#!/usr/bin/env bash
#
# Wrapper for git to handle more subdirs at the same time
#

if [ -n "$g_debug" ] ; then
    set -x
fi

SUBMODULES_ALL="dictionaries helpcontent2 translations"

pushd $(dirname $0) > /dev/null
if [ -f config_host.mk ] ; then
    # we are in the BUILDDIR
    SRC_ROOT=$(< config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//")
else
    SRC_ROOT=$(pwd)
fi
popd > /dev/null

COREDIR="$SRC_ROOT"

usage()
{
    git
    echo
    echo "Usage: g [options] [git (checkout|clone|fetch|grep|pull|push|reset) [git options/args..]]"
    echo ""
    echo " -z restore the git hooks and do other sanity checks"
}

refresh_submodule_hooks()
{
    local repo=$1
    local hook
    local hook_name

    if [ -d "${repo?}"/.git ] ; then
        # use core's hook by default
        for hook_name in "${COREDIR?}/.git-hooks"/* ; do
            hook="${repo?}/.git/hooks/${hook_name##*/}"
            if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
                rm -f "${hook?}"
                ln -sf "${hook_name}" "${hook?}"
            fi
        done
        # override if need be by the submodules' own hooks
        for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
            hook="${repo?}/.git/hooks/${hook_name##*/}"
            if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
                rm -f "${hook?}"
                ln -sf "${hook_name}" "${hook?}"
            fi
        done
    elif [ -d .git/modules/"${repo}"/hooks ] ; then
        for hook_name in "${COREDIR?}/.git-hooks"/* ; do
            hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
            if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
                rm -f "${hook?}"
                ln -sf "${hook_name}" "${hook?}"
            fi
        done
        # override if need be by the submodules' own hooks
        for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
            hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
            if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
                rm -f "${hook?}"
                ln -sf "${hook_name}" "${hook?}"
            fi
        done
    fi

}

refresh_all_hooks()
{
    local repo
    local hook_name
    local hook

    pushd "${COREDIR?}" > /dev/null
    for hook_name in "${COREDIR?}/.git-hooks"/* ; do
        hook=".git/hooks/${hook_name##*/}"
        if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
            rm -f "${hook?}"
            ln -sf "${hook_name}" "${hook?}"
        fi
    done

    for repo in ${SUBMODULES_ALL?} ; do
        refresh_submodule_hooks "$repo"
    done
    popd > /dev/null

}

set_push_url()
{
    local repo

    repo="$1"
    if [ -n "$repo" ] ; then
        pushd "${COREDIR?}/${repo?}" > /dev/null
    else
        pushd "${COREDIR?}" > /dev/null
        repo="core"
    fi
    echo "setting up push url for ${repo?}"
    if [ "${repo?}" = "helpcontent2" ] ; then
        git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/help"
    else
        git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/${repo?}"
    fi
    popd > /dev/null
}

set_push_urls()
{
    PUSH_USER="$1"
    set_push_url
    for repo in ${SUBMODULES_ACTIVE?} ; do
        set_push_url "${repo?}"
    done
}

get_active_submodules()
{
    SUBMODULES_ACTIVE=""
    local repo

    for repo in ${SUBMODULES_ALL?} ; do
        if [ -d "${repo?}"/.git ] || [ -f "${repo?}"/.git ] ; then
            SUBMODULES_ACTIVE="${repo?} ${SUBMODULES_ACTIVE?}"
        fi
    done
}

get_configured_submodules()
{
    SUBMODULES_CONFIGURED=""
    if [ -f config_host.mk ] ; then
        SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
    else
        # if we need the configured submodule before the configuration is done. we assumed you want them all
        SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}
    fi
}

get_git_reference()
{
    REFERENCED_GIT=""
    if [ -f config_host.mk ]; then
        REFERENCED_GIT=$(< config_host.mk grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//")
    fi
    LINKED_GIT=""
    if [ -f config_host.mk ]; then
        LINKED_GIT=$(< config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//")
    fi
}

do_shortcut_update()
{
    local module
    local repo

    for module in $SUBMODULES_CONFIGURED ; do
        if [ ! -d "${module?}"/.git ] ; then
            case "${module?}" in
                helpcontent2)
                    if [ -d clone/help/.git ] ; then
                        repo="clone/help/.git"
                    fi
                    ;;
                *)
                    if [ -d clone/"${module?}"/.git ] ; then
                        repo="clone/${module?}/.git"
                    fi
                    ;;
            esac
            if [ -n "$repo" ] ; then
                cp -r "${repo?}" "${module?}/."
            fi
        fi
    done
}

do_git_cmd()
{
    echo "cmd:$*"
    git "$@"
    git submodule foreach git "$@" $KEEP_GOING
}

do_checkout()
{
    local cmd
    local create_branch="0"
    local branch
    local module

    git checkout "$@" || return $?
    for cmd in "$@" ; do
        if [ "$cmd" = "-f" ]; then
            continue
        elif [ "$cmd" = "-b" ] ; then
            create_branch=1
        elif [ "$create_branch" = "1" ] ; then
            branch="$cmd"
            create_branch=0
        fi
    done
    if [ -f .gitmodules ] ; then
        git submodule update
        if [ -n "$branch" ] ; then
            git submodule foreach git checkout -b "${branch}" HEAD || return $?
        fi
    else
        # now that is the nasty case we moved prior to submodules
        # delete the submodules left over if any
        for module in $SUBMODULES_ALL ; do
            echo "clean-up submodule $module"
            rm -fr "${module}"
        done
        # make sure we have the needed repo in clone
        ./g clone && ./g -f checkout "$@" || return $?
    fi
    return $?
}

do_reset()
{
    git reset "$@" || return $?
    if [ -f .gitmodules ] ; then
        git submodule update || return $?
    else
        # now that is the nasty case we moved prior to submodules
        # delete the submodules left over if any
        for module in $SUBMODULES_ALL ; do
            echo "clean-up submodule $module"
            rm -fr "${module}"
        done
        # make sure we have the needed repo in clone
        ./g clone && ./g -f reset "$@"
    fi
    return $?;
}

do_init_modules()
{
    local module
    local configured

    do_shortcut_update

    for module in $SUBMODULES_CONFIGURED ; do
        if [ -n "$LINKED_GIT" ] ; then
            if ! [ -d ".git/modules/${module}" ]; then
                ./bin/git-new-module-workdir "${LINKED_GIT}/${module}" "${module}"
            fi
        fi
        configured=$(git config --local --get submodule."${module}".url)
        if [ -z "$configured" ] ; then
            git submodule init "$module" || return $?
        fi
    done
    for module in $SUBMODULES_CONFIGURED ; do
        if [ -n "$REFERENCED_GIT" ] ; then
            git submodule update --reference "$REFERENCED_GIT/.git/modules/$module" "$module" || return $?
        else
            git submodule update "$module" || return $?
        fi
    done
    return 0
}


# no params, no action
if [ "$#" -eq "0" ] ; then
    usage
fi

if [ ! "$(type -p git)" ]; then
    echo "Cannot find the git binary! Is git installed and is in PATH?"
    exit 1
fi


get_active_submodules
get_configured_submodules
get_git_reference




# extra params for some commands, like log
EXTRA=
COMMAND="$1"
PAGER=
RELATIVIZE=1
PUSH_ALL=
PUSH_USER=
PUSH_NOTES=
LAST_WORKING=
SET_LAST_WORKING=
ALLOW_EMPTY=
KEEP_GOING=
REPORT_REPOS=1
REPORT_COMMANDS=0
REPORT_COMPACT=0
DO_HOOK_REFRESH=false

while [ "${COMMAND:0:1}" = "-" ] ; do
    case "$COMMAND" in
        -f )KEEP_GOING="||:"
            ;;
        -z)
            refresh_all_hooks
            exit 0;
            ;;
        --set-push-urls)
            shift
            PUSH_USER="$1"
            if [ -n "${PUSH_USER}" ] ; then
                PUSH_USER="${PUSH_USER}@"
            fi
            set_push_urls "$PUSH_USER"
            exit 0;
            ;;
        -*)
            echo "option: $COMMAND not supported" 1>&2
            exit 1
    esac
    shift
    COMMAND="$1"
done

shift

case "$COMMAND" in
    branch)
        do_git_cmd "${COMMAND}" "$@"
        ;;
    checkout)
        do_checkout "$@"
        ;;
    clone)
        do_init_modules && refresh_all_hooks
        ;;
    fetch)
        (git fetch "$@" && git submodule foreach git fetch "$@" ) && git submodule update

        ;;
    grep)
        KEEP_GOING="||:"
        do_git_cmd "${COMMAND}" "$@"
        ;;
    pull)
        git pull "$@" && git submodule update && refresh_all_hooks
        ;;
    push)
        git submodule foreach git push "$@"
        if [ "$?" = "0" ] ; then
            git push "$@"
        fi
        ;;
    reset)
        do_reset
        ;;
    tag)
        do_git_cmd "${COMMAND}" "$@"
        ;;
    "")
        ;;
    *)
        echo "./g does not support command: $COMMAND" 1>&2
        exit 1;
        ;;
esac

exit $?

# vi:set shiftwidth=4 expandtab:
a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-i2c-devices-bq32k?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-i2c-devices-bq32k</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-iio?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-iio-adc-stm32?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-adc-stm32</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-iio-cros-ec?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-cros-ec</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-iio-distance-srf08?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-distance-srf08</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-iio-light-isl29018?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-light-isl29018</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-timer-stm32</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-pci?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-pci</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-bus-vfio-mdev?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-vfio-mdev</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-class-devfreq-event?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-devfreq-event</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-class-fpga-bridge?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-fpga-bridge</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-class-led?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-led</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-class-mei?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-mei</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-class-rc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-rc</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-class-remoteproc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-remoteproc</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-devices-edac?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-devices-edac</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-devices-system-cpu?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-devices-system-cpu</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-kernel-iommu_groups?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-kernel-iommu_groups</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-kernel-slab?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-kernel-slab</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-platform-hidma?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-platform-hidma</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-platform-hidma-mgmt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-platform-hidma-mgmt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-platform-sst-atom?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-platform-sst-atom</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ABI/testing/sysfs-power?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-power</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/BUG-HUNTING?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/BUG-HUNTING</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>l---------<span class='modechange'>[-rw-r--r--]</span></td><td class='typ'><a href='/drm-misc/diff/Documentation/Changes?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/Changes</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/CodeOfConflict?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/CodeOfConflict</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/CodingStyle?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/CodingStyle</a></td><td class='right'>1063</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.3%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/DMA-ISA-LPC.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DMA-ISA-LPC.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/DMA-attributes.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DMA-attributes.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/DocBook/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/DocBook/alsa-driver-api.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/alsa-driver-api.tmpl</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/DocBook/crypto-API.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/crypto-API.tmpl</a></td><td class='right'>2092</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.3%;'/><td class='none' style='width: 83.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/DocBook/debugobjects.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/debugobjects.tmpl</a></td><td class='right'>443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/DocBook/deviceiobook.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/deviceiobook.tmpl</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/DocBook/iio.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/iio.tmpl</a></td><td class='right'>697</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/DocBook/kernel-hacking.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/kernel-hacking.tmpl</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/DocBook/kgdb.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/kgdb.tmpl</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/DocBook/libata.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/libata.tmpl</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/DocBook/regulator.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/regulator.tmpl</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/DocBook/tracepoint.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/tracepoint.tmpl</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/DocBook/uio-howto.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/uio-howto.tmpl</a></td><td class='right'>1050</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.2%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/DocBook/usb.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/usb.tmpl</a></td><td class='right'>992</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.7%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/DocBook/writing-an-alsa-driver.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/writing-an-alsa-driver.tmpl</a></td><td class='right'>6206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 48.4%;'/><td class='none' style='width: 51.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/HOWTO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/HOWTO</a></td><td class='right'>652</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/IPMI.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/IPMI.txt</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/Makefile.sphinx?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/Makefile.sphinx</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/ManagementStyle?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ManagementStyle</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/PCI/MSI-HOWTO.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/PCI/MSI-HOWTO.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/PCI/PCIEBUS-HOWTO.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/PCI/PCIEBUS-HOWTO.txt</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/PCI/pci-error-recovery.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/PCI/pci-error-recovery.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/PCI/pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/PCI/pci.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/PCI/pcieaer-howto.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/PCI/pcieaer-howto.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/RCU/Design/Data-Structures/Data-Structures.html?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Data-Structures/Data-Structures.html</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg</a></td><td class='right'>830</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg</a></td><td class='right'>826</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html</a></td><td class='right'>626</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/RCU/Design/Requirements/Requirements.html?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Requirements/Requirements.html</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/RCU/trace.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/trace.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/RCU/whatisRCU.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/whatisRCU.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/SecurityBugs?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/SecurityBugs</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/SubmitChecklist?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/SubmitChecklist</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/SubmittingDrivers?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/SubmittingDrivers</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/SubmittingPatches?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/SubmittingPatches</a></td><td class='right'>842</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/VGA-softcursor.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/VGA-softcursor.txt</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/acpi/DSD-properties-rules.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/DSD-properties-rules.txt</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/acpi/acpi-lid.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/acpi-lid.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/acpi/enumeration.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/enumeration.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/acpi/gpio-properties.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/gpio-properties.txt</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/acpi/method-customizing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/method-customizing.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/acpi/method-tracing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/method-tracing.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/acpi/osi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/osi.txt</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/acpi/video_extension.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/video_extension.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/adding-syscalls.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/adding-syscalls.txt</a></td><td class='right'>527</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/README.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/README.rst</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/binfmt-misc.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/binfmt-misc.rst</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/braille-console.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/braille-console.rst</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/bug-bisect.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/bug-bisect.rst</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/bug-hunting.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/bug-hunting.rst</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/conf.py</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/devices.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/devices.rst</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/devices.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/devices.txt</a></td><td class='right'>3081</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/dynamic-debug-howto.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/dynamic-debug-howto.rst</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/index.rst</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/init.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/init.rst</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/initrd.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/initrd.rst</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/java.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/java.rst</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/kernel-parameters.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/kernel-parameters.rst</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/admin-guide/kernel-parameters.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/kernel-parameters.txt</a> (renamed from Documentation/kernel-parameters.txt)</td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/md.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/md.rst</a></td><td class='right'>732</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/module-signing.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/module-signing.rst</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/mono.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/mono.rst</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/parport.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/parport.rst</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/ramoops.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/ramoops.rst</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/ras.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/ras.rst</a></td><td class='right'>1210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/reporting-bugs.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/reporting-bugs.rst</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/security-bugs.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/security-bugs.rst</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/serial-console.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/serial-console.rst</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/sysfs-rules.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/sysfs-rules.rst</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/sysrq.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/sysrq.rst</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/tainted-kernels.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/tainted-kernels.rst</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/unicode.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/unicode.rst</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/admin-guide/vga-softcursor.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/vga-softcursor.rst</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/applying-patches.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/applying-patches.txt</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/arm/Booting?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm/Booting</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/arm/stm32/overview.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm/stm32/overview.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/arm/stm32/stm32f746-overview.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm/stm32/stm32f746-overview.txt</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/arm/sunxi/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm/sunxi/README</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/arm64/cpu-feature-registers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm64/cpu-feature-registers.txt</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/arm64/silicon-errata.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm64/silicon-errata.txt</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/assoc_array.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/assoc_array.txt</a></td><td class='right'>574</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/atomic_ops.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/atomic_ops.txt</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/bad_memory.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/bad_memory.txt</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/basic_profiling.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/basic_profiling.txt</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/binfmt_misc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/binfmt_misc.txt</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/block/biodoc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/block/biodoc.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/block/cfq-iosched.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/block/cfq-iosched.txt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/block/null_blk.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/block/null_blk.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/block/pr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/block/pr.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/block/queue-sysfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/block/queue-sysfs.txt</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/blockdev/cciss.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/blockdev/cciss.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/blockdev/mflash.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/blockdev/mflash.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/blockdev/ramdisk.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/blockdev/ramdisk.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/blockdev/zram.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/blockdev/zram.txt</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/braille-console.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/braille-console.txt</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/cdrom/cdrom-standard.tex?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cdrom/cdrom-standard.tex</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/cgroup-v1/00-INDEX?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cgroup-v1/00-INDEX</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/cgroup-v1/cpusets.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cgroup-v1/cpusets.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/cgroup-v1/rdma.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cgroup-v1/rdma.txt</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/cgroup-v2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cgroup-v2.txt</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/circular-buffers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/circular-buffers.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/conf.py</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/core-api/assoc_array.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/assoc_array.rst</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/core-api/atomic_ops.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/atomic_ops.rst</a></td><td class='right'>658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/core-api/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/conf.py</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/core-api/cpu_hotplug.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/cpu_hotplug.rst</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/core-api/debug-objects.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/debug-objects.rst</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/core-api/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/index.rst</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/core-api/local_ops.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/local_ops.rst</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/core-api/tracepoint.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/tracepoint.rst</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/core-api/workqueue.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/workqueue.rst</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/cpu-freq/core.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/core.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/cpu-freq/cpu-drivers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/cpu-drivers.txt</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/cpu-freq/cpufreq-stats.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/cpufreq-stats.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/cpu-freq/governors.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/governors.txt</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/cpu-freq/index.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/index.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/cpu-freq/intel-pstate.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/intel-pstate.txt</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/cpu-freq/user-guide.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/user-guide.txt</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/cpu-hotplug.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-hotplug.txt</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/api-aead.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-aead.rst</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/api-akcipher.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-akcipher.rst</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/api-digest.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-digest.rst</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/crypto/api-intro.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-intro.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/api-kpp.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-kpp.rst</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/api-rng.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-rng.rst</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/api-samples.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-samples.rst</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/api-skcipher.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-skcipher.rst</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/api.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api.rst</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/architecture.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/architecture.rst</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/devel-algos.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/devel-algos.rst</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/index.rst</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/intro.rst</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/crypto/userspace-if.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/userspace-if.rst</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/dev-tools/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dev-tools/conf.py</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/dev-tools/gcov.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dev-tools/gcov.rst</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/dev-tools/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dev-tools/index.rst</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/dev-tools/kcov.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dev-tools/kcov.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/dev-tools/sparse.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dev-tools/sparse.rst</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/dev-tools/tools.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dev-tools/tools.rst</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/development-process/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/development-process/conf.py</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/development-process/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/development-process/index.rst</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/device-mapper/cache.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/cache.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/device-mapper/delay.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/delay.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/device-mapper/dm-crypt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/dm-crypt.txt</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/device-mapper/dm-raid.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/dm-raid.txt</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/device-mapper/linear.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/linear.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/device-mapper/striped.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/striped.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/device-mapper/switch.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/switch.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/devices.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devices.txt</a></td><td class='right'>3325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 25.9%;'/><td class='none' style='width: 74.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/amlogic,scpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/amlogic,scpi.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/amlogic.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/amlogic.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/arch_timer.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/arch_timer.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/arm,scpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/arm,scpi.txt</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/arm-boards?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/arm-boards</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/atmel-at91.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/atmel-at91.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/axentia.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/axentia.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt</a> (renamed from Documentation/devicetree/bindings/arm/bcm/ns2.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/cpu-capacity.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/cpu-capacity.txt</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/cpus.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/cpus.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/davinci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/davinci.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/fsl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/fsl.txt</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/juno,scpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/juno,scpi.txt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/keystone/ti,sci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/keystone/ti,sci.txt</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/marvell/98dx3236.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/omap/omap.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/omap/omap.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/oxnas.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/oxnas.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/qcom.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/qcom.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/rockchip.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/rockchip.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/shmobile.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/shmobile.txt</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/sunxi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/sunxi.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/arm/swir.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/swir.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/ata/ahci-da850.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/ata/ahci-da850.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/ata/ahci-st.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/ata/ahci-st.txt</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/bus/qcom,ebi2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/bus/qcom,ebi2.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/bus/ti,da850-mstpri.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/bus/ti,da850-mstpri.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/exynos4415-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/exynos4415-clock.txt</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/exynos5433-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/exynos5433-clock.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/hi3519-crg.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/hi3519-crg.txt</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/hi3660-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/hi3660-clock.txt</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/hisi-crg.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/hisi-crg.txt</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/idt,versaclock5.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/idt,versaclock5.txt</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/imx31-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/imx31-clock.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/oxnas,stdclk.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/oxnas,stdclk.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/qcom,gcc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/qcom,gcc.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/qcom,rpmcc.txt</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/qoriq-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/qoriq-clock.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/rockchip,rk1108-cru.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/rockchip,rk1108-cru.txt</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/st,stm32-rcc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/st,stm32-rcc.txt</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/stericsson,abx500.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/stericsson,abx500.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/sun9i-de.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/sun9i-de.txt</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/sun9i-usb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/sun9i-usb.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/sunxi-ccu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/sunxi-ccu.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/ti,cdce925.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/ti,cdce925.txt</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/clock/zx296718-clk.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/zx296718-clk.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/cpufreq/ti-cpufreq.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/cpufreq/ti-cpufreq.txt</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/crypto/brcm,spu-crypto.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/crypto/brcm,spu-crypto.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/crypto/fsl-sec4.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/crypto/fsl-sec4.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/crypto/mediatek-crypto.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/crypto/mediatek-crypto.txt</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/devfreq/exynos-bus.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/devfreq/exynos-bus.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/arm,pl11x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/arm,pl11x.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/analogix_dp.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/bridge/anx7814.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/anx7814.txt</a> (renamed from Documentation/devicetree/bindings/video/bridge/anx7814.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/bridge/sil-sii8620.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/sil-sii8620.txt</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/ht16k33.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/ht16k33.txt</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/imx/hdmi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/imx/hdmi.txt</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/imx/ldb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/imx/ldb.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/msm/dsi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/msm/dsi.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/msm/edp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/msm/edp.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/msm/gpu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/msm/gpu.txt</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/msm/hdmi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/msm/hdmi.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/mxsfb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/mxsfb.txt</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/auo,g133han01.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/auo,g133han01.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/auo,g185han01.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/auo,g185han01.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/auo,t215hvn01.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/auo,t215hvn01.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/chunghwa,claa070wp03xg.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/chunghwa,claa070wp03xg.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/display-timing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/display-timing.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/nvd,9128.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/nvd,9128.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/panel-dpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/panel-dpi.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/panel.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/panel.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/sharp,lq150x1lg11.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/sharp,lq150x1lg11.txt</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/renesas,du.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/renesas,du.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/ssd1307fb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/ssd1307fb.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/ti/ti,tfp410.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/ti/ti,tfp410.txt</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/tilcdc/panel.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/tilcdc/panel.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/display/zte,vou.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/zte,vou.txt</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/dma/nbpfaxi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/nbpfaxi.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/dma/snps-dma.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/snps-dma.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/dma/st_fdma.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/st_fdma.txt</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/dma/stm32-dma.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/stm32-dma.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/eeprom/eeprom.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/eeprom/eeprom.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/firmware/nvidia,tegra186-bpmp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/firmware/nvidia,tegra186-bpmp.txt</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/firmware/qcom,scm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/firmware/qcom,scm.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/fpga/altera-fpga2sdram-bridge.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/fpga/altera-fpga2sdram-bridge.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/fpga/altera-freeze-bridge.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/fpga/altera-freeze-bridge.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/fpga/altera-hps2fpga-bridge.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/fpga/altera-hps2fpga-bridge.txt</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/fpga/altera-socfpga-a10-fpga-mgr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/fpga/altera-socfpga-a10-fpga-mgr.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/fpga/fpga-region.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/fpga/fpga-region.txt</a></td><td class='right'>494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/gpio/cortina,gemini-gpio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpio/cortina,gemini-gpio.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpio/gpio-pca953x.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/devicetree/bindings/gpio/gpio-sx150x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpio/gpio-sx150x.txt</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/gpio/gpio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpio/gpio.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/gpio/gpio_oxnas.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpio/gpio_oxnas.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpio/mrvl-gpio.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/hwmon/adc128d818.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/adc128d818.txt</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/hwmon/lm70.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/lm70.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/hwmon/lm90.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/lm90.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/hwmon/mcp3021.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/mcp3021.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/hwmon/sht15.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/sht15.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/hwmon/stts751.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/stts751.txt</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/hwmon/tmp108.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/tmp108.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/i2c/i2c-pxa.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-pxa.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/i2c/i2c-rcar.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-rcar.txt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/i2c/i2c-stm32.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-stm32.txt</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/i2c/i2c.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/i2c/trivial-devices.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/trivial-devices.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/accel/lis302.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/accel/lis302.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/avia-hx711.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/adc/envelope-detector.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/envelope-detector.txt</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/adc/max11100.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/max11100.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/adc/ti-ads7950.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/ti-ads7950.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/dac/dpot-dac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/dac/dpot-dac.txt</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/dac/mcp4725.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/dac/mcp4725.txt</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/humidity/hts221.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/humidity/hts221.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/imu/bmi160.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/imu/bmi160.txt</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/light/cm3605.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/light/cm3605.txt</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/light/isl29018.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/light/isl29018.txt</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/light/tsl2583.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/light/tsl2583.txt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/potentiometer/max5481.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/potentiometer/max5481.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/st-sensors.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/st-sensors.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/temperature/tmp007.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/temperature/tmp007.txt</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/input/da9062-onkey.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/da9062-onkey.txt</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/input/mpr121-touchkey.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/mpr121-touchkey.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/input/pwm-beeper.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/pwm-beeper.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/input/touchscreen/zet6223.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/touchscreen/zet6223.txt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/interrupt-controller/cortina,gemini-interrupt-controller.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/interrupt-controller/cortina,gemini-interrupt-controller.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/iommu/arm,smmu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iommu/arm,smmu.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/leds/common.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/leds/common.txt</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/leds/pca963x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/leds/pca963x.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.txt</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/exynos5-gsc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/exynos5-gsc.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/fsl-vdoa.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/fsl-vdoa.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/gpio-ir-receiver.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/gpio-ir-receiver.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/hix5hd2-ir.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/hix5hd2-ir.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/i2c/adv7604.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/i2c/adv7604.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/i2c/toshiba,et8ek8.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/i2c/toshiba,et8ek8.txt</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/mediatek-mdp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/mediatek-mdp.txt</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/mediatek-vcodec.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/mediatek-vcodec.txt</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/meson-ir.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/meson-ir.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/mtk-cir.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/mtk-cir.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/rc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/rc.txt</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/renesas,fcp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/renesas,fcp.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/renesas,fdp1.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/renesas,fdp1.txt</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/s5p-mfc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/s5p-mfc.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/st,st-delta.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/st,st-delta.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/sunxi-ir.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/sunxi-ir.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/media/ti,da850-vpif.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/ti,da850-vpif.txt</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/memory-controllers/ti-da8xx-ddrctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/memory-controllers/ti-da8xx-ddrctl.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/altera-a10sr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/altera-a10sr.txt</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/as3722.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/as3722.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/aspeed-gfx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/aspeed-gfx.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/aspeed-lpc.txt</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/mfd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/mfd.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/motorola-cpcap.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/motorola-cpcap.txt</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/mt6397.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/mt6397.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/omap-usb-host.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/omap-usb-host.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/qcom-rpm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/qcom-rpm.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/rn5t618.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/rn5t618.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mfd/stm32-timers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/stm32-timers.txt</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/misc/atmel-ssc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/misc/atmel-ssc.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/misc/idt_89hpesx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/misc/idt_89hpesx.txt</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/mmc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/mmc.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/renesas,mmcif.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/renesas,mmcif.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/sdhci-cadence.txt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/sdhci-msm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/sdhci-msm.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/sdhci-st.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/sdhci-st.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/sdhci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/sdhci.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/sunxi-mmc.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/tmio_mmc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/tmio_mmc.txt</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mtd/aspeed-smc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/aspeed-smc.txt</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mtd/common.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/common.txt</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mtd/mtk-quadspi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/mtk-quadspi.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mtd/oxnas-nand.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/oxnas-nand.txt</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mtd/samsung-s3c2410.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/samsung-s3c2410.txt</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/mtd/tango-nand.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/tango-nand.txt</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/brcm,amac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/brcm,amac.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/brcm,systemport.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/brcm,systemport.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/btusb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/btusb.txt</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/can/rcar_can.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/can/rcar_can.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/can/rcar_canfd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/can/rcar_canfd.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/cpsw.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/cpsw.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/dsa/dsa.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/dsa/dsa.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/dsa/marvell.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/dsa/marvell.txt</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/ethernet.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/ethernet.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/marvell,prestera.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/marvell,prestera.txt</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/marvell-pp2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/marvell-pp2.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/mediatek-net.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/mediatek-net.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/meson-dwmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/meson-dwmac.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/oxnas-dwmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/oxnas-dwmac.txt</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/phy.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/rockchip-dwmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/rockchip-dwmac.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/smsc-lan91c111.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/smsc-lan91c111.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/stmmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/stmmac.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/ti,dp83867.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/ti,dp83867.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/wireless/ieee80211.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/wireless/ieee80211.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/nvmem/brcm,ocotp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/nvmem/brcm,ocotp.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/nvmem/imx-ocotp.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/nvmem/lpc1850-otp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/nvmem/lpc1850-otp.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/opp/opp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/opp/opp.txt</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/hisilicon-pcie.txt</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pci/layerscape-pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/layerscape-pci.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pci/mvebu-pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/mvebu-pci.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pci/pci-iommu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/pci-iommu.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pci/pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/pci.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pci/qcom,pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/qcom,pcie.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pci/rcar-pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/rcar-pci.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pci/rockchip-pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/rockchip-pcie.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/devicetree/bindings/phy/meson-usb2-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/meson-usb2-phy.txt</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.txt</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/phy/samsung-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/samsung-phy.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/marvell,armada-98dx3236-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/marvell,armada-98dx3236-pinctrl.txt</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/pinctrl-aspeed.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/pinctrl-aspeed.txt</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/ti,da850-pupd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/ti,da850-pupd.txt</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pinctrl/ti,iodelay.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/ti,iodelay.txt</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/domain-idle-state.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/domain-idle-state.txt</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/pd-samsung.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/pd-samsung.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/power_domain.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/power_domain.txt</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/reset/qnap-poweroff.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/reset/qnap-poweroff.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/supply/bq27xxx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/bq27xxx.txt</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/supply/qcom_smbb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/qcom_smbb.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/supply/ti,bq24735.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/ti,bq24735.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/tps65217_charger.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/power_supply/maxim,max14656.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power_supply/maxim,max14656.txt</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/powerpc/opal/power-mgt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/powerpc/opal/power-mgt.txt</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pwm/imx-pwm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pwm/imx-pwm.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pwm/pwm-hibvt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pwm/pwm-hibvt.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/pwm/pwm-stm32.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pwm/pwm-stm32.txt</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/regulator/anatop-regulator.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/regulator/anatop-regulator.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/regulator/cpcap-regulator.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/regulator/cpcap-regulator.txt</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/regulator/gpio-regulator.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/regulator/gpio-regulator.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/regulator/tps65218.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/regulator/tps65218.txt</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/reserved-memory/ramoops.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reserved-memory/ramoops.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/reset/oxnas,reset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/oxnas,reset.txt</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/reset/renesas,rst.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/renesas,rst.txt</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/st,sti-powerdown.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/reset/st,sti-softreset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/st,sti-softreset.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/reset/ti-syscon-reset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/ti-syscon-reset.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/reset/uniphier-reset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/uniphier-reset.txt</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/rng/omap_rng.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rng/omap_rng.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/rtc/armada-380-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/armada-380-rtc.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/rtc/cortina,gemini.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/cortina,gemini.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/rtc/epson,rtc7301.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/epson,rtc7301.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/rtc/imxdi-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/imxdi-rtc.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/rtc/maxim,ds3231.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/maxim,ds3231.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/rtc/pcf8563.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/pcf8563.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/rtc/sun6i-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/sun6i-rtc.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/rtc/twl-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/twl-rtc.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/scsi/hisilicon-sas.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/security/tpm/ibmvtpm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/security/tpm/ibmvtpm.txt</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/security/tpm/tpm_tis_mmio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/security/tpm/tpm_tis_mmio.txt</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/serial/8250.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/serial/8250.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/serial/fsl-imx-uart.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/serial/serial.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/serial/serial.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/serial/slave-device.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/serial/slave-device.txt</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/devicetree/bindings/soc/fsl/guts.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/fsl/guts.txt</a> (renamed from Documentation/devicetree/bindings/powerpc/fsl/guts.txt)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/soc/fsl/qman-portals.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/fsl/qman-portals.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/mediatek/scpsys.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/soc/rockchip/grf.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/rockchip/grf.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/rockchip/power_domain.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/cs35l34.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/cs35l34.txt</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/cs42l42.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/cs42l42.txt</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/davinci-mcbsp.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/es8328.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/es8328.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/nau8540.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/nau8540.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/rockchip-i2s.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/rockchip-i2s.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/rt5514.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/rt5514.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/rt5663.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/rt5663.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/rt5665.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/rt5665.txt</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/sun4i-codec.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/sun4i-codec.txt</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/sun4i-i2s.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/sun4i-i2s.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/tlv320aic31xx.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/wm8580.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/wm8580.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/zte,zx-i2s.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/spi/sh-msiof.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/sh-msiof.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/spi/spi-armada-3700.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/spi-armada-3700.txt</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/spi/spi-lantiq-ssc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/spi-lantiq-ssc.txt</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/spi/spi-rockchip.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/spi-rockchip.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/spi/spi-sun6i.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/spi-sun6i.txt</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/sram/sram.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sram/sram.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/submitting-patches.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/submitting-patches.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/thermal/qoriq-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/qoriq-thermal.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/rockchip-thermal.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/thermal/st-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/st-thermal.txt</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/thermal/zx2967-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/zx2967-thermal.txt</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/timer/cortina,gemini-timer.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/timer/cortina,gemini-timer.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/timer/ezchip,nps400-timer0.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/timer/ezchip,nps400-timer0.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/timer/ezchip,nps400-timer1.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/timer/ezchip,nps400-timer1.txt</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/timer/renesas,ostm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/timer/renesas,ostm.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/ufs/ufs-qcom.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/ufs/ufs-qcom.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/atmel-usb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/atmel-usb.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/da8xx-usb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/da8xx-usb.txt</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/dwc2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/dwc2.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/dwc3-st.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/dwc3-st.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/dwc3.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/dwc3.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/ehci-omap.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/ehci-omap.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/ehci-st.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/ehci-st.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/mt8173-mtu3.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/mt8173-mtu3.txt</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/mt8173-xhci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/mt8173-xhci.txt</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/ohci-da8xx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/ohci-da8xx.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/qcom,dwc3.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/qcom,dwc3.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/s3c2410-usb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/s3c2410-usb.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/ulpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/ulpi.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/usb-xhci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/usb-xhci.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/usb/usb251xb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/usb251xb.txt</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/vendor-prefixes.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/vendor-prefixes.txt</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/watchdog/cortina,gemin-watchdog.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/watchdog/cortina,gemin-watchdog.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/watchdog/samsung-wdt.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/devicetree/booting-without-of.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/booting-without-of.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/dma-buf-sharing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dma-buf-sharing.txt</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/dmaengine/client.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dmaengine/client.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/dmaengine/dmatest.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dmaengine/dmatest.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/dmaengine/provider.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dmaengine/provider.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/dmaengine/pxa_dma.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dmaengine/pxa_dma.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/doc-guide/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/conf.py</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/doc-guide/docbook.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/docbook.rst</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/doc-guide/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/index.rst</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/doc-guide/kernel-doc.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/kernel-doc.rst</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/doc-guide/parse-headers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/parse-headers.rst</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/doc-guide/sphinx.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/sphinx.rst</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/dontdiff?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dontdiff</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/driver-api/80211/cfg80211.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/cfg80211.rst</a> (renamed from Documentation/80211/cfg80211.rst)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/80211/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/conf.py</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/80211/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/index.rst</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/driver-api/80211/introduction.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/introduction.rst</a> (renamed from Documentation/80211/introduction.rst)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/driver-api/80211/mac80211-advanced.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/mac80211-advanced.rst</a> (renamed from Documentation/80211/mac80211-advanced.rst)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/driver-api/80211/mac80211.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/mac80211.rst</a> (renamed from Documentation/80211/mac80211.rst)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/conf.py</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/device-io.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/device-io.rst</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/device_link.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/device_link.rst</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/dma-buf.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/dma-buf.rst</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/edac.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/edac.rst</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/firmware/built-in-fw.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/built-in-fw.rst</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/firmware/core.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/core.rst</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/firmware/direct-fs-lookup.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/direct-fs-lookup.rst</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/firmware/fallback-mechanisms.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/fallback-mechanisms.rst</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/firmware/firmware_cache.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/firmware_cache.rst</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/firmware/fw_search_path.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/fw_search_path.rst</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/firmware/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/index.rst</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/firmware/introduction.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/introduction.rst</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/firmware/lookup-order.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/lookup-order.rst</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/firmware/request_firmware.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/request_firmware.rst</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/iio/buffers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/buffers.rst</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/iio/core.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/core.rst</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/iio/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/index.rst</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/iio/intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/intro.rst</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/iio/triggered-buffers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/triggered-buffers.rst</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/iio/triggers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/triggers.rst</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/driver-api/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/index.rst</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/driver-api/infrastructure.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/infrastructure.rst</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/pm/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/pm/conf.py</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/pm/devices.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/pm/devices.rst</a></td><td class='right'>736</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/pm/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/pm/index.rst</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/pm/notifiers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/pm/notifiers.rst</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/pm/types.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/pm/types.rst</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/regulator.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/regulator.rst</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/uio-howto.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/uio-howto.rst</a></td><td class='right'>705</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/usb.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/usb.rst</a></td><td class='right'>748</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/driver-api/vme.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/vme.rst</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/driver-model/devres.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-model/devres.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/dynamic-debug-howto.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dynamic-debug-howto.txt</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/edac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/edac.txt</a></td><td class='right'>812</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/extcon/intel-int3496.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/extcon/intel-int3496.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/features/io/dma-api-debug/arch-support.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/features/io/dma-api-debug/arch-support.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/features/io/dma-contiguous/arch-support.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/features/io/dma-contiguous/arch-support.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/features/io/sg-chain/arch-support.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/features/io/sg-chain/arch-support.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/00-INDEX?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/00-INDEX</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/Locking?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/Locking</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/afs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/afs.txt</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/autofs4-mount-control.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/autofs4-mount-control.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/autofs4.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/autofs4.txt</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/ceph.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/ceph.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/configfs/configfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/configfs/configfs.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/dax.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/dax.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/ext4.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/ext4.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/f2fs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/f2fs.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/locks.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/locks.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/filesystems/logfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/logfs.txt</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/nfs/nfsroot.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/nfs/nfsroot.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/overlayfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/overlayfs.txt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/porting?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/porting</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/proc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/proc.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/quota.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/quota.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/sysfs-pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/sysfs-pci.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/vfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/vfs.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/filesystems/xfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/xfs.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/firmware_class/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/firmware_class/README</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/fpga/fpga-mgr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/fpga/fpga-mgr.txt</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/frv/booting.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/frv/booting.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/gpio/driver.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpio/driver.txt</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/gpu/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/conf.py</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/gpu/drm-internals.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/drm-internals.rst</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/gpu/drm-kms-helpers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/drm-kms-helpers.rst</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/gpu/drm-kms.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/drm-kms.rst</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/gpu/drm-mm.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/drm-mm.rst</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/gpu/drm-uapi.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/drm-uapi.rst</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/gpu/i915.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/i915.rst</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/gpu/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/index.rst</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/gpu/introduction.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/introduction.rst</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/gpu/tinydrm.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/tinydrm.rst</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/hwmon/ds1621?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/ds1621</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/hwmon/hwmon-kernel-api.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/hwmon-kernel-api.txt</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/hwmon/lm70?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/lm70</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/hwmon/sht21?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/sht21</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/hwmon/submitting-patches?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/submitting-patches</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/hwmon/sysfs-interface?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/sysfs-interface</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/hwmon/tc654?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/tc654</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/hwmon/tmp108?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/tmp108</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/i2c/busses/i2c-i801?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/i2c/busses/i2c-i801</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/i2c/busses/i2c-mlxcpld?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/i2c/busses/i2c-mlxcpld</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/i2c/muxes/i2c-mux-gpio?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/i2c/muxes/i2c-mux-gpio</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/i2c/smbus-protocol?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/i2c/smbus-protocol</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/index.rst</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/init.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/init.txt</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/initrd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/initrd.txt</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/input/input.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/input/input.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ioctl/botching-up-ioctls.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ioctl/botching-up-ioctls.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/ioctl/ioctl-number.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ioctl/ioctl-number.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/isdn/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/isdn/README</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/ja_JP/HOWTO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ja_JP/HOWTO</a></td><td class='right'>637</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/ja_JP/SubmitChecklist?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ja_JP/SubmitChecklist</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/ja_JP/SubmittingPatches?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ja_JP/SubmittingPatches</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/ja_JP/stable_api_nonsense.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ja_JP/stable_api_nonsense.txt</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/ja_JP/stable_kernel_rules.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ja_JP/stable_kernel_rules.txt</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/java.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/java.txt</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/kbuild/kconfig-language.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/kbuild/kconfig-language.txt</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/kernel-doc-nano-HOWTO.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/kernel-doc-nano-HOWTO.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/kernel-documentation.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/kernel-documentation.rst</a></td><td class='right'>679</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/kernel-per-CPU-kthreads.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/kernel-per-CPU-kthreads.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/ko_KR/HOWTO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ko_KR/HOWTO</a></td><td class='right'>585</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/ko_KR/stable_api_nonsense.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ko_KR/stable_api_nonsense.txt</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/kselftest.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/kselftest.txt</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/laptops/thinkpad-acpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/laptops/thinkpad-acpi.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/leds/leds-class.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/leds/leds-class.txt</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/leds/leds-lp5523.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/leds/leds-lp5523.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/leds/uleds.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/leds/uleds.txt</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/livepatch/livepatch.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/livepatch/livepatch.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/local_ops.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/local_ops.txt</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/locking/ww-mutex-design.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/locking/ww-mutex-design.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/lockup-watchdogs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/lockup-watchdogs.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/m68k/kernel-options.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/m68k/kernel-options.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/magic-number.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/magic-number.txt</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/md.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/md.txt</a></td><td class='right'>613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/md/md-cluster.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/md/md-cluster.txt</a> (renamed from Documentation/md-cluster.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/md/raid5-cache.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/md/raid5-cache.txt</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/Makefile</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/dvb-drivers/ci.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/dvb-drivers/ci.rst</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/dvb-drivers/intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/dvb-drivers/intro.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/index.rst</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/intro.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/kapi/cec-core.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/kapi/cec-core.rst</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/kapi/csi2.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/kapi/csi2.rst</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/kapi/dtv-core.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/kapi/dtv-core.rst</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/kapi/mc-core.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/kapi/mc-core.rst</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/media_api_files/typical_media_device.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/media_api_files/typical_media_device.pdf</a></td><td class='right'>bin</td><td class='graph'>52895 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/media_api_files/typical_media_device.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/media_api_files/typical_media_device.svg</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/media_kapi.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/media_kapi.rst</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/typical_media_device.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/typical_media_device.svg</a></td><td class='right'>2948</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/cec/cec-func-close.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-func-close.rst</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/cec/cec-func-ioctl.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-func-ioctl.rst</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/cec/cec-func-open.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-func-open.rst</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/cec/cec-func-poll.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-func-poll.rst</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/cec/cec-intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-intro.rst</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/cec/cec-ioc-dqevent.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-dqevent.rst</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/cec/cec-ioc-g-mode.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-g-mode.rst</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/cec/cec-ioc-receive.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-receive.rst</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/dvb/dvb-frontend-parameters.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/dvb/dvbstb.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/dvb/dvbstb.svg</a></td><td class='right'>651</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/dvb/intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/dvb/intro.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/dvb/intro_files/dvbstb.pdf</a></td><td class='right'>bin</td><td class='graph'>1881 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/dvb/intro_files/dvbstb.png?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/dvb/intro_files/dvbstb.png</a></td><td class='right'>bin</td><td class='graph'>22655 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/gen-errors.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/gen-errors.rst</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/rc/rc-sysfs-nodes.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/rc/rc-sysfs-nodes.rst</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/bayer.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/bayer.svg</a></td><td class='right'>984</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/constraints.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/constraints.svg</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/control.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/control.rst</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/crop.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/crop.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/crop.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/crop.svg</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/crop_files/crop.gif?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/crop_files/crop.gif</a></td><td class='right'>bin</td><td class='graph'>5967 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/crop_files/crop.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/crop_files/crop.pdf</a></td><td class='right'>bin</td><td class='graph'>5846 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-codec.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-codec.rst</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-raw-vbi.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-raw-vbi.rst</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif</a></td><td class='right'>bin</td><td class='graph'>4741 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf</a></td><td class='right'>bin</td><td class='graph'>3706 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif</a></td><td class='right'>bin</td><td class='graph'>5095 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf</a></td><td class='right'>bin</td><td class='graph'>3996 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif</a></td><td class='right'>bin</td><td class='graph'>2400 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf</a></td><td class='right'>bin</td><td class='graph'>7405 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-subdev.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-subdev.rst</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf</a></td><td class='right'>bin</td><td class='graph'>20276 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png</a></td><td class='right'>bin</td><td class='graph'>12130 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf</a></td><td class='right'>bin</td><td class='graph'>20729 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf</a></td><td class='right'>bin</td><td class='graph'>46311 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf</a></td><td class='right'>bin</td><td class='graph'>36714 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/diff-v4l.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/diff-v4l.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/extended-controls.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/extended-controls.rst</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/field-order.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/field-order.rst</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif</a></td><td class='right'>bin</td><td class='graph'>25430 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf</a></td><td class='right'>bin</td><td class='graph'>9185 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif</a></td><td class='right'>bin</td><td class='graph'>25323 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf</a></td><td class='right'>bin</td><td class='graph'>9173 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/fieldseq_bt.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/fieldseq_bt.svg</a></td><td class='right'>2613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/fieldseq_tb.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/fieldseq_tb.svg</a></td><td class='right'>2607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/hsv-formats.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/hsv-formats.rst</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/nv12mt.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/nv12mt.svg</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/nv12mt_example.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/nv12mt_example.svg</a></td><td class='right'>1589</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pipeline.dot?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pipeline.dot</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-002.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-002.rst</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-003.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-003.rst</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-006.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-006.rst</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-007.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-007.rst</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-013.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-013.rst</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-nv12mt.rst</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png</a></td><td class='right'>bin</td><td class='graph'>1920 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png</a></td><td class='right'>bin</td><td class='graph'>5261 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-reserved.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-reserved.rst</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-rgb.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-rgb.rst</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-sbggr16.rst</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-srggb10p.rst</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-srggb12.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-srggb12.rst</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-srggb16.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-srggb16.rst</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt-srggb8.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-srggb8.rst</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/pixfmt.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt.rst</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/selection-api-003.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/selection-api-003.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/selection-api-003_files/selection.png?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/selection-api-003_files/selection.png</a></td><td class='right'>bin</td><td class='graph'>11716 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/selection.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/selection.svg</a></td><td class='right'>5812</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 45.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 54.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/subdev-formats.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/subdev-formats.rst</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/subdev-formats_files/bayer.png?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/subdev-formats_files/bayer.png</a></td><td class='right'>bin</td><td class='graph'>9725 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/subdev-image-processing-crop.svg</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/subdev-image-processing-full.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/subdev-image-processing-full.svg</a></td><td class='right'>742</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg</a></td><td class='right'>540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/v4l2.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/v4l2.rst</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/vbi_525.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vbi_525.svg</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/vbi_625.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vbi_625.svg</a></td><td class='right'>858</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/vbi_hsync.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vbi_hsync.svg</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/vidioc-g-selection.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vidioc-g-selection.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png</a></td><td class='right'>bin</td><td class='graph'>3313 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/uapi/v4l/vidioc-g-tuner.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vidioc-g-tuner.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/au0828-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/au0828-cardlist.rst</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/bttv-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/bttv-cardlist.rst</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/bttv.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/bttv.rst</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/cafe_ccic.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/cafe_ccic.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/cx23885-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/cx23885-cardlist.rst</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/cx88-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/cx88-cardlist.rst</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/em28xx-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/em28xx-cardlist.rst</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/gspca-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/gspca-cardlist.rst</a></td><td class='right'>843</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/index.rst</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/ivtv-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/ivtv-cardlist.rst</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/rcar-fdp1.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/rcar-fdp1.rst</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/saa7134-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/saa7134-cardlist.rst</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/saa7164-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/saa7164-cardlist.rst</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/tm6000-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/tm6000-cardlist.rst</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/tuner-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/tuner-cardlist.rst</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/v4l-drivers/usbvision-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/usbvision-cardlist.rst</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/media/videodev2.h.rst.exceptions?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/videodev2.h.rst.exceptions</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/memory-barriers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/memory-barriers.txt</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/memory-hotplug.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/memory-hotplug.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/module-signing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/module-signing.txt</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/mono.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/mono.txt</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/mtd/intel-spi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/mtd/intel-spi.txt</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/batman-adv.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/batman-adv.txt</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/cdc_mbim.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/cdc_mbim.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/dsa/dsa.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/dsa/dsa.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/networking/gtp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/gtp.txt</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/ieee802154.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/ieee802154.txt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/ip-sysctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/ip-sysctl.txt</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/kcm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/kcm.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/l2tp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/l2tp.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/mac80211_hwsim/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/mac80211_hwsim/README</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/mpls-sysctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/mpls-sysctl.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/netconsole.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/netconsole.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/netdev-FAQ.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/netdev-FAQ.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/networking/netfilter-sysctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/netfilter-sysctl.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/nf_conntrack-sysctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/nf_conntrack-sysctl.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/packet_mmap.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/packet_mmap.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/phy.txt</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/regulatory.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/regulatory.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/networking/seg6-sysctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/seg6-sysctl.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/stmmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/stmmac.txt</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/timestamping.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/timestamping.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/vortex.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/vortex.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/networking/vrf.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/vrf.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/oops-tracing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/oops-tracing.txt</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/parport.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/parport.txt</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/perf/qcom_l2_pmu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/perf/qcom_l2_pmu.txt</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/pinctrl.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/power/00-INDEX?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/00-INDEX</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/power/devices.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/devices.txt</a></td><td class='right'>704</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/power/freezing-of-tasks.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/freezing-of-tasks.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/power/notifiers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/notifiers.txt</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/power/opp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/opp.txt</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/power/pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/pci.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/power/pm_qos_interface.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/pm_qos_interface.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/power/runtime_pm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/runtime_pm.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/power/states.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/states.txt</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/power/swsusp-dmcrypt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/swsusp-dmcrypt.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/pps/pps.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/pps/pps.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/1.Intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/1.Intro.rst</a> (renamed from Documentation/development-process/1.Intro.rst)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/2.Process.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/2.Process.rst</a> (renamed from Documentation/development-process/2.Process.rst)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/3.Early-stage.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/3.Early-stage.rst</a> (renamed from Documentation/development-process/3.Early-stage.rst)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/4.Coding.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/4.Coding.rst</a> (renamed from Documentation/development-process/4.Coding.rst)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/5.Posting.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/5.Posting.rst</a> (renamed from Documentation/development-process/5.Posting.rst)</td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/6.Followthrough.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/6.Followthrough.rst</a> (renamed from Documentation/development-process/6.Followthrough.rst)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/7.AdvancedTopics.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/7.AdvancedTopics.rst</a> (renamed from Documentation/development-process/7.AdvancedTopics.rst)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/8.Conclusion.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/8.Conclusion.rst</a> (renamed from Documentation/development-process/8.Conclusion.rst)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/adding-syscalls.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/adding-syscalls.rst</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/applying-patches.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/applying-patches.rst</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/changes.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/changes.rst</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/code-of-conflict.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/code-of-conflict.rst</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/coding-style.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/coding-style.rst</a></td><td class='right'>1062</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/conf.py</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/development-process.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/development-process.rst</a> (renamed from Documentation/development-process/development-process.rst)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/email-clients.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/email-clients.rst</a> (renamed from Documentation/email-clients.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/howto.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/howto.rst</a></td><td class='right'>658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/index.rst</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/kernel-docs.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/kernel-docs.rst</a> (renamed from Documentation/kernel-docs.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/magic-number.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/magic-number.rst</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/management-style.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/management-style.rst</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/process/stable-api-nonsense.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/stable-api-nonsense.rst</a> (renamed from Documentation/stable_api_nonsense.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/stable-kernel-rules.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/stable-kernel-rules.rst</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/submit-checklist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/submit-checklist.rst</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/submitting-drivers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/submitting-drivers.rst</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/submitting-patches.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/submitting-patches.rst</a></td><td class='right'>836</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/process/volatile-considered-harmful.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/volatile-considered-harmful.rst</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/ramoops.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ramoops.txt</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/rfkill.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/rfkill.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/s390/Debugging390.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/s390/Debugging390.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/scheduler/completion.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scheduler/completion.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/scheduler/sched-deadline.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scheduler/sched-deadline.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/scheduler/sched-rt-group.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scheduler/sched-rt-group.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/scsi/ChangeLog.megaraid_sas?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scsi/ChangeLog.megaraid_sas</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/scsi/g_NCR5380.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scsi/g_NCR5380.txt</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/scsi/scsi-parameters.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scsi/scsi-parameters.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/scsi/scsi_mid_low_api.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scsi/scsi_mid_low_api.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/scsi/sym53c8xx_2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scsi/sym53c8xx_2.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/security/LSM.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/LSM.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/security/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/conf.py</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/security/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/index.rst</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/security/keys-trusted-encrypted.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/keys-trusted-encrypted.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/security/keys.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/keys.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/security/self-protection.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/self-protection.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/security/tpm/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/tpm/index.rst</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/security/tpm/tpm_vtpm_proxy.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/tpm/tpm_vtpm_proxy.rst</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/security/tpm/xen-tpmfront.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/tpm/xen-tpmfront.txt</a> (renamed from Documentation/tpm/xen-tpmfront.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/serial-console.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/serial-console.txt</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/siphash.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/siphash.txt</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/alsa-configuration.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa-configuration.rst</a></td><td class='right'>2683</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/ALSA-Configuration.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/ALSA-Configuration.txt</a></td><td class='right'>2330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.2%;'/><td class='none' style='width: 81.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/Audigy-mixer.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/Audigy-mixer.txt</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/Audiophile-Usb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/Audiophile-Usb.txt</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/Bt87x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/Bt87x.txt</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/CMIPCI.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/CMIPCI.txt</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/Channel-Mapping-API.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/Channel-Mapping-API.txt</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/ControlNames.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/ControlNames.txt</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/HD-Audio-Controls.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/HD-Audio-Controls.txt</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/HD-Audio-Models.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/HD-Audio-Models.txt</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/HD-Audio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/HD-Audio.txt</a></td><td class='right'>853</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.7%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/Jack-Controls.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/Jack-Controls.txt</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/Joystick.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/Joystick.txt</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/MIXART.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/MIXART.txt</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/OSS-Emulation.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/OSS-Emulation.txt</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/Procfile.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/Procfile.txt</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/README.maya44?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/README.maya44</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/SB-Live-mixer.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/SB-Live-mixer.txt</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/VIA82xx-mixer.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/VIA82xx-mixer.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/alsa-parameters.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/alsa-parameters.txt</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/compress_offload.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/compress_offload.txt</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/emu10k1-jack.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/emu10k1-jack.txt</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/hdspm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/hdspm.txt</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/img,spdif-in.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/img,spdif-in.txt</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/powersave.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/powersave.txt</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/seq_oss.html?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/seq_oss.html</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/serial-u16550.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/serial-u16550.txt</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/soc/DAI.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/soc/DAI.txt</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/soc/DPCM.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/soc/DPCM.txt</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/soc/clocking.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/soc/clocking.txt</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/soc/codec.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/soc/codec.txt</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/soc/dapm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/soc/dapm.txt</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/soc/jack.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/soc/jack.txt</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/soc/machine.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/soc/machine.txt</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/soc/overview.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/soc/overview.txt</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/soc/platform.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/soc/platform.txt</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/soc/pops_clicks.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/soc/pops_clicks.txt</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sound/alsa/timestamping.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa/timestamping.txt</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/audigy-mixer.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/audigy-mixer.rst</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/audiophile-usb.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/audiophile-usb.rst</a></td><td class='right'>550</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/bt87x.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/bt87x.rst</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/cmipci.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/cmipci.rst</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/emu10k1-jack.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/emu10k1-jack.rst</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/hdspm.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/hdspm.rst</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/img-spdif-in.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/img-spdif-in.rst</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/index.rst</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/joystick.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/joystick.rst</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/maya44.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/maya44.rst</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/mixart.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/mixart.rst</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/sb-live-mixer.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/sb-live-mixer.rst</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/serial-u16550.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/serial-u16550.rst</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/cards/via82xx-mixer.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/via82xx-mixer.rst</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/designs/channel-mapping-api.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/channel-mapping-api.rst</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/designs/compress-offload.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/compress-offload.rst</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/designs/control-names.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/control-names.rst</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/designs/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/index.rst</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/designs/jack-controls.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/jack-controls.rst</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/designs/oss-emulation.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/oss-emulation.rst</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/designs/powersave.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/powersave.rst</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/designs/procfile.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/procfile.rst</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/designs/seq-oss.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/seq-oss.rst</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/designs/timestamping.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/timestamping.rst</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/hd-audio/controls.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/hd-audio/controls.rst</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/hd-audio/dp-mst.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/hd-audio/dp-mst.rst</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/hd-audio/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/hd-audio/index.rst</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/hd-audio/models.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/hd-audio/models.rst</a></td><td class='right'>518</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/hd-audio/notes.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/hd-audio/notes.rst</a></td><td class='right'>880</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/index.rst</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/kernel-api/alsa-driver-api.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/kernel-api/alsa-driver-api.rst</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/kernel-api/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/kernel-api/index.rst</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/kernel-api/writing-an-alsa-driver.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/kernel-api/writing-an-alsa-driver.rst</a></td><td class='right'>4219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 32.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 67.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/sound/oss/oss-parameters.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/oss/oss-parameters.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/clocking.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/clocking.rst</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/codec-to-codec.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/codec-to-codec.rst</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/codec.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/codec.rst</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/dai.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/dai.rst</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/dapm.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/dapm.rst</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/dpcm.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/dpcm.rst</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/index.rst</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/jack.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/jack.rst</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/machine.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/machine.rst</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/overview.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/overview.rst</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/platform.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/platform.rst</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sound/soc/pops-clicks.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/pops-clicks.rst</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/sparc/console.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sparc/console.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/sphinx/kerneldoc.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sphinx/kerneldoc.py</a> (renamed from Documentation/sphinx/kernel-doc.py)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/Documentation/sphinx/parse-headers.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sphinx/parse-headers.pl</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/Documentation/sphinx/rstFlatTable.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sphinx/rstFlatTable.py</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/spi/ep93xx_spi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/spi/ep93xx_spi</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/stable_kernel_rules.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/stable_kernel_rules.txt</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/static-keys.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/static-keys.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/sync_file.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sync_file.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/sysctl/kernel.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sysctl/kernel.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/sysctl/net.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sysctl/net.txt</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/sysctl/vm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sysctl/vm.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sysfs-rules.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sysfs-rules.txt</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/sysrq.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sysrq.txt</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/thermal/nouveau_thermal?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/thermal/nouveau_thermal</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/timers/timer_stats.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/timers/timer_stats.txt</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/tpm/tpm_vtpm_proxy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/tpm/tpm_vtpm_proxy.txt</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/trace/events.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/events.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/trace/ftrace.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/ftrace.txt</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/trace/intel_th.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/intel_th.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/trace/postprocess/trace-vmscan-postprocess.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/postprocess/trace-vmscan-postprocess.pl</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/trace/stm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/stm.txt</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/trace/uprobetracer.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/uprobetracer.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/ja_JP/HOWTO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ja_JP/HOWTO</a></td><td class='right'>637</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/ja_JP/SubmitChecklist?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ja_JP/SubmitChecklist</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/ja_JP/SubmittingPatches?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ja_JP/SubmittingPatches</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/ja_JP/stable_api_nonsense.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ja_JP/stable_api_nonsense.txt</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/ja_JP/stable_kernel_rules.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ja_JP/stable_kernel_rules.txt</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/ko_KR/howto.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ko_KR/howto.rst</a></td><td class='right'>637</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/ko_KR/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ko_KR/index.rst</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/ko_KR/memory-barriers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ko_KR/memory-barriers.txt</a> (renamed from Documentation/ko_KR/memory-barriers.txt)</td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/ko_KR/stable_api_nonsense.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ko_KR/stable_api_nonsense.txt</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/zh_CN/HOWTO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/HOWTO</a></td><td class='right'>536</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/IRQ.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/IRQ.txt</a> (renamed from Documentation/zh_CN/IRQ.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/zh_CN/SecurityBugs?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/SecurityBugs</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/zh_CN/SubmittingDrivers?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/SubmittingDrivers</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/zh_CN/SubmittingPatches?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/SubmittingPatches</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/arm/Booting?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm/Booting</a> (renamed from Documentation/zh_CN/arm/Booting)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/arm/kernel_user_helpers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm/kernel_user_helpers.txt</a> (renamed from Documentation/zh_CN/arm/kernel_user_helpers.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/arm64/booting.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm64/booting.txt</a> (renamed from Documentation/zh_CN/arm64/booting.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/arm64/legacy_instructions.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm64/legacy_instructions.txt</a> (renamed from Documentation/zh_CN/arm64/legacy_instructions.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/arm64/memory.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm64/memory.txt</a> (renamed from Documentation/zh_CN/arm64/memory.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/arm64/silicon-errata.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm64/silicon-errata.txt</a> (renamed from Documentation/zh_CN/arm64/silicon-errata.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/arm64/tagged-pointers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm64/tagged-pointers.txt</a> (renamed from Documentation/zh_CN/arm64/tagged-pointers.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/basic_profiling.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/basic_profiling.txt</a> (renamed from Documentation/zh_CN/basic_profiling.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/zh_CN/coding-style.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/coding-style.rst</a></td><td class='right'>950</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/email-clients.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/email-clients.txt</a> (renamed from Documentation/zh_CN/email-clients.txt)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/filesystems/sysfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/filesystems/sysfs.txt</a> (renamed from Documentation/zh_CN/filesystems/sysfs.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/gpio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/gpio.txt</a> (renamed from Documentation/zh_CN/gpio.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/zh_CN/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/index.rst</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/io_ordering.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/io_ordering.txt</a> (renamed from Documentation/zh_CN/io_ordering.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/magic-number.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/magic-number.txt</a> (renamed from Documentation/zh_CN/magic-number.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/zh_CN/oops-tracing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/oops-tracing.txt</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/sparse.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/sparse.txt</a> (renamed from Documentation/zh_CN/sparse.txt)</td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/zh_CN/stable_api_nonsense.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/stable_api_nonsense.txt</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/zh_CN/stable_kernel_rules.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/stable_kernel_rules.txt</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/video4linux/omap3isp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/video4linux/omap3isp.txt</a> (renamed from Documentation/zh_CN/video4linux/omap3isp.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/video4linux/v4l2-framework.txt</a> (renamed from Documentation/zh_CN/video4linux/v4l2-framework.txt)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/translations/zh_CN/volatile-considered-harmful.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/volatile-considered-harmful.txt</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/unaligned-memory-access.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/unaligned-memory-access.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/unicode.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/unicode.txt</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/usb/gadget-testing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/usb/gadget-testing.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/usb/power-management.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/usb/power-management.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/vfio-mediated-device.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vfio-mediated-device.txt</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/virtual/kvm/00-INDEX?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/00-INDEX</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/virtual/kvm/api.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/api.txt</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/virtual/kvm/devices/arm-vgic-v3.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/devices/arm-vgic-v3.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/virtual/kvm/halt-polling.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/halt-polling.txt</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/virtual/kvm/hypercalls.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/hypercalls.txt</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/virtual/kvm/locking.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/locking.txt</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/virtual/kvm/msr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/msr.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/virtual/kvm/review-checklist.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/review-checklist.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/virtual/uml/UserModeLinux-HOWTO.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/uml/UserModeLinux-HOWTO.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/vm/ksm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vm/ksm.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/vm/numa?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vm/numa</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/vm/page_frags?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vm/page_frags</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/vm/transhuge.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vm/transhuge.txt</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/vm/userfaultfd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vm/userfaultfd.txt</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/vme_api.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vme_api.txt</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/volatile-considered-harmful.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/volatile-considered-harmful.txt</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/watchdog/convert_drivers_to_kernel_api.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/watchdog/convert_drivers_to_kernel_api.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/watchdog/watchdog-kernel-api.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/watchdog/watchdog-kernel-api.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/watchdog/watchdog-parameters.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/watchdog/watchdog-parameters.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/workqueue.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/workqueue.txt</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/x86/boot.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/x86/boot.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/Documentation/x86/intel_rdt_ui.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/x86/intel_rdt_ui.txt</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/x86/topology.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/x86/topology.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/x86/x86_64/boot-options.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/x86/x86_64/boot-options.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Documentation/x86/zero-page.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/x86/zero-page.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/zh_CN/CodingStyle?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/zh_CN/CodingStyle</a></td><td class='right'>813</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/zh_CN/HOWTO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/zh_CN/HOWTO</a></td><td class='right'>536</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/zh_CN/SecurityBugs?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/zh_CN/SecurityBugs</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/zh_CN/SubmittingDrivers?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/zh_CN/SubmittingDrivers</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/zh_CN/SubmittingPatches?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/zh_CN/SubmittingPatches</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/zh_CN/oops-tracing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/zh_CN/oops-tracing.txt</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/zh_CN/stable_api_nonsense.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/zh_CN/stable_api_nonsense.txt</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/zh_CN/stable_kernel_rules.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/zh_CN/stable_kernel_rules.txt</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/Documentation/zh_CN/volatile-considered-harmful.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/zh_CN/volatile-considered-harmful.txt</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/MAINTAINERS?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>MAINTAINERS</a></td><td class='right'>923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Makefile</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>README</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/REPORTING-BUGS?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>REPORTING-BUGS</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/Kconfig</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/boot/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/boot/misc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/include/asm/a.out-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/a.out-core.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/alpha/include/asm/current.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/current.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/alpha/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/mutex.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/osf_sys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/osf_sys.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/pci-noop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/pci-noop.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/pci_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/pci_iommu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/process.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/ptrace.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/signal.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/smp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/srm_env.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/srm_env.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/srmcons.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/srmcons.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/time.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/traps.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/lib/csum_partial_copy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/lib/csum_partial_copy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/math-emu/math.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/math-emu/math.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/mm/fault.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/alpha/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/mm/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/Kconfig</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/boot/dts/abilis_tb10x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/abilis_tb10x.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/boot/dts/axc003_idu.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/axc003_idu.dtsi</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/boot/dts/axs101.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/axs101.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/boot/dts/axs103_idu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/axs103_idu.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/arch/arc/boot/dts/haps_hs.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/haps_hs.dts</a> (renamed from arch/arc/boot/dts/zebu_hs.dts)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arc/boot/dts/haps_hs_idu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/haps_hs_idu.dts</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/boot/dts/nsim_hs_idu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/nsim_hs_idu.dts</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/boot/dts/nsimosci_hs_idu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/nsimosci_hs_idu.dts</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/boot/dts/vdk_axc003_idu.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/vdk_axc003_idu.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/boot/dts/vdk_axs10x_mb.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/vdk_axs10x_mb.dtsi</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arc/boot/dts/zebu_hs_idu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/zebu_hs_idu.dts</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/configs/axs101_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/axs101_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/configs/axs103_smp_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/axs103_smp_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arc/configs/haps_hs_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/haps_hs_defconfig</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arc/configs/haps_hs_smp_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/haps_hs_smp_defconfig</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/configs/nsimosci_hs_smp_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/nsimosci_hs_smp_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/configs/vdk_hs38_smp_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/vdk_hs38_smp_defconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arc/configs/zebu_hs_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/zebu_hs_defconfig</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arc/configs/zebu_hs_smp_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/zebu_hs_smp_defconfig</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/arcregs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/arcregs.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/cache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/cache.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/cacheflush.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/delay.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/delay.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/entry-arcv2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/entry-arcv2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/irq.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/irqflags-arcv2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/irqflags-arcv2.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/kprobes.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arc/include/asm/mcip.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/mcip.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/module.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/module.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arc/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/mutex.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/processor.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/ptrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/ptrace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/include/asm/setup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/setup.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/ctx_sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/ctx_sw.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/entry-arcv2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/entry-arcv2.S</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/entry-compact.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/entry-compact.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/head.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/intc-arcv2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/intc-arcv2.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/intc-compact.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/intc-compact.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/kgdb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/mcip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/mcip.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/module.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/setup.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/smp.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/stacktrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arc/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/time.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/traps.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/troubleshoot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/troubleshoot.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/unaligned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/unaligned.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/kernel/unwind.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/unwind.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/mm/cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/cache.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/mm/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/dma.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/extable.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/fault.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/init.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/mmap.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/mm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/tlb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/plat-axs10x/axs10x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/plat-axs10x/axs10x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/plat-eznps/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/plat-eznps/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/plat-eznps/include/plat/ctop.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/plat-eznps/include/plat/ctop.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arc/plat-sim/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/plat-sim/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/Kconfig-nommu?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/Kconfig-nommu</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/Kconfig.debug</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/compressed/decompress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/compressed/decompress.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/compressed/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/compressed/head.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/Makefile</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/alpine.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/alpine.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-baltos-ir2110.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-baltos-ir2110.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-baltos-ir3220.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-baltos-ir3220.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-baltos-ir5221.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-baltos-ir5221.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-baltos.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-baltos.dtsi</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-bone-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-bone-common.dtsi</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-boneblack-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-boneblack-common.dtsi</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-boneblack-wireless.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-boneblack-wireless.dts</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-boneblack.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-boneblack.dts</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-bonegreen-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-bonegreen-common.dtsi</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-bonegreen-wireless.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-bonegreen-wireless.dts</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-bonegreen.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-bonegreen.dts</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-chiliboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-chiliboard.dts</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-chilisom.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-chilisom.dtsi</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-evm.dts</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-evmsk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-evmsk.dts</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-icev2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-icev2.dts</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-nano.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-nano.dts</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-pcm-953.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-pcm-953.dtsi</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-phycore-rdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-phycore-rdk.dts</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-phycore-som.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-phycore-som.dtsi</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-sl50.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-sl50.dts</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am335x-wega.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-wega.dtsi</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am33xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am33xx.dtsi</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am3517.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am3517.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am4372.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am4372.dtsi</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am437x-gp-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am437x-gp-evm.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am437x-idk-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am437x-idk-evm.dts</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am437x-sk-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am437x-sk-evm.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am43x-epos-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am43x-epos-evm.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/am571x-idk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am571x-idk.dts</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am572x-idk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am572x-idk.dts</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am57xx-beagle-x15.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am57xx-beagle-x15.dts</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/am57xx-idk-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am57xx-idk-common.dtsi</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-db.dts</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370-dlink-dns327l.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-dlink-dns327l.dts</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370-mirabox.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-mirabox.dts</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370-netgear-rn102.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-netgear-rn102.dts</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370-netgear-rn104.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-netgear-rn104.dts</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370-rd.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-rd.dts</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370-synology-ds213j.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-synology-ds213j.dts</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370-xp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-xp.dtsi</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-370.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370.dtsi</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-375-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-375-db.dts</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-375.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-375.dtsi</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-380.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-380.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-385-linksys.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-385-linksys.dtsi</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-385-turris-omnia.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-385-turris-omnia.dts</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-385.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-385.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-388-clearfog-base.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-clearfog-base.dts</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-388-clearfog-pro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-clearfog-pro.dts</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-388-clearfog.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-clearfog.dts</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-388-clearfog.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-clearfog.dtsi</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-388-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-db.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-388-rd.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-rd.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-38x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-38x.dtsi</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-390-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-390-db.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-390.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-390.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-395.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-395.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-398-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-398-db.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-398.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-398.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-39x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-39x.dtsi</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-98dx3236.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-98dx3236.dtsi</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-98dx3336.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-98dx3336.dtsi</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-98dx4251.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-98dx4251.dtsi</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-axpwifiap.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-axpwifiap.dts</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-db-dxbc2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-db-dxbc2.dts</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-db.dts</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-gp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-gp.dts</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-linksys-mamba.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-linksys-mamba.dts</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-matrix.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-matrix.dts</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-mv78230.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-mv78230.dtsi</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-mv78260.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-mv78260.dtsi</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-mv78460.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-mv78460.dtsi</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-netgear-rn2120.dts</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp-synology-ds414.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-synology-ds414.dts</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/armada-xp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp.dtsi</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/artpec6-devboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/artpec6-devboard.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/artpec6.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/artpec6.dtsi</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/aspeed-ast2500-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/aspeed-ast2500-evb.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/aspeed-g4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/aspeed-g4.dtsi</a></td><td class='right'>776</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/aspeed-g5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/aspeed-g5.dtsi</a></td><td class='right'>879</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/at91-linea.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-linea.dtsi</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91-sama5d2_xplained.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-sama5d2_xplained.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91-sama5d4_xplained.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-sama5d4_xplained.dts</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/at91-tse850-3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-tse850-3.dts</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91rm9200.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91rm9200.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91sam9260.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9260.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91sam9260ek.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9260ek.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91sam9261.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9261.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91sam9263.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9263.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91sam9g45.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9g45.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91sam9n12.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9n12.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91sam9rl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9rl.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/at91sam9x5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9x5.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/axm55xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/axm55xx.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/axp223.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/axp223.dtsi</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm-cygnus.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm-cygnus.dtsi</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm-nsp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm-nsp.dtsi</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-a-plus.dts</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm2835-rpi-a.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-a.dts</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-b-plus.dts</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm2835-rpi-b.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-b.dts</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm2835-rpi-zero.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-zero.dts</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm2835-rpi.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi.dtsi</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm2835.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835.dtsi</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm2836-rpi-2-b.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2836-rpi-2-b.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm2836.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2836.dtsi</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm283x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm283x.dtsi</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4708-netgear-r6250.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-netgear-r6250.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4708.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm47081.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4709-netgear-r7000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709-netgear-r7000.dts</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4709-netgear-r8000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709-netgear-r8000.dts</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm4709.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709.dtsi</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm47094-netgear-r8500.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47094-netgear-r8500.dts</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm47094.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47094.dtsi</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm47189-tenda-ac9.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47189-tenda-ac9.dts</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm5301x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm5301x.dtsi</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm53573.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm53573.dtsi</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm94708.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm94708.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm94709.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm94709.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm953012er.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm953012er.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm953012k.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm953012k.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm958522er.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958522er.dts</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm958525er.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958525er.dts</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm958525xmc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958525xmc.dts</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm958622hr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958622hr.dts</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm958623hr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958623hr.dts</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm958625hr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958625hr.dts</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm958625k.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958625k.dts</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/bcm988312hr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm988312hr.dts</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/berlin2q-marvell-dmp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/berlin2q-marvell-dmp.dts</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/da850-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/da850-evm.dts</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/da850-lcdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/da850-lcdk.dts</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/da850-lego-ev3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/da850-lego-ev3.dts</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/da850.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/da850.dtsi</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/dm814x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dm814x.dtsi</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/dm816x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dm816x.dtsi</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/dove-cm-a510.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dove-cm-a510.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/dove-sbc-a510.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dove-sbc-a510.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/dra7-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra7-evm.dts</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/dra7.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra7.dtsi</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/dra71-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra71-evm.dts</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/dra72-evm-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra72-evm-common.dtsi</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/dra72-evm-revc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra72-evm-revc.dts</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/dra72-evm-tps65917.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra72-evm-tps65917.dtsi</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/dra72-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra72-evm.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/ecx-2000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ecx-2000.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/emev2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/emev2.dtsi</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos3250-artik5-eval.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250-artik5-eval.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos3250-artik5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250-artik5.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos3250-monk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250-monk.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos3250-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250-pinctrl.dtsi</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos3250-rinato.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250-rinato.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos3250.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250.dtsi</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4.dtsi</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4210-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4210-pinctrl.dtsi</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4210.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4210.dtsi</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4212.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4212.dtsi</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4412-itop-elite.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-itop-elite.dts</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi</a></td><td class='right'>501</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4412-odroid-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-odroid-common.dtsi</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4412-odroidu3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-odroidu3.dts</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4412-odroidx.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-odroidx.dts</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4412-odroidx2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-odroidx2.dts</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4412-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-pinctrl.dtsi</a></td><td class='right'>984</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4412-prime.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-prime.dtsi</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4412.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412.dtsi</a></td><td class='right'>578</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4415-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4415-pinctrl.dtsi</a></td><td class='right'>575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4415.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4415.dtsi</a></td><td class='right'>650</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4x12-pinctrl.dtsi</a></td><td class='right'>972</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.6%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos4x12.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4x12.dtsi</a></td><td class='right'>578</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5.dtsi</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5250-snow-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5250-snow-common.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5250.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5250.dtsi</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5260.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5260.dtsi</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5410-odroidxu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5410-odroidxu.dts</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5410-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5410-pinctrl.dtsi</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5410.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5410.dtsi</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5420-peach-pit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5420-peach-pit.dts</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5420.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5420.dtsi</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5440.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5440.dtsi</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos54xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos54xx.dtsi</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/exynos5800-peach-pi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5800-peach-pi.dts</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/hi3620.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/hi3620.dtsi</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/hip01.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/hip01.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/hisi-x5hd2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/hisi-x5hd2.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx1-ads.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx1-ads.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx1.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx1.dtsi</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx23.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx23.dtsi</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx25.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx25.dtsi</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx27-apf27dev.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-apf27dev.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx27-pdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-pdk.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx27.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx28-m28.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx28-m28.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx28-m28evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx28-m28evk.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx28.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx28.dtsi</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx31.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx31.dtsi</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx35.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx35.dtsi</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx50-evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx50-evk.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx50.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx50.dtsi</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx51-apf51dev.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx51-apf51dev.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx51-babbage.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx51-babbage.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx51.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx51.dtsi</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx53-m53.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-m53.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx53-m53evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-m53evk.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx53-qsb-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-qsb-common.dtsi</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx53-qsb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-qsb.dts</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx53-qsrb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-qsrb.dts</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx53-smd.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-smd.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx53-tqma53.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-tqma53.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx53-tx53.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-tx53.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx53.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53.dtsi</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-aristainetos2_4.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-aristainetos2_7.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-aristainetos_4.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-aristainetos_4.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-cubox-i.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-cubox-i.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-hummingboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-hummingboard.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-icore-rqs.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-icore-rqs.dts</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-icore.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-icore.dts</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-nit6xlite.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-nit6xlite.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-nitrogen6x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-nitrogen6x.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-riotboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-riotboard.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-sabrelite.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-sabrelite.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-savageboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-savageboard.dts</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-ts4900.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-ts4900.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl-tx6u-801x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-tx6u-801x.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6dl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-apalis-ixora.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-apalis-ixora.dts</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-b450v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-b450v3.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-b650v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-b650v3.dts</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-b850v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-b850v3.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-ba16.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-ba16.dtsi</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-bx50v3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-bx50v3.dtsi</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-cm-fx6.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-cm-fx6.dts</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-cubox-i.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-cubox-i.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-evi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-evi.dts</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-gw5400-a.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-gw5400-a.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-h100.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-h100.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-hummingboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-hummingboard.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-icore-rqs.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-icore-rqs.dts</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-icore.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-icore.dts</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-marsboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-marsboard.dts</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-mccmon6.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-mccmon6.dts</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-nitrogen6_max.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-nitrogen6_max.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-nitrogen6_som2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-nitrogen6_som2.dts</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-nitrogen6x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-nitrogen6x.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-novena.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-novena.dts</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-phytec-pbab01.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-phytec-pbab01.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-sabrelite.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-sabrelite.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-savageboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-savageboard.dts</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-ts4900.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-ts4900.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-tx6q-1010.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-tx6q-1010.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-tx6q-1020.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-tx6q-1020.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6q-utilite-pro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-utilite-pro.dts</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-apalis.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-apalis.dtsi</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-apf6dev.dtsi</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-aristainetos.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-colibri.dtsi</a></td><td class='right'>889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-cubox-i.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw51xx.dtsi</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw52xx.dtsi</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw53xx.dtsi</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw54xx.dtsi</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-gw551x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw551x.dtsi</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-gw552x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw552x.dtsi</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-gw553x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw553x.dtsi</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-hummingboard.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-icore.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-icore.dtsi</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-microsom.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-microsom.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi</a></td><td class='right'>767</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-rex.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-rex.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-sabreauto.dtsi</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-sabrelite.dtsi</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-sabresd.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-sabresd.dtsi</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-savageboard.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-savageboard.dtsi</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-ts4900.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-ts4900.dtsi</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-tx6.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-tx6.dtsi</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl-wandboard.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-wandboard.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qdl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl.dtsi</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6qp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qp.dtsi</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6sl-evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sl-evk.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6sl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sl.dtsi</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-nitrogen6sx.dts</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6sx-sdb-sai.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-sdb-sai.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6sx-sdb.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-sdb.dtsi</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-udoo-neo-full.dts</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-udoo-neo.dtsi</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6sx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx.dtsi</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-14x14-evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-14x14-evk.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-geam-kit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-geam-kit.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-geam.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-geam.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-isiot-emmc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-isiot-emmc.dts</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-isiot-nand.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-isiot-nand.dts</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-isiot.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-isiot.dtsi</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-liteboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-liteboard.dts</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-litesom.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-litesom.dtsi</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-opos6ul.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-opos6ul.dtsi</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-opos6uldev.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-opos6uldev.dts</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-pico-hobbit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-pico-hobbit.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul-tx6ul.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-tx6ul.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ul.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul.dtsi</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ull-14x14-evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ull-14x14-evk.dts</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ull-pinfunc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ull-pinfunc.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/imx6ull.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ull.dtsi</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx7-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7-colibri.dtsi</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx7d-cl-som-imx7.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7d-cl-som-imx7.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx7d-nitrogen7.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7d-nitrogen7.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx7d-pinfunc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7d-pinfunc.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx7d-sdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7d-sdb.dts</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx7s-warp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7s-warp.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/imx7s.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7s.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/integratorap.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/integratorap.dts</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/integratorcp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/integratorcp.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/keystone-k2e-netcp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2e-netcp.dtsi</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/keystone-k2e.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2e.dtsi</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/keystone-k2g.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2g.dtsi</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/keystone-k2hk-netcp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2hk-netcp.dtsi</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/keystone-k2hk.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2hk.dtsi</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/keystone-k2l-netcp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2l-netcp.dtsi</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/keystone-k2l.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2l.dtsi</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/keystone.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-dir665.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-dir665.dts</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-linkstation.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-linksys-viper.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linksys-viper.dts</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-rd88f6281-a.dts</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-rd88f6281.dtsi</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/kirkwood-topkick.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-topkick.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/lpc32xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/lpc32xx.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/ls1021a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ls1021a.dtsi</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mps2-an385.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mps2-an385.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mps2-an399.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mps2-an399.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mps2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mps2.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mt2701-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt2701-evb.dts</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mt2701.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt2701.dtsi</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mt6580.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt6580.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mt6589.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt6589.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mt7623-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt7623-evb.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mt7623.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt7623.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mt8127.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt8127.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mt8135.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt8135.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mvebu-linkstation-fan.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mvebu-linkstation-fan.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap2.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap2420.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap2420.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap2430.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap2430.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap3-beagle-xm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap3-beagle-xm.dts</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap3-igep.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap3-igep.dtsi</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap3-n900.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap3-n900.dts</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap3.dtsi</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap34xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap34xx.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap36xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap36xx.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/omap4-droid4-xt894.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap4-droid4-xt894.dts</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap4-panda-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap4-panda-common.dtsi</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap4.dtsi</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap5-igep0050.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap5-igep0050.dts</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap5-uevm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap5-uevm.dts</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/omap5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap5.dtsi</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/orion5x-kuroboxpro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-kuroboxpro.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/orion5x-linkstation-lschl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-linkstation-lschl.dts</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-linkstation-lsgl.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/orion5x-linkstation.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-linkstation.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/orion5x-lswsgl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-lswsgl.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/ox810se.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ox810se.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/ox820.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ox820.dtsi</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/pxa25x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/pxa25x.dtsi</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/pxa27x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/pxa27x.dtsi</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/pxa2xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/pxa2xx.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/pxa3xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/pxa3xx.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8060-dragonboard.dts</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064-ifc6410.dts</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-apq8064-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064-pins.dtsi</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-apq8064.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064.dtsi</a></td><td class='right'>612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-apq8084.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8084.dtsi</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-ipq8064.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-ipq8064.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-mdm9615.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-mdm9615.dtsi</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-msm8660-surf.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-msm8660-surf.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-msm8660.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-msm8660.dtsi</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/qcom-msm8974.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-msm8974.dtsi</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r7s72100-rskrza1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r7s72100-rskrza1.dts</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r7s72100.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r7s72100.dtsi</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a73a4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a73a4.dtsi</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7740.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7740.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7743-sk-rzg1m.dts</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7743.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7743.dtsi</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7745-sk-rzg1e.dts</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7745.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7745.dtsi</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7778.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7778.dtsi</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7779-marzen.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7779-marzen.dts</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7779.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7779.dtsi</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7790-lager.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7790-lager.dts</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7790.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7790.dtsi</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7791-koelsch.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7791-koelsch.dts</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7791.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7791.dtsi</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7792-wheat.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7792-wheat.dts</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7792.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7792.dtsi</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7793-gose.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7793-gose.dts</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7793.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7793.dtsi</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7794-alt.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7794-alt.dts</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/r8a7794.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7794.dtsi</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/rk1108-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk1108-evb.dts</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/rk1108.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk1108.dtsi</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3036-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3036-evb.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3036-kylin.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3036-kylin.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3036.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3036.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3066a-bqcurie2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3066a-bqcurie2.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3066a-marsboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3066a-marsboard.dts</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3066a-mk808.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3066a-mk808.dts</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3066a-rayeager.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3066a-rayeager.dts</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3066a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3066a.dtsi</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3188-px3-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3188-px3-evb.dts</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3188-radxarock.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3188-radxarock.dts</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3188.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3188.dtsi</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3228-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3228-evb.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3229-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3229-evb.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk322x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk322x.dtsi</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-evb-act8846.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-evb-act8846.dts</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-evb-rk808.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-evb-rk808.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-evb.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-evb.dtsi</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-fennec.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-fennec.dts</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-firefly-beta.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-firefly-beta.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-firefly-reload.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-firefly-reload.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-firefly.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-firefly.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-firefly.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-firefly.dtsi</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-miqi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-miqi.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-popmetal.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-popmetal.dts</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-r89.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-r89.dts</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-rock2-som.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-rock2-som.dtsi</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-rock2-square.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-rock2-square.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-veyron-brain.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-brain.dts</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-veyron-jaq.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-jaq.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-veyron-jerry.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-jerry.dts</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-veyron-mickey.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-mickey.dts</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-veyron-minnie.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-minnie.dts</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-veyron-pinky.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-pinky.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-veyron-speedy.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-speedy.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288-veyron.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron.dtsi</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3288.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288.dtsi</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/rk3xxx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3xxx.dtsi</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sama5d2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d2.dtsi</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sama5d3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d3.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/sama5d36ek_cmp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d36ek_cmp.dts</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sama5d3_uart.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d3_uart.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/sama5d3xcm_cmp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d3xcm_cmp.dtsi</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d3xmb_cmp.dtsi</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sama5d4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d4.dtsi</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sh73a0.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sh73a0.dtsi</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga.dtsi</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_arria10.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria10.dtsi</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria10_socdk.dtsi</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_arria5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria5.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_arria5_socdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria5_socdk.dts</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_socdk.dts</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_sockit.dts</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_cyclone5_socrates.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_socrates.dts</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_cyclone5_sodia.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_sodia.dts</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/spear13xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/spear13xx.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/ste-dbx5x0.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ste-dbx5x0.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/ste-href.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ste-href.dtsi</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/ste-hrefprev60.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ste-hrefprev60.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/ste-hrefv60plus.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ste-hrefv60plus.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/ste-snowball.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ste-snowball.dts</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stih407-clock.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih407-clock.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stih407-family.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih407-family.dtsi</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stih407-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih407-pinctrl.dtsi</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stih407.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih407.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stih410-b2120.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih410-b2120.dts</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stih410-b2260.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih410-b2260.dts</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stih410-clock.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih410-clock.dtsi</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stih410.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih410.dtsi</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih415-b2000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih415-b2000.dts</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih415-b2020.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih415-b2020.dts</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih415-clock.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih415-clock.dtsi</a></td><td class='right'>533</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih415-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih415-pinctrl.dtsi</a></td><td class='right'>545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih415.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih415.dtsi</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih416-b2000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih416-b2000.dts</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih416-b2020.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih416-b2020.dts</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih416-b2020e.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih416-b2020e.dts</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih416-clock.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih416-clock.dtsi</a></td><td class='right'>756</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih416-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih416-pinctrl.dtsi</a></td><td class='right'>692</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih416.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih416.dtsi</a></td><td class='right'>517</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih41x-b2000.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih41x-b2000.dtsi</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih41x-b2020.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih41x-b2020.dtsi</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih41x-b2020x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih41x-b2020x.dtsi</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/stih41x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih41x.dtsi</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stihxxx-b2120.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stihxxx-b2120.dtsi</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stm32429i-eval.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32429i-eval.dts</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/stm32746g-eval.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32746g-eval.dts</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stm32f429-disco.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32f429-disco.dts</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stm32f429.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32f429.dtsi</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/stm32f469-disco.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32f469-disco.dts</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/stm32f746.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32f746.dtsi</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-a1000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-a1000.dts</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-cubieboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-cubieboard.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-gemei-g9.dts</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-hackberry.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-hackberry.dts</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-inet1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-inet1.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-inet97fv2.dts</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-marsboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-marsboard.dts</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-mini-xplus.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-mk802.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-mk802.dts</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-pcduino.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-pcduino.dts</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-pcduino2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-pcduino2.dts</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun4i-a10.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10.dtsi</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a10s-mk802.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-mk802.dts</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a10s.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s.dtsi</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-hsg-h702.dts</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-licheepi-one.dts</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a13-olinuxino.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-olinuxino.dts</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-utoo-p66.dts</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-a13.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13.dtsi</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-gr8-chip-pro.dts</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-gr8-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-gr8-evb.dts</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-gr8.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-gr8.dtsi</a></td><td class='right'>645</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-r8-chip.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-r8-chip.dts</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-r8.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-r8.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun5i.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i.dtsi</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-app4-evb1.dts</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31-colombus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-colombus.dts</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31-hummingbird.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-hummingbird.dts</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31-i7.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-i7.dts</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31-m9.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-m9.dts</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31.dtsi</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31s-primo81.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31s-primo81.dts</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31s-sina31s.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31s-sina31s.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-a31s.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31s.dtsi</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-bananapi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-bananapi.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-bananapro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-bananapro.dts</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-cubieboard2.dts</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-cubietruck.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-cubietruck.dts</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-hummingbird.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-hummingbird.dts</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-itead-ibox.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-m3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-m3.dts</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-mk808c.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-mk808c.dts</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-orangepi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-orangepi.dts</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-pcduino3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-pcduino3.dts</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun7i-a20.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20.dtsi</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-a23-a33.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23-a33.dtsi</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-a23-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23-evb.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23-q8-tablet.dts</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-a23.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23.dtsi</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-a33-olinuxino.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a33-olinuxino.dts</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-a33.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a33.dtsi</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-a83t.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a83t.dtsi</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-beelink-x2.dts</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-nanopi.dtsi</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-2.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-one.dts</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-h3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3.dtsi</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-q8-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-q8-common.dtsi</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-r16-parrot.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-r16-parrot.dts</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/sun8i-v3s.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-v3s.dtsi</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun9i-a80-cubieboard4.dts</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun9i-a80-optimus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun9i-a80-optimus.dts</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sun9i-a80.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun9i-a80.dtsi</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/sunxi-common-regulators.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sunxi-common-regulators.dtsi</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tango4-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tango4-common.dtsi</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tango4-vantage-1172.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tango4-vantage-1172.dts</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tegra124-apalis-eval.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra124-apalis-eval.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tegra124-apalis.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra124-apalis.dtsi</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tegra124-nyan-big.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra124-nyan-big.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tegra124-nyan-blaze.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra124-nyan-blaze.dts</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tegra124-nyan.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra124-nyan.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tegra20-paz00.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra20-paz00.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tegra20-trimslice.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra20-trimslice.dts</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tegra20.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra20.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tegra30-apalis.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra30-apalis.dtsi</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tegra30-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra30-colibri.dtsi</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tegra30.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra30.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/tps65217.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tps65217.dtsi</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/boot/dts/uniphier-common32.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-common32.dtsi</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/uniphier-ld4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-ld4.dtsi</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/uniphier-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-pinctrl.dtsi</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/uniphier-pro4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-pro4.dtsi</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/uniphier-pro5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-pro5.dtsi</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/uniphier-pxs2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-pxs2.dtsi</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/uniphier-sld3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-sld3.dtsi</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/uniphier-sld8.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-sld8.dtsi</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf-colibri-eval-v3.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf-colibri.dtsi</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf500-colibri-eval-v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf500-colibri-eval-v3.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf500-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf500-colibri.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf500.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf500.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf610-colibri-eval-v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-colibri-eval-v3.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf610-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-colibri.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf610-twr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-twr.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-zii-dev-rev-b.dts</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-zii-dev-rev-c.dts</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/vf610-zii-dev.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-zii-dev.dtsi</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf610.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf610m4-colibri.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610m4-colibri.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf610m4-cosmic.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610m4-cosmic.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vf610m4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610m4.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/vfxxx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vfxxx.dtsi</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/zynq-7000.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-7000.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/boot/dts/zynq-microzed.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-microzed.dts</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/zynq-parallella.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-parallella.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/zynq-zc702.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-zc702.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/zynq-zc706.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-zc706.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/zynq-zed.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-zed.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/boot/dts/zynq-zybo.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-zybo.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/common/bL_switcher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/common/bL_switcher.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/common/bL_switcher_dummy_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/common/bL_switcher_dummy_if.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/common/dmabounce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/common/dmabounce.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/common/mcpm_entry.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/common/mcpm_entry.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/am200epdkit_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/am200epdkit_defconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/aspeed_g4_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/aspeed_g4_defconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/aspeed_g5_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/aspeed_g5_defconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/assabet_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/assabet_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/badge4_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/badge4_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/bcm2835_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/bcm2835_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/cerfcube_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/cerfcube_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/collie_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/collie_defconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/corgi_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/corgi_defconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/davinci_all_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/davinci_all_defconfig</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/configs/dram_0xc0000000.config?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/dram_0xc0000000.config</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/exynos_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/exynos_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/ezx_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/ezx_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/h3600_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/h3600_defconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/imote2_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/imote2_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/imx_v6_v7_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/imx_v6_v7_defconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/integrator_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/integrator_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/ixp4xx_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/ixp4xx_defconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/jornada720_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/jornada720_defconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/keystone_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/keystone_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/lart_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/lart_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/mainstone_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/mainstone_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/moxart_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/moxart_defconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/multi_v5_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/multi_v5_defconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/multi_v7_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/multi_v7_defconfig</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/mvebu_v5_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/mvebu_v5_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/netwinder_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/netwinder_defconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/omap1_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/omap1_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/omap2plus_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/omap2plus_defconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/pxa_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/pxa_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/qcom_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/qcom_defconfig</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/s3c2410_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/s3c2410_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/s5pv210_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/s5pv210_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/sama5_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/sama5_defconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/shannon_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/shannon_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/shmobile_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/shmobile_defconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/socfpga_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/socfpga_defconfig</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/spitz_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/spitz_defconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/stm32_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/stm32_defconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/sunxi_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/sunxi_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/configs/tango4_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/tango4_defconfig</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/tegra_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/tegra_defconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/u8500_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/u8500_defconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/configs/vf610m4_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/vf610m4_defconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/crypto/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/Kconfig</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/Makefile</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/crypto/aes-armv4.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-armv4.S</a></td><td class='right'>1089</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.5%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/crypto/aes-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-ce-core.S</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/crypto/aes-ce-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-ce-glue.c</a></td><td class='right'>402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/crypto/aes-cipher-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-cipher-core.S</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/crypto/aes-cipher-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-cipher-glue.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/crypto/aes-neonbs-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-neonbs-core.S</a></td><td class='right'>1023</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/crypto/aes-neonbs-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-neonbs-glue.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/crypto/aes_glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes_glue.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/crypto/aes_glue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes_glue.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/crypto/aesbs-core.S_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aesbs-core.S_shipped</a></td><td class='right'>2548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.9%;'/><td class='none' style='width: 80.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/crypto/aesbs-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aesbs-glue.c</a></td><td class='right'>443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/crypto/bsaes-armv7.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/bsaes-armv7.pl</a></td><td class='right'>2471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.3%;'/><td class='none' style='width: 80.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/crypto/chacha20-neon-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/chacha20-neon-core.S</a></td><td class='right'>523</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/crypto/chacha20-neon-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/chacha20-neon-glue.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/crypto/crc32-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/crc32-ce-core.S</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/crypto/crc32-ce-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/crc32-ce-glue.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/crypto/crct10dif-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/crct10dif-ce-core.S</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/crypto/crct10dif-ce-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/crct10dif-ce-glue.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/arch_gicv3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/arch_gicv3.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/cacheflush.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/cputype.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/cputype.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/delay.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/delay.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/device.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/dma-mapping.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/efi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/efi.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/ftrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/ftrace.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/hardware/cache-uniphier.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/hardware/cache-uniphier.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/kprobes.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/kvm_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/kvm_host.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/kvm_mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/kvm_mmu.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/include/asm/mach-types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/mach-types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/mach/flash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/mach/flash.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/memory.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/memory.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/mutex.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/pgtable-nommu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/pgtable-nommu.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/processor.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/tlb.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/tlbflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/tlbflush.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/include/asm/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/types.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/uaccess.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/unistd.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/virt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/virt.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/xen/hypercall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/xen/hypercall.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/xen/hypervisor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/xen/hypervisor.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/xen/interface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/xen/interface.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/xen/page-coherent.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/xen/page-coherent.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/asm/xen/page.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/xen/page.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/uapi/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/uapi/asm/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/uapi/asm/kvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/uapi/asm/kvm.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/include/uapi/asm/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/uapi/asm/types.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/include/uapi/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/uapi/asm/unistd.h</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/armksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/armksyms.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/kernel/calls.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/calls.S</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/entry-common.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/entry-common.S</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/head-nommu.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/head-nommu.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/hw_breakpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/hw_breakpoint.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/module.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/patch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/patch.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/perf_event_v6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/perf_event_v6.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/perf_event_v7.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/perf_event_v7.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/perf_event_xscale.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/perf_event_xscale.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/perf_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/perf_regs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/ptrace.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/setup.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/smccc-call.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/smccc-call.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/smp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/smp_tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/smp_tlb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/smp_twd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/smp_twd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/stacktrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/suspend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/suspend.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/swp_emulate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/swp_emulate.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/sys_oabi-compat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/sys_oabi-compat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/topology.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/traps.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/vmlinux.lds.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kvm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kvm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kvm/arm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/arm.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kvm/guest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/guest.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kvm/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/mmu.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/kvm/reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/reset.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/kvm/vgic-v3-coproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/vgic-v3-coproc.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/lib/delay-loop.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/lib/delay-loop.S</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/lib/getuser.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/lib/getuser.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-alpine/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-alpine/platsmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-artpec/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-artpec/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-aspeed/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-aspeed/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-at91/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-at91/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-at91/pm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-at91/pm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-axxia/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-axxia/platsmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-bcm/bcm63xx_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-bcm/bcm63xx_smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-bcm/bcm_5301x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-bcm/bcm_5301x.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-bcm/platsmp-brcmstb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-bcm/platsmp-brcmstb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-bcm/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-bcm/platsmp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-berlin/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-berlin/platsmp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/board-da830-evm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-da830-evm.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/board-da850-evm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-da850-evm.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/board-dm644x-evm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-dm644x-evm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/board-mityomapl138.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-mityomapl138.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/board-neuros-osd2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-neuros-osd2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/board-omapl138-hawk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-omapl138-hawk.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/clock.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/clock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/da830.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/da830.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/da850.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/da850.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/da8xx-dt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/da8xx-dt.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/devices-da8xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/devices-da8xx.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/devices.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/devices.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/dm355.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/dm355.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/dm365.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/dm365.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/include/mach/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/include/mach/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/include/mach/da8xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/include/mach/da8xx.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/mach-davinci/pdata-quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/pdata-quirks.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/pm.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-davinci/usb-da8xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/usb-da8xx.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ep93xx/edb93xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/edb93xx.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ep93xx/include/mach/uncompress.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/include/mach/uncompress.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ep93xx/simone.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/simone.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ep93xx/timer-ep93xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/timer-ep93xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ep93xx/ts72xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/ts72xx.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ep93xx/ts72xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/ts72xx.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ep93xx/vision_ep9307.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/vision_ep9307.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-exynos/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-exynos/exynos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/exynos.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-exynos/firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/firmware.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-exynos/mcpm-exynos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/mcpm-exynos.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-exynos/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/platsmp.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-exynos/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/pm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-exynos/suspend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/suspend.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-footbridge/dc21285-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-footbridge/dc21285-timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-hisi/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-hisi/core.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-hisi/platmcpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-hisi/platmcpm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-hisi/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-hisi/platsmp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/devices/platform-flexcan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/devices/platform-flexcan.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/gpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/gpc.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/imx31-dt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/imx31-dt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/mach-imx1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-imx1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/mach-imx6ul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-imx6ul.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/mach-mx27_3ds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-mx27_3ds.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/mach-mx31_3ds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-mx31_3ds.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/mach-mx35_3ds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-mx35_3ds.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/mach-pcm037.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-pcm037.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/mmdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mmdc.c</a></td><td class='right'>505</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/mx31moboard-marxbot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mx31moboard-marxbot.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/mx31moboard-smartbot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mx31moboard-smartbot.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/platsmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/pm-imx6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/pm-imx6.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-imx/src.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/src.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-integrator/impd1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-integrator/impd1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-integrator/integrator_ap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-integrator/integrator_ap.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-iop13xx/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-iop13xx/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ixp4xx/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ixp4xx/common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ixp4xx/dsmg600-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ixp4xx/dsmg600-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-keystone/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-keystone/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-lpc32xx/clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-lpc32xx/clock.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-lpc32xx/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-lpc32xx/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-lpc32xx/include/mach/irqs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-lpc32xx/include/mach/irqs.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-lpc32xx/phy3250.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-lpc32xx/phy3250.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-lpc32xx/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-lpc32xx/pm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-mediatek/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mediatek/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-mediatek/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mediatek/platsmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-mmp/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mmp/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-mv78xx0/pcie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mv78xx0/pcie.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-mvebu/coherency.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mvebu/coherency.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-mvebu/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mvebu/platsmp.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-mvebu/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mvebu/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-mvebu/pmsu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mvebu/pmsu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-mvebu/system-controller.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mvebu/system-controller.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap1/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap1/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/clock.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap1/clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/clock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap1/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/dma.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap1/i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/i2c.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap1/include/mach/usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/include/mach/usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap1/usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/usb.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/board-flash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/board-flash.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/board-flash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/board-flash.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/board-generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/board-generic.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/clock.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/clock.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/clockdomains7xx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/clockdomains7xx_data.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/common-board-devices.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/common-board-devices.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/common-board-devices.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/common-board-devices.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/common.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/control.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/control.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/cpuidle44xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/cpuidle44xx.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/devices.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/devices.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/display.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/display.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/display.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/dss-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/dss-common.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/dss-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/dss-common.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/gpio.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/gpmc-smsc911x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/gpmc-smsc911x.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/gpmc-smsc911x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/gpmc-smsc911x.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/hsmmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/hsmmc.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/i2c.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/id.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/id.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/msdi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/msdi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/mux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/mux.c</a></td><td class='right'>1153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/mux.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/mux.h</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/mux34xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/mux34xx.c</a></td><td class='right'>2061</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.1%;'/><td class='none' style='width: 83.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/mux34xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/mux34xx.h</a></td><td class='right'>402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap-mpuss-lowpower.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap-mpuss-lowpower.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap-smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap-smp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap4-sar-layout.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap4-sar-layout.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_33xx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_33xx_data.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_3xxx_data.c</a></td><td class='right'>787</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_43xx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_43xx_data.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_54xx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_54xx_data.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_7xx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_7xx_data.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_hwmod_common_data.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_common_data.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/omap_twl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_twl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/pdata-quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/pdata-quirks.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/pm-debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/pm-debug.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/pm.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/pm44xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/pm44xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/prcm43xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/prcm43xx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/prm_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/prm_common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/sdram-nokia.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/sdram-nokia.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/sdram-nokia.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/sdram-nokia.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/serial.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/timer.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/twl-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/twl-common.c</a></td><td class='right'>564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/twl-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/twl-common.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/usb-host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/usb-host.c</a></td><td class='right'>496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-omap2/usb-musb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/usb-musb.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-omap2/usb-tusb6010.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/usb-tusb6010.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-orion5x/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-orion5x/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-orion5x/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-orion5x/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-orion5x/ls-chl-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/ls-chl-setup.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-orion5x/ts78xx-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/ts78xx-setup.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-orion5x/wnr854t-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/wnr854t-setup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-orion5x/wrt350n-v2-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-oxnas/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-oxnas/Kconfig</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/mach-oxnas/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-oxnas/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/mach-oxnas/headsmp.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-oxnas/headsmp.S</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/mach-oxnas/hotplug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-oxnas/hotplug.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/mach-oxnas/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-oxnas/platsmp.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-prima2/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-prima2/platsmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-prima2/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-prima2/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/balloon3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/balloon3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/colibri-pxa270-income.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/colibri-pxa270-income.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/corgi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/corgi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/em-x270.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/em-x270.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/ezx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/ezx.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/generic.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/idp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/idp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/include/mach/hardware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/include/mach/hardware.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/mainstone.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/mainstone.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/mioa701.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/mioa701.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/palmz72.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/palmz72.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/pxa25x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/pxa25x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/pxa27x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/pxa27x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/pxa3xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/pxa3xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/pxa_cplds_irqs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/pxa_cplds_irqs.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/spitz.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/spitz.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/stargate2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/stargate2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/trizeps4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/trizeps4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/vpac270.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/vpac270.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/zeus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/zeus.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-pxa/zylonite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/zylonite.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-realview/platsmp-dt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-realview/platsmp-dt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-rockchip/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-rockchip/platsmp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-rockchip/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-rockchip/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-rockchip/rockchip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-rockchip/rockchip.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-rpc/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-rpc/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-rpc/ecard.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-rpc/ecard.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/bast-irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/bast-irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/common-smdk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/common-smdk.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/common.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/iotiming-s3c2410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/iotiming-s3c2410.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/mach-anubis.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-anubis.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/mach-at2440evb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-at2440evb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/mach-bast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-bast.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/mach-gta02.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-gta02.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/mach-jive.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-jive.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/mach-mini2440.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-mini2440.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/mach-osiris.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-osiris.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/mach-qt2410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-qt2410.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/mach-rx1950.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-rx1950.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/mach-rx3715.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-rx3715.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/mach-vstms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-vstms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/pm-s3c2410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/pm-s3c2410.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/pm-s3c2412.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/pm-s3c2412.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c24xx/pm-s3c2416.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/pm-s3c2416.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c64xx/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/common.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c64xx/dev-audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/dev-audio.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c64xx/mach-hmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/mach-hmt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c64xx/mach-mini6410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/mach-mini6410.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c64xx/mach-real6410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/mach-real6410.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c64xx/pl080.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/pl080.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s3c64xx/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/pm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s5pv210/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s5pv210/pm.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-s5pv210/regs-clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s5pv210/regs-clock.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-sa1100/generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sa1100/generic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-sa1100/include/mach/SA-1101.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sa1100/include/mach/SA-1101.h</a></td><td class='right'>925</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.2%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-sa1100/include/mach/hardware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sa1100/include/mach/hardware.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-sa1100/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sa1100/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-shmobile/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-shmobile/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-shmobile/platsmp-apmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/platsmp-apmu.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-shmobile/platsmp-scu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/platsmp-scu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-shmobile/pm-rcar-gen2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/pm-rcar-gen2.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-shmobile/rcar-gen2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/rcar-gen2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-shmobile/setup-r8a7778.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/setup-r8a7778.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-shmobile/setup-r8a7779.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/setup-r8a7779.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-shmobile/setup-r8a7792.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/setup-r8a7792.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-shmobile/setup-r8a7793.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/setup-r8a7793.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-shmobile/setup-r8a7794.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/setup-r8a7794.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-shmobile/setup-rcar-gen2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/setup-rcar-gen2.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-shmobile/smp-r8a7791.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/smp-r8a7791.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-socfpga/l2_cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-socfpga/l2_cache.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-socfpga/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-socfpga/platsmp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-spear/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-spear/platsmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-spear/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-spear/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-sti/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sti/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-sti/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sti/platsmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-stm32/board-dt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-stm32/board-dt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-sunxi/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sunxi/platsmp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-sunxi/sunxi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sunxi/sunxi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-tango/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-tango/platsmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-tango/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-tango/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-tegra/board-paz00.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-tegra/board-paz00.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-tegra/reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-tegra/reset.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ux500/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-ux500/board-mop500-audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/board-mop500-audio.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-ux500/board-mop500.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/board-mop500.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ux500/cpu-db8500.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/cpu-db8500.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-ux500/hotplug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/hotplug.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ux500/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/platsmp.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-ux500/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/pm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-ux500/setup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/setup.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/mach-ux500/ste-dma40-db8500.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/ste-dma40-db8500.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-vexpress/dcscb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-vexpress/dcscb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-vexpress/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-vexpress/platsmp.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-vexpress/tc2_pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-vexpress/tc2_pm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-zx/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-zx/platsmp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-zx/zx296702-pm-domain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-zx/zx296702-pm-domain.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-zynq/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-zynq/common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mach-zynq/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-zynq/platsmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/Kconfig</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/alignment.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/alignment.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/cache-l2x0-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/cache-l2x0-pmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/cache-l2x0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/cache-l2x0.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/cache-uniphier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/cache-uniphier.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/cache-v7.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/cache-v7.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/cache-v7m.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/cache-v7m.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/dma-mapping.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/dump.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/extable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/fault.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/fault.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/fault.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/flush.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/flush.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/idmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/idmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/init.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/mmap.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/mmu.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/nommu.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/mm/pageattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/pageattr.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/mm/physaddr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/physaddr.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/nwfpe/fpmodule.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/nwfpe/fpmodule.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/plat-iop/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-iop/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/plat-omap/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-omap/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/plat-omap/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-omap/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm/plat-omap/i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-omap/i2c.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/plat-orion/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-orion/common.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/plat-orion/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-orion/gpio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/plat-orion/include/plat/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-orion/include/plat/common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/plat-samsung/devs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-samsung/devs.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/plat-samsung/include/plat/gpio-cfg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-samsung/include/plat/gpio-cfg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/plat-samsung/include/plat/wakeup-mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-samsung/include/plat/wakeup-mask.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/plat-samsung/wakeup-mask.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-samsung/wakeup-mask.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/probes/decode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/probes/decode.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/probes/kprobes/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/probes/kprobes/core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/probes/kprobes/test-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/probes/kprobes/test-core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/tools/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/Makefile</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/tools/mach-types?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/mach-types</a></td><td class='right'>516</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/tools/syscall.tbl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/syscall.tbl</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/tools/syscallhdr.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/syscallhdr.sh</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/tools/syscallnr.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/syscallnr.sh</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm/tools/syscalltbl.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/syscalltbl.sh</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/vfp/vfp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/vfp/vfp.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/vfp/vfpmodule.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/vfp/vfpmodule.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/xen/enlighten.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/xen/enlighten.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/xen/hypercall.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/xen/hypercall.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm/xen/mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/xen/mm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/Kconfig</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/Kconfig.debug</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/Kconfig.platforms?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/Kconfig.platforms</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/allwinner/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/allwinner/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gx.dtsi</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi</a></td><td class='right'>997</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl.dtsi</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxm.dtsi</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/arm/juno-base.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-base.dtsi</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/arm/juno-clocks.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-clocks.dtsi</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/arm/juno-motherboard.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-motherboard.dtsi</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/arm/juno-r1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-r1.dts</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/arm/juno-r2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-r2.dts</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/arm/juno.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno.dts</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/broadcom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/broadcom/bcm2837.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/bcm2837.dtsi</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>l---------</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/broadcom/ns2-svk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/ns2-svk.dts</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/broadcom/ns2-xmc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/ns2-xmc.dts</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/broadcom/ns2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/ns2.dtsi</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi</a></td><td class='right'>793</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi</a></td><td class='right'>1191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tm2.dts</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos5433.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433.dtsi</a></td><td class='right'>1561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos7-espresso.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos7-espresso.dts</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/exynos/exynos7.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos7.dtsi</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi</a></td><td class='right'>595</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/hisilicon/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/hisilicon/hi3660.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hi3660.dtsi</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/hisilicon/hi6220.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hi6220.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/hisilicon/hip06-d03.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hip06-d03.dts</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/hisilicon/hip06.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hip06.dtsi</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/hisilicon/hip07-d05.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hip07-d05.dts</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/hisilicon/hip07.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hip07.dtsi</a></td><td class='right'>1059</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/armada-371x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-371x.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/armada-3720-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-3720-db.dts</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/armada-372x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-372x.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/armada-37xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-37xx.dtsi</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/armada-ap806.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-ap806.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/berlin4ct-stb.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/marvell/berlin4ct.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/berlin4ct.dtsi</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/mediatek/mt8173-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/mediatek/mt8173-evb.dts</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/mediatek/mt8173.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/mediatek/mt8173.dtsi</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/nvidia/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/nvidia/tegra186.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra186.dtsi</a></td><td class='right'>402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra210-smaug.dts</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/nvidia/tegra210.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra210.dtsi</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8916-pins.dtsi</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/msm8916.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8916.dtsi</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8992-pins.dtsi</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/msm8992.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8992.dtsi</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/msm8994-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8994-pins.dtsi</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/msm8994.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8994.dtsi</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/msm8996.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8996.dtsi</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/pm8916.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/pm8916.dtsi</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/qcom/pm8994.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/pm8994.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/renesas/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/renesas/r8a7795.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7795.dtsi</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/renesas/r8a7796.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7796.dtsi</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/rockchip/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/rockchip/rk3368-r88.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368-r88.dts</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/rockchip/rk3368.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368.dtsi</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/rockchip/rk3399-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3399-evb.dts</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/rockchip/rk3399.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3399.dtsi</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/xilinx/zynqmp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/xilinx/zynqmp.dtsi</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/boot/dts/zte/zx296718.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/zte/zx296718.dtsi</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/configs/defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/configs/defconfig</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/Kconfig</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/Makefile</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/aes-ce-ccm-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-ce-ccm-core.S</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/aes-ce-ccm-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-ce-ccm-glue.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/aes-ce-cipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-ce-cipher.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/aes-ce.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-ce.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/aes-cipher-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-cipher-core.S</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/aes-cipher-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-cipher-glue.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/aes-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-glue.c</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/aes-modes.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-modes.S</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/aes-neon.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-neon.S</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/aes-neonbs-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-neonbs-core.S</a></td><td class='right'>972</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/aes-neonbs-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-neonbs-glue.c</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/chacha20-neon-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/chacha20-neon-core.S</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/chacha20-neon-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/chacha20-neon-glue.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm64/crypto/crc32-arm64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/crc32-arm64.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/crc32-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/crc32-ce-core.S</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/crc32-ce-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/crc32-ce-glue.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/crct10dif-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/crct10dif-ce-core.S</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/crct10dif-ce-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/crct10dif-ce-glue.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/ghash-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/ghash-ce-core.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/sha1-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha1-ce-core.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/crypto/sha2-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha2-ce-core.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/sha256-core.S_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha256-core.S_shipped</a></td><td class='right'>2061</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/sha256-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha256-glue.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/sha512-armv8.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha512-armv8.pl</a></td><td class='right'>778</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/sha512-core.S_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha512-core.S_shipped</a></td><td class='right'>1085</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/crypto/sha512-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha512-glue.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/acpi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/acpi.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/arch_gicv3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/arch_gicv3.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/arch_timer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/arch_timer.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/include/asm/asm-uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/asm-uaccess.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/assembler.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/assembler.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/cacheflush.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/compat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/compat.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/cpucaps.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/cpucaps.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/cpufeature.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/cpufeature.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/cputype.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/cputype.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/include/asm/current.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/current.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/debug-monitors.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/debug-monitors.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/device.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/dma-mapping.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/efi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/efi.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/elf.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/futex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/futex.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/hw_breakpoint.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/hw_breakpoint.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/insn.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/insn.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/kernel-pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/kernel-pgtable.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/kprobes.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/kvm_arm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/kvm_arm.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/kvm_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/kvm_host.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/kvm_mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/kvm_mmu.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/lse.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/lse.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/memory.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/memory.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/mmu.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/mmu_context.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/neon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/neon.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/numa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/numa.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/arm64/include/asm/opcodes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/opcodes.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/percpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/percpu.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/perf_event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/perf_event.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/pgtable.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/probes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/probes.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/processor.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/ptdump.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/ptdump.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/ptrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/ptrace.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/smp.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/include/asm/stack_pointer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/stack_pointer.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/suspend.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/suspend.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/sysreg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/sysreg.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/thread_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/thread_info.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/tlbflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/tlbflush.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/uaccess.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/include/asm/uprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/uprobes.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/virt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/virt.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/word-at-a-time.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/word-at-a-time.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/xen/hypercall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/xen/hypercall.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/xen/hypervisor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/xen/hypervisor.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/xen/interface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/xen/interface.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/xen/page-coherent.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/xen/page-coherent.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/asm/xen/page.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/xen/page.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/uapi/asm/hwcap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/uapi/asm/hwcap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/uapi/asm/kvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/uapi/asm/kvm.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/include/uapi/asm/ptrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/uapi/asm/ptrace.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/acpi.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/acpi_parking_protocol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/acpi_parking_protocol.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/arm64ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/arm64ksyms.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/armv8_deprecated.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/armv8_deprecated.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/asm-offsets.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/cacheinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/cacheinfo.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/cpu-reset.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/cpu-reset.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/cpu_errata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/cpu_errata.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/cpufeature.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/cpufeature.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/cpuinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/cpuinfo.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/debug-monitors.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/debug-monitors.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/efi-entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/efi-entry.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/efi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/efi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/entry-ftrace.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/entry-ftrace.S</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/entry.S</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/fpsimd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/fpsimd.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/head.S</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/hibernate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/hibernate.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/hw_breakpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/hw_breakpoint.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/insn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/insn.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/kgdb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/pci.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/perf_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/perf_regs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/probes/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/probes/decode-insn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/decode-insn.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/probes/decode-insn.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/decode-insn.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/probes/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/kprobes.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/probes/simulate-insn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/simulate-insn.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/kernel/probes/uprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/uprobes.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/process.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/psci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/psci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/ptrace.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/return_address.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/return_address.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/setup.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/signal.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/signal32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/signal32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/sleep.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/sleep.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/smccc-call.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/smccc-call.S</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/smp.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/smp_spin_table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/smp_spin_table.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/stacktrace.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/suspend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/suspend.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/sys_compat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/sys_compat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/topology.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/traps.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/vdso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/vdso.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/vmlinux.lds.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/debug.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/guest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/guest.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/handle_exit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/handle_exit.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/hyp/debug-sr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/hyp/debug-sr.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/hyp/hyp-entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/hyp/hyp-entry.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/hyp/switch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/hyp/switch.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/hyp/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/hyp/tlb.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/reset.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/sys_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/sys_regs.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/kvm/sys_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/sys_regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/kvm/vgic-sys-reg-v3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/vgic-sys-reg-v3.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/lib/clear_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/lib/clear_user.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/lib/copy_from_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/lib/copy_from_user.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/lib/copy_in_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/lib/copy_in_user.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/lib/copy_template.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/lib/copy_template.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/lib/copy_to_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/lib/copy_to_user.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/cache.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/cache.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/context.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/dma-mapping.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/dump.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/fault.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/flush.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/flush.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/hugetlbpage.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/init.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/ioremap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/ioremap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/kasan_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/kasan_init.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/mmap.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/mmu.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/numa.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/mm/physaddr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/physaddr.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/mm/proc.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/proc.S</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/arm64/mm/ptdump_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/ptdump_debugfs.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/net/bpf_jit_comp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/net/bpf_jit_comp.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/arm64/xen/hypercall.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/xen/hypercall.S</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/asm/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/asm/kprobes.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/avr32/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/asm/mutex.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/include/uapi/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/uapi/asm/unistd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/kernel/avr32_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/avr32_ksyms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/kernel/nmi_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/nmi_debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/ptrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/stacktrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/kernel/syscall_table.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/syscall_table.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/traps.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/mach-at32ap/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/mach-at32ap/clock.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/mach-at32ap/pio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/mach-at32ap/pio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/mm/cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/mm/cache.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/avr32/mm/dma-coherent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/mm/dma-coherent.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/include/asm/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/blackfin/include/asm/vga.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/include/asm/vga.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/bfin_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/bfin_dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/dma-mapping.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/dumpstack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/dumpstack.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/early_printk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/early_printk.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/flat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/flat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/kgdb_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/kgdb_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/module.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/nmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/nmi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/perf_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/perf_event.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/process.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/ptrace.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/stacktrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/time-ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/time-ts.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/trace.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/traps.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/mach-bf561/coreb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/mach-bf561/coreb.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/mach-common/ints-priority.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/mach-common/ints-priority.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/mach-common/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/mach-common/smp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/mm/isram-driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/mm/isram-driver.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/blackfin/mm/sram-alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/mm/sram-alloc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/c6x/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/include/asm/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/c6x/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/c6x/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/include/asm/mutex.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/c6x/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/c6x/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/kernel/dma.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/c6x/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/kernel/process.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/c6x/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/c6x/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/c6x/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/c6x/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/mm/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v10/drivers/eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/drivers/eeprom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v10/drivers/sync_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/drivers/sync_serial.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v10/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/kernel/process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v10/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/kernel/ptrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v10/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/kernel/signal.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v10/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/kernel/traps.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v10/lib/usercopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/lib/usercopy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v10/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/mm/fault.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v10/mm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/mm/tlb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v32/drivers/cryptocop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/drivers/cryptocop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v32/drivers/pci/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/drivers/pci/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v32/drivers/sync_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/drivers/sync_serial.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v32/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/kernel/process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v32/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/kernel/ptrace.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v32/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/kernel/signal.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v32/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/kernel/traps.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v32/lib/usercopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/lib/usercopy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/arch-v32/mm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/mm/tlb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/boot/compressed/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/boot/compressed/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/boot/rescue/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/boot/rescue/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/include/asm/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/cris/include/asm/current.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/include/asm/current.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/include/asm/dma-mapping.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/cris/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/include/asm/mutex.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/include/asm/pgtable.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/kernel/crisksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/crisksyms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/kernel/profile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/profile.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/ptrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/stacktrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/kernel/sys_cris.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/sys_cris.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/traps.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/mm/fault.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/cris/mm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/mm/tlb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/asm/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/include/asm/atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/asm/atomic.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/include/asm/futex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/asm/futex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/frv/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/asm/mutex.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/kernel/pm-mb93093.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/pm-mb93093.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/kernel/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/process.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/ptrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/kernel/sys_frv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/sys_frv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/kernel/sysctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/sysctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/traps.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/kernel/uaccess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/uaccess.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/mb93090-mb00/pci-dma-nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mb93090-mb00/pci-dma-nommu.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/mb93090-mb00/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mb93090-mb00/pci-dma.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/mb93090-mb00/pci-frv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mb93090-mb00/pci-frv.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/mm/dma-alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mm/dma-alloc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/mm/elf-fdpic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mm/elf-fdpic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mm/extable.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mm/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/frv/mm/mmu-context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mm/mmu-context.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/h8300/boot/compressed/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/boot/compressed/misc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/h8300/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/include/asm/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/h8300/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/h8300/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/include/asm/mutex.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/h8300/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/h8300/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/kernel/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/h8300/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/kernel/process.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/h8300/kernel/ptrace_s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/kernel/ptrace_s.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/h8300/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/kernel/signal.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/h8300/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/kernel/traps.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/include/asm/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/include/asm/dma-mapping.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/hexagon/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/include/asm/mutex.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/dma.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/kernel/hexagon_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/hexagon_ksyms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/kgdb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/signal.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/smp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/stacktrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/traps.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/kernel/vm_events.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/vm_events.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/mm/uaccess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/mm/uaccess.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/hexagon/mm/vm_fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/mm/vm_fault.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/hp/common/hwsw_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/hp/common/hwsw_iommu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/hp/common/sba_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/hp/common/sba_iommu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/hp/sim/simserial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/hp/sim/simserial.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/asm/cputime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/cputime.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/dma-mapping.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/ia64/include/asm/exception.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/exception.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/kprobes.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/asm/machvec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/machvec.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/ia64/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/mutex.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/asm/numa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/numa.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/pgtable.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/processor.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/asm/thread_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/thread_info.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/tlb.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/uaccess.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/acpi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/asm-offsets.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/brl_emu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/brl_emu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/crash_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/crash_dump.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/cyclone.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/cyclone.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/dma-mapping.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/entry.S</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/err_inject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/err_inject.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/fsyscall_gtod_data.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/fsyscall_gtod_data.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/head.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/init_task.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/init_task.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/kprobes.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/mca.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/mca.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/palinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/palinfo.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/pci-dma.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/pci-swiotlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/pci-swiotlb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/perfmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/perfmon.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/process.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/ptrace.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/salinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/salinfo.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/setup.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/sys_ia64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/sys_ia64.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/time.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/topology.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/traps.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/unaligned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/unaligned.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/uncached.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/uncached.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/kernel/unwind.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/unwind.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/lib/csum_partial_copy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/lib/csum_partial_copy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/mm/extable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/mm/fault.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/mm/init.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/sn/kernel/sn2/sn2_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/sn/kernel/sn2/sn2_smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/sn/kernel/sn2/sn_hwperf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/sn/kernel/sn2/sn_hwperf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/sn/kernel/sn2/sn_proc_fs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/sn/kernel/sn2/sn_proc_fs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/sn/kernel/sn2/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/sn/kernel/sn2/timer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/ia64/sn/kernel/tiocx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/sn/kernel/tiocx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/include/asm/cmpxchg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/cmpxchg.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/m32r/include/asm/current.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/current.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/device.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/m32r/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/dma-mapping.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/m32r/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/mutex.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/kernel/align.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/align.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/kernel/m32r_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/m32r_ksyms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/process.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/ptrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/kernel/smpboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/smpboot.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/kernel/sys_m32r.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/sys_m32r.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/traps.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/lib/csum_partial_copy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/lib/csum_partial_copy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/lib/usercopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/lib/usercopy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/mm/extable.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/mm/fault-nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/mm/fault-nommu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/mm/fault.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m32r/platforms/m32700ut/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/platforms/m32700ut/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/68000/bootlogo-vz.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/bootlogo-vz.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/68000/bootlogo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/bootlogo.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/68000/m68328.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/m68328.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/68000/m68EZ328.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/m68EZ328.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/68000/m68VZ328.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/m68VZ328.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/68000/timers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/timers.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/Kconfig.machine?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/Kconfig.machine</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/amiga/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/amiga/config.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/atari/atakeyb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/atari/atakeyb.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/atari/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/atari/config.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/bvme6000/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/bvme6000/config.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/bvme6000/rtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/bvme6000/rtc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/m68k/coldfire/amcore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/amcore.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/device.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/dma_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/dma_timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m5206.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m5206.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m520x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m520x.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m523x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m523x.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m5249.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m5249.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m525x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m525x.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m527x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m527x.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m528x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m528x.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m5307.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m5307.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m53xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m53xx.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m5407.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m5407.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m5441x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m5441x.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/m54xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m54xx.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/pit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/pit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/sltimers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/sltimers.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/coldfire/timers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/timers.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/m68k/configs/amcore_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/amcore_defconfig</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/amiga_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/amiga_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/apollo_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/apollo_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/atari_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/atari_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/bvme6000_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/bvme6000_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/hp300_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/hp300_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/mac_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/mac_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/multi_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/multi_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/mvme147_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/mvme147_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/mvme16x_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/mvme16x_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/q40_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/q40_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/sun3_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/sun3_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/configs/sun3x_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/sun3x_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/emu/nfeth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/emu/nfeth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/ifpsp060/src/isp.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/ifpsp060/src/isp.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/MC68328.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/MC68328.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/MC68EZ328.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/MC68EZ328.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/MC68VZ328.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/MC68VZ328.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/a.out-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/a.out-core.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/bug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/bug.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/floppy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/floppy.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/m5206sim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m5206sim.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/m520xsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m520xsim.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/m523xsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m523xsim.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/m527xsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m527xsim.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/m528xsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m528xsim.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/m5307sim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m5307sim.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/m53xxsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m53xxsim.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/m5407sim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m5407sim.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/m54xxsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m54xxsim.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/macintosh.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/macintosh.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/macints.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/macints.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/math-emu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/math-emu.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/natfeat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/natfeat.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/sun3_pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/sun3_pgtable.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/include/asm/sun3xflop.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/sun3xflop.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/dma.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/module.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/process.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/ptrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/signal.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/kernel/sys_m68k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/sys_m68k.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/traps.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/kernel/uboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/uboot.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/lib/ashldi3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/lib/ashldi3.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/lib/ashrdi3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/lib/ashrdi3.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/lib/lshrdi3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/lib/lshrdi3.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/lib/muldi3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/lib/muldi3.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/lib/uaccess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/lib/uaccess.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mac/baboon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/baboon.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mac/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/config.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mac/macints.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/macints.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mac/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/misc.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mac/oss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/oss.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mac/psc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/psc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mac/via.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/via.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mm/init.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mm/memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mm/memory.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mm/motorola.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mm/motorola.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mm/sun3kmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mm/sun3kmap.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mm/sun3mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mm/sun3mmu.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mvme147/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mvme147/config.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mvme16x/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mvme16x/config.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/mvme16x/rtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mvme16x/rtc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/q40/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/q40/config.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/q40/q40ints.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/q40/q40ints.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/sun3/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/config.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/sun3/dvma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/dvma.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/sun3/idprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/idprom.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/sun3/mmu_emu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/mmu_emu.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/sun3/prom/printf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/prom/printf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/sun3/sun3dvma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/sun3dvma.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/sun3x/dvma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3x/dvma.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/m68k/sun3x/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3x/prom.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/include/asm/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/include/asm/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/dma.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/kernel/perf/perf_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/perf/perf_event.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/ptrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/smp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/stacktrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/traps.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/mm/extable.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/mm/fault.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/metag/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/mm/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/include/asm/irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/irq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/include/asm/mmu_context_mm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/mmu_context_mm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/microblaze/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/mutex.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/include/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/unistd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/include/uapi/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/uapi/asm/unistd.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/cpu/cpuinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/cpu/cpuinfo.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/dma.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/exceptions.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/exceptions.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/heartbeat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/heartbeat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/microblaze/kernel/intc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/intc.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/syscall_table.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/syscall_table.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/timer.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/kernel/unwind.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/unwind.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/mm/fault.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/mm/pgtable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/microblaze/pci/pci-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/pci/pci-common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/Kconfig</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/Makefile</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/mips/Makefile.postlink?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/Makefile.postlink</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/alchemy/board-gpr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/board-gpr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/alchemy/common/dbdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/dbdma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/alchemy/common/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/alchemy/common/gpiolib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/gpiolib.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/alchemy/common/power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/power.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/alchemy/common/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/alchemy/common/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/alchemy/common/usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/usb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/alchemy/common/vss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/vss.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/alchemy/devboards/bcsr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/devboards/bcsr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/alchemy/devboards/db1300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/devboards/db1300.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ar7/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ar7/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ar7/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ar7/gpio.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ar7/memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ar7/memory.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ar7/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ar7/platform.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ar7/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ar7/prom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ath79/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ath79/clock.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ath79/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ath79/common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/bcm47xx/board.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm47xx/board.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/bcm47xx/buttons.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm47xx/buttons.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/bcm47xx/leds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm47xx/leds.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/bcm63xx/clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/clk.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/bcm63xx/cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/cpu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/bcm63xx/cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/bcm63xx/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/bcm63xx/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/bcm63xx/reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/reset.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/bcm63xx/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/timer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/compressed/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/compressed/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm7125.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7125.dtsi</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm7346.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7346.dtsi</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm7358.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7358.dtsi</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm7360.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7360.dtsi</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm7362.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7362.dtsi</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm7420.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7420.dtsi</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm7425.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7425.dtsi</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm7435.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7435.dtsi</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm97125cbmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97125cbmb.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97346dbsmb.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm97358svmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97358svmb.dts</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm97360svmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97360svmb.dts</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm97362svmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97362svmb.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm97420c.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97420c.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm97425svmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97425svmb.dts</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/brcm/bcm97435svmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97435svmb.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/mips/boot/dts/img/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/img/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/mips/boot/dts/img/pistachio.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/img/pistachio.dtsi</a></td><td class='right'>924</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/mips/boot/dts/img/pistachio_marduk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/img/pistachio_marduk.dts</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/ingenic/jz4740.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/ingenic/jz4740.dtsi</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/ingenic/qi_lb60.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/ingenic/qi_lb60.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/boot/dts/xilfpga/nexys4ddr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/xilfpga/nexys4ddr.dts</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/crypto/octeon-crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/crypto/octeon-crypto.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/csrc-octeon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/csrc-octeon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/dma-octeon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/dma-octeon.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/executive/cvmx-bootmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-bootmem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper-errata.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper-spi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/executive/cvmx-helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-sysinfo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/octeon-memcpy.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/octeon-memcpy.S</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/octeon-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/octeon-platform.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/mips/cavium-octeon/octeon-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/octeon-usb.c</a></td><td class='right'>552</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/setup.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/cavium-octeon/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/smp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/bmips_stb_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/bmips_stb_defconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/cavium_octeon_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/cavium_octeon_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/ip22_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/ip22_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/ip27_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/ip27_defconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/lemote2f_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/lemote2f_defconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/loongson1b_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/loongson1b_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/loongson1c_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/loongson1c_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/malta_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/malta_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/malta_kvm_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/malta_kvm_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/malta_kvm_guest_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/malta_kvm_guest_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/maltaup_xpa_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/maltaup_xpa_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/nlm_xlp_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/nlm_xlp_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/nlm_xlr_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/nlm_xlr_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/xilfpga_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/xilfpga_defconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/configs/xway_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/xway_defconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/dec/kn01-berr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/dec/kn01-berr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/dec/prom/identify.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/dec/prom/identify.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/dec/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/dec/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/dec/wbflush.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/dec/wbflush.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/emma/markeins/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/emma/markeins/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/generic/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/generic/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/generic/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/generic/init.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/mips/generic/kexec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/generic/kexec.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/abi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/abi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/mips/include/asm/asm-prototypes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/asm-prototypes.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/asm.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/bootinfo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/bootinfo.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/checksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/checksum.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/compat-signal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/compat-signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/device.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/dma-mapping.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/elf.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/fpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/fpu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/highmem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/highmem.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/i8259.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/i8259.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/irq.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/kprobes.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/kvm_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/kvm_host.h</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/mach-ip27/spaces.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-ip27/spaces.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/mach-jz4740/platform.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-jz4740/platform.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/mach-loongson32/loongson1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-loongson32/loongson1.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/mach-loongson32/platform.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-loongson32/platform.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/mips/include/asm/mach-loongson32/regs-rtc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-loongson32/regs-rtc.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/mach-ralink/mt7620.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-ralink/mt7620.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/mips-cm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mips-cm.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/mipsregs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mipsregs.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mmu_context.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/netlogic/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/netlogic/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/octeon/cvmx-gpio-defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-gpio-defs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-helper-rgmii.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-helper-sgmii.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/octeon/cvmx-helper-spi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-helper-spi.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/octeon/cvmx-helper-xaui.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-helper-xaui.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/octeon/cvmx-helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-helper.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/pgalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/pgalloc.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/r4kcache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/r4kcache.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/smp.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/stackframe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/stackframe.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/switch_to.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/switch_to.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/termios.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/termios.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/thread_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/thread_info.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/mips/include/asm/tlbex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/tlbex.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/uaccess.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/asm/uasm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/uasm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/mips/include/asm/unaligned.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/unaligned.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/uapi/asm/kvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/uapi/asm/kvm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/jazz/jazzdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jazz/jazzdma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/jz4740/board-qi_lb60.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/board-qi_lb60.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/jz4740/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/jz4740/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/platform.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/jz4740/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/jz4740/reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/reset.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/jz4740/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/jz4740/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/timer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/asm-offsets.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/binfmt_elfn32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/binfmt_elfn32.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/binfmt_elfo32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/binfmt_elfo32.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/branch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/branch.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/mips/kernel/cacheinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/cacheinfo.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/cevt-txx9.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/cevt-txx9.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/cpu-bugs64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/cpu-bugs64.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/cpu-probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/cpu-probe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/crash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/crash.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/crash_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/crash_dump.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/csrc-bcm1480.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/csrc-bcm1480.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/csrc-ioasic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/csrc-ioasic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/csrc-r4k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/csrc-r4k.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/csrc-sb1250.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/csrc-sb1250.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/entry.S</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/genex.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/genex.S</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/irq.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/kgdb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/linux32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/linux32.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/machine_kexec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/machine_kexec.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/mcount.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/mcount.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/mips-mt-fpaff.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/mips-mt-fpaff.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/mips-r2-to-r6-emul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/mips-r2-to-r6-emul.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/mips/kernel/mips_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/mips_ksyms.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/perf_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/perf_event.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/perf_event_mipsxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/perf_event_mipsxx.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/pm-cps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/pm-cps.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/process.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/prom.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/ptrace.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/ptrace32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/ptrace32.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/r2300_switch.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/r2300_switch.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/r4k_switch.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/r4k_switch.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/relocate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/relocate.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/rtlx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/rtlx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/setup.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/signal32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/signal32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/signal_n32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/signal_n32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/signal_o32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/signal_o32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/smp-bmips.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/smp-bmips.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/smp-cps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/smp-cps.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/smp.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/stacktrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/sync-r4k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/sync-r4k.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/syscall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/syscall.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/traps.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/unaligned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/unaligned.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/uprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/uprobes.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/vdso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/vdso.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/vmlinux.lds.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kvm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kvm/dyntrans.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/dyntrans.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kvm/emulate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/emulate.c</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kvm/entry.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/entry.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kvm/interrupt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/interrupt.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kvm/mips.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/mips.c</a></td><td class='right'>509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kvm/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/mmu.c</a></td><td class='right'>1329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kvm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/tlb.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/kvm/trap_emul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/trap_emul.c</a></td><td class='right'>734</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lantiq/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lantiq/irq.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lantiq/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lantiq/prom.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lantiq/xway/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lantiq/xway/dma.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lantiq/xway/gptu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lantiq/xway/gptu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lantiq/xway/sysctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lantiq/xway/sysctrl.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lasat/at93c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lasat/at93c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lasat/sysctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lasat/sysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lib/csum_partial.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/csum_partial.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lib/memcpy.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/memcpy.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lib/memset.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/memset.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lib/strlen_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/strlen_user.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lib/strncpy_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/strncpy_user.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/lib/strnlen_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/strnlen_user.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson32/common/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson32/common/platform.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson32/common/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson32/common/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson32/ls1b/board.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson32/ls1b/board.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson32/ls1c/board.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson32/ls1c/board.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/common/dma-swiotlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/common/dma-swiotlb.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/common/env.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/common/env.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/common/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/common/setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/common/uart_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/common/uart_base.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/lemote-2f/ec_kb3310b.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/lemote-2f/ec_kb3310b.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/lemote-2f/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/lemote-2f/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/lemote-2f/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/lemote-2f/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/loongson-3/hpet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/loongson-3/hpet.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/loongson-3/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/loongson-3/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/loongson-3/numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/loongson-3/numa.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/loongson64/loongson-3/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/loongson-3/smp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/math-emu/cp1emu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/math-emu/cp1emu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/math-emu/dsemul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/math-emu/dsemul.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/c-r4k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/c-r4k.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/dma-default.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/dma-default.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/extable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/init.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/ioremap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/ioremap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/mmap.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/page-funcs.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/page-funcs.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/page.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/page.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/pgtable-64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/pgtable-64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/mips/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/pgtable.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/sc-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/sc-debugfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/sc-ip22.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/sc-ip22.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/sc-mips.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/sc-mips.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mm/tlbex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/tlbex.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mti-malta/malta-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mti-malta/malta-platform.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/mti-malta/malta-time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mti-malta/malta-time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/netlogic/common/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/netlogic/common/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/netlogic/common/nlm-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/netlogic/common/nlm-dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/netlogic/common/smpboot.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/netlogic/common/smpboot.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/netlogic/common/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/netlogic/common/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/netlogic/xlp/wakeup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/netlogic/xlp/wakeup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/oprofile/op_model_loongson3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/oprofile/op_model_loongson3.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/oprofile/op_model_mipsxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/oprofile/op_model_mipsxx.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/paravirt/paravirt-smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/paravirt/paravirt-smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/pci/pci-octeon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pci/pci-octeon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/pci/pci-tx4927.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pci/pci-tx4927.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/pci/pci-tx4938.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pci/pci-tx4938.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/pci/pci-tx4939.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pci/pci-tx4939.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/pic32/pic32mzda/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pic32/pic32mzda/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/pmcs-msp71xx/msp_prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pmcs-msp71xx/msp_prom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/pmcs-msp71xx/msp_time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pmcs-msp71xx/msp_time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ralink/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ralink/clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/clk.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ralink/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ralink/mt7620.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/mt7620.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ralink/mt7621.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/mt7621.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ralink/of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/of.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ralink/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/prom.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ralink/rt288x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/rt288x.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ralink/rt305x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/rt305x.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ralink/rt3883.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/rt3883.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/ralink/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/timer.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/rb532/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/rb532/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/rb532/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/rb532/prom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip22/Platform?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/Platform</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip22/ip22-berr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-berr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip22/ip22-hpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-hpc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip22/ip22-mc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-mc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip22/ip22-nvram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-nvram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip22/ip22-reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-reset.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip22/ip22-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip22/ip28-berr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip28-berr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip27/ip27-berr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-berr.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip27/ip27-init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip27/ip27-klnuma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-klnuma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip27/ip27-memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-memory.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip27/ip27-smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip27/ip27-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip32/crime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip32/crime.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip32/ip32-berr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip32/ip32-berr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sgi-ip32/ip32-irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip32/ip32-irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sibyte/bcm1480/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sibyte/bcm1480/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sibyte/bcm1480/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sibyte/bcm1480/smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sibyte/common/sb_tbprof.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sibyte/common/sb_tbprof.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sibyte/sb1250/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sibyte/sb1250/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/sibyte/sb1250/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sibyte/sb1250/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/txx9/generic/7segled.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/7segled.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/txx9/generic/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/pci.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/txx9/generic/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/txx9/generic/setup_tx3927.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/setup_tx3927.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/txx9/generic/setup_tx4927.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/setup_tx4927.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/txx9/generic/setup_tx4938.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/setup_tx4938.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/txx9/generic/setup_tx4939.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/setup_tx4939.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/txx9/generic/smsc_fdc37m81x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/smsc_fdc37m81x.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/txx9/jmr3927/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/jmr3927/prom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/txx9/jmr3927/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/jmr3927/setup.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/txx9/rbtx4938/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/rbtx4938/setup.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/vdso/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/vdso/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/vr41xx/common/bcu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/vr41xx/common/bcu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/vr41xx/common/cmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/vr41xx/common/cmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/vr41xx/common/icu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/vr41xx/common/icu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/vr41xx/common/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/vr41xx/common/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mips/xilfpga/intc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/xilfpga/intc.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/kprobes.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/mn10300/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/mutex.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/include/asm/switch_to.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/switch_to.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/kernel/csrc-mn10300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/csrc-mn10300.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/kernel/fpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/fpu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/kernel/mn10300_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/mn10300_ksyms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/process.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/ptrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/smp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/kernel/sys_mn10300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/sys_mn10300.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/lib/checksum.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/lib/checksum.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/mm/cache-smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/cache-smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/mm/cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/cache.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/mm/dma-alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/dma-alloc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/extable.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/mm/misalignment.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/misalignment.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/mm/tlb-smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/tlb-smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/proc-mn2ws0050/proc-init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/proc-mn2ws0050/proc-init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/mn10300/unit-asb2303/include/unit/smc91111.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/unit-asb2303/include/unit/smc91111.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--<span class='modechange'>[-rwxr-xr-x]</span></td><td class='upd'><a href='/drm-misc/diff/arch/nios2/boot/dts/10m50_devboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/boot/dts/10m50_devboard.dts</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--<span class='modechange'>[-rwxr-xr-x]</span></td><td class='upd'><a href='/drm-misc/diff/arch/nios2/configs/10m50_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/configs/10m50_defconfig</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/include/asm/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/nios2/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/include/asm/mutex.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/include/asm/page.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/include/asm/page.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/kernel/process.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/kernel/setup.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/kernel/traps.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/mm/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/mm/dma-mapping.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/mm/extable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/nios2/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/mm/fault.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/README.openrisc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/README.openrisc</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/TODO.openrisc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/TODO.openrisc</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/Kbuild</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/openrisc/include/asm/atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/atomic.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/include/asm/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/bitops.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/openrisc/include/asm/bitops/atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/bitops/atomic.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/openrisc/include/asm/cmpxchg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/cmpxchg.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/include/asm/cpuinfo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/cpuinfo.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/openrisc/include/asm/futex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/futex.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/openrisc/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/mutex.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/include/asm/pgalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/pgtable.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/include/asm/spr_defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/spr_defs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/openrisc/include/asm/string.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/string.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/openrisc/kernel/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/dma.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/entry.S</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/kernel/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/head.S</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/kernel/or32_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/or32_ksyms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/process.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/ptrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/setup.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/traps.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/vmlinux.lds.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/lib/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/lib/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/openrisc/lib/memcpy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/lib/memcpy.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/openrisc/lib/memset.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/lib/memset.S</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/mm/fault.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/mm/init.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/openrisc/mm/ioremap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/mm/ioremap.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/Kconfig.debug</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/configs/712_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/configs/712_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/configs/c3000_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/configs/c3000_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/asm/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/bitops.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/cacheflush.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/parisc/include/asm/current.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/current.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/dma-mapping.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/elf.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/asm/pdcpat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/pdcpat.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/processor.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/asm/thread_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/thread_info.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/uaccess.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/uapi/asm/bitsperlong.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/uapi/asm/bitsperlong.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/include/uapi/asm/swab.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/uapi/asm/swab.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/asm-offsets.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/binfmt_elf32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/binfmt_elf32.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/cache.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/drivers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/drivers.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/entry.S</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/firmware.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/inventory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/inventory.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/pa7300lc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/pa7300lc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/parisc_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/parisc_ksyms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/pci-dma.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/perf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/perf.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/process.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/processor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/processor.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/ptrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/signal.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/signal32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/signal32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/smp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/sys_parisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/sys_parisc.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/time.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/unaligned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/unaligned.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/kernel/unwind.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/unwind.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/lib/checksum.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/lib/checksum.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/math-emu/driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/math-emu/driver.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/mm/fault.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/mm/hugetlbpage.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/parisc/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/mm/init.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/Kconfig</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/Kconfig.debug</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/.gitignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/Makefile</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/boot/dts/fsl/kmcent2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/kmcent2.dts</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/dts/fsl/kmcoge4.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/kmcoge4.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/dts/fsl/mpc8569mds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/mpc8569mds.dts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/dts/fsl/t1023rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1023rdb.dts</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1023si-post.dtsi</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/dts/fsl/t1024qds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1024qds.dts</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/dts/fsl/t1024rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1024rdb.dts</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1040si-post.dtsi</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1042d4rdb.dts</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t2081si-post.dtsi</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/dts/fsl/t4240rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t4240rdb.dts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/ps3-head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/ps3-head.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/ps3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/ps3.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/boot/wrapper?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/wrapper</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/powerpc/configs/85xx/kmp204x_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/85xx/kmp204x_defconfig</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/amigaone_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/amigaone_defconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/cell_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/cell_defconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/chrp32_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/chrp32_defconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/dpaa.config?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/dpaa.config</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/fsl-emb-nonhw.config?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/fsl-emb-nonhw.config</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/g5_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/g5_defconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/maple_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/maple_defconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/pasemi_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/pasemi_defconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/pmac32_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/pmac32_defconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/powernv_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/powernv_defconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/ppc64_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/ppc64_defconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/ppc64e_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/ppc64e_defconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/ppc6xx_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/ppc6xx_defconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/pseries_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/pseries_defconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/configs/storcenter_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/storcenter_defconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/crypto/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/accounting.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/accounting.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/asm-prototypes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/asm-prototypes.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/bitops.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/32/pgalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/32/pgalloc.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/32/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/32/pgtable.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/hash-4k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/hash-4k.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/hash-64k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/hash-64k.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/hash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/hash.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/hugetlb-radix.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/hugetlb-radix.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/hugetlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/hugetlb.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/mmu-hash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/mmu-hash.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/mmu.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/pgtable-4k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/pgtable-4k.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/pgtable-64k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/pgtable-64k.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/pgtable.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/radix.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/radix.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/tlbflush-radix.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/cache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/cache.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/checksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/checksum.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/cmpxchg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/cmpxchg.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/code-patching.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/code-patching.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/cpu_has_feature.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/cpu_has_feature.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/cpuidle.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/cpuidle.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/cputime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/cputime.h</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/debug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/device.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/dma-mapping.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/elf.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/exception-64s.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/exception-64s.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/firmware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/firmware.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/fsl_hcalls.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/fsl_hcalls.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/futex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/futex.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/head-64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/head-64.h</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/hugetlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/hugetlb.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/hvcall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/hvcall.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/include/asm/ima.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/ima.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/io.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/include/asm/isa-bridge.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/isa-bridge.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/kexec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kexec.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kprobes.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/kvm_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kvm_asm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/kvm_book3s.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kvm_book3s.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/kvm_book3s_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kvm_book3s_64.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/kvm_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kvm_host.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/kvm_ppc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kvm_ppc.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/livepatch.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/livepatch.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/machdep.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/machdep.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/mmu-8xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/mmu-8xx.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/mmu.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/mmu_context.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/module.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/module.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/powerpc/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/mutex.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/nohash/32/pgalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/32/pgalloc.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/nohash/32/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/32/pgtable.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/nohash/32/pte-8xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/32/pte-8xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/nohash/64/pgtable-4k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/64/pgtable-4k.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/nohash/64/pgtable-64k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/64/pgtable-64k.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/nohash/64/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/64/pgtable.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/nohash/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/pgtable.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/opal-api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/opal-api.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/opal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/opal.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/paca.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/paca.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/page.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/page.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/page_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/page_64.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/pci-bridge.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pci-bridge.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pci.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/perf_event_server.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/perf_event_server.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/pgtable-be-types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pgtable-be-types.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/pgtable-types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pgtable-types.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pgtable.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/plpar_wrappers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/plpar_wrappers.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/pnv-pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pnv-pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/include/asm/powernv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/powernv.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/ppc-opcode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/ppc-opcode.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/ppc-pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/ppc-pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/ppc_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/ppc_asm.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/processor.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/prom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/prom.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/ps3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/ps3.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/reg.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/reg_8xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/reg_8xx.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/rtas.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/rtas.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/smp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/sparsemem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/sparsemem.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/spinlock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/spinlock.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/swiotlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/swiotlb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/systbl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/systbl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/tlb.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/trace.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/uaccess.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/unistd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/word-at-a-time.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/word-at-a-time.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/xics.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/xics.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/asm/xilinx_intc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/xilinx_intc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/uapi/asm/auxvec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/uapi/asm/auxvec.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/uapi/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/uapi/asm/elf.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/uapi/asm/kvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/uapi/asm/kvm.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/include/uapi/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/uapi/asm/unistd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/align.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/align.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/asm-offsets.c</a></td><td class='right'>766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/cpu_setup_power.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/cpu_setup_power.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/cputable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/cputable.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/crash_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/crash_dump.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/dma-swiotlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/dma-swiotlb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/dma.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/eeh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/eeh.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/eeh_driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/eeh_driver.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/eeh_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/eeh_event.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/eeh_pe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/eeh_pe.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/entry_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/entry_32.S</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/exceptions-64e.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/exceptions-64e.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/exceptions-64s.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/exceptions-64s.S</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/fadump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/fadump.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/ftrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/ftrace.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/head_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/head_32.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/head_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/head_64.S</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/head_8xx.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/head_8xx.S</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/hw_breakpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/hw_breakpoint.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/powerpc/kernel/ibmebus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/ibmebus.c</a></td><td class='right'>759</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/idle_book3s.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/idle_book3s.S</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/kernel/ima_kexec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/ima_kexec.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/io-workarounds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/io-workarounds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/iomap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/iomap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/isa-bridge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/isa-bridge.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/kernel/kexec_elf_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/kexec_elf_64.c</a></td><td class='right'>663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/kprobes.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/legacy_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/legacy_serial.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/machine_kexec_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/machine_kexec_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/kernel/machine_kexec_file_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/machine_kexec_file_64.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/mce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/mce.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/misc_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/misc_32.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/misc_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/misc_64.S</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/module.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/module_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/module_64.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/nvram_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/nvram_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/of_platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/of_platform.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/kernel/optprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/optprobes.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/kernel/optprobes_head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/optprobes_head.S</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/paca.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/paca.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/pci-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/pci-common.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/pci_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/pci_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/proc_powerpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/proc_powerpc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/process.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/prom.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/prom_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/prom_init.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/ptrace.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/ptrace32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/ptrace32.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/rtas-proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/rtas-proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/rtas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/rtas.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/rtas_flash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/rtas_flash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/rtasd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/rtasd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/setup-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/setup-common.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/setup_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/setup_32.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/setup_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/setup_64.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/signal_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/signal_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/signal_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/signal_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/smp.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/stacktrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/swsusp_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/swsusp_64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/sys_ppc32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/sys_ppc32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/syscalls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/syscalls.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/sysfs.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/time.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/traps.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/vdso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/vdso.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kernel/vecemu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/vecemu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_32_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_32_mmu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_64_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_64_mmu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_64_mmu_hv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_64_mmu_hv.c</a></td><td class='right'>800</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_64_mmu_radix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_64_mmu_radix.c</a></td><td class='right'>717</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_64_vio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_64_vio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_64_vio_hv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_64_vio_hv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_hv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv.c</a></td><td class='right'>558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_hv_builtin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv_builtin.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_hv_ras.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv_ras.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_hv_rm_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv_rm_mmu.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_hv_rm_xics.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv_rm_xics.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_hv_rmhandlers.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv_rmhandlers.S</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_mmu_hpte.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_mmu_hpte.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_pr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_pr.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_pr_papr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_pr_papr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_rtas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_rtas.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_segment.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_segment.S</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_xics.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_xics.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/book3s_xics.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_xics.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/booke.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/booke.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/e500_mmu_host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/e500_mmu_host.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/mpic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/mpic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/powerpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/powerpc.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/kvm/trace_hv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/trace_hv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/checksum_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/checksum_32.S</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/checksum_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/checksum_64.S</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/checksum_wrappers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/checksum_wrappers.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/code-patching.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/code-patching.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/copy_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/copy_32.S</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/copypage_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/copypage_64.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/copyuser_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/copyuser_64.S</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/copyuser_power7.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/copyuser_power7.S</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/feature-fixups.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/feature-fixups.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/ldstfp.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/ldstfp.S</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/sstep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/sstep.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/string.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/string.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/string_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/string_64.S</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/lib/usercopy_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/usercopy_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fabs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fabs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fadd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fadd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fadds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fadds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fcmpo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fcmpo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fcmpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fcmpu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fctiw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fctiw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fctiwz.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fctiwz.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fdiv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fdiv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fdivs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fdivs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fmadd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmadd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fmadds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmadds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fmr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fmsub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmsub.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fmsubs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmsubs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fmul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmul.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fmuls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmuls.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fnabs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fnabs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fneg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fneg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fnmadd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fnmadd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fnmadds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fnmadds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fnmsub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fnmsub.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fnmsubs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fnmsubs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fre.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fre.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fres.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fres.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/frsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/frsp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/frsqrte.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/frsqrte.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/frsqrtes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/frsqrtes.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fsel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fsel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fsqrt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fsqrt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fsqrts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fsqrts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fsub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fsub.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/fsubs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fsubs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/lfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/lfd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/lfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/lfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/math.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/math.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/math_efp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/math_efp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/mcrfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mcrfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/mffs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mffs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/mtfsb0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mtfsb0.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/mtfsb1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mtfsb1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/mtfsf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mtfsf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/mtfsfi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mtfsfi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/stfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/stfd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/stfiwx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/stfiwx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/math-emu/stfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/stfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/40x_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/40x_mmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/copro_fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/copro_fault.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/mm/dump_hashpagetable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/dump_hashpagetable.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/mm/dump_linuxpagetables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/dump_linuxpagetables.c</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/fault.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/fsl_booke_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/fsl_booke_mmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/hash_native_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/hash_native_64.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/hash_utils_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/hash_utils_64.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/hugetlbpage-hash64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/hugetlbpage-hash64.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/hugetlbpage.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/mm/init-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/init-common.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/init_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/init_64.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/mem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/mmap.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/mmu_context_book3s64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/mmu_context_book3s64.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/mmu_context_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/mmu_context_iommu.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/numa.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/pgtable-book3s64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable-book3s64.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/pgtable-hash64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable-hash64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/pgtable-radix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable-radix.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/pgtable_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable_32.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/pgtable_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable_64.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/slb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/slb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/slb_low.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/slb_low.S</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/subpage-prot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/subpage-prot.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/tlb-radix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/tlb-radix.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/mm/tlb_nohash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/tlb_nohash.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/net/bpf_jit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/net/bpf_jit.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/net/bpf_jit_comp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/net/bpf_jit_comp.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/net/bpf_jit_comp64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/net/bpf_jit_comp64.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/oprofile/cell/spu_profiler.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/oprofile/cell/spu_profiler.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/oprofile/cell/spu_task_sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/oprofile/cell/spu_task_sync.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/perf/8xx-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/8xx-pmu.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/perf/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/perf/core-book3s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/core-book3s.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/perf/isa207-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/isa207-common.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/perf/isa207-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/isa207-common.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/perf/perf_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/perf_regs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/perf/power8-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/power8-pmu.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/perf/power9-events-list.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/power9-events-list.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/perf/power9-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/power9-pmu.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/40x/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/40x/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/40x/virtex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/40x/virtex.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/44x/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/44x/Kconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/44x/virtex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/44x/virtex.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/83xx/suspend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/83xx/suspend.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/85xx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/85xx/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/85xx/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/85xx/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/85xx/corenet_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/85xx/corenet_generic.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/85xx/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/85xx/smp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/platforms/85xx/t1042rdb_diu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/85xx/t1042rdb_diu.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/8xx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/8xx/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/Kconfig.cputype?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/Kconfig.cputype</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/cpufreq_spudemand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/cpufreq_spudemand.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/iommu.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/spu_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spu_base.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/spufs/context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/context.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/spufs/coredump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/coredump.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/spufs/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/fault.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/spufs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/file.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/spufs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/spufs/sched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/sched.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/spufs/spufs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/spufs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/cell/spufs/syscalls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/syscalls.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/chrp/nvram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/chrp/nvram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/embedded6xx/holly.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/embedded6xx/holly.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/maple/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/maple/pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pasemi/iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pasemi/iommu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pasemi/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pasemi/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powermac/low_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powermac/low_i2c.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powermac/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powermac/smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/eeh-powernv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/eeh-powernv.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/idle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/idle.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/npu-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/npu-dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/opal-elog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-elog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/opal-hmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-hmi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/opal-irqchip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-irqchip.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/opal-lpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-lpc.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/opal-msglog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-msglog.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/opal-prd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-prd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/opal-tracepoints.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-tracepoints.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/opal-wrappers.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-wrappers.S</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/opal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/pci-ioda.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/pci-ioda.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/pci.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/pci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/powernv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/powernv.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/setup.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/powernv/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/smp.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/ps3/htab.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/ps3/htab.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/ps3/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/ps3/setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/ps3/system-bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/ps3/system-bus.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/cmm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/cmm.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/dlpar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/dlpar.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/dtl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/dtl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/eeh_pseries.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/eeh_pseries.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/firmware.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/hotplug-cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/hotplug-cpu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/hotplug-memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/hotplug-memory.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/ibmebus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/ibmebus.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/iommu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/lpar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/lpar.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/lparcfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/lparcfg.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/mobility.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/mobility.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/nvram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/nvram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/pseries.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/pseries.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/reconfig.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/reconfig.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/scanlog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/scanlog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/arch/powerpc/platforms/pseries/vio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/vio.c</a> (renamed from arch/powerpc/kernel/vio.c)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/purgatory/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/purgatory/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/purgatory/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/purgatory/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/powerpc/purgatory/trampoline.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/purgatory/trampoline.S</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/sysdev/fsl_lbc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/fsl_lbc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/sysdev/fsl_pmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/fsl_pmc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/sysdev/fsl_rio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/fsl_rio.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/sysdev/fsl_soc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/fsl_soc.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/sysdev/scom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/scom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/sysdev/tsi108_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/tsi108_pci.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/sysdev/xics/icp-opal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/xics/icp-opal.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/sysdev/xilinx_intc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/xilinx_intc.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/xmon/ppc-dis.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/xmon/ppc-dis.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/xmon/ppc-opc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/xmon/ppc-opc.c</a></td><td class='right'>9001</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 44.1%;'/><td class='rem' style='width: 26.1%;'/><td class='none' style='width: 29.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/xmon/ppc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/xmon/ppc.h</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/powerpc/xmon/xmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/xmon/xmon.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/Kconfig.debug</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/appldata/appldata_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/appldata/appldata_base.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/appldata/appldata_os.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/appldata/appldata_os.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/boot/compressed/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/boot/compressed/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/boot/compressed/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/boot/compressed/head.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/boot/compressed/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/boot/compressed/misc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/configs/default_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/configs/default_defconfig</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/configs/gcov_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/configs/gcov_defconfig</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/configs/performance_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/configs/performance_defconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/crypto/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/crypto/aes_s390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/crypto/aes_s390.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/crypto/des_s390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/crypto/des_s390.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/s390/crypto/paes_s390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/crypto/paes_s390.c</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/crypto/prng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/crypto/prng.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/defconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/hypfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/hypfs/inode.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/s390/include/asm/asm-offsets.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/asm-offsets.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/s390/include/asm/asm-prototypes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/asm-prototypes.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/atomic.h</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/s390/include/asm/atomic_ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/atomic_ops.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/bitops.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/cacheflush.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/checksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/checksum.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/compat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/compat.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/cpacf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/cpacf.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/cpu_mf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/cpu_mf.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/cputime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/cputime.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/ctl_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/ctl_reg.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/device.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/dma-mapping.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/elf.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/s390/include/asm/facilities_src.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/facilities_src.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/hugetlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/hugetlb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/idals.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/idals.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/ipl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/ipl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/kprobes.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/livepatch.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/livepatch.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/lowcore.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/lowcore.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/mmu_context.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/s390/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/mutex.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/pci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/pci_clp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/pci_clp.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/pgalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/pgalloc.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/pgtable.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/s390/include/asm/pkey.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/pkey.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/s390/include/asm/preempt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/preempt.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/processor.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/sclp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/sclp.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/scsw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/scsw.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/setup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/setup.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/smp.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/spinlock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/spinlock.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/string.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/string.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/sysinfo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/sysinfo.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/thread_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/thread_info.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/timex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/timex.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/tlb.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/topology.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/topology.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/s390/include/asm/trace/zcrypt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/trace/zcrypt.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/uaccess.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/asm/vdso.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/vdso.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/uapi/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/uapi/asm/Kbuild</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/s390/include/uapi/asm/pkey.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/uapi/asm/pkey.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/include/uapi/asm/zcrypt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/uapi/asm/zcrypt.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/Makefile</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/als.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/als.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/asm-offsets.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/compat_linux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/compat_linux.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/compat_signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/compat_signal.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/cpcmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/cpcmd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/crash_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/crash_dump.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/debug.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/diag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/diag.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/dis.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/dis.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/dumpstack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/dumpstack.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/early.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/early.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/s390/kernel/early_printk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/early_printk.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/ebcdic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/ebcdic.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/entry.S</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/entry.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/entry.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/head.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/head64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/head64.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/idle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/idle.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/ipl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/ipl.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/jump_label.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/jump_label.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/kprobes.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/lgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/lgr.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/module.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/nmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/nmi.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/os_info.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/os_info.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/perf_cpum_cf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/perf_cpum_cf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/perf_cpum_cf_events.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/perf_cpum_cf_events.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/perf_cpum_sf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/perf_cpum_sf.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/process.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/processor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/processor.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/ptrace.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/runtime_instr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/runtime_instr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/s390/kernel/sclp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/sclp.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/setup.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/signal.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/smp.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/stacktrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/swsusp.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/swsusp.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/sys_s390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/sys_s390.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/sysinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/sysinfo.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/time.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/topology.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/traps.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/uprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/uprobes.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/vdso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vdso.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/vdso32/clock_gettime.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vdso32/clock_gettime.S</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/vdso32/gettimeofday.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vdso32/gettimeofday.S</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/vdso64/clock_gettime.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vdso64/clock_gettime.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/vdso64/gettimeofday.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vdso64/gettimeofday.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vmlinux.lds.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kernel/vtime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vtime.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kvm/gaccess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/gaccess.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kvm/gaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/gaccess.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kvm/guestdbg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/guestdbg.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kvm/intercept.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/intercept.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kvm/interrupt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/interrupt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kvm/kvm-s390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/kvm-s390.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kvm/kvm-s390.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/kvm-s390.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kvm/priv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/priv.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/kvm/vsie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/vsie.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/lib/delay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/lib/delay.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/lib/mem.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/lib/mem.S</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/lib/spinlock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/lib/spinlock.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/lib/string.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/lib/string.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/lib/xor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/lib/xor.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/cmm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/cmm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/dump_pagetables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/dump_pagetables.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/extmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/extmem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/fault.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/gmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/gmap.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/hugetlbpage.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/init.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/mem_detect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/mem_detect.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/mmap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/pageattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/pageattr.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/pgtable.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/mm/vmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/vmem.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/net/bpf_jit_comp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/net/bpf_jit_comp.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/numa/mode_emu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/numa/mode_emu.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/numa/toptree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/numa/toptree.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/pci/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/pci/pci.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/pci/pci_clp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/pci/pci_clp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/pci/pci_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/pci/pci_debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/pci/pci_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/pci/pci_dma.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/tools/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/tools/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/s390/tools/gen_facilities.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/tools/gen_facilities.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/score/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/include/asm/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/score/include/asm/checksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/include/asm/checksum.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/score/include/asm/current.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/include/asm/current.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/score/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/score/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/include/asm/mutex.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/score/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/score/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/kernel/process.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/score/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/kernel/ptrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/score/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/kernel/traps.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/score/lib/checksum_copy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/lib/checksum_copy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/score/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/mm/extable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/score/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/mm/fault.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/boards/mach-landisk/gio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/boards/mach-landisk/gio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/boot/compressed/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/boot/compressed/misc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--<span class='modechange'>[-rwxr-xr-x]</span></td><td class='upd'><a href='/drm-misc/diff/arch/sh/boot/dts/j2_mimas_v2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/boot/dts/j2_mimas_v2.dts</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/boot/romimage/mmcif-sh7724.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/boot/romimage/mmcif-sh7724.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/configs/sh7785lcr_32bit_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/configs/sh7785lcr_32bit_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/drivers/heartbeat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/drivers/heartbeat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/include/asm/fpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/fpu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/kprobes.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/mmu_context.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/sh/include/asm/mutex-llsc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/mutex-llsc.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/sh/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/mutex.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/tlb.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/uaccess.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/fpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/fpu.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/irq/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/irq/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh2/setup-sh7619.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2/setup-sh7619.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh2a/fpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/fpu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh2a/setup-mxg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-mxg.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh2a/setup-sh7201.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-sh7201.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh2a/setup-sh7203.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-sh7203.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh2a/setup-sh7206.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-sh7206.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh2a/setup-sh7264.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-sh7264.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh2a/setup-sh7269.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-sh7269.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh3/setup-sh7705.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh3/setup-sh7705.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh3/setup-sh770x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh3/setup-sh770x.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh3/setup-sh7710.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh3/setup-sh7710.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh3/setup-sh7720.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh3/setup-sh7720.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4/fpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4/fpu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4/setup-sh4-202.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4/setup-sh4-202.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4/setup-sh7750.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4/setup-sh7750.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4/setup-sh7760.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4/setup-sh7760.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7343.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7343.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7366.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7366.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7722.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7722.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7723.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7723.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7724.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7724.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7734.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7734.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7757.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7757.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7763.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7763.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7770.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7770.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7780.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7780.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7785.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7785.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-sh7786.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7786.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh4a/setup-shx3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-shx3.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/sh5/setup-sh5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh5/setup-sh5.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/shmobile/cpuidle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/shmobile/cpuidle.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/cpu/shmobile/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/shmobile/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/crash_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/crash_dump.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/disassemble.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/disassemble.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/dma-nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/dma-nommu.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/dumpstack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/dumpstack.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/hw_breakpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/hw_breakpoint.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/io_trapped.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/io_trapped.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/kgdb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/kprobes.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/nmi_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/nmi_debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/process.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/process_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/process_32.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/process_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/process_64.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/ptrace_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/ptrace_32.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/ptrace_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/ptrace_64.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/sh_ksyms_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/sh_ksyms_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/signal_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/signal_32.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/signal_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/signal_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/smp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/stacktrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/sys_sh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/sys_sh.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/sys_sh32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/sys_sh32.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/traps.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/traps_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/traps_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/kernel/traps_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/traps_64.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/math-emu/math.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/math-emu/math.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/asids-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/asids-debugfs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/cache-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/cache-debugfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/cache-sh3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/cache-sh3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/cache-sh5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/cache-sh5.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/cache-sh7705.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/cache-sh7705.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/consistent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/consistent.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/extable_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/extable_32.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/extable_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/extable_64.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/fault.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/mmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/nommu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/pmb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/pmb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/tlb-sh3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/tlb-sh3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/tlbex_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/tlbex_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/mm/tlbflush_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/tlbflush_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sh/oprofile/backtrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/oprofile/backtrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/configs/sparc64_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/configs/sparc64_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/checksum_32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/checksum_32.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/checksum_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/checksum_64.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/dma-mapping.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/kdebug_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/kdebug_64.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/kprobes.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/mmu_context_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/mmu_context_64.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/page_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/page_64.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/pgtable_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/pgtable_64.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/processor_32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/processor_32.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/processor_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/processor_64.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/ptrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/ptrace.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/setup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/setup.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/switch_to_32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/switch_to_32.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/thread_info_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/thread_info_64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/tlbflush_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/tlbflush_64.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/topology_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/topology_64.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/asm/ttable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/ttable.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/sparc/include/asm/uprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/uprobes.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/apc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/apc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/asm-offsets.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/ds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/ds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/iommu.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/ioport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/ioport.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/irq_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/irq_64.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/kprobes.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/leon_kernel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/leon_kernel.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/leon_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/leon_smp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/mdesc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/mdesc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/nmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/nmi.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/pci_sun4v.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/pci_sun4v.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/pcic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/pcic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/pmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/pmc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/power.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/process_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/process_32.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/process_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/process_64.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/ptrace_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/ptrace_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/ptrace_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/ptrace_64.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/setup_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/setup_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/signal32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/signal32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/signal_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/signal_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/signal_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/signal_64.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/smp_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/smp_64.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/sstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sstate.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/stacktrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/sun4d_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sun4d_smp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/sun4m_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sun4m_irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/sun4m_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sun4m_smp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/sys_sparc32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sys_sparc32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/sys_sparc_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sys_sparc_32.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/sys_sparc_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sys_sparc_64.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sysfs.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/time_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/time_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/time_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/time_64.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/traps_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/traps_32.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/traps_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/traps_64.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/tsb.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/tsb.S</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/ttable_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/ttable_64.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/unaligned_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/unaligned_32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/unaligned_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/unaligned_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/sparc/kernel/uprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/uprobes.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/viohs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/viohs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/visemul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/visemul.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/kernel/windows.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/windows.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/math-emu/math_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/math-emu/math_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/math-emu/math_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/math-emu/math_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/extable.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/mm/fault_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/fault_64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/hugetlbpage.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/mm/init_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/init_32.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/mm/init_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/init_64.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/mm/srmmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/srmmu.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/mm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/tlb.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/sparc/mm/tsb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/tsb.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/include/asm/cache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/cache.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/device.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/tile/include/asm/div64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/div64.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/dma-mapping.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/kprobes.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/processor.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/include/asm/sections.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/sections.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/include/asm/stack.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/stack.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/compat_signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/compat_signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/kgdb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/module.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/pci-dma.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/pci_gx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/pci_gx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/process.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/ptrace.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/setup.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/single_step.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/single_step.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/smpboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/smpboot.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/stack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/stack.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/time.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/kernel/unaligned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/unaligned.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/lib/cacheflush.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/lib/cacheflush.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/mm/elf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/elf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/extable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/fault.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/mm/homecache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/homecache.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/hugetlbpage.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/init.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/mmap.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/tile/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/pgtable.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/drivers/harddog_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/harddog_kern.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/drivers/hostaudio_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/hostaudio_kern.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/drivers/line.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/line.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/drivers/mconsole_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/mconsole_kern.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/drivers/mmapper_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/mmapper_kern.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/drivers/net_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/net_kern.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/drivers/random.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/random.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/drivers/ubd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/ubd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/drivers/ubd_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/ubd_kern.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/drivers/ubd_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/ubd_user.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/include/asm/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/include/asm/tlb.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/exec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/exec.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/exitcode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/exitcode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/process.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/ptrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/reboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/reboot.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/skas/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/skas/mmu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/skas/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/skas/process.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/syscall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/syscall.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/sysrq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/sysrq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/tlb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/trap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/trap.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/um/kernel/um_arch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/um_arch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/include/asm/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/include/asm/dma-mapping.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/unicore32/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/include/asm/mutex.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/kernel/fpu-ucf64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/fpu-ucf64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/stacktrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/traps.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/mm/alignment.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/mm/alignment.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/mm/dma-swiotlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/mm/dma-swiotlb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/mm/extable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/mm/fault.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/unicore32/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/mm/init.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/Kconfig</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/Kconfig.debug</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/boot/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/boot/boot.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/boot.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/boot/compressed/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/compressed/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/boot/compressed/eboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/compressed/eboot.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/boot/compressed/head_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/compressed/head_32.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/boot/compressed/head_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/compressed/head_64.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/boot/compressed/kaslr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/compressed/kaslr.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/boot/cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/cpu.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/boot/string.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/string.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/boot/string.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/string.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/aesni-intel_asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/aesni-intel_asm.S</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/aesni-intel_avx-x86_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/aesni-intel_avx-x86_64.S</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/aesni-intel_glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/aesni-intel_glue.c</a></td><td class='right'>720</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/camellia-aesni-avx-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/camellia-aesni-avx-asm_64.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/camellia-aesni-avx2-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/camellia-aesni-avx2-asm_64.S</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/cast5-avx-x86_64-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/cast5-avx-x86_64-asm_64.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/cast6-avx-x86_64-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/cast6-avx-x86_64-asm_64.S</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/chacha20-avx2-x86_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/chacha20-avx2-x86_64.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/chacha20-ssse3-x86_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/chacha20-ssse3-x86_64.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/chacha20_glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/chacha20_glue.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/crc32c-intel_glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/crc32c-intel_glue.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/crc32c-pcl-intel-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/crc32c-pcl-intel-asm_64.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/crct10dif-pcl-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/crct10dif-pcl-asm_64.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/des3_ede-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/des3_ede-asm_64.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/fpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/fpu.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/ghash-clmulni-intel_asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/ghash-clmulni-intel_asm.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/glue_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/glue_helper.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/poly1305-avx2-x86_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/poly1305-avx2-x86_64.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/poly1305-sse2-x86_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/poly1305-sse2-x86_64.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/serpent-avx-x86_64-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/serpent-avx-x86_64-asm_64.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/serpent-avx2-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/serpent-avx2-asm_64.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha1-mb/sha1_mb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1-mb/sha1_mb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1-mb/sha1_mb_ctx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha1-mb/sha1_x8_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1-mb/sha1_x8_avx2.S</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha1_ni_asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1_ni_asm.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha256-avx-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-avx-asm.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha256-avx2-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-avx2-asm.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha256-mb/sha256_mb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-mb/sha256_mb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-mb/sha256_mb_ctx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha256-mb/sha256_x8_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-mb/sha256_x8_avx2.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha256-ssse3-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-ssse3-asm.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha256_ni_asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256_ni_asm.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha512-avx-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-avx-asm.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha512-avx2-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-avx2-asm.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha512-mb/sha512_mb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-mb/sha512_mb.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha512-mb/sha512_mb_ctx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-mb/sha512_mb_ctx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha512-mb/sha512_x4_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-mb/sha512_x4_avx2.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/sha512-ssse3-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-ssse3-asm.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/crypto/twofish-avx-x86_64-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/twofish-avx-x86_64-asm_64.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/entry/calling.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/calling.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/entry/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/common.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/entry/entry_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/entry_32.S</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/entry/entry_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/entry_64.S</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/entry/syscalls/syscall_32.tbl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/syscalls/syscall_32.tbl</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/entry/syscalls/syscall_64.tbl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/syscalls/syscall_64.tbl</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/entry/vdso/vclock_gettime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/vdso/vclock_gettime.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/entry/vdso/vma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/vdso/vma.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/entry/vsyscall/vsyscall_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/vsyscall/vsyscall_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/events/amd/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/amd/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/amd/ibs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/amd/ibs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/amd/power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/amd/power.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/amd/uncore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/amd/uncore.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/core.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/intel/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/core.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/intel/cqm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/cqm.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/intel/cstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/cstate.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/intel/ds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/ds.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/intel/pt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/pt.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/intel/rapl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/rapl.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/intel/uncore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/uncore.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/intel/uncore_snbep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/uncore_snbep.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/events/perf_event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/perf_event.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/hyperv/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/hyperv/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/hyperv/hv_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/hyperv/hv_init.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/ia32/ia32_aout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/ia32/ia32_aout.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/ia32/ia32_signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/ia32/ia32_signal.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/ia32/sys_ia32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/ia32/sys_ia32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/Kbuild</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/a.out-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/a.out-core.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/acpi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/acpi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/amd_nb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/amd_nb.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/apic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/apic.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/include/asm/asm-prototypes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/asm-prototypes.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/bitops.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/cacheflush.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/checksum_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/checksum_64.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/cpufeature.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/cpufeature.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/cpufeatures.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/cpufeatures.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/crypto/glue_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/crypto/glue_helper.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/desc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/desc.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/desc_defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/desc_defs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/device.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/div64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/div64.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/dma-mapping.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/e820.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/e820.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/efi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/efi.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/elf.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/floppy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/floppy.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/fpu/api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/fpu/api.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/fpu/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/fpu/internal.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/fpu/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/fpu/types.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/fpu/xstate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/fpu/xstate.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/include/asm/idle.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/idle.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/intel-family.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/intel-family.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/intel-mid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/intel-mid.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/intel_pmc_ipc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/intel_pmc_ipc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/include/asm/intel_rdt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/intel_rdt.h</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/include/asm/intel_rdt_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/intel_rdt_common.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/io.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/iommu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/iommu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/kdebug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kdebug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kprobes.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/kvm_emulate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kvm_emulate.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/kvm_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kvm_host.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/kvm_page_track.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kvm_page_track.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/include/asm/kvmclock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kvmclock.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/lguest_hcall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/lguest_hcall.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/mce.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mce.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/microcode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/microcode.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/microcode_amd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/microcode_amd.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/microcode_intel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/microcode_intel.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mmu.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/mpx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mpx.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/mshyperv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mshyperv.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/msr-index.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/msr-index.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/msr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/msr.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mutex.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/include/asm/mutex_32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mutex_32.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/include/asm/mutex_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mutex_64.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/mwait.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mwait.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/paravirt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/paravirt.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/paravirt_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/paravirt_types.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/percpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/percpu.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/pgtable-2level.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pgtable-2level.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/pgtable-3level.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pgtable-3level.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pgtable.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/pgtable_32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pgtable_32.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/pgtable_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pgtable_64.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/preempt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/preempt.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/processor.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/pvclock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pvclock.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/qspinlock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/qspinlock.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/special_insns.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/special_insns.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/spinlock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/spinlock.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/stacktrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/stacktrace.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/switch_to.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/switch_to.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/topology.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/topology.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/trace/exceptions.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/trace/exceptions.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/trace/fpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/trace/fpu.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/trace/irq_vectors.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/trace/irq_vectors.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/tsc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/tsc.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/uaccess.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/unwind.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/unwind.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/uv/uv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/uv/uv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/uv/uv_hub.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/uv/uv_hub.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/vgtod.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/vgtod.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/vmx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/vmx.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/x86_init.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/x86_init.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/xen/hypercall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/xen/hypercall.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/asm/xen/page.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/xen/page.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/uapi/asm/bootparam.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/bootparam.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/include/uapi/asm/hwcap2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/hwcap2.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/uapi/asm/hyperv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/hyperv.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/uapi/asm/kvm_para.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/kvm_para.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/uapi/asm/mce.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/mce.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/uapi/asm/prctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/prctl.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/include/uapi/asm/vmx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/vmx.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/acpi/apei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/acpi/apei.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/acpi/boot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/acpi/boot.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/acpi/cstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/acpi/cstate.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/acpi/wakeup_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/acpi/wakeup_64.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/alternative.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/alternative.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/amd_gart_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/amd_gart_64.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/amd_nb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/amd_nb.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/apb_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apb_timer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/apic/apic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/apic.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/apic/io_apic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/io_apic.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/apic/msi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/msi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/apic/vector.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/vector.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/apic/x2apic_cluster.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/x2apic_cluster.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/apic/x2apic_uv_x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/x2apic_uv_x.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/apm_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apm_32.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/asm-offsets.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/asm-offsets_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/asm-offsets_64.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/amd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/amd.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/bugs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/bugs.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/kernel/cpu/bugs_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/bugs_64.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/centaur.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/centaur.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/common.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/cyrix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/cyrix.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/intel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/intel.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/intel_cacheinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/intel_cacheinfo.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/kernel/cpu/intel_rdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/intel_rdt.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/intel_rdt_rdtgroup.c</a></td><td class='right'>1116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/kernel/cpu/intel_rdt_schemata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/intel_rdt_schemata.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/mcheck/mce-apei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce-apei.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/mcheck/mce-genpool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce-genpool.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/mcheck/mce-inject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce-inject.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/mcheck/mce-internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce-internal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/mcheck/mce-severity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce-severity.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/mcheck/mce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/mcheck/mce_amd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce_amd.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/mcheck/mce_intel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce_intel.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/mcheck/therm_throt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/therm_throt.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/mcheck/threshold.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/threshold.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/microcode/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/microcode/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/microcode/amd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/microcode/amd.c</a></td><td class='right'>613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/microcode/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/microcode/core.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/microcode/intel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/microcode/intel.c</a></td><td class='right'>877</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/kernel/cpu/microcode/intel_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/microcode/intel_lib.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/mshyperv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mshyperv.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/scattered.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/scattered.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/transmeta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/transmeta.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpu/vmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/vmware.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/cpuid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpuid.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/crash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/crash.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/crash_dump_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/crash_dump_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/doublefault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/doublefault.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/dumpstack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/dumpstack.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/dumpstack_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/dumpstack_32.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/dumpstack_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/dumpstack_64.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/e820.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/e820.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/fpu/bugs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/bugs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/fpu/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/core.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/fpu/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/init.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/fpu/regset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/regset.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/fpu/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/signal.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/fpu/xstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/xstate.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/head32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/head32.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/head_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/head_32.S</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/head_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/head_64.S</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/hpet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/hpet.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/ioport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/ioport.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/irq_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/irq_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/irq_work.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/irq_work.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/kernel/itmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/itmt.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/jump_label.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/jump_label.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/kexec-bzimage64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/kexec-bzimage64.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/kprobes/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/kprobes/core.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/kprobes/opt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/kprobes/opt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/kvm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/kvm.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/kvmclock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/kvmclock.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/ldt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/ldt.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/machine_kexec_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/machine_kexec_64.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/msr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/msr.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/nmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/nmi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/paravirt-spinlocks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/paravirt-spinlocks.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/paravirt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/paravirt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/paravirt_patch_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/paravirt_patch_32.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/paravirt_patch_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/paravirt_patch_64.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/pci-calgary_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/pci-calgary_64.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/pci-dma.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/pci-nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/pci-nommu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/pci-swiotlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/pci-swiotlb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/perf_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/perf_regs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/platform-quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/platform-quirks.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/process.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/process_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/process_32.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/process_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/process_64.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/ptrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/pvclock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/pvclock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/rtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/rtc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/setup.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/setup_percpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/setup_percpu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/smp.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/smpboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/smpboot.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/stacktrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/step.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/step.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/sys_x86_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/sys_x86_64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/tboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tboot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/kernel/test_nx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/test_nx.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/kernel/test_rodata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/test_rodata.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/tls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tls.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/tracepoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tracepoint.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/traps.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/tsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tsc.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/tsc_msr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tsc_msr.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/tsc_sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tsc_sync.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/unwind_frame.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/unwind_frame.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/vm86_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/vm86_32.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/vmlinux.lds.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kernel/x86_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/x86_init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/cpuid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/cpuid.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/emulate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/emulate.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/hyperv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/hyperv.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/i8254.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/i8254.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/i8254.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/i8254.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/i8259.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/i8259.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/irq.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/irq_comm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/irq_comm.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/lapic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/lapic.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/lapic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/lapic.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/mmu.c</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/page_track.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/page_track.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/pmu.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/svm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/svm.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/vmx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/vmx.c</a></td><td class='right'>1953</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/kvm/x86.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/x86.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/lguest/boot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lguest/boot.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/lib/copy_user_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lib/copy_user_64.S</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/lib/delay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lib/delay.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/lib/msr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lib/msr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/lib/usercopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lib/usercopy.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/lib/usercopy_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lib/usercopy_32.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/math-emu/errors.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/math-emu/errors.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/math-emu/fpu_entry.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/math-emu/fpu_entry.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/math-emu/get_address.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/math-emu/get_address.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/math-emu/load_store.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/math-emu/load_store.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/math-emu/reg_ld_str.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/math-emu/reg_ld_str.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/dump_pagetables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/dump_pagetables.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/extable.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/fault.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/gup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/gup.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/hugetlbpage.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/init_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/init_32.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/init_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/init_64.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/kasan_init_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/kasan_init_64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/mmap.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/mpx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/mpx.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/numa.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/pageattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/pageattr.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/pat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/pat.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/pat_rbtree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/pat_rbtree.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/pgtable.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/mm/pkeys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/pkeys.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/net/bpf_jit_comp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/net/bpf_jit_comp.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/oprofile/nmi_int.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/oprofile/nmi_int.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/pci/acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/pci/acpi.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/pci/amd_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/pci/amd_bus.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/pci/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/pci/common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/pci/sta2x11-fixup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/pci/sta2x11-fixup.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/pci/xen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/pci/xen.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/atom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/atom/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/ce4100/ce4100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/ce4100/ce4100.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/efi/efi-bgrt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/efi/efi-bgrt.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/efi/efi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/efi/efi.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/efi/efi_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/efi/efi_64.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/efi/quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/efi/quirks.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/goldfish/goldfish.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/goldfish/goldfish.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_ipc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_ipc.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_ipc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_ipc.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_mrfld_rtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_mrfld_rtc.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/device_libs/platform_spidev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_spidev.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/intel-mid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/intel-mid.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/mfld.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/mfld.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/mrfld.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/mrfld.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/pwr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/pwr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-mid/sfi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/sfi.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/intel-quark/imr_selftest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-quark/imr_selftest.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/platform/mellanox/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/mellanox/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/x86/platform/mellanox/mlx-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/mellanox/mlx-platform.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/uv/tlb_uv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/uv/tlb_uv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/uv/uv_nmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/uv/uv_nmi.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/platform/uv/uv_time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/uv/uv_time.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/power/cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/power/cpu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/power/hibernate_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/power/hibernate_64.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/ras/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/ras/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/ras/mce_amd_inj.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/ras/mce_amd_inj.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/realmode/rm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/realmode/rm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/tools/insn_sanity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/tools/insn_sanity.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/tools/relocs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/tools/relocs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/tools/test_get_len.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/tools/test_get_len.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/um/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/um/ptrace_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/ptrace_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/um/ptrace_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/ptrace_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/um/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/um/syscalls_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/syscalls_64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/um/sysrq_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/sysrq_32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/um/sysrq_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/sysrq_64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/um/tls_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/tls_32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/apic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/apic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/enlighten.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/enlighten.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/mmu.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/p2m.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/p2m.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/pci-swiotlb-xen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/pci-swiotlb-xen.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/platform-pci-unplug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/platform-pci-unplug.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/setup.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/smp.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/smp.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/spinlock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/spinlock.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/time.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/xen-head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/xen-head.S</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/x86/xen/xen-ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/xen-ops.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/x86/xen/xen-pvh.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/xen-pvh.S</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/boot/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/boot/Makefile</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/boot/boot-elf/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/boot/boot-elf/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/boot/boot-redboot/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/boot/boot-redboot/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/xtensa/boot/boot-uboot/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/boot/boot-uboot/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/boot/dts/kc705.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/boot/dts/kc705.dts</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/include/asm/checksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/checksum.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/device.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/dma-mapping.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/arch/xtensa/include/asm/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/mutex.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/include/asm/segment.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/segment.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/include/asm/vectors.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/vectors.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/uapi/asm/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/asm-offsets.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/pci-dma.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/perf_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/perf_event.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/process.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/ptrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/arch/xtensa/kernel/s32c1i_selftest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/s32c1i_selftest.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/setup.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/signal.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/smp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/stacktrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/syscall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/syscall.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/traps.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/vmlinux.lds.S</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/kernel/xtensa_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/xtensa_ksyms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/mm/fault.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/mm/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/platforms/iss/console.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/platforms/iss/console.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/arch/xtensa/platforms/iss/simdisk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/platforms/iss/simdisk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/Kconfig</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/Kconfig.iosched?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/Kconfig.iosched</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/bio-integrity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/bio-integrity.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/bio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/bio.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-cgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-cgroup.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-core.c</a></td><td class='right'>613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-exec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-exec.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-flush.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-flush.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-integrity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-integrity.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-ioc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-ioc.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-lib.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-map.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-map.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-merge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-merge.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-mq-cpumap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-cpumap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/blk-mq-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-debugfs.c</a></td><td class='right'>772</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/blk-mq-sched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-sched.c</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/blk-mq-sched.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-sched.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-mq-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-sysfs.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-mq-tag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-tag.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-mq-tag.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-tag.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/blk-mq-virtio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-virtio.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-mq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq.c</a></td><td class='right'>1182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-mq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-settings.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-settings.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-softirq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-softirq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/blk-stat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-stat.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/blk-stat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-stat.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-sysfs.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-tag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-tag.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk-throttle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-throttle.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/blk-wbt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-wbt.c</a></td><td class='right'>751</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/blk-wbt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-wbt.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/blk-zoned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-zoned.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/blk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/bsg-lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/bsg-lib.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/bsg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/bsg.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/cfq-iosched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/cfq-iosched.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/compat_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/compat_ioctl.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/deadline-iosched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/deadline-iosched.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/elevator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/elevator.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/genhd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/genhd.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/ioctl.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/ioprio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/ioprio.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/mq-deadline.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/mq-deadline.c</a></td><td class='right'>556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/noop-iosched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/noop-iosched.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/opal_proto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/opal_proto.h</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/partition-generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/partition-generic.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/partitions/efi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/partitions/efi.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/partitions/ibm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/partitions/ibm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/block/scsi_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/scsi_ioctl.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/block/sed-opal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/sed-opal.c</a></td><td class='right'>2425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/842.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/842.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/Kconfig</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/ablkcipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/ablkcipher.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/crypto/acompress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/acompress.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/aead.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/aead.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/aes_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/aes_generic.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/crypto/aes_ti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/aes_ti.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/ahash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/ahash.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/akcipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/akcipher.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/algapi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/algapi.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/algboss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/algboss.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/algif_aead.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/algif_aead.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/algif_hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/algif_hash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/algif_skcipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/algif_skcipher.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/api.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/asymmetric_keys/public_key.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/asymmetric_keys/public_key.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/authenc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/authenc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/authencesn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/authencesn.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/blkcipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/blkcipher.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/cbc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/cbc.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/ccm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/ccm.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/chacha20_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/chacha20_generic.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/chacha20poly1305.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/chacha20poly1305.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/cipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/cipher.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/cmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/cmac.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/compress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/compress.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/cryptd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/cryptd.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/crypto_engine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/crypto_engine.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/crypto_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/crypto_user.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/ctr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/ctr.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/cts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/cts.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/deflate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/deflate.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/dh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/dh.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/drbg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/drbg.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/gcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/gcm.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/gf128mul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/gf128mul.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/internal.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/jitterentropy-kcapi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/jitterentropy-kcapi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/kpp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/kpp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/lrw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/lrw.c</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/lz4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/lz4.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/lz4hc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/lz4hc.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/lzo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/lzo.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/mcryptd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/mcryptd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/pcbc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/pcbc.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/poly1305_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/poly1305_generic.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/rng.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/crypto/scompress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/scompress.c</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/seqiv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/seqiv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/shash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/shash.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/crypto/simd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/simd.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/skcipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/skcipher.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/tcrypt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/tcrypt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/testmgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/testmgr.c</a></td><td class='right'>1391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 7.7%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/testmgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/testmgr.h</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/crypto/xts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/xts.c</a></td><td class='right'>549</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpi_apd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_apd.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpi_extlog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_extlog.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpi_ipmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_ipmi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpi_lpss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_lpss.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpi_pad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_pad.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpi_processor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_processor.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpi_video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_video.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpi_watchdog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_watchdog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acapps.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acapps.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/accommon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/accommon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acdebug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acdebug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acdispat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acdispat.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acevents.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acevents.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acglobal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acglobal.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/achware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/achware.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acinterp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acinterp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/aclocal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/aclocal.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acmacros.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acmacros.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acnamesp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acnamesp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acobject.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acobject.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acopcode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acopcode.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acparser.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acparser.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acpredef.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acpredef.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acresrc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acresrc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acstruct.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acstruct.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/actables.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/actables.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/acutils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acutils.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/amlcode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/amlcode.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/amlresrc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/amlresrc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbcmds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbcmds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbconvert.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbconvert.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbdisply.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbdisply.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbexec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbexec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbfileio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbfileio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbhistry.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbhistry.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbinput.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbinput.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbmethod.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbmethod.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbnames.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbnames.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbobject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbobject.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbstats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbstats.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbtest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbtest.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbutils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dbxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbxface.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dsargs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsargs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dscontrol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dscontrol.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dsdebug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsdebug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dsfield.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsfield.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dsinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsinit.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dsmethod.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsmethod.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dsmthdat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsmthdat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dsobject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsobject.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dsopcode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsopcode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dsutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsutils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dswexec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dswexec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dswload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dswload.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dswload2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dswload2.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dswscope.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dswscope.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/dswstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dswstate.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evevent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evevent.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evglock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evglock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evgpe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evgpe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evgpeblk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evgpeblk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evgpeinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evgpeinit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evgpeutil.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evgpeutil.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evhandler.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evhandler.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evmisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evmisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evregion.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evregion.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evrgnini.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evrgnini.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evsci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evsci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evxface.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evxfevnt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evxfevnt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evxfgpe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evxfgpe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/evxfregn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evxfregn.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exconcat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exconcat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exconfig.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exconfig.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exconvrt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exconvrt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/excreate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/excreate.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exdebug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exdebug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exdump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exdump.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exfield.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exfield.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exfldio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exfldio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exmisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exmisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exmutex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exmutex.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exnames.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exnames.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exoparg1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exoparg1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exoparg2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exoparg2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exoparg3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exoparg3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exoparg6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exoparg6.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exprep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exprep.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exregion.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exregion.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exresnte.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exresnte.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exresolv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exresolv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exresop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exresop.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exstore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exstore.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exstoren.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exstoren.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exstorob.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exstorob.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exsystem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exsystem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/extrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/extrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/exutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exutils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/hwacpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwacpi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/hwesleep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwesleep.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/hwgpe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwgpe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/hwpci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwpci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/hwregs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwregs.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/hwsleep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwsleep.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/hwtimer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwtimer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/hwvalid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwvalid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/hwxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwxface.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/hwxfsleep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwxfsleep.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsaccess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsaccess.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsalloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsalloc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsarguments.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsarguments.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsconvert.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsconvert.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsdump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsdump.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsdumpdv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsdumpdv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nseval.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nseval.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsinit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsload.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsnames.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsnames.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsobject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsobject.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsparse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsparse.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nspredef.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nspredef.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsprepkg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsprepkg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsrepair.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsrepair.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsrepair2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsrepair2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nssearch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nssearch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsutils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nswalk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nswalk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsxfeval.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsxfeval.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsxfname.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsxfname.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/nsxfobj.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsxfobj.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/psargs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psargs.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/psloop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psloop.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/psobject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psobject.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/psopcode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psopcode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/psopinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psopinfo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/psparse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psparse.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/psscope.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psscope.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/pstree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/pstree.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/psutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psutils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/pswalk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/pswalk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/psxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psxface.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rsaddr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsaddr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rscalc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rscalc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rscreate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rscreate.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rsdump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsdump.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rsdumpinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsdumpinfo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rsinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsinfo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rsio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rsirq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsirq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rslist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rslist.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rsmemory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsmemory.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rsmisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsmisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rsserial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsserial.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rsutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsutils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/rsxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsxface.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/tbdata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbdata.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/tbfadt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbfadt.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/tbfind.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbfind.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/tbinstal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbinstal.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/tbprint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbprint.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/tbutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbutils.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/tbxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbxface.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/tbxfload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbxfload.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/tbxfroot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbxfroot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utaddress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utaddress.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utalloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utalloc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utascii.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utascii.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utbuffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utbuffer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utcache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utcache.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utcopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utcopy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utdebug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utdebug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utdecode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utdecode.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utdelete.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utdelete.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/uterror.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/uterror.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/uteval.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/uteval.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utexcep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utexcep.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utglobal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utglobal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/uthex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/uthex.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utids.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utids.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utinit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utlock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utlock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utmath.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utmath.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utmisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utmisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utmutex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utmutex.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utnonansi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utnonansi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utobject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utobject.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utosi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utosi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utownerid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utownerid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utpredef.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utpredef.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utprint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utprint.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utresrc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utresrc.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utstate.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utstring.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utstring.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utstrtoul64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utstrtoul64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/uttrack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/uttrack.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utuuid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utuuid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utxface.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utxferror.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utxferror.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utxfinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utxfinit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/acpica/utxfmutex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utxfmutex.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/apei/bert.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/apei/bert.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/apei/einj.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/apei/einj.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/apei/ghes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/apei/ghes.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/apei/hest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/apei/hest.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/arm64/iort.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/arm64/iort.c</a></td><td class='right'>607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/battery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/battery.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/bgrt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/bgrt.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/blacklist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/blacklist.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/bus.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/button.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/button.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/cppc_acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/cppc_acpi.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/device_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/device_sysfs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/ec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/ec.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/event.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/glue.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/acpi/gsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/gsi.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/internal.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/acpi/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/irq.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/nfit/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/nfit/core.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/nfit/mce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/nfit/mce.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/numa.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/osl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/osl.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/pci_mcfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/pci_mcfg.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/processor_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/processor_core.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/processor_idle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/processor_idle.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/processor_perflib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/processor_perflib.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/processor_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/processor_thermal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/processor_throttling.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/processor_throttling.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/property.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/property.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/resource.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/resource.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/scan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/scan.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/sleep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/sleep.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/spcr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/spcr.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/sysfs.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/tables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/tables.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/thermal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/acpi/video_detect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/video_detect.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/android/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/android/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/android/binder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/android/binder.c</a></td><td class='right'>1008</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/ahci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/ahci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/ahci_da850.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci_da850.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/ahci_imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci_imx.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/ahci_qoriq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci_qoriq.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/ahci_xgene.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci_xgene.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/libahci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libahci.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/libata-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata-core.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/libata-eh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata-eh.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/libata-scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata-scsi.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/libata-sff.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata-sff.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/libata-transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata-transport.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/libata.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/pata_at91.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_at91.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/pata_atiixp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_atiixp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/pata_bf54x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_bf54x.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/pata_ep93xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_ep93xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/ata/pata_falcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_falcon.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/pata_imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_imx.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/pata_ixp4xx_cf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_ixp4xx_cf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/pata_legacy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_legacy.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/pata_octeon_cf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_octeon_cf.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/pata_of_platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_of_platform.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/pata_pcmcia.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_pcmcia.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/pata_samsung_cf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_samsung_cf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/sata_mv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/sata_mv.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ata/sata_rcar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/sata_rcar.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/adummy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/adummy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/ambassador.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/ambassador.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/atmtcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/atmtcp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/eni.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/eni.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/firestream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/firestream.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/fore200e.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/fore200e.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/he.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/he.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/horizon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/horizon.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/idt77105.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/idt77105.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/idt77252.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/idt77252.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/iphase.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/iphase.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/iphase.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/iphase.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/lanai.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/lanai.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/midway.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/midway.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/nicstar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/nicstar.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/solos-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/solos-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/suni.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/suni.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/uPD98402.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/uPD98402.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/atm/zatm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/zatm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/auxdisplay/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/auxdisplay/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/auxdisplay/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/auxdisplay/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/auxdisplay/ht16k33.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/auxdisplay/ht16k33.c</a></td><td class='right'>543</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/base.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/base.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/cacheinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/cacheinfo.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/class.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/class.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/core.c</a></td><td class='right'>577</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/cpu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/dd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/dd.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/devcoredump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/devcoredump.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/devres.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/devres.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/devtmpfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/devtmpfs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/dma-contiguous.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/dma-contiguous.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/dma-mapping.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/firmware_class.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/firmware_class.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/memory.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/platform-msi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/platform-msi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/platform.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/domain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/domain.c</a></td><td class='right'>635</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/main.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/opp/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/opp/core.c</a></td><td class='right'>1351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/opp/cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/opp/cpu.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/opp/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/opp/debugfs.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/opp/of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/opp/of.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/opp/opp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/opp/opp.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/power.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/power.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/qos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/qos.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/runtime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/runtime.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/sysfs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/trace.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/wakeirq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/wakeirq.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/power/wakeup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/wakeup.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/property.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/property.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/regmap/regcache-lzo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/regmap/regcache-lzo.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/regmap/regcache-rbtree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/regmap/regcache-rbtree.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/regmap/regcache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/regmap/regcache.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/regmap/regmap-irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/regmap/regmap-irq.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/regmap/regmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/regmap/regmap.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/soc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/soc.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/base/test/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/test/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/base/test/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/test/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/base/test/test_async_driver_probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/test/test_async_driver_probe.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/base/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/topology.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bcma/bcma_private.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bcma/bcma_private.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bcma/driver_chipcommon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bcma/driver_chipcommon.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bcma/driver_mips.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bcma/driver_mips.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bcma/host_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bcma/host_pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bcma/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bcma/main.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/DAC960.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/DAC960.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/amiflop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/amiflop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/aoe/aoeblk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/aoe/aoeblk.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/brd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/brd.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/cciss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/cciss.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/cciss.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/cciss.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/cciss_scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/cciss_scsi.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/cryptoloop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/cryptoloop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/drbd/drbd_actlog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_actlog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/drbd/drbd_bitmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_bitmap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/drbd/drbd_int.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_int.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/drbd/drbd_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_main.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/drbd/drbd_nl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_nl.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/drbd/drbd_proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/drbd/drbd_receiver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_receiver.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/drbd/drbd_req.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_req.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/drbd/drbd_worker.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_worker.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/floppy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/floppy.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/hd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/hd.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/loop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/loop.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/mg_disk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/mg_disk.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/mtip32xx/mtip32xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/mtip32xx/mtip32xx.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/nbd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/nbd.c</a></td><td class='right'>840</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/null_blk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/null_blk.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/osdblk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/osdblk.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/paride/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/paride/pcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/pcd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/paride/pd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/pd.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/paride/pf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/pf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/paride/pg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/pg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/paride/pt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/pt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/pktcdvd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/pktcdvd.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/ps3disk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/ps3disk.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/rbd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/rbd.c</a></td><td class='right'>635</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/rbd_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/rbd_types.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/skd_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/skd_main.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/sunvdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/sunvdc.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/swim3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/swim3.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/sx8.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/sx8.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/umem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/umem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/virtio_blk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/virtio_blk.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/xen-blkback/blkback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/xen-blkback/blkback.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/xen-blkback/xenbus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/xen-blkback/xenbus.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/xen-blkfront.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/xen-blkfront.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/xsysace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/xsysace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/zram/zcomp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/zram/zcomp.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/zram/zcomp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/zram/zcomp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/zram/zram_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/zram/zram_drv.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/block/zram/zram_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/zram/zram_drv.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/ath3k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/ath3k.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/btbcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btbcm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/btmrvl_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btmrvl_drv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/btmrvl_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btmrvl_main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/btmrvl_sdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btmrvl_sdio.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/btqcomsmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btqcomsmd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/btusb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btusb.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/hci_bcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/hci_bcm.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/hci_bcsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/hci_bcsp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/hci_h5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/hci_h5.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/hci_qca.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/hci_qca.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bluetooth/hci_vhci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/hci_vhci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bus/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bus/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bus/arm-cci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/arm-cci.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bus/arm-ccn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/arm-ccn.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/bus/da8xx-mstpri.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/da8xx-mstpri.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/bus/tegra-gmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/tegra-gmi.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/bus/vexpress-config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/vexpress-config.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cdrom/cdrom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cdrom/cdrom.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cdrom/gdrom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cdrom/gdrom.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/agp/alpha-agp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/agp/alpha-agp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/agp/compat_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/agp/compat_ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/agp/frontend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/agp/frontend.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/agp/intel-gtt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/agp/intel-gtt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/apm-emulation.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/apm-emulation.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/applicom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/applicom.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/bfin-otp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/bfin-otp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/ds1302.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ds1302.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/ds1620.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ds1620.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/dtlk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/dtlk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/generic_nvram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/generic_nvram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hangcheck-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hangcheck-timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hpet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hpet.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/atmel-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/atmel-rng.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/cavium-rng-vf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/cavium-rng-vf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/core.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/meson-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/meson-rng.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/msm-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/msm-rng.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/n2-drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/n2-drv.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/n2rng.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/n2rng.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/omap-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/omap-rng.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/pic32-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/pic32-rng.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/pseries-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/pseries-rng.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/hw_random/via-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/via-rng.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/ipmi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/ipmi/bt-bmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/bt-bmc.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/ipmi/ipmi_devintf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_devintf.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/ipmi/ipmi_msghandler.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_msghandler.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/ipmi/ipmi_powernv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_powernv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/ipmi/ipmi_si_intf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_si_intf.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/ipmi/ipmi_ssif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_ssif.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/ipmi/ipmi_watchdog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_watchdog.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/lp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/lp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/mbcs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mbcs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mem.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/mmtimer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mmtimer.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/mspec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mspec.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/mwave/3780i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mwave/3780i.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/mwave/mwavedd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mwave/mwavedd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/nsc_gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/nsc_gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/nwbutton.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/nwbutton.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/nwflash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/nwflash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/pc8736x_gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pc8736x_gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/pcmcia/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/pcmcia/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/pcmcia/cm4000_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/cm4000_cs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/pcmcia/cm4040_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/cm4040_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/char/pcmcia/scr24x_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/scr24x_cs.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/pcmcia/synclink_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/synclink_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/ppdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ppdev.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/random.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/random.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/raw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/raw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/rtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/rtc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/scx200_gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/scx200_gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/snsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/snsc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/snsc_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/snsc_event.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/sonypi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/sonypi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tile-srom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tile-srom.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tlclk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tlclk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/toshiba.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/toshiba.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/st33zp24/st33zp24.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/st33zp24/st33zp24.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm-chip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm-chip.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm-dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm-dev.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm-interface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm-interface.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm-sysfs.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/char/tpm/tpm1_eventlog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm1_eventlog.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm2-cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm2-cmd.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/char/tpm/tpm2_eventlog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm2_eventlog.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_acpi.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_atmel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_atmel.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_crb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_crb.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/char/tpm/tpm_eventlog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_eventlog.c</a></td><td class='right'>454</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_eventlog.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_eventlog.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_ibmvtpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_ibmvtpm.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_nsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_nsc.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_of.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_tis.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_tis.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_tis_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_tis_core.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_tis_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_tis_core.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_tis_spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_tis_spi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/tpm_vtpm_proxy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_vtpm_proxy.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/tpm/xen-tpmfront.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/xen-tpmfront.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/virtio_console.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/virtio_console.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/xilinx_hwicap/buffer_icap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/xilinx_hwicap/buffer_icap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/char/xilinx_hwicap/xilinx_hwicap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/xilinx_hwicap/xilinx_hwicap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/axs10x/i2s_pll_clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/axs10x/i2s_pll_clock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/bcm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/bcm/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/bcm/clk-bcm2835.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/bcm/clk-bcm2835.c</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/clk-cdce925.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-cdce925.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/clk-conf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-conf.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/clk-cs2000-cp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-cs2000-cp.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/clk-devres.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-devres.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/clk-gate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-gate.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/clk-oxnas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-oxnas.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/clk-qoriq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-qoriq.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/clk-scpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-scpi.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/clk-stm32f4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-stm32f4.c</a></td><td class='right'>1297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/clk-versaclock5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-versaclock5.c</a></td><td class='right'>791</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/clk-wm831x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-wm831x.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/clkdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clkdev.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/hisilicon/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/hisilicon/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/hisilicon/clk-hi3660.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/clk-hi3660.c</a></td><td class='right'>567</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/hisilicon/clkgate-separated.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/clkgate-separated.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/hisilicon/crg-hi3516cv300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/crg-hi3516cv300.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/hisilicon/crg-hi3798cv200.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/crg-hi3798cv200.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/hisilicon/crg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/crg.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/imx/clk-imx31.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-imx31.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/imx/clk-imx6q.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-imx6q.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/imx/clk-imx6ul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-imx6ul.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/imx/clk-imx7d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-imx7d.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/imx/clk-pllv3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-pllv3.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/imx/clk-vf610.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-vf610.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/imx/clk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/keystone/pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/keystone/pll.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mediatek/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/Kconfig</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mediatek/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-gate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-gate.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-gate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-gate.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-mt2701-bdp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-bdp.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-mt2701-eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-eth.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-mt2701-hif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-hif.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-mt2701-img.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-img.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-mt2701-mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-mm.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-mt2701-vdec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-vdec.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-mt2701.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701.c</a></td><td class='right'>1035</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-mtk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mtk.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-mtk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mtk.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mediatek/clk-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-pll.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/meson/gxbb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/meson/gxbb.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/meson/gxbb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/meson/gxbb.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/meson/meson8b.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/meson/meson8b.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mmp/clk-of-mmp2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mmp/clk-of-mmp2.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mmp/clk-of-pxa1928.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mmp/clk-of-pxa1928.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mmp/clk-of-pxa910.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mmp/clk-of-pxa910.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mvebu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mvebu/ap806-system-controller.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/ap806-system-controller.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mvebu/armada-xp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/armada-xp.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mvebu/clk-corediv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/clk-corediv.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mvebu/clk-cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/clk-cpu.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/mvebu/cp110-system-controller.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/cp110-system-controller.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/mvebu/mv98dx3236.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/mv98dx3236.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/nxp/clk-lpc18xx-ccu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/nxp/clk-lpc18xx-ccu.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/nxp/clk-lpc32xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/nxp/clk-lpc32xx.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/pxa/clk-pxa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/pxa/clk-pxa.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/pxa/clk-pxa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/pxa/clk-pxa.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/pxa/clk-pxa25x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/pxa/clk-pxa25x.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/pxa/clk-pxa27x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/pxa/clk-pxa27x.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/clk-alpha-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-alpha-pll.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/clk-alpha-pll.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-alpha-pll.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/clk-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-pll.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/clk-rcg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-rcg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/clk-rcg2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-rcg2.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/qcom/clk-rpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-rpm.c</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/qcom/clk-smd-rpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-smd-rpm.c</a></td><td class='right'>649</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/common.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/common.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/gcc-apq8084.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-apq8084.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/gcc-ipq4019.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-ipq4019.c</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/gcc-ipq806x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-ipq806x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/gcc-mdm9615.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-mdm9615.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/gcc-msm8916.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-msm8916.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/gcc-msm8974.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-msm8974.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/qcom/gcc-msm8994.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-msm8994.c</a></td><td class='right'>2318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/gcc-msm8996.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-msm8996.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/gdsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gdsc.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/gdsc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gdsc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/lcc-ipq806x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/lcc-ipq806x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/qcom/mmcc-msm8996.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/mmcc-msm8996.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/clk-mstp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/clk-mstp.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/clk-r8a7778.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/clk-r8a7778.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/clk-r8a7779.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/clk-r8a7779.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/clk-rcar-gen2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/clk-rcar-gen2.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/renesas/r8a7743-cpg-mssr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/r8a7743-cpg-mssr.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/renesas/r8a7745-cpg-mssr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/r8a7745-cpg-mssr.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/r8a7795-cpg-mssr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/r8a7795-cpg-mssr.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/r8a7796-cpg-mssr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/r8a7796-cpg-mssr.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/renesas/rcar-gen2-cpg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/rcar-gen2-cpg.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/renesas/rcar-gen2-cpg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/rcar-gen2-cpg.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/rcar-gen3-cpg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/rcar-gen3-cpg.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/rcar-gen3-cpg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/rcar-gen3-cpg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/renesas-cpg-mssr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/renesas-cpg-mssr.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/renesas/renesas-cpg-mssr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/renesas-cpg-mssr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/rockchip/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/rockchip/clk-cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-cpu.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/rockchip/clk-muxgrf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-muxgrf.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/rockchip/clk-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-pll.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/rockchip/clk-rk1108.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-rk1108.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/rockchip/clk-rk3188.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-rk3188.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/rockchip/clk-rk3288.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-rk3288.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/rockchip/clk-rk3328.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-rk3328.c</a></td><td class='right'>895</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/rockchip/clk-rk3399.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-rk3399.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/rockchip/clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/rockchip/clk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/samsung/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/samsung/clk-exynos-audss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-exynos-audss.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/samsung/clk-exynos4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-exynos4.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/clk/samsung/clk-exynos4415.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-exynos4415.c</a></td><td class='right'>1022</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/samsung/clk-exynos5420.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-exynos5420.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/samsung/clk-exynos5433.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-exynos5433.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/samsung/clk-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-pll.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/samsung/clk-s3c2410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-s3c2410.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/samsung/clk-s3c2412.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-s3c2412.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/samsung/clk-s3c2443.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-s3c2443.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/samsung/clk-s3c64xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-s3c64xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/st/clk-flexgen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/st/clk-flexgen.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/Kconfig</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun50i-a64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun50i-a64.c</a></td><td class='right'>915</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun50i-a64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun50i-a64.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun5i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun5i.c</a></td><td class='right'>1022</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun5i.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun5i.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun6i-a31.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun6i-a31.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun8i-a23.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun8i-a23.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun8i-a33.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun8i-a33.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun8i-h3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun8i-h3.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun8i-v3s.c</a></td><td class='right'>591</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun8i-v3s.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun8i-v3s.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun9i-a80-de.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80-de.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun9i-a80.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80.c</a></td><td class='right'>1223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu-sun9i-a80.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_common.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_div.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_div.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_div.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_div.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_frac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_frac.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_frac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_frac.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_mp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_mp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_mp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_mp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_mult.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_mult.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_mult.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_mult.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_mux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_mux.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_nk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nk.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_nk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nk.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_nkm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nkm.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_nkm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nkm.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_nkmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nkmp.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_nkmp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nkmp.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_nm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nm.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi-ng/ccu_nm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nm.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/sunxi/clk-mod0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi/clk-mod0.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/tegra/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/tegra/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/tegra/clk-bpmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/clk-bpmp.c</a></td><td class='right'>620</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/tegra/clk-dfll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/clk-dfll.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/clk-tegra124-dfll-fcpu.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/tegra/cvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/cvb.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/ti/clk-3xxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/clk-3xxx.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/ti/clk-7xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/clk-7xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/ti/clk-dra7-atl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/clk-dra7-atl.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/ti/clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/clock.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/ti/divider.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/divider.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/ti/dpll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/dpll.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/ti/dpll3xxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/dpll3xxx.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/uniphier/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/uniphier/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/uniphier/clk-uniphier-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/uniphier/clk-uniphier-core.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/uniphier/clk-uniphier-cpugear.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/uniphier/clk-uniphier-cpugear.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/uniphier/clk-uniphier-sys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/uniphier/clk-uniphier-sys.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/uniphier/clk-uniphier.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/uniphier/clk-uniphier.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/ux500/abx500-clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ux500/abx500-clk.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/ux500/u8500_of_clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ux500/u8500_of_clk.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/x86/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/x86/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clk/x86/clk-pmc-atom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/x86/clk-pmc-atom.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/zte/clk-zx296718.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/zte/clk-zx296718.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/zte/clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/zte/clk.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clk/zte/clk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/zte/clk.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/Kconfig</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/acpi_pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/acpi_pm.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clocksource/arc_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/arc_timer.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/arm_arch_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/arm_arch_timer.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/arm_global_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/arm_global_timer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/bcm2835_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/bcm2835_timer.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/cadence_ttc_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/cadence_ttc_timer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clocksource/clkevt-probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/clkevt-probe.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/clksrc-dbx500-prcmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/clksrc-dbx500-prcmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/dummy_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/dummy_timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/dw_apb_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/dw_apb_timer.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/em_sti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/em_sti.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/exynos_mct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/exynos_mct.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/h8300_timer16.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/h8300_timer16.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/h8300_tpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/h8300_tpu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/i8253.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/i8253.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/jcore-pit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/jcore-pit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/metag_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/metag_generic.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/mips-gic-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/mips-gic-timer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/mmio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/mmio.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/moxart_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/moxart_timer.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/mxs_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/mxs_timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/pxa_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/pxa_timer.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/qcom-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/qcom-timer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clocksource/renesas-ostm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/renesas-ostm.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/samsung_pwm_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/samsung_pwm_timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/scx200_hrt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/scx200_hrt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/sh_cmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/sh_cmt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/sh_tmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/sh_tmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/tcb_clksrc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/tcb_clksrc.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/time-armada-370-xp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/time-armada-370-xp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/time-pistachio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/time-pistachio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/timer-atlas7.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-atlas7.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/timer-atmel-pit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-atmel-pit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/timer-atmel-st.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-atmel-st.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/timer-digicolor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-digicolor.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/clocksource/timer-gemini.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-gemini.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/timer-nps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-nps.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/timer-prima2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-prima2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/timer-sun5i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-sun5i.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/timer-ti-32k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-ti-32k.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/clocksource/vt8500_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/vt8500_timer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/Kconfig.arm?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/Kconfig.arm</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/Kconfig.x86?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/Kconfig.x86</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/acpi-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/acpi-cpufreq.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/cpufreq/bmips-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/bmips-cpufreq.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/cpufreq/brcmstb-avs-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/brcmstb-avs-cpufreq.c</a></td><td class='right'>1066</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/cppc_cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cppc_cpufreq.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/cpufreq-dt-platdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq-dt-platdev.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/cpufreq-dt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq-dt.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/cpufreq_conservative.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq_conservative.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/cpufreq_governor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq_governor.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/cpufreq_governor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq_governor.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/cpufreq_ondemand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq_ondemand.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/cpufreq_stats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq_stats.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/davinci-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/davinci-cpufreq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/exynos5440-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/exynos5440-cpufreq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/ia64-acpi-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/ia64-acpi-cpufreq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/imx6q-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/imx6q-cpufreq.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/cpufreq/integrator-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/integrator-cpufreq.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/intel_pstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/intel_pstate.c</a></td><td class='right'>1394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/mt8173-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/mt8173-cpufreq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/omap-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/omap-cpufreq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/powernv-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/powernv-cpufreq.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/ppc_cbe_cpufreq_pmi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/qoriq-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/qoriq-cpufreq.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/s3c2416-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/s3c2416-cpufreq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/s3c64xx-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/s3c64xx-cpufreq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/sparc-us2e-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/sparc-us2e-cpufreq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/sparc-us3-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/sparc-us3-cpufreq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpufreq/sti-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/sti-cpufreq.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/cpufreq/ti-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/ti-cpufreq.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpuidle/cpuidle-powernv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/cpuidle-powernv.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpuidle/cpuidle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/cpuidle.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpuidle/driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/driver.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpuidle/dt_idle_states.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/dt_idle_states.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpuidle/governor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/governor.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpuidle/governors/ladder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/governors/ladder.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpuidle/governors/menu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/governors/menu.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/cpuidle/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/sysfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/Kconfig</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/amcc/crypto4xx_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/amcc/crypto4xx_core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/atmel-aes-regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-aes-regs.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/atmel-aes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-aes.c</a></td><td class='right'>644</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/atmel-authenc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-authenc.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/atmel-sha-regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-sha-regs.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/atmel-sha.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-sha.c</a></td><td class='right'>1433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/atmel-tdes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-tdes.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/bcm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/bcm/cipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/cipher.c</a></td><td class='right'>4963</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 38.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 61.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/bcm/cipher.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/cipher.h</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/bcm/spu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/spu.c</a></td><td class='right'>1251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/bcm/spu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/spu.h</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/bcm/spu2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/spu2.c</a></td><td class='right'>1401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/bcm/spu2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/spu2.h</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/bcm/spum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/spum.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/bcm/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/util.c</a></td><td class='right'>581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/bcm/util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/util.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/bfin_crc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bfin_crc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/bfin_crc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bfin_crc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/caamalg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caamalg.c</a></td><td class='right'>2050</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 12.3%;'/><td class='none' style='width: 84.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/caam/caamalg_desc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caamalg_desc.c</a></td><td class='right'>1306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/caam/caamalg_desc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caamalg_desc.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/caamhash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caamhash.c</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/caampkc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caampkc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/caamrng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caamrng.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/ctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/ctrl.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/desc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/desc.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/desc_constr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/desc_constr.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/error.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/error.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/intern.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/intern.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/jr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/jr.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/key_gen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/key_gen.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/key_gen.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/key_gen.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/caam/sg_sw_sec4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/sg_sw_sec4.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/cpt_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cpt_common.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/cpt_hw_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cpt_hw_types.h</a></td><td class='right'>658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/cptpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptpf.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/cptpf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptpf_main.c</a></td><td class='right'>670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/cptpf_mbox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptpf_mbox.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/cptvf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/cptvf_algs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf_algs.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/cptvf_algs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf_algs.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/cptvf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf_main.c</a></td><td class='right'>866</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/cptvf_mbox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf_mbox.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/cptvf_reqmanager.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf_reqmanager.c</a></td><td class='right'>593</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/cavium/cpt/request_manager.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/request_manager.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/ccp/ccp-dev-v3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-dev-v3.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/ccp/ccp-dev-v5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-dev-v5.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/ccp/ccp-dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-dev.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/ccp/ccp-dev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-dev.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/ccp/ccp-dmaengine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-dmaengine.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/ccp/ccp-ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-ops.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/chelsio/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/chelsio/chcr_algo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/chcr_algo.c</a></td><td class='right'>2033</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.7%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 84.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/chelsio/chcr_algo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/chcr_algo.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/chelsio/chcr_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/chcr_core.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/chelsio/chcr_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/chcr_core.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/chelsio/chcr_crypto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/chcr_crypto.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/img-hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/img-hash.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/marvell/cesa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/marvell/cesa.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/marvell/cesa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/marvell/cesa.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/marvell/cipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/marvell/cipher.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/marvell/hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/marvell/hash.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/marvell/tdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/marvell/tdma.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/mediatek/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/mediatek/mtk-aes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/mtk-aes.c</a></td><td class='right'>1299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/mediatek/mtk-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/mtk-platform.c</a></td><td class='right'>604</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/mediatek/mtk-platform.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/mtk-platform.h</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/mediatek/mtk-regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/mtk-regs.h</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/mediatek/mtk-sha.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/mtk-sha.c</a></td><td class='right'>1435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/mv_cesa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mv_cesa.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/nx/nx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/nx/nx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/padlock-aes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/padlock-aes.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/padlock-sha.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/padlock-sha.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/picoxcell_crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/picoxcell_crypto.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_c3xxx/adf_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_c3xxx/adf_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_c3xxxvf/adf_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_c62x/adf_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_c62x/adf_drv.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_c62xvf/adf_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_c62xvf/adf_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_common/adf_accel_devices.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_common/adf_accel_devices.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_common/adf_cfg_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_common/adf_cfg_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_common/adf_common_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_common/adf_common_drv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_common/adf_dev_mgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_common/adf_dev_mgr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_common/adf_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_common/adf_init.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_common/adf_sriov.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_common/adf_sriov.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_common/adf_vf_isr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_common/adf_vf_isr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_common/qat_hal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_common/qat_hal.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_dh895xcc/adf_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_dh895xcc/adf_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/qat/qat_dh895xccvf/adf_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/sahara.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/sahara.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/talitos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/talitos.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/virtio/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/virtio/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/virtio/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/virtio/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/virtio/virtio_crypto_algs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/virtio/virtio_crypto_algs.c</a></td><td class='right'>558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/virtio/virtio_crypto_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/virtio/virtio_crypto_common.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/virtio/virtio_crypto_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/virtio/virtio_crypto_core.c</a></td><td class='right'>540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/crypto/virtio/virtio_crypto_mgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/virtio/virtio_crypto_mgr.c</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/vmx/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/vmx/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/vmx/aes_cbc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/vmx/aes_cbc.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/vmx/aes_ctr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/vmx/aes_ctr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/crypto/vmx/aes_xts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/vmx/aes_xts.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dax/dax.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dax/dax.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dax/pmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dax/pmem.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/devfreq/devfreq-event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/devfreq/devfreq-event.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/devfreq/devfreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/devfreq/devfreq.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/devfreq/event/exynos-nocp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/devfreq/event/exynos-nocp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/devfreq/event/exynos-ppmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/devfreq/event/exynos-ppmu.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/devfreq/event/rockchip-dfi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/devfreq/event/rockchip-dfi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/devfreq/exynos-bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/devfreq/exynos-bus.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/devfreq/governor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/devfreq/governor.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/devfreq/governor_passive.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/devfreq/governor_passive.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/devfreq/governor_userspace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/devfreq/governor_userspace.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/devfreq/rk3399_dmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/devfreq/rk3399_dmc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/devfreq/tegra-devfreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/devfreq/tegra-devfreq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dio/dio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dio/dio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma-buf/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma-buf/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma-buf/dma-buf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/dma-buf.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/dma-buf/dma-fence-array.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/dma-fence-array.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/dma-buf/dma-fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/dma-fence.c</a></td><td class='right'>575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/dma-buf/fence-array.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/fence-array.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/dma-buf/fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/fence.c</a></td><td class='right'>532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma-buf/reservation.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/reservation.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma-buf/seqno-fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/seqno-fence.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma-buf/sw_sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/sw_sync.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma-buf/sync_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/sync_debug.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma-buf/sync_debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/sync_debug.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma-buf/sync_file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma-buf/sync_file.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/amba-pl08x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/amba-pl08x.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/at_hdmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/at_hdmac.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/at_xdmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/at_xdmac.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/cppi41.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/cppi41.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/dmaengine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/dmaengine.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/dmatest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/dmatest.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/dw/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/dw/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/dw/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/dw/core.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/dw/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/dw/pci.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/dw/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/dw/platform.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/dw/regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/dw/regs.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/edma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/edma.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/fsl_raid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/fsl_raid.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/hsu/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/hsu/pci.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/img-mdc-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/img-mdc-dma.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/imx-sdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/imx-sdma.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/ioat/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/ioat/dma.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/ioat/hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/ioat/hw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/ioat/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/ioat/init.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/ioat/registers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/ioat/registers.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/ipu/ipu_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/ipu/ipu_irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/k3dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/k3dma.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/mic_x100_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/mic_x100_dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/mv_xor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/mv_xor.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/mv_xor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/mv_xor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/nbpfaxi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/nbpfaxi.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/omap-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/omap-dma.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/pch_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/pch_dma.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/pl330.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/pl330.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/pxa_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/pxa_dma.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/qcom/hidma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/qcom/hidma.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/qcom/hidma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/qcom/hidma.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/qcom/hidma_dbg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/qcom/hidma_dbg.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/qcom/hidma_ll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/qcom/hidma_ll.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/qcom/hidma_mgmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/qcom/hidma_mgmt.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/s3c24xx-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/s3c24xx-dma.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/sh/rcar-dmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/sh/rcar-dmac.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/sh/usb-dmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/sh/usb-dmac.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/sirf-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/sirf-dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/dma/st_fdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/st_fdma.c</a></td><td class='right'>889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/dma/st_fdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/st_fdma.h</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/ste_dma40.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/ste_dma40.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/stm32-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/stm32-dma.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/dma/ti-dma-crossbar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/ti-dma-crossbar.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/dma/zx296702_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/zx296702_dma.c</a></td><td class='right'>951</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/dma/zx_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/dma/zx_dma.c</a></td><td class='right'>952</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/altera_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/altera_edac.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/amd64_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/amd64_edac.c</a></td><td class='right'>734</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/amd64_edac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/amd64_edac.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/amd76x_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/amd76x_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/amd8111_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/amd8111_edac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/amd8131_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/amd8131_edac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/cell_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/cell_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/cpc925_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/cpc925_edac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/e752x_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/e752x_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/e7xxx_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/e7xxx_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/edac/edac_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_core.h</a></td><td class='right'>517</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/edac_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_device.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/edac/edac_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_device.h</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/edac_device_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_device_sysfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/edac_mc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_mc.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/edac/edac_mc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_mc.h</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/edac_mc_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_mc_sysfs.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/edac_module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_module.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/edac_module.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_module.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/edac_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_pci.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/edac/edac_pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_pci.h</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/edac_pci_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/edac_pci_sysfs.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/fsl_ddr_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/fsl_ddr_edac.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/ghes_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/ghes_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/highbank_l2_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/highbank_l2_edac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/highbank_mc_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/highbank_mc_edac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/i3000_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/i3000_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/i3200_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/i3200_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/i5000_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/i5000_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/i5100_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/i5100_edac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/i5400_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/i5400_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/i7300_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/i7300_edac.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/i7core_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/i7core_edac.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/i82443bxgx_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/i82443bxgx_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/i82860_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/i82860_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/i82875p_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/i82875p_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/i82975x_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/i82975x_edac.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/ie31200_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/ie31200_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/layerscape_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/layerscape_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/mce_amd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/mce_amd.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/mce_amd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/mce_amd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/mpc85xx_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/mpc85xx_edac.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/mv64x60_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/mv64x60_edac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/octeon_edac-l2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/octeon_edac-l2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/octeon_edac-lmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/octeon_edac-lmc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/octeon_edac-pc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/octeon_edac-pc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/octeon_edac-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/octeon_edac-pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/pasemi_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/pasemi_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/ppc4xx_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/ppc4xx_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/r82600_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/r82600_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/sb_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/sb_edac.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/skx_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/skx_edac.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/synopsys_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/synopsys_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/tile_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/tile_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/x38_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/x38_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/edac/xgene_edac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/edac/xgene_edac.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/devres.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/devres.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/extcon-adc-jack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon-adc-jack.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/extcon-arizona.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon-arizona.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/extcon-axp288.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon-axp288.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/extcon/extcon-intel-int3496.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon-intel-int3496.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/extcon-max14577.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon-max14577.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/extcon-max77693.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon-max77693.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/extcon-max77843.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon-max77843.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/extcon-palmas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon-palmas.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/extcon-rt8973a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon-rt8973a.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/extcon-sm5502.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon-sm5502.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/extcon-usb-gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon-usb-gpio.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/extcon/extcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/extcon/extcon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/extcon/extcon.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firewire/core-cdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firewire/core-cdev.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firewire/core-device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firewire/core-device.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firewire/net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firewire/net.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/Kconfig</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/arm_scpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/arm_scpi.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/dmi_scan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/dmi_scan.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/firmware/efi/apple-properties.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/apple-properties.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/arm-init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/arm-init.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/arm-runtime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/arm-runtime.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/firmware/efi/dev-path-parser.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/dev-path-parser.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/efi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/efi.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/esrt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/esrt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/fake_mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/fake_mem.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/libstub/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/libstub/Makefile</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/libstub/arm-stub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/libstub/arm-stub.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/libstub/efi-stub-helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/libstub/efi-stub-helper.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/libstub/efistub.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/libstub/efistub.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/libstub/fdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/libstub/fdt.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/libstub/random.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/libstub/random.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/firmware/efi/libstub/secureboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/libstub/secureboot.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/memattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/memattr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/memmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/memmap.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/efi/test/efi_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/efi/test/efi_test.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/psci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/psci.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/firmware/psci_checker.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/psci_checker.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/qcom_scm-32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/qcom_scm-32.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/qcom_scm-64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/qcom_scm-64.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/qcom_scm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/qcom_scm.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/firmware/qcom_scm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/qcom_scm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/firmware/tegra/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/tegra/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/firmware/tegra/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/tegra/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/firmware/tegra/bpmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/tegra/bpmp.c</a></td><td class='right'>869</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/firmware/tegra/ivc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/tegra/ivc.c</a></td><td class='right'>695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/firmware/ti_sci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/ti_sci.c</a></td><td class='right'>1991</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/firmware/ti_sci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/firmware/ti_sci.h</a></td><td class='right'>492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/fpga/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fpga/Kconfig</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/fpga/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fpga/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/fpga/altera-fpga2sdram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fpga/altera-fpga2sdram.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/fpga/altera-freeze-bridge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fpga/altera-freeze-bridge.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/fpga/altera-hps2fpga.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fpga/altera-hps2fpga.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/fpga/fpga-bridge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fpga/fpga-bridge.c</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/fpga/fpga-mgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fpga/fpga-mgr.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/fpga/fpga-region.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fpga/fpga-region.c</a></td><td class='right'>603</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/fpga/socfpga-a10.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fpga/socfpga-a10.c</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/fpga/socfpga.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fpga/socfpga.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/fpga/zynq-fpga.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fpga/zynq-fpga.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/fsi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fsi/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/fsi/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fsi/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/fsi/fsi-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/fsi/fsi-core.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/Kconfig</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/devres.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/devres.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-104-dio-48e.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-104-dio-48e.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-104-idi-48.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-104-idi-48.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-104-idio-16.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-104-idio-16.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-adnp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-adnp.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpio/gpio-altera-a10sr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-altera-a10sr.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-arizona.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-arizona.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-aspeed.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-aspeed.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-axp209.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-axp209.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-bcm-kona.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-bcm-kona.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-crystalcove.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-crystalcove.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-davinci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-davinci.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-dln2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-dln2.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-dwapb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-dwapb.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-ep93xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-ep93xx.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-etraxfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-etraxfs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpio/gpio-exar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-exar.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-f7188x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-f7188x.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpio/gpio-gemini.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-gemini.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-gpio-mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-gpio-mm.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-htc-egpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-htc-egpio.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-intel-mid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-intel-mid.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-lp873x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-lp873x.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-max732x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-max732x.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-max77620.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-max77620.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-mb86s7x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-mb86s7x.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-mcp23s08.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-mcp23s08.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-menz127.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-menz127.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-merrifield.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-merrifield.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-mm-lantiq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-mm-lantiq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-mockup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-mockup.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-mvebu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-mvebu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-mxs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-mxs.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-omap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-omap.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-pca953x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-pca953x.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-pcf857x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-pcf857x.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpio/gpio-pci-idio-16.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-pci-idio-16.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-pl061.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-pl061.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-rcar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-rcar.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-stmpe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-stmpe.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-stp-xway.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-stp-xway.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpio/gpio-sx150x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-sx150x.c</a></td><td class='right'>792</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-tc3589x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-tc3589x.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-tegra.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-tegra.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-tps65218.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-tps65218.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-vf610.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-vf610.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-vx855.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-vx855.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-wcove.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-wcove.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-wm831x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-wm831x.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-wm8994.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-wm8994.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpio-ws16c48.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpio-ws16c48.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpiolib-acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpiolib-acpi.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpio/gpiolib-devprop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpiolib-devprop.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpiolib-of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpiolib-of.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpiolib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpiolib.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpio/gpiolib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpio/gpiolib.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/Kconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/ObjectID.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/ObjectID.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu.h</a></td><td class='right'>964</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 6.5%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_device.c</a></td><td class='right'>691</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_display.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_job.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_object.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_object.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_test.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/atombios_crtc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/atombios_encoders.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/ci_dpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/ci_dpm.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cik.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cik.c</a></td><td class='right'>844</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cik.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cik.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cik_ih.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cik_ih.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cik_ih.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cik_ih.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cik_sdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cik_sdma.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cik_sdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cik_sdma.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cikd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cikd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/clearstate_si.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/clearstate_si.h</a> (renamed from drivers/gpu/drm/amd/include/asic_reg/si/clearstate_si.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cz_dpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cz_dpm.c</a></td><td class='right'>2298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.9%;'/><td class='none' style='width: 82.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cz_dpm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cz_dpm.h</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cz_ih.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cz_ih.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cz_ih.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cz_ih.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cz_smc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cz_smc.c</a></td><td class='right'>995</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.8%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/cz_smumgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/cz_smumgr.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/dce_v10_0.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/dce_v10_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/dce_v10_0.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/dce_v11_0.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/dce_v11_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/dce_v11_0.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/dce_v6_0.c</a></td><td class='right'>794</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/dce_v6_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/dce_v6_0.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/dce_v8_0.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/dce_v8_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/dce_v8_0.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/dce_virtual.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/dce_virtual.c</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/dce_virtual.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/dce_virtual.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c</a></td><td class='right'>1970</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 6.1%;'/><td class='none' style='width: 84.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c</a></td><td class='right'>1739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/gmc_v8_0.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/iceland_ih.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/iceland_ih.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/iceland_ih.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/iceland_ih.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/kv_dpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/kv_dpm.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c</a></td><td class='right'>592</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/sdma_v2_4.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/sdma_v3_0.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/si.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/si.c</a></td><td class='right'>1292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/si.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/si.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/si_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/si_dma.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/si_dma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/si_dma.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/si_dpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/si_dpm.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/si_enums.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/si_enums.h</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/si_ih.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/si_ih.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/si_ih.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/si_ih.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/si_smc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/si_smc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/sid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/sid.h</a> (renamed from drivers/gpu/drm/amd/include/asic_reg/si/sid.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/tonga_ih.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/tonga_ih.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/tonga_ih.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/tonga_ih.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/uvd_v4_2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/uvd_v5_0.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/uvd_v6_0.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/vce_v2_0.c</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/vce_v2_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/vce_v2_0.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/vce_v3_0.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/vce_v3_0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/vce_v3_0.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/vi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/vi.c</a></td><td class='right'>1353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/vi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/vi.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/vi_dpm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/vi_dpm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdgpu/vid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdgpu/vid.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdkfd/kfd_chardev.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdkfd/kfd_events.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdkfd/kfd_events.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/amdkfd/kfd_process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/amdkfd/kfd_process.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/amd_shared.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/amd_shared.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/bif/bif_3_0_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/bif/bif_3_0_d.h</a></td><td class='right'>661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/bif/bif_3_0_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/bif/bif_3_0_sh_mask.h</a></td><td class='right'>8127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 63.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 36.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/dce/dce_10_0_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/dce/dce_10_0_d.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/dce/dce_10_0_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/dce/dce_10_0_sh_mask.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_0_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_0_d.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_0_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_0_sh_mask.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--<span class='modechange'>[-rwxr-xr-x]</span></td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_d.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--<span class='modechange'>[-rwxr-xr-x]</span></td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_sh_mask.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h</a></td><td class='right'>4457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 65.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h</a></td><td class='right'>9836</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 76.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 23.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_d.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_d.h</a></td><td class='right'>1784</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_sh_mask.h</a></td><td class='right'>12821</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_6_0_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_6_0_d.h</a></td><td class='right'>1274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_6_0_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_6_0_sh_mask.h</a></td><td class='right'>11895</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 92.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 7.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_sh_mask.h</a></td><td class='right'>1079</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/smu/smu_6_0_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/smu/smu_6_0_d.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/smu/smu_6_0_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/smu/smu_6_0_sh_mask.h</a></td><td class='right'>715</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_d.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_d.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_sh_mask.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_sh_mask.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_sh_mask.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_0_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_0_d.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_0_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_0_sh_mask.h</a></td><td class='right'>795</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/vce/vce_1_0_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/vce/vce_1_0_d.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/asic_reg/vce/vce_1_0_sh_mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/asic_reg/vce/vce_1_0_sh_mask.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/atombios.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/atombios.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--<span class='modechange'>[-rwxr-xr-x]</span></td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/include/cgs_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/include/cgs_common.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/amd_powerplay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/amd_powerplay.c</a></td><td class='right'>734</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_clockpowergating.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/smu7_clockpowergating.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_clockpowergating.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/smu7_clockpowergating.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/inc/eventmgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/inc/eventmgr.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/inc/hwmgr.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/inc/power_state.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/inc/power_state.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/inc/pp_debug.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/inc/pp_instance.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/inc/pp_instance.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/inc/smumgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/inc/smumgr.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--<span class='modechange'>[-rwxr-xr-x]</span></td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/scheduler/gpu_scheduler.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/scheduler/gpu_scheduler.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/amd/scheduler/sched_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/amd/scheduler/sched_fence.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arc/arcpgu_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arc/arcpgu_crtc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arc/arcpgu_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arc/arcpgu_drv.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arc/arcpgu_hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arc/arcpgu_hdmi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arc/arcpgu_sim.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arc/arcpgu_sim.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arm/hdlcd_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arm/hdlcd_crtc.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arm/hdlcd_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arm/hdlcd_drv.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arm/malidp_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arm/malidp_drv.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arm/malidp_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arm/malidp_drv.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arm/malidp_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arm/malidp_hw.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arm/malidp_hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arm/malidp_hw.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arm/malidp_planes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arm/malidp_planes.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/arm/malidp_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/arm/malidp_regs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/armada/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/armada/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/armada/armada_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/armada_crtc.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/armada/armada_crtc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/armada_crtc.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/armada/armada_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/armada_debugfs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/armada/armada_drm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/armada_drm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/armada/armada_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/armada_drv.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/armada/armada_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/armada_fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/armada/armada_fbdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/armada_fbdev.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/armada/armada_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/armada_gem.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/armada/armada_overlay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/armada_overlay.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/armada/armada_trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/armada_trace.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/armada/armada_trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/armada/armada_trace.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ast/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ast/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ast/ast_dram_tables.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ast/ast_dram_tables.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ast/ast_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ast/ast_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ast/ast_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ast/ast_drv.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ast/ast_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ast/ast_fb.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ast/ast_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ast/ast_main.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ast/ast_mode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ast/ast_mode.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ast/ast_post.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ast/ast_post.c</a></td><td class='right'>566</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ast/ast_tables.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ast/ast_tables.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ast/ast_ttm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ast/ast_ttm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bochs/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bochs/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bochs/bochs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bochs/bochs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bochs/bochs_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bochs/bochs_drv.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bochs/bochs_fbdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bochs/bochs_fbdev.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bochs/bochs_kms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bochs/bochs_kms.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bochs/bochs_mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bochs/bochs_mm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/adv7511/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/adv7511/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/adv7511/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/adv7511/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/adv7511/adv7511.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/adv7511/adv7511.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/adv7511/adv7511_audio.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/adv7511/adv7511_drv.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/adv7511/adv7533.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/adv7511/adv7533.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/analogix/analogix_dp_core.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/dumb-vga-dac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/dumb-vga-dac.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/dw-hdmi-audio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/dw-hdmi-audio.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/dw-hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/dw-hdmi.c</a></td><td class='right'>736</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/dw-hdmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/dw-hdmi.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/nxp-ptn3460.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/nxp-ptn3460.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/parade-ps8622.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/parade-ps8622.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/sil-sii8620.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/sil-sii8620.c</a></td><td class='right'>2245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/sil-sii8620.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/sil-sii8620.h</a></td><td class='right'>1535</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/tc358767.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/tc358767.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/bridge/ti-tfp410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/bridge/ti-tfp410.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/cirrus/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/cirrus/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/cirrus/cirrus_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/cirrus/cirrus_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/cirrus/cirrus_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/cirrus/cirrus_drv.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/cirrus/cirrus_fbdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/cirrus/cirrus_fbdev.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/cirrus/cirrus_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/cirrus/cirrus_main.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/cirrus/cirrus_mode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/cirrus/cirrus_mode.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/cirrus/cirrus_ttm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/cirrus/cirrus_ttm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_agpsupport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_agpsupport.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_atomic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_atomic.c</a></td><td class='right'>685</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_atomic_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_atomic_helper.c</a></td><td class='right'>574</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_auth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_auth.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_blend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_blend.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_bridge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_bridge.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_cache.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_color_mgmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_color_mgmt.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_connector.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_connector.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_crtc.c</a></td><td class='right'>851</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_crtc_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_crtc_helper.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_crtc_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_crtc_internal.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_debugfs.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/drm_debugfs_crc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_debugfs_crc.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_dp_dual_mode_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_dp_dual_mode_helper.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_dp_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_dp_helper.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_dp_mst_topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_dp_mst_topology.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_drv.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/drm_dumb_buffers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_dumb_buffers.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_edid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_edid.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_encoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_encoder.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_encoder_slave.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_encoder_slave.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_fb_cma_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_fb_cma_helper.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_fb_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_fb_helper.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_fops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_fops.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_fourcc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_fourcc.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_framebuffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_framebuffer.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_gem.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_gem_cma_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_gem_cma_helper.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_global.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_global.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_info.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_info.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_internal.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_ioctl.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_irq.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_legacy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_legacy.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_lock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_lock.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_mm.c</a></td><td class='right'>1100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/drm_mode_config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_mode_config.c</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_mode_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_mode_object.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_modes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_modes.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_modeset_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_modeset_helper.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_modeset_lock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_modeset_lock.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_of.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_panel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_panel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_pci.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_plane.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_plane_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_plane_helper.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_platform.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_prime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_prime.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/drm_print.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_print.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_probe_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_probe_helper.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_property.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_property.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_rect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_rect.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_simple_kms_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_simple_kms_helper.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_sysfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_vm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_vm.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/drm_vma_manager.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/drm_vma_manager.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/cmdstream.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/cmdstream.xml.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_buffer.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_drv.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_drv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_dump.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_gem.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_gpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_gpu.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_gpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_gpu.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_iommu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_mmu.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/etnaviv/etnaviv_mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/etnaviv/etnaviv_mmu.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos5433_drm_decon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos5433_drm_decon.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos7_drm_decon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos7_drm_decon.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_dp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_dp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_crtc.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_crtc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_crtc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_drv.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_drv.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_dsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_dsi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_fb.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_fbdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_fbdev.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_fimc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_fimc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_fimd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_fimd.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_g2d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_g2d.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_gem.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_gem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_gem.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_gsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_gsc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_drm_mic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_drm_mic.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_hdmi.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/exynos_mixer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/exynos_mixer.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/exynos/regs-hdmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/exynos/regs-hdmi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/fsl-dcu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/fsl-dcu/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/fsl-dcu/fsl_tcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/fsl-dcu/fsl_tcon.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/accel_2d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/accel_2d.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/cdv_intel_lvds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/cdv_intel_lvds.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/framebuffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/framebuffer.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/gem.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/gma_display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/gma_display.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/gtt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/gtt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/mdfld_intel_display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/mdfld_intel_display.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/oaktrail_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/oaktrail_crtc.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/psb_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/psb_drv.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/psb_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/psb_drv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/psb_intel_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/psb_intel_drv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/gma500/psb_intel_lvds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/gma500/psb_intel_lvds.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/hibmc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/hibmc/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/hibmc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/hibmc/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_regs.h</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c</a></td><td class='right'>556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i2c/tda998x_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i2c/tda998x_drv.c</a></td><td class='right'>863</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i810/i810_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i810/i810_dma.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i810/i810_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i810/i810_drv.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i810/i810_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i810/i810_drv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/Kconfig</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/Kconfig.debug</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/Makefile</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/aperture_gm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/aperture_gm.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/cfg_space.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/cfg_space.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/cmd_parser.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/cmd_parser.c</a></td><td class='right'>2844</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/cmd_parser.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/cmd_parser.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/debug.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/display.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/display.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/display.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/edid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/edid.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/edid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/edid.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/execlist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/execlist.c</a></td><td class='right'>830</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/execlist.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/execlist.h</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/firmware.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/gtt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/gtt.c</a></td><td class='right'>2336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/gtt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/gtt.h</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/gvt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/gvt.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/gvt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/gvt.h</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/handlers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/handlers.c</a></td><td class='right'>2815</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/hypercall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/hypercall.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/interrupt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/interrupt.c</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/interrupt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/interrupt.h</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/kvmgt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/kvmgt.c</a></td><td class='right'>1486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/mmio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/mmio.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/mmio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/mmio.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/mpt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/mpt.h</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/opregion.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/opregion.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/reg.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/render.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/render.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/render.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/render.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/sched_policy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/sched_policy.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/sched_policy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/sched_policy.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/scheduler.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/scheduler.c</a></td><td class='right'>576</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/scheduler.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/scheduler.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/trace.h</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/trace_points.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/trace_points.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/gvt/vgpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/gvt/vgpu.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_cmd_parser.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_cmd_parser.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_debugfs.c</a></td><td class='right'>1794</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 9.5%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_drv.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_drv.h</a></td><td class='right'>1989</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem.c</a></td><td class='right'>3556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.5%;'/><td class='rem' style='width: 13.3%;'/><td class='none' style='width: 72.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_batch_pool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_batch_pool.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_context.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_context.h</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_dmabuf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_dmabuf.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_dmabuf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_dmabuf.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_evict.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_evict.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_execbuffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_execbuffer.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_fence.c</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_fence_reg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_fence_reg.c</a></td><td class='right'>726</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_fence_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_fence_reg.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_gtt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_gtt.c</a></td><td class='right'>1472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_gtt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_gtt.h</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_internal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_internal.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_object.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_object.h</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_render_state.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_render_state.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_render_state.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_render_state.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_request.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_request.c</a></td><td class='right'>860</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_request.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_request.h</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_shrinker.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_shrinker.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_stolen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_stolen.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_tiling.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_tiling.c</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_timeline.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_timeline.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_timeline.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_timeline.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gem_userptr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gem_userptr.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_gpu_error.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_gpu_error.c</a></td><td class='right'>803</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_guc_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_guc_reg.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_guc_submission.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_guc_submission.c</a></td><td class='right'>434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_irq.c</a></td><td class='right'>1017</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_oa_hsw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_oa_hsw.c</a></td><td class='right'>752</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_oa_hsw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_oa_hsw.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_params.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_params.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_params.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_params.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_pci.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_perf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_perf.c</a></td><td class='right'>2096</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_reg.h</a></td><td class='right'>781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_suspend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_suspend.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_sw_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_sw_fence.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_sw_fence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_sw_fence.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_sysfs.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_trace.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_utils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_utils.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_vgpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_vgpu.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_vma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_vma.c</a></td><td class='right'>689</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/i915_vma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/i915_vma.h</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_atomic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_atomic.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_atomic_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_atomic_plane.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_audio.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_bios.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_bios.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_bios.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_bios.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_breadcrumbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_breadcrumbs.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_color.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_color.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_crt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_crt.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_csr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_csr.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_ddi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_ddi.c</a></td><td class='right'>598</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_device_info.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_device_info.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_display.c</a></td><td class='right'>2984</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.5%;'/><td class='rem' style='width: 10.7%;'/><td class='none' style='width: 76.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_dp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_dp.c</a></td><td class='right'>901</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_dp_link_training.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_dp_link_training.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_dp_mst.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_dp_mst.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_dpio_phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_dpio_phy.c</a></td><td class='right'>633</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_dpll_mgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_dpll_mgr.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_dpll_mgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_dpll_mgr.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_drv.h</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_dsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_dsi.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_dsi_panel_vbt.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_dsi_pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_dsi_pll.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_dvo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_dvo.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_engine_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_engine_cs.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_fbc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_fbc.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_fbdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_fbdev.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_fifo_underrun.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_fifo_underrun.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_frontbuffer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_frontbuffer.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_guc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_guc.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_guc_fwif.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_guc_fwif.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_guc_loader.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_guc_loader.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_guc_log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_guc_log.c</a></td><td class='right'>658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_gvt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_gvt.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_gvt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_gvt.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_hangcheck.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_hangcheck.c</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_hdmi.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_hotplug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_hotplug.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_huc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_huc.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_i2c.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_lpe_audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_lpe_audio.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_lrc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_lrc.c</a></td><td class='right'>624</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_lrc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_lrc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_lspcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_lspcon.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_lvds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_lvds.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_mocs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_mocs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_mocs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_mocs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_opregion.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_opregion.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_overlay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_overlay.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_panel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_panel.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_pipe_crc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_pipe_crc.c</a></td><td class='right'>1011</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_pm.c</a></td><td class='right'>2204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 82.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_psr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_psr.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_ringbuffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_ringbuffer.c</a></td><td class='right'>518</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_ringbuffer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_ringbuffer.h</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_runtime_pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_runtime_pm.c</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_sdvo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_sdvo.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_sprite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_sprite.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_tv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_tv.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_uc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_uc.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_uc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_uc.h</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_uncore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_uncore.c</a></td><td class='right'>705</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/i915/intel_vbt_defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/i915/intel_vbt_defs.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/imx/dw_hdmi-imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/imx/dw_hdmi-imx.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/imx/imx-drm-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/imx/imx-drm-core.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/imx/imx-ldb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/imx/imx-ldb.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/imx/imx-tve.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/imx/imx-tve.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/imx/ipuv3-plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/imx/ipuv3-plane.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/imx/parallel-display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/imx/parallel-display.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/lib/drm_random.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/lib/drm_random.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/lib/drm_random.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/lib/drm_random.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mediatek/mtk_dpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mediatek/mtk_dpi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mediatek/mtk_drm_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mediatek/mtk_drm_crtc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mediatek/mtk_drm_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mediatek/mtk_drm_drv.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mediatek/mtk_drm_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mediatek/mtk_drm_drv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mediatek/mtk_drm_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mediatek/mtk_drm_fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mediatek/mtk_drm_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mediatek/mtk_drm_plane.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mediatek/mtk_dsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mediatek/mtk_dsi.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mediatek/mtk_hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mediatek/mtk_hdmi.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_canvas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_canvas.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_canvas.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_canvas.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_crtc.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_crtc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_crtc.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_drv.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_drv.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_plane.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_plane.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_plane.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_registers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_registers.h</a></td><td class='right'>1395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_vclk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_vclk.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_vclk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_vclk.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_venc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_venc.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_venc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_venc.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_venc_cvbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_venc_cvbs.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_venc_cvbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_venc_cvbs.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_viu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_viu.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_viu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_viu.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_vpp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_vpp.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/meson/meson_vpp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/meson/meson_vpp.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mga/mga_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mga/mga_dma.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mga/mga_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mga/mga_drv.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mga/mga_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mga/mga_drv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mgag200/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mgag200/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mgag200/mgag200_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mgag200/mgag200_drv.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mgag200/mgag200_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mgag200/mgag200_drv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mgag200/mgag200_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mgag200/mgag200_fb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mgag200/mgag200_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mgag200/mgag200_i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mgag200/mgag200_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mgag200/mgag200_main.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mgag200/mgag200_mode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mgag200/mgag200_mode.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/mgag200/mgag200_ttm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mgag200/mgag200_ttm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/a2xx.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/a2xx.xml.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/a3xx.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/a3xx.xml.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/a3xx_gpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/a3xx_gpu.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/a4xx.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/a4xx.xml.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/a4xx_gpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/a4xx_gpu.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/a5xx.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/a5xx.xml.h</a></td><td class='right'>3757</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 29.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 70.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/a5xx_gpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/a5xx_gpu.c</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/a5xx_gpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/a5xx_gpu.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/a5xx_power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/a5xx_power.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/adreno_common.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/adreno_common.xml.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/adreno_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/adreno_device.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/adreno_gpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/adreno_gpu.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/adreno_gpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/adreno_gpu.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/dsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/dsi.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/dsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/dsi.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/dsi.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/dsi.xml.h</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/dsi_cfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/dsi_cfg.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/dsi_cfg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/dsi_cfg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/dsi_host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/dsi_host.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/dsi_manager.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/dsi_manager.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/mmss_cc.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/mmss_cc.xml.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/phy/dsi_phy.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/phy/dsi_phy.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/pll/dsi_pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/pll/dsi_pll.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/pll/dsi_pll.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c</a></td><td class='right'>1104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/dsi/sfpb.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/dsi/sfpb.xml.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/edp/edp.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/edp/edp.xml.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/edp/edp_bridge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/edp/edp_bridge.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/hdmi/hdmi.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/hdmi/hdmi.xml.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/hdmi/hdmi_bridge.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/hdmi/qfprom.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/hdmi/qfprom.xml.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp_common.xml.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp_common.xml.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/mdp/mdp_kms.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/mdp/mdp_kms.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_atomic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_atomic.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_debugfs.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_drv.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_drv.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_fb.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_fbdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_fbdev.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_fence.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_fence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_fence.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_gem.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_gem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_gem.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_gem_shrinker.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_gem_shrinker.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_gem_submit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_gem_submit.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_gem_vma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_gem_vma.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_gpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_gpu.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_gpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_gpu.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_iommu.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_kms.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_kms.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_mmu.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_rd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_rd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/msm/msm_ringbuffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/msm/msm_ringbuffer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/mxsfb/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mxsfb/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/mxsfb/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mxsfb/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/mxsfb/mxsfb_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mxsfb/mxsfb_crtc.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/mxsfb/mxsfb_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mxsfb/mxsfb_drv.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/mxsfb/mxsfb_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mxsfb/mxsfb_drv.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/mxsfb/mxsfb_out.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mxsfb/mxsfb_out.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/mxsfb/mxsfb_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/mxsfb/mxsfb_regs.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/arb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/arb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/crtc.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/cursor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/cursor.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/dac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/dac.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/dfp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/dfp.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/disp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/disp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/disp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/disp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/hw.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/hw.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/overlay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/overlay.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/tvnv04.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/tvnv17.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/dispnv04/tvnv17.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/dispnv04/tvnv17.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvif/cl5070.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvif/cl5070.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvif/cl826e.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvif/cl826e.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvif/cl826f.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvif/cl826f.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvif/cl906f.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvif/cl906f.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvif/cla06f.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvif/cla06f.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvif/class.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvif/class.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvif/client.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvif/client.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvif/driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvif/driver.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvif/if0000.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvif/if0000.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvif/object.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvif/object.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/core/client.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/core/client.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/core/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/core/device.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/core/engine.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/core/memory.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/core/memory.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/core/mm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/core/mm.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/core/object.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/core/object.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_abi16.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_abi16.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_backlight.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_backlight.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_bios.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_bios.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_bios.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_bios.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_bo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_bo.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_bo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_bo.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_chan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_chan.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_chan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_chan.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_connector.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_connector.c</a></td><td class='right'>671</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_connector.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_connector.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_crtc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_crtc.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_debugfs.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_display.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_display.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_display.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_dp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_dp.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_drm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_drm.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_drv.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_encoder.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_encoder.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_fbcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_fbcon.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_fbcon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_fbcon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_fence.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_fence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_fence.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_gem.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_gem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_gem.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_hwmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_hwmon.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_led.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_led.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_led.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_nvif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_nvif.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_prime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_prime.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_sgdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_sgdma.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_ttm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_ttm.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_usif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_usif.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nouveau_vga.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nouveau_vga.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nv04_fbcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nv04_fbcon.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nv04_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nv04_fence.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nv10_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nv10_fence.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nv10_fence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nv10_fence.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nv17_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nv17_fence.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nv50_display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nv50_display.c</a></td><td class='right'>4212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.9%;'/><td class='rem' style='width: 9.0%;'/><td class='none' style='width: 67.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nv50_display.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nv50_display.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nv50_fbcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nv50_fbcon.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nv50_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nv50_fence.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nv84_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nv84_fence.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvc0_fbcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvc0_fbcon.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvif/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvif/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvif/client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvif/client.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvif/driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvif/driver.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvif/notify.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvif/notify.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/core/client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/core/client.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/core/engine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/core/engine.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/core/firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/core/firmware.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/core/ioctl.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/core/mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/core/mm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/core/object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/core/object.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/ce/gp102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/ce/gp102.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/ce/gp104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/ce/gp104.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/device/base.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/device/user.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/basegp102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/basegp102.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/basegp104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/basegp104.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/coreg94.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/coreg94.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/coregp102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/coregp102.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/coregp104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/coregp104.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/cursg84.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/cursg84.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgf119.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgf119.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgk104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgk104.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgp102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgp102.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgt215.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgt215.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgp102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgp102.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgp104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgp104.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/gp102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/gp102.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/gp104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/gp104.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmg84.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmg84.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgf119.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgf119.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgk104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgk104.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgp102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgp102.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgt215.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgt215.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlygp102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlygp102.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlygp104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlygp104.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/piocgf119.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/piocgf119.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/piocnv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/piocnv50.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgp102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgp102.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgp104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgp104.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv50.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/g84.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/g84.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/gt200.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/gt200.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/gt215.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/gt215.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp79.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp79.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp89.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp89.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/falcon/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/falcon/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/falcon/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/falcon/base.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/falcon/priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/falcon/priv.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/falcon/v1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/falcon/v1.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/boost.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/boost.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/cstep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/cstep.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/power_budget.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/power_budget.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/therm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/therm.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/timing.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/timing.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/vmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/vmap.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/bios/vpstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/bios/vpstate.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm20b.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm20b.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp104.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/gk104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/gpio/gk104.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pci/g92.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pci/g92.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf106.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf106.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk110.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk110.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk208.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk208.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm107.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm107.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp100.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c</a></td><td class='right'>936</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c</a></td><td class='right'>1389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 10.4%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_gr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_gr.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf100.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/volt/gpio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/connector-dvi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/connector-dvi.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/connector-hdmi.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/encoder-opa362.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/panel-dpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/panel-dpi.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/dispc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/dispc.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/display.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/dpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/dpi.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/dsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/dsi.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/dss.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/dss.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/hdmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/hdmi.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/hdmi4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/hdmi4.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/hdmi4_core.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/hdmi5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/hdmi5.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/hdmi5_core.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/hdmi_wp.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/omapdss.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/omapdss.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/output.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/output.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/rfbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/rfbi.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/sdi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/sdi.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/dss/venc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/dss/venc.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_connector.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_connector.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_crtc.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_debugfs.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_dmm_tiler.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_drv.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_drv.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_encoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_encoder.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_fb.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_fbdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_fbdev.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_gem.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_irq.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/omapdrm/omap_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/omapdrm/omap_plane.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/panel/panel-simple.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/panel/panel-simple.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_cmd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_debugfs.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_display.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_draw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_draw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_drv.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_drv.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_fb.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_gem.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_kms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_kms.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_object.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_object.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_object.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_release.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_release.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/qxl/qxl_ttm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/qxl/qxl_ttm.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/atombios.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/atombios.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/atombios_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/atombios_crtc.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/atombios_encoders.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/atombios_encoders.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/evergreen_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/evergreen_cs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/r100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/r100.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/r600_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/r600_cs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_atombios.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_atombios.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_bios.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_bios.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_clocks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_clocks.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_cursor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_cursor.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_device.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_display.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_dp_mst.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_dp_mst.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_drv.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_fb.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_fence.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_gem.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_irq_kms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_irq_kms.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_kms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_kms.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_legacy_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_legacy_crtc.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_legacy_encoders.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_legacy_encoders.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_mode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_mode.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_object.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_object.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_object.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_pm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_sync.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_ttm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_ttm.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/radeon_uvd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/radeon_uvd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/si.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/si.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/si_dpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/si_dpm.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/radeon/vce_v1_0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/radeon/vce_v1_0.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rcar-du/rcar_du_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rcar-du/rcar_du_crtc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rcar-du/rcar_du_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rcar-du/rcar_du_drv.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rcar-du/rcar_du_encoder.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rcar-du/rcar_du_encoder.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rcar-du/rcar_du_group.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rcar-du/rcar_du_group.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rcar-du/rcar_du_kms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rcar-du/rcar_du_kms.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rcar-du/rcar_du_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rcar-du/rcar_du_plane.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rcar-du/rcar_du_vsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rcar-du/rcar_du_vsp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/cdn-dp-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/cdn-dp-core.c</a></td><td class='right'>1262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/cdn-dp-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/cdn-dp-core.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/cdn-dp-reg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/cdn-dp-reg.c</a></td><td class='right'>979</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/cdn-dp-reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/cdn-dp-reg.h</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/dw-mipi-dsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/dw-mipi-dsi.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/rockchip_drm_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/rockchip_drm_drv.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/rockchip_drm_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/rockchip_drm_drv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/rockchip_drm_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/rockchip_drm_fb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/rockchip_drm_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/rockchip_drm_gem.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/rockchip_drm_gem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/rockchip_drm_gem.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/rockchip_drm_vop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/rockchip_drm_vop.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/rockchip_drm_vop.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/rockchip_drm_vop.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/rockchip/rockchip_vop_reg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/rockchip/rockchip_vop_reg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/savage/savage_bci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/savage/savage_bci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/savage/savage_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/savage/savage_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/savage/savage_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/savage/savage_drv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/savage/savage_state.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/savage/savage_state.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/selftests/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/selftests/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/selftests/drm_mm_selftests.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/selftests/drm_mm_selftests.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/selftests/drm_selftest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/selftests/drm_selftest.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/selftests/drm_selftest.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/selftests/drm_selftest.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/selftests/test-drm_mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/selftests/test-drm_mm.c</a></td><td class='right'>2276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/shmobile/shmob_drm_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/shmobile/shmob_drm_crtc.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/shmobile/shmob_drm_crtc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/shmobile/shmob_drm_crtc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/shmobile/shmob_drm_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/shmobile/shmob_drm_drv.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/shmobile/shmob_drm_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/shmobile/shmob_drm_plane.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sis/sis_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sis/sis_drv.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sis/sis_mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sis/sis_mm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_crtc.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_drv.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_drv.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_dvo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_dvo.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_gdp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_gdp.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_hda.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_hda.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_hdmi.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_hdmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_hdmi.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_hqvdp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_hqvdp.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_mixer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_mixer.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_plane.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_plane.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_plane.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_tvout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_tvout.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_vtac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_vtac.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sti/sti_vtg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sti/sti_vtg.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sun4i/sun4i_backend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sun4i/sun4i_backend.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sun4i/sun4i_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sun4i/sun4i_drv.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sun4i/sun4i_framebuffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sun4i/sun4i_framebuffer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sun4i/sun4i_layer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sun4i/sun4i_layer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sun4i/sun4i_rgb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sun4i/sun4i_rgb.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sun4i/sun4i_tcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sun4i/sun4i_tcon.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sun4i/sun4i_tcon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sun4i/sun4i_tcon.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sun4i/sun4i_tv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sun4i/sun4i_tv.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/sun4i/sun6i_drc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/sun4i/sun6i_drc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tdfx/tdfx_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tdfx/tdfx_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tegra/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tegra/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tegra/dc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tegra/dc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tegra/dpaux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tegra/dpaux.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tegra/drm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tegra/drm.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tegra/drm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tegra/drm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tegra/fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tegra/fb.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tegra/gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tegra/gem.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tegra/gr3d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tegra/gr3d.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tegra/sor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tegra/sor.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tilcdc/tilcdc_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tilcdc/tilcdc_crtc.c</a></td><td class='right'>603</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tilcdc/tilcdc_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tilcdc/tilcdc_drv.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tilcdc/tilcdc_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tilcdc/tilcdc_drv.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tilcdc/tilcdc_external.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tilcdc/tilcdc_external.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tilcdc/tilcdc_external.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tilcdc/tilcdc_external.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tilcdc/tilcdc_panel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tilcdc/tilcdc_panel.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tilcdc/tilcdc_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tilcdc/tilcdc_plane.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tilcdc/tilcdc_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tilcdc/tilcdc_regs.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tilcdc/tilcdc_tfp410.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/tinydrm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tinydrm/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/tinydrm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tinydrm/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/tinydrm/core/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tinydrm/core/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/tinydrm/core/tinydrm-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tinydrm/core/tinydrm-core.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/tinydrm/mi0283qt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tinydrm/mi0283qt.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/tinydrm/mipi-dbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/tinydrm/mipi-dbi.c</a></td><td class='right'>1005</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ttm/ttm_bo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ttm/ttm_bo.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ttm/ttm_bo_manager.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ttm/ttm_bo_manager.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ttm/ttm_bo_util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ttm/ttm_bo_util.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ttm/ttm_bo_vm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ttm/ttm_bo_vm.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ttm/ttm_execbuf_util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ttm/ttm_execbuf_util.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ttm/ttm_lock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ttm/ttm_lock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/ttm/ttm_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/ttm/ttm_object.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/udl/udl_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/udl/udl_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/udl/udl_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/udl/udl_drv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/udl/udl_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/udl/udl_fb.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/udl/udl_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/udl/udl_gem.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/udl/udl_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/udl/udl_main.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_crtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_crtc.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_debugfs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_drv.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_drv.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_dsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_dsi.c</a></td><td class='right'>1725</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_gem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_gem.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_hdmi.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_hvs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_hvs.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_kms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_kms.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_plane.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_regs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_render_cl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_render_cl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_v3d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_v3d.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_validate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_validate.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_validate_shaders.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_validate_shaders.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/vc4/vc4_vec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vc4/vc4_vec.c</a></td><td class='right'>657</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vgem/vgem_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vgem/vgem_drv.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vgem/vgem_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vgem/vgem_drv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vgem/vgem_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vgem/vgem_fence.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/via/via_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/via/via_drv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/via/via_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/via/via_drv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/via/via_map.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/via/via_map.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/via/via_mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/via/via_mm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/virtgpu_display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/virtgpu_display.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/virtgpu_drm_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/virtgpu_drm_bus.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/virtgpu_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/virtgpu_drv.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/virtgpu_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/virtgpu_drv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/virtgpu_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/virtgpu_fb.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/virtgpu_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/virtgpu_fence.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/virtgpu_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/virtgpu_ioctl.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/virtgpu_kms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/virtgpu_kms.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/virtgpu_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/virtgpu_plane.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/virtgpu_ttm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/virtgpu_ttm.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/virtio/virtgpu_vq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/virtio/virtgpu_vq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/device_include/svga3d_surfacedefs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/device_include/svga3d_surfacedefs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_drv.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_drv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_fb.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_fence.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_fence.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_kms.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_kms.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_mob.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_resource.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_drm_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_drm_drv.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_drm_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_drm_drv.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_hdmi.c</a></td><td class='right'>764</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_hdmi_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_hdmi_regs.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_plane.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_plane.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_plane.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_plane.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_plane_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_plane_regs.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_tvenc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_tvenc.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_tvenc_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_tvenc_regs.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_vou.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_vou.c</a></td><td class='right'>908</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_vou.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_vou.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/gpu/drm/zte/zx_vou_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/drm/zte/zx_vou_regs.h</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/host1x/bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/host1x/bus.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/host1x/dev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/host1x/dev.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/host1x/job.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/host1x/job.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/host1x/syncpt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/host1x/syncpt.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/ipu-v3/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/ipu-v3/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/ipu-v3/ipu-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/ipu-v3/ipu-common.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/ipu-v3/ipu-cpmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/ipu-v3/ipu-cpmem.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/ipu-v3/ipu-csi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/ipu-v3/ipu-csi.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/ipu-v3/ipu-di.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/ipu-v3/ipu-di.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/gpu/vga/vgaarb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/gpu/vga/vgaarb.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-asus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-asus.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-core.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-corsair.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-corsair.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-cp2112.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-cp2112.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-cypress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-cypress.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-ids.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-ids.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-input.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-kye.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-kye.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-lg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-lg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/hid/hid-mf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-mf.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-microsoft.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-microsoft.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-multitouch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-multitouch.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-picolcd_cir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-picolcd_cir.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-rmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-rmi.c</a></td><td class='right'>975</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 6.5%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-roccat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-roccat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-sensor-hub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-sensor-hub.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hid-sony.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-sony.c</a></td><td class='right'>479</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/hid/hid-udraw-ps3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hid-udraw-ps3.c</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/hidraw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/hidraw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/i2c-hid/i2c-hid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/i2c-hid/i2c-hid.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/intel-ish-hid/ipc/hw-ish-regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/intel-ish-hid/ipc/hw-ish-regs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/intel-ish-hid/ipc/hw-ish.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/intel-ish-hid/ipc/hw-ish.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/intel-ish-hid/ipc/ipc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/intel-ish-hid/ipc/ipc.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/intel-ish-hid/ipc/pci-ish.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/intel-ish-hid/ipc/pci-ish.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/hid/intel-ish-hid/ipc/utils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/intel-ish-hid/ipc/utils.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/intel-ish-hid/ishtp-hid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/intel-ish-hid/ishtp-hid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/intel-ish-hid/ishtp/bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/intel-ish-hid/ishtp/bus.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/intel-ish-hid/ishtp/hbm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/intel-ish-hid/ishtp/hbm.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/intel-ish-hid/ishtp/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/intel-ish-hid/ishtp/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/usbhid/hid-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/usbhid/hid-core.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/usbhid/hid-quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/usbhid/hid-quirks.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/usbhid/hiddev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/usbhid/hiddev.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/usbhid/usbkbd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/usbhid/usbkbd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/usbhid/usbmouse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/usbhid/usbmouse.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/wacom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/wacom.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/wacom_sys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/wacom_sys.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/wacom_wac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/wacom_wac.c</a></td><td class='right'>894</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hid/wacom_wac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hid/wacom_wac.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hsi/clients/cmt_speech.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hsi/clients/cmt_speech.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hsi/clients/ssi_protocol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hsi/clients/ssi_protocol.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/channel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/channel.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/channel_mgmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/channel_mgmt.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/connection.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/connection.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/hv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/hv.c</a></td><td class='right'>479</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/hv_balloon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/hv_balloon.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/hv_fcopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/hv_fcopy.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/hv_kvp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/hv_kvp.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/hv_snapshot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/hv_snapshot.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/hv_util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/hv_util.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/hyperv_vmbus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/hyperv_vmbus.h</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/ring_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/ring_buffer.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hv/vmbus_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hv/vmbus_drv.c</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/Kconfig</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/adc128d818.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/adc128d818.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/adm1021.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/adm1021.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/adm1025.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/adm1025.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/adm1026.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/adm1026.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/adm1031.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/adm1031.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/adm9240.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/adm9240.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/adt7411.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/adt7411.c</a></td><td class='right'>580</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/adt7462.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/adt7462.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/adt7470.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/adt7470.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/adt7475.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/adt7475.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/adt7x10.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/adt7x10.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/amc6821.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/amc6821.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/asb100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/asb100.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/atxp1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/atxp1.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/coretemp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/coretemp.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/dme1737.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/dme1737.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/ds1621.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/ds1621.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/ds620.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/ds620.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/emc2103.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/emc2103.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/emc6w201.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/emc6w201.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/f71805f.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/f71805f.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/f71882fg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/f71882fg.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/fam15h_power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/fam15h_power.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/fschmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/fschmd.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/g760a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/g760a.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/g762.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/g762.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/gl518sm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/gl518sm.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/gl520sm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/gl520sm.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/gpio-fan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/gpio-fan.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/hwmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/hwmon.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/i5500_temp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/i5500_temp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/i5k_amb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/i5k_amb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/it87.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/it87.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/jz4740-hwmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/jz4740-hwmon.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/k10temp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/k10temp.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/k8temp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/k8temp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/lm63.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/lm63.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/lm70.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/lm70.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/lm78.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/lm78.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/lm80.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/lm80.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/lm83.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/lm83.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/lm85.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/lm85.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/lm87.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/lm87.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/lm90.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/lm90.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/lm92.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/lm92.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/lm93.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/lm93.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/lm95234.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/lm95234.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/ltc4151.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/ltc4151.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/max1111.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/max1111.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/max1619.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/max1619.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/max197.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/max197.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/max6650.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/max6650.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/mc13783-adc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/mc13783-adc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/mcp3021.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/mcp3021.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/nct6683.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/nct6683.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/nct6775.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/nct6775.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/nct7802.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/nct7802.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/nsa320-hwmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/nsa320-hwmon.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/pc87360.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/pc87360.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/pc87427.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/pc87427.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/pcf8591.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/pcf8591.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/pmbus/adm1275.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/pmbus/adm1275.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/sch5627.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/sch5627.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/sch56xx-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/sch56xx-common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/scpi-hwmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/scpi-hwmon.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/sht15.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/sht15.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/sht21.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/sht21.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/sis5595.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/sis5595.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/smsc47m1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/smsc47m1.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/smsc47m192.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/smsc47m192.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/hwmon/stts751.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/stts751.c</a></td><td class='right'>834</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/hwmon/tc654.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/tc654.c</a></td><td class='right'>514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/hwmon/tmp108.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/tmp108.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/tmp401.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/tmp401.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/via-cputemp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/via-cputemp.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/via686a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/via686a.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/vt8231.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/vt8231.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/w83627ehf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/w83627ehf.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/w83627hf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/w83627hf.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/w83781d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/w83781d.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/w83791d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/w83791d.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/w83792d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/w83792d.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwmon/w83793.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwmon/w83793.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight-etm-perf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight-etm-perf.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight-etm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight-etm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight-etm3x-sysfs.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight-etm3x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight-etm3x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight-etm4x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight-etm4x.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight-etm4x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight-etm4x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight-priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight-priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight-stm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight-stm.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight-tmc-etf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight-tmc-etf.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight-tmc-etr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight-tmc-etr.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight-tmc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight-tmc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/coresight/coresight.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/coresight/coresight.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/intel_th/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/intel_th/core.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/intel_th/gth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/intel_th/gth.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/intel_th/intel_th.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/intel_th/intel_th.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/intel_th/msu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/intel_th/msu.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/intel_th/sth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/intel_th/sth.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/stm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/stm/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/stm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/stm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/stm/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/stm/core.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/hwtracing/stm/dummy_stm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/stm/dummy_stm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/hwtracing/stm/ftrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/hwtracing/stm/ftrace.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/Kconfig</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-at91.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-at91.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-axxia.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-axxia.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-bcm-iproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-bcm-iproc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-bcm2835.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-bcm2835.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-bfin-twi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-bfin-twi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-cadence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-cadence.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-cros-ec-tunnel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-cros-ec-tunnel.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-designware-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-designware-core.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-designware-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-designware-core.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-designware-pcidrv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-designware-pcidrv.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-designware-platdrv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-designware-platdrv.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-dln2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-dln2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-eg20t.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-eg20t.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-emev2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-emev2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-exynos5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-exynos5.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-i801.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-i801.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-ibm_iic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-ibm_iic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-imx-lpi2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-imx-lpi2c.c</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-imx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-mlxcpld.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-mlxcpld.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-mpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-mpc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-mv64xxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-mv64xxx.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-nforce2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-nforce2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-octeon-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-octeon-core.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-octeon-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-octeon-core.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-omap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-omap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-piix4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-piix4.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-pxa-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-pxa-pci.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-pxa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-pxa.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-qup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-qup.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-rcar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-rcar.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-riic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-riic.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-robotfuzz-osif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-robotfuzz-osif.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-sh_mobile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-sh_mobile.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-st.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-st.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-stm32f4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-stm32f4.c</a></td><td class='right'>897</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-tegra-bpmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-tegra-bpmp.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-thunderx-pcidrv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-thunderx-pcidrv.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-uniphier-f.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-uniphier-f.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-uniphier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-uniphier.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-viperboard.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-viperboard.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-xgene-slimpro.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-xgene-slimpro.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-xlp9xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-xlp9xx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/busses/i2c-xlr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/busses/i2c-xlr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/i2c-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/i2c-core.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/i2c-dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/i2c-dev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/i2c-smbus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/i2c-smbus.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/muxes/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/muxes/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/muxes/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/muxes/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/muxes/i2c-mux-gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/muxes/i2c-mux-gpio.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/i2c/muxes/i2c-mux-mlxcpld.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/muxes/i2c-mux-mlxcpld.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/muxes/i2c-mux-pca9541.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/muxes/i2c-mux-pca9541.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/i2c/muxes/i2c-mux-pca954x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/i2c/muxes/i2c-mux-pca954x.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/hpt366.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/hpt366.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-acpi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-atapi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-atapi.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-cd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-cd.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-cd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-cd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-cd_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-cd_ioctl.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-cd_verbose.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-cd_verbose.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-devsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-devsets.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-disk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-disk.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-eh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-eh.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-floppy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-floppy.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-io.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-ioctls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-ioctls.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-iops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-iops.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-park.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-park.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-pm.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-probe.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-tape.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-tape.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/ide-taskfile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/ide-taskfile.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/palm_bk3710.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/palm_bk3710.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ide/sis5513.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ide/sis5513.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/idle/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/idle/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/idle/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/idle/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/idle/i7300_idle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/idle/i7300_idle.c</a></td><td class='right'>612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/idle/intel_idle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/idle/intel_idle.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/accel/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/Kconfig</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/accel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/accel/bmc150-accel-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/bmc150-accel-core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/accel/da280.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/da280.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/accel/da311.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/da311.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/accel/dmard10.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/dmard10.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/accel/hid-sensor-accel-3d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/hid-sensor-accel-3d.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/accel/mma7660.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/mma7660.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/accel/mma8452.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/mma8452.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/accel/sca3000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/sca3000.c</a></td><td class='right'>1576</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/accel/ssp_accel_sensor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/ssp_accel_sensor.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/accel/st_accel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/st_accel.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/accel/st_accel_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/st_accel_core.c</a></td><td class='right'>613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/accel/st_accel_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/st_accel_i2c.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/accel/st_accel_spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/accel/st_accel_spi.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/Kconfig</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/adc/ad7766.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/ad7766.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/at91_adc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/at91_adc.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/axp288_adc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/axp288_adc.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/adc/envelope-detector.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/envelope-detector.c</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/exynos_adc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/exynos_adc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/fsl-imx25-gcq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/fsl-imx25-gcq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/adc/hx711.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/hx711.c</a></td><td class='right'>532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/ina2xx-adc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/ina2xx-adc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/max1027.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/max1027.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/adc/max11100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/max11100.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/max1363.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/max1363.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/adc/meson_saradc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/meson_saradc.c</a></td><td class='right'>922</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/palmas_gpadc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/palmas_gpadc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/qcom-spmi-vadc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/qcom-spmi-vadc.c</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/adc/rcar-gyroadc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/rcar-gyroadc.c</a></td><td class='right'>633</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/adc/stm32-adc-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/stm32-adc-core.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/adc/stm32-adc-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/stm32-adc-core.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/adc/stm32-adc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/stm32-adc.c</a></td><td class='right'>1103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/stx104.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/stx104.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/ti-adc0832.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/ti-adc0832.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/ti-adc161s626.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/ti-adc161s626.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/ti-ads1015.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/ti-ads1015.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/adc/ti-ads7950.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/ti-ads7950.c</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/adc/ti-tlc4541.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/ti-tlc4541.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/ti_am335x_adc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/ti_am335x_adc.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/adc/xilinx-xadc-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/adc/xilinx-xadc-core.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/buffer/industrialio-buffer-cb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/buffer/industrialio-buffer-cb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/buffer/kfifo_buf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/buffer/kfifo_buf.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/common/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/common/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/common/cros_ec_sensors/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/cros_ec_sensors/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/common/cros_ec_sensors/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/cros_ec_sensors/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/common/hid-sensors/hid-sensor-attributes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/hid-sensors/hid-sensor-attributes.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/common/ssp_sensors/ssp_iio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/ssp_sensors/ssp_iio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/common/st_sensors/st_sensors_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/st_sensors/st_sensors_buffer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/common/st_sensors/st_sensors_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/st_sensors/st_sensors_core.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/common/st_sensors/st_sensors_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/common/st_sensors/st_sensors_i2c.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/counter/104-quad-8.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/counter/104-quad-8.c</a></td><td class='right'>596</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/counter/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/counter/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/counter/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/counter/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/dac/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/dac/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/dac/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/dac/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/dac/ad5592r.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/dac/ad5592r.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/dac/ad5593r.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/dac/ad5593r.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/dac/dpot-dac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/dac/dpot-dac.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/dac/mcp4725.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/dac/mcp4725.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/dummy/iio_simple_dummy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/dummy/iio_simple_dummy.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/dummy/iio_simple_dummy_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/dummy/iio_simple_dummy_buffer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/gyro/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/gyro/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/gyro/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/gyro/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/gyro/mpu3050-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/gyro/mpu3050-core.c</a></td><td class='right'>1306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/gyro/mpu3050-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/gyro/mpu3050-i2c.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/gyro/mpu3050.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/gyro/mpu3050.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/gyro/ssp_gyro_sensor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/gyro/ssp_gyro_sensor.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/gyro/st_gyro_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/gyro/st_gyro_core.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/health/afe4403.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/health/afe4403.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/health/afe4404.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/health/afe4404.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/health/max30100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/health/max30100.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/humidity/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/humidity/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/humidity/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/humidity/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/humidity/dht11.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/humidity/dht11.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/humidity/hdc100x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/humidity/hdc100x.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/humidity/hts221.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/humidity/hts221.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/humidity/hts221_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/humidity/hts221_buffer.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/humidity/hts221_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/humidity/hts221_core.c</a></td><td class='right'>687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/humidity/hts221_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/humidity/hts221_i2c.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/humidity/hts221_spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/humidity/hts221_spi.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/humidity/si7020.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/humidity/si7020.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/imu/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/imu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/imu/bmi160/bmi160_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/bmi160/bmi160_core.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/imu/bmi160/bmi160_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/bmi160/bmi160_i2c.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/imu/bmi160/bmi160_spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/bmi160/bmi160_spi.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/imu/st_lsm6dsx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/st_lsm6dsx/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/imu/st_lsm6dsx/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/st_lsm6dsx/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c</a></td><td class='right'>454</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c</a></td><td class='right'>720</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/industrialio-buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/industrialio-buffer.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/industrialio-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/industrialio-core.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/industrialio-trigger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/industrialio-trigger.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/inkern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/inkern.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/light/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/light/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/light/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/light/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/light/cm3232.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/light/cm3232.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/light/cm3605.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/light/cm3605.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/light/hid-sensor-als.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/light/hid-sensor-als.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/iio/light/isl29018.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/light/isl29018.c</a> (renamed from drivers/staging/iio/light/isl29018.c)</td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/light/ltr501.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/light/ltr501.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/light/max44000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/light/max44000.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/light/opt3001.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/light/opt3001.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/light/tsl2583.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/light/tsl2583.c</a></td><td class='right'>913</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/magnetometer/ak8974.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/magnetometer/ak8974.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/magnetometer/ak8975.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/magnetometer/ak8975.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/magnetometer/hid-sensor-magn-3d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/magnetometer/hid-sensor-magn-3d.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/magnetometer/mag3110.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/magnetometer/mag3110.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/magnetometer/st_magn_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/magnetometer/st_magn_core.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/potentiometer/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/potentiometer/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/potentiometer/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/potentiometer/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/potentiometer/max5481.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/potentiometer/max5481.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/potentiometer/mcp4531.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/potentiometer/mcp4531.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/potentiostat/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/potentiostat/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/potentiostat/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/potentiostat/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/potentiostat/lmp91000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/potentiostat/lmp91000.c</a></td><td class='right'>446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/pressure/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/pressure/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/pressure/abp060mg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/abp060mg.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/pressure/bmp280-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/bmp280-core.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/pressure/cros_ec_baro.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/cros_ec_baro.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/pressure/mpl115.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/mpl115.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/pressure/mpl3115.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/mpl3115.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/pressure/ms5611_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/ms5611_core.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/pressure/st_pressure.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/st_pressure.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/pressure/st_pressure_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/st_pressure_core.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/pressure/st_pressure_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/st_pressure_i2c.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/pressure/zpa2326.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/pressure/zpa2326.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/proximity/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/proximity/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/proximity/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/proximity/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/proximity/pulsedlight-lidar-lite-v2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/proximity/srf08.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/proximity/srf08.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/proximity/sx9500.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/proximity/sx9500.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/temperature/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/temperature/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/temperature/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/temperature/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/temperature/tmp007.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/temperature/tmp007.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/trigger/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/trigger/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/trigger/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/trigger/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/trigger/iio-trig-hrtimer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/trigger/iio-trig-hrtimer.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/trigger/iio-trig-interrupt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/trigger/iio-trig-interrupt.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iio/trigger/iio-trig-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/trigger/iio-trig-sysfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/iio/trigger/stm32-timer-trigger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iio/trigger/stm32-timer-trigger.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/agent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/agent.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/cache.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/core/cgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/cgroup.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/cm.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/cma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/cma.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/cma_configfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/cma_configfs.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/core_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/core_priv.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/cq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/cq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/device.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/fmr_pool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/fmr_pool.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/iwcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/iwcm.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/iwpm_msg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/iwpm_msg.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/iwpm_util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/iwpm_util.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/mad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/mad.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/multicast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/multicast.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/roce_gid_mgmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/roce_gid_mgmt.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/sysfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/ucm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/ucm.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/ucma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/ucma.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/umem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/umem.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/umem_odp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/umem_odp.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/umem_rbtree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/umem_rbtree.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/user_mad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/user_mad.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/uverbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/uverbs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/uverbs_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/uverbs_cmd.c</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/uverbs_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/uverbs_main.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/core/verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/core/verbs.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/bnxt_re.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/bnxt_re.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/ib_verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/ib_verbs.c</a></td><td class='right'>3202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/ib_verbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/ib_verbs.h</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/main.c</a></td><td class='right'>1315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/qplib_fp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/qplib_fp.c</a></td><td class='right'>2167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/qplib_fp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/qplib_fp.h</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/qplib_rcfw.c</a></td><td class='right'>694</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/qplib_rcfw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/qplib_rcfw.h</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/qplib_res.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/qplib_res.c</a></td><td class='right'>825</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/qplib_res.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/qplib_res.h</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/qplib_sp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/qplib_sp.c</a></td><td class='right'>838</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/qplib_sp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/qplib_sp.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/bnxt_re/roce_hsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/bnxt_re/roce_hsi.h</a></td><td class='right'>2821</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/cxgb3/cxio_dbg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/cxgb3/cxio_dbg.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/cxgb3/iwch_cm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/cxgb3/iwch_cm.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/cxgb3/iwch_provider.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/cxgb3/iwch_provider.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/cxgb3/iwch_qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/cxgb3/iwch_qp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/cxgb4/cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/cxgb4/cm.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/cxgb4/cq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/cxgb4/cq.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/cxgb4/device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/cxgb4/device.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/cxgb4/iw_cxgb4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/cxgb4/iw_cxgb4.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/cxgb4/provider.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/cxgb4/provider.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/cxgb4/qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/cxgb4/qp.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/cxgb4/t4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/cxgb4/t4.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/affinity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/affinity.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/affinity.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/affinity.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/chip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/chip.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/chip_registers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/chip_registers.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/debugfs.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/dma.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/driver.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/efivar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/efivar.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/eprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/eprom.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/file_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/file_ops.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/firmware.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/hfi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/hfi.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/init.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/iowait.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/iowait.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/mad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/mad.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/mmu_rb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/mmu_rb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/pcie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/pcie.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/pio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/pio.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/pio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/pio.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/pio_copy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/pio_copy.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/platform.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/platform.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/platform.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/qp.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/qp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/qp.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/rc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/rc.c</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/ruc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/ruc.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/sdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/sdma.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/sdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/sdma.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/trace.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/uc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/uc.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/ud.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/ud.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/user_exp_rcv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/user_exp_rcv.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/user_pages.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/user_pages.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/user_sdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/user_sdma.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/verbs.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/verbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/verbs.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/verbs_txreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/verbs_txreq.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hfi1/verbs_txreq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hfi1/verbs_txreq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_ah.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_ah.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_alloc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_cmd.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_cmd.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_common.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_cq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_cq.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_device.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_eq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_eq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_hem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_hem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_hw_v1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_hw_v1.c</a></td><td class='right'>1222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_hw_v1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_hw_v1.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_main.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_mr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_mr.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_pd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_pd.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_qp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/infiniband/hw/hns/hns_roce_user.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/hns/hns_roce_user.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_cm.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_cm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_cm.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_ctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_ctrl.c</a></td><td class='right'>802</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_d.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_hw.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_main.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_osdep.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_osdep.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_p.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_p.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_pble.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_pble.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_puda.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_puda.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_puda.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_puda.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_type.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_type.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_ucontext.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_ucontext.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_uk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_uk.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_user.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_user.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_utils.c</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_verbs.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_verbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_verbs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/i40iw/i40iw_virtchnl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/i40iw/i40iw_virtchnl.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx4/ah.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx4/ah.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx4/alias_GUID.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx4/alias_GUID.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx4/cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx4/cm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx4/mad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx4/mad.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx4/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx4/main.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx4/mcg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx4/mcg.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx4/mlx4_ib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx4/mlx4_ib.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx4/mr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx4/mr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx4/qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx4/qp.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx4/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx4/sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/ah.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/ah.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/cmd.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/cmd.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/cq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/cq.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/mad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/mad.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/main.c</a></td><td class='right'>946</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/mem.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/mlx5_ib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/mlx5_ib.h</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/mr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/mr.c</a></td><td class='right'>709</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/odp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/odp.c</a></td><td class='right'>891</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/qp.c</a></td><td class='right'>660</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mlx5/srq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mlx5/srq.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mthca/mthca_av.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mthca/mthca_av.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mthca/mthca_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mthca/mthca_main.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mthca/mthca_provider.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mthca/mthca_provider.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/mthca/mthca_reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/mthca/mthca_reset.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/nes/nes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/nes/nes.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/nes/nes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/nes/nes.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/nes/nes_cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/nes/nes_cm.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/nes/nes_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/nes/nes_hw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/nes/nes_mgt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/nes/nes_mgt.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/nes/nes_nic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/nes/nes_nic.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/nes/nes_verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/nes/nes_verbs.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/ocrdma/ocrdma_ah.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/ocrdma/ocrdma_ah.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/ocrdma/ocrdma_ah.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/ocrdma/ocrdma_ah.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/ocrdma/ocrdma_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/ocrdma/ocrdma_hw.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/ocrdma/ocrdma_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/ocrdma/ocrdma_main.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/ocrdma/ocrdma_sli.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/ocrdma/ocrdma_sli.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/ocrdma/ocrdma_stats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/ocrdma/ocrdma_stats.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/ocrdma/ocrdma_verbs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qedr/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qedr/main.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qedr/qedr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qedr/qedr.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qedr/qedr_cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qedr/qedr_cm.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qedr/qedr_cm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qedr/qedr_cm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qedr/verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qedr/verbs.c</a></td><td class='right'>684</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qedr/verbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qedr/verbs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_diag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_diag.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_dma.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_driver.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_eeprom.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_file_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_file_ops.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_iba6120.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_iba6120.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_iba7220.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_iba7220.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_iba7322.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_iba7322.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_init.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_keys.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_pcie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_pcie.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_qp.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_qsfp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_qsfp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_qsfp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_qsfp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_rc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_rc.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_ruc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_ruc.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_uc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_uc.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_ud.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_ud.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_user_pages.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_user_pages.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_user_sdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_user_sdma.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_verbs.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/qib/qib_verbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/qib/qib_verbs.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/usnic/usnic_fwd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/usnic/usnic_fwd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/usnic/usnic_ib_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/usnic/usnic_ib_main.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/usnic/usnic_ib_sysfs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/usnic/usnic_ib_verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/usnic/usnic_ib_verbs.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/usnic/usnic_ib_verbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/usnic/usnic_ib_verbs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/usnic/usnic_uiom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/usnic/usnic_uiom.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/hw/usnic/usnic_vnic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/usnic/usnic_vnic.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma.h</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_cmd.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h</a></td><td class='right'>580</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_doorbell.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_doorbell.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c</a></td><td class='right'>1114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c</a></td><td class='right'>971</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c</a></td><td class='right'>579</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/cq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/cq.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/dma.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/dma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/dma.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/mad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/mad.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/mcast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/mcast.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/mr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/mr.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/pd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/pd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/qp.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/rc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/rc.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/trace.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/trace_mr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/trace_mr.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/trace_qp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/trace_qp.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/trace_rvt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/trace_rvt.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/trace_tx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/trace_tx.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/vt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/vt.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rdmavt/vt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rdmavt/vt.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_comp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_comp.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_cq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_cq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_dma.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_hdr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_hdr.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_loc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_loc.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_mcast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_mcast.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_mr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_mr.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_net.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_param.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_param.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_pool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_pool.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_pool.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_pool.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_qp.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_recv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_recv.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_req.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_req.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_resp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_resp.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_srq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_srq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_task.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_task.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_task.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_task.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_verbs.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/sw/rxe/rxe_verbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/sw/rxe/rxe_verbs.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/ipoib/ipoib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/ipoib/ipoib.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/ipoib/ipoib_cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/ipoib/ipoib_cm.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/ipoib/ipoib_ethtool.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/ipoib/ipoib_ib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/ipoib/ipoib_ib.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/ipoib/ipoib_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/ipoib/ipoib_vlan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/ipoib/ipoib_vlan.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/iser/iscsi_iser.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/iser/iscsi_iser.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/iser/iscsi_iser.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/iser/iscsi_iser.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/iser/iser_verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/iser/iser_verbs.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/isert/ib_isert.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/isert/ib_isert.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/srp/ib_srp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/srp/ib_srp.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/srp/ib_srp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/srp/ib_srp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/srpt/ib_srpt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/srpt/ib_srpt.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/infiniband/ulp/srpt/ib_srpt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/infiniband/ulp/srpt/ib_srpt.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/input-compat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/input-compat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/input.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/joydev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/joydev.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/joystick/maplecontrol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/joystick/maplecontrol.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/joystick/walkera0701.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/joystick/walkera0701.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/joystick/xpad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/joystick/xpad.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/adc-keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/adc-keys.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/adp5520-keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/adp5520-keys.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/bcm-keypad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/bcm-keypad.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/bf54x-keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/bf54x-keys.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/cap11xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/cap11xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/cros_ec_keyb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/cros_ec_keyb.c</a></td><td class='right'>454</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/davinci_keyscan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/davinci_keyscan.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/gpio_keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/gpio_keys.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/gpio_keys_polled.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/gpio_keys_polled.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/jornada680_kbd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/jornada680_kbd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/lpc32xx-keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/lpc32xx-keys.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/maple_keyb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/maple_keyb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/matrix_keypad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/matrix_keypad.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/max7359_keypad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/max7359_keypad.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/mpr121_touchkey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/mpr121_touchkey.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/nspire-keypad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/nspire-keypad.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/omap4-keypad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/omap4-keypad.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/opencores-kbd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/opencores-kbd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/pmic8xxx-keypad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/pmic8xxx-keypad.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/pxa27x_keypad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/pxa27x_keypad.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/samsung-keypad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/samsung-keypad.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/spear-keyboard.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/spear-keyboard.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/st-keyscan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/st-keyscan.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/stmpe-keypad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/stmpe-keypad.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/sun4i-lradc-keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/sun4i-lradc-keys.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/tca8418_keypad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/tca8418_keypad.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/input/keyboard/tm2-touchkey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/tm2-touchkey.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/keyboard/twl4030_keypad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/keyboard/twl4030_keypad.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/matrix-keymap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/matrix-keymap.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/88pm80x_onkey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/88pm80x_onkey.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/ab8500-ponkey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/ab8500-ponkey.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/adxl34x-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/adxl34x-i2c.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/arizona-haptics.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/arizona-haptics.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/atlas_btns.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/atlas_btns.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/atmel_captouch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/atmel_captouch.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/bfin_rotary.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/bfin_rotary.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/bma150.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/bma150.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/da9063_onkey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/da9063_onkey.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/dm355evm_keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/dm355evm_keys.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/drv260x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/drv260x.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/drv2665.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/drv2665.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/drv2667.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/drv2667.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/e3x0-button.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/e3x0-button.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/gp2ap002a00f.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/gp2ap002a00f.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/gpio_decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/gpio_decoder.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/gpio_tilt_polled.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/gpio_tilt_polled.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/hisi_powerkey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/hisi_powerkey.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/mma8450.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/mma8450.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/input/misc/mpu3050.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/mpu3050.c</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/pm8941-pwrkey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/pm8941-pwrkey.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/pmic8xxx-pwrkey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/pmic8xxx-pwrkey.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/pwm-beeper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/pwm-beeper.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/retu-pwrbutton.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/retu-pwrbutton.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/sirfsoc-onkey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/sirfsoc-onkey.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/soc_button_array.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/soc_button_array.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/tps65218-pwrbutton.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/tps65218-pwrbutton.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/twl4030-pwrbutton.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/twl4030-pwrbutton.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/uinput.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/uinput.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/misc/xen-kbdfront.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/misc/xen-kbdfront.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/alps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/alps.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/alps.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/alps.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/amimouse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/amimouse.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/atarimouse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/atarimouse.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/bcm5974.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/bcm5974.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/cyapa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/cyapa.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/cyapa_gen3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/cyapa_gen3.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/cypress_ps2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/cypress_ps2.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/elan_i2c_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/elan_i2c_core.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/elantech.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/elantech.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/hgpk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/hgpk.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/logips2pp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/logips2pp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/maplemouse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/maplemouse.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/psmouse-base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/psmouse-base.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/psmouse.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/psmouse.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/synaptics.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/synaptics.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/synaptics.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/synaptics.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/synaptics_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/synaptics_i2c.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/mouse/trackpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/mouse/trackpoint.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/Kconfig</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_2d_sensor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_2d_sensor.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_2d_sensor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_2d_sensor.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_bus.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_bus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_bus.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_driver.c</a></td><td class='right'>437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_driver.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_f01.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_f01.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_f03.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_f03.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_f11.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_f11.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_f12.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_f12.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_f30.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_f30.c</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_f34.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_f34.c</a></td><td class='right'>600</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_f34.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_f34.h</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_f34v7.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_f34v7.c</a></td><td class='right'>1383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_f54.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_f54.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_f55.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_f55.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_i2c.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_smbus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_smbus.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/rmi4/rmi_spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/rmi4/rmi_spi.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/serio/at32psif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/serio/at32psif.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/serio/hp_sdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/serio/hp_sdc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/serio/hyperv-keyboard.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/serio/hyperv-keyboard.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/serio/i8042-x86ia64io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/serio/i8042-x86ia64io.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/serio/i8042.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/serio/i8042.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/serio/q40kbd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/serio/q40kbd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/serio/serport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/serio/serport.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/serio/xilinx_ps2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/serio/xilinx_ps2.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/tablet/aiptek.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/tablet/aiptek.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/tablet/gtco.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/tablet/gtco.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/88pm860x-ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/88pm860x-ts.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/ads7846.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/ads7846.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/ar1021_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/ar1021_i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/atmel-wm97xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/atmel-wm97xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/atmel_mxt_ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/atmel_mxt_ts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/bu21013_ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/bu21013_ts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/colibri-vf50-ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/colibri-vf50-ts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/cyttsp4_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/cyttsp4_core.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/edt-ft5x06.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/edt-ft5x06.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/eeti_ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/eeti_ts.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/egalax_ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/egalax_ts.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/elants_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/elants_i2c.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/fsl-imx25-tcq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/fsl-imx25-tcq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/ili210x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/ili210x.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/imx6ul_tsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/imx6ul_tsc.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/input/touchscreen/intel-mid-touch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/intel-mid-touch.c</a></td><td class='right'>654</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/lpc32xx_ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/lpc32xx_ts.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/max11801_ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/max11801_ts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/mcs5000_ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/mcs5000_ts.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/melfas_mip4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/melfas_mip4.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/pixcir_i2c_ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/pixcir_i2c_ts.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/raydium_i2c_ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/raydium_i2c_ts.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/rohm_bu21023.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/rohm_bu21023.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/s3c2410_ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/s3c2410_ts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/silead.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/silead.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/sis_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/sis_i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/st1232.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/st1232.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/sx8654.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/sx8654.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/tsc2005.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/tsc2005.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/tsc200x-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/tsc200x-core.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/input/touchscreen/wm97xx-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/wm97xx-core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/input/touchscreen/zet6223.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/input/touchscreen/zet6223.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/amd_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/amd_iommu.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/amd_iommu_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/amd_iommu_init.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/amd_iommu_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/amd_iommu_types.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/amd_iommu_v2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/amd_iommu_v2.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/arm-smmu-v3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/arm-smmu-v3.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/arm-smmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/arm-smmu.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/dma-iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/dma-iommu.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/dmar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/dmar.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/exynos-iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/exynos-iommu.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/intel-iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/intel-iommu.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/intel-svm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/intel-svm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/io-pgtable-arm-v7s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/io-pgtable-arm-v7s.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/io-pgtable-arm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/io-pgtable-arm.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/iommu-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/iommu-sysfs.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/iommu.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/iova.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/iova.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/ipmmu-vmsa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/ipmmu-vmsa.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/msm_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/msm_iommu.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/msm_iommu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/msm_iommu.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/mtk_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/mtk_iommu.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/mtk_iommu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/mtk_iommu.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/mtk_iommu_v1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/mtk_iommu_v1.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/of_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/of_iommu.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/iommu/s390-iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/iommu/s390-iommu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/irq-armada-370-xp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-armada-370-xp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/irq-bcm2836.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-bcm2836.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/irq-bcm7038-l1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-bcm7038-l1.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/irqchip/irq-gemini.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-gemini.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/irq-gic-v3-its.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-gic-v3-its.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/irq-gic-v3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-gic-v3.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/irq-gic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-gic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/irq-hip04.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-hip04.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/irq-keystone.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-keystone.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/irq-mips-gic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-mips-gic.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/irq-mxs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-mxs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/irqchip/irq-st.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-st.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/irqchip/irq-xilinx-intc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/irq-xilinx-intc.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/irqchip/qcom-irq-combiner.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/irqchip/qcom-irq-combiner.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/capi/kcapi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/capi/kcapi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/gigaset/bas-gigaset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/gigaset/bas-gigaset.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/gigaset/ser-gigaset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/gigaset/ser-gigaset.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/gigaset/usb-gigaset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/gigaset/usb-gigaset.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hardware/avm/b1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hardware/avm/b1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hardware/avm/b1dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hardware/avm/b1dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hardware/avm/c4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hardware/avm/c4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hardware/eicon/capimain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hardware/eicon/capimain.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hardware/eicon/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hardware/eicon/debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hardware/eicon/divamnt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hardware/eicon/divamnt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hardware/eicon/divasi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hardware/eicon/divasi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hardware/eicon/divasmain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hardware/eicon/divasmain.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hardware/eicon/divasproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hardware/eicon/divasproc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hardware/eicon/message.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hardware/eicon/message.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hardware/mISDN/mISDNipac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hardware/mISDN/mISDNipac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hisax/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hisax/config.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hisax/hisax.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hisax/hisax.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hisax/q931.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hisax/q931.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hysdn/hysdn_boot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hysdn/hysdn_boot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/hysdn/hysdn_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/hysdn/hysdn_net.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/i4l/isdn_concap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/i4l/isdn_concap.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/i4l/isdn_tty.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/i4l/isdn_tty.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/i4l/isdn_x25iface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/i4l/isdn_x25iface.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/mISDN/dsp_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/mISDN/dsp_core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/mISDN/l1oip_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/mISDN/l1oip_core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/mISDN/stack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/mISDN/stack.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/isdn/mISDN/timerdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/isdn/mISDN/timerdev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/Kconfig</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/led-class.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/led-class.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/led-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/led-core.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/leds-cobalt-raq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-cobalt-raq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/leds-gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-gpio.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/leds-ktd2692.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-ktd2692.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/leds-lp3952.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-lp3952.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/leds-mc13783.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-mc13783.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/leds-mlxcpld.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-mlxcpld.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/leds-netxbig.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-netxbig.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/leds/leds-nic78bx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-nic78bx.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/leds-pca9532.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-pca9532.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/leds-pca955x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-pca955x.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/leds-pca963x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-pca963x.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/leds-pwm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/leds-pwm.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/trigger/ledtrig-cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/trigger/ledtrig-cpu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/leds/trigger/ledtrig-heartbeat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/trigger/ledtrig-heartbeat.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/leds/uleds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/leds/uleds.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/lguest/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lguest/core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/lguest/hypercalls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lguest/hypercalls.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/lguest/lg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lguest/lg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/lguest/lguest_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lguest/lguest_user.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/lguest/page_tables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lguest/page_tables.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/lguest/x86/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lguest/x86/core.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/lightnvm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lightnvm/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/lightnvm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lightnvm/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/lightnvm/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lightnvm/core.c</a></td><td class='right'>1240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/lightnvm/gennvm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lightnvm/gennvm.c</a></td><td class='right'>682</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/lightnvm/gennvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lightnvm/gennvm.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/lightnvm/lightnvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lightnvm/lightnvm.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/lightnvm/rrpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lightnvm/rrpc.c</a></td><td class='right'>521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/lightnvm/rrpc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lightnvm/rrpc.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/lightnvm/sysblk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lightnvm/sysblk.c</a></td><td class='right'>745</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/lightnvm/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/lightnvm/sysfs.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/macintosh/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/macintosh/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/macintosh/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/macintosh/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/macintosh/adb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/macintosh/adb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/macintosh/ans-lcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/macintosh/ans-lcd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/macintosh/rack-meter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/macintosh/rack-meter.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/macintosh/smu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/macintosh/smu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/macintosh/via-cuda.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/macintosh/via-cuda.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/macintosh/via-maciisi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/macintosh/via-maciisi.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/macintosh/via-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/macintosh/via-pmu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/macintosh/via-pmu68k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/macintosh/via-pmu68k.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/macintosh/windfarm_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/macintosh/windfarm_core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mailbox/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mailbox/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mailbox/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mailbox/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mailbox/bcm-pdc-mailbox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mailbox/bcm-pdc-mailbox.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mailbox/mailbox-sti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mailbox/mailbox-sti.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mailbox/mailbox-test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mailbox/mailbox-test.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mailbox/mailbox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mailbox/mailbox.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mailbox/pcc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mailbox/pcc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mailbox/tegra-hsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mailbox/tegra-hsp.c</a></td><td class='right'>479</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mcb/mcb-parse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mcb/mcb-parse.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/bcache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/bcache.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/bset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/bset.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/btree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/btree.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/btree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/btree.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/closure.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/closure.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/debug.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/journal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/journal.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/movinggc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/movinggc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/request.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/request.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/super.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/util.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/util.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/writeback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/writeback.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bcache/writeback.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bcache/writeback.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/bitmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/bitmap.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-bufio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-bufio.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-cache-block-types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-cache-block-types.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-cache-metadata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-cache-metadata.c</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-cache-metadata.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-cache-metadata.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-cache-policy-smq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-cache-policy-smq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-cache-target.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-cache-target.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-core.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-crypt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-crypt.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-era-target.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-era-target.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-flakey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-flakey.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-io.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-ioctl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-log.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-mpath.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-mpath.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-raid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-raid.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-raid1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-raid1.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-round-robin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-round-robin.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-rq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-rq.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-rq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-rq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-snap-persistent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-snap-persistent.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-stats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-stats.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-table.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-target.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-target.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-thin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-thin.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm-verity-target.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm-verity-target.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/dm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/dm.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/faulty.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/faulty.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/linear.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/linear.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/linear.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/linear.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/md.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/md.c</a></td><td class='right'>737</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/md.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/md.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/multipath.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/multipath.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/persistent-data/dm-array.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/persistent-data/dm-array.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/persistent-data/dm-array.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/persistent-data/dm-array.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/persistent-data/dm-bitset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/persistent-data/dm-bitset.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/persistent-data/dm-bitset.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/persistent-data/dm-bitset.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/persistent-data/dm-block-manager.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/persistent-data/dm-block-manager.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/persistent-data/dm-btree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/persistent-data/dm-btree.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/persistent-data/dm-btree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/persistent-data/dm-btree.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/persistent-data/dm-space-map-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/persistent-data/dm-space-map-common.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/persistent-data/dm-space-map-metadata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/persistent-data/dm-space-map-metadata.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/raid0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/raid0.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/raid1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/raid1.c</a></td><td class='right'>994</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/raid1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/raid1.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/raid10.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/raid10.c</a></td><td class='right'>545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/raid10.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/raid10.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/raid5-cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/raid5-cache.c</a></td><td class='right'>2070</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 83.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/raid5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/raid5.c</a></td><td class='right'>853</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/md/raid5.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/md/raid5.h</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/cec/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/cec/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/media/cec/cec-adap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/cec/cec-adap.c</a> (renamed from drivers/staging/media/cec/cec-adap.c)</td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/media/cec/cec-api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/cec/cec-api.c</a> (renamed from drivers/staging/media/cec/cec-api.c)</td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/media/cec/cec-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/cec/cec-core.c</a> (renamed from drivers/staging/media/cec/cec-core.c)</td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/media/cec/cec-priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/cec/cec-priv.h</a> (renamed from drivers/staging/media/cec/cec-priv.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/b2c2/flexcop-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/b2c2/flexcop-common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/b2c2/flexcop-eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/b2c2/flexcop-eeprom.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/b2c2/flexcop-fe-tuner.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/b2c2/flexcop-fe-tuner.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/b2c2/flexcop-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/b2c2/flexcop-i2c.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/b2c2/flexcop-misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/b2c2/flexcop-misc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/b2c2/flexcop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/b2c2/flexcop.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/cx2341x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/cx2341x.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/saa7146/saa7146_video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/saa7146/saa7146_video.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/siano/sms-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/siano/sms-cards.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/siano/sms-cards.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/siano/sms-cards.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/siano/smscoreapi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/siano/smscoreapi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/siano/smsdvb-main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/siano/smsdvb-main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/siano/smsir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/siano/smsir.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/tveeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/tveeprom.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/common/v4l2-tpg/v4l2-tpg-core.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/demux.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/demux.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dmxdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dmxdev.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dmxdev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dmxdev.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb-usb-ids.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb-usb-ids.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_ca_en50221.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_ca_en50221.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_demux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_demux.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_demux.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_demux.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_filter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_filter.c</a></td><td class='right'>603</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_frontend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_frontend.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_frontend.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_frontend.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_math.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_math.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_math.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_math.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_net.c</a></td><td class='right'>958</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_net.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_net.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_ringbuffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_ringbuffer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvb_ringbuffer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvb_ringbuffer.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvbdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvbdev.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-core/dvbdev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-core/dvbdev.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/af9013.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/af9013.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/af9013.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/af9013.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/af9013_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/af9013_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/af9033.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/af9033.c</a></td><td class='right'>839</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/af9033.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/af9033.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/af9033_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/af9033_priv.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/as102_fe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/as102_fe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/ascot2e.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/ascot2e.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/atbm8830.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/atbm8830.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/atbm8830.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/atbm8830.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/atbm8830_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/atbm8830_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/au8522_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/au8522_common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/au8522_decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/au8522_decoder.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/au8522_dig.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/au8522_dig.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/bcm3510.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/bcm3510.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/bcm3510.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/bcm3510.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/bcm3510_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/bcm3510_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/bsbe1-d01a.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/bsbe1-d01a.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/bsbe1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/bsbe1.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/bsru6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/bsru6.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/cx22700.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/cx22700.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/cx24110.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/cx24110.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/cx24113.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/cx24113.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/cx24113.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/cx24113.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/cx24116.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/cx24116.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/cx24117.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/cx24117.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/cx24120.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/cx24120.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/cx24123.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/cx24123.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/cxd2820r_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/cxd2820r_core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/cxd2841er.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/cxd2841er.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dib0070.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dib0070.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dib0090.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dib0090.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dib3000mb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dib3000mb.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dib3000mb_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dib3000mb_priv.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dib3000mc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dib3000mc.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dib7000m.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dib7000m.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dib7000p.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dib7000p.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dib8000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dib8000.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dib9000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dib9000.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dibx000_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dibx000_common.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dibx000_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dibx000_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/drx39xyj/drx39xxj.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/drx39xyj/drx39xxj.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/drx39xyj/drx_driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/drx39xyj/drx_driver.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/drx39xyj/drxj.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/drx39xyj/drxj.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/drx39xyj/drxj.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/drx39xyj/drxj.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/drxd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/drxd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/drxd_firm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/drxd_firm.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/drxd_firm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/drxd_firm.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/drxd_hard.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/drxd_hard.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/drxd_map_firm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/drxd_map_firm.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/drxk_hard.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/drxk_hard.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/ds3000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/ds3000.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dvb-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dvb-pll.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dvb_dummy_fe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dvb_dummy_fe.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/dvb_dummy_fe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/dvb_dummy_fe.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/ec100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/ec100.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/ec100.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/ec100.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/gp8psk-fe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/gp8psk-fe.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/media/dvb-frontends/hd29l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/hd29l2.c</a></td><td class='right'>870</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/media/dvb-frontends/hd29l2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/hd29l2.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/media/dvb-frontends/hd29l2_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/hd29l2_priv.h</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/helene.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/helene.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/horus3a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/horus3a.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/isl6405.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/isl6405.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/isl6405.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/isl6405.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/isl6421.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/isl6421.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/isl6421.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/isl6421.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/itd1000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/itd1000.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/itd1000.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/itd1000.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/itd1000_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/itd1000_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/ix2505v.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/ix2505v.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/ix2505v.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/ix2505v.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/l64781.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/l64781.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lg2160.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lg2160.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lg2160.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lg2160.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lgdt3305.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lgdt3305.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lgdt3305.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lgdt3305.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lgdt3306a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lgdt3306a.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lgdt3306a.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lgdt3306a.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lgdt330x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lgdt330x.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lgdt330x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lgdt330x.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lgdt330x_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lgdt330x_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lgs8gl5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lgs8gl5.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lgs8gxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lgs8gxx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lgs8gxx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lgs8gxx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lgs8gxx_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lgs8gxx_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lnbh24.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lnbh24.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lnbp21.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lnbp21.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lnbp21.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lnbp21.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lnbp22.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lnbp22.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/lnbp22.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/lnbp22.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/m88ds3103.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/m88ds3103.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/m88rs2000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/m88rs2000.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/mb86a16.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/mb86a16.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/mb86a20s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/mb86a20s.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/mn88472.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/mn88472.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/mn88473.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/mn88473.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/mn88473_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/mn88473_priv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/mt312.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/mt312.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/mt352.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/mt352.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/mt352.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/mt352.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/mt352_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/mt352_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/nxt200x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/nxt200x.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/nxt200x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/nxt200x.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/nxt6000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/nxt6000.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/or51132.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/or51132.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/or51132.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/or51132.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/or51211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/or51211.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/or51211.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/or51211.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/rtl2830.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/rtl2830.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/rtl2832.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/rtl2832.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/rtl2832_sdr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/rtl2832_sdr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/s5h1409.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/s5h1409.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/s5h1411.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/s5h1411.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/s5h1420.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/s5h1420.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/s5h1420.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/s5h1420.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/s5h1432.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/s5h1432.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/s5h1432.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/s5h1432.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/s921.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/s921.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/si2165.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/si2165.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/si2168.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/si2168.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/si2168_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/si2168_priv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/si21xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/si21xx.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/sp8870.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/sp8870.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/sp887x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/sp887x.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stb0899_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stb0899_drv.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stb6000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stb6000.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stb6100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stb6100.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0288.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0288.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0297.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0297.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0299.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0299.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0367.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0367.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0367.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0367.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0367_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0367_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0367_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0367_regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0900.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0900.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0900_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0900_core.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0900_init.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0900_init.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0900_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0900_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0900_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0900_reg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv0900_sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv0900_sw.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv090x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv090x.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv6110.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv6110.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv6110.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv6110.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/stv6110x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/stv6110x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tc90522.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tc90522.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tda10021.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tda10021.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tda10023.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tda10023.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tda10048.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tda10048.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tda1004x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tda1004x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tda10071.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tda10071.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tda10086.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tda10086.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tda18271c2dd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tda18271c2dd.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tda665x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tda665x.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tda8083.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tda8083.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tda8261.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tda8261.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tda826x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tda826x.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tdhd1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tdhd1.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/ts2020.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/ts2020.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tua6100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tua6100.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/tua6100.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/tua6100.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/ves1820.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/ves1820.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/ves1x93.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/ves1x93.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/dvb-frontends/zd1301_demod.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/zd1301_demod.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/dvb-frontends/zd1301_demod.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/zd1301_demod.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/zl10036.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/zl10036.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/zl10036.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/zl10036.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/zl10039.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/zl10039.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/zl10353.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/zl10353.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/zl10353.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/zl10353.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/dvb-frontends/zl10353_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/dvb-frontends/zl10353_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/firewire/firedtv-avc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/firewire/firedtv-avc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/firewire/firedtv-rc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/firewire/firedtv-rc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/ad5820.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/ad5820.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/adp1653.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/adp1653.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/adv7170.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/adv7170.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/adv7175.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/adv7175.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/adv7180.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/adv7180.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/adv7183.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/adv7183.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/adv7183_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/adv7183_regs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/adv7511.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/adv7511.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/adv7604.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/adv7604.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/adv7842.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/adv7842.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/ak881x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/ak881x.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/aptina-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/aptina-pll.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/aptina-pll.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/aptina-pll.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/as3645a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/as3645a.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/bt819.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/bt819.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/bt856.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/bt856.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/bt866.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/bt866.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/cs5345.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/cs5345.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/cs53l32a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/cs53l32a.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/cx25840/cx25840-audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/cx25840/cx25840-audio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/cx25840/cx25840-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/cx25840/cx25840-core.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/cx25840/cx25840-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/cx25840/cx25840-core.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/cx25840/cx25840-firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/cx25840/cx25840-firmware.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/cx25840/cx25840-ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/cx25840/cx25840-ir.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/cx25840/cx25840-vbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/cx25840/cx25840-vbi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/i2c/et8ek8/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/et8ek8/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/i2c/et8ek8/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/et8ek8/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/i2c/et8ek8/et8ek8_driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/et8ek8/et8ek8_driver.c</a></td><td class='right'>1514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/i2c/et8ek8/et8ek8_mode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/et8ek8/et8ek8_mode.c</a></td><td class='right'>587</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/i2c/et8ek8/et8ek8_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/et8ek8/et8ek8_reg.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/ir-kbd-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/ir-kbd-i2c.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/ks0127.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/ks0127.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/ks0127.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/ks0127.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/m52790.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/m52790.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/m5mols/m5mols_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/m5mols/m5mols_core.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/ml86v7667.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/ml86v7667.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/msp3400-driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/msp3400-driver.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/msp3400-kthreads.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/msp3400-kthreads.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/mt9m032.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/mt9m032.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/mt9p031.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/mt9p031.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/mt9v032.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/mt9v032.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/noon010pc30.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/noon010pc30.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/ov2659.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/ov2659.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/ov7640.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/ov7640.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/ov9650.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/ov9650.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/s5k6a3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/s5k6a3.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/saa6588.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/saa6588.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/saa7110.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/saa7110.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/saa7115.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/saa7115.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/saa7127.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/saa7127.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/saa717x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/saa717x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/saa7185.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/saa7185.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/smiapp-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/smiapp-pll.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/smiapp/smiapp-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/smiapp/smiapp-core.c</a></td><td class='right'>927</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/smiapp/smiapp-regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/smiapp/smiapp-regs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/smiapp/smiapp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/smiapp/smiapp.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/soc_camera/ov772x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/soc_camera/ov772x.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/soc_camera/ov9640.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/soc_camera/ov9640.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/soc_camera/ov9740.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/soc_camera/ov9740.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/soc_camera/tw9910.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/soc_camera/tw9910.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/sony-btf-mpx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/sony-btf-mpx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tc358743.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tc358743.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tc358743_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tc358743_regs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tlv320aic23b.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tlv320aic23b.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tvaudio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tvaudio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tvp514x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tvp514x.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tvp514x_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tvp514x_regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tvp5150.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tvp5150.c</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tvp5150_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tvp5150_reg.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tvp7002.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tvp7002.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tvp7002_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tvp7002_reg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tw2804.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tw2804.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tw9903.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tw9903.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/tw9906.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/tw9906.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/uda1342.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/uda1342.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/upd64031a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/upd64031a.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/upd64083.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/upd64083.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/vp27smpx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/vp27smpx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/vpx3220.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/vpx3220.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/vs6624.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/vs6624.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/vs6624_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/vs6624_regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/wm8739.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/wm8739.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/i2c/wm8775.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/i2c/wm8775.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/media-device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/media-device.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/media-devnode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/media-devnode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/media-entity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/media-entity.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/b2c2/flexcop-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/b2c2/flexcop-dma.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/b2c2/flexcop-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/b2c2/flexcop-pci.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/bt8xx/btcx-risc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/bt8xx/btcx-risc.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/bt8xx/bttv-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/bt8xx/bttv-cards.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/bt8xx/bttv-driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/bt8xx/bttv-driver.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/bt8xx/bttv-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/bt8xx/bttv-i2c.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/bt8xx/bttv-input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/bt8xx/bttv-input.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/bt8xx/dst.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/bt8xx/dst.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/bt8xx/dst_ca.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/bt8xx/dst_ca.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/bt8xx/dvb-bt8xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/bt8xx/dvb-bt8xx.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/bt8xx/dvb-bt8xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/bt8xx/dvb-bt8xx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cobalt/cobalt-cpld.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cobalt/cobalt-cpld.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cobalt/cobalt-driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cobalt/cobalt-driver.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cobalt/cobalt-driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cobalt/cobalt-driver.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cobalt/cobalt-v4l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cobalt/cobalt-v4l2.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-alsa-main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-alsa-main.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-alsa-mixer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-alsa-mixer.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-alsa-mixer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-alsa-mixer.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-alsa-pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-alsa-pcm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-alsa-pcm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-alsa-pcm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-alsa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-alsa.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-audio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-audio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-audio.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-av-audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-av-audio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-av-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-av-core.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-av-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-av-core.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-av-firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-av-firmware.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-av-vbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-av-vbi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-cards.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-cards.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-cards.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-controls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-controls.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-driver.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-driver.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-dvb.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-dvb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-dvb.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-fileops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-fileops.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-fileops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-fileops.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-firmware.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-firmware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-firmware.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-gpio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-gpio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-gpio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-i2c.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-i2c.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-i2c.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-io.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-io.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-ioctl.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-ioctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-ioctl.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-irq.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-irq.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-mailbox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-mailbox.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-mailbox.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-mailbox.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-queue.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-queue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-queue.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-scb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-scb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-scb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-scb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-streams.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-streams.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-streams.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-streams.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-vbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-vbi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-vbi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-vbi.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-version.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-version.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-video.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx18-video.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx18-video.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx18/cx23418.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx18/cx23418.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/altera-ci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/altera-ci.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/altera-ci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/altera-ci.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cimax2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cimax2.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885-417.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885-417.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885-alsa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885-alsa.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885-cards.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885-core.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885-dvb.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885-f300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885-f300.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885-i2c.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885-input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885-input.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885-ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885-ir.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885-vbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885-vbi.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885-video.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23885.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23885.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/cx23888-ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/cx23888-ir.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/netup-eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/netup-eeprom.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx23885/netup-init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx23885/netup-init.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-alsa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-alsa.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-audio-upstream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-audio-upstream.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-audio-upstream.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-audio-upstream.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-audio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-audio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-biffuncs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-biffuncs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-cards.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-gpio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-i2c.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-medusa-defines.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-medusa-defines.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-medusa-reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-medusa-reg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-medusa-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-medusa-video.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-medusa-video.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-medusa-video.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-reg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-sram.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-sram.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-video-upstream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-video-upstream.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-video-upstream.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-video-upstream.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-video.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821-video.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821-video.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx25821/cx25821.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx25821/cx25821.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-alsa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-alsa.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-blackbird.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-blackbird.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-cards.c</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-core.c</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-dsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-dsp.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-dvb.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-i2c.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-input.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-mpeg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-mpeg.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-reg.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-tvaudio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-tvaudio.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-vbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-vbi.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-video.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-vp3054-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-vp3054-i2c.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88-vp3054-i2c.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88-vp3054-i2c.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/cx88/cx88.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/cx88/cx88.h</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ddbridge/ddbridge-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ddbridge/ddbridge-core.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ddbridge/ddbridge-regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ddbridge/ddbridge-regs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ddbridge/ddbridge.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ddbridge/ddbridge.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/dm1105/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/dm1105/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/dm1105/dm1105.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/dm1105/dm1105.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-alsa-main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-alsa-main.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-alsa-mixer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-alsa-mixer.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-alsa-mixer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-alsa-mixer.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-alsa-pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-alsa-pcm.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-alsa-pcm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-alsa-pcm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-alsa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-alsa.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-driver.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-driver.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-firmware.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-ioctl.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-mailbox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-mailbox.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtv-yuv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtv-yuv.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ivtv/ivtvfb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ivtv/ivtvfb.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/mantis/mantis_dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/mantis/mantis_dvb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/mantis/mantis_input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/mantis/mantis_input.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/meye/meye.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/meye/meye.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/meye/meye.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/meye/meye.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/netup_unidvb/netup_unidvb_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/netup_unidvb/netup_unidvb_core.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ngene/ngene-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ngene/ngene-cards.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ngene/ngene-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ngene/ngene-core.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ngene/ngene-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ngene/ngene-dvb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ngene/ngene-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ngene/ngene-i2c.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ngene/ngene.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ngene/ngene.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/pluto2/pluto2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/pluto2/pluto2.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/pt1/pt1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/pt1/pt1.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/pt1/va1j5jf8007s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/pt1/va1j5jf8007s.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/pt1/va1j5jf8007s.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/pt1/va1j5jf8007s.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/pt1/va1j5jf8007t.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/pt1/va1j5jf8007t.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/pt1/va1j5jf8007t.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/pt1/va1j5jf8007t.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/pt3/pt3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/pt3/pt3.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134-alsa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134-alsa.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134-cards.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134-core.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134-dvb.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134-empress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134-empress.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134-i2c.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134-input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134-input.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134-ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134-ts.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134-tvaudio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134-tvaudio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134-vbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134-vbi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134-video.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7134/saa7134.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7134/saa7134.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-api.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-buffer.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-bus.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-cards.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-cmd.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-core.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-dvb.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-encoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-encoder.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-fw.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-i2c.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-reg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-types.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164-vbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164-vbi.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/saa7164/saa7164.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/saa7164/saa7164.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/smipcie/smipcie-ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/smipcie/smipcie-ir.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/solo6x10/solo6x10-g723.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/solo6x10/solo6x10-g723.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/solo6x10/solo6x10-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/solo6x10/solo6x10-i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/solo6x10/solo6x10-v4l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/solo6x10/solo6x10-v4l2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/solo6x10/solo6x10.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/solo6x10/solo6x10.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/sta2x11/sta2x11_vip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/sta2x11/sta2x11_vip.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/sta2x11/sta2x11_vip.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/sta2x11/sta2x11_vip.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/av7110.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/av7110.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/av7110.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/av7110.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/av7110_av.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/av7110_av.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/av7110_ca.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/av7110_ca.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/av7110_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/av7110_hw.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/av7110_hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/av7110_hw.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/av7110_ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/av7110_ir.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/av7110_v4l.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/av7110_v4l.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/budget-av.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/budget-av.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/budget-ci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/budget-ci.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/budget-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/budget-core.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/budget-patch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/budget-patch.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/budget.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/budget.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/budget.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/budget.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/pci/ttpci/dvb_filter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/dvb_filter.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/media/pci/ttpci/dvb_filter.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/dvb_filter.h</a> (renamed from drivers/media/dvb-core/dvb_filter.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/ttpci/ttpci-eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/ttpci/ttpci-eeprom.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/tw5864/tw5864-reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/tw5864/tw5864-reg.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/tw5864/tw5864-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/tw5864/tw5864-video.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/tw68/tw68-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/tw68/tw68-video.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/tw686x/tw686x-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/tw686x/tw686x-core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/videocodec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/videocodec.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/videocodec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/videocodec.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zoran.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zoran.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zoran_card.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zoran_card.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zoran_card.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zoran_card.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zoran_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zoran_device.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zoran_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zoran_device.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zoran_driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zoran_driver.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zoran_procfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zoran_procfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zoran_procfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zoran_procfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zr36016.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zr36016.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zr36016.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zr36016.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zr36050.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zr36050.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zr36050.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zr36050.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zr36057.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zr36057.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zr36060.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zr36060.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/pci/zoran/zr36060.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/pci/zoran/zr36060.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/Kconfig</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/am437x/am437x-vpfe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/am437x/am437x-vpfe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/arv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/arv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/atmel/atmel-isc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/atmel/atmel-isc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/blackfin/bfin_capture.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/blackfin/bfin_capture.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/blackfin/ppi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/blackfin/ppi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/coda/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/coda/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/coda/coda-bit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/coda/coda-bit.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/coda/coda-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/coda/coda-common.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/coda/coda-h264.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/coda/coda-h264.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/coda/coda.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/coda/coda.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/coda/imx-vdoa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/coda/imx-vdoa.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/coda/imx-vdoa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/coda/imx-vdoa.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/ccdc_hw_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/ccdc_hw_device.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/dm355_ccdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/dm355_ccdc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/dm355_ccdc_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/dm355_ccdc_regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/dm644x_ccdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/dm644x_ccdc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/dm644x_ccdc_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/dm644x_ccdc_regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/isif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/isif.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/isif_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/isif_regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/vpbe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/vpbe.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/vpbe_osd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/vpbe_osd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/vpbe_osd_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/vpbe_osd_regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/vpbe_venc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/vpbe_venc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/vpbe_venc_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/vpbe_venc_regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/vpfe_capture.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/vpfe_capture.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/vpif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/vpif.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/vpif_capture.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/vpif_capture.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/vpif_capture.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/vpif_capture.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/vpif_display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/vpif_display.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/davinci/vpss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/davinci/vpss.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos-gsc/gsc-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos-gsc/gsc-core.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos-gsc/gsc-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos-gsc/gsc-core.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos-gsc/gsc-m2m.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos-gsc/gsc-m2m.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos4-is/fimc-capture.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos4-is/fimc-capture.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos4-is/fimc-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos4-is/fimc-core.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos4-is/fimc-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos4-is/fimc-core.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos4-is/fimc-is-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos4-is/fimc-is-i2c.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos4-is/fimc-is.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos4-is/fimc-is.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos4-is/fimc-isp-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos4-is/fimc-isp-video.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos4-is/fimc-lite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos4-is/fimc-lite.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos4-is/fimc-m2m.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos4-is/fimc-m2m.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos4-is/media-dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos4-is/media-dev.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos4-is/media-dev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos4-is/media-dev.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/exynos4-is/mipi-csis.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/exynos4-is/mipi-csis.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/marvell-ccic/mcam-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/marvell-ccic/mcam-core.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/mtk_mdp_comp.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/mtk_mdp_comp.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/mtk_mdp_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/mtk_mdp_core.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/mtk_mdp_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/mtk_mdp_core.h</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c</a></td><td class='right'>1286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/mtk_mdp_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/mtk_mdp_regs.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/mtk_mdp_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/mtk_mdp_regs.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c</a></td><td class='right'>1501</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c</a></td><td class='right'>634</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c</a></td><td class='right'>967</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/vdec_drv_base.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/vdec_drv_base.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/vdec_drv_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/vdec_drv_if.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/vdec_drv_if.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/vdec_drv_if.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/vdec_vpu_if.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/vdec_vpu_if.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mtk-vcodec/venc_vpu_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vcodec/venc_vpu_if.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mtk-vpu/mtk_vpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vpu/mtk_vpu.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mtk-vpu/mtk_vpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mtk-vpu/mtk_vpu.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/mx2_emmaprp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/mx2_emmaprp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/omap/omap_vout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/omap/omap_vout.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/omap/omap_vout_vrfb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/omap/omap_vout_vrfb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/omap3isp/isp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/omap3isp/isp.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/omap3isp/ispccdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/omap3isp/ispccdc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/omap3isp/ispcsi2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/omap3isp/ispcsi2.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/omap3isp/ispcsiphy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/omap3isp/ispcsiphy.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/omap3isp/isph3a_aewb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/omap3isp/isph3a_aewb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/omap3isp/isph3a_af.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/omap3isp/isph3a_af.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/omap3isp/isphist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/omap3isp/isphist.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/omap3isp/ispstat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/omap3isp/ispstat.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/omap3isp/ispvideo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/omap3isp/ispvideo.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/pxa_camera.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/pxa_camera.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/rcar-fcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/rcar-fcp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/rcar_fdp1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/rcar_fdp1.c</a></td><td class='right'>2445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s3c-camif/camif-capture.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s3c-camif/camif-capture.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-mfc/regs-mfc-v6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-mfc/regs-mfc-v6.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-mfc/regs-mfc-v8.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-mfc/regs-mfc-v8.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-mfc/regs-mfc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-mfc/regs-mfc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-mfc/s5p_mfc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-mfc/s5p_mfc.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-mfc/s5p_mfc_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-mfc/s5p_mfc_common.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-mfc/s5p_mfc_debug.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-mfc/s5p_mfc_dec.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-mfc/s5p_mfc_enc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-mfc/s5p_mfc_opr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/s5p-mfc/s5p_mfc_pm.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/soc_camera/soc_camera_platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/soc_camera/soc_camera_platform.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/sti/bdisp/bdisp-debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/bdisp/bdisp-debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/sti/bdisp/bdisp-v4l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/bdisp/bdisp-v4l2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-cfg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-cfg.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-debug.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-debug.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-ipc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-ipc.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-ipc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-ipc.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-mem.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-mem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-mem.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-mjpeg-dec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-mjpeg-dec.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-mjpeg-fw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-mjpeg-fw.h</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-mjpeg-hdr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-mjpeg-hdr.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-mjpeg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-mjpeg.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta-v4l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta-v4l2.c</a></td><td class='right'>1993</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/delta/delta.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/delta/delta.h</a></td><td class='right'>566</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/sti/hva/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/hva/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/platform/sti/hva/hva-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/hva/hva-debugfs.c</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/sti/hva/hva-h264.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/hva/hva-h264.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/sti/hva/hva-hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/hva/hva-hw.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/sti/hva/hva-hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/hva/hva-hw.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/sti/hva/hva-mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/hva/hva-mem.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/sti/hva/hva-v4l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/hva/hva-v4l2.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/sti/hva/hva.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/sti/hva/hva.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/ti-vpe/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/ti-vpe/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/ti-vpe/cal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/ti-vpe/cal.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/ti-vpe/csc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/ti-vpe/csc.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/ti-vpe/csc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/ti-vpe/csc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/ti-vpe/sc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/ti-vpe/sc.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/ti-vpe/sc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/ti-vpe/sc.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/ti-vpe/vpdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/ti-vpe/vpdma.c</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/ti-vpe/vpdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/ti-vpe/vpdma.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/ti-vpe/vpdma_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/ti-vpe/vpdma_priv.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/ti-vpe/vpe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/ti-vpe/vpe.c</a></td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/via-camera.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/via-camera.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vim2m.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vim2m.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vivid/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vivid/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vivid/vivid-cec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vivid/vivid-cec.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vivid/vivid-cec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vivid/vivid-cec.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vivid/vivid-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vivid/vivid-core.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vivid/vivid-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vivid/vivid-core.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vivid/vivid-ctrls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vivid/vivid-ctrls.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vivid/vivid-radio-rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vivid/vivid-radio-rx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vivid/vivid-radio-tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vivid/vivid-radio-tx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vivid/vivid-vid-cap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vivid/vivid-vid-cap.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vivid/vivid-vid-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vivid/vivid-vid-common.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vivid/vivid-vid-out.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vivid/vivid-vid-out.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vsp1/vsp1_drm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vsp1/vsp1_drm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vsp1/vsp1_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vsp1/vsp1_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vsp1/vsp1_pipe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vsp1/vsp1_pipe.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vsp1/vsp1_rwpf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vsp1/vsp1_rwpf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/vsp1/vsp1_video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/vsp1/vsp1_video.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/xilinx/xilinx-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/xilinx/xilinx-dma.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/platform/xilinx/xilinx-tpg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/platform/xilinx/xilinx-tpg.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/dsbr100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/dsbr100.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-cadet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-cadet.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-gemtek.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-gemtek.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-isa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-isa.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-isa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-isa.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-keene.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-keene.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-ma901.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-ma901.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-mr800.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-mr800.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-shark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-shark.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-shark2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-shark2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-tea5764.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-tea5764.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-tea5777.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-tea5777.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-tea5777.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-tea5777.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-timb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-timb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/radio-wl1273.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/radio-wl1273.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/saa7706h.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/saa7706h.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/si470x/radio-si470x-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/si470x/radio-si470x-common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/si470x/radio-si470x-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/si470x/radio-si470x-i2c.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/si470x/radio-si470x-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/si470x/radio-si470x-usb.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/si470x/radio-si470x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/si470x/radio-si470x.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/si4713/radio-platform-si4713.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/si4713/radio-platform-si4713.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/si4713/si4713.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/si4713/si4713.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/tef6862.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/tef6862.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/wl128x/fmdrv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/wl128x/fmdrv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/wl128x/fmdrv_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/wl128x/fmdrv_common.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/wl128x/fmdrv_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/wl128x/fmdrv_common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/wl128x/fmdrv_rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/wl128x/fmdrv_rx.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/wl128x/fmdrv_rx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/wl128x/fmdrv_rx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/wl128x/fmdrv_tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/wl128x/fmdrv_tx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/wl128x/fmdrv_tx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/wl128x/fmdrv_tx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/wl128x/fmdrv_v4l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/wl128x/fmdrv_v4l2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/radio/wl128x/fmdrv_v4l2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/radio/wl128x/fmdrv_v4l2.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/Kconfig</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ati_remote.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ati_remote.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ene_ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ene_ir.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ene_ir.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ene_ir.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/fintek-cir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/fintek-cir.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/fintek-cir.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/fintek-cir.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/gpio-ir-recv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/gpio-ir-recv.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/igorplugusb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/igorplugusb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/iguanair.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/iguanair.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/img-ir/img-ir-hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/img-ir/img-ir-hw.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/img-ir/img-ir-nec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/img-ir/img-ir-nec.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/img-ir/img-ir-raw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/img-ir/img-ir-raw.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/img-ir/img-ir-sony.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/img-ir/img-ir-sony.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/imon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/imon.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ir-hix5hd2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-hix5hd2.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ir-jvc-decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-jvc-decoder.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ir-lirc-codec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-lirc-codec.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ir-mce_kbd-decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-mce_kbd-decoder.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ir-nec-decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-nec-decoder.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ir-rc5-decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-rc5-decoder.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ir-rc6-decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-rc6-decoder.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ir-rx51.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-rx51.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ir-sanyo-decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-sanyo-decoder.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ir-sharp-decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-sharp-decoder.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ir-sony-decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-sony-decoder.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/rc/ir-spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ir-spi.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ite-cir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ite-cir.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ite-cir.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ite-cir.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/keymaps/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/keymaps/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/rc/keymaps/rc-d680-dmb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/keymaps/rc-d680-dmb.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/rc/keymaps/rc-dvico-mce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/keymaps/rc-dvico-mce.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/rc/keymaps/rc-dvico-portable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/keymaps/rc-dvico-portable.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/rc/keymaps/rc-geekbox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/keymaps/rc-geekbox.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/keymaps/rc-rc6-mce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/keymaps/rc-rc6-mce.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/keymaps/rc-technisat-usb2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/keymaps/rc-technisat-usb2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/keymaps/rc-tivo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/keymaps/rc-tivo.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/lirc_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/lirc_dev.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/mceusb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/mceusb.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/meson-ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/meson-ir.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/rc/mtk-cir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/mtk-cir.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/nuvoton-cir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/nuvoton-cir.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/nuvoton-cir.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/nuvoton-cir.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/rc-core-priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/rc-core-priv.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/rc-ir-raw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/rc-ir-raw.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/rc-loopback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/rc-loopback.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/rc-main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/rc-main.c</a></td><td class='right'>593</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/redrat3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/redrat3.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/rc/serial_ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/serial_ir.c</a></td><td class='right'>865</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/st_rc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/st_rc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/streamzap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/streamzap.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/sunxi-cir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/sunxi-cir.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/ttusbir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/ttusbir.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/rc/winbond-cir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/rc/winbond-cir.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/spi/gs1662.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/spi/gs1662.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/fc0011.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/fc0011.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/fc0012-priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/fc0012-priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/fc0012.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/fc0012.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/fc0012.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/fc0012.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/fc0013-priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/fc0013-priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/fc0013.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/fc0013.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/fc0013.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/fc0013.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/fc001x-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/fc001x-common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/it913x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/it913x.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/it913x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/it913x.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/max2165.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/max2165.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/max2165.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/max2165.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/max2165_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/max2165_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mc44s803.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mc44s803.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mc44s803.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mc44s803.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mc44s803_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mc44s803_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mt2060.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mt2060.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mt2060.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mt2060.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mt2060_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mt2060_priv.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mt2063.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mt2063.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mt20xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mt20xx.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mt2131.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mt2131.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mt2131.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mt2131.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mt2131_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mt2131_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mt2266.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mt2266.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mxl5005s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mxl5005s.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mxl5007t.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mxl5007t.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/mxl5007t.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/mxl5007t.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/qt1010.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/qt1010.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/qt1010.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/qt1010.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/qt1010_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/qt1010_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/r820t.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/r820t.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tda18218.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tda18218.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tda18218.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tda18218.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tda18218_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tda18218_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tda18271-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tda18271-common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tda18271-fe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tda18271-fe.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tda18271-maps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tda18271-maps.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tda827x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tda827x.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tda8290.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tda8290.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tda9887.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tda9887.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tea5761.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tea5761.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tea5767.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tea5767.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tuner-simple.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tuner-simple.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/tuner-xc2028.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/tuner-xc2028.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/xc4000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/xc4000.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/xc4000.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/xc4000.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/xc5000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/xc5000.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/tuners/xc5000.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/tuners/xc5000.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/au0828/au0828-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/au0828/au0828-cards.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/au0828/au0828-cards.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/au0828/au0828-cards.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/au0828/au0828-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/au0828/au0828-core.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/au0828/au0828-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/au0828/au0828-dvb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/au0828/au0828-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/au0828/au0828-i2c.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/au0828/au0828-input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/au0828/au0828-input.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/au0828/au0828-reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/au0828/au0828-reg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/au0828/au0828-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/au0828/au0828-video.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/au0828/au0828.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/au0828/au0828.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/b2c2/flexcop-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/b2c2/flexcop-usb.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cpia2/cpia2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cpia2/cpia2.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cpia2/cpia2_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cpia2/cpia2_core.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cpia2/cpia2_registers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cpia2/cpia2_registers.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cpia2/cpia2_usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cpia2/cpia2_usb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cpia2/cpia2_v4l.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cpia2/cpia2_v4l.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cx231xx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cx231xx/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cx231xx/cx231xx-417.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cx231xx/cx231xx-417.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cx231xx/cx231xx-audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cx231xx/cx231xx-audio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cx231xx/cx231xx-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cx231xx/cx231xx-cards.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cx231xx/cx231xx-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cx231xx/cx231xx-core.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cx231xx/cx231xx-dif.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cx231xx/cx231xx-dif.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cx231xx/cx231xx-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cx231xx/cx231xx-dvb.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cx231xx/cx231xx-input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cx231xx/cx231xx-input.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/cx231xx/cx231xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/cx231xx/cx231xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/af9015.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/af9015.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/af9015.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/af9015.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/af9035.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/af9035.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/af9035.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/af9035.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/anysee.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/anysee.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/anysee.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/anysee.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/au6610.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/au6610.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/au6610.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/au6610.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/ce6230.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/ce6230.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/ce6230.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/ce6230.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/dvb_usb_core.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/dvbsky.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/dvbsky.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/ec168.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/ec168.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/ec168.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/ec168.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/lmedm04.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/lmedm04.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf-phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf-phy.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf-phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf-phy.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf-reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf-reg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/mxl111sf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/mxl111sf.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/rtl28xxu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/rtl28xxu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb-v2/zd1301.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb-v2/zd1301.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/af9005-fe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/af9005-fe.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/af9005-remote.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/af9005-remote.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/af9005.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/af9005.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/af9005.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/af9005.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/cinergyT2-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/cinergyT2-core.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/cinergyT2-fe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/cinergyT2-fe.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/cinergyT2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/cinergyT2.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/cxusb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/cxusb.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/cxusb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/cxusb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dib0700_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dib0700_core.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dib0700_devices.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dib0700_devices.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dibusb-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dibusb-common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dibusb-mc-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dibusb-mc-common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dtt200u-fe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dtt200u-fe.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dtv5100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dtv5100.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dtv5100.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dtv5100.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dvb-usb-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dvb-usb-dvb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dvb-usb-firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dvb-usb-firmware.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dvb-usb-remote.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dvb-usb-remote.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dvb-usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dvb-usb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/dw2102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/dw2102.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/friio-fe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/friio-fe.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/friio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/friio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/gp8psk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/gp8psk.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/m920x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/m920x.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/opera1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/opera1.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/pctv452e.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/pctv452e.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/technisat-usb2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/technisat-usb2.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/vp702x-fe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/vp702x-fe.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/dvb-usb/vp7045-fe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/dvb-usb/vp7045-fe.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/em28xx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/em28xx/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/em28xx/em28xx-audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/em28xx/em28xx-audio.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/em28xx/em28xx-camera.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/em28xx/em28xx-camera.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/em28xx/em28xx-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/em28xx/em28xx-cards.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/em28xx/em28xx-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/em28xx/em28xx-core.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/em28xx/em28xx-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/em28xx/em28xx-dvb.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/em28xx/em28xx-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/em28xx/em28xx-i2c.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/em28xx/em28xx-input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/em28xx/em28xx-input.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/em28xx/em28xx-vbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/em28xx/em28xx-vbi.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/em28xx/em28xx-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/em28xx/em28xx-video.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/em28xx/em28xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/em28xx/em28xx.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/go7007/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/go7007/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/autogain_functions.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/autogain_functions.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/benq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/benq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/conex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/conex.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/cpia1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/cpia1.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/etoms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/etoms.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/finepix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/finepix.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/gspca.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/gspca.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/jeilinj.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/jeilinj.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/jl2005bcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/jl2005bcd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/jpeg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/jpeg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/kinect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/kinect.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/konica.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/konica.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/m5602/m5602_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/m5602/m5602_core.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/mars.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/mars.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/mr97310a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/mr97310a.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/nw80x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/nw80x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/ov519.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/ov519.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/ov534.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/ov534.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/ov534_9.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/ov534_9.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/pac207.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/pac207.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/pac7302.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/pac7302.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/pac7311.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/pac7311.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/pac_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/pac_common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/se401.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/se401.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/se401.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/se401.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/sn9c2028.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/sn9c2028.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/sn9c2028.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/sn9c2028.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/sn9c20x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/sn9c20x.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/sonixb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/sonixb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/sonixj.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/sonixj.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/spca1528.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/spca1528.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/spca500.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/spca500.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/spca501.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/spca501.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/spca505.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/spca505.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/spca506.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/spca506.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/spca508.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/spca508.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/spca561.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/spca561.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/sq905.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/sq905.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/sq905c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/sq905c.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/sq930x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/sq930x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stk014.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stk014.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stk1135.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stk1135.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stk1135.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stk1135.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv0680.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv0680.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv06xx/stv06xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv06xx/stv06xx.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv06xx/stv06xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv06xx/stv06xx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv06xx/stv06xx_sensor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv06xx/stv06xx_sensor.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv06xx/stv06xx_st6422.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv06xx/stv06xx_st6422.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/sunplus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/sunplus.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/t613.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/t613.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/topro.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/topro.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/tv8532.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/tv8532.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/vc032x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/vc032x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/vicam.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/vicam.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/w996Xcf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/w996Xcf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/xirlink_cit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/xirlink_cit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/gspca/zc3xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/gspca/zc3xx.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/hdpvr/hdpvr-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/hdpvr/hdpvr-core.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/hdpvr/hdpvr-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/hdpvr/hdpvr-i2c.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/hdpvr/hdpvr-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/hdpvr/hdpvr-video.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/media/usb/pulse8-cec/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pulse8-cec/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/media/usb/pulse8-cec/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pulse8-cec/Makefile</a> (renamed from drivers/staging/media/pulse8-cec/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/media/usb/pulse8-cec/pulse8-cec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pulse8-cec/pulse8-cec.c</a> (renamed from drivers/staging/media/pulse8-cec/pulse8-cec.c)</td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-audio.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-audio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-audio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-context.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-context.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-ctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-ctrl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-ctrl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-ctrl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-debug.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-debugifc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-debugifc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-debugifc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-debugifc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-devattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-devattr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-devattr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-devattr.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-dvb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-eeprom.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-eeprom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-eeprom.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-encoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-encoder.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-encoder.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-encoder.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-hdw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-hdw.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-hdw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-hdw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-i2c-core.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-io.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-io.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-ioread.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-ioread.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-ioread.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-ioread.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-main.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-std.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-std.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-std.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-std.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-sysfs.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-sysfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-sysfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-util.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-v4l2.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-v4l2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-v4l2.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-video-v4l.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-video-v4l.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-wm8775.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-wm8775.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2-wm8775.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2-wm8775.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pvrusb2/pvrusb2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pvrusb2/pvrusb2.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pwc/pwc-ctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pwc/pwc-ctrl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pwc/pwc-if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pwc/pwc-if.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/pwc/pwc-v4l.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/pwc/pwc-v4l.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/s2255/s2255drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/s2255/s2255drv.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/siano/smsusb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/siano/smsusb.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/stk1160/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/stk1160/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/stk1160/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/stk1160/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/stk1160/stk1160-ac97.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/stk1160/stk1160-ac97.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/stk1160/stk1160-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/stk1160/stk1160-core.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/stk1160/stk1160-reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/stk1160/stk1160-reg.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/stk1160/stk1160.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/stk1160/stk1160.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/stkwebcam/stk-sensor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/stkwebcam/stk-sensor.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/stkwebcam/stk-webcam.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/stkwebcam/stk-webcam.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/stkwebcam/stk-webcam.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/stkwebcam/stk-webcam.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/tm6000/tm6000-alsa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/tm6000/tm6000-alsa.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/tm6000/tm6000-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/tm6000/tm6000-cards.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/tm6000/tm6000-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/tm6000/tm6000-core.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/tm6000/tm6000-dvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/tm6000/tm6000-dvb.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/tm6000/tm6000-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/tm6000/tm6000-i2c.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/tm6000/tm6000-input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/tm6000/tm6000-input.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/tm6000/tm6000-regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/tm6000/tm6000-regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/tm6000/tm6000-stds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/tm6000/tm6000-stds.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/tm6000/tm6000-usb-isoc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/tm6000/tm6000-usb-isoc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/tm6000/tm6000-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/tm6000/tm6000-video.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/tm6000/tm6000.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/tm6000/tm6000.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/ttusb-dec/ttusb_dec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/ttusb-dec/ttusb_dec.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/ttusb-dec/ttusbdecfe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/ttusb-dec/ttusbdecfe.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/ttusb-dec/ttusbdecfe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/ttusb-dec/ttusbdecfe.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/usbtv/usbtv-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/usbtv/usbtv-core.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/usbtv/usbtv-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/usbtv/usbtv-video.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/usbtv/usbtv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/usbtv/usbtv.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/usbvision/usbvision-cards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/usbvision/usbvision-cards.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/usbvision/usbvision-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/usbvision/usbvision-core.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/usbvision/usbvision-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/usbvision/usbvision-i2c.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/usbvision/usbvision-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/usbvision/usbvision-video.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/usbvision/usbvision.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/usbvision/usbvision.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/uvc/uvc_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/uvc/uvc_debugfs.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/uvc/uvc_driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/uvc/uvc_driver.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/uvc/uvc_queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/uvc/uvc_queue.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/uvc/uvc_v4l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/uvc/uvc_v4l2.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/uvc/uvc_video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/uvc/uvc_video.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/uvc/uvcvideo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/uvc/uvcvideo.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/usb/zr364xx/zr364xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/usb/zr364xx/zr364xx.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/tuner-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/tuner-core.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-async.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-async.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-compat-ioctl32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-compat-ioctl32.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-ctrls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-ctrls.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-dev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-device.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-dv-timings.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-dv-timings.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-event.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-fh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-fh.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-flash-led-class.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-flash-led-class.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-ioctl.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-mc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-mc.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-of.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/v4l2-subdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/v4l2-subdev.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/videobuf-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/videobuf-core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/videobuf-dma-sg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/videobuf-dma-sg.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/videobuf2-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/videobuf2-core.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/videobuf2-v4l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/videobuf2-v4l2.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/media/v4l2-core/videobuf2-vmalloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/media/v4l2-core/videobuf2-vmalloc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/memory/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/memory/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/memory/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/memory/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/memory/atmel-ebi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/memory/atmel-ebi.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/memory/atmel-sdramc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/memory/atmel-sdramc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/memory/da8xx-ddrctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/memory/da8xx-ddrctl.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/memory/tegra/tegra124-emc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/memory/tegra/tegra124-emc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/memory/ti-aemif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/memory/ti-aemif.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/memstick/core/memstick.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/memstick/core/memstick.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/memstick/core/ms_block.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/memstick/core/ms_block.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/memstick/core/mspro_block.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/memstick/core/mspro_block.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/message/fusion/mptbase.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/message/fusion/mptbase.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/message/fusion/mptctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/message/fusion/mptctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/message/fusion/mptfc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/message/fusion/mptfc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/message/fusion/mptlan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/message/fusion/mptlan.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/message/fusion/mptlan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/message/fusion/mptlan.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/message/fusion/mptsas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/message/fusion/mptsas.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/message/fusion/mptscsih.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/message/fusion/mptscsih.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/88pm860x-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/88pm860x-core.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/Kconfig</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/ab3100-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/ab3100-core.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/ab8500-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/ab8500-core.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/ab8500-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/ab8500-debugfs.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/ab8500-gpadc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/ab8500-gpadc.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/ab8500-sysctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/ab8500-sysctrl.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/abx500-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/abx500-core.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/arizona-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/arizona-core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/arizona-irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/arizona-irq.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/arizona.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/arizona.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/axp20x-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/axp20x-i2c.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/axp20x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/axp20x.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/bcm590xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/bcm590xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/cros_ec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/cros_ec.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/cs47l24-tables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/cs47l24-tables.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/davinci_voicecodec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/davinci_voicecodec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/fsl-imx25-tsadc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/fsl-imx25-tsadc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/hi655x-pmic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/hi655x-pmic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/intel-lpss-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/intel-lpss-pci.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/intel_soc_pmic_bxtwc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/intel_soc_pmic_bxtwc.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/kempld-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/kempld-core.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/lpc_ich.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/lpc_ich.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/max77620.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/max77620.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/max77686.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/max77686.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mfd/motorola-cpcap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/motorola-cpcap.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/mt6397-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/mt6397-core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/palmas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/palmas.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/mfd/pm8921-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/pm8921-core.c</a></td><td class='right'>429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mfd/qcom-pm8xxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/qcom-pm8xxx.c</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/rk808.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/rk808.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/rn5t618.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/rn5t618.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/si476x-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/si476x-i2c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mfd/stm32-timers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/stm32-timers.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mfd/sun4i-gpadc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/sun4i-gpadc.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/sun6i-prcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/sun6i-prcm.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/tc3589x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/tc3589x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/ti_am335x_tscadc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/ti_am335x_tscadc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/tps65217.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/tps65217.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/tps65218.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/tps65218.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/tps65912-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/tps65912-core.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/tps65912-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/tps65912-i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/wm5102-tables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/wm5102-tables.c</a></td><td class='right'>1412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mfd/wm8994-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mfd/wm8994-core.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/Kconfig</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/atmel-ssc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/atmel-ssc.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/api.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/context.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/cxl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/cxl.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/debugfs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/fault.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/file.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/guest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/guest.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/main.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/native.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/native.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/pci.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/phb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/phb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/cxl/vphb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/cxl/vphb.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/eeprom/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/eeprom/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/eeprom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/eeprom/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/eeprom/at24.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/eeprom/at24.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/eeprom/eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/eeprom/eeprom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/misc/eeprom/idt_89hpesx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/eeprom/idt_89hpesx.c</a></td><td class='right'>1581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/genwqe/card_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/genwqe/card_base.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/genwqe/card_base.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/genwqe/card_base.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/genwqe/card_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/genwqe/card_dev.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/genwqe/card_utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/genwqe/card_utils.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/ibmasm/ibmasmfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/ibmasm/ibmasmfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/ibmasm/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/ibmasm/module.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/ibmasm/r_heartbeat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/ibmasm/r_heartbeat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/kgdbts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/kgdbts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/lis3lv02d/lis3lv02d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/lis3lv02d/lis3lv02d.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/lkdtm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/lkdtm.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/lkdtm_bugs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/lkdtm_bugs.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/lkdtm_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/lkdtm_core.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/lkdtm_heap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/lkdtm_heap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/lkdtm_perms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/lkdtm_perms.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/lkdtm_usercopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/lkdtm_usercopy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/amthif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/amthif.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/bus-fixup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/bus-fixup.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/bus.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/client.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/client.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/client.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/debugfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/hbm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/hbm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/hw-me-regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/hw-me-regs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/hw-me.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/hw-me.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/hw-me.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/hw-me.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/hw-txe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/hw-txe.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/hw-txe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/hw-txe.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/hw.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/init.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/interrupt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/interrupt.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/main.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/mei_dev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/mei_dev.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/pci-me.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/pci-me.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mei/pci-txe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mei/pci-txe.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mic/bus/mic_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mic/bus/mic_bus.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mic/bus/scif_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mic/bus/scif_bus.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mic/bus/scif_bus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mic/bus/scif_bus.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mic/bus/vop_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mic/bus/vop_bus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mic/cosm/cosm_scif_server.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mic/cosm/cosm_scif_server.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mic/cosm_client/cosm_scif_client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mic/cosm_client/cosm_scif_client.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mic/host/mic_boot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mic/host/mic_boot.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mic/scif/scif_main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mic/scif/scif_main.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mic/scif/scif_rma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mic/scif/scif_rma.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mic/vop/vop_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mic/vop/vop_main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/mic/vop/vop_vringh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/mic/vop/vop_vringh.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/panel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/panel.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/sgi-gru/grumain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/sgi-gru/grumain.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/sgi-gru/grutables.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/sgi-gru/grutables.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/sgi-xp/xpnet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/sgi-xp/xpnet.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/misc/sram-exec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/sram-exec.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/sram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/sram.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/misc/sram.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/sram.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/vexpress-syscfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/vexpress-syscfg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/vmw_vmci/vmci_context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/vmw_vmci/vmci_context.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/vmw_vmci/vmci_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/vmw_vmci/vmci_event.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/vmw_vmci/vmci_guest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/vmw_vmci/vmci_guest.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/vmw_vmci/vmci_host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/vmw_vmci/vmci_host.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/vmw_vmci/vmci_queue_pair.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/vmw_vmci/vmci_queue_pair.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/misc/vmw_vmci/vmci_resource.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/misc/vmw_vmci/vmci_resource.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/mmc/card/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/card/Kconfig</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/mmc/card/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/card/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/mmc/card/block.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/card/block.c</a></td><td class='right'>2745</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 21.4%;'/><td class='none' style='width: 78.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/mmc/card/block.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/card/block.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/mmc/card/queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/card/queue.c</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/mmc/card/queue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/card/queue.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/Kconfig</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mmc/core/block.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/block.c</a></td><td class='right'>2271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mmc/core/block.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/block.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/bus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/bus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/bus.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mmc/core/card.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/card.h</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/core.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/core.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/debugfs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/host.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/host.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/mmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/mmc.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/mmc_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/mmc_ops.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/mmc_ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/mmc_ops.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/mmc/core/mmc_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/mmc_test.c</a> (renamed from drivers/mmc/card/mmc_test.c)</td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/pwrseq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/pwrseq.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mmc/core/pwrseq_sd8787.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/pwrseq_sd8787.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mmc/core/queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/queue.c</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mmc/core/queue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/queue.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/mmc/core/quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/quirks.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mmc/core/quirks.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/quirks.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sd.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sd_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sd_ops.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sd_ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sd_ops.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sdio.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sdio_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sdio_bus.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sdio_bus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sdio_bus.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sdio_cis.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sdio_cis.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sdio_cis.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sdio_cis.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sdio_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sdio_io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sdio_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sdio_irq.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sdio_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sdio_ops.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/sdio_ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sdio_ops.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/mmc/core/sdio_uart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/sdio_uart.c</a> (renamed from drivers/mmc/card/sdio_uart.c)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/slot-gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/slot-gpio.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/core/slot-gpio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/core/slot-gpio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/android-goldfish.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/android-goldfish.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/davinci_mmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/davinci_mmc.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/dw_mmc-exynos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/dw_mmc-exynos.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/dw_mmc-k3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/dw_mmc-k3.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/dw_mmc-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/dw_mmc-pci.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/dw_mmc-pltfm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/dw_mmc-pltfm.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/dw_mmc-rockchip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/dw_mmc-rockchip.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mmc/host/dw_mmc-zx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/dw_mmc-zx.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mmc/host/dw_mmc-zx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/dw_mmc-zx.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/dw_mmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/dw_mmc.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/dw_mmc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/dw_mmc.h</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/jz4740_mmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/jz4740_mmc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mmc/host/meson-gx-mmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/meson-gx-mmc.c</a></td><td class='right'>857</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/mmci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/mmci.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/mmci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/mmci.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/mmci_qcom_dml.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/mmci_qcom_dml.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/mtk-sd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/mtk-sd.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/mxs-mmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/mxs-mmc.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/omap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/omap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/omap_hsmmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/omap_hsmmc.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/rtsx_pci_sdmmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/rtsx_pci_sdmmc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/rtsx_usb_sdmmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/rtsx_usb_sdmmc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/s3cmci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/s3cmci.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-acpi.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-cadence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-cadence.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-esdhc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-esdhc.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-iproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-iproc.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-msm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-msm.c</a></td><td class='right'>789</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-of-at91.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-of-at91.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-of-esdhc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-of-esdhc.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-pci-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-pci-core.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-pci.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-pltfm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-pltfm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-s3c-regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-s3c-regs.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci-s3c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci-s3c.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sdhci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sdhci.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sh_mmcif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sh_mmcif.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sh_mobile_sdhi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sh_mobile_sdhi.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/sunxi-mmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/sunxi-mmc.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/tmio_mmc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/tmio_mmc.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/tmio_mmc_pio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/tmio_mmc_pio.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/via-sdmmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/via-sdmmc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/vub300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/vub300.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/wbsd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/wbsd.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mmc/host/wmt-sdmmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mmc/host/wmt-sdmmc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/bcm47xxpart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/bcm47xxpart.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/devices/bcm47xxsflash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/devices/bcm47xxsflash.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/devices/bcm47xxsflash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/devices/bcm47xxsflash.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/devices/lart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/devices/lart.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/devices/m25p80.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/devices/m25p80.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/devices/pmc551.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/devices/pmc551.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/devices/serial_flash_cmds.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/devices/serial_flash_cmds.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/devices/slram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/devices/slram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/devices/st_spi_fsm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/devices/st_spi_fsm.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/ftl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/ftl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/inftlcore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/inftlcore.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/inftlmount.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/inftlmount.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/maps/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/maps/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/maps/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/maps/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/maps/ichxrom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/maps/ichxrom.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/maps/lantiq-flash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/maps/lantiq-flash.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/maps/physmap_of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/maps/physmap_of.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mtd/maps/physmap_of_gemini.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/maps/physmap_of_gemini.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mtd/maps/physmap_of_gemini.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/maps/physmap_of_gemini.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/maps/physmap_of_versatile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/maps/physmap_of_versatile.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/maps/pmcmsp-flash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/maps/pmcmsp-flash.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/maps/sc520cdp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/maps/sc520cdp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/maps/sun_uflash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/maps/sun_uflash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/mtd_blkdevs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/mtd_blkdevs.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/mtdchar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/mtdchar.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/mtdcore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/mtdcore.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/mtdpart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/mtdpart.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/mtdswap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/mtdswap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/ams-delta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/ams-delta.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/atmel_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/atmel_nand.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/brcmnand/brcmnand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/brcmnand/brcmnand.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/cafe_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/cafe_nand.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/cmx270_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/cmx270_nand.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/cs553x_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/cs553x_nand.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/denali.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/denali.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/denali.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/denali.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/denali_dt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/denali_dt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/denali_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/denali_pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/fsl_ifc_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/fsl_ifc_nand.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/fsmc_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/fsmc_nand.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/gpio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/gpmi-nand/gpmi-nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/gpmi-nand/gpmi-nand.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/hisi504_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/hisi504_nand.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/lpc32xx_mlc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/lpc32xx_mlc.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/lpc32xx_slc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/lpc32xx_slc.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/mpc5121_nfc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/mpc5121_nfc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/mtk_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/mtk_nand.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/mxc_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/mxc_nand.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/nand_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/nand_base.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/nand_ids.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/nand_ids.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/nand_timings.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/nand_timings.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/nandsim.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/nandsim.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/omap2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/omap2.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/orion_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/orion_nand.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mtd/nand/oxnas_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/oxnas_nand.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/pasemi_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/pasemi_nand.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/plat_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/plat_nand.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/pxa3xx_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/pxa3xx_nand.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/s3c2410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/s3c2410.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/socrates_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/socrates_nand.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/sunxi_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/sunxi_nand.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mtd/nand/tango_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/tango_nand.c</a></td><td class='right'>678</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/tmio_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/tmio_nand.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/vf610_nfc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/vf610_nfc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nand/xway_nand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nand/xway_nand.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/nftlcore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/nftlcore.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/ofpart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/ofpart.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/spi-nor/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/spi-nor/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/spi-nor/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/spi-nor/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mtd/spi-nor/aspeed-smc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/spi-nor/aspeed-smc.c</a></td><td class='right'>754</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/spi-nor/cadence-quadspi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/spi-nor/cadence-quadspi.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/spi-nor/fsl-quadspi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/spi-nor/fsl-quadspi.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mtd/spi-nor/intel-spi-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/spi-nor/intel-spi-platform.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mtd/spi-nor/intel-spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/spi-nor/intel-spi.c</a></td><td class='right'>777</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/mtd/spi-nor/intel-spi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/spi-nor/intel-spi.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/spi-nor/spi-nor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/spi-nor/spi-nor.c</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/tests/mtd_test.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/tests/mtd_test.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/ubi/block.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/ubi/block.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/ubi/build.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/ubi/build.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/mtd/ubi/kapi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/mtd/ubi/kapi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/appletalk/ipddp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/appletalk/ipddp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/arcnet/arcnet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/arcnet/arcnet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/bonding/bond_alb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/bonding/bond_alb.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/bonding/bond_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/bonding/bond_main.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/bonding/bond_options.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/bonding/bond_options.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/bonding/bond_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/bonding/bond_sysfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/caif/caif_virtio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/caif/caif_virtio.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/at91_can.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/at91_can.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/c_can/c_can.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/c_can/c_can.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/c_can/c_can_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/c_can/c_can_pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/dev.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/flexcan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/flexcan.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/grcan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/grcan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/ifi_canfd/ifi_canfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/ifi_canfd/ifi_canfd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/janz-ican3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/janz-ican3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/m_can/m_can.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/m_can/m_can.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/rcar/rcar_can.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/rcar/rcar_can.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/rcar/rcar_canfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/rcar/rcar_canfd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/can/rx-offload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/rx-offload.c</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/softing/softing_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/softing/softing_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/softing/softing_fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/softing/softing_fw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/softing/softing_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/softing/softing_main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/ti_hecc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/ti_hecc.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/usb/gs_usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/usb/gs_usb.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/usb/kvaser_usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/usb/kvaser_usb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/usb/usb_8dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/usb/usb_8dev.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/can/xilinx_can.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/can/xilinx_can.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/cris/eth_v10.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/cris/eth_v10.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/b53/b53_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/b53/b53_common.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/b53/b53_mdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/b53/b53_mdio.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/b53/b53_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/b53/b53_priv.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/b53/b53_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/b53/b53_regs.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/bcm_sf2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/bcm_sf2.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/bcm_sf2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/bcm_sf2.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/dsa/bcm_sf2_cfp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/bcm_sf2_cfp.c</a></td><td class='right'>613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/bcm_sf2_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/bcm_sf2_regs.h</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/mv88e6060.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/mv88e6060.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/mv88e6xxx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/mv88e6xxx/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/mv88e6xxx/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/mv88e6xxx/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/mv88e6xxx/chip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/mv88e6xxx/chip.c</a></td><td class='right'>2552</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.8%;'/><td class='rem' style='width: 7.1%;'/><td class='none' style='width: 80.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/mv88e6xxx/global1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/mv88e6xxx/global1.c</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/mv88e6xxx/global1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/mv88e6xxx/global1.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/mv88e6xxx/global2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/mv88e6xxx/global2.c</a></td><td class='right'>534</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/mv88e6xxx/global2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/mv88e6xxx/global2.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/mv88e6xxx/mv88e6xxx.h</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/dsa/mv88e6xxx/port.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/mv88e6xxx/port.c</a></td><td class='right'>841</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/dsa/mv88e6xxx/port.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/mv88e6xxx/port.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/qca8k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/qca8k.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dsa/qca8k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dsa/qca8k.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/dummy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/dummy.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/eql.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/eql.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/3com/3c509.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/3com/3c509.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/3com/3c515.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/3com/3c515.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/3com/3c574_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/3com/3c574_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/3com/3c589_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/3com/3c589_cs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/3com/3c59x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/3com/3c59x.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/3com/typhoon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/3com/typhoon.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/8390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/8390.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/8390p.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/8390p.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/ax88796.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/ax88796.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/axnet_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/axnet_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/etherh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/etherh.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/hydra.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/hydra.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/mac8390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/mac8390.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/mcf8390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/mcf8390.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/ne2k-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/ne2k-pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/pcnet_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/pcnet_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/smc-ultra.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/smc-ultra.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/wd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/wd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/8390/zorro8390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/8390/zorro8390.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/adaptec/starfire.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/adaptec/starfire.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/adi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/adi/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/adi/bfin_mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/adi/bfin_mac.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/aeroflex/greth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aeroflex/greth.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/agere/et131x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/agere/et131x.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/alacritech/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/alacritech/Kconfig</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/alacritech/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/alacritech/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/alacritech/slic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/alacritech/slic.h</a></td><td class='right'>575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/alacritech/slicoss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/alacritech/slicoss.c</a></td><td class='right'>1868</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/allwinner/sun4i-emac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/allwinner/sun4i-emac.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/alteon/acenic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/alteon/acenic.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/altera/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/altera/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/altera/altera_tse.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/altera/altera_tse.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/altera/altera_tse_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/altera/altera_tse_main.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amazon/ena/ena_admin_defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amazon/ena/ena_admin_defs.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amazon/ena/ena_com.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amazon/ena/ena_com.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amazon/ena/ena_com.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amazon/ena/ena_com.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amazon/ena/ena_eth_com.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amazon/ena/ena_eth_com.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amazon/ena/ena_netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amazon/ena/ena_netdev.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amazon/ena/ena_netdev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amazon/ena/ena_netdev.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/a2065.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/a2065.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/am79c961a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/am79c961a.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/amd8111e.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/amd8111e.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/ariadne.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/ariadne.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/atarilance.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/atarilance.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/au1000_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/au1000_eth.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/declance.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/declance.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/hplance.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/hplance.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/lance.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/lance.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/mvme147.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/mvme147.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/ni65.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/ni65.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/nmclan_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/nmclan_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/pcnet32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/pcnet32.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/sun3lance.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/sun3lance.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/sunlance.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/sunlance.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-common.h</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-dev.c</a></td><td class='right'>1058</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-drv.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-i2c.c</a></td><td class='right'>492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-main.c</a></td><td class='right'>705</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-mdio.c</a></td><td class='right'>1130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-pci.c</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c</a></td><td class='right'>845</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c</a></td><td class='right'>3108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-platform.c</a></td><td class='right'>642</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe-ptp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/amd/xgbe/xgbe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/amd/xgbe/xgbe.h</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apm/xgene/xgene_enet_cle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apm/xgene/xgene_enet_cle.c</a></td><td class='right'>704</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apm/xgene/xgene_enet_cle.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apm/xgene/xgene_enet_cle.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apm/xgene/xgene_enet_hw.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apm/xgene/xgene_enet_hw.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apm/xgene/xgene_enet_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apm/xgene/xgene_enet_main.c</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apm/xgene/xgene_enet_main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apm/xgene/xgene_enet_main.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apple/bmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apple/bmac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apple/mace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apple/mace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/apple/macmace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/apple/macmace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/Makefile</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_cfg.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_common.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_hw.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_main.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_main.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_nic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_nic.c</a></td><td class='right'>990</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_nic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_nic.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_nic_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_nic_internal.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_ring.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_ring.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_ring.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_ring.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_rss.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_rss.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_utils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_utils.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_vec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_vec.c</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/aq_vec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/aq_vec.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c</a></td><td class='right'>958</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c</a></td><td class='right'>1394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h</a></td><td class='right'>2375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c</a></td><td class='right'>570</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/aquantia/atlantic/ver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aquantia/atlantic/ver.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/arc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/arc/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/arc/emac_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/arc/emac_main.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/alx/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/alx/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/alx/alx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/alx/alx.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/alx/ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/alx/ethtool.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/alx/hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/alx/hw.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/alx/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/alx/main.c</a></td><td class='right'>578</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/atl1c/atl1c_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/atl1c/atl1c_main.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/atl1e/atl1e_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/atl1e/atl1e_main.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/atlx/atl1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/atlx/atl1.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/atlx/atl2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/atlx/atl2.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/atheros/atlx/atl2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/atheros/atlx/atl2.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/aurora/nb8800.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/aurora/nb8800.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/b44.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/b44.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bcm63xx_enet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bcm63xx_enet.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bcmsysport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bcmsysport.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bcmsysport.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bcmsysport.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bgmac-bcma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bgmac-bcma.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bgmac-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bgmac-platform.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bgmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bgmac.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bgmac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bgmac.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnx2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnx2.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnx2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnx2.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnx2x/bnx2x.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt.c</a></td><td class='right'>1453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt.h</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h</a></td><td class='right'>2236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.5%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 82.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/cnic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/cnic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/genet/bcmgenet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/genet/bcmgenet.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/sb1250-mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/sb1250-mac.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/broadcom/tg3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/broadcom/tg3.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/brocade/bna/bna_enet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/brocade/bna/bna_enet.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/brocade/bna/bnad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/brocade/bna/bnad.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/brocade/bna/bnad_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/brocade/bna/bnad_ethtool.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cadence/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cadence/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cadence/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cadence/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cadence/macb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cadence/macb.c</a></td><td class='right'>566</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cadence/macb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cadence/macb.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/cadence/macb_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cadence/macb_pci.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/calxeda/xgmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/calxeda/xgmac.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/Makefile</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c</a></td><td class='right'>722</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_regs.h</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn66xx_device.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn66xx_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn66xx_device.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn68xx_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn68xx_device.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn68xx_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn68xx_device.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/cn68xx_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/cn68xx_regs.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/lio_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/lio_core.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/lio_ethtool.c</a></td><td class='right'>589</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/lio_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/lio_main.c</a></td><td class='right'>522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/lio_vf_main.c</a></td><td class='right'>3248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/liquidio_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/liquidio_common.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/liquidio_image.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/liquidio_image.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_config.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_config.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_console.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_console.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_device.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_device.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_droq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_droq.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_droq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_droq.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_iq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_iq.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_main.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_network.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_network.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_nic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_nic.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/octeon_nic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/octeon_nic.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/request_manager.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/request_manager.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/response_manager.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/response_manager.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/liquidio/response_manager.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/liquidio/response_manager.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/octeon/octeon_mgmt.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/thunder/nic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/thunder/nic.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/thunder/nic_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/thunder/nic_main.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/thunder/nicvf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/thunder/nicvf_main.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/thunder/nicvf_queues.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/thunder/nicvf_queues.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/thunder/nicvf_queues.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/thunder/nicvf_queues.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/thunder/q_struct.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/thunder/q_struct.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/thunder/thunder_bgx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/thunder/thunder_bgx.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/thunder/thunder_bgx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/thunder/thunder_bgx.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cavium/thunder/thunder_xcv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cavium/thunder/thunder_xcv.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb/common.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb/cxgb2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb/cxgb2.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb/pm3393.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb/pm3393.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb/sge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb/sge.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb/vsc7326.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb/vsc7326.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb3/l2t.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb3/l2t.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb3/sge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb3/sge.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/cxgb4.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/l2t.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/l2t.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/sched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/sched.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/sge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/sge.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/t4_hw.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/t4_msg.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/t4_regs.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/cxgb4vf/sge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/cxgb4vf/sge.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cirrus/cs89x0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cirrus/cs89x0.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cirrus/ep93xx_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cirrus/ep93xx_eth.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cirrus/mac89x0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cirrus/mac89x0.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cisco/enic/enic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cisco/enic/enic.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cisco/enic/enic_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cisco/enic/enic_main.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cisco/enic/enic_res.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cisco/enic/enic_res.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cisco/enic/vnic_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cisco/enic/vnic_dev.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cisco/enic/vnic_dev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cisco/enic/vnic_dev.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cisco/enic/vnic_devcmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cisco/enic/vnic_devcmd.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cisco/enic/vnic_enet.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cisco/enic/vnic_enet.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/cisco/enic/vnic_rq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/cisco/enic/vnic_rq.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/davicom/dm9000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/davicom/dm9000.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dec/tulip/de2104x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dec/tulip/de2104x.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dec/tulip/de4x5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dec/tulip/de4x5.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dec/tulip/dmfe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dec/tulip/dmfe.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dec/tulip/interrupt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dec/tulip/interrupt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dec/tulip/tulip_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dec/tulip/tulip_core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dec/tulip/uli526x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dec/tulip/uli526x.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dec/tulip/winbond-840.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dec/tulip/winbond-840.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dec/tulip/xircom_cb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dec/tulip/xircom_cb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dlink/dl2k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dlink/dl2k.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dlink/dl2k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dlink/dl2k.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dlink/sundance.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dlink/sundance.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/dnet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/dnet.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ec_bhf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ec_bhf.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/emulex/benet/be.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/emulex/benet/be.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/emulex/benet/be_cmds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/emulex/benet/be_cmds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/emulex/benet/be_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/emulex/benet/be_ethtool.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/emulex/benet/be_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/emulex/benet/be_main.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ethoc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ethoc.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ezchip/nps_enet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ezchip/nps_enet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/faraday/ftgmac100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/faraday/ftgmac100.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/faraday/ftmac100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/faraday/ftmac100.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/fealnx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/fealnx.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/dpaa/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/dpaa/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/dpaa/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/dpaa/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/dpaa/dpaa_eth.c</a></td><td class='right'>2766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/dpaa/dpaa_eth.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c</a></td><td class='right'>417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fec_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fec_main.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fec_mpc52xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fec_mpc52xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fec_ptp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fec_ptp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fman/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fman/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fman/fman.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fman/fman.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fman/fman_dtsec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fman/fman_dtsec.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fman/fman_memac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fman/fman_memac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fman/mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fman/mac.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fs_enet/fs_enet.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fs_enet/fs_enet.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fs_enet/mac-fcc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fs_enet/mac-fec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fs_enet/mac-fec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fs_enet/mac-scc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fs_enet/mac-scc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/fs_enet/mii-fec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/fs_enet/mii-fec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/gianfar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/gianfar.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/gianfar.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/gianfar.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/gianfar_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/gianfar_ethtool.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/gianfar_ptp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/gianfar_ptp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/ucc_geth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/ucc_geth.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/freescale/ucc_geth_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/freescale/ucc_geth_ethtool.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/fujitsu/fmvj18x_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/fujitsu/fmvj18x_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hip04_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hip04_eth.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hisi_femac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hisi_femac.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hix5hd2_gmac.c</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hnae.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hnae.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_enet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_enet.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hisilicon/hns/hns_ethtool.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/hp/hp100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/hp/hp100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/i825xx/82596.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/i825xx/82596.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/i825xx/ether1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/i825xx/ether1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/i825xx/lib82596.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/i825xx/lib82596.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/i825xx/sun3_82586.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/i825xx/sun3_82586.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ibm/ehea/ehea_ethtool.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ibm/ehea/ehea_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ibm/ehea/ehea_main.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ibm/emac/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ibm/emac/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ibm/emac/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ibm/emac/core.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ibm/emac/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ibm/emac/core.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ibm/emac/mal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ibm/emac/mal.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ibm/ibmveth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ibm/ibmveth.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ibm/ibmvnic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ibm/ibmvnic.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ibm/ibmvnic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ibm/ibmvnic.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/e100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/e100.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/e1000/e1000_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/e1000/e1000_main.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/e1000e/e1000.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/e1000e/e1000.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/e1000e/netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/e1000e/netdev.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/e1000e/ptp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/e1000e/ptp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/fm10k/fm10k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/fm10k/fm10k.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/fm10k/fm10k_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/fm10k/fm10k_common.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/fm10k/fm10k_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/fm10k/fm10k_main.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/fm10k/fm10k_mbx.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/fm10k/fm10k_netdev.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/fm10k/fm10k_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/fm10k/fm10k_pci.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/fm10k/fm10k_pf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/fm10k/fm10k_pf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_adminq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_adminq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_client.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_client.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_client.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_common.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_debugfs.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_devids.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_devids.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_ethtool.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_fcoe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_fcoe.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_main.c</a></td><td class='right'>1699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 86.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_nvm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_nvm.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_osdep.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_osdep.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_prototype.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_prototype.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_ptp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_ptp.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_txrx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_txrx.c</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_txrx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_txrx.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_type.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_type.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_virtchnl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40e_adminq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40e_adminq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40e_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40e_common.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40e_devids.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40e_devids.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40e_prototype.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40e_prototype.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40e_txrx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40e_txrx.c</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40e_txrx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40e_txrx.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40e_type.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40e_type.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40evf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40evf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40evf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40evf_main.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/igb/e1000_82575.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/igb/e1000_82575.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/igb/e1000_defines.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/igb/e1000_defines.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/igb/e1000_i210.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/igb/e1000_i210.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/igb/e1000_mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/igb/e1000_mac.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/igb/e1000_phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/igb/e1000_phy.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/igb/e1000_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/igb/e1000_regs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/igb/igb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/igb/igb.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/igb/igb_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/igb/igb_main.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/igb/igb_ptp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/igb/igb_ptp.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/igbvf/defines.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/igbvf/defines.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/igbvf/netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/igbvf/netdev.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgb/ixgb_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgb/ixgb_main.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe.h</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_common.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_common.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_main.c</a></td><td class='right'>953</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_type.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c</a></td><td class='right'>1343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbevf/ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbevf/ethtool.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbevf/ixgbevf.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbevf/mbx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbevf/mbx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/intel/ixgbevf/vf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/intel/ixgbevf/vf.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/jme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/jme.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/jme.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/jme.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/korina.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/korina.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/lantiq_etop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/lantiq_etop.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/marvell/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/marvell/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/marvell/mv643xx_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/marvell/mv643xx_eth.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/marvell/mvneta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/marvell/mvneta.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/marvell/mvpp2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/marvell/mvpp2.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/marvell/pxa168_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/marvell/pxa168_eth.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/marvell/skge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/marvell/skge.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/marvell/skge.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/marvell/skge.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/marvell/sky2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/marvell/sky2.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/marvell/sky2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/marvell/sky2.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mediatek/mtk_eth_soc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mediatek/mtk_eth_soc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/catas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/catas.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/cmd.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/cq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/cq.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/en_clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/en_clock.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/en_cq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/en_cq.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/en_ethtool.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/en_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/en_main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/en_netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/en_netdev.c</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/en_port.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/en_port.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/en_port.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/en_port.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/en_rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/en_rx.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/en_selftest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/en_selftest.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/en_tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/en_tx.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/eq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/eq.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/fw.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/icm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/icm.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/intf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/intf.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/main.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/mlx4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/mlx4.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/mlx4_en.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/mr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/mr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/port.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/port.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/qp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx4/resource_tracker.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/alloc.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/cmd.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/cq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/cq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/dev.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_clock.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_common.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_fs.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_main.c</a></td><td class='right'>692</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_rep.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_rx.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_stats.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_tc.c</a></td><td class='right'>789</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/en_tx.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/eq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/eq.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/eswitch.c</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/eswitch.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/fs_core.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/fs_core.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/fw.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/health.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/health.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/main.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/port.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/port.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/qp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/qp.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/rl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/rl.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/uar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/uar.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/vport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/vport.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/wq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/wq.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlx5/core/wq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlx5/core/wq.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/Kconfig</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/cmd.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/core.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/core.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c</a></td><td class='right'>679</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c</a></td><td class='right'>475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/core_thermal.c</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/i2c.c</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/i2c.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/i2c.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/ib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/ib.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/item.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/item.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/minimal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/minimal.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/pci.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/pci.h</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/pci_hw.h</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/port.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/port.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/reg.h</a></td><td class='right'>1442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/resources.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/resources.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/spectrum.c</a></td><td class='right'>807</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/spectrum.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c</a></td><td class='right'>572</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c</a></td><td class='right'>1084</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c</a></td><td class='right'>1620</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 87.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/switchib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/switchib.c</a></td><td class='right'>605</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/switchx2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/switchx2.c</a></td><td class='right'>701</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/mellanox/mlxsw/trap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/mellanox/mlxsw/trap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/micrel/ks8695net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/micrel/ks8695net.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/micrel/ks8851.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/micrel/ks8851.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/micrel/ks8851_mll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/micrel/ks8851_mll.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/micrel/ksz884x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/micrel/ksz884x.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/microchip/enc28j60.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/microchip/enc28j60.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/microchip/encx24j600-regmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/microchip/encx24j600-regmap.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/microchip/encx24j600.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/microchip/encx24j600.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/moxa/moxart_ether.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/moxa/moxart_ether.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/myricom/myri10ge/myri10ge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/myricom/myri10ge/myri10ge.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/natsemi/jazzsonic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/natsemi/jazzsonic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/natsemi/macsonic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/natsemi/macsonic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/natsemi/natsemi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/natsemi/natsemi.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/natsemi/ns83820.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/natsemi/ns83820.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/natsemi/xtsonic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/natsemi/xtsonic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/neterion/s2io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/neterion/s2io.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/neterion/vxge/vxge-config.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/neterion/vxge/vxge-config.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/neterion/vxge/vxge-ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/neterion/vxge/vxge-ethtool.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/neterion/vxge/vxge-main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/neterion/vxge/vxge-main.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_bpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_bpf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_bpf_verifier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_bpf_verifier.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_main.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_main.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_net.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_net.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_net_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_net_common.c</a></td><td class='right'>1373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_net_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_net_main.c</a></td><td class='right'>586</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_net_offload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_net_offload.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/crc32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/crc32.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/nfp6000.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/nfp6000.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/nfp_xpb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/nfp_xpb.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c</a></td><td class='right'>1364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_arm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_arm.h</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c</a></td><td class='right'>1746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpplib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpplib.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_hwinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_hwinfo.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mip.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c</a></td><td class='right'>426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_rtsym.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_rtsym.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_target.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_target.c</a></td><td class='right'>764</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/netx-eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/netx-eth.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/nuvoton/w90p910_ether.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/nuvoton/w90p910_ether.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/nvidia/forcedeth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/nvidia/forcedeth.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/nxp/lpc_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/nxp/lpc_eth.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/packetengines/hamachi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/packetengines/hamachi.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/packetengines/yellowfin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/packetengines/yellowfin.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/pasemi/pasemi_mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/pasemi/pasemi_mac.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_cxt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_cxt.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_cxt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_cxt.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_dcbx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_dcbx.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_dcbx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_dcbx.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_dev.c</a></td><td class='right'>682</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_dev_api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_dev_api.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_fcoe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_fcoe.c</a></td><td class='right'>1014</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_fcoe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_fcoe.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_hsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_hsi.h</a></td><td class='right'>934</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_hw.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_hw.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_init_fw_funcs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_init_fw_funcs.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_init_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_init_ops.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_init_ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_init_ops.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_int.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_int.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_int.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_int.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_iscsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_iscsi.c</a></td><td class='right'>1301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_iscsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_iscsi.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_l2.c</a></td><td class='right'>921</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_l2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_l2.h</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_ll2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_ll2.c</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_ll2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_ll2.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_main.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_mcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_mcp.c</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_mcp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_mcp.h</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_ooo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_ooo.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_ooo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_ooo.h</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_ptp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_ptp.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_ptp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_ptp.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_reg_addr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_reg_addr.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_roce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_roce.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_roce.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_roce.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_selftest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_selftest.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_selftest.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_selftest.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_sp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_sp.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_sp_commands.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_spq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_spq.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_sriov.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_sriov.c</a></td><td class='right'>772</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_sriov.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_sriov.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_vf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_vf.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qed/qed_vf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qed/qed_vf.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qede/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qede/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qede/qede.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qede/qede.h</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qede/qede_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qede/qede_ethtool.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qede/qede_filter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qede/qede_filter.c</a></td><td class='right'>759</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qede/qede_fp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qede/qede_fp.c</a></td><td class='right'>1700</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qede/qede_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qede/qede_main.c</a></td><td class='right'>2692</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 17.8%;'/><td class='none' style='width: 79.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qede/qede_ptp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qede/qede_ptp.c</a></td><td class='right'>536</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qede/qede_ptp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qede/qede_ptp.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qede/qede_roce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qede/qede_roce.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qla3xxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qla3xxx.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qlogic/qlge/qlge_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qlogic/qlge/qlge_main.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac-ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac-ethtool.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac-mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac-mac.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac-mac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac-mac.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac-phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac-phy.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac-phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac-phy.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac-sgmii-fsm9900.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac-sgmii-fsm9900.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac-sgmii-qdf2400.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac-sgmii-qdf2400.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac-sgmii-qdf2432.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac-sgmii-qdf2432.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac-sgmii.c</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac-sgmii.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac-sgmii.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/emac/emac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/emac/emac.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/qca_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/qca_debug.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/qca_framing.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/qca_framing.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/qualcomm/qca_spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/qualcomm/qca_spi.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/rdc/r6040.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/rdc/r6040.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/realtek/8139cp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/realtek/8139cp.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/realtek/8139too.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/realtek/8139too.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/realtek/atp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/realtek/atp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/realtek/r8169.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/realtek/r8169.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/renesas/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/renesas/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/renesas/ravb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/renesas/ravb.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/renesas/ravb_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/renesas/ravb_main.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/renesas/sh_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/renesas/sh_eth.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/renesas/sh_eth.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/renesas/sh_eth.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/rocker/rocker.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/rocker/rocker.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/rocker/rocker_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/rocker/rocker_main.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/rocker/rocker_ofdpa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/rocker/rocker_ofdpa.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/samsung/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/samsung/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/seeq/ether3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/seeq/ether3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/seeq/sgiseeq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/seeq/sgiseeq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/Kconfig</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/bitfield.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/bitfield.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/ef10.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/ef10.c</a></td><td class='right'>1466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/ef10_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/ef10_regs.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/ef10_sriov.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/ef10_sriov.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/ef10_sriov.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/ef10_sriov.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/efx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/efx.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/efx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/efx.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/enum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/enum.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/ethtool.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon.c</a></td><td class='right'>2905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 22.7%;'/><td class='none' style='width: 77.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/bitfield.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/bitfield.h</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/efx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/efx.c</a></td><td class='right'>3307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/efx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/efx.h</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/enum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/enum.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/ethtool.c</a></td><td class='right'>1346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/falcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/falcon.c</a></td><td class='right'>2905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/falcon_boards.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/falcon_boards.c</a> (renamed from drivers/net/ethernet/sfc/falcon_boards.c)</td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/farch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/farch.c</a></td><td class='right'>2892</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/farch_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/farch_regs.h</a></td><td class='right'>2932</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/filter.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/filter.h</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/io.h</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/mdio_10g.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/mdio_10g.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/mdio_10g.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/mdio_10g.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/mtd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/mtd.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/net_driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/net_driver.h</a></td><td class='right'>1339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/nic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/nic.c</a></td><td class='right'>527</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/nic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/nic.h</a></td><td class='right'>513</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/phy.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/qt202x_phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/qt202x_phy.c</a> (renamed from drivers/net/ethernet/sfc/qt202x_phy.c)</td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/rx.c</a></td><td class='right'>973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/selftest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/selftest.c</a></td><td class='right'>808</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/selftest.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/selftest.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/tenxpress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/tenxpress.c</a> (renamed from drivers/net/ethernet/sfc/tenxpress.c)</td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/tx.c</a></td><td class='right'>649</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/tx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/tx.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/txc43128_phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/txc43128_phy.c</a> (renamed from drivers/net/ethernet/sfc/txc43128_phy.c)</td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/falcon/workarounds.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/falcon/workarounds.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/farch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/farch.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/filter.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/filter.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/mcdi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/mcdi.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/mcdi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/mcdi.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/mcdi_mon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/mcdi_mon.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/mcdi_pcol.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/mcdi_pcol.h</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/mcdi_port.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/mcdi_port.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/mdio_10g.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/mdio_10g.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/mdio_10g.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/mdio_10g.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/net_driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/net_driver.h</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/nic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/nic.h</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/phy.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/ptp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/ptp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/rx.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/selftest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/selftest.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/siena.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/siena.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/sriov.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/sriov.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/sriov.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/sriov.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/tx.c</a></td><td class='right'>1057</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/tx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/tx.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/tx_tso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/tx_tso.c</a></td><td class='right'>451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sfc/workarounds.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sfc/workarounds.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sgi/ioc3-eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sgi/ioc3-eth.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sgi/meth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sgi/meth.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/silan/sc92031.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/silan/sc92031.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sis/sis190.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sis/sis190.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sis/sis900.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sis/sis900.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/smsc/epic100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/smsc/epic100.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/smsc/smc911x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/smsc/smc911x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/smsc/smc9194.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/smsc/smc9194.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/smsc/smc91c92_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/smsc/smc91c92_cs.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/smsc/smc91x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/smsc/smc91x.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/smsc/smc91x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/smsc/smc91x.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/smsc/smsc911x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/smsc/smsc911x.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/smsc/smsc9420.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/smsc/smsc9420.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/chain_mode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/chain_mode.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/common.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/descs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/descs.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/descs_com.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/descs_com.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac100.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac100.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac1000.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac4.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/enh_desc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/enh_desc.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/mmc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/mmc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/mmc_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/mmc_core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/norm_desc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/norm_desc.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/ring_mode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/ring_mode.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/stmmac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/stmmac.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/stmmac_main.c</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/cassini.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/cassini.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/ldmvsw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/ldmvsw.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/niu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/niu.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/sunbmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/sunbmac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/sungem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/sungem.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/sunhme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/sunhme.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/sunhme.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/sunhme.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/sunqe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/sunqe.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/sunvnet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/sunvnet.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/sunvnet_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/sunvnet_common.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/sun/sunvnet_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/sun/sunvnet_common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/net/ethernet/synopsys/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/synopsys/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/net/ethernet/synopsys/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/synopsys/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/net/ethernet/synopsys/dwc_eth_qos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/synopsys/dwc_eth_qos.c</a></td><td class='right'>2998</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 23.4%;'/><td class='none' style='width: 76.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/tehuti/tehuti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/tehuti/tehuti.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/tehuti/tehuti.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/tehuti/tehuti.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/cpmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/cpmac.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/cpsw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/cpsw.c</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/cpsw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/cpsw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/cpsw_ale.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/cpsw_ale.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/cpsw_ale.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/cpsw_ale.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/cpts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/cpts.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/cpts.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/cpts.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/davinci_cpdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/davinci_cpdma.c</a></td><td class='right'>707</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/davinci_cpdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/davinci_cpdma.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/davinci_emac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/davinci_emac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/netcp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/netcp.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/netcp_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/netcp_core.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/netcp_ethss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/netcp_ethss.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/ti/tlan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/ti/tlan.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/tile/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/tile/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/tile/tilegx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/tile/tilegx.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/tile/tilepro.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/tile/tilepro.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/toshiba/ps3_gelic_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/toshiba/ps3_gelic_net.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/toshiba/ps3_gelic_net.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/toshiba/ps3_gelic_net.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/toshiba/ps3_gelic_wireless.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/toshiba/spider_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/toshiba/spider_net.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/toshiba/tc35815.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/toshiba/tc35815.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/tundra/tsi108_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/tundra/tsi108_eth.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/via/via-rhine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/via/via-rhine.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/via/via-velocity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/via/via-velocity.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/wiznet/w5100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/wiznet/w5100.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/wiznet/w5300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/wiznet/w5300.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/xilinx/ll_temac_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/xilinx/ll_temac_main.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/xilinx/xilinx_axienet_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/xilinx/xilinx_axienet_main.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/xilinx/xilinx_emaclite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/xilinx/xilinx_emaclite.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/xircom/xirc2ps_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/xircom/xirc2ps_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ethernet/xscale/ixp4xx_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ethernet/xscale/ixp4xx_eth.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/cfm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/cfm.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/drvfbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/drvfbi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/ecm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/ecm.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/ess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/ess.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/fplustm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/fplustm.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/h/cmtdef.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/h/cmtdef.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/h/hwmtm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/h/hwmtm.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/hwmtm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/hwmtm.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/pcmplc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/pcmplc.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/pmf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/pmf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/rmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/rmt.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/skfddi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/skfddi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/smt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/smt.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fddi/skfp/srf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fddi/skfp/srf.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fjes/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fjes/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fjes/fjes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fjes/fjes.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/fjes/fjes_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fjes/fjes_debugfs.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fjes/fjes_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fjes/fjes_ethtool.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fjes/fjes_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fjes/fjes_hw.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fjes/fjes_hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fjes/fjes_hw.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/fjes/fjes_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fjes/fjes_main.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/fjes/fjes_trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fjes/fjes_trace.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/fjes/fjes_trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/fjes/fjes_trace.h</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/geneve.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/geneve.c</a></td><td class='right'>715</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/gtp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/gtp.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hamradio/6pack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hamradio/6pack.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hamradio/baycom_epp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hamradio/baycom_epp.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hamradio/baycom_par.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hamradio/baycom_par.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hamradio/baycom_ser_fdx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hamradio/baycom_ser_fdx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hamradio/baycom_ser_hdx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hamradio/baycom_ser_hdx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hamradio/bpqether.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hamradio/bpqether.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hamradio/dmascc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hamradio/dmascc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hamradio/hdlcdrv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hamradio/hdlcdrv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hamradio/mkiss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hamradio/mkiss.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hamradio/scc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hamradio/scc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hamradio/yam.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hamradio/yam.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hippi/rrunner.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hippi/rrunner.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hyperv/hyperv_net.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hyperv/hyperv_net.h</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hyperv/netvsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hyperv/netvsc.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hyperv/netvsc_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hyperv/netvsc_drv.c</a></td><td class='right'>605</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/hyperv/rndis_filter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/hyperv/rndis_filter.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ieee802154/adf7242.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ieee802154/adf7242.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ieee802154/at86rf230.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ieee802154/at86rf230.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ieee802154/atusb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ieee802154/atusb.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ieee802154/atusb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ieee802154/atusb.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ieee802154/fakelb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ieee802154/fakelb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ifb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ifb.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ipvlan/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ipvlan/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ipvlan/ipvlan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ipvlan/ipvlan.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ipvlan/ipvlan_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ipvlan/ipvlan_core.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ipvlan/ipvlan_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ipvlan/ipvlan_main.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/ipvlan/ipvtap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ipvlan/ipvtap.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/au1k_ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/au1k_ir.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/bfin_sir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/bfin_sir.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/irtty-sir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/irtty-sir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/kingsun-sir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/kingsun-sir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/ks959-sir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/ks959-sir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/ksdazzle-sir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/ksdazzle-sir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/mcs7780.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/mcs7780.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/pxaficp_ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/pxaficp_ir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/sh_sir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/sh_sir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/stir4200.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/stir4200.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/vlsi_ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/vlsi_ir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/irda/w83977af_ir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/irda/w83977af_ir.c</a></td><td class='right'>675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/loopback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/loopback.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/macsec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/macsec.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/macvlan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/macvlan.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/macvtap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/macvtap.c</a></td><td class='right'>1234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 9.2%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/mdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/mdio.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/mii.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/mii.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/nlmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/nlmon.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ntb_netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ntb_netdev.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/aquantia.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/aquantia.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/at803x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/at803x.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/bcm-cygnus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/bcm-cygnus.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/bcm-phy-lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/bcm-phy-lib.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/bcm-phy-lib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/bcm-phy-lib.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/bcm63xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/bcm63xx.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/bcm7xxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/bcm7xxx.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/broadcom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/broadcom.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/davicom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/davicom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/dp83640.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/dp83640.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/dp83848.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/dp83848.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/dp83867.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/dp83867.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/icplus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/icplus.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/intel-xway.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/intel-xway.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/lxt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/lxt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/marvell.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/marvell.c</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/mdio-bcm-iproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/mdio-bcm-iproc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/phy/mdio-boardinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/mdio-boardinfo.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/phy/mdio-boardinfo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/mdio-boardinfo.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/mdio-gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/mdio-gpio.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/mdio-mux-mmioreg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/mdio-mux-mmioreg.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/mdio-xgene.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/mdio-xgene.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/mdio-xgene.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/mdio-xgene.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/mdio_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/mdio_bus.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/mdio_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/mdio_device.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/phy/meson-gxl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/meson-gxl.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/micrel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/micrel.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/microchip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/microchip.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/mscc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/mscc.c</a></td><td class='right'>437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/national.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/national.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/phy.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/phy_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/phy_device.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/phy/phy_led_triggers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/phy_led_triggers.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/qsemi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/qsemi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/smsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/smsc.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/phy/vitesse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/phy/vitesse.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/plip/plip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/plip/plip.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ppp/ppp_async.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ppp/ppp_async.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ppp/ppp_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ppp/ppp_generic.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ppp/ppp_synctty.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ppp/ppp_synctty.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ppp/pppoe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ppp/pppoe.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/ppp/pppox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/ppp/pppox.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/rionet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/rionet.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/sb1000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/sb1000.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/slip/slhc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/slip/slhc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/slip/slip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/slip/slip.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/tap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/tap.c</a></td><td class='right'>1285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/team/team.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/team/team.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/tun.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/tun.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/asix_devices.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/asix_devices.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/ax88172a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/ax88172a.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/ax88179_178a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/ax88179_178a.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/catc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/catc.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/cdc-phonet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/cdc-phonet.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/cdc_ether.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/cdc_ether.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/cdc_ncm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/cdc_ncm.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/hso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/hso.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/kalmia.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/kalmia.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/kaweth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/kaweth.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/lan78xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/lan78xx.c</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/lan78xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/lan78xx.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/pegasus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/pegasus.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/qmi_wwan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/qmi_wwan.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/r8152.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/r8152.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/rndis_host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/rndis_host.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/rtl8150.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/rtl8150.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/sierra_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/sierra_net.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/smsc75xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/smsc75xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/usb/usbnet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/usb/usbnet.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/veth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/veth.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/virtio_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/virtio_net.c</a></td><td class='right'>756</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/vmxnet3/vmxnet3_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/vmxnet3/vmxnet3_drv.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/vmxnet3/vmxnet3_ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/vmxnet3/vmxnet3_ethtool.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/vmxnet3/vmxnet3_int.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/vmxnet3/vmxnet3_int.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/vrf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/vrf.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/vxlan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/vxlan.c</a></td><td class='right'>956</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/c101.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/c101.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/cosa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/cosa.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/dlci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/dlci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/dscc4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/dscc4.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/farsync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/farsync.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/fsl_ucc_hdlc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/fsl_ucc_hdlc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/hd64570.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/hd64570.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/hd64572.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/hd64572.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/hdlc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/hdlc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/hdlc_fr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/hdlc_fr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/hostess_sv11.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/hostess_sv11.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/ixp4xx_hss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/ixp4xx_hss.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/lapbether.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/lapbether.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/lmc/lmc_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/lmc/lmc_main.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/lmc/lmc_media.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/lmc/lmc_media.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/n2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/n2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/pc300too.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/pc300too.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/pci200syn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/pci200syn.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/sbni.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/sbni.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/sdla.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/sdla.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/sealevel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/sealevel.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/slic_ds26522.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/slic_ds26522.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/wanxl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/wanxl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wan/x25_asy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wan/x25_asy.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wimax/i2400m/netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wimax/i2400m/netdev.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wimax/i2400m/usb-fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wimax/i2400m/usb-fw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/admtek/adm8211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/admtek/adm8211.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/ahb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/ahb.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/ce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/ce.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/ce.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/ce.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/core.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/core.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/debug.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/debug.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/debugfs_sta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/debugfs_sta.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/htc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/htc.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/htc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/htc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/htt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/htt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/htt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/htt.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/htt_rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/htt_rx.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/htt_tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/htt_tx.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/hw.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/hw.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/mac.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/mac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/mac.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/p2p.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/p2p.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/pci.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/pci.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/spectral.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/spectral.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/testmode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/testmode.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/wmi-ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/wmi-ops.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/wmi-tlv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/wmi-tlv.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/wmi-tlv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/wmi-tlv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/wmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/wmi.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath10k/wmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath10k/wmi.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath5k/ahb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath5k/ahb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath5k/ath5k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath5k/ath5k.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath5k/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath5k/debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath5k/mac80211-ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath5k/mac80211-ops.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath6kl/cfg80211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath6kl/cfg80211.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath6kl/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath6kl/core.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath6kl/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath6kl/main.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath6kl/sdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath6kl/sdio.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath6kl/txrx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath6kl/txrx.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath6kl/wmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath6kl/wmi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/ahb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/ahb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/ani.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/ani.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/ar5008_phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/ar5008_phy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/ar9002_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/ar9002_hw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/ar9002_mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/ar9002_mac.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/ar9003_mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/ar9003_mac.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/ath9k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/ath9k.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/channel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/channel.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/common-debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/common-debug.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/common-spectral.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/common-spectral.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/common-spectral.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/common-spectral.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/debug.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/debug.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/debug_sta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/debug_sta.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/eeprom.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/eeprom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/eeprom.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/eeprom_4k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/eeprom_4k.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/eeprom_9287.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/eeprom_9287.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/eeprom_def.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/eeprom_def.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/hif_usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/hif_usb.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/hif_usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/hif_usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/htc_hst.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/htc_hst.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/hw.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/init.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/link.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/link.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/mac.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/mac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/mac.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/main.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/pci.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/recv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/recv.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/rng.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/ath9k/xmit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/ath9k/xmit.c</a></td><td class='right'>512</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/main.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/regd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/regd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/regd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/regd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wcn36xx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wcn36xx/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wcn36xx/dxe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wcn36xx/dxe.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wcn36xx/hal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wcn36xx/hal.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wcn36xx/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wcn36xx/main.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wcn36xx/smd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wcn36xx/smd.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wcn36xx/smd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wcn36xx/smd.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wcn36xx/txrx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wcn36xx/txrx.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wcn36xx/wcn36xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wcn36xx/wcn36xx.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/cfg80211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/cfg80211.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/debugfs.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/ethtool.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/fw.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/fw_inc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/fw_inc.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/interrupt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/interrupt.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/main.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/netdev.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/p2p.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/p2p.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/pcie_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/pcie_bus.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/pm.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/pmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/pmc.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/rx_reorder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/rx_reorder.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/txrx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/txrx.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/wil6210.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/wil6210.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/wil_crash_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/wil_crash_dump.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/wmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/wmi.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ath/wil6210/wmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ath/wil6210/wmi.h</a></td><td class='right'>653</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/atmel/atmel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/atmel/atmel.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/b43/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/b43/main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/b43legacy/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/b43legacy/main.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/cisco/airo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/cisco/airo.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/ipw2x00/ipw2100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/ipw2x00/ipw2100.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/ipw2x00/ipw2200.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/ipw2x00/ipw2200.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/ipw2x00/libipw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/ipw2x00/libipw.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/ipw2x00/libipw_geo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/ipw2x00/libipw_geo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/ipw2x00/libipw_module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/ipw2x00/libipw_module.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/ipw2x00/libipw_rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/ipw2x00/libipw_rx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/ipw2x00/libipw_tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/ipw2x00/libipw_tx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlegacy/3945-mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlegacy/3945-mac.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlegacy/4965-mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlegacy/4965-mac.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlegacy/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlegacy/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/dvm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/dvm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/dvm/calib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/dvm/calib.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/dvm/rs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/dvm/rs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/dvm/ucode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/iwl-6000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/iwl-6000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/iwl-7000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/iwl-7000.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/iwl-8000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/iwl-8000.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/iwl-9000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/iwl-9000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/iwl-a000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/iwl-a000.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/iwl-config.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/iwl-config.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/iwl-csr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/iwl-csr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/iwl-drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/iwl-drv.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/iwl-drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/iwl-drv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/iwl-fw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/iwl-fw.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/d3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/d3.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-mac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/fw-api-mac.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-scan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/fw-api-scan.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-sta.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/fw-api-sta.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-stats.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/fw-api-stats.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/fw.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/mvm.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/ops.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/power.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/rs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/rs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/rx.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/scan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/scan.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/sta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/sta.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/sta.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/sta.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/tt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/tt.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/tx.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/mvm/utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/mvm/utils.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/pcie/drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/pcie/drv.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/pcie/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/pcie/internal.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/pcie/rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/pcie/rx.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/pcie/trans.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/pcie/trans.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intel/iwlwifi/pcie/tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intel/iwlwifi/pcie/tx.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/hostap/hostap_80211_rx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/hostap/hostap_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/hostap/hostap_hw.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/hostap/hostap_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/hostap/hostap_ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/hostap/hostap_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/hostap/hostap_main.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/orinoco/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/orinoco/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/orinoco/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/orinoco/main.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/orinoco/mic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/orinoco/mic.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/orinoco/mic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/orinoco/mic.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/orinoco/orinoco.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/orinoco/orinoco.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/orinoco/orinoco_usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/orinoco/orinoco_usb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/p54/fwio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/p54/fwio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/prism54/isl_38xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/prism54/isl_38xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/prism54/isl_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/prism54/isl_ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/intersil/prism54/islpci_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/intersil/prism54/islpci_dev.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/mac80211_hwsim.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/mac80211_hwsim.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/libertas/cfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/libertas/cfg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/libertas/cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/libertas/cmd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/libertas/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/libertas/main.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/11n_aggr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/11n_aggr.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/README</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/cfg80211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/cfg80211.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/cmdevt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/cmdevt.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/debugfs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/decl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/decl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/fw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/fw.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/init.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/main.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/main.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/pcie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/pcie.c</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/pcie.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/pcie.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/scan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/scan.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/sdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/sdio.c</a></td><td class='right'>645</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/sdio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/sdio.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/sta_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/sta_cmd.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/sta_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/sta_event.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/sta_ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/txrx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/txrx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/uap_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/uap_cmd.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/usb.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/util.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/marvell/mwifiex/wmm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/marvell/mwifiex/wmm.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/mediatek/mt7601u/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/mediatek/mt7601u/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/mediatek/mt7601u/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/mediatek/mt7601u/init.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/mediatek/mt7601u/regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/mediatek/mt7601u/regs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2400pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2400pci.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2500pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2500pci.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2500usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2500usb.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2800.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2800.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2800lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2800lib.c</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2800lib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2800lib.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2800usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2800usb.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00config.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00debug.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00dev.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00lib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00lib.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00link.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00link.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00mac.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00queue.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00queue.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00soc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt2x00usb.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt61pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt61pci.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ralink/rt2x00/rt73usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ralink/rt2x00/rt73usb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ray_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ray_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/base.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/base.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/base.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c</a></td><td class='right'>1082</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c</a></td><td class='right'>851</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c</a></td><td class='right'>993</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c</a></td><td class='right'>916</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c</a></td><td class='right'>1262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 5.2%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/cam.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/cam.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/core.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/debug.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/debug.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/efuse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/efuse.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/efuse.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/efuse.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/pci.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/pci.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/ps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/ps.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/regd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/regd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/main.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/def.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/def.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/reg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.h</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/def.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/def.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/reg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/usb.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/usb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/realtek/rtlwifi/wifi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/realtek/rtlwifi/wifi.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/rndis_wlan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/rndis_wlan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/rsi/rsi_91x_mac80211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/rsi/rsi_91x_mac80211.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/rsi/rsi_91x_mgmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/rsi/rsi_91x_mgmt.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/rsi/rsi_91x_usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/rsi/rsi_91x_usb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/rsi/rsi_main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/rsi/rsi_main.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/rsi/rsi_mgmt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/rsi/rsi_mgmt.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/st/cw1200/sta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/st/cw1200/sta.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/st/cw1200/wsm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/st/cw1200/wsm.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wl1251/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wl1251/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wl1251/event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wl1251/event.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wl18xx/event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wl18xx/event.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wl18xx/event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wl18xx/event.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wl18xx/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wl18xx/main.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wlcore/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wlcore/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wlcore/acx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wlcore/acx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wlcore/acx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wlcore/acx.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wlcore/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wlcore/debugfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wlcore/event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wlcore/event.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wlcore/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wlcore/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wlcore/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wlcore/main.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/ti/wlcore/sdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/ti/wlcore/sdio.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/wl3501_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/wl3501_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/wireless/zydas/zd1201.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/wireless/zydas/zd1201.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/xen-netback/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/xen-netback/common.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/xen-netback/hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/xen-netback/hash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/xen-netback/interface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/xen-netback/interface.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/xen-netback/netback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/xen-netback/netback.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/xen-netback/xenbus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/xen-netback/xenbus.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/net/xen-netfront.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/net/xen-netfront.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nfc/mei_phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nfc/mei_phy.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nfc/microread/mei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nfc/microread/mei.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nfc/pn533/pn533.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nfc/pn533/pn533.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nfc/pn544/mei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nfc/pn544/mei.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ntb/hw/amd/ntb_hw_amd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ntb/hw/amd/ntb_hw_amd.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ntb/hw/amd/ntb_hw_amd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ntb/hw/amd/ntb_hw_amd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ntb/hw/intel/ntb_hw_intel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ntb/hw/intel/ntb_hw_intel.c</a></td><td class='right'>684</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ntb/hw/intel/ntb_hw_intel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ntb/hw/intel/ntb_hw_intel.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ntb/ntb_transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ntb/ntb_transport.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ntb/test/ntb_perf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ntb/test/ntb_perf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nubus/proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nubus/proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/claim.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/claim.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/core.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/dimm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/dimm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/dimm_devs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/dimm_devs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/e820.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/e820.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/label.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/label.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/namespace_devs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/namespace_devs.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/nd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/nd.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/pfn_devs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/pfn_devs.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/pmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/pmem.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvdimm/region_devs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvdimm/region_devs.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/host/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/host/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/host/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/host/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/host/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/host/core.c</a></td><td class='right'>539</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/host/fabrics.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/host/fabrics.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/host/fabrics.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/host/fabrics.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/nvme/host/fc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/host/fc.c</a></td><td class='right'>2573</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/host/lightnvm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/host/lightnvm.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/host/nvme.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/host/nvme.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/host/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/host/pci.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/host/rdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/host/rdma.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/host/scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/host/scsi.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/target/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/target/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/target/admin-cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/admin-cmd.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/target/configfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/configfs.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/target/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/core.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/target/discovery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/discovery.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/target/fabrics-cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/fabrics-cmd.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/nvme/target/fc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/fc.c</a></td><td class='right'>2294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/nvme/target/fcloop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/fcloop.c</a></td><td class='right'>1148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/target/io-cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/io-cmd.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/target/loop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/loop.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/target/nvmet.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/nvmet.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvme/target/rdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvme/target/rdma.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvmem/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvmem/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvmem/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvmem/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/nvmem/bcm-ocotp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvmem/bcm-ocotp.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvmem/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvmem/core.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvmem/imx-ocotp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvmem/imx-ocotp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/nvmem/lpc18xx_otp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvmem/lpc18xx_otp.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/nvmem/qfprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/nvmem/qfprom.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/base.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/device.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/fdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/fdt.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/irq.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/of_mdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/of_mdio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/of_numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/of_numa.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/of_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/of_pci.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/of_pci_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/of_pci_irq.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/of_reserved_mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/of_reserved_mem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/overlay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/overlay.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/platform.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/resolver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/resolver.c</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/of/unittest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/of/unittest.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/oprofile/buffer_sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/oprofile/buffer_sync.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/oprofile/cpu_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/oprofile/cpu_buffer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/oprofile/event_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/oprofile/event_buffer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/oprofile/nmi_timer_int.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/oprofile/nmi_timer_int.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/oprofile/oprofilefs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/oprofile/oprofilefs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parisc/ccio-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parisc/ccio-dma.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parisc/ccio-rm-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parisc/ccio-rm-dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parisc/eisa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parisc/eisa.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parisc/eisa_eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parisc/eisa_eeprom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parisc/eisa_enumerator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parisc/eisa_enumerator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parisc/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parisc/led.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parisc/pdc_stable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parisc/pdc_stable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parisc/power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parisc/power.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parisc/sba_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parisc/sba_iommu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parport/daisy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parport/daisy.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parport/ieee1284.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parport/ieee1284.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parport/ieee1284_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parport/ieee1284_ops.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parport/parport_gsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parport/parport_gsc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parport/parport_ip32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parport/parport_ip32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parport/parport_pc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parport/parport_pc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parport/probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parport/probe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parport/procfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parport/procfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/parport/share.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/parport/share.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/access.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/access.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/bus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pci/dwc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/Kconfig</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pci/dwc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/Makefile</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pci/dwc/pci-dra7xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pci-dra7xx.c</a></td><td class='right'>564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pci/dwc/pci-exynos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pci-exynos.c</a></td><td class='right'>752</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/pci/dwc/pci-imx6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pci-imx6.c</a> (renamed from drivers/pci/host/pci-imx6.c)</td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/pci/dwc/pci-keystone-dw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pci-keystone-dw.c</a> (renamed from drivers/pci/host/pci-keystone-dw.c)</td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/pci/dwc/pci-keystone.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pci-keystone.c</a> (renamed from drivers/pci/host/pci-keystone.c)</td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/pci/dwc/pci-keystone.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pci-keystone.h</a> (renamed from drivers/pci/host/pci-keystone.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pci/dwc/pci-layerscape.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pci-layerscape.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pci/dwc/pcie-armada8k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pcie-armada8k.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/pci/dwc/pcie-artpec6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pcie-artpec6.c</a> (renamed from drivers/pci/host/pcie-artpec6.c)</td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pci/dwc/pcie-designware-host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pcie-designware-host.c</a></td><td class='right'>635</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/pci/dwc/pcie-designware-plat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pcie-designware-plat.c</a> (renamed from drivers/pci/host/pcie-designware-plat.c)</td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pci/dwc/pcie-designware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pcie-designware.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pci/dwc/pcie-designware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pcie-designware.h</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pci/dwc/pcie-hisi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pcie-hisi.c</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pci/dwc/pcie-qcom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pcie-qcom.c</a></td><td class='right'>768</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/pci/dwc/pcie-spear13xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/dwc/pcie-spear13xx.c</a> (renamed from drivers/pci/host/pcie-spear13xx.c)</td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/ecam.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/ecam.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/Kconfig</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/Makefile</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pci/host/pci-dra7xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-dra7xx.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pci/host/pci-exynos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-exynos.c</a></td><td class='right'>629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pci-host-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-host-common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pci-hyperv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-hyperv.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pci/host/pci-layerscape.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-layerscape.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pci-mvebu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-mvebu.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pci-rcar-gen2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-rcar-gen2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pci-tegra.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-tegra.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pci-thunder-ecam.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-thunder-ecam.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pci-thunder-pem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-thunder-pem.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pci-versatile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-versatile.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pci-xgene-msi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-xgene-msi.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pci-xgene.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pci-xgene.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pcie-altera.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-altera.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pci/host/pcie-armada8k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-armada8k.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pci/host/pcie-designware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-designware.c</a></td><td class='right'>902</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pci/host/pcie-designware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-designware.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pci/host/pcie-hisi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-hisi.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pcie-iproc-bcma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-iproc-bcma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pcie-iproc-msi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-iproc-msi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pcie-iproc-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-iproc-platform.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pcie-iproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-iproc.c</a></td><td class='right'>954</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pcie-iproc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-iproc.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pci/host/pcie-qcom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-qcom.c</a></td><td class='right'>586</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pcie-rcar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-rcar.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pcie-rockchip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-rockchip.c</a></td><td class='right'>429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pcie-xilinx-nwl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-xilinx-nwl.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/pcie-xilinx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/pcie-xilinx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/host/vmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/host/vmd.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/acpiphp_glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/acpiphp_glue.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/acpiphp_ibm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/acpiphp_ibm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/cpci_hotplug_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/cpci_hotplug_core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/cpqphp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/cpqphp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/cpqphp_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/cpqphp_core.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/cpqphp_nvram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/cpqphp_nvram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/pci_hotplug_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/pci_hotplug_core.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/pciehp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/pciehp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/pciehp_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/pciehp_core.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/pciehp_ctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/pciehp_ctrl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/pciehp_hpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/pciehp_hpc.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/pnv_php.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/pnv_php.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/rpadlpar_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/rpadlpar_core.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/s390_pci_hpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/s390_pci_hpc.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/hotplug/shpchp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/hotplug/shpchp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/iov.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/iov.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/msi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/msi.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pci-acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pci-acpi.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pci-driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pci-driver.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pci-mid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pci-mid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pci-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pci-sysfs.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pci.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pci.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pcie/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pcie/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pcie/aer/aerdrv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pcie/aer/aerdrv.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pcie/aspm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pcie/aspm.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pcie/pcie-dpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pcie/pcie-dpc.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pcie/pme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pcie/pme.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pcie/portdrv_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pcie/portdrv_core.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/pcie/portdrv_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/pcie/portdrv_pci.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/probe.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/quirks.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/remove.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/remove.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/rom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/rom.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/setup-bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/setup-bus.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/setup-res.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/setup-res.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/slot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/slot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/syscall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/syscall.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pci/xen-pcifront.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pci/xen-pcifront.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pcmcia/m32r_pcc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pcmcia/m32r_pcc.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/perf/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/perf/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/perf/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/perf/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/perf/arm_pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/perf/arm_pmu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/perf/qcom_l2_pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/perf/qcom_l2_pmu.c</a></td><td class='right'>1013</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/perf/xgene_pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/perf/xgene_pmu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/Kconfig</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-bcm-cygnus-pcie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-bcm-cygnus-pcie.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/phy/phy-bcm-nsp-usb3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-bcm-nsp-usb3.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-berlin-sata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-berlin-sata.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-brcm-sata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-brcm-sata.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-da8xx-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-da8xx-usb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-exynos-mipi-video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-exynos-mipi-video.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/phy/phy-exynos-pcie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-exynos-pcie.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-exynos4210-usb2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-exynos4210-usb2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-exynos4x12-usb2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-exynos4x12-usb2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-exynos5250-usb2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-exynos5250-usb2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-hi6220-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-hi6220-usb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/phy/phy-meson8b-usb2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-meson8b-usb2.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/phy/phy-miphy365x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-miphy365x.c</a></td><td class='right'>625</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-mt65xx-usb3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-mt65xx-usb3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-qcom-ufs-i.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-qcom-ufs-i.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-qcom-ufs-qmp-14nm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-qcom-ufs-qmp-14nm.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-qcom-ufs-qmp-20nm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-qcom-ufs-qmp-20nm.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-qcom-ufs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-qcom-ufs.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/phy/phy-qcom-usb-hs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-qcom-usb-hs.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/phy/phy-qcom-usb-hsic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-qcom-usb-hsic.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-rcar-gen3-usb2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-rcar-gen3-usb2.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-rockchip-emmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-rockchip-emmc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-rockchip-inno-usb2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-rockchip-inno-usb2.c</a></td><td class='right'>612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-s5pv210-usb2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-s5pv210-usb2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/phy/phy-stih41x-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-stih41x-usb.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-sun4i-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-sun4i-usb.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-ti-pipe3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-ti-pipe3.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/phy-twl4030-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/phy-twl4030-usb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/tegra/xusb-tegra124.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/tegra/xusb-tegra124.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/phy/tegra/xusb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/phy/tegra/xusb.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/Kconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c</a></td><td class='right'>1115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c</a></td><td class='right'>1524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/aspeed/pinctrl-aspeed.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/aspeed/pinctrl-aspeed.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/aspeed/pinctrl-aspeed.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/aspeed/pinctrl-aspeed.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/bcm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/bcm/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/bcm/pinctrl-bcm281xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/bcm/pinctrl-bcm281xx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/bcm/pinctrl-bcm2835.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/bcm/pinctrl-bcm2835.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/bcm/pinctrl-iproc-gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/bcm/pinctrl-ns2-mux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/bcm/pinctrl-ns2-mux.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/bcm/pinctrl-nsp-gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/bcm/pinctrl-nsp-gpio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/berlin/berlin-bg2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/berlin/berlin-bg2.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/berlin/berlin-bg2cd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/berlin/berlin-bg2cd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/berlin/berlin-bg2q.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/berlin/berlin-bg2q.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/berlin/berlin-bg4ct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/berlin/berlin-bg4ct.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/core.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/core.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/devicetree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/devicetree.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/devicetree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/devicetree.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/freescale/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/freescale/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/freescale/pinctrl-imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/freescale/pinctrl-imx.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/freescale/pinctrl-imx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/freescale/pinctrl-imx.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/intel/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/intel/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/intel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/intel/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/intel/pinctrl-baytrail.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/intel/pinctrl-baytrail.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/intel/pinctrl-broxton.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/intel/pinctrl-broxton.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/intel/pinctrl-cherryview.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/intel/pinctrl-cherryview.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/intel/pinctrl-geminilake.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/intel/pinctrl-geminilake.c</a></td><td class='right'>512</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/intel/pinctrl-intel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/intel/pinctrl-intel.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/intel/pinctrl-intel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/intel/pinctrl-intel.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/intel/pinctrl-merrifield.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/intel/pinctrl-merrifield.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/intel/pinctrl-sunrisepoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/intel/pinctrl-sunrisepoint.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mediatek/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mediatek/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mediatek/pinctrl-mt6397.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mediatek/pinctrl-mt6397.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mediatek/pinctrl-mt7623.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mediatek/pinctrl-mt7623.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mediatek/pinctrl-mtk-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mediatek/pinctrl-mtk-common.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mediatek/pinctrl-mtk-mt8173.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mediatek/pinctrl-mtk-mt8173.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/meson/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/meson/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/meson/pinctrl-meson-gxbb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/meson/pinctrl-meson-gxbb.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/meson/pinctrl-meson-gxl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/meson/pinctrl-meson-gxl.c</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/meson/pinctrl-meson.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/meson/pinctrl-meson.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/meson/pinctrl-meson.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/meson/pinctrl-meson.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mvebu/pinctrl-armada-370.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mvebu/pinctrl-armada-370.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mvebu/pinctrl-armada-375.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mvebu/pinctrl-armada-375.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mvebu/pinctrl-armada-38x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mvebu/pinctrl-armada-38x.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mvebu/pinctrl-armada-39x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mvebu/pinctrl-armada-39x.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mvebu/pinctrl-armada-xp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mvebu/pinctrl-armada-xp.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mvebu/pinctrl-dove.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mvebu/pinctrl-dove.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mvebu/pinctrl-kirkwood.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mvebu/pinctrl-kirkwood.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mvebu/pinctrl-mvebu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mvebu/pinctrl-mvebu.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mvebu/pinctrl-mvebu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mvebu/pinctrl-mvebu.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/mvebu/pinctrl-orion.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/mvebu/pinctrl-orion.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinconf-generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinconf-generic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinconf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinconf.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinconf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinconf.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-amd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-amd.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-amd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-amd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-at91.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-at91.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-da850-pupd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-da850-pupd.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-falcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-falcon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-lantiq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-lantiq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-lantiq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-lantiq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-lpc18xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-lpc18xx.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-max77620.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-max77620.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-oxnas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-oxnas.c</a></td><td class='right'>605</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-palmas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-palmas.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-rockchip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-rockchip.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-single.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-single.c</a></td><td class='right'>514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-st.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-st.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-sx150x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-sx150x.c</a></td><td class='right'>1250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-xway.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-xway.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinctrl-zynq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinctrl-zynq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinmux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinmux.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/pinmux.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/pinmux.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/qcom/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/qcom/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/qcom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/qcom/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/qcom/pinctrl-msm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/qcom/pinctrl-msm.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/qcom/pinctrl-msm8660.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/qcom/pinctrl-msm8660.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/qcom/pinctrl-msm8994.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/qcom/pinctrl-msm8994.c</a></td><td class='right'>1379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/samsung/pinctrl-exynos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/samsung/pinctrl-exynos.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/samsung/pinctrl-exynos.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/samsung/pinctrl-exynos.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/samsung/pinctrl-s3c24xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/samsung/pinctrl-s3c24xx.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/samsung/pinctrl-s3c64xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/samsung/pinctrl-s3c64xx.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/samsung/pinctrl-samsung.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/samsung/pinctrl-samsung.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/samsung/pinctrl-samsung.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/samsung/pinctrl-samsung.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sh-pfc/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sh-pfc/core.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sh-pfc/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sh-pfc/core.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sh-pfc/pfc-r8a7778.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sh-pfc/pfc-r8a7778.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sh-pfc/pfc-r8a7791.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sh-pfc/pfc-r8a7791.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sh-pfc/pfc-r8a7795.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sh-pfc/pfc-r8a7795.c</a></td><td class='right'>664</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sh-pfc/pfc-r8a7796.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sh-pfc/pfc-r8a7796.c</a></td><td class='right'>2496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 80.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sh-pfc/pinctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sh-pfc/pinctrl.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sh-pfc/sh_pfc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sh-pfc/sh_pfc.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sirf/pinctrl-atlas7.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sirf/pinctrl-atlas7.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/spear/pinctrl-plgpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/spear/pinctrl-plgpio.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/spear/pinctrl-spear1310.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/spear/pinctrl-spear1310.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/spear/pinctrl-spear1340.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/spear/pinctrl-spear1340.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/spear/pinctrl-spear300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/spear/pinctrl-spear300.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/spear/pinctrl-spear310.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/spear/pinctrl-spear310.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/spear/pinctrl-spear320.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/spear/pinctrl-spear320.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/stm32/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/stm32/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/stm32/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/stm32/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/stm32/pinctrl-stm32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/stm32/pinctrl-stm32.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/stm32/pinctrl-stm32f429.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/stm32/pinctrl-stm32f429.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/stm32/pinctrl-stm32h743.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/stm32/pinctrl-stm32h743.c</a></td><td class='right'>1980</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-gr8.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-gr8.c</a></td><td class='right'>541</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c</a></td><td class='right'>558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c</a></td><td class='right'>690</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun5i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun5i.c</a></td><td class='right'>749</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c</a></td><td class='right'>814</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sunxi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sunxi.c</a></td><td class='right'>584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/sunxi/pinctrl-sunxi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/sunxi/pinctrl-sunxi.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/ti/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/ti/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/ti/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/ti/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pinctrl/ti/pinctrl-ti-iodelay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/ti/pinctrl-ti-iodelay.c</a></td><td class='right'>937</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/uniphier/pinctrl-uniphier-core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/vt8500/pinctrl-vt8500.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/vt8500/pinctrl-vt8500.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/vt8500/pinctrl-wm8505.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/vt8500/pinctrl-wm8505.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/vt8500/pinctrl-wm8650.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/vt8500/pinctrl-wm8650.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/vt8500/pinctrl-wm8750.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/vt8500/pinctrl-wm8750.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/vt8500/pinctrl-wm8850.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/vt8500/pinctrl-wm8850.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/vt8500/pinctrl-wmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/vt8500/pinctrl-wmt.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pinctrl/vt8500/pinctrl-wmt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pinctrl/vt8500/pinctrl-wmt.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/chrome/cros_ec_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/chrome/cros_ec_dev.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/chrome/cros_ec_proto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/chrome/cros_ec_proto.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/goldfish/goldfish_pipe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/goldfish/goldfish_pipe.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/goldfish/pdev_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/goldfish/pdev_bus.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/Kconfig</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/acer-wmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/acer-wmi.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/alienware-wmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/alienware-wmi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/asus-nb-wmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/asus-nb-wmi.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/asus-wireless.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/asus-wireless.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/asus-wmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/asus-wmi.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/asus-wmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/asus-wmi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/dell-laptop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/dell-laptop.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/dell-wmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/dell-wmi.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/fujitsu-laptop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/fujitsu-laptop.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/hp_accel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/hp_accel.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/ideapad-laptop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/ideapad-laptop.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/intel-hid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel-hid.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/intel-smartconnect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel-smartconnect.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/intel-vbtn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel-vbtn.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/platform/x86/intel_bxtwc_tmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel_bxtwc_tmu.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/intel_ips.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel_ips.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/intel_mid_powerbtn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel_mid_powerbtn.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/intel_mid_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel_mid_thermal.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/intel_pmc_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel_pmc_core.c</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/intel_pmc_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel_pmc_core.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/intel_pmc_ipc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel_pmc_ipc.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/platform/x86/intel_pmic_gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel_pmic_gpio.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/platform/x86/intel_turbo_max_3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/intel_turbo_max_3.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/platform/x86/mlx-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/mlx-platform.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/platform/x86/mlxcpld-hotplug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/mlxcpld-hotplug.c</a></td><td class='right'>515</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/msi-wmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/msi-wmi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/panasonic-laptop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/panasonic-laptop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/platform/x86/pmc_atom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/pmc_atom.c</a> (renamed from arch/x86/platform/atom/pmc_atom.c)</td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/platform/x86/silead_dmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/silead_dmi.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/sony-laptop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/sony-laptop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/platform/x86/surface3-wmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/surface3-wmi.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/platform/x86/surface3_button.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/surface3_button.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/platform/x86/thinkpad_acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/platform/x86/thinkpad_acpi.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pnp/interface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pnp/interface.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pnp/pnpbios/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pnp/pnpbios/core.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pnp/pnpbios/proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pnp/pnpbios/proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/avs/rockchip-io-domain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/avs/rockchip-io-domain.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/avs/smartreflex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/avs/smartreflex.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/reset/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/reset/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/reset/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/reset/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/reset/at91-poweroff.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/reset/at91-poweroff.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/reset/at91-reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/reset/at91-reset.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/reset/at91-sama5d2_shdwc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/reset/at91-sama5d2_shdwc.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/reset/ltc2952-poweroff.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/reset/ltc2952-poweroff.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/power/reset/piix4-poweroff.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/reset/piix4-poweroff.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/reset/syscon-reboot-mode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/reset/syscon-reboot-mode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/reset/zx-reboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/reset/zx-reboot.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/Kconfig</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/ab8500_btemp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/ab8500_btemp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/ab8500_fg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/ab8500_fg.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/power/supply/axp20x_ac_power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/axp20x_ac_power.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/axp20x_usb_power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/axp20x_usb_power.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/axp288_charger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/axp288_charger.c</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/axp288_fuel_gauge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/axp288_fuel_gauge.c</a></td><td class='right'>540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/bq2415x_charger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/bq2415x_charger.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/bq24190_charger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/bq24190_charger.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/bq24735-charger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/bq24735-charger.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/bq27xxx_battery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/bq27xxx_battery.c</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/bq27xxx_battery_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/bq27xxx_battery_i2c.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/gpio-charger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/gpio-charger.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/power/supply/intel_mid_battery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/intel_mid_battery.c</a></td><td class='right'>795</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/ipaq_micro_battery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/ipaq_micro_battery.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/lp8788-charger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/lp8788-charger.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/power/supply/max14656_charger_detector.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/max14656_charger_detector.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/max17040_battery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/max17040_battery.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/max8997_charger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/max8997_charger.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/pcf50633-charger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/pcf50633-charger.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/power_supply_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/power_supply_core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/qcom_smbb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/qcom_smbb.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/power/supply/sbs-charger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/sbs-charger.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/tps65217_charger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/tps65217_charger.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/wm8350_power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/wm8350_power.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/power/supply/wm97xx_battery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/power/supply/wm97xx_battery.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/powercap/intel_rapl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/powercap/intel_rapl.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ps3/ps3-sys-manager.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ps3/ps3-sys-manager.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ptp/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ptp/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ptp/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ptp/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ptp/ptp_clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ptp/ptp_clock.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/ptp/ptp_kvm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ptp/ptp_kvm.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ptp/ptp_private.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ptp/ptp_private.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ptp/ptp_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ptp/ptp_sysfs.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/core.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-atmel-hlcdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-atmel-hlcdc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-atmel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-atmel.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-bcm-kona.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-bcm-kona.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-berlin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-berlin.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-bfin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-bfin.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-brcmstb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-brcmstb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-fsl-ftm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-fsl-ftm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pwm/pwm-hibvt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-hibvt.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-imx.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-lp3943.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-lp3943.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-lpss-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-lpss-pci.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-lpss-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-lpss-platform.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-lpss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-lpss.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-lpss.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-lpss.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-meson.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-meson.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-mxs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-mxs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-pca9685.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-pca9685.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-pxa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-pxa.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-sti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-sti.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/pwm/pwm-stm32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-stm32.c</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-sun4i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-sun4i.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-twl-led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-twl-led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-twl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-twl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/pwm/pwm-vt8500.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/pwm/pwm-vt8500.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rapidio/devices/rio_mport_cdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rapidio/devices/rio_mport_cdev.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/88pm800.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/88pm800.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/88pm8607.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/88pm8607.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/aat2870-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/aat2870-regulator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/act8945a-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/act8945a-regulator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/ad5398.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/ad5398.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/anatop-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/anatop-regulator.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/arizona-ldo1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/arizona-ldo1.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/arizona-micsupp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/arizona-micsupp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/as3711-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/as3711-regulator.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/axp20x-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/axp20x-regulator.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/bcm590xx-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/bcm590xx-regulator.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/core.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/regulator/cpcap-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/cpcap-regulator.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/devres.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/devres.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/fan53555.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/fan53555.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/fixed.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/fixed.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/hi655x-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/hi655x-regulator.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/internal.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/lp8755.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/lp8755.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/ltc3589.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/ltc3589.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/ltc3676.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/ltc3676.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/max14577-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/max14577-regulator.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/max77620-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/max77620-regulator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/max77686-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/max77686-regulator.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/max77693-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/max77693-regulator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/max77802-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/max77802-regulator.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/max8907-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/max8907-regulator.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/max8925-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/max8925-regulator.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/max8952.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/max8952.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/palmas-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/palmas-regulator.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/pbias-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/pbias-regulator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/pcap-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/pcap-regulator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/pcf50633-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/pcf50633-regulator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/pfuze100-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/pfuze100-regulator.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/pv88060-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/pv88060-regulator.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/pv88080-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/pv88080-regulator.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/pv88090-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/pv88090-regulator.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/qcom_smd-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/qcom_smd-regulator.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/rc5t583-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/rc5t583-regulator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/rk808-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/rk808-regulator.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/rn5t618-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/rn5t618-regulator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/s2mpa01.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/s2mpa01.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/tps65086-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/tps65086-regulator.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/tps65217-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/tps65217-regulator.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/tps65218-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/tps65218-regulator.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/regulator/twl6030-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/regulator/twl6030-regulator.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/Kconfig</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/da8xx_remoteproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/da8xx_remoteproc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/omap_remoteproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/omap_remoteproc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/remoteproc/qcom_adsp_pil.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/qcom_adsp_pil.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/remoteproc/qcom_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/qcom_common.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/remoteproc/qcom_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/qcom_common.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/remoteproc/qcom_mdt_loader.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/qcom_mdt_loader.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/remoteproc/qcom_mdt_loader.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/qcom_mdt_loader.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/qcom_q6v5_pil.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/qcom_q6v5_pil.c</a></td><td class='right'>532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/qcom_wcnss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/qcom_wcnss.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/qcom_wcnss.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/qcom_wcnss.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/qcom_wcnss_iris.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/qcom_wcnss_iris.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/remoteproc_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/remoteproc_core.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/remoteproc_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/remoteproc_debugfs.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/remoteproc_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/remoteproc_internal.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/remoteproc/remoteproc_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/remoteproc_sysfs.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/remoteproc_virtio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/remoteproc_virtio.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/st_remoteproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/st_remoteproc.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/remoteproc/st_slim_rproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/st_slim_rproc.c</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/remoteproc/ste_modem_rproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/ste_modem_rproc.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/remoteproc/wkup_m3_rproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/remoteproc/wkup_m3_rproc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/core.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/hisilicon/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/hisilicon/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/hisilicon/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/hisilicon/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/reset/hisilicon/reset-hi3660.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/hisilicon/reset-hi3660.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/reset-berlin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/reset-berlin.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/reset-lpc18xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/reset-lpc18xx.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/reset-oxnas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/reset-oxnas.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/reset-socfpga.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/reset-socfpga.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/reset-sunxi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/reset-sunxi.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/reset-ti-syscon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/reset-ti-syscon.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/reset-uniphier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/reset-uniphier.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/reset/reset-zx2967.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/reset-zx2967.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/reset-zynq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/reset-zynq.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/sti/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/sti/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/reset/sti/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/sti/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/reset/sti/reset-stih415.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/sti/reset-stih415.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/reset/sti/reset-stih416.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/sti/reset-stih416.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/reset/tegra/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/tegra/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/reset/tegra/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/tegra/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/reset/tegra/reset-bpmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/reset/tegra/reset-bpmp.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rpmsg/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rpmsg/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rpmsg/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rpmsg/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rpmsg/qcom_smd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rpmsg/qcom_smd.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/rpmsg/rpmsg_char.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rpmsg/rpmsg_char.c</a></td><td class='right'>584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rpmsg/rpmsg_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rpmsg/rpmsg_core.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rpmsg/rpmsg_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rpmsg/rpmsg_internal.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rpmsg/virtio_rpmsg_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rpmsg/virtio_rpmsg_bus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/Kconfig</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/interface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/interface.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-armada38x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-armada38x.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-au1xxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-au1xxx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-bfin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-bfin.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-bq32k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-bq32k.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-cmos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-cmos.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-dev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-dm355evm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-dm355evm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-ds1307.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-ds1307.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-ds1374.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-ds1374.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-ds3232.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-ds3232.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-gemini.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-gemini.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-imxdi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-imxdi.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-jz4740.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-jz4740.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-lib.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-ls1x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-ls1x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-m48t86.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-m48t86.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-mcp795.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-mcp795.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-mxc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-mxc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-omap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-omap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-pcf2127.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-pcf2127.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-pcf85063.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-pcf85063.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/rtc/rtc-r7301.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-r7301.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-rx8010.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-rx8010.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-sh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-sh.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-snvs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-snvs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-starfire.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-starfire.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/rtc/rtc-stm32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-stm32.c</a></td><td class='right'>725</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-sun4v.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-sun4v.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-sun6i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-sun6i.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-tegra.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-tegra.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-tps65910.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-tps65910.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/rtc/rtc-twl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/rtc/rtc-twl.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd_3990_erp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd_3990_erp.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd_devmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd_devmap.c</a></td><td class='right'>614</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd_eckd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd_eckd.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd_eckd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd_eckd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd_eer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd_eer.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd_erp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd_erp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd_fba.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd_fba.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd_genhd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd_genhd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd_int.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd_int.h</a></td><td class='right'>451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd_ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dasd_proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dasd_proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/dcssblk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/dcssblk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/scm_blk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/scm_blk.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/block/xpram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/block/xpram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/con3215.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/con3215.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/con3270.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/con3270.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/fs3270.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/fs3270.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/keyboard.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/keyboard.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/monreader.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/monreader.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/monwriter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/monwriter.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/raw3270.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/raw3270.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/sclp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/sclp.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/sclp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/sclp.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/sclp_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/sclp_cmd.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/sclp_ctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/sclp_ctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/sclp_early.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/sclp_early.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/s390/char/sclp_early_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/sclp_early_core.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/sclp_quiesce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/sclp_quiesce.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/sclp_rw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/sclp_rw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/sclp_tty.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/sclp_tty.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/sclp_vt220.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/sclp_vt220.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/tape_char.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/tape_char.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/tty3270.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/tty3270.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/vmcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/vmcp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/vmlogrdr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/vmlogrdr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/vmur.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/vmur.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/char/zcore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/char/zcore.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/blacklist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/blacklist.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/chp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/chp.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/chp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/chp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/chsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/chsc.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/chsc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/chsc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/cio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/cio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/cmf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/cmf.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/css.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/css.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/css.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/css.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/device.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/device.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/device_fsm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/device_fsm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/device_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/device_ops.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/ioasm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/ioasm.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/qdio_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/qdio_main.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/cio/qdio_thinint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/cio/qdio_thinint.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/s390/crypto/ap_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/ap_asm.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/ap_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/ap_bus.c</a></td><td class='right'>1372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/ap_bus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/ap_bus.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/s390/crypto/ap_card.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/ap_card.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/s390/crypto/ap_debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/ap_debug.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/s390/crypto/ap_queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/ap_queue.c</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/s390/crypto/pkey_api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/pkey_api.c</a></td><td class='right'>1148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_api.c</a></td><td class='right'>1147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_api.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_card.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_card.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_cex2a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_cex2a.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_cex4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_cex4.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_debug.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_error.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_error.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_msgtype50.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_msgtype50.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_msgtype50.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_msgtype50.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_msgtype6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_msgtype6.c</a></td><td class='right'>660</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_msgtype6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_msgtype6.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_pcixcc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_pcixcc.c</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/s390/crypto/zcrypt_queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/crypto/zcrypt_queue.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/net/ctcm_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/net/ctcm_main.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/net/lcs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/net/lcs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/net/netiucv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/net/netiucv.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/net/qeth_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/net/qeth_core.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/net/qeth_core_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/net/qeth_core_main.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/net/qeth_core_mpc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/net/qeth_core_mpc.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/net/qeth_l2_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/net/qeth_l2_main.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/net/qeth_l3_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/net/qeth_l3_main.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/net/qeth_l3_sys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/net/qeth_l3_sys.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/scsi/zfcp_dbf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/scsi/zfcp_dbf.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/scsi/zfcp_dbf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/scsi/zfcp_dbf.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/scsi/zfcp_erp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/scsi/zfcp_erp.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/scsi/zfcp_ext.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/scsi/zfcp_ext.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/scsi/zfcp_fc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/scsi/zfcp_fc.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/scsi/zfcp_fsf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/scsi/zfcp_fsf.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/scsi/zfcp_fsf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/scsi/zfcp_fsf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/scsi/zfcp_reqlist.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/scsi/zfcp_reqlist.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/scsi/zfcp_scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/scsi/zfcp_scsi.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/virtio/kvm_virtio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/virtio/kvm_virtio.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/s390/virtio/virtio_ccw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/s390/virtio/virtio_ccw.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/sbus/char/display7seg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/sbus/char/display7seg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/sbus/char/envctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/sbus/char/envctrl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/sbus/char/flash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/sbus/char/flash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/sbus/char/jsflash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/sbus/char/jsflash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/sbus/char/openprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/sbus/char/openprom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/3w-9xxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/3w-9xxx.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/3w-9xxx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/3w-9xxx.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/3w-sas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/3w-sas.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/3w-sas.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/3w-sas.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/3w-xxxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/3w-xxxx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/3w-xxxx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/3w-xxxx.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/Kconfig</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/NCR5380.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/NCR5380.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/NCR5380.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/NCR5380.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/aachba.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/aachba.c</a></td><td class='right'>1337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/aacraid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/aacraid.h</a></td><td class='right'>706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/commctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/commctrl.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/comminit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/comminit.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/commsup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/commsup.c</a></td><td class='right'>1085</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/dpcsup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/dpcsup.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/linit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/linit.c</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/nark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/nark.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/rkt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/rkt.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/rx.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/sa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/sa.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aacraid/src.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aacraid/src.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/advansys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/advansys.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aic7xxx/aicasm/aicasm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aic7xxx/aicasm/aicasm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/aic94xx/aic94xx_hwi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/aic94xx/aic94xx_hwi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/arcmsr/arcmsr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/arcmsr/arcmsr.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/arcmsr/arcmsr_hba.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/arcmsr/arcmsr_hba.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/arm/cumana_1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/arm/cumana_1.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/arm/oak.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/arm/oak.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/atari_scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/atari_scsi.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/be2iscsi/be.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/be2iscsi/be.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/be2iscsi/be_cmds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/be2iscsi/be_cmds.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/be2iscsi/be_cmds.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/be2iscsi/be_cmds.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/be2iscsi/be_iscsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/be2iscsi/be_iscsi.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/be2iscsi/be_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/be2iscsi/be_main.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/be2iscsi/be_main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/be2iscsi/be_main.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/be2iscsi/be_mgmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/be2iscsi/be_mgmt.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/be2iscsi/be_mgmt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/be2iscsi/be_mgmt.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bfa/bfa_fcs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bfa/bfa_fcs.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bfa/bfa_fcs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bfa/bfa_fcs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bfa/bfa_ioc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bfa/bfa_ioc.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bfa/bfad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bfa/bfad.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bfa/bfad_bsg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bfa/bfad_bsg.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bfa/bfad_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bfa/bfad_drv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bfa/bfad_im.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bfa/bfad_im.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bfa/bfad_im.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bfa/bfad_im.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bfa/bfi_ms.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bfa/bfi_ms.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bnx2fc/bnx2fc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bnx2fc/bnx2fc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bnx2fc/bnx2fc_fcoe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bnx2fc/bnx2fc_fcoe.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bnx2fc/bnx2fc_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bnx2fc/bnx2fc_io.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bnx2fc/bnx2fc_tgt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bnx2fc/bnx2fc_tgt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bnx2i/bnx2i.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bnx2i/bnx2i.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bnx2i/bnx2i_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bnx2i/bnx2i_init.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/bnx2i/bnx2i_iscsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/bnx2i/bnx2i_iscsi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/csiostor/csio_scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/csiostor/csio_scsi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/cxgbi/cxgb3i/cxgb3i.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/cxgbi/cxgb4i/cxgb4i.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/cxgbi/libcxgbi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/cxgbi/libcxgbi.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/cxgbi/libcxgbi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/cxgbi/libcxgbi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/cxlflash/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/cxlflash/common.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/cxlflash/lunmgt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/cxlflash/lunmgt.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/cxlflash/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/cxlflash/main.c</a></td><td class='right'>855</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/cxlflash/main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/cxlflash/main.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/cxlflash/sislite.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/cxlflash/sislite.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/cxlflash/superpipe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/cxlflash/superpipe.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/cxlflash/vlun.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/cxlflash/vlun.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/device_handler/scsi_dh_alua.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/device_handler/scsi_dh_alua.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/device_handler/scsi_dh_emc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/device_handler/scsi_dh_emc.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/device_handler/scsi_dh_hp_sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/device_handler/scsi_dh_hp_sw.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/device_handler/scsi_dh_rdac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/device_handler/scsi_dh_rdac.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/dmx3191d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/dmx3191d.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/dpt_i2o.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/dpt_i2o.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/esas2r/esas2r_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/esas2r/esas2r_init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/esas2r/esas2r_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/esas2r/esas2r_ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/esas2r/esas2r_log.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/esas2r/esas2r_log.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/esas2r/esas2r_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/esas2r/esas2r_main.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/fcoe/fcoe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/fcoe/fcoe.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/fcoe/fcoe_ctlr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/fcoe/fcoe_ctlr.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/fcoe/fcoe_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/fcoe/fcoe_sysfs.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/fnic/fnic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/fnic/fnic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/fnic/fnic_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/fnic/fnic_main.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/fnic/fnic_scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/fnic/fnic_scsi.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/fnic/fnic_trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/fnic/fnic_trace.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/fnic/fnic_trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/fnic/fnic_trace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/fnic/vnic_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/fnic/vnic_dev.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/g_NCR5380.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/g_NCR5380.c</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/scsi/g_NCR5380.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/g_NCR5380.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/scsi/g_NCR5380_mmio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/g_NCR5380_mmio.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/gdth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/gdth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/hisi_sas/hisi_sas.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/hisi_sas/hisi_sas.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/hisi_sas/hisi_sas_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/hisi_sas/hisi_sas_main.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/hisi_sas/hisi_sas_v1_hw.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/hisi_sas/hisi_sas_v2_hw.c</a></td><td class='right'>687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/hosts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/hosts.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/hpsa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/hpsa.c</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/hpsa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/hpsa.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/hptiop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/hptiop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ibmvscsi/ibmvfc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ibmvscsi/ibmvfc.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ibmvscsi/ibmvscsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ibmvscsi/ibmvscsi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ibmvscsi/ibmvscsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ibmvscsi/ibmvscsi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c</a></td><td class='right'>913</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ipr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ipr.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ipr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ipr.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ips.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ips.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ips.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ips.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/isci/host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/isci/host.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/isci/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/isci/init.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/isci/probe_roms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/isci/probe_roms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/isci/remote_node_context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/isci/remote_node_context.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/isci/request.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/isci/request.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/iscsi_tcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/iscsi_tcp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libfc/fc_disc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libfc/fc_disc.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libfc/fc_elsct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libfc/fc_elsct.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libfc/fc_exch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libfc/fc_exch.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libfc/fc_fcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libfc/fc_fcp.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libfc/fc_libfc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libfc/fc_libfc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libfc/fc_lport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libfc/fc_lport.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libfc/fc_rport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libfc/fc_rport.c</a></td><td class='right'>563</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libiscsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libiscsi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libsas/sas_expander.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libsas/sas_expander.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libsas/sas_host_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libsas/sas_host_smp.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libsas/sas_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libsas/sas_init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libsas/sas_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libsas/sas_internal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/libsas/sas_scsi_host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/libsas/sas_scsi_host.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_attr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_attr.c</a></td><td class='right'>793</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_attr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_attr.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_bsg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_bsg.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_bsg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_bsg.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_compat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_compat.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_crtn.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_crtn.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_ct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_ct.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_debugfs.c</a></td><td class='right'>2302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.7%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 82.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_debugfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_debugfs.h</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_disc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_disc.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_els.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_els.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_hbadisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_hbadisc.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_hw.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_hw4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_hw4.h</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_ids.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_ids.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_init.c</a></td><td class='right'>2940</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.9%;'/><td class='rem' style='width: 9.0%;'/><td class='none' style='width: 77.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_logmsg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_logmsg.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_mbox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_mbox.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_mem.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_nl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_nl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_nportdisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_nportdisc.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_nvme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_nvme.c</a></td><td class='right'>2464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_nvme.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_nvme.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_nvmet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_nvmet.c</a></td><td class='right'>1986</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_nvmet.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_nvmet.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_scsi.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_scsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_scsi.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_sli.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_sli.c</a></td><td class='right'>2264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.4%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 82.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_sli.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_sli.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_sli4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_sli4.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_version.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_version.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_vport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_vport.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/lpfc/lpfc_vport.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/lpfc/lpfc_vport.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mac_scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mac_scsi.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/megaraid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/megaraid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/megaraid/megaraid_mm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/megaraid/megaraid_mm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/megaraid/megaraid_sas.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/megaraid/megaraid_sas.h</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/megaraid/megaraid_sas_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/megaraid/megaraid_sas_base.c</a></td><td class='right'>782</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/megaraid/megaraid_sas_fp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/megaraid/megaraid_sas_fp.c</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/megaraid/megaraid_sas_fusion.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/megaraid/megaraid_sas_fusion.c</a></td><td class='right'>1351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/megaraid/megaraid_sas_fusion.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/megaraid/megaraid_sas_fusion.h</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mpt3sas/mpi/mpi2_ioc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mpt3sas/mpt3sas_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mpt3sas/mpt3sas_base.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mpt3sas/mpt3sas_base.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mpt3sas/mpt3sas_base.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mpt3sas/mpt3sas_config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mpt3sas/mpt3sas_config.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mpt3sas/mpt3sas_ctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mpt3sas/mpt3sas_ctl.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mpt3sas/mpt3sas_ctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mpt3sas/mpt3sas_ctl.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mpt3sas/mpt3sas_scsih.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mpt3sas/mpt3sas_scsih.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mpt3sas/mpt3sas_transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mpt3sas/mpt3sas_transport.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mvsas/mv_94xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mvsas/mv_94xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/mvumi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/mvumi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/osd/osd_initiator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/osd/osd_initiator.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/osd/osd_uld.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/osd/osd_uld.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/osst.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/osst.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/pm8001/pm8001_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/pm8001/pm8001_init.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/pm8001/pm8001_sas.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/pm8001/pm8001_sas.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/pmcraid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/pmcraid.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/pmcraid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/pmcraid.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/qedf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/qedf.h</a></td><td class='right'>545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/qedf_attr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/qedf_attr.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/qedf_dbg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/qedf_dbg.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/qedf_dbg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/qedf_dbg.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/qedf_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/qedf_debugfs.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/qedf_els.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/qedf_els.c</a></td><td class='right'>949</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/qedf_fip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/qedf_fip.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/qedf_hsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/qedf_hsi.h</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/qedf_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/qedf_io.c</a></td><td class='right'>2282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/qedf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/qedf_main.c</a></td><td class='right'>3336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedf/qedf_version.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedf/qedf_version.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi.h</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi_dbg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi_dbg.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi_dbg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi_dbg.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi_debugfs.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi_fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi_fw.c</a></td><td class='right'>2379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi_gbl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi_gbl.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi_hsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi_hsi.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi_iscsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi_iscsi.c</a></td><td class='right'>1621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi_iscsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi_iscsi.h</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi_main.c</a></td><td class='right'>2095</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi_sysfs.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/qedi/qedi_version.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qedi/qedi_version.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_attr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_attr.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_bsg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_bsg.c</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_dbg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_dbg.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_def.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_def.h</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_dfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_dfs.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_fw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_fw.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_gbl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_gbl.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_gs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_gs.c</a></td><td class='right'>732</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_init.c</a></td><td class='right'>1783</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_inline.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_inline.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_iocb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_iocb.c</a></td><td class='right'>589</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_isr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_isr.c</a></td><td class='right'>661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_mbx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_mbx.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_mid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_mid.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_mr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_mr.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_nx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_nx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_nx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_nx.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_nx2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_nx2.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_nx2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_nx2.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_os.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_os.c</a></td><td class='right'>822</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_sup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_sup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_target.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_target.c</a></td><td class='right'>2411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 10.0%;'/><td class='none' style='width: 81.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_target.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_target.h</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/qla_tmpl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/qla_tmpl.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/tcm_qla2xxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/tcm_qla2xxx.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla2xxx/tcm_qla2xxx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla2xxx/tcm_qla2xxx.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla4xxx/ql4_def.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla4xxx/ql4_def.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla4xxx/ql4_glbl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla4xxx/ql4_glbl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla4xxx/ql4_isr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla4xxx/ql4_isr.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla4xxx/ql4_mbx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla4xxx/ql4_mbx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla4xxx/ql4_nx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla4xxx/ql4_nx.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/qla4xxx/ql4_os.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/qla4xxx/ql4_os.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi.c</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_debug.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_devinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_devinfo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_dh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_dh.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_error.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_error.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_ioctl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_lib.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_priv.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_sysfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_transport_fc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_transport_fc.c</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_transport_iscsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_transport_iscsi.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_transport_sas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_transport_sas.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_transport_spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_transport_spi.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/scsi_transport_srp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/scsi_transport_srp.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/sd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/sd.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/sd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/sd.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/scsi/sd_zbc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/sd_zbc.c</a></td><td class='right'>648</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ses.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ses.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/sg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/sg.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/smartpqi/smartpqi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/smartpqi/smartpqi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/smartpqi/smartpqi_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/smartpqi/smartpqi_init.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/snic/snic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/snic/snic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/snic/snic_isr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/snic/snic_isr.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/snic/snic_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/snic/snic_main.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/sr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/sr.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/sr_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/sr_ioctl.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/st.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/st.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/storvsc_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/storvsc_drv.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/sun3_scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/sun3_scsi.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/scsi/sun3_scsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/sun3_scsi.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ufs/ufs-qcom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ufs/ufs-qcom.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ufs/ufs-qcom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ufs/ufs-qcom.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ufs/ufs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ufs/ufs.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ufs/ufs_quirks.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ufs/ufs_quirks.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ufs/ufshcd-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ufs/ufshcd-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ufs/ufshcd-pltfrm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ufs/ufshcd-pltfrm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ufs/ufshcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ufs/ufshcd.c</a></td><td class='right'>2021</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.3%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 84.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ufs/ufshcd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ufs/ufshcd.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ufs/ufshci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ufs/ufshci.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/ufs/unipro.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/ufs/unipro.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/virtio_scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/virtio_scsi.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/vmw_pvscsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/vmw_pvscsi.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/vmw_pvscsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/vmw_pvscsi.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/scsi/xen-scsifront.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/scsi/xen-scsifront.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/sh/intc/virq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/sh/intc/virq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/dove/pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/dove/pmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/fsl/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/fsl/guts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/guts.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/qbman/bman.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/qbman/bman.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/qbman/bman_ccsr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/qbman/bman_ccsr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/qbman/bman_portal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/qbman/bman_portal.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/qbman/dpaa_sys.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/qbman/dpaa_sys.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/qbman/qman.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/qbman/qman.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/qbman/qman_ccsr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/qbman/qman_ccsr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/qbman/qman_portal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/qbman/qman_portal.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/qbman/qman_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/qbman/qman_priv.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/qbman/qman_test_api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/qbman/qman_test_api.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/qbman/qman_test_stash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/qbman/qman_test_stash.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/fsl/qe/qe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/fsl/qe/qe.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/mediatek/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/mediatek/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/mediatek/mtk-scpsys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/mediatek/mtk-scpsys.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/qcom/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/qcom/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/qcom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/qcom/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/qcom/mdt_loader.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/qcom/mdt_loader.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/renesas/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/renesas/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/renesas/r8a7743-sysc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/renesas/r8a7743-sysc.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/renesas/r8a7745-sysc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/renesas/r8a7745-sysc.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/renesas/rcar-rst.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/renesas/rcar-rst.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/renesas/rcar-sysc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/renesas/rcar-sysc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/renesas/rcar-sysc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/renesas/rcar-sysc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/renesas/renesas-soc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/renesas/renesas-soc.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/rockchip/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/rockchip/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/rockchip/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/rockchip/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/rockchip/grf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/rockchip/grf.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/rockchip/pm_domains.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/rockchip/pm_domains.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/samsung/exynos-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/samsung/exynos-pmu.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/samsung/exynos5250-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/samsung/exynos5250-pmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/samsung/exynos5420-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/samsung/exynos5420-pmu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/samsung/pm_domains.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/samsung/pm_domains.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/tegra/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/tegra/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/tegra/pmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/tegra/pmc.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/ti/knav_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/ti/knav_dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/ti/knav_qmss_acc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/ti/knav_qmss_acc.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/ti/knav_qmss_queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/ti/knav_qmss_queue.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/soc/ti/wkup_m3_ipc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/ti/wkup_m3_ipc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/zte/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/zte/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/zte/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/zte/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/zte/zx296718_pm_domains.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/zte/zx296718_pm_domains.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/zte/zx2967_pm_domains.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/zte/zx2967_pm_domains.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/soc/zte/zx2967_pm_domains.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/soc/zte/zx2967_pm_domains.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/Kconfig</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/spi/spi-armada-3700.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-armada-3700.c</a></td><td class='right'>922</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-ath79.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-ath79.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-atmel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-atmel.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-axi-spi-engine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-axi-spi-engine.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-bcm-qspi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-bcm-qspi.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-bcm53xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-bcm53xx.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-davinci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-davinci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-dw-mid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-dw-mid.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-dw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-dw.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-dw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-dw.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-ep93xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-ep93xx.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-fsl-dspi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-fsl-dspi.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-fsl-espi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-fsl-espi.c</a></td><td class='right'>728</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-fsl-lib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-fsl-lib.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/spi/spi-fsl-lpspi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-fsl-lpspi.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-fsl-spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-fsl-spi.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-imx.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-jcore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-jcore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/spi/spi-lantiq-ssc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-lantiq-ssc.c</a></td><td class='right'>983</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-mpc52xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-mpc52xx.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-mt65xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-mt65xx.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-omap2-mcspi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-omap2-mcspi.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-orion.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-orion.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-ppc4xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-ppc4xx.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-pxa2xx-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-pxa2xx-pci.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-pxa2xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-pxa2xx.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-pxa2xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-pxa2xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-rockchip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-rockchip.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-rspi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-rspi.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-s3c64xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-s3c64xx.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-sh-msiof.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-sh-msiof.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-sun4i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-sun4i.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-sun6i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-sun6i.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-ti-qspi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-ti-qspi.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-topcliff-pch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-topcliff-pch.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi-xlp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi-xlp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spi.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/spi/spidev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/spi/spidev.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/ssb/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ssb/pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/TODO</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/ashmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/ashmem.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/ion/ion-ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/ion/ion-ioctl.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/ion/ion.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/ion/ion.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/ion/ion_cma_heap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/ion/ion_cma_heap.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/ion/ion_dummy_driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/ion/ion_dummy_driver.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/ion/ion_heap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/ion/ion_heap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/ion/ion_of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/ion/ion_of.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/ion/ion_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/ion/ion_priv.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/ion/ion_system_heap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/ion/ion_system_heap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/lowmemorykiller.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/lowmemorykiller.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/android/uapi/ion_test.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/android/uapi/ion_test.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/bcm2835-audio/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/bcm2835-audio/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/bcm2835-audio/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/bcm2835-audio/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/bcm2835-audio/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/bcm2835-audio/TODO</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/bcm2835-audio/bcm2835-ctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/bcm2835-audio/bcm2835-ctl.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/bcm2835-audio/bcm2835-pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/bcm2835-audio/bcm2835-pcm.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/bcm2835-audio/bcm2835-vchiq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/bcm2835-audio/bcm2835-vchiq.c</a></td><td class='right'>912</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/bcm2835-audio/bcm2835.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/bcm2835-audio/bcm2835.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/bcm2835-audio/bcm2835.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/bcm2835-audio/bcm2835.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/bcm2835-audio/vc_vchi_audioserv_defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/bcm2835-audio/vc_vchi_audioserv_defs.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/comedi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/comedi.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/comedi_buf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/comedi_buf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/comedi_compat32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/comedi_compat32.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/comedi_fops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/comedi_fops.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/comedi_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/comedi_internal.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/comedi_pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/comedi_pci.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/comedi_pcmcia.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/comedi_pcmcia.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/comedi_pcmcia.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/comedi_pcmcia.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/comedi_usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/comedi_usb.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/comedidev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/comedidev.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/addi_apci_3501.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/addi_apci_3501.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/addi_watchdog.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/addi_watchdog.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/adl_pci9118.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/adl_pci9118.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/cb_pcidas64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/cb_pcidas64.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/cb_pcidda.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/cb_pcidda.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/comedi_8254.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/comedi_8254.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/comedi_isadma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/comedi_isadma.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/comedi_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/comedi_test.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/daqboard2000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/daqboard2000.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/dmm32at.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/dmm32at.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/dt2801.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/dt2801.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/dt2814.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/dt2814.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/dt2815.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/dt2815.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/dyna_pci10xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/dyna_pci10xx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/mite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/mite.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/mite.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/mite.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_660x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_660x.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_670x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_670x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_at_a2150.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_at_a2150.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_at_ao.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_at_ao.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_labpc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_labpc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_mio_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_mio_common.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_pcidio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_pcidio.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_pcimio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_pcimio.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_stc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_stc.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_tio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_tio.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_tio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_tio.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/ni_tio_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/ni_tio_internal.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/pcl818.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/pcl818.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/drivers/s626.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/drivers/s626.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/kcomedilib/kcomedilib_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/kcomedilib/kcomedilib_main.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/comedi/proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/comedi/proc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/TODO</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_cls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_cls.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_cls.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_cls.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_driver.c</a></td><td class='right'>558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_driver.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_mgmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_mgmt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_neo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_neo.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_neo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_neo.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_sysfs.c</a></td><td class='right'>703</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_sysfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_sysfs.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_tty.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_tty.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_tty.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_tty.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/dgnc_utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/dgnc_utils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/dgnc/digi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/dgnc/digi.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/emxx_udc/emxx_udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/emxx_udc/emxx_udc.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_agm1264k-fl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_agm1264k-fl.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_hx8340bn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_hx8340bn.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_hx8347d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_hx8347d.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_hx8353d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_hx8353d.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ili9163.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ili9163.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ili9320.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ili9320.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ili9325.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ili9325.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ili9341.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ili9341.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ili9481.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ili9481.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ili9486.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ili9486.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_pcd8544.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_pcd8544.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ra8875.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ra8875.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_s6d02a1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_s6d02a1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_s6d1121.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_s6d1121.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ssd1289.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ssd1289.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ssd1305.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ssd1305.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ssd1306.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ssd1306.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ssd1325.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ssd1325.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ssd1331.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ssd1331.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_ssd1351.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_ssd1351.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_st7735r.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_st7735r.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_st7789v.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_st7789v.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_tls8204.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_tls8204.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_uc1611.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_uc1611.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fb_watterott.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fb_watterott.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fbtft-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fbtft-core.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fbtft-io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fbtft-io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fbtft-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fbtft-sysfs.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fbtft.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fbtft.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/fbtft_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/fbtft_device.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/flexfb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/flexfb.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fbtft/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fbtft/internal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/dpbp-cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/dpbp-cmd.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/dpbp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/dpbp.c</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/dpcon-cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/dpcon-cmd.h</a> (renamed from drivers/staging/fsl-mc/include/dpcon-cmd.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/dpmcp-cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/dpmcp-cmd.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/dpmcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/dpmcp.c</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/dpmcp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/dpmcp.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/dpmng-cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/dpmng-cmd.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/dpmng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/dpmng.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/dprc-cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/dprc-cmd.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/dprc-driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/dprc-driver.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/dprc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/dprc.c</a></td><td class='right'>665</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/fsl-mc-allocator.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/fsl-mc-bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/fsl-mc-bus.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/fsl-mc-msi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/fsl-mc-msi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/fsl-mc-private.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/fsl-mc-private.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/mc-io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/mc-io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/bus/mc-sys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/bus/mc-sys.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/fsl-mc/include/dpbp-cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/include/dpbp-cmd.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/include/dpbp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/include/dpbp.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/include/dpmng.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/include/dpmng.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/include/dprc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/include/dprc.h</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/include/mc-bus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/include/mc-bus.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/include/mc-cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/include/mc-cmd.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/include/mc-sys.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/include/mc-sys.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fsl-mc/include/mc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fsl-mc/include/mc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/fwserial/fwserial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/fwserial/fwserial.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/gdm724x/gdm_endian.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/gdm724x/gdm_endian.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/gdm724x/gdm_endian.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/gdm724x/gdm_endian.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/gdm724x/gdm_lte.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/gdm724x/gdm_lte.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/gdm724x/gdm_lte.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/gdm724x/gdm_lte.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/gdm724x/gdm_tty.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/gdm724x/gdm_tty.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/gdm724x/hci_packet.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/gdm724x/hci_packet.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/gdm724x/netlink_k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/gdm724x/netlink_k.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/arche-apb-ctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/arche-apb-ctrl.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/arche-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/arche-platform.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/arche_platform.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/arche_platform.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/arpc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/arpc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/audio_codec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/audio_codec.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/audio_codec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/audio_codec.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/audio_gb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/audio_gb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/audio_manager.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/audio_manager.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/audio_manager_module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/audio_manager_module.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/audio_manager_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/audio_manager_sysfs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/audio_module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/audio_module.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/audio_topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/audio_topology.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/authentication.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/authentication.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/bootrom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/bootrom.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/camera.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/camera.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/connection.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/connection.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/control.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/control.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/control.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/control.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/core.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/es2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/es2.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/fw-download.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/fw-download.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/gbphy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/gbphy.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/gpio.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/greybus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/greybus.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/greybus_protocols.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/greybus_protocols.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/greybus_trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/greybus_trace.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/hd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/hd.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/interface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/interface.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/interface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/interface.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/log.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/loopback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/loopback.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/operation.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/operation.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/operation.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/operation.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/pwm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/pwm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/sdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/sdio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/svc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/svc.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/svc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/svc.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/svc_watchdog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/svc_watchdog.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/greybus/timesync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/timesync.c</a></td><td class='right'>1357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.6%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/greybus/timesync.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/timesync.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/greybus/timesync_platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/timesync_platform.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/tools/loopback_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/tools/loopback_test.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/uart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/uart.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/greybus/vibrator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/greybus/vibrator.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/gs_fpgaboot/gs_fpgaboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/gs_fpgaboot/gs_fpgaboot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/gs_fpgaboot/gs_fpgaboot.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/gs_fpgaboot/gs_fpgaboot.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/Documentation/README.act2000?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/Documentation/README.act2000</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/Documentation/README.icn?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/Documentation/README.icn</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/Documentation/README.pcbit?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/Documentation/README.pcbit</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/Documentation/README.sc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/Documentation/README.sc</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/TODO</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/act2000/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/act2000/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/act2000/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/act2000/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/act2000/act2000.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/act2000/act2000.h</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/act2000/act2000_isa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/act2000/act2000_isa.c</a></td><td class='right'>443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/act2000/act2000_isa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/act2000/act2000_isa.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/act2000/capi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/act2000/capi.c</a></td><td class='right'>1182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.2%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/act2000/capi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/act2000/capi.h</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/act2000/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/act2000/module.c</a></td><td class='right'>814</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/icn/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/icn/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/icn/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/icn/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/icn/icn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/icn/icn.c</a></td><td class='right'>1697</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.2%;'/><td class='none' style='width: 86.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/icn/icn.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/icn/icn.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/callbacks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/callbacks.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/callbacks.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/callbacks.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/capi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/capi.c</a></td><td class='right'>647</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/capi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/capi.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/drv.c</a></td><td class='right'>1071</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/edss1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/edss1.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/edss1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/edss1.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/layer2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/layer2.c</a></td><td class='right'>710</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/layer2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/layer2.h</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/module.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/i4l/pcbit/pcbit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/i4l/pcbit/pcbit.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2583?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2583</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/iio/Documentation/sysfs-bus-iio-light-tsl2583?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/Documentation/sysfs-bus-iio-light-tsl2583</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/TODO</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/accel/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/accel/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/accel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/accel/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/accel/adis16201_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/accel/adis16201_core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/accel/adis16203_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/accel/adis16203_core.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/accel/adis16209_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/accel/adis16209_core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/iio/accel/sca3000.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/accel/sca3000.h</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/iio/accel/sca3000_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/accel/sca3000_core.c</a></td><td class='right'>1210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.4%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/iio/accel/sca3000_ring.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/accel/sca3000_ring.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/adc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/adc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/adc/ad7192.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/adc/ad7192.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/adc/ad7280a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/adc/ad7280a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/iio/adc/ad7606.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/adc/ad7606.c</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/adc/ad7606.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/adc/ad7606.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/iio/adc/ad7606_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/adc/ad7606_core.c</a></td><td class='right'>603</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/adc/ad7606_par.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/adc/ad7606_par.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/iio/adc/ad7606_ring.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/adc/ad7606_ring.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/adc/ad7606_spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/adc/ad7606_spi.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/adc/ad7780.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/adc/ad7780.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/adc/ad7816.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/adc/ad7816.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/addac/adt7316-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/addac/adt7316-i2c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/addac/adt7316.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/addac/adt7316.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/cdc/ad7150.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/cdc/ad7150.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/cdc/ad7152.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/cdc/ad7152.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/cdc/ad7746.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/cdc/ad7746.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/frequency/ad9832.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/frequency/ad9832.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/frequency/ad9832.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/frequency/ad9832.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/frequency/ad9834.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/frequency/ad9834.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/impedance-analyzer/ad5933.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/impedance-analyzer/ad5933.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/light/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/light/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/light/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/light/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/light/isl29028.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/light/isl29028.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/iio/light/tsl2583.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/light/tsl2583.c</a></td><td class='right'>963</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.5%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/meter/ade7753.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/meter/ade7753.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/meter/ade7753.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/meter/ade7753.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/meter/ade7754.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/meter/ade7754.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/meter/ade7754.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/meter/ade7754.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/meter/ade7758.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/meter/ade7758.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/meter/ade7758_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/meter/ade7758_core.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/meter/ade7758_ring.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/meter/ade7758_ring.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/meter/ade7759.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/meter/ade7759.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/meter/ade7759.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/meter/ade7759.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/meter/ade7854.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/meter/ade7854.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/meter/ade7854.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/meter/ade7854.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/iio/ring_hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/ring_hw.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/iio/trigger/iio-trig-bfin-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/iio/trigger/iio-trig-bfin-timer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/ks7010/ks7010_sdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/ks7010/ks7010_sdio.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/ks7010/ks7010_sdio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/ks7010/ks7010_sdio.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/ks7010/ks_hostif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/ks7010/ks_hostif.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/ks7010/ks_hostif.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/ks7010/ks_hostif.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/ks7010/ks_wlan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/ks7010/ks_wlan.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/ks7010/ks_wlan_ioctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/ks7010/ks_wlan_ioctl.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/ks7010/ks_wlan_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/ks7010/ks_wlan_net.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/ks7010/michael_mic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/ks7010/michael_mic.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/ks7010/michael_mic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/ks7010/michael_mic.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/curproc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/curproc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/libcfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/libcfs.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/libcfs_private.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/libcfs_string.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/lnet/lib-lnet.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/lnet/lib-lnet.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/lnet/lib-types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/lnet/lib-types.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/lnet/lnetst.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/lnet/lnetst.h</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/lnet/socklnd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/lnet/socklnd.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/include/linux/lnet/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/include/linux/lnet/types.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/debug.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/fail.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/fail.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/hash.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/libcfs_lock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/libcfs_lock.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/libcfs_mem.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/libcfs_string.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/libcfs_string.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/linux/linux-module.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/module.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/prng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/prng.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/tracefile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/tracefile.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/tracefile.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/tracefile.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/libcfs/workitem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/libcfs/workitem.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/lnet/acceptor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/lnet/acceptor.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/lnet/api-ni.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/lnet/api-ni.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/lnet/lib-me.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/lnet/lib-me.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/lnet/lib-move.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/lnet/lib-move.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/lnet/lib-msg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/lnet/lib-msg.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/lnet/lib-ptl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/lnet/lib-ptl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/lnet/lib-socket.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/lnet/lib-socket.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/lnet/net_fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/lnet/net_fault.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/lnet/nidstrings.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/lnet/nidstrings.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/lnet/router.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/lnet/router.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/lnet/router_proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/lnet/router_proc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/brw_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/brw_test.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/conctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/conctl.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/conrpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/conrpc.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/conrpc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/conrpc.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/console.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/console.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/console.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/console.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/framework.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/framework.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/module.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/ping_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/ping_test.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/rpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/rpc.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/rpc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/rpc.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/selftest.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/selftest.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lnet/selftest/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lnet/selftest/timer.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/fid/fid_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/fid/fid_lib.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/fid/fid_request.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/fid/fid_request.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/fid/lproc_fid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/fid/lproc_fid.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/fld/fld_cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/fld/fld_cache.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/fld/fld_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/fld/fld_internal.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/fld/fld_request.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/fld/fld_request.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/cl_object.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/cl_object.h</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/interval_tree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/interval_tree.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/llog_swab.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/llog_swab.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lprocfs_status.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lprocfs_status.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lu_object.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lu_object.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre/lustre_idl.h</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre/lustre_user.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre/lustre_user.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_compat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_compat.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_dlm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_dlm.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_fid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_fid.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_fld.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_fld.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_ha.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_ha.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_import.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_import.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_lib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_lib.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_lmv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_lmv.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_log.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_log.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_mdc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_mdc.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_net.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_net.h</a></td><td class='right'>906</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_nrs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_nrs.h</a></td><td class='right'>717</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_obdo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_obdo.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_req_layout.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_req_layout.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_sec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_sec.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/lustre_swab.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/lustre_swab.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/obd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/obd.h</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/obd_class.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/obd_class.h</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/obd_support.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/obd_support.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/include/seq_range.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/include/seq_range.h</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ldlm/ldlm_extent.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ldlm/ldlm_flock.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ldlm/ldlm_internal.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ldlm/ldlm_lib.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ldlm/ldlm_lock.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ldlm/ldlm_plain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ldlm/ldlm_plain.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ldlm/ldlm_pool.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ldlm/ldlm_request.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ldlm/ldlm_request.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ldlm/ldlm_resource.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/dcache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/dcache.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/dir.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/file.c</a></td><td class='right'>1044</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/glimpse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/glimpse.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/lcommon_cl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/lcommon_cl.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/lcommon_misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/lcommon_misc.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/llite_close.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/llite_close.c</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/llite_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/llite_internal.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/llite_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/llite_lib.c</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/llite_mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/llite_mmap.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/llite_nfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/llite_nfs.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/lproc_llite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/lproc_llite.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/namei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/namei.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/range_lock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/range_lock.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/range_lock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/range_lock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/rw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/rw.c</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/rw26.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/rw26.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/statahead.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/statahead.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/super25.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/super25.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/symlink.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/vvp_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/vvp_dev.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/vvp_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/vvp_internal.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/vvp_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/vvp_io.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/vvp_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/vvp_object.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/vvp_page.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/vvp_page.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/vvp_req.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/vvp_req.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/xattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/xattr.c</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/xattr_cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/xattr_cache.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/llite/xattr_security.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/llite/xattr_security.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lmv/lmv_intent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lmv/lmv_intent.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lmv/lmv_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lmv/lmv_internal.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lmv/lmv_obd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lmv/lmv_obd.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lmv/lproc_lmv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lmv/lproc_lmv.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_cl_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_cl_internal.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_dev.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_ea.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_ea.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_internal.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_io.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_lock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_lock.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_merge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_merge.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_obd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_obd.c</a></td><td class='right'>722</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_object.c</a></td><td class='right'>723</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_pack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_pack.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_page.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_page.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_pool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_pool.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lov_request.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lov_request.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lovsub_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lovsub_dev.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/lov/lovsub_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/lov/lovsub_object.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/mdc/lproc_mdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/mdc/lproc_mdc.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/mdc/mdc_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/mdc/mdc_internal.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/mdc/mdc_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/mdc/mdc_lib.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/mdc/mdc_locks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/mdc/mdc_locks.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/mdc/mdc_reint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/mdc/mdc_reint.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/mdc/mdc_request.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/mdc/mdc_request.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/mgc/mgc_request.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/mgc/mgc_request.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/cl_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/cl_internal.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/cl_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/cl_io.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/cl_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/cl_object.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/cl_page.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/cl_page.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/genops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/genops.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/linux/linux-module.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/llog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/llog.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/llog_obd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/llog_obd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/llog_swab.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/llog_swab.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/lprocfs_status.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/lu_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/lu_object.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/obd_config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/obd_config.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/obd_mount.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/obd_mount.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdclass/obdo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdclass/obdo.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/obdecho/echo_client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/obdecho/echo_client.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/osc/lproc_osc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/osc/lproc_osc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/osc/osc_cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/osc/osc_cache.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/osc/osc_cl_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/osc/osc_cl_internal.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/osc/osc_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/osc/osc_dev.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/osc/osc_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/osc/osc_internal.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/osc/osc_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/osc/osc_io.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/osc/osc_lock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/osc/osc_lock.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/osc/osc_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/osc/osc_object.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/osc/osc_page.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/osc/osc_page.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/osc/osc_quota.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/osc/osc_quota.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/osc/osc_request.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/osc/osc_request.c</a></td><td class='right'>753</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/client.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/connection.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/connection.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/events.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/events.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/import.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/import.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/layout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/layout.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/llog_client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/llog_client.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/niobuf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/niobuf.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/nrs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/nrs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/pack_generic.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/pers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/pers.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/recover.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/recover.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/sec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/sec.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/sec_plain.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/service.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/service.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/lustre/ptlrpc/wiretest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/lustre/ptlrpc/wiretest.c</a></td><td class='right'>604</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/lustre/sysfs-fs-lustre?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/lustre/sysfs-fs-lustre</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/bcm2048/radio-bcm2048.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/bcm2048/radio-bcm2048.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/bcm2048/radio-bcm2048.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/bcm2048/radio-bcm2048.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/media/cec/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/cec/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/media/cec/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/cec/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/media/cec/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/cec/TODO</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/cxd2099/cxd2099.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/cxd2099/cxd2099.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/davinci_vpfe/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/davinci_vpfe/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/davinci_vpfe/dm365_resizer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/davinci_vpfe/dm365_resizer.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/davinci_vpfe/dm365_resizer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/davinci_vpfe/dm365_resizer.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/davinci_vpfe/vpfe_video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/davinci_vpfe/vpfe_video.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/davinci_vpfe/vpfe_video.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/davinci_vpfe/vpfe_video.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/lirc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/lirc/Kconfig</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/lirc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/lirc/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/media/lirc/lirc_bt829.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/lirc/lirc_bt829.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/media/lirc/lirc_imon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/lirc/lirc_imon.c</a></td><td class='right'>978</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.6%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/media/lirc/lirc_parallel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/lirc/lirc_parallel.c</a></td><td class='right'>741</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/media/lirc/lirc_parallel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/lirc/lirc_parallel.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/lirc/lirc_sasem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/lirc/lirc_sasem.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/media/lirc/lirc_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/lirc/lirc_serial.c</a></td><td class='right'>1130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.8%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/lirc/lirc_sir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/lirc/lirc_sir.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/lirc/lirc_zilog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/lirc/lirc_zilog.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/omap4iss/iss_csi2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/omap4iss/iss_csi2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/omap4iss/iss_video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/omap4iss/iss_video.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/TODO</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/bcm2835-camera.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/bcm2835-camera.c</a></td><td class='right'>2024</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/bcm2835-camera.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/bcm2835-camera.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/controls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/controls.c</a></td><td class='right'>1335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/mmal-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/mmal-common.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/mmal-encodings.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/mmal-encodings.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/mmal-msg-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/mmal-msg-common.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/mmal-msg-format.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/mmal-msg-format.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/mmal-msg-port.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/mmal-msg-port.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/mmal-msg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/mmal-msg.h</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/mmal-parameters.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/mmal-parameters.h</a></td><td class='right'>689</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/mmal-vchiq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/mmal-vchiq.c</a></td><td class='right'>1916</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/platform/bcm2835/mmal-vchiq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/platform/bcm2835/mmal-vchiq.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/media/pulse8-cec/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/pulse8-cec/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/media/pulse8-cec/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/pulse8-cec/TODO</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/s5p-cec/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/s5p-cec/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/s5p-cec/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/s5p-cec/TODO</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/s5p-cec/exynos_hdmi_cec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/s5p-cec/exynos_hdmi_cec.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/s5p-cec/s5p_cec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/s5p-cec/s5p_cec.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/st-cec/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/st-cec/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/media/st-cec/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/st-cec/TODO</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/media/st-cec/stih-cec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/media/st-cec/stih-cec.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/most/aim-network/networking.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/most/aim-network/networking.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/most/hdm-dim2/dim2_hdm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/most/hdm-dim2/dim2_hdm.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/most/hdm-i2c/hdm_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/most/hdm-i2c/hdm_i2c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/most/hdm-usb/hdm_usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/most/hdm-usb/hdm_usb.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/most/mostcore/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/most/mostcore/core.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/netlogic/xlr_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/netlogic/xlr_net.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/nvec/nvec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/nvec/nvec.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/nvec/nvec_power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/nvec/nvec_power.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/nvec/nvec_ps2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/nvec/nvec_ps2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/octeon/ethernet-rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/octeon/ethernet-rx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/octeon/ethernet-tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/octeon/ethernet-tx.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/octeon/ethernet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/octeon/ethernet.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/octeon/octeon-ethernet.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/octeon/octeon-ethernet.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/olpc_dcon/olpc_dcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/olpc_dcon/olpc_dcon.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_ap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_ap.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_cmd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_efuse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_efuse.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_ieee80211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_ieee80211.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_ioctl_set.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_led.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_mlme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_mlme.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_mlme_ext.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_pwrctrl.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_recv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_recv.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_security.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_security.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_sta_mgt.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_wlan_util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_wlan_util.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/core/rtw_xmit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/core/rtw_xmit.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/hal/bb_cfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/hal/bb_cfg.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/hal/odm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/hal/odm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/hal/phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/hal/phy.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/hal/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/hal/rf.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/hal/rf_cfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/hal/rf_cfg.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/hal/rtl8188eu_led.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/hal/usb_halinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/hal/usb_halinit.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/drv_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/drv_types.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/hal_intf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/hal_intf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/odm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/odm.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/osdep_intf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/osdep_intf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/osdep_service.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/osdep_service.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/recv_osdep.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/recv_osdep.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/rtl8188e_hal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/rtl8188e_hal.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/rtl8188e_recv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/rtl8188e_recv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/rtw_debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/rtw_debug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/rtw_led.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/rtw_led.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/rtw_mlme.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/rtw_mlme.h</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/rtw_recv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/rtw_recv.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/rtw_security.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/rtw_security.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/usb_ops_linux.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/usb_ops_linux.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/wifi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/wifi.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/include/xmit_osdep.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/include/xmit_osdep.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/os_dep/ioctl_linux.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/os_dep/mon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/os_dep/mon.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/os_dep/os_intfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/os_dep/os_intfs.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/os_dep/osdep_service.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/os_dep/osdep_service.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/os_dep/recv_linux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/os_dep/recv_linux.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/os_dep/rtw_android.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/os_dep/rtw_android.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/os_dep/usb_intf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/os_dep/usb_intf.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8188eu/os_dep/xmit_linux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8188eu/os_dep/xmit_linux.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/dot11d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/dot11d.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/dot11d.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/dot11d.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/rtl8192e/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/rtl8192e/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/rtl8192e/rtl_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/rtl8192e/rtl_core.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/rtl8192e/rtl_dm.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/rtl819x_BAProc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/rtl819x_BAProc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/rtl819x_HTProc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/rtl819x_HTProc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/rtl819x_TSProc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/rtl819x_TSProc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/rtllib_rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/rtllib_rx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192e/rtllib_softmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192e/rtllib_softmac.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/ieee80211.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/ieee80211.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/ieee80211_module.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r8180_93cx6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r8180_93cx6.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r8180_93cx6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r8180_93cx6.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r8190_rtl8256.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r8190_rtl8256.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r8190_rtl8256.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r8190_rtl8256.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r8192U.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r8192U.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r8192U_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r8192U_core.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r8192U_hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r8192U_hw.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r8192U_wx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r8192U_wx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r819xU_cmdpkt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r819xU_cmdpkt.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r819xU_cmdpkt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r819xU_cmdpkt.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r819xU_firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r819xU_firmware.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8192u/r819xU_phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8192u/r819xU_phy.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/hal_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/hal_init.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/ieee80211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/ieee80211.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/ieee80211.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/ieee80211.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/mlme_linux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/mlme_linux.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/osdep_service.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/osdep_service.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl8712_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl8712_cmd.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl8712_event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl8712_event.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl8712_hal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl8712_hal.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl8712_led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl8712_led.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl8712_recv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl8712_recv.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl8712_recv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl8712_recv.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl8712_xmit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl8712_xmit.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl8712_xmit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl8712_xmit.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_cmd.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_cmd.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_event.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_ioctl_linux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_ioctl_linux.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_ioctl_set.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_ioctl_set.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_mlme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_mlme.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_mlme.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_mlme.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_mp_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_mp_ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_pwrctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_pwrctrl.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_recv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_recv.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_security.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_security.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_xmit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_xmit.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/rtl871x_xmit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/rtl871x_xmit.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/usb_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/usb_ops.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/usb_ops_linux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/usb_ops_linux.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/wifi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/wifi.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rtl8712/wlan_bssdef.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rtl8712/wlan_bssdef.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/ms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/ms.c</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/ms.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/ms.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/rtsx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/rtsx.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/rtsx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/rtsx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/rtsx_card.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/rtsx_card.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/rtsx_card.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/rtsx_card.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/rtsx_chip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/rtsx_chip.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/rtsx_chip.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/rtsx_chip.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/rtsx_scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/rtsx_scsi.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/rtsx_scsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/rtsx_scsi.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/rtsx_sys.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/rtsx_sys.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/rtsx_transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/rtsx_transport.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/rtsx_transport.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/rtsx_transport.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/sd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/sd.c</a></td><td class='right'>813</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/sd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/sd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/spi.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/xd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/xd.c</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/rts5208/xd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/rts5208/xd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/skein/skein_api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/skein/skein_api.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/skein/skein_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/skein/skein_base.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/skein/skein_base.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/skein/skein_base.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/skein/skein_block.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/skein/skein_block.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/skein/skein_block.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/skein/skein_block.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/skein/skein_iv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/skein/skein_iv.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/skein/threefish_block.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/skein/threefish_block.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/slicoss/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/slicoss/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/slicoss/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/slicoss/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/slicoss/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/slicoss/README</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/slicoss/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/slicoss/TODO</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/slicoss/slic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/slicoss/slic.h</a></td><td class='right'>573</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/slicoss/slichw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/slicoss/slichw.h</a></td><td class='right'>652</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/slicoss/slicoss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/slicoss/slicoss.c</a></td><td class='right'>3132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 24.4%;'/><td class='none' style='width: 75.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_chip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_chip.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_chip.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_chip.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_display.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_display.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_display.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_dvi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_dvi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_help.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_help.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_help.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_help.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_hwi2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_hwi2c.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_mode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_mode.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_power.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_power.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_power.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_sii164.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_sii164.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_swi2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_swi2c.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/ddk750_swi2c.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/ddk750_swi2c.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/sm750.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/sm750.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/sm750.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/sm750.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/sm750_accel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/sm750_accel.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/sm750_accel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/sm750_accel.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/sm750_cursor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/sm750_cursor.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/sm750_cursor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/sm750_cursor.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/sm750fb/sm750_hw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/sm750fb/sm750_hw.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/TODO</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/fakekey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/fakekey.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/i18n.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/i18n.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/kobjects.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/kobjects.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/main.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/selection.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/selection.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/serialio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/serialio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_acntpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_acntpc.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_acntsa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_acntsa.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_apollo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_apollo.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_audptr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_audptr.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_bns.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_bns.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_decext.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_decext.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_decpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_decpc.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_dectlk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_dectlk.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_dtlk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_dtlk.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_dtlk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_dtlk.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_dummy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_dummy.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_keypc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_keypc.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_ltlk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_ltlk.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_soft.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_soft.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_spkout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_spkout.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/speakup_txprt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/speakup_txprt.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/spk_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/spk_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/spk_priv_keyinfo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/spk_priv_keyinfo.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/spk_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/spk_types.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/synth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/synth.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/thread.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/thread.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/speakup/varhandlers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/speakup/varhandlers.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/include/channel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/include/channel.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/include/iochannel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/include/iochannel.h</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/include/visorbus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/include/visorbus.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/visorbus/controlvmchannel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/visorbus/controlvmchannel.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/visorbus/vbuschannel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/visorbus/vbuschannel.h</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/visorbus/visorbus_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/visorbus/visorbus_main.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/visorbus/visorbus_private.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/visorbus/visorbus_private.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/visorbus/visorchannel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/visorbus/visorchannel.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/visorbus/visorchipset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/visorbus/visorchipset.c</a></td><td class='right'>1052</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/visorbus/vmcallinterface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/visorbus/vmcallinterface.h</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/visorhba/visorhba_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/visorhba/visorhba_main.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/visorinput/visorinput.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/visorinput/visorinput.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/unisys/visornic/visornic_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/unisys/visornic/visornic_main.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchi/TODO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchi/TODO</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchi/connections/connection.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchi/connections/connection.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchi/message_drivers/message.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchi/message_drivers/message.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchi/vchi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchi/vchi.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchi/vchi_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchi/vchi_common.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c</a></td><td class='right'>753</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vme/devices/vme_pio2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vme/devices/vme_pio2.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vme/devices/vme_pio2_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vme/devices/vme_pio2_core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vme/devices/vme_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vme/devices/vme_user.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/baseband.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/baseband.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/baseband.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/baseband.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/card.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/card.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/card.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/card.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/channel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/channel.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/channel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/channel.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/desc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/desc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/device.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/device_cfg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/device_cfg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/device_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/device_main.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/dpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/dpc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/dpc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/dpc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/key.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/key.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/key.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/key.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/mac.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/mac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/mac.h</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/power.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/power.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/power.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/rf.c</a></td><td class='right'>718</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/rf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/rf.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/rxtx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/rxtx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/rxtx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/rxtx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/srom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/srom.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/srom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/srom.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/tmacro.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/tmacro.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6655/upc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6655/upc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/baseband.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/baseband.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/card.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/card.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/card.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/card.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/channel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/channel.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/dpc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/dpc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/firmware.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/firmware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/firmware.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/int.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/int.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/int.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/int.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/key.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/key.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/key.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/key.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/mac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/mac.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/mac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/mac.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/main_usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/main_usb.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/power.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/power.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/rf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/rf.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/rf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/rf.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/rxtx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/rxtx.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/rxtx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/rxtx.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/usbpipe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/usbpipe.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/usbpipe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/usbpipe.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/wcmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/wcmd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/vt6656/wcmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/vt6656/wcmd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wilc1000/coreconfigurator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wilc1000/coreconfigurator.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wilc1000/host_interface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wilc1000/host_interface.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wilc1000/host_interface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wilc1000/host_interface.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wilc1000/linux_mon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wilc1000/linux_mon.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wilc1000/linux_wlan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wilc1000/linux_wlan.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wilc1000/wilc_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wilc1000/wilc_debugfs.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wilc1000/wilc_sdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wilc1000/wilc_sdio.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wilc1000/wilc_spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wilc1000/wilc_spi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wilc1000/wilc_wfi_cfgoperations.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wilc1000/wilc_wfi_netdevice.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wilc1000/wilc_wfi_netdevice.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wilc1000/wilc_wlan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wilc1000/wilc_wlan.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/cfg80211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/cfg80211.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/hfa384x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/hfa384x.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/hfa384x_usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/hfa384x_usb.c</a></td><td class='right'>2480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.9%;'/><td class='rem' style='width: 9.4%;'/><td class='none' style='width: 80.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211conv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211conv.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211conv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211conv.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211hdr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211hdr.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211ioctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211ioctl.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211metadef.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211metadef.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211mgmt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211mgmt.h</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211msg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211msg.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211netdev.c</a></td><td class='right'>659</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211netdev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211netdev.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211req.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211req.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211req.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211req.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/p80211wep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/p80211wep.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/prism2fw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/prism2fw.c</a></td><td class='right'>559</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/prism2mgmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/prism2mgmt.c</a></td><td class='right'>555</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/prism2mgmt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/prism2mgmt.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/prism2mib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/prism2mib.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/wlan-ng/prism2sta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/wlan-ng/prism2sta.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/xgifb/XGI_main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/xgifb/XGI_main.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/xgifb/XGI_main_26.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/xgifb/XGI_main_26.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/xgifb/vb_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/xgifb/vb_init.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/xgifb/vb_setmode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/xgifb/vb_setmode.c</a></td><td class='right'>667</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/xgifb/vb_setmode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/xgifb/vb_setmode.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/xgifb/vb_table.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/xgifb/vb_table.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/staging/xgifb/vb_util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/staging/xgifb/vb_util.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/cxgbit/cxgbit_cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/cxgbit/cxgbit_cm.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/cxgbit/cxgbit_lro.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/cxgbit/cxgbit_lro.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/cxgbit/cxgbit_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/cxgbit/cxgbit_main.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/cxgbit/cxgbit_target.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/cxgbit/cxgbit_target.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_auth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_auth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_auth.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_auth.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_configfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_configfs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_datain_values.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_datain_values.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_datain_values.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_datain_values.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_device.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_erl0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_erl0.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_erl0.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_erl0.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_erl1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_erl1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_erl1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_erl1.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_erl2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_erl2.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_erl2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_erl2.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_login.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_login.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_login.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_login.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_nego.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_nego.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_nego.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_nego.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_nodeattrib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_nodeattrib.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_parameters.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_parameters.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_parameters.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_parameters.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_seq_pdu_list.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_seq_pdu_list.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_tmr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_tmr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_tmr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_tmr.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_tpg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_tpg.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_tpg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_tpg.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_transport.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_util.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/iscsi/iscsi_target_util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/iscsi/iscsi_target_util.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/loopback/tcm_loop.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/loopback/tcm_loop.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/sbp/sbp_target.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/sbp/sbp_target.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_alua.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_alua.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_alua.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_alua.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_configfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_configfs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_device.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_fabric_configfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_fabric_configfs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_file.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_file.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_file.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_iblock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_iblock.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_iblock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_iblock.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_internal.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_pr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_pr.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_pr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_pr.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_pscsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_pscsi.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_pscsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_pscsi.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_rd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_rd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_rd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_rd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_sbc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_sbc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_stat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_stat.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_tmr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_tmr.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_tpg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_tpg.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_transport.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_ua.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_ua.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_user.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_xcopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_xcopy.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/target_core_xcopy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/target_core_xcopy.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/tcm_fc/tcm_fc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/tcm_fc/tcm_fc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/tcm_fc/tfc_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/tcm_fc/tfc_cmd.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/tcm_fc/tfc_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/tcm_fc/tfc_io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/target/tcm_fc/tfc_sess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/target/tcm_fc/tfc_sess.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/clock_cooling.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/clock_cooling.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/cpu_cooling.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/cpu_cooling.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/db8500_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/db8500_thermal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/devfreq_cooling.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/devfreq_cooling.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/imx_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/imx_thermal.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/int340x_thermal/int3400_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/int340x_thermal/int3400_thermal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/intel_pch_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/intel_pch_thermal.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/intel_powerclamp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/intel_powerclamp.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/max77620_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/max77620_thermal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/mtk_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/mtk_thermal.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/qcom-spmi-temp-alarm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/qcom-spmi-temp-alarm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/thermal/rcar_gen3_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/rcar_gen3_thermal.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/rockchip_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/rockchip_thermal.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/samsung/exynos_tmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/samsung/exynos_tmu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/samsung/exynos_tmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/samsung/exynos_tmu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/tango_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/tango_thermal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/thermal_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/thermal_core.c</a></td><td class='right'>1493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 9.2%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/thermal_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/thermal_core.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/thermal/thermal_helpers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/thermal_helpers.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/thermal_hwmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/thermal_hwmon.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/thermal/thermal_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/thermal_sysfs.c</a></td><td class='right'>771</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/ti-soc-thermal/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/ti-soc-thermal/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/ti-soc-thermal/dra752-bandgap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/ti-soc-thermal/dra752-bandgap.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/ti-soc-thermal/dra752-thermal-data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/ti-soc-thermal/dra752-thermal-data.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/ti-soc-thermal/ti-bandgap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/ti-soc-thermal/ti-bandgap.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thermal/x86_pkg_temp_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/x86_pkg_temp_thermal.c</a></td><td class='right'>587</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/thermal/zx2967_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thermal/zx2967_thermal.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thunderbolt/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thunderbolt/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thunderbolt/eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thunderbolt/eeprom.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thunderbolt/nhi_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thunderbolt/nhi_regs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/thunderbolt/switch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/thunderbolt/switch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/amiserial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/amiserial.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/goldfish.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/goldfish.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/hvc/hvc_console.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/hvc/hvc_console.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/hvc/hvcs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/hvc/hvcs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/hvc/hvsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/hvc/hvsi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/moxa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/moxa.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/mxser.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/mxser.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/n_gsm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/n_gsm.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/n_hdlc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/n_hdlc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/n_r3964.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/n_r3964.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/nozomi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/nozomi.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/pty.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/pty.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/rocket.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/rocket.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/tty/serdev/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serdev/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/tty/serdev/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serdev/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/tty/serdev/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serdev/core.c</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/tty/serdev/serdev-ttyport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serdev/serdev-ttyport.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_core.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_dma.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_dw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_dw.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_exar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_exar.c</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_fintek.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_fintek.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_gsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_gsc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_hp300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_hp300.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_lpss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_lpss.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_mid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_mid.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_moxa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_moxa.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_of.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_omap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_omap.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_pci.c</a></td><td class='right'>568</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_port.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_port.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_pxa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_pxa.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/8250_uniphier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/8250_uniphier.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/8250/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/8250/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/amba-pl010.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/amba-pl010.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/amba-pl011.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/amba-pl011.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/ar933x_uart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/ar933x_uart.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/atmel_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/atmel_serial.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/bfin_sport_uart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/bfin_sport_uart.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/cpm_uart/cpm_uart_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/cpm_uart/cpm_uart_core.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/crisv10.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/crisv10.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/dz.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/dz.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/efm32-uart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/efm32-uart.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/fsl_lpuart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/fsl_lpuart.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/icom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/icom.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/ifx6x60.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/ifx6x60.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/imx.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/ioc3_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/ioc3_serial.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/ioc4_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/ioc4_serial.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/ip22zilog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/ip22zilog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/lantiq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/lantiq.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/lpc32xx_hs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/lpc32xx_hs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/max310x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/max310x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/meson_uart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/meson_uart.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/mpsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/mpsc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/msm_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/msm_serial.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/mxs-auart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/mxs-auart.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/omap-serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/omap-serial.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/pic32_uart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/pic32_uart.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/pmac_zilog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/pmac_zilog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/pnx8xxx_uart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/pnx8xxx_uart.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/pxa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/pxa.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/samsung.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/samsung.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/samsung.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/samsung.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/sc16is7xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/sc16is7xx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/serial-tegra.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/serial-tegra.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/serial_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/serial_core.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/serial_txx9.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/serial_txx9.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/sh-sci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/sh-sci.c</a></td><td class='right'>1112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/sh-sci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/sh-sci.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/sirfsoc_uart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/sirfsoc_uart.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/sn_console.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/sn_console.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/sprd_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/sprd_serial.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/st-asc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/st-asc.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/sunhv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/sunhv.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/sunsu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/sunsu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/sunzilog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/sunzilog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/vr41xx_siu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/vr41xx_siu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/vt8500_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/vt8500_serial.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/xilinx_uartps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/xilinx_uartps.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/serial/zs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/serial/zs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/synclink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/synclink.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/synclink_gt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/synclink_gt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/synclinkmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/synclinkmp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/sysrq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/sysrq.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/tty_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/tty_buffer.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/tty_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/tty_io.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/tty_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/tty_ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/tty_ldsem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/tty_ldsem.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/tty_port.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/tty_port.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/vt/consolemap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/vt/consolemap.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/vt/keyboard.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/vt/keyboard.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/vt/selection.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/vt/selection.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/vt/vc_screen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/vt/vc_screen.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/vt/vt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/vt/vt.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/tty/vt/vt_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/tty/vt/vt_ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/uio/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/uio/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/uio/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/uio/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/uio/uio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/uio/uio.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/uio/uio_hv_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/uio/uio_hv_generic.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/uio/uio_pruss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/uio/uio_pruss.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/atm/usbatm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/atm/usbatm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/ci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/ci.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/ci_hdrc_imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/ci_hdrc_imx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/ci_hdrc_imx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/ci_hdrc_imx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/ci_hdrc_msm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/ci_hdrc_msm.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/ci_hdrc_usb2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/ci_hdrc_usb2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/core.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/host.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/otg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/otg.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/otg_fsm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/otg_fsm.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/udc.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/udc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/udc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/chipidea/ulpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/ulpi.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/chipidea/usbmisc_imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/chipidea/usbmisc_imx.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/class/cdc-acm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/class/cdc-acm.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/class/cdc-acm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/class/cdc-acm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/class/cdc-wdm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/class/cdc-wdm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/class/usblp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/class/usblp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/class/usbtmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/class/usbtmc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/common/ulpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/common/ulpi.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/buffer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/config.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/devices.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/devices.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/devio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/devio.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/driver.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/endpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/endpoint.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/generic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/hcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/hcd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/hub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/hub.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/ledtrig-usbport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/ledtrig-usbport.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/message.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/message.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/notify.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/notify.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/quirks.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/sysfs.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/urb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/urb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/usb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/core/usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/core/usb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/core.c</a></td><td class='right'>963</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/core.h</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/core_intr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/core_intr.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/debug.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/debugfs.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/gadget.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/gadget.c</a></td><td class='right'>1431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/hcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/hcd.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/hcd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/hcd.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/hcd_ddma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/hcd_ddma.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/hcd_intr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/hcd_intr.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/hcd_queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/hcd_queue.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/hw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/hw.h</a></td><td class='right'>630</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/dwc2/params.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/params.c</a></td><td class='right'>707</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/pci.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc2/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc2/platform.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/core.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/core.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/usb/dwc3/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/debug.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/debug.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/dwc3-exynos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/dwc3-exynos.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/dwc3-omap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/dwc3-omap.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/dwc3-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/dwc3-pci.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/dwc3-st.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/dwc3-st.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/ep0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/ep0.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/gadget.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/gadget.c</a></td><td class='right'>786</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/gadget.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/gadget.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/host.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/io.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/dwc3/trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/dwc3/trace.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/early/ehci-dbgp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/early/ehci-dbgp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/composite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/composite.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/configfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/configfs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/f_fs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/f_fs.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/f_hid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/f_hid.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/f_mass_storage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/f_mass_storage.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/f_ncm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/f_ncm.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/f_phonet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/f_phonet.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/f_printer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/f_printer.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/f_tcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/f_tcm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/f_uac2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/f_uac2.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/rndis.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/rndis.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/rndis.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/rndis.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/u_ether.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/u_ether.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/u_ether_configfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/u_ether_configfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/u_fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/u_fs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/u_printer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/u_printer.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/u_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/u_serial.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/u_uac2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/u_uac2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/uvc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/uvc.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/uvc_configfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/uvc_configfs.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/uvc_v4l2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/uvc_v4l2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/function/uvc_video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/function/uvc_video.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/legacy/audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/legacy/audio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/legacy/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/legacy/inode.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/legacy/printer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/legacy/printer.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/at91_udc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/at91_udc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/atmel_usba_udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/atmel_usba_udc.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/atmel_usba_udc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/atmel_usba_udc.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/bdc/bdc_cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/bdc/bdc_cmd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/bdc/bdc_ep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/bdc/bdc_ep.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/core.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/dummy_hcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/dummy_hcd.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/fotg210-udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/fotg210-udc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/fsl_qe_udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/fsl_qe_udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/fsl_udc_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/fsl_udc_core.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/fsl_usb2_udc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/fsl_usb2_udc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/fusb300_udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/fusb300_udc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/goku_udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/goku_udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/gr_udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/gr_udc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/m66592-udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/m66592-udc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/mv_u3d_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/mv_u3d_core.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/mv_udc_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/mv_udc_core.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/net2272.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/net2272.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/net2280.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/net2280.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/omap_udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/omap_udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/omap_udc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/omap_udc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/pxa25x_udc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/pxa25x_udc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/pxa27x_udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/pxa27x_udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/r8a66597-udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/r8a66597-udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/renesas_usb3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/renesas_usb3.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/s3c-hsudc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/s3c-hsudc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/gadget/udc/s3c2410_udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/gadget/udc/s3c2410_udc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ehci-exynos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ehci-exynos.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ehci-fsl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ehci-fsl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ehci-hcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ehci-hcd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ehci-hub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ehci-hub.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ehci-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ehci-pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ehci-q.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ehci-q.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ehci-sched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ehci-sched.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ehci-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ehci-timer.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ehci-w90x900.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ehci-w90x900.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ehci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ehci.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/fotg210-hcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/fotg210-hcd.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/fsl-mph-dr-of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/fsl-mph-dr-of.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/isp1362-hcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/isp1362-hcd.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ohci-at91.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ohci-at91.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ohci-da8xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ohci-da8xx.c</a></td><td class='right'>522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ohci-exynos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ohci-exynos.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ohci-hcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ohci-hcd.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ohci-hub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ohci-hub.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ohci-mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ohci-mem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ohci-nxp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ohci-nxp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ohci-omap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ohci-omap.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ohci-pxa27x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ohci-pxa27x.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/ohci-s3c2410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/ohci-s3c2410.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/oxu210hp-hcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/oxu210hp-hcd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/uhci-hcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/uhci-hcd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/uhci-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/uhci-pci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-dbg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-dbg.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-ext-caps.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-ext-caps.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-hub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-hub.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-mem.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-mtk-sch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-mtk-sch.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-mtk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-mtk.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-mtk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-mtk.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-pci.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-plat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-plat.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-rcar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-rcar.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-rcar.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-rcar.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-ring.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-ring.c</a></td><td class='right'>1269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci-trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci-trace.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/host/xhci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/host/xhci.h</a></td><td class='right'>546</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/image/mdc800.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/image/mdc800.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/isp1760/isp1760-if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/isp1760/isp1760-if.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/isp1760/isp1760-udc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/isp1760/isp1760-udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/adutux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/adutux.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/chaoskey.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/chaoskey.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/ftdi-elan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/ftdi-elan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/idmouse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/idmouse.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/ldusb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/ldusb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/legousbtower.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/legousbtower.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/rio500.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/rio500.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/sisusbvga/sisusb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/sisusbvga/sisusb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/sisusbvga/sisusb_con.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/sisusbvga/sisusb_con.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/misc/usb251xb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/usb251xb.c</a></td><td class='right'>605</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/usbtest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/usbtest.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/misc/uss720.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/misc/uss720.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/mon/mon_bin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mon/mon_bin.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/mon/mon_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mon/mon_main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/mon/mon_stat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mon/mon_stat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/mon/mon_text.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mon/mon_text.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/Kconfig</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/mtu3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/mtu3.h</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/mtu3_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/mtu3_core.c</a></td><td class='right'>863</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/mtu3_dr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/mtu3_dr.c</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/mtu3_dr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/mtu3_dr.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/mtu3_gadget.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/mtu3_gadget.c</a></td><td class='right'>730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/mtu3_gadget_ep0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/mtu3_gadget_ep0.c</a></td><td class='right'>881</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/mtu3_host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/mtu3_host.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/mtu3_hw_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/mtu3_hw_regs.h</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/mtu3_plat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/mtu3_plat.c</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/mtu3_qmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/mtu3_qmu.c</a></td><td class='right'>573</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/mtu3/mtu3_qmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/mtu3/mtu3_qmu.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/am35x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/am35x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/blackfin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/blackfin.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/cppi_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/cppi_dma.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/cppi_dma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/cppi_dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/da8xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/da8xx.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/davinci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/davinci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/jz4740.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/jz4740.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/musb_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/musb_core.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/musb_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/musb_core.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/musb_cppi41.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/musb_cppi41.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/musb_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/musb_debugfs.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/musb_dma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/musb_dma.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/musb_dsps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/musb_dsps.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/musb_gadget.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/musb_gadget.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/musb_host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/musb_host.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/musb_virthub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/musb_virthub.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/musbhsdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/musbhsdma.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/omap2430.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/omap2430.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/sunxi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/sunxi.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/tusb6010_omap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/tusb6010_omap.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/musb/ux500.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/musb/ux500.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/phy/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/phy/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/phy/phy-ab8500-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/phy/phy-ab8500-usb.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/phy/phy-am335x-control.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/phy/phy-am335x-control.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/phy/phy-fsl-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/phy/phy-fsl-usb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/phy/phy-generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/phy/phy-generic.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/phy/phy-isp1301-omap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/phy/phy-isp1301-omap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/phy/phy-msm-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/phy/phy-msm-usb.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/phy/phy-omap-otg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/phy/phy-omap-otg.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/phy/phy-qcom-8x16-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/phy/phy-qcom-8x16-usb.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/phy/phy-tahvo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/phy/phy-tahvo.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/phy/phy-twl6030-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/phy/phy-twl6030-usb.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/renesas_usbhs/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/renesas_usbhs/common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/renesas_usbhs/fifo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/renesas_usbhs/fifo.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/renesas_usbhs/mod_host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/renesas_usbhs/mod_host.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/ark3116.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/ark3116.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/ch341.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/ch341.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/console.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/console.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/cp210x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/cp210x.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/cyberjack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/cyberjack.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/cypress_m8.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/cypress_m8.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/digi_acceleport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/digi_acceleport.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/serial/f81534.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/f81534.c</a></td><td class='right'>1411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/ftdi_sio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/ftdi_sio.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/garmin_gps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/garmin_gps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/generic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/io_edgeport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/io_edgeport.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/usb/serial/io_tables.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/io_tables.h</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/io_ti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/io_ti.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/iuu_phoenix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/iuu_phoenix.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/keyspan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/keyspan.c</a></td><td class='right'>592</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/usb/serial/keyspan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/keyspan.h</a></td><td class='right'>629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/keyspan_pda.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/keyspan_pda.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/kl5kusb105.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/kl5kusb105.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/kobil_sct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/kobil_sct.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/mct_u232.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/mct_u232.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/metro-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/metro-usb.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/mos7720.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/mos7720.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/mos7840.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/mos7840.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/omninet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/omninet.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/opticon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/opticon.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/option.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/option.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/oti6858.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/oti6858.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/pl2303.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/pl2303.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/pl2303.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/pl2303.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/qcserial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/qcserial.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/quatech2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/quatech2.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/sierra.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/sierra.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/spcp8x5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/spcp8x5.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/ssu100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/ssu100.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/ti_usb_3410_5052.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/ti_usb_3410_5052.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/usb/serial/upd78f0730.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/upd78f0730.c</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/usb_wwan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/usb_wwan.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/serial/whiteheat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/serial/whiteheat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/storage/ene_ub6250.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/storage/ene_ub6250.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/storage/sddr09.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/storage/sddr09.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/storage/unusual_devs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/storage/unusual_devs.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/storage/usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/storage/usb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/usbip/usbip_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/usbip/usbip_common.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/usbip/usbip_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/usbip/usbip_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/usbip/vhci_hcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/usbip/vhci_hcd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/usbip/vhci_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/usbip/vhci_sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/usbip/vudc_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/usbip/vudc_dev.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/usbip/vudc_transfer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/usbip/vudc_transfer.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/wusbcore/crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/wusbcore/crypto.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/wusbcore/dev-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/wusbcore/dev-sysfs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/wusbcore/security.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/wusbcore/security.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/wusbcore/wa-nep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/wusbcore/wa-nep.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/wusbcore/wa-xfer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/wusbcore/wa-xfer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/usb/wusbcore/wusbhc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/usb/wusbcore/wusbhc.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vfio/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vfio/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/vfio/mdev/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/mdev/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/vfio/mdev/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/mdev/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/vfio/mdev/mdev_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/mdev/mdev_core.c</a></td><td class='right'>443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/vfio/mdev/mdev_driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/mdev/mdev_driver.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/vfio/mdev/mdev_private.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/mdev/mdev_private.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/vfio/mdev/mdev_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/mdev/mdev_sysfs.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/vfio/mdev/vfio_mdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/mdev/vfio_mdev.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vfio/pci/vfio_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/pci/vfio_pci.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vfio/pci/vfio_pci_config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/pci/vfio_pci_config.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vfio/pci/vfio_pci_rdwr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/pci/vfio_pci_rdwr.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vfio/platform/vfio_platform_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/platform/vfio_platform_common.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vfio/vfio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/vfio.c</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vfio/vfio_iommu_spapr_tce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/vfio_iommu_spapr_tce.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vfio/vfio_iommu_type1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vfio/vfio_iommu_type1.c</a></td><td class='right'>910</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vhost/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vhost/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vhost/net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vhost/net.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vhost/scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vhost/scsi.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vhost/vhost.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vhost/vhost.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vhost/vhost.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vhost/vhost.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vhost/vringh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vhost/vringh.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vhost/vsock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vhost/vsock.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/backlight/adp5520_bl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/backlight/adp5520_bl.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/backlight/da9052_bl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/backlight/da9052_bl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/backlight/lcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/backlight/lcd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/backlight/pwm_bl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/backlight/pwm_bl.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/console/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/console/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/console/fbcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/console/fbcon.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/console/mdacon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/console/mdacon.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/console/newport_con.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/console/newport_con.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/console/sticon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/console/sticon.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/console/vgacon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/console/vgacon.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/68328fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/68328fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/amba-clcd-nomadik.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/amba-clcd-nomadik.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/amba-clcd-nomadik.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/amba-clcd-nomadik.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/amba-clcd-versatile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/amba-clcd-versatile.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/amba-clcd-versatile.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/amba-clcd-versatile.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/amba-clcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/amba-clcd.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/amifb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/amifb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/aty/radeon_monitor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/aty/radeon_monitor.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/auo_k190x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/auo_k190x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/cobalt_lcdfb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/cobalt_lcdfb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/core/fb_defio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/core/fb_defio.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/core/fbcmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/core/fbcmap.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/core/fbmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/core/fbmem.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/efifb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/efifb.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/fsl-diu-fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/fsl-diu-fb.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/hitfb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/hitfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/hpfb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/hpfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/imxfb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/imxfb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/matrox/matroxfb_DAC1064.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/matrox/matroxfb_DAC1064.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/matrox/matroxfb_Ti3026.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/matrox/matroxfb_Ti3026.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/maxinefb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/maxinefb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/mbx/mbxdebugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/mbx/mbxdebugfs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/metronomefb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/metronomefb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/mx3fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/mx3fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/nvidia/nv_accel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/nvidia/nv_accel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/offb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/offb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/omap/lcd_ams_delta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/omap/lcd_ams_delta.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/omap/lcd_h3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/omap/lcd_h3.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/omap/lcd_htcherald.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/omap/lcd_htcherald.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/omap/lcd_inn1510.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/omap/lcd_inn1510.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/omap/lcd_inn1610.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/omap/lcd_inn1610.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/omap/lcd_osk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/omap/lcd_osk.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/omap/lcd_palmte.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/omap/lcd_palmte.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/omap/lcd_palmtt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/omap/lcd_palmtt.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/omap/lcd_palmz71.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/omap/lcd_palmz71.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/omap/omapfb_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/omap/omapfb_main.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/pmag-ba-fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/pmag-ba-fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/pmagb-b-fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/pmagb-b-fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/q40fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/q40fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/sh_mobile_lcdcfb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/sh_mobile_lcdcfb.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/simplefb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/simplefb.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/skeletonfb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/skeletonfb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/sm501fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/sm501fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/ssd1307fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/ssd1307fb.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/stifb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/stifb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/w100fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/w100fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/wm8505fb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/wm8505fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/fbdev/xen-fbfront.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/fbdev/xen-fbfront.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/hdmi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/video/of_display_timing.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/video/of_display_timing.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/virtio/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/virtio/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/virtio/virtio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/virtio/virtio.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/virtio/virtio_balloon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/virtio/virtio_balloon.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/virtio/virtio_input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/virtio/virtio_input.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/virtio/virtio_mmio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/virtio/virtio_mmio.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/virtio/virtio_pci_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/virtio/virtio_pci_common.c</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/virtio/virtio_pci_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/virtio/virtio_pci_common.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/virtio/virtio_pci_legacy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/virtio/virtio_pci_legacy.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/virtio/virtio_pci_modern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/virtio/virtio_pci_modern.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/virtio/virtio_ring.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/virtio/virtio_ring.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vme/bridges/vme_ca91cx42.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vme/bridges/vme_ca91cx42.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/vme/vme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/vme/vme.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/masters/ds2490.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/masters/ds2490.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/masters/omap_hdq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/masters/omap_hdq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/slaves/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/slaves/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/slaves/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/slaves/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/w1/slaves/w1_ds2405.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/slaves/w1_ds2405.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/w1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/w1.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/w1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/w1.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/w1_family.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/w1_family.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/w1_family.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/w1_family.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/w1_int.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/w1_int.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/w1_int.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/w1_int.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/w1_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/w1_io.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/w1_log.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/w1_log.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/w1_netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/w1_netlink.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/w1/w1_netlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/w1/w1_netlink.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/Kconfig</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/asm9260_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/asm9260_wdt.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/aspeed_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/aspeed_wdt.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/atlas7_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/atlas7_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/bcm2835_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/bcm2835_wdt.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/bcm47xx_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/bcm47xx_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/bcm7038_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/bcm7038_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/bcm_kona_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/bcm_kona_wdt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/booke_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/booke_wdt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/cadence_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/cadence_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/coh901327_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/coh901327_wdt.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/cpwd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/cpwd.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/da9052_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/da9052_wdt.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/da9055_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/da9055_wdt.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/da9062_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/da9062_wdt.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/da9063_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/da9063_wdt.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/davinci_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/davinci_wdt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/diag288_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/diag288_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/digicolor_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/digicolor_wdt.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/dw_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/dw_wdt.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/ebc-c384_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/ebc-c384_wdt.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/ep93xx_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/ep93xx_wdt.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/watchdog/gemini_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/gemini_wdt.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/iTCO_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/iTCO_wdt.c</a></td><td class='right'>426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/imgpdc_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/imgpdc_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/intel-mid_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/intel-mid_wdt.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/it87_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/it87_wdt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/jz4740_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/jz4740_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/kempld_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/kempld_wdt.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/lantiq_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/lantiq_wdt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/watchdog/loongson1_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/loongson1_wdt.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/lpc18xx_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/lpc18xx_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/max77620_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/max77620_wdt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/mei_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/mei_wdt.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/mena21_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/mena21_wdt.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/meson_gxbb_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/meson_gxbb_wdt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/meson_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/meson_wdt.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/mpc8xxx_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/mpc8xxx_wdt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/mt7621_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/mt7621_wdt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/watchdog/nic7018_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/nic7018_wdt.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/octeon-wdt-main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/octeon-wdt-main.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/orion_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/orion_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/pika_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/pika_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/qcom-wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/qcom-wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/rn5t618_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/rn5t618_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/rt2880_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/rt2880_wdt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/s3c2410_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/s3c2410_wdt.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/sa1100_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/sa1100_wdt.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/sama5d4_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/sama5d4_wdt.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/sbsa_gwdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/sbsa_gwdt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/sirfsoc_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/sirfsoc_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/softdog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/softdog.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/sun4v_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/sun4v_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/sunxi_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/sunxi_wdt.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/tangox_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/tangox_wdt.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/tegra_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/tegra_wdt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/ts72xx_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/ts72xx_wdt.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/w83627hf_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/w83627hf_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/watchdog_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/watchdog_dev.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/watchdog/wm831x_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/wm831x_wdt.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/watchdog/zx2967_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/watchdog/zx2967_wdt.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/arm-device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/arm-device.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/balloon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/balloon.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/cpu_hotplug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/cpu_hotplug.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/events/events_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/events/events_base.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/events/events_fifo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/events/events_fifo.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/evtchn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/evtchn.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/gntalloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/gntalloc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/gntdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/gntdev.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/grant-table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/grant-table.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/manage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/manage.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/platform-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/platform-pci.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/privcmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/privcmd.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/swiotlb-xen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/swiotlb-xen.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xen-balloon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xen-balloon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xen-pciback/xenbus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xen-pciback/xenbus.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/drivers/xen/xenbus/xenbus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenbus/xenbus.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xenbus/xenbus_client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenbus/xenbus_client.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xenbus/xenbus_comms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenbus/xenbus_comms.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/xen/xenbus/xenbus_comms.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenbus/xenbus_comms.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xenbus/xenbus_dev_backend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenbus/xenbus_dev_backend.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xenbus/xenbus_dev_frontend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenbus/xenbus_dev_frontend.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xenbus/xenbus_probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenbus/xenbus_probe.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/drivers/xen/xenbus/xenbus_probe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenbus/xenbus_probe.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xenbus/xenbus_probe_backend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenbus/xenbus_probe_backend.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xenbus/xenbus_probe_frontend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenbus/xenbus_probe_frontend.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xenbus/xenbus_xs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenbus/xenbus_xs.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xenfs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenfs/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/xen/xenfs/xenstored.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/xen/xenfs/xenstored.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/drivers/zorro/proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/zorro/proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/9p/acl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/9p/acl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/9p/fid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/9p/fid.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/9p/v9fs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/9p/v9fs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/9p/vfs_addr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/9p/vfs_addr.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/9p/vfs_file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/9p/vfs_file.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/9p/vfs_inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/9p/vfs_inode.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/9p/vfs_inode_dotl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/9p/vfs_inode_dotl.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/Kconfig.binfmt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/Kconfig.binfmt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/affs/affs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/affs/affs.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/affs/amigaffs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/affs/amigaffs.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/affs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/affs/inode.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/affs/namei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/affs/namei.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/affs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/affs/super.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/affs/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/affs/symlink.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/callback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/callback.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/cmservice.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/cmservice.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/dir.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/file.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/fsclient.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/fsclient.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/inode.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/internal.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/main.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/mntpt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/mntpt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/netdevices.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/netdevices.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/rxrpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/rxrpc.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/vlclient.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/vlclient.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/vlocation.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/vlocation.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/vnode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/vnode.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/volume.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/volume.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/afs/write.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/afs/write.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/aio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/aio.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/anon_inodes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/anon_inodes.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/attr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/attr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/autofs4/autofs_i.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/autofs4/autofs_i.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/autofs4/dev-ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/autofs4/dev-ioctl.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/autofs4/expire.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/autofs4/expire.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/autofs4/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/autofs4/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/autofs4/root.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/autofs4/root.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/autofs4/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/autofs4/symlink.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/autofs4/waitq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/autofs4/waitq.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/bad_inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/bad_inode.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/befs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/befs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/befs_fs_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/befs_fs_types.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/btree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/btree.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/btree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/btree.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/datastream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/datastream.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/datastream.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/datastream.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/debug.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/inode.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/inode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/inode.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/io.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/linuxvfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/linuxvfs.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/befs/super.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/befs/super.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/bfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/bfs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/binfmt_aout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/binfmt_aout.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/binfmt_elf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/binfmt_elf.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/binfmt_elf_fdpic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/binfmt_elf_fdpic.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/binfmt_flat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/binfmt_flat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/binfmt_misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/binfmt_misc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/block_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/block_dev.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/async-thread.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/async-thread.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/async-thread.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/async-thread.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/backref.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/backref.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/btrfs_inode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/btrfs_inode.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/check-integrity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/check-integrity.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/check-integrity.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/check-integrity.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/compression.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/compression.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/compression.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/compression.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/ctree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/ctree.c</a></td><td class='right'>596</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/ctree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/ctree.h</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/delayed-inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/delayed-inode.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/delayed-inode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/delayed-inode.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/delayed-ref.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/delayed-ref.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/delayed-ref.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/delayed-ref.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/dev-replace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/dev-replace.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/dev-replace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/dev-replace.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/dir-item.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/dir-item.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/disk-io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/disk-io.c</a></td><td class='right'>656</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/disk-io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/disk-io.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/export.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/export.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/extent-tree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/extent-tree.c</a></td><td class='right'>1920</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 85.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/extent_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/extent_io.c</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/extent_io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/extent_io.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/file-item.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/file-item.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/file.c</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/free-space-cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/free-space-cache.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/free-space-cache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/free-space-cache.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/free-space-tree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/free-space-tree.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/inode-item.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/inode-item.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/inode-map.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/inode-map.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/inode.c</a></td><td class='right'>1858</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 85.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/ioctl.c</a></td><td class='right'>762</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/lzo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/lzo.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/ordered-data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/ordered-data.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/ordered-data.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/ordered-data.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/print-tree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/print-tree.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/print-tree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/print-tree.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/props.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/props.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/qgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/qgroup.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/qgroup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/qgroup.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/raid56.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/raid56.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/raid56.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/raid56.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/reada.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/reada.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/relocation.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/relocation.c</a></td><td class='right'>495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/root-tree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/root-tree.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/scrub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/scrub.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/send.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/send.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/super.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/tests/btrfs-tests.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/tests/btrfs-tests.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/tests/btrfs-tests.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/tests/btrfs-tests.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/tests/extent-buffer-tests.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/tests/extent-buffer-tests.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/tests/extent-io-tests.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/tests/extent-io-tests.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/tests/free-space-tests.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/tests/free-space-tests.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/tests/free-space-tree-tests.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/tests/free-space-tree-tests.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/tests/inode-tests.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/tests/inode-tests.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/tests/qgroup-tests.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/tests/qgroup-tests.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/transaction.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/transaction.c</a></td><td class='right'>673</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/transaction.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/transaction.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/tree-log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/tree-log.c</a></td><td class='right'>549</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/tree-log.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/tree-log.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/ulist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/ulist.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/ulist.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/ulist.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/uuid-tree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/uuid-tree.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/volumes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/volumes.c</a></td><td class='right'>866</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/volumes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/volumes.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/xattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/xattr.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/btrfs/zlib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/btrfs/zlib.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/buffer.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cachefiles/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cachefiles/internal.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/addr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/addr.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/cache.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/caps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/caps.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/debugfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/dir.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/export.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/export.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/file.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/inode.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/mds_client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/mds_client.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/mds_client.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/mds_client.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/mdsmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/mdsmap.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/snap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/snap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/super.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ceph/super.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ceph/super.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/cifs_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/cifs_debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/cifs_dfs_ref.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/cifs_dfs_ref.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/cifs_unicode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/cifs_unicode.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/cifsencrypt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/cifsencrypt.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/cifsfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/cifsfs.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/cifsfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/cifsfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/cifsglob.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/cifsglob.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/cifspdu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/cifspdu.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/cifsproto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/cifsproto.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/cifssmb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/cifssmb.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/connect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/connect.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/dir.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/file.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/inode.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/link.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/link.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/misc.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/readdir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/readdir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/sess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/sess.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/smb1ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/smb1ops.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/smb2file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/smb2file.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/smb2glob.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/smb2glob.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/smb2maperror.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/smb2maperror.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/smb2misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/smb2misc.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/smb2ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/smb2ops.c</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/smb2pdu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/smb2pdu.c</a></td><td class='right'>816</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/smb2pdu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/smb2pdu.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/smb2proto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/smb2proto.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/smb2transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/smb2transport.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/smbencrypt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/smbencrypt.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/cifs/transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/cifs/transport.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/coda/cnode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/coda/cnode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/coda/coda_linux.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/coda/coda_linux.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/coda/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/coda/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/coda/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/coda/inode.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/coda/psdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/coda/psdev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/coda/upcall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/coda/upcall.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/compat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/compat.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/compat_binfmt_elf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/compat_binfmt_elf.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/compat_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/compat_ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/configfs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/configfs/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/configfs/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/configfs/symlink.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/coredump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/coredump.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/crypto/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/crypto/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/crypto/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/fs/crypto/bio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/crypto/bio.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/crypto/crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/crypto/crypto.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/crypto/fname.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/crypto/fname.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/fs/crypto/fscrypt_private.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/crypto/fscrypt_private.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/crypto/keyinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/crypto/keyinfo.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/crypto/policy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/crypto/policy.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dax.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dax.c</a></td><td class='right'>1556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 6.1%;'/><td class='none' style='width: 87.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dcache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dcache.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dcookies.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dcookies.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/debugfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/debugfs/inode.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/direct-io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/direct-io.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dlm/ast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dlm/ast.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dlm/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dlm/config.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dlm/debug_fs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dlm/debug_fs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dlm/dlm_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dlm/dlm_internal.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dlm/lock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dlm/lock.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dlm/lockspace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dlm/lockspace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dlm/lowcomms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dlm/lowcomms.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dlm/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dlm/main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dlm/netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dlm/netlink.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/dlm/user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/dlm/user.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ecryptfs/ecryptfs_kernel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ecryptfs/ecryptfs_kernel.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ecryptfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ecryptfs/inode.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ecryptfs/kthread.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ecryptfs/kthread.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ecryptfs/read_write.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ecryptfs/read_write.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/efs/efs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/efs/efs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/eventfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/eventfd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/eventpoll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/eventpoll.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/exec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/exec.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/exofs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/exofs/inode.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/exofs/sys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/exofs/sys.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/exportfs/expfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/exportfs/expfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext2/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext2/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext2/balloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext2/balloc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext2/ext2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext2/ext2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext2/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext2/file.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext2/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext2/inode.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext2/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext2/ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext2/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext2/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext2/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext2/symlink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/acl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/acl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/ext4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/ext4.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/ext4_jbd2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/ext4_jbd2.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/ext4_jbd2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/ext4_jbd2.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/extents.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/extents.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/extents_status.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/extents_status.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/file.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/fsync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/fsync.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/hash.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/ialloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/ialloc.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/inline.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/inline.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/inode.c</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/ioctl.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/mballoc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/mballoc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/mmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/mmp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/move_extent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/move_extent.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/namei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/namei.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/page-io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/page-io.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/resize.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/resize.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/super.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/symlink.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/xattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/xattr.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ext4/xattr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ext4/xattr.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/acl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/acl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/checkpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/checkpoint.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/data.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/debug.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/dir.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/extent_cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/extent_cache.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/f2fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/f2fs.h</a></td><td class='right'>848</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/file.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/gc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/gc.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/inline.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/inline.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/inode.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/namei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/namei.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/node.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/node.c</a></td><td class='right'>772</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/node.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/node.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/recovery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/recovery.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/segment.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/segment.c</a></td><td class='right'>705</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/segment.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/segment.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/shrinker.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/shrinker.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/super.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/xattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/xattr.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/f2fs/xattr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/f2fs/xattr.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fat/fat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fat/fat.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fat/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fat/file.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fcntl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fcntl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fhandle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fhandle.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/file_table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/file_table.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/filesystems.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/filesystems.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fs-writeback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fs-writeback.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fs_struct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fs_struct.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fscache/cookie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fscache/cookie.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fscache/netfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fscache/netfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fscache/object-list.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fscache/object-list.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fscache/object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fscache/object.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fuse/dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fuse/dev.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fuse/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fuse/dir.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fuse/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fuse/file.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/fuse/fuse_i.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/fuse/fuse_i.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/aops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/aops.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/bmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/bmap.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/dir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/file.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/glock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/glock.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/incore.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/incore.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/inode.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/lock_dlm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/lock_dlm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/log.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/lops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/lops.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/meta_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/meta_io.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/ops_fstype.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/ops_fstype.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/sys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/sys.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/trans.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/trans.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/util.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/gfs2/xattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/gfs2/xattr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/hfs/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/hfs/dir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/hfs/hfs_fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/hfs/hfs_fs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/hfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/hfs/inode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/hfs/mdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/hfs/mdb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/hfsplus/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/hfsplus/inode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/hfsplus/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/hfsplus/ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/hfsplus/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/hfsplus/super.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/hfsplus/wrapper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/hfsplus/wrapper.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/hostfs/hostfs_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/hostfs/hostfs_kern.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/hpfs/hpfs_fn.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/hpfs/hpfs_fn.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/hugetlbfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/hugetlbfs/inode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/internal.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ioctl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/iomap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/iomap.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/isofs/compress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/isofs/compress.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/isofs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/isofs/inode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jbd2/checkpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jbd2/checkpoint.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jbd2/commit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jbd2/commit.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jbd2/journal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jbd2/journal.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jbd2/revoke.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jbd2/revoke.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jbd2/transaction.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jbd2/transaction.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jffs2/background.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jffs2/background.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jffs2/fs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jffs2/fs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jffs2/nodemgmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jffs2/nodemgmt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jffs2/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jffs2/symlink.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jfs/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jfs/ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jfs/jfs_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jfs/jfs_debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jfs/jfs_logmgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jfs/jfs_logmgr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jfs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jfs/super.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/jfs/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/jfs/symlink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/kernfs/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/kernfs/dir.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/kernfs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/kernfs/file.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/kernfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/kernfs/inode.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/kernfs/kernfs-internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/kernfs/kernfs-internal.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/kernfs/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/kernfs/symlink.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/libfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/libfs.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/lockd/netns.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/lockd/netns.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/lockd/svc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/lockd/svc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/locks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/locks.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/compr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/compr.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/dev_bdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/dev_bdev.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/dev_mtd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/dev_mtd.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/dir.c</a></td><td class='right'>801</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/file.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/gc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/gc.c</a></td><td class='right'>732</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/inode.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/journal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/journal.c</a></td><td class='right'>894</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/logfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/logfs.h</a></td><td class='right'>735</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/logfs_abi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/logfs_abi.h</a></td><td class='right'>629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/readwrite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/readwrite.c</a></td><td class='right'>2298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.9%;'/><td class='none' style='width: 82.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/segment.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/segment.c</a></td><td class='right'>961</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.5%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/fs/logfs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/logfs/super.c</a></td><td class='right'>653</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/mbcache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/mbcache.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/minix/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/minix/inode.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/minix/minix.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/minix/minix.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/mount.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/mount.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/mpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/mpage.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/namei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/namei.c</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/namespace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/namespace.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ncpfs/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ncpfs/dir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ncpfs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ncpfs/file.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ncpfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ncpfs/inode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ncpfs/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ncpfs/ioctl.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ncpfs/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ncpfs/mmap.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ncpfs/ncplib_kernel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ncpfs/ncplib_kernel.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ncpfs/sock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ncpfs/sock.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ncpfs/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ncpfs/symlink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/blocklayout/blocklayout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/blocklayout/blocklayout.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/cache_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/cache_lib.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/callback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/callback.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/callback_proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/callback_proc.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/callback_xdr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/callback_xdr.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/client.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/delegation.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/delegation.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/dir.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/direct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/direct.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/file.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/filelayout/filelayout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/filelayout/filelayout.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/filelayout/filelayoutdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/filelayout/filelayoutdev.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/flexfilelayout/flexfilelayout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/flexfilelayout/flexfilelayout.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/flexfilelayout/flexfilelayout.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/flexfilelayout/flexfilelayout.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/flexfilelayout/flexfilelayoutdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/flexfilelayout/flexfilelayoutdev.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/getroot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/getroot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/inode.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/internal.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/namespace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/namespace.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/netns.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/netns.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs3client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs3client.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs42proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs42proc.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs42xdr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs42xdr.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4_fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4_fs.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4client.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4idmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4idmap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4namespace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4namespace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4proc.c</a></td><td class='right'>687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4renewd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4renewd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4session.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4session.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4session.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4session.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4state.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4state.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4trace.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/nfs4xdr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/nfs4xdr.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/objlayout/objlayout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/objlayout/objlayout.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/objlayout/objlayout.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/objlayout/objlayout.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/pagelist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/pagelist.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/pnfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/pnfs.c</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/pnfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/pnfs.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/pnfs_nfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/pnfs_nfs.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/super.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/symlink.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs/write.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs/write.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfs_common/grace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfs_common/grace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/blocklayout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/blocklayout.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/export.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/export.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/fault_inject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/fault_inject.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/netns.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/netns.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfs2acl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfs2acl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfs3acl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfs3acl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfs3proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfs3proc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfs4callback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfs4callback.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfs4idmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfs4idmap.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfs4layouts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfs4layouts.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfs4proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfs4proc.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfs4state.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfs4state.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfs4xdr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfs4xdr.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfscache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfscache.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfsctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfsctl.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfsd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfsd.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfsproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfsproc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/nfssvc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/nfssvc.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/state.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/state.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/vfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/vfs.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nfsd/vfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nfsd/vfs.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nilfs2/alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nilfs2/alloc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nilfs2/btnode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nilfs2/btnode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nilfs2/btree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nilfs2/btree.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nilfs2/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nilfs2/file.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nilfs2/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nilfs2/inode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nilfs2/mdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nilfs2/mdt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nilfs2/namei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nilfs2/namei.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nilfs2/segment.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nilfs2/segment.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nilfs2/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nilfs2/super.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/notify/dnotify/dnotify.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/notify/dnotify/dnotify.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/notify/fanotify/fanotify.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/notify/fanotify/fanotify.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/notify/fanotify/fanotify.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/notify/fanotify/fanotify.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/notify/fanotify/fanotify_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/notify/fanotify/fanotify_user.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/notify/fsnotify.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/notify/fsnotify.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/notify/inode_mark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/notify/inode_mark.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/notify/inotify/inotify.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/notify/inotify/inotify.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/notify/inotify/inotify_fsnotify.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/notify/inotify/inotify_fsnotify.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/notify/inotify/inotify_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/notify/inotify/inotify_user.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/notify/mark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/notify/mark.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/nsfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/nsfs.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ntfs/aops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ntfs/aops.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ntfs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ntfs/file.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ntfs/logfile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ntfs/logfile.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ntfs/mft.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ntfs/mft.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/acl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/acl.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/alloc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/aops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/aops.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/aops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/aops.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/buffer_head_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/buffer_head_io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/cluster/heartbeat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/cluster/heartbeat.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/cluster/masklog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/cluster/masklog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/cluster/netdebug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/cluster/netdebug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/cluster/tcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/cluster/tcp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/dlm/dlmdebug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/dlm/dlmdebug.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/dlm/dlmdomain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/dlm/dlmdomain.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/dlm/dlmmaster.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/dlm/dlmmaster.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/dlm/dlmrecovery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/dlm/dlmrecovery.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/dlm/dlmunlock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/dlm/dlmunlock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/dlmfs/dlmfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/dlmfs/dlmfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/dlmfs/userdlm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/dlmfs/userdlm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/dlmglue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/dlmglue.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/dlmglue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/dlmglue.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/file.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/file.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/file.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/inode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/inode.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/journal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/journal.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/mmap.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/move_extents.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/move_extents.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/namei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/namei.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/ocfs2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/ocfs2.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/quota_global.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/quota_global.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/quota_local.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/quota_local.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/refcounttree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/refcounttree.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/refcounttree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/refcounttree.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/stack_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/stack_user.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/stackglue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/stackglue.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/stackglue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/stackglue.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/super.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/symlink.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ocfs2/xattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ocfs2/xattr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/omfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/omfs/inode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/open.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/open.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/openpromfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/openpromfs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/devorangefs-req.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/devorangefs-req.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/inode.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/orangefs-bufmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/orangefs-bufmap.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/orangefs-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/orangefs-debugfs.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/orangefs-dev-proto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/orangefs-dev-proto.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/orangefs-kernel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/orangefs-kernel.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/orangefs-mod.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/orangefs-mod.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/orangefs-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/orangefs-sysfs.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/orangefs-utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/orangefs-utils.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/super.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/symlink.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/orangefs/upcall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/orangefs/upcall.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/overlayfs/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/overlayfs/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/overlayfs/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/overlayfs/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/overlayfs/copy_up.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/overlayfs/copy_up.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/overlayfs/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/overlayfs/dir.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/overlayfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/overlayfs/inode.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/fs/overlayfs/namei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/overlayfs/namei.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/overlayfs/overlayfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/overlayfs/overlayfs.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/fs/overlayfs/ovl_entry.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/overlayfs/ovl_entry.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/overlayfs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/overlayfs/super.c</a></td><td class='right'>597</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/fs/overlayfs/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/overlayfs/util.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/pipe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/pipe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/pnode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/pnode.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/pnode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/pnode.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/posix_acl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/posix_acl.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/array.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/array.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/base.c</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/fd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/fd.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/generic.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/inode.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/internal.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/kcore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/kcore.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/kmsg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/kmsg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/loadavg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/loadavg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/namespaces.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/namespaces.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/nommu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/page.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/page.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/proc_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/proc_net.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/proc_sysctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/proc_sysctl.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/proc_tty.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/proc_tty.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/root.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/root.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/self.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/self.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/stat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/stat.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/task_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/task_mmu.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/task_nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/task_nommu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/thread_self.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/thread_self.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/uptime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/uptime.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc/vmcore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc/vmcore.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/proc_namespace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/proc_namespace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/pstore/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/pstore/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/pstore/ftrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/pstore/ftrace.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/pstore/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/pstore/inode.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/pstore/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/pstore/internal.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/pstore/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/pstore/platform.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/pstore/ram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/pstore/ram.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/pstore/ram_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/pstore/ram_core.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/quota/dquot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/quota/dquot.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/quota/netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/quota/netlink.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/quota/quota.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/quota/quota.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ramfs/file-nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ramfs/file-nommu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ramfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ramfs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/read_write.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/read_write.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/readdir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/readdir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/reiserfs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/reiserfs/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/reiserfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/reiserfs/inode.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/reiserfs/journal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/reiserfs/journal.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/reiserfs/namei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/reiserfs/namei.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/reiserfs/stree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/reiserfs/stree.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/reiserfs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/reiserfs/super.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/romfs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/romfs/super.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/select.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/select.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/seq_file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/seq_file.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/splice.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/splice.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/squashfs/block.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/squashfs/block.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/squashfs/lz4_wrapper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/squashfs/lz4_wrapper.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/squashfs/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/squashfs/symlink.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/stat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/stat.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/statfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/statfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/super.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/sync.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/sysv/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/sysv/inode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/sysv/itree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/sysv/itree.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/sysv/sysv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/sysv/sysv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/timerfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/timerfd.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/fs/ubifs/crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/crypto.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/debug.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/dir.c</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/file.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/gc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/gc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/io.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/ioctl.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/journal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/journal.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/key.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/key.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/replay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/replay.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/sb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/sb.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/super.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/tnc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/tnc.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/ubifs-media.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/ubifs-media.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/ubifs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/ubifs.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ubifs/xattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ubifs/xattr.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/dir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/dir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/directory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/directory.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/ecma_167.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/ecma_167.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/file.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/inode.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/lowlevel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/lowlevel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/misc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/namei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/namei.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/osta_udf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/osta_udf.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/super.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/symlink.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/udf/udfdecl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/udf/udfdecl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ufs/balloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ufs/balloc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ufs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ufs/inode.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/ufs/super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/ufs/super.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/userfaultfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/userfaultfd.c</a></td><td class='right'>622</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/utimes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/utimes.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xattr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/kmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/kmem.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_ag_resv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_ag_resv.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_alloc.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_alloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_alloc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_alloc_btree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_alloc_btree.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_attr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_attr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_attr_leaf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_attr_leaf.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_attr_leaf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_attr_leaf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_bmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_bmap.c</a></td><td class='right'>584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_bmap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_bmap.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_bmap_btree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_bmap_btree.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_btree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_btree.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_btree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_btree.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_cksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_cksum.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_da_btree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_da_btree.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_da_btree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_da_btree.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_dir2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_dir2.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_dir2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_dir2.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_dir2_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_dir2_data.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_dir2_node.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_dir2_node.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_dir2_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_dir2_priv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_ialloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_ialloc.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_ialloc_btree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_ialloc_btree.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_ialloc_btree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_ialloc_btree.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_inode_buf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_inode_buf.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_inode_buf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_inode_buf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_inode_fork.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_inode_fork.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_inode_fork.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_inode_fork.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_log_format.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_log_format.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_log_recover.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_log_recover.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_refcount_btree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_refcount_btree.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_refcount_btree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_refcount_btree.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_rmap_btree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_rmap_btree.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_rmap_btree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_rmap_btree.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_rtbitmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_rtbitmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_sb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_sb.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/libxfs/xfs_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/libxfs/xfs_types.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_aops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_aops.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_aops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_aops.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_attr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_attr.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_attr_list.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_attr_list.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_bmap_util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_bmap_util.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_bmap_util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_bmap_util.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_buf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_buf.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_buf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_buf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_buf_item.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_buf_item.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_dir2_readdir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_dir2_readdir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_discard.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_discard.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_discard.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_discard.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_dquot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_dquot.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_extent_busy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_extent_busy.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_extent_busy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_extent_busy.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_file.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_fsops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_fsops.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_icache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_icache.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_icache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_icache.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_icreate_item.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_icreate_item.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_inode.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_inode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_inode.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_inode_item.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_inode_item.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_ioctl.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_ioctl32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_ioctl32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_iomap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_iomap.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_iomap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_iomap.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_iops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_iops.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_linux.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_linux.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_log.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_log.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_log.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_log_cil.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_log_cil.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_log_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_log_priv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_log_recover.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_log_recover.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_mount.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_mount.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_mount.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_mount.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_pnfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_pnfs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_pnfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_pnfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_qm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_qm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_refcount_item.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_refcount_item.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_reflink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_reflink.c</a></td><td class='right'>661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_reflink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_reflink.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_rtalloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_rtalloc.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_rtalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_rtalloc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_stats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_stats.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_stats.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_stats.h</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_super.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_super.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_super.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_super.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_symlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_symlink.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_sysfs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_trace.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_trans.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_trans.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/fs/xfs/xfs_xattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>fs/xfs/xfs_xattr.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acbuffer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acbuffer.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acconfig.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acconfig.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acexcep.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acexcep.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acnames.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acnames.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acoutput.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acoutput.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acpi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acpi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acpi_bus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acpi_bus.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acpi_io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acpi_io.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acpiosxf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acpiosxf.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acpixf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acpixf.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acrestyp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acrestyp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/actbl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/actbl.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/actbl1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/actbl1.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/actbl2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/actbl2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/actbl3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/actbl3.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/actypes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/actypes.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/acuuid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/acuuid.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/platform/acenv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/platform/acenv.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/platform/acenvex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/platform/acenvex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/platform/acgcc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/platform/acgcc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/platform/acgccex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/platform/acgccex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/acpi/platform/acintel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/platform/acintel.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/platform/aclinux.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/platform/aclinux.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/platform/aclinuxex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/platform/aclinuxex.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/processor.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/acpi/video.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/acpi/video.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/asm-generic/asm-prototypes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/asm-prototypes.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/asm-generic/atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/atomic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/asm-generic/cputime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/cputime.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/asm-generic/cputime_jiffies.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/cputime_jiffies.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/asm-generic/cputime_nsecs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/cputime_nsecs.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/asm-generic/export.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/export.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/asm-generic/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/kprobes.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/asm-generic/mutex-dec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/mutex-dec.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/asm-generic/mutex-null.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/mutex-null.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/asm-generic/mutex-xchg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/mutex-xchg.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/asm-generic/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/mutex.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/asm-generic/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/pgtable.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/asm-generic/rwsem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/rwsem.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/asm-generic/termios-base.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/termios-base.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/asm-generic/termios.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/termios.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/asm-generic/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/tlb.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/asm-generic/vmlinux.lds.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/asm-generic/vmlinux.lds.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/clocksource/pxa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/clocksource/pxa.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/crypto/acompress.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/acompress.h</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/aead.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/aead.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/algapi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/algapi.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/crypto/cbc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/cbc.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/chacha20.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/chacha20.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/cryptd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/cryptd.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/dh.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/dh.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/ecdh.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/ecdh.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/engine.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/engine.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/gf128mul.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/gf128mul.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/hash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/hash.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/crypto/internal/acompress.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/internal/acompress.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/crypto/internal/scompress.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/internal/scompress.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/crypto/internal/simd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/internal/simd.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/internal/skcipher.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/internal/skcipher.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/kpp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/kpp.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/skcipher.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/skcipher.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/crypto/xts.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/crypto/xts.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/bridge/dw_hdmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/bridge/dw_hdmi.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/drm/bridge/mhl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/bridge/mhl.h</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drmP.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drmP.h</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_atomic.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_atomic_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_atomic_helper.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_auth.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_auth.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_blend.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_blend.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_bridge.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_bridge.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_cache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_cache.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_color_mgmt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_color_mgmt.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_connector.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_connector.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_crtc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_crtc.h</a></td><td class='right'>818</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_crtc_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_crtc_helper.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/drm/drm_debugfs_crc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_debugfs_crc.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_dp_dual_mode_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_dp_dual_mode_helper.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_dp_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_dp_helper.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_dp_mst_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_dp_mst_helper.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/drm/drm_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_drv.h</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_edid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_edid.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_encoder.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_encoder.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_encoder_slave.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_encoder_slave.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_fb_cma_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_fb_cma_helper.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_fb_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_fb_helper.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_flip_work.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_flip_work.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_fourcc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_fourcc.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_framebuffer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_framebuffer.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_gem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_gem.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_gem_cma_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_gem_cma_helper.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_irq.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_mm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_mm.h</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/drm/drm_mode_config.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_mode_config.h</a></td><td class='right'>671</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_mode_object.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_mode_object.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_modes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_modes.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_modeset_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_modeset_helper.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_modeset_helper_vtables.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_modeset_helper_vtables.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_modeset_lock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_modeset_lock.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_of.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_of.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_os_linux.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_os_linux.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_panel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_panel.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_plane.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_plane.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/drm/drm_print.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_print.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_property.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_property.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/drm_simple_kms_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/drm_simple_kms_helper.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/i915_component.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/i915_component.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/i915_pciids.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/i915_pciids.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/intel-gtt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/intel-gtt.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/drm/intel_lpe_audio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/intel_lpe_audio.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/drm/tinydrm/ili9341.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/tinydrm/ili9341.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/drm/tinydrm/mipi-dbi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/tinydrm/mipi-dbi.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/drm/tinydrm/tinydrm-helpers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/tinydrm/tinydrm-helpers.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/drm/tinydrm/tinydrm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/tinydrm/tinydrm.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/ttm/ttm_bo_api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/ttm/ttm_bo_api.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/ttm/ttm_bo_driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/ttm/ttm_bo_driver.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/drm/ttm/ttm_execbuf_util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/drm/ttm/ttm_execbuf_util.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/bcm2835.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/bcm2835.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/dt-bindings/clock/exynos4415.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/exynos4415.h</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/exynos5433.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/exynos5433.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/gxbb-clkc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/gxbb-clkc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/hi3516cv300-clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/hi3516cv300-clock.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/hi3660-clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/hi3660-clock.h</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/histb-clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/histb-clock.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/imx6ul-clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/imx6ul-clock.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/imx7d-clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/imx7d-clock.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/oxsemi,ox810se.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/oxsemi,ox810se.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/oxsemi,ox820.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/oxsemi,ox820.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/qcom,gcc-ipq4019.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/qcom,gcc-ipq4019.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/qcom,gcc-mdm9615.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/qcom,gcc-mdm9615.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/qcom,gcc-msm8994.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/qcom,gcc-msm8994.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/qcom,gcc-msm8996.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/qcom,gcc-msm8996.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/qcom,rpmcc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/qcom,rpmcc.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/r7s72100-clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/r7s72100-clock.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/r8a7743-cpg-mssr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/r8a7743-cpg-mssr.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/r8a7745-cpg-mssr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/r8a7745-cpg-mssr.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/r8a7794-clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/r8a7794-clock.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/rk1108-cru.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/rk1108-cru.h</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/rk3188-cru-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/rk3188-cru-common.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/clock/rk3288-cru.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/rk3288-cru.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/rk3328-cru.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/rk3328-cru.h</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/ste-ab8500.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/ste-ab8500.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/dt-bindings/clock/stih415-clks.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/stih415-clks.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/stm32fx-clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/stm32fx-clock.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/sun50i-a64-ccu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/sun50i-a64-ccu.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/sun5i-ccu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/sun5i-ccu.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/sun8i-v3s-ccu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/sun8i-v3s-ccu.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/sun9i-a80-ccu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/sun9i-a80-ccu.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/sun9i-a80-de.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/sun9i-a80-de.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/sun9i-a80-usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/sun9i-a80-usb.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/clock/tegra186-clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/clock/tegra186-clock.h</a></td><td class='right'>940</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/gpio/meson-gxl-gpio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/gpio/meson-gxl-gpio.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/mailbox/tegra186-hsp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/mailbox/tegra186-hsp.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/mfd/stm32f4-rcc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/mfd/stm32f4-rcc.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/net/mscc-phy-vsc8531.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/net/mscc-phy-vsc8531.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/pinctrl/at91.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/pinctrl/at91.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/pinctrl/bcm2835.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/pinctrl/bcm2835.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/pinctrl/omap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/pinctrl/omap.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/pinctrl/qcom,pmic-gpio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/pinctrl/qcom,pmic-gpio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/pinctrl/qcom,pmic-mpp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/pinctrl/qcom,pmic-mpp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/pinctrl/rockchip.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/pinctrl/rockchip.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/dt-bindings/pinctrl/samsung.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/pinctrl/samsung.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/pinctrl/stm32h7-pinfunc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/pinctrl/stm32h7-pinfunc.h</a></td><td class='right'>1612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/power/mt2701-power.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/power/mt2701-power.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/power/r8a7743-sysc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/power/r8a7743-sysc.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/power/r8a7745-sysc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/power/r8a7745-sysc.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/power/rk3328-power.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/power/rk3328-power.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/power/tegra186-powergate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/power/tegra186-powergate.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/reset/oxsemi,ox810se.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/reset/oxsemi,ox810se.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/reset/oxsemi,ox820.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/reset/oxsemi,ox820.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/reset/sun50i-a64-ccu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/reset/sun50i-a64-ccu.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/reset/sun5i-ccu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/reset/sun5i-ccu.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/reset/sun8i-v3s-ccu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/reset/sun8i-v3s-ccu.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/reset/sun9i-a80-ccu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/reset/sun9i-a80-ccu.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/reset/sun9i-a80-de.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/reset/sun9i-a80-de.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/reset/sun9i-a80-usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/reset/sun9i-a80-usb.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/reset/tegra186-reset.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/reset/tegra186-reset.h</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/soc/zte,pm_domains.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/soc/zte,pm_domains.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/sound/cs42l42.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/sound/cs42l42.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/dt-bindings/thermal/lm90.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/dt-bindings/thermal/lm90.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/keys/user-type.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/keys/user-type.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/kvm/arm_arch_timer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/kvm/arm_arch_timer.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/kvm/arm_vgic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/kvm/arm_vgic.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/acpi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/acpi.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/acpi_iort.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/acpi_iort.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/ahci-remap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ahci-remap.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/aio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/aio.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/alarmtimer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/alarmtimer.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/amba/pl061.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/amba/pl061.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/amba/pl08x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/amba/pl08x.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/arm-smccc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/arm-smccc.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/async_tx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/async_tx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ata.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ata.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/atmel-ssc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/atmel-ssc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/audit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/audit.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/average.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/average.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/backing-dev-defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/backing-dev-defs.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/backing-dev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/backing-dev.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/bcma/bcma_driver_chipcommon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/bcma/bcma_driver_chipcommon.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/binfmts.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/binfmts.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/bio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/bio.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/bitfield.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/bitfield.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/blk-cgroup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/blk-cgroup.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/blk-mq-virtio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/blk-mq-virtio.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/blk-mq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/blk-mq.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/blk_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/blk_types.h</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/blkdev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/blkdev.h</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/blktrace_api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/blktrace_api.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/bpf-cgroup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/bpf-cgroup.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/bpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/bpf.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/bpf_trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/bpf_trace.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/bpf_verifier.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/bpf_verifier.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/brcmphy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/brcmphy.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/bsg-lib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/bsg-lib.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/buffer_head.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/buffer_head.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/bug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/bug.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cacheinfo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cacheinfo.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/can/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/can/core.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/can/dev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/can/dev.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/can/rx-offload.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/can/rx-offload.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/capability.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/capability.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ccp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ccp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cdrom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cdrom.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ceph/auth.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ceph/auth.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ceph/ceph_fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ceph/ceph_fs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ceph/mdsmap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ceph/mdsmap.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ceph/messenger.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ceph/messenger.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ceph/osd_client.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ceph/osd_client.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ceph/osdmap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ceph/osdmap.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ceph/rados.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ceph/rados.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cgroup-defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cgroup-defs.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cgroup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cgroup.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/cgroup_rdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cgroup_rdma.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cgroup_subsys.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cgroup_subsys.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/clk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/clk.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/clk/renesas.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/clk/renesas.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/clockchips.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/clockchips.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/clocksource.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/clocksource.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cma.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/compat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/compat.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/compiler-gcc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/compiler-gcc.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/compiler.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/compiler.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/configfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/configfs.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/console.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/console.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/coredump.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/coredump.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cpu.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cpufreq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cpufreq.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cpuhotplug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cpuhotplug.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cpuidle.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cpuidle.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cpumask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cpumask.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cpuset.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cpuset.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/cputime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cputime.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cred.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cred.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/crush/crush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/crush/crush.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/crush/mapper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/crush/mapper.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/crypto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/crypto.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/cryptohash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/cryptohash.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dax.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dax.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dcache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dcache.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dcookies.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dcookies.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/debugfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/debugfs.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/delay.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/delay.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/delayacct.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/delayacct.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/devfreq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/devfreq.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/devfreq_cooling.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/devfreq_cooling.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/device-mapper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/device-mapper.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/device.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dm-io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dm-io.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dma-buf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dma-buf.h</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dma-contiguous.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dma-contiguous.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/dma-fence-array.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dma-fence-array.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/dma-fence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dma-fence.h</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dma-iommu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dma-iommu.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dma-mapping.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dma/dw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dma/dw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dmaengine.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dmaengine.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dmar.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dmar.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/drbd_genl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/drbd_genl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/dw_apb_timer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/dw_apb_timer.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/edac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/edac.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/efi-bgrt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/efi-bgrt.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/efi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/efi.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/elevator.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/elevator.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/elfcore.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/elfcore.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/etherdevice.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/etherdevice.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/export.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/export.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/extcon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/extcon.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/extcon/extcon-adc-jack.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/extcon/extcon-adc-jack.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/f2fs_fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/f2fs_fs.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fault-inject.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fault-inject.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fddidevice.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fddidevice.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/fence-array.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fence-array.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/fence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fence.h</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/file.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/file.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/filter.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/filter.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/fpga/fpga-bridge.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fpga/fpga-bridge.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fpga/fpga-mgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fpga/fpga-mgr.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/frame.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/frame.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fs.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fscache-cache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fscache-cache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/fscrypt_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fscrypt_common.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/fscrypt_notsupp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fscrypt_notsupp.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/fscrypt_supp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fscrypt_supp.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/fscrypto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fscrypto.h</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/fsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fsi.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fsl-diu-fb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fsl-diu-fb.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fsl/guts.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fsl/guts.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fsl_devices.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fsl_devices.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fsl_ifc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fsl_ifc.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fsnotify.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fsnotify.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fsnotify_backend.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fsnotify_backend.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ftrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ftrace.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/futex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/futex.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/fwnode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/fwnode.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/genhd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/genhd.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/genl_magic_func.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/genl_magic_func.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/gfp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/gfp.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/gpio/consumer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/gpio/consumer.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/gpio/driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/gpio/driver.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/gpio_keys.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/gpio_keys.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/hdlc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/hdlc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/hdmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/hdmi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/hid-sensor-hub.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/hid-sensor-hub.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/hid-sensor-ids.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/hid-sensor-ids.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/hid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/hid.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/hippidevice.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/hippidevice.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/hrtimer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/hrtimer.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/huge_mm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/huge_mm.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/hugetlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/hugetlb.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/hw_random.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/hw_random.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/hwmon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/hwmon.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/hyperv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/hyperv.h</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/i2c-smbus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/i2c-smbus.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/i2c.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/i2c.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/i2c/mlxcpld.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/i2c/mlxcpld.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/i2c/mpr121_touchkey.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/i2c/mpr121_touchkey.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ide.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ide.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/idr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/idr.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ieee80211.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ieee80211.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/if_arp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/if_arp.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/if_bridge.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/if_bridge.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/if_frad.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/if_frad.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/if_macvlan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/if_macvlan.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/if_tap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/if_tap.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/if_vlan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/if_vlan.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iio/adc/ad_sigma_delta.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/adc/ad_sigma_delta.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iio/buffer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/buffer.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/iio/buffer_impl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/buffer_impl.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iio/common/st_sensors.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/common/st_sensors.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iio/common/st_sensors_i2c.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/common/st_sensors_i2c.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iio/consumer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/consumer.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iio/dac/mcp4725.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/dac/mcp4725.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iio/iio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/iio.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iio/kfifo_buf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/kfifo_buf.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iio/sysfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/sysfs.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/iio/timer/stm32-timer-trigger.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/timer/stm32-timer-trigger.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iio/trigger.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/trigger.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iio/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iio/types.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ima.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ima.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/init.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/init.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/init_task.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/init_task.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/input/matrix_keypad.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/input/matrix_keypad.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/input/tca8418_keypad.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/input/tca8418_keypad.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/intel-iommu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/intel-iommu.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/intel_pmic_gpio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/intel_pmic_gpio.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/interrupt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/interrupt.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iomap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iomap.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iommu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iommu.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/iopoll.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/iopoll.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ipmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ipmi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ipv6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ipv6.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/irq.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/irqchip/arm-gic-v3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/irqchip/arm-gic-v3.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/irqchip/mips-gic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/irqchip/mips-gic.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/irqdomain.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/irqdomain.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/isdnif.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/isdnif.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/jiffies.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/jiffies.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/jump_label.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/jump_label.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/jump_label_ratelimit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/jump_label_ratelimit.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kasan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kasan.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kconfig.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kconfig.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kdb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kdb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kernel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kernel.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kernel_stat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kernel_stat.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kernfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kernfs.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kexec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kexec.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/key.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/key.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/khugepaged.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/khugepaged.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kmod.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kmod.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kprobes.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kref.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kref.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ksm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ksm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kthread.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kthread.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ktime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ktime.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/kvm_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/kvm_host.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/leds.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/leds.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/libata.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/libata.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/libnvdimm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/libnvdimm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/lightnvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/lightnvm.h</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/list.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/list.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/llist.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/llist.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/lockd/lockd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/lockd/lockd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/lockdep.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/lockdep.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/log2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/log2.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/lsm_hooks.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/lsm_hooks.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/lz4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/lz4.h</a></td><td class='right'>701</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/marvell_phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/marvell_phy.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/math64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/math64.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mbus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mbus.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mc146818rtc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mc146818rtc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/mdev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mdev.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mdio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mdio.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mei_cl_bus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mei_cl_bus.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/memblock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/memblock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/memcontrol.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/memcontrol.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/memory.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/memory.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/memory_hotplug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/memory_hotplug.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mempolicy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mempolicy.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/abx500.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/abx500.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/abx500/ab8500-bm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/abx500/ab8500-bm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/axp20x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/axp20x.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/cros_ec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/cros_ec.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/cros_ec_commands.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/cros_ec_commands.h</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/davinci_voicecodec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/davinci_voicecodec.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/intel_soc_pmic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/intel_soc_pmic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/lpc_ich.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/lpc_ich.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/mfd/motorola-cpcap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/motorola-cpcap.h</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/rk808.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/rk808.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/rn5t618.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/rn5t618.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/mfd/stm32-timers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/stm32-timers.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/mfd/sun4i-gpadc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/sun4i-gpadc.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/ti_am335x_tscadc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/ti_am335x_tscadc.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/tmio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/tmio.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/tps65217.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/tps65217.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/tps65218.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/tps65218.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/tps65910.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/tps65910.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mfd/tps65912.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mfd/tps65912.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mic_bus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mic_bus.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/micrel_phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/micrel_phy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/migrate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/migrate.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mii.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mii.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/miscdevice.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/miscdevice.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx4/cmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx4/cmd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx4/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx4/device.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx4/driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx4/driver.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx5/cq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx5/cq.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx5/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx5/device.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx5/doorbell.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx5/doorbell.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx5/driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx5/driver.h</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx5/fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx5/fs.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx5/mlx5_ifc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx5/mlx5_ifc.h</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx5/port.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx5/port.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx5/qp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx5/qp.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx5/srq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx5/srq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mlx5/vport.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mlx5/vport.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mm.h</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mm_inline.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mm_inline.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mm_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mm_types.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/mm_types_task.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mm_types_task.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/mmc/boot.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mmc/boot.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mmc/card.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mmc/card.h</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mmc/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mmc/core.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/mmc/dw_mmc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mmc/dw_mmc.h</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mmc/host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mmc/host.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mmc/mmc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mmc/mmc.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mmc/sdio_ids.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mmc/sdio_ids.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mmc/sh_mmcif.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mmc/sh_mmcif.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mmc/slot-gpio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mmc/slot-gpio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mmu_notifier.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mmu_notifier.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mmzone.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mmzone.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mod_devicetable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mod_devicetable.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/module.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/module.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mount.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mount.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mroute.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mroute.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mroute6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mroute6.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/msi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/msi.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/mtd/fsmc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mtd/fsmc.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mtd/mtd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mtd/mtd.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mtd/nand.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mtd/nand.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mtd/partitions.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mtd/partitions.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mtd/qinfo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mtd/qinfo.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mtd/spi-nor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mtd/spi-nor.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/mutex-debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mutex-debug.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/mutex.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netdev_features.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netdev_features.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netdevice.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netdevice.h</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netfilter.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netfilter.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netfilter/ipset/ip_set.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netfilter/ipset/ip_set.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netfilter/ipset/ip_set_bitmap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netfilter/ipset/ip_set_bitmap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netfilter/ipset/ip_set_comment.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netfilter/ipset/ip_set_comment.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/netfilter/ipset/ip_set_counter.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netfilter/ipset/ip_set_counter.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/netfilter/ipset/ip_set_skbinfo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netfilter/ipset/ip_set_skbinfo.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netfilter/ipset/ip_set_timeout.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netfilter/ipset/ip_set_timeout.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netfilter/nf_conntrack_dccp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netfilter/nf_conntrack_dccp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netfilter/nfnetlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netfilter/nfnetlink.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netfilter/x_tables.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netfilter/x_tables.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netfilter_ingress.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netfilter_ingress.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/netpoll.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/netpoll.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/nfs4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/nfs4.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/nfs_fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/nfs_fs.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/nfs_xdr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/nfs_xdr.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/nmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/nmi.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ntb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ntb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/nvme-fc-driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/nvme-fc-driver.h</a></td><td class='right'>851</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/nvme-fc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/nvme-fc.h</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/nvme-rdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/nvme-rdma.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/nvme.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/nvme.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/of.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/of.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/of_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/of_device.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/of_fdt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/of_fdt.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/of_graph.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/of_graph.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/of_iommu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/of_iommu.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/of_pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/of_pci.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/oom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/oom.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/page-flags.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/page-flags.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pagemap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pagemap.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/parman.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/parman.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/parser.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/parser.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pci-acpi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pci-acpi.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pci-ecam.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pci-ecam.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pci.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pci_hotplug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pci_hotplug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pci_ids.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pci_ids.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/percpu-refcount.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/percpu-refcount.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/percpu-rwsem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/percpu-rwsem.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/perf_event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/perf_event.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/perf_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/perf_regs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pfn_t.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pfn_t.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/phy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/phy.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/phy/phy-qcom-ufs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/phy/phy-qcom-ufs.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/phy_led_triggers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/phy_led_triggers.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pid.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pid_namespace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pid_namespace.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pim.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pinctrl/consumer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pinctrl/consumer.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pinctrl/pinconf-generic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pinctrl/pinconf-generic.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pinctrl/pinctrl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pinctrl/pinctrl.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/platform_data/asoc-s3c.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/asoc-s3c.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/platform_data/dma-dw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/dma-dw.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/platform_data/drv260x-pdata.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/drv260x-pdata.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/platform_data/gpio-davinci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/gpio-davinci.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/platform_data/intel-spi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/intel-spi.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/platform_data/macb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/macb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/platform_data/media/ir-rx51.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/media/ir-rx51.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/platform_data/mlxcpld-hotplug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/mlxcpld-hotplug.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/platform_data/mmc-mxcmmc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/mmc-mxcmmc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/platform_data/mtd-nand-s3c2410.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/mtd-nand-s3c2410.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/platform_data/rtc-m48t86.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/rtc-m48t86.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/platform_data/spi-ep93xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/spi-ep93xx.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/platform_data/spi-s3c64xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/spi-s3c64xx.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/platform_data/ti-aemif.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/ti-aemif.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/platform_data/usb-davinci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/usb-davinci.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/platform_data/video-imxfb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/video-imxfb.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/platform_data/x86/clk-pmc-atom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/x86/clk-pmc-atom.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/include/linux/platform_data/x86/pmc_atom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/platform_data/x86/pmc_atom.h</a> (renamed from arch/x86/include/asm/pmc_atom.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pm-trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pm-trace.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pm.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pm_domain.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pm_domain.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pm_opp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pm_opp.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pm_qos.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pm_qos.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pm_runtime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pm_runtime.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/poison.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/poison.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/poll.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/poll.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/posix-timers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/posix-timers.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/power/bq27xxx_battery.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/power/bq27xxx_battery.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/preempt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/preempt.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/prime_numbers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/prime_numbers.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/printk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/printk.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/proc_fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/proc_fs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/property.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/property.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pstore.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pstore.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pstore_ram.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pstore_ram.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ptp_clock_kernel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ptp_clock_kernel.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ptr_ring.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ptr_ring.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ptrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ptrace.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pwm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pwm.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/pxa2xx_ssp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/pxa2xx_ssp.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qcom_scm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qcom_scm.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/common_hsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/common_hsi.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/eth_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/eth_common.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/qed/fcoe_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/fcoe_common.h</a></td><td class='right'>715</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/iscsi_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/iscsi_common.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/qed_chain.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/qed_chain.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/qed_eth_if.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/qed_eth_if.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/qed/qed_fcoe_if.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/qed_fcoe_if.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/qed_if.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/qed_if.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/qed_iov_if.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/qed_iov_if.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/qed/qed_iscsi_if.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/qed_iscsi_if.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/qed_ll2_if.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/qed_ll2_if.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/qed_roce_if.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/qed_roce_if.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/qede_roce.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/qede_roce.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/rdma_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/rdma_common.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/roce_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/roce_common.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/storage_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/storage_common.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/qed/tcp_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/qed/tcp_common.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/quota.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/quota.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/quotaops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/quotaops.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/radix-tree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/radix-tree.h</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ratelimit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ratelimit.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/rbtree_augmented.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rbtree_augmented.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/rculist.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rculist.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/rcupdate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rcupdate.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/rcupdate_wait.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rcupdate_wait.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/rcutiny.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rcutiny.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/rcuwait.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rcuwait.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/refcount.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/refcount.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/regmap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/regmap.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/remoteproc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/remoteproc.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/remoteproc/st_slim_rproc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/remoteproc/st_slim_rproc.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/reservation.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/reservation.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/reset.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/reset.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/restart_block.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/restart_block.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/rfkill-regulator.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rfkill-regulator.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/rhashtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rhashtable.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ring_buffer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ring_buffer.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/rmap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rmap.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/rmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rmi.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/rodata_test.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rodata_test.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/rpmsg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rpmsg.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/rpmsg/qcom_smd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/rpmsg/qcom_smd.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sbitmap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sbitmap.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sched.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched.h</a></td><td class='right'>3507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 21.6%;'/><td class='none' style='width: 72.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/autogroup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/autogroup.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/clock.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/coredump.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/coredump.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/cpufreq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/cpufreq.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/cputime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/cputime.h</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sched/deadline.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/deadline.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/debug.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/hotplug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/hotplug.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/idle.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/idle.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/init.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/init.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/jobctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/jobctl.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/loadavg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/loadavg.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/mm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/mm.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/nohz.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/nohz.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/numa_balancing.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/numa_balancing.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sched/prio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/prio.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sched/rt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/rt.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/signal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/signal.h</a></td><td class='right'>613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/stat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/stat.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sched/sysctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/sysctl.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/task.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/task.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/task_stack.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/task_stack.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/topology.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/topology.h</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/user.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/user.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/wake_q.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/wake_q.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sched/xacct.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sched/xacct.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sctp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sctp.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/security.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/security.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sed-opal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sed-opal.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/seg6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/seg6.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/seg6_genl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/seg6_genl.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/seg6_hmac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/seg6_hmac.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/seg6_iptunnel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/seg6_iptunnel.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sem.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/seqno-fence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/seqno-fence.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/serdev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/serdev.h</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/serial_8250.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/serial_8250.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/serial_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/serial_core.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/serial_sci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/serial_sci.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/shmem_fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/shmem_fs.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/signal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/signal.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/signal_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/signal_types.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/signalfd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/signalfd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/siphash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/siphash.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/skbuff.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/skbuff.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/slab.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/slab.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/slub_def.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/slub_def.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/smc91x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/smc91x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/soc/qcom/mdt_loader.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/soc/qcom/mdt_loader.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/soc/qcom/smem_state.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/soc/qcom/smem_state.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/soc/qcom/wcnss_ctrl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/soc/qcom/wcnss_ctrl.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/soc/renesas/rcar-rst.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/soc/renesas/rcar-rst.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/soc/samsung/exynos-pmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/soc/samsung/exynos-pmu.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/soc/samsung/exynos-regs-pmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/soc/samsung/exynos-regs-pmu.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/soc/ti/knav_dma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/soc/ti/knav_dma.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/soc/ti/ti_sci_protocol.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/soc/ti/ti_sci_protocol.h</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/socket.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/spi/flash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/spi/flash.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/spi/spi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/spi/spi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/linux/spi/tsc2005.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/spi/tsc2005.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/spinlock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/spinlock.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/spinlock_api_smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/spinlock_api_smp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/spinlock_api_up.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/spinlock_api_up.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/sram.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sram.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/srcu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/srcu.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/stat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/stat.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/stm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/stm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/stmmac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/stmmac.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/auth.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/auth.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/cache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/cache.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/clnt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/clnt.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/debug.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/rpc_rdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/rpc_rdma.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/svc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/svc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/svc_rdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/svc_rdma.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/svc_xprt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/svc_xprt.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/xdr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/xdr.h</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/xprt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/xprt.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sunrpc/xprtsock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sunrpc/xprtsock.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/swap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/swap.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/swap_slots.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/swap_slots.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/swiotlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/swiotlb.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sync_file.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sync_file.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sys_soc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sys_soc.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/syscalls.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/syscalls.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/sysctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/sysctl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/taskstats_kern.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/taskstats_kern.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/tcp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/tcp.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/thermal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/thermal.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/thread_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/thread_info.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/tick.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/tick.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/time.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/time.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/timecounter.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/timecounter.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/timekeeper_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/timekeeper_internal.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/timekeeping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/timekeeping.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/timer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/timer.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/timerfd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/timerfd.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/linux/trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/trace.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/trace_events.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/trace_events.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/tracepoint-defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/tracepoint-defs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/tracepoint.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/tracepoint.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/tty.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/tty.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/types.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/udp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/udp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/uio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/uio.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/uprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/uprobes.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/usb/chipidea.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/usb/chipidea.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/usb/gadget.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/usb/gadget.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/usb/hcd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/usb/hcd.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/user_namespace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/user_namespace.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/userfaultfd_k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/userfaultfd_k.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/uuid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/uuid.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/vfio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/vfio.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/virtio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/virtio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/virtio_config.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/virtio_config.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/virtio_net.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/virtio_net.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/vm_event_item.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/vm_event_item.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/vmacache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/vmacache.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/vmalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/vmalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/vme.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/vme.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/vmw_vmci_defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/vmw_vmci_defs.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/vt_kern.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/vt_kern.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/vtime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/vtime.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/wait.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/wait.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/watchdog.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/watchdog.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/workqueue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/workqueue.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/writeback.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/writeback.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/linux/ww_mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/linux/ww_mutex.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/blackfin/ppi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/blackfin/ppi.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/cec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/cec.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/ccdc_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/ccdc_types.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/dm355_ccdc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/dm355_ccdc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/dm644x_ccdc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/dm644x_ccdc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/isif.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/isif.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/vpbe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/vpbe.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/vpbe_osd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/vpbe_osd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/vpbe_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/vpbe_types.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/vpbe_venc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/vpbe_venc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/vpfe_capture.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/vpfe_capture.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/vpfe_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/vpfe_types.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/vpif_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/vpif_types.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/davinci/vpss.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/davinci/vpss.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/drv-intf/tea575x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/drv-intf/tea575x.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/i2c/adp1653.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/i2c/adp1653.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/i2c/adv7183.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/i2c/adv7183.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/i2c/as3645a.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/i2c/as3645a.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/i2c/lm3560.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/i2c/lm3560.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/i2c/mt9m032.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/i2c/mt9m032.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/i2c/smiapp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/i2c/smiapp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/i2c/ths7303.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/i2c/ths7303.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/i2c/tvp514x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/i2c/tvp514x.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/i2c/tvp7002.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/i2c/tvp7002.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/i2c/upd64031a.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/i2c/upd64031a.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/i2c/upd64083.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/i2c/upd64083.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/media-device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/media-device.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/media-devnode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/media-devnode.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/media-entity.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/media-entity.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/rc-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/rc-core.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/rc-map.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/rc-map.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/v4l2-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/v4l2-common.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/v4l2-ctrls.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/v4l2-ctrls.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/v4l2-dv-timings.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/v4l2-dv-timings.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/v4l2-event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/v4l2-event.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/v4l2-fh.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/v4l2-fh.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/v4l2-ioctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/v4l2-ioctl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/v4l2-mem2mem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/v4l2-mem2mem.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/v4l2-subdev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/v4l2-subdev.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/media/v4l2-tpg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/media/v4l2-tpg.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/9p/9p.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/9p/9p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/9p/client.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/9p/client.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/act_api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/act_api.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/addrconf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/addrconf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/arp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/arp.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/bluetooth/bluetooth.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/bluetooth/bluetooth.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/bluetooth/hci_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/bluetooth/hci_core.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/bonding.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/bonding.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/busy_poll.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/busy_poll.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/cfg80211.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/cfg80211.h</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/checksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/checksum.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/cipso_ipv4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/cipso_ipv4.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/devlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/devlink.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/dsa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/dsa.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/dst.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/dst.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/dst_metadata.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/dst_metadata.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/dst_ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/dst_ops.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/fib_rules.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/fib_rules.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/flow.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/flow.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/flow_dissector.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/flow_dissector.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/flowcache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/flowcache.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/gen_stats.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/gen_stats.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/genetlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/genetlink.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/gro_cells.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/gro_cells.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/ieee80211_radiotap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/ieee80211_radiotap.h</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/if_inet6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/if_inet6.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/net/ife.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/ife.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/inet6_connection_sock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/inet6_connection_sock.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/inet_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/inet_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/inet_connection_sock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/inet_connection_sock.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/inet_frag.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/inet_frag.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/inet_hashtables.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/inet_hashtables.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/inet_sock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/inet_sock.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/inet_timewait_sock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/inet_timewait_sock.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/ip.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/ip.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/ip6_fib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/ip6_fib.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/ip6_route.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/ip6_route.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/ip_fib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/ip_fib.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/ip_tunnels.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/ip_tunnels.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/ip_vs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/ip_vs.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/ipv6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/ipv6.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/iw_handler.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/iw_handler.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/lwtunnel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/lwtunnel.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/mac80211.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/mac80211.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/ndisc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/ndisc.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/neighbour.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/neighbour.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/net_namespace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/net_namespace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/ipv4/nf_conntrack_ipv4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/ipv4/nf_conntrack_ipv4.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/ipv4/nf_defrag_ipv4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/ipv4/nf_defrag_ipv4.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/ipv6/nf_conntrack_ipv6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/ipv6/nf_conntrack_ipv6.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/ipv6/nf_defrag_ipv6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/ipv6/nf_defrag_ipv6.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/nf_conntrack.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_conntrack.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/nf_conntrack_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_conntrack_core.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/nf_conntrack_l3proto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_conntrack_l3proto.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/nf_conntrack_l4proto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_conntrack_l4proto.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/nf_conntrack_synproxy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_conntrack_synproxy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/nf_dup_netdev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_dup_netdev.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/nf_log.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_log.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/nf_nat_l4proto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_nat_l4proto.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/nf_queue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_queue.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/net/netfilter/nf_socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_socket.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/nf_tables.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_tables.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/nf_tables_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nf_tables_core.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/net/netfilter/nft_fib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/nft_fib.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netfilter/xt_rateest.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netfilter/xt_rateest.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netlink.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netns/conntrack.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netns/conntrack.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netns/generic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netns/generic.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netns/ipv4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netns/ipv4.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netns/ipv6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netns/ipv6.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netns/netfilter.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netns/netfilter.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/netns/sctp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/netns/sctp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/pkt_cls.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/pkt_cls.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/pkt_sched.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/pkt_sched.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/net/psample.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/psample.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/raw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/raw.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/rawv6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/rawv6.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/red.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/red.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/request_sock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/request_sock.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/route.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/route.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/rtnetlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/rtnetlink.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/sch_generic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/sch_generic.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/scm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/scm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/sctp/constants.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/sctp/constants.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/sctp/sctp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/sctp/sctp.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/sctp/sm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/sctp/sm.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/sctp/structs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/sctp/structs.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/sctp/ulpevent.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/sctp/ulpevent.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/secure_seq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/secure_seq.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/net/seg6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/seg6.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/net/seg6_hmac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/seg6_hmac.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/net/smc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/smc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/sock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/sock.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/switchdev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/switchdev.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/tc_act/tc_ife.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/tc_act/tc_ife.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/tc_act/tc_mirred.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/tc_act/tc_mirred.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/tc_act/tc_pedit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/tc_act/tc_pedit.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/net/tc_act/tc_sample.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/tc_act/tc_sample.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/tc_act/tc_skbedit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/tc_act/tc_skbedit.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/tc_act/tc_tunnel_key.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/tc_act/tc_tunnel_key.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/tcp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/tcp.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/udp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/udp.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/udplite.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/udplite.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/vxlan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/vxlan.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/net/xfrm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/net/xfrm.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/ib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/ib.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/ib_addr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/ib_addr.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/ib_cache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/ib_cache.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/ib_cm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/ib_cm.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/ib_hdrs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/ib_hdrs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/ib_mad.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/ib_mad.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/ib_sa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/ib_sa.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/ib_umem_odp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/ib_umem_odp.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/ib_verbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/ib_verbs.h</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/iw_cm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/iw_cm.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/opa_smi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/opa_smi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/rdma_cm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/rdma_cm.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/rdma_vt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/rdma_vt.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/rdmavt_mr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/rdmavt_mr.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/rdma/rdmavt_qp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/rdma/rdmavt_qp.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/scsi/iscsi_proto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/iscsi_proto.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/scsi/libfc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/libfc.h</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/scsi/libiscsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/libiscsi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/scsi/scsi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/scsi.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/scsi/scsi_cmnd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/scsi_cmnd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/scsi/scsi_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/scsi_device.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/scsi/scsi_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/scsi_host.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/scsi/scsi_proto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/scsi_proto.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/scsi/scsi_request.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/scsi_request.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/scsi/scsi_transport.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/scsi_transport.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/scsi/scsi_transport_fc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/scsi_transport_fc.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/scsi/scsi_transport_srp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/scsi/scsi_transport_srp.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/soc/arc/aux.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/arc/aux.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/soc/arc/mcip.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/arc/mcip.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/soc/arc/timers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/arc/timers.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/soc/at91/at91sam9_ddrsdr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/at91/at91sam9_ddrsdr.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/soc/at91/atmel-secumod.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/at91/atmel-secumod.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/soc/bcm2835/raspberrypi-firmware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/bcm2835/raspberrypi-firmware.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/soc/fsl/qman.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/fsl/qman.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/soc/nps/mtm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/nps/mtm.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/soc/tegra/bpmp-abi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/tegra/bpmp-abi.h</a></td><td class='right'>1601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/soc/tegra/bpmp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/tegra/bpmp.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/soc/tegra/ivc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/tegra/ivc.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/soc/tegra/pmc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/soc/tegra/pmc.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/compress_driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/compress_driver.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/control.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/control.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/core.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/sound/cs35l34.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/cs35l34.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/emu10k1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/emu10k1.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/hda_i915.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/hda_i915.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/hdmi-codec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/hdmi-codec.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/pcm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/pcm.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/rawmidi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/rawmidi.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/sound/rt5514.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/rt5514.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/sound/rt5665.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/rt5665.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/simple_card_utils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/simple_card_utils.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/snd_wavefront.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/snd_wavefront.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/soc-dai.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/soc-dai.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/soc-dapm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/soc-dapm.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/soc-topology.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/soc-topology.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/sound/soc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/sound/soc.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/target/iscsi/iscsi_target_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/target/iscsi/iscsi_target_core.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/target/iscsi/iscsi_target_stat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/target/iscsi/iscsi_target_stat.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/target/iscsi/iscsi_transport.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/target/iscsi/iscsi_transport.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/target/target_core_backend.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/target/target_core_backend.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/target/target_core_base.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/target/target_core_base.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/target/target_core_fabric.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/target/target_core_fabric.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/trace/events/afs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/afs.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/trace/events/alarmtimer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/alarmtimer.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/bcache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/bcache.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/block.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/block.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/trace/events/bpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/bpf.h</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/btrfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/btrfs.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/cgroup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/cgroup.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/compaction.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/compaction.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/trace/events/dma_fence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/dma_fence.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/f2fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/f2fs.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/include/trace/events/fence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/fence.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/trace/events/fs_dax.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/fs_dax.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/i2c.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/i2c.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/trace/events/mdio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/mdio.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/mmflags.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/mmflags.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/oom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/oom.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/rcu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/rcu.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/rxrpc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/rxrpc.h</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/sched.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/sched.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/swiotlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/swiotlb.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/timer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/timer.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/trace/events/ufs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/ufs.h</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/vmscan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/vmscan.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/trace/events/wbt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/wbt.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/events/writeback.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/writeback.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/trace/events/xdp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/events/xdp.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/trace/trace_events.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/trace/trace_events.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/asm-generic/ioctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/asm-generic/ioctl.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/asm-generic/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/asm-generic/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/drm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/drm/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/drm/amdgpu_drm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/drm/amdgpu_drm.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/drm/drm_fourcc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/drm/drm_fourcc.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/drm/drm_mode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/drm/drm_mode.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/drm/i915_drm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/drm/i915_drm.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/drm/msm_drm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/drm/msm_drm.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/drm/vc4_drm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/drm/vc4_drm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/Kbuild</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/android/binder.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/android/binder.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/audit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/audit.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/auto_dev-ioctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/auto_dev-ioctl.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/auto_fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/auto_fs.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/auto_fs4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/auto_fs4.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/batman_adv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/batman_adv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/blkzoned.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/blkzoned.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/bpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/bpf.h</a></td><td class='right'>670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/can/netlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/can/netlink.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/include/uapi/linux/cec-funcs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/cec-funcs.h</a> (renamed from include/linux/cec-funcs.h)</td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/include/uapi/linux/cec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/cec.h</a> (renamed from include/linux/cec.h)</td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/cryptouser.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/cryptouser.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/devlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/devlink.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/dm-log-userspace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/dm-log-userspace.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/ethtool.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/ethtool.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/fcntl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/fcntl.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/fib_rules.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/fib_rules.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/fs.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/genetlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/genetlink.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/hw_breakpoint.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/hw_breakpoint.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/if.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/if.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/if_bridge.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/if_bridge.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/if_ether.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/if_ether.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/if_link.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/if_link.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/if_pppol2tp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/if_pppol2tp.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/ife.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/ife.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/igmp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/igmp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/iio/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/iio/types.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/in.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/in.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/in6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/in6.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/inet_diag.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/inet_diag.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/ip6_tunnel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/ip6_tunnel.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/ipv6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/ipv6.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/ipv6_route.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/ipv6_route.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/kvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/kvm.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/kvm_para.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/kvm_para.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/l2tp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/l2tp.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/lightnvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/lightnvm.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/llc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/llc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/lwtunnel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/lwtunnel.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/magic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/magic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/major.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/major.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/mmc/ioctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/mmc/ioctl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/mpls.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/mpls.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/mqueue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/mqueue.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/mroute.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/mroute.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/mroute6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/mroute6.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/nbd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/nbd.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/neighbour.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/neighbour.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/net_tstamp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/net_tstamp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/netconf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/netconf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/netfilter.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/netfilter.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/netfilter/nf_conntrack_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/netfilter/nf_conntrack_common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/netfilter/nf_conntrack_tuple_common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/netfilter/nf_log.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/netfilter/nf_log.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/netfilter/nf_tables.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/netfilter/nf_tables.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/netfilter/nfnetlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/netfilter/nfnetlink.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/netfilter/nfnetlink_queue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/netfilter/nfnetlink_queue.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/netfilter/xt_bpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/netfilter/xt_bpf.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/netfilter/xt_hashlimit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/netfilter/xt_hashlimit.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/netlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/netlink.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/nfsd/export.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/nfsd/export.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/nl80211.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/nl80211.h</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/nsfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/nsfs.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/openvswitch.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/openvswitch.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/pci_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/pci_regs.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/pkt_cls.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/pkt_cls.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/psample.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/psample.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/raid/md_p.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/raid/md_p.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/rds.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/rds.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/rpmsg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/rpmsg.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/rtnetlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/rtnetlink.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/sched/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/sched/types.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/sctp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/sctp.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/sed-opal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/sed-opal.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/seg6.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/seg6.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/seg6_genl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/seg6_genl.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/seg6_hmac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/seg6_hmac.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/seg6_iptunnel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/seg6_iptunnel.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/serial_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/serial_core.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/serial_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/serial_reg.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/serio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/serio.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/smc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/smc.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/smc_diag.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/smc_diag.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/snmp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/snmp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/sockios.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/sockios.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/stat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/stat.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/target_core_user.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/target_core_user.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/tc_act/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/tc_act/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/tc_act/tc_bpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/tc_act/tc_bpf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/tc_act/tc_csum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/tc_act/tc_csum.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/tc_act/tc_ife.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/tc_act/tc_ife.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/tc_act/tc_pedit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/tc_act/tc_pedit.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/tc_act/tc_sample.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/tc_act/tc_sample.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/tc_act/tc_skbedit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/tc_act/tc_skbedit.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/tc_act/tc_tunnel_key.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/tc_act/tc_tunnel_key.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/tcp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/tcp.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/timerfd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/timerfd.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/tipc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/tipc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/types.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/uleds.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/uleds.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/un.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/un.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/usb/ch9.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/usb/ch9.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/usb/functionfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/usb/functionfs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/userfaultfd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/userfaultfd.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/v4l2-controls.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/v4l2-controls.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/v4l2-dv-timings.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/v4l2-dv-timings.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/vfio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/vfio.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/vhost.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/vhost.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/videodev2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/videodev2.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/linux/virtio_crypto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/virtio_crypto.h</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/virtio_ids.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/virtio_ids.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/include/uapi/linux/virtio_mmio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/virtio_mmio.h</a> (renamed from include/linux/virtio_mmio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/virtio_pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/virtio_pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/virtio_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/virtio_types.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/linux/vtpm_proxy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/linux/vtpm_proxy.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/rdma/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/rdma/bnxt_re-abi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/bnxt_re-abi.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/rdma/cxgb3-abi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/cxgb3-abi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/rdma/hfi/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/hfi/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/rdma/hfi/hfi1_ioctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/hfi/hfi1_ioctl.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/rdma/hfi/hfi1_user.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/hfi/hfi1_user.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/rdma/hns-abi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/hns-abi.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/rdma/ib_user_mad.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/ib_user_mad.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/rdma/ib_user_verbs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/ib_user_verbs.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/rdma/mlx5-abi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/mlx5-abi.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/rdma/rdma_user_cm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/rdma_user_cm.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/rdma/rdma_user_ioctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/rdma_user_ioctl.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/uapi/rdma/vmw_pvrdma-abi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/rdma/vmw_pvrdma-abi.h</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/scsi/cxlflash_ioctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/scsi/cxlflash_ioctl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/scsi/fc/fc_fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/scsi/fc/fc_fs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/sound/asoc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/sound/asoc.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/sound/snd_sst_tokens.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/sound/snd_sst_tokens.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/uapi/xen/privcmd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/uapi/xen/privcmd.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/video/display_timing.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/video/display_timing.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/video/exynos5433_decon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/video/exynos5433_decon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/video/imx-ipu-v3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/video/imx-ipu-v3.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/video/of_display_timing.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/video/of_display_timing.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/xen/arm/hypercall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/arm/hypercall.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/xen/arm/hypervisor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/arm/hypervisor.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/xen/arm/interface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/arm/interface.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/xen/arm/page-coherent.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/arm/page-coherent.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/xen/arm/page.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/arm/page.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/xen/interface/elfnote.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/interface/elfnote.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/xen/interface/grant_table.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/interface/grant_table.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/xen/interface/hvm/dm_op.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/interface/hvm/dm_op.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/xen/interface/hvm/hvm_vcpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/interface/hvm/hvm_vcpu.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/include/xen/interface/hvm/start_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/interface/hvm/start_info.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/xen/interface/xen.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/interface/xen.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/xen/swiotlb-xen.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/swiotlb-xen.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/xen/xen.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/xen.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/include/xen/xenbus.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>include/xen/xenbus.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/init/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>init/Kconfig</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/init/do_mounts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>init/do_mounts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/init/init_task.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>init/init_task.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/init/initramfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>init/initramfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/init/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>init/main.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/init/version.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>init/version.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/ipc/mqueue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>ipc/mqueue.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/ipc/msg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>ipc/msg.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/ipc/namespace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>ipc/namespace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/ipc/sem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>ipc/sem.c</a></td><td class='right'>622</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/ipc/shm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>ipc/shm.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/Kconfig.locks?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/Kconfig.locks</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/acct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/acct.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/audit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/audit.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/audit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/audit.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/audit_fsnotify.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/audit_fsnotify.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/audit_tree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/audit_tree.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/audit_watch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/audit_watch.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/auditfilter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/auditfilter.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/auditsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/auditsc.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/bpf/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/bpf/arraymap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/arraymap.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/bpf/bpf_lru_list.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/bpf_lru_list.c</a></td><td class='right'>697</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/bpf/bpf_lru_list.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/bpf_lru_list.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/bpf/cgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/cgroup.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/bpf/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/core.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/bpf/hashtab.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/hashtab.c</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/bpf/helpers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/helpers.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/bpf/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/inode.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/bpf/lpm_trie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/lpm_trie.c</a></td><td class='right'>521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/bpf/stackmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/stackmap.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/bpf/syscall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/syscall.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/bpf/verifier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/bpf/verifier.c</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/capability.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/capability.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/kernel/cgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cgroup.c</a></td><td class='right'>6642</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 51.8%;'/><td class='none' style='width: 48.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/cgroup/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cgroup/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/cgroup/cgroup-internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cgroup/cgroup-internal.h</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/cgroup/cgroup-v1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cgroup/cgroup-v1.c</a></td><td class='right'>1398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/cgroup/cgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cgroup/cgroup.c</a></td><td class='right'>5068</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 39.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 60.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/kernel/cgroup/cpuset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cgroup/cpuset.c</a> (renamed from kernel/cpuset.c)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/kernel/cgroup/freezer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cgroup/freezer.c</a> (renamed from kernel/cgroup_freezer.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/cgroup/namespace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cgroup/namespace.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/cgroup/pids.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cgroup/pids.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/cgroup/rdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cgroup/rdma.c</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/kernel/cgroup_pids.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cgroup_pids.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/compat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/compat.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/configs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/configs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/configs/android-base.config?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/configs/android-base.config</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/configs/android-recommended.config?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/configs/android-recommended.config</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cpu.c</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/cred.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/cred.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/debug/debug_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/debug/debug_core.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/debug/gdbstub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/debug/gdbstub.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/debug/kdb/kdb_bt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/debug/kdb/kdb_bt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/debug/kdb/kdb_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/debug/kdb/kdb_io.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/debug/kdb/kdb_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/debug/kdb/kdb_main.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/debug/kdb/kdb_private.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/debug/kdb/kdb_private.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/delayacct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/delayacct.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/events/callchain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/events/callchain.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/events/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/events/core.c</a></td><td class='right'>565</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/events/uprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/events/uprobes.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/exit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/exit.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/extable.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/fork.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/fork.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/futex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/futex.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/futex_compat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/futex_compat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/groups.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/groups.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/hung_task.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/hung_task.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/irq/affinity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/irq/affinity.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/irq/devres.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/irq/devres.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/irq/irqdomain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/irq/irqdomain.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/irq/manage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/irq/manage.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/irq/msi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/irq/msi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/irq/proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/irq/proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/irq/spurious.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/irq/spurious.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/jump_label.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/jump_label.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/kallsyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/kallsyms.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/kcov.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/kcov.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/kexec_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/kexec_core.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/kexec_file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/kexec_file.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/kexec_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/kexec_internal.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/kmod.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/kmod.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/kprobes.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/ksysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/ksysfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/kthread.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/kthread.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/latencytop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/latencytop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/lockdep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/lockdep.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/lockdep_proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/lockdep_proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/locktorture.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/locktorture.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/mcs_spinlock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/mcs_spinlock.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/mutex-debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/mutex-debug.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/mutex-debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/mutex-debug.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/mutex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/mutex.c</a></td><td class='right'>994</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/mutex.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/osq_lock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/osq_lock.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/percpu-rwsem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/percpu-rwsem.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/qrwlock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/qrwlock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/qspinlock_paravirt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/qspinlock_paravirt.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/qspinlock_stat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/qspinlock_stat.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/rtmutex-debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/rtmutex-debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/rtmutex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/rtmutex.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/rtmutex_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/rtmutex_common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/rwsem-spinlock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/rwsem-spinlock.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/rwsem-xadd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/rwsem-xadd.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/rwsem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/rwsem.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/semaphore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/semaphore.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/spinlock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/spinlock.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/locking/spinlock_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/spinlock_debug.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/locking/test-ww_mutex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/locking/test-ww_mutex.c</a></td><td class='right'>646</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/membarrier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/membarrier.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/memremap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/memremap.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/module.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/notifier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/notifier.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/padata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/padata.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/panic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/panic.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/pid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/pid.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/pid_namespace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/pid_namespace.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/power/hibernate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/power/hibernate.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/power/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/power/main.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/power/power.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/power/power.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/power/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/power/process.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/power/qos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/power/qos.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/power/snapshot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/power/snapshot.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/power/suspend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/power/suspend.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/power/suspend_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/power/suspend_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/power/swap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/power/swap.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/power/user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/power/user.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/printk/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/printk/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/printk/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/printk/internal.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/kernel/printk/nmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/printk/nmi.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/printk/printk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/printk/printk.c</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/printk/printk_safe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/printk/printk_safe.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/profile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/profile.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/ptrace.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/rcu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/rcu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/rcuperf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/rcuperf.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/rcutorture.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/rcutorture.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/srcu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/srcu.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/tiny.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/tiny.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/tiny_plugin.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/tiny_plugin.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/tree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/tree.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/tree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/tree.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/tree_exp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/tree_exp.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/tree_plugin.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/tree_plugin.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/tree_trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/tree_trace.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/rcu/update.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/rcu/update.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/relay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/relay.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/kernel/sched/auto_group.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/auto_group.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/kernel/sched/autogroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/autogroup.c</a> (renamed from kernel/sched/auto_group.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/sched/autogroup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/autogroup.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/clock.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/completion.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/completion.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/core.c</a></td><td class='right'>2385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 15.3%;'/><td class='none' style='width: 81.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/cpuacct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/cpuacct.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/cpudeadline.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/cpudeadline.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/cpufreq_schedutil.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/cpufreq_schedutil.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/cpupri.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/cpupri.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/cputime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/cputime.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/deadline.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/deadline.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/debug.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/fair.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/fair.c</a></td><td class='right'>788</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/idle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/idle.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/idle_task.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/idle_task.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/loadavg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/loadavg.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/rt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/rt.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/sched.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/sched.h</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/stats.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/stats.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/stop_task.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/stop_task.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/swait.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/swait.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/sched/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/topology.c</a></td><td class='right'>1658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sched/wait.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sched/wait.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/seccomp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/seccomp.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/signal.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/smp.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/smpboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/smpboot.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/stacktrace.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/stop_machine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/stop_machine.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sys.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sys_ni.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sys_ni.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sysctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sysctl.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/sysctl_binary.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/sysctl_binary.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/taskstats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/taskstats.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/alarmtimer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/alarmtimer.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/clockevents.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/clockevents.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/clocksource.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/clocksource.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/hrtimer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/hrtimer.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/itimer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/itimer.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/jiffies.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/jiffies.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/ntp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/ntp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/posix-cpu-timers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/posix-cpu-timers.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/time/posix-stubs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/posix-stubs.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/posix-timers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/posix-timers.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/sched_clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/sched_clock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/tick-broadcast-hrtimer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/tick-broadcast-hrtimer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/tick-broadcast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/tick-broadcast.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/tick-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/tick-common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/tick-oneshot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/tick-oneshot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/tick-sched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/tick-sched.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/time.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/timeconst.bc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/timeconst.bc</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/timecounter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/timecounter.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/timekeeping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/timekeeping.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/timekeeping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/timekeeping.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/timekeeping_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/timekeeping_debug.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/timekeeping_internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/timekeeping_internal.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/timer.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/time/timer_list.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/timer_list.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/kernel/time/timer_stats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/time/timer_stats.c</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/torture.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/torture.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/blktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/blktrace.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/bpf_trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/bpf_trace.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/ftrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/ftrace.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/ring_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/ring_buffer.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/ring_buffer_benchmark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/ring_buffer_benchmark.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace.c</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_benchmark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_benchmark.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_benchmark.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_benchmark.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_branch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_branch.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_clock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_entries.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_entries.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_events.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_events.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_events_filter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_events_filter.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_events_hist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_events_hist.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_events_trigger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_events_trigger.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_functions_graph.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_functions_graph.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_hwlat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_hwlat.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_irqsoff.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_irqsoff.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_kprobe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_kprobe.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_output.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_output.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_probe.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_sched_wakeup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_sched_wakeup.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_selftest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_selftest.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_stack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_stack.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/trace/trace_uprobe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/trace/trace_uprobe.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/tracepoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/tracepoint.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/tsacct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/tsacct.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/ucount.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/ucount.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/uid16.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/uid16.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/user.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/user_namespace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/user_namespace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/utsname.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/utsname.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/utsname_sysctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/utsname_sysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/watchdog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/watchdog.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/kernel/watchdog_hld.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/watchdog_hld.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/kernel/workqueue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>kernel/workqueue.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/Kconfig.debug</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/Kconfig.ubsan?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/Kconfig.ubsan</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/Makefile</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/atomic64_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/atomic64_test.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/bug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/bug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/lib/cpu-notifier-error-inject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/cpu-notifier-error-inject.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/crc32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/crc32.c</a></td><td class='right'>824</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/lib/crc32test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/crc32test.c</a></td><td class='right'>856</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/debugobjects.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/debugobjects.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/decompress_unlz4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/decompress_unlz4.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/digsig.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/digsig.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/dma-debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/dma-debug.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/dma-noop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/dma-noop.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/lib/dma-virt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/dma-virt.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/dump_stack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/dump_stack.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/extable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/find_bit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/find_bit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/fonts/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/fonts/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/glob.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/glob.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/lib/globtest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/globtest.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/lib/halfmd4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/halfmd4.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/idr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/idr.c</a></td><td class='right'>1247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/ioremap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/ioremap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/iov_iter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/iov_iter.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/is_single_threaded.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/is_single_threaded.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/kobject_uevent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/kobject_uevent.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/kstrtox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/kstrtox.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/list_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/list_debug.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/lockref.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/lockref.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/lz4/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/lz4/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/lz4/lz4_compress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/lz4/lz4_compress.c</a></td><td class='right'>1141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/lz4/lz4_decompress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/lz4/lz4_decompress.c</a></td><td class='right'>665</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/lz4/lz4defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/lz4/lz4defs.h</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/lz4/lz4hc_compress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/lz4/lz4hc_compress.c</a></td><td class='right'>846</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/nlattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/nlattr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/nmi_backtrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/nmi_backtrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/lib/parman.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/parman.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/parser.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/parser.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/percpu_counter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/percpu_counter.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/percpu_ida.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/percpu_ida.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/plist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/plist.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/lib/prime_numbers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/prime_numbers.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/radix-tree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/radix-tree.c</a></td><td class='right'>1714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/raid6/avx2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/raid6/avx2.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/rbtree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/rbtree.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/lib/refcount.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/refcount.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/rhashtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/rhashtable.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/sbitmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/sbitmap.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/scatterlist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/scatterlist.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/show_mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/show_mem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/lib/siphash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/siphash.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/smp_processor_id.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/smp_processor_id.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/sort.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/sort.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/swiotlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/swiotlb.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/syscall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/syscall.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/test_firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/test_firmware.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/test_kasan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/test_kasan.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/lib/test_parman.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/test_parman.c</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/lib/test_siphash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/test_siphash.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/lib/test_sort.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/test_sort.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/test_user_copy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/test_user_copy.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/timerqueue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/timerqueue.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/lib/vsprintf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>lib/vsprintf.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/Kconfig.debug</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/backing-dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/backing-dev.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/bootmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/bootmem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/cma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/cma.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/cma_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/cma_debug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/compaction.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/compaction.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/debug.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/dmapool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/dmapool.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/fadvise.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/fadvise.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/filemap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/filemap.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/gup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/gup.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/huge_memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/huge_memory.c</a></td><td class='right'>682</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/hugetlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/hugetlb.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/init-mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/init-mm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/internal.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/kasan/kasan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/kasan/kasan.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/kasan/kasan_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/kasan/kasan_init.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/kasan/quarantine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/kasan/quarantine.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/kasan/report.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/kasan/report.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/khugepaged.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/khugepaged.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/kmemleak.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/kmemleak.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/ksm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/ksm.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/madvise.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/madvise.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/memblock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/memblock.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/memcontrol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/memcontrol.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/memory-failure.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/memory-failure.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/memory.c</a></td><td class='right'>1157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/memory_hotplug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/memory_hotplug.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/mempolicy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/mempolicy.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/migrate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/migrate.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/mincore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/mincore.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/mlock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/mlock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/mmap.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/mmu_context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/mmu_context.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/mmu_notifier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/mmu_notifier.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/mmzone.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/mmzone.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/mprotect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/mprotect.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/mremap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/mremap.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/nommu.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/oom_kill.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/oom_kill.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/page-writeback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/page-writeback.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/page_alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/page_alloc.c</a></td><td class='right'>889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/page_idle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/page_idle.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/page_io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/page_io.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/page_isolation.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/page_isolation.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/mm/page_vma_mapped.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/page_vma_mapped.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/pagewalk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/pagewalk.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/percpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/percpu.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/pgtable-generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/pgtable-generic.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/process_vm_access.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/process_vm_access.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/readahead.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/readahead.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/rmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/rmap.c</a></td><td class='right'>645</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/mm/rodata_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/rodata_test.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/shmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/shmem.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/slab.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/slab.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/slab.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/slab.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/slab_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/slab_common.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/slob.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/slob.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/slub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/slub.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/sparse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/sparse.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/swap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/swap.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/mm/swap_slots.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/swap_slots.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/swap_state.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/swap_state.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/swapfile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/swapfile.c</a></td><td class='right'>563</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/truncate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/truncate.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/usercopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/usercopy.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/userfaultfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/userfaultfd.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/util.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/vmacache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/vmacache.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/vmalloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/vmalloc.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/vmpressure.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/vmpressure.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/vmscan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/vmscan.c</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/vmstat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/vmstat.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/workingset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/workingset.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/z3fold.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/z3fold.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/zsmalloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/zsmalloc.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/mm/zswap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>mm/zswap.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/6lowpan/nhc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/6lowpan/nhc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/802/fc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/802/fc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/802/fddi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/802/fddi.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/802/hippi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/802/hippi.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/8021q/vlan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/8021q/vlan.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/8021q/vlan.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/8021q/vlan.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/8021q/vlan_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/8021q/vlan_dev.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/9p/client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/9p/client.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/appletalk/ddp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/appletalk/ddp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/atm/br2684.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/atm/br2684.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/atm/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/atm/common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/atm/lec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/atm/lec.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/atm/mpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/atm/mpc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/atm/mpoa_caches.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/atm/mpoa_caches.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/atm/svc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/atm/svc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/af_ax25.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/af_ax25.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_addr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_addr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_dev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_ds_in.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_ds_in.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_ds_subr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_ds_subr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_ds_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_ds_timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_iface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_iface.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_in.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_in.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_ip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_ip.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_out.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_out.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_route.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_route.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_std_in.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_std_in.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_std_subr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_std_subr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_std_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_std_timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_subr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_subr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ax25/ax25_uid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ax25/ax25_uid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bat_algo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bat_algo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bat_algo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bat_algo.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bat_iv_ogm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bat_iv_ogm.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bat_iv_ogm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bat_iv_ogm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bat_v.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bat_v.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bat_v.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bat_v.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bat_v_elp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bat_v_elp.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bat_v_elp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bat_v_elp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bat_v_ogm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bat_v_ogm.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bat_v_ogm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bat_v_ogm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bitarray.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bitarray.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bitarray.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bitarray.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bridge_loop_avoidance.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bridge_loop_avoidance.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/bridge_loop_avoidance.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/bridge_loop_avoidance.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/debugfs.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/debugfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/debugfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/distributed-arp-table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/distributed-arp-table.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/distributed-arp-table.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/distributed-arp-table.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/fragmentation.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/fragmentation.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/fragmentation.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/fragmentation.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/gateway_client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/gateway_client.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/gateway_client.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/gateway_client.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/gateway_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/gateway_common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/gateway_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/gateway_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/hard-interface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/hard-interface.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/hard-interface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/hard-interface.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/hash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/hash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/hash.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/icmp_socket.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/icmp_socket.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/icmp_socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/icmp_socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/log.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/log.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/log.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/main.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/main.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/multicast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/multicast.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/multicast.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/multicast.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/netlink.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/netlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/netlink.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/network-coding.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/network-coding.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/network-coding.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/network-coding.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/originator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/originator.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/originator.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/originator.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/packet.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/packet.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/routing.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/routing.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/routing.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/routing.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/send.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/send.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/send.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/send.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/soft-interface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/soft-interface.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/soft-interface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/soft-interface.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/sysfs.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/sysfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/sysfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/tp_meter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/tp_meter.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/tp_meter.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/tp_meter.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/translation-table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/translation-table.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/translation-table.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/translation-table.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/tvlv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/tvlv.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/tvlv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/tvlv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/batman-adv/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/batman-adv/types.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/6lowpan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/6lowpan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/a2mp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/a2mp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/af_bluetooth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/af_bluetooth.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/amp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/amp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/bnep/netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/bnep/netdev.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/cmtp/capi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/cmtp/capi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/hci_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/hci_event.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/hci_request.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/hci_request.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/hci_sock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/hci_sock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/l2cap_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/l2cap_core.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/l2cap_sock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/l2cap_sock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/rfcomm/sock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/rfcomm/sock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/sco.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/sco.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/smp.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bluetooth/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bluetooth/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_device.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_fdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_fdb.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_forward.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_forward.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_if.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_input.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_mdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_mdb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_multicast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_multicast.c</a></td><td class='right'>333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_netfilter_hooks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_netfilter_hooks.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_netfilter_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_netfilter_ipv6.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_netlink.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/bridge/br_netlink_tunnel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_netlink_tunnel.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_private.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_private.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_private_stp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_private_stp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/bridge/br_private_tunnel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_private_tunnel.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_stp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_stp.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_stp_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_stp_if.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_stp_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_stp_timer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_sysfs_br.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_sysfs_br.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_sysfs_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_sysfs_if.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/br_vlan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_vlan.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/bridge/br_vlan_tunnel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/br_vlan_tunnel.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/ebt_among.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/ebt_among.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/ebt_arpreply.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/ebt_arpreply.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/ebt_limit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/ebt_limit.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/ebt_log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/ebt_log.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/ebt_nflog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/ebt_nflog.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/ebt_redirect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/ebt_redirect.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/ebtable_broute.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/ebtable_broute.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/ebtables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/ebtables.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/nf_log_bridge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/nf_log_bridge.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/nft_meta_bridge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/nft_meta_bridge.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/bridge/netfilter/nft_reject_bridge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/bridge/netfilter/nft_reject_bridge.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/caif/caif_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/caif/caif_dev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/caif/caif_socket.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/caif/caif_socket.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/caif/cfcnfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/caif/cfcnfg.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/caif/chnl_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/caif/chnl_net.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/can/af_can.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/can/af_can.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/can/af_can.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/can/af_can.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/can/bcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/can/bcm.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/can/gw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/can/gw.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/can/raw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/can/raw.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/auth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/auth.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/auth_x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/auth_x.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/auth_x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/auth_x.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/cls_lock_client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/cls_lock_client.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/crush/crush.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/crush/crush.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/crush/mapper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/crush/mapper.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/crypto.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/crypto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/crypto.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/messenger.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/messenger.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/mon_client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/mon_client.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/osd_client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/osd_client.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/osdmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/osdmap.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ceph/snapshot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ceph/snapshot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/compat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/compat.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/datagram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/datagram.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/dev.c</a></td><td class='right'>1431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/devlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/devlink.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/drop_monitor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/drop_monitor.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/dst.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/dst.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/ethtool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/ethtool.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/fib_rules.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/fib_rules.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/filter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/filter.c</a></td><td class='right'>562</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/flow.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/flow.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/flow_dissector.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/flow_dissector.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/gen_estimator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/gen_estimator.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/gen_stats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/gen_stats.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/core/gro_cells.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/gro_cells.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/core/lwt_bpf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/lwt_bpf.c</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/lwtunnel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/lwtunnel.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/neighbour.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/neighbour.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/net-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/net-sysfs.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/net_namespace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/net_namespace.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/netclassid_cgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/netclassid_cgroup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/netpoll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/netpoll.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/netprio_cgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/netprio_cgroup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/pktgen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/pktgen.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/request_sock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/request_sock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/rtnetlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/rtnetlink.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/scm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/scm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/secure_seq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/secure_seq.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/skbuff.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/skbuff.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/sock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/sock.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/stream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/stream.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/sysctl_net_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/sysctl_net_core.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/core/utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/core/utils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dccp/input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dccp/input.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dccp/ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dccp/ipv4.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dccp/ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dccp/ipv6.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dccp/minisocks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dccp/minisocks.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dccp/output.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dccp/output.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/decnet/af_decnet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/decnet/af_decnet.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/decnet/dn_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/decnet/dn_dev.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/decnet/dn_fib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/decnet/dn_fib.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/decnet/dn_table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/decnet/dn_table.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/decnet/sysctl_net_decnet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/decnet/sysctl_net_decnet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dns_resolver/dns_query.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dns_resolver/dns_query.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dsa/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dsa/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dsa/dsa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/dsa.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dsa/dsa2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/dsa2.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dsa/dsa_priv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/dsa_priv.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dsa/slave.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/slave.c</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/dsa/switch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/switch.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dsa/tag_brcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/tag_brcm.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dsa/tag_dsa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/tag_dsa.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dsa/tag_edsa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/tag_edsa.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dsa/tag_qca.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/tag_qca.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/dsa/tag_trailer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/dsa/tag_trailer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ethernet/eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ethernet/eth.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/hsr/hsr_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/hsr/hsr_device.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/hsr/hsr_netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/hsr/hsr_netlink.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/hsr/hsr_slave.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/hsr/hsr_slave.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ieee802154/6lowpan/6lowpan_i.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ieee802154/6lowpan/6lowpan_i.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ieee802154/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ieee802154/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ieee802154/netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ieee802154/netlink.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ieee802154/nl-phy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ieee802154/nl-phy.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ieee802154/nl802154.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ieee802154/nl802154.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ieee802154/socket.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ieee802154/socket.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ife/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ife/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ife/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ife/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ife/ife.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ife/ife.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/af_inet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/af_inet.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ah4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ah4.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/arp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/arp.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/cipso_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/cipso_ipv4.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/devinet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/devinet.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/esp4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/esp4.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ipv4/esp4_offload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/esp4_offload.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/fib_frontend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/fib_frontend.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/fib_semantics.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/fib_semantics.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/fib_trie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/fib_trie.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/fou.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/fou.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/icmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/icmp.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/igmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/igmp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/inet_connection_sock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/inet_connection_sock.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/inet_diag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/inet_diag.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/inet_hashtables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/inet_hashtables.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/inet_timewait_sock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/inet_timewait_sock.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ip_gre.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ip_gre.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ip_options.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ip_options.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ip_output.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ip_output.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ip_sockglue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ip_sockglue.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ip_tunnel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ip_tunnel.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ip_tunnel_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ip_tunnel_core.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ip_vti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ip_vti.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ipconfig.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ipconfig.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ipip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ipip.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ipmr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ipmr.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/arp_tables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/arp_tables.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/ip_tables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/ip_tables.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/ipt_CLUSTERIP.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/ipt_CLUSTERIP.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/ipt_MASQUERADE.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/ipt_MASQUERADE.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/ipt_REJECT.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/ipt_REJECT.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/ipt_SYNPROXY.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/ipt_SYNPROXY.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/ipt_rpfilter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/ipt_rpfilter.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/nf_conntrack_proto_icmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nf_conntrack_proto_icmp.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/nf_defrag_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nf_defrag_ipv4.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/nf_dup_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nf_dup_ipv4.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/nf_log_arp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nf_log_arp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/nf_log_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nf_log_ipv4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/nf_reject_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nf_reject_ipv4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ipv4/netfilter/nf_socket_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nf_socket_ipv4.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/nft_dup_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nft_dup_ipv4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ipv4/netfilter/nft_fib_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nft_fib_ipv4.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/nft_masq_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nft_masq_ipv4.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/nft_redir_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nft_redir_ipv4.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/netfilter/nft_reject_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/netfilter/nft_reject_ipv4.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/ping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/ping.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/proc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/raw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/raw.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ipv4/raw_diag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/raw_diag.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/route.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/route.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/syncookies.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/syncookies.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/sysctl_net_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/sysctl_net_ipv4.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_bbr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_bbr.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_cdg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_cdg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_cong.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_cong.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_dctcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_dctcp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_fastopen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_fastopen.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_highspeed.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_highspeed.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_hybla.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_hybla.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_illinois.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_illinois.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_input.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_ipv4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_ipv4.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_lp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_lp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_metrics.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_metrics.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_minisocks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_minisocks.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_output.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_output.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_recovery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_recovery.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_scalable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_scalable.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_timer.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_vegas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_vegas.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_veno.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_veno.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_westwood.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_westwood.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/tcp_yeah.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/tcp_yeah.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/udp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/udp.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/udplite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/udplite.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/xfrm4_input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/xfrm4_input.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/xfrm4_mode_transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/xfrm4_mode_transport.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/xfrm4_policy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/xfrm4_policy.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/xfrm4_protocol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/xfrm4_protocol.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv4/xfrm4_state.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv4/xfrm4_state.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/Kconfig</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/addrconf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/addrconf.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/af_inet6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/af_inet6.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ah6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ah6.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/datagram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/datagram.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/esp6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/esp6.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ipv6/esp6_offload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/esp6_offload.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/exthdrs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/exthdrs.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/icmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/icmp.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ila/ila_lwt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ila/ila_lwt.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ila/ila_xlat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ila/ila_xlat.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/inet6_connection_sock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/inet6_connection_sock.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/inet6_hashtables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/inet6_hashtables.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ip6_fib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ip6_fib.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ip6_flowlabel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ip6_flowlabel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ip6_gre.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ip6_gre.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ip6_offload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ip6_offload.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ip6_output.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ip6_output.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ip6_tunnel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ip6_tunnel.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ip6_vti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ip6_vti.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ip6mr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ip6mr.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ipcomp6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ipcomp6.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ipv6_sockglue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ipv6_sockglue.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/mcast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/mcast.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/mip6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/mip6.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ndisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ndisc.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/ip6_tables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/ip6_tables.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/ip6t_MASQUERADE.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/ip6t_MASQUERADE.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/ip6t_NPT.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/ip6t_NPT.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/ip6t_REJECT.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/ip6t_REJECT.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/ip6t_SYNPROXY.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/ip6t_SYNPROXY.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/ip6t_rpfilter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/ip6t_rpfilter.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/nf_conntrack_reasm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nf_conntrack_reasm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nf_defrag_ipv6_hooks.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/nf_dup_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nf_dup_ipv6.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/nf_log_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nf_log_ipv6.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/nf_reject_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nf_reject_ipv6.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ipv6/netfilter/nf_socket_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nf_socket_ipv6.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/nft_dup_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nft_dup_ipv6.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ipv6/netfilter/nft_fib_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nft_fib_ipv6.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/nft_masq_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nft_masq_ipv6.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/nft_redir_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nft_redir_ipv6.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/netfilter/nft_reject_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/netfilter/nft_reject_ipv6.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/ping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/ping.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/raw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/raw.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/reassembly.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/reassembly.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/route.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/route.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ipv6/seg6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/seg6.c</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ipv6/seg6_hmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/seg6_hmac.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/ipv6/seg6_iptunnel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/seg6_iptunnel.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/sit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/sit.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/syncookies.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/syncookies.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/tcp_ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/tcp_ipv6.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/udp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/udp.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/udplite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/udplite.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/xfrm6_input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/xfrm6_input.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/xfrm6_mode_transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/xfrm6_mode_transport.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/xfrm6_policy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/xfrm6_policy.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/xfrm6_protocol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/xfrm6_protocol.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipv6/xfrm6_tunnel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipv6/xfrm6_tunnel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/ipx/af_ipx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/ipx/af_ipx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/irda/af_irda.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/irda/af_irda.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/irda/ircomm/ircomm_tty.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/irda/ircomm/ircomm_tty.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/irda/ircomm/ircomm_tty_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/irda/ircomm/ircomm_tty_ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/irda/irda_device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/irda/irda_device.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/irda/irlan/irlan_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/irda/irlan/irlan_eth.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/irda/irnet/irnet.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/irda/irnet/irnet.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/irda/irnet/irnet_ppp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/irda/irnet/irnet_ppp.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/irda/irnet/irnet_ppp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/irda/irnet/irnet_ppp.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/irda/irnetlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/irda/irnetlink.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/irda/irproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/irda/irproc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/irda/irqueue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/irda/irqueue.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/iucv/af_iucv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/iucv/af_iucv.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/iucv/iucv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/iucv/iucv.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/kcm/kcmsock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/kcm/kcmsock.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/key/af_key.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/key/af_key.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/l2tp/l2tp_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/l2tp/l2tp_core.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/l2tp/l2tp_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/l2tp/l2tp_core.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/l2tp/l2tp_eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/l2tp/l2tp_eth.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/l2tp/l2tp_ip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/l2tp/l2tp_ip.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/l2tp/l2tp_ip6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/l2tp/l2tp_ip6.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/l2tp/l2tp_netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/l2tp/l2tp_netlink.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/l2tp/l2tp_ppp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/l2tp/l2tp_ppp.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/lapb/lapb_iface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/lapb/lapb_iface.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/lapb/lapb_in.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/lapb/lapb_in.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/lapb/lapb_out.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/lapb/lapb_out.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/lapb/lapb_subr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/lapb/lapb_subr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/lapb/lapb_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/lapb/lapb_timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/llc/af_llc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/llc/af_llc.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/llc/llc_conn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/llc/llc_conn.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/llc/llc_sap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/llc/llc_sap.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/aes_cmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/aes_cmac.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/aes_cmac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/aes_cmac.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/agg-rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/agg-rx.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/cfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/cfg.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/chan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/chan.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/debugfs.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/debugfs_netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/debugfs_netdev.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/debugfs_sta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/debugfs_sta.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/mac80211/fils_aead.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/fils_aead.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/mac80211/fils_aead.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/fils_aead.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/ibss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/ibss.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/ieee80211_i.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/ieee80211_i.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/iface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/iface.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/key.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/key.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/key.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/key.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/main.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/mesh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/mesh.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/mesh.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/mesh.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/mesh_plink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/mesh_plink.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/mesh_sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/mesh_sync.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/mlme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/mlme.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/pm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/rc80211_minstrel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/rc80211_minstrel.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/rc80211_minstrel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/rc80211_minstrel.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/rc80211_minstrel_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/rc80211_minstrel_debugfs.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/rc80211_minstrel_ht.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/rc80211_minstrel_ht.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/rc80211_minstrel_ht.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/rc80211_minstrel_ht.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/rc80211_minstrel_ht_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/rc80211_minstrel_ht_debugfs.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/rx.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/scan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/scan.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/sta_info.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/sta_info.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/sta_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/sta_info.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/status.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/status.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/trace.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/tx.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/util.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/vht.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/vht.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/wep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/wep.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/wme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/wme.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac80211/wpa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac80211/wpa.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac802154/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac802154/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac802154/llsec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac802154/llsec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mac802154/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mac802154/util.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mpls/af_mpls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mpls/af_mpls.c</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mpls/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mpls/internal.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/mpls/mpls_iptunnel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/mpls/mpls_iptunnel.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/Kconfig</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/Makefile</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/core.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_bitmap_gen.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_bitmap_gen.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_core.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_gen.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_gen.h</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_ip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_ip.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_ipmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_ipmac.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_ipmark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_ipmark.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_ipport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_ipport.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_ipportip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_ipportip.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_ipportnet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_ipportnet.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_net.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_netiface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_netiface.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_netnet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_netnet.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_netport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_netport.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_hash_netportnet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_hash_netportnet.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipset/ip_set_list_set.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipset/ip_set_list_set.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipvs/ip_vs_conn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipvs/ip_vs_conn.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipvs/ip_vs_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipvs/ip_vs_core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipvs/ip_vs_ctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipvs/ip_vs_ctl.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipvs/ip_vs_dh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipvs/ip_vs_dh.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipvs/ip_vs_lblc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipvs/ip_vs_lblc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipvs/ip_vs_lblcr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipvs/ip_vs_lblcr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipvs/ip_vs_sh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipvs/ip_vs_sh.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipvs/ip_vs_sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipvs/ip_vs_sync.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/ipvs/ip_vs_xmit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/ipvs/ip_vs_xmit.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_core.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_expect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_expect.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_ftp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_ftp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_helper.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_netlink.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_proto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_proto.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_proto_dccp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_proto_dccp.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_proto_gre.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_proto_gre.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_proto_sctp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_proto_sctp.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_proto_tcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_proto_tcp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_proto_udp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_proto_udp.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_proto_udplite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_proto_udplite.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_sip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_sip.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_conntrack_standalone.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_conntrack_standalone.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_dup_netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_dup_netdev.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_internals.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_internals.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_log.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_log_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_log_common.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/netfilter/nf_log_netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_log_netdev.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_nat_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_nat_core.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_nat_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_nat_helper.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_nat_proto_dccp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_nat_proto_dccp.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_nat_proto_sctp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_nat_proto_sctp.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_nat_proto_udp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_nat_proto_udp.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/net/netfilter/nf_nat_proto_udplite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_nat_proto_udplite.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_queue.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_synproxy_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_synproxy_core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_tables_api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_tables_api.c</a></td><td class='right'>1000</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_tables_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_tables_core.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nf_tables_trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nf_tables_trace.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nfnetlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nfnetlink.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nfnetlink_cthelper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nfnetlink_cthelper.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nfnetlink_log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nfnetlink_log.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nfnetlink_queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nfnetlink_queue.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_bitwise.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_bitwise.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_byteorder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_byteorder.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_cmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_cmp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_counter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_counter.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_ct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_ct.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_dynset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_dynset.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_exthdr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_exthdr.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/netfilter/nft_fib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_fib.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/netfilter/nft_fib_inet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_fib_inet.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_fwd_netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_fwd_netdev.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_hash.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_immediate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_immediate.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_log.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_lookup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_lookup.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_masq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_masq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_meta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_meta.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_nat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_nat.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_numgen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_numgen.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/netfilter/nft_objref.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_objref.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_payload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_payload.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_queue.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_quota.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_quota.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_range.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_range.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_redir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_redir.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_reject_inet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_reject_inet.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/netfilter/nft_rt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_rt.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/netfilter/nft_set_bitmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_set_bitmap.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_set_hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_set_hash.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/nft_set_rbtree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/nft_set_rbtree.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/x_tables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/x_tables.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_AUDIT.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_AUDIT.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_CONNSECMARK.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_CONNSECMARK.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_CT.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_CT.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_LOG.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_LOG.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_NETMAP.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_NETMAP.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_NFLOG.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_NFLOG.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_NFQUEUE.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_NFQUEUE.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_RATEEST.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_RATEEST.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_REDIRECT.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_REDIRECT.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_TCPMSS.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_TCPMSS.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_TEE.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_TEE.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_TPROXY.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_TPROXY.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_addrtype.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_addrtype.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_bpf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_bpf.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_cgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_cgroup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_cluster.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_cluster.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_connbytes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_connbytes.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_connlabel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_connlabel.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_connlimit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_connlimit.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_connmark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_connmark.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_conntrack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_conntrack.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_devgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_devgroup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_dscp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_dscp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_hashlimit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_hashlimit.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_helper.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_ipvs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_ipvs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_limit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_limit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_multiport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_multiport.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_nat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_nat.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_nfacct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_nfacct.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_osf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_osf.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_owner.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_owner.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_pkttype.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_pkttype.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_policy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_policy.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_quota.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_quota.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_rateest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_rateest.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_recent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_recent.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_set.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_set.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_socket.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_socket.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_state.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_state.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_string.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_string.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netfilter/xt_time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netfilter/xt_time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netlabel/netlabel_calipso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netlabel/netlabel_calipso.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netlabel/netlabel_cipso_v4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netlabel/netlabel_cipso_v4.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netlabel/netlabel_kapi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netlabel/netlabel_kapi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netlabel/netlabel_mgmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netlabel/netlabel_mgmt.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netlabel/netlabel_unlabeled.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netlabel/netlabel_unlabeled.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netlink/af_netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netlink/af_netlink.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netlink/genetlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netlink/genetlink.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/netrom/af_netrom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/netrom/af_netrom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/nfc/llcp_sock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/nfc/llcp_sock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/nfc/netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/nfc/netlink.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/actions.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/actions.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/conntrack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/conntrack.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/conntrack.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/conntrack.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/datapath.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/datapath.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/datapath.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/datapath.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/flow.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/flow.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/flow.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/flow.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/flow_netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/flow_netlink.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/flow_netlink.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/flow_netlink.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/vport-internal_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/vport-internal_dev.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/vport-netdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/vport-netdev.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/vport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/vport.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/openvswitch/vport.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/openvswitch/vport.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/packet/af_packet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/packet/af_packet.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/packet/diag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/packet/diag.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/phonet/pep-gprs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/phonet/pep-gprs.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/phonet/pep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/phonet/pep.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/phonet/pn_dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/phonet/pn_dev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/phonet/socket.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/phonet/socket.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/psample/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/psample/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/psample/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/psample/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/psample/psample.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/psample/psample.c</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/qrtr/qrtr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/qrtr/qrtr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/af_rds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/af_rds.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/bind.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/bind.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/connection.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/connection.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/ib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/ib.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/ib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/ib.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/ib_cm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/ib_cm.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/ib_frmr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/ib_frmr.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/ib_mr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/ib_mr.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/ib_recv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/ib_recv.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/ib_send.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/ib_send.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/ib_stats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/ib_stats.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/message.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/message.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/page.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/page.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/rdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/rdma.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/rdma_transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/rdma_transport.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/rds.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/rds.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/recv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/recv.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/send.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/send.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/tcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/tcp.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/tcp_connect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/tcp_connect.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/tcp_listen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/tcp_listen.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/tcp_recv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/tcp_recv.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/tcp_send.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/tcp_send.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/threads.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/threads.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rds/transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rds/transport.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rfkill/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rfkill/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rfkill/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rfkill/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rfkill/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rfkill/core.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/net/rfkill/rfkill-regulator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rfkill/rfkill-regulator.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rose/af_rose.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rose/af_rose.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rose/rose_route.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rose/rose_route.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/af_rxrpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/af_rxrpc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/ar-internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/ar-internal.h</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/call_accept.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/call_accept.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/call_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/call_object.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/conn_client.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/conn_client.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/conn_object.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/conn_object.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/input.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/key.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/key.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/misc.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/proc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/recvmsg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/recvmsg.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/rxrpc/sendmsg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/rxrpc/sendmsg.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_api.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_bpf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_bpf.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_connmark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_connmark.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_csum.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_csum.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_gact.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_gact.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_ife.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_ife.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_ipt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_ipt.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_mirred.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_mirred.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_nat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_nat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_pedit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_pedit.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_police.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_police.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/sched/act_sample.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_sample.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_simple.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_simple.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_skbedit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_skbedit.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_skbmod.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_skbmod.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_tunnel_key.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_tunnel_key.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/act_vlan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/act_vlan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/cls_api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/cls_api.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/cls_bpf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/cls_bpf.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/cls_flow.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/cls_flow.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/cls_flower.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/cls_flower.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/cls_matchall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/cls_matchall.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/cls_u32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/cls_u32.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/em_ipset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/em_ipset.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/em_meta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/em_meta.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_api.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_atm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_atm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_cbq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_cbq.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_choke.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_choke.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_drr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_drr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_dsmark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_dsmark.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_fq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_fq.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_fq_codel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_fq_codel.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_generic.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_hfsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_hfsc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_hhf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_hhf.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_htb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_htb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_ingress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_ingress.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_mq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_mq.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_mqprio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_mqprio.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_multiq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_multiq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_netem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_netem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_prio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_prio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_qfq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_qfq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_sfb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_sfb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_sfq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_sfq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sched/sch_teql.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sched/sch_teql.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/associola.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/associola.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/bind_addr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/bind_addr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/chunk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/chunk.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/debug.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/endpointola.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/endpointola.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/input.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/ipv6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/ipv6.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/objcnt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/objcnt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/offload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/offload.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/output.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/output.c</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/outqueue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/outqueue.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/primitive.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/primitive.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/protocol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/protocol.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/sm_make_chunk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/sm_make_chunk.c</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/sm_sideeffect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/sm_sideeffect.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/sm_statefuns.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/sm_statefuns.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/sm_statetable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/sm_statetable.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/socket.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/socket.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/net/sctp/ssnmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/ssnmap.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/sctp/stream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/stream.c</a></td><td class='right'>479</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/transport.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/ulpevent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/ulpevent.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sctp/ulpqueue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sctp/ulpqueue.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/af_smc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/af_smc.c</a></td><td class='right'>1409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc.h</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_cdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_cdc.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_cdc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_cdc.h</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_clc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_clc.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_clc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_clc.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_close.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_close.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_close.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_close.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_core.c</a></td><td class='right'>682</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_core.h</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_diag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_diag.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_ib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_ib.c</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_ib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_ib.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_llc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_llc.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_llc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_llc.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_pnet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_pnet.c</a></td><td class='right'>534</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_pnet.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_pnet.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_rx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_rx.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_rx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_rx.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_tx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_tx.c</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_tx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_tx.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_wr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_wr.c</a></td><td class='right'>614</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/smc/smc_wr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/smc/smc_wr.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/socket.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/socket.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/strparser/strparser.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/strparser/strparser.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/auth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/auth.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/auth_gss/auth_gss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/auth_gss/auth_gss.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/auth_gss/gss_krb5_crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/auth_gss/gss_krb5_crypto.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/auth_gss/gss_krb5_mech.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/auth_gss/gss_krb5_mech.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/auth_gss/gss_rpc_xdr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/auth_gss/gss_rpc_xdr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/auth_gss/svcauth_gss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/auth_gss/svcauth_gss.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/auth_null.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/auth_null.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/auth_unix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/auth_unix.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/cache.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/clnt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/clnt.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/debugfs.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/netns.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/netns.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/stats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/stats.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/sunrpc_syms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/sunrpc_syms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/svc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/svc.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/svc_xprt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/svc_xprt.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/svcauth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/svcauth.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/svcauth_unix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/svcauth_unix.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/svcsock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/svcsock.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/sysctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/sysctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xdr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xdr.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprt.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/backchannel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/backchannel.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/fmr_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/fmr_ops.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/frwr_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/frwr_ops.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/rpc_rdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/rpc_rdma.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/svc_rdma_backchannel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/svc_rdma_backchannel.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/svc_rdma_marshal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/svc_rdma_marshal.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/svc_rdma_recvfrom.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/svc_rdma_sendto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/svc_rdma_sendto.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/svc_rdma_transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/svc_rdma_transport.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/transport.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/verbs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/verbs.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtrdma/xprt_rdma.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtrdma/xprt_rdma.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/sunrpc/xprtsock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/sunrpc/xprtsock.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/switchdev/switchdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/switchdev/switchdev.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/bcast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/bcast.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/bcast.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/bcast.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/bearer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/bearer.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/bearer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/bearer.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/core.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/discover.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/discover.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/link.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/link.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/msg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/msg.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/msg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/msg.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/name_distr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/name_distr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/name_table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/name_table.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/name_table.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/name_table.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/net.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/net.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/netlink.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/netlink.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/netlink_compat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/netlink_compat.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/node.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/node.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/node.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/node.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/server.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/server.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/socket.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/socket.c</a></td><td class='right'>979</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/subscr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/subscr.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/subscr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/subscr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/tipc/udp_media.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/tipc/udp_media.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/unix/af_unix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/unix/af_unix.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/vmw_vsock/af_vsock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/vmw_vsock/af_vsock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/vmw_vsock/virtio_transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/vmw_vsock/virtio_transport.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/vmw_vsock/virtio_transport_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/vmw_vsock/virtio_transport_common.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/vmw_vsock/vmci_transport_notify.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/vmw_vsock/vmci_transport_notify.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/vmw_vsock/vmci_transport_notify_qstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/vmw_vsock/vmci_transport_notify_qstate.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wimax/stack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wimax/stack.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/core.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/core.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/debugfs.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/lib80211_crypt_tkip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/lib80211_crypt_tkip.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/mesh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/mesh.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/mlme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/mlme.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/nl80211.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/nl80211.c</a></td><td class='right'>828</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/nl80211.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/nl80211.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/net/wireless/of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/of.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/rdev-ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/rdev-ops.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/reg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/reg.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/scan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/scan.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/sme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/sme.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/sysfs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/trace.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/util.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/wext-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/wext-core.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/wireless/wext-sme.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/wireless/wext-sme.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/x25/af_x25.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/x25/af_x25.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/x25/sysctl_net_x25.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/x25/sysctl_net_x25.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/x25/x25_link.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/x25/x25_link.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/xfrm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/xfrm/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/xfrm/xfrm_input.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/xfrm/xfrm_input.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/xfrm/xfrm_output.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/xfrm/xfrm_output.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/xfrm/xfrm_policy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/xfrm/xfrm_policy.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/xfrm/xfrm_state.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/xfrm/xfrm_state.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/net/xfrm/xfrm_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>net/xfrm/xfrm_user.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/Makefile</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/README.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/README.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/bpf_helpers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/bpf_helpers.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/bpf_load.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/bpf_load.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/bpf_load.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/bpf_load.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/cgroup_helpers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/cgroup_helpers.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/cgroup_helpers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/cgroup_helpers.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/fds_example.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/fds_example.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/lathist_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/lathist_user.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/samples/bpf/libbpf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/libbpf.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/libbpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/libbpf.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/lwt_len_hist.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/lwt_len_hist.sh</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/lwt_len_hist_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/lwt_len_hist_kern.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/lwt_len_hist_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/lwt_len_hist_user.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/map_perf_test_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/map_perf_test_kern.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/map_perf_test_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/map_perf_test_user.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/offwaketime_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/offwaketime_user.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/sampleip_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/sampleip_user.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/sock_example.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/sock_example.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/sock_example.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/sock_example.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/sock_flags_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/sock_flags_kern.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/sockex1_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/sockex1_user.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/sockex2_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/sockex2_kern.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/sockex2_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/sockex2_user.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/sockex3_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/sockex3_user.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/spintest_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/spintest_user.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/tc_l2_redirect_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/tc_l2_redirect_kern.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/tc_l2_redirect_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/tc_l2_redirect_user.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/test_cgrp2_array_pin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_cgrp2_array_pin.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/test_cgrp2_attach.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_cgrp2_attach.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/test_cgrp2_attach2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_cgrp2_attach2.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/test_cgrp2_sock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_cgrp2_sock.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/samples/bpf/test_cgrp2_sock.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_cgrp2_sock.sh</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/test_cgrp2_sock2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_cgrp2_sock2.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/samples/bpf/test_cgrp2_sock2.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_cgrp2_sock2.sh</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/test_current_task_under_cgroup_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_current_task_under_cgroup_user.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/test_lru_dist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_lru_dist.c</a></td><td class='right'>541</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/test_lwt_bpf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_lwt_bpf.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/test_lwt_bpf.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_lwt_bpf.sh</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/samples/bpf/test_maps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_maps.c</a></td><td class='right'>503</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/test_probe_write_user_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_probe_write_user_user.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/samples/bpf/test_verifier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/test_verifier.c</a></td><td class='right'>2529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.7%;'/><td class='none' style='width: 80.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/trace_event_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/trace_event_user.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/trace_output_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/trace_output_user.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/tracex2_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/tracex2_user.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/tracex3_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/tracex3_user.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/tracex4_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/tracex4_user.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/tracex5_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/tracex5_kern.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/tracex6_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/tracex6_user.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/bpf/xdp1_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/xdp1_user.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/xdp_tx_iptunnel_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/xdp_tx_iptunnel_common.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/xdp_tx_iptunnel_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/xdp_tx_iptunnel_kern.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/bpf/xdp_tx_iptunnel_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/bpf/xdp_tx_iptunnel_user.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/connector/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/connector/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/seccomp/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/seccomp/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/seccomp/bpf-helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/seccomp/bpf-helper.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/seccomp/bpf-helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/seccomp/bpf-helper.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/seccomp/dropper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/seccomp/dropper.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/statx/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/statx/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/statx/test-statx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/statx/test-statx.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/trace_events/trace-events-sample.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/trace_events/trace-events-sample.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/samples/trace_events/trace-events-sample.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/trace_events/trace-events-sample.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/vfio-mdev/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/vfio-mdev/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/samples/vfio-mdev/mtty.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>samples/vfio-mdev/mtty.c</a></td><td class='right'>1516</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/Kbuild.include?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/Kbuild.include</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/Lindent?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/Lindent</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/Makefile.build?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/Makefile.build</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/Makefile.gcc-plugins?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/Makefile.gcc-plugins</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/Makefile.kasan?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/Makefile.kasan</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/adjust_autoksyms.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/adjust_autoksyms.sh</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/analyze_suspend.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/analyze_suspend.py</a></td><td class='right'>1933</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 84.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/bloat-o-meter?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/bloat-o-meter</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/scripts/check_00index.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/check_00index.sh</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/checkincludes.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/checkincludes.pl</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/checkkconfigsymbols.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/checkkconfigsymbols.py</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/checkpatch.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/checkpatch.pl</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/checkstack.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/checkstack.pl</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/scripts/coccinelle/misc/boolconv.cocci?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/coccinelle/misc/boolconv.cocci</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/coccinelle/misc/irqf_oneshot.cocci?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/coccinelle/misc/irqf_oneshot.cocci</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/decode_stacktrace.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/decode_stacktrace.sh</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/checks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/checks.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/dtc-lexer.l?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/dtc-lexer.l</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/dtc-lexer.lex.c_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/dtc-lexer.lex.c_shipped</a></td><td class='right'>650</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/dtc-parser.tab.c_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/dtc-parser.tab.c_shipped</a></td><td class='right'>752</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/dtc-parser.tab.h_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/dtc-parser.tab.h_shipped</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/dtc-parser.y?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/dtc-parser.y</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/dtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/dtc.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/dtc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/dtc.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/flattree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/flattree.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/fstree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/fstree.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/libfdt/Makefile.libfdt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/libfdt/Makefile.libfdt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/libfdt/fdt_ro.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/libfdt/fdt_ro.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/libfdt/fdt_rw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/libfdt/fdt_rw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/libfdt/fdt_strerror.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/libfdt/fdt_strerror.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/libfdt/fdt_wip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/libfdt/fdt_wip.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/libfdt/libfdt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/libfdt/libfdt.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/libfdt/libfdt_env.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/libfdt/libfdt_env.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/livetree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/livetree.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/srcpos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/srcpos.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/srcpos.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/srcpos.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/treesource.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/treesource.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/util.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/util.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/dtc/version_gen.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/dtc/version_gen.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/faddr2line?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/faddr2line</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/gcc-plugins/cyc_complexity_plugin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/gcc-plugins/cyc_complexity_plugin.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/gcc-plugins/gcc-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/gcc-plugins/gcc-common.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/gcc-plugins/latent_entropy_plugin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/gcc-plugins/latent_entropy_plugin.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/gcc-plugins/sancov_plugin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/gcc-plugins/sancov_plugin.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/scripts/gcc-plugins/structleak_plugin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/gcc-plugins/structleak_plugin.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/genksyms/genksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/genksyms/genksyms.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/genksyms/keywords.gperf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/genksyms/keywords.gperf</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/genksyms/keywords.hash.c_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/genksyms/keywords.hash.c_shipped</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/genksyms/parse.tab.c_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/genksyms/parse.tab.c_shipped</a></td><td class='right'>676</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/genksyms/parse.tab.h_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/genksyms/parse.tab.h_shipped</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/genksyms/parse.y?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/genksyms/parse.y</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/get_maintainer.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/get_maintainer.pl</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/kallsyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kallsyms.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/kconfig/expr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kconfig/expr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/kconfig/menu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kconfig/menu.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/kconfig/nconf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kconfig/nconf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/kconfig/nconf.gui.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kconfig/nconf.gui.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/kconfig/qconf.cc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kconfig/qconf.cc</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/kconfig/symbol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kconfig/symbol.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/kconfig/zconf.gperf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kconfig/zconf.gperf</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/kconfig/zconf.hash.c_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kconfig/zconf.hash.c_shipped</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/kconfig/zconf.tab.c_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kconfig/zconf.tab.c_shipped</a></td><td class='right'>1581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 87.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/kconfig/zconf.y?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kconfig/zconf.y</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/kernel-doc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/kernel-doc</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/link-vmlinux.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/link-vmlinux.sh</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/mod/modpost.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/mod/modpost.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/module-common.lds?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/module-common.lds</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/package/builddeb?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/package/builddeb</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/package/mkspec?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/package/mkspec</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/recordmcount.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/recordmcount.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/recordmcount.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/recordmcount.pl</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/selinux/genheaders/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/selinux/genheaders/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/selinux/genheaders/genheaders.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/selinux/genheaders/genheaders.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/selinux/mdp/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/selinux/mdp/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/selinux/mdp/mdp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/selinux/mdp/mdp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--<span class='modechange'>[-rwxr-xr-x]</span></td><td class='upd'><a href='/drm-misc/diff/scripts/sign-file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/sign-file.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/sortextable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/sortextable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/scripts/spelling.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/spelling.txt</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/scripts/tags.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>scripts/tags.sh</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/Kconfig</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/Kconfig</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/apparmorfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/apparmorfs.c</a></td><td class='right'>681</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/audit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/audit.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/capability.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/capability.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/context.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/crypto.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/domain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/domain.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/file.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/include/apparmor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/apparmor.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/include/apparmorfs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/apparmorfs.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/include/audit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/audit.h</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/include/context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/context.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/include/crypto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/crypto.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/include/domain.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/domain.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/include/file.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/file.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/security/apparmor/include/lib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/lib.h</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/include/match.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/match.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/include/path.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/path.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/include/policy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/policy.h</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/security/apparmor/include/policy_ns.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/policy_ns.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/include/policy_unpack.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/policy_unpack.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/security/apparmor/include/secid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/secid.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/security/apparmor/include/sid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/include/sid.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/ipc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/ipc.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/lib.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/lsm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/lsm.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/match.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/match.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/security/apparmor/nulldfa.in?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/nulldfa.in</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/policy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/policy.c</a></td><td class='right'>826</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/security/apparmor/policy_ns.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/policy_ns.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/policy_unpack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/policy_unpack.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/procattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/procattr.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/apparmor/resource.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/resource.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/security/apparmor/secid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/secid.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/security/apparmor/sid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/apparmor/sid.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/commoncap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/commoncap.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/inode.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/digsig.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/digsig.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/evm/evm_crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/evm/evm_crypto.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/evm/evm_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/evm/evm_main.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/ima.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/ima.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/ima_api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/ima_api.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/ima_appraise.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/ima_appraise.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/ima_crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/ima_crypto.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/ima_fs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/ima_fs.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/ima_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/ima_init.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/security/integrity/ima/ima_kexec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/ima_kexec.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/ima_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/ima_main.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/ima_queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/ima_queue.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/ima_template.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/ima_template.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/integrity/ima/ima_template_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/integrity/ima/ima_template_lib.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/keys/dh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/keys/dh.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/keys/encrypted-keys/encrypted.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/keys/encrypted-keys/encrypted.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/keys/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/keys/internal.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/keys/keyctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/keys/keyctl.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/keys/persistent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/keys/persistent.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/keys/process_keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/keys/process_keys.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/keys/request_key.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/keys/request_key.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/keys/request_key_auth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/keys/request_key_auth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/keys/trusted.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/keys/trusted.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/keys/user_defined.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/keys/user_defined.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/loadpin/loadpin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/loadpin/loadpin.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/security.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/security.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/selinux/hooks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/selinux/hooks.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/selinux/include/classmap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/selinux/include/classmap.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/selinux/include/objsec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/selinux/include/objsec.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/selinux/include/security.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/selinux/include/security.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/selinux/selinuxfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/selinux/selinuxfs.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/selinux/ss/ebitmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/selinux/ss/ebitmap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/selinux/ss/policydb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/selinux/ss/policydb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/selinux/ss/services.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/selinux/ss/services.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/smack/smack.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/smack/smack.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/smack/smack_access.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/smack/smack_access.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/smack/smack_lsm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/smack/smack_lsm.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/smack/smackfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/smack/smackfs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/tomoyo/domain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/tomoyo/domain.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/tomoyo/group.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/tomoyo/group.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/tomoyo/tomoyo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/tomoyo/tomoyo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/tomoyo/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/tomoyo/util.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/security/yama/yama_lsm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>security/yama/yama_lsm.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/control.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/control.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/hrtimer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/hrtimer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/hwdep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/hwdep.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/misc.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/oss/pcm_oss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/oss/pcm_oss.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/pcm_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/pcm_lib.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/pcm_native.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/pcm_native.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/rawmidi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/rawmidi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/seq/oss/seq_oss_device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/seq/oss/seq_oss_device.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/seq/oss/seq_oss_writeq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/seq/oss/seq_oss_writeq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/seq/seq_fifo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/seq/seq_fifo.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/seq/seq_memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/seq/seq_memory.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/seq/seq_queue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/seq/seq_queue.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/seq/seq_virmidi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/seq/seq_virmidi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/core/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/core/timer.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/drivers/mpu401/mpu401_uart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/drivers/mpu401/mpu401_uart.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/drivers/mtpav.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/drivers/mtpav.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/drivers/mts64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/drivers/mts64.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/drivers/opl3/opl3_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/drivers/opl3/opl3_lib.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/drivers/pcsp/pcsp_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/drivers/pcsp/pcsp_lib.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/drivers/portman2x4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/drivers/portman2x4.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/drivers/serial-u16550.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/drivers/serial-u16550.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/drivers/vx/vx_pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/drivers/vx/vx_pcm.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/bebob/bebob.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/bebob/bebob.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/bebob/bebob.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/bebob/bebob.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/bebob/bebob_hwdep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/bebob/bebob_hwdep.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/bebob/bebob_midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/bebob/bebob_midi.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/bebob/bebob_pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/bebob/bebob_pcm.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/dice/dice-interface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/dice/dice-interface.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/dice/dice-midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/dice/dice-midi.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/dice/dice-stream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/dice/dice-stream.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/dice/dice.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/dice/dice.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/digi00x/digi00x-hwdep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/digi00x/digi00x-hwdep.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/digi00x/digi00x-midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/digi00x/digi00x-midi.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/digi00x/digi00x-pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/digi00x/digi00x-pcm.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/digi00x/digi00x.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/digi00x/digi00x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/fireworks/fireworks.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/fireworks/fireworks.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/fireworks/fireworks_hwdep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/fireworks/fireworks_hwdep.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/fireworks/fireworks_midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/fireworks/fireworks_midi.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/fireworks/fireworks_pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/fireworks/fireworks_pcm.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/fireworks/fireworks_stream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/fireworks/fireworks_stream.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/lib.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/oxfw/oxfw-midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/oxfw/oxfw-midi.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/oxfw/oxfw-scs1x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/oxfw/oxfw-scs1x.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/oxfw/oxfw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/oxfw/oxfw.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/oxfw/oxfw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/oxfw/oxfw.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/tascam/tascam-hwdep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/tascam/tascam-hwdep.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/tascam/tascam-midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/tascam/tascam-midi.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/tascam/tascam-pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/tascam/tascam-pcm.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/tascam/tascam-stream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/tascam/tascam-stream.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/firewire/tascam/tascam.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/firewire/tascam/tascam.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/hda/ext/hdac_ext_stream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/hda/ext/hdac_ext_stream.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/hda/hdac_i915.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/hda/hdac_i915.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/hda/hdac_stream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/hda/hdac_stream.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/isa/gus/gus_pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/isa/gus/gus_pcm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/isa/gus/gus_uart.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/isa/gus/gus_uart.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/isa/msnd/msnd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/isa/msnd/msnd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/isa/msnd/msnd_midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/isa/msnd/msnd_midi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/isa/sb/emu8000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/isa/sb/emu8000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/isa/sb/emu8000_patch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/isa/sb/emu8000_patch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/isa/sb/emu8000_pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/isa/sb/emu8000_pcm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/isa/sb/sb8_midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/isa/sb/sb8_midi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/isa/wavefront/wavefront_midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/isa/wavefront/wavefront_midi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/isa/wavefront/wavefront_synth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/isa/wavefront/wavefront_synth.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/mips/hal2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/mips/hal2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/ad1848.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/ad1848.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/dmabuf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/dmabuf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/dmasound/dmasound_atari.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/dmasound/dmasound_atari.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/dmasound/dmasound_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/dmasound/dmasound_core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/dmasound/dmasound_paula.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/dmasound/dmasound_paula.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/dmasound/dmasound_q40.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/dmasound/dmasound_q40.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/midibuf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/midibuf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/msnd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/msnd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/msnd_pinnacle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/msnd_pinnacle.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/os.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/os.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/sound_config.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/sound_config.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/oss/swarm_cs4297a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/oss/swarm_cs4297a.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/ac97/ac97_codec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/ac97/ac97_codec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/ac97/ac97_patch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/ac97/ac97_patch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/als4000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/als4000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/au88x0/au88x0_game.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/au88x0/au88x0_game.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/azt3328.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/azt3328.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/ca0106/ca_midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/ca0106/ca_midi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/cmipci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/cmipci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/cs4281.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/cs4281.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/cs46xx/cs46xx_dsp_task_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/cs46xx/cs46xx_dsp_task_types.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/cs46xx/cs46xx_lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/cs46xx/cs46xx_lib.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/cs46xx/dsp_spos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/cs46xx/dsp_spos.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/cs5535audio/cs5535audio_pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/cs5535audio/cs5535audio_pm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/ctxfi/cthw20k1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/ctxfi/cthw20k1.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/ctxfi/cthw20k2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/ctxfi/cthw20k2.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/echoaudio/layla24_dsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/echoaudio/layla24_dsp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/echoaudio/midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/echoaudio/midi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/emu10k1/emu10k1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/emu10k1/emu10k1.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/emu10k1/emu10k1_callback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/emu10k1/emu10k1_callback.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/emu10k1/emu10k1_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/emu10k1/emu10k1_main.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/emu10k1/emu10k1x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/emu10k1/emu10k1x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/emu10k1/emumpu401.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/emu10k1/emumpu401.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/ens1370.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/ens1370.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/es1938.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/es1938.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/es1968.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/es1968.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/hda/hda_auto_parser.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/hda/hda_auto_parser.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/hda/hda_codec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/hda/hda_codec.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/hda/hda_codec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/hda/hda_codec.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/hda/hda_controller.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/hda/hda_controller.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/hda/hda_controller.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/hda/hda_controller.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/hda/hda_intel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/hda/hda_intel.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/hda/patch_ca0132.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/hda/patch_ca0132.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/hda/patch_conexant.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/hda/patch_conexant.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/hda/patch_hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/hda/patch_hdmi.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/hda/patch_realtek.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/hda/patch_realtek.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/hda/patch_sigmatel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/hda/patch_sigmatel.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/ice1712/ice1724.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/ice1712/ice1724.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/ice1712/wm8766.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/ice1712/wm8766.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/ice1712/wm8776.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/ice1712/wm8776.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/korg1212/korg1212.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/korg1212/korg1212.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/mixart/mixart.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/mixart/mixart.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/pcxhr/pcxhr_hwdep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/pcxhr/pcxhr_hwdep.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/riptide/riptide.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/riptide/riptide.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/rme9652/hdsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/rme9652/hdsp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/rme9652/hdspm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/rme9652/hdspm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/sonicvibes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/sonicvibes.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/trident/trident_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/trident/trident_main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/via82xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/via82xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/vx222/vx222_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/vx222/vx222_ops.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pci/ymfpci/ymfpci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pci/ymfpci/ymfpci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/pcmcia/vx/vxp_ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/pcmcia/vx/vxp_ops.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/ppc/snd_ps3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/ppc/snd_ps3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/sh/sh_dac_audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/sh/sh_dac_audio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/amd/acp-pcm-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/amd/acp-pcm-dma.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/atmel/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/atmel/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/atmel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/atmel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/atmel/atmel_ssc_dai.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/atmel/atmel_ssc_dai.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/atmel/atmel_ssc_dai.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/atmel/atmel_ssc_dai.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/atmel/atmel_wm8904.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/atmel/atmel_wm8904.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/atmel/tse850-pcm5142.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/atmel/tse850-pcm5142.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/bcm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/bcm/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/Kconfig</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/ab8500-codec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/ab8500-codec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/adau17x1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/adau17x1.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/ak4641.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/ak4641.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/codecs/ak4641.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/ak4641.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/ak4642.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/ak4642.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/arizona.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/arizona.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/arizona.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/arizona.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/codecs/cs35l34.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/cs35l34.c</a></td><td class='right'>1251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/codecs/cs35l34.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/cs35l34.h</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/codecs/cs42l42.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/cs42l42.c</a></td><td class='right'>1986</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/codecs/cs42l42.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/cs42l42.h</a></td><td class='right'>776</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/cs42l56.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/cs42l56.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/cs42l73.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/cs42l73.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/cs42xx8.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/cs42xx8.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/cs47l24.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/cs47l24.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/da7218.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/da7218.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/da7219-aad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/da7219-aad.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/da7219.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/da7219.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/da7219.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/da7219.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/es8328-i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/es8328-i2c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/es8328.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/es8328.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/es8328.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/es8328.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/hdac_hdmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/hdac_hdmi.c</a></td><td class='right'>1329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/hdac_hdmi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/hdac_hdmi.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/hdmi-codec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/hdmi-codec.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/max98090.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/max98090.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/max9867.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/max9867.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/codecs/msm8916-wcd-analog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/msm8916-wcd-analog.c</a></td><td class='right'>890</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/codecs/msm8916-wcd-digital.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/msm8916-wcd-digital.c</a></td><td class='right'>923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/codecs/nau8540.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/nau8540.c</a></td><td class='right'>835</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/codecs/nau8540.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/nau8540.h</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/nau8825.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/nau8825.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/nau8825.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/nau8825.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/pcm3168a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/pcm3168a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rl6231.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rl6231.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rl6347a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rl6347a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt298.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt298.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5514-spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5514-spi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5514.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5514.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5514.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5514.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5616.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5616.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5640.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5640.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5640.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5640.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5645.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5645.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5659.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5659.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5660.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5660.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5660.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5660.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5663.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5663.c</a></td><td class='right'>1137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5663.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5663.h</a></td><td class='right'>1162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/codecs/rt5665.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5665.c</a></td><td class='right'>4874</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 38.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 62.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/codecs/rt5665.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5665.h</a></td><td class='right'>1990</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5670.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5670.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5670.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5670.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/rt5677-spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/rt5677-spi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/stac9766.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/stac9766.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/codecs/stac9766.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/stac9766.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/sti-sas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/sti-sas.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/tlv320aic31xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/tlv320aic31xx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/tlv320aic31xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/tlv320aic31xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/tlv320aic3x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/tlv320aic3x.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/uda1380.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/uda1380.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/uda1380.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/uda1380.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm0010.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm0010.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm2200.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm2200.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm5102.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm5102.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm5110.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm5110.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm8523.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm8523.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm8580.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm8580.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm8731.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm8731.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm8741.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm8741.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm8753.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm8753.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm8753.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm8753.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm8978.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm8978.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm8997.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm8997.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm8998.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm8998.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm9081.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm9081.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm9705.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm9705.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/codecs/wm9705.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm9705.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm9712.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm9712.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/codecs/wm9712.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm9712.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm9713.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm9713.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm9713.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm9713.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm_adsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm_adsp.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm_adsp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm_adsp.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wm_hubs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wm_hubs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/codecs/wmfw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/codecs/wmfw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/davinci/davinci-evm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/davinci/davinci-evm.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/dwc/designware_i2s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/dwc/designware_i2s.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/dwc/designware_pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/dwc/designware_pcm.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/dwc/local.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/dwc/local.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/fsl/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/fsl/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/fsl/efika-audio-fabric.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/fsl/efika-audio-fabric.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/fsl/fsl-asoc-card.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/fsl/fsl-asoc-card.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/fsl/fsl_asrc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/fsl/fsl_asrc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/fsl/fsl_sai.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/fsl/fsl_sai.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/fsl/fsl_ssi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/fsl/fsl_ssi.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/fsl/imx-wm8962.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/fsl/imx-wm8962.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/fsl/mpc5200_psc_ac97.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/fsl/mpc5200_psc_ac97.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/fsl/mpc5200_psc_ac97.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/fsl/mpc5200_psc_ac97.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/generic/simple-card-utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/generic/simple-card-utils.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/generic/simple-card.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/generic/simple-card.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/generic/simple-scu-card.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/generic/simple-scu-card.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/img/img-parallel-out.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/img/img-parallel-out.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/Kconfig</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/atom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/atom/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/atom/sst-atom-controls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/atom/sst-atom-controls.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/atom/sst-mfld-platform-pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/atom/sst-mfld-platform-pcm.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/atom/sst/sst.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/atom/sst/sst.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/atom/sst/sst.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/atom/sst/sst.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/atom/sst/sst_acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/atom/sst/sst_acpi.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/atom/sst/sst_ipc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/atom/sst/sst_ipc.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/atom/sst/sst_stream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/atom/sst/sst_stream.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/baytrail/sst-baytrail-ipc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/baytrail/sst-baytrail-ipc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/bdw-rt5677.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/bdw-rt5677.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/broadwell.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/broadwell.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/bxt_da7219_max98357a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/bxt_da7219_max98357a.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/bxt_rt298.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/bxt_rt298.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/bytcr_rt5640.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/bytcr_rt5640.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/bytcr_rt5651.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/bytcr_rt5651.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/cht_bsw_max98090_ti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/cht_bsw_max98090_ti.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/cht_bsw_rt5645.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/cht_bsw_rt5645.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/cht_bsw_rt5672.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/cht_bsw_rt5672.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/haswell.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/haswell.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/mfld_machine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/mfld_machine.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/skl_nau88l25_max98357a.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/skl_nau88l25_max98357a.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/skl_nau88l25_ssm4567.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/skl_nau88l25_ssm4567.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/boards/skl_rt286.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/boards/skl_rt286.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/common/sst-acpi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/common/sst-acpi.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/common/sst-dsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/common/sst-dsp.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/common/sst-ipc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/common/sst-ipc.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/common/sst-ipc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/common/sst-ipc.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/common/sst-match-acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/common/sst-match-acpi.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/haswell/sst-haswell-ipc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/haswell/sst-haswell-ipc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/bxt-sst.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/bxt-sst.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-messages.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-messages.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-nhlt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-nhlt.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-pcm.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-sst-cldma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-sst-cldma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-sst-dsp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-sst-dsp.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-sst-ipc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-sst-ipc.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-sst-ipc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-sst-ipc.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-sst-utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-sst-utils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-sst.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-sst.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-topology.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-topology.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-topology.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl-tplg-interface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl-tplg-interface.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/intel/skylake/skl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/intel/skylake/skl.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/kirkwood/armada-370-db.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/kirkwood/armada-370-db.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/mediatek/mt2701/mt2701-afe-pcm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/mediatek/mt8173/mt8173-max98090.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/mediatek/mt8173/mt8173-max98090.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/mxs/mxs-saif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/mxs/mxs-saif.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/mxs/mxs-sgtl5000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/mxs/mxs-sgtl5000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/omap/mcbsp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/omap/mcbsp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/omap/omap-mcbsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/omap/omap-mcbsp.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/corgi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/corgi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/e740_wm9705.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/e740_wm9705.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/e750_wm9705.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/e750_wm9705.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/e800_wm9712.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/e800_wm9712.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/em-x270.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/em-x270.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/hx4700.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/hx4700.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/magician.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/magician.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/mioa701_wm9713.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/mioa701_wm9713.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/palm27x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/palm27x.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/poodle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/poodle.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/pxa-ssp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/pxa-ssp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/pxa2xx-ac97.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/pxa2xx-ac97.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/pxa/pxa2xx-ac97.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/pxa2xx-ac97.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/pxa2xx-i2s.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/pxa2xx-i2s.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/spitz.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/spitz.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/tosa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/tosa.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/pxa/zylonite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/pxa/zylonite.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/qcom/apq8016_sbc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/qcom/apq8016_sbc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/qcom/lpass-apq8016.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/qcom/lpass-apq8016.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/qcom/lpass-cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/qcom/lpass-cpu.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/qcom/lpass-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/qcom/lpass-platform.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/qcom/lpass.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/qcom/lpass.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/qcom/storm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/qcom/storm.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/rockchip/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/rockchip/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/rockchip/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/rockchip/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/rockchip/rk3288_hdmi_analog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/rockchip/rk3288_hdmi_analog.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/rockchip/rk3399_gru_sound.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/rockchip/rk3399_gru_sound.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/rockchip/rockchip_max98090.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/rockchip/rockchip_max98090.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/rockchip/rockchip_rt5645.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/rockchip/rockchip_rt5645.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/samsung/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/Kconfig</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/samsung/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/samsung/ac97.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/ac97.c</a></td><td class='right'>437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/samsung/i2s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/i2s.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/samsung/ln2440sbc_alc650.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/ln2440sbc_alc650.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/samsung/pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/pcm.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/samsung/regs-ac97.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/regs-ac97.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/samsung/s3c24xx-i2s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/s3c24xx-i2s.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/samsung/s3c24xx_uda134x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/s3c24xx_uda134x.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/samsung/smdk2443_wm9710.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/smdk2443_wm9710.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/samsung/smdk_wm8580.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/smdk_wm8580.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/samsung/smdk_wm8580pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/smdk_wm8580pcm.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/samsung/smdk_wm9713.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/smdk_wm9713.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/samsung/tm2_wm5110.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/samsung/tm2_wm5110.c</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sh/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sh/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sh/rcar/adg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sh/rcar/adg.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sh/rcar/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sh/rcar/core.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sh/rcar/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sh/rcar/dma.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sh/rcar/dvc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sh/rcar/dvc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sh/rcar/gen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sh/rcar/gen.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sh/rcar/rsnd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sh/rcar/rsnd.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sh/rcar/src.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sh/rcar/src.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sh/rcar/ssi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sh/rcar/ssi.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sh/rcar/ssiu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sh/rcar/ssiu.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/soc-ac97.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/soc-ac97.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/soc-compress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/soc-compress.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/soc-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/soc-core.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/soc-dapm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/soc-dapm.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/soc-generic-dmaengine-pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/soc-generic-dmaengine-pcm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/soc-ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/soc-ops.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/soc-pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/soc-pcm.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/soc-topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/soc-topology.c</a></td><td class='right'>761</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/soc-utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/soc-utils.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sti/sti_uniperif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sti/sti_uniperif.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sti/uniperif.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sti/uniperif.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sti/uniperif_player.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sti/uniperif_player.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sti/uniperif_reader.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sti/uniperif_reader.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sunxi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sunxi/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sunxi/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sunxi/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sunxi/sun4i-codec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sunxi/sun4i-codec.c</a></td><td class='right'>868</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sunxi/sun4i-i2s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sunxi/sun4i-i2s.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/sunxi/sun4i-spdif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sunxi/sun4i-spdif.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/sunxi/sun8i-codec-analog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sunxi/sun8i-codec-analog.c</a></td><td class='right'>691</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/sunxi/sun8i-codec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/sunxi/sun8i-codec.c</a></td><td class='right'>498</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/tegra/tegra_alc5632.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/tegra/tegra_alc5632.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/tegra/tegra_max98090.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/tegra/tegra_max98090.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/tegra/tegra_rt5640.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/tegra/tegra_rt5640.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/tegra/tegra_rt5677.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/tegra/tegra_rt5677.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/tegra/tegra_sgtl5000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/tegra/tegra_sgtl5000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/tegra/tegra_wm8753.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/tegra/tegra_wm8753.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/tegra/tegra_wm8903.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/tegra/tegra_wm8903.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/tegra/trimslice.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/tegra/trimslice.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/zte/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/zte/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/soc/zte/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/zte/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/zte/zx-i2s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/zte/zx-i2s.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/soc/zte/zx-spdif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/zte/zx-spdif.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/zte/zx296702-i2s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/zte/zx296702-i2s.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/sound/soc/zte/zx296702-spdif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/soc/zte/zx296702-spdif.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/synth/emux/emux_seq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/synth/emux/emux_seq.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/6fire/midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/6fire/midi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/bcd2000/bcd2000.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/bcd2000/bcd2000.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/caiaq/midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/caiaq/midi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/card.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/card.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/endpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/endpoint.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/endpoint.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/endpoint.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/hiface/pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/hiface/pcm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/line6/driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/line6/driver.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/line6/driver.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/line6/driver.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/line6/midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/line6/midi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/line6/podhd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/line6/podhd.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/midi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/midi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/mixer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/mixer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/mixer_quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/mixer_quirks.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/usb/mixer_us16x08.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/mixer_us16x08.c</a></td><td class='right'>1419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/usb/mixer_us16x08.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/mixer_us16x08.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/pcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/pcm.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/quirks.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/usx2y/us122l.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/usx2y/us122l.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/usx2y/usX2Yhwdep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/usx2y/usX2Yhwdep.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/sound/usb/usx2y/usx2yhwdeppcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/usb/usx2y/usx2yhwdeppcm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/x86/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/x86/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/x86/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/x86/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/x86/intel_hdmi_audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/x86/intel_hdmi_audio.c</a></td><td class='right'>1867</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/x86/intel_hdmi_audio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/x86/intel_hdmi_audio.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/sound/x86/intel_hdmi_lpe_audio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>sound/x86/intel_hdmi_lpe_audio.h</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/arch/arm/include/uapi/asm/kvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/arch/arm/include/uapi/asm/kvm.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/arch/powerpc/include/uapi/asm/kvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/arch/powerpc/include/uapi/asm/kvm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/arch/x86/include/asm/cpufeatures.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/arch/x86/include/asm/cpufeatures.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/arch/x86/include/uapi/asm/vmx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/arch/x86/include/uapi/asm/vmx.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/build/Build.include?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/Build.include</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/build/Documentation/Build.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/Documentation/Build.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/build/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/build/Makefile.build?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/Makefile.build</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/build/Makefile.feature?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/Makefile.feature</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/build/Makefile.include?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/Makefile.include</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/build/feature/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/feature/Makefile</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/build/feature/test-clang.cpp?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/feature/test-clang.cpp</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/build/feature/test-jvmti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/feature/test-jvmti.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/build/feature/test-llvm-version.cpp?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/feature/test-llvm-version.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/build/feature/test-llvm.cpp?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/feature/test-llvm.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/build/fixdep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/build/fixdep.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/gpio/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/gpio/.gitignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/gpio/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/gpio/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/gpio/gpio-hammer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/gpio/gpio-hammer.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/gpio/gpio-utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/gpio/gpio-utils.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/gpio/gpio-utils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/gpio/gpio-utils.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/hv/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/hv/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/tools/hv/bondvf.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/hv/bondvf.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/hv/hv_fcopy_daemon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/hv/hv_fcopy_daemon.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/hv/hv_kvp_daemon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/hv/hv_kvp_daemon.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/iio/iio_event_monitor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/iio/iio_event_monitor.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/iio/iio_generic_buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/iio/iio_generic_buffer.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/asm-generic/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/asm-generic/bitops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/tools/include/asm-generic/bitops/__ffz.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/asm-generic/bitops/__ffz.h</a> (renamed from tools/testing/radix-tree/linux/bitops/ffz.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/asm-generic/bitops/atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/asm-generic/bitops/atomic.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/asm-generic/bitops/find.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/asm-generic/bitops/find.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/asm/bug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/asm/bug.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/linux/bitmap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/linux/bitmap.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/linux/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/linux/bitops.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/include/linux/compiler-gcc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/linux/compiler-gcc.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/linux/compiler.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/linux/compiler.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/linux/filter.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/linux/filter.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/linux/log2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/linux/log2.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/include/linux/spinlock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/linux/spinlock.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/linux/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/linux/types.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/uapi/asm-generic/mman-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/uapi/asm-generic/mman-common.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/uapi/linux/bpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/uapi/linux/bpf.h</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/include/uapi/linux/hw_breakpoint.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/include/uapi/linux/hw_breakpoint.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/leds/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/leds/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/leds/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/leds/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/leds/led_hw_brightness_mon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/leds/led_hw_brightness_mon.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/leds/uledmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/leds/uledmon.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/api/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/api/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/api/fs/fs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/api/fs/fs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/api/fs/fs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/api/fs/fs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/api/fs/tracing_path.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/api/fs/tracing_path.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/bpf/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/bpf/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/bpf/bpf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/bpf/bpf.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/bpf/bpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/bpf/bpf.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/bpf/libbpf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/bpf/libbpf.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/bpf/libbpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/bpf/libbpf.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/find_bit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/find_bit.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/lockdep/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/lockdep/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/subcmd/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/subcmd/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/subcmd/parse-options.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/subcmd/parse-options.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/subcmd/parse-options.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/subcmd/parse-options.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/traceevent/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/traceevent/Makefile</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/traceevent/event-parse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/traceevent/event-parse.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/traceevent/event-parse.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/traceevent/event-parse.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/traceevent/kbuffer-parse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/traceevent/kbuffer-parse.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/traceevent/plugin_function.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/traceevent/plugin_function.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/lib/traceevent/plugin_sched_switch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/lib/traceevent/plugin_sched_switch.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/objtool/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/objtool/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/objtool/arch.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/objtool/arch.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/objtool/arch/x86/decode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/objtool/arch/x86/decode.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/objtool/builtin-check.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/objtool/builtin-check.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Build?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Build</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/intel-pt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/intel-pt.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/Documentation/jitdump-specification.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/jitdump-specification.txt</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/perf-annotate.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-annotate.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/Documentation/perf-c2c.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-c2c.txt</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/perf-config.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-config.txt</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/perf-diff.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-diff.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/Documentation/perf-ftrace.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-ftrace.txt</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/Documentation/perf-kallsyms.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-kallsyms.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/perf-kmem.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-kmem.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/perf-record.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-record.txt</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/perf-report.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-report.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/perf-sched.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-sched.txt</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/perf-script.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-script.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/perf-stat.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-stat.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/perf-top.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-top.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/perf-trace.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/perf-trace.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Documentation/tips.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Documentation/tips.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/MANIFEST?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/MANIFEST</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Makefile.config?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Makefile.config</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/Makefile.perf?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/Makefile.perf</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/arch/arm/annotate/instructions.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/arch/arm/annotate/instructions.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/arch/arm/util/cs-etm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/arch/arm/util/cs-etm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/arch/arm64/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/arch/arm64/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/arch/arm64/annotate/instructions.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/arch/arm64/annotate/instructions.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/arch/arm64/include/dwarf-regs-table.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/arch/arm64/include/dwarf-regs-table.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/arch/arm64/util/dwarf-regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/arch/arm64/util/dwarf-regs.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/arch/powerpc/annotate/instructions.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/arch/powerpc/annotate/instructions.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/arch/x86/annotate/instructions.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/arch/x86/annotate/instructions.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/arch/x86/entry/syscalls/syscall_64.tbl</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/arch/x86/tests/arch-tests.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/arch/x86/tests/arch-tests.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/bench/futex-hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/bench/futex-hash.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/bench/futex-lock-pi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/bench/futex-lock-pi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/bench/mem-functions.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/bench/mem-functions.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/bench/numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/bench/numa.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-annotate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-annotate.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/builtin-c2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-c2c.c</a></td><td class='right'>2780</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-config.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-diff.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-diff.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/builtin-ftrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-ftrace.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-help.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-help.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/builtin-kallsyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-kallsyms.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-kmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-kmem.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-list.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-list.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-mem.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-probe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-record.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-record.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-report.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-report.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-sched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-sched.c</a></td><td class='right'>1434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-script.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-script.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-stat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-stat.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-top.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-top.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin-trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin-trace.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/builtin.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/builtin.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/perf/check-headers.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/check-headers.sh</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/command-list.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/command-list.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/jvmti/Build?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/jvmti/Build</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/perf/jvmti/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/jvmti/Makefile</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/jvmti/jvmti_agent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/jvmti/jvmti_agent.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/jvmti/libjvmti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/jvmti/libjvmti.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/perf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/perf.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/perf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/perf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/powerpc/mapfile.csv?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/powerpc/mapfile.csv</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/powerpc/power8/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/powerpc/power8/cache.json</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/powerpc/power8/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/powerpc/power8/floating-point.json</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/powerpc/power8/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/powerpc/power8/frontend.json</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/powerpc/power8/marked.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/powerpc/power8/marked.json</a></td><td class='right'>794</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/powerpc/power8/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/powerpc/power8/memory.json</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/powerpc/power8/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/powerpc/power8/other.json</a></td><td class='right'>4064</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 31.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 68.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/powerpc/power8/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/powerpc/power8/pipeline.json</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/powerpc/power8/pmc.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/powerpc/power8/pmc.json</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/powerpc/power8/translation.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/powerpc/power8/translation.json</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/bonnell/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/bonnell/cache.json</a></td><td class='right'>746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/bonnell/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/bonnell/floating-point.json</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/bonnell/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/bonnell/frontend.json</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/bonnell/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/bonnell/memory.json</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/bonnell/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/bonnell/other.json</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/bonnell/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/bonnell/pipeline.json</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/bonnell/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/bonnell/virtual-memory.json</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwell/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwell/cache.json</a></td><td class='right'>3198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwell/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwell/floating-point.json</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwell/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwell/frontend.json</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwell/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwell/memory.json</a></td><td class='right'>2845</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwell/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwell/other.json</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwell/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwell/pipeline.json</a></td><td class='right'>1417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwell/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwell/virtual-memory.json</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellde/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellde/cache.json</a></td><td class='right'>774</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellde/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellde/floating-point.json</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellde/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellde/frontend.json</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellde/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellde/memory.json</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellde/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellde/other.json</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellde/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellde/pipeline.json</a></td><td class='right'>1417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellde/uncore-cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellde/uncore-cache.json</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellde/uncore-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellde/uncore-memory.json</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellde/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellde/virtual-memory.json</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellx/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellx/cache.json</a></td><td class='right'>942</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellx/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellx/floating-point.json</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellx/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellx/frontend.json</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellx/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellx/memory.json</a></td><td class='right'>649</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellx/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellx/other.json</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellx/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellx/pipeline.json</a></td><td class='right'>1417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellx/uncore-cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellx/uncore-cache.json</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellx/uncore-interconnect.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellx/uncore-interconnect.json</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellx/uncore-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellx/uncore-memory.json</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/broadwellx/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/broadwellx/virtual-memory.json</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/goldmont/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/goldmont/cache.json</a></td><td class='right'>1127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/goldmont/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/goldmont/frontend.json</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/goldmont/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/goldmont/memory.json</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/goldmont/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/goldmont/other.json</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/goldmont/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/goldmont/pipeline.json</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/goldmont/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/goldmont/virtual-memory.json</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswell/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswell/cache.json</a></td><td class='right'>1041</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswell/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswell/floating-point.json</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswell/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswell/frontend.json</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswell/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswell/memory.json</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswell/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswell/other.json</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswell/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswell/pipeline.json</a></td><td class='right'>1329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswell/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswell/virtual-memory.json</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswellx/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswellx/cache.json</a></td><td class='right'>1077</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswellx/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswellx/floating-point.json</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswellx/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswellx/frontend.json</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswellx/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswellx/memory.json</a></td><td class='right'>739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswellx/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswellx/other.json</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswellx/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswellx/pipeline.json</a></td><td class='right'>1329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswellx/uncore-cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswellx/uncore-cache.json</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswellx/uncore-interconnect.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswellx/uncore-interconnect.json</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswellx/uncore-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswellx/uncore-memory.json</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/haswellx/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/haswellx/virtual-memory.json</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivybridge/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivybridge/cache.json</a></td><td class='right'>1123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivybridge/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivybridge/floating-point.json</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivybridge/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivybridge/frontend.json</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivybridge/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivybridge/memory.json</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivybridge/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivybridge/other.json</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivybridge/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivybridge/pipeline.json</a></td><td class='right'>1307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivybridge/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivybridge/virtual-memory.json</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivytown/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivytown/cache.json</a></td><td class='right'>1272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivytown/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivytown/floating-point.json</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivytown/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivytown/frontend.json</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivytown/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivytown/memory.json</a></td><td class='right'>503</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivytown/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivytown/other.json</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivytown/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivytown/pipeline.json</a></td><td class='right'>1307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivytown/uncore-cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivytown/uncore-cache.json</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivytown/uncore-interconnect.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivytown/uncore-interconnect.json</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivytown/uncore-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivytown/uncore-memory.json</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/ivytown/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/ivytown/virtual-memory.json</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/jaketown/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/jaketown/cache.json</a></td><td class='right'>1290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/jaketown/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/jaketown/floating-point.json</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/jaketown/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/jaketown/frontend.json</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/jaketown/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/jaketown/memory.json</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/jaketown/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/jaketown/other.json</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/jaketown/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/jaketown/pipeline.json</a></td><td class='right'>1220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/jaketown/uncore-cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/jaketown/uncore-cache.json</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/jaketown/uncore-interconnect.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/jaketown/uncore-interconnect.json</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/jaketown/uncore-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/jaketown/uncore-memory.json</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/jaketown/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/jaketown/virtual-memory.json</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/knightslanding/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/knightslanding/cache.json</a></td><td class='right'>2305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/knightslanding/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/knightslanding/frontend.json</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/knightslanding/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/knightslanding/memory.json</a></td><td class='right'>1110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/knightslanding/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/knightslanding/pipeline.json</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/knightslanding/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/knightslanding/virtual-memory.json</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/mapfile.csv?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/mapfile.csv</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemep/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemep/cache.json</a></td><td class='right'>3229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemep/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemep/floating-point.json</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemep/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemep/frontend.json</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemep/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemep/memory.json</a></td><td class='right'>739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemep/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemep/other.json</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemep/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemep/pipeline.json</a></td><td class='right'>881</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemex/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemex/cache.json</a></td><td class='right'>3184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemex/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemex/floating-point.json</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemex/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemex/frontend.json</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemex/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemex/memory.json</a></td><td class='right'>739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemex/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemex/other.json</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemex/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemex/pipeline.json</a></td><td class='right'>881</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/nehalemex/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/nehalemex/virtual-memory.json</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/sandybridge/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/sandybridge/cache.json</a></td><td class='right'>1879</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/sandybridge/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/sandybridge/floating-point.json</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/sandybridge/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/sandybridge/frontend.json</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/sandybridge/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/sandybridge/memory.json</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/sandybridge/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/sandybridge/other.json</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/sandybridge/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/sandybridge/pipeline.json</a></td><td class='right'>1220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/sandybridge/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/sandybridge/virtual-memory.json</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/silvermont/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/silvermont/cache.json</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/silvermont/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/silvermont/frontend.json</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/silvermont/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/silvermont/memory.json</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/silvermont/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/silvermont/pipeline.json</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/silvermont/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/silvermont/virtual-memory.json</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/skylake/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/skylake/cache.json</a></td><td class='right'>4299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 33.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 66.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/skylake/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/skylake/floating-point.json</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/skylake/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/skylake/frontend.json</a></td><td class='right'>472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/skylake/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/skylake/memory.json</a></td><td class='right'>2309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/skylake/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/skylake/other.json</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/skylake/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/skylake/pipeline.json</a></td><td class='right'>939</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/skylake/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/skylake/virtual-memory.json</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-dp/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-dp/cache.json</a></td><td class='right'>2817</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-dp/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-dp/floating-point.json</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-dp/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-dp/frontend.json</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-dp/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-dp/memory.json</a></td><td class='right'>758</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-dp/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-dp/other.json</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-dp/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-dp/pipeline.json</a></td><td class='right'>899</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-dp/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-dp/virtual-memory.json</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-sp/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-sp/cache.json</a></td><td class='right'>3233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-sp/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-sp/floating-point.json</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-sp/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-sp/frontend.json</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-sp/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-sp/memory.json</a></td><td class='right'>739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-sp/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-sp/other.json</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-sp/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-sp/pipeline.json</a></td><td class='right'>899</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereep-sp/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereep-sp/virtual-memory.json</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereex/cache.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereex/cache.json</a></td><td class='right'>3225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereex/floating-point.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereex/floating-point.json</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereex/frontend.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereex/frontend.json</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereex/memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereex/memory.json</a></td><td class='right'>747</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereex/other.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereex/other.json</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereex/pipeline.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereex/pipeline.json</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/pmu-events/arch/x86/westmereex/virtual-memory.json?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/arch/x86/westmereex/virtual-memory.json</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/pmu-events/jevents.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/jevents.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/pmu-events/jevents.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/jevents.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/pmu-events/json.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/json.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/pmu-events/pmu-events.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/pmu-events/pmu-events.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/Build?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/Build</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/attr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/attr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/backward-ring-buffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/backward-ring-buffer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/bpf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/bpf.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/builtin-test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/builtin-test.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/tests/clang.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/clang.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/code-reading.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/code-reading.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/fdarray.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/fdarray.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/llvm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/llvm.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/llvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/llvm.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/make?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/make</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/parse-events.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/parse-events.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/parse-no-sample-id-all.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/parse-no-sample-id-all.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/tests/perf-hooks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/perf-hooks.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/perf-record.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/perf-record.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/python-use.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/python-use.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/tests.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/tests.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/thread-map.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/thread-map.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/topology.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/tests/unit_number__scnprintf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/unit_number__scnprintf.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/tests/vmlinux-kallsyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/tests/vmlinux-kallsyms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/trace/beauty/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/trace/beauty/mmap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/ui/browsers/annotate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/ui/browsers/annotate.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/ui/browsers/hists.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/ui/browsers/hists.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/ui/browsers/hists.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/ui/browsers/hists.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/ui/browsers/map.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/ui/browsers/map.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/ui/gtk/annotate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/ui/gtk/annotate.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/ui/helpline.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/ui/helpline.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/ui/helpline.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/ui/helpline.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/ui/hist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/ui/hist.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/ui/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/ui/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/ui/stdio/hist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/ui/stdio/hist.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/Build?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/Build</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/annotate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/annotate.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/annotate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/annotate.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/bpf-loader.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/bpf-loader.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/util/c++/Build?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/c++/Build</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/util/c++/clang-c.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/c++/clang-c.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/util/c++/clang-test.cpp?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/c++/clang-test.cpp</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/util/c++/clang.cpp?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/c++/clang.cpp</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/util/c++/clang.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/c++/clang.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/callchain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/callchain.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/callchain.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/callchain.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/cgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/cgroup.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/config.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/config.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/config.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/cpumap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/cpumap.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/cpumap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/cpumap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/data-convert-bt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/data-convert-bt.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/debug.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/dso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/dso.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/env.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/env.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/event.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/event.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/evlist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/evlist.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/evlist.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/evlist.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/evsel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/evsel.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/evsel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/evsel.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/evsel_fprintf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/evsel_fprintf.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/genelf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/genelf.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/genelf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/genelf.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/header.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/header.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/hist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/hist.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/hist.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/hist.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/intel-bts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/intel-bts.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/intel-pt-decoder/Build?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/intel-pt-decoder/Build</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/intel-pt-decoder/intel-pt-decoder.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/intel-pt-decoder/intel-pt-decoder.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/intel-pt-decoder/intel-pt-decoder.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/intel-pt-decoder/intel-pt-log.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/intel-pt-decoder/intel-pt-log.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/intel-pt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/intel-pt.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/jitdump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/jitdump.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/jitdump.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/jitdump.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/llvm-utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/llvm-utils.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/llvm-utils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/llvm-utils.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/machine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/machine.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/machine.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/machine.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/map.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/map.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/mem-events.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/mem-events.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/mem-events.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/mem-events.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/parse-branch-options.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/parse-branch-options.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/parse-branch-options.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/parse-branch-options.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/parse-events.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/parse-events.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/parse-events.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/parse-events.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/parse-events.y?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/parse-events.y</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/util/perf-hooks-list.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/perf-hooks-list.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/util/perf-hooks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/perf-hooks.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/util/perf-hooks.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/perf-hooks.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/pmu.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/pmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/pmu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/probe-event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/probe-event.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/probe-event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/probe-event.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/probe-finder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/probe-finder.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/probe-finder.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/probe-finder.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/python-ext-sources?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/python-ext-sources</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/quote.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/quote.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/scripting-engines/Build?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/scripting-engines/Build</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/scripting-engines/trace-event-perl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/scripting-engines/trace-event-perl.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/scripting-engines/trace-event-python.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/scripting-engines/trace-event-python.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/session.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/session.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/setup.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/setup.py</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/sort.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/sort.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/sort.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/sort.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/stat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/stat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/strfilter.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/strfilter.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/string.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/string.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/symbol-elf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/symbol-elf.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/symbol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/symbol.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/symbol.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/symbol.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/symbol_fprintf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/symbol_fprintf.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/thread_map.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/thread_map.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/thread_map.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/thread_map.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/util/time-utils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/time-utils.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/util/time-utils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/time-utils.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/trace-event-info.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/trace-event-info.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/trace-event-parse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/trace-event-parse.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/trace-event-read.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/trace-event-read.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/trace-event-scripting.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/trace-event-scripting.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/trace-event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/trace-event.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/unwind-libunwind-local.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/unwind-libunwind-local.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/perf/util/util-cxx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/util-cxx.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/util.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/util.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/values.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/values.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/perf/util/values.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/perf/util/values.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/acpi/common/cmfsize.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/acpi/common/cmfsize.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/acpi/common/getopt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/acpi/common/getopt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/acpi/os_specific/service_layers/oslinuxtbl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/acpi/os_specific/service_layers/osunixdir.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/acpi/os_specific/service_layers/osunixdir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/acpi/os_specific/service_layers/osunixmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/acpi/os_specific/service_layers/osunixmap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/acpi/os_specific/service_layers/osunixxf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/acpi/os_specific/service_layers/osunixxf.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/acpi/tools/acpidump/acpidump.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/acpi/tools/acpidump/acpidump.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/acpi/tools/acpidump/apdump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/acpi/tools/acpidump/apdump.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/acpi/tools/acpidump/apfiles.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/acpi/tools/acpidump/apfiles.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/acpi/tools/acpidump/apmain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/acpi/tools/acpidump/apmain.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/acpi/tools/ec/ec_access.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/acpi/tools/ec/ec_access.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/cpupower/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/cpupower/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/cpupower/debug/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/cpupower/debug/kernel/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/cpupower/utils/cpufreq-info.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/cpupower/utils/cpufreq-info.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py</a></td><td class='right'>569</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/x86/turbostat/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/x86/turbostat/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/x86/turbostat/turbostat.8?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/x86/turbostat/turbostat.8</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/power/x86/turbostat/turbostat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/power/x86/turbostat/turbostat.c</a></td><td class='right'>2569</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.8%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 80.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/scripts/Makefile.include?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/scripts/Makefile.include</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/spi/spidev_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/spi/spidev_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/tools/testing/ktest/ktest.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/ktest/ktest.pl</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/nvdimm/test/nfit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/nvdimm/test/nfit.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/.gitignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/Makefile</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/radix-tree/benchmark.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/benchmark.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/find_next_bit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/find_next_bit.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/generated/autoconf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/generated/autoconf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/radix-tree/idr-test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/idr-test.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/iteration_check.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/iteration_check.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/linux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/bitops.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/bitops/__ffs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/bitops/__ffs.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/bitops/ffs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/bitops/ffs.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/bitops/find.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/bitops/find.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/bitops/fls.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/bitops/fls.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/bitops/fls64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/bitops/fls64.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/bitops/hweight.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/bitops/hweight.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/bitops/le.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/bitops/le.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/bitops/non-atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/bitops/non-atomic.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/bug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/bug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/cpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/cpu.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/export.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/export.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/gfp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/gfp.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/idr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/idr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/init.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/init.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/kernel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/kernel.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/mempool.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/mempool.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/notifier.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/notifier.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/percpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/percpu.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/preempt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/preempt.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/radix-tree.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/radix-tree.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/slab.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/slab.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/linux/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/linux/types.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/main.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/multiorder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/multiorder.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/radix-tree/rcupdate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/rcupdate.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/regression1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/regression1.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/regression2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/regression2.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/regression3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/regression3.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/tag_check.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/tag_check.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/test.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/radix-tree/test.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/radix-tree/test.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/Makefile</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/bpf/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/bpf/.gitignore</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/bpf/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/bpf/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/bpf/bpf_util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/bpf/bpf_util.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/bpf/config?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/bpf/config</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/bpf/test_kmod.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/bpf/test_kmod.sh</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/bpf/test_lpm_map.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/bpf/test_lpm_map.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/bpf/test_lru_map.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/bpf/test_lru_map.c</a></td><td class='right'>602</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/bpf/test_maps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/bpf/test_maps.c</a></td><td class='right'>530</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/bpf/test_tag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/bpf/test_tag.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/bpf/test_verifier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/bpf/test_verifier.c</a></td><td class='right'>4684</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 36.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 63.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/breakpoints/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/breakpoints/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/breakpoints/breakpoint_test_arm64.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/capabilities/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/capabilities/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/cpufreq/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/cpufreq/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/cpufreq/cpu.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/cpufreq/cpu.sh</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/cpufreq/cpufreq.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/cpufreq/cpufreq.sh</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/cpufreq/governor.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/cpufreq/governor.sh</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/cpufreq/main.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/cpufreq/main.sh</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/cpufreq/module.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/cpufreq/module.sh</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/cpufreq/special-tests.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/cpufreq/special-tests.sh</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/drivers/gpu/drm_mm.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/drivers/gpu/drm_mm.sh</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/drivers/gpu/i915.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/drivers/gpu/i915.sh</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/efivarfs/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/efivarfs/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/exec/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/exec/Makefile</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/firmware/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/firmware/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/firmware/fw_fallback.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/firmware/fw_fallback.sh</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/firmware/fw_filesystem.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/firmware/fw_filesystem.sh</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/drm-misc/diff/tools/testing/selftests/firmware/fw_userhelper.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/firmware/fw_userhelper.sh</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/ftrace/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/ftrace/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/ftrace/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/ftrace/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/ftrace/ftracetest?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/ftrace/ftracetest</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/ftrace/test.d/functions?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/ftrace/test.d/functions</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/futex/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/futex/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/futex/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/futex/README</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/futex/functional/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/futex/functional/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/futex/include/logging.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/futex/include/logging.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/gpio/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/gpio/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/gpio/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/gpio/Makefile</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/gpio/gpio-mockup-chardev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/gpio/gpio-mockup-chardev.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/gpio/gpio-mockup-sysfs.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/gpio/gpio-mockup-sysfs.sh</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/gpio/gpio-mockup.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/gpio/gpio-mockup.sh</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/intel_pstate/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/intel_pstate/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/intel_pstate/aperf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/intel_pstate/aperf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/ipc/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/ipc/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/ipc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/ipc/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/kcmp/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/kcmp/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/lib.mk?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/lib.mk</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/lib/prime_numbers.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/lib/prime_numbers.sh</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/locking/ww_mutex.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/locking/ww_mutex.sh</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/membarrier/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/membarrier/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/memfd/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/memfd/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/mount/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/mount/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/mqueue/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/mqueue/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/net/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/net/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/net/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/net/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/net/psock_lib.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/net/psock_lib.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/net/psock_tpacket.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/net/psock_tpacket.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/net/reuseport_bpf_numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/net/reuseport_bpf_numa.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/net/run_netsocktests?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/net/run_netsocktests</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/nsfs/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/nsfs/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/nsfs/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/nsfs/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/Makefile</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/alignment/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/alignment/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/basic_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/basic_asm.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/benchmarks/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/benchmarks/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/benchmarks/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/benchmarks/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/benchmarks/context_switch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/benchmarks/context_switch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/benchmarks/null_syscall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/benchmarks/null_syscall.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/context_switch/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/context_switch/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/copyloops/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/copyloops/Makefile</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/copyloops/validate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/copyloops/validate.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/dscr/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/dscr/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/dscr/dscr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/dscr/dscr.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/include/basic_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/include/basic_asm.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/include/fpu_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/include/fpu_asm.h</a> (renamed from tools/testing/selftests/powerpc/fpu_asm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/include/gpr_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/include/gpr_asm.h</a> (renamed from tools/testing/selftests/powerpc/gpr_asm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/include/instructions.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/include/instructions.h</a> (renamed from tools/testing/selftests/powerpc/instructions.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/include/reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/include/reg.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/include/subunit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/include/subunit.h</a> (renamed from tools/testing/selftests/powerpc/subunit.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/include/utils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/include/utils.h</a> (renamed from tools/testing/selftests/powerpc/utils.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/include/vmx_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/include/vmx_asm.h</a> (renamed from tools/testing/selftests/powerpc/vmx_asm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/include/vsx_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/include/vsx_asm.h</a> (renamed from tools/testing/selftests/powerpc/vsx_asm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/lib/reg.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/lib/reg.S</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/math/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/math/Makefile</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/math/fpu_asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/math/fpu_asm.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/math/vmx_asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/math/vmx_asm.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/math/vsx_asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/math/vsx_asm.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/mm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/mm/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/pmu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/pmu/Makefile</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/pmu/ebb/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/pmu/ebb/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/pmu/ebb/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/pmu/ebb/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr_regs.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/pmu/lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/pmu/lib.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/primitives/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/primitives/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/primitives/asm/firmware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/primitives/asm/firmware.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>l---------</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/primitives/asm/ppc_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/primitives/asm/ppc_asm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/primitives/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/primitives/asm/processor.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/primitives/linux/stringify.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/primitives/linux/stringify.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/primitives/load_unaligned_zeropad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/primitives/load_unaligned_zeropad.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/.gitignore</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-gpr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-gpr.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-gpr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-gpr.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-tar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-tar.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-tar.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-tar.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-tm-gpr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-tm-gpr.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-gpr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-gpr.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-tar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-tar.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-tm-spr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-tm-spr.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-tm-tar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-tm-tar.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-tm-vsx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-tm-vsx.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-vsx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-vsx.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace-vsx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace-vsx.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/ptrace/ptrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/ptrace/ptrace.h</a></td><td class='right'>711</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/reg.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/signal/signal.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/signal/signal.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/stringloops/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/stringloops/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/stringloops/memcmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/stringloops/memcmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/switch_endian/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/switch_endian/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/syscalls/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/syscalls/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/tm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/tm/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/tm/tm-signal.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/tm/tm-signal.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/tm/tm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/tm/tm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/powerpc/vphn/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/powerpc/vphn/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/pstore/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/pstore/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/ptrace/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/ptrace/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/bin/kvm.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/bin/kvm.sh</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/lock/CFLIST?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/lock/CFLIST</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/lock/LOCK07?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/lock/LOCK07</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/lock/LOCK07.boot?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/lock/LOCK07.boot</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/rcu/CFcommon?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/rcu/CFcommon</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/rcu/TINY01?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/rcu/TINY01</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/rcu/TINY02?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/rcu/TINY02</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE01?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/rcu/TREE01</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE02?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/rcu/TREE02</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE03?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/rcu/TREE03</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE04?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/rcu/TREE04</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE05?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/rcu/TREE05</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE06?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/rcu/TREE06</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE07?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/rcu/TREE07</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE08?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/configs/rcu/TREE08</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/delay.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/delay.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/export.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/export.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/mutex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/mutex.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/percpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/percpu.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/preempt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/preempt.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/rcupdate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/rcupdate.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/sched.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/sched.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/smp.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/workqueue.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/workqueue.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/uapi/linux/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/uapi/linux/types.h</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/kconfig.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/kconfig.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/assert_end.fail?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/assert_end.fail</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force.fail?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force.fail</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force2.fail?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force2.fail</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force3.fail?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force3.fail</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/main.pass?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/main.pass</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/seccomp/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/seccomp/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sigaltstack/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sigaltstack/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/sigaltstack/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sigaltstack/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/sigaltstack/sas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sigaltstack/sas.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/size/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/size/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/splice/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/splice/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/splice/default_file_splice_read.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/splice/default_file_splice_read.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/splice/default_file_splice_read.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/splice/default_file_splice_read.sh</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/Makefile</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/sw_sync.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/sw_sync.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/sync.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/sync.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/sync.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/sync_alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/sync_alloc.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/sync_fence.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/sync_fence.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/sync_merge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/sync_merge.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/sync_stress_consumer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/sync_stress_consumer.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/sync_stress_merge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/sync_stress_merge.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/sync_stress_parallelism.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/sync_stress_parallelism.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/sync_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/sync_test.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/sync_wait.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/sync_wait.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/sync/synctest.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/sync/synctest.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/timers/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/timers/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/timers/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/timers/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/timers/skew_consistency.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/timers/skew_consistency.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/vm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/vm/Makefile</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/vm/run_vmtests?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/vm/run_vmtests</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/vm/userfaultfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/vm/userfaultfd.c</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/x86/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/x86/Makefile</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/x86/ioperm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/x86/ioperm.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/x86/protection_keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/x86/protection_keys.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/x86/sysret_rip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/x86/sysret_rip.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/tools/testing/selftests/x86/test_vdso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/x86/test_vdso.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/testing/selftests/zram/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/testing/selftests/zram/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/usb/ffs-test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/usb/ffs-test.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/usb/usbip/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/usb/usbip/.gitignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/usb/usbip/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/usb/usbip/README</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/usb/usbip/src/usbipd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/usb/usbip/src/usbipd.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/drm-misc/diff/tools/usb/usbip/vudc/vudc_server_example.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/usb/usbip/vudc/vudc_server_example.sh</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/virtio/linux/compiler.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/virtio/linux/compiler.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/virtio/linux/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/virtio/linux/uaccess.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/virtio/ringtest/main.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/virtio/ringtest/main.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/drm-misc/diff/tools/virtio/ringtest/run-on-all.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/virtio/ringtest/run-on-all.sh</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/tools/vm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>tools/vm/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/usr/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>usr/Kconfig</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/usr/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>usr/Makefile</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/arch_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/arch_timer.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/hyp/timer-sr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/hyp/timer-sr.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic-debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic-debug.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic-init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic-init.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic-irqfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic-irqfd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic-its.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic-its.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic-kvm-device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic-kvm-device.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic-mmio-v2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic-mmio-v2.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic-mmio-v3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic-mmio-v3.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic-mmio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic-mmio.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic-mmio.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic-mmio.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic-v2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic-v2.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic-v3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic-v3.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/arm/vgic/vgic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/arm/vgic/vgic.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/async_pf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/async_pf.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/kvm_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/kvm_main.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/kvm/vfio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/kvm/vfio.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/drm-misc/diff/virt/lib/irqbypass.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>virt/lib/irqbypass.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>18796 files changed, 1274067 insertions, 495084 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/.mailmap b/.mailmap<br/>index 02d261407683..67dc22ffc9a8 100644<br/>--- a/<a href='/drm-misc/tree/.mailmap?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>.mailmap</a><br/>+++ b/<a href='/drm-misc/tree/.mailmap?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>.mailmap</a></div><div class='hunk'>@@ -137,6 +137,7 @@ Ricardo Ribalda Delgado &lt;ricardo.ribalda@gmail.com&gt;</div><div class='ctx'> Rudolf Marek &lt;R.Marek@sh.cvut.cz&gt;</div><div class='ctx'> Rui Saraiva &lt;rmps@joel.ist.utl.pt&gt;</div><div class='ctx'> Sachin P Sant &lt;ssant@in.ibm.com&gt;</div><div class='add'>+Sarangdhar Joshi &lt;spjoshi@codeaurora.org&gt;</div><div class='ctx'> Sam Ravnborg &lt;sam@mars.ravnborg.org&gt;</div><div class='ctx'> Santosh Shilimkar &lt;ssantosh@kernel.org&gt;</div><div class='ctx'> Santosh Shilimkar &lt;santosh.shilimkar@oracle.org&gt;</div><div class='hunk'>@@ -150,10 +151,13 @@ Shuah Khan &lt;shuah@kernel.org&gt; &lt;shuah.kh@samsung.com&gt;</div><div class='ctx'> Simon Kelley &lt;simon@thekelleys.org.uk&gt;</div><div class='ctx'> Stéphane Witzmann &lt;stephane.witzmann@ubpmes.univ-bpclermont.fr&gt;</div><div class='ctx'> Stephen Hemminger &lt;shemminger@osdl.org&gt;</div><div class='add'>+Subash Abhinov Kasiviswanathan &lt;subashab@codeaurora.org&gt;</div><div class='add'>+Subhash Jadavani &lt;subhashj@codeaurora.org&gt;</div><div class='ctx'> Sudeep Holla &lt;sudeep.holla@arm.com&gt; Sudeep KarkadaNagesha &lt;sudeep.karkadanagesha@arm.com&gt;</div><div class='ctx'> Sumit Semwal &lt;sumit.semwal@ti.com&gt;</div><div class='ctx'> Tejun Heo &lt;htejun@gmail.com&gt;</div><div class='ctx'> Thomas Graf &lt;tgraf@suug.ch&gt;</div><div class='add'>+Thomas Pedersen &lt;twp@codeaurora.org&gt;</div><div class='ctx'> Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='ctx'> Tsuneo Yoshioka &lt;Tsuneo.Yoshioka@f-secure.com&gt;</div><div class='ctx'> Uwe Kleine-König &lt;ukleinek@informatik.uni-freiburg.de&gt;</div><div class='head'>diff --git a/CREDITS b/CREDITS<br/>index d7ebdfbc4d4f..c5626bf06264 100644<br/>--- a/<a href='/drm-misc/tree/CREDITS?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>CREDITS</a><br/>+++ b/<a href='/drm-misc/tree/CREDITS?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>CREDITS</a></div><div class='hunk'>@@ -2478,12 +2478,11 @@ S: D-90453 Nuernberg</div><div class='ctx'> S: Germany</div><div class='ctx'> </div><div class='ctx'> N: Arnaldo Carvalho de Melo</div><div class='del'>-E: acme@ghostprotocols.net</div><div class='add'>+E: acme@kernel.org</div><div class='ctx'> E: arnaldo.melo@gmail.com</div><div class='ctx'> E: acme@redhat.com</div><div class='del'>-W: http://oops.ghostprotocols.net:81/blog/</div><div class='ctx'> P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01</div><div class='del'>-D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks</div><div class='add'>+D: tools/, IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks</div><div class='ctx'> S: Brazil</div><div class='ctx'> </div><div class='ctx'> N: Karsten Merker</div><div class='hunk'>@@ -2775,6 +2774,10 @@ S: C/ Mieses 20, 9-B</div><div class='ctx'> S: Valladolid 47009</div><div class='ctx'> S: Spain</div><div class='ctx'> </div><div class='add'>+N: Peter Oruba</div><div class='add'>+D: AMD Microcode loader driver</div><div class='add'>+S: Germany</div><div class='add'>+</div><div class='ctx'> N: Jens Osterkamp</div><div class='ctx'> E: jens@de.ibm.com</div><div class='ctx'> D: Maintainer of Spidernet network driver for Cell</div><div class='hunk'>@@ -3945,8 +3948,6 @@ E: gwingerde@gmail.com</div><div class='ctx'> D: Ralink rt2x00 WLAN driver</div><div class='ctx'> D: Minix V2 file-system</div><div class='ctx'> D: Misc fixes</div><div class='del'>-S: Geessinkweg 177</div><div class='del'>-S: 7544 TX Enschede</div><div class='ctx'> S: The Netherlands</div><div class='ctx'> </div><div class='ctx'> N: Lars Wirzenius</div><div class='head'>diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX<br/>index 3acc4f1a6f84..793acf999e9e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/00-INDEX?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/00-INDEX</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/00-INDEX?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/00-INDEX</a></div><div class='hunk'>@@ -14,13 +14,8 @@ Following translations are available on the WWW:</div><div class='ctx'> 	- this file.</div><div class='ctx'> ABI/</div><div class='ctx'> 	- info on kernel &lt;-&gt; userspace ABI and relative interface stability.</div><div class='del'>-</div><div class='del'>-BUG-HUNTING</div><div class='del'>-	- brute force method of doing binary search of patches to find bug.</div><div class='del'>-Changes</div><div class='del'>-	- list of changes that break older software packages.</div><div class='ctx'> CodingStyle</div><div class='del'>-	- how the maintainers expect the C code in the kernel to look.</div><div class='add'>+	- nothing here, just a pointer to process/coding-style.rst.</div><div class='ctx'> DMA-API.txt</div><div class='ctx'> 	- DMA API, pci_ API &amp; extensions for non-consistent memory machines.</div><div class='ctx'> DMA-API-HOWTO.txt</div><div class='hunk'>@@ -33,8 +28,6 @@ DocBook/</div><div class='ctx'> 	- directory with DocBook templates etc. for kernel documentation.</div><div class='ctx'> EDID/</div><div class='ctx'> 	- directory with info on customizing EDID for broken gfx/displays.</div><div class='del'>-HOWTO</div><div class='del'>-	- the process and procedures of how to do Linux kernel development.</div><div class='ctx'> IPMI.txt</div><div class='ctx'> 	- info on Linux Intelligent Platform Management Interface (IPMI) Driver.</div><div class='ctx'> IRQ-affinity.txt</div><div class='hunk'>@@ -46,62 +39,43 @@ IRQ.txt</div><div class='ctx'> Intel-IOMMU.txt</div><div class='ctx'> 	- basic info on the Intel IOMMU virtualization support.</div><div class='ctx'> Makefile</div><div class='del'>-	- This file does nothing. Removing it breaks make htmldocs and</div><div class='del'>-	  make distclean.</div><div class='del'>-ManagementStyle</div><div class='del'>-	- how to (attempt to) manage kernel hackers.</div><div class='add'>+	- It's not of interest for those who aren't touching the build system.</div><div class='add'>+Makefile.sphinx</div><div class='add'>+	- It's not of interest for those who aren't touching the build system.</div><div class='add'>+PCI/</div><div class='add'>+	- info related to PCI drivers.</div><div class='ctx'> RCU/</div><div class='ctx'> 	- directory with info on RCU (read-copy update).</div><div class='ctx'> SAK.txt</div><div class='ctx'> 	- info on Secure Attention Keys.</div><div class='ctx'> SM501.txt</div><div class='ctx'> 	- Silicon Motion SM501 multimedia companion chip</div><div class='del'>-SecurityBugs</div><div class='del'>-	- procedure for reporting security bugs found in the kernel.</div><div class='del'>-SubmitChecklist</div><div class='del'>-	- Linux kernel patch submission checklist.</div><div class='del'>-SubmittingDrivers</div><div class='del'>-	- procedure to get a new driver source included into the kernel tree.</div><div class='ctx'> SubmittingPatches</div><div class='del'>-	- procedure to get a source patch included into the kernel tree.</div><div class='del'>-VGA-softcursor.txt</div><div class='del'>-	- how to change your VGA cursor from a blinking underscore.</div><div class='add'>+	- nothing here, just a pointer to process/coding-style.rst.</div><div class='ctx'> accounting/</div><div class='ctx'> 	- documentation on accounting and taskstats.</div><div class='ctx'> acpi/</div><div class='ctx'> 	- info on ACPI-specific hooks in the kernel.</div><div class='add'>+admin-guide/</div><div class='add'>+	- info related to Linux users and system admins.</div><div class='ctx'> aoe/</div><div class='ctx'> 	- description of AoE (ATA over Ethernet) along with config examples.</div><div class='del'>-applying-patches.txt</div><div class='del'>-	- description of various trees and how to apply their patches.</div><div class='ctx'> arm/</div><div class='ctx'> 	- directory with info about Linux on the ARM architecture.</div><div class='ctx'> arm64/</div><div class='ctx'> 	- directory with info about Linux on the 64 bit ARM architecture.</div><div class='del'>-assoc_array.txt</div><div class='del'>-	- generic associative array intro.</div><div class='del'>-atomic_ops.txt</div><div class='del'>-	- semantics and behavior of atomic and bitmask operations.</div><div class='ctx'> auxdisplay/</div><div class='ctx'> 	- misc. LCD driver documentation (cfag12864b, ks0108).</div><div class='ctx'> backlight/</div><div class='ctx'> 	- directory with info on controlling backlights in flat panel displays</div><div class='del'>-bad_memory.txt</div><div class='del'>-	- how to use kernel parameters to exclude bad RAM regions.</div><div class='del'>-basic_profiling.txt</div><div class='del'>-	- basic instructions for those who wants to profile Linux kernel.</div><div class='ctx'> bcache.txt</div><div class='ctx'> 	- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.</div><div class='del'>-binfmt_misc.txt</div><div class='del'>-	- info on the kernel support for extra binary formats.</div><div class='ctx'> blackfin/</div><div class='ctx'> 	- directory with documentation for the Blackfin arch.</div><div class='ctx'> block/</div><div class='ctx'> 	- info on the Block I/O (BIO) layer.</div><div class='ctx'> blockdev/</div><div class='ctx'> 	- info on block devices &amp; drivers</div><div class='del'>-braille-console.txt</div><div class='del'>-	- info on how to use serial devices for Braille support.</div><div class='ctx'> bt8xxgpio.txt</div><div class='ctx'> 	- info on how to modify a bt8xx video card for GPIO usage.</div><div class='ctx'> btmrvl.txt</div><div class='hunk'>@@ -114,18 +88,24 @@ cachetlb.txt</div><div class='ctx'> 	- describes the cache/TLB flushing interfaces Linux uses.</div><div class='ctx'> cdrom/</div><div class='ctx'> 	- directory with information on the CD-ROM drivers that Linux has.</div><div class='del'>-cgroups/</div><div class='del'>-	- cgroups features, including cpusets and memory controller.</div><div class='add'>+cgroup-v1/</div><div class='add'>+	- cgroups v1 features, including cpusets and memory controller.</div><div class='add'>+cgroup-v2.txt</div><div class='add'>+	- cgroups v2 features, including cpusets and memory controller.</div><div class='ctx'> circular-buffers.txt</div><div class='ctx'> 	- how to make use of the existing circular buffer infrastructure</div><div class='ctx'> clk.txt</div><div class='ctx'> 	- info on the common clock framework</div><div class='del'>-coccinelle.txt</div><div class='del'>-	- info on how to get and use the Coccinelle code checking tool.</div><div class='add'>+cma/</div><div class='add'>+	- Continuous Memory Area (CMA) debugfs interface.</div><div class='add'>+conf.py</div><div class='add'>+	- It's not of interest for those who aren't touching the build system.</div><div class='ctx'> connector/</div><div class='ctx'> 	- docs on the netlink based userspace&lt;-&gt;kernel space communication mod.</div><div class='ctx'> console/</div><div class='ctx'> 	- documentation on Linux console drivers.</div><div class='add'>+core-api/</div><div class='add'>+	- documentation on kernel core components.</div><div class='ctx'> cpu-freq/</div><div class='ctx'> 	- info on CPU frequency and voltage scaling.</div><div class='ctx'> cpu-hotplug.txt</div><div class='hunk'>@@ -150,42 +130,42 @@ debugging-via-ohci1394.txt</div><div class='ctx'> 	- how to use firewire like a hardware debugger memory reader.</div><div class='ctx'> dell_rbu.txt</div><div class='ctx'> 	- document demonstrating the use of the Dell Remote BIOS Update driver.</div><div class='del'>-development-process/</div><div class='del'>-	- how to work with the mainline kernel development process.</div><div class='add'>+dev-tools/</div><div class='add'>+	- directory with info on development tools for the kernel.</div><div class='ctx'> device-mapper/</div><div class='ctx'> 	- directory with info on Device Mapper.</div><div class='del'>-devices.txt</div><div class='del'>-	- plain ASCII listing of all the nodes in /dev/ with major minor #'s.</div><div class='add'>+dmaengine/</div><div class='add'>+	- the DMA engine and controller API guides.</div><div class='ctx'> devicetree/</div><div class='ctx'> 	- directory with info on device tree files used by OF/PowerPC/ARM</div><div class='ctx'> digsig.txt</div><div class='ctx'> 	-info on the Digital Signature Verification API</div><div class='ctx'> dma-buf-sharing.txt</div><div class='ctx'> 	- the DMA Buffer Sharing API Guide</div><div class='add'>+docutils.conf</div><div class='add'>+	- nothing here. Just a configuration file for docutils.</div><div class='ctx'> dontdiff</div><div class='ctx'> 	- file containing a list of files that should never be diff'ed.</div><div class='add'>+driver-api/</div><div class='add'>+	- the Linux driver implementer's API guide.</div><div class='ctx'> driver-model/</div><div class='ctx'> 	- directory with info about Linux driver model.</div><div class='del'>-dvb/</div><div class='del'>-	- info on Linux Digital Video Broadcast (DVB) subsystem.</div><div class='del'>-dynamic-debug-howto.txt</div><div class='del'>-	- how to use the dynamic debug (dyndbg) feature.</div><div class='ctx'> early-userspace/</div><div class='ctx'> 	- info about initramfs, klibc, and userspace early during boot.</div><div class='del'>-edac.txt</div><div class='del'>-	- information on EDAC - Error Detection And Correction</div><div class='ctx'> efi-stub.txt</div><div class='ctx'> 	- How to use the EFI boot stub to bypass GRUB or elilo on EFI systems.</div><div class='ctx'> eisa.txt</div><div class='ctx'> 	- info on EISA bus support.</div><div class='del'>-email-clients.txt</div><div class='del'>-	- info on how to use e-mail to send un-mangled (git) patches.</div><div class='ctx'> extcon/</div><div class='ctx'> 	- directory with porting guide for Android kernel switch driver.</div><div class='add'>+isa.txt</div><div class='add'>+	- info on EISA bus support.</div><div class='ctx'> fault-injection/</div><div class='ctx'> 	- dir with docs about the fault injection capabilities infrastructure.</div><div class='ctx'> fb/</div><div class='ctx'> 	- directory with info on the frame buffer graphics abstraction layer.</div><div class='add'>+features/</div><div class='add'>+	- status of feature implementation on different architectures.</div><div class='ctx'> filesystems/</div><div class='ctx'> 	- info on the vfs and the various filesystems that Linux supports.</div><div class='ctx'> firmware_class/</div><div class='hunk'>@@ -194,20 +174,22 @@ flexible-arrays.txt</div><div class='ctx'> 	- how to make use of flexible sized arrays in linux</div><div class='ctx'> fmc/</div><div class='ctx'> 	- information about the FMC bus abstraction</div><div class='add'>+fpga/</div><div class='add'>+	- FPGA Manager Core.</div><div class='ctx'> frv/</div><div class='ctx'> 	- Fujitsu FR-V Linux documentation.</div><div class='ctx'> futex-requeue-pi.txt</div><div class='ctx'> 	- info on requeueing of tasks from a non-PI futex to a PI futex</div><div class='del'>-gcov.txt</div><div class='del'>-	- use of GCC's coverage testing tool "gcov" with the Linux kernel</div><div class='add'>+gcc-plugins.txt</div><div class='add'>+	- GCC plugin infrastructure.</div><div class='ctx'> gpio/</div><div class='ctx'> 	- gpio related documentation</div><div class='add'>+gpu/</div><div class='add'>+	- directory with information on GPU driver developer's guide.</div><div class='ctx'> hid/</div><div class='ctx'> 	- directory with information on human interface devices</div><div class='ctx'> highuid.txt</div><div class='ctx'> 	- notes on the change from 16 bit to 32 bit user/group IDs.</div><div class='del'>-hsi.txt</div><div class='del'>-	- HSI subsystem overview.</div><div class='ctx'> hwspinlock.txt</div><div class='ctx'> 	- hardware spinlock provides hardware assistance for synchronization</div><div class='ctx'> timers/</div><div class='hunk'>@@ -218,18 +200,18 @@ hwmon/</div><div class='ctx'> 	- directory with docs on various hardware monitoring drivers.</div><div class='ctx'> i2c/</div><div class='ctx'> 	- directory with info about the I2C bus/protocol (2 wire, kHz speed).</div><div class='del'>-i2o/</div><div class='del'>-	- directory with info about the Linux I2O subsystem.</div><div class='ctx'> x86/i386/</div><div class='ctx'> 	- directory with info about Linux on Intel 32 bit architecture.</div><div class='ctx'> ia64/</div><div class='ctx'> 	- directory with info about Linux on Intel 64 bit architecture.</div><div class='add'>+ide/</div><div class='add'>+	- Information regarding the Enhanced IDE drive.</div><div class='add'>+iio/</div><div class='add'>+	- info on industrial IIO configfs support.</div><div class='add'>+index.rst</div><div class='add'>+	- main index for the documentation at ReST format.</div><div class='ctx'> infiniband/</div><div class='ctx'> 	- directory with documents concerning Linux InfiniBand support.</div><div class='del'>-init.txt</div><div class='del'>-	- what to do when the kernel can't find the 1st process to run.</div><div class='del'>-initrd.txt</div><div class='del'>-	- how to use the RAM disk as an initial/temporary root filesystem.</div><div class='ctx'> input/</div><div class='ctx'> 	- info on Linux input device support.</div><div class='ctx'> intel_txt.txt</div><div class='hunk'>@@ -248,28 +230,16 @@ isapnp.txt</div><div class='ctx'> 	- info on Linux ISA Plug &amp; Play support.</div><div class='ctx'> isdn/</div><div class='ctx'> 	- directory with info on the Linux ISDN support, and supported cards.</div><div class='del'>-java.txt</div><div class='del'>-	- info on the in-kernel binary support for Java(tm).</div><div class='del'>-ja_JP/</div><div class='del'>-	- directory with Japanese translations of various documents</div><div class='ctx'> kbuild/</div><div class='ctx'> 	- directory with info about the kernel build process.</div><div class='add'>+kernel-doc-nano-HOWTO.txt</div><div class='add'>+	- outdated info about kernel-doc documentation.</div><div class='ctx'> kdump/</div><div class='ctx'> 	- directory with mini HowTo on getting the crash dump code to work.</div><div class='del'>-kernel-docs.txt</div><div class='del'>-	- listing of various WWW + books that document kernel internals.</div><div class='del'>-kernel-documentation.rst</div><div class='add'>+doc-guide/</div><div class='ctx'> 	- how to write and format reStructuredText kernel documentation</div><div class='del'>-kernel-parameters.txt</div><div class='del'>-	- summary listing of command line / boot prompt args for the kernel.</div><div class='ctx'> kernel-per-CPU-kthreads.txt</div><div class='ctx'> 	- List of all per-CPU kthreads and how they introduce jitter.</div><div class='del'>-kmemcheck.txt</div><div class='del'>-	- info on dynamic checker that detects uses of uninitialized memory.</div><div class='del'>-kmemleak.txt</div><div class='del'>-	- info on how to make use of the kernel memory leak detection system</div><div class='del'>-ko_KR/</div><div class='del'>-	- directory with Korean translations of various documents</div><div class='ctx'> kobject.txt</div><div class='ctx'> 	- info of the kobject infrastructure of the Linux kernel.</div><div class='ctx'> kprobes.txt</div><div class='hunk'>@@ -284,8 +254,8 @@ ldm.txt</div><div class='ctx'> 	- a brief description of LDM (Windows Dynamic Disks).</div><div class='ctx'> leds/</div><div class='ctx'> 	- directory with info about LED handling under Linux.</div><div class='del'>-local_ops.txt</div><div class='del'>-	- semantics and behavior of local atomic operations.</div><div class='add'>+livepatch/</div><div class='add'>+	- info on kernel live patching.</div><div class='ctx'> locking/</div><div class='ctx'> 	- directory with info about kernel locking primitives</div><div class='ctx'> lockup-watchdogs.txt</div><div class='hunk'>@@ -298,22 +268,24 @@ lzo.txt</div><div class='ctx'> 	- kernel LZO decompressor input formats</div><div class='ctx'> m68k/</div><div class='ctx'> 	- directory with info about Linux on Motorola 68k architecture.</div><div class='del'>-magic-number.txt</div><div class='del'>-	- list of magic numbers used to mark/protect kernel data structures.</div><div class='ctx'> mailbox.txt</div><div class='ctx'> 	- How to write drivers for the common mailbox framework (IPC).</div><div class='del'>-md.txt</div><div class='del'>-	- info on boot arguments for the multiple devices driver.</div><div class='del'>-media-framework.txt</div><div class='del'>-	- info on media framework, its data structures, functions and usage.</div><div class='add'>+md/</div><div class='add'>+	- directory with info about Linux Software RAID</div><div class='add'>+media/</div><div class='add'>+	- info on media drivers: uAPI, kAPI and driver documentation.</div><div class='ctx'> memory-barriers.txt</div><div class='ctx'> 	- info on Linux kernel memory barriers.</div><div class='ctx'> memory-devices/</div><div class='ctx'> 	- directory with info on parts like the Texas Instruments EMIF driver</div><div class='ctx'> memory-hotplug.txt</div><div class='ctx'> 	- Hotpluggable memory support, how to use and current status.</div><div class='add'>+men-chameleon-bus.txt</div><div class='add'>+	- info on MEN chameleon bus.</div><div class='ctx'> metag/</div><div class='ctx'> 	- directory with info about Linux on Meta architecture.</div><div class='add'>+mic/</div><div class='add'>+	- Intel Many Integrated Core (MIC) architecture device driver.</div><div class='ctx'> mips/</div><div class='ctx'> 	- directory with info about Linux on MIPS architecture.</div><div class='ctx'> misc-devices/</div><div class='hunk'>@@ -322,12 +294,8 @@ mmc/</div><div class='ctx'> 	- directory with info about the MMC subsystem</div><div class='ctx'> mn10300/</div><div class='ctx'> 	- directory with info about the mn10300 architecture port</div><div class='del'>-module-signing.txt</div><div class='del'>-	- Kernel module signing for increased security when loading modules.</div><div class='ctx'> mtd/</div><div class='ctx'> 	- directory with info about memory technology devices (flash)</div><div class='del'>-mono.txt</div><div class='del'>-	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.</div><div class='ctx'> namespaces/</div><div class='ctx'> 	- directory with various information about namespaces</div><div class='ctx'> netlabel/</div><div class='hunk'>@@ -336,30 +304,42 @@ networking/</div><div class='ctx'> 	- directory with info on various aspects of networking with Linux.</div><div class='ctx'> nfc/</div><div class='ctx'> 	- directory relating info about Near Field Communications support.</div><div class='add'>+nios2/</div><div class='add'>+	- Linux on the Nios II architecture.</div><div class='ctx'> nommu-mmap.txt</div><div class='ctx'> 	- documentation about no-mmu memory mapping support.</div><div class='ctx'> numastat.txt</div><div class='ctx'> 	- info on how to read Numa policy hit/miss statistics in sysfs.</div><div class='del'>-oops-tracing.txt</div><div class='del'>-	- how to decode those nasty internal kernel error dump messages.</div><div class='add'>+ntb.txt</div><div class='add'>+	- info on Non-Transparent Bridge (NTB) drivers.</div><div class='add'>+nvdimm/</div><div class='add'>+	- info on non-volatile devices.</div><div class='add'>+nvmem/</div><div class='add'>+	- info on non volatile memory framework.</div><div class='add'>+output/</div><div class='add'>+	- default directory where html/LaTeX/pdf files will be written.</div><div class='ctx'> padata.txt</div><div class='ctx'> 	- An introduction to the "padata" parallel execution API</div><div class='ctx'> parisc/</div><div class='ctx'> 	- directory with info on using Linux on PA-RISC architecture.</div><div class='del'>-parport.txt</div><div class='del'>-	- how to use the parallel-port driver.</div><div class='ctx'> parport-lowlevel.txt</div><div class='ctx'> 	- description and usage of the low level parallel port functions.</div><div class='ctx'> pcmcia/</div><div class='ctx'> 	- info on the Linux PCMCIA driver.</div><div class='ctx'> percpu-rw-semaphore.txt</div><div class='ctx'> 	- RCU based read-write semaphore optimized for locking for reading</div><div class='add'>+perf/</div><div class='add'>+	- info about the APM X-Gene SoC Performance Monitoring Unit (PMU).</div><div class='add'>+phy/</div><div class='add'>+	- ino on Samsung USB 2.0 PHY adaptation layer.</div><div class='ctx'> phy.txt</div><div class='ctx'> 	- Description of the generic PHY framework.</div><div class='ctx'> pi-futex.txt</div><div class='ctx'> 	- documentation on lightweight priority inheritance futexes.</div><div class='ctx'> pinctrl.txt</div><div class='ctx'> 	- info on pinctrl subsystem and the PINMUX/PINCONF and drivers</div><div class='add'>+platform/</div><div class='add'>+	- List of supported hardware by compal and Dell laptop.</div><div class='ctx'> pnp.txt</div><div class='ctx'> 	- Linux Plug and Play documentation.</div><div class='ctx'> power/</div><div class='hunk'>@@ -372,14 +352,16 @@ preempt-locking.txt</div><div class='ctx'> 	- info on locking under a preemptive kernel.</div><div class='ctx'> printk-formats.txt</div><div class='ctx'> 	- how to get printk format specifiers right</div><div class='add'>+process/</div><div class='add'>+	- how to work with the mainline kernel development process.</div><div class='ctx'> pps/</div><div class='ctx'> 	- directory with information on the pulse-per-second support</div><div class='add'>+pti/</div><div class='add'>+	- directory with info on Intel MID PTI.</div><div class='ctx'> ptp/</div><div class='ctx'> 	- directory with info on support for IEEE 1588 PTP clocks in Linux.</div><div class='ctx'> pwm.txt</div><div class='ctx'> 	- info on the pulse width modulation driver subsystem</div><div class='del'>-ramoops.txt</div><div class='del'>-	- documentation of the ramoops oops/panic logging module.</div><div class='ctx'> rapidio/</div><div class='ctx'> 	- directory with info on RapidIO packet-based fabric interconnect</div><div class='ctx'> rbtree.txt</div><div class='hunk'>@@ -406,8 +388,6 @@ security/</div><div class='ctx'> 	- directory that contains security-related info</div><div class='ctx'> serial/</div><div class='ctx'> 	- directory with info on the low level serial API.</div><div class='del'>-serial-console.txt</div><div class='del'>-	- how to set up Linux with a serial line console as the default.</div><div class='ctx'> sgi-ioc4.txt</div><div class='ctx'> 	- description of the SGI IOC4 PCI (multi function) device.</div><div class='ctx'> sh/</div><div class='hunk'>@@ -416,24 +396,20 @@ smsc_ece1099.txt</div><div class='ctx'> 	-info on the smsc Keyboard Scan Expansion/GPIO Expansion device.</div><div class='ctx'> sound/</div><div class='ctx'> 	- directory with info on sound card support.</div><div class='del'>-sparse.txt</div><div class='del'>-	- info on how to obtain and use the sparse tool for typechecking.</div><div class='ctx'> spi/</div><div class='ctx'> 	- overview of Linux kernel Serial Peripheral Interface (SPI) support.</div><div class='del'>-stable_api_nonsense.txt</div><div class='del'>-	- info on why the kernel does not have a stable in-kernel api or abi.</div><div class='del'>-stable_kernel_rules.txt</div><div class='del'>-	- rules and procedures for the -stable kernel releases.</div><div class='add'>+sphinx/</div><div class='add'>+	- no documentation here, just files required by Sphinx toolchain.</div><div class='add'>+sphinx-static/</div><div class='add'>+	- no documentation here, just files required by Sphinx toolchain.</div><div class='ctx'> static-keys.txt</div><div class='ctx'> 	- info on how static keys allow debug code in hotpaths via patching</div><div class='ctx'> svga.txt</div><div class='ctx'> 	- short guide on selecting video modes at boot via VGA BIOS.</div><div class='del'>-sysfs-rules.txt</div><div class='del'>-	- How not to use sysfs.</div><div class='add'>+sync_file.txt</div><div class='add'>+	- Sync file API guide.</div><div class='ctx'> sysctl/</div><div class='ctx'> 	- directory with info on the /proc/sys/* files.</div><div class='del'>-sysrq.txt</div><div class='del'>-	- info on the magic SysRq key.</div><div class='ctx'> target/</div><div class='ctx'> 	- directory with info on generating TCM v4 fabric .ko modules</div><div class='ctx'> this_cpu_ops.txt</div><div class='hunk'>@@ -442,39 +418,29 @@ thermal/</div><div class='ctx'> 	- directory with information on managing thermal issues (CPU/temp)</div><div class='ctx'> trace/</div><div class='ctx'> 	- directory with info on tracing technologies within linux</div><div class='add'>+translations/</div><div class='add'>+	- translations of this document from English to another language</div><div class='ctx'> unaligned-memory-access.txt</div><div class='ctx'> 	- info on how to avoid arch breaking unaligned memory access in code.</div><div class='del'>-unicode.txt</div><div class='del'>-	- info on the Unicode character/font mapping used in Linux.</div><div class='ctx'> unshare.txt</div><div class='ctx'> 	- description of the Linux unshare system call.</div><div class='ctx'> usb/</div><div class='ctx'> 	- directory with info regarding the Universal Serial Bus.</div><div class='del'>-vDSO/</div><div class='del'>-	- directory with info regarding virtual dynamic shared objects</div><div class='ctx'> vfio.txt</div><div class='ctx'> 	- info on Virtual Function I/O used in guest/hypervisor instances.</div><div class='del'>-vgaarbiter.txt</div><div class='del'>-	- info on enable/disable the legacy decoding on different VGA devices</div><div class='ctx'> video-output.txt</div><div class='ctx'> 	- sysfs class driver interface to enable/disable a video output device.</div><div class='del'>-video4linux/</div><div class='del'>-	- directory with info regarding video/TV/radio cards and linux.</div><div class='ctx'> virtual/</div><div class='ctx'> 	- directory with information on the various linux virtualizations.</div><div class='ctx'> vm/</div><div class='ctx'> 	- directory with info on the Linux vm code.</div><div class='del'>-vme_api.txt</div><div class='del'>-	- file relating info on the VME bus API in linux</div><div class='del'>-volatile-considered-harmful.txt</div><div class='del'>-	- Why the "volatile" type class should not be used</div><div class='ctx'> w1/</div><div class='ctx'> 	- directory with documents regarding the 1-wire (w1) subsystem.</div><div class='ctx'> watchdog/</div><div class='ctx'> 	- how to auto-reboot Linux if it has "fallen and can't get up". ;-)</div><div class='ctx'> wimax/</div><div class='ctx'> 	- directory with info about Intel Wireless Wimax Connections</div><div class='del'>-workqueue.txt</div><div class='add'>+core-api/workqueue.rst</div><div class='ctx'> 	- information on the Concurrency Managed Workqueue implementation</div><div class='ctx'> x86/x86_64/</div><div class='ctx'> 	- directory with info on Linux support for AMD x86-64 (Hammer) machines.</div><div class='hunk'>@@ -484,7 +450,5 @@ xtensa/</div><div class='ctx'> 	- directory with documents relating to arch/xtensa port/implementation</div><div class='ctx'> xz.txt</div><div class='ctx'> 	- how to make use of the XZ data compression within linux kernel</div><div class='del'>-zh_CN/</div><div class='del'>-	- directory with Chinese translations of various documents</div><div class='ctx'> zorro.txt</div><div class='ctx'> 	- info on writing drivers for Zorro bus devices found on Amigas.</div><div class='head'>diff --git a/Documentation/80211/conf.py b/Documentation/80211/conf.py<br/>deleted file mode 100644<br/>index 20c7c275ef4a..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/80211/conf.py?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/80211/conf.py</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-# -*- coding: utf-8; mode: python -*-</div><div class='del'>-</div><div class='del'>-project = "Linux 802.11 Driver Developer's Guide"</div><div class='del'>-</div><div class='del'>-tags.add("subproject")</div><div class='head'>diff --git a/Documentation/80211/index.rst b/Documentation/80211/index.rst<br/>deleted file mode 100644<br/>index 90bba476f442..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/80211/index.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/80211/index.rst</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +0,0 @@</div><div class='del'>-=====================================</div><div class='del'>-Linux 802.11 Driver Developer's Guide</div><div class='del'>-=====================================</div><div class='del'>-</div><div class='del'>-.. toctree::</div><div class='del'>-</div><div class='del'>-   introduction</div><div class='del'>-   cfg80211</div><div class='del'>-   mac80211</div><div class='del'>-   mac80211-advanced</div><div class='del'>-</div><div class='del'>-.. only::  subproject</div><div class='del'>-</div><div class='del'>-   Indices</div><div class='del'>-   =======</div><div class='del'>-</div><div class='del'>-   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/ABI/README b/Documentation/ABI/README<br/>index 1fafc4b0753b..3121029dce21 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/README?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/README</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/README</a></div><div class='hunk'>@@ -84,4 +84,4 @@ stable:</div><div class='ctx'> </div><div class='ctx'> - Kernel-internal symbols.  Do not rely on the presence, absence, location, or</div><div class='ctx'>   type of any kernel symbol, either in System.map files or the kernel binary</div><div class='del'>-  itself.  See Documentation/stable_api_nonsense.txt.</div><div class='add'>+  itself.  See Documentation/process/stable-api-nonsense.rst.</div><div class='head'>diff --git a/Documentation/ABI/obsolete/sysfs-block-zram b/Documentation/ABI/obsolete/sysfs-block-zram<br/>deleted file mode 100644<br/>index 720ea92cfb2e..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/obsolete/sysfs-block-zram?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/obsolete/sysfs-block-zram</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,119 +0,0 @@</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/num_reads</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The num_reads file is read-only and specifies the number of</div><div class='del'>-		reads (failed or successful) done on this device.</div><div class='del'>-		Now accessible via zram&lt;id&gt;/stat node.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/num_writes</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The num_writes file is read-only and specifies the number of</div><div class='del'>-		writes (failed or successful) done on this device.</div><div class='del'>-		Now accessible via zram&lt;id&gt;/stat node.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/invalid_io</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The invalid_io file is read-only and specifies the number of</div><div class='del'>-		non-page-size-aligned I/O requests issued to this device.</div><div class='del'>-		Now accessible via zram&lt;id&gt;/io_stat node.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/failed_reads</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The failed_reads file is read-only and specifies the number of</div><div class='del'>-		failed reads happened on this device.</div><div class='del'>-		Now accessible via zram&lt;id&gt;/io_stat node.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/failed_writes</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The failed_writes file is read-only and specifies the number of</div><div class='del'>-		failed writes happened on this device.</div><div class='del'>-		Now accessible via zram&lt;id&gt;/io_stat node.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/notify_free</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The notify_free file is read-only. Depending on device usage</div><div class='del'>-		scenario it may account a) the number of pages freed because</div><div class='del'>-		of swap slot free notifications or b) the number of pages freed</div><div class='del'>-		because of REQ_DISCARD requests sent by bio. The former ones</div><div class='del'>-		are sent to a swap block device when a swap slot is freed, which</div><div class='del'>-		implies that this disk is being used as a swap disk. The latter</div><div class='del'>-		ones are sent by filesystem mounted with discard option,</div><div class='del'>-		whenever some data blocks are getting discarded.</div><div class='del'>-		Now accessible via zram&lt;id&gt;/io_stat node.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/zero_pages</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The zero_pages file is read-only and specifies number of zero</div><div class='del'>-		filled pages written to this disk. No memory is allocated for</div><div class='del'>-		such pages.</div><div class='del'>-		Now accessible via zram&lt;id&gt;/mm_stat node.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/orig_data_size</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The orig_data_size file is read-only and specifies uncompressed</div><div class='del'>-		size of data stored in this disk. This excludes zero-filled</div><div class='del'>-		pages (zero_pages) since no memory is allocated for them.</div><div class='del'>-		Unit: bytes</div><div class='del'>-		Now accessible via zram&lt;id&gt;/mm_stat node.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/compr_data_size</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The compr_data_size file is read-only and specifies compressed</div><div class='del'>-		size of data stored in this disk. So, compression ratio can be</div><div class='del'>-		calculated using orig_data_size and this statistic.</div><div class='del'>-		Unit: bytes</div><div class='del'>-		Now accessible via zram&lt;id&gt;/mm_stat node.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/mem_used_total</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The mem_used_total file is read-only and specifies the amount</div><div class='del'>-		of memory, including allocator fragmentation and metadata</div><div class='del'>-		overhead, allocated for this disk. So, allocator space</div><div class='del'>-		efficiency can be calculated using compr_data_size and this</div><div class='del'>-		statistic.</div><div class='del'>-		Unit: bytes</div><div class='del'>-		Now accessible via zram&lt;id&gt;/mm_stat node.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/mem_used_max</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The mem_used_max file is read/write and specifies the amount</div><div class='del'>-		of maximum memory zram have consumed to store compressed data.</div><div class='del'>-		For resetting the value, you should write "0". Otherwise,</div><div class='del'>-		you could see -EINVAL.</div><div class='del'>-		Unit: bytes</div><div class='del'>-		Downgraded to write-only node: so it's possible to set new</div><div class='del'>-		value only; its current value is stored in zram&lt;id&gt;/mm_stat</div><div class='del'>-		node.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/mem_limit</div><div class='del'>-Date:		August 2015</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The mem_limit file is read/write and specifies the maximum</div><div class='del'>-		amount of memory ZRAM can use to store the compressed data.</div><div class='del'>-		The limit could be changed in run time and "0" means disable</div><div class='del'>-		the limit.  No limit is the initial state.  Unit: bytes</div><div class='del'>-		Downgraded to write-only node: so it's possible to set new</div><div class='del'>-		value only; its current value is stored in zram&lt;id&gt;/mm_stat</div><div class='del'>-		node.</div><div class='head'>diff --git a/Documentation/ABI/stable/sysfs-devices b/Documentation/ABI/stable/sysfs-devices<br/>index df449d79b563..35c457f8ce73 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/stable/sysfs-devices?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/stable/sysfs-devices</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/stable/sysfs-devices?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/stable/sysfs-devices</a></div><div class='hunk'>@@ -8,3 +8,17 @@ Description:</div><div class='ctx'> 		Any device associated with a device-tree node will have</div><div class='ctx'> 		an of_path symlink pointing to the corresponding device</div><div class='ctx'> 		node in /sys/firmware/devicetree/</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/*/devspec</div><div class='add'>+Date:		October 2016</div><div class='add'>+Contact:	Device Tree mailing list &lt;devicetree@vger.kernel.org&gt;</div><div class='add'>+Description:</div><div class='add'>+		If CONFIG_OF is enabled, then this file is present. When</div><div class='add'>+		read, it returns full name of the device node.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/*/obppath</div><div class='add'>+Date:		October 2016</div><div class='add'>+Contact:	Device Tree mailing list &lt;devicetree@vger.kernel.org&gt;</div><div class='add'>+Description:</div><div class='add'>+		If CONFIG_OF is enabled, then this file is present. When</div><div class='add'>+		read, it returns full name of the device node.</div><div class='head'>diff --git a/Documentation/ABI/testing/configfs-rdma_cm b/Documentation/ABI/testing/configfs-rdma_cm<br/>index 5c389aaf5291..74f9506f42e7 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/configfs-rdma_cm?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/configfs-rdma_cm</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/configfs-rdma_cm?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/configfs-rdma_cm</a></div><div class='hunk'>@@ -20,3 +20,11 @@ Description: 	RDMA-CM based connections from HCA &lt;hca&gt; at port &lt;port-num&gt;</div><div class='ctx'> 		will be initiated with this RoCE type as default.</div><div class='ctx'> 		The possible RoCE types are either "IB/RoCE v1" or "RoCE v2".</div><div class='ctx'> 		This parameter has RW access.</div><div class='add'>+</div><div class='add'>+What: 		/config/rdma_cm/&lt;hca&gt;/ports/&lt;port-num&gt;/default_roce_tos</div><div class='add'>+Date: 		February 7, 2017</div><div class='add'>+KernelVersion:  4.11.0</div><div class='add'>+Description: 	RDMA-CM QPs from HCA &lt;hca&gt; at port &lt;port-num&gt;</div><div class='add'>+		will be created with this TOS as default.</div><div class='add'>+		This can be overridden by using the rdma_set_option API.</div><div class='add'>+		The possible RoCE TOS values are 0-255.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block<br/>index 71d184dbb70d..2da04ce6aeef 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-block?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-block</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-block?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-block</a></div><div class='hunk'>@@ -235,3 +235,45 @@ Description:</div><div class='ctx'> 		write_same_max_bytes is 0, write same is not supported</div><div class='ctx'> 		by the device.</div><div class='ctx'> </div><div class='add'>+What:		/sys/block/&lt;disk&gt;/queue/write_zeroes_max_bytes</div><div class='add'>+Date:		November 2016</div><div class='add'>+Contact:	Chaitanya Kulkarni &lt;chaitanya.kulkarni@wdc.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Devices that support write zeroes operation in which a</div><div class='add'>+		single request can be issued to zero out the range of</div><div class='add'>+		contiguous blocks on storage without having any payload</div><div class='add'>+		in the request. This can be used to optimize writing zeroes</div><div class='add'>+		to the devices. write_zeroes_max_bytes indicates how many</div><div class='add'>+		bytes can be written in a single write zeroes command. If</div><div class='add'>+		write_zeroes_max_bytes is 0, write zeroes is not supported</div><div class='add'>+		by the device.</div><div class='add'>+</div><div class='add'>+What:		/sys/block/&lt;disk&gt;/queue/zoned</div><div class='add'>+Date:		September 2016</div><div class='add'>+Contact:	Damien Le Moal &lt;damien.lemoal@hgst.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		zoned indicates if the device is a zoned block device</div><div class='add'>+		and the zone model of the device if it is indeed zoned.</div><div class='add'>+		The possible values indicated by zoned are "none" for</div><div class='add'>+		regular block devices and "host-aware" or "host-managed"</div><div class='add'>+		for zoned block devices. The characteristics of</div><div class='add'>+		host-aware and host-managed zoned block devices are</div><div class='add'>+		described in the ZBC (Zoned Block Commands) and ZAC</div><div class='add'>+		(Zoned Device ATA Command Set) standards. These standards</div><div class='add'>+		also define the "drive-managed" zone model. However,</div><div class='add'>+		since drive-managed zoned block devices do not support</div><div class='add'>+		zone commands, they will be treated as regular block</div><div class='add'>+		devices and zoned will report "none".</div><div class='add'>+</div><div class='add'>+What:		/sys/block/&lt;disk&gt;/queue/chunk_sectors</div><div class='add'>+Date:		September 2016</div><div class='add'>+Contact:	Hannes Reinecke &lt;hare@suse.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		chunk_sectors has different meaning depending on the type</div><div class='add'>+		of the disk. For a RAID device (dm-raid), chunk_sectors</div><div class='add'>+		indicates the size in 512B sectors of the RAID volume</div><div class='add'>+		stripe segment. For a zoned block device, either</div><div class='add'>+		host-aware or host-managed, chunk_sectors indicates the</div><div class='add'>+		size of 512B sectors of the zones of the device, with</div><div class='add'>+		the eventual exception of the last zone of the device</div><div class='add'>+		which may be smaller.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-block-zram b/Documentation/ABI/testing/sysfs-block-zram<br/>index 4518d30b8c2e..451b6d882b2c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-block-zram?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-block-zram</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-block-zram?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-block-zram</a></div><div class='hunk'>@@ -22,41 +22,6 @@ Description:</div><div class='ctx'> 		device. The reset operation frees all the memory associated</div><div class='ctx'> 		with this device.</div><div class='ctx'> </div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/num_reads</div><div class='del'>-Date:		August 2010</div><div class='del'>-Contact:	Nitin Gupta &lt;ngupta@vflare.org&gt;</div><div class='del'>-Description:</div><div class='del'>-		The num_reads file is read-only and specifies the number of</div><div class='del'>-		reads (failed or successful) done on this device.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/num_writes</div><div class='del'>-Date:		August 2010</div><div class='del'>-Contact:	Nitin Gupta &lt;ngupta@vflare.org&gt;</div><div class='del'>-Description:</div><div class='del'>-		The num_writes file is read-only and specifies the number of</div><div class='del'>-		writes (failed or successful) done on this device.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/invalid_io</div><div class='del'>-Date:		August 2010</div><div class='del'>-Contact:	Nitin Gupta &lt;ngupta@vflare.org&gt;</div><div class='del'>-Description:</div><div class='del'>-		The invalid_io file is read-only and specifies the number of</div><div class='del'>-		non-page-size-aligned I/O requests issued to this device.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/failed_reads</div><div class='del'>-Date:		February 2014</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The failed_reads file is read-only and specifies the number of</div><div class='del'>-		failed reads happened on this device.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/failed_writes</div><div class='del'>-Date:		February 2014</div><div class='del'>-Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='del'>-Description:</div><div class='del'>-		The failed_writes file is read-only and specifies the number of</div><div class='del'>-		failed writes happened on this device.</div><div class='del'>-</div><div class='ctx'> What:		/sys/block/zram&lt;id&gt;/max_comp_streams</div><div class='ctx'> Date:		February 2014</div><div class='ctx'> Contact:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='hunk'>@@ -73,74 +38,24 @@ Description:</div><div class='ctx'> 		available and selected compression algorithms, change</div><div class='ctx'> 		compression algorithm selection.</div><div class='ctx'> </div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/notify_free</div><div class='del'>-Date:		August 2010</div><div class='del'>-Contact:	Nitin Gupta &lt;ngupta@vflare.org&gt;</div><div class='del'>-Description:</div><div class='del'>-		The notify_free file is read-only. Depending on device usage</div><div class='del'>-		scenario it may account a) the number of pages freed because</div><div class='del'>-		of swap slot free notifications or b) the number of pages freed</div><div class='del'>-		because of REQ_DISCARD requests sent by bio. The former ones</div><div class='del'>-		are sent to a swap block device when a swap slot is freed, which</div><div class='del'>-		implies that this disk is being used as a swap disk. The latter</div><div class='del'>-		ones are sent by filesystem mounted with discard option,</div><div class='del'>-		whenever some data blocks are getting discarded.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/zero_pages</div><div class='del'>-Date:		August 2010</div><div class='del'>-Contact:	Nitin Gupta &lt;ngupta@vflare.org&gt;</div><div class='del'>-Description:</div><div class='del'>-		The zero_pages file is read-only and specifies number of zero</div><div class='del'>-		filled pages written to this disk. No memory is allocated for</div><div class='del'>-		such pages.</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/orig_data_size</div><div class='del'>-Date:		August 2010</div><div class='del'>-Contact:	Nitin Gupta &lt;ngupta@vflare.org&gt;</div><div class='del'>-Description:</div><div class='del'>-		The orig_data_size file is read-only and specifies uncompressed</div><div class='del'>-		size of data stored in this disk. This excludes zero-filled</div><div class='del'>-		pages (zero_pages) since no memory is allocated for them.</div><div class='del'>-		Unit: bytes</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/compr_data_size</div><div class='del'>-Date:		August 2010</div><div class='del'>-Contact:	Nitin Gupta &lt;ngupta@vflare.org&gt;</div><div class='del'>-Description:</div><div class='del'>-		The compr_data_size file is read-only and specifies compressed</div><div class='del'>-		size of data stored in this disk. So, compression ratio can be</div><div class='del'>-		calculated using orig_data_size and this statistic.</div><div class='del'>-		Unit: bytes</div><div class='del'>-</div><div class='del'>-What:		/sys/block/zram&lt;id&gt;/mem_used_total</div><div class='del'>-Date:		August 2010</div><div class='del'>-Contact:	Nitin Gupta &lt;ngupta@vflare.org&gt;</div><div class='del'>-Description:</div><div class='del'>-		The mem_used_total file is read-only and specifies the amount</div><div class='del'>-		of memory, including allocator fragmentation and metadata</div><div class='del'>-		overhead, allocated for this disk. So, allocator space</div><div class='del'>-		efficiency can be calculated using compr_data_size and this</div><div class='del'>-		statistic.</div><div class='del'>-		Unit: bytes</div><div class='del'>-</div><div class='ctx'> What:		/sys/block/zram&lt;id&gt;/mem_used_max</div><div class='ctx'> Date:		August 2014</div><div class='ctx'> Contact:	Minchan Kim &lt;minchan@kernel.org&gt;</div><div class='ctx'> Description:</div><div class='del'>-		The mem_used_max file is read/write and specifies the amount</div><div class='del'>-		of maximum memory zram have consumed to store compressed data.</div><div class='del'>-		For resetting the value, you should write "0". Otherwise,</div><div class='del'>-		you could see -EINVAL.</div><div class='add'>+		The mem_used_max file is write-only and is used to reset</div><div class='add'>+		the counter of maximum memory zram have consumed to store</div><div class='add'>+		compressed data. For resetting the value, you should write</div><div class='add'>+		"0". Otherwise, you could see -EINVAL.</div><div class='ctx'> 		Unit: bytes</div><div class='ctx'> </div><div class='ctx'> What:		/sys/block/zram&lt;id&gt;/mem_limit</div><div class='ctx'> Date:		August 2014</div><div class='ctx'> Contact:	Minchan Kim &lt;minchan@kernel.org&gt;</div><div class='ctx'> Description:</div><div class='del'>-		The mem_limit file is read/write and specifies the maximum</div><div class='del'>-		amount of memory ZRAM can use to store the compressed data.  The</div><div class='del'>-		limit could be changed in run time and "0" means disable the</div><div class='del'>-		limit.  No limit is the initial state.  Unit: bytes</div><div class='add'>+		The mem_limit file is write-only and specifies the maximum</div><div class='add'>+		amount of memory ZRAM can use to store the compressed data.</div><div class='add'>+		The limit could be changed in run time and "0" means disable</div><div class='add'>+		the limit. No limit is the initial state.  Unit: bytes</div><div class='ctx'> </div><div class='ctx'> What:		/sys/block/zram&lt;id&gt;/compact</div><div class='ctx'> Date:		August 2015</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-fsl-mc b/Documentation/ABI/testing/sysfs-bus-fsl-mc<br/>new file mode 100644<br/>index 000000000000..80256b8b4f26<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-fsl-mc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-fsl-mc</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+What:		/sys/bus/fsl-mc/drivers/.../bind</div><div class='add'>+Date:		December 2016</div><div class='add'>+Contact:	stuart.yoder@nxp.com</div><div class='add'>+Description:</div><div class='add'>+		Writing a device location to this file will cause</div><div class='add'>+		the driver to attempt to bind to the device found at</div><div class='add'>+		this location. The format for the location is Object.Id</div><div class='add'>+		and is the same as found in /sys/bus/fsl-mc/devices/.</div><div class='add'>+                For example:</div><div class='add'>+		# echo dpni.2 &gt; /sys/bus/fsl-mc/drivers/fsl_dpaa2_eth/bind</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/fsl-mc/drivers/.../unbind</div><div class='add'>+Date:		December 2016</div><div class='add'>+Contact:	stuart.yoder@nxp.com</div><div class='add'>+Description:</div><div class='add'>+		Writing a device location to this file will cause the</div><div class='add'>+		driver to attempt to unbind from the device found at</div><div class='add'>+		this location. The format for the location is Object.Id</div><div class='add'>+		and is the same as found in /sys/bus/fsl-mc/devices/.</div><div class='add'>+                For example:</div><div class='add'>+		# echo dpni.2 &gt; /sys/bus/fsl-mc/drivers/fsl_dpaa2_eth/unbind</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-i2c-devices-bq32k b/Documentation/ABI/testing/sysfs-bus-i2c-devices-bq32k<br/>new file mode 100644<br/>index 000000000000..398b258fb770<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-i2c-devices-bq32k?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-i2c-devices-bq32k</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+What:		/sys/bus/i2c/devices/.../trickle_charge_bypass</div><div class='add'>+Date:		Jan 2017</div><div class='add'>+KernelVersion:	4.11</div><div class='add'>+Contact:	Enric Balletbo i Serra &lt;eballetbo@gmail.com&gt;</div><div class='add'>+Description:    Attribute for enable/disable the trickle charge bypass</div><div class='add'>+		The trickle_charge_bypass attribute allows the userspace to</div><div class='add'>+                enable/disable the Trickle charge FET bypass.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio<br/>index fee35c00cc4e..530809ccfacf 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-bus-iio</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio</a></div><div class='hunk'>@@ -170,6 +170,16 @@ Description:</div><div class='ctx'> 		Has all of the equivalent parameters as per voltageY. Units</div><div class='ctx'> 		after application of scale and offset are m/s^2.</div><div class='ctx'> </div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_gravity_x_raw</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_gravity_y_raw</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_gravity_z_raw</div><div class='add'>+KernelVersion:	4.11</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Gravity in direction x, y or z (may be arbitrarily assigned</div><div class='add'>+		but should match other such assignments on device).</div><div class='add'>+		Units after application of scale and offset are m/s^2.</div><div class='add'>+</div><div class='ctx'> What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_x_raw</div><div class='ctx'> What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_y_raw</div><div class='ctx'> What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_z_raw</div><div class='hunk'>@@ -329,6 +339,7 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_scale</div><div class='ctx'> What:		/sys/bus/iio/devices/iio:deviceX/in_humidityrelative_scale</div><div class='ctx'> What:		/sys/bus/iio/devices/iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_scale</div><div class='ctx'> What:		/sys/bus/iio/devices/iio:deviceX/in_illuminance_scale</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_countY_scale</div><div class='ctx'> KernelVersion:	2.6.35</div><div class='ctx'> Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='hunk'>@@ -804,7 +815,7 @@ Description:</div><div class='ctx'> 		attribute. E.g. if in_voltage0_raw_thresh_rising_value is set to 1200</div><div class='ctx'> 		and in_voltage0_raw_thresh_rising_hysteresis is set to 50. The event</div><div class='ctx'> 		will get activated once in_voltage0_raw goes above 1200 and will become</div><div class='del'>-		deactived again once the value falls below 1150.</div><div class='add'>+		deactivated again once the value falls below 1150.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/.../events/in_accel_x_raw_roc_rising_value</div><div class='ctx'> What:		/sys/.../events/in_accel_x_raw_roc_falling_value</div><div class='hunk'>@@ -1244,7 +1255,8 @@ Description:</div><div class='ctx'> 		reflectivity of infrared or ultrasound emitted.</div><div class='ctx'> 		Often these sensors are unit less and as such conversion</div><div class='ctx'> 		to SI units is not possible. Higher proximity measurements</div><div class='del'>-		indicate closer objects, and vice versa.</div><div class='add'>+		indicate closer objects, and vice versa. Units after</div><div class='add'>+		application of scale and offset are meters.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/.../iio:deviceX/in_illuminance_input</div><div class='ctx'> What:		/sys/.../iio:deviceX/in_illuminance_raw</div><div class='hunk'>@@ -1579,3 +1591,20 @@ Contact:	linux-iio@vger.kernel.org</div><div class='ctx'> Description:</div><div class='ctx'> 		Raw (unscaled no offset etc.) electric conductivity reading that</div><div class='ctx'> 		can be processed to siemens per meter.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_countY_raw</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Raw counter device counts from channel Y. For quadrature</div><div class='add'>+		counters, multiplication by an available [Y]_scale results in</div><div class='add'>+		the counts of a single quadrature signal phase from channel Y.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_indexY_raw</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Raw counter device index value from channel Y. This attribute</div><div class='add'>+		provides an absolute positional reference (e.g. a pulse once per</div><div class='add'>+		revolution) which may be used to home positional systems as</div><div class='add'>+		required.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector b/Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector<br/>new file mode 100644<br/>index 000000000000..2071f9bcfaa5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_altvoltageY_invert</div><div class='add'>+Date:		October 2016</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	Peter Rosin &lt;peda@axentia.se&gt;</div><div class='add'>+Description:</div><div class='add'>+		The DAC is used to find the peak level of an alternating</div><div class='add'>+		voltage input signal by a binary search using the output</div><div class='add'>+		of a comparator wired to an interrupt pin. Like so:</div><div class='add'>+		                           _</div><div class='add'>+		                          | \</div><div class='add'>+		     input +------&gt;-------|+ \</div><div class='add'>+		                          |   \</div><div class='add'>+		            .-------.     |    }---.</div><div class='add'>+		            |       |     |   /    |</div><div class='add'>+		            |    dac|--&gt;--|- /     |</div><div class='add'>+		            |       |     |_/      |</div><div class='add'>+		            |       |              |</div><div class='add'>+		            |       |              |</div><div class='add'>+		            |    irq|------&lt;-------'</div><div class='add'>+		            |       |</div><div class='add'>+		            '-------'</div><div class='add'>+		The boolean invert attribute (0/1) should be set when the</div><div class='add'>+		input signal is centered around the maximum value of the</div><div class='add'>+		dac instead of zero. The envelope detector will search</div><div class='add'>+		from below in this case and will also invert the result.</div><div class='add'>+		The edge/level of the interrupt is also switched to its</div><div class='add'>+		opposite value.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_altvoltageY_compare_interval</div><div class='add'>+Date:		October 2016</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	Peter Rosin &lt;peda@axentia.se&gt;</div><div class='add'>+Description:</div><div class='add'>+		Number of milliseconds to wait for the comparator in each</div><div class='add'>+		step of the binary search for the input peak level. Needs</div><div class='add'>+		to relate to the frequency of the input signal.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-adc-stm32 b/Documentation/ABI/testing/sysfs-bus-iio-adc-stm32<br/>new file mode 100644<br/>index 000000000000..efe4c85e3c8b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio-adc-stm32?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-adc-stm32</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+What:		/sys/bus/iio/devices/triggerX/trigger_polarity</div><div class='add'>+KernelVersion:	4.11</div><div class='add'>+Contact:	fabrice.gasnier@st.com</div><div class='add'>+Description:</div><div class='add'>+		The STM32 ADC can be configured to use external trigger sources</div><div class='add'>+		(e.g. timers, pwm or exti gpio). Then, it can be tuned to start</div><div class='add'>+		conversions on external trigger by either:</div><div class='add'>+		- "rising-edge"</div><div class='add'>+		- "falling-edge"</div><div class='add'>+		- "both-edges".</div><div class='add'>+		Reading returns current trigger polarity.</div><div class='add'>+		Writing value before enabling conversions sets trigger polarity.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/triggerX/trigger_polarity_available</div><div class='add'>+KernelVersion:	4.11</div><div class='add'>+Contact:	fabrice.gasnier@st.com</div><div class='add'>+Description:</div><div class='add'>+		List all available trigger_polarity settings.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8 b/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8<br/>new file mode 100644<br/>index 000000000000..ba676520b953<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8</a></div><div class='hunk'>@@ -0,0 +1,125 @@</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_count_count_direction_available</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_count_count_mode_available</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_count_noise_error_available</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_count_quadrature_mode_available</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_index_index_polarity_available</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_index_synchronous_mode_available</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Discrete set of available values for the respective counter</div><div class='add'>+		configuration are listed in this file.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_countY_count_direction</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Read-only attribute that indicates whether the counter for</div><div class='add'>+		channel Y is counting up or down.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_countY_count_mode</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Count mode for channel Y. Four count modes are available:</div><div class='add'>+		normal, range limit, non-recycle, and modulo-n. The preset value</div><div class='add'>+		for channel Y is used by the count mode where required.</div><div class='add'>+</div><div class='add'>+		Normal:</div><div class='add'>+			Counting is continuous in either direction.</div><div class='add'>+</div><div class='add'>+		Range Limit:</div><div class='add'>+			An upper or lower limit is set, mimicking limit switches</div><div class='add'>+			in the mechanical counterpart. The upper limit is set to</div><div class='add'>+			the preset value, while the lower limit is set to 0. The</div><div class='add'>+			counter freezes at count = preset when counting up, and</div><div class='add'>+			at count = 0 when counting down. At either of these</div><div class='add'>+			limits, the counting is resumed only when the count</div><div class='add'>+			direction is reversed.</div><div class='add'>+</div><div class='add'>+		Non-recycle:</div><div class='add'>+			Counter is disabled whenever a 24-bit count overflow or</div><div class='add'>+			underflow takes place. The counter is re-enabled when a</div><div class='add'>+			new count value is loaded to the counter via a preset</div><div class='add'>+			operation or write to raw.</div><div class='add'>+</div><div class='add'>+		Modulo-N:</div><div class='add'>+			A count boundary is set between 0 and the preset value.</div><div class='add'>+			The counter is reset to 0 at count = preset when</div><div class='add'>+			counting up, while the counter is set to the preset</div><div class='add'>+			value at count = 0 when counting down; the counter does</div><div class='add'>+			not freeze at the bundary points, but counts</div><div class='add'>+			continuously throughout.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_countY_noise_error</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Read-only attribute that indicates whether excessive noise is</div><div class='add'>+		present at the channel Y count inputs in quadrature clock mode;</div><div class='add'>+		irrelevant in non-quadrature clock mode.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_countY_preset</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		If the counter device supports preset registers, the preset</div><div class='add'>+		count for channel Y is provided by this attribute.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_countY_quadrature_mode</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Configure channel Y counter for non-quadrature or quadrature</div><div class='add'>+		clock mode. Selecting non-quadrature clock mode will disable</div><div class='add'>+		synchronous load mode. In quadrature clock mode, the channel Y</div><div class='add'>+		scale attribute selects the encoder phase division (scale of 1</div><div class='add'>+		selects full-cycle, scale of 0.5 selects half-cycle, scale of</div><div class='add'>+		0.25 selects quarter-cycle) processed by the channel Y counter.</div><div class='add'>+</div><div class='add'>+		Non-quadrature:</div><div class='add'>+			The filter and decoder circuit are bypassed. Encoder A</div><div class='add'>+			input serves as the count input and B as the UP/DOWN</div><div class='add'>+			direction control input, with B = 1 selecting UP Count</div><div class='add'>+			mode and B = 0 selecting Down Count mode.</div><div class='add'>+</div><div class='add'>+		Quadrature:</div><div class='add'>+			Encoder A and B inputs are digitally filtered and</div><div class='add'>+			decoded for UP/DN clock.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_countY_set_to_preset_on_index</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Whether to set channel Y counter with channel Y preset value</div><div class='add'>+		when channel Y index input is active, or continuously count.</div><div class='add'>+		Valid attribute values are boolean.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_indexY_index_polarity</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Active level of channel Y index input; irrelevant in</div><div class='add'>+		non-synchronous load mode.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/in_indexY_synchronous_mode</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Configure channel Y counter for non-synchronous or synchronous</div><div class='add'>+		load mode. Synchronous load mode cannot be selected in</div><div class='add'>+		non-quadrature clock mode.</div><div class='add'>+</div><div class='add'>+		Non-synchronous:</div><div class='add'>+			A logic low level is the active level at this index</div><div class='add'>+			input. The index function (as enabled via</div><div class='add'>+			set_to_preset_on_index) is performed directly on the</div><div class='add'>+			active level of the index input.</div><div class='add'>+</div><div class='add'>+		Synchronous:</div><div class='add'>+			Intended for interfacing with encoder Index output in</div><div class='add'>+			quadrature clock mode. The active level is configured</div><div class='add'>+			via index_polarity. The index function (as enabled via</div><div class='add'>+			set_to_preset_on_index) is performed synchronously with</div><div class='add'>+			the quadrature clock on the active level of the index</div><div class='add'>+			input.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-cros-ec b/Documentation/ABI/testing/sysfs-bus-iio-cros-ec<br/>new file mode 100644<br/>index 000000000000..297b9720f024<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio-cros-ec?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-cros-ec</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/calibrate</div><div class='add'>+Date:		July 2015</div><div class='add'>+KernelVersion:	4.7</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Writing '1' will perform a FOC (Fast Online Calibration). The</div><div class='add'>+                corresponding calibration offsets can be read from *_calibbias</div><div class='add'>+                entries.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/location</div><div class='add'>+Date:		July 2015</div><div class='add'>+KernelVersion:	4.7</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		This attribute returns a string with the physical location where</div><div class='add'>+                the motion sensor is placed. For example, in a laptop a motion</div><div class='add'>+                sensor can be located on the base or on the lid. Current valid</div><div class='add'>+		values are 'base' and 'lid'.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac b/Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac<br/>new file mode 100644<br/>index 000000000000..580e93f373f6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_raw_available</div><div class='add'>+Date:		October 2016</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	Peter Rosin &lt;peda@axentia.se&gt;</div><div class='add'>+Description:</div><div class='add'>+		The range of available values represented as the minimum value,</div><div class='add'>+		the step and the maximum value, all enclosed in square brackets.</div><div class='add'>+		Example: [0 1 256]</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-distance-srf08 b/Documentation/ABI/testing/sysfs-bus-iio-distance-srf08<br/>new file mode 100644<br/>index 000000000000..0a1ca1487fa9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio-distance-srf08?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-distance-srf08</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+What		/sys/bus/iio/devices/iio:deviceX/sensor_sensitivity</div><div class='add'>+Date:		January 2017</div><div class='add'>+KernelVersion:	4.11</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Show or set the gain boost of the amp, from 0-31 range.</div><div class='add'>+		default 31</div><div class='add'>+</div><div class='add'>+What		/sys/bus/iio/devices/iio:deviceX/sensor_max_range</div><div class='add'>+Date:		January 2017</div><div class='add'>+KernelVersion:	4.11</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+                Show or set the maximum range between the sensor and the</div><div class='add'>+		first object echoed in meters. Default value is 6.020.</div><div class='add'>+		This setting limits the time the driver is waiting for a</div><div class='add'>+		echo.</div><div class='add'>+		Showing the range of available values is represented as the</div><div class='add'>+		minimum value, the step and the maximum value, all enclosed</div><div class='add'>+		in square brackets.</div><div class='add'>+		Example:</div><div class='add'>+		[0.043 0.043 11.008]</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-light-isl29018 b/Documentation/ABI/testing/sysfs-bus-iio-light-isl29018<br/>new file mode 100644<br/>index 000000000000..f0ce0a0476ea<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio-light-isl29018?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-light-isl29018</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/proximity_on_chip_ambient_infrared_suppression</div><div class='add'>+Date:		January 2011</div><div class='add'>+KernelVersion:	2.6.37</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		From ISL29018 Data Sheet (FN6619.4, Oct 8, 2012) regarding the</div><div class='add'>+		infrared suppression:</div><div class='add'>+</div><div class='add'>+		Scheme 0, makes full n (4, 8, 12, 16) bits (unsigned) proximity</div><div class='add'>+		detection. The range of Scheme 0 proximity count is from 0 to</div><div class='add'>+		2^n. Logic 1 of this bit, Scheme 1, makes n-1 (3, 7, 11, 15)</div><div class='add'>+		bits (2's complementary) proximity_less_ambient detection. The</div><div class='add'>+		range of Scheme 1 proximity count is from -2^(n-1) to 2^(n-1).</div><div class='add'>+		The sign bit is extended for resolutions less than 16. While</div><div class='add'>+		Scheme 0 has wider dynamic range, Scheme 1 proximity detection</div><div class='add'>+		is less affected by the ambient IR noise variation.</div><div class='add'>+</div><div class='add'>+		0 Sensing IR from LED and ambient</div><div class='add'>+		1 Sensing IR from LED with ambient IR rejection</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583 b/Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583<br/>new file mode 100644<br/>index 000000000000..a2e19964e87e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+What:		/sys/bus/iio/devices/device[n]/in_illuminance_calibrate</div><div class='add'>+KernelVersion:	2.6.37</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		This property causes an internal calibration of the als gain trim</div><div class='add'>+		value which is later used in calculating illuminance in lux.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/device[n]/in_illuminance_lux_table</div><div class='add'>+KernelVersion:	2.6.37</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		This property gets/sets the table of coefficients</div><div class='add'>+		used in calculating illuminance in lux.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/device[n]/in_illuminance_input_target</div><div class='add'>+KernelVersion:	2.6.37</div><div class='add'>+Contact:	linux-iio@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		This property is the known externally illuminance (in lux).</div><div class='add'>+		It is used in the process of calibrating the device accuracy.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531 b/Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531<br/>new file mode 100644<br/>index 000000000000..2a91fbe394fc<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+What:		/sys/bus/iio/devices/iio:deviceX/out_resistance_raw_available</div><div class='add'>+Date:		October 2016</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	Peter Rosin &lt;peda@axentia.se&gt;</div><div class='add'>+Description:</div><div class='add'>+		The range of available values represented as the minimum value,</div><div class='add'>+		the step and the maximum value, all enclosed in square brackets.</div><div class='add'>+		Example: [0 1 256]</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32 b/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32<br/>new file mode 100644<br/>index 000000000000..6534a60037ff<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-iio-timer-stm32</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+What:		/sys/bus/iio/devices/triggerX/master_mode_available</div><div class='add'>+KernelVersion:	4.11</div><div class='add'>+Contact:	benjamin.gaignard@st.com</div><div class='add'>+Description:</div><div class='add'>+		Reading returns the list possible master modes which are:</div><div class='add'>+		- "reset"     :	The UG bit from the TIMx_EGR register is used as trigger output (TRGO).</div><div class='add'>+		- "enable"    : The Counter Enable signal CNT_EN is used as trigger output.</div><div class='add'>+		- "update"    : The update event is selected as trigger output.</div><div class='add'>+				For instance a master timer can then be used as a prescaler for a slave timer.</div><div class='add'>+		- "compare_pulse" : The trigger output send a positive pulse when the CC1IF flag is to be set.</div><div class='add'>+		- "OC1REF"    : OC1REF signal is used as trigger output.</div><div class='add'>+		- "OC2REF"    : OC2REF signal is used as trigger output.</div><div class='add'>+		- "OC3REF"    : OC3REF signal is used as trigger output.</div><div class='add'>+		- "OC4REF"    : OC4REF signal is used as trigger output.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/triggerX/master_mode</div><div class='add'>+KernelVersion:	4.11</div><div class='add'>+Contact:	benjamin.gaignard@st.com</div><div class='add'>+Description:</div><div class='add'>+		Reading returns the current master modes.</div><div class='add'>+		Writing set the master mode</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/iio/devices/triggerX/sampling_frequency</div><div class='add'>+KernelVersion:	4.11</div><div class='add'>+Contact:	benjamin.gaignard@st.com</div><div class='add'>+Description:</div><div class='add'>+		Reading returns the current sampling frequency.</div><div class='add'>+		Writing an value different of 0 set and start sampling.</div><div class='add'>+		Writing 0 stop sampling.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci<br/>index b3bc50f650ee..5a1732b78707 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-pci?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-bus-pci</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-pci?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-pci</a></div><div class='hunk'>@@ -294,3 +294,10 @@ Description:</div><div class='ctx'> 		a firmware bug to the system vendor.  Writing to this file</div><div class='ctx'> 		taints the kernel with TAINT_FIRMWARE_WORKAROUND, which</div><div class='ctx'> 		reduces the supportability of your system.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/pci/devices/.../revision</div><div class='add'>+Date:		November 2016</div><div class='add'>+Contact:	Emil Velikov &lt;emil.l.velikov@gmail.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		This file contains the revision field of the the PCI device.</div><div class='add'>+		The value comes from device config space. The file is read only.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-vfio-mdev b/Documentation/ABI/testing/sysfs-bus-vfio-mdev<br/>new file mode 100644<br/>index 000000000000..452dbe39270e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-bus-vfio-mdev?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-bus-vfio-mdev</a></div><div class='hunk'>@@ -0,0 +1,111 @@</div><div class='add'>+What:           /sys/.../&lt;device&gt;/mdev_supported_types/</div><div class='add'>+Date:           October 2016</div><div class='add'>+Contact:        Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                This directory contains list of directories of currently</div><div class='add'>+		supported mediated device types and their details for</div><div class='add'>+		&lt;device&gt;. Supported type attributes are defined by the</div><div class='add'>+		vendor driver who registers with Mediated device framework.</div><div class='add'>+		Each supported type is a directory whose name is created</div><div class='add'>+		by adding the device driver string as a prefix to the</div><div class='add'>+		string provided by the vendor driver.</div><div class='add'>+</div><div class='add'>+What:           /sys/.../&lt;device&gt;/mdev_supported_types/&lt;type-id&gt;/</div><div class='add'>+Date:           October 2016</div><div class='add'>+Contact:        Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                This directory gives details of supported type, like name,</div><div class='add'>+		description, available_instances, device_api etc.</div><div class='add'>+		'device_api' and 'available_instances' are mandatory</div><div class='add'>+		attributes to be provided by vendor driver. 'name',</div><div class='add'>+		'description' and other vendor driver specific attributes</div><div class='add'>+		are optional.</div><div class='add'>+</div><div class='add'>+What:           /sys/.../mdev_supported_types/&lt;type-id&gt;/create</div><div class='add'>+Date:           October 2016</div><div class='add'>+Contact:        Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Writing UUID to this file will create mediated device of</div><div class='add'>+		type &lt;type-id&gt; for parent device &lt;device&gt;. This is a</div><div class='add'>+		write-only file.</div><div class='add'>+		For example:</div><div class='add'>+		# echo "83b8f4f2-509f-382f-3c1e-e6bfe0fa1001" &gt;	\</div><div class='add'>+		       /sys/devices/foo/mdev_supported_types/foo-1/create</div><div class='add'>+</div><div class='add'>+What:           /sys/.../mdev_supported_types/&lt;type-id&gt;/devices/</div><div class='add'>+Date:           October 2016</div><div class='add'>+Contact:        Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		This directory contains symbolic links pointing to mdev</div><div class='add'>+		devices sysfs entries which are created of this &lt;type-id&gt;.</div><div class='add'>+</div><div class='add'>+What:           /sys/.../mdev_supported_types/&lt;type-id&gt;/available_instances</div><div class='add'>+Date:           October 2016</div><div class='add'>+Contact:        Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Reading this attribute will show the number of mediated</div><div class='add'>+		devices of type &lt;type-id&gt; that can be created. This is a</div><div class='add'>+		readonly file.</div><div class='add'>+Users:</div><div class='add'>+		Userspace applications interested in creating mediated</div><div class='add'>+		device of that type. Userspace application should check</div><div class='add'>+		the number of available instances could be created before</div><div class='add'>+		creating mediated device of this type.</div><div class='add'>+</div><div class='add'>+What:           /sys/.../mdev_supported_types/&lt;type-id&gt;/device_api</div><div class='add'>+Date:           October 2016</div><div class='add'>+Contact:        Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Reading this attribute will show VFIO device API supported</div><div class='add'>+		by this type. For example, "vfio-pci" for a PCI device,</div><div class='add'>+		"vfio-platform" for platform device.</div><div class='add'>+</div><div class='add'>+What:           /sys/.../mdev_supported_types/&lt;type-id&gt;/name</div><div class='add'>+Date:           October 2016</div><div class='add'>+Contact:        Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Reading this attribute will show human readable name of the</div><div class='add'>+		mediated device that will get created of type &lt;type-id&gt;.</div><div class='add'>+		This is optional attribute. For example: "Grid M60-0Q"</div><div class='add'>+Users:</div><div class='add'>+		Userspace applications interested in knowing the name of</div><div class='add'>+		a particular &lt;type-id&gt; that can help in understanding the</div><div class='add'>+		type of mediated device.</div><div class='add'>+</div><div class='add'>+What:           /sys/.../mdev_supported_types/&lt;type-id&gt;/description</div><div class='add'>+Date:           October 2016</div><div class='add'>+Contact:        Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Reading this attribute will show description of the type of</div><div class='add'>+		mediated device that will get created of type &lt;type-id&gt;.</div><div class='add'>+		This is optional attribute. For example:</div><div class='add'>+		"2 heads, 512M FB, 2560x1600 maximum resolution"</div><div class='add'>+Users:</div><div class='add'>+		Userspace applications interested in knowing the details of</div><div class='add'>+		a particular &lt;type-id&gt; that can help in understanding the</div><div class='add'>+		features provided by that type of mediated device.</div><div class='add'>+</div><div class='add'>+What:           /sys/.../&lt;device&gt;/&lt;UUID&gt;/</div><div class='add'>+Date:           October 2016</div><div class='add'>+Contact:        Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		This directory represents device directory of mediated</div><div class='add'>+		device. It contains all the attributes related to mediated</div><div class='add'>+		device.</div><div class='add'>+</div><div class='add'>+What:           /sys/.../&lt;device&gt;/&lt;UUID&gt;/mdev_type</div><div class='add'>+Date:           October 2016</div><div class='add'>+Contact:        Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		This is symbolic link pointing to supported type, &lt;type-id&gt;</div><div class='add'>+		directory of which this mediated device is created.</div><div class='add'>+</div><div class='add'>+What:           /sys/.../&lt;device&gt;/&lt;UUID&gt;/remove</div><div class='add'>+Date:           October 2016</div><div class='add'>+Contact:        Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Writing '1' to this file destroys the mediated device. The</div><div class='add'>+		vendor driver can fail the remove() callback if that device</div><div class='add'>+		is active and the vendor driver doesn't support hot unplug.</div><div class='add'>+		Example:</div><div class='add'>+		# echo 1 &gt; /sys/bus/mdev/devices/&lt;UUID&gt;/remove</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-devfreq-event b/Documentation/ABI/testing/sysfs-class-devfreq-event<br/>new file mode 100644<br/>index 000000000000..ceaf0f686d4a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-class-devfreq-event?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-devfreq-event</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+What:		/sys/class/devfreq-event/event(x)/</div><div class='add'>+Date:		January 2017</div><div class='add'>+Contact:	Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Provide a place in sysfs for the devfreq-event objects.</div><div class='add'>+		This allows accessing various devfreq-event specific variables.</div><div class='add'>+		The name of devfreq-event object denoted as 'event(x)' which</div><div class='add'>+		includes the unique number of 'x' for each devfreq-event object.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/devfreq-event/event(x)/name</div><div class='add'>+Date:		January 2017</div><div class='add'>+Contact:	Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The /sys/class/devfreq-event/event(x)/name attribute contains</div><div class='add'>+		the name of the devfreq-event object. This attribute is</div><div class='add'>+		read-only.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/devfreq-event/event(x)/enable_count</div><div class='add'>+Date:		January 2017</div><div class='add'>+Contact:	Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The /sys/class/devfreq-event/event(x)/enable_count attribute</div><div class='add'>+		contains the reference count to enable the devfreq-event</div><div class='add'>+		object. If the device is enabled, the value of attribute is</div><div class='add'>+		greater than zero.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-fpga-bridge b/Documentation/ABI/testing/sysfs-class-fpga-bridge<br/>new file mode 100644<br/>index 000000000000..312ae2c579d8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-class-fpga-bridge?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-fpga-bridge</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+What:		/sys/class/fpga_bridge/&lt;bridge&gt;/name</div><div class='add'>+Date:		January 2016</div><div class='add'>+KernelVersion:	4.5</div><div class='add'>+Contact:	Alan Tull &lt;atull@opensource.altera.com&gt;</div><div class='add'>+Description:	Name of low level FPGA bridge driver.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/fpga_bridge/&lt;bridge&gt;/state</div><div class='add'>+Date:		January 2016</div><div class='add'>+KernelVersion:	4.5</div><div class='add'>+Contact:	Alan Tull &lt;atull@opensource.altera.com&gt;</div><div class='add'>+Description:	Show bridge state as "enabled" or "disabled"</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-led b/Documentation/ABI/testing/sysfs-class-led<br/>index 86ace287d48b..5f67f7ab277b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-class-led?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-class-led</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-class-led?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-led</a></div><div class='hunk'>@@ -4,16 +4,41 @@ KernelVersion:	2.6.17</div><div class='ctx'> Contact:	Richard Purdie &lt;rpurdie@rpsys.net&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Set the brightness of the LED. Most LEDs don't</div><div class='del'>-		have hardware brightness support so will just be turned on for</div><div class='add'>+		have hardware brightness support, so will just be turned on for</div><div class='ctx'> 		non-zero brightness settings. The value is between 0 and</div><div class='ctx'> 		/sys/class/leds/&lt;led&gt;/max_brightness.</div><div class='ctx'> </div><div class='add'>+		Writing 0 to this file clears active trigger.</div><div class='add'>+</div><div class='add'>+		Writing non-zero to this file while trigger is active changes the</div><div class='add'>+		top brightness trigger is going to use.</div><div class='add'>+</div><div class='ctx'> What:		/sys/class/leds/&lt;led&gt;/max_brightness</div><div class='ctx'> Date:		March 2006</div><div class='ctx'> KernelVersion:	2.6.17</div><div class='ctx'> Contact:	Richard Purdie &lt;rpurdie@rpsys.net&gt;</div><div class='ctx'> Description:</div><div class='del'>-		Maximum brightness level for this led, default is 255 (LED_FULL).</div><div class='add'>+		Maximum brightness level for this LED, default is 255 (LED_FULL).</div><div class='add'>+</div><div class='add'>+		If the LED does not support different brightness levels, this</div><div class='add'>+		should be 1.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/leds/&lt;led&gt;/brightness_hw_changed</div><div class='add'>+Date:		January 2017</div><div class='add'>+KernelVersion:	4.11</div><div class='add'>+Description:</div><div class='add'>+		Last hardware set brightness level for this LED. Some LEDs</div><div class='add'>+		may be changed autonomously by hardware/firmware. Only LEDs</div><div class='add'>+		where this happens and the driver can detect this, will have</div><div class='add'>+		this file.</div><div class='add'>+</div><div class='add'>+		This file supports poll() to detect when the hardware changes</div><div class='add'>+		the brightness.</div><div class='add'>+</div><div class='add'>+		Reading this file will return the last brightness level set</div><div class='add'>+		by the hardware, this may be different from the current</div><div class='add'>+		brightness. Reading this file when no hw brightness change</div><div class='add'>+		event has happened will return an ENODATA error.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/class/leds/&lt;led&gt;/trigger</div><div class='ctx'> Date:		March 2006</div><div class='hunk'>@@ -21,7 +46,7 @@ KernelVersion:	2.6.17</div><div class='ctx'> Contact:	Richard Purdie &lt;rpurdie@rpsys.net&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Set the trigger for this LED. A trigger is a kernel based source</div><div class='del'>-		of led events.</div><div class='add'>+		of LED events.</div><div class='ctx'> 		You can change triggers in a similar manner to the way an IO</div><div class='ctx'> 		scheduler is chosen. Trigger specific parameters can appear in</div><div class='ctx'> 		/sys/class/leds/&lt;led&gt; once a given trigger is selected. For</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-mei b/Documentation/ABI/testing/sysfs-class-mei<br/>index 80d9888a8ece..5096a82f4cde 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-class-mei?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-class-mei</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-class-mei?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-mei</a></div><div class='hunk'>@@ -29,3 +29,19 @@ Description:	Display fw status registers content</div><div class='ctx'> 		Also number of registers varies between 1 and 6</div><div class='ctx'> 		depending on generation.</div><div class='ctx'> </div><div class='add'>+What:		/sys/class/mei/meiN/hbm_ver</div><div class='add'>+Date:		Aug 2016</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	Tomas Winkler &lt;tomas.winkler@intel.com&gt;</div><div class='add'>+Description:	Display the negotiated HBM protocol version.</div><div class='add'>+</div><div class='add'>+		The HBM protocol version negotiated</div><div class='add'>+		between the driver and the device.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/mei/meiN/hbm_ver_drv</div><div class='add'>+Date:		Aug 2016</div><div class='add'>+KernelVersion:	4.9</div><div class='add'>+Contact:	Tomas Winkler &lt;tomas.winkler@intel.com&gt;</div><div class='add'>+Description:	Display the driver HBM protocol version.</div><div class='add'>+</div><div class='add'>+		The HBM protocol version supported by the driver.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-rc b/Documentation/ABI/testing/sysfs-class-rc<br/>index b65674da43bb..8be1fd3760e0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-class-rc?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-class-rc</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-class-rc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-rc</a></div><div class='hunk'>@@ -62,18 +62,18 @@ Description:</div><div class='ctx'> 		This value may be reset to 0 if the current protocol is altered.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/class/rc/rcN/wakeup_protocols</div><div class='del'>-Date:		Feb 2014</div><div class='del'>-KernelVersion:	3.15</div><div class='add'>+Date:		Feb 2017</div><div class='add'>+KernelVersion:	4.11</div><div class='ctx'> Contact:	Mauro Carvalho Chehab &lt;m.chehab@samsung.com&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		Reading this file returns a list of available protocols to use</div><div class='ctx'> 		for the wakeup filter, something like:</div><div class='del'>-		    "rc5 rc6 nec jvc [sony]"</div><div class='add'>+		    "rc-5 nec nec-x rc-6-0 rc-6-6a-24 [rc-6-6a-32] rc-6-mce"</div><div class='add'>+		Note that protocol variants are listed, so "nec", "sony",</div><div class='add'>+		"rc-5", "rc-6" have their different bit length encodings</div><div class='add'>+		listed if available.</div><div class='ctx'> 		The enabled wakeup protocol is shown in [] brackets.</div><div class='del'>-		Writing "+proto" will add a protocol to the list of enabled</div><div class='del'>-		wakeup protocols.</div><div class='del'>-		Writing "-proto" will remove a protocol from the list of enabled</div><div class='del'>-		wakeup protocols.</div><div class='add'>+		Only one protocol can be selected at a time.</div><div class='ctx'> 		Writing "proto" will use "proto" for wakeup events.</div><div class='ctx'> 		Writing "none" will disable wakeup.</div><div class='ctx'> 		Write fails with EINVAL if an invalid protocol combination or</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-remoteproc b/Documentation/ABI/testing/sysfs-class-remoteproc<br/>new file mode 100644<br/>index 000000000000..d188afebc8ba<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-class-remoteproc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-remoteproc</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+What:		/sys/class/remoteproc/.../firmware</div><div class='add'>+Date:		October 2016</div><div class='add'>+Contact:	Matt Redfearn &lt;matt.redfearn@imgtec.com&gt;</div><div class='add'>+Description:	Remote processor firmware</div><div class='add'>+</div><div class='add'>+		Reports the name of the firmware currently loaded to the</div><div class='add'>+		remote processor.</div><div class='add'>+</div><div class='add'>+		To change the running firmware, ensure the remote processor is</div><div class='add'>+		stopped (using /sys/class/remoteproc/.../state) and write a new filename.</div><div class='add'>+</div><div class='add'>+What:		/sys/class/remoteproc/.../state</div><div class='add'>+Date:		October 2016</div><div class='add'>+Contact:	Matt Redfearn &lt;matt.redfearn@imgtec.com&gt;</div><div class='add'>+Description:	Remote processor state</div><div class='add'>+</div><div class='add'>+		Reports the state of the remote processor, which will be one of:</div><div class='add'>+</div><div class='add'>+		"offline"</div><div class='add'>+		"suspended"</div><div class='add'>+		"running"</div><div class='add'>+		"crashed"</div><div class='add'>+		"invalid"</div><div class='add'>+</div><div class='add'>+		"offline" means the remote processor is powered off.</div><div class='add'>+</div><div class='add'>+		"suspended" means that the remote processor is suspended and</div><div class='add'>+		must be woken to receive messages.</div><div class='add'>+</div><div class='add'>+		"running" is the normal state of an available remote processor</div><div class='add'>+</div><div class='add'>+		"crashed" indicates that a problem/crash has been detected on</div><div class='add'>+		the remote processor.</div><div class='add'>+</div><div class='add'>+		"invalid" is returned if the remote processor is in an</div><div class='add'>+		unknown state.</div><div class='add'>+</div><div class='add'>+		Writing this file controls the state of the remote processor.</div><div class='add'>+		The following states can be written:</div><div class='add'>+</div><div class='add'>+		"start"</div><div class='add'>+		"stop"</div><div class='add'>+</div><div class='add'>+		Writing "start" will attempt to start the processor running the</div><div class='add'>+		firmware indicated by, or written to,</div><div class='add'>+		/sys/class/remoteproc/.../firmware. The remote processor should</div><div class='add'>+		transition to "running" state.</div><div class='add'>+</div><div class='add'>+		Writing "stop" will attempt to halt the remote processor and</div><div class='add'>+		return it to the "offline" state.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration b/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration<br/>index 4cf1e72222d9..ec950c93e5c6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration</a></div><div class='hunk'>@@ -1,8 +1,9 @@</div><div class='del'>-What:           Attribute for calibrating ST-Ericsson AB8500 Real Time Clock</div><div class='add'>+What:           /sys/class/rtc/rtc0/device/rtc_calibration</div><div class='ctx'> Date:           Oct 2011</div><div class='ctx'> KernelVersion:  3.0</div><div class='ctx'> Contact:        Mark Godfrey &lt;mark.godfrey@stericsson.com&gt;</div><div class='del'>-Description:    The rtc_calibration attribute allows the userspace to</div><div class='add'>+Description:    Attribute for calibrating ST-Ericsson AB8500 Real Time Clock</div><div class='add'>+		The rtc_calibration attribute allows the userspace to</div><div class='ctx'>                 calibrate the AB8500.s 32KHz Real Time Clock.</div><div class='ctx'>                 Every 60 seconds the AB8500 will correct the RTC's value</div><div class='ctx'>                 by adding to it the value of this attribute.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-devices-edac b/Documentation/ABI/testing/sysfs-devices-edac<br/>index 6568e0010e1a..46ff929fd52a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-devices-edac?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-devices-edac</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-devices-edac?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-devices-edac</a></div><div class='hunk'>@@ -138,3 +138,20 @@ Contact:	Mauro Carvalho Chehab &lt;m.chehab@samsung.com&gt;</div><div class='ctx'> Description:	This attribute file will display what type of memory is</div><div class='ctx'> 		currently on this csrow. Normally, either buffered or</div><div class='ctx'> 		unbuffered memory (for example, Unbuffered-DDR3).</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_ce_count</div><div class='add'>+Date:		October 2016</div><div class='add'>+Contact:	linux-edac@vger.kernel.org</div><div class='add'>+Description:	This attribute file displays the total count of correctable</div><div class='add'>+		errors that have occurred on this DIMM. This count is very important</div><div class='add'>+		to examine. CEs provide early indications that a DIMM is beginning</div><div class='add'>+		to fail. This count field should be monitored for non-zero values</div><div class='add'>+		and report such information to the system administrator.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_ue_count</div><div class='add'>+Date:		October 2016</div><div class='add'>+Contact:	linux-edac@vger.kernel.org</div><div class='add'>+Description:	This attribute file displays the total count of uncorrectable</div><div class='add'>+		errors that have occurred on this DIMM. If panic_on_ue is set, this</div><div class='add'>+		counter will not have a chance to increment, since EDAC will panic the</div><div class='add'>+		system</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu<br/>index 498741737055..2a4a423d08e0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-devices-system-cpu?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-devices-system-cpu</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-devices-system-cpu?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-devices-system-cpu</a></div><div class='hunk'>@@ -272,6 +272,22 @@ Description:	Parameters for the CPU cache attributes</div><div class='ctx'> 				     the modified cache line is written to main</div><div class='ctx'> 				     memory only when it is replaced</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/cpu/cpu*/cache/index*/id</div><div class='add'>+Date:		September 2016</div><div class='add'>+Contact:	Linux kernel mailing list &lt;linux-kernel@vger.kernel.org&gt;</div><div class='add'>+Description:	Cache id</div><div class='add'>+</div><div class='add'>+		The id provides a unique number for a specific instance of</div><div class='add'>+		a cache of a particular type. E.g. there may be a level</div><div class='add'>+		3 unified cache on each socket in a server and we may</div><div class='add'>+		assign them ids 0, 1, 2, ...</div><div class='add'>+</div><div class='add'>+		Note that id value can be non-contiguous. E.g. level 1</div><div class='add'>+		caches typically exist per core, but there may not be a</div><div class='add'>+		power of two cores on a socket, so these caches may be</div><div class='add'>+		numbered 0, 1, 2, 3, 4, 5, 8, 9, 10, ...</div><div class='add'>+</div><div class='ctx'> What:		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats</div><div class='ctx'> 		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/turbo_stat</div><div class='ctx'> 		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/sub_turbo_stat</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-kernel-iommu_groups b/Documentation/ABI/testing/sysfs-kernel-iommu_groups<br/>index 9b31556cfdda..35c64e00b35c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-kernel-iommu_groups?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-kernel-iommu_groups</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-kernel-iommu_groups?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-kernel-iommu_groups</a></div><div class='hunk'>@@ -12,3 +12,15 @@ Description:	/sys/kernel/iommu_groups/ contains a number of sub-</div><div class='ctx'> 		file if the IOMMU driver has chosen to register a more</div><div class='ctx'> 		common name for the group.</div><div class='ctx'> Users:</div><div class='add'>+</div><div class='add'>+What:		/sys/kernel/iommu_groups/reserved_regions</div><div class='add'>+Date: 		January 2017</div><div class='add'>+KernelVersion:  v4.11</div><div class='add'>+Contact: 	Eric Auger &lt;eric.auger@redhat.com&gt;</div><div class='add'>+Description:    /sys/kernel/iommu_groups/reserved_regions list IOVA</div><div class='add'>+		regions that are reserved. Not necessarily all</div><div class='add'>+		reserved regions are listed. This is typically used to</div><div class='add'>+		output direct-mapped, MSI, non mappable regions. Each</div><div class='add'>+		region is described on a single line: the 1st field is</div><div class='add'>+		the base IOVA, the second is the end IOVA and the third</div><div class='add'>+		field describes the type of the region.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-kernel-slab b/Documentation/ABI/testing/sysfs-kernel-slab<br/>index 91bd6ca5440f..2cc0a72b64be 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-kernel-slab?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-kernel-slab</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-kernel-slab?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-kernel-slab</a></div><div class='hunk'>@@ -347,7 +347,7 @@ Description:</div><div class='ctx'> 		because of fragmentation, SLUB will retry with the minimum order</div><div class='ctx'> 		possible depending on its characteristics.</div><div class='ctx'> 		When debug_guardpage_minorder=N (N &gt; 0) parameter is specified</div><div class='del'>-		(see Documentation/kernel-parameters.txt), the minimum possible</div><div class='add'>+		(see Documentation/admin-guide/kernel-parameters.rst), the minimum possible</div><div class='ctx'> 		order is used and this sysfs entry can not be used to change</div><div class='ctx'> 		the order at run time.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-platform-hidma b/Documentation/ABI/testing/sysfs-platform-hidma<br/>index d36441538660..fca40a54df59 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-platform-hidma?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-platform-hidma</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-platform-hidma?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-platform-hidma</a></div><div class='hunk'>@@ -2,7 +2,7 @@ What:		/sys/devices/platform/hidma-*/chid</div><div class='ctx'> 		/sys/devices/platform/QCOM8061:*/chid</div><div class='ctx'> Date:		Dec 2015</div><div class='ctx'> KernelVersion:	4.4</div><div class='del'>-Contact:	"Sinan Kaya &lt;okaya@cudeaurora.org&gt;"</div><div class='add'>+Contact:	"Sinan Kaya &lt;okaya@codeaurora.org&gt;"</div><div class='ctx'> Description:</div><div class='ctx'> 		Contains the ID of the channel within the HIDMA instance.</div><div class='ctx'> 		It is used to associate a given HIDMA channel with the</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-platform-hidma-mgmt b/Documentation/ABI/testing/sysfs-platform-hidma-mgmt<br/>index c2fb5d033f0e..3b6c5c9eabdc 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-platform-hidma-mgmt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-platform-hidma-mgmt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-platform-hidma-mgmt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-platform-hidma-mgmt</a></div><div class='hunk'>@@ -2,7 +2,7 @@ What:		/sys/devices/platform/hidma-mgmt*/chanops/chan*/priority</div><div class='ctx'> 		/sys/devices/platform/QCOM8060:*/chanops/chan*/priority</div><div class='ctx'> Date:		Nov 2015</div><div class='ctx'> KernelVersion:	4.4</div><div class='del'>-Contact:	"Sinan Kaya &lt;okaya@cudeaurora.org&gt;"</div><div class='add'>+Contact:	"Sinan Kaya &lt;okaya@codeaurora.org&gt;"</div><div class='ctx'> Description:</div><div class='ctx'> 		Contains either 0 or 1 and indicates if the DMA channel is a</div><div class='ctx'> 		low priority (0) or high priority (1) channel.</div><div class='hunk'>@@ -11,7 +11,7 @@ What:		/sys/devices/platform/hidma-mgmt*/chanops/chan*/weight</div><div class='ctx'> 		/sys/devices/platform/QCOM8060:*/chanops/chan*/weight</div><div class='ctx'> Date:		Nov 2015</div><div class='ctx'> KernelVersion:	4.4</div><div class='del'>-Contact:	"Sinan Kaya &lt;okaya@cudeaurora.org&gt;"</div><div class='add'>+Contact:	"Sinan Kaya &lt;okaya@codeaurora.org&gt;"</div><div class='ctx'> Description:</div><div class='ctx'> 		Contains 0..15 and indicates the weight of the channel among</div><div class='ctx'> 		equal priority channels during round robin scheduling.</div><div class='hunk'>@@ -20,7 +20,7 @@ What:		/sys/devices/platform/hidma-mgmt*/chreset_timeout_cycles</div><div class='ctx'> 		/sys/devices/platform/QCOM8060:*/chreset_timeout_cycles</div><div class='ctx'> Date:		Nov 2015</div><div class='ctx'> KernelVersion:	4.4</div><div class='del'>-Contact:	"Sinan Kaya &lt;okaya@cudeaurora.org&gt;"</div><div class='add'>+Contact:	"Sinan Kaya &lt;okaya@codeaurora.org&gt;"</div><div class='ctx'> Description:</div><div class='ctx'> 		Contains the platform specific cycle value to wait after a</div><div class='ctx'> 		reset command is issued. If the value is chosen too short,</div><div class='hunk'>@@ -32,7 +32,7 @@ What:		/sys/devices/platform/hidma-mgmt*/dma_channels</div><div class='ctx'> 		/sys/devices/platform/QCOM8060:*/dma_channels</div><div class='ctx'> Date:		Nov 2015</div><div class='ctx'> KernelVersion:	4.4</div><div class='del'>-Contact:	"Sinan Kaya &lt;okaya@cudeaurora.org&gt;"</div><div class='add'>+Contact:	"Sinan Kaya &lt;okaya@codeaurora.org&gt;"</div><div class='ctx'> Description:</div><div class='ctx'> 		Contains the number of dma channels supported by one instance</div><div class='ctx'> 		of HIDMA hardware. The value may change from chip to chip.</div><div class='hunk'>@@ -41,7 +41,7 @@ What:		/sys/devices/platform/hidma-mgmt*/hw_version_major</div><div class='ctx'> 		/sys/devices/platform/QCOM8060:*/hw_version_major</div><div class='ctx'> Date:		Nov 2015</div><div class='ctx'> KernelVersion:	4.4</div><div class='del'>-Contact:	"Sinan Kaya &lt;okaya@cudeaurora.org&gt;"</div><div class='add'>+Contact:	"Sinan Kaya &lt;okaya@codeaurora.org&gt;"</div><div class='ctx'> Description:</div><div class='ctx'> 		Version number major for the hardware.</div><div class='ctx'> </div><div class='hunk'>@@ -49,7 +49,7 @@ What:		/sys/devices/platform/hidma-mgmt*/hw_version_minor</div><div class='ctx'> 		/sys/devices/platform/QCOM8060:*/hw_version_minor</div><div class='ctx'> Date:		Nov 2015</div><div class='ctx'> KernelVersion:	4.4</div><div class='del'>-Contact:	"Sinan Kaya &lt;okaya@cudeaurora.org&gt;"</div><div class='add'>+Contact:	"Sinan Kaya &lt;okaya@codeaurora.org&gt;"</div><div class='ctx'> Description:</div><div class='ctx'> 		Version number minor for the hardware.</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +57,7 @@ What:		/sys/devices/platform/hidma-mgmt*/max_rd_xactions</div><div class='ctx'> 		/sys/devices/platform/QCOM8060:*/max_rd_xactions</div><div class='ctx'> Date:		Nov 2015</div><div class='ctx'> KernelVersion:	4.4</div><div class='del'>-Contact:	"Sinan Kaya &lt;okaya@cudeaurora.org&gt;"</div><div class='add'>+Contact:	"Sinan Kaya &lt;okaya@codeaurora.org&gt;"</div><div class='ctx'> Description:</div><div class='ctx'> 		Contains a value between 0 and 31. Maximum number of</div><div class='ctx'> 		read transactions that can be issued back to back.</div><div class='hunk'>@@ -69,7 +69,7 @@ What:		/sys/devices/platform/hidma-mgmt*/max_read_request</div><div class='ctx'> 		/sys/devices/platform/QCOM8060:*/max_read_request</div><div class='ctx'> Date:		Nov 2015</div><div class='ctx'> KernelVersion:	4.4</div><div class='del'>-Contact:	"Sinan Kaya &lt;okaya@cudeaurora.org&gt;"</div><div class='add'>+Contact:	"Sinan Kaya &lt;okaya@codeaurora.org&gt;"</div><div class='ctx'> Description:</div><div class='ctx'> 		Size of each read request. The value needs to be a power</div><div class='ctx'> 		of two and can be between 128 and 1024.</div><div class='hunk'>@@ -78,7 +78,7 @@ What:		/sys/devices/platform/hidma-mgmt*/max_wr_xactions</div><div class='ctx'> 		/sys/devices/platform/QCOM8060:*/max_wr_xactions</div><div class='ctx'> Date:		Nov 2015</div><div class='ctx'> KernelVersion:	4.4</div><div class='del'>-Contact:	"Sinan Kaya &lt;okaya@cudeaurora.org&gt;"</div><div class='add'>+Contact:	"Sinan Kaya &lt;okaya@codeaurora.org&gt;"</div><div class='ctx'> Description:</div><div class='ctx'> 		Contains a value between 0 and 31. Maximum number of</div><div class='ctx'> 		write transactions that can be issued back to back.</div><div class='hunk'>@@ -91,7 +91,7 @@ What:		/sys/devices/platform/hidma-mgmt*/max_write_request</div><div class='ctx'> 		/sys/devices/platform/QCOM8060:*/max_write_request</div><div class='ctx'> Date:		Nov 2015</div><div class='ctx'> KernelVersion:	4.4</div><div class='del'>-Contact:	"Sinan Kaya &lt;okaya@cudeaurora.org&gt;"</div><div class='add'>+Contact:	"Sinan Kaya &lt;okaya@codeaurora.org&gt;"</div><div class='ctx'> Description:</div><div class='ctx'> 		Size of each write request. The value needs to be a power</div><div class='ctx'> 		of two and can be between 128 and 1024.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2 b/Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2<br/>new file mode 100644<br/>index 000000000000..6212697bbf6f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+What:		/sys/devices/platform/&lt;phy-name&gt;/role</div><div class='add'>+Date:		October 2016</div><div class='add'>+KernelVersion:	4.10</div><div class='add'>+Contact:	Yoshihiro Shimoda &lt;yoshihiro.shimoda.uh@renesas.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		This file can be read and write.</div><div class='add'>+		The file can show/change the phy mode for role swap of usb.</div><div class='add'>+</div><div class='add'>+		Write the following strings to change the mode:</div><div class='add'>+		 "host" - switching mode from peripheral to host.</div><div class='add'>+		 "peripheral" - switching mode from host to peripheral.</div><div class='add'>+</div><div class='add'>+		Read the file, then it shows the following strings:</div><div class='add'>+		 "host" - The mode is host now.</div><div class='add'>+		 "peripheral" - The mode is peripheral now.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-platform-sst-atom b/Documentation/ABI/testing/sysfs-platform-sst-atom<br/>new file mode 100644<br/>index 000000000000..0d07c0395660<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-platform-sst-atom?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-platform-sst-atom</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+What:		/sys/devices/platform/8086%x:00/firmware_version</div><div class='add'>+Date:		November 2016</div><div class='add'>+KernelVersion:	4.10</div><div class='add'>+Contact:	"Sebastien Guiriec" &lt;sebastien.guiriec@intel.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		LPE Firmware version for SST driver on all atom</div><div class='add'>+		plaforms (BYT/CHT/Merrifield/BSW).</div><div class='add'>+		If the FW has never been loaded it will display:</div><div class='add'>+			"FW not yet loaded"</div><div class='add'>+		If FW has been loaded it will display:</div><div class='add'>+			"v01.aa.bb.cc"</div><div class='add'>+		aa: Major version is reflecting SoC version:</div><div class='add'>+			0d: BYT FW</div><div class='add'>+			0b: BSW FW</div><div class='add'>+			07: Merrifield FW</div><div class='add'>+		bb: Minor version</div><div class='add'>+		cc: Build version</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-power b/Documentation/ABI/testing/sysfs-power<br/>index 50b368d490b5..f523e5a3ac33 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-power?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ABI/testing/sysfs-power</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ABI/testing/sysfs-power?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ABI/testing/sysfs-power</a></div><div class='hunk'>@@ -7,30 +7,35 @@ Description:</div><div class='ctx'> 		subsystem.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/power/state</div><div class='del'>-Date:		May 2014</div><div class='add'>+Date:		November 2016</div><div class='ctx'> Contact:	Rafael J. Wysocki &lt;rjw@rjwysocki.net&gt;</div><div class='ctx'> Description:</div><div class='ctx'> 		The /sys/power/state file controls system sleep states.</div><div class='ctx'> 		Reading from this file returns the available sleep state</div><div class='del'>-		labels, which may be "mem", "standby", "freeze" and "disk"</div><div class='del'>-		(hibernation).  The meanings of the first three labels depend on</div><div class='del'>-		the relative_sleep_states command line argument as follows:</div><div class='del'>-		 1) relative_sleep_states = 1</div><div class='del'>-		    "mem", "standby", "freeze" represent non-hibernation sleep</div><div class='del'>-		    states from the deepest ("mem", always present) to the</div><div class='del'>-		    shallowest ("freeze").  "standby" and "freeze" may or may</div><div class='del'>-		    not be present depending on the capabilities of the</div><div class='del'>-		    platform.  "freeze" can only be present if "standby" is</div><div class='del'>-		    present.</div><div class='del'>-		 2) relative_sleep_states = 0 (default)</div><div class='del'>-		    "mem" - "suspend-to-RAM", present if supported.</div><div class='del'>-		    "standby" - "power-on suspend", present if supported.</div><div class='del'>-		    "freeze" - "suspend-to-idle", always present.</div><div class='del'>-</div><div class='del'>-		Writing to this file one of these strings causes the system to</div><div class='del'>-		transition into the corresponding state, if available.  See</div><div class='del'>-		Documentation/power/states.txt for a description of what</div><div class='del'>-		"suspend-to-RAM", "power-on suspend" and "suspend-to-idle" mean.</div><div class='add'>+		labels, which may be "mem" (suspend), "standby" (power-on</div><div class='add'>+		suspend), "freeze" (suspend-to-idle) and "disk" (hibernation).</div><div class='add'>+</div><div class='add'>+		Writing one of the above strings to this file causes the system</div><div class='add'>+		to transition into the corresponding state, if available.</div><div class='add'>+</div><div class='add'>+		See Documentation/power/states.txt for more information.</div><div class='add'>+</div><div class='add'>+What:		/sys/power/mem_sleep</div><div class='add'>+Date:		November 2016</div><div class='add'>+Contact:	Rafael J. Wysocki &lt;rjw@rjwysocki.net&gt;</div><div class='add'>+Description:</div><div class='add'>+		The /sys/power/mem_sleep file controls the operating mode of</div><div class='add'>+		system suspend.  Reading from it returns the available modes</div><div class='add'>+		as "s2idle" (always present), "shallow" and "deep" (present if</div><div class='add'>+		supported).  The mode that will be used on subsequent attempts</div><div class='add'>+		to suspend the system (by writing "mem" to the /sys/power/state</div><div class='add'>+		file described above) is enclosed in square brackets.</div><div class='add'>+</div><div class='add'>+		Writing one of the above strings to this file causes the mode</div><div class='add'>+		represented by it to be used on subsequent attempts to suspend</div><div class='add'>+		the system.</div><div class='add'>+</div><div class='add'>+		See Documentation/power/states.txt for more information.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/power/disk</div><div class='ctx'> Date:		September 2006</div><div class='head'>diff --git a/Documentation/BUG-HUNTING b/Documentation/BUG-HUNTING<br/>deleted file mode 100644<br/>index 65022a87bf17..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/BUG-HUNTING?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/BUG-HUNTING</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,246 +0,0 @@</div><div class='del'>-Table of contents</div><div class='del'>-=================</div><div class='del'>-</div><div class='del'>-Last updated: 20 December 2005</div><div class='del'>-</div><div class='del'>-Contents</div><div class='del'>-========</div><div class='del'>-</div><div class='del'>-- Introduction</div><div class='del'>-- Devices not appearing</div><div class='del'>-- Finding patch that caused a bug</div><div class='del'>--- Finding using git-bisect</div><div class='del'>--- Finding it the old way</div><div class='del'>-- Fixing the bug</div><div class='del'>-</div><div class='del'>-Introduction</div><div class='del'>-============</div><div class='del'>-</div><div class='del'>-Always try the latest kernel from kernel.org and build from source. If you are</div><div class='del'>-not confident in doing that please report the bug to your distribution vendor</div><div class='del'>-instead of to a kernel developer.</div><div class='del'>-</div><div class='del'>-Finding bugs is not always easy. Have a go though. If you can't find it don't</div><div class='del'>-give up. Report as much as you have found to the relevant maintainer. See</div><div class='del'>-MAINTAINERS for who that is for the subsystem you have worked on.</div><div class='del'>-</div><div class='del'>-Before you submit a bug report read REPORTING-BUGS.</div><div class='del'>-</div><div class='del'>-Devices not appearing</div><div class='del'>-=====================</div><div class='del'>-</div><div class='del'>-Often this is caused by udev. Check that first before blaming it on the</div><div class='del'>-kernel.</div><div class='del'>-</div><div class='del'>-Finding patch that caused a bug</div><div class='del'>-===============================</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Finding using git-bisect</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-Using the provided tools with git makes finding bugs easy provided the bug is</div><div class='del'>-reproducible.</div><div class='del'>-</div><div class='del'>-Steps to do it:</div><div class='del'>-- start using git for the kernel source</div><div class='del'>-- read the man page for git-bisect</div><div class='del'>-- have fun</div><div class='del'>-</div><div class='del'>-Finding it the old way</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-[Sat Mar  2 10:32:33 PST 1996 KERNEL_BUG-HOWTO lm@sgi.com (Larry McVoy)]</div><div class='del'>-</div><div class='del'>-This is how to track down a bug if you know nothing about kernel hacking.</div><div class='del'>-It's a brute force approach but it works pretty well.</div><div class='del'>-</div><div class='del'>-You need:</div><div class='del'>-</div><div class='del'>-        . A reproducible bug - it has to happen predictably (sorry)</div><div class='del'>-        . All the kernel tar files from a revision that worked to the</div><div class='del'>-          revision that doesn't</div><div class='del'>-</div><div class='del'>-You will then do:</div><div class='del'>-</div><div class='del'>-        . Rebuild a revision that you believe works, install, and verify that.</div><div class='del'>-        . Do a binary search over the kernels to figure out which one</div><div class='del'>-          introduced the bug.  I.e., suppose 1.3.28 didn't have the bug, but</div><div class='del'>-          you know that 1.3.69 does.  Pick a kernel in the middle and build</div><div class='del'>-          that, like 1.3.50.  Build &amp; test; if it works, pick the mid point</div><div class='del'>-          between .50 and .69, else the mid point between .28 and .50.</div><div class='del'>-        . You'll narrow it down to the kernel that introduced the bug.  You</div><div class='del'>-          can probably do better than this but it gets tricky.</div><div class='del'>-</div><div class='del'>-        . Narrow it down to a subdirectory</div><div class='del'>-</div><div class='del'>-          - Copy kernel that works into "test".  Let's say that 3.62 works,</div><div class='del'>-            but 3.63 doesn't.  So you diff -r those two kernels and come</div><div class='del'>-            up with a list of directories that changed.  For each of those</div><div class='del'>-            directories:</div><div class='del'>-</div><div class='del'>-                Copy the non-working directory next to the working directory</div><div class='del'>-                as "dir.63".</div><div class='del'>-                One directory at time, try moving the working directory to</div><div class='del'>-                "dir.62" and mv dir.63 dir"time, try</div><div class='del'>-</div><div class='del'>-                        mv dir dir.62</div><div class='del'>-                        mv dir.63 dir</div><div class='del'>-                        find dir -name '*.[oa]' -print | xargs rm -f</div><div class='del'>-</div><div class='del'>-                And then rebuild and retest.  Assuming that all related</div><div class='del'>-                changes were contained in the sub directory, this should</div><div class='del'>-                isolate the change to a directory.</div><div class='del'>-</div><div class='del'>-                Problems: changes in header files may have occurred; I've</div><div class='del'>-                found in my case that they were self explanatory - you may</div><div class='del'>-                or may not want to give up when that happens.</div><div class='del'>-</div><div class='del'>-        . Narrow it down to a file</div><div class='del'>-</div><div class='del'>-          - You can apply the same technique to each file in the directory,</div><div class='del'>-            hoping that the changes in that file are self contained.</div><div class='del'>-</div><div class='del'>-        . Narrow it down to a routine</div><div class='del'>-</div><div class='del'>-          - You can take the old file and the new file and manually create</div><div class='del'>-            a merged file that has</div><div class='del'>-</div><div class='del'>-                #ifdef VER62</div><div class='del'>-                routine()</div><div class='del'>-                {</div><div class='del'>-                        ...</div><div class='del'>-                }</div><div class='del'>-                #else</div><div class='del'>-                routine()</div><div class='del'>-                {</div><div class='del'>-                        ...</div><div class='del'>-                }</div><div class='del'>-                #endif</div><div class='del'>-</div><div class='del'>-            And then walk through that file, one routine at a time and</div><div class='del'>-            prefix it with</div><div class='del'>-</div><div class='del'>-                #define VER62</div><div class='del'>-                /* both routines here */</div><div class='del'>-                #undef VER62</div><div class='del'>-</div><div class='del'>-            Then recompile, retest, move the ifdefs until you find the one</div><div class='del'>-            that makes the difference.</div><div class='del'>-</div><div class='del'>-Finally, you take all the info that you have, kernel revisions, bug</div><div class='del'>-description, the extent to which you have narrowed it down, and pass</div><div class='del'>-that off to whomever you believe is the maintainer of that section.</div><div class='del'>-A post to linux.dev.kernel isn't such a bad idea if you've done some</div><div class='del'>-work to narrow it down.</div><div class='del'>-</div><div class='del'>-If you get it down to a routine, you'll probably get a fix in 24 hours.</div><div class='del'>-</div><div class='del'>-My apologies to Linus and the other kernel hackers for describing this</div><div class='del'>-brute force approach, it's hardly what a kernel hacker would do.  However,</div><div class='del'>-it does work and it lets non-hackers help fix bugs.  And it is cool</div><div class='del'>-because Linux snapshots will let you do this - something that you can't</div><div class='del'>-do with vendor supplied releases.</div><div class='del'>-</div><div class='del'>-Fixing the bug</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-Nobody is going to tell you how to fix bugs. Seriously. You need to work it</div><div class='del'>-out. But below are some hints on how to use the tools.</div><div class='del'>-</div><div class='del'>-To debug a kernel, use objdump and look for the hex offset from the crash</div><div class='del'>-output to find the valid line of code/assembler. Without debug symbols, you</div><div class='del'>-will see the assembler code for the routine shown, but if your kernel has</div><div class='del'>-debug symbols the C code will also be available. (Debug symbols can be enabled</div><div class='del'>-in the kernel hacking menu of the menu configuration.) For example:</div><div class='del'>-</div><div class='del'>-    objdump -r -S -l --disassemble net/dccp/ipv4.o</div><div class='del'>-</div><div class='del'>-NB.: you need to be at the top level of the kernel tree for this to pick up</div><div class='del'>-your C files.</div><div class='del'>-</div><div class='del'>-If you don't have access to the code you can also debug on some crash dumps</div><div class='del'>-e.g. crash dump output as shown by Dave Miller.</div><div class='del'>-</div><div class='del'>-&gt;    EIP is at ip_queue_xmit+0x14/0x4c0</div><div class='del'>-&gt;     ...</div><div class='del'>-&gt;    Code: 44 24 04 e8 6f 05 00 00 e9 e8 fe ff ff 8d 76 00 8d bc 27 00 00</div><div class='del'>-&gt;    00 00 55 57  56 53 81 ec bc 00 00 00 8b ac 24 d0 00 00 00 8b 5d 08</div><div class='del'>-&gt;    &lt;8b&gt; 83 3c 01 00 00 89 44  24 14 8b 45 28 85 c0 89 44 24 18 0f 85</div><div class='del'>-&gt;</div><div class='del'>-&gt;    Put the bytes into a "foo.s" file like this:</div><div class='del'>-&gt;</div><div class='del'>-&gt;           .text</div><div class='del'>-&gt;           .globl foo</div><div class='del'>-&gt;    foo:</div><div class='del'>-&gt;           .byte  .... /* bytes from Code: part of OOPS dump */</div><div class='del'>-&gt;</div><div class='del'>-&gt;    Compile it with "gcc -c -o foo.o foo.s" then look at the output of</div><div class='del'>-&gt;    "objdump --disassemble foo.o".</div><div class='del'>-&gt;</div><div class='del'>-&gt;    Output:</div><div class='del'>-&gt;</div><div class='del'>-&gt;    ip_queue_xmit:</div><div class='del'>-&gt;        push       %ebp</div><div class='del'>-&gt;        push       %edi</div><div class='del'>-&gt;        push       %esi</div><div class='del'>-&gt;        push       %ebx</div><div class='del'>-&gt;        sub        $0xbc, %esp</div><div class='del'>-&gt;        mov        0xd0(%esp), %ebp        ! %ebp = arg0 (skb)</div><div class='del'>-&gt;        mov        0x8(%ebp), %ebx         ! %ebx = skb-&gt;sk</div><div class='del'>-&gt;        mov        0x13c(%ebx), %eax       ! %eax = inet_sk(sk)-&gt;opt</div><div class='del'>-</div><div class='del'>-In addition, you can use GDB to figure out the exact file and line</div><div class='del'>-number of the OOPS from the vmlinux file. If you have</div><div class='del'>-CONFIG_DEBUG_INFO enabled, you can simply copy the EIP value from the</div><div class='del'>-OOPS:</div><div class='del'>-</div><div class='del'>- EIP:    0060:[&lt;c021e50e&gt;]    Not tainted VLI</div><div class='del'>-</div><div class='del'>-And use GDB to translate that to human-readable form:</div><div class='del'>-</div><div class='del'>-  gdb vmlinux</div><div class='del'>-  (gdb) l *0xc021e50e</div><div class='del'>-</div><div class='del'>-If you don't have CONFIG_DEBUG_INFO enabled, you use the function</div><div class='del'>-offset from the OOPS:</div><div class='del'>-</div><div class='del'>- EIP is at vt_ioctl+0xda8/0x1482</div><div class='del'>-</div><div class='del'>-And recompile the kernel with CONFIG_DEBUG_INFO enabled:</div><div class='del'>-</div><div class='del'>-  make vmlinux</div><div class='del'>-  gdb vmlinux</div><div class='del'>-  (gdb) p vt_ioctl</div><div class='del'>-  (gdb) l *(0x&lt;address of vt_ioctl&gt; + 0xda8)</div><div class='del'>-or, as one command</div><div class='del'>-  (gdb) l *(vt_ioctl + 0xda8)</div><div class='del'>-</div><div class='del'>-If you have a call trace, such as :-</div><div class='del'>-&gt;Call Trace:</div><div class='del'>-&gt; [&lt;ffffffff8802c8e9&gt;] :jbd:log_wait_commit+0xa3/0xf5</div><div class='del'>-&gt; [&lt;ffffffff810482d9&gt;] autoremove_wake_function+0x0/0x2e</div><div class='del'>-&gt; [&lt;ffffffff8802770b&gt;] :jbd:journal_stop+0x1be/0x1ee</div><div class='del'>-&gt; ...</div><div class='del'>-this shows the problem in the :jbd: module. You can load that module in gdb</div><div class='del'>-and list the relevant code.</div><div class='del'>-  gdb fs/jbd/jbd.ko</div><div class='del'>-  (gdb) p log_wait_commit</div><div class='del'>-  (gdb) l *(0x&lt;address&gt; + 0xa3)</div><div class='del'>-or</div><div class='del'>-  (gdb) l *(log_wait_commit + 0xa3)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Another very useful option of the Kernel Hacking section in menuconfig is</div><div class='del'>-Debug memory allocations. This will help you see whether data has been</div><div class='del'>-initialised and not set before use etc. To see the values that get assigned</div><div class='del'>-with this look at mm/slab.c and search for POISON_INUSE. When using this an</div><div class='del'>-Oops will often show the poisoned data instead of zero which is the default.</div><div class='del'>-</div><div class='del'>-Once you have worked out a fix please submit it upstream. After all open</div><div class='del'>-source is about sharing what you do and don't you want to be recognised for</div><div class='del'>-your genius?</div><div class='del'>-</div><div class='del'>-Please do read Documentation/SubmittingPatches though to help your code get</div><div class='del'>-accepted.</div><div class='head'>diff --git a/Documentation/Changes b/Documentation/Changes<br/>index 22797a15dc24..7564ae1682ba 100644..120000<br/>--- a/<a href='/drm-misc/tree/Documentation/Changes?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/Changes</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/Changes?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/Changes</a></div><div class='hunk'>@@ -1,485 +1 @@</div><div class='del'>-.. _changes:</div><div class='del'>-</div><div class='del'>-Minimal requerements to compile the Kernel</div><div class='del'>-++++++++++++++++++++++++++++++++++++++++++</div><div class='del'>-</div><div class='del'>-Intro</div><div class='del'>-=====</div><div class='del'>-</div><div class='del'>-This document is designed to provide a list of the minimum levels of</div><div class='del'>-software necessary to run the 4.x kernels.</div><div class='del'>-</div><div class='del'>-This document is originally based on my "Changes" file for 2.0.x kernels</div><div class='del'>-and therefore owes credit to the same people as that file (Jared Mauch,</div><div class='del'>-Axel Boldt, Alessandro Sigala, and countless other users all over the</div><div class='del'>-'net).</div><div class='del'>-</div><div class='del'>-Current Minimal Requirements</div><div class='del'>-****************************</div><div class='del'>-</div><div class='del'>-Upgrade to at **least** these software revisions before thinking you've</div><div class='del'>-encountered a bug!  If you're unsure what version you're currently</div><div class='del'>-running, the suggested command should tell you.</div><div class='del'>-</div><div class='del'>-Again, keep in mind that this list assumes you are already functionally</div><div class='del'>-running a Linux kernel.  Also, not all tools are necessary on all</div><div class='del'>-systems; obviously, if you don't have any ISDN hardware, for example,</div><div class='del'>-you probably needn't concern yourself with isdn4k-utils.</div><div class='del'>-</div><div class='del'>-====================== ===============  ========================================</div><div class='del'>-        Program        Minimal version       Command to check the version</div><div class='del'>-====================== ===============  ========================================</div><div class='del'>-GNU C                  3.2              gcc --version</div><div class='del'>-GNU make               3.80             make --version</div><div class='del'>-binutils               2.12             ld -v</div><div class='del'>-util-linux             2.10o            fdformat --version</div><div class='del'>-module-init-tools      0.9.10           depmod -V</div><div class='del'>-e2fsprogs              1.41.4           e2fsck -V</div><div class='del'>-jfsutils               1.1.3            fsck.jfs -V</div><div class='del'>-reiserfsprogs          3.6.3            reiserfsck -V</div><div class='del'>-xfsprogs               2.6.0            xfs_db -V</div><div class='del'>-squashfs-tools         4.0              mksquashfs -version</div><div class='del'>-btrfs-progs            0.18             btrfsck</div><div class='del'>-pcmciautils            004              pccardctl -V</div><div class='del'>-quota-tools            3.09             quota -V</div><div class='del'>-PPP                    2.4.0            pppd --version</div><div class='del'>-isdn4k-utils           3.1pre1          isdnctrl 2&gt;&amp;1|grep version</div><div class='del'>-nfs-utils              1.0.5            showmount --version</div><div class='del'>-procps                 3.2.0            ps --version</div><div class='del'>-oprofile               0.9              oprofiled --version</div><div class='del'>-udev                   081              udevd --version</div><div class='del'>-grub                   0.93             grub --version || grub-install --version</div><div class='del'>-mcelog                 0.6              mcelog --version</div><div class='del'>-iptables               1.4.2            iptables -V</div><div class='del'>-openssl &amp; libcrypto    1.0.0            openssl version</div><div class='del'>-bc                     1.06.95          bc --version</div><div class='del'>-Sphinx\ [#f1]_	       1.2		sphinx-build --version</div><div class='del'>-====================== ===============  ========================================</div><div class='del'>-</div><div class='del'>-.. [#f1] Sphinx is needed only to build the Kernel documentation</div><div class='del'>-</div><div class='del'>-Kernel compilation</div><div class='del'>-******************</div><div class='del'>-</div><div class='del'>-GCC</div><div class='del'>----</div><div class='del'>-</div><div class='del'>-The gcc version requirements may vary depending on the type of CPU in your</div><div class='del'>-computer.</div><div class='del'>-</div><div class='del'>-Make</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-You will need GNU make 3.80 or later to build the kernel.</div><div class='del'>-</div><div class='del'>-Binutils</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-Linux on IA-32 has recently switched from using ``as86`` to using ``gas`` for</div><div class='del'>-assembling the 16-bit boot code, removing the need for ``as86`` to compile</div><div class='del'>-your kernel.  This change does, however, mean that you need a recent</div><div class='del'>-release of binutils.</div><div class='del'>-</div><div class='del'>-Perl</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-You will need perl 5 and the following modules: ``Getopt::Long``,</div><div class='del'>-``Getopt::Std``, ``File::Basename``, and ``File::Find`` to build the kernel.</div><div class='del'>-</div><div class='del'>-BC</div><div class='del'>---</div><div class='del'>-</div><div class='del'>-You will need bc to build kernels 3.10 and higher</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-OpenSSL</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-Module signing and external certificate handling use the OpenSSL program and</div><div class='del'>-crypto library to do key creation and signature generation.</div><div class='del'>-</div><div class='del'>-You will need openssl to build kernels 3.7 and higher if module signing is</div><div class='del'>-enabled.  You will also need openssl development packages to build kernels 4.3</div><div class='del'>-and higher.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-System utilities</div><div class='del'>-****************</div><div class='del'>-</div><div class='del'>-Architectural changes</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-DevFS has been obsoleted in favour of udev</div><div class='del'>-(http://www.kernel.org/pub/linux/utils/kernel/hotplug/)</div><div class='del'>-</div><div class='del'>-32-bit UID support is now in place.  Have fun!</div><div class='del'>-</div><div class='del'>-Linux documentation for functions is transitioning to inline</div><div class='del'>-documentation via specially-formatted comments near their</div><div class='del'>-definitions in the source.  These comments can be combined with the</div><div class='del'>-SGML templates in the Documentation/DocBook directory to make DocBook</div><div class='del'>-files, which can then be converted by DocBook stylesheets to PostScript,</div><div class='del'>-HTML, PDF files, and several other formats.  In order to convert from</div><div class='del'>-DocBook format to a format of your choice, you'll need to install Jade as</div><div class='del'>-well as the desired DocBook stylesheets.</div><div class='del'>-</div><div class='del'>-Util-linux</div><div class='del'>-----------</div><div class='del'>-</div><div class='del'>-New versions of util-linux provide ``fdisk`` support for larger disks,</div><div class='del'>-support new options to mount, recognize more supported partition</div><div class='del'>-types, have a fdformat which works with 2.4 kernels, and similar goodies.</div><div class='del'>-You'll probably want to upgrade.</div><div class='del'>-</div><div class='del'>-Ksymoops</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-If the unthinkable happens and your kernel oopses, you may need the</div><div class='del'>-ksymoops tool to decode it, but in most cases you don't.</div><div class='del'>-It is generally preferred to build the kernel with ``CONFIG_KALLSYMS`` so</div><div class='del'>-that it produces readable dumps that can be used as-is (this also</div><div class='del'>-produces better output than ksymoops).  If for some reason your kernel</div><div class='del'>-is not build with ``CONFIG_KALLSYMS`` and you have no way to rebuild and</div><div class='del'>-reproduce the Oops with that option, then you can still decode that Oops</div><div class='del'>-with ksymoops.</div><div class='del'>-</div><div class='del'>-Module-Init-Tools</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-A new module loader is now in the kernel that requires ``module-init-tools``</div><div class='del'>-to use.  It is backward compatible with the 2.4.x series kernels.</div><div class='del'>-</div><div class='del'>-Mkinitrd</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-These changes to the ``/lib/modules`` file tree layout also require that</div><div class='del'>-mkinitrd be upgraded.</div><div class='del'>-</div><div class='del'>-E2fsprogs</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-The latest version of ``e2fsprogs`` fixes several bugs in fsck and</div><div class='del'>-debugfs.  Obviously, it's a good idea to upgrade.</div><div class='del'>-</div><div class='del'>-JFSutils</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-The ``jfsutils`` package contains the utilities for the file system.</div><div class='del'>-The following utilities are available:</div><div class='del'>-</div><div class='del'>-- ``fsck.jfs`` - initiate replay of the transaction log, and check</div><div class='del'>-  and repair a JFS formatted partition.</div><div class='del'>-</div><div class='del'>-- ``mkfs.jfs`` - create a JFS formatted partition.</div><div class='del'>-</div><div class='del'>-- other file system utilities are also available in this package.</div><div class='del'>-</div><div class='del'>-Reiserfsprogs</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-The reiserfsprogs package should be used for reiserfs-3.6.x</div><div class='del'>-(Linux kernels 2.4.x). It is a combined package and contains working</div><div class='del'>-versions of ``mkreiserfs``, ``resize_reiserfs``, ``debugreiserfs`` and</div><div class='del'>-``reiserfsck``. These utils work on both i386 and alpha platforms.</div><div class='del'>-</div><div class='del'>-Xfsprogs</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-The latest version of ``xfsprogs`` contains ``mkfs.xfs``, ``xfs_db``, and the</div><div class='del'>-``xfs_repair`` utilities, among others, for the XFS filesystem.  It is</div><div class='del'>-architecture independent and any version from 2.0.0 onward should</div><div class='del'>-work correctly with this version of the XFS kernel code (2.6.0 or</div><div class='del'>-later is recommended, due to some significant improvements).</div><div class='del'>-</div><div class='del'>-PCMCIAutils</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-PCMCIAutils replaces ``pcmcia-cs``. It properly sets up</div><div class='del'>-PCMCIA sockets at system startup and loads the appropriate modules</div><div class='del'>-for 16-bit PCMCIA devices if the kernel is modularized and the hotplug</div><div class='del'>-subsystem is used.</div><div class='del'>-</div><div class='del'>-Quota-tools</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-Support for 32 bit uid's and gid's is required if you want to use</div><div class='del'>-the newer version 2 quota format.  Quota-tools version 3.07 and</div><div class='del'>-newer has this support.  Use the recommended version or newer</div><div class='del'>-from the table above.</div><div class='del'>-</div><div class='del'>-Intel IA32 microcode</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-A driver has been added to allow updating of Intel IA32 microcode,</div><div class='del'>-accessible as a normal (misc) character device.  If you are not using</div><div class='del'>-udev you may need to::</div><div class='del'>-</div><div class='del'>-  mkdir /dev/cpu</div><div class='del'>-  mknod /dev/cpu/microcode c 10 184</div><div class='del'>-  chmod 0644 /dev/cpu/microcode</div><div class='del'>-</div><div class='del'>-as root before you can use this.  You'll probably also want to</div><div class='del'>-get the user-space microcode_ctl utility to use with this.</div><div class='del'>-</div><div class='del'>-udev</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-``udev`` is a userspace application for populating ``/dev`` dynamically with</div><div class='del'>-only entries for devices actually present. ``udev`` replaces the basic</div><div class='del'>-functionality of devfs, while allowing persistent device naming for</div><div class='del'>-devices.</div><div class='del'>-</div><div class='del'>-FUSE</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-Needs libfuse 2.4.0 or later.  Absolute minimum is 2.3.0 but mount</div><div class='del'>-options ``direct_io`` and ``kernel_cache`` won't work.</div><div class='del'>-</div><div class='del'>-Networking</div><div class='del'>-**********</div><div class='del'>-</div><div class='del'>-General changes</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-If you have advanced network configuration needs, you should probably</div><div class='del'>-consider using the network tools from ip-route2.</div><div class='del'>-</div><div class='del'>-Packet Filter / NAT</div><div class='del'>--------------------</div><div class='del'>-The packet filtering and NAT code uses the same tools like the previous 2.4.x</div><div class='del'>-kernel series (iptables).  It still includes backwards-compatibility modules</div><div class='del'>-for 2.2.x-style ipchains and 2.0.x-style ipfwadm.</div><div class='del'>-</div><div class='del'>-PPP</div><div class='del'>----</div><div class='del'>-</div><div class='del'>-The PPP driver has been restructured to support multilink and to</div><div class='del'>-enable it to operate over diverse media layers.  If you use PPP,</div><div class='del'>-upgrade pppd to at least 2.4.0.</div><div class='del'>-</div><div class='del'>-If you are not using udev, you must have the device file /dev/ppp</div><div class='del'>-which can be made by::</div><div class='del'>-</div><div class='del'>-  mknod /dev/ppp c 108 0</div><div class='del'>-</div><div class='del'>-as root.</div><div class='del'>-</div><div class='del'>-Isdn4k-utils</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-Due to changes in the length of the phone number field, isdn4k-utils</div><div class='del'>-needs to be recompiled or (preferably) upgraded.</div><div class='del'>-</div><div class='del'>-NFS-utils</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-In ancient (2.4 and earlier) kernels, the nfs server needed to know</div><div class='del'>-about any client that expected to be able to access files via NFS.  This</div><div class='del'>-information would be given to the kernel by ``mountd`` when the client</div><div class='del'>-mounted the filesystem, or by ``exportfs`` at system startup.  exportfs</div><div class='del'>-would take information about active clients from ``/var/lib/nfs/rmtab``.</div><div class='del'>-</div><div class='del'>-This approach is quite fragile as it depends on rmtab being correct</div><div class='del'>-which is not always easy, particularly when trying to implement</div><div class='del'>-fail-over.  Even when the system is working well, ``rmtab`` suffers from</div><div class='del'>-getting lots of old entries that never get removed.</div><div class='del'>-</div><div class='del'>-With modern kernels we have the option of having the kernel tell mountd</div><div class='del'>-when it gets a request from an unknown host, and mountd can give</div><div class='del'>-appropriate export information to the kernel.  This removes the</div><div class='del'>-dependency on ``rmtab`` and means that the kernel only needs to know about</div><div class='del'>-currently active clients.</div><div class='del'>-</div><div class='del'>-To enable this new functionality, you need to::</div><div class='del'>-</div><div class='del'>-  mount -t nfsd nfsd /proc/fs/nfsd</div><div class='del'>-</div><div class='del'>-before running exportfs or mountd.  It is recommended that all NFS</div><div class='del'>-services be protected from the internet-at-large by a firewall where</div><div class='del'>-that is possible.</div><div class='del'>-</div><div class='del'>-mcelog</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-On x86 kernels the mcelog utility is needed to process and log machine check</div><div class='del'>-events when ``CONFIG_X86_MCE`` is enabled. Machine check events are errors</div><div class='del'>-reported by the CPU. Processing them is strongly encouraged.</div><div class='del'>-</div><div class='del'>-Kernel documentation</div><div class='del'>-********************</div><div class='del'>-</div><div class='del'>-Sphinx</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-The ReST markups currently used by the Documentation/ files are meant to be</div><div class='del'>-built with ``Sphinx`` version 1.2 or upper. If you're desiring to build</div><div class='del'>-PDF outputs, it is recommended to use version 1.4.6.</div><div class='del'>-</div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-  Please notice that, for PDF and LaTeX output, you'll also need ``XeLaTeX``</div><div class='del'>-  version 3.14159265. Depending on the distribution, you may also need</div><div class='del'>-  to install a series of ``texlive`` packages that provide the minimal</div><div class='del'>-  set of functionalities required for ``XeLaTex`` to work.</div><div class='del'>-</div><div class='del'>-Other tools</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-In order to produce documentation from DocBook, you'll also need ``xmlto``.</div><div class='del'>-Please notice, however, that we're currently migrating all documents to use</div><div class='del'>-``Sphinx``.</div><div class='del'>-</div><div class='del'>-Getting updated software</div><div class='del'>-========================</div><div class='del'>-</div><div class='del'>-Kernel compilation</div><div class='del'>-******************</div><div class='del'>-</div><div class='del'>-gcc</div><div class='del'>----</div><div class='del'>-</div><div class='del'>-- &lt;ftp://ftp.gnu.org/gnu/gcc/&gt;</div><div class='del'>-</div><div class='del'>-Make</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-- &lt;ftp://ftp.gnu.org/gnu/make/&gt;</div><div class='del'>-</div><div class='del'>-Binutils</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-- &lt;ftp://ftp.kernel.org/pub/linux/devel/binutils/&gt;</div><div class='del'>-</div><div class='del'>-OpenSSL</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-- &lt;https://www.openssl.org/&gt;</div><div class='del'>-</div><div class='del'>-System utilities</div><div class='del'>-****************</div><div class='del'>-</div><div class='del'>-Util-linux</div><div class='del'>-----------</div><div class='del'>-</div><div class='del'>-- &lt;ftp://ftp.kernel.org/pub/linux/utils/util-linux/&gt;</div><div class='del'>-</div><div class='del'>-Ksymoops</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-- &lt;ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/&gt;</div><div class='del'>-</div><div class='del'>-Module-Init-Tools</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-- &lt;ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/&gt;</div><div class='del'>-</div><div class='del'>-Mkinitrd</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-- &lt;https://code.launchpad.net/initrd-tools/main&gt;</div><div class='del'>-</div><div class='del'>-E2fsprogs</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-- &lt;http://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.29.tar.gz&gt;</div><div class='del'>-</div><div class='del'>-JFSutils</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-- &lt;http://jfs.sourceforge.net/&gt;</div><div class='del'>-</div><div class='del'>-Reiserfsprogs</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-- &lt;http://www.kernel.org/pub/linux/utils/fs/reiserfs/&gt;</div><div class='del'>-</div><div class='del'>-Xfsprogs</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-- &lt;ftp://oss.sgi.com/projects/xfs/&gt;</div><div class='del'>-</div><div class='del'>-Pcmciautils</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-- &lt;ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/&gt;</div><div class='del'>-</div><div class='del'>-Quota-tools</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-- &lt;http://sourceforge.net/projects/linuxquota/&gt;</div><div class='del'>-</div><div class='del'>-DocBook Stylesheets</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-- &lt;http://sourceforge.net/projects/docbook/files/docbook-dsssl/&gt;</div><div class='del'>-</div><div class='del'>-XMLTO XSLT Frontend</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-- &lt;http://cyberelk.net/tim/xmlto/&gt;</div><div class='del'>-</div><div class='del'>-Intel P6 microcode</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-- &lt;https://downloadcenter.intel.com/&gt;</div><div class='del'>-</div><div class='del'>-udev</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-- &lt;http://www.freedesktop.org/software/systemd/man/udev.html&gt;</div><div class='del'>-</div><div class='del'>-FUSE</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-- &lt;http://sourceforge.net/projects/fuse&gt;</div><div class='del'>-</div><div class='del'>-mcelog</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-- &lt;http://www.mcelog.org/&gt;</div><div class='del'>-</div><div class='del'>-Networking</div><div class='del'>-**********</div><div class='del'>-</div><div class='del'>-PPP</div><div class='del'>----</div><div class='del'>-</div><div class='del'>-- &lt;ftp://ftp.samba.org/pub/ppp/&gt;</div><div class='del'>-</div><div class='del'>-Isdn4k-utils</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-- &lt;ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/&gt;</div><div class='del'>-</div><div class='del'>-NFS-utils</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-- &lt;http://sourceforge.net/project/showfiles.php?group_id=14&gt;</div><div class='del'>-</div><div class='del'>-Iptables</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-- &lt;http://www.iptables.org/downloads.html&gt;</div><div class='del'>-</div><div class='del'>-Ip-route2</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-- &lt;https://www.kernel.org/pub/linux/utils/net/iproute2/&gt;</div><div class='del'>-</div><div class='del'>-OProfile</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-- &lt;http://oprofile.sf.net/download/&gt;</div><div class='del'>-</div><div class='del'>-NFS-Utils</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-- &lt;http://nfs.sourceforge.net/&gt;</div><div class='del'>-</div><div class='del'>-Kernel documentation</div><div class='del'>-********************</div><div class='del'>-</div><div class='del'>-Sphinx</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-- &lt;http://www.sphinx-doc.org/&gt;</div><div class='add'>+process/changes.rst
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/CodeOfConflict b/Documentation/CodeOfConflict<br/>deleted file mode 100644<br/>index 49a8ecc157a2..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/CodeOfConflict?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/CodeOfConflict</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-Code of Conflict</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-The Linux kernel development effort is a very personal process compared</div><div class='del'>-to "traditional" ways of developing software.  Your code and ideas</div><div class='del'>-behind it will be carefully reviewed, often resulting in critique and</div><div class='del'>-criticism.  The review will almost always require improvements to the</div><div class='del'>-code before it can be included in the kernel.  Know that this happens</div><div class='del'>-because everyone involved wants to see the best possible solution for</div><div class='del'>-the overall success of Linux.  This development process has been proven</div><div class='del'>-to create the most robust operating system kernel ever, and we do not</div><div class='del'>-want to do anything to cause the quality of submission and eventual</div><div class='del'>-result to ever decrease.</div><div class='del'>-</div><div class='del'>-If however, anyone feels personally abused, threatened, or otherwise</div><div class='del'>-uncomfortable due to this process, that is not acceptable.  If so,</div><div class='del'>-please contact the Linux Foundation's Technical Advisory Board at</div><div class='del'>-&lt;tab@lists.linux-foundation.org&gt;, or the individual members, and they</div><div class='del'>-will work to resolve the issue to the best of their ability.  For more</div><div class='del'>-information on who is on the Technical Advisory Board and what their</div><div class='del'>-role is, please see:</div><div class='del'>-	http://www.linuxfoundation.org/projects/linux/tab</div><div class='del'>-</div><div class='del'>-As a reviewer of code, please strive to keep things civil and focused on</div><div class='del'>-the technical issues involved.  We are all humans, and frustrations can</div><div class='del'>-be high on both sides of the process.  Try to keep in mind the immortal</div><div class='del'>-words of Bill and Ted, "Be excellent to each other."</div><div class='head'>diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle<br/>index 9c61c039ccd9..320983ca114e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/CodingStyle?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/CodingStyle</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/CodingStyle?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/CodingStyle</a></div><div class='hunk'>@@ -1,1062 +1 @@</div><div class='del'>-.. _codingstyle:</div><div class='del'>-</div><div class='del'>-Linux kernel coding style</div><div class='del'>-=========================</div><div class='del'>-</div><div class='del'>-This is a short document describing the preferred coding style for the</div><div class='del'>-linux kernel.  Coding style is very personal, and I won't **force** my</div><div class='del'>-views on anybody, but this is what goes for anything that I have to be</div><div class='del'>-able to maintain, and I'd prefer it for most other things too.  Please</div><div class='del'>-at least consider the points made here.</div><div class='del'>-</div><div class='del'>-First off, I'd suggest printing out a copy of the GNU coding standards,</div><div class='del'>-and NOT read it.  Burn them, it's a great symbolic gesture.</div><div class='del'>-</div><div class='del'>-Anyway, here goes:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1) Indentation</div><div class='del'>---------------</div><div class='del'>-</div><div class='del'>-Tabs are 8 characters, and thus indentations are also 8 characters.</div><div class='del'>-There are heretic movements that try to make indentations 4 (or even 2!)</div><div class='del'>-characters deep, and that is akin to trying to define the value of PI to</div><div class='del'>-be 3.</div><div class='del'>-</div><div class='del'>-Rationale: The whole idea behind indentation is to clearly define where</div><div class='del'>-a block of control starts and ends.  Especially when you've been looking</div><div class='del'>-at your screen for 20 straight hours, you'll find it a lot easier to see</div><div class='del'>-how the indentation works if you have large indentations.</div><div class='del'>-</div><div class='del'>-Now, some people will claim that having 8-character indentations makes</div><div class='del'>-the code move too far to the right, and makes it hard to read on a</div><div class='del'>-80-character terminal screen.  The answer to that is that if you need</div><div class='del'>-more than 3 levels of indentation, you're screwed anyway, and should fix</div><div class='del'>-your program.</div><div class='del'>-</div><div class='del'>-In short, 8-char indents make things easier to read, and have the added</div><div class='del'>-benefit of warning you when you're nesting your functions too deep.</div><div class='del'>-Heed that warning.</div><div class='del'>-</div><div class='del'>-The preferred way to ease multiple indentation levels in a switch statement is</div><div class='del'>-to align the ``switch`` and its subordinate ``case`` labels in the same column</div><div class='del'>-instead of ``double-indenting`` the ``case`` labels.  E.g.:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	switch (suffix) {</div><div class='del'>-	case 'G':</div><div class='del'>-	case 'g':</div><div class='del'>-		mem &lt;&lt;= 30;</div><div class='del'>-		break;</div><div class='del'>-	case 'M':</div><div class='del'>-	case 'm':</div><div class='del'>-		mem &lt;&lt;= 20;</div><div class='del'>-		break;</div><div class='del'>-	case 'K':</div><div class='del'>-	case 'k':</div><div class='del'>-		mem &lt;&lt;= 10;</div><div class='del'>-		/* fall through */</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-Don't put multiple statements on a single line unless you have</div><div class='del'>-something to hide:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	if (condition) do_this;</div><div class='del'>-	  do_something_everytime;</div><div class='del'>-</div><div class='del'>-Don't put multiple assignments on a single line either.  Kernel coding style</div><div class='del'>-is super simple.  Avoid tricky expressions.</div><div class='del'>-</div><div class='del'>-Outside of comments, documentation and except in Kconfig, spaces are never</div><div class='del'>-used for indentation, and the above example is deliberately broken.</div><div class='del'>-</div><div class='del'>-Get a decent editor and don't leave whitespace at the end of lines.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2) Breaking long lines and strings</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-Coding style is all about readability and maintainability using commonly</div><div class='del'>-available tools.</div><div class='del'>-</div><div class='del'>-The limit on the length of lines is 80 columns and this is a strongly</div><div class='del'>-preferred limit.</div><div class='del'>-</div><div class='del'>-Statements longer than 80 columns will be broken into sensible chunks, unless</div><div class='del'>-exceeding 80 columns significantly increases readability and does not hide</div><div class='del'>-information. Descendants are always substantially shorter than the parent and</div><div class='del'>-are placed substantially to the right. The same applies to function headers</div><div class='del'>-with a long argument list. However, never break user-visible strings such as</div><div class='del'>-printk messages, because that breaks the ability to grep for them.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3) Placing Braces and Spaces</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-The other issue that always comes up in C styling is the placement of</div><div class='del'>-braces.  Unlike the indent size, there are few technical reasons to</div><div class='del'>-choose one placement strategy over the other, but the preferred way, as</div><div class='del'>-shown to us by the prophets Kernighan and Ritchie, is to put the opening</div><div class='del'>-brace last on the line, and put the closing brace first, thusly:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	if (x is true) {</div><div class='del'>-		we do y</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-This applies to all non-function statement blocks (if, switch, for,</div><div class='del'>-while, do).  E.g.:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case KOBJ_ADD:</div><div class='del'>-		return "add";</div><div class='del'>-	case KOBJ_REMOVE:</div><div class='del'>-		return "remove";</div><div class='del'>-	case KOBJ_CHANGE:</div><div class='del'>-		return "change";</div><div class='del'>-	default:</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-However, there is one special case, namely functions: they have the</div><div class='del'>-opening brace at the beginning of the next line, thus:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	int function(int x)</div><div class='del'>-	{</div><div class='del'>-		body of function</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-Heretic people all over the world have claimed that this inconsistency</div><div class='del'>-is ...  well ...  inconsistent, but all right-thinking people know that</div><div class='del'>-(a) K&amp;R are **right** and (b) K&amp;R are right.  Besides, functions are</div><div class='del'>-special anyway (you can't nest them in C).</div><div class='del'>-</div><div class='del'>-Note that the closing brace is empty on a line of its own, **except** in</div><div class='del'>-the cases where it is followed by a continuation of the same statement,</div><div class='del'>-ie a ``while`` in a do-statement or an ``else`` in an if-statement, like</div><div class='del'>-this:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		body of do-loop</div><div class='del'>-	} while (condition);</div><div class='del'>-</div><div class='del'>-and</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	if (x == y) {</div><div class='del'>-		..</div><div class='del'>-	} else if (x &gt; y) {</div><div class='del'>-		...</div><div class='del'>-	} else {</div><div class='del'>-		....</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-Rationale: K&amp;R.</div><div class='del'>-</div><div class='del'>-Also, note that this brace-placement also minimizes the number of empty</div><div class='del'>-(or almost empty) lines, without any loss of readability.  Thus, as the</div><div class='del'>-supply of new-lines on your screen is not a renewable resource (think</div><div class='del'>-25-line terminal screens here), you have more empty lines to put</div><div class='del'>-comments on.</div><div class='del'>-</div><div class='del'>-Do not unnecessarily use braces where a single statement will do.</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	if (condition)</div><div class='del'>-		action();</div><div class='del'>-</div><div class='del'>-and</div><div class='del'>-</div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	if (condition)</div><div class='del'>-		do_this();</div><div class='del'>-	else</div><div class='del'>-		do_that();</div><div class='del'>-</div><div class='del'>-This does not apply if only one branch of a conditional statement is a single</div><div class='del'>-statement; in the latter case use braces in both branches:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	if (condition) {</div><div class='del'>-		do_this();</div><div class='del'>-		do_that();</div><div class='del'>-	} else {</div><div class='del'>-		otherwise();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-3.1) Spaces</div><div class='del'>-***********</div><div class='del'>-</div><div class='del'>-Linux kernel style for use of spaces depends (mostly) on</div><div class='del'>-function-versus-keyword usage.  Use a space after (most) keywords.  The</div><div class='del'>-notable exceptions are sizeof, typeof, alignof, and __attribute__, which look</div><div class='del'>-somewhat like functions (and are usually used with parentheses in Linux,</div><div class='del'>-although they are not required in the language, as in: ``sizeof info`` after</div><div class='del'>-``struct fileinfo info;`` is declared).</div><div class='del'>-</div><div class='del'>-So use a space after these keywords::</div><div class='del'>-</div><div class='del'>-	if, switch, case, for, do, while</div><div class='del'>-</div><div class='del'>-but not with sizeof, typeof, alignof, or __attribute__.  E.g.,</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	s = sizeof(struct file);</div><div class='del'>-</div><div class='del'>-Do not add spaces around (inside) parenthesized expressions.  This example is</div><div class='del'>-**bad**:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	s = sizeof( struct file );</div><div class='del'>-</div><div class='del'>-When declaring pointer data or a function that returns a pointer type, the</div><div class='del'>-preferred use of ``*`` is adjacent to the data name or function name and not</div><div class='del'>-adjacent to the type name.  Examples:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	char *linux_banner;</div><div class='del'>-	unsigned long long memparse(char *ptr, char **retptr);</div><div class='del'>-	char *match_strdup(substring_t *s);</div><div class='del'>-</div><div class='del'>-Use one space around (on each side of) most binary and ternary operators,</div><div class='del'>-such as any of these::</div><div class='del'>-</div><div class='del'>-	=  +  -  &lt;  &gt;  *  /  %  |  &amp;  ^  &lt;=  &gt;=  ==  !=  ?  :</div><div class='del'>-</div><div class='del'>-but no space after unary operators::</div><div class='del'>-</div><div class='del'>-	&amp;  *  +  -  ~  !  sizeof  typeof  alignof  __attribute__  defined</div><div class='del'>-</div><div class='del'>-no space before the postfix increment &amp; decrement unary operators::</div><div class='del'>-</div><div class='del'>-	++  --</div><div class='del'>-</div><div class='del'>-no space after the prefix increment &amp; decrement unary operators::</div><div class='del'>-</div><div class='del'>-	++  --</div><div class='del'>-</div><div class='del'>-and no space around the ``.`` and ``-&gt;`` structure member operators.</div><div class='del'>-</div><div class='del'>-Do not leave trailing whitespace at the ends of lines.  Some editors with</div><div class='del'>-``smart`` indentation will insert whitespace at the beginning of new lines as</div><div class='del'>-appropriate, so you can start typing the next line of code right away.</div><div class='del'>-However, some such editors do not remove the whitespace if you end up not</div><div class='del'>-putting a line of code there, such as if you leave a blank line.  As a result,</div><div class='del'>-you end up with lines containing trailing whitespace.</div><div class='del'>-</div><div class='del'>-Git will warn you about patches that introduce trailing whitespace, and can</div><div class='del'>-optionally strip the trailing whitespace for you; however, if applying a series</div><div class='del'>-of patches, this may make later patches in the series fail by changing their</div><div class='del'>-context lines.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4) Naming</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-C is a Spartan language, and so should your naming be.  Unlike Modula-2</div><div class='del'>-and Pascal programmers, C programmers do not use cute names like</div><div class='del'>-ThisVariableIsATemporaryCounter.  A C programmer would call that</div><div class='del'>-variable ``tmp``, which is much easier to write, and not the least more</div><div class='del'>-difficult to understand.</div><div class='del'>-</div><div class='del'>-HOWEVER, while mixed-case names are frowned upon, descriptive names for</div><div class='del'>-global variables are a must.  To call a global function ``foo`` is a</div><div class='del'>-shooting offense.</div><div class='del'>-</div><div class='del'>-GLOBAL variables (to be used only if you **really** need them) need to</div><div class='del'>-have descriptive names, as do global functions.  If you have a function</div><div class='del'>-that counts the number of active users, you should call that</div><div class='del'>-``count_active_users()`` or similar, you should **not** call it ``cntusr()``.</div><div class='del'>-</div><div class='del'>-Encoding the type of a function into the name (so-called Hungarian</div><div class='del'>-notation) is brain damaged - the compiler knows the types anyway and can</div><div class='del'>-check those, and it only confuses the programmer.  No wonder MicroSoft</div><div class='del'>-makes buggy programs.</div><div class='del'>-</div><div class='del'>-LOCAL variable names should be short, and to the point.  If you have</div><div class='del'>-some random integer loop counter, it should probably be called ``i``.</div><div class='del'>-Calling it ``loop_counter`` is non-productive, if there is no chance of it</div><div class='del'>-being mis-understood.  Similarly, ``tmp`` can be just about any type of</div><div class='del'>-variable that is used to hold a temporary value.</div><div class='del'>-</div><div class='del'>-If you are afraid to mix up your local variable names, you have another</div><div class='del'>-problem, which is called the function-growth-hormone-imbalance syndrome.</div><div class='del'>-See chapter 6 (Functions).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5) Typedefs</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-Please don't use things like ``vps_t``.</div><div class='del'>-It's a **mistake** to use typedef for structures and pointers. When you see a</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	vps_t a;</div><div class='del'>-</div><div class='del'>-in the source, what does it mean?</div><div class='del'>-In contrast, if it says</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	struct virtual_container *a;</div><div class='del'>-</div><div class='del'>-you can actually tell what ``a`` is.</div><div class='del'>-</div><div class='del'>-Lots of people think that typedefs ``help readability``. Not so. They are</div><div class='del'>-useful only for:</div><div class='del'>-</div><div class='del'>- (a) totally opaque objects (where the typedef is actively used to **hide**</div><div class='del'>-     what the object is).</div><div class='del'>-</div><div class='del'>-     Example: ``pte_t`` etc. opaque objects that you can only access using</div><div class='del'>-     the proper accessor functions.</div><div class='del'>-</div><div class='del'>-     .. note::</div><div class='del'>-</div><div class='del'>-       Opaqueness and ``accessor functions`` are not good in themselves.</div><div class='del'>-       The reason we have them for things like pte_t etc. is that there</div><div class='del'>-       really is absolutely **zero** portably accessible information there.</div><div class='del'>-</div><div class='del'>- (b) Clear integer types, where the abstraction **helps** avoid confusion</div><div class='del'>-     whether it is ``int`` or ``long``.</div><div class='del'>-</div><div class='del'>-     u8/u16/u32 are perfectly fine typedefs, although they fit into</div><div class='del'>-     category (d) better than here.</div><div class='del'>-</div><div class='del'>-     .. note::</div><div class='del'>-</div><div class='del'>-       Again - there needs to be a **reason** for this. If something is</div><div class='del'>-       ``unsigned long``, then there's no reason to do</div><div class='del'>-</div><div class='del'>-	typedef unsigned long myflags_t;</div><div class='del'>-</div><div class='del'>-     but if there is a clear reason for why it under certain circumstances</div><div class='del'>-     might be an ``unsigned int`` and under other configurations might be</div><div class='del'>-     ``unsigned long``, then by all means go ahead and use a typedef.</div><div class='del'>-</div><div class='del'>- (c) when you use sparse to literally create a **new** type for</div><div class='del'>-     type-checking.</div><div class='del'>-</div><div class='del'>- (d) New types which are identical to standard C99 types, in certain</div><div class='del'>-     exceptional circumstances.</div><div class='del'>-</div><div class='del'>-     Although it would only take a short amount of time for the eyes and</div><div class='del'>-     brain to become accustomed to the standard types like ``uint32_t``,</div><div class='del'>-     some people object to their use anyway.</div><div class='del'>-</div><div class='del'>-     Therefore, the Linux-specific ``u8/u16/u32/u64`` types and their</div><div class='del'>-     signed equivalents which are identical to standard types are</div><div class='del'>-     permitted -- although they are not mandatory in new code of your</div><div class='del'>-     own.</div><div class='del'>-</div><div class='del'>-     When editing existing code which already uses one or the other set</div><div class='del'>-     of types, you should conform to the existing choices in that code.</div><div class='del'>-</div><div class='del'>- (e) Types safe for use in userspace.</div><div class='del'>-</div><div class='del'>-     In certain structures which are visible to userspace, we cannot</div><div class='del'>-     require C99 types and cannot use the ``u32`` form above. Thus, we</div><div class='del'>-     use __u32 and similar types in all structures which are shared</div><div class='del'>-     with userspace.</div><div class='del'>-</div><div class='del'>-Maybe there are other cases too, but the rule should basically be to NEVER</div><div class='del'>-EVER use a typedef unless you can clearly match one of those rules.</div><div class='del'>-</div><div class='del'>-In general, a pointer, or a struct that has elements that can reasonably</div><div class='del'>-be directly accessed should **never** be a typedef.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-6) Functions</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-Functions should be short and sweet, and do just one thing.  They should</div><div class='del'>-fit on one or two screenfuls of text (the ISO/ANSI screen size is 80x24,</div><div class='del'>-as we all know), and do one thing and do that well.</div><div class='del'>-</div><div class='del'>-The maximum length of a function is inversely proportional to the</div><div class='del'>-complexity and indentation level of that function.  So, if you have a</div><div class='del'>-conceptually simple function that is just one long (but simple)</div><div class='del'>-case-statement, where you have to do lots of small things for a lot of</div><div class='del'>-different cases, it's OK to have a longer function.</div><div class='del'>-</div><div class='del'>-However, if you have a complex function, and you suspect that a</div><div class='del'>-less-than-gifted first-year high-school student might not even</div><div class='del'>-understand what the function is all about, you should adhere to the</div><div class='del'>-maximum limits all the more closely.  Use helper functions with</div><div class='del'>-descriptive names (you can ask the compiler to in-line them if you think</div><div class='del'>-it's performance-critical, and it will probably do a better job of it</div><div class='del'>-than you would have done).</div><div class='del'>-</div><div class='del'>-Another measure of the function is the number of local variables.  They</div><div class='del'>-shouldn't exceed 5-10, or you're doing something wrong.  Re-think the</div><div class='del'>-function, and split it into smaller pieces.  A human brain can</div><div class='del'>-generally easily keep track of about 7 different things, anything more</div><div class='del'>-and it gets confused.  You know you're brilliant, but maybe you'd like</div><div class='del'>-to understand what you did 2 weeks from now.</div><div class='del'>-</div><div class='del'>-In source files, separate functions with one blank line.  If the function is</div><div class='del'>-exported, the **EXPORT** macro for it should follow immediately after the</div><div class='del'>-closing function brace line.  E.g.:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	int system_is_up(void)</div><div class='del'>-	{</div><div class='del'>-		return system_state == SYSTEM_RUNNING;</div><div class='del'>-	}</div><div class='del'>-	EXPORT_SYMBOL(system_is_up);</div><div class='del'>-</div><div class='del'>-In function prototypes, include parameter names with their data types.</div><div class='del'>-Although this is not required by the C language, it is preferred in Linux</div><div class='del'>-because it is a simple way to add valuable information for the reader.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-7) Centralized exiting of functions</div><div class='del'>------------------------------------</div><div class='del'>-</div><div class='del'>-Albeit deprecated by some people, the equivalent of the goto statement is</div><div class='del'>-used frequently by compilers in form of the unconditional jump instruction.</div><div class='del'>-</div><div class='del'>-The goto statement comes in handy when a function exits from multiple</div><div class='del'>-locations and some common work such as cleanup has to be done.  If there is no</div><div class='del'>-cleanup needed then just return directly.</div><div class='del'>-</div><div class='del'>-Choose label names which say what the goto does or why the goto exists.  An</div><div class='del'>-example of a good name could be ``out_free_buffer:`` if the goto frees ``buffer``.</div><div class='del'>-Avoid using GW-BASIC names like ``err1:`` and ``err2:``, as you would have to</div><div class='del'>-renumber them if you ever add or remove exit paths, and they make correctness</div><div class='del'>-difficult to verify anyway.</div><div class='del'>-</div><div class='del'>-The rationale for using gotos is:</div><div class='del'>-</div><div class='del'>-- unconditional statements are easier to understand and follow</div><div class='del'>-- nesting is reduced</div><div class='del'>-- errors by not updating individual exit points when making</div><div class='del'>-  modifications are prevented</div><div class='del'>-- saves the compiler work to optimize redundant code away ;)</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	int fun(int a)</div><div class='del'>-	{</div><div class='del'>-		int result = 0;</div><div class='del'>-		char *buffer;</div><div class='del'>-</div><div class='del'>-		buffer = kmalloc(SIZE, GFP_KERNEL);</div><div class='del'>-		if (!buffer)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		if (condition1) {</div><div class='del'>-			while (loop1) {</div><div class='del'>-				...</div><div class='del'>-			}</div><div class='del'>-			result = 1;</div><div class='del'>-			goto out_buffer;</div><div class='del'>-		}</div><div class='del'>-		...</div><div class='del'>-	out_free_buffer:</div><div class='del'>-		kfree(buffer);</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-A common type of bug to be aware of is ``one err bugs`` which look like this:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	err:</div><div class='del'>-		kfree(foo-&gt;bar);</div><div class='del'>-		kfree(foo);</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-The bug in this code is that on some exit paths ``foo`` is NULL.  Normally the</div><div class='del'>-fix for this is to split it up into two error labels ``err_free_bar:`` and</div><div class='del'>-``err_free_foo:``:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	 err_free_bar:</div><div class='del'>-		kfree(foo-&gt;bar);</div><div class='del'>-	 err_free_foo:</div><div class='del'>-		kfree(foo);</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-Ideally you should simulate errors to test all exit paths.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-8) Commenting</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-Comments are good, but there is also a danger of over-commenting.  NEVER</div><div class='del'>-try to explain HOW your code works in a comment: it's much better to</div><div class='del'>-write the code so that the **working** is obvious, and it's a waste of</div><div class='del'>-time to explain badly written code.</div><div class='del'>-</div><div class='del'>-Generally, you want your comments to tell WHAT your code does, not HOW.</div><div class='del'>-Also, try to avoid putting comments inside a function body: if the</div><div class='del'>-function is so complex that you need to separately comment parts of it,</div><div class='del'>-you should probably go back to chapter 6 for a while.  You can make</div><div class='del'>-small comments to note or warn about something particularly clever (or</div><div class='del'>-ugly), but try to avoid excess.  Instead, put the comments at the head</div><div class='del'>-of the function, telling people what it does, and possibly WHY it does</div><div class='del'>-it.</div><div class='del'>-</div><div class='del'>-When commenting the kernel API functions, please use the kernel-doc format.</div><div class='del'>-See the files Documentation/kernel-documentation.rst and scripts/kernel-doc</div><div class='del'>-for details.</div><div class='del'>-</div><div class='del'>-The preferred style for long (multi-line) comments is:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This is the preferred style for multi-line</div><div class='del'>-	 * comments in the Linux kernel source code.</div><div class='del'>-	 * Please use it consistently.</div><div class='del'>-	 *</div><div class='del'>-	 * Description:  A column of asterisks on the left side,</div><div class='del'>-	 * with beginning and ending almost-blank lines.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-For files in net/ and drivers/net/ the preferred style for long (multi-line)</div><div class='del'>-comments is a little different.</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	/* The preferred comment style for files in net/ and drivers/net</div><div class='del'>-	 * looks like this.</div><div class='del'>-	 *</div><div class='del'>-	 * It is nearly the same as the generally preferred comment style,</div><div class='del'>-	 * but there is no initial almost-blank line.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-It's also important to comment data, whether they are basic types or derived</div><div class='del'>-types.  To this end, use just one data declaration per line (no commas for</div><div class='del'>-multiple data declarations).  This leaves you room for a small comment on each</div><div class='del'>-item, explaining its use.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-9) You've made a mess of it</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='del'>-That's OK, we all do.  You've probably been told by your long-time Unix</div><div class='del'>-user helper that ``GNU emacs`` automatically formats the C sources for</div><div class='del'>-you, and you've noticed that yes, it does do that, but the defaults it</div><div class='del'>-uses are less than desirable (in fact, they are worse than random</div><div class='del'>-typing - an infinite number of monkeys typing into GNU emacs would never</div><div class='del'>-make a good program).</div><div class='del'>-</div><div class='del'>-So, you can either get rid of GNU emacs, or change it to use saner</div><div class='del'>-values.  To do the latter, you can stick the following in your .emacs file:</div><div class='del'>-</div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-  (defun c-lineup-arglist-tabs-only (ignored)</div><div class='del'>-    "Line up argument lists by tabs, not spaces"</div><div class='del'>-    (let* ((anchor (c-langelem-pos c-syntactic-element))</div><div class='del'>-           (column (c-langelem-2nd-pos c-syntactic-element))</div><div class='del'>-           (offset (- (1+ column) anchor))</div><div class='del'>-           (steps (floor offset c-basic-offset)))</div><div class='del'>-      (* (max steps 1)</div><div class='del'>-         c-basic-offset)))</div><div class='del'>-</div><div class='del'>-  (add-hook 'c-mode-common-hook</div><div class='del'>-            (lambda ()</div><div class='del'>-              ;; Add kernel style</div><div class='del'>-              (c-add-style</div><div class='del'>-               "linux-tabs-only"</div><div class='del'>-               '("linux" (c-offsets-alist</div><div class='del'>-                          (arglist-cont-nonempty</div><div class='del'>-                           c-lineup-gcc-asm-reg</div><div class='del'>-                           c-lineup-arglist-tabs-only))))))</div><div class='del'>-</div><div class='del'>-  (add-hook 'c-mode-hook</div><div class='del'>-            (lambda ()</div><div class='del'>-              (let ((filename (buffer-file-name)))</div><div class='del'>-                ;; Enable kernel mode for the appropriate files</div><div class='del'>-                (when (and filename</div><div class='del'>-                           (string-match (expand-file-name "~/src/linux-trees")</div><div class='del'>-                                         filename))</div><div class='del'>-                  (setq indent-tabs-mode t)</div><div class='del'>-                  (setq show-trailing-whitespace t)</div><div class='del'>-                  (c-set-style "linux-tabs-only")))))</div><div class='del'>-</div><div class='del'>-This will make emacs go better with the kernel coding style for C</div><div class='del'>-files below ``~/src/linux-trees``.</div><div class='del'>-</div><div class='del'>-But even if you fail in getting emacs to do sane formatting, not</div><div class='del'>-everything is lost: use ``indent``.</div><div class='del'>-</div><div class='del'>-Now, again, GNU indent has the same brain-dead settings that GNU emacs</div><div class='del'>-has, which is why you need to give it a few command line options.</div><div class='del'>-However, that's not too bad, because even the makers of GNU indent</div><div class='del'>-recognize the authority of K&amp;R (the GNU people aren't evil, they are</div><div class='del'>-just severely misguided in this matter), so you just give indent the</div><div class='del'>-options ``-kr -i8`` (stands for ``K&amp;R, 8 character indents``), or use</div><div class='del'>-``scripts/Lindent``, which indents in the latest style.</div><div class='del'>-</div><div class='del'>-``indent`` has a lot of options, and especially when it comes to comment</div><div class='del'>-re-formatting you may want to take a look at the man page.  But</div><div class='del'>-remember: ``indent`` is not a fix for bad programming.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-10) Kconfig configuration files</div><div class='del'>--------------------------------</div><div class='del'>-</div><div class='del'>-For all of the Kconfig* configuration files throughout the source tree,</div><div class='del'>-the indentation is somewhat different.  Lines under a ``config`` definition</div><div class='del'>-are indented with one tab, while help text is indented an additional two</div><div class='del'>-spaces.  Example::</div><div class='del'>-</div><div class='del'>-  config AUDIT</div><div class='del'>-	bool "Auditing support"</div><div class='del'>-	depends on NET</div><div class='del'>-	help</div><div class='del'>-	  Enable auditing infrastructure that can be used with another</div><div class='del'>-	  kernel subsystem, such as SELinux (which requires this for</div><div class='del'>-	  logging of avc messages output).  Does not do system-call</div><div class='del'>-	  auditing without CONFIG_AUDITSYSCALL.</div><div class='del'>-</div><div class='del'>-Seriously dangerous features (such as write support for certain</div><div class='del'>-filesystems) should advertise this prominently in their prompt string::</div><div class='del'>-</div><div class='del'>-  config ADFS_FS_RW</div><div class='del'>-	bool "ADFS write support (DANGEROUS)"</div><div class='del'>-	depends on ADFS_FS</div><div class='del'>-	...</div><div class='del'>-</div><div class='del'>-For full documentation on the configuration files, see the file</div><div class='del'>-Documentation/kbuild/kconfig-language.txt.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-11) Data structures</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-Data structures that have visibility outside the single-threaded</div><div class='del'>-environment they are created and destroyed in should always have</div><div class='del'>-reference counts.  In the kernel, garbage collection doesn't exist (and</div><div class='del'>-outside the kernel garbage collection is slow and inefficient), which</div><div class='del'>-means that you absolutely **have** to reference count all your uses.</div><div class='del'>-</div><div class='del'>-Reference counting means that you can avoid locking, and allows multiple</div><div class='del'>-users to have access to the data structure in parallel - and not having</div><div class='del'>-to worry about the structure suddenly going away from under them just</div><div class='del'>-because they slept or did something else for a while.</div><div class='del'>-</div><div class='del'>-Note that locking is **not** a replacement for reference counting.</div><div class='del'>-Locking is used to keep data structures coherent, while reference</div><div class='del'>-counting is a memory management technique.  Usually both are needed, and</div><div class='del'>-they are not to be confused with each other.</div><div class='del'>-</div><div class='del'>-Many data structures can indeed have two levels of reference counting,</div><div class='del'>-when there are users of different ``classes``.  The subclass count counts</div><div class='del'>-the number of subclass users, and decrements the global count just once</div><div class='del'>-when the subclass count goes to zero.</div><div class='del'>-</div><div class='del'>-Examples of this kind of ``multi-level-reference-counting`` can be found in</div><div class='del'>-memory management (``struct mm_struct``: mm_users and mm_count), and in</div><div class='del'>-filesystem code (``struct super_block``: s_count and s_active).</div><div class='del'>-</div><div class='del'>-Remember: if another thread can find your data structure, and you don't</div><div class='del'>-have a reference count on it, you almost certainly have a bug.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-12) Macros, Enums and RTL</div><div class='del'>--------------------------</div><div class='del'>-</div><div class='del'>-Names of macros defining constants and labels in enums are capitalized.</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	#define CONSTANT 0x12345</div><div class='del'>-</div><div class='del'>-Enums are preferred when defining several related constants.</div><div class='del'>-</div><div class='del'>-CAPITALIZED macro names are appreciated but macros resembling functions</div><div class='del'>-may be named in lower case.</div><div class='del'>-</div><div class='del'>-Generally, inline functions are preferable to macros resembling functions.</div><div class='del'>-</div><div class='del'>-Macros with multiple statements should be enclosed in a do - while block:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	#define macrofun(a, b, c)			\</div><div class='del'>-		do {					\</div><div class='del'>-			if (a == 5)			\</div><div class='del'>-				do_this(b, c);		\</div><div class='del'>-		} while (0)</div><div class='del'>-</div><div class='del'>-Things to avoid when using macros:</div><div class='del'>-</div><div class='del'>-1) macros that affect control flow:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	#define FOO(x)					\</div><div class='del'>-		do {					\</div><div class='del'>-			if (blah(x) &lt; 0)		\</div><div class='del'>-				return -EBUGGERED;	\</div><div class='del'>-		} while (0)</div><div class='del'>-</div><div class='del'>-is a **very** bad idea.  It looks like a function call but exits the ``calling``</div><div class='del'>-function; don't break the internal parsers of those who will read the code.</div><div class='del'>-</div><div class='del'>-2) macros that depend on having a local variable with a magic name:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	#define FOO(val) bar(index, val)</div><div class='del'>-</div><div class='del'>-might look like a good thing, but it's confusing as hell when one reads the</div><div class='del'>-code and it's prone to breakage from seemingly innocent changes.</div><div class='del'>-</div><div class='del'>-3) macros with arguments that are used as l-values: FOO(x) = y; will</div><div class='del'>-bite you if somebody e.g. turns FOO into an inline function.</div><div class='del'>-</div><div class='del'>-4) forgetting about precedence: macros defining constants using expressions</div><div class='del'>-must enclose the expression in parentheses. Beware of similar issues with</div><div class='del'>-macros using parameters.</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	#define CONSTANT 0x4000</div><div class='del'>-	#define CONSTEXP (CONSTANT | 3)</div><div class='del'>-</div><div class='del'>-5) namespace collisions when defining local variables in macros resembling</div><div class='del'>-functions:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	#define FOO(x)				\</div><div class='del'>-	({					\</div><div class='del'>-		typeof(x) ret;			\</div><div class='del'>-		ret = calc_ret(x);		\</div><div class='del'>-		(ret);				\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-ret is a common name for a local variable - __foo_ret is less likely</div><div class='del'>-to collide with an existing variable.</div><div class='del'>-</div><div class='del'>-The cpp manual deals with macros exhaustively. The gcc internals manual also</div><div class='del'>-covers RTL which is used frequently with assembly language in the kernel.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-13) Printing kernel messages</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-Kernel developers like to be seen as literate. Do mind the spelling</div><div class='del'>-of kernel messages to make a good impression. Do not use crippled</div><div class='del'>-words like ``dont``; use ``do not`` or ``don't`` instead.  Make the messages</div><div class='del'>-concise, clear, and unambiguous.</div><div class='del'>-</div><div class='del'>-Kernel messages do not have to be terminated with a period.</div><div class='del'>-</div><div class='del'>-Printing numbers in parentheses (%d) adds no value and should be avoided.</div><div class='del'>-</div><div class='del'>-There are a number of driver model diagnostic macros in &lt;linux/device.h&gt;</div><div class='del'>-which you should use to make sure messages are matched to the right device</div><div class='del'>-and driver, and are tagged with the right level:  dev_err(), dev_warn(),</div><div class='del'>-dev_info(), and so forth.  For messages that aren't associated with a</div><div class='del'>-particular device, &lt;linux/printk.h&gt; defines pr_notice(), pr_info(),</div><div class='del'>-pr_warn(), pr_err(), etc.</div><div class='del'>-</div><div class='del'>-Coming up with good debugging messages can be quite a challenge; and once</div><div class='del'>-you have them, they can be a huge help for remote troubleshooting.  However</div><div class='del'>-debug message printing is handled differently than printing other non-debug</div><div class='del'>-messages.  While the other pr_XXX() functions print unconditionally,</div><div class='del'>-pr_debug() does not; it is compiled out by default, unless either DEBUG is</div><div class='del'>-defined or CONFIG_DYNAMIC_DEBUG is set.  That is true for dev_dbg() also,</div><div class='del'>-and a related convention uses VERBOSE_DEBUG to add dev_vdbg() messages to</div><div class='del'>-the ones already enabled by DEBUG.</div><div class='del'>-</div><div class='del'>-Many subsystems have Kconfig debug options to turn on -DDEBUG in the</div><div class='del'>-corresponding Makefile; in other cases specific files #define DEBUG.  And</div><div class='del'>-when a debug message should be unconditionally printed, such as if it is</div><div class='del'>-already inside a debug-related #ifdef section, printk(KERN_DEBUG ...) can be</div><div class='del'>-used.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-14) Allocating memory</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-The kernel provides the following general purpose memory allocators:</div><div class='del'>-kmalloc(), kzalloc(), kmalloc_array(), kcalloc(), vmalloc(), and</div><div class='del'>-vzalloc().  Please refer to the API documentation for further information</div><div class='del'>-about them.</div><div class='del'>-</div><div class='del'>-The preferred form for passing a size of a struct is the following:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	p = kmalloc(sizeof(*p), ...);</div><div class='del'>-</div><div class='del'>-The alternative form where struct name is spelled out hurts readability and</div><div class='del'>-introduces an opportunity for a bug when the pointer variable type is changed</div><div class='del'>-but the corresponding sizeof that is passed to a memory allocator is not.</div><div class='del'>-</div><div class='del'>-Casting the return value which is a void pointer is redundant. The conversion</div><div class='del'>-from void pointer to any other pointer type is guaranteed by the C programming</div><div class='del'>-language.</div><div class='del'>-</div><div class='del'>-The preferred form for allocating an array is the following:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	p = kmalloc_array(n, sizeof(...), ...);</div><div class='del'>-</div><div class='del'>-The preferred form for allocating a zeroed array is the following:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	p = kcalloc(n, sizeof(...), ...);</div><div class='del'>-</div><div class='del'>-Both forms check for overflow on the allocation size n * sizeof(...),</div><div class='del'>-and return NULL if that occurred.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-15) The inline disease</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-There appears to be a common misperception that gcc has a magic "make me</div><div class='del'>-faster" speedup option called ``inline``. While the use of inlines can be</div><div class='del'>-appropriate (for example as a means of replacing macros, see Chapter 12), it</div><div class='del'>-very often is not. Abundant use of the inline keyword leads to a much bigger</div><div class='del'>-kernel, which in turn slows the system as a whole down, due to a bigger</div><div class='del'>-icache footprint for the CPU and simply because there is less memory</div><div class='del'>-available for the pagecache. Just think about it; a pagecache miss causes a</div><div class='del'>-disk seek, which easily takes 5 milliseconds. There are a LOT of cpu cycles</div><div class='del'>-that can go into these 5 milliseconds.</div><div class='del'>-</div><div class='del'>-A reasonable rule of thumb is to not put inline at functions that have more</div><div class='del'>-than 3 lines of code in them. An exception to this rule are the cases where</div><div class='del'>-a parameter is known to be a compiletime constant, and as a result of this</div><div class='del'>-constantness you *know* the compiler will be able to optimize most of your</div><div class='del'>-function away at compile time. For a good example of this later case, see</div><div class='del'>-the kmalloc() inline function.</div><div class='del'>-</div><div class='del'>-Often people argue that adding inline to functions that are static and used</div><div class='del'>-only once is always a win since there is no space tradeoff. While this is</div><div class='del'>-technically correct, gcc is capable of inlining these automatically without</div><div class='del'>-help, and the maintenance issue of removing the inline when a second user</div><div class='del'>-appears outweighs the potential value of the hint that tells gcc to do</div><div class='del'>-something it would have done anyway.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-16) Function return values and names</div><div class='del'>-------------------------------------</div><div class='del'>-</div><div class='del'>-Functions can return values of many different kinds, and one of the</div><div class='del'>-most common is a value indicating whether the function succeeded or</div><div class='del'>-failed.  Such a value can be represented as an error-code integer</div><div class='del'>-(-Exxx = failure, 0 = success) or a ``succeeded`` boolean (0 = failure,</div><div class='del'>-non-zero = success).</div><div class='del'>-</div><div class='del'>-Mixing up these two sorts of representations is a fertile source of</div><div class='del'>-difficult-to-find bugs.  If the C language included a strong distinction</div><div class='del'>-between integers and booleans then the compiler would find these mistakes</div><div class='del'>-for us... but it doesn't.  To help prevent such bugs, always follow this</div><div class='del'>-convention::</div><div class='del'>-</div><div class='del'>-	If the name of a function is an action or an imperative command,</div><div class='del'>-	the function should return an error-code integer.  If the name</div><div class='del'>-	is a predicate, the function should return a "succeeded" boolean.</div><div class='del'>-</div><div class='del'>-For example, ``add work`` is a command, and the add_work() function returns 0</div><div class='del'>-for success or -EBUSY for failure.  In the same way, ``PCI device present`` is</div><div class='del'>-a predicate, and the pci_dev_present() function returns 1 if it succeeds in</div><div class='del'>-finding a matching device or 0 if it doesn't.</div><div class='del'>-</div><div class='del'>-All EXPORTed functions must respect this convention, and so should all</div><div class='del'>-public functions.  Private (static) functions need not, but it is</div><div class='del'>-recommended that they do.</div><div class='del'>-</div><div class='del'>-Functions whose return value is the actual result of a computation, rather</div><div class='del'>-than an indication of whether the computation succeeded, are not subject to</div><div class='del'>-this rule.  Generally they indicate failure by returning some out-of-range</div><div class='del'>-result.  Typical examples would be functions that return pointers; they use</div><div class='del'>-NULL or the ERR_PTR mechanism to report failure.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-17) Don't re-invent the kernel macros</div><div class='del'>--------------------------------------</div><div class='del'>-</div><div class='del'>-The header file include/linux/kernel.h contains a number of macros that</div><div class='del'>-you should use, rather than explicitly coding some variant of them yourself.</div><div class='del'>-For example, if you need to calculate the length of an array, take advantage</div><div class='del'>-of the macro</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))</div><div class='del'>-</div><div class='del'>-Similarly, if you need to calculate the size of some structure member, use</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)-&gt;f))</div><div class='del'>-</div><div class='del'>-There are also min() and max() macros that do strict type checking if you</div><div class='del'>-need them.  Feel free to peruse that header file to see what else is already</div><div class='del'>-defined that you shouldn't reproduce in your code.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-18) Editor modelines and other cruft</div><div class='del'>-------------------------------------</div><div class='del'>-</div><div class='del'>-Some editors can interpret configuration information embedded in source files,</div><div class='del'>-indicated with special markers.  For example, emacs interprets lines marked</div><div class='del'>-like this:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	-*- mode: c -*-</div><div class='del'>-</div><div class='del'>-Or like this:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	Local Variables:</div><div class='del'>-	compile-command: "gcc -DMAGIC_DEBUG_FLAG foo.c"</div><div class='del'>-	End:</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-Vim interprets markers that look like this:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	/* vim:set sw=8 noet */</div><div class='del'>-</div><div class='del'>-Do not include any of these in source files.  People have their own personal</div><div class='del'>-editor configurations, and your source files should not override them.  This</div><div class='del'>-includes markers for indentation and mode configuration.  People may use their</div><div class='del'>-own custom mode, or may have some other magic method for making indentation</div><div class='del'>-work correctly.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-19) Inline assembly</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-In architecture-specific code, you may need to use inline assembly to interface</div><div class='del'>-with CPU or platform functionality.  Don't hesitate to do so when necessary.</div><div class='del'>-However, don't use inline assembly gratuitously when C can do the job.  You can</div><div class='del'>-and should poke hardware from C when possible.</div><div class='del'>-</div><div class='del'>-Consider writing simple helper functions that wrap common bits of inline</div><div class='del'>-assembly, rather than repeatedly writing them with slight variations.  Remember</div><div class='del'>-that inline assembly can use C parameters.</div><div class='del'>-</div><div class='del'>-Large, non-trivial assembly functions should go in .S files, with corresponding</div><div class='del'>-C prototypes defined in C header files.  The C prototypes for assembly</div><div class='del'>-functions should use ``asmlinkage``.</div><div class='del'>-</div><div class='del'>-You may need to mark your asm statement as volatile, to prevent GCC from</div><div class='del'>-removing it if GCC doesn't notice any side effects.  You don't always need to</div><div class='del'>-do so, though, and doing so unnecessarily can limit optimization.</div><div class='del'>-</div><div class='del'>-When writing a single inline assembly statement containing multiple</div><div class='del'>-instructions, put each instruction on a separate line in a separate quoted</div><div class='del'>-string, and end each string except the last with \n\t to properly indent the</div><div class='del'>-next instruction in the assembly output:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	asm ("magic %reg1, #42\n\t"</div><div class='del'>-	     "more_magic %reg2, %reg3"</div><div class='del'>-	     : /* outputs */ : /* inputs */ : /* clobbers */);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-20) Conditional Compilation</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='del'>-Wherever possible, don't use preprocessor conditionals (#if, #ifdef) in .c</div><div class='del'>-files; doing so makes code harder to read and logic harder to follow.  Instead,</div><div class='del'>-use such conditionals in a header file defining functions for use in those .c</div><div class='del'>-files, providing no-op stub versions in the #else case, and then call those</div><div class='del'>-functions unconditionally from .c files.  The compiler will avoid generating</div><div class='del'>-any code for the stub calls, producing identical results, but the logic will</div><div class='del'>-remain easy to follow.</div><div class='del'>-</div><div class='del'>-Prefer to compile out entire functions, rather than portions of functions or</div><div class='del'>-portions of expressions.  Rather than putting an ifdef in an expression, factor</div><div class='del'>-out part or all of the expression into a separate helper function and apply the</div><div class='del'>-conditional to that function.</div><div class='del'>-</div><div class='del'>-If you have a function or variable which may potentially go unused in a</div><div class='del'>-particular configuration, and the compiler would warn about its definition</div><div class='del'>-going unused, mark the definition as __maybe_unused rather than wrapping it in</div><div class='del'>-a preprocessor conditional.  (However, if a function or variable *always* goes</div><div class='del'>-unused, delete it.)</div><div class='del'>-</div><div class='del'>-Within code, where possible, use the IS_ENABLED macro to convert a Kconfig</div><div class='del'>-symbol into a C boolean expression, and use it in a normal C conditional:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_SOMETHING)) {</div><div class='del'>-		...</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-The compiler will constant-fold the conditional away, and include or exclude</div><div class='del'>-the block of code just as with an #ifdef, so this will not add any runtime</div><div class='del'>-overhead.  However, this approach still allows the C compiler to see the code</div><div class='del'>-inside the block, and check it for correctness (syntax, types, symbol</div><div class='del'>-references, etc).  Thus, you still have to use an #ifdef if the code inside the</div><div class='del'>-block references symbols that will not exist if the condition is not met.</div><div class='del'>-</div><div class='del'>-At the end of any non-trivial #if or #ifdef block (more than a few lines),</div><div class='del'>-place a comment after the #endif on the same line, noting the conditional</div><div class='del'>-expression used.  For instance:</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-	#ifdef CONFIG_SOMETHING</div><div class='del'>-	...</div><div class='del'>-	#endif /* CONFIG_SOMETHING */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Appendix I) References</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-The C Programming Language, Second Edition</div><div class='del'>-by Brian W. Kernighan and Dennis M. Ritchie.</div><div class='del'>-Prentice Hall, Inc., 1988.</div><div class='del'>-ISBN 0-13-110362-8 (paperback), 0-13-110370-9 (hardback).</div><div class='del'>-</div><div class='del'>-The Practice of Programming</div><div class='del'>-by Brian W. Kernighan and Rob Pike.</div><div class='del'>-Addison-Wesley, Inc., 1999.</div><div class='del'>-ISBN 0-201-61586-X.</div><div class='del'>-</div><div class='del'>-GNU manuals - where in compliance with K&amp;R and this text - for cpp, gcc,</div><div class='del'>-gcc internals and indent, all available from http://www.gnu.org/manual/</div><div class='del'>-</div><div class='del'>-WG14 is the international standardization working group for the programming</div><div class='del'>-language C, URL: http://www.open-std.org/JTC1/SC22/WG14/</div><div class='del'>-</div><div class='del'>-Kernel CodingStyle, by greg@kroah.com at OLS 2002:</div><div class='del'>-http://www.kroah.com/linux/talks/ols_2002_kernel_codingstyle_talk/html/</div><div class='add'>+This file has moved to process/coding-style.rst</div><div class='head'>diff --git a/Documentation/DMA-ISA-LPC.txt b/Documentation/DMA-ISA-LPC.txt<br/>index b1a19835e907..c41331398752 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/DMA-ISA-LPC.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DMA-ISA-LPC.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/DMA-ISA-LPC.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DMA-ISA-LPC.txt</a></div><div class='hunk'>@@ -42,7 +42,7 @@ requirements you pass the flag GFP_DMA to kmalloc.</div><div class='ctx'> </div><div class='ctx'> Unfortunately the memory available for ISA DMA is scarce so unless you</div><div class='ctx'> allocate the memory during boot-up it's a good idea to also pass</div><div class='del'>-__GFP_REPEAT and __GFP_NOWARN to make the allocater try a bit harder.</div><div class='add'>+__GFP_REPEAT and __GFP_NOWARN to make the allocator try a bit harder.</div><div class='ctx'> </div><div class='ctx'> (This scarcity also means that you should allocate the buffer as</div><div class='ctx'> early as possible and not release it until the driver is unloaded.)</div><div class='head'>diff --git a/Documentation/DMA-attributes.txt b/Documentation/DMA-attributes.txt<br/>index 98bf7ac29aad..44c6bc496eee 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/DMA-attributes.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DMA-attributes.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/DMA-attributes.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DMA-attributes.txt</a></div><div class='hunk'>@@ -143,3 +143,13 @@ So, this provides a way for drivers to avoid those error messages on calls</div><div class='ctx'> where allocation failures are not a problem, and shouldn't bother the logs.</div><div class='ctx'> </div><div class='ctx'> NOTE: At the moment DMA_ATTR_NO_WARN is only implemented on PowerPC.</div><div class='add'>+</div><div class='add'>+DMA_ATTR_PRIVILEGED</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+Some advanced peripherals such as remote processors and GPUs perform</div><div class='add'>+accesses to DMA buffers in both privileged "supervisor" and unprivileged</div><div class='add'>+"user" modes.  This attribute is used to indicate to the DMA-mapping</div><div class='add'>+subsystem that the buffer is fully accessible at the elevated privilege</div><div class='add'>+level (and ideally inaccessible or at least read-only at the</div><div class='add'>+lesser-privileged levels).</div><div class='head'>diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile<br/>index fdf8232d0eeb..164c1c76971f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/DocBook/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/Makefile</a></div><div class='hunk'>@@ -7,15 +7,13 @@</div><div class='ctx'> # list of DOCBOOKS.</div><div class='ctx'> </div><div class='ctx'> DOCBOOKS := z8530book.xml  \</div><div class='del'>-	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \</div><div class='add'>+	    kernel-hacking.xml kernel-locking.xml \</div><div class='ctx'> 	    writing_usb_driver.xml networking.xml \</div><div class='del'>-	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \</div><div class='add'>+	    kernel-api.xml filesystems.xml lsm.xml kgdb.xml \</div><div class='ctx'> 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \</div><div class='del'>-	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \</div><div class='del'>-	    debugobjects.xml sh.xml regulator.xml \</div><div class='del'>-	    alsa-driver-api.xml writing-an-alsa-driver.xml \</div><div class='del'>-	    tracepoint.xml w1.xml \</div><div class='del'>-	    writing_musb_glue_layer.xml crypto-API.xml iio.xml</div><div class='add'>+	    genericirq.xml s390-drivers.xml scsi.xml \</div><div class='add'>+	    sh.xml w1.xml \</div><div class='add'>+	    writing_musb_glue_layer.xml</div><div class='ctx'> </div><div class='ctx'> ifeq ($(DOCBOOKS),)</div><div class='ctx'> </div><div class='hunk'>@@ -73,6 +71,7 @@ installmandocs: mandocs</div><div class='ctx'> # no-op for the DocBook toolchain</div><div class='ctx'> epubdocs:</div><div class='ctx'> latexdocs:</div><div class='add'>+linkcheckdocs:</div><div class='ctx'> </div><div class='ctx'> ###</div><div class='ctx'> #External programs used</div><div class='hunk'>@@ -264,6 +263,7 @@ clean-files := $(DOCBOOKS) \</div><div class='ctx'> 	$(patsubst %.xml, %.aux.xml, $(DOCBOOKS)) \</div><div class='ctx'> 	$(patsubst %.xml, %.xml.db,  $(DOCBOOKS)) \</div><div class='ctx'> 	$(patsubst %.xml, %.xml,     $(DOCBOOKS)) \</div><div class='add'>+	$(patsubst %.xml, .%.xml.cmd, $(DOCBOOKS)) \</div><div class='ctx'> 	$(index)</div><div class='ctx'> </div><div class='ctx'> clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man</div><div class='hunk'>@@ -273,6 +273,6 @@ cleandocs:</div><div class='ctx'> 	$(Q)rm -rf $(call objectify, $(clean-dirs))</div><div class='ctx'> </div><div class='ctx'> # Declare the contents of the .PHONY variable as phony.  We keep that</div><div class='del'>-# information in a variable se we can use it in if_changed and friends.</div><div class='add'>+# information in a variable so we can use it in if_changed and friends.</div><div class='ctx'> </div><div class='ctx'> .PHONY: $(PHONY)</div><div class='head'>diff --git a/Documentation/DocBook/alsa-driver-api.tmpl b/Documentation/DocBook/alsa-driver-api.tmpl<br/>deleted file mode 100644<br/>index 53f439dcc94b..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/alsa-driver-api.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/alsa-driver-api.tmpl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,142 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='del'>-	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Header  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;book id="ALSA-Driver-API"&gt;</div><div class='del'>-  &lt;bookinfo&gt;</div><div class='del'>-    &lt;title&gt;The ALSA Driver API&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;legalnotice&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    This document is free; you can redistribute it and/or modify it</div><div class='del'>-    under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    This document is distributed in the hope that it will be useful,</div><div class='del'>-    but &lt;emphasis&gt;WITHOUT ANY WARRANTY&lt;/emphasis&gt;; without even the</div><div class='del'>-    implied warranty of &lt;emphasis&gt;MERCHANTABILITY or FITNESS FOR A</div><div class='del'>-    PARTICULAR PURPOSE&lt;/emphasis&gt;. See the GNU General Public License</div><div class='del'>-    for more details.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    You should have received a copy of the GNU General Public</div><div class='del'>-    License along with this program; if not, write to the Free</div><div class='del'>-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='del'>-    MA 02111-1307 USA</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/legalnotice&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-&lt;toc&gt;&lt;/toc&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter&gt;&lt;title&gt;Management of Cards and Devices&lt;/title&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;Card Management&lt;/title&gt;</div><div class='del'>-!Esound/core/init.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;Device Components&lt;/title&gt;</div><div class='del'>-!Esound/core/device.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;Module requests and Device File Entries&lt;/title&gt;</div><div class='del'>-!Esound/core/sound.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;Memory Management Helpers&lt;/title&gt;</div><div class='del'>-!Esound/core/memory.c</div><div class='del'>-!Esound/core/memalloc.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter&gt;&lt;title&gt;PCM API&lt;/title&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;PCM Core&lt;/title&gt;</div><div class='del'>-!Esound/core/pcm.c</div><div class='del'>-!Esound/core/pcm_lib.c</div><div class='del'>-!Esound/core/pcm_native.c</div><div class='del'>-!Iinclude/sound/pcm.h</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;PCM Format Helpers&lt;/title&gt;</div><div class='del'>-!Esound/core/pcm_misc.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;PCM Memory Management&lt;/title&gt;</div><div class='del'>-!Esound/core/pcm_memory.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;PCM DMA Engine API&lt;/title&gt;</div><div class='del'>-!Esound/core/pcm_dmaengine.c</div><div class='del'>-!Iinclude/sound/dmaengine_pcm.h</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter&gt;&lt;title&gt;Control/Mixer API&lt;/title&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;General Control Interface&lt;/title&gt;</div><div class='del'>-!Esound/core/control.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;AC97 Codec API&lt;/title&gt;</div><div class='del'>-!Esound/pci/ac97/ac97_codec.c</div><div class='del'>-!Esound/pci/ac97/ac97_pcm.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;Virtual Master Control API&lt;/title&gt;</div><div class='del'>-!Esound/core/vmaster.c</div><div class='del'>-!Iinclude/sound/control.h</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter&gt;&lt;title&gt;MIDI API&lt;/title&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;Raw MIDI API&lt;/title&gt;</div><div class='del'>-!Esound/core/rawmidi.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;MPU401-UART API&lt;/title&gt;</div><div class='del'>-!Esound/drivers/mpu401/mpu401_uart.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter&gt;&lt;title&gt;Proc Info API&lt;/title&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;Proc Info Interface&lt;/title&gt;</div><div class='del'>-!Esound/core/info.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter&gt;&lt;title&gt;Compress Offload&lt;/title&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;Compress Offload API&lt;/title&gt;</div><div class='del'>-!Esound/core/compress_offload.c</div><div class='del'>-!Iinclude/uapi/sound/compress_offload.h</div><div class='del'>-!Iinclude/uapi/sound/compress_params.h</div><div class='del'>-!Iinclude/sound/compress_driver.h</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter&gt;&lt;title&gt;ASoC&lt;/title&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;ASoC Core API&lt;/title&gt;</div><div class='del'>-!Iinclude/sound/soc.h</div><div class='del'>-!Esound/soc/soc-core.c</div><div class='del'>-&lt;!-- !Esound/soc/soc-cache.c no docbook comments here --&gt;</div><div class='del'>-!Esound/soc/soc-devres.c</div><div class='del'>-!Esound/soc/soc-io.c</div><div class='del'>-!Esound/soc/soc-pcm.c</div><div class='del'>-!Esound/soc/soc-ops.c</div><div class='del'>-!Esound/soc/soc-compress.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;ASoC DAPM API&lt;/title&gt;</div><div class='del'>-!Esound/soc/soc-dapm.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;ASoC DMA Engine API&lt;/title&gt;</div><div class='del'>-!Esound/soc/soc-generic-dmaengine-pcm.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter&gt;&lt;title&gt;Miscellaneous Functions&lt;/title&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;Hardware-Dependent Devices API&lt;/title&gt;</div><div class='del'>-!Esound/core/hwdep.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;Jack Abstraction Layer API&lt;/title&gt;</div><div class='del'>-!Iinclude/sound/jack.h</div><div class='del'>-!Esound/core/jack.c</div><div class='del'>-!Esound/soc/soc-jack.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;ISA DMA Helpers&lt;/title&gt;</div><div class='del'>-!Esound/core/isadma.c</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-     &lt;sect1&gt;&lt;title&gt;Other Helper Macros&lt;/title&gt;</div><div class='del'>-!Iinclude/sound/core.h</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/Documentation/DocBook/crypto-API.tmpl b/Documentation/DocBook/crypto-API.tmpl<br/>deleted file mode 100644<br/>index 088b79c341ff..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/crypto-API.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/crypto-API.tmpl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2092 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='del'>-	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="KernelCryptoAPI"&gt;</div><div class='del'>- &lt;bookinfo&gt;</div><div class='del'>-  &lt;title&gt;Linux Kernel Crypto API&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-  &lt;authorgroup&gt;</div><div class='del'>-   &lt;author&gt;</div><div class='del'>-    &lt;firstname&gt;Stephan&lt;/firstname&gt;</div><div class='del'>-    &lt;surname&gt;Mueller&lt;/surname&gt;</div><div class='del'>-    &lt;affiliation&gt;</div><div class='del'>-     &lt;address&gt;</div><div class='del'>-      &lt;email&gt;smueller@chronox.de&lt;/email&gt;</div><div class='del'>-     &lt;/address&gt;</div><div class='del'>-    &lt;/affiliation&gt;</div><div class='del'>-   &lt;/author&gt;</div><div class='del'>-   &lt;author&gt;</div><div class='del'>-    &lt;firstname&gt;Marek&lt;/firstname&gt;</div><div class='del'>-    &lt;surname&gt;Vasut&lt;/surname&gt;</div><div class='del'>-    &lt;affiliation&gt;</div><div class='del'>-     &lt;address&gt;</div><div class='del'>-      &lt;email&gt;marek@denx.de&lt;/email&gt;</div><div class='del'>-     &lt;/address&gt;</div><div class='del'>-    &lt;/affiliation&gt;</div><div class='del'>-   &lt;/author&gt;</div><div class='del'>-  &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-  &lt;copyright&gt;</div><div class='del'>-   &lt;year&gt;2014&lt;/year&gt;</div><div class='del'>-   &lt;holder&gt;Stephan Mueller&lt;/holder&gt;</div><div class='del'>-  &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;legalnotice&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This documentation is free software; you can redistribute</div><div class='del'>-     it and/or modify it under the terms of the GNU General Public</div><div class='del'>-     License as published by the Free Software Foundation; either</div><div class='del'>-     version 2 of the License, or (at your option) any later</div><div class='del'>-     version.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This program is distributed in the hope that it will be</div><div class='del'>-     useful, but WITHOUT ANY WARRANTY; without even the implied</div><div class='del'>-     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>-     See the GNU General Public License for more details.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     You should have received a copy of the GNU General Public</div><div class='del'>-     License along with this program; if not, write to the Free</div><div class='del'>-     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='del'>-     MA 02111-1307 USA</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     For more details see the file COPYING in the source</div><div class='del'>-     distribution of Linux.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/legalnotice&gt;</div><div class='del'>- &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>- &lt;toc&gt;&lt;/toc&gt;</div><div class='del'>-</div><div class='del'>- &lt;chapter id="Intro"&gt;</div><div class='del'>-  &lt;title&gt;Kernel Crypto API Interface Specification&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The kernel crypto API offers a rich set of cryptographic ciphers as</div><div class='del'>-     well as other data transformation mechanisms and methods to invoke</div><div class='del'>-     these. This document contains a description of the API and provides</div><div class='del'>-     example code.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     To understand and properly use the kernel crypto API a brief</div><div class='del'>-     explanation of its structure is given. Based on the architecture,</div><div class='del'>-     the API can be separated into different components. Following the</div><div class='del'>-     architecture specification, hints to developers of ciphers are</div><div class='del'>-     provided. Pointers to the API function call  documentation are</div><div class='del'>-     given at the end.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The kernel crypto API refers to all algorithms as "transformations".</div><div class='del'>-     Therefore, a cipher handle variable usually has the name "tfm".</div><div class='del'>-     Besides cryptographic operations, the kernel crypto API also knows</div><div class='del'>-     compression transformations and handles them the same way as ciphers.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The kernel crypto API serves the following entity types:</div><div class='del'>-</div><div class='del'>-     &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;consumers requesting cryptographic services&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;data transformation implementations (typically ciphers)</div><div class='del'>-       that can be called by consumers using the kernel crypto</div><div class='del'>-       API&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-     &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     This specification is intended for consumers of the kernel crypto</div><div class='del'>-     API as well as for developers implementing ciphers. This API</div><div class='del'>-     specification, however, does not discuss all API calls available</div><div class='del'>-     to data transformation implementations (i.e. implementations of</div><div class='del'>-     ciphers and other transformations (such as CRC or even compression</div><div class='del'>-     algorithms) that can register with the kernel crypto API).</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Note: The terms "transformation" and cipher algorithm are used</div><div class='del'>-     interchangeably.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Terminology&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The transformation implementation is an actual code or interface</div><div class='del'>-     to hardware which implements a certain transformation with precisely</div><div class='del'>-     defined behavior.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The transformation object (TFM) is an instance of a transformation</div><div class='del'>-     implementation. There can be multiple transformation objects</div><div class='del'>-     associated with a single transformation implementation. Each of</div><div class='del'>-     those transformation objects is held by a crypto API consumer or</div><div class='del'>-     another transformation. Transformation object is allocated when a</div><div class='del'>-     crypto API consumer requests a transformation implementation.</div><div class='del'>-     The consumer is then provided with a structure, which contains</div><div class='del'>-     a transformation object (TFM).</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The structure that contains transformation objects may also be</div><div class='del'>-     referred to as a "cipher handle". Such a cipher handle is always</div><div class='del'>-     subject to the following phases that are reflected in the API calls</div><div class='del'>-     applicable to such a cipher handle:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;orderedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;Initialization of a cipher handle.&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;Execution of all intended cipher operations applicable</div><div class='del'>-      for the handle where the cipher handle must be furnished to</div><div class='del'>-      every API call.&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;Destruction of a cipher handle.&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/orderedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     When using the initialization API calls, a cipher handle is</div><div class='del'>-     created and returned to the consumer. Therefore, please refer</div><div class='del'>-     to all initialization API calls that refer to the data</div><div class='del'>-     structure type a consumer is expected to receive and subsequently</div><div class='del'>-     to use. The initialization API calls have all the same naming</div><div class='del'>-     conventions of crypto_alloc_*.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The transformation context is private data associated with</div><div class='del'>-     the transformation object.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="Architecture"&gt;&lt;title&gt;Kernel Crypto API Architecture&lt;/title&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Cipher algorithm types&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The kernel crypto API provides different API calls for the</div><div class='del'>-     following cipher types:</div><div class='del'>-</div><div class='del'>-     &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Symmetric ciphers&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;AEAD ciphers&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Message digest, including keyed message digest&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Random number generation&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;User space interface&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-     &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Ciphers And Templates&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The kernel crypto API provides implementations of single block</div><div class='del'>-     ciphers and message digests. In addition, the kernel crypto API</div><div class='del'>-     provides numerous "templates" that can be used in conjunction</div><div class='del'>-     with the single block ciphers and message digests. Templates</div><div class='del'>-     include all types of block chaining mode, the HMAC mechanism, etc.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Single block ciphers and message digests can either be directly</div><div class='del'>-     used by a caller or invoked together with a template to form</div><div class='del'>-     multi-block ciphers or keyed message digests.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     A single block cipher may even be called with multiple templates.</div><div class='del'>-     However, templates cannot be used without a single cipher.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     See /proc/crypto and search for "name". For example:</div><div class='del'>-</div><div class='del'>-     &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;aes&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;ecb(aes)&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;cmac(aes)&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;ccm(aes)&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;rfc4106(gcm(aes))&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;sha1&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;hmac(sha1)&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;authenc(hmac(sha1),cbc(aes))&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-     &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     In these examples, "aes" and "sha1" are the ciphers and all</div><div class='del'>-     others are the templates.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Synchronous And Asynchronous Operation&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The kernel crypto API provides synchronous and asynchronous</div><div class='del'>-     API operations.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     When using the synchronous API operation, the caller invokes</div><div class='del'>-     a cipher operation which is performed synchronously by the</div><div class='del'>-     kernel crypto API. That means, the caller waits until the</div><div class='del'>-     cipher operation completes. Therefore, the kernel crypto API</div><div class='del'>-     calls work like regular function calls. For synchronous</div><div class='del'>-     operation, the set of API calls is small and conceptually</div><div class='del'>-     similar to any other crypto library.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Asynchronous operation is provided by the kernel crypto API</div><div class='del'>-     which implies that the invocation of a cipher operation will</div><div class='del'>-     complete almost instantly. That invocation triggers the</div><div class='del'>-     cipher operation but it does not signal its completion. Before</div><div class='del'>-     invoking a cipher operation, the caller must provide a callback</div><div class='del'>-     function the kernel crypto API can invoke to signal the</div><div class='del'>-     completion of the cipher operation. Furthermore, the caller</div><div class='del'>-     must ensure it can handle such asynchronous events by applying</div><div class='del'>-     appropriate locking around its data. The kernel crypto API</div><div class='del'>-     does not perform any special serialization operation to protect</div><div class='del'>-     the caller's data integrity.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Crypto API Cipher References And Priority&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     A cipher is referenced by the caller with a string. That string</div><div class='del'>-     has the following semantics:</div><div class='del'>-</div><div class='del'>-     &lt;programlisting&gt;</div><div class='del'>-	template(single block cipher)</div><div class='del'>-     &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-     where "template" and "single block cipher" is the aforementioned</div><div class='del'>-     template and single block cipher, respectively. If applicable,</div><div class='del'>-     additional templates may enclose other templates, such as</div><div class='del'>-</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-	template1(template2(single block cipher)))</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The kernel crypto API may provide multiple implementations of a</div><div class='del'>-     template or a single block cipher. For example, AES on newer</div><div class='del'>-     Intel hardware has the following implementations: AES-NI,</div><div class='del'>-     assembler implementation, or straight C. Now, when using the</div><div class='del'>-     string "aes" with the kernel crypto API, which cipher</div><div class='del'>-     implementation is used? The answer to that question is the</div><div class='del'>-     priority number assigned to each cipher implementation by the</div><div class='del'>-     kernel crypto API. When a caller uses the string to refer to a</div><div class='del'>-     cipher during initialization of a cipher handle, the kernel</div><div class='del'>-     crypto API looks up all implementations providing an</div><div class='del'>-     implementation with that name and selects the implementation</div><div class='del'>-     with the highest priority.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Now, a caller may have the need to refer to a specific cipher</div><div class='del'>-     implementation and thus does not want to rely on the</div><div class='del'>-     priority-based selection. To accommodate this scenario, the</div><div class='del'>-     kernel crypto API allows the cipher implementation to register</div><div class='del'>-     a unique name in addition to common names. When using that</div><div class='del'>-     unique name, a caller is therefore always sure to refer to</div><div class='del'>-     the intended cipher implementation.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The list of available ciphers is given in /proc/crypto. However,</div><div class='del'>-     that list does not specify all possible permutations of</div><div class='del'>-     templates and ciphers. Each block listed in /proc/crypto may</div><div class='del'>-     contain the following information -- if one of the components</div><div class='del'>-     listed as follows are not applicable to a cipher, it is not</div><div class='del'>-     displayed:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;name: the generic name of the cipher that is subject</div><div class='del'>-       to the priority-based selection -- this name can be used by</div><div class='del'>-       the cipher allocation API calls (all names listed above are</div><div class='del'>-       examples for such generic names)&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;driver: the unique name of the cipher -- this name can</div><div class='del'>-       be used by the cipher allocation API calls&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;module: the kernel module providing the cipher</div><div class='del'>-       implementation (or "kernel" for statically linked ciphers)&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;priority: the priority value of the cipher implementation&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;refcnt: the reference count of the respective cipher</div><div class='del'>-       (i.e. the number of current consumers of this cipher)&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;selftest: specification whether the self test for the</div><div class='del'>-       cipher passed&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;type:</div><div class='del'>-       &lt;itemizedlist&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;skcipher for symmetric key ciphers&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;cipher for single block ciphers that may be used with</div><div class='del'>-          an additional template&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;shash for synchronous message digest&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;ahash for asynchronous message digest&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;aead for AEAD cipher type&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;compression for compression type transformations&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;rng for random number generator&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;givcipher for cipher with associated IV generator</div><div class='del'>-          (see the geniv entry below for the specification of the</div><div class='del'>-          IV generator type used by the cipher implementation)&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-       &lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;blocksize: blocksize of cipher in bytes&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;keysize: key size in bytes&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;ivsize: IV size in bytes&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;seedsize: required size of seed data for random number</div><div class='del'>-       generator&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;digestsize: output size of the message digest&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;geniv: IV generation type:</div><div class='del'>-       &lt;itemizedlist&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;eseqiv for encrypted sequence number based IV</div><div class='del'>-          generation&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;seqiv for sequence number based IV generation&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;chainiv for chain iv generation&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;&amp;lt;builtin&amp;gt; is a marker that the cipher implements</div><div class='del'>-          IV generation and handling as it is specific to the given</div><div class='del'>-          cipher&lt;/para&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-       &lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Key Sizes&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     When allocating a cipher handle, the caller only specifies the</div><div class='del'>-     cipher type. Symmetric ciphers, however, typically support</div><div class='del'>-     multiple key sizes (e.g. AES-128 vs. AES-192 vs. AES-256).</div><div class='del'>-     These key sizes are determined with the length of the provided</div><div class='del'>-     key. Thus, the kernel crypto API does not provide a separate</div><div class='del'>-     way to select the particular symmetric cipher key size.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Cipher Allocation Type And Masks&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The different cipher handle allocation functions allow the</div><div class='del'>-     specification of a type and mask flag. Both parameters have</div><div class='del'>-     the following meaning (and are therefore not covered in the</div><div class='del'>-     subsequent sections).</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The type flag specifies the type of the cipher algorithm.</div><div class='del'>-     The caller usually provides a 0 when the caller wants the</div><div class='del'>-     default handling. Otherwise, the caller may provide the</div><div class='del'>-     following selections which match the aforementioned cipher</div><div class='del'>-     types:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_CIPHER Single block cipher&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_COMPRESS Compression&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-     &lt;para&gt;CRYPTO_ALG_TYPE_AEAD Authenticated Encryption with</div><div class='del'>-      Associated Data (MAC)&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_BLKCIPHER Synchronous multi-block cipher&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_ABLKCIPHER Asynchronous multi-block cipher&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_GIVCIPHER Asynchronous multi-block</div><div class='del'>-       cipher packed together with an IV generator (see geniv field</div><div class='del'>-       in the /proc/crypto listing for the known IV generators)&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_DIGEST Raw message digest&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_HASH Alias for CRYPTO_ALG_TYPE_DIGEST&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_SHASH Synchronous multi-block hash&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_AHASH Asynchronous multi-block hash&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_RNG Random Number Generation&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_AKCIPHER Asymmetric cipher&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;CRYPTO_ALG_TYPE_PCOMPRESS Enhanced version of</div><div class='del'>-       CRYPTO_ALG_TYPE_COMPRESS allowing for segmented compression /</div><div class='del'>-       decompression instead of performing the operation on one</div><div class='del'>-       segment only. CRYPTO_ALG_TYPE_PCOMPRESS is intended to replace</div><div class='del'>-       CRYPTO_ALG_TYPE_COMPRESS once existing consumers are converted.&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The mask flag restricts the type of cipher. The only allowed</div><div class='del'>-     flag is CRYPTO_ALG_ASYNC to restrict the cipher lookup function</div><div class='del'>-     to asynchronous ciphers. Usually, a caller provides a 0 for the</div><div class='del'>-     mask flag.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     When the caller provides a mask and type specification, the</div><div class='del'>-     caller limits the search the kernel crypto API can perform for</div><div class='del'>-     a suitable cipher implementation for the given cipher name.</div><div class='del'>-     That means, even when a caller uses a cipher name that exists</div><div class='del'>-     during its initialization call, the kernel crypto API may not</div><div class='del'>-     select it due to the used type and mask field.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Internal Structure of Kernel Crypto API&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The kernel crypto API has an internal structure where a cipher</div><div class='del'>-     implementation may use many layers and indirections. This section</div><div class='del'>-     shall help to clarify how the kernel crypto API uses</div><div class='del'>-     various components to implement the complete cipher.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The following subsections explain the internal structure based</div><div class='del'>-     on existing cipher implementations. The first section addresses</div><div class='del'>-     the most complex scenario where all other scenarios form a logical</div><div class='del'>-     subset.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;Generic AEAD Cipher Structure&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The following ASCII art decomposes the kernel crypto API layers</div><div class='del'>-      when using the AEAD cipher with the automated IV generation. The</div><div class='del'>-      shown example is used by the IPSEC layer.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      For other use cases of AEAD ciphers, the ASCII art applies as</div><div class='del'>-      well, but the caller may not use the AEAD cipher with a separate</div><div class='del'>-      IV generator. In this case, the caller must generate the IV.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The depicted example decomposes the AEAD cipher of GCM(AES) based</div><div class='del'>-      on the generic C implementations (gcm.c, aes-generic.c, ctr.c,</div><div class='del'>-      ghash-generic.c, seqiv.c). The generic implementation serves as an</div><div class='del'>-      example showing the complete logic of the kernel crypto API.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      It is possible that some streamlined cipher implementations (like</div><div class='del'>-      AES-NI) provide implementations merging aspects which in the view</div><div class='del'>-      of the kernel crypto API cannot be decomposed into layers any more.</div><div class='del'>-      In case of the AES-NI implementation, the CTR mode, the GHASH</div><div class='del'>-      implementation and the AES cipher are all merged into one cipher</div><div class='del'>-      implementation registered with the kernel crypto API. In this case,</div><div class='del'>-      the concept described by the following ASCII art applies too. However,</div><div class='del'>-      the decomposition of GCM into the individual sub-components</div><div class='del'>-      by the kernel crypto API is not done any more.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Each block in the following ASCII art is an independent cipher</div><div class='del'>-      instance obtained from the kernel crypto API. Each block</div><div class='del'>-      is accessed by the caller or by other blocks using the API functions</div><div class='del'>-      defined by the kernel crypto API for the cipher implementation type.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The blocks below indicate the cipher type as well as the specific</div><div class='del'>-      logic implemented in the cipher.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The ASCII art picture also indicates the call structure, i.e. who</div><div class='del'>-      calls which component. The arrows point to the invoked block</div><div class='del'>-      where the caller uses the API applicable to the cipher type</div><div class='del'>-      specified for the block.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-kernel crypto API                                |   IPSEC Layer</div><div class='del'>-                                                 |</div><div class='del'>-+-----------+                                    |</div><div class='del'>-|           |            (1)</div><div class='del'>-|   aead    | &lt;-----------------------------------  esp_output</div><div class='del'>-|  (seqiv)  | ---+</div><div class='del'>-+-----------+    |</div><div class='del'>-                 | (2)</div><div class='del'>-+-----------+    |</div><div class='del'>-|           | &lt;--+                (2)</div><div class='del'>-|   aead    | &lt;-----------------------------------  esp_input</div><div class='del'>-|   (gcm)   | ------------+</div><div class='del'>-+-----------+             |</div><div class='del'>-      | (3)               | (5)</div><div class='del'>-      v                   v</div><div class='del'>-+-----------+       +-----------+</div><div class='del'>-|           |       |           |</div><div class='del'>-|  skcipher |       |   ahash   |</div><div class='del'>-|   (ctr)   | ---+  |  (ghash)  |</div><div class='del'>-+-----------+    |  +-----------+</div><div class='del'>-                 |</div><div class='del'>-+-----------+    | (4)</div><div class='del'>-|           | &lt;--+</div><div class='del'>-|   cipher  |</div><div class='del'>-|   (aes)   |</div><div class='del'>-+-----------+</div><div class='del'>-]]&gt;</div><div class='del'>-     &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The following call sequence is applicable when the IPSEC layer</div><div class='del'>-      triggers an encryption operation with the esp_output function. During</div><div class='del'>-      configuration, the administrator set up the use of rfc4106(gcm(aes)) as</div><div class='del'>-      the cipher for ESP. The following call sequence is now depicted in the</div><div class='del'>-      ASCII art above:</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;orderedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        esp_output() invokes crypto_aead_encrypt() to trigger an encryption</div><div class='del'>-        operation of the AEAD cipher with IV generator.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        In case of GCM, the SEQIV implementation is registered as GIVCIPHER</div><div class='del'>-        in crypto_rfc4106_alloc().</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        The SEQIV performs its operation to generate an IV where the core</div><div class='del'>-        function is seqiv_geniv().</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        Now, SEQIV uses the AEAD API function calls to invoke the associated</div><div class='del'>-        AEAD cipher. In our case, during the instantiation of SEQIV, the</div><div class='del'>-        cipher handle for GCM is provided to SEQIV. This means that SEQIV</div><div class='del'>-        invokes AEAD cipher operations with the GCM cipher handle.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        During instantiation of the GCM handle, the CTR(AES) and GHASH</div><div class='del'>-        ciphers are instantiated. The cipher handles for CTR(AES) and GHASH</div><div class='del'>-        are retained for later use.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        The GCM implementation is responsible to invoke the CTR mode AES and</div><div class='del'>-        the GHASH cipher in the right manner to implement the GCM</div><div class='del'>-        specification.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        The GCM AEAD cipher type implementation now invokes the SKCIPHER API</div><div class='del'>-        with the instantiated CTR(AES) cipher handle.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-	During instantiation of the CTR(AES) cipher, the CIPHER type</div><div class='del'>-	implementation of AES is instantiated. The cipher handle for AES is</div><div class='del'>-	retained.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        That means that the SKCIPHER implementation of CTR(AES) only</div><div class='del'>-        implements the CTR block chaining mode. After performing the block</div><div class='del'>-        chaining operation, the CIPHER implementation of AES is invoked.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        The SKCIPHER of CTR(AES) now invokes the CIPHER API with the AES</div><div class='del'>-        cipher handle to encrypt one block.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        The GCM AEAD implementation also invokes the GHASH cipher</div><div class='del'>-        implementation via the AHASH API.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-     &lt;/orderedlist&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      When the IPSEC layer triggers the esp_input() function, the same call</div><div class='del'>-      sequence is followed with the only difference that the operation starts</div><div class='del'>-      with step (2).</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;Generic Block Cipher Structure&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Generic block ciphers follow the same concept as depicted with the ASCII</div><div class='del'>-      art picture above.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      For example, CBC(AES) is implemented with cbc.c, and aes-generic.c. The</div><div class='del'>-      ASCII art picture above applies as well with the difference that only</div><div class='del'>-      step (4) is used and the SKCIPHER block chaining mode is CBC.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;Generic Keyed Message Digest Structure&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Keyed message digest implementations again follow the same concept as</div><div class='del'>-      depicted in the ASCII art picture above.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      For example, HMAC(SHA256) is implemented with hmac.c and</div><div class='del'>-      sha256_generic.c. The following ASCII art illustrates the</div><div class='del'>-      implementation:</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-kernel crypto API            |       Caller</div><div class='del'>-                             |</div><div class='del'>-+-----------+         (1)    |</div><div class='del'>-|           | &lt;------------------  some_function</div><div class='del'>-|   ahash   |</div><div class='del'>-|   (hmac)  | ---+</div><div class='del'>-+-----------+    |</div><div class='del'>-                 | (2)</div><div class='del'>-+-----------+    |</div><div class='del'>-|           | &lt;--+</div><div class='del'>-|   shash   |</div><div class='del'>-|  (sha256) |</div><div class='del'>-+-----------+</div><div class='del'>-]]&gt;</div><div class='del'>-     &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The following call sequence is applicable when a caller triggers</div><div class='del'>-      an HMAC operation:</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;orderedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        The AHASH API functions are invoked by the caller. The HMAC</div><div class='del'>-        implementation performs its operation as needed.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        During initialization of the HMAC cipher, the SHASH cipher type of</div><div class='del'>-        SHA256 is instantiated. The cipher handle for the SHA256 instance is</div><div class='del'>-        retained.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        At one time, the HMAC implementation requires a SHA256 operation</div><div class='del'>-        where the SHA256 cipher handle is used.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        The HMAC instance now invokes the SHASH API with the SHA256</div><div class='del'>-        cipher handle to calculate the message digest.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-     &lt;/orderedlist&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="Development"&gt;&lt;title&gt;Developing Cipher Algorithms&lt;/title&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Registering And Unregistering Transformation&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     There are three distinct types of registration functions in</div><div class='del'>-     the Crypto API. One is used to register a generic cryptographic</div><div class='del'>-     transformation, while the other two are specific to HASH</div><div class='del'>-     transformations and COMPRESSion. We will discuss the latter</div><div class='del'>-     two in a separate chapter, here we will only look at the</div><div class='del'>-     generic ones.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Before discussing the register functions, the data structure</div><div class='del'>-     to be filled with each, struct crypto_alg, must be considered</div><div class='del'>-     -- see below for a description of this data structure.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The generic registration functions can be found in</div><div class='del'>-     include/linux/crypto.h and their definition can be seen below.</div><div class='del'>-     The former function registers a single transformation, while</div><div class='del'>-     the latter works on an array of transformation descriptions.</div><div class='del'>-     The latter is useful when registering transformations in bulk,</div><div class='del'>-     for example when a driver implements multiple transformations.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-   int crypto_register_alg(struct crypto_alg *alg);</div><div class='del'>-   int crypto_register_algs(struct crypto_alg *algs, int count);</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The counterparts to those functions are listed below.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-   int crypto_unregister_alg(struct crypto_alg *alg);</div><div class='del'>-   int crypto_unregister_algs(struct crypto_alg *algs, int count);</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Notice that both registration and unregistration functions</div><div class='del'>-     do return a value, so make sure to handle errors. A return</div><div class='del'>-     code of zero implies success. Any return code &amp;lt; 0 implies</div><div class='del'>-     an error.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The bulk registration/unregistration functions</div><div class='del'>-     register/unregister each transformation in the given array of</div><div class='del'>-     length count.  They handle errors as follows:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       crypto_register_algs() succeeds if and only if it</div><div class='del'>-       successfully registers all the given transformations. If an</div><div class='del'>-       error occurs partway through, then it rolls back successful</div><div class='del'>-       registrations before returning the error code. Note that if</div><div class='del'>-       a driver needs to handle registration errors for individual</div><div class='del'>-       transformations, then it will need to use the non-bulk</div><div class='del'>-       function crypto_register_alg() instead.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       crypto_unregister_algs() tries to unregister all the given</div><div class='del'>-       transformations, continuing on error. It logs errors and</div><div class='del'>-       always returns zero.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Single-Block Symmetric Ciphers [CIPHER]&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Example of transformations: aes, arc4, ...</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     This section describes the simplest of all transformation</div><div class='del'>-     implementations, that being the CIPHER type used for symmetric</div><div class='del'>-     ciphers. The CIPHER type is used for transformations which</div><div class='del'>-     operate on exactly one block at a time and there are no</div><div class='del'>-     dependencies between blocks at all.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;Registration specifics&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The registration of [CIPHER] algorithm is specific in that</div><div class='del'>-      struct crypto_alg field .cra_type is empty. The .cra_u.cipher</div><div class='del'>-      has to be filled in with proper callbacks to implement this</div><div class='del'>-      transformation.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      See struct cipher_alg below.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;Cipher Definition With struct cipher_alg&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Struct cipher_alg defines a single block cipher.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Here are schematics of how these functions are called when</div><div class='del'>-      operated from other part of the kernel. Note that the</div><div class='del'>-      .cia_setkey() call might happen before or after any of these</div><div class='del'>-      schematics happen, but must not happen during any of these</div><div class='del'>-      are in-flight.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-         KEY ---.    PLAINTEXT ---.</div><div class='del'>-                v                 v</div><div class='del'>-          .cia_setkey() -&amp;gt; .cia_encrypt()</div><div class='del'>-                                  |</div><div class='del'>-                                  '-----&amp;gt; CIPHERTEXT</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Please note that a pattern where .cia_setkey() is called</div><div class='del'>-      multiple times is also valid:</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-  KEY1 --.    PLAINTEXT1 --.         KEY2 --.    PLAINTEXT2 --.</div><div class='del'>-         v                 v                v                 v</div><div class='del'>-   .cia_setkey() -&amp;gt; .cia_encrypt() -&amp;gt; .cia_setkey() -&amp;gt; .cia_encrypt()</div><div class='del'>-                           |                                  |</div><div class='del'>-                           '---&amp;gt; CIPHERTEXT1                  '---&amp;gt; CIPHERTEXT2</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Multi-Block Ciphers&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Example of transformations: cbc(aes), ecb(arc4), ...</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     This section describes the multi-block cipher transformation</div><div class='del'>-     implementations. The multi-block ciphers are</div><div class='del'>-     used for transformations which operate on scatterlists of</div><div class='del'>-     data supplied to the transformation functions. They output</div><div class='del'>-     the result into a scatterlist of data as well.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;Registration Specifics&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The registration of multi-block cipher algorithms</div><div class='del'>-      is one of the most standard procedures throughout the crypto API.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Note, if a cipher implementation requires a proper alignment</div><div class='del'>-      of data, the caller should use the functions of</div><div class='del'>-      crypto_skcipher_alignmask() to identify a memory alignment mask.</div><div class='del'>-      The kernel crypto API is able to process requests that are unaligned.</div><div class='del'>-      This implies, however, additional overhead as the kernel</div><div class='del'>-      crypto API needs to perform the realignment of the data which</div><div class='del'>-      may imply moving of data.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;Cipher Definition With struct blkcipher_alg and ablkcipher_alg&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Struct blkcipher_alg defines a synchronous block cipher whereas</div><div class='del'>-      struct ablkcipher_alg defines an asynchronous block cipher.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Please refer to the single block cipher description for schematics</div><div class='del'>-      of the block cipher usage.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;Specifics Of Asynchronous Multi-Block Cipher&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      There are a couple of specifics to the asynchronous interface.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      First of all, some of the drivers will want to use the</div><div class='del'>-      Generic ScatterWalk in case the hardware needs to be fed</div><div class='del'>-      separate chunks of the scatterlist which contains the</div><div class='del'>-      plaintext and will contain the ciphertext. Please refer</div><div class='del'>-      to the ScatterWalk interface offered by the Linux kernel</div><div class='del'>-      scatter / gather list implementation.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Hashing [HASH]&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Example of transformations: crc32, md5, sha1, sha256,...</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;Registering And Unregistering The Transformation&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      There are multiple ways to register a HASH transformation,</div><div class='del'>-      depending on whether the transformation is synchronous [SHASH]</div><div class='del'>-      or asynchronous [AHASH] and the amount of HASH transformations</div><div class='del'>-      we are registering. You can find the prototypes defined in</div><div class='del'>-      include/crypto/internal/hash.h:</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;programlisting&gt;</div><div class='del'>-   int crypto_register_ahash(struct ahash_alg *alg);</div><div class='del'>-</div><div class='del'>-   int crypto_register_shash(struct shash_alg *alg);</div><div class='del'>-   int crypto_register_shashes(struct shash_alg *algs, int count);</div><div class='del'>-     &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The respective counterparts for unregistering the HASH</div><div class='del'>-      transformation are as follows:</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;programlisting&gt;</div><div class='del'>-   int crypto_unregister_ahash(struct ahash_alg *alg);</div><div class='del'>-</div><div class='del'>-   int crypto_unregister_shash(struct shash_alg *alg);</div><div class='del'>-   int crypto_unregister_shashes(struct shash_alg *algs, int count);</div><div class='del'>-     &lt;/programlisting&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;Cipher Definition With struct shash_alg and ahash_alg&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Here are schematics of how these functions are called when</div><div class='del'>-      operated from other part of the kernel. Note that the .setkey()</div><div class='del'>-      call might happen before or after any of these schematics happen,</div><div class='del'>-      but must not happen during any of these are in-flight. Please note</div><div class='del'>-      that calling .init() followed immediately by .finish() is also a</div><div class='del'>-      perfectly valid transformation.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;programlisting&gt;</div><div class='del'>-   I)   DATA -----------.</div><div class='del'>-                        v</div><div class='del'>-         .init() -&amp;gt; .update() -&amp;gt; .final()      ! .update() might not be called</div><div class='del'>-                     ^    |         |            at all in this scenario.</div><div class='del'>-                     '----'         '---&amp;gt; HASH</div><div class='del'>-</div><div class='del'>-   II)  DATA -----------.-----------.</div><div class='del'>-                        v           v</div><div class='del'>-         .init() -&amp;gt; .update() -&amp;gt; .finup()      ! .update() may not be called</div><div class='del'>-                     ^    |         |            at all in this scenario.</div><div class='del'>-                     '----'         '---&amp;gt; HASH</div><div class='del'>-</div><div class='del'>-   III) DATA -----------.</div><div class='del'>-                        v</div><div class='del'>-                    .digest()                  ! The entire process is handled</div><div class='del'>-                        |                        by the .digest() call.</div><div class='del'>-                        '---------------&amp;gt; HASH</div><div class='del'>-     &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Here is a schematic of how the .export()/.import() functions are</div><div class='del'>-      called when used from another part of the kernel.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;programlisting&gt;</div><div class='del'>-   KEY--.                 DATA--.</div><div class='del'>-        v                       v                  ! .update() may not be called</div><div class='del'>-    .setkey() -&amp;gt; .init() -&amp;gt; .update() -&amp;gt; .export()   at all in this scenario.</div><div class='del'>-                             ^     |         |</div><div class='del'>-                             '-----'         '--&amp;gt; PARTIAL_HASH</div><div class='del'>-</div><div class='del'>-   ----------- other transformations happen here -----------</div><div class='del'>-</div><div class='del'>-   PARTIAL_HASH--.   DATA1--.</div><div class='del'>-                 v          v</div><div class='del'>-             .import -&amp;gt; .update() -&amp;gt; .final()     ! .update() may not be called</div><div class='del'>-                         ^    |         |           at all in this scenario.</div><div class='del'>-                         '----'         '--&amp;gt; HASH1</div><div class='del'>-</div><div class='del'>-   PARTIAL_HASH--.   DATA2-.</div><div class='del'>-                 v         v</div><div class='del'>-             .import -&amp;gt; .finup()</div><div class='del'>-                           |</div><div class='del'>-                           '---------------&amp;gt; HASH2</div><div class='del'>-     &lt;/programlisting&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;Specifics Of Asynchronous HASH Transformation&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      Some of the drivers will want to use the Generic ScatterWalk</div><div class='del'>-      in case the implementation needs to be fed separate chunks of the</div><div class='del'>-      scatterlist which contains the input data. The buffer containing</div><div class='del'>-      the resulting hash will always be properly aligned to</div><div class='del'>-      .cra_alignmask so there is no need to worry about this.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="User"&gt;&lt;title&gt;User Space Interface&lt;/title&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The concepts of the kernel crypto API visible to kernel space is fully</div><div class='del'>-     applicable to the user space interface as well. Therefore, the kernel</div><div class='del'>-     crypto API high level discussion for the in-kernel use cases applies</div><div class='del'>-     here as well.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The major difference, however, is that user space can only act as a</div><div class='del'>-     consumer and never as a provider of a transformation or cipher algorithm.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The following covers the user space interface exported by the kernel</div><div class='del'>-     crypto API. A working example of this description is libkcapi that</div><div class='del'>-     can be obtained from [1]. That library can be used by user space</div><div class='del'>-     applications that require cryptographic services from the kernel.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Some details of the in-kernel kernel crypto API aspects do not</div><div class='del'>-     apply to user space, however. This includes the difference between</div><div class='del'>-     synchronous and asynchronous invocations. The user space API call</div><div class='del'>-     is fully synchronous.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     [1] &lt;ulink url="http://www.chronox.de/libkcapi.html"&gt;http://www.chronox.de/libkcapi.html&lt;/ulink&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;User Space API General Remarks&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The kernel crypto API is accessible from user space. Currently,</div><div class='del'>-     the following ciphers are accessible:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;Message digest including keyed message digest (HMAC, CMAC)&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;Symmetric ciphers&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;AEAD ciphers&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;Random Number Generators&lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The interface is provided via socket type using the type AF_ALG.</div><div class='del'>-     In addition, the setsockopt option type is SOL_ALG. In case the</div><div class='del'>-     user space header files do not export these flags yet, use the</div><div class='del'>-     following macros:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-#ifndef AF_ALG</div><div class='del'>-#define AF_ALG 38</div><div class='del'>-#endif</div><div class='del'>-#ifndef SOL_ALG</div><div class='del'>-#define SOL_ALG 279</div><div class='del'>-#endif</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     A cipher is accessed with the same name as done for the in-kernel</div><div class='del'>-     API calls. This includes the generic vs. unique naming schema for</div><div class='del'>-     ciphers as well as the enforcement of priorities for generic names.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     To interact with the kernel crypto API, a socket must be</div><div class='del'>-     created by the user space application. User space invokes the cipher</div><div class='del'>-     operation with the send()/write() system call family. The result of the</div><div class='del'>-     cipher operation is obtained with the read()/recv() system call family.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The following API calls assume that the socket descriptor</div><div class='del'>-     is already opened by the user space application and discusses only</div><div class='del'>-     the kernel crypto API specific invocations.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     To initialize the socket interface, the following sequence has to</div><div class='del'>-     be performed by the consumer:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;orderedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       Create a socket of type AF_ALG with the struct sockaddr_alg</div><div class='del'>-       parameter specified below for the different cipher types.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       Invoke bind with the socket descriptor</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       Invoke accept with the socket descriptor. The accept system call</div><div class='del'>-       returns a new file descriptor that is to be used to interact with</div><div class='del'>-       the particular cipher instance. When invoking send/write or recv/read</div><div class='del'>-       system calls to send data to the kernel or obtain data from the</div><div class='del'>-       kernel, the file descriptor returned by accept must be used.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/orderedlist&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;In-place Cipher operation&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Just like the in-kernel operation of the kernel crypto API, the user</div><div class='del'>-     space interface allows the cipher operation in-place. That means that</div><div class='del'>-     the input buffer used for the send/write system call and the output</div><div class='del'>-     buffer used by the read/recv system call may be one and the same.</div><div class='del'>-     This is of particular interest for symmetric cipher operations where a</div><div class='del'>-     copying of the output data to its final destination can be avoided.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     If a consumer on the other hand wants to maintain the plaintext and</div><div class='del'>-     the ciphertext in different memory locations, all a consumer needs</div><div class='del'>-     to do is to provide different memory pointers for the encryption and</div><div class='del'>-     decryption operation.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Message Digest API&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The message digest type to be used for the cipher operation is</div><div class='del'>-     selected when invoking the bind syscall. bind requires the caller</div><div class='del'>-     to provide a filled struct sockaddr data structure. This data</div><div class='del'>-     structure must be filled as follows:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-struct sockaddr_alg sa = {</div><div class='del'>-	.salg_family = AF_ALG,</div><div class='del'>-	.salg_type = "hash", /* this selects the hash logic in the kernel */</div><div class='del'>-	.salg_name = "sha1" /* this is the cipher name */</div><div class='del'>-};</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The salg_type value "hash" applies to message digests and keyed</div><div class='del'>-     message digests. Though, a keyed message digest is referenced by</div><div class='del'>-     the appropriate salg_name. Please see below for the setsockopt</div><div class='del'>-     interface that explains how the key can be set for a keyed message</div><div class='del'>-     digest.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Using the send() system call, the application provides the data that</div><div class='del'>-     should be processed with the message digest. The send system call</div><div class='del'>-     allows the following flags to be specified:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       MSG_MORE: If this flag is set, the send system call acts like a</div><div class='del'>-       message digest update function where the final hash is not</div><div class='del'>-       yet calculated. If the flag is not set, the send system call</div><div class='del'>-       calculates the final message digest immediately.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     With the recv() system call, the application can read the message</div><div class='del'>-     digest from the kernel crypto API. If the buffer is too small for the</div><div class='del'>-     message digest, the flag MSG_TRUNC is set by the kernel.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     In order to set a message digest key, the calling application must use</div><div class='del'>-     the setsockopt() option of ALG_SET_KEY. If the key is not set the HMAC</div><div class='del'>-     operation is performed without the initial HMAC state change caused by</div><div class='del'>-     the key.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Symmetric Cipher API&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The operation is very similar to the message digest discussion.</div><div class='del'>-     During initialization, the struct sockaddr data structure must be</div><div class='del'>-     filled as follows:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-struct sockaddr_alg sa = {</div><div class='del'>-	.salg_family = AF_ALG,</div><div class='del'>-	.salg_type = "skcipher", /* this selects the symmetric cipher */</div><div class='del'>-	.salg_name = "cbc(aes)" /* this is the cipher name */</div><div class='del'>-};</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Before data can be sent to the kernel using the write/send system</div><div class='del'>-     call family, the consumer must set the key. The key setting is</div><div class='del'>-     described with the setsockopt invocation below.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Using the sendmsg() system call, the application provides the data that should be processed for encryption or decryption. In addition, the IV is</div><div class='del'>-     specified with the data structure provided by the sendmsg() system call.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The sendmsg system call parameter of struct msghdr is embedded into the</div><div class='del'>-     struct cmsghdr data structure. See recv(2) and cmsg(3) for more</div><div class='del'>-     information on how the cmsghdr data structure is used together with the</div><div class='del'>-     send/recv system call family. That cmsghdr data structure holds the</div><div class='del'>-     following information specified with a separate header instances:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       specification of the cipher operation type with one of these flags:</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-       &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;ALG_OP_ENCRYPT - encryption of data&lt;/para&gt;</div><div class='del'>-       &lt;/listitem&gt;</div><div class='del'>-       &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;ALG_OP_DECRYPT - decryption of data&lt;/para&gt;</div><div class='del'>-       &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       specification of the IV information marked with the flag ALG_SET_IV</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The send system call family allows the following flag to be specified:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       MSG_MORE: If this flag is set, the send system call acts like a</div><div class='del'>-       cipher update function where more input data is expected</div><div class='del'>-       with a subsequent invocation of the send system call.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Note: The kernel reports -EINVAL for any unexpected data. The caller</div><div class='del'>-     must make sure that all data matches the constraints given in</div><div class='del'>-     /proc/crypto for the selected cipher.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     With the recv() system call, the application can read the result of</div><div class='del'>-     the cipher operation from the kernel crypto API. The output buffer</div><div class='del'>-     must be at least as large as to hold all blocks of the encrypted or</div><div class='del'>-     decrypted data. If the output data size is smaller, only as many</div><div class='del'>-     blocks are returned that fit into that output buffer size.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;AEAD Cipher API&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The operation is very similar to the symmetric cipher discussion.</div><div class='del'>-     During initialization, the struct sockaddr data structure must be</div><div class='del'>-     filled as follows:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-struct sockaddr_alg sa = {</div><div class='del'>-	.salg_family = AF_ALG,</div><div class='del'>-	.salg_type = "aead", /* this selects the symmetric cipher */</div><div class='del'>-	.salg_name = "gcm(aes)" /* this is the cipher name */</div><div class='del'>-};</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Before data can be sent to the kernel using the write/send system</div><div class='del'>-     call family, the consumer must set the key. The key setting is</div><div class='del'>-     described with the setsockopt invocation below.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     In addition, before data can be sent to the kernel using the</div><div class='del'>-     write/send system call family, the consumer must set the authentication</div><div class='del'>-     tag size. To set the authentication tag size, the caller must use the</div><div class='del'>-     setsockopt invocation described below.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Using the sendmsg() system call, the application provides the data that should be processed for encryption or decryption. In addition, the IV is</div><div class='del'>-     specified with the data structure provided by the sendmsg() system call.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The sendmsg system call parameter of struct msghdr is embedded into the</div><div class='del'>-     struct cmsghdr data structure. See recv(2) and cmsg(3) for more</div><div class='del'>-     information on how the cmsghdr data structure is used together with the</div><div class='del'>-     send/recv system call family. That cmsghdr data structure holds the</div><div class='del'>-     following information specified with a separate header instances:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       specification of the cipher operation type with one of these flags:</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-       &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;ALG_OP_ENCRYPT - encryption of data&lt;/para&gt;</div><div class='del'>-       &lt;/listitem&gt;</div><div class='del'>-       &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;ALG_OP_DECRYPT - decryption of data&lt;/para&gt;</div><div class='del'>-       &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       specification of the IV information marked with the flag ALG_SET_IV</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       specification of the associated authentication data (AAD) with the</div><div class='del'>-       flag ALG_SET_AEAD_ASSOCLEN. The AAD is sent to the kernel together</div><div class='del'>-       with the plaintext / ciphertext. See below for the memory structure.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The send system call family allows the following flag to be specified:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       MSG_MORE: If this flag is set, the send system call acts like a</div><div class='del'>-       cipher update function where more input data is expected</div><div class='del'>-       with a subsequent invocation of the send system call.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Note: The kernel reports -EINVAL for any unexpected data. The caller</div><div class='del'>-     must make sure that all data matches the constraints given in</div><div class='del'>-     /proc/crypto for the selected cipher.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     With the recv() system call, the application can read the result of</div><div class='del'>-     the cipher operation from the kernel crypto API. The output buffer</div><div class='del'>-     must be at least as large as defined with the memory structure below.</div><div class='del'>-     If the output data size is smaller, the cipher operation is not performed.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The authenticated decryption operation may indicate an integrity error.</div><div class='del'>-     Such breach in integrity is marked with the -EBADMSG error code.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;&lt;title&gt;AEAD Memory Structure&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The AEAD cipher operates with the following information that</div><div class='del'>-      is communicated between user and kernel space as one data stream:</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;plaintext or ciphertext&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;associated authentication data (AAD)&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;authentication tag&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-     &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The sizes of the AAD and the authentication tag are provided with</div><div class='del'>-      the sendmsg and setsockopt calls (see there). As the kernel knows</div><div class='del'>-      the size of the entire data stream, the kernel is now able to</div><div class='del'>-      calculate the right offsets of the data components in the data</div><div class='del'>-      stream.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The user space caller must arrange the aforementioned information</div><div class='del'>-      in the following order:</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        AEAD encryption input: AAD || plaintext</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        AEAD decryption input: AAD || ciphertext || authentication tag</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-     &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The output buffer the user space caller provides must be at least as</div><div class='del'>-      large to hold the following data:</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        AEAD encryption output: ciphertext || authentication tag</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        AEAD decryption output: plaintext</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-     &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Random Number Generator API&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Again, the operation is very similar to the other APIs.</div><div class='del'>-     During initialization, the struct sockaddr data structure must be</div><div class='del'>-     filled as follows:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-struct sockaddr_alg sa = {</div><div class='del'>-	.salg_family = AF_ALG,</div><div class='del'>-	.salg_type = "rng", /* this selects the symmetric cipher */</div><div class='del'>-	.salg_name = "drbg_nopr_sha256" /* this is the cipher name */</div><div class='del'>-};</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Depending on the RNG type, the RNG must be seeded. The seed is provided</div><div class='del'>-     using the setsockopt interface to set the key. For example, the</div><div class='del'>-     ansi_cprng requires a seed. The DRBGs do not require a seed, but</div><div class='del'>-     may be seeded.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Using the read()/recvmsg() system calls, random numbers can be obtained.</div><div class='del'>-     The kernel generates at most 128 bytes in one call. If user space</div><div class='del'>-     requires more data, multiple calls to read()/recvmsg() must be made.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     WARNING: The user space caller may invoke the initially mentioned</div><div class='del'>-     accept system call multiple times. In this case, the returned file</div><div class='del'>-     descriptors have the same state.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Zero-Copy Interface&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     In addition to the send/write/read/recv system call family, the AF_ALG</div><div class='del'>-     interface can be accessed with the zero-copy interface of splice/vmsplice.</div><div class='del'>-     As the name indicates, the kernel tries to avoid a copy operation into</div><div class='del'>-     kernel space.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The zero-copy operation requires data to be aligned at the page boundary.</div><div class='del'>-     Non-aligned data can be used as well, but may require more operations of</div><div class='del'>-     the kernel which would defeat the speed gains obtained from the zero-copy</div><div class='del'>-     interface.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The system-interent limit for the size of one zero-copy operation is</div><div class='del'>-     16 pages. If more data is to be sent to AF_ALG, user space must slice</div><div class='del'>-     the input into segments with a maximum size of 16 pages.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Zero-copy can be used with the following code example (a complete working</div><div class='del'>-     example is provided with libkcapi):</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-int pipes[2];</div><div class='del'>-</div><div class='del'>-pipe(pipes);</div><div class='del'>-/* input data in iov */</div><div class='del'>-vmsplice(pipes[1], iov, iovlen, SPLICE_F_GIFT);</div><div class='del'>-/* opfd is the file descriptor returned from accept() system call */</div><div class='del'>-splice(pipes[0], NULL, opfd, NULL, ret, 0);</div><div class='del'>-read(opfd, out, outlen);</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Setsockopt Interface&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     In addition to the read/recv and send/write system call handling</div><div class='del'>-     to send and retrieve data subject to the cipher operation, a consumer</div><div class='del'>-     also needs to set the additional information for the cipher operation.</div><div class='del'>-     This additional information is set using the setsockopt system call</div><div class='del'>-     that must be invoked with the file descriptor of the open cipher</div><div class='del'>-     (i.e. the file descriptor returned by the accept system call).</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Each setsockopt invocation must use the level SOL_ALG.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The setsockopt interface allows setting the following data using</div><div class='del'>-     the mentioned optname:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       ALG_SET_KEY -- Setting the key. Key setting is applicable to:</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-       &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;the skcipher cipher type (symmetric ciphers)&lt;/para&gt;</div><div class='del'>-       &lt;/listitem&gt;</div><div class='del'>-       &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;the hash cipher type (keyed message digests)&lt;/para&gt;</div><div class='del'>-       &lt;/listitem&gt;</div><div class='del'>-       &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;the AEAD cipher type&lt;/para&gt;</div><div class='del'>-       &lt;/listitem&gt;</div><div class='del'>-       &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;the RNG cipher type to provide the seed&lt;/para&gt;</div><div class='del'>-       &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-     &lt;listitem&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       ALG_SET_AEAD_AUTHSIZE -- Setting the authentication tag size</div><div class='del'>-       for AEAD ciphers. For a encryption operation, the authentication</div><div class='del'>-       tag of the given size will be generated. For a decryption operation,</div><div class='del'>-       the provided ciphertext is assumed to contain an authentication tag</div><div class='del'>-       of the given size (see section about AEAD memory layout below).</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;User space API example&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Please see [1] for libkcapi which provides an easy-to-use wrapper</div><div class='del'>-     around the aforementioned Netlink kernel interface. [1] also contains</div><div class='del'>-     a test application that invokes all libkcapi API calls.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     [1] &lt;ulink url="http://www.chronox.de/libkcapi.html"&gt;http://www.chronox.de/libkcapi.html&lt;/ulink&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="API"&gt;&lt;title&gt;Programming Interface&lt;/title&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Please note that the kernel crypto API contains the AEAD givcrypt</div><div class='del'>-    API (crypto_aead_giv* and aead_givcrypt_* function calls in</div><div class='del'>-    include/crypto/aead.h). This API is obsolete and will be removed</div><div class='del'>-    in the future. To obtain the functionality of an AEAD cipher with</div><div class='del'>-    internal IV generation, use the IV generator as a regular cipher.</div><div class='del'>-    For example, rfc4106(gcm(aes)) is the AEAD cipher with external</div><div class='del'>-    IV generation and seqniv(rfc4106(gcm(aes))) implies that the kernel</div><div class='del'>-    crypto API generates the IV. Different IV generators are available.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Block Cipher Context Data Structures&lt;/title&gt;</div><div class='del'>-!Pinclude/linux/crypto.h Block Cipher Context Data Structures</div><div class='del'>-!Finclude/crypto/aead.h aead_request</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Block Cipher Algorithm Definitions&lt;/title&gt;</div><div class='del'>-!Pinclude/linux/crypto.h Block Cipher Algorithm Definitions</div><div class='del'>-!Finclude/linux/crypto.h crypto_alg</div><div class='del'>-!Finclude/linux/crypto.h ablkcipher_alg</div><div class='del'>-!Finclude/crypto/aead.h aead_alg</div><div class='del'>-!Finclude/linux/crypto.h blkcipher_alg</div><div class='del'>-!Finclude/linux/crypto.h cipher_alg</div><div class='del'>-!Finclude/crypto/rng.h rng_alg</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Symmetric Key Cipher API&lt;/title&gt;</div><div class='del'>-!Pinclude/crypto/skcipher.h Symmetric Key Cipher API</div><div class='del'>-!Finclude/crypto/skcipher.h crypto_alloc_skcipher</div><div class='del'>-!Finclude/crypto/skcipher.h crypto_free_skcipher</div><div class='del'>-!Finclude/crypto/skcipher.h crypto_has_skcipher</div><div class='del'>-!Finclude/crypto/skcipher.h crypto_skcipher_ivsize</div><div class='del'>-!Finclude/crypto/skcipher.h crypto_skcipher_blocksize</div><div class='del'>-!Finclude/crypto/skcipher.h crypto_skcipher_setkey</div><div class='del'>-!Finclude/crypto/skcipher.h crypto_skcipher_reqtfm</div><div class='del'>-!Finclude/crypto/skcipher.h crypto_skcipher_encrypt</div><div class='del'>-!Finclude/crypto/skcipher.h crypto_skcipher_decrypt</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Symmetric Key Cipher Request Handle&lt;/title&gt;</div><div class='del'>-!Pinclude/crypto/skcipher.h Symmetric Key Cipher Request Handle</div><div class='del'>-!Finclude/crypto/skcipher.h crypto_skcipher_reqsize</div><div class='del'>-!Finclude/crypto/skcipher.h skcipher_request_set_tfm</div><div class='del'>-!Finclude/crypto/skcipher.h skcipher_request_alloc</div><div class='del'>-!Finclude/crypto/skcipher.h skcipher_request_free</div><div class='del'>-!Finclude/crypto/skcipher.h skcipher_request_set_callback</div><div class='del'>-!Finclude/crypto/skcipher.h skcipher_request_set_crypt</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Asynchronous Block Cipher API - Deprecated&lt;/title&gt;</div><div class='del'>-!Pinclude/linux/crypto.h Asynchronous Block Cipher API</div><div class='del'>-!Finclude/linux/crypto.h crypto_alloc_ablkcipher</div><div class='del'>-!Finclude/linux/crypto.h crypto_free_ablkcipher</div><div class='del'>-!Finclude/linux/crypto.h crypto_has_ablkcipher</div><div class='del'>-!Finclude/linux/crypto.h crypto_ablkcipher_ivsize</div><div class='del'>-!Finclude/linux/crypto.h crypto_ablkcipher_blocksize</div><div class='del'>-!Finclude/linux/crypto.h crypto_ablkcipher_setkey</div><div class='del'>-!Finclude/linux/crypto.h crypto_ablkcipher_reqtfm</div><div class='del'>-!Finclude/linux/crypto.h crypto_ablkcipher_encrypt</div><div class='del'>-!Finclude/linux/crypto.h crypto_ablkcipher_decrypt</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Asynchronous Cipher Request Handle - Deprecated&lt;/title&gt;</div><div class='del'>-!Pinclude/linux/crypto.h Asynchronous Cipher Request Handle</div><div class='del'>-!Finclude/linux/crypto.h crypto_ablkcipher_reqsize</div><div class='del'>-!Finclude/linux/crypto.h ablkcipher_request_set_tfm</div><div class='del'>-!Finclude/linux/crypto.h ablkcipher_request_alloc</div><div class='del'>-!Finclude/linux/crypto.h ablkcipher_request_free</div><div class='del'>-!Finclude/linux/crypto.h ablkcipher_request_set_callback</div><div class='del'>-!Finclude/linux/crypto.h ablkcipher_request_set_crypt</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Authenticated Encryption With Associated Data (AEAD) Cipher API&lt;/title&gt;</div><div class='del'>-!Pinclude/crypto/aead.h Authenticated Encryption With Associated Data (AEAD) Cipher API</div><div class='del'>-!Finclude/crypto/aead.h crypto_alloc_aead</div><div class='del'>-!Finclude/crypto/aead.h crypto_free_aead</div><div class='del'>-!Finclude/crypto/aead.h crypto_aead_ivsize</div><div class='del'>-!Finclude/crypto/aead.h crypto_aead_authsize</div><div class='del'>-!Finclude/crypto/aead.h crypto_aead_blocksize</div><div class='del'>-!Finclude/crypto/aead.h crypto_aead_setkey</div><div class='del'>-!Finclude/crypto/aead.h crypto_aead_setauthsize</div><div class='del'>-!Finclude/crypto/aead.h crypto_aead_encrypt</div><div class='del'>-!Finclude/crypto/aead.h crypto_aead_decrypt</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Asynchronous AEAD Request Handle&lt;/title&gt;</div><div class='del'>-!Pinclude/crypto/aead.h Asynchronous AEAD Request Handle</div><div class='del'>-!Finclude/crypto/aead.h crypto_aead_reqsize</div><div class='del'>-!Finclude/crypto/aead.h aead_request_set_tfm</div><div class='del'>-!Finclude/crypto/aead.h aead_request_alloc</div><div class='del'>-!Finclude/crypto/aead.h aead_request_free</div><div class='del'>-!Finclude/crypto/aead.h aead_request_set_callback</div><div class='del'>-!Finclude/crypto/aead.h aead_request_set_crypt</div><div class='del'>-!Finclude/crypto/aead.h aead_request_set_ad</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Synchronous Block Cipher API - Deprecated&lt;/title&gt;</div><div class='del'>-!Pinclude/linux/crypto.h Synchronous Block Cipher API</div><div class='del'>-!Finclude/linux/crypto.h crypto_alloc_blkcipher</div><div class='del'>-!Finclude/linux/crypto.h crypto_free_blkcipher</div><div class='del'>-!Finclude/linux/crypto.h crypto_has_blkcipher</div><div class='del'>-!Finclude/linux/crypto.h crypto_blkcipher_name</div><div class='del'>-!Finclude/linux/crypto.h crypto_blkcipher_ivsize</div><div class='del'>-!Finclude/linux/crypto.h crypto_blkcipher_blocksize</div><div class='del'>-!Finclude/linux/crypto.h crypto_blkcipher_setkey</div><div class='del'>-!Finclude/linux/crypto.h crypto_blkcipher_encrypt</div><div class='del'>-!Finclude/linux/crypto.h crypto_blkcipher_encrypt_iv</div><div class='del'>-!Finclude/linux/crypto.h crypto_blkcipher_decrypt</div><div class='del'>-!Finclude/linux/crypto.h crypto_blkcipher_decrypt_iv</div><div class='del'>-!Finclude/linux/crypto.h crypto_blkcipher_set_iv</div><div class='del'>-!Finclude/linux/crypto.h crypto_blkcipher_get_iv</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Single Block Cipher API&lt;/title&gt;</div><div class='del'>-!Pinclude/linux/crypto.h Single Block Cipher API</div><div class='del'>-!Finclude/linux/crypto.h crypto_alloc_cipher</div><div class='del'>-!Finclude/linux/crypto.h crypto_free_cipher</div><div class='del'>-!Finclude/linux/crypto.h crypto_has_cipher</div><div class='del'>-!Finclude/linux/crypto.h crypto_cipher_blocksize</div><div class='del'>-!Finclude/linux/crypto.h crypto_cipher_setkey</div><div class='del'>-!Finclude/linux/crypto.h crypto_cipher_encrypt_one</div><div class='del'>-!Finclude/linux/crypto.h crypto_cipher_decrypt_one</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Message Digest Algorithm Definitions&lt;/title&gt;</div><div class='del'>-!Pinclude/crypto/hash.h Message Digest Algorithm Definitions</div><div class='del'>-!Finclude/crypto/hash.h hash_alg_common</div><div class='del'>-!Finclude/crypto/hash.h ahash_alg</div><div class='del'>-!Finclude/crypto/hash.h shash_alg</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Asynchronous Message Digest API&lt;/title&gt;</div><div class='del'>-!Pinclude/crypto/hash.h Asynchronous Message Digest API</div><div class='del'>-!Finclude/crypto/hash.h crypto_alloc_ahash</div><div class='del'>-!Finclude/crypto/hash.h crypto_free_ahash</div><div class='del'>-!Finclude/crypto/hash.h crypto_ahash_init</div><div class='del'>-!Finclude/crypto/hash.h crypto_ahash_digestsize</div><div class='del'>-!Finclude/crypto/hash.h crypto_ahash_reqtfm</div><div class='del'>-!Finclude/crypto/hash.h crypto_ahash_reqsize</div><div class='del'>-!Finclude/crypto/hash.h crypto_ahash_setkey</div><div class='del'>-!Finclude/crypto/hash.h crypto_ahash_finup</div><div class='del'>-!Finclude/crypto/hash.h crypto_ahash_final</div><div class='del'>-!Finclude/crypto/hash.h crypto_ahash_digest</div><div class='del'>-!Finclude/crypto/hash.h crypto_ahash_export</div><div class='del'>-!Finclude/crypto/hash.h crypto_ahash_import</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Asynchronous Hash Request Handle&lt;/title&gt;</div><div class='del'>-!Pinclude/crypto/hash.h Asynchronous Hash Request Handle</div><div class='del'>-!Finclude/crypto/hash.h ahash_request_set_tfm</div><div class='del'>-!Finclude/crypto/hash.h ahash_request_alloc</div><div class='del'>-!Finclude/crypto/hash.h ahash_request_free</div><div class='del'>-!Finclude/crypto/hash.h ahash_request_set_callback</div><div class='del'>-!Finclude/crypto/hash.h ahash_request_set_crypt</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Synchronous Message Digest API&lt;/title&gt;</div><div class='del'>-!Pinclude/crypto/hash.h Synchronous Message Digest API</div><div class='del'>-!Finclude/crypto/hash.h crypto_alloc_shash</div><div class='del'>-!Finclude/crypto/hash.h crypto_free_shash</div><div class='del'>-!Finclude/crypto/hash.h crypto_shash_blocksize</div><div class='del'>-!Finclude/crypto/hash.h crypto_shash_digestsize</div><div class='del'>-!Finclude/crypto/hash.h crypto_shash_descsize</div><div class='del'>-!Finclude/crypto/hash.h crypto_shash_setkey</div><div class='del'>-!Finclude/crypto/hash.h crypto_shash_digest</div><div class='del'>-!Finclude/crypto/hash.h crypto_shash_export</div><div class='del'>-!Finclude/crypto/hash.h crypto_shash_import</div><div class='del'>-!Finclude/crypto/hash.h crypto_shash_init</div><div class='del'>-!Finclude/crypto/hash.h crypto_shash_update</div><div class='del'>-!Finclude/crypto/hash.h crypto_shash_final</div><div class='del'>-!Finclude/crypto/hash.h crypto_shash_finup</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Crypto API Random Number API&lt;/title&gt;</div><div class='del'>-!Pinclude/crypto/rng.h Random number generator API</div><div class='del'>-!Finclude/crypto/rng.h crypto_alloc_rng</div><div class='del'>-!Finclude/crypto/rng.h crypto_rng_alg</div><div class='del'>-!Finclude/crypto/rng.h crypto_free_rng</div><div class='del'>-!Finclude/crypto/rng.h crypto_rng_generate</div><div class='del'>-!Finclude/crypto/rng.h crypto_rng_get_bytes</div><div class='del'>-!Finclude/crypto/rng.h crypto_rng_reset</div><div class='del'>-!Finclude/crypto/rng.h crypto_rng_seedsize</div><div class='del'>-!Cinclude/crypto/rng.h</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Asymmetric Cipher API&lt;/title&gt;</div><div class='del'>-!Pinclude/crypto/akcipher.h Generic Public Key API</div><div class='del'>-!Finclude/crypto/akcipher.h akcipher_alg</div><div class='del'>-!Finclude/crypto/akcipher.h akcipher_request</div><div class='del'>-!Finclude/crypto/akcipher.h crypto_alloc_akcipher</div><div class='del'>-!Finclude/crypto/akcipher.h crypto_free_akcipher</div><div class='del'>-!Finclude/crypto/akcipher.h crypto_akcipher_set_pub_key</div><div class='del'>-!Finclude/crypto/akcipher.h crypto_akcipher_set_priv_key</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Asymmetric Cipher Request Handle&lt;/title&gt;</div><div class='del'>-!Finclude/crypto/akcipher.h akcipher_request_alloc</div><div class='del'>-!Finclude/crypto/akcipher.h akcipher_request_free</div><div class='del'>-!Finclude/crypto/akcipher.h akcipher_request_set_callback</div><div class='del'>-!Finclude/crypto/akcipher.h akcipher_request_set_crypt</div><div class='del'>-!Finclude/crypto/akcipher.h crypto_akcipher_maxsize</div><div class='del'>-!Finclude/crypto/akcipher.h crypto_akcipher_encrypt</div><div class='del'>-!Finclude/crypto/akcipher.h crypto_akcipher_decrypt</div><div class='del'>-!Finclude/crypto/akcipher.h crypto_akcipher_sign</div><div class='del'>-!Finclude/crypto/akcipher.h crypto_akcipher_verify</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="Code"&gt;&lt;title&gt;Code Examples&lt;/title&gt;</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Code Example For Symmetric Key Cipher Operation&lt;/title&gt;</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-struct tcrypt_result {</div><div class='del'>-	struct completion completion;</div><div class='del'>-	int err;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* tie all data structures together */</div><div class='del'>-struct skcipher_def {</div><div class='del'>-	struct scatterlist sg;</div><div class='del'>-	struct crypto_skcipher *tfm;</div><div class='del'>-	struct skcipher_request *req;</div><div class='del'>-	struct tcrypt_result result;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Callback function */</div><div class='del'>-static void test_skcipher_cb(struct crypto_async_request *req, int error)</div><div class='del'>-{</div><div class='del'>-	struct tcrypt_result *result = req-&amp;gt;data;</div><div class='del'>-</div><div class='del'>-	if (error == -EINPROGRESS)</div><div class='del'>-		return;</div><div class='del'>-	result-&amp;gt;err = error;</div><div class='del'>-	complete(&amp;amp;result-&amp;gt;completion);</div><div class='del'>-	pr_info("Encryption finished successfully\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Perform cipher operation */</div><div class='del'>-static unsigned int test_skcipher_encdec(struct skcipher_def *sk,</div><div class='del'>-					 int enc)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	if (enc)</div><div class='del'>-		rc = crypto_skcipher_encrypt(sk-&amp;gt;req);</div><div class='del'>-	else</div><div class='del'>-		rc = crypto_skcipher_decrypt(sk-&amp;gt;req);</div><div class='del'>-</div><div class='del'>-	switch (rc) {</div><div class='del'>-	case 0:</div><div class='del'>-		break;</div><div class='del'>-	case -EINPROGRESS:</div><div class='del'>-	case -EBUSY:</div><div class='del'>-		rc = wait_for_completion_interruptible(</div><div class='del'>-			&amp;amp;sk-&amp;gt;result.completion);</div><div class='del'>-		if (!rc &amp;amp;&amp;amp; !sk-&amp;gt;result.err) {</div><div class='del'>-			reinit_completion(&amp;amp;sk-&amp;gt;result.completion);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	default:</div><div class='del'>-		pr_info("skcipher encrypt returned with %d result %d\n",</div><div class='del'>-			rc, sk-&amp;gt;result.err);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	init_completion(&amp;amp;sk-&amp;gt;result.completion);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initialize and trigger cipher operation */</div><div class='del'>-static int test_skcipher(void)</div><div class='del'>-{</div><div class='del'>-	struct skcipher_def sk;</div><div class='del'>-	struct crypto_skcipher *skcipher = NULL;</div><div class='del'>-	struct skcipher_request *req = NULL;</div><div class='del'>-	char *scratchpad = NULL;</div><div class='del'>-	char *ivdata = NULL;</div><div class='del'>-	unsigned char key[32];</div><div class='del'>-	int ret = -EFAULT;</div><div class='del'>-</div><div class='del'>-	skcipher = crypto_alloc_skcipher("cbc-aes-aesni", 0, 0);</div><div class='del'>-	if (IS_ERR(skcipher)) {</div><div class='del'>-		pr_info("could not allocate skcipher handle\n");</div><div class='del'>-		return PTR_ERR(skcipher);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	req = skcipher_request_alloc(skcipher, GFP_KERNEL);</div><div class='del'>-	if (!req) {</div><div class='del'>-		pr_info("could not allocate skcipher request\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='del'>-				      test_skcipher_cb,</div><div class='del'>-				      &amp;amp;sk.result);</div><div class='del'>-</div><div class='del'>-	/* AES 256 with random key */</div><div class='del'>-	get_random_bytes(&amp;amp;key, 32);</div><div class='del'>-	if (crypto_skcipher_setkey(skcipher, key, 32)) {</div><div class='del'>-		pr_info("key could not be set\n");</div><div class='del'>-		ret = -EAGAIN;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* IV will be random */</div><div class='del'>-	ivdata = kmalloc(16, GFP_KERNEL);</div><div class='del'>-	if (!ivdata) {</div><div class='del'>-		pr_info("could not allocate ivdata\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	get_random_bytes(ivdata, 16);</div><div class='del'>-</div><div class='del'>-	/* Input data will be random */</div><div class='del'>-	scratchpad = kmalloc(16, GFP_KERNEL);</div><div class='del'>-	if (!scratchpad) {</div><div class='del'>-		pr_info("could not allocate scratchpad\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	get_random_bytes(scratchpad, 16);</div><div class='del'>-</div><div class='del'>-	sk.tfm = skcipher;</div><div class='del'>-	sk.req = req;</div><div class='del'>-</div><div class='del'>-	/* We encrypt one block */</div><div class='del'>-	sg_init_one(&amp;amp;sk.sg, scratchpad, 16);</div><div class='del'>-	skcipher_request_set_crypt(req, &amp;amp;sk.sg, &amp;amp;sk.sg, 16, ivdata);</div><div class='del'>-	init_completion(&amp;amp;sk.result.completion);</div><div class='del'>-</div><div class='del'>-	/* encrypt data */</div><div class='del'>-	ret = test_skcipher_encdec(&amp;amp;sk, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	pr_info("Encryption triggered successfully\n");</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (skcipher)</div><div class='del'>-		crypto_free_skcipher(skcipher);</div><div class='del'>-	if (req)</div><div class='del'>-		skcipher_request_free(req);</div><div class='del'>-	if (ivdata)</div><div class='del'>-		kfree(ivdata);</div><div class='del'>-	if (scratchpad)</div><div class='del'>-		kfree(scratchpad);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Code Example For Use of Operational State Memory With SHASH&lt;/title&gt;</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-struct sdesc {</div><div class='del'>-	struct shash_desc shash;</div><div class='del'>-	char ctx[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct sdescinit_sdesc(struct crypto_shash *alg)</div><div class='del'>-{</div><div class='del'>-	struct sdescsdesc;</div><div class='del'>-	int size;</div><div class='del'>-</div><div class='del'>-	size = sizeof(struct shash_desc) + crypto_shash_descsize(alg);</div><div class='del'>-	sdesc = kmalloc(size, GFP_KERNEL);</div><div class='del'>-	if (!sdesc)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	sdesc-&amp;gt;shash.tfm = alg;</div><div class='del'>-	sdesc-&amp;gt;shash.flags = 0x0;</div><div class='del'>-	return sdesc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int calc_hash(struct crypto_shashalg,</div><div class='del'>-		     const unsigned chardata, unsigned int datalen,</div><div class='del'>-		     unsigned chardigest) {</div><div class='del'>-	struct sdescsdesc;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	sdesc = init_sdesc(alg);</div><div class='del'>-	if (IS_ERR(sdesc)) {</div><div class='del'>-		pr_info("trusted_key: can't alloc %s\n", hash_alg);</div><div class='del'>-		return PTR_ERR(sdesc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = crypto_shash_digest(&amp;amp;sdesc-&amp;gt;shash, data, datalen, digest);</div><div class='del'>-	kfree(sdesc);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1&gt;&lt;title&gt;Code Example For Random Number Generator Usage&lt;/title&gt;</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-static int get_random_numbers(u8 *buf, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct crypto_rngrng = NULL;</div><div class='del'>-	chardrbg = "drbg_nopr_sha256"; /* Hash DRBG with SHA-256, no PR */</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!buf || !len) {</div><div class='del'>-		pr_debug("No output buffer provided\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rng = crypto_alloc_rng(drbg, 0, 0);</div><div class='del'>-	if (IS_ERR(rng)) {</div><div class='del'>-		pr_debug("could not allocate RNG handle for %s\n", drbg);</div><div class='del'>-		return -PTR_ERR(rng);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = crypto_rng_get_bytes(rng, buf, len);</div><div class='del'>-	if (ret &amp;lt; 0)</div><div class='del'>-		pr_debug("generation of random numbers failed\n");</div><div class='del'>-	else if (ret == 0)</div><div class='del'>-		pr_debug("RNG returned no data");</div><div class='del'>-	else</div><div class='del'>-		pr_debug("RNG returned %d bytes of data\n", ret);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	crypto_free_rng(rng);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>- &lt;/book&gt;</div><div class='head'>diff --git a/Documentation/DocBook/debugobjects.tmpl b/Documentation/DocBook/debugobjects.tmpl<br/>deleted file mode 100644<br/>index 7e4f34fde697..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/debugobjects.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/debugobjects.tmpl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,443 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='del'>-	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="debug-objects-guide"&gt;</div><div class='del'>- &lt;bookinfo&gt;</div><div class='del'>-  &lt;title&gt;Debug objects life time&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-  &lt;authorgroup&gt;</div><div class='del'>-   &lt;author&gt;</div><div class='del'>-    &lt;firstname&gt;Thomas&lt;/firstname&gt;</div><div class='del'>-    &lt;surname&gt;Gleixner&lt;/surname&gt;</div><div class='del'>-    &lt;affiliation&gt;</div><div class='del'>-     &lt;address&gt;</div><div class='del'>-      &lt;email&gt;tglx@linutronix.de&lt;/email&gt;</div><div class='del'>-     &lt;/address&gt;</div><div class='del'>-    &lt;/affiliation&gt;</div><div class='del'>-   &lt;/author&gt;</div><div class='del'>-  &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-  &lt;copyright&gt;</div><div class='del'>-   &lt;year&gt;2008&lt;/year&gt;</div><div class='del'>-   &lt;holder&gt;Thomas Gleixner&lt;/holder&gt;</div><div class='del'>-  &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-  &lt;legalnotice&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This documentation is free software; you can redistribute</div><div class='del'>-     it and/or modify it under the terms of the GNU General Public</div><div class='del'>-     License version 2 as published by the Free Software Foundation.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This program is distributed in the hope that it will be</div><div class='del'>-     useful, but WITHOUT ANY WARRANTY; without even the implied</div><div class='del'>-     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>-     See the GNU General Public License for more details.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     You should have received a copy of the GNU General Public</div><div class='del'>-     License along with this program; if not, write to the Free</div><div class='del'>-     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='del'>-     MA 02111-1307 USA</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     For more details see the file COPYING in the source</div><div class='del'>-     distribution of Linux.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/legalnotice&gt;</div><div class='del'>- &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-&lt;toc&gt;&lt;/toc&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="intro"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      debugobjects is a generic infrastructure to track the life time</div><div class='del'>-      of kernel objects and validate the operations on those.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      debugobjects is useful to check for the following error patterns:</div><div class='del'>-	&lt;itemizedlist&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;Activation of uninitialized objects&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;Initialization of active objects&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;Usage of freed/destroyed objects&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      debugobjects is not changing the data structure of the real</div><div class='del'>-      object so it can be compiled in with a minimal runtime impact</div><div class='del'>-      and enabled on demand with a kernel command line option.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="howto"&gt;</div><div class='del'>-    &lt;title&gt;Howto use debugobjects&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      A kernel subsystem needs to provide a data structure which</div><div class='del'>-      describes the object type and add calls into the debug code at</div><div class='del'>-      appropriate places. The data structure to describe the object</div><div class='del'>-      type needs at minimum the name of the object type. Optional</div><div class='del'>-      functions can and should be provided to fixup detected problems</div><div class='del'>-      so the kernel can continue to work and the debug information can</div><div class='del'>-      be retrieved from a live system instead of hard core debugging</div><div class='del'>-      with serial consoles and stack trace transcripts from the</div><div class='del'>-      monitor.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The debug calls provided by debugobjects are:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;debug_object_init&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;debug_object_init_on_stack&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;debug_object_activate&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;debug_object_deactivate&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;debug_object_destroy&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;debug_object_free&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;debug_object_assert_init&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-      Each of these functions takes the address of the real object and</div><div class='del'>-      a pointer to the object type specific debug description</div><div class='del'>-      structure.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Each detected error is reported in the statistics and a limited</div><div class='del'>-      number of errors are printk'ed including a full stack trace.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The statistics are available via /sys/kernel/debug/debug_objects/stats.</div><div class='del'>-      They provide information about the number of warnings and the</div><div class='del'>-      number of successful fixups along with information about the</div><div class='del'>-      usage of the internal tracking objects and the state of the</div><div class='del'>-      internal tracking objects pool.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter id="debugfunctions"&gt;</div><div class='del'>-    &lt;title&gt;Debug functions&lt;/title&gt;</div><div class='del'>-    &lt;sect1 id="prototypes"&gt;</div><div class='del'>-      &lt;title&gt;Debug object function reference&lt;/title&gt;</div><div class='del'>-!Elib/debugobjects.c</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    &lt;sect1 id="debug_object_init"&gt;</div><div class='del'>-      &lt;title&gt;debug_object_init&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called whenever the initialization function</div><div class='del'>-	of a real object is called.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the real object is already tracked by debugobjects it is</div><div class='del'>-	checked, whether the object can be initialized.  Initializing</div><div class='del'>-	is not allowed for active and destroyed objects. When</div><div class='del'>-	debugobjects detects an error, then it calls the fixup_init</div><div class='del'>-	function of the object type description structure if provided</div><div class='del'>-	by the caller. The fixup function can correct the problem</div><div class='del'>-	before the real initialization of the object happens. E.g. it</div><div class='del'>-	can deactivate an active object in order to prevent damage to</div><div class='del'>-	the subsystem.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the real object is not yet tracked by debugobjects,</div><div class='del'>-	debugobjects allocates a tracker object for the real object</div><div class='del'>-	and sets the tracker object state to ODEBUG_STATE_INIT. It</div><div class='del'>-	verifies that the object is not on the callers stack. If it is</div><div class='del'>-	on the callers stack then a limited number of warnings</div><div class='del'>-	including a full stack trace is printk'ed. The calling code</div><div class='del'>-	must use debug_object_init_on_stack() and remove the object</div><div class='del'>-	before leaving the function which allocated it. See next</div><div class='del'>-	section.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="debug_object_init_on_stack"&gt;</div><div class='del'>-      &lt;title&gt;debug_object_init_on_stack&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called whenever the initialization function</div><div class='del'>-	of a real object which resides on the stack is called.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the real object is already tracked by debugobjects it is</div><div class='del'>-	checked, whether the object can be initialized. Initializing</div><div class='del'>-	is not allowed for active and destroyed objects. When</div><div class='del'>-	debugobjects detects an error, then it calls the fixup_init</div><div class='del'>-	function of the object type description structure if provided</div><div class='del'>-	by the caller. The fixup function can correct the problem</div><div class='del'>-	before the real initialization of the object happens. E.g. it</div><div class='del'>-	can deactivate an active object in order to prevent damage to</div><div class='del'>-	the subsystem.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the real object is not yet tracked by debugobjects</div><div class='del'>-	debugobjects allocates a tracker object for the real object</div><div class='del'>-	and sets the tracker object state to ODEBUG_STATE_INIT. It</div><div class='del'>-	verifies that the object is on the callers stack.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	An object which is on the stack must be removed from the</div><div class='del'>-	tracker by calling debug_object_free() before the function</div><div class='del'>-	which allocates the object returns. Otherwise we keep track of</div><div class='del'>-	stale objects.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="debug_object_activate"&gt;</div><div class='del'>-      &lt;title&gt;debug_object_activate&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called whenever the activation function of a</div><div class='del'>-	real object is called.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the real object is already tracked by debugobjects it is</div><div class='del'>-	checked, whether the object can be activated.  Activating is</div><div class='del'>-	not allowed for active and destroyed objects. When</div><div class='del'>-	debugobjects detects an error, then it calls the</div><div class='del'>-	fixup_activate function of the object type description</div><div class='del'>-	structure if provided by the caller. The fixup function can</div><div class='del'>-	correct the problem before the real activation of the object</div><div class='del'>-	happens. E.g. it can deactivate an active object in order to</div><div class='del'>-	prevent damage to the subsystem.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the real object is not yet tracked by debugobjects then</div><div class='del'>-	the fixup_activate function is called if available. This is</div><div class='del'>-	necessary to allow the legitimate activation of statically</div><div class='del'>-	allocated and initialized objects. The fixup function checks</div><div class='del'>-	whether the object is valid and calls the debug_objects_init()</div><div class='del'>-	function to initialize the tracking of this object.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the activation is legitimate, then the state of the</div><div class='del'>-	associated tracker object is set to ODEBUG_STATE_ACTIVE.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="debug_object_deactivate"&gt;</div><div class='del'>-      &lt;title&gt;debug_object_deactivate&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called whenever the deactivation function of</div><div class='del'>-	a real object is called.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the real object is tracked by debugobjects it is checked,</div><div class='del'>-	whether the object can be deactivated. Deactivating is not</div><div class='del'>-	allowed for untracked or destroyed objects.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the deactivation is legitimate, then the state of the</div><div class='del'>-	associated tracker object is set to ODEBUG_STATE_INACTIVE.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="debug_object_destroy"&gt;</div><div class='del'>-      &lt;title&gt;debug_object_destroy&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called to mark an object destroyed. This is</div><div class='del'>-	useful to prevent the usage of invalid objects, which are</div><div class='del'>-	still available in memory: either statically allocated objects</div><div class='del'>-	or objects which are freed later.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the real object is tracked by debugobjects it is checked,</div><div class='del'>-	whether the object can be destroyed. Destruction is not</div><div class='del'>-	allowed for active and destroyed objects. When debugobjects</div><div class='del'>-	detects an error, then it calls the fixup_destroy function of</div><div class='del'>-	the object type description structure if provided by the</div><div class='del'>-	caller. The fixup function can correct the problem before the</div><div class='del'>-	real destruction of the object happens. E.g. it can deactivate</div><div class='del'>-	an active object in order to prevent damage to the subsystem.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the destruction is legitimate, then the state of the</div><div class='del'>-	associated tracker object is set to ODEBUG_STATE_DESTROYED.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="debug_object_free"&gt;</div><div class='del'>-      &lt;title&gt;debug_object_free&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called before an object is freed.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the real object is tracked by debugobjects it is checked,</div><div class='del'>-	whether the object can be freed. Free is not allowed for</div><div class='del'>-	active objects. When debugobjects detects an error, then it</div><div class='del'>-	calls the fixup_free function of the object type description</div><div class='del'>-	structure if provided by the caller. The fixup function can</div><div class='del'>-	correct the problem before the real free of the object</div><div class='del'>-	happens. E.g. it can deactivate an active object in order to</div><div class='del'>-	prevent damage to the subsystem.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Note that debug_object_free removes the object from the</div><div class='del'>-	tracker. Later usage of the object is detected by the other</div><div class='del'>-	debug checks.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="debug_object_assert_init"&gt;</div><div class='del'>-      &lt;title&gt;debug_object_assert_init&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called to assert that an object has been</div><div class='del'>-	initialized.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the real object is not tracked by debugobjects, it calls</div><div class='del'>-	fixup_assert_init of the object type description structure</div><div class='del'>-	provided by the caller, with the hardcoded object state</div><div class='del'>-	ODEBUG_NOT_AVAILABLE. The fixup function can correct the problem</div><div class='del'>-	by calling debug_object_init and other specific initializing</div><div class='del'>-	functions.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When the real object is already tracked by debugobjects it is</div><div class='del'>-	ignored.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter id="fixupfunctions"&gt;</div><div class='del'>-    &lt;title&gt;Fixup functions&lt;/title&gt;</div><div class='del'>-    &lt;sect1 id="debug_obj_descr"&gt;</div><div class='del'>-      &lt;title&gt;Debug object type description structure&lt;/title&gt;</div><div class='del'>-!Iinclude/linux/debugobjects.h</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    &lt;sect1 id="fixup_init"&gt;</div><div class='del'>-      &lt;title&gt;fixup_init&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called from the debug code whenever a problem</div><div class='del'>-	in debug_object_init is detected. The function takes the</div><div class='del'>-	address of the object and the state which is currently</div><div class='del'>-	recorded in the tracker.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Called from debug_object_init when the object state is:</div><div class='del'>-	&lt;itemizedlist&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;ODEBUG_STATE_ACTIVE&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The function returns true when the fixup was successful,</div><div class='del'>-	otherwise false. The return value is used to update the</div><div class='del'>-	statistics.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Note, that the function needs to call the debug_object_init()</div><div class='del'>-	function again, after the damage has been repaired in order to</div><div class='del'>-	keep the state consistent.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="fixup_activate"&gt;</div><div class='del'>-      &lt;title&gt;fixup_activate&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called from the debug code whenever a problem</div><div class='del'>-	in debug_object_activate is detected.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Called from debug_object_activate when the object state is:</div><div class='del'>-	&lt;itemizedlist&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;ODEBUG_STATE_NOTAVAILABLE&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;ODEBUG_STATE_ACTIVE&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The function returns true when the fixup was successful,</div><div class='del'>-	otherwise false. The return value is used to update the</div><div class='del'>-	statistics.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Note that the function needs to call the debug_object_activate()</div><div class='del'>-	function again after the damage has been repaired in order to</div><div class='del'>-	keep the state consistent.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The activation of statically initialized objects is a special</div><div class='del'>-	case. When debug_object_activate() has no tracked object for</div><div class='del'>-	this object address then fixup_activate() is called with</div><div class='del'>-	object state ODEBUG_STATE_NOTAVAILABLE. The fixup function</div><div class='del'>-	needs to check whether this is a legitimate case of a</div><div class='del'>-	statically initialized object or not. In case it is it calls</div><div class='del'>-	debug_object_init() and debug_object_activate() to make the</div><div class='del'>-	object known to the tracker and marked active. In this case</div><div class='del'>-	the function should return false because this is not a real</div><div class='del'>-	fixup.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="fixup_destroy"&gt;</div><div class='del'>-      &lt;title&gt;fixup_destroy&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called from the debug code whenever a problem</div><div class='del'>-	in debug_object_destroy is detected.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Called from debug_object_destroy when the object state is:</div><div class='del'>-	&lt;itemizedlist&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;ODEBUG_STATE_ACTIVE&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The function returns true when the fixup was successful,</div><div class='del'>-	otherwise false. The return value is used to update the</div><div class='del'>-	statistics.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    &lt;sect1 id="fixup_free"&gt;</div><div class='del'>-      &lt;title&gt;fixup_free&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called from the debug code whenever a problem</div><div class='del'>-	in debug_object_free is detected. Further it can be called</div><div class='del'>-	from the debug checks in kfree/vfree, when an active object is</div><div class='del'>-	detected from the debug_check_no_obj_freed() sanity checks.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Called from debug_object_free() or debug_check_no_obj_freed()</div><div class='del'>-	when the object state is:</div><div class='del'>-	&lt;itemizedlist&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;ODEBUG_STATE_ACTIVE&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The function returns true when the fixup was successful,</div><div class='del'>-	otherwise false. The return value is used to update the</div><div class='del'>-	statistics.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    &lt;sect1 id="fixup_assert_init"&gt;</div><div class='del'>-      &lt;title&gt;fixup_assert_init&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This function is called from the debug code whenever a problem</div><div class='del'>-	in debug_object_assert_init is detected.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Called from debug_object_assert_init() with a hardcoded state</div><div class='del'>-	ODEBUG_STATE_NOTAVAILABLE when the object is not found in the</div><div class='del'>-	debug bucket.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The function returns true when the fixup was successful,</div><div class='del'>-	otherwise false. The return value is used to update the</div><div class='del'>-	statistics.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Note, this function should make sure debug_object_init() is</div><div class='del'>-	called before returning.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The handling of statically initialized objects is a special</div><div class='del'>-	case. The fixup function should check if this is a legitimate</div><div class='del'>-	case of a statically initialized object or not. In this case only</div><div class='del'>-	debug_object_init() should be called to make the object known to</div><div class='del'>-	the tracker. Then the function should return false because this</div><div class='del'>-	is not</div><div class='del'>-	a real fixup.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter id="bugs"&gt;</div><div class='del'>-    &lt;title&gt;Known Bugs And Assumptions&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-	None (knock on wood).</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/Documentation/DocBook/deviceiobook.tmpl b/Documentation/DocBook/deviceiobook.tmpl<br/>deleted file mode 100644<br/>index 54199a0dcf9a..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/deviceiobook.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/deviceiobook.tmpl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,323 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='del'>-	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="DoingIO"&gt;</div><div class='del'>- &lt;bookinfo&gt;</div><div class='del'>-  &lt;title&gt;Bus-Independent Device Accesses&lt;/title&gt;</div><div class='del'>-  </div><div class='del'>-  &lt;authorgroup&gt;</div><div class='del'>-   &lt;author&gt;</div><div class='del'>-    &lt;firstname&gt;Matthew&lt;/firstname&gt;</div><div class='del'>-    &lt;surname&gt;Wilcox&lt;/surname&gt;</div><div class='del'>-    &lt;affiliation&gt;</div><div class='del'>-     &lt;address&gt;</div><div class='del'>-      &lt;email&gt;matthew@wil.cx&lt;/email&gt;</div><div class='del'>-     &lt;/address&gt;</div><div class='del'>-    &lt;/affiliation&gt;</div><div class='del'>-   &lt;/author&gt;</div><div class='del'>-  &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-  &lt;authorgroup&gt;</div><div class='del'>-   &lt;author&gt;</div><div class='del'>-    &lt;firstname&gt;Alan&lt;/firstname&gt;</div><div class='del'>-    &lt;surname&gt;Cox&lt;/surname&gt;</div><div class='del'>-    &lt;affiliation&gt;</div><div class='del'>-     &lt;address&gt;</div><div class='del'>-      &lt;email&gt;alan@lxorguk.ukuu.org.uk&lt;/email&gt;</div><div class='del'>-     &lt;/address&gt;</div><div class='del'>-    &lt;/affiliation&gt;</div><div class='del'>-   &lt;/author&gt;</div><div class='del'>-  &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-  &lt;copyright&gt;</div><div class='del'>-   &lt;year&gt;2001&lt;/year&gt;</div><div class='del'>-   &lt;holder&gt;Matthew Wilcox&lt;/holder&gt;</div><div class='del'>-  &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-  &lt;legalnotice&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This documentation is free software; you can redistribute</div><div class='del'>-     it and/or modify it under the terms of the GNU General Public</div><div class='del'>-     License as published by the Free Software Foundation; either</div><div class='del'>-     version 2 of the License, or (at your option) any later</div><div class='del'>-     version.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This program is distributed in the hope that it will be</div><div class='del'>-     useful, but WITHOUT ANY WARRANTY; without even the implied</div><div class='del'>-     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>-     See the GNU General Public License for more details.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     You should have received a copy of the GNU General Public</div><div class='del'>-     License along with this program; if not, write to the Free</div><div class='del'>-     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='del'>-     MA 02111-1307 USA</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     For more details see the file COPYING in the source</div><div class='del'>-     distribution of Linux.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/legalnotice&gt;</div><div class='del'>- &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-&lt;toc&gt;&lt;/toc&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="intro"&gt;</div><div class='del'>-      &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-	Linux provides an API which abstracts performing IO across all busses</div><div class='del'>-	and devices, allowing device drivers to be written independently of</div><div class='del'>-	bus type.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="bugs"&gt;</div><div class='del'>-     &lt;title&gt;Known Bugs And Assumptions&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-	None.	</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="mmio"&gt;</div><div class='del'>-    &lt;title&gt;Memory Mapped IO&lt;/title&gt;</div><div class='del'>-    &lt;sect1 id="getting_access_to_the_device"&gt;</div><div class='del'>-      &lt;title&gt;Getting Access to the Device&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The most widely supported form of IO is memory mapped IO.</div><div class='del'>-	That is, a part of the CPU's address space is interpreted</div><div class='del'>-	not as accesses to memory, but as accesses to a device.  Some</div><div class='del'>-	architectures define devices to be at a fixed address, but most</div><div class='del'>-	have some method of discovering devices.  The PCI bus walk is a</div><div class='del'>-	good example of such a scheme.	This document does not cover how</div><div class='del'>-	to receive such an address, but assumes you are starting with one.</div><div class='del'>-	Physical addresses are of type unsigned long. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This address should not be used directly.  Instead, to get an</div><div class='del'>-	address suitable for passing to the accessor functions described</div><div class='del'>-	below, you should call &lt;function&gt;ioremap&lt;/function&gt;.</div><div class='del'>-	An address suitable for accessing the device will be returned to you.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	After you've finished using the device (say, in your module's</div><div class='del'>-	exit routine), call &lt;function&gt;iounmap&lt;/function&gt; in order to return</div><div class='del'>-	the address space to the kernel.  Most architectures allocate new</div><div class='del'>-	address space each time you call &lt;function&gt;ioremap&lt;/function&gt;, and</div><div class='del'>-	they can run out unless you call &lt;function&gt;iounmap&lt;/function&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="accessing_the_device"&gt;</div><div class='del'>-      &lt;title&gt;Accessing the device&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The part of the interface most used by drivers is reading and</div><div class='del'>-	writing memory-mapped registers on the device.	Linux provides</div><div class='del'>-	interfaces to read and write 8-bit, 16-bit, 32-bit and 64-bit</div><div class='del'>-	quantities.  Due to a historical accident, these are named byte,</div><div class='del'>-	word, long and quad accesses.  Both read and write accesses are</div><div class='del'>-	supported; there is no prefetch support at this time.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The functions are named &lt;function&gt;readb&lt;/function&gt;,</div><div class='del'>-	&lt;function&gt;readw&lt;/function&gt;, &lt;function&gt;readl&lt;/function&gt;,</div><div class='del'>-	&lt;function&gt;readq&lt;/function&gt;, &lt;function&gt;readb_relaxed&lt;/function&gt;,</div><div class='del'>-	&lt;function&gt;readw_relaxed&lt;/function&gt;, &lt;function&gt;readl_relaxed&lt;/function&gt;,</div><div class='del'>-	&lt;function&gt;readq_relaxed&lt;/function&gt;, &lt;function&gt;writeb&lt;/function&gt;,</div><div class='del'>-	&lt;function&gt;writew&lt;/function&gt;, &lt;function&gt;writel&lt;/function&gt; and</div><div class='del'>-	&lt;function&gt;writeq&lt;/function&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Some devices (such as framebuffers) would like to use larger</div><div class='del'>-	transfers than 8 bytes at a time.  For these devices, the</div><div class='del'>-	&lt;function&gt;memcpy_toio&lt;/function&gt;, &lt;function&gt;memcpy_fromio&lt;/function&gt;</div><div class='del'>-	and &lt;function&gt;memset_io&lt;/function&gt; functions are provided.</div><div class='del'>-	Do not use memset or memcpy on IO addresses; they</div><div class='del'>-	are not guaranteed to copy data in order.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The read and write functions are defined to be ordered. That is the</div><div class='del'>-	compiler is not permitted to reorder the I/O sequence. When the </div><div class='del'>-	ordering can be compiler optimised, you can use &lt;function&gt;</div><div class='del'>-	__readb&lt;/function&gt; and friends to indicate the relaxed ordering. Use </div><div class='del'>-	this with care.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	While the basic functions are defined to be synchronous with respect</div><div class='del'>-	to each other and ordered with respect to each other the busses the</div><div class='del'>-	devices sit on may themselves have asynchronicity. In particular many</div><div class='del'>-	authors are burned by the fact that PCI bus writes are posted</div><div class='del'>-	asynchronously. A driver author must issue a read from the same</div><div class='del'>-	device to ensure that writes have occurred in the specific cases the</div><div class='del'>-	author cares. This kind of property cannot be hidden from driver</div><div class='del'>-	writers in the API.  In some cases, the read used to flush the device</div><div class='del'>-	may be expected to fail (if the card is resetting, for example).  In</div><div class='del'>-	that case, the read should be done from config space, which is</div><div class='del'>-	guaranteed to soft-fail if the card doesn't respond.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The following is an example of flushing a write to a device when</div><div class='del'>-	the driver would like to ensure the write's effects are visible prior</div><div class='del'>-	to continuing execution.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;programlisting&gt;</div><div class='del'>-static inline void</div><div class='del'>-qla1280_disable_intrs(struct scsi_qla_host *ha)</div><div class='del'>-{</div><div class='del'>-	struct device_reg *reg;</div><div class='del'>-</div><div class='del'>-	reg = ha-&gt;iobase;</div><div class='del'>-	/* disable risc and host interrupts */</div><div class='del'>-	WRT_REG_WORD(&amp;amp;reg-&gt;ictrl, 0);</div><div class='del'>-	/*</div><div class='del'>-	 * The following read will ensure that the above write</div><div class='del'>-	 * has been received by the device before we return from this</div><div class='del'>-	 * function.</div><div class='del'>-	 */</div><div class='del'>-	RD_REG_WORD(&amp;amp;reg-&gt;ictrl);</div><div class='del'>-	ha-&gt;flags.ints_enabled = 0;</div><div class='del'>-}</div><div class='del'>-&lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	In addition to write posting, on some large multiprocessing systems</div><div class='del'>-	(e.g. SGI Challenge, Origin and Altix machines) posted writes won't</div><div class='del'>-	be strongly ordered coming from different CPUs.  Thus it's important</div><div class='del'>-	to properly protect parts of your driver that do memory-mapped writes</div><div class='del'>-	with locks and use the &lt;function&gt;mmiowb&lt;/function&gt; to make sure they</div><div class='del'>-	arrive in the order intended.  Issuing a regular &lt;function&gt;readX</div><div class='del'>-	&lt;/function&gt; will also ensure write ordering, but should only be used</div><div class='del'>-	when the driver has to be sure that the write has actually arrived</div><div class='del'>-	at the device (not that it's simply ordered with respect to other</div><div class='del'>-	writes), since a full &lt;function&gt;readX&lt;/function&gt; is a relatively</div><div class='del'>-	expensive operation.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Generally, one should use &lt;function&gt;mmiowb&lt;/function&gt; prior to</div><div class='del'>-	releasing a spinlock that protects regions using &lt;function&gt;writeb</div><div class='del'>-	&lt;/function&gt; or similar functions that aren't surrounded by &lt;function&gt;</div><div class='del'>-	readb&lt;/function&gt; calls, which will ensure ordering and flushing.  The</div><div class='del'>-	following pseudocode illustrates what might occur if write ordering</div><div class='del'>-	isn't guaranteed via &lt;function&gt;mmiowb&lt;/function&gt; or one of the</div><div class='del'>-	&lt;function&gt;readX&lt;/function&gt; functions.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;programlisting&gt;</div><div class='del'>-CPU A:  spin_lock_irqsave(&amp;amp;dev_lock, flags)</div><div class='del'>-CPU A:  ...</div><div class='del'>-CPU A:  writel(newval, ring_ptr);</div><div class='del'>-CPU A:  spin_unlock_irqrestore(&amp;amp;dev_lock, flags)</div><div class='del'>-        ...</div><div class='del'>-CPU B:  spin_lock_irqsave(&amp;amp;dev_lock, flags)</div><div class='del'>-CPU B:  writel(newval2, ring_ptr);</div><div class='del'>-CPU B:  ...</div><div class='del'>-CPU B:  spin_unlock_irqrestore(&amp;amp;dev_lock, flags)</div><div class='del'>-&lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	In the case above, newval2 could be written to ring_ptr before</div><div class='del'>-	newval.  Fixing it is easy though:</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;programlisting&gt;</div><div class='del'>-CPU A:  spin_lock_irqsave(&amp;amp;dev_lock, flags)</div><div class='del'>-CPU A:  ...</div><div class='del'>-CPU A:  writel(newval, ring_ptr);</div><div class='del'>-CPU A:  mmiowb(); /* ensure no other writes beat us to the device */</div><div class='del'>-CPU A:  spin_unlock_irqrestore(&amp;amp;dev_lock, flags)</div><div class='del'>-        ...</div><div class='del'>-CPU B:  spin_lock_irqsave(&amp;amp;dev_lock, flags)</div><div class='del'>-CPU B:  writel(newval2, ring_ptr);</div><div class='del'>-CPU B:  ...</div><div class='del'>-CPU B:  mmiowb();</div><div class='del'>-CPU B:  spin_unlock_irqrestore(&amp;amp;dev_lock, flags)</div><div class='del'>-&lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	See tg3.c for a real world example of how to use &lt;function&gt;mmiowb</div><div class='del'>-	&lt;/function&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	PCI ordering rules also guarantee that PIO read responses arrive</div><div class='del'>-	after any outstanding DMA writes from that bus, since for some devices</div><div class='del'>-	the result of a &lt;function&gt;readb&lt;/function&gt; call may signal to the</div><div class='del'>-	driver that a DMA transaction is complete.  In many cases, however,</div><div class='del'>-	the driver may want to indicate that the next</div><div class='del'>-	&lt;function&gt;readb&lt;/function&gt; call has no relation to any previous DMA</div><div class='del'>-	writes performed by the device.  The driver can use</div><div class='del'>-	&lt;function&gt;readb_relaxed&lt;/function&gt; for these cases, although only</div><div class='del'>-	some platforms will honor the relaxed semantics.  Using the relaxed</div><div class='del'>-	read functions will provide significant performance benefits on</div><div class='del'>-	platforms that support it.  The qla2xxx driver provides examples</div><div class='del'>-	of how to use &lt;function&gt;readX_relaxed&lt;/function&gt;.  In many cases,</div><div class='del'>-	a majority of the driver's &lt;function&gt;readX&lt;/function&gt; calls can</div><div class='del'>-	safely be converted to &lt;function&gt;readX_relaxed&lt;/function&gt; calls, since</div><div class='del'>-	only a few will indicate or depend on DMA completion.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="port_space_accesses"&gt;</div><div class='del'>-    &lt;title&gt;Port Space Accesses&lt;/title&gt;</div><div class='del'>-    &lt;sect1 id="port_space_explained"&gt;</div><div class='del'>-      &lt;title&gt;Port Space Explained&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Another form of IO commonly supported is Port Space.  This is a</div><div class='del'>-	range of addresses separate to the normal memory address space.</div><div class='del'>-	Access to these addresses is generally not as fast as accesses</div><div class='del'>-	to the memory mapped addresses, and it also has a potentially</div><div class='del'>-	smaller address space.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Unlike memory mapped IO, no preparation is required</div><div class='del'>-	to access port space.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    &lt;sect1 id="accessing_port_space"&gt;</div><div class='del'>-      &lt;title&gt;Accessing Port Space&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Accesses to this space are provided through a set of functions</div><div class='del'>-	which allow 8-bit, 16-bit and 32-bit accesses; also</div><div class='del'>-	known as byte, word and long.  These functions are</div><div class='del'>-	&lt;function&gt;inb&lt;/function&gt;, &lt;function&gt;inw&lt;/function&gt;,</div><div class='del'>-	&lt;function&gt;inl&lt;/function&gt;, &lt;function&gt;outb&lt;/function&gt;,</div><div class='del'>-	&lt;function&gt;outw&lt;/function&gt; and &lt;function&gt;outl&lt;/function&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Some variants are provided for these functions.  Some devices</div><div class='del'>-	require that accesses to their ports are slowed down.  This</div><div class='del'>-	functionality is provided by appending a &lt;function&gt;_p&lt;/function&gt;</div><div class='del'>-	to the end of the function.  There are also equivalents to memcpy.</div><div class='del'>-	The &lt;function&gt;ins&lt;/function&gt; and &lt;function&gt;outs&lt;/function&gt;</div><div class='del'>-	functions copy bytes, words or longs to the given port.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="pubfunctions"&gt;</div><div class='del'>-     &lt;title&gt;Public Functions Provided&lt;/title&gt;</div><div class='del'>-!Iarch/x86/include/asm/io.h</div><div class='del'>-!Elib/pci_iomap.c</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/Documentation/DocBook/iio.tmpl b/Documentation/DocBook/iio.tmpl<br/>deleted file mode 100644<br/>index e2ab6a1f223e..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/iio.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/iio.tmpl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,697 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='del'>-	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="iioid"&gt;</div><div class='del'>-  &lt;bookinfo&gt;</div><div class='del'>-    &lt;title&gt;Industrial I/O driver developer's guide &lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-        &lt;firstname&gt;Daniel&lt;/firstname&gt;</div><div class='del'>-        &lt;surname&gt;Baluta&lt;/surname&gt;</div><div class='del'>-        &lt;affiliation&gt;</div><div class='del'>-          &lt;address&gt;</div><div class='del'>-            &lt;email&gt;daniel.baluta@intel.com&lt;/email&gt;</div><div class='del'>-          &lt;/address&gt;</div><div class='del'>-        &lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2015&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Intel Corporation&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-    &lt;legalnotice&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This documentation is free software; you can redistribute</div><div class='del'>-        it and/or modify it under the terms of the GNU General Public</div><div class='del'>-        License version 2.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/legalnotice&gt;</div><div class='del'>-  &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-  &lt;toc&gt;&lt;/toc&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="intro"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The main purpose of the Industrial I/O subsystem (IIO) is to provide</div><div class='del'>-      support for devices that in some sense perform either analog-to-digital</div><div class='del'>-      conversion (ADC) or digital-to-analog conversion (DAC) or both. The aim</div><div class='del'>-      is to fill the gap between the somewhat similar hwmon and input</div><div class='del'>-      subsystems.</div><div class='del'>-      Hwmon is directed at low sample rate sensors used to monitor and</div><div class='del'>-      control the system itself, like fan speed control or temperature</div><div class='del'>-      measurement. Input is, as its name suggests, focused on human interaction</div><div class='del'>-      input devices (keyboard, mouse, touchscreen). In some cases there is</div><div class='del'>-      considerable overlap between these and IIO.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Devices that fall into this category include:</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        analog to digital converters (ADCs)</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        accelerometers</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        capacitance to digital converters (CDCs)</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        digital to analog converters (DACs)</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        gyroscopes</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        inertial measurement units (IMUs)</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        color and light sensors</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        magnetometers</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        pressure sensors</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        proximity sensors</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        temperature sensors</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-    Usually these sensors are connected via SPI or I2C. A common use case of the</div><div class='del'>-    sensors devices is to have combined functionality (e.g. light plus proximity</div><div class='del'>-    sensor).</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter id='iiosubsys'&gt;</div><div class='del'>-    &lt;title&gt;Industrial I/O core&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The Industrial I/O core offers:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         a unified framework for writing drivers for many different types of</div><div class='del'>-         embedded sensors.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         a standard interface to user space applications manipulating sensors.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-      The implementation can be found under &lt;filename&gt;</div><div class='del'>-      drivers/iio/industrialio-*&lt;/filename&gt;</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;sect1 id="iiodevice"&gt;</div><div class='del'>-    &lt;title&gt; Industrial I/O devices &lt;/title&gt;</div><div class='del'>-</div><div class='del'>-!Finclude/linux/iio/iio.h iio_dev</div><div class='del'>-!Fdrivers/iio/industrialio-core.c iio_device_alloc</div><div class='del'>-!Fdrivers/iio/industrialio-core.c iio_device_free</div><div class='del'>-!Fdrivers/iio/industrialio-core.c iio_device_register</div><div class='del'>-!Fdrivers/iio/industrialio-core.c iio_device_unregister</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      An IIO device usually corresponds to a single hardware sensor and it</div><div class='del'>-      provides all the information needed by a driver handling a device.</div><div class='del'>-      Let's first have a look at the functionality embedded in an IIO</div><div class='del'>-      device then we will show how a device driver makes use of an IIO</div><div class='del'>-      device.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-        There are two ways for a user space application to interact</div><div class='del'>-        with an IIO driver.</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-          &lt;filename&gt;/sys/bus/iio/iio:deviceX/&lt;/filename&gt;, this</div><div class='del'>-          represents a hardware sensor and groups together the data</div><div class='del'>-          channels of the same chip.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-          &lt;filename&gt;/dev/iio:deviceX&lt;/filename&gt;, character device node</div><div class='del'>-          interface used for buffered data transfer and for events information</div><div class='del'>-          retrieval.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    A typical IIO driver will register itself as an I2C or SPI driver and will</div><div class='del'>-    create two routines, &lt;function&gt; probe &lt;/function&gt; and &lt;function&gt; remove</div><div class='del'>-    &lt;/function&gt;. At &lt;function&gt;probe&lt;/function&gt;:</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-    &lt;listitem&gt;call &lt;function&gt;iio_device_alloc&lt;/function&gt;, which allocates memory</div><div class='del'>-      for an IIO device.</div><div class='del'>-    &lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt; initialize IIO device fields with driver specific information</div><div class='del'>-              (e.g. device name, device channels).</div><div class='del'>-    &lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;call &lt;function&gt; iio_device_register&lt;/function&gt;, this registers the</div><div class='del'>-      device with the IIO core. After this call the device is ready to accept</div><div class='del'>-      requests from user space applications.</div><div class='del'>-    &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-      At &lt;function&gt;remove&lt;/function&gt;, we free the resources allocated in</div><div class='del'>-      &lt;function&gt;probe&lt;/function&gt; in reverse order:</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;function&gt;iio_device_unregister&lt;/function&gt;, unregister the device</div><div class='del'>-      from the IIO core.</div><div class='del'>-    &lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;function&gt;iio_device_free&lt;/function&gt;, free the memory allocated</div><div class='del'>-      for the IIO device.</div><div class='del'>-    &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="iioattr"&gt; &lt;title&gt; IIO device sysfs interface &lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Attributes are sysfs files used to expose chip info and also allowing</div><div class='del'>-        applications to set various configuration parameters. For device</div><div class='del'>-        with index X, attributes can be found under</div><div class='del'>-        &lt;filename&gt;/sys/bus/iio/iio:deviceX/ &lt;/filename&gt; directory.</div><div class='del'>-        Common attributes are:</div><div class='del'>-        &lt;itemizedlist&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;filename&gt;name&lt;/filename&gt;, description of the physical</div><div class='del'>-            chip.</div><div class='del'>-          &lt;/listitem&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;filename&gt;dev&lt;/filename&gt;, shows the major:minor pair</div><div class='del'>-            associated with &lt;filename&gt;/dev/iio:deviceX&lt;/filename&gt; node.</div><div class='del'>-          &lt;/listitem&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;filename&gt;sampling_frequency_available&lt;/filename&gt;,</div><div class='del'>-            available discrete set of sampling frequency values for</div><div class='del'>-            device.</div><div class='del'>-          &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-      Available standard attributes for IIO devices are described in the</div><div class='del'>-      &lt;filename&gt;Documentation/ABI/testing/sysfs-bus-iio &lt;/filename&gt; file</div><div class='del'>-      in the Linux kernel sources.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2 id="iiochannel"&gt; &lt;title&gt; IIO device channels &lt;/title&gt;</div><div class='del'>-!Finclude/linux/iio/iio.h iio_chan_spec structure.</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        An IIO device channel is a representation of a data channel. An</div><div class='del'>-        IIO device can have one or multiple channels. For example:</div><div class='del'>-        &lt;itemizedlist&gt;</div><div class='del'>-          &lt;listitem&gt;</div><div class='del'>-          a thermometer sensor has one channel representing the</div><div class='del'>-          temperature measurement.</div><div class='del'>-          &lt;/listitem&gt;</div><div class='del'>-          &lt;listitem&gt;</div><div class='del'>-          a light sensor with two channels indicating the measurements in</div><div class='del'>-          the visible and infrared spectrum.</div><div class='del'>-          &lt;/listitem&gt;</div><div class='del'>-          &lt;listitem&gt;</div><div class='del'>-          an accelerometer can have up to 3 channels representing</div><div class='del'>-          acceleration on X, Y and Z axes.</div><div class='del'>-          &lt;/listitem&gt;</div><div class='del'>-        &lt;/itemizedlist&gt;</div><div class='del'>-      An IIO channel is described by the &lt;type&gt; struct iio_chan_spec</div><div class='del'>-      &lt;/type&gt;. A thermometer driver for the temperature sensor in the</div><div class='del'>-      example above would have to describe its channel as follows:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-      static const struct iio_chan_spec temp_channel[] = {</div><div class='del'>-          {</div><div class='del'>-              .type = IIO_TEMP,</div><div class='del'>-              .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),</div><div class='del'>-          },</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      Channel sysfs attributes exposed to userspace are specified in</div><div class='del'>-      the form of &lt;emphasis&gt;bitmasks&lt;/emphasis&gt;. Depending on their</div><div class='del'>-      shared info, attributes can be set in one of the following masks:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;emphasis&gt;info_mask_separate&lt;/emphasis&gt;, attributes will</div><div class='del'>-        be specific to this channel&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;emphasis&gt;info_mask_shared_by_type&lt;/emphasis&gt;,</div><div class='del'>-        attributes are shared by all channels of the same type&lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;emphasis&gt;info_mask_shared_by_dir&lt;/emphasis&gt;, attributes</div><div class='del'>-        are shared by all channels of the same direction &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;emphasis&gt;info_mask_shared_by_all&lt;/emphasis&gt;,</div><div class='del'>-        attributes are shared by all channels&lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-      When there are multiple data channels per channel type we have two</div><div class='del'>-      ways to distinguish between them:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt; set &lt;emphasis&gt; .modified&lt;/emphasis&gt; field of &lt;type&gt;</div><div class='del'>-        iio_chan_spec&lt;/type&gt; to 1. Modifiers are specified using</div><div class='del'>-        &lt;emphasis&gt;.channel2&lt;/emphasis&gt; field of the same</div><div class='del'>-        &lt;type&gt;iio_chan_spec&lt;/type&gt; structure and are used to indicate a</div><div class='del'>-        physically unique characteristic of the channel such as its direction</div><div class='del'>-        or spectral response. For example, a light sensor can have two channels,</div><div class='del'>-        one for infrared light and one for both infrared and visible light.</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt; set &lt;emphasis&gt;.indexed &lt;/emphasis&gt; field of</div><div class='del'>-        &lt;type&gt;iio_chan_spec&lt;/type&gt; to 1. In this case the channel is</div><div class='del'>-        simply another instance with an index specified by the</div><div class='del'>-        &lt;emphasis&gt;.channel&lt;/emphasis&gt; field.</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-      Here is how we can make use of the channel's modifiers:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-      static const struct iio_chan_spec light_channels[] = {</div><div class='del'>-          {</div><div class='del'>-              .type = IIO_INTENSITY,</div><div class='del'>-              .modified = 1,</div><div class='del'>-              .channel2 = IIO_MOD_LIGHT_IR,</div><div class='del'>-              .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),</div><div class='del'>-              .info_mask_shared = BIT(IIO_CHAN_INFO_SAMP_FREQ),</div><div class='del'>-          },</div><div class='del'>-          {</div><div class='del'>-              .type = IIO_INTENSITY,</div><div class='del'>-              .modified = 1,</div><div class='del'>-              .channel2 = IIO_MOD_LIGHT_BOTH,</div><div class='del'>-              .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),</div><div class='del'>-              .info_mask_shared = BIT(IIO_CHAN_INFO_SAMP_FREQ),</div><div class='del'>-          },</div><div class='del'>-          {</div><div class='del'>-              .type = IIO_LIGHT,</div><div class='del'>-              .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),</div><div class='del'>-              .info_mask_shared = BIT(IIO_CHAN_INFO_SAMP_FREQ),</div><div class='del'>-          },</div><div class='del'>-</div><div class='del'>-      }</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      This channel's definition will generate two separate sysfs files</div><div class='del'>-      for raw data retrieval:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-      &lt;filename&gt;/sys/bus/iio/iio:deviceX/in_intensity_ir_raw&lt;/filename&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-      &lt;filename&gt;/sys/bus/iio/iio:deviceX/in_intensity_both_raw&lt;/filename&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-      one file for processed data:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-      &lt;filename&gt;/sys/bus/iio/iio:deviceX/in_illuminance_input</div><div class='del'>-      &lt;/filename&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-      and one shared sysfs file for sampling frequency:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-      &lt;filename&gt;/sys/bus/iio/iio:deviceX/sampling_frequency.</div><div class='del'>-      &lt;/filename&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      Here is how we can make use of the channel's indexing:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-      static const struct iio_chan_spec light_channels[] = {</div><div class='del'>-          {</div><div class='del'>-              .type = IIO_VOLTAGE,</div><div class='del'>-              .indexed = 1,</div><div class='del'>-              .channel = 0,</div><div class='del'>-              .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),</div><div class='del'>-          },</div><div class='del'>-          {</div><div class='del'>-              .type = IIO_VOLTAGE,</div><div class='del'>-              .indexed = 1,</div><div class='del'>-              .channel = 1,</div><div class='del'>-              .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),</div><div class='del'>-          },</div><div class='del'>-      }</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      This will generate two separate attributes files for raw data</div><div class='del'>-      retrieval:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;filename&gt;/sys/bus/iio/devices/iio:deviceX/in_voltage0_raw&lt;/filename&gt;,</div><div class='del'>-          representing voltage measurement for channel 0.</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;filename&gt;/sys/bus/iio/devices/iio:deviceX/in_voltage1_raw&lt;/filename&gt;,</div><div class='del'>-          representing voltage measurement for channel 1.</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="iiobuffer"&gt; &lt;title&gt; Industrial I/O buffers &lt;/title&gt;</div><div class='del'>-!Finclude/linux/iio/buffer.h iio_buffer</div><div class='del'>-!Edrivers/iio/industrialio-buffer.c</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    The Industrial I/O core offers a way for continuous data capture</div><div class='del'>-    based on a trigger source. Multiple data channels can be read at once</div><div class='del'>-    from &lt;filename&gt;/dev/iio:deviceX&lt;/filename&gt; character device node,</div><div class='del'>-    thus reducing the CPU load.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="iiobuffersysfs"&gt;</div><div class='del'>-    &lt;title&gt;IIO buffer sysfs interface &lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      An IIO buffer has an associated attributes directory under &lt;filename&gt;</div><div class='del'>-      /sys/bus/iio/iio:deviceX/buffer/&lt;/filename&gt;. Here are the existing</div><div class='del'>-      attributes:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-      &lt;emphasis&gt;length&lt;/emphasis&gt;, the total number of data samples</div><div class='del'>-      (capacity) that can be stored by the buffer.</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;emphasis&gt;enable&lt;/emphasis&gt;, activate buffer capture.</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2 id="iiobuffersetup"&gt; &lt;title&gt; IIO buffer setup &lt;/title&gt;</div><div class='del'>-      &lt;para&gt;The meta information associated with a channel reading</div><div class='del'>-        placed in a buffer is called a &lt;emphasis&gt; scan element &lt;/emphasis&gt;.</div><div class='del'>-        The important bits configuring scan elements are exposed to</div><div class='del'>-        userspace applications via the &lt;filename&gt;</div><div class='del'>-        /sys/bus/iio/iio:deviceX/scan_elements/&lt;/filename&gt; directory. This</div><div class='del'>-        file contains attributes of the following form:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;emphasis&gt;enable&lt;/emphasis&gt;, used for enabling a channel.</div><div class='del'>-        If and only if its attribute is non zero, then a triggered capture</div><div class='del'>-        will contain data samples for this channel.</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;emphasis&gt;type&lt;/emphasis&gt;, description of the scan element</div><div class='del'>-        data storage within the buffer and hence the form in which it is</div><div class='del'>-        read from user space. Format is &lt;emphasis&gt;</div><div class='del'>-        [be|le]:[s|u]bits/storagebitsXrepeat[&gt;&gt;shift] &lt;/emphasis&gt;.</div><div class='del'>-        &lt;itemizedlist&gt;</div><div class='del'>-        &lt;listitem&gt; &lt;emphasis&gt;be&lt;/emphasis&gt; or &lt;emphasis&gt;le&lt;/emphasis&gt;, specifies</div><div class='del'>-          big or little endian.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-        &lt;emphasis&gt;s &lt;/emphasis&gt;or &lt;emphasis&gt;u&lt;/emphasis&gt;, specifies if</div><div class='del'>-          signed (2's complement) or unsigned.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;&lt;emphasis&gt;bits&lt;/emphasis&gt;, is the number of valid data</div><div class='del'>-          bits.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;&lt;emphasis&gt;storagebits&lt;/emphasis&gt;, is the number of bits</div><div class='del'>-          (after padding) that it occupies in the buffer.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-        &lt;emphasis&gt;shift&lt;/emphasis&gt;, if specified, is the shift that needs</div><div class='del'>-          to be applied prior to masking out unused bits.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-        &lt;emphasis&gt;repeat&lt;/emphasis&gt;, specifies the number of bits/storagebits</div><div class='del'>-        repetitions. When the repeat element is 0 or 1, then the repeat</div><div class='del'>-        value is omitted.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-      For example, a driver for a 3-axis accelerometer with 12 bit</div><div class='del'>-      resolution where data is stored in two 8-bits registers as</div><div class='del'>-      follows:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-        7   6   5   4   3   2   1   0</div><div class='del'>-      +---+---+---+---+---+---+---+---+</div><div class='del'>-      |D3 |D2 |D1 |D0 | X | X | X | X | (LOW byte, address 0x06)</div><div class='del'>-      +---+---+---+---+---+---+---+---+</div><div class='del'>-</div><div class='del'>-        7   6   5   4   3   2   1   0</div><div class='del'>-      +---+---+---+---+---+---+---+---+</div><div class='del'>-      |D11|D10|D9 |D8 |D7 |D6 |D5 |D4 | (HIGH byte, address 0x07)</div><div class='del'>-      +---+---+---+---+---+---+---+---+</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-      will have the following scan element type for each axis:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-      $ cat /sys/bus/iio/devices/iio:device0/scan_elements/in_accel_y_type</div><div class='del'>-      le:s12/16&gt;&gt;4</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      A user space application will interpret data samples read from the</div><div class='del'>-      buffer as two byte little endian signed data, that needs a 4 bits</div><div class='del'>-      right shift before masking out the 12 valid bits of data.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      For implementing buffer support a driver should initialize the following</div><div class='del'>-      fields in &lt;type&gt;iio_chan_spec&lt;/type&gt; definition:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-          struct iio_chan_spec {</div><div class='del'>-              /* other members */</div><div class='del'>-              int scan_index</div><div class='del'>-              struct {</div><div class='del'>-                  char sign;</div><div class='del'>-                  u8 realbits;</div><div class='del'>-                  u8 storagebits;</div><div class='del'>-                  u8 shift;</div><div class='del'>-                  u8 repeat;</div><div class='del'>-                  enum iio_endian endianness;</div><div class='del'>-              } scan_type;</div><div class='del'>-          };</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      The driver implementing the accelerometer described above will</div><div class='del'>-      have the following channel definition:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-      struct struct iio_chan_spec accel_channels[] = {</div><div class='del'>-          {</div><div class='del'>-            .type = IIO_ACCEL,</div><div class='del'>-            .modified = 1,</div><div class='del'>-            .channel2 = IIO_MOD_X,</div><div class='del'>-            /* other stuff here */</div><div class='del'>-            .scan_index = 0,</div><div class='del'>-            .scan_type = {</div><div class='del'>-              .sign = 's',</div><div class='del'>-              .realbits = 12,</div><div class='del'>-              .storagebits = 16,</div><div class='del'>-              .shift = 4,</div><div class='del'>-              .endianness = IIO_LE,</div><div class='del'>-            },</div><div class='del'>-        }</div><div class='del'>-        /* similar for Y (with channel2 = IIO_MOD_Y, scan_index = 1)</div><div class='del'>-         * and Z (with channel2 = IIO_MOD_Z, scan_index = 2) axis</div><div class='del'>-         */</div><div class='del'>-    }</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    Here &lt;emphasis&gt; scan_index &lt;/emphasis&gt; defines the order in which</div><div class='del'>-    the enabled channels are placed inside the buffer. Channels with a lower</div><div class='del'>-    scan_index will be placed before channels with a higher index. Each</div><div class='del'>-    channel needs to have a unique scan_index.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    Setting scan_index to -1 can be used to indicate that the specific</div><div class='del'>-    channel does not support buffered capture. In this case no entries will</div><div class='del'>-    be created for the channel in the scan_elements directory.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="iiotrigger"&gt; &lt;title&gt; Industrial I/O triggers  &lt;/title&gt;</div><div class='del'>-!Finclude/linux/iio/trigger.h iio_trigger</div><div class='del'>-!Edrivers/iio/industrialio-trigger.c</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      In many situations it is useful for a driver to be able to</div><div class='del'>-      capture data based on some external event (trigger) as opposed</div><div class='del'>-      to periodically polling for data. An IIO trigger can be provided</div><div class='del'>-      by a device driver that also has an IIO device based on hardware</div><div class='del'>-      generated events (e.g. data ready or threshold exceeded) or</div><div class='del'>-      provided by a separate driver from an independent interrupt</div><div class='del'>-      source (e.g. GPIO line connected to some external system, timer</div><div class='del'>-      interrupt or user space writing a specific file in sysfs). A</div><div class='del'>-      trigger may initiate data capture for a number of sensors and</div><div class='del'>-      also it may be completely unrelated to the sensor itself.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="iiotrigsysfs"&gt; &lt;title&gt; IIO trigger sysfs interface &lt;/title&gt;</div><div class='del'>-      There are two locations in sysfs related to triggers:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-        &lt;listitem&gt;&lt;filename&gt;/sys/bus/iio/devices/triggerY&lt;/filename&gt;,</div><div class='del'>-          this file is created once an IIO trigger is registered with</div><div class='del'>-          the IIO core and corresponds to trigger with index Y. Because</div><div class='del'>-          triggers can be very different depending on type there are few</div><div class='del'>-          standard attributes that we can describe here:</div><div class='del'>-          &lt;itemizedlist&gt;</div><div class='del'>-            &lt;listitem&gt;</div><div class='del'>-              &lt;emphasis&gt;name&lt;/emphasis&gt;, trigger name that can be later</div><div class='del'>-                used for association with a device.</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-            &lt;listitem&gt;</div><div class='del'>-            &lt;emphasis&gt;sampling_frequency&lt;/emphasis&gt;, some timer based</div><div class='del'>-              triggers use this attribute to specify the frequency for</div><div class='del'>-              trigger calls.</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-          &lt;/itemizedlist&gt;</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-          &lt;filename&gt;/sys/bus/iio/devices/iio:deviceX/trigger/&lt;/filename&gt;, this</div><div class='del'>-          directory is created once the device supports a triggered</div><div class='del'>-          buffer. We can associate a trigger with our device by writing</div><div class='del'>-          the trigger's name in the &lt;filename&gt;current_trigger&lt;/filename&gt; file.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="iiotrigattr"&gt; &lt;title&gt; IIO trigger setup&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Let's see a simple example of how to setup a trigger to be used</div><div class='del'>-      by a driver.</div><div class='del'>-</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-      struct iio_trigger_ops trigger_ops = {</div><div class='del'>-          .set_trigger_state = sample_trigger_state,</div><div class='del'>-          .validate_device = sample_validate_device,</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-      struct iio_trigger *trig;</div><div class='del'>-</div><div class='del'>-      /* first, allocate memory for our trigger */</div><div class='del'>-      trig = iio_trigger_alloc(dev, "trig-%s-%d", name, idx);</div><div class='del'>-</div><div class='del'>-      /* setup trigger operations field */</div><div class='del'>-      trig-&gt;ops = &amp;amp;trigger_ops;</div><div class='del'>-</div><div class='del'>-      /* now register the trigger with the IIO core */</div><div class='del'>-      iio_trigger_register(trig);</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="iiotrigsetup"&gt; &lt;title&gt; IIO trigger ops&lt;/title&gt;</div><div class='del'>-!Finclude/linux/iio/trigger.h iio_trigger_ops</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-        Notice that a trigger has a set of operations attached:</div><div class='del'>-        &lt;itemizedlist&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-          &lt;function&gt;set_trigger_state&lt;/function&gt;, switch the trigger on/off</div><div class='del'>-          on demand.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-          &lt;function&gt;validate_device&lt;/function&gt;, function to validate the</div><div class='del'>-          device when the current trigger gets changed.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="iiotriggered_buffer"&gt;</div><div class='del'>-    &lt;title&gt; Industrial I/O triggered buffers &lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    Now that we know what buffers and triggers are let's see how they</div><div class='del'>-    work together.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;sect2 id="iiotrigbufsetup"&gt; &lt;title&gt; IIO triggered buffer setup&lt;/title&gt;</div><div class='del'>-!Edrivers/iio/buffer/industrialio-triggered-buffer.c</div><div class='del'>-!Finclude/linux/iio/iio.h iio_buffer_setup_ops</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    A typical triggered buffer setup looks like this:</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-    const struct iio_buffer_setup_ops sensor_buffer_setup_ops = {</div><div class='del'>-      .preenable    = sensor_buffer_preenable,</div><div class='del'>-      .postenable   = sensor_buffer_postenable,</div><div class='del'>-      .postdisable  = sensor_buffer_postdisable,</div><div class='del'>-      .predisable   = sensor_buffer_predisable,</div><div class='del'>-    };</div><div class='del'>-</div><div class='del'>-    irqreturn_t sensor_iio_pollfunc(int irq, void *p)</div><div class='del'>-    {</div><div class='del'>-        pf-&gt;timestamp = iio_get_time_ns((struct indio_dev *)p);</div><div class='del'>-        return IRQ_WAKE_THREAD;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    irqreturn_t sensor_trigger_handler(int irq, void *p)</div><div class='del'>-    {</div><div class='del'>-        u16 buf[8];</div><div class='del'>-        int i = 0;</div><div class='del'>-</div><div class='del'>-        /* read data for each active channel */</div><div class='del'>-        for_each_set_bit(bit, active_scan_mask, masklength)</div><div class='del'>-            buf[i++] = sensor_get_data(bit)</div><div class='del'>-</div><div class='del'>-        iio_push_to_buffers_with_timestamp(indio_dev, buf, timestamp);</div><div class='del'>-</div><div class='del'>-        iio_trigger_notify_done(trigger);</div><div class='del'>-        return IRQ_HANDLED;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* setup triggered buffer, usually in probe function */</div><div class='del'>-    iio_triggered_buffer_setup(indio_dev, sensor_iio_polfunc,</div><div class='del'>-                               sensor_trigger_handler,</div><div class='del'>-                               sensor_buffer_setup_ops);</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    The important things to notice here are:</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;function&gt; iio_buffer_setup_ops&lt;/function&gt;, the buffer setup</div><div class='del'>-    functions to be called at predefined points in the buffer configuration</div><div class='del'>-    sequence (e.g. before enable, after disable). If not specified, the</div><div class='del'>-    IIO core uses the default &lt;type&gt;iio_triggered_buffer_setup_ops&lt;/type&gt;.</div><div class='del'>-    &lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;function&gt;sensor_iio_pollfunc&lt;/function&gt;, the function that</div><div class='del'>-    will be used as top half of poll function. It should do as little</div><div class='del'>-    processing as possible, because it runs in interrupt context. The most</div><div class='del'>-    common operation is recording of the current timestamp and for this reason</div><div class='del'>-    one can use the IIO core defined &lt;function&gt;iio_pollfunc_store_time</div><div class='del'>-    &lt;/function&gt; function.</div><div class='del'>-    &lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;function&gt;sensor_trigger_handler&lt;/function&gt;, the function that</div><div class='del'>-    will be used as bottom half of the poll function. This runs in the</div><div class='del'>-    context of a kernel thread and all the processing takes place here.</div><div class='del'>-    It usually reads data from the device and stores it in the internal</div><div class='del'>-    buffer together with the timestamp recorded in the top half.</div><div class='del'>-    &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-  &lt;chapter id='iioresources'&gt;</div><div class='del'>-    &lt;title&gt; Resources &lt;/title&gt;</div><div class='del'>-      IIO core may change during time so the best documentation to read is the</div><div class='del'>-      source code. There are several locations where you should look:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-          &lt;filename&gt;drivers/iio/&lt;/filename&gt;, contains the IIO core plus</div><div class='del'>-          and directories for each sensor type (e.g. accel, magnetometer,</div><div class='del'>-          etc.)</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-          &lt;filename&gt;include/linux/iio/&lt;/filename&gt;, contains the header</div><div class='del'>-          files, nice to read for the internal kernel interfaces.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-        &lt;filename&gt;include/uapi/linux/iio/&lt;/filename&gt;, contains files to be</div><div class='del'>-          used by user space applications.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-         &lt;filename&gt;tools/iio/&lt;/filename&gt;, contains tools for rapidly</div><div class='del'>-          testing buffers, events and device creation.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;</div><div class='del'>-          &lt;filename&gt;drivers/staging/iio/&lt;/filename&gt;, contains code for some</div><div class='del'>-          drivers or experimental features that are not yet mature enough</div><div class='del'>-          to be moved out.</div><div class='del'>-        &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    Besides the code, there are some good online documentation sources:</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-    &lt;listitem&gt;</div><div class='del'>-      &lt;ulink url="http://marc.info/?l=linux-iio"&gt; Industrial I/O mailing</div><div class='del'>-      list &lt;/ulink&gt;</div><div class='del'>-    &lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;</div><div class='del'>-      &lt;ulink url="http://wiki.analog.com/software/linux/docs/iio/iio"&gt;</div><div class='del'>-      Analog Device IIO wiki page &lt;/ulink&gt;</div><div class='del'>-    &lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;</div><div class='del'>-      &lt;ulink url="https://fosdem.org/2015/schedule/event/iiosdr/"&gt;</div><div class='del'>-      Using the Linux IIO framework for SDR, Lars-Peter Clausen's</div><div class='del'>-      presentation at FOSDEM &lt;/ulink&gt;</div><div class='del'>-    &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-&lt;/book&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl<br/>index 2a272275c81b..da5c087462b1 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/kernel-hacking.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/kernel-hacking.tmpl</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/DocBook/kernel-hacking.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/kernel-hacking.tmpl</a></div><div class='hunk'>@@ -1208,8 +1208,8 @@ static struct block_device_operations opt_fops = {</div><div class='ctx'>    </div><div class='ctx'>    &lt;listitem&gt;</div><div class='ctx'>     &lt;para&gt;</div><div class='del'>-     Finally, don't forget to read &lt;filename&gt;Documentation/SubmittingPatches&lt;/filename&gt;</div><div class='del'>-     and possibly &lt;filename&gt;Documentation/SubmittingDrivers&lt;/filename&gt;.</div><div class='add'>+     Finally, don't forget to read &lt;filename&gt;Documentation/process/submitting-patches.rst&lt;/filename&gt;</div><div class='add'>+     and possibly &lt;filename&gt;Documentation/process/submitting-drivers.rst&lt;/filename&gt;.</div><div class='ctx'>     &lt;/para&gt;</div><div class='ctx'>    &lt;/listitem&gt;</div><div class='ctx'>   &lt;/itemizedlist&gt;</div><div class='head'>diff --git a/Documentation/DocBook/kgdb.tmpl b/Documentation/DocBook/kgdb.tmpl<br/>index f3abca7ec53d..856ac20bf367 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/kgdb.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/kgdb.tmpl</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/DocBook/kgdb.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/kgdb.tmpl</a></div><div class='hunk'>@@ -115,12 +115,12 @@</div><div class='ctx'>     &lt;/para&gt;</div><div class='ctx'>     &lt;para&gt;</div><div class='ctx'>     If the architecture that you are using supports the kernel option</div><div class='del'>-    CONFIG_DEBUG_RODATA, you should consider turning it off.  This</div><div class='add'>+    CONFIG_STRICT_KERNEL_RWX, you should consider turning it off.  This</div><div class='ctx'>     option will prevent the use of software breakpoints because it</div><div class='ctx'>     marks certain regions of the kernel's memory space as read-only.</div><div class='ctx'>     If kgdb supports it for the architecture you are using, you can</div><div class='ctx'>     use hardware breakpoints if you desire to run with the</div><div class='del'>-    CONFIG_DEBUG_RODATA option turned on, else you need to turn off</div><div class='add'>+    CONFIG_STRICT_KERNEL_RWX option turned on, else you need to turn off</div><div class='ctx'>     this option.</div><div class='ctx'>     &lt;/para&gt;</div><div class='ctx'>     &lt;para&gt;</div><div class='hunk'>@@ -135,7 +135,7 @@</div><div class='ctx'>     &lt;para&gt;Here is an example set of .config symbols to enable or</div><div class='ctx'>     disable for kgdb:</div><div class='ctx'>     &lt;itemizedlist&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;para&gt;# CONFIG_DEBUG_RODATA is not set&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+    &lt;listitem&gt;&lt;para&gt;# CONFIG_STRICT_KERNEL_RWX is not set&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'>     &lt;listitem&gt;&lt;para&gt;CONFIG_FRAME_POINTER=y&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'>     &lt;listitem&gt;&lt;para&gt;CONFIG_KGDB=y&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'>     &lt;listitem&gt;&lt;para&gt;CONFIG_KGDB_SERIAL_CONSOLE=y&lt;/para&gt;&lt;/listitem&gt;</div><div class='hunk'>@@ -166,7 +166,7 @@</div><div class='ctx'>     &lt;/para&gt;</div><div class='ctx'>     &lt;para&gt;Here is an example set of .config symbols to enable/disable kdb:</div><div class='ctx'>     &lt;itemizedlist&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;para&gt;# CONFIG_DEBUG_RODATA is not set&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+    &lt;listitem&gt;&lt;para&gt;# CONFIG_STRICT_KERNEL_RWX is not set&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'>     &lt;listitem&gt;&lt;para&gt;CONFIG_FRAME_POINTER=y&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'>     &lt;listitem&gt;&lt;para&gt;CONFIG_KGDB=y&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'>     &lt;listitem&gt;&lt;para&gt;CONFIG_KGDB_SERIAL_CONSOLE=y&lt;/para&gt;&lt;/listitem&gt;</div><div class='head'>diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl<br/>index d7fcdc5a4379..0320910b866d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/libata.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/libata.tmpl</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/DocBook/libata.tmpl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/DocBook/libata.tmpl</a></div><div class='hunk'>@@ -1020,7 +1020,7 @@ and other resources, etc.</div><div class='ctx'> 	&lt;/itemizedlist&gt;</div><div class='ctx'> </div><div class='ctx'> 	&lt;para&gt;</div><div class='del'>-	Of errors detected as above, the followings are not ATA/ATAPI</div><div class='add'>+	Of errors detected as above, the following are not ATA/ATAPI</div><div class='ctx'> 	device errors but ATA bus errors and should be handled</div><div class='ctx'> 	according to &lt;xref linkend="excatATAbusErr"/&gt;.</div><div class='ctx'> 	&lt;/para&gt;</div><div class='head'>diff --git a/Documentation/DocBook/regulator.tmpl b/Documentation/DocBook/regulator.tmpl<br/>deleted file mode 100644<br/>index 3b08a085d2c7..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/regulator.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/regulator.tmpl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,304 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='del'>-	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="regulator-api"&gt;</div><div class='del'>- &lt;bookinfo&gt;</div><div class='del'>-  &lt;title&gt;Voltage and current regulator API&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-  &lt;authorgroup&gt;</div><div class='del'>-   &lt;author&gt;</div><div class='del'>-    &lt;firstname&gt;Liam&lt;/firstname&gt;</div><div class='del'>-    &lt;surname&gt;Girdwood&lt;/surname&gt;</div><div class='del'>-    &lt;affiliation&gt;</div><div class='del'>-     &lt;address&gt;</div><div class='del'>-      &lt;email&gt;lrg@slimlogic.co.uk&lt;/email&gt;</div><div class='del'>-     &lt;/address&gt;</div><div class='del'>-    &lt;/affiliation&gt;</div><div class='del'>-   &lt;/author&gt;</div><div class='del'>-   &lt;author&gt;</div><div class='del'>-    &lt;firstname&gt;Mark&lt;/firstname&gt;</div><div class='del'>-    &lt;surname&gt;Brown&lt;/surname&gt;</div><div class='del'>-    &lt;affiliation&gt;</div><div class='del'>-     &lt;orgname&gt;Wolfson Microelectronics&lt;/orgname&gt;</div><div class='del'>-     &lt;address&gt;</div><div class='del'>-      &lt;email&gt;broonie@opensource.wolfsonmicro.com&lt;/email&gt;</div><div class='del'>-     &lt;/address&gt;</div><div class='del'>-    &lt;/affiliation&gt;</div><div class='del'>-   &lt;/author&gt;</div><div class='del'>-  &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-  &lt;copyright&gt;</div><div class='del'>-   &lt;year&gt;2007-2008&lt;/year&gt;</div><div class='del'>-   &lt;holder&gt;Wolfson Microelectronics&lt;/holder&gt;</div><div class='del'>-  &lt;/copyright&gt;</div><div class='del'>-  &lt;copyright&gt;</div><div class='del'>-   &lt;year&gt;2008&lt;/year&gt;</div><div class='del'>-   &lt;holder&gt;Liam Girdwood&lt;/holder&gt;</div><div class='del'>-  &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-  &lt;legalnotice&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This documentation is free software; you can redistribute</div><div class='del'>-     it and/or modify it under the terms of the GNU General Public</div><div class='del'>-     License version 2 as published by the Free Software Foundation.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This program is distributed in the hope that it will be</div><div class='del'>-     useful, but WITHOUT ANY WARRANTY; without even the implied</div><div class='del'>-     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>-     See the GNU General Public License for more details.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     You should have received a copy of the GNU General Public</div><div class='del'>-     License along with this program; if not, write to the Free</div><div class='del'>-     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='del'>-     MA 02111-1307 USA</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     For more details see the file COPYING in the source</div><div class='del'>-     distribution of Linux.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/legalnotice&gt;</div><div class='del'>- &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-&lt;toc&gt;&lt;/toc&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="intro"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-	This framework is designed to provide a standard kernel</div><div class='del'>-	interface to control voltage and current regulators.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-	The intention is to allow systems to dynamically control</div><div class='del'>-	regulator power output in order to save power and prolong</div><div class='del'>-	battery life.  This applies to both voltage regulators (where</div><div class='del'>-	voltage output is controllable) and current sinks (where current</div><div class='del'>-	limit is controllable).</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-	Note that additional (and currently more complete) documentation</div><div class='del'>-	is available in the Linux kernel source under</div><div class='del'>-	&lt;filename&gt;Documentation/power/regulator&lt;/filename&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="glossary"&gt;</div><div class='del'>-       &lt;title&gt;Glossary&lt;/title&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-	The regulator API uses a number of terms which may not be</div><div class='del'>-	familiar:</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       &lt;glossary&gt;</div><div class='del'>-</div><div class='del'>-         &lt;glossentry&gt;</div><div class='del'>-	   &lt;glossterm&gt;Regulator&lt;/glossterm&gt;</div><div class='del'>-	   &lt;glossdef&gt;</div><div class='del'>-	     &lt;para&gt;</div><div class='del'>-	Electronic device that supplies power to other devices.  Most</div><div class='del'>-	regulators can enable and disable their output and some can also</div><div class='del'>-	control their output voltage or current.</div><div class='del'>-	     &lt;/para&gt;</div><div class='del'>-	   &lt;/glossdef&gt;</div><div class='del'>-         &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-	 &lt;glossentry&gt;</div><div class='del'>-	   &lt;glossterm&gt;Consumer&lt;/glossterm&gt;</div><div class='del'>-	   &lt;glossdef&gt;</div><div class='del'>-	     &lt;para&gt;</div><div class='del'>-	Electronic device which consumes power provided by a regulator.</div><div class='del'>-	These may either be static, requiring only a fixed supply, or</div><div class='del'>-	dynamic, requiring active management of the regulator at</div><div class='del'>-	runtime.</div><div class='del'>-	     &lt;/para&gt;</div><div class='del'>-	   &lt;/glossdef&gt;</div><div class='del'>-	 &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-	 &lt;glossentry&gt;</div><div class='del'>-	   &lt;glossterm&gt;Power Domain&lt;/glossterm&gt;</div><div class='del'>-	   &lt;glossdef&gt;</div><div class='del'>-	     &lt;para&gt;</div><div class='del'>-	The electronic circuit supplied by a given regulator, including</div><div class='del'>-	the regulator and all consumer devices.  The configuration of</div><div class='del'>-	the regulator is shared between all the components in the</div><div class='del'>-	circuit.</div><div class='del'>-	     &lt;/para&gt;</div><div class='del'>-	   &lt;/glossdef&gt;</div><div class='del'>-	 &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-	 &lt;glossentry&gt;</div><div class='del'>-	   &lt;glossterm&gt;Power Management Integrated Circuit&lt;/glossterm&gt;</div><div class='del'>-	   &lt;acronym&gt;PMIC&lt;/acronym&gt;</div><div class='del'>-	   &lt;glossdef&gt;</div><div class='del'>-	     &lt;para&gt;</div><div class='del'>-	An IC which contains numerous regulators and often also other</div><div class='del'>-	subsystems.  In an embedded system the primary PMIC is often</div><div class='del'>-	equivalent to a combination of the PSU and southbridge in a</div><div class='del'>-	desktop system.</div><div class='del'>-	     &lt;/para&gt;</div><div class='del'>-	   &lt;/glossdef&gt;</div><div class='del'>-	 &lt;/glossentry&gt;</div><div class='del'>-	&lt;/glossary&gt;</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="consumer"&gt;</div><div class='del'>-     &lt;title&gt;Consumer driver interface&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-       This offers a similar API to the kernel clock framework.</div><div class='del'>-       Consumer drivers use &lt;link</div><div class='del'>-       linkend='API-regulator-get'&gt;get&lt;/link&gt; and &lt;link</div><div class='del'>-       linkend='API-regulator-put'&gt;put&lt;/link&gt; operations to acquire and</div><div class='del'>-       release regulators.  Functions are</div><div class='del'>-       provided to &lt;link linkend='API-regulator-enable'&gt;enable&lt;/link&gt;</div><div class='del'>-       and &lt;link linkend='API-regulator-disable'&gt;disable&lt;/link&gt; the</div><div class='del'>-       regulator and to get and set the runtime parameters of the</div><div class='del'>-       regulator.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-       When requesting regulators consumers use symbolic names for their</div><div class='del'>-       supplies, such as "Vcc", which are mapped into actual regulator</div><div class='del'>-       devices by the machine interface.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-	A stub version of this API is provided when the regulator</div><div class='del'>-	framework is not in use in order to minimise the need to use</div><div class='del'>-	ifdefs.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;sect1 id="consumer-enable"&gt;</div><div class='del'>-       &lt;title&gt;Enabling and disabling&lt;/title&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         The regulator API provides reference counted enabling and</div><div class='del'>-	 disabling of regulators. Consumer devices use the &lt;function&gt;&lt;link</div><div class='del'>-	 linkend='API-regulator-enable'&gt;regulator_enable&lt;/link&gt;&lt;/function&gt;</div><div class='del'>-	 and &lt;function&gt;&lt;link</div><div class='del'>-	 linkend='API-regulator-disable'&gt;regulator_disable&lt;/link&gt;</div><div class='del'>-	 &lt;/function&gt; functions to enable and disable regulators.  Calls</div><div class='del'>-	 to the two functions must be balanced.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         Note that since multiple consumers may be using a regulator and</div><div class='del'>-	 machine constraints may not allow the regulator to be disabled</div><div class='del'>-	 there is no guarantee that calling</div><div class='del'>-	 &lt;function&gt;regulator_disable&lt;/function&gt; will actually cause the</div><div class='del'>-	 supply provided by the regulator to be disabled. Consumer</div><div class='del'>-	 drivers should assume that the regulator may be enabled at all</div><div class='del'>-	 times.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-     &lt;sect1 id="consumer-config"&gt;</div><div class='del'>-       &lt;title&gt;Configuration&lt;/title&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         Some consumer devices may need to be able to dynamically</div><div class='del'>-	 configure their supplies.  For example, MMC drivers may need to</div><div class='del'>-	 select the correct operating voltage for their cards.  This may</div><div class='del'>-	 be done while the regulator is enabled or disabled.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-	 The &lt;function&gt;&lt;link</div><div class='del'>-	 linkend='API-regulator-set-voltage'&gt;regulator_set_voltage&lt;/link&gt;</div><div class='del'>-	 &lt;/function&gt; and &lt;function&gt;&lt;link</div><div class='del'>-	 linkend='API-regulator-set-current-limit'</div><div class='del'>-	 &gt;regulator_set_current_limit&lt;/link&gt;</div><div class='del'>-	 &lt;/function&gt; functions provide the primary interface for this.</div><div class='del'>-	 Both take ranges of voltages and currents, supporting drivers</div><div class='del'>-	 that do not require a specific value (eg, CPU frequency scaling</div><div class='del'>-	 normally permits the CPU to use a wider range of supply</div><div class='del'>-	 voltages at lower frequencies but does not require that the</div><div class='del'>-	 supply voltage be lowered).  Where an exact value is required</div><div class='del'>-	 both minimum and maximum values should be identical.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-     &lt;sect1 id="consumer-callback"&gt;</div><div class='del'>-       &lt;title&gt;Callbacks&lt;/title&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-	  Callbacks may also be &lt;link</div><div class='del'>-	  linkend='API-regulator-register-notifier'&gt;registered&lt;/link&gt;</div><div class='del'>-	  for events such as regulation failures.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-   &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-   &lt;chapter id="driver"&gt;</div><div class='del'>-     &lt;title&gt;Regulator driver interface&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-       Drivers for regulator chips &lt;link</div><div class='del'>-       linkend='API-regulator-register'&gt;register&lt;/link&gt; the regulators</div><div class='del'>-       with the regulator core, providing operations structures to the</div><div class='del'>-       core.  A &lt;link</div><div class='del'>-       linkend='API-regulator-notifier-call-chain'&gt;notifier&lt;/link&gt; interface</div><div class='del'>-       allows error conditions to be reported to the core.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-       Registration should be triggered by explicit setup done by the</div><div class='del'>-       platform, supplying a &lt;link</div><div class='del'>-       linkend='API-struct-regulator-init-data'&gt;struct</div><div class='del'>-       regulator_init_data&lt;/link&gt; for the regulator containing</div><div class='del'>-       &lt;link linkend='machine-constraint'&gt;constraint&lt;/link&gt; and</div><div class='del'>-       &lt;link linkend='machine-supply'&gt;supply&lt;/link&gt; information.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-   &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-   &lt;chapter id="machine"&gt;</div><div class='del'>-     &lt;title&gt;Machine interface&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-       This interface provides a way to define how regulators are</div><div class='del'>-       connected to consumers on a given system and what the valid</div><div class='del'>-       operating parameters are for the system.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;sect1 id="machine-supply"&gt;</div><div class='del'>-       &lt;title&gt;Supplies&lt;/title&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         Regulator supplies are specified using &lt;link</div><div class='del'>-	 linkend='API-struct-regulator-consumer-supply'&gt;struct</div><div class='del'>-	 regulator_consumer_supply&lt;/link&gt;.  This is done at</div><div class='del'>-	 &lt;link linkend='driver'&gt;driver registration</div><div class='del'>-	 time&lt;/link&gt; as part of the machine constraints.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-     &lt;sect1 id="machine-constraint"&gt;</div><div class='del'>-       &lt;title&gt;Constraints&lt;/title&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-	 As well as defining the connections the machine interface</div><div class='del'>-	 also provides constraints defining the operations that</div><div class='del'>-	 clients are allowed to perform and the parameters that may be</div><div class='del'>-	 set.  This is required since generally regulator devices will</div><div class='del'>-	 offer more flexibility than it is safe to use on a given</div><div class='del'>-	 system, for example supporting higher supply voltages than the</div><div class='del'>-	 consumers are rated for.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-	 This is done at &lt;link linkend='driver'&gt;driver</div><div class='del'>-	 registration time&lt;/link&gt; by providing a &lt;link</div><div class='del'>-	 linkend='API-struct-regulation-constraints'&gt;struct</div><div class='del'>-	 regulation_constraints&lt;/link&gt;.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         The constraints may also specify an initial configuration for the</div><div class='del'>-         regulator in the constraints, which is particularly useful for</div><div class='del'>-         use with static consumers.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-     &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="api"&gt;</div><div class='del'>-    &lt;title&gt;API reference&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Due to limitations of the kernel documentation framework and the</div><div class='del'>-      existing layout of the source code the entire regulator API is</div><div class='del'>-      documented here.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-!Iinclude/linux/regulator/consumer.h</div><div class='del'>-!Iinclude/linux/regulator/machine.h</div><div class='del'>-!Iinclude/linux/regulator/driver.h</div><div class='del'>-!Edrivers/regulator/core.c</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/Documentation/DocBook/tracepoint.tmpl b/Documentation/DocBook/tracepoint.tmpl<br/>deleted file mode 100644<br/>index b57a9ede3224..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/tracepoint.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/tracepoint.tmpl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,112 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='del'>-	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="Tracepoints"&gt;</div><div class='del'>- &lt;bookinfo&gt;</div><div class='del'>-  &lt;title&gt;The Linux Kernel Tracepoint API&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-  &lt;authorgroup&gt;</div><div class='del'>-   &lt;author&gt;</div><div class='del'>-    &lt;firstname&gt;Jason&lt;/firstname&gt;</div><div class='del'>-    &lt;surname&gt;Baron&lt;/surname&gt;</div><div class='del'>-    &lt;affiliation&gt;</div><div class='del'>-     &lt;address&gt;</div><div class='del'>-      &lt;email&gt;jbaron@redhat.com&lt;/email&gt;</div><div class='del'>-     &lt;/address&gt;</div><div class='del'>-    &lt;/affiliation&gt;</div><div class='del'>-   &lt;/author&gt;</div><div class='del'>-   &lt;author&gt;</div><div class='del'>-    &lt;firstname&gt;William&lt;/firstname&gt;</div><div class='del'>-    &lt;surname&gt;Cohen&lt;/surname&gt;</div><div class='del'>-    &lt;affiliation&gt;</div><div class='del'>-     &lt;address&gt;</div><div class='del'>-      &lt;email&gt;wcohen@redhat.com&lt;/email&gt;</div><div class='del'>-     &lt;/address&gt;</div><div class='del'>-    &lt;/affiliation&gt;</div><div class='del'>-   &lt;/author&gt;</div><div class='del'>-  &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-  &lt;legalnotice&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This documentation is free software; you can redistribute</div><div class='del'>-     it and/or modify it under the terms of the GNU General Public</div><div class='del'>-     License as published by the Free Software Foundation; either</div><div class='del'>-     version 2 of the License, or (at your option) any later</div><div class='del'>-     version.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This program is distributed in the hope that it will be</div><div class='del'>-     useful, but WITHOUT ANY WARRANTY; without even the implied</div><div class='del'>-     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>-     See the GNU General Public License for more details.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     You should have received a copy of the GNU General Public</div><div class='del'>-     License along with this program; if not, write to the Free</div><div class='del'>-     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='del'>-     MA 02111-1307 USA</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     For more details see the file COPYING in the source</div><div class='del'>-     distribution of Linux.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/legalnotice&gt;</div><div class='del'>- &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>- &lt;toc&gt;&lt;/toc&gt;</div><div class='del'>-  &lt;chapter id="intro"&gt;</div><div class='del'>-   &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     Tracepoints are static probe points that are located in strategic points</div><div class='del'>-     throughout the kernel. 'Probes' register/unregister with tracepoints</div><div class='del'>-     via a callback mechanism. The 'probes' are strictly typed functions that</div><div class='del'>-     are passed a unique set of parameters defined by each tracepoint.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     From this simple callback mechanism, 'probes' can be used to profile, debug,</div><div class='del'>-     and understand kernel behavior. There are a number of tools that provide a</div><div class='del'>-     framework for using 'probes'. These tools include Systemtap, ftrace, and</div><div class='del'>-     LTTng.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     Tracepoints are defined in a number of header files via various macros. Thus,</div><div class='del'>-     the purpose of this document is to provide a clear accounting of the available</div><div class='del'>-     tracepoints. The intention is to understand not only what tracepoints are</div><div class='del'>-     available but also to understand where future tracepoints might be added.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     The API presented has functions of the form:</div><div class='del'>-     &lt;function&gt;trace_tracepointname(function parameters)&lt;/function&gt;. These are the</div><div class='del'>-     tracepoints callbacks that are found throughout the code. Registering and</div><div class='del'>-     unregistering probes with these callback sites is covered in the</div><div class='del'>-     &lt;filename&gt;Documentation/trace/*&lt;/filename&gt; directory.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="irq"&gt;</div><div class='del'>-   &lt;title&gt;IRQ&lt;/title&gt;</div><div class='del'>-!Iinclude/trace/events/irq.h</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="signal"&gt;</div><div class='del'>-   &lt;title&gt;SIGNAL&lt;/title&gt;</div><div class='del'>-!Iinclude/trace/events/signal.h</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="block"&gt;</div><div class='del'>-   &lt;title&gt;Block IO&lt;/title&gt;</div><div class='del'>-!Iinclude/trace/events/block.h</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="workqueue"&gt;</div><div class='del'>-   &lt;title&gt;Workqueue&lt;/title&gt;</div><div class='del'>-!Iinclude/trace/events/workqueue.h</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl<br/>deleted file mode 100644<br/>index cd0e452dfed5..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/uio-howto.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/uio-howto.tmpl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1050 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"</div><div class='del'>-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="index"&gt;</div><div class='del'>-&lt;bookinfo&gt;</div><div class='del'>-&lt;title&gt;The Userspace I/O HOWTO&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-&lt;author&gt;</div><div class='del'>-      &lt;firstname&gt;Hans-Jürgen&lt;/firstname&gt;</div><div class='del'>-      &lt;surname&gt;Koch&lt;/surname&gt;</div><div class='del'>-      &lt;authorblurb&gt;&lt;para&gt;Linux developer, Linutronix&lt;/para&gt;&lt;/authorblurb&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	&lt;orgname&gt;</div><div class='del'>-		&lt;ulink url="http://www.linutronix.de"&gt;Linutronix&lt;/ulink&gt;</div><div class='del'>-	&lt;/orgname&gt;</div><div class='del'>-</div><div class='del'>-	&lt;address&gt;</div><div class='del'>-	   &lt;email&gt;hjk@hansjkoch.de&lt;/email&gt;</div><div class='del'>-	&lt;/address&gt;</div><div class='del'>-    &lt;/affiliation&gt;</div><div class='del'>-&lt;/author&gt;</div><div class='del'>-</div><div class='del'>-&lt;copyright&gt;</div><div class='del'>-	&lt;year&gt;2006-2008&lt;/year&gt;</div><div class='del'>-	&lt;holder&gt;Hans-Jürgen Koch.&lt;/holder&gt;</div><div class='del'>-&lt;/copyright&gt;</div><div class='del'>-&lt;copyright&gt;</div><div class='del'>-	&lt;year&gt;2009&lt;/year&gt;</div><div class='del'>-	&lt;holder&gt;Red Hat Inc, Michael S. Tsirkin (mst@redhat.com)&lt;/holder&gt;</div><div class='del'>-&lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-&lt;legalnotice&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-This documentation is Free Software licensed under the terms of the</div><div class='del'>-GPL version 2.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;/legalnotice&gt;</div><div class='del'>-</div><div class='del'>-&lt;pubdate&gt;2006-12-11&lt;/pubdate&gt;</div><div class='del'>-</div><div class='del'>-&lt;abstract&gt;</div><div class='del'>-	&lt;para&gt;This HOWTO describes concept and usage of Linux kernel's</div><div class='del'>-		Userspace I/O system.&lt;/para&gt;</div><div class='del'>-&lt;/abstract&gt;</div><div class='del'>-</div><div class='del'>-&lt;revhistory&gt;</div><div class='del'>-	&lt;revision&gt;</div><div class='del'>-	&lt;revnumber&gt;0.9&lt;/revnumber&gt;</div><div class='del'>-	&lt;date&gt;2009-07-16&lt;/date&gt;</div><div class='del'>-	&lt;authorinitials&gt;mst&lt;/authorinitials&gt;</div><div class='del'>-	&lt;revremark&gt;Added generic pci driver</div><div class='del'>-		&lt;/revremark&gt;</div><div class='del'>-	&lt;/revision&gt;</div><div class='del'>-	&lt;revision&gt;</div><div class='del'>-	&lt;revnumber&gt;0.8&lt;/revnumber&gt;</div><div class='del'>-	&lt;date&gt;2008-12-24&lt;/date&gt;</div><div class='del'>-	&lt;authorinitials&gt;hjk&lt;/authorinitials&gt;</div><div class='del'>-	&lt;revremark&gt;Added name attributes in mem and portio sysfs directories.</div><div class='del'>-		&lt;/revremark&gt;</div><div class='del'>-	&lt;/revision&gt;</div><div class='del'>-	&lt;revision&gt;</div><div class='del'>-	&lt;revnumber&gt;0.7&lt;/revnumber&gt;</div><div class='del'>-	&lt;date&gt;2008-12-23&lt;/date&gt;</div><div class='del'>-	&lt;authorinitials&gt;hjk&lt;/authorinitials&gt;</div><div class='del'>-	&lt;revremark&gt;Added generic platform drivers and offset attribute.&lt;/revremark&gt;</div><div class='del'>-	&lt;/revision&gt;</div><div class='del'>-	&lt;revision&gt;</div><div class='del'>-	&lt;revnumber&gt;0.6&lt;/revnumber&gt;</div><div class='del'>-	&lt;date&gt;2008-12-05&lt;/date&gt;</div><div class='del'>-	&lt;authorinitials&gt;hjk&lt;/authorinitials&gt;</div><div class='del'>-	&lt;revremark&gt;Added description of portio sysfs attributes.&lt;/revremark&gt;</div><div class='del'>-	&lt;/revision&gt;</div><div class='del'>-	&lt;revision&gt;</div><div class='del'>-	&lt;revnumber&gt;0.5&lt;/revnumber&gt;</div><div class='del'>-	&lt;date&gt;2008-05-22&lt;/date&gt;</div><div class='del'>-	&lt;authorinitials&gt;hjk&lt;/authorinitials&gt;</div><div class='del'>-	&lt;revremark&gt;Added description of write() function.&lt;/revremark&gt;</div><div class='del'>-	&lt;/revision&gt;</div><div class='del'>-	&lt;revision&gt;</div><div class='del'>-	&lt;revnumber&gt;0.4&lt;/revnumber&gt;</div><div class='del'>-	&lt;date&gt;2007-11-26&lt;/date&gt;</div><div class='del'>-	&lt;authorinitials&gt;hjk&lt;/authorinitials&gt;</div><div class='del'>-	&lt;revremark&gt;Removed section about uio_dummy.&lt;/revremark&gt;</div><div class='del'>-	&lt;/revision&gt;</div><div class='del'>-	&lt;revision&gt;</div><div class='del'>-	&lt;revnumber&gt;0.3&lt;/revnumber&gt;</div><div class='del'>-	&lt;date&gt;2007-04-29&lt;/date&gt;</div><div class='del'>-	&lt;authorinitials&gt;hjk&lt;/authorinitials&gt;</div><div class='del'>-	&lt;revremark&gt;Added section about userspace drivers.&lt;/revremark&gt;</div><div class='del'>-	&lt;/revision&gt;</div><div class='del'>-	&lt;revision&gt;</div><div class='del'>-	&lt;revnumber&gt;0.2&lt;/revnumber&gt;</div><div class='del'>-	&lt;date&gt;2007-02-13&lt;/date&gt;</div><div class='del'>-	&lt;authorinitials&gt;hjk&lt;/authorinitials&gt;</div><div class='del'>-	&lt;revremark&gt;Update after multiple mappings were added.&lt;/revremark&gt;</div><div class='del'>-	&lt;/revision&gt;</div><div class='del'>-	&lt;revision&gt;</div><div class='del'>-	&lt;revnumber&gt;0.1&lt;/revnumber&gt;</div><div class='del'>-	&lt;date&gt;2006-12-11&lt;/date&gt;</div><div class='del'>-	&lt;authorinitials&gt;hjk&lt;/authorinitials&gt;</div><div class='del'>-	&lt;revremark&gt;First draft.&lt;/revremark&gt;</div><div class='del'>-	&lt;/revision&gt;</div><div class='del'>-&lt;/revhistory&gt;</div><div class='del'>-&lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="aboutthisdoc"&gt;</div><div class='del'>-&lt;?dbhtml filename="aboutthis.html"?&gt;</div><div class='del'>-&lt;title&gt;About this document&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="translations"&gt;</div><div class='del'>-&lt;?dbhtml filename="translations.html"?&gt;</div><div class='del'>-&lt;title&gt;Translations&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-&lt;para&gt;If you know of any translations for this document, or you are</div><div class='del'>-interested in translating it, please email me</div><div class='del'>-&lt;email&gt;hjk@hansjkoch.de&lt;/email&gt;.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="preface"&gt;</div><div class='del'>-&lt;title&gt;Preface&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	For many types of devices, creating a Linux kernel driver is</div><div class='del'>-	overkill.  All that is really needed is some way to handle an</div><div class='del'>-	interrupt and provide access to the memory space of the</div><div class='del'>-	device.  The logic of controlling the device does not</div><div class='del'>-	necessarily have to be within the kernel, as the device does</div><div class='del'>-	not need to take advantage of any of other resources that the</div><div class='del'>-	kernel provides.  One such common class of devices that are</div><div class='del'>-	like this are for industrial I/O cards.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	To address this situation, the userspace I/O system (UIO) was</div><div class='del'>-	designed.  For typical industrial I/O cards, only a very small</div><div class='del'>-	kernel module is needed. The main part of the driver will run in</div><div class='del'>-	user space. This simplifies development and reduces the risk of</div><div class='del'>-	serious bugs within a kernel module.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Please note that UIO is not an universal driver interface. Devices</div><div class='del'>-	that are already handled well by other kernel subsystems (like</div><div class='del'>-	networking or serial or USB) are no candidates for an UIO driver.</div><div class='del'>-	Hardware that is ideally suited for an UIO driver fulfills all of</div><div class='del'>-	the following:</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;itemizedlist&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;The device has memory that can be mapped. The device can be</div><div class='del'>-	controlled completely by writing to this memory.&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;The device usually generates interrupts.&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;The device does not fit into one of the standard kernel</div><div class='del'>-	subsystems.&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;/itemizedlist&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="thanks"&gt;</div><div class='del'>-&lt;title&gt;Acknowledgments&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;I'd like to thank Thomas Gleixner and Benedikt Spranger of</div><div class='del'>-	Linutronix, who have not only written most of the UIO code, but also</div><div class='del'>-	helped greatly writing this HOWTO by giving me all kinds of background</div><div class='del'>-	information.&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="feedback"&gt;</div><div class='del'>-&lt;title&gt;Feedback&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;Find something wrong with this document? (Or perhaps something</div><div class='del'>-	right?) I would love to hear from you. Please email me at</div><div class='del'>-	&lt;email&gt;hjk@hansjkoch.de&lt;/email&gt;.&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="about"&gt;</div><div class='del'>-&lt;?dbhtml filename="about.html"?&gt;</div><div class='del'>-&lt;title&gt;About UIO&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-&lt;para&gt;If you use UIO for your card's driver, here's what you get:&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;itemizedlist&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;only one small kernel module to write and maintain.&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;develop the main part of your driver in user space,</div><div class='del'>-	with all the tools and libraries you're used to.&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;bugs in your driver won't crash the kernel.&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;updates of your driver can take place without recompiling</div><div class='del'>-	the kernel.&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="how_uio_works"&gt;</div><div class='del'>-&lt;title&gt;How UIO works&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Each UIO device is accessed through a device file and several</div><div class='del'>-	sysfs attribute files. The device file will be called</div><div class='del'>-	&lt;filename&gt;/dev/uio0&lt;/filename&gt; for the first device, and</div><div class='del'>-	&lt;filename&gt;/dev/uio1&lt;/filename&gt;, &lt;filename&gt;/dev/uio2&lt;/filename&gt;</div><div class='del'>-	and so on for subsequent devices.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;&lt;filename&gt;/dev/uioX&lt;/filename&gt; is used to access the</div><div class='del'>-	address space of the card. Just use</div><div class='del'>-	&lt;function&gt;mmap()&lt;/function&gt; to access registers or RAM</div><div class='del'>-	locations of your card.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Interrupts are handled by reading from</div><div class='del'>-	&lt;filename&gt;/dev/uioX&lt;/filename&gt;. A blocking</div><div class='del'>-	&lt;function&gt;read()&lt;/function&gt; from</div><div class='del'>-	&lt;filename&gt;/dev/uioX&lt;/filename&gt; will return as soon as an</div><div class='del'>-	interrupt occurs. You can also use</div><div class='del'>-	&lt;function&gt;select()&lt;/function&gt; on</div><div class='del'>-	&lt;filename&gt;/dev/uioX&lt;/filename&gt; to wait for an interrupt. The</div><div class='del'>-	integer value read from &lt;filename&gt;/dev/uioX&lt;/filename&gt;</div><div class='del'>-	represents the total interrupt count. You can use this number</div><div class='del'>-	to figure out if you missed some interrupts.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	For some hardware that has more than one interrupt source internally,</div><div class='del'>-	but not separate IRQ mask and status registers, there might be</div><div class='del'>-	situations where userspace cannot determine what the interrupt source</div><div class='del'>-	was if the kernel handler disables them by writing to the chip's IRQ</div><div class='del'>-	register. In such a case, the kernel has to disable the IRQ completely</div><div class='del'>-	to leave the chip's register untouched. Now the userspace part can</div><div class='del'>-	determine the cause of the interrupt, but it cannot re-enable</div><div class='del'>-	interrupts. Another cornercase is chips where re-enabling interrupts</div><div class='del'>-	is a read-modify-write operation to a combined IRQ status/acknowledge</div><div class='del'>-	register. This would be racy if a new interrupt occurred</div><div class='del'>-	simultaneously.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	To address these problems, UIO also implements a write() function. It</div><div class='del'>-	is normally not used and can be ignored for hardware that has only a</div><div class='del'>-	single interrupt source or has separate IRQ mask and status registers.</div><div class='del'>-	If you need it, however, a write to &lt;filename&gt;/dev/uioX&lt;/filename&gt;</div><div class='del'>-	will call the &lt;function&gt;irqcontrol()&lt;/function&gt; function implemented</div><div class='del'>-	by the driver. You have to write a 32-bit value that is usually either</div><div class='del'>-	0 or 1 to disable or enable interrupts. If a driver does not implement</div><div class='del'>-	&lt;function&gt;irqcontrol()&lt;/function&gt;, &lt;function&gt;write()&lt;/function&gt; will</div><div class='del'>-	return with &lt;varname&gt;-ENOSYS&lt;/varname&gt;.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	To handle interrupts properly, your custom kernel module can</div><div class='del'>-	provide its own interrupt handler. It will automatically be</div><div class='del'>-	called by the built-in handler.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	For cards that don't generate interrupts but need to be</div><div class='del'>-	polled, there is the possibility to set up a timer that</div><div class='del'>-	triggers the interrupt handler at configurable time intervals.</div><div class='del'>-	This interrupt simulation is done by calling</div><div class='del'>-	&lt;function&gt;uio_event_notify()&lt;/function&gt;</div><div class='del'>-	from the timer's event handler.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Each driver provides attributes that are used to read or write</div><div class='del'>-	variables. These attributes are accessible through sysfs</div><div class='del'>-	files.  A custom kernel driver module can add its own</div><div class='del'>-	attributes to the device owned by the uio driver, but not added</div><div class='del'>-	to the UIO device itself at this time.  This might change in the</div><div class='del'>-	future if it would be found to be useful.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The following standard attributes are provided by the UIO</div><div class='del'>-	framework:</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;itemizedlist&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;name&lt;/filename&gt;: The name of your device. It is</div><div class='del'>-	recommended to use the name of your kernel module for this.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;version&lt;/filename&gt;: A version string defined by your</div><div class='del'>-	driver. This allows the user space part of your driver to deal</div><div class='del'>-	with different versions of the kernel module.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;event&lt;/filename&gt;: The total number of interrupts</div><div class='del'>-	handled by the driver since the last time the device node was</div><div class='del'>-	read.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;/itemizedlist&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-	These attributes appear under the</div><div class='del'>-	&lt;filename&gt;/sys/class/uio/uioX&lt;/filename&gt; directory.  Please</div><div class='del'>-	note that this directory might be a symlink, and not a real</div><div class='del'>-	directory.  Any userspace code that accesses it must be able</div><div class='del'>-	to handle this.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-	Each UIO device can make one or more memory regions available for</div><div class='del'>-	memory mapping. This is necessary because some industrial I/O cards</div><div class='del'>-	require access to more than one PCI memory region in a driver.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-	Each mapping has its own directory in sysfs, the first mapping</div><div class='del'>-	appears as &lt;filename&gt;/sys/class/uio/uioX/maps/map0/&lt;/filename&gt;.</div><div class='del'>-	Subsequent mappings create directories &lt;filename&gt;map1/&lt;/filename&gt;,</div><div class='del'>-	&lt;filename&gt;map2/&lt;/filename&gt;, and so on. These directories will only</div><div class='del'>-	appear if the size of the mapping is not 0.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-	Each &lt;filename&gt;mapX/&lt;/filename&gt; directory contains four read-only files</div><div class='del'>-	that show attributes of the memory:</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;itemizedlist&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;name&lt;/filename&gt;: A string identifier for this mapping. This</div><div class='del'>-	is optional, the string can be empty. Drivers can set this to make it</div><div class='del'>-	easier for userspace to find the correct mapping.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;addr&lt;/filename&gt;: The address of memory that can be mapped.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;size&lt;/filename&gt;: The size, in bytes, of the memory</div><div class='del'>-	pointed to by addr.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;offset&lt;/filename&gt;: The offset, in bytes, that has to be</div><div class='del'>-	added to the pointer returned by &lt;function&gt;mmap()&lt;/function&gt; to get</div><div class='del'>-	to the actual device memory. This is important if the device's memory</div><div class='del'>-	is not page aligned. Remember that pointers returned by</div><div class='del'>-	&lt;function&gt;mmap()&lt;/function&gt; are always page aligned, so it is good</div><div class='del'>-	style to always add this offset.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-&lt;para&gt;</div><div class='del'>-	From userspace, the different mappings are distinguished by adjusting</div><div class='del'>-	the &lt;varname&gt;offset&lt;/varname&gt; parameter of the</div><div class='del'>-	&lt;function&gt;mmap()&lt;/function&gt; call. To map the memory of mapping N, you</div><div class='del'>-	have to use N times the page size as your offset:</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;programlisting format="linespecific"&gt;</div><div class='del'>-offset = N * getpagesize();</div><div class='del'>-&lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-&lt;para&gt;</div><div class='del'>-	Sometimes there is hardware with memory-like regions that can not be</div><div class='del'>-	mapped with the technique described here, but there are still ways to</div><div class='del'>-	access them from userspace. The most common example are x86 ioports.</div><div class='del'>-	On x86 systems, userspace can access these ioports using</div><div class='del'>-	&lt;function&gt;ioperm()&lt;/function&gt;, &lt;function&gt;iopl()&lt;/function&gt;,</div><div class='del'>-	&lt;function&gt;inb()&lt;/function&gt;, &lt;function&gt;outb()&lt;/function&gt;, and similar</div><div class='del'>-	functions.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-	Since these ioport regions can not be mapped, they will not appear under</div><div class='del'>-	&lt;filename&gt;/sys/class/uio/uioX/maps/&lt;/filename&gt; like the normal memory</div><div class='del'>-	described above. Without information about the port regions a hardware</div><div class='del'>-	has to offer, it becomes difficult for the userspace part of the</div><div class='del'>-	driver to find out which ports belong to which UIO device.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-	To address this situation, the new directory</div><div class='del'>-	&lt;filename&gt;/sys/class/uio/uioX/portio/&lt;/filename&gt; was added. It only</div><div class='del'>-	exists if the driver wants to pass information about one or more port</div><div class='del'>-	regions to userspace. If that is the case, subdirectories named</div><div class='del'>-	&lt;filename&gt;port0&lt;/filename&gt;, &lt;filename&gt;port1&lt;/filename&gt;, and so on,</div><div class='del'>-	will appear underneath</div><div class='del'>-	&lt;filename&gt;/sys/class/uio/uioX/portio/&lt;/filename&gt;.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-	Each &lt;filename&gt;portX/&lt;/filename&gt; directory contains four read-only</div><div class='del'>-	files that show name, start, size, and type of the port region:</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;itemizedlist&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;name&lt;/filename&gt;: A string identifier for this port region.</div><div class='del'>-	The string is optional and can be empty. Drivers can set it to make it</div><div class='del'>-	easier for userspace to find a certain port region.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;start&lt;/filename&gt;: The first port of this region.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;size&lt;/filename&gt;: The number of ports in this region.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;porttype&lt;/filename&gt;: A string describing the type of port.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/listitem&gt;</div><div class='del'>-&lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="custom_kernel_module" xreflabel="Writing your own kernel module"&gt;</div><div class='del'>-&lt;?dbhtml filename="custom_kernel_module.html"?&gt;</div><div class='del'>-&lt;title&gt;Writing your own kernel module&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Please have a look at &lt;filename&gt;uio_cif.c&lt;/filename&gt; as an</div><div class='del'>-	example. The following paragraphs explain the different</div><div class='del'>-	sections of this file.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="uio_info"&gt;</div><div class='del'>-&lt;title&gt;struct uio_info&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	This structure tells the framework the details of your driver,</div><div class='del'>-	Some of the members are required, others are optional.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;itemizedlist&gt;</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;const char *name&lt;/varname&gt;: Required. The name of your driver as</div><div class='del'>-it will appear in sysfs. I recommend using the name of your module for this.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;const char *version&lt;/varname&gt;: Required. This string appears in</div><div class='del'>-&lt;filename&gt;/sys/class/uio/uioX/version&lt;/filename&gt;.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;struct uio_mem mem[ MAX_UIO_MAPS ]&lt;/varname&gt;: Required if you</div><div class='del'>-have memory that can be mapped with &lt;function&gt;mmap()&lt;/function&gt;. For each</div><div class='del'>-mapping you need to fill one of the &lt;varname&gt;uio_mem&lt;/varname&gt; structures.</div><div class='del'>-See the description below for details.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;struct uio_port port[ MAX_UIO_PORTS_REGIONS ]&lt;/varname&gt;: Required</div><div class='del'>-if you want to pass information about ioports to userspace. For each port</div><div class='del'>-region you need to fill one of the &lt;varname&gt;uio_port&lt;/varname&gt; structures.</div><div class='del'>-See the description below for details.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;long irq&lt;/varname&gt;: Required. If your hardware generates an</div><div class='del'>-interrupt, it's your modules task to determine the irq number during</div><div class='del'>-initialization. If you don't have a hardware generated interrupt but</div><div class='del'>-want to trigger the interrupt handler in some other way, set</div><div class='del'>-&lt;varname&gt;irq&lt;/varname&gt; to &lt;varname&gt;UIO_IRQ_CUSTOM&lt;/varname&gt;.</div><div class='del'>-If you had no interrupt at all, you could set</div><div class='del'>-&lt;varname&gt;irq&lt;/varname&gt; to &lt;varname&gt;UIO_IRQ_NONE&lt;/varname&gt;, though this</div><div class='del'>-rarely makes sense.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;unsigned long irq_flags&lt;/varname&gt;: Required if you've set</div><div class='del'>-&lt;varname&gt;irq&lt;/varname&gt; to a hardware interrupt number. The flags given</div><div class='del'>-here will be used in the call to &lt;function&gt;request_irq()&lt;/function&gt;.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;int (*mmap)(struct uio_info *info, struct vm_area_struct</div><div class='del'>-*vma)&lt;/varname&gt;: Optional. If you need a special</div><div class='del'>-&lt;function&gt;mmap()&lt;/function&gt; function, you can set it here. If this</div><div class='del'>-pointer is not NULL, your &lt;function&gt;mmap()&lt;/function&gt; will be called</div><div class='del'>-instead of the built-in one.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;int (*open)(struct uio_info *info, struct inode *inode)</div><div class='del'>-&lt;/varname&gt;: Optional. You might want to have your own</div><div class='del'>-&lt;function&gt;open()&lt;/function&gt;, e.g. to enable interrupts only when your</div><div class='del'>-device is actually used.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;int (*release)(struct uio_info *info, struct inode *inode)</div><div class='del'>-&lt;/varname&gt;: Optional. If you define your own</div><div class='del'>-&lt;function&gt;open()&lt;/function&gt;, you will probably also want a custom</div><div class='del'>-&lt;function&gt;release()&lt;/function&gt; function.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;int (*irqcontrol)(struct uio_info *info, s32 irq_on)</div><div class='del'>-&lt;/varname&gt;: Optional. If you need to be able to enable or disable</div><div class='del'>-interrupts from userspace by writing to &lt;filename&gt;/dev/uioX&lt;/filename&gt;,</div><div class='del'>-you can implement this function. The parameter &lt;varname&gt;irq_on&lt;/varname&gt;</div><div class='del'>-will be 0 to disable interrupts and 1 to enable them.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-&lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-&lt;para&gt;</div><div class='del'>-Usually, your device will have one or more memory regions that can be mapped</div><div class='del'>-to user space. For each region, you have to set up a</div><div class='del'>-&lt;varname&gt;struct uio_mem&lt;/varname&gt; in the &lt;varname&gt;mem[]&lt;/varname&gt; array.</div><div class='del'>-Here's a description of the fields of &lt;varname&gt;struct uio_mem&lt;/varname&gt;:</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;itemizedlist&gt;</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;const char *name&lt;/varname&gt;: Optional. Set this to help identify</div><div class='del'>-the memory region, it will show up in the corresponding sysfs node.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;int memtype&lt;/varname&gt;: Required if the mapping is used. Set this to</div><div class='del'>-&lt;varname&gt;UIO_MEM_PHYS&lt;/varname&gt; if you you have physical memory on your</div><div class='del'>-card to be mapped. Use &lt;varname&gt;UIO_MEM_LOGICAL&lt;/varname&gt; for logical</div><div class='del'>-memory (e.g. allocated with &lt;function&gt;kmalloc()&lt;/function&gt;). There's also</div><div class='del'>-&lt;varname&gt;UIO_MEM_VIRTUAL&lt;/varname&gt; for virtual memory.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;phys_addr_t addr&lt;/varname&gt;: Required if the mapping is used.</div><div class='del'>-Fill in the address of your memory block. This address is the one that</div><div class='del'>-appears in sysfs.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;resource_size_t size&lt;/varname&gt;: Fill in the size of the</div><div class='del'>-memory block that &lt;varname&gt;addr&lt;/varname&gt; points to. If &lt;varname&gt;size&lt;/varname&gt;</div><div class='del'>-is zero, the mapping is considered unused. Note that you</div><div class='del'>-&lt;emphasis&gt;must&lt;/emphasis&gt; initialize &lt;varname&gt;size&lt;/varname&gt; with zero for</div><div class='del'>-all unused mappings.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;void *internal_addr&lt;/varname&gt;: If you have to access this memory</div><div class='del'>-region from within your kernel module, you will want to map it internally by</div><div class='del'>-using something like &lt;function&gt;ioremap()&lt;/function&gt;. Addresses</div><div class='del'>-returned by this function cannot be mapped to user space, so you must not</div><div class='del'>-store it in &lt;varname&gt;addr&lt;/varname&gt;. Use &lt;varname&gt;internal_addr&lt;/varname&gt;</div><div class='del'>-instead to remember such an address.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-&lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-&lt;para&gt;</div><div class='del'>-Please do not touch the &lt;varname&gt;map&lt;/varname&gt; element of</div><div class='del'>-&lt;varname&gt;struct uio_mem&lt;/varname&gt;! It is used by the UIO framework</div><div class='del'>-to set up sysfs files for this mapping. Simply leave it alone.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;para&gt;</div><div class='del'>-Sometimes, your device can have one or more port regions which can not be</div><div class='del'>-mapped to userspace. But if there are other possibilities for userspace to</div><div class='del'>-access these ports, it makes sense to make information about the ports</div><div class='del'>-available in sysfs. For each region, you have to set up a</div><div class='del'>-&lt;varname&gt;struct uio_port&lt;/varname&gt; in the &lt;varname&gt;port[]&lt;/varname&gt; array.</div><div class='del'>-Here's a description of the fields of &lt;varname&gt;struct uio_port&lt;/varname&gt;:</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;itemizedlist&gt;</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;char *porttype&lt;/varname&gt;: Required. Set this to one of the predefined</div><div class='del'>-constants. Use &lt;varname&gt;UIO_PORT_X86&lt;/varname&gt; for the ioports found in x86</div><div class='del'>-architectures.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;unsigned long start&lt;/varname&gt;: Required if the port region is used.</div><div class='del'>-Fill in the number of the first port of this region.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-&lt;varname&gt;unsigned long size&lt;/varname&gt;: Fill in the number of ports in this</div><div class='del'>-region. If &lt;varname&gt;size&lt;/varname&gt; is zero, the region is considered unused.</div><div class='del'>-Note that you &lt;emphasis&gt;must&lt;/emphasis&gt; initialize &lt;varname&gt;size&lt;/varname&gt;</div><div class='del'>-with zero for all unused regions.</div><div class='del'>-&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-&lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-&lt;para&gt;</div><div class='del'>-Please do not touch the &lt;varname&gt;portio&lt;/varname&gt; element of</div><div class='del'>-&lt;varname&gt;struct uio_port&lt;/varname&gt;! It is used internally by the UIO</div><div class='del'>-framework to set up sysfs files for this region. Simply leave it alone.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="adding_irq_handler"&gt;</div><div class='del'>-&lt;title&gt;Adding an interrupt handler&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	What you need to do in your interrupt handler depends on your</div><div class='del'>-	hardware and on how you want to	handle it. You should try to</div><div class='del'>-	keep the amount of code in your kernel interrupt handler low.</div><div class='del'>-	If your hardware requires no action that you</div><div class='del'>-	&lt;emphasis&gt;have&lt;/emphasis&gt; to perform after each interrupt,</div><div class='del'>-	then your handler can be empty.&lt;/para&gt; &lt;para&gt;If, on the other</div><div class='del'>-	hand, your hardware &lt;emphasis&gt;needs&lt;/emphasis&gt; some action to</div><div class='del'>-	be performed after each interrupt, then you</div><div class='del'>-	&lt;emphasis&gt;must&lt;/emphasis&gt; do it in your kernel module. Note</div><div class='del'>-	that you cannot rely on the userspace part of your driver. Your</div><div class='del'>-	userspace program can terminate at any time, possibly leaving</div><div class='del'>-	your hardware in a state where proper interrupt handling is</div><div class='del'>-	still required.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	There might also be applications where you want to read data</div><div class='del'>-	from your hardware at each interrupt and buffer it in a piece</div><div class='del'>-	of kernel memory you've allocated for that purpose.  With this</div><div class='del'>-	technique you could avoid loss of data if your userspace</div><div class='del'>-	program misses an interrupt.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	A note on shared interrupts: Your driver should support</div><div class='del'>-	interrupt sharing whenever this is possible. It is possible if</div><div class='del'>-	and only if your driver can detect whether your hardware has</div><div class='del'>-	triggered the interrupt or not. This is usually done by looking</div><div class='del'>-	at an interrupt status register. If your driver sees that the</div><div class='del'>-	IRQ bit is actually set, it will perform its actions, and the</div><div class='del'>-	handler returns IRQ_HANDLED. If the driver detects that it was</div><div class='del'>-	not your hardware that caused the interrupt, it will do nothing</div><div class='del'>-	and return IRQ_NONE, allowing the kernel to call the next</div><div class='del'>-	possible interrupt handler.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	If you decide not to support shared interrupts, your card</div><div class='del'>-	won't work in computers with no free interrupts. As this</div><div class='del'>-	frequently happens on the PC platform, you can save yourself a</div><div class='del'>-	lot of trouble by supporting interrupt sharing.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="using_uio_pdrv"&gt;</div><div class='del'>-&lt;title&gt;Using uio_pdrv for platform devices&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	In many cases, UIO drivers for platform devices can be handled in a</div><div class='del'>-	generic way. In the same place where you define your</div><div class='del'>-	&lt;varname&gt;struct platform_device&lt;/varname&gt;, you simply also implement</div><div class='del'>-	your interrupt handler and fill your</div><div class='del'>-	&lt;varname&gt;struct uio_info&lt;/varname&gt;. A pointer to this</div><div class='del'>-	&lt;varname&gt;struct uio_info&lt;/varname&gt; is then used as</div><div class='del'>-	&lt;varname&gt;platform_data&lt;/varname&gt; for your platform device.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	You also need to set up an array of &lt;varname&gt;struct resource&lt;/varname&gt;</div><div class='del'>-	containing addresses and sizes of your memory mappings. This</div><div class='del'>-	information is passed to the driver using the</div><div class='del'>-	&lt;varname&gt;.resource&lt;/varname&gt; and &lt;varname&gt;.num_resources&lt;/varname&gt;</div><div class='del'>-	elements of &lt;varname&gt;struct platform_device&lt;/varname&gt;.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	You now have to set the &lt;varname&gt;.name&lt;/varname&gt; element of</div><div class='del'>-	&lt;varname&gt;struct platform_device&lt;/varname&gt; to</div><div class='del'>-	&lt;varname&gt;"uio_pdrv"&lt;/varname&gt; to use the generic UIO platform device</div><div class='del'>-	driver. This driver will fill the &lt;varname&gt;mem[]&lt;/varname&gt; array</div><div class='del'>-	according to the resources given, and register the device.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The advantage of this approach is that you only have to edit a file</div><div class='del'>-	you need to edit anyway. You do not have to create an extra driver.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="using_uio_pdrv_genirq"&gt;</div><div class='del'>-&lt;title&gt;Using uio_pdrv_genirq for platform devices&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Especially in embedded devices, you frequently find chips where the</div><div class='del'>-	irq pin is tied to its own dedicated interrupt line. In such cases,</div><div class='del'>-	where you can be really sure the interrupt is not shared, we can take</div><div class='del'>-	the concept of &lt;varname&gt;uio_pdrv&lt;/varname&gt; one step further and use a</div><div class='del'>-	generic interrupt handler. That's what</div><div class='del'>-	&lt;varname&gt;uio_pdrv_genirq&lt;/varname&gt; does.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The setup for this driver is the same as described above for</div><div class='del'>-	&lt;varname&gt;uio_pdrv&lt;/varname&gt;, except that you do not implement an</div><div class='del'>-	interrupt handler. The &lt;varname&gt;.handler&lt;/varname&gt; element of</div><div class='del'>-	&lt;varname&gt;struct uio_info&lt;/varname&gt; must remain</div><div class='del'>-	&lt;varname&gt;NULL&lt;/varname&gt;. The  &lt;varname&gt;.irq_flags&lt;/varname&gt; element</div><div class='del'>-	must not contain &lt;varname&gt;IRQF_SHARED&lt;/varname&gt;.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	You will set the &lt;varname&gt;.name&lt;/varname&gt; element of</div><div class='del'>-	&lt;varname&gt;struct platform_device&lt;/varname&gt; to</div><div class='del'>-	&lt;varname&gt;"uio_pdrv_genirq"&lt;/varname&gt; to use this driver.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The generic interrupt handler of &lt;varname&gt;uio_pdrv_genirq&lt;/varname&gt;</div><div class='del'>-	will simply disable the interrupt line using</div><div class='del'>-	&lt;function&gt;disable_irq_nosync()&lt;/function&gt;. After doing its work,</div><div class='del'>-	userspace can reenable the interrupt by writing 0x00000001 to the UIO</div><div class='del'>-	device file. The driver already implements an</div><div class='del'>-	&lt;function&gt;irq_control()&lt;/function&gt; to make this possible, you must not</div><div class='del'>-	implement your own.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Using &lt;varname&gt;uio_pdrv_genirq&lt;/varname&gt; not only saves a few lines of</div><div class='del'>-	interrupt handler code. You also do not need to know anything about</div><div class='del'>-	the chip's internal registers to create the kernel part of the driver.</div><div class='del'>-	All you need to know is the irq number of the pin the chip is</div><div class='del'>-	connected to.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="using-uio_dmem_genirq"&gt;</div><div class='del'>-&lt;title&gt;Using uio_dmem_genirq for platform devices&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	In addition to statically allocated memory ranges, they may also be</div><div class='del'>-	a desire to use dynamically allocated regions in a user space driver.</div><div class='del'>-	In particular, being able to access memory made available through the</div><div class='del'>-	dma-mapping API, may be particularly useful.  The</div><div class='del'>-	&lt;varname&gt;uio_dmem_genirq&lt;/varname&gt; driver provides a way to accomplish</div><div class='del'>-	this.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	This driver is used in a similar manner to the</div><div class='del'>-	&lt;varname&gt;"uio_pdrv_genirq"&lt;/varname&gt; driver with respect to interrupt</div><div class='del'>-	configuration and handling.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Set the &lt;varname&gt;.name&lt;/varname&gt; element of</div><div class='del'>-	&lt;varname&gt;struct platform_device&lt;/varname&gt; to</div><div class='del'>-	&lt;varname&gt;"uio_dmem_genirq"&lt;/varname&gt; to use this driver.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	When using this driver, fill in the &lt;varname&gt;.platform_data&lt;/varname&gt;</div><div class='del'>-	element of &lt;varname&gt;struct platform_device&lt;/varname&gt;, which is of type</div><div class='del'>-	&lt;varname&gt;struct uio_dmem_genirq_pdata&lt;/varname&gt; and which contains the</div><div class='del'>-	following elements:</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;itemizedlist&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;&lt;varname&gt;struct uio_info uioinfo&lt;/varname&gt;: The same</div><div class='del'>-	structure used as the  &lt;varname&gt;uio_pdrv_genirq&lt;/varname&gt; platform</div><div class='del'>-	data&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;&lt;varname&gt;unsigned int *dynamic_region_sizes&lt;/varname&gt;:</div><div class='del'>-	Pointer to list of sizes of dynamic memory regions to be mapped into</div><div class='del'>-	user space.</div><div class='del'>-	&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;&lt;varname&gt;unsigned int num_dynamic_regions&lt;/varname&gt;:</div><div class='del'>-	Number of elements in &lt;varname&gt;dynamic_region_sizes&lt;/varname&gt; array.</div><div class='del'>-	&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The dynamic regions defined in the platform data will be appended to</div><div class='del'>-	the &lt;varname&gt; mem[] &lt;/varname&gt; array after the platform device</div><div class='del'>-	resources, which implies that the total number of static and dynamic</div><div class='del'>-	memory regions cannot exceed &lt;varname&gt;MAX_UIO_MAPS&lt;/varname&gt;.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The dynamic memory regions will be allocated when the UIO device file,</div><div class='del'>-	&lt;varname&gt;/dev/uioX&lt;/varname&gt; is opened.</div><div class='del'>-	Similar to static memory resources, the memory region information for</div><div class='del'>-	dynamic regions is then visible via sysfs at</div><div class='del'>-	&lt;varname&gt;/sys/class/uio/uioX/maps/mapY/*&lt;/varname&gt;.</div><div class='del'>-	The dynamic memory regions will be freed when the UIO device file is</div><div class='del'>-	closed. When no processes are holding the device file open, the address</div><div class='del'>-	returned to userspace is ~0.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="userspace_driver" xreflabel="Writing a driver in user space"&gt;</div><div class='del'>-&lt;?dbhtml filename="userspace_driver.html"?&gt;</div><div class='del'>-&lt;title&gt;Writing a driver in userspace&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Once you have a working kernel module for your hardware, you can</div><div class='del'>-	write the userspace part of your driver. You don't need any special</div><div class='del'>-	libraries, your driver can be written in any reasonable language,</div><div class='del'>-	you can use floating point numbers and so on. In short, you can</div><div class='del'>-	use all the tools and libraries you'd normally use for writing a</div><div class='del'>-	userspace application.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="getting_uio_information"&gt;</div><div class='del'>-&lt;title&gt;Getting information about your UIO device&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Information about all UIO devices is available in sysfs. The</div><div class='del'>-	first thing you should do in your driver is check</div><div class='del'>-	&lt;varname&gt;name&lt;/varname&gt; and &lt;varname&gt;version&lt;/varname&gt; to</div><div class='del'>-	make sure your talking to the right device and that its kernel</div><div class='del'>-	driver has the version you expect.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	You should also make sure that the memory mapping you need</div><div class='del'>-	exists and has the size you expect.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	There is a tool called &lt;varname&gt;lsuio&lt;/varname&gt; that lists</div><div class='del'>-	UIO devices and their attributes. It is available here:</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;ulink url="http://www.osadl.org/projects/downloads/UIO/user/"&gt;</div><div class='del'>-		http://www.osadl.org/projects/downloads/UIO/user/&lt;/ulink&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	With &lt;varname&gt;lsuio&lt;/varname&gt; you can quickly check if your</div><div class='del'>-	kernel module is loaded and which attributes it exports.</div><div class='del'>-	Have a look at the manpage for details.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The source code of &lt;varname&gt;lsuio&lt;/varname&gt; can serve as an</div><div class='del'>-	example for getting information about an UIO device.</div><div class='del'>-	The file &lt;filename&gt;uio_helper.c&lt;/filename&gt; contains a lot of</div><div class='del'>-	functions you could use in your userspace driver code.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="mmap_device_memory"&gt;</div><div class='del'>-&lt;title&gt;mmap() device memory&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	After you made sure you've got the right device with the</div><div class='del'>-	memory mappings you need, all you have to do is to call</div><div class='del'>-	&lt;function&gt;mmap()&lt;/function&gt; to map the device's memory</div><div class='del'>-	to userspace.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The parameter &lt;varname&gt;offset&lt;/varname&gt; of the</div><div class='del'>-	&lt;function&gt;mmap()&lt;/function&gt; call has a special meaning</div><div class='del'>-	for UIO devices: It is used to select which mapping of</div><div class='del'>-	your device you want to map. To map the memory of</div><div class='del'>-	mapping N, you have to use N times the page size as</div><div class='del'>-	your offset:</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;programlisting format="linespecific"&gt;</div><div class='del'>-	offset = N * getpagesize();</div><div class='del'>-&lt;/programlisting&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	N starts from zero, so if you've got only one memory</div><div class='del'>-	range to map, set &lt;varname&gt;offset = 0&lt;/varname&gt;.</div><div class='del'>-	A drawback of this technique is that memory is always</div><div class='del'>-	mapped beginning with its start address.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="wait_for_interrupts"&gt;</div><div class='del'>-&lt;title&gt;Waiting for interrupts&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	After you successfully mapped your devices memory, you</div><div class='del'>-	can access it like an ordinary array. Usually, you will</div><div class='del'>-	perform some initialization. After that, your hardware</div><div class='del'>-	starts working and will generate an interrupt as soon</div><div class='del'>-	as it's finished, has some data available, or needs your</div><div class='del'>-	attention because an error occurred.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;filename&gt;/dev/uioX&lt;/filename&gt; is a read-only file. A</div><div class='del'>-	&lt;function&gt;read()&lt;/function&gt; will always block until an</div><div class='del'>-	interrupt occurs. There is only one legal value for the</div><div class='del'>-	&lt;varname&gt;count&lt;/varname&gt; parameter of</div><div class='del'>-	&lt;function&gt;read()&lt;/function&gt;, and that is the size of a</div><div class='del'>-	signed 32 bit integer (4). Any other value for</div><div class='del'>-	&lt;varname&gt;count&lt;/varname&gt; causes &lt;function&gt;read()&lt;/function&gt;</div><div class='del'>-	to fail. The signed 32 bit integer read is the interrupt</div><div class='del'>-	count of your device. If the value is one more than the value</div><div class='del'>-	you read the last time, everything is OK. If the difference</div><div class='del'>-	is greater than one, you missed interrupts.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	You can also use &lt;function&gt;select()&lt;/function&gt; on</div><div class='del'>-	&lt;filename&gt;/dev/uioX&lt;/filename&gt;.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="uio_pci_generic" xreflabel="Using Generic driver for PCI cards"&gt;</div><div class='del'>-&lt;?dbhtml filename="uio_pci_generic.html"?&gt;</div><div class='del'>-&lt;title&gt;Generic PCI UIO driver&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The generic driver is a kernel module named uio_pci_generic.</div><div class='del'>-	It can work with any device compliant to PCI 2.3 (circa 2002) and</div><div class='del'>-	any compliant PCI Express device. Using this, you only need to</div><div class='del'>-        write the userspace driver, removing the need to write</div><div class='del'>-        a hardware-specific kernel module.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="uio_pci_generic_binding"&gt;</div><div class='del'>-&lt;title&gt;Making the driver recognize the device&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-Since the driver does not declare any device ids, it will not get loaded</div><div class='del'>-automatically and will not automatically bind to any devices, you must load it</div><div class='del'>-and allocate id to the driver yourself. For example:</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>- modprobe uio_pci_generic</div><div class='del'>- echo &amp;quot;8086 10f5&amp;quot; &amp;gt; /sys/bus/pci/drivers/uio_pci_generic/new_id</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-If there already is a hardware specific kernel driver for your device, the</div><div class='del'>-generic driver still won't bind to it, in this case if you want to use the</div><div class='del'>-generic driver (why would you?) you'll have to manually unbind the hardware</div><div class='del'>-specific driver and bind the generic driver, like this:</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-    echo -n 0000:00:19.0 &amp;gt; /sys/bus/pci/drivers/e1000e/unbind</div><div class='del'>-    echo -n 0000:00:19.0 &amp;gt; /sys/bus/pci/drivers/uio_pci_generic/bind</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-You can verify that the device has been bound to the driver</div><div class='del'>-by looking for it in sysfs, for example like the following:</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-    ls -l /sys/bus/pci/devices/0000:00:19.0/driver</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-Which if successful should print</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-  .../0000:00:19.0/driver -&amp;gt; ../../../bus/pci/drivers/uio_pci_generic</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-Note that the generic driver will not bind to old PCI 2.2 devices.</div><div class='del'>-If binding the device failed, run the following command:</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-  dmesg</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-and look in the output for failure reasons</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1 id="uio_pci_generic_internals"&gt;</div><div class='del'>-&lt;title&gt;Things to know about uio_pci_generic&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-Interrupts are handled using the Interrupt Disable bit in the PCI command</div><div class='del'>-register and Interrupt Status bit in the PCI status register.  All devices</div><div class='del'>-compliant to PCI 2.3 (circa 2002) and all compliant PCI Express devices should</div><div class='del'>-support these bits.  uio_pci_generic detects this support, and won't bind to</div><div class='del'>-devices which do not support the Interrupt Disable Bit in the command register.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-On each interrupt, uio_pci_generic sets the Interrupt Disable bit.</div><div class='del'>-This prevents the device from generating further interrupts</div><div class='del'>-until the bit is cleared. The userspace driver should clear this</div><div class='del'>-bit before blocking and waiting for more interrupts.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-&lt;sect1 id="uio_pci_generic_userspace"&gt;</div><div class='del'>-&lt;title&gt;Writing userspace driver using uio_pci_generic&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-Userspace driver can use pci sysfs interface, or the</div><div class='del'>-libpci libray that wraps it, to talk to the device and to</div><div class='del'>-re-enable interrupts by writing to the command register.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-&lt;sect1 id="uio_pci_generic_example"&gt;</div><div class='del'>-&lt;title&gt;Example code using uio_pci_generic&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-Here is some sample userspace driver code using uio_pci_generic:</div><div class='del'>-&lt;programlisting&gt;</div><div class='del'>-#include &amp;lt;stdlib.h&amp;gt;</div><div class='del'>-#include &amp;lt;stdio.h&amp;gt;</div><div class='del'>-#include &amp;lt;unistd.h&amp;gt;</div><div class='del'>-#include &amp;lt;sys/types.h&amp;gt;</div><div class='del'>-#include &amp;lt;sys/stat.h&amp;gt;</div><div class='del'>-#include &amp;lt;fcntl.h&amp;gt;</div><div class='del'>-#include &amp;lt;errno.h&amp;gt;</div><div class='del'>-</div><div class='del'>-int main()</div><div class='del'>-{</div><div class='del'>-	int uiofd;</div><div class='del'>-	int configfd;</div><div class='del'>-	int err;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned icount;</div><div class='del'>-	unsigned char command_high;</div><div class='del'>-</div><div class='del'>-	uiofd = open(&amp;quot;/dev/uio0&amp;quot;, O_RDONLY);</div><div class='del'>-	if (uiofd &amp;lt; 0) {</div><div class='del'>-		perror(&amp;quot;uio open:&amp;quot;);</div><div class='del'>-		return errno;</div><div class='del'>-	}</div><div class='del'>-	configfd = open(&amp;quot;/sys/class/uio/uio0/device/config&amp;quot;, O_RDWR);</div><div class='del'>-	if (configfd &amp;lt; 0) {</div><div class='del'>-		perror(&amp;quot;config open:&amp;quot;);</div><div class='del'>-		return errno;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Read and cache command value */</div><div class='del'>-	err = pread(configfd, &amp;amp;command_high, 1, 5);</div><div class='del'>-	if (err != 1) {</div><div class='del'>-		perror(&amp;quot;command config read:&amp;quot;);</div><div class='del'>-		return errno;</div><div class='del'>-	}</div><div class='del'>-	command_high &amp;amp;= ~0x4;</div><div class='del'>-</div><div class='del'>-	for(i = 0;; ++i) {</div><div class='del'>-		/* Print out a message, for debugging. */</div><div class='del'>-		if (i == 0)</div><div class='del'>-			fprintf(stderr, &amp;quot;Started uio test driver.\n&amp;quot;);</div><div class='del'>-		else</div><div class='del'>-			fprintf(stderr, &amp;quot;Interrupts: %d\n&amp;quot;, icount);</div><div class='del'>-</div><div class='del'>-		/****************************************/</div><div class='del'>-		/* Here we got an interrupt from the</div><div class='del'>-		   device. Do something to it. */</div><div class='del'>-		/****************************************/</div><div class='del'>-</div><div class='del'>-		/* Re-enable interrupts. */</div><div class='del'>-		err = pwrite(configfd, &amp;amp;command_high, 1, 5);</div><div class='del'>-		if (err != 1) {</div><div class='del'>-			perror(&amp;quot;config write:&amp;quot;);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Wait for next interrupt. */</div><div class='del'>-		err = read(uiofd, &amp;amp;icount, 4);</div><div class='del'>-		if (err != 4) {</div><div class='del'>-			perror(&amp;quot;uio read:&amp;quot;);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	return errno;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-&lt;/programlisting&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;appendix id="app1"&gt;</div><div class='del'>-&lt;title&gt;Further information&lt;/title&gt;</div><div class='del'>-&lt;itemizedlist&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-			&lt;ulink url="http://www.osadl.org"&gt;</div><div class='del'>-				OSADL homepage.&lt;/ulink&gt;</div><div class='del'>-		&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		&lt;ulink url="http://www.linutronix.de"&gt;</div><div class='del'>-		 Linutronix homepage.&lt;/ulink&gt;</div><div class='del'>-		&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-&lt;/itemizedlist&gt;</div><div class='del'>-&lt;/appendix&gt;</div><div class='del'>-</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/Documentation/DocBook/usb.tmpl b/Documentation/DocBook/usb.tmpl<br/>deleted file mode 100644<br/>index bc776be0f19c..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/usb.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/usb.tmpl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,992 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='del'>-	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="Linux-USB-API"&gt;</div><div class='del'>- &lt;bookinfo&gt;</div><div class='del'>-  &lt;title&gt;The Linux-USB Host Side API&lt;/title&gt;</div><div class='del'>-  </div><div class='del'>-  &lt;legalnotice&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This documentation is free software; you can redistribute</div><div class='del'>-     it and/or modify it under the terms of the GNU General Public</div><div class='del'>-     License as published by the Free Software Foundation; either</div><div class='del'>-     version 2 of the License, or (at your option) any later</div><div class='del'>-     version.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     This program is distributed in the hope that it will be</div><div class='del'>-     useful, but WITHOUT ANY WARRANTY; without even the implied</div><div class='del'>-     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>-     See the GNU General Public License for more details.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     You should have received a copy of the GNU General Public</div><div class='del'>-     License along with this program; if not, write to the Free</div><div class='del'>-     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='del'>-     MA 02111-1307 USA</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     For more details see the file COPYING in the source</div><div class='del'>-     distribution of Linux.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/legalnotice&gt;</div><div class='del'>- &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-&lt;toc&gt;&lt;/toc&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="intro"&gt;</div><div class='del'>-    &lt;title&gt;Introduction to USB on Linux&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;A Universal Serial Bus (USB) is used to connect a host,</div><div class='del'>-    such as a PC or workstation, to a number of peripheral</div><div class='del'>-    devices.  USB uses a tree structure, with the host as the</div><div class='del'>-    root (the system's master), hubs as interior nodes, and</div><div class='del'>-    peripherals as leaves (and slaves).</div><div class='del'>-    Modern PCs support several such trees of USB devices, usually</div><div class='del'>-    one USB 2.0 tree (480 Mbit/sec each) with</div><div class='del'>-    a few USB 1.1 trees (12 Mbit/sec each) that are used when you</div><div class='del'>-    connect a USB 1.1 device directly to the machine's "root hub".</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;That master/slave asymmetry was designed-in for a number of</div><div class='del'>-    reasons, one being ease of use.  It is not physically possible to</div><div class='del'>-    assemble (legal) USB cables incorrectly:  all upstream "to the host"</div><div class='del'>-    connectors are the rectangular type (matching the sockets on</div><div class='del'>-    root hubs), and all downstream connectors are the squarish type</div><div class='del'>-    (or they are built into the peripheral).</div><div class='del'>-    Also, the host software doesn't need to deal with distributed</div><div class='del'>-    auto-configuration since the pre-designated master node manages all that.</div><div class='del'>-    And finally, at the electrical level, bus protocol overhead is reduced by</div><div class='del'>-    eliminating arbitration and moving scheduling into the host software.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;USB 1.0 was announced in January 1996 and was revised</div><div class='del'>-    as USB 1.1 (with improvements in hub specification and</div><div class='del'>-    support for interrupt-out transfers) in September 1998.</div><div class='del'>-    USB 2.0 was released in April 2000, adding high-speed</div><div class='del'>-    transfers and transaction-translating hubs (used for USB 1.1</div><div class='del'>-    and 1.0 backward compatibility).</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;Kernel developers added USB support to Linux early in the 2.2 kernel</div><div class='del'>-    series, shortly before 2.3 development forked.  Updates from 2.3 were</div><div class='del'>-    regularly folded back into 2.2 releases, which improved reliability and</div><div class='del'>-    brought &lt;filename&gt;/sbin/hotplug&lt;/filename&gt; support as well more drivers.</div><div class='del'>-    Such improvements were continued in the 2.5 kernel series, where they added</div><div class='del'>-    USB 2.0 support, improved performance, and made the host controller drivers</div><div class='del'>-    (HCDs) more consistent.  They also simplified the API (to make bugs less</div><div class='del'>-    likely) and added internal "kerneldoc" documentation.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;Linux can run inside USB devices as well as on</div><div class='del'>-    the hosts that control the devices.</div><div class='del'>-    But USB device drivers running inside those peripherals</div><div class='del'>-    don't do the same things as the ones running inside hosts,</div><div class='del'>-    so they've been given a different name:</div><div class='del'>-    &lt;emphasis&gt;gadget drivers&lt;/emphasis&gt;.</div><div class='del'>-    This document does not cover gadget drivers.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="host"&gt;</div><div class='del'>-    &lt;title&gt;USB Host-Side API Model&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;Host-side drivers for USB devices talk to the "usbcore" APIs.</div><div class='del'>-    There are two.  One is intended for</div><div class='del'>-    &lt;emphasis&gt;general-purpose&lt;/emphasis&gt; drivers (exposed through</div><div class='del'>-    driver frameworks), and the other is for drivers that are</div><div class='del'>-    &lt;emphasis&gt;part of the core&lt;/emphasis&gt;.</div><div class='del'>-    Such core drivers include the &lt;emphasis&gt;hub&lt;/emphasis&gt; driver</div><div class='del'>-    (which manages trees of USB devices) and several different kinds</div><div class='del'>-    of &lt;emphasis&gt;host controller drivers&lt;/emphasis&gt;,</div><div class='del'>-    which control individual busses.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;The device model seen by USB drivers is relatively complex.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-     </div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;USB supports four kinds of data transfers</div><div class='del'>-	(control, bulk, interrupt, and isochronous).  Two of them (control</div><div class='del'>-	and bulk) use bandwidth as it's available,</div><div class='del'>-	while the other two (interrupt and isochronous)</div><div class='del'>-	are scheduled to provide guaranteed bandwidth.</div><div class='del'>-	&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;The device description model includes one or more</div><div class='del'>-	"configurations" per device, only one of which is active at a time.</div><div class='del'>-	Devices that are capable of high-speed operation must also support</div><div class='del'>-	full-speed configurations, along with a way to ask about the</div><div class='del'>-	"other speed" configurations which might be used.</div><div class='del'>-	&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;Configurations have one or more "interfaces", each</div><div class='del'>-	of which may have "alternate settings".  Interfaces may be</div><div class='del'>-	standardized by USB "Class" specifications, or may be specific to</div><div class='del'>-	a vendor or device.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;USB device drivers actually bind to interfaces, not devices.</div><div class='del'>-	Think of them as "interface drivers", though you</div><div class='del'>-	may not see many devices where the distinction is important.</div><div class='del'>-	&lt;emphasis&gt;Most USB devices are simple, with only one configuration,</div><div class='del'>-	one interface, and one alternate setting.&lt;/emphasis&gt;</div><div class='del'>-	&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;Interfaces have one or more "endpoints", each of</div><div class='del'>-	which supports one type and direction of data transfer such as</div><div class='del'>-	"bulk out" or "interrupt in".  The entire configuration may have</div><div class='del'>-	up to sixteen endpoints in each direction, allocated as needed</div><div class='del'>-	among all the interfaces.</div><div class='del'>-	&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;Data transfer on USB is packetized; each endpoint</div><div class='del'>-	has a maximum packet size.</div><div class='del'>-	Drivers must often be aware of conventions such as flagging the end</div><div class='del'>-	of bulk transfers using "short" (including zero length) packets.</div><div class='del'>-	&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;The Linux USB API supports synchronous calls for</div><div class='del'>-	control and bulk messages.</div><div class='del'>-	It also supports asynchronous calls for all kinds of data transfer,</div><div class='del'>-	using request structures called "URBs" (USB Request Blocks).</div><div class='del'>-	&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;Accordingly, the USB Core API exposed to device drivers</div><div class='del'>-    covers quite a lot of territory.  You'll probably need to consult</div><div class='del'>-    the USB 2.0 specification, available online from www.usb.org at</div><div class='del'>-    no cost, as well as class or device specifications.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;The only host-side drivers that actually touch hardware</div><div class='del'>-    (reading/writing registers, handling IRQs, and so on) are the HCDs.</div><div class='del'>-    In theory, all HCDs provide the same functionality through the same</div><div class='del'>-    API.  In practice, that's becoming more true on the 2.5 kernels,</div><div class='del'>-    but there are still differences that crop up especially with</div><div class='del'>-    fault handling.  Different controllers don't necessarily report</div><div class='del'>-    the same aspects of failures, and recovery from faults (including</div><div class='del'>-    software-induced ones like unlinking an URB) isn't yet fully</div><div class='del'>-    consistent.</div><div class='del'>-    Device driver authors should make a point of doing disconnect</div><div class='del'>-    testing (while the device is active) with each different host</div><div class='del'>-    controller driver, to make sure drivers don't have bugs of</div><div class='del'>-    their own as well as to make sure they aren't relying on some</div><div class='del'>-    HCD-specific behavior.</div><div class='del'>-    (You will need external USB 1.1 and/or</div><div class='del'>-    USB 2.0 hubs to perform all those tests.)</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="types"&gt;&lt;title&gt;USB-Standard Types&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;In &lt;filename&gt;&amp;lt;linux/usb/ch9.h&amp;gt;&lt;/filename&gt; you will find</div><div class='del'>-    the USB data types defined in chapter 9 of the USB specification.</div><div class='del'>-    These data types are used throughout USB, and in APIs including</div><div class='del'>-    this host side API, gadget APIs, and usbfs.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-!Iinclude/linux/usb/ch9.h</div><div class='del'>-</div><div class='del'>-    &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="hostside"&gt;&lt;title&gt;Host-Side Data Types and Macros&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;The host side API exposes several layers to drivers, some of</div><div class='del'>-    which are more necessary than others.</div><div class='del'>-    These support lifecycle models for host side drivers</div><div class='del'>-    and devices, and support passing buffers through usbcore to</div><div class='del'>-    some HCD that performs the I/O for the device driver.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!Iinclude/linux/usb.h</div><div class='del'>-</div><div class='del'>-    &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-    &lt;chapter id="usbcore"&gt;&lt;title&gt;USB Core APIs&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;There are two basic I/O models in the USB API.</div><div class='del'>-    The most elemental one is asynchronous:  drivers submit requests</div><div class='del'>-    in the form of an URB, and the URB's completion callback</div><div class='del'>-    handle the next step.</div><div class='del'>-    All USB transfer types support that model, although there</div><div class='del'>-    are special cases for control URBs (which always have setup</div><div class='del'>-    and status stages, but may not have a data stage) and</div><div class='del'>-    isochronous URBs (which allow large packets and include</div><div class='del'>-    per-packet fault reports).</div><div class='del'>-    Built on top of that is synchronous API support, where a</div><div class='del'>-    driver calls a routine that allocates one or more URBs,</div><div class='del'>-    submits them, and waits until they complete.</div><div class='del'>-    There are synchronous wrappers for single-buffer control</div><div class='del'>-    and bulk transfers (which are awkward to use in some</div><div class='del'>-    driver disconnect scenarios), and for scatterlist based</div><div class='del'>-    streaming i/o (bulk or interrupt).</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;USB drivers need to provide buffers that can be</div><div class='del'>-    used for DMA, although they don't necessarily need to</div><div class='del'>-    provide the DMA mapping themselves.</div><div class='del'>-    There are APIs to use used when allocating DMA buffers,</div><div class='del'>-    which can prevent use of bounce buffers on some systems.</div><div class='del'>-    In some cases, drivers may be able to rely on 64bit DMA</div><div class='del'>-    to eliminate another kind of bounce buffer.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-!Edrivers/usb/core/urb.c</div><div class='del'>-!Edrivers/usb/core/message.c</div><div class='del'>-!Edrivers/usb/core/file.c</div><div class='del'>-!Edrivers/usb/core/driver.c</div><div class='del'>-!Edrivers/usb/core/usb.c</div><div class='del'>-!Edrivers/usb/core/hub.c</div><div class='del'>-    &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-    &lt;chapter id="hcd"&gt;&lt;title&gt;Host Controller APIs&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;These APIs are only for use by host controller drivers,</div><div class='del'>-    most of which implement standard register interfaces such as</div><div class='del'>-    EHCI, OHCI, or UHCI.</div><div class='del'>-    UHCI was one of the first interfaces, designed by Intel and</div><div class='del'>-    also used by VIA; it doesn't do much in hardware.</div><div class='del'>-    OHCI was designed later, to have the hardware do more work</div><div class='del'>-    (bigger transfers, tracking protocol state, and so on).</div><div class='del'>-    EHCI was designed with USB 2.0; its design has features that</div><div class='del'>-    resemble OHCI (hardware does much more work) as well as</div><div class='del'>-    UHCI (some parts of ISO support, TD list processing).</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;There are host controllers other than the "big three",</div><div class='del'>-    although most PCI based controllers (and a few non-PCI based</div><div class='del'>-    ones) use one of those interfaces.</div><div class='del'>-    Not all host controllers use DMA; some use PIO, and there</div><div class='del'>-    is also a simulator.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;The same basic APIs are available to drivers for all</div><div class='del'>-    those controllers.  </div><div class='del'>-    For historical reasons they are in two layers:</div><div class='del'>-    &lt;structname&gt;struct usb_bus&lt;/structname&gt; is a rather thin</div><div class='del'>-    layer that became available in the 2.2 kernels, while</div><div class='del'>-    &lt;structname&gt;struct usb_hcd&lt;/structname&gt; is a more featureful</div><div class='del'>-    layer (available in later 2.4 kernels and in 2.5) that</div><div class='del'>-    lets HCDs share common code, to shrink driver size</div><div class='del'>-    and significantly reduce hcd-specific behaviors.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-!Edrivers/usb/core/hcd.c</div><div class='del'>-!Edrivers/usb/core/hcd-pci.c</div><div class='del'>-!Idrivers/usb/core/buffer.c</div><div class='del'>-    &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-    &lt;chapter id="usbfs"&gt;</div><div class='del'>-	&lt;title&gt;The USB Filesystem (usbfs)&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;This chapter presents the Linux &lt;emphasis&gt;usbfs&lt;/emphasis&gt;.</div><div class='del'>-	You may prefer to avoid writing new kernel code for your</div><div class='del'>-	USB driver; that's the problem that usbfs set out to solve.</div><div class='del'>-	User mode device drivers are usually packaged as applications</div><div class='del'>-	or libraries, and may use usbfs through some programming library</div><div class='del'>-	that wraps it.  Such libraries include</div><div class='del'>-	&lt;ulink url="http://libusb.sourceforge.net"&gt;libusb&lt;/ulink&gt;</div><div class='del'>-	for C/C++, and</div><div class='del'>-	&lt;ulink url="http://jUSB.sourceforge.net"&gt;jUSB&lt;/ulink&gt; for Java.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;note&gt;&lt;title&gt;Unfinished&lt;/title&gt;</div><div class='del'>-	    &lt;para&gt;This particular documentation is incomplete,</div><div class='del'>-	    especially with respect to the asynchronous mode.</div><div class='del'>-	    As of kernel 2.5.66 the code and this (new) documentation</div><div class='del'>-	    need to be cross-reviewed.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	    &lt;/note&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;Configure usbfs into Linux kernels by enabling the</div><div class='del'>-	&lt;emphasis&gt;USB filesystem&lt;/emphasis&gt; option (CONFIG_USB_DEVICEFS),</div><div class='del'>-	and you get basic support for user mode USB device drivers.</div><div class='del'>-	Until relatively recently it was often (confusingly) called</div><div class='del'>-	&lt;emphasis&gt;usbdevfs&lt;/emphasis&gt; although it wasn't solving what</div><div class='del'>-	&lt;emphasis&gt;devfs&lt;/emphasis&gt; was.</div><div class='del'>-	Every USB device will appear in usbfs, regardless of whether or</div><div class='del'>-	not it has a kernel driver.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;sect1 id="usbfs-files"&gt;</div><div class='del'>-	    &lt;title&gt;What files are in "usbfs"?&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;Conventionally mounted at</div><div class='del'>-	    &lt;filename&gt;/proc/bus/usb&lt;/filename&gt;, usbfs </div><div class='del'>-	    features include:</div><div class='del'>-	    &lt;itemizedlist&gt;</div><div class='del'>-		&lt;listitem&gt;&lt;para&gt;&lt;filename&gt;/proc/bus/usb/devices&lt;/filename&gt;</div><div class='del'>-		    ... a text file</div><div class='del'>-		    showing each of the USB devices on known to the kernel,</div><div class='del'>-		    and their configuration descriptors.</div><div class='del'>-		    You can also poll() this to learn about new devices.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		&lt;listitem&gt;&lt;para&gt;&lt;filename&gt;/proc/bus/usb/BBB/DDD&lt;/filename&gt;</div><div class='del'>-		    ... magic files</div><div class='del'>-		    exposing the each device's configuration descriptors, and</div><div class='del'>-		    supporting a series of ioctls for making device requests,</div><div class='del'>-		    including I/O to devices.  (Purely for access by programs.)</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	    &lt;/itemizedlist&gt;</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt; Each bus is given a number (BBB) based on when it was</div><div class='del'>-	    enumerated; within each bus, each device is given a similar</div><div class='del'>-	    number (DDD).</div><div class='del'>-	    Those BBB/DDD paths are not "stable" identifiers;</div><div class='del'>-	    expect them to change even if you always leave the devices</div><div class='del'>-	    plugged in to the same hub port.</div><div class='del'>-	    &lt;emphasis&gt;Don't even think of saving these in application</div><div class='del'>-	    configuration files.&lt;/emphasis&gt;</div><div class='del'>-	    Stable identifiers are available, for user mode applications</div><div class='del'>-	    that want to use them.  HID and networking devices expose</div><div class='del'>-	    these stable IDs, so that for example you can be sure that</div><div class='del'>-	    you told the right UPS to power down its second server.</div><div class='del'>-	    "usbfs" doesn't (yet) expose those IDs.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-	&lt;sect1 id="usbfs-fstab"&gt;</div><div class='del'>-	    &lt;title&gt;Mounting and Access Control&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;There are a number of mount options for usbfs, which will</div><div class='del'>-	    be of most interest to you if you need to override the default</div><div class='del'>-	    access control policy.</div><div class='del'>-	    That policy is that only root may read or write device files</div><div class='del'>-	    (&lt;filename&gt;/proc/bus/BBB/DDD&lt;/filename&gt;) although anyone may read</div><div class='del'>-	    the &lt;filename&gt;devices&lt;/filename&gt;</div><div class='del'>-	    or &lt;filename&gt;drivers&lt;/filename&gt; files.</div><div class='del'>-	    I/O requests to the device also need the CAP_SYS_RAWIO capability,</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;The significance of that is that by default, all user mode</div><div class='del'>-	    device drivers need super-user privileges.</div><div class='del'>-	    You can change modes or ownership in a driver setup</div><div class='del'>-	    when the device hotplugs, or maye just start the</div><div class='del'>-	    driver right then, as a privileged server (or some activity</div><div class='del'>-	    within one).</div><div class='del'>-	    That's the most secure approach for multi-user systems,</div><div class='del'>-	    but for single user systems ("trusted" by that user)</div><div class='del'>-	    it's more convenient just to grant everyone all access</div><div class='del'>-	    (using the &lt;emphasis&gt;devmode=0666&lt;/emphasis&gt; option)</div><div class='del'>-	    so the driver can start whenever it's needed.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;The mount options for usbfs, usable in /etc/fstab or</div><div class='del'>-	    in command line invocations of &lt;emphasis&gt;mount&lt;/emphasis&gt;, are:</div><div class='del'>-</div><div class='del'>-	    &lt;variablelist&gt;</div><div class='del'>-		&lt;varlistentry&gt;</div><div class='del'>-		    &lt;term&gt;&lt;emphasis&gt;busgid&lt;/emphasis&gt;=NNNNN&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Controls the GID used for the</div><div class='del'>-		    /proc/bus/usb/BBB</div><div class='del'>-		    directories.  (Default: 0)&lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;&lt;emphasis&gt;busmode&lt;/emphasis&gt;=MMM&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Controls the file mode used for the</div><div class='del'>-		    /proc/bus/usb/BBB</div><div class='del'>-		    directories.  (Default: 0555)</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;&lt;emphasis&gt;busuid&lt;/emphasis&gt;=NNNNN&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Controls the UID used for the</div><div class='del'>-		    /proc/bus/usb/BBB</div><div class='del'>-		    directories.  (Default: 0)&lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;&lt;emphasis&gt;devgid&lt;/emphasis&gt;=NNNNN&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Controls the GID used for the</div><div class='del'>-		    /proc/bus/usb/BBB/DDD</div><div class='del'>-		    files.  (Default: 0)&lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;&lt;emphasis&gt;devmode&lt;/emphasis&gt;=MMM&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Controls the file mode used for the</div><div class='del'>-		    /proc/bus/usb/BBB/DDD</div><div class='del'>-		    files.  (Default: 0644)&lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;&lt;emphasis&gt;devuid&lt;/emphasis&gt;=NNNNN&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Controls the UID used for the</div><div class='del'>-		    /proc/bus/usb/BBB/DDD</div><div class='del'>-		    files.  (Default: 0)&lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;&lt;emphasis&gt;listgid&lt;/emphasis&gt;=NNNNN&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Controls the GID used for the</div><div class='del'>-		    /proc/bus/usb/devices and drivers files.</div><div class='del'>-		    (Default: 0)&lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;&lt;emphasis&gt;listmode&lt;/emphasis&gt;=MMM&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Controls the file mode used for the</div><div class='del'>-		    /proc/bus/usb/devices and drivers files.</div><div class='del'>-		    (Default: 0444)&lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;&lt;emphasis&gt;listuid&lt;/emphasis&gt;=NNNNN&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Controls the UID used for the</div><div class='del'>-		    /proc/bus/usb/devices and drivers files.</div><div class='del'>-		    (Default: 0)&lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-	    &lt;/variablelist&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;Note that many Linux distributions hard-wire the mount options</div><div class='del'>-	    for usbfs in their init scripts, such as</div><div class='del'>-	    &lt;filename&gt;/etc/rc.d/rc.sysinit&lt;/filename&gt;,</div><div class='del'>-	    rather than making it easy to set this per-system</div><div class='del'>-	    policy in &lt;filename&gt;/etc/fstab&lt;/filename&gt;.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-	&lt;sect1 id="usbfs-devices"&gt;</div><div class='del'>-	    &lt;title&gt;/proc/bus/usb/devices&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;This file is handy for status viewing tools in user</div><div class='del'>-	    mode, which can scan the text format and ignore most of it.</div><div class='del'>-	    More detailed device status (including class and vendor</div><div class='del'>-	    status) is available from device-specific files.</div><div class='del'>-	    For information about the current format of this file,</div><div class='del'>-	    see the</div><div class='del'>-	    &lt;filename&gt;Documentation/usb/proc_usb_info.txt&lt;/filename&gt;</div><div class='del'>-	    file in your Linux kernel sources.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;This file, in combination with the poll() system call, can</div><div class='del'>-	    also be used to detect when devices are added or removed:</div><div class='del'>-&lt;programlisting&gt;int fd;</div><div class='del'>-struct pollfd pfd;</div><div class='del'>-</div><div class='del'>-fd = open("/proc/bus/usb/devices", O_RDONLY);</div><div class='del'>-pfd = { fd, POLLIN, 0 };</div><div class='del'>-for (;;) {</div><div class='del'>-	/* The first time through, this call will return immediately. */</div><div class='del'>-	poll(&amp;amp;pfd, 1, -1);</div><div class='del'>-</div><div class='del'>-	/* To see what's changed, compare the file's previous and current</div><div class='del'>-	   contents or scan the filesystem.  (Scanning is more precise.) */</div><div class='del'>-}&lt;/programlisting&gt;</div><div class='del'>-	    Note that this behavior is intended to be used for informational</div><div class='del'>-	    and debug purposes.  It would be more appropriate to use programs</div><div class='del'>-	    such as udev or HAL to initialize a device or start a user-mode</div><div class='del'>-	    helper program, for instance.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-	&lt;sect1 id="usbfs-bbbddd"&gt;</div><div class='del'>-	    &lt;title&gt;/proc/bus/usb/BBB/DDD&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;Use these files in one of these basic ways:</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;&lt;emphasis&gt;They can be read,&lt;/emphasis&gt;</div><div class='del'>-	    producing first the device descriptor</div><div class='del'>-	    (18 bytes) and then the descriptors for the current configuration.</div><div class='del'>-	    See the USB 2.0 spec for details about those binary data formats.</div><div class='del'>-	    You'll need to convert most multibyte values from little endian</div><div class='del'>-	    format to your native host byte order, although a few of the</div><div class='del'>-	    fields in the device descriptor (both of the BCD-encoded fields,</div><div class='del'>-	    and the vendor and product IDs) will be byteswapped for you.</div><div class='del'>-	    Note that configuration descriptors include descriptors for</div><div class='del'>-	    interfaces, altsettings, endpoints, and maybe additional</div><div class='del'>-	    class descriptors.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;&lt;emphasis&gt;Perform USB operations&lt;/emphasis&gt; using </div><div class='del'>-	    &lt;emphasis&gt;ioctl()&lt;/emphasis&gt; requests to make endpoint I/O</div><div class='del'>-	    requests (synchronously or asynchronously) or manage</div><div class='del'>-	    the device.</div><div class='del'>-	    These requests need the CAP_SYS_RAWIO capability,</div><div class='del'>-	    as well as filesystem access permissions.</div><div class='del'>-	    Only one ioctl request can be made on one of these</div><div class='del'>-	    device files at a time.</div><div class='del'>-	    This means that if you are synchronously reading an endpoint</div><div class='del'>-	    from one thread, you won't be able to write to a different</div><div class='del'>-	    endpoint from another thread until the read completes.</div><div class='del'>-	    This works for &lt;emphasis&gt;half duplex&lt;/emphasis&gt; protocols,</div><div class='del'>-	    but otherwise you'd use asynchronous i/o requests. </div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	&lt;sect1 id="usbfs-lifecycle"&gt;</div><div class='del'>-	    &lt;title&gt;Life Cycle of User Mode Drivers&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;Such a driver first needs to find a device file</div><div class='del'>-	    for a device it knows how to handle.</div><div class='del'>-	    Maybe it was told about it because a</div><div class='del'>-	    &lt;filename&gt;/sbin/hotplug&lt;/filename&gt; event handling agent</div><div class='del'>-	    chose that driver to handle the new device.</div><div class='del'>-	    Or maybe it's an application that scans all the</div><div class='del'>-	    /proc/bus/usb device files, and ignores most devices.</div><div class='del'>-	    In either case, it should &lt;function&gt;read()&lt;/function&gt; all</div><div class='del'>-	    the descriptors from the device file,</div><div class='del'>-	    and check them against what it knows how to handle.</div><div class='del'>-	    It might just reject everything except a particular</div><div class='del'>-	    vendor and product ID, or need a more complex policy.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;Never assume there will only be one such device</div><div class='del'>-	    on the system at a time!</div><div class='del'>-	    If your code can't handle more than one device at</div><div class='del'>-	    a time, at least detect when there's more than one, and</div><div class='del'>-	    have your users choose which device to use.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;Once your user mode driver knows what device to use,</div><div class='del'>-	    it interacts with it in either of two styles.</div><div class='del'>-	    The simple style is to make only control requests; some</div><div class='del'>-	    devices don't need more complex interactions than those.</div><div class='del'>-	    (An example might be software using vendor-specific control</div><div class='del'>-	    requests for some initialization or configuration tasks,</div><div class='del'>-	    with a kernel driver for the rest.)</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;More likely, you need a more complex style driver:</div><div class='del'>-	    one using non-control endpoints, reading or writing data</div><div class='del'>-	    and claiming exclusive use of an interface.</div><div class='del'>-	    &lt;emphasis&gt;Bulk&lt;/emphasis&gt; transfers are easiest to use,</div><div class='del'>-	    but only their sibling &lt;emphasis&gt;interrupt&lt;/emphasis&gt; transfers </div><div class='del'>-	    work with low speed devices.</div><div class='del'>-	    Both interrupt and &lt;emphasis&gt;isochronous&lt;/emphasis&gt; transfers</div><div class='del'>-	    offer service guarantees because their bandwidth is reserved.</div><div class='del'>-	    Such "periodic" transfers are awkward to use through usbfs,</div><div class='del'>-	    unless you're using the asynchronous calls.  However, interrupt</div><div class='del'>-	    transfers can also be used in a synchronous "one shot" style.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;Your user-mode driver should never need to worry</div><div class='del'>-	    about cleaning up request state when the device is</div><div class='del'>-	    disconnected, although it should close its open file</div><div class='del'>-	    descriptors as soon as it starts seeing the ENODEV</div><div class='del'>-	    errors.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-	&lt;sect1 id="usbfs-ioctl"&gt;&lt;title&gt;The ioctl() Requests&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;To use these ioctls, you need to include the following</div><div class='del'>-	    headers in your userspace program:</div><div class='del'>-&lt;programlisting&gt;#include &amp;lt;linux/usb.h&amp;gt;</div><div class='del'>-#include &amp;lt;linux/usbdevice_fs.h&amp;gt;</div><div class='del'>-#include &amp;lt;asm/byteorder.h&amp;gt;&lt;/programlisting&gt;</div><div class='del'>-	    The standard USB device model requests, from "Chapter 9" of</div><div class='del'>-	    the USB 2.0 specification, are automatically included from</div><div class='del'>-	    the &lt;filename&gt;&amp;lt;linux/usb/ch9.h&amp;gt;&lt;/filename&gt; header.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;Unless noted otherwise, the ioctl requests</div><div class='del'>-	    described here will</div><div class='del'>-	    update the modification time on the usbfs file to which</div><div class='del'>-	    they are applied (unless they fail).</div><div class='del'>-	    A return of zero indicates success; otherwise, a</div><div class='del'>-	    standard USB error code is returned.  (These are</div><div class='del'>-	    documented in</div><div class='del'>-	    &lt;filename&gt;Documentation/usb/error-codes.txt&lt;/filename&gt;</div><div class='del'>-	    in your kernel sources.)</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;para&gt;Each of these files multiplexes access to several</div><div class='del'>-	    I/O streams, one per endpoint.</div><div class='del'>-	    Each device has one control endpoint (endpoint zero)</div><div class='del'>-	    which supports a limited RPC style RPC access.</div><div class='del'>-	    Devices are configured</div><div class='del'>-	    by hub_wq (in the kernel) setting a device-wide</div><div class='del'>-	    &lt;emphasis&gt;configuration&lt;/emphasis&gt; that affects things</div><div class='del'>-	    like power consumption and basic functionality.</div><div class='del'>-	    The endpoints are part of USB &lt;emphasis&gt;interfaces&lt;/emphasis&gt;,</div><div class='del'>-	    which may have &lt;emphasis&gt;altsettings&lt;/emphasis&gt;</div><div class='del'>-	    affecting things like which endpoints are available.</div><div class='del'>-	    Many devices only have a single configuration and interface,</div><div class='del'>-	    so drivers for them will ignore configurations and altsettings.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	    &lt;sect2 id="usbfs-mgmt"&gt;</div><div class='del'>-		&lt;title&gt;Management/Status Requests&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-		&lt;para&gt;A number of usbfs requests don't deal very directly</div><div class='del'>-		with device I/O.</div><div class='del'>-		They mostly relate to device management and status.</div><div class='del'>-		These are all synchronous requests.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-		&lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_CLAIMINTERFACE&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;This is used to force usbfs to</div><div class='del'>-		    claim a specific interface,</div><div class='del'>-		    which has not previously been claimed by usbfs or any other</div><div class='del'>-		    kernel driver.</div><div class='del'>-		    The ioctl parameter is an integer holding the number of</div><div class='del'>-		    the interface (bInterfaceNumber from descriptor).</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    Note that if your driver doesn't claim an interface</div><div class='del'>-		    before trying to use one of its endpoints, and no</div><div class='del'>-		    other driver has bound to it, then the interface is</div><div class='del'>-		    automatically claimed by usbfs.</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    This claim will be released by a RELEASEINTERFACE ioctl,</div><div class='del'>-		    or by closing the file descriptor.</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_CONNECTINFO&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Says whether the device is lowspeed.</div><div class='del'>-		    The ioctl parameter points to a structure like this:</div><div class='del'>-&lt;programlisting&gt;struct usbdevfs_connectinfo {</div><div class='del'>-        unsigned int   devnum;</div><div class='del'>-        unsigned char  slow;</div><div class='del'>-}; &lt;/programlisting&gt;</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    &lt;emphasis&gt;You can't tell whether a "not slow"</div><div class='del'>-		    device is connected at high speed (480 MBit/sec)</div><div class='del'>-		    or just full speed (12 MBit/sec).&lt;/emphasis&gt;</div><div class='del'>-		    You should know the devnum value already,</div><div class='del'>-		    it's the DDD value of the device file name.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_GETDRIVER&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Returns the name of the kernel driver</div><div class='del'>-		    bound to a given interface (a string).  Parameter</div><div class='del'>-		    is a pointer to this structure, which is modified:</div><div class='del'>-&lt;programlisting&gt;struct usbdevfs_getdriver {</div><div class='del'>-        unsigned int  interface;</div><div class='del'>-        char          driver[USBDEVFS_MAXDRIVERNAME + 1];</div><div class='del'>-};&lt;/programlisting&gt;</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_IOCTL&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Passes a request from userspace through</div><div class='del'>-		    to a kernel driver that has an ioctl entry in the</div><div class='del'>-		    &lt;emphasis&gt;struct usb_driver&lt;/emphasis&gt; it registered.</div><div class='del'>-&lt;programlisting&gt;struct usbdevfs_ioctl {</div><div class='del'>-        int     ifno;</div><div class='del'>-        int     ioctl_code;</div><div class='del'>-        void    *data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* user mode call looks like this.</div><div class='del'>- * 'request' becomes the driver-&gt;ioctl() 'code' parameter.</div><div class='del'>- * the size of 'param' is encoded in 'request', and that data</div><div class='del'>- * is copied to or from the driver-&gt;ioctl() 'buf' parameter.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-usbdev_ioctl (int fd, int ifno, unsigned request, void *param)</div><div class='del'>-{</div><div class='del'>-        struct usbdevfs_ioctl	wrapper;</div><div class='del'>-</div><div class='del'>-        wrapper.ifno = ifno;</div><div class='del'>-        wrapper.ioctl_code = request;</div><div class='del'>-        wrapper.data = param;</div><div class='del'>-</div><div class='del'>-        return ioctl (fd, USBDEVFS_IOCTL, &amp;amp;wrapper);</div><div class='del'>-} &lt;/programlisting&gt;</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    This request lets kernel drivers talk to user mode code</div><div class='del'>-		    through filesystem operations even when they don't create</div><div class='del'>-		    a character or block special device.</div><div class='del'>-		    It's also been used to do things like ask devices what</div><div class='del'>-		    device special file should be used.</div><div class='del'>-		    Two pre-defined ioctls are used</div><div class='del'>-		    to disconnect and reconnect kernel drivers, so</div><div class='del'>-		    that user mode code can completely manage binding</div><div class='del'>-		    and configuration of devices.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_RELEASEINTERFACE&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;This is used to release the claim usbfs</div><div class='del'>-		    made on interface, either implicitly or because of a</div><div class='del'>-		    USBDEVFS_CLAIMINTERFACE call, before the file</div><div class='del'>-		    descriptor is closed.</div><div class='del'>-		    The ioctl parameter is an integer holding the number of</div><div class='del'>-		    the interface (bInterfaceNumber from descriptor);</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;warning&gt;&lt;para&gt;</div><div class='del'>-		    &lt;emphasis&gt;No security check is made to ensure</div><div class='del'>-		    that the task which made the claim is the one</div><div class='del'>-		    which is releasing it.</div><div class='del'>-		    This means that user mode driver may interfere</div><div class='del'>-		    other ones.  &lt;/emphasis&gt;</div><div class='del'>-		    &lt;/para&gt;&lt;/warning&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_RESETEP&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Resets the data toggle value for an endpoint</div><div class='del'>-		    (bulk or interrupt) to DATA0.</div><div class='del'>-		    The ioctl parameter is an integer endpoint number</div><div class='del'>-		    (1 to 15, as identified in the endpoint descriptor),</div><div class='del'>-		    with USB_DIR_IN added if the device's endpoint sends</div><div class='del'>-		    data to the host.</div><div class='del'>-		    &lt;/para&gt;&lt;warning&gt;&lt;para&gt;</div><div class='del'>-		    &lt;emphasis&gt;Avoid using this request.</div><div class='del'>-		    It should probably be removed.&lt;/emphasis&gt;</div><div class='del'>-		    Using it typically means the device and driver will lose</div><div class='del'>-		    toggle synchronization.  If you really lost synchronization,</div><div class='del'>-		    you likely need to completely handshake with the device,</div><div class='del'>-		    using a request like CLEAR_HALT</div><div class='del'>-		    or SET_INTERFACE.</div><div class='del'>-		    &lt;/para&gt;&lt;/warning&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_DROP_PRIVILEGES&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;This is used to relinquish the ability</div><div class='del'>-		    to do certain operations which are considered to be</div><div class='del'>-		    privileged on a usbfs file descriptor.</div><div class='del'>-		    This includes claiming arbitrary interfaces, resetting</div><div class='del'>-		    a device on which there are currently claimed interfaces</div><div class='del'>-		    from other users, and issuing USBDEVFS_IOCTL calls.</div><div class='del'>-		    The ioctl parameter is a 32 bit mask of interfaces</div><div class='del'>-		    the user is allowed to claim on this file descriptor.</div><div class='del'>-		    You may issue this ioctl more than one time to narrow</div><div class='del'>-		    said mask.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-		&lt;/variablelist&gt;</div><div class='del'>-</div><div class='del'>-		&lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;sect2 id="usbfs-sync"&gt;</div><div class='del'>-		&lt;title&gt;Synchronous I/O Support&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-		&lt;para&gt;Synchronous requests involve the kernel blocking</div><div class='del'>-		until the user mode request completes, either by</div><div class='del'>-		finishing successfully or by reporting an error.</div><div class='del'>-		In most cases this is the simplest way to use usbfs,</div><div class='del'>-		although as noted above it does prevent performing I/O</div><div class='del'>-		to more than one endpoint at a time.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-		&lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_BULK&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Issues a bulk read or write request to the</div><div class='del'>-		    device.</div><div class='del'>-		    The ioctl parameter is a pointer to this structure:</div><div class='del'>-&lt;programlisting&gt;struct usbdevfs_bulktransfer {</div><div class='del'>-        unsigned int  ep;</div><div class='del'>-        unsigned int  len;</div><div class='del'>-        unsigned int  timeout; /* in milliseconds */</div><div class='del'>-        void          *data;</div><div class='del'>-};&lt;/programlisting&gt;</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;The "ep" value identifies a</div><div class='del'>-		    bulk endpoint number (1 to 15, as identified in an endpoint</div><div class='del'>-		    descriptor),</div><div class='del'>-		    masked with USB_DIR_IN when referring to an endpoint which</div><div class='del'>-		    sends data to the host from the device.</div><div class='del'>-		    The length of the data buffer is identified by "len";</div><div class='del'>-		    Recent kernels support requests up to about 128KBytes.</div><div class='del'>-		    &lt;emphasis&gt;FIXME say how read length is returned,</div><div class='del'>-		    and how short reads are handled.&lt;/emphasis&gt;.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_CLEAR_HALT&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Clears endpoint halt (stall) and</div><div class='del'>-		    resets the endpoint toggle.  This is only</div><div class='del'>-		    meaningful for bulk or interrupt endpoints.</div><div class='del'>-		    The ioctl parameter is an integer endpoint number</div><div class='del'>-		    (1 to 15, as identified in an endpoint descriptor),</div><div class='del'>-		    masked with USB_DIR_IN when referring to an endpoint which</div><div class='del'>-		    sends data to the host from the device.</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    Use this on bulk or interrupt endpoints which have</div><div class='del'>-		    stalled, returning &lt;emphasis&gt;-EPIPE&lt;/emphasis&gt; status</div><div class='del'>-		    to a data transfer request.</div><div class='del'>-		    Do not issue the control request directly, since</div><div class='del'>-		    that could invalidate the host's record of the</div><div class='del'>-		    data toggle.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_CONTROL&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Issues a control request to the device.</div><div class='del'>-		    The ioctl parameter points to a structure like this:</div><div class='del'>-&lt;programlisting&gt;struct usbdevfs_ctrltransfer {</div><div class='del'>-        __u8   bRequestType;</div><div class='del'>-        __u8   bRequest;</div><div class='del'>-        __u16  wValue;</div><div class='del'>-        __u16  wIndex;</div><div class='del'>-        __u16  wLength;</div><div class='del'>-        __u32  timeout;  /* in milliseconds */</div><div class='del'>-        void   *data;</div><div class='del'>-};&lt;/programlisting&gt;</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    The first eight bytes of this structure are the contents</div><div class='del'>-		    of the SETUP packet to be sent to the device; see the</div><div class='del'>-		    USB 2.0 specification for details.</div><div class='del'>-		    The bRequestType value is composed by combining a</div><div class='del'>-		    USB_TYPE_* value, a USB_DIR_* value, and a</div><div class='del'>-		    USB_RECIP_* value (from</div><div class='del'>-		    &lt;emphasis&gt;&amp;lt;linux/usb.h&amp;gt;&lt;/emphasis&gt;).</div><div class='del'>-		    If wLength is nonzero, it describes the length of the data</div><div class='del'>-		    buffer, which is either written to the device</div><div class='del'>-		    (USB_DIR_OUT) or read from the device (USB_DIR_IN).</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    At this writing, you can't transfer more than 4 KBytes</div><div class='del'>-		    of data to or from a device; usbfs has a limit, and</div><div class='del'>-		    some host controller drivers have a limit.</div><div class='del'>-		    (That's not usually a problem.)</div><div class='del'>-		    &lt;emphasis&gt;Also&lt;/emphasis&gt; there's no way to say it's</div><div class='del'>-		    not OK to get a short read back from the device.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_RESET&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Does a USB level device reset.</div><div class='del'>-		    The ioctl parameter is ignored.</div><div class='del'>-		    After the reset, this rebinds all device interfaces.</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;warning&gt;&lt;para&gt;</div><div class='del'>-		    &lt;emphasis&gt;Avoid using this call&lt;/emphasis&gt;</div><div class='del'>-		    until some usbcore bugs get fixed,</div><div class='del'>-		    since it does not fully synchronize device, interface,</div><div class='del'>-		    and driver (not just usbfs) state.</div><div class='del'>-		    &lt;/para&gt;&lt;/warning&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-	    </div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_SETINTERFACE&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Sets the alternate setting for an</div><div class='del'>-		    interface.  The ioctl parameter is a pointer to a</div><div class='del'>-		    structure like this:</div><div class='del'>-&lt;programlisting&gt;struct usbdevfs_setinterface {</div><div class='del'>-        unsigned int  interface;</div><div class='del'>-        unsigned int  altsetting;</div><div class='del'>-}; &lt;/programlisting&gt;</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    Those struct members are from some interface descriptor</div><div class='del'>-		    applying to the current configuration.</div><div class='del'>-		    The interface number is the bInterfaceNumber value, and</div><div class='del'>-		    the altsetting number is the bAlternateSetting value.</div><div class='del'>-		    (This resets each endpoint in the interface.)</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_SETCONFIGURATION&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;Issues the</div><div class='del'>-		    &lt;function&gt;usb_set_configuration&lt;/function&gt; call</div><div class='del'>-		    for the device.</div><div class='del'>-		    The parameter is an integer holding the number of</div><div class='del'>-		    a configuration (bConfigurationValue from descriptor).</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;warning&gt;&lt;para&gt;</div><div class='del'>-		    &lt;emphasis&gt;Avoid using this call&lt;/emphasis&gt;</div><div class='del'>-		    until some usbcore bugs get fixed,</div><div class='del'>-		    since it does not fully synchronize device, interface,</div><div class='del'>-		    and driver (not just usbfs) state.</div><div class='del'>-		    &lt;/para&gt;&lt;/warning&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;/variablelist&gt;</div><div class='del'>-	    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;sect2 id="usbfs-async"&gt;</div><div class='del'>-		&lt;title&gt;Asynchronous I/O Support&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-		&lt;para&gt;As mentioned above, there are situations where it may be</div><div class='del'>-		important to initiate concurrent operations from user mode code.</div><div class='del'>-		This is particularly important for periodic transfers</div><div class='del'>-		(interrupt and isochronous), but it can be used for other</div><div class='del'>-		kinds of USB requests too.</div><div class='del'>-		In such cases, the asynchronous requests described here</div><div class='del'>-		are essential.  Rather than submitting one request and having</div><div class='del'>-		the kernel block until it completes, the blocking is separate.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-		&lt;para&gt;These requests are packaged into a structure that</div><div class='del'>-		resembles the URB used by kernel device drivers.</div><div class='del'>-		(No POSIX Async I/O support here, sorry.)</div><div class='del'>-		It identifies the endpoint type (USBDEVFS_URB_TYPE_*),</div><div class='del'>-		endpoint (number, masked with USB_DIR_IN as appropriate),</div><div class='del'>-		buffer and length, and a user "context" value serving to</div><div class='del'>-		uniquely identify each request.</div><div class='del'>-		(It's usually a pointer to per-request data.)</div><div class='del'>-		Flags can modify requests (not as many as supported for</div><div class='del'>-		kernel drivers).</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-		&lt;para&gt;Each request can specify a realtime signal number</div><div class='del'>-		(between SIGRTMIN and SIGRTMAX, inclusive) to request a</div><div class='del'>-		signal be sent when the request completes.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-		&lt;para&gt;When usbfs returns these urbs, the status value</div><div class='del'>-		is updated, and the buffer may have been modified.</div><div class='del'>-		Except for isochronous transfers, the actual_length is</div><div class='del'>-		updated to say how many bytes were transferred; if the</div><div class='del'>-		USBDEVFS_URB_DISABLE_SPD flag is set</div><div class='del'>-		("short packets are not OK"), if fewer bytes were read</div><div class='del'>-		than were requested then you get an error report.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;programlisting&gt;struct usbdevfs_iso_packet_desc {</div><div class='del'>-        unsigned int                     length;</div><div class='del'>-        unsigned int                     actual_length;</div><div class='del'>-        unsigned int                     status;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct usbdevfs_urb {</div><div class='del'>-        unsigned char                    type;</div><div class='del'>-        unsigned char                    endpoint;</div><div class='del'>-        int                              status;</div><div class='del'>-        unsigned int                     flags;</div><div class='del'>-        void                             *buffer;</div><div class='del'>-        int                              buffer_length;</div><div class='del'>-        int                              actual_length;</div><div class='del'>-        int                              start_frame;</div><div class='del'>-        int                              number_of_packets;</div><div class='del'>-        int                              error_count;</div><div class='del'>-        unsigned int                     signr;</div><div class='del'>-        void                             *usercontext;</div><div class='del'>-        struct usbdevfs_iso_packet_desc  iso_frame_desc[];</div><div class='del'>-};&lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-		&lt;para&gt; For these asynchronous requests, the file modification</div><div class='del'>-		time reflects when the request was initiated.</div><div class='del'>-		This contrasts with their use with the synchronous requests,</div><div class='del'>-		where it reflects when requests complete.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-		&lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_DISCARDURB&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		    &lt;emphasis&gt;TBS&lt;/emphasis&gt;</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_DISCSIGNAL&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		    &lt;emphasis&gt;TBS&lt;/emphasis&gt;</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_REAPURB&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		    &lt;emphasis&gt;TBS&lt;/emphasis&gt;</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_REAPURBNDELAY&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		    &lt;emphasis&gt;TBS&lt;/emphasis&gt;</div><div class='del'>-		    File modification time is not updated by this request.</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;varlistentry&gt;&lt;term&gt;USBDEVFS_SUBMITURB&lt;/term&gt;</div><div class='del'>-		    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		    &lt;emphasis&gt;TBS&lt;/emphasis&gt;</div><div class='del'>-		    &lt;/para&gt;&lt;para&gt;</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-		&lt;/variablelist&gt;</div><div class='del'>-	    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-	&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;/book&gt;</div><div class='del'>-&lt;!-- vim:syntax=sgml:sw=4</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl<br/>deleted file mode 100644<br/>index a27ab9f53fb6..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/DocBook/writing-an-alsa-driver.tmpl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/DocBook/writing-an-alsa-driver.tmpl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6206 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='del'>-	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Header  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;book id="Writing-an-ALSA-Driver"&gt;</div><div class='del'>-  &lt;bookinfo&gt;</div><div class='del'>-    &lt;title&gt;Writing an ALSA Driver&lt;/title&gt;</div><div class='del'>-    &lt;author&gt;</div><div class='del'>-      &lt;firstname&gt;Takashi&lt;/firstname&gt;</div><div class='del'>-      &lt;surname&gt;Iwai&lt;/surname&gt;</div><div class='del'>-      &lt;affiliation&gt;</div><div class='del'>-        &lt;address&gt;</div><div class='del'>-          &lt;email&gt;tiwai@suse.de&lt;/email&gt;</div><div class='del'>-        &lt;/address&gt;</div><div class='del'>-      &lt;/affiliation&gt;</div><div class='del'>-     &lt;/author&gt;</div><div class='del'>-</div><div class='del'>-     &lt;date&gt;Oct 15, 2007&lt;/date&gt;</div><div class='del'>-     &lt;edition&gt;0.3.7&lt;/edition&gt;</div><div class='del'>-</div><div class='del'>-    &lt;abstract&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This document describes how to write an ALSA (Advanced Linux</div><div class='del'>-        Sound Architecture) driver.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/abstract&gt;</div><div class='del'>-</div><div class='del'>-    &lt;legalnotice&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    Copyright (c) 2002-2005  Takashi Iwai &lt;email&gt;tiwai@suse.de&lt;/email&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    This document is free; you can redistribute it and/or modify it</div><div class='del'>-    under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    This document is distributed in the hope that it will be useful,</div><div class='del'>-    but &lt;emphasis&gt;WITHOUT ANY WARRANTY&lt;/emphasis&gt;; without even the</div><div class='del'>-    implied warranty of &lt;emphasis&gt;MERCHANTABILITY or FITNESS FOR A</div><div class='del'>-    PARTICULAR PURPOSE&lt;/emphasis&gt;. See the GNU General Public License</div><div class='del'>-    for more details.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    You should have received a copy of the GNU General Public</div><div class='del'>-    License along with this program; if not, write to the Free</div><div class='del'>-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='del'>-    MA 02111-1307 USA</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/legalnotice&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Preface  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;preface id="preface"&gt;</div><div class='del'>-    &lt;title&gt;Preface&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This document describes how to write an</div><div class='del'>-      &lt;ulink url="http://www.alsa-project.org/"&gt;&lt;citetitle&gt;</div><div class='del'>-      ALSA (Advanced Linux Sound Architecture)&lt;/citetitle&gt;&lt;/ulink&gt;</div><div class='del'>-      driver. The document focuses mainly on PCI soundcards.</div><div class='del'>-      In the case of other device types, the API might</div><div class='del'>-      be different, too. However, at least the ALSA kernel API is</div><div class='del'>-      consistent, and therefore it would be still a bit help for</div><div class='del'>-      writing them.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    This document targets people who already have enough</div><div class='del'>-    C language skills and have basic linux kernel programming</div><div class='del'>-    knowledge.  This document doesn't explain the general</div><div class='del'>-    topic of linux kernel coding and doesn't cover low-level</div><div class='del'>-    driver implementation details. It only describes</div><div class='del'>-    the standard way to write a PCI sound driver on ALSA.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If you are already familiar with the older ALSA ver.0.5.x API, you</div><div class='del'>-    can check the drivers such as &lt;filename&gt;sound/pci/es1938.c&lt;/filename&gt; or</div><div class='del'>-    &lt;filename&gt;sound/pci/maestro3.c&lt;/filename&gt; which have also almost the same</div><div class='del'>-    code-base in the ALSA 0.5.x tree, so you can compare the differences.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This document is still a draft version. Any feedback and</div><div class='del'>-    corrections, please!!</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/preface&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- File Tree Structure  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="file-tree"&gt;</div><div class='del'>-    &lt;title&gt;File Tree Structure&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-general"&gt;</div><div class='del'>-      &lt;title&gt;General&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The ALSA drivers are provided in two ways.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        One is the trees provided as a tarball or via cvs from the</div><div class='del'>-      ALSA's ftp site, and another is the 2.6 (or later) Linux kernel</div><div class='del'>-      tree. To synchronize both, the ALSA driver tree is split into</div><div class='del'>-      two different trees: alsa-kernel and alsa-driver. The former</div><div class='del'>-      contains purely the source code for the Linux 2.6 (or later)</div><div class='del'>-      tree. This tree is designed only for compilation on 2.6 or</div><div class='del'>-      later environment. The latter, alsa-driver, contains many subtle</div><div class='del'>-      files for compiling ALSA drivers outside of the Linux kernel tree,</div><div class='del'>-      wrapper functions for older 2.2 and 2.4 kernels, to adapt the latest kernel API,</div><div class='del'>-      and additional drivers which are still in development or in</div><div class='del'>-      tests.  The drivers in alsa-driver tree will be moved to</div><div class='del'>-      alsa-kernel (and eventually to the 2.6 kernel tree) when they are</div><div class='del'>-      finished and confirmed to work fine.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The file tree structure of ALSA driver is depicted below. Both</div><div class='del'>-        alsa-kernel and alsa-driver have almost the same file</div><div class='del'>-        structure, except for &lt;quote&gt;core&lt;/quote&gt; directory. It's</div><div class='del'>-        named as &lt;quote&gt;acore&lt;/quote&gt; in alsa-driver tree. </div><div class='del'>-</div><div class='del'>-        &lt;example&gt;</div><div class='del'>-          &lt;title&gt;ALSA File Tree Structure&lt;/title&gt;</div><div class='del'>-          &lt;literallayout&gt;</div><div class='del'>-        sound</div><div class='del'>-                /core</div><div class='del'>-                        /oss</div><div class='del'>-                        /seq</div><div class='del'>-                                /oss</div><div class='del'>-                                /instr</div><div class='del'>-                /ioctl32</div><div class='del'>-                /include</div><div class='del'>-                /drivers</div><div class='del'>-                        /mpu401</div><div class='del'>-                        /opl3</div><div class='del'>-                /i2c</div><div class='del'>-                        /l3</div><div class='del'>-                /synth</div><div class='del'>-                        /emux</div><div class='del'>-                /pci</div><div class='del'>-                        /(cards)</div><div class='del'>-                /isa</div><div class='del'>-                        /(cards)</div><div class='del'>-                /arm</div><div class='del'>-                /ppc</div><div class='del'>-                /sparc</div><div class='del'>-                /usb</div><div class='del'>-                /pcmcia /(cards)</div><div class='del'>-                /oss</div><div class='del'>-          &lt;/literallayout&gt;</div><div class='del'>-        &lt;/example&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-core-directory"&gt;</div><div class='del'>-      &lt;title&gt;core directory&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This directory contains the middle layer which is the heart</div><div class='del'>-      of ALSA drivers. In this directory, the native ALSA modules are</div><div class='del'>-      stored. The sub-directories contain different modules and are</div><div class='del'>-      dependent upon the kernel config. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="file-tree-core-directory-oss"&gt;</div><div class='del'>-        &lt;title&gt;core/oss&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          The codes for PCM and mixer OSS emulation modules are stored</div><div class='del'>-        in this directory. The rawmidi OSS emulation is included in</div><div class='del'>-        the ALSA rawmidi code since it's quite small. The sequencer</div><div class='del'>-        code is stored in &lt;filename&gt;core/seq/oss&lt;/filename&gt; directory (see</div><div class='del'>-        &lt;link linkend="file-tree-core-directory-seq-oss"&gt;&lt;citetitle&gt;</div><div class='del'>-        below&lt;/citetitle&gt;&lt;/link&gt;).</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="file-tree-core-directory-ioctl32"&gt;</div><div class='del'>-        &lt;title&gt;core/ioctl32&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This directory contains the 32bit-ioctl wrappers for 64bit</div><div class='del'>-        architectures such like x86-64, ppc64 and sparc64. For 32bit</div><div class='del'>-        and alpha architectures, these are not compiled. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="file-tree-core-directory-seq"&gt;</div><div class='del'>-        &lt;title&gt;core/seq&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This directory and its sub-directories are for the ALSA</div><div class='del'>-        sequencer. This directory contains the sequencer core and</div><div class='del'>-        primary sequencer modules such like snd-seq-midi,</div><div class='del'>-        snd-seq-virmidi, etc. They are compiled only when</div><div class='del'>-        &lt;constant&gt;CONFIG_SND_SEQUENCER&lt;/constant&gt; is set in the kernel</div><div class='del'>-        config. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="file-tree-core-directory-seq-oss"&gt;</div><div class='del'>-        &lt;title&gt;core/seq/oss&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This contains the OSS sequencer emulation codes.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="file-tree-core-directory-deq-instr"&gt;</div><div class='del'>-        &lt;title&gt;core/seq/instr&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This directory contains the modules for the sequencer</div><div class='del'>-        instrument layer. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-include-directory"&gt;</div><div class='del'>-      &lt;title&gt;include directory&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This is the place for the public header files of ALSA drivers,</div><div class='del'>-      which are to be exported to user-space, or included by</div><div class='del'>-      several files at different directories. Basically, the private</div><div class='del'>-      header files should not be placed in this directory, but you may</div><div class='del'>-      still find files there, due to historical reasons :) </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-drivers-directory"&gt;</div><div class='del'>-      &lt;title&gt;drivers directory&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This directory contains code shared among different drivers</div><div class='del'>-      on different architectures.  They are hence supposed not to be</div><div class='del'>-      architecture-specific.</div><div class='del'>-      For example, the dummy pcm driver and the serial MIDI</div><div class='del'>-      driver are found in this directory. In the sub-directories,</div><div class='del'>-      there is code for components which are independent from</div><div class='del'>-      bus and cpu architectures. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="file-tree-drivers-directory-mpu401"&gt;</div><div class='del'>-        &lt;title&gt;drivers/mpu401&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          The MPU401 and MPU401-UART modules are stored here.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="file-tree-drivers-directory-opl3"&gt;</div><div class='del'>-        &lt;title&gt;drivers/opl3 and opl4&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          The OPL3 and OPL4 FM-synth stuff is found here.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-i2c-directory"&gt;</div><div class='del'>-      &lt;title&gt;i2c directory&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This contains the ALSA i2c components.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Although there is a standard i2c layer on Linux, ALSA has its</div><div class='del'>-      own i2c code for some cards, because the soundcard needs only a</div><div class='del'>-      simple operation and the standard i2c API is too complicated for</div><div class='del'>-      such a purpose. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="file-tree-i2c-directory-l3"&gt;</div><div class='del'>-        &lt;title&gt;i2c/l3&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This is a sub-directory for ARM L3 i2c.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-synth-directory"&gt;</div><div class='del'>-        &lt;title&gt;synth directory&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This contains the synth middle-level modules.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          So far, there is only Emu8000/Emu10k1 synth driver under</div><div class='del'>-        the &lt;filename&gt;synth/emux&lt;/filename&gt; sub-directory. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-pci-directory"&gt;</div><div class='del'>-      &lt;title&gt;pci directory&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This directory and its sub-directories hold the top-level card modules</div><div class='del'>-      for PCI soundcards and the code specific to the PCI BUS.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The drivers compiled from a single file are stored directly</div><div class='del'>-      in the pci directory, while the drivers with several source files are</div><div class='del'>-      stored on their own sub-directory (e.g. emu10k1, ice1712). </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-isa-directory"&gt;</div><div class='del'>-      &lt;title&gt;isa directory&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This directory and its sub-directories hold the top-level card modules</div><div class='del'>-      for ISA soundcards. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-arm-ppc-sparc-directories"&gt;</div><div class='del'>-      &lt;title&gt;arm, ppc, and sparc directories&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        They are used for top-level card modules which are</div><div class='del'>-      specific to one of these architectures. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-usb-directory"&gt;</div><div class='del'>-      &lt;title&gt;usb directory&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This directory contains the USB-audio driver. In the latest version, the</div><div class='del'>-      USB MIDI driver is integrated in the usb-audio driver. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-pcmcia-directory"&gt;</div><div class='del'>-      &lt;title&gt;pcmcia directory&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The PCMCIA, especially PCCard drivers will go here. CardBus</div><div class='del'>-      drivers will be in the pci directory, because their API is identical</div><div class='del'>-      to that of standard PCI cards. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="file-tree-oss-directory"&gt;</div><div class='del'>-      &lt;title&gt;oss directory&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The OSS/Lite source files are stored here in Linux 2.6 (or</div><div class='del'>-      later) tree. In the ALSA driver tarball, this directory is empty,</div><div class='del'>-      of course :) </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Basic Flow for PCI Drivers  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="basic-flow"&gt;</div><div class='del'>-    &lt;title&gt;Basic Flow for PCI Drivers&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="basic-flow-outline"&gt;</div><div class='del'>-      &lt;title&gt;Outline&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The minimum flow for PCI soundcards is as follows:</div><div class='del'>-</div><div class='del'>-        &lt;itemizedlist&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt;define the PCI ID table (see the section</div><div class='del'>-          &lt;link linkend="pci-resource-entries"&gt;&lt;citetitle&gt;PCI Entries</div><div class='del'>-          &lt;/citetitle&gt;&lt;/link&gt;).&lt;/para&gt;&lt;/listitem&gt; </div><div class='del'>-          &lt;listitem&gt;&lt;para&gt;create &lt;function&gt;probe()&lt;/function&gt; callback.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt;create &lt;function&gt;remove()&lt;/function&gt; callback.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt;create a &lt;structname&gt;pci_driver&lt;/structname&gt; structure</div><div class='del'>-	  containing the three pointers above.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt;create an &lt;function&gt;init()&lt;/function&gt; function just calling</div><div class='del'>-	  the &lt;function&gt;pci_register_driver()&lt;/function&gt; to register the pci_driver table</div><div class='del'>-	  defined above.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt;create an &lt;function&gt;exit()&lt;/function&gt; function to call</div><div class='del'>-	  the &lt;function&gt;pci_unregister_driver()&lt;/function&gt; function.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="basic-flow-example"&gt;</div><div class='del'>-      &lt;title&gt;Full Code Example&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The code example is shown below. Some parts are kept</div><div class='del'>-      unimplemented at this moment but will be filled in the</div><div class='del'>-      next sections. The numbers in the comment lines of the</div><div class='del'>-      &lt;function&gt;snd_mychip_probe()&lt;/function&gt; function</div><div class='del'>-      refer to details explained in the following section. </div><div class='del'>-</div><div class='del'>-        &lt;example&gt;</div><div class='del'>-          &lt;title&gt;Basic Flow for PCI Drivers - Example&lt;/title&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  #include &lt;linux/init.h&gt;</div><div class='del'>-  #include &lt;linux/pci.h&gt;</div><div class='del'>-  #include &lt;linux/slab.h&gt;</div><div class='del'>-  #include &lt;sound/core.h&gt;</div><div class='del'>-  #include &lt;sound/initval.h&gt;</div><div class='del'>-</div><div class='del'>-  /* module parameters (see "Module Parameters") */</div><div class='del'>-  /* SNDRV_CARDS: maximum number of cards supported by this module */</div><div class='del'>-  static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='del'>-  static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-  static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='del'>-</div><div class='del'>-  /* definition of the chip-specific record */</div><div class='del'>-  struct mychip {</div><div class='del'>-          struct snd_card *card;</div><div class='del'>-          /* the rest of the implementation will be in section</div><div class='del'>-           * "PCI Resource Management"</div><div class='del'>-           */</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  /* chip-specific destructor</div><div class='del'>-   * (see "PCI Resource Management")</div><div class='del'>-   */</div><div class='del'>-  static int snd_mychip_free(struct mychip *chip)</div><div class='del'>-  {</div><div class='del'>-          .... /* will be implemented later... */</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* component-destructor</div><div class='del'>-   * (see "Management of Cards and Components")</div><div class='del'>-   */</div><div class='del'>-  static int snd_mychip_dev_free(struct snd_device *device)</div><div class='del'>-  {</div><div class='del'>-          return snd_mychip_free(device-&gt;device_data);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* chip-specific constructor</div><div class='del'>-   * (see "Management of Cards and Components")</div><div class='del'>-   */</div><div class='del'>-  static int snd_mychip_create(struct snd_card *card,</div><div class='del'>-                               struct pci_dev *pci,</div><div class='del'>-                               struct mychip **rchip)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip;</div><div class='del'>-          int err;</div><div class='del'>-          static struct snd_device_ops ops = {</div><div class='del'>-                 .dev_free = snd_mychip_dev_free,</div><div class='del'>-          };</div><div class='del'>-</div><div class='del'>-          *rchip = NULL;</div><div class='del'>-</div><div class='del'>-          /* check PCI availability here</div><div class='del'>-           * (see "PCI Resource Management")</div><div class='del'>-           */</div><div class='del'>-          ....</div><div class='del'>-</div><div class='del'>-          /* allocate a chip-specific data with zero filled */</div><div class='del'>-          chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-          if (chip == NULL)</div><div class='del'>-                  return -ENOMEM;</div><div class='del'>-</div><div class='del'>-          chip-&gt;card = card;</div><div class='del'>-</div><div class='del'>-          /* rest of initialization here; will be implemented</div><div class='del'>-           * later, see "PCI Resource Management"</div><div class='del'>-           */</div><div class='del'>-          ....</div><div class='del'>-</div><div class='del'>-          err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-          if (err &lt; 0) {</div><div class='del'>-                  snd_mychip_free(chip);</div><div class='del'>-                  return err;</div><div class='del'>-          }</div><div class='del'>-</div><div class='del'>-          *rchip = chip;</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* constructor -- see "Constructor" sub-section */</div><div class='del'>-  static int snd_mychip_probe(struct pci_dev *pci,</div><div class='del'>-                              const struct pci_device_id *pci_id)</div><div class='del'>-  {</div><div class='del'>-          static int dev;</div><div class='del'>-          struct snd_card *card;</div><div class='del'>-          struct mychip *chip;</div><div class='del'>-          int err;</div><div class='del'>-</div><div class='del'>-          /* (1) */</div><div class='del'>-          if (dev &gt;= SNDRV_CARDS)</div><div class='del'>-                  return -ENODEV;</div><div class='del'>-          if (!enable[dev]) {</div><div class='del'>-                  dev++;</div><div class='del'>-                  return -ENOENT;</div><div class='del'>-          }</div><div class='del'>-</div><div class='del'>-          /* (2) */</div><div class='del'>-          err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='del'>-                             0, &amp;card);</div><div class='del'>-          if (err &lt; 0)</div><div class='del'>-                  return err;</div><div class='del'>-</div><div class='del'>-          /* (3) */</div><div class='del'>-          err = snd_mychip_create(card, pci, &amp;chip);</div><div class='del'>-          if (err &lt; 0) {</div><div class='del'>-                  snd_card_free(card);</div><div class='del'>-                  return err;</div><div class='del'>-          }</div><div class='del'>-</div><div class='del'>-          /* (4) */</div><div class='del'>-          strcpy(card-&gt;driver, "My Chip");</div><div class='del'>-          strcpy(card-&gt;shortname, "My Own Chip 123");</div><div class='del'>-          sprintf(card-&gt;longname, "%s at 0x%lx irq %i",</div><div class='del'>-                  card-&gt;shortname, chip-&gt;ioport, chip-&gt;irq);</div><div class='del'>-</div><div class='del'>-          /* (5) */</div><div class='del'>-          .... /* implemented later */</div><div class='del'>-</div><div class='del'>-          /* (6) */</div><div class='del'>-          err = snd_card_register(card);</div><div class='del'>-          if (err &lt; 0) {</div><div class='del'>-                  snd_card_free(card);</div><div class='del'>-                  return err;</div><div class='del'>-          }</div><div class='del'>-</div><div class='del'>-          /* (7) */</div><div class='del'>-          pci_set_drvdata(pci, card);</div><div class='del'>-          dev++;</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* destructor -- see the "Destructor" sub-section */</div><div class='del'>-  static void snd_mychip_remove(struct pci_dev *pci)</div><div class='del'>-  {</div><div class='del'>-          snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-          pci_set_drvdata(pci, NULL);</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/example&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="basic-flow-constructor"&gt;</div><div class='del'>-      &lt;title&gt;Constructor&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The real constructor of PCI drivers is the &lt;function&gt;probe&lt;/function&gt; callback.</div><div class='del'>-      The &lt;function&gt;probe&lt;/function&gt; callback and other component-constructors which are called</div><div class='del'>-      from the &lt;function&gt;probe&lt;/function&gt; callback cannot be used with</div><div class='del'>-      the &lt;parameter&gt;__init&lt;/parameter&gt; prefix</div><div class='del'>-      because any PCI device could be a hotplug device. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In the &lt;function&gt;probe&lt;/function&gt; callback, the following scheme is often used.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="basic-flow-constructor-device-index"&gt;</div><div class='del'>-        &lt;title&gt;1) Check and increment the device index.&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int dev;</div><div class='del'>-  ....</div><div class='del'>-  if (dev &gt;= SNDRV_CARDS)</div><div class='del'>-          return -ENODEV;</div><div class='del'>-  if (!enable[dev]) {</div><div class='del'>-          dev++;</div><div class='del'>-          return -ENOENT;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        where enable[dev] is the module option.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Each time the &lt;function&gt;probe&lt;/function&gt; callback is called, check the</div><div class='del'>-        availability of the device. If not available, simply increment</div><div class='del'>-        the device index and returns. dev will be incremented also</div><div class='del'>-        later (&lt;link</div><div class='del'>-        linkend="basic-flow-constructor-set-pci"&gt;&lt;citetitle&gt;step</div><div class='del'>-        7&lt;/citetitle&gt;&lt;/link&gt;). </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="basic-flow-constructor-create-card"&gt;</div><div class='del'>-        &lt;title&gt;2) Create a card instance&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_card *card;</div><div class='del'>-  int err;</div><div class='del'>-  ....</div><div class='del'>-  err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='del'>-                     0, &amp;card);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          The details will be explained in the section</div><div class='del'>-          &lt;link linkend="card-management-card-instance"&gt;&lt;citetitle&gt;</div><div class='del'>-          Management of Cards and Components&lt;/citetitle&gt;&lt;/link&gt;.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="basic-flow-constructor-create-main"&gt;</div><div class='del'>-        &lt;title&gt;3) Create a main component&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          In this part, the PCI resources are allocated.</div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct mychip *chip;</div><div class='del'>-  ....</div><div class='del'>-  err = snd_mychip_create(card, pci, &amp;chip);</div><div class='del'>-  if (err &lt; 0) {</div><div class='del'>-          snd_card_free(card);</div><div class='del'>-          return err;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          The details will be explained in the section &lt;link</div><div class='del'>-        linkend="pci-resource"&gt;&lt;citetitle&gt;PCI Resource</div><div class='del'>-        Management&lt;/citetitle&gt;&lt;/link&gt;.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="basic-flow-constructor-main-component"&gt;</div><div class='del'>-        &lt;title&gt;4) Set the driver ID and name strings.&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  strcpy(card-&gt;driver, "My Chip");</div><div class='del'>-  strcpy(card-&gt;shortname, "My Own Chip 123");</div><div class='del'>-  sprintf(card-&gt;longname, "%s at 0x%lx irq %i",</div><div class='del'>-          card-&gt;shortname, chip-&gt;ioport, chip-&gt;irq);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          The driver field holds the minimal ID string of the</div><div class='del'>-        chip. This is used by alsa-lib's configurator, so keep it</div><div class='del'>-        simple but unique. </div><div class='del'>-          Even the same driver can have different driver IDs to</div><div class='del'>-        distinguish the functionality of each chip type. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          The shortname field is a string shown as more verbose</div><div class='del'>-        name. The longname field contains the information</div><div class='del'>-        shown in &lt;filename&gt;/proc/asound/cards&lt;/filename&gt;. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="basic-flow-constructor-create-other"&gt;</div><div class='del'>-        &lt;title&gt;5) Create other components, such as mixer, MIDI, etc.&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Here you define the basic components such as</div><div class='del'>-          &lt;link linkend="pcm-interface"&gt;&lt;citetitle&gt;PCM&lt;/citetitle&gt;&lt;/link&gt;,</div><div class='del'>-          mixer (e.g. &lt;link linkend="api-ac97"&gt;&lt;citetitle&gt;AC97&lt;/citetitle&gt;&lt;/link&gt;),</div><div class='del'>-          MIDI (e.g. &lt;link linkend="midi-interface"&gt;&lt;citetitle&gt;MPU-401&lt;/citetitle&gt;&lt;/link&gt;),</div><div class='del'>-          and other interfaces.</div><div class='del'>-          Also, if you want a &lt;link linkend="proc-interface"&gt;&lt;citetitle&gt;proc</div><div class='del'>-        file&lt;/citetitle&gt;&lt;/link&gt;, define it here, too.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="basic-flow-constructor-register-card"&gt;</div><div class='del'>-        &lt;title&gt;6) Register the card instance.&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  err = snd_card_register(card);</div><div class='del'>-  if (err &lt; 0) {</div><div class='del'>-          snd_card_free(card);</div><div class='del'>-          return err;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Will be explained in the section &lt;link</div><div class='del'>-        linkend="card-management-registration"&gt;&lt;citetitle&gt;Management</div><div class='del'>-        of Cards and Components&lt;/citetitle&gt;&lt;/link&gt;, too. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="basic-flow-constructor-set-pci"&gt;</div><div class='del'>-        &lt;title&gt;7) Set the PCI driver data and return zero.&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-        pci_set_drvdata(pci, card);</div><div class='del'>-        dev++;</div><div class='del'>-        return 0;</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          In the above, the card record is stored. This pointer is</div><div class='del'>-        used in the remove callback and power-management</div><div class='del'>-        callbacks, too. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="basic-flow-destructor"&gt;</div><div class='del'>-      &lt;title&gt;Destructor&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The destructor, remove callback, simply releases the card</div><div class='del'>-      instance. Then the ALSA middle layer will release all the</div><div class='del'>-      attached components automatically. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        It would be typically like the following:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static void snd_mychip_remove(struct pci_dev *pci)</div><div class='del'>-  {</div><div class='del'>-          snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-          pci_set_drvdata(pci, NULL);</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        The above code assumes that the card pointer is set to the PCI</div><div class='del'>-	driver data.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="basic-flow-header-files"&gt;</div><div class='del'>-      &lt;title&gt;Header Files&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        For the above example, at least the following include files</div><div class='del'>-      are necessary. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  #include &lt;linux/init.h&gt;</div><div class='del'>-  #include &lt;linux/pci.h&gt;</div><div class='del'>-  #include &lt;linux/slab.h&gt;</div><div class='del'>-  #include &lt;sound/core.h&gt;</div><div class='del'>-  #include &lt;sound/initval.h&gt;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-	where the last one is necessary only when module options are</div><div class='del'>-      defined in the source file.  If the code is split into several</div><div class='del'>-      files, the files without module options don't need them.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In addition to these headers, you'll need</div><div class='del'>-      &lt;filename&gt;&amp;lt;linux/interrupt.h&amp;gt;&lt;/filename&gt; for interrupt</div><div class='del'>-      handling, and &lt;filename&gt;&amp;lt;asm/io.h&amp;gt;&lt;/filename&gt; for I/O</div><div class='del'>-      access. If you use the &lt;function&gt;mdelay()&lt;/function&gt; or</div><div class='del'>-      &lt;function&gt;udelay()&lt;/function&gt; functions, you'll need to include</div><div class='del'>-      &lt;filename&gt;&amp;lt;linux/delay.h&amp;gt;&lt;/filename&gt; too. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The ALSA interfaces like the PCM and control APIs are defined in other</div><div class='del'>-      &lt;filename&gt;&amp;lt;sound/xxx.h&amp;gt;&lt;/filename&gt; header files.</div><div class='del'>-      They have to be included after</div><div class='del'>-      &lt;filename&gt;&amp;lt;sound/core.h&amp;gt;&lt;/filename&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Management of Cards and Components  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="card-management"&gt;</div><div class='del'>-    &lt;title&gt;Management of Cards and Components&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="card-management-card-instance"&gt;</div><div class='del'>-      &lt;title&gt;Card Instance&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      For each soundcard, a &lt;quote&gt;card&lt;/quote&gt; record must be allocated.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      A card record is the headquarters of the soundcard.  It manages</div><div class='del'>-      the whole list of devices (components) on the soundcard, such as</div><div class='del'>-      PCM, mixers, MIDI, synthesizer, and so on.  Also, the card</div><div class='del'>-      record holds the ID and the name strings of the card, manages</div><div class='del'>-      the root of proc files, and controls the power-management states</div><div class='del'>-      and hotplug disconnections.  The component list on the card</div><div class='del'>-      record is used to manage the correct release of resources at</div><div class='del'>-      destruction. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        As mentioned above, to create a card instance, call</div><div class='del'>-      &lt;function&gt;snd_card_new()&lt;/function&gt;.</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_card *card;</div><div class='del'>-  int err;</div><div class='del'>-  err = snd_card_new(&amp;pci-&gt;dev, index, id, module, extra_size, &amp;card);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The function takes six arguments: the parent device pointer,</div><div class='del'>-        the card-index number, the id string, the module pointer (usually</div><div class='del'>-        &lt;constant&gt;THIS_MODULE&lt;/constant&gt;),</div><div class='del'>-        the size of extra-data space, and the pointer to return the</div><div class='del'>-        card instance.  The extra_size argument is used to</div><div class='del'>-        allocate card-&amp;gt;private_data for the</div><div class='del'>-        chip-specific data.  Note that these data</div><div class='del'>-        are allocated by &lt;function&gt;snd_card_new()&lt;/function&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The first argument, the pointer of struct</div><div class='del'>-	&lt;structname&gt;device&lt;/structname&gt;, specifies the parent device.</div><div class='del'>-	For PCI devices, typically &amp;amp;pci-&amp;gt; is passed there.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="card-management-component"&gt;</div><div class='del'>-      &lt;title&gt;Components&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        After the card is created, you can attach the components</div><div class='del'>-      (devices) to the card instance. In an ALSA driver, a component is</div><div class='del'>-      represented as a struct &lt;structname&gt;snd_device&lt;/structname&gt; object.</div><div class='del'>-      A component can be a PCM instance, a control interface, a raw</div><div class='del'>-      MIDI interface, etc.  Each such instance has one component</div><div class='del'>-      entry.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        A component can be created via</div><div class='del'>-        &lt;function&gt;snd_device_new()&lt;/function&gt; function. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_device_new(card, SNDRV_DEV_XXX, chip, &amp;ops);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This takes the card pointer, the device-level</div><div class='del'>-      (&lt;constant&gt;SNDRV_DEV_XXX&lt;/constant&gt;), the data pointer, and the</div><div class='del'>-      callback pointers (&lt;parameter&gt;&amp;amp;ops&lt;/parameter&gt;). The</div><div class='del'>-      device-level defines the type of components and the order of</div><div class='del'>-      registration and de-registration.  For most components, the</div><div class='del'>-      device-level is already defined.  For a user-defined component,</div><div class='del'>-      you can use &lt;constant&gt;SNDRV_DEV_LOWLEVEL&lt;/constant&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      This function itself doesn't allocate the data space. The data</div><div class='del'>-      must be allocated manually beforehand, and its pointer is passed</div><div class='del'>-      as the argument. This pointer (&lt;parameter&gt;chip&lt;/parameter&gt; in the</div><div class='del'>-      above example) is used as the identifier for the instance.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Each pre-defined ALSA component such as ac97 and pcm calls</div><div class='del'>-      &lt;function&gt;snd_device_new()&lt;/function&gt; inside its</div><div class='del'>-      constructor. The destructor for each component is defined in the</div><div class='del'>-      callback pointers.  Hence, you don't need to take care of</div><div class='del'>-      calling a destructor for such a component.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        If you wish to create your own component, you need to</div><div class='del'>-      set the destructor function to the dev_free callback in</div><div class='del'>-      the &lt;parameter&gt;ops&lt;/parameter&gt;, so that it can be released</div><div class='del'>-      automatically via &lt;function&gt;snd_card_free()&lt;/function&gt;.</div><div class='del'>-      The next example will show an implementation of chip-specific</div><div class='del'>-      data.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="card-management-chip-specific"&gt;</div><div class='del'>-      &lt;title&gt;Chip-Specific Data&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      Chip-specific information, e.g. the I/O port address, its</div><div class='del'>-      resource pointer, or the irq number, is stored in the</div><div class='del'>-      chip-specific record.</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct mychip {</div><div class='del'>-          ....</div><div class='del'>-  };</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In general, there are two ways of allocating the chip record.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="card-management-chip-specific-snd-card-new"&gt;</div><div class='del'>-        &lt;title&gt;1. Allocating via &lt;function&gt;snd_card_new()&lt;/function&gt;.&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          As mentioned above, you can pass the extra-data-length</div><div class='del'>-	  to the 5th argument of &lt;function&gt;snd_card_new()&lt;/function&gt;, i.e.</div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='del'>-                     sizeof(struct mychip), &amp;card);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          struct &lt;structname&gt;mychip&lt;/structname&gt; is the type of the chip record.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          In return, the allocated record can be accessed as</div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct mychip *chip = card-&gt;private_data;</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          With this method, you don't have to allocate twice.</div><div class='del'>-          The record is released together with the card instance.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="card-management-chip-specific-allocate-extra"&gt;</div><div class='del'>-        &lt;title&gt;2. Allocating an extra device.&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          After allocating a card instance via</div><div class='del'>-          &lt;function&gt;snd_card_new()&lt;/function&gt; (with</div><div class='del'>-          &lt;constant&gt;0&lt;/constant&gt; on the 4th arg), call</div><div class='del'>-          &lt;function&gt;kzalloc()&lt;/function&gt;. </div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_card *card;</div><div class='del'>-  struct mychip *chip;</div><div class='del'>-  err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='del'>-                     0, &amp;card);</div><div class='del'>-  .....</div><div class='del'>-  chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          The chip record should have the field to hold the card</div><div class='del'>-          pointer at least, </div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct mychip {</div><div class='del'>-          struct snd_card *card;</div><div class='del'>-          ....</div><div class='del'>-  };</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Then, set the card pointer in the returned chip instance.</div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  chip-&gt;card = card;</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Next, initialize the fields, and register this chip</div><div class='del'>-          record as a low-level device with a specified</div><div class='del'>-          &lt;parameter&gt;ops&lt;/parameter&gt;, </div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static struct snd_device_ops ops = {</div><div class='del'>-          .dev_free =        snd_mychip_dev_free,</div><div class='del'>-  };</div><div class='del'>-  ....</div><div class='del'>-  snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          &lt;function&gt;snd_mychip_dev_free()&lt;/function&gt; is the</div><div class='del'>-        device-destructor function, which will call the real</div><div class='del'>-        destructor. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_mychip_dev_free(struct snd_device *device)</div><div class='del'>-  {</div><div class='del'>-          return snd_mychip_free(device-&gt;device_data);</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          where &lt;function&gt;snd_mychip_free()&lt;/function&gt; is the real destructor.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="card-management-registration"&gt;</div><div class='del'>-      &lt;title&gt;Registration and Release&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        After all components are assigned, register the card instance</div><div class='del'>-      by calling &lt;function&gt;snd_card_register()&lt;/function&gt;. Access</div><div class='del'>-      to the device files is enabled at this point. That is, before</div><div class='del'>-      &lt;function&gt;snd_card_register()&lt;/function&gt; is called, the</div><div class='del'>-      components are safely inaccessible from external side. If this</div><div class='del'>-      call fails, exit the probe function after releasing the card via</div><div class='del'>-      &lt;function&gt;snd_card_free()&lt;/function&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        For releasing the card instance, you can call simply</div><div class='del'>-      &lt;function&gt;snd_card_free()&lt;/function&gt;. As mentioned earlier, all</div><div class='del'>-      components are released automatically by this call. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      For a device which allows hotplugging, you can use</div><div class='del'>-      &lt;function&gt;snd_card_free_when_closed&lt;/function&gt;.  This one will</div><div class='del'>-      postpone the destruction until all devices are closed.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- PCI Resource Management  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="pci-resource"&gt;</div><div class='del'>-    &lt;title&gt;PCI Resource Management&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pci-resource-example"&gt;</div><div class='del'>-      &lt;title&gt;Full Code Example&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In this section, we'll complete the chip-specific constructor,</div><div class='del'>-      destructor and PCI entries. Example code is shown first,</div><div class='del'>-      below. </div><div class='del'>-</div><div class='del'>-        &lt;example&gt;</div><div class='del'>-          &lt;title&gt;PCI Resource Management Example&lt;/title&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct mychip {</div><div class='del'>-          struct snd_card *card;</div><div class='del'>-          struct pci_dev *pci;</div><div class='del'>-</div><div class='del'>-          unsigned long port;</div><div class='del'>-          int irq;</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  static int snd_mychip_free(struct mychip *chip)</div><div class='del'>-  {</div><div class='del'>-          /* disable hardware here if any */</div><div class='del'>-          .... /* (not implemented in this document) */</div><div class='del'>-</div><div class='del'>-          /* release the irq */</div><div class='del'>-          if (chip-&gt;irq &gt;= 0)</div><div class='del'>-                  free_irq(chip-&gt;irq, chip);</div><div class='del'>-          /* release the I/O ports &amp; memory */</div><div class='del'>-          pci_release_regions(chip-&gt;pci);</div><div class='del'>-          /* disable the PCI entry */</div><div class='del'>-          pci_disable_device(chip-&gt;pci);</div><div class='del'>-          /* release the data */</div><div class='del'>-          kfree(chip);</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* chip-specific constructor */</div><div class='del'>-  static int snd_mychip_create(struct snd_card *card,</div><div class='del'>-                               struct pci_dev *pci,</div><div class='del'>-                               struct mychip **rchip)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip;</div><div class='del'>-          int err;</div><div class='del'>-          static struct snd_device_ops ops = {</div><div class='del'>-                 .dev_free = snd_mychip_dev_free,</div><div class='del'>-          };</div><div class='del'>-</div><div class='del'>-          *rchip = NULL;</div><div class='del'>-</div><div class='del'>-          /* initialize the PCI entry */</div><div class='del'>-          err = pci_enable_device(pci);</div><div class='del'>-          if (err &lt; 0)</div><div class='del'>-                  return err;</div><div class='del'>-          /* check PCI availability (28bit DMA) */</div><div class='del'>-          if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0 ||</div><div class='del'>-              pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0) {</div><div class='del'>-                  printk(KERN_ERR "error to set 28bit mask DMA\n");</div><div class='del'>-                  pci_disable_device(pci);</div><div class='del'>-                  return -ENXIO;</div><div class='del'>-          }</div><div class='del'>-</div><div class='del'>-          chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-          if (chip == NULL) {</div><div class='del'>-                  pci_disable_device(pci);</div><div class='del'>-                  return -ENOMEM;</div><div class='del'>-          }</div><div class='del'>-</div><div class='del'>-          /* initialize the stuff */</div><div class='del'>-          chip-&gt;card = card;</div><div class='del'>-          chip-&gt;pci = pci;</div><div class='del'>-          chip-&gt;irq = -1;</div><div class='del'>-</div><div class='del'>-          /* (1) PCI resource allocation */</div><div class='del'>-          err = pci_request_regions(pci, "My Chip");</div><div class='del'>-          if (err &lt; 0) {</div><div class='del'>-                  kfree(chip);</div><div class='del'>-                  pci_disable_device(pci);</div><div class='del'>-                  return err;</div><div class='del'>-          }</div><div class='del'>-          chip-&gt;port = pci_resource_start(pci, 0);</div><div class='del'>-          if (request_irq(pci-&gt;irq, snd_mychip_interrupt,</div><div class='del'>-                          IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='del'>-                  printk(KERN_ERR "cannot grab irq %d\n", pci-&gt;irq);</div><div class='del'>-                  snd_mychip_free(chip);</div><div class='del'>-                  return -EBUSY;</div><div class='del'>-          }</div><div class='del'>-          chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-</div><div class='del'>-          /* (2) initialization of the chip hardware */</div><div class='del'>-          .... /*   (not implemented in this document) */</div><div class='del'>-</div><div class='del'>-          err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-          if (err &lt; 0) {</div><div class='del'>-                  snd_mychip_free(chip);</div><div class='del'>-                  return err;</div><div class='del'>-          }</div><div class='del'>-</div><div class='del'>-          *rchip = chip;</div><div class='del'>-          return 0;</div><div class='del'>-  }        </div><div class='del'>-</div><div class='del'>-  /* PCI IDs */</div><div class='del'>-  static struct pci_device_id snd_mychip_ids[] = {</div><div class='del'>-          { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,</div><div class='del'>-            PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='del'>-          ....</div><div class='del'>-          { 0, }</div><div class='del'>-  };</div><div class='del'>-  MODULE_DEVICE_TABLE(pci, snd_mychip_ids);</div><div class='del'>-</div><div class='del'>-  /* pci_driver definition */</div><div class='del'>-  static struct pci_driver driver = {</div><div class='del'>-          .name = KBUILD_MODNAME,</div><div class='del'>-          .id_table = snd_mychip_ids,</div><div class='del'>-          .probe = snd_mychip_probe,</div><div class='del'>-          .remove = snd_mychip_remove,</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  /* module initialization */</div><div class='del'>-  static int __init alsa_card_mychip_init(void)</div><div class='del'>-  {</div><div class='del'>-          return pci_register_driver(&amp;driver);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* module clean up */</div><div class='del'>-  static void __exit alsa_card_mychip_exit(void)</div><div class='del'>-  {</div><div class='del'>-          pci_unregister_driver(&amp;driver);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  module_init(alsa_card_mychip_init)</div><div class='del'>-  module_exit(alsa_card_mychip_exit)</div><div class='del'>-</div><div class='del'>-  EXPORT_NO_SYMBOLS; /* for old kernels only */</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/example&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pci-resource-some-haftas"&gt;</div><div class='del'>-      &lt;title&gt;Some Hafta's&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The allocation of PCI resources is done in the</div><div class='del'>-      &lt;function&gt;probe()&lt;/function&gt; function, and usually an extra</div><div class='del'>-      &lt;function&gt;xxx_create()&lt;/function&gt; function is written for this</div><div class='del'>-      purpose.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In the case of PCI devices, you first have to call</div><div class='del'>-      the &lt;function&gt;pci_enable_device()&lt;/function&gt; function before</div><div class='del'>-      allocating resources. Also, you need to set the proper PCI DMA</div><div class='del'>-      mask to limit the accessed I/O range. In some cases, you might</div><div class='del'>-      need to call &lt;function&gt;pci_set_master()&lt;/function&gt; function,</div><div class='del'>-      too.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Suppose the 28bit mask, and the code to be added would be like:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  err = pci_enable_device(pci);</div><div class='del'>-  if (err &lt; 0)</div><div class='del'>-          return err;</div><div class='del'>-  if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0 ||</div><div class='del'>-      pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0) {</div><div class='del'>-          printk(KERN_ERR "error to set 28bit mask DMA\n");</div><div class='del'>-          pci_disable_device(pci);</div><div class='del'>-          return -ENXIO;</div><div class='del'>-  }</div><div class='del'>-  </div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pci-resource-resource-allocation"&gt;</div><div class='del'>-      &lt;title&gt;Resource Allocation&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The allocation of I/O ports and irqs is done via standard kernel</div><div class='del'>-      functions. Unlike ALSA ver.0.5.x., there are no helpers for</div><div class='del'>-      that. And these resources must be released in the destructor</div><div class='del'>-      function (see below). Also, on ALSA 0.9.x, you don't need to</div><div class='del'>-      allocate (pseudo-)DMA for PCI like in ALSA 0.5.x.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Now assume that the PCI device has an I/O port with 8 bytes</div><div class='del'>-        and an interrupt. Then struct &lt;structname&gt;mychip&lt;/structname&gt; will have the</div><div class='del'>-        following fields:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct mychip {</div><div class='del'>-          struct snd_card *card;</div><div class='del'>-</div><div class='del'>-          unsigned long port;</div><div class='del'>-          int irq;</div><div class='del'>-  };</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        For an I/O port (and also a memory region), you need to have</div><div class='del'>-      the resource pointer for the standard resource management. For</div><div class='del'>-      an irq, you have to keep only the irq number (integer). But you</div><div class='del'>-      need to initialize this number as -1 before actual allocation,</div><div class='del'>-      since irq 0 is valid. The port address and its resource pointer</div><div class='del'>-      can be initialized as null by</div><div class='del'>-      &lt;function&gt;kzalloc()&lt;/function&gt; automatically, so you</div><div class='del'>-      don't have to take care of resetting them. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The allocation of an I/O port is done like this:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  err = pci_request_regions(pci, "My Chip");</div><div class='del'>-  if (err &lt; 0) { </div><div class='del'>-          kfree(chip);</div><div class='del'>-          pci_disable_device(pci);</div><div class='del'>-          return err;</div><div class='del'>-  }</div><div class='del'>-  chip-&gt;port = pci_resource_start(pci, 0);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;!-- obsolete --&gt;</div><div class='del'>-        It will reserve the I/O port region of 8 bytes of the given</div><div class='del'>-      PCI device. The returned value, chip-&amp;gt;res_port, is allocated</div><div class='del'>-      via &lt;function&gt;kmalloc()&lt;/function&gt; by</div><div class='del'>-      &lt;function&gt;request_region()&lt;/function&gt;. The pointer must be</div><div class='del'>-      released via &lt;function&gt;kfree()&lt;/function&gt;, but there is a</div><div class='del'>-      problem with this. This issue will be explained later.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The allocation of an interrupt source is done like this:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  if (request_irq(pci-&gt;irq, snd_mychip_interrupt,</div><div class='del'>-                  IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='del'>-          printk(KERN_ERR "cannot grab irq %d\n", pci-&gt;irq);</div><div class='del'>-          snd_mychip_free(chip);</div><div class='del'>-          return -EBUSY;</div><div class='del'>-  }</div><div class='del'>-  chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        where &lt;function&gt;snd_mychip_interrupt()&lt;/function&gt; is the</div><div class='del'>-      interrupt handler defined &lt;link</div><div class='del'>-      linkend="pcm-interface-interrupt-handler"&gt;&lt;citetitle&gt;later&lt;/citetitle&gt;&lt;/link&gt;.</div><div class='del'>-      Note that chip-&amp;gt;irq should be defined</div><div class='del'>-      only when &lt;function&gt;request_irq()&lt;/function&gt; succeeded.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      On the PCI bus, interrupts can be shared. Thus,</div><div class='del'>-      &lt;constant&gt;IRQF_SHARED&lt;/constant&gt; is used as the interrupt flag of</div><div class='del'>-      &lt;function&gt;request_irq()&lt;/function&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The last argument of &lt;function&gt;request_irq()&lt;/function&gt; is the</div><div class='del'>-      data pointer passed to the interrupt handler. Usually, the</div><div class='del'>-      chip-specific record is used for that, but you can use what you</div><div class='del'>-      like, too. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        I won't give details about the interrupt handler at this</div><div class='del'>-        point, but at least its appearance can be explained now. The</div><div class='del'>-        interrupt handler looks usually like the following: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = dev_id;</div><div class='del'>-          ....</div><div class='del'>-          return IRQ_HANDLED;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Now let's write the corresponding destructor for the resources</div><div class='del'>-      above. The role of destructor is simple: disable the hardware</div><div class='del'>-      (if already activated) and release the resources. So far, we</div><div class='del'>-      have no hardware part, so the disabling code is not written here. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        To release the resources, the &lt;quote&gt;check-and-release&lt;/quote&gt;</div><div class='del'>-        method is a safer way. For the interrupt, do like this: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  if (chip-&gt;irq &gt;= 0)</div><div class='del'>-          free_irq(chip-&gt;irq, chip);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        Since the irq number can start from 0, you should initialize</div><div class='del'>-        chip-&amp;gt;irq with a negative value (e.g. -1), so that you can</div><div class='del'>-        check the validity of the irq number as above.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        When you requested I/O ports or memory regions via</div><div class='del'>-	&lt;function&gt;pci_request_region()&lt;/function&gt; or</div><div class='del'>-	&lt;function&gt;pci_request_regions()&lt;/function&gt; like in this example,</div><div class='del'>-	release the resource(s) using the corresponding function,</div><div class='del'>-	&lt;function&gt;pci_release_region()&lt;/function&gt; or</div><div class='del'>-	&lt;function&gt;pci_release_regions()&lt;/function&gt;.</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  pci_release_regions(chip-&gt;pci);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	When you requested manually via &lt;function&gt;request_region()&lt;/function&gt;</div><div class='del'>-	or &lt;function&gt;request_mem_region&lt;/function&gt;, you can release it via</div><div class='del'>-	&lt;function&gt;release_resource()&lt;/function&gt;.  Suppose that you keep</div><div class='del'>-	the resource pointer returned from &lt;function&gt;request_region()&lt;/function&gt;</div><div class='del'>-	in chip-&amp;gt;res_port, the release procedure looks like:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  release_and_free_resource(chip-&gt;res_port);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      Don't forget to call &lt;function&gt;pci_disable_device()&lt;/function&gt;</div><div class='del'>-      before the end.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        And finally, release the chip-specific record.</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  kfree(chip);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      We didn't implement the hardware disabling part in the above.</div><div class='del'>-      If you need to do this, please note that the destructor may be</div><div class='del'>-      called even before the initialization of the chip is completed.</div><div class='del'>-      It would be better to have a flag to skip hardware disabling</div><div class='del'>-      if the hardware was not initialized yet.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      When the chip-data is assigned to the card using</div><div class='del'>-      &lt;function&gt;snd_device_new()&lt;/function&gt; with</div><div class='del'>-      &lt;constant&gt;SNDRV_DEV_LOWLELVEL&lt;/constant&gt; , its destructor is </div><div class='del'>-      called at the last.  That is, it is assured that all other</div><div class='del'>-      components like PCMs and controls have already been released.</div><div class='del'>-      You don't have to stop PCMs, etc. explicitly, but just</div><div class='del'>-      call low-level hardware stopping.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The management of a memory-mapped region is almost as same as</div><div class='del'>-        the management of an I/O port. You'll need three fields like</div><div class='del'>-        the following: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct mychip {</div><div class='del'>-          ....</div><div class='del'>-          unsigned long iobase_phys;</div><div class='del'>-          void __iomem *iobase_virt;</div><div class='del'>-  };</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        and the allocation would be like below:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  if ((err = pci_request_regions(pci, "My Chip")) &lt; 0) {</div><div class='del'>-          kfree(chip);</div><div class='del'>-          return err;</div><div class='del'>-  }</div><div class='del'>-  chip-&gt;iobase_phys = pci_resource_start(pci, 0);</div><div class='del'>-  chip-&gt;iobase_virt = ioremap_nocache(chip-&gt;iobase_phys,</div><div class='del'>-                                      pci_resource_len(pci, 0));</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-        </div><div class='del'>-        and the corresponding destructor would be:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_mychip_free(struct mychip *chip)</div><div class='del'>-  {</div><div class='del'>-          ....</div><div class='del'>-          if (chip-&gt;iobase_virt)</div><div class='del'>-                  iounmap(chip-&gt;iobase_virt);</div><div class='del'>-          ....</div><div class='del'>-          pci_release_regions(chip-&gt;pci);</div><div class='del'>-          ....</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pci-resource-entries"&gt;</div><div class='del'>-      &lt;title&gt;PCI Entries&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        So far, so good. Let's finish the missing PCI</div><div class='del'>-      stuff. At first, we need a</div><div class='del'>-      &lt;structname&gt;pci_device_id&lt;/structname&gt; table for this</div><div class='del'>-      chipset. It's a table of PCI vendor/device ID number, and some</div><div class='del'>-      masks. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        For example,</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static struct pci_device_id snd_mychip_ids[] = {</div><div class='del'>-          { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,</div><div class='del'>-            PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='del'>-          ....</div><div class='del'>-          { 0, }</div><div class='del'>-  };</div><div class='del'>-  MODULE_DEVICE_TABLE(pci, snd_mychip_ids);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The first and second fields of</div><div class='del'>-      the &lt;structname&gt;pci_device_id&lt;/structname&gt; structure are the vendor and</div><div class='del'>-      device IDs. If you have no reason to filter the matching</div><div class='del'>-      devices, you can leave the remaining fields as above. The last</div><div class='del'>-      field of the &lt;structname&gt;pci_device_id&lt;/structname&gt; struct contains</div><div class='del'>-      private data for this entry. You can specify any value here, for</div><div class='del'>-      example, to define specific operations for supported device IDs.</div><div class='del'>-      Such an example is found in the intel8x0 driver. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The last entry of this list is the terminator. You must</div><div class='del'>-      specify this all-zero entry. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Then, prepare the &lt;structname&gt;pci_driver&lt;/structname&gt; record:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static struct pci_driver driver = {</div><div class='del'>-          .name = KBUILD_MODNAME,</div><div class='del'>-          .id_table = snd_mychip_ids,</div><div class='del'>-          .probe = snd_mychip_probe,</div><div class='del'>-          .remove = snd_mychip_remove,</div><div class='del'>-  };</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;structfield&gt;probe&lt;/structfield&gt; and</div><div class='del'>-      &lt;structfield&gt;remove&lt;/structfield&gt; functions have already</div><div class='del'>-      been defined in the previous sections.</div><div class='del'>-      The &lt;structfield&gt;name&lt;/structfield&gt;</div><div class='del'>-      field is the name string of this device. Note that you must not</div><div class='del'>-      use a slash &lt;quote&gt;/&lt;/quote&gt; in this string. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        And at last, the module entries:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int __init alsa_card_mychip_init(void)</div><div class='del'>-  {</div><div class='del'>-          return pci_register_driver(&amp;driver);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  static void __exit alsa_card_mychip_exit(void)</div><div class='del'>-  {</div><div class='del'>-          pci_unregister_driver(&amp;driver);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  module_init(alsa_card_mychip_init)</div><div class='del'>-  module_exit(alsa_card_mychip_exit)</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Note that these module entries are tagged with</div><div class='del'>-      &lt;parameter&gt;__init&lt;/parameter&gt; and </div><div class='del'>-      &lt;parameter&gt;__exit&lt;/parameter&gt; prefixes.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Oh, one thing was forgotten. If you have no exported symbols,</div><div class='del'>-        you need to declare it in 2.2 or 2.4 kernels (it's not necessary in 2.6 kernels).</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  EXPORT_NO_SYMBOLS;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        That's all!</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- PCM Interface  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="pcm-interface"&gt;</div><div class='del'>-    &lt;title&gt;PCM Interface&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pcm-interface-general"&gt;</div><div class='del'>-      &lt;title&gt;General&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The PCM middle layer of ALSA is quite powerful and it is only</div><div class='del'>-      necessary for each driver to implement the low-level functions</div><div class='del'>-      to access its hardware.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        For accessing to the PCM layer, you need to include</div><div class='del'>-      &lt;filename&gt;&amp;lt;sound/pcm.h&amp;gt;&lt;/filename&gt; first. In addition,</div><div class='del'>-      &lt;filename&gt;&amp;lt;sound/pcm_params.h&amp;gt;&lt;/filename&gt; might be needed</div><div class='del'>-      if you access to some functions related with hw_param. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Each card device can have up to four pcm instances. A pcm</div><div class='del'>-      instance corresponds to a pcm device file. The limitation of</div><div class='del'>-      number of instances comes only from the available bit size of</div><div class='del'>-      the Linux's device numbers. Once when 64bit device number is</div><div class='del'>-      used, we'll have more pcm instances available. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        A pcm instance consists of pcm playback and capture streams,</div><div class='del'>-      and each pcm stream consists of one or more pcm substreams. Some</div><div class='del'>-      soundcards support multiple playback functions. For example,</div><div class='del'>-      emu10k1 has a PCM playback of 32 stereo substreams. In this case, at</div><div class='del'>-      each open, a free substream is (usually) automatically chosen</div><div class='del'>-      and opened. Meanwhile, when only one substream exists and it was</div><div class='del'>-      already opened, the successful open will either block</div><div class='del'>-      or error with &lt;constant&gt;EAGAIN&lt;/constant&gt; according to the</div><div class='del'>-      file open mode. But you don't have to care about such details in your</div><div class='del'>-      driver. The PCM middle layer will take care of such work.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pcm-interface-example"&gt;</div><div class='del'>-      &lt;title&gt;Full Code Example&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The example code below does not include any hardware access</div><div class='del'>-      routines but shows only the skeleton, how to build up the PCM</div><div class='del'>-      interfaces.</div><div class='del'>-</div><div class='del'>-        &lt;example&gt;</div><div class='del'>-          &lt;title&gt;PCM Example Code&lt;/title&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  #include &lt;sound/pcm.h&gt;</div><div class='del'>-  ....</div><div class='del'>-</div><div class='del'>-  /* hardware definition */</div><div class='del'>-  static struct snd_pcm_hardware snd_mychip_playback_hw = {</div><div class='del'>-          .info = (SNDRV_PCM_INFO_MMAP |</div><div class='del'>-                   SNDRV_PCM_INFO_INTERLEAVED |</div><div class='del'>-                   SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='del'>-                   SNDRV_PCM_INFO_MMAP_VALID),</div><div class='del'>-          .formats =          SNDRV_PCM_FMTBIT_S16_LE,</div><div class='del'>-          .rates =            SNDRV_PCM_RATE_8000_48000,</div><div class='del'>-          .rate_min =         8000,</div><div class='del'>-          .rate_max =         48000,</div><div class='del'>-          .channels_min =     2,</div><div class='del'>-          .channels_max =     2,</div><div class='del'>-          .buffer_bytes_max = 32768,</div><div class='del'>-          .period_bytes_min = 4096,</div><div class='del'>-          .period_bytes_max = 32768,</div><div class='del'>-          .periods_min =      1,</div><div class='del'>-          .periods_max =      1024,</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  /* hardware definition */</div><div class='del'>-  static struct snd_pcm_hardware snd_mychip_capture_hw = {</div><div class='del'>-          .info = (SNDRV_PCM_INFO_MMAP |</div><div class='del'>-                   SNDRV_PCM_INFO_INTERLEAVED |</div><div class='del'>-                   SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='del'>-                   SNDRV_PCM_INFO_MMAP_VALID),</div><div class='del'>-          .formats =          SNDRV_PCM_FMTBIT_S16_LE,</div><div class='del'>-          .rates =            SNDRV_PCM_RATE_8000_48000,</div><div class='del'>-          .rate_min =         8000,</div><div class='del'>-          .rate_max =         48000,</div><div class='del'>-          .channels_min =     2,</div><div class='del'>-          .channels_max =     2,</div><div class='del'>-          .buffer_bytes_max = 32768,</div><div class='del'>-          .period_bytes_min = 4096,</div><div class='del'>-          .period_bytes_max = 32768,</div><div class='del'>-          .periods_min =      1,</div><div class='del'>-          .periods_max =      1024,</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  /* open callback */</div><div class='del'>-  static int snd_mychip_playback_open(struct snd_pcm_substream *substream)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-          struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-          runtime-&gt;hw = snd_mychip_playback_hw;</div><div class='del'>-          /* more hardware-initialization will be done here */</div><div class='del'>-          ....</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* close callback */</div><div class='del'>-  static int snd_mychip_playback_close(struct snd_pcm_substream *substream)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-          /* the hardware-specific codes will be here */</div><div class='del'>-          ....</div><div class='del'>-          return 0;</div><div class='del'>-</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* open callback */</div><div class='del'>-  static int snd_mychip_capture_open(struct snd_pcm_substream *substream)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-          struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-          runtime-&gt;hw = snd_mychip_capture_hw;</div><div class='del'>-          /* more hardware-initialization will be done here */</div><div class='del'>-          ....</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* close callback */</div><div class='del'>-  static int snd_mychip_capture_close(struct snd_pcm_substream *substream)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-          /* the hardware-specific codes will be here */</div><div class='del'>-          ....</div><div class='del'>-          return 0;</div><div class='del'>-</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* hw_params callback */</div><div class='del'>-  static int snd_mychip_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-                               struct snd_pcm_hw_params *hw_params)</div><div class='del'>-  {</div><div class='del'>-          return snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-                                     params_buffer_bytes(hw_params));</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* hw_free callback */</div><div class='del'>-  static int snd_mychip_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-  {</div><div class='del'>-          return snd_pcm_lib_free_pages(substream);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* prepare callback */</div><div class='del'>-  static int snd_mychip_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-          struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-          /* set up the hardware with the current configuration</div><div class='del'>-           * for example...</div><div class='del'>-           */</div><div class='del'>-          mychip_set_sample_format(chip, runtime-&gt;format);</div><div class='del'>-          mychip_set_sample_rate(chip, runtime-&gt;rate);</div><div class='del'>-          mychip_set_channels(chip, runtime-&gt;channels);</div><div class='del'>-          mychip_set_dma_setup(chip, runtime-&gt;dma_addr,</div><div class='del'>-                               chip-&gt;buffer_size,</div><div class='del'>-                               chip-&gt;period_size);</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* trigger callback */</div><div class='del'>-  static int snd_mychip_pcm_trigger(struct snd_pcm_substream *substream,</div><div class='del'>-                                    int cmd)</div><div class='del'>-  {</div><div class='del'>-          switch (cmd) {</div><div class='del'>-          case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-                  /* do something to start the PCM engine */</div><div class='del'>-                  ....</div><div class='del'>-                  break;</div><div class='del'>-          case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-                  /* do something to stop the PCM engine */</div><div class='del'>-                  ....</div><div class='del'>-                  break;</div><div class='del'>-          default:</div><div class='del'>-                  return -EINVAL;</div><div class='del'>-          }</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* pointer callback */</div><div class='del'>-  static snd_pcm_uframes_t</div><div class='del'>-  snd_mychip_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-          unsigned int current_ptr;</div><div class='del'>-</div><div class='del'>-          /* get the current hardware pointer */</div><div class='del'>-          current_ptr = mychip_get_hw_pointer(chip);</div><div class='del'>-          return current_ptr;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  /* operators */</div><div class='del'>-  static struct snd_pcm_ops snd_mychip_playback_ops = {</div><div class='del'>-          .open =        snd_mychip_playback_open,</div><div class='del'>-          .close =       snd_mychip_playback_close,</div><div class='del'>-          .ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-          .hw_params =   snd_mychip_pcm_hw_params,</div><div class='del'>-          .hw_free =     snd_mychip_pcm_hw_free,</div><div class='del'>-          .prepare =     snd_mychip_pcm_prepare,</div><div class='del'>-          .trigger =     snd_mychip_pcm_trigger,</div><div class='del'>-          .pointer =     snd_mychip_pcm_pointer,</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  /* operators */</div><div class='del'>-  static struct snd_pcm_ops snd_mychip_capture_ops = {</div><div class='del'>-          .open =        snd_mychip_capture_open,</div><div class='del'>-          .close =       snd_mychip_capture_close,</div><div class='del'>-          .ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-          .hw_params =   snd_mychip_pcm_hw_params,</div><div class='del'>-          .hw_free =     snd_mychip_pcm_hw_free,</div><div class='del'>-          .prepare =     snd_mychip_pcm_prepare,</div><div class='del'>-          .trigger =     snd_mychip_pcm_trigger,</div><div class='del'>-          .pointer =     snd_mychip_pcm_pointer,</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  /*</div><div class='del'>-   *  definitions of capture are omitted here...</div><div class='del'>-   */</div><div class='del'>-</div><div class='del'>-  /* create a pcm device */</div><div class='del'>-  static int snd_mychip_new_pcm(struct mychip *chip)</div><div class='del'>-  {</div><div class='del'>-          struct snd_pcm *pcm;</div><div class='del'>-          int err;</div><div class='del'>-</div><div class='del'>-          err = snd_pcm_new(chip-&gt;card, "My Chip", 0, 1, 1, &amp;pcm);</div><div class='del'>-          if (err &lt; 0) </div><div class='del'>-                  return err;</div><div class='del'>-          pcm-&gt;private_data = chip;</div><div class='del'>-          strcpy(pcm-&gt;name, "My Chip");</div><div class='del'>-          chip-&gt;pcm = pcm;</div><div class='del'>-          /* set operators */</div><div class='del'>-          snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='del'>-                          &amp;snd_mychip_playback_ops);</div><div class='del'>-          snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='del'>-                          &amp;snd_mychip_capture_ops);</div><div class='del'>-          /* pre-allocation of buffers */</div><div class='del'>-          /* NOTE: this may fail */</div><div class='del'>-          snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-                                                snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-                                                64*1024, 64*1024);</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/example&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pcm-interface-constructor"&gt;</div><div class='del'>-      &lt;title&gt;Constructor&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        A pcm instance is allocated by the &lt;function&gt;snd_pcm_new()&lt;/function&gt;</div><div class='del'>-      function. It would be better to create a constructor for pcm,</div><div class='del'>-      namely, </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_mychip_new_pcm(struct mychip *chip)</div><div class='del'>-  {</div><div class='del'>-          struct snd_pcm *pcm;</div><div class='del'>-          int err;</div><div class='del'>-</div><div class='del'>-          err = snd_pcm_new(chip-&gt;card, "My Chip", 0, 1, 1, &amp;pcm);</div><div class='del'>-          if (err &lt; 0) </div><div class='del'>-                  return err;</div><div class='del'>-          pcm-&gt;private_data = chip;</div><div class='del'>-          strcpy(pcm-&gt;name, "My Chip");</div><div class='del'>-          chip-&gt;pcm = pcm;</div><div class='del'>-	  ....</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;function&gt;snd_pcm_new()&lt;/function&gt; function takes four</div><div class='del'>-      arguments. The first argument is the card pointer to which this</div><div class='del'>-      pcm is assigned, and the second is the ID string. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The third argument (&lt;parameter&gt;index&lt;/parameter&gt;, 0 in the</div><div class='del'>-      above) is the index of this new pcm. It begins from zero. If</div><div class='del'>-      you create more than one pcm instances, specify the</div><div class='del'>-      different numbers in this argument. For example,</div><div class='del'>-      &lt;parameter&gt;index&lt;/parameter&gt; = 1 for the second PCM device.  </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The fourth and fifth arguments are the number of substreams</div><div class='del'>-      for playback and capture, respectively. Here 1 is used for</div><div class='del'>-      both arguments. When no playback or capture substreams are available,</div><div class='del'>-      pass 0 to the corresponding argument.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        If a chip supports multiple playbacks or captures, you can</div><div class='del'>-      specify more numbers, but they must be handled properly in</div><div class='del'>-      open/close, etc. callbacks.  When you need to know which</div><div class='del'>-      substream you are referring to, then it can be obtained from</div><div class='del'>-      struct &lt;structname&gt;snd_pcm_substream&lt;/structname&gt; data passed to each callback</div><div class='del'>-      as follows: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_pcm_substream *substream;</div><div class='del'>-  int index = substream-&gt;number;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        After the pcm is created, you need to set operators for each</div><div class='del'>-        pcm stream. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='del'>-                  &amp;snd_mychip_playback_ops);</div><div class='del'>-  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='del'>-                  &amp;snd_mychip_capture_ops);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The operators are defined typically like this:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static struct snd_pcm_ops snd_mychip_playback_ops = {</div><div class='del'>-          .open =        snd_mychip_pcm_open,</div><div class='del'>-          .close =       snd_mychip_pcm_close,</div><div class='del'>-          .ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-          .hw_params =   snd_mychip_pcm_hw_params,</div><div class='del'>-          .hw_free =     snd_mychip_pcm_hw_free,</div><div class='del'>-          .prepare =     snd_mychip_pcm_prepare,</div><div class='del'>-          .trigger =     snd_mychip_pcm_trigger,</div><div class='del'>-          .pointer =     snd_mychip_pcm_pointer,</div><div class='del'>-  };</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        All the callbacks are described in the</div><div class='del'>-        &lt;link linkend="pcm-interface-operators"&gt;&lt;citetitle&gt;</div><div class='del'>-        Operators&lt;/citetitle&gt;&lt;/link&gt; subsection.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        After setting the operators, you probably will want to</div><div class='del'>-        pre-allocate the buffer. For the pre-allocation, simply call</div><div class='del'>-        the following: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-                                        snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-                                        64*1024, 64*1024);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        It will allocate a buffer up to 64kB as default.</div><div class='del'>-      Buffer management details will be described in the later section &lt;link</div><div class='del'>-      linkend="buffer-and-memory"&gt;&lt;citetitle&gt;Buffer and Memory</div><div class='del'>-      Management&lt;/citetitle&gt;&lt;/link&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Additionally, you can set some extra information for this pcm</div><div class='del'>-        in pcm-&amp;gt;info_flags.</div><div class='del'>-        The available values are defined as</div><div class='del'>-        &lt;constant&gt;SNDRV_PCM_INFO_XXX&lt;/constant&gt; in</div><div class='del'>-        &lt;filename&gt;&amp;lt;sound/asound.h&amp;gt;&lt;/filename&gt;, which is used for</div><div class='del'>-        the hardware definition (described later). When your soundchip</div><div class='del'>-        supports only half-duplex, specify like this: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  pcm-&gt;info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pcm-interface-destructor"&gt;</div><div class='del'>-      &lt;title&gt;... And the Destructor?&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The destructor for a pcm instance is not always</div><div class='del'>-      necessary. Since the pcm device will be released by the middle</div><div class='del'>-      layer code automatically, you don't have to call the destructor</div><div class='del'>-      explicitly.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The destructor would be necessary if you created</div><div class='del'>-        special records internally and needed to release them. In such a</div><div class='del'>-        case, set the destructor function to</div><div class='del'>-        pcm-&amp;gt;private_free: </div><div class='del'>-</div><div class='del'>-        &lt;example&gt;</div><div class='del'>-          &lt;title&gt;PCM Instance with a Destructor&lt;/title&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static void mychip_pcm_free(struct snd_pcm *pcm)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = snd_pcm_chip(pcm);</div><div class='del'>-          /* free your own data */</div><div class='del'>-          kfree(chip-&gt;my_private_pcm_data);</div><div class='del'>-          /* do what you like else */</div><div class='del'>-          ....</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  static int snd_mychip_new_pcm(struct mychip *chip)</div><div class='del'>-  {</div><div class='del'>-          struct snd_pcm *pcm;</div><div class='del'>-          ....</div><div class='del'>-          /* allocate your own data */</div><div class='del'>-          chip-&gt;my_private_pcm_data = kmalloc(...);</div><div class='del'>-          /* set the destructor */</div><div class='del'>-          pcm-&gt;private_data = chip;</div><div class='del'>-          pcm-&gt;private_free = mychip_pcm_free;</div><div class='del'>-          ....</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/example&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pcm-interface-runtime"&gt;</div><div class='del'>-      &lt;title&gt;Runtime Pointer - The Chest of PCM Information&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  When the PCM substream is opened, a PCM runtime instance is</div><div class='del'>-	allocated and assigned to the substream. This pointer is</div><div class='del'>-	accessible via &lt;constant&gt;substream-&amp;gt;runtime&lt;/constant&gt;.</div><div class='del'>-	This runtime pointer holds most information you need</div><div class='del'>-	to control the PCM: the copy of hw_params and sw_params configurations, the buffer</div><div class='del'>-	pointers, mmap records, spinlocks, etc.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The definition of runtime instance is found in</div><div class='del'>-	&lt;filename&gt;&amp;lt;sound/pcm.h&amp;gt;&lt;/filename&gt;.  Here are</div><div class='del'>-       the contents of this file:</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-struct _snd_pcm_runtime {</div><div class='del'>-	/* -- Status -- */</div><div class='del'>-	struct snd_pcm_substream *trigger_master;</div><div class='del'>-	snd_timestamp_t trigger_tstamp;	/* trigger timestamp */</div><div class='del'>-	int overrange;</div><div class='del'>-	snd_pcm_uframes_t avail_max;</div><div class='del'>-	snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */</div><div class='del'>-	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time*/</div><div class='del'>-</div><div class='del'>-	/* -- HW params -- */</div><div class='del'>-	snd_pcm_access_t access;	/* access mode */</div><div class='del'>-	snd_pcm_format_t format;	/* SNDRV_PCM_FORMAT_* */</div><div class='del'>-	snd_pcm_subformat_t subformat;	/* subformat */</div><div class='del'>-	unsigned int rate;		/* rate in Hz */</div><div class='del'>-	unsigned int channels;		/* channels */</div><div class='del'>-	snd_pcm_uframes_t period_size;	/* period size */</div><div class='del'>-	unsigned int periods;		/* periods */</div><div class='del'>-	snd_pcm_uframes_t buffer_size;	/* buffer size */</div><div class='del'>-	unsigned int tick_time;		/* tick time */</div><div class='del'>-	snd_pcm_uframes_t min_align;	/* Min alignment for the format */</div><div class='del'>-	size_t byte_align;</div><div class='del'>-	unsigned int frame_bits;</div><div class='del'>-	unsigned int sample_bits;</div><div class='del'>-	unsigned int info;</div><div class='del'>-	unsigned int rate_num;</div><div class='del'>-	unsigned int rate_den;</div><div class='del'>-</div><div class='del'>-	/* -- SW params -- */</div><div class='del'>-	struct timespec tstamp_mode;	/* mmap timestamp is updated */</div><div class='del'>-  	unsigned int period_step;</div><div class='del'>-	unsigned int sleep_min;		/* min ticks to sleep */</div><div class='del'>-	snd_pcm_uframes_t start_threshold;</div><div class='del'>-	snd_pcm_uframes_t stop_threshold;</div><div class='del'>-	snd_pcm_uframes_t silence_threshold; /* Silence filling happens when</div><div class='del'>-						noise is nearest than this */</div><div class='del'>-	snd_pcm_uframes_t silence_size;	/* Silence filling size */</div><div class='del'>-	snd_pcm_uframes_t boundary;	/* pointers wrap point */</div><div class='del'>-</div><div class='del'>-	snd_pcm_uframes_t silenced_start;</div><div class='del'>-	snd_pcm_uframes_t silenced_size;</div><div class='del'>-</div><div class='del'>-	snd_pcm_sync_id_t sync;		/* hardware synchronization ID */</div><div class='del'>-</div><div class='del'>-	/* -- mmap -- */</div><div class='del'>-	volatile struct snd_pcm_mmap_status *status;</div><div class='del'>-	volatile struct snd_pcm_mmap_control *control;</div><div class='del'>-	atomic_t mmap_count;</div><div class='del'>-</div><div class='del'>-	/* -- locking / scheduling -- */</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	wait_queue_head_t sleep;</div><div class='del'>-	struct timer_list tick_timer;</div><div class='del'>-	struct fasync_struct *fasync;</div><div class='del'>-</div><div class='del'>-	/* -- private section -- */</div><div class='del'>-	void *private_data;</div><div class='del'>-	void (*private_free)(struct snd_pcm_runtime *runtime);</div><div class='del'>-</div><div class='del'>-	/* -- hardware description -- */</div><div class='del'>-	struct snd_pcm_hardware hw;</div><div class='del'>-	struct snd_pcm_hw_constraints hw_constraints;</div><div class='del'>-</div><div class='del'>-	/* -- timer -- */</div><div class='del'>-	unsigned int timer_resolution;	/* timer resolution */</div><div class='del'>-</div><div class='del'>-	/* -- DMA -- */           </div><div class='del'>-	unsigned char *dma_area;	/* DMA area */</div><div class='del'>-	dma_addr_t dma_addr;		/* physical bus address (not accessible from main CPU) */</div><div class='del'>-	size_t dma_bytes;		/* size of DMA area */</div><div class='del'>-</div><div class='del'>-	struct snd_dma_buffer *dma_buffer_p;	/* allocated buffer */</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)</div><div class='del'>-	/* -- OSS things -- */</div><div class='del'>-	struct snd_pcm_oss_runtime oss;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  For the operators (callbacks) of each sound driver, most of</div><div class='del'>-	these records are supposed to be read-only.  Only the PCM</div><div class='del'>-	middle-layer changes / updates them.  The exceptions are</div><div class='del'>-	the hardware description (hw) DMA buffer information and the</div><div class='del'>-	private data.  Besides, if you use the standard buffer allocation</div><div class='del'>-	method via &lt;function&gt;snd_pcm_lib_malloc_pages()&lt;/function&gt;,</div><div class='del'>-	you don't need to set the DMA buffer information by yourself.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	In the sections below, important records are explained.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;section id="pcm-interface-runtime-hw"&gt;</div><div class='del'>-	&lt;title&gt;Hardware Description&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  The hardware descriptor (struct &lt;structname&gt;snd_pcm_hardware&lt;/structname&gt;)</div><div class='del'>-	contains the definitions of the fundamental hardware</div><div class='del'>-	configuration.  Above all, you'll need to define this in</div><div class='del'>-	&lt;link linkend="pcm-interface-operators-open-callback"&gt;&lt;citetitle&gt;</div><div class='del'>-	the open callback&lt;/citetitle&gt;&lt;/link&gt;.</div><div class='del'>-	Note that the runtime instance holds the copy of the</div><div class='del'>-	descriptor, not the pointer to the existing descriptor.  That</div><div class='del'>-	is, in the open callback, you can modify the copied descriptor</div><div class='del'>-	(&lt;constant&gt;runtime-&amp;gt;hw&lt;/constant&gt;) as you need.  For example, if the maximum</div><div class='del'>-	number of channels is 1 only on some chip models, you can</div><div class='del'>-	still use the same hardware descriptor and change the</div><div class='del'>-	channels_max later:</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-          struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-          ...</div><div class='del'>-          runtime-&gt;hw = snd_mychip_playback_hw; /* common definition */</div><div class='del'>-          if (chip-&gt;model == VERY_OLD_ONE)</div><div class='del'>-                  runtime-&gt;hw.channels_max = 1;</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  Typically, you'll have a hardware descriptor as below:</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static struct snd_pcm_hardware snd_mychip_playback_hw = {</div><div class='del'>-          .info = (SNDRV_PCM_INFO_MMAP |</div><div class='del'>-                   SNDRV_PCM_INFO_INTERLEAVED |</div><div class='del'>-                   SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='del'>-                   SNDRV_PCM_INFO_MMAP_VALID),</div><div class='del'>-          .formats =          SNDRV_PCM_FMTBIT_S16_LE,</div><div class='del'>-          .rates =            SNDRV_PCM_RATE_8000_48000,</div><div class='del'>-          .rate_min =         8000,</div><div class='del'>-          .rate_max =         48000,</div><div class='del'>-          .channels_min =     2,</div><div class='del'>-          .channels_max =     2,</div><div class='del'>-          .buffer_bytes_max = 32768,</div><div class='del'>-          .period_bytes_min = 4096,</div><div class='del'>-          .period_bytes_max = 32768,</div><div class='del'>-          .periods_min =      1,</div><div class='del'>-          .periods_max =      1024,</div><div class='del'>-  };</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	&lt;itemizedlist&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-          The &lt;structfield&gt;info&lt;/structfield&gt; field contains the type and</div><div class='del'>-        capabilities of this pcm. The bit flags are defined in</div><div class='del'>-        &lt;filename&gt;&amp;lt;sound/asound.h&amp;gt;&lt;/filename&gt; as</div><div class='del'>-        &lt;constant&gt;SNDRV_PCM_INFO_XXX&lt;/constant&gt;. Here, at least, you</div><div class='del'>-        have to specify whether the mmap is supported and which</div><div class='del'>-        interleaved format is supported.</div><div class='del'>-        When the hardware supports mmap, add the</div><div class='del'>-        &lt;constant&gt;SNDRV_PCM_INFO_MMAP&lt;/constant&gt; flag here. When the</div><div class='del'>-        hardware supports the interleaved or the non-interleaved</div><div class='del'>-        formats, &lt;constant&gt;SNDRV_PCM_INFO_INTERLEAVED&lt;/constant&gt; or</div><div class='del'>-        &lt;constant&gt;SNDRV_PCM_INFO_NONINTERLEAVED&lt;/constant&gt; flag must</div><div class='del'>-        be set, respectively. If both are supported, you can set both,</div><div class='del'>-        too. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          In the above example, &lt;constant&gt;MMAP_VALID&lt;/constant&gt; and</div><div class='del'>-        &lt;constant&gt;BLOCK_TRANSFER&lt;/constant&gt; are specified for the OSS mmap</div><div class='del'>-        mode. Usually both are set. Of course,</div><div class='del'>-        &lt;constant&gt;MMAP_VALID&lt;/constant&gt; is set only if the mmap is</div><div class='del'>-        really supported. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          The other possible flags are</div><div class='del'>-        &lt;constant&gt;SNDRV_PCM_INFO_PAUSE&lt;/constant&gt; and</div><div class='del'>-        &lt;constant&gt;SNDRV_PCM_INFO_RESUME&lt;/constant&gt;. The</div><div class='del'>-        &lt;constant&gt;PAUSE&lt;/constant&gt; bit means that the pcm supports the</div><div class='del'>-        &lt;quote&gt;pause&lt;/quote&gt; operation, while the</div><div class='del'>-        &lt;constant&gt;RESUME&lt;/constant&gt; bit means that the pcm supports</div><div class='del'>-        the full &lt;quote&gt;suspend/resume&lt;/quote&gt; operation.</div><div class='del'>-	If the &lt;constant&gt;PAUSE&lt;/constant&gt; flag is set,</div><div class='del'>-	the &lt;structfield&gt;trigger&lt;/structfield&gt; callback below</div><div class='del'>-        must handle the corresponding (pause push/release) commands.</div><div class='del'>-	The suspend/resume trigger commands can be defined even without</div><div class='del'>-	the &lt;constant&gt;RESUME&lt;/constant&gt; flag.  See &lt;link</div><div class='del'>-	linkend="power-management"&gt;&lt;citetitle&gt;</div><div class='del'>-	Power Management&lt;/citetitle&gt;&lt;/link&gt; section for details.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  When the PCM substreams can be synchronized (typically,</div><div class='del'>-	synchronized start/stop of a playback and a capture streams),</div><div class='del'>-	you can give &lt;constant&gt;SNDRV_PCM_INFO_SYNC_START&lt;/constant&gt;,</div><div class='del'>-	too.  In this case, you'll need to check the linked-list of</div><div class='del'>-	PCM substreams in the trigger callback.  This will be</div><div class='del'>-	described in the later section.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;structfield&gt;formats&lt;/structfield&gt; field contains the bit-flags</div><div class='del'>-        of supported formats (&lt;constant&gt;SNDRV_PCM_FMTBIT_XXX&lt;/constant&gt;).</div><div class='del'>-        If the hardware supports more than one format, give all or'ed</div><div class='del'>-        bits.  In the example above, the signed 16bit little-endian</div><div class='del'>-        format is specified.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        &lt;structfield&gt;rates&lt;/structfield&gt; field contains the bit-flags of</div><div class='del'>-        supported rates (&lt;constant&gt;SNDRV_PCM_RATE_XXX&lt;/constant&gt;).</div><div class='del'>-        When the chip supports continuous rates, pass</div><div class='del'>-        &lt;constant&gt;CONTINUOUS&lt;/constant&gt; bit additionally.</div><div class='del'>-        The pre-defined rate bits are provided only for typical</div><div class='del'>-	rates. If your chip supports unconventional rates, you need to add</div><div class='del'>-        the &lt;constant&gt;KNOT&lt;/constant&gt; bit and set up the hardware</div><div class='del'>-        constraint manually (explained later).</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;structfield&gt;rate_min&lt;/structfield&gt; and</div><div class='del'>-	&lt;structfield&gt;rate_max&lt;/structfield&gt; define the minimum and</div><div class='del'>-	maximum sample rate.  This should correspond somehow to</div><div class='del'>-	&lt;structfield&gt;rates&lt;/structfield&gt; bits.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;structfield&gt;channel_min&lt;/structfield&gt; and</div><div class='del'>-	&lt;structfield&gt;channel_max&lt;/structfield&gt; </div><div class='del'>-	define, as you might already expected, the minimum and maximum</div><div class='del'>-	number of channels.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;structfield&gt;buffer_bytes_max&lt;/structfield&gt; defines the</div><div class='del'>-	maximum buffer size in bytes.  There is no</div><div class='del'>-	&lt;structfield&gt;buffer_bytes_min&lt;/structfield&gt; field, since</div><div class='del'>-	it can be calculated from the minimum period size and the</div><div class='del'>-	minimum number of periods.</div><div class='del'>-	Meanwhile, &lt;structfield&gt;period_bytes_min&lt;/structfield&gt; and</div><div class='del'>-	define the minimum and maximum size of the period in bytes.</div><div class='del'>-	&lt;structfield&gt;periods_max&lt;/structfield&gt; and</div><div class='del'>-	&lt;structfield&gt;periods_min&lt;/structfield&gt; define the maximum and</div><div class='del'>-	minimum number of periods in the buffer.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The &lt;quote&gt;period&lt;/quote&gt; is a term that corresponds to</div><div class='del'>-	a fragment in the OSS world. The period defines the size at</div><div class='del'>-	which a PCM interrupt is generated. This size strongly</div><div class='del'>-	depends on the hardware. </div><div class='del'>-	Generally, the smaller period size will give you more</div><div class='del'>-	interrupts, that is, more controls. </div><div class='del'>-	In the case of capture, this size defines the input latency.</div><div class='del'>-	On the other hand, the whole buffer size defines the</div><div class='del'>-	output latency for the playback direction.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	There is also a field &lt;structfield&gt;fifo_size&lt;/structfield&gt;.</div><div class='del'>-	This specifies the size of the hardware FIFO, but currently it</div><div class='del'>-	is neither used in the driver nor in the alsa-lib.  So, you</div><div class='del'>-	can ignore this field.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/section&gt;</div><div class='del'>-</div><div class='del'>-	&lt;section id="pcm-interface-runtime-config"&gt;</div><div class='del'>-	&lt;title&gt;PCM Configurations&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Ok, let's go back again to the PCM runtime records.</div><div class='del'>-	The most frequently referred records in the runtime instance are</div><div class='del'>-	the PCM configurations.</div><div class='del'>-	The PCM configurations are stored in the runtime instance</div><div class='del'>-	after the application sends &lt;type&gt;hw_params&lt;/type&gt; data via</div><div class='del'>-	alsa-lib.  There are many fields copied from hw_params and</div><div class='del'>-	sw_params structs.  For example,</div><div class='del'>-	&lt;structfield&gt;format&lt;/structfield&gt; holds the format type</div><div class='del'>-	chosen by the application.  This field contains the enum value</div><div class='del'>-	&lt;constant&gt;SNDRV_PCM_FORMAT_XXX&lt;/constant&gt;.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	One thing to be noted is that the configured buffer and period</div><div class='del'>-	sizes are stored in &lt;quote&gt;frames&lt;/quote&gt; in the runtime.</div><div class='del'>-        In the ALSA world, 1 frame = channels * samples-size.</div><div class='del'>-	For conversion between frames and bytes, you can use the</div><div class='del'>-	&lt;function&gt;frames_to_bytes()&lt;/function&gt; and</div><div class='del'>-          &lt;function&gt;bytes_to_frames()&lt;/function&gt; helper functions. </div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  period_bytes = frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Also, many software parameters (sw_params) are</div><div class='del'>-	stored in frames, too.  Please check the type of the field.</div><div class='del'>-	&lt;type&gt;snd_pcm_uframes_t&lt;/type&gt; is for the frames as unsigned</div><div class='del'>-	integer while &lt;type&gt;snd_pcm_sframes_t&lt;/type&gt; is for the frames</div><div class='del'>-	as signed integer.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/section&gt;</div><div class='del'>-</div><div class='del'>-	&lt;section id="pcm-interface-runtime-dma"&gt;</div><div class='del'>-	&lt;title&gt;DMA Buffer Information&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The DMA buffer is defined by the following four fields,</div><div class='del'>-	&lt;structfield&gt;dma_area&lt;/structfield&gt;,</div><div class='del'>-	&lt;structfield&gt;dma_addr&lt;/structfield&gt;,</div><div class='del'>-	&lt;structfield&gt;dma_bytes&lt;/structfield&gt; and</div><div class='del'>-	&lt;structfield&gt;dma_private&lt;/structfield&gt;.</div><div class='del'>-	The &lt;structfield&gt;dma_area&lt;/structfield&gt; holds the buffer</div><div class='del'>-	pointer (the logical address).  You can call</div><div class='del'>-	&lt;function&gt;memcpy&lt;/function&gt; from/to </div><div class='del'>-	this pointer.  Meanwhile, &lt;structfield&gt;dma_addr&lt;/structfield&gt;</div><div class='del'>-	holds the physical address of the buffer.  This field is</div><div class='del'>-	specified only when the buffer is a linear buffer.</div><div class='del'>-	&lt;structfield&gt;dma_bytes&lt;/structfield&gt; holds the size of buffer</div><div class='del'>-	in bytes.  &lt;structfield&gt;dma_private&lt;/structfield&gt; is used for</div><div class='del'>-	the ALSA DMA allocator.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	If you use a standard ALSA function,</div><div class='del'>-	&lt;function&gt;snd_pcm_lib_malloc_pages()&lt;/function&gt;, for</div><div class='del'>-	allocating the buffer, these fields are set by the ALSA middle</div><div class='del'>-	layer, and you should &lt;emphasis&gt;not&lt;/emphasis&gt; change them by</div><div class='del'>-	yourself.  You can read them but not write them.</div><div class='del'>-	On the other hand, if you want to allocate the buffer by</div><div class='del'>-	yourself, you'll need to manage it in hw_params callback.</div><div class='del'>-	At least, &lt;structfield&gt;dma_bytes&lt;/structfield&gt; is mandatory.</div><div class='del'>-	&lt;structfield&gt;dma_area&lt;/structfield&gt; is necessary when the</div><div class='del'>-	buffer is mmapped.  If your driver doesn't support mmap, this</div><div class='del'>-	field is not necessary.  &lt;structfield&gt;dma_addr&lt;/structfield&gt;</div><div class='del'>-	is also optional.  You can use</div><div class='del'>-	&lt;structfield&gt;dma_private&lt;/structfield&gt; as you like, too.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/section&gt;</div><div class='del'>-</div><div class='del'>-	&lt;section id="pcm-interface-runtime-status"&gt;</div><div class='del'>-	&lt;title&gt;Running Status&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The running status can be referred via &lt;constant&gt;runtime-&amp;gt;status&lt;/constant&gt;.</div><div class='del'>-	This is the pointer to the struct &lt;structname&gt;snd_pcm_mmap_status&lt;/structname&gt;</div><div class='del'>-	record.  For example, you can get the current DMA hardware</div><div class='del'>-	pointer via &lt;constant&gt;runtime-&amp;gt;status-&amp;gt;hw_ptr&lt;/constant&gt;.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The DMA application pointer can be referred via</div><div class='del'>-	&lt;constant&gt;runtime-&amp;gt;control&lt;/constant&gt;, which points to the</div><div class='del'>-	struct &lt;structname&gt;snd_pcm_mmap_control&lt;/structname&gt; record.</div><div class='del'>-	However, accessing directly to this value is not recommended.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/section&gt;</div><div class='del'>-</div><div class='del'>-	&lt;section id="pcm-interface-runtime-private"&gt;</div><div class='del'>-	&lt;title&gt;Private Data&lt;/title&gt; </div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	You can allocate a record for the substream and store it in</div><div class='del'>-	&lt;constant&gt;runtime-&amp;gt;private_data&lt;/constant&gt;.  Usually, this</div><div class='del'>-	is done in</div><div class='del'>-	&lt;link linkend="pcm-interface-operators-open-callback"&gt;&lt;citetitle&gt;</div><div class='del'>-	the open callback&lt;/citetitle&gt;&lt;/link&gt;.</div><div class='del'>-	Don't mix this with &lt;constant&gt;pcm-&amp;gt;private_data&lt;/constant&gt;.</div><div class='del'>-	The &lt;constant&gt;pcm-&amp;gt;private_data&lt;/constant&gt; usually points to the</div><div class='del'>-	chip instance assigned statically at the creation of PCM, while the </div><div class='del'>-	&lt;constant&gt;runtime-&amp;gt;private_data&lt;/constant&gt; points to a dynamic</div><div class='del'>-	data structure created at the PCM open callback.</div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_xxx_open(struct snd_pcm_substream *substream)</div><div class='del'>-  {</div><div class='del'>-          struct my_pcm_data *data;</div><div class='del'>-          ....</div><div class='del'>-          data = kmalloc(sizeof(*data), GFP_KERNEL);</div><div class='del'>-          substream-&gt;runtime-&gt;private_data = data;</div><div class='del'>-          ....</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          The allocated object must be released in</div><div class='del'>-	&lt;link linkend="pcm-interface-operators-open-callback"&gt;&lt;citetitle&gt;</div><div class='del'>-	the close callback&lt;/citetitle&gt;&lt;/link&gt;.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pcm-interface-operators"&gt;</div><div class='del'>-      &lt;title&gt;Operators&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        OK, now let me give details about each pcm callback</div><div class='del'>-      (&lt;parameter&gt;ops&lt;/parameter&gt;). In general, every callback must</div><div class='del'>-      return 0 if successful, or a negative error number</div><div class='del'>-      such as &lt;constant&gt;-EINVAL&lt;/constant&gt;. To choose an appropriate</div><div class='del'>-      error number, it is advised to check what value other parts of</div><div class='del'>-      the kernel return when the same kind of request fails.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The callback function takes at least the argument with</div><div class='del'>-        &lt;structname&gt;snd_pcm_substream&lt;/structname&gt; pointer. To retrieve</div><div class='del'>-        the chip record from the given substream instance, you can use the</div><div class='del'>-        following macro. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  int xxx() {</div><div class='del'>-          struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-          ....</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-	The macro reads &lt;constant&gt;substream-&amp;gt;private_data&lt;/constant&gt;,</div><div class='del'>-	which is a copy of &lt;constant&gt;pcm-&amp;gt;private_data&lt;/constant&gt;.</div><div class='del'>-	You can override the former if you need to assign different data</div><div class='del'>-	records per PCM substream.  For example, the cmi8330 driver assigns</div><div class='del'>-	different private_data for playback and capture directions,</div><div class='del'>-	because it uses two different codecs (SB- and AD-compatible) for</div><div class='del'>-	different directions.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-operators-open-callback"&gt;</div><div class='del'>-        &lt;title&gt;open callback&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_xxx_open(struct snd_pcm_substream *substream);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          This is called when a pcm substream is opened.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          At least, here you have to initialize the runtime-&amp;gt;hw</div><div class='del'>-          record. Typically, this is done by like this: </div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_xxx_open(struct snd_pcm_substream *substream)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-          struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-          runtime-&gt;hw = snd_mychip_playback_hw;</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          where &lt;parameter&gt;snd_mychip_playback_hw&lt;/parameter&gt; is the</div><div class='del'>-          pre-defined hardware description.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	You can allocate a private data in this callback, as described</div><div class='del'>-	in &lt;link linkend="pcm-interface-runtime-private"&gt;&lt;citetitle&gt;</div><div class='del'>-	Private Data&lt;/citetitle&gt;&lt;/link&gt; section.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	If the hardware configuration needs more constraints, set the</div><div class='del'>-	hardware constraints here, too.</div><div class='del'>-	See &lt;link linkend="pcm-interface-constraints"&gt;&lt;citetitle&gt;</div><div class='del'>-	Constraints&lt;/citetitle&gt;&lt;/link&gt; for more details.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-operators-close-callback"&gt;</div><div class='del'>-        &lt;title&gt;close callback&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_xxx_close(struct snd_pcm_substream *substream);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          Obviously, this is called when a pcm substream is closed.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Any private instance for a pcm substream allocated in the</div><div class='del'>-          open callback will be released here. </div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_xxx_close(struct snd_pcm_substream *substream)</div><div class='del'>-  {</div><div class='del'>-          ....</div><div class='del'>-          kfree(substream-&gt;runtime-&gt;private_data);</div><div class='del'>-          ....</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-operators-ioctl-callback"&gt;</div><div class='del'>-        &lt;title&gt;ioctl callback&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This is used for any special call to pcm ioctls. But</div><div class='del'>-        usually you can pass a generic ioctl callback, </div><div class='del'>-        &lt;function&gt;snd_pcm_lib_ioctl&lt;/function&gt;.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-operators-hw-params-callback"&gt;</div><div class='del'>-        &lt;title&gt;hw_params callback&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_xxx_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-                               struct snd_pcm_hw_params *hw_params);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This is called when the hardware parameter</div><div class='del'>-        (&lt;structfield&gt;hw_params&lt;/structfield&gt;) is set</div><div class='del'>-        up by the application, </div><div class='del'>-        that is, once when the buffer size, the period size, the</div><div class='del'>-        format, etc. are defined for the pcm substream. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Many hardware setups should be done in this callback,</div><div class='del'>-        including the allocation of buffers. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Parameters to be initialized are retrieved by</div><div class='del'>-          &lt;function&gt;params_xxx()&lt;/function&gt; macros. To allocate</div><div class='del'>-          buffer, you can call a helper function, </div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          &lt;function&gt;snd_pcm_lib_malloc_pages()&lt;/function&gt; is available</div><div class='del'>-	  only when the DMA buffers have been pre-allocated.</div><div class='del'>-	  See the section &lt;link</div><div class='del'>-	  linkend="buffer-and-memory-buffer-types"&gt;&lt;citetitle&gt;</div><div class='del'>-	  Buffer Types&lt;/citetitle&gt;&lt;/link&gt; for more details.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Note that this and &lt;structfield&gt;prepare&lt;/structfield&gt; callbacks</div><div class='del'>-        may be called multiple times per initialization.</div><div class='del'>-        For example, the OSS emulation may</div><div class='del'>-        call these callbacks at each change via its ioctl. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Thus, you need to be careful not to allocate the same buffers</div><div class='del'>-        many times, which will lead to memory leaks!  Calling the</div><div class='del'>-        helper function above many times is OK. It will release the</div><div class='del'>-        previous buffer automatically when it was already allocated. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Another note is that this callback is non-atomic</div><div class='del'>-        (schedulable) as default, i.e. when no</div><div class='del'>-	&lt;structfield&gt;nonatomic&lt;/structfield&gt; flag set.</div><div class='del'>-	This is important, because the</div><div class='del'>-        &lt;structfield&gt;trigger&lt;/structfield&gt; callback </div><div class='del'>-        is atomic (non-schedulable). That is, mutexes or any</div><div class='del'>-        schedule-related functions are not available in</div><div class='del'>-        &lt;structfield&gt;trigger&lt;/structfield&gt; callback.</div><div class='del'>-	Please see the subsection</div><div class='del'>-	&lt;link linkend="pcm-interface-atomicity"&gt;&lt;citetitle&gt;</div><div class='del'>-	Atomicity&lt;/citetitle&gt;&lt;/link&gt; for details.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-operators-hw-free-callback"&gt;</div><div class='del'>-        &lt;title&gt;hw_free callback&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_xxx_hw_free(struct snd_pcm_substream *substream);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This is called to release the resources allocated via</div><div class='del'>-          &lt;structfield&gt;hw_params&lt;/structfield&gt;. For example, releasing the</div><div class='del'>-          buffer via </div><div class='del'>-          &lt;function&gt;snd_pcm_lib_malloc_pages()&lt;/function&gt; is done by</div><div class='del'>-          calling the following: </div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_pcm_lib_free_pages(substream);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This function is always called before the close callback is called.</div><div class='del'>-          Also, the callback may be called multiple times, too.</div><div class='del'>-          Keep track whether the resource was already released. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-operators-prepare-callback"&gt;</div><div class='del'>-       &lt;title&gt;prepare callback&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_xxx_prepare(struct snd_pcm_substream *substream);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This callback is called when the pcm is</div><div class='del'>-        &lt;quote&gt;prepared&lt;/quote&gt;. You can set the format type, sample</div><div class='del'>-        rate, etc. here. The difference from</div><div class='del'>-        &lt;structfield&gt;hw_params&lt;/structfield&gt; is that the </div><div class='del'>-        &lt;structfield&gt;prepare&lt;/structfield&gt; callback will be called each</div><div class='del'>-        time </div><div class='del'>-        &lt;function&gt;snd_pcm_prepare()&lt;/function&gt; is called, i.e. when</div><div class='del'>-        recovering after underruns, etc. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	Note that this callback is now non-atomic.</div><div class='del'>-	You can use schedule-related functions safely in this callback.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          In this and the following callbacks, you can refer to the</div><div class='del'>-        values via the runtime record,</div><div class='del'>-        substream-&amp;gt;runtime.</div><div class='del'>-        For example, to get the current</div><div class='del'>-        rate, format or channels, access to</div><div class='del'>-        runtime-&amp;gt;rate,</div><div class='del'>-        runtime-&amp;gt;format or</div><div class='del'>-        runtime-&amp;gt;channels, respectively. </div><div class='del'>-        The physical address of the allocated buffer is set to</div><div class='del'>-	runtime-&amp;gt;dma_area.  The buffer and period sizes are</div><div class='del'>-	in runtime-&amp;gt;buffer_size and runtime-&amp;gt;period_size,</div><div class='del'>-	respectively.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Be careful that this callback will be called many times at</div><div class='del'>-        each setup, too. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-operators-trigger-callback"&gt;</div><div class='del'>-        &lt;title&gt;trigger callback&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_xxx_trigger(struct snd_pcm_substream *substream, int cmd);</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          This is called when the pcm is started, stopped or paused.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Which action is specified in the second argument,</div><div class='del'>-          &lt;constant&gt;SNDRV_PCM_TRIGGER_XXX&lt;/constant&gt; in</div><div class='del'>-          &lt;filename&gt;&amp;lt;sound/pcm.h&amp;gt;&lt;/filename&gt;. At least,</div><div class='del'>-          the &lt;constant&gt;START&lt;/constant&gt; and &lt;constant&gt;STOP&lt;/constant&gt;</div><div class='del'>-          commands must be defined in this callback. </div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  switch (cmd) {</div><div class='del'>-  case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-          /* do something to start the PCM engine */</div><div class='del'>-          break;</div><div class='del'>-  case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-          /* do something to stop the PCM engine */</div><div class='del'>-          break;</div><div class='del'>-  default:</div><div class='del'>-          return -EINVAL;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          When the pcm supports the pause operation (given in the info</div><div class='del'>-        field of the hardware table), the &lt;constant&gt;PAUSE_PUSH&lt;/constant&gt;</div><div class='del'>-        and &lt;constant&gt;PAUSE_RELEASE&lt;/constant&gt; commands must be</div><div class='del'>-        handled here, too. The former is the command to pause the pcm,</div><div class='del'>-        and the latter to restart the pcm again. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          When the pcm supports the suspend/resume operation,</div><div class='del'>-	regardless of full or partial suspend/resume support,</div><div class='del'>-        the &lt;constant&gt;SUSPEND&lt;/constant&gt; and &lt;constant&gt;RESUME&lt;/constant&gt;</div><div class='del'>-        commands must be handled, too.</div><div class='del'>-        These commands are issued when the power-management status is</div><div class='del'>-        changed.  Obviously, the &lt;constant&gt;SUSPEND&lt;/constant&gt; and</div><div class='del'>-        &lt;constant&gt;RESUME&lt;/constant&gt; commands</div><div class='del'>-        suspend and resume the pcm substream, and usually, they</div><div class='del'>-        are identical to the &lt;constant&gt;STOP&lt;/constant&gt; and</div><div class='del'>-        &lt;constant&gt;START&lt;/constant&gt; commands, respectively.</div><div class='del'>-	  See the &lt;link linkend="power-management"&gt;&lt;citetitle&gt;</div><div class='del'>-	Power Management&lt;/citetitle&gt;&lt;/link&gt; section for details.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          As mentioned, this callback is atomic as default unless</div><div class='del'>-	  &lt;structfield&gt;nonatomic&lt;/structfield&gt; flag set, and</div><div class='del'>-	  you cannot call functions which may sleep.</div><div class='del'>-	  The trigger callback should be as minimal as possible,</div><div class='del'>-	  just really triggering the DMA.  The other stuff should be</div><div class='del'>-	  initialized hw_params and prepare callbacks properly</div><div class='del'>-	  beforehand.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-operators-pointer-callback"&gt;</div><div class='del'>-        &lt;title&gt;pointer callback&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static snd_pcm_uframes_t snd_xxx_pointer(struct snd_pcm_substream *substream)</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-          This callback is called when the PCM middle layer inquires</div><div class='del'>-        the current hardware position on the buffer. The position must</div><div class='del'>-        be returned in frames,</div><div class='del'>-        ranging from 0 to buffer_size - 1.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This is called usually from the buffer-update routine in the</div><div class='del'>-        pcm middle layer, which is invoked when</div><div class='del'>-        &lt;function&gt;snd_pcm_period_elapsed()&lt;/function&gt; is called in the</div><div class='del'>-        interrupt routine. Then the pcm middle layer updates the</div><div class='del'>-        position and calculates the available space, and wakes up the</div><div class='del'>-        sleeping poll threads, etc. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This callback is also atomic as default.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-operators-copy-silence"&gt;</div><div class='del'>-        &lt;title&gt;copy and silence callbacks&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          These callbacks are not mandatory, and can be omitted in</div><div class='del'>-        most cases. These callbacks are used when the hardware buffer</div><div class='del'>-        cannot be in the normal memory space. Some chips have their</div><div class='del'>-        own buffer on the hardware which is not mappable. In such a</div><div class='del'>-        case, you have to transfer the data manually from the memory</div><div class='del'>-        buffer to the hardware buffer. Or, if the buffer is</div><div class='del'>-        non-contiguous on both physical and virtual memory spaces,</div><div class='del'>-        these callbacks must be defined, too. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          If these two callbacks are defined, copy and set-silence</div><div class='del'>-        operations are done by them. The detailed will be described in</div><div class='del'>-        the later section &lt;link</div><div class='del'>-        linkend="buffer-and-memory"&gt;&lt;citetitle&gt;Buffer and Memory</div><div class='del'>-        Management&lt;/citetitle&gt;&lt;/link&gt;. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-operators-ack"&gt;</div><div class='del'>-        &lt;title&gt;ack callback&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This callback is also not mandatory. This callback is called</div><div class='del'>-        when the appl_ptr is updated in read or write operations.</div><div class='del'>-        Some drivers like emu10k1-fx and cs46xx need to track the</div><div class='del'>-	current appl_ptr for the internal buffer, and this callback</div><div class='del'>-	is useful only for such a purpose.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  This callback is atomic as default.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-operators-page-callback"&gt;</div><div class='del'>-        &lt;title&gt;page callback&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This callback is optional too. This callback is used</div><div class='del'>-        mainly for non-contiguous buffers. The mmap calls this</div><div class='del'>-        callback to get the page address. Some examples will be</div><div class='del'>-        explained in the later section &lt;link</div><div class='del'>-        linkend="buffer-and-memory"&gt;&lt;citetitle&gt;Buffer and Memory</div><div class='del'>-        Management&lt;/citetitle&gt;&lt;/link&gt;, too. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pcm-interface-interrupt-handler"&gt;</div><div class='del'>-      &lt;title&gt;Interrupt Handler&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The rest of pcm stuff is the PCM interrupt handler. The</div><div class='del'>-      role of PCM interrupt handler in the sound driver is to update</div><div class='del'>-      the buffer position and to tell the PCM middle layer when the</div><div class='del'>-      buffer position goes across the prescribed period size. To</div><div class='del'>-      inform this, call the &lt;function&gt;snd_pcm_period_elapsed()&lt;/function&gt;</div><div class='del'>-      function. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        There are several types of sound chips to generate the interrupts.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-interrupt-handler-boundary"&gt;</div><div class='del'>-        &lt;title&gt;Interrupts at the period (fragment) boundary&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This is the most frequently found type:  the hardware</div><div class='del'>-        generates an interrupt at each period boundary.</div><div class='del'>-	In this case, you can call</div><div class='del'>-        &lt;function&gt;snd_pcm_period_elapsed()&lt;/function&gt; at each </div><div class='del'>-        interrupt. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;function&gt;snd_pcm_period_elapsed()&lt;/function&gt; takes the</div><div class='del'>-        substream pointer as its argument. Thus, you need to keep the</div><div class='del'>-        substream pointer accessible from the chip instance. For</div><div class='del'>-        example, define substream field in the chip record to hold the</div><div class='del'>-        current running substream pointer, and set the pointer value</div><div class='del'>-        at open callback (and reset at close callback). </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          If you acquire a spinlock in the interrupt handler, and the</div><div class='del'>-        lock is used in other pcm callbacks, too, then you have to</div><div class='del'>-        release the lock before calling</div><div class='del'>-        &lt;function&gt;snd_pcm_period_elapsed()&lt;/function&gt;, because</div><div class='del'>-        &lt;function&gt;snd_pcm_period_elapsed()&lt;/function&gt; calls other pcm</div><div class='del'>-        callbacks inside. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Typical code would be like:</div><div class='del'>-</div><div class='del'>-          &lt;example&gt;</div><div class='del'>-	    &lt;title&gt;Interrupt Handler Case #1&lt;/title&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = dev_id;</div><div class='del'>-          spin_lock(&amp;chip-&gt;lock);</div><div class='del'>-          ....</div><div class='del'>-          if (pcm_irq_invoked(chip)) {</div><div class='del'>-                  /* call updater, unlock before it */</div><div class='del'>-                  spin_unlock(&amp;chip-&gt;lock);</div><div class='del'>-                  snd_pcm_period_elapsed(chip-&gt;substream);</div><div class='del'>-                  spin_lock(&amp;chip-&gt;lock);</div><div class='del'>-                  /* acknowledge the interrupt if necessary */</div><div class='del'>-          }</div><div class='del'>-          ....</div><div class='del'>-          spin_unlock(&amp;chip-&gt;lock);</div><div class='del'>-          return IRQ_HANDLED;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/example&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-interrupt-handler-timer"&gt;</div><div class='del'>-        &lt;title&gt;High frequency timer interrupts&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	This happens when the hardware doesn't generate interrupts</div><div class='del'>-        at the period boundary but issues timer interrupts at a fixed</div><div class='del'>-        timer rate (e.g. es1968 or ymfpci drivers). </div><div class='del'>-        In this case, you need to check the current hardware</div><div class='del'>-        position and accumulate the processed sample length at each</div><div class='del'>-        interrupt.  When the accumulated size exceeds the period</div><div class='del'>-        size, call </div><div class='del'>-        &lt;function&gt;snd_pcm_period_elapsed()&lt;/function&gt; and reset the</div><div class='del'>-        accumulator. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Typical code would be like the following.</div><div class='del'>-</div><div class='del'>-          &lt;example&gt;</div><div class='del'>-	    &lt;title&gt;Interrupt Handler Case #2&lt;/title&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = dev_id;</div><div class='del'>-          spin_lock(&amp;chip-&gt;lock);</div><div class='del'>-          ....</div><div class='del'>-          if (pcm_irq_invoked(chip)) {</div><div class='del'>-                  unsigned int last_ptr, size;</div><div class='del'>-                  /* get the current hardware pointer (in frames) */</div><div class='del'>-                  last_ptr = get_hw_ptr(chip);</div><div class='del'>-                  /* calculate the processed frames since the</div><div class='del'>-                   * last update</div><div class='del'>-                   */</div><div class='del'>-                  if (last_ptr &lt; chip-&gt;last_ptr)</div><div class='del'>-                          size = runtime-&gt;buffer_size + last_ptr </div><div class='del'>-                                   - chip-&gt;last_ptr; </div><div class='del'>-                  else</div><div class='del'>-                          size = last_ptr - chip-&gt;last_ptr;</div><div class='del'>-                  /* remember the last updated point */</div><div class='del'>-                  chip-&gt;last_ptr = last_ptr;</div><div class='del'>-                  /* accumulate the size */</div><div class='del'>-                  chip-&gt;size += size;</div><div class='del'>-                  /* over the period boundary? */</div><div class='del'>-                  if (chip-&gt;size &gt;= runtime-&gt;period_size) {</div><div class='del'>-                          /* reset the accumulator */</div><div class='del'>-                          chip-&gt;size %= runtime-&gt;period_size;</div><div class='del'>-                          /* call updater */</div><div class='del'>-                          spin_unlock(&amp;chip-&gt;lock);</div><div class='del'>-                          snd_pcm_period_elapsed(substream);</div><div class='del'>-                          spin_lock(&amp;chip-&gt;lock);</div><div class='del'>-                  }</div><div class='del'>-                  /* acknowledge the interrupt if necessary */</div><div class='del'>-          }</div><div class='del'>-          ....</div><div class='del'>-          spin_unlock(&amp;chip-&gt;lock);</div><div class='del'>-          return IRQ_HANDLED;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/example&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="pcm-interface-interrupt-handler-both"&gt;</div><div class='del'>-        &lt;title&gt;On calling &lt;function&gt;snd_pcm_period_elapsed()&lt;/function&gt;&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          In both cases, even if more than one period are elapsed, you</div><div class='del'>-        don't have to call</div><div class='del'>-        &lt;function&gt;snd_pcm_period_elapsed()&lt;/function&gt; many times. Call</div><div class='del'>-        only once. And the pcm layer will check the current hardware</div><div class='del'>-        pointer and update to the latest status. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="pcm-interface-atomicity"&gt;</div><div class='del'>-      &lt;title&gt;Atomicity&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      One of the most important (and thus difficult to debug) problems</div><div class='del'>-      in kernel programming are race conditions.</div><div class='del'>-      In the Linux kernel, they are usually avoided via spin-locks, mutexes</div><div class='del'>-      or semaphores.  In general, if a race condition can happen</div><div class='del'>-      in an interrupt handler, it has to be managed atomically, and you</div><div class='del'>-      have to use a spinlock to protect the critical session. If the</div><div class='del'>-      critical section is not in interrupt handler code and</div><div class='del'>-      if taking a relatively long time to execute is acceptable, you</div><div class='del'>-      should use mutexes or semaphores instead.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      As already seen, some pcm callbacks are atomic and some are</div><div class='del'>-      not.  For example, the &lt;parameter&gt;hw_params&lt;/parameter&gt; callback is</div><div class='del'>-      non-atomic, while &lt;parameter&gt;trigger&lt;/parameter&gt; callback is</div><div class='del'>-      atomic.  This means, the latter is called already in a spinlock</div><div class='del'>-      held by the PCM middle layer. Please take this atomicity into</div><div class='del'>-      account when you choose a locking scheme in the callbacks.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      In the atomic callbacks, you cannot use functions which may call</div><div class='del'>-      &lt;function&gt;schedule&lt;/function&gt; or go to</div><div class='del'>-      &lt;function&gt;sleep&lt;/function&gt;.  Semaphores and mutexes can sleep,</div><div class='del'>-      and hence they cannot be used inside the atomic callbacks</div><div class='del'>-      (e.g. &lt;parameter&gt;trigger&lt;/parameter&gt; callback).</div><div class='del'>-      To implement some delay in such a callback, please use</div><div class='del'>-      &lt;function&gt;udelay()&lt;/function&gt; or &lt;function&gt;mdelay()&lt;/function&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      All three atomic callbacks (trigger, pointer, and ack) are</div><div class='del'>-      called with local interrupts disabled.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The recent changes in PCM core code, however, allow all PCM</div><div class='del'>-      operations to be non-atomic.  This assumes that the all caller</div><div class='del'>-      sides are in non-atomic contexts.  For example, the function</div><div class='del'>-      &lt;function&gt;snd_pcm_period_elapsed()&lt;/function&gt; is called</div><div class='del'>-      typically from the interrupt handler.  But, if you set up the</div><div class='del'>-      driver to use a threaded interrupt handler, this call can be in</div><div class='del'>-      non-atomic context, too.  In such a case, you can set</div><div class='del'>-      &lt;structfield&gt;nonatomic&lt;/structfield&gt; filed of</div><div class='del'>-      &lt;structname&gt;snd_pcm&lt;/structname&gt; object after creating it.</div><div class='del'>-      When this flag is set, mutex and rwsem are used internally in</div><div class='del'>-      the PCM core instead of spin and rwlocks, so that you can call</div><div class='del'>-      all PCM functions safely in a non-atomic context.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-    &lt;section id="pcm-interface-constraints"&gt;</div><div class='del'>-      &lt;title&gt;Constraints&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        If your chip supports unconventional sample rates, or only the</div><div class='del'>-      limited samples, you need to set a constraint for the</div><div class='del'>-      condition. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        For example, in order to restrict the sample rates in the some</div><div class='del'>-        supported values, use</div><div class='del'>-	&lt;function&gt;snd_pcm_hw_constraint_list()&lt;/function&gt;.</div><div class='del'>-	You need to call this function in the open callback.</div><div class='del'>-</div><div class='del'>-        &lt;example&gt;</div><div class='del'>-	  &lt;title&gt;Example of Hardware Constraints&lt;/title&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static unsigned int rates[] =</div><div class='del'>-          {4000, 10000, 22050, 44100};</div><div class='del'>-  static struct snd_pcm_hw_constraint_list constraints_rates = {</div><div class='del'>-          .count = ARRAY_SIZE(rates),</div><div class='del'>-          .list = rates,</div><div class='del'>-          .mask = 0,</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  static int snd_mychip_pcm_open(struct snd_pcm_substream *substream)</div><div class='del'>-  {</div><div class='del'>-          int err;</div><div class='del'>-          ....</div><div class='del'>-          err = snd_pcm_hw_constraint_list(substream-&gt;runtime, 0,</div><div class='del'>-                                           SNDRV_PCM_HW_PARAM_RATE,</div><div class='del'>-                                           &amp;constraints_rates);</div><div class='del'>-          if (err &lt; 0)</div><div class='del'>-                  return err;</div><div class='del'>-          ....</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/example&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        There are many different constraints.</div><div class='del'>-        Look at &lt;filename&gt;sound/pcm.h&lt;/filename&gt; for a complete list.</div><div class='del'>-        You can even define your own constraint rules.</div><div class='del'>-        For example, let's suppose my_chip can manage a substream of 1 channel</div><div class='del'>-        if and only if the format is S16_LE, otherwise it supports any format</div><div class='del'>-        specified in the &lt;structname&gt;snd_pcm_hardware&lt;/structname&gt; structure (or in any</div><div class='del'>-        other constraint_list). You can build a rule like this:</div><div class='del'>-</div><div class='del'>-        &lt;example&gt;</div><div class='del'>-	  &lt;title&gt;Example of Hardware Constraints for Channels&lt;/title&gt;</div><div class='del'>-	  &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int hw_rule_channels_by_format(struct snd_pcm_hw_params *params,</div><div class='del'>-                                        struct snd_pcm_hw_rule *rule)</div><div class='del'>-  {</div><div class='del'>-          struct snd_interval *c = hw_param_interval(params,</div><div class='del'>-                        SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='del'>-          struct snd_mask *f = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='del'>-          struct snd_interval ch;</div><div class='del'>-</div><div class='del'>-          snd_interval_any(&amp;ch);</div><div class='del'>-          if (f-&gt;bits[0] == SNDRV_PCM_FMTBIT_S16_LE) {</div><div class='del'>-                  ch.min = ch.max = 1;</div><div class='del'>-                  ch.integer = 1;</div><div class='del'>-                  return snd_interval_refine(c, &amp;ch);</div><div class='del'>-          }</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/example&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>- </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Then you need to call this function to add your rule:</div><div class='del'>-</div><div class='del'>-       &lt;informalexample&gt;</div><div class='del'>-	 &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_pcm_hw_rule_add(substream-&gt;runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='del'>-                      hw_rule_channels_by_format, NULL,</div><div class='del'>-                      SNDRV_PCM_HW_PARAM_FORMAT, -1);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The rule function is called when an application sets the PCM</div><div class='del'>-	format, and it refines the number of channels accordingly.</div><div class='del'>-        But an application may set the number of channels before</div><div class='del'>-	setting the format. Thus you also need to define the inverse rule:</div><div class='del'>-</div><div class='del'>-       &lt;example&gt;</div><div class='del'>-	 &lt;title&gt;Example of Hardware Constraints for Formats&lt;/title&gt;</div><div class='del'>-	 &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int hw_rule_format_by_channels(struct snd_pcm_hw_params *params,</div><div class='del'>-                                        struct snd_pcm_hw_rule *rule)</div><div class='del'>-  {</div><div class='del'>-          struct snd_interval *c = hw_param_interval(params,</div><div class='del'>-                SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='del'>-          struct snd_mask *f = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='del'>-          struct snd_mask fmt;</div><div class='del'>-</div><div class='del'>-          snd_mask_any(&amp;fmt);    /* Init the struct */</div><div class='del'>-          if (c-&gt;min &lt; 2) {</div><div class='del'>-                  fmt.bits[0] &amp;= SNDRV_PCM_FMTBIT_S16_LE;</div><div class='del'>-                  return snd_mask_refine(f, &amp;fmt);</div><div class='del'>-          }</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/example&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      ...and in the open callback:</div><div class='del'>-       &lt;informalexample&gt;</div><div class='del'>-	 &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_pcm_hw_rule_add(substream-&gt;runtime, 0, SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='del'>-                      hw_rule_format_by_channels, NULL,</div><div class='del'>-                      SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        I won't give more details here, rather I</div><div class='del'>-        would like to say, &lt;quote&gt;Luke, use the source.&lt;/quote&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Control Interface  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="control-interface"&gt;</div><div class='del'>-    &lt;title&gt;Control Interface&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="control-interface-general"&gt;</div><div class='del'>-      &lt;title&gt;General&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The control interface is used widely for many switches,</div><div class='del'>-      sliders, etc. which are accessed from user-space. Its most</div><div class='del'>-      important use is the mixer interface. In other words, since ALSA</div><div class='del'>-      0.9.x, all the mixer stuff is implemented on the control kernel API.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        ALSA has a well-defined AC97 control module. If your chip</div><div class='del'>-      supports only the AC97 and nothing else, you can skip this</div><div class='del'>-      section. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The control API is defined in</div><div class='del'>-      &lt;filename&gt;&amp;lt;sound/control.h&amp;gt;&lt;/filename&gt;.</div><div class='del'>-      Include this file if you want to add your own controls.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="control-interface-definition"&gt;</div><div class='del'>-      &lt;title&gt;Definition of Controls&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        To create a new control, you need to define the</div><div class='del'>-	following three</div><div class='del'>-      callbacks: &lt;structfield&gt;info&lt;/structfield&gt;,</div><div class='del'>-      &lt;structfield&gt;get&lt;/structfield&gt; and</div><div class='del'>-      &lt;structfield&gt;put&lt;/structfield&gt;. Then, define a</div><div class='del'>-      struct &lt;structname&gt;snd_kcontrol_new&lt;/structname&gt; record, such as: </div><div class='del'>-</div><div class='del'>-        &lt;example&gt;</div><div class='del'>-	  &lt;title&gt;Definition of a Control&lt;/title&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static struct snd_kcontrol_new my_control = {</div><div class='del'>-          .iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-          .name = "PCM Playback Switch",</div><div class='del'>-          .index = 0,</div><div class='del'>-          .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='del'>-          .private_value = 0xffff,</div><div class='del'>-          .info = my_control_info,</div><div class='del'>-          .get = my_control_get,</div><div class='del'>-          .put = my_control_put</div><div class='del'>-  };</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/example&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;structfield&gt;iface&lt;/structfield&gt; field specifies the control</div><div class='del'>-      type, &lt;constant&gt;SNDRV_CTL_ELEM_IFACE_XXX&lt;/constant&gt;, which</div><div class='del'>-      is usually &lt;constant&gt;MIXER&lt;/constant&gt;.</div><div class='del'>-      Use &lt;constant&gt;CARD&lt;/constant&gt; for global controls that are not</div><div class='del'>-      logically part of the mixer.</div><div class='del'>-      If the control is closely associated with some specific device on</div><div class='del'>-      the sound card, use &lt;constant&gt;HWDEP&lt;/constant&gt;,</div><div class='del'>-      &lt;constant&gt;PCM&lt;/constant&gt;, &lt;constant&gt;RAWMIDI&lt;/constant&gt;,</div><div class='del'>-      &lt;constant&gt;TIMER&lt;/constant&gt;, or &lt;constant&gt;SEQUENCER&lt;/constant&gt;, and</div><div class='del'>-      specify the device number with the</div><div class='del'>-      &lt;structfield&gt;device&lt;/structfield&gt; and</div><div class='del'>-      &lt;structfield&gt;subdevice&lt;/structfield&gt; fields.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;structfield&gt;name&lt;/structfield&gt; is the name identifier</div><div class='del'>-      string. Since ALSA 0.9.x, the control name is very important,</div><div class='del'>-      because its role is classified from its name. There are</div><div class='del'>-      pre-defined standard control names. The details are described in</div><div class='del'>-      the &lt;link linkend="control-interface-control-names"&gt;&lt;citetitle&gt;</div><div class='del'>-      Control Names&lt;/citetitle&gt;&lt;/link&gt; subsection.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;structfield&gt;index&lt;/structfield&gt; field holds the index number</div><div class='del'>-      of this control. If there are several different controls with</div><div class='del'>-      the same name, they can be distinguished by the index</div><div class='del'>-      number. This is the case when </div><div class='del'>-      several codecs exist on the card. If the index is zero, you can</div><div class='del'>-      omit the definition above. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;structfield&gt;access&lt;/structfield&gt; field contains the access</div><div class='del'>-      type of this control. Give the combination of bit masks,</div><div class='del'>-      &lt;constant&gt;SNDRV_CTL_ELEM_ACCESS_XXX&lt;/constant&gt;, there.</div><div class='del'>-      The details will be explained in</div><div class='del'>-      the &lt;link linkend="control-interface-access-flags"&gt;&lt;citetitle&gt;</div><div class='del'>-      Access Flags&lt;/citetitle&gt;&lt;/link&gt; subsection.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;structfield&gt;private_value&lt;/structfield&gt; field contains</div><div class='del'>-      an arbitrary long integer value for this record. When using</div><div class='del'>-      the generic &lt;structfield&gt;info&lt;/structfield&gt;,</div><div class='del'>-      &lt;structfield&gt;get&lt;/structfield&gt; and</div><div class='del'>-      &lt;structfield&gt;put&lt;/structfield&gt; callbacks, you can pass a value </div><div class='del'>-      through this field. If several small numbers are necessary, you can</div><div class='del'>-      combine them in bitwise. Or, it's possible to give a pointer</div><div class='del'>-      (casted to unsigned long) of some record to this field, too. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The &lt;structfield&gt;tlv&lt;/structfield&gt; field can be used to provide</div><div class='del'>-      metadata about the control; see the</div><div class='del'>-      &lt;link linkend="control-interface-tlv"&gt;</div><div class='del'>-      &lt;citetitle&gt;Metadata&lt;/citetitle&gt;&lt;/link&gt; subsection.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The other three are</div><div class='del'>-	&lt;link linkend="control-interface-callbacks"&gt;&lt;citetitle&gt;</div><div class='del'>-	callback functions&lt;/citetitle&gt;&lt;/link&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="control-interface-control-names"&gt;</div><div class='del'>-      &lt;title&gt;Control Names&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        There are some standards to define the control names. A</div><div class='del'>-      control is usually defined from the three parts as</div><div class='del'>-      &lt;quote&gt;SOURCE DIRECTION FUNCTION&lt;/quote&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The first, &lt;constant&gt;SOURCE&lt;/constant&gt;, specifies the source</div><div class='del'>-      of the control, and is a string such as &lt;quote&gt;Master&lt;/quote&gt;,</div><div class='del'>-      &lt;quote&gt;PCM&lt;/quote&gt;, &lt;quote&gt;CD&lt;/quote&gt; and</div><div class='del'>-      &lt;quote&gt;Line&lt;/quote&gt;. There are many pre-defined sources. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The second, &lt;constant&gt;DIRECTION&lt;/constant&gt;, is one of the</div><div class='del'>-      following strings according to the direction of the control:</div><div class='del'>-      &lt;quote&gt;Playback&lt;/quote&gt;, &lt;quote&gt;Capture&lt;/quote&gt;, &lt;quote&gt;Bypass</div><div class='del'>-      Playback&lt;/quote&gt; and &lt;quote&gt;Bypass Capture&lt;/quote&gt;. Or, it can</div><div class='del'>-      be omitted, meaning both playback and capture directions. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The third, &lt;constant&gt;FUNCTION&lt;/constant&gt;, is one of the</div><div class='del'>-      following strings according to the function of the control:</div><div class='del'>-      &lt;quote&gt;Switch&lt;/quote&gt;, &lt;quote&gt;Volume&lt;/quote&gt; and</div><div class='del'>-      &lt;quote&gt;Route&lt;/quote&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The example of control names are, thus, &lt;quote&gt;Master Capture</div><div class='del'>-      Switch&lt;/quote&gt; or &lt;quote&gt;PCM Playback Volume&lt;/quote&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        There are some exceptions:</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="control-interface-control-names-global"&gt;</div><div class='del'>-        &lt;title&gt;Global capture and playback&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          &lt;quote&gt;Capture Source&lt;/quote&gt;, &lt;quote&gt;Capture Switch&lt;/quote&gt;</div><div class='del'>-        and &lt;quote&gt;Capture Volume&lt;/quote&gt; are used for the global</div><div class='del'>-        capture (input) source, switch and volume. Similarly,</div><div class='del'>-        &lt;quote&gt;Playback Switch&lt;/quote&gt; and &lt;quote&gt;Playback</div><div class='del'>-        Volume&lt;/quote&gt; are used for the global output gain switch and</div><div class='del'>-        volume. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="control-interface-control-names-tone"&gt;</div><div class='del'>-        &lt;title&gt;Tone-controls&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          tone-control switch and volumes are specified like</div><div class='del'>-        &lt;quote&gt;Tone Control - XXX&lt;/quote&gt;, e.g. &lt;quote&gt;Tone Control -</div><div class='del'>-        Switch&lt;/quote&gt;, &lt;quote&gt;Tone Control - Bass&lt;/quote&gt;,</div><div class='del'>-        &lt;quote&gt;Tone Control - Center&lt;/quote&gt;.  </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="control-interface-control-names-3d"&gt;</div><div class='del'>-        &lt;title&gt;3D controls&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          3D-control switches and volumes are specified like &lt;quote&gt;3D</div><div class='del'>-        Control - XXX&lt;/quote&gt;, e.g. &lt;quote&gt;3D Control -</div><div class='del'>-        Switch&lt;/quote&gt;, &lt;quote&gt;3D Control - Center&lt;/quote&gt;, &lt;quote&gt;3D</div><div class='del'>-        Control - Space&lt;/quote&gt;. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="control-interface-control-names-mic"&gt;</div><div class='del'>-        &lt;title&gt;Mic boost&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Mic-boost switch is set as &lt;quote&gt;Mic Boost&lt;/quote&gt; or</div><div class='del'>-        &lt;quote&gt;Mic Boost (6dB)&lt;/quote&gt;. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          More precise information can be found in</div><div class='del'>-        &lt;filename&gt;Documentation/sound/alsa/ControlNames.txt&lt;/filename&gt;.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="control-interface-access-flags"&gt;</div><div class='del'>-      &lt;title&gt;Access Flags&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The access flag is the bitmask which specifies the access type</div><div class='del'>-      of the given control.  The default access type is</div><div class='del'>-      &lt;constant&gt;SNDRV_CTL_ELEM_ACCESS_READWRITE&lt;/constant&gt;, </div><div class='del'>-      which means both read and write are allowed to this control.</div><div class='del'>-      When the access flag is omitted (i.e. = 0), it is</div><div class='del'>-      considered as &lt;constant&gt;READWRITE&lt;/constant&gt; access as default. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      When the control is read-only, pass</div><div class='del'>-      &lt;constant&gt;SNDRV_CTL_ELEM_ACCESS_READ&lt;/constant&gt; instead.</div><div class='del'>-      In this case, you don't have to define</div><div class='del'>-      the &lt;structfield&gt;put&lt;/structfield&gt; callback.</div><div class='del'>-      Similarly, when the control is write-only (although it's a rare</div><div class='del'>-      case), you can use the &lt;constant&gt;WRITE&lt;/constant&gt; flag instead, and</div><div class='del'>-      you don't need the &lt;structfield&gt;get&lt;/structfield&gt; callback.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      If the control value changes frequently (e.g. the VU meter),</div><div class='del'>-      &lt;constant&gt;VOLATILE&lt;/constant&gt; flag should be given.  This means</div><div class='del'>-      that the control may be changed without</div><div class='del'>-      &lt;link linkend="control-interface-change-notification"&gt;&lt;citetitle&gt;</div><div class='del'>-      notification&lt;/citetitle&gt;&lt;/link&gt;. Applications should poll such</div><div class='del'>-      a control constantly.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      When the control is inactive, set</div><div class='del'>-      the &lt;constant&gt;INACTIVE&lt;/constant&gt; flag, too.</div><div class='del'>-      There are &lt;constant&gt;LOCK&lt;/constant&gt; and</div><div class='del'>-      &lt;constant&gt;OWNER&lt;/constant&gt; flags to change the write</div><div class='del'>-      permissions.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="control-interface-callbacks"&gt;</div><div class='del'>-      &lt;title&gt;Callbacks&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="control-interface-callbacks-info"&gt;</div><div class='del'>-        &lt;title&gt;info callback&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          The &lt;structfield&gt;info&lt;/structfield&gt; callback is used to get</div><div class='del'>-        detailed information on this control. This must store the</div><div class='del'>-        values of the given struct &lt;structname&gt;snd_ctl_elem_info&lt;/structname&gt;</div><div class='del'>-        object. For example, for a boolean control with a single</div><div class='del'>-        element: </div><div class='del'>-</div><div class='del'>-          &lt;example&gt;</div><div class='del'>-	    &lt;title&gt;Example of info callback&lt;/title&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_myctl_mono_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-                          struct snd_ctl_elem_info *uinfo)</div><div class='del'>-  {</div><div class='del'>-          uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;</div><div class='del'>-          uinfo-&gt;count = 1;</div><div class='del'>-          uinfo-&gt;value.integer.min = 0;</div><div class='del'>-          uinfo-&gt;value.integer.max = 1;</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/example&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          The &lt;structfield&gt;type&lt;/structfield&gt; field specifies the type</div><div class='del'>-        of the control. There are &lt;constant&gt;BOOLEAN&lt;/constant&gt;,</div><div class='del'>-        &lt;constant&gt;INTEGER&lt;/constant&gt;, &lt;constant&gt;ENUMERATED&lt;/constant&gt;,</div><div class='del'>-        &lt;constant&gt;BYTES&lt;/constant&gt;, &lt;constant&gt;IEC958&lt;/constant&gt; and</div><div class='del'>-        &lt;constant&gt;INTEGER64&lt;/constant&gt;. The</div><div class='del'>-        &lt;structfield&gt;count&lt;/structfield&gt; field specifies the </div><div class='del'>-        number of elements in this control. For example, a stereo</div><div class='del'>-        volume would have count = 2. The</div><div class='del'>-        &lt;structfield&gt;value&lt;/structfield&gt; field is a union, and </div><div class='del'>-        the values stored are depending on the type. The boolean and</div><div class='del'>-        integer types are identical. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          The enumerated type is a bit different from others.  You'll</div><div class='del'>-          need to set the string for the currently given item index. </div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_myctl_enum_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-                          struct snd_ctl_elem_info *uinfo)</div><div class='del'>-  {</div><div class='del'>-          static char *texts[4] = {</div><div class='del'>-                  "First", "Second", "Third", "Fourth"</div><div class='del'>-          };</div><div class='del'>-          uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-          uinfo-&gt;count = 1;</div><div class='del'>-          uinfo-&gt;value.enumerated.items = 4;</div><div class='del'>-          if (uinfo-&gt;value.enumerated.item &gt; 3)</div><div class='del'>-                  uinfo-&gt;value.enumerated.item = 3;</div><div class='del'>-          strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-                 texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  The above callback can be simplified with a helper function,</div><div class='del'>-	  &lt;function&gt;snd_ctl_enum_info&lt;/function&gt;.  The final code</div><div class='del'>-	  looks like below.</div><div class='del'>-	  (You can pass ARRAY_SIZE(texts) instead of 4 in the third</div><div class='del'>-	   argument; it's a matter of taste.)</div><div class='del'>-</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_myctl_enum_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-                          struct snd_ctl_elem_info *uinfo)</div><div class='del'>-  {</div><div class='del'>-          static char *texts[4] = {</div><div class='del'>-                  "First", "Second", "Third", "Fourth"</div><div class='del'>-          };</div><div class='del'>-          return snd_ctl_enum_info(uinfo, 1, 4, texts);</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  Some common info callbacks are available for your convenience:</div><div class='del'>-	&lt;function&gt;snd_ctl_boolean_mono_info()&lt;/function&gt; and</div><div class='del'>-	&lt;function&gt;snd_ctl_boolean_stereo_info()&lt;/function&gt;.</div><div class='del'>-	Obviously, the former is an info callback for a mono channel</div><div class='del'>-	boolean item, just like &lt;function&gt;snd_myctl_mono_info&lt;/function&gt;</div><div class='del'>-	above, and the latter is for a stereo channel boolean item.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="control-interface-callbacks-get"&gt;</div><div class='del'>-        &lt;title&gt;get callback&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This callback is used to read the current value of the</div><div class='del'>-        control and to return to user-space. </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          For example,</div><div class='del'>-</div><div class='del'>-          &lt;example&gt;</div><div class='del'>-	    &lt;title&gt;Example of get callback&lt;/title&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_myctl_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-                           struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-          ucontrol-&gt;value.integer.value[0] = get_some_value(chip);</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/example&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	The &lt;structfield&gt;value&lt;/structfield&gt; field depends on </div><div class='del'>-        the type of control as well as on the info callback.  For example,</div><div class='del'>-	the sb driver uses this field to store the register offset,</div><div class='del'>-        the bit-shift and the bit-mask.  The</div><div class='del'>-        &lt;structfield&gt;private_value&lt;/structfield&gt; field is set as follows:</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  .private_value = reg | (shift &lt;&lt; 16) | (mask &lt;&lt; 24)</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-	and is retrieved in callbacks like</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_sbmixer_get_single(struct snd_kcontrol *kcontrol,</div><div class='del'>-                                    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-  {</div><div class='del'>-          int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='del'>-          int shift = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-          int mask = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-          ....</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	In the &lt;structfield&gt;get&lt;/structfield&gt; callback,</div><div class='del'>-	you have to fill all the elements if the</div><div class='del'>-        control has more than one elements,</div><div class='del'>-        i.e. &lt;structfield&gt;count&lt;/structfield&gt; &amp;gt; 1.</div><div class='del'>-	In the example above, we filled only one element</div><div class='del'>-        (&lt;structfield&gt;value.integer.value[0]&lt;/structfield&gt;) since it's</div><div class='del'>-        assumed as &lt;structfield&gt;count&lt;/structfield&gt; = 1.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="control-interface-callbacks-put"&gt;</div><div class='del'>-        &lt;title&gt;put callback&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          This callback is used to write a value from user-space.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          For example,</div><div class='del'>-</div><div class='del'>-          &lt;example&gt;</div><div class='del'>-	    &lt;title&gt;Example of put callback&lt;/title&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_myctl_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-                           struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-          int changed = 0;</div><div class='del'>-          if (chip-&gt;current_value !=</div><div class='del'>-               ucontrol-&gt;value.integer.value[0]) {</div><div class='del'>-                  change_current_value(chip,</div><div class='del'>-                              ucontrol-&gt;value.integer.value[0]);</div><div class='del'>-                  changed = 1;</div><div class='del'>-          }</div><div class='del'>-          return changed;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/example&gt;</div><div class='del'>-</div><div class='del'>-          As seen above, you have to return 1 if the value is</div><div class='del'>-        changed. If the value is not changed, return 0 instead. </div><div class='del'>-	If any fatal error happens, return a negative error code as</div><div class='del'>-        usual.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	As in the &lt;structfield&gt;get&lt;/structfield&gt; callback,</div><div class='del'>-	when the control has more than one elements,</div><div class='del'>-	all elements must be evaluated in this callback, too.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="control-interface-callbacks-all"&gt;</div><div class='del'>-        &lt;title&gt;Callbacks are not atomic&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          All these three callbacks are basically not atomic.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="control-interface-constructor"&gt;</div><div class='del'>-      &lt;title&gt;Constructor&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        When everything is ready, finally we can create a new</div><div class='del'>-      control. To create a control, there are two functions to be</div><div class='del'>-      called, &lt;function&gt;snd_ctl_new1()&lt;/function&gt; and</div><div class='del'>-      &lt;function&gt;snd_ctl_add()&lt;/function&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In the simplest way, you can do like this:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  err = snd_ctl_add(card, snd_ctl_new1(&amp;my_control, chip));</div><div class='del'>-  if (err &lt; 0)</div><div class='del'>-          return err;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        where &lt;parameter&gt;my_control&lt;/parameter&gt; is the</div><div class='del'>-      struct &lt;structname&gt;snd_kcontrol_new&lt;/structname&gt; object defined above, and chip</div><div class='del'>-      is the object pointer to be passed to</div><div class='del'>-      kcontrol-&amp;gt;private_data </div><div class='del'>-      which can be referred to in callbacks. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;function&gt;snd_ctl_new1()&lt;/function&gt; allocates a new</div><div class='del'>-      &lt;structname&gt;snd_kcontrol&lt;/structname&gt; instance,</div><div class='del'>-      and &lt;function&gt;snd_ctl_add&lt;/function&gt; assigns the given</div><div class='del'>-      control component to the card. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="control-interface-change-notification"&gt;</div><div class='del'>-      &lt;title&gt;Change Notification&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        If you need to change and update a control in the interrupt</div><div class='del'>-      routine, you can call &lt;function&gt;snd_ctl_notify()&lt;/function&gt;. For</div><div class='del'>-      example, </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, id_pointer);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        This function takes the card pointer, the event-mask, and the</div><div class='del'>-      control id pointer for the notification. The event-mask</div><div class='del'>-      specifies the types of notification, for example, in the above</div><div class='del'>-      example, the change of control values is notified.</div><div class='del'>-      The id pointer is the pointer of struct &lt;structname&gt;snd_ctl_elem_id&lt;/structname&gt;</div><div class='del'>-      to be notified.</div><div class='del'>-      You can find some examples in &lt;filename&gt;es1938.c&lt;/filename&gt; or</div><div class='del'>-      &lt;filename&gt;es1968.c&lt;/filename&gt; for hardware volume interrupts. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="control-interface-tlv"&gt;</div><div class='del'>-      &lt;title&gt;Metadata&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      To provide information about the dB values of a mixer control, use</div><div class='del'>-      on of the &lt;constant&gt;DECLARE_TLV_xxx&lt;/constant&gt; macros from</div><div class='del'>-      &lt;filename&gt;&amp;lt;sound/tlv.h&amp;gt;&lt;/filename&gt; to define a variable</div><div class='del'>-      containing this information, set the&lt;structfield&gt;tlv.p</div><div class='del'>-      &lt;/structfield&gt; field to point to this variable, and include the</div><div class='del'>-      &lt;constant&gt;SNDRV_CTL_ELEM_ACCESS_TLV_READ&lt;/constant&gt; flag in the</div><div class='del'>-      &lt;structfield&gt;access&lt;/structfield&gt; field; like this:</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static DECLARE_TLV_DB_SCALE(db_scale_my_control, -4050, 150, 0);</div><div class='del'>-</div><div class='del'>-  static struct snd_kcontrol_new my_control = {</div><div class='del'>-          ...</div><div class='del'>-          .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='del'>-                    SNDRV_CTL_ELEM_ACCESS_TLV_READ,</div><div class='del'>-          ...</div><div class='del'>-          .tlv.p = db_scale_my_control,</div><div class='del'>-  };</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The &lt;function&gt;DECLARE_TLV_DB_SCALE&lt;/function&gt; macro defines</div><div class='del'>-      information about a mixer control where each step in the control's</div><div class='del'>-      value changes the dB value by a constant dB amount.</div><div class='del'>-      The first parameter is the name of the variable to be defined.</div><div class='del'>-      The second parameter is the minimum value, in units of 0.01 dB.</div><div class='del'>-      The third parameter is the step size, in units of 0.01 dB.</div><div class='del'>-      Set the fourth parameter to 1 if the minimum value actually mutes</div><div class='del'>-      the control.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The &lt;function&gt;DECLARE_TLV_DB_LINEAR&lt;/function&gt; macro defines</div><div class='del'>-      information about a mixer control where the control's value affects</div><div class='del'>-      the output linearly.</div><div class='del'>-      The first parameter is the name of the variable to be defined.</div><div class='del'>-      The second parameter is the minimum value, in units of 0.01 dB.</div><div class='del'>-      The third parameter is the maximum value, in units of 0.01 dB.</div><div class='del'>-      If the minimum value mutes the control, set the second parameter to</div><div class='del'>-      &lt;constant&gt;TLV_DB_GAIN_MUTE&lt;/constant&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- API for AC97 Codec  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="api-ac97"&gt;</div><div class='del'>-    &lt;title&gt;API for AC97 Codec&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section&gt;</div><div class='del'>-      &lt;title&gt;General&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The ALSA AC97 codec layer is a well-defined one, and you don't</div><div class='del'>-      have to write much code to control it. Only low-level control</div><div class='del'>-      routines are necessary. The AC97 codec API is defined in</div><div class='del'>-      &lt;filename&gt;&amp;lt;sound/ac97_codec.h&amp;gt;&lt;/filename&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="api-ac97-example"&gt;</div><div class='del'>-      &lt;title&gt;Full Code Example&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-          &lt;example&gt;</div><div class='del'>-	    &lt;title&gt;Example of AC97 Interface&lt;/title&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct mychip {</div><div class='del'>-          ....</div><div class='del'>-          struct snd_ac97 *ac97;</div><div class='del'>-          ....</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  static unsigned short snd_mychip_ac97_read(struct snd_ac97 *ac97,</div><div class='del'>-                                             unsigned short reg)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = ac97-&gt;private_data;</div><div class='del'>-          ....</div><div class='del'>-          /* read a register value here from the codec */</div><div class='del'>-          return the_register_value;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  static void snd_mychip_ac97_write(struct snd_ac97 *ac97,</div><div class='del'>-                                   unsigned short reg, unsigned short val)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = ac97-&gt;private_data;</div><div class='del'>-          ....</div><div class='del'>-          /* write the given register value to the codec */</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  static int snd_mychip_ac97(struct mychip *chip)</div><div class='del'>-  {</div><div class='del'>-          struct snd_ac97_bus *bus;</div><div class='del'>-          struct snd_ac97_template ac97;</div><div class='del'>-          int err;</div><div class='del'>-          static struct snd_ac97_bus_ops ops = {</div><div class='del'>-                  .write = snd_mychip_ac97_write,</div><div class='del'>-                  .read = snd_mychip_ac97_read,</div><div class='del'>-          };</div><div class='del'>-</div><div class='del'>-          err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, NULL, &amp;bus);</div><div class='del'>-          if (err &lt; 0)</div><div class='del'>-                  return err;</div><div class='del'>-          memset(&amp;ac97, 0, sizeof(ac97));</div><div class='del'>-          ac97.private_data = chip;</div><div class='del'>-          return snd_ac97_mixer(bus, &amp;ac97, &amp;chip-&gt;ac97);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/example&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="api-ac97-constructor"&gt;</div><div class='del'>-      &lt;title&gt;Constructor&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        To create an ac97 instance, first call &lt;function&gt;snd_ac97_bus&lt;/function&gt;</div><div class='del'>-      with an &lt;type&gt;ac97_bus_ops_t&lt;/type&gt; record with callback functions.</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_ac97_bus *bus;</div><div class='del'>-  static struct snd_ac97_bus_ops ops = {</div><div class='del'>-        .write = snd_mychip_ac97_write,</div><div class='del'>-        .read = snd_mychip_ac97_read,</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  snd_ac97_bus(card, 0, &amp;ops, NULL, &amp;pbus);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-      The bus record is shared among all belonging ac97 instances.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      And then call &lt;function&gt;snd_ac97_mixer()&lt;/function&gt; with an</div><div class='del'>-      struct &lt;structname&gt;snd_ac97_template&lt;/structname&gt;</div><div class='del'>-      record together with the bus pointer created above.</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_ac97_template ac97;</div><div class='del'>-  int err;</div><div class='del'>-</div><div class='del'>-  memset(&amp;ac97, 0, sizeof(ac97));</div><div class='del'>-  ac97.private_data = chip;</div><div class='del'>-  snd_ac97_mixer(bus, &amp;ac97, &amp;chip-&gt;ac97);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        where chip-&amp;gt;ac97 is a pointer to a newly created</div><div class='del'>-        &lt;type&gt;ac97_t&lt;/type&gt; instance.</div><div class='del'>-        In this case, the chip pointer is set as the private data, so that</div><div class='del'>-        the read/write callback functions can refer to this chip instance.</div><div class='del'>-        This instance is not necessarily stored in the chip</div><div class='del'>-	record.  If you need to change the register values from the</div><div class='del'>-        driver, or need the suspend/resume of ac97 codecs, keep this</div><div class='del'>-        pointer to pass to the corresponding functions.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="api-ac97-callbacks"&gt;</div><div class='del'>-      &lt;title&gt;Callbacks&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The standard callbacks are &lt;structfield&gt;read&lt;/structfield&gt; and</div><div class='del'>-      &lt;structfield&gt;write&lt;/structfield&gt;. Obviously they </div><div class='del'>-      correspond to the functions for read and write accesses to the</div><div class='del'>-      hardware low-level codes. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;structfield&gt;read&lt;/structfield&gt; callback returns the</div><div class='del'>-        register value specified in the argument. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static unsigned short snd_mychip_ac97_read(struct snd_ac97 *ac97,</div><div class='del'>-                                             unsigned short reg)</div><div class='del'>-  {</div><div class='del'>-          struct mychip *chip = ac97-&gt;private_data;</div><div class='del'>-          ....</div><div class='del'>-          return the_register_value;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        Here, the chip can be cast from ac97-&amp;gt;private_data.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Meanwhile, the &lt;structfield&gt;write&lt;/structfield&gt; callback is</div><div class='del'>-        used to set the register value. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static void snd_mychip_ac97_write(struct snd_ac97 *ac97,</div><div class='del'>-                       unsigned short reg, unsigned short val)</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      These callbacks are non-atomic like the control API callbacks.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        There are also other callbacks:</div><div class='del'>-      &lt;structfield&gt;reset&lt;/structfield&gt;,</div><div class='del'>-      &lt;structfield&gt;wait&lt;/structfield&gt; and</div><div class='del'>-      &lt;structfield&gt;init&lt;/structfield&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;structfield&gt;reset&lt;/structfield&gt; callback is used to reset</div><div class='del'>-      the codec. If the chip requires a special kind of reset, you can</div><div class='del'>-      define this callback. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;structfield&gt;wait&lt;/structfield&gt; callback is used to</div><div class='del'>-      add some waiting time in the standard initialization of the codec. If the</div><div class='del'>-      chip requires the extra waiting time, define this callback. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;structfield&gt;init&lt;/structfield&gt; callback is used for</div><div class='del'>-      additional initialization of the codec.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="api-ac97-updating-registers"&gt;</div><div class='del'>-      &lt;title&gt;Updating Registers in The Driver&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        If you need to access to the codec from the driver, you can</div><div class='del'>-      call the following functions:</div><div class='del'>-      &lt;function&gt;snd_ac97_write()&lt;/function&gt;,</div><div class='del'>-      &lt;function&gt;snd_ac97_read()&lt;/function&gt;,</div><div class='del'>-      &lt;function&gt;snd_ac97_update()&lt;/function&gt; and</div><div class='del'>-      &lt;function&gt;snd_ac97_update_bits()&lt;/function&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Both &lt;function&gt;snd_ac97_write()&lt;/function&gt; and</div><div class='del'>-        &lt;function&gt;snd_ac97_update()&lt;/function&gt; functions are used to</div><div class='del'>-        set a value to the given register</div><div class='del'>-        (&lt;constant&gt;AC97_XXX&lt;/constant&gt;). The difference between them is</div><div class='del'>-        that &lt;function&gt;snd_ac97_update()&lt;/function&gt; doesn't write a</div><div class='del'>-        value if the given value has been already set, while</div><div class='del'>-        &lt;function&gt;snd_ac97_write()&lt;/function&gt; always rewrites the</div><div class='del'>-        value. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_ac97_write(ac97, AC97_MASTER, 0x8080);</div><div class='del'>-  snd_ac97_update(ac97, AC97_MASTER, 0x8080);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;function&gt;snd_ac97_read()&lt;/function&gt; is used to read the value</div><div class='del'>-        of the given register. For example, </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  value = snd_ac97_read(ac97, AC97_MASTER);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;function&gt;snd_ac97_update_bits()&lt;/function&gt; is used to update</div><div class='del'>-        some bits in the given register.  </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_ac97_update_bits(ac97, reg, mask, value);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Also, there is a function to change the sample rate (of a</div><div class='del'>-        given register such as</div><div class='del'>-        &lt;constant&gt;AC97_PCM_FRONT_DAC_RATE&lt;/constant&gt;) when VRA or</div><div class='del'>-        DRA is supported by the codec:</div><div class='del'>-        &lt;function&gt;snd_ac97_set_rate()&lt;/function&gt;. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_ac97_set_rate(ac97, AC97_PCM_FRONT_DAC_RATE, 44100);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The following registers are available to set the rate:</div><div class='del'>-      &lt;constant&gt;AC97_PCM_MIC_ADC_RATE&lt;/constant&gt;,</div><div class='del'>-      &lt;constant&gt;AC97_PCM_FRONT_DAC_RATE&lt;/constant&gt;,</div><div class='del'>-      &lt;constant&gt;AC97_PCM_LR_ADC_RATE&lt;/constant&gt;,</div><div class='del'>-      &lt;constant&gt;AC97_SPDIF&lt;/constant&gt;. When</div><div class='del'>-      &lt;constant&gt;AC97_SPDIF&lt;/constant&gt; is specified, the register is</div><div class='del'>-      not really changed but the corresponding IEC958 status bits will</div><div class='del'>-      be updated. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="api-ac97-clock-adjustment"&gt;</div><div class='del'>-      &lt;title&gt;Clock Adjustment&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In some chips, the clock of the codec isn't 48000 but using a</div><div class='del'>-      PCI clock (to save a quartz!). In this case, change the field</div><div class='del'>-      bus-&amp;gt;clock to the corresponding</div><div class='del'>-      value. For example, intel8x0 </div><div class='del'>-      and es1968 drivers have their own function to read from the clock.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="api-ac97-proc-files"&gt;</div><div class='del'>-      &lt;title&gt;Proc Files&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The ALSA AC97 interface will create a proc file such as</div><div class='del'>-      &lt;filename&gt;/proc/asound/card0/codec97#0/ac97#0-0&lt;/filename&gt; and</div><div class='del'>-      &lt;filename&gt;ac97#0-0+regs&lt;/filename&gt;. You can refer to these files to</div><div class='del'>-      see the current status and registers of the codec. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="api-ac97-multiple-codecs"&gt;</div><div class='del'>-      &lt;title&gt;Multiple Codecs&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        When there are several codecs on the same card, you need to</div><div class='del'>-      call &lt;function&gt;snd_ac97_mixer()&lt;/function&gt; multiple times with</div><div class='del'>-      ac97.num=1 or greater. The &lt;structfield&gt;num&lt;/structfield&gt; field</div><div class='del'>-      specifies the codec number. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        If you set up multiple codecs, you either need to write</div><div class='del'>-      different callbacks for each codec or check</div><div class='del'>-      ac97-&amp;gt;num in the callback routines. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- MIDI (MPU401-UART) Interface  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="midi-interface"&gt;</div><div class='del'>-    &lt;title&gt;MIDI (MPU401-UART) Interface&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="midi-interface-general"&gt;</div><div class='del'>-      &lt;title&gt;General&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Many soundcards have built-in MIDI (MPU401-UART)</div><div class='del'>-      interfaces. When the soundcard supports the standard MPU401-UART</div><div class='del'>-      interface, most likely you can use the ALSA MPU401-UART API. The</div><div class='del'>-      MPU401-UART API is defined in</div><div class='del'>-      &lt;filename&gt;&amp;lt;sound/mpu401.h&amp;gt;&lt;/filename&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Some soundchips have a similar but slightly different</div><div class='del'>-      implementation of mpu401 stuff. For example, emu10k1 has its own</div><div class='del'>-      mpu401 routines. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="midi-interface-constructor"&gt;</div><div class='del'>-      &lt;title&gt;Constructor&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        To create a rawmidi object, call</div><div class='del'>-      &lt;function&gt;snd_mpu401_uart_new()&lt;/function&gt;. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_rawmidi *rmidi;</div><div class='del'>-  snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port, info_flags,</div><div class='del'>-                      irq, &amp;rmidi);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The first argument is the card pointer, and the second is the</div><div class='del'>-      index of this component. You can create up to 8 rawmidi</div><div class='del'>-      devices. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The third argument is the type of the hardware,</div><div class='del'>-      &lt;constant&gt;MPU401_HW_XXX&lt;/constant&gt;. If it's not a special one,</div><div class='del'>-      you can use &lt;constant&gt;MPU401_HW_MPU401&lt;/constant&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The 4th argument is the I/O port address. Many</div><div class='del'>-      backward-compatible MPU401 have an I/O port such as 0x330. Or, it</div><div class='del'>-      might be a part of its own PCI I/O region. It depends on the</div><div class='del'>-      chip design. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The 5th argument is a bitflag for additional information.</div><div class='del'>-        When the I/O port address above is part of the PCI I/O</div><div class='del'>-      region, the MPU401 I/O port might have been already allocated</div><div class='del'>-      (reserved) by the driver itself. In such a case, pass a bit flag</div><div class='del'>-      &lt;constant&gt;MPU401_INFO_INTEGRATED&lt;/constant&gt;,</div><div class='del'>-      and the mpu401-uart layer will allocate the I/O ports by itself. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	When the controller supports only the input or output MIDI stream,</div><div class='del'>-	pass the &lt;constant&gt;MPU401_INFO_INPUT&lt;/constant&gt; or</div><div class='del'>-	&lt;constant&gt;MPU401_INFO_OUTPUT&lt;/constant&gt; bitflag, respectively.</div><div class='del'>-	Then the rawmidi instance is created as a single stream.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;constant&gt;MPU401_INFO_MMIO&lt;/constant&gt; bitflag is used to change</div><div class='del'>-	the access method to MMIO (via readb and writeb) instead of</div><div class='del'>-	iob and outb. In this case, you have to pass the iomapped address</div><div class='del'>-	to &lt;function&gt;snd_mpu401_uart_new()&lt;/function&gt;.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	When &lt;constant&gt;MPU401_INFO_TX_IRQ&lt;/constant&gt; is set, the output</div><div class='del'>-	stream isn't checked in the default interrupt handler.  The driver</div><div class='del'>-	needs to call &lt;function&gt;snd_mpu401_uart_interrupt_tx()&lt;/function&gt;</div><div class='del'>-	by itself to start processing the output stream in the irq handler.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	If the MPU-401 interface shares its interrupt with the other logical</div><div class='del'>-	devices on the card, set &lt;constant&gt;MPU401_INFO_IRQ_HOOK&lt;/constant&gt;</div><div class='del'>-	(see &lt;link linkend="midi-interface-interrupt-handler"&gt;&lt;citetitle&gt;</div><div class='del'>-	below&lt;/citetitle&gt;&lt;/link&gt;).</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Usually, the port address corresponds to the command port and</div><div class='del'>-        port + 1 corresponds to the data port. If not, you may change</div><div class='del'>-        the &lt;structfield&gt;cport&lt;/structfield&gt; field of</div><div class='del'>-        struct &lt;structname&gt;snd_mpu401&lt;/structname&gt; manually </div><div class='del'>-        afterward. However, &lt;structname&gt;snd_mpu401&lt;/structname&gt; pointer is not</div><div class='del'>-        returned explicitly by</div><div class='del'>-        &lt;function&gt;snd_mpu401_uart_new()&lt;/function&gt;. You need to cast</div><div class='del'>-        rmidi-&amp;gt;private_data to</div><div class='del'>-        &lt;structname&gt;snd_mpu401&lt;/structname&gt; explicitly, </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_mpu401 *mpu;</div><div class='del'>-  mpu = rmidi-&gt;private_data;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        and reset the cport as you like:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  mpu-&gt;cport = my_own_control_port;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The 6th argument specifies the ISA irq number that will be</div><div class='del'>-	allocated.  If no interrupt is to be allocated (because your</div><div class='del'>-	code is already allocating a shared interrupt, or because the</div><div class='del'>-	device does not use interrupts), pass -1 instead.</div><div class='del'>-	For a MPU-401 device without an interrupt, a polling timer</div><div class='del'>-	will be used instead.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="midi-interface-interrupt-handler"&gt;</div><div class='del'>-      &lt;title&gt;Interrupt Handler&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        When the interrupt is allocated in</div><div class='del'>-      &lt;function&gt;snd_mpu401_uart_new()&lt;/function&gt;, an exclusive ISA</div><div class='del'>-      interrupt handler is automatically used, hence you don't have</div><div class='del'>-      anything else to do than creating the mpu401 stuff.  Otherwise, you</div><div class='del'>-      have to set &lt;constant&gt;MPU401_INFO_IRQ_HOOK&lt;/constant&gt;, and call</div><div class='del'>-      &lt;function&gt;snd_mpu401_uart_interrupt()&lt;/function&gt; explicitly from your</div><div class='del'>-      own interrupt handler when it has determined that a UART interrupt</div><div class='del'>-      has occurred.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In this case, you need to pass the private_data of the</div><div class='del'>-        returned rawmidi object from</div><div class='del'>-        &lt;function&gt;snd_mpu401_uart_new()&lt;/function&gt; as the second</div><div class='del'>-        argument of &lt;function&gt;snd_mpu401_uart_interrupt()&lt;/function&gt;. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_mpu401_uart_interrupt(irq, rmidi-&gt;private_data, regs);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- RawMIDI Interface  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="rawmidi-interface"&gt;</div><div class='del'>-    &lt;title&gt;RawMIDI Interface&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="rawmidi-interface-overview"&gt;</div><div class='del'>-      &lt;title&gt;Overview&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The raw MIDI interface is used for hardware MIDI ports that can</div><div class='del'>-      be accessed as a byte stream.  It is not used for synthesizer</div><div class='del'>-      chips that do not directly understand MIDI.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      ALSA handles file and buffer management.  All you have to do is</div><div class='del'>-      to write some code to move data between the buffer and the</div><div class='del'>-      hardware.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The rawmidi API is defined in</div><div class='del'>-      &lt;filename&gt;&amp;lt;sound/rawmidi.h&amp;gt;&lt;/filename&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="rawmidi-interface-constructor"&gt;</div><div class='del'>-      &lt;title&gt;Constructor&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      To create a rawmidi device, call the</div><div class='del'>-      &lt;function&gt;snd_rawmidi_new&lt;/function&gt; function:</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_rawmidi *rmidi;</div><div class='del'>-  err = snd_rawmidi_new(chip-&gt;card, "MyMIDI", 0, outs, ins, &amp;rmidi);</div><div class='del'>-  if (err &lt; 0)</div><div class='del'>-          return err;</div><div class='del'>-  rmidi-&gt;private_data = chip;</div><div class='del'>-  strcpy(rmidi-&gt;name, "My MIDI");</div><div class='del'>-  rmidi-&gt;info_flags = SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='del'>-                      SNDRV_RAWMIDI_INFO_INPUT |</div><div class='del'>-                      SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The first argument is the card pointer, the second argument is</div><div class='del'>-      the ID string.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The third argument is the index of this component.  You can</div><div class='del'>-      create up to 8 rawmidi devices.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The fourth and fifth arguments are the number of output and</div><div class='del'>-      input substreams, respectively, of this device (a substream is</div><div class='del'>-      the equivalent of a MIDI port).</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      Set the &lt;structfield&gt;info_flags&lt;/structfield&gt; field to specify</div><div class='del'>-      the capabilities of the device.</div><div class='del'>-      Set &lt;constant&gt;SNDRV_RAWMIDI_INFO_OUTPUT&lt;/constant&gt; if there is</div><div class='del'>-      at least one output port,</div><div class='del'>-      &lt;constant&gt;SNDRV_RAWMIDI_INFO_INPUT&lt;/constant&gt; if there is at</div><div class='del'>-      least one input port,</div><div class='del'>-      and &lt;constant&gt;SNDRV_RAWMIDI_INFO_DUPLEX&lt;/constant&gt; if the device</div><div class='del'>-      can handle output and input at the same time.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      After the rawmidi device is created, you need to set the</div><div class='del'>-      operators (callbacks) for each substream.  There are helper</div><div class='del'>-      functions to set the operators for all the substreams of a device:</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &amp;snd_mymidi_output_ops);</div><div class='del'>-  snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &amp;snd_mymidi_input_ops);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The operators are usually defined like this:</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static struct snd_rawmidi_ops snd_mymidi_output_ops = {</div><div class='del'>-          .open =    snd_mymidi_output_open,</div><div class='del'>-          .close =   snd_mymidi_output_close,</div><div class='del'>-          .trigger = snd_mymidi_output_trigger,</div><div class='del'>-  };</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      These callbacks are explained in the &lt;link</div><div class='del'>-      linkend="rawmidi-interface-callbacks"&gt;&lt;citetitle&gt;Callbacks&lt;/citetitle&gt;&lt;/link&gt;</div><div class='del'>-      section.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      If there are more than one substream, you should give a</div><div class='del'>-      unique name to each of them:</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_rawmidi_substream *substream;</div><div class='del'>-  list_for_each_entry(substream,</div><div class='del'>-                      &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams,</div><div class='del'>-                      list {</div><div class='del'>-          sprintf(substream-&gt;name, "My MIDI Port %d", substream-&gt;number + 1);</div><div class='del'>-  }</div><div class='del'>-  /* same for SNDRV_RAWMIDI_STREAM_INPUT */</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="rawmidi-interface-callbacks"&gt;</div><div class='del'>-      &lt;title&gt;Callbacks&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      In all the callbacks, the private data that you've set for the</div><div class='del'>-      rawmidi device can be accessed as</div><div class='del'>-      substream-&amp;gt;rmidi-&amp;gt;private_data.</div><div class='del'>-      &lt;!-- &lt;code&gt; isn't available before DocBook 4.3 --&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      If there is more than one port, your callbacks can determine the</div><div class='del'>-      port index from the struct snd_rawmidi_substream data passed to each</div><div class='del'>-      callback:</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_rawmidi_substream *substream;</div><div class='del'>-  int index = substream-&gt;number;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="rawmidi-interface-op-open"&gt;</div><div class='del'>-      &lt;title&gt;&lt;function&gt;open&lt;/function&gt; callback&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_xxx_open(struct snd_rawmidi_substream *substream);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        This is called when a substream is opened.</div><div class='del'>-        You can initialize the hardware here, but you shouldn't</div><div class='del'>-        start transmitting/receiving data yet.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="rawmidi-interface-op-close"&gt;</div><div class='del'>-      &lt;title&gt;&lt;function&gt;close&lt;/function&gt; callback&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_xxx_close(struct snd_rawmidi_substream *substream);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        Guess what.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        The &lt;function&gt;open&lt;/function&gt; and &lt;function&gt;close&lt;/function&gt;</div><div class='del'>-        callbacks of a rawmidi device are serialized with a mutex,</div><div class='del'>-        and can sleep.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="rawmidi-interface-op-trigger-out"&gt;</div><div class='del'>-      &lt;title&gt;&lt;function&gt;trigger&lt;/function&gt; callback for output</div><div class='del'>-      substreams&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static void snd_xxx_output_trigger(struct snd_rawmidi_substream *substream, int up);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        This is called with a nonzero &lt;parameter&gt;up&lt;/parameter&gt;</div><div class='del'>-        parameter when there is some data in the substream buffer that</div><div class='del'>-        must be transmitted.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        To read data from the buffer, call</div><div class='del'>-        &lt;function&gt;snd_rawmidi_transmit_peek&lt;/function&gt;.  It will</div><div class='del'>-        return the number of bytes that have been read; this will be</div><div class='del'>-        less than the number of bytes requested when there are no more</div><div class='del'>-        data in the buffer.</div><div class='del'>-        After the data have been transmitted successfully, call</div><div class='del'>-        &lt;function&gt;snd_rawmidi_transmit_ack&lt;/function&gt; to remove the</div><div class='del'>-        data from the substream buffer:</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  unsigned char data;</div><div class='del'>-  while (snd_rawmidi_transmit_peek(substream, &amp;data, 1) == 1) {</div><div class='del'>-          if (snd_mychip_try_to_transmit(data))</div><div class='del'>-                  snd_rawmidi_transmit_ack(substream, 1);</div><div class='del'>-          else</div><div class='del'>-                  break; /* hardware FIFO full */</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        If you know beforehand that the hardware will accept data, you</div><div class='del'>-        can use the &lt;function&gt;snd_rawmidi_transmit&lt;/function&gt; function</div><div class='del'>-        which reads some data and removes them from the buffer at once:</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  while (snd_mychip_transmit_possible()) {</div><div class='del'>-          unsigned char data;</div><div class='del'>-          if (snd_rawmidi_transmit(substream, &amp;data, 1) != 1)</div><div class='del'>-                  break; /* no more data */</div><div class='del'>-          snd_mychip_transmit(data);</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        If you know beforehand how many bytes you can accept, you can</div><div class='del'>-        use a buffer size greater than one with the</div><div class='del'>-        &lt;function&gt;snd_rawmidi_transmit*&lt;/function&gt; functions.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        The &lt;function&gt;trigger&lt;/function&gt; callback must not sleep.  If</div><div class='del'>-        the hardware FIFO is full before the substream buffer has been</div><div class='del'>-        emptied, you have to continue transmitting data later, either</div><div class='del'>-        in an interrupt handler, or with a timer if the hardware</div><div class='del'>-        doesn't have a MIDI transmit interrupt.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        The &lt;function&gt;trigger&lt;/function&gt; callback is called with a</div><div class='del'>-        zero &lt;parameter&gt;up&lt;/parameter&gt; parameter when the transmission</div><div class='del'>-        of data should be aborted.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="rawmidi-interface-op-trigger-in"&gt;</div><div class='del'>-      &lt;title&gt;&lt;function&gt;trigger&lt;/function&gt; callback for input</div><div class='del'>-      substreams&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static void snd_xxx_input_trigger(struct snd_rawmidi_substream *substream, int up);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        This is called with a nonzero &lt;parameter&gt;up&lt;/parameter&gt;</div><div class='del'>-        parameter to enable receiving data, or with a zero</div><div class='del'>-        &lt;parameter&gt;up&lt;/parameter&gt; parameter do disable receiving data.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        The &lt;function&gt;trigger&lt;/function&gt; callback must not sleep; the</div><div class='del'>-        actual reading of data from the device is usually done in an</div><div class='del'>-        interrupt handler.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        When data reception is enabled, your interrupt handler should</div><div class='del'>-        call &lt;function&gt;snd_rawmidi_receive&lt;/function&gt; for all received</div><div class='del'>-        data:</div><div class='del'>-          &lt;informalexample&gt;</div><div class='del'>-            &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  void snd_mychip_midi_interrupt(...)</div><div class='del'>-  {</div><div class='del'>-          while (mychip_midi_available()) {</div><div class='del'>-                  unsigned char data;</div><div class='del'>-                  data = mychip_midi_read();</div><div class='del'>-                  snd_rawmidi_receive(substream, &amp;data, 1);</div><div class='del'>-          }</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>-          &lt;/informalexample&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-      &lt;section id="rawmidi-interface-op-drain"&gt;</div><div class='del'>-      &lt;title&gt;&lt;function&gt;drain&lt;/function&gt; callback&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static void snd_xxx_drain(struct snd_rawmidi_substream *substream);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        This is only used with output substreams.  This function should wait</div><div class='del'>-        until all data read from the substream buffer have been transmitted.</div><div class='del'>-        This ensures that the device can be closed and the driver unloaded</div><div class='del'>-        without losing data.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        This callback is optional. If you do not set</div><div class='del'>-        &lt;structfield&gt;drain&lt;/structfield&gt; in the struct snd_rawmidi_ops</div><div class='del'>-        structure, ALSA will simply wait for 50&amp;nbsp;milliseconds</div><div class='del'>-        instead.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/section&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Miscellaneous Devices  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="misc-devices"&gt;</div><div class='del'>-    &lt;title&gt;Miscellaneous Devices&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="misc-devices-opl3"&gt;</div><div class='del'>-      &lt;title&gt;FM OPL3&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The FM OPL3 is still used in many chips (mainly for backward</div><div class='del'>-      compatibility). ALSA has a nice OPL3 FM control layer, too. The</div><div class='del'>-      OPL3 API is defined in</div><div class='del'>-      &lt;filename&gt;&amp;lt;sound/opl3.h&amp;gt;&lt;/filename&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        FM registers can be directly accessed through the direct-FM API,</div><div class='del'>-      defined in &lt;filename&gt;&amp;lt;sound/asound_fm.h&amp;gt;&lt;/filename&gt;. In</div><div class='del'>-      ALSA native mode, FM registers are accessed through</div><div class='del'>-      the Hardware-Dependent Device direct-FM extension API, whereas in</div><div class='del'>-      OSS compatible mode, FM registers can be accessed with the OSS</div><div class='del'>-      direct-FM compatible API in &lt;filename&gt;/dev/dmfmX&lt;/filename&gt; device. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        To create the OPL3 component, you have two functions to</div><div class='del'>-        call. The first one is a constructor for the &lt;type&gt;opl3_t&lt;/type&gt;</div><div class='del'>-        instance. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_opl3 *opl3;</div><div class='del'>-  snd_opl3_create(card, lport, rport, OPL3_HW_OPL3_XXX,</div><div class='del'>-                  integrated, &amp;opl3);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The first argument is the card pointer, the second one is the</div><div class='del'>-      left port address, and the third is the right port address. In</div><div class='del'>-      most cases, the right port is placed at the left port + 2. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The fourth argument is the hardware type.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        When the left and right ports have been already allocated by</div><div class='del'>-      the card driver, pass non-zero to the fifth argument</div><div class='del'>-      (&lt;parameter&gt;integrated&lt;/parameter&gt;). Otherwise, the opl3 module will</div><div class='del'>-      allocate the specified ports by itself. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        When the accessing the hardware requires special method</div><div class='del'>-        instead of the standard I/O access, you can create opl3 instance</div><div class='del'>-        separately with &lt;function&gt;snd_opl3_new()&lt;/function&gt;.</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_opl3 *opl3;</div><div class='del'>-  snd_opl3_new(card, OPL3_HW_OPL3_XXX, &amp;opl3);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Then set &lt;structfield&gt;command&lt;/structfield&gt;,</div><div class='del'>-	&lt;structfield&gt;private_data&lt;/structfield&gt; and</div><div class='del'>-	&lt;structfield&gt;private_free&lt;/structfield&gt; for the private</div><div class='del'>-	access function, the private data and the destructor.</div><div class='del'>-	The l_port and r_port are not necessarily set.  Only the</div><div class='del'>-	command must be set properly.  You can retrieve the data</div><div class='del'>-	from the opl3-&amp;gt;private_data field.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	After creating the opl3 instance via &lt;function&gt;snd_opl3_new()&lt;/function&gt;,</div><div class='del'>-	call &lt;function&gt;snd_opl3_init()&lt;/function&gt; to initialize the chip to the</div><div class='del'>-	proper state. Note that &lt;function&gt;snd_opl3_create()&lt;/function&gt; always</div><div class='del'>-	calls it internally.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        If the opl3 instance is created successfully, then create a</div><div class='del'>-        hwdep device for this opl3. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_hwdep *opl3hwdep;</div><div class='del'>-  snd_opl3_hwdep_new(opl3, 0, 1, &amp;opl3hwdep);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The first argument is the &lt;type&gt;opl3_t&lt;/type&gt; instance you</div><div class='del'>-      created, and the second is the index number, usually 0. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The third argument is the index-offset for the sequencer</div><div class='del'>-      client assigned to the OPL3 port. When there is an MPU401-UART,</div><div class='del'>-      give 1 for here (UART always takes 0). </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="misc-devices-hardware-dependent"&gt;</div><div class='del'>-      &lt;title&gt;Hardware-Dependent Devices&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Some chips need user-space access for special</div><div class='del'>-      controls or for loading the micro code. In such a case, you can</div><div class='del'>-      create a hwdep (hardware-dependent) device. The hwdep API is</div><div class='del'>-      defined in &lt;filename&gt;&amp;lt;sound/hwdep.h&amp;gt;&lt;/filename&gt;. You can</div><div class='del'>-      find examples in opl3 driver or</div><div class='del'>-      &lt;filename&gt;isa/sb/sb16_csp.c&lt;/filename&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The creation of the &lt;type&gt;hwdep&lt;/type&gt; instance is done via</div><div class='del'>-        &lt;function&gt;snd_hwdep_new()&lt;/function&gt;. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_hwdep *hw;</div><div class='del'>-  snd_hwdep_new(card, "My HWDEP", 0, &amp;hw);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        where the third argument is the index number.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        You can then pass any pointer value to the</div><div class='del'>-        &lt;parameter&gt;private_data&lt;/parameter&gt;.</div><div class='del'>-        If you assign a private data, you should define the</div><div class='del'>-        destructor, too. The destructor function is set in</div><div class='del'>-        the &lt;structfield&gt;private_free&lt;/structfield&gt; field.  </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct mydata *p = kmalloc(sizeof(*p), GFP_KERNEL);</div><div class='del'>-  hw-&gt;private_data = p;</div><div class='del'>-  hw-&gt;private_free = mydata_free;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        and the implementation of the destructor would be:</div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static void mydata_free(struct snd_hwdep *hw)</div><div class='del'>-  {</div><div class='del'>-          struct mydata *p = hw-&gt;private_data;</div><div class='del'>-          kfree(p);</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The arbitrary file operations can be defined for this</div><div class='del'>-        instance. The file operators are defined in</div><div class='del'>-        the &lt;parameter&gt;ops&lt;/parameter&gt; table. For example, assume that</div><div class='del'>-        this chip needs an ioctl. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  hw-&gt;ops.open = mydata_open;</div><div class='del'>-  hw-&gt;ops.ioctl = mydata_ioctl;</div><div class='del'>-  hw-&gt;ops.release = mydata_release;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        And implement the callback functions as you like.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="misc-devices-IEC958"&gt;</div><div class='del'>-      &lt;title&gt;IEC958 (S/PDIF)&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Usually the controls for IEC958 devices are implemented via</div><div class='del'>-      the control interface. There is a macro to compose a name string for</div><div class='del'>-      IEC958 controls, &lt;function&gt;SNDRV_CTL_NAME_IEC958()&lt;/function&gt;</div><div class='del'>-      defined in &lt;filename&gt;&amp;lt;include/asound.h&amp;gt;&lt;/filename&gt;.  </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        There are some standard controls for IEC958 status bits. These</div><div class='del'>-      controls use the type &lt;type&gt;SNDRV_CTL_ELEM_TYPE_IEC958&lt;/type&gt;,</div><div class='del'>-      and the size of element is fixed as 4 bytes array</div><div class='del'>-      (value.iec958.status[x]). For the &lt;structfield&gt;info&lt;/structfield&gt;</div><div class='del'>-      callback, you don't specify </div><div class='del'>-      the value field for this type (the count field must be set,</div><div class='del'>-      though). </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;quote&gt;IEC958 Playback Con Mask&lt;/quote&gt; is used to return the</div><div class='del'>-      bit-mask for the IEC958 status bits of consumer mode. Similarly,</div><div class='del'>-      &lt;quote&gt;IEC958 Playback Pro Mask&lt;/quote&gt; returns the bitmask for</div><div class='del'>-      professional mode. They are read-only controls, and are defined</div><div class='del'>-      as MIXER controls (iface =</div><div class='del'>-      &lt;constant&gt;SNDRV_CTL_ELEM_IFACE_MIXER&lt;/constant&gt;).  </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Meanwhile, &lt;quote&gt;IEC958 Playback Default&lt;/quote&gt; control is</div><div class='del'>-      defined for getting and setting the current default IEC958</div><div class='del'>-      bits. Note that this one is usually defined as a PCM control</div><div class='del'>-      (iface = &lt;constant&gt;SNDRV_CTL_ELEM_IFACE_PCM&lt;/constant&gt;),</div><div class='del'>-      although in some places it's defined as a MIXER control. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In addition, you can define the control switches to</div><div class='del'>-      enable/disable or to set the raw bit mode. The implementation</div><div class='del'>-      will depend on the chip, but the control should be named as</div><div class='del'>-      &lt;quote&gt;IEC958 xxx&lt;/quote&gt;, preferably using</div><div class='del'>-      the &lt;function&gt;SNDRV_CTL_NAME_IEC958()&lt;/function&gt; macro. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        You can find several cases, for example,</div><div class='del'>-      &lt;filename&gt;pci/emu10k1&lt;/filename&gt;,</div><div class='del'>-      &lt;filename&gt;pci/ice1712&lt;/filename&gt;, or</div><div class='del'>-      &lt;filename&gt;pci/cmipci.c&lt;/filename&gt;.  </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Buffer and Memory Management  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="buffer-and-memory"&gt;</div><div class='del'>-    &lt;title&gt;Buffer and Memory Management&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="buffer-and-memory-buffer-types"&gt;</div><div class='del'>-      &lt;title&gt;Buffer Types&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        ALSA provides several different buffer allocation functions</div><div class='del'>-      depending on the bus and the architecture. All these have a</div><div class='del'>-      consistent API. The allocation of physically-contiguous pages is</div><div class='del'>-      done via </div><div class='del'>-      &lt;function&gt;snd_malloc_xxx_pages()&lt;/function&gt; function, where xxx</div><div class='del'>-      is the bus type. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The allocation of pages with fallback is</div><div class='del'>-      &lt;function&gt;snd_malloc_xxx_pages_fallback()&lt;/function&gt;. This</div><div class='del'>-      function tries to allocate the specified pages but if the pages</div><div class='del'>-      are not available, it tries to reduce the page sizes until</div><div class='del'>-      enough space is found.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The release the pages, call</div><div class='del'>-      &lt;function&gt;snd_free_xxx_pages()&lt;/function&gt; function. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      Usually, ALSA drivers try to allocate and reserve</div><div class='del'>-       a large contiguous physical space</div><div class='del'>-       at the time the module is loaded for the later use.</div><div class='del'>-       This is called &lt;quote&gt;pre-allocation&lt;/quote&gt;.</div><div class='del'>-       As already written, you can call the following function at </div><div class='del'>-       pcm instance construction time (in the case of PCI bus). </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-                                        snd_dma_pci_data(pci), size, max);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        where &lt;parameter&gt;size&lt;/parameter&gt; is the byte size to be</div><div class='del'>-      pre-allocated and the &lt;parameter&gt;max&lt;/parameter&gt; is the maximum</div><div class='del'>-      size to be changed via the &lt;filename&gt;prealloc&lt;/filename&gt; proc file.</div><div class='del'>-      The allocator will try to get an area as large as possible</div><div class='del'>-      within the given size. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      The second argument (type) and the third argument (device pointer)</div><div class='del'>-      are dependent on the bus.</div><div class='del'>-      In the case of the ISA bus, pass &lt;function&gt;snd_dma_isa_data()&lt;/function&gt;</div><div class='del'>-      as the third argument with &lt;constant&gt;SNDRV_DMA_TYPE_DEV&lt;/constant&gt; type.</div><div class='del'>-      For the continuous buffer unrelated to the bus can be pre-allocated</div><div class='del'>-      with &lt;constant&gt;SNDRV_DMA_TYPE_CONTINUOUS&lt;/constant&gt; type and the</div><div class='del'>-      &lt;function&gt;snd_dma_continuous_data(GFP_KERNEL)&lt;/function&gt; device pointer,</div><div class='del'>-      where &lt;constant&gt;GFP_KERNEL&lt;/constant&gt; is the kernel allocation flag to</div><div class='del'>-      use.</div><div class='del'>-      For the PCI scatter-gather buffers, use</div><div class='del'>-      &lt;constant&gt;SNDRV_DMA_TYPE_DEV_SG&lt;/constant&gt; with</div><div class='del'>-      &lt;function&gt;snd_dma_pci_data(pci)&lt;/function&gt;</div><div class='del'>-      (see the </div><div class='del'>-          &lt;link linkend="buffer-and-memory-non-contiguous"&gt;&lt;citetitle&gt;Non-Contiguous Buffers</div><div class='del'>-          &lt;/citetitle&gt;&lt;/link&gt; section).</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Once the buffer is pre-allocated, you can use the</div><div class='del'>-        allocator in the &lt;structfield&gt;hw_params&lt;/structfield&gt; callback: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_pcm_lib_malloc_pages(substream, size);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        Note that you have to pre-allocate to use this function.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="buffer-and-memory-external-hardware"&gt;</div><div class='del'>-      &lt;title&gt;External Hardware Buffers&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Some chips have their own hardware buffers and the DMA</div><div class='del'>-      transfer from the host memory is not available. In such a case,</div><div class='del'>-      you need to either 1) copy/set the audio data directly to the</div><div class='del'>-      external hardware buffer, or 2) make an intermediate buffer and</div><div class='del'>-      copy/set the data from it to the external hardware buffer in</div><div class='del'>-      interrupts (or in tasklets, preferably).</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The first case works fine if the external hardware buffer is large</div><div class='del'>-      enough.  This method doesn't need any extra buffers and thus is</div><div class='del'>-      more effective. You need to define the</div><div class='del'>-      &lt;structfield&gt;copy&lt;/structfield&gt; and</div><div class='del'>-      &lt;structfield&gt;silence&lt;/structfield&gt; callbacks for </div><div class='del'>-      the data transfer. However, there is a drawback: it cannot</div><div class='del'>-      be mmapped. The examples are GUS's GF1 PCM or emu8000's</div><div class='del'>-      wavetable PCM. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The second case allows for mmap on the buffer, although you have</div><div class='del'>-      to handle an interrupt or a tasklet to transfer the data</div><div class='del'>-      from the intermediate buffer to the hardware buffer. You can find an</div><div class='del'>-      example in the vxpocket driver. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Another case is when the chip uses a PCI memory-map</div><div class='del'>-      region for the buffer instead of the host memory. In this case,</div><div class='del'>-      mmap is available only on certain architectures like the Intel one.</div><div class='del'>-      In non-mmap mode, the data cannot be transferred as in the normal</div><div class='del'>-      way. Thus you need to define the &lt;structfield&gt;copy&lt;/structfield&gt; and</div><div class='del'>-      &lt;structfield&gt;silence&lt;/structfield&gt; callbacks as well, </div><div class='del'>-      as in the cases above. The examples are found in</div><div class='del'>-      &lt;filename&gt;rme32.c&lt;/filename&gt; and &lt;filename&gt;rme96.c&lt;/filename&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The implementation of the &lt;structfield&gt;copy&lt;/structfield&gt; and</div><div class='del'>-        &lt;structfield&gt;silence&lt;/structfield&gt; callbacks depends upon </div><div class='del'>-        whether the hardware supports interleaved or non-interleaved</div><div class='del'>-        samples. The &lt;structfield&gt;copy&lt;/structfield&gt; callback is</div><div class='del'>-        defined like below, a bit </div><div class='del'>-        differently depending whether the direction is playback or</div><div class='del'>-        capture: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int playback_copy(struct snd_pcm_substream *substream, int channel,</div><div class='del'>-               snd_pcm_uframes_t pos, void *src, snd_pcm_uframes_t count);</div><div class='del'>-  static int capture_copy(struct snd_pcm_substream *substream, int channel,</div><div class='del'>-               snd_pcm_uframes_t pos, void *dst, snd_pcm_uframes_t count);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In the case of interleaved samples, the second argument</div><div class='del'>-      (&lt;parameter&gt;channel&lt;/parameter&gt;) is not used. The third argument</div><div class='del'>-      (&lt;parameter&gt;pos&lt;/parameter&gt;) points the </div><div class='del'>-      current position offset in frames. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The meaning of the fourth argument is different between</div><div class='del'>-      playback and capture. For playback, it holds the source data</div><div class='del'>-      pointer, and for capture, it's the destination data pointer. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The last argument is the number of frames to be copied.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        What you have to do in this callback is again different</div><div class='del'>-        between playback and capture directions. In the</div><div class='del'>-        playback case, you copy the given amount of data</div><div class='del'>-        (&lt;parameter&gt;count&lt;/parameter&gt;) at the specified pointer</div><div class='del'>-        (&lt;parameter&gt;src&lt;/parameter&gt;) to the specified offset</div><div class='del'>-        (&lt;parameter&gt;pos&lt;/parameter&gt;) on the hardware buffer. When</div><div class='del'>-        coded like memcpy-like way, the copy would be like: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  my_memcpy(my_buffer + frames_to_bytes(runtime, pos), src,</div><div class='del'>-            frames_to_bytes(runtime, count));</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        For the capture direction, you copy the given amount of</div><div class='del'>-        data (&lt;parameter&gt;count&lt;/parameter&gt;) at the specified offset</div><div class='del'>-        (&lt;parameter&gt;pos&lt;/parameter&gt;) on the hardware buffer to the</div><div class='del'>-        specified pointer (&lt;parameter&gt;dst&lt;/parameter&gt;). </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  my_memcpy(dst, my_buffer + frames_to_bytes(runtime, pos),</div><div class='del'>-            frames_to_bytes(runtime, count));</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-        Note that both the position and the amount of data are given</div><div class='del'>-      in frames. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In the case of non-interleaved samples, the implementation</div><div class='del'>-      will be a bit more complicated. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        You need to check the channel argument, and if it's -1, copy</div><div class='del'>-      the whole channels. Otherwise, you have to copy only the</div><div class='del'>-      specified channel. Please check</div><div class='del'>-      &lt;filename&gt;isa/gus/gus_pcm.c&lt;/filename&gt; as an example. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;structfield&gt;silence&lt;/structfield&gt; callback is also</div><div class='del'>-        implemented in a similar way. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int silence(struct snd_pcm_substream *substream, int channel,</div><div class='del'>-                     snd_pcm_uframes_t pos, snd_pcm_uframes_t count);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The meanings of arguments are the same as in the</div><div class='del'>-      &lt;structfield&gt;copy&lt;/structfield&gt; </div><div class='del'>-      callback, although there is no &lt;parameter&gt;src/dst&lt;/parameter&gt;</div><div class='del'>-      argument. In the case of interleaved samples, the channel</div><div class='del'>-      argument has no meaning, as well as on</div><div class='del'>-      &lt;structfield&gt;copy&lt;/structfield&gt; callback.  </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The role of &lt;structfield&gt;silence&lt;/structfield&gt; callback is to</div><div class='del'>-        set the given amount </div><div class='del'>-        (&lt;parameter&gt;count&lt;/parameter&gt;) of silence data at the</div><div class='del'>-        specified offset (&lt;parameter&gt;pos&lt;/parameter&gt;) on the hardware</div><div class='del'>-        buffer. Suppose that the data format is signed (that is, the</div><div class='del'>-        silent-data is 0), and the implementation using a memset-like</div><div class='del'>-        function would be like: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  my_memcpy(my_buffer + frames_to_bytes(runtime, pos), 0,</div><div class='del'>-            frames_to_bytes(runtime, count));</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In the case of non-interleaved samples, again, the</div><div class='del'>-      implementation becomes a bit more complicated. See, for example,</div><div class='del'>-      &lt;filename&gt;isa/gus/gus_pcm.c&lt;/filename&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="buffer-and-memory-non-contiguous"&gt;</div><div class='del'>-      &lt;title&gt;Non-Contiguous Buffers&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        If your hardware supports the page table as in emu10k1 or the</div><div class='del'>-      buffer descriptors as in via82xx, you can use the scatter-gather</div><div class='del'>-      (SG) DMA. ALSA provides an interface for handling SG-buffers.</div><div class='del'>-      The API is provided in &lt;filename&gt;&amp;lt;sound/pcm.h&amp;gt;&lt;/filename&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        For creating the SG-buffer handler, call</div><div class='del'>-        &lt;function&gt;snd_pcm_lib_preallocate_pages()&lt;/function&gt; or</div><div class='del'>-        &lt;function&gt;snd_pcm_lib_preallocate_pages_for_all()&lt;/function&gt;</div><div class='del'>-        with &lt;constant&gt;SNDRV_DMA_TYPE_DEV_SG&lt;/constant&gt;</div><div class='del'>-	in the PCM constructor like other PCI pre-allocator.</div><div class='del'>-        You need to pass &lt;function&gt;snd_dma_pci_data(pci)&lt;/function&gt;,</div><div class='del'>-        where pci is the struct &lt;structname&gt;pci_dev&lt;/structname&gt; pointer</div><div class='del'>-        of the chip as well.</div><div class='del'>-        The &lt;type&gt;struct snd_sg_buf&lt;/type&gt; instance is created as</div><div class='del'>-        substream-&amp;gt;dma_private. You can cast</div><div class='del'>-        the pointer like: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_sg_buf *sgbuf = (struct snd_sg_buf *)substream-&gt;dma_private;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Then call &lt;function&gt;snd_pcm_lib_malloc_pages()&lt;/function&gt;</div><div class='del'>-      in the &lt;structfield&gt;hw_params&lt;/structfield&gt; callback</div><div class='del'>-      as well as in the case of normal PCI buffer.</div><div class='del'>-      The SG-buffer handler will allocate the non-contiguous kernel</div><div class='del'>-      pages of the given size and map them onto the virtually contiguous</div><div class='del'>-      memory.  The virtual pointer is addressed in runtime-&amp;gt;dma_area.</div><div class='del'>-      The physical address (runtime-&amp;gt;dma_addr) is set to zero,</div><div class='del'>-      because the buffer is physically non-contiguous.</div><div class='del'>-      The physical address table is set up in sgbuf-&amp;gt;table.</div><div class='del'>-      You can get the physical address at a certain offset via</div><div class='del'>-      &lt;function&gt;snd_pcm_sgbuf_get_addr()&lt;/function&gt;. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        When a SG-handler is used, you need to set</div><div class='del'>-      &lt;function&gt;snd_pcm_sgbuf_ops_page&lt;/function&gt; as</div><div class='del'>-      the &lt;structfield&gt;page&lt;/structfield&gt; callback.</div><div class='del'>-      (See &lt;link linkend="pcm-interface-operators-page-callback"&gt;</div><div class='del'>-      &lt;citetitle&gt;page callback section&lt;/citetitle&gt;&lt;/link&gt;.)</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        To release the data, call</div><div class='del'>-      &lt;function&gt;snd_pcm_lib_free_pages()&lt;/function&gt; in the</div><div class='del'>-      &lt;structfield&gt;hw_free&lt;/structfield&gt; callback as usual.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="buffer-and-memory-vmalloced"&gt;</div><div class='del'>-      &lt;title&gt;Vmalloc'ed Buffers&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        It's possible to use a buffer allocated via</div><div class='del'>-      &lt;function&gt;vmalloc&lt;/function&gt;, for example, for an intermediate</div><div class='del'>-      buffer. Since the allocated pages are not contiguous, you need</div><div class='del'>-      to set the &lt;structfield&gt;page&lt;/structfield&gt; callback to obtain</div><div class='del'>-      the physical address at every offset. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The implementation of &lt;structfield&gt;page&lt;/structfield&gt; callback</div><div class='del'>-        would be like this: </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  #include &lt;linux/vmalloc.h&gt;</div><div class='del'>-</div><div class='del'>-  /* get the physical page pointer on the given offset */</div><div class='del'>-  static struct page *mychip_page(struct snd_pcm_substream *substream,</div><div class='del'>-                                  unsigned long offset)</div><div class='del'>-  {</div><div class='del'>-          void *pageptr = substream-&gt;runtime-&gt;dma_area + offset;</div><div class='del'>-          return vmalloc_to_page(pageptr);</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Proc Interface  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="proc-interface"&gt;</div><div class='del'>-    &lt;title&gt;Proc Interface&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      ALSA provides an easy interface for procfs. The proc files are</div><div class='del'>-      very useful for debugging. I recommend you set up proc files if</div><div class='del'>-      you write a driver and want to get a running status or register</div><div class='del'>-      dumps. The API is found in</div><div class='del'>-      &lt;filename&gt;&amp;lt;sound/info.h&amp;gt;&lt;/filename&gt;. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      To create a proc file, call</div><div class='del'>-      &lt;function&gt;snd_card_proc_new()&lt;/function&gt;. </div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  struct snd_info_entry *entry;</div><div class='del'>-  int err = snd_card_proc_new(card, "my-file", &amp;entry);</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-      where the second argument specifies the name of the proc file to be</div><div class='del'>-    created. The above example will create a file</div><div class='del'>-    &lt;filename&gt;my-file&lt;/filename&gt; under the card directory,</div><div class='del'>-    e.g. &lt;filename&gt;/proc/asound/card0/my-file&lt;/filename&gt;. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    Like other components, the proc entry created via</div><div class='del'>-    &lt;function&gt;snd_card_proc_new()&lt;/function&gt; will be registered and</div><div class='del'>-    released automatically in the card registration and release</div><div class='del'>-    functions.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      When the creation is successful, the function stores a new</div><div class='del'>-    instance in the pointer given in the third argument.</div><div class='del'>-    It is initialized as a text proc file for read only.  To use</div><div class='del'>-    this proc file as a read-only text file as it is, set the read</div><div class='del'>-    callback with a private data via </div><div class='del'>-     &lt;function&gt;snd_info_set_text_ops()&lt;/function&gt;.</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_info_set_text_ops(entry, chip, my_proc_read);</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    </div><div class='del'>-    where the second argument (&lt;parameter&gt;chip&lt;/parameter&gt;) is the</div><div class='del'>-    private data to be used in the callbacks. The third parameter</div><div class='del'>-    specifies the read buffer size and the fourth</div><div class='del'>-    (&lt;parameter&gt;my_proc_read&lt;/parameter&gt;) is the callback function, which</div><div class='del'>-    is defined like</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static void my_proc_read(struct snd_info_entry *entry,</div><div class='del'>-                           struct snd_info_buffer *buffer);</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    In the read callback, use &lt;function&gt;snd_iprintf()&lt;/function&gt; for</div><div class='del'>-    output strings, which works just like normal</div><div class='del'>-    &lt;function&gt;printf()&lt;/function&gt;.  For example,</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static void my_proc_read(struct snd_info_entry *entry,</div><div class='del'>-                           struct snd_info_buffer *buffer)</div><div class='del'>-  {</div><div class='del'>-          struct my_chip *chip = entry-&gt;private_data;</div><div class='del'>-</div><div class='del'>-          snd_iprintf(buffer, "This is my chip!\n");</div><div class='del'>-          snd_iprintf(buffer, "Port = %ld\n", chip-&gt;port);</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    The file permissions can be changed afterwards.  As default, it's</div><div class='del'>-    set as read only for all users.  If you want to add write</div><div class='del'>-    permission for the user (root as default), do as follows:</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>- entry-&gt;mode = S_IFREG | S_IRUGO | S_IWUSR;</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-    and set the write buffer size and the callback</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  entry-&gt;c.text.write = my_proc_write;</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      For the write callback, you can use</div><div class='del'>-    &lt;function&gt;snd_info_get_line()&lt;/function&gt; to get a text line, and</div><div class='del'>-    &lt;function&gt;snd_info_get_str()&lt;/function&gt; to retrieve a string from</div><div class='del'>-    the line. Some examples are found in</div><div class='del'>-    &lt;filename&gt;core/oss/mixer_oss.c&lt;/filename&gt;, core/oss/and</div><div class='del'>-    &lt;filename&gt;pcm_oss.c&lt;/filename&gt;. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      For a raw-data proc-file, set the attributes as follows:</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static struct snd_info_entry_ops my_file_io_ops = {</div><div class='del'>-          .read = my_file_io_read,</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  entry-&gt;content = SNDRV_INFO_CONTENT_DATA;</div><div class='del'>-  entry-&gt;private_data = chip;</div><div class='del'>-  entry-&gt;c.ops = &amp;my_file_io_ops;</div><div class='del'>-  entry-&gt;size = 4096;</div><div class='del'>-  entry-&gt;mode = S_IFREG | S_IRUGO;</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-      For the raw data, &lt;structfield&gt;size&lt;/structfield&gt; field must be</div><div class='del'>-      set properly.  This specifies the maximum size of the proc file access.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The read/write callbacks of raw mode are more direct than the text mode.</div><div class='del'>-      You need to use a low-level I/O functions such as</div><div class='del'>-      &lt;function&gt;copy_from/to_user()&lt;/function&gt; to transfer the</div><div class='del'>-      data.</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static ssize_t my_file_io_read(struct snd_info_entry *entry,</div><div class='del'>-                              void *file_private_data,</div><div class='del'>-                              struct file *file,</div><div class='del'>-                              char *buf,</div><div class='del'>-                              size_t count,</div><div class='del'>-                              loff_t pos)</div><div class='del'>-  {</div><div class='del'>-          if (copy_to_user(buf, local_data + pos, count))</div><div class='del'>-                  return -EFAULT;</div><div class='del'>-          return count;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-      If the size of the info entry has been set up properly,</div><div class='del'>-      &lt;structfield&gt;count&lt;/structfield&gt; and &lt;structfield&gt;pos&lt;/structfield&gt; are</div><div class='del'>-      guaranteed to fit within 0 and the given size.</div><div class='del'>-      You don't have to check the range in the callbacks unless any</div><div class='del'>-      other condition is required.</div><div class='del'>-</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Power Management  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="power-management"&gt;</div><div class='del'>-    &lt;title&gt;Power Management&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If the chip is supposed to work with suspend/resume</div><div class='del'>-      functions, you need to add power-management code to the</div><div class='del'>-      driver. The additional code for power-management should be</div><div class='del'>-      &lt;function&gt;ifdef&lt;/function&gt;'ed with</div><div class='del'>-      &lt;constant&gt;CONFIG_PM&lt;/constant&gt;. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	If the driver &lt;emphasis&gt;fully&lt;/emphasis&gt; supports suspend/resume</div><div class='del'>-	that is, the device can be</div><div class='del'>-	properly resumed to its state when suspend was called,</div><div class='del'>-	you can set the &lt;constant&gt;SNDRV_PCM_INFO_RESUME&lt;/constant&gt; flag</div><div class='del'>-	in the pcm info field.  Usually, this is possible when the</div><div class='del'>-	registers of the chip can be safely saved and restored to</div><div class='del'>-	RAM. If this is set, the trigger callback is called with</div><div class='del'>-	&lt;constant&gt;SNDRV_PCM_TRIGGER_RESUME&lt;/constant&gt; after the resume</div><div class='del'>-	callback completes. </div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Even if the driver doesn't support PM fully but </div><div class='del'>-	partial suspend/resume is still possible, it's still worthy to</div><div class='del'>-	implement suspend/resume callbacks. In such a case, applications</div><div class='del'>-	would reset the status by calling</div><div class='del'>-	&lt;function&gt;snd_pcm_prepare()&lt;/function&gt; and restart the stream</div><div class='del'>-	appropriately.  Hence, you can define suspend/resume callbacks</div><div class='del'>-	below but don't set &lt;constant&gt;SNDRV_PCM_INFO_RESUME&lt;/constant&gt;</div><div class='del'>-	info flag to the PCM.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Note that the trigger with SUSPEND can always be called when</div><div class='del'>-	&lt;function&gt;snd_pcm_suspend_all&lt;/function&gt; is called,</div><div class='del'>-	regardless of the &lt;constant&gt;SNDRV_PCM_INFO_RESUME&lt;/constant&gt; flag.</div><div class='del'>-	The &lt;constant&gt;RESUME&lt;/constant&gt; flag affects only the behavior</div><div class='del'>-	of &lt;function&gt;snd_pcm_resume()&lt;/function&gt;.</div><div class='del'>-	(Thus, in theory,</div><div class='del'>-	&lt;constant&gt;SNDRV_PCM_TRIGGER_RESUME&lt;/constant&gt; isn't needed</div><div class='del'>-	to be handled in the trigger callback when no</div><div class='del'>-	&lt;constant&gt;SNDRV_PCM_INFO_RESUME&lt;/constant&gt; flag is set.  But,</div><div class='del'>-	it's better to keep it for compatibility reasons.)</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      In the earlier version of ALSA drivers, a common</div><div class='del'>-      power-management layer was provided, but it has been removed.</div><div class='del'>-      The driver needs to define the suspend/resume hooks according to</div><div class='del'>-      the bus the device is connected to.  In the case of PCI drivers, the</div><div class='del'>-      callbacks look like below:</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  #ifdef CONFIG_PM</div><div class='del'>-  static int snd_my_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='del'>-  {</div><div class='del'>-          .... /* do things for suspend */</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-  static int snd_my_resume(struct pci_dev *pci)</div><div class='del'>-  {</div><div class='del'>-          .... /* do things for suspend */</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-  #endif</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The scheme of the real suspend job is as follows.</div><div class='del'>-</div><div class='del'>-      &lt;orderedlist&gt;</div><div class='del'>-        &lt;listitem&gt;&lt;para&gt;Retrieve the card and the chip data.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;&lt;para&gt;Call &lt;function&gt;snd_power_change_state()&lt;/function&gt; with</div><div class='del'>-	  &lt;constant&gt;SNDRV_CTL_POWER_D3hot&lt;/constant&gt; to change the</div><div class='del'>-	  power status.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;&lt;para&gt;Call &lt;function&gt;snd_pcm_suspend_all()&lt;/function&gt; to suspend the running PCM streams.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;If AC97 codecs are used, call</div><div class='del'>-	&lt;function&gt;snd_ac97_suspend()&lt;/function&gt; for each codec.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;&lt;para&gt;Save the register values if necessary.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;&lt;para&gt;Stop the hardware if necessary.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;&lt;para&gt;Disable the PCI device by calling</div><div class='del'>-	  &lt;function&gt;pci_disable_device()&lt;/function&gt;.  Then, call</div><div class='del'>-          &lt;function&gt;pci_save_state()&lt;/function&gt; at last.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;/orderedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      A typical code would be like:</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int mychip_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='del'>-  {</div><div class='del'>-          /* (1) */</div><div class='del'>-          struct snd_card *card = pci_get_drvdata(pci);</div><div class='del'>-          struct mychip *chip = card-&gt;private_data;</div><div class='del'>-          /* (2) */</div><div class='del'>-          snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-          /* (3) */</div><div class='del'>-          snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='del'>-          /* (4) */</div><div class='del'>-          snd_ac97_suspend(chip-&gt;ac97);</div><div class='del'>-          /* (5) */</div><div class='del'>-          snd_mychip_save_registers(chip);</div><div class='del'>-          /* (6) */</div><div class='del'>-          snd_mychip_stop_hardware(chip);</div><div class='del'>-          /* (7) */</div><div class='del'>-          pci_disable_device(pci);</div><div class='del'>-          pci_save_state(pci);</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    The scheme of the real resume job is as follows.</div><div class='del'>-</div><div class='del'>-    &lt;orderedlist&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;para&gt;Retrieve the card and the chip data.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;para&gt;Set up PCI. First, call &lt;function&gt;pci_restore_state()&lt;/function&gt;.</div><div class='del'>-    	Then enable the pci device again by calling &lt;function&gt;pci_enable_device()&lt;/function&gt;.</div><div class='del'>-	Call &lt;function&gt;pci_set_master()&lt;/function&gt; if necessary, too.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;para&gt;Re-initialize the chip.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;para&gt;Restore the saved registers if necessary.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;para&gt;Resume the mixer, e.g. calling</div><div class='del'>-    &lt;function&gt;snd_ac97_resume()&lt;/function&gt;.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;para&gt;Restart the hardware (if any).&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-    &lt;listitem&gt;&lt;para&gt;Call &lt;function&gt;snd_power_change_state()&lt;/function&gt; with</div><div class='del'>-	&lt;constant&gt;SNDRV_CTL_POWER_D0&lt;/constant&gt; to notify the processes.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-    &lt;/orderedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    A typical code would be like:</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int mychip_resume(struct pci_dev *pci)</div><div class='del'>-  {</div><div class='del'>-          /* (1) */</div><div class='del'>-          struct snd_card *card = pci_get_drvdata(pci);</div><div class='del'>-          struct mychip *chip = card-&gt;private_data;</div><div class='del'>-          /* (2) */</div><div class='del'>-          pci_restore_state(pci);</div><div class='del'>-          pci_enable_device(pci);</div><div class='del'>-          pci_set_master(pci);</div><div class='del'>-          /* (3) */</div><div class='del'>-          snd_mychip_reinit_chip(chip);</div><div class='del'>-          /* (4) */</div><div class='del'>-          snd_mychip_restore_registers(chip);</div><div class='del'>-          /* (5) */</div><div class='del'>-          snd_ac97_resume(chip-&gt;ac97);</div><div class='del'>-          /* (6) */</div><div class='del'>-          snd_mychip_restart_chip(chip);</div><div class='del'>-          /* (7) */</div><div class='del'>-          snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='del'>-          return 0;</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-	As shown in the above, it's better to save registers after</div><div class='del'>-	suspending the PCM operations via</div><div class='del'>-	&lt;function&gt;snd_pcm_suspend_all()&lt;/function&gt; or</div><div class='del'>-	&lt;function&gt;snd_pcm_suspend()&lt;/function&gt;.  It means that the PCM</div><div class='del'>-	streams are already stopped when the register snapshot is</div><div class='del'>-	taken.  But, remember that you don't have to restart the PCM</div><div class='del'>-	stream in the resume callback. It'll be restarted via </div><div class='del'>-	trigger call with &lt;constant&gt;SNDRV_PCM_TRIGGER_RESUME&lt;/constant&gt;</div><div class='del'>-	when necessary.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      OK, we have all callbacks now. Let's set them up. In the</div><div class='del'>-      initialization of the card, make sure that you can get the chip</div><div class='del'>-      data from the card instance, typically via</div><div class='del'>-      &lt;structfield&gt;private_data&lt;/structfield&gt; field, in case you</div><div class='del'>-      created the chip data individually.</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_mychip_probe(struct pci_dev *pci,</div><div class='del'>-                              const struct pci_device_id *pci_id)</div><div class='del'>-  {</div><div class='del'>-          ....</div><div class='del'>-          struct snd_card *card;</div><div class='del'>-          struct mychip *chip;</div><div class='del'>-          int err;</div><div class='del'>-          ....</div><div class='del'>-          err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='del'>-                             0, &amp;card);</div><div class='del'>-          ....</div><div class='del'>-          chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-          ....</div><div class='del'>-          card-&gt;private_data = chip;</div><div class='del'>-          ....</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-	When you created the chip data with</div><div class='del'>-	&lt;function&gt;snd_card_new()&lt;/function&gt;, it's anyway accessible</div><div class='del'>-	via &lt;structfield&gt;private_data&lt;/structfield&gt; field.</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int snd_mychip_probe(struct pci_dev *pci,</div><div class='del'>-                              const struct pci_device_id *pci_id)</div><div class='del'>-  {</div><div class='del'>-          ....</div><div class='del'>-          struct snd_card *card;</div><div class='del'>-          struct mychip *chip;</div><div class='del'>-          int err;</div><div class='del'>-          ....</div><div class='del'>-          err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='del'>-                             sizeof(struct mychip), &amp;card);</div><div class='del'>-          ....</div><div class='del'>-          chip = card-&gt;private_data;</div><div class='del'>-          ....</div><div class='del'>-  }</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If you need a space to save the registers, allocate the</div><div class='del'>-	buffer for it here, too, since it would be fatal</div><div class='del'>-    if you cannot allocate a memory in the suspend phase.</div><div class='del'>-    The allocated buffer should be released in the corresponding</div><div class='del'>-    destructor.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      And next, set suspend/resume callbacks to the pci_driver.</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static struct pci_driver driver = {</div><div class='del'>-          .name = KBUILD_MODNAME,</div><div class='del'>-          .id_table = snd_my_ids,</div><div class='del'>-          .probe = snd_my_probe,</div><div class='del'>-          .remove = snd_my_remove,</div><div class='del'>-  #ifdef CONFIG_PM</div><div class='del'>-          .suspend = snd_my_suspend,</div><div class='del'>-          .resume = snd_my_resume,</div><div class='del'>-  #endif</div><div class='del'>-  };</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Module Parameters  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="module-parameters"&gt;</div><div class='del'>-    &lt;title&gt;Module Parameters&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      There are standard module options for ALSA. At least, each</div><div class='del'>-      module should have the &lt;parameter&gt;index&lt;/parameter&gt;,</div><div class='del'>-      &lt;parameter&gt;id&lt;/parameter&gt; and &lt;parameter&gt;enable&lt;/parameter&gt;</div><div class='del'>-      options. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If the module supports multiple cards (usually up to</div><div class='del'>-      8 = &lt;constant&gt;SNDRV_CARDS&lt;/constant&gt; cards), they should be</div><div class='del'>-      arrays. The default initial values are defined already as</div><div class='del'>-      constants for easier programming:</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='del'>-  static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-  static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If the module supports only a single card, they could be single</div><div class='del'>-    variables, instead.  &lt;parameter&gt;enable&lt;/parameter&gt; option is not</div><div class='del'>-    always necessary in this case, but it would be better to have a</div><div class='del'>-    dummy option for compatibility.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The module parameters must be declared with the standard</div><div class='del'>-    &lt;function&gt;module_param()()&lt;/function&gt;,</div><div class='del'>-    &lt;function&gt;module_param_array()()&lt;/function&gt; and</div><div class='del'>-    &lt;function&gt;MODULE_PARM_DESC()&lt;/function&gt; macros.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The typical coding would be like below:</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  #define CARD_NAME "My Chip"</div><div class='del'>-</div><div class='del'>-  module_param_array(index, int, NULL, 0444);</div><div class='del'>-  MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");</div><div class='del'>-  module_param_array(id, charp, NULL, 0444);</div><div class='del'>-  MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard.");</div><div class='del'>-  module_param_array(enable, bool, NULL, 0444);</div><div class='del'>-  MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard.");</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Also, don't forget to define the module description, classes,</div><div class='del'>-      license and devices. Especially, the recent modprobe requires to</div><div class='del'>-      define the module license as GPL, etc., otherwise the system is</div><div class='del'>-      shown as &lt;quote&gt;tainted&lt;/quote&gt;. </div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  MODULE_DESCRIPTION("My Chip");</div><div class='del'>-  MODULE_LICENSE("GPL");</div><div class='del'>-  MODULE_SUPPORTED_DEVICE("{{Vendor,My Chip Name}}");</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- How To Put Your Driver  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="how-to-put-your-driver"&gt;</div><div class='del'>-    &lt;title&gt;How To Put Your Driver Into ALSA Tree&lt;/title&gt;</div><div class='del'>-	&lt;section&gt;</div><div class='del'>-	&lt;title&gt;General&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	So far, you've learned how to write the driver codes.</div><div class='del'>-	And you might have a question now: how to put my own</div><div class='del'>-	driver into the ALSA driver tree?</div><div class='del'>-	Here (finally :) the standard procedure is described briefly.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Suppose that you create a new PCI driver for the card</div><div class='del'>-	&lt;quote&gt;xyz&lt;/quote&gt;.  The card module name would be</div><div class='del'>-	snd-xyz.  The new driver is usually put into the alsa-driver</div><div class='del'>-	tree, &lt;filename&gt;alsa-driver/pci&lt;/filename&gt; directory in</div><div class='del'>-	the case of PCI cards.</div><div class='del'>-	Then the driver is evaluated, audited and tested</div><div class='del'>-	by developers and users.  After a certain time, the driver</div><div class='del'>-	will go to the alsa-kernel tree (to the corresponding directory,</div><div class='del'>-	such as &lt;filename&gt;alsa-kernel/pci&lt;/filename&gt;) and eventually</div><div class='del'>- 	will be integrated into the Linux 2.6 tree (the directory would be</div><div class='del'>-	&lt;filename&gt;linux/sound/pci&lt;/filename&gt;).</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	In the following sections, the driver code is supposed</div><div class='del'>-	to be put into alsa-driver tree. The two cases are covered:</div><div class='del'>-	a driver consisting of a single source file and one consisting</div><div class='del'>-	of several source files.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/section&gt;</div><div class='del'>-</div><div class='del'>-	&lt;section&gt;</div><div class='del'>-	&lt;title&gt;Driver with A Single Source File&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	&lt;orderedlist&gt;</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Modify alsa-driver/pci/Makefile</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Suppose you have a file xyz.c.  Add the following</div><div class='del'>-	two lines</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd-xyz-objs := xyz.o</div><div class='del'>-  obj-$(CONFIG_SND_XYZ) += snd-xyz.o</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Create the Kconfig entry</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Add the new entry of Kconfig for your xyz driver.</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  config SND_XYZ</div><div class='del'>-          tristate "Foobar XYZ"</div><div class='del'>-          depends on SND</div><div class='del'>-          select SND_PCM</div><div class='del'>-          help</div><div class='del'>-            Say Y here to include support for Foobar XYZ soundcard.</div><div class='del'>-</div><div class='del'>-            To compile this driver as a module, choose M here: the module</div><div class='del'>-            will be called snd-xyz.</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-	the line, select SND_PCM, specifies that the driver xyz supports</div><div class='del'>-	PCM.  In addition to SND_PCM, the following components are</div><div class='del'>-	supported for select command:</div><div class='del'>-	SND_RAWMIDI, SND_TIMER, SND_HWDEP, SND_MPU401_UART,</div><div class='del'>-	SND_OPL3_LIB, SND_OPL4_LIB, SND_VX_LIB, SND_AC97_CODEC.</div><div class='del'>-	Add the select command for each supported component.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Note that some selections imply the lowlevel selections.</div><div class='del'>-	For example, PCM includes TIMER, MPU401_UART includes RAWMIDI,</div><div class='del'>-	AC97_CODEC includes PCM, and OPL3_LIB includes HWDEP.</div><div class='del'>-	You don't need to give the lowlevel selections again.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	For the details of Kconfig script, refer to the kbuild</div><div class='del'>-	documentation.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Run cvscompile script to re-generate the configure script and</div><div class='del'>-	build the whole stuff again.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-	&lt;/orderedlist&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/section&gt;</div><div class='del'>-</div><div class='del'>-	&lt;section&gt;</div><div class='del'>-	&lt;title&gt;Drivers with Several Source Files&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Suppose that the driver snd-xyz have several source files.</div><div class='del'>-	They are located in the new subdirectory,</div><div class='del'>-	pci/xyz.</div><div class='del'>-</div><div class='del'>-	&lt;orderedlist&gt;</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Add a new directory (&lt;filename&gt;xyz&lt;/filename&gt;) in</div><div class='del'>-	&lt;filename&gt;alsa-driver/pci/Makefile&lt;/filename&gt; as below</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  obj-$(CONFIG_SND) += xyz/</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Under the directory &lt;filename&gt;xyz&lt;/filename&gt;, create a Makefile</div><div class='del'>-</div><div class='del'>-      &lt;example&gt;</div><div class='del'>-	&lt;title&gt;Sample Makefile for a driver xyz&lt;/title&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  ifndef SND_TOPDIR</div><div class='del'>-  SND_TOPDIR=../..</div><div class='del'>-  endif</div><div class='del'>-</div><div class='del'>-  include $(SND_TOPDIR)/toplevel.config</div><div class='del'>-  include $(SND_TOPDIR)/Makefile.conf</div><div class='del'>-</div><div class='del'>-  snd-xyz-objs := xyz.o abc.o def.o</div><div class='del'>-</div><div class='del'>-  obj-$(CONFIG_SND_XYZ) += snd-xyz.o</div><div class='del'>-</div><div class='del'>-  include $(SND_TOPDIR)/Rules.make</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/example&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Create the Kconfig entry</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	This procedure is as same as in the last section.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	Run cvscompile script to re-generate the configure script and</div><div class='del'>-	build the whole stuff again.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-	&lt;/orderedlist&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Useful Functions  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="useful-functions"&gt;</div><div class='del'>-    &lt;title&gt;Useful Functions&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="useful-functions-snd-printk"&gt;</div><div class='del'>-      &lt;title&gt;&lt;function&gt;snd_printk()&lt;/function&gt; and friends&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        ALSA provides a verbose version of the</div><div class='del'>-      &lt;function&gt;printk()&lt;/function&gt; function. If a kernel config</div><div class='del'>-      &lt;constant&gt;CONFIG_SND_VERBOSE_PRINTK&lt;/constant&gt; is set, this</div><div class='del'>-      function prints the given message together with the file name</div><div class='del'>-      and the line of the caller. The &lt;constant&gt;KERN_XXX&lt;/constant&gt;</div><div class='del'>-      prefix is processed as </div><div class='del'>-      well as the original &lt;function&gt;printk()&lt;/function&gt; does, so it's</div><div class='del'>-      recommended to add this prefix, e.g. </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_printk(KERN_ERR "Oh my, sorry, it's extremely bad!\n");</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        There are also &lt;function&gt;printk()&lt;/function&gt;'s for</div><div class='del'>-      debugging. &lt;function&gt;snd_printd()&lt;/function&gt; can be used for</div><div class='del'>-      general debugging purposes. If</div><div class='del'>-      &lt;constant&gt;CONFIG_SND_DEBUG&lt;/constant&gt; is set, this function is</div><div class='del'>-      compiled, and works just like</div><div class='del'>-      &lt;function&gt;snd_printk()&lt;/function&gt;. If the ALSA is compiled</div><div class='del'>-      without the debugging flag, it's ignored. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;function&gt;snd_printdd()&lt;/function&gt; is compiled in only when</div><div class='del'>-      &lt;constant&gt;CONFIG_SND_DEBUG_VERBOSE&lt;/constant&gt; is set. Please note</div><div class='del'>-      that &lt;constant&gt;CONFIG_SND_DEBUG_VERBOSE&lt;/constant&gt; is not set as default</div><div class='del'>-      even if you configure the alsa-driver with</div><div class='del'>-      &lt;option&gt;--with-debug=full&lt;/option&gt; option. You need to give</div><div class='del'>-      explicitly &lt;option&gt;--with-debug=detect&lt;/option&gt; option instead. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="useful-functions-snd-bug"&gt;</div><div class='del'>-      &lt;title&gt;&lt;function&gt;snd_BUG()&lt;/function&gt;&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        It shows the &lt;computeroutput&gt;BUG?&lt;/computeroutput&gt; message and</div><div class='del'>-      stack trace as well as &lt;function&gt;snd_BUG_ON&lt;/function&gt; at the point.</div><div class='del'>-      It's useful to show that a fatal error happens there. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	 When no debug flag is set, this macro is ignored. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-    &lt;section id="useful-functions-snd-bug-on"&gt;</div><div class='del'>-      &lt;title&gt;&lt;function&gt;snd_BUG_ON()&lt;/function&gt;&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;function&gt;snd_BUG_ON()&lt;/function&gt; macro is similar with</div><div class='del'>-	&lt;function&gt;WARN_ON()&lt;/function&gt; macro. For example,  </div><div class='del'>-</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  snd_BUG_ON(!pointer);</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-	or it can be used as the condition,</div><div class='del'>-        &lt;informalexample&gt;</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  if (snd_BUG_ON(non_zero_is_bug))</div><div class='del'>-          return -EINVAL;</div><div class='del'>-]]&gt;</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/informalexample&gt;</div><div class='del'>-</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The macro takes an conditional expression to evaluate.</div><div class='del'>-	When &lt;constant&gt;CONFIG_SND_DEBUG&lt;/constant&gt;, is set, if the</div><div class='del'>-	expression is non-zero, it shows the warning message such as</div><div class='del'>-	&lt;computeroutput&gt;BUG? (xxx)&lt;/computeroutput&gt;</div><div class='del'>-	normally followed by stack trace.</div><div class='del'>-</div><div class='del'>-	In both cases it returns the evaluated value.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-&lt;!-- Acknowledgments  --&gt;</div><div class='del'>-&lt;!-- ****************************************************** --&gt;</div><div class='del'>-  &lt;chapter id="acknowledgments"&gt;</div><div class='del'>-    &lt;title&gt;Acknowledgments&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      I would like to thank Phil Kerr for his help for improvement and</div><div class='del'>-      corrections of this document. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    Kevin Conder reformatted the original plain-text to the</div><div class='del'>-    DocBook format.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    Giuliano Pochini corrected typos and contributed the example codes</div><div class='del'>-    in the hardware constraints section.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/Documentation/HOWTO b/Documentation/HOWTO<br/>deleted file mode 100644<br/>index 5f042349f987..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/HOWTO?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/HOWTO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,652 +0,0 @@</div><div class='del'>-HOWTO do Linux kernel development</div><div class='del'>-=================================</div><div class='del'>-</div><div class='del'>-This is the be-all, end-all document on this topic.  It contains</div><div class='del'>-instructions on how to become a Linux kernel developer and how to learn</div><div class='del'>-to work with the Linux kernel development community.  It tries to not</div><div class='del'>-contain anything related to the technical aspects of kernel programming,</div><div class='del'>-but will help point you in the right direction for that.</div><div class='del'>-</div><div class='del'>-If anything in this document becomes out of date, please send in patches</div><div class='del'>-to the maintainer of this file, who is listed at the bottom of the</div><div class='del'>-document.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Introduction</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-So, you want to learn how to become a Linux kernel developer?  Or you</div><div class='del'>-have been told by your manager, "Go write a Linux driver for this</div><div class='del'>-device."  This document's goal is to teach you everything you need to</div><div class='del'>-know to achieve this by describing the process you need to go through,</div><div class='del'>-and hints on how to work with the community.  It will also try to</div><div class='del'>-explain some of the reasons why the community works like it does.</div><div class='del'>-</div><div class='del'>-The kernel is written mostly in C, with some architecture-dependent</div><div class='del'>-parts written in assembly. A good understanding of C is required for</div><div class='del'>-kernel development.  Assembly (any architecture) is not required unless</div><div class='del'>-you plan to do low-level development for that architecture.  Though they</div><div class='del'>-are not a good substitute for a solid C education and/or years of</div><div class='del'>-experience, the following books are good for, if anything, reference:</div><div class='del'>-</div><div class='del'>- - "The C Programming Language" by Kernighan and Ritchie [Prentice Hall]</div><div class='del'>- - "Practical C Programming" by Steve Oualline [O'Reilly]</div><div class='del'>- - "C:  A Reference Manual" by Harbison and Steele [Prentice Hall]</div><div class='del'>-</div><div class='del'>-The kernel is written using GNU C and the GNU toolchain.  While it</div><div class='del'>-adheres to the ISO C89 standard, it uses a number of extensions that are</div><div class='del'>-not featured in the standard.  The kernel is a freestanding C</div><div class='del'>-environment, with no reliance on the standard C library, so some</div><div class='del'>-portions of the C standard are not supported.  Arbitrary long long</div><div class='del'>-divisions and floating point are not allowed.  It can sometimes be</div><div class='del'>-difficult to understand the assumptions the kernel has on the toolchain</div><div class='del'>-and the extensions that it uses, and unfortunately there is no</div><div class='del'>-definitive reference for them.  Please check the gcc info pages (`info</div><div class='del'>-gcc`) for some information on them.</div><div class='del'>-</div><div class='del'>-Please remember that you are trying to learn how to work with the</div><div class='del'>-existing development community.  It is a diverse group of people, with</div><div class='del'>-high standards for coding, style and procedure.  These standards have</div><div class='del'>-been created over time based on what they have found to work best for</div><div class='del'>-such a large and geographically dispersed team.  Try to learn as much as</div><div class='del'>-possible about these standards ahead of time, as they are well</div><div class='del'>-documented; do not expect people to adapt to you or your company's way</div><div class='del'>-of doing things.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Legal Issues</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-The Linux kernel source code is released under the GPL.  Please see the</div><div class='del'>-file, COPYING, in the main directory of the source tree, for details on</div><div class='del'>-the license.  If you have further questions about the license, please</div><div class='del'>-contact a lawyer, and do not ask on the Linux kernel mailing list.  The</div><div class='del'>-people on the mailing lists are not lawyers, and you should not rely on</div><div class='del'>-their statements on legal matters.</div><div class='del'>-</div><div class='del'>-For common questions and answers about the GPL, please see:</div><div class='del'>-</div><div class='del'>-	https://www.gnu.org/licenses/gpl-faq.html</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Documentation</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-The Linux kernel source tree has a large range of documents that are</div><div class='del'>-invaluable for learning how to interact with the kernel community.  When</div><div class='del'>-new features are added to the kernel, it is recommended that new</div><div class='del'>-documentation files are also added which explain how to use the feature.</div><div class='del'>-When a kernel change causes the interface that the kernel exposes to</div><div class='del'>-userspace to change, it is recommended that you send the information or</div><div class='del'>-a patch to the manual pages explaining the change to the manual pages</div><div class='del'>-maintainer at mtk.manpages@gmail.com, and CC the list</div><div class='del'>-linux-api@vger.kernel.org.</div><div class='del'>-</div><div class='del'>-Here is a list of files that are in the kernel source tree that are</div><div class='del'>-required reading:</div><div class='del'>-</div><div class='del'>-  README</div><div class='del'>-    This file gives a short background on the Linux kernel and describes</div><div class='del'>-    what is necessary to do to configure and build the kernel.  People</div><div class='del'>-    who are new to the kernel should start here.</div><div class='del'>-</div><div class='del'>-  :ref:`Documentation/Changes &lt;changes&gt;`</div><div class='del'>-    This file gives a list of the minimum levels of various software</div><div class='del'>-    packages that are necessary to build and run the kernel</div><div class='del'>-    successfully.</div><div class='del'>-</div><div class='del'>-  :ref:`Documentation/CodingStyle &lt;codingstyle&gt;`</div><div class='del'>-    This describes the Linux kernel coding style, and some of the</div><div class='del'>-    rationale behind it. All new code is expected to follow the</div><div class='del'>-    guidelines in this document. Most maintainers will only accept</div><div class='del'>-    patches if these rules are followed, and many people will only</div><div class='del'>-    review code if it is in the proper style.</div><div class='del'>-</div><div class='del'>-  :ref:`Documentation/SubmittingPatches &lt;submittingpatches&gt;` and :ref:`Documentation/SubmittingDrivers &lt;submittingdrivers&gt;`</div><div class='del'>-    These files describe in explicit detail how to successfully create</div><div class='del'>-    and send a patch, including (but not limited to):</div><div class='del'>-</div><div class='del'>-       - Email contents</div><div class='del'>-       - Email format</div><div class='del'>-       - Who to send it to</div><div class='del'>-</div><div class='del'>-    Following these rules will not guarantee success (as all patches are</div><div class='del'>-    subject to scrutiny for content and style), but not following them</div><div class='del'>-    will almost always prevent it.</div><div class='del'>-</div><div class='del'>-    Other excellent descriptions of how to create patches properly are:</div><div class='del'>-</div><div class='del'>-	"The Perfect Patch"</div><div class='del'>-		https://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='del'>-</div><div class='del'>-	"Linux kernel patch submission format"</div><div class='del'>-		http://linux.yyz.us/patch-format.html</div><div class='del'>-</div><div class='del'>-  :ref:`Documentation/stable_api_nonsense.txt &lt;stable_api_nonsense&gt;`</div><div class='del'>-    This file describes the rationale behind the conscious decision to</div><div class='del'>-    not have a stable API within the kernel, including things like:</div><div class='del'>-</div><div class='del'>-      - Subsystem shim-layers (for compatibility?)</div><div class='del'>-      - Driver portability between Operating Systems.</div><div class='del'>-      - Mitigating rapid change within the kernel source tree (or</div><div class='del'>-	preventing rapid change)</div><div class='del'>-</div><div class='del'>-    This document is crucial for understanding the Linux development</div><div class='del'>-    philosophy and is very important for people moving to Linux from</div><div class='del'>-    development on other Operating Systems.</div><div class='del'>-</div><div class='del'>-  :ref:`Documentation/SecurityBugs &lt;securitybugs&gt;`</div><div class='del'>-    If you feel you have found a security problem in the Linux kernel,</div><div class='del'>-    please follow the steps in this document to help notify the kernel</div><div class='del'>-    developers, and help solve the issue.</div><div class='del'>-</div><div class='del'>-  :ref:`Documentation/ManagementStyle &lt;managementstyle&gt;`</div><div class='del'>-    This document describes how Linux kernel maintainers operate and the</div><div class='del'>-    shared ethos behind their methodologies.  This is important reading</div><div class='del'>-    for anyone new to kernel development (or anyone simply curious about</div><div class='del'>-    it), as it resolves a lot of common misconceptions and confusion</div><div class='del'>-    about the unique behavior of kernel maintainers.</div><div class='del'>-</div><div class='del'>-  :ref:`Documentation/stable_kernel_rules.txt &lt;stable_kernel_rules&gt;`</div><div class='del'>-    This file describes the rules on how the stable kernel releases</div><div class='del'>-    happen, and what to do if you want to get a change into one of these</div><div class='del'>-    releases.</div><div class='del'>-</div><div class='del'>-  :ref:`Documentation/kernel-docs.txt &lt;kernel_docs&gt;`</div><div class='del'>-    A list of external documentation that pertains to kernel</div><div class='del'>-    development.  Please consult this list if you do not find what you</div><div class='del'>-    are looking for within the in-kernel documentation.</div><div class='del'>-</div><div class='del'>-  :ref:`Documentation/applying-patches.txt &lt;applying_patches&gt;`</div><div class='del'>-    A good introduction describing exactly what a patch is and how to</div><div class='del'>-    apply it to the different development branches of the kernel.</div><div class='del'>-</div><div class='del'>-The kernel also has a large number of documents that can be</div><div class='del'>-automatically generated from the source code itself or from</div><div class='del'>-ReStructuredText markups (ReST), like this one. This includes a</div><div class='del'>-full description of the in-kernel API, and rules on how to handle</div><div class='del'>-locking properly.</div><div class='del'>-</div><div class='del'>-All such documents can be generated as PDF or HTML by running::</div><div class='del'>-</div><div class='del'>-	make pdfdocs</div><div class='del'>-	make htmldocs</div><div class='del'>-</div><div class='del'>-respectively from the main kernel source directory.</div><div class='del'>-</div><div class='del'>-The documents that uses ReST markup will be generated at Documentation/output.</div><div class='del'>-They can also be generated on LaTeX and ePub formats with::</div><div class='del'>-</div><div class='del'>-	make latexdocs</div><div class='del'>-	make epubdocs</div><div class='del'>-</div><div class='del'>-Currently, there are some documents written on DocBook that are in</div><div class='del'>-the process of conversion to ReST. Such documents will be created in the</div><div class='del'>-Documentation/DocBook/ directory and can be generated also as</div><div class='del'>-Postscript or man pages by running::</div><div class='del'>-</div><div class='del'>-	make psdocs</div><div class='del'>-	make mandocs</div><div class='del'>-</div><div class='del'>-Becoming A Kernel Developer</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='del'>-If you do not know anything about Linux kernel development, you should</div><div class='del'>-look at the Linux KernelNewbies project:</div><div class='del'>-</div><div class='del'>-	https://kernelnewbies.org</div><div class='del'>-</div><div class='del'>-It consists of a helpful mailing list where you can ask almost any type</div><div class='del'>-of basic kernel development question (make sure to search the archives</div><div class='del'>-first, before asking something that has already been answered in the</div><div class='del'>-past.)  It also has an IRC channel that you can use to ask questions in</div><div class='del'>-real-time, and a lot of helpful documentation that is useful for</div><div class='del'>-learning about Linux kernel development.</div><div class='del'>-</div><div class='del'>-The website has basic information about code organization, subsystems,</div><div class='del'>-and current projects (both in-tree and out-of-tree). It also describes</div><div class='del'>-some basic logistical information, like how to compile a kernel and</div><div class='del'>-apply a patch.</div><div class='del'>-</div><div class='del'>-If you do not know where you want to start, but you want to look for</div><div class='del'>-some task to start doing to join into the kernel development community,</div><div class='del'>-go to the Linux Kernel Janitor's project:</div><div class='del'>-</div><div class='del'>-	https://kernelnewbies.org/KernelJanitors</div><div class='del'>-</div><div class='del'>-It is a great place to start.  It describes a list of relatively simple</div><div class='del'>-problems that need to be cleaned up and fixed within the Linux kernel</div><div class='del'>-source tree.  Working with the developers in charge of this project, you</div><div class='del'>-will learn the basics of getting your patch into the Linux kernel tree,</div><div class='del'>-and possibly be pointed in the direction of what to go work on next, if</div><div class='del'>-you do not already have an idea.</div><div class='del'>-</div><div class='del'>-If you already have a chunk of code that you want to put into the kernel</div><div class='del'>-tree, but need some help getting it in the proper form, the</div><div class='del'>-kernel-mentors project was created to help you out with this.  It is a</div><div class='del'>-mailing list, and can be found at:</div><div class='del'>-</div><div class='del'>-	https://selenic.com/mailman/listinfo/kernel-mentors</div><div class='del'>-</div><div class='del'>-Before making any actual modifications to the Linux kernel code, it is</div><div class='del'>-imperative to understand how the code in question works.  For this</div><div class='del'>-purpose, nothing is better than reading through it directly (most tricky</div><div class='del'>-bits are commented well), perhaps even with the help of specialized</div><div class='del'>-tools.  One such tool that is particularly recommended is the Linux</div><div class='del'>-Cross-Reference project, which is able to present source code in a</div><div class='del'>-self-referential, indexed webpage format. An excellent up-to-date</div><div class='del'>-repository of the kernel code may be found at:</div><div class='del'>-</div><div class='del'>-	http://lxr.free-electrons.com/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The development process</div><div class='del'>------------------------</div><div class='del'>-</div><div class='del'>-Linux kernel development process currently consists of a few different</div><div class='del'>-main kernel "branches" and lots of different subsystem-specific kernel</div><div class='del'>-branches.  These different branches are:</div><div class='del'>-</div><div class='del'>-  - main 4.x kernel tree</div><div class='del'>-  - 4.x.y -stable kernel tree</div><div class='del'>-  - 4.x -git kernel patches</div><div class='del'>-  - subsystem specific kernel trees and patches</div><div class='del'>-  - the 4.x -next kernel tree for integration tests</div><div class='del'>-</div><div class='del'>-4.x kernel tree</div><div class='del'>------------------</div><div class='del'>-4.x kernels are maintained by Linus Torvalds, and can be found on</div><div class='del'>-https://kernel.org in the pub/linux/kernel/v4.x/ directory.  Its development</div><div class='del'>-process is as follows:</div><div class='del'>-</div><div class='del'>-  - As soon as a new kernel is released a two weeks window is open,</div><div class='del'>-    during this period of time maintainers can submit big diffs to</div><div class='del'>-    Linus, usually the patches that have already been included in the</div><div class='del'>-    -next kernel for a few weeks.  The preferred way to submit big changes</div><div class='del'>-    is using git (the kernel's source management tool, more information</div><div class='del'>-    can be found at https://git-scm.com/) but plain patches are also just</div><div class='del'>-    fine.</div><div class='del'>-  - After two weeks a -rc1 kernel is released it is now possible to push</div><div class='del'>-    only patches that do not include new features that could affect the</div><div class='del'>-    stability of the whole kernel.  Please note that a whole new driver</div><div class='del'>-    (or filesystem) might be accepted after -rc1 because there is no</div><div class='del'>-    risk of causing regressions with such a change as long as the change</div><div class='del'>-    is self-contained and does not affect areas outside of the code that</div><div class='del'>-    is being added.  git can be used to send patches to Linus after -rc1</div><div class='del'>-    is released, but the patches need to also be sent to a public</div><div class='del'>-    mailing list for review.</div><div class='del'>-  - A new -rc is released whenever Linus deems the current git tree to</div><div class='del'>-    be in a reasonably sane state adequate for testing.  The goal is to</div><div class='del'>-    release a new -rc kernel every week.</div><div class='del'>-  - Process continues until the kernel is considered "ready", the</div><div class='del'>-    process should last around 6 weeks.</div><div class='del'>-</div><div class='del'>-It is worth mentioning what Andrew Morton wrote on the linux-kernel</div><div class='del'>-mailing list about kernel releases:</div><div class='del'>-</div><div class='del'>-	*"Nobody knows when a kernel will be released, because it's</div><div class='del'>-	released according to perceived bug status, not according to a</div><div class='del'>-	preconceived timeline."*</div><div class='del'>-</div><div class='del'>-4.x.y -stable kernel tree</div><div class='del'>--------------------------</div><div class='del'>-Kernels with 3-part versions are -stable kernels. They contain</div><div class='del'>-relatively small and critical fixes for security problems or significant</div><div class='del'>-regressions discovered in a given 4.x kernel.</div><div class='del'>-</div><div class='del'>-This is the recommended branch for users who want the most recent stable</div><div class='del'>-kernel and are not interested in helping test development/experimental</div><div class='del'>-versions.</div><div class='del'>-</div><div class='del'>-If no 4.x.y kernel is available, then the highest numbered 4.x</div><div class='del'>-kernel is the current stable kernel.</div><div class='del'>-</div><div class='del'>-4.x.y are maintained by the "stable" team &lt;stable@vger.kernel.org&gt;, and</div><div class='del'>-are released as needs dictate.  The normal release period is approximately</div><div class='del'>-two weeks, but it can be longer if there are no pressing problems.  A</div><div class='del'>-security-related problem, instead, can cause a release to happen almost</div><div class='del'>-instantly.</div><div class='del'>-</div><div class='del'>-The file Documentation/stable_kernel_rules.txt in the kernel tree</div><div class='del'>-documents what kinds of changes are acceptable for the -stable tree, and</div><div class='del'>-how the release process works.</div><div class='del'>-</div><div class='del'>-4.x -git patches</div><div class='del'>-----------------</div><div class='del'>-These are daily snapshots of Linus' kernel tree which are managed in a</div><div class='del'>-git repository (hence the name.) These patches are usually released</div><div class='del'>-daily and represent the current state of Linus' tree.  They are more</div><div class='del'>-experimental than -rc kernels since they are generated automatically</div><div class='del'>-without even a cursory glance to see if they are sane.</div><div class='del'>-</div><div class='del'>-Subsystem Specific kernel trees and patches</div><div class='del'>--------------------------------------------</div><div class='del'>-The maintainers of the various kernel subsystems --- and also many</div><div class='del'>-kernel subsystem developers --- expose their current state of</div><div class='del'>-development in source repositories.  That way, others can see what is</div><div class='del'>-happening in the different areas of the kernel.  In areas where</div><div class='del'>-development is rapid, a developer may be asked to base his submissions</div><div class='del'>-onto such a subsystem kernel tree so that conflicts between the</div><div class='del'>-submission and other already ongoing work are avoided.</div><div class='del'>-</div><div class='del'>-Most of these repositories are git trees, but there are also other SCMs</div><div class='del'>-in use, or patch queues being published as quilt series.  Addresses of</div><div class='del'>-these subsystem repositories are listed in the MAINTAINERS file.  Many</div><div class='del'>-of them can be browsed at https://git.kernel.org/.</div><div class='del'>-</div><div class='del'>-Before a proposed patch is committed to such a subsystem tree, it is</div><div class='del'>-subject to review which primarily happens on mailing lists (see the</div><div class='del'>-respective section below).  For several kernel subsystems, this review</div><div class='del'>-process is tracked with the tool patchwork.  Patchwork offers a web</div><div class='del'>-interface which shows patch postings, any comments on a patch or</div><div class='del'>-revisions to it, and maintainers can mark patches as under review,</div><div class='del'>-accepted, or rejected.  Most of these patchwork sites are listed at</div><div class='del'>-https://patchwork.kernel.org/.</div><div class='del'>-</div><div class='del'>-4.x -next kernel tree for integration tests</div><div class='del'>--------------------------------------------</div><div class='del'>-Before updates from subsystem trees are merged into the mainline 4.x</div><div class='del'>-tree, they need to be integration-tested.  For this purpose, a special</div><div class='del'>-testing repository exists into which virtually all subsystem trees are</div><div class='del'>-pulled on an almost daily basis:</div><div class='del'>-</div><div class='del'>-	https://git.kernel.org/?p=linux/kernel/git/next/linux-next.git</div><div class='del'>-</div><div class='del'>-This way, the -next kernel gives a summary outlook onto what will be</div><div class='del'>-expected to go into the mainline kernel at the next merge period.</div><div class='del'>-Adventurous testers are very welcome to runtime-test the -next kernel.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Bug Reporting</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-https://bugzilla.kernel.org is where the Linux kernel developers track kernel</div><div class='del'>-bugs.  Users are encouraged to report all bugs that they find in this</div><div class='del'>-tool.  For details on how to use the kernel bugzilla, please see:</div><div class='del'>-</div><div class='del'>-	https://bugzilla.kernel.org/page.cgi?id=faq.html</div><div class='del'>-</div><div class='del'>-The file REPORTING-BUGS in the main kernel source directory has a good</div><div class='del'>-template for how to report a possible kernel bug, and details what kind</div><div class='del'>-of information is needed by the kernel developers to help track down the</div><div class='del'>-problem.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Managing bug reports</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-One of the best ways to put into practice your hacking skills is by fixing</div><div class='del'>-bugs reported by other people. Not only you will help to make the kernel</div><div class='del'>-more stable, you'll learn to fix real world problems and you will improve</div><div class='del'>-your skills, and other developers will be aware of your presence. Fixing</div><div class='del'>-bugs is one of the best ways to get merits among other developers, because</div><div class='del'>-not many people like wasting time fixing other people's bugs.</div><div class='del'>-</div><div class='del'>-To work in the already reported bug reports, go to https://bugzilla.kernel.org.</div><div class='del'>-If you want to be advised of the future bug reports, you can subscribe to the</div><div class='del'>-bugme-new mailing list (only new bug reports are mailed here) or to the</div><div class='del'>-bugme-janitor mailing list (every change in the bugzilla is mailed here)</div><div class='del'>-</div><div class='del'>-	https://lists.linux-foundation.org/mailman/listinfo/bugme-new</div><div class='del'>-</div><div class='del'>-	https://lists.linux-foundation.org/mailman/listinfo/bugme-janitors</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Mailing lists</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-As some of the above documents describe, the majority of the core kernel</div><div class='del'>-developers participate on the Linux Kernel Mailing list.  Details on how</div><div class='del'>-to subscribe and unsubscribe from the list can be found at:</div><div class='del'>-</div><div class='del'>-	http://vger.kernel.org/vger-lists.html#linux-kernel</div><div class='del'>-</div><div class='del'>-There are archives of the mailing list on the web in many different</div><div class='del'>-places.  Use a search engine to find these archives.  For example:</div><div class='del'>-</div><div class='del'>-	http://dir.gmane.org/gmane.linux.kernel</div><div class='del'>-</div><div class='del'>-It is highly recommended that you search the archives about the topic</div><div class='del'>-you want to bring up, before you post it to the list. A lot of things</div><div class='del'>-already discussed in detail are only recorded at the mailing list</div><div class='del'>-archives.</div><div class='del'>-</div><div class='del'>-Most of the individual kernel subsystems also have their own separate</div><div class='del'>-mailing list where they do their development efforts.  See the</div><div class='del'>-MAINTAINERS file for a list of what these lists are for the different</div><div class='del'>-groups.</div><div class='del'>-</div><div class='del'>-Many of the lists are hosted on kernel.org. Information on them can be</div><div class='del'>-found at:</div><div class='del'>-</div><div class='del'>-	http://vger.kernel.org/vger-lists.html</div><div class='del'>-</div><div class='del'>-Please remember to follow good behavioral habits when using the lists.</div><div class='del'>-Though a bit cheesy, the following URL has some simple guidelines for</div><div class='del'>-interacting with the list (or any list):</div><div class='del'>-</div><div class='del'>-	http://www.albion.com/netiquette/</div><div class='del'>-</div><div class='del'>-If multiple people respond to your mail, the CC: list of recipients may</div><div class='del'>-get pretty large. Don't remove anybody from the CC: list without a good</div><div class='del'>-reason, or don't reply only to the list address. Get used to receiving the</div><div class='del'>-mail twice, one from the sender and the one from the list, and don't try</div><div class='del'>-to tune that by adding fancy mail-headers, people will not like it.</div><div class='del'>-</div><div class='del'>-Remember to keep the context and the attribution of your replies intact,</div><div class='del'>-keep the "John Kernelhacker wrote ...:" lines at the top of your reply, and</div><div class='del'>-add your statements between the individual quoted sections instead of</div><div class='del'>-writing at the top of the mail.</div><div class='del'>-</div><div class='del'>-If you add patches to your mail, make sure they are plain readable text</div><div class='del'>-as stated in Documentation/SubmittingPatches.</div><div class='del'>-Kernel developers don't want to deal with</div><div class='del'>-attachments or compressed patches; they may want to comment on</div><div class='del'>-individual lines of your patch, which works only that way. Make sure you</div><div class='del'>-use a mail program that does not mangle spaces and tab characters. A</div><div class='del'>-good first test is to send the mail to yourself and try to apply your</div><div class='del'>-own patch by yourself. If that doesn't work, get your mail program fixed</div><div class='del'>-or change it until it works.</div><div class='del'>-</div><div class='del'>-Above all, please remember to show respect to other subscribers.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Working with the community</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-The goal of the kernel community is to provide the best possible kernel</div><div class='del'>-there is.  When you submit a patch for acceptance, it will be reviewed</div><div class='del'>-on its technical merits and those alone.  So, what should you be</div><div class='del'>-expecting?</div><div class='del'>-</div><div class='del'>-  - criticism</div><div class='del'>-  - comments</div><div class='del'>-  - requests for change</div><div class='del'>-  - requests for justification</div><div class='del'>-  - silence</div><div class='del'>-</div><div class='del'>-Remember, this is part of getting your patch into the kernel.  You have</div><div class='del'>-to be able to take criticism and comments about your patches, evaluate</div><div class='del'>-them at a technical level and either rework your patches or provide</div><div class='del'>-clear and concise reasoning as to why those changes should not be made.</div><div class='del'>-If there are no responses to your posting, wait a few days and try</div><div class='del'>-again, sometimes things get lost in the huge volume.</div><div class='del'>-</div><div class='del'>-What should you not do?</div><div class='del'>-</div><div class='del'>-  - expect your patch to be accepted without question</div><div class='del'>-  - become defensive</div><div class='del'>-  - ignore comments</div><div class='del'>-  - resubmit the patch without making any of the requested changes</div><div class='del'>-</div><div class='del'>-In a community that is looking for the best technical solution possible,</div><div class='del'>-there will always be differing opinions on how beneficial a patch is.</div><div class='del'>-You have to be cooperative, and willing to adapt your idea to fit within</div><div class='del'>-the kernel.  Or at least be willing to prove your idea is worth it.</div><div class='del'>-Remember, being wrong is acceptable as long as you are willing to work</div><div class='del'>-toward a solution that is right.</div><div class='del'>-</div><div class='del'>-It is normal that the answers to your first patch might simply be a list</div><div class='del'>-of a dozen things you should correct.  This does **not** imply that your</div><div class='del'>-patch will not be accepted, and it is **not** meant against you</div><div class='del'>-personally.  Simply correct all issues raised against your patch and</div><div class='del'>-resend it.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Differences between the kernel community and corporate structures</div><div class='del'>------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-The kernel community works differently than most traditional corporate</div><div class='del'>-development environments.  Here are a list of things that you can try to</div><div class='del'>-do to avoid problems:</div><div class='del'>-</div><div class='del'>-  Good things to say regarding your proposed changes:</div><div class='del'>-</div><div class='del'>-    - "This solves multiple problems."</div><div class='del'>-    - "This deletes 2000 lines of code."</div><div class='del'>-    - "Here is a patch that explains what I am trying to describe."</div><div class='del'>-    - "I tested it on 5 different architectures..."</div><div class='del'>-    - "Here is a series of small patches that..."</div><div class='del'>-    - "This increases performance on typical machines..."</div><div class='del'>-</div><div class='del'>-  Bad things you should avoid saying:</div><div class='del'>-</div><div class='del'>-    - "We did it this way in AIX/ptx/Solaris, so therefore it must be</div><div class='del'>-      good..."</div><div class='del'>-    - "I've being doing this for 20 years, so..."</div><div class='del'>-    - "This is required for my company to make money"</div><div class='del'>-    - "This is for our Enterprise product line."</div><div class='del'>-    - "Here is my 1000 page design document that describes my idea"</div><div class='del'>-    - "I've been working on this for 6 months..."</div><div class='del'>-    - "Here's a 5000 line patch that..."</div><div class='del'>-    - "I rewrote all of the current mess, and here it is..."</div><div class='del'>-    - "I have a deadline, and this patch needs to be applied now."</div><div class='del'>-</div><div class='del'>-Another way the kernel community is different than most traditional</div><div class='del'>-software engineering work environments is the faceless nature of</div><div class='del'>-interaction.  One benefit of using email and irc as the primary forms of</div><div class='del'>-communication is the lack of discrimination based on gender or race.</div><div class='del'>-The Linux kernel work environment is accepting of women and minorities</div><div class='del'>-because all you are is an email address.  The international aspect also</div><div class='del'>-helps to level the playing field because you can't guess gender based on</div><div class='del'>-a person's name. A man may be named Andrea and a woman may be named Pat.</div><div class='del'>-Most women who have worked in the Linux kernel and have expressed an</div><div class='del'>-opinion have had positive experiences.</div><div class='del'>-</div><div class='del'>-The language barrier can cause problems for some people who are not</div><div class='del'>-comfortable with English.  A good grasp of the language can be needed in</div><div class='del'>-order to get ideas across properly on mailing lists, so it is</div><div class='del'>-recommended that you check your emails to make sure they make sense in</div><div class='del'>-English before sending them.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Break up your changes</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-The Linux kernel community does not gladly accept large chunks of code</div><div class='del'>-dropped on it all at once.  The changes need to be properly introduced,</div><div class='del'>-discussed, and broken up into tiny, individual portions.  This is almost</div><div class='del'>-the exact opposite of what companies are used to doing.  Your proposal</div><div class='del'>-should also be introduced very early in the development process, so that</div><div class='del'>-you can receive feedback on what you are doing.  It also lets the</div><div class='del'>-community feel that you are working with them, and not simply using them</div><div class='del'>-as a dumping ground for your feature.  However, don't send 50 emails at</div><div class='del'>-one time to a mailing list, your patch series should be smaller than</div><div class='del'>-that almost all of the time.</div><div class='del'>-</div><div class='del'>-The reasons for breaking things up are the following:</div><div class='del'>-</div><div class='del'>-1) Small patches increase the likelihood that your patches will be</div><div class='del'>-   applied, since they don't take much time or effort to verify for</div><div class='del'>-   correctness.  A 5 line patch can be applied by a maintainer with</div><div class='del'>-   barely a second glance. However, a 500 line patch may take hours to</div><div class='del'>-   review for correctness (the time it takes is exponentially</div><div class='del'>-   proportional to the size of the patch, or something).</div><div class='del'>-</div><div class='del'>-   Small patches also make it very easy to debug when something goes</div><div class='del'>-   wrong.  It's much easier to back out patches one by one than it is</div><div class='del'>-   to dissect a very large patch after it's been applied (and broken</div><div class='del'>-   something).</div><div class='del'>-</div><div class='del'>-2) It's important not only to send small patches, but also to rewrite</div><div class='del'>-   and simplify (or simply re-order) patches before submitting them.</div><div class='del'>-</div><div class='del'>-Here is an analogy from kernel developer Al Viro:</div><div class='del'>-</div><div class='del'>-	*"Think of a teacher grading homework from a math student.  The</div><div class='del'>-	teacher does not want to see the student's trials and errors</div><div class='del'>-	before they came up with the solution. They want to see the</div><div class='del'>-	cleanest, most elegant answer.  A good student knows this, and</div><div class='del'>-	would never submit her intermediate work before the final</div><div class='del'>-	solution.*</div><div class='del'>-</div><div class='del'>-	*The same is true of kernel development. The maintainers and</div><div class='del'>-	reviewers do not want to see the thought process behind the</div><div class='del'>-	solution to the problem one is solving. They want to see a</div><div class='del'>-	simple and elegant solution."*</div><div class='del'>-</div><div class='del'>-It may be challenging to keep the balance between presenting an elegant</div><div class='del'>-solution and working together with the community and discussing your</div><div class='del'>-unfinished work. Therefore it is good to get early in the process to</div><div class='del'>-get feedback to improve your work, but also keep your changes in small</div><div class='del'>-chunks that they may get already accepted, even when your whole task is</div><div class='del'>-not ready for inclusion now.</div><div class='del'>-</div><div class='del'>-Also realize that it is not acceptable to send patches for inclusion</div><div class='del'>-that are unfinished and will be "fixed up later."</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Justify your change</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-Along with breaking up your patches, it is very important for you to let</div><div class='del'>-the Linux community know why they should add this change.  New features</div><div class='del'>-must be justified as being needed and useful.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Document your change</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-When sending in your patches, pay special attention to what you say in</div><div class='del'>-the text in your email.  This information will become the ChangeLog</div><div class='del'>-information for the patch, and will be preserved for everyone to see for</div><div class='del'>-all time.  It should describe the patch completely, containing:</div><div class='del'>-</div><div class='del'>-  - why the change is necessary</div><div class='del'>-  - the overall design approach in the patch</div><div class='del'>-  - implementation details</div><div class='del'>-  - testing results</div><div class='del'>-</div><div class='del'>-For more details on what this should all look like, please see the</div><div class='del'>-ChangeLog section of the document:</div><div class='del'>-</div><div class='del'>-  "The Perfect Patch"</div><div class='del'>-      http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-All of these things are sometimes very hard to do. It can take years to</div><div class='del'>-perfect these practices (if at all). It's a continuous process of</div><div class='del'>-improvement that requires a lot of patience and determination. But</div><div class='del'>-don't give up, it's possible. Many have done it before, and each had to</div><div class='del'>-start exactly where you are now.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-----------</div><div class='del'>-</div><div class='del'>-Thanks to Paolo Ciarrocchi who allowed the "Development Process"</div><div class='del'>-(https://lwn.net/Articles/94386/) section</div><div class='del'>-to be based on text he had written, and to Randy Dunlap and Gerrit</div><div class='del'>-Huizenga for some of the list of things you should and should not say.</div><div class='del'>-Also thanks to Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,</div><div class='del'>-Vojtech Pavlik, Jan Kara, Josh Boyer, Kees Cook, Andrew Morton, Andi</div><div class='del'>-Kleen, Vadim Lobanov, Jesper Juhl, Adrian Bunk, Keri Harris, Frans Pop,</div><div class='del'>-David A. Wheeler, Junio Hamano, Michael Kerrisk, and Alex Shepard for</div><div class='del'>-their review, comments, and contributions.  Without their help, this</div><div class='del'>-document would not have been possible.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Maintainer: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/Documentation/IPMI.txt b/Documentation/IPMI.txt<br/>index c0d8788e75d3..6962cab997ef 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/IPMI.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/IPMI.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/IPMI.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/IPMI.txt</a></div><div class='hunk'>@@ -111,6 +111,8 @@ ipmi_ssif - A driver for accessing BMCs on the SMBus. It uses the</div><div class='ctx'> I2C kernel driver's SMBus interfaces to send and receive IPMI messages</div><div class='ctx'> over the SMBus.</div><div class='ctx'> </div><div class='add'>+ipmi_powernv - A driver for access BMCs on POWERNV systems.</div><div class='add'>+</div><div class='ctx'> ipmi_watchdog - IPMI requires systems to have a very capable watchdog</div><div class='ctx'> timer.  This driver implements the standard Linux watchdog timer</div><div class='ctx'> interface on top of the IPMI message handler.</div><div class='hunk'>@@ -118,17 +120,15 @@ interface on top of the IPMI message handler.</div><div class='ctx'> ipmi_poweroff - Some systems support the ability to be turned off via</div><div class='ctx'> IPMI commands.</div><div class='ctx'> </div><div class='del'>-These are all individually selectable via configuration options.</div><div class='add'>+bt-bmc - This is not part of the main driver, but instead a driver for</div><div class='add'>+accessing a BMC-side interface of a BT interface.  It is used on BMCs</div><div class='add'>+running Linux to provide an interface to the host.</div><div class='ctx'> </div><div class='del'>-Note that the KCS-only interface has been removed.  The af_ipmi driver</div><div class='del'>-is no longer supported and has been removed because it was impossible</div><div class='del'>-to do 32 bit emulation on 64-bit kernels with it.</div><div class='add'>+These are all individually selectable via configuration options.</div><div class='ctx'> </div><div class='ctx'> Much documentation for the interface is in the include files.  The</div><div class='ctx'> IPMI include files are:</div><div class='ctx'> </div><div class='del'>-net/af_ipmi.h - Contains the socket interface.</div><div class='del'>-</div><div class='ctx'> linux/ipmi.h - Contains the user interface and IOCTL interface for IPMI.</div><div class='ctx'> </div><div class='ctx'> linux/ipmi_smi.h - Contains the interface for system management interfaces</div><div class='hunk'>@@ -245,9 +245,19 @@ addressed (because some boards actually have multiple BMCs on them)</div><div class='ctx'> and the user should not have to care what type of SMI is below them.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+Watching For Interfaces</div><div class='add'>+</div><div class='add'>+When your code comes up, the IPMI driver may or may not have detected</div><div class='add'>+if IPMI devices exist.  So you might have to defer your setup until</div><div class='add'>+the device is detected, or you might be able to do it immediately.</div><div class='add'>+To handle this, and to allow for discovery, you register an SMI</div><div class='add'>+watcher with ipmi_smi_watcher_register() to iterate over interfaces</div><div class='add'>+and tell you when they come and go.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Creating the User</div><div class='ctx'> </div><div class='del'>-To user the message handler, you must first create a user using</div><div class='add'>+To use the message handler, you must first create a user using</div><div class='ctx'> ipmi_create_user.  The interface number specifies which SMI you want</div><div class='ctx'> to connect to, and you must supply callback functions to be called</div><div class='ctx'> when data comes in.  The callback function can run at interrupt level,</div><div class='hunk'>@@ -263,7 +273,7 @@ closing the device automatically destroys the user.</div><div class='ctx'> </div><div class='ctx'> Messaging</div><div class='ctx'> </div><div class='del'>-To send a message from kernel-land, the ipmi_request() call does</div><div class='add'>+To send a message from kernel-land, the ipmi_request_settime() call does</div><div class='ctx'> pretty much all message handling.  Most of the parameter are</div><div class='ctx'> self-explanatory.  However, it takes a "msgid" parameter.  This is NOT</div><div class='ctx'> the sequence number of messages.  It is simply a long value that is</div><div class='hunk'>@@ -352,11 +362,12 @@ that for more details.</div><div class='ctx'> The SI Driver</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='del'>-The SI driver allows up to 4 KCS or SMIC interfaces to be configured</div><div class='del'>-in the system.  By default, scan the ACPI tables for interfaces, and</div><div class='del'>-if it doesn't find any the driver will attempt to register one KCS</div><div class='del'>-interface at the spec-specified I/O port 0xca2 without interrupts.</div><div class='del'>-You can change this at module load time (for a module) with:</div><div class='add'>+The SI driver allows KCS, BT, and SMIC interfaces to be configured</div><div class='add'>+in the system.  It discovers interfaces through a host of different</div><div class='add'>+methods, depending on the system.</div><div class='add'>+</div><div class='add'>+You can specify up to four interfaces on the module load line and</div><div class='add'>+control some module parameters:</div><div class='ctx'> </div><div class='ctx'>   modprobe ipmi_si.o type=&lt;type1&gt;,&lt;type2&gt;....</div><div class='ctx'>        ports=&lt;port1&gt;,&lt;port2&gt;... addrs=&lt;addr1&gt;,&lt;addr2&gt;...</div><div class='hunk'>@@ -367,7 +378,7 @@ You can change this at module load time (for a module) with:</div><div class='ctx'>        force_kipmid=&lt;enable1&gt;,&lt;enable2&gt;,...</div><div class='ctx'>        kipmid_max_busy_us=&lt;ustime1&gt;,&lt;ustime2&gt;,...</div><div class='ctx'>        unload_when_empty=[0|1]</div><div class='del'>-       trydefaults=[0|1] trydmi=[0|1] tryacpi=[0|1]</div><div class='add'>+       trydmi=[0|1] tryacpi=[0|1]</div><div class='ctx'>        tryplatform=[0|1] trypci=[0|1]</div><div class='ctx'> </div><div class='ctx'> Each of these except try... items is a list, the first item for the</div><div class='hunk'>@@ -386,10 +397,6 @@ use the I/O port given as the device address.</div><div class='ctx'> If you specify irqs as non-zero for an interface, the driver will</div><div class='ctx'> attempt to use the given interrupt for the device.</div><div class='ctx'> </div><div class='del'>-trydefaults sets whether the standard IPMI interface at 0xca2 and</div><div class='del'>-any interfaces specified by ACPE are tried.  By default, the driver</div><div class='del'>-tries it, set this value to zero to turn this off.</div><div class='del'>-</div><div class='ctx'> The other try... items disable discovery by their corresponding</div><div class='ctx'> names.  These are all enabled by default, set them to zero to disable</div><div class='ctx'> them.  The tryplatform disables openfirmware.</div><div class='hunk'>@@ -434,7 +441,7 @@ kernel command line as:</div><div class='ctx'> </div><div class='ctx'>   ipmi_si.type=&lt;type1&gt;,&lt;type2&gt;...</div><div class='ctx'>        ipmi_si.ports=&lt;port1&gt;,&lt;port2&gt;... ipmi_si.addrs=&lt;addr1&gt;,&lt;addr2&gt;...</div><div class='del'>-       ipmi_si.irqs=&lt;irq1&gt;,&lt;irq2&gt;... ipmi_si.trydefaults=[0|1]</div><div class='add'>+       ipmi_si.irqs=&lt;irq1&gt;,&lt;irq2&gt;...</div><div class='ctx'>        ipmi_si.regspacings=&lt;sp1&gt;,&lt;sp2&gt;,...</div><div class='ctx'>        ipmi_si.regsizes=&lt;size1&gt;,&lt;size2&gt;,...</div><div class='ctx'>        ipmi_si.regshifts=&lt;shift1&gt;,&lt;shift2&gt;,...</div><div class='hunk'>@@ -444,11 +451,6 @@ kernel command line as:</div><div class='ctx'> </div><div class='ctx'> It works the same as the module parameters of the same names.</div><div class='ctx'> </div><div class='del'>-By default, the driver will attempt to detect any device specified by</div><div class='del'>-ACPI, and if none of those then a KCS device at the spec-specified</div><div class='del'>-0xca2.  If you want to turn this off, set the "trydefaults" option to</div><div class='del'>-false.</div><div class='del'>-</div><div class='ctx'> If your IPMI interface does not support interrupts and is a KCS or</div><div class='ctx'> SMIC interface, the IPMI driver will start a kernel thread for the</div><div class='ctx'> interface to help speed things up.  This is a low-priority kernel</div><div class='hunk'>@@ -500,7 +502,8 @@ at module load time (for a module) with:</div><div class='ctx'> 	addr=&lt;i2caddr1&gt;[,&lt;i2caddr2&gt;[,...]]</div><div class='ctx'> 	adapter=&lt;adapter1&gt;[,&lt;adapter2&gt;[...]]</div><div class='ctx'> 	dbg=&lt;flags1&gt;,&lt;flags2&gt;...</div><div class='del'>-        slave_addrs=&lt;addr1&gt;,&lt;addr2&gt;,...</div><div class='add'>+	slave_addrs=&lt;addr1&gt;,&lt;addr2&gt;,...</div><div class='add'>+	tryacpi=[0|1] trydmi=[0|1]</div><div class='ctx'> 	[dbg_probe=1]</div><div class='ctx'> </div><div class='ctx'> The addresses are normal I2C addresses.  The adapter is the string</div><div class='hunk'>@@ -513,6 +516,9 @@ spaces in kernel parameters.</div><div class='ctx'> The debug flags are bit flags for each BMC found, they are:</div><div class='ctx'> IPMI messages: 1, driver state: 2, timing: 4, I2C probe: 8</div><div class='ctx'> </div><div class='add'>+The tryxxx parameters can be used to disable detecting interfaces</div><div class='add'>+from various sources.</div><div class='add'>+</div><div class='ctx'> Setting dbg_probe to 1 will enable debugging of the probing and</div><div class='ctx'> detection process for BMCs on the SMBusses.</div><div class='ctx'> </div><div class='hunk'>@@ -535,7 +541,8 @@ kernel command line as:</div><div class='ctx'> 	ipmi_ssif.adapter=&lt;adapter1&gt;[,&lt;adapter2&gt;[...]]</div><div class='ctx'> 	ipmi_ssif.dbg=&lt;flags1&gt;[,&lt;flags2&gt;[...]]</div><div class='ctx'> 	ipmi_ssif.dbg_probe=1</div><div class='del'>-        ipmi_ssif.slave_addrs=&lt;addr1&gt;[,&lt;addr2&gt;[...]]</div><div class='add'>+	ipmi_ssif.slave_addrs=&lt;addr1&gt;[,&lt;addr2&gt;[...]]</div><div class='add'>+	ipmi_ssif.tryacpi=[0|1] ipmi_ssif.trydmi=[0|1]</div><div class='ctx'> </div><div class='ctx'> These are the same options as on the module command line.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx<br/>index 92deea30b183..bcf529f6cf9b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/Makefile.sphinx?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/Makefile.sphinx</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/Makefile.sphinx?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/Makefile.sphinx</a></div><div class='hunk'>@@ -10,6 +10,8 @@ _SPHINXDIRS   = $(patsubst $(srctree)/Documentation/%/conf.py,%,$(wildcard $(src</div><div class='ctx'> SPHINX_CONF   = conf.py</div><div class='ctx'> PAPER         =</div><div class='ctx'> BUILDDIR      = $(obj)/output</div><div class='add'>+PDFLATEX      = xelatex</div><div class='add'>+LATEXOPTS     = -interaction=batchmode</div><div class='ctx'> </div><div class='ctx'> # User-friendly check for sphinx-build</div><div class='ctx'> HAVE_SPHINX := $(shell if which $(SPHINXBUILD) &gt;/dev/null 2&gt;&amp;1; then echo 1; else echo 0; fi)</div><div class='hunk'>@@ -29,7 +31,7 @@ else ifneq ($(DOCBOOKS),)</div><div class='ctx'> else # HAVE_SPHINX</div><div class='ctx'> </div><div class='ctx'> # User-friendly check for pdflatex</div><div class='del'>-HAVE_PDFLATEX := $(shell if which xelatex &gt;/dev/null 2&gt;&amp;1; then echo 1; else echo 0; fi)</div><div class='add'>+HAVE_PDFLATEX := $(shell if which $(PDFLATEX) &gt;/dev/null 2&gt;&amp;1; then echo 1; else echo 0; fi)</div><div class='ctx'> </div><div class='ctx'> # Internal variables.</div><div class='ctx'> PAPEROPT_a4     = -D latex_paper_size=a4</div><div class='hunk'>@@ -41,7 +43,7 @@ ALLSPHINXOPTS   =  $(KERNELDOC_CONF) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS)</div><div class='ctx'> I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .</div><div class='ctx'> </div><div class='ctx'> # commands; the 'cmd' from scripts/Kbuild.include is not *loopable*</div><div class='del'>-loop_cmd = $(echo-cmd) $(cmd_$(1))</div><div class='add'>+loop_cmd = $(echo-cmd) $(cmd_$(1)) || exit;</div><div class='ctx'> </div><div class='ctx'> # $2 sphinx builder e.g. "html"</div><div class='ctx'> # $3 name of the build subfolder / e.g. "media", used as:</div><div class='hunk'>@@ -51,8 +53,9 @@ loop_cmd = $(echo-cmd) $(cmd_$(1))</div><div class='ctx'> # $5 reST source folder relative to $(srctree)/$(src),</div><div class='ctx'> #    e.g. "media" for the linux-tv book-set at ./Documentation/media</div><div class='ctx'> </div><div class='del'>-quiet_cmd_sphinx = SPHINX  $@ --&gt; file://$(abspath $(BUILDDIR)/$3/$4);</div><div class='del'>-      cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media all;\</div><div class='add'>+quiet_cmd_sphinx = SPHINX  $@ --&gt; file://$(abspath $(BUILDDIR)/$3/$4)</div><div class='add'>+      cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media $2 &amp;&amp; \</div><div class='add'>+	PYTHONDONTWRITEBYTECODE=1 \</div><div class='ctx'> 	BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \</div><div class='ctx'> 	$(SPHINXBUILD) \</div><div class='ctx'> 	-b $2 \</div><div class='hunk'>@@ -61,40 +64,54 @@ quiet_cmd_sphinx = SPHINX  $@ --&gt; file://$(abspath $(BUILDDIR)/$3/$4);</div><div class='ctx'> 	-D version=$(KERNELVERSION) -D release=$(KERNELRELEASE) \</div><div class='ctx'> 	$(ALLSPHINXOPTS) \</div><div class='ctx'> 	$(abspath $(srctree)/$(src)/$5) \</div><div class='del'>-	$(abspath $(BUILDDIR)/$3/$4);</div><div class='add'>+	$(abspath $(BUILDDIR)/$3/$4)</div><div class='ctx'> </div><div class='ctx'> htmldocs:</div><div class='del'>-	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var)))</div><div class='add'>+	@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var)))</div><div class='add'>+</div><div class='add'>+linkcheckdocs:</div><div class='add'>+	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,linkcheck,$(var),,$(var)))</div><div class='ctx'> </div><div class='ctx'> latexdocs:</div><div class='add'>+	@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,latex,$(var),latex,$(var)))</div><div class='add'>+</div><div class='ctx'> ifeq ($(HAVE_PDFLATEX),0)</div><div class='del'>-	$(warning The 'xelatex' command was not found. Make sure you have it installed and in PATH to produce PDF output.)</div><div class='add'>+</div><div class='add'>+pdfdocs:</div><div class='add'>+	$(warning The '$(PDFLATEX)' command was not found. Make sure you have it installed and in PATH to produce PDF output.)</div><div class='ctx'> 	@echo "  SKIP    Sphinx $@ target."</div><div class='add'>+</div><div class='ctx'> else # HAVE_PDFLATEX</div><div class='del'>-	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,latex,$(var),latex,$(var)))</div><div class='del'>-endif # HAVE_PDFLATEX</div><div class='ctx'> </div><div class='ctx'> pdfdocs: latexdocs</div><div class='del'>-ifneq ($(HAVE_PDFLATEX),0)</div><div class='del'>-	$(foreach var,$(SPHINXDIRS), $(MAKE) PDFLATEX=xelatex LATEXOPTS="-interaction=nonstopmode" -C $(BUILDDIR)/$(var)/latex)</div><div class='add'>+	$(foreach var,$(SPHINXDIRS), $(MAKE) PDFLATEX=$(PDFLATEX) LATEXOPTS="$(LATEXOPTS)" -C $(BUILDDIR)/$(var)/latex || exit;)</div><div class='add'>+</div><div class='ctx'> endif # HAVE_PDFLATEX</div><div class='ctx'> </div><div class='ctx'> epubdocs:</div><div class='del'>-	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,epub,$(var),epub,$(var)))</div><div class='add'>+	@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,epub,$(var),epub,$(var)))</div><div class='ctx'> </div><div class='ctx'> xmldocs:</div><div class='del'>-	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,xml,$(var),xml,$(var)))</div><div class='add'>+	@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,xml,$(var),xml,$(var)))</div><div class='add'>+</div><div class='add'>+endif # HAVE_SPHINX</div><div class='add'>+</div><div class='add'>+# The following targets are independent of HAVE_SPHINX, and the rules should</div><div class='add'>+# work or silently pass without Sphinx.</div><div class='ctx'> </div><div class='ctx'> # no-ops for the Sphinx toolchain</div><div class='ctx'> sgmldocs:</div><div class='add'>+	@:</div><div class='ctx'> psdocs:</div><div class='add'>+	@:</div><div class='ctx'> mandocs:</div><div class='add'>+	@:</div><div class='ctx'> installmandocs:</div><div class='add'>+	@:</div><div class='ctx'> </div><div class='ctx'> cleandocs:</div><div class='ctx'> 	$(Q)rm -rf $(BUILDDIR)</div><div class='del'>-</div><div class='del'>-endif # HAVE_SPHINX</div><div class='add'>+	$(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media clean</div><div class='ctx'> </div><div class='ctx'> dochelp:</div><div class='ctx'> 	@echo  ' Linux kernel internal documentation in different formats (Sphinx):'</div><div class='hunk'>@@ -103,6 +120,7 @@ dochelp:</div><div class='ctx'> 	@echo  '  pdfdocs         - PDF'</div><div class='ctx'> 	@echo  '  epubdocs        - EPUB'</div><div class='ctx'> 	@echo  '  xmldocs         - XML'</div><div class='add'>+	@echo  '  linkcheckdocs   - check for broken external links (will connect to external hosts)'</div><div class='ctx'> 	@echo  '  cleandocs       - clean all generated files'</div><div class='ctx'> 	@echo</div><div class='ctx'> 	@echo  '  make SPHINXDIRS="s1 s2" [target] Generate only docs of folder s1, s2'</div><div class='head'>diff --git a/Documentation/ManagementStyle b/Documentation/ManagementStyle<br/>deleted file mode 100644<br/>index dea2e66c9a10..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/ManagementStyle?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ManagementStyle</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,288 +0,0 @@</div><div class='del'>-.. _managementstyle:</div><div class='del'>-</div><div class='del'>-Linux kernel management style</div><div class='del'>-=============================</div><div class='del'>-</div><div class='del'>-This is a short document describing the preferred (or made up, depending</div><div class='del'>-on who you ask) management style for the linux kernel.  It's meant to</div><div class='del'>-mirror the CodingStyle document to some degree, and mainly written to</div><div class='del'>-avoid answering [#f1]_  the same (or similar) questions over and over again.</div><div class='del'>-</div><div class='del'>-Management style is very personal and much harder to quantify than</div><div class='del'>-simple coding style rules, so this document may or may not have anything</div><div class='del'>-to do with reality.  It started as a lark, but that doesn't mean that it</div><div class='del'>-might not actually be true. You'll have to decide for yourself.</div><div class='del'>-</div><div class='del'>-Btw, when talking about "kernel manager", it's all about the technical</div><div class='del'>-lead persons, not the people who do traditional management inside</div><div class='del'>-companies.  If you sign purchase orders or you have any clue about the</div><div class='del'>-budget of your group, you're almost certainly not a kernel manager.</div><div class='del'>-These suggestions may or may not apply to you.</div><div class='del'>-</div><div class='del'>-First off, I'd suggest buying "Seven Habits of Highly Effective</div><div class='del'>-People", and NOT read it.  Burn it, it's a great symbolic gesture.</div><div class='del'>-</div><div class='del'>-.. [#f1] This document does so not so much by answering the question, but by</div><div class='del'>-  making it painfully obvious to the questioner that we don't have a clue</div><div class='del'>-  to what the answer is.</div><div class='del'>-</div><div class='del'>-Anyway, here goes:</div><div class='del'>-</div><div class='del'>-.. _decisions:</div><div class='del'>-</div><div class='del'>-1) Decisions</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-Everybody thinks managers make decisions, and that decision-making is</div><div class='del'>-important.  The bigger and more painful the decision, the bigger the</div><div class='del'>-manager must be to make it.  That's very deep and obvious, but it's not</div><div class='del'>-actually true.</div><div class='del'>-</div><div class='del'>-The name of the game is to **avoid** having to make a decision.  In</div><div class='del'>-particular, if somebody tells you "choose (a) or (b), we really need you</div><div class='del'>-to decide on this", you're in trouble as a manager.  The people you</div><div class='del'>-manage had better know the details better than you, so if they come to</div><div class='del'>-you for a technical decision, you're screwed.  You're clearly not</div><div class='del'>-competent to make that decision for them.</div><div class='del'>-</div><div class='del'>-(Corollary:if the people you manage don't know the details better than</div><div class='del'>-you, you're also screwed, although for a totally different reason.</div><div class='del'>-Namely that you are in the wrong job, and that **they** should be managing</div><div class='del'>-your brilliance instead).</div><div class='del'>-</div><div class='del'>-So the name of the game is to **avoid** decisions, at least the big and</div><div class='del'>-painful ones.  Making small and non-consequential decisions is fine, and</div><div class='del'>-makes you look like you know what you're doing, so what a kernel manager</div><div class='del'>-needs to do is to turn the big and painful ones into small things where</div><div class='del'>-nobody really cares.</div><div class='del'>-</div><div class='del'>-It helps to realize that the key difference between a big decision and a</div><div class='del'>-small one is whether you can fix your decision afterwards.  Any decision</div><div class='del'>-can be made small by just always making sure that if you were wrong (and</div><div class='del'>-you **will** be wrong), you can always undo the damage later by</div><div class='del'>-backtracking.  Suddenly, you get to be doubly managerial for making</div><div class='del'>-**two** inconsequential decisions - the wrong one **and** the right one.</div><div class='del'>-</div><div class='del'>-And people will even see that as true leadership (*cough* bullshit</div><div class='del'>-*cough*).</div><div class='del'>-</div><div class='del'>-Thus the key to avoiding big decisions becomes to just avoiding to do</div><div class='del'>-things that can't be undone.  Don't get ushered into a corner from which</div><div class='del'>-you cannot escape.  A cornered rat may be dangerous - a cornered manager</div><div class='del'>-is just pitiful.</div><div class='del'>-</div><div class='del'>-It turns out that since nobody would be stupid enough to ever really let</div><div class='del'>-a kernel manager have huge fiscal responsibility **anyway**, it's usually</div><div class='del'>-fairly easy to backtrack.  Since you're not going to be able to waste</div><div class='del'>-huge amounts of money that you might not be able to repay, the only</div><div class='del'>-thing you can backtrack on is a technical decision, and there</div><div class='del'>-back-tracking is very easy: just tell everybody that you were an</div><div class='del'>-incompetent nincompoop, say you're sorry, and undo all the worthless</div><div class='del'>-work you had people work on for the last year.  Suddenly the decision</div><div class='del'>-you made a year ago wasn't a big decision after all, since it could be</div><div class='del'>-easily undone.</div><div class='del'>-</div><div class='del'>-It turns out that some people have trouble with this approach, for two</div><div class='del'>-reasons:</div><div class='del'>-</div><div class='del'>- - admitting you were an idiot is harder than it looks.  We all like to</div><div class='del'>-   maintain appearances, and coming out in public to say that you were</div><div class='del'>-   wrong is sometimes very hard indeed.</div><div class='del'>- - having somebody tell you that what you worked on for the last year</div><div class='del'>-   wasn't worthwhile after all can be hard on the poor lowly engineers</div><div class='del'>-   too, and while the actual **work** was easy enough to undo by just</div><div class='del'>-   deleting it, you may have irrevocably lost the trust of that</div><div class='del'>-   engineer.  And remember: "irrevocable" was what we tried to avoid in</div><div class='del'>-   the first place, and your decision ended up being a big one after</div><div class='del'>-   all.</div><div class='del'>-</div><div class='del'>-Happily, both of these reasons can be mitigated effectively by just</div><div class='del'>-admitting up-front that you don't have a friggin' clue, and telling</div><div class='del'>-people ahead of the fact that your decision is purely preliminary, and</div><div class='del'>-might be the wrong thing.  You should always reserve the right to change</div><div class='del'>-your mind, and make people very **aware** of that.  And it's much easier</div><div class='del'>-to admit that you are stupid when you haven't **yet** done the really</div><div class='del'>-stupid thing.</div><div class='del'>-</div><div class='del'>-Then, when it really does turn out to be stupid, people just roll their</div><div class='del'>-eyes and say "Oops, he did it again".</div><div class='del'>-</div><div class='del'>-This preemptive admission of incompetence might also make the people who</div><div class='del'>-actually do the work also think twice about whether it's worth doing or</div><div class='del'>-not.  After all, if **they** aren't certain whether it's a good idea, you</div><div class='del'>-sure as hell shouldn't encourage them by promising them that what they</div><div class='del'>-work on will be included.  Make them at least think twice before they</div><div class='del'>-embark on a big endeavor.</div><div class='del'>-</div><div class='del'>-Remember: they'd better know more about the details than you do, and</div><div class='del'>-they usually already think they have the answer to everything.  The best</div><div class='del'>-thing you can do as a manager is not to instill confidence, but rather a</div><div class='del'>-healthy dose of critical thinking on what they do.</div><div class='del'>-</div><div class='del'>-Btw, another way to avoid a decision is to plaintively just whine "can't</div><div class='del'>-we just do both?" and look pitiful.  Trust me, it works.  If it's not</div><div class='del'>-clear which approach is better, they'll eventually figure it out.  The</div><div class='del'>-answer may end up being that both teams get so frustrated by the</div><div class='del'>-situation that they just give up.</div><div class='del'>-</div><div class='del'>-That may sound like a failure, but it's usually a sign that there was</div><div class='del'>-something wrong with both projects, and the reason the people involved</div><div class='del'>-couldn't decide was that they were both wrong.  You end up coming up</div><div class='del'>-smelling like roses, and you avoided yet another decision that you could</div><div class='del'>-have screwed up on.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2) People</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-Most people are idiots, and being a manager means you'll have to deal</div><div class='del'>-with it, and perhaps more importantly, that **they** have to deal with</div><div class='del'>-**you**.</div><div class='del'>-</div><div class='del'>-It turns out that while it's easy to undo technical mistakes, it's not</div><div class='del'>-as easy to undo personality disorders.  You just have to live with</div><div class='del'>-theirs - and yours.</div><div class='del'>-</div><div class='del'>-However, in order to prepare yourself as a kernel manager, it's best to</div><div class='del'>-remember not to burn any bridges, bomb any innocent villagers, or</div><div class='del'>-alienate too many kernel developers. It turns out that alienating people</div><div class='del'>-is fairly easy, and un-alienating them is hard. Thus "alienating"</div><div class='del'>-immediately falls under the heading of "not reversible", and becomes a</div><div class='del'>-no-no according to :ref:`decisions`.</div><div class='del'>-</div><div class='del'>-There's just a few simple rules here:</div><div class='del'>-</div><div class='del'>- (1) don't call people d*ckheads (at least not in public)</div><div class='del'>- (2) learn how to apologize when you forgot rule (1)</div><div class='del'>-</div><div class='del'>-The problem with #1 is that it's very easy to do, since you can say</div><div class='del'>-"you're a d*ckhead" in millions of different ways [#f2]_, sometimes without</div><div class='del'>-even realizing it, and almost always with a white-hot conviction that</div><div class='del'>-you are right.</div><div class='del'>-</div><div class='del'>-And the more convinced you are that you are right (and let's face it,</div><div class='del'>-you can call just about **anybody** a d*ckhead, and you often **will** be</div><div class='del'>-right), the harder it ends up being to apologize afterwards.</div><div class='del'>-</div><div class='del'>-To solve this problem, you really only have two options:</div><div class='del'>-</div><div class='del'>- - get really good at apologies</div><div class='del'>- - spread the "love" out so evenly that nobody really ends up feeling</div><div class='del'>-   like they get unfairly targeted.  Make it inventive enough, and they</div><div class='del'>-   might even be amused.</div><div class='del'>-</div><div class='del'>-The option of being unfailingly polite really doesn't exist. Nobody will</div><div class='del'>-trust somebody who is so clearly hiding his true character.</div><div class='del'>-</div><div class='del'>-.. [#f2] Paul Simon sang "Fifty Ways to Leave Your Lover", because quite</div><div class='del'>-  frankly, "A Million Ways to Tell a Developer He Is a D*ckhead" doesn't</div><div class='del'>-  scan nearly as well.  But I'm sure he thought about it.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3) People II - the Good Kind</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-While it turns out that most people are idiots, the corollary to that is</div><div class='del'>-sadly that you are one too, and that while we can all bask in the secure</div><div class='del'>-knowledge that we're better than the average person (let's face it,</div><div class='del'>-nobody ever believes that they're average or below-average), we should</div><div class='del'>-also admit that we're not the sharpest knife around, and there will be</div><div class='del'>-other people that are less of an idiot than you are.</div><div class='del'>-</div><div class='del'>-Some people react badly to smart people.  Others take advantage of them.</div><div class='del'>-</div><div class='del'>-Make sure that you, as a kernel maintainer, are in the second group.</div><div class='del'>-Suck up to them, because they are the people who will make your job</div><div class='del'>-easier. In particular, they'll be able to make your decisions for you,</div><div class='del'>-which is what the game is all about.</div><div class='del'>-</div><div class='del'>-So when you find somebody smarter than you are, just coast along.  Your</div><div class='del'>-management responsibilities largely become ones of saying "Sounds like a</div><div class='del'>-good idea - go wild", or "That sounds good, but what about xxx?".  The</div><div class='del'>-second version in particular is a great way to either learn something</div><div class='del'>-new about "xxx" or seem **extra** managerial by pointing out something the</div><div class='del'>-smarter person hadn't thought about.  In either case, you win.</div><div class='del'>-</div><div class='del'>-One thing to look out for is to realize that greatness in one area does</div><div class='del'>-not necessarily translate to other areas.  So you might prod people in</div><div class='del'>-specific directions, but let's face it, they might be good at what they</div><div class='del'>-do, and suck at everything else.  The good news is that people tend to</div><div class='del'>-naturally gravitate back to what they are good at, so it's not like you</div><div class='del'>-are doing something irreversible when you **do** prod them in some</div><div class='del'>-direction, just don't push too hard.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4) Placing blame</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-Things will go wrong, and people want somebody to blame. Tag, you're it.</div><div class='del'>-</div><div class='del'>-It's not actually that hard to accept the blame, especially if people</div><div class='del'>-kind of realize that it wasn't **all** your fault.  Which brings us to the</div><div class='del'>-best way of taking the blame: do it for another guy. You'll feel good</div><div class='del'>-for taking the fall, he'll feel good about not getting blamed, and the</div><div class='del'>-guy who lost his whole 36GB porn-collection because of your incompetence</div><div class='del'>-will grudgingly admit that you at least didn't try to weasel out of it.</div><div class='del'>-</div><div class='del'>-Then make the developer who really screwed up (if you can find him) know</div><div class='del'>-**in_private** that he screwed up.  Not just so he can avoid it in the</div><div class='del'>-future, but so that he knows he owes you one.  And, perhaps even more</div><div class='del'>-importantly, he's also likely the person who can fix it.  Because, let's</div><div class='del'>-face it, it sure ain't you.</div><div class='del'>-</div><div class='del'>-Taking the blame is also why you get to be manager in the first place.</div><div class='del'>-It's part of what makes people trust you, and allow you the potential</div><div class='del'>-glory, because you're the one who gets to say "I screwed up".  And if</div><div class='del'>-you've followed the previous rules, you'll be pretty good at saying that</div><div class='del'>-by now.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5) Things to avoid</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-There's one thing people hate even more than being called "d*ckhead",</div><div class='del'>-and that is being called a "d*ckhead" in a sanctimonious voice.  The</div><div class='del'>-first you can apologize for, the second one you won't really get the</div><div class='del'>-chance.  They likely will no longer be listening even if you otherwise</div><div class='del'>-do a good job.</div><div class='del'>-</div><div class='del'>-We all think we're better than anybody else, which means that when</div><div class='del'>-somebody else puts on airs, it **really** rubs us the wrong way.  You may</div><div class='del'>-be morally and intellectually superior to everybody around you, but</div><div class='del'>-don't try to make it too obvious unless you really **intend** to irritate</div><div class='del'>-somebody [#f3]_.</div><div class='del'>-</div><div class='del'>-Similarly, don't be too polite or subtle about things. Politeness easily</div><div class='del'>-ends up going overboard and hiding the problem, and as they say, "On the</div><div class='del'>-internet, nobody can hear you being subtle". Use a big blunt object to</div><div class='del'>-hammer the point in, because you can't really depend on people getting</div><div class='del'>-your point otherwise.</div><div class='del'>-</div><div class='del'>-Some humor can help pad both the bluntness and the moralizing.  Going</div><div class='del'>-overboard to the point of being ridiculous can drive a point home</div><div class='del'>-without making it painful to the recipient, who just thinks you're being</div><div class='del'>-silly.  It can thus help get through the personal mental block we all</div><div class='del'>-have about criticism.</div><div class='del'>-</div><div class='del'>-.. [#f3] Hint: internet newsgroups that are not directly related to your work</div><div class='del'>-  are great ways to take out your frustrations at other people. Write</div><div class='del'>-  insulting posts with a sneer just to get into a good flame every once in</div><div class='del'>-  a while, and you'll feel cleansed. Just don't crap too close to home.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-6) Why me?</div><div class='del'>-----------</div><div class='del'>-</div><div class='del'>-Since your main responsibility seems to be to take the blame for other</div><div class='del'>-peoples mistakes, and make it painfully obvious to everybody else that</div><div class='del'>-you're incompetent, the obvious question becomes one of why do it in the</div><div class='del'>-first place?</div><div class='del'>-</div><div class='del'>-First off, while you may or may not get screaming teenage girls (or</div><div class='del'>-boys, let's not be judgmental or sexist here) knocking on your dressing</div><div class='del'>-room door, you **will** get an immense feeling of personal accomplishment</div><div class='del'>-for being "in charge".  Never mind the fact that you're really leading</div><div class='del'>-by trying to keep up with everybody else and running after them as fast</div><div class='del'>-as you can.  Everybody will still think you're the person in charge.</div><div class='del'>-</div><div class='del'>-It's a great job if you can hack it.</div><div class='head'>diff --git a/Documentation/PCI/MSI-HOWTO.txt b/Documentation/PCI/MSI-HOWTO.txt<br/>index cd9c9f6a7cd9..1e37138027a3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/PCI/MSI-HOWTO.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/PCI/MSI-HOWTO.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/PCI/MSI-HOWTO.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/PCI/MSI-HOWTO.txt</a></div><div class='hunk'>@@ -162,8 +162,6 @@ The following old APIs to enable and disable MSI or MSI-X interrupts should</div><div class='ctx'> not be used in new code:</div><div class='ctx'> </div><div class='ctx'>   pci_enable_msi()		/* deprecated */</div><div class='del'>-  pci_enable_msi_range()	/* deprecated */</div><div class='del'>-  pci_enable_msi_exact()	/* deprecated */</div><div class='ctx'>   pci_disable_msi()		/* deprecated */</div><div class='ctx'>   pci_enable_msix_range()	/* deprecated */</div><div class='ctx'>   pci_enable_msix_exact()	/* deprecated */</div><div class='hunk'>@@ -268,5 +266,5 @@ or disabled (0).  If 0 is found in any of the msi_bus files belonging</div><div class='ctx'> to bridges between the PCI root and the device, MSIs are disabled.</div><div class='ctx'> </div><div class='ctx'> It is also worth checking the device driver to see whether it supports MSIs.</div><div class='del'>-For example, it may contain calls to pci_enable_msi_range() or</div><div class='del'>-pci_enable_msix_range().</div><div class='add'>+For example, it may contain calls to pci_irq_alloc_vectors() with the</div><div class='add'>+PCI_IRQ_MSI or PCI_IRQ_MSIX flags.</div><div class='head'>diff --git a/Documentation/PCI/PCIEBUS-HOWTO.txt b/Documentation/PCI/PCIEBUS-HOWTO.txt<br/>index 6bd5f372adec..15f0bb3b5045 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/PCI/PCIEBUS-HOWTO.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/PCI/PCIEBUS-HOWTO.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/PCI/PCIEBUS-HOWTO.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/PCI/PCIEBUS-HOWTO.txt</a></div><div class='hunk'>@@ -161,21 +161,13 @@ Since all service drivers of a PCI-PCI Bridge Port device are</div><div class='ctx'> allowed to run simultaneously, below lists a few of possible resource</div><div class='ctx'> conflicts with proposed solutions.</div><div class='ctx'> </div><div class='del'>-6.1 MSI Vector Resource</div><div class='del'>-</div><div class='del'>-The MSI capability structure enables a device software driver to call</div><div class='del'>-pci_enable_msi to request MSI based interrupts. Once MSI interrupts</div><div class='del'>-are enabled on a device, it stays in this mode until a device driver</div><div class='del'>-calls pci_disable_msi to disable MSI interrupts and revert back to</div><div class='del'>-INTx emulation mode. Since service drivers of the same PCI-PCI Bridge</div><div class='del'>-port share the same physical device, if an individual service driver</div><div class='del'>-calls pci_enable_msi/pci_disable_msi it may result unpredictable</div><div class='del'>-behavior. For example, two service drivers run simultaneously on the</div><div class='del'>-same physical Root Port. Both service drivers call pci_enable_msi to</div><div class='del'>-request MSI based interrupts. A service driver may not know whether</div><div class='del'>-any other service drivers have run on this Root Port. If either one</div><div class='del'>-of them calls pci_disable_msi, it puts the other service driver</div><div class='del'>-in a wrong interrupt mode.</div><div class='add'>+6.1 MSI and MSI-X Vector Resource</div><div class='add'>+</div><div class='add'>+Once MSI or MSI-X interrupts are enabled on a device, it stays in this</div><div class='add'>+mode until they are disabled again.  Since service drivers of the same</div><div class='add'>+PCI-PCI Bridge port share the same physical device, if an individual</div><div class='add'>+service driver enables or disables MSI/MSI-X mode it may result</div><div class='add'>+unpredictable behavior.</div><div class='ctx'> </div><div class='ctx'> To avoid this situation all service drivers are not permitted to</div><div class='ctx'> switch interrupt mode on its device. The PCI Express Port Bus driver</div><div class='hunk'>@@ -187,17 +179,6 @@ driver. Service drivers should use (struct pcie_device*)dev-&gt;irq to</div><div class='ctx'> call request_irq/free_irq. In addition, the interrupt mode is stored</div><div class='ctx'> in the field interrupt_mode of struct pcie_device.</div><div class='ctx'> </div><div class='del'>-6.2 MSI-X Vector Resources</div><div class='del'>-</div><div class='del'>-Similar to the MSI a device driver for an MSI-X capable device can</div><div class='del'>-call pci_enable_msix to request MSI-X interrupts. All service drivers</div><div class='del'>-are not permitted to switch interrupt mode on its device. The PCI</div><div class='del'>-Express Port Bus driver is responsible for determining the interrupt</div><div class='del'>-mode and this should be transparent to service drivers. Any attempt</div><div class='del'>-by service driver to call pci_enable_msix/pci_disable_msix may</div><div class='del'>-result unpredictable behavior. Service drivers should use</div><div class='del'>-(struct pcie_device*)dev-&gt;irq and call request_irq/free_irq.</div><div class='del'>-</div><div class='ctx'> 6.3 PCI Memory/IO Mapped Regions</div><div class='ctx'> </div><div class='ctx'> Service drivers for PCI Express Power Management (PME), Advanced</div><div class='head'>diff --git a/Documentation/PCI/pci-error-recovery.txt b/Documentation/PCI/pci-error-recovery.txt<br/>index ac26869c7db4..da3b2176d5da 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/PCI/pci-error-recovery.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/PCI/pci-error-recovery.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/PCI/pci-error-recovery.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/PCI/pci-error-recovery.txt</a></div><div class='hunk'>@@ -78,7 +78,6 @@ struct pci_error_handlers</div><div class='ctx'> {</div><div class='ctx'> 	int (*error_detected)(struct pci_dev *dev, enum pci_channel_state);</div><div class='ctx'> 	int (*mmio_enabled)(struct pci_dev *dev);</div><div class='del'>-	int (*link_reset)(struct pci_dev *dev);</div><div class='ctx'> 	int (*slot_reset)(struct pci_dev *dev);</div><div class='ctx'> 	void (*resume)(struct pci_dev *dev);</div><div class='ctx'> };</div><div class='hunk'>@@ -104,8 +103,7 @@ if it implements any, it must implement error_detected(). If a callback</div><div class='ctx'> is not implemented, the corresponding feature is considered unsupported.</div><div class='ctx'> For example, if mmio_enabled() and resume() aren't there, then it</div><div class='ctx'> is assumed that the driver is not doing any direct recovery and requires</div><div class='del'>-a slot reset. If link_reset() is not implemented, the card is assumed to</div><div class='del'>-not care about link resets. Typically a driver will want to know about</div><div class='add'>+a slot reset.  Typically a driver will want to know about</div><div class='ctx'> a slot_reset().</div><div class='ctx'> </div><div class='ctx'> The actual steps taken by a platform to recover from a PCI error</div><div class='hunk'>@@ -232,25 +230,9 @@ proceeds to STEP 4 (Slot Reset)</div><div class='ctx'> </div><div class='ctx'> STEP 3: Link Reset</div><div class='ctx'> ------------------</div><div class='del'>-The platform resets the link, and then calls the link_reset() callback</div><div class='del'>-on all affected device drivers.  This is a PCI-Express specific state</div><div class='add'>+The platform resets the link.  This is a PCI-Express specific step</div><div class='ctx'> and is done whenever a non-fatal error has been detected that can be</div><div class='del'>-"solved" by resetting the link. This call informs the driver of the</div><div class='del'>-reset and the driver should check to see if the device appears to be</div><div class='del'>-in working condition.</div><div class='del'>-</div><div class='del'>-The driver is not supposed to restart normal driver I/O operations</div><div class='del'>-at this point.  It should limit itself to "probing" the device to</div><div class='del'>-check its recoverability status. If all is right, then the platform</div><div class='del'>-will call resume() once all drivers have ack'd link_reset().</div><div class='del'>-</div><div class='del'>-	Result codes:</div><div class='del'>-		(identical to STEP 3 (MMIO Enabled)</div><div class='del'>-</div><div class='del'>-The platform then proceeds to either STEP 4 (Slot Reset) or STEP 5</div><div class='del'>-(Resume Operations).</div><div class='del'>-</div><div class='del'>-&gt;&gt;&gt; The current powerpc implementation does not implement this callback.</div><div class='add'>+"solved" by resetting the link.</div><div class='ctx'> </div><div class='ctx'> STEP 4: Slot Reset</div><div class='ctx'> ------------------</div><div class='head'>diff --git a/Documentation/PCI/pci.txt b/Documentation/PCI/pci.txt<br/>index 77f49dc5be23..611a75e4366e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/PCI/pci.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/PCI/pci.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/PCI/pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/PCI/pci.txt</a></div><div class='hunk'>@@ -382,18 +382,18 @@ The fundamental difference between MSI and MSI-X is how multiple</div><div class='ctx'> "vectors" get allocated. MSI requires contiguous blocks of vectors</div><div class='ctx'> while MSI-X can allocate several individual ones.</div><div class='ctx'> </div><div class='del'>-MSI capability can be enabled by calling pci_enable_msi() or</div><div class='del'>-pci_enable_msix() before calling request_irq(). This causes</div><div class='del'>-the PCI support to program CPU vector data into the PCI device</div><div class='del'>-capability registers.</div><div class='del'>-</div><div class='del'>-If your PCI device supports both, try to enable MSI-X first.</div><div class='del'>-Only one can be enabled at a time.  Many architectures, chip-sets,</div><div class='del'>-or BIOSes do NOT support MSI or MSI-X and the call to pci_enable_msi/msix</div><div class='del'>-will fail. This is important to note since many drivers have</div><div class='del'>-two (or more) interrupt handlers: one for MSI/MSI-X and another for IRQs.</div><div class='del'>-They choose which handler to register with request_irq() based on the</div><div class='del'>-return value from pci_enable_msi/msix().</div><div class='add'>+MSI capability can be enabled by calling pci_alloc_irq_vectors() with the</div><div class='add'>+PCI_IRQ_MSI and/or PCI_IRQ_MSIX flags before calling request_irq(). This</div><div class='add'>+causes the PCI support to program CPU vector data into the PCI device</div><div class='add'>+capability registers. Many architectures, chip-sets, or BIOSes do NOT</div><div class='add'>+support MSI or MSI-X and a call to pci_alloc_irq_vectors with just</div><div class='add'>+the PCI_IRQ_MSI and PCI_IRQ_MSIX flags will fail, so try to always</div><div class='add'>+specify PCI_IRQ_LEGACY as well.</div><div class='add'>+</div><div class='add'>+Drivers that have different interrupt handlers for MSI/MSI-X and</div><div class='add'>+legacy INTx should chose the right one based on the msi_enabled</div><div class='add'>+and msix_enabled flags in the pci_dev structure after calling</div><div class='add'>+pci_alloc_irq_vectors.</div><div class='ctx'> </div><div class='ctx'> There are (at least) two really good reasons for using MSI:</div><div class='ctx'> 1) MSI is an exclusive interrupt vector by definition.</div><div class='head'>diff --git a/Documentation/PCI/pcieaer-howto.txt b/Documentation/PCI/pcieaer-howto.txt<br/>index ea8cafba255c..acd0dddd6bb8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/PCI/pcieaer-howto.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/PCI/pcieaer-howto.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/PCI/pcieaer-howto.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/PCI/pcieaer-howto.txt</a></div><div class='hunk'>@@ -256,7 +256,7 @@ After reboot with new kernel or insert the module, a device file named</div><div class='ctx'> </div><div class='ctx'> Then, you need a user space tool named aer-inject, which can be gotten</div><div class='ctx'> from:</div><div class='del'>-    http://www.kernel.org/pub/linux/utils/pci/aer-inject/</div><div class='add'>+    https://git.kernel.org/cgit/linux/kernel/git/gong.chen/aer-inject.git/</div><div class='ctx'> </div><div class='ctx'> More information about aer-inject can be found in the document comes</div><div class='ctx'> with its source code.</div><div class='head'>diff --git a/Documentation/RCU/Design/Data-Structures/Data-Structures.html b/Documentation/RCU/Design/Data-Structures/Data-Structures.html<br/>index 7eb47ac25ad7..d583c653a703 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/RCU/Design/Data-Structures/Data-Structures.html?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/RCU/Design/Data-Structures/Data-Structures.html</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Data-Structures/Data-Structures.html?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Data-Structures/Data-Structures.html</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>         &lt;head&gt;&lt;title&gt;A Tour Through TREE_RCU's Data Structures [LWN.net]&lt;/title&gt;</div><div class='ctx'>         &lt;meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"&gt;</div><div class='ctx'> </div><div class='del'>-           &lt;p&gt;January 27, 2016&lt;/p&gt;</div><div class='add'>+           &lt;p&gt;December 18, 2016&lt;/p&gt;</div><div class='ctx'>            &lt;p&gt;This article was contributed by Paul E.&amp;nbsp;McKenney&lt;/p&gt;</div><div class='ctx'> </div><div class='ctx'> &lt;h3&gt;Introduction&lt;/h3&gt;</div><div class='hunk'>@@ -31,9 +31,6 @@ to each other.</div><div class='ctx'> 	Accessor Functions&lt;/a&gt;</div><div class='ctx'> &lt;/ol&gt;</div><div class='ctx'> </div><div class='del'>-At the end we have the</div><div class='del'>-&lt;a href="#Answers to Quick Quizzes"&gt;answers to the quick quizzes&lt;/a&gt;.</div><div class='del'>-</div><div class='ctx'> &lt;h3&gt;&lt;a name="Data-Structure Relationships"&gt;Data-Structure Relationships&lt;/a&gt;&lt;/h3&gt;</div><div class='ctx'> </div><div class='ctx'> &lt;p&gt;RCU is for all intents and purposes a large state machine, and its</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg b/Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg<br/>new file mode 100644<br/>index 000000000000..7c6c90bd02c9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg</a></div><div class='hunk'>@@ -0,0 +1,830 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Creator: fig2dev Version 3.2 Patchlevel 5e --&gt;</div><div class='add'>+</div><div class='add'>+&lt;!-- CreationDate: Wed Dec  9 17:39:46 2015 --&gt;</div><div class='add'>+</div><div class='add'>+&lt;!-- Magnification: 3.000 --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="952.6817"</div><div class='add'>+   height="1219.6219"</div><div class='add'>+   viewBox="-66 -66 12729.905 16296.808"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.48.4 r9939"</div><div class='add'>+   sodipodi:docname="ExpRCUFlow.svg"&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata94"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs92"&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path4146"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow1Mend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow1Mend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3852"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"</div><div class='add'>+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"</div><div class='add'>+         transform="matrix(-0.4,0,0,-0.4,-4,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow1Mend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow1Mend-9"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path3852-7"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"</div><div class='add'>+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"</div><div class='add'>+         transform="matrix(-0.4,0,0,-0.4,-4,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-7"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-6"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-1"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-4"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-16"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-8"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-160"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-5"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-78"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-66"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-8"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-56"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-19"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-89"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-85"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-3"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-73"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-55"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-5"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-88"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-198"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-2"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-22"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="marker5072"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path5074"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-87"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-63"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-6"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-26"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-0"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-51"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1090"</div><div class='add'>+     inkscape:window-height="1148"</div><div class='add'>+     id="namedview90"</div><div class='add'>+     showgrid="true"</div><div class='add'>+     inkscape:zoom="0.80021373"</div><div class='add'>+     inkscape:cx="462.49289"</div><div class='add'>+     inkscape:cy="623.19585"</div><div class='add'>+     inkscape:window-x="557"</div><div class='add'>+     inkscape:window-y="24"</div><div class='add'>+     inkscape:window-maximized="0"</div><div class='add'>+     inkscape:current-layer="g4"</div><div class='add'>+     inkscape:snap-grids="false"</div><div class='add'>+     fit-margin-top="5"</div><div class='add'>+     fit-margin-right="5"</div><div class='add'>+     fit-margin-bottom="5"</div><div class='add'>+     fit-margin-left="5" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     style="fill:none;stroke-width:0.025in"</div><div class='add'>+     id="g4"</div><div class='add'>+     transform="translate(23.312813,523.41305)"&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 11475 2250 - 11475 3465--&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 11475 5625 - 11475 6840--&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 7875 225 - 10665 225--&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 9675 675 - 7785 675--&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 9675 4725 - 10665 4725--&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 9225 5175 - 10665 5175--&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 8775 11475 - 10665 11475--&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 11475 9000 - 11475 10215--&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g4104"</div><div class='add'>+       transform="translate(-1068.9745,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"</div><div class='add'>+         y="-7383.8755"</div><div class='add'>+         x="-6124.8989"</div><div class='add'>+         height="1966.2251"</div><div class='add'>+         width="1953.6969"</div><div class='add'>+         id="rect3032-1-0"</div><div class='add'>+         style="fill:#96ff96;fill-opacity:1;stroke:#000000;stroke-width:45.00382233;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4098"</div><div class='add'>+         y="818.40338"</div><div class='add'>+         x="8168.2671"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="818.40338"</div><div class='add'>+           x="8168.2671"</div><div class='add'>+           id="tspan4100"</div><div class='add'>+           sodipodi:role="line"&gt;Idle or&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           id="tspan4102"</div><div class='add'>+           y="1152.4579"</div><div class='add'>+           x="8168.2671"</div><div class='add'>+           sodipodi:role="line"&gt;offline?&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g4114"</div><div class='add'>+       transform="translate(0,147.96969)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1475.6636"</div><div class='add'>+         width="4401.7612"</div><div class='add'>+         y="0"</div><div class='add'>+         x="0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110"</div><div class='add'>+         y="835.11212"</div><div class='add'>+         x="2206.4917"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="835.11212"</div><div class='add'>+           x="2206.4917"</div><div class='add'>+           id="tspan4112"</div><div class='add'>+           sodipodi:role="line"&gt;CPU N Start&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="M 4432.5052,897.4924 5684.8749,880.79414"</div><div class='add'>+       id="path4119"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="M 8503.0006,874.12161 9755.3703,857.42334"</div><div class='add'>+       id="path4119-8"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="8617.0977"</div><div class='add'>+       y="705.50983"</div><div class='add'>+       id="text4593"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4595"</div><div class='add'>+         x="8617.0977"</div><div class='add'>+         y="705.50983"&gt;Y&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9"</div><div class='add'>+       transform="translate(9722.4732,131.27105)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="0"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5"</div><div class='add'>+         y="835.11212"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="835.11212"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           id="tspan4112-9"</div><div class='add'>+           sodipodi:role="line"&gt;Done&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-5"</div><div class='add'>+       transform="translate(0,3705.3456)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-1"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1475.6636"</div><div class='add'>+         width="4401.7612"</div><div class='add'>+         y="0"</div><div class='add'>+         x="0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-9"</div><div class='add'>+         y="835.11212"</div><div class='add'>+         x="2206.4917"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="835.11212"</div><div class='add'>+           x="2206.4917"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4776"&gt;Send IPI to CPU N&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="M 7102.5627,2263.5171 4430.8404,3682.8694"</div><div class='add'>+       id="path4119-3"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4104-1"</div><div class='add'>+       transform="translate(-1065.3349,6403.5782)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"</div><div class='add'>+         y="-7383.8755"</div><div class='add'>+         x="-6124.8989"</div><div class='add'>+         height="1966.2251"</div><div class='add'>+         width="1953.6969"</div><div class='add'>+         id="rect3032-1-0-6"</div><div class='add'>+         style="fill:#96ff96;fill-opacity:1;stroke:#000000;stroke-width:45.00382233;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4098-3"</div><div class='add'>+         y="482.00006"</div><div class='add'>+         x="8168.2671"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           id="tspan4102-8"</div><div class='add'>+           y="482.00006"</div><div class='add'>+           x="8168.2671"</div><div class='add'>+           sodipodi:role="line"&gt;In RCU&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="816.05457"</div><div class='add'>+           x="8168.2671"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4833"&gt;read-side&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="1150.109"</div><div class='add'>+           x="8168.2671"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4835"&gt;critical&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="1484.1636"</div><div class='add'>+           x="8168.2671"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4837"&gt;section?&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:267.24362183px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="6463.0864"</div><div class='add'>+       y="2285.6765"</div><div class='add'>+       id="text4593-0"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4595-6"</div><div class='add'>+         x="6463.0864"</div><div class='add'>+         y="2285.6765"&gt;N&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:40.08654108, 80.17308215;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 2189.1897,5219.361 16.6983,1252.3697"</div><div class='add'>+       id="path4119-0"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-5-2"</div><div class='add'>+       transform="translate(0,6551.5479)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-1-7"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1475.6636"</div><div class='add'>+         width="4401.7612"</div><div class='add'>+         y="0"</div><div class='add'>+         x="0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-9-5"</div><div class='add'>+         y="835.11212"</div><div class='add'>+         x="2206.4917"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="835.11212"</div><div class='add'>+           x="2206.4917"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4776-5"&gt;IPI Handler&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 4432.5052,7297.9678 1252.3697,-16.6982"</div><div class='add'>+       id="path4119-2"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 8503.0013,7278.6595 1252.369,-16.6982"</div><div class='add'>+       id="path4119-8-7"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:267.24362183px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="8617.0977"</div><div class='add'>+       y="7110.0186"</div><div class='add'>+       id="text4593-4"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4595-0"</div><div class='add'>+         x="8617.0977"</div><div class='add'>+         y="7110.0186"&gt;N&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3"</div><div class='add'>+       transform="translate(9722.4732,6535.809)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7"</div><div class='add'>+         y="503.71591"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="503.71591"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           id="tspan4112-9-0"</div><div class='add'>+           sodipodi:role="line"&gt;Report CPU&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="837.77039"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4923"&gt;Quiescent&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="1171.825"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925"&gt;State&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:40.08654335, 80.17308669;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 7102.5627,8725.7454 16.6983,1252.3697"</div><div class='add'>+       id="path4119-0-0"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:267.24362183px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="6797.0522"</div><div class='add'>+       y="9018.6807"</div><div class='add'>+       id="text4593-3"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4595-2"</div><div class='add'>+         x="6797.0522"</div><div class='add'>+         y="9018.6807"&gt;Y&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3-8"</div><div class='add'>+       transform="translate(-80.17308,11381.108)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7-5"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7-6"</div><div class='add'>+         y="841.88086"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="841.88086"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925-1"&gt;rcu_read_unlock()&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:40.08654562, 80.17309124;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 1362.6256,10071.26 16.6983,1252.369"</div><div class='add'>+       id="path4119-0-0-7"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 1362.6256,12883.919 16.6983,1252.369"</div><div class='add'>+       id="path4119-0-0-7-7"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3-8-1"</div><div class='add'>+       transform="translate(9722.4732,11389.458)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7-5-1"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7-6-2"</div><div class='add'>+         y="841.88086"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="841.88086"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925-1-2"&gt;Context Switch&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:40.08654789, 80.17309578;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 11165.272,10071.26 16.698,1252.369"</div><div class='add'>+       id="path4119-0-0-7-8"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3-9"</div><div class='add'>+       transform="translate(-80.17308,14163.046)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7-1"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7-3"</div><div class='add'>+         y="503.71591"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="503.71591"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           id="tspan4112-9-0-4"</div><div class='add'>+           sodipodi:role="line"&gt;Report CPU&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="837.77039"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4923-3"&gt;and Task&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="1171.825"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925-9"&gt;Quiescent States&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3-8-1-8"</div><div class='add'>+       transform="translate(5663.2978,11389.458)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7-5-1-1"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7-6-2-4"</div><div class='add'>+         y="841.88086"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="841.88086"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925-1-2-4"&gt;Enqueue Task&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="M 9827.612,12141.988 8575.243,12125.29"</div><div class='add'>+       id="path4119-8-7-5"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 7106.0965,12818.962 16.6983,1252.369"</div><div class='add'>+       id="path4119-0-0-7-7-5"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3-9-2"</div><div class='add'>+       transform="translate(5663.2978,14098.088)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7-1-8"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7-3-4"</div><div class='add'>+         y="503.71591"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="503.71591"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4923-3-2"&gt;Report CPU&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="837.77039"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925-9-9"&gt;Quiescent&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="1171.825"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan5239"&gt;State&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:40.08654562, 80.17309124;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="M 5733.305,14095.542 2761.014,12809.774"</div><div class='add'>+       id="path4119-0-0-2"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:40.08654107, 80.17308214;stroke-dashoffset:0"</div><div class='add'>+       d="m 1353.3524,10079.499 9701.6916,0 100.189,-16.698"</div><div class='add'>+       id="path5265"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="ccc" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg b/Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg<br/>new file mode 100644<br/>index 000000000000..e4233ac93c2b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg</a></div><div class='hunk'>@@ -0,0 +1,826 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Creator: fig2dev Version 3.2 Patchlevel 5e --&gt;</div><div class='add'>+</div><div class='add'>+&lt;!-- CreationDate: Wed Dec  9 17:39:46 2015 --&gt;</div><div class='add'>+</div><div class='add'>+&lt;!-- Magnification: 3.000 --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="952.6817"</div><div class='add'>+   height="1425.6191"</div><div class='add'>+   viewBox="-66 -66 12729.905 19049.38"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.48.4 r9939"</div><div class='add'>+   sodipodi:docname="ExpSchedFlow.svg"&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata94"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs92"&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path4146"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow1Mend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow1Mend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3852"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"</div><div class='add'>+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"</div><div class='add'>+         transform="matrix(-0.4,0,0,-0.4,-4,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow1Mend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow1Mend-9"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path3852-7"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"</div><div class='add'>+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"</div><div class='add'>+         transform="matrix(-0.4,0,0,-0.4,-4,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-7"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-6"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-1"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-4"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-16"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-8"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-160"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-5"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-78"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-66"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-8"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-56"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-19"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-89"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-85"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-3"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-73"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-55"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-5"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-88"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-198"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-2"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-22"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="marker5072"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path5074"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-87"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-63"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-6"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-26"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-0"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4146-51"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-58"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path4146-61"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1090"</div><div class='add'>+     inkscape:window-height="1148"</div><div class='add'>+     id="namedview90"</div><div class='add'>+     showgrid="true"</div><div class='add'>+     inkscape:zoom="0.80021373"</div><div class='add'>+     inkscape:cx="462.49289"</div><div class='add'>+     inkscape:cy="473.6718"</div><div class='add'>+     inkscape:window-x="770"</div><div class='add'>+     inkscape:window-y="24"</div><div class='add'>+     inkscape:window-maximized="0"</div><div class='add'>+     inkscape:current-layer="g4114-9-3-9"</div><div class='add'>+     inkscape:snap-grids="false"</div><div class='add'>+     fit-margin-top="5"</div><div class='add'>+     fit-margin-right="5"</div><div class='add'>+     fit-margin-bottom="5"</div><div class='add'>+     fit-margin-left="5" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     style="fill:none;stroke-width:0.025in"</div><div class='add'>+     id="g4"</div><div class='add'>+     transform="translate(23.312814,523.41265)"&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 11475 2250 - 11475 3465--&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 11475 5625 - 11475 6840--&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 7875 225 - 10665 225--&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 9675 675 - 7785 675--&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 9675 4725 - 10665 4725--&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 9225 5175 - 10665 5175--&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 8775 11475 - 10665 11475--&gt;</div><div class='add'>+    &lt;!-- Line: box --&gt;</div><div class='add'>+    &lt;!-- Line --&gt;</div><div class='add'>+    &lt;!-- Arrowhead on XXXpoint 11475 9000 - 11475 10215--&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;!-- Text --&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g4104"</div><div class='add'>+       transform="translate(-1068.9745,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"</div><div class='add'>+         y="-7383.8755"</div><div class='add'>+         x="-6124.8989"</div><div class='add'>+         height="1966.2251"</div><div class='add'>+         width="1953.6969"</div><div class='add'>+         id="rect3032-1-0"</div><div class='add'>+         style="fill:#96ff96;fill-opacity:1;stroke:#000000;stroke-width:45.00382233;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4098"</div><div class='add'>+         y="818.40338"</div><div class='add'>+         x="8168.2671"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="818.40338"</div><div class='add'>+           x="8168.2671"</div><div class='add'>+           id="tspan4100"</div><div class='add'>+           sodipodi:role="line"&gt;Idle or&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           id="tspan4102"</div><div class='add'>+           y="1152.4579"</div><div class='add'>+           x="8168.2671"</div><div class='add'>+           sodipodi:role="line"&gt;offline?&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g4114"</div><div class='add'>+       transform="translate(0,147.96969)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1475.6636"</div><div class='add'>+         width="4401.7612"</div><div class='add'>+         y="0"</div><div class='add'>+         x="0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110"</div><div class='add'>+         y="835.11212"</div><div class='add'>+         x="2206.4917"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="835.11212"</div><div class='add'>+           x="2206.4917"</div><div class='add'>+           id="tspan4112"</div><div class='add'>+           sodipodi:role="line"&gt;CPU N Start&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="M 4432.5052,897.4924 5684.8749,880.79414"</div><div class='add'>+       id="path4119"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="M 8503.0006,874.12161 9755.3703,857.42334"</div><div class='add'>+       id="path4119-8"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="8617.0977"</div><div class='add'>+       y="705.50983"</div><div class='add'>+       id="text4593"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4595"</div><div class='add'>+         x="8617.0977"</div><div class='add'>+         y="705.50983"&gt;Y&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9"</div><div class='add'>+       transform="translate(9722.4732,131.27105)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="0"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5"</div><div class='add'>+         y="835.11212"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="835.11212"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           id="tspan4112-9"</div><div class='add'>+           sodipodi:role="line"&gt;Done&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-5"</div><div class='add'>+       transform="translate(0,3705.3456)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-1"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1475.6636"</div><div class='add'>+         width="4401.7612"</div><div class='add'>+         y="0"</div><div class='add'>+         x="0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-9"</div><div class='add'>+         y="835.11212"</div><div class='add'>+         x="2206.4917"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="835.11212"</div><div class='add'>+           x="2206.4917"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4776"&gt;Send IPI to CPU N&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="M 7102.5627,2263.5171 4430.8404,3682.8694"</div><div class='add'>+       id="path4119-3"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4104-1"</div><div class='add'>+       transform="translate(-1065.3349,6403.5782)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"</div><div class='add'>+         y="-7383.8755"</div><div class='add'>+         x="-6124.8989"</div><div class='add'>+         height="1966.2251"</div><div class='add'>+         width="1953.6969"</div><div class='add'>+         id="rect3032-1-0-6"</div><div class='add'>+         style="fill:#96ff96;fill-opacity:1;stroke:#000000;stroke-width:45.00382233;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4098-3"</div><div class='add'>+         y="985.4306"</div><div class='add'>+         x="8168.2671"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="985.4306"</div><div class='add'>+           x="8168.2671"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3109"&gt;CPU idle?&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:267.24362183px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="6463.0864"</div><div class='add'>+       y="2285.6765"</div><div class='add'>+       id="text4593-0"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4595-6"</div><div class='add'>+         x="6463.0864"</div><div class='add'>+         y="2285.6765"&gt;N&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:40.08654108, 80.17308215;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 2189.1897,5219.361 16.6983,1252.3697"</div><div class='add'>+       id="path4119-0"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-5-2"</div><div class='add'>+       transform="translate(0,6551.5479)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-1-7"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1475.6636"</div><div class='add'>+         width="4401.7612"</div><div class='add'>+         y="0"</div><div class='add'>+         x="0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-9-5"</div><div class='add'>+         y="835.11212"</div><div class='add'>+         x="2206.4917"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="835.11212"</div><div class='add'>+           x="2206.4917"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4776-5"&gt;IPI Handler&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 4432.5052,7297.9678 1252.3697,-16.6982"</div><div class='add'>+       id="path4119-2"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 8503.0013,7278.6595 1252.369,-16.6982"</div><div class='add'>+       id="path4119-8-7"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:267.24362183px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="8617.0977"</div><div class='add'>+       y="7110.0186"</div><div class='add'>+       id="text4593-4"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4595-0"</div><div class='add'>+         x="8617.0977"</div><div class='add'>+         y="7110.0186"&gt;Y&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3"</div><div class='add'>+       transform="translate(9722.4732,6535.809)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7"</div><div class='add'>+         y="503.71591"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="503.71591"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           id="tspan4112-9-0"</div><div class='add'>+           sodipodi:role="line"&gt;Report CPU&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="837.77039"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4923"&gt;Quiescent&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="1171.825"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925"&gt;State&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:40.08654335, 80.17308669;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 7102.5627,11478.337 16.6983,1252.35"</div><div class='add'>+       id="path4119-0-0"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:267.24362183px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="6797.0522"</div><div class='add'>+       y="9018.6807"</div><div class='add'>+       id="text4593-3"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4595-2"</div><div class='add'>+         x="6797.0522"</div><div class='add'>+         y="9018.6807"&gt;N&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3-8"</div><div class='add'>+       transform="translate(-80.17308,14133.68)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7-5"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7-6"</div><div class='add'>+         y="841.88086"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="841.88086"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925-1"&gt;Context Switch&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:40.08654562, 80.17309124;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 1362.6256,12823.832 16.6983,1252.369"</div><div class='add'>+       id="path4119-0-0-7"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 1362.6256,15636.491 16.6983,1252.369"</div><div class='add'>+       id="path4119-0-0-7-7"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3-8-1"</div><div class='add'>+       transform="translate(9722.4732,14142.03)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7-5-1"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7-6-2"</div><div class='add'>+         y="841.88086"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="841.88086"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925-1-2"&gt;CPU Offline&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:40.08654789, 80.17309578;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 11165.272,12823.832 16.698,1252.369"</div><div class='add'>+       id="path4119-0-0-7-8"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3-9"</div><div class='add'>+       transform="translate(-80.17308,16915.618)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7-1"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7-3"</div><div class='add'>+         y="505.47754"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="505.47754"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           id="tspan4112-9-0-4"</div><div class='add'>+           sodipodi:role="line"&gt;Report CPU&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="839.53204"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925-9"&gt;Quiescent&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="1173.5865"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3168"&gt;State&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 11165.272,15571.534 16.698,1252.369"</div><div class='add'>+       id="path4119-0-0-7-7-5"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3-9-2"</div><div class='add'>+       transform="translate(9722.4732,16850.66)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7-1-8"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7-3-4"</div><div class='add'>+         y="503.71591"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="503.71591"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4923-3-2"&gt;Report CPU&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="837.77039"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925-9-9"&gt;Quiescent&lt;/tspan&gt;&lt;tspan</div><div class='add'>+           y="1171.825"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan5239"&gt;State&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:40.08654107, 80.17308214;stroke-dashoffset:0"</div><div class='add'>+       d="m 1353.3524,12832.071 9701.6916,0 100.189,-16.698"</div><div class='add'>+       id="path5265"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="ccc" /&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:40.08654022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"</div><div class='add'>+       d="m 7112.6465,8669.1867 16.6983,1252.369"</div><div class='add'>+       id="path4119-0-0-7-7-5-7"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       style="fill:none;stroke-width:0.025in"</div><div class='add'>+       id="g4114-9-3-8-1-8-3"</div><div class='add'>+       transform="translate(5663.1399,9972.3627)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6-0-7-5-1-1-9"</div><div class='add'>+         style="fill:#87cfff;stroke:#000000;stroke-width:45.00382233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"</div><div class='add'>+         rx="0"</div><div class='add'>+         height="1425.5687"</div><div class='add'>+         width="2748.6331"</div><div class='add'>+         y="29.467337"</div><div class='add'>+         x="80.17308" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         sodipodi:linespacing="125%"</div><div class='add'>+         id="text4110-5-7-6-2-4-0"</div><div class='add'>+         y="841.88086"</div><div class='add'>+         x="1460.1007"</div><div class='add'>+         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         xml:space="preserve"&gt;&lt;tspan</div><div class='add'>+           y="841.88086"</div><div class='add'>+           x="1460.1007"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan4925-1-2-4-5"&gt;reched_cpu()&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html b/Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html<br/>new file mode 100644<br/>index 000000000000..7a3194c5559a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html</a></div><div class='hunk'>@@ -0,0 +1,626 @@</div><div class='add'>+&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"</div><div class='add'>+        "http://www.w3.org/TR/html4/loose.dtd"&gt;</div><div class='add'>+        &lt;html&gt;</div><div class='add'>+        &lt;head&gt;&lt;title&gt;A Tour Through TREE_RCU's Expedited Grace Periods&lt;/title&gt;</div><div class='add'>+        &lt;meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"&gt;</div><div class='add'>+</div><div class='add'>+&lt;h2&gt;Introduction&lt;/h2&gt;</div><div class='add'>+</div><div class='add'>+This document describes RCU's expedited grace periods.</div><div class='add'>+Unlike RCU's normal grace periods, which accept long latencies to attain</div><div class='add'>+high efficiency and minimal disturbance, expedited grace periods accept</div><div class='add'>+lower efficiency and significant disturbance to attain shorter latencies.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+There are three flavors of RCU (RCU-bh, RCU-preempt, and RCU-sched),</div><div class='add'>+but only two flavors of expedited grace periods because the RCU-bh</div><div class='add'>+expedited grace period maps onto the RCU-sched expedited grace period.</div><div class='add'>+Each of the remaining two implementations is covered in its own section.</div><div class='add'>+</div><div class='add'>+&lt;ol&gt;</div><div class='add'>+&lt;li&gt;	&lt;a href="#Expedited Grace Period Design"&gt;</div><div class='add'>+	Expedited Grace Period Design&lt;/a&gt;</div><div class='add'>+&lt;li&gt;	&lt;a href="#RCU-preempt Expedited Grace Periods"&gt;</div><div class='add'>+	RCU-preempt Expedited Grace Periods&lt;/a&gt;</div><div class='add'>+&lt;li&gt;	&lt;a href="#RCU-sched Expedited Grace Periods"&gt;</div><div class='add'>+	RCU-sched Expedited Grace Periods&lt;/a&gt;</div><div class='add'>+&lt;li&gt;	&lt;a href="#Expedited Grace Period and CPU Hotplug"&gt;</div><div class='add'>+	Expedited Grace Period and CPU Hotplug&lt;/a&gt;</div><div class='add'>+&lt;li&gt;	&lt;a href="#Expedited Grace Period Refinements"&gt;</div><div class='add'>+	Expedited Grace Period Refinements&lt;/a&gt;</div><div class='add'>+&lt;/ol&gt;</div><div class='add'>+</div><div class='add'>+&lt;h2&gt;&lt;a name="Expedited Grace Period Design"&gt;</div><div class='add'>+Expedited Grace Period Design&lt;/a&gt;&lt;/h2&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+The expedited RCU grace periods cannot be accused of being subtle,</div><div class='add'>+given that they for all intents and purposes hammer every CPU that</div><div class='add'>+has not yet provided a quiescent state for the current expedited</div><div class='add'>+grace period.</div><div class='add'>+The one saving grace is that the hammer has grown a bit smaller</div><div class='add'>+over time:  The old call to &lt;tt&gt;try_stop_cpus()&lt;/tt&gt; has been</div><div class='add'>+replaced with a set of calls to &lt;tt&gt;smp_call_function_single()&lt;/tt&gt;,</div><div class='add'>+each of which results in an IPI to the target CPU.</div><div class='add'>+The corresponding handler function checks the CPU's state, motivating</div><div class='add'>+a faster quiescent state where possible, and triggering a report</div><div class='add'>+of that quiescent state.</div><div class='add'>+As always for RCU, once everything has spent some time in a quiescent</div><div class='add'>+state, the expedited grace period has completed.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+The details of the &lt;tt&gt;smp_call_function_single()&lt;/tt&gt; handler's</div><div class='add'>+operation depend on the RCU flavor, as described in the following</div><div class='add'>+sections.</div><div class='add'>+</div><div class='add'>+&lt;h2&gt;&lt;a name="RCU-preempt Expedited Grace Periods"&gt;</div><div class='add'>+RCU-preempt Expedited Grace Periods&lt;/a&gt;&lt;/h2&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+The overall flow of the handling of a given CPU by an RCU-preempt</div><div class='add'>+expedited grace period is shown in the following diagram:</div><div class='add'>+</div><div class='add'>+&lt;p&gt;&lt;img src="ExpRCUFlow.svg" alt="ExpRCUFlow.svg" width="55%"&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+The solid arrows denote direct action, for example, a function call.</div><div class='add'>+The dotted arrows denote indirect action, for example, an IPI</div><div class='add'>+or a state that is reached after some time.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+If a given CPU is offline or idle, &lt;tt&gt;synchronize_rcu_expedited()&lt;/tt&gt;</div><div class='add'>+will ignore it because idle and offline CPUs are already residing</div><div class='add'>+in quiescent states.</div><div class='add'>+Otherwise, the expedited grace period will use</div><div class='add'>+&lt;tt&gt;smp_call_function_single()&lt;/tt&gt; to send the CPU an IPI, which</div><div class='add'>+is handled by &lt;tt&gt;sync_rcu_exp_handler()&lt;/tt&gt;.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+However, because this is preemptible RCU, &lt;tt&gt;sync_rcu_exp_handler()&lt;/tt&gt;</div><div class='add'>+can check to see if the CPU is currently running in an RCU read-side</div><div class='add'>+critical section.</div><div class='add'>+If not, the handler can immediately report a quiescent state.</div><div class='add'>+Otherwise, it sets flags so that the outermost &lt;tt&gt;rcu_read_unlock()&lt;/tt&gt;</div><div class='add'>+invocation will provide the needed quiescent-state report.</div><div class='add'>+This flag-setting avoids the previous forced preemption of all</div><div class='add'>+CPUs that might have RCU read-side critical sections.</div><div class='add'>+In addition, this flag-setting is done so as to avoid increasing</div><div class='add'>+the overhead of the common-case fastpath through the scheduler.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Again because this is preemptible RCU, an RCU read-side critical section</div><div class='add'>+can be preempted.</div><div class='add'>+When that happens, RCU will enqueue the task, which will the continue to</div><div class='add'>+block the current expedited grace period until it resumes and finds its</div><div class='add'>+outermost &lt;tt&gt;rcu_read_unlock()&lt;/tt&gt;.</div><div class='add'>+The CPU will report a quiescent state just after enqueuing the task because</div><div class='add'>+the CPU is no longer blocking the grace period.</div><div class='add'>+It is instead the preempted task doing the blocking.</div><div class='add'>+The list of blocked tasks is managed by &lt;tt&gt;rcu_preempt_ctxt_queue()&lt;/tt&gt;,</div><div class='add'>+which is called from &lt;tt&gt;rcu_preempt_note_context_switch()&lt;/tt&gt;, which</div><div class='add'>+in turn is called from &lt;tt&gt;rcu_note_context_switch()&lt;/tt&gt;, which in</div><div class='add'>+turn is called from the scheduler.</div><div class='add'>+</div><div class='add'>+&lt;table&gt;</div><div class='add'>+&lt;tr&gt;&lt;th&gt;&amp;nbsp;&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;th align="left"&gt;Quick Quiz:&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td&gt;</div><div class='add'>+	Why not just have the expedited grace period check the</div><div class='add'>+	state of all the CPUs?</div><div class='add'>+	After all, that would avoid all those real-time-unfriendly IPIs.</div><div class='add'>+&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;th align="left"&gt;Answer:&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td bgcolor="#ffffff"&gt;&lt;font color="ffffff"&gt;</div><div class='add'>+	Because we want the RCU read-side critical sections to run fast,</div><div class='add'>+	which means no memory barriers.</div><div class='add'>+	Therefore, it is not possible to safely check the state from some</div><div class='add'>+	other CPU.</div><div class='add'>+	And even if it was possible to safely check the state, it would</div><div class='add'>+	still be necessary to IPI the CPU to safely interact with the</div><div class='add'>+	upcoming &lt;tt&gt;rcu_read_unlock()&lt;/tt&gt; invocation, which means that</div><div class='add'>+	the remote state testing would not help the worst-case</div><div class='add'>+	latency that real-time applications care about.</div><div class='add'>+</div><div class='add'>+	&lt;p&gt;&lt;font color="ffffff"&gt;One way to prevent your real-time</div><div class='add'>+	application from getting hit with these IPIs is to</div><div class='add'>+	build your kernel with &lt;tt&gt;CONFIG_NO_HZ_FULL=y&lt;/tt&gt;.</div><div class='add'>+	RCU would then perceive the CPU running your application</div><div class='add'>+	as being idle, and it would be able to safely detect that</div><div class='add'>+	state without needing to IPI the CPU.</div><div class='add'>+&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td&gt;&amp;nbsp;&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;/table&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Please note that this is just the overall flow:</div><div class='add'>+Additional complications can arise due to races with CPUs going idle</div><div class='add'>+or offline, among other things.</div><div class='add'>+</div><div class='add'>+&lt;h2&gt;&lt;a name="RCU-sched Expedited Grace Periods"&gt;</div><div class='add'>+RCU-sched Expedited Grace Periods&lt;/a&gt;&lt;/h2&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+The overall flow of the handling of a given CPU by an RCU-sched</div><div class='add'>+expedited grace period is shown in the following diagram:</div><div class='add'>+</div><div class='add'>+&lt;p&gt;&lt;img src="ExpSchedFlow.svg" alt="ExpSchedFlow.svg" width="55%"&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+As with RCU-preempt's &lt;tt&gt;synchronize_rcu_expedited()&lt;/tt&gt;,</div><div class='add'>+&lt;tt&gt;synchronize_sched_expedited()&lt;/tt&gt; ignores offline and</div><div class='add'>+idle CPUs, again because they are in remotely detectable</div><div class='add'>+quiescent states.</div><div class='add'>+However, the &lt;tt&gt;synchronize_rcu_expedited()&lt;/tt&gt; handler</div><div class='add'>+is &lt;tt&gt;sync_sched_exp_handler()&lt;/tt&gt;, and because the</div><div class='add'>+&lt;tt&gt;rcu_read_lock_sched()&lt;/tt&gt; and &lt;tt&gt;rcu_read_unlock_sched()&lt;/tt&gt;</div><div class='add'>+leave no trace of their invocation, in general it is not possible to tell</div><div class='add'>+whether or not the current CPU is in an RCU read-side critical section.</div><div class='add'>+The best that &lt;tt&gt;sync_sched_exp_handler()&lt;/tt&gt; can do is to check</div><div class='add'>+for idle, on the off-chance that the CPU went idle while the IPI</div><div class='add'>+was in flight.</div><div class='add'>+If the CPU is idle, then tt&gt;sync_sched_exp_handler()&lt;/tt&gt; reports</div><div class='add'>+the quiescent state.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Otherwise, the handler invokes &lt;tt&gt;resched_cpu()&lt;/tt&gt;, which forces</div><div class='add'>+a future context switch.</div><div class='add'>+At the time of the context switch, the CPU reports the quiescent state.</div><div class='add'>+Should the CPU go offline first, it will report the quiescent state</div><div class='add'>+at that time.</div><div class='add'>+</div><div class='add'>+&lt;h2&gt;&lt;a name="Expedited Grace Period and CPU Hotplug"&gt;</div><div class='add'>+Expedited Grace Period and CPU Hotplug&lt;/a&gt;&lt;/h2&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+The expedited nature of expedited grace periods require a much tighter</div><div class='add'>+interaction with CPU hotplug operations than is required for normal</div><div class='add'>+grace periods.</div><div class='add'>+In addition, attempting to IPI offline CPUs will result in splats, but</div><div class='add'>+failing to IPI online CPUs can result in too-short grace periods.</div><div class='add'>+Neither option is acceptable in production kernels.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+The interaction between expedited grace periods and CPU hotplug operations</div><div class='add'>+is carried out at several levels:</div><div class='add'>+</div><div class='add'>+&lt;ol&gt;</div><div class='add'>+&lt;li&gt;	The number of CPUs that have ever been online is tracked</div><div class='add'>+	by the &lt;tt&gt;rcu_state&lt;/tt&gt; structure's &lt;tt&gt;-&amp;gt;ncpus&lt;/tt&gt;</div><div class='add'>+	field.</div><div class='add'>+	The &lt;tt&gt;rcu_state&lt;/tt&gt; structure's &lt;tt&gt;-&amp;gt;ncpus_snap&lt;/tt&gt;</div><div class='add'>+	field tracks the number of CPUs that have ever been online</div><div class='add'>+	at the beginning of an RCU expedited grace period.</div><div class='add'>+	Note that this number never decreases, at least in the absence</div><div class='add'>+	of a time machine.</div><div class='add'>+&lt;li&gt;	The identities of the CPUs that have ever been online is</div><div class='add'>+	tracked by the &lt;tt&gt;rcu_node&lt;/tt&gt; structure's</div><div class='add'>+	&lt;tt&gt;-&amp;gt;expmaskinitnext&lt;/tt&gt; field.</div><div class='add'>+	The &lt;tt&gt;rcu_node&lt;/tt&gt; structure's &lt;tt&gt;-&amp;gt;expmaskinit&lt;/tt&gt;</div><div class='add'>+	field tracks the identities of the CPUs that were online</div><div class='add'>+	at least once at the beginning of the most recent RCU</div><div class='add'>+	expedited grace period.</div><div class='add'>+	The &lt;tt&gt;rcu_state&lt;/tt&gt; structure's &lt;tt&gt;-&amp;gt;ncpus&lt;/tt&gt; and</div><div class='add'>+	&lt;tt&gt;-&amp;gt;ncpus_snap&lt;/tt&gt; fields are used to detect when</div><div class='add'>+	new CPUs have come online for the first time, that is,</div><div class='add'>+	when the &lt;tt&gt;rcu_node&lt;/tt&gt; structure's &lt;tt&gt;-&amp;gt;expmaskinitnext&lt;/tt&gt;</div><div class='add'>+	field has changed since the beginning of the last RCU</div><div class='add'>+	expedited grace period, which triggers an update of each</div><div class='add'>+	&lt;tt&gt;rcu_node&lt;/tt&gt; structure's &lt;tt&gt;-&amp;gt;expmaskinit&lt;/tt&gt;</div><div class='add'>+	field from its &lt;tt&gt;-&amp;gt;expmaskinitnext&lt;/tt&gt; field.</div><div class='add'>+&lt;li&gt;	Each &lt;tt&gt;rcu_node&lt;/tt&gt; structure's &lt;tt&gt;-&amp;gt;expmaskinit&lt;/tt&gt;</div><div class='add'>+	field is used to initialize that structure's</div><div class='add'>+	&lt;tt&gt;-&amp;gt;expmask&lt;/tt&gt; at the beginning of each RCU</div><div class='add'>+	expedited grace period.</div><div class='add'>+	This means that only those CPUs that have been online at least</div><div class='add'>+	once will be considered for a given grace period.</div><div class='add'>+&lt;li&gt;	Any CPU that goes offline will clear its bit in its leaf</div><div class='add'>+	&lt;tt&gt;rcu_node&lt;/tt&gt; structure's &lt;tt&gt;-&amp;gt;qsmaskinitnext&lt;/tt&gt;</div><div class='add'>+	field, so any CPU with that bit clear can safely be ignored.</div><div class='add'>+	However, it is possible for a CPU coming online or going offline</div><div class='add'>+	to have this bit set for some time while &lt;tt&gt;cpu_online&lt;/tt&gt;</div><div class='add'>+	returns &lt;tt&gt;false&lt;/tt&gt;.</div><div class='add'>+&lt;li&gt;	For each non-idle CPU that RCU believes is currently online, the grace</div><div class='add'>+	period invokes &lt;tt&gt;smp_call_function_single()&lt;/tt&gt;.</div><div class='add'>+	If this succeeds, the CPU was fully online.</div><div class='add'>+	Failure indicates that the CPU is in the process of coming online</div><div class='add'>+	or going offline, in which case it is necessary to wait for a</div><div class='add'>+	short time period and try again.</div><div class='add'>+	The purpose of this wait (or series of waits, as the case may be)</div><div class='add'>+	is to permit a concurrent CPU-hotplug operation to complete.</div><div class='add'>+&lt;li&gt;	In the case of RCU-sched, one of the last acts of an outgoing CPU</div><div class='add'>+	is to invoke &lt;tt&gt;rcu_report_dead()&lt;/tt&gt;, which</div><div class='add'>+	reports a quiescent state for that CPU.</div><div class='add'>+	However, this is likely paranoia-induced redundancy. &lt;!-- @@@ --&gt;</div><div class='add'>+&lt;/ol&gt;</div><div class='add'>+</div><div class='add'>+&lt;table&gt;</div><div class='add'>+&lt;tr&gt;&lt;th&gt;&amp;nbsp;&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;th align="left"&gt;Quick Quiz:&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td&gt;</div><div class='add'>+	Why all the dancing around with multiple counters and masks</div><div class='add'>+	tracking CPUs that were once online?</div><div class='add'>+	Why not just have a single set of masks tracking the currently</div><div class='add'>+	online CPUs and be done with it?</div><div class='add'>+&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;th align="left"&gt;Answer:&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td bgcolor="#ffffff"&gt;&lt;font color="ffffff"&gt;</div><div class='add'>+	Maintaining single set of masks tracking the online CPUs &lt;i&gt;sounds&lt;/i&gt;</div><div class='add'>+	easier, at least until you try working out all the race conditions</div><div class='add'>+	between grace-period initialization and CPU-hotplug operations.</div><div class='add'>+	For example, suppose initialization is progressing down the</div><div class='add'>+	tree while a CPU-offline operation is progressing up the tree.</div><div class='add'>+	This situation can result in bits set at the top of the tree</div><div class='add'>+	that have no counterparts at the bottom of the tree.</div><div class='add'>+	Those bits will never be cleared, which will result in</div><div class='add'>+	grace-period hangs.</div><div class='add'>+	In short, that way lies madness, to say nothing of a great many</div><div class='add'>+	bugs, hangs, and deadlocks.</div><div class='add'>+</div><div class='add'>+	&lt;p&gt;&lt;font color="ffffff"&gt;</div><div class='add'>+	In contrast, the current multi-mask multi-counter scheme ensures</div><div class='add'>+	that grace-period initialization will always see consistent masks</div><div class='add'>+	up and down the tree, which brings significant simplifications</div><div class='add'>+	over the single-mask method.</div><div class='add'>+</div><div class='add'>+	&lt;p&gt;&lt;font color="ffffff"&gt;</div><div class='add'>+	This is an instance of</div><div class='add'>+	&lt;a href="http://www.cs.columbia.edu/~library/TR-repository/reports/reports-1992/cucs-039-92.ps.gz"&gt;&lt;font color="ffffff"&gt;</div><div class='add'>+	deferring work in order to avoid synchronization&lt;/a&gt;.</div><div class='add'>+	Lazily recording CPU-hotplug events at the beginning of the next</div><div class='add'>+	grace period greatly simplifies maintenance of the CPU-tracking</div><div class='add'>+	bitmasks in the &lt;tt&gt;rcu_node&lt;/tt&gt; tree.</div><div class='add'>+&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td&gt;&amp;nbsp;&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;/table&gt;</div><div class='add'>+</div><div class='add'>+&lt;h2&gt;&lt;a name="Expedited Grace Period Refinements"&gt;</div><div class='add'>+Expedited Grace Period Refinements&lt;/a&gt;&lt;/h2&gt;</div><div class='add'>+</div><div class='add'>+&lt;ol&gt;</div><div class='add'>+&lt;li&gt;	&lt;a href="#Idle-CPU Checks"&gt;Idle-CPU checks&lt;/a&gt;.</div><div class='add'>+&lt;li&gt;	&lt;a href="#Batching via Sequence Counter"&gt;</div><div class='add'>+	Batching via sequence counter&lt;/a&gt;.</div><div class='add'>+&lt;li&gt;	&lt;a href="#Funnel Locking and Wait/Wakeup"&gt;</div><div class='add'>+	Funnel locking and wait/wakeup&lt;/a&gt;.</div><div class='add'>+&lt;li&gt;	&lt;a href="#Use of Workqueues"&gt;Use of Workqueues&lt;/a&gt;.</div><div class='add'>+&lt;li&gt;	&lt;a href="#Stall Warnings"&gt;Stall warnings&lt;/a&gt;.</div><div class='add'>+&lt;/ol&gt;</div><div class='add'>+</div><div class='add'>+&lt;h3&gt;&lt;a name="Idle-CPU Checks"&gt;Idle-CPU Checks&lt;/a&gt;&lt;/h3&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Each expedited grace period checks for idle CPUs when initially forming</div><div class='add'>+the mask of CPUs to be IPIed and again just before IPIing a CPU</div><div class='add'>+(both checks are carried out by &lt;tt&gt;sync_rcu_exp_select_cpus()&lt;/tt&gt;).</div><div class='add'>+If the CPU is idle at any time between those two times, the CPU will</div><div class='add'>+not be IPIed.</div><div class='add'>+Instead, the task pushing the grace period forward will include the</div><div class='add'>+idle CPUs in the mask passed to &lt;tt&gt;rcu_report_exp_cpu_mult()&lt;/tt&gt;.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+For RCU-sched, there is an additional check for idle in the IPI</div><div class='add'>+handler, &lt;tt&gt;sync_sched_exp_handler()&lt;/tt&gt;.</div><div class='add'>+If the IPI has interrupted the idle loop, then</div><div class='add'>+&lt;tt&gt;sync_sched_exp_handler()&lt;/tt&gt; invokes &lt;tt&gt;rcu_report_exp_rdp()&lt;/tt&gt;</div><div class='add'>+to report the corresponding quiescent state.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+For RCU-preempt, there is no specific check for idle in the</div><div class='add'>+IPI handler (&lt;tt&gt;sync_rcu_exp_handler()&lt;/tt&gt;), but because</div><div class='add'>+RCU read-side critical sections are not permitted within the</div><div class='add'>+idle loop, if &lt;tt&gt;sync_rcu_exp_handler()&lt;/tt&gt; sees that the CPU is within</div><div class='add'>+RCU read-side critical section, the CPU cannot possibly be idle.</div><div class='add'>+Otherwise, &lt;tt&gt;sync_rcu_exp_handler()&lt;/tt&gt; invokes</div><div class='add'>+&lt;tt&gt;rcu_report_exp_rdp()&lt;/tt&gt; to report the corresponding quiescent</div><div class='add'>+state, regardless of whether or not that quiescent state was due to</div><div class='add'>+the CPU being idle.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+In summary, RCU expedited grace periods check for idle when building</div><div class='add'>+the bitmask of CPUs that must be IPIed, just before sending each IPI,</div><div class='add'>+and (either explicitly or implicitly) within the IPI handler.</div><div class='add'>+</div><div class='add'>+&lt;h3&gt;&lt;a name="Batching via Sequence Counter"&gt;</div><div class='add'>+Batching via Sequence Counter&lt;/a&gt;&lt;/h3&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+If each grace-period request was carried out separately, expedited</div><div class='add'>+grace periods would have abysmal scalability and</div><div class='add'>+problematic high-load characteristics.</div><div class='add'>+Because each grace-period operation can serve an unlimited number of</div><div class='add'>+updates, it is important to &lt;i&gt;batch&lt;/i&gt; requests, so that a single</div><div class='add'>+expedited grace-period operation will cover all requests in the</div><div class='add'>+corresponding batch.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+This batching is controlled by a sequence counter named</div><div class='add'>+&lt;tt&gt;-&amp;gt;expedited_sequence&lt;/tt&gt; in the &lt;tt&gt;rcu_state&lt;/tt&gt; structure.</div><div class='add'>+This counter has an odd value when there is an expedited grace period</div><div class='add'>+in progress and an even value otherwise, so that dividing the counter</div><div class='add'>+value by two gives the number of completed grace periods.</div><div class='add'>+During any given update request, the counter must transition from</div><div class='add'>+even to odd and then back to even, thus indicating that a grace</div><div class='add'>+period has elapsed.</div><div class='add'>+Therefore, if the initial value of the counter is &lt;tt&gt;s&lt;/tt&gt;,</div><div class='add'>+the updater must wait until the counter reaches at least the</div><div class='add'>+value &lt;tt&gt;(s+3)&amp;amp;~0x1&lt;/tt&gt;.</div><div class='add'>+This counter is managed by the following access functions:</div><div class='add'>+</div><div class='add'>+&lt;ol&gt;</div><div class='add'>+&lt;li&gt;	&lt;tt&gt;rcu_exp_gp_seq_start()&lt;/tt&gt;, which marks the start of</div><div class='add'>+	an expedited grace period.</div><div class='add'>+&lt;li&gt;	&lt;tt&gt;rcu_exp_gp_seq_end()&lt;/tt&gt;, which marks the end of an</div><div class='add'>+	expedited grace period.</div><div class='add'>+&lt;li&gt;	&lt;tt&gt;rcu_exp_gp_seq_snap()&lt;/tt&gt;, which obtains a snapshot of</div><div class='add'>+	the counter.</div><div class='add'>+&lt;li&gt;	&lt;tt&gt;rcu_exp_gp_seq_done()&lt;/tt&gt;, which returns &lt;tt&gt;true&lt;/tt&gt;</div><div class='add'>+	if a full expedited grace period has elapsed since the</div><div class='add'>+	corresponding call to &lt;tt&gt;rcu_exp_gp_seq_snap()&lt;/tt&gt;.</div><div class='add'>+&lt;/ol&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Again, only one request in a given batch need actually carry out</div><div class='add'>+a grace-period operation, which means there must be an efficient</div><div class='add'>+way to identify which of many concurrent reqeusts will initiate</div><div class='add'>+the grace period, and that there be an efficient way for the</div><div class='add'>+remaining requests to wait for that grace period to complete.</div><div class='add'>+However, that is the topic of the next section.</div><div class='add'>+</div><div class='add'>+&lt;h3&gt;&lt;a name="Funnel Locking and Wait/Wakeup"&gt;</div><div class='add'>+Funnel Locking and Wait/Wakeup&lt;/a&gt;&lt;/h3&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+The natural way to sort out which of a batch of updaters will initiate</div><div class='add'>+the expedited grace period is to use the &lt;tt&gt;rcu_node&lt;/tt&gt; combining</div><div class='add'>+tree, as implemented by the &lt;tt&gt;exp_funnel_lock()&lt;/tt&gt; function.</div><div class='add'>+The first updater corresponding to a given grace period arriving</div><div class='add'>+at a given &lt;tt&gt;rcu_node&lt;/tt&gt; structure records its desired grace-period</div><div class='add'>+sequence number in the &lt;tt&gt;-&amp;gt;exp_seq_rq&lt;/tt&gt; field and moves up</div><div class='add'>+to the next level in the tree.</div><div class='add'>+Otherwise, if the &lt;tt&gt;-&amp;gt;exp_seq_rq&lt;/tt&gt; field already contains</div><div class='add'>+the sequence number for the desired grace period or some later one,</div><div class='add'>+the updater blocks on one of four wait queues in the</div><div class='add'>+&lt;tt&gt;-&amp;gt;exp_wq[]&lt;/tt&gt; array, using the second-from-bottom</div><div class='add'>+and third-from bottom bits as an index.</div><div class='add'>+An &lt;tt&gt;-&amp;gt;exp_lock&lt;/tt&gt; field in the &lt;tt&gt;rcu_node&lt;/tt&gt; structure</div><div class='add'>+synchronizes access to these fields.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+An empty &lt;tt&gt;rcu_node&lt;/tt&gt; tree is shown in the following diagram,</div><div class='add'>+with the white cells representing the &lt;tt&gt;-&amp;gt;exp_seq_rq&lt;/tt&gt; field</div><div class='add'>+and the red cells representing the elements of the</div><div class='add'>+&lt;tt&gt;-&amp;gt;exp_wq[]&lt;/tt&gt; array.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;&lt;img src="Funnel0.svg" alt="Funnel0.svg" width="75%"&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+The next diagram shows the situation after the arrival of Task&amp;nbsp;A</div><div class='add'>+and Task&amp;nbsp;B at the leftmost and rightmost leaf &lt;tt&gt;rcu_node&lt;/tt&gt;</div><div class='add'>+structures, respectively.</div><div class='add'>+The current value of the &lt;tt&gt;rcu_state&lt;/tt&gt; structure's</div><div class='add'>+&lt;tt&gt;-&amp;gt;expedited_sequence&lt;/tt&gt; field is zero, so adding three and</div><div class='add'>+clearing the bottom bit results in the value two, which both tasks</div><div class='add'>+record in the &lt;tt&gt;-&amp;gt;exp_seq_rq&lt;/tt&gt; field of their respective</div><div class='add'>+&lt;tt&gt;rcu_node&lt;/tt&gt; structures:</div><div class='add'>+</div><div class='add'>+&lt;p&gt;&lt;img src="Funnel1.svg" alt="Funnel1.svg" width="75%"&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Each of Tasks&amp;nbsp;A and&amp;nbsp;B will move up to the root</div><div class='add'>+&lt;tt&gt;rcu_node&lt;/tt&gt; structure.</div><div class='add'>+Suppose that Task&amp;nbsp;A wins, recording its desired grace-period sequence</div><div class='add'>+number and resulting in the state shown below:</div><div class='add'>+</div><div class='add'>+&lt;p&gt;&lt;img src="Funnel2.svg" alt="Funnel2.svg" width="75%"&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Task&amp;nbsp;A now advances to initiate a new grace period, while Task&amp;nbsp;B</div><div class='add'>+moves up to the root &lt;tt&gt;rcu_node&lt;/tt&gt; structure, and, seeing that</div><div class='add'>+its desired sequence number is already recorded, blocks on</div><div class='add'>+&lt;tt&gt;-&amp;gt;exp_wq[1]&lt;/tt&gt;.</div><div class='add'>+</div><div class='add'>+&lt;table&gt;</div><div class='add'>+&lt;tr&gt;&lt;th&gt;&amp;nbsp;&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;th align="left"&gt;Quick Quiz:&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td&gt;</div><div class='add'>+	Why &lt;tt&gt;-&amp;gt;exp_wq[1]&lt;/tt&gt;?</div><div class='add'>+	Given that the value of these tasks' desired sequence number is</div><div class='add'>+	two, so shouldn't they instead block on &lt;tt&gt;-&amp;gt;exp_wq[2]&lt;/tt&gt;?</div><div class='add'>+&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;th align="left"&gt;Answer:&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td bgcolor="#ffffff"&gt;&lt;font color="ffffff"&gt;</div><div class='add'>+	No.</div><div class='add'>+</div><div class='add'>+	&lt;p&gt;&lt;font color="ffffff"&gt;</div><div class='add'>+	Recall that the bottom bit of the desired sequence number indicates</div><div class='add'>+	whether or not a grace period is currently in progress.</div><div class='add'>+	It is therefore necessary to shift the sequence number right one</div><div class='add'>+	bit position to obtain the number of the grace period.</div><div class='add'>+	This results in &lt;tt&gt;-&amp;gt;exp_wq[1]&lt;/tt&gt;.</div><div class='add'>+&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td&gt;&amp;nbsp;&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;/table&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+If Tasks&amp;nbsp;C and&amp;nbsp;D also arrive at this point, they will compute the</div><div class='add'>+same desired grace-period sequence number, and see that both leaf</div><div class='add'>+&lt;tt&gt;rcu_node&lt;/tt&gt; structures already have that value recorded.</div><div class='add'>+They will therefore block on their respective &lt;tt&gt;rcu_node&lt;/tt&gt;</div><div class='add'>+structures' &lt;tt&gt;-&amp;gt;exp_wq[1]&lt;/tt&gt; fields, as shown below:</div><div class='add'>+</div><div class='add'>+&lt;p&gt;&lt;img src="Funnel3.svg" alt="Funnel3.svg" width="75%"&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Task&amp;nbsp;A now acquires the &lt;tt&gt;rcu_state&lt;/tt&gt; structure's</div><div class='add'>+&lt;tt&gt;-&amp;gt;exp_mutex&lt;/tt&gt; and initiates the grace period, which</div><div class='add'>+increments &lt;tt&gt;-&amp;gt;expedited_sequence&lt;/tt&gt;.</div><div class='add'>+Therefore, if Tasks&amp;nbsp;E and&amp;nbsp;F arrive, they will compute</div><div class='add'>+a desired sequence number of 4 and will record this value as</div><div class='add'>+shown below:</div><div class='add'>+</div><div class='add'>+&lt;p&gt;&lt;img src="Funnel4.svg" alt="Funnel4.svg" width="75%"&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Tasks&amp;nbsp;E and&amp;nbsp;F will propagate up the &lt;tt&gt;rcu_node&lt;/tt&gt;</div><div class='add'>+combining tree, with Task&amp;nbsp;F blocking on the root &lt;tt&gt;rcu_node&lt;/tt&gt;</div><div class='add'>+structure and Task&amp;nbsp;E wait for Task&amp;nbsp;A to finish so that</div><div class='add'>+it can start the next grace period.</div><div class='add'>+The resulting state is as shown below:</div><div class='add'>+</div><div class='add'>+&lt;p&gt;&lt;img src="Funnel5.svg" alt="Funnel5.svg" width="75%"&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Once the grace period completes, Task&amp;nbsp;A</div><div class='add'>+starts waking up the tasks waiting for this grace period to complete,</div><div class='add'>+increments the &lt;tt&gt;-&amp;gt;expedited_sequence&lt;/tt&gt;,</div><div class='add'>+acquires the &lt;tt&gt;-&amp;gt;exp_wake_mutex&lt;/tt&gt; and then releases the</div><div class='add'>+&lt;tt&gt;-&amp;gt;exp_mutex&lt;/tt&gt;.</div><div class='add'>+This results in the following state:</div><div class='add'>+</div><div class='add'>+&lt;p&gt;&lt;img src="Funnel6.svg" alt="Funnel6.svg" width="75%"&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Task&amp;nbsp;E can then acquire &lt;tt&gt;-&amp;gt;exp_mutex&lt;/tt&gt; and increment</div><div class='add'>+&lt;tt&gt;-&amp;gt;expedited_sequence&lt;/tt&gt; to the value three.</div><div class='add'>+If new tasks&amp;nbsp;G and&amp;nbsp;H arrive and moves up the combining tree at the</div><div class='add'>+same time, the state will be as follows:</div><div class='add'>+</div><div class='add'>+&lt;p&gt;&lt;img src="Funnel7.svg" alt="Funnel7.svg" width="75%"&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Note that three of the root &lt;tt&gt;rcu_node&lt;/tt&gt; structure's</div><div class='add'>+waitqueues are now occupied.</div><div class='add'>+However, at some point, Task&amp;nbsp;A will wake up the</div><div class='add'>+tasks blocked on the &lt;tt&gt;-&amp;gt;exp_wq&lt;/tt&gt; waitqueues, resulting</div><div class='add'>+in the following state:</div><div class='add'>+</div><div class='add'>+&lt;p&gt;&lt;img src="Funnel8.svg" alt="Funnel8.svg" width="75%"&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Execution will continue with Tasks&amp;nbsp;E and&amp;nbsp;H completing</div><div class='add'>+their grace periods and carrying out their wakeups.</div><div class='add'>+</div><div class='add'>+&lt;table&gt;</div><div class='add'>+&lt;tr&gt;&lt;th&gt;&amp;nbsp;&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;th align="left"&gt;Quick Quiz:&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td&gt;</div><div class='add'>+	What happens if Task&amp;nbsp;A takes so long to do its wakeups</div><div class='add'>+	that Task&amp;nbsp;E's grace period completes?</div><div class='add'>+&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;th align="left"&gt;Answer:&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td bgcolor="#ffffff"&gt;&lt;font color="ffffff"&gt;</div><div class='add'>+	Then Task&amp;nbsp;E will block on the &lt;tt&gt;-&amp;gt;exp_wake_mutex&lt;/tt&gt;,</div><div class='add'>+	which will also prevent it from releasing &lt;tt&gt;-&amp;gt;exp_mutex&lt;/tt&gt;,</div><div class='add'>+	which in turn will prevent the next grace period from starting.</div><div class='add'>+	This last is important in preventing overflow of the</div><div class='add'>+	&lt;tt&gt;-&amp;gt;exp_wq[]&lt;/tt&gt; array.</div><div class='add'>+&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td&gt;&amp;nbsp;&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;/table&gt;</div><div class='add'>+</div><div class='add'>+&lt;h3&gt;&lt;a name="Use of Workqueues"&gt;Use of Workqueues&lt;/a&gt;&lt;/h3&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+In earlier implementations, the task requesting the expedited</div><div class='add'>+grace period also drove it to completion.</div><div class='add'>+This straightforward approach had the disadvantage of needing to</div><div class='add'>+account for signals sent to user tasks,</div><div class='add'>+so more recent implemementations use the Linux kernel's</div><div class='add'>+&lt;a href="https://www.kernel.org/doc/Documentation/workqueue.txt"&gt;workqueues&lt;/a&gt;.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+The requesting task still does counter snapshotting and funnel-lock</div><div class='add'>+processing, but the task reaching the top of the funnel lock</div><div class='add'>+does a &lt;tt&gt;schedule_work()&lt;/tt&gt; (from &lt;tt&gt;_synchronize_rcu_expedited()&lt;/tt&gt;</div><div class='add'>+so that a workqueue kthread does the actual grace-period processing.</div><div class='add'>+Because workqueue kthreads do not accept signals, grace-period-wait</div><div class='add'>+processing need not allow for signals.</div><div class='add'>+</div><div class='add'>+In addition, this approach allows wakeups for the previous expedited</div><div class='add'>+grace period to be overlapped with processing for the next expedited</div><div class='add'>+grace period.</div><div class='add'>+Because there are only four sets of waitqueues, it is necessary to</div><div class='add'>+ensure that the previous grace period's wakeups complete before the</div><div class='add'>+next grace period's wakeups start.</div><div class='add'>+This is handled by having the &lt;tt&gt;-&amp;gt;exp_mutex&lt;/tt&gt;</div><div class='add'>+guard expedited grace-period processing and the</div><div class='add'>+&lt;tt&gt;-&amp;gt;exp_wake_mutex&lt;/tt&gt; guard wakeups.</div><div class='add'>+The key point is that the &lt;tt&gt;-&amp;gt;exp_mutex&lt;/tt&gt; is not released</div><div class='add'>+until the first wakeup is complete, which means that the</div><div class='add'>+&lt;tt&gt;-&amp;gt;exp_wake_mutex&lt;/tt&gt; has already been acquired at that point.</div><div class='add'>+This approach ensures that the previous grace period's wakeups can</div><div class='add'>+be carried out while the current grace period is in process, but</div><div class='add'>+that these wakeups will complete before the next grace period starts.</div><div class='add'>+This means that only three waitqueues are required, guaranteeing that</div><div class='add'>+the four that are provided are sufficient.</div><div class='add'>+</div><div class='add'>+&lt;h3&gt;&lt;a name="Stall Warnings"&gt;Stall Warnings&lt;/a&gt;&lt;/h3&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Expediting grace periods does nothing to speed things up when RCU</div><div class='add'>+readers take too long, and therefore expedited grace periods check</div><div class='add'>+for stalls just as normal grace periods do.</div><div class='add'>+</div><div class='add'>+&lt;table&gt;</div><div class='add'>+&lt;tr&gt;&lt;th&gt;&amp;nbsp;&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;th align="left"&gt;Quick Quiz:&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td&gt;</div><div class='add'>+	But why not just let the normal grace-period machinery</div><div class='add'>+	detect the stalls, given that a given reader must block</div><div class='add'>+	both normal and expedited grace periods?</div><div class='add'>+&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;th align="left"&gt;Answer:&lt;/th&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td bgcolor="#ffffff"&gt;&lt;font color="ffffff"&gt;</div><div class='add'>+	Because it is quite possible that at a given time there</div><div class='add'>+	is no normal grace period in progress, in which case the</div><div class='add'>+	normal grace period cannot emit a stall warning.</div><div class='add'>+&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;tr&gt;&lt;td&gt;&amp;nbsp;&lt;/td&gt;&lt;/tr&gt;</div><div class='add'>+&lt;/table&gt;</div><div class='add'>+</div><div class='add'>+The &lt;tt&gt;synchronize_sched_expedited_wait()&lt;/tt&gt; function loops waiting</div><div class='add'>+for the expedited grace period to end, but with a timeout set to the</div><div class='add'>+current RCU CPU stall-warning time.</div><div class='add'>+If this time is exceeded, any CPUs or &lt;tt&gt;rcu_node&lt;/tt&gt; structures</div><div class='add'>+blocking the current grace period are printed.</div><div class='add'>+Each stall warning results in another pass through the loop, but the</div><div class='add'>+second and subsequent passes use longer stall times.</div><div class='add'>+</div><div class='add'>+&lt;h3&gt;&lt;a name="Summary"&gt;</div><div class='add'>+Summary&lt;/a&gt;&lt;/h3&gt;</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Expedited grace periods use a sequence-number approach to promote</div><div class='add'>+batching, so that a single grace-period operation can serve numerous</div><div class='add'>+requests.</div><div class='add'>+A funnel lock is used to efficiently identify the one task out of</div><div class='add'>+a concurrent group that will request the grace period.</div><div class='add'>+All members of the group will block on waitqueues provided in</div><div class='add'>+the &lt;tt&gt;rcu_node&lt;/tt&gt; structure.</div><div class='add'>+The actual grace-period processing is carried out by a workqueue.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+CPU-hotplug operations are noted lazily in order to prevent the need</div><div class='add'>+for tight synchronization between expedited grace periods and</div><div class='add'>+CPU-hotplug operations.</div><div class='add'>+The dyntick-idle counters are used to avoid sending IPIs to idle CPUs,</div><div class='add'>+at least in the common case.</div><div class='add'>+RCU-preempt and RCU-sched use different IPI handlers and different</div><div class='add'>+code to respond to the state changes carried out by those handlers,</div><div class='add'>+but otherwise use common code.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+Quiescent states are tracked using the &lt;tt&gt;rcu_node&lt;/tt&gt; tree,</div><div class='add'>+and once all necessary quiescent states have been reported,</div><div class='add'>+all tasks waiting on this expedited grace period are awakened.</div><div class='add'>+A pair of mutexes are used to allow one grace period's wakeups</div><div class='add'>+to proceed concurrently with the next grace period's processing.</div><div class='add'>+</div><div class='add'>+&lt;p&gt;</div><div class='add'>+This combination of mechanisms allows expedited grace periods to</div><div class='add'>+run reasonably efficiently.</div><div class='add'>+However, for non-time-critical tasks, normal grace periods should be</div><div class='add'>+used instead because their longer duration permits much higher</div><div class='add'>+degrees of batching, and thus much lower per-request overheads.</div><div class='add'>+</div><div class='add'>+&lt;/body&gt;&lt;/html&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg b/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg<br/>new file mode 100644<br/>index 000000000000..98af66557908<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg</a></div><div class='hunk'>@@ -0,0 +1,275 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="490.05093"</div><div class='add'>+   height="125.78741"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.48.4 r9939"</div><div class='add'>+   sodipodi:docname="Funnel0.svg"&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs4"&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789-9"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792-4"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     id="base"</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1.0"</div><div class='add'>+     inkscape:pageopacity="0.0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:zoom="1.3670394"</div><div class='add'>+     inkscape:cx="201.06495"</div><div class='add'>+     inkscape:cy="-86.548414"</div><div class='add'>+     inkscape:document-units="px"</div><div class='add'>+     inkscape:current-layer="layer1"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:window-width="1351"</div><div class='add'>+     inkscape:window-height="836"</div><div class='add'>+     inkscape:window-x="171"</div><div class='add'>+     inkscape:window-y="279"</div><div class='add'>+     inkscape:window-maximized="0"</div><div class='add'>+     fit-margin-top="5"</div><div class='add'>+     fit-margin-left="5"</div><div class='add'>+     fit-margin-right="5"</div><div class='add'>+     fit-margin-bottom="5" /&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata7"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:label="Layer 1"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer1"</div><div class='add'>+     transform="translate(-117.08462,-249.92053)"&gt;</div><div class='add'>+    &lt;flowRoot</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       id="flowRoot2985"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"&gt;&lt;flowRegion</div><div class='add'>+         id="flowRegion2987"&gt;&lt;rect</div><div class='add'>+           id="rect2989"</div><div class='add'>+           width="82.85714"</div><div class='add'>+           height="11.428572"</div><div class='add'>+           x="240"</div><div class='add'>+           y="492.36218" /&gt;&lt;/flowRegion&gt;&lt;flowPara</div><div class='add'>+         id="flowPara2991" /&gt;&lt;/flowRoot&gt;    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"</div><div class='add'>+       x="362.371"</div><div class='add'>+       y="262.51819"</div><div class='add'>+       id="text4441"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4443"</div><div class='add'>+         x="362.371"</div><div class='add'>+         y="262.51819"&gt;-&amp;gt;expedited_sequence: 0&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"</div><div class='add'>+       id="rect3101"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="253.55223"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="297.04141"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="427.509"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="384.01981"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7-5"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="340.53061"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997"</div><div class='add'>+       transform="translate(-0.87295532,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="145.45404"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015"</div><div class='add'>+           x="145.45404"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:0&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997-7"</div><div class='add'>+       transform="translate(260.06223,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35-0"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9-3"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1-6"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2-0"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="145.45404"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6"</div><div class='add'>+           x="145.45404"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:0&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg b/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg<br/>new file mode 100644<br/>index 000000000000..e0184a37aec7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg</a></div><div class='hunk'>@@ -0,0 +1,275 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="490.05093"</div><div class='add'>+   height="125.78741"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.48.4 r9939"</div><div class='add'>+   sodipodi:docname="Funnel1.svg"&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs4"&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789-9"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792-4"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     id="base"</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1.0"</div><div class='add'>+     inkscape:pageopacity="0.0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:zoom="1.3670394"</div><div class='add'>+     inkscape:cx="201.06495"</div><div class='add'>+     inkscape:cy="-86.548414"</div><div class='add'>+     inkscape:document-units="px"</div><div class='add'>+     inkscape:current-layer="g3997-7"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:window-width="1351"</div><div class='add'>+     inkscape:window-height="836"</div><div class='add'>+     inkscape:window-x="363"</div><div class='add'>+     inkscape:window-y="336"</div><div class='add'>+     inkscape:window-maximized="0"</div><div class='add'>+     fit-margin-top="5"</div><div class='add'>+     fit-margin-left="5"</div><div class='add'>+     fit-margin-right="5"</div><div class='add'>+     fit-margin-bottom="5" /&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata7"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:label="Layer 1"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer1"</div><div class='add'>+     transform="translate(-117.08462,-249.92053)"&gt;</div><div class='add'>+    &lt;flowRoot</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       id="flowRoot2985"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"&gt;&lt;flowRegion</div><div class='add'>+         id="flowRegion2987"&gt;&lt;rect</div><div class='add'>+           id="rect2989"</div><div class='add'>+           width="82.85714"</div><div class='add'>+           height="11.428572"</div><div class='add'>+           x="240"</div><div class='add'>+           y="492.36218" /&gt;&lt;/flowRegion&gt;&lt;flowPara</div><div class='add'>+         id="flowPara2991" /&gt;&lt;/flowRoot&gt;    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"</div><div class='add'>+       x="362.371"</div><div class='add'>+       y="262.51819"</div><div class='add'>+       id="text4441"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4443"</div><div class='add'>+         x="362.371"</div><div class='add'>+         y="262.51819"&gt;-&amp;gt;expedited_sequence: 0&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"</div><div class='add'>+       id="rect3101"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="253.55223"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="297.04141"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="427.509"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="384.01981"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7-5"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="340.53061"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997"</div><div class='add'>+       transform="translate(-0.87295532,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="146.00092"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015"</div><div class='add'>+           x="146.00092"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;A:2&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997-7"</div><div class='add'>+       transform="translate(260.06223,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35-0"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9-3"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1-6"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2-0"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="145.54926"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6"</div><div class='add'>+           x="145.54926"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;B:2&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg b/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg<br/>new file mode 100644<br/>index 000000000000..1bc3fed54d58<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg</a></div><div class='hunk'>@@ -0,0 +1,287 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="490.05093"</div><div class='add'>+   height="125.78741"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.48.4 r9939"</div><div class='add'>+   sodipodi:docname="Funnel2.svg"&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs4"&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789-9"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792-4"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     id="base"</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1.0"</div><div class='add'>+     inkscape:pageopacity="0.0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:zoom="1.3670394"</div><div class='add'>+     inkscape:cx="114.01552"</div><div class='add'>+     inkscape:cy="-86.548414"</div><div class='add'>+     inkscape:document-units="px"</div><div class='add'>+     inkscape:current-layer="g3997-7"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:window-width="1351"</div><div class='add'>+     inkscape:window-height="836"</div><div class='add'>+     inkscape:window-x="363"</div><div class='add'>+     inkscape:window-y="336"</div><div class='add'>+     inkscape:window-maximized="0"</div><div class='add'>+     fit-margin-top="5"</div><div class='add'>+     fit-margin-left="5"</div><div class='add'>+     fit-margin-right="5"</div><div class='add'>+     fit-margin-bottom="5" /&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata7"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:label="Layer 1"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer1"</div><div class='add'>+     transform="translate(-117.08462,-249.92053)"&gt;</div><div class='add'>+    &lt;flowRoot</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       id="flowRoot2985"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"&gt;&lt;flowRegion</div><div class='add'>+         id="flowRegion2987"&gt;&lt;rect</div><div class='add'>+           id="rect2989"</div><div class='add'>+           width="82.85714"</div><div class='add'>+           height="11.428572"</div><div class='add'>+           x="240"</div><div class='add'>+           y="492.36218" /&gt;&lt;/flowRegion&gt;&lt;flowPara</div><div class='add'>+         id="flowPara2991" /&gt;&lt;/flowRoot&gt;    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"</div><div class='add'>+       x="362.371"</div><div class='add'>+       y="262.51819"</div><div class='add'>+       id="text4441"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4443"</div><div class='add'>+         x="362.371"</div><div class='add'>+         y="262.51819"&gt;-&amp;gt;expedited_sequence: 0&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"</div><div class='add'>+       id="rect3101"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="253.55223"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="297.04141"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="427.509"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="384.01981"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7-5"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="340.53061"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997"</div><div class='add'>+       transform="translate(-0.87295532,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="146.00092"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015"</div><div class='add'>+           x="146.00092"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:2&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997-7"</div><div class='add'>+       transform="translate(260.06223,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35-0"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9-3"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1-6"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2-0"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="145.54926"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6"</div><div class='add'>+           x="145.54926"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;B:2&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="275.59558"</div><div class='add'>+       y="291.95297"</div><div class='add'>+       id="text3013-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-7"</div><div class='add'>+         x="275.59558"</div><div class='add'>+         y="291.95297"</div><div class='add'>+         style="font-size:10px"&gt;A:2&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg b/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg<br/>new file mode 100644<br/>index 000000000000..6d8a1bffb3e4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg</a></div><div class='hunk'>@@ -0,0 +1,323 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="490.05093"</div><div class='add'>+   height="125.78741"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.48.4 r9939"</div><div class='add'>+   sodipodi:docname="Funnel3.svg"&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs4"&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789-9"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792-4"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     id="base"</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1.0"</div><div class='add'>+     inkscape:pageopacity="0.0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:zoom="1.3670394"</div><div class='add'>+     inkscape:cx="114.01552"</div><div class='add'>+     inkscape:cy="-86.548414"</div><div class='add'>+     inkscape:document-units="px"</div><div class='add'>+     inkscape:current-layer="layer1"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:window-width="1351"</div><div class='add'>+     inkscape:window-height="836"</div><div class='add'>+     inkscape:window-x="68"</div><div class='add'>+     inkscape:window-y="180"</div><div class='add'>+     inkscape:window-maximized="0"</div><div class='add'>+     fit-margin-top="5"</div><div class='add'>+     fit-margin-left="5"</div><div class='add'>+     fit-margin-right="5"</div><div class='add'>+     fit-margin-bottom="5" /&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata7"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:label="Layer 1"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer1"</div><div class='add'>+     transform="translate(-117.08462,-249.92053)"&gt;</div><div class='add'>+    &lt;flowRoot</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       id="flowRoot2985"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"&gt;&lt;flowRegion</div><div class='add'>+         id="flowRegion2987"&gt;&lt;rect</div><div class='add'>+           id="rect2989"</div><div class='add'>+           width="82.85714"</div><div class='add'>+           height="11.428572"</div><div class='add'>+           x="240"</div><div class='add'>+           y="492.36218" /&gt;&lt;/flowRegion&gt;&lt;flowPara</div><div class='add'>+         id="flowPara2991" /&gt;&lt;/flowRoot&gt;    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"</div><div class='add'>+       x="362.371"</div><div class='add'>+       y="262.51819"</div><div class='add'>+       id="text4441"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4443"</div><div class='add'>+         x="362.371"</div><div class='add'>+         y="262.51819"&gt;-&amp;gt;expedited_sequence: 0  GP: A&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"</div><div class='add'>+       id="rect3101"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="253.55223"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="297.04141"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="427.509"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="384.01981"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7-5"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="340.53061"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997"</div><div class='add'>+       transform="translate(-0.87295532,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="146.00092"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015"</div><div class='add'>+           x="146.00092"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:2&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="232.51051"</div><div class='add'>+         y="360.18094"</div><div class='add'>+         id="text3013-3-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6-6"</div><div class='add'>+           x="232.51051"</div><div class='add'>+           y="360.18094"</div><div class='add'>+           style="font-size:10px"&gt;C&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3019"</div><div class='add'>+       transform="translate(260.06223,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35-0"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62-9"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9-3"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1-6"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2-0"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="145.54926"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6"</div><div class='add'>+           x="145.54926"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:2&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="232.31764"</div><div class='add'>+         y="360.18582"</div><div class='add'>+         id="text3013-3-3-7"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6-6-5"</div><div class='add'>+           x="232.31764"</div><div class='add'>+           y="360.18582"</div><div class='add'>+           style="font-size:10px"&gt;D&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="275.59558"</div><div class='add'>+       y="291.95297"</div><div class='add'>+       id="text3013-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-7"</div><div class='add'>+         x="275.59558"</div><div class='add'>+         y="291.95297"</div><div class='add'>+         style="font-size:10px"&gt;:2&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="361.97092"</div><div class='add'>+       y="291.88705"</div><div class='add'>+       id="text3013-3-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-6-7"</div><div class='add'>+         x="361.97092"</div><div class='add'>+         y="291.88705"</div><div class='add'>+         style="font-size:10px"&gt;B&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg b/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg<br/>new file mode 100644<br/>index 000000000000..44018fd6342b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg</a></div><div class='hunk'>@@ -0,0 +1,323 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="490.05093"</div><div class='add'>+   height="125.78741"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.48.4 r9939"</div><div class='add'>+   sodipodi:docname="Funnel4.svg"&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs4"&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789-9"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792-4"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     id="base"</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1.0"</div><div class='add'>+     inkscape:pageopacity="0.0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:zoom="1.3670394"</div><div class='add'>+     inkscape:cx="114.01552"</div><div class='add'>+     inkscape:cy="-86.548414"</div><div class='add'>+     inkscape:document-units="px"</div><div class='add'>+     inkscape:current-layer="layer1"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:window-width="1351"</div><div class='add'>+     inkscape:window-height="836"</div><div class='add'>+     inkscape:window-x="68"</div><div class='add'>+     inkscape:window-y="180"</div><div class='add'>+     inkscape:window-maximized="0"</div><div class='add'>+     fit-margin-top="5"</div><div class='add'>+     fit-margin-left="5"</div><div class='add'>+     fit-margin-right="5"</div><div class='add'>+     fit-margin-bottom="5" /&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata7"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:label="Layer 1"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer1"</div><div class='add'>+     transform="translate(-117.08462,-249.92053)"&gt;</div><div class='add'>+    &lt;flowRoot</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       id="flowRoot2985"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"&gt;&lt;flowRegion</div><div class='add'>+         id="flowRegion2987"&gt;&lt;rect</div><div class='add'>+           id="rect2989"</div><div class='add'>+           width="82.85714"</div><div class='add'>+           height="11.428572"</div><div class='add'>+           x="240"</div><div class='add'>+           y="492.36218" /&gt;&lt;/flowRegion&gt;&lt;flowPara</div><div class='add'>+         id="flowPara2991" /&gt;&lt;/flowRoot&gt;    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"</div><div class='add'>+       x="362.371"</div><div class='add'>+       y="262.51819"</div><div class='add'>+       id="text4441"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4443"</div><div class='add'>+         x="362.371"</div><div class='add'>+         y="262.51819"&gt;-&amp;gt;expedited_sequence: 1  GP: A&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"</div><div class='add'>+       id="rect3101"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="253.55223"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="297.04141"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="427.509"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="384.01981"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7-5"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="340.53061"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997"</div><div class='add'>+       transform="translate(-0.87295532,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="146.00092"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015"</div><div class='add'>+           x="146.00092"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;E:4&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="232.51051"</div><div class='add'>+         y="360.18094"</div><div class='add'>+         id="text3013-3-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6-6"</div><div class='add'>+           x="232.51051"</div><div class='add'>+           y="360.18094"</div><div class='add'>+           style="font-size:10px"&gt;C&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3019"</div><div class='add'>+       transform="translate(260.06223,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35-0"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62-9"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9-3"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1-6"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2-0"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="145.54926"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6"</div><div class='add'>+           x="145.54926"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;F:4&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="232.31764"</div><div class='add'>+         y="360.18582"</div><div class='add'>+         id="text3013-3-3-7"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6-6-5"</div><div class='add'>+           x="232.31764"</div><div class='add'>+           y="360.18582"</div><div class='add'>+           style="font-size:10px"&gt;D&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="275.59558"</div><div class='add'>+       y="291.95297"</div><div class='add'>+       id="text3013-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-7"</div><div class='add'>+         x="275.59558"</div><div class='add'>+         y="291.95297"</div><div class='add'>+         style="font-size:10px"&gt;:2&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="361.97092"</div><div class='add'>+       y="291.88705"</div><div class='add'>+       id="text3013-3-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-6-7"</div><div class='add'>+         x="361.97092"</div><div class='add'>+         y="291.88705"</div><div class='add'>+         style="font-size:10px"&gt;B&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg b/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg<br/>new file mode 100644<br/>index 000000000000..e5eef50454fb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg</a></div><div class='hunk'>@@ -0,0 +1,335 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="490.05093"</div><div class='add'>+   height="125.78741"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.48.4 r9939"</div><div class='add'>+   sodipodi:docname="Funnel5.svg"&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs4"&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789-9"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792-4"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     id="base"</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1.0"</div><div class='add'>+     inkscape:pageopacity="0.0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:zoom="1.3670394"</div><div class='add'>+     inkscape:cx="114.01552"</div><div class='add'>+     inkscape:cy="-86.548414"</div><div class='add'>+     inkscape:document-units="px"</div><div class='add'>+     inkscape:current-layer="layer1"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:window-width="1351"</div><div class='add'>+     inkscape:window-height="836"</div><div class='add'>+     inkscape:window-x="68"</div><div class='add'>+     inkscape:window-y="180"</div><div class='add'>+     inkscape:window-maximized="0"</div><div class='add'>+     fit-margin-top="5"</div><div class='add'>+     fit-margin-left="5"</div><div class='add'>+     fit-margin-right="5"</div><div class='add'>+     fit-margin-bottom="5" /&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata7"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:label="Layer 1"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer1"</div><div class='add'>+     transform="translate(-117.08462,-249.92053)"&gt;</div><div class='add'>+    &lt;flowRoot</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       id="flowRoot2985"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"&gt;&lt;flowRegion</div><div class='add'>+         id="flowRegion2987"&gt;&lt;rect</div><div class='add'>+           id="rect2989"</div><div class='add'>+           width="82.85714"</div><div class='add'>+           height="11.428572"</div><div class='add'>+           x="240"</div><div class='add'>+           y="492.36218" /&gt;&lt;/flowRegion&gt;&lt;flowPara</div><div class='add'>+         id="flowPara2991" /&gt;&lt;/flowRoot&gt;    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"</div><div class='add'>+       x="362.371"</div><div class='add'>+       y="262.51819"</div><div class='add'>+       id="text4441"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4443"</div><div class='add'>+         x="362.371"</div><div class='add'>+         y="262.51819"&gt;-&amp;gt;expedited_sequence: 1  GP: A,E&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"</div><div class='add'>+       id="rect3101"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="253.55223"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="297.04141"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="427.509"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="384.01981"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7-5"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="340.53061"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997"</div><div class='add'>+       transform="translate(-0.87295532,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="146.00092"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015"</div><div class='add'>+           x="146.00092"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:4&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="232.51051"</div><div class='add'>+         y="360.18094"</div><div class='add'>+         id="text3013-3-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6-6"</div><div class='add'>+           x="232.51051"</div><div class='add'>+           y="360.18094"</div><div class='add'>+           style="font-size:10px"&gt;C&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3019"</div><div class='add'>+       transform="translate(260.06223,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35-0"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62-9"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9-3"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1-6"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2-0"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="145.54926"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6"</div><div class='add'>+           x="145.54926"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:4&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="232.31764"</div><div class='add'>+         y="360.18582"</div><div class='add'>+         id="text3013-3-3-7"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6-6-5"</div><div class='add'>+           x="232.31764"</div><div class='add'>+           y="360.18582"</div><div class='add'>+           style="font-size:10px"&gt;D&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="275.59558"</div><div class='add'>+       y="291.95297"</div><div class='add'>+       id="text3013-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-7"</div><div class='add'>+         x="275.59558"</div><div class='add'>+         y="291.95297"</div><div class='add'>+         style="font-size:10px"&gt;:4&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="361.97092"</div><div class='add'>+       y="291.88705"</div><div class='add'>+       id="text3013-3-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-6-7"</div><div class='add'>+         x="361.97092"</div><div class='add'>+         y="291.88705"</div><div class='add'>+         style="font-size:10px"&gt;B&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="405.40396"</div><div class='add'>+       y="291.88705"</div><div class='add'>+       id="text3013-3-36-3"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-6-7-6"</div><div class='add'>+         x="405.40396"</div><div class='add'>+         y="291.88705"</div><div class='add'>+         style="font-size:10px"&gt;F&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg b/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg<br/>new file mode 100644<br/>index 000000000000..fbd2c1892886<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg</a></div><div class='hunk'>@@ -0,0 +1,335 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="490.05093"</div><div class='add'>+   height="125.78741"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.48.4 r9939"</div><div class='add'>+   sodipodi:docname="Funnel6.svg"&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs4"&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789-9"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792-4"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     id="base"</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1.0"</div><div class='add'>+     inkscape:pageopacity="0.0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:zoom="1.3670394"</div><div class='add'>+     inkscape:cx="114.01552"</div><div class='add'>+     inkscape:cy="-86.548414"</div><div class='add'>+     inkscape:document-units="px"</div><div class='add'>+     inkscape:current-layer="layer1"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:window-width="1351"</div><div class='add'>+     inkscape:window-height="836"</div><div class='add'>+     inkscape:window-x="68"</div><div class='add'>+     inkscape:window-y="180"</div><div class='add'>+     inkscape:window-maximized="0"</div><div class='add'>+     fit-margin-top="5"</div><div class='add'>+     fit-margin-left="5"</div><div class='add'>+     fit-margin-right="5"</div><div class='add'>+     fit-margin-bottom="5" /&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata7"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:label="Layer 1"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer1"</div><div class='add'>+     transform="translate(-117.08462,-249.92053)"&gt;</div><div class='add'>+    &lt;flowRoot</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       id="flowRoot2985"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"&gt;&lt;flowRegion</div><div class='add'>+         id="flowRegion2987"&gt;&lt;rect</div><div class='add'>+           id="rect2989"</div><div class='add'>+           width="82.85714"</div><div class='add'>+           height="11.428572"</div><div class='add'>+           x="240"</div><div class='add'>+           y="492.36218" /&gt;&lt;/flowRegion&gt;&lt;flowPara</div><div class='add'>+         id="flowPara2991" /&gt;&lt;/flowRoot&gt;    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"</div><div class='add'>+       x="362.371"</div><div class='add'>+       y="262.51819"</div><div class='add'>+       id="text4441"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4443"</div><div class='add'>+         x="362.371"</div><div class='add'>+         y="262.51819"&gt;-&amp;gt;expedited_sequence: 2  GP: E  Wakeup: A&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"</div><div class='add'>+       id="rect3101"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="253.55223"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="297.04141"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="427.509"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="384.01981"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7-5"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="340.53061"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997"</div><div class='add'>+       transform="translate(-0.87295532,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="146.00092"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015"</div><div class='add'>+           x="146.00092"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:4&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="232.51051"</div><div class='add'>+         y="360.18094"</div><div class='add'>+         id="text3013-3-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6-6"</div><div class='add'>+           x="232.51051"</div><div class='add'>+           y="360.18094"</div><div class='add'>+           style="font-size:10px"&gt;C&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3019"</div><div class='add'>+       transform="translate(260.06223,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35-0"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62-9"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9-3"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1-6"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2-0"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="145.54926"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6"</div><div class='add'>+           x="145.54926"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:4&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="232.31764"</div><div class='add'>+         y="360.18582"</div><div class='add'>+         id="text3013-3-3-7"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6-6-5"</div><div class='add'>+           x="232.31764"</div><div class='add'>+           y="360.18582"</div><div class='add'>+           style="font-size:10px"&gt;D&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="275.59558"</div><div class='add'>+       y="291.95297"</div><div class='add'>+       id="text3013-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-7"</div><div class='add'>+         x="275.59558"</div><div class='add'>+         y="291.95297"</div><div class='add'>+         style="font-size:10px"&gt;:4&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="361.97092"</div><div class='add'>+       y="291.88705"</div><div class='add'>+       id="text3013-3-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-6-7"</div><div class='add'>+         x="361.97092"</div><div class='add'>+         y="291.88705"</div><div class='add'>+         style="font-size:10px"&gt;B&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="405.40396"</div><div class='add'>+       y="291.88705"</div><div class='add'>+       id="text3013-3-36-3"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-6-7-6"</div><div class='add'>+         x="405.40396"</div><div class='add'>+         y="291.88705"</div><div class='add'>+         style="font-size:10px"&gt;F&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg b/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg<br/>new file mode 100644<br/>index 000000000000..502e159ed278<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg</a></div><div class='hunk'>@@ -0,0 +1,347 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="490.05093"</div><div class='add'>+   height="125.78741"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.48.4 r9939"</div><div class='add'>+   sodipodi:docname="Funnel7.svg"&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs4"&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789-9"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792-4"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     id="base"</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1.0"</div><div class='add'>+     inkscape:pageopacity="0.0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:zoom="1.3670394"</div><div class='add'>+     inkscape:cx="114.01552"</div><div class='add'>+     inkscape:cy="-86.548414"</div><div class='add'>+     inkscape:document-units="px"</div><div class='add'>+     inkscape:current-layer="layer1"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:window-width="1351"</div><div class='add'>+     inkscape:window-height="836"</div><div class='add'>+     inkscape:window-x="68"</div><div class='add'>+     inkscape:window-y="180"</div><div class='add'>+     inkscape:window-maximized="0"</div><div class='add'>+     fit-margin-top="5"</div><div class='add'>+     fit-margin-left="5"</div><div class='add'>+     fit-margin-right="5"</div><div class='add'>+     fit-margin-bottom="5" /&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata7"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:label="Layer 1"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer1"</div><div class='add'>+     transform="translate(-117.08462,-249.92053)"&gt;</div><div class='add'>+    &lt;flowRoot</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       id="flowRoot2985"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"&gt;&lt;flowRegion</div><div class='add'>+         id="flowRegion2987"&gt;&lt;rect</div><div class='add'>+           id="rect2989"</div><div class='add'>+           width="82.85714"</div><div class='add'>+           height="11.428572"</div><div class='add'>+           x="240"</div><div class='add'>+           y="492.36218" /&gt;&lt;/flowRegion&gt;&lt;flowPara</div><div class='add'>+         id="flowPara2991" /&gt;&lt;/flowRoot&gt;    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"</div><div class='add'>+       x="362.371"</div><div class='add'>+       y="262.51819"</div><div class='add'>+       id="text4441"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4443"</div><div class='add'>+         x="362.371"</div><div class='add'>+         y="262.51819"&gt;-&amp;gt;expedited_sequence: 3  GP: E,H  Wakeup: A&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"</div><div class='add'>+       id="rect3101"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="253.55223"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="297.04141"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"</div><div class='add'>+       id="rect3101-3-6"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="427.509"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="384.01981"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7-5"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="340.53061"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997"</div><div class='add'>+       transform="translate(-0.87295532,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="146.00092"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015"</div><div class='add'>+           x="146.00092"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:4&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="232.51051"</div><div class='add'>+         y="360.18094"</div><div class='add'>+         id="text3013-3-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6-6"</div><div class='add'>+           x="232.51051"</div><div class='add'>+           y="360.18094"</div><div class='add'>+           style="font-size:10px"&gt;C&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3019"</div><div class='add'>+       transform="translate(260.06223,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35-0"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62-9"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9-3"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1-6"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2-0"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="145.54926"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6"</div><div class='add'>+           x="145.54926"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:6&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="232.31764"</div><div class='add'>+         y="360.18582"</div><div class='add'>+         id="text3013-3-3-7"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6-6-5"</div><div class='add'>+           x="232.31764"</div><div class='add'>+           y="360.18582"</div><div class='add'>+           style="font-size:10px"&gt;D&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="275.59558"</div><div class='add'>+       y="291.95297"</div><div class='add'>+       id="text3013-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-7"</div><div class='add'>+         x="275.59558"</div><div class='add'>+         y="291.95297"</div><div class='add'>+         style="font-size:10px"&gt;:6&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="361.97092"</div><div class='add'>+       y="291.88705"</div><div class='add'>+       id="text3013-3-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-6-7"</div><div class='add'>+         x="361.97092"</div><div class='add'>+         y="291.88705"</div><div class='add'>+         style="font-size:10px"&gt;B&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="405.40396"</div><div class='add'>+       y="291.88705"</div><div class='add'>+       id="text3013-3-36-3"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-6-7-6"</div><div class='add'>+         x="405.40396"</div><div class='add'>+         y="291.88705"</div><div class='add'>+         style="font-size:10px"&gt;F&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="449.22031"</div><div class='add'>+       y="291.88217"</div><div class='add'>+       id="text3013-3-36-3-3"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-6-7-6-6"</div><div class='add'>+         x="449.22031"</div><div class='add'>+         y="291.88217"</div><div class='add'>+         style="font-size:10px"&gt;G&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg b/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg<br/>new file mode 100644<br/>index 000000000000..677401551c7d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg</a></div><div class='hunk'>@@ -0,0 +1,311 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="490.05093"</div><div class='add'>+   height="125.78741"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.48.4 r9939"</div><div class='add'>+   sodipodi:docname="Funnel8.svg"&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs4"&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lstart"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lstart-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3789-9"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(1.1,0,0,1.1,1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Lend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Lend-4"</div><div class='add'>+       style="overflow:visible"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path3792-4"</div><div class='add'>+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     id="base"</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1.0"</div><div class='add'>+     inkscape:pageopacity="0.0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:zoom="1.3670394"</div><div class='add'>+     inkscape:cx="114.01552"</div><div class='add'>+     inkscape:cy="-86.548414"</div><div class='add'>+     inkscape:document-units="px"</div><div class='add'>+     inkscape:current-layer="layer1"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:window-width="1351"</div><div class='add'>+     inkscape:window-height="836"</div><div class='add'>+     inkscape:window-x="68"</div><div class='add'>+     inkscape:window-y="180"</div><div class='add'>+     inkscape:window-maximized="0"</div><div class='add'>+     fit-margin-top="5"</div><div class='add'>+     fit-margin-left="5"</div><div class='add'>+     fit-margin-right="5"</div><div class='add'>+     fit-margin-bottom="5" /&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata7"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:label="Layer 1"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer1"</div><div class='add'>+     transform="translate(-117.08462,-249.92053)"&gt;</div><div class='add'>+    &lt;flowRoot</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       id="flowRoot2985"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"&gt;&lt;flowRegion</div><div class='add'>+         id="flowRegion2987"&gt;&lt;rect</div><div class='add'>+           id="rect2989"</div><div class='add'>+           width="82.85714"</div><div class='add'>+           height="11.428572"</div><div class='add'>+           x="240"</div><div class='add'>+           y="492.36218" /&gt;&lt;/flowRegion&gt;&lt;flowPara</div><div class='add'>+         id="flowPara2991" /&gt;&lt;/flowRoot&gt;    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Symbol;-inkscape-font-specification:Symbol"</div><div class='add'>+       x="362.371"</div><div class='add'>+       y="262.51819"</div><div class='add'>+       id="text4441"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4443"</div><div class='add'>+         x="362.371"</div><div class='add'>+         y="262.51819"&gt;-&amp;gt;expedited_sequence: 3  GP: E,H&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"</div><div class='add'>+       id="rect3101"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="253.55223"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="297.04141"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"</div><div class='add'>+       id="rect3101-3-6"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="427.509"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="384.01981"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"</div><div class='add'>+       id="rect3101-3-6-7-5"</div><div class='add'>+       width="43.158947"</div><div class='add'>+       height="26.33428"</div><div class='add'>+       x="340.53061"</div><div class='add'>+       y="275.07489" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3997"</div><div class='add'>+       transform="translate(-0.87295532,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2"</div><div class='add'>+         style="fill:#ff8282;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="146.00092"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015"</div><div class='add'>+           x="146.00092"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:4&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g3019"</div><div class='add'>+       transform="translate(260.06223,0)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="123.95757"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-35-0"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="167.44673"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-62-9"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="297.91437"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-9-3"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="254.42516"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-1-6"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="343.37366"</div><div class='add'>+         x="210.93593"</div><div class='add'>+         height="26.33428"</div><div class='add'>+         width="43.158947"</div><div class='add'>+         id="rect3101-3-6-7-5-2-0"</div><div class='add'>+         style="fill:#ff8282;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;</div><div class='add'>+      &lt;text</div><div class='add'>+         xml:space="preserve"</div><div class='add'>+         style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+         x="145.54926"</div><div class='add'>+         y="360.25174"</div><div class='add'>+         id="text3013-3"</div><div class='add'>+         sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan3015-6"</div><div class='add'>+           x="145.54926"</div><div class='add'>+           y="360.25174"</div><div class='add'>+           style="font-size:10px"&gt;:6&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="275.59558"</div><div class='add'>+       y="291.95297"</div><div class='add'>+       id="text3013-36"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-7"</div><div class='add'>+         x="275.59558"</div><div class='add'>+         y="291.95297"</div><div class='add'>+         style="font-size:10px"&gt;:6&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="405.40396"</div><div class='add'>+       y="291.88705"</div><div class='add'>+       id="text3013-3-36-3"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-6-7-6"</div><div class='add'>+         x="405.40396"</div><div class='add'>+         y="291.88705"</div><div class='add'>+         style="font-size:10px"&gt;F&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"</div><div class='add'>+       x="449.22031"</div><div class='add'>+       y="291.88217"</div><div class='add'>+       id="text3013-3-36-3-3"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3015-6-7-6-6"</div><div class='add'>+         x="449.22031"</div><div class='add'>+         y="291.88217"</div><div class='add'>+         style="font-size:10px"&gt;G&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/RCU/Design/Requirements/Requirements.html b/Documentation/RCU/Design/Requirements/Requirements.html<br/>index a4d3838130e4..21593496aca6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/RCU/Design/Requirements/Requirements.html?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/RCU/Design/Requirements/Requirements.html</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/Design/Requirements/Requirements.html?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/Design/Requirements/Requirements.html</a></div><div class='hunk'>@@ -547,7 +547,7 @@ The &lt;tt&gt;rcu_access_pointer()&lt;/tt&gt; on line&amp;nbsp;6 is similar to</div><div class='ctx'> 	It could reuse a value formerly fetched from this same pointer.</div><div class='ctx'> 	It could also fetch the pointer from &lt;tt&gt;gp&lt;/tt&gt; in a byte-at-a-time</div><div class='ctx'> 	manner, resulting in &lt;i&gt;load tearing&lt;/i&gt;, in turn resulting a bytewise</div><div class='del'>-	mash-up of two distince pointer values.</div><div class='add'>+	mash-up of two distinct pointer values.</div><div class='ctx'> 	It might even use value-speculation optimizations, where it makes</div><div class='ctx'> 	a wrong guess, but by the time it gets around to checking the</div><div class='ctx'> 	value, an update has changed the pointer to match the wrong guess.</div><div class='hunk'>@@ -659,6 +659,29 @@ systems with more than one CPU:</div><div class='ctx'> 	In other words, a given instance of &lt;tt&gt;synchronize_rcu()&lt;/tt&gt;</div><div class='ctx'> 	can avoid waiting on a given RCU read-side critical section only</div><div class='ctx'> 	if it can prove that &lt;tt&gt;synchronize_rcu()&lt;/tt&gt; started first.</div><div class='add'>+</div><div class='add'>+	&lt;p&gt;</div><div class='add'>+	A related question is &amp;ldquo;When &lt;tt&gt;rcu_read_lock()&lt;/tt&gt;</div><div class='add'>+	doesn't generate any code, why does it matter how it relates</div><div class='add'>+	to a grace period?&amp;rdquo;</div><div class='add'>+	The answer is that it is not the relationship of</div><div class='add'>+	&lt;tt&gt;rcu_read_lock()&lt;/tt&gt; itself that is important, but rather</div><div class='add'>+	the relationship of the code within the enclosed RCU read-side</div><div class='add'>+	critical section to the code preceding and following the</div><div class='add'>+	grace period.</div><div class='add'>+	If we take this viewpoint, then a given RCU read-side critical</div><div class='add'>+	section begins before a given grace period when some access</div><div class='add'>+	preceding the grace period observes the effect of some access</div><div class='add'>+	within the critical section, in which case none of the accesses</div><div class='add'>+	within the critical section may observe the effects of any</div><div class='add'>+	access following the grace period.</div><div class='add'>+</div><div class='add'>+	&lt;p&gt;</div><div class='add'>+	As of late 2016, mathematical models of RCU take this</div><div class='add'>+	viewpoint, for example, see slides&amp;nbsp;62 and&amp;nbsp;63</div><div class='add'>+	of the</div><div class='add'>+	&lt;a href="http://www2.rdrop.com/users/paulmck/scalability/paper/LinuxMM.2016.10.04c.LCE.pdf"&gt;2016 LinuxCon EU&lt;/a&gt;</div><div class='add'>+	presentation.</div><div class='ctx'> &lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;</div><div class='ctx'> &lt;tr&gt;&lt;td&gt;&amp;nbsp;&lt;/td&gt;&lt;/tr&gt;</div><div class='ctx'> &lt;/table&gt;</div><div class='hunk'>@@ -1457,7 +1480,7 @@ speed-of-light delays if nothing else.</div><div class='ctx'> </div><div class='ctx'> &lt;p&gt;</div><div class='ctx'> Furthermore, uncertainty about external state is inherent in many cases.</div><div class='del'>-For example, a pair of veternarians might use heartbeat to determine</div><div class='add'>+For example, a pair of veterinarians might use heartbeat to determine</div><div class='ctx'> whether or not a given cat was alive.</div><div class='ctx'> But how long should they wait after the last heartbeat to decide that</div><div class='ctx'> the cat is in fact dead?</div><div class='hunk'>@@ -1466,9 +1489,9 @@ mean that a relaxed cat would be considered to cycle between death</div><div class='ctx'> and life more than 100 times per minute.</div><div class='ctx'> Moreover, just as with human beings, a cat's heart might stop for</div><div class='ctx'> some period of time, so the exact wait period is a judgment call.</div><div class='del'>-One of our pair of veternarians might wait 30 seconds before pronouncing</div><div class='add'>+One of our pair of veterinarians might wait 30 seconds before pronouncing</div><div class='ctx'> the cat dead, while the other might insist on waiting a full minute.</div><div class='del'>-The two veternarians would then disagree on the state of the cat during</div><div class='add'>+The two veterinarians would then disagree on the state of the cat during</div><div class='ctx'> the final 30 seconds of the minute following the last heartbeat.</div><div class='ctx'> </div><div class='ctx'> &lt;p&gt;</div><div class='hunk'>@@ -1922,7 +1945,7 @@ guard against mishaps and misuse:</div><div class='ctx'> &lt;ol&gt;</div><div class='ctx'> &lt;li&gt;	It is all too easy to forget to use &lt;tt&gt;rcu_read_lock()&lt;/tt&gt;</div><div class='ctx'> 	everywhere that it is needed, so kernels built with</div><div class='del'>-	&lt;tt&gt;CONFIG_PROVE_RCU=y&lt;/tt&gt; will spat if</div><div class='add'>+	&lt;tt&gt;CONFIG_PROVE_RCU=y&lt;/tt&gt; will splat if</div><div class='ctx'> 	&lt;tt&gt;rcu_dereference()&lt;/tt&gt; is used outside of an</div><div class='ctx'> 	RCU read-side critical section.</div><div class='ctx'> 	Update-side code can use &lt;tt&gt;rcu_dereference_protected()&lt;/tt&gt;,</div><div class='hunk'>@@ -2398,7 +2421,7 @@ However, there are some restrictions on the code placed within</div><div class='ctx'> &lt;li&gt;	Blocking is prohibited.</div><div class='ctx'> 	In practice, this is not a serious restriction given that idle</div><div class='ctx'> 	tasks are prohibited from blocking to begin with.</div><div class='del'>-&lt;li&gt;	Although nesting &lt;tt&gt;RCU_NONIDLE()&lt;/tt&gt; is permited, they cannot</div><div class='add'>+&lt;li&gt;	Although nesting &lt;tt&gt;RCU_NONIDLE()&lt;/tt&gt; is permitted, they cannot</div><div class='ctx'> 	nest indefinitely deeply.</div><div class='ctx'> 	However, given that they can be nested on the order of a million</div><div class='ctx'> 	deep, even on 32-bit systems, this should not be a serious</div><div class='hunk'>@@ -2862,7 +2885,7 @@ APIs for defining and initializing &lt;tt&gt;srcu_struct&lt;/tt&gt; structures.</div><div class='ctx'> &lt;h3&gt;&lt;a name="Tasks RCU"&gt;Tasks RCU&lt;/a&gt;&lt;/h3&gt;</div><div class='ctx'> </div><div class='ctx'> &lt;p&gt;</div><div class='del'>-Some forms of tracing use &amp;ldquo;tramopolines&amp;rdquo; to handle the</div><div class='add'>+Some forms of tracing use &amp;ldquo;trampolines&amp;rdquo; to handle the</div><div class='ctx'> binary rewriting required to install different types of probes.</div><div class='ctx'> It would be good to be able to free old trampolines, which sounds</div><div class='ctx'> like a job for some form of RCU.</div><div class='head'>diff --git a/Documentation/RCU/trace.txt b/Documentation/RCU/trace.txt<br/>index 00a3a38b375a..6549012033f9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/RCU/trace.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/RCU/trace.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/trace.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/trace.txt</a></div><div class='hunk'>@@ -237,7 +237,7 @@ o	"ktl" is the low-order 16 bits (in hexadecimal) of the count of</div><div class='ctx'> </div><div class='ctx'> The output of "cat rcu/rcu_preempt/rcuexp" looks as follows:</div><div class='ctx'> </div><div class='del'>-s=21872 wd1=0 wd2=0 wd3=5 n=0 enq=0 sc=21872</div><div class='add'>+s=21872 wd1=0 wd2=0 wd3=5 enq=0 sc=21872</div><div class='ctx'> </div><div class='ctx'> These fields are as follows:</div><div class='ctx'> </div><div class='hunk'>@@ -249,9 +249,6 @@ o	"wd1", "wd2", and "wd3" are the number of times that an attempt</div><div class='ctx'> 	completed an expedited grace period that satisfies the attempted</div><div class='ctx'> 	request.  "Our work is done."</div><div class='ctx'> </div><div class='del'>-o	"n" is number of times that a concurrent CPU-hotplug operation</div><div class='del'>-	forced a fallback to a normal grace period.</div><div class='del'>-</div><div class='ctx'> o	"enq" is the number of quiescent states still outstanding.</div><div class='ctx'> </div><div class='ctx'> o	"sc" is the number of times that the attempt to start a</div><div class='head'>diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt<br/>index 204422719197..5cbd8b2395b8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/RCU/whatisRCU.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/RCU/whatisRCU.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/RCU/whatisRCU.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/RCU/whatisRCU.txt</a></div><div class='hunk'>@@ -237,7 +237,7 @@ rcu_dereference()</div><div class='ctx'> </div><div class='ctx'> 	The reader uses rcu_dereference() to fetch an RCU-protected</div><div class='ctx'> 	pointer, which returns a value that may then be safely</div><div class='del'>-	dereferenced.  Note that rcu_deference() does not actually</div><div class='add'>+	dereferenced.  Note that rcu_dereference() does not actually</div><div class='ctx'> 	dereference the pointer, instead, it protects the pointer for</div><div class='ctx'> 	later dereferencing.  It also executes any needed memory-barrier</div><div class='ctx'> 	instructions for a given CPU architecture.  Currently, only Alpha</div><div class='head'>diff --git a/Documentation/SecurityBugs b/Documentation/SecurityBugs<br/>deleted file mode 100644<br/>index 342d769834f6..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/SecurityBugs?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/SecurityBugs</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-.. _securitybugs:</div><div class='del'>-</div><div class='del'>-Security bugs</div><div class='del'>-=============</div><div class='del'>-</div><div class='del'>-Linux kernel developers take security very seriously.  As such, we'd</div><div class='del'>-like to know when a security bug is found so that it can be fixed and</div><div class='del'>-disclosed as quickly as possible.  Please report security bugs to the</div><div class='del'>-Linux kernel security team.</div><div class='del'>-</div><div class='del'>-1) Contact</div><div class='del'>-----------</div><div class='del'>-</div><div class='del'>-The Linux kernel security team can be contacted by email at</div><div class='del'>-&lt;security@kernel.org&gt;.  This is a private list of security officers</div><div class='del'>-who will help verify the bug report and develop and release a fix.</div><div class='del'>-It is possible that the security team will bring in extra help from</div><div class='del'>-area maintainers to understand and fix the security vulnerability.</div><div class='del'>-</div><div class='del'>-As it is with any bug, the more information provided the easier it</div><div class='del'>-will be to diagnose and fix.  Please review the procedure outlined in</div><div class='del'>-REPORTING-BUGS if you are unclear about what information is helpful.</div><div class='del'>-Any exploit code is very helpful and will not be released without</div><div class='del'>-consent from the reporter unless it has already been made public.</div><div class='del'>-</div><div class='del'>-2) Disclosure</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-The goal of the Linux kernel security team is to work with the</div><div class='del'>-bug submitter to bug resolution as well as disclosure.  We prefer</div><div class='del'>-to fully disclose the bug as soon as possible.  It is reasonable to</div><div class='del'>-delay disclosure when the bug or the fix is not yet fully understood,</div><div class='del'>-the solution is not well-tested or for vendor coordination.  However, we</div><div class='del'>-expect these delays to be short, measurable in days, not weeks or months.</div><div class='del'>-A disclosure date is negotiated by the security team working with the</div><div class='del'>-bug submitter as well as vendors.  However, the kernel security team</div><div class='del'>-holds the final say when setting a disclosure date.  The timeframe for</div><div class='del'>-disclosure is from immediate (esp. if it's already publicly known)</div><div class='del'>-to a few weeks.  As a basic default policy, we expect report date to</div><div class='del'>-disclosure date to be on the order of 7 days.</div><div class='del'>-</div><div class='del'>-3) Non-disclosure agreements</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-The Linux kernel security team is not a formal body and therefore unable</div><div class='del'>-to enter any non-disclosure agreements.</div><div class='head'>diff --git a/Documentation/SubmitChecklist b/Documentation/SubmitChecklist<br/>deleted file mode 100644<br/>index 894289b22b15..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/SubmitChecklist?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/SubmitChecklist</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,120 +0,0 @@</div><div class='del'>-.. _submitchecklist:</div><div class='del'>-</div><div class='del'>-Linux Kernel patch submission checklist</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-Here are some basic things that developers should do if they want to see their</div><div class='del'>-kernel patch submissions accepted more quickly.</div><div class='del'>-</div><div class='del'>-These are all above and beyond the documentation that is provided in</div><div class='del'>-:ref:`Documentation/SubmittingPatches &lt;submittingpatches&gt;`</div><div class='del'>-and elsewhere regarding submitting Linux kernel patches.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1) If you use a facility then #include the file that defines/declares</div><div class='del'>-   that facility.  Don't depend on other header files pulling in ones</div><div class='del'>-   that you use.</div><div class='del'>-</div><div class='del'>-2) Builds cleanly:</div><div class='del'>-</div><div class='del'>-  a) with applicable or modified ``CONFIG`` options ``=y``, ``=m``, and</div><div class='del'>-     ``=n``.  No ``gcc`` warnings/errors, no linker warnings/errors.</div><div class='del'>-</div><div class='del'>-  b) Passes ``allnoconfig``, ``allmodconfig``</div><div class='del'>-</div><div class='del'>-  c) Builds successfully when using ``O=builddir``</div><div class='del'>-</div><div class='del'>-3) Builds on multiple CPU architectures by using local cross-compile tools</div><div class='del'>-   or some other build farm.</div><div class='del'>-</div><div class='del'>-4) ppc64 is a good architecture for cross-compilation checking because it</div><div class='del'>-   tends to use ``unsigned long`` for 64-bit quantities.</div><div class='del'>-</div><div class='del'>-5) Check your patch for general style as detailed in</div><div class='del'>-   :ref:`Documentation/CodingStyle &lt;codingstyle&gt;`.</div><div class='del'>-   Check for trivial violations with the patch style checker prior to</div><div class='del'>-   submission (``scripts/checkpatch.pl``).</div><div class='del'>-   You should be able to justify all violations that remain in</div><div class='del'>-   your patch.</div><div class='del'>-</div><div class='del'>-6) Any new or modified ``CONFIG`` options don't muck up the config menu.</div><div class='del'>-</div><div class='del'>-7) All new ``Kconfig`` options have help text.</div><div class='del'>-</div><div class='del'>-8) Has been carefully reviewed with respect to relevant ``Kconfig``</div><div class='del'>-   combinations.  This is very hard to get right with testing -- brainpower</div><div class='del'>-   pays off here.</div><div class='del'>-</div><div class='del'>-9) Check cleanly with sparse.</div><div class='del'>-</div><div class='del'>-10) Use ``make checkstack`` and ``make namespacecheck`` and fix any problems</div><div class='del'>-    that they find.</div><div class='del'>-</div><div class='del'>-    .. note::</div><div class='del'>-</div><div class='del'>-       ``checkstack`` does not point out problems explicitly,</div><div class='del'>-       but any one function that uses more than 512 bytes on the stack is a</div><div class='del'>-       candidate for change.</div><div class='del'>-</div><div class='del'>-11) Include :ref:`kernel-doc &lt;kernel_doc&gt;` to document global  kernel APIs.</div><div class='del'>-    (Not required for static functions, but OK there also.) Use</div><div class='del'>-    ``make htmldocs`` or ``make pdfdocs`` to check the</div><div class='del'>-    :ref:`kernel-doc &lt;kernel_doc&gt;` and fix any issues.</div><div class='del'>-</div><div class='del'>-12) Has been tested with ``CONFIG_PREEMPT``, ``CONFIG_DEBUG_PREEMPT``,</div><div class='del'>-    ``CONFIG_DEBUG_SLAB``, ``CONFIG_DEBUG_PAGEALLOC``, ``CONFIG_DEBUG_MUTEXES``,</div><div class='del'>-    ``CONFIG_DEBUG_SPINLOCK``, ``CONFIG_DEBUG_ATOMIC_SLEEP``,</div><div class='del'>-    ``CONFIG_PROVE_RCU`` and ``CONFIG_DEBUG_OBJECTS_RCU_HEAD`` all</div><div class='del'>-    simultaneously enabled.</div><div class='del'>-</div><div class='del'>-13) Has been build- and runtime tested with and without ``CONFIG_SMP`` and</div><div class='del'>-    ``CONFIG_PREEMPT.``</div><div class='del'>-</div><div class='del'>-14) If the patch affects IO/Disk, etc: has been tested with and without</div><div class='del'>-    ``CONFIG_LBDAF.``</div><div class='del'>-</div><div class='del'>-15) All codepaths have been exercised with all lockdep features enabled.</div><div class='del'>-</div><div class='del'>-16) All new ``/proc`` entries are documented under ``Documentation/``</div><div class='del'>-</div><div class='del'>-17) All new kernel boot parameters are documented in</div><div class='del'>-    ``Documentation/kernel-parameters.txt``.</div><div class='del'>-</div><div class='del'>-18) All new module parameters are documented with ``MODULE_PARM_DESC()``</div><div class='del'>-</div><div class='del'>-19) All new userspace interfaces are documented in ``Documentation/ABI/``.</div><div class='del'>-    See ``Documentation/ABI/README`` for more information.</div><div class='del'>-    Patches that change userspace interfaces should be CCed to</div><div class='del'>-    linux-api@vger.kernel.org.</div><div class='del'>-</div><div class='del'>-20) Check that it all passes ``make headers_check``.</div><div class='del'>-</div><div class='del'>-21) Has been checked with injection of at least slab and page-allocation</div><div class='del'>-    failures.  See ``Documentation/fault-injection/``.</div><div class='del'>-</div><div class='del'>-    If the new code is substantial, addition of subsystem-specific fault</div><div class='del'>-    injection might be appropriate.</div><div class='del'>-</div><div class='del'>-22) Newly-added code has been compiled with ``gcc -W`` (use</div><div class='del'>-    ``make EXTRA_CFLAGS=-W``).  This will generate lots of noise, but is good</div><div class='del'>-    for finding bugs like "warning: comparison between signed and unsigned".</div><div class='del'>-</div><div class='del'>-23) Tested after it has been merged into the -mm patchset to make sure</div><div class='del'>-    that it still works with all of the other queued patches and various</div><div class='del'>-    changes in the VM, VFS, and other subsystems.</div><div class='del'>-</div><div class='del'>-24) All memory barriers {e.g., ``barrier()``, ``rmb()``, ``wmb()``} need a</div><div class='del'>-    comment in the source code that explains the logic of what they are doing</div><div class='del'>-    and why.</div><div class='del'>-</div><div class='del'>-25) If any ioctl's are added by the patch, then also update</div><div class='del'>-    ``Documentation/ioctl/ioctl-number.txt``.</div><div class='del'>-</div><div class='del'>-26) If your modified source code depends on or uses any of the kernel</div><div class='del'>-    APIs or features that are related to the following ``Kconfig`` symbols,</div><div class='del'>-    then test multiple builds with the related ``Kconfig`` symbols disabled</div><div class='del'>-    and/or ``=m`` (if that option is available) [not all of these at the</div><div class='del'>-    same time, just various/random combinations of them]:</div><div class='del'>-</div><div class='del'>-    ``CONFIG_SMP``, ``CONFIG_SYSFS``, ``CONFIG_PROC_FS``, ``CONFIG_INPUT``, ``CONFIG_PCI``, ``CONFIG_BLOCK``, ``CONFIG_PM``, ``CONFIG_MAGIC_SYSRQ``,</div><div class='del'>-    ``CONFIG_NET``, ``CONFIG_INET=n`` (but latter with ``CONFIG_NET=y``).</div><div class='head'>diff --git a/Documentation/SubmittingDrivers b/Documentation/SubmittingDrivers<br/>deleted file mode 100644<br/>index 252b77a23fad..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/SubmittingDrivers?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/SubmittingDrivers</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,183 +0,0 @@</div><div class='del'>-.. _submittingdrivers:</div><div class='del'>-</div><div class='del'>-Submitting Drivers For The Linux Kernel</div><div class='del'>-=======================================</div><div class='del'>-</div><div class='del'>-This document is intended to explain how to submit device drivers to the</div><div class='del'>-various kernel trees. Note that if you are interested in video card drivers</div><div class='del'>-you should probably talk to XFree86 (http://www.xfree86.org/) and/or X.Org</div><div class='del'>-(http://x.org/) instead.</div><div class='del'>-</div><div class='del'>-Also read the Documentation/SubmittingPatches document.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Allocating Device Numbers</div><div class='del'>--------------------------</div><div class='del'>-</div><div class='del'>-Major and minor numbers for block and character devices are allocated</div><div class='del'>-by the Linux assigned name and number authority (currently this is</div><div class='del'>-Torben Mathiasen). The site is http://www.lanana.org/. This</div><div class='del'>-also deals with allocating numbers for devices that are not going to</div><div class='del'>-be submitted to the mainstream kernel.</div><div class='del'>-See Documentation/devices.txt for more information on this.</div><div class='del'>-</div><div class='del'>-If you don't use assigned numbers then when your device is submitted it will</div><div class='del'>-be given an assigned number even if that is different from values you may</div><div class='del'>-have shipped to customers before.</div><div class='del'>-</div><div class='del'>-Who To Submit Drivers To</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-Linux 2.0:</div><div class='del'>-	No new drivers are accepted for this kernel tree.</div><div class='del'>-</div><div class='del'>-Linux 2.2:</div><div class='del'>-	No new drivers are accepted for this kernel tree.</div><div class='del'>-</div><div class='del'>-Linux 2.4:</div><div class='del'>-	If the code area has a general maintainer then please submit it to</div><div class='del'>-	the maintainer listed in MAINTAINERS in the kernel file. If the</div><div class='del'>-	maintainer does not respond or you cannot find the appropriate</div><div class='del'>-	maintainer then please contact Willy Tarreau &lt;w@1wt.eu&gt;.</div><div class='del'>-</div><div class='del'>-Linux 2.6 and upper:</div><div class='del'>-	The same rules apply as 2.4 except that you should follow linux-kernel</div><div class='del'>-	to track changes in API's. The final contact point for Linux 2.6+</div><div class='del'>-	submissions is Andrew Morton.</div><div class='del'>-</div><div class='del'>-What Criteria Determine Acceptance</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-Licensing:</div><div class='del'>-		The code must be released to us under the</div><div class='del'>-		GNU General Public License. We don't insist on any kind</div><div class='del'>-		of exclusive GPL licensing, and if you wish the driver</div><div class='del'>-		to be useful to other communities such as BSD you may well</div><div class='del'>-		wish to release under multiple licenses.</div><div class='del'>-		See accepted licenses at include/linux/module.h</div><div class='del'>-</div><div class='del'>-Copyright:</div><div class='del'>-		The copyright owner must agree to use of GPL.</div><div class='del'>-		It's best if the submitter and copyright owner</div><div class='del'>-		are the same person/entity. If not, the name of</div><div class='del'>-		the person/entity authorizing use of GPL should be</div><div class='del'>-		listed in case it's necessary to verify the will of</div><div class='del'>-		the copyright owner.</div><div class='del'>-</div><div class='del'>-Interfaces:</div><div class='del'>-		If your driver uses existing interfaces and behaves like</div><div class='del'>-		other drivers in the same class it will be much more likely</div><div class='del'>-		to be accepted than if it invents gratuitous new ones.</div><div class='del'>-		If you need to implement a common API over Linux and NT</div><div class='del'>-		drivers do it in userspace.</div><div class='del'>-</div><div class='del'>-Code:</div><div class='del'>-		Please use the Linux style of code formatting as documented</div><div class='del'>-		in :ref:`Documentation/CodingStyle &lt;codingStyle&gt;`.</div><div class='del'>-		If you have sections of code</div><div class='del'>-		that need to be in other formats, for example because they</div><div class='del'>-		are shared with a windows driver kit and you want to</div><div class='del'>-		maintain them just once separate them out nicely and note</div><div class='del'>-		this fact.</div><div class='del'>-</div><div class='del'>-Portability:</div><div class='del'>-		Pointers are not always 32bits, not all computers are little</div><div class='del'>-		endian, people do not all have floating point and you</div><div class='del'>-		shouldn't use inline x86 assembler in your driver without</div><div class='del'>-		careful thought. Pure x86 drivers generally are not popular.</div><div class='del'>-		If you only have x86 hardware it is hard to test portability</div><div class='del'>-		but it is easy to make sure the code can easily be made</div><div class='del'>-		portable.</div><div class='del'>-</div><div class='del'>-Clarity:</div><div class='del'>-		It helps if anyone can see how to fix the driver. It helps</div><div class='del'>-		you because you get patches not bug reports. If you submit a</div><div class='del'>-		driver that intentionally obfuscates how the hardware works</div><div class='del'>-		it will go in the bitbucket.</div><div class='del'>-</div><div class='del'>-PM support:</div><div class='del'>-		Since Linux is used on many portable and desktop systems, your</div><div class='del'>-		driver is likely to be used on such a system and therefore it</div><div class='del'>-		should support basic power management by implementing, if</div><div class='del'>-		necessary, the .suspend and .resume methods used during the</div><div class='del'>-		system-wide suspend and resume transitions.  You should verify</div><div class='del'>-		that your driver correctly handles the suspend and resume, but</div><div class='del'>-		if you are unable to ensure that, please at least define the</div><div class='del'>-		.suspend method returning the -ENOSYS ("Function not</div><div class='del'>-		implemented") error.  You should also try to make sure that your</div><div class='del'>-		driver uses as little power as possible when it's not doing</div><div class='del'>-		anything.  For the driver testing instructions see</div><div class='del'>-		Documentation/power/drivers-testing.txt and for a relatively</div><div class='del'>-		complete overview of the power management issues related to</div><div class='del'>-		drivers see Documentation/power/devices.txt .</div><div class='del'>-</div><div class='del'>-Control:</div><div class='del'>-		In general if there is active maintenance of a driver by</div><div class='del'>-		the author then patches will be redirected to them unless</div><div class='del'>-		they are totally obvious and without need of checking.</div><div class='del'>-		If you want to be the contact and update point for the</div><div class='del'>-		driver it is a good idea to state this in the comments,</div><div class='del'>-		and include an entry in MAINTAINERS for your driver.</div><div class='del'>-</div><div class='del'>-What Criteria Do Not Determine Acceptance</div><div class='del'>------------------------------------------</div><div class='del'>-</div><div class='del'>-Vendor:</div><div class='del'>-		Being the hardware vendor and maintaining the driver is</div><div class='del'>-		often a good thing. If there is a stable working driver from</div><div class='del'>-		other people already in the tree don't expect 'we are the</div><div class='del'>-		vendor' to get your driver chosen. Ideally work with the</div><div class='del'>-		existing driver author to build a single perfect driver.</div><div class='del'>-</div><div class='del'>-Author:</div><div class='del'>-		It doesn't matter if a large Linux company wrote the driver,</div><div class='del'>-		or you did. Nobody has any special access to the kernel</div><div class='del'>-		tree. Anyone who tells you otherwise isn't telling the</div><div class='del'>-		whole story.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Resources</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-Linux kernel master tree:</div><div class='del'>-	ftp.\ *country_code*\ .kernel.org:/pub/linux/kernel/...</div><div class='del'>-</div><div class='del'>-	where *country_code* == your country code, such as</div><div class='del'>-	**us**, **uk**, **fr**, etc.</div><div class='del'>-</div><div class='del'>-	http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git</div><div class='del'>-</div><div class='del'>-Linux kernel mailing list:</div><div class='del'>-	linux-kernel@vger.kernel.org</div><div class='del'>-	[mail majordomo@vger.kernel.org to subscribe]</div><div class='del'>-</div><div class='del'>-Linux Device Drivers, Third Edition (covers 2.6.10):</div><div class='del'>-	http://lwn.net/Kernel/LDD3/  (free version)</div><div class='del'>-</div><div class='del'>-LWN.net:</div><div class='del'>-	Weekly summary of kernel development activity - http://lwn.net/</div><div class='del'>-</div><div class='del'>-	2.6 API changes:</div><div class='del'>-</div><div class='del'>-		http://lwn.net/Articles/2.6-kernel-api/</div><div class='del'>-</div><div class='del'>-	Porting drivers from prior kernels to 2.6:</div><div class='del'>-</div><div class='del'>-		http://lwn.net/Articles/driver-porting/</div><div class='del'>-</div><div class='del'>-KernelNewbies:</div><div class='del'>-	Documentation and assistance for new kernel programmers</div><div class='del'>-</div><div class='del'>-		http://kernelnewbies.org/</div><div class='del'>-</div><div class='del'>-Linux USB project:</div><div class='del'>-	http://www.linux-usb.org/</div><div class='del'>-</div><div class='del'>-How to NOT write kernel driver by Arjan van de Ven:</div><div class='del'>-	http://www.fenrus.org/how-to-not-write-a-device-driver-paper.pdf</div><div class='del'>-</div><div class='del'>-Kernel Janitor:</div><div class='del'>-	http://kernelnewbies.org/KernelJanitors</div><div class='del'>-</div><div class='del'>-GIT, Fast Version Control System:</div><div class='del'>-	http://git-scm.com/</div><div class='head'>diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches<br/>index 36f1dedc944c..81455705e4a6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/SubmittingPatches?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/SubmittingPatches</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/SubmittingPatches?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/SubmittingPatches</a></div><div class='hunk'>@@ -1,841 +1 @@</div><div class='del'>-.. _submittingpatches:</div><div class='del'>-</div><div class='del'>-How to Get Your Change Into the Linux Kernel or Care And Operation Of Your Linus Torvalds</div><div class='del'>-=========================================================================================</div><div class='del'>-</div><div class='del'>-For a person or company who wishes to submit a change to the Linux</div><div class='del'>-kernel, the process can sometimes be daunting if you're not familiar</div><div class='del'>-with "the system."  This text is a collection of suggestions which</div><div class='del'>-can greatly increase the chances of your change being accepted.</div><div class='del'>-</div><div class='del'>-This document contains a large number of suggestions in a relatively terse</div><div class='del'>-format.  For detailed information on how the kernel development process</div><div class='del'>-works, see :ref:`Documentation/development-process &lt;development_process_main&gt;`.</div><div class='del'>-Also, read :ref:`Documentation/SubmitChecklist &lt;submitchecklist&gt;`</div><div class='del'>-for a list of items to check before</div><div class='del'>-submitting code.  If you are submitting a driver, also read</div><div class='del'>-:ref:`Documentation/SubmittingDrivers &lt;submittingdrivers&gt;`;</div><div class='del'>-for device tree binding patches, read</div><div class='del'>-Documentation/devicetree/bindings/submitting-patches.txt.</div><div class='del'>-</div><div class='del'>-Many of these steps describe the default behavior of the ``git`` version</div><div class='del'>-control system; if you use ``git`` to prepare your patches, you'll find much</div><div class='del'>-of the mechanical work done for you, though you'll still need to prepare</div><div class='del'>-and document a sensible set of patches.  In general, use of ``git`` will make</div><div class='del'>-your life as a kernel developer easier.</div><div class='del'>-</div><div class='del'>-Creating and Sending your Change</div><div class='del'>-********************************</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-0) Obtain a current source tree</div><div class='del'>--------------------------------</div><div class='del'>-</div><div class='del'>-If you do not have a repository with the current kernel source handy, use</div><div class='del'>-``git`` to obtain one.  You'll want to start with the mainline repository,</div><div class='del'>-which can be grabbed with::</div><div class='del'>-</div><div class='del'>-  git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git</div><div class='del'>-</div><div class='del'>-Note, however, that you may not want to develop against the mainline tree</div><div class='del'>-directly.  Most subsystem maintainers run their own trees and want to see</div><div class='del'>-patches prepared against those trees.  See the **T:** entry for the subsystem</div><div class='del'>-in the MAINTAINERS file to find that tree, or simply ask the maintainer if</div><div class='del'>-the tree is not listed there.</div><div class='del'>-</div><div class='del'>-It is still possible to download kernel releases via tarballs (as described</div><div class='del'>-in the next section), but that is the hard way to do kernel development.</div><div class='del'>-</div><div class='del'>-1) ``diff -up``</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-If you must generate your patches by hand, use ``diff -up`` or ``diff -uprN``</div><div class='del'>-to create patches.  Git generates patches in this form by default; if</div><div class='del'>-you're using ``git``, you can skip this section entirely.</div><div class='del'>-</div><div class='del'>-All changes to the Linux kernel occur in the form of patches, as</div><div class='del'>-generated by :manpage:`diff(1)`.  When creating your patch, make sure to</div><div class='del'>-create it in "unified diff" format, as supplied by the ``-u`` argument</div><div class='del'>-to :manpage:`diff(1)`.</div><div class='del'>-Also, please use the ``-p`` argument which shows which C function each</div><div class='del'>-change is in - that makes the resultant ``diff`` a lot easier to read.</div><div class='del'>-Patches should be based in the root kernel source directory,</div><div class='del'>-not in any lower subdirectory.</div><div class='del'>-</div><div class='del'>-To create a patch for a single file, it is often sufficient to do::</div><div class='del'>-</div><div class='del'>-	SRCTREE= linux</div><div class='del'>-	MYFILE=  drivers/net/mydriver.c</div><div class='del'>-</div><div class='del'>-	cd $SRCTREE</div><div class='del'>-	cp $MYFILE $MYFILE.orig</div><div class='del'>-	vi $MYFILE	# make your change</div><div class='del'>-	cd ..</div><div class='del'>-	diff -up $SRCTREE/$MYFILE{.orig,} &gt; /tmp/patch</div><div class='del'>-</div><div class='del'>-To create a patch for multiple files, you should unpack a "vanilla",</div><div class='del'>-or unmodified kernel source tree, and generate a ``diff`` against your</div><div class='del'>-own source tree.  For example::</div><div class='del'>-</div><div class='del'>-	MYSRC= /devel/linux</div><div class='del'>-</div><div class='del'>-	tar xvfz linux-3.19.tar.gz</div><div class='del'>-	mv linux-3.19 linux-3.19-vanilla</div><div class='del'>-	diff -uprN -X linux-3.19-vanilla/Documentation/dontdiff \</div><div class='del'>-		linux-3.19-vanilla $MYSRC &gt; /tmp/patch</div><div class='del'>-</div><div class='del'>-``dontdiff`` is a list of files which are generated by the kernel during</div><div class='del'>-the build process, and should be ignored in any :manpage:`diff(1)`-generated</div><div class='del'>-patch.</div><div class='del'>-</div><div class='del'>-Make sure your patch does not include any extra files which do not</div><div class='del'>-belong in a patch submission.  Make sure to review your patch -after-</div><div class='del'>-generating it with :manpage:`diff(1)`, to ensure accuracy.</div><div class='del'>-</div><div class='del'>-If your changes produce a lot of deltas, you need to split them into</div><div class='del'>-individual patches which modify things in logical stages; see</div><div class='del'>-:ref:`split_changes`.  This will facilitate review by other kernel developers,</div><div class='del'>-very important if you want your patch accepted.</div><div class='del'>-</div><div class='del'>-If you're using ``git``, ``git rebase -i`` can help you with this process.  If</div><div class='del'>-you're not using ``git``, ``quilt`` &lt;http://savannah.nongnu.org/projects/quilt&gt;</div><div class='del'>-is another popular alternative.</div><div class='del'>-</div><div class='del'>-.. _describe_changes:</div><div class='del'>-</div><div class='del'>-2) Describe your changes</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-Describe your problem.  Whether your patch is a one-line bug fix or</div><div class='del'>-5000 lines of a new feature, there must be an underlying problem that</div><div class='del'>-motivated you to do this work.  Convince the reviewer that there is a</div><div class='del'>-problem worth fixing and that it makes sense for them to read past the</div><div class='del'>-first paragraph.</div><div class='del'>-</div><div class='del'>-Describe user-visible impact.  Straight up crashes and lockups are</div><div class='del'>-pretty convincing, but not all bugs are that blatant.  Even if the</div><div class='del'>-problem was spotted during code review, describe the impact you think</div><div class='del'>-it can have on users.  Keep in mind that the majority of Linux</div><div class='del'>-installations run kernels from secondary stable trees or</div><div class='del'>-vendor/product-specific trees that cherry-pick only specific patches</div><div class='del'>-from upstream, so include anything that could help route your change</div><div class='del'>-downstream: provoking circumstances, excerpts from dmesg, crash</div><div class='del'>-descriptions, performance regressions, latency spikes, lockups, etc.</div><div class='del'>-</div><div class='del'>-Quantify optimizations and trade-offs.  If you claim improvements in</div><div class='del'>-performance, memory consumption, stack footprint, or binary size,</div><div class='del'>-include numbers that back them up.  But also describe non-obvious</div><div class='del'>-costs.  Optimizations usually aren't free but trade-offs between CPU,</div><div class='del'>-memory, and readability; or, when it comes to heuristics, between</div><div class='del'>-different workloads.  Describe the expected downsides of your</div><div class='del'>-optimization so that the reviewer can weigh costs against benefits.</div><div class='del'>-</div><div class='del'>-Once the problem is established, describe what you are actually doing</div><div class='del'>-about it in technical detail.  It's important to describe the change</div><div class='del'>-in plain English for the reviewer to verify that the code is behaving</div><div class='del'>-as you intend it to.</div><div class='del'>-</div><div class='del'>-The maintainer will thank you if you write your patch description in a</div><div class='del'>-form which can be easily pulled into Linux's source code management</div><div class='del'>-system, ``git``, as a "commit log".  See :ref:`explicit_in_reply_to`.</div><div class='del'>-</div><div class='del'>-Solve only one problem per patch.  If your description starts to get</div><div class='del'>-long, that's a sign that you probably need to split up your patch.</div><div class='del'>-See :ref:`split_changes`.</div><div class='del'>-</div><div class='del'>-When you submit or resubmit a patch or patch series, include the</div><div class='del'>-complete patch description and justification for it.  Don't just</div><div class='del'>-say that this is version N of the patch (series).  Don't expect the</div><div class='del'>-subsystem maintainer to refer back to earlier patch versions or referenced</div><div class='del'>-URLs to find the patch description and put that into the patch.</div><div class='del'>-I.e., the patch (series) and its description should be self-contained.</div><div class='del'>-This benefits both the maintainers and reviewers.  Some reviewers</div><div class='del'>-probably didn't even receive earlier versions of the patch.</div><div class='del'>-</div><div class='del'>-Describe your changes in imperative mood, e.g. "make xyzzy do frotz"</div><div class='del'>-instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy</div><div class='del'>-to do frotz", as if you are giving orders to the codebase to change</div><div class='del'>-its behaviour.</div><div class='del'>-</div><div class='del'>-If the patch fixes a logged bug entry, refer to that bug entry by</div><div class='del'>-number and URL.  If the patch follows from a mailing list discussion,</div><div class='del'>-give a URL to the mailing list archive; use the https://lkml.kernel.org/</div><div class='del'>-redirector with a ``Message-Id``, to ensure that the links cannot become</div><div class='del'>-stale.</div><div class='del'>-</div><div class='del'>-However, try to make your explanation understandable without external</div><div class='del'>-resources.  In addition to giving a URL to a mailing list archive or</div><div class='del'>-bug, summarize the relevant points of the discussion that led to the</div><div class='del'>-patch as submitted.</div><div class='del'>-</div><div class='del'>-If you want to refer to a specific commit, don't just refer to the</div><div class='del'>-SHA-1 ID of the commit. Please also include the oneline summary of</div><div class='del'>-the commit, to make it easier for reviewers to know what it is about.</div><div class='del'>-Example::</div><div class='del'>-</div><div class='del'>-	Commit e21d2170f36602ae2708 ("video: remove unnecessary</div><div class='del'>-	platform_set_drvdata()") removed the unnecessary</div><div class='del'>-	platform_set_drvdata(), but left the variable "dev" unused,</div><div class='del'>-	delete it.</div><div class='del'>-</div><div class='del'>-You should also be sure to use at least the first twelve characters of the</div><div class='del'>-SHA-1 ID.  The kernel repository holds a *lot* of objects, making</div><div class='del'>-collisions with shorter IDs a real possibility.  Bear in mind that, even if</div><div class='del'>-there is no collision with your six-character ID now, that condition may</div><div class='del'>-change five years from now.</div><div class='del'>-</div><div class='del'>-If your patch fixes a bug in a specific commit, e.g. you found an issue using</div><div class='del'>-``git bisect``, please use the 'Fixes:' tag with the first 12 characters of</div><div class='del'>-the SHA-1 ID, and the one line summary.  For example::</div><div class='del'>-</div><div class='del'>-	Fixes: e21d2170f366 ("video: remove unnecessary platform_set_drvdata()")</div><div class='del'>-</div><div class='del'>-The following ``git config`` settings can be used to add a pretty format for</div><div class='del'>-outputting the above style in the ``git log`` or ``git show`` commands::</div><div class='del'>-</div><div class='del'>-	[core]</div><div class='del'>-		abbrev = 12</div><div class='del'>-	[pretty]</div><div class='del'>-		fixes = Fixes: %h (\"%s\")</div><div class='del'>-</div><div class='del'>-.. _split_changes:</div><div class='del'>-</div><div class='del'>-3) Separate your changes</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-Separate each **logical change** into a separate patch.</div><div class='del'>-</div><div class='del'>-For example, if your changes include both bug fixes and performance</div><div class='del'>-enhancements for a single driver, separate those changes into two</div><div class='del'>-or more patches.  If your changes include an API update, and a new</div><div class='del'>-driver which uses that new API, separate those into two patches.</div><div class='del'>-</div><div class='del'>-On the other hand, if you make a single change to numerous files,</div><div class='del'>-group those changes into a single patch.  Thus a single logical change</div><div class='del'>-is contained within a single patch.</div><div class='del'>-</div><div class='del'>-The point to remember is that each patch should make an easily understood</div><div class='del'>-change that can be verified by reviewers.  Each patch should be justifiable</div><div class='del'>-on its own merits.</div><div class='del'>-</div><div class='del'>-If one patch depends on another patch in order for a change to be</div><div class='del'>-complete, that is OK.  Simply note **"this patch depends on patch X"**</div><div class='del'>-in your patch description.</div><div class='del'>-</div><div class='del'>-When dividing your change into a series of patches, take special care to</div><div class='del'>-ensure that the kernel builds and runs properly after each patch in the</div><div class='del'>-series.  Developers using ``git bisect`` to track down a problem can end up</div><div class='del'>-splitting your patch series at any point; they will not thank you if you</div><div class='del'>-introduce bugs in the middle.</div><div class='del'>-</div><div class='del'>-If you cannot condense your patch set into a smaller set of patches,</div><div class='del'>-then only post say 15 or so at a time and wait for review and integration.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4) Style-check your changes</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='del'>-Check your patch for basic style violations, details of which can be</div><div class='del'>-found in</div><div class='del'>-:ref:`Documentation/CodingStyle &lt;codingstyle&gt;`.</div><div class='del'>-Failure to do so simply wastes</div><div class='del'>-the reviewers time and will get your patch rejected, probably</div><div class='del'>-without even being read.</div><div class='del'>-</div><div class='del'>-One significant exception is when moving code from one file to</div><div class='del'>-another -- in this case you should not modify the moved code at all in</div><div class='del'>-the same patch which moves it.  This clearly delineates the act of</div><div class='del'>-moving the code and your changes.  This greatly aids review of the</div><div class='del'>-actual differences and allows tools to better track the history of</div><div class='del'>-the code itself.</div><div class='del'>-</div><div class='del'>-Check your patches with the patch style checker prior to submission</div><div class='del'>-(scripts/checkpatch.pl).  Note, though, that the style checker should be</div><div class='del'>-viewed as a guide, not as a replacement for human judgment.  If your code</div><div class='del'>-looks better with a violation then its probably best left alone.</div><div class='del'>-</div><div class='del'>-The checker reports at three levels:</div><div class='del'>- - ERROR: things that are very likely to be wrong</div><div class='del'>- - WARNING: things requiring careful review</div><div class='del'>- - CHECK: things requiring thought</div><div class='del'>-</div><div class='del'>-You should be able to justify all violations that remain in your</div><div class='del'>-patch.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5) Select the recipients for your patch</div><div class='del'>----------------------------------------</div><div class='del'>-</div><div class='del'>-You should always copy the appropriate subsystem maintainer(s) on any patch</div><div class='del'>-to code that they maintain; look through the MAINTAINERS file and the</div><div class='del'>-source code revision history to see who those maintainers are.  The</div><div class='del'>-script scripts/get_maintainer.pl can be very useful at this step.  If you</div><div class='del'>-cannot find a maintainer for the subsystem you are working on, Andrew</div><div class='del'>-Morton (akpm@linux-foundation.org) serves as a maintainer of last resort.</div><div class='del'>-</div><div class='del'>-You should also normally choose at least one mailing list to receive a copy</div><div class='del'>-of your patch set.  linux-kernel@vger.kernel.org functions as a list of</div><div class='del'>-last resort, but the volume on that list has caused a number of developers</div><div class='del'>-to tune it out.  Look in the MAINTAINERS file for a subsystem-specific</div><div class='del'>-list; your patch will probably get more attention there.  Please do not</div><div class='del'>-spam unrelated lists, though.</div><div class='del'>-</div><div class='del'>-Many kernel-related lists are hosted on vger.kernel.org; you can find a</div><div class='del'>-list of them at http://vger.kernel.org/vger-lists.html.  There are</div><div class='del'>-kernel-related lists hosted elsewhere as well, though.</div><div class='del'>-</div><div class='del'>-Do not send more than 15 patches at once to the vger mailing lists!!!</div><div class='del'>-</div><div class='del'>-Linus Torvalds is the final arbiter of all changes accepted into the</div><div class='del'>-Linux kernel.  His e-mail address is &lt;torvalds@linux-foundation.org&gt;.</div><div class='del'>-He gets a lot of e-mail, and, at this point, very few patches go through</div><div class='del'>-Linus directly, so typically you should do your best to -avoid-</div><div class='del'>-sending him e-mail.</div><div class='del'>-</div><div class='del'>-If you have a patch that fixes an exploitable security bug, send that patch</div><div class='del'>-to security@kernel.org.  For severe bugs, a short embargo may be considered</div><div class='del'>-to allow distributors to get the patch out to users; in such cases,</div><div class='del'>-obviously, the patch should not be sent to any public lists.</div><div class='del'>-</div><div class='del'>-Patches that fix a severe bug in a released kernel should be directed</div><div class='del'>-toward the stable maintainers by putting a line like this::</div><div class='del'>-</div><div class='del'>-  Cc: stable@vger.kernel.org</div><div class='del'>-</div><div class='del'>-into the sign-off area of your patch (note, NOT an email recipient).  You</div><div class='del'>-should also read</div><div class='del'>-:ref:`Documentation/stable_kernel_rules.txt &lt;stable_kernel_rules&gt;`</div><div class='del'>-in addition to this file.</div><div class='del'>-</div><div class='del'>-Note, however, that some subsystem maintainers want to come to their own</div><div class='del'>-conclusions on which patches should go to the stable trees.  The networking</div><div class='del'>-maintainer, in particular, would rather not see individual developers</div><div class='del'>-adding lines like the above to their patches.</div><div class='del'>-</div><div class='del'>-If changes affect userland-kernel interfaces, please send the MAN-PAGES</div><div class='del'>-maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at</div><div class='del'>-least a notification of the change, so that some information makes its way</div><div class='del'>-into the manual pages.  User-space API changes should also be copied to</div><div class='del'>-linux-api@vger.kernel.org.</div><div class='del'>-</div><div class='del'>-For small patches you may want to CC the Trivial Patch Monkey</div><div class='del'>-trivial@kernel.org which collects "trivial" patches. Have a look</div><div class='del'>-into the MAINTAINERS file for its current manager.</div><div class='del'>-</div><div class='del'>-Trivial patches must qualify for one of the following rules:</div><div class='del'>-</div><div class='del'>-- Spelling fixes in documentation</div><div class='del'>-- Spelling fixes for errors which could break :manpage:`grep(1)`</div><div class='del'>-- Warning fixes (cluttering with useless warnings is bad)</div><div class='del'>-- Compilation fixes (only if they are actually correct)</div><div class='del'>-- Runtime fixes (only if they actually fix things)</div><div class='del'>-- Removing use of deprecated functions/macros</div><div class='del'>-- Contact detail and documentation fixes</div><div class='del'>-- Non-portable code replaced by portable code (even in arch-specific,</div><div class='del'>-  since people copy, as long as it's trivial)</div><div class='del'>-- Any fix by the author/maintainer of the file (ie. patch monkey</div><div class='del'>-  in re-transmission mode)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-6) No MIME, no links, no compression, no attachments.  Just plain text</div><div class='del'>-----------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-Linus and other kernel developers need to be able to read and comment</div><div class='del'>-on the changes you are submitting.  It is important for a kernel</div><div class='del'>-developer to be able to "quote" your changes, using standard e-mail</div><div class='del'>-tools, so that they may comment on specific portions of your code.</div><div class='del'>-</div><div class='del'>-For this reason, all patches should be submitted by e-mail "inline".</div><div class='del'>-</div><div class='del'>-.. warning::</div><div class='del'>-</div><div class='del'>-  Be wary of your editor's word-wrap corrupting your patch,</div><div class='del'>-  if you choose to cut-n-paste your patch.</div><div class='del'>-</div><div class='del'>-Do not attach the patch as a MIME attachment, compressed or not.</div><div class='del'>-Many popular e-mail applications will not always transmit a MIME</div><div class='del'>-attachment as plain text, making it impossible to comment on your</div><div class='del'>-code.  A MIME attachment also takes Linus a bit more time to process,</div><div class='del'>-decreasing the likelihood of your MIME-attached change being accepted.</div><div class='del'>-</div><div class='del'>-Exception:  If your mailer is mangling patches then someone may ask</div><div class='del'>-you to re-send them using MIME.</div><div class='del'>-</div><div class='del'>-See :ref:`Documentation/email-clients.txt &lt;email_clients&gt;`</div><div class='del'>-for hints about configuring your e-mail client so that it sends your patches</div><div class='del'>-untouched.</div><div class='del'>-</div><div class='del'>-7) E-mail size</div><div class='del'>---------------</div><div class='del'>-</div><div class='del'>-Large changes are not appropriate for mailing lists, and some</div><div class='del'>-maintainers.  If your patch, uncompressed, exceeds 300 kB in size,</div><div class='del'>-it is preferred that you store your patch on an Internet-accessible</div><div class='del'>-server, and provide instead a URL (link) pointing to your patch.  But note</div><div class='del'>-that if your patch exceeds 300 kB, it almost certainly needs to be broken up</div><div class='del'>-anyway.</div><div class='del'>-</div><div class='del'>-8) Respond to review comments</div><div class='del'>------------------------------</div><div class='del'>-</div><div class='del'>-Your patch will almost certainly get comments from reviewers on ways in</div><div class='del'>-which the patch can be improved.  You must respond to those comments;</div><div class='del'>-ignoring reviewers is a good way to get ignored in return.  Review comments</div><div class='del'>-or questions that do not lead to a code change should almost certainly</div><div class='del'>-bring about a comment or changelog entry so that the next reviewer better</div><div class='del'>-understands what is going on.</div><div class='del'>-</div><div class='del'>-Be sure to tell the reviewers what changes you are making and to thank them</div><div class='del'>-for their time.  Code review is a tiring and time-consuming process, and</div><div class='del'>-reviewers sometimes get grumpy.  Even in that case, though, respond</div><div class='del'>-politely and address the problems they have pointed out.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-9) Don't get discouraged - or impatient</div><div class='del'>----------------------------------------</div><div class='del'>-</div><div class='del'>-After you have submitted your change, be patient and wait.  Reviewers are</div><div class='del'>-busy people and may not get to your patch right away.</div><div class='del'>-</div><div class='del'>-Once upon a time, patches used to disappear into the void without comment,</div><div class='del'>-but the development process works more smoothly than that now.  You should</div><div class='del'>-receive comments within a week or so; if that does not happen, make sure</div><div class='del'>-that you have sent your patches to the right place.  Wait for a minimum of</div><div class='del'>-one week before resubmitting or pinging reviewers - possibly longer during</div><div class='del'>-busy times like merge windows.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-10) Include PATCH in the subject</div><div class='del'>---------------------------------</div><div class='del'>-</div><div class='del'>-Due to high e-mail traffic to Linus, and to linux-kernel, it is common</div><div class='del'>-convention to prefix your subject line with [PATCH].  This lets Linus</div><div class='del'>-and other kernel developers more easily distinguish patches from other</div><div class='del'>-e-mail discussions.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-11) Sign your work</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-To improve tracking of who did what, especially with patches that can</div><div class='del'>-percolate to their final resting place in the kernel through several</div><div class='del'>-layers of maintainers, we've introduced a "sign-off" procedure on</div><div class='del'>-patches that are being emailed around.</div><div class='del'>-</div><div class='del'>-The sign-off is a simple line at the end of the explanation for the</div><div class='del'>-patch, which certifies that you wrote it or otherwise have the right to</div><div class='del'>-pass it on as an open-source patch.  The rules are pretty simple: if you</div><div class='del'>-can certify the below:</div><div class='del'>-</div><div class='del'>-Developer's Certificate of Origin 1.1</div><div class='del'>-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='del'>-</div><div class='del'>-By making a contribution to this project, I certify that:</div><div class='del'>-</div><div class='del'>-        (a) The contribution was created in whole or in part by me and I</div><div class='del'>-            have the right to submit it under the open source license</div><div class='del'>-            indicated in the file; or</div><div class='del'>-</div><div class='del'>-        (b) The contribution is based upon previous work that, to the best</div><div class='del'>-            of my knowledge, is covered under an appropriate open source</div><div class='del'>-            license and I have the right under that license to submit that</div><div class='del'>-            work with modifications, whether created in whole or in part</div><div class='del'>-            by me, under the same open source license (unless I am</div><div class='del'>-            permitted to submit under a different license), as indicated</div><div class='del'>-            in the file; or</div><div class='del'>-</div><div class='del'>-        (c) The contribution was provided directly to me by some other</div><div class='del'>-            person who certified (a), (b) or (c) and I have not modified</div><div class='del'>-            it.</div><div class='del'>-</div><div class='del'>-        (d) I understand and agree that this project and the contribution</div><div class='del'>-            are public and that a record of the contribution (including all</div><div class='del'>-            personal information I submit with it, including my sign-off) is</div><div class='del'>-            maintained indefinitely and may be redistributed consistent with</div><div class='del'>-            this project or the open source license(s) involved.</div><div class='del'>-</div><div class='del'>-then you just add a line saying::</div><div class='del'>-</div><div class='del'>-	Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='del'>-</div><div class='del'>-using your real name (sorry, no pseudonyms or anonymous contributions.)</div><div class='del'>-</div><div class='del'>-Some people also put extra tags at the end.  They'll just be ignored for</div><div class='del'>-now, but you can do this to mark internal company procedures or just</div><div class='del'>-point out some special detail about the sign-off.</div><div class='del'>-</div><div class='del'>-If you are a subsystem or branch maintainer, sometimes you need to slightly</div><div class='del'>-modify patches you receive in order to merge them, because the code is not</div><div class='del'>-exactly the same in your tree and the submitters'. If you stick strictly to</div><div class='del'>-rule (c), you should ask the submitter to rediff, but this is a totally</div><div class='del'>-counter-productive waste of time and energy. Rule (b) allows you to adjust</div><div class='del'>-the code, but then it is very impolite to change one submitter's code and</div><div class='del'>-make him endorse your bugs. To solve this problem, it is recommended that</div><div class='del'>-you add a line between the last Signed-off-by header and yours, indicating</div><div class='del'>-the nature of your changes. While there is nothing mandatory about this, it</div><div class='del'>-seems like prepending the description with your mail and/or name, all</div><div class='del'>-enclosed in square brackets, is noticeable enough to make it obvious that</div><div class='del'>-you are responsible for last-minute changes. Example::</div><div class='del'>-</div><div class='del'>-	Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='del'>-	[lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]</div><div class='del'>-	Signed-off-by: Lucky K Maintainer &lt;lucky@maintainer.example.org&gt;</div><div class='del'>-</div><div class='del'>-This practice is particularly helpful if you maintain a stable branch and</div><div class='del'>-want at the same time to credit the author, track changes, merge the fix,</div><div class='del'>-and protect the submitter from complaints. Note that under no circumstances</div><div class='del'>-can you change the author's identity (the From header), as it is the one</div><div class='del'>-which appears in the changelog.</div><div class='del'>-</div><div class='del'>-Special note to back-porters: It seems to be a common and useful practice</div><div class='del'>-to insert an indication of the origin of a patch at the top of the commit</div><div class='del'>-message (just after the subject line) to facilitate tracking. For instance,</div><div class='del'>-here's what we see in a 3.x-stable release::</div><div class='del'>-</div><div class='del'>-  Date:   Tue Oct 7 07:26:38 2014 -0400</div><div class='del'>-</div><div class='del'>-    libata: Un-break ATA blacklist</div><div class='del'>-</div><div class='del'>-    commit 1c40279960bcd7d52dbdf1d466b20d24b99176c8 upstream.</div><div class='del'>-</div><div class='del'>-And here's what might appear in an older kernel once a patch is backported::</div><div class='del'>-</div><div class='del'>-    Date:   Tue May 13 22:12:27 2008 +0200</div><div class='del'>-</div><div class='del'>-        wireless, airo: waitbusy() won't delay</div><div class='del'>-</div><div class='del'>-        [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]</div><div class='del'>-</div><div class='del'>-Whatever the format, this information provides a valuable help to people</div><div class='del'>-tracking your trees, and to people trying to troubleshoot bugs in your</div><div class='del'>-tree.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-12) When to use Acked-by: and Cc:</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-The Signed-off-by: tag indicates that the signer was involved in the</div><div class='del'>-development of the patch, or that he/she was in the patch's delivery path.</div><div class='del'>-</div><div class='del'>-If a person was not directly involved in the preparation or handling of a</div><div class='del'>-patch but wishes to signify and record their approval of it then they can</div><div class='del'>-ask to have an Acked-by: line added to the patch's changelog.</div><div class='del'>-</div><div class='del'>-Acked-by: is often used by the maintainer of the affected code when that</div><div class='del'>-maintainer neither contributed to nor forwarded the patch.</div><div class='del'>-</div><div class='del'>-Acked-by: is not as formal as Signed-off-by:.  It is a record that the acker</div><div class='del'>-has at least reviewed the patch and has indicated acceptance.  Hence patch</div><div class='del'>-mergers will sometimes manually convert an acker's "yep, looks good to me"</div><div class='del'>-into an Acked-by: (but note that it is usually better to ask for an</div><div class='del'>-explicit ack).</div><div class='del'>-</div><div class='del'>-Acked-by: does not necessarily indicate acknowledgement of the entire patch.</div><div class='del'>-For example, if a patch affects multiple subsystems and has an Acked-by: from</div><div class='del'>-one subsystem maintainer then this usually indicates acknowledgement of just</div><div class='del'>-the part which affects that maintainer's code.  Judgement should be used here.</div><div class='del'>-When in doubt people should refer to the original discussion in the mailing</div><div class='del'>-list archives.</div><div class='del'>-</div><div class='del'>-If a person has had the opportunity to comment on a patch, but has not</div><div class='del'>-provided such comments, you may optionally add a ``Cc:`` tag to the patch.</div><div class='del'>-This is the only tag which might be added without an explicit action by the</div><div class='del'>-person it names - but it should indicate that this person was copied on the</div><div class='del'>-patch.  This tag documents that potentially interested parties</div><div class='del'>-have been included in the discussion.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-13) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:</div><div class='del'>---------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-The Reported-by tag gives credit to people who find bugs and report them and it</div><div class='del'>-hopefully inspires them to help us again in the future.  Please note that if</div><div class='del'>-the bug was reported in private, then ask for permission first before using the</div><div class='del'>-Reported-by tag.</div><div class='del'>-</div><div class='del'>-A Tested-by: tag indicates that the patch has been successfully tested (in</div><div class='del'>-some environment) by the person named.  This tag informs maintainers that</div><div class='del'>-some testing has been performed, provides a means to locate testers for</div><div class='del'>-future patches, and ensures credit for the testers.</div><div class='del'>-</div><div class='del'>-Reviewed-by:, instead, indicates that the patch has been reviewed and found</div><div class='del'>-acceptable according to the Reviewer's Statement:</div><div class='del'>-</div><div class='del'>-Reviewer's statement of oversight</div><div class='del'>-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='del'>-</div><div class='del'>-By offering my Reviewed-by: tag, I state that:</div><div class='del'>-</div><div class='del'>-	 (a) I have carried out a technical review of this patch to</div><div class='del'>-	     evaluate its appropriateness and readiness for inclusion into</div><div class='del'>-	     the mainline kernel.</div><div class='del'>-</div><div class='del'>-	 (b) Any problems, concerns, or questions relating to the patch</div><div class='del'>-	     have been communicated back to the submitter.  I am satisfied</div><div class='del'>-	     with the submitter's response to my comments.</div><div class='del'>-</div><div class='del'>-	 (c) While there may be things that could be improved with this</div><div class='del'>-	     submission, I believe that it is, at this time, (1) a</div><div class='del'>-	     worthwhile modification to the kernel, and (2) free of known</div><div class='del'>-	     issues which would argue against its inclusion.</div><div class='del'>-</div><div class='del'>-	 (d) While I have reviewed the patch and believe it to be sound, I</div><div class='del'>-	     do not (unless explicitly stated elsewhere) make any</div><div class='del'>-	     warranties or guarantees that it will achieve its stated</div><div class='del'>-	     purpose or function properly in any given situation.</div><div class='del'>-</div><div class='del'>-A Reviewed-by tag is a statement of opinion that the patch is an</div><div class='del'>-appropriate modification of the kernel without any remaining serious</div><div class='del'>-technical issues.  Any interested reviewer (who has done the work) can</div><div class='del'>-offer a Reviewed-by tag for a patch.  This tag serves to give credit to</div><div class='del'>-reviewers and to inform maintainers of the degree of review which has been</div><div class='del'>-done on the patch.  Reviewed-by: tags, when supplied by reviewers known to</div><div class='del'>-understand the subject area and to perform thorough reviews, will normally</div><div class='del'>-increase the likelihood of your patch getting into the kernel.</div><div class='del'>-</div><div class='del'>-A Suggested-by: tag indicates that the patch idea is suggested by the person</div><div class='del'>-named and ensures credit to the person for the idea. Please note that this</div><div class='del'>-tag should not be added without the reporter's permission, especially if the</div><div class='del'>-idea was not posted in a public forum. That said, if we diligently credit our</div><div class='del'>-idea reporters, they will, hopefully, be inspired to help us again in the</div><div class='del'>-future.</div><div class='del'>-</div><div class='del'>-A Fixes: tag indicates that the patch fixes an issue in a previous commit. It</div><div class='del'>-is used to make it easy to determine where a bug originated, which can help</div><div class='del'>-review a bug fix. This tag also assists the stable kernel team in determining</div><div class='del'>-which stable kernel versions should receive your fix. This is the preferred</div><div class='del'>-method for indicating a bug fixed by the patch. See :ref:`describe_changes`</div><div class='del'>-for more details.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-14) The canonical patch format</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-This section describes how the patch itself should be formatted.  Note</div><div class='del'>-that, if you have your patches stored in a ``git`` repository, proper patch</div><div class='del'>-formatting can be had with ``git format-patch``.  The tools cannot create</div><div class='del'>-the necessary text, though, so read the instructions below anyway.</div><div class='del'>-</div><div class='del'>-The canonical patch subject line is::</div><div class='del'>-</div><div class='del'>-    Subject: [PATCH 001/123] subsystem: summary phrase</div><div class='del'>-</div><div class='del'>-The canonical patch message body contains the following:</div><div class='del'>-</div><div class='del'>-  - A ``from`` line specifying the patch author (only needed if the person</div><div class='del'>-    sending the patch is not the author).</div><div class='del'>-</div><div class='del'>-  - An empty line.</div><div class='del'>-</div><div class='del'>-  - The body of the explanation, line wrapped at 75 columns, which will</div><div class='del'>-    be copied to the permanent changelog to describe this patch.</div><div class='del'>-</div><div class='del'>-  - The ``Signed-off-by:`` lines, described above, which will</div><div class='del'>-    also go in the changelog.</div><div class='del'>-</div><div class='del'>-  - A marker line containing simply ``---``.</div><div class='del'>-</div><div class='del'>-  - Any additional comments not suitable for the changelog.</div><div class='del'>-</div><div class='del'>-  - The actual patch (``diff`` output).</div><div class='del'>-</div><div class='del'>-The Subject line format makes it very easy to sort the emails</div><div class='del'>-alphabetically by subject line - pretty much any email reader will</div><div class='del'>-support that - since because the sequence number is zero-padded,</div><div class='del'>-the numerical and alphabetic sort is the same.</div><div class='del'>-</div><div class='del'>-The ``subsystem`` in the email's Subject should identify which</div><div class='del'>-area or subsystem of the kernel is being patched.</div><div class='del'>-</div><div class='del'>-The ``summary phrase`` in the email's Subject should concisely</div><div class='del'>-describe the patch which that email contains.  The ``summary</div><div class='del'>-phrase`` should not be a filename.  Do not use the same ``summary</div><div class='del'>-phrase`` for every patch in a whole patch series (where a ``patch</div><div class='del'>-series`` is an ordered sequence of multiple, related patches).</div><div class='del'>-</div><div class='del'>-Bear in mind that the ``summary phrase`` of your email becomes a</div><div class='del'>-globally-unique identifier for that patch.  It propagates all the way</div><div class='del'>-into the ``git`` changelog.  The ``summary phrase`` may later be used in</div><div class='del'>-developer discussions which refer to the patch.  People will want to</div><div class='del'>-google for the ``summary phrase`` to read discussion regarding that</div><div class='del'>-patch.  It will also be the only thing that people may quickly see</div><div class='del'>-when, two or three months later, they are going through perhaps</div><div class='del'>-thousands of patches using tools such as ``gitk`` or ``git log</div><div class='del'>---oneline``.</div><div class='del'>-</div><div class='del'>-For these reasons, the ``summary`` must be no more than 70-75</div><div class='del'>-characters, and it must describe both what the patch changes, as well</div><div class='del'>-as why the patch might be necessary.  It is challenging to be both</div><div class='del'>-succinct and descriptive, but that is what a well-written summary</div><div class='del'>-should do.</div><div class='del'>-</div><div class='del'>-The ``summary phrase`` may be prefixed by tags enclosed in square</div><div class='del'>-brackets: "Subject: [PATCH &lt;tag&gt;...] &lt;summary phrase&gt;".  The tags are</div><div class='del'>-not considered part of the summary phrase, but describe how the patch</div><div class='del'>-should be treated.  Common tags might include a version descriptor if</div><div class='del'>-the multiple versions of the patch have been sent out in response to</div><div class='del'>-comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for</div><div class='del'>-comments.  If there are four patches in a patch series the individual</div><div class='del'>-patches may be numbered like this: 1/4, 2/4, 3/4, 4/4.  This assures</div><div class='del'>-that developers understand the order in which the patches should be</div><div class='del'>-applied and that they have reviewed or applied all of the patches in</div><div class='del'>-the patch series.</div><div class='del'>-</div><div class='del'>-A couple of example Subjects::</div><div class='del'>-</div><div class='del'>-    Subject: [PATCH 2/5] ext2: improve scalability of bitmap searching</div><div class='del'>-    Subject: [PATCH v2 01/27] x86: fix eflags tracking</div><div class='del'>-</div><div class='del'>-The ``from`` line must be the very first line in the message body,</div><div class='del'>-and has the form:</div><div class='del'>-</div><div class='del'>-        From: Original Author &lt;author@example.com&gt;</div><div class='del'>-</div><div class='del'>-The ``from`` line specifies who will be credited as the author of the</div><div class='del'>-patch in the permanent changelog.  If the ``from`` line is missing,</div><div class='del'>-then the ``From:`` line from the email header will be used to determine</div><div class='del'>-the patch author in the changelog.</div><div class='del'>-</div><div class='del'>-The explanation body will be committed to the permanent source</div><div class='del'>-changelog, so should make sense to a competent reader who has long</div><div class='del'>-since forgotten the immediate details of the discussion that might</div><div class='del'>-have led to this patch.  Including symptoms of the failure which the</div><div class='del'>-patch addresses (kernel log messages, oops messages, etc.) is</div><div class='del'>-especially useful for people who might be searching the commit logs</div><div class='del'>-looking for the applicable patch.  If a patch fixes a compile failure,</div><div class='del'>-it may not be necessary to include _all_ of the compile failures; just</div><div class='del'>-enough that it is likely that someone searching for the patch can find</div><div class='del'>-it.  As in the ``summary phrase``, it is important to be both succinct as</div><div class='del'>-well as descriptive.</div><div class='del'>-</div><div class='del'>-The ``---`` marker line serves the essential purpose of marking for patch</div><div class='del'>-handling tools where the changelog message ends.</div><div class='del'>-</div><div class='del'>-One good use for the additional comments after the ``---`` marker is for</div><div class='del'>-a ``diffstat``, to show what files have changed, and the number of</div><div class='del'>-inserted and deleted lines per file.  A ``diffstat`` is especially useful</div><div class='del'>-on bigger patches.  Other comments relevant only to the moment or the</div><div class='del'>-maintainer, not suitable for the permanent changelog, should also go</div><div class='del'>-here.  A good example of such comments might be ``patch changelogs``</div><div class='del'>-which describe what has changed between the v1 and v2 version of the</div><div class='del'>-patch.</div><div class='del'>-</div><div class='del'>-If you are going to include a ``diffstat`` after the ``---`` marker, please</div><div class='del'>-use ``diffstat`` options ``-p 1 -w 70`` so that filenames are listed from</div><div class='del'>-the top of the kernel source tree and don't use too much horizontal</div><div class='del'>-space (easily fit in 80 columns, maybe with some indentation).  (``git``</div><div class='del'>-generates appropriate diffstats by default.)</div><div class='del'>-</div><div class='del'>-See more details on the proper patch format in the following</div><div class='del'>-references.</div><div class='del'>-</div><div class='del'>-.. _explicit_in_reply_to:</div><div class='del'>-</div><div class='del'>-15) Explicit In-Reply-To headers</div><div class='del'>---------------------------------</div><div class='del'>-</div><div class='del'>-It can be helpful to manually add In-Reply-To: headers to a patch</div><div class='del'>-(e.g., when using ``git send-email``) to associate the patch with</div><div class='del'>-previous relevant discussion, e.g. to link a bug fix to the email with</div><div class='del'>-the bug report.  However, for a multi-patch series, it is generally</div><div class='del'>-best to avoid using In-Reply-To: to link to older versions of the</div><div class='del'>-series.  This way multiple versions of the patch don't become an</div><div class='del'>-unmanageable forest of references in email clients.  If a link is</div><div class='del'>-helpful, you can use the https://lkml.kernel.org/ redirector (e.g., in</div><div class='del'>-the cover email text) to link to an earlier version of the patch series.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-16) Sending ``git pull`` requests</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-If you have a series of patches, it may be most convenient to have the</div><div class='del'>-maintainer pull them directly into the subsystem repository with a</div><div class='del'>-``git pull`` operation.  Note, however, that pulling patches from a developer</div><div class='del'>-requires a higher degree of trust than taking patches from a mailing list.</div><div class='del'>-As a result, many subsystem maintainers are reluctant to take pull</div><div class='del'>-requests, especially from new, unknown developers.  If in doubt you can use</div><div class='del'>-the pull request as the cover letter for a normal posting of the patch</div><div class='del'>-series, giving the maintainer the option of using either.</div><div class='del'>-</div><div class='del'>-A pull request should have [GIT] or [PULL] in the subject line.  The</div><div class='del'>-request itself should include the repository name and the branch of</div><div class='del'>-interest on a single line; it should look something like::</div><div class='del'>-</div><div class='del'>-  Please pull from</div><div class='del'>-</div><div class='del'>-      git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus</div><div class='del'>-</div><div class='del'>-  to get these changes:</div><div class='del'>-</div><div class='del'>-A pull request should also include an overall message saying what will be</div><div class='del'>-included in the request, a ``git shortlog`` listing of the patches</div><div class='del'>-themselves, and a ``diffstat`` showing the overall effect of the patch series.</div><div class='del'>-The easiest way to get all this information together is, of course, to let</div><div class='del'>-``git`` do it for you with the ``git request-pull`` command.</div><div class='del'>-</div><div class='del'>-Some maintainers (including Linus) want to see pull requests from signed</div><div class='del'>-commits; that increases their confidence that the request actually came</div><div class='del'>-from you.  Linus, in particular, will not pull from public hosting sites</div><div class='del'>-like GitHub in the absence of a signed tag.</div><div class='del'>-</div><div class='del'>-The first step toward creating such tags is to make a GNUPG key and get it</div><div class='del'>-signed by one or more core kernel developers.  This step can be hard for</div><div class='del'>-new developers, but there is no way around it.  Attending conferences can</div><div class='del'>-be a good way to find developers who can sign your key.</div><div class='del'>-</div><div class='del'>-Once you have prepared a patch series in ``git`` that you wish to have somebody</div><div class='del'>-pull, create a signed tag with ``git tag -s``.  This will create a new tag</div><div class='del'>-identifying the last commit in the series and containing a signature</div><div class='del'>-created with your private key.  You will also have the opportunity to add a</div><div class='del'>-changelog-style message to the tag; this is an ideal place to describe the</div><div class='del'>-effects of the pull request as a whole.</div><div class='del'>-</div><div class='del'>-If the tree the maintainer will be pulling from is not the repository you</div><div class='del'>-are working from, don't forget to push the signed tag explicitly to the</div><div class='del'>-public tree.</div><div class='del'>-</div><div class='del'>-When generating your pull request, use the signed tag as the target.  A</div><div class='del'>-command like this will do the trick::</div><div class='del'>-</div><div class='del'>-  git request-pull master git://my.public.tree/linux.git my-signed-tag</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-REFERENCES</div><div class='del'>-**********</div><div class='del'>-</div><div class='del'>-Andrew Morton, "The perfect patch" (tpp).</div><div class='del'>-  &lt;http://www.ozlabs.org/~akpm/stuff/tpp.txt&gt;</div><div class='del'>-</div><div class='del'>-Jeff Garzik, "Linux kernel patch submission format".</div><div class='del'>-  &lt;http://linux.yyz.us/patch-format.html&gt;</div><div class='del'>-</div><div class='del'>-Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".</div><div class='del'>-  &lt;http://www.kroah.com/log/linux/maintainer.html&gt;</div><div class='del'>-</div><div class='del'>-  &lt;http://www.kroah.com/log/linux/maintainer-02.html&gt;</div><div class='del'>-</div><div class='del'>-  &lt;http://www.kroah.com/log/linux/maintainer-03.html&gt;</div><div class='del'>-</div><div class='del'>-  &lt;http://www.kroah.com/log/linux/maintainer-04.html&gt;</div><div class='del'>-</div><div class='del'>-  &lt;http://www.kroah.com/log/linux/maintainer-05.html&gt;</div><div class='del'>-</div><div class='del'>-  &lt;http://www.kroah.com/log/linux/maintainer-06.html&gt;</div><div class='del'>-</div><div class='del'>-NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!</div><div class='del'>-  &lt;https://lkml.org/lkml/2005/7/11/336&gt;</div><div class='del'>-</div><div class='del'>-Kernel Documentation/CodingStyle:</div><div class='del'>-  :ref:`Documentation/CodingStyle &lt;codingstyle&gt;`</div><div class='del'>-</div><div class='del'>-Linus Torvalds's mail on the canonical patch format:</div><div class='del'>-  &lt;http://lkml.org/lkml/2005/4/7/183&gt;</div><div class='del'>-</div><div class='del'>-Andi Kleen, "On submitting kernel patches"</div><div class='del'>-  Some strategies to get difficult or controversial changes in.</div><div class='del'>-</div><div class='del'>-  http://halobates.de/on-submitting-patches.pdf</div><div class='del'>-</div><div class='add'>+This file has moved to process/submitting-patches.rst</div><div class='head'>diff --git a/Documentation/VGA-softcursor.txt b/Documentation/VGA-softcursor.txt<br/>deleted file mode 100644<br/>index 70acfbf399eb..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/VGA-softcursor.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/VGA-softcursor.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-Software cursor for VGA    by Pavel Machek &lt;pavel@atrey.karlin.mff.cuni.cz&gt;</div><div class='del'>-=======================    and Martin Mares &lt;mj@atrey.karlin.mff.cuni.cz&gt;</div><div class='del'>-</div><div class='del'>-   Linux now has some ability to manipulate cursor appearance. Normally, you</div><div class='del'>-can set the size of hardware cursor (and also work around some ugly bugs in</div><div class='del'>-those miserable Trident cards--see #define TRIDENT_GLITCH in drivers/video/</div><div class='del'>-vgacon.c). You can now play a few new tricks:  you can make your cursor look</div><div class='del'>-like a non-blinking red block, make it inverse background of the character it's</div><div class='del'>-over or to highlight that character and still choose whether the original</div><div class='del'>-hardware cursor should remain visible or not.  There may be other things I have</div><div class='del'>-never thought of.</div><div class='del'>-</div><div class='del'>-   The cursor appearance is controlled by a "&lt;ESC&gt;[?1;2;3c" escape sequence</div><div class='del'>-where 1, 2 and 3 are parameters described below. If you omit any of them,</div><div class='del'>-they will default to zeroes.</div><div class='del'>-</div><div class='del'>-   Parameter 1 specifies cursor size (0=default, 1=invisible, 2=underline, ...,</div><div class='del'>-8=full block) + 16 if you want the software cursor to be applied + 32 if you</div><div class='del'>-want to always change the background color + 64 if you dislike having the</div><div class='del'>-background the same as the foreground.  Highlights are ignored for the last two</div><div class='del'>-flags.</div><div class='del'>-</div><div class='del'>-   The second parameter selects character attribute bits you want to change</div><div class='del'>-(by simply XORing them with the value of this parameter). On standard VGA,</div><div class='del'>-the high four bits specify background and the low four the foreground. In both</div><div class='del'>-groups, low three bits set color (as in normal color codes used by the console)</div><div class='del'>-and the most significant one turns on highlight (or sometimes blinking--it</div><div class='del'>-depends on the configuration of your VGA).</div><div class='del'>-</div><div class='del'>-   The third parameter consists of character attribute bits you want to set.</div><div class='del'>-Bit setting takes place before bit toggling, so you can simply clear a bit by </div><div class='del'>-including it in both the set mask and the toggle mask.</div><div class='del'>-</div><div class='del'>-Examples:</div><div class='del'>-=========</div><div class='del'>-</div><div class='del'>-To get normal blinking underline, use: echo -e '\033[?2c'</div><div class='del'>-To get blinking block, use:            echo -e '\033[?6c'</div><div class='del'>-To get red non-blinking block, use:    echo -e '\033[?17;0;64c'</div><div class='head'>diff --git a/Documentation/acpi/DSD-properties-rules.txt b/Documentation/acpi/DSD-properties-rules.txt<br/>new file mode 100644<br/>index 000000000000..3e4862bdad98<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/acpi/DSD-properties-rules.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/DSD-properties-rules.txt</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+_DSD Device Properties Usage Rules</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+Properties, Property Sets and Property Subsets</div><div class='add'>+----------------------------------------------</div><div class='add'>+</div><div class='add'>+The _DSD (Device Specific Data) configuration object, introduced in ACPI 5.1,</div><div class='add'>+allows any type of device configuration data to be provided via the ACPI</div><div class='add'>+namespace.  In principle, the format of the data may be arbitrary, but it has to</div><div class='add'>+be identified by a UUID which must be recognized by the driver processing the</div><div class='add'>+_DSD output.  However, there are generic UUIDs defined for _DSD recognized by</div><div class='add'>+the ACPI subsystem in the Linux kernel which automatically processes the data</div><div class='add'>+packages associated with them and makes those data available to device drivers</div><div class='add'>+as "device properties".</div><div class='add'>+</div><div class='add'>+A device property is a data item consisting of a string key and a value (of a</div><div class='add'>+specific type) associated with it.</div><div class='add'>+</div><div class='add'>+In the ACPI _DSD context it is an element of the sub-package following the</div><div class='add'>+generic Device Properties UUID in the _DSD return package as specified in the</div><div class='add'>+Device Properties UUID definition document [1].</div><div class='add'>+</div><div class='add'>+It also may be regarded as the definition of a key and the associated data type</div><div class='add'>+that can be returned by _DSD in the Device Properties UUID sub-package for a</div><div class='add'>+given device.</div><div class='add'>+</div><div class='add'>+A property set is a collection of properties applicable to a hardware entity</div><div class='add'>+like a device.  In the ACPI _DSD context it is the set of all properties that</div><div class='add'>+can be returned in the Device Properties UUID sub-package for the device in</div><div class='add'>+question.</div><div class='add'>+</div><div class='add'>+Property subsets are nested collections of properties.  Each of them is</div><div class='add'>+associated with an additional key (name) allowing the subset to be referred</div><div class='add'>+to as a whole (and to be treated as a separate entity).  The canonical</div><div class='add'>+representation of property subsets is via the mechanism specified in the</div><div class='add'>+Hierarchical Properties Extension UUID definition document [2].</div><div class='add'>+</div><div class='add'>+Property sets may be hierarchical.  That is, a property set may contain</div><div class='add'>+multiple property subsets that each may contain property subsets of its</div><div class='add'>+own and so on.</div><div class='add'>+</div><div class='add'>+General Validity Rule for Property Sets</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+Valid property sets must follow the guidance given by the Device Properties UUID</div><div class='add'>+definition document [1].</div><div class='add'>+</div><div class='add'>+_DSD properties are intended to be used in addition to, and not instead of, the</div><div class='add'>+existing mechanisms defined by the ACPI specification.  Therefore, as a rule,</div><div class='add'>+they should only be used if the ACPI specification does not make direct</div><div class='add'>+provisions for handling the underlying use case.  It generally is invalid to</div><div class='add'>+return property sets which do not follow that rule from _DSD in data packages</div><div class='add'>+associated with the Device Properties UUID.</div><div class='add'>+</div><div class='add'>+Additional Considerations</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+There are cases in which, even if the general rule given above is followed in</div><div class='add'>+principle, the property set may still not be regarded as a valid one.</div><div class='add'>+</div><div class='add'>+For example, that applies to device properties which may cause kernel code</div><div class='add'>+(either a device driver or a library/subsystem) to access hardware in a way</div><div class='add'>+possibly leading to a conflict with AML methods in the ACPI namespace.  In</div><div class='add'>+particular, that may happen if the kernel code uses device properties to</div><div class='add'>+manipulate hardware normally controlled by ACPI methods related to power</div><div class='add'>+management, like _PSx and _DSW (for device objects) or _ON and _OFF (for power</div><div class='add'>+resource objects), or by ACPI device disabling/enabling methods, like _DIS and</div><div class='add'>+_SRS.</div><div class='add'>+</div><div class='add'>+In all cases in which kernel code may do something that will confuse AML as a</div><div class='add'>+result of using device properties, the device properties in question are not</div><div class='add'>+suitable for the ACPI environment and consequently they cannot belong to a valid</div><div class='add'>+property set.</div><div class='add'>+</div><div class='add'>+Property Sets and Device Tree Bindings</div><div class='add'>+--------------------------------------</div><div class='add'>+</div><div class='add'>+It often is useful to make _DSD return property sets that follow Device Tree</div><div class='add'>+bindings.</div><div class='add'>+</div><div class='add'>+In those cases, however, the above validity considerations must be taken into</div><div class='add'>+account in the first place and returning invalid property sets from _DSD must be</div><div class='add'>+avoided.  For this reason, it may not be possible to make _DSD return a property</div><div class='add'>+set following the given DT binding literally and completely.  Still, for the</div><div class='add'>+sake of code re-use, it may make sense to provide as much of the configuration</div><div class='add'>+data as possible in the form of device properties and complement that with an</div><div class='add'>+ACPI-specific mechanism suitable for the use case at hand.</div><div class='add'>+</div><div class='add'>+In any case, property sets following DT bindings literally should not be</div><div class='add'>+expected to automatically work in the ACPI environment regardless of their</div><div class='add'>+contents.</div><div class='add'>+</div><div class='add'>+References</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+[1] http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf</div><div class='add'>+[2] http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf</div><div class='head'>diff --git a/Documentation/acpi/acpi-lid.txt b/Documentation/acpi/acpi-lid.txt<br/>index effe7af3a5af..22cb3091f297 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/acpi/acpi-lid.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/acpi/acpi-lid.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/acpi/acpi-lid.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/acpi-lid.txt</a></div><div class='hunk'>@@ -59,28 +59,20 @@ button driver uses the following 3 modes in order not to trigger issues.</div><div class='ctx'> If the userspace hasn't been prepared to ignore the unreliable "opened"</div><div class='ctx'> events and the unreliable initial state notification, Linux users can use</div><div class='ctx'> the following kernel parameters to handle the possible issues:</div><div class='del'>-A. button.lid_init_state=method:</div><div class='del'>-   When this option is specified, the ACPI button driver reports the</div><div class='del'>-   initial lid state using the returning value of the _LID control method</div><div class='del'>-   and whether the "opened"/"closed" events are paired fully relies on the</div><div class='del'>-   firmware implementation.</div><div class='del'>-   This option can be used to fix some platforms where the returning value</div><div class='del'>-   of the _LID control method is reliable but the initial lid state</div><div class='del'>-   notification is missing.</div><div class='del'>-   This option is the default behavior during the period the userspace</div><div class='del'>-   isn't ready to handle the buggy AML tables.</div><div class='del'>-B. button.lid_init_state=open:</div><div class='add'>+A. button.lid_init_state=open:</div><div class='ctx'>    When this option is specified, the ACPI button driver always reports the</div><div class='ctx'>    initial lid state as "opened" and whether the "opened"/"closed" events</div><div class='ctx'>    are paired fully relies on the firmware implementation.</div><div class='ctx'>    This may fix some platforms where the returning value of the _LID</div><div class='ctx'>    control method is not reliable and the initial lid state notification is</div><div class='ctx'>    missing.</div><div class='add'>+   This option is the default behavior during the period the userspace</div><div class='add'>+   isn't ready to handle the buggy AML tables.</div><div class='ctx'> </div><div class='ctx'> If the userspace has been prepared to ignore the unreliable "opened" events</div><div class='ctx'> and the unreliable initial state notification, Linux users should always</div><div class='ctx'> use the following kernel parameter:</div><div class='del'>-C. button.lid_init_state=ignore:</div><div class='add'>+B. button.lid_init_state=ignore:</div><div class='ctx'>    When this option is specified, the ACPI button driver never reports the</div><div class='ctx'>    initial lid state and there is a compensation mechanism implemented to</div><div class='ctx'>    ensure that the reliable "closed" notifications can always be delievered</div><div class='head'>diff --git a/Documentation/acpi/enumeration.txt b/Documentation/acpi/enumeration.txt<br/>index a91ec5af52df..209a5eba6b87 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/acpi/enumeration.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/acpi/enumeration.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/acpi/enumeration.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/enumeration.txt</a></div><div class='hunk'>@@ -415,3 +415,12 @@ the "compatible" property in the _DSD or a _CID as long as one of their</div><div class='ctx'> ancestors provides a _DSD with a valid "compatible" property.  Such device</div><div class='ctx'> objects are then simply regarded as additional "blocks" providing hierarchical</div><div class='ctx'> configuration information to the driver of the composite ancestor device.</div><div class='add'>+</div><div class='add'>+However, PRP0001 can only be returned from either _HID or _CID of a device</div><div class='add'>+object if all of the properties returned by the _DSD associated with it (either</div><div class='add'>+the _DSD of the device object itself or the _DSD of its ancestor in the</div><div class='add'>+"composite device" case described above) can be used in the ACPI environment.</div><div class='add'>+Otherwise, the _DSD itself is regarded as invalid and therefore the "compatible"</div><div class='add'>+property returned by it is meaningless.</div><div class='add'>+</div><div class='add'>+Refer to DSD-properties-rules.txt for more information.</div><div class='head'>diff --git a/Documentation/acpi/gpio-properties.txt b/Documentation/acpi/gpio-properties.txt<br/>index 5aafe0b351a1..2aff0349facd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/acpi/gpio-properties.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/acpi/gpio-properties.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/acpi/gpio-properties.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/gpio-properties.txt</a></div><div class='hunk'>@@ -51,6 +51,68 @@ it to 1 marks the GPIO as active low.</div><div class='ctx'> In our Bluetooth example the "reset-gpios" refers to the second GpioIo()</div><div class='ctx'> resource, second pin in that resource with the GPIO number of 31.</div><div class='ctx'> </div><div class='add'>+It is possible to leave holes in the array of GPIOs. This is useful in</div><div class='add'>+cases like with SPI host controllers where some chip selects may be</div><div class='add'>+implemented as GPIOs and some as native signals. For example a SPI host</div><div class='add'>+controller can have chip selects 0 and 2 implemented as GPIOs and 1 as</div><div class='add'>+native:</div><div class='add'>+</div><div class='add'>+  Package () {</div><div class='add'>+      "cs-gpios",</div><div class='add'>+      Package () {</div><div class='add'>+          ^GPIO, 19, 0, 0, // chip select 0: GPIO</div><div class='add'>+          0,               // chip select 1: native signal</div><div class='add'>+          ^GPIO, 20, 0, 0, // chip select 2: GPIO</div><div class='add'>+      }</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+Other supported properties</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+Following Device Tree compatible device properties are also supported by</div><div class='add'>+_DSD device properties for GPIO controllers:</div><div class='add'>+</div><div class='add'>+- gpio-hog</div><div class='add'>+- output-high</div><div class='add'>+- output-low</div><div class='add'>+- input</div><div class='add'>+- line-name</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+  Name (_DSD, Package () {</div><div class='add'>+      // _DSD Hierarchical Properties Extension UUID</div><div class='add'>+      ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),</div><div class='add'>+      Package () {</div><div class='add'>+          Package () {"hog-gpio8", "G8PU"}</div><div class='add'>+      }</div><div class='add'>+  })</div><div class='add'>+</div><div class='add'>+  Name (G8PU, Package () {</div><div class='add'>+      ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</div><div class='add'>+      Package () {</div><div class='add'>+          Package () {"gpio-hog", 1},</div><div class='add'>+          Package () {"gpios", Package () {8, 0}},</div><div class='add'>+          Package () {"output-high", 1},</div><div class='add'>+          Package () {"line-name", "gpio8-pullup"},</div><div class='add'>+      }</div><div class='add'>+  })</div><div class='add'>+</div><div class='add'>+- gpio-line-names</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+  Package () {</div><div class='add'>+      "gpio-line-names",</div><div class='add'>+      Package () {</div><div class='add'>+          "SPI0_CS_N", "EXP2_INT", "MUX6_IO", "UART0_RXD", "MUX7_IO",</div><div class='add'>+          "LVL_C_A1", "MUX0_IO", "SPI1_MISO"</div><div class='add'>+      }</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+See Documentation/devicetree/bindings/gpio/gpio.txt for more information</div><div class='add'>+about these properties.</div><div class='add'>+</div><div class='ctx'> ACPI GPIO Mappings Provided by Drivers</div><div class='ctx'> --------------------------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/acpi/method-customizing.txt b/Documentation/acpi/method-customizing.txt<br/>index 5f55373dd53b..a3f598e141f2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/acpi/method-customizing.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/acpi/method-customizing.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/acpi/method-customizing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/method-customizing.txt</a></div><div class='hunk'>@@ -57,7 +57,7 @@ Note: To get the ACPI debug object output (Store (AAAA, Debug)),</div><div class='ctx'> 3. undo your changes</div><div class='ctx'>    The "undo" operation is not supported for a new inserted method</div><div class='ctx'>    right now, i.e. we can not remove a method currently.</div><div class='del'>-   For an overrided method, in order to undo your changes, please</div><div class='add'>+   For an overridden method, in order to undo your changes, please</div><div class='ctx'>    save a copy of the method original ASL code in step c) section 1,</div><div class='ctx'>    and redo step c) ~ g) to override the method with the original one.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/acpi/method-tracing.txt b/Documentation/acpi/method-tracing.txt<br/>index c2505eefc878..0aba14c8f459 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/acpi/method-tracing.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/acpi/method-tracing.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/acpi/method-tracing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/method-tracing.txt</a></div><div class='hunk'>@@ -152,7 +152,7 @@ tracing facility.</div><div class='ctx'> 	Users can enable/disable this debug tracing feature by executing</div><div class='ctx'> 	the following command:</div><div class='ctx'> 	    # echo string &gt; /sys/module/acpi/parameters/trace_state</div><div class='del'>-	Where "string" should be one of the followings:</div><div class='add'>+	Where "string" should be one of the following:</div><div class='ctx'> 	"disable"</div><div class='ctx'> 	    Disable the method tracing feature.</div><div class='ctx'> 	"enable"</div><div class='head'>diff --git a/Documentation/acpi/osi.txt b/Documentation/acpi/osi.txt<br/>new file mode 100644<br/>index 000000000000..50cde0ceb9b0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/acpi/osi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/osi.txt</a></div><div class='hunk'>@@ -0,0 +1,187 @@</div><div class='add'>+ACPI _OSI and _REV methods</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+An ACPI BIOS can use the "Operating System Interfaces" method (_OSI)</div><div class='add'>+to find out what the operating system supports. Eg. If BIOS</div><div class='add'>+AML code includes _OSI("XYZ"), the kernel's AML interpreter</div><div class='add'>+can evaluate that method, look to see if it supports 'XYZ'</div><div class='add'>+and answer YES or NO to the BIOS.</div><div class='add'>+</div><div class='add'>+The ACPI _REV method returns the "Revision of the ACPI specification</div><div class='add'>+that OSPM supports"</div><div class='add'>+</div><div class='add'>+This document explains how and why the BIOS and Linux should use these methods.</div><div class='add'>+It also explains how and why they are widely misused.</div><div class='add'>+</div><div class='add'>+How to use _OSI</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Linux runs on two groups of machines -- those that are tested by the OEM</div><div class='add'>+to be compatible with Linux, and those that were never tested with Linux,</div><div class='add'>+but where Linux was installed to replace the original OS (Windows or OSX).</div><div class='add'>+</div><div class='add'>+The larger group is the systems tested to run only Windows.  Not only that,</div><div class='add'>+but many were tested to run with just one specific version of Windows.</div><div class='add'>+So even though the BIOS may use _OSI to query what version of Windows is running,</div><div class='add'>+only a single path through the BIOS has actually been tested.</div><div class='add'>+Experience shows that taking untested paths through the BIOS</div><div class='add'>+exposes Linux to an entire category of BIOS bugs.</div><div class='add'>+For this reason, Linux _OSI defaults must continue to claim compatibility</div><div class='add'>+with all versions of Windows.</div><div class='add'>+</div><div class='add'>+But Linux isn't actually compatible with Windows, and the Linux community</div><div class='add'>+has also been hurt with regressions when Linux adds the latest version of</div><div class='add'>+Windows to its list of _OSI strings.  So it is possible that additional strings</div><div class='add'>+will be more thoroughly vetted before shipping upstream in the future.</div><div class='add'>+But it is likely that they will all eventually be added.</div><div class='add'>+</div><div class='add'>+What should an OEM do if they want to support Linux and Windows</div><div class='add'>+using the same BIOS image?  Often they need to do something different</div><div class='add'>+for Linux to deal with how Linux is different from Windows.</div><div class='add'>+Here the BIOS should ask exactly what it wants to know:</div><div class='add'>+</div><div class='add'>+_OSI("Linux-OEM-my_interface_name")</div><div class='add'>+where 'OEM' is needed if this is an OEM-specific hook,</div><div class='add'>+and 'my_interface_name' describes the hook, which could be a</div><div class='add'>+quirk, a bug, or a bug-fix.</div><div class='add'>+</div><div class='add'>+In addition, the OEM should send a patch to upstream Linux</div><div class='add'>+via the linux-acpi@vger.kernel.org mailing list.  When that patch</div><div class='add'>+is checked into Linux, the OS will answer "YES" when the BIOS</div><div class='add'>+on the OEM's system uses _OSI to ask if the interface is supported</div><div class='add'>+by the OS.  Linux distributors can back-port that patch for Linux</div><div class='add'>+pre-installs, and it will be included by all distributions that</div><div class='add'>+re-base to upstream.  If the distribution can not update the kernel binary,</div><div class='add'>+they can also add an acpi_osi=Linux-OEM-my_interface_name</div><div class='add'>+cmdline parameter to the boot loader, as needed.</div><div class='add'>+</div><div class='add'>+If the string refers to a feature where the upstream kernel</div><div class='add'>+eventually grows support, a patch should be sent to remove</div><div class='add'>+the string when that support is added to the kernel.</div><div class='add'>+</div><div class='add'>+That was easy.  Read on, to find out how to do it wrong.</div><div class='add'>+</div><div class='add'>+Before _OSI, there was _OS</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+ACPI 1.0 specified "_OS" as an</div><div class='add'>+"object that evaluates to a string that identifies the operating system."</div><div class='add'>+</div><div class='add'>+The ACPI BIOS flow would include an evaluation of _OS, and the AML</div><div class='add'>+interpreter in the kernel would return to it a string identifying the OS:</div><div class='add'>+</div><div class='add'>+Windows 98, SE: "Microsoft Windows"</div><div class='add'>+Windows ME: "Microsoft WindowsME:Millenium Edition"</div><div class='add'>+Windows NT: "Microsoft Windows NT"</div><div class='add'>+</div><div class='add'>+The idea was on a platform tasked with running multiple OS's,</div><div class='add'>+the BIOS could use _OS to enable devices that an OS</div><div class='add'>+might support, or enable quirks or bug workarounds</div><div class='add'>+necessary to make the platform compatible with that pre-existing OS.</div><div class='add'>+</div><div class='add'>+But _OS had fundamental problems.  First, the BIOS needed to know the name</div><div class='add'>+of every possible version of the OS that would run on it, and needed to know</div><div class='add'>+all the quirks of those OS's.  Certainly it would make more sense</div><div class='add'>+for the BIOS to ask *specific* things of the OS, such</div><div class='add'>+"do you support a specific interface", and thus in ACPI 3.0,</div><div class='add'>+_OSI was born to replace _OS.</div><div class='add'>+</div><div class='add'>+_OS was abandoned, though even today, many BIOS look for</div><div class='add'>+_OS "Microsoft Windows NT", though it seems somewhat far-fetched</div><div class='add'>+that anybody would install those old operating systems</div><div class='add'>+over what came with the machine.</div><div class='add'>+</div><div class='add'>+Linux answers "Microsoft Windows NT" to please that BIOS idiom.</div><div class='add'>+That is the *only* viable strategy, as that is what modern Windows does,</div><div class='add'>+and so doing otherwise could steer the BIOS down an untested path.</div><div class='add'>+</div><div class='add'>+_OSI is born, and immediately misused</div><div class='add'>+--------------------------------------</div><div class='add'>+</div><div class='add'>+With _OSI, the *BIOS* provides the string describing an interface,</div><div class='add'>+and asks the OS: "YES/NO, are you compatible with this interface?"</div><div class='add'>+</div><div class='add'>+eg. _OSI("3.0 Thermal Model") would return TRUE if the OS knows how</div><div class='add'>+to deal with the thermal extensions made to the ACPI 3.0 specification.</div><div class='add'>+An old OS that doesn't know about those extensions would answer FALSE,</div><div class='add'>+and a new OS may be able to return TRUE.</div><div class='add'>+</div><div class='add'>+For an OS-specific interface, the ACPI spec said that the BIOS and the OS</div><div class='add'>+were to agree on a string of the form such as "Windows-interface_name".</div><div class='add'>+</div><div class='add'>+But two bad things happened.  First, the Windows ecosystem used _OSI</div><div class='add'>+not as designed, but as a direct replacement for _OS -- identifying</div><div class='add'>+the OS version, rather than an OS supported interface.  Indeed, right</div><div class='add'>+from the start, the ACPI 3.0 spec itself codified this misuse</div><div class='add'>+in example code using _OSI("Windows 2001").</div><div class='add'>+</div><div class='add'>+This misuse was adopted and continues today.</div><div class='add'>+</div><div class='add'>+Linux had no choice but to also return TRUE to _OSI("Windows 2001")</div><div class='add'>+and its successors.  To do otherwise would virtually guarantee breaking</div><div class='add'>+a BIOS that has been tested only with that _OSI returning TRUE.</div><div class='add'>+</div><div class='add'>+This strategy is problematic, as Linux is never completely compatible with</div><div class='add'>+the latest version of Windows, and sometimes it takes more than a year</div><div class='add'>+to iron out incompatibilities.</div><div class='add'>+</div><div class='add'>+Not to be out-done, the Linux community made things worse by returning TRUE</div><div class='add'>+to _OSI("Linux").  Doing so is even worse than the Windows misuse</div><div class='add'>+of _OSI, as "Linux" does not even contain any version information.</div><div class='add'>+_OSI("Linux") led to some BIOS' malfunctioning due to BIOS writer's</div><div class='add'>+using it in untested BIOS flows.  But some OEM's used _OSI("Linux")</div><div class='add'>+in tested flows to support real Linux features.  In 2009, Linux</div><div class='add'>+removed _OSI("Linux"), and added a cmdline parameter to restore it</div><div class='add'>+for legacy systems still needed it.  Further a BIOS_BUG warning prints</div><div class='add'>+for all BIOS's that invoke it.</div><div class='add'>+</div><div class='add'>+No BIOS should use _OSI("Linux").</div><div class='add'>+</div><div class='add'>+The result is a strategy for Linux to maximize compatibility with</div><div class='add'>+ACPI BIOS that are tested on Windows machines.  There is a real risk</div><div class='add'>+of over-stating that compatibility; but the alternative has often been</div><div class='add'>+catastrophic failure resulting from the BIOS taking paths that</div><div class='add'>+were never validated under *any* OS.</div><div class='add'>+</div><div class='add'>+Do not use _REV</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Since _OSI("Linux") went away, some BIOS writers used _REV</div><div class='add'>+to support Linux and Windows differences in the same BIOS.</div><div class='add'>+</div><div class='add'>+_REV was defined in ACPI 1.0 to return the version of ACPI</div><div class='add'>+supported by the OS and the OS AML interpreter.</div><div class='add'>+</div><div class='add'>+Modern Windows returns _REV = 2.  Linux used ACPI_CA_SUPPORT_LEVEL,</div><div class='add'>+which would increment, based on the version of the spec supported.</div><div class='add'>+</div><div class='add'>+Unfortunately, _REV was also misused.  eg. some BIOS would check</div><div class='add'>+for _REV = 3, and do something for Linux, but when Linux returned</div><div class='add'>+_REV = 4, that support broke.</div><div class='add'>+</div><div class='add'>+In response to this problem, Linux returns _REV = 2 always,</div><div class='add'>+from mid-2015 onward.  The ACPI specification will also be updated</div><div class='add'>+to reflect that _REV is deprecated, and always returns 2.</div><div class='add'>+</div><div class='add'>+Apple Mac and _OSI("Darwin")</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+On Apple's Mac platforms, the ACPI BIOS invokes _OSI("Darwin")</div><div class='add'>+to determine if the machine is running Apple OSX.</div><div class='add'>+</div><div class='add'>+Like Linux's _OSI("*Windows*") strategy, Linux defaults to</div><div class='add'>+answering YES to _OSI("Darwin") to enable full access</div><div class='add'>+to the hardware and validated BIOS paths seen by OSX.</div><div class='add'>+Just like on Windows-tested platforms, this strategy has risks.</div><div class='add'>+</div><div class='add'>+Starting in Linux-3.18, the kernel answered YES to _OSI("Darwin")</div><div class='add'>+for the purpose of enabling Mac Thunderbolt support.  Further,</div><div class='add'>+if the kernel noticed _OSI("Darwin") being invoked, it additionally</div><div class='add'>+disabled all _OSI("*Windows*") to keep poorly written Mac BIOS</div><div class='add'>+from going down untested combinations of paths.</div><div class='add'>+</div><div class='add'>+The Linux-3.18 change in default caused power regressions on Mac</div><div class='add'>+laptops, and the 3.18 implementation did not allow changing</div><div class='add'>+the default via cmdline "acpi_osi=!Darwin".  Linux-4.7 fixed</div><div class='add'>+the ability to use acpi_osi=!Darwin as a workaround, and</div><div class='add'>+we hope to see Mac Thunderbolt power management support in Linux-4.11.</div><div class='head'>diff --git a/Documentation/acpi/video_extension.txt b/Documentation/acpi/video_extension.txt<br/>index 78b32ac02466..79bf6a4921be 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/acpi/video_extension.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/acpi/video_extension.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/acpi/video_extension.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/acpi/video_extension.txt</a></div><div class='hunk'>@@ -101,6 +101,6 @@ received a notification, it will set the backlight level accordingly. This does</div><div class='ctx'> not affect the sending of event to user space, they are always sent to user</div><div class='ctx'> space regardless of whether or not the video module controls the backlight level</div><div class='ctx'> directly. This behaviour can be controlled through the brightness_switch_enabled</div><div class='del'>-module parameter as documented in kernel-parameters.txt. It is recommended to</div><div class='add'>+module parameter as documented in admin-guide/kernel-parameters.rst. It is recommended to</div><div class='ctx'> disable this behaviour once a GUI environment starts up and wants to have full</div><div class='ctx'> control of the backlight level.</div><div class='head'>diff --git a/Documentation/adding-syscalls.txt b/Documentation/adding-syscalls.txt<br/>deleted file mode 100644<br/>index bbb31e091b28..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/adding-syscalls.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/adding-syscalls.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,527 +0,0 @@</div><div class='del'>-Adding a New System Call</div><div class='del'>-========================</div><div class='del'>-</div><div class='del'>-This document describes what's involved in adding a new system call to the</div><div class='del'>-Linux kernel, over and above the normal submission advice in</div><div class='del'>-Documentation/SubmittingPatches.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-System Call Alternatives</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-The first thing to consider when adding a new system call is whether one of</div><div class='del'>-the alternatives might be suitable instead.  Although system calls are the</div><div class='del'>-most traditional and most obvious interaction points between userspace and the</div><div class='del'>-kernel, there are other possibilities -- choose what fits best for your</div><div class='del'>-interface.</div><div class='del'>-</div><div class='del'>- - If the operations involved can be made to look like a filesystem-like</div><div class='del'>-   object, it may make more sense to create a new filesystem or device.  This</div><div class='del'>-   also makes it easier to encapsulate the new functionality in a kernel module</div><div class='del'>-   rather than requiring it to be built into the main kernel.</div><div class='del'>-     - If the new functionality involves operations where the kernel notifies</div><div class='del'>-       userspace that something has happened, then returning a new file</div><div class='del'>-       descriptor for the relevant object allows userspace to use</div><div class='del'>-       poll/select/epoll to receive that notification.</div><div class='del'>-     - However, operations that don't map to read(2)/write(2)-like operations</div><div class='del'>-       have to be implemented as ioctl(2) requests, which can lead to a</div><div class='del'>-       somewhat opaque API.</div><div class='del'>- - If you're just exposing runtime system information, a new node in sysfs</div><div class='del'>-   (see Documentation/filesystems/sysfs.txt) or the /proc filesystem may be</div><div class='del'>-   more appropriate.  However, access to these mechanisms requires that the</div><div class='del'>-   relevant filesystem is mounted, which might not always be the case (e.g.</div><div class='del'>-   in a namespaced/sandboxed/chrooted environment).  Avoid adding any API to</div><div class='del'>-   debugfs, as this is not considered a 'production' interface to userspace.</div><div class='del'>- - If the operation is specific to a particular file or file descriptor, then</div><div class='del'>-   an additional fcntl(2) command option may be more appropriate.  However,</div><div class='del'>-   fcntl(2) is a multiplexing system call that hides a lot of complexity, so</div><div class='del'>-   this option is best for when the new function is closely analogous to</div><div class='del'>-   existing fcntl(2) functionality, or the new functionality is very simple</div><div class='del'>-   (for example, getting/setting a simple flag related to a file descriptor).</div><div class='del'>- - If the operation is specific to a particular task or process, then an</div><div class='del'>-   additional prctl(2) command option may be more appropriate.  As with</div><div class='del'>-   fcntl(2), this system call is a complicated multiplexor so is best reserved</div><div class='del'>-   for near-analogs of existing prctl() commands or getting/setting a simple</div><div class='del'>-   flag related to a process.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Designing the API: Planning for Extension</div><div class='del'>------------------------------------------</div><div class='del'>-</div><div class='del'>-A new system call forms part of the API of the kernel, and has to be supported</div><div class='del'>-indefinitely.  As such, it's a very good idea to explicitly discuss the</div><div class='del'>-interface on the kernel mailing list, and it's important to plan for future</div><div class='del'>-extensions of the interface.</div><div class='del'>-</div><div class='del'>-(The syscall table is littered with historical examples where this wasn't done,</div><div class='del'>-together with the corresponding follow-up system calls -- eventfd/eventfd2,</div><div class='del'>-dup2/dup3, inotify_init/inotify_init1,  pipe/pipe2, renameat/renameat2 -- so</div><div class='del'>-learn from the history of the kernel and plan for extensions from the start.)</div><div class='del'>-</div><div class='del'>-For simpler system calls that only take a couple of arguments, the preferred</div><div class='del'>-way to allow for future extensibility is to include a flags argument to the</div><div class='del'>-system call.  To make sure that userspace programs can safely use flags</div><div class='del'>-between kernel versions, check whether the flags value holds any unknown</div><div class='del'>-flags, and reject the system call (with EINVAL) if it does:</div><div class='del'>-</div><div class='del'>-    if (flags &amp; ~(THING_FLAG1 | THING_FLAG2 | THING_FLAG3))</div><div class='del'>-        return -EINVAL;</div><div class='del'>-</div><div class='del'>-(If no flags values are used yet, check that the flags argument is zero.)</div><div class='del'>-</div><div class='del'>-For more sophisticated system calls that involve a larger number of arguments,</div><div class='del'>-it's preferred to encapsulate the majority of the arguments into a structure</div><div class='del'>-that is passed in by pointer.  Such a structure can cope with future extension</div><div class='del'>-by including a size argument in the structure:</div><div class='del'>-</div><div class='del'>-    struct xyzzy_params {</div><div class='del'>-        u32 size; /* userspace sets p-&gt;size = sizeof(struct xyzzy_params) */</div><div class='del'>-        u32 param_1;</div><div class='del'>-        u64 param_2;</div><div class='del'>-        u64 param_3;</div><div class='del'>-    };</div><div class='del'>-</div><div class='del'>-As long as any subsequently added field, say param_4, is designed so that a</div><div class='del'>-zero value gives the previous behaviour, then this allows both directions of</div><div class='del'>-version mismatch:</div><div class='del'>-</div><div class='del'>- - To cope with a later userspace program calling an older kernel, the kernel</div><div class='del'>-   code should check that any memory beyond the size of the structure that it</div><div class='del'>-   expects is zero (effectively checking that param_4 == 0).</div><div class='del'>- - To cope with an older userspace program calling a newer kernel, the kernel</div><div class='del'>-   code can zero-extend a smaller instance of the structure (effectively</div><div class='del'>-   setting param_4 = 0).</div><div class='del'>-</div><div class='del'>-See perf_event_open(2) and the perf_copy_attr() function (in</div><div class='del'>-kernel/events/core.c) for an example of this approach.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Designing the API: Other Considerations</div><div class='del'>----------------------------------------</div><div class='del'>-</div><div class='del'>-If your new system call allows userspace to refer to a kernel object, it</div><div class='del'>-should use a file descriptor as the handle for that object -- don't invent a</div><div class='del'>-new type of userspace object handle when the kernel already has mechanisms and</div><div class='del'>-well-defined semantics for using file descriptors.</div><div class='del'>-</div><div class='del'>-If your new xyzzy(2) system call does return a new file descriptor, then the</div><div class='del'>-flags argument should include a value that is equivalent to setting O_CLOEXEC</div><div class='del'>-on the new FD.  This makes it possible for userspace to close the timing</div><div class='del'>-window between xyzzy() and calling fcntl(fd, F_SETFD, FD_CLOEXEC), where an</div><div class='del'>-unexpected fork() and execve() in another thread could leak a descriptor to</div><div class='del'>-the exec'ed program. (However, resist the temptation to re-use the actual value</div><div class='del'>-of the O_CLOEXEC constant, as it is architecture-specific and is part of a</div><div class='del'>-numbering space of O_* flags that is fairly full.)</div><div class='del'>-</div><div class='del'>-If your system call returns a new file descriptor, you should also consider</div><div class='del'>-what it means to use the poll(2) family of system calls on that file</div><div class='del'>-descriptor. Making a file descriptor ready for reading or writing is the</div><div class='del'>-normal way for the kernel to indicate to userspace that an event has</div><div class='del'>-occurred on the corresponding kernel object.</div><div class='del'>-</div><div class='del'>-If your new xyzzy(2) system call involves a filename argument:</div><div class='del'>-</div><div class='del'>-    int sys_xyzzy(const char __user *path, ..., unsigned int flags);</div><div class='del'>-</div><div class='del'>-you should also consider whether an xyzzyat(2) version is more appropriate:</div><div class='del'>-</div><div class='del'>-    int sys_xyzzyat(int dfd, const char __user *path, ..., unsigned int flags);</div><div class='del'>-</div><div class='del'>-This allows more flexibility for how userspace specifies the file in question;</div><div class='del'>-in particular it allows userspace to request the functionality for an</div><div class='del'>-already-opened file descriptor using the AT_EMPTY_PATH flag, effectively giving</div><div class='del'>-an fxyzzy(3) operation for free:</div><div class='del'>-</div><div class='del'>- - xyzzyat(AT_FDCWD, path, ..., 0) is equivalent to xyzzy(path,...)</div><div class='del'>- - xyzzyat(fd, "", ..., AT_EMPTY_PATH) is equivalent to fxyzzy(fd, ...)</div><div class='del'>-</div><div class='del'>-(For more details on the rationale of the *at() calls, see the openat(2) man</div><div class='del'>-page; for an example of AT_EMPTY_PATH, see the fstatat(2) man page.)</div><div class='del'>-</div><div class='del'>-If your new xyzzy(2) system call involves a parameter describing an offset</div><div class='del'>-within a file, make its type loff_t so that 64-bit offsets can be supported</div><div class='del'>-even on 32-bit architectures.</div><div class='del'>-</div><div class='del'>-If your new xyzzy(2) system call involves privileged functionality, it needs</div><div class='del'>-to be governed by the appropriate Linux capability bit (checked with a call to</div><div class='del'>-capable()), as described in the capabilities(7) man page.  Choose an existing</div><div class='del'>-capability bit that governs related functionality, but try to avoid combining</div><div class='del'>-lots of only vaguely related functions together under the same bit, as this</div><div class='del'>-goes against capabilities' purpose of splitting the power of root.  In</div><div class='del'>-particular, avoid adding new uses of the already overly-general CAP_SYS_ADMIN</div><div class='del'>-capability.</div><div class='del'>-</div><div class='del'>-If your new xyzzy(2) system call manipulates a process other than the calling</div><div class='del'>-process, it should be restricted (using a call to ptrace_may_access()) so that</div><div class='del'>-only a calling process with the same permissions as the target process, or</div><div class='del'>-with the necessary capabilities, can manipulate the target process.</div><div class='del'>-</div><div class='del'>-Finally, be aware that some non-x86 architectures have an easier time if</div><div class='del'>-system call parameters that are explicitly 64-bit fall on odd-numbered</div><div class='del'>-arguments (i.e. parameter 1, 3, 5), to allow use of contiguous pairs of 32-bit</div><div class='del'>-registers.  (This concern does not apply if the arguments are part of a</div><div class='del'>-structure that's passed in by pointer.)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Proposing the API</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-To make new system calls easy to review, it's best to divide up the patchset</div><div class='del'>-into separate chunks.  These should include at least the following items as</div><div class='del'>-distinct commits (each of which is described further below):</div><div class='del'>-</div><div class='del'>- - The core implementation of the system call, together with prototypes,</div><div class='del'>-   generic numbering, Kconfig changes and fallback stub implementation.</div><div class='del'>- - Wiring up of the new system call for one particular architecture, usually</div><div class='del'>-   x86 (including all of x86_64, x86_32 and x32).</div><div class='del'>- - A demonstration of the use of the new system call in userspace via a</div><div class='del'>-   selftest in tools/testing/selftests/.</div><div class='del'>- - A draft man-page for the new system call, either as plain text in the</div><div class='del'>-   cover letter, or as a patch to the (separate) man-pages repository.</div><div class='del'>-</div><div class='del'>-New system call proposals, like any change to the kernel's API, should always</div><div class='del'>-be cc'ed to linux-api@vger.kernel.org.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Generic System Call Implementation</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-The main entry point for your new xyzzy(2) system call will be called</div><div class='del'>-sys_xyzzy(), but you add this entry point with the appropriate</div><div class='del'>-SYSCALL_DEFINEn() macro rather than explicitly.  The 'n' indicates the number</div><div class='del'>-of arguments to the system call, and the macro takes the system call name</div><div class='del'>-followed by the (type, name) pairs for the parameters as arguments.  Using</div><div class='del'>-this macro allows metadata about the new system call to be made available for</div><div class='del'>-other tools.</div><div class='del'>-</div><div class='del'>-The new entry point also needs a corresponding function prototype, in</div><div class='del'>-include/linux/syscalls.h, marked as asmlinkage to match the way that system</div><div class='del'>-calls are invoked:</div><div class='del'>-</div><div class='del'>-    asmlinkage long sys_xyzzy(...);</div><div class='del'>-</div><div class='del'>-Some architectures (e.g. x86) have their own architecture-specific syscall</div><div class='del'>-tables, but several other architectures share a generic syscall table. Add your</div><div class='del'>-new system call to the generic list by adding an entry to the list in</div><div class='del'>-include/uapi/asm-generic/unistd.h:</div><div class='del'>-</div><div class='del'>-    #define __NR_xyzzy 292</div><div class='del'>-    __SYSCALL(__NR_xyzzy, sys_xyzzy)</div><div class='del'>-</div><div class='del'>-Also update the __NR_syscalls count to reflect the additional system call, and</div><div class='del'>-note that if multiple new system calls are added in the same merge window,</div><div class='del'>-your new syscall number may get adjusted to resolve conflicts.</div><div class='del'>-</div><div class='del'>-The file kernel/sys_ni.c provides a fallback stub implementation of each system</div><div class='del'>-call, returning -ENOSYS.  Add your new system call here too:</div><div class='del'>-</div><div class='del'>-    cond_syscall(sys_xyzzy);</div><div class='del'>-</div><div class='del'>-Your new kernel functionality, and the system call that controls it, should</div><div class='del'>-normally be optional, so add a CONFIG option (typically to init/Kconfig) for</div><div class='del'>-it. As usual for new CONFIG options:</div><div class='del'>-</div><div class='del'>- - Include a description of the new functionality and system call controlled</div><div class='del'>-   by the option.</div><div class='del'>- - Make the option depend on EXPERT if it should be hidden from normal users.</div><div class='del'>- - Make any new source files implementing the function dependent on the CONFIG</div><div class='del'>-   option in the Makefile (e.g. "obj-$(CONFIG_XYZZY_SYSCALL) += xyzzy.c").</div><div class='del'>- - Double check that the kernel still builds with the new CONFIG option turned</div><div class='del'>-   off.</div><div class='del'>-</div><div class='del'>-To summarize, you need a commit that includes:</div><div class='del'>-</div><div class='del'>- - CONFIG option for the new function, normally in init/Kconfig</div><div class='del'>- - SYSCALL_DEFINEn(xyzzy, ...) for the entry point</div><div class='del'>- - corresponding prototype in include/linux/syscalls.h</div><div class='del'>- - generic table entry in include/uapi/asm-generic/unistd.h</div><div class='del'>- - fallback stub in kernel/sys_ni.c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-x86 System Call Implementation</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-To wire up your new system call for x86 platforms, you need to update the</div><div class='del'>-master syscall tables.  Assuming your new system call isn't special in some</div><div class='del'>-way (see below), this involves a "common" entry (for x86_64 and x32) in</div><div class='del'>-arch/x86/entry/syscalls/syscall_64.tbl:</div><div class='del'>-</div><div class='del'>-    333   common   xyzzy     sys_xyzzy</div><div class='del'>-</div><div class='del'>-and an "i386" entry in arch/x86/entry/syscalls/syscall_32.tbl:</div><div class='del'>-</div><div class='del'>-    380   i386     xyzzy     sys_xyzzy</div><div class='del'>-</div><div class='del'>-Again, these numbers are liable to be changed if there are conflicts in the</div><div class='del'>-relevant merge window.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Compatibility System Calls (Generic)</div><div class='del'>-------------------------------------</div><div class='del'>-</div><div class='del'>-For most system calls the same 64-bit implementation can be invoked even when</div><div class='del'>-the userspace program is itself 32-bit; even if the system call's parameters</div><div class='del'>-include an explicit pointer, this is handled transparently.</div><div class='del'>-</div><div class='del'>-However, there are a couple of situations where a compatibility layer is</div><div class='del'>-needed to cope with size differences between 32-bit and 64-bit.</div><div class='del'>-</div><div class='del'>-The first is if the 64-bit kernel also supports 32-bit userspace programs, and</div><div class='del'>-so needs to parse areas of (__user) memory that could hold either 32-bit or</div><div class='del'>-64-bit values.  In particular, this is needed whenever a system call argument</div><div class='del'>-is:</div><div class='del'>-</div><div class='del'>- - a pointer to a pointer</div><div class='del'>- - a pointer to a struct containing a pointer (e.g. struct iovec __user *)</div><div class='del'>- - a pointer to a varying sized integral type (time_t, off_t, long, ...)</div><div class='del'>- - a pointer to a struct containing a varying sized integral type.</div><div class='del'>-</div><div class='del'>-The second situation that requires a compatibility layer is if one of the</div><div class='del'>-system call's arguments has a type that is explicitly 64-bit even on a 32-bit</div><div class='del'>-architecture, for example loff_t or __u64.  In this case, a value that arrives</div><div class='del'>-at a 64-bit kernel from a 32-bit application will be split into two 32-bit</div><div class='del'>-values, which then need to be re-assembled in the compatibility layer.</div><div class='del'>-</div><div class='del'>-(Note that a system call argument that's a pointer to an explicit 64-bit type</div><div class='del'>-does *not* need a compatibility layer; for example, splice(2)'s arguments of</div><div class='del'>-type loff_t __user * do not trigger the need for a compat_ system call.)</div><div class='del'>-</div><div class='del'>-The compatibility version of the system call is called compat_sys_xyzzy(), and</div><div class='del'>-is added with the COMPAT_SYSCALL_DEFINEn() macro, analogously to</div><div class='del'>-SYSCALL_DEFINEn.  This version of the implementation runs as part of a 64-bit</div><div class='del'>-kernel, but expects to receive 32-bit parameter values and does whatever is</div><div class='del'>-needed to deal with them.  (Typically, the compat_sys_ version converts the</div><div class='del'>-values to 64-bit versions and either calls on to the sys_ version, or both of</div><div class='del'>-them call a common inner implementation function.)</div><div class='del'>-</div><div class='del'>-The compat entry point also needs a corresponding function prototype, in</div><div class='del'>-include/linux/compat.h, marked as asmlinkage to match the way that system</div><div class='del'>-calls are invoked:</div><div class='del'>-</div><div class='del'>-    asmlinkage long compat_sys_xyzzy(...);</div><div class='del'>-</div><div class='del'>-If the system call involves a structure that is laid out differently on 32-bit</div><div class='del'>-and 64-bit systems, say struct xyzzy_args, then the include/linux/compat.h</div><div class='del'>-header file should also include a compat version of the structure (struct</div><div class='del'>-compat_xyzzy_args) where each variable-size field has the appropriate compat_</div><div class='del'>-type that corresponds to the type in struct xyzzy_args.  The</div><div class='del'>-compat_sys_xyzzy() routine can then use this compat_ structure to parse the</div><div class='del'>-arguments from a 32-bit invocation.</div><div class='del'>-</div><div class='del'>-For example, if there are fields:</div><div class='del'>-</div><div class='del'>-    struct xyzzy_args {</div><div class='del'>-        const char __user *ptr;</div><div class='del'>-        __kernel_long_t varying_val;</div><div class='del'>-        u64 fixed_val;</div><div class='del'>-        /* ... */</div><div class='del'>-    };</div><div class='del'>-</div><div class='del'>-in struct xyzzy_args, then struct compat_xyzzy_args would have:</div><div class='del'>-</div><div class='del'>-    struct compat_xyzzy_args {</div><div class='del'>-        compat_uptr_t ptr;</div><div class='del'>-        compat_long_t varying_val;</div><div class='del'>-        u64 fixed_val;</div><div class='del'>-        /* ... */</div><div class='del'>-    };</div><div class='del'>-</div><div class='del'>-The generic system call list also needs adjusting to allow for the compat</div><div class='del'>-version; the entry in include/uapi/asm-generic/unistd.h should use</div><div class='del'>-__SC_COMP rather than __SYSCALL:</div><div class='del'>-</div><div class='del'>-    #define __NR_xyzzy 292</div><div class='del'>-    __SC_COMP(__NR_xyzzy, sys_xyzzy, compat_sys_xyzzy)</div><div class='del'>-</div><div class='del'>-To summarize, you need:</div><div class='del'>-</div><div class='del'>- - a COMPAT_SYSCALL_DEFINEn(xyzzy, ...) for the compat entry point</div><div class='del'>- - corresponding prototype in include/linux/compat.h</div><div class='del'>- - (if needed) 32-bit mapping struct in include/linux/compat.h</div><div class='del'>- - instance of __SC_COMP not __SYSCALL in include/uapi/asm-generic/unistd.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Compatibility System Calls (x86)</div><div class='del'>---------------------------------</div><div class='del'>-</div><div class='del'>-To wire up the x86 architecture of a system call with a compatibility version,</div><div class='del'>-the entries in the syscall tables need to be adjusted.</div><div class='del'>-</div><div class='del'>-First, the entry in arch/x86/entry/syscalls/syscall_32.tbl gets an extra</div><div class='del'>-column to indicate that a 32-bit userspace program running on a 64-bit kernel</div><div class='del'>-should hit the compat entry point:</div><div class='del'>-</div><div class='del'>-    380   i386     xyzzy     sys_xyzzy    compat_sys_xyzzy</div><div class='del'>-</div><div class='del'>-Second, you need to figure out what should happen for the x32 ABI version of</div><div class='del'>-the new system call.  There's a choice here: the layout of the arguments</div><div class='del'>-should either match the 64-bit version or the 32-bit version.</div><div class='del'>-</div><div class='del'>-If there's a pointer-to-a-pointer involved, the decision is easy: x32 is</div><div class='del'>-ILP32, so the layout should match the 32-bit version, and the entry in</div><div class='del'>-arch/x86/entry/syscalls/syscall_64.tbl is split so that x32 programs hit the</div><div class='del'>-compatibility wrapper:</div><div class='del'>-</div><div class='del'>-    333   64       xyzzy     sys_xyzzy</div><div class='del'>-    ...</div><div class='del'>-    555   x32      xyzzy     compat_sys_xyzzy</div><div class='del'>-</div><div class='del'>-If no pointers are involved, then it is preferable to re-use the 64-bit system</div><div class='del'>-call for the x32 ABI (and consequently the entry in</div><div class='del'>-arch/x86/entry/syscalls/syscall_64.tbl is unchanged).</div><div class='del'>-</div><div class='del'>-In either case, you should check that the types involved in your argument</div><div class='del'>-layout do indeed map exactly from x32 (-mx32) to either the 32-bit (-m32) or</div><div class='del'>-64-bit (-m64) equivalents.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-System Calls Returning Elsewhere</div><div class='del'>---------------------------------</div><div class='del'>-</div><div class='del'>-For most system calls, once the system call is complete the user program</div><div class='del'>-continues exactly where it left off -- at the next instruction, with the</div><div class='del'>-stack the same and most of the registers the same as before the system call,</div><div class='del'>-and with the same virtual memory space.</div><div class='del'>-</div><div class='del'>-However, a few system calls do things differently.  They might return to a</div><div class='del'>-different location (rt_sigreturn) or change the memory space (fork/vfork/clone)</div><div class='del'>-or even architecture (execve/execveat) of the program.</div><div class='del'>-</div><div class='del'>-To allow for this, the kernel implementation of the system call may need to</div><div class='del'>-save and restore additional registers to the kernel stack, allowing complete</div><div class='del'>-control of where and how execution continues after the system call.</div><div class='del'>-</div><div class='del'>-This is arch-specific, but typically involves defining assembly entry points</div><div class='del'>-that save/restore additional registers and invoke the real system call entry</div><div class='del'>-point.</div><div class='del'>-</div><div class='del'>-For x86_64, this is implemented as a stub_xyzzy entry point in</div><div class='del'>-arch/x86/entry/entry_64.S, and the entry in the syscall table</div><div class='del'>-(arch/x86/entry/syscalls/syscall_64.tbl) is adjusted to match:</div><div class='del'>-</div><div class='del'>-    333   common   xyzzy     stub_xyzzy</div><div class='del'>-</div><div class='del'>-The equivalent for 32-bit programs running on a 64-bit kernel is normally</div><div class='del'>-called stub32_xyzzy and implemented in arch/x86/entry/entry_64_compat.S,</div><div class='del'>-with the corresponding syscall table adjustment in</div><div class='del'>-arch/x86/entry/syscalls/syscall_32.tbl:</div><div class='del'>-</div><div class='del'>-    380   i386     xyzzy     sys_xyzzy    stub32_xyzzy</div><div class='del'>-</div><div class='del'>-If the system call needs a compatibility layer (as in the previous section)</div><div class='del'>-then the stub32_ version needs to call on to the compat_sys_ version of the</div><div class='del'>-system call rather than the native 64-bit version.  Also, if the x32 ABI</div><div class='del'>-implementation is not common with the x86_64 version, then its syscall</div><div class='del'>-table will also need to invoke a stub that calls on to the compat_sys_</div><div class='del'>-version.</div><div class='del'>-</div><div class='del'>-For completeness, it's also nice to set up a mapping so that user-mode Linux</div><div class='del'>-still works -- its syscall table will reference stub_xyzzy, but the UML build</div><div class='del'>-doesn't include arch/x86/entry/entry_64.S implementation (because UML</div><div class='del'>-simulates registers etc).  Fixing this is as simple as adding a #define to</div><div class='del'>-arch/x86/um/sys_call_table_64.c:</div><div class='del'>-</div><div class='del'>-    #define stub_xyzzy sys_xyzzy</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Other Details</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-Most of the kernel treats system calls in a generic way, but there is the</div><div class='del'>-occasional exception that may need updating for your particular system call.</div><div class='del'>-</div><div class='del'>-The audit subsystem is one such special case; it includes (arch-specific)</div><div class='del'>-functions that classify some special types of system call -- specifically</div><div class='del'>-file open (open/openat), program execution (execve/exeveat) or socket</div><div class='del'>-multiplexor (socketcall) operations. If your new system call is analogous to</div><div class='del'>-one of these, then the audit system should be updated.</div><div class='del'>-</div><div class='del'>-More generally, if there is an existing system call that is analogous to your</div><div class='del'>-new system call, it's worth doing a kernel-wide grep for the existing system</div><div class='del'>-call to check there are no other special cases.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Testing</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-A new system call should obviously be tested; it is also useful to provide</div><div class='del'>-reviewers with a demonstration of how user space programs will use the system</div><div class='del'>-call.  A good way to combine these aims is to include a simple self-test</div><div class='del'>-program in a new directory under tools/testing/selftests/.</div><div class='del'>-</div><div class='del'>-For a new system call, there will obviously be no libc wrapper function and so</div><div class='del'>-the test will need to invoke it using syscall(); also, if the system call</div><div class='del'>-involves a new userspace-visible structure, the corresponding header will need</div><div class='del'>-to be installed to compile the test.</div><div class='del'>-</div><div class='del'>-Make sure the selftest runs successfully on all supported architectures.  For</div><div class='del'>-example, check that it works when compiled as an x86_64 (-m64), x86_32 (-m32)</div><div class='del'>-and x32 (-mx32) ABI program.</div><div class='del'>-</div><div class='del'>-For more extensive and thorough testing of new functionality, you should also</div><div class='del'>-consider adding tests to the Linux Test Project, or to the xfstests project</div><div class='del'>-for filesystem-related changes.</div><div class='del'>- - https://linux-test-project.github.io/</div><div class='del'>- - git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Man Page</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-All new system calls should come with a complete man page, ideally using groff</div><div class='del'>-markup, but plain text will do.  If groff is used, it's helpful to include a</div><div class='del'>-pre-rendered ASCII version of the man page in the cover email for the</div><div class='del'>-patchset, for the convenience of reviewers.</div><div class='del'>-</div><div class='del'>-The man page should be cc'ed to linux-man@vger.kernel.org</div><div class='del'>-For more details, see https://www.kernel.org/doc/man-pages/patches.html</div><div class='del'>-</div><div class='del'>-References and Sources</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>- - LWN article from Michael Kerrisk on use of flags argument in system calls:</div><div class='del'>-   https://lwn.net/Articles/585415/</div><div class='del'>- - LWN article from Michael Kerrisk on how to handle unknown flags in a system</div><div class='del'>-   call: https://lwn.net/Articles/588444/</div><div class='del'>- - LWN article from Jake Edge describing constraints on 64-bit system call</div><div class='del'>-   arguments: https://lwn.net/Articles/311630/</div><div class='del'>- - Pair of LWN articles from David Drysdale that describe the system call</div><div class='del'>-   implementation paths in detail for v3.14:</div><div class='del'>-    - https://lwn.net/Articles/604287/</div><div class='del'>-    - https://lwn.net/Articles/604515/</div><div class='del'>- - Architecture-specific requirements for system calls are discussed in the</div><div class='del'>-   syscall(2) man-page:</div><div class='del'>-   http://man7.org/linux/man-pages/man2/syscall.2.html#NOTES</div><div class='del'>- - Collated emails from Linus Torvalds discussing the problems with ioctl():</div><div class='del'>-   http://yarchive.net/comp/linux/ioctl.html</div><div class='del'>- - "How to not invent kernel interfaces", Arnd Bergmann,</div><div class='del'>-   http://www.ukuug.org/events/linux2007/2007/papers/Bergmann.pdf</div><div class='del'>- - LWN article from Michael Kerrisk on avoiding new uses of CAP_SYS_ADMIN:</div><div class='del'>-   https://lwn.net/Articles/486306/</div><div class='del'>- - Recommendation from Andrew Morton that all related information for a new</div><div class='del'>-   system call should come in the same email thread:</div><div class='del'>-   https://lkml.org/lkml/2014/7/24/641</div><div class='del'>- - Recommendation from Michael Kerrisk that a new system call should come with</div><div class='del'>-   a man page: https://lkml.org/lkml/2014/6/13/309</div><div class='del'>- - Suggestion from Thomas Gleixner that x86 wire-up should be in a separate</div><div class='del'>-   commit: https://lkml.org/lkml/2014/11/19/254</div><div class='del'>- - Suggestion from Greg Kroah-Hartman that it's good for new system calls to</div><div class='del'>-   come with a man-page &amp; selftest: https://lkml.org/lkml/2014/3/19/710</div><div class='del'>- - Discussion from Michael Kerrisk of new system call vs. prctl(2) extension:</div><div class='del'>-   https://lkml.org/lkml/2014/6/3/411</div><div class='del'>- - Suggestion from Ingo Molnar that system calls that involve multiple</div><div class='del'>-   arguments should encapsulate those arguments in a struct, which includes a</div><div class='del'>-   size field for future extensibility: https://lkml.org/lkml/2015/7/30/117</div><div class='del'>- - Numbering oddities arising from (re-)use of O_* numbering space flags:</div><div class='del'>-    - commit 75069f2b5bfb ("vfs: renumber FMODE_NONOTIFY and add to uniqueness</div><div class='del'>-      check")</div><div class='del'>-    - commit 12ed2e36c98a ("fanotify: FMODE_NONOTIFY and __O_SYNC in sparc</div><div class='del'>-      conflict")</div><div class='del'>-    - commit bb458c644a59 ("Safer ABI for O_TMPFILE")</div><div class='del'>- - Discussion from Matthew Wilcox about restrictions on 64-bit arguments:</div><div class='del'>-   https://lkml.org/lkml/2008/12/12/187</div><div class='del'>- - Recommendation from Greg Kroah-Hartman that unknown flags should be</div><div class='del'>-   policed: https://lkml.org/lkml/2014/7/17/577</div><div class='del'>- - Recommendation from Linus Torvalds that x32 system calls should prefer</div><div class='del'>-   compatibility with 64-bit versions rather than 32-bit versions:</div><div class='del'>-   https://lkml.org/lkml/2011/8/31/244</div><div class='head'>diff --git a/Documentation/admin-guide/README.rst b/Documentation/admin-guide/README.rst<br/>new file mode 100644<br/>index 000000000000..697a00ccec25<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/README.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/README.rst</a></div><div class='hunk'>@@ -0,0 +1,411 @@</div><div class='add'>+Linux kernel release 4.x &lt;http://kernel.org/&gt;</div><div class='add'>+=============================================</div><div class='add'>+</div><div class='add'>+These are the release notes for Linux version 4.  Read them carefully,</div><div class='add'>+as they tell you what this is all about, explain how to install the</div><div class='add'>+kernel, and what to do if something goes wrong.</div><div class='add'>+</div><div class='add'>+What is Linux?</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+  Linux is a clone of the operating system Unix, written from scratch by</div><div class='add'>+  Linus Torvalds with assistance from a loosely-knit team of hackers across</div><div class='add'>+  the Net. It aims towards POSIX and Single UNIX Specification compliance.</div><div class='add'>+</div><div class='add'>+  It has all the features you would expect in a modern fully-fledged Unix,</div><div class='add'>+  including true multitasking, virtual memory, shared libraries, demand</div><div class='add'>+  loading, shared copy-on-write executables, proper memory management,</div><div class='add'>+  and multistack networking including IPv4 and IPv6.</div><div class='add'>+</div><div class='add'>+  It is distributed under the GNU General Public License v2 - see the</div><div class='add'>+  accompanying COPYING file for more details.</div><div class='add'>+</div><div class='add'>+On what hardware does it run?</div><div class='add'>+-----------------------------</div><div class='add'>+</div><div class='add'>+  Although originally developed first for 32-bit x86-based PCs (386 or higher),</div><div class='add'>+  today Linux also runs on (at least) the Compaq Alpha AXP, Sun SPARC and</div><div class='add'>+  UltraSPARC, Motorola 68000, PowerPC, PowerPC64, ARM, Hitachi SuperH, Cell,</div><div class='add'>+  IBM S/390, MIPS, HP PA-RISC, Intel IA-64, DEC VAX, AMD x86-64, AXIS CRIS,</div><div class='add'>+  Xtensa, Tilera TILE, AVR32, ARC and Renesas M32R architectures.</div><div class='add'>+</div><div class='add'>+  Linux is easily portable to most general-purpose 32- or 64-bit architectures</div><div class='add'>+  as long as they have a paged memory management unit (PMMU) and a port of the</div><div class='add'>+  GNU C compiler (gcc) (part of The GNU Compiler Collection, GCC). Linux has</div><div class='add'>+  also been ported to a number of architectures without a PMMU, although</div><div class='add'>+  functionality is then obviously somewhat limited.</div><div class='add'>+  Linux has also been ported to itself. You can now run the kernel as a</div><div class='add'>+  userspace application - this is called UserMode Linux (UML).</div><div class='add'>+</div><div class='add'>+Documentation</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+ - There is a lot of documentation available both in electronic form on</div><div class='add'>+   the Internet and in books, both Linux-specific and pertaining to</div><div class='add'>+   general UNIX questions.  I'd recommend looking into the documentation</div><div class='add'>+   subdirectories on any Linux FTP site for the LDP (Linux Documentation</div><div class='add'>+   Project) books.  This README is not meant to be documentation on the</div><div class='add'>+   system: there are much better sources available.</div><div class='add'>+</div><div class='add'>+ - There are various README files in the Documentation/ subdirectory:</div><div class='add'>+   these typically contain kernel-specific installation notes for some</div><div class='add'>+   drivers for example. See Documentation/00-INDEX for a list of what</div><div class='add'>+   is contained in each file.  Please read the</div><div class='add'>+   :ref:`Documentation/process/changes.rst &lt;changes&gt;` file, as it</div><div class='add'>+   contains information about the problems, which may result by upgrading</div><div class='add'>+   your kernel.</div><div class='add'>+</div><div class='add'>+ - The Documentation/DocBook/ subdirectory contains several guides for</div><div class='add'>+   kernel developers and users.  These guides can be rendered in a</div><div class='add'>+   number of formats:  PostScript (.ps), PDF, HTML, &amp; man-pages, among others.</div><div class='add'>+   After installation, ``make psdocs``, ``make pdfdocs``, ``make htmldocs``,</div><div class='add'>+   or ``make mandocs`` will render the documentation in the requested format.</div><div class='add'>+</div><div class='add'>+Installing the kernel source</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+ - If you install the full sources, put the kernel tarball in a</div><div class='add'>+   directory where you have permissions (e.g. your home directory) and</div><div class='add'>+   unpack it::</div><div class='add'>+</div><div class='add'>+     xz -cd linux-4.X.tar.xz | tar xvf -</div><div class='add'>+</div><div class='add'>+   Replace "X" with the version number of the latest kernel.</div><div class='add'>+</div><div class='add'>+   Do NOT use the /usr/src/linux area! This area has a (usually</div><div class='add'>+   incomplete) set of kernel headers that are used by the library header</div><div class='add'>+   files.  They should match the library, and not get messed up by</div><div class='add'>+   whatever the kernel-du-jour happens to be.</div><div class='add'>+</div><div class='add'>+ - You can also upgrade between 4.x releases by patching.  Patches are</div><div class='add'>+   distributed in the xz format.  To install by patching, get all the</div><div class='add'>+   newer patch files, enter the top level directory of the kernel source</div><div class='add'>+   (linux-4.X) and execute::</div><div class='add'>+</div><div class='add'>+     xz -cd ../patch-4.x.xz | patch -p1</div><div class='add'>+</div><div class='add'>+   Replace "x" for all versions bigger than the version "X" of your current</div><div class='add'>+   source tree, **in_order**, and you should be ok.  You may want to remove</div><div class='add'>+   the backup files (some-file-name~ or some-file-name.orig), and make sure</div><div class='add'>+   that there are no failed patches (some-file-name# or some-file-name.rej).</div><div class='add'>+   If there are, either you or I have made a mistake.</div><div class='add'>+</div><div class='add'>+   Unlike patches for the 4.x kernels, patches for the 4.x.y kernels</div><div class='add'>+   (also known as the -stable kernels) are not incremental but instead apply</div><div class='add'>+   directly to the base 4.x kernel.  For example, if your base kernel is 4.0</div><div class='add'>+   and you want to apply the 4.0.3 patch, you must not first apply the 4.0.1</div><div class='add'>+   and 4.0.2 patches. Similarly, if you are running kernel version 4.0.2 and</div><div class='add'>+   want to jump to 4.0.3, you must first reverse the 4.0.2 patch (that is,</div><div class='add'>+   patch -R) **before** applying the 4.0.3 patch. You can read more on this in</div><div class='add'>+   :ref:`Documentation/process/applying-patches.rst &lt;applying_patches&gt;`.</div><div class='add'>+</div><div class='add'>+   Alternatively, the script patch-kernel can be used to automate this</div><div class='add'>+   process.  It determines the current kernel version and applies any</div><div class='add'>+   patches found::</div><div class='add'>+</div><div class='add'>+     linux/scripts/patch-kernel linux</div><div class='add'>+</div><div class='add'>+   The first argument in the command above is the location of the</div><div class='add'>+   kernel source.  Patches are applied from the current directory, but</div><div class='add'>+   an alternative directory can be specified as the second argument.</div><div class='add'>+</div><div class='add'>+ - Make sure you have no stale .o files and dependencies lying around::</div><div class='add'>+</div><div class='add'>+     cd linux</div><div class='add'>+     make mrproper</div><div class='add'>+</div><div class='add'>+   You should now have the sources correctly installed.</div><div class='add'>+</div><div class='add'>+Software requirements</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+   Compiling and running the 4.x kernels requires up-to-date</div><div class='add'>+   versions of various software packages.  Consult</div><div class='add'>+   :ref:`Documentation/process/changes.rst &lt;changes&gt;` for the minimum version numbers</div><div class='add'>+   required and how to get updates for these packages.  Beware that using</div><div class='add'>+   excessively old versions of these packages can cause indirect</div><div class='add'>+   errors that are very difficult to track down, so don't assume that</div><div class='add'>+   you can just update packages when obvious problems arise during</div><div class='add'>+   build or operation.</div><div class='add'>+</div><div class='add'>+Build directory for the kernel</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+   When compiling the kernel, all output files will per default be</div><div class='add'>+   stored together with the kernel source code.</div><div class='add'>+   Using the option ``make O=output/dir`` allows you to specify an alternate</div><div class='add'>+   place for the output files (including .config).</div><div class='add'>+   Example::</div><div class='add'>+</div><div class='add'>+     kernel source code: /usr/src/linux-4.X</div><div class='add'>+     build directory:    /home/name/build/kernel</div><div class='add'>+</div><div class='add'>+   To configure and build the kernel, use::</div><div class='add'>+</div><div class='add'>+     cd /usr/src/linux-4.X</div><div class='add'>+     make O=/home/name/build/kernel menuconfig</div><div class='add'>+     make O=/home/name/build/kernel</div><div class='add'>+     sudo make O=/home/name/build/kernel modules_install install</div><div class='add'>+</div><div class='add'>+   Please note: If the ``O=output/dir`` option is used, then it must be</div><div class='add'>+   used for all invocations of make.</div><div class='add'>+</div><div class='add'>+Configuring the kernel</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+   Do not skip this step even if you are only upgrading one minor</div><div class='add'>+   version.  New configuration options are added in each release, and</div><div class='add'>+   odd problems will turn up if the configuration files are not set up</div><div class='add'>+   as expected.  If you want to carry your existing configuration to a</div><div class='add'>+   new version with minimal work, use ``make oldconfig``, which will</div><div class='add'>+   only ask you for the answers to new questions.</div><div class='add'>+</div><div class='add'>+ - Alternative configuration commands are::</div><div class='add'>+</div><div class='add'>+     "make config"      Plain text interface.</div><div class='add'>+</div><div class='add'>+     "make menuconfig"  Text based color menus, radiolists &amp; dialogs.</div><div class='add'>+</div><div class='add'>+     "make nconfig"     Enhanced text based color menus.</div><div class='add'>+</div><div class='add'>+     "make xconfig"     Qt based configuration tool.</div><div class='add'>+</div><div class='add'>+     "make gconfig"     GTK+ based configuration tool.</div><div class='add'>+</div><div class='add'>+     "make oldconfig"   Default all questions based on the contents of</div><div class='add'>+                        your existing ./.config file and asking about</div><div class='add'>+                        new config symbols.</div><div class='add'>+</div><div class='add'>+     "make silentoldconfig"</div><div class='add'>+                        Like above, but avoids cluttering the screen</div><div class='add'>+                        with questions already answered.</div><div class='add'>+                        Additionally updates the dependencies.</div><div class='add'>+</div><div class='add'>+     "make olddefconfig"</div><div class='add'>+                        Like above, but sets new symbols to their default</div><div class='add'>+                        values without prompting.</div><div class='add'>+</div><div class='add'>+     "make defconfig"   Create a ./.config file by using the default</div><div class='add'>+                        symbol values from either arch/$ARCH/defconfig</div><div class='add'>+                        or arch/$ARCH/configs/${PLATFORM}_defconfig,</div><div class='add'>+                        depending on the architecture.</div><div class='add'>+</div><div class='add'>+     "make ${PLATFORM}_defconfig"</div><div class='add'>+                        Create a ./.config file by using the default</div><div class='add'>+                        symbol values from</div><div class='add'>+                        arch/$ARCH/configs/${PLATFORM}_defconfig.</div><div class='add'>+                        Use "make help" to get a list of all available</div><div class='add'>+                        platforms of your architecture.</div><div class='add'>+</div><div class='add'>+     "make allyesconfig"</div><div class='add'>+                        Create a ./.config file by setting symbol</div><div class='add'>+                        values to 'y' as much as possible.</div><div class='add'>+</div><div class='add'>+     "make allmodconfig"</div><div class='add'>+                        Create a ./.config file by setting symbol</div><div class='add'>+                        values to 'm' as much as possible.</div><div class='add'>+</div><div class='add'>+     "make allnoconfig" Create a ./.config file by setting symbol</div><div class='add'>+                        values to 'n' as much as possible.</div><div class='add'>+</div><div class='add'>+     "make randconfig"  Create a ./.config file by setting symbol</div><div class='add'>+                        values to random values.</div><div class='add'>+</div><div class='add'>+     "make localmodconfig" Create a config based on current config and</div><div class='add'>+                           loaded modules (lsmod). Disables any module</div><div class='add'>+                           option that is not needed for the loaded modules.</div><div class='add'>+</div><div class='add'>+                           To create a localmodconfig for another machine,</div><div class='add'>+                           store the lsmod of that machine into a file</div><div class='add'>+                           and pass it in as a LSMOD parameter.</div><div class='add'>+</div><div class='add'>+                   target$ lsmod &gt; /tmp/mylsmod</div><div class='add'>+                   target$ scp /tmp/mylsmod host:/tmp</div><div class='add'>+</div><div class='add'>+                   host$ make LSMOD=/tmp/mylsmod localmodconfig</div><div class='add'>+</div><div class='add'>+                           The above also works when cross compiling.</div><div class='add'>+</div><div class='add'>+     "make localyesconfig" Similar to localmodconfig, except it will convert</div><div class='add'>+                           all module options to built in (=y) options.</div><div class='add'>+</div><div class='add'>+   You can find more information on using the Linux kernel config tools</div><div class='add'>+   in Documentation/kbuild/kconfig.txt.</div><div class='add'>+</div><div class='add'>+ - NOTES on ``make config``:</div><div class='add'>+</div><div class='add'>+    - Having unnecessary drivers will make the kernel bigger, and can</div><div class='add'>+      under some circumstances lead to problems: probing for a</div><div class='add'>+      nonexistent controller card may confuse your other controllers.</div><div class='add'>+</div><div class='add'>+    - A kernel with math-emulation compiled in will still use the</div><div class='add'>+      coprocessor if one is present: the math emulation will just</div><div class='add'>+      never get used in that case.  The kernel will be slightly larger,</div><div class='add'>+      but will work on different machines regardless of whether they</div><div class='add'>+      have a math coprocessor or not.</div><div class='add'>+</div><div class='add'>+    - The "kernel hacking" configuration details usually result in a</div><div class='add'>+      bigger or slower kernel (or both), and can even make the kernel</div><div class='add'>+      less stable by configuring some routines to actively try to</div><div class='add'>+      break bad code to find kernel problems (kmalloc()).  Thus you</div><div class='add'>+      should probably answer 'n' to the questions for "development",</div><div class='add'>+      "experimental", or "debugging" features.</div><div class='add'>+</div><div class='add'>+Compiling the kernel</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+ - Make sure you have at least gcc 3.2 available.</div><div class='add'>+   For more information, refer to :ref:`Documentation/process/changes.rst &lt;changes&gt;`.</div><div class='add'>+</div><div class='add'>+   Please note that you can still run a.out user programs with this kernel.</div><div class='add'>+</div><div class='add'>+ - Do a ``make`` to create a compressed kernel image. It is also</div><div class='add'>+   possible to do ``make install`` if you have lilo installed to suit the</div><div class='add'>+   kernel makefiles, but you may want to check your particular lilo setup first.</div><div class='add'>+</div><div class='add'>+   To do the actual install, you have to be root, but none of the normal</div><div class='add'>+   build should require that. Don't take the name of root in vain.</div><div class='add'>+</div><div class='add'>+ - If you configured any of the parts of the kernel as ``modules``, you</div><div class='add'>+   will also have to do ``make modules_install``.</div><div class='add'>+</div><div class='add'>+ - Verbose kernel compile/build output:</div><div class='add'>+</div><div class='add'>+   Normally, the kernel build system runs in a fairly quiet mode (but not</div><div class='add'>+   totally silent).  However, sometimes you or other kernel developers need</div><div class='add'>+   to see compile, link, or other commands exactly as they are executed.</div><div class='add'>+   For this, use "verbose" build mode.  This is done by passing</div><div class='add'>+   ``V=1`` to the ``make`` command, e.g.::</div><div class='add'>+</div><div class='add'>+     make V=1 all</div><div class='add'>+</div><div class='add'>+   To have the build system also tell the reason for the rebuild of each</div><div class='add'>+   target, use ``V=2``.  The default is ``V=0``.</div><div class='add'>+</div><div class='add'>+ - Keep a backup kernel handy in case something goes wrong.  This is</div><div class='add'>+   especially true for the development releases, since each new release</div><div class='add'>+   contains new code which has not been debugged.  Make sure you keep a</div><div class='add'>+   backup of the modules corresponding to that kernel, as well.  If you</div><div class='add'>+   are installing a new kernel with the same version number as your</div><div class='add'>+   working kernel, make a backup of your modules directory before you</div><div class='add'>+   do a ``make modules_install``.</div><div class='add'>+</div><div class='add'>+   Alternatively, before compiling, use the kernel config option</div><div class='add'>+   "LOCALVERSION" to append a unique suffix to the regular kernel version.</div><div class='add'>+   LOCALVERSION can be set in the "General Setup" menu.</div><div class='add'>+</div><div class='add'>+ - In order to boot your new kernel, you'll need to copy the kernel</div><div class='add'>+   image (e.g. .../linux/arch/x86/boot/bzImage after compilation)</div><div class='add'>+   to the place where your regular bootable kernel is found.</div><div class='add'>+</div><div class='add'>+ - Booting a kernel directly from a floppy without the assistance of a</div><div class='add'>+   bootloader such as LILO, is no longer supported.</div><div class='add'>+</div><div class='add'>+   If you boot Linux from the hard drive, chances are you use LILO, which</div><div class='add'>+   uses the kernel image as specified in the file /etc/lilo.conf.  The</div><div class='add'>+   kernel image file is usually /vmlinuz, /boot/vmlinuz, /bzImage or</div><div class='add'>+   /boot/bzImage.  To use the new kernel, save a copy of the old image</div><div class='add'>+   and copy the new image over the old one.  Then, you MUST RERUN LILO</div><div class='add'>+   to update the loading map! If you don't, you won't be able to boot</div><div class='add'>+   the new kernel image.</div><div class='add'>+</div><div class='add'>+   Reinstalling LILO is usually a matter of running /sbin/lilo.</div><div class='add'>+   You may wish to edit /etc/lilo.conf to specify an entry for your</div><div class='add'>+   old kernel image (say, /vmlinux.old) in case the new one does not</div><div class='add'>+   work.  See the LILO docs for more information.</div><div class='add'>+</div><div class='add'>+   After reinstalling LILO, you should be all set.  Shutdown the system,</div><div class='add'>+   reboot, and enjoy!</div><div class='add'>+</div><div class='add'>+   If you ever need to change the default root device, video mode,</div><div class='add'>+   ramdisk size, etc.  in the kernel image, use the ``rdev`` program (or</div><div class='add'>+   alternatively the LILO boot options when appropriate).  No need to</div><div class='add'>+   recompile the kernel to change these parameters.</div><div class='add'>+</div><div class='add'>+ - Reboot with the new kernel and enjoy.</div><div class='add'>+</div><div class='add'>+If something goes wrong</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+ - If you have problems that seem to be due to kernel bugs, please check</div><div class='add'>+   the file MAINTAINERS to see if there is a particular person associated</div><div class='add'>+   with the part of the kernel that you are having trouble with. If there</div><div class='add'>+   isn't anyone listed there, then the second best thing is to mail</div><div class='add'>+   them to me (torvalds@linux-foundation.org), and possibly to any other</div><div class='add'>+   relevant mailing-list or to the newsgroup.</div><div class='add'>+</div><div class='add'>+ - In all bug-reports, *please* tell what kernel you are talking about,</div><div class='add'>+   how to duplicate the problem, and what your setup is (use your common</div><div class='add'>+   sense).  If the problem is new, tell me so, and if the problem is</div><div class='add'>+   old, please try to tell me when you first noticed it.</div><div class='add'>+</div><div class='add'>+ - If the bug results in a message like::</div><div class='add'>+</div><div class='add'>+     unable to handle kernel paging request at address C0000010</div><div class='add'>+     Oops: 0002</div><div class='add'>+     EIP:   0010:XXXXXXXX</div><div class='add'>+     eax: xxxxxxxx   ebx: xxxxxxxx   ecx: xxxxxxxx   edx: xxxxxxxx</div><div class='add'>+     esi: xxxxxxxx   edi: xxxxxxxx   ebp: xxxxxxxx</div><div class='add'>+     ds: xxxx  es: xxxx  fs: xxxx  gs: xxxx</div><div class='add'>+     Pid: xx, process nr: xx</div><div class='add'>+     xx xx xx xx xx xx xx xx xx xx</div><div class='add'>+</div><div class='add'>+   or similar kernel debugging information on your screen or in your</div><div class='add'>+   system log, please duplicate it *exactly*.  The dump may look</div><div class='add'>+   incomprehensible to you, but it does contain information that may</div><div class='add'>+   help debugging the problem.  The text above the dump is also</div><div class='add'>+   important: it tells something about why the kernel dumped code (in</div><div class='add'>+   the above example, it's due to a bad kernel pointer). More information</div><div class='add'>+   on making sense of the dump is in Documentation/admin-guide/oops-tracing.rst</div><div class='add'>+</div><div class='add'>+ - If you compiled the kernel with CONFIG_KALLSYMS you can send the dump</div><div class='add'>+   as is, otherwise you will have to use the ``ksymoops`` program to make</div><div class='add'>+   sense of the dump (but compiling with CONFIG_KALLSYMS is usually preferred).</div><div class='add'>+   This utility can be downloaded from</div><div class='add'>+   ftp://ftp.&lt;country&gt;.kernel.org/pub/linux/utils/kernel/ksymoops/ .</div><div class='add'>+   Alternatively, you can do the dump lookup by hand:</div><div class='add'>+</div><div class='add'>+ - In debugging dumps like the above, it helps enormously if you can</div><div class='add'>+   look up what the EIP value means.  The hex value as such doesn't help</div><div class='add'>+   me or anybody else very much: it will depend on your particular</div><div class='add'>+   kernel setup.  What you should do is take the hex value from the EIP</div><div class='add'>+   line (ignore the ``0010:``), and look it up in the kernel namelist to</div><div class='add'>+   see which kernel function contains the offending address.</div><div class='add'>+</div><div class='add'>+   To find out the kernel function name, you'll need to find the system</div><div class='add'>+   binary associated with the kernel that exhibited the symptom.  This is</div><div class='add'>+   the file 'linux/vmlinux'.  To extract the namelist and match it against</div><div class='add'>+   the EIP from the kernel crash, do::</div><div class='add'>+</div><div class='add'>+     nm vmlinux | sort | less</div><div class='add'>+</div><div class='add'>+   This will give you a list of kernel addresses sorted in ascending</div><div class='add'>+   order, from which it is simple to find the function that contains the</div><div class='add'>+   offending address.  Note that the address given by the kernel</div><div class='add'>+   debugging messages will not necessarily match exactly with the</div><div class='add'>+   function addresses (in fact, that is very unlikely), so you can't</div><div class='add'>+   just 'grep' the list: the list will, however, give you the starting</div><div class='add'>+   point of each kernel function, so by looking for the function that</div><div class='add'>+   has a starting address lower than the one you are searching for but</div><div class='add'>+   is followed by a function with a higher address you will find the one</div><div class='add'>+   you want.  In fact, it may be a good idea to include a bit of</div><div class='add'>+   "context" in your problem report, giving a few lines around the</div><div class='add'>+   interesting one.</div><div class='add'>+</div><div class='add'>+   If you for some reason cannot do the above (you have a pre-compiled</div><div class='add'>+   kernel image or similar), telling me as much about your setup as</div><div class='add'>+   possible will help.  Please read the :ref:`admin-guide/reporting-bugs.rst &lt;reportingbugs&gt;`</div><div class='add'>+   document for details.</div><div class='add'>+</div><div class='add'>+ - Alternatively, you can use gdb on a running kernel. (read-only; i.e. you</div><div class='add'>+   cannot change values or set break points.) To do this, first compile the</div><div class='add'>+   kernel with -g; edit arch/x86/Makefile appropriately, then do a ``make</div><div class='add'>+   clean``. You'll also need to enable CONFIG_PROC_FS (via ``make config``).</div><div class='add'>+</div><div class='add'>+   After you've rebooted with the new kernel, do ``gdb vmlinux /proc/kcore``.</div><div class='add'>+   You can now use all the usual gdb commands. The command to look up the</div><div class='add'>+   point where your system crashed is ``l *0xXXXXXXXX``. (Replace the XXXes</div><div class='add'>+   with the EIP value.)</div><div class='add'>+</div><div class='add'>+   gdb'ing a non-running kernel currently fails because ``gdb`` (wrongly)</div><div class='add'>+   disregards the starting offset for which the kernel is compiled.</div><div class='head'>diff --git a/Documentation/admin-guide/binfmt-misc.rst b/Documentation/admin-guide/binfmt-misc.rst<br/>new file mode 100644<br/>index 000000000000..97b0d7927078<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/binfmt-misc.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/binfmt-misc.rst</a></div><div class='hunk'>@@ -0,0 +1,151 @@</div><div class='add'>+Kernel Support for miscellaneous (your favourite) Binary Formats v1.1</div><div class='add'>+=====================================================================</div><div class='add'>+</div><div class='add'>+This Kernel feature allows you to invoke almost (for restrictions see below)</div><div class='add'>+every program by simply typing its name in the shell.</div><div class='add'>+This includes for example compiled Java(TM), Python or Emacs programs.</div><div class='add'>+</div><div class='add'>+To achieve this you must tell binfmt_misc which interpreter has to be invoked</div><div class='add'>+with which binary. Binfmt_misc recognises the binary-type by matching some bytes</div><div class='add'>+at the beginning of the file with a magic byte sequence (masking out specified</div><div class='add'>+bits) you have supplied. Binfmt_misc can also recognise a filename extension</div><div class='add'>+aka ``.com`` or ``.exe``.</div><div class='add'>+</div><div class='add'>+First you must mount binfmt_misc::</div><div class='add'>+</div><div class='add'>+	mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc</div><div class='add'>+</div><div class='add'>+To actually register a new binary type, you have to set up a string looking like</div><div class='add'>+``:name:type:offset:magic:mask:interpreter:flags`` (where you can choose the</div><div class='add'>+``:`` upon your needs) and echo it to ``/proc/sys/fs/binfmt_misc/register``.</div><div class='add'>+</div><div class='add'>+Here is what the fields mean:</div><div class='add'>+</div><div class='add'>+- ``name``</div><div class='add'>+   is an identifier string. A new /proc file will be created with this</div><div class='add'>+   ``name below /proc/sys/fs/binfmt_misc``; cannot contain slashes ``/`` for</div><div class='add'>+   obvious reasons.</div><div class='add'>+- ``type``</div><div class='add'>+   is the type of recognition. Give ``M`` for magic and ``E`` for extension.</div><div class='add'>+- ``offset``</div><div class='add'>+   is the offset of the magic/mask in the file, counted in bytes. This</div><div class='add'>+   defaults to 0 if you omit it (i.e. you write ``:name:type::magic...``).</div><div class='add'>+   Ignored when using filename extension matching.</div><div class='add'>+- ``magic``</div><div class='add'>+   is the byte sequence binfmt_misc is matching for. The magic string</div><div class='add'>+   may contain hex-encoded characters like ``\x0a`` or ``\xA4``. Note that you</div><div class='add'>+   must escape any NUL bytes; parsing halts at the first one. In a shell</div><div class='add'>+   environment you might have to write ``\\x0a`` to prevent the shell from</div><div class='add'>+   eating your ``\``.</div><div class='add'>+   If you chose filename extension matching, this is the extension to be</div><div class='add'>+   recognised (without the ``.``, the ``\x0a`` specials are not allowed).</div><div class='add'>+   Extension    matching is case sensitive, and slashes ``/`` are not allowed!</div><div class='add'>+- ``mask``</div><div class='add'>+   is an (optional, defaults to all 0xff) mask. You can mask out some</div><div class='add'>+   bits from matching by supplying a string like magic and as long as magic.</div><div class='add'>+   The mask is anded with the byte sequence of the file. Note that you must</div><div class='add'>+   escape any NUL bytes; parsing halts at the first one. Ignored when using</div><div class='add'>+   filename extension matching.</div><div class='add'>+- ``interpreter``</div><div class='add'>+   is the program that should be invoked with the binary as first</div><div class='add'>+   argument (specify the full path)</div><div class='add'>+- ``flags``</div><div class='add'>+   is an optional field that controls several aspects of the invocation</div><div class='add'>+   of the interpreter. It is a string of capital letters, each controls a</div><div class='add'>+   certain aspect. The following flags are supported:</div><div class='add'>+</div><div class='add'>+      ``P`` - preserve-argv[0]</div><div class='add'>+            Legacy behavior of binfmt_misc is to overwrite</div><div class='add'>+            the original argv[0] with the full path to the binary. When this</div><div class='add'>+            flag is included, binfmt_misc will add an argument to the argument</div><div class='add'>+            vector for this purpose, thus preserving the original ``argv[0]``.</div><div class='add'>+            e.g. If your interp is set to ``/bin/foo`` and you run ``blah``</div><div class='add'>+            (which is in ``/usr/local/bin``), then the kernel will execute</div><div class='add'>+            ``/bin/foo`` with ``argv[]`` set to ``["/bin/foo", "/usr/local/bin/blah", "blah"]``.  The interp has to be aware of this so it can</div><div class='add'>+            execute ``/usr/local/bin/blah``</div><div class='add'>+            with ``argv[]`` set to ``["blah"]``.</div><div class='add'>+      ``O`` - open-binary</div><div class='add'>+	    Legacy behavior of binfmt_misc is to pass the full path</div><div class='add'>+            of the binary to the interpreter as an argument. When this flag is</div><div class='add'>+            included, binfmt_misc will open the file for reading and pass its</div><div class='add'>+            descriptor as an argument, instead of the full path, thus allowing</div><div class='add'>+            the interpreter to execute non-readable binaries. This feature</div><div class='add'>+            should be used with care - the interpreter has to be trusted not to</div><div class='add'>+            emit the contents of the non-readable binary.</div><div class='add'>+      ``C`` - credentials</div><div class='add'>+            Currently, the behavior of binfmt_misc is to calculate</div><div class='add'>+            the credentials and security token of the new process according to</div><div class='add'>+            the interpreter. When this flag is included, these attributes are</div><div class='add'>+            calculated according to the binary. It also implies the ``O`` flag.</div><div class='add'>+            This feature should be used with care as the interpreter</div><div class='add'>+            will run with root permissions when a setuid binary owned by root</div><div class='add'>+            is run with binfmt_misc.</div><div class='add'>+      ``F`` - fix binary</div><div class='add'>+            The usual behaviour of binfmt_misc is to spawn the</div><div class='add'>+	    binary lazily when the misc format file is invoked.  However,</div><div class='add'>+	    this doesn``t work very well in the face of mount namespaces and</div><div class='add'>+	    changeroots, so the ``F`` mode opens the binary as soon as the</div><div class='add'>+	    emulation is installed and uses the opened image to spawn the</div><div class='add'>+	    emulator, meaning it is always available once installed,</div><div class='add'>+	    regardless of how the environment changes.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+There are some restrictions:</div><div class='add'>+</div><div class='add'>+ - the whole register string may not exceed 1920 characters</div><div class='add'>+ - the magic must reside in the first 128 bytes of the file, i.e.</div><div class='add'>+   offset+size(magic) has to be less than 128</div><div class='add'>+ - the interpreter string may not exceed 127 characters</div><div class='add'>+</div><div class='add'>+To use binfmt_misc you have to mount it first. You can mount it with</div><div class='add'>+``mount -t binfmt_misc none /proc/sys/fs/binfmt_misc`` command, or you can add</div><div class='add'>+a line ``none  /proc/sys/fs/binfmt_misc binfmt_misc defaults 0 0`` to your</div><div class='add'>+``/etc/fstab`` so it auto mounts on boot.</div><div class='add'>+</div><div class='add'>+You may want to add the binary formats in one of your ``/etc/rc`` scripts during</div><div class='add'>+boot-up. Read the manual of your init program to figure out how to do this</div><div class='add'>+right.</div><div class='add'>+</div><div class='add'>+Think about the order of adding entries! Later added entries are matched first!</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+A few examples (assumed you are in ``/proc/sys/fs/binfmt_misc``):</div><div class='add'>+</div><div class='add'>+- enable support for em86 (like binfmt_em86, for Alpha AXP only)::</div><div class='add'>+</div><div class='add'>+    echo ':i386:M::\x7fELF\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/bin/em86:' &gt; register</div><div class='add'>+    echo ':i486:M::\x7fELF\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/bin/em86:' &gt; register</div><div class='add'>+</div><div class='add'>+- enable support for packed DOS applications (pre-configured dosemu hdimages)::</div><div class='add'>+</div><div class='add'>+    echo ':DEXE:M::\x0eDEX::/usr/bin/dosexec:' &gt; register</div><div class='add'>+</div><div class='add'>+- enable support for Windows executables using wine::</div><div class='add'>+</div><div class='add'>+    echo ':DOSWin:M::MZ::/usr/local/bin/wine:' &gt; register</div><div class='add'>+</div><div class='add'>+For java support see Documentation/admin-guide/java.rst</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+You can enable/disable binfmt_misc or one binary type by echoing 0 (to disable)</div><div class='add'>+or 1 (to enable) to ``/proc/sys/fs/binfmt_misc/status`` or</div><div class='add'>+``/proc/.../the_name``.</div><div class='add'>+Catting the file tells you the current status of ``binfmt_misc/the_entry``.</div><div class='add'>+</div><div class='add'>+You can remove one entry or all entries by echoing -1 to ``/proc/.../the_name``</div><div class='add'>+or ``/proc/sys/fs/binfmt_misc/status``.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Hints</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+If you want to pass special arguments to your interpreter, you can</div><div class='add'>+write a wrapper script for it. See Documentation/admin-guide/java.rst for an</div><div class='add'>+example.</div><div class='add'>+</div><div class='add'>+Your interpreter should NOT look in the PATH for the filename; the kernel</div><div class='add'>+passes it the full filename (or the file descriptor) to use.  Using ``$PATH`` can</div><div class='add'>+cause unexpected behaviour and can be a security hazard.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Richard Günther &lt;rguenth@tat.physik.uni-tuebingen.de&gt;</div><div class='head'>diff --git a/Documentation/admin-guide/braille-console.rst b/Documentation/admin-guide/braille-console.rst<br/>new file mode 100644<br/>index 000000000000..18e79337dcfd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/braille-console.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/braille-console.rst</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+Linux Braille Console</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+To get early boot messages on a braille device (before userspace screen</div><div class='add'>+readers can start), you first need to compile the support for the usual serial</div><div class='add'>+console (see :ref:`Documentation/admin-guide/serial-console.rst &lt;serial_console&gt;`), and</div><div class='add'>+for braille device</div><div class='add'>+(in :menuselection:`Device Drivers --&gt; Accessibility support --&gt; Console on braille device`).</div><div class='add'>+</div><div class='add'>+Then you need to specify a ``console=brl``, option on the kernel command line, the</div><div class='add'>+format is::</div><div class='add'>+</div><div class='add'>+	console=brl,serial_options...</div><div class='add'>+</div><div class='add'>+where ``serial_options...`` are the same as described in</div><div class='add'>+:ref:`Documentation/admin-guide/serial-console.rst &lt;serial_console&gt;`.</div><div class='add'>+</div><div class='add'>+So for instance you can use ``console=brl,ttyS0`` if the braille device is connected to the first serial port, and ``console=brl,ttyS0,115200`` to</div><div class='add'>+override the baud rate to 115200, etc.</div><div class='add'>+</div><div class='add'>+By default, the braille device will just show the last kernel message (console</div><div class='add'>+mode).  To review previous messages, press the Insert key to switch to the VT</div><div class='add'>+review mode.  In review mode, the arrow keys permit to browse in the VT content,</div><div class='add'>+:kbd:`PAGE-UP`/:kbd:`PAGE-DOWN` keys go at the top/bottom of the screen, and</div><div class='add'>+the :kbd:`HOME` key goes back</div><div class='add'>+to the cursor, hence providing very basic screen reviewing facility.</div><div class='add'>+</div><div class='add'>+Sound feedback can be obtained by adding the ``braille_console.sound=1`` kernel</div><div class='add'>+parameter.</div><div class='add'>+</div><div class='add'>+For simplicity, only one braille console can be enabled, other uses of</div><div class='add'>+``console=brl,...`` will be discarded.  Also note that it does not interfere with</div><div class='add'>+the console selection mechanism described in</div><div class='add'>+:ref:`Documentation/admin-guide/serial-console.rst &lt;serial_console&gt;`.</div><div class='add'>+</div><div class='add'>+For now, only the VisioBraille device is supported.</div><div class='add'>+</div><div class='add'>+Samuel Thibault &lt;samuel.thibault@ens-lyon.org&gt;</div><div class='head'>diff --git a/Documentation/admin-guide/bug-bisect.rst b/Documentation/admin-guide/bug-bisect.rst<br/>new file mode 100644<br/>index 000000000000..59567da344e8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/bug-bisect.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/bug-bisect.rst</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+Bisecting a bug</div><div class='add'>++++++++++++++++</div><div class='add'>+</div><div class='add'>+Last updated: 28 October 2016</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+Always try the latest kernel from kernel.org and build from source. If you are</div><div class='add'>+not confident in doing that please report the bug to your distribution vendor</div><div class='add'>+instead of to a kernel developer.</div><div class='add'>+</div><div class='add'>+Finding bugs is not always easy. Have a go though. If you can't find it don't</div><div class='add'>+give up. Report as much as you have found to the relevant maintainer. See</div><div class='add'>+MAINTAINERS for who that is for the subsystem you have worked on.</div><div class='add'>+</div><div class='add'>+Before you submit a bug report read</div><div class='add'>+:ref:`Documentation/admin-guide/reporting-bugs.rst &lt;reportingbugs&gt;`.</div><div class='add'>+</div><div class='add'>+Devices not appearing</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+Often this is caused by udev/systemd. Check that first before blaming it</div><div class='add'>+on the kernel.</div><div class='add'>+</div><div class='add'>+Finding patch that caused a bug</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+Using the provided tools with ``git`` makes finding bugs easy provided the bug</div><div class='add'>+is reproducible.</div><div class='add'>+</div><div class='add'>+Steps to do it:</div><div class='add'>+</div><div class='add'>+- build the Kernel from its git source</div><div class='add'>+- start bisect with [#f1]_::</div><div class='add'>+</div><div class='add'>+	$ git bisect start</div><div class='add'>+</div><div class='add'>+- mark the broken changeset with::</div><div class='add'>+</div><div class='add'>+	$ git bisect bad [commit]</div><div class='add'>+</div><div class='add'>+- mark a changeset where the code is known to work with::</div><div class='add'>+</div><div class='add'>+	$ git bisect good [commit]</div><div class='add'>+</div><div class='add'>+- rebuild the Kernel and test</div><div class='add'>+- interact with git bisect by using either::</div><div class='add'>+</div><div class='add'>+	$ git bisect good</div><div class='add'>+</div><div class='add'>+  or::</div><div class='add'>+</div><div class='add'>+	$ git bisect bad</div><div class='add'>+</div><div class='add'>+  depending if the bug happened on the changeset you're testing</div><div class='add'>+- After some interactions, git bisect will give you the changeset that</div><div class='add'>+  likely caused the bug.</div><div class='add'>+</div><div class='add'>+- For example, if you know that the current version is bad, and version</div><div class='add'>+  4.8 is good, you could do::</div><div class='add'>+</div><div class='add'>+           $ git bisect start</div><div class='add'>+           $ git bisect bad                 # Current version is bad</div><div class='add'>+           $ git bisect good v4.8</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. [#f1] You can, optionally, provide both good and bad arguments at git</div><div class='add'>+	 start with ``git bisect start [BAD] [GOOD]``</div><div class='add'>+</div><div class='add'>+For further references, please read:</div><div class='add'>+</div><div class='add'>+- The man page for ``git-bisect``</div><div class='add'>+- `Fighting regressions with git bisect &lt;https://www.kernel.org/pub/software/scm/git/docs/git-bisect-lk2009.html&gt;`_</div><div class='add'>+- `Fully automated bisecting with "git bisect run" &lt;https://lwn.net/Articles/317154&gt;`_</div><div class='add'>+- `Using Git bisect to figure out when brokenness was introduced &lt;http://webchick.net/node/99&gt;`_</div><div class='head'>diff --git a/Documentation/admin-guide/bug-hunting.rst b/Documentation/admin-guide/bug-hunting.rst<br/>new file mode 100644<br/>index 000000000000..08c4b1308189<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/bug-hunting.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/bug-hunting.rst</a></div><div class='hunk'>@@ -0,0 +1,369 @@</div><div class='add'>+Bug hunting</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+Kernel bug reports often come with a stack dump like the one below::</div><div class='add'>+</div><div class='add'>+	------------[ cut here ]------------</div><div class='add'>+	WARNING: CPU: 1 PID: 28102 at kernel/module.c:1108 module_put+0x57/0x70</div><div class='add'>+	Modules linked in: dvb_usb_gp8psk(-) dvb_usb dvb_core nvidia_drm(PO) nvidia_modeset(PO) snd_hda_codec_hdmi snd_hda_intel snd_hda_codec snd_hwdep snd_hda_core snd_pcm snd_timer snd soundcore nvidia(PO) [last unloaded: rc_core]</div><div class='add'>+	CPU: 1 PID: 28102 Comm: rmmod Tainted: P        WC O 4.8.4-build.1 #1</div><div class='add'>+	Hardware name: MSI MS-7309/MS-7309, BIOS V1.12 02/23/2009</div><div class='add'>+	 00000000 c12ba080 00000000 00000000 c103ed6a c1616014 00000001 00006dc6</div><div class='add'>+	 c1615862 00000454 c109e8a7 c109e8a7 00000009 ffffffff 00000000 f13f6a10</div><div class='add'>+	 f5f5a600 c103ee33 00000009 00000000 00000000 c109e8a7 f80ca4d0 c109f617</div><div class='add'>+	Call Trace:</div><div class='add'>+	 [&lt;c12ba080&gt;] ? dump_stack+0x44/0x64</div><div class='add'>+	 [&lt;c103ed6a&gt;] ? __warn+0xfa/0x120</div><div class='add'>+	 [&lt;c109e8a7&gt;] ? module_put+0x57/0x70</div><div class='add'>+	 [&lt;c109e8a7&gt;] ? module_put+0x57/0x70</div><div class='add'>+	 [&lt;c103ee33&gt;] ? warn_slowpath_null+0x23/0x30</div><div class='add'>+	 [&lt;c109e8a7&gt;] ? module_put+0x57/0x70</div><div class='add'>+	 [&lt;f80ca4d0&gt;] ? gp8psk_fe_set_frontend+0x460/0x460 [dvb_usb_gp8psk]</div><div class='add'>+	 [&lt;c109f617&gt;] ? symbol_put_addr+0x27/0x50</div><div class='add'>+	 [&lt;f80bc9ca&gt;] ? dvb_usb_adapter_frontend_exit+0x3a/0x70 [dvb_usb]</div><div class='add'>+	 [&lt;f80bb3bf&gt;] ? dvb_usb_exit+0x2f/0xd0 [dvb_usb]</div><div class='add'>+	 [&lt;c13d03bc&gt;] ? usb_disable_endpoint+0x7c/0xb0</div><div class='add'>+	 [&lt;f80bb48a&gt;] ? dvb_usb_device_exit+0x2a/0x50 [dvb_usb]</div><div class='add'>+	 [&lt;c13d2882&gt;] ? usb_unbind_interface+0x62/0x250</div><div class='add'>+	 [&lt;c136b514&gt;] ? __pm_runtime_idle+0x44/0x70</div><div class='add'>+	 [&lt;c13620d8&gt;] ? __device_release_driver+0x78/0x120</div><div class='add'>+	 [&lt;c1362907&gt;] ? driver_detach+0x87/0x90</div><div class='add'>+	 [&lt;c1361c48&gt;] ? bus_remove_driver+0x38/0x90</div><div class='add'>+	 [&lt;c13d1c18&gt;] ? usb_deregister+0x58/0xb0</div><div class='add'>+	 [&lt;c109fbb0&gt;] ? SyS_delete_module+0x130/0x1f0</div><div class='add'>+	 [&lt;c1055654&gt;] ? task_work_run+0x64/0x80</div><div class='add'>+	 [&lt;c1000fa5&gt;] ? exit_to_usermode_loop+0x85/0x90</div><div class='add'>+	 [&lt;c10013f0&gt;] ? do_fast_syscall_32+0x80/0x130</div><div class='add'>+	 [&lt;c1549f43&gt;] ? sysenter_past_esp+0x40/0x6a</div><div class='add'>+	---[ end trace 6ebc60ef3981792f ]---</div><div class='add'>+</div><div class='add'>+Such stack traces provide enough information to identify the line inside the</div><div class='add'>+Kernel's source code where the bug happened. Depending on the severity of</div><div class='add'>+the issue, it may also contain the word **Oops**, as on this one::</div><div class='add'>+</div><div class='add'>+	BUG: unable to handle kernel NULL pointer dereference at   (null)</div><div class='add'>+	IP: [&lt;c06969d4&gt;] iret_exc+0x7d0/0xa59</div><div class='add'>+	*pdpt = 000000002258a001 *pde = 0000000000000000</div><div class='add'>+	Oops: 0002 [#1] PREEMPT SMP</div><div class='add'>+	...</div><div class='add'>+</div><div class='add'>+Despite being an **Oops** or some other sort of stack trace, the offended</div><div class='add'>+line is usually required to identify and handle the bug. Along this chapter,</div><div class='add'>+we'll refer to "Oops" for all kinds of stack traces that need to be analized.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+  ``ksymoops`` is useless on 2.6 or upper.  Please use the Oops in its original</div><div class='add'>+  format (from ``dmesg``, etc).  Ignore any references in this or other docs to</div><div class='add'>+  "decoding the Oops" or "running it through ksymoops".</div><div class='add'>+  If you post an Oops from 2.6+ that has been run through ``ksymoops``,</div><div class='add'>+  people will just tell you to repost it.</div><div class='add'>+</div><div class='add'>+Where is the Oops message is located?</div><div class='add'>+-------------------------------------</div><div class='add'>+</div><div class='add'>+Normally the Oops text is read from the kernel buffers by klogd and</div><div class='add'>+handed to ``syslogd`` which writes it to a syslog file, typically</div><div class='add'>+``/var/log/messages`` (depends on ``/etc/syslog.conf``). On systems with</div><div class='add'>+systemd, it may also be stored by the ``journald`` daemon, and accessed</div><div class='add'>+by running ``journalctl`` command.</div><div class='add'>+</div><div class='add'>+Sometimes ``klogd`` dies, in which case you can run ``dmesg &gt; file`` to</div><div class='add'>+read the data from the kernel buffers and save it.  Or you can</div><div class='add'>+``cat /proc/kmsg &gt; file``, however you have to break in to stop the transfer,</div><div class='add'>+``kmsg`` is a "never ending file".</div><div class='add'>+</div><div class='add'>+If the machine has crashed so badly that you cannot enter commands or</div><div class='add'>+the disk is not available then you have three options:</div><div class='add'>+</div><div class='add'>+(1) Hand copy the text from the screen and type it in after the machine</div><div class='add'>+    has restarted.  Messy but it is the only option if you have not</div><div class='add'>+    planned for a crash. Alternatively, you can take a picture of</div><div class='add'>+    the screen with a digital camera - not nice, but better than</div><div class='add'>+    nothing.  If the messages scroll off the top of the console, you</div><div class='add'>+    may find that booting with a higher resolution (eg, ``vga=791``)</div><div class='add'>+    will allow you to read more of the text. (Caveat: This needs ``vesafb``,</div><div class='add'>+    so won't help for 'early' oopses)</div><div class='add'>+</div><div class='add'>+(2) Boot with a serial console (see</div><div class='add'>+    :ref:`Documentation/admin-guide/serial-console.rst &lt;serial_console&gt;`),</div><div class='add'>+    run a null modem to a second machine and capture the output there</div><div class='add'>+    using your favourite communication program.  Minicom works well.</div><div class='add'>+</div><div class='add'>+(3) Use Kdump (see Documentation/kdump/kdump.txt),</div><div class='add'>+    extract the kernel ring buffer from old memory with using dmesg</div><div class='add'>+    gdbmacro in Documentation/kdump/gdbmacros.txt.</div><div class='add'>+</div><div class='add'>+Finding the bug's location</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+Reporting a bug works best if you point the location of the bug at the</div><div class='add'>+Kernel source file. There are two methods for doing that. Usually, using</div><div class='add'>+``gdb`` is easier, but the Kernel should be pre-compiled with debug info.</div><div class='add'>+</div><div class='add'>+gdb</div><div class='add'>+^^^</div><div class='add'>+</div><div class='add'>+The GNU debug (``gdb``) is the best way to figure out the exact file and line</div><div class='add'>+number of the OOPS from the ``vmlinux`` file.</div><div class='add'>+</div><div class='add'>+The usage of gdb works best on a kernel compiled with ``CONFIG_DEBUG_INFO``.</div><div class='add'>+This can be set by running::</div><div class='add'>+</div><div class='add'>+  $ ./scripts/config -d COMPILE_TEST -e DEBUG_KERNEL -e DEBUG_INFO</div><div class='add'>+</div><div class='add'>+On a kernel compiled with ``CONFIG_DEBUG_INFO``, you can simply copy the</div><div class='add'>+EIP value from the OOPS::</div><div class='add'>+</div><div class='add'>+ EIP:    0060:[&lt;c021e50e&gt;]    Not tainted VLI</div><div class='add'>+</div><div class='add'>+And use GDB to translate that to human-readable form::</div><div class='add'>+</div><div class='add'>+  $ gdb vmlinux</div><div class='add'>+  (gdb) l *0xc021e50e</div><div class='add'>+</div><div class='add'>+If you don't have ``CONFIG_DEBUG_INFO`` enabled, you use the function</div><div class='add'>+offset from the OOPS::</div><div class='add'>+</div><div class='add'>+ EIP is at vt_ioctl+0xda8/0x1482</div><div class='add'>+</div><div class='add'>+And recompile the kernel with ``CONFIG_DEBUG_INFO`` enabled::</div><div class='add'>+</div><div class='add'>+  $ ./scripts/config -d COMPILE_TEST -e DEBUG_KERNEL -e DEBUG_INFO</div><div class='add'>+  $ make vmlinux</div><div class='add'>+  $ gdb vmlinux</div><div class='add'>+  (gdb) l *vt_ioctl+0xda8</div><div class='add'>+  0x1888 is in vt_ioctl (drivers/tty/vt/vt_ioctl.c:293).</div><div class='add'>+  288	{</div><div class='add'>+  289		struct vc_data *vc = NULL;</div><div class='add'>+  290		int ret = 0;</div><div class='add'>+  291</div><div class='add'>+  292		console_lock();</div><div class='add'>+  293		if (VT_BUSY(vc_num))</div><div class='add'>+  294			ret = -EBUSY;</div><div class='add'>+  295		else if (vc_num)</div><div class='add'>+  296			vc = vc_deallocate(vc_num);</div><div class='add'>+  297		console_unlock();</div><div class='add'>+</div><div class='add'>+or, if you want to be more verbose::</div><div class='add'>+</div><div class='add'>+  (gdb) p vt_ioctl</div><div class='add'>+  $1 = {int (struct tty_struct *, unsigned int, unsigned long)} 0xae0 &lt;vt_ioctl&gt;</div><div class='add'>+  (gdb) l *0xae0+0xda8</div><div class='add'>+</div><div class='add'>+You could, instead, use the object file::</div><div class='add'>+</div><div class='add'>+  $ make drivers/tty/</div><div class='add'>+  $ gdb drivers/tty/vt/vt_ioctl.o</div><div class='add'>+  (gdb) l *vt_ioctl+0xda8</div><div class='add'>+</div><div class='add'>+If you have a call trace, such as::</div><div class='add'>+</div><div class='add'>+     Call Trace:</div><div class='add'>+      [&lt;ffffffff8802c8e9&gt;] :jbd:log_wait_commit+0xa3/0xf5</div><div class='add'>+      [&lt;ffffffff810482d9&gt;] autoremove_wake_function+0x0/0x2e</div><div class='add'>+      [&lt;ffffffff8802770b&gt;] :jbd:journal_stop+0x1be/0x1ee</div><div class='add'>+      ...</div><div class='add'>+</div><div class='add'>+this shows the problem likely in the :jbd: module. You can load that module</div><div class='add'>+in gdb and list the relevant code::</div><div class='add'>+</div><div class='add'>+  $ gdb fs/jbd/jbd.ko</div><div class='add'>+  (gdb) l *log_wait_commit+0xa3</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+     You can also do the same for any function call at the stack trace,</div><div class='add'>+     like this one::</div><div class='add'>+</div><div class='add'>+	 [&lt;f80bc9ca&gt;] ? dvb_usb_adapter_frontend_exit+0x3a/0x70 [dvb_usb]</div><div class='add'>+</div><div class='add'>+     The position where the above call happened can be seen with::</div><div class='add'>+</div><div class='add'>+	$ gdb drivers/media/usb/dvb-usb/dvb-usb.o</div><div class='add'>+	(gdb) l *dvb_usb_adapter_frontend_exit+0x3a</div><div class='add'>+</div><div class='add'>+objdump</div><div class='add'>+^^^^^^^</div><div class='add'>+</div><div class='add'>+To debug a kernel, use objdump and look for the hex offset from the crash</div><div class='add'>+output to find the valid line of code/assembler. Without debug symbols, you</div><div class='add'>+will see the assembler code for the routine shown, but if your kernel has</div><div class='add'>+debug symbols the C code will also be available. (Debug symbols can be enabled</div><div class='add'>+in the kernel hacking menu of the menu configuration.) For example::</div><div class='add'>+</div><div class='add'>+    $ objdump -r -S -l --disassemble net/dccp/ipv4.o</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+   You need to be at the top level of the kernel tree for this to pick up</div><div class='add'>+   your C files.</div><div class='add'>+</div><div class='add'>+If you don't have access to the code you can also debug on some crash dumps</div><div class='add'>+e.g. crash dump output as shown by Dave Miller::</div><div class='add'>+</div><div class='add'>+     EIP is at 	+0x14/0x4c0</div><div class='add'>+      ...</div><div class='add'>+     Code: 44 24 04 e8 6f 05 00 00 e9 e8 fe ff ff 8d 76 00 8d bc 27 00 00</div><div class='add'>+     00 00 55 57  56 53 81 ec bc 00 00 00 8b ac 24 d0 00 00 00 8b 5d 08</div><div class='add'>+     &lt;8b&gt; 83 3c 01 00 00 89 44  24 14 8b 45 28 85 c0 89 44 24 18 0f 85</div><div class='add'>+</div><div class='add'>+     Put the bytes into a "foo.s" file like this:</div><div class='add'>+</div><div class='add'>+            .text</div><div class='add'>+            .globl foo</div><div class='add'>+     foo:</div><div class='add'>+            .byte  .... /* bytes from Code: part of OOPS dump */</div><div class='add'>+</div><div class='add'>+     Compile it with "gcc -c -o foo.o foo.s" then look at the output of</div><div class='add'>+     "objdump --disassemble foo.o".</div><div class='add'>+</div><div class='add'>+     Output:</div><div class='add'>+</div><div class='add'>+     ip_queue_xmit:</div><div class='add'>+         push       %ebp</div><div class='add'>+         push       %edi</div><div class='add'>+         push       %esi</div><div class='add'>+         push       %ebx</div><div class='add'>+         sub        $0xbc, %esp</div><div class='add'>+         mov        0xd0(%esp), %ebp        ! %ebp = arg0 (skb)</div><div class='add'>+         mov        0x8(%ebp), %ebx         ! %ebx = skb-&gt;sk</div><div class='add'>+         mov        0x13c(%ebx), %eax       ! %eax = inet_sk(sk)-&gt;opt</div><div class='add'>+</div><div class='add'>+Reporting the bug</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Once you find where the bug happened, by inspecting its location,</div><div class='add'>+you could either try to fix it yourself or report it upstream.</div><div class='add'>+</div><div class='add'>+In order to report it upstream, you should identify the mailing list</div><div class='add'>+used for the development of the affected code. This can be done by using</div><div class='add'>+the ``get_maintainer.pl`` script.</div><div class='add'>+</div><div class='add'>+For example, if you find a bug at the gspca's conex.c file, you can get</div><div class='add'>+their maintainers with::</div><div class='add'>+</div><div class='add'>+	$ ./scripts/get_maintainer.pl -f drivers/media/usb/gspca/sonixj.c</div><div class='add'>+	Hans Verkuil &lt;hverkuil@xs4all.nl&gt; (odd fixer:GSPCA USB WEBCAM DRIVER,commit_signer:1/1=100%)</div><div class='add'>+	Mauro Carvalho Chehab &lt;mchehab@kernel.org&gt; (maintainer:MEDIA INPUT INFRASTRUCTURE (V4L/DVB),commit_signer:1/1=100%)</div><div class='add'>+	Tejun Heo &lt;tj@kernel.org&gt; (commit_signer:1/1=100%)</div><div class='add'>+	Bhaktipriya Shridhar &lt;bhaktipriya96@gmail.com&gt; (commit_signer:1/1=100%,authored:1/1=100%,added_lines:4/4=100%,removed_lines:9/9=100%)</div><div class='add'>+	linux-media@vger.kernel.org (open list:GSPCA USB WEBCAM DRIVER)</div><div class='add'>+	linux-kernel@vger.kernel.org (open list)</div><div class='add'>+</div><div class='add'>+Please notice that it will point to:</div><div class='add'>+</div><div class='add'>+- The last developers that touched on the source code. On the above example,</div><div class='add'>+  Tejun and Bhaktipriya (in this specific case, none really envolved on the</div><div class='add'>+  development of this file);</div><div class='add'>+- The driver maintainer (Hans Verkuil);</div><div class='add'>+- The subsystem maintainer (Mauro Carvalho Chehab)</div><div class='add'>+- The driver and/or subsystem mailing list (linux-media@vger.kernel.org);</div><div class='add'>+- the Linux Kernel mailing list (linux-kernel@vger.kernel.org).</div><div class='add'>+</div><div class='add'>+Usually, the fastest way to have your bug fixed is to report it to mailing</div><div class='add'>+list used for the development of the code (linux-media ML) copying the driver maintainer (Hans).</div><div class='add'>+</div><div class='add'>+If you are totally stumped as to whom to send the report, and</div><div class='add'>+``get_maintainer.pl`` didn't provide you anything useful, send it to</div><div class='add'>+linux-kernel@vger.kernel.org.</div><div class='add'>+</div><div class='add'>+Thanks for your help in making Linux as stable as humanly possible.</div><div class='add'>+</div><div class='add'>+Fixing the bug</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+If you know programming, you could help us by not only reporting the bug,</div><div class='add'>+but also providing us with a solution. After all open source is about</div><div class='add'>+sharing what you do and don't you want to be recognised for your genius?</div><div class='add'>+</div><div class='add'>+If you decide to take this way, once you have worked out a fix please submit</div><div class='add'>+it upstream.</div><div class='add'>+</div><div class='add'>+Please do read</div><div class='add'>+ref:`Documentation/process/submitting-patches.rst &lt;submittingpatches&gt;` though</div><div class='add'>+to help your code get accepted.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+---------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Notes on Oops tracing with ``klogd``</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+In order to help Linus and the other kernel developers there has been</div><div class='add'>+substantial support incorporated into ``klogd`` for processing protection</div><div class='add'>+faults.  In order to have full support for address resolution at least</div><div class='add'>+version 1.3-pl3 of the ``sysklogd`` package should be used.</div><div class='add'>+</div><div class='add'>+When a protection fault occurs the ``klogd`` daemon automatically</div><div class='add'>+translates important addresses in the kernel log messages to their</div><div class='add'>+symbolic equivalents.  This translated kernel message is then</div><div class='add'>+forwarded through whatever reporting mechanism ``klogd`` is using.  The</div><div class='add'>+protection fault message can be simply cut out of the message files</div><div class='add'>+and forwarded to the kernel developers.</div><div class='add'>+</div><div class='add'>+Two types of address resolution are performed by ``klogd``.  The first is</div><div class='add'>+static translation and the second is dynamic translation.  Static</div><div class='add'>+translation uses the System.map file in much the same manner that</div><div class='add'>+ksymoops does.  In order to do static translation the ``klogd`` daemon</div><div class='add'>+must be able to find a system map file at daemon initialization time.</div><div class='add'>+See the klogd man page for information on how ``klogd`` searches for map</div><div class='add'>+files.</div><div class='add'>+</div><div class='add'>+Dynamic address translation is important when kernel loadable modules</div><div class='add'>+are being used.  Since memory for kernel modules is allocated from the</div><div class='add'>+kernel's dynamic memory pools there are no fixed locations for either</div><div class='add'>+the start of the module or for functions and symbols in the module.</div><div class='add'>+</div><div class='add'>+The kernel supports system calls which allow a program to determine</div><div class='add'>+which modules are loaded and their location in memory.  Using these</div><div class='add'>+system calls the klogd daemon builds a symbol table which can be used</div><div class='add'>+to debug a protection fault which occurs in a loadable kernel module.</div><div class='add'>+</div><div class='add'>+At the very minimum klogd will provide the name of the module which</div><div class='add'>+generated the protection fault.  There may be additional symbolic</div><div class='add'>+information available if the developer of the loadable module chose to</div><div class='add'>+export symbol information from the module.</div><div class='add'>+</div><div class='add'>+Since the kernel module environment can be dynamic there must be a</div><div class='add'>+mechanism for notifying the ``klogd`` daemon when a change in module</div><div class='add'>+environment occurs.  There are command line options available which</div><div class='add'>+allow klogd to signal the currently executing daemon that symbol</div><div class='add'>+information should be refreshed.  See the ``klogd`` manual page for more</div><div class='add'>+information.</div><div class='add'>+</div><div class='add'>+A patch is included with the sysklogd distribution which modifies the</div><div class='add'>+``modules-2.0.0`` package to automatically signal klogd whenever a module</div><div class='add'>+is loaded or unloaded.  Applying this patch provides essentially</div><div class='add'>+seamless support for debugging protection faults which occur with</div><div class='add'>+kernel loadable modules.</div><div class='add'>+</div><div class='add'>+The following is an example of a protection fault in a loadable module</div><div class='add'>+processed by ``klogd``::</div><div class='add'>+</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: Unable to handle kernel paging request at virtual address f15e97cc</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: current-&gt;tss.cr3 = 0062d000, %cr3 = 0062d000</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: *pde = 00000000</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: Oops: 0002</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: CPU:    0</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: EIP:    0010:[oops:_oops+16/3868]</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: EFLAGS: 00010212</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: eax: 315e97cc   ebx: 003a6f80   ecx: 001be77b   edx: 00237c0c</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: esi: 00000000   edi: bffffdb3   ebp: 00589f90   esp: 00589f8c</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: ds: 0018   es: 0018   fs: 002b   gs: 002b   ss: 0018</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: Process oops_test (pid: 3374, process nr: 21, stackpage=00589000)</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: Stack: 315e97cc 00589f98 0100b0b4 bffffed4 0012e38e 00240c64 003a6f80 00000001</div><div class='add'>+	Aug 29 09:51:01 blizard kernel:        00000000 00237810 bfffff00 0010a7fa 00000003 00000001 00000000 bfffff00</div><div class='add'>+	Aug 29 09:51:01 blizard kernel:        bffffdb3 bffffed4 ffffffda 0000002b 0007002b 0000002b 0000002b 00000036</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: Call Trace: [oops:_oops_ioctl+48/80] [_sys_ioctl+254/272] [_system_call+82/128]</div><div class='add'>+	Aug 29 09:51:01 blizard kernel: Code: c7 00 05 00 00 00 eb 08 90 90 90 90 90 90 90 90 89 ec 5d c3</div><div class='add'>+</div><div class='add'>+---------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  Dr. G.W. Wettstein           Oncology Research Div. Computing Facility</div><div class='add'>+  Roger Maris Cancer Center    INTERNET: greg@wind.rmcc.com</div><div class='add'>+  820 4th St. N.</div><div class='add'>+  Fargo, ND  58122</div><div class='add'>+  Phone: 701-234-7556</div><div class='head'>diff --git a/Documentation/admin-guide/conf.py b/Documentation/admin-guide/conf.py<br/>new file mode 100644<br/>index 000000000000..86f738953799<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/conf.py</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# -*- coding: utf-8; mode: python -*-</div><div class='add'>+</div><div class='add'>+project = 'Linux Kernel User Documentation'</div><div class='add'>+</div><div class='add'>+tags.add("subproject")</div><div class='add'>+</div><div class='add'>+latex_documents = [</div><div class='add'>+    ('index', 'linux-user.tex', 'Linux Kernel User Documentation',</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+]</div><div class='head'>diff --git a/Documentation/admin-guide/devices.rst b/Documentation/admin-guide/devices.rst<br/>new file mode 100644<br/>index 000000000000..7fadc05330dd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/devices.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/devices.rst</a></div><div class='hunk'>@@ -0,0 +1,268 @@</div><div class='add'>+</div><div class='add'>+Linux allocated devices (4.x+ version)</div><div class='add'>+======================================</div><div class='add'>+</div><div class='add'>+This list is the Linux Device List, the official registry of allocated</div><div class='add'>+device numbers and ``/dev`` directory nodes for the Linux operating</div><div class='add'>+system.</div><div class='add'>+</div><div class='add'>+The LaTeX version of this document is no longer maintained, nor is</div><div class='add'>+the document that used to reside at lanana.org.  This version in the</div><div class='add'>+mainline Linux kernel is the master document.  Updates shall be sent</div><div class='add'>+as patches to the kernel maintainers (see the</div><div class='add'>+:ref:`Documentation/process/submitting-patches.rst &lt;submittingpatches&gt;` document).</div><div class='add'>+Specifically explore the sections titled "CHAR and MISC DRIVERS", and</div><div class='add'>+"BLOCK LAYER" in the MAINTAINERS file to find the right maintainers</div><div class='add'>+to involve for character and block devices.</div><div class='add'>+</div><div class='add'>+This document is included by reference into the Filesystem Hierarchy</div><div class='add'>+Standard (FHS).	 The FHS is available from http://www.pathname.com/fhs/.</div><div class='add'>+</div><div class='add'>+Allocations marked (68k/Amiga) apply to Linux/68k on the Amiga</div><div class='add'>+platform only.	Allocations marked (68k/Atari) apply to Linux/68k on</div><div class='add'>+the Atari platform only.</div><div class='add'>+</div><div class='add'>+This document is in the public domain.	The authors requests, however,</div><div class='add'>+that semantically altered versions are not distributed without</div><div class='add'>+permission of the authors, assuming the authors can be contacted without</div><div class='add'>+an unreasonable effort.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. attention::</div><div class='add'>+</div><div class='add'>+  DEVICE DRIVERS AUTHORS PLEASE READ THIS</div><div class='add'>+</div><div class='add'>+  Linux now has extensive support for dynamic allocation of device numbering</div><div class='add'>+  and can use ``sysfs`` and ``udev`` (``systemd``) to handle the naming needs.</div><div class='add'>+  There are still some exceptions in the serial and boot device area. Before</div><div class='add'>+  asking   for a device number make sure you actually need one.</div><div class='add'>+</div><div class='add'>+  To have a major number allocated, or a minor number in situations</div><div class='add'>+  where that applies (e.g. busmice), please submit a patch and send to</div><div class='add'>+  the authors as indicated above.</div><div class='add'>+</div><div class='add'>+  Keep the description of the device *in the same format</div><div class='add'>+  as this list*. The reason for this is that it is the only way we have</div><div class='add'>+  found to ensure we have all the requisite information to publish your</div><div class='add'>+  device and avoid conflicts.</div><div class='add'>+</div><div class='add'>+  Finally, sometimes we have to play "namespace police."  Please don't be</div><div class='add'>+  offended.  We often get submissions for ``/dev`` names that would be bound</div><div class='add'>+  to cause conflicts down the road.  We are trying to avoid getting in a</div><div class='add'>+  situation where we would have to suffer an incompatible forward</div><div class='add'>+  change.  Therefore, please consult with us **before** you make your</div><div class='add'>+  device names and numbers in any way public, at least to the point</div><div class='add'>+  where it would be at all difficult to get them changed.</div><div class='add'>+</div><div class='add'>+  Your cooperation is appreciated.</div><div class='add'>+</div><div class='add'>+.. include:: devices.txt</div><div class='add'>+   :literal:</div><div class='add'>+</div><div class='add'>+Additional ``/dev/`` directory entries</div><div class='add'>+--------------------------------------</div><div class='add'>+</div><div class='add'>+This section details additional entries that should or may exist in</div><div class='add'>+the /dev directory.  It is preferred that symbolic links use the same</div><div class='add'>+form (absolute or relative) as is indicated here.  Links are</div><div class='add'>+classified as "hard" or "symbolic" depending on the preferred type of</div><div class='add'>+link; if possible, the indicated type of link should be used.</div><div class='add'>+</div><div class='add'>+Compulsory links</div><div class='add'>+++++++++++++++++</div><div class='add'>+</div><div class='add'>+These links should exist on all systems:</div><div class='add'>+</div><div class='add'>+=============== =============== =============== ===============================</div><div class='add'>+/dev/fd		/proc/self/fd	symbolic	File descriptors</div><div class='add'>+/dev/stdin	fd/0		symbolic	stdin file descriptor</div><div class='add'>+/dev/stdout	fd/1		symbolic	stdout file descriptor</div><div class='add'>+/dev/stderr	fd/2		symbolic	stderr file descriptor</div><div class='add'>+/dev/nfsd	socksys		symbolic	Required by iBCS-2</div><div class='add'>+/dev/X0R	null		symbolic	Required by iBCS-2</div><div class='add'>+=============== =============== =============== ===============================</div><div class='add'>+</div><div class='add'>+Note: ``/dev/X0R`` is &lt;letter X&gt;-&lt;digit 0&gt;-&lt;letter R&gt;.</div><div class='add'>+</div><div class='add'>+Recommended links</div><div class='add'>++++++++++++++++++</div><div class='add'>+</div><div class='add'>+It is recommended that these links exist on all systems:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+=============== =============== =============== ===============================</div><div class='add'>+/dev/core	/proc/kcore	symbolic	Backward compatibility</div><div class='add'>+/dev/ramdisk	ram0		symbolic	Backward compatibility</div><div class='add'>+/dev/ftape	qft0		symbolic	Backward compatibility</div><div class='add'>+/dev/bttv0	video0		symbolic	Backward compatibility</div><div class='add'>+/dev/radio	radio0		symbolic	Backward compatibility</div><div class='add'>+/dev/i2o*	/dev/i2o/*	symbolic	Backward compatibility</div><div class='add'>+/dev/scd?	sr?		hard		Alternate SCSI CD-ROM name</div><div class='add'>+=============== =============== =============== ===============================</div><div class='add'>+</div><div class='add'>+Locally defined links</div><div class='add'>++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+The following links may be established locally to conform to the</div><div class='add'>+configuration of the system.  This is merely a tabulation of existing</div><div class='add'>+practice, and does not constitute a recommendation.  However, if they</div><div class='add'>+exist, they should have the following uses.</div><div class='add'>+</div><div class='add'>+=============== =============== =============== ===============================</div><div class='add'>+/dev/mouse	mouse port	symbolic	Current mouse device</div><div class='add'>+/dev/tape	tape device	symbolic	Current tape device</div><div class='add'>+/dev/cdrom	CD-ROM device	symbolic	Current CD-ROM device</div><div class='add'>+/dev/cdwriter	CD-writer	symbolic	Current CD-writer device</div><div class='add'>+/dev/scanner	scanner		symbolic	Current scanner device</div><div class='add'>+/dev/modem	modem port	symbolic	Current dialout device</div><div class='add'>+/dev/root	root device	symbolic	Current root filesystem</div><div class='add'>+/dev/swap	swap device	symbolic	Current swap device</div><div class='add'>+=============== =============== =============== ===============================</div><div class='add'>+</div><div class='add'>+``/dev/modem`` should not be used for a modem which supports dialin as</div><div class='add'>+well as dialout, as it tends to cause lock file problems.  If it</div><div class='add'>+exists, ``/dev/modem`` should point to the appropriate primary TTY device</div><div class='add'>+(the use of the alternate callout devices is deprecated).</div><div class='add'>+</div><div class='add'>+For SCSI devices, ``/dev/tape`` and ``/dev/cdrom`` should point to the</div><div class='add'>+*cooked* devices (``/dev/st*`` and ``/dev/sr*``, respectively), whereas</div><div class='add'>+``/dev/cdwriter`` and /dev/scanner should point to the appropriate generic</div><div class='add'>+SCSI devices (/dev/sg*).</div><div class='add'>+</div><div class='add'>+``/dev/mouse`` may point to a primary serial TTY device, a hardware mouse</div><div class='add'>+device, or a socket for a mouse driver program (e.g. ``/dev/gpmdata``).</div><div class='add'>+</div><div class='add'>+Sockets and pipes</div><div class='add'>++++++++++++++++++</div><div class='add'>+</div><div class='add'>+Non-transient sockets and named pipes may exist in /dev.  Common entries are:</div><div class='add'>+</div><div class='add'>+=============== =============== ===============================================</div><div class='add'>+/dev/printer	socket		lpd local socket</div><div class='add'>+/dev/log	socket		syslog local socket</div><div class='add'>+/dev/gpmdata	socket		gpm mouse multiplexer</div><div class='add'>+=============== =============== ===============================================</div><div class='add'>+</div><div class='add'>+Mount points</div><div class='add'>+++++++++++++</div><div class='add'>+</div><div class='add'>+The following names are reserved for mounting special filesystems</div><div class='add'>+under /dev.  These special filesystems provide kernel interfaces that</div><div class='add'>+cannot be provided with standard device nodes.</div><div class='add'>+</div><div class='add'>+=============== =============== ===============================================</div><div class='add'>+/dev/pts	devpts		PTY slave filesystem</div><div class='add'>+/dev/shm	tmpfs		POSIX shared memory maintenance access</div><div class='add'>+=============== =============== ===============================================</div><div class='add'>+</div><div class='add'>+Terminal devices</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Terminal, or TTY devices are a special class of character devices.  A</div><div class='add'>+terminal device is any device that could act as a controlling terminal</div><div class='add'>+for a session; this includes virtual consoles, serial ports, and</div><div class='add'>+pseudoterminals (PTYs).</div><div class='add'>+</div><div class='add'>+All terminal devices share a common set of capabilities known as line</div><div class='add'>+disciplines; these include the common terminal line discipline as well</div><div class='add'>+as SLIP and PPP modes.</div><div class='add'>+</div><div class='add'>+All terminal devices are named similarly; this section explains the</div><div class='add'>+naming and use of the various types of TTYs.  Note that the naming</div><div class='add'>+conventions include several historical warts; some of these are</div><div class='add'>+Linux-specific, some were inherited from other systems, and some</div><div class='add'>+reflect Linux outgrowing a borrowed convention.</div><div class='add'>+</div><div class='add'>+A hash mark (``#``) in a device name is used here to indicate a decimal</div><div class='add'>+number without leading zeroes.</div><div class='add'>+</div><div class='add'>+Virtual consoles and the console device</div><div class='add'>++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+Virtual consoles are full-screen terminal displays on the system video</div><div class='add'>+monitor.  Virtual consoles are named ``/dev/tty#``, with numbering</div><div class='add'>+starting at ``/dev/tty1``; ``/dev/tty0`` is the current virtual console.</div><div class='add'>+``/dev/tty0`` is the device that should be used to access the system video</div><div class='add'>+card on those architectures for which the frame buffer devices</div><div class='add'>+(``/dev/fb*``) are not applicable. Do not use ``/dev/console``</div><div class='add'>+for this purpose.</div><div class='add'>+</div><div class='add'>+The console device, ``/dev/console``, is the device to which system</div><div class='add'>+messages should be sent, and on which logins should be permitted in</div><div class='add'>+single-user mode.  Starting with Linux 2.1.71, ``/dev/console`` is managed</div><div class='add'>+by the kernel; for previous versions it should be a symbolic link to</div><div class='add'>+either ``/dev/tty0``, a specific virtual console such as ``/dev/tty1``, or to</div><div class='add'>+a serial port primary (``tty*``, not ``cu*``) device, depending on the</div><div class='add'>+configuration of the system.</div><div class='add'>+</div><div class='add'>+Serial ports</div><div class='add'>+++++++++++++</div><div class='add'>+</div><div class='add'>+Serial ports are RS-232 serial ports and any device which simulates</div><div class='add'>+one, either in hardware (such as internal modems) or in software (such</div><div class='add'>+as the ISDN driver.)  Under Linux, each serial ports has two device</div><div class='add'>+names, the primary or callin device and the alternate or callout one.</div><div class='add'>+Each kind of device is indicated by a different letter.	 For any</div><div class='add'>+letter X, the names of the devices are ``/dev/ttyX#`` and ``/dev/cux#``,</div><div class='add'>+respectively; for historical reasons, ``/dev/ttyS#`` and ``/dev/ttyC#``</div><div class='add'>+correspond to ``/dev/cua#`` and ``/dev/cub#``. In the future, it should be</div><div class='add'>+expected that multiple letters will be used; all letters will be upper</div><div class='add'>+case for the "tty" device (e.g. ``/dev/ttyDP#``) and lower case for the</div><div class='add'>+"cu" device (e.g. ``/dev/cudp#``).</div><div class='add'>+</div><div class='add'>+The names ``/dev/ttyQ#`` and ``/dev/cuq#`` are reserved for local use.</div><div class='add'>+</div><div class='add'>+The alternate devices provide for kernel-based exclusion and somewhat</div><div class='add'>+different defaults than the primary devices.  Their main purpose is to</div><div class='add'>+allow the use of serial ports with programs with no inherent or broken</div><div class='add'>+support for serial ports.  Their use is deprecated, and they may be</div><div class='add'>+removed from a future version of Linux.</div><div class='add'>+</div><div class='add'>+Arbitration of serial ports is provided by the use of lock files with</div><div class='add'>+the names ``/var/lock/LCK..ttyX#``. The contents of the lock file should</div><div class='add'>+be the PID of the locking process as an ASCII number.</div><div class='add'>+</div><div class='add'>+It is common practice to install links such as /dev/modem</div><div class='add'>+which point to serial ports.  In order to ensure proper locking in the</div><div class='add'>+presence of these links, it is recommended that software chase</div><div class='add'>+symlinks and lock all possible names; additionally, it is recommended</div><div class='add'>+that a lock file be installed with the corresponding alternate</div><div class='add'>+device.	 In order to avoid deadlocks, it is recommended that the locks</div><div class='add'>+are acquired in the following order, and released in the reverse:</div><div class='add'>+</div><div class='add'>+	1. The symbolic link name, if any (``/var/lock/LCK..modem``)</div><div class='add'>+	2. The "tty" name (``/var/lock/LCK..ttyS2``)</div><div class='add'>+	3. The alternate device name (``/var/lock/LCK..cua2``)</div><div class='add'>+</div><div class='add'>+In the case of nested symbolic links, the lock files should be</div><div class='add'>+installed in the order the symlinks are resolved.</div><div class='add'>+</div><div class='add'>+Under no circumstances should an application hold a lock while waiting</div><div class='add'>+for another to be released.  In addition, applications which attempt</div><div class='add'>+to create lock files for the corresponding alternate device names</div><div class='add'>+should take into account the possibility of being used on a non-serial</div><div class='add'>+port TTY, for which no alternate device would exist.</div><div class='add'>+</div><div class='add'>+Pseudoterminals (PTYs)</div><div class='add'>+++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+Pseudoterminals, or PTYs, are used to create login sessions or provide</div><div class='add'>+other capabilities requiring a TTY line discipline (including SLIP or</div><div class='add'>+PPP capability) to arbitrary data-generation processes.	 Each PTY has</div><div class='add'>+a master side, named ``/dev/pty[p-za-e][0-9a-f]``, and a slave side, named</div><div class='add'>+``/dev/tty[p-za-e][0-9a-f]``.  The kernel arbitrates the use of PTYs by</div><div class='add'>+allowing each master side to be opened only once.</div><div class='add'>+</div><div class='add'>+Once the master side has been opened, the corresponding slave device</div><div class='add'>+can be used in the same manner as any TTY device.  The master and</div><div class='add'>+slave devices are connected by the kernel, generating the equivalent</div><div class='add'>+of a bidirectional pipe with TTY capabilities.</div><div class='add'>+</div><div class='add'>+Recent versions of the Linux kernels and GNU libc contain support for</div><div class='add'>+the System V/Unix98 naming scheme for PTYs, which assigns a common</div><div class='add'>+device, ``/dev/ptmx``, to all the masters (opening it will automatically</div><div class='add'>+give you a previously unassigned PTY) and a subdirectory, ``/dev/pts``,</div><div class='add'>+for the slaves; the slaves are named with decimal integers (``/dev/pts/#``</div><div class='add'>+in our notation).  This removes the problem of exhausting the</div><div class='add'>+namespace and enables the kernel to automatically create the device</div><div class='add'>+nodes for the slaves on demand using the "devpts" filesystem.</div><div class='head'>diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt<br/>new file mode 100644<br/>index 000000000000..c9cea2e39c21<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/devices.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/devices.txt</a></div><div class='hunk'>@@ -0,0 +1,3081 @@</div><div class='add'>+   0		Unnamed devices (e.g. non-device mounts)</div><div class='add'>+		  0 = reserved as null device number</div><div class='add'>+		See block major 144, 145, 146 for expansion areas.</div><div class='add'>+</div><div class='add'>+   1 char	Memory devices</div><div class='add'>+		  1 = /dev/mem		Physical memory access</div><div class='add'>+		  2 = /dev/kmem		Kernel virtual memory access</div><div class='add'>+		  3 = /dev/null		Null device</div><div class='add'>+		  4 = /dev/port		I/O port access</div><div class='add'>+		  5 = /dev/zero		Null byte source</div><div class='add'>+		  6 = /dev/core		OBSOLETE - replaced by /proc/kcore</div><div class='add'>+		  7 = /dev/full		Returns ENOSPC on write</div><div class='add'>+		  8 = /dev/random	Nondeterministic random number gen.</div><div class='add'>+		  9 = /dev/urandom	Faster, less secure random number gen.</div><div class='add'>+		 10 = /dev/aio		Asynchronous I/O notification interface</div><div class='add'>+		 11 = /dev/kmsg		Writes to this come out as printk's, reads</div><div class='add'>+					export the buffered printk records.</div><div class='add'>+		 12 = /dev/oldmem	OBSOLETE - replaced by /proc/vmcore</div><div class='add'>+</div><div class='add'>+   1 block	RAM disk</div><div class='add'>+		  0 = /dev/ram0		First RAM disk</div><div class='add'>+		  1 = /dev/ram1		Second RAM disk</div><div class='add'>+		    ...</div><div class='add'>+		250 = /dev/initrd	Initial RAM disk</div><div class='add'>+</div><div class='add'>+		Older kernels had /dev/ramdisk (1, 1) here.</div><div class='add'>+		/dev/initrd refers to a RAM disk which was preloaded</div><div class='add'>+		by the boot loader; newer kernels use /dev/ram0 for</div><div class='add'>+		the initrd.</div><div class='add'>+</div><div class='add'>+   2 char	Pseudo-TTY masters</div><div class='add'>+		  0 = /dev/ptyp0	First PTY master</div><div class='add'>+		  1 = /dev/ptyp1	Second PTY master</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/ptyef	256th PTY master</div><div class='add'>+</div><div class='add'>+		Pseudo-tty's are named as follows:</div><div class='add'>+		* Masters are "pty", slaves are "tty";</div><div class='add'>+		* the fourth letter is one of pqrstuvwxyzabcde indicating</div><div class='add'>+		  the 1st through 16th series of 16 pseudo-ttys each, and</div><div class='add'>+		* the fifth letter is one of 0123456789abcdef indicating</div><div class='add'>+		  the position within the series.</div><div class='add'>+</div><div class='add'>+		These are the old-style (BSD) PTY devices; Unix98</div><div class='add'>+		devices are on major 128 and above and use the PTY</div><div class='add'>+		master multiplex (/dev/ptmx) to acquire a PTY on</div><div class='add'>+		demand.</div><div class='add'>+</div><div class='add'>+   2 block	Floppy disks</div><div class='add'>+		  0 = /dev/fd0		Controller 0, drive 0, autodetect</div><div class='add'>+		  1 = /dev/fd1		Controller 0, drive 1, autodetect</div><div class='add'>+		  2 = /dev/fd2		Controller 0, drive 2, autodetect</div><div class='add'>+		  3 = /dev/fd3		Controller 0, drive 3, autodetect</div><div class='add'>+		128 = /dev/fd4		Controller 1, drive 0, autodetect</div><div class='add'>+		129 = /dev/fd5		Controller 1, drive 1, autodetect</div><div class='add'>+		130 = /dev/fd6		Controller 1, drive 2, autodetect</div><div class='add'>+		131 = /dev/fd7		Controller 1, drive 3, autodetect</div><div class='add'>+</div><div class='add'>+		To specify format, add to the autodetect device number:</div><div class='add'>+		  0 = /dev/fd?		Autodetect format</div><div class='add'>+		  4 = /dev/fd?d360	5.25"  360K in a 360K  drive(1)</div><div class='add'>+		 20 = /dev/fd?h360	5.25"  360K in a 1200K drive(1)</div><div class='add'>+		 48 = /dev/fd?h410	5.25"  410K in a 1200K drive</div><div class='add'>+		 64 = /dev/fd?h420	5.25"  420K in a 1200K drive</div><div class='add'>+		 24 = /dev/fd?h720	5.25"  720K in a 1200K drive</div><div class='add'>+		 80 = /dev/fd?h880	5.25"  880K in a 1200K drive(1)</div><div class='add'>+		  8 = /dev/fd?h1200	5.25" 1200K in a 1200K drive(1)</div><div class='add'>+		 40 = /dev/fd?h1440	5.25" 1440K in a 1200K drive(1)</div><div class='add'>+		 56 = /dev/fd?h1476	5.25" 1476K in a 1200K drive</div><div class='add'>+		 72 = /dev/fd?h1494	5.25" 1494K in a 1200K drive</div><div class='add'>+		 92 = /dev/fd?h1600	5.25" 1600K in a 1200K drive(1)</div><div class='add'>+</div><div class='add'>+		 12 = /dev/fd?u360	3.5"   360K Double Density(2)</div><div class='add'>+		 16 = /dev/fd?u720	3.5"   720K Double Density(1)</div><div class='add'>+		120 = /dev/fd?u800	3.5"   800K Double Density(2)</div><div class='add'>+		 52 = /dev/fd?u820	3.5"   820K Double Density</div><div class='add'>+		 68 = /dev/fd?u830	3.5"   830K Double Density</div><div class='add'>+		 84 = /dev/fd?u1040	3.5"  1040K Double Density(1)</div><div class='add'>+		 88 = /dev/fd?u1120	3.5"  1120K Double Density(1)</div><div class='add'>+		 28 = /dev/fd?u1440	3.5"  1440K High Density(1)</div><div class='add'>+		124 = /dev/fd?u1600	3.5"  1600K High Density(1)</div><div class='add'>+		 44 = /dev/fd?u1680	3.5"  1680K High Density(3)</div><div class='add'>+		 60 = /dev/fd?u1722	3.5"  1722K High Density</div><div class='add'>+		 76 = /dev/fd?u1743	3.5"  1743K High Density</div><div class='add'>+		 96 = /dev/fd?u1760	3.5"  1760K High Density</div><div class='add'>+		116 = /dev/fd?u1840	3.5"  1840K High Density(3)</div><div class='add'>+		100 = /dev/fd?u1920	3.5"  1920K High Density(1)</div><div class='add'>+		 32 = /dev/fd?u2880	3.5"  2880K Extra Density(1)</div><div class='add'>+		104 = /dev/fd?u3200	3.5"  3200K Extra Density</div><div class='add'>+		108 = /dev/fd?u3520	3.5"  3520K Extra Density</div><div class='add'>+		112 = /dev/fd?u3840	3.5"  3840K Extra Density(1)</div><div class='add'>+</div><div class='add'>+		 36 = /dev/fd?CompaQ	Compaq 2880K drive; obsolete?</div><div class='add'>+</div><div class='add'>+		(1) Autodetectable format</div><div class='add'>+		(2) Autodetectable format in a Double Density (720K) drive only</div><div class='add'>+		(3) Autodetectable format in a High Density (1440K) drive only</div><div class='add'>+</div><div class='add'>+		NOTE: The letter in the device name (d, q, h or u)</div><div class='add'>+		signifies the type of drive: 5.25" Double Density (d),</div><div class='add'>+		5.25" Quad Density (q), 5.25" High Density (h) or 3.5"</div><div class='add'>+		(any model, u).	 The use of the capital letters D, H</div><div class='add'>+		and E for the 3.5" models have been deprecated, since</div><div class='add'>+		the drive type is insignificant for these devices.</div><div class='add'>+</div><div class='add'>+   3 char	Pseudo-TTY slaves</div><div class='add'>+		  0 = /dev/ttyp0	First PTY slave</div><div class='add'>+		  1 = /dev/ttyp1	Second PTY slave</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/ttyef	256th PTY slave</div><div class='add'>+</div><div class='add'>+		These are the old-style (BSD) PTY devices; Unix98</div><div class='add'>+		devices are on major 136 and above.</div><div class='add'>+</div><div class='add'>+   3 block	First MFM, RLL and IDE hard disk/CD-ROM interface</div><div class='add'>+		  0 = /dev/hda		Master: whole disk (or CD-ROM)</div><div class='add'>+		 64 = /dev/hdb		Slave: whole disk (or CD-ROM)</div><div class='add'>+</div><div class='add'>+		For partitions, add to the whole disk device number:</div><div class='add'>+		  0 = /dev/hd?		Whole disk</div><div class='add'>+		  1 = /dev/hd?1		First partition</div><div class='add'>+		  2 = /dev/hd?2		Second partition</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/hd?63	63rd partition</div><div class='add'>+</div><div class='add'>+		For Linux/i386, partitions 1-4 are the primary</div><div class='add'>+		partitions, and 5 and above are logical partitions.</div><div class='add'>+		Other versions of Linux use partitioning schemes</div><div class='add'>+		appropriate to their respective architectures.</div><div class='add'>+</div><div class='add'>+   4 char	TTY devices</div><div class='add'>+		  0 = /dev/tty0		Current virtual console</div><div class='add'>+</div><div class='add'>+		  1 = /dev/tty1		First virtual console</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/tty63	63rd virtual console</div><div class='add'>+		 64 = /dev/ttyS0	First UART serial port</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/ttyS191	192nd UART serial port</div><div class='add'>+</div><div class='add'>+		UART serial ports refer to 8250/16450/16550 series devices.</div><div class='add'>+</div><div class='add'>+		Older versions of the Linux kernel used this major</div><div class='add'>+		number for BSD PTY devices.  As of Linux 2.1.115, this</div><div class='add'>+		is no longer supported.	 Use major numbers 2 and 3.</div><div class='add'>+</div><div class='add'>+   4 block	Aliases for dynamically allocated major devices to be used</div><div class='add'>+		when its not possible to create the real device nodes</div><div class='add'>+		because the root filesystem is mounted read-only.</div><div class='add'>+</div><div class='add'>+		   0 = /dev/root</div><div class='add'>+</div><div class='add'>+   5 char	Alternate TTY devices</div><div class='add'>+		  0 = /dev/tty		Current TTY device</div><div class='add'>+		  1 = /dev/console	System console</div><div class='add'>+		  2 = /dev/ptmx		PTY master multiplex</div><div class='add'>+		  3 = /dev/ttyprintk	User messages via printk TTY device</div><div class='add'>+		 64 = /dev/cua0		Callout device for ttyS0</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/cua191	Callout device for ttyS191</div><div class='add'>+</div><div class='add'>+		(5,1) is /dev/console starting with Linux 2.1.71.  See</div><div class='add'>+		the section on terminal devices for more information</div><div class='add'>+		on /dev/console.</div><div class='add'>+</div><div class='add'>+   6 char	Parallel printer devices</div><div class='add'>+		  0 = /dev/lp0		Parallel printer on parport0</div><div class='add'>+		  1 = /dev/lp1		Parallel printer on parport1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		Current Linux kernels no longer have a fixed mapping</div><div class='add'>+		between parallel ports and I/O addresses.  Instead,</div><div class='add'>+		they are redirected through the parport multiplex layer.</div><div class='add'>+</div><div class='add'>+   7 char	Virtual console capture devices</div><div class='add'>+		  0 = /dev/vcs		Current vc text contents</div><div class='add'>+		  1 = /dev/vcs1		tty1 text contents</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/vcs63	tty63 text contents</div><div class='add'>+		128 = /dev/vcsa		Current vc text/attribute contents</div><div class='add'>+		129 = /dev/vcsa1	tty1 text/attribute contents</div><div class='add'>+		    ...</div><div class='add'>+		191 = /dev/vcsa63	tty63 text/attribute contents</div><div class='add'>+</div><div class='add'>+		NOTE: These devices permit both read and write access.</div><div class='add'>+</div><div class='add'>+   7 block	Loopback devices</div><div class='add'>+		  0 = /dev/loop0	First loop device</div><div class='add'>+		  1 = /dev/loop1	Second loop device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		The loop devices are used to mount filesystems not</div><div class='add'>+		associated with block devices.	The binding to the</div><div class='add'>+		loop devices is handled by mount(8) or losetup(8).</div><div class='add'>+</div><div class='add'>+   8 block	SCSI disk devices (0-15)</div><div class='add'>+		  0 = /dev/sda		First SCSI disk whole disk</div><div class='add'>+		 16 = /dev/sdb		Second SCSI disk whole disk</div><div class='add'>+		 32 = /dev/sdc		Third SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/sdp		Sixteenth SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+   9 char	SCSI tape devices</div><div class='add'>+		  0 = /dev/st0		First SCSI tape, mode 0</div><div class='add'>+		  1 = /dev/st1		Second SCSI tape, mode 0</div><div class='add'>+		    ...</div><div class='add'>+		 32 = /dev/st0l		First SCSI tape, mode 1</div><div class='add'>+		 33 = /dev/st1l		Second SCSI tape, mode 1</div><div class='add'>+		    ...</div><div class='add'>+		 64 = /dev/st0m		First SCSI tape, mode 2</div><div class='add'>+		 65 = /dev/st1m		Second SCSI tape, mode 2</div><div class='add'>+		    ...</div><div class='add'>+		 96 = /dev/st0a		First SCSI tape, mode 3</div><div class='add'>+		 97 = /dev/st1a		Second SCSI tape, mode 3</div><div class='add'>+		      ...</div><div class='add'>+		128 = /dev/nst0		First SCSI tape, mode 0, no rewind</div><div class='add'>+		129 = /dev/nst1		Second SCSI tape, mode 0, no rewind</div><div class='add'>+		    ...</div><div class='add'>+		160 = /dev/nst0l	First SCSI tape, mode 1, no rewind</div><div class='add'>+		161 = /dev/nst1l	Second SCSI tape, mode 1, no rewind</div><div class='add'>+		    ...</div><div class='add'>+		192 = /dev/nst0m	First SCSI tape, mode 2, no rewind</div><div class='add'>+		193 = /dev/nst1m	Second SCSI tape, mode 2, no rewind</div><div class='add'>+		    ...</div><div class='add'>+		224 = /dev/nst0a	First SCSI tape, mode 3, no rewind</div><div class='add'>+		225 = /dev/nst1a	Second SCSI tape, mode 3, no rewind</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		"No rewind" refers to the omission of the default</div><div class='add'>+		automatic rewind on device close.  The MTREW or MTOFFL</div><div class='add'>+		ioctl()'s can be used to rewind the tape regardless of</div><div class='add'>+		the device used to access it.</div><div class='add'>+</div><div class='add'>+   9 block	Metadisk (RAID) devices</div><div class='add'>+		  0 = /dev/md0		First metadisk group</div><div class='add'>+		  1 = /dev/md1		Second metadisk group</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		The metadisk driver is used to span a</div><div class='add'>+		filesystem across multiple physical disks.</div><div class='add'>+</div><div class='add'>+  10 char	Non-serial mice, misc features</div><div class='add'>+		  0 = /dev/logibm	Logitech bus mouse</div><div class='add'>+		  1 = /dev/psaux	PS/2-style mouse port</div><div class='add'>+		  2 = /dev/inportbm	Microsoft Inport bus mouse</div><div class='add'>+		  3 = /dev/atibm	ATI XL bus mouse</div><div class='add'>+		  4 = /dev/jbm		J-mouse</div><div class='add'>+		  4 = /dev/amigamouse	Amiga mouse (68k/Amiga)</div><div class='add'>+		  5 = /dev/atarimouse	Atari mouse</div><div class='add'>+		  6 = /dev/sunmouse	Sun mouse</div><div class='add'>+		  7 = /dev/amigamouse1	Second Amiga mouse</div><div class='add'>+		  8 = /dev/smouse	Simple serial mouse driver</div><div class='add'>+		  9 = /dev/pc110pad	IBM PC-110 digitizer pad</div><div class='add'>+		 10 = /dev/adbmouse	Apple Desktop Bus mouse</div><div class='add'>+		 11 = /dev/vrtpanel	Vr41xx embedded touch panel</div><div class='add'>+		 13 = /dev/vpcmouse	Connectix Virtual PC Mouse</div><div class='add'>+		 14 = /dev/touchscreen/ucb1x00  UCB 1x00 touchscreen</div><div class='add'>+		 15 = /dev/touchscreen/mk712	MK712 touchscreen</div><div class='add'>+		128 = /dev/beep		Fancy beep device</div><div class='add'>+		129 =</div><div class='add'>+		130 = /dev/watchdog	Watchdog timer port</div><div class='add'>+		131 = /dev/temperature	Machine internal temperature</div><div class='add'>+		132 = /dev/hwtrap	Hardware fault trap</div><div class='add'>+		133 = /dev/exttrp	External device trap</div><div class='add'>+		134 = /dev/apm_bios	Advanced Power Management BIOS</div><div class='add'>+		135 = /dev/rtc		Real Time Clock</div><div class='add'>+		137 = /dev/vhci		Bluetooth virtual HCI driver</div><div class='add'>+		139 = /dev/openprom	SPARC OpenBoot PROM</div><div class='add'>+		140 = /dev/relay8	Berkshire Products Octal relay card</div><div class='add'>+		141 = /dev/relay16	Berkshire Products ISO-16 relay card</div><div class='add'>+		142 =</div><div class='add'>+		143 = /dev/pciconf	PCI configuration space</div><div class='add'>+		144 = /dev/nvram	Non-volatile configuration RAM</div><div class='add'>+		145 = /dev/hfmodem	Soundcard shortwave modem control</div><div class='add'>+		146 = /dev/graphics	Linux/SGI graphics device</div><div class='add'>+		147 = /dev/opengl	Linux/SGI OpenGL pipe</div><div class='add'>+		148 = /dev/gfx		Linux/SGI graphics effects device</div><div class='add'>+		149 = /dev/input/mouse	Linux/SGI Irix emulation mouse</div><div class='add'>+		150 = /dev/input/keyboard Linux/SGI Irix emulation keyboard</div><div class='add'>+		151 = /dev/led		Front panel LEDs</div><div class='add'>+		152 = /dev/kpoll	Kernel Poll Driver</div><div class='add'>+		153 = /dev/mergemem	Memory merge device</div><div class='add'>+		154 = /dev/pmu		Macintosh PowerBook power manager</div><div class='add'>+		155 = /dev/isictl	MultiTech ISICom serial control</div><div class='add'>+		156 = /dev/lcd		Front panel LCD display</div><div class='add'>+		157 = /dev/ac		Applicom Intl Profibus card</div><div class='add'>+		158 = /dev/nwbutton	Netwinder external button</div><div class='add'>+		159 = /dev/nwdebug	Netwinder debug interface</div><div class='add'>+		160 = /dev/nwflash	Netwinder flash memory</div><div class='add'>+		161 = /dev/userdma	User-space DMA access</div><div class='add'>+		162 = /dev/smbus	System Management Bus</div><div class='add'>+		163 = /dev/lik		Logitech Internet Keyboard</div><div class='add'>+		164 = /dev/ipmo		Intel Intelligent Platform Management</div><div class='add'>+		165 = /dev/vmmon	VMware virtual machine monitor</div><div class='add'>+		166 = /dev/i2o/ctl	I2O configuration manager</div><div class='add'>+		167 = /dev/specialix_sxctl Specialix serial control</div><div class='add'>+		168 = /dev/tcldrv	Technology Concepts serial control</div><div class='add'>+		169 = /dev/specialix_rioctl Specialix RIO serial control</div><div class='add'>+		170 = /dev/thinkpad/thinkpad	IBM Thinkpad devices</div><div class='add'>+		171 = /dev/srripc	QNX4 API IPC manager</div><div class='add'>+		172 = /dev/usemaclone	Semaphore clone device</div><div class='add'>+		173 = /dev/ipmikcs	Intelligent Platform Management</div><div class='add'>+		174 = /dev/uctrl	SPARCbook 3 microcontroller</div><div class='add'>+		175 = /dev/agpgart	AGP Graphics Address Remapping Table</div><div class='add'>+		176 = /dev/gtrsc	Gorgy Timing radio clock</div><div class='add'>+		177 = /dev/cbm		Serial CBM bus</div><div class='add'>+		178 = /dev/jsflash	JavaStation OS flash SIMM</div><div class='add'>+		179 = /dev/xsvc		High-speed shared-mem/semaphore service</div><div class='add'>+		180 = /dev/vrbuttons	Vr41xx button input device</div><div class='add'>+		181 = /dev/toshiba	Toshiba laptop SMM support</div><div class='add'>+		182 = /dev/perfctr	Performance-monitoring counters</div><div class='add'>+		183 = /dev/hwrng	Generic random number generator</div><div class='add'>+		184 = /dev/cpu/microcode CPU microcode update interface</div><div class='add'>+		186 = /dev/atomicps	Atomic shapshot of process state data</div><div class='add'>+		187 = /dev/irnet	IrNET device</div><div class='add'>+		188 = /dev/smbusbios	SMBus BIOS</div><div class='add'>+		189 = /dev/ussp_ctl	User space serial port control</div><div class='add'>+		190 = /dev/crash	Mission Critical Linux crash dump facility</div><div class='add'>+		191 = /dev/pcl181	&lt;information missing&gt;</div><div class='add'>+		192 = /dev/nas_xbus	NAS xbus LCD/buttons access</div><div class='add'>+		193 = /dev/d7s		SPARC 7-segment display</div><div class='add'>+		194 = /dev/zkshim	Zero-Knowledge network shim control</div><div class='add'>+		195 = /dev/elographics/e2201	Elographics touchscreen E271-2201</div><div class='add'>+		196 = /dev/vfio/vfio	VFIO userspace driver interface</div><div class='add'>+		197 = /dev/pxa3xx-gcu	PXA3xx graphics controller unit driver</div><div class='add'>+		198 = /dev/sexec	Signed executable interface</div><div class='add'>+		199 = /dev/scanners/cuecat :CueCat barcode scanner</div><div class='add'>+		200 = /dev/net/tun	TAP/TUN network device</div><div class='add'>+		201 = /dev/button/gulpb	Transmeta GULP-B buttons</div><div class='add'>+		202 = /dev/emd/ctl	Enhanced Metadisk RAID (EMD) control</div><div class='add'>+		203 = /dev/cuse		Cuse (character device in user-space)</div><div class='add'>+		204 = /dev/video/em8300		EM8300 DVD decoder control</div><div class='add'>+		205 = /dev/video/em8300_mv	EM8300 DVD decoder video</div><div class='add'>+		206 = /dev/video/em8300_ma	EM8300 DVD decoder audio</div><div class='add'>+		207 = /dev/video/em8300_sp	EM8300 DVD decoder subpicture</div><div class='add'>+		208 = /dev/compaq/cpqphpc	Compaq PCI Hot Plug Controller</div><div class='add'>+		209 = /dev/compaq/cpqrid	Compaq Remote Insight Driver</div><div class='add'>+		210 = /dev/impi/bt	IMPI coprocessor block transfer</div><div class='add'>+		211 = /dev/impi/smic	IMPI coprocessor stream interface</div><div class='add'>+		212 = /dev/watchdogs/0	First watchdog device</div><div class='add'>+		213 = /dev/watchdogs/1	Second watchdog device</div><div class='add'>+		214 = /dev/watchdogs/2	Third watchdog device</div><div class='add'>+		215 = /dev/watchdogs/3	Fourth watchdog device</div><div class='add'>+		216 = /dev/fujitsu/apanel	Fujitsu/Siemens application panel</div><div class='add'>+		217 = /dev/ni/natmotn		National Instruments Motion</div><div class='add'>+		218 = /dev/kchuid	Inter-process chuid control</div><div class='add'>+		219 = /dev/modems/mwave	MWave modem firmware upload</div><div class='add'>+		220 = /dev/mptctl	Message passing technology (MPT) control</div><div class='add'>+		221 = /dev/mvista/hssdsi	Montavista PICMG hot swap system driver</div><div class='add'>+		222 = /dev/mvista/hasi		Montavista PICMG high availability</div><div class='add'>+		223 = /dev/input/uinput		User level driver support for input</div><div class='add'>+		224 = /dev/tpm		TCPA TPM driver</div><div class='add'>+		225 = /dev/pps		Pulse Per Second driver</div><div class='add'>+		226 = /dev/systrace	Systrace device</div><div class='add'>+		227 = /dev/mcelog	X86_64 Machine Check Exception driver</div><div class='add'>+		228 = /dev/hpet		HPET driver</div><div class='add'>+		229 = /dev/fuse		Fuse (virtual filesystem in user-space)</div><div class='add'>+		230 = /dev/midishare	MidiShare driver</div><div class='add'>+		231 = /dev/snapshot	System memory snapshot device</div><div class='add'>+		232 = /dev/kvm		Kernel-based virtual machine (hardware virtualization extensions)</div><div class='add'>+		233 = /dev/kmview	View-OS A process with a view</div><div class='add'>+		234 = /dev/btrfs-control	Btrfs control device</div><div class='add'>+		235 = /dev/autofs	Autofs control device</div><div class='add'>+		236 = /dev/mapper/control	Device-Mapper control device</div><div class='add'>+		237 = /dev/loop-control Loopback control device</div><div class='add'>+		238 = /dev/vhost-net	Host kernel accelerator for virtio net</div><div class='add'>+		239 = /dev/uhid		User-space I/O driver support for HID subsystem</div><div class='add'>+</div><div class='add'>+		240-254			Reserved for local use</div><div class='add'>+		255			Reserved for MISC_DYNAMIC_MINOR</div><div class='add'>+</div><div class='add'>+  11 char	Raw keyboard device	(Linux/SPARC only)</div><div class='add'>+		  0 = /dev/kbd		Raw keyboard device</div><div class='add'>+</div><div class='add'>+  11 char	Serial Mux device	(Linux/PA-RISC only)</div><div class='add'>+		  0 = /dev/ttyB0	First mux port</div><div class='add'>+		  1 = /dev/ttyB1	Second mux port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  11 block	SCSI CD-ROM devices</div><div class='add'>+		  0 = /dev/scd0		First SCSI CD-ROM</div><div class='add'>+		  1 = /dev/scd1		Second SCSI CD-ROM</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		The prefix /dev/sr (instead of /dev/scd) has been deprecated.</div><div class='add'>+</div><div class='add'>+  12 char	QIC-02 tape</div><div class='add'>+		  2 = /dev/ntpqic11	QIC-11, no rewind-on-close</div><div class='add'>+		  3 = /dev/tpqic11	QIC-11, rewind-on-close</div><div class='add'>+		  4 = /dev/ntpqic24	QIC-24, no rewind-on-close</div><div class='add'>+		  5 = /dev/tpqic24	QIC-24, rewind-on-close</div><div class='add'>+		  6 = /dev/ntpqic120	QIC-120, no rewind-on-close</div><div class='add'>+		  7 = /dev/tpqic120	QIC-120, rewind-on-close</div><div class='add'>+		  8 = /dev/ntpqic150	QIC-150, no rewind-on-close</div><div class='add'>+		  9 = /dev/tpqic150	QIC-150, rewind-on-close</div><div class='add'>+</div><div class='add'>+		The device names specified are proposed -- if there</div><div class='add'>+		are "standard" names for these devices, please let me know.</div><div class='add'>+</div><div class='add'>+  12 block</div><div class='add'>+</div><div class='add'>+  13 char	Input core</div><div class='add'>+		  0 = /dev/input/js0	First joystick</div><div class='add'>+		  1 = /dev/input/js1	Second joystick</div><div class='add'>+		    ...</div><div class='add'>+		 32 = /dev/input/mouse0	First mouse</div><div class='add'>+		 33 = /dev/input/mouse1	Second mouse</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/input/mice	Unified mouse</div><div class='add'>+		 64 = /dev/input/event0	First event queue</div><div class='add'>+		 65 = /dev/input/event1	Second event queue</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		Each device type has 5 bits (32 minors).</div><div class='add'>+</div><div class='add'>+  13 block	Previously used for the XT disk (/dev/xdN)</div><div class='add'>+		Deleted in kernel v3.9.</div><div class='add'>+</div><div class='add'>+  14 char	Open Sound System (OSS)</div><div class='add'>+		  0 = /dev/mixer	Mixer control</div><div class='add'>+		  1 = /dev/sequencer	Audio sequencer</div><div class='add'>+		  2 = /dev/midi00	First MIDI port</div><div class='add'>+		  3 = /dev/dsp		Digital audio</div><div class='add'>+		  4 = /dev/audio	Sun-compatible digital audio</div><div class='add'>+		  6 =</div><div class='add'>+		  7 = /dev/audioctl	SPARC audio control device</div><div class='add'>+		  8 = /dev/sequencer2	Sequencer -- alternate device</div><div class='add'>+		 16 = /dev/mixer1	Second soundcard mixer control</div><div class='add'>+		 17 = /dev/patmgr0	Sequencer patch manager</div><div class='add'>+		 18 = /dev/midi01	Second MIDI port</div><div class='add'>+		 19 = /dev/dsp1		Second soundcard digital audio</div><div class='add'>+		 20 = /dev/audio1	Second soundcard Sun digital audio</div><div class='add'>+		 33 = /dev/patmgr1	Sequencer patch manager</div><div class='add'>+		 34 = /dev/midi02	Third MIDI port</div><div class='add'>+		 50 = /dev/midi03	Fourth MIDI port</div><div class='add'>+</div><div class='add'>+  14 block</div><div class='add'>+</div><div class='add'>+  15 char	Joystick</div><div class='add'>+		  0 = /dev/js0		First analog joystick</div><div class='add'>+		  1 = /dev/js1		Second analog joystick</div><div class='add'>+		    ...</div><div class='add'>+		128 = /dev/djs0		First digital joystick</div><div class='add'>+		129 = /dev/djs1		Second digital joystick</div><div class='add'>+		    ...</div><div class='add'>+  15 block	Sony CDU-31A/CDU-33A CD-ROM</div><div class='add'>+		  0 = /dev/sonycd	Sony CDU-31a CD-ROM</div><div class='add'>+</div><div class='add'>+  16 char	Non-SCSI scanners</div><div class='add'>+		  0 = /dev/gs4500	Genius 4500 handheld scanner</div><div class='add'>+</div><div class='add'>+  16 block	GoldStar CD-ROM</div><div class='add'>+		  0 = /dev/gscd		GoldStar CD-ROM</div><div class='add'>+</div><div class='add'>+  17 char	OBSOLETE (was Chase serial card)</div><div class='add'>+		  0 = /dev/ttyH0	First Chase port</div><div class='add'>+		  1 = /dev/ttyH1	Second Chase port</div><div class='add'>+		    ...</div><div class='add'>+  17 block	Optics Storage CD-ROM</div><div class='add'>+		  0 = /dev/optcd	Optics Storage CD-ROM</div><div class='add'>+</div><div class='add'>+  18 char	OBSOLETE (was Chase serial card - alternate devices)</div><div class='add'>+		  0 = /dev/cuh0		Callout device for ttyH0</div><div class='add'>+		  1 = /dev/cuh1		Callout device for ttyH1</div><div class='add'>+		    ...</div><div class='add'>+  18 block	Sanyo CD-ROM</div><div class='add'>+		  0 = /dev/sjcd		Sanyo CD-ROM</div><div class='add'>+</div><div class='add'>+  19 char	Cyclades serial card</div><div class='add'>+		  0 = /dev/ttyC0	First Cyclades port</div><div class='add'>+		    ...</div><div class='add'>+		 31 = /dev/ttyC31	32nd Cyclades port</div><div class='add'>+</div><div class='add'>+  19 block	"Double" compressed disk</div><div class='add'>+		  0 = /dev/double0	First compressed disk</div><div class='add'>+		    ...</div><div class='add'>+		  7 = /dev/double7	Eighth compressed disk</div><div class='add'>+		128 = /dev/cdouble0	Mirror of first compressed disk</div><div class='add'>+		    ...</div><div class='add'>+		135 = /dev/cdouble7	Mirror of eighth compressed disk</div><div class='add'>+</div><div class='add'>+		See the Double documentation for the meaning of the</div><div class='add'>+		mirror devices.</div><div class='add'>+</div><div class='add'>+  20 char	Cyclades serial card - alternate devices</div><div class='add'>+		  0 = /dev/cub0		Callout device for ttyC0</div><div class='add'>+		    ...</div><div class='add'>+		 31 = /dev/cub31	Callout device for ttyC31</div><div class='add'>+</div><div class='add'>+  20 block	Hitachi CD-ROM (under development)</div><div class='add'>+		  0 = /dev/hitcd	Hitachi CD-ROM</div><div class='add'>+</div><div class='add'>+  21 char	Generic SCSI access</div><div class='add'>+		  0 = /dev/sg0		First generic SCSI device</div><div class='add'>+		  1 = /dev/sg1		Second generic SCSI device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		Most distributions name these /dev/sga, /dev/sgb...;</div><div class='add'>+		this sets an unnecessary limit of 26 SCSI devices in</div><div class='add'>+		the system and is counter to standard Linux</div><div class='add'>+		device-naming practice.</div><div class='add'>+</div><div class='add'>+  21 block	Acorn MFM hard drive interface</div><div class='add'>+		  0 = /dev/mfma		First MFM drive whole disk</div><div class='add'>+		 64 = /dev/mfmb		Second MFM drive whole disk</div><div class='add'>+</div><div class='add'>+		This device is used on the ARM-based Acorn RiscPC.</div><div class='add'>+		Partitions are handled the same way as for IDE disks</div><div class='add'>+		(see major number 3).</div><div class='add'>+</div><div class='add'>+  22 char	Digiboard serial card</div><div class='add'>+		  0 = /dev/ttyD0	First Digiboard port</div><div class='add'>+		  1 = /dev/ttyD1	Second Digiboard port</div><div class='add'>+		    ...</div><div class='add'>+  22 block	Second IDE hard disk/CD-ROM interface</div><div class='add'>+		  0 = /dev/hdc		Master: whole disk (or CD-ROM)</div><div class='add'>+		 64 = /dev/hdd		Slave: whole disk (or CD-ROM)</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for the first</div><div class='add'>+		interface (see major number 3).</div><div class='add'>+</div><div class='add'>+  23 char	Digiboard serial card - alternate devices</div><div class='add'>+		  0 = /dev/cud0		Callout device for ttyD0</div><div class='add'>+		  1 = /dev/cud1		Callout device for ttyD1</div><div class='add'>+		      ...</div><div class='add'>+  23 block	Mitsumi proprietary CD-ROM</div><div class='add'>+		  0 = /dev/mcd		Mitsumi CD-ROM</div><div class='add'>+</div><div class='add'>+  24 char	Stallion serial card</div><div class='add'>+		  0 = /dev/ttyE0	Stallion port 0 card 0</div><div class='add'>+		  1 = /dev/ttyE1	Stallion port 1 card 0</div><div class='add'>+		    ...</div><div class='add'>+		 64 = /dev/ttyE64	Stallion port 0 card 1</div><div class='add'>+		 65 = /dev/ttyE65	Stallion port 1 card 1</div><div class='add'>+		      ...</div><div class='add'>+		128 = /dev/ttyE128	Stallion port 0 card 2</div><div class='add'>+		129 = /dev/ttyE129	Stallion port 1 card 2</div><div class='add'>+		    ...</div><div class='add'>+		192 = /dev/ttyE192	Stallion port 0 card 3</div><div class='add'>+		193 = /dev/ttyE193	Stallion port 1 card 3</div><div class='add'>+		    ...</div><div class='add'>+  24 block	Sony CDU-535 CD-ROM</div><div class='add'>+		  0 = /dev/cdu535	Sony CDU-535 CD-ROM</div><div class='add'>+</div><div class='add'>+  25 char	Stallion serial card - alternate devices</div><div class='add'>+		  0 = /dev/cue0		Callout device for ttyE0</div><div class='add'>+		  1 = /dev/cue1		Callout device for ttyE1</div><div class='add'>+		    ...</div><div class='add'>+		 64 = /dev/cue64	Callout device for ttyE64</div><div class='add'>+		 65 = /dev/cue65	Callout device for ttyE65</div><div class='add'>+		    ...</div><div class='add'>+		128 = /dev/cue128	Callout device for ttyE128</div><div class='add'>+		129 = /dev/cue129	Callout device for ttyE129</div><div class='add'>+		    ...</div><div class='add'>+		192 = /dev/cue192	Callout device for ttyE192</div><div class='add'>+		193 = /dev/cue193	Callout device for ttyE193</div><div class='add'>+		      ...</div><div class='add'>+  25 block	First Matsushita (Panasonic/SoundBlaster) CD-ROM</div><div class='add'>+		  0 = /dev/sbpcd0	Panasonic CD-ROM controller 0 unit 0</div><div class='add'>+		  1 = /dev/sbpcd1	Panasonic CD-ROM controller 0 unit 1</div><div class='add'>+		  2 = /dev/sbpcd2	Panasonic CD-ROM controller 0 unit 2</div><div class='add'>+		  3 = /dev/sbpcd3	Panasonic CD-ROM controller 0 unit 3</div><div class='add'>+</div><div class='add'>+  26 char</div><div class='add'>+</div><div class='add'>+  26 block	Second Matsushita (Panasonic/SoundBlaster) CD-ROM</div><div class='add'>+		  0 = /dev/sbpcd4	Panasonic CD-ROM controller 1 unit 0</div><div class='add'>+		  1 = /dev/sbpcd5	Panasonic CD-ROM controller 1 unit 1</div><div class='add'>+		  2 = /dev/sbpcd6	Panasonic CD-ROM controller 1 unit 2</div><div class='add'>+		  3 = /dev/sbpcd7	Panasonic CD-ROM controller 1 unit 3</div><div class='add'>+</div><div class='add'>+  27 char	QIC-117 tape</div><div class='add'>+		  0 = /dev/qft0		Unit 0, rewind-on-close</div><div class='add'>+		  1 = /dev/qft1		Unit 1, rewind-on-close</div><div class='add'>+		  2 = /dev/qft2		Unit 2, rewind-on-close</div><div class='add'>+		  3 = /dev/qft3		Unit 3, rewind-on-close</div><div class='add'>+		  4 = /dev/nqft0	Unit 0, no rewind-on-close</div><div class='add'>+		  5 = /dev/nqft1	Unit 1, no rewind-on-close</div><div class='add'>+		  6 = /dev/nqft2	Unit 2, no rewind-on-close</div><div class='add'>+		  7 = /dev/nqft3	Unit 3, no rewind-on-close</div><div class='add'>+		 16 = /dev/zqft0	Unit 0, rewind-on-close, compression</div><div class='add'>+		 17 = /dev/zqft1	Unit 1, rewind-on-close, compression</div><div class='add'>+		 18 = /dev/zqft2	Unit 2, rewind-on-close, compression</div><div class='add'>+		 19 = /dev/zqft3	Unit 3, rewind-on-close, compression</div><div class='add'>+		 20 = /dev/nzqft0	Unit 0, no rewind-on-close, compression</div><div class='add'>+		 21 = /dev/nzqft1	Unit 1, no rewind-on-close, compression</div><div class='add'>+		 22 = /dev/nzqft2	Unit 2, no rewind-on-close, compression</div><div class='add'>+		 23 = /dev/nzqft3	Unit 3, no rewind-on-close, compression</div><div class='add'>+		 32 = /dev/rawqft0	Unit 0, rewind-on-close, no file marks</div><div class='add'>+		 33 = /dev/rawqft1	Unit 1, rewind-on-close, no file marks</div><div class='add'>+		 34 = /dev/rawqft2	Unit 2, rewind-on-close, no file marks</div><div class='add'>+		 35 = /dev/rawqft3	Unit 3, rewind-on-close, no file marks</div><div class='add'>+		 36 = /dev/nrawqft0	Unit 0, no rewind-on-close, no file marks</div><div class='add'>+		 37 = /dev/nrawqft1	Unit 1, no rewind-on-close, no file marks</div><div class='add'>+		 38 = /dev/nrawqft2	Unit 2, no rewind-on-close, no file marks</div><div class='add'>+		 39 = /dev/nrawqft3	Unit 3, no rewind-on-close, no file marks</div><div class='add'>+</div><div class='add'>+  27 block	Third Matsushita (Panasonic/SoundBlaster) CD-ROM</div><div class='add'>+		  0 = /dev/sbpcd8	Panasonic CD-ROM controller 2 unit 0</div><div class='add'>+		  1 = /dev/sbpcd9	Panasonic CD-ROM controller 2 unit 1</div><div class='add'>+		  2 = /dev/sbpcd10	Panasonic CD-ROM controller 2 unit 2</div><div class='add'>+		  3 = /dev/sbpcd11	Panasonic CD-ROM controller 2 unit 3</div><div class='add'>+</div><div class='add'>+  28 char	Stallion serial card - card programming</div><div class='add'>+		  0 = /dev/staliomem0	First Stallion card I/O memory</div><div class='add'>+		  1 = /dev/staliomem1	Second Stallion card I/O memory</div><div class='add'>+		  2 = /dev/staliomem2	Third Stallion card I/O memory</div><div class='add'>+		  3 = /dev/staliomem3	Fourth Stallion card I/O memory</div><div class='add'>+</div><div class='add'>+  28 char	Atari SLM ACSI laser printer (68k/Atari)</div><div class='add'>+		  0 = /dev/slm0		First SLM laser printer</div><div class='add'>+		  1 = /dev/slm1		Second SLM laser printer</div><div class='add'>+		    ...</div><div class='add'>+  28 block	Fourth Matsushita (Panasonic/SoundBlaster) CD-ROM</div><div class='add'>+		  0 = /dev/sbpcd12	Panasonic CD-ROM controller 3 unit 0</div><div class='add'>+		  1 = /dev/sbpcd13	Panasonic CD-ROM controller 3 unit 1</div><div class='add'>+		  2 = /dev/sbpcd14	Panasonic CD-ROM controller 3 unit 2</div><div class='add'>+		  3 = /dev/sbpcd15	Panasonic CD-ROM controller 3 unit 3</div><div class='add'>+</div><div class='add'>+  28 block	ACSI disk (68k/Atari)</div><div class='add'>+		  0 = /dev/ada		First ACSI disk whole disk</div><div class='add'>+		 16 = /dev/adb		Second ACSI disk whole disk</div><div class='add'>+		 32 = /dev/adc		Third ACSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/adp		16th ACSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15, like SCSI.</div><div class='add'>+</div><div class='add'>+  29 char	Universal frame buffer</div><div class='add'>+		  0 = /dev/fb0		First frame buffer</div><div class='add'>+		  1 = /dev/fb1		Second frame buffer</div><div class='add'>+		    ...</div><div class='add'>+		 31 = /dev/fb31		32nd frame buffer</div><div class='add'>+</div><div class='add'>+  29 block	Aztech/Orchid/Okano/Wearnes CD-ROM</div><div class='add'>+		  0 = /dev/aztcd	Aztech CD-ROM</div><div class='add'>+</div><div class='add'>+  30 char	iBCS-2 compatibility devices</div><div class='add'>+		  0 = /dev/socksys	Socket access</div><div class='add'>+		  1 = /dev/spx		SVR3 local X interface</div><div class='add'>+		 32 = /dev/inet/ip	Network access</div><div class='add'>+		 33 = /dev/inet/icmp</div><div class='add'>+		 34 = /dev/inet/ggp</div><div class='add'>+		 35 = /dev/inet/ipip</div><div class='add'>+		 36 = /dev/inet/tcp</div><div class='add'>+		 37 = /dev/inet/egp</div><div class='add'>+		 38 = /dev/inet/pup</div><div class='add'>+		 39 = /dev/inet/udp</div><div class='add'>+		 40 = /dev/inet/idp</div><div class='add'>+		 41 = /dev/inet/rawip</div><div class='add'>+</div><div class='add'>+		Additionally, iBCS-2 requires the following links:</div><div class='add'>+</div><div class='add'>+		/dev/ip -&gt; /dev/inet/ip</div><div class='add'>+		/dev/icmp -&gt; /dev/inet/icmp</div><div class='add'>+		/dev/ggp -&gt; /dev/inet/ggp</div><div class='add'>+		/dev/ipip -&gt; /dev/inet/ipip</div><div class='add'>+		/dev/tcp -&gt; /dev/inet/tcp</div><div class='add'>+		/dev/egp -&gt; /dev/inet/egp</div><div class='add'>+		/dev/pup -&gt; /dev/inet/pup</div><div class='add'>+		/dev/udp -&gt; /dev/inet/udp</div><div class='add'>+		/dev/idp -&gt; /dev/inet/idp</div><div class='add'>+		/dev/rawip -&gt; /dev/inet/rawip</div><div class='add'>+		/dev/inet/arp -&gt; /dev/inet/udp</div><div class='add'>+		/dev/inet/rip -&gt; /dev/inet/udp</div><div class='add'>+		/dev/nfsd -&gt; /dev/socksys</div><div class='add'>+		/dev/X0R -&gt; /dev/null (? apparently not required ?)</div><div class='add'>+</div><div class='add'>+  30 block	Philips LMS CM-205 CD-ROM</div><div class='add'>+		  0 = /dev/cm205cd	Philips LMS CM-205 CD-ROM</div><div class='add'>+</div><div class='add'>+		/dev/lmscd is an older name for this device.  This</div><div class='add'>+		driver does not work with the CM-205MS CD-ROM.</div><div class='add'>+</div><div class='add'>+  31 char	MPU-401 MIDI</div><div class='add'>+		  0 = /dev/mpu401data	MPU-401 data port</div><div class='add'>+		  1 = /dev/mpu401stat	MPU-401 status port</div><div class='add'>+</div><div class='add'>+  31 block	ROM/flash memory card</div><div class='add'>+		  0 = /dev/rom0		First ROM card (rw)</div><div class='add'>+		      ...</div><div class='add'>+		  7 = /dev/rom7		Eighth ROM card (rw)</div><div class='add'>+		  8 = /dev/rrom0	First ROM card (ro)</div><div class='add'>+		    ...</div><div class='add'>+		 15 = /dev/rrom7	Eighth ROM card (ro)</div><div class='add'>+		 16 = /dev/flash0	First flash memory card (rw)</div><div class='add'>+		    ...</div><div class='add'>+		 23 = /dev/flash7	Eighth flash memory card (rw)</div><div class='add'>+		 24 = /dev/rflash0	First flash memory card (ro)</div><div class='add'>+		    ...</div><div class='add'>+		 31 = /dev/rflash7	Eighth flash memory card (ro)</div><div class='add'>+</div><div class='add'>+		The read-write (rw) devices support back-caching</div><div class='add'>+		written data in RAM, as well as writing to flash RAM</div><div class='add'>+		devices.  The read-only devices (ro) support reading</div><div class='add'>+		only.</div><div class='add'>+</div><div class='add'>+  32 char	Specialix serial card</div><div class='add'>+		  0 = /dev/ttyX0	First Specialix port</div><div class='add'>+		  1 = /dev/ttyX1	Second Specialix port</div><div class='add'>+		    ...</div><div class='add'>+  32 block	Philips LMS CM-206 CD-ROM</div><div class='add'>+		  0 = /dev/cm206cd	Philips LMS CM-206 CD-ROM</div><div class='add'>+</div><div class='add'>+  33 char	Specialix serial card - alternate devices</div><div class='add'>+		  0 = /dev/cux0		Callout device for ttyX0</div><div class='add'>+		  1 = /dev/cux1		Callout device for ttyX1</div><div class='add'>+		    ...</div><div class='add'>+  33 block	Third IDE hard disk/CD-ROM interface</div><div class='add'>+		  0 = /dev/hde		Master: whole disk (or CD-ROM)</div><div class='add'>+		 64 = /dev/hdf		Slave: whole disk (or CD-ROM)</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for the first</div><div class='add'>+		interface (see major number 3).</div><div class='add'>+</div><div class='add'>+  34 char	Z8530 HDLC driver</div><div class='add'>+		  0 = /dev/scc0		First Z8530, first port</div><div class='add'>+		  1 = /dev/scc1		First Z8530, second port</div><div class='add'>+		  2 = /dev/scc2		Second Z8530, first port</div><div class='add'>+		  3 = /dev/scc3		Second Z8530, second port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		In a previous version these devices were named</div><div class='add'>+		/dev/sc1 for /dev/scc0, /dev/sc2 for /dev/scc1, and so</div><div class='add'>+		on.</div><div class='add'>+</div><div class='add'>+  34 block	Fourth IDE hard disk/CD-ROM interface</div><div class='add'>+		  0 = /dev/hdg		Master: whole disk (or CD-ROM)</div><div class='add'>+		 64 = /dev/hdh		Slave: whole disk (or CD-ROM)</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for the first</div><div class='add'>+		interface (see major number 3).</div><div class='add'>+</div><div class='add'>+  35 char	tclmidi MIDI driver</div><div class='add'>+		  0 = /dev/midi0	First MIDI port, kernel timed</div><div class='add'>+		  1 = /dev/midi1	Second MIDI port, kernel timed</div><div class='add'>+		  2 = /dev/midi2	Third MIDI port, kernel timed</div><div class='add'>+		  3 = /dev/midi3	Fourth MIDI port, kernel timed</div><div class='add'>+		 64 = /dev/rmidi0	First MIDI port, untimed</div><div class='add'>+		 65 = /dev/rmidi1	Second MIDI port, untimed</div><div class='add'>+		 66 = /dev/rmidi2	Third MIDI port, untimed</div><div class='add'>+		 67 = /dev/rmidi3	Fourth MIDI port, untimed</div><div class='add'>+		128 = /dev/smpte0	First MIDI port, SMPTE timed</div><div class='add'>+		129 = /dev/smpte1	Second MIDI port, SMPTE timed</div><div class='add'>+		130 = /dev/smpte2	Third MIDI port, SMPTE timed</div><div class='add'>+		131 = /dev/smpte3	Fourth MIDI port, SMPTE timed</div><div class='add'>+</div><div class='add'>+  35 block	Slow memory ramdisk</div><div class='add'>+		  0 = /dev/slram	Slow memory ramdisk</div><div class='add'>+</div><div class='add'>+  36 char	Netlink support</div><div class='add'>+		  0 = /dev/route	Routing, device updates, kernel to user</div><div class='add'>+		  1 = /dev/skip		enSKIP security cache control</div><div class='add'>+		  3 = /dev/fwmonitor	Firewall packet copies</div><div class='add'>+		 16 = /dev/tap0		First Ethertap device</div><div class='add'>+		    ...</div><div class='add'>+		 31 = /dev/tap15	16th Ethertap device</div><div class='add'>+</div><div class='add'>+  36 block	OBSOLETE (was MCA ESDI hard disk)</div><div class='add'>+</div><div class='add'>+  37 char	IDE tape</div><div class='add'>+		  0 = /dev/ht0		First IDE tape</div><div class='add'>+		  1 = /dev/ht1		Second IDE tape</div><div class='add'>+		    ...</div><div class='add'>+		128 = /dev/nht0		First IDE tape, no rewind-on-close</div><div class='add'>+		129 = /dev/nht1		Second IDE tape, no rewind-on-close</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		Currently, only one IDE tape drive is supported.</div><div class='add'>+</div><div class='add'>+  37 block	Zorro II ramdisk</div><div class='add'>+		  0 = /dev/z2ram	Zorro II ramdisk</div><div class='add'>+</div><div class='add'>+  38 char	Myricom PCI Myrinet board</div><div class='add'>+		  0 = /dev/mlanai0	First Myrinet board</div><div class='add'>+		  1 = /dev/mlanai1	Second Myrinet board</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		This device is used for status query, board control</div><div class='add'>+		and "user level packet I/O."  This board is also</div><div class='add'>+		accessible as a standard networking "eth" device.</div><div class='add'>+</div><div class='add'>+  38 block	OBSOLETE (was Linux/AP+)</div><div class='add'>+</div><div class='add'>+  39 char	ML-16P experimental I/O board</div><div class='add'>+		  0 = /dev/ml16pa-a0	First card, first analog channel</div><div class='add'>+		  1 = /dev/ml16pa-a1	First card, second analog channel</div><div class='add'>+		    ...</div><div class='add'>+		 15 = /dev/ml16pa-a15	First card, 16th analog channel</div><div class='add'>+		 16 = /dev/ml16pa-d	First card, digital lines</div><div class='add'>+		 17 = /dev/ml16pa-c0	First card, first counter/timer</div><div class='add'>+		 18 = /dev/ml16pa-c1	First card, second counter/timer</div><div class='add'>+		 19 = /dev/ml16pa-c2	First card, third counter/timer</div><div class='add'>+		 32 = /dev/ml16pb-a0	Second card, first analog channel</div><div class='add'>+		 33 = /dev/ml16pb-a1	Second card, second analog channel</div><div class='add'>+		    ...</div><div class='add'>+		 47 = /dev/ml16pb-a15	Second card, 16th analog channel</div><div class='add'>+		 48 = /dev/ml16pb-d	Second card, digital lines</div><div class='add'>+		 49 = /dev/ml16pb-c0	Second card, first counter/timer</div><div class='add'>+		 50 = /dev/ml16pb-c1	Second card, second counter/timer</div><div class='add'>+		 51 = /dev/ml16pb-c2	Second card, third counter/timer</div><div class='add'>+		      ...</div><div class='add'>+  39 block</div><div class='add'>+</div><div class='add'>+  40 char</div><div class='add'>+</div><div class='add'>+  40 block</div><div class='add'>+</div><div class='add'>+  41 char	Yet Another Micro Monitor</div><div class='add'>+		  0 = /dev/yamm		Yet Another Micro Monitor</div><div class='add'>+</div><div class='add'>+  41 block</div><div class='add'>+</div><div class='add'>+  42 char	Demo/sample use</div><div class='add'>+</div><div class='add'>+  42 block	Demo/sample use</div><div class='add'>+</div><div class='add'>+		This number is intended for use in sample code, as</div><div class='add'>+		well as a general "example" device number.  It</div><div class='add'>+		should never be used for a device driver that is being</div><div class='add'>+		distributed; either obtain an official number or use</div><div class='add'>+		the local/experimental range.  The sudden addition or</div><div class='add'>+		removal of a driver with this number should not cause</div><div class='add'>+		ill effects to the system (bugs excepted.)</div><div class='add'>+</div><div class='add'>+		IN PARTICULAR, ANY DISTRIBUTION WHICH CONTAINS A</div><div class='add'>+		DEVICE DRIVER USING MAJOR NUMBER 42 IS NONCOMPLIANT.</div><div class='add'>+</div><div class='add'>+  43 char	isdn4linux virtual modem</div><div class='add'>+		  0 = /dev/ttyI0	First virtual modem</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/ttyI63	64th virtual modem</div><div class='add'>+</div><div class='add'>+  43 block	Network block devices</div><div class='add'>+		  0 = /dev/nb0		First network block device</div><div class='add'>+		  1 = /dev/nb1		Second network block device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		Network Block Device is somehow similar to loopback</div><div class='add'>+		devices: If you read from it, it sends packet across</div><div class='add'>+		network asking server for data. If you write to it, it</div><div class='add'>+		sends packet telling server to write. It could be used</div><div class='add'>+		to mounting filesystems over the net, swapping over</div><div class='add'>+		the net, implementing block device in userland etc.</div><div class='add'>+</div><div class='add'>+  44 char	isdn4linux virtual modem - alternate devices</div><div class='add'>+		  0 = /dev/cui0		Callout device for ttyI0</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/cui63	Callout device for ttyI63</div><div class='add'>+</div><div class='add'>+  44 block	Flash Translation Layer (FTL) filesystems</div><div class='add'>+		  0 = /dev/ftla		FTL on first Memory Technology Device</div><div class='add'>+		 16 = /dev/ftlb		FTL on second Memory Technology Device</div><div class='add'>+		 32 = /dev/ftlc		FTL on third Memory Technology Device</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/ftlp		FTL on 16th Memory Technology Device</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the partition</div><div class='add'>+		limit is 15 rather than 63 per disk (same as SCSI.)</div><div class='add'>+</div><div class='add'>+  45 char	isdn4linux ISDN BRI driver</div><div class='add'>+		  0 = /dev/isdn0	First virtual B channel raw data</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/isdn63	64th virtual B channel raw data</div><div class='add'>+		 64 = /dev/isdnctrl0	First channel control/debug</div><div class='add'>+		    ...</div><div class='add'>+		127 = /dev/isdnctrl63	64th channel control/debug</div><div class='add'>+</div><div class='add'>+		128 = /dev/ippp0	First SyncPPP device</div><div class='add'>+		    ...</div><div class='add'>+		191 = /dev/ippp63	64th SyncPPP device</div><div class='add'>+</div><div class='add'>+		255 = /dev/isdninfo	ISDN monitor interface</div><div class='add'>+</div><div class='add'>+  45 block	Parallel port IDE disk devices</div><div class='add'>+		  0 = /dev/pda		First parallel port IDE disk</div><div class='add'>+		 16 = /dev/pdb		Second parallel port IDE disk</div><div class='add'>+		 32 = /dev/pdc		Third parallel port IDE disk</div><div class='add'>+		 48 = /dev/pdd		Fourth parallel port IDE disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the partition</div><div class='add'>+		limit is 15 rather than 63 per disk.</div><div class='add'>+</div><div class='add'>+  46 char	Comtrol Rocketport serial card</div><div class='add'>+		  0 = /dev/ttyR0	First Rocketport port</div><div class='add'>+		  1 = /dev/ttyR1	Second Rocketport port</div><div class='add'>+		    ...</div><div class='add'>+  46 block	Parallel port ATAPI CD-ROM devices</div><div class='add'>+		  0 = /dev/pcd0		First parallel port ATAPI CD-ROM</div><div class='add'>+		  1 = /dev/pcd1		Second parallel port ATAPI CD-ROM</div><div class='add'>+		  2 = /dev/pcd2		Third parallel port ATAPI CD-ROM</div><div class='add'>+		  3 = /dev/pcd3		Fourth parallel port ATAPI CD-ROM</div><div class='add'>+</div><div class='add'>+  47 char	Comtrol Rocketport serial card - alternate devices</div><div class='add'>+		  0 = /dev/cur0		Callout device for ttyR0</div><div class='add'>+		  1 = /dev/cur1		Callout device for ttyR1</div><div class='add'>+		    ...</div><div class='add'>+  47 block	Parallel port ATAPI disk devices</div><div class='add'>+		  0 = /dev/pf0		First parallel port ATAPI disk</div><div class='add'>+		  1 = /dev/pf1		Second parallel port ATAPI disk</div><div class='add'>+		  2 = /dev/pf2		Third parallel port ATAPI disk</div><div class='add'>+		  3 = /dev/pf3		Fourth parallel port ATAPI disk</div><div class='add'>+</div><div class='add'>+		This driver is intended for floppy disks and similar</div><div class='add'>+		devices and hence does not support partitioning.</div><div class='add'>+</div><div class='add'>+  48 char	SDL RISCom serial card</div><div class='add'>+		  0 = /dev/ttyL0	First RISCom port</div><div class='add'>+		  1 = /dev/ttyL1	Second RISCom port</div><div class='add'>+		    ...</div><div class='add'>+  48 block	Mylex DAC960 PCI RAID controller; first controller</div><div class='add'>+		  0 = /dev/rd/c0d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c0d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c0d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		For partitions add:</div><div class='add'>+		  0 = /dev/rd/c?d?	Whole disk</div><div class='add'>+		  1 = /dev/rd/c?d?p1	First partition</div><div class='add'>+		    ...</div><div class='add'>+		  7 = /dev/rd/c?d?p7	Seventh partition</div><div class='add'>+</div><div class='add'>+  49 char	SDL RISCom serial card - alternate devices</div><div class='add'>+		  0 = /dev/cul0		Callout device for ttyL0</div><div class='add'>+		  1 = /dev/cul1		Callout device for ttyL1</div><div class='add'>+		    ...</div><div class='add'>+  49 block	Mylex DAC960 PCI RAID controller; second controller</div><div class='add'>+		  0 = /dev/rd/c1d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c1d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c1d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+  50 char	Reserved for GLINT</div><div class='add'>+</div><div class='add'>+  50 block	Mylex DAC960 PCI RAID controller; third controller</div><div class='add'>+		  0 = /dev/rd/c2d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c2d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c2d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+  51 char	Baycom radio modem OR Radio Tech BIM-XXX-RS232 radio modem</div><div class='add'>+		  0 = /dev/bc0		First Baycom radio modem</div><div class='add'>+		  1 = /dev/bc1		Second Baycom radio modem</div><div class='add'>+		    ...</div><div class='add'>+  51 block	Mylex DAC960 PCI RAID controller; fourth controller</div><div class='add'>+		  0 = /dev/rd/c3d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c3d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c3d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+  52 char	Spellcaster DataComm/BRI ISDN card</div><div class='add'>+		  0 = /dev/dcbri0	First DataComm card</div><div class='add'>+		  1 = /dev/dcbri1	Second DataComm card</div><div class='add'>+		  2 = /dev/dcbri2	Third DataComm card</div><div class='add'>+		  3 = /dev/dcbri3	Fourth DataComm card</div><div class='add'>+</div><div class='add'>+  52 block	Mylex DAC960 PCI RAID controller; fifth controller</div><div class='add'>+		  0 = /dev/rd/c4d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c4d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c4d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+  53 char	BDM interface for remote debugging MC683xx microcontrollers</div><div class='add'>+		  0 = /dev/pd_bdm0	PD BDM interface on lp0</div><div class='add'>+		  1 = /dev/pd_bdm1	PD BDM interface on lp1</div><div class='add'>+		  2 = /dev/pd_bdm2	PD BDM interface on lp2</div><div class='add'>+		  4 = /dev/icd_bdm0	ICD BDM interface on lp0</div><div class='add'>+		  5 = /dev/icd_bdm1	ICD BDM interface on lp1</div><div class='add'>+		  6 = /dev/icd_bdm2	ICD BDM interface on lp2</div><div class='add'>+</div><div class='add'>+		This device is used for the interfacing to the MC683xx</div><div class='add'>+		microcontrollers via Background Debug Mode by use of a</div><div class='add'>+		Parallel Port interface. PD is the Motorola Public</div><div class='add'>+		Domain Interface and ICD is the commercial interface</div><div class='add'>+		by P&amp;E.</div><div class='add'>+</div><div class='add'>+  53 block	Mylex DAC960 PCI RAID controller; sixth controller</div><div class='add'>+		  0 = /dev/rd/c5d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c5d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c5d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+  54 char	Electrocardiognosis Holter serial card</div><div class='add'>+		  0 = /dev/holter0	First Holter port</div><div class='add'>+		  1 = /dev/holter1	Second Holter port</div><div class='add'>+		  2 = /dev/holter2	Third Holter port</div><div class='add'>+</div><div class='add'>+		A custom serial card used by Electrocardiognosis SRL</div><div class='add'>+		&lt;mseritan@ottonel.pub.ro&gt; to transfer data from Holter</div><div class='add'>+		24-hour heart monitoring equipment.</div><div class='add'>+</div><div class='add'>+  54 block	Mylex DAC960 PCI RAID controller; seventh controller</div><div class='add'>+		  0 = /dev/rd/c6d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c6d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c6d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+  55 char	DSP56001 digital signal processor</div><div class='add'>+		  0 = /dev/dsp56k	First DSP56001</div><div class='add'>+</div><div class='add'>+  55 block	Mylex DAC960 PCI RAID controller; eighth controller</div><div class='add'>+		  0 = /dev/rd/c7d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c7d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c7d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+  56 char	Apple Desktop Bus</div><div class='add'>+		  0 = /dev/adb		ADB bus control</div><div class='add'>+</div><div class='add'>+		Additional devices will be added to this number, all</div><div class='add'>+		starting with /dev/adb.</div><div class='add'>+</div><div class='add'>+  56 block	Fifth IDE hard disk/CD-ROM interface</div><div class='add'>+		  0 = /dev/hdi		Master: whole disk (or CD-ROM)</div><div class='add'>+		 64 = /dev/hdj		Slave: whole disk (or CD-ROM)</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for the first</div><div class='add'>+		interface (see major number 3).</div><div class='add'>+</div><div class='add'>+  57 char	Hayes ESP serial card</div><div class='add'>+		  0 = /dev/ttyP0	First ESP port</div><div class='add'>+		  1 = /dev/ttyP1	Second ESP port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  57 block	Sixth IDE hard disk/CD-ROM interface</div><div class='add'>+		  0 = /dev/hdk		Master: whole disk (or CD-ROM)</div><div class='add'>+		 64 = /dev/hdl		Slave: whole disk (or CD-ROM)</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for the first</div><div class='add'>+		interface (see major number 3).</div><div class='add'>+</div><div class='add'>+  58 char	Hayes ESP serial card - alternate devices</div><div class='add'>+		  0 = /dev/cup0		Callout device for ttyP0</div><div class='add'>+		  1 = /dev/cup1		Callout device for ttyP1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  58 block	Reserved for logical volume manager</div><div class='add'>+</div><div class='add'>+  59 char	sf firewall package</div><div class='add'>+		  0 = /dev/firewall	Communication with sf kernel module</div><div class='add'>+</div><div class='add'>+  59 block	Generic PDA filesystem device</div><div class='add'>+		  0 = /dev/pda0		First PDA device</div><div class='add'>+		  1 = /dev/pda1		Second PDA device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		The pda devices are used to mount filesystems on</div><div class='add'>+		remote pda's (basically slow handheld machines with</div><div class='add'>+		proprietary OS's and limited memory and storage</div><div class='add'>+		running small fs translation drivers) through serial /</div><div class='add'>+		IRDA / parallel links.</div><div class='add'>+</div><div class='add'>+		NAMING CONFLICT -- PROPOSED REVISED NAME /dev/rpda0 etc</div><div class='add'>+</div><div class='add'>+  60-63 char	LOCAL/EXPERIMENTAL USE</div><div class='add'>+</div><div class='add'>+  60-63 block	LOCAL/EXPERIMENTAL USE</div><div class='add'>+		Allocated for local/experimental use.  For devices not</div><div class='add'>+		assigned official numbers, these ranges should be</div><div class='add'>+		used in order to avoid conflicting with future assignments.</div><div class='add'>+</div><div class='add'>+  64 char	ENskip kernel encryption package</div><div class='add'>+		  0 = /dev/enskip	Communication with ENskip kernel module</div><div class='add'>+</div><div class='add'>+  64 block	Scramdisk/DriveCrypt encrypted devices</div><div class='add'>+		  0 = /dev/scramdisk/master    Master node for ioctls</div><div class='add'>+		  1 = /dev/scramdisk/1         First encrypted device</div><div class='add'>+		  2 = /dev/scramdisk/2         Second encrypted device</div><div class='add'>+		  ...</div><div class='add'>+		255 = /dev/scramdisk/255       255th encrypted device</div><div class='add'>+</div><div class='add'>+		The filename of the encrypted container and the passwords</div><div class='add'>+		are sent via ioctls (using the sdmount tool) to the master</div><div class='add'>+		node which then activates them via one of the</div><div class='add'>+		/dev/scramdisk/x nodes for loop mounting (all handled</div><div class='add'>+		through the sdmount tool).</div><div class='add'>+</div><div class='add'>+		Requested by: andy@scramdisklinux.org</div><div class='add'>+</div><div class='add'>+  65 char	Sundance "plink" Transputer boards (obsolete, unused)</div><div class='add'>+		  0 = /dev/plink0	First plink device</div><div class='add'>+		  1 = /dev/plink1	Second plink device</div><div class='add'>+		  2 = /dev/plink2	Third plink device</div><div class='add'>+		  3 = /dev/plink3	Fourth plink device</div><div class='add'>+		 64 = /dev/rplink0	First plink device, raw</div><div class='add'>+		 65 = /dev/rplink1	Second plink device, raw</div><div class='add'>+		 66 = /dev/rplink2	Third plink device, raw</div><div class='add'>+		 67 = /dev/rplink3	Fourth plink device, raw</div><div class='add'>+		128 = /dev/plink0d	First plink device, debug</div><div class='add'>+		129 = /dev/plink1d	Second plink device, debug</div><div class='add'>+		130 = /dev/plink2d	Third plink device, debug</div><div class='add'>+		131 = /dev/plink3d	Fourth plink device, debug</div><div class='add'>+		192 = /dev/rplink0d	First plink device, raw, debug</div><div class='add'>+		193 = /dev/rplink1d	Second plink device, raw, debug</div><div class='add'>+		194 = /dev/rplink2d	Third plink device, raw, debug</div><div class='add'>+		195 = /dev/rplink3d	Fourth plink device, raw, debug</div><div class='add'>+</div><div class='add'>+		This is a commercial driver; contact James Howes</div><div class='add'>+		&lt;jth@prosig.demon.co.uk&gt; for information.</div><div class='add'>+</div><div class='add'>+  65 block	SCSI disk devices (16-31)</div><div class='add'>+		  0 = /dev/sdq		17th SCSI disk whole disk</div><div class='add'>+		 16 = /dev/sdr		18th SCSI disk whole disk</div><div class='add'>+		 32 = /dev/sds		19th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/sdaf		32nd SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  66 char	YARC PowerPC PCI coprocessor card</div><div class='add'>+		  0 = /dev/yppcpci0	First YARC card</div><div class='add'>+		  1 = /dev/yppcpci1	Second YARC card</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  66 block	SCSI disk devices (32-47)</div><div class='add'>+		  0 = /dev/sdag		33th SCSI disk whole disk</div><div class='add'>+		 16 = /dev/sdah		34th SCSI disk whole disk</div><div class='add'>+		 32 = /dev/sdai		35th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/sdav		48nd SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  67 char	Coda network file system</div><div class='add'>+		  0 = /dev/cfs0		Coda cache manager</div><div class='add'>+</div><div class='add'>+		See http://www.coda.cs.cmu.edu for information about Coda.</div><div class='add'>+</div><div class='add'>+  67 block	SCSI disk devices (48-63)</div><div class='add'>+		  0 = /dev/sdaw		49th SCSI disk whole disk</div><div class='add'>+		 16 = /dev/sdax		50th SCSI disk whole disk</div><div class='add'>+		 32 = /dev/sday		51st SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/sdbl		64th SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  68 char	CAPI 2.0 interface</div><div class='add'>+		  0 = /dev/capi20	Control device</div><div class='add'>+		  1 = /dev/capi20.00	First CAPI 2.0 application</div><div class='add'>+		  2 = /dev/capi20.01	Second CAPI 2.0 application</div><div class='add'>+		    ...</div><div class='add'>+		 20 = /dev/capi20.19	19th CAPI 2.0 application</div><div class='add'>+</div><div class='add'>+		ISDN CAPI 2.0 driver for use with CAPI 2.0</div><div class='add'>+		applications; currently supports the AVM B1 card.</div><div class='add'>+</div><div class='add'>+  68 block	SCSI disk devices (64-79)</div><div class='add'>+		  0 = /dev/sdbm		65th SCSI disk whole disk</div><div class='add'>+		 16 = /dev/sdbn		66th SCSI disk whole disk</div><div class='add'>+		 32 = /dev/sdbo		67th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/sdcb		80th SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  69 char	MA16 numeric accelerator card</div><div class='add'>+		  0 = /dev/ma16		Board memory access</div><div class='add'>+</div><div class='add'>+  69 block	SCSI disk devices (80-95)</div><div class='add'>+		  0 = /dev/sdcc		81st SCSI disk whole disk</div><div class='add'>+		 16 = /dev/sdcd		82nd SCSI disk whole disk</div><div class='add'>+		 32 = /dev/sdce		83th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/sdcr		96th SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  70 char	SpellCaster Protocol Services Interface</div><div class='add'>+		  0 = /dev/apscfg	Configuration interface</div><div class='add'>+		  1 = /dev/apsauth	Authentication interface</div><div class='add'>+		  2 = /dev/apslog	Logging interface</div><div class='add'>+		  3 = /dev/apsdbg	Debugging interface</div><div class='add'>+		 64 = /dev/apsisdn	ISDN command interface</div><div class='add'>+		 65 = /dev/apsasync	Async command interface</div><div class='add'>+		128 = /dev/apsmon	Monitor interface</div><div class='add'>+</div><div class='add'>+  70 block	SCSI disk devices (96-111)</div><div class='add'>+		  0 = /dev/sdcs		97th SCSI disk whole disk</div><div class='add'>+		 16 = /dev/sdct		98th SCSI disk whole disk</div><div class='add'>+		 32 = /dev/sdcu		99th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/sddh		112nd SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  71 char	Computone IntelliPort II serial card</div><div class='add'>+		  0 = /dev/ttyF0	IntelliPort II board 0, port 0</div><div class='add'>+		  1 = /dev/ttyF1	IntelliPort II board 0, port 1</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/ttyF63	IntelliPort II board 0, port 63</div><div class='add'>+		 64 = /dev/ttyF64	IntelliPort II board 1, port 0</div><div class='add'>+		 65 = /dev/ttyF65	IntelliPort II board 1, port 1</div><div class='add'>+		    ...</div><div class='add'>+		127 = /dev/ttyF127	IntelliPort II board 1, port 63</div><div class='add'>+		128 = /dev/ttyF128	IntelliPort II board 2, port 0</div><div class='add'>+		129 = /dev/ttyF129	IntelliPort II board 2, port 1</div><div class='add'>+		    ...</div><div class='add'>+		191 = /dev/ttyF191	IntelliPort II board 2, port 63</div><div class='add'>+		192 = /dev/ttyF192	IntelliPort II board 3, port 0</div><div class='add'>+		193 = /dev/ttyF193	IntelliPort II board 3, port 1</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/ttyF255	IntelliPort II board 3, port 63</div><div class='add'>+</div><div class='add'>+  71 block	SCSI disk devices (112-127)</div><div class='add'>+		  0 = /dev/sddi		113th SCSI disk whole disk</div><div class='add'>+		 16 = /dev/sddj		114th SCSI disk whole disk</div><div class='add'>+		 32 = /dev/sddk		115th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/sddx		128th SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  72 char	Computone IntelliPort II serial card - alternate devices</div><div class='add'>+		  0 = /dev/cuf0		Callout device for ttyF0</div><div class='add'>+		  1 = /dev/cuf1		Callout device for ttyF1</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/cuf63	Callout device for ttyF63</div><div class='add'>+		 64 = /dev/cuf64	Callout device for ttyF64</div><div class='add'>+		 65 = /dev/cuf65	Callout device for ttyF65</div><div class='add'>+		    ...</div><div class='add'>+		127 = /dev/cuf127	Callout device for ttyF127</div><div class='add'>+		128 = /dev/cuf128	Callout device for ttyF128</div><div class='add'>+		129 = /dev/cuf129	Callout device for ttyF129</div><div class='add'>+		    ...</div><div class='add'>+		191 = /dev/cuf191	Callout device for ttyF191</div><div class='add'>+		192 = /dev/cuf192	Callout device for ttyF192</div><div class='add'>+		193 = /dev/cuf193	Callout device for ttyF193</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/cuf255	Callout device for ttyF255</div><div class='add'>+</div><div class='add'>+  72 block	Compaq Intelligent Drive Array, first controller</div><div class='add'>+		  0 = /dev/ida/c0d0	First logical drive whole disk</div><div class='add'>+		 16 = /dev/ida/c0d1	Second logical drive whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/ida/c0d15	16th logical drive whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  73 char	Computone IntelliPort II serial card - control devices</div><div class='add'>+		  0 = /dev/ip2ipl0	Loadware device for board 0</div><div class='add'>+		  1 = /dev/ip2stat0	Status device for board 0</div><div class='add'>+		  4 = /dev/ip2ipl1	Loadware device for board 1</div><div class='add'>+		  5 = /dev/ip2stat1	Status device for board 1</div><div class='add'>+		  8 = /dev/ip2ipl2	Loadware device for board 2</div><div class='add'>+		  9 = /dev/ip2stat2	Status device for board 2</div><div class='add'>+		 12 = /dev/ip2ipl3	Loadware device for board 3</div><div class='add'>+		 13 = /dev/ip2stat3	Status device for board 3</div><div class='add'>+</div><div class='add'>+  73 block	Compaq Intelligent Drive Array, second controller</div><div class='add'>+		  0 = /dev/ida/c1d0	First logical drive whole disk</div><div class='add'>+		 16 = /dev/ida/c1d1	Second logical drive whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/ida/c1d15	16th logical drive whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  74 char	SCI bridge</div><div class='add'>+		  0 = /dev/SCI/0	SCI device 0</div><div class='add'>+		  1 = /dev/SCI/1	SCI device 1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		Currently for Dolphin Interconnect Solutions' PCI-SCI</div><div class='add'>+		bridge.</div><div class='add'>+</div><div class='add'>+  74 block	Compaq Intelligent Drive Array, third controller</div><div class='add'>+		  0 = /dev/ida/c2d0	First logical drive whole disk</div><div class='add'>+		 16 = /dev/ida/c2d1	Second logical drive whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/ida/c2d15	16th logical drive whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  75 char	Specialix IO8+ serial card</div><div class='add'>+		  0 = /dev/ttyW0	First IO8+ port, first card</div><div class='add'>+		  1 = /dev/ttyW1	Second IO8+ port, first card</div><div class='add'>+		    ...</div><div class='add'>+		  8 = /dev/ttyW8	First IO8+ port, second card</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  75 block	Compaq Intelligent Drive Array, fourth controller</div><div class='add'>+		  0 = /dev/ida/c3d0	First logical drive whole disk</div><div class='add'>+		 16 = /dev/ida/c3d1	Second logical drive whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/ida/c3d15	16th logical drive whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  76 char	Specialix IO8+ serial card - alternate devices</div><div class='add'>+		  0 = /dev/cuw0		Callout device for ttyW0</div><div class='add'>+		  1 = /dev/cuw1		Callout device for ttyW1</div><div class='add'>+		    ...</div><div class='add'>+		  8 = /dev/cuw8		Callout device for ttyW8</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  76 block	Compaq Intelligent Drive Array, fifth controller</div><div class='add'>+		  0 = /dev/ida/c4d0	First logical drive whole disk</div><div class='add'>+		 16 = /dev/ida/c4d1	Second logical drive whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/ida/c4d15	16th logical drive whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  77 char	ComScire Quantum Noise Generator</div><div class='add'>+		  0 = /dev/qng		ComScire Quantum Noise Generator</div><div class='add'>+</div><div class='add'>+  77 block	Compaq Intelligent Drive Array, sixth controller</div><div class='add'>+		  0 = /dev/ida/c5d0	First logical drive whole disk</div><div class='add'>+		 16 = /dev/ida/c5d1	Second logical drive whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/ida/c5d15	16th logical drive whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  78 char	PAM Software's multimodem boards</div><div class='add'>+		  0 = /dev/ttyM0	First PAM modem</div><div class='add'>+		  1 = /dev/ttyM1	Second PAM modem</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  78 block	Compaq Intelligent Drive Array, seventh controller</div><div class='add'>+		  0 = /dev/ida/c6d0	First logical drive whole disk</div><div class='add'>+		 16 = /dev/ida/c6d1	Second logical drive whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/ida/c6d15	16th logical drive whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  79 char	PAM Software's multimodem boards - alternate devices</div><div class='add'>+		  0 = /dev/cum0		Callout device for ttyM0</div><div class='add'>+		  1 = /dev/cum1		Callout device for ttyM1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  79 block	Compaq Intelligent Drive Array, eighth controller</div><div class='add'>+		  0 = /dev/ida/c7d0	First logical drive whole disk</div><div class='add'>+		 16 = /dev/ida/c7d1	Second logical drive whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/ida/c715	16th logical drive whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  80 char	Photometrics AT200 CCD camera</div><div class='add'>+		  0 = /dev/at200	Photometrics AT200 CCD camera</div><div class='add'>+</div><div class='add'>+  80 block	I2O hard disk</div><div class='add'>+		  0 = /dev/i2o/hda	First I2O hard disk, whole disk</div><div class='add'>+		 16 = /dev/i2o/hdb	Second I2O hard disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/i2o/hdp	16th I2O hard disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  81 char	video4linux</div><div class='add'>+		  0 = /dev/video0	Video capture/overlay device</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/video63	Video capture/overlay device</div><div class='add'>+		 64 = /dev/radio0	Radio device</div><div class='add'>+		    ...</div><div class='add'>+		127 = /dev/radio63	Radio device</div><div class='add'>+		128 = /dev/swradio0	Software Defined Radio device</div><div class='add'>+		    ...</div><div class='add'>+		191 = /dev/swradio63	Software Defined Radio device</div><div class='add'>+		224 = /dev/vbi0		Vertical blank interrupt</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/vbi31	Vertical blank interrupt</div><div class='add'>+</div><div class='add'>+		Minor numbers are allocated dynamically unless</div><div class='add'>+		CONFIG_VIDEO_FIXED_MINOR_RANGES (default n)</div><div class='add'>+		configuration option is set.</div><div class='add'>+</div><div class='add'>+  81 block	I2O hard disk</div><div class='add'>+		  0 = /dev/i2o/hdq	17th I2O hard disk, whole disk</div><div class='add'>+		 16 = /dev/i2o/hdr	18th I2O hard disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/i2o/hdaf	32nd I2O hard disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  82 char	WiNRADiO communications receiver card</div><div class='add'>+		  0 = /dev/winradio0	First WiNRADiO card</div><div class='add'>+		  1 = /dev/winradio1	Second WiNRADiO card</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		The driver and documentation may be obtained from</div><div class='add'>+		http://www.winradio.com/</div><div class='add'>+</div><div class='add'>+  82 block	I2O hard disk</div><div class='add'>+		  0 = /dev/i2o/hdag	33rd I2O hard disk, whole disk</div><div class='add'>+		 16 = /dev/i2o/hdah	34th I2O hard disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/i2o/hdav	48th I2O hard disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  83 char	Matrox mga_vid video driver</div><div class='add'>+		 0 = /dev/mga_vid0	1st video card</div><div class='add'>+		 1 = /dev/mga_vid1	2nd video card</div><div class='add'>+		 2 = /dev/mga_vid2	3rd video card</div><div class='add'>+		  ...</div><div class='add'>+		15 = /dev/mga_vid15	16th video card</div><div class='add'>+</div><div class='add'>+  83 block	I2O hard disk</div><div class='add'>+		  0 = /dev/i2o/hdaw	49th I2O hard disk, whole disk</div><div class='add'>+		 16 = /dev/i2o/hdax	50th I2O hard disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/i2o/hdbl	64th I2O hard disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  84 char	Ikon 1011[57] Versatec Greensheet Interface</div><div class='add'>+		  0 = /dev/ihcp0	First Greensheet port</div><div class='add'>+		  1 = /dev/ihcp1	Second Greensheet port</div><div class='add'>+</div><div class='add'>+  84 block	I2O hard disk</div><div class='add'>+		  0 = /dev/i2o/hdbm	65th I2O hard disk, whole disk</div><div class='add'>+		 16 = /dev/i2o/hdbn	66th I2O hard disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/i2o/hdcb	80th I2O hard disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  85 char	Linux/SGI shared memory input queue</div><div class='add'>+		  0 = /dev/shmiq	Master shared input queue</div><div class='add'>+		  1 = /dev/qcntl0	First device pushed</div><div class='add'>+		  2 = /dev/qcntl1	Second device pushed</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  85 block	I2O hard disk</div><div class='add'>+		  0 = /dev/i2o/hdcc	81st I2O hard disk, whole disk</div><div class='add'>+		 16 = /dev/i2o/hdcd	82nd I2O hard disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/i2o/hdcr	96th I2O hard disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  86 char	SCSI media changer</div><div class='add'>+		  0 = /dev/sch0		First SCSI media changer</div><div class='add'>+		  1 = /dev/sch1		Second SCSI media changer</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  86 block	I2O hard disk</div><div class='add'>+		  0 = /dev/i2o/hdcs	97th I2O hard disk, whole disk</div><div class='add'>+		 16 = /dev/i2o/hdct	98th I2O hard disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/i2o/hddh	112th I2O hard disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  87 char	Sony Control-A1 stereo control bus</div><div class='add'>+		  0 = /dev/controla0	First device on chain</div><div class='add'>+		  1 = /dev/controla1	Second device on chain</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  87 block	I2O hard disk</div><div class='add'>+		  0 = /dev/i2o/hddi	113rd I2O hard disk, whole disk</div><div class='add'>+		 16 = /dev/i2o/hddj	114th I2O hard disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/i2o/hddx	128th I2O hard disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  88 char	COMX synchronous serial card</div><div class='add'>+		  0 = /dev/comx0	COMX channel 0</div><div class='add'>+		  1 = /dev/comx1	COMX channel 1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  88 block	Seventh IDE hard disk/CD-ROM interface</div><div class='add'>+		  0 = /dev/hdm		Master: whole disk (or CD-ROM)</div><div class='add'>+		 64 = /dev/hdn		Slave: whole disk (or CD-ROM)</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for the first</div><div class='add'>+		interface (see major number 3).</div><div class='add'>+</div><div class='add'>+  89 char	I2C bus interface</div><div class='add'>+		  0 = /dev/i2c-0	First I2C adapter</div><div class='add'>+		  1 = /dev/i2c-1	Second I2C adapter</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  89 block	Eighth IDE hard disk/CD-ROM interface</div><div class='add'>+		  0 = /dev/hdo		Master: whole disk (or CD-ROM)</div><div class='add'>+		 64 = /dev/hdp		Slave: whole disk (or CD-ROM)</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for the first</div><div class='add'>+		interface (see major number 3).</div><div class='add'>+</div><div class='add'>+  90 char	Memory Technology Device (RAM, ROM, Flash)</div><div class='add'>+		  0 = /dev/mtd0		First MTD (rw)</div><div class='add'>+		  1 = /dev/mtdr0	First MTD (ro)</div><div class='add'>+		    ...</div><div class='add'>+		 30 = /dev/mtd15	16th MTD (rw)</div><div class='add'>+		 31 = /dev/mtdr15	16th MTD (ro)</div><div class='add'>+</div><div class='add'>+  90 block	Ninth IDE hard disk/CD-ROM interface</div><div class='add'>+		  0 = /dev/hdq		Master: whole disk (or CD-ROM)</div><div class='add'>+		 64 = /dev/hdr		Slave: whole disk (or CD-ROM)</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for the first</div><div class='add'>+		interface (see major number 3).</div><div class='add'>+</div><div class='add'>+  91 char	CAN-Bus devices</div><div class='add'>+		  0 = /dev/can0		First CAN-Bus controller</div><div class='add'>+		  1 = /dev/can1		Second CAN-Bus controller</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  91 block	Tenth IDE hard disk/CD-ROM interface</div><div class='add'>+		  0 = /dev/hds		Master: whole disk (or CD-ROM)</div><div class='add'>+		 64 = /dev/hdt		Slave: whole disk (or CD-ROM)</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for the first</div><div class='add'>+		interface (see major number 3).</div><div class='add'>+</div><div class='add'>+  92 char	Reserved for ith Kommunikationstechnik MIC ISDN card</div><div class='add'>+</div><div class='add'>+  92 block	PPDD encrypted disk driver</div><div class='add'>+		  0 = /dev/ppdd0	First encrypted disk</div><div class='add'>+		  1 = /dev/ppdd1	Second encrypted disk</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+  93 char</div><div class='add'>+</div><div class='add'>+  93 block	NAND Flash Translation Layer filesystem</div><div class='add'>+		  0 = /dev/nftla	First NFTL layer</div><div class='add'>+		 16 = /dev/nftlb	Second NFTL layer</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/nftlp	16th NTFL layer</div><div class='add'>+</div><div class='add'>+  94 char</div><div class='add'>+</div><div class='add'>+  94 block	IBM S/390 DASD block storage</div><div class='add'>+		  0 = /dev/dasda First DASD device, major</div><div class='add'>+		  1 = /dev/dasda1 First DASD device, block 1</div><div class='add'>+		  2 = /dev/dasda2 First DASD device, block 2</div><div class='add'>+		  3 = /dev/dasda3 First DASD device, block 3</div><div class='add'>+		  4 = /dev/dasdb Second DASD device, major</div><div class='add'>+		  5 = /dev/dasdb1 Second DASD device, block 1</div><div class='add'>+		  6 = /dev/dasdb2 Second DASD device, block 2</div><div class='add'>+		  7 = /dev/dasdb3 Second DASD device, block 3</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  95 char	IP filter</div><div class='add'>+		  0 = /dev/ipl		Filter control device/log file</div><div class='add'>+		  1 = /dev/ipnat	NAT control device/log file</div><div class='add'>+		  2 = /dev/ipstate	State information log file</div><div class='add'>+		  3 = /dev/ipauth	Authentication control device/log file</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  96 char	Parallel port ATAPI tape devices</div><div class='add'>+		  0 = /dev/pt0		First parallel port ATAPI tape</div><div class='add'>+		  1 = /dev/pt1		Second parallel port ATAPI tape</div><div class='add'>+		    ...</div><div class='add'>+		128 = /dev/npt0		First p.p. ATAPI tape, no rewind</div><div class='add'>+		129 = /dev/npt1		Second p.p. ATAPI tape, no rewind</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  96 block	Inverse NAND Flash Translation Layer</div><div class='add'>+		  0 = /dev/inftla First INFTL layer</div><div class='add'>+		 16 = /dev/inftlb Second INFTL layer</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/inftlp	16th INTFL layer</div><div class='add'>+</div><div class='add'>+  97 char	Parallel port generic ATAPI interface</div><div class='add'>+		  0 = /dev/pg0		First parallel port ATAPI device</div><div class='add'>+		  1 = /dev/pg1		Second parallel port ATAPI device</div><div class='add'>+		  2 = /dev/pg2		Third parallel port ATAPI device</div><div class='add'>+		  3 = /dev/pg3		Fourth parallel port ATAPI device</div><div class='add'>+</div><div class='add'>+		These devices support the same API as the generic SCSI</div><div class='add'>+		devices.</div><div class='add'>+</div><div class='add'>+  98 char	Control and Measurement Device (comedi)</div><div class='add'>+		  0 = /dev/comedi0	First comedi device</div><div class='add'>+		  1 = /dev/comedi1	Second comedi device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		See http://stm.lbl.gov/comedi.</div><div class='add'>+</div><div class='add'>+  98 block	User-mode virtual block device</div><div class='add'>+		  0 = /dev/ubda		First user-mode block device</div><div class='add'>+		 16 = /dev/udbb		Second user-mode block device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+		This device is used by the user-mode virtual kernel port.</div><div class='add'>+</div><div class='add'>+  99 char	Raw parallel ports</div><div class='add'>+		  0 = /dev/parport0	First parallel port</div><div class='add'>+		  1 = /dev/parport1	Second parallel port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+  99 block	JavaStation flash disk</div><div class='add'>+		  0 = /dev/jsfd		JavaStation flash disk</div><div class='add'>+</div><div class='add'>+ 100 char	Telephony for Linux</div><div class='add'>+		  0 = /dev/phone0	First telephony device</div><div class='add'>+		  1 = /dev/phone1	Second telephony device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 101 char	Motorola DSP 56xxx board</div><div class='add'>+		  0 = /dev/mdspstat	Status information</div><div class='add'>+		  1 = /dev/mdsp1	First DSP board I/O controls</div><div class='add'>+		    ...</div><div class='add'>+		 16 = /dev/mdsp16	16th DSP board I/O controls</div><div class='add'>+</div><div class='add'>+ 101 block	AMI HyperDisk RAID controller</div><div class='add'>+		  0 = /dev/amiraid/ar0	First array whole disk</div><div class='add'>+		 16 = /dev/amiraid/ar1	Second array whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/amiraid/ar15	16th array whole disk</div><div class='add'>+</div><div class='add'>+		For each device, partitions are added as:</div><div class='add'>+		  0 = /dev/amiraid/ar?	  Whole disk</div><div class='add'>+		  1 = /dev/amiraid/ar?p1  First partition</div><div class='add'>+		  2 = /dev/amiraid/ar?p2  Second partition</div><div class='add'>+		    ...</div><div class='add'>+		 15 = /dev/amiraid/ar?p15 15th partition</div><div class='add'>+</div><div class='add'>+ 102 char</div><div class='add'>+</div><div class='add'>+ 102 block	Compressed block device</div><div class='add'>+		  0 = /dev/cbd/a	First compressed block device, whole device</div><div class='add'>+		 16 = /dev/cbd/b	Second compressed block device, whole device</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/cbd/p	16th compressed block device, whole device</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 103 char	Arla network file system</div><div class='add'>+		  0 = /dev/nnpfs0	First NNPFS device</div><div class='add'>+		  1 = /dev/nnpfs1	Second NNPFS device</div><div class='add'>+</div><div class='add'>+		Arla is a free clone of the Andrew File System, AFS.</div><div class='add'>+		The NNPFS device gives user mode filesystem</div><div class='add'>+		implementations a kernel presence for caching and easy</div><div class='add'>+		mounting.  For more information about the project,</div><div class='add'>+		write to &lt;arla-drinkers@stacken.kth.se&gt; or see</div><div class='add'>+		http://www.stacken.kth.se/project/arla/</div><div class='add'>+</div><div class='add'>+ 103 block	Audit device</div><div class='add'>+		  0 = /dev/audit	Audit device</div><div class='add'>+</div><div class='add'>+ 104 char	Flash BIOS support</div><div class='add'>+</div><div class='add'>+ 104 block	Compaq Next Generation Drive Array, first controller</div><div class='add'>+		  0 = /dev/cciss/c0d0	First logical drive, whole disk</div><div class='add'>+		 16 = /dev/cciss/c0d1	Second logical drive, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/cciss/c0d15	16th logical drive, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 105 char	Comtrol VS-1000 serial controller</div><div class='add'>+		  0 = /dev/ttyV0	First VS-1000 port</div><div class='add'>+		  1 = /dev/ttyV1	Second VS-1000 port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 105 block	Compaq Next Generation Drive Array, second controller</div><div class='add'>+		  0 = /dev/cciss/c1d0	First logical drive, whole disk</div><div class='add'>+		 16 = /dev/cciss/c1d1	Second logical drive, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/cciss/c1d15	16th logical drive, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 106 char	Comtrol VS-1000 serial controller - alternate devices</div><div class='add'>+		  0 = /dev/cuv0		First VS-1000 port</div><div class='add'>+		  1 = /dev/cuv1		Second VS-1000 port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 106 block	Compaq Next Generation Drive Array, third controller</div><div class='add'>+		  0 = /dev/cciss/c2d0	First logical drive, whole disk</div><div class='add'>+		 16 = /dev/cciss/c2d1	Second logical drive, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/cciss/c2d15	16th logical drive, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 107 char	3Dfx Voodoo Graphics device</div><div class='add'>+		  0 = /dev/3dfx		Primary 3Dfx graphics device</div><div class='add'>+</div><div class='add'>+ 107 block	Compaq Next Generation Drive Array, fourth controller</div><div class='add'>+		  0 = /dev/cciss/c3d0	First logical drive, whole disk</div><div class='add'>+		 16 = /dev/cciss/c3d1	Second logical drive, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/cciss/c3d15	16th logical drive, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 108 char	Device independent PPP interface</div><div class='add'>+		  0 = /dev/ppp		Device independent PPP interface</div><div class='add'>+</div><div class='add'>+ 108 block	Compaq Next Generation Drive Array, fifth controller</div><div class='add'>+		  0 = /dev/cciss/c4d0	First logical drive, whole disk</div><div class='add'>+		 16 = /dev/cciss/c4d1	Second logical drive, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/cciss/c4d15	16th logical drive, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 109 char	Reserved for logical volume manager</div><div class='add'>+</div><div class='add'>+ 109 block	Compaq Next Generation Drive Array, sixth controller</div><div class='add'>+		  0 = /dev/cciss/c5d0	First logical drive, whole disk</div><div class='add'>+		 16 = /dev/cciss/c5d1	Second logical drive, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/cciss/c5d15	16th logical drive, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 110 char	miroMEDIA Surround board</div><div class='add'>+		  0 = /dev/srnd0	First miroMEDIA Surround board</div><div class='add'>+		  1 = /dev/srnd1	Second miroMEDIA Surround board</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 110 block	Compaq Next Generation Drive Array, seventh controller</div><div class='add'>+		  0 = /dev/cciss/c6d0	First logical drive, whole disk</div><div class='add'>+		 16 = /dev/cciss/c6d1	Second logical drive, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/cciss/c6d15	16th logical drive, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 111 char</div><div class='add'>+</div><div class='add'>+ 111 block	Compaq Next Generation Drive Array, eighth controller</div><div class='add'>+		  0 = /dev/cciss/c7d0	First logical drive, whole disk</div><div class='add'>+		 16 = /dev/cciss/c7d1	Second logical drive, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/cciss/c7d15	16th logical drive, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled the same way as for Mylex</div><div class='add'>+		DAC960 (see major number 48) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 112 char	ISI serial card</div><div class='add'>+		  0 = /dev/ttyM0	First ISI port</div><div class='add'>+		  1 = /dev/ttyM1	Second ISI port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		There is currently a device-naming conflict between</div><div class='add'>+		these and PAM multimodems (major 78).</div><div class='add'>+</div><div class='add'>+ 112 block	IBM iSeries virtual disk</div><div class='add'>+		  0 = /dev/iseries/vda	First virtual disk, whole disk</div><div class='add'>+		  8 = /dev/iseries/vdb	Second virtual disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		200 = /dev/iseries/vdz	26th virtual disk, whole disk</div><div class='add'>+		208 = /dev/iseries/vdaa	27th virtual disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/iseries/vdaf	32nd virtual disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 7.</div><div class='add'>+</div><div class='add'>+ 113 char	ISI serial card - alternate devices</div><div class='add'>+		  0 = /dev/cum0		Callout device for ttyM0</div><div class='add'>+		  1 = /dev/cum1		Callout device for ttyM1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 113 block	IBM iSeries virtual CD-ROM</div><div class='add'>+		  0 = /dev/iseries/vcda	First virtual CD-ROM</div><div class='add'>+		  1 = /dev/iseries/vcdb	Second virtual CD-ROM</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 114 char	Picture Elements ISE board</div><div class='add'>+		  0 = /dev/ise0		First ISE board</div><div class='add'>+		  1 = /dev/ise1		Second ISE board</div><div class='add'>+		    ...</div><div class='add'>+		128 = /dev/isex0	Control node for first ISE board</div><div class='add'>+		129 = /dev/isex1	Control node for second ISE board</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		The ISE board is an embedded computer, optimized for</div><div class='add'>+		image processing. The /dev/iseN nodes are the general</div><div class='add'>+		I/O access to the board, the /dev/isex0 nodes command</div><div class='add'>+		nodes used to control the board.</div><div class='add'>+</div><div class='add'>+ 114 block       IDE BIOS powered software RAID interfaces such as the</div><div class='add'>+		Promise Fastrak</div><div class='add'>+</div><div class='add'>+		   0 = /dev/ataraid/d0</div><div class='add'>+		   1 = /dev/ataraid/d0p1</div><div class='add'>+		   2 = /dev/ataraid/d0p2</div><div class='add'>+		  ...</div><div class='add'>+		  16 = /dev/ataraid/d1</div><div class='add'>+		  17 = /dev/ataraid/d1p1</div><div class='add'>+		  18 = /dev/ataraid/d1p2</div><div class='add'>+		  ...</div><div class='add'>+		 255 = /dev/ataraid/d15p15</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 115 char	TI link cable devices (115 was formerly the console driver speaker)</div><div class='add'>+		  0 = /dev/tipar0    Parallel cable on first parallel port</div><div class='add'>+		  ...</div><div class='add'>+		  7 = /dev/tipar7    Parallel cable on seventh parallel port</div><div class='add'>+</div><div class='add'>+		  8 = /dev/tiser0    Serial cable on first serial port</div><div class='add'>+		  ...</div><div class='add'>+		 15 = /dev/tiser7    Serial cable on seventh serial port</div><div class='add'>+</div><div class='add'>+		 16 = /dev/tiusb0    First USB cable</div><div class='add'>+		  ...</div><div class='add'>+		 47 = /dev/tiusb31   32nd USB cable</div><div class='add'>+</div><div class='add'>+ 115 block       NetWare (NWFS) Devices (0-255)</div><div class='add'>+</div><div class='add'>+		The NWFS (NetWare) devices are used to present a</div><div class='add'>+		collection of NetWare Mirror Groups or NetWare</div><div class='add'>+		Partitions as a logical storage segment for</div><div class='add'>+		use in mounting NetWare volumes.  A maximum of</div><div class='add'>+		 256 NetWare volumes can be supported in a single</div><div class='add'>+		machine.</div><div class='add'>+</div><div class='add'>+		http://cgfa.telepac.pt/ftp2/kernel.org/linux/kernel/people/jmerkey/nwfs/</div><div class='add'>+</div><div class='add'>+		 0 = /dev/nwfs/v0    First NetWare (NWFS) Logical Volume</div><div class='add'>+		 1 = /dev/nwfs/v1    Second NetWare (NWFS) Logical Volume</div><div class='add'>+		 2 = /dev/nwfs/v2    Third NetWare (NWFS) Logical Volume</div><div class='add'>+		      ...</div><div class='add'>+		 255 = /dev/nwfs/v255    Last NetWare (NWFS) Logical Volume</div><div class='add'>+</div><div class='add'>+ 116 char	Advanced Linux Sound Driver (ALSA)</div><div class='add'>+</div><div class='add'>+ 116 block       MicroMemory battery backed RAM adapter (NVRAM)</div><div class='add'>+		Supports 16 boards, 15 partitions each.</div><div class='add'>+		Requested by neilb at cse.unsw.edu.au.</div><div class='add'>+</div><div class='add'>+		 0 = /dev/umem/d0      Whole of first board</div><div class='add'>+		 1 = /dev/umem/d0p1    First partition of first board</div><div class='add'>+		 2 = /dev/umem/d0p2    Second partition of first board</div><div class='add'>+		15 = /dev/umem/d0p15   15th partition of first board</div><div class='add'>+</div><div class='add'>+		16 = /dev/umem/d1      Whole of second board</div><div class='add'>+		17 = /dev/umem/d1p1    First partition of second board</div><div class='add'>+		    ...</div><div class='add'>+		255= /dev/umem/d15p15  15th partition of 16th board.</div><div class='add'>+</div><div class='add'>+ 117 char	COSA/SRP synchronous serial card</div><div class='add'>+		  0 = /dev/cosa0c0	1st board, 1st channel</div><div class='add'>+		  1 = /dev/cosa0c1	1st board, 2nd channel</div><div class='add'>+		    ...</div><div class='add'>+		 16 = /dev/cosa1c0	2nd board, 1st channel</div><div class='add'>+		 17 = /dev/cosa1c1	2nd board, 2nd channel</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 117 block       Enterprise Volume Management System (EVMS)</div><div class='add'>+</div><div class='add'>+		The EVMS driver uses a layered, plug-in model to provide</div><div class='add'>+		unparalleled flexibility and extensibility in managing</div><div class='add'>+		storage.  This allows for easy expansion or customization</div><div class='add'>+		of various levels of volume management.  Requested by</div><div class='add'>+		Mark Peloquin (peloquin at us.ibm.com).</div><div class='add'>+</div><div class='add'>+		Note: EVMS populates and manages all the devnodes in</div><div class='add'>+		/dev/evms.</div><div class='add'>+</div><div class='add'>+		http://sf.net/projects/evms</div><div class='add'>+</div><div class='add'>+		   0 = /dev/evms/block_device   EVMS block device</div><div class='add'>+		   1 = /dev/evms/legacyname1    First EVMS legacy device</div><div class='add'>+		   2 = /dev/evms/legacyname2    Second EVMS legacy device</div><div class='add'>+		    ...</div><div class='add'>+		    Both ranges can grow (down or up) until they meet.</div><div class='add'>+		    ...</div><div class='add'>+		 254 = /dev/evms/EVMSname2      Second EVMS native device</div><div class='add'>+		 255 = /dev/evms/EVMSname1      First EVMS native device</div><div class='add'>+</div><div class='add'>+		Note: legacyname(s) are derived from the normal legacy</div><div class='add'>+		device names.  For example, /dev/hda5 would become</div><div class='add'>+		/dev/evms/hda5.</div><div class='add'>+</div><div class='add'>+ 118 char	IBM Cryptographic Accelerator</div><div class='add'>+		  0 = /dev/ica	Virtual interface to all IBM Crypto Accelerators</div><div class='add'>+		  1 = /dev/ica0	IBMCA Device 0</div><div class='add'>+		  2 = /dev/ica1	IBMCA Device 1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 119 char	VMware virtual network control</div><div class='add'>+		  0 = /dev/vnet0	1st virtual network</div><div class='add'>+		  1 = /dev/vnet1	2nd virtual network</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 120-127 char	LOCAL/EXPERIMENTAL USE</div><div class='add'>+</div><div class='add'>+ 120-127 block	LOCAL/EXPERIMENTAL USE</div><div class='add'>+		Allocated for local/experimental use.  For devices not</div><div class='add'>+		assigned official numbers, these ranges should be</div><div class='add'>+		used in order to avoid conflicting with future assignments.</div><div class='add'>+</div><div class='add'>+ 128-135 char	Unix98 PTY masters</div><div class='add'>+</div><div class='add'>+		These devices should not have corresponding device</div><div class='add'>+		nodes; instead they should be accessed through the</div><div class='add'>+		/dev/ptmx cloning interface.</div><div class='add'>+</div><div class='add'>+ 128 block       SCSI disk devices (128-143)</div><div class='add'>+		   0 = /dev/sddy         129th SCSI disk whole disk</div><div class='add'>+		  16 = /dev/sddz         130th SCSI disk whole disk</div><div class='add'>+		  32 = /dev/sdea         131th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		 240 = /dev/sden         144th SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 129 block       SCSI disk devices (144-159)</div><div class='add'>+		   0 = /dev/sdeo         145th SCSI disk whole disk</div><div class='add'>+		  16 = /dev/sdep         146th SCSI disk whole disk</div><div class='add'>+		  32 = /dev/sdeq         147th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		 240 = /dev/sdfd         160th SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 130 char 	(Misc devices)</div><div class='add'>+</div><div class='add'>+ 130 block       SCSI disk devices (160-175)</div><div class='add'>+		   0 = /dev/sdfe         161st SCSI disk whole disk</div><div class='add'>+		  16 = /dev/sdff         162nd SCSI disk whole disk</div><div class='add'>+		  32 = /dev/sdfg         163rd SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		 240 = /dev/sdft         176th SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 131 block       SCSI disk devices (176-191)</div><div class='add'>+		   0 = /dev/sdfu         177th SCSI disk whole disk</div><div class='add'>+		  16 = /dev/sdfv         178th SCSI disk whole disk</div><div class='add'>+		  32 = /dev/sdfw         179th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		 240 = /dev/sdgj         192nd SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 132 block       SCSI disk devices (192-207)</div><div class='add'>+		   0 = /dev/sdgk         193rd SCSI disk whole disk</div><div class='add'>+		  16 = /dev/sdgl         194th SCSI disk whole disk</div><div class='add'>+		  32 = /dev/sdgm         195th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		 240 = /dev/sdgz         208th SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 133 block       SCSI disk devices (208-223)</div><div class='add'>+		   0 = /dev/sdha         209th SCSI disk whole disk</div><div class='add'>+		  16 = /dev/sdhb         210th SCSI disk whole disk</div><div class='add'>+		  32 = /dev/sdhc         211th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		 240 = /dev/sdhp         224th SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 134 block       SCSI disk devices (224-239)</div><div class='add'>+		   0 = /dev/sdhq         225th SCSI disk whole disk</div><div class='add'>+		  16 = /dev/sdhr         226th SCSI disk whole disk</div><div class='add'>+		  32 = /dev/sdhs         227th SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		 240 = /dev/sdif         240th SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 135 block       SCSI disk devices (240-255)</div><div class='add'>+		   0 = /dev/sdig         241st SCSI disk whole disk</div><div class='add'>+		  16 = /dev/sdih         242nd SCSI disk whole disk</div><div class='add'>+		  32 = /dev/sdih         243rd SCSI disk whole disk</div><div class='add'>+		    ...</div><div class='add'>+		 240 = /dev/sdiv         256th SCSI disk whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 136-143 char	Unix98 PTY slaves</div><div class='add'>+		  0 = /dev/pts/0	First Unix98 pseudo-TTY</div><div class='add'>+		  1 = /dev/pts/1	Second Unix98 pseudo-TTY</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		These device nodes are automatically generated with</div><div class='add'>+		the proper permissions and modes by mounting the</div><div class='add'>+		devpts filesystem onto /dev/pts with the appropriate</div><div class='add'>+		mount options (distribution dependent, however, on</div><div class='add'>+		*most* distributions the appropriate options are</div><div class='add'>+		"mode=0620,gid=&lt;gid of the "tty" group&gt;".)</div><div class='add'>+</div><div class='add'>+ 136 block	Mylex DAC960 PCI RAID controller; ninth controller</div><div class='add'>+		  0 = /dev/rd/c8d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c8d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c8d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+ 137 block	Mylex DAC960 PCI RAID controller; tenth controller</div><div class='add'>+		  0 = /dev/rd/c9d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c9d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c9d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+ 138 block	Mylex DAC960 PCI RAID controller; eleventh controller</div><div class='add'>+		  0 = /dev/rd/c10d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c10d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c10d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+ 139 block	Mylex DAC960 PCI RAID controller; twelfth controller</div><div class='add'>+		  0 = /dev/rd/c11d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c11d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c11d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+ 140 block	Mylex DAC960 PCI RAID controller; thirteenth controller</div><div class='add'>+		  0 = /dev/rd/c12d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c12d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c12d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+ 141 block	Mylex DAC960 PCI RAID controller; fourteenth controller</div><div class='add'>+		  0 = /dev/rd/c13d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c13d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c13d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+ 142 block	Mylex DAC960 PCI RAID controller; fifteenth controller</div><div class='add'>+		  0 = /dev/rd/c14d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c14d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c14d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+ 143 block	Mylex DAC960 PCI RAID controller; sixteenth controller</div><div class='add'>+		  0 = /dev/rd/c15d0	First disk, whole disk</div><div class='add'>+		  8 = /dev/rd/c15d1	Second disk, whole disk</div><div class='add'>+		    ...</div><div class='add'>+		248 = /dev/rd/c15d31	32nd disk, whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled as for major 48.</div><div class='add'>+</div><div class='add'>+ 144 char	Encapsulated PPP</div><div class='add'>+		  0 = /dev/pppox0	First PPP over Ethernet</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/pppox63	64th PPP over Ethernet</div><div class='add'>+</div><div class='add'>+		This is primarily used for ADSL.</div><div class='add'>+</div><div class='add'>+		The SST 5136-DN DeviceNet interface driver has been</div><div class='add'>+		relocated to major 183 due to an unfortunate conflict.</div><div class='add'>+</div><div class='add'>+ 144 block	Expansion Area #1 for more non-device (e.g. NFS) mounts</div><div class='add'>+		  0 = mounted device 256</div><div class='add'>+		255 = mounted device 511</div><div class='add'>+</div><div class='add'>+ 145 char	SAM9407-based soundcard</div><div class='add'>+		  0 = /dev/sam0_mixer</div><div class='add'>+		  1 = /dev/sam0_sequencer</div><div class='add'>+		  2 = /dev/sam0_midi00</div><div class='add'>+		  3 = /dev/sam0_dsp</div><div class='add'>+		  4 = /dev/sam0_audio</div><div class='add'>+		  6 = /dev/sam0_sndstat</div><div class='add'>+		 18 = /dev/sam0_midi01</div><div class='add'>+		 34 = /dev/sam0_midi02</div><div class='add'>+		 50 = /dev/sam0_midi03</div><div class='add'>+		 64 = /dev/sam1_mixer</div><div class='add'>+		    ...</div><div class='add'>+		128 = /dev/sam2_mixer</div><div class='add'>+		    ...</div><div class='add'>+		192 = /dev/sam3_mixer</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		Device functions match OSS, but offer a number of</div><div class='add'>+		addons, which are sam9407 specific.  OSS can be</div><div class='add'>+		operated simultaneously, taking care of the codec.</div><div class='add'>+</div><div class='add'>+ 145 block	Expansion Area #2 for more non-device (e.g. NFS) mounts</div><div class='add'>+		  0 = mounted device 512</div><div class='add'>+		255 = mounted device 767</div><div class='add'>+</div><div class='add'>+ 146 char	SYSTRAM SCRAMNet mirrored-memory network</div><div class='add'>+		  0 = /dev/scramnet0	First SCRAMNet device</div><div class='add'>+		  1 = /dev/scramnet1	Second SCRAMNet device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 146 block	Expansion Area #3 for more non-device (e.g. NFS) mounts</div><div class='add'>+		  0 = mounted device 768</div><div class='add'>+		255 = mounted device 1023</div><div class='add'>+</div><div class='add'>+ 147 char	Aureal Semiconductor Vortex Audio device</div><div class='add'>+		  0 = /dev/aureal0	First Aureal Vortex</div><div class='add'>+		  1 = /dev/aureal1	Second Aureal Vortex</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 147 block	Distributed Replicated Block Device (DRBD)</div><div class='add'>+		  0 = /dev/drbd0	First DRBD device</div><div class='add'>+		  1 = /dev/drbd1	Second DRBD device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 148 char	Technology Concepts serial card</div><div class='add'>+		  0 = /dev/ttyT0	First TCL port</div><div class='add'>+		  1 = /dev/ttyT1	Second TCL port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 149 char	Technology Concepts serial card - alternate devices</div><div class='add'>+		  0 = /dev/cut0		Callout device for ttyT0</div><div class='add'>+		  1 = /dev/cut0		Callout device for ttyT1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 150 char	Real-Time Linux FIFOs</div><div class='add'>+		  0 = /dev/rtf0		First RTLinux FIFO</div><div class='add'>+		  1 = /dev/rtf1		Second RTLinux FIFO</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 151 char	DPT I2O SmartRaid V controller</div><div class='add'>+		  0 = /dev/dpti0	First DPT I2O adapter</div><div class='add'>+		  1 = /dev/dpti1	Second DPT I2O adapter</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 152 char	EtherDrive Control Device</div><div class='add'>+		  0 = /dev/etherd/ctl	Connect/Disconnect an EtherDrive</div><div class='add'>+		  1 = /dev/etherd/err	Monitor errors</div><div class='add'>+		  2 = /dev/etherd/raw	Raw AoE packet monitor</div><div class='add'>+</div><div class='add'>+ 152 block	EtherDrive Block Devices</div><div class='add'>+		  0 = /dev/etherd/0	EtherDrive 0</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/etherd/255	EtherDrive 255</div><div class='add'>+</div><div class='add'>+ 153 char	SPI Bus Interface (sometimes referred to as MicroWire)</div><div class='add'>+		  0 = /dev/spi0		First SPI device on the bus</div><div class='add'>+		  1 = /dev/spi1		Second SPI device on the bus</div><div class='add'>+		    ...</div><div class='add'>+		 15 = /dev/spi15	Sixteenth SPI device on the bus</div><div class='add'>+</div><div class='add'>+ 153 block	Enhanced Metadisk RAID (EMD) storage units</div><div class='add'>+		  0 = /dev/emd/0	First unit</div><div class='add'>+		  1 = /dev/emd/0p1	Partition 1 on First unit</div><div class='add'>+		  2 = /dev/emd/0p2	Partition 2 on First unit</div><div class='add'>+		    ...</div><div class='add'>+		 15 = /dev/emd/0p15	Partition 15 on First unit</div><div class='add'>+</div><div class='add'>+		 16 = /dev/emd/1	Second unit</div><div class='add'>+		 32 = /dev/emd/2	Third unit</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/emd/15	Sixteenth unit</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 154 char	Specialix RIO serial card</div><div class='add'>+		  0 = /dev/ttySR0	First RIO port</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/ttySR255	256th RIO port</div><div class='add'>+</div><div class='add'>+ 155 char	Specialix RIO serial card - alternate devices</div><div class='add'>+		  0 = /dev/cusr0	Callout device for ttySR0</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/cusr255	Callout device for ttySR255</div><div class='add'>+</div><div class='add'>+ 156 char	Specialix RIO serial card</div><div class='add'>+		  0 = /dev/ttySR256	257th RIO port</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/ttySR511	512th RIO port</div><div class='add'>+</div><div class='add'>+ 157 char	Specialix RIO serial card - alternate devices</div><div class='add'>+		  0 = /dev/cusr256	Callout device for ttySR256</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/cusr511	Callout device for ttySR511</div><div class='add'>+</div><div class='add'>+ 158 char	Dialogic GammaLink fax driver</div><div class='add'>+		  0 = /dev/gfax0	GammaLink channel 0</div><div class='add'>+		  1 = /dev/gfax1	GammaLink channel 1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 159 char	RESERVED</div><div class='add'>+</div><div class='add'>+ 159 block	RESERVED</div><div class='add'>+</div><div class='add'>+ 160 char	General Purpose Instrument Bus (GPIB)</div><div class='add'>+		  0 = /dev/gpib0	First GPIB bus</div><div class='add'>+		  1 = /dev/gpib1	Second GPIB bus</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 160 block       Carmel 8-port SATA Disks on First Controller</div><div class='add'>+		  0 = /dev/carmel/0     SATA disk 0 whole disk</div><div class='add'>+		  1 = /dev/carmel/0p1   SATA disk 0 partition 1</div><div class='add'>+		    ...</div><div class='add'>+		 31 = /dev/carmel/0p31  SATA disk 0 partition 31</div><div class='add'>+</div><div class='add'>+		 32 = /dev/carmel/1     SATA disk 1 whole disk</div><div class='add'>+		 64 = /dev/carmel/2     SATA disk 2 whole disk</div><div class='add'>+		    ...</div><div class='add'>+		224 = /dev/carmel/7     SATA disk 7 whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 31.</div><div class='add'>+</div><div class='add'>+ 161 char	IrCOMM devices (IrDA serial/parallel emulation)</div><div class='add'>+		  0 = /dev/ircomm0	First IrCOMM device</div><div class='add'>+		  1 = /dev/ircomm1	Second IrCOMM device</div><div class='add'>+		    ...</div><div class='add'>+		 16 = /dev/irlpt0	First IrLPT device</div><div class='add'>+		 17 = /dev/irlpt1	Second IrLPT device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 161 block       Carmel 8-port SATA Disks on Second Controller</div><div class='add'>+		  0 = /dev/carmel/8     SATA disk 8 whole disk</div><div class='add'>+		  1 = /dev/carmel/8p1   SATA disk 8 partition 1</div><div class='add'>+		    ...</div><div class='add'>+		 31 = /dev/carmel/8p31  SATA disk 8 partition 31</div><div class='add'>+</div><div class='add'>+		 32 = /dev/carmel/9     SATA disk 9 whole disk</div><div class='add'>+		 64 = /dev/carmel/10    SATA disk 10 whole disk</div><div class='add'>+		    ...</div><div class='add'>+		224 = /dev/carmel/15    SATA disk 15 whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 31.</div><div class='add'>+</div><div class='add'>+ 162 char	Raw block device interface</div><div class='add'>+		  0 = /dev/rawctl	Raw I/O control device</div><div class='add'>+		  1 = /dev/raw/raw1	First raw I/O device</div><div class='add'>+		  2 = /dev/raw/raw2	Second raw I/O device</div><div class='add'>+		    ...</div><div class='add'>+		 max minor number of raw device is set by kernel config</div><div class='add'>+		 MAX_RAW_DEVS or raw module parameter 'max_raw_devs'</div><div class='add'>+</div><div class='add'>+ 163 char</div><div class='add'>+</div><div class='add'>+ 164 char	Chase Research AT/PCI-Fast serial card</div><div class='add'>+		  0 = /dev/ttyCH0	AT/PCI-Fast board 0, port 0</div><div class='add'>+		    ...</div><div class='add'>+		 15 = /dev/ttyCH15	AT/PCI-Fast board 0, port 15</div><div class='add'>+		 16 = /dev/ttyCH16	AT/PCI-Fast board 1, port 0</div><div class='add'>+		    ...</div><div class='add'>+		 31 = /dev/ttyCH31	AT/PCI-Fast board 1, port 15</div><div class='add'>+		 32 = /dev/ttyCH32	AT/PCI-Fast board 2, port 0</div><div class='add'>+		    ...</div><div class='add'>+		 47 = /dev/ttyCH47	AT/PCI-Fast board 2, port 15</div><div class='add'>+		 48 = /dev/ttyCH48	AT/PCI-Fast board 3, port 0</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/ttyCH63	AT/PCI-Fast board 3, port 15</div><div class='add'>+</div><div class='add'>+ 165 char	Chase Research AT/PCI-Fast serial card - alternate devices</div><div class='add'>+		  0 = /dev/cuch0	Callout device for ttyCH0</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/cuch63	Callout device for ttyCH63</div><div class='add'>+</div><div class='add'>+ 166 char	ACM USB modems</div><div class='add'>+		  0 = /dev/ttyACM0	First ACM modem</div><div class='add'>+		  1 = /dev/ttyACM1	Second ACM modem</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 167 char	ACM USB modems - alternate devices</div><div class='add'>+		  0 = /dev/cuacm0	Callout device for ttyACM0</div><div class='add'>+		  1 = /dev/cuacm1	Callout device for ttyACM1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 168 char	Eracom CSA7000 PCI encryption adaptor</div><div class='add'>+		  0 = /dev/ecsa0	First CSA7000</div><div class='add'>+		  1 = /dev/ecsa1	Second CSA7000</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 169 char	Eracom CSA8000 PCI encryption adaptor</div><div class='add'>+		  0 = /dev/ecsa8-0	First CSA8000</div><div class='add'>+		  1 = /dev/ecsa8-1	Second CSA8000</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 170 char	AMI MegaRAC remote access controller</div><div class='add'>+		  0 = /dev/megarac0	First MegaRAC card</div><div class='add'>+		  1 = /dev/megarac1	Second MegaRAC card</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 171 char	Reserved for IEEE 1394 (Firewire)</div><div class='add'>+</div><div class='add'>+ 172 char	Moxa Intellio serial card</div><div class='add'>+		  0 = /dev/ttyMX0	First Moxa port</div><div class='add'>+		  1 = /dev/ttyMX1	Second Moxa port</div><div class='add'>+		    ...</div><div class='add'>+		127 = /dev/ttyMX127	128th Moxa port</div><div class='add'>+		128 = /dev/moxactl	Moxa control port</div><div class='add'>+</div><div class='add'>+ 173 char	Moxa Intellio serial card - alternate devices</div><div class='add'>+		  0 = /dev/cumx0	Callout device for ttyMX0</div><div class='add'>+		  1 = /dev/cumx1	Callout device for ttyMX1</div><div class='add'>+		    ...</div><div class='add'>+		127 = /dev/cumx127	Callout device for ttyMX127</div><div class='add'>+</div><div class='add'>+ 174 char	SmartIO serial card</div><div class='add'>+		  0 = /dev/ttySI0	First SmartIO port</div><div class='add'>+		  1 = /dev/ttySI1	Second SmartIO port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 175 char	SmartIO serial card - alternate devices</div><div class='add'>+		  0 = /dev/cusi0	Callout device for ttySI0</div><div class='add'>+		  1 = /dev/cusi1	Callout device for ttySI1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 176 char	nCipher nFast PCI crypto accelerator</div><div class='add'>+		  0 = /dev/nfastpci0	First nFast PCI device</div><div class='add'>+		  1 = /dev/nfastpci1	First nFast PCI device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 177 char	TI PCILynx memory spaces</div><div class='add'>+		  0 = /dev/pcilynx/aux0	 AUX space of first PCILynx card</div><div class='add'>+		    ...</div><div class='add'>+		 15 = /dev/pcilynx/aux15 AUX space of 16th PCILynx card</div><div class='add'>+		 16 = /dev/pcilynx/rom0	 ROM space of first PCILynx card</div><div class='add'>+		    ...</div><div class='add'>+		 31 = /dev/pcilynx/rom15 ROM space of 16th PCILynx card</div><div class='add'>+		 32 = /dev/pcilynx/ram0	 RAM space of first PCILynx card</div><div class='add'>+		    ...</div><div class='add'>+		 47 = /dev/pcilynx/ram15 RAM space of 16th PCILynx card</div><div class='add'>+</div><div class='add'>+ 178 char	Giganet cLAN1xxx virtual interface adapter</div><div class='add'>+		  0 = /dev/clanvi0	First cLAN adapter</div><div class='add'>+		  1 = /dev/clanvi1	Second cLAN adapter</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 179 block       MMC block devices</div><div class='add'>+		  0 = /dev/mmcblk0      First SD/MMC card</div><div class='add'>+		  1 = /dev/mmcblk0p1    First partition on first MMC card</div><div class='add'>+		  8 = /dev/mmcblk1      Second SD/MMC card</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		The start of next SD/MMC card can be configured with</div><div class='add'>+		CONFIG_MMC_BLOCK_MINORS, or overridden at boot/modprobe</div><div class='add'>+		time using the mmcblk.perdev_minors option. That would</div><div class='add'>+		bump the offset between each card to be the configured</div><div class='add'>+		value instead of the default 8.</div><div class='add'>+</div><div class='add'>+ 179 char	CCube DVXChip-based PCI products</div><div class='add'>+		  0 = /dev/dvxirq0	First DVX device</div><div class='add'>+		  1 = /dev/dvxirq1	Second DVX device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 180 char	USB devices</div><div class='add'>+		  0 = /dev/usb/lp0	First USB printer</div><div class='add'>+		    ...</div><div class='add'>+		 15 = /dev/usb/lp15	16th USB printer</div><div class='add'>+		 48 = /dev/usb/scanner0	First USB scanner</div><div class='add'>+		    ...</div><div class='add'>+		 63 = /dev/usb/scanner15 16th USB scanner</div><div class='add'>+		 64 = /dev/usb/rio500	Diamond Rio 500</div><div class='add'>+		 65 = /dev/usb/usblcd	USBLCD Interface (info@usblcd.de)</div><div class='add'>+		 66 = /dev/usb/cpad0	Synaptics cPad (mouse/LCD)</div><div class='add'>+		 96 = /dev/usb/hiddev0	1st USB HID device</div><div class='add'>+		    ...</div><div class='add'>+		111 = /dev/usb/hiddev15	16th USB HID device</div><div class='add'>+		112 = /dev/usb/auer0	1st auerswald ISDN device</div><div class='add'>+		    ...</div><div class='add'>+		127 = /dev/usb/auer15	16th auerswald ISDN device</div><div class='add'>+		128 = /dev/usb/brlvgr0	First Braille Voyager device</div><div class='add'>+		    ...</div><div class='add'>+		131 = /dev/usb/brlvgr3	Fourth Braille Voyager device</div><div class='add'>+		132 = /dev/usb/idmouse	ID Mouse (fingerprint scanner) device</div><div class='add'>+		133 = /dev/usb/sisusbvga1	First SiSUSB VGA device</div><div class='add'>+		    ...</div><div class='add'>+		140 = /dev/usb/sisusbvga8	Eighth SISUSB VGA device</div><div class='add'>+		144 = /dev/usb/lcd	USB LCD device</div><div class='add'>+		160 = /dev/usb/legousbtower0	1st USB Legotower device</div><div class='add'>+		    ...</div><div class='add'>+		175 = /dev/usb/legousbtower15	16th USB Legotower device</div><div class='add'>+		176 = /dev/usb/usbtmc1	First USB TMC device</div><div class='add'>+		   ...</div><div class='add'>+		191 = /dev/usb/usbtmc16	16th USB TMC device</div><div class='add'>+		192 = /dev/usb/yurex1	First USB Yurex device</div><div class='add'>+		   ...</div><div class='add'>+		209 = /dev/usb/yurex16	16th USB Yurex device</div><div class='add'>+</div><div class='add'>+ 180 block	USB block devices</div><div class='add'>+		  0 = /dev/uba		First USB block device</div><div class='add'>+		  8 = /dev/ubb		Second USB block device</div><div class='add'>+		 16 = /dev/ubc		Third USB block device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 181 char	Conrad Electronic parallel port radio clocks</div><div class='add'>+		  0 = /dev/pcfclock0	First Conrad radio clock</div><div class='add'>+		  1 = /dev/pcfclock1	Second Conrad radio clock</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 182 char	Picture Elements THR2 binarizer</div><div class='add'>+		  0 = /dev/pethr0	First THR2 board</div><div class='add'>+		  1 = /dev/pethr1	Second THR2 board</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 183 char	SST 5136-DN DeviceNet interface</div><div class='add'>+		  0 = /dev/ss5136dn0	First DeviceNet interface</div><div class='add'>+		  1 = /dev/ss5136dn1	Second DeviceNet interface</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		This device used to be assigned to major number 144.</div><div class='add'>+		It had to be moved due to an unfortunate conflict.</div><div class='add'>+</div><div class='add'>+ 184 char	Picture Elements' video simulator/sender</div><div class='add'>+		  0 = /dev/pevss0	First sender board</div><div class='add'>+		  1 = /dev/pevss1	Second sender board</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 185 char	InterMezzo high availability file system</div><div class='add'>+		  0 = /dev/intermezzo0	First cache manager</div><div class='add'>+		  1 = /dev/intermezzo1	Second cache manager</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		See http://web.archive.org/web/20080115195241/</div><div class='add'>+		http://inter-mezzo.org/index.html</div><div class='add'>+</div><div class='add'>+ 186 char	Object-based storage control device</div><div class='add'>+		  0 = /dev/obd0		First obd control device</div><div class='add'>+		  1 = /dev/obd1		Second obd control device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		See ftp://ftp.lustre.org/pub/obd for code and information.</div><div class='add'>+</div><div class='add'>+ 187 char	DESkey hardware encryption device</div><div class='add'>+		  0 = /dev/deskey0	First DES key</div><div class='add'>+		  1 = /dev/deskey1	Second DES key</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 188 char	USB serial converters</div><div class='add'>+		  0 = /dev/ttyUSB0	First USB serial converter</div><div class='add'>+		  1 = /dev/ttyUSB1	Second USB serial converter</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 189 char	USB serial converters - alternate devices</div><div class='add'>+		  0 = /dev/cuusb0	Callout device for ttyUSB0</div><div class='add'>+		  1 = /dev/cuusb1	Callout device for ttyUSB1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 190 char	Kansas City tracker/tuner card</div><div class='add'>+		  0 = /dev/kctt0	First KCT/T card</div><div class='add'>+		  1 = /dev/kctt1	Second KCT/T card</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 191 char	Reserved for PCMCIA</div><div class='add'>+</div><div class='add'>+ 192 char	Kernel profiling interface</div><div class='add'>+		  0 = /dev/profile	Profiling control device</div><div class='add'>+		  1 = /dev/profile0	Profiling device for CPU 0</div><div class='add'>+		  2 = /dev/profile1	Profiling device for CPU 1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 193 char	Kernel event-tracing interface</div><div class='add'>+		  0 = /dev/trace	Tracing control device</div><div class='add'>+		  1 = /dev/trace0	Tracing device for CPU 0</div><div class='add'>+		  2 = /dev/trace1	Tracing device for CPU 1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 194 char	linVideoStreams (LINVS)</div><div class='add'>+		  0 = /dev/mvideo/status0	Video compression status</div><div class='add'>+		  1 = /dev/mvideo/stream0	Video stream</div><div class='add'>+		  2 = /dev/mvideo/frame0	Single compressed frame</div><div class='add'>+		  3 = /dev/mvideo/rawframe0	Raw uncompressed frame</div><div class='add'>+		  4 = /dev/mvideo/codec0	Direct codec access</div><div class='add'>+		  5 = /dev/mvideo/video4linux0	Video4Linux compatibility</div><div class='add'>+</div><div class='add'>+		 16 = /dev/mvideo/status1	Second device</div><div class='add'>+		    ...</div><div class='add'>+		 32 = /dev/mvideo/status2	Third device</div><div class='add'>+		    ...</div><div class='add'>+		    ...</div><div class='add'>+		240 = /dev/mvideo/status15	16th device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 195 char	Nvidia graphics devices</div><div class='add'>+		  0 = /dev/nvidia0		First Nvidia card</div><div class='add'>+		  1 = /dev/nvidia1		Second Nvidia card</div><div class='add'>+		    ...</div><div class='add'>+		255 = /dev/nvidiactl		Nvidia card control device</div><div class='add'>+</div><div class='add'>+ 196 char	Tormenta T1 card</div><div class='add'>+		  0 = /dev/tor/0		Master control channel for all cards</div><div class='add'>+		  1 = /dev/tor/1		First DS0</div><div class='add'>+		  2 = /dev/tor/2		Second DS0</div><div class='add'>+		    ...</div><div class='add'>+		 48 = /dev/tor/48		48th DS0</div><div class='add'>+		 49 = /dev/tor/49		First pseudo-channel</div><div class='add'>+		 50 = /dev/tor/50		Second pseudo-channel</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 197 char	OpenTNF tracing facility</div><div class='add'>+		  0 = /dev/tnf/t0		Trace 0 data extraction</div><div class='add'>+		  1 = /dev/tnf/t1		Trace 1 data extraction</div><div class='add'>+		    ...</div><div class='add'>+		128 = /dev/tnf/status		Tracing facility status</div><div class='add'>+		130 = /dev/tnf/trace		Tracing device</div><div class='add'>+</div><div class='add'>+ 198 char	Total Impact TPMP2 quad coprocessor PCI card</div><div class='add'>+		  0 = /dev/tpmp2/0		First card</div><div class='add'>+		  1 = /dev/tpmp2/1		Second card</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 199 char	Veritas volume manager (VxVM) volumes</div><div class='add'>+		  0 = /dev/vx/rdsk/*/*		First volume</div><div class='add'>+		  1 = /dev/vx/rdsk/*/*		Second volume</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 199 block	Veritas volume manager (VxVM) volumes</div><div class='add'>+		  0 = /dev/vx/dsk/*/*		First volume</div><div class='add'>+		  1 = /dev/vx/dsk/*/*		Second volume</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		The namespace in these directories is maintained by</div><div class='add'>+		the user space VxVM software.</div><div class='add'>+</div><div class='add'>+ 200 char	Veritas VxVM configuration interface</div><div class='add'>+		   0 = /dev/vx/config		Configuration access node</div><div class='add'>+		   1 = /dev/vx/trace		Volume i/o trace access node</div><div class='add'>+		   2 = /dev/vx/iod		Volume i/o daemon access node</div><div class='add'>+		   3 = /dev/vx/info		Volume information access node</div><div class='add'>+		   4 = /dev/vx/task		Volume tasks access node</div><div class='add'>+		   5 = /dev/vx/taskmon		Volume tasks monitor daemon</div><div class='add'>+</div><div class='add'>+ 201 char	Veritas VxVM dynamic multipathing driver</div><div class='add'>+		  0 = /dev/vx/rdmp/*		First multipath device</div><div class='add'>+		  1 = /dev/vx/rdmp/*		Second multipath device</div><div class='add'>+		    ...</div><div class='add'>+ 201 block	Veritas VxVM dynamic multipathing driver</div><div class='add'>+		  0 = /dev/vx/dmp/*		First multipath device</div><div class='add'>+		  1 = /dev/vx/dmp/*		Second multipath device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		The namespace in these directories is maintained by</div><div class='add'>+		the user space VxVM software.</div><div class='add'>+</div><div class='add'>+ 202 char	CPU model-specific registers</div><div class='add'>+		  0 = /dev/cpu/0/msr		MSRs on CPU 0</div><div class='add'>+		  1 = /dev/cpu/1/msr		MSRs on CPU 1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 202 block	Xen Virtual Block Device</div><div class='add'>+		  0 = /dev/xvda       First Xen VBD whole disk</div><div class='add'>+		  16 = /dev/xvdb      Second Xen VBD whole disk</div><div class='add'>+		  32 = /dev/xvdc      Third Xen VBD whole disk</div><div class='add'>+		    ...</div><div class='add'>+		  240 = /dev/xvdp     Sixteenth Xen VBD whole disk</div><div class='add'>+</div><div class='add'>+		Partitions are handled in the same way as for IDE</div><div class='add'>+		disks (see major number 3) except that the limit on</div><div class='add'>+		partitions is 15.</div><div class='add'>+</div><div class='add'>+ 203 char	CPU CPUID information</div><div class='add'>+		  0 = /dev/cpu/0/cpuid		CPUID on CPU 0</div><div class='add'>+		  1 = /dev/cpu/1/cpuid		CPUID on CPU 1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 204 char	Low-density serial ports</div><div class='add'>+		  0 = /dev/ttyLU0		LinkUp Systems L72xx UART - port 0</div><div class='add'>+		  1 = /dev/ttyLU1		LinkUp Systems L72xx UART - port 1</div><div class='add'>+		  2 = /dev/ttyLU2		LinkUp Systems L72xx UART - port 2</div><div class='add'>+		  3 = /dev/ttyLU3		LinkUp Systems L72xx UART - port 3</div><div class='add'>+		  4 = /dev/ttyFB0		Intel Footbridge (ARM)</div><div class='add'>+		  5 = /dev/ttySA0		StrongARM builtin serial port 0</div><div class='add'>+		  6 = /dev/ttySA1		StrongARM builtin serial port 1</div><div class='add'>+		  7 = /dev/ttySA2		StrongARM builtin serial port 2</div><div class='add'>+		  8 = /dev/ttySC0		SCI serial port (SuperH) - port 0</div><div class='add'>+		  9 = /dev/ttySC1		SCI serial port (SuperH) - port 1</div><div class='add'>+		 10 = /dev/ttySC2		SCI serial port (SuperH) - port 2</div><div class='add'>+		 11 = /dev/ttySC3		SCI serial port (SuperH) - port 3</div><div class='add'>+		 12 = /dev/ttyFW0		Firmware console - port 0</div><div class='add'>+		 13 = /dev/ttyFW1		Firmware console - port 1</div><div class='add'>+		 14 = /dev/ttyFW2		Firmware console - port 2</div><div class='add'>+		 15 = /dev/ttyFW3		Firmware console - port 3</div><div class='add'>+		 16 = /dev/ttyAM0		ARM "AMBA" serial port 0</div><div class='add'>+		    ...</div><div class='add'>+		 31 = /dev/ttyAM15		ARM "AMBA" serial port 15</div><div class='add'>+		 32 = /dev/ttyDB0		DataBooster serial port 0</div><div class='add'>+		    ...</div><div class='add'>+		 39 = /dev/ttyDB7		DataBooster serial port 7</div><div class='add'>+		 40 = /dev/ttySG0		SGI Altix console port</div><div class='add'>+		 41 = /dev/ttySMX0		Motorola i.MX - port 0</div><div class='add'>+		 42 = /dev/ttySMX1		Motorola i.MX - port 1</div><div class='add'>+		 43 = /dev/ttySMX2		Motorola i.MX - port 2</div><div class='add'>+		 44 = /dev/ttyMM0		Marvell MPSC - port 0</div><div class='add'>+		 45 = /dev/ttyMM1		Marvell MPSC - port 1</div><div class='add'>+		 46 = /dev/ttyCPM0		PPC CPM (SCC or SMC) - port 0</div><div class='add'>+		    ...</div><div class='add'>+		 47 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 5</div><div class='add'>+		 50 = /dev/ttyIOC0		Altix serial card</div><div class='add'>+		    ...</div><div class='add'>+		 81 = /dev/ttyIOC31		Altix serial card</div><div class='add'>+		 82 = /dev/ttyVR0		NEC VR4100 series SIU</div><div class='add'>+		 83 = /dev/ttyVR1		NEC VR4100 series DSIU</div><div class='add'>+		 84 = /dev/ttyIOC84		Altix ioc4 serial card</div><div class='add'>+		    ...</div><div class='add'>+		 115 = /dev/ttyIOC115		Altix ioc4 serial card</div><div class='add'>+		 116 = /dev/ttySIOC0		Altix ioc3 serial card</div><div class='add'>+		    ...</div><div class='add'>+		 147 = /dev/ttySIOC31		Altix ioc3 serial card</div><div class='add'>+		 148 = /dev/ttyPSC0		PPC PSC - port 0</div><div class='add'>+		    ...</div><div class='add'>+		 153 = /dev/ttyPSC5		PPC PSC - port 5</div><div class='add'>+		 154 = /dev/ttyAT0		ATMEL serial port 0</div><div class='add'>+		    ...</div><div class='add'>+		 169 = /dev/ttyAT15		ATMEL serial port 15</div><div class='add'>+		 170 = /dev/ttyNX0		Hilscher netX serial port 0</div><div class='add'>+		    ...</div><div class='add'>+		 185 = /dev/ttyNX15		Hilscher netX serial port 15</div><div class='add'>+		 186 = /dev/ttyJ0		JTAG1 DCC protocol based serial port emulation</div><div class='add'>+		 187 = /dev/ttyUL0		Xilinx uartlite - port 0</div><div class='add'>+		    ...</div><div class='add'>+		 190 = /dev/ttyUL3		Xilinx uartlite - port 3</div><div class='add'>+		 191 = /dev/xvc0		Xen virtual console - port 0</div><div class='add'>+		 192 = /dev/ttyPZ0		pmac_zilog - port 0</div><div class='add'>+		    ...</div><div class='add'>+		 195 = /dev/ttyPZ3		pmac_zilog - port 3</div><div class='add'>+		 196 = /dev/ttyTX0		TX39/49 serial port 0</div><div class='add'>+		    ...</div><div class='add'>+		 204 = /dev/ttyTX7		TX39/49 serial port 7</div><div class='add'>+		 205 = /dev/ttySC0		SC26xx serial port 0</div><div class='add'>+		 206 = /dev/ttySC1		SC26xx serial port 1</div><div class='add'>+		 207 = /dev/ttySC2		SC26xx serial port 2</div><div class='add'>+		 208 = /dev/ttySC3		SC26xx serial port 3</div><div class='add'>+		 209 = /dev/ttyMAX0		MAX3100 serial port 0</div><div class='add'>+		 210 = /dev/ttyMAX1		MAX3100 serial port 1</div><div class='add'>+		 211 = /dev/ttyMAX2		MAX3100 serial port 2</div><div class='add'>+		 212 = /dev/ttyMAX3		MAX3100 serial port 3</div><div class='add'>+</div><div class='add'>+ 205 char	Low-density serial ports (alternate device)</div><div class='add'>+		  0 = /dev/culu0		Callout device for ttyLU0</div><div class='add'>+		  1 = /dev/culu1		Callout device for ttyLU1</div><div class='add'>+		  2 = /dev/culu2		Callout device for ttyLU2</div><div class='add'>+		  3 = /dev/culu3		Callout device for ttyLU3</div><div class='add'>+		  4 = /dev/cufb0		Callout device for ttyFB0</div><div class='add'>+		  5 = /dev/cusa0		Callout device for ttySA0</div><div class='add'>+		  6 = /dev/cusa1		Callout device for ttySA1</div><div class='add'>+		  7 = /dev/cusa2		Callout device for ttySA2</div><div class='add'>+		  8 = /dev/cusc0		Callout device for ttySC0</div><div class='add'>+		  9 = /dev/cusc1		Callout device for ttySC1</div><div class='add'>+		 10 = /dev/cusc2		Callout device for ttySC2</div><div class='add'>+		 11 = /dev/cusc3		Callout device for ttySC3</div><div class='add'>+		 12 = /dev/cufw0		Callout device for ttyFW0</div><div class='add'>+		 13 = /dev/cufw1		Callout device for ttyFW1</div><div class='add'>+		 14 = /dev/cufw2		Callout device for ttyFW2</div><div class='add'>+		 15 = /dev/cufw3		Callout device for ttyFW3</div><div class='add'>+		 16 = /dev/cuam0		Callout device for ttyAM0</div><div class='add'>+		    ...</div><div class='add'>+		 31 = /dev/cuam15		Callout device for ttyAM15</div><div class='add'>+		 32 = /dev/cudb0		Callout device for ttyDB0</div><div class='add'>+		    ...</div><div class='add'>+		 39 = /dev/cudb7		Callout device for ttyDB7</div><div class='add'>+		 40 = /dev/cusg0		Callout device for ttySG0</div><div class='add'>+		 41 = /dev/ttycusmx0		Callout device for ttySMX0</div><div class='add'>+		 42 = /dev/ttycusmx1		Callout device for ttySMX1</div><div class='add'>+		 43 = /dev/ttycusmx2		Callout device for ttySMX2</div><div class='add'>+		 46 = /dev/cucpm0		Callout device for ttyCPM0</div><div class='add'>+		    ...</div><div class='add'>+		 49 = /dev/cucpm5		Callout device for ttyCPM5</div><div class='add'>+		 50 = /dev/cuioc40		Callout device for ttyIOC40</div><div class='add'>+		    ...</div><div class='add'>+		 81 = /dev/cuioc431		Callout device for ttyIOC431</div><div class='add'>+		 82 = /dev/cuvr0		Callout device for ttyVR0</div><div class='add'>+		 83 = /dev/cuvr1		Callout device for ttyVR1</div><div class='add'>+</div><div class='add'>+ 206 char	OnStream SC-x0 tape devices</div><div class='add'>+		  0 = /dev/osst0		First OnStream SCSI tape, mode 0</div><div class='add'>+		  1 = /dev/osst1		Second OnStream SCSI tape, mode 0</div><div class='add'>+		    ...</div><div class='add'>+		 32 = /dev/osst0l		First OnStream SCSI tape, mode 1</div><div class='add'>+		 33 = /dev/osst1l		Second OnStream SCSI tape, mode 1</div><div class='add'>+		    ...</div><div class='add'>+		 64 = /dev/osst0m		First OnStream SCSI tape, mode 2</div><div class='add'>+		 65 = /dev/osst1m		Second OnStream SCSI tape, mode 2</div><div class='add'>+		    ...</div><div class='add'>+		 96 = /dev/osst0a		First OnStream SCSI tape, mode 3</div><div class='add'>+		 97 = /dev/osst1a		Second OnStream SCSI tape, mode 3</div><div class='add'>+		    ...</div><div class='add'>+		128 = /dev/nosst0		No rewind version of /dev/osst0</div><div class='add'>+		129 = /dev/nosst1		No rewind version of /dev/osst1</div><div class='add'>+		    ...</div><div class='add'>+		160 = /dev/nosst0l		No rewind version of /dev/osst0l</div><div class='add'>+		161 = /dev/nosst1l		No rewind version of /dev/osst1l</div><div class='add'>+		    ...</div><div class='add'>+		192 = /dev/nosst0m		No rewind version of /dev/osst0m</div><div class='add'>+		193 = /dev/nosst1m		No rewind version of /dev/osst1m</div><div class='add'>+		    ...</div><div class='add'>+		224 = /dev/nosst0a		No rewind version of /dev/osst0a</div><div class='add'>+		225 = /dev/nosst1a		No rewind version of /dev/osst1a</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		The OnStream SC-x0 SCSI tapes do not support the</div><div class='add'>+		standard SCSI SASD command set and therefore need</div><div class='add'>+		their own driver "osst". Note that the IDE, USB (and</div><div class='add'>+		maybe ParPort) versions may be driven via ide-scsi or</div><div class='add'>+		usb-storage SCSI emulation and this osst device and</div><div class='add'>+		driver as well.  The ADR-x0 drives are QIC-157</div><div class='add'>+		compliant and don't need osst.</div><div class='add'>+</div><div class='add'>+ 207 char	Compaq ProLiant health feature indicate</div><div class='add'>+		  0 = /dev/cpqhealth/cpqw	Redirector interface</div><div class='add'>+		  1 = /dev/cpqhealth/crom	EISA CROM</div><div class='add'>+		  2 = /dev/cpqhealth/cdt	Data Table</div><div class='add'>+		  3 = /dev/cpqhealth/cevt	Event Log</div><div class='add'>+		  4 = /dev/cpqhealth/casr	Automatic Server Recovery</div><div class='add'>+		  5 = /dev/cpqhealth/cecc	ECC Memory</div><div class='add'>+		  6 = /dev/cpqhealth/cmca	Machine Check Architecture</div><div class='add'>+		  7 = /dev/cpqhealth/ccsm	Deprecated CDT</div><div class='add'>+		  8 = /dev/cpqhealth/cnmi	NMI Handling</div><div class='add'>+		  9 = /dev/cpqhealth/css	Sideshow Management</div><div class='add'>+		 10 = /dev/cpqhealth/cram	CMOS interface</div><div class='add'>+		 11 = /dev/cpqhealth/cpci	PCI IRQ interface</div><div class='add'>+</div><div class='add'>+ 208 char	User space serial ports</div><div class='add'>+		  0 = /dev/ttyU0		First user space serial port</div><div class='add'>+		  1 = /dev/ttyU1		Second user space serial port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 209 char	User space serial ports (alternate devices)</div><div class='add'>+		  0 = /dev/cuu0			Callout device for ttyU0</div><div class='add'>+		  1 = /dev/cuu1			Callout device for ttyU1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 210 char	SBE, Inc. sync/async serial card</div><div class='add'>+		  0 = /dev/sbei/wxcfg0		Configuration device for board 0</div><div class='add'>+		  1 = /dev/sbei/dld0		Download device for board 0</div><div class='add'>+		  2 = /dev/sbei/wan00		WAN device, port 0, board 0</div><div class='add'>+		  3 = /dev/sbei/wan01		WAN device, port 1, board 0</div><div class='add'>+		  4 = /dev/sbei/wan02		WAN device, port 2, board 0</div><div class='add'>+		  5 = /dev/sbei/wan03		WAN device, port 3, board 0</div><div class='add'>+		  6 = /dev/sbei/wanc00		WAN clone device, port 0, board 0</div><div class='add'>+		  7 = /dev/sbei/wanc01		WAN clone device, port 1, board 0</div><div class='add'>+		  8 = /dev/sbei/wanc02		WAN clone device, port 2, board 0</div><div class='add'>+		  9 = /dev/sbei/wanc03		WAN clone device, port 3, board 0</div><div class='add'>+		 10 = /dev/sbei/wxcfg1		Configuration device for board 1</div><div class='add'>+		 11 = /dev/sbei/dld1		Download device for board 1</div><div class='add'>+		 12 = /dev/sbei/wan10		WAN device, port 0, board 1</div><div class='add'>+		 13 = /dev/sbei/wan11		WAN device, port 1, board 1</div><div class='add'>+		 14 = /dev/sbei/wan12		WAN device, port 2, board 1</div><div class='add'>+		 15 = /dev/sbei/wan13		WAN device, port 3, board 1</div><div class='add'>+		 16 = /dev/sbei/wanc10		WAN clone device, port 0, board 1</div><div class='add'>+		 17 = /dev/sbei/wanc11		WAN clone device, port 1, board 1</div><div class='add'>+		 18 = /dev/sbei/wanc12		WAN clone device, port 2, board 1</div><div class='add'>+		 19 = /dev/sbei/wanc13		WAN clone device, port 3, board 1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		Yes, each board is really spaced 10 (decimal) apart.</div><div class='add'>+</div><div class='add'>+ 211 char	Addinum CPCI1500 digital I/O card</div><div class='add'>+		  0 = /dev/addinum/cpci1500/0	First CPCI1500 card</div><div class='add'>+		  1 = /dev/addinum/cpci1500/1	Second CPCI1500 card</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 212 char	LinuxTV.org DVB driver subsystem</div><div class='add'>+		  0 = /dev/dvb/adapter0/video0    first video decoder of first card</div><div class='add'>+		  1 = /dev/dvb/adapter0/audio0    first audio decoder of first card</div><div class='add'>+		  2 = /dev/dvb/adapter0/sec0      (obsolete/unused)</div><div class='add'>+		  3 = /dev/dvb/adapter0/frontend0 first frontend device of first card</div><div class='add'>+		  4 = /dev/dvb/adapter0/demux0    first demux device of first card</div><div class='add'>+		  5 = /dev/dvb/adapter0/dvr0      first digital video recoder device of first card</div><div class='add'>+		  6 = /dev/dvb/adapter0/ca0       first common access port of first card</div><div class='add'>+		  7 = /dev/dvb/adapter0/net0      first network device of first card</div><div class='add'>+		  8 = /dev/dvb/adapter0/osd0      first on-screen-display device of first card</div><div class='add'>+		  9 = /dev/dvb/adapter0/video1    second video decoder of first card</div><div class='add'>+		    ...</div><div class='add'>+		 64 = /dev/dvb/adapter1/video0    first video decoder of second card</div><div class='add'>+		    ...</div><div class='add'>+		128 = /dev/dvb/adapter2/video0    first video decoder of third card</div><div class='add'>+		    ...</div><div class='add'>+		196 = /dev/dvb/adapter3/video0    first video decoder of fourth card</div><div class='add'>+</div><div class='add'>+ 216 char	Bluetooth RFCOMM TTY devices</div><div class='add'>+		  0 = /dev/rfcomm0		First Bluetooth RFCOMM TTY device</div><div class='add'>+		  1 = /dev/rfcomm1		Second Bluetooth RFCOMM TTY device</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 217 char	Bluetooth RFCOMM TTY devices (alternate devices)</div><div class='add'>+		  0 = /dev/curf0		Callout device for rfcomm0</div><div class='add'>+		  1 = /dev/curf1		Callout device for rfcomm1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 218 char	The Logical Company bus Unibus/Qbus adapters</div><div class='add'>+		  0 = /dev/logicalco/bci/0	First bus adapter</div><div class='add'>+		  1 = /dev/logicalco/bci/1	First bus adapter</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 219 char	The Logical Company DCI-1300 digital I/O card</div><div class='add'>+		  0 = /dev/logicalco/dci1300/0	First DCI-1300 card</div><div class='add'>+		  1 = /dev/logicalco/dci1300/1	Second DCI-1300 card</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 220 char	Myricom Myrinet "GM" board</div><div class='add'>+		  0 = /dev/myricom/gm0		First Myrinet GM board</div><div class='add'>+		  1 = /dev/myricom/gmp0		First board "root access"</div><div class='add'>+		  2 = /dev/myricom/gm1		Second Myrinet GM board</div><div class='add'>+		  3 = /dev/myricom/gmp1		Second board "root access"</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 221 char	VME bus</div><div class='add'>+		  0 = /dev/bus/vme/m0		First master image</div><div class='add'>+		  1 = /dev/bus/vme/m1		Second master image</div><div class='add'>+		  2 = /dev/bus/vme/m2		Third master image</div><div class='add'>+		  3 = /dev/bus/vme/m3		Fourth master image</div><div class='add'>+		  4 = /dev/bus/vme/s0		First slave image</div><div class='add'>+		  5 = /dev/bus/vme/s1		Second slave image</div><div class='add'>+		  6 = /dev/bus/vme/s2		Third slave image</div><div class='add'>+		  7 = /dev/bus/vme/s3		Fourth slave image</div><div class='add'>+		  8 = /dev/bus/vme/ctl		Control</div><div class='add'>+</div><div class='add'>+		It is expected that all VME bus drivers will use the</div><div class='add'>+		same interface.  For interface documentation see</div><div class='add'>+		http://www.vmelinux.org/.</div><div class='add'>+</div><div class='add'>+ 224 char	A2232 serial card</div><div class='add'>+		  0 = /dev/ttyY0		First A2232 port</div><div class='add'>+		  1 = /dev/ttyY1		Second A2232 port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 225 char	A2232 serial card (alternate devices)</div><div class='add'>+		  0 = /dev/cuy0			Callout device for ttyY0</div><div class='add'>+		  1 = /dev/cuy1			Callout device for ttyY1</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 226 char	Direct Rendering Infrastructure (DRI)</div><div class='add'>+		  0 = /dev/dri/card0		First graphics card</div><div class='add'>+		  1 = /dev/dri/card1		Second graphics card</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 227 char	IBM 3270 terminal Unix tty access</div><div class='add'>+		  1 = /dev/3270/tty1		First 3270 terminal</div><div class='add'>+		  2 = /dev/3270/tty2		Seconds 3270 terminal</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 228 char	IBM 3270 terminal block-mode access</div><div class='add'>+		  0 = /dev/3270/tub		Controlling interface</div><div class='add'>+		  1 = /dev/3270/tub1		First 3270 terminal</div><div class='add'>+		  2 = /dev/3270/tub2		Second 3270 terminal</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 229 char	IBM iSeries/pSeries virtual console</div><div class='add'>+		  0 = /dev/hvc0			First console port</div><div class='add'>+		  1 = /dev/hvc1			Second console port</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+ 230 char	IBM iSeries virtual tape</div><div class='add'>+		  0 = /dev/iseries/vt0		First virtual tape, mode 0</div><div class='add'>+		  1 = /dev/iseries/vt1		Second virtual tape, mode 0</div><div class='add'>+		    ...</div><div class='add'>+		 32 = /dev/iseries/vt0l		First virtual tape, mode 1</div><div class='add'>+		 33 = /dev/iseries/vt1l		Second virtual tape, mode 1</div><div class='add'>+		    ...</div><div class='add'>+		 64 = /dev/iseries/vt0m		First virtual tape, mode 2</div><div class='add'>+		 65 = /dev/iseries/vt1m		Second virtual tape, mode 2</div><div class='add'>+		    ...</div><div class='add'>+		 96 = /dev/iseries/vt0a		First virtual tape, mode 3</div><div class='add'>+		 97 = /dev/iseries/vt1a		Second virtual tape, mode 3</div><div class='add'>+		      ...</div><div class='add'>+		128 = /dev/iseries/nvt0		First virtual tape, mode 0, no rewind</div><div class='add'>+		129 = /dev/iseries/nvt1		Second virtual tape, mode 0, no rewind</div><div class='add'>+		    ...</div><div class='add'>+		160 = /dev/iseries/nvt0l	First virtual tape, mode 1, no rewind</div><div class='add'>+		161 = /dev/iseries/nvt1l	Second virtual tape, mode 1, no rewind</div><div class='add'>+		    ...</div><div class='add'>+		192 = /dev/iseries/nvt0m	First virtual tape, mode 2, no rewind</div><div class='add'>+		193 = /dev/iseries/nvt1m	Second virtual tape, mode 2, no rewind</div><div class='add'>+		    ...</div><div class='add'>+		224 = /dev/iseries/nvt0a	First virtual tape, mode 3, no rewind</div><div class='add'>+		225 = /dev/iseries/nvt1a	Second virtual tape, mode 3, no rewind</div><div class='add'>+		    ...</div><div class='add'>+</div><div class='add'>+		"No rewind" refers to the omission of the default</div><div class='add'>+		automatic rewind on device close.  The MTREW or MTOFFL</div><div class='add'>+		ioctl()'s can be used to rewind the tape regardless of</div><div class='add'>+		the device used to access it.</div><div class='add'>+</div><div class='add'>+ 231 char	InfiniBand</div><div class='add'>+		0 = /dev/infiniband/umad0</div><div class='add'>+		1 = /dev/infiniband/umad1</div><div class='add'>+		  ...</div><div class='add'>+		63 = /dev/infiniband/umad63    63rd InfiniBandMad device</div><div class='add'>+		64 = /dev/infiniband/issm0     First InfiniBand IsSM device</div><div class='add'>+		65 = /dev/infiniband/issm1     Second InfiniBand IsSM device</div><div class='add'>+		  ...</div><div class='add'>+		127 = /dev/infiniband/issm63    63rd InfiniBand IsSM device</div><div class='add'>+		128 = /dev/infiniband/uverbs0   First InfiniBand verbs device</div><div class='add'>+		129 = /dev/infiniband/uverbs1   Second InfiniBand verbs device</div><div class='add'>+		  ...</div><div class='add'>+		159 = /dev/infiniband/uverbs31  31st InfiniBand verbs device</div><div class='add'>+</div><div class='add'>+ 232 char	Biometric Devices</div><div class='add'>+		0 = /dev/biometric/sensor0/fingerprint	first fingerprint sensor on first device</div><div class='add'>+		1 = /dev/biometric/sensor0/iris		first iris sensor on first device</div><div class='add'>+		2 = /dev/biometric/sensor0/retina	first retina sensor on first device</div><div class='add'>+		3 = /dev/biometric/sensor0/voiceprint	first voiceprint sensor on first device</div><div class='add'>+		4 = /dev/biometric/sensor0/facial	first facial sensor on first device</div><div class='add'>+		5 = /dev/biometric/sensor0/hand		first hand sensor on first device</div><div class='add'>+		  ...</div><div class='add'>+		10 = /dev/biometric/sensor1/fingerprint	first fingerprint sensor on second device</div><div class='add'>+		  ...</div><div class='add'>+		20 = /dev/biometric/sensor2/fingerprint	first fingerprint sensor on third device</div><div class='add'>+		  ...</div><div class='add'>+</div><div class='add'>+ 233 char	PathScale InfiniPath interconnect</div><div class='add'>+		0 = /dev/ipath        Primary device for programs (any unit)</div><div class='add'>+		1 = /dev/ipath0       Access specifically to unit 0</div><div class='add'>+		2 = /dev/ipath1       Access specifically to unit 1</div><div class='add'>+		  ...</div><div class='add'>+		4 = /dev/ipath3       Access specifically to unit 3</div><div class='add'>+		129 = /dev/ipath_sma    Device used by Subnet Management Agent</div><div class='add'>+		130 = /dev/ipath_diag   Device used by diagnostics programs</div><div class='add'>+</div><div class='add'>+ 234-254	char	RESERVED FOR DYNAMIC ASSIGNMENT</div><div class='add'>+		Character devices that request a dynamic allocation of major number will</div><div class='add'>+		take numbers starting from 254 and downward.</div><div class='add'>+</div><div class='add'>+ 240-254 block	LOCAL/EXPERIMENTAL USE</div><div class='add'>+		Allocated for local/experimental use.  For devices not</div><div class='add'>+		assigned official numbers, these ranges should be</div><div class='add'>+		used in order to avoid conflicting with future assignments.</div><div class='add'>+</div><div class='add'>+ 255 char	RESERVED</div><div class='add'>+</div><div class='add'>+ 255 block	RESERVED</div><div class='add'>+</div><div class='add'>+		This major is reserved to assist the expansion to a</div><div class='add'>+		larger number space.  No device nodes with this major</div><div class='add'>+		should ever be created on the filesystem.</div><div class='add'>+		(This is probably not true anymore, but I'll leave it</div><div class='add'>+		for now /Torben)</div><div class='add'>+</div><div class='add'>+ ---LARGE MAJORS!!!!!---</div><div class='add'>+</div><div class='add'>+ 256 char	Equinox SST multi-port serial boards</div><div class='add'>+		   0 = /dev/ttyEQ0	First serial port on first Equinox SST board</div><div class='add'>+		 127 = /dev/ttyEQ127	Last serial port on first Equinox SST board</div><div class='add'>+		 128 = /dev/ttyEQ128	First serial port on second Equinox SST board</div><div class='add'>+		  ...</div><div class='add'>+		1027 = /dev/ttyEQ1027	Last serial port on eighth Equinox SST board</div><div class='add'>+</div><div class='add'>+ 256 block	Resident Flash Disk Flash Translation Layer</div><div class='add'>+		  0 = /dev/rfda		First RFD FTL layer</div><div class='add'>+		 16 = /dev/rfdb		Second RFD FTL layer</div><div class='add'>+		  ...</div><div class='add'>+		240 = /dev/rfdp		16th RFD FTL layer</div><div class='add'>+</div><div class='add'>+ 257 char	Phoenix Technologies Cryptographic Services Driver</div><div class='add'>+		  0 = /dev/ptlsec	Crypto Services Driver</div><div class='add'>+</div><div class='add'>+ 257 block	SSFDC Flash Translation Layer filesystem</div><div class='add'>+		  0 = /dev/ssfdca	First SSFDC layer</div><div class='add'>+		  8 = /dev/ssfdcb	Second SSFDC layer</div><div class='add'>+		 16 = /dev/ssfdcc	Third SSFDC layer</div><div class='add'>+		 24 = /dev/ssfdcd	4th SSFDC layer</div><div class='add'>+		 32 = /dev/ssfdce	5th SSFDC layer</div><div class='add'>+		 40 = /dev/ssfdcf	6th SSFDC layer</div><div class='add'>+		 48 = /dev/ssfdcg	7th SSFDC layer</div><div class='add'>+		 56 = /dev/ssfdch	8th SSFDC layer</div><div class='add'>+</div><div class='add'>+ 258 block	ROM/Flash read-only translation layer</div><div class='add'>+		  0 = /dev/blockrom0	First ROM card's translation layer interface</div><div class='add'>+		  1 = /dev/blockrom1	Second ROM card's translation layer interface</div><div class='add'>+		  ...</div><div class='add'>+</div><div class='add'>+ 259 block	Block Extended Major</div><div class='add'>+		  Used dynamically to hold additional partition minor</div><div class='add'>+		  numbers and allow large numbers of partitions per device</div><div class='add'>+</div><div class='add'>+ 259 char	FPGA configuration interfaces</div><div class='add'>+		  0 = /dev/icap0	First Xilinx internal configuration</div><div class='add'>+		  1 = /dev/icap1	Second Xilinx internal configuration</div><div class='add'>+</div><div class='add'>+ 260 char	OSD (Object-based-device) SCSI Device</div><div class='add'>+		  0 = /dev/osd0		First OSD Device</div><div class='add'>+		  1 = /dev/osd1		Second OSD Device</div><div class='add'>+		  ...</div><div class='add'>+		  255 = /dev/osd255	256th OSD Device</div><div class='head'>diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentation/admin-guide/dynamic-debug-howto.rst<br/>new file mode 100644<br/>index 000000000000..12278a926370<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/dynamic-debug-howto.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/dynamic-debug-howto.rst</a></div><div class='hunk'>@@ -0,0 +1,353 @@</div><div class='add'>+Dynamic debug</div><div class='add'>++++++++++++++</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+This document describes how to use the dynamic debug (dyndbg) feature.</div><div class='add'>+</div><div class='add'>+Dynamic debug is designed to allow you to dynamically enable/disable</div><div class='add'>+kernel code to obtain additional kernel information.  Currently, if</div><div class='add'>+``CONFIG_DYNAMIC_DEBUG`` is set, then all ``pr_debug()``/``dev_dbg()`` and</div><div class='add'>+``print_hex_dump_debug()``/``print_hex_dump_bytes()`` calls can be dynamically</div><div class='add'>+enabled per-callsite.</div><div class='add'>+</div><div class='add'>+If ``CONFIG_DYNAMIC_DEBUG`` is not set, ``print_hex_dump_debug()`` is just</div><div class='add'>+shortcut for ``print_hex_dump(KERN_DEBUG)``.</div><div class='add'>+</div><div class='add'>+For ``print_hex_dump_debug()``/``print_hex_dump_bytes()``, format string is</div><div class='add'>+its ``prefix_str`` argument, if it is constant string; or ``hexdump``</div><div class='add'>+in case ``prefix_str`` is build dynamically.</div><div class='add'>+</div><div class='add'>+Dynamic debug has even more useful features:</div><div class='add'>+</div><div class='add'>+ * Simple query language allows turning on and off debugging</div><div class='add'>+   statements by matching any combination of 0 or 1 of:</div><div class='add'>+</div><div class='add'>+   - source filename</div><div class='add'>+   - function name</div><div class='add'>+   - line number (including ranges of line numbers)</div><div class='add'>+   - module name</div><div class='add'>+   - format string</div><div class='add'>+</div><div class='add'>+ * Provides a debugfs control file: ``&lt;debugfs&gt;/dynamic_debug/control``</div><div class='add'>+   which can be read to display the complete list of known debug</div><div class='add'>+   statements, to help guide you</div><div class='add'>+</div><div class='add'>+Controlling dynamic debug Behaviour</div><div class='add'>+===================================</div><div class='add'>+</div><div class='add'>+The behaviour of ``pr_debug()``/``dev_dbg()`` are controlled via writing to a</div><div class='add'>+control file in the 'debugfs' filesystem. Thus, you must first mount</div><div class='add'>+the debugfs filesystem, in order to make use of this feature.</div><div class='add'>+Subsequently, we refer to the control file as:</div><div class='add'>+``&lt;debugfs&gt;/dynamic_debug/control``. For example, if you want to enable</div><div class='add'>+printing from source file ``svcsock.c``, line 1603 you simply do::</div><div class='add'>+</div><div class='add'>+  nullarbor:~ # echo 'file svcsock.c line 1603 +p' &gt;</div><div class='add'>+				&lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+If you make a mistake with the syntax, the write will fail thus::</div><div class='add'>+</div><div class='add'>+  nullarbor:~ # echo 'file svcsock.c wtf 1 +p' &gt;</div><div class='add'>+				&lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+  -bash: echo: write error: Invalid argument</div><div class='add'>+</div><div class='add'>+Viewing Dynamic Debug Behaviour</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+You can view the currently configured behaviour of all the debug</div><div class='add'>+statements via::</div><div class='add'>+</div><div class='add'>+  nullarbor:~ # cat &lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+  # filename:lineno [module]function flags format</div><div class='add'>+  /usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:323 [svcxprt_rdma]svc_rdma_cleanup =_ "SVCRDMA Module Removed, deregister RPC RDMA transport\012"</div><div class='add'>+  /usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:341 [svcxprt_rdma]svc_rdma_init =_ "\011max_inline       : %d\012"</div><div class='add'>+  /usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:340 [svcxprt_rdma]svc_rdma_init =_ "\011sq_depth         : %d\012"</div><div class='add'>+  /usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:338 [svcxprt_rdma]svc_rdma_init =_ "\011max_requests     : %d\012"</div><div class='add'>+  ...</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+You can also apply standard Unix text manipulation filters to this</div><div class='add'>+data, e.g.::</div><div class='add'>+</div><div class='add'>+  nullarbor:~ # grep -i rdma &lt;debugfs&gt;/dynamic_debug/control  | wc -l</div><div class='add'>+  62</div><div class='add'>+</div><div class='add'>+  nullarbor:~ # grep -i tcp &lt;debugfs&gt;/dynamic_debug/control | wc -l</div><div class='add'>+  42</div><div class='add'>+</div><div class='add'>+The third column shows the currently enabled flags for each debug</div><div class='add'>+statement callsite (see below for definitions of the flags).  The</div><div class='add'>+default value, with no flags enabled, is ``=_``.  So you can view all</div><div class='add'>+the debug statement callsites with any non-default flags::</div><div class='add'>+</div><div class='add'>+  nullarbor:~ # awk '$3 != "=_"' &lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+  # filename:lineno [module]function flags format</div><div class='add'>+  /usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svcsock.c:1603 [sunrpc]svc_send p "svc_process: st_sendto returned %d\012"</div><div class='add'>+</div><div class='add'>+Command Language Reference</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+At the lexical level, a command comprises a sequence of words separated</div><div class='add'>+by spaces or tabs.  So these are all equivalent::</div><div class='add'>+</div><div class='add'>+  nullarbor:~ # echo -n 'file svcsock.c line 1603 +p' &gt;</div><div class='add'>+				&lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+  nullarbor:~ # echo -n '  file   svcsock.c     line  1603 +p  ' &gt;</div><div class='add'>+				&lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+  nullarbor:~ # echo -n 'file svcsock.c line 1603 +p' &gt;</div><div class='add'>+				&lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+Command submissions are bounded by a write() system call.</div><div class='add'>+Multiple commands can be written together, separated by ``;`` or ``\n``::</div><div class='add'>+</div><div class='add'>+  ~# echo "func pnpacpi_get_resources +p; func pnp_assign_mem +p" \</div><div class='add'>+     &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+If your query set is big, you can batch them too::</div><div class='add'>+</div><div class='add'>+  ~# cat query-batch-file &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+A another way is to use wildcard. The match rule support ``*`` (matches</div><div class='add'>+zero or more characters) and ``?`` (matches exactly one character).For</div><div class='add'>+example, you can match all usb drivers::</div><div class='add'>+</div><div class='add'>+  ~# echo "file drivers/usb/* +p" &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+At the syntactical level, a command comprises a sequence of match</div><div class='add'>+specifications, followed by a flags change specification::</div><div class='add'>+</div><div class='add'>+  command ::= match-spec* flags-spec</div><div class='add'>+</div><div class='add'>+The match-spec's are used to choose a subset of the known pr_debug()</div><div class='add'>+callsites to which to apply the flags-spec.  Think of them as a query</div><div class='add'>+with implicit ANDs between each pair.  Note that an empty list of</div><div class='add'>+match-specs will select all debug statement callsites.</div><div class='add'>+</div><div class='add'>+A match specification comprises a keyword, which controls the</div><div class='add'>+attribute of the callsite to be compared, and a value to compare</div><div class='add'>+against.  Possible keywords are:::</div><div class='add'>+</div><div class='add'>+  match-spec ::= 'func' string |</div><div class='add'>+		 'file' string |</div><div class='add'>+		 'module' string |</div><div class='add'>+		 'format' string |</div><div class='add'>+		 'line' line-range</div><div class='add'>+</div><div class='add'>+  line-range ::= lineno |</div><div class='add'>+		 '-'lineno |</div><div class='add'>+		 lineno'-' |</div><div class='add'>+		 lineno'-'lineno</div><div class='add'>+</div><div class='add'>+  lineno ::= unsigned-int</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+  ``line-range`` cannot contain space, e.g.</div><div class='add'>+  "1-30" is valid range but "1 - 30" is not.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The meanings of each keyword are:</div><div class='add'>+</div><div class='add'>+func</div><div class='add'>+    The given string is compared against the function name</div><div class='add'>+    of each callsite.  Example::</div><div class='add'>+</div><div class='add'>+	func svc_tcp_accept</div><div class='add'>+</div><div class='add'>+file</div><div class='add'>+    The given string is compared against either the full pathname, the</div><div class='add'>+    src-root relative pathname, or the basename of the source file of</div><div class='add'>+    each callsite.  Examples::</div><div class='add'>+</div><div class='add'>+	file svcsock.c</div><div class='add'>+	file kernel/freezer.c</div><div class='add'>+	file /usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svcsock.c</div><div class='add'>+</div><div class='add'>+module</div><div class='add'>+    The given string is compared against the module name</div><div class='add'>+    of each callsite.  The module name is the string as</div><div class='add'>+    seen in ``lsmod``, i.e. without the directory or the ``.ko``</div><div class='add'>+    suffix and with ``-`` changed to ``_``.  Examples::</div><div class='add'>+</div><div class='add'>+	module sunrpc</div><div class='add'>+	module nfsd</div><div class='add'>+</div><div class='add'>+format</div><div class='add'>+    The given string is searched for in the dynamic debug format</div><div class='add'>+    string.  Note that the string does not need to match the</div><div class='add'>+    entire format, only some part.  Whitespace and other</div><div class='add'>+    special characters can be escaped using C octal character</div><div class='add'>+    escape ``\ooo`` notation, e.g. the space character is ``\040``.</div><div class='add'>+    Alternatively, the string can be enclosed in double quote</div><div class='add'>+    characters (``"``) or single quote characters (``'``).</div><div class='add'>+    Examples::</div><div class='add'>+</div><div class='add'>+	format svcrdma:         // many of the NFS/RDMA server pr_debugs</div><div class='add'>+	format readahead        // some pr_debugs in the readahead cache</div><div class='add'>+	format nfsd:\040SETATTR // one way to match a format with whitespace</div><div class='add'>+	format "nfsd: SETATTR"  // a neater way to match a format with whitespace</div><div class='add'>+	format 'nfsd: SETATTR'  // yet another way to match a format with whitespace</div><div class='add'>+</div><div class='add'>+line</div><div class='add'>+    The given line number or range of line numbers is compared</div><div class='add'>+    against the line number of each ``pr_debug()`` callsite.  A single</div><div class='add'>+    line number matches the callsite line number exactly.  A</div><div class='add'>+    range of line numbers matches any callsite between the first</div><div class='add'>+    and last line number inclusive.  An empty first number means</div><div class='add'>+    the first line in the file, an empty line number means the</div><div class='add'>+    last number in the file.  Examples::</div><div class='add'>+</div><div class='add'>+	line 1603           // exactly line 1603</div><div class='add'>+	line 1600-1605      // the six lines from line 1600 to line 1605</div><div class='add'>+	line -1605          // the 1605 lines from line 1 to line 1605</div><div class='add'>+	line 1600-          // all lines from line 1600 to the end of the file</div><div class='add'>+</div><div class='add'>+The flags specification comprises a change operation followed</div><div class='add'>+by one or more flag characters.  The change operation is one</div><div class='add'>+of the characters::</div><div class='add'>+</div><div class='add'>+  -    remove the given flags</div><div class='add'>+  +    add the given flags</div><div class='add'>+  =    set the flags to the given flags</div><div class='add'>+</div><div class='add'>+The flags are::</div><div class='add'>+</div><div class='add'>+  p    enables the pr_debug() callsite.</div><div class='add'>+  f    Include the function name in the printed message</div><div class='add'>+  l    Include line number in the printed message</div><div class='add'>+  m    Include module name in the printed message</div><div class='add'>+  t    Include thread ID in messages not generated from interrupt context</div><div class='add'>+  _    No flags are set. (Or'd with others on input)</div><div class='add'>+</div><div class='add'>+For ``print_hex_dump_debug()`` and ``print_hex_dump_bytes()``, only ``p`` flag</div><div class='add'>+have meaning, other flags ignored.</div><div class='add'>+</div><div class='add'>+For display, the flags are preceded by ``=``</div><div class='add'>+(mnemonic: what the flags are currently equal to).</div><div class='add'>+</div><div class='add'>+Note the regexp ``^[-+=][flmpt_]+$`` matches a flags specification.</div><div class='add'>+To clear all flags at once, use ``=_`` or ``-flmpt``.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Debug messages during Boot Process</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+To activate debug messages for core code and built-in modules during</div><div class='add'>+the boot process, even before userspace and debugfs exists, use</div><div class='add'>+``dyndbg="QUERY"``, ``module.dyndbg="QUERY"``, or ``ddebug_query="QUERY"``</div><div class='add'>+(``ddebug_query`` is obsoleted by ``dyndbg``, and deprecated).  QUERY follows</div><div class='add'>+the syntax described above, but must not exceed 1023 characters.  Your</div><div class='add'>+bootloader may impose lower limits.</div><div class='add'>+</div><div class='add'>+These ``dyndbg`` params are processed just after the ddebug tables are</div><div class='add'>+processed, as part of the arch_initcall.  Thus you can enable debug</div><div class='add'>+messages in all code run after this arch_initcall via this boot</div><div class='add'>+parameter.</div><div class='add'>+</div><div class='add'>+On an x86 system for example ACPI enablement is a subsys_initcall and::</div><div class='add'>+</div><div class='add'>+   dyndbg="file ec.c +p"</div><div class='add'>+</div><div class='add'>+will show early Embedded Controller transactions during ACPI setup if</div><div class='add'>+your machine (typically a laptop) has an Embedded Controller.</div><div class='add'>+PCI (or other devices) initialization also is a hot candidate for using</div><div class='add'>+this boot parameter for debugging purposes.</div><div class='add'>+</div><div class='add'>+If ``foo`` module is not built-in, ``foo.dyndbg`` will still be processed at</div><div class='add'>+boot time, without effect, but will be reprocessed when module is</div><div class='add'>+loaded later. ``dyndbg_query=`` and bare ``dyndbg=`` are only processed at</div><div class='add'>+boot.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Debug Messages at Module Initialization Time</div><div class='add'>+============================================</div><div class='add'>+</div><div class='add'>+When ``modprobe foo`` is called, modprobe scans ``/proc/cmdline`` for</div><div class='add'>+``foo.params``, strips ``foo.``, and passes them to the kernel along with</div><div class='add'>+params given in modprobe args or ``/etc/modprob.d/*.conf`` files,</div><div class='add'>+in the following order:</div><div class='add'>+</div><div class='add'>+1. parameters given via ``/etc/modprobe.d/*.conf``::</div><div class='add'>+</div><div class='add'>+	options foo dyndbg=+pt</div><div class='add'>+	options foo dyndbg # defaults to +p</div><div class='add'>+</div><div class='add'>+2. ``foo.dyndbg`` as given in boot args, ``foo.`` is stripped and passed::</div><div class='add'>+</div><div class='add'>+	foo.dyndbg=" func bar +p; func buz +mp"</div><div class='add'>+</div><div class='add'>+3. args to modprobe::</div><div class='add'>+</div><div class='add'>+	modprobe foo dyndbg==pmf # override previous settings</div><div class='add'>+</div><div class='add'>+These ``dyndbg`` queries are applied in order, with last having final say.</div><div class='add'>+This allows boot args to override or modify those from ``/etc/modprobe.d``</div><div class='add'>+(sensible, since 1 is system wide, 2 is kernel or boot specific), and</div><div class='add'>+modprobe args to override both.</div><div class='add'>+</div><div class='add'>+In the ``foo.dyndbg="QUERY"`` form, the query must exclude ``module foo``.</div><div class='add'>+``foo`` is extracted from the param-name, and applied to each query in</div><div class='add'>+``QUERY``, and only 1 match-spec of each type is allowed.</div><div class='add'>+</div><div class='add'>+The ``dyndbg`` option is a "fake" module parameter, which means:</div><div class='add'>+</div><div class='add'>+- modules do not need to define it explicitly</div><div class='add'>+- every module gets it tacitly, whether they use pr_debug or not</div><div class='add'>+- it doesn't appear in ``/sys/module/$module/parameters/``</div><div class='add'>+  To see it, grep the control file, or inspect ``/proc/cmdline.``</div><div class='add'>+</div><div class='add'>+For ``CONFIG_DYNAMIC_DEBUG`` kernels, any settings given at boot-time (or</div><div class='add'>+enabled by ``-DDEBUG`` flag during compilation) can be disabled later via</div><div class='add'>+the sysfs interface if the debug messages are no longer needed::</div><div class='add'>+</div><div class='add'>+   echo "module module_name -p" &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+Examples</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  // enable the message at line 1603 of file svcsock.c</div><div class='add'>+  nullarbor:~ # echo -n 'file svcsock.c line 1603 +p' &gt;</div><div class='add'>+				&lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+  // enable all the messages in file svcsock.c</div><div class='add'>+  nullarbor:~ # echo -n 'file svcsock.c +p' &gt;</div><div class='add'>+				&lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+  // enable all the messages in the NFS server module</div><div class='add'>+  nullarbor:~ # echo -n 'module nfsd +p' &gt;</div><div class='add'>+				&lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+  // enable all 12 messages in the function svc_process()</div><div class='add'>+  nullarbor:~ # echo -n 'func svc_process +p' &gt;</div><div class='add'>+				&lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+  // disable all 12 messages in the function svc_process()</div><div class='add'>+  nullarbor:~ # echo -n 'func svc_process -p' &gt;</div><div class='add'>+				&lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+  // enable messages for NFS calls READ, READLINK, READDIR and READDIR+.</div><div class='add'>+  nullarbor:~ # echo -n 'format "nfsd: READ" +p' &gt;</div><div class='add'>+				&lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+  // enable messages in files of which the paths include string "usb"</div><div class='add'>+  nullarbor:~ # echo -n '*usb* +p' &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+  // enable all messages</div><div class='add'>+  nullarbor:~ # echo -n '+p' &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+  // add module, function to all enabled messages</div><div class='add'>+  nullarbor:~ # echo -n '+mf' &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='add'>+</div><div class='add'>+  // boot-args example, with newlines and comments for readability</div><div class='add'>+  Kernel command line: ...</div><div class='add'>+    // see whats going on in dyndbg=value processing</div><div class='add'>+    dynamic_debug.verbose=1</div><div class='add'>+    // enable pr_debugs in 2 builtins, #cmt is stripped</div><div class='add'>+    dyndbg="module params +p #cmt ; module sys +p"</div><div class='add'>+    // enable pr_debugs in 2 functions in a module loaded later</div><div class='add'>+    pc87360.dyndbg="func pc87360_init_device +p; func pc87360_find +p"</div><div class='head'>diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst<br/>new file mode 100644<br/>index 000000000000..8ddae4e4299a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/index.rst</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+The Linux kernel user's and administrator's guide</div><div class='add'>+=================================================</div><div class='add'>+</div><div class='add'>+The following is a collection of user-oriented documents that have been</div><div class='add'>+added to the kernel over time.  There is, as yet, little overall order or</div><div class='add'>+organization here — this material was not written to be a single, coherent</div><div class='add'>+document!  With luck things will improve quickly over time.</div><div class='add'>+</div><div class='add'>+This initial section contains overall information, including the README</div><div class='add'>+file describing the kernel as a whole, documentation on kernel parameters,</div><div class='add'>+etc.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   README</div><div class='add'>+   kernel-parameters</div><div class='add'>+   devices</div><div class='add'>+</div><div class='add'>+Here is a set of documents aimed at users who are trying to track down</div><div class='add'>+problems and bugs in particular.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   reporting-bugs</div><div class='add'>+   security-bugs</div><div class='add'>+   bug-hunting</div><div class='add'>+   bug-bisect</div><div class='add'>+   tainted-kernels</div><div class='add'>+   ramoops</div><div class='add'>+   dynamic-debug-howto</div><div class='add'>+   init</div><div class='add'>+</div><div class='add'>+This is the beginning of a section with information of interest to</div><div class='add'>+application developers.  Documents covering various aspects of the kernel</div><div class='add'>+ABI will be found here.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   sysfs-rules</div><div class='add'>+</div><div class='add'>+The rest of this manual consists of various unordered guides on how to</div><div class='add'>+configure specific aspects of kernel behavior to your liking.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   initrd</div><div class='add'>+   serial-console</div><div class='add'>+   braille-console</div><div class='add'>+   parport</div><div class='add'>+   md</div><div class='add'>+   module-signing</div><div class='add'>+   sysrq</div><div class='add'>+   unicode</div><div class='add'>+   vga-softcursor</div><div class='add'>+   binfmt-misc</div><div class='add'>+   mono</div><div class='add'>+   java</div><div class='add'>+   ras</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/admin-guide/init.rst b/Documentation/admin-guide/init.rst<br/>new file mode 100644<br/>index 000000000000..e89d97f31eaf<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/init.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/init.rst</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+Explaining the dreaded "No init found." boot hang message</div><div class='add'>+=========================================================</div><div class='add'>+</div><div class='add'>+OK, so you've got this pretty unintuitive message (currently located</div><div class='add'>+in init/main.c) and are wondering what the H*** went wrong.</div><div class='add'>+Some high-level reasons for failure (listed roughly in order of execution)</div><div class='add'>+to load the init binary are:</div><div class='add'>+</div><div class='add'>+A) Unable to mount root FS</div><div class='add'>+B) init binary doesn't exist on rootfs</div><div class='add'>+C) broken console device</div><div class='add'>+D) binary exists but dependencies not available</div><div class='add'>+E) binary cannot be loaded</div><div class='add'>+</div><div class='add'>+Detailed explanations:</div><div class='add'>+</div><div class='add'>+A) Set "debug" kernel parameter (in bootloader config file or CONFIG_CMDLINE)</div><div class='add'>+   to get more detailed kernel messages.</div><div class='add'>+B) make sure you have the correct root FS type</div><div class='add'>+   (and ``root=`` kernel parameter points to the correct partition),</div><div class='add'>+   required drivers such as storage hardware (such as SCSI or USB!)</div><div class='add'>+   and filesystem (ext3, jffs2 etc.) are builtin (alternatively as modules,</div><div class='add'>+   to be pre-loaded by an initrd)</div><div class='add'>+C) Possibly a conflict in ``console= setup`` --&gt; initial console unavailable.</div><div class='add'>+   E.g. some serial consoles are unreliable due to serial IRQ issues (e.g.</div><div class='add'>+   missing interrupt-based configuration).</div><div class='add'>+   Try using a different ``console= device`` or e.g. ``netconsole=``.</div><div class='add'>+D) e.g. required library dependencies of the init binary such as</div><div class='add'>+   ``/lib/ld-linux.so.2`` missing or broken. Use</div><div class='add'>+   ``readelf -d &lt;INIT&gt;|grep NEEDED`` to find out which libraries are required.</div><div class='add'>+E) make sure the binary's architecture matches your hardware.</div><div class='add'>+   E.g. i386 vs. x86_64 mismatch, or trying to load x86 on ARM hardware.</div><div class='add'>+   In case you tried loading a non-binary file here (shell script?),</div><div class='add'>+   you should make sure that the script specifies an interpreter in its shebang</div><div class='add'>+   header line (``#!/...``) that is fully working (including its library</div><div class='add'>+   dependencies). And before tackling scripts, better first test a simple</div><div class='add'>+   non-script binary such as ``/bin/sh`` and confirm its successful execution.</div><div class='add'>+   To find out more, add code ``to init/main.c`` to display kernel_execve()s</div><div class='add'>+   return values.</div><div class='add'>+</div><div class='add'>+Please extend this explanation whenever you find new failure causes</div><div class='add'>+(after all loading the init binary is a CRITICAL and hard transition step</div><div class='add'>+which needs to be made as painless as possible), then submit patch to LKML.</div><div class='add'>+Further TODOs:</div><div class='add'>+</div><div class='add'>+- Implement the various ``run_init_process()`` invocations via a struct array</div><div class='add'>+  which can then store the ``kernel_execve()`` result value and on failure</div><div class='add'>+  log it all by iterating over **all** results (very important usability fix).</div><div class='add'>+- try to make the implementation itself more helpful in general,</div><div class='add'>+  e.g. by providing additional error messages at affected places.</div><div class='add'>+</div><div class='add'>+Andreas Mohr &lt;andi at lisas period de&gt;</div><div class='head'>diff --git a/Documentation/admin-guide/initrd.rst b/Documentation/admin-guide/initrd.rst<br/>new file mode 100644<br/>index 000000000000..a03dabaaf3a3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/initrd.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/initrd.rst</a></div><div class='hunk'>@@ -0,0 +1,383 @@</div><div class='add'>+Using the initial RAM disk (initrd)</div><div class='add'>+===================================</div><div class='add'>+</div><div class='add'>+Written 1996,2000 by Werner Almesberger &lt;werner.almesberger@epfl.ch&gt; and</div><div class='add'>+Hans Lermen &lt;lermen@fgan.de&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+initrd provides the capability to load a RAM disk by the boot loader.</div><div class='add'>+This RAM disk can then be mounted as the root file system and programs</div><div class='add'>+can be run from it. Afterwards, a new root file system can be mounted</div><div class='add'>+from a different device. The previous root (from initrd) is then moved</div><div class='add'>+to a directory and can be subsequently unmounted.</div><div class='add'>+</div><div class='add'>+initrd is mainly designed to allow system startup to occur in two phases,</div><div class='add'>+where the kernel comes up with a minimum set of compiled-in drivers, and</div><div class='add'>+where additional modules are loaded from initrd.</div><div class='add'>+</div><div class='add'>+This document gives a brief overview of the use of initrd. A more detailed</div><div class='add'>+discussion of the boot process can be found in [#f1]_.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Operation</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+When using initrd, the system typically boots as follows:</div><div class='add'>+</div><div class='add'>+  1) the boot loader loads the kernel and the initial RAM disk</div><div class='add'>+  2) the kernel converts initrd into a "normal" RAM disk and</div><div class='add'>+     frees the memory used by initrd</div><div class='add'>+  3) if the root device is not ``/dev/ram0``, the old (deprecated)</div><div class='add'>+     change_root procedure is followed. see the "Obsolete root change</div><div class='add'>+     mechanism" section below.</div><div class='add'>+  4) root device is mounted. if it is ``/dev/ram0``, the initrd image is</div><div class='add'>+     then mounted as root</div><div class='add'>+  5) /sbin/init is executed (this can be any valid executable, including</div><div class='add'>+     shell scripts; it is run with uid 0 and can do basically everything</div><div class='add'>+     init can do).</div><div class='add'>+  6) init mounts the "real" root file system</div><div class='add'>+  7) init places the root file system at the root directory using the</div><div class='add'>+     pivot_root system call</div><div class='add'>+  8) init execs the ``/sbin/init`` on the new root filesystem, performing</div><div class='add'>+     the usual boot sequence</div><div class='add'>+  9) the initrd file system is removed</div><div class='add'>+</div><div class='add'>+Note that changing the root directory does not involve unmounting it.</div><div class='add'>+It is therefore possible to leave processes running on initrd during that</div><div class='add'>+procedure. Also note that file systems mounted under initrd continue to</div><div class='add'>+be accessible.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Boot command-line options</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+initrd adds the following new options::</div><div class='add'>+</div><div class='add'>+  initrd=&lt;path&gt;    (e.g. LOADLIN)</div><div class='add'>+</div><div class='add'>+    Loads the specified file as the initial RAM disk. When using LILO, you</div><div class='add'>+    have to specify the RAM disk image file in /etc/lilo.conf, using the</div><div class='add'>+    INITRD configuration variable.</div><div class='add'>+</div><div class='add'>+  noinitrd</div><div class='add'>+</div><div class='add'>+    initrd data is preserved but it is not converted to a RAM disk and</div><div class='add'>+    the "normal" root file system is mounted. initrd data can be read</div><div class='add'>+    from /dev/initrd. Note that the data in initrd can have any structure</div><div class='add'>+    in this case and doesn't necessarily have to be a file system image.</div><div class='add'>+    This option is used mainly for debugging.</div><div class='add'>+</div><div class='add'>+    Note: /dev/initrd is read-only and it can only be used once. As soon</div><div class='add'>+    as the last process has closed it, all data is freed and /dev/initrd</div><div class='add'>+    can't be opened anymore.</div><div class='add'>+</div><div class='add'>+  root=/dev/ram0</div><div class='add'>+</div><div class='add'>+    initrd is mounted as root, and the normal boot procedure is followed,</div><div class='add'>+    with the RAM disk mounted as root.</div><div class='add'>+</div><div class='add'>+Compressed cpio images</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+Recent kernels have support for populating a ramdisk from a compressed cpio</div><div class='add'>+archive. On such systems, the creation of a ramdisk image doesn't need to</div><div class='add'>+involve special block devices or loopbacks; you merely create a directory on</div><div class='add'>+disk with the desired initrd content, cd to that directory, and run (as an</div><div class='add'>+example)::</div><div class='add'>+</div><div class='add'>+	find . | cpio --quiet -H newc -o | gzip -9 -n &gt; /boot/imagefile.img</div><div class='add'>+</div><div class='add'>+Examining the contents of an existing image file is just as simple::</div><div class='add'>+</div><div class='add'>+	mkdir /tmp/imagefile</div><div class='add'>+	cd /tmp/imagefile</div><div class='add'>+	gzip -cd /boot/imagefile.img | cpio -imd --quiet</div><div class='add'>+</div><div class='add'>+Installation</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+First, a directory for the initrd file system has to be created on the</div><div class='add'>+"normal" root file system, e.g.::</div><div class='add'>+</div><div class='add'>+	# mkdir /initrd</div><div class='add'>+</div><div class='add'>+The name is not relevant. More details can be found on the</div><div class='add'>+:manpage:`pivot_root(2)` man page.</div><div class='add'>+</div><div class='add'>+If the root file system is created during the boot procedure (i.e. if</div><div class='add'>+you're building an install floppy), the root file system creation</div><div class='add'>+procedure should create the ``/initrd`` directory.</div><div class='add'>+</div><div class='add'>+If initrd will not be mounted in some cases, its content is still</div><div class='add'>+accessible if the following device has been created::</div><div class='add'>+</div><div class='add'>+	# mknod /dev/initrd b 1 250</div><div class='add'>+	# chmod 400 /dev/initrd</div><div class='add'>+</div><div class='add'>+Second, the kernel has to be compiled with RAM disk support and with</div><div class='add'>+support for the initial RAM disk enabled. Also, at least all components</div><div class='add'>+needed to execute programs from initrd (e.g. executable format and file</div><div class='add'>+system) must be compiled into the kernel.</div><div class='add'>+</div><div class='add'>+Third, you have to create the RAM disk image. This is done by creating a</div><div class='add'>+file system on a block device, copying files to it as needed, and then</div><div class='add'>+copying the content of the block device to the initrd file. With recent</div><div class='add'>+kernels, at least three types of devices are suitable for that:</div><div class='add'>+</div><div class='add'>+ - a floppy disk (works everywhere but it's painfully slow)</div><div class='add'>+ - a RAM disk (fast, but allocates physical memory)</div><div class='add'>+ - a loopback device (the most elegant solution)</div><div class='add'>+</div><div class='add'>+We'll describe the loopback device method:</div><div class='add'>+</div><div class='add'>+ 1) make sure loopback block devices are configured into the kernel</div><div class='add'>+ 2) create an empty file system of the appropriate size, e.g.::</div><div class='add'>+</div><div class='add'>+	# dd if=/dev/zero of=initrd bs=300k count=1</div><div class='add'>+	# mke2fs -F -m0 initrd</div><div class='add'>+</div><div class='add'>+    (if space is critical, you may want to use the Minix FS instead of Ext2)</div><div class='add'>+ 3) mount the file system, e.g.::</div><div class='add'>+</div><div class='add'>+	# mount -t ext2 -o loop initrd /mnt</div><div class='add'>+</div><div class='add'>+ 4) create the console device::</div><div class='add'>+</div><div class='add'>+    # mkdir /mnt/dev</div><div class='add'>+    # mknod /mnt/dev/console c 5 1</div><div class='add'>+</div><div class='add'>+ 5) copy all the files that are needed to properly use the initrd</div><div class='add'>+    environment. Don't forget the most important file, ``/sbin/init``</div><div class='add'>+</div><div class='add'>+    .. note:: ``/sbin/init`` permissions must include "x" (execute).</div><div class='add'>+</div><div class='add'>+ 6) correct operation the initrd environment can frequently be tested</div><div class='add'>+    even without rebooting with the command::</div><div class='add'>+</div><div class='add'>+	# chroot /mnt /sbin/init</div><div class='add'>+</div><div class='add'>+    This is of course limited to initrds that do not interfere with the</div><div class='add'>+    general system state (e.g. by reconfiguring network interfaces,</div><div class='add'>+    overwriting mounted devices, trying to start already running demons,</div><div class='add'>+    etc. Note however that it is usually possible to use pivot_root in</div><div class='add'>+    such a chroot'ed initrd environment.)</div><div class='add'>+ 7) unmount the file system::</div><div class='add'>+</div><div class='add'>+	# umount /mnt</div><div class='add'>+</div><div class='add'>+ 8) the initrd is now in the file "initrd". Optionally, it can now be</div><div class='add'>+    compressed::</div><div class='add'>+</div><div class='add'>+	# gzip -9 initrd</div><div class='add'>+</div><div class='add'>+For experimenting with initrd, you may want to take a rescue floppy and</div><div class='add'>+only add a symbolic link from ``/sbin/init`` to ``/bin/sh``. Alternatively, you</div><div class='add'>+can try the experimental newlib environment [#f2]_ to create a small</div><div class='add'>+initrd.</div><div class='add'>+</div><div class='add'>+Finally, you have to boot the kernel and load initrd. Almost all Linux</div><div class='add'>+boot loaders support initrd. Since the boot process is still compatible</div><div class='add'>+with an older mechanism, the following boot command line parameters</div><div class='add'>+have to be given::</div><div class='add'>+</div><div class='add'>+  root=/dev/ram0 rw</div><div class='add'>+</div><div class='add'>+(rw is only necessary if writing to the initrd file system.)</div><div class='add'>+</div><div class='add'>+With LOADLIN, you simply execute::</div><div class='add'>+</div><div class='add'>+     LOADLIN &lt;kernel&gt; initrd=&lt;disk_image&gt;</div><div class='add'>+</div><div class='add'>+e.g.::</div><div class='add'>+</div><div class='add'>+	LOADLIN C:\LINUX\BZIMAGE initrd=C:\LINUX\INITRD.GZ root=/dev/ram0 rw</div><div class='add'>+</div><div class='add'>+With LILO, you add the option ``INITRD=&lt;path&gt;`` to either the global section</div><div class='add'>+or to the section of the respective kernel in ``/etc/lilo.conf``, and pass</div><div class='add'>+the options using APPEND, e.g.::</div><div class='add'>+</div><div class='add'>+  image = /bzImage</div><div class='add'>+    initrd = /boot/initrd.gz</div><div class='add'>+    append = "root=/dev/ram0 rw"</div><div class='add'>+</div><div class='add'>+and run ``/sbin/lilo``</div><div class='add'>+</div><div class='add'>+For other boot loaders, please refer to the respective documentation.</div><div class='add'>+</div><div class='add'>+Now you can boot and enjoy using initrd.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Changing the root device</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+When finished with its duties, init typically changes the root device</div><div class='add'>+and proceeds with starting the Linux system on the "real" root device.</div><div class='add'>+</div><div class='add'>+The procedure involves the following steps:</div><div class='add'>+ - mounting the new root file system</div><div class='add'>+ - turning it into the root file system</div><div class='add'>+ - removing all accesses to the old (initrd) root file system</div><div class='add'>+ - unmounting the initrd file system and de-allocating the RAM disk</div><div class='add'>+</div><div class='add'>+Mounting the new root file system is easy: it just needs to be mounted on</div><div class='add'>+a directory under the current root. Example::</div><div class='add'>+</div><div class='add'>+	# mkdir /new-root</div><div class='add'>+	# mount -o ro /dev/hda1 /new-root</div><div class='add'>+</div><div class='add'>+The root change is accomplished with the pivot_root system call, which</div><div class='add'>+is also available via the ``pivot_root`` utility (see :manpage:`pivot_root(8)`</div><div class='add'>+man page; ``pivot_root`` is distributed with util-linux version 2.10h or higher</div><div class='add'>+[#f3]_). ``pivot_root`` moves the current root to a directory under the new</div><div class='add'>+root, and puts the new root at its place. The directory for the old root</div><div class='add'>+must exist before calling ``pivot_root``. Example::</div><div class='add'>+</div><div class='add'>+	# cd /new-root</div><div class='add'>+	# mkdir initrd</div><div class='add'>+	# pivot_root . initrd</div><div class='add'>+</div><div class='add'>+Now, the init process may still access the old root via its</div><div class='add'>+executable, shared libraries, standard input/output/error, and its</div><div class='add'>+current root directory. All these references are dropped by the</div><div class='add'>+following command::</div><div class='add'>+</div><div class='add'>+	# exec chroot . what-follows &lt;dev/console &gt;dev/console 2&gt;&amp;1</div><div class='add'>+</div><div class='add'>+Where what-follows is a program under the new root, e.g. ``/sbin/init``</div><div class='add'>+If the new root file system will be used with udev and has no valid</div><div class='add'>+``/dev`` directory, udev must be initialized before invoking chroot in order</div><div class='add'>+to provide ``/dev/console``.</div><div class='add'>+</div><div class='add'>+Note: implementation details of pivot_root may change with time. In order</div><div class='add'>+to ensure compatibility, the following points should be observed:</div><div class='add'>+</div><div class='add'>+ - before calling pivot_root, the current directory of the invoking</div><div class='add'>+   process should point to the new root directory</div><div class='add'>+ - use . as the first argument, and the _relative_ path of the directory</div><div class='add'>+   for the old root as the second argument</div><div class='add'>+ - a chroot program must be available under the old and the new root</div><div class='add'>+ - chroot to the new root afterwards</div><div class='add'>+ - use relative paths for dev/console in the exec command</div><div class='add'>+</div><div class='add'>+Now, the initrd can be unmounted and the memory allocated by the RAM</div><div class='add'>+disk can be freed::</div><div class='add'>+</div><div class='add'>+	# umount /initrd</div><div class='add'>+	# blockdev --flushbufs /dev/ram0</div><div class='add'>+</div><div class='add'>+It is also possible to use initrd with an NFS-mounted root, see the</div><div class='add'>+:manpage:`pivot_root(8)` man page for details.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Usage scenarios</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+The main motivation for implementing initrd was to allow for modular</div><div class='add'>+kernel configuration at system installation. The procedure would work</div><div class='add'>+as follows:</div><div class='add'>+</div><div class='add'>+  1) system boots from floppy or other media with a minimal kernel</div><div class='add'>+     (e.g. support for RAM disks, initrd, a.out, and the Ext2 FS) and</div><div class='add'>+     loads initrd</div><div class='add'>+  2) ``/sbin/init`` determines what is needed to (1) mount the "real" root FS</div><div class='add'>+     (i.e. device type, device drivers, file system) and (2) the</div><div class='add'>+     distribution media (e.g. CD-ROM, network, tape, ...). This can be</div><div class='add'>+     done by asking the user, by auto-probing, or by using a hybrid</div><div class='add'>+     approach.</div><div class='add'>+  3) ``/sbin/init`` loads the necessary kernel modules</div><div class='add'>+  4) ``/sbin/init`` creates and populates the root file system (this doesn't</div><div class='add'>+     have to be a very usable system yet)</div><div class='add'>+  5) ``/sbin/init`` invokes ``pivot_root`` to change the root file system and</div><div class='add'>+     execs - via chroot - a program that continues the installation</div><div class='add'>+  6) the boot loader is installed</div><div class='add'>+  7) the boot loader is configured to load an initrd with the set of</div><div class='add'>+     modules that was used to bring up the system (e.g. ``/initrd`` can be</div><div class='add'>+     modified, then unmounted, and finally, the image is written from</div><div class='add'>+     ``/dev/ram0`` or ``/dev/rd/0`` to a file)</div><div class='add'>+  8) now the system is bootable and additional installation tasks can be</div><div class='add'>+     performed</div><div class='add'>+</div><div class='add'>+The key role of initrd here is to re-use the configuration data during</div><div class='add'>+normal system operation without requiring the use of a bloated "generic"</div><div class='add'>+kernel or re-compiling or re-linking the kernel.</div><div class='add'>+</div><div class='add'>+A second scenario is for installations where Linux runs on systems with</div><div class='add'>+different hardware configurations in a single administrative domain. In</div><div class='add'>+such cases, it is desirable to generate only a small set of kernels</div><div class='add'>+(ideally only one) and to keep the system-specific part of configuration</div><div class='add'>+information as small as possible. In this case, a common initrd could be</div><div class='add'>+generated with all the necessary modules. Then, only ``/sbin/init`` or a file</div><div class='add'>+read by it would have to be different.</div><div class='add'>+</div><div class='add'>+A third scenario is more convenient recovery disks, because information</div><div class='add'>+like the location of the root FS partition doesn't have to be provided at</div><div class='add'>+boot time, but the system loaded from initrd can invoke a user-friendly</div><div class='add'>+dialog and it can also perform some sanity checks (or even some form of</div><div class='add'>+auto-detection).</div><div class='add'>+</div><div class='add'>+Last not least, CD-ROM distributors may use it for better installation</div><div class='add'>+from CD, e.g. by using a boot floppy and bootstrapping a bigger RAM disk</div><div class='add'>+via initrd from CD; or by booting via a loader like ``LOADLIN`` or directly</div><div class='add'>+from the CD-ROM, and loading the RAM disk from CD without need of</div><div class='add'>+floppies.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Obsolete root change mechanism</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+The following mechanism was used before the introduction of pivot_root.</div><div class='add'>+Current kernels still support it, but you should _not_ rely on its</div><div class='add'>+continued availability.</div><div class='add'>+</div><div class='add'>+It works by mounting the "real" root device (i.e. the one set with rdev</div><div class='add'>+in the kernel image or with root=... at the boot command line) as the</div><div class='add'>+root file system when linuxrc exits. The initrd file system is then</div><div class='add'>+unmounted, or, if it is still busy, moved to a directory ``/initrd``, if</div><div class='add'>+such a directory exists on the new root file system.</div><div class='add'>+</div><div class='add'>+In order to use this mechanism, you do not have to specify the boot</div><div class='add'>+command options root, init, or rw. (If specified, they will affect</div><div class='add'>+the real root file system, not the initrd environment.)</div><div class='add'>+</div><div class='add'>+If /proc is mounted, the "real" root device can be changed from within</div><div class='add'>+linuxrc by writing the number of the new root FS device to the special</div><div class='add'>+file /proc/sys/kernel/real-root-dev, e.g.::</div><div class='add'>+</div><div class='add'>+  # echo 0x301 &gt;/proc/sys/kernel/real-root-dev</div><div class='add'>+</div><div class='add'>+Note that the mechanism is incompatible with NFS and similar file</div><div class='add'>+systems.</div><div class='add'>+</div><div class='add'>+This old, deprecated mechanism is commonly called ``change_root``, while</div><div class='add'>+the new, supported mechanism is called ``pivot_root``.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Mixed change_root and pivot_root mechanism</div><div class='add'>+------------------------------------------</div><div class='add'>+</div><div class='add'>+In case you did not want to use ``root=/dev/ram0`` to trigger the pivot_root</div><div class='add'>+mechanism, you may create both ``/linuxrc`` and ``/sbin/init`` in your initrd</div><div class='add'>+image.</div><div class='add'>+</div><div class='add'>+``/linuxrc`` would contain only the following::</div><div class='add'>+</div><div class='add'>+	#! /bin/sh</div><div class='add'>+	mount -n -t proc proc /proc</div><div class='add'>+	echo 0x0100 &gt;/proc/sys/kernel/real-root-dev</div><div class='add'>+	umount -n /proc</div><div class='add'>+</div><div class='add'>+Once linuxrc exited, the kernel would mount again your initrd as root,</div><div class='add'>+this time executing ``/sbin/init``. Again, it would be the duty of this init</div><div class='add'>+to build the right environment (maybe using the ``root= device`` passed on</div><div class='add'>+the cmdline) before the final execution of the real ``/sbin/init``.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Resources</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+.. [#f1] Almesberger, Werner; "Booting Linux: The History and the Future"</div><div class='add'>+    http://www.almesberger.net/cv/papers/ols2k-9.ps.gz</div><div class='add'>+.. [#f2] newlib package (experimental), with initrd example</div><div class='add'>+    https://www.sourceware.org/newlib/</div><div class='add'>+.. [#f3] util-linux: Miscellaneous utilities for Linux</div><div class='add'>+    https://www.kernel.org/pub/linux/utils/util-linux/</div><div class='head'>diff --git a/Documentation/admin-guide/java.rst b/Documentation/admin-guide/java.rst<br/>new file mode 100644<br/>index 000000000000..8744e272e6f8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/java.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/java.rst</a></div><div class='hunk'>@@ -0,0 +1,423 @@</div><div class='add'>+Java(tm) Binary Kernel Support for Linux v1.03</div><div class='add'>+----------------------------------------------</div><div class='add'>+</div><div class='add'>+Linux beats them ALL! While all other OS's are TALKING about direct</div><div class='add'>+support of Java Binaries in the OS, Linux is doing it!</div><div class='add'>+</div><div class='add'>+You can execute Java applications and Java Applets just like any</div><div class='add'>+other program after you have done the following:</div><div class='add'>+</div><div class='add'>+1) You MUST FIRST install the Java Developers Kit for Linux.</div><div class='add'>+   The Java on Linux HOWTO gives the details on getting and</div><div class='add'>+   installing this. This HOWTO can be found at:</div><div class='add'>+</div><div class='add'>+	ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/Java-HOWTO</div><div class='add'>+</div><div class='add'>+   You should also set up a reasonable CLASSPATH environment</div><div class='add'>+   variable to use Java applications that make use of any</div><div class='add'>+   nonstandard classes (not included in the same directory</div><div class='add'>+   as the application itself).</div><div class='add'>+</div><div class='add'>+2) You have to compile BINFMT_MISC either as a module or into</div><div class='add'>+   the kernel (``CONFIG_BINFMT_MISC``) and set it up properly.</div><div class='add'>+   If you choose to compile it as a module, you will have</div><div class='add'>+   to insert it manually with modprobe/insmod, as kmod</div><div class='add'>+   cannot easily be supported with binfmt_misc.</div><div class='add'>+   Read the file 'binfmt_misc.txt' in this directory to know</div><div class='add'>+   more about the configuration process.</div><div class='add'>+</div><div class='add'>+3) Add the following configuration items to binfmt_misc</div><div class='add'>+   (you should really have read ``binfmt_misc.txt`` now):</div><div class='add'>+   support for Java applications::</div><div class='add'>+</div><div class='add'>+     ':Java:M::\xca\xfe\xba\xbe::/usr/local/bin/javawrapper:'</div><div class='add'>+</div><div class='add'>+   support for executable Jar files::</div><div class='add'>+</div><div class='add'>+     ':ExecutableJAR:E::jar::/usr/local/bin/jarwrapper:'</div><div class='add'>+</div><div class='add'>+   support for Java Applets::</div><div class='add'>+</div><div class='add'>+     ':Applet:E::html::/usr/bin/appletviewer:'</div><div class='add'>+</div><div class='add'>+   or the following, if you want to be more selective::</div><div class='add'>+</div><div class='add'>+     ':Applet:M::&lt;!--applet::/usr/bin/appletviewer:'</div><div class='add'>+</div><div class='add'>+   Of course you have to fix the path names. The path/file names given in this</div><div class='add'>+   document match the Debian 2.1 system. (i.e. jdk installed in ``/usr``,</div><div class='add'>+   custom wrappers from this document in ``/usr/local``)</div><div class='add'>+</div><div class='add'>+   Note, that for the more selective applet support you have to modify</div><div class='add'>+   existing html-files to contain ``&lt;!--applet--&gt;`` in the first line</div><div class='add'>+   (``&lt;`` has to be the first character!) to let this work!</div><div class='add'>+</div><div class='add'>+   For the compiled Java programs you need a wrapper script like the</div><div class='add'>+   following (this is because Java is broken in case of the filename</div><div class='add'>+   handling), again fix the path names, both in the script and in the</div><div class='add'>+   above given configuration string.</div><div class='add'>+</div><div class='add'>+   You, too, need the little program after the script. Compile like::</div><div class='add'>+</div><div class='add'>+	gcc -O2 -o javaclassname javaclassname.c</div><div class='add'>+</div><div class='add'>+   and stick it to ``/usr/local/bin``.</div><div class='add'>+</div><div class='add'>+   Both the javawrapper shellscript and the javaclassname program</div><div class='add'>+   were supplied by Colin J. Watson &lt;cjw44@cam.ac.uk&gt;.</div><div class='add'>+</div><div class='add'>+Javawrapper shell script:</div><div class='add'>+</div><div class='add'>+.. code-block:: sh</div><div class='add'>+</div><div class='add'>+  #!/bin/bash</div><div class='add'>+  # /usr/local/bin/javawrapper - the wrapper for binfmt_misc/java</div><div class='add'>+</div><div class='add'>+  if [ -z "$1" ]; then</div><div class='add'>+	exec 1&gt;&amp;2</div><div class='add'>+	echo Usage: $0 class-file</div><div class='add'>+	exit 1</div><div class='add'>+  fi</div><div class='add'>+</div><div class='add'>+  CLASS=$1</div><div class='add'>+  FQCLASS=`/usr/local/bin/javaclassname $1`</div><div class='add'>+  FQCLASSN=`echo $FQCLASS | sed -e 's/^.*\.\([^.]*\)$/\1/'`</div><div class='add'>+  FQCLASSP=`echo $FQCLASS | sed -e 's-\.-/-g' -e 's-^[^/]*$--' -e 's-/[^/]*$--'`</div><div class='add'>+</div><div class='add'>+  # for example:</div><div class='add'>+  # CLASS=Test.class</div><div class='add'>+  # FQCLASS=foo.bar.Test</div><div class='add'>+  # FQCLASSN=Test</div><div class='add'>+  # FQCLASSP=foo/bar</div><div class='add'>+</div><div class='add'>+  unset CLASSBASE</div><div class='add'>+</div><div class='add'>+  declare -i LINKLEVEL=0</div><div class='add'>+</div><div class='add'>+  while :; do</div><div class='add'>+	if [ "`basename $CLASS .class`" == "$FQCLASSN" ]; then</div><div class='add'>+		# See if this directory works straight off</div><div class='add'>+		cd -L `dirname $CLASS`</div><div class='add'>+		CLASSDIR=$PWD</div><div class='add'>+		cd $OLDPWD</div><div class='add'>+		if echo $CLASSDIR | grep -q "$FQCLASSP$"; then</div><div class='add'>+			CLASSBASE=`echo $CLASSDIR | sed -e "s.$FQCLASSP$.."`</div><div class='add'>+			break;</div><div class='add'>+		fi</div><div class='add'>+		# Try dereferencing the directory name</div><div class='add'>+		cd -P `dirname $CLASS`</div><div class='add'>+		CLASSDIR=$PWD</div><div class='add'>+		cd $OLDPWD</div><div class='add'>+		if echo $CLASSDIR | grep -q "$FQCLASSP$"; then</div><div class='add'>+			CLASSBASE=`echo $CLASSDIR | sed -e "s.$FQCLASSP$.."`</div><div class='add'>+			break;</div><div class='add'>+		fi</div><div class='add'>+		# If no other possible filename exists</div><div class='add'>+		if [ ! -L $CLASS ]; then</div><div class='add'>+			exec 1&gt;&amp;2</div><div class='add'>+			echo $0:</div><div class='add'>+			echo "  $CLASS should be in a" \</div><div class='add'>+			     "directory tree called $FQCLASSP"</div><div class='add'>+			exit 1</div><div class='add'>+		fi</div><div class='add'>+	fi</div><div class='add'>+	if [ ! -L $CLASS ]; then break; fi</div><div class='add'>+	# Go down one more level of symbolic links</div><div class='add'>+	let LINKLEVEL+=1</div><div class='add'>+	if [ $LINKLEVEL -gt 5 ]; then</div><div class='add'>+		exec 1&gt;&amp;2</div><div class='add'>+		echo $0:</div><div class='add'>+		echo "  Too many symbolic links encountered"</div><div class='add'>+		exit 1</div><div class='add'>+	fi</div><div class='add'>+	CLASS=`ls --color=no -l $CLASS | sed -e 's/^.* \([^ ]*\)$/\1/'`</div><div class='add'>+  done</div><div class='add'>+</div><div class='add'>+  if [ -z "$CLASSBASE" ]; then</div><div class='add'>+	if [ -z "$FQCLASSP" ]; then</div><div class='add'>+		GOODNAME=$FQCLASSN.class</div><div class='add'>+	else</div><div class='add'>+		GOODNAME=$FQCLASSP/$FQCLASSN.class</div><div class='add'>+	fi</div><div class='add'>+	exec 1&gt;&amp;2</div><div class='add'>+	echo $0:</div><div class='add'>+	echo "  $FQCLASS should be in a file called $GOODNAME"</div><div class='add'>+	exit 1</div><div class='add'>+  fi</div><div class='add'>+</div><div class='add'>+  if ! echo $CLASSPATH | grep -q "^\(.*:\)*$CLASSBASE\(:.*\)*"; then</div><div class='add'>+	# class is not in CLASSPATH, so prepend dir of class to CLASSPATH</div><div class='add'>+	if [ -z "${CLASSPATH}" ] ; then</div><div class='add'>+		export CLASSPATH=$CLASSBASE</div><div class='add'>+	else</div><div class='add'>+		export CLASSPATH=$CLASSBASE:$CLASSPATH</div><div class='add'>+	fi</div><div class='add'>+  fi</div><div class='add'>+</div><div class='add'>+  shift</div><div class='add'>+  /usr/bin/java $FQCLASS "$@"</div><div class='add'>+</div><div class='add'>+javaclassname.c:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+  /* javaclassname.c</div><div class='add'>+   *</div><div class='add'>+   * Extracts the class name from a Java class file; intended for use in a Java</div><div class='add'>+   * wrapper of the type supported by the binfmt_misc option in the Linux kernel.</div><div class='add'>+   *</div><div class='add'>+   * Copyright (C) 1999 Colin J. Watson &lt;cjw44@cam.ac.uk&gt;.</div><div class='add'>+   *</div><div class='add'>+   * This program is free software; you can redistribute it and/or modify</div><div class='add'>+   * it under the terms of the GNU General Public License as published by</div><div class='add'>+   * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+   * (at your option) any later version.</div><div class='add'>+   *</div><div class='add'>+   * This program is distributed in the hope that it will be useful,</div><div class='add'>+   * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+   * GNU General Public License for more details.</div><div class='add'>+   *</div><div class='add'>+   * You should have received a copy of the GNU General Public License</div><div class='add'>+   * along with this program; if not, write to the Free Software</div><div class='add'>+   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+   */</div><div class='add'>+</div><div class='add'>+  #include &lt;stdlib.h&gt;</div><div class='add'>+  #include &lt;stdio.h&gt;</div><div class='add'>+  #include &lt;stdarg.h&gt;</div><div class='add'>+  #include &lt;sys/types.h&gt;</div><div class='add'>+</div><div class='add'>+  /* From Sun's Java VM Specification, as tag entries in the constant pool. */</div><div class='add'>+</div><div class='add'>+  #define CP_UTF8 1</div><div class='add'>+  #define CP_INTEGER 3</div><div class='add'>+  #define CP_FLOAT 4</div><div class='add'>+  #define CP_LONG 5</div><div class='add'>+  #define CP_DOUBLE 6</div><div class='add'>+  #define CP_CLASS 7</div><div class='add'>+  #define CP_STRING 8</div><div class='add'>+  #define CP_FIELDREF 9</div><div class='add'>+  #define CP_METHODREF 10</div><div class='add'>+  #define CP_INTERFACEMETHODREF 11</div><div class='add'>+  #define CP_NAMEANDTYPE 12</div><div class='add'>+  #define CP_METHODHANDLE 15</div><div class='add'>+  #define CP_METHODTYPE 16</div><div class='add'>+  #define CP_INVOKEDYNAMIC 18</div><div class='add'>+</div><div class='add'>+  /* Define some commonly used error messages */</div><div class='add'>+</div><div class='add'>+  #define seek_error() error("%s: Cannot seek\n", program)</div><div class='add'>+  #define corrupt_error() error("%s: Class file corrupt\n", program)</div><div class='add'>+  #define eof_error() error("%s: Unexpected end of file\n", program)</div><div class='add'>+  #define utf8_error() error("%s: Only ASCII 1-255 supported\n", program);</div><div class='add'>+</div><div class='add'>+  char *program;</div><div class='add'>+</div><div class='add'>+  long *pool;</div><div class='add'>+</div><div class='add'>+  u_int8_t read_8(FILE *classfile);</div><div class='add'>+  u_int16_t read_16(FILE *classfile);</div><div class='add'>+  void skip_constant(FILE *classfile, u_int16_t *cur);</div><div class='add'>+  void error(const char *format, ...);</div><div class='add'>+  int main(int argc, char **argv);</div><div class='add'>+</div><div class='add'>+  /* Reads in an unsigned 8-bit integer. */</div><div class='add'>+  u_int8_t read_8(FILE *classfile)</div><div class='add'>+  {</div><div class='add'>+	int b = fgetc(classfile);</div><div class='add'>+	if(b == EOF)</div><div class='add'>+		eof_error();</div><div class='add'>+	return (u_int8_t)b;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  /* Reads in an unsigned 16-bit integer. */</div><div class='add'>+  u_int16_t read_16(FILE *classfile)</div><div class='add'>+  {</div><div class='add'>+	int b1, b2;</div><div class='add'>+	b1 = fgetc(classfile);</div><div class='add'>+	if(b1 == EOF)</div><div class='add'>+		eof_error();</div><div class='add'>+	b2 = fgetc(classfile);</div><div class='add'>+	if(b2 == EOF)</div><div class='add'>+		eof_error();</div><div class='add'>+	return (u_int16_t)((b1 &lt;&lt; 8) | b2);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  /* Reads in a value from the constant pool. */</div><div class='add'>+  void skip_constant(FILE *classfile, u_int16_t *cur)</div><div class='add'>+  {</div><div class='add'>+	u_int16_t len;</div><div class='add'>+	int seekerr = 1;</div><div class='add'>+	pool[*cur] = ftell(classfile);</div><div class='add'>+	switch(read_8(classfile))</div><div class='add'>+	{</div><div class='add'>+	case CP_UTF8:</div><div class='add'>+		len = read_16(classfile);</div><div class='add'>+		seekerr = fseek(classfile, len, SEEK_CUR);</div><div class='add'>+		break;</div><div class='add'>+	case CP_CLASS:</div><div class='add'>+	case CP_STRING:</div><div class='add'>+	case CP_METHODTYPE:</div><div class='add'>+		seekerr = fseek(classfile, 2, SEEK_CUR);</div><div class='add'>+		break;</div><div class='add'>+	case CP_METHODHANDLE:</div><div class='add'>+		seekerr = fseek(classfile, 3, SEEK_CUR);</div><div class='add'>+		break;</div><div class='add'>+	case CP_INTEGER:</div><div class='add'>+	case CP_FLOAT:</div><div class='add'>+	case CP_FIELDREF:</div><div class='add'>+	case CP_METHODREF:</div><div class='add'>+	case CP_INTERFACEMETHODREF:</div><div class='add'>+	case CP_NAMEANDTYPE:</div><div class='add'>+	case CP_INVOKEDYNAMIC:</div><div class='add'>+		seekerr = fseek(classfile, 4, SEEK_CUR);</div><div class='add'>+		break;</div><div class='add'>+	case CP_LONG:</div><div class='add'>+	case CP_DOUBLE:</div><div class='add'>+		seekerr = fseek(classfile, 8, SEEK_CUR);</div><div class='add'>+		++(*cur);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		corrupt_error();</div><div class='add'>+	}</div><div class='add'>+	if(seekerr)</div><div class='add'>+		seek_error();</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  void error(const char *format, ...)</div><div class='add'>+  {</div><div class='add'>+	va_list ap;</div><div class='add'>+	va_start(ap, format);</div><div class='add'>+	vfprintf(stderr, format, ap);</div><div class='add'>+	va_end(ap);</div><div class='add'>+	exit(1);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  int main(int argc, char **argv)</div><div class='add'>+  {</div><div class='add'>+	FILE *classfile;</div><div class='add'>+	u_int16_t cp_count, i, this_class, classinfo_ptr;</div><div class='add'>+	u_int8_t length;</div><div class='add'>+</div><div class='add'>+	program = argv[0];</div><div class='add'>+</div><div class='add'>+	if(!argv[1])</div><div class='add'>+		error("%s: Missing input file\n", program);</div><div class='add'>+	classfile = fopen(argv[1], "rb");</div><div class='add'>+	if(!classfile)</div><div class='add'>+		error("%s: Error opening %s\n", program, argv[1]);</div><div class='add'>+</div><div class='add'>+	if(fseek(classfile, 8, SEEK_SET))  /* skip magic and version numbers */</div><div class='add'>+		seek_error();</div><div class='add'>+	cp_count = read_16(classfile);</div><div class='add'>+	pool = calloc(cp_count, sizeof(long));</div><div class='add'>+	if(!pool)</div><div class='add'>+		error("%s: Out of memory for constant pool\n", program);</div><div class='add'>+</div><div class='add'>+	for(i = 1; i &lt; cp_count; ++i)</div><div class='add'>+		skip_constant(classfile, &amp;i);</div><div class='add'>+	if(fseek(classfile, 2, SEEK_CUR))	/* skip access flags */</div><div class='add'>+		seek_error();</div><div class='add'>+</div><div class='add'>+	this_class = read_16(classfile);</div><div class='add'>+	if(this_class &lt; 1 || this_class &gt;= cp_count)</div><div class='add'>+		corrupt_error();</div><div class='add'>+	if(!pool[this_class] || pool[this_class] == -1)</div><div class='add'>+		corrupt_error();</div><div class='add'>+	if(fseek(classfile, pool[this_class] + 1, SEEK_SET))</div><div class='add'>+		seek_error();</div><div class='add'>+</div><div class='add'>+	classinfo_ptr = read_16(classfile);</div><div class='add'>+	if(classinfo_ptr &lt; 1 || classinfo_ptr &gt;= cp_count)</div><div class='add'>+		corrupt_error();</div><div class='add'>+	if(!pool[classinfo_ptr] || pool[classinfo_ptr] == -1)</div><div class='add'>+		corrupt_error();</div><div class='add'>+	if(fseek(classfile, pool[classinfo_ptr] + 1, SEEK_SET))</div><div class='add'>+		seek_error();</div><div class='add'>+</div><div class='add'>+	length = read_16(classfile);</div><div class='add'>+	for(i = 0; i &lt; length; ++i)</div><div class='add'>+	{</div><div class='add'>+		u_int8_t x = read_8(classfile);</div><div class='add'>+		if((x &amp; 0x80) || !x)</div><div class='add'>+		{</div><div class='add'>+			if((x &amp; 0xE0) == 0xC0)</div><div class='add'>+			{</div><div class='add'>+				u_int8_t y = read_8(classfile);</div><div class='add'>+				if((y &amp; 0xC0) == 0x80)</div><div class='add'>+				{</div><div class='add'>+					int c = ((x &amp; 0x1f) &lt;&lt; 6) + (y &amp; 0x3f);</div><div class='add'>+					if(c) putchar(c);</div><div class='add'>+					else utf8_error();</div><div class='add'>+				}</div><div class='add'>+				else utf8_error();</div><div class='add'>+			}</div><div class='add'>+			else utf8_error();</div><div class='add'>+		}</div><div class='add'>+		else if(x == '/') putchar('.');</div><div class='add'>+		else putchar(x);</div><div class='add'>+	}</div><div class='add'>+	putchar('\n');</div><div class='add'>+	free(pool);</div><div class='add'>+	fclose(classfile);</div><div class='add'>+	return 0;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+jarwrapper::</div><div class='add'>+</div><div class='add'>+  #!/bin/bash</div><div class='add'>+  # /usr/local/java/bin/jarwrapper - the wrapper for binfmt_misc/jar</div><div class='add'>+</div><div class='add'>+  java -jar $1</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Now simply ``chmod +x`` the ``.class``, ``.jar`` and/or ``.html`` files you</div><div class='add'>+want to execute.</div><div class='add'>+</div><div class='add'>+To add a Java program to your path best put a symbolic link to the main</div><div class='add'>+.class file into /usr/bin (or another place you like) omitting the .class</div><div class='add'>+extension. The directory containing the original .class file will be</div><div class='add'>+added to your CLASSPATH during execution.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+To test your new setup, enter in the following simple Java app, and name</div><div class='add'>+it "HelloWorld.java":</div><div class='add'>+</div><div class='add'>+.. code-block:: java</div><div class='add'>+</div><div class='add'>+	class HelloWorld {</div><div class='add'>+		public static void main(String args[]) {</div><div class='add'>+			System.out.println("Hello World!");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+Now compile the application with::</div><div class='add'>+</div><div class='add'>+	javac HelloWorld.java</div><div class='add'>+</div><div class='add'>+Set the executable permissions of the binary file, with::</div><div class='add'>+</div><div class='add'>+	chmod 755 HelloWorld.class</div><div class='add'>+</div><div class='add'>+And then execute it::</div><div class='add'>+</div><div class='add'>+	./HelloWorld.class</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+To execute Java Jar files, simple chmod the ``*.jar`` files to include</div><div class='add'>+the execution bit, then just do::</div><div class='add'>+</div><div class='add'>+       ./Application.jar</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+To execute Java Applets, simple chmod the ``*.html`` files to include</div><div class='add'>+the execution bit, then just do::</div><div class='add'>+</div><div class='add'>+	./Applet.html</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+originally by Brian A. Lantz, brian@lantz.com</div><div class='add'>+heavily edited for binfmt_misc by Richard Günther</div><div class='add'>+new scripts by Colin J. Watson &lt;cjw44@cam.ac.uk&gt;</div><div class='add'>+added executable Jar file support by Kurt Huwig &lt;kurt@iku-netz.de&gt;</div><div class='head'>diff --git a/Documentation/admin-guide/kernel-parameters.rst b/Documentation/admin-guide/kernel-parameters.rst<br/>new file mode 100644<br/>index 000000000000..b516164999a8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/kernel-parameters.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/kernel-parameters.rst</a></div><div class='hunk'>@@ -0,0 +1,209 @@</div><div class='add'>+The kernel's command-line parameters</div><div class='add'>+====================================</div><div class='add'>+</div><div class='add'>+The following is a consolidated list of the kernel parameters as</div><div class='add'>+implemented by the __setup(), core_param() and module_param() macros</div><div class='add'>+and sorted into English Dictionary order (defined as ignoring all</div><div class='add'>+punctuation and sorting digits before letters in a case insensitive</div><div class='add'>+manner), and with descriptions where known.</div><div class='add'>+</div><div class='add'>+The kernel parses parameters from the kernel command line up to "--";</div><div class='add'>+if it doesn't recognize a parameter and it doesn't contain a '.', the</div><div class='add'>+parameter gets passed to init: parameters with '=' go into init's</div><div class='add'>+environment, others are passed as command line arguments to init.</div><div class='add'>+Everything after "--" is passed as an argument to init.</div><div class='add'>+</div><div class='add'>+Module parameters can be specified in two ways: via the kernel command</div><div class='add'>+line with a module name prefix, or via modprobe, e.g.::</div><div class='add'>+</div><div class='add'>+	(kernel command line) usbcore.blinkenlights=1</div><div class='add'>+	(modprobe command line) modprobe usbcore blinkenlights=1</div><div class='add'>+</div><div class='add'>+Parameters for modules which are built into the kernel need to be</div><div class='add'>+specified on the kernel command line.  modprobe looks through the</div><div class='add'>+kernel command line (/proc/cmdline) and collects module parameters</div><div class='add'>+when it loads a module, so the kernel command line can be used for</div><div class='add'>+loadable modules too.</div><div class='add'>+</div><div class='add'>+Hyphens (dashes) and underscores are equivalent in parameter names, so::</div><div class='add'>+</div><div class='add'>+	log_buf_len=1M print-fatal-signals=1</div><div class='add'>+</div><div class='add'>+can also be entered as::</div><div class='add'>+</div><div class='add'>+	log-buf-len=1M print_fatal_signals=1</div><div class='add'>+</div><div class='add'>+Double-quotes can be used to protect spaces in values, e.g.::</div><div class='add'>+</div><div class='add'>+	param="spaces in here"</div><div class='add'>+</div><div class='add'>+cpu lists:</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+Some kernel parameters take a list of CPUs as a value, e.g.  isolcpus,</div><div class='add'>+nohz_full, irqaffinity, rcu_nocbs.  The format of this list is:</div><div class='add'>+</div><div class='add'>+	&lt;cpu number&gt;,...,&lt;cpu number&gt;</div><div class='add'>+</div><div class='add'>+or</div><div class='add'>+</div><div class='add'>+	&lt;cpu number&gt;-&lt;cpu number&gt;</div><div class='add'>+	(must be a positive range in ascending order)</div><div class='add'>+</div><div class='add'>+or a mixture</div><div class='add'>+</div><div class='add'>+&lt;cpu number&gt;,...,&lt;cpu number&gt;-&lt;cpu number&gt;</div><div class='add'>+</div><div class='add'>+Note that for the special case of a range one can split the range into equal</div><div class='add'>+sized groups and for each group use some amount from the beginning of that</div><div class='add'>+group:</div><div class='add'>+</div><div class='add'>+	&lt;cpu number&gt;-cpu number&gt;:&lt;used size&gt;/&lt;group size&gt;</div><div class='add'>+</div><div class='add'>+For example one can add to the command line following parameter:</div><div class='add'>+</div><div class='add'>+	isolcpus=1,2,10-20,100-2000:2/25</div><div class='add'>+</div><div class='add'>+where the final item represents CPUs 100,101,125,126,150,151,...</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+This document may not be entirely up to date and comprehensive. The command</div><div class='add'>+"modinfo -p ${modulename}" shows a current list of all parameters of a loadable</div><div class='add'>+module. Loadable modules, after being loaded into the running kernel, also</div><div class='add'>+reveal their parameters in /sys/module/${modulename}/parameters/. Some of these</div><div class='add'>+parameters may be changed at runtime by the command</div><div class='add'>+``echo -n ${value} &gt; /sys/module/${modulename}/parameters/${parm}``.</div><div class='add'>+</div><div class='add'>+The parameters listed below are only valid if certain kernel build options were</div><div class='add'>+enabled and if respective hardware is present. The text in square brackets at</div><div class='add'>+the beginning of each description states the restrictions within which a</div><div class='add'>+parameter is applicable::</div><div class='add'>+</div><div class='add'>+	ACPI	ACPI support is enabled.</div><div class='add'>+	AGP	AGP (Accelerated Graphics Port) is enabled.</div><div class='add'>+	ALSA	ALSA sound support is enabled.</div><div class='add'>+	APIC	APIC support is enabled.</div><div class='add'>+	APM	Advanced Power Management support is enabled.</div><div class='add'>+	ARM	ARM architecture is enabled.</div><div class='add'>+	AVR32	AVR32 architecture is enabled.</div><div class='add'>+	AX25	Appropriate AX.25 support is enabled.</div><div class='add'>+	BLACKFIN Blackfin architecture is enabled.</div><div class='add'>+	CLK	Common clock infrastructure is enabled.</div><div class='add'>+	CMA	Contiguous Memory Area support is enabled.</div><div class='add'>+	DRM	Direct Rendering Management support is enabled.</div><div class='add'>+	DYNAMIC_DEBUG Build in debug messages and enable them at runtime</div><div class='add'>+	EDD	BIOS Enhanced Disk Drive Services (EDD) is enabled</div><div class='add'>+	EFI	EFI Partitioning (GPT) is enabled</div><div class='add'>+	EIDE	EIDE/ATAPI support is enabled.</div><div class='add'>+	EVM	Extended Verification Module</div><div class='add'>+	FB	The frame buffer device is enabled.</div><div class='add'>+	FTRACE	Function tracing enabled.</div><div class='add'>+	GCOV	GCOV profiling is enabled.</div><div class='add'>+	HW	Appropriate hardware is enabled.</div><div class='add'>+	IA-64	IA-64 architecture is enabled.</div><div class='add'>+	IMA     Integrity measurement architecture is enabled.</div><div class='add'>+	IOSCHED	More than one I/O scheduler is enabled.</div><div class='add'>+	IP_PNP	IP DHCP, BOOTP, or RARP is enabled.</div><div class='add'>+	IPV6	IPv6 support is enabled.</div><div class='add'>+	ISAPNP	ISA PnP code is enabled.</div><div class='add'>+	ISDN	Appropriate ISDN support is enabled.</div><div class='add'>+	JOY	Appropriate joystick support is enabled.</div><div class='add'>+	KGDB	Kernel debugger support is enabled.</div><div class='add'>+	KVM	Kernel Virtual Machine support is enabled.</div><div class='add'>+	LIBATA  Libata driver is enabled</div><div class='add'>+	LP	Printer support is enabled.</div><div class='add'>+	LOOP	Loopback device support is enabled.</div><div class='add'>+	M68k	M68k architecture is enabled.</div><div class='add'>+			These options have more detailed description inside of</div><div class='add'>+			Documentation/m68k/kernel-options.txt.</div><div class='add'>+	MDA	MDA console support is enabled.</div><div class='add'>+	MIPS	MIPS architecture is enabled.</div><div class='add'>+	MOUSE	Appropriate mouse support is enabled.</div><div class='add'>+	MSI	Message Signaled Interrupts (PCI).</div><div class='add'>+	MTD	MTD (Memory Technology Device) support is enabled.</div><div class='add'>+	NET	Appropriate network support is enabled.</div><div class='add'>+	NUMA	NUMA support is enabled.</div><div class='add'>+	NFS	Appropriate NFS support is enabled.</div><div class='add'>+	OSS	OSS sound support is enabled.</div><div class='add'>+	PV_OPS	A paravirtualized kernel is enabled.</div><div class='add'>+	PARIDE	The ParIDE (parallel port IDE) subsystem is enabled.</div><div class='add'>+	PARISC	The PA-RISC architecture is enabled.</div><div class='add'>+	PCI	PCI bus support is enabled.</div><div class='add'>+	PCIE	PCI Express support is enabled.</div><div class='add'>+	PCMCIA	The PCMCIA subsystem is enabled.</div><div class='add'>+	PNP	Plug &amp; Play support is enabled.</div><div class='add'>+	PPC	PowerPC architecture is enabled.</div><div class='add'>+	PPT	Parallel port support is enabled.</div><div class='add'>+	PS2	Appropriate PS/2 support is enabled.</div><div class='add'>+	RAM	RAM disk support is enabled.</div><div class='add'>+	S390	S390 architecture is enabled.</div><div class='add'>+	SCSI	Appropriate SCSI support is enabled.</div><div class='add'>+			A lot of drivers have their options described inside</div><div class='add'>+			the Documentation/scsi/ sub-directory.</div><div class='add'>+	SECURITY Different security models are enabled.</div><div class='add'>+	SELINUX SELinux support is enabled.</div><div class='add'>+	APPARMOR AppArmor support is enabled.</div><div class='add'>+	SERIAL	Serial support is enabled.</div><div class='add'>+	SH	SuperH architecture is enabled.</div><div class='add'>+	SMP	The kernel is an SMP kernel.</div><div class='add'>+	SPARC	Sparc architecture is enabled.</div><div class='add'>+	SWSUSP	Software suspend (hibernation) is enabled.</div><div class='add'>+	SUSPEND	System suspend states are enabled.</div><div class='add'>+	TPM	TPM drivers are enabled.</div><div class='add'>+	TS	Appropriate touchscreen support is enabled.</div><div class='add'>+	UMS	USB Mass Storage support is enabled.</div><div class='add'>+	USB	USB support is enabled.</div><div class='add'>+	USBHID	USB Human Interface Device support is enabled.</div><div class='add'>+	V4L	Video For Linux support is enabled.</div><div class='add'>+	VMMIO   Driver for memory mapped virtio devices is enabled.</div><div class='add'>+	VGA	The VGA console has been enabled.</div><div class='add'>+	VT	Virtual terminal support is enabled.</div><div class='add'>+	WDT	Watchdog support is enabled.</div><div class='add'>+	XT	IBM PC/XT MFM hard disk support is enabled.</div><div class='add'>+	X86-32	X86-32, aka i386 architecture is enabled.</div><div class='add'>+	X86-64	X86-64 architecture is enabled.</div><div class='add'>+			More X86-64 boot options can be found in</div><div class='add'>+			Documentation/x86/x86_64/boot-options.txt .</div><div class='add'>+	X86	Either 32-bit or 64-bit x86 (same as X86-32+X86-64)</div><div class='add'>+	X86_UV	SGI UV support is enabled.</div><div class='add'>+	XEN	Xen support is enabled</div><div class='add'>+</div><div class='add'>+In addition, the following text indicates that the option::</div><div class='add'>+</div><div class='add'>+	BUGS=	Relates to possible processor bugs on the said processor.</div><div class='add'>+	KNL	Is a kernel start-up parameter.</div><div class='add'>+	BOOT	Is a boot loader parameter.</div><div class='add'>+</div><div class='add'>+Parameters denoted with BOOT are actually interpreted by the boot</div><div class='add'>+loader, and have no meaning to the kernel directly.</div><div class='add'>+Do not modify the syntax of boot loader parameters without extreme</div><div class='add'>+need or coordination with &lt;Documentation/x86/boot.txt&gt;.</div><div class='add'>+</div><div class='add'>+There are also arch-specific kernel-parameters not documented here.</div><div class='add'>+See for example &lt;Documentation/x86/x86_64/boot-options.txt&gt;.</div><div class='add'>+</div><div class='add'>+Note that ALL kernel parameters listed below are CASE SENSITIVE, and that</div><div class='add'>+a trailing = on the name of any parameter states that that parameter will</div><div class='add'>+be entered as an environment variable, whereas its absence indicates that</div><div class='add'>+it will appear as a kernel argument readable via /proc/cmdline by programs</div><div class='add'>+running once the system is up.</div><div class='add'>+</div><div class='add'>+The number of kernel parameters is not limited, but the length of the</div><div class='add'>+complete command line (parameters including spaces etc.) is limited to</div><div class='add'>+a fixed number of characters. This limit depends on the architecture</div><div class='add'>+and is between 256 and 4096 characters. It is defined in the file</div><div class='add'>+./include/asm/setup.h as COMMAND_LINE_SIZE.</div><div class='add'>+</div><div class='add'>+Finally, the [KMG] suffix is commonly described after a number of kernel</div><div class='add'>+parameter values. These 'K', 'M', and 'G' letters represent the _binary_</div><div class='add'>+multipliers 'Kilo', 'Mega', and 'Giga', equalling 2^10, 2^20, and 2^30</div><div class='add'>+bytes respectively. Such letter suffixes can also be entirely omitted:</div><div class='add'>+</div><div class='add'>+.. include:: kernel-parameters.txt</div><div class='add'>+   :literal:</div><div class='add'>+</div><div class='add'>+Todo</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+	Add more DRM drivers.</div><div class='head'>diff --git a/Documentation/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt<br/>index 37babf91f2cb..986e44387dad 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/kernel-parameters.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/kernel-parameters.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/kernel-parameters.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/kernel-parameters.txt</a></div><div class='hunk'>@@ -1,202 +1,3 @@</div><div class='del'>-                          Kernel Parameters</div><div class='del'>-                          ~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-The following is a consolidated list of the kernel parameters as</div><div class='del'>-implemented by the __setup(), core_param() and module_param() macros</div><div class='del'>-and sorted into English Dictionary order (defined as ignoring all</div><div class='del'>-punctuation and sorting digits before letters in a case insensitive</div><div class='del'>-manner), and with descriptions where known.</div><div class='del'>-</div><div class='del'>-The kernel parses parameters from the kernel command line up to "--";</div><div class='del'>-if it doesn't recognize a parameter and it doesn't contain a '.', the</div><div class='del'>-parameter gets passed to init: parameters with '=' go into init's</div><div class='del'>-environment, others are passed as command line arguments to init.</div><div class='del'>-Everything after "--" is passed as an argument to init.</div><div class='del'>-</div><div class='del'>-Module parameters can be specified in two ways: via the kernel command</div><div class='del'>-line with a module name prefix, or via modprobe, e.g.:</div><div class='del'>-</div><div class='del'>-	(kernel command line) usbcore.blinkenlights=1</div><div class='del'>-	(modprobe command line) modprobe usbcore blinkenlights=1</div><div class='del'>-</div><div class='del'>-Parameters for modules which are built into the kernel need to be</div><div class='del'>-specified on the kernel command line.  modprobe looks through the</div><div class='del'>-kernel command line (/proc/cmdline) and collects module parameters</div><div class='del'>-when it loads a module, so the kernel command line can be used for</div><div class='del'>-loadable modules too.</div><div class='del'>-</div><div class='del'>-Hyphens (dashes) and underscores are equivalent in parameter names, so</div><div class='del'>-	log_buf_len=1M print-fatal-signals=1</div><div class='del'>-can also be entered as</div><div class='del'>-	log-buf-len=1M print_fatal_signals=1</div><div class='del'>-</div><div class='del'>-Double-quotes can be used to protect spaces in values, e.g.:</div><div class='del'>-	param="spaces in here"</div><div class='del'>-</div><div class='del'>-cpu lists:</div><div class='del'>-----------</div><div class='del'>-</div><div class='del'>-Some kernel parameters take a list of CPUs as a value, e.g.  isolcpus,</div><div class='del'>-nohz_full, irqaffinity, rcu_nocbs.  The format of this list is:</div><div class='del'>-</div><div class='del'>-	&lt;cpu number&gt;,...,&lt;cpu number&gt;</div><div class='del'>-</div><div class='del'>-or</div><div class='del'>-</div><div class='del'>-	&lt;cpu number&gt;-&lt;cpu number&gt;</div><div class='del'>-	(must be a positive range in ascending order)</div><div class='del'>-</div><div class='del'>-or a mixture</div><div class='del'>-</div><div class='del'>-&lt;cpu number&gt;,...,&lt;cpu number&gt;-&lt;cpu number&gt;</div><div class='del'>-</div><div class='del'>-Note that for the special case of a range one can split the range into equal</div><div class='del'>-sized groups and for each group use some amount from the beginning of that</div><div class='del'>-group:</div><div class='del'>-</div><div class='del'>-	&lt;cpu number&gt;-cpu number&gt;:&lt;used size&gt;/&lt;group size&gt;</div><div class='del'>-</div><div class='del'>-For example one can add to the command line following parameter:</div><div class='del'>-</div><div class='del'>-	isolcpus=1,2,10-20,100-2000:2/25</div><div class='del'>-</div><div class='del'>-where the final item represents CPUs 100,101,125,126,150,151,...</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-This document may not be entirely up to date and comprehensive. The command</div><div class='del'>-"modinfo -p ${modulename}" shows a current list of all parameters of a loadable</div><div class='del'>-module. Loadable modules, after being loaded into the running kernel, also</div><div class='del'>-reveal their parameters in /sys/module/${modulename}/parameters/. Some of these</div><div class='del'>-parameters may be changed at runtime by the command</div><div class='del'>-"echo -n ${value} &gt; /sys/module/${modulename}/parameters/${parm}".</div><div class='del'>-</div><div class='del'>-The parameters listed below are only valid if certain kernel build options were</div><div class='del'>-enabled and if respective hardware is present. The text in square brackets at</div><div class='del'>-the beginning of each description states the restrictions within which a</div><div class='del'>-parameter is applicable:</div><div class='del'>-</div><div class='del'>-	ACPI	ACPI support is enabled.</div><div class='del'>-	AGP	AGP (Accelerated Graphics Port) is enabled.</div><div class='del'>-	ALSA	ALSA sound support is enabled.</div><div class='del'>-	APIC	APIC support is enabled.</div><div class='del'>-	APM	Advanced Power Management support is enabled.</div><div class='del'>-	ARM	ARM architecture is enabled.</div><div class='del'>-	AVR32	AVR32 architecture is enabled.</div><div class='del'>-	AX25	Appropriate AX.25 support is enabled.</div><div class='del'>-	BLACKFIN Blackfin architecture is enabled.</div><div class='del'>-	CLK	Common clock infrastructure is enabled.</div><div class='del'>-	CMA	Contiguous Memory Area support is enabled.</div><div class='del'>-	DRM	Direct Rendering Management support is enabled.</div><div class='del'>-	DYNAMIC_DEBUG Build in debug messages and enable them at runtime</div><div class='del'>-	EDD	BIOS Enhanced Disk Drive Services (EDD) is enabled</div><div class='del'>-	EFI	EFI Partitioning (GPT) is enabled</div><div class='del'>-	EIDE	EIDE/ATAPI support is enabled.</div><div class='del'>-	EVM	Extended Verification Module</div><div class='del'>-	FB	The frame buffer device is enabled.</div><div class='del'>-	FTRACE	Function tracing enabled.</div><div class='del'>-	GCOV	GCOV profiling is enabled.</div><div class='del'>-	HW	Appropriate hardware is enabled.</div><div class='del'>-	IA-64	IA-64 architecture is enabled.</div><div class='del'>-	IMA     Integrity measurement architecture is enabled.</div><div class='del'>-	IOSCHED	More than one I/O scheduler is enabled.</div><div class='del'>-	IP_PNP	IP DHCP, BOOTP, or RARP is enabled.</div><div class='del'>-	IPV6	IPv6 support is enabled.</div><div class='del'>-	ISAPNP	ISA PnP code is enabled.</div><div class='del'>-	ISDN	Appropriate ISDN support is enabled.</div><div class='del'>-	JOY	Appropriate joystick support is enabled.</div><div class='del'>-	KGDB	Kernel debugger support is enabled.</div><div class='del'>-	KVM	Kernel Virtual Machine support is enabled.</div><div class='del'>-	LIBATA  Libata driver is enabled</div><div class='del'>-	LP	Printer support is enabled.</div><div class='del'>-	LOOP	Loopback device support is enabled.</div><div class='del'>-	M68k	M68k architecture is enabled.</div><div class='del'>-			These options have more detailed description inside of</div><div class='del'>-			Documentation/m68k/kernel-options.txt.</div><div class='del'>-	MDA	MDA console support is enabled.</div><div class='del'>-	MIPS	MIPS architecture is enabled.</div><div class='del'>-	MOUSE	Appropriate mouse support is enabled.</div><div class='del'>-	MSI	Message Signaled Interrupts (PCI).</div><div class='del'>-	MTD	MTD (Memory Technology Device) support is enabled.</div><div class='del'>-	NET	Appropriate network support is enabled.</div><div class='del'>-	NUMA	NUMA support is enabled.</div><div class='del'>-	NFS	Appropriate NFS support is enabled.</div><div class='del'>-	OSS	OSS sound support is enabled.</div><div class='del'>-	PV_OPS	A paravirtualized kernel is enabled.</div><div class='del'>-	PARIDE	The ParIDE (parallel port IDE) subsystem is enabled.</div><div class='del'>-	PARISC	The PA-RISC architecture is enabled.</div><div class='del'>-	PCI	PCI bus support is enabled.</div><div class='del'>-	PCIE	PCI Express support is enabled.</div><div class='del'>-	PCMCIA	The PCMCIA subsystem is enabled.</div><div class='del'>-	PNP	Plug &amp; Play support is enabled.</div><div class='del'>-	PPC	PowerPC architecture is enabled.</div><div class='del'>-	PPT	Parallel port support is enabled.</div><div class='del'>-	PS2	Appropriate PS/2 support is enabled.</div><div class='del'>-	RAM	RAM disk support is enabled.</div><div class='del'>-	S390	S390 architecture is enabled.</div><div class='del'>-	SCSI	Appropriate SCSI support is enabled.</div><div class='del'>-			A lot of drivers have their options described inside</div><div class='del'>-			the Documentation/scsi/ sub-directory.</div><div class='del'>-	SECURITY Different security models are enabled.</div><div class='del'>-	SELINUX SELinux support is enabled.</div><div class='del'>-	APPARMOR AppArmor support is enabled.</div><div class='del'>-	SERIAL	Serial support is enabled.</div><div class='del'>-	SH	SuperH architecture is enabled.</div><div class='del'>-	SMP	The kernel is an SMP kernel.</div><div class='del'>-	SPARC	Sparc architecture is enabled.</div><div class='del'>-	SWSUSP	Software suspend (hibernation) is enabled.</div><div class='del'>-	SUSPEND	System suspend states are enabled.</div><div class='del'>-	TPM	TPM drivers are enabled.</div><div class='del'>-	TS	Appropriate touchscreen support is enabled.</div><div class='del'>-	UMS	USB Mass Storage support is enabled.</div><div class='del'>-	USB	USB support is enabled.</div><div class='del'>-	USBHID	USB Human Interface Device support is enabled.</div><div class='del'>-	V4L	Video For Linux support is enabled.</div><div class='del'>-	VMMIO   Driver for memory mapped virtio devices is enabled.</div><div class='del'>-	VGA	The VGA console has been enabled.</div><div class='del'>-	VT	Virtual terminal support is enabled.</div><div class='del'>-	WDT	Watchdog support is enabled.</div><div class='del'>-	XT	IBM PC/XT MFM hard disk support is enabled.</div><div class='del'>-	X86-32	X86-32, aka i386 architecture is enabled.</div><div class='del'>-	X86-64	X86-64 architecture is enabled.</div><div class='del'>-			More X86-64 boot options can be found in</div><div class='del'>-			Documentation/x86/x86_64/boot-options.txt .</div><div class='del'>-	X86	Either 32-bit or 64-bit x86 (same as X86-32+X86-64)</div><div class='del'>-	X86_UV	SGI UV support is enabled.</div><div class='del'>-	XEN	Xen support is enabled</div><div class='del'>-</div><div class='del'>-In addition, the following text indicates that the option:</div><div class='del'>-</div><div class='del'>-	BUGS=	Relates to possible processor bugs on the said processor.</div><div class='del'>-	KNL	Is a kernel start-up parameter.</div><div class='del'>-	BOOT	Is a boot loader parameter.</div><div class='del'>-</div><div class='del'>-Parameters denoted with BOOT are actually interpreted by the boot</div><div class='del'>-loader, and have no meaning to the kernel directly.</div><div class='del'>-Do not modify the syntax of boot loader parameters without extreme</div><div class='del'>-need or coordination with &lt;Documentation/x86/boot.txt&gt;.</div><div class='del'>-</div><div class='del'>-There are also arch-specific kernel-parameters not documented here.</div><div class='del'>-See for example &lt;Documentation/x86/x86_64/boot-options.txt&gt;.</div><div class='del'>-</div><div class='del'>-Note that ALL kernel parameters listed below are CASE SENSITIVE, and that</div><div class='del'>-a trailing = on the name of any parameter states that that parameter will</div><div class='del'>-be entered as an environment variable, whereas its absence indicates that</div><div class='del'>-it will appear as a kernel argument readable via /proc/cmdline by programs</div><div class='del'>-running once the system is up.</div><div class='del'>-</div><div class='del'>-The number of kernel parameters is not limited, but the length of the</div><div class='del'>-complete command line (parameters including spaces etc.) is limited to</div><div class='del'>-a fixed number of characters. This limit depends on the architecture</div><div class='del'>-and is between 256 and 4096 characters. It is defined in the file</div><div class='del'>-./include/asm/setup.h as COMMAND_LINE_SIZE.</div><div class='del'>-</div><div class='del'>-Finally, the [KMG] suffix is commonly described after a number of kernel</div><div class='del'>-parameter values. These 'K', 'M', and 'G' letters represent the _binary_</div><div class='del'>-multipliers 'Kilo', 'Mega', and 'Giga', equalling 2^10, 2^20, and 2^30</div><div class='del'>-bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	acpi=		[HW,ACPI,X86,ARM64]</div><div class='ctx'> 			Advanced Configuration and Power Interface</div><div class='ctx'> 			Format: { force | on | off | strict | noirq | rsdt |</div><div class='hunk'>@@ -305,6 +106,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			use by PCI</div><div class='ctx'> 			Format: &lt;irq&gt;,&lt;irq&gt;...</div><div class='ctx'> </div><div class='add'>+	acpi_mask_gpe=  [HW,ACPI]</div><div class='add'>+			Due to the existence of _Lxx/_Exx, some GPEs triggered</div><div class='add'>+			by unsupported hardware/firmware features can result in</div><div class='add'>+                        GPE floodings that cannot be automatically disabled by</div><div class='add'>+                        the GPE dispatcher.</div><div class='add'>+			This facility can be used to prevent such uncontrolled</div><div class='add'>+			GPE floodings.</div><div class='add'>+			Format: &lt;int&gt;</div><div class='add'>+			Support masking of GPEs numbered from 0x00 to 0x7f.</div><div class='add'>+</div><div class='ctx'> 	acpi_no_auto_serialize	[HW,ACPI]</div><div class='ctx'> 			Disable auto-serialization of AML methods</div><div class='ctx'> 			AML control methods that contain the opcodes to create</div><div class='hunk'>@@ -738,15 +549,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			loops can be debugged more effectively on production</div><div class='ctx'> 			systems.</div><div class='ctx'> </div><div class='del'>-	clocksource.arm_arch_timer.fsl-a008585=</div><div class='del'>-			[ARM64]</div><div class='del'>-			Format: &lt;bool&gt;</div><div class='del'>-			Enable/disable the workaround of Freescale/NXP</div><div class='del'>-			erratum A-008585.  This can be useful for KVM</div><div class='del'>-			guests, if the guest device tree doesn't show the</div><div class='del'>-			erratum.  If unspecified, the workaround is</div><div class='del'>-			enabled based on the device tree.</div><div class='del'>-</div><div class='ctx'> 	clearcpuid=BITNUM [X86]</div><div class='ctx'> 			Disable CPUID feature X for the kernel. See</div><div class='ctx'> 			arch/x86/include/asm/cpufeatures.h for the valid bit</div><div class='hunk'>@@ -811,7 +613,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			bits, and "f" is flow control ("r" for RTS or</div><div class='ctx'> 			omit it).  Default is "9600n8".</div><div class='ctx'> </div><div class='del'>-			See Documentation/serial-console.txt for more</div><div class='add'>+			See Documentation/admin-guide/serial-console.rst for more</div><div class='ctx'> 			information.  See</div><div class='ctx'> 			Documentation/networking/netconsole.txt for an</div><div class='ctx'> 			alternative.</div><div class='hunk'>@@ -1062,6 +864,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> </div><div class='ctx'> 	dscc4.setup=	[NET]</div><div class='ctx'> </div><div class='add'>+	dump_apple_properties	[X86]</div><div class='add'>+			Dump name and content of EFI device properties on</div><div class='add'>+			x86 Macs.  Useful for driver authors to determine</div><div class='add'>+			what data is available or for reverse-engineering.</div><div class='add'>+</div><div class='ctx'> 	dyndbg[="val"]		[KNL,DYNAMIC_DEBUG]</div><div class='ctx'> 	module.dyndbg[="val"]</div><div class='ctx'> 			Enable debug messages at boot time.  See</div><div class='hunk'>@@ -1074,12 +881,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 	nopku		[X86] Disable Memory Protection Keys CPU feature found</div><div class='ctx'> 			in some Intel CPUs.</div><div class='ctx'> </div><div class='del'>-	eagerfpu=	[X86]</div><div class='del'>-			on	enable eager fpu restore</div><div class='del'>-			off	disable eager fpu restore</div><div class='del'>-			auto	selects the default scheme, which automatically</div><div class='del'>-				enables eagerfpu restore for xsaveopt.</div><div class='del'>-</div><div class='ctx'> 	module.async_probe [KNL]</div><div class='ctx'> 			Enable asynchronous probe on this module.</div><div class='ctx'> </div><div class='hunk'>@@ -1156,6 +957,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			serial port must already be setup and configured.</div><div class='ctx'> 			Options are not yet supported.</div><div class='ctx'> </div><div class='add'>+		lantiq,&lt;addr&gt;</div><div class='add'>+			Start an early, polled-mode console on a lantiq serial</div><div class='add'>+			(lqasc) port at the specified address. The serial port</div><div class='add'>+			must already be setup and configured. Options are not</div><div class='add'>+			yet supported.</div><div class='add'>+</div><div class='ctx'> 		lpuart,&lt;addr&gt;</div><div class='ctx'> 		lpuart32,&lt;addr&gt;</div><div class='ctx'> 			Use early console provided by Freescale LP UART driver</div><div class='hunk'>@@ -1169,9 +976,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			address. The serial port must already be setup</div><div class='ctx'> 			and configured. Options are not yet supported.</div><div class='ctx'> </div><div class='del'>-	earlyprintk=	[X86,SH,BLACKFIN,ARM,M68k]</div><div class='add'>+	earlyprintk=	[X86,SH,BLACKFIN,ARM,M68k,S390]</div><div class='ctx'> 			earlyprintk=vga</div><div class='ctx'> 			earlyprintk=efi</div><div class='add'>+			earlyprintk=sclp</div><div class='ctx'> 			earlyprintk=xen</div><div class='ctx'> 			earlyprintk=serial[,ttySn[,baudrate]]</div><div class='ctx'> 			earlyprintk=serial[,0x...[,baudrate]]</div><div class='hunk'>@@ -1206,6 +1014,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> </div><div class='ctx'> 			The xen output can only be used by Xen PV guests.</div><div class='ctx'> </div><div class='add'>+			The sclp output can only be used on s390.</div><div class='add'>+</div><div class='ctx'> 	edac_report=	[HW,EDAC] Control how to report EDAC event</div><div class='ctx'> 			Format: {"on" | "off" | "force"}</div><div class='ctx'> 			on: enable EDAC to report H/W event. May be overridden</div><div class='hunk'>@@ -1391,6 +1201,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			When zero, profiling data is discarded and associated</div><div class='ctx'> 			debugfs files are removed at module unload time.</div><div class='ctx'> </div><div class='add'>+	goldfish	[X86] Enable the goldfish android emulator platform.</div><div class='add'>+			Don't use this when you are not running on the</div><div class='add'>+			android emulator</div><div class='add'>+</div><div class='ctx'> 	gpt		[EFI] Forces disk with valid GPT signature but</div><div class='ctx'> 			invalid Protective MBR to be treated as GPT. If the</div><div class='ctx'> 			primary GPT is corrupted, it enables the backup/alternate</div><div class='hunk'>@@ -1641,6 +1455,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			The builtin appraise policy appraises all files</div><div class='ctx'> 			owned by uid=0.</div><div class='ctx'> </div><div class='add'>+	ima_canonical_fmt [IMA]</div><div class='add'>+			Use the canonical format for the binary runtime</div><div class='add'>+			measurements, instead of host native format.</div><div class='add'>+</div><div class='ctx'> 	ima_hash=	[IMA]</div><div class='ctx'> 			Format: { md5 | sha1 | rmd160 | sha256 | sha384</div><div class='ctx'> 				   | sha512 | ... }</div><div class='hunk'>@@ -1760,6 +1578,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 		       disable</div><div class='ctx'> 		         Do not enable intel_pstate as the default</div><div class='ctx'> 		         scaling driver for the supported processors</div><div class='add'>+		       passive</div><div class='add'>+			 Use intel_pstate as a scaling driver, but configure it</div><div class='add'>+			 to work with generic cpufreq governors (instead of</div><div class='add'>+			 enabling its internal governor).  This mode cannot be</div><div class='add'>+			 used along with the hardware-managed P-states (HWP)</div><div class='add'>+			 feature.</div><div class='ctx'> 		       force</div><div class='ctx'> 			 Enable intel_pstate on systems that prohibit it by default</div><div class='ctx'> 			 in favor of acpi-cpufreq. Forcing the intel_pstate driver</div><div class='hunk'>@@ -1780,6 +1604,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			Description Table, specifies preferred power management</div><div class='ctx'> 			profile as "Enterprise Server" or "Performance Server",</div><div class='ctx'> 			then this feature is turned on by default.</div><div class='add'>+		per_cpu_perf_limits</div><div class='add'>+			Allow per-logical-CPU P-State performance control limits using</div><div class='add'>+			cpufreq sysfs interface</div><div class='ctx'> </div><div class='ctx'> 	intremap=	[X86-64, Intel-IOMMU]</div><div class='ctx'> 			on	enable Interrupt Remapping (default)</div><div class='hunk'>@@ -1958,9 +1785,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			kmemcheck=2 (one-shot mode)</div><div class='ctx'> 			Default: 2 (one-shot mode)</div><div class='ctx'> </div><div class='del'>-	kstack=N	[X86] Print N words from the kernel stack</div><div class='del'>-			in oops dumps.</div><div class='del'>-</div><div class='ctx'> 	kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.</div><div class='ctx'> 			Default is 0 (don't ignore, but inject #GP)</div><div class='ctx'> </div><div class='hunk'>@@ -2235,7 +2059,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 	mce=option	[X86-64] See Documentation/x86/x86_64/boot-options.txt</div><div class='ctx'> </div><div class='ctx'> 	md=		[HW] RAID subsystems devices and level</div><div class='del'>-			See Documentation/md.txt.</div><div class='add'>+			See Documentation/admin-guide/md.rst.</div><div class='ctx'> </div><div class='ctx'> 	mdacon=		[MDA]</div><div class='ctx'> 			Format: &lt;first&gt;,&lt;last&gt;</div><div class='hunk'>@@ -2325,6 +2149,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			memory contents and reserves bad memory</div><div class='ctx'> 			regions that are detected.</div><div class='ctx'> </div><div class='add'>+	mem_sleep_default=	[SUSPEND] Default system suspend mode:</div><div class='add'>+			s2idle  - Suspend-To-Idle</div><div class='add'>+			shallow - Power-On Suspend or equivalent (if supported)</div><div class='add'>+			deep    - Suspend-To-RAM or equivalent (if supported)</div><div class='add'>+			See Documentation/power/states.txt.</div><div class='add'>+</div><div class='ctx'> 	meye.*=		[HW] Set MotionEye Camera parameters</div><div class='ctx'> 			See Documentation/video4linux/meye.txt.</div><div class='ctx'> </div><div class='hunk'>@@ -2401,7 +2231,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			that the amount of memory usable for all allocations</div><div class='ctx'> 			is not too small.</div><div class='ctx'> </div><div class='del'>-	movable_node	[KNL,X86] Boot-time switch to enable the effects</div><div class='add'>+	movable_node	[KNL] Boot-time switch to enable the effects</div><div class='ctx'> 			of CONFIG_MOVABLE_NODE=y. See mm/Kconfig for details.</div><div class='ctx'> </div><div class='ctx'> 	MTD_Partition=	[MTD]</div><div class='hunk'>@@ -2545,7 +2375,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			will be sent.</div><div class='ctx'> 			The default is to send the implementation identification</div><div class='ctx'> 			information.</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	nfs.recover_lost_locks =</div><div class='ctx'> 			[NFSv4] Attempt to recover locks that were lost due</div><div class='ctx'> 			to a lease timeout on the server. Please note that</div><div class='hunk'>@@ -2754,6 +2584,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 	no-kvmapf	[X86,KVM] Disable paravirtualized asynchronous page</div><div class='ctx'> 			fault handling.</div><div class='ctx'> </div><div class='add'>+	no-vmw-sched-clock</div><div class='add'>+			[X86,PV_OPS] Disable paravirtualized VMware scheduler</div><div class='add'>+			clock and use the default one.</div><div class='add'>+</div><div class='ctx'> 	no-steal-acc    [X86,KVM] Disable paravirtualized steal time accounting.</div><div class='ctx'> 			steal time is computed, but won't influence scheduler</div><div class='ctx'> 			behaviour</div><div class='hunk'>@@ -3235,6 +3069,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			may be specified.</div><div class='ctx'> 			Format: &lt;port&gt;,&lt;port&gt;....</div><div class='ctx'> </div><div class='add'>+	powersave=off	[PPC] This option disables power saving features.</div><div class='add'>+			It specifically disables cpuidle and sets the</div><div class='add'>+			platform machine description specific power_save</div><div class='add'>+			function to NULL. On Idle the CPU just reduces</div><div class='add'>+			execution priority.</div><div class='add'>+</div><div class='ctx'> 	ppc_strict_facility_enable</div><div class='ctx'> 			[PPC] This option catches any kernel floating point,</div><div class='ctx'> 			Altivec, VSX and SPE outside of regions specifically</div><div class='hunk'>@@ -3318,7 +3158,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 	r128=		[HW,DRM]</div><div class='ctx'> </div><div class='ctx'> 	raid=		[HW,RAID]</div><div class='del'>-			See Documentation/md.txt.</div><div class='add'>+			See Documentation/admin-guide/md.rst.</div><div class='ctx'> </div><div class='ctx'> 	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes</div><div class='ctx'> 			See Documentation/blockdev/ramdisk.txt.</div><div class='hunk'>@@ -3442,6 +3282,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			Lazy RCU callbacks are those which RCU can</div><div class='ctx'> 			prove do nothing more than free memory.</div><div class='ctx'> </div><div class='add'>+	rcutree.rcu_kick_kthreads= [KNL]</div><div class='add'>+			Cause the grace-period kthread to get an extra</div><div class='add'>+			wake_up() if it sleeps three times longer than</div><div class='add'>+			it should at force-quiescent-state time.</div><div class='add'>+			This wake_up() will be accompanied by a</div><div class='add'>+			WARN_ONCE() splat and an ftrace_dump().</div><div class='add'>+</div><div class='ctx'> 	rcuperf.gp_exp= [KNL]</div><div class='ctx'> 			Measure performance of expedited synchronous</div><div class='ctx'> 			grace-period primitives.</div><div class='hunk'>@@ -3668,13 +3515,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			[KNL, SMP] Set scheduler's default relax_domain_level.</div><div class='ctx'> 			See Documentation/cgroup-v1/cpusets.txt.</div><div class='ctx'> </div><div class='del'>-	relative_sleep_states=</div><div class='del'>-			[SUSPEND] Use sleep state labeling where the deepest</div><div class='del'>-			state available other than hibernation is always "mem".</div><div class='del'>-			Format: { "0" | "1" }</div><div class='del'>-			0 -- Traditional sleep state labels.</div><div class='del'>-			1 -- Relative sleep state labels.</div><div class='del'>-</div><div class='ctx'> 	reserve=	[KNL,BUGS] Force the kernel to ignore some iomem area</div><div class='ctx'> </div><div class='ctx'> 	reservetop=	[X86-32]</div><div class='hunk'>@@ -3734,6 +3574,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 	rhash_entries=	[KNL,NET]</div><div class='ctx'> 			Set number of hash buckets for route cache</div><div class='ctx'> </div><div class='add'>+	ring3mwait=disable</div><div class='add'>+			[KNL] Disable ring 3 MONITOR/MWAIT feature on supported</div><div class='add'>+			CPUs.</div><div class='add'>+</div><div class='ctx'> 	ro		[KNL] Mount root device read-only on boot</div><div class='ctx'> </div><div class='ctx'> 	rodata=		[KNL]</div><div class='hunk'>@@ -3824,12 +3668,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 	shapers=	[NET]</div><div class='ctx'> 			Maximal number of shapers.</div><div class='ctx'> </div><div class='del'>-	show_msr=	[x86] show boot-time MSR settings</div><div class='del'>-			Format: { &lt;integer&gt; }</div><div class='del'>-			Show boot-time (BIOS-initialized) MSR settings.</div><div class='del'>-			The parameter means the number of CPUs to show,</div><div class='del'>-			for example 1 means boot CPU only.</div><div class='del'>-</div><div class='ctx'> 	simeth=		[IA-64]</div><div class='ctx'> 	simscsi=</div><div class='ctx'> </div><div class='hunk'>@@ -3856,6 +3694,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			last alloc / free. For more information see</div><div class='ctx'> 			Documentation/vm/slub.txt.</div><div class='ctx'> </div><div class='add'>+	slub_memcg_sysfs=	[MM, SLUB]</div><div class='add'>+			Determines whether to enable sysfs directories for</div><div class='add'>+			memory cgroup sub-caches. 1 to enable, 0 to disable.</div><div class='add'>+			The default is determined by CONFIG_SLUB_MEMCG_SYSFS_ON.</div><div class='add'>+			Enabling this can lead to a very high number of	debug</div><div class='add'>+			directories and files being created under</div><div class='add'>+			/sys/kernel/slub.</div><div class='add'>+</div><div class='ctx'> 	slub_max_order= [MM, SLUB]</div><div class='ctx'> 			Determines the maximum allowed order for slabs.</div><div class='ctx'> 			A high setting may cause OOMs due to memory</div><div class='hunk'>@@ -3998,10 +3844,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			it if 0 is given (See Documentation/cgroup-v1/memory.txt)</div><div class='ctx'> </div><div class='ctx'> 	swiotlb=	[ARM,IA-64,PPC,MIPS,X86]</div><div class='del'>-			Format: { &lt;int&gt; | force }</div><div class='add'>+			Format: { &lt;int&gt; | force | noforce }</div><div class='ctx'> 			&lt;int&gt; -- Number of I/O TLB slabs</div><div class='ctx'> 			force -- force using of bounce buffers even if they</div><div class='ctx'> 			         wouldn't be automatically used by the kernel</div><div class='add'>+			noforce -- Never use bounce buffers (for debugging)</div><div class='ctx'> </div><div class='ctx'> 	switches=	[HW,M68k]</div><div class='ctx'> </div><div class='hunk'>@@ -4197,7 +4044,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			See also Documentation/input/joystick-parport.txt</div><div class='ctx'> </div><div class='ctx'> 	udbg-immortal	[PPC] When debugging early kernel crashes that</div><div class='del'>-			happen after console_init() and before a proper </div><div class='add'>+			happen after console_init() and before a proper</div><div class='ctx'> 			console driver takes over, this boot options might</div><div class='ctx'> 			help "seeing" what's going on.</div><div class='ctx'> </div><div class='hunk'>@@ -4564,9 +4411,3 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 	xirc2ps_cs=	[NET,PCMCIA]</div><div class='ctx'> 			Format:</div><div class='ctx'> 			&lt;irq&gt;,&lt;irq_mask&gt;,&lt;io&gt;,&lt;full_duplex&gt;,&lt;do_sound&gt;,&lt;lockup_hack&gt;[,&lt;irq2&gt;[,&lt;irq3&gt;[,&lt;irq4&gt;]]]</div><div class='del'>-</div><div class='del'>-______________________________________________________________________</div><div class='del'>-</div><div class='del'>-TODO:</div><div class='del'>-</div><div class='del'>-	Add more DRM drivers.</div><div class='head'>diff --git a/Documentation/admin-guide/md.rst b/Documentation/admin-guide/md.rst<br/>new file mode 100644<br/>index 000000000000..1e61bf50595c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/md.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/md.rst</a></div><div class='hunk'>@@ -0,0 +1,732 @@</div><div class='add'>+RAID arrays</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+Boot time assembly of RAID arrays</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+Tools that manage md devices can be found at</div><div class='add'>+   http://www.kernel.org/pub/linux/utils/raid/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+You can boot with your md device with the following kernel command</div><div class='add'>+lines:</div><div class='add'>+</div><div class='add'>+for old raid arrays without persistent superblocks::</div><div class='add'>+</div><div class='add'>+  md=&lt;md device no.&gt;,&lt;raid level&gt;,&lt;chunk size factor&gt;,&lt;fault level&gt;,dev0,dev1,...,devn</div><div class='add'>+</div><div class='add'>+for raid arrays with persistent superblocks::</div><div class='add'>+</div><div class='add'>+  md=&lt;md device no.&gt;,dev0,dev1,...,devn</div><div class='add'>+</div><div class='add'>+or, to assemble a partitionable array::</div><div class='add'>+</div><div class='add'>+  md=d&lt;md device no.&gt;,dev0,dev1,...,devn</div><div class='add'>+</div><div class='add'>+``md device no.``</div><div class='add'>++++++++++++++++++</div><div class='add'>+</div><div class='add'>+The number of the md device</div><div class='add'>+</div><div class='add'>+================= =========</div><div class='add'>+``md device no.`` device</div><div class='add'>+================= =========</div><div class='add'>+              0		md0</div><div class='add'>+	      1		md1</div><div class='add'>+	      2		md2</div><div class='add'>+	      3		md3</div><div class='add'>+	      4		md4</div><div class='add'>+================= =========</div><div class='add'>+</div><div class='add'>+``raid level``</div><div class='add'>+++++++++++++++</div><div class='add'>+</div><div class='add'>+level of the RAID array</div><div class='add'>+</div><div class='add'>+=============== =============</div><div class='add'>+``raid level``  level</div><div class='add'>+=============== =============</div><div class='add'>+-1		linear mode</div><div class='add'>+0		striped mode</div><div class='add'>+=============== =============</div><div class='add'>+</div><div class='add'>+other modes are only supported with persistent super blocks</div><div class='add'>+</div><div class='add'>+``chunk size factor``</div><div class='add'>++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+(raid-0 and raid-1 only)</div><div class='add'>+</div><div class='add'>+Set  the chunk size as 4k &lt;&lt; n.</div><div class='add'>+</div><div class='add'>+``fault level``</div><div class='add'>++++++++++++++++</div><div class='add'>+</div><div class='add'>+Totally ignored</div><div class='add'>+</div><div class='add'>+``dev0`` to ``devn``</div><div class='add'>+++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+e.g. ``/dev/hda1``, ``/dev/hdc1``, ``/dev/sda1``, ``/dev/sdb1``</div><div class='add'>+</div><div class='add'>+A possible loadlin line (Harald Hoyer &lt;HarryH@Royal.Net&gt;)  looks like this::</div><div class='add'>+</div><div class='add'>+	e:\loadlin\loadlin e:\zimage root=/dev/md0 md=0,0,4,0,/dev/hdb2,/dev/hdc3 ro</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Boot time autodetection of RAID arrays</div><div class='add'>+--------------------------------------</div><div class='add'>+</div><div class='add'>+When md is compiled into the kernel (not as module), partitions of</div><div class='add'>+type 0xfd are scanned and automatically assembled into RAID arrays.</div><div class='add'>+This autodetection may be suppressed with the kernel parameter</div><div class='add'>+``raid=noautodetect``.  As of kernel 2.6.9, only drives with a type 0</div><div class='add'>+superblock can be autodetected and run at boot time.</div><div class='add'>+</div><div class='add'>+The kernel parameter ``raid=partitionable`` (or ``raid=part``) means</div><div class='add'>+that all auto-detected arrays are assembled as partitionable.</div><div class='add'>+</div><div class='add'>+Boot time assembly of degraded/dirty arrays</div><div class='add'>+-------------------------------------------</div><div class='add'>+</div><div class='add'>+If a raid5 or raid6 array is both dirty and degraded, it could have</div><div class='add'>+undetectable data corruption.  This is because the fact that it is</div><div class='add'>+``dirty`` means that the parity cannot be trusted, and the fact that it</div><div class='add'>+is degraded means that some datablocks are missing and cannot reliably</div><div class='add'>+be reconstructed (due to no parity).</div><div class='add'>+</div><div class='add'>+For this reason, md will normally refuse to start such an array.  This</div><div class='add'>+requires the sysadmin to take action to explicitly start the array</div><div class='add'>+despite possible corruption.  This is normally done with::</div><div class='add'>+</div><div class='add'>+   mdadm --assemble --force ....</div><div class='add'>+</div><div class='add'>+This option is not really available if the array has the root</div><div class='add'>+filesystem on it.  In order to support this booting from such an</div><div class='add'>+array, md supports a module parameter ``start_dirty_degraded`` which,</div><div class='add'>+when set to 1, bypassed the checks and will allows dirty degraded</div><div class='add'>+arrays to be started.</div><div class='add'>+</div><div class='add'>+So, to boot with a root filesystem of a dirty degraded raid 5 or 6, use::</div><div class='add'>+</div><div class='add'>+   md-mod.start_dirty_degraded=1</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Superblock formats</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+The md driver can support a variety of different superblock formats.</div><div class='add'>+Currently, it supports superblock formats ``0.90.0`` and the ``md-1`` format</div><div class='add'>+introduced in the 2.5 development series.</div><div class='add'>+</div><div class='add'>+The kernel will autodetect which format superblock is being used.</div><div class='add'>+</div><div class='add'>+Superblock format ``0`` is treated differently to others for legacy</div><div class='add'>+reasons - it is the original superblock format.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+General Rules - apply for all superblock formats</div><div class='add'>+------------------------------------------------</div><div class='add'>+</div><div class='add'>+An array is ``created`` by writing appropriate superblocks to all</div><div class='add'>+devices.</div><div class='add'>+</div><div class='add'>+It is ``assembled`` by associating each of these devices with an</div><div class='add'>+particular md virtual device.  Once it is completely assembled, it can</div><div class='add'>+be accessed.</div><div class='add'>+</div><div class='add'>+An array should be created by a user-space tool.  This will write</div><div class='add'>+superblocks to all devices.  It will usually mark the array as</div><div class='add'>+``unclean``, or with some devices missing so that the kernel md driver</div><div class='add'>+can create appropriate redundancy (copying in raid 1, parity</div><div class='add'>+calculation in raid 4/5).</div><div class='add'>+</div><div class='add'>+When an array is assembled, it is first initialized with the</div><div class='add'>+SET_ARRAY_INFO ioctl.  This contains, in particular, a major and minor</div><div class='add'>+version number.  The major version number selects which superblock</div><div class='add'>+format is to be used.  The minor number might be used to tune handling</div><div class='add'>+of the format, such as suggesting where on each device to look for the</div><div class='add'>+superblock.</div><div class='add'>+</div><div class='add'>+Then each device is added using the ADD_NEW_DISK ioctl.  This</div><div class='add'>+provides, in particular, a major and minor number identifying the</div><div class='add'>+device to add.</div><div class='add'>+</div><div class='add'>+The array is started with the RUN_ARRAY ioctl.</div><div class='add'>+</div><div class='add'>+Once started, new devices can be added.  They should have an</div><div class='add'>+appropriate superblock written to them, and then be passed in with</div><div class='add'>+ADD_NEW_DISK.</div><div class='add'>+</div><div class='add'>+Devices that have failed or are not yet active can be detached from an</div><div class='add'>+array using HOT_REMOVE_DISK.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Specific Rules that apply to format-0 super block arrays, and arrays with no superblock (non-persistent)</div><div class='add'>+--------------------------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+An array can be ``created`` by describing the array (level, chunksize</div><div class='add'>+etc) in a SET_ARRAY_INFO ioctl.  This must have ``major_version==0`` and</div><div class='add'>+``raid_disks != 0``.</div><div class='add'>+</div><div class='add'>+Then uninitialized devices can be added with ADD_NEW_DISK.  The</div><div class='add'>+structure passed to ADD_NEW_DISK must specify the state of the device</div><div class='add'>+and its role in the array.</div><div class='add'>+</div><div class='add'>+Once started with RUN_ARRAY, uninitialized spares can be added with</div><div class='add'>+HOT_ADD_DISK.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MD devices in sysfs</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+md devices appear in sysfs (``/sys``) as regular block devices,</div><div class='add'>+e.g.::</div><div class='add'>+</div><div class='add'>+   /sys/block/md0</div><div class='add'>+</div><div class='add'>+Each ``md`` device will contain a subdirectory called ``md`` which</div><div class='add'>+contains further md-specific information about the device.</div><div class='add'>+</div><div class='add'>+All md devices contain:</div><div class='add'>+</div><div class='add'>+  level</div><div class='add'>+     a text file indicating the ``raid level``. e.g. raid0, raid1,</div><div class='add'>+     raid5, linear, multipath, faulty.</div><div class='add'>+     If no raid level has been set yet (array is still being</div><div class='add'>+     assembled), the value will reflect whatever has been written</div><div class='add'>+     to it, which may be a name like the above, or may be a number</div><div class='add'>+     such as ``0``, ``5``, etc.</div><div class='add'>+</div><div class='add'>+  raid_disks</div><div class='add'>+     a text file with a simple number indicating the number of devices</div><div class='add'>+     in a fully functional array.  If this is not yet known, the file</div><div class='add'>+     will be empty.  If an array is being resized this will contain</div><div class='add'>+     the new number of devices.</div><div class='add'>+     Some raid levels allow this value to be set while the array is</div><div class='add'>+     active.  This will reconfigure the array.   Otherwise it can only</div><div class='add'>+     be set while assembling an array.</div><div class='add'>+     A change to this attribute will not be permitted if it would</div><div class='add'>+     reduce the size of the array.  To reduce the number of drives</div><div class='add'>+     in an e.g. raid5, the array size must first be reduced by</div><div class='add'>+     setting the ``array_size`` attribute.</div><div class='add'>+</div><div class='add'>+  chunk_size</div><div class='add'>+     This is the size in bytes for ``chunks`` and is only relevant to</div><div class='add'>+     raid levels that involve striping (0,4,5,6,10). The address space</div><div class='add'>+     of the array is conceptually divided into chunks and consecutive</div><div class='add'>+     chunks are striped onto neighbouring devices.</div><div class='add'>+     The size should be at least PAGE_SIZE (4k) and should be a power</div><div class='add'>+     of 2.  This can only be set while assembling an array</div><div class='add'>+</div><div class='add'>+  layout</div><div class='add'>+     The ``layout`` for the array for the particular level.  This is</div><div class='add'>+     simply a number that is interpretted differently by different</div><div class='add'>+     levels.  It can be written while assembling an array.</div><div class='add'>+</div><div class='add'>+  array_size</div><div class='add'>+     This can be used to artificially constrain the available space in</div><div class='add'>+     the array to be less than is actually available on the combined</div><div class='add'>+     devices.  Writing a number (in Kilobytes) which is less than</div><div class='add'>+     the available size will set the size.  Any reconfiguration of the</div><div class='add'>+     array (e.g. adding devices) will not cause the size to change.</div><div class='add'>+     Writing the word ``default`` will cause the effective size of the</div><div class='add'>+     array to be whatever size is actually available based on</div><div class='add'>+     ``level``, ``chunk_size`` and ``component_size``.</div><div class='add'>+</div><div class='add'>+     This can be used to reduce the size of the array before reducing</div><div class='add'>+     the number of devices in a raid4/5/6, or to support external</div><div class='add'>+     metadata formats which mandate such clipping.</div><div class='add'>+</div><div class='add'>+  reshape_position</div><div class='add'>+     This is either ``none`` or a sector number within the devices of</div><div class='add'>+     the array where ``reshape`` is up to.  If this is set, the three</div><div class='add'>+     attributes mentioned above (raid_disks, chunk_size, layout) can</div><div class='add'>+     potentially have 2 values, an old and a new value.  If these</div><div class='add'>+     values differ, reading the attribute returns::</div><div class='add'>+</div><div class='add'>+        new (old)</div><div class='add'>+</div><div class='add'>+     and writing will effect the ``new`` value, leaving the ``old``</div><div class='add'>+     unchanged.</div><div class='add'>+</div><div class='add'>+  component_size</div><div class='add'>+     For arrays with data redundancy (i.e. not raid0, linear, faulty,</div><div class='add'>+     multipath), all components must be the same size - or at least</div><div class='add'>+     there must a size that they all provide space for.  This is a key</div><div class='add'>+     part or the geometry of the array.  It is measured in sectors</div><div class='add'>+     and can be read from here.  Writing to this value may resize</div><div class='add'>+     the array if the personality supports it (raid1, raid5, raid6),</div><div class='add'>+     and if the component drives are large enough.</div><div class='add'>+</div><div class='add'>+  metadata_version</div><div class='add'>+     This indicates the format that is being used to record metadata</div><div class='add'>+     about the array.  It can be 0.90 (traditional format), 1.0, 1.1,</div><div class='add'>+     1.2 (newer format in varying locations) or ``none`` indicating that</div><div class='add'>+     the kernel isn't managing metadata at all.</div><div class='add'>+     Alternately it can be ``external:`` followed by a string which</div><div class='add'>+     is set by user-space.  This indicates that metadata is managed</div><div class='add'>+     by a user-space program.  Any device failure or other event that</div><div class='add'>+     requires a metadata update will cause array activity to be</div><div class='add'>+     suspended until the event is acknowledged.</div><div class='add'>+</div><div class='add'>+  resync_start</div><div class='add'>+     The point at which resync should start.  If no resync is needed,</div><div class='add'>+     this will be a very large number (or ``none`` since 2.6.30-rc1).  At</div><div class='add'>+     array creation it will default to 0, though starting the array as</div><div class='add'>+     ``clean`` will set it much larger.</div><div class='add'>+</div><div class='add'>+   new_dev</div><div class='add'>+     This file can be written but not read.  The value written should</div><div class='add'>+     be a block device number as major:minor.  e.g. 8:0</div><div class='add'>+     This will cause that device to be attached to the array, if it is</div><div class='add'>+     available.  It will then appear at md/dev-XXX (depending on the</div><div class='add'>+     name of the device) and further configuration is then possible.</div><div class='add'>+</div><div class='add'>+   safe_mode_delay</div><div class='add'>+     When an md array has seen no write requests for a certain period</div><div class='add'>+     of time, it will be marked as ``clean``.  When another write</div><div class='add'>+     request arrives, the array is marked as ``dirty`` before the write</div><div class='add'>+     commences.  This is known as ``safe_mode``.</div><div class='add'>+     The ``certain period`` is controlled by this file which stores the</div><div class='add'>+     period as a number of seconds.  The default is 200msec (0.200).</div><div class='add'>+     Writing a value of 0 disables safemode.</div><div class='add'>+</div><div class='add'>+   array_state</div><div class='add'>+     This file contains a single word which describes the current</div><div class='add'>+     state of the array.  In many cases, the state can be set by</div><div class='add'>+     writing the word for the desired state, however some states</div><div class='add'>+     cannot be explicitly set, and some transitions are not allowed.</div><div class='add'>+</div><div class='add'>+     Select/poll works on this file.  All changes except between</div><div class='add'>+     Active_idle and active (which can be frequent and are not</div><div class='add'>+     very interesting) are notified.  active-&gt;active_idle is</div><div class='add'>+     reported if the metadata is externally managed.</div><div class='add'>+</div><div class='add'>+     clear</div><div class='add'>+         No devices, no size, no level</div><div class='add'>+</div><div class='add'>+         Writing is equivalent to STOP_ARRAY ioctl</div><div class='add'>+</div><div class='add'>+     inactive</div><div class='add'>+         May have some settings, but array is not active</div><div class='add'>+         all IO results in error</div><div class='add'>+</div><div class='add'>+         When written, doesn't tear down array, but just stops it</div><div class='add'>+</div><div class='add'>+     suspended (not supported yet)</div><div class='add'>+         All IO requests will block. The array can be reconfigured.</div><div class='add'>+</div><div class='add'>+         Writing this, if accepted, will block until array is quiessent</div><div class='add'>+</div><div class='add'>+     readonly</div><div class='add'>+         no resync can happen.  no superblocks get written.</div><div class='add'>+</div><div class='add'>+         Write requests fail</div><div class='add'>+</div><div class='add'>+     read-auto</div><div class='add'>+         like readonly, but behaves like ``clean`` on a write request.</div><div class='add'>+</div><div class='add'>+     clean</div><div class='add'>+         no pending writes, but otherwise active.</div><div class='add'>+</div><div class='add'>+         When written to inactive array, starts without resync</div><div class='add'>+</div><div class='add'>+         If a write request arrives then</div><div class='add'>+         if metadata is known, mark ``dirty`` and switch to ``active``.</div><div class='add'>+         if not known, block and switch to write-pending</div><div class='add'>+</div><div class='add'>+         If written to an active array that has pending writes, then fails.</div><div class='add'>+     active</div><div class='add'>+         fully active: IO and resync can be happening.</div><div class='add'>+         When written to inactive array, starts with resync</div><div class='add'>+</div><div class='add'>+     write-pending</div><div class='add'>+         clean, but writes are blocked waiting for ``active`` to be written.</div><div class='add'>+</div><div class='add'>+     active-idle</div><div class='add'>+         like active, but no writes have been seen for a while (safe_mode_delay).</div><div class='add'>+</div><div class='add'>+  bitmap/location</div><div class='add'>+     This indicates where the write-intent bitmap for the array is</div><div class='add'>+     stored.</div><div class='add'>+</div><div class='add'>+     It can be one of ``none``, ``file`` or ``[+-]N``.</div><div class='add'>+     ``file`` may later be extended to ``file:/file/name``</div><div class='add'>+     ``[+-]N`` means that many sectors from the start of the metadata.</div><div class='add'>+</div><div class='add'>+     This is replicated on all devices.  For arrays with externally</div><div class='add'>+     managed metadata, the offset is from the beginning of the</div><div class='add'>+     device.</div><div class='add'>+</div><div class='add'>+  bitmap/chunksize</div><div class='add'>+     The size, in bytes, of the chunk which will be represented by a</div><div class='add'>+     single bit.  For RAID456, it is a portion of an individual</div><div class='add'>+     device. For RAID10, it is a portion of the array.  For RAID1, it</div><div class='add'>+     is both (they come to the same thing).</div><div class='add'>+</div><div class='add'>+  bitmap/time_base</div><div class='add'>+     The time, in seconds, between looking for bits in the bitmap to</div><div class='add'>+     be cleared. In the current implementation, a bit will be cleared</div><div class='add'>+     between 2 and 3 times ``time_base`` after all the covered blocks</div><div class='add'>+     are known to be in-sync.</div><div class='add'>+</div><div class='add'>+  bitmap/backlog</div><div class='add'>+     When write-mostly devices are active in a RAID1, write requests</div><div class='add'>+     to those devices proceed in the background - the filesystem (or</div><div class='add'>+     other user of the device) does not have to wait for them.</div><div class='add'>+     ``backlog`` sets a limit on the number of concurrent background</div><div class='add'>+     writes.  If there are more than this, new writes will by</div><div class='add'>+     synchronous.</div><div class='add'>+</div><div class='add'>+  bitmap/metadata</div><div class='add'>+     This can be either ``internal`` or ``external``.</div><div class='add'>+</div><div class='add'>+     ``internal``</div><div class='add'>+       is the default and means the metadata for the bitmap</div><div class='add'>+       is stored in the first 256 bytes of the allocated space and is</div><div class='add'>+       managed by the md module.</div><div class='add'>+</div><div class='add'>+     ``external``</div><div class='add'>+       means that bitmap metadata is managed externally to</div><div class='add'>+       the kernel (i.e. by some userspace program)</div><div class='add'>+</div><div class='add'>+  bitmap/can_clear</div><div class='add'>+     This is either ``true`` or ``false``.  If ``true``, then bits in the</div><div class='add'>+     bitmap will be cleared when the corresponding blocks are thought</div><div class='add'>+     to be in-sync.  If ``false``, bits will never be cleared.</div><div class='add'>+     This is automatically set to ``false`` if a write happens on a</div><div class='add'>+     degraded array, or if the array becomes degraded during a write.</div><div class='add'>+     When metadata is managed externally, it should be set to true</div><div class='add'>+     once the array becomes non-degraded, and this fact has been</div><div class='add'>+     recorded in the metadata.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+As component devices are added to an md array, they appear in the ``md``</div><div class='add'>+directory as new directories named::</div><div class='add'>+</div><div class='add'>+      dev-XXX</div><div class='add'>+</div><div class='add'>+where ``XXX`` is a name that the kernel knows for the device, e.g. hdb1.</div><div class='add'>+Each directory contains:</div><div class='add'>+</div><div class='add'>+      block</div><div class='add'>+        a symlink to the block device in /sys/block, e.g.::</div><div class='add'>+</div><div class='add'>+	     /sys/block/md0/md/dev-hdb1/block -&gt; ../../../../block/hdb/hdb1</div><div class='add'>+</div><div class='add'>+      super</div><div class='add'>+        A file containing an image of the superblock read from, or</div><div class='add'>+        written to, that device.</div><div class='add'>+</div><div class='add'>+      state</div><div class='add'>+	A file recording the current state of the device in the array</div><div class='add'>+	which can be a comma separated list of:</div><div class='add'>+</div><div class='add'>+	      faulty</div><div class='add'>+			device has been kicked from active use due to</div><div class='add'>+			a detected fault, or it has unacknowledged bad</div><div class='add'>+			blocks</div><div class='add'>+</div><div class='add'>+	      in_sync</div><div class='add'>+			device is a fully in-sync member of the array</div><div class='add'>+</div><div class='add'>+	      writemostly</div><div class='add'>+			device will only be subject to read</div><div class='add'>+			requests if there are no other options.</div><div class='add'>+</div><div class='add'>+			This applies only to raid1 arrays.</div><div class='add'>+</div><div class='add'>+	      blocked</div><div class='add'>+			device has failed, and the failure hasn't been</div><div class='add'>+			acknowledged yet by the metadata handler.</div><div class='add'>+</div><div class='add'>+			Writes that would write to this device if</div><div class='add'>+			it were not faulty are blocked.</div><div class='add'>+</div><div class='add'>+	      spare</div><div class='add'>+			device is working, but not a full member.</div><div class='add'>+</div><div class='add'>+			This includes spares that are in the process</div><div class='add'>+			of being recovered to</div><div class='add'>+</div><div class='add'>+	      write_error</div><div class='add'>+			device has ever seen a write error.</div><div class='add'>+</div><div class='add'>+	      want_replacement</div><div class='add'>+			device is (mostly) working but probably</div><div class='add'>+			should be replaced, either due to errors or</div><div class='add'>+			due to user request.</div><div class='add'>+</div><div class='add'>+	      replacement</div><div class='add'>+			device is a replacement for another active</div><div class='add'>+			device with same raid_disk.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	This list may grow in future.</div><div class='add'>+</div><div class='add'>+	This can be written to.</div><div class='add'>+</div><div class='add'>+	Writing ``faulty``  simulates a failure on the device.</div><div class='add'>+</div><div class='add'>+	Writing ``remove`` removes the device from the array.</div><div class='add'>+</div><div class='add'>+	Writing ``writemostly`` sets the writemostly flag.</div><div class='add'>+</div><div class='add'>+	Writing ``-writemostly`` clears the writemostly flag.</div><div class='add'>+</div><div class='add'>+	Writing ``blocked`` sets the ``blocked`` flag.</div><div class='add'>+</div><div class='add'>+	Writing ``-blocked`` clears the ``blocked`` flags and allows writes</div><div class='add'>+	to complete and possibly simulates an error.</div><div class='add'>+</div><div class='add'>+	Writing ``in_sync`` sets the in_sync flag.</div><div class='add'>+</div><div class='add'>+	Writing ``write_error`` sets writeerrorseen flag.</div><div class='add'>+</div><div class='add'>+	Writing ``-write_error`` clears writeerrorseen flag.</div><div class='add'>+</div><div class='add'>+	Writing ``want_replacement`` is allowed at any time except to a</div><div class='add'>+	replacement device or a spare.  It sets the flag.</div><div class='add'>+</div><div class='add'>+	Writing ``-want_replacement`` is allowed at any time.  It clears</div><div class='add'>+	the flag.</div><div class='add'>+</div><div class='add'>+	Writing ``replacement`` or ``-replacement`` is only allowed before</div><div class='add'>+	starting the array.  It sets or clears the flag.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	This file responds to select/poll. Any change to ``faulty``</div><div class='add'>+	or ``blocked`` causes an event.</div><div class='add'>+</div><div class='add'>+      errors</div><div class='add'>+	An approximate count of read errors that have been detected on</div><div class='add'>+	this device but have not caused the device to be evicted from</div><div class='add'>+	the array (either because they were corrected or because they</div><div class='add'>+	happened while the array was read-only).  When using version-1</div><div class='add'>+	metadata, this value persists across restarts of the array.</div><div class='add'>+</div><div class='add'>+	This value can be written while assembling an array thus</div><div class='add'>+	providing an ongoing count for arrays with metadata managed by</div><div class='add'>+	userspace.</div><div class='add'>+</div><div class='add'>+      slot</div><div class='add'>+        This gives the role that the device has in the array.  It will</div><div class='add'>+	either be ``none`` if the device is not active in the array</div><div class='add'>+        (i.e. is a spare or has failed) or an integer less than the</div><div class='add'>+	``raid_disks`` number for the array indicating which position</div><div class='add'>+	it currently fills.  This can only be set while assembling an</div><div class='add'>+	array.  A device for which this is set is assumed to be working.</div><div class='add'>+</div><div class='add'>+      offset</div><div class='add'>+        This gives the location in the device (in sectors from the</div><div class='add'>+        start) where data from the array will be stored.  Any part of</div><div class='add'>+        the device before this offset is not touched, unless it is</div><div class='add'>+        used for storing metadata (Formats 1.1 and 1.2).</div><div class='add'>+</div><div class='add'>+      size</div><div class='add'>+        The amount of the device, after the offset, that can be used</div><div class='add'>+        for storage of data.  This will normally be the same as the</div><div class='add'>+	component_size.  This can be written while assembling an</div><div class='add'>+        array.  If a value less than the current component_size is</div><div class='add'>+        written, it will be rejected.</div><div class='add'>+</div><div class='add'>+      recovery_start</div><div class='add'>+        When the device is not ``in_sync``, this records the number of</div><div class='add'>+	sectors from the start of the device which are known to be</div><div class='add'>+	correct.  This is normally zero, but during a recovery</div><div class='add'>+	operation it will steadily increase, and if the recovery is</div><div class='add'>+	interrupted, restoring this value can cause recovery to</div><div class='add'>+	avoid repeating the earlier blocks.  With v1.x metadata, this</div><div class='add'>+	value is saved and restored automatically.</div><div class='add'>+</div><div class='add'>+	This can be set whenever the device is not an active member of</div><div class='add'>+	the array, either before the array is activated, or before</div><div class='add'>+	the ``slot`` is set.</div><div class='add'>+</div><div class='add'>+	Setting this to ``none`` is equivalent to setting ``in_sync``.</div><div class='add'>+	Setting to any other value also clears the ``in_sync`` flag.</div><div class='add'>+</div><div class='add'>+      bad_blocks</div><div class='add'>+	This gives the list of all known bad blocks in the form of</div><div class='add'>+	start address and length (in sectors respectively). If output</div><div class='add'>+	is too big to fit in a page, it will be truncated. Writing</div><div class='add'>+	``sector length`` to this file adds new acknowledged (i.e.</div><div class='add'>+	recorded to disk safely) bad blocks.</div><div class='add'>+</div><div class='add'>+      unacknowledged_bad_blocks</div><div class='add'>+	This gives the list of known-but-not-yet-saved-to-disk bad</div><div class='add'>+	blocks in the same form of ``bad_blocks``. If output is too big</div><div class='add'>+	to fit in a page, it will be truncated. Writing to this file</div><div class='add'>+	adds bad blocks without acknowledging them. This is largely</div><div class='add'>+	for testing.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+An active md device will also contain an entry for each active device</div><div class='add'>+in the array.  These are named::</div><div class='add'>+</div><div class='add'>+    rdNN</div><div class='add'>+</div><div class='add'>+where ``NN`` is the position in the array, starting from 0.</div><div class='add'>+So for a 3 drive array there will be rd0, rd1, rd2.</div><div class='add'>+These are symbolic links to the appropriate ``dev-XXX`` entry.</div><div class='add'>+Thus, for example::</div><div class='add'>+</div><div class='add'>+       cat /sys/block/md*/md/rd*/state</div><div class='add'>+</div><div class='add'>+will show ``in_sync`` on every line.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Active md devices for levels that support data redundancy (1,4,5,6,10)</div><div class='add'>+also have</div><div class='add'>+</div><div class='add'>+   sync_action</div><div class='add'>+     a text file that can be used to monitor and control the rebuild</div><div class='add'>+     process.  It contains one word which can be one of:</div><div class='add'>+</div><div class='add'>+       resync</div><div class='add'>+		redundancy is being recalculated after unclean</div><div class='add'>+                shutdown or creation</div><div class='add'>+</div><div class='add'>+       recover</div><div class='add'>+		a hot spare is being built to replace a</div><div class='add'>+		failed/missing device</div><div class='add'>+</div><div class='add'>+       idle</div><div class='add'>+		nothing is happening</div><div class='add'>+       check</div><div class='add'>+		A full check of redundancy was requested and is</div><div class='add'>+                happening.  This reads all blocks and checks</div><div class='add'>+                them. A repair may also happen for some raid</div><div class='add'>+                levels.</div><div class='add'>+</div><div class='add'>+       repair</div><div class='add'>+		A full check and repair is happening.  This is</div><div class='add'>+		similar to ``resync``, but was requested by the</div><div class='add'>+                user, and the write-intent bitmap is NOT used to</div><div class='add'>+		optimise the process.</div><div class='add'>+</div><div class='add'>+      This file is writable, and each of the strings that could be</div><div class='add'>+      read are meaningful for writing.</div><div class='add'>+</div><div class='add'>+	``idle`` will stop an active resync/recovery etc.  There is no</div><div class='add'>+	guarantee that another resync/recovery may not be automatically</div><div class='add'>+	started again, though some event will be needed to trigger</div><div class='add'>+	this.</div><div class='add'>+</div><div class='add'>+	``resync`` or ``recovery`` can be used to restart the</div><div class='add'>+        corresponding operation if it was stopped with ``idle``.</div><div class='add'>+</div><div class='add'>+	``check`` and ``repair`` will start the appropriate process</div><div class='add'>+	providing the current state is ``idle``.</div><div class='add'>+</div><div class='add'>+      This file responds to select/poll.  Any important change in the value</div><div class='add'>+      triggers a poll event.  Sometimes the value will briefly be</div><div class='add'>+      ``recover`` if a recovery seems to be needed, but cannot be</div><div class='add'>+      achieved. In that case, the transition to ``recover`` isn't</div><div class='add'>+      notified, but the transition away is.</div><div class='add'>+</div><div class='add'>+   degraded</div><div class='add'>+      This contains a count of the number of devices by which the</div><div class='add'>+      arrays is degraded.  So an optimal array will show ``0``.  A</div><div class='add'>+      single failed/missing drive will show ``1``, etc.</div><div class='add'>+</div><div class='add'>+      This file responds to select/poll, any increase or decrease</div><div class='add'>+      in the count of missing devices will trigger an event.</div><div class='add'>+</div><div class='add'>+   mismatch_count</div><div class='add'>+      When performing ``check`` and ``repair``, and possibly when</div><div class='add'>+      performing ``resync``, md will count the number of errors that are</div><div class='add'>+      found.  The count in ``mismatch_cnt`` is the number of sectors</div><div class='add'>+      that were re-written, or (for ``check``) would have been</div><div class='add'>+      re-written.  As most raid levels work in units of pages rather</div><div class='add'>+      than sectors, this may be larger than the number of actual errors</div><div class='add'>+      by a factor of the number of sectors in a page.</div><div class='add'>+</div><div class='add'>+   bitmap_set_bits</div><div class='add'>+      If the array has a write-intent bitmap, then writing to this</div><div class='add'>+      attribute can set bits in the bitmap, indicating that a resync</div><div class='add'>+      would need to check the corresponding blocks. Either individual</div><div class='add'>+      numbers or start-end pairs can be written.  Multiple numbers</div><div class='add'>+      can be separated by a space.</div><div class='add'>+</div><div class='add'>+      Note that the numbers are ``bit`` numbers, not ``block`` numbers.</div><div class='add'>+      They should be scaled by the bitmap_chunksize.</div><div class='add'>+</div><div class='add'>+   sync_speed_min, sync_speed_max</div><div class='add'>+     This are similar to ``/proc/sys/dev/raid/speed_limit_{min,max}``</div><div class='add'>+     however they only apply to the particular array.</div><div class='add'>+</div><div class='add'>+     If no value has been written to these, or if the word ``system``</div><div class='add'>+     is written, then the system-wide value is used.  If a value,</div><div class='add'>+     in kibibytes-per-second is written, then it is used.</div><div class='add'>+</div><div class='add'>+     When the files are read, they show the currently active value</div><div class='add'>+     followed by ``(local)`` or ``(system)`` depending on whether it is</div><div class='add'>+     a locally set or system-wide value.</div><div class='add'>+</div><div class='add'>+   sync_completed</div><div class='add'>+     This shows the number of sectors that have been completed of</div><div class='add'>+     whatever the current sync_action is, followed by the number of</div><div class='add'>+     sectors in total that could need to be processed.  The two</div><div class='add'>+     numbers are separated by a ``/``  thus effectively showing one</div><div class='add'>+     value, a fraction of the process that is complete.</div><div class='add'>+</div><div class='add'>+     A ``select`` on this attribute will return when resync completes,</div><div class='add'>+     when it reaches the current sync_max (below) and possibly at</div><div class='add'>+     other times.</div><div class='add'>+</div><div class='add'>+   sync_speed</div><div class='add'>+     This shows the current actual speed, in K/sec, of the current</div><div class='add'>+     sync_action.  It is averaged over the last 30 seconds.</div><div class='add'>+</div><div class='add'>+   suspend_lo, suspend_hi</div><div class='add'>+     The two values, given as numbers of sectors, indicate a range</div><div class='add'>+     within the array where IO will be blocked.  This is currently</div><div class='add'>+     only supported for raid4/5/6.</div><div class='add'>+</div><div class='add'>+   sync_min, sync_max</div><div class='add'>+     The two values, given as numbers of sectors, indicate a range</div><div class='add'>+     within the array where ``check``/``repair`` will operate. Must be</div><div class='add'>+     a multiple of chunk_size. When it reaches ``sync_max`` it will</div><div class='add'>+     pause, rather than complete.</div><div class='add'>+     You can use ``select`` or ``poll`` on ``sync_completed`` to wait for</div><div class='add'>+     that number to reach sync_max.  Then you can either increase</div><div class='add'>+     ``sync_max``, or can write ``idle`` to ``sync_action``.</div><div class='add'>+</div><div class='add'>+     The value of ``max`` for ``sync_max`` effectively disables the limit.</div><div class='add'>+     When a resync is active, the value can only ever be increased,</div><div class='add'>+     never decreased.</div><div class='add'>+     The value of ``0`` is the minimum for ``sync_min``.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Each active md device may also have attributes specific to the</div><div class='add'>+personality module that manages it.</div><div class='add'>+These are specific to the implementation of the module and could</div><div class='add'>+change substantially if the implementation changes.</div><div class='add'>+</div><div class='add'>+These currently include:</div><div class='add'>+</div><div class='add'>+  stripe_cache_size  (currently raid5 only)</div><div class='add'>+      number of entries in the stripe cache.  This is writable, but</div><div class='add'>+      there are upper and lower limits (32768, 17).  Default is 256.</div><div class='add'>+</div><div class='add'>+  strip_cache_active (currently raid5 only)</div><div class='add'>+      number of active entries in the stripe cache</div><div class='add'>+</div><div class='add'>+  preread_bypass_threshold (currently raid5 only)</div><div class='add'>+      number of times a stripe requiring preread will be bypassed by</div><div class='add'>+      a stripe that does not require preread.  For fairness defaults</div><div class='add'>+      to 1.  Setting this to 0 disables bypass accounting and</div><div class='add'>+      requires preread stripes to wait until all full-width stripe-</div><div class='add'>+      writes are complete.  Valid values are 0 to stripe_cache_size.</div><div class='add'>+</div><div class='add'>+  journal_mode (currently raid5 only)</div><div class='add'>+      The cache mode for raid5. raid5 could include an extra disk for</div><div class='add'>+      caching. The mode can be "write-throuth" and "write-back". The</div><div class='add'>+      default is "write-through".</div><div class='head'>diff --git a/Documentation/admin-guide/module-signing.rst b/Documentation/admin-guide/module-signing.rst<br/>new file mode 100644<br/>index 000000000000..27e59498b487<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/module-signing.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/module-signing.rst</a></div><div class='hunk'>@@ -0,0 +1,285 @@</div><div class='add'>+Kernel module signing facility</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+.. CONTENTS</div><div class='add'>+..</div><div class='add'>+.. - Overview.</div><div class='add'>+.. - Configuring module signing.</div><div class='add'>+.. - Generating signing keys.</div><div class='add'>+.. - Public keys in the kernel.</div><div class='add'>+.. - Manually signing modules.</div><div class='add'>+.. - Signed modules and stripping.</div><div class='add'>+.. - Loading signed modules.</div><div class='add'>+.. - Non-valid signatures and unsigned modules.</div><div class='add'>+.. - Administering/protecting the private key.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+========</div><div class='add'>+Overview</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+The kernel module signing facility cryptographically signs modules during</div><div class='add'>+installation and then checks the signature upon loading the module.  This</div><div class='add'>+allows increased kernel security by disallowing the loading of unsigned modules</div><div class='add'>+or modules signed with an invalid key.  Module signing increases security by</div><div class='add'>+making it harder to load a malicious module into the kernel.  The module</div><div class='add'>+signature checking is done by the kernel so that it is not necessary to have</div><div class='add'>+trusted userspace bits.</div><div class='add'>+</div><div class='add'>+This facility uses X.509 ITU-T standard certificates to encode the public keys</div><div class='add'>+involved.  The signatures are not themselves encoded in any industrial standard</div><div class='add'>+type.  The facility currently only supports the RSA public key encryption</div><div class='add'>+standard (though it is pluggable and permits others to be used).  The possible</div><div class='add'>+hash algorithms that can be used are SHA-1, SHA-224, SHA-256, SHA-384, and</div><div class='add'>+SHA-512 (the algorithm is selected by data in the signature).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+==========================</div><div class='add'>+Configuring module signing</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+The module signing facility is enabled by going to the</div><div class='add'>+:menuselection:`Enable Loadable Module Support` section of</div><div class='add'>+the kernel configuration and turning on::</div><div class='add'>+</div><div class='add'>+	CONFIG_MODULE_SIG	"Module signature verification"</div><div class='add'>+</div><div class='add'>+This has a number of options available:</div><div class='add'>+</div><div class='add'>+ (1) :menuselection:`Require modules to be validly signed`</div><div class='add'>+     (``CONFIG_MODULE_SIG_FORCE``)</div><div class='add'>+</div><div class='add'>+     This specifies how the kernel should deal with a module that has a</div><div class='add'>+     signature for which the key is not known or a module that is unsigned.</div><div class='add'>+</div><div class='add'>+     If this is off (ie. "permissive"), then modules for which the key is not</div><div class='add'>+     available and modules that are unsigned are permitted, but the kernel will</div><div class='add'>+     be marked as being tainted, and the concerned modules will be marked as</div><div class='add'>+     tainted, shown with the character 'E'.</div><div class='add'>+</div><div class='add'>+     If this is on (ie. "restrictive"), only modules that have a valid</div><div class='add'>+     signature that can be verified by a public key in the kernel's possession</div><div class='add'>+     will be loaded.  All other modules will generate an error.</div><div class='add'>+</div><div class='add'>+     Irrespective of the setting here, if the module has a signature block that</div><div class='add'>+     cannot be parsed, it will be rejected out of hand.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ (2) :menuselection:`Automatically sign all modules`</div><div class='add'>+     (``CONFIG_MODULE_SIG_ALL``)</div><div class='add'>+</div><div class='add'>+     If this is on then modules will be automatically signed during the</div><div class='add'>+     modules_install phase of a build.  If this is off, then the modules must</div><div class='add'>+     be signed manually using::</div><div class='add'>+</div><div class='add'>+	scripts/sign-file</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ (3) :menuselection:`Which hash algorithm should modules be signed with?`</div><div class='add'>+</div><div class='add'>+     This presents a choice of which hash algorithm the installation phase will</div><div class='add'>+     sign the modules with:</div><div class='add'>+</div><div class='add'>+        =============================== ==========================================</div><div class='add'>+	``CONFIG_MODULE_SIG_SHA1``	:menuselection:`Sign modules with SHA-1`</div><div class='add'>+	``CONFIG_MODULE_SIG_SHA224``	:menuselection:`Sign modules with SHA-224`</div><div class='add'>+	``CONFIG_MODULE_SIG_SHA256``	:menuselection:`Sign modules with SHA-256`</div><div class='add'>+	``CONFIG_MODULE_SIG_SHA384``	:menuselection:`Sign modules with SHA-384`</div><div class='add'>+	``CONFIG_MODULE_SIG_SHA512``	:menuselection:`Sign modules with SHA-512`</div><div class='add'>+        =============================== ==========================================</div><div class='add'>+</div><div class='add'>+     The algorithm selected here will also be built into the kernel (rather</div><div class='add'>+     than being a module) so that modules signed with that algorithm can have</div><div class='add'>+     their signatures checked without causing a dependency loop.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ (4) :menuselection:`File name or PKCS#11 URI of module signing key`</div><div class='add'>+     (``CONFIG_MODULE_SIG_KEY``)</div><div class='add'>+</div><div class='add'>+     Setting this option to something other than its default of</div><div class='add'>+     ``certs/signing_key.pem`` will disable the autogeneration of signing keys</div><div class='add'>+     and allow the kernel modules to be signed with a key of your choosing.</div><div class='add'>+     The string provided should identify a file containing both a private key</div><div class='add'>+     and its corresponding X.509 certificate in PEM form, or — on systems where</div><div class='add'>+     the OpenSSL ENGINE_pkcs11 is functional — a PKCS#11 URI as defined by</div><div class='add'>+     RFC7512. In the latter case, the PKCS#11 URI should reference both a</div><div class='add'>+     certificate and a private key.</div><div class='add'>+</div><div class='add'>+     If the PEM file containing the private key is encrypted, or if the</div><div class='add'>+     PKCS#11 token requries a PIN, this can be provided at build time by</div><div class='add'>+     means of the ``KBUILD_SIGN_PIN`` variable.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ (5) :menuselection:`Additional X.509 keys for default system keyring`</div><div class='add'>+     (``CONFIG_SYSTEM_TRUSTED_KEYS``)</div><div class='add'>+</div><div class='add'>+     This option can be set to the filename of a PEM-encoded file containing</div><div class='add'>+     additional certificates which will be included in the system keyring by</div><div class='add'>+     default.</div><div class='add'>+</div><div class='add'>+Note that enabling module signing adds a dependency on the OpenSSL devel</div><div class='add'>+packages to the kernel build processes for the tool that does the signing.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+=======================</div><div class='add'>+Generating signing keys</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+Cryptographic keypairs are required to generate and check signatures.  A</div><div class='add'>+private key is used to generate a signature and the corresponding public key is</div><div class='add'>+used to check it.  The private key is only needed during the build, after which</div><div class='add'>+it can be deleted or stored securely.  The public key gets built into the</div><div class='add'>+kernel so that it can be used to check the signatures as the modules are</div><div class='add'>+loaded.</div><div class='add'>+</div><div class='add'>+Under normal conditions, when ``CONFIG_MODULE_SIG_KEY`` is unchanged from its</div><div class='add'>+default, the kernel build will automatically generate a new keypair using</div><div class='add'>+openssl if one does not exist in the file::</div><div class='add'>+</div><div class='add'>+	certs/signing_key.pem</div><div class='add'>+</div><div class='add'>+during the building of vmlinux (the public part of the key needs to be built</div><div class='add'>+into vmlinux) using parameters in the::</div><div class='add'>+</div><div class='add'>+	certs/x509.genkey</div><div class='add'>+</div><div class='add'>+file (which is also generated if it does not already exist).</div><div class='add'>+</div><div class='add'>+It is strongly recommended that you provide your own x509.genkey file.</div><div class='add'>+</div><div class='add'>+Most notably, in the x509.genkey file, the req_distinguished_name section</div><div class='add'>+should be altered from the default::</div><div class='add'>+</div><div class='add'>+	[ req_distinguished_name ]</div><div class='add'>+	#O = Unspecified company</div><div class='add'>+	CN = Build time autogenerated kernel key</div><div class='add'>+	#emailAddress = unspecified.user@unspecified.company</div><div class='add'>+</div><div class='add'>+The generated RSA key size can also be set with::</div><div class='add'>+</div><div class='add'>+	[ req ]</div><div class='add'>+	default_bits = 4096</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+It is also possible to manually generate the key private/public files using the</div><div class='add'>+x509.genkey key generation configuration file in the root node of the Linux</div><div class='add'>+kernel sources tree and the openssl command.  The following is an example to</div><div class='add'>+generate the public/private key files::</div><div class='add'>+</div><div class='add'>+	openssl req -new -nodes -utf8 -sha256 -days 36500 -batch -x509 \</div><div class='add'>+	   -config x509.genkey -outform PEM -out kernel_key.pem \</div><div class='add'>+	   -keyout kernel_key.pem</div><div class='add'>+</div><div class='add'>+The full pathname for the resulting kernel_key.pem file can then be specified</div><div class='add'>+in the ``CONFIG_MODULE_SIG_KEY`` option, and the certificate and key therein will</div><div class='add'>+be used instead of an autogenerated keypair.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+=========================</div><div class='add'>+Public keys in the kernel</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+The kernel contains a ring of public keys that can be viewed by root.  They're</div><div class='add'>+in a keyring called ".system_keyring" that can be seen by::</div><div class='add'>+</div><div class='add'>+	[root@deneb ~]# cat /proc/keys</div><div class='add'>+	...</div><div class='add'>+	223c7853 I------     1 perm 1f030000     0     0 keyring   .system_keyring: 1</div><div class='add'>+	302d2d52 I------     1 perm 1f010000     0     0 asymmetri Fedora kernel signing key: d69a84e6bce3d216b979e9505b3e3ef9a7118079: X509.RSA a7118079 []</div><div class='add'>+	...</div><div class='add'>+</div><div class='add'>+Beyond the public key generated specifically for module signing, additional</div><div class='add'>+trusted certificates can be provided in a PEM-encoded file referenced by the</div><div class='add'>+``CONFIG_SYSTEM_TRUSTED_KEYS`` configuration option.</div><div class='add'>+</div><div class='add'>+Further, the architecture code may take public keys from a hardware store and</div><div class='add'>+add those in also (e.g. from the UEFI key database).</div><div class='add'>+</div><div class='add'>+Finally, it is possible to add additional public keys by doing::</div><div class='add'>+</div><div class='add'>+	keyctl padd asymmetric "" [.system_keyring-ID] &lt;[key-file]</div><div class='add'>+</div><div class='add'>+e.g.::</div><div class='add'>+</div><div class='add'>+	keyctl padd asymmetric "" 0x223c7853 &lt;my_public_key.x509</div><div class='add'>+</div><div class='add'>+Note, however, that the kernel will only permit keys to be added to</div><div class='add'>+``.system_keyring _if_`` the new key's X.509 wrapper is validly signed by a key</div><div class='add'>+that is already resident in the .system_keyring at the time the key was added.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+========================</div><div class='add'>+Manually signing modules</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+To manually sign a module, use the scripts/sign-file tool available in</div><div class='add'>+the Linux kernel source tree.  The script requires 4 arguments:</div><div class='add'>+</div><div class='add'>+	1.  The hash algorithm (e.g., sha256)</div><div class='add'>+	2.  The private key filename or PKCS#11 URI</div><div class='add'>+	3.  The public key filename</div><div class='add'>+	4.  The kernel module to be signed</div><div class='add'>+</div><div class='add'>+The following is an example to sign a kernel module::</div><div class='add'>+</div><div class='add'>+	scripts/sign-file sha512 kernel-signkey.priv \</div><div class='add'>+		kernel-signkey.x509 module.ko</div><div class='add'>+</div><div class='add'>+The hash algorithm used does not have to match the one configured, but if it</div><div class='add'>+doesn't, you should make sure that hash algorithm is either built into the</div><div class='add'>+kernel or can be loaded without requiring itself.</div><div class='add'>+</div><div class='add'>+If the private key requires a passphrase or PIN, it can be provided in the</div><div class='add'>+$KBUILD_SIGN_PIN environment variable.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+============================</div><div class='add'>+Signed modules and stripping</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+A signed module has a digital signature simply appended at the end.  The string</div><div class='add'>+``~Module signature appended~.`` at the end of the module's file confirms that a</div><div class='add'>+signature is present but it does not confirm that the signature is valid!</div><div class='add'>+</div><div class='add'>+Signed modules are BRITTLE as the signature is outside of the defined ELF</div><div class='add'>+container.  Thus they MAY NOT be stripped once the signature is computed and</div><div class='add'>+attached.  Note the entire module is the signed payload, including any and all</div><div class='add'>+debug information present at the time of signing.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+======================</div><div class='add'>+Loading signed modules</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+Modules are loaded with insmod, modprobe, ``init_module()`` or</div><div class='add'>+``finit_module()``, exactly as for unsigned modules as no processing is</div><div class='add'>+done in userspace.  The signature checking is all done within the kernel.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+=========================================</div><div class='add'>+Non-valid signatures and unsigned modules</div><div class='add'>+=========================================</div><div class='add'>+</div><div class='add'>+If ``CONFIG_MODULE_SIG_FORCE`` is enabled or module.sig_enforce=1 is supplied on</div><div class='add'>+the kernel command line, the kernel will only load validly signed modules</div><div class='add'>+for which it has a public key.   Otherwise, it will also load modules that are</div><div class='add'>+unsigned.   Any module for which the kernel has a key, but which proves to have</div><div class='add'>+a signature mismatch will not be permitted to load.</div><div class='add'>+</div><div class='add'>+Any module that has an unparseable signature will be rejected.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+=========================================</div><div class='add'>+Administering/protecting the private key</div><div class='add'>+=========================================</div><div class='add'>+</div><div class='add'>+Since the private key is used to sign modules, viruses and malware could use</div><div class='add'>+the private key to sign modules and compromise the operating system.  The</div><div class='add'>+private key must be either destroyed or moved to a secure location and not kept</div><div class='add'>+in the root node of the kernel source tree.</div><div class='add'>+</div><div class='add'>+If you use the same private key to sign modules for multiple kernel</div><div class='add'>+configurations, you must ensure that the module version information is</div><div class='add'>+sufficient to prevent loading a module into a different kernel.  Either</div><div class='add'>+set ``CONFIG_MODVERSIONS=y`` or ensure that each configuration has a different</div><div class='add'>+kernel release string by changing ``EXTRAVERSION`` or ``CONFIG_LOCALVERSION``.</div><div class='head'>diff --git a/Documentation/admin-guide/mono.rst b/Documentation/admin-guide/mono.rst<br/>new file mode 100644<br/>index 000000000000..cdddc099af64<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/mono.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/mono.rst</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+Mono(tm) Binary Kernel Support for Linux</div><div class='add'>+-----------------------------------------</div><div class='add'>+</div><div class='add'>+To configure Linux to automatically execute Mono-based .NET binaries</div><div class='add'>+(in the form of .exe files) without the need to use the mono CLR</div><div class='add'>+wrapper, you can use the BINFMT_MISC kernel support.</div><div class='add'>+</div><div class='add'>+This will allow you to execute Mono-based .NET binaries just like any</div><div class='add'>+other program after you have done the following:</div><div class='add'>+</div><div class='add'>+1) You MUST FIRST install the Mono CLR support, either by downloading</div><div class='add'>+   a binary package, a source tarball or by installing from CVS. Binary</div><div class='add'>+   packages for several distributions can be found at:</div><div class='add'>+</div><div class='add'>+	http://go-mono.com/download.html</div><div class='add'>+</div><div class='add'>+   Instructions for compiling Mono can be found at:</div><div class='add'>+</div><div class='add'>+	http://www.go-mono.com/compiling.html</div><div class='add'>+</div><div class='add'>+   Once the Mono CLR support has been installed, just check that</div><div class='add'>+   ``/usr/bin/mono`` (which could be located elsewhere, for example</div><div class='add'>+   ``/usr/local/bin/mono``) is working.</div><div class='add'>+</div><div class='add'>+2) You have to compile BINFMT_MISC either as a module or into</div><div class='add'>+   the kernel (``CONFIG_BINFMT_MISC``) and set it up properly.</div><div class='add'>+   If you choose to compile it as a module, you will have</div><div class='add'>+   to insert it manually with modprobe/insmod, as kmod</div><div class='add'>+   cannot be easily supported with binfmt_misc.</div><div class='add'>+   Read the file ``binfmt_misc.txt`` in this directory to know</div><div class='add'>+   more about the configuration process.</div><div class='add'>+</div><div class='add'>+3) Add the following entries to ``/etc/rc.local`` or similar script</div><div class='add'>+   to be run at system startup:</div><div class='add'>+</div><div class='add'>+   .. code-block:: sh</div><div class='add'>+</div><div class='add'>+    # Insert BINFMT_MISC module into the kernel</div><div class='add'>+    if [ ! -e /proc/sys/fs/binfmt_misc/register ]; then</div><div class='add'>+        /sbin/modprobe binfmt_misc</div><div class='add'>+	# Some distributions, like Fedora Core, perform</div><div class='add'>+	# the following command automatically when the</div><div class='add'>+	# binfmt_misc module is loaded into the kernel</div><div class='add'>+	# or during normal boot up (systemd-based systems).</div><div class='add'>+	# Thus, it is possible that the following line</div><div class='add'>+	# is not needed at all.</div><div class='add'>+	mount -t binfmt_misc none /proc/sys/fs/binfmt_misc</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+    # Register support for .NET CLR binaries</div><div class='add'>+    if [ -e /proc/sys/fs/binfmt_misc/register ]; then</div><div class='add'>+	# Replace /usr/bin/mono with the correct pathname to</div><div class='add'>+	# the Mono CLR runtime (usually /usr/local/bin/mono</div><div class='add'>+	# when compiling from sources or CVS).</div><div class='add'>+        echo ':CLR:M::MZ::/usr/bin/mono:' &gt; /proc/sys/fs/binfmt_misc/register</div><div class='add'>+    else</div><div class='add'>+        echo "No binfmt_misc support"</div><div class='add'>+        exit 1</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+4) Check that ``.exe`` binaries can be ran without the need of a</div><div class='add'>+   wrapper script, simply by launching the ``.exe`` file directly</div><div class='add'>+   from a command prompt, for example::</div><div class='add'>+</div><div class='add'>+	/usr/bin/xsd.exe</div><div class='add'>+</div><div class='add'>+   .. note::</div><div class='add'>+</div><div class='add'>+      If this fails with a permission denied error, check</div><div class='add'>+      that the ``.exe`` file has execute permissions.</div><div class='head'>diff --git a/Documentation/admin-guide/parport.rst b/Documentation/admin-guide/parport.rst<br/>new file mode 100644<br/>index 000000000000..ad3f9b8a11e1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/parport.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/parport.rst</a></div><div class='hunk'>@@ -0,0 +1,286 @@</div><div class='add'>+Parport</div><div class='add'>++++++++</div><div class='add'>+</div><div class='add'>+The ``parport`` code provides parallel-port support under Linux.  This</div><div class='add'>+includes the ability to share one port between multiple device</div><div class='add'>+drivers.</div><div class='add'>+</div><div class='add'>+You can pass parameters to the ``parport`` code to override its automatic</div><div class='add'>+detection of your hardware.  This is particularly useful if you want</div><div class='add'>+to use IRQs, since in general these can't be autoprobed successfully.</div><div class='add'>+By default IRQs are not used even if they **can** be probed.  This is</div><div class='add'>+because there are a lot of people using the same IRQ for their</div><div class='add'>+parallel port and a sound card or network card.</div><div class='add'>+</div><div class='add'>+The ``parport`` code is split into two parts: generic (which deals with</div><div class='add'>+port-sharing) and architecture-dependent (which deals with actually</div><div class='add'>+using the port).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Parport as modules</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+If you load the `parport`` code as a module, say::</div><div class='add'>+</div><div class='add'>+	# insmod parport</div><div class='add'>+</div><div class='add'>+to load the generic ``parport`` code.  You then must load the</div><div class='add'>+architecture-dependent code with (for example)::</div><div class='add'>+</div><div class='add'>+	# insmod parport_pc io=0x3bc,0x378,0x278 irq=none,7,auto</div><div class='add'>+</div><div class='add'>+to tell the ``parport`` code that you want three PC-style ports, one at</div><div class='add'>+0x3bc with no IRQ, one at 0x378 using IRQ 7, and one at 0x278 with an</div><div class='add'>+auto-detected IRQ.  Currently, PC-style (``parport_pc``), Sun ``bpp``,</div><div class='add'>+Amiga, Atari, and MFC3 hardware is supported.</div><div class='add'>+</div><div class='add'>+PCI parallel I/O card support comes from ``parport_pc``.  Base I/O</div><div class='add'>+addresses should not be specified for supported PCI cards since they</div><div class='add'>+are automatically detected.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+modprobe</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+If you use modprobe , you will find it useful to add lines as below to a</div><div class='add'>+configuration file in /etc/modprobe.d/ directory::</div><div class='add'>+</div><div class='add'>+	alias parport_lowlevel parport_pc</div><div class='add'>+	options parport_pc io=0x378,0x278 irq=7,auto</div><div class='add'>+</div><div class='add'>+modprobe will load ``parport_pc`` (with the options ``io=0x378,0x278 irq=7,auto``)</div><div class='add'>+whenever a parallel port device driver (such as ``lp``) is loaded.</div><div class='add'>+</div><div class='add'>+Note that these are example lines only!  You shouldn't in general need</div><div class='add'>+to specify any options to ``parport_pc`` in order to be able to use a</div><div class='add'>+parallel port.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Parport probe [optional]</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+In 2.2 kernels there was a module called ``parport_probe``, which was used</div><div class='add'>+for collecting IEEE 1284 device ID information.  This has now been</div><div class='add'>+enhanced and now lives with the IEEE 1284 support.  When a parallel</div><div class='add'>+port is detected, the devices that are connected to it are analysed,</div><div class='add'>+and information is logged like this::</div><div class='add'>+</div><div class='add'>+	parport0: Printer, BJC-210 (Canon)</div><div class='add'>+</div><div class='add'>+The probe information is available from files in ``/proc/sys/dev/parport/``.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Parport linked into the kernel statically</div><div class='add'>+=========================================</div><div class='add'>+</div><div class='add'>+If you compile the ``parport`` code into the kernel, then you can use</div><div class='add'>+kernel boot parameters to get the same effect.  Add something like the</div><div class='add'>+following to your LILO command line::</div><div class='add'>+</div><div class='add'>+	parport=0x3bc parport=0x378,7 parport=0x278,auto,nofifo</div><div class='add'>+</div><div class='add'>+You can have many ``parport=...`` statements, one for each port you want</div><div class='add'>+to add.  Adding ``parport=0`` to the kernel command-line will disable</div><div class='add'>+parport support entirely.  Adding ``parport=auto`` to the kernel</div><div class='add'>+command-line will make ``parport`` use any IRQ lines or DMA channels that</div><div class='add'>+it auto-detects.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Files in /proc</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+If you have configured the ``/proc`` filesystem into your kernel, you will</div><div class='add'>+see a new directory entry: ``/proc/sys/dev/parport``.  In there will be a</div><div class='add'>+directory entry for each parallel port for which parport is</div><div class='add'>+configured.  In each of those directories are a collection of files</div><div class='add'>+describing that parallel port.</div><div class='add'>+</div><div class='add'>+The ``/proc/sys/dev/parport`` directory tree looks like::</div><div class='add'>+</div><div class='add'>+	parport</div><div class='add'>+	|-- default</div><div class='add'>+	|   |-- spintime</div><div class='add'>+	|   `-- timeslice</div><div class='add'>+	|-- parport0</div><div class='add'>+	|   |-- autoprobe</div><div class='add'>+	|   |-- autoprobe0</div><div class='add'>+	|   |-- autoprobe1</div><div class='add'>+	|   |-- autoprobe2</div><div class='add'>+	|   |-- autoprobe3</div><div class='add'>+	|   |-- devices</div><div class='add'>+	|   |   |-- active</div><div class='add'>+	|   |   `-- lp</div><div class='add'>+	|   |       `-- timeslice</div><div class='add'>+	|   |-- base-addr</div><div class='add'>+	|   |-- irq</div><div class='add'>+	|   |-- dma</div><div class='add'>+	|   |-- modes</div><div class='add'>+	|   `-- spintime</div><div class='add'>+	`-- parport1</div><div class='add'>+	|-- autoprobe</div><div class='add'>+	|-- autoprobe0</div><div class='add'>+	|-- autoprobe1</div><div class='add'>+	|-- autoprobe2</div><div class='add'>+	|-- autoprobe3</div><div class='add'>+	|-- devices</div><div class='add'>+	|   |-- active</div><div class='add'>+	|   `-- ppa</div><div class='add'>+	|       `-- timeslice</div><div class='add'>+	|-- base-addr</div><div class='add'>+	|-- irq</div><div class='add'>+	|-- dma</div><div class='add'>+	|-- modes</div><div class='add'>+	`-- spintime</div><div class='add'>+</div><div class='add'>+.. tabularcolumns:: |p{4.0cm}|p{13.5cm}|</div><div class='add'>+</div><div class='add'>+=======================	=======================================================</div><div class='add'>+File			Contents</div><div class='add'>+=======================	=======================================================</div><div class='add'>+``devices/active``	A list of the device drivers using that port.  A "+"</div><div class='add'>+			will appear by the name of the device currently using</div><div class='add'>+			the port (it might not appear against any).  The</div><div class='add'>+			string "none" means that there are no device drivers</div><div class='add'>+			using that port.</div><div class='add'>+</div><div class='add'>+``base-addr``		Parallel port's base address, or addresses if the port</div><div class='add'>+			has more than one in which case they are separated</div><div class='add'>+			with tabs.  These values might not have any sensible</div><div class='add'>+			meaning for some ports.</div><div class='add'>+</div><div class='add'>+``irq``			Parallel port's IRQ, or -1 if none is being used.</div><div class='add'>+</div><div class='add'>+``dma``			Parallel port's DMA channel, or -1 if none is being</div><div class='add'>+			used.</div><div class='add'>+</div><div class='add'>+``modes``		Parallel port's hardware modes, comma-separated,</div><div class='add'>+			meaning:</div><div class='add'>+</div><div class='add'>+			- PCSPP</div><div class='add'>+				PC-style SPP registers are available.</div><div class='add'>+</div><div class='add'>+			- TRISTATE</div><div class='add'>+				Port is bidirectional.</div><div class='add'>+</div><div class='add'>+			- COMPAT</div><div class='add'>+				Hardware acceleration for printers is</div><div class='add'>+				available and will be used.</div><div class='add'>+</div><div class='add'>+			- EPP</div><div class='add'>+				Hardware acceleration for EPP protocol</div><div class='add'>+				is available and will be used.</div><div class='add'>+</div><div class='add'>+			- ECP</div><div class='add'>+				Hardware acceleration for ECP protocol</div><div class='add'>+				is available and will be used.</div><div class='add'>+</div><div class='add'>+			- DMA</div><div class='add'>+				DMA is available and will be used.</div><div class='add'>+</div><div class='add'>+			Note that the current implementation will only take</div><div class='add'>+			advantage of COMPAT and ECP modes if it has an IRQ</div><div class='add'>+			line to use.</div><div class='add'>+</div><div class='add'>+``autoprobe``		Any IEEE-1284 device ID information that has been</div><div class='add'>+			acquired from the (non-IEEE 1284.3) device.</div><div class='add'>+</div><div class='add'>+``autoprobe[0-3]``	IEEE 1284 device ID information retrieved from</div><div class='add'>+			daisy-chain devices that conform to IEEE 1284.3.</div><div class='add'>+</div><div class='add'>+``spintime``		The number of microseconds to busy-loop while waiting</div><div class='add'>+			for the peripheral to respond.  You might find that</div><div class='add'>+			adjusting this improves performance, depending on your</div><div class='add'>+			peripherals.  This is a port-wide setting, i.e. it</div><div class='add'>+			applies to all devices on a particular port.</div><div class='add'>+</div><div class='add'>+``timeslice``		The number of milliseconds that a device driver is</div><div class='add'>+			allowed to keep a port claimed for.  This is advisory,</div><div class='add'>+			and driver can ignore it if it must.</div><div class='add'>+</div><div class='add'>+``default/*``		The defaults for spintime and timeslice. When a new</div><div class='add'>+			port is	registered, it picks up the default spintime.</div><div class='add'>+			When a new device is registered, it picks up the</div><div class='add'>+			default timeslice.</div><div class='add'>+=======================	=======================================================</div><div class='add'>+</div><div class='add'>+Device drivers</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+Once the parport code is initialised, you can attach device drivers to</div><div class='add'>+specific ports.  Normally this happens automatically; if the lp driver</div><div class='add'>+is loaded it will create one lp device for each port found.  You can</div><div class='add'>+override this, though, by using parameters either when you load the lp</div><div class='add'>+driver::</div><div class='add'>+</div><div class='add'>+	# insmod lp parport=0,2</div><div class='add'>+</div><div class='add'>+or on the LILO command line::</div><div class='add'>+</div><div class='add'>+	lp=parport0 lp=parport2</div><div class='add'>+</div><div class='add'>+Both the above examples would inform lp that you want ``/dev/lp0`` to be</div><div class='add'>+the first parallel port, and /dev/lp1 to be the **third** parallel port,</div><div class='add'>+with no lp device associated with the second port (parport1).  Note</div><div class='add'>+that this is different to the way older kernels worked; there used to</div><div class='add'>+be a static association between the I/O port address and the device</div><div class='add'>+name, so ``/dev/lp0`` was always the port at 0x3bc.  This is no longer the</div><div class='add'>+case - if you only have one port, it will default to being ``/dev/lp0``,</div><div class='add'>+regardless of base address.</div><div class='add'>+</div><div class='add'>+Also:</div><div class='add'>+</div><div class='add'>+ * If you selected the IEEE 1284 support at compile time, you can say</div><div class='add'>+   ``lp=auto`` on the kernel command line, and lp will create devices</div><div class='add'>+   only for those ports that seem to have printers attached.</div><div class='add'>+</div><div class='add'>+ * If you give PLIP the ``timid`` parameter, either with ``plip=timid`` on</div><div class='add'>+   the command line, or with ``insmod plip timid=1`` when using modules,</div><div class='add'>+   it will avoid any ports that seem to be in use by other devices.</div><div class='add'>+</div><div class='add'>+ * IRQ autoprobing works only for a few port types at the moment.</div><div class='add'>+</div><div class='add'>+Reporting printer problems with parport</div><div class='add'>+=======================================</div><div class='add'>+</div><div class='add'>+If you are having problems printing, please go through these steps to</div><div class='add'>+try to narrow down where the problem area is.</div><div class='add'>+</div><div class='add'>+When reporting problems with parport, really you need to give all of</div><div class='add'>+the messages that ``parport_pc`` spits out when it initialises.  There are</div><div class='add'>+several code paths:</div><div class='add'>+</div><div class='add'>+- polling</div><div class='add'>+- interrupt-driven, protocol in software</div><div class='add'>+- interrupt-driven, protocol in hardware using PIO</div><div class='add'>+- interrupt-driven, protocol in hardware using DMA</div><div class='add'>+</div><div class='add'>+The kernel messages that ``parport_pc`` logs give an indication of which</div><div class='add'>+code path is being used. (They could be a lot better actually..)</div><div class='add'>+</div><div class='add'>+For normal printer protocol, having IEEE 1284 modes enabled or not</div><div class='add'>+should not make a difference.</div><div class='add'>+</div><div class='add'>+To turn off the 'protocol in hardware' code paths, disable</div><div class='add'>+``CONFIG_PARPORT_PC_FIFO``.  Note that when they are enabled they are not</div><div class='add'>+necessarily **used**; it depends on whether the hardware is available,</div><div class='add'>+enabled by the BIOS, and detected by the driver.</div><div class='add'>+</div><div class='add'>+So, to start with, disable ``CONFIG_PARPORT_PC_FIFO``, and load ``parport_pc``</div><div class='add'>+with ``irq=none``. See if printing works then.  It really should,</div><div class='add'>+because this is the simplest code path.</div><div class='add'>+</div><div class='add'>+If that works fine, try with ``io=0x378 irq=7`` (adjust for your</div><div class='add'>+hardware), to make it use interrupt-driven in-software protocol.</div><div class='add'>+</div><div class='add'>+If **that** works fine, then one of the hardware modes isn't working</div><div class='add'>+right.  Enable ``CONFIG_FIFO`` (no, it isn't a module option,</div><div class='add'>+and yes, it should be), set the port to ECP mode in the BIOS and note</div><div class='add'>+the DMA channel, and try with::</div><div class='add'>+</div><div class='add'>+    io=0x378 irq=7 dma=none (for PIO)</div><div class='add'>+    io=0x378 irq=7 dma=3 (for DMA)</div><div class='add'>+</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+philb@gnu.org</div><div class='add'>+tim@cyberelk.net</div><div class='head'>diff --git a/Documentation/admin-guide/ramoops.rst b/Documentation/admin-guide/ramoops.rst<br/>new file mode 100644<br/>index 000000000000..4efd7ce77565<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/ramoops.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/ramoops.rst</a></div><div class='hunk'>@@ -0,0 +1,156 @@</div><div class='add'>+Ramoops oops/panic logger</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+Sergiu Iordache &lt;sergiu@chromium.org&gt;</div><div class='add'>+</div><div class='add'>+Updated: 17 November 2011</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+Ramoops is an oops/panic logger that writes its logs to RAM before the system</div><div class='add'>+crashes. It works by logging oopses and panics in a circular buffer. Ramoops</div><div class='add'>+needs a system with persistent RAM so that the content of that area can</div><div class='add'>+survive after a restart.</div><div class='add'>+</div><div class='add'>+Ramoops concepts</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Ramoops uses a predefined memory area to store the dump. The start and size</div><div class='add'>+and type of the memory area are set using three variables:</div><div class='add'>+</div><div class='add'>+  * ``mem_address`` for the start</div><div class='add'>+  * ``mem_size`` for the size. The memory size will be rounded down to a</div><div class='add'>+    power of two.</div><div class='add'>+  * ``mem_type`` to specifiy if the memory type (default is pgprot_writecombine).</div><div class='add'>+</div><div class='add'>+Typically the default value of ``mem_type=0`` should be used as that sets the pstore</div><div class='add'>+mapping to pgprot_writecombine. Setting ``mem_type=1`` attempts to use</div><div class='add'>+``pgprot_noncached``, which only works on some platforms. This is because pstore</div><div class='add'>+depends on atomic operations. At least on ARM, pgprot_noncached causes the</div><div class='add'>+memory to be mapped strongly ordered, and atomic operations on strongly ordered</div><div class='add'>+memory are implementation defined, and won't work on many ARMs such as omaps.</div><div class='add'>+</div><div class='add'>+The memory area is divided into ``record_size`` chunks (also rounded down to</div><div class='add'>+power of two) and each oops/panic writes a ``record_size`` chunk of</div><div class='add'>+information.</div><div class='add'>+</div><div class='add'>+Dumping both oopses and panics can be done by setting 1 in the ``dump_oops``</div><div class='add'>+variable while setting 0 in that variable dumps only the panics.</div><div class='add'>+</div><div class='add'>+The module uses a counter to record multiple dumps but the counter gets reset</div><div class='add'>+on restart (i.e. new dumps after the restart will overwrite old ones).</div><div class='add'>+</div><div class='add'>+Ramoops also supports software ECC protection of persistent memory regions.</div><div class='add'>+This might be useful when a hardware reset was used to bring the machine back</div><div class='add'>+to life (i.e. a watchdog triggered). In such cases, RAM may be somewhat</div><div class='add'>+corrupt, but usually it is restorable.</div><div class='add'>+</div><div class='add'>+Setting the parameters</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+Setting the ramoops parameters can be done in several different manners:</div><div class='add'>+</div><div class='add'>+ A. Use the module parameters (which have the names of the variables described</div><div class='add'>+ as before). For quick debugging, you can also reserve parts of memory during</div><div class='add'>+ boot and then use the reserved memory for ramoops. For example, assuming a</div><div class='add'>+ machine with &gt; 128 MB of memory, the following kernel command line will tell</div><div class='add'>+ the kernel to use only the first 128 MB of memory, and place ECC-protected</div><div class='add'>+ ramoops region at 128 MB boundary::</div><div class='add'>+</div><div class='add'>+	mem=128M ramoops.mem_address=0x8000000 ramoops.ecc=1</div><div class='add'>+</div><div class='add'>+ B. Use Device Tree bindings, as described in</div><div class='add'>+ ``Documentation/device-tree/bindings/reserved-memory/admin-guide/ramoops.rst``.</div><div class='add'>+ For example::</div><div class='add'>+</div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		ramoops@8f000000 {</div><div class='add'>+			compatible = "ramoops";</div><div class='add'>+			reg = &lt;0 0x8f000000 0 0x100000&gt;;</div><div class='add'>+			record-size = &lt;0x4000&gt;;</div><div class='add'>+			console-size = &lt;0x4000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+ C. Use a platform device and set the platform data. The parameters can then</div><div class='add'>+ be set through that platform data. An example of doing that is:</div><div class='add'>+</div><div class='add'>+ .. code-block:: c</div><div class='add'>+</div><div class='add'>+  #include &lt;linux/pstore_ram.h&gt;</div><div class='add'>+  [...]</div><div class='add'>+</div><div class='add'>+  static struct ramoops_platform_data ramoops_data = {</div><div class='add'>+        .mem_size               = &lt;...&gt;,</div><div class='add'>+        .mem_address            = &lt;...&gt;,</div><div class='add'>+        .mem_type               = &lt;...&gt;,</div><div class='add'>+        .record_size            = &lt;...&gt;,</div><div class='add'>+        .dump_oops              = &lt;...&gt;,</div><div class='add'>+        .ecc                    = &lt;...&gt;,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+  static struct platform_device ramoops_dev = {</div><div class='add'>+        .name = "ramoops",</div><div class='add'>+        .dev = {</div><div class='add'>+                .platform_data = &amp;ramoops_data,</div><div class='add'>+        },</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+  [... inside a function ...]</div><div class='add'>+  int ret;</div><div class='add'>+</div><div class='add'>+  ret = platform_device_register(&amp;ramoops_dev);</div><div class='add'>+  if (ret) {</div><div class='add'>+	printk(KERN_ERR "unable to register platform device\n");</div><div class='add'>+	return ret;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+You can specify either RAM memory or peripheral devices' memory. However, when</div><div class='add'>+specifying RAM, be sure to reserve the memory by issuing memblock_reserve()</div><div class='add'>+very early in the architecture code, e.g.::</div><div class='add'>+</div><div class='add'>+	#include &lt;linux/memblock.h&gt;</div><div class='add'>+</div><div class='add'>+	memblock_reserve(ramoops_data.mem_address, ramoops_data.mem_size);</div><div class='add'>+</div><div class='add'>+Dump format</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The data dump begins with a header, currently defined as ``====`` followed by a</div><div class='add'>+timestamp and a new line. The dump then continues with the actual data.</div><div class='add'>+</div><div class='add'>+Reading the data</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+The dump data can be read from the pstore filesystem. The format for these</div><div class='add'>+files is ``dmesg-ramoops-N``, where N is the record number in memory. To delete</div><div class='add'>+a stored record from RAM, simply unlink the respective pstore file.</div><div class='add'>+</div><div class='add'>+Persistent function tracing</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+Persistent function tracing might be useful for debugging software or hardware</div><div class='add'>+related hangs. The functions call chain log is stored in a ``ftrace-ramoops``</div><div class='add'>+file. Here is an example of usage::</div><div class='add'>+</div><div class='add'>+ # mount -t debugfs debugfs /sys/kernel/debug/</div><div class='add'>+ # echo 1 &gt; /sys/kernel/debug/pstore/record_ftrace</div><div class='add'>+ # reboot -f</div><div class='add'>+ [...]</div><div class='add'>+ # mount -t pstore pstore /mnt/</div><div class='add'>+ # tail /mnt/ftrace-ramoops</div><div class='add'>+ 0 ffffffff8101ea64  ffffffff8101bcda  native_apic_mem_read &lt;- disconnect_bsp_APIC+0x6a/0xc0</div><div class='add'>+ 0 ffffffff8101ea44  ffffffff8101bcf6  native_apic_mem_write &lt;- disconnect_bsp_APIC+0x86/0xc0</div><div class='add'>+ 0 ffffffff81020084  ffffffff8101a4b5  hpet_disable &lt;- native_machine_shutdown+0x75/0x90</div><div class='add'>+ 0 ffffffff81005f94  ffffffff8101a4bb  iommu_shutdown_noop &lt;- native_machine_shutdown+0x7b/0x90</div><div class='add'>+ 0 ffffffff8101a6a1  ffffffff8101a437  native_machine_emergency_restart &lt;- native_machine_restart+0x37/0x40</div><div class='add'>+ 0 ffffffff811f9876  ffffffff8101a73a  acpi_reboot &lt;- native_machine_emergency_restart+0xaa/0x1e0</div><div class='add'>+ 0 ffffffff8101a514  ffffffff8101a772  mach_reboot_fixups &lt;- native_machine_emergency_restart+0xe2/0x1e0</div><div class='add'>+ 0 ffffffff811d9c54  ffffffff8101a7a0  __const_udelay &lt;- native_machine_emergency_restart+0x110/0x1e0</div><div class='add'>+ 0 ffffffff811d9c34  ffffffff811d9c80  __delay &lt;- __const_udelay+0x30/0x40</div><div class='add'>+ 0 ffffffff811d9d14  ffffffff811d9c3f  delay_tsc &lt;- __delay+0xf/0x20</div><div class='head'>diff --git a/Documentation/admin-guide/ras.rst b/Documentation/admin-guide/ras.rst<br/>new file mode 100644<br/>index 000000000000..1b90c6f00a92<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/ras.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/ras.rst</a></div><div class='hunk'>@@ -0,0 +1,1210 @@</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='add'>+============================================</div><div class='add'>+Reliability, Availability and Serviceability</div><div class='add'>+============================================</div><div class='add'>+</div><div class='add'>+RAS concepts</div><div class='add'>+************</div><div class='add'>+</div><div class='add'>+Reliability, Availability and Serviceability (RAS) is a concept used on</div><div class='add'>+servers meant to measure their robusteness.</div><div class='add'>+</div><div class='add'>+Reliability</div><div class='add'>+  is the probability that a system will produce correct outputs.</div><div class='add'>+</div><div class='add'>+  * Generally measured as Mean Time Between Failures (MTBF)</div><div class='add'>+  * Enhanced by features that help to avoid, detect and repair hardware faults</div><div class='add'>+</div><div class='add'>+Availability</div><div class='add'>+  is the probability that a system is operational at a given time</div><div class='add'>+</div><div class='add'>+  * Generally measured as a percentage of downtime per a period of time</div><div class='add'>+  * Often uses mechanisms to detect and correct hardware faults in</div><div class='add'>+    runtime;</div><div class='add'>+</div><div class='add'>+Serviceability (or maintainability)</div><div class='add'>+  is the simplicity and speed with which a system can be repaired or</div><div class='add'>+  maintained</div><div class='add'>+</div><div class='add'>+  * Generally measured on Mean Time Between Repair (MTBR)</div><div class='add'>+</div><div class='add'>+Improving RAS</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+In order to reduce systems downtime, a system should be capable of detecting</div><div class='add'>+hardware errors, and, when possible correcting them in runtime. It should</div><div class='add'>+also provide mechanisms to detect hardware degradation, in order to warn</div><div class='add'>+the system administrator to take the action of replacing a component before</div><div class='add'>+it causes data loss or system downtime.</div><div class='add'>+</div><div class='add'>+Among the monitoring measures, the most usual ones include:</div><div class='add'>+</div><div class='add'>+* CPU – detect errors at instruction execution and at L1/L2/L3 caches;</div><div class='add'>+* Memory – add error correction logic (ECC) to detect and correct errors;</div><div class='add'>+* I/O – add CRC checksums for tranfered data;</div><div class='add'>+* Storage – RAID, journal file systems, checksums,</div><div class='add'>+  Self-Monitoring, Analysis and Reporting Technology (SMART).</div><div class='add'>+</div><div class='add'>+By monitoring the number of occurrences of error detections, it is possible</div><div class='add'>+to identify if the probability of hardware errors is increasing, and, on such</div><div class='add'>+case, do a preventive maintainance to replace a degrated component while</div><div class='add'>+those errors are correctable.</div><div class='add'>+</div><div class='add'>+Types of errors</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Most mechanisms used on modern systems use use technologies like Hamming</div><div class='add'>+Codes that allow error correction when the number of errors on a bit packet</div><div class='add'>+is below a threshold. If the number of errors is above, those mechanisms</div><div class='add'>+can indicate with a high degree of confidence that an error happened, but</div><div class='add'>+they can't correct.</div><div class='add'>+</div><div class='add'>+Also, sometimes an error occur on a component that it is not used. For</div><div class='add'>+example, a part of the memory that it is not currently allocated.</div><div class='add'>+</div><div class='add'>+That defines some categories of errors:</div><div class='add'>+</div><div class='add'>+* **Correctable Error (CE)** - the error detection mechanism detected and</div><div class='add'>+  corrected the error. Such errors are usually not fatal, although some</div><div class='add'>+  Kernel mechanisms allow the system administrator to consider them as fatal.</div><div class='add'>+</div><div class='add'>+* **Uncorrected Error (UE)** - the amount of errors happened above the error</div><div class='add'>+  correction threshold, and the system was unable to auto-correct.</div><div class='add'>+</div><div class='add'>+* **Fatal Error** - when an UE error happens on a critical component of the</div><div class='add'>+  system (for example, a piece of the Kernel got corrupted by an UE), the</div><div class='add'>+  only reliable way to avoid data corruption is to hang or reboot the machine.</div><div class='add'>+</div><div class='add'>+* **Non-fatal Error** - when an UE error happens on an unused component,</div><div class='add'>+  like a CPU in power down state or an unused memory bank, the system may</div><div class='add'>+  still run, eventually replacing the affected hardware by a hot spare,</div><div class='add'>+  if available.</div><div class='add'>+</div><div class='add'>+  Also, when an error happens on a userspace process, it is also possible to</div><div class='add'>+  kill such process and let userspace restart it.</div><div class='add'>+</div><div class='add'>+The mechanism for handling non-fatal errors is usually complex and may</div><div class='add'>+require the help of some userspace application, in order to apply the</div><div class='add'>+policy desired by the system administrator.</div><div class='add'>+</div><div class='add'>+Identifying a bad hardware component</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+Just detecting a hardware flaw is usually not enough, as the system needs</div><div class='add'>+to pinpoint to the minimal replaceable unit (MRU) that should be exchanged</div><div class='add'>+to make the hardware reliable again.</div><div class='add'>+</div><div class='add'>+So, it requires not only error logging facilities, but also mechanisms that</div><div class='add'>+will translate the error message to the silkscreen or component label for</div><div class='add'>+the MRU.</div><div class='add'>+</div><div class='add'>+Typically, it is very complex for memory, as modern CPUs interlace memory</div><div class='add'>+from different memory modules, in order to provide a better performance. The</div><div class='add'>+DMI BIOS usually have a list of memory module labels, with can be obtained</div><div class='add'>+using the ``dmidecode`` tool. For example, on a desktop machine, it shows::</div><div class='add'>+</div><div class='add'>+	Memory Device</div><div class='add'>+		Total Width: 64 bits</div><div class='add'>+		Data Width: 64 bits</div><div class='add'>+		Size: 16384 MB</div><div class='add'>+		Form Factor: SODIMM</div><div class='add'>+		Set: None</div><div class='add'>+		Locator: ChannelA-DIMM0</div><div class='add'>+		Bank Locator: BANK 0</div><div class='add'>+		Type: DDR4</div><div class='add'>+		Type Detail: Synchronous</div><div class='add'>+		Speed: 2133 MHz</div><div class='add'>+		Rank: 2</div><div class='add'>+		Configured Clock Speed: 2133 MHz</div><div class='add'>+</div><div class='add'>+On the above example, a DDR4 SO-DIMM memory module is located at the</div><div class='add'>+system's memory labeled as "BANK 0", as given by the *bank locator* field.</div><div class='add'>+Please notice that, on such system, the *total width* is equal to the</div><div class='add'>+*data witdh*. It means that such memory module doesn't have error</div><div class='add'>+detection/correction mechanisms.</div><div class='add'>+</div><div class='add'>+Unfortunately, not all systems use the same field to specify the memory</div><div class='add'>+bank. On this example, from an older server, ``dmidecode`` shows::</div><div class='add'>+</div><div class='add'>+	Memory Device</div><div class='add'>+		Array Handle: 0x1000</div><div class='add'>+		Error Information Handle: Not Provided</div><div class='add'>+		Total Width: 72 bits</div><div class='add'>+		Data Width: 64 bits</div><div class='add'>+		Size: 8192 MB</div><div class='add'>+		Form Factor: DIMM</div><div class='add'>+		Set: 1</div><div class='add'>+		Locator: DIMM_A1</div><div class='add'>+		Bank Locator: Not Specified</div><div class='add'>+		Type: DDR3</div><div class='add'>+		Type Detail: Synchronous Registered (Buffered)</div><div class='add'>+		Speed: 1600 MHz</div><div class='add'>+		Rank: 2</div><div class='add'>+		Configured Clock Speed: 1600 MHz</div><div class='add'>+</div><div class='add'>+There, the DDR3 RDIMM memory module is located at the system's memory labeled</div><div class='add'>+as "DIMM_A1", as given by the *locator* field. Please notice that this</div><div class='add'>+memory module has 64 bits of *data witdh* and 72 bits of *total width*. So,</div><div class='add'>+it has 8 extra bits to be used by error detection and correction mechanisms.</div><div class='add'>+Such kind of memory is called Error-correcting code memory (ECC memory).</div><div class='add'>+</div><div class='add'>+To make things even worse, it is not uncommon that systems with different</div><div class='add'>+labels on their system's board to use exactly the same BIOS, meaning that</div><div class='add'>+the labels provided by the BIOS won't match the real ones.</div><div class='add'>+</div><div class='add'>+ECC memory</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+As mentioned on the previous section, ECC memory has extra bits to be</div><div class='add'>+used for error correction. So, on 64 bit systems, a memory module</div><div class='add'>+has 64 bits of *data width*, and 74 bits of *total width*. So, there are</div><div class='add'>+8 bits extra bits to be used for the error detection and correction</div><div class='add'>+mechanisms. Those extra bits are called *syndrome*\ [#f1]_\ [#f2]_.</div><div class='add'>+</div><div class='add'>+So, when the cpu requests the memory controller to write a word with</div><div class='add'>+*data width*, the memory controller calculates the *syndrome* in real time,</div><div class='add'>+using Hamming code, or some other error correction code, like SECDED+,</div><div class='add'>+producing a code with *total width* size. Such code is then written</div><div class='add'>+on the memory modules.</div><div class='add'>+</div><div class='add'>+At read, the *total width* bits code is converted back, using the same</div><div class='add'>+ECC code used on write, producing a word with *data width* and a *syndrome*.</div><div class='add'>+The word with *data width* is sent to the CPU, even when errors happen.</div><div class='add'>+</div><div class='add'>+The memory controller also looks at the *syndrome* in order to check if</div><div class='add'>+there was an error, and if the ECC code was able to fix such error.</div><div class='add'>+If the error was corrected, a Corrected Error (CE) happened. If not, an</div><div class='add'>+Uncorrected Error (UE) happened.</div><div class='add'>+</div><div class='add'>+The information about the CE/UE errors is stored on some special registers</div><div class='add'>+at the memory controller and can be accessed by reading such registers,</div><div class='add'>+either by BIOS, by some special CPUs or by Linux EDAC driver. On x86 64</div><div class='add'>+bit CPUs, such errors can also be retrieved via the Machine Check</div><div class='add'>+Architecture (MCA)\ [#f3]_.</div><div class='add'>+</div><div class='add'>+.. [#f1] Please notice that several memory controllers allow operation on a</div><div class='add'>+  mode called "Lock-Step", where it groups two memory modules together,</div><div class='add'>+  doing 128-bit reads/writes. That gives 16 bits for error correction, with</div><div class='add'>+  significatively improves the error correction mechanism, at the expense</div><div class='add'>+  that, when an error happens, there's no way to know what memory module is</div><div class='add'>+  to blame. So, it has to blame both memory modules.</div><div class='add'>+</div><div class='add'>+.. [#f2] Some memory controllers also allow using memory in mirror mode.</div><div class='add'>+  On such mode, the same data is written to two memory modules. At read,</div><div class='add'>+  the system checks both memory modules, in order to check if both provide</div><div class='add'>+  identical data. On such configuration, when an error happens, there's no</div><div class='add'>+  way to know what memory module is to blame. So, it has to blame both</div><div class='add'>+  memory modules (or 4 memory modules, if the system is also on Lock-step</div><div class='add'>+  mode).</div><div class='add'>+</div><div class='add'>+.. [#f3] For more details about the Machine Check Architecture (MCA),</div><div class='add'>+  please read Documentation/x86/x86_64/machinecheck at the Kernel tree.</div><div class='add'>+</div><div class='add'>+EDAC - Error Detection And Correction</div><div class='add'>+*************************************</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+   "bluesmoke" was the name for this device driver subsystem when it</div><div class='add'>+   was "out-of-tree" and maintained at http://bluesmoke.sourceforge.net.</div><div class='add'>+   That site is mostly archaic now and can be used only for historical</div><div class='add'>+   purposes.</div><div class='add'>+</div><div class='add'>+   When the subsystem was pushed upstream for the first time, on</div><div class='add'>+   Kernel 2.6.16, for the first time, it was renamed to ``EDAC``.</div><div class='add'>+</div><div class='add'>+Purpose</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+The ``edac`` kernel module's goal is to detect and report hardware errors</div><div class='add'>+that occur within the computer system running under linux.</div><div class='add'>+</div><div class='add'>+Memory</div><div class='add'>+------</div><div class='add'>+</div><div class='add'>+Memory Correctable Errors (CE) and Uncorrectable Errors (UE) are the</div><div class='add'>+primary errors being harvested. These types of errors are harvested by</div><div class='add'>+the ``edac_mc`` device.</div><div class='add'>+</div><div class='add'>+Detecting CE events, then harvesting those events and reporting them,</div><div class='add'>+**can** but must not necessarily be a predictor of future UE events. With</div><div class='add'>+CE events only, the system can and will continue to operate as no data</div><div class='add'>+has been damaged yet.</div><div class='add'>+</div><div class='add'>+However, preventive maintenance and proactive part replacement of memory</div><div class='add'>+modules exhibiting CEs can reduce the likelihood of the dreaded UE events</div><div class='add'>+and system panics.</div><div class='add'>+</div><div class='add'>+Other hardware elements</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+A new feature for EDAC, the ``edac_device`` class of device, was added in</div><div class='add'>+the 2.6.23 version of the kernel.</div><div class='add'>+</div><div class='add'>+This new device type allows for non-memory type of ECC hardware detectors</div><div class='add'>+to have their states harvested and presented to userspace via the sysfs</div><div class='add'>+interface.</div><div class='add'>+</div><div class='add'>+Some architectures have ECC detectors for L1, L2 and L3 caches,</div><div class='add'>+along with DMA engines, fabric switches, main data path switches,</div><div class='add'>+interconnections, and various other hardware data paths. If the hardware</div><div class='add'>+reports it, then a edac_device device probably can be constructed to</div><div class='add'>+harvest and present that to userspace.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PCI bus scanning</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+In addition, PCI devices are scanned for PCI Bus Parity and SERR Errors</div><div class='add'>+in order to determine if errors are occurring during data transfers.</div><div class='add'>+</div><div class='add'>+The presence of PCI Parity errors must be examined with a grain of salt.</div><div class='add'>+There are several add-in adapters that do **not** follow the PCI specification</div><div class='add'>+with regards to Parity generation and reporting. The specification says</div><div class='add'>+the vendor should tie the parity status bits to 0 if they do not intend</div><div class='add'>+to generate parity.  Some vendors do not do this, and thus the parity bit</div><div class='add'>+can "float" giving false positives.</div><div class='add'>+</div><div class='add'>+There is a PCI device attribute located in sysfs that is checked by</div><div class='add'>+the EDAC PCI scanning code. If that attribute is set, PCI parity/error</div><div class='add'>+scanning is skipped for that device. The attribute is::</div><div class='add'>+</div><div class='add'>+	broken_parity_status</div><div class='add'>+</div><div class='add'>+and is located in ``/sys/devices/pci&lt;XXX&gt;/0000:XX:YY.Z`` directories for</div><div class='add'>+PCI devices.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Versioning</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+EDAC is composed of a "core" module (``edac_core.ko``) and several Memory</div><div class='add'>+Controller (MC) driver modules. On a given system, the CORE is loaded</div><div class='add'>+and one MC driver will be loaded. Both the CORE and the MC driver (or</div><div class='add'>+``edac_device`` driver) have individual versions that reflect current</div><div class='add'>+release level of their respective modules.</div><div class='add'>+</div><div class='add'>+Thus, to "report" on what version a system is running, one must report</div><div class='add'>+both the CORE's and the MC driver's versions.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Loading</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+If ``edac`` was statically linked with the kernel then no loading</div><div class='add'>+is necessary. If ``edac`` was built as modules then simply modprobe</div><div class='add'>+the ``edac`` pieces that you need. You should be able to modprobe</div><div class='add'>+hardware-specific modules and have the dependencies load the necessary</div><div class='add'>+core modules.</div><div class='add'>+</div><div class='add'>+Example::</div><div class='add'>+</div><div class='add'>+	$ modprobe amd76x_edac</div><div class='add'>+</div><div class='add'>+loads both the ``amd76x_edac.ko`` memory controller module and the</div><div class='add'>+``edac_mc.ko`` core module.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Sysfs interface</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+EDAC presents a ``sysfs`` interface for control and reporting purposes. It</div><div class='add'>+lives in the /sys/devices/system/edac directory.</div><div class='add'>+</div><div class='add'>+Within this directory there currently reside 2 components:</div><div class='add'>+</div><div class='add'>+	======= ==============================</div><div class='add'>+	mc	memory controller(s) system</div><div class='add'>+	pci	PCI control and status system</div><div class='add'>+	======= ==============================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Memory Controller (mc) Model</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+Each ``mc`` device controls a set of memory modules [#f4]_. These modules</div><div class='add'>+are laid out in a Chip-Select Row (``csrowX``) and Channel table (``chX``).</div><div class='add'>+There can be multiple csrows and multiple channels.</div><div class='add'>+</div><div class='add'>+.. [#f4] Nowadays, the term DIMM (Dual In-line Memory Module) is widely</div><div class='add'>+  used to refer to a memory module, although there are other memory</div><div class='add'>+  packaging alternatives, like SO-DIMM, SIMM, etc. Along this document,</div><div class='add'>+  and inside the EDAC system, the term "dimm" is used for all memory</div><div class='add'>+  modules, even when they use a different kind of packaging.</div><div class='add'>+</div><div class='add'>+Memory controllers allow for several csrows, with 8 csrows being a</div><div class='add'>+typical value. Yet, the actual number of csrows depends on the layout of</div><div class='add'>+a given motherboard, memory controller and memory module characteristics.</div><div class='add'>+</div><div class='add'>+Dual channels allow for dual data length (e. g. 128 bits, on 64 bit systems)</div><div class='add'>+data transfers to/from the CPU from/to memory. Some newer chipsets allow</div><div class='add'>+for more than 2 channels, like Fully Buffered DIMMs (FB-DIMMs) memory</div><div class='add'>+controllers. The following example will assume 2 channels:</div><div class='add'>+</div><div class='add'>+	+------------+-----------------------+</div><div class='add'>+	| Chip       |       Channels        |</div><div class='add'>+	| Select     +-----------+-----------+</div><div class='add'>+	| rows       |  ``ch0``  |  ``ch1``  |</div><div class='add'>+	+============+===========+===========+</div><div class='add'>+	| ``csrow0`` |  DIMM_A0  |  DIMM_B0  |</div><div class='add'>+	+------------+           |           |</div><div class='add'>+	| ``csrow1`` |           |           |</div><div class='add'>+	+------------+-----------+-----------+</div><div class='add'>+	| ``csrow2`` |  DIMM_A1  | DIMM_B1   |</div><div class='add'>+	+------------+           |           |</div><div class='add'>+	| ``csrow3`` |           |           |</div><div class='add'>+	+------------+-----------+-----------+</div><div class='add'>+</div><div class='add'>+In the above example, there are 4 physical slots on the motherboard</div><div class='add'>+for memory DIMMs:</div><div class='add'>+</div><div class='add'>+	+---------+---------+</div><div class='add'>+	| DIMM_A0 | DIMM_B0 |</div><div class='add'>+	+---------+---------+</div><div class='add'>+	| DIMM_A1 | DIMM_B1 |</div><div class='add'>+	+---------+---------+</div><div class='add'>+</div><div class='add'>+Labels for these slots are usually silk-screened on the motherboard.</div><div class='add'>+Slots labeled ``A`` are channel 0 in this example. Slots labeled ``B`` are</div><div class='add'>+channel 1. Notice that there are two csrows possible on a physical DIMM.</div><div class='add'>+These csrows are allocated their csrow assignment based on the slot into</div><div class='add'>+which the memory DIMM is placed. Thus, when 1 DIMM is placed in each</div><div class='add'>+Channel, the csrows cross both DIMMs.</div><div class='add'>+</div><div class='add'>+Memory DIMMs come single or dual "ranked". A rank is a populated csrow.</div><div class='add'>+Thus, 2 single ranked DIMMs, placed in slots DIMM_A0 and DIMM_B0 above</div><div class='add'>+will have just one csrow (csrow0). csrow1 will be empty. On the other</div><div class='add'>+hand, when 2 dual ranked DIMMs are similarly placed, then both csrow0</div><div class='add'>+and csrow1 will be populated. The pattern repeats itself for csrow2 and</div><div class='add'>+csrow3.</div><div class='add'>+</div><div class='add'>+The representation of the above is reflected in the directory</div><div class='add'>+tree in EDAC's sysfs interface. Starting in directory</div><div class='add'>+``/sys/devices/system/edac/mc``, each memory controller will be</div><div class='add'>+represented by its own ``mcX`` directory, where ``X`` is the</div><div class='add'>+index of the MC::</div><div class='add'>+</div><div class='add'>+	..../edac/mc/</div><div class='add'>+		   |</div><div class='add'>+		   |-&gt;mc0</div><div class='add'>+		   |-&gt;mc1</div><div class='add'>+		   |-&gt;mc2</div><div class='add'>+		   ....</div><div class='add'>+</div><div class='add'>+Under each ``mcX`` directory each ``csrowX`` is again represented by a</div><div class='add'>+``csrowX``, where ``X`` is the csrow index::</div><div class='add'>+</div><div class='add'>+	.../mc/mc0/</div><div class='add'>+		|</div><div class='add'>+		|-&gt;csrow0</div><div class='add'>+		|-&gt;csrow2</div><div class='add'>+		|-&gt;csrow3</div><div class='add'>+		....</div><div class='add'>+</div><div class='add'>+Notice that there is no csrow1, which indicates that csrow0 is composed</div><div class='add'>+of a single ranked DIMMs. This should also apply in both Channels, in</div><div class='add'>+order to have dual-channel mode be operational. Since both csrow2 and</div><div class='add'>+csrow3 are populated, this indicates a dual ranked set of DIMMs for</div><div class='add'>+channels 0 and 1.</div><div class='add'>+</div><div class='add'>+Within each of the ``mcX`` and ``csrowX`` directories are several EDAC</div><div class='add'>+control and attribute files.</div><div class='add'>+</div><div class='add'>+``mcX`` directories</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+In ``mcX`` directories are EDAC control and attribute files for</div><div class='add'>+this ``X`` instance of the memory controllers.</div><div class='add'>+</div><div class='add'>+For a description of the sysfs API, please see:</div><div class='add'>+</div><div class='add'>+	Documentation/ABI/testing/sysfs-devices-edac</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+``dimmX`` or ``rankX`` directories</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+The recommended way to use the EDAC subsystem is to look at the information</div><div class='add'>+provided by the ``dimmX`` or ``rankX`` directories [#f5]_.</div><div class='add'>+</div><div class='add'>+A typical EDAC system has the following structure under</div><div class='add'>+``/sys/devices/system/edac/``\ [#f6]_::</div><div class='add'>+</div><div class='add'>+	/sys/devices/system/edac/</div><div class='add'>+	├── mc</div><div class='add'>+	│   ├── mc0</div><div class='add'>+	│   │   ├── ce_count</div><div class='add'>+	│   │   ├── ce_noinfo_count</div><div class='add'>+	│   │   ├── dimm0</div><div class='add'>+	│   │   │   ├── dimm_ce_count</div><div class='add'>+	│   │   │   ├── dimm_dev_type</div><div class='add'>+	│   │   │   ├── dimm_edac_mode</div><div class='add'>+	│   │   │   ├── dimm_label</div><div class='add'>+	│   │   │   ├── dimm_location</div><div class='add'>+	│   │   │   ├── dimm_mem_type</div><div class='add'>+	│   │   │   ├── dimm_ue_count</div><div class='add'>+	│   │   │   ├── size</div><div class='add'>+	│   │   │   └── uevent</div><div class='add'>+	│   │   ├── max_location</div><div class='add'>+	│   │   ├── mc_name</div><div class='add'>+	│   │   ├── reset_counters</div><div class='add'>+	│   │   ├── seconds_since_reset</div><div class='add'>+	│   │   ├── size_mb</div><div class='add'>+	│   │   ├── ue_count</div><div class='add'>+	│   │   ├── ue_noinfo_count</div><div class='add'>+	│   │   └── uevent</div><div class='add'>+	│   ├── mc1</div><div class='add'>+	│   │   ├── ce_count</div><div class='add'>+	│   │   ├── ce_noinfo_count</div><div class='add'>+	│   │   ├── dimm0</div><div class='add'>+	│   │   │   ├── dimm_ce_count</div><div class='add'>+	│   │   │   ├── dimm_dev_type</div><div class='add'>+	│   │   │   ├── dimm_edac_mode</div><div class='add'>+	│   │   │   ├── dimm_label</div><div class='add'>+	│   │   │   ├── dimm_location</div><div class='add'>+	│   │   │   ├── dimm_mem_type</div><div class='add'>+	│   │   │   ├── dimm_ue_count</div><div class='add'>+	│   │   │   ├── size</div><div class='add'>+	│   │   │   └── uevent</div><div class='add'>+	│   │   ├── max_location</div><div class='add'>+	│   │   ├── mc_name</div><div class='add'>+	│   │   ├── reset_counters</div><div class='add'>+	│   │   ├── seconds_since_reset</div><div class='add'>+	│   │   ├── size_mb</div><div class='add'>+	│   │   ├── ue_count</div><div class='add'>+	│   │   ├── ue_noinfo_count</div><div class='add'>+	│   │   └── uevent</div><div class='add'>+	│   └── uevent</div><div class='add'>+	└── uevent</div><div class='add'>+</div><div class='add'>+In the ``dimmX`` directories are EDAC control and attribute files for</div><div class='add'>+this ``X`` memory module:</div><div class='add'>+</div><div class='add'>+- ``size`` - Total memory managed by this csrow attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file displays, in count of megabytes, the memory</div><div class='add'>+	that this csrow contains.</div><div class='add'>+</div><div class='add'>+- ``dimm_ue_count`` - Uncorrectable Errors count attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file displays the total count of uncorrectable</div><div class='add'>+	errors that have occurred on this DIMM. If panic_on_ue is set</div><div class='add'>+	this counter will not have a chance to increment, since EDAC</div><div class='add'>+	will panic the system.</div><div class='add'>+</div><div class='add'>+- ``dimm_ce_count`` - Correctable Errors count attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file displays the total count of correctable</div><div class='add'>+	errors that have occurred on this DIMM. This count is very</div><div class='add'>+	important to examine. CEs provide early indications that a</div><div class='add'>+	DIMM is beginning to fail. This count field should be</div><div class='add'>+	monitored for non-zero values and report such information</div><div class='add'>+	to the system administrator.</div><div class='add'>+</div><div class='add'>+- ``dimm_dev_type``  - Device type attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file will display what type of DRAM device is</div><div class='add'>+	being utilized on this DIMM.</div><div class='add'>+	Examples:</div><div class='add'>+</div><div class='add'>+		- x1</div><div class='add'>+		- x2</div><div class='add'>+		- x4</div><div class='add'>+		- x8</div><div class='add'>+</div><div class='add'>+- ``dimm_edac_mode`` - EDAC Mode of operation attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file will display what type of Error detection</div><div class='add'>+	and correction is being utilized.</div><div class='add'>+</div><div class='add'>+- ``dimm_label`` - memory module label control file</div><div class='add'>+</div><div class='add'>+	This control file allows this DIMM to have a label assigned</div><div class='add'>+	to it. With this label in the module, when errors occur</div><div class='add'>+	the output can provide the DIMM label in the system log.</div><div class='add'>+	This becomes vital for panic events to isolate the</div><div class='add'>+	cause of the UE event.</div><div class='add'>+</div><div class='add'>+	DIMM Labels must be assigned after booting, with information</div><div class='add'>+	that correctly identifies the physical slot with its</div><div class='add'>+	silk screen label. This information is currently very</div><div class='add'>+	motherboard specific and determination of this information</div><div class='add'>+	must occur in userland at this time.</div><div class='add'>+</div><div class='add'>+- ``dimm_location`` - location of the memory module</div><div class='add'>+</div><div class='add'>+	The location can have up to 3 levels, and describe how the</div><div class='add'>+	memory controller identifies the location of a memory module.</div><div class='add'>+	Depending on the type of memory and memory controller, it</div><div class='add'>+	can be:</div><div class='add'>+</div><div class='add'>+		- *csrow* and *channel* - used when the memory controller</div><div class='add'>+		  doesn't identify a single DIMM - e. g. in ``rankX`` dir;</div><div class='add'>+		- *branch*, *channel*, *slot* - typically used on FB-DIMM memory</div><div class='add'>+		  controllers;</div><div class='add'>+		- *channel*, *slot* - used on Nehalem and newer Intel drivers.</div><div class='add'>+</div><div class='add'>+- ``dimm_mem_type`` - Memory Type attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file will display what type of memory is currently</div><div class='add'>+	on this csrow. Normally, either buffered or unbuffered memory.</div><div class='add'>+	Examples:</div><div class='add'>+</div><div class='add'>+		- Registered-DDR</div><div class='add'>+		- Unbuffered-DDR</div><div class='add'>+</div><div class='add'>+.. [#f5] On some systems, the memory controller doesn't have any logic</div><div class='add'>+  to identify the memory module. On such systems, the directory is called ``rankX`` and works on a similar way as the ``csrowX`` directories.</div><div class='add'>+  On modern Intel memory controllers, the memory controller identifies the</div><div class='add'>+  memory modules directly. On such systems, the directory is called ``dimmX``.</div><div class='add'>+</div><div class='add'>+.. [#f6] There are also some ``power`` directories and ``subsystem``</div><div class='add'>+  symlinks inside the sysfs mapping that are automatically created by</div><div class='add'>+  the sysfs subsystem. Currently, they serve no purpose.</div><div class='add'>+</div><div class='add'>+``csrowX`` directories</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+When CONFIG_EDAC_LEGACY_SYSFS is enabled, sysfs will contain the ``csrowX``</div><div class='add'>+directories. As this API doesn't work properly for Rambus, FB-DIMMs and</div><div class='add'>+modern Intel Memory Controllers, this is being deprecated in favor of</div><div class='add'>+``dimmX`` directories.</div><div class='add'>+</div><div class='add'>+In the ``csrowX`` directories are EDAC control and attribute files for</div><div class='add'>+this ``X`` instance of csrow:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``ue_count`` - Total Uncorrectable Errors count attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file displays the total count of uncorrectable</div><div class='add'>+	errors that have occurred on this csrow. If panic_on_ue is set</div><div class='add'>+	this counter will not have a chance to increment, since EDAC</div><div class='add'>+	will panic the system.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``ce_count`` - Total Correctable Errors count attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file displays the total count of correctable</div><div class='add'>+	errors that have occurred on this csrow. This count is very</div><div class='add'>+	important to examine. CEs provide early indications that a</div><div class='add'>+	DIMM is beginning to fail. This count field should be</div><div class='add'>+	monitored for non-zero values and report such information</div><div class='add'>+	to the system administrator.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``size_mb`` - Total memory managed by this csrow attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file displays, in count of megabytes, the memory</div><div class='add'>+	that this csrow contains.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``mem_type`` - Memory Type attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file will display what type of memory is currently</div><div class='add'>+	on this csrow. Normally, either buffered or unbuffered memory.</div><div class='add'>+	Examples:</div><div class='add'>+</div><div class='add'>+		- Registered-DDR</div><div class='add'>+		- Unbuffered-DDR</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``edac_mode`` - EDAC Mode of operation attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file will display what type of Error detection</div><div class='add'>+	and correction is being utilized.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``dev_type`` - Device type attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file will display what type of DRAM device is</div><div class='add'>+	being utilized on this DIMM.</div><div class='add'>+	Examples:</div><div class='add'>+</div><div class='add'>+		- x1</div><div class='add'>+		- x2</div><div class='add'>+		- x4</div><div class='add'>+		- x8</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``ch0_ce_count`` - Channel 0 CE Count attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file will display the count of CEs on this</div><div class='add'>+	DIMM located in channel 0.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``ch0_ue_count`` - Channel 0 UE Count attribute file</div><div class='add'>+</div><div class='add'>+	This attribute file will display the count of UEs on this</div><div class='add'>+	DIMM located in channel 0.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``ch0_dimm_label`` - Channel 0 DIMM Label control file</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	This control file allows this DIMM to have a label assigned</div><div class='add'>+	to it. With this label in the module, when errors occur</div><div class='add'>+	the output can provide the DIMM label in the system log.</div><div class='add'>+	This becomes vital for panic events to isolate the</div><div class='add'>+	cause of the UE event.</div><div class='add'>+</div><div class='add'>+	DIMM Labels must be assigned after booting, with information</div><div class='add'>+	that correctly identifies the physical slot with its</div><div class='add'>+	silk screen label. This information is currently very</div><div class='add'>+	motherboard specific and determination of this information</div><div class='add'>+	must occur in userland at this time.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``ch1_ce_count`` - Channel 1 CE Count attribute file</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	This attribute file will display the count of CEs on this</div><div class='add'>+	DIMM located in channel 1.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``ch1_ue_count`` - Channel 1 UE Count attribute file</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	This attribute file will display the count of UEs on this</div><div class='add'>+	DIMM located in channel 0.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``ch1_dimm_label`` - Channel 1 DIMM Label control file</div><div class='add'>+</div><div class='add'>+	This control file allows this DIMM to have a label assigned</div><div class='add'>+	to it. With this label in the module, when errors occur</div><div class='add'>+	the output can provide the DIMM label in the system log.</div><div class='add'>+	This becomes vital for panic events to isolate the</div><div class='add'>+	cause of the UE event.</div><div class='add'>+</div><div class='add'>+	DIMM Labels must be assigned after booting, with information</div><div class='add'>+	that correctly identifies the physical slot with its</div><div class='add'>+	silk screen label. This information is currently very</div><div class='add'>+	motherboard specific and determination of this information</div><div class='add'>+	must occur in userland at this time.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+System Logging</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+If logging for UEs and CEs is enabled, then system logs will contain</div><div class='add'>+information indicating that errors have been detected::</div><div class='add'>+</div><div class='add'>+  EDAC MC0: CE page 0x283, offset 0xce0, grain 8, syndrome 0x6ec3, row 0, channel 1 "DIMM_B1": amd76x_edac</div><div class='add'>+  EDAC MC0: CE page 0x1e5, offset 0xfb0, grain 8, syndrome 0xb741, row 0, channel 1 "DIMM_B1": amd76x_edac</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The structure of the message is:</div><div class='add'>+</div><div class='add'>+	+---------------------------------------+-------------+</div><div class='add'>+	| Content                               + Example     |</div><div class='add'>+	+=======================================+=============+</div><div class='add'>+	| The memory controller                 | MC0         |</div><div class='add'>+	+---------------------------------------+-------------+</div><div class='add'>+	| Error type                            | CE          |</div><div class='add'>+	+---------------------------------------+-------------+</div><div class='add'>+	| Memory page                           | 0x283       |</div><div class='add'>+	+---------------------------------------+-------------+</div><div class='add'>+	| Offset in the page                    | 0xce0       |</div><div class='add'>+	+---------------------------------------+-------------+</div><div class='add'>+	| The byte granularity                  | grain 8     |</div><div class='add'>+	| or resolution of the error            |             |</div><div class='add'>+	+---------------------------------------+-------------+</div><div class='add'>+	| The error syndrome                    | 0xb741      |</div><div class='add'>+	+---------------------------------------+-------------+</div><div class='add'>+	| Memory row                            | row 0       +</div><div class='add'>+	+---------------------------------------+-------------+</div><div class='add'>+	| Memory channel                        | channel 1   |</div><div class='add'>+	+---------------------------------------+-------------+</div><div class='add'>+	| DIMM label, if set prior              | DIMM B1     |</div><div class='add'>+	+---------------------------------------+-------------+</div><div class='add'>+	| And then an optional, driver-specific |             |</div><div class='add'>+	| message that may have additional      |             |</div><div class='add'>+	| information.                          |             |</div><div class='add'>+	+---------------------------------------+-------------+</div><div class='add'>+</div><div class='add'>+Both UEs and CEs with no info will lack all but memory controller, error</div><div class='add'>+type, a notice of "no info" and then an optional, driver-specific error</div><div class='add'>+message.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PCI Bus Parity Detection</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+On Header Type 00 devices, the primary status is looked at for any</div><div class='add'>+parity error regardless of whether parity is enabled on the device or</div><div class='add'>+not. (The spec indicates parity is generated in some cases). On Header</div><div class='add'>+Type 01 bridges, the secondary status register is also looked at to see</div><div class='add'>+if parity occurred on the bus on the other side of the bridge.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Sysfs configuration</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Under ``/sys/devices/system/edac/pci`` are control and attribute files as</div><div class='add'>+follows:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``check_pci_parity`` - Enable/Disable PCI Parity checking control file</div><div class='add'>+</div><div class='add'>+	This control file enables or disables the PCI Bus Parity scanning</div><div class='add'>+	operation. Writing a 1 to this file enables the scanning. Writing</div><div class='add'>+	a 0 to this file disables the scanning.</div><div class='add'>+</div><div class='add'>+	Enable::</div><div class='add'>+</div><div class='add'>+		echo "1" &gt;/sys/devices/system/edac/pci/check_pci_parity</div><div class='add'>+</div><div class='add'>+	Disable::</div><div class='add'>+</div><div class='add'>+		echo "0" &gt;/sys/devices/system/edac/pci/check_pci_parity</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``pci_parity_count`` - Parity Count</div><div class='add'>+</div><div class='add'>+	This attribute file will display the number of parity errors that</div><div class='add'>+	have been detected.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Module parameters</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+- ``edac_mc_panic_on_ue`` - Panic on UE control file</div><div class='add'>+</div><div class='add'>+	An uncorrectable error will cause a machine panic.  This is usually</div><div class='add'>+	desirable.  It is a bad idea to continue when an uncorrectable error</div><div class='add'>+	occurs - it is indeterminate what was uncorrected and the operating</div><div class='add'>+	system context might be so mangled that continuing will lead to further</div><div class='add'>+	corruption. If the kernel has MCE configured, then EDAC will never</div><div class='add'>+	notice the UE.</div><div class='add'>+</div><div class='add'>+	LOAD TIME::</div><div class='add'>+</div><div class='add'>+		module/kernel parameter: edac_mc_panic_on_ue=[0|1]</div><div class='add'>+</div><div class='add'>+	RUN TIME::</div><div class='add'>+</div><div class='add'>+		echo "1" &gt; /sys/module/edac_core/parameters/edac_mc_panic_on_ue</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``edac_mc_log_ue`` - Log UE control file</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	Generate kernel messages describing uncorrectable errors.  These errors</div><div class='add'>+	are reported through the system message log system.  UE statistics</div><div class='add'>+	will be accumulated even when UE logging is disabled.</div><div class='add'>+</div><div class='add'>+	LOAD TIME::</div><div class='add'>+</div><div class='add'>+		module/kernel parameter: edac_mc_log_ue=[0|1]</div><div class='add'>+</div><div class='add'>+	RUN TIME::</div><div class='add'>+</div><div class='add'>+		echo "1" &gt; /sys/module/edac_core/parameters/edac_mc_log_ue</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``edac_mc_log_ce`` - Log CE control file</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	Generate kernel messages describing correctable errors.  These</div><div class='add'>+	errors are reported through the system message log system.</div><div class='add'>+	CE statistics will be accumulated even when CE logging is disabled.</div><div class='add'>+</div><div class='add'>+	LOAD TIME::</div><div class='add'>+</div><div class='add'>+		module/kernel parameter: edac_mc_log_ce=[0|1]</div><div class='add'>+</div><div class='add'>+	RUN TIME::</div><div class='add'>+</div><div class='add'>+		echo "1" &gt; /sys/module/edac_core/parameters/edac_mc_log_ce</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``edac_mc_poll_msec`` - Polling period control file</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	The time period, in milliseconds, for polling for error information.</div><div class='add'>+	Too small a value wastes resources.  Too large a value might delay</div><div class='add'>+	necessary handling of errors and might loose valuable information for</div><div class='add'>+	locating the error.  1000 milliseconds (once each second) is the current</div><div class='add'>+	default. Systems which require all the bandwidth they can get, may</div><div class='add'>+	increase this.</div><div class='add'>+</div><div class='add'>+	LOAD TIME::</div><div class='add'>+</div><div class='add'>+		module/kernel parameter: edac_mc_poll_msec=[0|1]</div><div class='add'>+</div><div class='add'>+	RUN TIME::</div><div class='add'>+</div><div class='add'>+		echo "1000" &gt; /sys/module/edac_core/parameters/edac_mc_poll_msec</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- ``panic_on_pci_parity`` - Panic on PCI PARITY Error</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	This control file enables or disables panicking when a parity</div><div class='add'>+	error has been detected.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	module/kernel parameter::</div><div class='add'>+</div><div class='add'>+			edac_panic_on_pci_pe=[0|1]</div><div class='add'>+</div><div class='add'>+	Enable::</div><div class='add'>+</div><div class='add'>+		echo "1" &gt; /sys/module/edac_core/parameters/edac_panic_on_pci_pe</div><div class='add'>+</div><div class='add'>+	Disable::</div><div class='add'>+</div><div class='add'>+		echo "0" &gt; /sys/module/edac_core/parameters/edac_panic_on_pci_pe</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+EDAC device type</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+In the header file, edac_pci.h, there is a series of edac_device structures</div><div class='add'>+and APIs for the EDAC_DEVICE.</div><div class='add'>+</div><div class='add'>+User space access to an edac_device is through the sysfs interface.</div><div class='add'>+</div><div class='add'>+At the location ``/sys/devices/system/edac`` (sysfs) new edac_device devices</div><div class='add'>+will appear.</div><div class='add'>+</div><div class='add'>+There is a three level tree beneath the above ``edac`` directory. For example,</div><div class='add'>+the ``test_device_edac`` device (found at the http://bluesmoke.sourceforget.net</div><div class='add'>+website) installs itself as::</div><div class='add'>+</div><div class='add'>+	/sys/devices/system/edac/test-instance</div><div class='add'>+</div><div class='add'>+in this directory are various controls, a symlink and one or more ``instance``</div><div class='add'>+directories.</div><div class='add'>+</div><div class='add'>+The standard default controls are:</div><div class='add'>+</div><div class='add'>+	==============	=======================================================</div><div class='add'>+	log_ce		boolean to log CE events</div><div class='add'>+	log_ue		boolean to log UE events</div><div class='add'>+	panic_on_ue	boolean to ``panic`` the system if an UE is encountered</div><div class='add'>+			(default off, can be set true via startup script)</div><div class='add'>+	poll_msec	time period between POLL cycles for events</div><div class='add'>+	==============	=======================================================</div><div class='add'>+</div><div class='add'>+The test_device_edac device adds at least one of its own custom control:</div><div class='add'>+</div><div class='add'>+	==============	==================================================</div><div class='add'>+	test_bits	which in the current test driver does nothing but</div><div class='add'>+			show how it is installed. A ported driver can</div><div class='add'>+			add one or more such controls and/or attributes</div><div class='add'>+			for specific uses.</div><div class='add'>+			One out-of-tree driver uses controls here to allow</div><div class='add'>+			for ERROR INJECTION operations to hardware</div><div class='add'>+			injection registers</div><div class='add'>+	==============	==================================================</div><div class='add'>+</div><div class='add'>+The symlink points to the 'struct dev' that is registered for this edac_device.</div><div class='add'>+</div><div class='add'>+Instances</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+One or more instance directories are present. For the ``test_device_edac``</div><div class='add'>+case:</div><div class='add'>+</div><div class='add'>+	+----------------+</div><div class='add'>+	| test-instance0 |</div><div class='add'>+	+----------------+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+In this directory there are two default counter attributes, which are totals of</div><div class='add'>+counter in deeper subdirectories.</div><div class='add'>+</div><div class='add'>+	==============	====================================</div><div class='add'>+	ce_count	total of CE events of subdirectories</div><div class='add'>+	ue_count	total of UE events of subdirectories</div><div class='add'>+	==============	====================================</div><div class='add'>+</div><div class='add'>+Blocks</div><div class='add'>+------</div><div class='add'>+</div><div class='add'>+At the lowest directory level is the ``block`` directory. There can be 0, 1</div><div class='add'>+or more blocks specified in each instance:</div><div class='add'>+</div><div class='add'>+	+-------------+</div><div class='add'>+	| test-block0 |</div><div class='add'>+	+-------------+</div><div class='add'>+</div><div class='add'>+In this directory the default attributes are:</div><div class='add'>+</div><div class='add'>+	==============	================================================</div><div class='add'>+	ce_count	which is counter of CE events for this ``block``</div><div class='add'>+			of hardware being monitored</div><div class='add'>+	ue_count	which is counter of UE events for this ``block``</div><div class='add'>+			of hardware being monitored</div><div class='add'>+	==============	================================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The ``test_device_edac`` device adds 4 attributes and 1 control:</div><div class='add'>+</div><div class='add'>+	================== ====================================================</div><div class='add'>+	test-block-bits-0	for every POLL cycle this counter</div><div class='add'>+				is incremented</div><div class='add'>+	test-block-bits-1	every 10 cycles, this counter is bumped once,</div><div class='add'>+				and test-block-bits-0 is set to 0</div><div class='add'>+	test-block-bits-2	every 100 cycles, this counter is bumped once,</div><div class='add'>+				and test-block-bits-1 is set to 0</div><div class='add'>+	test-block-bits-3	every 1000 cycles, this counter is bumped once,</div><div class='add'>+				and test-block-bits-2 is set to 0</div><div class='add'>+	================== ====================================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	================== ====================================================</div><div class='add'>+	reset-counters		writing ANY thing to this control will</div><div class='add'>+				reset all the above counters.</div><div class='add'>+	================== ====================================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Use of the ``test_device_edac`` driver should enable any others to create their own</div><div class='add'>+unique drivers for their hardware systems.</div><div class='add'>+</div><div class='add'>+The ``test_device_edac`` sample driver is located at the</div><div class='add'>+http://bluesmoke.sourceforge.net project site for EDAC.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Usage of EDAC APIs on Nehalem and newer Intel CPUs</div><div class='add'>+--------------------------------------------------</div><div class='add'>+</div><div class='add'>+On older Intel architectures, the memory controller was part of the North</div><div class='add'>+Bridge chipset. Nehalem, Sandy Bridge, Ivy Bridge, Haswell, Sky Lake and</div><div class='add'>+newer Intel architectures integrated an enhanced version of the memory</div><div class='add'>+controller (MC) inside the CPUs.</div><div class='add'>+</div><div class='add'>+This chapter will cover the differences of the enhanced memory controllers</div><div class='add'>+found on newer Intel CPUs, such as ``i7core_edac``, ``sb_edac`` and</div><div class='add'>+``sbx_edac`` drivers.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+   The Xeon E7 processor families use a separate chip for the memory</div><div class='add'>+   controller, called Intel Scalable Memory Buffer. This section doesn't</div><div class='add'>+   apply for such families.</div><div class='add'>+</div><div class='add'>+1) There is one Memory Controller per Quick Patch Interconnect</div><div class='add'>+   (QPI). At the driver, the term "socket" means one QPI. This is</div><div class='add'>+   associated with a physical CPU socket.</div><div class='add'>+</div><div class='add'>+   Each MC have 3 physical read channels, 3 physical write channels and</div><div class='add'>+   3 logic channels. The driver currently sees it as just 3 channels.</div><div class='add'>+   Each channel can have up to 3 DIMMs.</div><div class='add'>+</div><div class='add'>+   The minimum known unity is DIMMs. There are no information about csrows.</div><div class='add'>+   As EDAC API maps the minimum unity is csrows, the driver sequentially</div><div class='add'>+   maps channel/DIMM into different csrows.</div><div class='add'>+</div><div class='add'>+   For example, supposing the following layout::</div><div class='add'>+</div><div class='add'>+	Ch0 phy rd0, wr0 (0x063f4031): 2 ranks, UDIMMs</div><div class='add'>+	  dimm 0 1024 Mb offset: 0, bank: 8, rank: 1, row: 0x4000, col: 0x400</div><div class='add'>+	  dimm 1 1024 Mb offset: 4, bank: 8, rank: 1, row: 0x4000, col: 0x400</div><div class='add'>+        Ch1 phy rd1, wr1 (0x063f4031): 2 ranks, UDIMMs</div><div class='add'>+	  dimm 0 1024 Mb offset: 0, bank: 8, rank: 1, row: 0x4000, col: 0x400</div><div class='add'>+	Ch2 phy rd3, wr3 (0x063f4031): 2 ranks, UDIMMs</div><div class='add'>+	  dimm 0 1024 Mb offset: 0, bank: 8, rank: 1, row: 0x4000, col: 0x400</div><div class='add'>+</div><div class='add'>+   The driver will map it as::</div><div class='add'>+</div><div class='add'>+	csrow0: channel 0, dimm0</div><div class='add'>+	csrow1: channel 0, dimm1</div><div class='add'>+	csrow2: channel 1, dimm0</div><div class='add'>+	csrow3: channel 2, dimm0</div><div class='add'>+</div><div class='add'>+   exports one DIMM per csrow.</div><div class='add'>+</div><div class='add'>+   Each QPI is exported as a different memory controller.</div><div class='add'>+</div><div class='add'>+2) The MC has the ability to inject errors to test drivers. The drivers</div><div class='add'>+   implement this functionality via some error injection nodes:</div><div class='add'>+</div><div class='add'>+   For injecting a memory error, there are some sysfs nodes, under</div><div class='add'>+   ``/sys/devices/system/edac/mc/mc?/``:</div><div class='add'>+</div><div class='add'>+   - ``inject_addrmatch/*``:</div><div class='add'>+      Controls the error injection mask register. It is possible to specify</div><div class='add'>+      several characteristics of the address to match an error code::</div><div class='add'>+</div><div class='add'>+         dimm = the affected dimm. Numbers are relative to a channel;</div><div class='add'>+         rank = the memory rank;</div><div class='add'>+         channel = the channel that will generate an error;</div><div class='add'>+         bank = the affected bank;</div><div class='add'>+         page = the page address;</div><div class='add'>+         column (or col) = the address column.</div><div class='add'>+</div><div class='add'>+      each of the above values can be set to "any" to match any valid value.</div><div class='add'>+</div><div class='add'>+      At driver init, all values are set to any.</div><div class='add'>+</div><div class='add'>+      For example, to generate an error at rank 1 of dimm 2, for any channel,</div><div class='add'>+      any bank, any page, any column::</div><div class='add'>+</div><div class='add'>+		echo 2 &gt;/sys/devices/system/edac/mc/mc0/inject_addrmatch/dimm</div><div class='add'>+		echo 1 &gt;/sys/devices/system/edac/mc/mc0/inject_addrmatch/rank</div><div class='add'>+</div><div class='add'>+	To return to the default behaviour of matching any, you can do::</div><div class='add'>+</div><div class='add'>+		echo any &gt;/sys/devices/system/edac/mc/mc0/inject_addrmatch/dimm</div><div class='add'>+		echo any &gt;/sys/devices/system/edac/mc/mc0/inject_addrmatch/rank</div><div class='add'>+</div><div class='add'>+   - ``inject_eccmask``:</div><div class='add'>+          specifies what bits will have troubles,</div><div class='add'>+</div><div class='add'>+   - ``inject_section``:</div><div class='add'>+       specifies what ECC cache section will get the error::</div><div class='add'>+</div><div class='add'>+		3 for both</div><div class='add'>+		2 for the highest</div><div class='add'>+		1 for the lowest</div><div class='add'>+</div><div class='add'>+   - ``inject_type``:</div><div class='add'>+       specifies the type of error, being a combination of the following bits::</div><div class='add'>+</div><div class='add'>+		bit 0 - repeat</div><div class='add'>+		bit 1 - ecc</div><div class='add'>+		bit 2 - parity</div><div class='add'>+</div><div class='add'>+   - ``inject_enable``:</div><div class='add'>+       starts the error generation when something different than 0 is written.</div><div class='add'>+</div><div class='add'>+   All inject vars can be read. root permission is needed for write.</div><div class='add'>+</div><div class='add'>+   Datasheet states that the error will only be generated after a write on an</div><div class='add'>+   address that matches inject_addrmatch. It seems, however, that reading will</div><div class='add'>+   also produce an error.</div><div class='add'>+</div><div class='add'>+   For example, the following code will generate an error for any write access</div><div class='add'>+   at socket 0, on any DIMM/address on channel 2::</div><div class='add'>+</div><div class='add'>+	echo 2 &gt;/sys/devices/system/edac/mc/mc0/inject_addrmatch/channel</div><div class='add'>+	echo 2 &gt;/sys/devices/system/edac/mc/mc0/inject_type</div><div class='add'>+	echo 64 &gt;/sys/devices/system/edac/mc/mc0/inject_eccmask</div><div class='add'>+	echo 3 &gt;/sys/devices/system/edac/mc/mc0/inject_section</div><div class='add'>+	echo 1 &gt;/sys/devices/system/edac/mc/mc0/inject_enable</div><div class='add'>+	dd if=/dev/mem of=/dev/null seek=16k bs=4k count=1 &gt;&amp; /dev/null</div><div class='add'>+</div><div class='add'>+   For socket 1, it is needed to replace "mc0" by "mc1" at the above</div><div class='add'>+   commands.</div><div class='add'>+</div><div class='add'>+   The generated error message will look like::</div><div class='add'>+</div><div class='add'>+	EDAC MC0: UE row 0, channel-a= 0 channel-b= 0 labels "-": NON_FATAL (addr = 0x0075b980, socket=0, Dimm=0, Channel=2, syndrome=0x00000040, count=1, Err=8c0000400001009f:4000080482 (read error: read ECC error))</div><div class='add'>+</div><div class='add'>+3) Corrected Error memory register counters</div><div class='add'>+</div><div class='add'>+   Those newer MCs have some registers to count memory errors. The driver</div><div class='add'>+   uses those registers to report Corrected Errors on devices with Registered</div><div class='add'>+   DIMMs.</div><div class='add'>+</div><div class='add'>+   However, those counters don't work with Unregistered DIMM. As the chipset</div><div class='add'>+   offers some counters that also work with UDIMMs (but with a worse level of</div><div class='add'>+   granularity than the default ones), the driver exposes those registers for</div><div class='add'>+   UDIMM memories.</div><div class='add'>+</div><div class='add'>+   They can be read by looking at the contents of ``all_channel_counts/``::</div><div class='add'>+</div><div class='add'>+     $ for i in /sys/devices/system/edac/mc/mc0/all_channel_counts/*; do echo $i; cat $i; done</div><div class='add'>+	/sys/devices/system/edac/mc/mc0/all_channel_counts/udimm0</div><div class='add'>+	0</div><div class='add'>+	/sys/devices/system/edac/mc/mc0/all_channel_counts/udimm1</div><div class='add'>+	0</div><div class='add'>+	/sys/devices/system/edac/mc/mc0/all_channel_counts/udimm2</div><div class='add'>+	0</div><div class='add'>+</div><div class='add'>+   What happens here is that errors on different csrows, but at the same</div><div class='add'>+   dimm number will increment the same counter.</div><div class='add'>+   So, in this memory mapping::</div><div class='add'>+</div><div class='add'>+	csrow0: channel 0, dimm0</div><div class='add'>+	csrow1: channel 0, dimm1</div><div class='add'>+	csrow2: channel 1, dimm0</div><div class='add'>+	csrow3: channel 2, dimm0</div><div class='add'>+</div><div class='add'>+   The hardware will increment udimm0 for an error at the first dimm at either</div><div class='add'>+   csrow0, csrow2  or csrow3;</div><div class='add'>+</div><div class='add'>+   The hardware will increment udimm1 for an error at the second dimm at either</div><div class='add'>+   csrow0, csrow2  or csrow3;</div><div class='add'>+</div><div class='add'>+   The hardware will increment udimm2 for an error at the third dimm at either</div><div class='add'>+   csrow0, csrow2  or csrow3;</div><div class='add'>+</div><div class='add'>+4) Standard error counters</div><div class='add'>+</div><div class='add'>+   The standard error counters are generated when an mcelog error is received</div><div class='add'>+   by the driver. Since, with UDIMM, this is counted by software, it is</div><div class='add'>+   possible that some errors could be lost. With RDIMM's, they display the</div><div class='add'>+   contents of the registers</div><div class='add'>+</div><div class='add'>+Reference documents used on ``amd64_edac``</div><div class='add'>+------------------------------------------</div><div class='add'>+</div><div class='add'>+``amd64_edac`` module is based on the following documents</div><div class='add'>+(available from http://support.amd.com/en-us/search/tech-docs):</div><div class='add'>+</div><div class='add'>+1. :Title:  BIOS and Kernel Developer's Guide for AMD Athlon 64 and AMD</div><div class='add'>+	   Opteron Processors</div><div class='add'>+   :AMD publication #: 26094</div><div class='add'>+   :Revision: 3.26</div><div class='add'>+   :Link: http://support.amd.com/TechDocs/26094.PDF</div><div class='add'>+</div><div class='add'>+2. :Title:  BIOS and Kernel Developer's Guide for AMD NPT Family 0Fh</div><div class='add'>+	   Processors</div><div class='add'>+   :AMD publication #: 32559</div><div class='add'>+   :Revision: 3.00</div><div class='add'>+   :Issue Date: May 2006</div><div class='add'>+   :Link: http://support.amd.com/TechDocs/32559.pdf</div><div class='add'>+</div><div class='add'>+3. :Title:  BIOS and Kernel Developer's Guide (BKDG) For AMD Family 10h</div><div class='add'>+	   Processors</div><div class='add'>+   :AMD publication #: 31116</div><div class='add'>+   :Revision: 3.00</div><div class='add'>+   :Issue Date: September 07, 2007</div><div class='add'>+   :Link: http://support.amd.com/TechDocs/31116.pdf</div><div class='add'>+</div><div class='add'>+4. :Title: BIOS and Kernel Developer's Guide (BKDG) for AMD Family 15h</div><div class='add'>+	  Models 30h-3Fh Processors</div><div class='add'>+   :AMD publication #: 49125</div><div class='add'>+   :Revision: 3.06</div><div class='add'>+   :Issue Date: 2/12/2015 (latest release)</div><div class='add'>+   :Link: http://support.amd.com/TechDocs/49125_15h_Models_30h-3Fh_BKDG.pdf</div><div class='add'>+</div><div class='add'>+5. :Title: BIOS and Kernel Developer's Guide (BKDG) for AMD Family 15h</div><div class='add'>+	  Models 60h-6Fh Processors</div><div class='add'>+   :AMD publication #: 50742</div><div class='add'>+   :Revision: 3.01</div><div class='add'>+   :Issue Date: 7/23/2015 (latest release)</div><div class='add'>+   :Link: http://support.amd.com/TechDocs/50742_15h_Models_60h-6Fh_BKDG.pdf</div><div class='add'>+</div><div class='add'>+6. :Title: BIOS and Kernel Developer's Guide (BKDG) for AMD Family 16h</div><div class='add'>+	  Models 00h-0Fh Processors</div><div class='add'>+   :AMD publication #: 48751</div><div class='add'>+   :Revision: 3.03</div><div class='add'>+   :Issue Date: 2/23/2015 (latest release)</div><div class='add'>+   :Link: http://support.amd.com/TechDocs/48751_16h_bkdg.pdf</div><div class='add'>+</div><div class='add'>+Credits</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+* Written by Doug Thompson &lt;dougthompson@xmission.com&gt;</div><div class='add'>+</div><div class='add'>+  - 7 Dec 2005</div><div class='add'>+  - 17 Jul 2007	Updated</div><div class='add'>+</div><div class='add'>+* |copy| Mauro Carvalho Chehab</div><div class='add'>+</div><div class='add'>+  - 05 Aug 2009	Nehalem interface</div><div class='add'>+  - 26 Oct 2016 Converted to ReST and cleanups at the Nehalem section</div><div class='add'>+</div><div class='add'>+* EDAC authors/maintainers:</div><div class='add'>+</div><div class='add'>+  - Doug Thompson, Dave Jiang, Dave Peterson et al,</div><div class='add'>+  - Mauro Carvalho Chehab</div><div class='add'>+  - Borislav Petkov</div><div class='add'>+  - original author: Thayne Harbaugh</div><div class='head'>diff --git a/Documentation/admin-guide/reporting-bugs.rst b/Documentation/admin-guide/reporting-bugs.rst<br/>new file mode 100644<br/>index 000000000000..26b60b419652<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/reporting-bugs.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/reporting-bugs.rst</a></div><div class='hunk'>@@ -0,0 +1,182 @@</div><div class='add'>+.. _reportingbugs:</div><div class='add'>+</div><div class='add'>+Reporting bugs</div><div class='add'>+++++++++++++++</div><div class='add'>+</div><div class='add'>+Background</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+The upstream Linux kernel maintainers only fix bugs for specific kernel</div><div class='add'>+versions.  Those versions include the current "release candidate" (or -rc)</div><div class='add'>+kernel, any "stable" kernel versions, and any "long term" kernels.</div><div class='add'>+</div><div class='add'>+Please see https://www.kernel.org/ for a list of supported kernels.  Any</div><div class='add'>+kernel marked with [EOL] is "end of life" and will not have any fixes</div><div class='add'>+backported to it.</div><div class='add'>+</div><div class='add'>+If you've found a bug on a kernel version that isn't listed on kernel.org,</div><div class='add'>+contact your Linux distribution or embedded vendor for support.</div><div class='add'>+Alternatively, you can attempt to run one of the supported stable or -rc</div><div class='add'>+kernels, and see if you can reproduce the bug on that.  It's preferable</div><div class='add'>+to reproduce the bug on the latest -rc kernel.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+How to report Linux kernel bugs</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Identify the problematic subsystem</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+Identifying which part of the Linux kernel might be causing your issue</div><div class='add'>+increases your chances of getting your bug fixed. Simply posting to the</div><div class='add'>+generic linux-kernel mailing list (LKML) may cause your bug report to be</div><div class='add'>+lost in the noise of a mailing list that gets 1000+ emails a day.</div><div class='add'>+</div><div class='add'>+Instead, try to figure out which kernel subsystem is causing the issue,</div><div class='add'>+and email that subsystem's maintainer and mailing list.  If the subsystem</div><div class='add'>+maintainer doesn't answer, then expand your scope to mailing lists like</div><div class='add'>+LKML.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Identify who to notify</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+Once you know the subsystem that is causing the issue, you should send a</div><div class='add'>+bug report.  Some maintainers prefer bugs to be reported via bugzilla</div><div class='add'>+(https://bugzilla.kernel.org), while others prefer that bugs be reported</div><div class='add'>+via the subsystem mailing list.</div><div class='add'>+</div><div class='add'>+To find out where to send an emailed bug report, find your subsystem or</div><div class='add'>+device driver in the MAINTAINERS file.  Search in the file for relevant</div><div class='add'>+entries, and send your bug report to the person(s) listed in the "M:"</div><div class='add'>+lines, making sure to Cc the mailing list(s) in the "L:" lines.  When the</div><div class='add'>+maintainer replies to you, make sure to 'Reply-all' in order to keep the</div><div class='add'>+public mailing list(s) in the email thread.</div><div class='add'>+</div><div class='add'>+If you know which driver is causing issues, you can pass one of the driver</div><div class='add'>+files to the get_maintainer.pl script::</div><div class='add'>+</div><div class='add'>+     perl scripts/get_maintainer.pl -f &lt;filename&gt;</div><div class='add'>+</div><div class='add'>+If it is a security bug, please copy the Security Contact listed in the</div><div class='add'>+MAINTAINERS file.  They can help coordinate bugfix and disclosure.  See</div><div class='add'>+:ref:`Documentation/admin-guide/security-bugs.rst &lt;securitybugs&gt;` for more information.</div><div class='add'>+</div><div class='add'>+If you can't figure out which subsystem caused the issue, you should file</div><div class='add'>+a bug in kernel.org bugzilla and send email to</div><div class='add'>+linux-kernel@vger.kernel.org, referencing the bugzilla URL.  (For more</div><div class='add'>+information on the linux-kernel mailing list see</div><div class='add'>+http://www.tux.org/lkml/).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Tips for reporting bugs</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+If you haven't reported a bug before, please read:</div><div class='add'>+</div><div class='add'>+	http://www.chiark.greenend.org.uk/~sgtatham/bugs.html</div><div class='add'>+</div><div class='add'>+	http://www.catb.org/esr/faqs/smart-questions.html</div><div class='add'>+</div><div class='add'>+It's REALLY important to report bugs that seem unrelated as separate email</div><div class='add'>+threads or separate bugzilla entries.  If you report several unrelated</div><div class='add'>+bugs at once, it's difficult for maintainers to tease apart the relevant</div><div class='add'>+data.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Gather information</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+The most important information in a bug report is how to reproduce the</div><div class='add'>+bug.  This includes system information, and (most importantly)</div><div class='add'>+step-by-step instructions for how a user can trigger the bug.</div><div class='add'>+</div><div class='add'>+If the failure includes an "OOPS:", take a picture of the screen, capture</div><div class='add'>+a netconsole trace, or type the message from your screen into the bug</div><div class='add'>+report.  Please read "Documentation/admin-guide/oops-tracing.rst" before posting your</div><div class='add'>+bug report. This explains what you should do with the "Oops" information</div><div class='add'>+to make it useful to the recipient.</div><div class='add'>+</div><div class='add'>+This is a suggested format for a bug report sent via email or bugzilla.</div><div class='add'>+Having a standardized bug report form makes it easier for you not to</div><div class='add'>+overlook things, and easier for the developers to find the pieces of</div><div class='add'>+information they're really interested in.  If some information is not</div><div class='add'>+relevant to your bug, feel free to exclude it.</div><div class='add'>+</div><div class='add'>+First run the ver_linux script included as scripts/ver_linux, which</div><div class='add'>+reports the version of some important subsystems.  Run this script with</div><div class='add'>+the command ``awk -f scripts/ver_linux``.</div><div class='add'>+</div><div class='add'>+Use that information to fill in all fields of the bug report form, and</div><div class='add'>+post it to the mailing list with a subject of "PROBLEM: &lt;one line</div><div class='add'>+summary from [1.]&gt;" for easy identification by the developers::</div><div class='add'>+</div><div class='add'>+  [1.] One line summary of the problem:</div><div class='add'>+  [2.] Full description of the problem/report:</div><div class='add'>+  [3.] Keywords (i.e., modules, networking, kernel):</div><div class='add'>+  [4.] Kernel information</div><div class='add'>+  [4.1.] Kernel version (from /proc/version):</div><div class='add'>+  [4.2.] Kernel .config file:</div><div class='add'>+  [5.] Most recent kernel version which did not have the bug:</div><div class='add'>+  [6.] Output of Oops.. message (if applicable) with symbolic information</div><div class='add'>+       resolved (see Documentation/admin-guide/oops-tracing.rst)</div><div class='add'>+  [7.] A small shell script or example program which triggers the</div><div class='add'>+       problem (if possible)</div><div class='add'>+  [8.] Environment</div><div class='add'>+  [8.1.] Software (add the output of the ver_linux script here)</div><div class='add'>+  [8.2.] Processor information (from /proc/cpuinfo):</div><div class='add'>+  [8.3.] Module information (from /proc/modules):</div><div class='add'>+  [8.4.] Loaded driver and hardware information (/proc/ioports, /proc/iomem)</div><div class='add'>+  [8.5.] PCI information ('lspci -vvv' as root)</div><div class='add'>+  [8.6.] SCSI information (from /proc/scsi/scsi)</div><div class='add'>+  [8.7.] Other information that might be relevant to the problem</div><div class='add'>+         (please look in /proc and include all information that you</div><div class='add'>+         think to be relevant):</div><div class='add'>+  [X.] Other notes, patches, fixes, workarounds:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Follow up</div><div class='add'>+=========</div><div class='add'>+</div><div class='add'>+Expectations for bug reporters</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+Linux kernel maintainers expect bug reporters to be able to follow up on</div><div class='add'>+bug reports.  That may include running new tests, applying patches,</div><div class='add'>+recompiling your kernel, and/or re-triggering your bug.  The most</div><div class='add'>+frustrating thing for maintainers is for someone to report a bug, and then</div><div class='add'>+never follow up on a request to try out a fix.</div><div class='add'>+</div><div class='add'>+That said, it's still useful for a kernel maintainer to know a bug exists</div><div class='add'>+on a supported kernel, even if you can't follow up with retests.  Follow</div><div class='add'>+up reports, such as replying to the email thread with "I tried the latest</div><div class='add'>+kernel and I can't reproduce my bug anymore" are also helpful, because</div><div class='add'>+maintainers have to assume silence means things are still broken.</div><div class='add'>+</div><div class='add'>+Expectations for kernel maintainers</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+Linux kernel maintainers are busy, overworked human beings.  Some times</div><div class='add'>+they may not be able to address your bug in a day, a week, or two weeks.</div><div class='add'>+If they don't answer your email, they may be on vacation, or at a Linux</div><div class='add'>+conference.  Check the conference schedule at https://LWN.net for more info:</div><div class='add'>+</div><div class='add'>+	https://lwn.net/Calendar/</div><div class='add'>+</div><div class='add'>+In general, kernel maintainers take 1 to 5 business days to respond to</div><div class='add'>+bugs.  The majority of kernel maintainers are employed to work on the</div><div class='add'>+kernel, and they may not work on the weekends.  Maintainers are scattered</div><div class='add'>+around the world, and they may not work in your time zone.  Unless you</div><div class='add'>+have a high priority bug, please wait at least a week after the first bug</div><div class='add'>+report before sending the maintainer a reminder email.</div><div class='add'>+</div><div class='add'>+The exceptions to this rule are regressions, kernel crashes, security holes,</div><div class='add'>+or userspace breakage caused by new kernel behavior.  Those bugs should be</div><div class='add'>+addressed by the maintainers ASAP.  If you suspect a maintainer is not</div><div class='add'>+responding to these types of bugs in a timely manner (especially during a</div><div class='add'>+merge window), escalate the bug to LKML and Linus Torvalds.</div><div class='add'>+</div><div class='add'>+Thank you!</div><div class='add'>+</div><div class='add'>+[Some of this is taken from Frohwalt Egerer's original linux-kernel FAQ]</div><div class='head'>diff --git a/Documentation/admin-guide/security-bugs.rst b/Documentation/admin-guide/security-bugs.rst<br/>new file mode 100644<br/>index 000000000000..4f7414cad586<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/security-bugs.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/security-bugs.rst</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+.. _securitybugs:</div><div class='add'>+</div><div class='add'>+Security bugs</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+Linux kernel developers take security very seriously.  As such, we'd</div><div class='add'>+like to know when a security bug is found so that it can be fixed and</div><div class='add'>+disclosed as quickly as possible.  Please report security bugs to the</div><div class='add'>+Linux kernel security team.</div><div class='add'>+</div><div class='add'>+Contact</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+The Linux kernel security team can be contacted by email at</div><div class='add'>+&lt;security@kernel.org&gt;.  This is a private list of security officers</div><div class='add'>+who will help verify the bug report and develop and release a fix.</div><div class='add'>+It is possible that the security team will bring in extra help from</div><div class='add'>+area maintainers to understand and fix the security vulnerability.</div><div class='add'>+</div><div class='add'>+As it is with any bug, the more information provided the easier it</div><div class='add'>+will be to diagnose and fix.  Please review the procedure outlined in</div><div class='add'>+admin-guide/reporting-bugs.rst if you are unclear about what information is helpful.</div><div class='add'>+Any exploit code is very helpful and will not be released without</div><div class='add'>+consent from the reporter unless it has already been made public.</div><div class='add'>+</div><div class='add'>+Disclosure</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+The goal of the Linux kernel security team is to work with the</div><div class='add'>+bug submitter to bug resolution as well as disclosure.  We prefer</div><div class='add'>+to fully disclose the bug as soon as possible.  It is reasonable to</div><div class='add'>+delay disclosure when the bug or the fix is not yet fully understood,</div><div class='add'>+the solution is not well-tested or for vendor coordination.  However, we</div><div class='add'>+expect these delays to be short, measurable in days, not weeks or months.</div><div class='add'>+A disclosure date is negotiated by the security team working with the</div><div class='add'>+bug submitter as well as vendors.  However, the kernel security team</div><div class='add'>+holds the final say when setting a disclosure date.  The timeframe for</div><div class='add'>+disclosure is from immediate (esp. if it's already publicly known)</div><div class='add'>+to a few weeks.  As a basic default policy, we expect report date to</div><div class='add'>+disclosure date to be on the order of 7 days.</div><div class='add'>+</div><div class='add'>+Non-disclosure agreements</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+The Linux kernel security team is not a formal body and therefore unable</div><div class='add'>+to enter any non-disclosure agreements.</div><div class='head'>diff --git a/Documentation/admin-guide/serial-console.rst b/Documentation/admin-guide/serial-console.rst<br/>new file mode 100644<br/>index 000000000000..a8d1e36b627a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/serial-console.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/serial-console.rst</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+.. _serial_console:</div><div class='add'>+</div><div class='add'>+Linux Serial Console</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+To use a serial port as console you need to compile the support into your</div><div class='add'>+kernel - by default it is not compiled in. For PC style serial ports</div><div class='add'>+it's the config option next to menu option:</div><div class='add'>+</div><div class='add'>+:menuselection:`Character devices --&gt; Serial drivers --&gt; 8250/16550 and compatible serial support --&gt; Console on 8250/16550 and compatible serial port`</div><div class='add'>+</div><div class='add'>+You must compile serial support into the kernel and not as a module.</div><div class='add'>+</div><div class='add'>+It is possible to specify multiple devices for console output. You can</div><div class='add'>+define a new kernel command line option to select which device(s) to</div><div class='add'>+use for console output.</div><div class='add'>+</div><div class='add'>+The format of this option is::</div><div class='add'>+</div><div class='add'>+	console=device,options</div><div class='add'>+</div><div class='add'>+	device:		tty0 for the foreground virtual console</div><div class='add'>+			ttyX for any other virtual console</div><div class='add'>+			ttySx for a serial port</div><div class='add'>+			lp0 for the first parallel port</div><div class='add'>+			ttyUSB0 for the first USB serial device</div><div class='add'>+</div><div class='add'>+	options:	depend on the driver. For the serial port this</div><div class='add'>+			defines the baudrate/parity/bits/flow control of</div><div class='add'>+			the port, in the format BBBBPNF, where BBBB is the</div><div class='add'>+			speed, P is parity (n/o/e), N is number of bits,</div><div class='add'>+			and F is flow control ('r' for RTS). Default is</div><div class='add'>+			9600n8. The maximum baudrate is 115200.</div><div class='add'>+</div><div class='add'>+You can specify multiple console= options on the kernel command line.</div><div class='add'>+Output will appear on all of them. The last device will be used when</div><div class='add'>+you open ``/dev/console``. So, for example::</div><div class='add'>+</div><div class='add'>+	console=ttyS1,9600 console=tty0</div><div class='add'>+</div><div class='add'>+defines that opening ``/dev/console`` will get you the current foreground</div><div class='add'>+virtual console, and kernel messages will appear on both the VGA</div><div class='add'>+console and the 2nd serial port (ttyS1 or COM2) at 9600 baud.</div><div class='add'>+</div><div class='add'>+Note that you can only define one console per device type (serial, video).</div><div class='add'>+</div><div class='add'>+If no console device is specified, the first device found capable of</div><div class='add'>+acting as a system console will be used. At this time, the system</div><div class='add'>+first looks for a VGA card and then for a serial port. So if you don't</div><div class='add'>+have a VGA card in your system the first serial port will automatically</div><div class='add'>+become the console.</div><div class='add'>+</div><div class='add'>+You will need to create a new device to use ``/dev/console``. The official</div><div class='add'>+``/dev/console`` is now character device 5,1.</div><div class='add'>+</div><div class='add'>+(You can also use a network device as a console.  See</div><div class='add'>+``Documentation/networking/netconsole.txt`` for information on that.)</div><div class='add'>+</div><div class='add'>+Here's an example that will use ``/dev/ttyS1`` (COM2) as the console.</div><div class='add'>+Replace the sample values as needed.</div><div class='add'>+</div><div class='add'>+1. Create ``/dev/console`` (real console) and ``/dev/tty0`` (master virtual</div><div class='add'>+   console)::</div><div class='add'>+</div><div class='add'>+     cd /dev</div><div class='add'>+     rm -f console tty0</div><div class='add'>+     mknod -m 622 console c 5 1</div><div class='add'>+     mknod -m 622 tty0 c 4 0</div><div class='add'>+</div><div class='add'>+2. LILO can also take input from a serial device. This is a very</div><div class='add'>+   useful option. To tell LILO to use the serial port:</div><div class='add'>+   In lilo.conf (global section)::</div><div class='add'>+</div><div class='add'>+     serial  = 1,9600n8 (ttyS1, 9600 bd, no parity, 8 bits)</div><div class='add'>+</div><div class='add'>+3. Adjust to kernel flags for the new kernel,</div><div class='add'>+   again in lilo.conf (kernel section)::</div><div class='add'>+</div><div class='add'>+     append = "console=ttyS1,9600"</div><div class='add'>+</div><div class='add'>+4. Make sure a getty runs on the serial port so that you can login to</div><div class='add'>+   it once the system is done booting. This is done by adding a line</div><div class='add'>+   like this to ``/etc/inittab`` (exact syntax depends on your getty)::</div><div class='add'>+</div><div class='add'>+     S1:23:respawn:/sbin/getty -L ttyS1 9600 vt100</div><div class='add'>+</div><div class='add'>+5. Init and ``/etc/ioctl.save``</div><div class='add'>+</div><div class='add'>+   Sysvinit remembers its stty settings in a file in ``/etc``, called</div><div class='add'>+   ``/etc/ioctl.save``. REMOVE THIS FILE before using the serial</div><div class='add'>+   console for the first time, because otherwise init will probably</div><div class='add'>+   set the baudrate to 38400 (baudrate of the virtual console).</div><div class='add'>+</div><div class='add'>+6. ``/dev/console`` and X</div><div class='add'>+   Programs that want to do something with the virtual console usually</div><div class='add'>+   open ``/dev/console``. If you have created the new ``/dev/console`` device,</div><div class='add'>+   and your console is NOT the virtual console some programs will fail.</div><div class='add'>+   Those are programs that want to access the VT interface, and use</div><div class='add'>+   ``/dev/console instead of /dev/tty0``. Some of those programs are::</div><div class='add'>+</div><div class='add'>+     Xfree86, svgalib, gpm, SVGATextMode</div><div class='add'>+</div><div class='add'>+   It should be fixed in modern versions of these programs though.</div><div class='add'>+</div><div class='add'>+   Note that if you boot without a ``console=`` option (or with</div><div class='add'>+   ``console=/dev/tty0``), ``/dev/console`` is the same as ``/dev/tty0``.</div><div class='add'>+   In that case everything will still work.</div><div class='add'>+</div><div class='add'>+7. Thanks</div><div class='add'>+</div><div class='add'>+   Thanks to Geert Uytterhoeven &lt;geert@linux-m68k.org&gt;</div><div class='add'>+   for porting the patches from 2.1.4x to 2.1.6x for taking care of</div><div class='add'>+   the integration of these patches into m68k, ppc and alpha.</div><div class='add'>+</div><div class='add'>+Miquel van Smoorenburg &lt;miquels@cistron.nl&gt;, 11-Jun-2000</div><div class='head'>diff --git a/Documentation/admin-guide/sysfs-rules.rst b/Documentation/admin-guide/sysfs-rules.rst<br/>new file mode 100644<br/>index 000000000000..abad33526aca<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/sysfs-rules.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/sysfs-rules.rst</a></div><div class='hunk'>@@ -0,0 +1,192 @@</div><div class='add'>+Rules on how to access information in sysfs</div><div class='add'>+===========================================</div><div class='add'>+</div><div class='add'>+The kernel-exported sysfs exports internal kernel implementation details</div><div class='add'>+and depends on internal kernel structures and layout. It is agreed upon</div><div class='add'>+by the kernel developers that the Linux kernel does not provide a stable</div><div class='add'>+internal API. Therefore, there are aspects of the sysfs interface that</div><div class='add'>+may not be stable across kernel releases.</div><div class='add'>+</div><div class='add'>+To minimize the risk of breaking users of sysfs, which are in most cases</div><div class='add'>+low-level userspace applications, with a new kernel release, the users</div><div class='add'>+of sysfs must follow some rules to use an as-abstract-as-possible way to</div><div class='add'>+access this filesystem. The current udev and HAL programs already</div><div class='add'>+implement this and users are encouraged to plug, if possible, into the</div><div class='add'>+abstractions these programs provide instead of accessing sysfs directly.</div><div class='add'>+</div><div class='add'>+But if you really do want or need to access sysfs directly, please follow</div><div class='add'>+the following rules and then your programs should work with future</div><div class='add'>+versions of the sysfs interface.</div><div class='add'>+</div><div class='add'>+- Do not use libsysfs</div><div class='add'>+    It makes assumptions about sysfs which are not true. Its API does not</div><div class='add'>+    offer any abstraction, it exposes all the kernel driver-core</div><div class='add'>+    implementation details in its own API. Therefore it is not better than</div><div class='add'>+    reading directories and opening the files yourself.</div><div class='add'>+    Also, it is not actively maintained, in the sense of reflecting the</div><div class='add'>+    current kernel development. The goal of providing a stable interface</div><div class='add'>+    to sysfs has failed; it causes more problems than it solves. It</div><div class='add'>+    violates many of the rules in this document.</div><div class='add'>+</div><div class='add'>+- sysfs is always at ``/sys``</div><div class='add'>+    Parsing ``/proc/mounts`` is a waste of time. Other mount points are a</div><div class='add'>+    system configuration bug you should not try to solve. For test cases,</div><div class='add'>+    possibly support a ``SYSFS_PATH`` environment variable to overwrite the</div><div class='add'>+    application's behavior, but never try to search for sysfs. Never try</div><div class='add'>+    to mount it, if you are not an early boot script.</div><div class='add'>+</div><div class='add'>+- devices are only "devices"</div><div class='add'>+    There is no such thing like class-, bus-, physical devices,</div><div class='add'>+    interfaces, and such that you can rely on in userspace. Everything is</div><div class='add'>+    just simply a "device". Class-, bus-, physical, ... types are just</div><div class='add'>+    kernel implementation details which should not be expected by</div><div class='add'>+    applications that look for devices in sysfs.</div><div class='add'>+</div><div class='add'>+    The properties of a device are:</div><div class='add'>+</div><div class='add'>+    - devpath (``/devices/pci0000:00/0000:00:1d.1/usb2/2-2/2-2:1.0``)</div><div class='add'>+</div><div class='add'>+      - identical to the DEVPATH value in the event sent from the kernel</div><div class='add'>+        at device creation and removal</div><div class='add'>+      - the unique key to the device at that point in time</div><div class='add'>+      - the kernel's path to the device directory without the leading</div><div class='add'>+        ``/sys``, and always starting with a slash</div><div class='add'>+      - all elements of a devpath must be real directories. Symlinks</div><div class='add'>+        pointing to /sys/devices must always be resolved to their real</div><div class='add'>+        target and the target path must be used to access the device.</div><div class='add'>+        That way the devpath to the device matches the devpath of the</div><div class='add'>+        kernel used at event time.</div><div class='add'>+      - using or exposing symlink values as elements in a devpath string</div><div class='add'>+        is a bug in the application</div><div class='add'>+</div><div class='add'>+    - kernel name (``sda``, ``tty``, ``0000:00:1f.2``, ...)</div><div class='add'>+</div><div class='add'>+      - a directory name, identical to the last element of the devpath</div><div class='add'>+      - applications need to handle spaces and characters like ``!`` in</div><div class='add'>+        the name</div><div class='add'>+</div><div class='add'>+    - subsystem (``block``, ``tty``, ``pci``, ...)</div><div class='add'>+</div><div class='add'>+      - simple string, never a path or a link</div><div class='add'>+      - retrieved by reading the "subsystem"-link and using only the</div><div class='add'>+        last element of the target path</div><div class='add'>+</div><div class='add'>+    - driver (``tg3``, ``ata_piix``, ``uhci_hcd``)</div><div class='add'>+</div><div class='add'>+      - a simple string, which may contain spaces, never a path or a</div><div class='add'>+        link</div><div class='add'>+      - it is retrieved by reading the "driver"-link and using only the</div><div class='add'>+        last element of the target path</div><div class='add'>+      - devices which do not have "driver"-link just do not have a</div><div class='add'>+        driver; copying the driver value in a child device context is a</div><div class='add'>+        bug in the application</div><div class='add'>+</div><div class='add'>+    - attributes</div><div class='add'>+</div><div class='add'>+      - the files in the device directory or files below subdirectories</div><div class='add'>+        of the same device directory</div><div class='add'>+      - accessing attributes reached by a symlink pointing to another device,</div><div class='add'>+        like the "device"-link, is a bug in the application</div><div class='add'>+</div><div class='add'>+    Everything else is just a kernel driver-core implementation detail</div><div class='add'>+    that should not be assumed to be stable across kernel releases.</div><div class='add'>+</div><div class='add'>+- Properties of parent devices never belong into a child device.</div><div class='add'>+    Always look at the parent devices themselves for determining device</div><div class='add'>+    context properties. If the device ``eth0`` or ``sda`` does not have a</div><div class='add'>+    "driver"-link, then this device does not have a driver. Its value is empty.</div><div class='add'>+    Never copy any property of the parent-device into a child-device. Parent</div><div class='add'>+    device properties may change dynamically without any notice to the</div><div class='add'>+    child device.</div><div class='add'>+</div><div class='add'>+- Hierarchy in a single device tree</div><div class='add'>+    There is only one valid place in sysfs where hierarchy can be examined</div><div class='add'>+    and this is below: ``/sys/devices.``</div><div class='add'>+    It is planned that all device directories will end up in the tree</div><div class='add'>+    below this directory.</div><div class='add'>+</div><div class='add'>+- Classification by subsystem</div><div class='add'>+    There are currently three places for classification of devices:</div><div class='add'>+    ``/sys/block,`` ``/sys/class`` and ``/sys/bus.`` It is planned that these will</div><div class='add'>+    not contain any device directories themselves, but only flat lists of</div><div class='add'>+    symlinks pointing to the unified ``/sys/devices`` tree.</div><div class='add'>+    All three places have completely different rules on how to access</div><div class='add'>+    device information. It is planned to merge all three</div><div class='add'>+    classification directories into one place at ``/sys/subsystem``,</div><div class='add'>+    following the layout of the bus directories. All buses and</div><div class='add'>+    classes, including the converted block subsystem, will show up</div><div class='add'>+    there.</div><div class='add'>+    The devices belonging to a subsystem will create a symlink in the</div><div class='add'>+    "devices" directory at ``/sys/subsystem/&lt;name&gt;/devices``,</div><div class='add'>+</div><div class='add'>+    If ``/sys/subsystem`` exists, ``/sys/bus``, ``/sys/class`` and ``/sys/block``</div><div class='add'>+    can be ignored. If it does not exist, you always have to scan all three</div><div class='add'>+    places, as the kernel is free to move a subsystem from one place to</div><div class='add'>+    the other, as long as the devices are still reachable by the same</div><div class='add'>+    subsystem name.</div><div class='add'>+</div><div class='add'>+    Assuming ``/sys/class/&lt;subsystem&gt;`` and ``/sys/bus/&lt;subsystem&gt;``, or</div><div class='add'>+    ``/sys/block`` and ``/sys/class/block`` are not interchangeable is a bug in</div><div class='add'>+    the application.</div><div class='add'>+</div><div class='add'>+- Block</div><div class='add'>+    The converted block subsystem at ``/sys/class/block`` or</div><div class='add'>+    ``/sys/subsystem/block`` will contain the links for disks and partitions</div><div class='add'>+    at the same level, never in a hierarchy. Assuming the block subsystem to</div><div class='add'>+    contain only disks and not partition devices in the same flat list is</div><div class='add'>+    a bug in the application.</div><div class='add'>+</div><div class='add'>+- "device"-link and &lt;subsystem&gt;:&lt;kernel name&gt;-links</div><div class='add'>+    Never depend on the "device"-link. The "device"-link is a workaround</div><div class='add'>+    for the old layout, where class devices are not created in</div><div class='add'>+    ``/sys/devices/`` like the bus devices. If the link-resolving of a</div><div class='add'>+    device directory does not end in ``/sys/devices/``, you can use the</div><div class='add'>+    "device"-link to find the parent devices in ``/sys/devices/``, That is the</div><div class='add'>+    single valid use of the "device"-link; it must never appear in any</div><div class='add'>+    path as an element. Assuming the existence of the "device"-link for</div><div class='add'>+    a device in ``/sys/devices/`` is a bug in the application.</div><div class='add'>+    Accessing ``/sys/class/net/eth0/device`` is a bug in the application.</div><div class='add'>+</div><div class='add'>+    Never depend on the class-specific links back to the ``/sys/class``</div><div class='add'>+    directory.  These links are also a workaround for the design mistake</div><div class='add'>+    that class devices are not created in ``/sys/devices.`` If a device</div><div class='add'>+    directory does not contain directories for child devices, these links</div><div class='add'>+    may be used to find the child devices in ``/sys/class.`` That is the single</div><div class='add'>+    valid use of these links; they must never appear in any path as an</div><div class='add'>+    element. Assuming the existence of these links for devices which are</div><div class='add'>+    real child device directories in the ``/sys/devices`` tree is a bug in</div><div class='add'>+    the application.</div><div class='add'>+</div><div class='add'>+    It is planned to remove all these links when all class device</div><div class='add'>+    directories live in ``/sys/devices.``</div><div class='add'>+</div><div class='add'>+- Position of devices along device chain can change.</div><div class='add'>+    Never depend on a specific parent device position in the devpath,</div><div class='add'>+    or the chain of parent devices. The kernel is free to insert devices into</div><div class='add'>+    the chain. You must always request the parent device you are looking for</div><div class='add'>+    by its subsystem value. You need to walk up the chain until you find</div><div class='add'>+    the device that matches the expected subsystem. Depending on a specific</div><div class='add'>+    position of a parent device or exposing relative paths using ``../`` to</div><div class='add'>+    access the chain of parents is a bug in the application.</div><div class='add'>+</div><div class='add'>+- When reading and writing sysfs device attribute files, avoid dependency</div><div class='add'>+    on specific error codes wherever possible. This minimizes coupling to</div><div class='add'>+    the error handling implementation within the kernel.</div><div class='add'>+</div><div class='add'>+    In general, failures to read or write sysfs device attributes shall</div><div class='add'>+    propagate errors wherever possible. Common errors include, but are not</div><div class='add'>+    limited to:</div><div class='add'>+</div><div class='add'>+	``-EIO``: The read or store operation is not supported, typically</div><div class='add'>+	returned by the sysfs system itself if the read or store pointer</div><div class='add'>+	is ``NULL``.</div><div class='add'>+</div><div class='add'>+	``-ENXIO``: The read or store operation failed</div><div class='add'>+</div><div class='add'>+    Error codes will not be changed without good reason, and should a change</div><div class='add'>+    to error codes result in user-space breakage, it will be fixed, or the</div><div class='add'>+    the offending change will be reverted.</div><div class='add'>+</div><div class='add'>+    Userspace applications can, however, expect the format and contents of</div><div class='add'>+    the attribute files to remain consistent in the absence of a version</div><div class='add'>+    attribute change in the context of a given attribute.</div><div class='head'>diff --git a/Documentation/admin-guide/sysrq.rst b/Documentation/admin-guide/sysrq.rst<br/>new file mode 100644<br/>index 000000000000..d1712ea2d314<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/sysrq.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/sysrq.rst</a></div><div class='hunk'>@@ -0,0 +1,289 @@</div><div class='add'>+Linux Magic System Request Key Hacks</div><div class='add'>+====================================</div><div class='add'>+</div><div class='add'>+Documentation for sysrq.c</div><div class='add'>+</div><div class='add'>+What is the magic SysRq key?</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+It is a 'magical' key combo you can hit which the kernel will respond to</div><div class='add'>+regardless of whatever else it is doing, unless it is completely locked up.</div><div class='add'>+</div><div class='add'>+How do I enable the magic SysRq key?</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+You need to say "yes" to 'Magic SysRq key (CONFIG_MAGIC_SYSRQ)' when</div><div class='add'>+configuring the kernel. When running a kernel with SysRq compiled in,</div><div class='add'>+/proc/sys/kernel/sysrq controls the functions allowed to be invoked via</div><div class='add'>+the SysRq key. The default value in this file is set by the</div><div class='add'>+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE config symbol, which itself defaults</div><div class='add'>+to 1. Here is the list of possible values in /proc/sys/kernel/sysrq:</div><div class='add'>+</div><div class='add'>+   -  0 - disable sysrq completely</div><div class='add'>+   -  1 - enable all functions of sysrq</div><div class='add'>+   - &gt;1 - bitmask of allowed sysrq functions (see below for detailed function</div><div class='add'>+     description)::</div><div class='add'>+</div><div class='add'>+          2 =   0x2 - enable control of console logging level</div><div class='add'>+          4 =   0x4 - enable control of keyboard (SAK, unraw)</div><div class='add'>+          8 =   0x8 - enable debugging dumps of processes etc.</div><div class='add'>+         16 =  0x10 - enable sync command</div><div class='add'>+         32 =  0x20 - enable remount read-only</div><div class='add'>+         64 =  0x40 - enable signalling of processes (term, kill, oom-kill)</div><div class='add'>+        128 =  0x80 - allow reboot/poweroff</div><div class='add'>+        256 = 0x100 - allow nicing of all RT tasks</div><div class='add'>+</div><div class='add'>+You can set the value in the file by the following command::</div><div class='add'>+</div><div class='add'>+    echo "number" &gt;/proc/sys/kernel/sysrq</div><div class='add'>+</div><div class='add'>+The number may be written here either as decimal or as hexadecimal</div><div class='add'>+with the 0x prefix. CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE must always be</div><div class='add'>+written in hexadecimal.</div><div class='add'>+</div><div class='add'>+Note that the value of ``/proc/sys/kernel/sysrq`` influences only the invocation</div><div class='add'>+via a keyboard. Invocation of any operation via ``/proc/sysrq-trigger`` is</div><div class='add'>+always allowed (by a user with admin privileges).</div><div class='add'>+</div><div class='add'>+How do I use the magic SysRq key?</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+On x86   - You press the key combo :kbd:`ALT-SysRq-&lt;command key&gt;`.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+	   Some</div><div class='add'>+           keyboards may not have a key labeled 'SysRq'. The 'SysRq' key is</div><div class='add'>+           also known as the 'Print Screen' key. Also some keyboards cannot</div><div class='add'>+	   handle so many keys being pressed at the same time, so you might</div><div class='add'>+	   have better luck with press :kbd:`Alt`, press :kbd:`SysRq`,</div><div class='add'>+	   release :kbd:`SysRq`, press :kbd:`&lt;command key&gt;`, release everything.</div><div class='add'>+</div><div class='add'>+On SPARC - You press :kbd:`ALT-STOP-&lt;command key&gt;`, I believe.</div><div class='add'>+</div><div class='add'>+On the serial console (PC style standard serial ports only)</div><div class='add'>+        You send a ``BREAK``, then within 5 seconds a command key. Sending</div><div class='add'>+        ``BREAK`` twice is interpreted as a normal BREAK.</div><div class='add'>+</div><div class='add'>+On PowerPC</div><div class='add'>+	Press :kbd:`ALT - Print Screen` (or :kbd:`F13`) - :kbd:`&lt;command key&gt;`,</div><div class='add'>+        :kbd:`Print Screen` (or :kbd:`F13`) - :kbd:`&lt;command key&gt;` may suffice.</div><div class='add'>+</div><div class='add'>+On other</div><div class='add'>+	If you know of the key combos for other architectures, please</div><div class='add'>+        let me know so I can add them to this section.</div><div class='add'>+</div><div class='add'>+On all</div><div class='add'>+	write a character to /proc/sysrq-trigger.  e.g.::</div><div class='add'>+</div><div class='add'>+		echo t &gt; /proc/sysrq-trigger</div><div class='add'>+</div><div class='add'>+What are the 'command' keys?</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+=========== ===================================================================</div><div class='add'>+Command	    Function</div><div class='add'>+=========== ===================================================================</div><div class='add'>+``b``	    Will immediately reboot the system without syncing or unmounting</div><div class='add'>+            your disks.</div><div class='add'>+</div><div class='add'>+``c``	    Will perform a system crash by a NULL pointer dereference.</div><div class='add'>+            A crashdump will be taken if configured.</div><div class='add'>+</div><div class='add'>+``d``	    Shows all locks that are held.</div><div class='add'>+</div><div class='add'>+``e``	    Send a SIGTERM to all processes, except for init.</div><div class='add'>+</div><div class='add'>+``f``	    Will call the oom killer to kill a memory hog process, but do not</div><div class='add'>+	    panic if nothing can be killed.</div><div class='add'>+</div><div class='add'>+``g``	    Used by kgdb (kernel debugger)</div><div class='add'>+</div><div class='add'>+``h``	    Will display help (actually any other key than those listed</div><div class='add'>+            here will display help. but ``h`` is easy to remember :-)</div><div class='add'>+</div><div class='add'>+``i``	    Send a SIGKILL to all processes, except for init.</div><div class='add'>+</div><div class='add'>+``j``	    Forcibly "Just thaw it" - filesystems frozen by the FIFREEZE ioctl.</div><div class='add'>+</div><div class='add'>+``k``	    Secure Access Key (SAK) Kills all programs on the current virtual</div><div class='add'>+            console. NOTE: See important comments below in SAK section.</div><div class='add'>+</div><div class='add'>+``l``	    Shows a stack backtrace for all active CPUs.</div><div class='add'>+</div><div class='add'>+``m``	    Will dump current memory info to your console.</div><div class='add'>+</div><div class='add'>+``n``	    Used to make RT tasks nice-able</div><div class='add'>+</div><div class='add'>+``o``	    Will shut your system off (if configured and supported).</div><div class='add'>+</div><div class='add'>+``p``	    Will dump the current registers and flags to your console.</div><div class='add'>+</div><div class='add'>+``q``	    Will dump per CPU lists of all armed hrtimers (but NOT regular</div><div class='add'>+            timer_list timers) and detailed information about all</div><div class='add'>+            clockevent devices.</div><div class='add'>+</div><div class='add'>+``r``	    Turns off keyboard raw mode and sets it to XLATE.</div><div class='add'>+</div><div class='add'>+``s``	    Will attempt to sync all mounted filesystems.</div><div class='add'>+</div><div class='add'>+``t``	    Will dump a list of current tasks and their information to your</div><div class='add'>+            console.</div><div class='add'>+</div><div class='add'>+``u``	    Will attempt to remount all mounted filesystems read-only.</div><div class='add'>+</div><div class='add'>+``v``	    Forcefully restores framebuffer console</div><div class='add'>+``v``	    Causes ETM buffer dump [ARM-specific]</div><div class='add'>+</div><div class='add'>+``w``	    Dumps tasks that are in uninterruptable (blocked) state.</div><div class='add'>+</div><div class='add'>+``x``	    Used by xmon interface on ppc/powerpc platforms.</div><div class='add'>+            Show global PMU Registers on sparc64.</div><div class='add'>+            Dump all TLB entries on MIPS.</div><div class='add'>+</div><div class='add'>+``y``	    Show global CPU Registers [SPARC-64 specific]</div><div class='add'>+</div><div class='add'>+``z``	    Dump the ftrace buffer</div><div class='add'>+</div><div class='add'>+``0``-``9`` Sets the console log level, controlling which kernel messages</div><div class='add'>+            will be printed to your console. (``0``, for example would make</div><div class='add'>+            it so that only emergency messages like PANICs or OOPSes would</div><div class='add'>+            make it to your console.)</div><div class='add'>+=========== ===================================================================</div><div class='add'>+</div><div class='add'>+Okay, so what can I use them for?</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Well, unraw(r) is very handy when your X server or a svgalib program crashes.</div><div class='add'>+</div><div class='add'>+sak(k) (Secure Access Key) is useful when you want to be sure there is no</div><div class='add'>+trojan program running at console which could grab your password</div><div class='add'>+when you would try to login. It will kill all programs on given console,</div><div class='add'>+thus letting you make sure that the login prompt you see is actually</div><div class='add'>+the one from init, not some trojan program.</div><div class='add'>+</div><div class='add'>+.. important::</div><div class='add'>+</div><div class='add'>+   In its true form it is not a true SAK like the one in a</div><div class='add'>+   c2 compliant system, and it should not be mistaken as</div><div class='add'>+   such.</div><div class='add'>+</div><div class='add'>+It seems others find it useful as (System Attention Key) which is</div><div class='add'>+useful when you want to exit a program that will not let you switch consoles.</div><div class='add'>+(For example, X or a svgalib program.)</div><div class='add'>+</div><div class='add'>+``reboot(b)`` is good when you're unable to shut down. But you should also</div><div class='add'>+``sync(s)`` and ``umount(u)`` first.</div><div class='add'>+</div><div class='add'>+``crash(c)`` can be used to manually trigger a crashdump when the system is hung.</div><div class='add'>+Note that this just triggers a crash if there is no dump mechanism available.</div><div class='add'>+</div><div class='add'>+``sync(s)`` is great when your system is locked up, it allows you to sync your</div><div class='add'>+disks and will certainly lessen the chance of data loss and fscking. Note</div><div class='add'>+that the sync hasn't taken place until you see the "OK" and "Done" appear</div><div class='add'>+on the screen. (If the kernel is really in strife, you may not ever get the</div><div class='add'>+OK or Done message...)</div><div class='add'>+</div><div class='add'>+``umount(u)`` is basically useful in the same ways as ``sync(s)``. I generally</div><div class='add'>+``sync(s)``, ``umount(u)``, then ``reboot(b)`` when my system locks. It's saved</div><div class='add'>+me many a fsck. Again, the unmount (remount read-only) hasn't taken place until</div><div class='add'>+you see the "OK" and "Done" message appear on the screen.</div><div class='add'>+</div><div class='add'>+The loglevels ``0``-``9`` are useful when your console is being flooded with</div><div class='add'>+kernel messages you do not want to see. Selecting ``0`` will prevent all but</div><div class='add'>+the most urgent kernel messages from reaching your console. (They will</div><div class='add'>+still be logged if syslogd/klogd are alive, though.)</div><div class='add'>+</div><div class='add'>+``term(e)`` and ``kill(i)`` are useful if you have some sort of runaway process</div><div class='add'>+you are unable to kill any other way, especially if it's spawning other</div><div class='add'>+processes.</div><div class='add'>+</div><div class='add'>+"just thaw ``it(j)``" is useful if your system becomes unresponsive due to a</div><div class='add'>+frozen (probably root) filesystem via the FIFREEZE ioctl.</div><div class='add'>+</div><div class='add'>+Sometimes SysRq seems to get 'stuck' after using it, what can I do?</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+That happens to me, also. I've found that tapping shift, alt, and control</div><div class='add'>+on both sides of the keyboard, and hitting an invalid sysrq sequence again</div><div class='add'>+will fix the problem. (i.e., something like :kbd:`alt-sysrq-z`). Switching to</div><div class='add'>+another virtual console (:kbd:`ALT+Fn`) and then back again should also help.</div><div class='add'>+</div><div class='add'>+I hit SysRq, but nothing seems to happen, what's wrong?</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+There are some keyboards that produce a different keycode for SysRq than the</div><div class='add'>+pre-defined value of 99 (see ``KEY_SYSRQ`` in ``include/linux/input.h``), or</div><div class='add'>+which don't have a SysRq key at all. In these cases, run ``showkey -s`` to find</div><div class='add'>+an appropriate scancode sequence, and use ``setkeycodes &lt;sequence&gt; 99`` to map</div><div class='add'>+this sequence to the usual SysRq code (e.g., ``setkeycodes e05b 99``). It's</div><div class='add'>+probably best to put this command in a boot script. Oh, and by the way, you</div><div class='add'>+exit ``showkey`` by not typing anything for ten seconds.</div><div class='add'>+</div><div class='add'>+I want to add SysRQ key events to a module, how does it work?</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+In order to register a basic function with the table, you must first include</div><div class='add'>+the header ``include/linux/sysrq.h``, this will define everything else you need.</div><div class='add'>+Next, you must create a ``sysrq_key_op`` struct, and populate it with A) the key</div><div class='add'>+handler function you will use, B) a help_msg string, that will print when SysRQ</div><div class='add'>+prints help, and C) an action_msg string, that will print right before your</div><div class='add'>+handler is called. Your handler must conform to the prototype in 'sysrq.h'.</div><div class='add'>+</div><div class='add'>+After the ``sysrq_key_op`` is created, you can call the kernel function</div><div class='add'>+``register_sysrq_key(int key, struct sysrq_key_op *op_p);`` this will</div><div class='add'>+register the operation pointed to by ``op_p`` at table key 'key',</div><div class='add'>+if that slot in the table is blank. At module unload time, you must call</div><div class='add'>+the function ``unregister_sysrq_key(int key, struct sysrq_key_op *op_p)``, which</div><div class='add'>+will remove the key op pointed to by 'op_p' from the key 'key', if and only if</div><div class='add'>+it is currently registered in that slot. This is in case the slot has been</div><div class='add'>+overwritten since you registered it.</div><div class='add'>+</div><div class='add'>+The Magic SysRQ system works by registering key operations against a key op</div><div class='add'>+lookup table, which is defined in 'drivers/tty/sysrq.c'. This key table has</div><div class='add'>+a number of operations registered into it at compile time, but is mutable,</div><div class='add'>+and 2 functions are exported for interface to it::</div><div class='add'>+</div><div class='add'>+	register_sysrq_key and unregister_sysrq_key.</div><div class='add'>+</div><div class='add'>+Of course, never ever leave an invalid pointer in the table. I.e., when</div><div class='add'>+your module that called register_sysrq_key() exits, it must call</div><div class='add'>+unregister_sysrq_key() to clean up the sysrq key table entry that it used.</div><div class='add'>+Null pointers in the table are always safe. :)</div><div class='add'>+</div><div class='add'>+If for some reason you feel the need to call the handle_sysrq function from</div><div class='add'>+within a function called by handle_sysrq, you must be aware that you are in</div><div class='add'>+a lock (you are also in an interrupt handler, which means don't sleep!), so</div><div class='add'>+you must call ``__handle_sysrq_nolock`` instead.</div><div class='add'>+</div><div class='add'>+When I hit a SysRq key combination only the header appears on the console?</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Sysrq output is subject to the same console loglevel control as all</div><div class='add'>+other console output.  This means that if the kernel was booted 'quiet'</div><div class='add'>+as is common on distro kernels the output may not appear on the actual</div><div class='add'>+console, even though it will appear in the dmesg buffer, and be accessible</div><div class='add'>+via the dmesg command and to the consumers of ``/proc/kmsg``.  As a specific</div><div class='add'>+exception the header line from the sysrq command is passed to all console</div><div class='add'>+consumers as if the current loglevel was maximum.  If only the header</div><div class='add'>+is emitted it is almost certain that the kernel loglevel is too low.</div><div class='add'>+Should you require the output on the console channel then you will need</div><div class='add'>+to temporarily up the console loglevel using :kbd:`alt-sysrq-8` or::</div><div class='add'>+</div><div class='add'>+    echo 8 &gt; /proc/sysrq-trigger</div><div class='add'>+</div><div class='add'>+Remember to return the loglevel to normal after triggering the sysrq</div><div class='add'>+command you are interested in.</div><div class='add'>+</div><div class='add'>+I have more questions, who can I ask?</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Just ask them on the linux-kernel mailing list:</div><div class='add'>+	linux-kernel@vger.kernel.org</div><div class='add'>+</div><div class='add'>+Credits</div><div class='add'>+~~~~~~~</div><div class='add'>+</div><div class='add'>+Written by Mydraal &lt;vulpyne@vulpyne.net&gt;</div><div class='add'>+Updated by Adam Sulmicki &lt;adam@cfar.umd.edu&gt;</div><div class='add'>+Updated by Jeremy M. Dolan &lt;jmd@turbogeek.org&gt; 2001/01/28 10:15:59</div><div class='add'>+Added to by Crutcher Dunnavant &lt;crutcher+kernel@datastacks.com&gt;</div><div class='head'>diff --git a/Documentation/admin-guide/tainted-kernels.rst b/Documentation/admin-guide/tainted-kernels.rst<br/>new file mode 100644<br/>index 000000000000..1df03b5cb02f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/tainted-kernels.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/tainted-kernels.rst</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+Tainted kernels</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Some oops reports contain the string **'Tainted: '** after the program</div><div class='add'>+counter. This indicates that the kernel has been tainted by some</div><div class='add'>+mechanism.  The string is followed by a series of position-sensitive</div><div class='add'>+characters, each representing a particular tainted value.</div><div class='add'>+</div><div class='add'>+  1) 'G' if all modules loaded have a GPL or compatible license, 'P' if</div><div class='add'>+     any proprietary module has been loaded.  Modules without a</div><div class='add'>+     MODULE_LICENSE or with a MODULE_LICENSE that is not recognised by</div><div class='add'>+     insmod as GPL compatible are assumed to be proprietary.</div><div class='add'>+</div><div class='add'>+  2) ``F`` if any module was force loaded by ``insmod -f``, ``' '`` if all</div><div class='add'>+     modules were loaded normally.</div><div class='add'>+</div><div class='add'>+  3) ``S`` if the oops occurred on an SMP kernel running on hardware that</div><div class='add'>+     hasn't been certified as safe to run multiprocessor.</div><div class='add'>+     Currently this occurs only on various Athlons that are not</div><div class='add'>+     SMP capable.</div><div class='add'>+</div><div class='add'>+  4) ``R`` if a module was force unloaded by ``rmmod -f``, ``' '`` if all</div><div class='add'>+     modules were unloaded normally.</div><div class='add'>+</div><div class='add'>+  5) ``M`` if any processor has reported a Machine Check Exception,</div><div class='add'>+     ``' '`` if no Machine Check Exceptions have occurred.</div><div class='add'>+</div><div class='add'>+  6) ``B`` if a page-release function has found a bad page reference or</div><div class='add'>+     some unexpected page flags.</div><div class='add'>+</div><div class='add'>+  7) ``U`` if a user or user application specifically requested that the</div><div class='add'>+     Tainted flag be set, ``' '`` otherwise.</div><div class='add'>+</div><div class='add'>+  8) ``D`` if the kernel has died recently, i.e. there was an OOPS or BUG.</div><div class='add'>+</div><div class='add'>+  9) ``A`` if the ACPI table has been overridden.</div><div class='add'>+</div><div class='add'>+ 10) ``W`` if a warning has previously been issued by the kernel.</div><div class='add'>+     (Though some warnings may set more specific taint flags.)</div><div class='add'>+</div><div class='add'>+ 11) ``C`` if a staging driver has been loaded.</div><div class='add'>+</div><div class='add'>+ 12) ``I`` if the kernel is working around a severe bug in the platform</div><div class='add'>+     firmware (BIOS or similar).</div><div class='add'>+</div><div class='add'>+ 13) ``O`` if an externally-built ("out-of-tree") module has been loaded.</div><div class='add'>+</div><div class='add'>+ 14) ``E`` if an unsigned module has been loaded in a kernel supporting</div><div class='add'>+     module signature.</div><div class='add'>+</div><div class='add'>+ 15) ``L`` if a soft lockup has previously occurred on the system.</div><div class='add'>+</div><div class='add'>+ 16) ``K`` if the kernel has been live patched.</div><div class='add'>+</div><div class='add'>+The primary reason for the **'Tainted: '** string is to tell kernel</div><div class='add'>+debuggers if this is a clean kernel or if anything unusual has</div><div class='add'>+occurred.  Tainting is permanent: even if an offending module is</div><div class='add'>+unloaded, the tainted value remains to indicate that the kernel is not</div><div class='add'>+trustworthy.</div><div class='head'>diff --git a/Documentation/admin-guide/unicode.rst b/Documentation/admin-guide/unicode.rst<br/>new file mode 100644<br/>index 000000000000..7425a3351321<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/unicode.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/unicode.rst</a></div><div class='hunk'>@@ -0,0 +1,189 @@</div><div class='add'>+Unicode support</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+		 Last update: 2005-01-17, version 1.4</div><div class='add'>+</div><div class='add'>+This file is maintained by H. Peter Anvin &lt;unicode@lanana.org&gt; as part</div><div class='add'>+of the Linux Assigned Names And Numbers Authority (LANANA) project.</div><div class='add'>+The current version can be found at:</div><div class='add'>+</div><div class='add'>+	    http://www.lanana.org/docs/unicode/admin-guide/unicode.rst</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+The Linux kernel code has been rewritten to use Unicode to map</div><div class='add'>+characters to fonts.  By downloading a single Unicode-to-font table,</div><div class='add'>+both the eight-bit character sets and UTF-8 mode are changed to use</div><div class='add'>+the font as indicated.</div><div class='add'>+</div><div class='add'>+This changes the semantics of the eight-bit character tables subtly.</div><div class='add'>+The four character tables are now:</div><div class='add'>+</div><div class='add'>+=============== =============================== ================</div><div class='add'>+Map symbol	Map name			Escape code (G0)</div><div class='add'>+=============== =============================== ================</div><div class='add'>+LAT1_MAP	Latin-1 (ISO 8859-1)		ESC ( B</div><div class='add'>+GRAF_MAP	DEC VT100 pseudographics	ESC ( 0</div><div class='add'>+IBMPC_MAP	IBM code page 437		ESC ( U</div><div class='add'>+USER_MAP	User defined			ESC ( K</div><div class='add'>+=============== =============================== ================</div><div class='add'>+</div><div class='add'>+In particular, ESC ( U is no longer "straight to font", since the font</div><div class='add'>+might be completely different than the IBM character set.  This</div><div class='add'>+permits for example the use of block graphics even with a Latin-1 font</div><div class='add'>+loaded.</div><div class='add'>+</div><div class='add'>+Note that although these codes are similar to ISO 2022, neither the</div><div class='add'>+codes nor their uses match ISO 2022; Linux has two 8-bit codes (G0 and</div><div class='add'>+G1), whereas ISO 2022 has four 7-bit codes (G0-G3).</div><div class='add'>+</div><div class='add'>+In accordance with the Unicode standard/ISO 10646 the range U+F000 to</div><div class='add'>+U+F8FF has been reserved for OS-wide allocation (the Unicode Standard</div><div class='add'>+refers to this as a "Corporate Zone", since this is inaccurate for</div><div class='add'>+Linux we call it the "Linux Zone").  U+F000 was picked as the starting</div><div class='add'>+point since it lets the direct-mapping area start on a large power of</div><div class='add'>+two (in case 1024- or 2048-character fonts ever become necessary).</div><div class='add'>+This leaves U+E000 to U+EFFF as End User Zone.</div><div class='add'>+</div><div class='add'>+[v1.2]: The Unicodes range from U+F000 and up to U+F7FF have been</div><div class='add'>+hard-coded to map directly to the loaded font, bypassing the</div><div class='add'>+translation table.  The user-defined map now defaults to U+F000 to</div><div class='add'>+U+F0FF, emulating the previous behaviour.  In practice, this range</div><div class='add'>+might be shorter; for example, vgacon can only handle 256-character</div><div class='add'>+(U+F000..U+F0FF) or 512-character (U+F000..U+F1FF) fonts.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Actual characters assigned in the Linux Zone</div><div class='add'>+--------------------------------------------</div><div class='add'>+</div><div class='add'>+In addition, the following characters not present in Unicode 1.1.4</div><div class='add'>+have been defined; these are used by the DEC VT graphics map.  [v1.2]</div><div class='add'>+THIS USE IS OBSOLETE AND SHOULD NO LONGER BE USED; PLEASE SEE BELOW.</div><div class='add'>+</div><div class='add'>+====== ======================================</div><div class='add'>+U+F800 DEC VT GRAPHICS HORIZONTAL LINE SCAN 1</div><div class='add'>+U+F801 DEC VT GRAPHICS HORIZONTAL LINE SCAN 3</div><div class='add'>+U+F803 DEC VT GRAPHICS HORIZONTAL LINE SCAN 7</div><div class='add'>+U+F804 DEC VT GRAPHICS HORIZONTAL LINE SCAN 9</div><div class='add'>+====== ======================================</div><div class='add'>+</div><div class='add'>+The DEC VT220 uses a 6x10 character matrix, and these characters form</div><div class='add'>+a smooth progression in the DEC VT graphics character set.  I have</div><div class='add'>+omitted the scan 5 line, since it is also used as a block-graphics</div><div class='add'>+character, and hence has been coded as U+2500 FORMS LIGHT HORIZONTAL.</div><div class='add'>+</div><div class='add'>+[v1.3]: These characters have been officially added to Unicode 3.2.0;</div><div class='add'>+they are added at U+23BA, U+23BB, U+23BC, U+23BD.  Linux now uses the</div><div class='add'>+new values.</div><div class='add'>+</div><div class='add'>+[v1.2]: The following characters have been added to represent common</div><div class='add'>+keyboard symbols that are unlikely to ever be added to Unicode proper</div><div class='add'>+since they are horribly vendor-specific.  This, of course, is an</div><div class='add'>+excellent example of horrible design.</div><div class='add'>+</div><div class='add'>+====== ======================================</div><div class='add'>+U+F810 KEYBOARD SYMBOL FLYING FLAG</div><div class='add'>+U+F811 KEYBOARD SYMBOL PULLDOWN MENU</div><div class='add'>+U+F812 KEYBOARD SYMBOL OPEN APPLE</div><div class='add'>+U+F813 KEYBOARD SYMBOL SOLID APPLE</div><div class='add'>+====== ======================================</div><div class='add'>+</div><div class='add'>+Klingon language support</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+In 1996, Linux was the first operating system in the world to add</div><div class='add'>+support for the artificial language Klingon, created by Marc Okrand</div><div class='add'>+for the "Star Trek" television series.	This encoding was later</div><div class='add'>+adopted by the ConScript Unicode Registry and proposed (but ultimately</div><div class='add'>+rejected) for inclusion in Unicode Plane 1.  Thus, it remains as a</div><div class='add'>+Linux/CSUR private assignment in the Linux Zone.</div><div class='add'>+</div><div class='add'>+This encoding has been endorsed by the Klingon Language Institute.</div><div class='add'>+For more information, contact them at:</div><div class='add'>+</div><div class='add'>+	http://www.kli.org/</div><div class='add'>+</div><div class='add'>+Since the characters in the beginning of the Linux CZ have been more</div><div class='add'>+of the dingbats/symbols/forms type and this is a language, I have</div><div class='add'>+located it at the end, on a 16-cell boundary in keeping with standard</div><div class='add'>+Unicode practice.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+  This range is now officially managed by the ConScript Unicode</div><div class='add'>+  Registry.  The normative reference is at:</div><div class='add'>+</div><div class='add'>+	http://www.evertype.com/standards/csur/klingon.html</div><div class='add'>+</div><div class='add'>+Klingon has an alphabet of 26 characters, a positional numeric writing</div><div class='add'>+system with 10 digits, and is written left-to-right, top-to-bottom.</div><div class='add'>+</div><div class='add'>+Several glyph forms for the Klingon alphabet have been proposed.</div><div class='add'>+However, since the set of symbols appear to be consistent throughout,</div><div class='add'>+with only the actual shapes being different, in keeping with standard</div><div class='add'>+Unicode practice these differences are considered font variants.</div><div class='add'>+</div><div class='add'>+======	=======================================================</div><div class='add'>+U+F8D0	KLINGON LETTER A</div><div class='add'>+U+F8D1	KLINGON LETTER B</div><div class='add'>+U+F8D2	KLINGON LETTER CH</div><div class='add'>+U+F8D3	KLINGON LETTER D</div><div class='add'>+U+F8D4	KLINGON LETTER E</div><div class='add'>+U+F8D5	KLINGON LETTER GH</div><div class='add'>+U+F8D6	KLINGON LETTER H</div><div class='add'>+U+F8D7	KLINGON LETTER I</div><div class='add'>+U+F8D8	KLINGON LETTER J</div><div class='add'>+U+F8D9	KLINGON LETTER L</div><div class='add'>+U+F8DA	KLINGON LETTER M</div><div class='add'>+U+F8DB	KLINGON LETTER N</div><div class='add'>+U+F8DC	KLINGON LETTER NG</div><div class='add'>+U+F8DD	KLINGON LETTER O</div><div class='add'>+U+F8DE	KLINGON LETTER P</div><div class='add'>+U+F8DF	KLINGON LETTER Q</div><div class='add'>+	- Written &lt;q&gt; in standard Okrand Latin transliteration</div><div class='add'>+U+F8E0	KLINGON LETTER QH</div><div class='add'>+	- Written &lt;Q&gt; in standard Okrand Latin transliteration</div><div class='add'>+U+F8E1	KLINGON LETTER R</div><div class='add'>+U+F8E2	KLINGON LETTER S</div><div class='add'>+U+F8E3	KLINGON LETTER T</div><div class='add'>+U+F8E4	KLINGON LETTER TLH</div><div class='add'>+U+F8E5	KLINGON LETTER U</div><div class='add'>+U+F8E6	KLINGON LETTER V</div><div class='add'>+U+F8E7	KLINGON LETTER W</div><div class='add'>+U+F8E8	KLINGON LETTER Y</div><div class='add'>+U+F8E9	KLINGON LETTER GLOTTAL STOP</div><div class='add'>+</div><div class='add'>+U+F8F0	KLINGON DIGIT ZERO</div><div class='add'>+U+F8F1	KLINGON DIGIT ONE</div><div class='add'>+U+F8F2	KLINGON DIGIT TWO</div><div class='add'>+U+F8F3	KLINGON DIGIT THREE</div><div class='add'>+U+F8F4	KLINGON DIGIT FOUR</div><div class='add'>+U+F8F5	KLINGON DIGIT FIVE</div><div class='add'>+U+F8F6	KLINGON DIGIT SIX</div><div class='add'>+U+F8F7	KLINGON DIGIT SEVEN</div><div class='add'>+U+F8F8	KLINGON DIGIT EIGHT</div><div class='add'>+U+F8F9	KLINGON DIGIT NINE</div><div class='add'>+</div><div class='add'>+U+F8FD	KLINGON COMMA</div><div class='add'>+U+F8FE	KLINGON FULL STOP</div><div class='add'>+U+F8FF	KLINGON SYMBOL FOR EMPIRE</div><div class='add'>+======	=======================================================</div><div class='add'>+</div><div class='add'>+Other Fictional and Artificial Scripts</div><div class='add'>+--------------------------------------</div><div class='add'>+</div><div class='add'>+Since the assignment of the Klingon Linux Unicode block, a registry of</div><div class='add'>+fictional and artificial scripts has been established by John Cowan</div><div class='add'>+&lt;jcowan@reutershealth.com&gt; and Michael Everson &lt;everson@evertype.com&gt;.</div><div class='add'>+The ConScript Unicode Registry is accessible at:</div><div class='add'>+</div><div class='add'>+	  http://www.evertype.com/standards/csur/</div><div class='add'>+</div><div class='add'>+The ranges used fall at the low end of the End User Zone and can hence</div><div class='add'>+not be normatively assigned, but it is recommended that people who</div><div class='add'>+wish to encode fictional scripts use these codes, in the interest of</div><div class='add'>+interoperability.  For Klingon, CSUR has adopted the Linux encoding.</div><div class='add'>+The CSUR people are driving adding Tengwar and Cirth into Unicode</div><div class='add'>+Plane 1; the addition of Klingon to Unicode Plane 1 has been rejected</div><div class='add'>+and so the above encoding remains official.</div><div class='head'>diff --git a/Documentation/admin-guide/vga-softcursor.rst b/Documentation/admin-guide/vga-softcursor.rst<br/>new file mode 100644<br/>index 000000000000..f52175457e60<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/admin-guide/vga-softcursor.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/admin-guide/vga-softcursor.rst</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+Software cursor for VGA</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+by Pavel Machek &lt;pavel@atrey.karlin.mff.cuni.cz&gt;</div><div class='add'>+and Martin Mares &lt;mj@atrey.karlin.mff.cuni.cz&gt;</div><div class='add'>+</div><div class='add'>+Linux now has some ability to manipulate cursor appearance.  Normally,</div><div class='add'>+you can set the size of hardware cursor.  You can now play a few new</div><div class='add'>+tricks: you can make your cursor look like a non-blinking red block,</div><div class='add'>+make it inverse background of the character it's over or to highlight</div><div class='add'>+that character and still choose whether the original hardware cursor</div><div class='add'>+should remain visible or not.  There may be other things I have never</div><div class='add'>+thought of.</div><div class='add'>+</div><div class='add'>+The cursor appearance is controlled by a ``&lt;ESC&gt;[?1;2;3c`` escape sequence</div><div class='add'>+where 1, 2 and 3 are parameters described below. If you omit any of them,</div><div class='add'>+they will default to zeroes.</div><div class='add'>+</div><div class='add'>+first Parameter</div><div class='add'>+	specifies cursor size::</div><div class='add'>+</div><div class='add'>+		0=default</div><div class='add'>+		1=invisible</div><div class='add'>+		2=underline,</div><div class='add'>+		...</div><div class='add'>+		8=full block</div><div class='add'>+		+ 16 if you want the software cursor to be applied</div><div class='add'>+		+ 32 if you want to always change the background color</div><div class='add'>+		+ 64 if you dislike having the background the same as the</div><div class='add'>+		     foreground.</div><div class='add'>+</div><div class='add'>+	Highlights are ignored for the last two flags.</div><div class='add'>+</div><div class='add'>+second parameter</div><div class='add'>+	selects character attribute bits you want to change</div><div class='add'>+	(by simply XORing them with the value of this parameter). On standard</div><div class='add'>+	VGA, the high four bits specify background and the low four the</div><div class='add'>+	foreground. In both groups, low three bits set color (as in normal</div><div class='add'>+	color codes used by the console) and the most significant one turns</div><div class='add'>+	on highlight (or sometimes blinking -- it depends on the configuration</div><div class='add'>+	of your VGA).</div><div class='add'>+</div><div class='add'>+third parameter</div><div class='add'>+	consists of character attribute bits you want to set.</div><div class='add'>+</div><div class='add'>+	Bit setting takes place before bit toggling, so you can simply clear a</div><div class='add'>+	bit by including it in both the set mask and the toggle mask.</div><div class='add'>+</div><div class='add'>+Examples</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+To get normal blinking underline, use::</div><div class='add'>+</div><div class='add'>+	echo -e '\033[?2c'</div><div class='add'>+</div><div class='add'>+To get blinking block, use::</div><div class='add'>+</div><div class='add'>+	echo -e '\033[?6c'</div><div class='add'>+</div><div class='add'>+To get red non-blinking block, use::</div><div class='add'>+</div><div class='add'>+	echo -e '\033[?17;0;64c'</div><div class='head'>diff --git a/Documentation/applying-patches.txt b/Documentation/applying-patches.txt<br/>deleted file mode 100644<br/>index 02ce4924468e..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/applying-patches.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/applying-patches.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,465 +0,0 @@</div><div class='del'>-.. _applying_patches:</div><div class='del'>-</div><div class='del'>-Applying Patches To The Linux Kernel</div><div class='del'>-++++++++++++++++++++++++++++++++++++</div><div class='del'>-</div><div class='del'>-Original by:</div><div class='del'>-	Jesper Juhl, August 2005</div><div class='del'>-</div><div class='del'>-Last update:</div><div class='del'>-	2016-09-14</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-A frequently asked question on the Linux Kernel Mailing List is how to apply</div><div class='del'>-a patch to the kernel or, more specifically, what base kernel a patch for</div><div class='del'>-one of the many trees/branches should be applied to. Hopefully this document</div><div class='del'>-will explain this to you.</div><div class='del'>-</div><div class='del'>-In addition to explaining how to apply and revert patches, a brief</div><div class='del'>-description of the different kernel trees (and examples of how to apply</div><div class='del'>-their specific patches) is also provided.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-What is a patch?</div><div class='del'>-================</div><div class='del'>-</div><div class='del'>-A patch is a small text document containing a delta of changes between two</div><div class='del'>-different versions of a source tree. Patches are created with the ``diff``</div><div class='del'>-program.</div><div class='del'>-</div><div class='del'>-To correctly apply a patch you need to know what base it was generated from</div><div class='del'>-and what new version the patch will change the source tree into. These</div><div class='del'>-should both be present in the patch file metadata or be possible to deduce</div><div class='del'>-from the filename.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-How do I apply or revert a patch?</div><div class='del'>-=================================</div><div class='del'>-</div><div class='del'>-You apply a patch with the ``patch`` program. The patch program reads a diff</div><div class='del'>-(or patch) file and makes the changes to the source tree described in it.</div><div class='del'>-</div><div class='del'>-Patches for the Linux kernel are generated relative to the parent directory</div><div class='del'>-holding the kernel source dir.</div><div class='del'>-</div><div class='del'>-This means that paths to files inside the patch file contain the name of the</div><div class='del'>-kernel source directories it was generated against (or some other directory</div><div class='del'>-names like "a/" and "b/").</div><div class='del'>-</div><div class='del'>-Since this is unlikely to match the name of the kernel source dir on your</div><div class='del'>-local machine (but is often useful info to see what version an otherwise</div><div class='del'>-unlabeled patch was generated against) you should change into your kernel</div><div class='del'>-source directory and then strip the first element of the path from filenames</div><div class='del'>-in the patch file when applying it (the ``-p1`` argument to ``patch`` does</div><div class='del'>-this).</div><div class='del'>-</div><div class='del'>-To revert a previously applied patch, use the -R argument to patch.</div><div class='del'>-So, if you applied a patch like this::</div><div class='del'>-</div><div class='del'>-	patch -p1 &lt; ../patch-x.y.z</div><div class='del'>-</div><div class='del'>-You can revert (undo) it like this::</div><div class='del'>-</div><div class='del'>-	patch -R -p1 &lt; ../patch-x.y.z</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-How do I feed a patch/diff file to ``patch``?</div><div class='del'>-=============================================</div><div class='del'>-</div><div class='del'>-This (as usual with Linux and other UNIX like operating systems) can be</div><div class='del'>-done in several different ways.</div><div class='del'>-</div><div class='del'>-In all the examples below I feed the file (in uncompressed form) to patch</div><div class='del'>-via stdin using the following syntax::</div><div class='del'>-</div><div class='del'>-	patch -p1 &lt; path/to/patch-x.y.z</div><div class='del'>-</div><div class='del'>-If you just want to be able to follow the examples below and don't want to</div><div class='del'>-know of more than one way to use patch, then you can stop reading this</div><div class='del'>-section here.</div><div class='del'>-</div><div class='del'>-Patch can also get the name of the file to use via the -i argument, like</div><div class='del'>-this::</div><div class='del'>-</div><div class='del'>-	patch -p1 -i path/to/patch-x.y.z</div><div class='del'>-</div><div class='del'>-If your patch file is compressed with gzip or xz and you don't want to</div><div class='del'>-uncompress it before applying it, then you can feed it to patch like this</div><div class='del'>-instead::</div><div class='del'>-</div><div class='del'>-	xzcat path/to/patch-x.y.z.xz | patch -p1</div><div class='del'>-	bzcat path/to/patch-x.y.z.gz | patch -p1</div><div class='del'>-</div><div class='del'>-If you wish to uncompress the patch file by hand first before applying it</div><div class='del'>-(what I assume you've done in the examples below), then you simply run</div><div class='del'>-gunzip or xz on the file -- like this::</div><div class='del'>-</div><div class='del'>-	gunzip patch-x.y.z.gz</div><div class='del'>-	xz -d patch-x.y.z.xz</div><div class='del'>-</div><div class='del'>-Which will leave you with a plain text patch-x.y.z file that you can feed to</div><div class='del'>-patch via stdin or the ``-i`` argument, as you prefer.</div><div class='del'>-</div><div class='del'>-A few other nice arguments for patch are ``-s`` which causes patch to be silent</div><div class='del'>-except for errors which is nice to prevent errors from scrolling out of the</div><div class='del'>-screen too fast, and ``--dry-run`` which causes patch to just print a listing of</div><div class='del'>-what would happen, but doesn't actually make any changes. Finally ``--verbose``</div><div class='del'>-tells patch to print more information about the work being done.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Common errors when patching</div><div class='del'>-===========================</div><div class='del'>-</div><div class='del'>-When patch applies a patch file it attempts to verify the sanity of the</div><div class='del'>-file in different ways.</div><div class='del'>-</div><div class='del'>-Checking that the file looks like a valid patch file and checking the code</div><div class='del'>-around the bits being modified matches the context provided in the patch are</div><div class='del'>-just two of the basic sanity checks patch does.</div><div class='del'>-</div><div class='del'>-If patch encounters something that doesn't look quite right it has two</div><div class='del'>-options. It can either refuse to apply the changes and abort or it can try</div><div class='del'>-to find a way to make the patch apply with a few minor changes.</div><div class='del'>-</div><div class='del'>-One example of something that's not 'quite right' that patch will attempt to</div><div class='del'>-fix up is if all the context matches, the lines being changed match, but the</div><div class='del'>-line numbers are different. This can happen, for example, if the patch makes</div><div class='del'>-a change in the middle of the file but for some reasons a few lines have</div><div class='del'>-been added or removed near the beginning of the file. In that case</div><div class='del'>-everything looks good it has just moved up or down a bit, and patch will</div><div class='del'>-usually adjust the line numbers and apply the patch.</div><div class='del'>-</div><div class='del'>-Whenever patch applies a patch that it had to modify a bit to make it fit</div><div class='del'>-it'll tell you about it by saying the patch applied with **fuzz**.</div><div class='del'>-You should be wary of such changes since even though patch probably got it</div><div class='del'>-right it doesn't /always/ get it right, and the result will sometimes be</div><div class='del'>-wrong.</div><div class='del'>-</div><div class='del'>-When patch encounters a change that it can't fix up with fuzz it rejects it</div><div class='del'>-outright and leaves a file with a ``.rej`` extension (a reject file). You can</div><div class='del'>-read this file to see exactly what change couldn't be applied, so you can</div><div class='del'>-go fix it up by hand if you wish.</div><div class='del'>-</div><div class='del'>-If you don't have any third-party patches applied to your kernel source, but</div><div class='del'>-only patches from kernel.org and you apply the patches in the correct order,</div><div class='del'>-and have made no modifications yourself to the source files, then you should</div><div class='del'>-never see a fuzz or reject message from patch. If you do see such messages</div><div class='del'>-anyway, then there's a high risk that either your local source tree or the</div><div class='del'>-patch file is corrupted in some way. In that case you should probably try</div><div class='del'>-re-downloading the patch and if things are still not OK then you'd be advised</div><div class='del'>-to start with a fresh tree downloaded in full from kernel.org.</div><div class='del'>-</div><div class='del'>-Let's look a bit more at some of the messages patch can produce.</div><div class='del'>-</div><div class='del'>-If patch stops and presents a ``File to patch:`` prompt, then patch could not</div><div class='del'>-find a file to be patched. Most likely you forgot to specify -p1 or you are</div><div class='del'>-in the wrong directory. Less often, you'll find patches that need to be</div><div class='del'>-applied with ``-p0`` instead of ``-p1`` (reading the patch file should reveal if</div><div class='del'>-this is the case -- if so, then this is an error by the person who created</div><div class='del'>-the patch but is not fatal).</div><div class='del'>-</div><div class='del'>-If you get ``Hunk #2 succeeded at 1887 with fuzz 2 (offset 7 lines).`` or a</div><div class='del'>-message similar to that, then it means that patch had to adjust the location</div><div class='del'>-of the change (in this example it needed to move 7 lines from where it</div><div class='del'>-expected to make the change to make it fit).</div><div class='del'>-</div><div class='del'>-The resulting file may or may not be OK, depending on the reason the file</div><div class='del'>-was different than expected.</div><div class='del'>-</div><div class='del'>-This often happens if you try to apply a patch that was generated against a</div><div class='del'>-different kernel version than the one you are trying to patch.</div><div class='del'>-</div><div class='del'>-If you get a message like ``Hunk #3 FAILED at 2387.``, then it means that the</div><div class='del'>-patch could not be applied correctly and the patch program was unable to</div><div class='del'>-fuzz its way through. This will generate a ``.rej`` file with the change that</div><div class='del'>-caused the patch to fail and also a ``.orig`` file showing you the original</div><div class='del'>-content that couldn't be changed.</div><div class='del'>-</div><div class='del'>-If you get ``Reversed (or previously applied) patch detected!  Assume -R? [n]``</div><div class='del'>-then patch detected that the change contained in the patch seems to have</div><div class='del'>-already been made.</div><div class='del'>-</div><div class='del'>-If you actually did apply this patch previously and you just re-applied it</div><div class='del'>-in error, then just say [n]o and abort this patch. If you applied this patch</div><div class='del'>-previously and actually intended to revert it, but forgot to specify -R,</div><div class='del'>-then you can say [**y**]es here to make patch revert it for you.</div><div class='del'>-</div><div class='del'>-This can also happen if the creator of the patch reversed the source and</div><div class='del'>-destination directories when creating the patch, and in that case reverting</div><div class='del'>-the patch will in fact apply it.</div><div class='del'>-</div><div class='del'>-A message similar to ``patch: **** unexpected end of file in patch`` or</div><div class='del'>-``patch unexpectedly ends in middle of line`` means that patch could make no</div><div class='del'>-sense of the file you fed to it. Either your download is broken, you tried to</div><div class='del'>-feed patch a compressed patch file without uncompressing it first, or the patch</div><div class='del'>-file that you are using has been mangled by a mail client or mail transfer</div><div class='del'>-agent along the way somewhere, e.g., by splitting a long line into two lines.</div><div class='del'>-Often these warnings can easily be fixed by joining (concatenating) the</div><div class='del'>-two lines that had been split.</div><div class='del'>-</div><div class='del'>-As I already mentioned above, these errors should never happen if you apply</div><div class='del'>-a patch from kernel.org to the correct version of an unmodified source tree.</div><div class='del'>-So if you get these errors with kernel.org patches then you should probably</div><div class='del'>-assume that either your patch file or your tree is broken and I'd advise you</div><div class='del'>-to start over with a fresh download of a full kernel tree and the patch you</div><div class='del'>-wish to apply.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Are there any alternatives to ``patch``?</div><div class='del'>-========================================</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Yes there are alternatives.</div><div class='del'>-</div><div class='del'>-You can use the ``interdiff`` program (http://cyberelk.net/tim/patchutils/) to</div><div class='del'>-generate a patch representing the differences between two patches and then</div><div class='del'>-apply the result.</div><div class='del'>-</div><div class='del'>-This will let you move from something like 4.7.2 to 4.7.3 in a single</div><div class='del'>-step. The -z flag to interdiff will even let you feed it patches in gzip or</div><div class='del'>-bzip2 compressed form directly without the use of zcat or bzcat or manual</div><div class='del'>-decompression.</div><div class='del'>-</div><div class='del'>-Here's how you'd go from 4.7.2 to 4.7.3 in a single step::</div><div class='del'>-</div><div class='del'>-	interdiff -z ../patch-4.7.2.gz ../patch-4.7.3.gz | patch -p1</div><div class='del'>-</div><div class='del'>-Although interdiff may save you a step or two you are generally advised to</div><div class='del'>-do the additional steps since interdiff can get things wrong in some cases.</div><div class='del'>-</div><div class='del'>-Another alternative is ``ketchup``, which is a python script for automatic</div><div class='del'>-downloading and applying of patches (http://www.selenic.com/ketchup/).</div><div class='del'>-</div><div class='del'>-Other nice tools are diffstat, which shows a summary of changes made by a</div><div class='del'>-patch; lsdiff, which displays a short listing of affected files in a patch</div><div class='del'>-file, along with (optionally) the line numbers of the start of each patch;</div><div class='del'>-and grepdiff, which displays a list of the files modified by a patch where</div><div class='del'>-the patch contains a given regular expression.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Where can I download the patches?</div><div class='del'>-=================================</div><div class='del'>-</div><div class='del'>-The patches are available at http://kernel.org/</div><div class='del'>-Most recent patches are linked from the front page, but they also have</div><div class='del'>-specific homes.</div><div class='del'>-</div><div class='del'>-The 4.x.y (-stable) and 4.x patches live at</div><div class='del'>-</div><div class='del'>-	ftp://ftp.kernel.org/pub/linux/kernel/v4.x/</div><div class='del'>-</div><div class='del'>-The -rc patches live at</div><div class='del'>-</div><div class='del'>-	ftp://ftp.kernel.org/pub/linux/kernel/v4.x/testing/</div><div class='del'>-</div><div class='del'>-In place of ``ftp.kernel.org`` you can use ``ftp.cc.kernel.org``, where cc is a</div><div class='del'>-country code. This way you'll be downloading from a mirror site that's most</div><div class='del'>-likely geographically closer to you, resulting in faster downloads for you,</div><div class='del'>-less bandwidth used globally and less load on the main kernel.org servers --</div><div class='del'>-these are good things, so do use mirrors when possible.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The 4.x kernels</div><div class='del'>-===============</div><div class='del'>-</div><div class='del'>-These are the base stable releases released by Linus. The highest numbered</div><div class='del'>-release is the most recent.</div><div class='del'>-</div><div class='del'>-If regressions or other serious flaws are found, then a -stable fix patch</div><div class='del'>-will be released (see below) on top of this base. Once a new 4.x base</div><div class='del'>-kernel is released, a patch is made available that is a delta between the</div><div class='del'>-previous 4.x kernel and the new one.</div><div class='del'>-</div><div class='del'>-To apply a patch moving from 4.6 to 4.7, you'd do the following (note</div><div class='del'>-that such patches do **NOT** apply on top of 4.x.y kernels but on top of the</div><div class='del'>-base 4.x kernel -- if you need to move from 4.x.y to 4.x+1 you need to</div><div class='del'>-first revert the 4.x.y patch).</div><div class='del'>-</div><div class='del'>-Here are some examples::</div><div class='del'>-</div><div class='del'>-	# moving from 4.6 to 4.7</div><div class='del'>-</div><div class='del'>-	$ cd ~/linux-4.6		# change to kernel source dir</div><div class='del'>-	$ patch -p1 &lt; ../patch-4.7	# apply the 4.7 patch</div><div class='del'>-	$ cd ..</div><div class='del'>-	$ mv linux-4.6 linux-4.7	# rename source dir</div><div class='del'>-</div><div class='del'>-	# moving from 4.6.1 to 4.7</div><div class='del'>-</div><div class='del'>-	$ cd ~/linux-4.6.1		# change to kernel source dir</div><div class='del'>-	$ patch -p1 -R &lt; ../patch-4.6.1	# revert the 4.6.1 patch</div><div class='del'>-					# source dir is now 4.6</div><div class='del'>-	$ patch -p1 &lt; ../patch-4.7	# apply new 4.7 patch</div><div class='del'>-	$ cd ..</div><div class='del'>-	$ mv linux-4.6.1 linux-4.7	# rename source dir</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The 4.x.y kernels</div><div class='del'>-=================</div><div class='del'>-</div><div class='del'>-Kernels with 3-digit versions are -stable kernels. They contain small(ish)</div><div class='del'>-critical fixes for security problems or significant regressions discovered</div><div class='del'>-in a given 4.x kernel.</div><div class='del'>-</div><div class='del'>-This is the recommended branch for users who want the most recent stable</div><div class='del'>-kernel and are not interested in helping test development/experimental</div><div class='del'>-versions.</div><div class='del'>-</div><div class='del'>-If no 4.x.y kernel is available, then the highest numbered 4.x kernel is</div><div class='del'>-the current stable kernel.</div><div class='del'>-</div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>- The -stable team usually do make incremental patches available as well</div><div class='del'>- as patches against the latest mainline release, but I only cover the</div><div class='del'>- non-incremental ones below. The incremental ones can be found at</div><div class='del'>- ftp://ftp.kernel.org/pub/linux/kernel/v4.x/incr/</div><div class='del'>-</div><div class='del'>-These patches are not incremental, meaning that for example the 4.7.3</div><div class='del'>-patch does not apply on top of the 4.7.2 kernel source, but rather on top</div><div class='del'>-of the base 4.7 kernel source.</div><div class='del'>-</div><div class='del'>-So, in order to apply the 4.7.3 patch to your existing 4.7.2 kernel</div><div class='del'>-source you have to first back out the 4.7.2 patch (so you are left with a</div><div class='del'>-base 4.7 kernel source) and then apply the new 4.7.3 patch.</div><div class='del'>-</div><div class='del'>-Here's a small example::</div><div class='del'>-</div><div class='del'>-	$ cd ~/linux-4.7.2		# change to the kernel source dir</div><div class='del'>-	$ patch -p1 -R &lt; ../patch-4.7.2	# revert the 4.7.2 patch</div><div class='del'>-	$ patch -p1 &lt; ../patch-4.7.3	# apply the new 4.7.3 patch</div><div class='del'>-	$ cd ..</div><div class='del'>-	$ mv linux-4.7.2 linux-4.7.3	# rename the kernel source dir</div><div class='del'>-</div><div class='del'>-The -rc kernels</div><div class='del'>-===============</div><div class='del'>-</div><div class='del'>-These are release-candidate kernels. These are development kernels released</div><div class='del'>-by Linus whenever he deems the current git (the kernel's source management</div><div class='del'>-tool) tree to be in a reasonably sane state adequate for testing.</div><div class='del'>-</div><div class='del'>-These kernels are not stable and you should expect occasional breakage if</div><div class='del'>-you intend to run them. This is however the most stable of the main</div><div class='del'>-development branches and is also what will eventually turn into the next</div><div class='del'>-stable kernel, so it is important that it be tested by as many people as</div><div class='del'>-possible.</div><div class='del'>-</div><div class='del'>-This is a good branch to run for people who want to help out testing</div><div class='del'>-development kernels but do not want to run some of the really experimental</div><div class='del'>-stuff (such people should see the sections about -git and -mm kernels below).</div><div class='del'>-</div><div class='del'>-The -rc patches are not incremental, they apply to a base 4.x kernel, just</div><div class='del'>-like the 4.x.y patches described above. The kernel version before the -rcN</div><div class='del'>-suffix denotes the version of the kernel that this -rc kernel will eventually</div><div class='del'>-turn into.</div><div class='del'>-</div><div class='del'>-So, 4.8-rc5 means that this is the fifth release candidate for the 4.8</div><div class='del'>-kernel and the patch should be applied on top of the 4.7 kernel source.</div><div class='del'>-</div><div class='del'>-Here are 3 examples of how to apply these patches::</div><div class='del'>-</div><div class='del'>-	# first an example of moving from 4.7 to 4.8-rc3</div><div class='del'>-</div><div class='del'>-	$ cd ~/linux-4.7			# change to the 4.7 source dir</div><div class='del'>-	$ patch -p1 &lt; ../patch-4.8-rc3		# apply the 4.8-rc3 patch</div><div class='del'>-	$ cd ..</div><div class='del'>-	$ mv linux-4.7 linux-4.8-rc3		# rename the source dir</div><div class='del'>-</div><div class='del'>-	# now let's move from 4.8-rc3 to 4.8-rc5</div><div class='del'>-</div><div class='del'>-	$ cd ~/linux-4.8-rc3			# change to the 4.8-rc3 dir</div><div class='del'>-	$ patch -p1 -R &lt; ../patch-4.8-rc3	# revert the 4.8-rc3 patch</div><div class='del'>-	$ patch -p1 &lt; ../patch-4.8-rc5		# apply the new 4.8-rc5 patch</div><div class='del'>-	$ cd ..</div><div class='del'>-	$ mv linux-4.8-rc3 linux-4.8-rc5	# rename the source dir</div><div class='del'>-</div><div class='del'>-	# finally let's try and move from 4.7.3 to 4.8-rc5</div><div class='del'>-</div><div class='del'>-	$ cd ~/linux-4.7.3			# change to the kernel source dir</div><div class='del'>-	$ patch -p1 -R &lt; ../patch-4.7.3		# revert the 4.7.3 patch</div><div class='del'>-	$ patch -p1 &lt; ../patch-4.8-rc5		# apply new 4.8-rc5 patch</div><div class='del'>-	$ cd ..</div><div class='del'>-	$ mv linux-4.7.3 linux-4.8-rc5		# rename the kernel source dir</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The -git kernels</div><div class='del'>-================</div><div class='del'>-</div><div class='del'>-These are daily snapshots of Linus' kernel tree (managed in a git</div><div class='del'>-repository, hence the name).</div><div class='del'>-</div><div class='del'>-These patches are usually released daily and represent the current state of</div><div class='del'>-Linus's tree. They are more experimental than -rc kernels since they are</div><div class='del'>-generated automatically without even a cursory glance to see if they are</div><div class='del'>-sane.</div><div class='del'>-</div><div class='del'>--git patches are not incremental and apply either to a base 4.x kernel or</div><div class='del'>-a base 4.x-rc kernel -- you can see which from their name.</div><div class='del'>-A patch named 4.7-git1 applies to the 4.7 kernel source and a patch</div><div class='del'>-named 4.8-rc3-git2 applies to the source of the 4.8-rc3 kernel.</div><div class='del'>-</div><div class='del'>-Here are some examples of how to apply these patches::</div><div class='del'>-</div><div class='del'>-	# moving from 4.7 to 4.7-git1</div><div class='del'>-</div><div class='del'>-	$ cd ~/linux-4.7			# change to the kernel source dir</div><div class='del'>-	$ patch -p1 &lt; ../patch-4.7-git1		# apply the 4.7-git1 patch</div><div class='del'>-	$ cd ..</div><div class='del'>-	$ mv linux-4.7 linux-4.7-git1		# rename the kernel source dir</div><div class='del'>-</div><div class='del'>-	# moving from 4.7-git1 to 4.8-rc2-git3</div><div class='del'>-</div><div class='del'>-	$ cd ~/linux-4.7-git1			# change to the kernel source dir</div><div class='del'>-	$ patch -p1 -R &lt; ../patch-4.7-git1	# revert the 4.7-git1 patch</div><div class='del'>-						# we now have a 4.7 kernel</div><div class='del'>-	$ patch -p1 &lt; ../patch-4.8-rc2		# apply the 4.8-rc2 patch</div><div class='del'>-						# the kernel is now 4.8-rc2</div><div class='del'>-	$ patch -p1 &lt; ../patch-4.8-rc2-git3	# apply the 4.8-rc2-git3 patch</div><div class='del'>-						# the kernel is now 4.8-rc2-git3</div><div class='del'>-	$ cd ..</div><div class='del'>-	$ mv linux-4.7-git1 linux-4.8-rc2-git3	# rename source dir</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The -mm patches and the linux-next tree</div><div class='del'>-=======================================</div><div class='del'>-</div><div class='del'>-The -mm patches are experimental patches released by Andrew Morton.</div><div class='del'>-</div><div class='del'>-In the past, -mm tree were used to also test subsystem patches, but this</div><div class='del'>-function is now done via the</div><div class='del'>-:ref:`linux-next &lt;https://www.kernel.org/doc/man-pages/linux-next.html&gt;`</div><div class='del'>-tree. The Subsystem maintainers push their patches first to linux-next,</div><div class='del'>-and, during the merge window, sends them directly to Linus.</div><div class='del'>-</div><div class='del'>-The -mm patches serve as a sort of proving ground for new features and other</div><div class='del'>-experimental patches that aren't merged via a subsystem tree.</div><div class='del'>-Once such patches has proved its worth in -mm for a while Andrew pushes</div><div class='del'>-it on to Linus for inclusion in mainline.</div><div class='del'>-</div><div class='del'>-The linux-next tree is daily updated, and includes the -mm patches.</div><div class='del'>-Both are in constant flux and contains many experimental features, a</div><div class='del'>-lot of debugging patches not appropriate for mainline etc., and is the most</div><div class='del'>-experimental of the branches described in this document.</div><div class='del'>-</div><div class='del'>-These patches are not appropriate for use on systems that are supposed to be</div><div class='del'>-stable and they are more risky to run than any of the other branches (make</div><div class='del'>-sure you have up-to-date backups -- that goes for any experimental kernel but</div><div class='del'>-even more so for -mm patches or using a Kernel from the linux-next tree).</div><div class='del'>-</div><div class='del'>-Testing of -mm patches and linux-next is greatly appreciated since the whole</div><div class='del'>-point of those are to weed out regressions, crashes, data corruption bugs,</div><div class='del'>-build breakage (and any other bug in general) before changes are merged into</div><div class='del'>-the more stable mainline Linus tree.</div><div class='del'>-</div><div class='del'>-But testers of -mm and linux-next should be aware that breakages are</div><div class='del'>-more common than in any other tree.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-This concludes this list of explanations of the various kernel trees.</div><div class='del'>-I hope you are now clear on how to apply the various patches and help testing</div><div class='del'>-the kernel.</div><div class='del'>-</div><div class='del'>-Thank you's to Randy Dunlap, Rolf Eike Beer, Linus Torvalds, Bodo Eggert,</div><div class='del'>-Johannes Stezenbach, Grant Coady, Pavel Machek and others that I may have</div><div class='del'>-forgotten for their reviews and contributions to this document.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/arm/Booting b/Documentation/arm/Booting<br/>index 83c1df2fc758..259f00af3ab3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/arm/Booting?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/arm/Booting</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/arm/Booting?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm/Booting</a></div><div class='hunk'>@@ -51,7 +51,7 @@ As an alternative, the boot loader can pass the relevant 'console='</div><div class='ctx'> option to the kernel via the tagged lists specifying the port, and</div><div class='ctx'> serial format options as described in</div><div class='ctx'> </div><div class='del'>-       Documentation/kernel-parameters.txt.</div><div class='add'>+       Documentation/admin-guide/kernel-parameters.rst.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 3. Detect the machine type</div><div class='head'>diff --git a/Documentation/arm/stm32/overview.txt b/Documentation/arm/stm32/overview.txt<br/>index 09aed5588d7c..a03b0357c017 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/arm/stm32/overview.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/arm/stm32/overview.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/arm/stm32/overview.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm/stm32/overview.txt</a></div><div class='hunk'>@@ -5,7 +5,8 @@ Introduction</div><div class='ctx'> ------------</div><div class='ctx'> </div><div class='ctx'>   The STMicroelectronics family of Cortex-M based MCUs are supported by the</div><div class='del'>-  'STM32' platform of ARM Linux. Currently only the STM32F429 is supported.</div><div class='add'>+  'STM32' platform of ARM Linux. Currently only the STM32F429 (Cortex-M4)</div><div class='add'>+  and STM32F746 (Cortex-M7) are supported.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Configuration</div><div class='head'>diff --git a/Documentation/arm/stm32/stm32f746-overview.txt b/Documentation/arm/stm32/stm32f746-overview.txt<br/>new file mode 100644<br/>index 000000000000..cffd2b1ccd6f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/arm/stm32/stm32f746-overview.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm/stm32/stm32f746-overview.txt</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+			STM32F746 Overview</div><div class='add'>+			==================</div><div class='add'>+</div><div class='add'>+  Introduction</div><div class='add'>+  ------------</div><div class='add'>+	The STM32F746 is a Cortex-M7 MCU aimed at various applications.</div><div class='add'>+	It features:</div><div class='add'>+	- Cortex-M7 core running up to @216MHz</div><div class='add'>+	- 1MB internal flash, 320KBytes internal RAM (+4KB of backup SRAM)</div><div class='add'>+	- FMC controller to connect SDRAM, NOR and NAND memories</div><div class='add'>+	- Dual mode QSPI</div><div class='add'>+	- SD/MMC/SDIO support</div><div class='add'>+	- Ethernet controller</div><div class='add'>+	- USB OTFG FS &amp; HS controllers</div><div class='add'>+	- I2C, SPI, CAN busses support</div><div class='add'>+	- Several 16 &amp; 32 bits general purpose timers</div><div class='add'>+	- Serial Audio interface</div><div class='add'>+	- LCD controller</div><div class='add'>+	- HDMI-CEC</div><div class='add'>+	- SPDIFRX</div><div class='add'>+</div><div class='add'>+  Resources</div><div class='add'>+  ---------</div><div class='add'>+	Datasheet and reference manual are publicly available on ST website:</div><div class='add'>+	- http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f7-series/stm32f7x6/stm32f746ng.html</div><div class='add'>+</div><div class='add'>+  Document Author</div><div class='add'>+  ---------------</div><div class='add'>+	Alexandre Torgue &lt;alexandre.torgue@st.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/arm/sunxi/README b/Documentation/arm/sunxi/README<br/>index cd0243302bc1..d7b1f016bd62 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/arm/sunxi/README?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/arm/sunxi/README</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/arm/sunxi/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm/sunxi/README</a></div><div class='hunk'>@@ -63,10 +63,18 @@ SunXi family</div><div class='ctx'>         + User Manual</div><div class='ctx'>           http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf</div><div class='ctx'> </div><div class='add'>+      - Allwinner H2+ (sun8i)</div><div class='add'>+        + No document available now, but is known to be working properly with</div><div class='add'>+          H3 drivers and memory map.</div><div class='add'>+</div><div class='ctx'>       - Allwinner H3 (sun8i)</div><div class='ctx'>         + Datasheet</div><div class='ctx'>           http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.pdf</div><div class='ctx'> </div><div class='add'>+      - Allwinner V3s (sun8i)</div><div class='add'>+        + Datasheet</div><div class='add'>+          http://linux-sunxi.org/File:Allwinner_V3s_Datasheet_V1.0.pdf</div><div class='add'>+</div><div class='ctx'>     * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs</div><div class='ctx'>       - Allwinner A80</div><div class='ctx'>         + Datasheet</div><div class='head'>diff --git a/Documentation/arm64/cpu-feature-registers.txt b/Documentation/arm64/cpu-feature-registers.txt<br/>new file mode 100644<br/>index 000000000000..61ca21ebef1a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/arm64/cpu-feature-registers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm64/cpu-feature-registers.txt</a></div><div class='hunk'>@@ -0,0 +1,240 @@</div><div class='add'>+		ARM64 CPU Feature Registers</div><div class='add'>+		===========================</div><div class='add'>+</div><div class='add'>+Author: Suzuki K Poulose &lt;suzuki.poulose@arm.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+This file describes the ABI for exporting the AArch64 CPU ID/feature</div><div class='add'>+registers to userspace. The availability of this ABI is advertised</div><div class='add'>+via the HWCAP_CPUID in HWCAPs.</div><div class='add'>+</div><div class='add'>+1. Motivation</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+The ARM architecture defines a set of feature registers, which describe</div><div class='add'>+the capabilities of the CPU/system. Access to these system registers is</div><div class='add'>+restricted from EL0 and there is no reliable way for an application to</div><div class='add'>+extract this information to make better decisions at runtime. There is</div><div class='add'>+limited information available to the application via HWCAPs, however</div><div class='add'>+there are some issues with their usage.</div><div class='add'>+</div><div class='add'>+ a) Any change to the HWCAPs requires an update to userspace (e.g libc)</div><div class='add'>+    to detect the new changes, which can take a long time to appear in</div><div class='add'>+    distributions. Exposing the registers allows applications to get the</div><div class='add'>+    information without requiring updates to the toolchains.</div><div class='add'>+</div><div class='add'>+ b) Access to HWCAPs is sometimes limited (e.g prior to libc, or</div><div class='add'>+    when ld is initialised at startup time).</div><div class='add'>+</div><div class='add'>+ c) HWCAPs cannot represent non-boolean information effectively. The</div><div class='add'>+    architecture defines a canonical format for representing features</div><div class='add'>+    in the ID registers; this is well defined and is capable of</div><div class='add'>+    representing all valid architecture variations.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. Requirements</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+ a) Safety :</div><div class='add'>+    Applications should be able to use the information provided by the</div><div class='add'>+    infrastructure to run safely across the system. This has greater</div><div class='add'>+    implications on a system with heterogeneous CPUs.</div><div class='add'>+    The infrastructure exports a value that is safe across all the</div><div class='add'>+    available CPU on the system.</div><div class='add'>+</div><div class='add'>+    e.g, If at least one CPU doesn't implement CRC32 instructions, while</div><div class='add'>+    others do, we should report that the CRC32 is not implemented.</div><div class='add'>+    Otherwise an application could crash when scheduled on the CPU</div><div class='add'>+    which doesn't support CRC32.</div><div class='add'>+</div><div class='add'>+ b) Security :</div><div class='add'>+    Applications should only be able to receive information that is</div><div class='add'>+    relevant to the normal operation in userspace. Hence, some of the</div><div class='add'>+    fields are masked out(i.e, made invisible) and their values are set to</div><div class='add'>+    indicate the feature is 'not supported'. See Section 4 for the list</div><div class='add'>+    of visible features. Also, the kernel may manipulate the fields</div><div class='add'>+    based on what it supports. e.g, If FP is not supported by the</div><div class='add'>+    kernel, the values could indicate that the FP is not available</div><div class='add'>+    (even when the CPU provides it).</div><div class='add'>+</div><div class='add'>+ c) Implementation Defined Features</div><div class='add'>+    The infrastructure doesn't expose any register which is</div><div class='add'>+    IMPLEMENTATION DEFINED as per ARMv8-A Architecture.</div><div class='add'>+</div><div class='add'>+ d) CPU Identification :</div><div class='add'>+    MIDR_EL1 is exposed to help identify the processor. On a</div><div class='add'>+    heterogeneous system, this could be racy (just like getcpu()). The</div><div class='add'>+    process could be migrated to another CPU by the time it uses the</div><div class='add'>+    register value, unless the CPU affinity is set. Hence, there is no</div><div class='add'>+    guarantee that the value reflects the processor that it is</div><div class='add'>+    currently executing on. The REVIDR is not exposed due to this</div><div class='add'>+    constraint, as REVIDR makes sense only in conjunction with the</div><div class='add'>+    MIDR. Alternately, MIDR_EL1 and REVIDR_EL1 are exposed via sysfs</div><div class='add'>+    at:</div><div class='add'>+</div><div class='add'>+	/sys/devices/system/cpu/cpu$ID/regs/identification/</div><div class='add'>+	                                              \- midr</div><div class='add'>+	                                              \- revidr</div><div class='add'>+</div><div class='add'>+3. Implementation</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+The infrastructure is built on the emulation of the 'MRS' instruction.</div><div class='add'>+Accessing a restricted system register from an application generates an</div><div class='add'>+exception and ends up in SIGILL being delivered to the process.</div><div class='add'>+The infrastructure hooks into the exception handler and emulates the</div><div class='add'>+operation if the source belongs to the supported system register space.</div><div class='add'>+</div><div class='add'>+The infrastructure emulates only the following system register space:</div><div class='add'>+	Op0=3, Op1=0, CRn=0, CRm=0,4,5,6,7</div><div class='add'>+</div><div class='add'>+(See Table C5-6 'System instruction encodings for non-Debug System</div><div class='add'>+register accesses' in ARMv8 ARM DDI 0487A.h, for the list of</div><div class='add'>+registers).</div><div class='add'>+</div><div class='add'>+The following rules are applied to the value returned by the</div><div class='add'>+infrastructure:</div><div class='add'>+</div><div class='add'>+ a) The value of an 'IMPLEMENTATION DEFINED' field is set to 0.</div><div class='add'>+ b) The value of a reserved field is populated with the reserved</div><div class='add'>+    value as defined by the architecture.</div><div class='add'>+ c) The value of a 'visible' field holds the system wide safe value</div><div class='add'>+    for the particular feature (except for MIDR_EL1, see section 4).</div><div class='add'>+ d) All other fields (i.e, invisible fields) are set to indicate</div><div class='add'>+    the feature is missing (as defined by the architecture).</div><div class='add'>+</div><div class='add'>+4. List of registers with visible features</div><div class='add'>+-------------------------------------------</div><div class='add'>+</div><div class='add'>+  1) ID_AA64ISAR0_EL1 - Instruction Set Attribute Register 0</div><div class='add'>+     x--------------------------------------------------x</div><div class='add'>+     | Name                         |  bits   | visible |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | RES0                         | [63-32] |    n    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | RDM                          | [31-28] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | ATOMICS                      | [23-20] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | CRC32                        | [19-16] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | SHA2                         | [15-12] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | SHA1                         | [11-8]  |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | AES                          | [7-4]   |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | RES0                         | [3-0]   |    n    |</div><div class='add'>+     x--------------------------------------------------x</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  2) ID_AA64PFR0_EL1 - Processor Feature Register 0</div><div class='add'>+     x--------------------------------------------------x</div><div class='add'>+     | Name                         |  bits   | visible |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | RES0                         | [63-28] |    n    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | GIC                          | [27-24] |    n    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | AdvSIMD                      | [23-20] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | FP                           | [19-16] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | EL3                          | [15-12] |    n    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | EL2                          | [11-8]  |    n    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | EL1                          | [7-4]   |    n    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | EL0                          | [3-0]   |    n    |</div><div class='add'>+     x--------------------------------------------------x</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  3) MIDR_EL1 - Main ID Register</div><div class='add'>+     x--------------------------------------------------x</div><div class='add'>+     | Name                         |  bits   | visible |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | Implementer                  | [31-24] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | Variant                      | [23-20] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | Architecture                 | [19-16] |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | PartNum                      | [15-4]  |    y    |</div><div class='add'>+     |--------------------------------------------------|</div><div class='add'>+     | Revision                     | [3-0]   |    y    |</div><div class='add'>+     x--------------------------------------------------x</div><div class='add'>+</div><div class='add'>+   NOTE: The 'visible' fields of MIDR_EL1 will contain the value</div><div class='add'>+   as available on the CPU where it is fetched and is not a system</div><div class='add'>+   wide safe value.</div><div class='add'>+</div><div class='add'>+Appendix I: Example</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sample program to demonstrate the MRS emulation ABI.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015-2016, ARM Ltd</div><div class='add'>+ *</div><div class='add'>+ * Author: Suzuki K Poulose &lt;suzuki.poulose@arm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;sys/auxv.h&gt;</div><div class='add'>+</div><div class='add'>+#define get_cpu_ftr(id) ({					\</div><div class='add'>+		unsigned long __val;				\</div><div class='add'>+		asm("mrs %0, "#id : "=r" (__val));		\</div><div class='add'>+		printf("%-20s: 0x%016lx\n", #id, __val);	\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+int main(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (!(getauxval(AT_HWCAP) &amp; HWCAP_CPUID)) {</div><div class='add'>+		fputs("CPUID registers unavailable\n", stderr);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	get_cpu_ftr(ID_AA64ISAR0_EL1);</div><div class='add'>+	get_cpu_ftr(ID_AA64ISAR1_EL1);</div><div class='add'>+	get_cpu_ftr(ID_AA64MMFR0_EL1);</div><div class='add'>+	get_cpu_ftr(ID_AA64MMFR1_EL1);</div><div class='add'>+	get_cpu_ftr(ID_AA64PFR0_EL1);</div><div class='add'>+	get_cpu_ftr(ID_AA64PFR1_EL1);</div><div class='add'>+	get_cpu_ftr(ID_AA64DFR0_EL1);</div><div class='add'>+	get_cpu_ftr(ID_AA64DFR1_EL1);</div><div class='add'>+</div><div class='add'>+	get_cpu_ftr(MIDR_EL1);</div><div class='add'>+	get_cpu_ftr(MPIDR_EL1);</div><div class='add'>+	get_cpu_ftr(REVIDR_EL1);</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	/* Unexposed register access causes SIGILL */</div><div class='add'>+	get_cpu_ftr(ID_MMFR0_EL1);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/arm64/silicon-errata.txt b/Documentation/arm64/silicon-errata.txt<br/>index 405da11fc3e4..a71b8095dbd8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/arm64/silicon-errata.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/arm64/silicon-errata.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/arm64/silicon-errata.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/arm64/silicon-errata.txt</a></div><div class='hunk'>@@ -42,24 +42,29 @@ file acts as a registry of software workarounds in the Linux Kernel and</div><div class='ctx'> will be updated when new workarounds are committed and backported to</div><div class='ctx'> stable kernels.</div><div class='ctx'> </div><div class='del'>-| Implementor    | Component       | Erratum ID      | Kconfig                 |</div><div class='del'>-+----------------+-----------------+-----------------+-------------------------+</div><div class='del'>-| ARM            | Cortex-A53      | #826319         | ARM64_ERRATUM_826319    |</div><div class='del'>-| ARM            | Cortex-A53      | #827319         | ARM64_ERRATUM_827319    |</div><div class='del'>-| ARM            | Cortex-A53      | #824069         | ARM64_ERRATUM_824069    |</div><div class='del'>-| ARM            | Cortex-A53      | #819472         | ARM64_ERRATUM_819472    |</div><div class='del'>-| ARM            | Cortex-A53      | #845719         | ARM64_ERRATUM_845719    |</div><div class='del'>-| ARM            | Cortex-A53      | #843419         | ARM64_ERRATUM_843419    |</div><div class='del'>-| ARM            | Cortex-A57      | #832075         | ARM64_ERRATUM_832075    |</div><div class='del'>-| ARM            | Cortex-A57      | #852523         | N/A                     |</div><div class='del'>-| ARM            | Cortex-A57      | #834220         | ARM64_ERRATUM_834220    |</div><div class='del'>-| ARM            | Cortex-A72      | #853709         | N/A                     |</div><div class='del'>-| ARM            | MMU-500         | #841119,#826419 | N/A                     |</div><div class='del'>-|                |                 |                 |                         |</div><div class='del'>-| Cavium         | ThunderX ITS    | #22375, #24313  | CAVIUM_ERRATUM_22375    |</div><div class='del'>-| Cavium         | ThunderX ITS    | #23144          | CAVIUM_ERRATUM_23144    |</div><div class='del'>-| Cavium         | ThunderX GICv3  | #23154          | CAVIUM_ERRATUM_23154    |</div><div class='del'>-| Cavium         | ThunderX Core   | #27456          | CAVIUM_ERRATUM_27456    |</div><div class='del'>-| Cavium         | ThunderX SMMUv2 | #27704          | N/A		       |</div><div class='del'>-|                |                 |                 |                         |</div><div class='del'>-| Freescale/NXP  | LS2080A/LS1043A | A-008585        | FSL_ERRATUM_A008585     |</div><div class='add'>+| Implementor    | Component       | Erratum ID      | Kconfig                     |</div><div class='add'>++----------------+-----------------+-----------------+-----------------------------+</div><div class='add'>+| ARM            | Cortex-A53      | #826319         | ARM64_ERRATUM_826319        |</div><div class='add'>+| ARM            | Cortex-A53      | #827319         | ARM64_ERRATUM_827319        |</div><div class='add'>+| ARM            | Cortex-A53      | #824069         | ARM64_ERRATUM_824069        |</div><div class='add'>+| ARM            | Cortex-A53      | #819472         | ARM64_ERRATUM_819472        |</div><div class='add'>+| ARM            | Cortex-A53      | #845719         | ARM64_ERRATUM_845719        |</div><div class='add'>+| ARM            | Cortex-A53      | #843419         | ARM64_ERRATUM_843419        |</div><div class='add'>+| ARM            | Cortex-A57      | #832075         | ARM64_ERRATUM_832075        |</div><div class='add'>+| ARM            | Cortex-A57      | #852523         | N/A                         |</div><div class='add'>+| ARM            | Cortex-A57      | #834220         | ARM64_ERRATUM_834220        |</div><div class='add'>+| ARM            | Cortex-A72      | #853709         | N/A                         |</div><div class='add'>+| ARM            | MMU-500         | #841119,#826419 | N/A                         |</div><div class='add'>+|                |                 |                 |                             |</div><div class='add'>+| Cavium         | ThunderX ITS    | #22375, #24313  | CAVIUM_ERRATUM_22375        |</div><div class='add'>+| Cavium         | ThunderX ITS    | #23144          | CAVIUM_ERRATUM_23144        |</div><div class='add'>+| Cavium         | ThunderX GICv3  | #23154          | CAVIUM_ERRATUM_23154        |</div><div class='add'>+| Cavium         | ThunderX Core   | #27456          | CAVIUM_ERRATUM_27456        |</div><div class='add'>+| Cavium         | ThunderX SMMUv2 | #27704          | N/A                         |</div><div class='add'>+|                |                 |                 |                             |</div><div class='add'>+| Freescale/NXP  | LS2080A/LS1043A | A-008585        | FSL_ERRATUM_A008585         |</div><div class='add'>+|                |                 |                 |                             |</div><div class='add'>+| Hisilicon      | Hip0{5,6,7}     | #161010101      | HISILICON_ERRATUM_161010101 |</div><div class='add'>+|                |                 |                 |                             |</div><div class='add'>+| Qualcomm Tech. | Falkor v1       | E1003           | QCOM_FALKOR_ERRATUM_1003    |</div><div class='add'>+| Qualcomm Tech. | Falkor v1       | E1009           | QCOM_FALKOR_ERRATUM_1009    |</div><div class='head'>diff --git a/Documentation/assoc_array.txt b/Documentation/assoc_array.txt<br/>deleted file mode 100644<br/>index 2f2c6cdd73c0..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/assoc_array.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/assoc_array.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,574 +0,0 @@</div><div class='del'>-		   ========================================</div><div class='del'>-		   GENERIC ASSOCIATIVE ARRAY IMPLEMENTATION</div><div class='del'>-		   ========================================</div><div class='del'>-</div><div class='del'>-Contents:</div><div class='del'>-</div><div class='del'>- - Overview.</div><div class='del'>-</div><div class='del'>- - The public API.</div><div class='del'>-   - Edit script.</div><div class='del'>-   - Operations table.</div><div class='del'>-   - Manipulation functions.</div><div class='del'>-   - Access functions.</div><div class='del'>-   - Index key form.</div><div class='del'>-</div><div class='del'>- - Internal workings.</div><div class='del'>-   - Basic internal tree layout.</div><div class='del'>-   - Shortcuts.</div><div class='del'>-   - Splitting and collapsing nodes.</div><div class='del'>-   - Non-recursive iteration.</div><div class='del'>-   - Simultaneous alteration and iteration.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-========</div><div class='del'>-OVERVIEW</div><div class='del'>-========</div><div class='del'>-</div><div class='del'>-This associative array implementation is an object container with the following</div><div class='del'>-properties:</div><div class='del'>-</div><div class='del'>- (1) Objects are opaque pointers.  The implementation does not care where they</div><div class='del'>-     point (if anywhere) or what they point to (if anything).</div><div class='del'>-</div><div class='del'>-     [!] NOTE: Pointers to objects _must_ be zero in the least significant bit.</div><div class='del'>-</div><div class='del'>- (2) Objects do not need to contain linkage blocks for use by the array.  This</div><div class='del'>-     permits an object to be located in multiple arrays simultaneously.</div><div class='del'>-     Rather, the array is made up of metadata blocks that point to objects.</div><div class='del'>-</div><div class='del'>- (3) Objects require index keys to locate them within the array.</div><div class='del'>-</div><div class='del'>- (4) Index keys must be unique.  Inserting an object with the same key as one</div><div class='del'>-     already in the array will replace the old object.</div><div class='del'>-</div><div class='del'>- (5) Index keys can be of any length and can be of different lengths.</div><div class='del'>-</div><div class='del'>- (6) Index keys should encode the length early on, before any variation due to</div><div class='del'>-     length is seen.</div><div class='del'>-</div><div class='del'>- (7) Index keys can include a hash to scatter objects throughout the array.</div><div class='del'>-</div><div class='del'>- (8) The array can iterated over.  The objects will not necessarily come out in</div><div class='del'>-     key order.</div><div class='del'>-</div><div class='del'>- (9) The array can be iterated over whilst it is being modified, provided the</div><div class='del'>-     RCU readlock is being held by the iterator.  Note, however, under these</div><div class='del'>-     circumstances, some objects may be seen more than once.  If this is a</div><div class='del'>-     problem, the iterator should lock against modification.  Objects will not</div><div class='del'>-     be missed, however, unless deleted.</div><div class='del'>-</div><div class='del'>-(10) Objects in the array can be looked up by means of their index key.</div><div class='del'>-</div><div class='del'>-(11) Objects can be looked up whilst the array is being modified, provided the</div><div class='del'>-     RCU readlock is being held by the thread doing the look up.</div><div class='del'>-</div><div class='del'>-The implementation uses a tree of 16-pointer nodes internally that are indexed</div><div class='del'>-on each level by nibbles from the index key in the same manner as in a radix</div><div class='del'>-tree.  To improve memory efficiency, shortcuts can be emplaced to skip over</div><div class='del'>-what would otherwise be a series of single-occupancy nodes.  Further, nodes</div><div class='del'>-pack leaf object pointers into spare space in the node rather than making an</div><div class='del'>-extra branch until as such time an object needs to be added to a full node.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-==============</div><div class='del'>-THE PUBLIC API</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-The public API can be found in &lt;linux/assoc_array.h&gt;.  The associative array is</div><div class='del'>-rooted on the following structure:</div><div class='del'>-</div><div class='del'>-	struct assoc_array {</div><div class='del'>-		...</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-The code is selected by enabling CONFIG_ASSOCIATIVE_ARRAY.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EDIT SCRIPT</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-The insertion and deletion functions produce an 'edit script' that can later be</div><div class='del'>-applied to effect the changes without risking ENOMEM.  This retains the</div><div class='del'>-preallocated metadata blocks that will be installed in the internal tree and</div><div class='del'>-keeps track of the metadata blocks that will be removed from the tree when the</div><div class='del'>-script is applied.</div><div class='del'>-</div><div class='del'>-This is also used to keep track of dead blocks and dead objects after the</div><div class='del'>-script has been applied so that they can be freed later.  The freeing is done</div><div class='del'>-after an RCU grace period has passed - thus allowing access functions to</div><div class='del'>-proceed under the RCU read lock.</div><div class='del'>-</div><div class='del'>-The script appears as outside of the API as a pointer of the type:</div><div class='del'>-</div><div class='del'>-	struct assoc_array_edit;</div><div class='del'>-</div><div class='del'>-There are two functions for dealing with the script:</div><div class='del'>-</div><div class='del'>- (1) Apply an edit script.</div><div class='del'>-</div><div class='del'>-	void assoc_array_apply_edit(struct assoc_array_edit *edit);</div><div class='del'>-</div><div class='del'>-     This will perform the edit functions, interpolating various write barriers</div><div class='del'>-     to permit accesses under the RCU read lock to continue.  The edit script</div><div class='del'>-     will then be passed to call_rcu() to free it and any dead stuff it points</div><div class='del'>-     to.</div><div class='del'>-</div><div class='del'>- (2) Cancel an edit script.</div><div class='del'>-</div><div class='del'>-	void assoc_array_cancel_edit(struct assoc_array_edit *edit);</div><div class='del'>-</div><div class='del'>-     This frees the edit script and all preallocated memory immediately.  If</div><div class='del'>-     this was for insertion, the new object is _not_ released by this function,</div><div class='del'>-     but must rather be released by the caller.</div><div class='del'>-</div><div class='del'>-These functions are guaranteed not to fail.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-OPERATIONS TABLE</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-Various functions take a table of operations:</div><div class='del'>-</div><div class='del'>-	struct assoc_array_ops {</div><div class='del'>-		...</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-This points to a number of methods, all of which need to be provided:</div><div class='del'>-</div><div class='del'>- (1) Get a chunk of index key from caller data:</div><div class='del'>-</div><div class='del'>-	unsigned long (*get_key_chunk)(const void *index_key, int level);</div><div class='del'>-</div><div class='del'>-     This should return a chunk of caller-supplied index key starting at the</div><div class='del'>-     *bit* position given by the level argument.  The level argument will be a</div><div class='del'>-     multiple of ASSOC_ARRAY_KEY_CHUNK_SIZE and the function should return</div><div class='del'>-     ASSOC_ARRAY_KEY_CHUNK_SIZE bits.  No error is possible.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (2) Get a chunk of an object's index key.</div><div class='del'>-</div><div class='del'>-	unsigned long (*get_object_key_chunk)(const void *object, int level);</div><div class='del'>-</div><div class='del'>-     As the previous function, but gets its data from an object in the array</div><div class='del'>-     rather than from a caller-supplied index key.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (3) See if this is the object we're looking for.</div><div class='del'>-</div><div class='del'>-	bool (*compare_object)(const void *object, const void *index_key);</div><div class='del'>-</div><div class='del'>-     Compare the object against an index key and return true if it matches and</div><div class='del'>-     false if it doesn't.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (4) Diff the index keys of two objects.</div><div class='del'>-</div><div class='del'>-	int (*diff_objects)(const void *object, const void *index_key);</div><div class='del'>-</div><div class='del'>-     Return the bit position at which the index key of the specified object</div><div class='del'>-     differs from the given index key or -1 if they are the same.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (5) Free an object.</div><div class='del'>-</div><div class='del'>-	void (*free_object)(void *object);</div><div class='del'>-</div><div class='del'>-     Free the specified object.  Note that this may be called an RCU grace</div><div class='del'>-     period after assoc_array_apply_edit() was called, so synchronize_rcu() may</div><div class='del'>-     be necessary on module unloading.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MANIPULATION FUNCTIONS</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-There are a number of functions for manipulating an associative array:</div><div class='del'>-</div><div class='del'>- (1) Initialise an associative array.</div><div class='del'>-</div><div class='del'>-	void assoc_array_init(struct assoc_array *array);</div><div class='del'>-</div><div class='del'>-     This initialises the base structure for an associative array.  It can't</div><div class='del'>-     fail.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (2) Insert/replace an object in an associative array.</div><div class='del'>-</div><div class='del'>-	struct assoc_array_edit *</div><div class='del'>-	assoc_array_insert(struct assoc_array *array,</div><div class='del'>-			   const struct assoc_array_ops *ops,</div><div class='del'>-			   const void *index_key,</div><div class='del'>-			   void *object);</div><div class='del'>-</div><div class='del'>-     This inserts the given object into the array.  Note that the least</div><div class='del'>-     significant bit of the pointer must be zero as it's used to type-mark</div><div class='del'>-     pointers internally.</div><div class='del'>-</div><div class='del'>-     If an object already exists for that key then it will be replaced with the</div><div class='del'>-     new object and the old one will be freed automatically.</div><div class='del'>-</div><div class='del'>-     The index_key argument should hold index key information and is</div><div class='del'>-     passed to the methods in the ops table when they are called.</div><div class='del'>-</div><div class='del'>-     This function makes no alteration to the array itself, but rather returns</div><div class='del'>-     an edit script that must be applied.  -ENOMEM is returned in the case of</div><div class='del'>-     an out-of-memory error.</div><div class='del'>-</div><div class='del'>-     The caller should lock exclusively against other modifiers of the array.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (3) Delete an object from an associative array.</div><div class='del'>-</div><div class='del'>-	struct assoc_array_edit *</div><div class='del'>-	assoc_array_delete(struct assoc_array *array,</div><div class='del'>-			   const struct assoc_array_ops *ops,</div><div class='del'>-			   const void *index_key);</div><div class='del'>-</div><div class='del'>-     This deletes an object that matches the specified data from the array.</div><div class='del'>-</div><div class='del'>-     The index_key argument should hold index key information and is</div><div class='del'>-     passed to the methods in the ops table when they are called.</div><div class='del'>-</div><div class='del'>-     This function makes no alteration to the array itself, but rather returns</div><div class='del'>-     an edit script that must be applied.  -ENOMEM is returned in the case of</div><div class='del'>-     an out-of-memory error.  NULL will be returned if the specified object is</div><div class='del'>-     not found within the array.</div><div class='del'>-</div><div class='del'>-     The caller should lock exclusively against other modifiers of the array.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (4) Delete all objects from an associative array.</div><div class='del'>-</div><div class='del'>-	struct assoc_array_edit *</div><div class='del'>-	assoc_array_clear(struct assoc_array *array,</div><div class='del'>-			  const struct assoc_array_ops *ops);</div><div class='del'>-</div><div class='del'>-     This deletes all the objects from an associative array and leaves it</div><div class='del'>-     completely empty.</div><div class='del'>-</div><div class='del'>-     This function makes no alteration to the array itself, but rather returns</div><div class='del'>-     an edit script that must be applied.  -ENOMEM is returned in the case of</div><div class='del'>-     an out-of-memory error.</div><div class='del'>-</div><div class='del'>-     The caller should lock exclusively against other modifiers of the array.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (5) Destroy an associative array, deleting all objects.</div><div class='del'>-</div><div class='del'>-	void assoc_array_destroy(struct assoc_array *array,</div><div class='del'>-				 const struct assoc_array_ops *ops);</div><div class='del'>-</div><div class='del'>-     This destroys the contents of the associative array and leaves it</div><div class='del'>-     completely empty.  It is not permitted for another thread to be traversing</div><div class='del'>-     the array under the RCU read lock at the same time as this function is</div><div class='del'>-     destroying it as no RCU deferral is performed on memory release -</div><div class='del'>-     something that would require memory to be allocated.</div><div class='del'>-</div><div class='del'>-     The caller should lock exclusively against other modifiers and accessors</div><div class='del'>-     of the array.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (6) Garbage collect an associative array.</div><div class='del'>-</div><div class='del'>-	int assoc_array_gc(struct assoc_array *array,</div><div class='del'>-			   const struct assoc_array_ops *ops,</div><div class='del'>-			   bool (*iterator)(void *object, void *iterator_data),</div><div class='del'>-			   void *iterator_data);</div><div class='del'>-</div><div class='del'>-     This iterates over the objects in an associative array and passes each one</div><div class='del'>-     to iterator().  If iterator() returns true, the object is kept.  If it</div><div class='del'>-     returns false, the object will be freed.  If the iterator() function</div><div class='del'>-     returns true, it must perform any appropriate refcount incrementing on the</div><div class='del'>-     object before returning.</div><div class='del'>-</div><div class='del'>-     The internal tree will be packed down if possible as part of the iteration</div><div class='del'>-     to reduce the number of nodes in it.</div><div class='del'>-</div><div class='del'>-     The iterator_data is passed directly to iterator() and is otherwise</div><div class='del'>-     ignored by the function.</div><div class='del'>-</div><div class='del'>-     The function will return 0 if successful and -ENOMEM if there wasn't</div><div class='del'>-     enough memory.</div><div class='del'>-</div><div class='del'>-     It is possible for other threads to iterate over or search the array under</div><div class='del'>-     the RCU read lock whilst this function is in progress.  The caller should</div><div class='del'>-     lock exclusively against other modifiers of the array.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ACCESS FUNCTIONS</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-There are two functions for accessing an associative array:</div><div class='del'>-</div><div class='del'>- (1) Iterate over all the objects in an associative array.</div><div class='del'>-</div><div class='del'>-	int assoc_array_iterate(const struct assoc_array *array,</div><div class='del'>-				int (*iterator)(const void *object,</div><div class='del'>-						void *iterator_data),</div><div class='del'>-				void *iterator_data);</div><div class='del'>-</div><div class='del'>-     This passes each object in the array to the iterator callback function.</div><div class='del'>-     iterator_data is private data for that function.</div><div class='del'>-</div><div class='del'>-     This may be used on an array at the same time as the array is being</div><div class='del'>-     modified, provided the RCU read lock is held.  Under such circumstances,</div><div class='del'>-     it is possible for the iteration function to see some objects twice.  If</div><div class='del'>-     this is a problem, then modification should be locked against.  The</div><div class='del'>-     iteration algorithm should not, however, miss any objects.</div><div class='del'>-</div><div class='del'>-     The function will return 0 if no objects were in the array or else it will</div><div class='del'>-     return the result of the last iterator function called.  Iteration stops</div><div class='del'>-     immediately if any call to the iteration function results in a non-zero</div><div class='del'>-     return.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (2) Find an object in an associative array.</div><div class='del'>-</div><div class='del'>-	void *assoc_array_find(const struct assoc_array *array,</div><div class='del'>-			       const struct assoc_array_ops *ops,</div><div class='del'>-			       const void *index_key);</div><div class='del'>-</div><div class='del'>-     This walks through the array's internal tree directly to the object</div><div class='del'>-     specified by the index key..</div><div class='del'>-</div><div class='del'>-     This may be used on an array at the same time as the array is being</div><div class='del'>-     modified, provided the RCU read lock is held.</div><div class='del'>-</div><div class='del'>-     The function will return the object if found (and set *_type to the object</div><div class='del'>-     type) or will return NULL if the object was not found.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-INDEX KEY FORM</div><div class='del'>---------------</div><div class='del'>-</div><div class='del'>-The index key can be of any form, but since the algorithms aren't told how long</div><div class='del'>-the key is, it is strongly recommended that the index key includes its length</div><div class='del'>-very early on before any variation due to the length would have an effect on</div><div class='del'>-comparisons.</div><div class='del'>-</div><div class='del'>-This will cause leaves with different length keys to scatter away from each</div><div class='del'>-other - and those with the same length keys to cluster together.</div><div class='del'>-</div><div class='del'>-It is also recommended that the index key begin with a hash of the rest of the</div><div class='del'>-key to maximise scattering throughout keyspace.</div><div class='del'>-</div><div class='del'>-The better the scattering, the wider and lower the internal tree will be.</div><div class='del'>-</div><div class='del'>-Poor scattering isn't too much of a problem as there are shortcuts and nodes</div><div class='del'>-can contain mixtures of leaves and metadata pointers.</div><div class='del'>-</div><div class='del'>-The index key is read in chunks of machine word.  Each chunk is subdivided into</div><div class='del'>-one nibble (4 bits) per level, so on a 32-bit CPU this is good for 8 levels and</div><div class='del'>-on a 64-bit CPU, 16 levels.  Unless the scattering is really poor, it is</div><div class='del'>-unlikely that more than one word of any particular index key will have to be</div><div class='del'>-used.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-=================</div><div class='del'>-INTERNAL WORKINGS</div><div class='del'>-=================</div><div class='del'>-</div><div class='del'>-The associative array data structure has an internal tree.  This tree is</div><div class='del'>-constructed of two types of metadata blocks: nodes and shortcuts.</div><div class='del'>-</div><div class='del'>-A node is an array of slots.  Each slot can contain one of four things:</div><div class='del'>-</div><div class='del'>- (*) A NULL pointer, indicating that the slot is empty.</div><div class='del'>-</div><div class='del'>- (*) A pointer to an object (a leaf).</div><div class='del'>-</div><div class='del'>- (*) A pointer to a node at the next level.</div><div class='del'>-</div><div class='del'>- (*) A pointer to a shortcut.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BASIC INTERNAL TREE LAYOUT</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-Ignoring shortcuts for the moment, the nodes form a multilevel tree.  The index</div><div class='del'>-key space is strictly subdivided by the nodes in the tree and nodes occur on</div><div class='del'>-fixed levels.  For example:</div><div class='del'>-</div><div class='del'>- Level:	0		1		2		3</div><div class='del'>-	===============	===============	===============	===============</div><div class='del'>-							NODE D</div><div class='del'>-			NODE B		NODE C	+------&gt;+---+</div><div class='del'>-		+------&gt;+---+	+------&gt;+---+	|	| 0 |</div><div class='del'>-	NODE A	|	| 0 |	|	| 0 |	|	+---+</div><div class='del'>-	+---+	|	+---+	|	+---+	|	:   :</div><div class='del'>-	| 0 |	|	:   :	|	:   :	|	+---+</div><div class='del'>-	+---+	|	+---+	|	+---+	|	| f |</div><div class='del'>-	| 1 |---+	| 3 |---+	| 7 |---+	+---+</div><div class='del'>-	+---+		+---+		+---+</div><div class='del'>-	:   :		:   :		| 8 |---+</div><div class='del'>-	+---+		+---+		+---+	|	NODE E</div><div class='del'>-	| e |---+	| f |		:   :   +------&gt;+---+</div><div class='del'>-	+---+	|	+---+		+---+		| 0 |</div><div class='del'>-	| f |	|			| f |		+---+</div><div class='del'>-	+---+	|			+---+		:   :</div><div class='del'>-		|	NODE F				+---+</div><div class='del'>-		+------&gt;+---+				| f |</div><div class='del'>-			| 0 |		NODE G		+---+</div><div class='del'>-			+---+	+------&gt;+---+</div><div class='del'>-			:   :	|	| 0 |</div><div class='del'>-			+---+	|	+---+</div><div class='del'>-			| 6 |---+	:   :</div><div class='del'>-			+---+		+---+</div><div class='del'>-			:   :		| f |</div><div class='del'>-			+---+		+---+</div><div class='del'>-			| f |</div><div class='del'>-			+---+</div><div class='del'>-</div><div class='del'>-In the above example, there are 7 nodes (A-G), each with 16 slots (0-f).</div><div class='del'>-Assuming no other meta data nodes in the tree, the key space is divided thusly:</div><div class='del'>-</div><div class='del'>-	KEY PREFIX	NODE</div><div class='del'>-	==========	====</div><div class='del'>-	137*		D</div><div class='del'>-	138*		E</div><div class='del'>-	13[0-69-f]*	C</div><div class='del'>-	1[0-24-f]*	B</div><div class='del'>-	e6*		G</div><div class='del'>-	e[0-57-f]*	F</div><div class='del'>-	[02-df]*	A</div><div class='del'>-</div><div class='del'>-So, for instance, keys with the following example index keys will be found in</div><div class='del'>-the appropriate nodes:</div><div class='del'>-</div><div class='del'>-	INDEX KEY	PREFIX	NODE</div><div class='del'>-	===============	=======	====</div><div class='del'>-	13694892892489	13	C</div><div class='del'>-	13795289025897	137	D</div><div class='del'>-	13889dde88793	138	E</div><div class='del'>-	138bbb89003093	138	E</div><div class='del'>-	1394879524789	12	C</div><div class='del'>-	1458952489	1	B</div><div class='del'>-	9431809de993ba	-	A</div><div class='del'>-	b4542910809cd	-	A</div><div class='del'>-	e5284310def98	e	F</div><div class='del'>-	e68428974237	e6	G</div><div class='del'>-	e7fffcbd443	e	F</div><div class='del'>-	f3842239082	-	A</div><div class='del'>-</div><div class='del'>-To save memory, if a node can hold all the leaves in its portion of keyspace,</div><div class='del'>-then the node will have all those leaves in it and will not have any metadata</div><div class='del'>-pointers - even if some of those leaves would like to be in the same slot.</div><div class='del'>-</div><div class='del'>-A node can contain a heterogeneous mix of leaves and metadata pointers.</div><div class='del'>-Metadata pointers must be in the slots that match their subdivisions of key</div><div class='del'>-space.  The leaves can be in any slot not occupied by a metadata pointer.  It</div><div class='del'>-is guaranteed that none of the leaves in a node will match a slot occupied by a</div><div class='del'>-metadata pointer.  If the metadata pointer is there, any leaf whose key matches</div><div class='del'>-the metadata key prefix must be in the subtree that the metadata pointer points</div><div class='del'>-to.</div><div class='del'>-</div><div class='del'>-In the above example list of index keys, node A will contain:</div><div class='del'>-</div><div class='del'>-	SLOT	CONTENT		INDEX KEY (PREFIX)</div><div class='del'>-	====	===============	==================</div><div class='del'>-	1	PTR TO NODE B	1*</div><div class='del'>-	any	LEAF		9431809de993ba</div><div class='del'>-	any	LEAF		b4542910809cd</div><div class='del'>-	e	PTR TO NODE F	e*</div><div class='del'>-	any	LEAF		f3842239082</div><div class='del'>-</div><div class='del'>-and node B:</div><div class='del'>-</div><div class='del'>-	3	PTR TO NODE C	13*</div><div class='del'>-	any	LEAF		1458952489</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SHORTCUTS</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-Shortcuts are metadata records that jump over a piece of keyspace.  A shortcut</div><div class='del'>-is a replacement for a series of single-occupancy nodes ascending through the</div><div class='del'>-levels.  Shortcuts exist to save memory and to speed up traversal.</div><div class='del'>-</div><div class='del'>-It is possible for the root of the tree to be a shortcut - say, for example,</div><div class='del'>-the tree contains at least 17 nodes all with key prefix '1111'.  The insertion</div><div class='del'>-algorithm will insert a shortcut to skip over the '1111' keyspace in a single</div><div class='del'>-bound and get to the fourth level where these actually become different.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SPLITTING AND COLLAPSING NODES</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-Each node has a maximum capacity of 16 leaves and metadata pointers.  If the</div><div class='del'>-insertion algorithm finds that it is trying to insert a 17th object into a</div><div class='del'>-node, that node will be split such that at least two leaves that have a common</div><div class='del'>-key segment at that level end up in a separate node rooted on that slot for</div><div class='del'>-that common key segment.</div><div class='del'>-</div><div class='del'>-If the leaves in a full node and the leaf that is being inserted are</div><div class='del'>-sufficiently similar, then a shortcut will be inserted into the tree.</div><div class='del'>-</div><div class='del'>-When the number of objects in the subtree rooted at a node falls to 16 or</div><div class='del'>-fewer, then the subtree will be collapsed down to a single node - and this will</div><div class='del'>-ripple towards the root if possible.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-NON-RECURSIVE ITERATION</div><div class='del'>------------------------</div><div class='del'>-</div><div class='del'>-Each node and shortcut contains a back pointer to its parent and the number of</div><div class='del'>-slot in that parent that points to it.  None-recursive iteration uses these to</div><div class='del'>-proceed rootwards through the tree, going to the parent node, slot N + 1 to</div><div class='del'>-make sure progress is made without the need for a stack.</div><div class='del'>-</div><div class='del'>-The backpointers, however, make simultaneous alteration and iteration tricky.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SIMULTANEOUS ALTERATION AND ITERATION</div><div class='del'>--------------------------------------</div><div class='del'>-</div><div class='del'>-There are a number of cases to consider:</div><div class='del'>-</div><div class='del'>- (1) Simple insert/replace.  This involves simply replacing a NULL or old</div><div class='del'>-     matching leaf pointer with the pointer to the new leaf after a barrier.</div><div class='del'>-     The metadata blocks don't change otherwise.  An old leaf won't be freed</div><div class='del'>-     until after the RCU grace period.</div><div class='del'>-</div><div class='del'>- (2) Simple delete.  This involves just clearing an old matching leaf.  The</div><div class='del'>-     metadata blocks don't change otherwise.  The old leaf won't be freed until</div><div class='del'>-     after the RCU grace period.</div><div class='del'>-</div><div class='del'>- (3) Insertion replacing part of a subtree that we haven't yet entered.  This</div><div class='del'>-     may involve replacement of part of that subtree - but that won't affect</div><div class='del'>-     the iteration as we won't have reached the pointer to it yet and the</div><div class='del'>-     ancestry blocks are not replaced (the layout of those does not change).</div><div class='del'>-</div><div class='del'>- (4) Insertion replacing nodes that we're actively processing.  This isn't a</div><div class='del'>-     problem as we've passed the anchoring pointer and won't switch onto the</div><div class='del'>-     new layout until we follow the back pointers - at which point we've</div><div class='del'>-     already examined the leaves in the replaced node (we iterate over all the</div><div class='del'>-     leaves in a node before following any of its metadata pointers).</div><div class='del'>-</div><div class='del'>-     We might, however, re-see some leaves that have been split out into a new</div><div class='del'>-     branch that's in a slot further along than we were at.</div><div class='del'>-</div><div class='del'>- (5) Insertion replacing nodes that we're processing a dependent branch of.</div><div class='del'>-     This won't affect us until we follow the back pointers.  Similar to (4).</div><div class='del'>-</div><div class='del'>- (6) Deletion collapsing a branch under us.  This doesn't affect us because the</div><div class='del'>-     back pointers will get us back to the parent of the new node before we</div><div class='del'>-     could see the new node.  The entire collapsed subtree is thrown away</div><div class='del'>-     unchanged - and will still be rooted on the same slot, so we shouldn't</div><div class='del'>-     process it a second time as we'll go back to slot + 1.</div><div class='del'>-</div><div class='del'>-Note:</div><div class='del'>-</div><div class='del'>- (*) Under some circumstances, we need to simultaneously change the parent</div><div class='del'>-     pointer and the parent slot pointer on a node (say, for example, we</div><div class='del'>-     inserted another node before it and moved it up a level).  We cannot do</div><div class='del'>-     this without locking against a read - so we have to replace that node too.</div><div class='del'>-</div><div class='del'>-     However, when we're changing a shortcut into a node this isn't a problem</div><div class='del'>-     as shortcuts only have one slot and so the parent slot number isn't used</div><div class='del'>-     when traversing backwards over one.  This means that it's okay to change</div><div class='del'>-     the slot number first - provided suitable barriers are used to make sure</div><div class='del'>-     the parent slot number is read after the back pointer.</div><div class='del'>-</div><div class='del'>-Obsolete blocks and leaves are freed up after an RCU grace period has passed,</div><div class='del'>-so as long as anyone doing walking or iteration holds the RCU read lock, the</div><div class='del'>-old superstructure should not go away on them.</div><div class='head'>diff --git a/Documentation/atomic_ops.txt b/Documentation/atomic_ops.txt<br/>deleted file mode 100644<br/>index c9d1cacb4395..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/atomic_ops.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/atomic_ops.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,640 +0,0 @@</div><div class='del'>-		Semantics and Behavior of Atomic and</div><div class='del'>-		         Bitmask Operations</div><div class='del'>-</div><div class='del'>-			  David S. Miller	 </div><div class='del'>-</div><div class='del'>-	This document is intended to serve as a guide to Linux port</div><div class='del'>-maintainers on how to implement atomic counter, bitops, and spinlock</div><div class='del'>-interfaces properly.</div><div class='del'>-</div><div class='del'>-	The atomic_t type should be defined as a signed integer and</div><div class='del'>-the atomic_long_t type as a signed long integer.  Also, they should</div><div class='del'>-be made opaque such that any kind of cast to a normal C integer type</div><div class='del'>-will fail.  Something like the following should suffice:</div><div class='del'>-</div><div class='del'>-	typedef struct { int counter; } atomic_t;</div><div class='del'>-	typedef struct { long counter; } atomic_long_t;</div><div class='del'>-</div><div class='del'>-Historically, counter has been declared volatile.  This is now discouraged.</div><div class='del'>-See Documentation/volatile-considered-harmful.txt for the complete rationale.</div><div class='del'>-</div><div class='del'>-local_t is very similar to atomic_t. If the counter is per CPU and only</div><div class='del'>-updated by one CPU, local_t is probably more appropriate. Please see</div><div class='del'>-Documentation/local_ops.txt for the semantics of local_t.</div><div class='del'>-</div><div class='del'>-The first operations to implement for atomic_t's are the initializers and</div><div class='del'>-plain reads.</div><div class='del'>-</div><div class='del'>-	#define ATOMIC_INIT(i)		{ (i) }</div><div class='del'>-	#define atomic_set(v, i)	((v)-&gt;counter = (i))</div><div class='del'>-</div><div class='del'>-The first macro is used in definitions, such as:</div><div class='del'>-</div><div class='del'>-static atomic_t my_counter = ATOMIC_INIT(1);</div><div class='del'>-</div><div class='del'>-The initializer is atomic in that the return values of the atomic operations</div><div class='del'>-are guaranteed to be correct reflecting the initialized value if the</div><div class='del'>-initializer is used before runtime.  If the initializer is used at runtime, a</div><div class='del'>-proper implicit or explicit read memory barrier is needed before reading the</div><div class='del'>-value with atomic_read from another thread.</div><div class='del'>-</div><div class='del'>-As with all of the atomic_ interfaces, replace the leading "atomic_"</div><div class='del'>-with "atomic_long_" to operate on atomic_long_t.</div><div class='del'>-</div><div class='del'>-The second interface can be used at runtime, as in:</div><div class='del'>-</div><div class='del'>-	struct foo { atomic_t counter; };</div><div class='del'>-	...</div><div class='del'>-</div><div class='del'>-	struct foo *k;</div><div class='del'>-</div><div class='del'>-	k = kmalloc(sizeof(*k), GFP_KERNEL);</div><div class='del'>-	if (!k)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	atomic_set(&amp;k-&gt;counter, 0);</div><div class='del'>-</div><div class='del'>-The setting is atomic in that the return values of the atomic operations by</div><div class='del'>-all threads are guaranteed to be correct reflecting either the value that has</div><div class='del'>-been set with this operation or set with another operation.  A proper implicit</div><div class='del'>-or explicit memory barrier is needed before the value set with the operation</div><div class='del'>-is guaranteed to be readable with atomic_read from another thread.</div><div class='del'>-</div><div class='del'>-Next, we have:</div><div class='del'>-</div><div class='del'>-	#define atomic_read(v)	((v)-&gt;counter)</div><div class='del'>-</div><div class='del'>-which simply reads the counter value currently visible to the calling thread.</div><div class='del'>-The read is atomic in that the return value is guaranteed to be one of the</div><div class='del'>-values initialized or modified with the interface operations if a proper</div><div class='del'>-implicit or explicit memory barrier is used after possible runtime</div><div class='del'>-initialization by any other thread and the value is modified only with the</div><div class='del'>-interface operations.  atomic_read does not guarantee that the runtime</div><div class='del'>-initialization by any other thread is visible yet, so the user of the</div><div class='del'>-interface must take care of that with a proper implicit or explicit memory</div><div class='del'>-barrier.</div><div class='del'>-</div><div class='del'>-*** WARNING: atomic_read() and atomic_set() DO NOT IMPLY BARRIERS! ***</div><div class='del'>-</div><div class='del'>-Some architectures may choose to use the volatile keyword, barriers, or inline</div><div class='del'>-assembly to guarantee some degree of immediacy for atomic_read() and</div><div class='del'>-atomic_set().  This is not uniformly guaranteed, and may change in the future,</div><div class='del'>-so all users of atomic_t should treat atomic_read() and atomic_set() as simple</div><div class='del'>-C statements that may be reordered or optimized away entirely by the compiler</div><div class='del'>-or processor, and explicitly invoke the appropriate compiler and/or memory</div><div class='del'>-barrier for each use case.  Failure to do so will result in code that may</div><div class='del'>-suddenly break when used with different architectures or compiler</div><div class='del'>-optimizations, or even changes in unrelated code which changes how the</div><div class='del'>-compiler optimizes the section accessing atomic_t variables.</div><div class='del'>-</div><div class='del'>-*** YOU HAVE BEEN WARNED! ***</div><div class='del'>-</div><div class='del'>-Properly aligned pointers, longs, ints, and chars (and unsigned</div><div class='del'>-equivalents) may be atomically loaded from and stored to in the same</div><div class='del'>-sense as described for atomic_read() and atomic_set().  The ACCESS_ONCE()</div><div class='del'>-macro should be used to prevent the compiler from using optimizations</div><div class='del'>-that might otherwise optimize accesses out of existence on the one hand,</div><div class='del'>-or that might create unsolicited accesses on the other.</div><div class='del'>-</div><div class='del'>-For example consider the following code:</div><div class='del'>-</div><div class='del'>-	while (a &gt; 0)</div><div class='del'>-		do_something();</div><div class='del'>-</div><div class='del'>-If the compiler can prove that do_something() does not store to the</div><div class='del'>-variable a, then the compiler is within its rights transforming this to</div><div class='del'>-the following:</div><div class='del'>-</div><div class='del'>-	tmp = a;</div><div class='del'>-	if (a &gt; 0)</div><div class='del'>-		for (;;)</div><div class='del'>-			do_something();</div><div class='del'>-</div><div class='del'>-If you don't want the compiler to do this (and you probably don't), then</div><div class='del'>-you should use something like the following:</div><div class='del'>-</div><div class='del'>-	while (ACCESS_ONCE(a) &lt; 0)</div><div class='del'>-		do_something();</div><div class='del'>-</div><div class='del'>-Alternatively, you could place a barrier() call in the loop.</div><div class='del'>-</div><div class='del'>-For another example, consider the following code:</div><div class='del'>-</div><div class='del'>-	tmp_a = a;</div><div class='del'>-	do_something_with(tmp_a);</div><div class='del'>-	do_something_else_with(tmp_a);</div><div class='del'>-</div><div class='del'>-If the compiler can prove that do_something_with() does not store to the</div><div class='del'>-variable a, then the compiler is within its rights to manufacture an</div><div class='del'>-additional load as follows:</div><div class='del'>-</div><div class='del'>-	tmp_a = a;</div><div class='del'>-	do_something_with(tmp_a);</div><div class='del'>-	tmp_a = a;</div><div class='del'>-	do_something_else_with(tmp_a);</div><div class='del'>-</div><div class='del'>-This could fatally confuse your code if it expected the same value</div><div class='del'>-to be passed to do_something_with() and do_something_else_with().</div><div class='del'>-</div><div class='del'>-The compiler would be likely to manufacture this additional load if</div><div class='del'>-do_something_with() was an inline function that made very heavy use</div><div class='del'>-of registers: reloading from variable a could save a flush to the</div><div class='del'>-stack and later reload.  To prevent the compiler from attacking your</div><div class='del'>-code in this manner, write the following:</div><div class='del'>-</div><div class='del'>-	tmp_a = ACCESS_ONCE(a);</div><div class='del'>-	do_something_with(tmp_a);</div><div class='del'>-	do_something_else_with(tmp_a);</div><div class='del'>-</div><div class='del'>-For a final example, consider the following code, assuming that the</div><div class='del'>-variable a is set at boot time before the second CPU is brought online</div><div class='del'>-and never changed later, so that memory barriers are not needed:</div><div class='del'>-</div><div class='del'>-	if (a)</div><div class='del'>-		b = 9;</div><div class='del'>-	else</div><div class='del'>-		b = 42;</div><div class='del'>-</div><div class='del'>-The compiler is within its rights to manufacture an additional store</div><div class='del'>-by transforming the above code into the following:</div><div class='del'>-</div><div class='del'>-	b = 42;</div><div class='del'>-	if (a)</div><div class='del'>-		b = 9;</div><div class='del'>-</div><div class='del'>-This could come as a fatal surprise to other code running concurrently</div><div class='del'>-that expected b to never have the value 42 if a was zero.  To prevent</div><div class='del'>-the compiler from doing this, write something like:</div><div class='del'>-</div><div class='del'>-	if (a)</div><div class='del'>-		ACCESS_ONCE(b) = 9;</div><div class='del'>-	else</div><div class='del'>-		ACCESS_ONCE(b) = 42;</div><div class='del'>-</div><div class='del'>-Don't even -think- about doing this without proper use of memory barriers,</div><div class='del'>-locks, or atomic operations if variable a can change at runtime!</div><div class='del'>-</div><div class='del'>-*** WARNING: ACCESS_ONCE() DOES NOT IMPLY A BARRIER! ***</div><div class='del'>-</div><div class='del'>-Now, we move onto the atomic operation interfaces typically implemented with</div><div class='del'>-the help of assembly code.</div><div class='del'>-</div><div class='del'>-	void atomic_add(int i, atomic_t *v);</div><div class='del'>-	void atomic_sub(int i, atomic_t *v);</div><div class='del'>-	void atomic_inc(atomic_t *v);</div><div class='del'>-	void atomic_dec(atomic_t *v);</div><div class='del'>-</div><div class='del'>-These four routines add and subtract integral values to/from the given</div><div class='del'>-atomic_t value.  The first two routines pass explicit integers by</div><div class='del'>-which to make the adjustment, whereas the latter two use an implicit</div><div class='del'>-adjustment value of "1".</div><div class='del'>-</div><div class='del'>-One very important aspect of these two routines is that they DO NOT</div><div class='del'>-require any explicit memory barriers.  They need only perform the</div><div class='del'>-atomic_t counter update in an SMP safe manner.</div><div class='del'>-</div><div class='del'>-Next, we have:</div><div class='del'>-</div><div class='del'>-	int atomic_inc_return(atomic_t *v);</div><div class='del'>-	int atomic_dec_return(atomic_t *v);</div><div class='del'>-</div><div class='del'>-These routines add 1 and subtract 1, respectively, from the given</div><div class='del'>-atomic_t and return the new counter value after the operation is</div><div class='del'>-performed.</div><div class='del'>-</div><div class='del'>-Unlike the above routines, it is required that these primitives</div><div class='del'>-include explicit memory barriers that are performed before and after</div><div class='del'>-the operation.  It must be done such that all memory operations before</div><div class='del'>-and after the atomic operation calls are strongly ordered with respect</div><div class='del'>-to the atomic operation itself.</div><div class='del'>-</div><div class='del'>-For example, it should behave as if a smp_mb() call existed both</div><div class='del'>-before and after the atomic operation.</div><div class='del'>-</div><div class='del'>-If the atomic instructions used in an implementation provide explicit</div><div class='del'>-memory barrier semantics which satisfy the above requirements, that is</div><div class='del'>-fine as well.</div><div class='del'>-</div><div class='del'>-Let's move on:</div><div class='del'>-</div><div class='del'>-	int atomic_add_return(int i, atomic_t *v);</div><div class='del'>-	int atomic_sub_return(int i, atomic_t *v);</div><div class='del'>-</div><div class='del'>-These behave just like atomic_{inc,dec}_return() except that an</div><div class='del'>-explicit counter adjustment is given instead of the implicit "1".</div><div class='del'>-This means that like atomic_{inc,dec}_return(), the memory barrier</div><div class='del'>-semantics are required.</div><div class='del'>-</div><div class='del'>-Next:</div><div class='del'>-</div><div class='del'>-	int atomic_inc_and_test(atomic_t *v);</div><div class='del'>-	int atomic_dec_and_test(atomic_t *v);</div><div class='del'>-</div><div class='del'>-These two routines increment and decrement by 1, respectively, the</div><div class='del'>-given atomic counter.  They return a boolean indicating whether the</div><div class='del'>-resulting counter value was zero or not.</div><div class='del'>-</div><div class='del'>-Again, these primitives provide explicit memory barrier semantics around</div><div class='del'>-the atomic operation.</div><div class='del'>-</div><div class='del'>-	int atomic_sub_and_test(int i, atomic_t *v);</div><div class='del'>-</div><div class='del'>-This is identical to atomic_dec_and_test() except that an explicit</div><div class='del'>-decrement is given instead of the implicit "1".  This primitive must</div><div class='del'>-provide explicit memory barrier semantics around the operation.</div><div class='del'>-</div><div class='del'>-	int atomic_add_negative(int i, atomic_t *v);</div><div class='del'>-</div><div class='del'>-The given increment is added to the given atomic counter value.  A boolean</div><div class='del'>-is return which indicates whether the resulting counter value is negative.</div><div class='del'>-This primitive must provide explicit memory barrier semantics around</div><div class='del'>-the operation.</div><div class='del'>-</div><div class='del'>-Then:</div><div class='del'>-</div><div class='del'>-	int atomic_xchg(atomic_t *v, int new);</div><div class='del'>-</div><div class='del'>-This performs an atomic exchange operation on the atomic variable v, setting</div><div class='del'>-the given new value.  It returns the old value that the atomic variable v had</div><div class='del'>-just before the operation.</div><div class='del'>-</div><div class='del'>-atomic_xchg must provide explicit memory barriers around the operation.</div><div class='del'>-</div><div class='del'>-	int atomic_cmpxchg(atomic_t *v, int old, int new);</div><div class='del'>-</div><div class='del'>-This performs an atomic compare exchange operation on the atomic value v,</div><div class='del'>-with the given old and new values. Like all atomic_xxx operations,</div><div class='del'>-atomic_cmpxchg will only satisfy its atomicity semantics as long as all</div><div class='del'>-other accesses of *v are performed through atomic_xxx operations.</div><div class='del'>-</div><div class='del'>-atomic_cmpxchg must provide explicit memory barriers around the operation,</div><div class='del'>-although if the comparison fails then no memory ordering guarantees are</div><div class='del'>-required.</div><div class='del'>-</div><div class='del'>-The semantics for atomic_cmpxchg are the same as those defined for 'cas'</div><div class='del'>-below.</div><div class='del'>-</div><div class='del'>-Finally:</div><div class='del'>-</div><div class='del'>-	int atomic_add_unless(atomic_t *v, int a, int u);</div><div class='del'>-</div><div class='del'>-If the atomic value v is not equal to u, this function adds a to v, and</div><div class='del'>-returns non zero. If v is equal to u then it returns zero. This is done as</div><div class='del'>-an atomic operation.</div><div class='del'>-</div><div class='del'>-atomic_add_unless must provide explicit memory barriers around the</div><div class='del'>-operation unless it fails (returns 0).</div><div class='del'>-</div><div class='del'>-atomic_inc_not_zero, equivalent to atomic_add_unless(v, 1, 0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-If a caller requires memory barrier semantics around an atomic_t</div><div class='del'>-operation which does not return a value, a set of interfaces are</div><div class='del'>-defined which accomplish this:</div><div class='del'>-</div><div class='del'>-	void smp_mb__before_atomic(void);</div><div class='del'>-	void smp_mb__after_atomic(void);</div><div class='del'>-</div><div class='del'>-For example, smp_mb__before_atomic() can be used like so:</div><div class='del'>-</div><div class='del'>-	obj-&gt;dead = 1;</div><div class='del'>-	smp_mb__before_atomic();</div><div class='del'>-	atomic_dec(&amp;obj-&gt;ref_count);</div><div class='del'>-</div><div class='del'>-It makes sure that all memory operations preceding the atomic_dec()</div><div class='del'>-call are strongly ordered with respect to the atomic counter</div><div class='del'>-operation.  In the above example, it guarantees that the assignment of</div><div class='del'>-"1" to obj-&gt;dead will be globally visible to other cpus before the</div><div class='del'>-atomic counter decrement.</div><div class='del'>-</div><div class='del'>-Without the explicit smp_mb__before_atomic() call, the</div><div class='del'>-implementation could legally allow the atomic counter update visible</div><div class='del'>-to other cpus before the "obj-&gt;dead = 1;" assignment.</div><div class='del'>-</div><div class='del'>-A missing memory barrier in the cases where they are required by the</div><div class='del'>-atomic_t implementation above can have disastrous results.  Here is</div><div class='del'>-an example, which follows a pattern occurring frequently in the Linux</div><div class='del'>-kernel.  It is the use of atomic counters to implement reference</div><div class='del'>-counting, and it works such that once the counter falls to zero it can</div><div class='del'>-be guaranteed that no other entity can be accessing the object:</div><div class='del'>-</div><div class='del'>-static void obj_list_add(struct obj *obj, struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	obj-&gt;active = 1;</div><div class='del'>-	list_add(&amp;obj-&gt;list, head);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void obj_list_del(struct obj *obj)</div><div class='del'>-{</div><div class='del'>-	list_del(&amp;obj-&gt;list);</div><div class='del'>-	obj-&gt;active = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void obj_destroy(struct obj *obj)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(obj-&gt;active);</div><div class='del'>-	kfree(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct obj *obj_list_peek(struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	if (!list_empty(head)) {</div><div class='del'>-		struct obj *obj;</div><div class='del'>-</div><div class='del'>-		obj = list_entry(head-&gt;next, struct obj, list);</div><div class='del'>-		atomic_inc(&amp;obj-&gt;refcnt);</div><div class='del'>-		return obj;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void obj_poke(void)</div><div class='del'>-{</div><div class='del'>-	struct obj *obj;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;global_list_lock);</div><div class='del'>-	obj = obj_list_peek(&amp;global_list);</div><div class='del'>-	spin_unlock(&amp;global_list_lock);</div><div class='del'>-</div><div class='del'>-	if (obj) {</div><div class='del'>-		obj-&gt;ops-&gt;poke(obj);</div><div class='del'>-		if (atomic_dec_and_test(&amp;obj-&gt;refcnt))</div><div class='del'>-			obj_destroy(obj);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void obj_timeout(struct obj *obj)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;global_list_lock);</div><div class='del'>-	obj_list_del(obj);</div><div class='del'>-	spin_unlock(&amp;global_list_lock);</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;obj-&gt;refcnt))</div><div class='del'>-		obj_destroy(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-(This is a simplification of the ARP queue management in the</div><div class='del'>- generic neighbour discover code of the networking.  Olaf Kirch</div><div class='del'>- found a bug wrt. memory barriers in kfree_skb() that exposed</div><div class='del'>- the atomic_t memory barrier requirements quite clearly.)</div><div class='del'>-</div><div class='del'>-Given the above scheme, it must be the case that the obj-&gt;active</div><div class='del'>-update done by the obj list deletion be visible to other processors</div><div class='del'>-before the atomic counter decrement is performed.</div><div class='del'>-</div><div class='del'>-Otherwise, the counter could fall to zero, yet obj-&gt;active would still</div><div class='del'>-be set, thus triggering the assertion in obj_destroy().  The error</div><div class='del'>-sequence looks like this:</div><div class='del'>-</div><div class='del'>-	cpu 0				cpu 1</div><div class='del'>-	obj_poke()			obj_timeout()</div><div class='del'>-	obj = obj_list_peek();</div><div class='del'>-	... gains ref to obj, refcnt=2</div><div class='del'>-					obj_list_del(obj);</div><div class='del'>-					obj-&gt;active = 0 ...</div><div class='del'>-					... visibility delayed ...</div><div class='del'>-					atomic_dec_and_test()</div><div class='del'>-					... refcnt drops to 1 ...</div><div class='del'>-	atomic_dec_and_test()</div><div class='del'>-	... refcount drops to 0 ...</div><div class='del'>-	obj_destroy()</div><div class='del'>-	BUG() triggers since obj-&gt;active</div><div class='del'>-	still seen as one</div><div class='del'>-					obj-&gt;active update visibility occurs</div><div class='del'>-</div><div class='del'>-With the memory barrier semantics required of the atomic_t operations</div><div class='del'>-which return values, the above sequence of memory visibility can never</div><div class='del'>-happen.  Specifically, in the above case the atomic_dec_and_test()</div><div class='del'>-counter decrement would not become globally visible until the</div><div class='del'>-obj-&gt;active update does.</div><div class='del'>-</div><div class='del'>-As a historical note, 32-bit Sparc used to only allow usage of</div><div class='del'>-24-bits of its atomic_t type.  This was because it used 8 bits</div><div class='del'>-as a spinlock for SMP safety.  Sparc32 lacked a "compare and swap"</div><div class='del'>-type instruction.  However, 32-bit Sparc has since been moved over</div><div class='del'>-to a "hash table of spinlocks" scheme, that allows the full 32-bit</div><div class='del'>-counter to be realized.  Essentially, an array of spinlocks are</div><div class='del'>-indexed into based upon the address of the atomic_t being operated</div><div class='del'>-on, and that lock protects the atomic operation.  Parisc uses the</div><div class='del'>-same scheme.</div><div class='del'>-</div><div class='del'>-Another note is that the atomic_t operations returning values are</div><div class='del'>-extremely slow on an old 386.</div><div class='del'>-</div><div class='del'>-We will now cover the atomic bitmask operations.  You will find that</div><div class='del'>-their SMP and memory barrier semantics are similar in shape and scope</div><div class='del'>-to the atomic_t ops above.</div><div class='del'>-</div><div class='del'>-Native atomic bit operations are defined to operate on objects aligned</div><div class='del'>-to the size of an "unsigned long" C data type, and are least of that</div><div class='del'>-size.  The endianness of the bits within each "unsigned long" are the</div><div class='del'>-native endianness of the cpu.</div><div class='del'>-</div><div class='del'>-	void set_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-	void clear_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-	void change_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-</div><div class='del'>-These routines set, clear, and change, respectively, the bit number</div><div class='del'>-indicated by "nr" on the bit mask pointed to by "ADDR".</div><div class='del'>-</div><div class='del'>-They must execute atomically, yet there are no implicit memory barrier</div><div class='del'>-semantics required of these interfaces.</div><div class='del'>-</div><div class='del'>-	int test_and_set_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-	int test_and_clear_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-	int test_and_change_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-</div><div class='del'>-Like the above, except that these routines return a boolean which</div><div class='del'>-indicates whether the changed bit was set _BEFORE_ the atomic bit</div><div class='del'>-operation.</div><div class='del'>-</div><div class='del'>-WARNING! It is incredibly important that the value be a boolean,</div><div class='del'>-ie. "0" or "1".  Do not try to be fancy and save a few instructions by</div><div class='del'>-declaring the above to return "long" and just returning something like</div><div class='del'>-"old_val &amp; mask" because that will not work.</div><div class='del'>-</div><div class='del'>-For one thing, this return value gets truncated to int in many code</div><div class='del'>-paths using these interfaces, so on 64-bit if the bit is set in the</div><div class='del'>-upper 32-bits then testers will never see that.</div><div class='del'>-</div><div class='del'>-One great example of where this problem crops up are the thread_info</div><div class='del'>-flag operations.  Routines such as test_and_set_ti_thread_flag() chop</div><div class='del'>-the return value into an int.  There are other places where things</div><div class='del'>-like this occur as well.</div><div class='del'>-</div><div class='del'>-These routines, like the atomic_t counter operations returning values,</div><div class='del'>-must provide explicit memory barrier semantics around their execution.</div><div class='del'>-All memory operations before the atomic bit operation call must be</div><div class='del'>-made visible globally before the atomic bit operation is made visible.</div><div class='del'>-Likewise, the atomic bit operation must be visible globally before any</div><div class='del'>-subsequent memory operation is made visible.  For example:</div><div class='del'>-</div><div class='del'>-	obj-&gt;dead = 1;</div><div class='del'>-	if (test_and_set_bit(0, &amp;obj-&gt;flags))</div><div class='del'>-		/* ... */;</div><div class='del'>-	obj-&gt;killed = 1;</div><div class='del'>-</div><div class='del'>-The implementation of test_and_set_bit() must guarantee that</div><div class='del'>-"obj-&gt;dead = 1;" is visible to cpus before the atomic memory operation</div><div class='del'>-done by test_and_set_bit() becomes visible.  Likewise, the atomic</div><div class='del'>-memory operation done by test_and_set_bit() must become visible before</div><div class='del'>-"obj-&gt;killed = 1;" is visible.</div><div class='del'>-</div><div class='del'>-Finally there is the basic operation:</div><div class='del'>-</div><div class='del'>-	int test_bit(unsigned long nr, __const__ volatile unsigned long *addr);</div><div class='del'>-</div><div class='del'>-Which returns a boolean indicating if bit "nr" is set in the bitmask</div><div class='del'>-pointed to by "addr".</div><div class='del'>-</div><div class='del'>-If explicit memory barriers are required around {set,clear}_bit() (which do</div><div class='del'>-not return a value, and thus does not need to provide memory barrier</div><div class='del'>-semantics), two interfaces are provided:</div><div class='del'>-</div><div class='del'>-	void smp_mb__before_atomic(void);</div><div class='del'>-	void smp_mb__after_atomic(void);</div><div class='del'>-</div><div class='del'>-They are used as follows, and are akin to their atomic_t operation</div><div class='del'>-brothers:</div><div class='del'>-</div><div class='del'>-	/* All memory operations before this call will</div><div class='del'>-	 * be globally visible before the clear_bit().</div><div class='del'>-	 */</div><div class='del'>-	smp_mb__before_atomic();</div><div class='del'>-	clear_bit( ... );</div><div class='del'>-</div><div class='del'>-	/* The clear_bit() will be visible before all</div><div class='del'>-	 * subsequent memory operations.</div><div class='del'>-	 */</div><div class='del'>-	 smp_mb__after_atomic();</div><div class='del'>-</div><div class='del'>-There are two special bitops with lock barrier semantics (acquire/release,</div><div class='del'>-same as spinlocks). These operate in the same way as their non-_lock/unlock</div><div class='del'>-postfixed variants, except that they are to provide acquire/release semantics,</div><div class='del'>-respectively. This means they can be used for bit_spin_trylock and</div><div class='del'>-bit_spin_unlock type operations without specifying any more barriers.</div><div class='del'>-</div><div class='del'>-	int test_and_set_bit_lock(unsigned long nr, unsigned long *addr);</div><div class='del'>-	void clear_bit_unlock(unsigned long nr, unsigned long *addr);</div><div class='del'>-	void __clear_bit_unlock(unsigned long nr, unsigned long *addr);</div><div class='del'>-</div><div class='del'>-The __clear_bit_unlock version is non-atomic, however it still implements</div><div class='del'>-unlock barrier semantics. This can be useful if the lock itself is protecting</div><div class='del'>-the other bits in the word.</div><div class='del'>-</div><div class='del'>-Finally, there are non-atomic versions of the bitmask operations</div><div class='del'>-provided.  They are used in contexts where some other higher-level SMP</div><div class='del'>-locking scheme is being used to protect the bitmask, and thus less</div><div class='del'>-expensive non-atomic operations may be used in the implementation.</div><div class='del'>-They have names similar to the above bitmask operation interfaces,</div><div class='del'>-except that two underscores are prefixed to the interface name.</div><div class='del'>-</div><div class='del'>-	void __set_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-	void __clear_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-	void __change_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-	int __test_and_set_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-	int __test_and_clear_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-	int __test_and_change_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='del'>-</div><div class='del'>-These non-atomic variants also do not require any special memory</div><div class='del'>-barrier semantics.</div><div class='del'>-</div><div class='del'>-The routines xchg() and cmpxchg() must provide the same exact</div><div class='del'>-memory-barrier semantics as the atomic and bit operations returning</div><div class='del'>-values.</div><div class='del'>-</div><div class='del'>-Note: If someone wants to use xchg(), cmpxchg() and their variants,</div><div class='del'>-linux/atomic.h should be included rather than asm/cmpxchg.h, unless</div><div class='del'>-the code is in arch/* and can take care of itself.</div><div class='del'>-</div><div class='del'>-Spinlocks and rwlocks have memory barrier expectations as well.</div><div class='del'>-The rule to follow is simple:</div><div class='del'>-</div><div class='del'>-1) When acquiring a lock, the implementation must make it globally</div><div class='del'>-   visible before any subsequent memory operation.</div><div class='del'>-</div><div class='del'>-2) When releasing a lock, the implementation must make it such that</div><div class='del'>-   all previous memory operations are globally visible before the</div><div class='del'>-   lock release.</div><div class='del'>-</div><div class='del'>-Which finally brings us to _atomic_dec_and_lock().  There is an</div><div class='del'>-architecture-neutral version implemented in lib/dec_and_lock.c,</div><div class='del'>-but most platforms will wish to optimize this in assembler.</div><div class='del'>-</div><div class='del'>-	int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);</div><div class='del'>-</div><div class='del'>-Atomically decrement the given counter, and if will drop to zero</div><div class='del'>-atomically acquire the given spinlock and perform the decrement</div><div class='del'>-of the counter to zero.  If it does not drop to zero, do nothing</div><div class='del'>-with the spinlock.</div><div class='del'>-</div><div class='del'>-It is actually pretty simple to get the memory barrier correct.</div><div class='del'>-Simply satisfy the spinlock grab requirements, which is make</div><div class='del'>-sure the spinlock operation is globally visible before any</div><div class='del'>-subsequent memory operation.</div><div class='del'>-</div><div class='del'>-We can demonstrate this operation more clearly if we define</div><div class='del'>-an abstract atomic operation:</div><div class='del'>-</div><div class='del'>-	long cas(long *mem, long old, long new);</div><div class='del'>-</div><div class='del'>-"cas" stands for "compare and swap".  It atomically:</div><div class='del'>-</div><div class='del'>-1) Compares "old" with the value currently at "mem".</div><div class='del'>-2) If they are equal, "new" is written to "mem".</div><div class='del'>-3) Regardless, the current value at "mem" is returned.</div><div class='del'>-</div><div class='del'>-As an example usage, here is what an atomic counter update</div><div class='del'>-might look like:</div><div class='del'>-</div><div class='del'>-void example_atomic_inc(long *counter)</div><div class='del'>-{</div><div class='del'>-	long old, new, ret;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		old = *counter;</div><div class='del'>-		new = old + 1;</div><div class='del'>-</div><div class='del'>-		ret = cas(counter, old, new);</div><div class='del'>-		if (ret == old)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-Let's use cas() in order to build a pseudo-C atomic_dec_and_lock():</div><div class='del'>-</div><div class='del'>-int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)</div><div class='del'>-{</div><div class='del'>-	long old, new, ret;</div><div class='del'>-	int went_to_zero;</div><div class='del'>-</div><div class='del'>-	went_to_zero = 0;</div><div class='del'>-	while (1) {</div><div class='del'>-		old = atomic_read(atomic);</div><div class='del'>-		new = old - 1;</div><div class='del'>-		if (new == 0) {</div><div class='del'>-			went_to_zero = 1;</div><div class='del'>-			spin_lock(lock);</div><div class='del'>-		}</div><div class='del'>-		ret = cas(atomic, old, new);</div><div class='del'>-		if (ret == old)</div><div class='del'>-			break;</div><div class='del'>-		if (went_to_zero) {</div><div class='del'>-			spin_unlock(lock);</div><div class='del'>-			went_to_zero = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return went_to_zero;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-Now, as far as memory barriers go, as long as spin_lock()</div><div class='del'>-strictly orders all subsequent memory operations (including</div><div class='del'>-the cas()) with respect to itself, things will be fine.</div><div class='del'>-</div><div class='del'>-Said another way, _atomic_dec_and_lock() must guarantee that</div><div class='del'>-a counter dropping to zero is never made visible before the</div><div class='del'>-spinlock being acquired.</div><div class='del'>-</div><div class='del'>-Note that this also means that for the case where the counter</div><div class='del'>-is not dropping to zero, there are no memory ordering</div><div class='del'>-requirements.</div><div class='head'>diff --git a/Documentation/bad_memory.txt b/Documentation/bad_memory.txt<br/>deleted file mode 100644<br/>index df8416213202..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/bad_memory.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/bad_memory.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-March 2008</div><div class='del'>-Jan-Simon Moeller, dl9pf@gmx.de</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-How to deal with bad memory e.g. reported by memtest86+ ?</div><div class='del'>-#########################################################</div><div class='del'>-</div><div class='del'>-There are three possibilities I know of:</div><div class='del'>-</div><div class='del'>-1) Reinsert/swap the memory modules</div><div class='del'>-</div><div class='del'>-2) Buy new modules (best!) or try to exchange the memory</div><div class='del'>-   if you have spare-parts</div><div class='del'>-</div><div class='del'>-3) Use BadRAM or memmap</div><div class='del'>-</div><div class='del'>-This Howto is about number 3) .</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BadRAM</div><div class='del'>-######</div><div class='del'>-BadRAM is the actively developed and available as kernel-patch</div><div class='del'>-here:  http://rick.vanrein.org/linux/badram/</div><div class='del'>-</div><div class='del'>-For more details see the BadRAM documentation.</div><div class='del'>-</div><div class='del'>-memmap</div><div class='del'>-######</div><div class='del'>-</div><div class='del'>-memmap is already in the kernel and usable as kernel-parameter at</div><div class='del'>-boot-time.  Its syntax is slightly strange and you may need to</div><div class='del'>-calculate the values by yourself!</div><div class='del'>-</div><div class='del'>-Syntax to exclude a memory area (see kernel-parameters.txt for details):</div><div class='del'>-memmap=&lt;size&gt;$&lt;address&gt;</div><div class='del'>-</div><div class='del'>-Example: memtest86+ reported here errors at address 0x18691458, 0x18698424 and</div><div class='del'>-         some others. All had 0x1869xxxx in common, so I chose a pattern of</div><div class='del'>-         0x18690000,0xffff0000.</div><div class='del'>-</div><div class='del'>-With the numbers of the example above:</div><div class='del'>-memmap=64K$0x18690000</div><div class='del'>- or</div><div class='del'>-memmap=0x10000$0x18690000</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/basic_profiling.txt b/Documentation/basic_profiling.txt<br/>deleted file mode 100644<br/>index 8764e9f70821..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/basic_profiling.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/basic_profiling.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-These instructions are deliberately very basic. If you want something clever,</div><div class='del'>-go read the real docs ;-) Please don't add more stuff, but feel free to </div><div class='del'>-correct my mistakes ;-)    (mbligh@aracnet.com)</div><div class='del'>-Thanks to John Levon, Dave Hansen, et al. for help writing this.</div><div class='del'>-</div><div class='del'>-&lt;test&gt; is the thing you're trying to measure.</div><div class='del'>-Make sure you have the correct System.map / vmlinux referenced!</div><div class='del'>-</div><div class='del'>-It is probably easiest to use "make install" for linux and hack</div><div class='del'>-/sbin/installkernel to copy vmlinux to /boot, in addition to vmlinuz,</div><div class='del'>-config, System.map, which are usually installed by default.</div><div class='del'>-</div><div class='del'>-Readprofile</div><div class='del'>------------</div><div class='del'>-A recent readprofile command is needed for 2.6, such as found in util-linux</div><div class='del'>-2.12a, which can be downloaded from:</div><div class='del'>-</div><div class='del'>-http://www.kernel.org/pub/linux/utils/util-linux/</div><div class='del'>-</div><div class='del'>-Most distributions will ship it already.</div><div class='del'>-</div><div class='del'>-Add "profile=2" to the kernel command line.</div><div class='del'>-</div><div class='del'>-clear		readprofile -r</div><div class='del'>-		&lt;test&gt;</div><div class='del'>-dump output	readprofile -m /boot/System.map &gt; captured_profile</div><div class='del'>-</div><div class='del'>-Oprofile</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-Get the source (see Changes for required version) from</div><div class='del'>-http://oprofile.sourceforge.net/ and add "idle=poll" to the kernel command</div><div class='del'>-line.</div><div class='del'>-</div><div class='del'>-Configure with CONFIG_PROFILING=y and CONFIG_OPROFILE=y &amp; reboot on new kernel</div><div class='del'>-</div><div class='del'>-./configure --with-kernel-support</div><div class='del'>-make install</div><div class='del'>-</div><div class='del'>-For superior results, be sure to enable the local APIC. If opreport sees</div><div class='del'>-a 0Hz CPU, APIC was not on. Be aware that idle=poll may mean a performance</div><div class='del'>-penalty.</div><div class='del'>-</div><div class='del'>-One time setup:</div><div class='del'>-		opcontrol --setup --vmlinux=/boot/vmlinux</div><div class='del'>-</div><div class='del'>-clear		opcontrol --reset</div><div class='del'>-start		opcontrol --start</div><div class='del'>-		&lt;test&gt;</div><div class='del'>-stop		opcontrol --stop</div><div class='del'>-dump output	opreport &gt;  output_file</div><div class='del'>-</div><div class='del'>-To only report on the kernel, run opreport -l /boot/vmlinux &gt; output_file</div><div class='del'>-</div><div class='del'>-A reset is needed to clear old statistics, which survive a reboot.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/binfmt_misc.txt b/Documentation/binfmt_misc.txt<br/>deleted file mode 100644<br/>index ec83bbce547a..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/binfmt_misc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/binfmt_misc.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-     Kernel Support for miscellaneous (your favourite) Binary Formats v1.1</div><div class='del'>-     =====================================================================</div><div class='del'>-</div><div class='del'>-This Kernel feature allows you to invoke almost (for restrictions see below)</div><div class='del'>-every program by simply typing its name in the shell.</div><div class='del'>-This includes for example compiled Java(TM), Python or Emacs programs.</div><div class='del'>-</div><div class='del'>-To achieve this you must tell binfmt_misc which interpreter has to be invoked</div><div class='del'>-with which binary. Binfmt_misc recognises the binary-type by matching some bytes</div><div class='del'>-at the beginning of the file with a magic byte sequence (masking out specified</div><div class='del'>-bits) you have supplied. Binfmt_misc can also recognise a filename extension</div><div class='del'>-aka '.com' or '.exe'.</div><div class='del'>-</div><div class='del'>-First you must mount binfmt_misc:</div><div class='del'>-	mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc </div><div class='del'>-</div><div class='del'>-To actually register a new binary type, you have to set up a string looking like</div><div class='del'>-:name:type:offset:magic:mask:interpreter:flags (where you can choose the ':'</div><div class='del'>-upon your needs) and echo it to /proc/sys/fs/binfmt_misc/register.</div><div class='del'>-</div><div class='del'>-Here is what the fields mean:</div><div class='del'>- - 'name' is an identifier string. A new /proc file will be created with this</div><div class='del'>-   name below /proc/sys/fs/binfmt_misc; cannot contain slashes '/' for obvious</div><div class='del'>-   reasons.</div><div class='del'>- - 'type' is the type of recognition. Give 'M' for magic and 'E' for extension.</div><div class='del'>- - 'offset' is the offset of the magic/mask in the file, counted in bytes. This</div><div class='del'>-   defaults to 0 if you omit it (i.e. you write ':name:type::magic...'). Ignored</div><div class='del'>-   when using filename extension matching.</div><div class='del'>- - 'magic' is the byte sequence binfmt_misc is matching for. The magic string</div><div class='del'>-   may contain hex-encoded characters like \x0a or \xA4. Note that you must</div><div class='del'>-   escape any NUL bytes; parsing halts at the first one. In a shell environment</div><div class='del'>-   you might have to write \\x0a to prevent the shell from eating your \.</div><div class='del'>-   If you chose filename extension matching, this is the extension to be</div><div class='del'>-   recognised (without the '.', the \x0a specials are not allowed). Extension</div><div class='del'>-   matching is case sensitive, and slashes '/' are not allowed!</div><div class='del'>- - 'mask' is an (optional, defaults to all 0xff) mask. You can mask out some</div><div class='del'>-   bits from matching by supplying a string like magic and as long as magic.</div><div class='del'>-   The mask is anded with the byte sequence of the file. Note that you must</div><div class='del'>-   escape any NUL bytes; parsing halts at the first one. Ignored when using</div><div class='del'>-   filename extension matching.</div><div class='del'>- - 'interpreter' is the program that should be invoked with the binary as first</div><div class='del'>-   argument (specify the full path)</div><div class='del'>- - 'flags' is an optional field that controls several aspects of the invocation</div><div class='del'>-   of the interpreter. It is a string of capital letters, each controls a</div><div class='del'>-   certain aspect. The following flags are supported -</div><div class='del'>-      'P' - preserve-argv[0]. Legacy behavior of binfmt_misc is to overwrite</div><div class='del'>-            the original argv[0] with the full path to the binary. When this</div><div class='del'>-            flag is included, binfmt_misc will add an argument to the argument</div><div class='del'>-            vector for this purpose, thus preserving the original argv[0].</div><div class='del'>-            e.g. If your interp is set to /bin/foo and you run `blah` (which is</div><div class='del'>-            in /usr/local/bin), then the kernel will execute /bin/foo with</div><div class='del'>-            argv[] set to ["/bin/foo", "/usr/local/bin/blah", "blah"].  The</div><div class='del'>-            interp has to be aware of this so it can execute /usr/local/bin/blah</div><div class='del'>-            with argv[] set to ["blah"].</div><div class='del'>-      'O' - open-binary. Legacy behavior of binfmt_misc is to pass the full path</div><div class='del'>-            of the binary to the interpreter as an argument. When this flag is</div><div class='del'>-            included, binfmt_misc will open the file for reading and pass its</div><div class='del'>-            descriptor as an argument, instead of the full path, thus allowing</div><div class='del'>-            the interpreter to execute non-readable binaries. This feature</div><div class='del'>-            should be used with care - the interpreter has to be trusted not to</div><div class='del'>-            emit the contents of the non-readable binary.</div><div class='del'>-      'C' - credentials. Currently, the behavior of binfmt_misc is to calculate</div><div class='del'>-            the credentials and security token of the new process according to</div><div class='del'>-            the interpreter. When this flag is included, these attributes are</div><div class='del'>-            calculated according to the binary. It also implies the 'O' flag.</div><div class='del'>-            This feature should be used with care as the interpreter</div><div class='del'>-            will run with root permissions when a setuid binary owned by root</div><div class='del'>-            is run with binfmt_misc.</div><div class='del'>-      'F' - fix binary.  The usual behaviour of binfmt_misc is to spawn the</div><div class='del'>-      	    binary lazily when the misc format file is invoked.  However,</div><div class='del'>-	    this doesn't work very well in the face of mount namespaces and</div><div class='del'>-	    changeroots, so the F mode opens the binary as soon as the</div><div class='del'>-	    emulation is installed and uses the opened image to spawn the</div><div class='del'>-	    emulator, meaning it is always available once installed,</div><div class='del'>-	    regardless of how the environment changes.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-There are some restrictions:</div><div class='del'>- - the whole register string may not exceed 1920 characters</div><div class='del'>- - the magic must reside in the first 128 bytes of the file, i.e.</div><div class='del'>-   offset+size(magic) has to be less than 128</div><div class='del'>- - the interpreter string may not exceed 127 characters</div><div class='del'>-</div><div class='del'>-To use binfmt_misc you have to mount it first. You can mount it with</div><div class='del'>-"mount -t binfmt_misc none /proc/sys/fs/binfmt_misc" command, or you can add</div><div class='del'>-a line "none  /proc/sys/fs/binfmt_misc binfmt_misc defaults 0 0" to your</div><div class='del'>-/etc/fstab so it auto mounts on boot.</div><div class='del'>-</div><div class='del'>-You may want to add the binary formats in one of your /etc/rc scripts during</div><div class='del'>-boot-up. Read the manual of your init program to figure out how to do this</div><div class='del'>-right.</div><div class='del'>-</div><div class='del'>-Think about the order of adding entries! Later added entries are matched first!</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-A few examples (assumed you are in /proc/sys/fs/binfmt_misc):</div><div class='del'>-</div><div class='del'>-- enable support for em86 (like binfmt_em86, for Alpha AXP only):</div><div class='del'>-  echo ':i386:M::\x7fELF\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/bin/em86:' &gt; register</div><div class='del'>-  echo ':i486:M::\x7fELF\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/bin/em86:' &gt; register</div><div class='del'>-</div><div class='del'>-- enable support for packed DOS applications (pre-configured dosemu hdimages):</div><div class='del'>-  echo ':DEXE:M::\x0eDEX::/usr/bin/dosexec:' &gt; register</div><div class='del'>-</div><div class='del'>-- enable support for Windows executables using wine:</div><div class='del'>-  echo ':DOSWin:M::MZ::/usr/local/bin/wine:' &gt; register</div><div class='del'>-</div><div class='del'>-For java support see Documentation/java.txt</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-You can enable/disable binfmt_misc or one binary type by echoing 0 (to disable)</div><div class='del'>-or 1 (to enable) to /proc/sys/fs/binfmt_misc/status or /proc/.../the_name.</div><div class='del'>-Catting the file tells you the current status of binfmt_misc/the entry.</div><div class='del'>-</div><div class='del'>-You can remove one entry or all entries by echoing -1 to /proc/.../the_name</div><div class='del'>-or /proc/sys/fs/binfmt_misc/status.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-HINTS:</div><div class='del'>-======</div><div class='del'>-</div><div class='del'>-If you want to pass special arguments to your interpreter, you can</div><div class='del'>-write a wrapper script for it. See Documentation/java.txt for an</div><div class='del'>-example.</div><div class='del'>-</div><div class='del'>-Your interpreter should NOT look in the PATH for the filename; the kernel</div><div class='del'>-passes it the full filename (or the file descriptor) to use.  Using $PATH can</div><div class='del'>-cause unexpected behaviour and can be a security hazard.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Richard Günther &lt;rguenth@tat.physik.uni-tuebingen.de&gt;</div><div class='head'>diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt<br/>index 918e1e0d0e78..01ddeaf64b0f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/block/biodoc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/block/biodoc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/block/biodoc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/block/biodoc.txt</a></div><div class='hunk'>@@ -348,7 +348,7 @@ Drivers can now specify a request prepare function (q-&gt;prep_rq_fn) that the</div><div class='ctx'> block layer would invoke to pre-build device commands for a given request,</div><div class='ctx'> or perform other preparatory processing for the request. This is routine is</div><div class='ctx'> called by elv_next_request(), i.e. typically just before servicing a request.</div><div class='del'>-(The prepare function would not be called for requests that have REQ_DONTPREP</div><div class='add'>+(The prepare function would not be called for requests that have RQF_DONTPREP</div><div class='ctx'> enabled)</div><div class='ctx'> </div><div class='ctx'> Aside:</div><div class='hunk'>@@ -553,8 +553,8 @@ struct request {</div><div class='ctx'> 	struct request_list *rl;</div><div class='ctx'> }</div><div class='ctx'> 	</div><div class='del'>-See the rq_flag_bits definitions for an explanation of the various flags</div><div class='del'>-available. Some bits are used by the block layer or i/o scheduler.</div><div class='add'>+See the req_ops and req_flag_bits definitions for an explanation of the various</div><div class='add'>+flags available. Some bits are used by the block layer or i/o scheduler.</div><div class='ctx'> 	</div><div class='ctx'> The behaviour of the various sector counts are almost the same as before,</div><div class='ctx'> except that since we have multi-segment bios, current_nr_sectors refers</div><div class='head'>diff --git a/Documentation/block/cfq-iosched.txt b/Documentation/block/cfq-iosched.txt<br/>index 1e4f835a659d..895bd3813115 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/block/cfq-iosched.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/block/cfq-iosched.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/block/cfq-iosched.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/block/cfq-iosched.txt</a></div><div class='hunk'>@@ -240,11 +240,11 @@ All cfq queues doing synchronous sequential IO go on to sync-idle tree.</div><div class='ctx'> On this tree we idle on each queue individually.</div><div class='ctx'> </div><div class='ctx'> All synchronous non-sequential queues go on sync-noidle tree. Also any</div><div class='del'>-request which are marked with REQ_NOIDLE go on this service tree. On this</div><div class='del'>-tree we do not idle on individual queues instead idle on the whole group</div><div class='del'>-of queues or the tree. So if there are 4 queues waiting for IO to dispatch</div><div class='del'>-we will idle only once last queue has dispatched the IO and there is</div><div class='del'>-no more IO on this service tree.</div><div class='add'>+synchronous write request which is not marked with REQ_IDLE goes on this</div><div class='add'>+service tree. On this tree we do not idle on individual queues instead idle</div><div class='add'>+on the whole group of queues or the tree. So if there are 4 queues waiting</div><div class='add'>+for IO to dispatch we will idle only once last queue has dispatched the IO</div><div class='add'>+and there is no more IO on this service tree.</div><div class='ctx'> </div><div class='ctx'> All async writes go on async service tree. There is no idling on async</div><div class='ctx'> queues.</div><div class='hunk'>@@ -257,17 +257,17 @@ tree idling provides isolation with buffered write queues on async tree.</div><div class='ctx'> </div><div class='ctx'> FAQ</div><div class='ctx'> ===</div><div class='del'>-Q1. Why to idle at all on queues marked with REQ_NOIDLE.</div><div class='add'>+Q1. Why to idle at all on queues not marked with REQ_IDLE.</div><div class='ctx'> </div><div class='del'>-A1. We only do tree idle (all queues on sync-noidle tree) on queues marked</div><div class='del'>-    with REQ_NOIDLE. This helps in providing isolation with all the sync-idle</div><div class='add'>+A1. We only do tree idle (all queues on sync-noidle tree) on queues not marked</div><div class='add'>+    with REQ_IDLE. This helps in providing isolation with all the sync-idle</div><div class='ctx'>     queues. Otherwise in presence of many sequential readers, other</div><div class='ctx'>     synchronous IO might not get fair share of disk.</div><div class='ctx'> </div><div class='ctx'>     For example, if there are 10 sequential readers doing IO and they get</div><div class='del'>-    100ms each. If a REQ_NOIDLE request comes in, it will be scheduled</div><div class='del'>-    roughly after 1 second. If after completion of REQ_NOIDLE request we</div><div class='del'>-    do not idle, and after a couple of milli seconds a another REQ_NOIDLE</div><div class='add'>+    100ms each. If a !REQ_IDLE request comes in, it will be scheduled</div><div class='add'>+    roughly after 1 second. If after completion of !REQ_IDLE request we</div><div class='add'>+    do not idle, and after a couple of milli seconds a another !REQ_IDLE</div><div class='ctx'>     request comes in, again it will be scheduled after 1second. Repeat it</div><div class='ctx'>     and notice how a workload can lose its disk share and suffer due to</div><div class='ctx'>     multiple sequential readers.</div><div class='hunk'>@@ -276,16 +276,16 @@ A1. We only do tree idle (all queues on sync-noidle tree) on queues marked</div><div class='ctx'>     context of fsync, and later some journaling data is written. Journaling</div><div class='ctx'>     data comes in only after fsync has finished its IO (atleast for ext4</div><div class='ctx'>     that seemed to be the case). Now if one decides not to idle on fsync</div><div class='del'>-    thread due to REQ_NOIDLE, then next journaling write will not get</div><div class='add'>+    thread due to !REQ_IDLE, then next journaling write will not get</div><div class='ctx'>     scheduled for another second. A process doing small fsync, will suffer</div><div class='ctx'>     badly in presence of multiple sequential readers.</div><div class='ctx'> </div><div class='del'>-    Hence doing tree idling on threads using REQ_NOIDLE flag on requests</div><div class='add'>+    Hence doing tree idling on threads using !REQ_IDLE flag on requests</div><div class='ctx'>     provides isolation from multiple sequential readers and at the same</div><div class='ctx'>     time we do not idle on individual threads.</div><div class='ctx'> </div><div class='del'>-Q2. When to specify REQ_NOIDLE</div><div class='del'>-A2. I would think whenever one is doing synchronous write and not expecting</div><div class='add'>+Q2. When to specify REQ_IDLE</div><div class='add'>+A2. I would think whenever one is doing synchronous write and expecting</div><div class='ctx'>     more writes to be dispatched from same context soon, should be able</div><div class='del'>-    to specify REQ_NOIDLE on writes and that probably should work well for</div><div class='add'>+    to specify REQ_IDLE on writes and that probably should work well for</div><div class='ctx'>     most of the cases.</div><div class='head'>diff --git a/Documentation/block/null_blk.txt b/Documentation/block/null_blk.txt<br/>index d8880ca30af4..3140dbd860d8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/block/null_blk.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/block/null_blk.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/block/null_blk.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/block/null_blk.txt</a></div><div class='hunk'>@@ -72,4 +72,4 @@ use_per_node_hctx=[0/1]: Default: 0</div><div class='ctx'>      queue for each CPU node in the system.</div><div class='ctx'> </div><div class='ctx'> use_lightnvm=[0/1]: Default: 0</div><div class='del'>-  Register device with LightNVM. Requires blk-mq to be used.</div><div class='add'>+  Register device with LightNVM. Requires blk-mq and CONFIG_NVM to be enabled.</div><div class='head'>diff --git a/Documentation/block/pr.txt b/Documentation/block/pr.txt<br/>index d3eb1ca65051..ac9b8e70e64b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/block/pr.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/block/pr.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/block/pr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/block/pr.txt</a></div><div class='hunk'>@@ -90,7 +90,7 @@ and thus removes any access restriction implied by it.</div><div class='ctx'> 4. IOC_PR_PREEMPT</div><div class='ctx'> </div><div class='ctx'> This ioctl command releases the existing reservation referred to by</div><div class='del'>-old_key and replaces it with a a new reservation of type for the</div><div class='add'>+old_key and replaces it with a new reservation of type for the</div><div class='ctx'> reservation key new_key.</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/block/queue-sysfs.txt b/Documentation/block/queue-sysfs.txt<br/>index 2a3904030dea..c0a3bb5a6e4e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/block/queue-sysfs.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/block/queue-sysfs.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/block/queue-sysfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/block/queue-sysfs.txt</a></div><div class='hunk'>@@ -54,9 +54,23 @@ This is the hardware sector size of the device, in bytes.</div><div class='ctx'> </div><div class='ctx'> io_poll (RW)</div><div class='ctx'> ------------</div><div class='del'>-When read, this file shows the total number of block IO polls and how</div><div class='del'>-many returned success.  Writing '0' to this file will disable polling</div><div class='del'>-for this device.  Writing any non-zero value will enable this feature.</div><div class='add'>+When read, this file shows whether polling is enabled (1) or disabled</div><div class='add'>+(0).  Writing '0' to this file will disable polling for this device.</div><div class='add'>+Writing any non-zero value will enable this feature.</div><div class='add'>+</div><div class='add'>+io_poll_delay (RW)</div><div class='add'>+------------------</div><div class='add'>+If polling is enabled, this controls what kind of polling will be</div><div class='add'>+performed. It defaults to -1, which is classic polling. In this mode,</div><div class='add'>+the CPU will repeatedly ask for completions without giving up any time.</div><div class='add'>+If set to 0, a hybrid polling mode is used, where the kernel will attempt</div><div class='add'>+to make an educated guess at when the IO will complete. Based on this</div><div class='add'>+guess, the kernel will put the process issuing IO to sleep for an amount</div><div class='add'>+of time, before entering a classic poll loop. This mode might be a</div><div class='add'>+little slower than pure classic polling, but it will be more efficient.</div><div class='add'>+If set to a value larger than 0, the kernel will put the process issuing</div><div class='add'>+IO to sleep for this amont of microseconds before entering classic</div><div class='add'>+polling.</div><div class='ctx'> </div><div class='ctx'> iostats (RW)</div><div class='ctx'> -------------</div><div class='hunk'>@@ -169,5 +183,14 @@ This is the number of bytes the device can write in a single write-same</div><div class='ctx'> command.  A value of '0' means write-same is not supported by this</div><div class='ctx'> device.</div><div class='ctx'> </div><div class='add'>+wb_lat_usec (RW)</div><div class='add'>+----------------</div><div class='add'>+If the device is registered for writeback throttling, then this file shows</div><div class='add'>+the target minimum read latency. If this latency is exceeded in a given</div><div class='add'>+window of time (see wb_window_usec), then the writeback throttling will start</div><div class='add'>+scaling back writes. Writing a value of '0' to this file disables the</div><div class='add'>+feature. Writing a value of '-1' to this file resets the value to the</div><div class='add'>+default setting.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Jens Axboe &lt;jens.axboe@oracle.com&gt;, February 2009</div><div class='head'>diff --git a/Documentation/blockdev/cciss.txt b/Documentation/blockdev/cciss.txt<br/>index b79d0a13e7cd..3a5477cc456e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/blockdev/cciss.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/blockdev/cciss.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/blockdev/cciss.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/blockdev/cciss.txt</a></div><div class='hunk'>@@ -184,7 +184,7 @@ infrequently used and the primary purpose of Smart Array controllers is to</div><div class='ctx'> act as a RAID controller for disk drives, so the vast majority of commands</div><div class='ctx'> are allocated for disk devices.  However, if you have more than a few tape</div><div class='ctx'> drives attached to a smart array, the default number of commands may not be</div><div class='del'>-enought (for example, if you have 8 tape drives, you could only rewind 6</div><div class='add'>+enough (for example, if you have 8 tape drives, you could only rewind 6</div><div class='ctx'> at one time with the default number of commands.)  The cciss_tape_cmds module</div><div class='ctx'> parameter allows more commands (up to 16 more) to be allocated for use by</div><div class='ctx'> tape drives.  For example:</div><div class='head'>diff --git a/Documentation/blockdev/mflash.txt b/Documentation/blockdev/mflash.txt<br/>index 1f610ecf698a..f7e050551487 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/blockdev/mflash.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/blockdev/mflash.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/blockdev/mflash.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/blockdev/mflash.txt</a></div><div class='hunk'>@@ -17,7 +17,7 @@ driver and currently works well under standard IDE subsystem. Actually it's</div><div class='ctx'> one chip SSD. IO mode is ATA-like custom mode for the host that doesn't have</div><div class='ctx'> IDE interface.</div><div class='ctx'> </div><div class='del'>-Followings are brief descriptions about IO mode.</div><div class='add'>+Following are brief descriptions about IO mode.</div><div class='ctx'> A. IO mode based on ATA protocol and uses some custom command. (read confirm,</div><div class='ctx'> write confirm)</div><div class='ctx'> B. IO mode uses SRAM bus interface.</div><div class='head'>diff --git a/Documentation/blockdev/ramdisk.txt b/Documentation/blockdev/ramdisk.txt<br/>index fe2ef978d85a..501e12e0323e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/blockdev/ramdisk.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/blockdev/ramdisk.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/blockdev/ramdisk.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/blockdev/ramdisk.txt</a></div><div class='hunk'>@@ -14,7 +14,7 @@ Contents:</div><div class='ctx'> </div><div class='ctx'> The RAM disk driver is a way to use main system memory as a block device.  It</div><div class='ctx'> is required for initrd, an initial filesystem used if you need to load modules</div><div class='del'>-in order to access the root filesystem (see Documentation/initrd.txt).  It can</div><div class='add'>+in order to access the root filesystem (see Documentation/admin-guide/initrd.rst).  It can</div><div class='ctx'> also be used for a temporary filesystem for crypto work, since the contents</div><div class='ctx'> are erased on reboot.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/blockdev/zram.txt b/Documentation/blockdev/zram.txt<br/>index 0535ae1f73e5..4fced8a21307 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/blockdev/zram.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/blockdev/zram.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/blockdev/zram.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/blockdev/zram.txt</a></div><div class='hunk'>@@ -161,42 +161,14 @@ Name            access            description</div><div class='ctx'> disksize          RW    show and set the device's disk size</div><div class='ctx'> initstate         RO    shows the initialization state of the device</div><div class='ctx'> reset             WO    trigger device reset</div><div class='del'>-num_reads         RO    the number of reads</div><div class='del'>-failed_reads      RO    the number of failed reads</div><div class='del'>-num_write         RO    the number of writes</div><div class='del'>-failed_writes     RO    the number of failed writes</div><div class='del'>-invalid_io        RO    the number of non-page-size-aligned I/O requests</div><div class='add'>+mem_used_max      WO    reset the `mem_used_max' counter (see later)</div><div class='add'>+mem_limit         WO    specifies the maximum amount of memory ZRAM can use</div><div class='add'>+                        to store the compressed data</div><div class='ctx'> max_comp_streams  RW    the number of possible concurrent compress operations</div><div class='ctx'> comp_algorithm    RW    show and change the compression algorithm</div><div class='del'>-notify_free       RO    the number of notifications to free pages (either</div><div class='del'>-                        slot free notifications or REQ_DISCARD requests)</div><div class='del'>-zero_pages        RO    the number of zero filled pages written to this disk</div><div class='del'>-orig_data_size    RO    uncompressed size of data stored in this disk</div><div class='del'>-compr_data_size   RO    compressed size of data stored in this disk</div><div class='del'>-mem_used_total    RO    the amount of memory allocated for this disk</div><div class='del'>-mem_used_max      RW    the maximum amount of memory zram have consumed to</div><div class='del'>-                        store the data (to reset this counter to the actual</div><div class='del'>-                        current value, write 1 to this attribute)</div><div class='del'>-mem_limit         RW    the maximum amount of memory ZRAM can use to store</div><div class='del'>-                        the compressed data</div><div class='del'>-pages_compacted   RO    the number of pages freed during compaction</div><div class='del'>-                        (available only via zram&lt;id&gt;/mm_stat node)</div><div class='ctx'> compact           WO    trigger memory compaction</div><div class='ctx'> debug_stat        RO    this file is used for zram debugging purposes</div><div class='ctx'> </div><div class='del'>-WARNING</div><div class='del'>-=======</div><div class='del'>-per-stat sysfs attributes are considered to be deprecated.</div><div class='del'>-The basic strategy is:</div><div class='del'>--- the existing RW nodes will be downgraded to WO nodes (in linux 4.11)</div><div class='del'>--- deprecated RO sysfs nodes will eventually be removed (in linux 4.11)</div><div class='del'>-</div><div class='del'>-The list of deprecated attributes can be found here:</div><div class='del'>-Documentation/ABI/obsolete/sysfs-block-zram</div><div class='del'>-</div><div class='del'>-Basically, every attribute that has its own read accessible sysfs node</div><div class='del'>-(e.g. num_reads) *AND* is accessible via one of the stat files (zram&lt;id&gt;/stat</div><div class='del'>-or zram&lt;id&gt;/io_stat or zram&lt;id&gt;/mm_stat) is considered to be deprecated.</div><div class='ctx'> </div><div class='ctx'> User space is advised to use the following files to read the device statistics.</div><div class='ctx'> </div><div class='hunk'>@@ -211,22 +183,40 @@ The stat file represents device's I/O statistics not accounted by block</div><div class='ctx'> layer and, thus, not available in zram&lt;id&gt;/stat file. It consists of a</div><div class='ctx'> single line of text and contains the following stats separated by</div><div class='ctx'> whitespace:</div><div class='del'>-	failed_reads</div><div class='del'>-	failed_writes</div><div class='del'>-	invalid_io</div><div class='del'>-	notify_free</div><div class='add'>+ failed_reads     the number of failed reads</div><div class='add'>+ failed_writes    the number of failed writes</div><div class='add'>+ invalid_io       the number of non-page-size-aligned I/O requests</div><div class='add'>+ notify_free      Depending on device usage scenario it may account</div><div class='add'>+                  a) the number of pages freed because of swap slot free</div><div class='add'>+                  notifications or b) the number of pages freed because of</div><div class='add'>+                  REQ_DISCARD requests sent by bio. The former ones are</div><div class='add'>+                  sent to a swap block device when a swap slot is freed,</div><div class='add'>+                  which implies that this disk is being used as a swap disk.</div><div class='add'>+                  The latter ones are sent by filesystem mounted with</div><div class='add'>+                  discard option, whenever some data blocks are getting</div><div class='add'>+                  discarded.</div><div class='ctx'> </div><div class='ctx'> File /sys/block/zram&lt;id&gt;/mm_stat</div><div class='ctx'> </div><div class='ctx'> The stat file represents device's mm statistics. It consists of a single</div><div class='ctx'> line of text and contains the following stats separated by whitespace:</div><div class='del'>-	orig_data_size</div><div class='del'>-	compr_data_size</div><div class='del'>-	mem_used_total</div><div class='del'>-	mem_limit</div><div class='del'>-	mem_used_max</div><div class='del'>-	zero_pages</div><div class='del'>-	num_migrated</div><div class='add'>+ orig_data_size   uncompressed size of data stored in this disk.</div><div class='add'>+		  This excludes same-element-filled pages (same_pages) since</div><div class='add'>+		  no memory is allocated for them.</div><div class='add'>+                  Unit: bytes</div><div class='add'>+ compr_data_size  compressed size of data stored in this disk</div><div class='add'>+ mem_used_total   the amount of memory allocated for this disk. This</div><div class='add'>+                  includes allocator fragmentation and metadata overhead,</div><div class='add'>+                  allocated for this disk. So, allocator space efficiency</div><div class='add'>+                  can be calculated using compr_data_size and this statistic.</div><div class='add'>+                  Unit: bytes</div><div class='add'>+ mem_limit        the maximum amount of memory ZRAM can use to store</div><div class='add'>+                  the compressed data</div><div class='add'>+ mem_used_max     the maximum amount of memory zram have consumed to</div><div class='add'>+                  store the data</div><div class='add'>+ same_pages       the number of same element filled pages written to this disk.</div><div class='add'>+                  No memory is allocated for such pages.</div><div class='add'>+ pages_compacted  the number of pages freed during compaction</div><div class='ctx'> </div><div class='ctx'> 9) Deactivate:</div><div class='ctx'> 	swapoff /dev/zram0</div><div class='head'>diff --git a/Documentation/braille-console.txt b/Documentation/braille-console.txt<br/>deleted file mode 100644<br/>index d0d042c2fd5e..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/braille-console.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/braille-console.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-                       Linux Braille Console</div><div class='del'>-</div><div class='del'>-To get early boot messages on a braille device (before userspace screen</div><div class='del'>-readers can start), you first need to compile the support for the usual serial</div><div class='del'>-console (see serial-console.txt), and for braille device (in Device Drivers -</div><div class='del'>-Accessibility).</div><div class='del'>-</div><div class='del'>-Then you need to specify a console=brl, option on the kernel command line, the</div><div class='del'>-format is:</div><div class='del'>-</div><div class='del'>-	console=brl,serial_options...</div><div class='del'>-</div><div class='del'>-where serial_options... are the same as described in serial-console.txt</div><div class='del'>-</div><div class='del'>-So for instance you can use console=brl,ttyS0 if the braille device is connected</div><div class='del'>-to the first serial port, and console=brl,ttyS0,115200 to override the baud rate</div><div class='del'>-to 115200, etc.</div><div class='del'>-</div><div class='del'>-By default, the braille device will just show the last kernel message (console</div><div class='del'>-mode).  To review previous messages, press the Insert key to switch to the VT</div><div class='del'>-review mode.  In review mode, the arrow keys permit to browse in the VT content,</div><div class='del'>-page up/down keys go at the top/bottom of the screen, and the home key goes back</div><div class='del'>-to the cursor, hence providing very basic screen reviewing facility.</div><div class='del'>-</div><div class='del'>-Sound feedback can be obtained by adding the braille_console.sound=1 kernel</div><div class='del'>-parameter.</div><div class='del'>-</div><div class='del'>-For simplicity, only one braille console can be enabled, other uses of</div><div class='del'>-console=brl,... will be discarded.  Also note that it does not interfere with</div><div class='del'>-the console selection mechanism described in serial-console.txt</div><div class='del'>-</div><div class='del'>-For now, only the VisioBraille device is supported.</div><div class='del'>-</div><div class='del'>-Samuel Thibault &lt;samuel.thibault@ens-lyon.org&gt;</div><div class='head'>diff --git a/Documentation/cdrom/cdrom-standard.tex b/Documentation/cdrom/cdrom-standard.tex<br/>index c06233fe52ac..8f85b0e41046 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/cdrom/cdrom-standard.tex?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cdrom/cdrom-standard.tex</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/cdrom/cdrom-standard.tex?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cdrom/cdrom-standard.tex</a></div><div class='hunk'>@@ -249,7 +249,6 @@ struct&amp; cdrom_device_ops\ \{ \hidewidth\cr</div><div class='ctx'>         unsigned\ long);\cr</div><div class='ctx'> \noalign{\medskip}</div><div class='ctx'>   &amp;const\ int&amp; capability;&amp; capability flags \cr</div><div class='del'>-  &amp;int&amp; n_minors;&amp; number of active minor devices \cr</div><div class='ctx'> \};\cr</div><div class='ctx'> }</div><div class='ctx'> $$</div><div class='hunk'>@@ -258,13 +257,7 @@ it should add a function pointer to this $struct$. When a particular</div><div class='ctx'> function is not implemented, however, this $struct$ should contain a</div><div class='ctx'> NULL instead. The $capability$ flags specify the capabilities of the</div><div class='ctx'> \cdrom\ hardware and/or low-level \cdrom\ driver when a \cdrom\ drive</div><div class='del'>-is registered with the \UCD. The value $n_minors$ should be a positive</div><div class='del'>-value indicating the number of minor devices that are supported by</div><div class='del'>-the low-level device driver, normally~1. Although these two variables</div><div class='del'>-are `informative' rather than `operational,' they are included in</div><div class='del'>-$cdrom_device_ops$ because they describe the capability of the {\em</div><div class='del'>-driver\/} rather than the {\em drive}. Nomenclature has always been</div><div class='del'>-difficult in computer programming.</div><div class='add'>+is registered with the \UCD.</div><div class='ctx'> </div><div class='ctx'> Note that most functions have fewer parameters than their</div><div class='ctx'> $blkdev_fops$ counterparts. This is because very little of the</div><div class='head'>diff --git a/Documentation/cgroup-v1/00-INDEX b/Documentation/cgroup-v1/00-INDEX<br/>index 106885ad670d..13e0c85e7b35 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/cgroup-v1/00-INDEX?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cgroup-v1/00-INDEX</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/cgroup-v1/00-INDEX?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cgroup-v1/00-INDEX</a></div><div class='hunk'>@@ -8,7 +8,7 @@ cpuacct.txt</div><div class='ctx'> 	- CPU Accounting Controller; account CPU usage for groups of tasks.</div><div class='ctx'> cpusets.txt</div><div class='ctx'> 	- documents the cpusets feature; assign CPUs and Mem to a set of tasks.</div><div class='del'>-devices.txt</div><div class='add'>+admin-guide/devices.rst</div><div class='ctx'> 	- Device Whitelist Controller; description, interface and security.</div><div class='ctx'> freezer-subsystem.txt</div><div class='ctx'> 	- checkpointing; rationale to not use signals, interface.</div><div class='head'>diff --git a/Documentation/cgroup-v1/cpusets.txt b/Documentation/cgroup-v1/cpusets.txt<br/>index e5ac5da86682..8402dd6de8df 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/cgroup-v1/cpusets.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cgroup-v1/cpusets.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/cgroup-v1/cpusets.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cgroup-v1/cpusets.txt</a></div><div class='hunk'>@@ -615,7 +615,7 @@ to allocate a page of memory for that task.</div><div class='ctx'> </div><div class='ctx'> If a cpuset has its 'cpuset.cpus' modified, then each task in that cpuset</div><div class='ctx'> will have its allowed CPU placement changed immediately.  Similarly,</div><div class='del'>-if a task's pid is written to another cpusets 'cpuset.tasks' file, then its</div><div class='add'>+if a task's pid is written to another cpuset's 'tasks' file, then its</div><div class='ctx'> allowed CPU placement is changed immediately.  If such a task had been</div><div class='ctx'> bound to some subset of its cpuset using the sched_setaffinity() call,</div><div class='ctx'> the task will be allowed to run on any CPU allowed in its new cpuset,</div><div class='head'>diff --git a/Documentation/cgroup-v1/rdma.txt b/Documentation/cgroup-v1/rdma.txt<br/>new file mode 100644<br/>index 000000000000..af618171e0eb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/cgroup-v1/rdma.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cgroup-v1/rdma.txt</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+				RDMA Controller</div><div class='add'>+				----------------</div><div class='add'>+</div><div class='add'>+Contents</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+1. Overview</div><div class='add'>+  1-1. What is RDMA controller?</div><div class='add'>+  1-2. Why RDMA controller needed?</div><div class='add'>+  1-3. How is RDMA controller implemented?</div><div class='add'>+2. Usage Examples</div><div class='add'>+</div><div class='add'>+1. Overview</div><div class='add'>+</div><div class='add'>+1-1. What is RDMA controller?</div><div class='add'>+-----------------------------</div><div class='add'>+</div><div class='add'>+RDMA controller allows user to limit RDMA/IB specific resources that a given</div><div class='add'>+set of processes can use. These processes are grouped using RDMA controller.</div><div class='add'>+</div><div class='add'>+RDMA controller defines two resources which can be limited for processes of a</div><div class='add'>+cgroup.</div><div class='add'>+</div><div class='add'>+1-2. Why RDMA controller needed?</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+Currently user space applications can easily take away all the rdma verb</div><div class='add'>+specific resources such as AH, CQ, QP, MR etc. Due to which other applications</div><div class='add'>+in other cgroup or kernel space ULPs may not even get chance to allocate any</div><div class='add'>+rdma resources. This can leads to service unavailability.</div><div class='add'>+</div><div class='add'>+Therefore RDMA controller is needed through which resource consumption</div><div class='add'>+of processes can be limited. Through this controller different rdma</div><div class='add'>+resources can be accounted.</div><div class='add'>+</div><div class='add'>+1-3. How is RDMA controller implemented?</div><div class='add'>+----------------------------------------</div><div class='add'>+</div><div class='add'>+RDMA cgroup allows limit configuration of resources. Rdma cgroup maintains</div><div class='add'>+resource accounting per cgroup, per device using resource pool structure.</div><div class='add'>+Each such resource pool is limited up to 64 resources in given resource pool</div><div class='add'>+by rdma cgroup, which can be extended later if required.</div><div class='add'>+</div><div class='add'>+This resource pool object is linked to the cgroup css. Typically there</div><div class='add'>+are 0 to 4 resource pool instances per cgroup, per device in most use cases.</div><div class='add'>+But nothing limits to have it more. At present hundreds of RDMA devices per</div><div class='add'>+single cgroup may not be handled optimally, however there is no</div><div class='add'>+known use case or requirement for such configuration either.</div><div class='add'>+</div><div class='add'>+Since RDMA resources can be allocated from any process and can be freed by any</div><div class='add'>+of the child processes which shares the address space, rdma resources are</div><div class='add'>+always owned by the creator cgroup css. This allows process migration from one</div><div class='add'>+to other cgroup without major complexity of transferring resource ownership;</div><div class='add'>+because such ownership is not really present due to shared nature of</div><div class='add'>+rdma resources. Linking resources around css also ensures that cgroups can be</div><div class='add'>+deleted after processes migrated. This allow progress migration as well with</div><div class='add'>+active resources, even though that is not a primary use case.</div><div class='add'>+</div><div class='add'>+Whenever RDMA resource charging occurs, owner rdma cgroup is returned to</div><div class='add'>+the caller. Same rdma cgroup should be passed while uncharging the resource.</div><div class='add'>+This also allows process migrated with active RDMA resource to charge</div><div class='add'>+to new owner cgroup for new resource. It also allows to uncharge resource of</div><div class='add'>+a process from previously charged cgroup which is migrated to new cgroup,</div><div class='add'>+even though that is not a primary use case.</div><div class='add'>+</div><div class='add'>+Resource pool object is created in following situations.</div><div class='add'>+(a) User sets the limit and no previous resource pool exist for the device</div><div class='add'>+of interest for the cgroup.</div><div class='add'>+(b) No resource limits were configured, but IB/RDMA stack tries to</div><div class='add'>+charge the resource. So that it correctly uncharge them when applications are</div><div class='add'>+running without limits and later on when limits are enforced during uncharging,</div><div class='add'>+otherwise usage count will drop to negative.</div><div class='add'>+</div><div class='add'>+Resource pool is destroyed if all the resource limits are set to max and</div><div class='add'>+it is the last resource getting deallocated.</div><div class='add'>+</div><div class='add'>+User should set all the limit to max value if it intents to remove/unconfigure</div><div class='add'>+the resource pool for a particular device.</div><div class='add'>+</div><div class='add'>+IB stack honors limits enforced by the rdma controller. When application</div><div class='add'>+query about maximum resource limits of IB device, it returns minimum of</div><div class='add'>+what is configured by user for a given cgroup and what is supported by</div><div class='add'>+IB device.</div><div class='add'>+</div><div class='add'>+Following resources can be accounted by rdma controller.</div><div class='add'>+  hca_handle	Maximum number of HCA Handles</div><div class='add'>+  hca_object 	Maximum number of HCA Objects</div><div class='add'>+</div><div class='add'>+2. Usage Examples</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+(a) Configure resource limit:</div><div class='add'>+echo mlx4_0 hca_handle=2 hca_object=2000 &gt; /sys/fs/cgroup/rdma/1/rdma.max</div><div class='add'>+echo ocrdma1 hca_handle=3 &gt; /sys/fs/cgroup/rdma/2/rdma.max</div><div class='add'>+</div><div class='add'>+(b) Query resource limit:</div><div class='add'>+cat /sys/fs/cgroup/rdma/2/rdma.max</div><div class='add'>+#Output:</div><div class='add'>+mlx4_0 hca_handle=2 hca_object=2000</div><div class='add'>+ocrdma1 hca_handle=3 hca_object=max</div><div class='add'>+</div><div class='add'>+(c) Query current usage:</div><div class='add'>+cat /sys/fs/cgroup/rdma/2/rdma.current</div><div class='add'>+#Output:</div><div class='add'>+mlx4_0 hca_handle=1 hca_object=20</div><div class='add'>+ocrdma1 hca_handle=1 hca_object=23</div><div class='add'>+</div><div class='add'>+(d) Delete resource limit:</div><div class='add'>+echo echo mlx4_0 hca_handle=max hca_object=max &gt; /sys/fs/cgroup/rdma/1/rdma.max</div><div class='head'>diff --git a/Documentation/cgroup-v2.txt b/Documentation/cgroup-v2.txt<br/>index 4cc07ce3b8dd..3b8449f8ac7e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/cgroup-v2.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cgroup-v2.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/cgroup-v2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cgroup-v2.txt</a></div><div class='hunk'>@@ -47,6 +47,12 @@ CONTENTS</div><div class='ctx'>   5-3. IO</div><div class='ctx'>     5-3-1. IO Interface Files</div><div class='ctx'>     5-3-2. Writeback</div><div class='add'>+  5-4. PID</div><div class='add'>+    5-4-1. PID Interface Files</div><div class='add'>+  5-5. RDMA</div><div class='add'>+    5-5-1. RDMA Interface Files</div><div class='add'>+  5-6. Misc</div><div class='add'>+    5-6-1. perf_event</div><div class='ctx'> 6. Namespace</div><div class='ctx'>   6-1. Basics</div><div class='ctx'>   6-2. The Root and Views</div><div class='hunk'>@@ -328,14 +334,12 @@ a process with a non-root euid to migrate a target process into a</div><div class='ctx'> cgroup by writing its PID to the "cgroup.procs" file, the following</div><div class='ctx'> conditions must be met.</div><div class='ctx'> </div><div class='del'>-- The writer's euid must match either uid or suid of the target process.</div><div class='del'>-</div><div class='ctx'> - The writer must have write access to the "cgroup.procs" file.</div><div class='ctx'> </div><div class='ctx'> - The writer must have write access to the "cgroup.procs" file of the</div><div class='ctx'>   common ancestor of the source and destination cgroups.</div><div class='ctx'> </div><div class='del'>-The above three constraints ensure that while a delegatee may migrate</div><div class='add'>+The above two constraints ensure that while a delegatee may migrate</div><div class='ctx'> processes around freely in the delegated sub-hierarchy it can't pull</div><div class='ctx'> in from or push out to outside the sub-hierarchy.</div><div class='ctx'> </div><div class='hunk'>@@ -350,10 +354,10 @@ all processes under C0 and C1 belong to U0.</div><div class='ctx'> </div><div class='ctx'> Let's also say U0 wants to write the PID of a process which is</div><div class='ctx'> currently in C10 into "C00/cgroup.procs".  U0 has write access to the</div><div class='del'>-file and uid match on the process; however, the common ancestor of the</div><div class='del'>-source cgroup C10 and the destination cgroup C00 is above the points</div><div class='del'>-of delegation and U0 would not have write access to its "cgroup.procs"</div><div class='del'>-files and thus the write will be denied with -EACCES.</div><div class='add'>+file; however, the common ancestor of the source cgroup C10 and the</div><div class='add'>+destination cgroup C00 is above the points of delegation and U0 would</div><div class='add'>+not have write access to its "cgroup.procs" files and thus the write</div><div class='add'>+will be denied with -EACCES.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 2-6. Guidelines</div><div class='hunk'>@@ -1119,6 +1123,91 @@ writeback as follows.</div><div class='ctx'> 	vm.dirty[_background]_ratio.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+5-4. PID</div><div class='add'>+</div><div class='add'>+The process number controller is used to allow a cgroup to stop any</div><div class='add'>+new tasks from being fork()'d or clone()'d after a specified limit is</div><div class='add'>+reached.</div><div class='add'>+</div><div class='add'>+The number of tasks in a cgroup can be exhausted in ways which other</div><div class='add'>+controllers cannot prevent, thus warranting its own controller.  For</div><div class='add'>+example, a fork bomb is likely to exhaust the number of tasks before</div><div class='add'>+hitting memory restrictions.</div><div class='add'>+</div><div class='add'>+Note that PIDs used in this controller refer to TIDs, process IDs as</div><div class='add'>+used by the kernel.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5-4-1. PID Interface Files</div><div class='add'>+</div><div class='add'>+  pids.max</div><div class='add'>+</div><div class='add'>+ A read-write single value file which exists on non-root cgroups.  The</div><div class='add'>+ default is "max".</div><div class='add'>+</div><div class='add'>+ Hard limit of number of processes.</div><div class='add'>+</div><div class='add'>+  pids.current</div><div class='add'>+</div><div class='add'>+ A read-only single value file which exists on all cgroups.</div><div class='add'>+</div><div class='add'>+ The number of processes currently in the cgroup and its descendants.</div><div class='add'>+</div><div class='add'>+Organisational operations are not blocked by cgroup policies, so it is</div><div class='add'>+possible to have pids.current &gt; pids.max.  This can be done by either</div><div class='add'>+setting the limit to be smaller than pids.current, or attaching enough</div><div class='add'>+processes to the cgroup such that pids.current is larger than</div><div class='add'>+pids.max.  However, it is not possible to violate a cgroup PID policy</div><div class='add'>+through fork() or clone(). These will return -EAGAIN if the creation</div><div class='add'>+of a new process would cause a cgroup policy to be violated.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5-5. RDMA</div><div class='add'>+</div><div class='add'>+The "rdma" controller regulates the distribution and accounting of</div><div class='add'>+of RDMA resources.</div><div class='add'>+</div><div class='add'>+5-5-1. RDMA Interface Files</div><div class='add'>+</div><div class='add'>+  rdma.max</div><div class='add'>+	A readwrite nested-keyed file that exists for all the cgroups</div><div class='add'>+	except root that describes current configured resource limit</div><div class='add'>+	for a RDMA/IB device.</div><div class='add'>+</div><div class='add'>+	Lines are keyed by device name and are not ordered.</div><div class='add'>+	Each line contains space separated resource name and its configured</div><div class='add'>+	limit that can be distributed.</div><div class='add'>+</div><div class='add'>+	The following nested keys are defined.</div><div class='add'>+</div><div class='add'>+	  hca_handle	Maximum number of HCA Handles</div><div class='add'>+	  hca_object 	Maximum number of HCA Objects</div><div class='add'>+</div><div class='add'>+	An example for mlx4 and ocrdma device follows.</div><div class='add'>+</div><div class='add'>+	  mlx4_0 hca_handle=2 hca_object=2000</div><div class='add'>+	  ocrdma1 hca_handle=3 hca_object=max</div><div class='add'>+</div><div class='add'>+  rdma.current</div><div class='add'>+	A read-only file that describes current resource usage.</div><div class='add'>+	It exists for all the cgroup except root.</div><div class='add'>+</div><div class='add'>+	An example for mlx4 and ocrdma device follows.</div><div class='add'>+</div><div class='add'>+	  mlx4_0 hca_handle=1 hca_object=20</div><div class='add'>+	  ocrdma1 hca_handle=1 hca_object=23</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5-6. Misc</div><div class='add'>+</div><div class='add'>+5-6-1. perf_event</div><div class='add'>+</div><div class='add'>+perf_event controller, if not mounted on a legacy hierarchy, is</div><div class='add'>+automatically enabled on the v2 hierarchy so that perf events can</div><div class='add'>+always be filtered by cgroup v2 path.  The controller can still be</div><div class='add'>+moved to a legacy hierarchy after v2 hierarchy is populated.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 6. Namespace</div><div class='ctx'> </div><div class='ctx'> 6-1. Basics</div><div class='head'>diff --git a/Documentation/circular-buffers.txt b/Documentation/circular-buffers.txt<br/>index 88951b179262..4a824d232472 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/circular-buffers.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/circular-buffers.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/circular-buffers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/circular-buffers.txt</a></div><div class='hunk'>@@ -161,7 +161,7 @@ The producer will look something like this:</div><div class='ctx'> </div><div class='ctx'> 	unsigned long head = buffer-&gt;head;</div><div class='ctx'> 	/* The spin_unlock() and next spin_lock() provide needed ordering. */</div><div class='del'>-	unsigned long tail = ACCESS_ONCE(buffer-&gt;tail);</div><div class='add'>+	unsigned long tail = READ_ONCE(buffer-&gt;tail);</div><div class='ctx'> </div><div class='ctx'> 	if (CIRC_SPACE(head, tail, buffer-&gt;size) &gt;= 1) {</div><div class='ctx'> 		/* insert one item into the buffer */</div><div class='hunk'>@@ -222,7 +222,7 @@ This will instruct the CPU to make sure the index is up to date before reading</div><div class='ctx'> the new item, and then it shall make sure the CPU has finished reading the item</div><div class='ctx'> before it writes the new tail pointer, which will erase the item.</div><div class='ctx'> </div><div class='del'>-Note the use of ACCESS_ONCE() and smp_load_acquire() to read the</div><div class='add'>+Note the use of READ_ONCE() and smp_load_acquire() to read the</div><div class='ctx'> opposition index.  This prevents the compiler from discarding and</div><div class='ctx'> reloading its cached value - which some compilers will do across</div><div class='ctx'> smp_read_barrier_depends().  This isn't strictly needed if you can</div><div class='head'>diff --git a/Documentation/conf.py b/Documentation/conf.py<br/>index bf6f310e5170..7fadb3b83293 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/conf.py?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/conf.py</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/conf.py</a></div><div class='hunk'>@@ -34,10 +34,10 @@ from load_config import loadConfig</div><div class='ctx'> # Add any Sphinx extension module names here, as strings. They can be</div><div class='ctx'> # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom</div><div class='ctx'> # ones.</div><div class='del'>-extensions = ['kernel-doc', 'rstFlatTable', 'kernel_include', 'cdomain']</div><div class='add'>+extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain']</div><div class='ctx'> </div><div class='ctx'> # The name of the math extension changed on Sphinx 1.4</div><div class='del'>-if minor &gt; 3:</div><div class='add'>+if major == 1 and minor &gt; 3:</div><div class='ctx'>     extensions.append("sphinx.ext.imgmath")</div><div class='ctx'> else:</div><div class='ctx'>     extensions.append("sphinx.ext.pngmath")</div><div class='hunk'>@@ -58,7 +58,7 @@ master_doc = 'index'</div><div class='ctx'> </div><div class='ctx'> # General information about the project.</div><div class='ctx'> project = 'The Linux Kernel'</div><div class='del'>-copyright = '2016, The kernel development community'</div><div class='add'>+copyright = 'The kernel development community'</div><div class='ctx'> author = 'The kernel development community'</div><div class='ctx'> </div><div class='ctx'> # The version info for the project you're documenting, acts as replacement for</div><div class='hunk'>@@ -135,8 +135,8 @@ pygments_style = 'sphinx'</div><div class='ctx'> # If true, `todo` and `todoList` produce output, else they produce nothing.</div><div class='ctx'> todo_include_todos = False</div><div class='ctx'> </div><div class='del'>-primary_domain = 'C'</div><div class='del'>-highlight_language = 'guess'</div><div class='add'>+primary_domain = 'c'</div><div class='add'>+highlight_language = 'none'</div><div class='ctx'> </div><div class='ctx'> # -- Options for HTML output ----------------------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -332,18 +332,32 @@ latex_elements = {</div><div class='ctx'>      '''</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+# Fix reference escape troubles with Sphinx 1.4.x</div><div class='add'>+if major == 1 and minor &gt; 3:</div><div class='add'>+    latex_elements['preamble']  += '\\renewcommand*{\\DUrole}[2]{ #2 }\n'</div><div class='add'>+</div><div class='ctx'> # Grouping the document tree into LaTeX files. List of tuples</div><div class='ctx'> # (source start file, target name, title,</div><div class='ctx'> #  author, documentclass [howto, manual, or own class]).</div><div class='ctx'> latex_documents = [</div><div class='add'>+    ('doc-guide/index', 'kernel-doc-guide.tex', 'Linux Kernel Documentation Guide',</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+    ('admin-guide/index', 'linux-user.tex', 'Linux Kernel User Documentation',</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+    ('core-api/index', 'core-api.tex', 'The kernel core API manual',</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+    ('driver-api/index', 'driver-api.tex', 'The kernel driver API manual',</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='ctx'>     ('kernel-documentation', 'kernel-documentation.tex', 'The Linux Kernel Documentation',</div><div class='ctx'>      'The kernel development community', 'manual'),</div><div class='del'>-    ('development-process/index', 'development-process.tex', 'Linux Kernel Development Documentation',</div><div class='add'>+    ('process/index', 'development-process.tex', 'Linux Kernel Development Documentation',</div><div class='ctx'>      'The kernel development community', 'manual'),</div><div class='ctx'>     ('gpu/index', 'gpu.tex', 'Linux GPU Driver Developer\'s Guide',</div><div class='ctx'>      'The kernel development community', 'manual'),</div><div class='ctx'>     ('media/index', 'media.tex', 'Linux Media Subsystem Documentation',</div><div class='ctx'>      'The kernel development community', 'manual'),</div><div class='add'>+    ('security/index', 'security.tex', 'The kernel security subsystem manual',</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='ctx'> ]</div><div class='ctx'> </div><div class='ctx'> # The name of an image file (relative to this directory) to place at the top of</div><div class='head'>diff --git a/Documentation/core-api/assoc_array.rst b/Documentation/core-api/assoc_array.rst<br/>new file mode 100644<br/>index 000000000000..d83cfff9ea43<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/core-api/assoc_array.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/assoc_array.rst</a></div><div class='hunk'>@@ -0,0 +1,551 @@</div><div class='add'>+========================================</div><div class='add'>+Generic Associative Array Implementation</div><div class='add'>+========================================</div><div class='add'>+</div><div class='add'>+Overview</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+This associative array implementation is an object container with the following</div><div class='add'>+properties:</div><div class='add'>+</div><div class='add'>+1. Objects are opaque pointers.  The implementation does not care where they</div><div class='add'>+   point (if anywhere) or what they point to (if anything).</div><div class='add'>+.. note:: Pointers to objects _must_ be zero in the least significant bit.</div><div class='add'>+</div><div class='add'>+2. Objects do not need to contain linkage blocks for use by the array.  This</div><div class='add'>+   permits an object to be located in multiple arrays simultaneously.</div><div class='add'>+   Rather, the array is made up of metadata blocks that point to objects.</div><div class='add'>+</div><div class='add'>+3. Objects require index keys to locate them within the array.</div><div class='add'>+</div><div class='add'>+4. Index keys must be unique.  Inserting an object with the same key as one</div><div class='add'>+   already in the array will replace the old object.</div><div class='add'>+</div><div class='add'>+5. Index keys can be of any length and can be of different lengths.</div><div class='add'>+</div><div class='add'>+6. Index keys should encode the length early on, before any variation due to</div><div class='add'>+   length is seen.</div><div class='add'>+</div><div class='add'>+7. Index keys can include a hash to scatter objects throughout the array.</div><div class='add'>+</div><div class='add'>+8. The array can iterated over.  The objects will not necessarily come out in</div><div class='add'>+   key order.</div><div class='add'>+</div><div class='add'>+9. The array can be iterated over whilst it is being modified, provided the</div><div class='add'>+   RCU readlock is being held by the iterator.  Note, however, under these</div><div class='add'>+   circumstances, some objects may be seen more than once.  If this is a</div><div class='add'>+   problem, the iterator should lock against modification.  Objects will not</div><div class='add'>+   be missed, however, unless deleted.</div><div class='add'>+</div><div class='add'>+10. Objects in the array can be looked up by means of their index key.</div><div class='add'>+</div><div class='add'>+11. Objects can be looked up whilst the array is being modified, provided the</div><div class='add'>+    RCU readlock is being held by the thread doing the look up.</div><div class='add'>+</div><div class='add'>+The implementation uses a tree of 16-pointer nodes internally that are indexed</div><div class='add'>+on each level by nibbles from the index key in the same manner as in a radix</div><div class='add'>+tree.  To improve memory efficiency, shortcuts can be emplaced to skip over</div><div class='add'>+what would otherwise be a series of single-occupancy nodes.  Further, nodes</div><div class='add'>+pack leaf object pointers into spare space in the node rather than making an</div><div class='add'>+extra branch until as such time an object needs to be added to a full node.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The Public API</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+The public API can be found in ``&lt;linux/assoc_array.h&gt;``.  The associative</div><div class='add'>+array is rooted on the following structure::</div><div class='add'>+</div><div class='add'>+    struct assoc_array {</div><div class='add'>+            ...</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+The code is selected by enabling ``CONFIG_ASSOCIATIVE_ARRAY`` with::</div><div class='add'>+</div><div class='add'>+    ./script/config -e ASSOCIATIVE_ARRAY</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Edit Script</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The insertion and deletion functions produce an 'edit script' that can later be</div><div class='add'>+applied to effect the changes without risking ``ENOMEM``. This retains the</div><div class='add'>+preallocated metadata blocks that will be installed in the internal tree and</div><div class='add'>+keeps track of the metadata blocks that will be removed from the tree when the</div><div class='add'>+script is applied.</div><div class='add'>+</div><div class='add'>+This is also used to keep track of dead blocks and dead objects after the</div><div class='add'>+script has been applied so that they can be freed later.  The freeing is done</div><div class='add'>+after an RCU grace period has passed - thus allowing access functions to</div><div class='add'>+proceed under the RCU read lock.</div><div class='add'>+</div><div class='add'>+The script appears as outside of the API as a pointer of the type::</div><div class='add'>+</div><div class='add'>+    struct assoc_array_edit;</div><div class='add'>+</div><div class='add'>+There are two functions for dealing with the script:</div><div class='add'>+</div><div class='add'>+1. Apply an edit script::</div><div class='add'>+</div><div class='add'>+    void assoc_array_apply_edit(struct assoc_array_edit *edit);</div><div class='add'>+</div><div class='add'>+This will perform the edit functions, interpolating various write barriers</div><div class='add'>+to permit accesses under the RCU read lock to continue.  The edit script</div><div class='add'>+will then be passed to ``call_rcu()`` to free it and any dead stuff it points</div><div class='add'>+to.</div><div class='add'>+</div><div class='add'>+2. Cancel an edit script::</div><div class='add'>+</div><div class='add'>+    void assoc_array_cancel_edit(struct assoc_array_edit *edit);</div><div class='add'>+</div><div class='add'>+This frees the edit script and all preallocated memory immediately. If</div><div class='add'>+this was for insertion, the new object is _not_ released by this function,</div><div class='add'>+but must rather be released by the caller.</div><div class='add'>+</div><div class='add'>+These functions are guaranteed not to fail.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Operations Table</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Various functions take a table of operations::</div><div class='add'>+</div><div class='add'>+    struct assoc_array_ops {</div><div class='add'>+            ...</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+This points to a number of methods, all of which need to be provided:</div><div class='add'>+</div><div class='add'>+1. Get a chunk of index key from caller data::</div><div class='add'>+</div><div class='add'>+    unsigned long (*get_key_chunk)(const void *index_key, int level);</div><div class='add'>+</div><div class='add'>+This should return a chunk of caller-supplied index key starting at the</div><div class='add'>+*bit* position given by the level argument.  The level argument will be a</div><div class='add'>+multiple of ``ASSOC_ARRAY_KEY_CHUNK_SIZE`` and the function should return</div><div class='add'>+``ASSOC_ARRAY_KEY_CHUNK_SIZE bits``.  No error is possible.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. Get a chunk of an object's index key::</div><div class='add'>+</div><div class='add'>+    unsigned long (*get_object_key_chunk)(const void *object, int level);</div><div class='add'>+</div><div class='add'>+As the previous function, but gets its data from an object in the array</div><div class='add'>+rather than from a caller-supplied index key.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3. See if this is the object we're looking for::</div><div class='add'>+</div><div class='add'>+    bool (*compare_object)(const void *object, const void *index_key);</div><div class='add'>+</div><div class='add'>+Compare the object against an index key and return ``true`` if it matches and</div><div class='add'>+``false`` if it doesn't.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4. Diff the index keys of two objects::</div><div class='add'>+</div><div class='add'>+    int (*diff_objects)(const void *object, const void *index_key);</div><div class='add'>+</div><div class='add'>+Return the bit position at which the index key of the specified object</div><div class='add'>+differs from the given index key or -1 if they are the same.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5. Free an object::</div><div class='add'>+</div><div class='add'>+    void (*free_object)(void *object);</div><div class='add'>+</div><div class='add'>+Free the specified object.  Note that this may be called an RCU grace period</div><div class='add'>+after ``assoc_array_apply_edit()`` was called, so ``synchronize_rcu()`` may be</div><div class='add'>+necessary on module unloading.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Manipulation Functions</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+There are a number of functions for manipulating an associative array:</div><div class='add'>+</div><div class='add'>+1. Initialise an associative array::</div><div class='add'>+</div><div class='add'>+    void assoc_array_init(struct assoc_array *array);</div><div class='add'>+</div><div class='add'>+This initialises the base structure for an associative array.  It can't fail.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. Insert/replace an object in an associative array::</div><div class='add'>+</div><div class='add'>+    struct assoc_array_edit *</div><div class='add'>+    assoc_array_insert(struct assoc_array *array,</div><div class='add'>+                       const struct assoc_array_ops *ops,</div><div class='add'>+                       const void *index_key,</div><div class='add'>+                       void *object);</div><div class='add'>+</div><div class='add'>+This inserts the given object into the array.  Note that the least</div><div class='add'>+significant bit of the pointer must be zero as it's used to type-mark</div><div class='add'>+pointers internally.</div><div class='add'>+</div><div class='add'>+If an object already exists for that key then it will be replaced with the</div><div class='add'>+new object and the old one will be freed automatically.</div><div class='add'>+</div><div class='add'>+The ``index_key`` argument should hold index key information and is</div><div class='add'>+passed to the methods in the ops table when they are called.</div><div class='add'>+</div><div class='add'>+This function makes no alteration to the array itself, but rather returns</div><div class='add'>+an edit script that must be applied.  ``-ENOMEM`` is returned in the case of</div><div class='add'>+an out-of-memory error.</div><div class='add'>+</div><div class='add'>+The caller should lock exclusively against other modifiers of the array.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3. Delete an object from an associative array::</div><div class='add'>+</div><div class='add'>+    struct assoc_array_edit *</div><div class='add'>+    assoc_array_delete(struct assoc_array *array,</div><div class='add'>+                       const struct assoc_array_ops *ops,</div><div class='add'>+                       const void *index_key);</div><div class='add'>+</div><div class='add'>+This deletes an object that matches the specified data from the array.</div><div class='add'>+</div><div class='add'>+The ``index_key`` argument should hold index key information and is</div><div class='add'>+passed to the methods in the ops table when they are called.</div><div class='add'>+</div><div class='add'>+This function makes no alteration to the array itself, but rather returns</div><div class='add'>+an edit script that must be applied.  ``-ENOMEM`` is returned in the case of</div><div class='add'>+an out-of-memory error.  ``NULL`` will be returned if the specified object is</div><div class='add'>+not found within the array.</div><div class='add'>+</div><div class='add'>+The caller should lock exclusively against other modifiers of the array.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4. Delete all objects from an associative array::</div><div class='add'>+</div><div class='add'>+    struct assoc_array_edit *</div><div class='add'>+    assoc_array_clear(struct assoc_array *array,</div><div class='add'>+                      const struct assoc_array_ops *ops);</div><div class='add'>+</div><div class='add'>+This deletes all the objects from an associative array and leaves it</div><div class='add'>+completely empty.</div><div class='add'>+</div><div class='add'>+This function makes no alteration to the array itself, but rather returns</div><div class='add'>+an edit script that must be applied.  ``-ENOMEM`` is returned in the case of</div><div class='add'>+an out-of-memory error.</div><div class='add'>+</div><div class='add'>+The caller should lock exclusively against other modifiers of the array.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5. Destroy an associative array, deleting all objects::</div><div class='add'>+</div><div class='add'>+    void assoc_array_destroy(struct assoc_array *array,</div><div class='add'>+                             const struct assoc_array_ops *ops);</div><div class='add'>+</div><div class='add'>+This destroys the contents of the associative array and leaves it</div><div class='add'>+completely empty.  It is not permitted for another thread to be traversing</div><div class='add'>+the array under the RCU read lock at the same time as this function is</div><div class='add'>+destroying it as no RCU deferral is performed on memory release -</div><div class='add'>+something that would require memory to be allocated.</div><div class='add'>+</div><div class='add'>+The caller should lock exclusively against other modifiers and accessors</div><div class='add'>+of the array.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6. Garbage collect an associative array::</div><div class='add'>+</div><div class='add'>+    int assoc_array_gc(struct assoc_array *array,</div><div class='add'>+                       const struct assoc_array_ops *ops,</div><div class='add'>+                       bool (*iterator)(void *object, void *iterator_data),</div><div class='add'>+                       void *iterator_data);</div><div class='add'>+</div><div class='add'>+This iterates over the objects in an associative array and passes each one to</div><div class='add'>+``iterator()``.  If ``iterator()`` returns ``true``, the object is kept.  If it</div><div class='add'>+returns ``false``, the object will be freed.  If the ``iterator()`` function</div><div class='add'>+returns ``true``, it must perform any appropriate refcount incrementing on the</div><div class='add'>+object before returning.</div><div class='add'>+</div><div class='add'>+The internal tree will be packed down if possible as part of the iteration</div><div class='add'>+to reduce the number of nodes in it.</div><div class='add'>+</div><div class='add'>+The ``iterator_data`` is passed directly to ``iterator()`` and is otherwise</div><div class='add'>+ignored by the function.</div><div class='add'>+</div><div class='add'>+The function will return ``0`` if successful and ``-ENOMEM`` if there wasn't</div><div class='add'>+enough memory.</div><div class='add'>+</div><div class='add'>+It is possible for other threads to iterate over or search the array under</div><div class='add'>+the RCU read lock whilst this function is in progress.  The caller should</div><div class='add'>+lock exclusively against other modifiers of the array.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Access Functions</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+There are two functions for accessing an associative array:</div><div class='add'>+</div><div class='add'>+1. Iterate over all the objects in an associative array::</div><div class='add'>+</div><div class='add'>+    int assoc_array_iterate(const struct assoc_array *array,</div><div class='add'>+                            int (*iterator)(const void *object,</div><div class='add'>+                                            void *iterator_data),</div><div class='add'>+                            void *iterator_data);</div><div class='add'>+</div><div class='add'>+This passes each object in the array to the iterator callback function.</div><div class='add'>+``iterator_data`` is private data for that function.</div><div class='add'>+</div><div class='add'>+This may be used on an array at the same time as the array is being</div><div class='add'>+modified, provided the RCU read lock is held.  Under such circumstances,</div><div class='add'>+it is possible for the iteration function to see some objects twice.  If</div><div class='add'>+this is a problem, then modification should be locked against.  The</div><div class='add'>+iteration algorithm should not, however, miss any objects.</div><div class='add'>+</div><div class='add'>+The function will return ``0`` if no objects were in the array or else it will</div><div class='add'>+return the result of the last iterator function called.  Iteration stops</div><div class='add'>+immediately if any call to the iteration function results in a non-zero</div><div class='add'>+return.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. Find an object in an associative array::</div><div class='add'>+</div><div class='add'>+    void *assoc_array_find(const struct assoc_array *array,</div><div class='add'>+                           const struct assoc_array_ops *ops,</div><div class='add'>+                           const void *index_key);</div><div class='add'>+</div><div class='add'>+This walks through the array's internal tree directly to the object</div><div class='add'>+specified by the index key..</div><div class='add'>+</div><div class='add'>+This may be used on an array at the same time as the array is being</div><div class='add'>+modified, provided the RCU read lock is held.</div><div class='add'>+</div><div class='add'>+The function will return the object if found (and set ``*_type`` to the object</div><div class='add'>+type) or will return ``NULL`` if the object was not found.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Index Key Form</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+The index key can be of any form, but since the algorithms aren't told how long</div><div class='add'>+the key is, it is strongly recommended that the index key includes its length</div><div class='add'>+very early on before any variation due to the length would have an effect on</div><div class='add'>+comparisons.</div><div class='add'>+</div><div class='add'>+This will cause leaves with different length keys to scatter away from each</div><div class='add'>+other - and those with the same length keys to cluster together.</div><div class='add'>+</div><div class='add'>+It is also recommended that the index key begin with a hash of the rest of the</div><div class='add'>+key to maximise scattering throughout keyspace.</div><div class='add'>+</div><div class='add'>+The better the scattering, the wider and lower the internal tree will be.</div><div class='add'>+</div><div class='add'>+Poor scattering isn't too much of a problem as there are shortcuts and nodes</div><div class='add'>+can contain mixtures of leaves and metadata pointers.</div><div class='add'>+</div><div class='add'>+The index key is read in chunks of machine word.  Each chunk is subdivided into</div><div class='add'>+one nibble (4 bits) per level, so on a 32-bit CPU this is good for 8 levels and</div><div class='add'>+on a 64-bit CPU, 16 levels.  Unless the scattering is really poor, it is</div><div class='add'>+unlikely that more than one word of any particular index key will have to be</div><div class='add'>+used.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Internal Workings</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+The associative array data structure has an internal tree.  This tree is</div><div class='add'>+constructed of two types of metadata blocks: nodes and shortcuts.</div><div class='add'>+</div><div class='add'>+A node is an array of slots.  Each slot can contain one of four things:</div><div class='add'>+</div><div class='add'>+* A NULL pointer, indicating that the slot is empty.</div><div class='add'>+* A pointer to an object (a leaf).</div><div class='add'>+* A pointer to a node at the next level.</div><div class='add'>+* A pointer to a shortcut.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Basic Internal Tree Layout</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+Ignoring shortcuts for the moment, the nodes form a multilevel tree.  The index</div><div class='add'>+key space is strictly subdivided by the nodes in the tree and nodes occur on</div><div class='add'>+fixed levels.  For example::</div><div class='add'>+</div><div class='add'>+ Level: 0               1               2               3</div><div class='add'>+        =============== =============== =============== ===============</div><div class='add'>+                                                        NODE D</div><div class='add'>+                        NODE B          NODE C  +------&gt;+---+</div><div class='add'>+                +------&gt;+---+   +------&gt;+---+   |       | 0 |</div><div class='add'>+        NODE A  |       | 0 |   |       | 0 |   |       +---+</div><div class='add'>+        +---+   |       +---+   |       +---+   |       :   :</div><div class='add'>+        | 0 |   |       :   :   |       :   :   |       +---+</div><div class='add'>+        +---+   |       +---+   |       +---+   |       | f |</div><div class='add'>+        | 1 |---+       | 3 |---+       | 7 |---+       +---+</div><div class='add'>+        +---+           +---+           +---+</div><div class='add'>+        :   :           :   :           | 8 |---+</div><div class='add'>+        +---+           +---+           +---+   |       NODE E</div><div class='add'>+        | e |---+       | f |           :   :   +------&gt;+---+</div><div class='add'>+        +---+   |       +---+           +---+           | 0 |</div><div class='add'>+        | f |   |                       | f |           +---+</div><div class='add'>+        +---+   |                       +---+           :   :</div><div class='add'>+                |       NODE F                          +---+</div><div class='add'>+                +------&gt;+---+                           | f |</div><div class='add'>+                        | 0 |           NODE G          +---+</div><div class='add'>+                        +---+   +------&gt;+---+</div><div class='add'>+                        :   :   |       | 0 |</div><div class='add'>+                        +---+   |       +---+</div><div class='add'>+                        | 6 |---+       :   :</div><div class='add'>+                        +---+           +---+</div><div class='add'>+                        :   :           | f |</div><div class='add'>+                        +---+           +---+</div><div class='add'>+                        | f |</div><div class='add'>+                        +---+</div><div class='add'>+</div><div class='add'>+In the above example, there are 7 nodes (A-G), each with 16 slots (0-f).</div><div class='add'>+Assuming no other meta data nodes in the tree, the key space is divided</div><div class='add'>+thusly::</div><div class='add'>+</div><div class='add'>+    KEY PREFIX      NODE</div><div class='add'>+    ==========      ====</div><div class='add'>+    137*            D</div><div class='add'>+    138*            E</div><div class='add'>+    13[0-69-f]*     C</div><div class='add'>+    1[0-24-f]*      B</div><div class='add'>+    e6*             G</div><div class='add'>+    e[0-57-f]*      F</div><div class='add'>+    [02-df]*        A</div><div class='add'>+</div><div class='add'>+So, for instance, keys with the following example index keys will be found in</div><div class='add'>+the appropriate nodes::</div><div class='add'>+</div><div class='add'>+    INDEX KEY       PREFIX  NODE</div><div class='add'>+    =============== ======= ====</div><div class='add'>+    13694892892489  13      C</div><div class='add'>+    13795289025897  137     D</div><div class='add'>+    13889dde88793   138     E</div><div class='add'>+    138bbb89003093  138     E</div><div class='add'>+    1394879524789   12      C</div><div class='add'>+    1458952489      1       B</div><div class='add'>+    9431809de993ba  -       A</div><div class='add'>+    b4542910809cd   -       A</div><div class='add'>+    e5284310def98   e       F</div><div class='add'>+    e68428974237    e6      G</div><div class='add'>+    e7fffcbd443     e       F</div><div class='add'>+    f3842239082     -       A</div><div class='add'>+</div><div class='add'>+To save memory, if a node can hold all the leaves in its portion of keyspace,</div><div class='add'>+then the node will have all those leaves in it and will not have any metadata</div><div class='add'>+pointers - even if some of those leaves would like to be in the same slot.</div><div class='add'>+</div><div class='add'>+A node can contain a heterogeneous mix of leaves and metadata pointers.</div><div class='add'>+Metadata pointers must be in the slots that match their subdivisions of key</div><div class='add'>+space.  The leaves can be in any slot not occupied by a metadata pointer.  It</div><div class='add'>+is guaranteed that none of the leaves in a node will match a slot occupied by a</div><div class='add'>+metadata pointer.  If the metadata pointer is there, any leaf whose key matches</div><div class='add'>+the metadata key prefix must be in the subtree that the metadata pointer points</div><div class='add'>+to.</div><div class='add'>+</div><div class='add'>+In the above example list of index keys, node A will contain::</div><div class='add'>+</div><div class='add'>+    SLOT    CONTENT         INDEX KEY (PREFIX)</div><div class='add'>+    ====    =============== ==================</div><div class='add'>+    1       PTR TO NODE B   1*</div><div class='add'>+    any     LEAF            9431809de993ba</div><div class='add'>+    any     LEAF            b4542910809cd</div><div class='add'>+    e       PTR TO NODE F   e*</div><div class='add'>+    any     LEAF            f3842239082</div><div class='add'>+</div><div class='add'>+and node B::</div><div class='add'>+</div><div class='add'>+    3	PTR TO NODE C	13*</div><div class='add'>+    any	LEAF		1458952489</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Shortcuts</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+Shortcuts are metadata records that jump over a piece of keyspace.  A shortcut</div><div class='add'>+is a replacement for a series of single-occupancy nodes ascending through the</div><div class='add'>+levels.  Shortcuts exist to save memory and to speed up traversal.</div><div class='add'>+</div><div class='add'>+It is possible for the root of the tree to be a shortcut - say, for example,</div><div class='add'>+the tree contains at least 17 nodes all with key prefix ``1111``.  The</div><div class='add'>+insertion algorithm will insert a shortcut to skip over the ``1111`` keyspace</div><div class='add'>+in a single bound and get to the fourth level where these actually become</div><div class='add'>+different.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Splitting And Collapsing Nodes</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+Each node has a maximum capacity of 16 leaves and metadata pointers.  If the</div><div class='add'>+insertion algorithm finds that it is trying to insert a 17th object into a</div><div class='add'>+node, that node will be split such that at least two leaves that have a common</div><div class='add'>+key segment at that level end up in a separate node rooted on that slot for</div><div class='add'>+that common key segment.</div><div class='add'>+</div><div class='add'>+If the leaves in a full node and the leaf that is being inserted are</div><div class='add'>+sufficiently similar, then a shortcut will be inserted into the tree.</div><div class='add'>+</div><div class='add'>+When the number of objects in the subtree rooted at a node falls to 16 or</div><div class='add'>+fewer, then the subtree will be collapsed down to a single node - and this will</div><div class='add'>+ripple towards the root if possible.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Non-Recursive Iteration</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Each node and shortcut contains a back pointer to its parent and the number of</div><div class='add'>+slot in that parent that points to it.  None-recursive iteration uses these to</div><div class='add'>+proceed rootwards through the tree, going to the parent node, slot N + 1 to</div><div class='add'>+make sure progress is made without the need for a stack.</div><div class='add'>+</div><div class='add'>+The backpointers, however, make simultaneous alteration and iteration tricky.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Simultaneous Alteration And Iteration</div><div class='add'>+-------------------------------------</div><div class='add'>+</div><div class='add'>+There are a number of cases to consider:</div><div class='add'>+</div><div class='add'>+1. Simple insert/replace.  This involves simply replacing a NULL or old</div><div class='add'>+   matching leaf pointer with the pointer to the new leaf after a barrier.</div><div class='add'>+   The metadata blocks don't change otherwise.  An old leaf won't be freed</div><div class='add'>+   until after the RCU grace period.</div><div class='add'>+</div><div class='add'>+2. Simple delete.  This involves just clearing an old matching leaf.  The</div><div class='add'>+   metadata blocks don't change otherwise.  The old leaf won't be freed until</div><div class='add'>+   after the RCU grace period.</div><div class='add'>+</div><div class='add'>+3. Insertion replacing part of a subtree that we haven't yet entered.  This</div><div class='add'>+   may involve replacement of part of that subtree - but that won't affect</div><div class='add'>+   the iteration as we won't have reached the pointer to it yet and the</div><div class='add'>+   ancestry blocks are not replaced (the layout of those does not change).</div><div class='add'>+</div><div class='add'>+4. Insertion replacing nodes that we're actively processing.  This isn't a</div><div class='add'>+   problem as we've passed the anchoring pointer and won't switch onto the</div><div class='add'>+   new layout until we follow the back pointers - at which point we've</div><div class='add'>+   already examined the leaves in the replaced node (we iterate over all the</div><div class='add'>+   leaves in a node before following any of its metadata pointers).</div><div class='add'>+</div><div class='add'>+   We might, however, re-see some leaves that have been split out into a new</div><div class='add'>+   branch that's in a slot further along than we were at.</div><div class='add'>+</div><div class='add'>+5. Insertion replacing nodes that we're processing a dependent branch of.</div><div class='add'>+   This won't affect us until we follow the back pointers.  Similar to (4).</div><div class='add'>+</div><div class='add'>+6. Deletion collapsing a branch under us.  This doesn't affect us because the</div><div class='add'>+   back pointers will get us back to the parent of the new node before we</div><div class='add'>+   could see the new node.  The entire collapsed subtree is thrown away</div><div class='add'>+   unchanged - and will still be rooted on the same slot, so we shouldn't</div><div class='add'>+   process it a second time as we'll go back to slot + 1.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+   Under some circumstances, we need to simultaneously change the parent</div><div class='add'>+   pointer and the parent slot pointer on a node (say, for example, we</div><div class='add'>+   inserted another node before it and moved it up a level).  We cannot do</div><div class='add'>+   this without locking against a read - so we have to replace that node too.</div><div class='add'>+</div><div class='add'>+   However, when we're changing a shortcut into a node this isn't a problem</div><div class='add'>+   as shortcuts only have one slot and so the parent slot number isn't used</div><div class='add'>+   when traversing backwards over one.  This means that it's okay to change</div><div class='add'>+   the slot number first - provided suitable barriers are used to make sure</div><div class='add'>+   the parent slot number is read after the back pointer.</div><div class='add'>+</div><div class='add'>+Obsolete blocks and leaves are freed up after an RCU grace period has passed,</div><div class='add'>+so as long as anyone doing walking or iteration holds the RCU read lock, the</div><div class='add'>+old superstructure should not go away on them.</div><div class='head'>diff --git a/Documentation/core-api/atomic_ops.rst b/Documentation/core-api/atomic_ops.rst<br/>new file mode 100644<br/>index 000000000000..55e43f1c80de<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/core-api/atomic_ops.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/atomic_ops.rst</a></div><div class='hunk'>@@ -0,0 +1,658 @@</div><div class='add'>+=======================================================</div><div class='add'>+Semantics and Behavior of Atomic and Bitmask Operations</div><div class='add'>+=======================================================</div><div class='add'>+</div><div class='add'>+:Author: David S. Miller</div><div class='add'>+</div><div class='add'>+This document is intended to serve as a guide to Linux port</div><div class='add'>+maintainers on how to implement atomic counter, bitops, and spinlock</div><div class='add'>+interfaces properly.</div><div class='add'>+</div><div class='add'>+Atomic Type And Operations</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+The atomic_t type should be defined as a signed integer and</div><div class='add'>+the atomic_long_t type as a signed long integer.  Also, they should</div><div class='add'>+be made opaque such that any kind of cast to a normal C integer type</div><div class='add'>+will fail.  Something like the following should suffice::</div><div class='add'>+</div><div class='add'>+	typedef struct { int counter; } atomic_t;</div><div class='add'>+	typedef struct { long counter; } atomic_long_t;</div><div class='add'>+</div><div class='add'>+Historically, counter has been declared volatile.  This is now discouraged.</div><div class='add'>+See :ref:`Documentation/process/volatile-considered-harmful.rst</div><div class='add'>+&lt;volatile_considered_harmful&gt;` for the complete rationale.</div><div class='add'>+</div><div class='add'>+local_t is very similar to atomic_t. If the counter is per CPU and only</div><div class='add'>+updated by one CPU, local_t is probably more appropriate. Please see</div><div class='add'>+:ref:`Documentation/core-api/local_ops.rst &lt;local_ops&gt;` for the semantics of</div><div class='add'>+local_t.</div><div class='add'>+</div><div class='add'>+The first operations to implement for atomic_t's are the initializers and</div><div class='add'>+plain reads. ::</div><div class='add'>+</div><div class='add'>+	#define ATOMIC_INIT(i)		{ (i) }</div><div class='add'>+	#define atomic_set(v, i)	((v)-&gt;counter = (i))</div><div class='add'>+</div><div class='add'>+The first macro is used in definitions, such as::</div><div class='add'>+</div><div class='add'>+	static atomic_t my_counter = ATOMIC_INIT(1);</div><div class='add'>+</div><div class='add'>+The initializer is atomic in that the return values of the atomic operations</div><div class='add'>+are guaranteed to be correct reflecting the initialized value if the</div><div class='add'>+initializer is used before runtime.  If the initializer is used at runtime, a</div><div class='add'>+proper implicit or explicit read memory barrier is needed before reading the</div><div class='add'>+value with atomic_read from another thread.</div><div class='add'>+</div><div class='add'>+As with all of the ``atomic_`` interfaces, replace the leading ``atomic_``</div><div class='add'>+with ``atomic_long_`` to operate on atomic_long_t.</div><div class='add'>+</div><div class='add'>+The second interface can be used at runtime, as in::</div><div class='add'>+</div><div class='add'>+	struct foo { atomic_t counter; };</div><div class='add'>+	...</div><div class='add'>+</div><div class='add'>+	struct foo *k;</div><div class='add'>+</div><div class='add'>+	k = kmalloc(sizeof(*k), GFP_KERNEL);</div><div class='add'>+	if (!k)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	atomic_set(&amp;k-&gt;counter, 0);</div><div class='add'>+</div><div class='add'>+The setting is atomic in that the return values of the atomic operations by</div><div class='add'>+all threads are guaranteed to be correct reflecting either the value that has</div><div class='add'>+been set with this operation or set with another operation.  A proper implicit</div><div class='add'>+or explicit memory barrier is needed before the value set with the operation</div><div class='add'>+is guaranteed to be readable with atomic_read from another thread.</div><div class='add'>+</div><div class='add'>+Next, we have::</div><div class='add'>+</div><div class='add'>+	#define atomic_read(v)	((v)-&gt;counter)</div><div class='add'>+</div><div class='add'>+which simply reads the counter value currently visible to the calling thread.</div><div class='add'>+The read is atomic in that the return value is guaranteed to be one of the</div><div class='add'>+values initialized or modified with the interface operations if a proper</div><div class='add'>+implicit or explicit memory barrier is used after possible runtime</div><div class='add'>+initialization by any other thread and the value is modified only with the</div><div class='add'>+interface operations.  atomic_read does not guarantee that the runtime</div><div class='add'>+initialization by any other thread is visible yet, so the user of the</div><div class='add'>+interface must take care of that with a proper implicit or explicit memory</div><div class='add'>+barrier.</div><div class='add'>+</div><div class='add'>+.. warning::</div><div class='add'>+</div><div class='add'>+	``atomic_read()`` and ``atomic_set()`` DO NOT IMPLY BARRIERS!</div><div class='add'>+</div><div class='add'>+	Some architectures may choose to use the volatile keyword, barriers, or</div><div class='add'>+	inline assembly to guarantee some degree of immediacy for atomic_read()</div><div class='add'>+	and atomic_set().  This is not uniformly guaranteed, and may change in</div><div class='add'>+	the future, so all users of atomic_t should treat atomic_read() and</div><div class='add'>+	atomic_set() as simple C statements that may be reordered or optimized</div><div class='add'>+	away entirely by the compiler or processor, and explicitly invoke the</div><div class='add'>+	appropriate compiler and/or memory barrier for each use case.  Failure</div><div class='add'>+	to do so will result in code that may suddenly break when used with</div><div class='add'>+	different architectures or compiler optimizations, or even changes in</div><div class='add'>+	unrelated code which changes how the compiler optimizes the section</div><div class='add'>+	accessing atomic_t variables.</div><div class='add'>+</div><div class='add'>+Properly aligned pointers, longs, ints, and chars (and unsigned</div><div class='add'>+equivalents) may be atomically loaded from and stored to in the same</div><div class='add'>+sense as described for atomic_read() and atomic_set().  The READ_ONCE()</div><div class='add'>+and WRITE_ONCE() macros should be used to prevent the compiler from using</div><div class='add'>+optimizations that might otherwise optimize accesses out of existence on</div><div class='add'>+the one hand, or that might create unsolicited accesses on the other.</div><div class='add'>+</div><div class='add'>+For example consider the following code::</div><div class='add'>+</div><div class='add'>+	while (a &gt; 0)</div><div class='add'>+		do_something();</div><div class='add'>+</div><div class='add'>+If the compiler can prove that do_something() does not store to the</div><div class='add'>+variable a, then the compiler is within its rights transforming this to</div><div class='add'>+the following::</div><div class='add'>+</div><div class='add'>+	tmp = a;</div><div class='add'>+	if (a &gt; 0)</div><div class='add'>+		for (;;)</div><div class='add'>+			do_something();</div><div class='add'>+</div><div class='add'>+If you don't want the compiler to do this (and you probably don't), then</div><div class='add'>+you should use something like the following::</div><div class='add'>+</div><div class='add'>+	while (READ_ONCE(a) &lt; 0)</div><div class='add'>+		do_something();</div><div class='add'>+</div><div class='add'>+Alternatively, you could place a barrier() call in the loop.</div><div class='add'>+</div><div class='add'>+For another example, consider the following code::</div><div class='add'>+</div><div class='add'>+	tmp_a = a;</div><div class='add'>+	do_something_with(tmp_a);</div><div class='add'>+	do_something_else_with(tmp_a);</div><div class='add'>+</div><div class='add'>+If the compiler can prove that do_something_with() does not store to the</div><div class='add'>+variable a, then the compiler is within its rights to manufacture an</div><div class='add'>+additional load as follows::</div><div class='add'>+</div><div class='add'>+	tmp_a = a;</div><div class='add'>+	do_something_with(tmp_a);</div><div class='add'>+	tmp_a = a;</div><div class='add'>+	do_something_else_with(tmp_a);</div><div class='add'>+</div><div class='add'>+This could fatally confuse your code if it expected the same value</div><div class='add'>+to be passed to do_something_with() and do_something_else_with().</div><div class='add'>+</div><div class='add'>+The compiler would be likely to manufacture this additional load if</div><div class='add'>+do_something_with() was an inline function that made very heavy use</div><div class='add'>+of registers: reloading from variable a could save a flush to the</div><div class='add'>+stack and later reload.  To prevent the compiler from attacking your</div><div class='add'>+code in this manner, write the following::</div><div class='add'>+</div><div class='add'>+	tmp_a = READ_ONCE(a);</div><div class='add'>+	do_something_with(tmp_a);</div><div class='add'>+	do_something_else_with(tmp_a);</div><div class='add'>+</div><div class='add'>+For a final example, consider the following code, assuming that the</div><div class='add'>+variable a is set at boot time before the second CPU is brought online</div><div class='add'>+and never changed later, so that memory barriers are not needed::</div><div class='add'>+</div><div class='add'>+	if (a)</div><div class='add'>+		b = 9;</div><div class='add'>+	else</div><div class='add'>+		b = 42;</div><div class='add'>+</div><div class='add'>+The compiler is within its rights to manufacture an additional store</div><div class='add'>+by transforming the above code into the following::</div><div class='add'>+</div><div class='add'>+	b = 42;</div><div class='add'>+	if (a)</div><div class='add'>+		b = 9;</div><div class='add'>+</div><div class='add'>+This could come as a fatal surprise to other code running concurrently</div><div class='add'>+that expected b to never have the value 42 if a was zero.  To prevent</div><div class='add'>+the compiler from doing this, write something like::</div><div class='add'>+</div><div class='add'>+	if (a)</div><div class='add'>+		WRITE_ONCE(b, 9);</div><div class='add'>+	else</div><div class='add'>+		WRITE_ONCE(b, 42);</div><div class='add'>+</div><div class='add'>+Don't even -think- about doing this without proper use of memory barriers,</div><div class='add'>+locks, or atomic operations if variable a can change at runtime!</div><div class='add'>+</div><div class='add'>+.. warning::</div><div class='add'>+</div><div class='add'>+	``READ_ONCE()`` OR ``WRITE_ONCE()`` DO NOT IMPLY A BARRIER!</div><div class='add'>+</div><div class='add'>+Now, we move onto the atomic operation interfaces typically implemented with</div><div class='add'>+the help of assembly code. ::</div><div class='add'>+</div><div class='add'>+	void atomic_add(int i, atomic_t *v);</div><div class='add'>+	void atomic_sub(int i, atomic_t *v);</div><div class='add'>+	void atomic_inc(atomic_t *v);</div><div class='add'>+	void atomic_dec(atomic_t *v);</div><div class='add'>+</div><div class='add'>+These four routines add and subtract integral values to/from the given</div><div class='add'>+atomic_t value.  The first two routines pass explicit integers by</div><div class='add'>+which to make the adjustment, whereas the latter two use an implicit</div><div class='add'>+adjustment value of "1".</div><div class='add'>+</div><div class='add'>+One very important aspect of these two routines is that they DO NOT</div><div class='add'>+require any explicit memory barriers.  They need only perform the</div><div class='add'>+atomic_t counter update in an SMP safe manner.</div><div class='add'>+</div><div class='add'>+Next, we have::</div><div class='add'>+</div><div class='add'>+	int atomic_inc_return(atomic_t *v);</div><div class='add'>+	int atomic_dec_return(atomic_t *v);</div><div class='add'>+</div><div class='add'>+These routines add 1 and subtract 1, respectively, from the given</div><div class='add'>+atomic_t and return the new counter value after the operation is</div><div class='add'>+performed.</div><div class='add'>+</div><div class='add'>+Unlike the above routines, it is required that these primitives</div><div class='add'>+include explicit memory barriers that are performed before and after</div><div class='add'>+the operation.  It must be done such that all memory operations before</div><div class='add'>+and after the atomic operation calls are strongly ordered with respect</div><div class='add'>+to the atomic operation itself.</div><div class='add'>+</div><div class='add'>+For example, it should behave as if a smp_mb() call existed both</div><div class='add'>+before and after the atomic operation.</div><div class='add'>+</div><div class='add'>+If the atomic instructions used in an implementation provide explicit</div><div class='add'>+memory barrier semantics which satisfy the above requirements, that is</div><div class='add'>+fine as well.</div><div class='add'>+</div><div class='add'>+Let's move on::</div><div class='add'>+</div><div class='add'>+	int atomic_add_return(int i, atomic_t *v);</div><div class='add'>+	int atomic_sub_return(int i, atomic_t *v);</div><div class='add'>+</div><div class='add'>+These behave just like atomic_{inc,dec}_return() except that an</div><div class='add'>+explicit counter adjustment is given instead of the implicit "1".</div><div class='add'>+This means that like atomic_{inc,dec}_return(), the memory barrier</div><div class='add'>+semantics are required.</div><div class='add'>+</div><div class='add'>+Next::</div><div class='add'>+</div><div class='add'>+	int atomic_inc_and_test(atomic_t *v);</div><div class='add'>+	int atomic_dec_and_test(atomic_t *v);</div><div class='add'>+</div><div class='add'>+These two routines increment and decrement by 1, respectively, the</div><div class='add'>+given atomic counter.  They return a boolean indicating whether the</div><div class='add'>+resulting counter value was zero or not.</div><div class='add'>+</div><div class='add'>+Again, these primitives provide explicit memory barrier semantics around</div><div class='add'>+the atomic operation::</div><div class='add'>+</div><div class='add'>+	int atomic_sub_and_test(int i, atomic_t *v);</div><div class='add'>+</div><div class='add'>+This is identical to atomic_dec_and_test() except that an explicit</div><div class='add'>+decrement is given instead of the implicit "1".  This primitive must</div><div class='add'>+provide explicit memory barrier semantics around the operation::</div><div class='add'>+</div><div class='add'>+	int atomic_add_negative(int i, atomic_t *v);</div><div class='add'>+</div><div class='add'>+The given increment is added to the given atomic counter value.  A boolean</div><div class='add'>+is return which indicates whether the resulting counter value is negative.</div><div class='add'>+This primitive must provide explicit memory barrier semantics around</div><div class='add'>+the operation.</div><div class='add'>+</div><div class='add'>+Then::</div><div class='add'>+</div><div class='add'>+	int atomic_xchg(atomic_t *v, int new);</div><div class='add'>+</div><div class='add'>+This performs an atomic exchange operation on the atomic variable v, setting</div><div class='add'>+the given new value.  It returns the old value that the atomic variable v had</div><div class='add'>+just before the operation.</div><div class='add'>+</div><div class='add'>+atomic_xchg must provide explicit memory barriers around the operation. ::</div><div class='add'>+</div><div class='add'>+	int atomic_cmpxchg(atomic_t *v, int old, int new);</div><div class='add'>+</div><div class='add'>+This performs an atomic compare exchange operation on the atomic value v,</div><div class='add'>+with the given old and new values. Like all atomic_xxx operations,</div><div class='add'>+atomic_cmpxchg will only satisfy its atomicity semantics as long as all</div><div class='add'>+other accesses of \*v are performed through atomic_xxx operations.</div><div class='add'>+</div><div class='add'>+atomic_cmpxchg must provide explicit memory barriers around the operation,</div><div class='add'>+although if the comparison fails then no memory ordering guarantees are</div><div class='add'>+required.</div><div class='add'>+</div><div class='add'>+The semantics for atomic_cmpxchg are the same as those defined for 'cas'</div><div class='add'>+below.</div><div class='add'>+</div><div class='add'>+Finally::</div><div class='add'>+</div><div class='add'>+	int atomic_add_unless(atomic_t *v, int a, int u);</div><div class='add'>+</div><div class='add'>+If the atomic value v is not equal to u, this function adds a to v, and</div><div class='add'>+returns non zero. If v is equal to u then it returns zero. This is done as</div><div class='add'>+an atomic operation.</div><div class='add'>+</div><div class='add'>+atomic_add_unless must provide explicit memory barriers around the</div><div class='add'>+operation unless it fails (returns 0).</div><div class='add'>+</div><div class='add'>+atomic_inc_not_zero, equivalent to atomic_add_unless(v, 1, 0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+If a caller requires memory barrier semantics around an atomic_t</div><div class='add'>+operation which does not return a value, a set of interfaces are</div><div class='add'>+defined which accomplish this::</div><div class='add'>+</div><div class='add'>+	void smp_mb__before_atomic(void);</div><div class='add'>+	void smp_mb__after_atomic(void);</div><div class='add'>+</div><div class='add'>+For example, smp_mb__before_atomic() can be used like so::</div><div class='add'>+</div><div class='add'>+	obj-&gt;dead = 1;</div><div class='add'>+	smp_mb__before_atomic();</div><div class='add'>+	atomic_dec(&amp;obj-&gt;ref_count);</div><div class='add'>+</div><div class='add'>+It makes sure that all memory operations preceding the atomic_dec()</div><div class='add'>+call are strongly ordered with respect to the atomic counter</div><div class='add'>+operation.  In the above example, it guarantees that the assignment of</div><div class='add'>+"1" to obj-&gt;dead will be globally visible to other cpus before the</div><div class='add'>+atomic counter decrement.</div><div class='add'>+</div><div class='add'>+Without the explicit smp_mb__before_atomic() call, the</div><div class='add'>+implementation could legally allow the atomic counter update visible</div><div class='add'>+to other cpus before the "obj-&gt;dead = 1;" assignment.</div><div class='add'>+</div><div class='add'>+A missing memory barrier in the cases where they are required by the</div><div class='add'>+atomic_t implementation above can have disastrous results.  Here is</div><div class='add'>+an example, which follows a pattern occurring frequently in the Linux</div><div class='add'>+kernel.  It is the use of atomic counters to implement reference</div><div class='add'>+counting, and it works such that once the counter falls to zero it can</div><div class='add'>+be guaranteed that no other entity can be accessing the object::</div><div class='add'>+</div><div class='add'>+	static void obj_list_add(struct obj *obj, struct list_head *head)</div><div class='add'>+	{</div><div class='add'>+		obj-&gt;active = 1;</div><div class='add'>+		list_add(&amp;obj-&gt;list, head);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	static void obj_list_del(struct obj *obj)</div><div class='add'>+	{</div><div class='add'>+		list_del(&amp;obj-&gt;list);</div><div class='add'>+		obj-&gt;active = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	static void obj_destroy(struct obj *obj)</div><div class='add'>+	{</div><div class='add'>+		BUG_ON(obj-&gt;active);</div><div class='add'>+		kfree(obj);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	struct obj *obj_list_peek(struct list_head *head)</div><div class='add'>+	{</div><div class='add'>+		if (!list_empty(head)) {</div><div class='add'>+			struct obj *obj;</div><div class='add'>+</div><div class='add'>+			obj = list_entry(head-&gt;next, struct obj, list);</div><div class='add'>+			atomic_inc(&amp;obj-&gt;refcnt);</div><div class='add'>+			return obj;</div><div class='add'>+		}</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	void obj_poke(void)</div><div class='add'>+	{</div><div class='add'>+		struct obj *obj;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;global_list_lock);</div><div class='add'>+		obj = obj_list_peek(&amp;global_list);</div><div class='add'>+		spin_unlock(&amp;global_list_lock);</div><div class='add'>+</div><div class='add'>+		if (obj) {</div><div class='add'>+			obj-&gt;ops-&gt;poke(obj);</div><div class='add'>+			if (atomic_dec_and_test(&amp;obj-&gt;refcnt))</div><div class='add'>+				obj_destroy(obj);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	void obj_timeout(struct obj *obj)</div><div class='add'>+	{</div><div class='add'>+		spin_lock(&amp;global_list_lock);</div><div class='add'>+		obj_list_del(obj);</div><div class='add'>+		spin_unlock(&amp;global_list_lock);</div><div class='add'>+</div><div class='add'>+		if (atomic_dec_and_test(&amp;obj-&gt;refcnt))</div><div class='add'>+			obj_destroy(obj);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+	This is a simplification of the ARP queue management in the generic</div><div class='add'>+	neighbour discover code of the networking.  Olaf Kirch found a bug wrt.</div><div class='add'>+	memory barriers in kfree_skb() that exposed the atomic_t memory barrier</div><div class='add'>+	requirements quite clearly.</div><div class='add'>+</div><div class='add'>+Given the above scheme, it must be the case that the obj-&gt;active</div><div class='add'>+update done by the obj list deletion be visible to other processors</div><div class='add'>+before the atomic counter decrement is performed.</div><div class='add'>+</div><div class='add'>+Otherwise, the counter could fall to zero, yet obj-&gt;active would still</div><div class='add'>+be set, thus triggering the assertion in obj_destroy().  The error</div><div class='add'>+sequence looks like this::</div><div class='add'>+</div><div class='add'>+	cpu 0				cpu 1</div><div class='add'>+	obj_poke()			obj_timeout()</div><div class='add'>+	obj = obj_list_peek();</div><div class='add'>+	... gains ref to obj, refcnt=2</div><div class='add'>+					obj_list_del(obj);</div><div class='add'>+					obj-&gt;active = 0 ...</div><div class='add'>+					... visibility delayed ...</div><div class='add'>+					atomic_dec_and_test()</div><div class='add'>+					... refcnt drops to 1 ...</div><div class='add'>+	atomic_dec_and_test()</div><div class='add'>+	... refcount drops to 0 ...</div><div class='add'>+	obj_destroy()</div><div class='add'>+	BUG() triggers since obj-&gt;active</div><div class='add'>+	still seen as one</div><div class='add'>+					obj-&gt;active update visibility occurs</div><div class='add'>+</div><div class='add'>+With the memory barrier semantics required of the atomic_t operations</div><div class='add'>+which return values, the above sequence of memory visibility can never</div><div class='add'>+happen.  Specifically, in the above case the atomic_dec_and_test()</div><div class='add'>+counter decrement would not become globally visible until the</div><div class='add'>+obj-&gt;active update does.</div><div class='add'>+</div><div class='add'>+As a historical note, 32-bit Sparc used to only allow usage of</div><div class='add'>+24-bits of its atomic_t type.  This was because it used 8 bits</div><div class='add'>+as a spinlock for SMP safety.  Sparc32 lacked a "compare and swap"</div><div class='add'>+type instruction.  However, 32-bit Sparc has since been moved over</div><div class='add'>+to a "hash table of spinlocks" scheme, that allows the full 32-bit</div><div class='add'>+counter to be realized.  Essentially, an array of spinlocks are</div><div class='add'>+indexed into based upon the address of the atomic_t being operated</div><div class='add'>+on, and that lock protects the atomic operation.  Parisc uses the</div><div class='add'>+same scheme.</div><div class='add'>+</div><div class='add'>+Another note is that the atomic_t operations returning values are</div><div class='add'>+extremely slow on an old 386.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Atomic Bitmask</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+We will now cover the atomic bitmask operations.  You will find that</div><div class='add'>+their SMP and memory barrier semantics are similar in shape and scope</div><div class='add'>+to the atomic_t ops above.</div><div class='add'>+</div><div class='add'>+Native atomic bit operations are defined to operate on objects aligned</div><div class='add'>+to the size of an "unsigned long" C data type, and are least of that</div><div class='add'>+size.  The endianness of the bits within each "unsigned long" are the</div><div class='add'>+native endianness of the cpu. ::</div><div class='add'>+</div><div class='add'>+	void set_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	void clear_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	void change_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+</div><div class='add'>+These routines set, clear, and change, respectively, the bit number</div><div class='add'>+indicated by "nr" on the bit mask pointed to by "ADDR".</div><div class='add'>+</div><div class='add'>+They must execute atomically, yet there are no implicit memory barrier</div><div class='add'>+semantics required of these interfaces. ::</div><div class='add'>+</div><div class='add'>+	int test_and_set_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	int test_and_clear_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	int test_and_change_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+</div><div class='add'>+Like the above, except that these routines return a boolean which</div><div class='add'>+indicates whether the changed bit was set _BEFORE_ the atomic bit</div><div class='add'>+operation.</div><div class='add'>+</div><div class='add'>+WARNING! It is incredibly important that the value be a boolean,</div><div class='add'>+ie. "0" or "1".  Do not try to be fancy and save a few instructions by</div><div class='add'>+declaring the above to return "long" and just returning something like</div><div class='add'>+"old_val &amp; mask" because that will not work.</div><div class='add'>+</div><div class='add'>+For one thing, this return value gets truncated to int in many code</div><div class='add'>+paths using these interfaces, so on 64-bit if the bit is set in the</div><div class='add'>+upper 32-bits then testers will never see that.</div><div class='add'>+</div><div class='add'>+One great example of where this problem crops up are the thread_info</div><div class='add'>+flag operations.  Routines such as test_and_set_ti_thread_flag() chop</div><div class='add'>+the return value into an int.  There are other places where things</div><div class='add'>+like this occur as well.</div><div class='add'>+</div><div class='add'>+These routines, like the atomic_t counter operations returning values,</div><div class='add'>+must provide explicit memory barrier semantics around their execution.</div><div class='add'>+All memory operations before the atomic bit operation call must be</div><div class='add'>+made visible globally before the atomic bit operation is made visible.</div><div class='add'>+Likewise, the atomic bit operation must be visible globally before any</div><div class='add'>+subsequent memory operation is made visible.  For example::</div><div class='add'>+</div><div class='add'>+	obj-&gt;dead = 1;</div><div class='add'>+	if (test_and_set_bit(0, &amp;obj-&gt;flags))</div><div class='add'>+		/* ... */;</div><div class='add'>+	obj-&gt;killed = 1;</div><div class='add'>+</div><div class='add'>+The implementation of test_and_set_bit() must guarantee that</div><div class='add'>+"obj-&gt;dead = 1;" is visible to cpus before the atomic memory operation</div><div class='add'>+done by test_and_set_bit() becomes visible.  Likewise, the atomic</div><div class='add'>+memory operation done by test_and_set_bit() must become visible before</div><div class='add'>+"obj-&gt;killed = 1;" is visible.</div><div class='add'>+</div><div class='add'>+Finally there is the basic operation::</div><div class='add'>+</div><div class='add'>+	int test_bit(unsigned long nr, __const__ volatile unsigned long *addr);</div><div class='add'>+</div><div class='add'>+Which returns a boolean indicating if bit "nr" is set in the bitmask</div><div class='add'>+pointed to by "addr".</div><div class='add'>+</div><div class='add'>+If explicit memory barriers are required around {set,clear}_bit() (which do</div><div class='add'>+not return a value, and thus does not need to provide memory barrier</div><div class='add'>+semantics), two interfaces are provided::</div><div class='add'>+</div><div class='add'>+	void smp_mb__before_atomic(void);</div><div class='add'>+	void smp_mb__after_atomic(void);</div><div class='add'>+</div><div class='add'>+They are used as follows, and are akin to their atomic_t operation</div><div class='add'>+brothers::</div><div class='add'>+</div><div class='add'>+	/* All memory operations before this call will</div><div class='add'>+	 * be globally visible before the clear_bit().</div><div class='add'>+	 */</div><div class='add'>+	smp_mb__before_atomic();</div><div class='add'>+	clear_bit( ... );</div><div class='add'>+</div><div class='add'>+	/* The clear_bit() will be visible before all</div><div class='add'>+	 * subsequent memory operations.</div><div class='add'>+	 */</div><div class='add'>+	 smp_mb__after_atomic();</div><div class='add'>+</div><div class='add'>+There are two special bitops with lock barrier semantics (acquire/release,</div><div class='add'>+same as spinlocks). These operate in the same way as their non-_lock/unlock</div><div class='add'>+postfixed variants, except that they are to provide acquire/release semantics,</div><div class='add'>+respectively. This means they can be used for bit_spin_trylock and</div><div class='add'>+bit_spin_unlock type operations without specifying any more barriers. ::</div><div class='add'>+</div><div class='add'>+	int test_and_set_bit_lock(unsigned long nr, unsigned long *addr);</div><div class='add'>+	void clear_bit_unlock(unsigned long nr, unsigned long *addr);</div><div class='add'>+	void __clear_bit_unlock(unsigned long nr, unsigned long *addr);</div><div class='add'>+</div><div class='add'>+The __clear_bit_unlock version is non-atomic, however it still implements</div><div class='add'>+unlock barrier semantics. This can be useful if the lock itself is protecting</div><div class='add'>+the other bits in the word.</div><div class='add'>+</div><div class='add'>+Finally, there are non-atomic versions of the bitmask operations</div><div class='add'>+provided.  They are used in contexts where some other higher-level SMP</div><div class='add'>+locking scheme is being used to protect the bitmask, and thus less</div><div class='add'>+expensive non-atomic operations may be used in the implementation.</div><div class='add'>+They have names similar to the above bitmask operation interfaces,</div><div class='add'>+except that two underscores are prefixed to the interface name. ::</div><div class='add'>+</div><div class='add'>+	void __set_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	void __clear_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	void __change_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	int __test_and_set_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	int __test_and_clear_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	int __test_and_change_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+</div><div class='add'>+These non-atomic variants also do not require any special memory</div><div class='add'>+barrier semantics.</div><div class='add'>+</div><div class='add'>+The routines xchg() and cmpxchg() must provide the same exact</div><div class='add'>+memory-barrier semantics as the atomic and bit operations returning</div><div class='add'>+values.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+	If someone wants to use xchg(), cmpxchg() and their variants,</div><div class='add'>+	linux/atomic.h should be included rather than asm/cmpxchg.h, unless the</div><div class='add'>+	code is in arch/* and can take care of itself.</div><div class='add'>+</div><div class='add'>+Spinlocks and rwlocks have memory barrier expectations as well.</div><div class='add'>+The rule to follow is simple:</div><div class='add'>+</div><div class='add'>+1) When acquiring a lock, the implementation must make it globally</div><div class='add'>+   visible before any subsequent memory operation.</div><div class='add'>+</div><div class='add'>+2) When releasing a lock, the implementation must make it such that</div><div class='add'>+   all previous memory operations are globally visible before the</div><div class='add'>+   lock release.</div><div class='add'>+</div><div class='add'>+Which finally brings us to _atomic_dec_and_lock().  There is an</div><div class='add'>+architecture-neutral version implemented in lib/dec_and_lock.c,</div><div class='add'>+but most platforms will wish to optimize this in assembler. ::</div><div class='add'>+</div><div class='add'>+	int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);</div><div class='add'>+</div><div class='add'>+Atomically decrement the given counter, and if will drop to zero</div><div class='add'>+atomically acquire the given spinlock and perform the decrement</div><div class='add'>+of the counter to zero.  If it does not drop to zero, do nothing</div><div class='add'>+with the spinlock.</div><div class='add'>+</div><div class='add'>+It is actually pretty simple to get the memory barrier correct.</div><div class='add'>+Simply satisfy the spinlock grab requirements, which is make</div><div class='add'>+sure the spinlock operation is globally visible before any</div><div class='add'>+subsequent memory operation.</div><div class='add'>+</div><div class='add'>+We can demonstrate this operation more clearly if we define</div><div class='add'>+an abstract atomic operation::</div><div class='add'>+</div><div class='add'>+	long cas(long *mem, long old, long new);</div><div class='add'>+</div><div class='add'>+"cas" stands for "compare and swap".  It atomically:</div><div class='add'>+</div><div class='add'>+1) Compares "old" with the value currently at "mem".</div><div class='add'>+2) If they are equal, "new" is written to "mem".</div><div class='add'>+3) Regardless, the current value at "mem" is returned.</div><div class='add'>+</div><div class='add'>+As an example usage, here is what an atomic counter update</div><div class='add'>+might look like::</div><div class='add'>+</div><div class='add'>+	void example_atomic_inc(long *counter)</div><div class='add'>+	{</div><div class='add'>+		long old, new, ret;</div><div class='add'>+</div><div class='add'>+		while (1) {</div><div class='add'>+			old = *counter;</div><div class='add'>+			new = old + 1;</div><div class='add'>+</div><div class='add'>+			ret = cas(counter, old, new);</div><div class='add'>+			if (ret == old)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+Let's use cas() in order to build a pseudo-C atomic_dec_and_lock()::</div><div class='add'>+</div><div class='add'>+	int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)</div><div class='add'>+	{</div><div class='add'>+		long old, new, ret;</div><div class='add'>+		int went_to_zero;</div><div class='add'>+</div><div class='add'>+		went_to_zero = 0;</div><div class='add'>+		while (1) {</div><div class='add'>+			old = atomic_read(atomic);</div><div class='add'>+			new = old - 1;</div><div class='add'>+			if (new == 0) {</div><div class='add'>+				went_to_zero = 1;</div><div class='add'>+				spin_lock(lock);</div><div class='add'>+			}</div><div class='add'>+			ret = cas(atomic, old, new);</div><div class='add'>+			if (ret == old)</div><div class='add'>+				break;</div><div class='add'>+			if (went_to_zero) {</div><div class='add'>+				spin_unlock(lock);</div><div class='add'>+				went_to_zero = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return went_to_zero;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+Now, as far as memory barriers go, as long as spin_lock()</div><div class='add'>+strictly orders all subsequent memory operations (including</div><div class='add'>+the cas()) with respect to itself, things will be fine.</div><div class='add'>+</div><div class='add'>+Said another way, _atomic_dec_and_lock() must guarantee that</div><div class='add'>+a counter dropping to zero is never made visible before the</div><div class='add'>+spinlock being acquired.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+	Note that this also means that for the case where the counter is not</div><div class='add'>+	dropping to zero, there are no memory ordering requirements.</div><div class='head'>diff --git a/Documentation/core-api/conf.py b/Documentation/core-api/conf.py<br/>new file mode 100644<br/>index 000000000000..db1f7659f3da<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/core-api/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/conf.py</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# -*- coding: utf-8; mode: python -*-</div><div class='add'>+</div><div class='add'>+project = "Core-API Documentation"</div><div class='add'>+</div><div class='add'>+tags.add("subproject")</div><div class='add'>+</div><div class='add'>+latex_documents = [</div><div class='add'>+    ('index', 'core-api.tex', project,</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+]</div><div class='head'>diff --git a/Documentation/core-api/cpu_hotplug.rst b/Documentation/core-api/cpu_hotplug.rst<br/>new file mode 100644<br/>index 000000000000..4a50ab7817f7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/core-api/cpu_hotplug.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/cpu_hotplug.rst</a></div><div class='hunk'>@@ -0,0 +1,372 @@</div><div class='add'>+=========================</div><div class='add'>+CPU hotplug in the Kernel</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+:Date: December, 2016</div><div class='add'>+:Author: Sebastian Andrzej Siewior &lt;bigeasy@linutronix.de&gt;,</div><div class='add'>+          Rusty Russell &lt;rusty@rustcorp.com.au&gt;,</div><div class='add'>+          Srivatsa Vaddagiri &lt;vatsa@in.ibm.com&gt;,</div><div class='add'>+          Ashok Raj &lt;ashok.raj@intel.com&gt;,</div><div class='add'>+          Joel Schopp &lt;jschopp@austin.ibm.com&gt;</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+Modern advances in system architectures have introduced advanced error</div><div class='add'>+reporting and correction capabilities in processors. There are couple OEMS that</div><div class='add'>+support NUMA hardware which are hot pluggable as well, where physical node</div><div class='add'>+insertion and removal require support for CPU hotplug.</div><div class='add'>+</div><div class='add'>+Such advances require CPUs available to a kernel to be removed either for</div><div class='add'>+provisioning reasons, or for RAS purposes to keep an offending CPU off</div><div class='add'>+system execution path. Hence the need for CPU hotplug support in the</div><div class='add'>+Linux kernel.</div><div class='add'>+</div><div class='add'>+A more novel use of CPU-hotplug support is its use today in suspend resume</div><div class='add'>+support for SMP. Dual-core and HT support makes even a laptop run SMP kernels</div><div class='add'>+which didn't support these methods.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Command Line Switches</div><div class='add'>+=====================</div><div class='add'>+``maxcpus=n``</div><div class='add'>+  Restrict boot time CPUs to *n*. Say if you have fourV CPUs, using</div><div class='add'>+  ``maxcpus=2`` will only boot two. You can choose to bring the</div><div class='add'>+  other CPUs later online.</div><div class='add'>+</div><div class='add'>+``nr_cpus=n``</div><div class='add'>+  Restrict the total amount CPUs the kernel will support. If the number</div><div class='add'>+  supplied here is lower than the number of physically available CPUs than</div><div class='add'>+  those CPUs can not be brought online later.</div><div class='add'>+</div><div class='add'>+``additional_cpus=n``</div><div class='add'>+  Use this to limit hotpluggable CPUs. This option sets</div><div class='add'>+  ``cpu_possible_mask = cpu_present_mask + additional_cpus``</div><div class='add'>+</div><div class='add'>+  This option is limited to the IA64 architecture.</div><div class='add'>+</div><div class='add'>+``possible_cpus=n``</div><div class='add'>+  This option sets ``possible_cpus`` bits in ``cpu_possible_mask``.</div><div class='add'>+</div><div class='add'>+  This option is limited to the X86 and S390 architecture.</div><div class='add'>+</div><div class='add'>+``cede_offline={"off","on"}``</div><div class='add'>+  Use this option to disable/enable putting offlined processors to an extended</div><div class='add'>+  ``H_CEDE`` state on supported pseries platforms. If nothing is specified,</div><div class='add'>+  ``cede_offline`` is set to "on".</div><div class='add'>+</div><div class='add'>+  This option is limited to the PowerPC architecture.</div><div class='add'>+</div><div class='add'>+``cpu0_hotplug``</div><div class='add'>+  Allow to shutdown CPU0.</div><div class='add'>+</div><div class='add'>+  This option is limited to the X86 architecture.</div><div class='add'>+</div><div class='add'>+CPU maps</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+``cpu_possible_mask``</div><div class='add'>+  Bitmap of possible CPUs that can ever be available in the</div><div class='add'>+  system. This is used to allocate some boot time memory for per_cpu variables</div><div class='add'>+  that aren't designed to grow/shrink as CPUs are made available or removed.</div><div class='add'>+  Once set during boot time discovery phase, the map is static, i.e no bits</div><div class='add'>+  are added or removed anytime. Trimming it accurately for your system needs</div><div class='add'>+  upfront can save some boot time memory.</div><div class='add'>+</div><div class='add'>+``cpu_online_mask``</div><div class='add'>+  Bitmap of all CPUs currently online. Its set in ``__cpu_up()``</div><div class='add'>+  after a CPU is available for kernel scheduling and ready to receive</div><div class='add'>+  interrupts from devices. Its cleared when a CPU is brought down using</div><div class='add'>+  ``__cpu_disable()``, before which all OS services including interrupts are</div><div class='add'>+  migrated to another target CPU.</div><div class='add'>+</div><div class='add'>+``cpu_present_mask``</div><div class='add'>+  Bitmap of CPUs currently present in the system. Not all</div><div class='add'>+  of them may be online. When physical hotplug is processed by the relevant</div><div class='add'>+  subsystem (e.g ACPI) can change and new bit either be added or removed</div><div class='add'>+  from the map depending on the event is hot-add/hot-remove. There are currently</div><div class='add'>+  no locking rules as of now. Typical usage is to init topology during boot,</div><div class='add'>+  at which time hotplug is disabled.</div><div class='add'>+</div><div class='add'>+You really don't need to manipulate any of the system CPU maps. They should</div><div class='add'>+be read-only for most use. When setting up per-cpu resources almost always use</div><div class='add'>+``cpu_possible_mask`` or ``for_each_possible_cpu()`` to iterate. To macro</div><div class='add'>+``for_each_cpu()`` can be used to iterate over a custom CPU mask.</div><div class='add'>+</div><div class='add'>+Never use anything other than ``cpumask_t`` to represent bitmap of CPUs.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Using CPU hotplug</div><div class='add'>+=================</div><div class='add'>+The kernel option *CONFIG_HOTPLUG_CPU* needs to be enabled. It is currently</div><div class='add'>+available on multiple architectures including ARM, MIPS, PowerPC and X86. The</div><div class='add'>+configuration is done via the sysfs interface: ::</div><div class='add'>+</div><div class='add'>+ $ ls -lh /sys/devices/system/cpu</div><div class='add'>+ total 0</div><div class='add'>+ drwxr-xr-x  9 root root    0 Dec 21 16:33 cpu0</div><div class='add'>+ drwxr-xr-x  9 root root    0 Dec 21 16:33 cpu1</div><div class='add'>+ drwxr-xr-x  9 root root    0 Dec 21 16:33 cpu2</div><div class='add'>+ drwxr-xr-x  9 root root    0 Dec 21 16:33 cpu3</div><div class='add'>+ drwxr-xr-x  9 root root    0 Dec 21 16:33 cpu4</div><div class='add'>+ drwxr-xr-x  9 root root    0 Dec 21 16:33 cpu5</div><div class='add'>+ drwxr-xr-x  9 root root    0 Dec 21 16:33 cpu6</div><div class='add'>+ drwxr-xr-x  9 root root    0 Dec 21 16:33 cpu7</div><div class='add'>+ drwxr-xr-x  2 root root    0 Dec 21 16:33 hotplug</div><div class='add'>+ -r--r--r--  1 root root 4.0K Dec 21 16:33 offline</div><div class='add'>+ -r--r--r--  1 root root 4.0K Dec 21 16:33 online</div><div class='add'>+ -r--r--r--  1 root root 4.0K Dec 21 16:33 possible</div><div class='add'>+ -r--r--r--  1 root root 4.0K Dec 21 16:33 present</div><div class='add'>+</div><div class='add'>+The files *offline*, *online*, *possible*, *present* represent the CPU masks.</div><div class='add'>+Each CPU folder contains an *online* file which controls the logical on (1) and</div><div class='add'>+off (0) state. To logically shutdown CPU4: ::</div><div class='add'>+</div><div class='add'>+ $ echo 0 &gt; /sys/devices/system/cpu/cpu4/online</div><div class='add'>+  smpboot: CPU 4 is now offline</div><div class='add'>+</div><div class='add'>+Once the CPU is shutdown, it will be removed from */proc/interrupts*,</div><div class='add'>+*/proc/cpuinfo* and should also not be shown visible by the *top* command. To</div><div class='add'>+bring CPU4 back online: ::</div><div class='add'>+</div><div class='add'>+ $ echo 1 &gt; /sys/devices/system/cpu/cpu4/online</div><div class='add'>+ smpboot: Booting Node 0 Processor 4 APIC 0x1</div><div class='add'>+</div><div class='add'>+The CPU is usable again. This should work on all CPUs. CPU0 is often special</div><div class='add'>+and excluded from CPU hotplug. On X86 the kernel option</div><div class='add'>+*CONFIG_BOOTPARAM_HOTPLUG_CPU0* has to be enabled in order to be able to</div><div class='add'>+shutdown CPU0. Alternatively the kernel command option *cpu0_hotplug* can be</div><div class='add'>+used. Some known dependencies of CPU0:</div><div class='add'>+</div><div class='add'>+* Resume from hibernate/suspend. Hibernate/suspend will fail if CPU0 is offline.</div><div class='add'>+* PIC interrupts. CPU0 can't be removed if a PIC interrupt is detected.</div><div class='add'>+</div><div class='add'>+Please let Fenghua Yu &lt;fenghua.yu@intel.com&gt; know if you find any dependencies</div><div class='add'>+on CPU0.</div><div class='add'>+</div><div class='add'>+The CPU hotplug coordination</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+The offline case</div><div class='add'>+----------------</div><div class='add'>+Once a CPU has been logically shutdown the teardown callbacks of registered</div><div class='add'>+hotplug states will be invoked, starting with ``CPUHP_ONLINE`` and terminating</div><div class='add'>+at state ``CPUHP_OFFLINE``. This includes:</div><div class='add'>+</div><div class='add'>+* If tasks are frozen due to a suspend operation then *cpuhp_tasks_frozen*</div><div class='add'>+  will be set to true.</div><div class='add'>+* All processes are migrated away from this outgoing CPU to new CPUs.</div><div class='add'>+  The new CPU is chosen from each process' current cpuset, which may be</div><div class='add'>+  a subset of all online CPUs.</div><div class='add'>+* All interrupts targeted to this CPU are migrated to a new CPU</div><div class='add'>+* timers are also migrated to a new CPU</div><div class='add'>+* Once all services are migrated, kernel calls an arch specific routine</div><div class='add'>+  ``__cpu_disable()`` to perform arch specific cleanup.</div><div class='add'>+</div><div class='add'>+Using the hotplug API</div><div class='add'>+---------------------</div><div class='add'>+It is possible to receive notifications once a CPU is offline or onlined. This</div><div class='add'>+might be important to certain drivers which need to perform some kind of setup</div><div class='add'>+or clean up functions based on the number of available CPUs: ::</div><div class='add'>+</div><div class='add'>+  #include &lt;linux/cpuhotplug.h&gt;</div><div class='add'>+</div><div class='add'>+  ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "X/Y:online",</div><div class='add'>+                          Y_online, Y_prepare_down);</div><div class='add'>+</div><div class='add'>+*X* is the subsystem and *Y* the particular driver. The *Y_online* callback</div><div class='add'>+will be invoked during registration on all online CPUs. If an error</div><div class='add'>+occurs during the online callback the *Y_prepare_down* callback will be</div><div class='add'>+invoked on all CPUs on which the online callback was previously invoked.</div><div class='add'>+After registration completed, the *Y_online* callback will be invoked</div><div class='add'>+once a CPU is brought online and *Y_prepare_down* will be invoked when a</div><div class='add'>+CPU is shutdown. All resources which were previously allocated in</div><div class='add'>+*Y_online* should be released in *Y_prepare_down*.</div><div class='add'>+The return value *ret* is negative if an error occurred during the</div><div class='add'>+registration process. Otherwise a positive value is returned which</div><div class='add'>+contains the allocated hotplug for dynamically allocated states</div><div class='add'>+(*CPUHP_AP_ONLINE_DYN*). It will return zero for predefined states.</div><div class='add'>+</div><div class='add'>+The callback can be remove by invoking ``cpuhp_remove_state()``. In case of a</div><div class='add'>+dynamically allocated state (*CPUHP_AP_ONLINE_DYN*) use the returned state.</div><div class='add'>+During the removal of a hotplug state the teardown callback will be invoked.</div><div class='add'>+</div><div class='add'>+Multiple instances</div><div class='add'>+~~~~~~~~~~~~~~~~~~</div><div class='add'>+If a driver has multiple instances and each instance needs to perform the</div><div class='add'>+callback independently then it is likely that a ''multi-state'' should be used.</div><div class='add'>+First a multi-state state needs to be registered: ::</div><div class='add'>+</div><div class='add'>+  ret = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN, "X/Y:online,</div><div class='add'>+                                Y_online, Y_prepare_down);</div><div class='add'>+  Y_hp_online = ret;</div><div class='add'>+</div><div class='add'>+The ``cpuhp_setup_state_multi()`` behaves similar to ``cpuhp_setup_state()``</div><div class='add'>+except it prepares the callbacks for a multi state and does not invoke</div><div class='add'>+the callbacks. This is a one time setup.</div><div class='add'>+Once a new instance is allocated, you need to register this new instance: ::</div><div class='add'>+</div><div class='add'>+  ret = cpuhp_state_add_instance(Y_hp_online, &amp;d-&gt;node);</div><div class='add'>+</div><div class='add'>+This function will add this instance to your previously allocated</div><div class='add'>+*Y_hp_online* state and invoke the previously registered callback</div><div class='add'>+(*Y_online*) on all online CPUs. The *node* element is a ``struct</div><div class='add'>+hlist_node`` member of your per-instance data structure.</div><div class='add'>+</div><div class='add'>+On removal of the instance: ::</div><div class='add'>+  cpuhp_state_remove_instance(Y_hp_online, &amp;d-&gt;node)</div><div class='add'>+</div><div class='add'>+should be invoked which will invoke the teardown callback on all online</div><div class='add'>+CPUs.</div><div class='add'>+</div><div class='add'>+Manual setup</div><div class='add'>+~~~~~~~~~~~~</div><div class='add'>+Usually it is handy to invoke setup and teardown callbacks on registration or</div><div class='add'>+removal of a state because usually the operation needs to performed once a CPU</div><div class='add'>+goes online (offline) and during initial setup (shutdown) of the driver. However</div><div class='add'>+each registration and removal function is also available with a ``_nocalls``</div><div class='add'>+suffix which does not invoke the provided callbacks if the invocation of the</div><div class='add'>+callbacks is not desired. During the manual setup (or teardown) the functions</div><div class='add'>+``get_online_cpus()`` and ``put_online_cpus()`` should be used to inhibit CPU</div><div class='add'>+hotplug operations.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The ordering of the events</div><div class='add'>+--------------------------</div><div class='add'>+The hotplug states are defined in ``include/linux/cpuhotplug.h``:</div><div class='add'>+</div><div class='add'>+* The states *CPUHP_OFFLINE* … *CPUHP_AP_OFFLINE* are invoked before the</div><div class='add'>+  CPU is up.</div><div class='add'>+* The states *CPUHP_AP_OFFLINE* … *CPUHP_AP_ONLINE* are invoked</div><div class='add'>+  just the after the CPU has been brought up. The interrupts are off and</div><div class='add'>+  the scheduler is not yet active on this CPU. Starting with *CPUHP_AP_OFFLINE*</div><div class='add'>+  the callbacks are invoked on the target CPU.</div><div class='add'>+* The states between *CPUHP_AP_ONLINE_DYN* and *CPUHP_AP_ONLINE_DYN_END* are</div><div class='add'>+  reserved for the dynamic allocation.</div><div class='add'>+* The states are invoked in the reverse order on CPU shutdown starting with</div><div class='add'>+  *CPUHP_ONLINE* and stopping at *CPUHP_OFFLINE*. Here the callbacks are</div><div class='add'>+  invoked on the CPU that will be shutdown until *CPUHP_AP_OFFLINE*.</div><div class='add'>+</div><div class='add'>+A dynamically allocated state via *CPUHP_AP_ONLINE_DYN* is often enough.</div><div class='add'>+However if an earlier invocation during the bring up or shutdown is required</div><div class='add'>+then an explicit state should be acquired. An explicit state might also be</div><div class='add'>+required if the hotplug event requires specific ordering in respect to</div><div class='add'>+another hotplug event.</div><div class='add'>+</div><div class='add'>+Testing of hotplug states</div><div class='add'>+=========================</div><div class='add'>+One way to verify whether a custom state is working as expected or not is to</div><div class='add'>+shutdown a CPU and then put it online again. It is also possible to put the CPU</div><div class='add'>+to certain state (for instance *CPUHP_AP_ONLINE*) and then go back to</div><div class='add'>+*CPUHP_ONLINE*. This would simulate an error one state after *CPUHP_AP_ONLINE*</div><div class='add'>+which would lead to rollback to the online state.</div><div class='add'>+</div><div class='add'>+All registered states are enumerated in ``/sys/devices/system/cpu/hotplug/states``: ::</div><div class='add'>+</div><div class='add'>+ $ tail /sys/devices/system/cpu/hotplug/states</div><div class='add'>+ 138: mm/vmscan:online</div><div class='add'>+ 139: mm/vmstat:online</div><div class='add'>+ 140: lib/percpu_cnt:online</div><div class='add'>+ 141: acpi/cpu-drv:online</div><div class='add'>+ 142: base/cacheinfo:online</div><div class='add'>+ 143: virtio/net:online</div><div class='add'>+ 144: x86/mce:online</div><div class='add'>+ 145: printk:online</div><div class='add'>+ 168: sched:active</div><div class='add'>+ 169: online</div><div class='add'>+</div><div class='add'>+To rollback CPU4 to ``lib/percpu_cnt:online`` and back online just issue: ::</div><div class='add'>+</div><div class='add'>+  $ cat /sys/devices/system/cpu/cpu4/hotplug/state</div><div class='add'>+  169</div><div class='add'>+  $ echo 140 &gt; /sys/devices/system/cpu/cpu4/hotplug/target</div><div class='add'>+  $ cat /sys/devices/system/cpu/cpu4/hotplug/state</div><div class='add'>+  140</div><div class='add'>+</div><div class='add'>+It is important to note that the teardown callbac of state 140 have been</div><div class='add'>+invoked. And now get back online: ::</div><div class='add'>+</div><div class='add'>+  $ echo 169 &gt; /sys/devices/system/cpu/cpu4/hotplug/target</div><div class='add'>+  $ cat /sys/devices/system/cpu/cpu4/hotplug/state</div><div class='add'>+  169</div><div class='add'>+</div><div class='add'>+With trace events enabled, the individual steps are visible, too: ::</div><div class='add'>+</div><div class='add'>+  #  TASK-PID   CPU#    TIMESTAMP  FUNCTION</div><div class='add'>+  #     | |       |        |         |</div><div class='add'>+      bash-394  [001]  22.976: cpuhp_enter: cpu: 0004 target: 140 step: 169 (cpuhp_kick_ap_work)</div><div class='add'>+   cpuhp/4-31   [004]  22.977: cpuhp_enter: cpu: 0004 target: 140 step: 168 (sched_cpu_deactivate)</div><div class='add'>+   cpuhp/4-31   [004]  22.990: cpuhp_exit:  cpu: 0004  state: 168 step: 168 ret: 0</div><div class='add'>+   cpuhp/4-31   [004]  22.991: cpuhp_enter: cpu: 0004 target: 140 step: 144 (mce_cpu_pre_down)</div><div class='add'>+   cpuhp/4-31   [004]  22.992: cpuhp_exit:  cpu: 0004  state: 144 step: 144 ret: 0</div><div class='add'>+   cpuhp/4-31   [004]  22.993: cpuhp_multi_enter: cpu: 0004 target: 140 step: 143 (virtnet_cpu_down_prep)</div><div class='add'>+   cpuhp/4-31   [004]  22.994: cpuhp_exit:  cpu: 0004  state: 143 step: 143 ret: 0</div><div class='add'>+   cpuhp/4-31   [004]  22.995: cpuhp_enter: cpu: 0004 target: 140 step: 142 (cacheinfo_cpu_pre_down)</div><div class='add'>+   cpuhp/4-31   [004]  22.996: cpuhp_exit:  cpu: 0004  state: 142 step: 142 ret: 0</div><div class='add'>+      bash-394  [001]  22.997: cpuhp_exit:  cpu: 0004  state: 140 step: 169 ret: 0</div><div class='add'>+      bash-394  [005]  95.540: cpuhp_enter: cpu: 0004 target: 169 step: 140 (cpuhp_kick_ap_work)</div><div class='add'>+   cpuhp/4-31   [004]  95.541: cpuhp_enter: cpu: 0004 target: 169 step: 141 (acpi_soft_cpu_online)</div><div class='add'>+   cpuhp/4-31   [004]  95.542: cpuhp_exit:  cpu: 0004  state: 141 step: 141 ret: 0</div><div class='add'>+   cpuhp/4-31   [004]  95.543: cpuhp_enter: cpu: 0004 target: 169 step: 142 (cacheinfo_cpu_online)</div><div class='add'>+   cpuhp/4-31   [004]  95.544: cpuhp_exit:  cpu: 0004  state: 142 step: 142 ret: 0</div><div class='add'>+   cpuhp/4-31   [004]  95.545: cpuhp_multi_enter: cpu: 0004 target: 169 step: 143 (virtnet_cpu_online)</div><div class='add'>+   cpuhp/4-31   [004]  95.546: cpuhp_exit:  cpu: 0004  state: 143 step: 143 ret: 0</div><div class='add'>+   cpuhp/4-31   [004]  95.547: cpuhp_enter: cpu: 0004 target: 169 step: 144 (mce_cpu_online)</div><div class='add'>+   cpuhp/4-31   [004]  95.548: cpuhp_exit:  cpu: 0004  state: 144 step: 144 ret: 0</div><div class='add'>+   cpuhp/4-31   [004]  95.549: cpuhp_enter: cpu: 0004 target: 169 step: 145 (console_cpu_notify)</div><div class='add'>+   cpuhp/4-31   [004]  95.550: cpuhp_exit:  cpu: 0004  state: 145 step: 145 ret: 0</div><div class='add'>+   cpuhp/4-31   [004]  95.551: cpuhp_enter: cpu: 0004 target: 169 step: 168 (sched_cpu_activate)</div><div class='add'>+   cpuhp/4-31   [004]  95.552: cpuhp_exit:  cpu: 0004  state: 168 step: 168 ret: 0</div><div class='add'>+      bash-394  [005]  95.553: cpuhp_exit:  cpu: 0004  state: 169 step: 140 ret: 0</div><div class='add'>+</div><div class='add'>+As it an be seen, CPU4 went down until timestamp 22.996 and then back up until</div><div class='add'>+95.552. All invoked callbacks including their return codes are visible in the</div><div class='add'>+trace.</div><div class='add'>+</div><div class='add'>+Architecture's requirements</div><div class='add'>+===========================</div><div class='add'>+The following functions and configurations are required:</div><div class='add'>+</div><div class='add'>+``CONFIG_HOTPLUG_CPU``</div><div class='add'>+  This entry needs to be enabled in Kconfig</div><div class='add'>+</div><div class='add'>+``__cpu_up()``</div><div class='add'>+  Arch interface to bring up a CPU</div><div class='add'>+</div><div class='add'>+``__cpu_disable()``</div><div class='add'>+  Arch interface to shutdown a CPU, no more interrupts can be handled by the</div><div class='add'>+  kernel after the routine returns. This includes the shutdown of the timer.</div><div class='add'>+</div><div class='add'>+``__cpu_die()``</div><div class='add'>+  This actually supposed to ensure death of the CPU. Actually look at some</div><div class='add'>+  example code in other arch that implement CPU hotplug. The processor is taken</div><div class='add'>+  down from the ``idle()`` loop for that specific architecture. ``__cpu_die()``</div><div class='add'>+  typically waits for some per_cpu state to be set, to ensure the processor dead</div><div class='add'>+  routine is called to be sure positively.</div><div class='add'>+</div><div class='add'>+User Space Notification</div><div class='add'>+=======================</div><div class='add'>+After CPU successfully onlined or offline udev events are sent. A udev rule like: ::</div><div class='add'>+</div><div class='add'>+  SUBSYSTEM=="cpu", DRIVERS=="processor", DEVPATH=="/devices/system/cpu/*", RUN+="the_hotplug_receiver.sh"</div><div class='add'>+</div><div class='add'>+will receive all events. A script like: ::</div><div class='add'>+</div><div class='add'>+  #!/bin/sh</div><div class='add'>+</div><div class='add'>+  if [ "${ACTION}" = "offline" ]</div><div class='add'>+  then</div><div class='add'>+      echo "CPU ${DEVPATH##*/} offline"</div><div class='add'>+</div><div class='add'>+  elif [ "${ACTION}" = "online" ]</div><div class='add'>+  then</div><div class='add'>+      echo "CPU ${DEVPATH##*/} online"</div><div class='add'>+</div><div class='add'>+  fi</div><div class='add'>+</div><div class='add'>+can process the event further.</div><div class='add'>+</div><div class='add'>+Kernel Inline Documentations Reference</div><div class='add'>+======================================</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/cpuhotplug.h</div><div class='head'>diff --git a/Documentation/core-api/debug-objects.rst b/Documentation/core-api/debug-objects.rst<br/>new file mode 100644<br/>index 000000000000..ac926fd55a64<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/core-api/debug-objects.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/debug-objects.rst</a></div><div class='hunk'>@@ -0,0 +1,310 @@</div><div class='add'>+============================================</div><div class='add'>+The object-lifetime debugging infrastructure</div><div class='add'>+============================================</div><div class='add'>+</div><div class='add'>+:Author: Thomas Gleixner</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+debugobjects is a generic infrastructure to track the life time of</div><div class='add'>+kernel objects and validate the operations on those.</div><div class='add'>+</div><div class='add'>+debugobjects is useful to check for the following error patterns:</div><div class='add'>+</div><div class='add'>+-  Activation of uninitialized objects</div><div class='add'>+</div><div class='add'>+-  Initialization of active objects</div><div class='add'>+</div><div class='add'>+-  Usage of freed/destroyed objects</div><div class='add'>+</div><div class='add'>+debugobjects is not changing the data structure of the real object so it</div><div class='add'>+can be compiled in with a minimal runtime impact and enabled on demand</div><div class='add'>+with a kernel command line option.</div><div class='add'>+</div><div class='add'>+Howto use debugobjects</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+A kernel subsystem needs to provide a data structure which describes the</div><div class='add'>+object type and add calls into the debug code at appropriate places. The</div><div class='add'>+data structure to describe the object type needs at minimum the name of</div><div class='add'>+the object type. Optional functions can and should be provided to fixup</div><div class='add'>+detected problems so the kernel can continue to work and the debug</div><div class='add'>+information can be retrieved from a live system instead of hard core</div><div class='add'>+debugging with serial consoles and stack trace transcripts from the</div><div class='add'>+monitor.</div><div class='add'>+</div><div class='add'>+The debug calls provided by debugobjects are:</div><div class='add'>+</div><div class='add'>+-  debug_object_init</div><div class='add'>+</div><div class='add'>+-  debug_object_init_on_stack</div><div class='add'>+</div><div class='add'>+-  debug_object_activate</div><div class='add'>+</div><div class='add'>+-  debug_object_deactivate</div><div class='add'>+</div><div class='add'>+-  debug_object_destroy</div><div class='add'>+</div><div class='add'>+-  debug_object_free</div><div class='add'>+</div><div class='add'>+-  debug_object_assert_init</div><div class='add'>+</div><div class='add'>+Each of these functions takes the address of the real object and a</div><div class='add'>+pointer to the object type specific debug description structure.</div><div class='add'>+</div><div class='add'>+Each detected error is reported in the statistics and a limited number</div><div class='add'>+of errors are printk'ed including a full stack trace.</div><div class='add'>+</div><div class='add'>+The statistics are available via /sys/kernel/debug/debug_objects/stats.</div><div class='add'>+They provide information about the number of warnings and the number of</div><div class='add'>+successful fixups along with information about the usage of the internal</div><div class='add'>+tracking objects and the state of the internal tracking objects pool.</div><div class='add'>+</div><div class='add'>+Debug functions</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: lib/debugobjects.c</div><div class='add'>+   :functions: debug_object_init</div><div class='add'>+</div><div class='add'>+This function is called whenever the initialization function of a real</div><div class='add'>+object is called.</div><div class='add'>+</div><div class='add'>+When the real object is already tracked by debugobjects it is checked,</div><div class='add'>+whether the object can be initialized. Initializing is not allowed for</div><div class='add'>+active and destroyed objects. When debugobjects detects an error, then</div><div class='add'>+it calls the fixup_init function of the object type description</div><div class='add'>+structure if provided by the caller. The fixup function can correct the</div><div class='add'>+problem before the real initialization of the object happens. E.g. it</div><div class='add'>+can deactivate an active object in order to prevent damage to the</div><div class='add'>+subsystem.</div><div class='add'>+</div><div class='add'>+When the real object is not yet tracked by debugobjects, debugobjects</div><div class='add'>+allocates a tracker object for the real object and sets the tracker</div><div class='add'>+object state to ODEBUG_STATE_INIT. It verifies that the object is not</div><div class='add'>+on the callers stack. If it is on the callers stack then a limited</div><div class='add'>+number of warnings including a full stack trace is printk'ed. The</div><div class='add'>+calling code must use debug_object_init_on_stack() and remove the</div><div class='add'>+object before leaving the function which allocated it. See next section.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: lib/debugobjects.c</div><div class='add'>+   :functions: debug_object_init_on_stack</div><div class='add'>+</div><div class='add'>+This function is called whenever the initialization function of a real</div><div class='add'>+object which resides on the stack is called.</div><div class='add'>+</div><div class='add'>+When the real object is already tracked by debugobjects it is checked,</div><div class='add'>+whether the object can be initialized. Initializing is not allowed for</div><div class='add'>+active and destroyed objects. When debugobjects detects an error, then</div><div class='add'>+it calls the fixup_init function of the object type description</div><div class='add'>+structure if provided by the caller. The fixup function can correct the</div><div class='add'>+problem before the real initialization of the object happens. E.g. it</div><div class='add'>+can deactivate an active object in order to prevent damage to the</div><div class='add'>+subsystem.</div><div class='add'>+</div><div class='add'>+When the real object is not yet tracked by debugobjects debugobjects</div><div class='add'>+allocates a tracker object for the real object and sets the tracker</div><div class='add'>+object state to ODEBUG_STATE_INIT. It verifies that the object is on</div><div class='add'>+the callers stack.</div><div class='add'>+</div><div class='add'>+An object which is on the stack must be removed from the tracker by</div><div class='add'>+calling debug_object_free() before the function which allocates the</div><div class='add'>+object returns. Otherwise we keep track of stale objects.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: lib/debugobjects.c</div><div class='add'>+   :functions: debug_object_activate</div><div class='add'>+</div><div class='add'>+This function is called whenever the activation function of a real</div><div class='add'>+object is called.</div><div class='add'>+</div><div class='add'>+When the real object is already tracked by debugobjects it is checked,</div><div class='add'>+whether the object can be activated. Activating is not allowed for</div><div class='add'>+active and destroyed objects. When debugobjects detects an error, then</div><div class='add'>+it calls the fixup_activate function of the object type description</div><div class='add'>+structure if provided by the caller. The fixup function can correct the</div><div class='add'>+problem before the real activation of the object happens. E.g. it can</div><div class='add'>+deactivate an active object in order to prevent damage to the subsystem.</div><div class='add'>+</div><div class='add'>+When the real object is not yet tracked by debugobjects then the</div><div class='add'>+fixup_activate function is called if available. This is necessary to</div><div class='add'>+allow the legitimate activation of statically allocated and initialized</div><div class='add'>+objects. The fixup function checks whether the object is valid and calls</div><div class='add'>+the debug_objects_init() function to initialize the tracking of this</div><div class='add'>+object.</div><div class='add'>+</div><div class='add'>+When the activation is legitimate, then the state of the associated</div><div class='add'>+tracker object is set to ODEBUG_STATE_ACTIVE.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: lib/debugobjects.c</div><div class='add'>+   :functions: debug_object_deactivate</div><div class='add'>+</div><div class='add'>+This function is called whenever the deactivation function of a real</div><div class='add'>+object is called.</div><div class='add'>+</div><div class='add'>+When the real object is tracked by debugobjects it is checked, whether</div><div class='add'>+the object can be deactivated. Deactivating is not allowed for untracked</div><div class='add'>+or destroyed objects.</div><div class='add'>+</div><div class='add'>+When the deactivation is legitimate, then the state of the associated</div><div class='add'>+tracker object is set to ODEBUG_STATE_INACTIVE.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: lib/debugobjects.c</div><div class='add'>+   :functions: debug_object_destroy</div><div class='add'>+</div><div class='add'>+This function is called to mark an object destroyed. This is useful to</div><div class='add'>+prevent the usage of invalid objects, which are still available in</div><div class='add'>+memory: either statically allocated objects or objects which are freed</div><div class='add'>+later.</div><div class='add'>+</div><div class='add'>+When the real object is tracked by debugobjects it is checked, whether</div><div class='add'>+the object can be destroyed. Destruction is not allowed for active and</div><div class='add'>+destroyed objects. When debugobjects detects an error, then it calls the</div><div class='add'>+fixup_destroy function of the object type description structure if</div><div class='add'>+provided by the caller. The fixup function can correct the problem</div><div class='add'>+before the real destruction of the object happens. E.g. it can</div><div class='add'>+deactivate an active object in order to prevent damage to the subsystem.</div><div class='add'>+</div><div class='add'>+When the destruction is legitimate, then the state of the associated</div><div class='add'>+tracker object is set to ODEBUG_STATE_DESTROYED.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: lib/debugobjects.c</div><div class='add'>+   :functions: debug_object_free</div><div class='add'>+</div><div class='add'>+This function is called before an object is freed.</div><div class='add'>+</div><div class='add'>+When the real object is tracked by debugobjects it is checked, whether</div><div class='add'>+the object can be freed. Free is not allowed for active objects. When</div><div class='add'>+debugobjects detects an error, then it calls the fixup_free function of</div><div class='add'>+the object type description structure if provided by the caller. The</div><div class='add'>+fixup function can correct the problem before the real free of the</div><div class='add'>+object happens. E.g. it can deactivate an active object in order to</div><div class='add'>+prevent damage to the subsystem.</div><div class='add'>+</div><div class='add'>+Note that debug_object_free removes the object from the tracker. Later</div><div class='add'>+usage of the object is detected by the other debug checks.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: lib/debugobjects.c</div><div class='add'>+   :functions: debug_object_assert_init</div><div class='add'>+</div><div class='add'>+This function is called to assert that an object has been initialized.</div><div class='add'>+</div><div class='add'>+When the real object is not tracked by debugobjects, it calls</div><div class='add'>+fixup_assert_init of the object type description structure provided by</div><div class='add'>+the caller, with the hardcoded object state ODEBUG_NOT_AVAILABLE. The</div><div class='add'>+fixup function can correct the problem by calling debug_object_init</div><div class='add'>+and other specific initializing functions.</div><div class='add'>+</div><div class='add'>+When the real object is already tracked by debugobjects it is ignored.</div><div class='add'>+</div><div class='add'>+Fixup functions</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+Debug object type description structure</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/debugobjects.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+fixup_init</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This function is called from the debug code whenever a problem in</div><div class='add'>+debug_object_init is detected. The function takes the address of the</div><div class='add'>+object and the state which is currently recorded in the tracker.</div><div class='add'>+</div><div class='add'>+Called from debug_object_init when the object state is:</div><div class='add'>+</div><div class='add'>+-  ODEBUG_STATE_ACTIVE</div><div class='add'>+</div><div class='add'>+The function returns true when the fixup was successful, otherwise</div><div class='add'>+false. The return value is used to update the statistics.</div><div class='add'>+</div><div class='add'>+Note, that the function needs to call the debug_object_init() function</div><div class='add'>+again, after the damage has been repaired in order to keep the state</div><div class='add'>+consistent.</div><div class='add'>+</div><div class='add'>+fixup_activate</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+This function is called from the debug code whenever a problem in</div><div class='add'>+debug_object_activate is detected.</div><div class='add'>+</div><div class='add'>+Called from debug_object_activate when the object state is:</div><div class='add'>+</div><div class='add'>+-  ODEBUG_STATE_NOTAVAILABLE</div><div class='add'>+</div><div class='add'>+-  ODEBUG_STATE_ACTIVE</div><div class='add'>+</div><div class='add'>+The function returns true when the fixup was successful, otherwise</div><div class='add'>+false. The return value is used to update the statistics.</div><div class='add'>+</div><div class='add'>+Note that the function needs to call the debug_object_activate()</div><div class='add'>+function again after the damage has been repaired in order to keep the</div><div class='add'>+state consistent.</div><div class='add'>+</div><div class='add'>+The activation of statically initialized objects is a special case. When</div><div class='add'>+debug_object_activate() has no tracked object for this object address</div><div class='add'>+then fixup_activate() is called with object state</div><div class='add'>+ODEBUG_STATE_NOTAVAILABLE. The fixup function needs to check whether</div><div class='add'>+this is a legitimate case of a statically initialized object or not. In</div><div class='add'>+case it is it calls debug_object_init() and debug_object_activate()</div><div class='add'>+to make the object known to the tracker and marked active. In this case</div><div class='add'>+the function should return false because this is not a real fixup.</div><div class='add'>+</div><div class='add'>+fixup_destroy</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+This function is called from the debug code whenever a problem in</div><div class='add'>+debug_object_destroy is detected.</div><div class='add'>+</div><div class='add'>+Called from debug_object_destroy when the object state is:</div><div class='add'>+</div><div class='add'>+-  ODEBUG_STATE_ACTIVE</div><div class='add'>+</div><div class='add'>+The function returns true when the fixup was successful, otherwise</div><div class='add'>+false. The return value is used to update the statistics.</div><div class='add'>+</div><div class='add'>+fixup_free</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This function is called from the debug code whenever a problem in</div><div class='add'>+debug_object_free is detected. Further it can be called from the debug</div><div class='add'>+checks in kfree/vfree, when an active object is detected from the</div><div class='add'>+debug_check_no_obj_freed() sanity checks.</div><div class='add'>+</div><div class='add'>+Called from debug_object_free() or debug_check_no_obj_freed() when</div><div class='add'>+the object state is:</div><div class='add'>+</div><div class='add'>+-  ODEBUG_STATE_ACTIVE</div><div class='add'>+</div><div class='add'>+The function returns true when the fixup was successful, otherwise</div><div class='add'>+false. The return value is used to update the statistics.</div><div class='add'>+</div><div class='add'>+fixup_assert_init</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+This function is called from the debug code whenever a problem in</div><div class='add'>+debug_object_assert_init is detected.</div><div class='add'>+</div><div class='add'>+Called from debug_object_assert_init() with a hardcoded state</div><div class='add'>+ODEBUG_STATE_NOTAVAILABLE when the object is not found in the debug</div><div class='add'>+bucket.</div><div class='add'>+</div><div class='add'>+The function returns true when the fixup was successful, otherwise</div><div class='add'>+false. The return value is used to update the statistics.</div><div class='add'>+</div><div class='add'>+Note, this function should make sure debug_object_init() is called</div><div class='add'>+before returning.</div><div class='add'>+</div><div class='add'>+The handling of statically initialized objects is a special case. The</div><div class='add'>+fixup function should check if this is a legitimate case of a statically</div><div class='add'>+initialized object or not. In this case only debug_object_init()</div><div class='add'>+should be called to make the object known to the tracker. Then the</div><div class='add'>+function should return false because this is not a real fixup.</div><div class='add'>+</div><div class='add'>+Known Bugs And Assumptions</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+None (knock on wood).</div><div class='head'>diff --git a/Documentation/core-api/index.rst b/Documentation/core-api/index.rst<br/>new file mode 100644<br/>index 000000000000..0d93d8089136<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/core-api/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/index.rst</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+======================</div><div class='add'>+Core API Documentation</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+This is the beginning of a manual for core kernel APIs.  The conversion</div><div class='add'>+(and writing!) of documents for this manual is much appreciated!</div><div class='add'>+</div><div class='add'>+Core utilities</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   assoc_array</div><div class='add'>+   atomic_ops</div><div class='add'>+   cpu_hotplug</div><div class='add'>+   local_ops</div><div class='add'>+   workqueue</div><div class='add'>+</div><div class='add'>+Interfaces for kernel debugging</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   debug-objects</div><div class='add'>+   tracepoint</div><div class='add'>+</div><div class='add'>+.. only::  subproject</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/core-api/local_ops.rst b/Documentation/core-api/local_ops.rst<br/>new file mode 100644<br/>index 000000000000..1062ddba62c7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/core-api/local_ops.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/local_ops.rst</a></div><div class='hunk'>@@ -0,0 +1,206 @@</div><div class='add'>+</div><div class='add'>+.. _local_ops:</div><div class='add'>+</div><div class='add'>+=================================================</div><div class='add'>+Semantics and Behavior of Local Atomic Operations</div><div class='add'>+=================================================</div><div class='add'>+</div><div class='add'>+:Author: Mathieu Desnoyers</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+This document explains the purpose of the local atomic operations, how</div><div class='add'>+to implement them for any given architecture and shows how they can be used</div><div class='add'>+properly. It also stresses on the precautions that must be taken when reading</div><div class='add'>+those local variables across CPUs when the order of memory writes matters.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+    Note that ``local_t`` based operations are not recommended for general</div><div class='add'>+    kernel use. Please use the ``this_cpu`` operations instead unless there is</div><div class='add'>+    really a special purpose. Most uses of ``local_t`` in the kernel have been</div><div class='add'>+    replaced by ``this_cpu`` operations. ``this_cpu`` operations combine the</div><div class='add'>+    relocation with the ``local_t`` like semantics in a single instruction and</div><div class='add'>+    yield more compact and faster executing code.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Purpose of local atomic operations</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+Local atomic operations are meant to provide fast and highly reentrant per CPU</div><div class='add'>+counters. They minimize the performance cost of standard atomic operations by</div><div class='add'>+removing the LOCK prefix and memory barriers normally required to synchronize</div><div class='add'>+across CPUs.</div><div class='add'>+</div><div class='add'>+Having fast per CPU atomic counters is interesting in many cases: it does not</div><div class='add'>+require disabling interrupts to protect from interrupt handlers and it permits</div><div class='add'>+coherent counters in NMI handlers. It is especially useful for tracing purposes</div><div class='add'>+and for various performance monitoring counters.</div><div class='add'>+</div><div class='add'>+Local atomic operations only guarantee variable modification atomicity wrt the</div><div class='add'>+CPU which owns the data. Therefore, care must taken to make sure that only one</div><div class='add'>+CPU writes to the ``local_t`` data. This is done by using per cpu data and</div><div class='add'>+making sure that we modify it from within a preemption safe context. It is</div><div class='add'>+however permitted to read ``local_t`` data from any CPU: it will then appear to</div><div class='add'>+be written out of order wrt other memory writes by the owner CPU.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Implementation for a given architecture</div><div class='add'>+=======================================</div><div class='add'>+</div><div class='add'>+It can be done by slightly modifying the standard atomic operations: only</div><div class='add'>+their UP variant must be kept. It typically means removing LOCK prefix (on</div><div class='add'>+i386 and x86_64) and any SMP synchronization barrier. If the architecture does</div><div class='add'>+not have a different behavior between SMP and UP, including</div><div class='add'>+``asm-generic/local.h`` in your architecture's ``local.h`` is sufficient.</div><div class='add'>+</div><div class='add'>+The ``local_t`` type is defined as an opaque ``signed long`` by embedding an</div><div class='add'>+``atomic_long_t`` inside a structure. This is made so a cast from this type to</div><div class='add'>+a ``long`` fails. The definition looks like::</div><div class='add'>+</div><div class='add'>+    typedef struct { atomic_long_t a; } local_t;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Rules to follow when using local atomic operations</div><div class='add'>+==================================================</div><div class='add'>+</div><div class='add'>+* Variables touched by local ops must be per cpu variables.</div><div class='add'>+* *Only* the CPU owner of these variables must write to them.</div><div class='add'>+* This CPU can use local ops from any context (process, irq, softirq, nmi, ...)</div><div class='add'>+  to update its ``local_t`` variables.</div><div class='add'>+* Preemption (or interrupts) must be disabled when using local ops in</div><div class='add'>+  process context to make sure the process won't be migrated to a</div><div class='add'>+  different CPU between getting the per-cpu variable and doing the</div><div class='add'>+  actual local op.</div><div class='add'>+* When using local ops in interrupt context, no special care must be</div><div class='add'>+  taken on a mainline kernel, since they will run on the local CPU with</div><div class='add'>+  preemption already disabled. I suggest, however, to explicitly</div><div class='add'>+  disable preemption anyway to make sure it will still work correctly on</div><div class='add'>+  -rt kernels.</div><div class='add'>+* Reading the local cpu variable will provide the current copy of the</div><div class='add'>+  variable.</div><div class='add'>+* Reads of these variables can be done from any CPU, because updates to</div><div class='add'>+  "``long``", aligned, variables are always atomic. Since no memory</div><div class='add'>+  synchronization is done by the writer CPU, an outdated copy of the</div><div class='add'>+  variable can be read when reading some *other* cpu's variables.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+How to use local atomic operations</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    #include &lt;linux/percpu.h&gt;</div><div class='add'>+    #include &lt;asm/local.h&gt;</div><div class='add'>+</div><div class='add'>+    static DEFINE_PER_CPU(local_t, counters) = LOCAL_INIT(0);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Counting</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+Counting is done on all the bits of a signed long.</div><div class='add'>+</div><div class='add'>+In preemptible context, use ``get_cpu_var()`` and ``put_cpu_var()`` around</div><div class='add'>+local atomic operations: it makes sure that preemption is disabled around write</div><div class='add'>+access to the per cpu variable. For instance::</div><div class='add'>+</div><div class='add'>+    local_inc(&amp;get_cpu_var(counters));</div><div class='add'>+    put_cpu_var(counters);</div><div class='add'>+</div><div class='add'>+If you are already in a preemption-safe context, you can use</div><div class='add'>+``this_cpu_ptr()`` instead::</div><div class='add'>+</div><div class='add'>+    local_inc(this_cpu_ptr(&amp;counters));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Reading the counters</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+Those local counters can be read from foreign CPUs to sum the count. Note that</div><div class='add'>+the data seen by local_read across CPUs must be considered to be out of order</div><div class='add'>+relatively to other memory writes happening on the CPU that owns the data::</div><div class='add'>+</div><div class='add'>+    long sum = 0;</div><div class='add'>+    for_each_online_cpu(cpu)</div><div class='add'>+            sum += local_read(&amp;per_cpu(counters, cpu));</div><div class='add'>+</div><div class='add'>+If you want to use a remote local_read to synchronize access to a resource</div><div class='add'>+between CPUs, explicit ``smp_wmb()`` and ``smp_rmb()`` memory barriers must be used</div><div class='add'>+respectively on the writer and the reader CPUs. It would be the case if you use</div><div class='add'>+the ``local_t`` variable as a counter of bytes written in a buffer: there should</div><div class='add'>+be a ``smp_wmb()`` between the buffer write and the counter increment and also a</div><div class='add'>+``smp_rmb()`` between the counter read and the buffer read.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Here is a sample module which implements a basic per cpu counter using</div><div class='add'>+``local.h``::</div><div class='add'>+</div><div class='add'>+    /* test-local.c</div><div class='add'>+     *</div><div class='add'>+     * Sample module for local.h usage.</div><div class='add'>+     */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    #include &lt;asm/local.h&gt;</div><div class='add'>+    #include &lt;linux/module.h&gt;</div><div class='add'>+    #include &lt;linux/timer.h&gt;</div><div class='add'>+</div><div class='add'>+    static DEFINE_PER_CPU(local_t, counters) = LOCAL_INIT(0);</div><div class='add'>+</div><div class='add'>+    static struct timer_list test_timer;</div><div class='add'>+</div><div class='add'>+    /* IPI called on each CPU. */</div><div class='add'>+    static void test_each(void *info)</div><div class='add'>+    {</div><div class='add'>+            /* Increment the counter from a non preemptible context */</div><div class='add'>+            printk("Increment on cpu %d\n", smp_processor_id());</div><div class='add'>+            local_inc(this_cpu_ptr(&amp;counters));</div><div class='add'>+</div><div class='add'>+            /* This is what incrementing the variable would look like within a</div><div class='add'>+             * preemptible context (it disables preemption) :</div><div class='add'>+             *</div><div class='add'>+             * local_inc(&amp;get_cpu_var(counters));</div><div class='add'>+             * put_cpu_var(counters);</div><div class='add'>+             */</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    static void do_test_timer(unsigned long data)</div><div class='add'>+    {</div><div class='add'>+            int cpu;</div><div class='add'>+</div><div class='add'>+            /* Increment the counters */</div><div class='add'>+            on_each_cpu(test_each, NULL, 1);</div><div class='add'>+            /* Read all the counters */</div><div class='add'>+            printk("Counters read from CPU %d\n", smp_processor_id());</div><div class='add'>+            for_each_online_cpu(cpu) {</div><div class='add'>+                    printk("Read : CPU %d, count %ld\n", cpu,</div><div class='add'>+                            local_read(&amp;per_cpu(counters, cpu)));</div><div class='add'>+            }</div><div class='add'>+            del_timer(&amp;test_timer);</div><div class='add'>+            test_timer.expires = jiffies + 1000;</div><div class='add'>+            add_timer(&amp;test_timer);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    static int __init test_init(void)</div><div class='add'>+    {</div><div class='add'>+            /* initialize the timer that will increment the counter */</div><div class='add'>+            init_timer(&amp;test_timer);</div><div class='add'>+            test_timer.function = do_test_timer;</div><div class='add'>+            test_timer.expires = jiffies + 1;</div><div class='add'>+            add_timer(&amp;test_timer);</div><div class='add'>+</div><div class='add'>+            return 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    static void __exit test_exit(void)</div><div class='add'>+    {</div><div class='add'>+            del_timer_sync(&amp;test_timer);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    module_init(test_init);</div><div class='add'>+    module_exit(test_exit);</div><div class='add'>+</div><div class='add'>+    MODULE_LICENSE("GPL");</div><div class='add'>+    MODULE_AUTHOR("Mathieu Desnoyers");</div><div class='add'>+    MODULE_DESCRIPTION("Local Atomic Ops");</div><div class='head'>diff --git a/Documentation/core-api/tracepoint.rst b/Documentation/core-api/tracepoint.rst<br/>new file mode 100644<br/>index 000000000000..6b44bec0de43<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/core-api/tracepoint.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/tracepoint.rst</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+===============================</div><div class='add'>+The Linux Kernel Tracepoint API</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+:Author: Jason Baron</div><div class='add'>+:Author: William Cohen</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+Tracepoints are static probe points that are located in strategic points</div><div class='add'>+throughout the kernel. 'Probes' register/unregister with tracepoints via</div><div class='add'>+a callback mechanism. The 'probes' are strictly typed functions that are</div><div class='add'>+passed a unique set of parameters defined by each tracepoint.</div><div class='add'>+</div><div class='add'>+From this simple callback mechanism, 'probes' can be used to profile,</div><div class='add'>+debug, and understand kernel behavior. There are a number of tools that</div><div class='add'>+provide a framework for using 'probes'. These tools include Systemtap,</div><div class='add'>+ftrace, and LTTng.</div><div class='add'>+</div><div class='add'>+Tracepoints are defined in a number of header files via various macros.</div><div class='add'>+Thus, the purpose of this document is to provide a clear accounting of</div><div class='add'>+the available tracepoints. The intention is to understand not only what</div><div class='add'>+tracepoints are available but also to understand where future</div><div class='add'>+tracepoints might be added.</div><div class='add'>+</div><div class='add'>+The API presented has functions of the form:</div><div class='add'>+``trace_tracepointname(function parameters)``. These are the tracepoints</div><div class='add'>+callbacks that are found throughout the code. Registering and</div><div class='add'>+unregistering probes with these callback sites is covered in the</div><div class='add'>+``Documentation/trace/*`` directory.</div><div class='add'>+</div><div class='add'>+IRQ</div><div class='add'>+===</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/trace/events/irq.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+SIGNAL</div><div class='add'>+======</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/trace/events/signal.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+Block IO</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/trace/events/block.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+Workqueue</div><div class='add'>+=========</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/trace/events/workqueue.h</div><div class='add'>+   :internal:</div><div class='head'>diff --git a/Documentation/core-api/workqueue.rst b/Documentation/core-api/workqueue.rst<br/>new file mode 100644<br/>index 000000000000..ffdec94fbca1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/core-api/workqueue.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/core-api/workqueue.rst</a></div><div class='hunk'>@@ -0,0 +1,394 @@</div><div class='add'>+====================================</div><div class='add'>+Concurrency Managed Workqueue (cmwq)</div><div class='add'>+====================================</div><div class='add'>+</div><div class='add'>+:Date: September, 2010</div><div class='add'>+:Author: Tejun Heo &lt;tj@kernel.org&gt;</div><div class='add'>+:Author: Florian Mickler &lt;florian@mickler.org&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+There are many cases where an asynchronous process execution context</div><div class='add'>+is needed and the workqueue (wq) API is the most commonly used</div><div class='add'>+mechanism for such cases.</div><div class='add'>+</div><div class='add'>+When such an asynchronous execution context is needed, a work item</div><div class='add'>+describing which function to execute is put on a queue.  An</div><div class='add'>+independent thread serves as the asynchronous execution context.  The</div><div class='add'>+queue is called workqueue and the thread is called worker.</div><div class='add'>+</div><div class='add'>+While there are work items on the workqueue the worker executes the</div><div class='add'>+functions associated with the work items one after the other.  When</div><div class='add'>+there is no work item left on the workqueue the worker becomes idle.</div><div class='add'>+When a new work item gets queued, the worker begins executing again.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Why cmwq?</div><div class='add'>+=========</div><div class='add'>+</div><div class='add'>+In the original wq implementation, a multi threaded (MT) wq had one</div><div class='add'>+worker thread per CPU and a single threaded (ST) wq had one worker</div><div class='add'>+thread system-wide.  A single MT wq needed to keep around the same</div><div class='add'>+number of workers as the number of CPUs.  The kernel grew a lot of MT</div><div class='add'>+wq users over the years and with the number of CPU cores continuously</div><div class='add'>+rising, some systems saturated the default 32k PID space just booting</div><div class='add'>+up.</div><div class='add'>+</div><div class='add'>+Although MT wq wasted a lot of resource, the level of concurrency</div><div class='add'>+provided was unsatisfactory.  The limitation was common to both ST and</div><div class='add'>+MT wq albeit less severe on MT.  Each wq maintained its own separate</div><div class='add'>+worker pool.  A MT wq could provide only one execution context per CPU</div><div class='add'>+while a ST wq one for the whole system.  Work items had to compete for</div><div class='add'>+those very limited execution contexts leading to various problems</div><div class='add'>+including proneness to deadlocks around the single execution context.</div><div class='add'>+</div><div class='add'>+The tension between the provided level of concurrency and resource</div><div class='add'>+usage also forced its users to make unnecessary tradeoffs like libata</div><div class='add'>+choosing to use ST wq for polling PIOs and accepting an unnecessary</div><div class='add'>+limitation that no two polling PIOs can progress at the same time.  As</div><div class='add'>+MT wq don't provide much better concurrency, users which require</div><div class='add'>+higher level of concurrency, like async or fscache, had to implement</div><div class='add'>+their own thread pool.</div><div class='add'>+</div><div class='add'>+Concurrency Managed Workqueue (cmwq) is a reimplementation of wq with</div><div class='add'>+focus on the following goals.</div><div class='add'>+</div><div class='add'>+* Maintain compatibility with the original workqueue API.</div><div class='add'>+</div><div class='add'>+* Use per-CPU unified worker pools shared by all wq to provide</div><div class='add'>+  flexible level of concurrency on demand without wasting a lot of</div><div class='add'>+  resource.</div><div class='add'>+</div><div class='add'>+* Automatically regulate worker pool and level of concurrency so that</div><div class='add'>+  the API users don't need to worry about such details.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The Design</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+In order to ease the asynchronous execution of functions a new</div><div class='add'>+abstraction, the work item, is introduced.</div><div class='add'>+</div><div class='add'>+A work item is a simple struct that holds a pointer to the function</div><div class='add'>+that is to be executed asynchronously.  Whenever a driver or subsystem</div><div class='add'>+wants a function to be executed asynchronously it has to set up a work</div><div class='add'>+item pointing to that function and queue that work item on a</div><div class='add'>+workqueue.</div><div class='add'>+</div><div class='add'>+Special purpose threads, called worker threads, execute the functions</div><div class='add'>+off of the queue, one after the other.  If no work is queued, the</div><div class='add'>+worker threads become idle.  These worker threads are managed in so</div><div class='add'>+called worker-pools.</div><div class='add'>+</div><div class='add'>+The cmwq design differentiates between the user-facing workqueues that</div><div class='add'>+subsystems and drivers queue work items on and the backend mechanism</div><div class='add'>+which manages worker-pools and processes the queued work items.</div><div class='add'>+</div><div class='add'>+There are two worker-pools, one for normal work items and the other</div><div class='add'>+for high priority ones, for each possible CPU and some extra</div><div class='add'>+worker-pools to serve work items queued on unbound workqueues - the</div><div class='add'>+number of these backing pools is dynamic.</div><div class='add'>+</div><div class='add'>+Subsystems and drivers can create and queue work items through special</div><div class='add'>+workqueue API functions as they see fit. They can influence some</div><div class='add'>+aspects of the way the work items are executed by setting flags on the</div><div class='add'>+workqueue they are putting the work item on. These flags include</div><div class='add'>+things like CPU locality, concurrency limits, priority and more.  To</div><div class='add'>+get a detailed overview refer to the API description of</div><div class='add'>+``alloc_workqueue()`` below.</div><div class='add'>+</div><div class='add'>+When a work item is queued to a workqueue, the target worker-pool is</div><div class='add'>+determined according to the queue parameters and workqueue attributes</div><div class='add'>+and appended on the shared worklist of the worker-pool.  For example,</div><div class='add'>+unless specifically overridden, a work item of a bound workqueue will</div><div class='add'>+be queued on the worklist of either normal or highpri worker-pool that</div><div class='add'>+is associated to the CPU the issuer is running on.</div><div class='add'>+</div><div class='add'>+For any worker pool implementation, managing the concurrency level</div><div class='add'>+(how many execution contexts are active) is an important issue.  cmwq</div><div class='add'>+tries to keep the concurrency at a minimal but sufficient level.</div><div class='add'>+Minimal to save resources and sufficient in that the system is used at</div><div class='add'>+its full capacity.</div><div class='add'>+</div><div class='add'>+Each worker-pool bound to an actual CPU implements concurrency</div><div class='add'>+management by hooking into the scheduler.  The worker-pool is notified</div><div class='add'>+whenever an active worker wakes up or sleeps and keeps track of the</div><div class='add'>+number of the currently runnable workers.  Generally, work items are</div><div class='add'>+not expected to hog a CPU and consume many cycles.  That means</div><div class='add'>+maintaining just enough concurrency to prevent work processing from</div><div class='add'>+stalling should be optimal.  As long as there are one or more runnable</div><div class='add'>+workers on the CPU, the worker-pool doesn't start execution of a new</div><div class='add'>+work, but, when the last running worker goes to sleep, it immediately</div><div class='add'>+schedules a new worker so that the CPU doesn't sit idle while there</div><div class='add'>+are pending work items.  This allows using a minimal number of workers</div><div class='add'>+without losing execution bandwidth.</div><div class='add'>+</div><div class='add'>+Keeping idle workers around doesn't cost other than the memory space</div><div class='add'>+for kthreads, so cmwq holds onto idle ones for a while before killing</div><div class='add'>+them.</div><div class='add'>+</div><div class='add'>+For unbound workqueues, the number of backing pools is dynamic.</div><div class='add'>+Unbound workqueue can be assigned custom attributes using</div><div class='add'>+``apply_workqueue_attrs()`` and workqueue will automatically create</div><div class='add'>+backing worker pools matching the attributes.  The responsibility of</div><div class='add'>+regulating concurrency level is on the users.  There is also a flag to</div><div class='add'>+mark a bound wq to ignore the concurrency management.  Please refer to</div><div class='add'>+the API section for details.</div><div class='add'>+</div><div class='add'>+Forward progress guarantee relies on that workers can be created when</div><div class='add'>+more execution contexts are necessary, which in turn is guaranteed</div><div class='add'>+through the use of rescue workers.  All work items which might be used</div><div class='add'>+on code paths that handle memory reclaim are required to be queued on</div><div class='add'>+wq's that have a rescue-worker reserved for execution under memory</div><div class='add'>+pressure.  Else it is possible that the worker-pool deadlocks waiting</div><div class='add'>+for execution contexts to free up.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Application Programming Interface (API)</div><div class='add'>+=======================================</div><div class='add'>+</div><div class='add'>+``alloc_workqueue()`` allocates a wq.  The original</div><div class='add'>+``create_*workqueue()`` functions are deprecated and scheduled for</div><div class='add'>+removal.  ``alloc_workqueue()`` takes three arguments - @``name``,</div><div class='add'>+``@flags`` and ``@max_active``.  ``@name`` is the name of the wq and</div><div class='add'>+also used as the name of the rescuer thread if there is one.</div><div class='add'>+</div><div class='add'>+A wq no longer manages execution resources but serves as a domain for</div><div class='add'>+forward progress guarantee, flush and work item attributes. ``@flags``</div><div class='add'>+and ``@max_active`` control how work items are assigned execution</div><div class='add'>+resources, scheduled and executed.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+``flags``</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+``WQ_UNBOUND``</div><div class='add'>+  Work items queued to an unbound wq are served by the special</div><div class='add'>+  worker-pools which host workers which are not bound to any</div><div class='add'>+  specific CPU.  This makes the wq behave as a simple execution</div><div class='add'>+  context provider without concurrency management.  The unbound</div><div class='add'>+  worker-pools try to start execution of work items as soon as</div><div class='add'>+  possible.  Unbound wq sacrifices locality but is useful for</div><div class='add'>+  the following cases.</div><div class='add'>+</div><div class='add'>+  * Wide fluctuation in the concurrency level requirement is</div><div class='add'>+    expected and using bound wq may end up creating large number</div><div class='add'>+    of mostly unused workers across different CPUs as the issuer</div><div class='add'>+    hops through different CPUs.</div><div class='add'>+</div><div class='add'>+  * Long running CPU intensive workloads which can be better</div><div class='add'>+    managed by the system scheduler.</div><div class='add'>+</div><div class='add'>+``WQ_FREEZABLE``</div><div class='add'>+  A freezable wq participates in the freeze phase of the system</div><div class='add'>+  suspend operations.  Work items on the wq are drained and no</div><div class='add'>+  new work item starts execution until thawed.</div><div class='add'>+</div><div class='add'>+``WQ_MEM_RECLAIM``</div><div class='add'>+  All wq which might be used in the memory reclaim paths **MUST**</div><div class='add'>+  have this flag set.  The wq is guaranteed to have at least one</div><div class='add'>+  execution context regardless of memory pressure.</div><div class='add'>+</div><div class='add'>+``WQ_HIGHPRI``</div><div class='add'>+  Work items of a highpri wq are queued to the highpri</div><div class='add'>+  worker-pool of the target cpu.  Highpri worker-pools are</div><div class='add'>+  served by worker threads with elevated nice level.</div><div class='add'>+</div><div class='add'>+  Note that normal and highpri worker-pools don't interact with</div><div class='add'>+  each other.  Each maintain its separate pool of workers and</div><div class='add'>+  implements concurrency management among its workers.</div><div class='add'>+</div><div class='add'>+``WQ_CPU_INTENSIVE``</div><div class='add'>+  Work items of a CPU intensive wq do not contribute to the</div><div class='add'>+  concurrency level.  In other words, runnable CPU intensive</div><div class='add'>+  work items will not prevent other work items in the same</div><div class='add'>+  worker-pool from starting execution.  This is useful for bound</div><div class='add'>+  work items which are expected to hog CPU cycles so that their</div><div class='add'>+  execution is regulated by the system scheduler.</div><div class='add'>+</div><div class='add'>+  Although CPU intensive work items don't contribute to the</div><div class='add'>+  concurrency level, start of their executions is still</div><div class='add'>+  regulated by the concurrency management and runnable</div><div class='add'>+  non-CPU-intensive work items can delay execution of CPU</div><div class='add'>+  intensive work items.</div><div class='add'>+</div><div class='add'>+  This flag is meaningless for unbound wq.</div><div class='add'>+</div><div class='add'>+Note that the flag ``WQ_NON_REENTRANT`` no longer exists as all</div><div class='add'>+workqueues are now non-reentrant - any work item is guaranteed to be</div><div class='add'>+executed by at most one worker system-wide at any given time.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+``max_active``</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+``@max_active`` determines the maximum number of execution contexts</div><div class='add'>+per CPU which can be assigned to the work items of a wq.  For example,</div><div class='add'>+with ``@max_active`` of 16, at most 16 work items of the wq can be</div><div class='add'>+executing at the same time per CPU.</div><div class='add'>+</div><div class='add'>+Currently, for a bound wq, the maximum limit for ``@max_active`` is</div><div class='add'>+512 and the default value used when 0 is specified is 256.  For an</div><div class='add'>+unbound wq, the limit is higher of 512 and 4 *</div><div class='add'>+``num_possible_cpus()``.  These values are chosen sufficiently high</div><div class='add'>+such that they are not the limiting factor while providing protection</div><div class='add'>+in runaway cases.</div><div class='add'>+</div><div class='add'>+The number of active work items of a wq is usually regulated by the</div><div class='add'>+users of the wq, more specifically, by how many work items the users</div><div class='add'>+may queue at the same time.  Unless there is a specific need for</div><div class='add'>+throttling the number of active work items, specifying '0' is</div><div class='add'>+recommended.</div><div class='add'>+</div><div class='add'>+Some users depend on the strict execution ordering of ST wq.  The</div><div class='add'>+combination of ``@max_active`` of 1 and ``WQ_UNBOUND`` is used to</div><div class='add'>+achieve this behavior.  Work items on such wq are always queued to the</div><div class='add'>+unbound worker-pools and only one work item can be active at any given</div><div class='add'>+time thus achieving the same ordering property as ST wq.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example Execution Scenarios</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+The following example execution scenarios try to illustrate how cmwq</div><div class='add'>+behave under different configurations.</div><div class='add'>+</div><div class='add'>+ Work items w0, w1, w2 are queued to a bound wq q0 on the same CPU.</div><div class='add'>+ w0 burns CPU for 5ms then sleeps for 10ms then burns CPU for 5ms</div><div class='add'>+ again before finishing.  w1 and w2 burn CPU for 5ms then sleep for</div><div class='add'>+ 10ms.</div><div class='add'>+</div><div class='add'>+Ignoring all other tasks, works and processing overhead, and assuming</div><div class='add'>+simple FIFO scheduling, the following is one highly simplified version</div><div class='add'>+of possible sequences of events with the original wq. ::</div><div class='add'>+</div><div class='add'>+ TIME IN MSECS	EVENT</div><div class='add'>+ 0		w0 starts and burns CPU</div><div class='add'>+ 5		w0 sleeps</div><div class='add'>+ 15		w0 wakes up and burns CPU</div><div class='add'>+ 20		w0 finishes</div><div class='add'>+ 20		w1 starts and burns CPU</div><div class='add'>+ 25		w1 sleeps</div><div class='add'>+ 35		w1 wakes up and finishes</div><div class='add'>+ 35		w2 starts and burns CPU</div><div class='add'>+ 40		w2 sleeps</div><div class='add'>+ 50		w2 wakes up and finishes</div><div class='add'>+</div><div class='add'>+And with cmwq with ``@max_active`` &gt;= 3, ::</div><div class='add'>+</div><div class='add'>+ TIME IN MSECS	EVENT</div><div class='add'>+ 0		w0 starts and burns CPU</div><div class='add'>+ 5		w0 sleeps</div><div class='add'>+ 5		w1 starts and burns CPU</div><div class='add'>+ 10		w1 sleeps</div><div class='add'>+ 10		w2 starts and burns CPU</div><div class='add'>+ 15		w2 sleeps</div><div class='add'>+ 15		w0 wakes up and burns CPU</div><div class='add'>+ 20		w0 finishes</div><div class='add'>+ 20		w1 wakes up and finishes</div><div class='add'>+ 25		w2 wakes up and finishes</div><div class='add'>+</div><div class='add'>+If ``@max_active`` == 2, ::</div><div class='add'>+</div><div class='add'>+ TIME IN MSECS	EVENT</div><div class='add'>+ 0		w0 starts and burns CPU</div><div class='add'>+ 5		w0 sleeps</div><div class='add'>+ 5		w1 starts and burns CPU</div><div class='add'>+ 10		w1 sleeps</div><div class='add'>+ 15		w0 wakes up and burns CPU</div><div class='add'>+ 20		w0 finishes</div><div class='add'>+ 20		w1 wakes up and finishes</div><div class='add'>+ 20		w2 starts and burns CPU</div><div class='add'>+ 25		w2 sleeps</div><div class='add'>+ 35		w2 wakes up and finishes</div><div class='add'>+</div><div class='add'>+Now, let's assume w1 and w2 are queued to a different wq q1 which has</div><div class='add'>+``WQ_CPU_INTENSIVE`` set, ::</div><div class='add'>+</div><div class='add'>+ TIME IN MSECS	EVENT</div><div class='add'>+ 0		w0 starts and burns CPU</div><div class='add'>+ 5		w0 sleeps</div><div class='add'>+ 5		w1 and w2 start and burn CPU</div><div class='add'>+ 10		w1 sleeps</div><div class='add'>+ 15		w2 sleeps</div><div class='add'>+ 15		w0 wakes up and burns CPU</div><div class='add'>+ 20		w0 finishes</div><div class='add'>+ 20		w1 wakes up and finishes</div><div class='add'>+ 25		w2 wakes up and finishes</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Guidelines</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+* Do not forget to use ``WQ_MEM_RECLAIM`` if a wq may process work</div><div class='add'>+  items which are used during memory reclaim.  Each wq with</div><div class='add'>+  ``WQ_MEM_RECLAIM`` set has an execution context reserved for it.  If</div><div class='add'>+  there is dependency among multiple work items used during memory</div><div class='add'>+  reclaim, they should be queued to separate wq each with</div><div class='add'>+  ``WQ_MEM_RECLAIM``.</div><div class='add'>+</div><div class='add'>+* Unless strict ordering is required, there is no need to use ST wq.</div><div class='add'>+</div><div class='add'>+* Unless there is a specific need, using 0 for @max_active is</div><div class='add'>+  recommended.  In most use cases, concurrency level usually stays</div><div class='add'>+  well under the default limit.</div><div class='add'>+</div><div class='add'>+* A wq serves as a domain for forward progress guarantee</div><div class='add'>+  (``WQ_MEM_RECLAIM``, flush and work item attributes.  Work items</div><div class='add'>+  which are not involved in memory reclaim and don't need to be</div><div class='add'>+  flushed as a part of a group of work items, and don't require any</div><div class='add'>+  special attribute, can use one of the system wq.  There is no</div><div class='add'>+  difference in execution characteristics between using a dedicated wq</div><div class='add'>+  and a system wq.</div><div class='add'>+</div><div class='add'>+* Unless work items are expected to consume a huge amount of CPU</div><div class='add'>+  cycles, using a bound wq is usually beneficial due to the increased</div><div class='add'>+  level of locality in wq operations and work item execution.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Debugging</div><div class='add'>+=========</div><div class='add'>+</div><div class='add'>+Because the work functions are executed by generic worker threads</div><div class='add'>+there are a few tricks needed to shed some light on misbehaving</div><div class='add'>+workqueue users.</div><div class='add'>+</div><div class='add'>+Worker threads show up in the process list as: ::</div><div class='add'>+</div><div class='add'>+  root      5671  0.0  0.0      0     0 ?        S    12:07   0:00 [kworker/0:1]</div><div class='add'>+  root      5672  0.0  0.0      0     0 ?        S    12:07   0:00 [kworker/1:2]</div><div class='add'>+  root      5673  0.0  0.0      0     0 ?        S    12:12   0:00 [kworker/0:0]</div><div class='add'>+  root      5674  0.0  0.0      0     0 ?        S    12:13   0:00 [kworker/1:0]</div><div class='add'>+</div><div class='add'>+If kworkers are going crazy (using too much cpu), there are two types</div><div class='add'>+of possible problems:</div><div class='add'>+</div><div class='add'>+	1. Something being scheduled in rapid succession</div><div class='add'>+	2. A single work item that consumes lots of cpu cycles</div><div class='add'>+</div><div class='add'>+The first one can be tracked using tracing: ::</div><div class='add'>+</div><div class='add'>+	$ echo workqueue:workqueue_queue_work &gt; /sys/kernel/debug/tracing/set_event</div><div class='add'>+	$ cat /sys/kernel/debug/tracing/trace_pipe &gt; out.txt</div><div class='add'>+	(wait a few secs)</div><div class='add'>+	^C</div><div class='add'>+</div><div class='add'>+If something is busy looping on work queueing, it would be dominating</div><div class='add'>+the output and the offender can be determined with the work item</div><div class='add'>+function.</div><div class='add'>+</div><div class='add'>+For the second type of problems it should be possible to just check</div><div class='add'>+the stack trace of the offending worker thread. ::</div><div class='add'>+</div><div class='add'>+	$ cat /proc/THE_OFFENDING_KWORKER/stack</div><div class='add'>+</div><div class='add'>+The work item's function should be trivially visible in the stack</div><div class='add'>+trace.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Kernel Inline Documentations Reference</div><div class='add'>+======================================</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/workqueue.h</div><div class='head'>diff --git a/Documentation/cpu-freq/core.txt b/Documentation/cpu-freq/core.txt<br/>index 4bc7287806de..978463a7c81e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/cpu-freq/core.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cpu-freq/core.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/cpu-freq/core.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/core.txt</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'> </div><div class='ctx'> 		    Dominik Brodowski  &lt;linux@brodo.de&gt;</div><div class='ctx'> 		     David Kimdon &lt;dwhedon@debian.org&gt;</div><div class='add'>+		Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='add'>+		   Viresh Kumar &lt;viresh.kumar@linaro.org&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -36,10 +38,11 @@ speed limits (like LCD drivers on ARM architecture). Additionally, the</div><div class='ctx'> kernel "constant" loops_per_jiffy is updated on frequency changes</div><div class='ctx'> here.</div><div class='ctx'> </div><div class='del'>-Reference counting is done by cpufreq_get_cpu and cpufreq_put_cpu,</div><div class='del'>-which make sure that the cpufreq processor driver is correctly</div><div class='del'>-registered with the core, and will not be unloaded until</div><div class='del'>-cpufreq_put_cpu is called.</div><div class='add'>+Reference counting of the cpufreq policies is done by cpufreq_cpu_get</div><div class='add'>+and cpufreq_cpu_put, which make sure that the cpufreq driver is</div><div class='add'>+correctly registered with the core, and will not be unloaded until</div><div class='add'>+cpufreq_put_cpu is called. That also ensures that the respective cpufreq</div><div class='add'>+policy doesn't get freed while being used.</div><div class='ctx'> </div><div class='ctx'> 2. CPUFreq notifiers</div><div class='ctx'> ====================</div><div class='hunk'>@@ -69,18 +72,16 @@ CPUFreq policy notifier is called twice for a policy transition:</div><div class='ctx'> The phase is specified in the second argument to the notifier.</div><div class='ctx'> </div><div class='ctx'> The third argument, a void *pointer, points to a struct cpufreq_policy</div><div class='del'>-consisting of five values: cpu, min, max, policy and max_cpu_freq. min </div><div class='del'>-and max are the lower and upper frequencies (in kHz) of the new</div><div class='del'>-policy, policy the new policy, cpu the number of the affected CPU; and </div><div class='del'>-max_cpu_freq the maximum supported CPU frequency. This value is given </div><div class='del'>-for informational purposes only.</div><div class='add'>+consisting of several values, including min, max (the lower and upper</div><div class='add'>+frequencies (in kHz) of the new policy).</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 2.2 CPUFreq transition notifiers</div><div class='ctx'> --------------------------------</div><div class='ctx'> </div><div class='del'>-These are notified twice when the CPUfreq driver switches the CPU core</div><div class='del'>-frequency and this change has any external implications.</div><div class='add'>+These are notified twice for each online CPU in the policy, when the</div><div class='add'>+CPUfreq driver switches the CPU core frequency and this change has no</div><div class='add'>+any external implications.</div><div class='ctx'> </div><div class='ctx'> The second argument specifies the phase - CPUFREQ_PRECHANGE or</div><div class='ctx'> CPUFREQ_POSTCHANGE.</div><div class='hunk'>@@ -90,6 +91,7 @@ values:</div><div class='ctx'> cpu	- number of the affected CPU</div><div class='ctx'> old	- old frequency</div><div class='ctx'> new	- new frequency</div><div class='add'>+flags	- flags of the cpufreq driver</div><div class='ctx'> </div><div class='ctx'> 3. CPUFreq Table Generation with Operating Performance Point (OPP)</div><div class='ctx'> ==================================================================</div><div class='head'>diff --git a/Documentation/cpu-freq/cpu-drivers.txt b/Documentation/cpu-freq/cpu-drivers.txt<br/>index 772b94fde264..f71e6be26b83 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/cpu-freq/cpu-drivers.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cpu-freq/cpu-drivers.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/cpu-freq/cpu-drivers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/cpu-drivers.txt</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 		    Dominik Brodowski  &lt;linux@brodo.de&gt;</div><div class='add'>+		Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='add'>+		   Viresh Kumar &lt;viresh.kumar@linaro.org&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -49,49 +51,65 @@ using cpufreq_register_driver()</div><div class='ctx'> </div><div class='ctx'> What shall this struct cpufreq_driver contain? </div><div class='ctx'> </div><div class='del'>-cpufreq_driver.name -		The name of this driver.</div><div class='add'>+ .name - The name of this driver.</div><div class='ctx'> </div><div class='del'>-cpufreq_driver.init -		A pointer to the per-CPU initialization </div><div class='del'>-				function.</div><div class='add'>+ .init - A pointer to the per-policy initialization function.</div><div class='ctx'> </div><div class='del'>-cpufreq_driver.verify -		A pointer to a "verification" function.</div><div class='add'>+ .verify - A pointer to a "verification" function.</div><div class='ctx'> </div><div class='del'>-cpufreq_driver.setpolicy _or_ </div><div class='del'>-cpufreq_driver.target/</div><div class='del'>-target_index		-	See below on the differences.</div><div class='add'>+ .setpolicy _or_ .fast_switch _or_ .target _or_ .target_index - See</div><div class='add'>+ below on the differences.</div><div class='ctx'> </div><div class='ctx'> And optionally</div><div class='ctx'> </div><div class='del'>-cpufreq_driver.exit -		A pointer to a per-CPU cleanup</div><div class='del'>-				function called during CPU_POST_DEAD</div><div class='del'>-				phase of cpu hotplug process.</div><div class='add'>+ .flags - Hints for the cpufreq core.</div><div class='ctx'> </div><div class='del'>-cpufreq_driver.stop_cpu -	A pointer to a per-CPU stop function</div><div class='del'>-				called during CPU_DOWN_PREPARE phase of</div><div class='del'>-				cpu hotplug process.</div><div class='add'>+ .driver_data - cpufreq driver specific data.</div><div class='ctx'> </div><div class='del'>-cpufreq_driver.resume -		A pointer to a per-CPU resume function</div><div class='del'>-				which is called with interrupts disabled</div><div class='del'>-				and _before_ the pre-suspend frequency</div><div class='del'>-				and/or policy is restored by a call to</div><div class='del'>-				-&gt;target/target_index or -&gt;setpolicy.</div><div class='add'>+ .resolve_freq - Returns the most appropriate frequency for a target</div><div class='add'>+ frequency. Doesn't change the frequency though.</div><div class='ctx'> </div><div class='del'>-cpufreq_driver.attr -		A pointer to a NULL-terminated list of</div><div class='del'>-				"struct freq_attr" which allow to</div><div class='del'>-				export values to sysfs.</div><div class='add'>+ .get_intermediate and target_intermediate - Used to switch to stable</div><div class='add'>+ frequency while changing CPU frequency.</div><div class='ctx'> </div><div class='del'>-cpufreq_driver.get_intermediate</div><div class='del'>-and target_intermediate		Used to switch to stable frequency while</div><div class='del'>-				changing CPU frequency.</div><div class='add'>+ .get - Returns current frequency of the CPU.</div><div class='add'>+</div><div class='add'>+ .bios_limit - Returns HW/BIOS max frequency limitations for the CPU.</div><div class='add'>+</div><div class='add'>+ .exit - A pointer to a per-policy cleanup function called during</div><div class='add'>+ CPU_POST_DEAD phase of cpu hotplug process.</div><div class='add'>+</div><div class='add'>+ .stop_cpu - A pointer to a per-policy stop function called during</div><div class='add'>+ CPU_DOWN_PREPARE phase of cpu hotplug process.</div><div class='add'>+</div><div class='add'>+ .suspend - A pointer to a per-policy suspend function which is called</div><div class='add'>+ with interrupts disabled and _after_ the governor is stopped for the</div><div class='add'>+ policy.</div><div class='add'>+</div><div class='add'>+ .resume - A pointer to a per-policy resume function which is called</div><div class='add'>+ with interrupts disabled and _before_ the governor is started again.</div><div class='add'>+</div><div class='add'>+ .ready - A pointer to a per-policy ready function which is called after</div><div class='add'>+ the policy is fully initialized.</div><div class='add'>+</div><div class='add'>+ .attr - A pointer to a NULL-terminated list of "struct freq_attr" which</div><div class='add'>+ allow to export values to sysfs.</div><div class='add'>+</div><div class='add'>+ .boost_enabled - If set, boost frequencies are enabled.</div><div class='add'>+</div><div class='add'>+ .set_boost - A pointer to a per-policy function to enable/disable boost</div><div class='add'>+ frequencies.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 1.2 Per-CPU Initialization</div><div class='ctx'> --------------------------</div><div class='ctx'> </div><div class='ctx'> Whenever a new CPU is registered with the device model, or after the</div><div class='del'>-cpufreq driver registers itself, the per-CPU initialization function </div><div class='del'>-cpufreq_driver.init is called. It takes a struct cpufreq_policy</div><div class='del'>-*policy as argument. What to do now?</div><div class='add'>+cpufreq driver registers itself, the per-policy initialization function</div><div class='add'>+cpufreq_driver.init is called if no cpufreq policy existed for the CPU.</div><div class='add'>+Note that the .init() and .exit() routines are called only once for the</div><div class='add'>+policy and not for each CPU managed by the policy. It takes a struct</div><div class='add'>+cpufreq_policy *policy as argument. What to do now?</div><div class='ctx'> </div><div class='ctx'> If necessary, activate the CPUfreq support on your CPU.</div><div class='ctx'> </div><div class='hunk'>@@ -117,47 +135,45 @@ policy-&gt;governor		must contain the "default policy" for</div><div class='ctx'> 				cpufreq_driver.setpolicy or</div><div class='ctx'> 				cpufreq_driver.target/target_index is called</div><div class='ctx'> 				with these values.</div><div class='add'>+policy-&gt;cpus			Update this with the masks of the</div><div class='add'>+				(online + offline) CPUs that do DVFS</div><div class='add'>+				along with this CPU (i.e.  that share</div><div class='add'>+				clock/voltage rails with it).</div><div class='ctx'> </div><div class='ctx'> For setting some of these values (cpuinfo.min[max]_freq, policy-&gt;min[max]), the</div><div class='ctx'> frequency table helpers might be helpful. See the section 2 for more information</div><div class='ctx'> on them.</div><div class='ctx'> </div><div class='del'>-SMP systems normally have same clock source for a group of cpus. For these the</div><div class='del'>-.init() would be called only once for the first online cpu. Here the .init()</div><div class='del'>-routine must initialize policy-&gt;cpus with mask of all possible cpus (Online +</div><div class='del'>-Offline) that share the clock. Then the core would copy this mask onto</div><div class='del'>-policy-&gt;related_cpus and will reset policy-&gt;cpus to carry only online cpus.</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> 1.3 verify</div><div class='del'>-------------</div><div class='add'>+----------</div><div class='ctx'> </div><div class='ctx'> When the user decides a new policy (consisting of</div><div class='ctx'> "policy,governor,min,max") shall be set, this policy must be validated</div><div class='ctx'> so that incompatible values can be corrected. For verifying these</div><div class='del'>-values, a frequency table helper and/or the</div><div class='del'>-cpufreq_verify_within_limits(struct cpufreq_policy *policy, unsigned</div><div class='del'>-int min_freq, unsigned int max_freq) function might be helpful. See</div><div class='del'>-section 2 for details on frequency table helpers.</div><div class='add'>+values cpufreq_verify_within_limits(struct cpufreq_policy *policy,</div><div class='add'>+unsigned int min_freq, unsigned int max_freq) function might be helpful.</div><div class='add'>+See section 2 for details on frequency table helpers.</div><div class='ctx'> </div><div class='ctx'> You need to make sure that at least one valid frequency (or operating</div><div class='ctx'> range) is within policy-&gt;min and policy-&gt;max. If necessary, increase</div><div class='ctx'> policy-&gt;max first, and only if this is no solution, decrease policy-&gt;min.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-1.4 target/target_index or setpolicy?</div><div class='del'>-----------------------------</div><div class='add'>+1.4 target or target_index or setpolicy or fast_switch?</div><div class='add'>+-------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> Most cpufreq drivers or even most cpu frequency scaling algorithms </div><div class='del'>-only allow the CPU to be set to one frequency. For these, you use the</div><div class='del'>--&gt;target/target_index call.</div><div class='add'>+only allow the CPU frequency to be set to predefined fixed values. For</div><div class='add'>+these, you use the -&gt;target(), -&gt;target_index() or -&gt;fast_switch()</div><div class='add'>+callbacks.</div><div class='ctx'> </div><div class='del'>-Some cpufreq-capable processors switch the frequency between certain</div><div class='del'>-limits on their own. These shall use the -&gt;setpolicy call</div><div class='add'>+Some cpufreq capable processors switch the frequency between certain</div><div class='add'>+limits on their own. These shall use the -&gt;setpolicy() callback.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 1.5. target/target_index</div><div class='del'>--------------</div><div class='add'>+------------------------</div><div class='ctx'> </div><div class='ctx'> The target_index call has two arguments: struct cpufreq_policy *policy,</div><div class='ctx'> and unsigned int index (into the exposed frequency table).</div><div class='hunk'>@@ -186,9 +202,20 @@ actual frequency must be determined using the following rules:</div><div class='ctx'> Here again the frequency table helper might assist you - see section 2</div><div class='ctx'> for details.</div><div class='ctx'> </div><div class='add'>+1.6. fast_switch</div><div class='add'>+----------------</div><div class='ctx'> </div><div class='del'>-1.6 setpolicy</div><div class='del'>----------------</div><div class='add'>+This function is used for frequency switching from scheduler's context.</div><div class='add'>+Not all drivers are expected to implement it, as sleeping from within</div><div class='add'>+this callback isn't allowed. This callback must be highly optimized to</div><div class='add'>+do switching as fast as possible.</div><div class='add'>+</div><div class='add'>+This function has two arguments: struct cpufreq_policy *policy and</div><div class='add'>+unsigned int target_frequency.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1.7 setpolicy</div><div class='add'>+-------------</div><div class='ctx'> </div><div class='ctx'> The setpolicy call only takes a struct cpufreq_policy *policy as</div><div class='ctx'> argument. You need to set the lower limit of the in-processor or</div><div class='hunk'>@@ -198,7 +225,7 @@ setting when policy-&gt;policy is CPUFREQ_POLICY_PERFORMANCE, and a</div><div class='ctx'> powersaving-oriented setting when CPUFREQ_POLICY_POWERSAVE. Also check</div><div class='ctx'> the reference implementation in drivers/cpufreq/longrun.c</div><div class='ctx'> </div><div class='del'>-1.7 get_intermediate and target_intermediate</div><div class='add'>+1.8 get_intermediate and target_intermediate</div><div class='ctx'> --------------------------------------------</div><div class='ctx'> </div><div class='ctx'> Only for drivers with target_index() and CPUFREQ_ASYNC_NOTIFICATION unset.</div><div class='hunk'>@@ -222,42 +249,36 @@ failures as core would send notifications for that.</div><div class='ctx'> </div><div class='ctx'> As most cpufreq processors only allow for being set to a few specific</div><div class='ctx'> frequencies, a "frequency table" with some functions might assist in</div><div class='del'>-some work of the processor driver. Such a "frequency table" consists</div><div class='del'>-of an array of struct cpufreq_frequency_table entries, with any value in</div><div class='del'>-"driver_data" you want to use, and the corresponding frequency in</div><div class='del'>-"frequency". At the end of the table, you need to add a</div><div class='del'>-cpufreq_frequency_table entry with frequency set to CPUFREQ_TABLE_END. And</div><div class='del'>-if you want to skip one entry in the table, set the frequency to </div><div class='del'>-CPUFREQ_ENTRY_INVALID. The entries don't need to be in ascending</div><div class='del'>-order.</div><div class='del'>-</div><div class='del'>-By calling cpufreq_table_validate_and_show(struct cpufreq_policy *policy,</div><div class='del'>-					struct cpufreq_frequency_table *table);</div><div class='del'>-the cpuinfo.min_freq and cpuinfo.max_freq values are detected, and</div><div class='del'>-policy-&gt;min and policy-&gt;max are set to the same values. This is</div><div class='del'>-helpful for the per-CPU initialization stage.</div><div class='del'>-</div><div class='del'>-int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,</div><div class='del'>-                                   struct cpufreq_frequency_table *table);</div><div class='del'>-assures that at least one valid frequency is within policy-&gt;min and</div><div class='del'>-policy-&gt;max, and all other criteria are met. This is helpful for the</div><div class='del'>--&gt;verify call.</div><div class='del'>-</div><div class='del'>-int cpufreq_frequency_table_target(struct cpufreq_policy *policy,</div><div class='del'>-                                   unsigned int target_freq,</div><div class='del'>-                                   unsigned int relation);</div><div class='del'>-</div><div class='del'>-is the corresponding frequency table helper for the -&gt;target</div><div class='del'>-stage. Just pass the values to this function, and this function</div><div class='del'>-returns the number of the frequency table entry which contains</div><div class='del'>-the frequency the CPU shall be set to.</div><div class='add'>+some work of the processor driver. Such a "frequency table" consists of</div><div class='add'>+an array of struct cpufreq_frequency_table entries, with driver specific</div><div class='add'>+values in "driver_data", the corresponding frequency in "frequency" and</div><div class='add'>+flags set. At the end of the table, you need to add a</div><div class='add'>+cpufreq_frequency_table entry with frequency set to CPUFREQ_TABLE_END.</div><div class='add'>+And if you want to skip one entry in the table, set the frequency to</div><div class='add'>+CPUFREQ_ENTRY_INVALID. The entries don't need to be in sorted in any</div><div class='add'>+particular order, but if they are cpufreq core will do DVFS a bit</div><div class='add'>+quickly for them as search for best match is faster.</div><div class='add'>+</div><div class='add'>+By calling cpufreq_table_validate_and_show(), the cpuinfo.min_freq and</div><div class='add'>+cpuinfo.max_freq values are detected, and policy-&gt;min and policy-&gt;max</div><div class='add'>+are set to the same values. This is helpful for the per-CPU</div><div class='add'>+initialization stage.</div><div class='add'>+</div><div class='add'>+cpufreq_frequency_table_verify() assures that at least one valid</div><div class='add'>+frequency is within policy-&gt;min and policy-&gt;max, and all other criteria</div><div class='add'>+are met. This is helpful for the -&gt;verify call.</div><div class='add'>+</div><div class='add'>+cpufreq_frequency_table_target() is the corresponding frequency table</div><div class='add'>+helper for the -&gt;target stage. Just pass the values to this function,</div><div class='add'>+and this function returns the of the frequency table entry which</div><div class='add'>+contains the frequency the CPU shall be set to.</div><div class='ctx'> </div><div class='ctx'> The following macros can be used as iterators over cpufreq_frequency_table:</div><div class='ctx'> </div><div class='ctx'> cpufreq_for_each_entry(pos, table) - iterates over all entries of frequency</div><div class='ctx'> table.</div><div class='ctx'> </div><div class='del'>-cpufreq-for_each_valid_entry(pos, table) - iterates over all entries,</div><div class='add'>+cpufreq_for_each_valid_entry(pos, table) - iterates over all entries,</div><div class='ctx'> excluding CPUFREQ_ENTRY_INVALID frequencies.</div><div class='ctx'> Use arguments "pos" - a cpufreq_frequency_table * as a loop cursor and</div><div class='ctx'> "table" - the cpufreq_frequency_table * you want to iterate over.</div><div class='head'>diff --git a/Documentation/cpu-freq/cpufreq-stats.txt b/Documentation/cpu-freq/cpufreq-stats.txt<br/>index 8d9773f23550..2bbe207354ed 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/cpu-freq/cpufreq-stats.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cpu-freq/cpufreq-stats.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/cpu-freq/cpufreq-stats.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/cpufreq-stats.txt</a></div><div class='hunk'>@@ -34,21 +34,27 @@ cpufreq stats provides following statistics (explained in detail below).</div><div class='ctx'> -  total_trans</div><div class='ctx'> -  trans_table</div><div class='ctx'> </div><div class='del'>-All the statistics will be from the time the stats driver has been inserted </div><div class='del'>-to the time when a read of a particular statistic is done. Obviously, stats </div><div class='del'>-driver will not have any information about the frequency transitions before</div><div class='del'>-the stats driver insertion.</div><div class='add'>+All the statistics will be from the time the stats driver has been inserted</div><div class='add'>+(or the time the stats were reset) to the time when a read of a particular</div><div class='add'>+statistic is done. Obviously, stats driver will not have any information</div><div class='add'>+about the frequency transitions before the stats driver insertion.</div><div class='ctx'> </div><div class='ctx'> --------------------------------------------------------------------------------</div><div class='ctx'> &lt;mysystem&gt;:/sys/devices/system/cpu/cpu0/cpufreq/stats # ls -l</div><div class='ctx'> total 0</div><div class='ctx'> drwxr-xr-x  2 root root    0 May 14 16:06 .</div><div class='ctx'> drwxr-xr-x  3 root root    0 May 14 15:58 ..</div><div class='add'>+--w-------  1 root root 4096 May 14 16:06 reset</div><div class='ctx'> -r--r--r--  1 root root 4096 May 14 16:06 time_in_state</div><div class='ctx'> -r--r--r--  1 root root 4096 May 14 16:06 total_trans</div><div class='ctx'> -r--r--r--  1 root root 4096 May 14 16:06 trans_table</div><div class='ctx'> --------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='add'>+-  reset</div><div class='add'>+Write-only attribute that can be used to reset the stat counters. This can be</div><div class='add'>+useful for evaluating system behaviour under different governors without the</div><div class='add'>+need for a reboot.</div><div class='add'>+</div><div class='ctx'> -  time_in_state</div><div class='ctx'> This gives the amount of time spent in each of the frequencies supported by</div><div class='ctx'> this CPU. The cat output will have "&lt;frequency&gt; &lt;time&gt;" pair in each line, which</div><div class='hunk'>@@ -104,25 +110,13 @@ Config Main Menu</div><div class='ctx'> 		CPU Frequency scaling  ---&gt;</div><div class='ctx'> 			[*] CPU Frequency scaling</div><div class='ctx'> 			[*]   CPU frequency translation statistics</div><div class='del'>-			[*]     CPU frequency translation statistics details</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> "CPU Frequency scaling" (CONFIG_CPU_FREQ) should be enabled to configure</div><div class='ctx'> cpufreq-stats.</div><div class='ctx'> </div><div class='ctx'> "CPU frequency translation statistics" (CONFIG_CPU_FREQ_STAT) provides the</div><div class='del'>-basic statistics which includes time_in_state and total_trans.</div><div class='del'>-</div><div class='del'>-"CPU frequency translation statistics details" (CONFIG_CPU_FREQ_STAT_DETAILS)</div><div class='del'>-provides fine grained cpufreq stats by trans_table. The reason for having a</div><div class='del'>-separate config option for trans_table is:</div><div class='del'>-- trans_table goes against the traditional /sysfs rule of one value per</div><div class='del'>-  interface. It provides a whole bunch of value in a 2 dimensional matrix</div><div class='del'>-  form.</div><div class='add'>+statistics which includes time_in_state, total_trans and trans_table.</div><div class='ctx'> </div><div class='del'>-Once these two options are enabled and your CPU supports cpufrequency, you</div><div class='add'>+Once this option is enabled and your CPU supports cpufrequency, you</div><div class='ctx'> will be able to see the CPU frequency statistics in /sysfs.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt<br/>index c15aa75f5227..61b3184b6c24 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/cpu-freq/governors.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cpu-freq/governors.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/cpu-freq/governors.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/governors.txt</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> </div><div class='ctx'> 		    Dominik Brodowski  &lt;linux@brodo.de&gt;</div><div class='ctx'>             some additions and corrections by Nico Golde &lt;nico@ngolde.de&gt;</div><div class='add'>+		Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='add'>+		   Viresh Kumar &lt;viresh.kumar@linaro.org&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -28,32 +30,27 @@ Contents:</div><div class='ctx'> 2.3  Userspace</div><div class='ctx'> 2.4  Ondemand</div><div class='ctx'> 2.5  Conservative</div><div class='add'>+2.6  Schedutil</div><div class='ctx'> </div><div class='ctx'> 3.   The Governor Interface in the CPUfreq Core</div><div class='ctx'> </div><div class='add'>+4.   References</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 1. What Is A CPUFreq Governor?</div><div class='ctx'> ==============================</div><div class='ctx'> </div><div class='ctx'> Most cpufreq drivers (except the intel_pstate and longrun) or even most</div><div class='del'>-cpu frequency scaling algorithms only offer the CPU to be set to one</div><div class='del'>-frequency. In order to offer dynamic frequency scaling, the cpufreq</div><div class='del'>-core must be able to tell these drivers of a "target frequency". So</div><div class='del'>-these specific drivers will be transformed to offer a "-&gt;target/target_index"</div><div class='del'>-call instead of the existing "-&gt;setpolicy" call. For "longrun", all</div><div class='del'>-stays the same, though.</div><div class='add'>+cpu frequency scaling algorithms only allow the CPU frequency to be set</div><div class='add'>+to predefined fixed values.  In order to offer dynamic frequency</div><div class='add'>+scaling, the cpufreq core must be able to tell these drivers of a</div><div class='add'>+"target frequency". So these specific drivers will be transformed to</div><div class='add'>+offer a "-&gt;target/target_index/fast_switch()" call instead of the</div><div class='add'>+"-&gt;setpolicy()" call. For set_policy drivers, all stays the same,</div><div class='add'>+though.</div><div class='ctx'> </div><div class='ctx'> How to decide what frequency within the CPUfreq policy should be used?</div><div class='del'>-That's done using "cpufreq governors". Two are already in this patch</div><div class='del'>--- they're the already existing "powersave" and "performance" which</div><div class='del'>-set the frequency statically to the lowest or highest frequency,</div><div class='del'>-respectively. At least two more such governors will be ready for</div><div class='del'>-addition in the near future, but likely many more as there are various</div><div class='del'>-different theories and models about dynamic frequency scaling</div><div class='del'>-around. Using such a generic interface as cpufreq offers to scaling</div><div class='del'>-governors, these can be tested extensively, and the best one can be</div><div class='del'>-selected for each specific use.</div><div class='add'>+That's done using "cpufreq governors".</div><div class='ctx'> </div><div class='ctx'> Basically, it's the following flow graph:</div><div class='ctx'> </div><div class='hunk'>@@ -71,7 +68,7 @@ CPU can be set to switch independently	 |	   CPU can only be set</div><div class='ctx'> 		    /			       the limits of policy-&gt;{min,max}</div><div class='ctx'> 		   /			            \</div><div class='ctx'> 		  /				     \</div><div class='del'>-	Using the -&gt;setpolicy call,		 Using the -&gt;target/target_index call,</div><div class='add'>+	Using the -&gt;setpolicy call,		 Using the -&gt;target/target_index/fast_switch call,</div><div class='ctx'> 	    the limits and the			  the frequency closest</div><div class='ctx'> 	     "policy" is set.			  to target_freq is set.</div><div class='ctx'> 						  It is assured that it</div><div class='hunk'>@@ -109,114 +106,159 @@ directory.</div><div class='ctx'> 2.4 Ondemand</div><div class='ctx'> ------------</div><div class='ctx'> </div><div class='del'>-The CPUfreq governor "ondemand" sets the CPU depending on the</div><div class='del'>-current usage. To do this the CPU must have the capability to</div><div class='del'>-switch the frequency very quickly.  There are a number of sysfs file</div><div class='del'>-accessible parameters:</div><div class='del'>-</div><div class='del'>-sampling_rate: measured in uS (10^-6 seconds), this is how often you</div><div class='del'>-want the kernel to look at the CPU usage and to make decisions on</div><div class='del'>-what to do about the frequency.  Typically this is set to values of</div><div class='del'>-around '10000' or more. It's default value is (cmp. with users-guide.txt):</div><div class='del'>-transition_latency * 1000</div><div class='del'>-Be aware that transition latency is in ns and sampling_rate is in us, so you</div><div class='del'>-get the same sysfs value by default.</div><div class='del'>-Sampling rate should always get adjusted considering the transition latency</div><div class='del'>-To set the sampling rate 750 times as high as the transition latency</div><div class='del'>-in the bash (as said, 1000 is default), do:</div><div class='del'>-echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) \</div><div class='del'>-    &gt;ondemand/sampling_rate</div><div class='del'>-</div><div class='del'>-sampling_rate_min:</div><div class='del'>-The sampling rate is limited by the HW transition latency:</div><div class='del'>-transition_latency * 100</div><div class='del'>-Or by kernel restrictions:</div><div class='del'>-If CONFIG_NO_HZ_COMMON is set, the limit is 10ms fixed.</div><div class='del'>-If CONFIG_NO_HZ_COMMON is not set or nohz=off boot parameter is used, the</div><div class='del'>-limits depend on the CONFIG_HZ option:</div><div class='del'>-HZ=1000: min=20000us  (20ms)</div><div class='del'>-HZ=250:  min=80000us  (80ms)</div><div class='del'>-HZ=100:  min=200000us (200ms)</div><div class='del'>-The highest value of kernel and HW latency restrictions is shown and</div><div class='del'>-used as the minimum sampling rate.</div><div class='del'>-</div><div class='del'>-up_threshold: defines what the average CPU usage between the samplings</div><div class='del'>-of 'sampling_rate' needs to be for the kernel to make a decision on</div><div class='del'>-whether it should increase the frequency.  For example when it is set</div><div class='del'>-to its default value of '95' it means that between the checking</div><div class='del'>-intervals the CPU needs to be on average more than 95% in use to then</div><div class='del'>-decide that the CPU frequency needs to be increased.  </div><div class='del'>-</div><div class='del'>-ignore_nice_load: this parameter takes a value of '0' or '1'. When</div><div class='del'>-set to '0' (its default), all processes are counted towards the</div><div class='del'>-'cpu utilisation' value.  When set to '1', the processes that are</div><div class='del'>-run with a 'nice' value will not count (and thus be ignored) in the</div><div class='del'>-overall usage calculation.  This is useful if you are running a CPU</div><div class='del'>-intensive calculation on your laptop that you do not care how long it</div><div class='del'>-takes to complete as you can 'nice' it and prevent it from taking part</div><div class='del'>-in the deciding process of whether to increase your CPU frequency.</div><div class='del'>-</div><div class='del'>-sampling_down_factor: this parameter controls the rate at which the</div><div class='del'>-kernel makes a decision on when to decrease the frequency while running</div><div class='del'>-at top speed. When set to 1 (the default) decisions to reevaluate load</div><div class='del'>-are made at the same interval regardless of current clock speed. But</div><div class='del'>-when set to greater than 1 (e.g. 100) it acts as a multiplier for the</div><div class='del'>-scheduling interval for reevaluating load when the CPU is at its top</div><div class='del'>-speed due to high load. This improves performance by reducing the overhead</div><div class='del'>-of load evaluation and helping the CPU stay at its top speed when truly</div><div class='del'>-busy, rather than shifting back and forth in speed. This tunable has no</div><div class='del'>-effect on behavior at lower speeds/lower CPU loads.</div><div class='del'>-</div><div class='del'>-powersave_bias: this parameter takes a value between 0 to 1000. It</div><div class='del'>-defines the percentage (times 10) value of the target frequency that</div><div class='del'>-will be shaved off of the target. For example, when set to 100 -- 10%,</div><div class='del'>-when ondemand governor would have targeted 1000 MHz, it will target</div><div class='del'>-1000 MHz - (10% of 1000 MHz) = 900 MHz instead. This is set to 0</div><div class='del'>-(disabled) by default.</div><div class='del'>-When AMD frequency sensitivity powersave bias driver --</div><div class='del'>-drivers/cpufreq/amd_freq_sensitivity.c is loaded, this parameter</div><div class='del'>-defines the workload frequency sensitivity threshold in which a lower</div><div class='del'>-frequency is chosen instead of ondemand governor's original target.</div><div class='del'>-The frequency sensitivity is a hardware reported (on AMD Family 16h</div><div class='del'>-Processors and above) value between 0 to 100% that tells software how</div><div class='del'>-the performance of the workload running on a CPU will change when</div><div class='del'>-frequency changes. A workload with sensitivity of 0% (memory/IO-bound)</div><div class='del'>-will not perform any better on higher core frequency, whereas a</div><div class='del'>-workload with sensitivity of 100% (CPU-bound) will perform better</div><div class='del'>-higher the frequency. When the driver is loaded, this is set to 400</div><div class='del'>-by default -- for CPUs running workloads with sensitivity value below</div><div class='del'>-40%, a lower frequency is chosen. Unloading the driver or writing 0</div><div class='del'>-will disable this feature.</div><div class='add'>+The CPUfreq governor "ondemand" sets the CPU frequency depending on the</div><div class='add'>+current system load. Load estimation is triggered by the scheduler</div><div class='add'>+through the update_util_data-&gt;func hook; when triggered, cpufreq checks</div><div class='add'>+the CPU-usage statistics over the last period and the governor sets the</div><div class='add'>+CPU accordingly.  The CPU must have the capability to switch the</div><div class='add'>+frequency very quickly.</div><div class='add'>+</div><div class='add'>+Sysfs files:</div><div class='add'>+</div><div class='add'>+* sampling_rate:</div><div class='add'>+</div><div class='add'>+  Measured in uS (10^-6 seconds), this is how often you want the kernel</div><div class='add'>+  to look at the CPU usage and to make decisions on what to do about the</div><div class='add'>+  frequency.  Typically this is set to values of around '10000' or more.</div><div class='add'>+  It's default value is (cmp. with users-guide.txt): transition_latency</div><div class='add'>+  * 1000.  Be aware that transition latency is in ns and sampling_rate</div><div class='add'>+  is in us, so you get the same sysfs value by default.  Sampling rate</div><div class='add'>+  should always get adjusted considering the transition latency to set</div><div class='add'>+  the sampling rate 750 times as high as the transition latency in the</div><div class='add'>+  bash (as said, 1000 is default), do:</div><div class='add'>+</div><div class='add'>+  $ echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) &gt; ondemand/sampling_rate</div><div class='add'>+</div><div class='add'>+* sampling_rate_min:</div><div class='add'>+</div><div class='add'>+  The sampling rate is limited by the HW transition latency:</div><div class='add'>+  transition_latency * 100</div><div class='add'>+</div><div class='add'>+  Or by kernel restrictions:</div><div class='add'>+  - If CONFIG_NO_HZ_COMMON is set, the limit is 10ms fixed.</div><div class='add'>+  - If CONFIG_NO_HZ_COMMON is not set or nohz=off boot parameter is</div><div class='add'>+    used, the limits depend on the CONFIG_HZ option:</div><div class='add'>+    HZ=1000: min=20000us  (20ms)</div><div class='add'>+    HZ=250:  min=80000us  (80ms)</div><div class='add'>+    HZ=100:  min=200000us (200ms)</div><div class='add'>+</div><div class='add'>+  The highest value of kernel and HW latency restrictions is shown and</div><div class='add'>+  used as the minimum sampling rate.</div><div class='add'>+</div><div class='add'>+* up_threshold:</div><div class='add'>+</div><div class='add'>+  This defines what the average CPU usage between the samplings of</div><div class='add'>+  'sampling_rate' needs to be for the kernel to make a decision on</div><div class='add'>+  whether it should increase the frequency.  For example when it is set</div><div class='add'>+  to its default value of '95' it means that between the checking</div><div class='add'>+  intervals the CPU needs to be on average more than 95% in use to then</div><div class='add'>+  decide that the CPU frequency needs to be increased.</div><div class='add'>+</div><div class='add'>+* ignore_nice_load:</div><div class='add'>+</div><div class='add'>+  This parameter takes a value of '0' or '1'. When set to '0' (its</div><div class='add'>+  default), all processes are counted towards the 'cpu utilisation'</div><div class='add'>+  value.  When set to '1', the processes that are run with a 'nice'</div><div class='add'>+  value will not count (and thus be ignored) in the overall usage</div><div class='add'>+  calculation.  This is useful if you are running a CPU intensive</div><div class='add'>+  calculation on your laptop that you do not care how long it takes to</div><div class='add'>+  complete as you can 'nice' it and prevent it from taking part in the</div><div class='add'>+  deciding process of whether to increase your CPU frequency.</div><div class='add'>+</div><div class='add'>+* sampling_down_factor:</div><div class='add'>+</div><div class='add'>+  This parameter controls the rate at which the kernel makes a decision</div><div class='add'>+  on when to decrease the frequency while running at top speed. When set</div><div class='add'>+  to 1 (the default) decisions to reevaluate load are made at the same</div><div class='add'>+  interval regardless of current clock speed. But when set to greater</div><div class='add'>+  than 1 (e.g. 100) it acts as a multiplier for the scheduling interval</div><div class='add'>+  for reevaluating load when the CPU is at its top speed due to high</div><div class='add'>+  load. This improves performance by reducing the overhead of load</div><div class='add'>+  evaluation and helping the CPU stay at its top speed when truly busy,</div><div class='add'>+  rather than shifting back and forth in speed. This tunable has no</div><div class='add'>+  effect on behavior at lower speeds/lower CPU loads.</div><div class='add'>+</div><div class='add'>+* powersave_bias:</div><div class='add'>+</div><div class='add'>+  This parameter takes a value between 0 to 1000. It defines the</div><div class='add'>+  percentage (times 10) value of the target frequency that will be</div><div class='add'>+  shaved off of the target. For example, when set to 100 -- 10%, when</div><div class='add'>+  ondemand governor would have targeted 1000 MHz, it will target</div><div class='add'>+  1000 MHz - (10% of 1000 MHz) = 900 MHz instead. This is set to 0</div><div class='add'>+  (disabled) by default.</div><div class='add'>+</div><div class='add'>+  When AMD frequency sensitivity powersave bias driver --</div><div class='add'>+  drivers/cpufreq/amd_freq_sensitivity.c is loaded, this parameter</div><div class='add'>+  defines the workload frequency sensitivity threshold in which a lower</div><div class='add'>+  frequency is chosen instead of ondemand governor's original target.</div><div class='add'>+  The frequency sensitivity is a hardware reported (on AMD Family 16h</div><div class='add'>+  Processors and above) value between 0 to 100% that tells software how</div><div class='add'>+  the performance of the workload running on a CPU will change when</div><div class='add'>+  frequency changes. A workload with sensitivity of 0% (memory/IO-bound)</div><div class='add'>+  will not perform any better on higher core frequency, whereas a</div><div class='add'>+  workload with sensitivity of 100% (CPU-bound) will perform better</div><div class='add'>+  higher the frequency. When the driver is loaded, this is set to 400 by</div><div class='add'>+  default -- for CPUs running workloads with sensitivity value below</div><div class='add'>+  40%, a lower frequency is chosen. Unloading the driver or writing 0</div><div class='add'>+  will disable this feature.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 2.5 Conservative</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='ctx'> The CPUfreq governor "conservative", much like the "ondemand"</div><div class='del'>-governor, sets the CPU depending on the current usage.  It differs in</div><div class='del'>-behaviour in that it gracefully increases and decreases the CPU speed</div><div class='del'>-rather than jumping to max speed the moment there is any load on the</div><div class='del'>-CPU.  This behaviour more suitable in a battery powered environment.</div><div class='del'>-The governor is tweaked in the same manner as the "ondemand" governor</div><div class='del'>-through sysfs with the addition of:</div><div class='del'>-</div><div class='del'>-freq_step: this describes what percentage steps the cpu freq should be</div><div class='del'>-increased and decreased smoothly by.  By default the cpu frequency will</div><div class='del'>-increase in 5% chunks of your maximum cpu frequency.  You can change this</div><div class='del'>-value to anywhere between 0 and 100 where '0' will effectively lock your</div><div class='del'>-CPU at a speed regardless of its load whilst '100' will, in theory, make</div><div class='del'>-it behave identically to the "ondemand" governor.</div><div class='del'>-</div><div class='del'>-down_threshold: same as the 'up_threshold' found for the "ondemand"</div><div class='del'>-governor but for the opposite direction.  For example when set to its</div><div class='del'>-default value of '20' it means that if the CPU usage needs to be below</div><div class='del'>-20% between samples to have the frequency decreased.</div><div class='del'>-</div><div class='del'>-sampling_down_factor: similar functionality as in "ondemand" governor.</div><div class='del'>-But in "conservative", it controls the rate at which the kernel makes</div><div class='del'>-a decision on when to decrease the frequency while running in any</div><div class='del'>-speed. Load for frequency increase is still evaluated every</div><div class='del'>-sampling rate.</div><div class='add'>+governor, sets the CPU frequency depending on the current usage.  It</div><div class='add'>+differs in behaviour in that it gracefully increases and decreases the</div><div class='add'>+CPU speed rather than jumping to max speed the moment there is any load</div><div class='add'>+on the CPU. This behaviour is more suitable in a battery powered</div><div class='add'>+environment.  The governor is tweaked in the same manner as the</div><div class='add'>+"ondemand" governor through sysfs with the addition of:</div><div class='add'>+</div><div class='add'>+* freq_step:</div><div class='add'>+</div><div class='add'>+  This describes what percentage steps the cpu freq should be increased</div><div class='add'>+  and decreased smoothly by.  By default the cpu frequency will increase</div><div class='add'>+  in 5% chunks of your maximum cpu frequency.  You can change this value</div><div class='add'>+  to anywhere between 0 and 100 where '0' will effectively lock your CPU</div><div class='add'>+  at a speed regardless of its load whilst '100' will, in theory, make</div><div class='add'>+  it behave identically to the "ondemand" governor.</div><div class='add'>+</div><div class='add'>+* down_threshold:</div><div class='add'>+</div><div class='add'>+  Same as the 'up_threshold' found for the "ondemand" governor but for</div><div class='add'>+  the opposite direction.  For example when set to its default value of</div><div class='add'>+  '20' it means that if the CPU usage needs to be below 20% between</div><div class='add'>+  samples to have the frequency decreased.</div><div class='add'>+</div><div class='add'>+* sampling_down_factor:</div><div class='add'>+</div><div class='add'>+  Similar functionality as in "ondemand" governor.  But in</div><div class='add'>+  "conservative", it controls the rate at which the kernel makes a</div><div class='add'>+  decision on when to decrease the frequency while running in any speed.</div><div class='add'>+  Load for frequency increase is still evaluated every sampling rate.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.6 Schedutil</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+The "schedutil" governor aims at better integration with the Linux</div><div class='add'>+kernel scheduler.  Load estimation is achieved through the scheduler's</div><div class='add'>+Per-Entity Load Tracking (PELT) mechanism, which also provides</div><div class='add'>+information about the recent load [1].  This governor currently does</div><div class='add'>+load based DVFS only for tasks managed by CFS. RT and DL scheduler tasks</div><div class='add'>+are always run at the highest frequency.  Unlike all the other</div><div class='add'>+governors, the code is located under the kernel/sched/ directory.</div><div class='add'>+</div><div class='add'>+Sysfs files:</div><div class='add'>+</div><div class='add'>+* rate_limit_us:</div><div class='add'>+</div><div class='add'>+  This contains a value in microseconds. The governor waits for</div><div class='add'>+  rate_limit_us time before reevaluating the load again, after it has</div><div class='add'>+  evaluated the load once.</div><div class='add'>+</div><div class='add'>+For an in-depth comparison with the other governors refer to [2].</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 3. The Governor Interface in the CPUfreq Core</div><div class='ctx'> =============================================</div><div class='hunk'>@@ -225,26 +267,10 @@ A new governor must register itself with the CPUfreq core using</div><div class='ctx'> "cpufreq_register_governor". The struct cpufreq_governor, which has to</div><div class='ctx'> be passed to that function, must contain the following values:</div><div class='ctx'> </div><div class='del'>-governor-&gt;name -	    A unique name for this governor</div><div class='del'>-governor-&gt;governor -	    The governor callback function</div><div class='del'>-governor-&gt;owner	-	    .THIS_MODULE for the governor module (if </div><div class='del'>-			    appropriate)</div><div class='del'>-</div><div class='del'>-The governor-&gt;governor callback is called with the current (or to-be-set)</div><div class='del'>-cpufreq_policy struct for that CPU, and an unsigned int event. The</div><div class='del'>-following events are currently defined:</div><div class='del'>-</div><div class='del'>-CPUFREQ_GOV_START:   This governor shall start its duty for the CPU</div><div class='del'>-		     policy-&gt;cpu</div><div class='del'>-CPUFREQ_GOV_STOP:    This governor shall end its duty for the CPU</div><div class='del'>-		     policy-&gt;cpu</div><div class='del'>-CPUFREQ_GOV_LIMITS:  The limits for CPU policy-&gt;cpu have changed to</div><div class='del'>-		     policy-&gt;min and policy-&gt;max.</div><div class='del'>-</div><div class='del'>-If you need other "events" externally of your driver, _only_ use the</div><div class='del'>-cpufreq_governor_l(unsigned int cpu, unsigned int event) call to the</div><div class='del'>-CPUfreq core to ensure proper locking.</div><div class='add'>+governor-&gt;name - A unique name for this governor.</div><div class='add'>+governor-&gt;owner - .THIS_MODULE for the governor module (if appropriate).</div><div class='ctx'> </div><div class='add'>+plus a set of hooks to the functions implementing the governor's logic.</div><div class='ctx'> </div><div class='ctx'> The CPUfreq governor may call the CPU processor driver using one of</div><div class='ctx'> these two functions:</div><div class='hunk'>@@ -258,12 +284,18 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,</div><div class='ctx'>                                    unsigned int relation);</div><div class='ctx'> </div><div class='ctx'> target_freq must be within policy-&gt;min and policy-&gt;max, of course.</div><div class='del'>-What's the difference between these two functions? When your governor</div><div class='del'>-still is in a direct code path of a call to governor-&gt;governor, the</div><div class='del'>-per-CPU cpufreq lock is still held in the cpufreq core, and there's</div><div class='del'>-no need to lock it again (in fact, this would cause a deadlock). So</div><div class='del'>-use __cpufreq_driver_target only in these cases. In all other cases </div><div class='del'>-(for example, when there's a "daemonized" function that wakes up </div><div class='del'>-every second), use cpufreq_driver_target to lock the cpufreq per-CPU</div><div class='del'>-lock before the command is passed to the cpufreq processor driver.</div><div class='add'>+What's the difference between these two functions? When your governor is</div><div class='add'>+in a direct code path of a call to governor callbacks, like</div><div class='add'>+governor-&gt;start(), the policy-&gt;rwsem is still held in the cpufreq core,</div><div class='add'>+and there's no need to lock it again (in fact, this would cause a</div><div class='add'>+deadlock). So use __cpufreq_driver_target only in these cases. In all</div><div class='add'>+other cases (for example, when there's a "daemonized" function that</div><div class='add'>+wakes up every second), use cpufreq_driver_target to take policy-&gt;rwsem</div><div class='add'>+before the command is passed to the cpufreq driver.</div><div class='add'>+</div><div class='add'>+4. References</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+[1] Per-entity load tracking: https://lwn.net/Articles/531853/</div><div class='add'>+[2] Improvements in CPU frequency management: https://lwn.net/Articles/682391/</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/cpu-freq/index.txt b/Documentation/cpu-freq/index.txt<br/>index dc024ab4054f..ef1d39247b05 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/cpu-freq/index.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cpu-freq/index.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/cpu-freq/index.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/index.txt</a></div><div class='hunk'>@@ -18,16 +18,29 @@</div><div class='ctx'> </div><div class='ctx'> Documents in this directory:</div><div class='ctx'> ----------------------------</div><div class='add'>+</div><div class='add'>+amd-powernow.txt -	AMD powernow driver specific file.</div><div class='add'>+</div><div class='add'>+boost.txt -		Frequency boosting support.</div><div class='add'>+</div><div class='ctx'> core.txt	-	General description of the CPUFreq core and</div><div class='del'>-			of CPUFreq notifiers</div><div class='add'>+			of CPUFreq notifiers.</div><div class='add'>+</div><div class='add'>+cpu-drivers.txt -	How to implement a new cpufreq processor driver.</div><div class='ctx'> </div><div class='del'>-cpu-drivers.txt -	How to implement a new cpufreq processor driver</div><div class='add'>+cpufreq-nforce2.txt -	nVidia nForce2 platform specific file.</div><div class='add'>+</div><div class='add'>+cpufreq-stats.txt -	General description of sysfs cpufreq stats.</div><div class='ctx'> </div><div class='ctx'> governors.txt	-	What are cpufreq governors and how to</div><div class='ctx'> 			implement them?</div><div class='ctx'> </div><div class='ctx'> index.txt	-	File index, Mailing list and Links (this document)</div><div class='ctx'> </div><div class='add'>+intel-pstate.txt -	Intel pstate cpufreq driver specific file.</div><div class='add'>+</div><div class='add'>+pcc-cpufreq.txt -	PCC cpufreq driver specific file.</div><div class='add'>+</div><div class='ctx'> user-guide.txt	-	User Guide to CPUFreq</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -35,9 +48,7 @@ Mailing List</div><div class='ctx'> ------------</div><div class='ctx'> There is a CPU frequency changing CVS commit and general list where</div><div class='ctx'> you can report bugs, problems or submit patches. To post a message,</div><div class='del'>-send an email to linux-pm@vger.kernel.org, to subscribe go to</div><div class='del'>-http://vger.kernel.org/vger-lists.html#linux-pm and follow the</div><div class='del'>-instructions there.</div><div class='add'>+send an email to linux-pm@vger.kernel.org.</div><div class='ctx'> </div><div class='ctx'> Links</div><div class='ctx'> -----</div><div class='hunk'>@@ -48,7 +59,7 @@ how to access the CVS repository:</div><div class='ctx'> * http://cvs.arm.linux.org.uk/</div><div class='ctx'> </div><div class='ctx'> the CPUFreq Mailing list:</div><div class='del'>-* http://vger.kernel.org/vger-lists.html#cpufreq</div><div class='add'>+* http://vger.kernel.org/vger-lists.html#linux-pm</div><div class='ctx'> </div><div class='ctx'> Clock and voltage scaling for the SA-1100:</div><div class='ctx'> * http://www.lartmaker.nl/projects/scaling</div><div class='head'>diff --git a/Documentation/cpu-freq/intel-pstate.txt b/Documentation/cpu-freq/intel-pstate.txt<br/>index e6bd1e6512a5..3fdcdfd968ba 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/cpu-freq/intel-pstate.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cpu-freq/intel-pstate.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/cpu-freq/intel-pstate.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/intel-pstate.txt</a></div><div class='hunk'>@@ -48,7 +48,7 @@ In addition to the frequency-controlling interfaces provided by the cpufreq</div><div class='ctx'> core, the driver provides its own sysfs files to control the P-State selection.</div><div class='ctx'> These files have been added to /sys/devices/system/cpu/intel_pstate/.</div><div class='ctx'> Any changes made to these files are applicable to all CPUs (even in a</div><div class='del'>-multi-package system).</div><div class='add'>+multi-package system, Refer to later section on placing "Per-CPU limits").</div><div class='ctx'> </div><div class='ctx'>       max_perf_pct: Limits the maximum P-State that will be requested by</div><div class='ctx'>       the driver. It states it as a percentage of the available performance. The</div><div class='hunk'>@@ -85,6 +85,21 @@ Sysfs will show :</div><div class='ctx'> Refer to "Intel® 64 and IA-32 Architectures Software Developer’s Manual</div><div class='ctx'> Volume 3: System Programming Guide" to understand ratios.</div><div class='ctx'> </div><div class='add'>+There is one more sysfs attribute in /sys/devices/system/cpu/intel_pstate/</div><div class='add'>+that can be used for controlling the operation mode of the driver:</div><div class='add'>+</div><div class='add'>+      status: Three settings are possible:</div><div class='add'>+      "off"     - The driver is not in use at this time.</div><div class='add'>+      "active"  - The driver works as a P-state governor (default).</div><div class='add'>+      "passive" - The driver works as a regular cpufreq one and collaborates</div><div class='add'>+                  with the generic cpufreq governors (it sets P-states as</div><div class='add'>+                  requested by those governors).</div><div class='add'>+      The current setting is returned by reads from this attribute.  Writing one</div><div class='add'>+      of the above strings to it changes the operation mode as indicated by that</div><div class='add'>+      string, if possible.  If HW-managed P-states (HWP) are enabled, it is not</div><div class='add'>+      possible to change the driver's operation mode and attempts to write to</div><div class='add'>+      this attribute will fail.</div><div class='add'>+</div><div class='ctx'> cpufreq sysfs for Intel P-State</div><div class='ctx'> </div><div class='ctx'> Since this driver registers with cpufreq, cpufreq sysfs is also presented.</div><div class='hunk'>@@ -120,13 +135,57 @@ frequency is fictional for Intel Core processors. Even if the scaling</div><div class='ctx'> driver selects a single P-State, the actual frequency the processor</div><div class='ctx'> will run at is selected by the processor itself.</div><div class='ctx'> </div><div class='add'>+Per-CPU limits</div><div class='add'>+</div><div class='add'>+The kernel command line option "intel_pstate=per_cpu_perf_limits" forces</div><div class='add'>+the intel_pstate driver to use per-CPU performance limits.  When it is set,</div><div class='add'>+the sysfs control interface described above is subject to limitations.</div><div class='add'>+- The following controls are not available for both read and write</div><div class='add'>+	/sys/devices/system/cpu/intel_pstate/max_perf_pct</div><div class='add'>+	/sys/devices/system/cpu/intel_pstate/min_perf_pct</div><div class='add'>+- The following controls can be used to set performance limits, as far as the</div><div class='add'>+architecture of the processor permits:</div><div class='add'>+	/sys/devices/system/cpu/cpu*/cpufreq/scaling_max_freq</div><div class='add'>+	/sys/devices/system/cpu/cpu*/cpufreq/scaling_min_freq</div><div class='add'>+	/sys/devices/system/cpu/cpu*/cpufreq/scaling_governor</div><div class='add'>+- User can still observe turbo percent and number of P-States from</div><div class='add'>+	/sys/devices/system/cpu/intel_pstate/turbo_pct</div><div class='add'>+	/sys/devices/system/cpu/intel_pstate/num_pstates</div><div class='add'>+- User can read write system wide turbo status</div><div class='add'>+	/sys/devices/system/cpu/no_turbo</div><div class='add'>+</div><div class='add'>+Support of energy performance hints</div><div class='add'>+It is possible to provide hints to the HWP algorithms in the processor</div><div class='add'>+to be more performance centric to more energy centric. When the driver</div><div class='add'>+is using HWP, two additional cpufreq sysfs attributes are presented for</div><div class='add'>+each logical CPU.</div><div class='add'>+These attributes are:</div><div class='add'>+	- energy_performance_available_preferences</div><div class='add'>+	- energy_performance_preference</div><div class='add'>+</div><div class='add'>+To get list of supported hints:</div><div class='add'>+$ cat energy_performance_available_preferences</div><div class='add'>+    default performance balance_performance balance_power power</div><div class='add'>+</div><div class='add'>+The current preference can be read or changed via cpufreq sysfs</div><div class='add'>+attribute "energy_performance_preference". Reading from this attribute</div><div class='add'>+will display current effective setting. User can write any of the valid</div><div class='add'>+preference string to this attribute. User can always restore to power-on</div><div class='add'>+default by writing "default".</div><div class='add'>+</div><div class='add'>+Since threads can migrate to different CPUs, this is possible that the</div><div class='add'>+new CPU may have different energy performance preference than the previous</div><div class='add'>+one. To avoid such issues, either threads can be pinned to specific CPUs</div><div class='add'>+or set the same energy performance preference value to all CPUs.</div><div class='add'>+</div><div class='ctx'> Tuning Intel P-State driver</div><div class='ctx'> </div><div class='del'>-When HWP mode is not used, debugfs files have also been added to allow the</div><div class='del'>-tuning of the internal governor algorithm. These files are located at</div><div class='del'>-/sys/kernel/debug/pstate_snb/. The algorithm uses a PID (Proportional</div><div class='del'>-Integral Derivative) controller. The PID tunable parameters are:</div><div class='add'>+When the performance can be tuned using PID (Proportional Integral</div><div class='add'>+Derivative) controller, debugfs files are provided for adjusting performance.</div><div class='add'>+They are presented under:</div><div class='add'>+/sys/kernel/debug/pstate_snb/</div><div class='ctx'> </div><div class='add'>+The PID tunable parameters are:</div><div class='ctx'>       deadband</div><div class='ctx'>       d_gain_pct</div><div class='ctx'>       i_gain_pct</div><div class='head'>diff --git a/Documentation/cpu-freq/user-guide.txt b/Documentation/cpu-freq/user-guide.txt<br/>index 109e97bbab77..391da64e9492 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/cpu-freq/user-guide.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cpu-freq/user-guide.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/cpu-freq/user-guide.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/cpu-freq/user-guide.txt</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> Contents:</div><div class='ctx'> ---------</div><div class='ctx'> 1. Supported Architectures and Processors</div><div class='del'>-1.1 ARM</div><div class='add'>+1.1 ARM and ARM64</div><div class='ctx'> 1.2 x86</div><div class='ctx'> 1.3 sparc64</div><div class='ctx'> 1.4 ppc</div><div class='hunk'>@@ -37,16 +37,10 @@ Contents:</div><div class='ctx'> 1. Supported Architectures and Processors</div><div class='ctx'> =========================================</div><div class='ctx'> </div><div class='del'>-1.1 ARM</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-The following ARM processors are supported by cpufreq:</div><div class='del'>-</div><div class='del'>-ARM Integrator</div><div class='del'>-ARM-SA1100</div><div class='del'>-ARM-SA1110</div><div class='del'>-Intel PXA</div><div class='add'>+1.1 ARM and ARM64</div><div class='add'>+-----------------</div><div class='ctx'> </div><div class='add'>+Almost all ARM and ARM64 platforms support CPU frequency scaling.</div><div class='ctx'> </div><div class='ctx'> 1.2 x86</div><div class='ctx'> -------</div><div class='hunk'>@@ -69,6 +63,7 @@ Transmeta Crusoe</div><div class='ctx'> Transmeta Efficeon</div><div class='ctx'> VIA Cyrix 3 / C3</div><div class='ctx'> various processors on some ACPI 2.0-compatible systems [*]</div><div class='add'>+And many more</div><div class='ctx'> </div><div class='ctx'> [*] Only if "ACPI Processor Performance States" are available</div><div class='ctx'> to the ACPI&lt;-&gt;BIOS interface.</div><div class='hunk'>@@ -87,7 +82,9 @@ UltraSPARC-III</div><div class='ctx'> -------</div><div class='ctx'> </div><div class='ctx'> Several "PowerBook" and "iBook2" notebooks are supported.</div><div class='del'>-</div><div class='add'>+The following POWER processors are supported in powernv mode:</div><div class='add'>+POWER8</div><div class='add'>+POWER9</div><div class='ctx'> </div><div class='ctx'> 1.5 SuperH</div><div class='ctx'> ----------</div><div class='hunk'>@@ -147,10 +144,19 @@ mounted it at /sys, the cpufreq interface is located in a subdirectory</div><div class='ctx'> "cpufreq" within the cpu-device directory</div><div class='ctx'> (e.g. /sys/devices/system/cpu/cpu0/cpufreq/ for the first CPU).</div><div class='ctx'> </div><div class='add'>+affected_cpus :			List of Online CPUs that require software</div><div class='add'>+				coordination of frequency.</div><div class='add'>+</div><div class='add'>+cpuinfo_cur_freq :		Current frequency of the CPU as obtained from</div><div class='add'>+				the hardware, in KHz. This is the frequency</div><div class='add'>+				the CPU actually runs at.</div><div class='add'>+</div><div class='ctx'> cpuinfo_min_freq :		this file shows the minimum operating</div><div class='ctx'> 				frequency the processor can run at(in kHz) </div><div class='add'>+</div><div class='ctx'> cpuinfo_max_freq :		this file shows the maximum operating</div><div class='ctx'> 				frequency the processor can run at(in kHz) </div><div class='add'>+</div><div class='ctx'> cpuinfo_transition_latency	The time it takes on this CPU to</div><div class='ctx'> 				switch between two frequencies in nano</div><div class='ctx'> 				seconds. If unknown or known to be</div><div class='hunk'>@@ -163,25 +169,30 @@ cpuinfo_transition_latency	The time it takes on this CPU to</div><div class='ctx'> 				userspace daemon. Make sure to not</div><div class='ctx'> 				switch the frequency too often</div><div class='ctx'> 				resulting in performance loss.</div><div class='del'>-scaling_driver :		this file shows what cpufreq driver is</div><div class='del'>-				used to set the frequency on this CPU</div><div class='add'>+</div><div class='add'>+related_cpus :			List of Online + Offline CPUs that need software</div><div class='add'>+				coordination of frequency.</div><div class='add'>+</div><div class='add'>+scaling_available_frequencies : List of available frequencies, in KHz.</div><div class='ctx'> </div><div class='ctx'> scaling_available_governors :	this file shows the CPUfreq governors</div><div class='ctx'> 				available in this kernel. You can see the</div><div class='ctx'> 				currently activated governor in</div><div class='ctx'> </div><div class='add'>+scaling_cur_freq :		Current frequency of the CPU as determined by</div><div class='add'>+				the governor and cpufreq core, in KHz. This is</div><div class='add'>+				the frequency the kernel thinks the CPU runs</div><div class='add'>+				at.</div><div class='add'>+</div><div class='add'>+scaling_driver :		this file shows what cpufreq driver is</div><div class='add'>+				used to set the frequency on this CPU</div><div class='add'>+</div><div class='ctx'> scaling_governor,		and by "echoing" the name of another</div><div class='ctx'> 				governor you can change it. Please note</div><div class='ctx'> 				that some governors won't load - they only</div><div class='ctx'> 				work on some specific architectures or</div><div class='ctx'> 				processors.</div><div class='ctx'> </div><div class='del'>-cpuinfo_cur_freq :		Current frequency of the CPU as obtained from</div><div class='del'>-				the hardware, in KHz. This is the frequency</div><div class='del'>-				the CPU actually runs at.</div><div class='del'>-</div><div class='del'>-scaling_available_frequencies : List of available frequencies, in KHz.</div><div class='del'>-</div><div class='ctx'> scaling_min_freq and</div><div class='ctx'> scaling_max_freq		show the current "policy limits" (in</div><div class='ctx'> 				kHz). By echoing new values into these</div><div class='hunk'>@@ -190,16 +201,11 @@ scaling_max_freq		show the current "policy limits" (in</div><div class='ctx'> 				first set scaling_max_freq, then</div><div class='ctx'> 				scaling_min_freq.</div><div class='ctx'> </div><div class='del'>-affected_cpus :			List of Online CPUs that require software</div><div class='del'>-				coordination of frequency.</div><div class='del'>-</div><div class='del'>-related_cpus :			List of Online + Offline CPUs that need software</div><div class='del'>-				coordination of frequency.</div><div class='del'>-</div><div class='del'>-scaling_cur_freq :		Current frequency of the CPU as determined by</div><div class='del'>-				the governor and cpufreq core, in KHz. This is</div><div class='del'>-				the frequency the kernel thinks the CPU runs</div><div class='del'>-				at.</div><div class='add'>+scaling_setspeed		This can be read to get the currently programmed</div><div class='add'>+				value by the governor. This can be written to</div><div class='add'>+				change the current frequency for a group of</div><div class='add'>+				CPUs, represented by a policy. This is supported</div><div class='add'>+				currently only by the userspace governor.</div><div class='ctx'> </div><div class='ctx'> bios_limit :			If the BIOS tells the OS to limit a CPU to</div><div class='ctx'> 				lower frequencies, the user can read out the</div><div class='head'>diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt<br/>deleted file mode 100644<br/>index dd68821c22d4..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/cpu-hotplug.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/cpu-hotplug.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,452 +0,0 @@</div><div class='del'>-		CPU hotplug Support in Linux(tm) Kernel</div><div class='del'>-</div><div class='del'>-		Maintainers:</div><div class='del'>-		CPU Hotplug Core:</div><div class='del'>-			Rusty Russell &lt;rusty@rustcorp.com.au&gt;</div><div class='del'>-			Srivatsa Vaddagiri &lt;vatsa@in.ibm.com&gt;</div><div class='del'>-		i386:</div><div class='del'>-			Zwane Mwaikambo &lt;zwanem@gmail.com&gt;</div><div class='del'>-		ppc64:</div><div class='del'>-			Nathan Lynch &lt;nathanl@austin.ibm.com&gt;</div><div class='del'>-			Joel Schopp &lt;jschopp@austin.ibm.com&gt;</div><div class='del'>-		ia64/x86_64:</div><div class='del'>-			Ashok Raj &lt;ashok.raj@intel.com&gt;</div><div class='del'>-		s390:</div><div class='del'>-			Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='del'>-</div><div class='del'>-Authors: Ashok Raj &lt;ashok.raj@intel.com&gt;</div><div class='del'>-Lots of feedback: Nathan Lynch &lt;nathanl@austin.ibm.com&gt;,</div><div class='del'>-	     Joel Schopp &lt;jschopp@austin.ibm.com&gt;</div><div class='del'>-</div><div class='del'>-Introduction</div><div class='del'>-</div><div class='del'>-Modern advances in system architectures have introduced advanced error</div><div class='del'>-reporting and correction capabilities in processors. CPU architectures permit</div><div class='del'>-partitioning support, where compute resources of a single CPU could be made</div><div class='del'>-available to virtual machine environments. There are couple OEMS that</div><div class='del'>-support NUMA hardware which are hot pluggable as well, where physical</div><div class='del'>-node insertion and removal require support for CPU hotplug.</div><div class='del'>-</div><div class='del'>-Such advances require CPUs available to a kernel to be removed either for</div><div class='del'>-provisioning reasons, or for RAS purposes to keep an offending CPU off</div><div class='del'>-system execution path. Hence the need for CPU hotplug support in the</div><div class='del'>-Linux kernel.</div><div class='del'>-</div><div class='del'>-A more novel use of CPU-hotplug support is its use today in suspend</div><div class='del'>-resume support for SMP. Dual-core and HT support makes even</div><div class='del'>-a laptop run SMP kernels which didn't support these methods. SMP support</div><div class='del'>-for suspend/resume is a work in progress.</div><div class='del'>-</div><div class='del'>-General Stuff about CPU Hotplug</div><div class='del'>---------------------------------</div><div class='del'>-</div><div class='del'>-Command Line Switches</div><div class='del'>----------------------</div><div class='del'>-maxcpus=n    Restrict boot time cpus to n. Say if you have 4 cpus, using</div><div class='del'>-             maxcpus=2 will only boot 2. You can choose to bring the</div><div class='del'>-             other cpus later online, read FAQ's for more info.</div><div class='del'>-</div><div class='del'>-additional_cpus=n (*)	Use this to limit hotpluggable cpus. This option sets</div><div class='del'>-  			cpu_possible_mask = cpu_present_mask + additional_cpus</div><div class='del'>-</div><div class='del'>-cede_offline={"off","on"}  Use this option to disable/enable putting offlined</div><div class='del'>-		            processors to an extended H_CEDE state on</div><div class='del'>-			    supported pseries platforms.</div><div class='del'>-			    If nothing is specified,</div><div class='del'>-			    cede_offline is set to "on".</div><div class='del'>-</div><div class='del'>-(*) Option valid only for following architectures</div><div class='del'>-- ia64</div><div class='del'>-</div><div class='del'>-ia64 uses the number of disabled local apics in ACPI tables MADT to</div><div class='del'>-determine the number of potentially hot-pluggable cpus. The implementation</div><div class='del'>-should only rely on this to count the # of cpus, but *MUST* not rely</div><div class='del'>-on the apicid values in those tables for disabled apics. In the event</div><div class='del'>-BIOS doesn't mark such hot-pluggable cpus as disabled entries, one could</div><div class='del'>-use this parameter "additional_cpus=x" to represent those cpus in the</div><div class='del'>-cpu_possible_mask.</div><div class='del'>-</div><div class='del'>-possible_cpus=n		[s390,x86_64] use this to set hotpluggable cpus.</div><div class='del'>-			This option sets possible_cpus bits in</div><div class='del'>-			cpu_possible_mask. Thus keeping the numbers of bits set</div><div class='del'>-			constant even if the machine gets rebooted.</div><div class='del'>-</div><div class='del'>-CPU maps and such</div><div class='del'>------------------</div><div class='del'>-[More on cpumaps and primitive to manipulate, please check</div><div class='del'>-include/linux/cpumask.h that has more descriptive text.]</div><div class='del'>-</div><div class='del'>-cpu_possible_mask: Bitmap of possible CPUs that can ever be available in the</div><div class='del'>-system. This is used to allocate some boot time memory for per_cpu variables</div><div class='del'>-that aren't designed to grow/shrink as CPUs are made available or removed.</div><div class='del'>-Once set during boot time discovery phase, the map is static, i.e no bits</div><div class='del'>-are added or removed anytime.  Trimming it accurately for your system needs</div><div class='del'>-upfront can save some boot time memory. See below for how we use heuristics</div><div class='del'>-in x86_64 case to keep this under check.</div><div class='del'>-</div><div class='del'>-cpu_online_mask: Bitmap of all CPUs currently online. Its set in __cpu_up()</div><div class='del'>-after a cpu is available for kernel scheduling and ready to receive</div><div class='del'>-interrupts from devices. Its cleared when a cpu is brought down using</div><div class='del'>-__cpu_disable(), before which all OS services including interrupts are</div><div class='del'>-migrated to another target CPU.</div><div class='del'>-</div><div class='del'>-cpu_present_mask: Bitmap of CPUs currently present in the system. Not all</div><div class='del'>-of them may be online. When physical hotplug is processed by the relevant</div><div class='del'>-subsystem (e.g ACPI) can change and new bit either be added or removed</div><div class='del'>-from the map depending on the event is hot-add/hot-remove. There are currently</div><div class='del'>-no locking rules as of now. Typical usage is to init topology during boot,</div><div class='del'>-at which time hotplug is disabled.</div><div class='del'>-</div><div class='del'>-You really dont need to manipulate any of the system cpu maps. They should</div><div class='del'>-be read-only for most use. When setting up per-cpu resources almost always use</div><div class='del'>-cpu_possible_mask/for_each_possible_cpu() to iterate.</div><div class='del'>-</div><div class='del'>-Never use anything other than cpumask_t to represent bitmap of CPUs.</div><div class='del'>-</div><div class='del'>-	#include &lt;linux/cpumask.h&gt;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu     - Iterate over cpu_possible_mask</div><div class='del'>-	for_each_online_cpu       - Iterate over cpu_online_mask</div><div class='del'>-	for_each_present_cpu      - Iterate over cpu_present_mask</div><div class='del'>-	for_each_cpu(x,mask)      - Iterate over some random collection of cpu mask.</div><div class='del'>-</div><div class='del'>-	#include &lt;linux/cpu.h&gt;</div><div class='del'>-	get_online_cpus() and put_online_cpus():</div><div class='del'>-</div><div class='del'>-The above calls are used to inhibit cpu hotplug operations. While the</div><div class='del'>-cpu_hotplug.refcount is non zero, the cpu_online_mask will not change.</div><div class='del'>-If you merely need to avoid cpus going away, you could also use</div><div class='del'>-preempt_disable() and preempt_enable() for those sections.</div><div class='del'>-Just remember the critical section cannot call any</div><div class='del'>-function that can sleep or schedule this process away. The preempt_disable()</div><div class='del'>-will work as long as stop_machine_run() is used to take a cpu down.</div><div class='del'>-</div><div class='del'>-CPU Hotplug - Frequently Asked Questions.</div><div class='del'>-</div><div class='del'>-Q: How to enable my kernel to support CPU hotplug?</div><div class='del'>-A: When doing make defconfig, Enable CPU hotplug support</div><div class='del'>-</div><div class='del'>-   "Processor type and Features" -&gt; Support for Hotpluggable CPUs</div><div class='del'>-</div><div class='del'>-Make sure that you have CONFIG_SMP turned on as well.</div><div class='del'>-</div><div class='del'>-You would need to enable CONFIG_HOTPLUG_CPU for SMP suspend/resume support</div><div class='del'>-as well.</div><div class='del'>-</div><div class='del'>-Q: What architectures support CPU hotplug?</div><div class='del'>-A: As of 2.6.14, the following architectures support CPU hotplug.</div><div class='del'>-</div><div class='del'>-i386 (Intel), ppc, ppc64, parisc, s390, ia64 and x86_64</div><div class='del'>-</div><div class='del'>-Q: How to test if hotplug is supported on the newly built kernel?</div><div class='del'>-A: You should now notice an entry in sysfs.</div><div class='del'>-</div><div class='del'>-Check if sysfs is mounted, using the "mount" command. You should notice</div><div class='del'>-an entry as shown below in the output.</div><div class='del'>-</div><div class='del'>-	....</div><div class='del'>-	none on /sys type sysfs (rw)</div><div class='del'>-	....</div><div class='del'>-</div><div class='del'>-If this is not mounted, do the following.</div><div class='del'>-</div><div class='del'>-	#mkdir /sys</div><div class='del'>-	#mount -t sysfs sys /sys</div><div class='del'>-</div><div class='del'>-Now you should see entries for all present cpu, the following is an example</div><div class='del'>-in a 8-way system.</div><div class='del'>-</div><div class='del'>-	#pwd</div><div class='del'>-	#/sys/devices/system/cpu</div><div class='del'>-	#ls -l</div><div class='del'>-	total 0</div><div class='del'>-	drwxr-xr-x  10 root root 0 Sep 19 07:44 .</div><div class='del'>-	drwxr-xr-x  13 root root 0 Sep 19 07:45 ..</div><div class='del'>-	drwxr-xr-x   3 root root 0 Sep 19 07:44 cpu0</div><div class='del'>-	drwxr-xr-x   3 root root 0 Sep 19 07:44 cpu1</div><div class='del'>-	drwxr-xr-x   3 root root 0 Sep 19 07:44 cpu2</div><div class='del'>-	drwxr-xr-x   3 root root 0 Sep 19 07:44 cpu3</div><div class='del'>-	drwxr-xr-x   3 root root 0 Sep 19 07:44 cpu4</div><div class='del'>-	drwxr-xr-x   3 root root 0 Sep 19 07:44 cpu5</div><div class='del'>-	drwxr-xr-x   3 root root 0 Sep 19 07:44 cpu6</div><div class='del'>-	drwxr-xr-x   3 root root 0 Sep 19 07:48 cpu7</div><div class='del'>-</div><div class='del'>-Under each directory you would find an "online" file which is the control</div><div class='del'>-file to logically online/offline a processor.</div><div class='del'>-</div><div class='del'>-Q: Does hot-add/hot-remove refer to physical add/remove of cpus?</div><div class='del'>-A: The usage of hot-add/remove may not be very consistently used in the code.</div><div class='del'>-CONFIG_HOTPLUG_CPU enables logical online/offline capability in the kernel.</div><div class='del'>-To support physical addition/removal, one would need some BIOS hooks and</div><div class='del'>-the platform should have something like an attention button in PCI hotplug.</div><div class='del'>-CONFIG_ACPI_HOTPLUG_CPU enables ACPI support for physical add/remove of CPUs.</div><div class='del'>-</div><div class='del'>-Q: How do i logically offline a CPU?</div><div class='del'>-A: Do the following.</div><div class='del'>-</div><div class='del'>-	#echo 0 &gt; /sys/devices/system/cpu/cpuX/online</div><div class='del'>-</div><div class='del'>-Once the logical offline is successful, check</div><div class='del'>-</div><div class='del'>-	#cat /proc/interrupts</div><div class='del'>-</div><div class='del'>-You should now not see the CPU that you removed. Also online file will report</div><div class='del'>-the state as 0 when a cpu if offline and 1 when its online.</div><div class='del'>-</div><div class='del'>-	#To display the current cpu state.</div><div class='del'>-	#cat /sys/devices/system/cpu/cpuX/online</div><div class='del'>-</div><div class='del'>-Q: Why can't i remove CPU0 on some systems?</div><div class='del'>-A: Some architectures may have some special dependency on a certain CPU.</div><div class='del'>-</div><div class='del'>-For e.g in IA64 platforms we have ability to sent platform interrupts to the</div><div class='del'>-OS. a.k.a Corrected Platform Error Interrupts (CPEI). In current ACPI</div><div class='del'>-specifications, we didn't have a way to change the target CPU. Hence if the</div><div class='del'>-current ACPI version doesn't support such re-direction, we disable that CPU</div><div class='del'>-by making it not-removable.</div><div class='del'>-</div><div class='del'>-In such cases you will also notice that the online file is missing under cpu0.</div><div class='del'>-</div><div class='del'>-Q: Is CPU0 removable on X86?</div><div class='del'>-A: Yes. If kernel is compiled with CONFIG_BOOTPARAM_HOTPLUG_CPU0=y, CPU0 is</div><div class='del'>-removable by default. Otherwise, CPU0 is also removable by kernel option</div><div class='del'>-cpu0_hotplug.</div><div class='del'>-</div><div class='del'>-But some features depend on CPU0. Two known dependencies are:</div><div class='del'>-</div><div class='del'>-1. Resume from hibernate/suspend depends on CPU0. Hibernate/suspend will fail if</div><div class='del'>-CPU0 is offline and you need to online CPU0 before hibernate/suspend can</div><div class='del'>-continue.</div><div class='del'>-2. PIC interrupts also depend on CPU0. CPU0 can't be removed if a PIC interrupt</div><div class='del'>-is detected.</div><div class='del'>-</div><div class='del'>-It's said poweroff/reboot may depend on CPU0 on some machines although I haven't</div><div class='del'>-seen any poweroff/reboot failure so far after CPU0 is offline on a few tested</div><div class='del'>-machines.</div><div class='del'>-</div><div class='del'>-Please let me know if you know or see any other dependencies of CPU0.</div><div class='del'>-</div><div class='del'>-If the dependencies are under your control, you can turn on CPU0 hotplug feature</div><div class='del'>-either by CONFIG_BOOTPARAM_HOTPLUG_CPU0 or by kernel parameter cpu0_hotplug.</div><div class='del'>-</div><div class='del'>---Fenghua Yu &lt;fenghua.yu@intel.com&gt;</div><div class='del'>-</div><div class='del'>-Q: How do i find out if a particular CPU is not removable?</div><div class='del'>-A: Depending on the implementation, some architectures may show this by the</div><div class='del'>-absence of the "online" file. This is done if it can be determined ahead of</div><div class='del'>-time that this CPU cannot be removed.</div><div class='del'>-</div><div class='del'>-In some situations, this can be a run time check, i.e if you try to remove the</div><div class='del'>-last CPU, this will not be permitted. You can find such failures by</div><div class='del'>-investigating the return value of the "echo" command.</div><div class='del'>-</div><div class='del'>-Q: What happens when a CPU is being logically offlined?</div><div class='del'>-A: The following happen, listed in no particular order :-)</div><div class='del'>-</div><div class='del'>-- A notification is sent to in-kernel registered modules by sending an event</div><div class='del'>-  CPU_DOWN_PREPARE or CPU_DOWN_PREPARE_FROZEN, depending on whether or not the</div><div class='del'>-  CPU is being offlined while tasks are frozen due to a suspend operation in</div><div class='del'>-  progress</div><div class='del'>-- All processes are migrated away from this outgoing CPU to new CPUs.</div><div class='del'>-  The new CPU is chosen from each process' current cpuset, which may be</div><div class='del'>-  a subset of all online CPUs.</div><div class='del'>-- All interrupts targeted to this CPU is migrated to a new CPU</div><div class='del'>-- timers/bottom half/task lets are also migrated to a new CPU</div><div class='del'>-- Once all services are migrated, kernel calls an arch specific routine</div><div class='del'>-  __cpu_disable() to perform arch specific cleanup.</div><div class='del'>-- Once this is successful, an event for successful cleanup is sent by an event</div><div class='del'>-  CPU_DEAD (or CPU_DEAD_FROZEN if tasks are frozen due to a suspend while the</div><div class='del'>-  CPU is being offlined).</div><div class='del'>-</div><div class='del'>-  "It is expected that each service cleans up when the CPU_DOWN_PREPARE</div><div class='del'>-  notifier is called, when CPU_DEAD is called its expected there is nothing</div><div class='del'>-  running on behalf of this CPU that was offlined"</div><div class='del'>-</div><div class='del'>-Q: If i have some kernel code that needs to be aware of CPU arrival and</div><div class='del'>-   departure, how to i arrange for proper notification?</div><div class='del'>-A: This is what you would need in your kernel code to receive notifications.</div><div class='del'>-</div><div class='del'>-	#include &lt;linux/cpu.h&gt;</div><div class='del'>-	static int foobar_cpu_callback(struct notifier_block *nfb,</div><div class='del'>-				       unsigned long action, void *hcpu)</div><div class='del'>-	{</div><div class='del'>-		unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-</div><div class='del'>-		switch (action) {</div><div class='del'>-		case CPU_ONLINE:</div><div class='del'>-		case CPU_ONLINE_FROZEN:</div><div class='del'>-			foobar_online_action(cpu);</div><div class='del'>-			break;</div><div class='del'>-		case CPU_DEAD:</div><div class='del'>-		case CPU_DEAD_FROZEN:</div><div class='del'>-			foobar_dead_action(cpu);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		return NOTIFY_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	static struct notifier_block foobar_cpu_notifier =</div><div class='del'>-	{</div><div class='del'>-	   .notifier_call = foobar_cpu_callback,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-You need to call register_cpu_notifier() from your init function.</div><div class='del'>-Init functions could be of two types:</div><div class='del'>-1. early init (init function called when only the boot processor is online).</div><div class='del'>-2. late init (init function called _after_ all the CPUs are online).</div><div class='del'>-</div><div class='del'>-For the first case, you should add the following to your init function</div><div class='del'>-</div><div class='del'>-	register_cpu_notifier(&amp;foobar_cpu_notifier);</div><div class='del'>-</div><div class='del'>-For the second case, you should add the following to your init function</div><div class='del'>-</div><div class='del'>-	register_hotcpu_notifier(&amp;foobar_cpu_notifier);</div><div class='del'>-</div><div class='del'>-You can fail PREPARE notifiers if something doesn't work to prepare resources.</div><div class='del'>-This will stop the activity and send a following CANCELED event back.</div><div class='del'>-</div><div class='del'>-CPU_DEAD should not be failed, its just a goodness indication, but bad</div><div class='del'>-things will happen if a notifier in path sent a BAD notify code.</div><div class='del'>-</div><div class='del'>-Q: I don't see my action being called for all CPUs already up and running?</div><div class='del'>-A: Yes, CPU notifiers are called only when new CPUs are on-lined or offlined.</div><div class='del'>-   If you need to perform some action for each cpu already in the system, then</div><div class='del'>-   do this:</div><div class='del'>-</div><div class='del'>-	for_each_online_cpu(i) {</div><div class='del'>-		foobar_cpu_callback(&amp;foobar_cpu_notifier, CPU_UP_PREPARE, i);</div><div class='del'>-		foobar_cpu_callback(&amp;foobar_cpu_notifier, CPU_ONLINE, i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-   However, if you want to register a hotplug callback, as well as perform</div><div class='del'>-   some initialization for CPUs that are already online, then do this:</div><div class='del'>-</div><div class='del'>-   Version 1: (Correct)</div><div class='del'>-   ---------</div><div class='del'>-</div><div class='del'>-   	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='del'>-		for_each_online_cpu(i) {</div><div class='del'>-			foobar_cpu_callback(&amp;foobar_cpu_notifier,</div><div class='del'>-					    CPU_UP_PREPARE, i);</div><div class='del'>-			foobar_cpu_callback(&amp;foobar_cpu_notifier,</div><div class='del'>-					    CPU_ONLINE, i);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	/* Note the use of the double underscored version of the API */</div><div class='del'>-	__register_cpu_notifier(&amp;foobar_cpu_notifier);</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-</div><div class='del'>-   Note that the following code is *NOT* the right way to achieve this,</div><div class='del'>-   because it is prone to an ABBA deadlock between the cpu_add_remove_lock</div><div class='del'>-   and the cpu_hotplug.lock.</div><div class='del'>-</div><div class='del'>-   Version 2: (Wrong!)</div><div class='del'>-   ---------</div><div class='del'>-</div><div class='del'>-	get_online_cpus();</div><div class='del'>-</div><div class='del'>-		for_each_online_cpu(i) {</div><div class='del'>-			foobar_cpu_callback(&amp;foobar_cpu_notifier,</div><div class='del'>-					    CPU_UP_PREPARE, i);</div><div class='del'>-			foobar_cpu_callback(&amp;foobar_cpu_notifier,</div><div class='del'>-					    CPU_ONLINE, i);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	register_cpu_notifier(&amp;foobar_cpu_notifier);</div><div class='del'>-</div><div class='del'>-	put_online_cpus();</div><div class='del'>-</div><div class='del'>-    So always use the first version shown above when you want to register</div><div class='del'>-    callbacks as well as initialize the already online CPUs.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Q: If i would like to develop cpu hotplug support for a new architecture,</div><div class='del'>-   what do i need at a minimum?</div><div class='del'>-A: The following are what is required for CPU hotplug infrastructure to work</div><div class='del'>-   correctly.</div><div class='del'>-</div><div class='del'>-    - Make sure you have an entry in Kconfig to enable CONFIG_HOTPLUG_CPU</div><div class='del'>-    - __cpu_up()        - Arch interface to bring up a CPU</div><div class='del'>-    - __cpu_disable()   - Arch interface to shutdown a CPU, no more interrupts</div><div class='del'>-                          can be handled by the kernel after the routine</div><div class='del'>-                          returns. Including local APIC timers etc are</div><div class='del'>-                          shutdown.</div><div class='del'>-     - __cpu_die()      - This actually supposed to ensure death of the CPU.</div><div class='del'>-                          Actually look at some example code in other arch</div><div class='del'>-                          that implement CPU hotplug. The processor is taken</div><div class='del'>-                          down from the idle() loop for that specific</div><div class='del'>-                          architecture. __cpu_die() typically waits for some</div><div class='del'>-                          per_cpu state to be set, to ensure the processor</div><div class='del'>-                          dead routine is called to be sure positively.</div><div class='del'>-</div><div class='del'>-Q: I need to ensure that a particular cpu is not removed when there is some</div><div class='del'>-   work specific to this cpu is in progress.</div><div class='del'>-A: There are two ways.  If your code can be run in interrupt context, use</div><div class='del'>-   smp_call_function_single(), otherwise use work_on_cpu().  Note that</div><div class='del'>-   work_on_cpu() is slow, and can fail due to out of memory:</div><div class='del'>-</div><div class='del'>-	int my_func_on_cpu(int cpu)</div><div class='del'>-	{</div><div class='del'>-		int err;</div><div class='del'>-		get_online_cpus();</div><div class='del'>-		if (!cpu_online(cpu))</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-#if NEEDS_BLOCKING</div><div class='del'>-			err = work_on_cpu(cpu, __my_func_on_cpu, NULL);</div><div class='del'>-#else</div><div class='del'>-			smp_call_function_single(cpu, __my_func_on_cpu, &amp;err,</div><div class='del'>-						 true);</div><div class='del'>-#endif</div><div class='del'>-		put_online_cpus();</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-Q: How do we determine how many CPUs are available for hotplug.</div><div class='del'>-A: There is no clear spec defined way from ACPI that can give us that</div><div class='del'>-   information today. Based on some input from Natalie of Unisys,</div><div class='del'>-   that the ACPI MADT (Multiple APIC Description Tables) marks those possible</div><div class='del'>-   CPUs in a system with disabled status.</div><div class='del'>-</div><div class='del'>-   Andi implemented some simple heuristics that count the number of disabled</div><div class='del'>-   CPUs in MADT as hotpluggable CPUS.  In the case there are no disabled CPUS</div><div class='del'>-   we assume 1/2 the number of CPUs currently present can be hotplugged.</div><div class='del'>-</div><div class='del'>-   Caveat: ACPI MADT can only provide 256 entries in systems with only ACPI 2.0c</div><div class='del'>-   or earlier ACPI version supported, because the apicid field in MADT is only</div><div class='del'>-   8 bits. From ACPI 3.0, this limitation was removed since the apicid field</div><div class='del'>-   was extended to 32 bits with x2APIC introduced.</div><div class='del'>-</div><div class='del'>-User Space Notification</div><div class='del'>-</div><div class='del'>-Hotplug support for devices is common in Linux today. Its being used today to</div><div class='del'>-support automatic configuration of network, usb and pci devices. A hotplug</div><div class='del'>-event can be used to invoke an agent script to perform the configuration task.</div><div class='del'>-</div><div class='del'>-You can add /etc/hotplug/cpu.agent to handle hotplug notification user space</div><div class='del'>-scripts.</div><div class='del'>-</div><div class='del'>-	#!/bin/bash</div><div class='del'>-	# $Id: cpu.agent</div><div class='del'>-	# Kernel hotplug params include:</div><div class='del'>-	#ACTION=%s [online or offline]</div><div class='del'>-	#DEVPATH=%s</div><div class='del'>-	#</div><div class='del'>-	cd /etc/hotplug</div><div class='del'>-	. ./hotplug.functions</div><div class='del'>-</div><div class='del'>-	case $ACTION in</div><div class='del'>-		online)</div><div class='del'>-			echo `date` ":cpu.agent" add cpu &gt;&gt; /tmp/hotplug.txt</div><div class='del'>-			;;</div><div class='del'>-		offline)</div><div class='del'>-			echo `date` ":cpu.agent" remove cpu &gt;&gt;/tmp/hotplug.txt</div><div class='del'>-			;;</div><div class='del'>-		*)</div><div class='del'>-			debug_mesg CPU $ACTION event not supported</div><div class='del'>-        exit 1</div><div class='del'>-        ;;</div><div class='del'>-	esac</div><div class='head'>diff --git a/Documentation/crypto/api-aead.rst b/Documentation/crypto/api-aead.rst<br/>new file mode 100644<br/>index 000000000000..d15256f1ae36<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/api-aead.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-aead.rst</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+Authenticated Encryption With Associated Data (AEAD) Algorithm Definitions</div><div class='add'>+--------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/aead.h</div><div class='add'>+   :doc: Authenticated Encryption With Associated Data (AEAD) Cipher API</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/aead.h</div><div class='add'>+   :functions: aead_request aead_alg</div><div class='add'>+</div><div class='add'>+Authenticated Encryption With Associated Data (AEAD) Cipher API</div><div class='add'>+---------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/aead.h</div><div class='add'>+   :functions: crypto_alloc_aead crypto_free_aead crypto_aead_ivsize crypto_aead_authsize crypto_aead_blocksize crypto_aead_setkey crypto_aead_setauthsize crypto_aead_encrypt crypto_aead_decrypt</div><div class='add'>+</div><div class='add'>+Asynchronous AEAD Request Handle</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/aead.h</div><div class='add'>+   :doc: Asynchronous AEAD Request Handle</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/aead.h</div><div class='add'>+   :functions: crypto_aead_reqsize aead_request_set_tfm aead_request_alloc aead_request_free aead_request_set_callback aead_request_set_crypt aead_request_set_ad</div><div class='head'>diff --git a/Documentation/crypto/api-akcipher.rst b/Documentation/crypto/api-akcipher.rst<br/>new file mode 100644<br/>index 000000000000..40aa8746e2a1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/api-akcipher.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-akcipher.rst</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+Asymmetric Cipher Algorithm Definitions</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/akcipher.h</div><div class='add'>+   :functions: akcipher_alg akcipher_request</div><div class='add'>+</div><div class='add'>+Asymmetric Cipher API</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/akcipher.h</div><div class='add'>+   :doc: Generic Public Key API</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/akcipher.h</div><div class='add'>+   :functions: crypto_alloc_akcipher crypto_free_akcipher crypto_akcipher_set_pub_key crypto_akcipher_set_priv_key crypto_akcipher_maxsize crypto_akcipher_encrypt crypto_akcipher_decrypt crypto_akcipher_sign crypto_akcipher_verify</div><div class='add'>+</div><div class='add'>+Asymmetric Cipher Request Handle</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/akcipher.h</div><div class='add'>+   :functions: akcipher_request_alloc akcipher_request_free akcipher_request_set_callback akcipher_request_set_crypt</div><div class='head'>diff --git a/Documentation/crypto/api-digest.rst b/Documentation/crypto/api-digest.rst<br/>new file mode 100644<br/>index 000000000000..7a1e670d6ce1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/api-digest.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-digest.rst</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+Message Digest Algorithm Definitions</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/hash.h</div><div class='add'>+   :doc: Message Digest Algorithm Definitions</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/hash.h</div><div class='add'>+   :functions: hash_alg_common ahash_alg shash_alg</div><div class='add'>+</div><div class='add'>+Asynchronous Message Digest API</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/hash.h</div><div class='add'>+   :doc: Asynchronous Message Digest API</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/hash.h</div><div class='add'>+   :functions: crypto_alloc_ahash crypto_free_ahash crypto_ahash_init crypto_ahash_digestsize crypto_ahash_reqtfm crypto_ahash_reqsize crypto_ahash_statesize crypto_ahash_setkey crypto_ahash_finup crypto_ahash_final crypto_ahash_digest crypto_ahash_export crypto_ahash_import</div><div class='add'>+</div><div class='add'>+Asynchronous Hash Request Handle</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/hash.h</div><div class='add'>+   :doc: Asynchronous Hash Request Handle</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/hash.h</div><div class='add'>+   :functions: ahash_request_set_tfm ahash_request_alloc ahash_request_free ahash_request_set_callback ahash_request_set_crypt</div><div class='add'>+</div><div class='add'>+Synchronous Message Digest API</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/hash.h</div><div class='add'>+   :doc: Synchronous Message Digest API</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/hash.h</div><div class='add'>+   :functions: crypto_alloc_shash crypto_free_shash crypto_shash_blocksize crypto_shash_digestsize crypto_shash_descsize crypto_shash_setkey crypto_shash_digest crypto_shash_export crypto_shash_import crypto_shash_init crypto_shash_update crypto_shash_final crypto_shash_finup</div><div class='head'>diff --git a/Documentation/crypto/api-intro.txt b/Documentation/crypto/api-intro.txt<br/>index beda682e8d77..45d943fcae5b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/crypto/api-intro.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/crypto/api-intro.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/api-intro.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-intro.txt</a></div><div class='hunk'>@@ -44,12 +44,9 @@ one block while the former can operate on an arbitrary amount of data,</div><div class='ctx'> subject to block size requirements (i.e., non-stream ciphers can only</div><div class='ctx'> process multiples of blocks).</div><div class='ctx'> </div><div class='del'>-Support for hardware crypto devices via an asynchronous interface is</div><div class='del'>-under development.</div><div class='del'>-</div><div class='ctx'> Here's an example of how to use the API:</div><div class='ctx'> </div><div class='del'>-	#include &lt;crypto/ahash.h&gt;</div><div class='add'>+	#include &lt;crypto/hash.h&gt;</div><div class='ctx'> 	#include &lt;linux/err.h&gt;</div><div class='ctx'> 	#include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> 	</div><div class='head'>diff --git a/Documentation/crypto/api-kpp.rst b/Documentation/crypto/api-kpp.rst<br/>new file mode 100644<br/>index 000000000000..7d86ab906bdf<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/api-kpp.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-kpp.rst</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+Key-agreement Protocol Primitives (KPP) Cipher Algorithm Definitions</div><div class='add'>+--------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/kpp.h</div><div class='add'>+   :functions: kpp_request crypto_kpp kpp_alg kpp_secret</div><div class='add'>+</div><div class='add'>+Key-agreement Protocol Primitives (KPP) Cipher API</div><div class='add'>+--------------------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/kpp.h</div><div class='add'>+   :doc: Generic Key-agreement Protocol Primitives API</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/kpp.h</div><div class='add'>+   :functions: crypto_alloc_kpp crypto_free_kpp crypto_kpp_set_secret crypto_kpp_generate_public_key crypto_kpp_compute_shared_secret crypto_kpp_maxsize</div><div class='add'>+</div><div class='add'>+Key-agreement Protocol Primitives (KPP) Cipher Request Handle</div><div class='add'>+-------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/kpp.h</div><div class='add'>+   :functions: kpp_request_alloc kpp_request_free kpp_request_set_callback kpp_request_set_input kpp_request_set_output</div><div class='add'>+</div><div class='add'>+ECDH Helper Functions</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/ecdh.h</div><div class='add'>+   :doc: ECDH Helper Functions</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/ecdh.h</div><div class='add'>+   :functions: ecdh crypto_ecdh_key_len crypto_ecdh_encode_key crypto_ecdh_decode_key</div><div class='add'>+</div><div class='add'>+DH Helper Functions</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/dh.h</div><div class='add'>+   :doc: DH Helper Functions</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/dh.h</div><div class='add'>+   :functions: dh crypto_dh_key_len crypto_dh_encode_key crypto_dh_decode_key</div><div class='head'>diff --git a/Documentation/crypto/api-rng.rst b/Documentation/crypto/api-rng.rst<br/>new file mode 100644<br/>index 000000000000..10ba7436cee4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/api-rng.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-rng.rst</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+Random Number Algorithm Definitions</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/rng.h</div><div class='add'>+   :functions: rng_alg</div><div class='add'>+</div><div class='add'>+Crypto API Random Number API</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/rng.h</div><div class='add'>+   :doc: Random number generator API</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/rng.h</div><div class='add'>+   :functions: crypto_alloc_rng crypto_rng_alg crypto_free_rng crypto_rng_generate crypto_rng_get_bytes crypto_rng_reset crypto_rng_seedsize</div><div class='head'>diff --git a/Documentation/crypto/api-samples.rst b/Documentation/crypto/api-samples.rst<br/>new file mode 100644<br/>index 000000000000..0a10819f6107<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/api-samples.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-samples.rst</a></div><div class='hunk'>@@ -0,0 +1,224 @@</div><div class='add'>+Code Examples</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+Code Example For Symmetric Key Cipher Operation</div><div class='add'>+-----------------------------------------------</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    struct tcrypt_result {</div><div class='add'>+        struct completion completion;</div><div class='add'>+        int err;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    /* tie all data structures together */</div><div class='add'>+    struct skcipher_def {</div><div class='add'>+        struct scatterlist sg;</div><div class='add'>+        struct crypto_skcipher *tfm;</div><div class='add'>+        struct skcipher_request *req;</div><div class='add'>+        struct tcrypt_result result;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    /* Callback function */</div><div class='add'>+    static void test_skcipher_cb(struct crypto_async_request *req, int error)</div><div class='add'>+    {</div><div class='add'>+        struct tcrypt_result *result = req-&gt;data;</div><div class='add'>+</div><div class='add'>+        if (error == -EINPROGRESS)</div><div class='add'>+            return;</div><div class='add'>+        result-&gt;err = error;</div><div class='add'>+        complete(&amp;result-&gt;completion);</div><div class='add'>+        pr_info("Encryption finished successfully\n");</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* Perform cipher operation */</div><div class='add'>+    static unsigned int test_skcipher_encdec(struct skcipher_def *sk,</div><div class='add'>+                         int enc)</div><div class='add'>+    {</div><div class='add'>+        int rc = 0;</div><div class='add'>+</div><div class='add'>+        if (enc)</div><div class='add'>+            rc = crypto_skcipher_encrypt(sk-&gt;req);</div><div class='add'>+        else</div><div class='add'>+            rc = crypto_skcipher_decrypt(sk-&gt;req);</div><div class='add'>+</div><div class='add'>+        switch (rc) {</div><div class='add'>+        case 0:</div><div class='add'>+            break;</div><div class='add'>+        case -EINPROGRESS:</div><div class='add'>+        case -EBUSY:</div><div class='add'>+            rc = wait_for_completion_interruptible(</div><div class='add'>+                &amp;sk-&gt;result.completion);</div><div class='add'>+            if (!rc &amp;&amp; !sk-&gt;result.err) {</div><div class='add'>+                reinit_completion(&amp;sk-&gt;result.completion);</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+        default:</div><div class='add'>+            pr_info("skcipher encrypt returned with %d result %d\n",</div><div class='add'>+                rc, sk-&gt;result.err);</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='add'>+        init_completion(&amp;sk-&gt;result.completion);</div><div class='add'>+</div><div class='add'>+        return rc;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* Initialize and trigger cipher operation */</div><div class='add'>+    static int test_skcipher(void)</div><div class='add'>+    {</div><div class='add'>+        struct skcipher_def sk;</div><div class='add'>+        struct crypto_skcipher *skcipher = NULL;</div><div class='add'>+        struct skcipher_request *req = NULL;</div><div class='add'>+        char *scratchpad = NULL;</div><div class='add'>+        char *ivdata = NULL;</div><div class='add'>+        unsigned char key[32];</div><div class='add'>+        int ret = -EFAULT;</div><div class='add'>+</div><div class='add'>+        skcipher = crypto_alloc_skcipher("cbc-aes-aesni", 0, 0);</div><div class='add'>+        if (IS_ERR(skcipher)) {</div><div class='add'>+            pr_info("could not allocate skcipher handle\n");</div><div class='add'>+            return PTR_ERR(skcipher);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        req = skcipher_request_alloc(skcipher, GFP_KERNEL);</div><div class='add'>+        if (!req) {</div><div class='add'>+            pr_info("could not allocate skcipher request\n");</div><div class='add'>+            ret = -ENOMEM;</div><div class='add'>+            goto out;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='add'>+                          test_skcipher_cb,</div><div class='add'>+                          &amp;sk.result);</div><div class='add'>+</div><div class='add'>+        /* AES 256 with random key */</div><div class='add'>+        get_random_bytes(&amp;key, 32);</div><div class='add'>+        if (crypto_skcipher_setkey(skcipher, key, 32)) {</div><div class='add'>+            pr_info("key could not be set\n");</div><div class='add'>+            ret = -EAGAIN;</div><div class='add'>+            goto out;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* IV will be random */</div><div class='add'>+        ivdata = kmalloc(16, GFP_KERNEL);</div><div class='add'>+        if (!ivdata) {</div><div class='add'>+            pr_info("could not allocate ivdata\n");</div><div class='add'>+            goto out;</div><div class='add'>+        }</div><div class='add'>+        get_random_bytes(ivdata, 16);</div><div class='add'>+</div><div class='add'>+        /* Input data will be random */</div><div class='add'>+        scratchpad = kmalloc(16, GFP_KERNEL);</div><div class='add'>+        if (!scratchpad) {</div><div class='add'>+            pr_info("could not allocate scratchpad\n");</div><div class='add'>+            goto out;</div><div class='add'>+        }</div><div class='add'>+        get_random_bytes(scratchpad, 16);</div><div class='add'>+</div><div class='add'>+        sk.tfm = skcipher;</div><div class='add'>+        sk.req = req;</div><div class='add'>+</div><div class='add'>+        /* We encrypt one block */</div><div class='add'>+        sg_init_one(&amp;sk.sg, scratchpad, 16);</div><div class='add'>+        skcipher_request_set_crypt(req, &amp;sk.sg, &amp;sk.sg, 16, ivdata);</div><div class='add'>+        init_completion(&amp;sk.result.completion);</div><div class='add'>+</div><div class='add'>+        /* encrypt data */</div><div class='add'>+        ret = test_skcipher_encdec(&amp;sk, 1);</div><div class='add'>+        if (ret)</div><div class='add'>+            goto out;</div><div class='add'>+</div><div class='add'>+        pr_info("Encryption triggered successfully\n");</div><div class='add'>+</div><div class='add'>+    out:</div><div class='add'>+        if (skcipher)</div><div class='add'>+            crypto_free_skcipher(skcipher);</div><div class='add'>+        if (req)</div><div class='add'>+            skcipher_request_free(req);</div><div class='add'>+        if (ivdata)</div><div class='add'>+            kfree(ivdata);</div><div class='add'>+        if (scratchpad)</div><div class='add'>+            kfree(scratchpad);</div><div class='add'>+        return ret;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Code Example For Use of Operational State Memory With SHASH</div><div class='add'>+-----------------------------------------------------------</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    struct sdesc {</div><div class='add'>+        struct shash_desc shash;</div><div class='add'>+        char ctx[];</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    static struct sdescinit_sdesc(struct crypto_shash *alg)</div><div class='add'>+    {</div><div class='add'>+        struct sdescsdesc;</div><div class='add'>+        int size;</div><div class='add'>+</div><div class='add'>+        size = sizeof(struct shash_desc) + crypto_shash_descsize(alg);</div><div class='add'>+        sdesc = kmalloc(size, GFP_KERNEL);</div><div class='add'>+        if (!sdesc)</div><div class='add'>+            return ERR_PTR(-ENOMEM);</div><div class='add'>+        sdesc-&gt;shash.tfm = alg;</div><div class='add'>+        sdesc-&gt;shash.flags = 0x0;</div><div class='add'>+        return sdesc;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    static int calc_hash(struct crypto_shashalg,</div><div class='add'>+                 const unsigned chardata, unsigned int datalen,</div><div class='add'>+                 unsigned chardigest) {</div><div class='add'>+        struct sdescsdesc;</div><div class='add'>+        int ret;</div><div class='add'>+</div><div class='add'>+        sdesc = init_sdesc(alg);</div><div class='add'>+        if (IS_ERR(sdesc)) {</div><div class='add'>+            pr_info("trusted_key: can't alloc %s\n", hash_alg);</div><div class='add'>+            return PTR_ERR(sdesc);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        ret = crypto_shash_digest(&amp;sdesc-&gt;shash, data, datalen, digest);</div><div class='add'>+        kfree(sdesc);</div><div class='add'>+        return ret;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Code Example For Random Number Generator Usage</div><div class='add'>+----------------------------------------------</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    static int get_random_numbers(u8 *buf, unsigned int len)</div><div class='add'>+    {</div><div class='add'>+        struct crypto_rngrng = NULL;</div><div class='add'>+        chardrbg = "drbg_nopr_sha256"; /* Hash DRBG with SHA-256, no PR */</div><div class='add'>+        int ret;</div><div class='add'>+</div><div class='add'>+        if (!buf || !len) {</div><div class='add'>+            pr_debug("No output buffer provided\n");</div><div class='add'>+            return -EINVAL;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        rng = crypto_alloc_rng(drbg, 0, 0);</div><div class='add'>+        if (IS_ERR(rng)) {</div><div class='add'>+            pr_debug("could not allocate RNG handle for %s\n", drbg);</div><div class='add'>+            return -PTR_ERR(rng);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        ret = crypto_rng_get_bytes(rng, buf, len);</div><div class='add'>+        if (ret &lt; 0)</div><div class='add'>+            pr_debug("generation of random numbers failed\n");</div><div class='add'>+        else if (ret == 0)</div><div class='add'>+            pr_debug("RNG returned no data");</div><div class='add'>+        else</div><div class='add'>+            pr_debug("RNG returned %d bytes of data\n", ret);</div><div class='add'>+</div><div class='add'>+    out:</div><div class='add'>+        crypto_free_rng(rng);</div><div class='add'>+        return ret;</div><div class='add'>+    }</div><div class='head'>diff --git a/Documentation/crypto/api-skcipher.rst b/Documentation/crypto/api-skcipher.rst<br/>new file mode 100644<br/>index 000000000000..4eec4a93f7e3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/api-skcipher.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api-skcipher.rst</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+Block Cipher Algorithm Definitions</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/crypto.h</div><div class='add'>+   :doc: Block Cipher Algorithm Definitions</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/crypto.h</div><div class='add'>+   :functions: crypto_alg ablkcipher_alg blkcipher_alg cipher_alg</div><div class='add'>+</div><div class='add'>+Symmetric Key Cipher API</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/skcipher.h</div><div class='add'>+   :doc: Symmetric Key Cipher API</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/skcipher.h</div><div class='add'>+   :functions: crypto_alloc_skcipher crypto_free_skcipher crypto_has_skcipher crypto_skcipher_ivsize crypto_skcipher_blocksize crypto_skcipher_setkey crypto_skcipher_reqtfm crypto_skcipher_encrypt crypto_skcipher_decrypt</div><div class='add'>+</div><div class='add'>+Symmetric Key Cipher Request Handle</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/skcipher.h</div><div class='add'>+   :doc: Symmetric Key Cipher Request Handle</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/crypto/skcipher.h</div><div class='add'>+   :functions: crypto_skcipher_reqsize skcipher_request_set_tfm skcipher_request_alloc skcipher_request_free skcipher_request_set_callback skcipher_request_set_crypt</div><div class='add'>+</div><div class='add'>+Single Block Cipher API</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/crypto.h</div><div class='add'>+   :doc: Single Block Cipher API</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/crypto.h</div><div class='add'>+   :functions: crypto_alloc_cipher crypto_free_cipher crypto_has_cipher crypto_cipher_blocksize crypto_cipher_setkey crypto_cipher_encrypt_one crypto_cipher_decrypt_one</div><div class='add'>+</div><div class='add'>+Asynchronous Block Cipher API - Deprecated</div><div class='add'>+------------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/crypto.h</div><div class='add'>+   :doc: Asynchronous Block Cipher API</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/crypto.h</div><div class='add'>+   :functions: crypto_free_ablkcipher crypto_has_ablkcipher crypto_ablkcipher_ivsize crypto_ablkcipher_blocksize crypto_ablkcipher_setkey crypto_ablkcipher_reqtfm crypto_ablkcipher_encrypt crypto_ablkcipher_decrypt</div><div class='add'>+</div><div class='add'>+Asynchronous Cipher Request Handle - Deprecated</div><div class='add'>+-----------------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/crypto.h</div><div class='add'>+   :doc: Asynchronous Cipher Request Handle</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/crypto.h</div><div class='add'>+   :functions: crypto_ablkcipher_reqsize ablkcipher_request_set_tfm ablkcipher_request_alloc ablkcipher_request_free ablkcipher_request_set_callback ablkcipher_request_set_crypt</div><div class='add'>+</div><div class='add'>+Synchronous Block Cipher API - Deprecated</div><div class='add'>+-----------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/crypto.h</div><div class='add'>+   :doc: Synchronous Block Cipher API</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/crypto.h</div><div class='add'>+   :functions: crypto_alloc_blkcipher crypto_free_blkcipher crypto_has_blkcipher crypto_blkcipher_name crypto_blkcipher_ivsize crypto_blkcipher_blocksize crypto_blkcipher_setkey crypto_blkcipher_encrypt crypto_blkcipher_encrypt_iv crypto_blkcipher_decrypt crypto_blkcipher_decrypt_iv crypto_blkcipher_set_iv crypto_blkcipher_get_iv</div><div class='head'>diff --git a/Documentation/crypto/api.rst b/Documentation/crypto/api.rst<br/>new file mode 100644<br/>index 000000000000..2e519193ab4a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/api.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/api.rst</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+Programming Interface</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+Please note that the kernel crypto API contains the AEAD givcrypt API</div><div class='add'>+(crypto_aead_giv\* and aead_givcrypt\* function calls in</div><div class='add'>+include/crypto/aead.h). This API is obsolete and will be removed in the</div><div class='add'>+future. To obtain the functionality of an AEAD cipher with internal IV</div><div class='add'>+generation, use the IV generator as a regular cipher. For example,</div><div class='add'>+rfc4106(gcm(aes)) is the AEAD cipher with external IV generation and</div><div class='add'>+seqniv(rfc4106(gcm(aes))) implies that the kernel crypto API generates</div><div class='add'>+the IV. Different IV generators are available.</div><div class='add'>+</div><div class='add'>+.. class:: toc-title</div><div class='add'>+</div><div class='add'>+	   Table of contents</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   api-skcipher</div><div class='add'>+   api-aead</div><div class='add'>+   api-digest</div><div class='add'>+   api-rng</div><div class='add'>+   api-akcipher</div><div class='add'>+   api-kpp</div><div class='head'>diff --git a/Documentation/crypto/architecture.rst b/Documentation/crypto/architecture.rst<br/>new file mode 100644<br/>index 000000000000..ca2d09b991f5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/architecture.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/architecture.rst</a></div><div class='hunk'>@@ -0,0 +1,441 @@</div><div class='add'>+Kernel Crypto API Architecture</div><div class='add'>+==============================</div><div class='add'>+</div><div class='add'>+Cipher algorithm types</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+The kernel crypto API provides different API calls for the following</div><div class='add'>+cipher types:</div><div class='add'>+</div><div class='add'>+-  Symmetric ciphers</div><div class='add'>+</div><div class='add'>+-  AEAD ciphers</div><div class='add'>+</div><div class='add'>+-  Message digest, including keyed message digest</div><div class='add'>+</div><div class='add'>+-  Random number generation</div><div class='add'>+</div><div class='add'>+-  User space interface</div><div class='add'>+</div><div class='add'>+Ciphers And Templates</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The kernel crypto API provides implementations of single block ciphers</div><div class='add'>+and message digests. In addition, the kernel crypto API provides</div><div class='add'>+numerous "templates" that can be used in conjunction with the single</div><div class='add'>+block ciphers and message digests. Templates include all types of block</div><div class='add'>+chaining mode, the HMAC mechanism, etc.</div><div class='add'>+</div><div class='add'>+Single block ciphers and message digests can either be directly used by</div><div class='add'>+a caller or invoked together with a template to form multi-block ciphers</div><div class='add'>+or keyed message digests.</div><div class='add'>+</div><div class='add'>+A single block cipher may even be called with multiple templates.</div><div class='add'>+However, templates cannot be used without a single cipher.</div><div class='add'>+</div><div class='add'>+See /proc/crypto and search for "name". For example:</div><div class='add'>+</div><div class='add'>+-  aes</div><div class='add'>+</div><div class='add'>+-  ecb(aes)</div><div class='add'>+</div><div class='add'>+-  cmac(aes)</div><div class='add'>+</div><div class='add'>+-  ccm(aes)</div><div class='add'>+</div><div class='add'>+-  rfc4106(gcm(aes))</div><div class='add'>+</div><div class='add'>+-  sha1</div><div class='add'>+</div><div class='add'>+-  hmac(sha1)</div><div class='add'>+</div><div class='add'>+-  authenc(hmac(sha1),cbc(aes))</div><div class='add'>+</div><div class='add'>+In these examples, "aes" and "sha1" are the ciphers and all others are</div><div class='add'>+the templates.</div><div class='add'>+</div><div class='add'>+Synchronous And Asynchronous Operation</div><div class='add'>+--------------------------------------</div><div class='add'>+</div><div class='add'>+The kernel crypto API provides synchronous and asynchronous API</div><div class='add'>+operations.</div><div class='add'>+</div><div class='add'>+When using the synchronous API operation, the caller invokes a cipher</div><div class='add'>+operation which is performed synchronously by the kernel crypto API.</div><div class='add'>+That means, the caller waits until the cipher operation completes.</div><div class='add'>+Therefore, the kernel crypto API calls work like regular function calls.</div><div class='add'>+For synchronous operation, the set of API calls is small and</div><div class='add'>+conceptually similar to any other crypto library.</div><div class='add'>+</div><div class='add'>+Asynchronous operation is provided by the kernel crypto API which</div><div class='add'>+implies that the invocation of a cipher operation will complete almost</div><div class='add'>+instantly. That invocation triggers the cipher operation but it does not</div><div class='add'>+signal its completion. Before invoking a cipher operation, the caller</div><div class='add'>+must provide a callback function the kernel crypto API can invoke to</div><div class='add'>+signal the completion of the cipher operation. Furthermore, the caller</div><div class='add'>+must ensure it can handle such asynchronous events by applying</div><div class='add'>+appropriate locking around its data. The kernel crypto API does not</div><div class='add'>+perform any special serialization operation to protect the caller's data</div><div class='add'>+integrity.</div><div class='add'>+</div><div class='add'>+Crypto API Cipher References And Priority</div><div class='add'>+-----------------------------------------</div><div class='add'>+</div><div class='add'>+A cipher is referenced by the caller with a string. That string has the</div><div class='add'>+following semantics:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+        template(single block cipher)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+where "template" and "single block cipher" is the aforementioned</div><div class='add'>+template and single block cipher, respectively. If applicable,</div><div class='add'>+additional templates may enclose other templates, such as</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+        template1(template2(single block cipher)))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The kernel crypto API may provide multiple implementations of a template</div><div class='add'>+or a single block cipher. For example, AES on newer Intel hardware has</div><div class='add'>+the following implementations: AES-NI, assembler implementation, or</div><div class='add'>+straight C. Now, when using the string "aes" with the kernel crypto API,</div><div class='add'>+which cipher implementation is used? The answer to that question is the</div><div class='add'>+priority number assigned to each cipher implementation by the kernel</div><div class='add'>+crypto API. When a caller uses the string to refer to a cipher during</div><div class='add'>+initialization of a cipher handle, the kernel crypto API looks up all</div><div class='add'>+implementations providing an implementation with that name and selects</div><div class='add'>+the implementation with the highest priority.</div><div class='add'>+</div><div class='add'>+Now, a caller may have the need to refer to a specific cipher</div><div class='add'>+implementation and thus does not want to rely on the priority-based</div><div class='add'>+selection. To accommodate this scenario, the kernel crypto API allows</div><div class='add'>+the cipher implementation to register a unique name in addition to</div><div class='add'>+common names. When using that unique name, a caller is therefore always</div><div class='add'>+sure to refer to the intended cipher implementation.</div><div class='add'>+</div><div class='add'>+The list of available ciphers is given in /proc/crypto. However, that</div><div class='add'>+list does not specify all possible permutations of templates and</div><div class='add'>+ciphers. Each block listed in /proc/crypto may contain the following</div><div class='add'>+information -- if one of the components listed as follows are not</div><div class='add'>+applicable to a cipher, it is not displayed:</div><div class='add'>+</div><div class='add'>+-  name: the generic name of the cipher that is subject to the</div><div class='add'>+   priority-based selection -- this name can be used by the cipher</div><div class='add'>+   allocation API calls (all names listed above are examples for such</div><div class='add'>+   generic names)</div><div class='add'>+</div><div class='add'>+-  driver: the unique name of the cipher -- this name can be used by the</div><div class='add'>+   cipher allocation API calls</div><div class='add'>+</div><div class='add'>+-  module: the kernel module providing the cipher implementation (or</div><div class='add'>+   "kernel" for statically linked ciphers)</div><div class='add'>+</div><div class='add'>+-  priority: the priority value of the cipher implementation</div><div class='add'>+</div><div class='add'>+-  refcnt: the reference count of the respective cipher (i.e. the number</div><div class='add'>+   of current consumers of this cipher)</div><div class='add'>+</div><div class='add'>+-  selftest: specification whether the self test for the cipher passed</div><div class='add'>+</div><div class='add'>+-  type:</div><div class='add'>+</div><div class='add'>+   -  skcipher for symmetric key ciphers</div><div class='add'>+</div><div class='add'>+   -  cipher for single block ciphers that may be used with an</div><div class='add'>+      additional template</div><div class='add'>+</div><div class='add'>+   -  shash for synchronous message digest</div><div class='add'>+</div><div class='add'>+   -  ahash for asynchronous message digest</div><div class='add'>+</div><div class='add'>+   -  aead for AEAD cipher type</div><div class='add'>+</div><div class='add'>+   -  compression for compression type transformations</div><div class='add'>+</div><div class='add'>+   -  rng for random number generator</div><div class='add'>+</div><div class='add'>+   -  givcipher for cipher with associated IV generator (see the geniv</div><div class='add'>+      entry below for the specification of the IV generator type used by</div><div class='add'>+      the cipher implementation)</div><div class='add'>+</div><div class='add'>+   -  kpp for a Key-agreement Protocol Primitive (KPP) cipher such as</div><div class='add'>+      an ECDH or DH implementation</div><div class='add'>+</div><div class='add'>+-  blocksize: blocksize of cipher in bytes</div><div class='add'>+</div><div class='add'>+-  keysize: key size in bytes</div><div class='add'>+</div><div class='add'>+-  ivsize: IV size in bytes</div><div class='add'>+</div><div class='add'>+-  seedsize: required size of seed data for random number generator</div><div class='add'>+</div><div class='add'>+-  digestsize: output size of the message digest</div><div class='add'>+</div><div class='add'>+-  geniv: IV generation type:</div><div class='add'>+</div><div class='add'>+   -  eseqiv for encrypted sequence number based IV generation</div><div class='add'>+</div><div class='add'>+   -  seqiv for sequence number based IV generation</div><div class='add'>+</div><div class='add'>+   -  chainiv for chain iv generation</div><div class='add'>+</div><div class='add'>+   -  &lt;builtin&gt; is a marker that the cipher implements IV generation and</div><div class='add'>+      handling as it is specific to the given cipher</div><div class='add'>+</div><div class='add'>+Key Sizes</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+When allocating a cipher handle, the caller only specifies the cipher</div><div class='add'>+type. Symmetric ciphers, however, typically support multiple key sizes</div><div class='add'>+(e.g. AES-128 vs. AES-192 vs. AES-256). These key sizes are determined</div><div class='add'>+with the length of the provided key. Thus, the kernel crypto API does</div><div class='add'>+not provide a separate way to select the particular symmetric cipher key</div><div class='add'>+size.</div><div class='add'>+</div><div class='add'>+Cipher Allocation Type And Masks</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+The different cipher handle allocation functions allow the specification</div><div class='add'>+of a type and mask flag. Both parameters have the following meaning (and</div><div class='add'>+are therefore not covered in the subsequent sections).</div><div class='add'>+</div><div class='add'>+The type flag specifies the type of the cipher algorithm. The caller</div><div class='add'>+usually provides a 0 when the caller wants the default handling.</div><div class='add'>+Otherwise, the caller may provide the following selections which match</div><div class='add'>+the aforementioned cipher types:</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_CIPHER Single block cipher</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_COMPRESS Compression</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_AEAD Authenticated Encryption with Associated Data</div><div class='add'>+   (MAC)</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_BLKCIPHER Synchronous multi-block cipher</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_ABLKCIPHER Asynchronous multi-block cipher</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_GIVCIPHER Asynchronous multi-block cipher packed</div><div class='add'>+   together with an IV generator (see geniv field in the /proc/crypto</div><div class='add'>+   listing for the known IV generators)</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_KPP Key-agreement Protocol Primitive (KPP) such as</div><div class='add'>+   an ECDH or DH implementation</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_DIGEST Raw message digest</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_HASH Alias for CRYPTO_ALG_TYPE_DIGEST</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_SHASH Synchronous multi-block hash</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_AHASH Asynchronous multi-block hash</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_RNG Random Number Generation</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_AKCIPHER Asymmetric cipher</div><div class='add'>+</div><div class='add'>+-  CRYPTO_ALG_TYPE_PCOMPRESS Enhanced version of</div><div class='add'>+   CRYPTO_ALG_TYPE_COMPRESS allowing for segmented compression /</div><div class='add'>+   decompression instead of performing the operation on one segment</div><div class='add'>+   only. CRYPTO_ALG_TYPE_PCOMPRESS is intended to replace</div><div class='add'>+   CRYPTO_ALG_TYPE_COMPRESS once existing consumers are converted.</div><div class='add'>+</div><div class='add'>+The mask flag restricts the type of cipher. The only allowed flag is</div><div class='add'>+CRYPTO_ALG_ASYNC to restrict the cipher lookup function to</div><div class='add'>+asynchronous ciphers. Usually, a caller provides a 0 for the mask flag.</div><div class='add'>+</div><div class='add'>+When the caller provides a mask and type specification, the caller</div><div class='add'>+limits the search the kernel crypto API can perform for a suitable</div><div class='add'>+cipher implementation for the given cipher name. That means, even when a</div><div class='add'>+caller uses a cipher name that exists during its initialization call,</div><div class='add'>+the kernel crypto API may not select it due to the used type and mask</div><div class='add'>+field.</div><div class='add'>+</div><div class='add'>+Internal Structure of Kernel Crypto API</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+The kernel crypto API has an internal structure where a cipher</div><div class='add'>+implementation may use many layers and indirections. This section shall</div><div class='add'>+help to clarify how the kernel crypto API uses various components to</div><div class='add'>+implement the complete cipher.</div><div class='add'>+</div><div class='add'>+The following subsections explain the internal structure based on</div><div class='add'>+existing cipher implementations. The first section addresses the most</div><div class='add'>+complex scenario where all other scenarios form a logical subset.</div><div class='add'>+</div><div class='add'>+Generic AEAD Cipher Structure</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The following ASCII art decomposes the kernel crypto API layers when</div><div class='add'>+using the AEAD cipher with the automated IV generation. The shown</div><div class='add'>+example is used by the IPSEC layer.</div><div class='add'>+</div><div class='add'>+For other use cases of AEAD ciphers, the ASCII art applies as well, but</div><div class='add'>+the caller may not use the AEAD cipher with a separate IV generator. In</div><div class='add'>+this case, the caller must generate the IV.</div><div class='add'>+</div><div class='add'>+The depicted example decomposes the AEAD cipher of GCM(AES) based on the</div><div class='add'>+generic C implementations (gcm.c, aes-generic.c, ctr.c, ghash-generic.c,</div><div class='add'>+seqiv.c). The generic implementation serves as an example showing the</div><div class='add'>+complete logic of the kernel crypto API.</div><div class='add'>+</div><div class='add'>+It is possible that some streamlined cipher implementations (like</div><div class='add'>+AES-NI) provide implementations merging aspects which in the view of the</div><div class='add'>+kernel crypto API cannot be decomposed into layers any more. In case of</div><div class='add'>+the AES-NI implementation, the CTR mode, the GHASH implementation and</div><div class='add'>+the AES cipher are all merged into one cipher implementation registered</div><div class='add'>+with the kernel crypto API. In this case, the concept described by the</div><div class='add'>+following ASCII art applies too. However, the decomposition of GCM into</div><div class='add'>+the individual sub-components by the kernel crypto API is not done any</div><div class='add'>+more.</div><div class='add'>+</div><div class='add'>+Each block in the following ASCII art is an independent cipher instance</div><div class='add'>+obtained from the kernel crypto API. Each block is accessed by the</div><div class='add'>+caller or by other blocks using the API functions defined by the kernel</div><div class='add'>+crypto API for the cipher implementation type.</div><div class='add'>+</div><div class='add'>+The blocks below indicate the cipher type as well as the specific logic</div><div class='add'>+implemented in the cipher.</div><div class='add'>+</div><div class='add'>+The ASCII art picture also indicates the call structure, i.e. who calls</div><div class='add'>+which component. The arrows point to the invoked block where the caller</div><div class='add'>+uses the API applicable to the cipher type specified for the block.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    kernel crypto API                                |   IPSEC Layer</div><div class='add'>+                                                     |</div><div class='add'>+    +-----------+                                    |</div><div class='add'>+    |           |            (1)</div><div class='add'>+    |   aead    | &lt;-----------------------------------  esp_output</div><div class='add'>+    |  (seqiv)  | ---+</div><div class='add'>+    +-----------+    |</div><div class='add'>+                     | (2)</div><div class='add'>+    +-----------+    |</div><div class='add'>+    |           | &lt;--+                (2)</div><div class='add'>+    |   aead    | &lt;-----------------------------------  esp_input</div><div class='add'>+    |   (gcm)   | ------------+</div><div class='add'>+    +-----------+             |</div><div class='add'>+          | (3)               | (5)</div><div class='add'>+          v                   v</div><div class='add'>+    +-----------+       +-----------+</div><div class='add'>+    |           |       |           |</div><div class='add'>+    |  skcipher |       |   ahash   |</div><div class='add'>+    |   (ctr)   | ---+  |  (ghash)  |</div><div class='add'>+    +-----------+    |  +-----------+</div><div class='add'>+                     |</div><div class='add'>+    +-----------+    | (4)</div><div class='add'>+    |           | &lt;--+</div><div class='add'>+    |   cipher  |</div><div class='add'>+    |   (aes)   |</div><div class='add'>+    +-----------+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The following call sequence is applicable when the IPSEC layer triggers</div><div class='add'>+an encryption operation with the esp_output function. During</div><div class='add'>+configuration, the administrator set up the use of rfc4106(gcm(aes)) as</div><div class='add'>+the cipher for ESP. The following call sequence is now depicted in the</div><div class='add'>+ASCII art above:</div><div class='add'>+</div><div class='add'>+1. esp_output() invokes crypto_aead_encrypt() to trigger an</div><div class='add'>+   encryption operation of the AEAD cipher with IV generator.</div><div class='add'>+</div><div class='add'>+   In case of GCM, the SEQIV implementation is registered as GIVCIPHER</div><div class='add'>+   in crypto_rfc4106_alloc().</div><div class='add'>+</div><div class='add'>+   The SEQIV performs its operation to generate an IV where the core</div><div class='add'>+   function is seqiv_geniv().</div><div class='add'>+</div><div class='add'>+2. Now, SEQIV uses the AEAD API function calls to invoke the associated</div><div class='add'>+   AEAD cipher. In our case, during the instantiation of SEQIV, the</div><div class='add'>+   cipher handle for GCM is provided to SEQIV. This means that SEQIV</div><div class='add'>+   invokes AEAD cipher operations with the GCM cipher handle.</div><div class='add'>+</div><div class='add'>+   During instantiation of the GCM handle, the CTR(AES) and GHASH</div><div class='add'>+   ciphers are instantiated. The cipher handles for CTR(AES) and GHASH</div><div class='add'>+   are retained for later use.</div><div class='add'>+</div><div class='add'>+   The GCM implementation is responsible to invoke the CTR mode AES and</div><div class='add'>+   the GHASH cipher in the right manner to implement the GCM</div><div class='add'>+   specification.</div><div class='add'>+</div><div class='add'>+3. The GCM AEAD cipher type implementation now invokes the SKCIPHER API</div><div class='add'>+   with the instantiated CTR(AES) cipher handle.</div><div class='add'>+</div><div class='add'>+   During instantiation of the CTR(AES) cipher, the CIPHER type</div><div class='add'>+   implementation of AES is instantiated. The cipher handle for AES is</div><div class='add'>+   retained.</div><div class='add'>+</div><div class='add'>+   That means that the SKCIPHER implementation of CTR(AES) only</div><div class='add'>+   implements the CTR block chaining mode. After performing the block</div><div class='add'>+   chaining operation, the CIPHER implementation of AES is invoked.</div><div class='add'>+</div><div class='add'>+4. The SKCIPHER of CTR(AES) now invokes the CIPHER API with the AES</div><div class='add'>+   cipher handle to encrypt one block.</div><div class='add'>+</div><div class='add'>+5. The GCM AEAD implementation also invokes the GHASH cipher</div><div class='add'>+   implementation via the AHASH API.</div><div class='add'>+</div><div class='add'>+When the IPSEC layer triggers the esp_input() function, the same call</div><div class='add'>+sequence is followed with the only difference that the operation starts</div><div class='add'>+with step (2).</div><div class='add'>+</div><div class='add'>+Generic Block Cipher Structure</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Generic block ciphers follow the same concept as depicted with the ASCII</div><div class='add'>+art picture above.</div><div class='add'>+</div><div class='add'>+For example, CBC(AES) is implemented with cbc.c, and aes-generic.c. The</div><div class='add'>+ASCII art picture above applies as well with the difference that only</div><div class='add'>+step (4) is used and the SKCIPHER block chaining mode is CBC.</div><div class='add'>+</div><div class='add'>+Generic Keyed Message Digest Structure</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Keyed message digest implementations again follow the same concept as</div><div class='add'>+depicted in the ASCII art picture above.</div><div class='add'>+</div><div class='add'>+For example, HMAC(SHA256) is implemented with hmac.c and</div><div class='add'>+sha256_generic.c. The following ASCII art illustrates the</div><div class='add'>+implementation:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    kernel crypto API            |       Caller</div><div class='add'>+                                 |</div><div class='add'>+    +-----------+         (1)    |</div><div class='add'>+    |           | &lt;------------------  some_function</div><div class='add'>+    |   ahash   |</div><div class='add'>+    |   (hmac)  | ---+</div><div class='add'>+    +-----------+    |</div><div class='add'>+                     | (2)</div><div class='add'>+    +-----------+    |</div><div class='add'>+    |           | &lt;--+</div><div class='add'>+    |   shash   |</div><div class='add'>+    |  (sha256) |</div><div class='add'>+    +-----------+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The following call sequence is applicable when a caller triggers an HMAC</div><div class='add'>+operation:</div><div class='add'>+</div><div class='add'>+1. The AHASH API functions are invoked by the caller. The HMAC</div><div class='add'>+   implementation performs its operation as needed.</div><div class='add'>+</div><div class='add'>+   During initialization of the HMAC cipher, the SHASH cipher type of</div><div class='add'>+   SHA256 is instantiated. The cipher handle for the SHA256 instance is</div><div class='add'>+   retained.</div><div class='add'>+</div><div class='add'>+   At one time, the HMAC implementation requires a SHA256 operation</div><div class='add'>+   where the SHA256 cipher handle is used.</div><div class='add'>+</div><div class='add'>+2. The HMAC instance now invokes the SHASH API with the SHA256 cipher</div><div class='add'>+   handle to calculate the message digest.</div><div class='head'>diff --git a/Documentation/crypto/devel-algos.rst b/Documentation/crypto/devel-algos.rst<br/>new file mode 100644<br/>index 000000000000..66f50d32dcec<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/devel-algos.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/devel-algos.rst</a></div><div class='hunk'>@@ -0,0 +1,247 @@</div><div class='add'>+Developing Cipher Algorithms</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+Registering And Unregistering Transformation</div><div class='add'>+--------------------------------------------</div><div class='add'>+</div><div class='add'>+There are three distinct types of registration functions in the Crypto</div><div class='add'>+API. One is used to register a generic cryptographic transformation,</div><div class='add'>+while the other two are specific to HASH transformations and</div><div class='add'>+COMPRESSion. We will discuss the latter two in a separate chapter, here</div><div class='add'>+we will only look at the generic ones.</div><div class='add'>+</div><div class='add'>+Before discussing the register functions, the data structure to be</div><div class='add'>+filled with each, struct crypto_alg, must be considered -- see below</div><div class='add'>+for a description of this data structure.</div><div class='add'>+</div><div class='add'>+The generic registration functions can be found in</div><div class='add'>+include/linux/crypto.h and their definition can be seen below. The</div><div class='add'>+former function registers a single transformation, while the latter</div><div class='add'>+works on an array of transformation descriptions. The latter is useful</div><div class='add'>+when registering transformations in bulk, for example when a driver</div><div class='add'>+implements multiple transformations.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+       int crypto_register_alg(struct crypto_alg *alg);</div><div class='add'>+       int crypto_register_algs(struct crypto_alg *algs, int count);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The counterparts to those functions are listed below.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+       int crypto_unregister_alg(struct crypto_alg *alg);</div><div class='add'>+       int crypto_unregister_algs(struct crypto_alg *algs, int count);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Notice that both registration and unregistration functions do return a</div><div class='add'>+value, so make sure to handle errors. A return code of zero implies</div><div class='add'>+success. Any return code &lt; 0 implies an error.</div><div class='add'>+</div><div class='add'>+The bulk registration/unregistration functions register/unregister each</div><div class='add'>+transformation in the given array of length count. They handle errors as</div><div class='add'>+follows:</div><div class='add'>+</div><div class='add'>+-  crypto_register_algs() succeeds if and only if it successfully</div><div class='add'>+   registers all the given transformations. If an error occurs partway</div><div class='add'>+   through, then it rolls back successful registrations before returning</div><div class='add'>+   the error code. Note that if a driver needs to handle registration</div><div class='add'>+   errors for individual transformations, then it will need to use the</div><div class='add'>+   non-bulk function crypto_register_alg() instead.</div><div class='add'>+</div><div class='add'>+-  crypto_unregister_algs() tries to unregister all the given</div><div class='add'>+   transformations, continuing on error. It logs errors and always</div><div class='add'>+   returns zero.</div><div class='add'>+</div><div class='add'>+Single-Block Symmetric Ciphers [CIPHER]</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+Example of transformations: aes, arc4, ...</div><div class='add'>+</div><div class='add'>+This section describes the simplest of all transformation</div><div class='add'>+implementations, that being the CIPHER type used for symmetric ciphers.</div><div class='add'>+The CIPHER type is used for transformations which operate on exactly one</div><div class='add'>+block at a time and there are no dependencies between blocks at all.</div><div class='add'>+</div><div class='add'>+Registration specifics</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The registration of [CIPHER] algorithm is specific in that struct</div><div class='add'>+crypto_alg field .cra_type is empty. The .cra_u.cipher has to be</div><div class='add'>+filled in with proper callbacks to implement this transformation.</div><div class='add'>+</div><div class='add'>+See struct cipher_alg below.</div><div class='add'>+</div><div class='add'>+Cipher Definition With struct cipher_alg</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Struct cipher_alg defines a single block cipher.</div><div class='add'>+</div><div class='add'>+Here are schematics of how these functions are called when operated from</div><div class='add'>+other part of the kernel. Note that the .cia_setkey() call might happen</div><div class='add'>+before or after any of these schematics happen, but must not happen</div><div class='add'>+during any of these are in-flight.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+             KEY ---.    PLAINTEXT ---.</div><div class='add'>+                    v                 v</div><div class='add'>+              .cia_setkey() -&gt; .cia_encrypt()</div><div class='add'>+                                      |</div><div class='add'>+                                      '-----&gt; CIPHERTEXT</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Please note that a pattern where .cia_setkey() is called multiple times</div><div class='add'>+is also valid:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      KEY1 --.    PLAINTEXT1 --.         KEY2 --.    PLAINTEXT2 --.</div><div class='add'>+             v                 v                v                 v</div><div class='add'>+       .cia_setkey() -&gt; .cia_encrypt() -&gt; .cia_setkey() -&gt; .cia_encrypt()</div><div class='add'>+                               |                                  |</div><div class='add'>+                               '---&gt; CIPHERTEXT1                  '---&gt; CIPHERTEXT2</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Multi-Block Ciphers</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Example of transformations: cbc(aes), ecb(arc4), ...</div><div class='add'>+</div><div class='add'>+This section describes the multi-block cipher transformation</div><div class='add'>+implementations. The multi-block ciphers are used for transformations</div><div class='add'>+which operate on scatterlists of data supplied to the transformation</div><div class='add'>+functions. They output the result into a scatterlist of data as well.</div><div class='add'>+</div><div class='add'>+Registration Specifics</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The registration of multi-block cipher algorithms is one of the most</div><div class='add'>+standard procedures throughout the crypto API.</div><div class='add'>+</div><div class='add'>+Note, if a cipher implementation requires a proper alignment of data,</div><div class='add'>+the caller should use the functions of crypto_skcipher_alignmask() to</div><div class='add'>+identify a memory alignment mask. The kernel crypto API is able to</div><div class='add'>+process requests that are unaligned. This implies, however, additional</div><div class='add'>+overhead as the kernel crypto API needs to perform the realignment of</div><div class='add'>+the data which may imply moving of data.</div><div class='add'>+</div><div class='add'>+Cipher Definition With struct blkcipher_alg and ablkcipher_alg</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Struct blkcipher_alg defines a synchronous block cipher whereas struct</div><div class='add'>+ablkcipher_alg defines an asynchronous block cipher.</div><div class='add'>+</div><div class='add'>+Please refer to the single block cipher description for schematics of</div><div class='add'>+the block cipher usage.</div><div class='add'>+</div><div class='add'>+Specifics Of Asynchronous Multi-Block Cipher</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+There are a couple of specifics to the asynchronous interface.</div><div class='add'>+</div><div class='add'>+First of all, some of the drivers will want to use the Generic</div><div class='add'>+ScatterWalk in case the hardware needs to be fed separate chunks of the</div><div class='add'>+scatterlist which contains the plaintext and will contain the</div><div class='add'>+ciphertext. Please refer to the ScatterWalk interface offered by the</div><div class='add'>+Linux kernel scatter / gather list implementation.</div><div class='add'>+</div><div class='add'>+Hashing [HASH]</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Example of transformations: crc32, md5, sha1, sha256,...</div><div class='add'>+</div><div class='add'>+Registering And Unregistering The Transformation</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+There are multiple ways to register a HASH transformation, depending on</div><div class='add'>+whether the transformation is synchronous [SHASH] or asynchronous</div><div class='add'>+[AHASH] and the amount of HASH transformations we are registering. You</div><div class='add'>+can find the prototypes defined in include/crypto/internal/hash.h:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+       int crypto_register_ahash(struct ahash_alg *alg);</div><div class='add'>+</div><div class='add'>+       int crypto_register_shash(struct shash_alg *alg);</div><div class='add'>+       int crypto_register_shashes(struct shash_alg *algs, int count);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The respective counterparts for unregistering the HASH transformation</div><div class='add'>+are as follows:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+       int crypto_unregister_ahash(struct ahash_alg *alg);</div><div class='add'>+</div><div class='add'>+       int crypto_unregister_shash(struct shash_alg *alg);</div><div class='add'>+       int crypto_unregister_shashes(struct shash_alg *algs, int count);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Cipher Definition With struct shash_alg and ahash_alg</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Here are schematics of how these functions are called when operated from</div><div class='add'>+other part of the kernel. Note that the .setkey() call might happen</div><div class='add'>+before or after any of these schematics happen, but must not happen</div><div class='add'>+during any of these are in-flight. Please note that calling .init()</div><div class='add'>+followed immediately by .finish() is also a perfectly valid</div><div class='add'>+transformation.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+       I)   DATA -----------.</div><div class='add'>+                            v</div><div class='add'>+             .init() -&gt; .update() -&gt; .final()      ! .update() might not be called</div><div class='add'>+                         ^    |         |            at all in this scenario.</div><div class='add'>+                         '----'         '---&gt; HASH</div><div class='add'>+</div><div class='add'>+       II)  DATA -----------.-----------.</div><div class='add'>+                            v           v</div><div class='add'>+             .init() -&gt; .update() -&gt; .finup()      ! .update() may not be called</div><div class='add'>+                         ^    |         |            at all in this scenario.</div><div class='add'>+                         '----'         '---&gt; HASH</div><div class='add'>+</div><div class='add'>+       III) DATA -----------.</div><div class='add'>+                            v</div><div class='add'>+                        .digest()                  ! The entire process is handled</div><div class='add'>+                            |                        by the .digest() call.</div><div class='add'>+                            '---------------&gt; HASH</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Here is a schematic of how the .export()/.import() functions are called</div><div class='add'>+when used from another part of the kernel.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+       KEY--.                 DATA--.</div><div class='add'>+            v                       v                  ! .update() may not be called</div><div class='add'>+        .setkey() -&gt; .init() -&gt; .update() -&gt; .export()   at all in this scenario.</div><div class='add'>+                                 ^     |         |</div><div class='add'>+                                 '-----'         '--&gt; PARTIAL_HASH</div><div class='add'>+</div><div class='add'>+       ----------- other transformations happen here -----------</div><div class='add'>+</div><div class='add'>+       PARTIAL_HASH--.   DATA1--.</div><div class='add'>+                     v          v</div><div class='add'>+                 .import -&gt; .update() -&gt; .final()     ! .update() may not be called</div><div class='add'>+                             ^    |         |           at all in this scenario.</div><div class='add'>+                             '----'         '--&gt; HASH1</div><div class='add'>+</div><div class='add'>+       PARTIAL_HASH--.   DATA2-.</div><div class='add'>+                     v         v</div><div class='add'>+                 .import -&gt; .finup()</div><div class='add'>+                               |</div><div class='add'>+                               '---------------&gt; HASH2</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Specifics Of Asynchronous HASH Transformation</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Some of the drivers will want to use the Generic ScatterWalk in case the</div><div class='add'>+implementation needs to be fed separate chunks of the scatterlist which</div><div class='add'>+contains the input data. The buffer containing the resulting hash will</div><div class='add'>+always be properly aligned to .cra_alignmask so there is no need to</div><div class='add'>+worry about this.</div><div class='head'>diff --git a/Documentation/crypto/index.rst b/Documentation/crypto/index.rst<br/>new file mode 100644<br/>index 000000000000..94c4786f2573<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/index.rst</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+=======================</div><div class='add'>+Linux Kernel Crypto API</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+:Author: Stephan Mueller</div><div class='add'>+:Author: Marek Vasut</div><div class='add'>+</div><div class='add'>+This documentation outlines the Linux kernel crypto API with its</div><div class='add'>+concepts, details about developing cipher implementations, employment of the API</div><div class='add'>+for cryptographic use cases, as well as programming examples.</div><div class='add'>+</div><div class='add'>+.. class:: toc-title</div><div class='add'>+</div><div class='add'>+	   Table of contents</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   intro</div><div class='add'>+   architecture</div><div class='add'>+   devel-algos</div><div class='add'>+   userspace-if</div><div class='add'>+   api</div><div class='add'>+   api-samples</div><div class='head'>diff --git a/Documentation/crypto/intro.rst b/Documentation/crypto/intro.rst<br/>new file mode 100644<br/>index 000000000000..9aa89ebbfba9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/intro.rst</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+Kernel Crypto API Interface Specification</div><div class='add'>+=========================================</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+The kernel crypto API offers a rich set of cryptographic ciphers as well</div><div class='add'>+as other data transformation mechanisms and methods to invoke these.</div><div class='add'>+This document contains a description of the API and provides example</div><div class='add'>+code.</div><div class='add'>+</div><div class='add'>+To understand and properly use the kernel crypto API a brief explanation</div><div class='add'>+of its structure is given. Based on the architecture, the API can be</div><div class='add'>+separated into different components. Following the architecture</div><div class='add'>+specification, hints to developers of ciphers are provided. Pointers to</div><div class='add'>+the API function call documentation are given at the end.</div><div class='add'>+</div><div class='add'>+The kernel crypto API refers to all algorithms as "transformations".</div><div class='add'>+Therefore, a cipher handle variable usually has the name "tfm". Besides</div><div class='add'>+cryptographic operations, the kernel crypto API also knows compression</div><div class='add'>+transformations and handles them the same way as ciphers.</div><div class='add'>+</div><div class='add'>+The kernel crypto API serves the following entity types:</div><div class='add'>+</div><div class='add'>+-  consumers requesting cryptographic services</div><div class='add'>+</div><div class='add'>+-  data transformation implementations (typically ciphers) that can be</div><div class='add'>+   called by consumers using the kernel crypto API</div><div class='add'>+</div><div class='add'>+This specification is intended for consumers of the kernel crypto API as</div><div class='add'>+well as for developers implementing ciphers. This API specification,</div><div class='add'>+however, does not discuss all API calls available to data transformation</div><div class='add'>+implementations (i.e. implementations of ciphers and other</div><div class='add'>+transformations (such as CRC or even compression algorithms) that can</div><div class='add'>+register with the kernel crypto API).</div><div class='add'>+</div><div class='add'>+Note: The terms "transformation" and cipher algorithm are used</div><div class='add'>+interchangeably.</div><div class='add'>+</div><div class='add'>+Terminology</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The transformation implementation is an actual code or interface to</div><div class='add'>+hardware which implements a certain transformation with precisely</div><div class='add'>+defined behavior.</div><div class='add'>+</div><div class='add'>+The transformation object (TFM) is an instance of a transformation</div><div class='add'>+implementation. There can be multiple transformation objects associated</div><div class='add'>+with a single transformation implementation. Each of those</div><div class='add'>+transformation objects is held by a crypto API consumer or another</div><div class='add'>+transformation. Transformation object is allocated when a crypto API</div><div class='add'>+consumer requests a transformation implementation. The consumer is then</div><div class='add'>+provided with a structure, which contains a transformation object (TFM).</div><div class='add'>+</div><div class='add'>+The structure that contains transformation objects may also be referred</div><div class='add'>+to as a "cipher handle". Such a cipher handle is always subject to the</div><div class='add'>+following phases that are reflected in the API calls applicable to such</div><div class='add'>+a cipher handle:</div><div class='add'>+</div><div class='add'>+1. Initialization of a cipher handle.</div><div class='add'>+</div><div class='add'>+2. Execution of all intended cipher operations applicable for the handle</div><div class='add'>+   where the cipher handle must be furnished to every API call.</div><div class='add'>+</div><div class='add'>+3. Destruction of a cipher handle.</div><div class='add'>+</div><div class='add'>+When using the initialization API calls, a cipher handle is created and</div><div class='add'>+returned to the consumer. Therefore, please refer to all initialization</div><div class='add'>+API calls that refer to the data structure type a consumer is expected</div><div class='add'>+to receive and subsequently to use. The initialization API calls have</div><div class='add'>+all the same naming conventions of crypto_alloc\*.</div><div class='add'>+</div><div class='add'>+The transformation context is private data associated with the</div><div class='add'>+transformation object.</div><div class='head'>diff --git a/Documentation/crypto/userspace-if.rst b/Documentation/crypto/userspace-if.rst<br/>new file mode 100644<br/>index 000000000000..de5a72e32bc9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/crypto/userspace-if.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/crypto/userspace-if.rst</a></div><div class='hunk'>@@ -0,0 +1,387 @@</div><div class='add'>+User Space Interface</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+The concepts of the kernel crypto API visible to kernel space is fully</div><div class='add'>+applicable to the user space interface as well. Therefore, the kernel</div><div class='add'>+crypto API high level discussion for the in-kernel use cases applies</div><div class='add'>+here as well.</div><div class='add'>+</div><div class='add'>+The major difference, however, is that user space can only act as a</div><div class='add'>+consumer and never as a provider of a transformation or cipher</div><div class='add'>+algorithm.</div><div class='add'>+</div><div class='add'>+The following covers the user space interface exported by the kernel</div><div class='add'>+crypto API. A working example of this description is libkcapi that can</div><div class='add'>+be obtained from [1]. That library can be used by user space</div><div class='add'>+applications that require cryptographic services from the kernel.</div><div class='add'>+</div><div class='add'>+Some details of the in-kernel kernel crypto API aspects do not apply to</div><div class='add'>+user space, however. This includes the difference between synchronous</div><div class='add'>+and asynchronous invocations. The user space API call is fully</div><div class='add'>+synchronous.</div><div class='add'>+</div><div class='add'>+[1] http://www.chronox.de/libkcapi.html</div><div class='add'>+</div><div class='add'>+User Space API General Remarks</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+The kernel crypto API is accessible from user space. Currently, the</div><div class='add'>+following ciphers are accessible:</div><div class='add'>+</div><div class='add'>+-  Message digest including keyed message digest (HMAC, CMAC)</div><div class='add'>+</div><div class='add'>+-  Symmetric ciphers</div><div class='add'>+</div><div class='add'>+-  AEAD ciphers</div><div class='add'>+</div><div class='add'>+-  Random Number Generators</div><div class='add'>+</div><div class='add'>+The interface is provided via socket type using the type AF_ALG. In</div><div class='add'>+addition, the setsockopt option type is SOL_ALG. In case the user space</div><div class='add'>+header files do not export these flags yet, use the following macros:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    #ifndef AF_ALG</div><div class='add'>+    #define AF_ALG 38</div><div class='add'>+    #endif</div><div class='add'>+    #ifndef SOL_ALG</div><div class='add'>+    #define SOL_ALG 279</div><div class='add'>+    #endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+A cipher is accessed with the same name as done for the in-kernel API</div><div class='add'>+calls. This includes the generic vs. unique naming schema for ciphers as</div><div class='add'>+well as the enforcement of priorities for generic names.</div><div class='add'>+</div><div class='add'>+To interact with the kernel crypto API, a socket must be created by the</div><div class='add'>+user space application. User space invokes the cipher operation with the</div><div class='add'>+send()/write() system call family. The result of the cipher operation is</div><div class='add'>+obtained with the read()/recv() system call family.</div><div class='add'>+</div><div class='add'>+The following API calls assume that the socket descriptor is already</div><div class='add'>+opened by the user space application and discusses only the kernel</div><div class='add'>+crypto API specific invocations.</div><div class='add'>+</div><div class='add'>+To initialize the socket interface, the following sequence has to be</div><div class='add'>+performed by the consumer:</div><div class='add'>+</div><div class='add'>+1. Create a socket of type AF_ALG with the struct sockaddr_alg</div><div class='add'>+   parameter specified below for the different cipher types.</div><div class='add'>+</div><div class='add'>+2. Invoke bind with the socket descriptor</div><div class='add'>+</div><div class='add'>+3. Invoke accept with the socket descriptor. The accept system call</div><div class='add'>+   returns a new file descriptor that is to be used to interact with the</div><div class='add'>+   particular cipher instance. When invoking send/write or recv/read</div><div class='add'>+   system calls to send data to the kernel or obtain data from the</div><div class='add'>+   kernel, the file descriptor returned by accept must be used.</div><div class='add'>+</div><div class='add'>+In-place Cipher operation</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+Just like the in-kernel operation of the kernel crypto API, the user</div><div class='add'>+space interface allows the cipher operation in-place. That means that</div><div class='add'>+the input buffer used for the send/write system call and the output</div><div class='add'>+buffer used by the read/recv system call may be one and the same. This</div><div class='add'>+is of particular interest for symmetric cipher operations where a</div><div class='add'>+copying of the output data to its final destination can be avoided.</div><div class='add'>+</div><div class='add'>+If a consumer on the other hand wants to maintain the plaintext and the</div><div class='add'>+ciphertext in different memory locations, all a consumer needs to do is</div><div class='add'>+to provide different memory pointers for the encryption and decryption</div><div class='add'>+operation.</div><div class='add'>+</div><div class='add'>+Message Digest API</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+The message digest type to be used for the cipher operation is selected</div><div class='add'>+when invoking the bind syscall. bind requires the caller to provide a</div><div class='add'>+filled struct sockaddr data structure. This data structure must be</div><div class='add'>+filled as follows:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    struct sockaddr_alg sa = {</div><div class='add'>+        .salg_family = AF_ALG,</div><div class='add'>+        .salg_type = "hash", /* this selects the hash logic in the kernel */</div><div class='add'>+        .salg_name = "sha1" /* this is the cipher name */</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The salg_type value "hash" applies to message digests and keyed message</div><div class='add'>+digests. Though, a keyed message digest is referenced by the appropriate</div><div class='add'>+salg_name. Please see below for the setsockopt interface that explains</div><div class='add'>+how the key can be set for a keyed message digest.</div><div class='add'>+</div><div class='add'>+Using the send() system call, the application provides the data that</div><div class='add'>+should be processed with the message digest. The send system call allows</div><div class='add'>+the following flags to be specified:</div><div class='add'>+</div><div class='add'>+-  MSG_MORE: If this flag is set, the send system call acts like a</div><div class='add'>+   message digest update function where the final hash is not yet</div><div class='add'>+   calculated. If the flag is not set, the send system call calculates</div><div class='add'>+   the final message digest immediately.</div><div class='add'>+</div><div class='add'>+With the recv() system call, the application can read the message digest</div><div class='add'>+from the kernel crypto API. If the buffer is too small for the message</div><div class='add'>+digest, the flag MSG_TRUNC is set by the kernel.</div><div class='add'>+</div><div class='add'>+In order to set a message digest key, the calling application must use</div><div class='add'>+the setsockopt() option of ALG_SET_KEY. If the key is not set the HMAC</div><div class='add'>+operation is performed without the initial HMAC state change caused by</div><div class='add'>+the key.</div><div class='add'>+</div><div class='add'>+Symmetric Cipher API</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+The operation is very similar to the message digest discussion. During</div><div class='add'>+initialization, the struct sockaddr data structure must be filled as</div><div class='add'>+follows:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    struct sockaddr_alg sa = {</div><div class='add'>+        .salg_family = AF_ALG,</div><div class='add'>+        .salg_type = "skcipher", /* this selects the symmetric cipher */</div><div class='add'>+        .salg_name = "cbc(aes)" /* this is the cipher name */</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Before data can be sent to the kernel using the write/send system call</div><div class='add'>+family, the consumer must set the key. The key setting is described with</div><div class='add'>+the setsockopt invocation below.</div><div class='add'>+</div><div class='add'>+Using the sendmsg() system call, the application provides the data that</div><div class='add'>+should be processed for encryption or decryption. In addition, the IV is</div><div class='add'>+specified with the data structure provided by the sendmsg() system call.</div><div class='add'>+</div><div class='add'>+The sendmsg system call parameter of struct msghdr is embedded into the</div><div class='add'>+struct cmsghdr data structure. See recv(2) and cmsg(3) for more</div><div class='add'>+information on how the cmsghdr data structure is used together with the</div><div class='add'>+send/recv system call family. That cmsghdr data structure holds the</div><div class='add'>+following information specified with a separate header instances:</div><div class='add'>+</div><div class='add'>+-  specification of the cipher operation type with one of these flags:</div><div class='add'>+</div><div class='add'>+   -  ALG_OP_ENCRYPT - encryption of data</div><div class='add'>+</div><div class='add'>+   -  ALG_OP_DECRYPT - decryption of data</div><div class='add'>+</div><div class='add'>+-  specification of the IV information marked with the flag ALG_SET_IV</div><div class='add'>+</div><div class='add'>+The send system call family allows the following flag to be specified:</div><div class='add'>+</div><div class='add'>+-  MSG_MORE: If this flag is set, the send system call acts like a</div><div class='add'>+   cipher update function where more input data is expected with a</div><div class='add'>+   subsequent invocation of the send system call.</div><div class='add'>+</div><div class='add'>+Note: The kernel reports -EINVAL for any unexpected data. The caller</div><div class='add'>+must make sure that all data matches the constraints given in</div><div class='add'>+/proc/crypto for the selected cipher.</div><div class='add'>+</div><div class='add'>+With the recv() system call, the application can read the result of the</div><div class='add'>+cipher operation from the kernel crypto API. The output buffer must be</div><div class='add'>+at least as large as to hold all blocks of the encrypted or decrypted</div><div class='add'>+data. If the output data size is smaller, only as many blocks are</div><div class='add'>+returned that fit into that output buffer size.</div><div class='add'>+</div><div class='add'>+AEAD Cipher API</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+The operation is very similar to the symmetric cipher discussion. During</div><div class='add'>+initialization, the struct sockaddr data structure must be filled as</div><div class='add'>+follows:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    struct sockaddr_alg sa = {</div><div class='add'>+        .salg_family = AF_ALG,</div><div class='add'>+        .salg_type = "aead", /* this selects the symmetric cipher */</div><div class='add'>+        .salg_name = "gcm(aes)" /* this is the cipher name */</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Before data can be sent to the kernel using the write/send system call</div><div class='add'>+family, the consumer must set the key. The key setting is described with</div><div class='add'>+the setsockopt invocation below.</div><div class='add'>+</div><div class='add'>+In addition, before data can be sent to the kernel using the write/send</div><div class='add'>+system call family, the consumer must set the authentication tag size.</div><div class='add'>+To set the authentication tag size, the caller must use the setsockopt</div><div class='add'>+invocation described below.</div><div class='add'>+</div><div class='add'>+Using the sendmsg() system call, the application provides the data that</div><div class='add'>+should be processed for encryption or decryption. In addition, the IV is</div><div class='add'>+specified with the data structure provided by the sendmsg() system call.</div><div class='add'>+</div><div class='add'>+The sendmsg system call parameter of struct msghdr is embedded into the</div><div class='add'>+struct cmsghdr data structure. See recv(2) and cmsg(3) for more</div><div class='add'>+information on how the cmsghdr data structure is used together with the</div><div class='add'>+send/recv system call family. That cmsghdr data structure holds the</div><div class='add'>+following information specified with a separate header instances:</div><div class='add'>+</div><div class='add'>+-  specification of the cipher operation type with one of these flags:</div><div class='add'>+</div><div class='add'>+   -  ALG_OP_ENCRYPT - encryption of data</div><div class='add'>+</div><div class='add'>+   -  ALG_OP_DECRYPT - decryption of data</div><div class='add'>+</div><div class='add'>+-  specification of the IV information marked with the flag ALG_SET_IV</div><div class='add'>+</div><div class='add'>+-  specification of the associated authentication data (AAD) with the</div><div class='add'>+   flag ALG_SET_AEAD_ASSOCLEN. The AAD is sent to the kernel together</div><div class='add'>+   with the plaintext / ciphertext. See below for the memory structure.</div><div class='add'>+</div><div class='add'>+The send system call family allows the following flag to be specified:</div><div class='add'>+</div><div class='add'>+-  MSG_MORE: If this flag is set, the send system call acts like a</div><div class='add'>+   cipher update function where more input data is expected with a</div><div class='add'>+   subsequent invocation of the send system call.</div><div class='add'>+</div><div class='add'>+Note: The kernel reports -EINVAL for any unexpected data. The caller</div><div class='add'>+must make sure that all data matches the constraints given in</div><div class='add'>+/proc/crypto for the selected cipher.</div><div class='add'>+</div><div class='add'>+With the recv() system call, the application can read the result of the</div><div class='add'>+cipher operation from the kernel crypto API. The output buffer must be</div><div class='add'>+at least as large as defined with the memory structure below. If the</div><div class='add'>+output data size is smaller, the cipher operation is not performed.</div><div class='add'>+</div><div class='add'>+The authenticated decryption operation may indicate an integrity error.</div><div class='add'>+Such breach in integrity is marked with the -EBADMSG error code.</div><div class='add'>+</div><div class='add'>+AEAD Memory Structure</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The AEAD cipher operates with the following information that is</div><div class='add'>+communicated between user and kernel space as one data stream:</div><div class='add'>+</div><div class='add'>+-  plaintext or ciphertext</div><div class='add'>+</div><div class='add'>+-  associated authentication data (AAD)</div><div class='add'>+</div><div class='add'>+-  authentication tag</div><div class='add'>+</div><div class='add'>+The sizes of the AAD and the authentication tag are provided with the</div><div class='add'>+sendmsg and setsockopt calls (see there). As the kernel knows the size</div><div class='add'>+of the entire data stream, the kernel is now able to calculate the right</div><div class='add'>+offsets of the data components in the data stream.</div><div class='add'>+</div><div class='add'>+The user space caller must arrange the aforementioned information in the</div><div class='add'>+following order:</div><div class='add'>+</div><div class='add'>+-  AEAD encryption input: AAD \|\| plaintext</div><div class='add'>+</div><div class='add'>+-  AEAD decryption input: AAD \|\| ciphertext \|\| authentication tag</div><div class='add'>+</div><div class='add'>+The output buffer the user space caller provides must be at least as</div><div class='add'>+large to hold the following data:</div><div class='add'>+</div><div class='add'>+-  AEAD encryption output: ciphertext \|\| authentication tag</div><div class='add'>+</div><div class='add'>+-  AEAD decryption output: plaintext</div><div class='add'>+</div><div class='add'>+Random Number Generator API</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+Again, the operation is very similar to the other APIs. During</div><div class='add'>+initialization, the struct sockaddr data structure must be filled as</div><div class='add'>+follows:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    struct sockaddr_alg sa = {</div><div class='add'>+        .salg_family = AF_ALG,</div><div class='add'>+        .salg_type = "rng", /* this selects the symmetric cipher */</div><div class='add'>+        .salg_name = "drbg_nopr_sha256" /* this is the cipher name */</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Depending on the RNG type, the RNG must be seeded. The seed is provided</div><div class='add'>+using the setsockopt interface to set the key. For example, the</div><div class='add'>+ansi_cprng requires a seed. The DRBGs do not require a seed, but may be</div><div class='add'>+seeded.</div><div class='add'>+</div><div class='add'>+Using the read()/recvmsg() system calls, random numbers can be obtained.</div><div class='add'>+The kernel generates at most 128 bytes in one call. If user space</div><div class='add'>+requires more data, multiple calls to read()/recvmsg() must be made.</div><div class='add'>+</div><div class='add'>+WARNING: The user space caller may invoke the initially mentioned accept</div><div class='add'>+system call multiple times. In this case, the returned file descriptors</div><div class='add'>+have the same state.</div><div class='add'>+</div><div class='add'>+Zero-Copy Interface</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+In addition to the send/write/read/recv system call family, the AF_ALG</div><div class='add'>+interface can be accessed with the zero-copy interface of</div><div class='add'>+splice/vmsplice. As the name indicates, the kernel tries to avoid a copy</div><div class='add'>+operation into kernel space.</div><div class='add'>+</div><div class='add'>+The zero-copy operation requires data to be aligned at the page</div><div class='add'>+boundary. Non-aligned data can be used as well, but may require more</div><div class='add'>+operations of the kernel which would defeat the speed gains obtained</div><div class='add'>+from the zero-copy interface.</div><div class='add'>+</div><div class='add'>+The system-interent limit for the size of one zero-copy operation is 16</div><div class='add'>+pages. If more data is to be sent to AF_ALG, user space must slice the</div><div class='add'>+input into segments with a maximum size of 16 pages.</div><div class='add'>+</div><div class='add'>+Zero-copy can be used with the following code example (a complete</div><div class='add'>+working example is provided with libkcapi):</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    int pipes[2];</div><div class='add'>+</div><div class='add'>+    pipe(pipes);</div><div class='add'>+    /* input data in iov */</div><div class='add'>+    vmsplice(pipes[1], iov, iovlen, SPLICE_F_GIFT);</div><div class='add'>+    /* opfd is the file descriptor returned from accept() system call */</div><div class='add'>+    splice(pipes[0], NULL, opfd, NULL, ret, 0);</div><div class='add'>+    read(opfd, out, outlen);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Setsockopt Interface</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+In addition to the read/recv and send/write system call handling to send</div><div class='add'>+and retrieve data subject to the cipher operation, a consumer also needs</div><div class='add'>+to set the additional information for the cipher operation. This</div><div class='add'>+additional information is set using the setsockopt system call that must</div><div class='add'>+be invoked with the file descriptor of the open cipher (i.e. the file</div><div class='add'>+descriptor returned by the accept system call).</div><div class='add'>+</div><div class='add'>+Each setsockopt invocation must use the level SOL_ALG.</div><div class='add'>+</div><div class='add'>+The setsockopt interface allows setting the following data using the</div><div class='add'>+mentioned optname:</div><div class='add'>+</div><div class='add'>+-  ALG_SET_KEY -- Setting the key. Key setting is applicable to:</div><div class='add'>+</div><div class='add'>+   -  the skcipher cipher type (symmetric ciphers)</div><div class='add'>+</div><div class='add'>+   -  the hash cipher type (keyed message digests)</div><div class='add'>+</div><div class='add'>+   -  the AEAD cipher type</div><div class='add'>+</div><div class='add'>+   -  the RNG cipher type to provide the seed</div><div class='add'>+</div><div class='add'>+-  ALG_SET_AEAD_AUTHSIZE -- Setting the authentication tag size for</div><div class='add'>+   AEAD ciphers. For a encryption operation, the authentication tag of</div><div class='add'>+   the given size will be generated. For a decryption operation, the</div><div class='add'>+   provided ciphertext is assumed to contain an authentication tag of</div><div class='add'>+   the given size (see section about AEAD memory layout below).</div><div class='add'>+</div><div class='add'>+User space API example</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+Please see [1] for libkcapi which provides an easy-to-use wrapper around</div><div class='add'>+the aforementioned Netlink kernel interface. [1] also contains a test</div><div class='add'>+application that invokes all libkcapi API calls.</div><div class='add'>+</div><div class='add'>+[1] http://www.chronox.de/libkcapi.html</div><div class='head'>diff --git a/Documentation/dev-tools/conf.py b/Documentation/dev-tools/conf.py<br/>new file mode 100644<br/>index 000000000000..7faafa3f7888<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/dev-tools/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dev-tools/conf.py</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# -*- coding: utf-8; mode: python -*-</div><div class='add'>+</div><div class='add'>+project = "Development tools for the kernel"</div><div class='add'>+</div><div class='add'>+tags.add("subproject")</div><div class='add'>+</div><div class='add'>+latex_documents = [</div><div class='add'>+    ('index', 'dev-tools.tex', project,</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+]</div><div class='head'>diff --git a/Documentation/dev-tools/gcov.rst b/Documentation/dev-tools/gcov.rst<br/>index 19eedfea8800..69a7d90c320a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/dev-tools/gcov.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/dev-tools/gcov.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/dev-tools/gcov.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dev-tools/gcov.rst</a></div><div class='hunk'>@@ -201,7 +201,9 @@ Appendix A: gather_on_build.sh</div><div class='ctx'> ------------------------------</div><div class='ctx'> </div><div class='ctx'> Sample script to gather coverage meta files on the build machine</div><div class='del'>-(see 6a)::</div><div class='add'>+(see 6a):</div><div class='add'>+</div><div class='add'>+.. code-block:: sh</div><div class='ctx'> </div><div class='ctx'>     #!/bin/bash</div><div class='ctx'> </div><div class='hunk'>@@ -232,7 +234,9 @@ Appendix B: gather_on_test.sh</div><div class='ctx'> -----------------------------</div><div class='ctx'> </div><div class='ctx'> Sample script to gather coverage data files on the test machine</div><div class='del'>-(see 6b)::</div><div class='add'>+(see 6b):</div><div class='add'>+</div><div class='add'>+.. code-block:: sh</div><div class='ctx'> </div><div class='ctx'>     #!/bin/bash -e</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/dev-tools/index.rst b/Documentation/dev-tools/index.rst<br/>new file mode 100644<br/>index 000000000000..07d881147ef3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/dev-tools/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dev-tools/index.rst</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+================================</div><div class='add'>+Development tools for the kernel</div><div class='add'>+================================</div><div class='add'>+</div><div class='add'>+This document is a collection of documents about development tools that can</div><div class='add'>+be used to work on the kernel.  For now, the documents have been pulled</div><div class='add'>+together without any significant effot to integrate them into a coherent</div><div class='add'>+whole; patches welcome!</div><div class='add'>+</div><div class='add'>+.. class:: toc-title</div><div class='add'>+</div><div class='add'>+	   Table of contents</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   coccinelle</div><div class='add'>+   sparse</div><div class='add'>+   kcov</div><div class='add'>+   gcov</div><div class='add'>+   kasan</div><div class='add'>+   ubsan</div><div class='add'>+   kmemleak</div><div class='add'>+   kmemcheck</div><div class='add'>+   gdb-kernel-debugging</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/dev-tools/kcov.rst b/Documentation/dev-tools/kcov.rst<br/>index aca0e27ca197..2c41b713841f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/dev-tools/kcov.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/dev-tools/kcov.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/dev-tools/kcov.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dev-tools/kcov.rst</a></div><div class='hunk'>@@ -24,7 +24,9 @@ Profiling data will only become accessible once debugfs has been mounted::</div><div class='ctx'> </div><div class='ctx'>         mount -t debugfs none /sys/kernel/debug</div><div class='ctx'> </div><div class='del'>-The following program demonstrates kcov usage from within a test program::</div><div class='add'>+The following program demonstrates kcov usage from within a test program:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='ctx'> </div><div class='ctx'>     #include &lt;stdio.h&gt;</div><div class='ctx'>     #include &lt;stddef.h&gt;</div><div class='head'>diff --git a/Documentation/dev-tools/sparse.rst b/Documentation/dev-tools/sparse.rst<br/>index 8c250e8a2105..ffdcc97f6f5a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/dev-tools/sparse.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/dev-tools/sparse.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/dev-tools/sparse.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dev-tools/sparse.rst</a></div><div class='hunk'>@@ -51,13 +51,6 @@ sure that bitwise types don't get mixed up (little-endian vs big-endian</div><div class='ctx'> vs cpu-endian vs whatever), and there the constant "0" really _is_</div><div class='ctx'> special.</div><div class='ctx'> </div><div class='del'>-__bitwise__ - to be used for relatively compact stuff (gfp_t, etc.) that</div><div class='del'>-is mostly warning-free and is supposed to stay that way.  Warnings will</div><div class='del'>-be generated without __CHECK_ENDIAN__.</div><div class='del'>-</div><div class='del'>-__bitwise - noisy stuff; in particular, __le*/__be* are that.  We really</div><div class='del'>-don't want to drown in noise unless we'd explicitly asked for it.</div><div class='del'>-</div><div class='ctx'> Using sparse for lock checking</div><div class='ctx'> ------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -109,9 +102,10 @@ be recompiled or not.  The latter is a fast way to check the whole tree if you</div><div class='ctx'> have already built it.</div><div class='ctx'> </div><div class='ctx'> The optional make variable CF can be used to pass arguments to sparse.  The</div><div class='del'>-build system passes -Wbitwise to sparse automatically.  To perform endianness</div><div class='del'>-checks, you may define __CHECK_ENDIAN__::</div><div class='add'>+build system passes -Wbitwise to sparse automatically.</div><div class='ctx'> </div><div class='del'>-        make C=2 CF="-D__CHECK_ENDIAN__"</div><div class='add'>+Checking RCU annotations</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='del'>-These checks are disabled by default as they generate a host of warnings.</div><div class='add'>+RCU annotations are not checked by default.  To enable RCU annotation</div><div class='add'>+checks, include -DCONFIG_SPARSE_RCU_POINTER in your CF flags.</div><div class='head'>diff --git a/Documentation/dev-tools/tools.rst b/Documentation/dev-tools/tools.rst<br/>deleted file mode 100644<br/>index 824ae8e54dd5..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/dev-tools/tools.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/dev-tools/tools.rst</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-================================</div><div class='del'>-Development tools for the kernel</div><div class='del'>-================================</div><div class='del'>-</div><div class='del'>-This document is a collection of documents about development tools that can</div><div class='del'>-be used to work on the kernel.  For now, the documents have been pulled</div><div class='del'>-together without any significant effot to integrate them into a coherent</div><div class='del'>-whole; patches welcome!</div><div class='del'>-</div><div class='del'>-.. class:: toc-title</div><div class='del'>-</div><div class='del'>-	   Table of contents</div><div class='del'>-</div><div class='del'>-.. toctree::</div><div class='del'>-   :maxdepth: 2</div><div class='del'>-</div><div class='del'>-   coccinelle</div><div class='del'>-   sparse</div><div class='del'>-   kcov</div><div class='del'>-   gcov</div><div class='del'>-   kasan</div><div class='del'>-   ubsan</div><div class='del'>-   kmemleak</div><div class='del'>-   kmemcheck</div><div class='del'>-   gdb-kernel-debugging</div><div class='head'>diff --git a/Documentation/development-process/conf.py b/Documentation/development-process/conf.py<br/>deleted file mode 100644<br/>index 4b4a12dace02..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/development-process/conf.py?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/development-process/conf.py</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-# -*- coding: utf-8; mode: python -*-</div><div class='del'>-</div><div class='del'>-project = 'Linux Kernel Development Documentation'</div><div class='del'>-</div><div class='del'>-tags.add("subproject")</div><div class='del'>-</div><div class='del'>-latex_documents = [</div><div class='del'>-    ('index', 'development-process.tex', 'Linux Kernel Development Documentation',</div><div class='del'>-     'The kernel development community', 'manual'),</div><div class='del'>-]</div><div class='head'>diff --git a/Documentation/development-process/index.rst b/Documentation/development-process/index.rst<br/>deleted file mode 100644<br/>index c37475d91090..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/development-process/index.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/development-process/index.rst</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-Linux Kernel Development Documentation</div><div class='del'>-======================================</div><div class='del'>-</div><div class='del'>-Contents:</div><div class='del'>-</div><div class='del'>-.. toctree::</div><div class='del'>-   :maxdepth: 2</div><div class='del'>-</div><div class='del'>-   development-process</div><div class='head'>diff --git a/Documentation/device-mapper/cache.txt b/Documentation/device-mapper/cache.txt<br/>index 785eab87aa71..f228604ddbcd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/device-mapper/cache.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/device-mapper/cache.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/device-mapper/cache.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/cache.txt</a></div><div class='hunk'>@@ -207,6 +207,10 @@ Optional feature arguments are:</div><div class='ctx'> 		   block, then the cache block is invalidated.</div><div class='ctx'> 		   To enable passthrough mode the cache must be clean.</div><div class='ctx'> </div><div class='add'>+   metadata2	: use version 2 of the metadata.  This stores the dirty bits</div><div class='add'>+                  in a separate btree, which improves speed of shutting</div><div class='add'>+		  down the cache.</div><div class='add'>+</div><div class='ctx'> A policy called 'default' is always registered.  This is an alias for</div><div class='ctx'> the policy we currently think is giving best all round performance.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/device-mapper/delay.txt b/Documentation/device-mapper/delay.txt<br/>index a07b5927f4a8..4b1d22a44ce4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/device-mapper/delay.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/device-mapper/delay.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/device-mapper/delay.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/delay.txt</a></div><div class='hunk'>@@ -16,12 +16,12 @@ Example scripts</div><div class='ctx'> [[</div><div class='ctx'> #!/bin/sh</div><div class='ctx'> # Create device delaying rw operation for 500ms</div><div class='del'>-echo "0 `blockdev --getsize $1` delay $1 0 500" | dmsetup create delayed</div><div class='add'>+echo "0 `blockdev --getsz $1` delay $1 0 500" | dmsetup create delayed</div><div class='ctx'> ]]</div><div class='ctx'> </div><div class='ctx'> [[</div><div class='ctx'> #!/bin/sh</div><div class='ctx'> # Create device delaying only write operation for 500ms and</div><div class='ctx'> # splitting reads and writes to different devices $1 $2</div><div class='del'>-echo "0 `blockdev --getsize $1` delay $1 0 0 $2 0 500" | dmsetup create delayed</div><div class='add'>+echo "0 `blockdev --getsz $1` delay $1 0 0 $2 0 500" | dmsetup create delayed</div><div class='ctx'> ]]</div><div class='head'>diff --git a/Documentation/device-mapper/dm-crypt.txt b/Documentation/device-mapper/dm-crypt.txt<br/>index 692171fe9da0..ff1f87bf26e8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/device-mapper/dm-crypt.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/device-mapper/dm-crypt.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/device-mapper/dm-crypt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/dm-crypt.txt</a></div><div class='hunk'>@@ -21,13 +21,30 @@ Parameters: &lt;cipher&gt; &lt;key&gt; &lt;iv_offset&gt; &lt;device path&gt; \</div><div class='ctx'>     /proc/crypto contains supported crypto modes</div><div class='ctx'> </div><div class='ctx'> &lt;key&gt;</div><div class='del'>-    Key used for encryption. It is encoded as a hexadecimal number.</div><div class='add'>+    Key used for encryption. It is encoded either as a hexadecimal number</div><div class='add'>+    or it can be passed as &lt;key_string&gt; prefixed with single colon</div><div class='add'>+    character (':') for keys residing in kernel keyring service.</div><div class='ctx'>     You can only use key sizes that are valid for the selected cipher</div><div class='ctx'>     in combination with the selected iv mode.</div><div class='ctx'>     Note that for some iv modes the key string can contain additional</div><div class='ctx'>     keys (for example IV seed) so the key contains more parts concatenated</div><div class='ctx'>     into a single string.</div><div class='ctx'> </div><div class='add'>+&lt;key_string&gt;</div><div class='add'>+    The kernel keyring key is identified by string in following format:</div><div class='add'>+    &lt;key_size&gt;:&lt;key_type&gt;:&lt;key_description&gt;.</div><div class='add'>+</div><div class='add'>+&lt;key_size&gt;</div><div class='add'>+    The encryption key size in bytes. The kernel key payload size must match</div><div class='add'>+    the value passed in &lt;key_size&gt;.</div><div class='add'>+</div><div class='add'>+&lt;key_type&gt;</div><div class='add'>+    Either 'logon' or 'user' kernel key type.</div><div class='add'>+</div><div class='add'>+&lt;key_description&gt;</div><div class='add'>+    The kernel keyring key description crypt target should look for</div><div class='add'>+    when loading key of &lt;key_type&gt;.</div><div class='add'>+</div><div class='ctx'> &lt;keycount&gt;</div><div class='ctx'>     Multi-key compatibility mode. You can define &lt;keycount&gt; keys and</div><div class='ctx'>     then sectors are encrypted according to their offsets (sector 0 uses key0;</div><div class='hunk'>@@ -85,7 +102,13 @@ https://gitlab.com/cryptsetup/cryptsetup</div><div class='ctx'> [[</div><div class='ctx'> #!/bin/sh</div><div class='ctx'> # Create a crypt device using dmsetup</div><div class='del'>-dmsetup create crypt1 --table "0 `blockdev --getsize $1` crypt aes-cbc-essiv:sha256 babebabebabebabebabebabebabebabe 0 $1 0"</div><div class='add'>+dmsetup create crypt1 --table "0 `blockdev --getsz $1` crypt aes-cbc-essiv:sha256 babebabebabebabebabebabebabebabe 0 $1 0"</div><div class='add'>+]]</div><div class='add'>+</div><div class='add'>+[[</div><div class='add'>+#!/bin/sh</div><div class='add'>+# Create a crypt device using dmsetup when encryption key is stored in keyring service</div><div class='add'>+dmsetup create crypt2 --table "0 `blockdev --getsize $1` crypt aes-cbc-essiv:sha256 :32:logon:my_prefix:my_key 0 $1 0"</div><div class='ctx'> ]]</div><div class='ctx'> </div><div class='ctx'> [[</div><div class='head'>diff --git a/Documentation/device-mapper/dm-raid.txt b/Documentation/device-mapper/dm-raid.txt<br/>index c75b64a85859..cd2cb2fc85ea 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/device-mapper/dm-raid.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/device-mapper/dm-raid.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/device-mapper/dm-raid.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/dm-raid.txt</a></div><div class='hunk'>@@ -17,7 +17,7 @@ The target is named "raid" and it accepts the following parameters:</div><div class='ctx'>   raid0		RAID0 striping (no resilience)</div><div class='ctx'>   raid1		RAID1 mirroring</div><div class='ctx'>   raid4		RAID4 with dedicated last parity disk</div><div class='del'>-  raid5_n 	RAID5 with dedicated last parity disk suporting takeover</div><div class='add'>+  raid5_n 	RAID5 with dedicated last parity disk supporting takeover</div><div class='ctx'> 		Same as raid4</div><div class='ctx'> 		-Transitory layout</div><div class='ctx'>   raid5_la	RAID5 left asymmetric</div><div class='hunk'>@@ -36,7 +36,7 @@ The target is named "raid" and it accepts the following parameters:</div><div class='ctx'> 		- rotating parity N (right-to-left) with data continuation</div><div class='ctx'>   raid6_n_6	RAID6 with dedicate parity disks</div><div class='ctx'> 		- parity and Q-syndrome on the last 2 disks;</div><div class='del'>-		  laylout for takeover from/to raid4/raid5_n</div><div class='add'>+		  layout for takeover from/to raid4/raid5_n</div><div class='ctx'>   raid6_la_6	Same as "raid_la" plus dedicated last Q-syndrome disk</div><div class='ctx'> 		- layout for takeover from raid5_la from/to raid6</div><div class='ctx'>   raid6_ra_6	Same as "raid5_ra" dedicated last Q-syndrome disk</div><div class='hunk'>@@ -137,8 +137,8 @@ The target is named "raid" and it accepts the following parameters:</div><div class='ctx'> 		device removal (negative value) or device addition (positive</div><div class='ctx'> 		value) to any reshape supporting raid levels 4/5/6 and 10.</div><div class='ctx'> 		RAID levels 4/5/6 allow for addition of devices (metadata</div><div class='del'>-		and data device tupel), raid10_near and raid10_offset only</div><div class='del'>-		allow for device addtion. raid10_far does not support any</div><div class='add'>+		and data device tuple), raid10_near and raid10_offset only</div><div class='add'>+		allow for device addition. raid10_far does not support any</div><div class='ctx'> 		reshaping at all.</div><div class='ctx'> 		A minimum of devices have to be kept to enforce resilience,</div><div class='ctx'> 		which is 3 devices for raid4/5 and 4 devices for raid6.</div><div class='hunk'>@@ -161,6 +161,15 @@ The target is named "raid" and it accepts the following parameters:</div><div class='ctx'> 		the RAID type (i.e. the allocation algorithm) as well, e.g.</div><div class='ctx'> 		changing from raid5_ls to raid5_n.</div><div class='ctx'> </div><div class='add'>+	[journal_dev &lt;dev&gt;]</div><div class='add'>+		This option adds a journal device to raid4/5/6 raid sets and</div><div class='add'>+		uses it to close the 'write hole' caused by the non-atomic updates</div><div class='add'>+		to the component devices which can cause data loss during recovery.</div><div class='add'>+		The journal device is used as writethrough thus causing writes to</div><div class='add'>+		be throttled versus non-journaled raid4/5/6 sets.</div><div class='add'>+		Takeover/reshape is not possible with a raid4/5/6 journal device;</div><div class='add'>+		it has to be deconfigured before requesting these.</div><div class='add'>+</div><div class='ctx'> &lt;#raid_devs&gt;: The number of devices composing the array.</div><div class='ctx'> 	Each device consists of two entries.  The first is the device</div><div class='ctx'> 	containing the metadata (if any); the second is the one containing the</div><div class='hunk'>@@ -242,6 +251,13 @@ recovery.  Here is a fuller description of the individual fields:</div><div class='ctx'> 			in RAID1/10 or wrong parity values found in RAID4/5/6.</div><div class='ctx'> 			This value is valid only after a "check" of the array</div><div class='ctx'> 			is performed.  A healthy array has a 'mismatch_cnt' of 0.</div><div class='add'>+	&lt;data_offset&gt;   The current data offset to the start of the user data on</div><div class='add'>+			each component device of a raid set (see the respective</div><div class='add'>+			raid parameter to support out-of-place reshaping).</div><div class='add'>+	&lt;journal_char&gt;	'A' - active raid4/5/6 journal device.</div><div class='add'>+			'D' - dead journal device.</div><div class='add'>+			'-' - no journal device.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Message Interface</div><div class='ctx'> -----------------</div><div class='hunk'>@@ -303,10 +319,15 @@ Version History</div><div class='ctx'> 1.5.2   'mismatch_cnt' is zero unless [last_]sync_action is "check".</div><div class='ctx'> 1.6.0   Add discard support (and devices_handle_discard_safely module param).</div><div class='ctx'> 1.7.0   Add support for MD RAID0 mappings.</div><div class='del'>-1.8.0   Explictely check for compatible flags in the superblock metadata</div><div class='add'>+1.8.0   Explicitly check for compatible flags in the superblock metadata</div><div class='ctx'> 	and reject to start the raid set if any are set by a newer</div><div class='ctx'> 	target version, thus avoiding data corruption on a raid set</div><div class='ctx'> 	with a reshape in progress.</div><div class='ctx'> 1.9.0   Add support for RAID level takeover/reshape/region size</div><div class='ctx'> 	and set size reduction.</div><div class='ctx'> 1.9.1   Fix activation of existing RAID 4/10 mapped devices</div><div class='add'>+1.9.2   Don't emit '- -' on the status table line in case the constructor</div><div class='add'>+	fails reading a superblock. Correctly emit 'maj:min1 maj:min2' and</div><div class='add'>+	'D' on the status line.  If '- -' is passed into the constructor, emit</div><div class='add'>+	'- -' on the table line and '-' as the status line health character.</div><div class='add'>+1.10.0  Add support for raid4/5/6 journal device</div><div class='head'>diff --git a/Documentation/device-mapper/linear.txt b/Documentation/device-mapper/linear.txt<br/>index d5307d380a45..7cb98d89d3f8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/device-mapper/linear.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/device-mapper/linear.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/device-mapper/linear.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/linear.txt</a></div><div class='hunk'>@@ -16,15 +16,15 @@ Example scripts</div><div class='ctx'> [[</div><div class='ctx'> #!/bin/sh</div><div class='ctx'> # Create an identity mapping for a device</div><div class='del'>-echo "0 `blockdev --getsize $1` linear $1 0" | dmsetup create identity</div><div class='add'>+echo "0 `blockdev --getsz $1` linear $1 0" | dmsetup create identity</div><div class='ctx'> ]]</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> [[</div><div class='ctx'> #!/bin/sh</div><div class='ctx'> # Join 2 devices together</div><div class='del'>-size1=`blockdev --getsize $1`</div><div class='del'>-size2=`blockdev --getsize $2`</div><div class='add'>+size1=`blockdev --getsz $1`</div><div class='add'>+size2=`blockdev --getsz $2`</div><div class='ctx'> echo "0 $size1 linear $1 0</div><div class='ctx'> $size1 $size2 linear $2 0" | dmsetup create joined</div><div class='ctx'> ]]</div><div class='hunk'>@@ -44,7 +44,7 @@ if (!defined($dev)) {</div><div class='ctx'>         die("Please specify a device.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-my $dev_size = `blockdev --getsize $dev`;</div><div class='add'>+my $dev_size = `blockdev --getsz $dev`;</div><div class='ctx'> my $extents = int($dev_size / $extent_size) -</div><div class='ctx'>               (($dev_size % $extent_size) ? 1 : 0);</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/device-mapper/striped.txt b/Documentation/device-mapper/striped.txt<br/>index 45f3b91ea4c3..07ec492cceee 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/device-mapper/striped.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/device-mapper/striped.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/device-mapper/striped.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/striped.txt</a></div><div class='hunk'>@@ -37,9 +37,9 @@ if (!$num_devs) {</div><div class='ctx'>         die("Specify at least one device\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-$min_dev_size = `blockdev --getsize $devs[0]`;</div><div class='add'>+$min_dev_size = `blockdev --getsz $devs[0]`;</div><div class='ctx'> for ($i = 1; $i &lt; $num_devs; $i++) {</div><div class='del'>-        my $this_size = `blockdev --getsize $devs[$i]`;</div><div class='add'>+        my $this_size = `blockdev --getsz $devs[$i]`;</div><div class='ctx'>         $min_dev_size = ($min_dev_size &lt; $this_size) ?</div><div class='ctx'>                         $min_dev_size : $this_size;</div><div class='ctx'> }</div><div class='head'>diff --git a/Documentation/device-mapper/switch.txt b/Documentation/device-mapper/switch.txt<br/>index 424835e57f27..5bd4831db4a8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/device-mapper/switch.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/device-mapper/switch.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/device-mapper/switch.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/device-mapper/switch.txt</a></div><div class='hunk'>@@ -123,7 +123,7 @@ Assume that you have volumes vg1/switch0 vg1/switch1 vg1/switch2 with</div><div class='ctx'> the same size.</div><div class='ctx'> </div><div class='ctx'> Create a switch device with 64kB region size:</div><div class='del'>-    dmsetup create switch --table "0 `blockdev --getsize /dev/vg1/switch0`</div><div class='add'>+    dmsetup create switch --table "0 `blockdev --getsz /dev/vg1/switch0`</div><div class='ctx'> 	switch 3 128 0 /dev/vg1/switch0 0 /dev/vg1/switch1 0 /dev/vg1/switch2 0"</div><div class='ctx'> </div><div class='ctx'> Set mappings for the first 7 entries to point to devices switch0, switch1,</div><div class='head'>diff --git a/Documentation/devices.txt b/Documentation/devices.txt<br/>deleted file mode 100644<br/>index 4035eca87144..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/devices.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devices.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3325 +0,0 @@</div><div class='del'>-</div><div class='del'>-		    LINUX ALLOCATED DEVICES (4.x+ version)</div><div class='del'>-</div><div class='del'>-This list is the Linux Device List, the official registry of allocated</div><div class='del'>-device numbers and /dev directory nodes for the Linux operating</div><div class='del'>-system.</div><div class='del'>-</div><div class='del'>-The LaTeX version of this document is no longer maintained, nor is</div><div class='del'>-the document that used to reside at lanana.org.  This version in the</div><div class='del'>-mainline Linux kernel is the master document.  Updates shall be sent</div><div class='del'>-as patches to the kernel maintainers (see the SubmittingPatches document).</div><div class='del'>-Specifically explore the sections titled "CHAR and MISC DRIVERS", and</div><div class='del'>-"BLOCK LAYER" in the MAINTAINERS file to find the right maintainers</div><div class='del'>-to involve for character and block devices.</div><div class='del'>-</div><div class='del'>-This document is included by reference into the Filesystem Hierarchy</div><div class='del'>-Standard (FHS).	 The FHS is available from http://www.pathname.com/fhs/.</div><div class='del'>-</div><div class='del'>-Allocations marked (68k/Amiga) apply to Linux/68k on the Amiga</div><div class='del'>-platform only.	Allocations marked (68k/Atari) apply to Linux/68k on</div><div class='del'>-the Atari platform only.</div><div class='del'>-</div><div class='del'>-This document is in the public domain.	The authors requests, however,</div><div class='del'>-that semantically altered versions are not distributed without</div><div class='del'>-permission of the authors, assuming the authors can be contacted without</div><div class='del'>-an unreasonable effort.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  **** DEVICE DRIVERS AUTHORS PLEASE READ THIS ****</div><div class='del'>-</div><div class='del'>-Linux now has extensive support for dynamic allocation of device numbering</div><div class='del'>-and can use sysfs and udev (systemd) to handle the naming needs. There are</div><div class='del'>-still some exceptions in the serial and boot device area. Before asking</div><div class='del'>-for a device number make sure you actually need one.</div><div class='del'>-</div><div class='del'>-To have a major number allocated, or a minor number in situations</div><div class='del'>-where that applies (e.g. busmice), please submit a patch and send to</div><div class='del'>-the authors as indicated above.</div><div class='del'>-</div><div class='del'>-Keep the description of the device *in the same format</div><div class='del'>-as this list*.	The reason for this is that it is the only way we have</div><div class='del'>-found to ensure we have all the requisite information to publish your</div><div class='del'>-device and avoid conflicts.</div><div class='del'>-</div><div class='del'>-Finally, sometimes we have to play "namespace police."  Please don't be</div><div class='del'>-offended.  We often get submissions for /dev names that would be bound</div><div class='del'>-to cause conflicts down the road.  We are trying to avoid getting in a</div><div class='del'>-situation where we would have to suffer an incompatible forward</div><div class='del'>-change.  Therefore, please consult with us *before* you make your</div><div class='del'>-device names and numbers in any way public, at least to the point</div><div class='del'>-where it would be at all difficult to get them changed.</div><div class='del'>-</div><div class='del'>-Your cooperation is appreciated.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  0		Unnamed devices (e.g. non-device mounts)</div><div class='del'>-		  0 = reserved as null device number</div><div class='del'>-		See block major 144, 145, 146 for expansion areas.</div><div class='del'>-</div><div class='del'>-  1 char	Memory devices</div><div class='del'>-		  1 = /dev/mem		Physical memory access</div><div class='del'>-		  2 = /dev/kmem		Kernel virtual memory access</div><div class='del'>-		  3 = /dev/null		Null device</div><div class='del'>-		  4 = /dev/port		I/O port access</div><div class='del'>-		  5 = /dev/zero		Null byte source</div><div class='del'>-		  6 = /dev/core		OBSOLETE - replaced by /proc/kcore</div><div class='del'>-		  7 = /dev/full		Returns ENOSPC on write</div><div class='del'>-		  8 = /dev/random	Nondeterministic random number gen.</div><div class='del'>-		  9 = /dev/urandom	Faster, less secure random number gen.</div><div class='del'>-		 10 = /dev/aio		Asynchronous I/O notification interface</div><div class='del'>-		 11 = /dev/kmsg		Writes to this come out as printk's, reads</div><div class='del'>-					export the buffered printk records.</div><div class='del'>-		 12 = /dev/oldmem	OBSOLETE - replaced by /proc/vmcore</div><div class='del'>-</div><div class='del'>-  1 block	RAM disk</div><div class='del'>-		  0 = /dev/ram0		First RAM disk</div><div class='del'>-		  1 = /dev/ram1		Second RAM disk</div><div class='del'>-		    ...</div><div class='del'>-		250 = /dev/initrd	Initial RAM disk</div><div class='del'>-</div><div class='del'>-		Older kernels had /dev/ramdisk (1, 1) here.</div><div class='del'>-		/dev/initrd refers to a RAM disk which was preloaded</div><div class='del'>-		by the boot loader; newer kernels use /dev/ram0 for</div><div class='del'>-		the initrd.</div><div class='del'>-</div><div class='del'>-  2 char	Pseudo-TTY masters</div><div class='del'>-		  0 = /dev/ptyp0	First PTY master</div><div class='del'>-		  1 = /dev/ptyp1	Second PTY master</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/ptyef	256th PTY master</div><div class='del'>-</div><div class='del'>-		Pseudo-tty's are named as follows:</div><div class='del'>-		* Masters are "pty", slaves are "tty";</div><div class='del'>-		* the fourth letter is one of pqrstuvwxyzabcde indicating</div><div class='del'>-		  the 1st through 16th series of 16 pseudo-ttys each, and</div><div class='del'>-		* the fifth letter is one of 0123456789abcdef indicating</div><div class='del'>-		  the position within the series.</div><div class='del'>-</div><div class='del'>-		These are the old-style (BSD) PTY devices; Unix98</div><div class='del'>-		devices are on major 128 and above and use the PTY</div><div class='del'>-		master multiplex (/dev/ptmx) to acquire a PTY on</div><div class='del'>-		demand.</div><div class='del'>-</div><div class='del'>-  2 block	Floppy disks</div><div class='del'>-		  0 = /dev/fd0		Controller 0, drive 0, autodetect</div><div class='del'>-		  1 = /dev/fd1		Controller 0, drive 1, autodetect</div><div class='del'>-		  2 = /dev/fd2		Controller 0, drive 2, autodetect</div><div class='del'>-		  3 = /dev/fd3		Controller 0, drive 3, autodetect</div><div class='del'>-		128 = /dev/fd4		Controller 1, drive 0, autodetect</div><div class='del'>-		129 = /dev/fd5		Controller 1, drive 1, autodetect</div><div class='del'>-		130 = /dev/fd6		Controller 1, drive 2, autodetect</div><div class='del'>-		131 = /dev/fd7		Controller 1, drive 3, autodetect</div><div class='del'>-</div><div class='del'>-		To specify format, add to the autodetect device number:</div><div class='del'>-		  0 = /dev/fd?		Autodetect format</div><div class='del'>-		  4 = /dev/fd?d360	5.25"  360K in a 360K  drive(1)</div><div class='del'>-		 20 = /dev/fd?h360	5.25"  360K in a 1200K drive(1)</div><div class='del'>-		 48 = /dev/fd?h410	5.25"  410K in a 1200K drive</div><div class='del'>-		 64 = /dev/fd?h420	5.25"  420K in a 1200K drive</div><div class='del'>-		 24 = /dev/fd?h720	5.25"  720K in a 1200K drive</div><div class='del'>-		 80 = /dev/fd?h880	5.25"  880K in a 1200K drive(1)</div><div class='del'>-		  8 = /dev/fd?h1200	5.25" 1200K in a 1200K drive(1)</div><div class='del'>-		 40 = /dev/fd?h1440	5.25" 1440K in a 1200K drive(1)</div><div class='del'>-		 56 = /dev/fd?h1476	5.25" 1476K in a 1200K drive</div><div class='del'>-		 72 = /dev/fd?h1494	5.25" 1494K in a 1200K drive</div><div class='del'>-		 92 = /dev/fd?h1600	5.25" 1600K in a 1200K drive(1)</div><div class='del'>-</div><div class='del'>-		 12 = /dev/fd?u360	3.5"   360K Double Density(2)</div><div class='del'>-		 16 = /dev/fd?u720	3.5"   720K Double Density(1)</div><div class='del'>-		120 = /dev/fd?u800	3.5"   800K Double Density(2)</div><div class='del'>-		 52 = /dev/fd?u820	3.5"   820K Double Density</div><div class='del'>-		 68 = /dev/fd?u830	3.5"   830K Double Density</div><div class='del'>-		 84 = /dev/fd?u1040	3.5"  1040K Double Density(1)</div><div class='del'>-		 88 = /dev/fd?u1120	3.5"  1120K Double Density(1)</div><div class='del'>-		 28 = /dev/fd?u1440	3.5"  1440K High Density(1)</div><div class='del'>-		124 = /dev/fd?u1600	3.5"  1600K High Density(1)</div><div class='del'>-		 44 = /dev/fd?u1680	3.5"  1680K High Density(3)</div><div class='del'>-		 60 = /dev/fd?u1722	3.5"  1722K High Density</div><div class='del'>-		 76 = /dev/fd?u1743	3.5"  1743K High Density</div><div class='del'>-		 96 = /dev/fd?u1760	3.5"  1760K High Density</div><div class='del'>-		116 = /dev/fd?u1840	3.5"  1840K High Density(3)</div><div class='del'>-		100 = /dev/fd?u1920	3.5"  1920K High Density(1)</div><div class='del'>-		 32 = /dev/fd?u2880	3.5"  2880K Extra Density(1)</div><div class='del'>-		104 = /dev/fd?u3200	3.5"  3200K Extra Density</div><div class='del'>-		108 = /dev/fd?u3520	3.5"  3520K Extra Density</div><div class='del'>-		112 = /dev/fd?u3840	3.5"  3840K Extra Density(1)</div><div class='del'>-</div><div class='del'>-		 36 = /dev/fd?CompaQ	Compaq 2880K drive; obsolete?</div><div class='del'>-</div><div class='del'>-		(1) Autodetectable format</div><div class='del'>-		(2) Autodetectable format in a Double Density (720K) drive only</div><div class='del'>-		(3) Autodetectable format in a High Density (1440K) drive only</div><div class='del'>-</div><div class='del'>-		NOTE: The letter in the device name (d, q, h or u)</div><div class='del'>-		signifies the type of drive: 5.25" Double Density (d),</div><div class='del'>-		5.25" Quad Density (q), 5.25" High Density (h) or 3.5"</div><div class='del'>-		(any model, u).	 The use of the capital letters D, H</div><div class='del'>-		and E for the 3.5" models have been deprecated, since</div><div class='del'>-		the drive type is insignificant for these devices.</div><div class='del'>-</div><div class='del'>-  3 char	Pseudo-TTY slaves</div><div class='del'>-		  0 = /dev/ttyp0	First PTY slave</div><div class='del'>-		  1 = /dev/ttyp1	Second PTY slave</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/ttyef	256th PTY slave</div><div class='del'>-</div><div class='del'>-		These are the old-style (BSD) PTY devices; Unix98</div><div class='del'>-		devices are on major 136 and above.</div><div class='del'>-</div><div class='del'>-  3 block	First MFM, RLL and IDE hard disk/CD-ROM interface</div><div class='del'>-		  0 = /dev/hda		Master: whole disk (or CD-ROM)</div><div class='del'>-		 64 = /dev/hdb		Slave: whole disk (or CD-ROM)</div><div class='del'>-</div><div class='del'>-		For partitions, add to the whole disk device number:</div><div class='del'>-		  0 = /dev/hd?		Whole disk</div><div class='del'>-		  1 = /dev/hd?1		First partition</div><div class='del'>-		  2 = /dev/hd?2		Second partition</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/hd?63	63rd partition</div><div class='del'>-</div><div class='del'>-		For Linux/i386, partitions 1-4 are the primary</div><div class='del'>-		partitions, and 5 and above are logical partitions.</div><div class='del'>-		Other versions of Linux use partitioning schemes</div><div class='del'>-		appropriate to their respective architectures.</div><div class='del'>-</div><div class='del'>-  4 char	TTY devices</div><div class='del'>-		  0 = /dev/tty0		Current virtual console</div><div class='del'>-</div><div class='del'>-		  1 = /dev/tty1		First virtual console</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/tty63	63rd virtual console</div><div class='del'>-		 64 = /dev/ttyS0	First UART serial port</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/ttyS191	192nd UART serial port</div><div class='del'>-</div><div class='del'>-		UART serial ports refer to 8250/16450/16550 series devices.</div><div class='del'>-</div><div class='del'>-		Older versions of the Linux kernel used this major</div><div class='del'>-		number for BSD PTY devices.  As of Linux 2.1.115, this</div><div class='del'>-		is no longer supported.	 Use major numbers 2 and 3.</div><div class='del'>-</div><div class='del'>-  4 block	Aliases for dynamically allocated major devices to be used</div><div class='del'>-		when its not possible to create the real device nodes</div><div class='del'>-		because the root filesystem is mounted read-only.</div><div class='del'>-</div><div class='del'>-                  0 = /dev/root</div><div class='del'>-</div><div class='del'>-  5 char	Alternate TTY devices</div><div class='del'>-		  0 = /dev/tty		Current TTY device</div><div class='del'>-		  1 = /dev/console	System console</div><div class='del'>-		  2 = /dev/ptmx		PTY master multiplex</div><div class='del'>-		  3 = /dev/ttyprintk	User messages via printk TTY device</div><div class='del'>-		 64 = /dev/cua0		Callout device for ttyS0</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/cua191	Callout device for ttyS191</div><div class='del'>-</div><div class='del'>-		(5,1) is /dev/console starting with Linux 2.1.71.  See</div><div class='del'>-		the section on terminal devices for more information</div><div class='del'>-		on /dev/console.</div><div class='del'>-</div><div class='del'>-  6 char	Parallel printer devices</div><div class='del'>-		  0 = /dev/lp0		Parallel printer on parport0</div><div class='del'>-		  1 = /dev/lp1		Parallel printer on parport1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		Current Linux kernels no longer have a fixed mapping</div><div class='del'>-		between parallel ports and I/O addresses.  Instead,</div><div class='del'>-		they are redirected through the parport multiplex layer.</div><div class='del'>-</div><div class='del'>-  7 char	Virtual console capture devices</div><div class='del'>-		  0 = /dev/vcs		Current vc text contents</div><div class='del'>-		  1 = /dev/vcs1		tty1 text contents</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/vcs63	tty63 text contents</div><div class='del'>-		128 = /dev/vcsa		Current vc text/attribute contents</div><div class='del'>-		129 = /dev/vcsa1	tty1 text/attribute contents</div><div class='del'>-		    ...</div><div class='del'>-		191 = /dev/vcsa63	tty63 text/attribute contents</div><div class='del'>-</div><div class='del'>-		NOTE: These devices permit both read and write access.</div><div class='del'>-</div><div class='del'>-  7 block	Loopback devices</div><div class='del'>-		  0 = /dev/loop0	First loop device</div><div class='del'>-		  1 = /dev/loop1	Second loop device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		The loop devices are used to mount filesystems not</div><div class='del'>-		associated with block devices.	The binding to the</div><div class='del'>-		loop devices is handled by mount(8) or losetup(8).</div><div class='del'>-</div><div class='del'>-  8 block	SCSI disk devices (0-15)</div><div class='del'>-		  0 = /dev/sda		First SCSI disk whole disk</div><div class='del'>-		 16 = /dev/sdb		Second SCSI disk whole disk</div><div class='del'>-		 32 = /dev/sdc		Third SCSI disk whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/sdp		Sixteenth SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-  9 char	SCSI tape devices</div><div class='del'>-		  0 = /dev/st0		First SCSI tape, mode 0</div><div class='del'>-		  1 = /dev/st1		Second SCSI tape, mode 0</div><div class='del'>-		    ...</div><div class='del'>-		 32 = /dev/st0l		First SCSI tape, mode 1</div><div class='del'>-		 33 = /dev/st1l		Second SCSI tape, mode 1</div><div class='del'>-		    ...</div><div class='del'>-		 64 = /dev/st0m		First SCSI tape, mode 2</div><div class='del'>-		 65 = /dev/st1m		Second SCSI tape, mode 2</div><div class='del'>-		    ...</div><div class='del'>-		 96 = /dev/st0a		First SCSI tape, mode 3</div><div class='del'>-		 97 = /dev/st1a		Second SCSI tape, mode 3</div><div class='del'>-		      ...</div><div class='del'>-		128 = /dev/nst0		First SCSI tape, mode 0, no rewind</div><div class='del'>-		129 = /dev/nst1		Second SCSI tape, mode 0, no rewind</div><div class='del'>-		    ...</div><div class='del'>-		160 = /dev/nst0l	First SCSI tape, mode 1, no rewind</div><div class='del'>-		161 = /dev/nst1l	Second SCSI tape, mode 1, no rewind</div><div class='del'>-		    ...</div><div class='del'>-		192 = /dev/nst0m	First SCSI tape, mode 2, no rewind</div><div class='del'>-		193 = /dev/nst1m	Second SCSI tape, mode 2, no rewind</div><div class='del'>-		    ...</div><div class='del'>-		224 = /dev/nst0a	First SCSI tape, mode 3, no rewind</div><div class='del'>-		225 = /dev/nst1a	Second SCSI tape, mode 3, no rewind</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		"No rewind" refers to the omission of the default</div><div class='del'>-		automatic rewind on device close.  The MTREW or MTOFFL</div><div class='del'>-		ioctl()'s can be used to rewind the tape regardless of</div><div class='del'>-		the device used to access it.</div><div class='del'>-</div><div class='del'>-  9 block	Metadisk (RAID) devices</div><div class='del'>-		  0 = /dev/md0		First metadisk group</div><div class='del'>-		  1 = /dev/md1		Second metadisk group</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		The metadisk driver is used to span a</div><div class='del'>-		filesystem across multiple physical disks.</div><div class='del'>-</div><div class='del'>- 10 char	Non-serial mice, misc features</div><div class='del'>-		  0 = /dev/logibm	Logitech bus mouse</div><div class='del'>-		  1 = /dev/psaux	PS/2-style mouse port</div><div class='del'>-		  2 = /dev/inportbm	Microsoft Inport bus mouse</div><div class='del'>-		  3 = /dev/atibm	ATI XL bus mouse</div><div class='del'>-		  4 = /dev/jbm		J-mouse</div><div class='del'>-		  4 = /dev/amigamouse	Amiga mouse (68k/Amiga)</div><div class='del'>-		  5 = /dev/atarimouse	Atari mouse</div><div class='del'>-		  6 = /dev/sunmouse	Sun mouse</div><div class='del'>-		  7 = /dev/amigamouse1	Second Amiga mouse</div><div class='del'>-		  8 = /dev/smouse	Simple serial mouse driver</div><div class='del'>-		  9 = /dev/pc110pad	IBM PC-110 digitizer pad</div><div class='del'>-		 10 = /dev/adbmouse	Apple Desktop Bus mouse</div><div class='del'>-		 11 = /dev/vrtpanel	Vr41xx embedded touch panel</div><div class='del'>-		 13 = /dev/vpcmouse	Connectix Virtual PC Mouse</div><div class='del'>-		 14 = /dev/touchscreen/ucb1x00  UCB 1x00 touchscreen</div><div class='del'>-		 15 = /dev/touchscreen/mk712	MK712 touchscreen</div><div class='del'>-		128 = /dev/beep		Fancy beep device</div><div class='del'>-		129 =</div><div class='del'>-		130 = /dev/watchdog	Watchdog timer port</div><div class='del'>-		131 = /dev/temperature	Machine internal temperature</div><div class='del'>-		132 = /dev/hwtrap	Hardware fault trap</div><div class='del'>-		133 = /dev/exttrp	External device trap</div><div class='del'>-		134 = /dev/apm_bios	Advanced Power Management BIOS</div><div class='del'>-		135 = /dev/rtc		Real Time Clock</div><div class='del'>-		137 = /dev/vhci		Bluetooth virtual HCI driver</div><div class='del'>-		139 = /dev/openprom	SPARC OpenBoot PROM</div><div class='del'>-		140 = /dev/relay8	Berkshire Products Octal relay card</div><div class='del'>-		141 = /dev/relay16	Berkshire Products ISO-16 relay card</div><div class='del'>-		142 =</div><div class='del'>-		143 = /dev/pciconf	PCI configuration space</div><div class='del'>-		144 = /dev/nvram	Non-volatile configuration RAM</div><div class='del'>-		145 = /dev/hfmodem	Soundcard shortwave modem control</div><div class='del'>-		146 = /dev/graphics	Linux/SGI graphics device</div><div class='del'>-		147 = /dev/opengl	Linux/SGI OpenGL pipe</div><div class='del'>-		148 = /dev/gfx		Linux/SGI graphics effects device</div><div class='del'>-		149 = /dev/input/mouse	Linux/SGI Irix emulation mouse</div><div class='del'>-		150 = /dev/input/keyboard Linux/SGI Irix emulation keyboard</div><div class='del'>-		151 = /dev/led		Front panel LEDs</div><div class='del'>-		152 = /dev/kpoll	Kernel Poll Driver</div><div class='del'>-		153 = /dev/mergemem	Memory merge device</div><div class='del'>-		154 = /dev/pmu		Macintosh PowerBook power manager</div><div class='del'>-		155 = /dev/isictl	MultiTech ISICom serial control</div><div class='del'>-		156 = /dev/lcd		Front panel LCD display</div><div class='del'>-		157 = /dev/ac		Applicom Intl Profibus card</div><div class='del'>-		158 = /dev/nwbutton	Netwinder external button</div><div class='del'>-		159 = /dev/nwdebug	Netwinder debug interface</div><div class='del'>-		160 = /dev/nwflash	Netwinder flash memory</div><div class='del'>-		161 = /dev/userdma	User-space DMA access</div><div class='del'>-		162 = /dev/smbus	System Management Bus</div><div class='del'>-		163 = /dev/lik		Logitech Internet Keyboard</div><div class='del'>-		164 = /dev/ipmo		Intel Intelligent Platform Management</div><div class='del'>-		165 = /dev/vmmon	VMware virtual machine monitor</div><div class='del'>-		166 = /dev/i2o/ctl	I2O configuration manager</div><div class='del'>-		167 = /dev/specialix_sxctl Specialix serial control</div><div class='del'>-		168 = /dev/tcldrv	Technology Concepts serial control</div><div class='del'>-		169 = /dev/specialix_rioctl Specialix RIO serial control</div><div class='del'>-		170 = /dev/thinkpad/thinkpad	IBM Thinkpad devices</div><div class='del'>-		171 = /dev/srripc	QNX4 API IPC manager</div><div class='del'>-		172 = /dev/usemaclone	Semaphore clone device</div><div class='del'>-		173 = /dev/ipmikcs	Intelligent Platform Management</div><div class='del'>-		174 = /dev/uctrl	SPARCbook 3 microcontroller</div><div class='del'>-		175 = /dev/agpgart	AGP Graphics Address Remapping Table</div><div class='del'>-		176 = /dev/gtrsc	Gorgy Timing radio clock</div><div class='del'>-		177 = /dev/cbm		Serial CBM bus</div><div class='del'>-		178 = /dev/jsflash	JavaStation OS flash SIMM</div><div class='del'>-		179 = /dev/xsvc		High-speed shared-mem/semaphore service</div><div class='del'>-		180 = /dev/vrbuttons	Vr41xx button input device</div><div class='del'>-		181 = /dev/toshiba	Toshiba laptop SMM support</div><div class='del'>-		182 = /dev/perfctr	Performance-monitoring counters</div><div class='del'>-		183 = /dev/hwrng	Generic random number generator</div><div class='del'>-		184 = /dev/cpu/microcode CPU microcode update interface</div><div class='del'>-		186 = /dev/atomicps	Atomic shapshot of process state data</div><div class='del'>-		187 = /dev/irnet	IrNET device</div><div class='del'>-		188 = /dev/smbusbios	SMBus BIOS</div><div class='del'>-		189 = /dev/ussp_ctl	User space serial port control</div><div class='del'>-		190 = /dev/crash	Mission Critical Linux crash dump facility</div><div class='del'>-		191 = /dev/pcl181	&lt;information missing&gt;</div><div class='del'>-		192 = /dev/nas_xbus	NAS xbus LCD/buttons access</div><div class='del'>-		193 = /dev/d7s		SPARC 7-segment display</div><div class='del'>-		194 = /dev/zkshim	Zero-Knowledge network shim control</div><div class='del'>-		195 = /dev/elographics/e2201	Elographics touchscreen E271-2201</div><div class='del'>-		196 = /dev/vfio/vfio	VFIO userspace driver interface</div><div class='del'>-		197 = /dev/pxa3xx-gcu	PXA3xx graphics controller unit driver</div><div class='del'>-		198 = /dev/sexec	Signed executable interface</div><div class='del'>-		199 = /dev/scanners/cuecat :CueCat barcode scanner</div><div class='del'>-		200 = /dev/net/tun	TAP/TUN network device</div><div class='del'>-		201 = /dev/button/gulpb	Transmeta GULP-B buttons</div><div class='del'>-		202 = /dev/emd/ctl	Enhanced Metadisk RAID (EMD) control</div><div class='del'>-		203 = /dev/cuse		Cuse (character device in user-space)</div><div class='del'>-		204 = /dev/video/em8300		EM8300 DVD decoder control</div><div class='del'>-		205 = /dev/video/em8300_mv	EM8300 DVD decoder video</div><div class='del'>-		206 = /dev/video/em8300_ma	EM8300 DVD decoder audio</div><div class='del'>-		207 = /dev/video/em8300_sp	EM8300 DVD decoder subpicture</div><div class='del'>-		208 = /dev/compaq/cpqphpc	Compaq PCI Hot Plug Controller</div><div class='del'>-		209 = /dev/compaq/cpqrid	Compaq Remote Insight Driver</div><div class='del'>-		210 = /dev/impi/bt	IMPI coprocessor block transfer</div><div class='del'>-		211 = /dev/impi/smic	IMPI coprocessor stream interface</div><div class='del'>-		212 = /dev/watchdogs/0	First watchdog device</div><div class='del'>-		213 = /dev/watchdogs/1	Second watchdog device</div><div class='del'>-		214 = /dev/watchdogs/2	Third watchdog device</div><div class='del'>-		215 = /dev/watchdogs/3	Fourth watchdog device</div><div class='del'>-		216 = /dev/fujitsu/apanel	Fujitsu/Siemens application panel</div><div class='del'>-		217 = /dev/ni/natmotn		National Instruments Motion</div><div class='del'>-		218 = /dev/kchuid	Inter-process chuid control</div><div class='del'>-		219 = /dev/modems/mwave	MWave modem firmware upload</div><div class='del'>-		220 = /dev/mptctl	Message passing technology (MPT) control</div><div class='del'>-		221 = /dev/mvista/hssdsi	Montavista PICMG hot swap system driver</div><div class='del'>-		222 = /dev/mvista/hasi		Montavista PICMG high availability</div><div class='del'>-		223 = /dev/input/uinput		User level driver support for input</div><div class='del'>-		224 = /dev/tpm		TCPA TPM driver</div><div class='del'>-		225 = /dev/pps		Pulse Per Second driver</div><div class='del'>-		226 = /dev/systrace	Systrace device</div><div class='del'>-		227 = /dev/mcelog	X86_64 Machine Check Exception driver</div><div class='del'>-		228 = /dev/hpet		HPET driver</div><div class='del'>-		229 = /dev/fuse		Fuse (virtual filesystem in user-space)</div><div class='del'>-		230 = /dev/midishare	MidiShare driver</div><div class='del'>-		231 = /dev/snapshot	System memory snapshot device</div><div class='del'>-		232 = /dev/kvm		Kernel-based virtual machine (hardware virtualization extensions)</div><div class='del'>-		233 = /dev/kmview	View-OS A process with a view</div><div class='del'>-		234 = /dev/btrfs-control	Btrfs control device</div><div class='del'>-		235 = /dev/autofs	Autofs control device</div><div class='del'>-		236 = /dev/mapper/control	Device-Mapper control device</div><div class='del'>-		237 = /dev/loop-control Loopback control device</div><div class='del'>-		238 = /dev/vhost-net	Host kernel accelerator for virtio net</div><div class='del'>-		239 = /dev/uhid		User-space I/O driver support for HID subsystem</div><div class='del'>-</div><div class='del'>-		240-254			Reserved for local use</div><div class='del'>-		255			Reserved for MISC_DYNAMIC_MINOR</div><div class='del'>-</div><div class='del'>- 11 char	Raw keyboard device	(Linux/SPARC only)</div><div class='del'>-		  0 = /dev/kbd		Raw keyboard device</div><div class='del'>-</div><div class='del'>- 11 char	Serial Mux device	(Linux/PA-RISC only)</div><div class='del'>-		  0 = /dev/ttyB0	First mux port</div><div class='del'>-		  1 = /dev/ttyB1	Second mux port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 11 block	SCSI CD-ROM devices</div><div class='del'>-		  0 = /dev/scd0		First SCSI CD-ROM</div><div class='del'>-		  1 = /dev/scd1		Second SCSI CD-ROM</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		The prefix /dev/sr (instead of /dev/scd) has been deprecated.</div><div class='del'>-</div><div class='del'>- 12 char	QIC-02 tape</div><div class='del'>-		  2 = /dev/ntpqic11	QIC-11, no rewind-on-close</div><div class='del'>-		  3 = /dev/tpqic11	QIC-11, rewind-on-close</div><div class='del'>-		  4 = /dev/ntpqic24	QIC-24, no rewind-on-close</div><div class='del'>-		  5 = /dev/tpqic24	QIC-24, rewind-on-close</div><div class='del'>-		  6 = /dev/ntpqic120	QIC-120, no rewind-on-close</div><div class='del'>-		  7 = /dev/tpqic120	QIC-120, rewind-on-close</div><div class='del'>-		  8 = /dev/ntpqic150	QIC-150, no rewind-on-close</div><div class='del'>-		  9 = /dev/tpqic150	QIC-150, rewind-on-close</div><div class='del'>-</div><div class='del'>-		The device names specified are proposed -- if there</div><div class='del'>-		are "standard" names for these devices, please let me know.</div><div class='del'>-</div><div class='del'>- 12 block</div><div class='del'>-</div><div class='del'>- 13 char	Input core</div><div class='del'>-		  0 = /dev/input/js0	First joystick</div><div class='del'>-		  1 = /dev/input/js1	Second joystick</div><div class='del'>-		    ...</div><div class='del'>-		 32 = /dev/input/mouse0	First mouse</div><div class='del'>-		 33 = /dev/input/mouse1	Second mouse</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/input/mice	Unified mouse</div><div class='del'>-		 64 = /dev/input/event0	First event queue</div><div class='del'>-		 65 = /dev/input/event1	Second event queue</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		Each device type has 5 bits (32 minors).</div><div class='del'>-</div><div class='del'>- 13 block	Previously used for the XT disk (/dev/xdN)</div><div class='del'>-		Deleted in kernel v3.9.</div><div class='del'>-</div><div class='del'>- 14 char	Open Sound System (OSS)</div><div class='del'>-		  0 = /dev/mixer	Mixer control</div><div class='del'>-		  1 = /dev/sequencer	Audio sequencer</div><div class='del'>-		  2 = /dev/midi00	First MIDI port</div><div class='del'>-		  3 = /dev/dsp		Digital audio</div><div class='del'>-		  4 = /dev/audio	Sun-compatible digital audio</div><div class='del'>-		  6 =</div><div class='del'>-		  7 = /dev/audioctl	SPARC audio control device</div><div class='del'>-		  8 = /dev/sequencer2	Sequencer -- alternate device</div><div class='del'>-		 16 = /dev/mixer1	Second soundcard mixer control</div><div class='del'>-		 17 = /dev/patmgr0	Sequencer patch manager</div><div class='del'>-		 18 = /dev/midi01	Second MIDI port</div><div class='del'>-		 19 = /dev/dsp1		Second soundcard digital audio</div><div class='del'>-		 20 = /dev/audio1	Second soundcard Sun digital audio</div><div class='del'>-		 33 = /dev/patmgr1	Sequencer patch manager</div><div class='del'>-		 34 = /dev/midi02	Third MIDI port</div><div class='del'>-		 50 = /dev/midi03	Fourth MIDI port</div><div class='del'>-</div><div class='del'>- 14 block</div><div class='del'>-</div><div class='del'>- 15 char	Joystick</div><div class='del'>-		  0 = /dev/js0		First analog joystick</div><div class='del'>-		  1 = /dev/js1		Second analog joystick</div><div class='del'>-		    ...</div><div class='del'>-		128 = /dev/djs0		First digital joystick</div><div class='del'>-		129 = /dev/djs1		Second digital joystick</div><div class='del'>-		    ...</div><div class='del'>- 15 block	Sony CDU-31A/CDU-33A CD-ROM</div><div class='del'>-		  0 = /dev/sonycd	Sony CDU-31a CD-ROM</div><div class='del'>-</div><div class='del'>- 16 char	Non-SCSI scanners</div><div class='del'>-		  0 = /dev/gs4500	Genius 4500 handheld scanner</div><div class='del'>-</div><div class='del'>- 16 block	GoldStar CD-ROM</div><div class='del'>-		  0 = /dev/gscd		GoldStar CD-ROM</div><div class='del'>-</div><div class='del'>- 17 char	OBSOLETE (was Chase serial card)</div><div class='del'>-		  0 = /dev/ttyH0	First Chase port</div><div class='del'>-		  1 = /dev/ttyH1	Second Chase port</div><div class='del'>-		    ...</div><div class='del'>- 17 block	Optics Storage CD-ROM</div><div class='del'>-		  0 = /dev/optcd	Optics Storage CD-ROM</div><div class='del'>-</div><div class='del'>- 18 char	OBSOLETE (was Chase serial card - alternate devices)</div><div class='del'>-		  0 = /dev/cuh0		Callout device for ttyH0</div><div class='del'>-		  1 = /dev/cuh1		Callout device for ttyH1</div><div class='del'>-		    ...</div><div class='del'>- 18 block	Sanyo CD-ROM</div><div class='del'>-		  0 = /dev/sjcd		Sanyo CD-ROM</div><div class='del'>-</div><div class='del'>- 19 char	Cyclades serial card</div><div class='del'>-		  0 = /dev/ttyC0	First Cyclades port</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/ttyC31	32nd Cyclades port</div><div class='del'>-</div><div class='del'>- 19 block	"Double" compressed disk</div><div class='del'>-		  0 = /dev/double0	First compressed disk</div><div class='del'>-		    ...</div><div class='del'>-		  7 = /dev/double7	Eighth compressed disk</div><div class='del'>-		128 = /dev/cdouble0	Mirror of first compressed disk</div><div class='del'>-		    ...</div><div class='del'>-		135 = /dev/cdouble7	Mirror of eighth compressed disk</div><div class='del'>-</div><div class='del'>-		See the Double documentation for the meaning of the</div><div class='del'>-		mirror devices.</div><div class='del'>-</div><div class='del'>- 20 char	Cyclades serial card - alternate devices</div><div class='del'>-		  0 = /dev/cub0		Callout device for ttyC0</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/cub31	Callout device for ttyC31</div><div class='del'>-</div><div class='del'>- 20 block	Hitachi CD-ROM (under development)</div><div class='del'>-		  0 = /dev/hitcd	Hitachi CD-ROM</div><div class='del'>-</div><div class='del'>- 21 char	Generic SCSI access</div><div class='del'>-		  0 = /dev/sg0		First generic SCSI device</div><div class='del'>-		  1 = /dev/sg1		Second generic SCSI device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		Most distributions name these /dev/sga, /dev/sgb...;</div><div class='del'>-		this sets an unnecessary limit of 26 SCSI devices in</div><div class='del'>-		the system and is counter to standard Linux</div><div class='del'>-		device-naming practice.</div><div class='del'>-</div><div class='del'>- 21 block	Acorn MFM hard drive interface</div><div class='del'>-		  0 = /dev/mfma		First MFM drive whole disk</div><div class='del'>-		 64 = /dev/mfmb		Second MFM drive whole disk</div><div class='del'>-</div><div class='del'>-		This device is used on the ARM-based Acorn RiscPC.</div><div class='del'>-		Partitions are handled the same way as for IDE disks</div><div class='del'>-		(see major number 3).</div><div class='del'>-</div><div class='del'>- 22 char	Digiboard serial card</div><div class='del'>-		  0 = /dev/ttyD0	First Digiboard port</div><div class='del'>-		  1 = /dev/ttyD1	Second Digiboard port</div><div class='del'>-		    ...</div><div class='del'>- 22 block	Second IDE hard disk/CD-ROM interface</div><div class='del'>-		  0 = /dev/hdc		Master: whole disk (or CD-ROM)</div><div class='del'>-		 64 = /dev/hdd		Slave: whole disk (or CD-ROM)</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for the first</div><div class='del'>-		interface (see major number 3).</div><div class='del'>-</div><div class='del'>- 23 char	Digiboard serial card - alternate devices</div><div class='del'>-		  0 = /dev/cud0		Callout device for ttyD0</div><div class='del'>-		  1 = /dev/cud1		Callout device for ttyD1</div><div class='del'>-		      ...</div><div class='del'>- 23 block	Mitsumi proprietary CD-ROM</div><div class='del'>-		  0 = /dev/mcd		Mitsumi CD-ROM</div><div class='del'>-</div><div class='del'>- 24 char	Stallion serial card</div><div class='del'>-		  0 = /dev/ttyE0	Stallion port 0 card 0</div><div class='del'>-		  1 = /dev/ttyE1	Stallion port 1 card 0</div><div class='del'>-		    ...</div><div class='del'>-		 64 = /dev/ttyE64	Stallion port 0 card 1</div><div class='del'>-		 65 = /dev/ttyE65	Stallion port 1 card 1</div><div class='del'>-		      ...</div><div class='del'>-		128 = /dev/ttyE128	Stallion port 0 card 2</div><div class='del'>-		129 = /dev/ttyE129	Stallion port 1 card 2</div><div class='del'>-		    ...</div><div class='del'>-		192 = /dev/ttyE192	Stallion port 0 card 3</div><div class='del'>-		193 = /dev/ttyE193	Stallion port 1 card 3</div><div class='del'>-		    ...</div><div class='del'>- 24 block	Sony CDU-535 CD-ROM</div><div class='del'>-		  0 = /dev/cdu535	Sony CDU-535 CD-ROM</div><div class='del'>-</div><div class='del'>- 25 char	Stallion serial card - alternate devices</div><div class='del'>-		  0 = /dev/cue0		Callout device for ttyE0</div><div class='del'>-		  1 = /dev/cue1		Callout device for ttyE1</div><div class='del'>-		    ...</div><div class='del'>-		 64 = /dev/cue64	Callout device for ttyE64</div><div class='del'>-		 65 = /dev/cue65	Callout device for ttyE65</div><div class='del'>-		    ...</div><div class='del'>-		128 = /dev/cue128	Callout device for ttyE128</div><div class='del'>-		129 = /dev/cue129	Callout device for ttyE129</div><div class='del'>-		    ...</div><div class='del'>-		192 = /dev/cue192	Callout device for ttyE192</div><div class='del'>-		193 = /dev/cue193	Callout device for ttyE193</div><div class='del'>-		      ...</div><div class='del'>- 25 block	First Matsushita (Panasonic/SoundBlaster) CD-ROM</div><div class='del'>-		  0 = /dev/sbpcd0	Panasonic CD-ROM controller 0 unit 0</div><div class='del'>-		  1 = /dev/sbpcd1	Panasonic CD-ROM controller 0 unit 1</div><div class='del'>-		  2 = /dev/sbpcd2	Panasonic CD-ROM controller 0 unit 2</div><div class='del'>-		  3 = /dev/sbpcd3	Panasonic CD-ROM controller 0 unit 3</div><div class='del'>-</div><div class='del'>- 26 char</div><div class='del'>-</div><div class='del'>- 26 block	Second Matsushita (Panasonic/SoundBlaster) CD-ROM</div><div class='del'>-		  0 = /dev/sbpcd4	Panasonic CD-ROM controller 1 unit 0</div><div class='del'>-		  1 = /dev/sbpcd5	Panasonic CD-ROM controller 1 unit 1</div><div class='del'>-		  2 = /dev/sbpcd6	Panasonic CD-ROM controller 1 unit 2</div><div class='del'>-		  3 = /dev/sbpcd7	Panasonic CD-ROM controller 1 unit 3</div><div class='del'>-</div><div class='del'>- 27 char	QIC-117 tape</div><div class='del'>-		  0 = /dev/qft0		Unit 0, rewind-on-close</div><div class='del'>-		  1 = /dev/qft1		Unit 1, rewind-on-close</div><div class='del'>-		  2 = /dev/qft2		Unit 2, rewind-on-close</div><div class='del'>-		  3 = /dev/qft3		Unit 3, rewind-on-close</div><div class='del'>-		  4 = /dev/nqft0	Unit 0, no rewind-on-close</div><div class='del'>-		  5 = /dev/nqft1	Unit 1, no rewind-on-close</div><div class='del'>-		  6 = /dev/nqft2	Unit 2, no rewind-on-close</div><div class='del'>-		  7 = /dev/nqft3	Unit 3, no rewind-on-close</div><div class='del'>-		 16 = /dev/zqft0	Unit 0, rewind-on-close, compression</div><div class='del'>-		 17 = /dev/zqft1	Unit 1, rewind-on-close, compression</div><div class='del'>-		 18 = /dev/zqft2	Unit 2, rewind-on-close, compression</div><div class='del'>-		 19 = /dev/zqft3	Unit 3, rewind-on-close, compression</div><div class='del'>-		 20 = /dev/nzqft0	Unit 0, no rewind-on-close, compression</div><div class='del'>-		 21 = /dev/nzqft1	Unit 1, no rewind-on-close, compression</div><div class='del'>-		 22 = /dev/nzqft2	Unit 2, no rewind-on-close, compression</div><div class='del'>-		 23 = /dev/nzqft3	Unit 3, no rewind-on-close, compression</div><div class='del'>-		 32 = /dev/rawqft0	Unit 0, rewind-on-close, no file marks</div><div class='del'>-		 33 = /dev/rawqft1	Unit 1, rewind-on-close, no file marks</div><div class='del'>-		 34 = /dev/rawqft2	Unit 2, rewind-on-close, no file marks</div><div class='del'>-		 35 = /dev/rawqft3	Unit 3, rewind-on-close, no file marks</div><div class='del'>-		 36 = /dev/nrawqft0	Unit 0, no rewind-on-close, no file marks</div><div class='del'>-		 37 = /dev/nrawqft1	Unit 1, no rewind-on-close, no file marks</div><div class='del'>-		 38 = /dev/nrawqft2	Unit 2, no rewind-on-close, no file marks</div><div class='del'>-		 39 = /dev/nrawqft3	Unit 3, no rewind-on-close, no file marks</div><div class='del'>-</div><div class='del'>- 27 block	Third Matsushita (Panasonic/SoundBlaster) CD-ROM</div><div class='del'>-		  0 = /dev/sbpcd8	Panasonic CD-ROM controller 2 unit 0</div><div class='del'>-		  1 = /dev/sbpcd9	Panasonic CD-ROM controller 2 unit 1</div><div class='del'>-		  2 = /dev/sbpcd10	Panasonic CD-ROM controller 2 unit 2</div><div class='del'>-		  3 = /dev/sbpcd11	Panasonic CD-ROM controller 2 unit 3</div><div class='del'>-</div><div class='del'>- 28 char	Stallion serial card - card programming</div><div class='del'>-		  0 = /dev/staliomem0	First Stallion card I/O memory</div><div class='del'>-		  1 = /dev/staliomem1	Second Stallion card I/O memory</div><div class='del'>-		  2 = /dev/staliomem2	Third Stallion card I/O memory</div><div class='del'>-		  3 = /dev/staliomem3	Fourth Stallion card I/O memory</div><div class='del'>-</div><div class='del'>- 28 char	Atari SLM ACSI laser printer (68k/Atari)</div><div class='del'>-		  0 = /dev/slm0		First SLM laser printer</div><div class='del'>-		  1 = /dev/slm1		Second SLM laser printer</div><div class='del'>-		    ...</div><div class='del'>- 28 block	Fourth Matsushita (Panasonic/SoundBlaster) CD-ROM</div><div class='del'>-		  0 = /dev/sbpcd12	Panasonic CD-ROM controller 3 unit 0</div><div class='del'>-		  1 = /dev/sbpcd13	Panasonic CD-ROM controller 3 unit 1</div><div class='del'>-		  2 = /dev/sbpcd14	Panasonic CD-ROM controller 3 unit 2</div><div class='del'>-		  3 = /dev/sbpcd15	Panasonic CD-ROM controller 3 unit 3</div><div class='del'>-</div><div class='del'>- 28 block	ACSI disk (68k/Atari)</div><div class='del'>-		  0 = /dev/ada		First ACSI disk whole disk</div><div class='del'>-		 16 = /dev/adb		Second ACSI disk whole disk</div><div class='del'>-		 32 = /dev/adc		Third ACSI disk whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/adp		16th ACSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15, like SCSI.</div><div class='del'>-</div><div class='del'>- 29 char	Universal frame buffer</div><div class='del'>-		  0 = /dev/fb0		First frame buffer</div><div class='del'>-		  1 = /dev/fb1		Second frame buffer</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/fb31		32nd frame buffer</div><div class='del'>-</div><div class='del'>- 29 block	Aztech/Orchid/Okano/Wearnes CD-ROM</div><div class='del'>-		  0 = /dev/aztcd	Aztech CD-ROM</div><div class='del'>-</div><div class='del'>- 30 char	iBCS-2 compatibility devices</div><div class='del'>-		  0 = /dev/socksys	Socket access</div><div class='del'>-		  1 = /dev/spx		SVR3 local X interface</div><div class='del'>-		 32 = /dev/inet/ip	Network access</div><div class='del'>-		 33 = /dev/inet/icmp</div><div class='del'>-		 34 = /dev/inet/ggp</div><div class='del'>-		 35 = /dev/inet/ipip</div><div class='del'>-		 36 = /dev/inet/tcp</div><div class='del'>-		 37 = /dev/inet/egp</div><div class='del'>-		 38 = /dev/inet/pup</div><div class='del'>-		 39 = /dev/inet/udp</div><div class='del'>-		 40 = /dev/inet/idp</div><div class='del'>-		 41 = /dev/inet/rawip</div><div class='del'>-</div><div class='del'>-		Additionally, iBCS-2 requires the following links:</div><div class='del'>-</div><div class='del'>-		/dev/ip -&gt; /dev/inet/ip</div><div class='del'>-		/dev/icmp -&gt; /dev/inet/icmp</div><div class='del'>-		/dev/ggp -&gt; /dev/inet/ggp</div><div class='del'>-		/dev/ipip -&gt; /dev/inet/ipip</div><div class='del'>-		/dev/tcp -&gt; /dev/inet/tcp</div><div class='del'>-		/dev/egp -&gt; /dev/inet/egp</div><div class='del'>-		/dev/pup -&gt; /dev/inet/pup</div><div class='del'>-		/dev/udp -&gt; /dev/inet/udp</div><div class='del'>-		/dev/idp -&gt; /dev/inet/idp</div><div class='del'>-		/dev/rawip -&gt; /dev/inet/rawip</div><div class='del'>-		/dev/inet/arp -&gt; /dev/inet/udp</div><div class='del'>-		/dev/inet/rip -&gt; /dev/inet/udp</div><div class='del'>-		/dev/nfsd -&gt; /dev/socksys</div><div class='del'>-		/dev/X0R -&gt; /dev/null (? apparently not required ?)</div><div class='del'>-</div><div class='del'>- 30 block	Philips LMS CM-205 CD-ROM</div><div class='del'>-		  0 = /dev/cm205cd	Philips LMS CM-205 CD-ROM</div><div class='del'>-</div><div class='del'>-		/dev/lmscd is an older name for this device.  This</div><div class='del'>-		driver does not work with the CM-205MS CD-ROM.</div><div class='del'>-</div><div class='del'>- 31 char	MPU-401 MIDI</div><div class='del'>-		  0 = /dev/mpu401data	MPU-401 data port</div><div class='del'>-		  1 = /dev/mpu401stat	MPU-401 status port</div><div class='del'>-</div><div class='del'>- 31 block	ROM/flash memory card</div><div class='del'>-		  0 = /dev/rom0		First ROM card (rw)</div><div class='del'>-		      ...</div><div class='del'>-		  7 = /dev/rom7		Eighth ROM card (rw)</div><div class='del'>-		  8 = /dev/rrom0	First ROM card (ro)</div><div class='del'>-		    ...</div><div class='del'>-		 15 = /dev/rrom7	Eighth ROM card (ro)</div><div class='del'>-		 16 = /dev/flash0	First flash memory card (rw)</div><div class='del'>-		    ...</div><div class='del'>-		 23 = /dev/flash7	Eighth flash memory card (rw)</div><div class='del'>-		 24 = /dev/rflash0	First flash memory card (ro)</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/rflash7	Eighth flash memory card (ro)</div><div class='del'>-</div><div class='del'>-		The read-write (rw) devices support back-caching</div><div class='del'>-		written data in RAM, as well as writing to flash RAM</div><div class='del'>-		devices.  The read-only devices (ro) support reading</div><div class='del'>-		only.</div><div class='del'>-</div><div class='del'>- 32 char	Specialix serial card</div><div class='del'>-		  0 = /dev/ttyX0	First Specialix port</div><div class='del'>-		  1 = /dev/ttyX1	Second Specialix port</div><div class='del'>-		    ...</div><div class='del'>- 32 block	Philips LMS CM-206 CD-ROM</div><div class='del'>-		  0 = /dev/cm206cd	Philips LMS CM-206 CD-ROM</div><div class='del'>-</div><div class='del'>- 33 char	Specialix serial card - alternate devices</div><div class='del'>-		  0 = /dev/cux0		Callout device for ttyX0</div><div class='del'>-		  1 = /dev/cux1		Callout device for ttyX1</div><div class='del'>-		    ...</div><div class='del'>- 33 block	Third IDE hard disk/CD-ROM interface</div><div class='del'>-		  0 = /dev/hde		Master: whole disk (or CD-ROM)</div><div class='del'>-		 64 = /dev/hdf		Slave: whole disk (or CD-ROM)</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for the first</div><div class='del'>-		interface (see major number 3).</div><div class='del'>-</div><div class='del'>- 34 char	Z8530 HDLC driver</div><div class='del'>-		  0 = /dev/scc0		First Z8530, first port</div><div class='del'>-		  1 = /dev/scc1		First Z8530, second port</div><div class='del'>-		  2 = /dev/scc2		Second Z8530, first port</div><div class='del'>-		  3 = /dev/scc3		Second Z8530, second port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		In a previous version these devices were named</div><div class='del'>-		/dev/sc1 for /dev/scc0, /dev/sc2 for /dev/scc1, and so</div><div class='del'>-		on.</div><div class='del'>-</div><div class='del'>- 34 block	Fourth IDE hard disk/CD-ROM interface</div><div class='del'>-		  0 = /dev/hdg		Master: whole disk (or CD-ROM)</div><div class='del'>-		 64 = /dev/hdh		Slave: whole disk (or CD-ROM)</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for the first</div><div class='del'>-		interface (see major number 3).</div><div class='del'>-</div><div class='del'>- 35 char	tclmidi MIDI driver</div><div class='del'>-		  0 = /dev/midi0	First MIDI port, kernel timed</div><div class='del'>-		  1 = /dev/midi1	Second MIDI port, kernel timed</div><div class='del'>-		  2 = /dev/midi2	Third MIDI port, kernel timed</div><div class='del'>-		  3 = /dev/midi3	Fourth MIDI port, kernel timed</div><div class='del'>-		 64 = /dev/rmidi0	First MIDI port, untimed</div><div class='del'>-		 65 = /dev/rmidi1	Second MIDI port, untimed</div><div class='del'>-		 66 = /dev/rmidi2	Third MIDI port, untimed</div><div class='del'>-		 67 = /dev/rmidi3	Fourth MIDI port, untimed</div><div class='del'>-		128 = /dev/smpte0	First MIDI port, SMPTE timed</div><div class='del'>-		129 = /dev/smpte1	Second MIDI port, SMPTE timed</div><div class='del'>-		130 = /dev/smpte2	Third MIDI port, SMPTE timed</div><div class='del'>-		131 = /dev/smpte3	Fourth MIDI port, SMPTE timed</div><div class='del'>-</div><div class='del'>- 35 block	Slow memory ramdisk</div><div class='del'>-		  0 = /dev/slram	Slow memory ramdisk</div><div class='del'>-</div><div class='del'>- 36 char	Netlink support</div><div class='del'>-		  0 = /dev/route	Routing, device updates, kernel to user</div><div class='del'>-		  1 = /dev/skip		enSKIP security cache control</div><div class='del'>-		  3 = /dev/fwmonitor	Firewall packet copies</div><div class='del'>-		 16 = /dev/tap0		First Ethertap device</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/tap15	16th Ethertap device</div><div class='del'>-</div><div class='del'>- 36 block	OBSOLETE (was MCA ESDI hard disk)</div><div class='del'>-</div><div class='del'>- 37 char	IDE tape</div><div class='del'>-		  0 = /dev/ht0		First IDE tape</div><div class='del'>-		  1 = /dev/ht1		Second IDE tape</div><div class='del'>-		    ...</div><div class='del'>-		128 = /dev/nht0		First IDE tape, no rewind-on-close</div><div class='del'>-		129 = /dev/nht1		Second IDE tape, no rewind-on-close</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		Currently, only one IDE tape drive is supported.</div><div class='del'>-</div><div class='del'>- 37 block	Zorro II ramdisk</div><div class='del'>-		  0 = /dev/z2ram	Zorro II ramdisk</div><div class='del'>-</div><div class='del'>- 38 char	Myricom PCI Myrinet board</div><div class='del'>-		  0 = /dev/mlanai0	First Myrinet board</div><div class='del'>-		  1 = /dev/mlanai1	Second Myrinet board</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		This device is used for status query, board control</div><div class='del'>-		and "user level packet I/O."  This board is also</div><div class='del'>-		accessible as a standard networking "eth" device.</div><div class='del'>-</div><div class='del'>- 38 block	OBSOLETE (was Linux/AP+)</div><div class='del'>-</div><div class='del'>- 39 char	ML-16P experimental I/O board</div><div class='del'>-		  0 = /dev/ml16pa-a0	First card, first analog channel</div><div class='del'>-		  1 = /dev/ml16pa-a1	First card, second analog channel</div><div class='del'>-		    ...</div><div class='del'>-		 15 = /dev/ml16pa-a15	First card, 16th analog channel</div><div class='del'>-		 16 = /dev/ml16pa-d	First card, digital lines</div><div class='del'>-		 17 = /dev/ml16pa-c0	First card, first counter/timer</div><div class='del'>-		 18 = /dev/ml16pa-c1	First card, second counter/timer</div><div class='del'>-		 19 = /dev/ml16pa-c2	First card, third counter/timer</div><div class='del'>-		 32 = /dev/ml16pb-a0	Second card, first analog channel</div><div class='del'>-		 33 = /dev/ml16pb-a1	Second card, second analog channel</div><div class='del'>-		    ...</div><div class='del'>-		 47 = /dev/ml16pb-a15	Second card, 16th analog channel</div><div class='del'>-		 48 = /dev/ml16pb-d	Second card, digital lines</div><div class='del'>-		 49 = /dev/ml16pb-c0	Second card, first counter/timer</div><div class='del'>-		 50 = /dev/ml16pb-c1	Second card, second counter/timer</div><div class='del'>-		 51 = /dev/ml16pb-c2	Second card, third counter/timer</div><div class='del'>-		      ...</div><div class='del'>- 39 block</div><div class='del'>-</div><div class='del'>- 40 char</div><div class='del'>-</div><div class='del'>- 40 block</div><div class='del'>-</div><div class='del'>- 41 char	Yet Another Micro Monitor</div><div class='del'>-		  0 = /dev/yamm		Yet Another Micro Monitor</div><div class='del'>-</div><div class='del'>- 41 block</div><div class='del'>-</div><div class='del'>- 42 char	Demo/sample use</div><div class='del'>-</div><div class='del'>- 42 block	Demo/sample use</div><div class='del'>-</div><div class='del'>-		This number is intended for use in sample code, as</div><div class='del'>-		well as a general "example" device number.  It</div><div class='del'>-		should never be used for a device driver that is being</div><div class='del'>-		distributed; either obtain an official number or use</div><div class='del'>-		the local/experimental range.  The sudden addition or</div><div class='del'>-		removal of a driver with this number should not cause</div><div class='del'>-		ill effects to the system (bugs excepted.)</div><div class='del'>-</div><div class='del'>-		IN PARTICULAR, ANY DISTRIBUTION WHICH CONTAINS A</div><div class='del'>-		DEVICE DRIVER USING MAJOR NUMBER 42 IS NONCOMPLIANT.</div><div class='del'>-</div><div class='del'>- 43 char	isdn4linux virtual modem</div><div class='del'>-		  0 = /dev/ttyI0	First virtual modem</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/ttyI63	64th virtual modem</div><div class='del'>-</div><div class='del'>- 43 block	Network block devices</div><div class='del'>-		  0 = /dev/nb0		First network block device</div><div class='del'>-		  1 = /dev/nb1		Second network block device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		Network Block Device is somehow similar to loopback</div><div class='del'>-		devices: If you read from it, it sends packet across</div><div class='del'>-		network asking server for data. If you write to it, it</div><div class='del'>-		sends packet telling server to write. It could be used</div><div class='del'>-		to mounting filesystems over the net, swapping over</div><div class='del'>-		the net, implementing block device in userland etc.</div><div class='del'>-</div><div class='del'>- 44 char	isdn4linux virtual modem - alternate devices</div><div class='del'>-		  0 = /dev/cui0		Callout device for ttyI0</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/cui63	Callout device for ttyI63</div><div class='del'>-</div><div class='del'>- 44 block	Flash Translation Layer (FTL) filesystems</div><div class='del'>-		  0 = /dev/ftla		FTL on first Memory Technology Device</div><div class='del'>-		 16 = /dev/ftlb		FTL on second Memory Technology Device</div><div class='del'>-		 32 = /dev/ftlc		FTL on third Memory Technology Device</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/ftlp		FTL on 16th Memory Technology Device</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the partition</div><div class='del'>-		limit is 15 rather than 63 per disk (same as SCSI.)</div><div class='del'>-</div><div class='del'>- 45 char	isdn4linux ISDN BRI driver</div><div class='del'>-		  0 = /dev/isdn0	First virtual B channel raw data</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/isdn63	64th virtual B channel raw data</div><div class='del'>-		 64 = /dev/isdnctrl0	First channel control/debug</div><div class='del'>-		    ...</div><div class='del'>-		127 = /dev/isdnctrl63	64th channel control/debug</div><div class='del'>-</div><div class='del'>-		128 = /dev/ippp0	First SyncPPP device</div><div class='del'>-		    ...</div><div class='del'>-		191 = /dev/ippp63	64th SyncPPP device</div><div class='del'>-</div><div class='del'>-		255 = /dev/isdninfo	ISDN monitor interface</div><div class='del'>-</div><div class='del'>- 45 block	Parallel port IDE disk devices</div><div class='del'>-		  0 = /dev/pda		First parallel port IDE disk</div><div class='del'>-		 16 = /dev/pdb		Second parallel port IDE disk</div><div class='del'>-		 32 = /dev/pdc		Third parallel port IDE disk</div><div class='del'>-		 48 = /dev/pdd		Fourth parallel port IDE disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the partition</div><div class='del'>-		limit is 15 rather than 63 per disk.</div><div class='del'>-</div><div class='del'>- 46 char	Comtrol Rocketport serial card</div><div class='del'>-		  0 = /dev/ttyR0	First Rocketport port</div><div class='del'>-		  1 = /dev/ttyR1	Second Rocketport port</div><div class='del'>-		    ...</div><div class='del'>- 46 block	Parallel port ATAPI CD-ROM devices</div><div class='del'>-		  0 = /dev/pcd0		First parallel port ATAPI CD-ROM</div><div class='del'>-		  1 = /dev/pcd1		Second parallel port ATAPI CD-ROM</div><div class='del'>-		  2 = /dev/pcd2		Third parallel port ATAPI CD-ROM</div><div class='del'>-		  3 = /dev/pcd3		Fourth parallel port ATAPI CD-ROM</div><div class='del'>-</div><div class='del'>- 47 char	Comtrol Rocketport serial card - alternate devices</div><div class='del'>-		  0 = /dev/cur0		Callout device for ttyR0</div><div class='del'>-		  1 = /dev/cur1		Callout device for ttyR1</div><div class='del'>-		    ...</div><div class='del'>- 47 block	Parallel port ATAPI disk devices</div><div class='del'>-		  0 = /dev/pf0		First parallel port ATAPI disk</div><div class='del'>-		  1 = /dev/pf1		Second parallel port ATAPI disk</div><div class='del'>-		  2 = /dev/pf2		Third parallel port ATAPI disk</div><div class='del'>-		  3 = /dev/pf3		Fourth parallel port ATAPI disk</div><div class='del'>-</div><div class='del'>-		This driver is intended for floppy disks and similar</div><div class='del'>-		devices and hence does not support partitioning.</div><div class='del'>-</div><div class='del'>- 48 char	SDL RISCom serial card</div><div class='del'>-		  0 = /dev/ttyL0	First RISCom port</div><div class='del'>-		  1 = /dev/ttyL1	Second RISCom port</div><div class='del'>-		    ...</div><div class='del'>- 48 block	Mylex DAC960 PCI RAID controller; first controller</div><div class='del'>-		  0 = /dev/rd/c0d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c0d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c0d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		For partitions add:</div><div class='del'>-		  0 = /dev/rd/c?d?	Whole disk</div><div class='del'>-		  1 = /dev/rd/c?d?p1	First partition</div><div class='del'>-		    ...</div><div class='del'>-		  7 = /dev/rd/c?d?p7	Seventh partition</div><div class='del'>-</div><div class='del'>- 49 char	SDL RISCom serial card - alternate devices</div><div class='del'>-		  0 = /dev/cul0		Callout device for ttyL0</div><div class='del'>-		  1 = /dev/cul1		Callout device for ttyL1</div><div class='del'>-		    ...</div><div class='del'>- 49 block	Mylex DAC960 PCI RAID controller; second controller</div><div class='del'>-		  0 = /dev/rd/c1d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c1d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c1d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>- 50 char	Reserved for GLINT</div><div class='del'>-</div><div class='del'>- 50 block	Mylex DAC960 PCI RAID controller; third controller</div><div class='del'>-		  0 = /dev/rd/c2d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c2d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c2d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>- 51 char	Baycom radio modem OR Radio Tech BIM-XXX-RS232 radio modem</div><div class='del'>-		  0 = /dev/bc0		First Baycom radio modem</div><div class='del'>-		  1 = /dev/bc1		Second Baycom radio modem</div><div class='del'>-		    ...</div><div class='del'>- 51 block	Mylex DAC960 PCI RAID controller; fourth controller</div><div class='del'>-		  0 = /dev/rd/c3d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c3d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c3d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>- 52 char	Spellcaster DataComm/BRI ISDN card</div><div class='del'>-		  0 = /dev/dcbri0	First DataComm card</div><div class='del'>-		  1 = /dev/dcbri1	Second DataComm card</div><div class='del'>-		  2 = /dev/dcbri2	Third DataComm card</div><div class='del'>-		  3 = /dev/dcbri3	Fourth DataComm card</div><div class='del'>-</div><div class='del'>- 52 block	Mylex DAC960 PCI RAID controller; fifth controller</div><div class='del'>-		  0 = /dev/rd/c4d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c4d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c4d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>- 53 char	BDM interface for remote debugging MC683xx microcontrollers</div><div class='del'>-		  0 = /dev/pd_bdm0	PD BDM interface on lp0</div><div class='del'>-		  1 = /dev/pd_bdm1	PD BDM interface on lp1</div><div class='del'>-		  2 = /dev/pd_bdm2	PD BDM interface on lp2</div><div class='del'>-		  4 = /dev/icd_bdm0	ICD BDM interface on lp0</div><div class='del'>-		  5 = /dev/icd_bdm1	ICD BDM interface on lp1</div><div class='del'>-		  6 = /dev/icd_bdm2	ICD BDM interface on lp2</div><div class='del'>-</div><div class='del'>-		This device is used for the interfacing to the MC683xx</div><div class='del'>-		microcontrollers via Background Debug Mode by use of a</div><div class='del'>-		Parallel Port interface. PD is the Motorola Public</div><div class='del'>-		Domain Interface and ICD is the commercial interface</div><div class='del'>-		by P&amp;E.</div><div class='del'>-</div><div class='del'>- 53 block	Mylex DAC960 PCI RAID controller; sixth controller</div><div class='del'>-		  0 = /dev/rd/c5d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c5d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c5d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>- 54 char	Electrocardiognosis Holter serial card</div><div class='del'>-		  0 = /dev/holter0	First Holter port</div><div class='del'>-		  1 = /dev/holter1	Second Holter port</div><div class='del'>-		  2 = /dev/holter2	Third Holter port</div><div class='del'>-</div><div class='del'>-		A custom serial card used by Electrocardiognosis SRL</div><div class='del'>-		&lt;mseritan@ottonel.pub.ro&gt; to transfer data from Holter</div><div class='del'>-		24-hour heart monitoring equipment.</div><div class='del'>-</div><div class='del'>- 54 block	Mylex DAC960 PCI RAID controller; seventh controller</div><div class='del'>-		  0 = /dev/rd/c6d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c6d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c6d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>- 55 char	DSP56001 digital signal processor</div><div class='del'>-		  0 = /dev/dsp56k	First DSP56001</div><div class='del'>-</div><div class='del'>- 55 block	Mylex DAC960 PCI RAID controller; eighth controller</div><div class='del'>-		  0 = /dev/rd/c7d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c7d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c7d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>- 56 char	Apple Desktop Bus</div><div class='del'>-		  0 = /dev/adb		ADB bus control</div><div class='del'>-</div><div class='del'>-		Additional devices will be added to this number, all</div><div class='del'>-		starting with /dev/adb.</div><div class='del'>-</div><div class='del'>- 56 block	Fifth IDE hard disk/CD-ROM interface</div><div class='del'>-		  0 = /dev/hdi		Master: whole disk (or CD-ROM)</div><div class='del'>-		 64 = /dev/hdj		Slave: whole disk (or CD-ROM)</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for the first</div><div class='del'>-		interface (see major number 3).</div><div class='del'>-</div><div class='del'>- 57 char	Hayes ESP serial card</div><div class='del'>-		  0 = /dev/ttyP0	First ESP port</div><div class='del'>-		  1 = /dev/ttyP1	Second ESP port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 57 block	Sixth IDE hard disk/CD-ROM interface</div><div class='del'>-		  0 = /dev/hdk		Master: whole disk (or CD-ROM)</div><div class='del'>-		 64 = /dev/hdl		Slave: whole disk (or CD-ROM)</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for the first</div><div class='del'>-		interface (see major number 3).</div><div class='del'>-</div><div class='del'>- 58 char	Hayes ESP serial card - alternate devices</div><div class='del'>-		  0 = /dev/cup0		Callout device for ttyP0</div><div class='del'>-		  1 = /dev/cup1		Callout device for ttyP1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 58 block	Reserved for logical volume manager</div><div class='del'>-</div><div class='del'>- 59 char	sf firewall package</div><div class='del'>-		  0 = /dev/firewall	Communication with sf kernel module</div><div class='del'>-</div><div class='del'>- 59 block	Generic PDA filesystem device</div><div class='del'>-		  0 = /dev/pda0		First PDA device</div><div class='del'>-		  1 = /dev/pda1		Second PDA device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		The pda devices are used to mount filesystems on</div><div class='del'>-		remote pda's (basically slow handheld machines with</div><div class='del'>-		proprietary OS's and limited memory and storage</div><div class='del'>-		running small fs translation drivers) through serial /</div><div class='del'>-		IRDA / parallel links.</div><div class='del'>-</div><div class='del'>-		NAMING CONFLICT -- PROPOSED REVISED NAME /dev/rpda0 etc</div><div class='del'>-</div><div class='del'>- 60-63 char	LOCAL/EXPERIMENTAL USE</div><div class='del'>-</div><div class='del'>- 60-63 block	LOCAL/EXPERIMENTAL USE</div><div class='del'>-		Allocated for local/experimental use.  For devices not</div><div class='del'>-		assigned official numbers, these ranges should be</div><div class='del'>-		used in order to avoid conflicting with future assignments.</div><div class='del'>-</div><div class='del'>- 64 char	ENskip kernel encryption package</div><div class='del'>-		  0 = /dev/enskip	Communication with ENskip kernel module</div><div class='del'>-</div><div class='del'>- 64 block	Scramdisk/DriveCrypt encrypted devices</div><div class='del'>-		  0 = /dev/scramdisk/master    Master node for ioctls</div><div class='del'>-		  1 = /dev/scramdisk/1         First encrypted device</div><div class='del'>-		  2 = /dev/scramdisk/2         Second encrypted device</div><div class='del'>-		  ...</div><div class='del'>-		255 = /dev/scramdisk/255       255th encrypted device</div><div class='del'>-</div><div class='del'>-		The filename of the encrypted container and the passwords</div><div class='del'>-		are sent via ioctls (using the sdmount tool) to the master</div><div class='del'>-		node which then activates them via one of the</div><div class='del'>-		/dev/scramdisk/x nodes for loop mounting (all handled</div><div class='del'>-		through the sdmount tool).</div><div class='del'>-</div><div class='del'>-		Requested by: andy@scramdisklinux.org</div><div class='del'>-</div><div class='del'>- 65 char	Sundance "plink" Transputer boards (obsolete, unused)</div><div class='del'>-		  0 = /dev/plink0	First plink device</div><div class='del'>-		  1 = /dev/plink1	Second plink device</div><div class='del'>-		  2 = /dev/plink2	Third plink device</div><div class='del'>-		  3 = /dev/plink3	Fourth plink device</div><div class='del'>-		 64 = /dev/rplink0	First plink device, raw</div><div class='del'>-		 65 = /dev/rplink1	Second plink device, raw</div><div class='del'>-		 66 = /dev/rplink2	Third plink device, raw</div><div class='del'>-		 67 = /dev/rplink3	Fourth plink device, raw</div><div class='del'>-		128 = /dev/plink0d	First plink device, debug</div><div class='del'>-		129 = /dev/plink1d	Second plink device, debug</div><div class='del'>-		130 = /dev/plink2d	Third plink device, debug</div><div class='del'>-		131 = /dev/plink3d	Fourth plink device, debug</div><div class='del'>-		192 = /dev/rplink0d	First plink device, raw, debug</div><div class='del'>-		193 = /dev/rplink1d	Second plink device, raw, debug</div><div class='del'>-		194 = /dev/rplink2d	Third plink device, raw, debug</div><div class='del'>-		195 = /dev/rplink3d	Fourth plink device, raw, debug</div><div class='del'>-</div><div class='del'>-		This is a commercial driver; contact James Howes</div><div class='del'>-		&lt;jth@prosig.demon.co.uk&gt; for information.</div><div class='del'>-</div><div class='del'>- 65 block	SCSI disk devices (16-31)</div><div class='del'>-		  0 = /dev/sdq		17th SCSI disk whole disk</div><div class='del'>-		 16 = /dev/sdr		18th SCSI disk whole disk</div><div class='del'>-		 32 = /dev/sds		19th SCSI disk whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/sdaf		32nd SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 66 char	YARC PowerPC PCI coprocessor card</div><div class='del'>-		  0 = /dev/yppcpci0	First YARC card</div><div class='del'>-		  1 = /dev/yppcpci1	Second YARC card</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 66 block	SCSI disk devices (32-47)</div><div class='del'>-		  0 = /dev/sdag		33th SCSI disk whole disk</div><div class='del'>-		 16 = /dev/sdah		34th SCSI disk whole disk</div><div class='del'>-		 32 = /dev/sdai		35th SCSI disk whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/sdav		48nd SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 67 char	Coda network file system</div><div class='del'>-		  0 = /dev/cfs0		Coda cache manager</div><div class='del'>-</div><div class='del'>-		See http://www.coda.cs.cmu.edu for information about Coda.</div><div class='del'>-</div><div class='del'>- 67 block	SCSI disk devices (48-63)</div><div class='del'>-		  0 = /dev/sdaw		49th SCSI disk whole disk</div><div class='del'>-		 16 = /dev/sdax		50th SCSI disk whole disk</div><div class='del'>-		 32 = /dev/sday		51st SCSI disk whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/sdbl		64th SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 68 char	CAPI 2.0 interface</div><div class='del'>-		  0 = /dev/capi20	Control device</div><div class='del'>-		  1 = /dev/capi20.00	First CAPI 2.0 application</div><div class='del'>-		  2 = /dev/capi20.01	Second CAPI 2.0 application</div><div class='del'>-		    ...</div><div class='del'>-		 20 = /dev/capi20.19	19th CAPI 2.0 application</div><div class='del'>-</div><div class='del'>-		ISDN CAPI 2.0 driver for use with CAPI 2.0</div><div class='del'>-		applications; currently supports the AVM B1 card.</div><div class='del'>-</div><div class='del'>- 68 block	SCSI disk devices (64-79)</div><div class='del'>-		  0 = /dev/sdbm		65th SCSI disk whole disk</div><div class='del'>-		 16 = /dev/sdbn		66th SCSI disk whole disk</div><div class='del'>-		 32 = /dev/sdbo		67th SCSI disk whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/sdcb		80th SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 69 char	MA16 numeric accelerator card</div><div class='del'>-		  0 = /dev/ma16		Board memory access</div><div class='del'>-</div><div class='del'>- 69 block	SCSI disk devices (80-95)</div><div class='del'>-		  0 = /dev/sdcc		81st SCSI disk whole disk</div><div class='del'>-		 16 = /dev/sdcd		82nd SCSI disk whole disk</div><div class='del'>-		 32 = /dev/sdce		83th SCSI disk whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/sdcr		96th SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 70 char	SpellCaster Protocol Services Interface</div><div class='del'>-		  0 = /dev/apscfg	Configuration interface</div><div class='del'>-		  1 = /dev/apsauth	Authentication interface</div><div class='del'>-		  2 = /dev/apslog	Logging interface</div><div class='del'>-		  3 = /dev/apsdbg	Debugging interface</div><div class='del'>-		 64 = /dev/apsisdn	ISDN command interface</div><div class='del'>-		 65 = /dev/apsasync	Async command interface</div><div class='del'>-		128 = /dev/apsmon	Monitor interface</div><div class='del'>-</div><div class='del'>- 70 block	SCSI disk devices (96-111)</div><div class='del'>-		  0 = /dev/sdcs		97th SCSI disk whole disk</div><div class='del'>-		 16 = /dev/sdct		98th SCSI disk whole disk</div><div class='del'>-		 32 = /dev/sdcu		99th SCSI disk whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/sddh		112nd SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 71 char	Computone IntelliPort II serial card</div><div class='del'>-		  0 = /dev/ttyF0	IntelliPort II board 0, port 0</div><div class='del'>-		  1 = /dev/ttyF1	IntelliPort II board 0, port 1</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/ttyF63	IntelliPort II board 0, port 63</div><div class='del'>-		 64 = /dev/ttyF64	IntelliPort II board 1, port 0</div><div class='del'>-		 65 = /dev/ttyF65	IntelliPort II board 1, port 1</div><div class='del'>-		    ...</div><div class='del'>-		127 = /dev/ttyF127	IntelliPort II board 1, port 63</div><div class='del'>-		128 = /dev/ttyF128	IntelliPort II board 2, port 0</div><div class='del'>-		129 = /dev/ttyF129	IntelliPort II board 2, port 1</div><div class='del'>-		    ...</div><div class='del'>-		191 = /dev/ttyF191	IntelliPort II board 2, port 63</div><div class='del'>-		192 = /dev/ttyF192	IntelliPort II board 3, port 0</div><div class='del'>-		193 = /dev/ttyF193	IntelliPort II board 3, port 1</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/ttyF255	IntelliPort II board 3, port 63</div><div class='del'>-</div><div class='del'>- 71 block	SCSI disk devices (112-127)</div><div class='del'>-		  0 = /dev/sddi		113th SCSI disk whole disk</div><div class='del'>-		 16 = /dev/sddj		114th SCSI disk whole disk</div><div class='del'>-		 32 = /dev/sddk		115th SCSI disk whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/sddx		128th SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 72 char	Computone IntelliPort II serial card - alternate devices</div><div class='del'>-		  0 = /dev/cuf0		Callout device for ttyF0</div><div class='del'>-		  1 = /dev/cuf1		Callout device for ttyF1</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/cuf63	Callout device for ttyF63</div><div class='del'>-		 64 = /dev/cuf64	Callout device for ttyF64</div><div class='del'>-		 65 = /dev/cuf65	Callout device for ttyF65</div><div class='del'>-		    ...</div><div class='del'>-		127 = /dev/cuf127	Callout device for ttyF127</div><div class='del'>-		128 = /dev/cuf128	Callout device for ttyF128</div><div class='del'>-		129 = /dev/cuf129	Callout device for ttyF129</div><div class='del'>-		    ...</div><div class='del'>-		191 = /dev/cuf191	Callout device for ttyF191</div><div class='del'>-		192 = /dev/cuf192	Callout device for ttyF192</div><div class='del'>-		193 = /dev/cuf193	Callout device for ttyF193</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/cuf255	Callout device for ttyF255</div><div class='del'>-</div><div class='del'>- 72 block	Compaq Intelligent Drive Array, first controller</div><div class='del'>-		  0 = /dev/ida/c0d0	First logical drive whole disk</div><div class='del'>-		 16 = /dev/ida/c0d1	Second logical drive whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/ida/c0d15	16th logical drive whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 73 char	Computone IntelliPort II serial card - control devices</div><div class='del'>-		  0 = /dev/ip2ipl0	Loadware device for board 0</div><div class='del'>-		  1 = /dev/ip2stat0	Status device for board 0</div><div class='del'>-		  4 = /dev/ip2ipl1	Loadware device for board 1</div><div class='del'>-		  5 = /dev/ip2stat1	Status device for board 1</div><div class='del'>-		  8 = /dev/ip2ipl2	Loadware device for board 2</div><div class='del'>-		  9 = /dev/ip2stat2	Status device for board 2</div><div class='del'>-		 12 = /dev/ip2ipl3	Loadware device for board 3</div><div class='del'>-		 13 = /dev/ip2stat3	Status device for board 3</div><div class='del'>-</div><div class='del'>- 73 block	Compaq Intelligent Drive Array, second controller</div><div class='del'>-		  0 = /dev/ida/c1d0	First logical drive whole disk</div><div class='del'>-		 16 = /dev/ida/c1d1	Second logical drive whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/ida/c1d15	16th logical drive whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 74 char	SCI bridge</div><div class='del'>-		  0 = /dev/SCI/0	SCI device 0</div><div class='del'>-		  1 = /dev/SCI/1	SCI device 1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		Currently for Dolphin Interconnect Solutions' PCI-SCI</div><div class='del'>-		bridge.</div><div class='del'>-</div><div class='del'>- 74 block	Compaq Intelligent Drive Array, third controller</div><div class='del'>-		  0 = /dev/ida/c2d0	First logical drive whole disk</div><div class='del'>-		 16 = /dev/ida/c2d1	Second logical drive whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/ida/c2d15	16th logical drive whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 75 char	Specialix IO8+ serial card</div><div class='del'>-		  0 = /dev/ttyW0	First IO8+ port, first card</div><div class='del'>-		  1 = /dev/ttyW1	Second IO8+ port, first card</div><div class='del'>-		    ...</div><div class='del'>-		  8 = /dev/ttyW8	First IO8+ port, second card</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 75 block	Compaq Intelligent Drive Array, fourth controller</div><div class='del'>-		  0 = /dev/ida/c3d0	First logical drive whole disk</div><div class='del'>-		 16 = /dev/ida/c3d1	Second logical drive whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/ida/c3d15	16th logical drive whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 76 char	Specialix IO8+ serial card - alternate devices</div><div class='del'>-		  0 = /dev/cuw0		Callout device for ttyW0</div><div class='del'>-		  1 = /dev/cuw1		Callout device for ttyW1</div><div class='del'>-		    ...</div><div class='del'>-		  8 = /dev/cuw8		Callout device for ttyW8</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 76 block	Compaq Intelligent Drive Array, fifth controller</div><div class='del'>-		  0 = /dev/ida/c4d0	First logical drive whole disk</div><div class='del'>-		 16 = /dev/ida/c4d1	Second logical drive whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/ida/c4d15	16th logical drive whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- 77 char	ComScire Quantum Noise Generator</div><div class='del'>-		  0 = /dev/qng		ComScire Quantum Noise Generator</div><div class='del'>-</div><div class='del'>- 77 block	Compaq Intelligent Drive Array, sixth controller</div><div class='del'>-		  0 = /dev/ida/c5d0	First logical drive whole disk</div><div class='del'>-		 16 = /dev/ida/c5d1	Second logical drive whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/ida/c5d15	16th logical drive whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 78 char	PAM Software's multimodem boards</div><div class='del'>-		  0 = /dev/ttyM0	First PAM modem</div><div class='del'>-		  1 = /dev/ttyM1	Second PAM modem</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 78 block	Compaq Intelligent Drive Array, seventh controller</div><div class='del'>-		  0 = /dev/ida/c6d0	First logical drive whole disk</div><div class='del'>-		 16 = /dev/ida/c6d1	Second logical drive whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/ida/c6d15	16th logical drive whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 79 char	PAM Software's multimodem boards - alternate devices</div><div class='del'>-		  0 = /dev/cum0		Callout device for ttyM0</div><div class='del'>-		  1 = /dev/cum1		Callout device for ttyM1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 79 block	Compaq Intelligent Drive Array, eighth controller</div><div class='del'>-		  0 = /dev/ida/c7d0	First logical drive whole disk</div><div class='del'>-		 16 = /dev/ida/c7d1	Second logical drive whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/ida/c715	16th logical drive whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 80 char	Photometrics AT200 CCD camera</div><div class='del'>-		  0 = /dev/at200	Photometrics AT200 CCD camera</div><div class='del'>-</div><div class='del'>- 80 block	I2O hard disk</div><div class='del'>-		  0 = /dev/i2o/hda	First I2O hard disk, whole disk</div><div class='del'>-		 16 = /dev/i2o/hdb	Second I2O hard disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/i2o/hdp	16th I2O hard disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 81 char	video4linux</div><div class='del'>-		  0 = /dev/video0	Video capture/overlay device</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/video63	Video capture/overlay device</div><div class='del'>-		 64 = /dev/radio0	Radio device</div><div class='del'>-		    ...</div><div class='del'>-		127 = /dev/radio63	Radio device</div><div class='del'>-		128 = /dev/swradio0	Software Defined Radio device</div><div class='del'>-		    ...</div><div class='del'>-		191 = /dev/swradio63	Software Defined Radio device</div><div class='del'>-		224 = /dev/vbi0		Vertical blank interrupt</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/vbi31	Vertical blank interrupt</div><div class='del'>-</div><div class='del'>-		Minor numbers are allocated dynamically unless</div><div class='del'>-		CONFIG_VIDEO_FIXED_MINOR_RANGES (default n)</div><div class='del'>-		configuration option is set.</div><div class='del'>-</div><div class='del'>- 81 block	I2O hard disk</div><div class='del'>-		  0 = /dev/i2o/hdq	17th I2O hard disk, whole disk</div><div class='del'>-		 16 = /dev/i2o/hdr	18th I2O hard disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/i2o/hdaf	32nd I2O hard disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 82 char	WiNRADiO communications receiver card</div><div class='del'>-		  0 = /dev/winradio0	First WiNRADiO card</div><div class='del'>-		  1 = /dev/winradio1	Second WiNRADiO card</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		The driver and documentation may be obtained from</div><div class='del'>-		http://www.winradio.com/</div><div class='del'>-</div><div class='del'>- 82 block	I2O hard disk</div><div class='del'>-		  0 = /dev/i2o/hdag	33rd I2O hard disk, whole disk</div><div class='del'>-		 16 = /dev/i2o/hdah	34th I2O hard disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/i2o/hdav	48th I2O hard disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 83 char	Matrox mga_vid video driver</div><div class='del'>- 		 0 = /dev/mga_vid0	1st video card</div><div class='del'>-		 1 = /dev/mga_vid1	2nd video card</div><div class='del'>-		 2 = /dev/mga_vid2	3rd video card</div><div class='del'>-		  ...</div><div class='del'>-	        15 = /dev/mga_vid15	16th video card</div><div class='del'>-</div><div class='del'>- 83 block	I2O hard disk</div><div class='del'>-		  0 = /dev/i2o/hdaw	49th I2O hard disk, whole disk</div><div class='del'>-		 16 = /dev/i2o/hdax	50th I2O hard disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/i2o/hdbl	64th I2O hard disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 84 char	Ikon 1011[57] Versatec Greensheet Interface</div><div class='del'>-		  0 = /dev/ihcp0	First Greensheet port</div><div class='del'>-		  1 = /dev/ihcp1	Second Greensheet port</div><div class='del'>-</div><div class='del'>- 84 block	I2O hard disk</div><div class='del'>-		  0 = /dev/i2o/hdbm	65th I2O hard disk, whole disk</div><div class='del'>-		 16 = /dev/i2o/hdbn	66th I2O hard disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/i2o/hdcb	80th I2O hard disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 85 char	Linux/SGI shared memory input queue</div><div class='del'>-		  0 = /dev/shmiq	Master shared input queue</div><div class='del'>-		  1 = /dev/qcntl0	First device pushed</div><div class='del'>-		  2 = /dev/qcntl1	Second device pushed</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 85 block	I2O hard disk</div><div class='del'>-		  0 = /dev/i2o/hdcc	81st I2O hard disk, whole disk</div><div class='del'>-		 16 = /dev/i2o/hdcd	82nd I2O hard disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/i2o/hdcr	96th I2O hard disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 86 char	SCSI media changer</div><div class='del'>-		  0 = /dev/sch0		First SCSI media changer</div><div class='del'>-		  1 = /dev/sch1		Second SCSI media changer</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 86 block	I2O hard disk</div><div class='del'>-		  0 = /dev/i2o/hdcs	97th I2O hard disk, whole disk</div><div class='del'>-		 16 = /dev/i2o/hdct	98th I2O hard disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/i2o/hddh	112th I2O hard disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 87 char	Sony Control-A1 stereo control bus</div><div class='del'>-		  0 = /dev/controla0	First device on chain</div><div class='del'>-		  1 = /dev/controla1	Second device on chain</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 87 block	I2O hard disk</div><div class='del'>-		  0 = /dev/i2o/hddi	113rd I2O hard disk, whole disk</div><div class='del'>-		 16 = /dev/i2o/hddj	114th I2O hard disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/i2o/hddx	128th I2O hard disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 88 char	COMX synchronous serial card</div><div class='del'>-		  0 = /dev/comx0	COMX channel 0</div><div class='del'>-		  1 = /dev/comx1	COMX channel 1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 88 block	Seventh IDE hard disk/CD-ROM interface</div><div class='del'>-		  0 = /dev/hdm		Master: whole disk (or CD-ROM)</div><div class='del'>-		 64 = /dev/hdn		Slave: whole disk (or CD-ROM)</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for the first</div><div class='del'>-		interface (see major number 3).</div><div class='del'>-</div><div class='del'>- 89 char	I2C bus interface</div><div class='del'>-		  0 = /dev/i2c-0	First I2C adapter</div><div class='del'>-		  1 = /dev/i2c-1	Second I2C adapter</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 89 block	Eighth IDE hard disk/CD-ROM interface</div><div class='del'>-		  0 = /dev/hdo		Master: whole disk (or CD-ROM)</div><div class='del'>-		 64 = /dev/hdp		Slave: whole disk (or CD-ROM)</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for the first</div><div class='del'>-		interface (see major number 3).</div><div class='del'>-</div><div class='del'>- 90 char	Memory Technology Device (RAM, ROM, Flash)</div><div class='del'>-		  0 = /dev/mtd0		First MTD (rw)</div><div class='del'>-		  1 = /dev/mtdr0	First MTD (ro)</div><div class='del'>-		    ...</div><div class='del'>-		 30 = /dev/mtd15	16th MTD (rw)</div><div class='del'>-		 31 = /dev/mtdr15	16th MTD (ro)</div><div class='del'>-</div><div class='del'>- 90 block	Ninth IDE hard disk/CD-ROM interface</div><div class='del'>-		  0 = /dev/hdq		Master: whole disk (or CD-ROM)</div><div class='del'>-		 64 = /dev/hdr		Slave: whole disk (or CD-ROM)</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for the first</div><div class='del'>-		interface (see major number 3).</div><div class='del'>-</div><div class='del'>- 91 char	CAN-Bus devices</div><div class='del'>-		  0 = /dev/can0		First CAN-Bus controller</div><div class='del'>-		  1 = /dev/can1		Second CAN-Bus controller</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 91 block	Tenth IDE hard disk/CD-ROM interface</div><div class='del'>-		  0 = /dev/hds		Master: whole disk (or CD-ROM)</div><div class='del'>-		 64 = /dev/hdt		Slave: whole disk (or CD-ROM)</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for the first</div><div class='del'>-		interface (see major number 3).</div><div class='del'>-</div><div class='del'>- 92 char	Reserved for ith Kommunikationstechnik MIC ISDN card</div><div class='del'>-</div><div class='del'>- 92 block	PPDD encrypted disk driver</div><div class='del'>-		  0 = /dev/ppdd0	First encrypted disk</div><div class='del'>-		  1 = /dev/ppdd1	Second encrypted disk</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>- 93 char</div><div class='del'>-</div><div class='del'>- 93 block	NAND Flash Translation Layer filesystem</div><div class='del'>-		  0 = /dev/nftla	First NFTL layer</div><div class='del'>-		 16 = /dev/nftlb	Second NFTL layer</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/nftlp	16th NTFL layer</div><div class='del'>-</div><div class='del'>- 94 char</div><div class='del'>-</div><div class='del'>- 94 block	IBM S/390 DASD block storage</div><div class='del'>-    		  0 = /dev/dasda First DASD device, major</div><div class='del'>-    		  1 = /dev/dasda1 First DASD device, block 1</div><div class='del'>-	    	  2 = /dev/dasda2 First DASD device, block 2</div><div class='del'>-    		  3 = /dev/dasda3 First DASD device, block 3</div><div class='del'>-    		  4 = /dev/dasdb Second DASD device, major</div><div class='del'>-    		  5 = /dev/dasdb1 Second DASD device, block 1</div><div class='del'>-    		  6 = /dev/dasdb2 Second DASD device, block 2</div><div class='del'>-    		  7 = /dev/dasdb3 Second DASD device, block 3</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 95 char	IP filter</div><div class='del'>-		  0 = /dev/ipl		Filter control device/log file</div><div class='del'>-		  1 = /dev/ipnat	NAT control device/log file</div><div class='del'>-		  2 = /dev/ipstate	State information log file</div><div class='del'>-		  3 = /dev/ipauth	Authentication control device/log file</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 96 char	Parallel port ATAPI tape devices</div><div class='del'>-		  0 = /dev/pt0		First parallel port ATAPI tape</div><div class='del'>-		  1 = /dev/pt1		Second parallel port ATAPI tape</div><div class='del'>-		    ...</div><div class='del'>-		128 = /dev/npt0		First p.p. ATAPI tape, no rewind</div><div class='del'>-		129 = /dev/npt1		Second p.p. ATAPI tape, no rewind</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 96 block	Inverse NAND Flash Translation Layer</div><div class='del'>-		  0 = /dev/inftla First INFTL layer</div><div class='del'>-		 16 = /dev/inftlb Second INFTL layer</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/inftlp	16th INTFL layer</div><div class='del'>-</div><div class='del'>- 97 char	Parallel port generic ATAPI interface</div><div class='del'>-		  0 = /dev/pg0		First parallel port ATAPI device</div><div class='del'>-		  1 = /dev/pg1		Second parallel port ATAPI device</div><div class='del'>-		  2 = /dev/pg2		Third parallel port ATAPI device</div><div class='del'>-		  3 = /dev/pg3		Fourth parallel port ATAPI device</div><div class='del'>-</div><div class='del'>-		These devices support the same API as the generic SCSI</div><div class='del'>-		devices.</div><div class='del'>-</div><div class='del'>- 98 char	Control and Measurement Device (comedi)</div><div class='del'>-		  0 = /dev/comedi0	First comedi device</div><div class='del'>-		  1 = /dev/comedi1	Second comedi device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		See http://stm.lbl.gov/comedi.</div><div class='del'>-</div><div class='del'>- 98 block	User-mode virtual block device</div><div class='del'>-		  0 = /dev/ubda		First user-mode block device</div><div class='del'>-		 16 = /dev/udbb		Second user-mode block device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-		This device is used by the user-mode virtual kernel port.</div><div class='del'>-</div><div class='del'>- 99 char	Raw parallel ports</div><div class='del'>-		  0 = /dev/parport0	First parallel port</div><div class='del'>-		  1 = /dev/parport1	Second parallel port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>- 99 block	JavaStation flash disk</div><div class='del'>-		  0 = /dev/jsfd		JavaStation flash disk</div><div class='del'>-</div><div class='del'>-100 char	Telephony for Linux</div><div class='del'>-		  0 = /dev/phone0	First telephony device</div><div class='del'>-		  1 = /dev/phone1	Second telephony device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-101 char	Motorola DSP 56xxx board</div><div class='del'>-		  0 = /dev/mdspstat	Status information</div><div class='del'>-		  1 = /dev/mdsp1	First DSP board I/O controls</div><div class='del'>-		    ...</div><div class='del'>-		 16 = /dev/mdsp16	16th DSP board I/O controls</div><div class='del'>-</div><div class='del'>-101 block	AMI HyperDisk RAID controller</div><div class='del'>-		  0 = /dev/amiraid/ar0	First array whole disk</div><div class='del'>-		 16 = /dev/amiraid/ar1	Second array whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/amiraid/ar15	16th array whole disk</div><div class='del'>-</div><div class='del'>-		For each device, partitions are added as:</div><div class='del'>-		  0 = /dev/amiraid/ar?	  Whole disk</div><div class='del'>-		  1 = /dev/amiraid/ar?p1  First partition</div><div class='del'>-		  2 = /dev/amiraid/ar?p2  Second partition</div><div class='del'>-		    ...</div><div class='del'>-		 15 = /dev/amiraid/ar?p15 15th partition</div><div class='del'>-</div><div class='del'>-102 char</div><div class='del'>-</div><div class='del'>-102 block	Compressed block device</div><div class='del'>-		  0 = /dev/cbd/a	First compressed block device, whole device</div><div class='del'>-		 16 = /dev/cbd/b	Second compressed block device, whole device</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/cbd/p	16th compressed block device, whole device</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-103 char	Arla network file system</div><div class='del'>-		  0 = /dev/nnpfs0	First NNPFS device</div><div class='del'>-		  1 = /dev/nnpfs1	Second NNPFS device</div><div class='del'>-</div><div class='del'>-		Arla is a free clone of the Andrew File System, AFS.</div><div class='del'>-		The NNPFS device gives user mode filesystem</div><div class='del'>-		implementations a kernel presence for caching and easy</div><div class='del'>-		mounting.  For more information about the project,</div><div class='del'>-		write to &lt;arla-drinkers@stacken.kth.se&gt; or see</div><div class='del'>-		http://www.stacken.kth.se/project/arla/</div><div class='del'>-</div><div class='del'>-103 block	Audit device</div><div class='del'>-		  0 = /dev/audit	Audit device</div><div class='del'>-</div><div class='del'>-104 char	Flash BIOS support</div><div class='del'>-</div><div class='del'>-104 block	Compaq Next Generation Drive Array, first controller</div><div class='del'>-		  0 = /dev/cciss/c0d0	First logical drive, whole disk</div><div class='del'>-		 16 = /dev/cciss/c0d1	Second logical drive, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/cciss/c0d15	16th logical drive, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-105 char	Comtrol VS-1000 serial controller</div><div class='del'>-		  0 = /dev/ttyV0	First VS-1000 port</div><div class='del'>-		  1 = /dev/ttyV1	Second VS-1000 port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-105 block	Compaq Next Generation Drive Array, second controller</div><div class='del'>-		  0 = /dev/cciss/c1d0	First logical drive, whole disk</div><div class='del'>-		 16 = /dev/cciss/c1d1	Second logical drive, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/cciss/c1d15	16th logical drive, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-106 char	Comtrol VS-1000 serial controller - alternate devices</div><div class='del'>-		  0 = /dev/cuv0		First VS-1000 port</div><div class='del'>-		  1 = /dev/cuv1		Second VS-1000 port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-106 block	Compaq Next Generation Drive Array, third controller</div><div class='del'>-		  0 = /dev/cciss/c2d0	First logical drive, whole disk</div><div class='del'>-		 16 = /dev/cciss/c2d1	Second logical drive, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/cciss/c2d15	16th logical drive, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-107 char	3Dfx Voodoo Graphics device</div><div class='del'>-		  0 = /dev/3dfx		Primary 3Dfx graphics device</div><div class='del'>-</div><div class='del'>-107 block	Compaq Next Generation Drive Array, fourth controller</div><div class='del'>-		  0 = /dev/cciss/c3d0	First logical drive, whole disk</div><div class='del'>-		 16 = /dev/cciss/c3d1	Second logical drive, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/cciss/c3d15	16th logical drive, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-108 char	Device independent PPP interface</div><div class='del'>-		  0 = /dev/ppp		Device independent PPP interface</div><div class='del'>-</div><div class='del'>-108 block	Compaq Next Generation Drive Array, fifth controller</div><div class='del'>-		  0 = /dev/cciss/c4d0	First logical drive, whole disk</div><div class='del'>-		 16 = /dev/cciss/c4d1	Second logical drive, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/cciss/c4d15	16th logical drive, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-109 char	Reserved for logical volume manager</div><div class='del'>-</div><div class='del'>-109 block	Compaq Next Generation Drive Array, sixth controller</div><div class='del'>-		  0 = /dev/cciss/c5d0	First logical drive, whole disk</div><div class='del'>-		 16 = /dev/cciss/c5d1	Second logical drive, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/cciss/c5d15	16th logical drive, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-110 char	miroMEDIA Surround board</div><div class='del'>-		  0 = /dev/srnd0	First miroMEDIA Surround board</div><div class='del'>-		  1 = /dev/srnd1	Second miroMEDIA Surround board</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-110 block	Compaq Next Generation Drive Array, seventh controller</div><div class='del'>-		  0 = /dev/cciss/c6d0	First logical drive, whole disk</div><div class='del'>-		 16 = /dev/cciss/c6d1	Second logical drive, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/cciss/c6d15	16th logical drive, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-111 char</div><div class='del'>-</div><div class='del'>-111 block	Compaq Next Generation Drive Array, eighth controller</div><div class='del'>-		  0 = /dev/cciss/c7d0	First logical drive, whole disk</div><div class='del'>-		 16 = /dev/cciss/c7d1	Second logical drive, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/cciss/c7d15	16th logical drive, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled the same way as for Mylex</div><div class='del'>-		DAC960 (see major number 48) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-112 char	ISI serial card</div><div class='del'>-		  0 = /dev/ttyM0	First ISI port</div><div class='del'>-		  1 = /dev/ttyM1	Second ISI port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		There is currently a device-naming conflict between</div><div class='del'>-		these and PAM multimodems (major 78).</div><div class='del'>-</div><div class='del'>-112 block	IBM iSeries virtual disk</div><div class='del'>-		  0 = /dev/iseries/vda	First virtual disk, whole disk</div><div class='del'>-		  8 = /dev/iseries/vdb	Second virtual disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		200 = /dev/iseries/vdz	26th virtual disk, whole disk</div><div class='del'>-		208 = /dev/iseries/vdaa	27th virtual disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/iseries/vdaf	32nd virtual disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 7.</div><div class='del'>-</div><div class='del'>-113 char	ISI serial card - alternate devices</div><div class='del'>-		  0 = /dev/cum0		Callout device for ttyM0</div><div class='del'>-		  1 = /dev/cum1		Callout device for ttyM1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-113 block	IBM iSeries virtual CD-ROM</div><div class='del'>-		  0 = /dev/iseries/vcda	First virtual CD-ROM</div><div class='del'>-		  1 = /dev/iseries/vcdb	Second virtual CD-ROM</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-114 char	Picture Elements ISE board</div><div class='del'>-		  0 = /dev/ise0		First ISE board</div><div class='del'>-		  1 = /dev/ise1		Second ISE board</div><div class='del'>-		    ...</div><div class='del'>-		128 = /dev/isex0	Control node for first ISE board</div><div class='del'>-		129 = /dev/isex1	Control node for second ISE board</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		The ISE board is an embedded computer, optimized for</div><div class='del'>-		image processing. The /dev/iseN nodes are the general</div><div class='del'>-		I/O access to the board, the /dev/isex0 nodes command</div><div class='del'>-		nodes used to control the board.</div><div class='del'>-</div><div class='del'>-114 block       IDE BIOS powered software RAID interfaces such as the</div><div class='del'>-                Promise Fastrak</div><div class='del'>-</div><div class='del'>-                  0 = /dev/ataraid/d0</div><div class='del'>-                  1 = /dev/ataraid/d0p1</div><div class='del'>-                  2 = /dev/ataraid/d0p2</div><div class='del'>-                  ...</div><div class='del'>-                 16 = /dev/ataraid/d1</div><div class='del'>-                 17 = /dev/ataraid/d1p1</div><div class='del'>-                 18 = /dev/ataraid/d1p2</div><div class='del'>-                  ...</div><div class='del'>-                255 = /dev/ataraid/d15p15</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-115 char	TI link cable devices (115 was formerly the console driver speaker)</div><div class='del'>-		  0 = /dev/tipar0    Parallel cable on first parallel port</div><div class='del'>-		  ...</div><div class='del'>-		  7 = /dev/tipar7    Parallel cable on seventh parallel port</div><div class='del'>-</div><div class='del'>-		  8 = /dev/tiser0    Serial cable on first serial port</div><div class='del'>-		  ...</div><div class='del'>-		 15 = /dev/tiser7    Serial cable on seventh serial port</div><div class='del'>-</div><div class='del'>-		 16 = /dev/tiusb0    First USB cable</div><div class='del'>-		  ...</div><div class='del'>-		 47 = /dev/tiusb31   32nd USB cable</div><div class='del'>-</div><div class='del'>-115 block       NetWare (NWFS) Devices (0-255)</div><div class='del'>-</div><div class='del'>-                The NWFS (NetWare) devices are used to present a</div><div class='del'>-                collection of NetWare Mirror Groups or NetWare</div><div class='del'>-                Partitions as a logical storage segment for</div><div class='del'>-                use in mounting NetWare volumes.  A maximum of</div><div class='del'>-                256 NetWare volumes can be supported in a single</div><div class='del'>-                machine.</div><div class='del'>-</div><div class='del'>-                http://cgfa.telepac.pt/ftp2/kernel.org/linux/kernel/people/jmerkey/nwfs/</div><div class='del'>-</div><div class='del'>-                0 = /dev/nwfs/v0    First NetWare (NWFS) Logical Volume</div><div class='del'>-                1 = /dev/nwfs/v1    Second NetWare (NWFS) Logical Volume</div><div class='del'>-                2 = /dev/nwfs/v2    Third NetWare (NWFS) Logical Volume</div><div class='del'>-                      ...</div><div class='del'>-                255 = /dev/nwfs/v255    Last NetWare (NWFS) Logical Volume</div><div class='del'>-</div><div class='del'>-116 char	Advanced Linux Sound Driver (ALSA)</div><div class='del'>-</div><div class='del'>-116 block       MicroMemory battery backed RAM adapter (NVRAM)</div><div class='del'>-                Supports 16 boards, 15 partitions each.</div><div class='del'>-                Requested by neilb at cse.unsw.edu.au.</div><div class='del'>-</div><div class='del'>-		 0 = /dev/umem/d0      Whole of first board</div><div class='del'>-		 1 = /dev/umem/d0p1    First partition of first board</div><div class='del'>-		 2 = /dev/umem/d0p2    Second partition of first board</div><div class='del'>-		15 = /dev/umem/d0p15   15th partition of first board</div><div class='del'>-</div><div class='del'>-		16 = /dev/umem/d1      Whole of second board</div><div class='del'>-		17 = /dev/umem/d1p1    First partition of second board</div><div class='del'>-		    ...</div><div class='del'>-		255= /dev/umem/d15p15  15th partition of 16th board.</div><div class='del'>-</div><div class='del'>-117 char	COSA/SRP synchronous serial card</div><div class='del'>-		  0 = /dev/cosa0c0	1st board, 1st channel</div><div class='del'>-		  1 = /dev/cosa0c1	1st board, 2nd channel</div><div class='del'>-		    ...</div><div class='del'>-		 16 = /dev/cosa1c0	2nd board, 1st channel</div><div class='del'>-		 17 = /dev/cosa1c1	2nd board, 2nd channel</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-117 block       Enterprise Volume Management System (EVMS)</div><div class='del'>-</div><div class='del'>-                The EVMS driver uses a layered, plug-in model to provide</div><div class='del'>-                unparalleled flexibility and extensibility in managing</div><div class='del'>-                storage.  This allows for easy expansion or customization</div><div class='del'>-                of various levels of volume management.  Requested by</div><div class='del'>-                Mark Peloquin (peloquin at us.ibm.com).</div><div class='del'>-</div><div class='del'>-                Note: EVMS populates and manages all the devnodes in</div><div class='del'>-                /dev/evms.</div><div class='del'>-</div><div class='del'>-                http://sf.net/projects/evms</div><div class='del'>-</div><div class='del'>-                  0 = /dev/evms/block_device   EVMS block device</div><div class='del'>-                  1 = /dev/evms/legacyname1    First EVMS legacy device</div><div class='del'>-                  2 = /dev/evms/legacyname2    Second EVMS legacy device</div><div class='del'>-                    ...</div><div class='del'>-                    Both ranges can grow (down or up) until they meet.</div><div class='del'>-                    ...</div><div class='del'>-                254 = /dev/evms/EVMSname2      Second EVMS native device</div><div class='del'>-                255 = /dev/evms/EVMSname1      First EVMS native device</div><div class='del'>-</div><div class='del'>-                Note: legacyname(s) are derived from the normal legacy</div><div class='del'>-                device names.  For example, /dev/hda5 would become</div><div class='del'>-                /dev/evms/hda5.</div><div class='del'>-</div><div class='del'>-118 char	IBM Cryptographic Accelerator</div><div class='del'>-		  0 = /dev/ica	Virtual interface to all IBM Crypto Accelerators</div><div class='del'>-		  1 = /dev/ica0	IBMCA Device 0</div><div class='del'>-		  2 = /dev/ica1	IBMCA Device 1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-119 char	VMware virtual network control</div><div class='del'>-		  0 = /dev/vnet0	1st virtual network</div><div class='del'>-		  1 = /dev/vnet1	2nd virtual network</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-120-127 char	LOCAL/EXPERIMENTAL USE</div><div class='del'>-</div><div class='del'>-120-127 block	LOCAL/EXPERIMENTAL USE</div><div class='del'>-		Allocated for local/experimental use.  For devices not</div><div class='del'>-		assigned official numbers, these ranges should be</div><div class='del'>-		used in order to avoid conflicting with future assignments.</div><div class='del'>-</div><div class='del'>-128-135 char	Unix98 PTY masters</div><div class='del'>-</div><div class='del'>-		These devices should not have corresponding device</div><div class='del'>-		nodes; instead they should be accessed through the</div><div class='del'>-		/dev/ptmx cloning interface.</div><div class='del'>-</div><div class='del'>-128 block       SCSI disk devices (128-143)</div><div class='del'>-                  0 = /dev/sddy         129th SCSI disk whole disk</div><div class='del'>-                 16 = /dev/sddz         130th SCSI disk whole disk</div><div class='del'>-                 32 = /dev/sdea         131th SCSI disk whole disk</div><div class='del'>-                    ...</div><div class='del'>-                240 = /dev/sden         144th SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-129 block       SCSI disk devices (144-159)</div><div class='del'>-                  0 = /dev/sdeo         145th SCSI disk whole disk</div><div class='del'>-                 16 = /dev/sdep         146th SCSI disk whole disk</div><div class='del'>-                 32 = /dev/sdeq         147th SCSI disk whole disk</div><div class='del'>-                    ...</div><div class='del'>-                240 = /dev/sdfd         160th SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-130 char 	(Misc devices)</div><div class='del'>-</div><div class='del'>-130 block       SCSI disk devices (160-175)</div><div class='del'>-                  0 = /dev/sdfe         161st SCSI disk whole disk</div><div class='del'>-                 16 = /dev/sdff         162nd SCSI disk whole disk</div><div class='del'>-                 32 = /dev/sdfg         163rd SCSI disk whole disk</div><div class='del'>-                    ...</div><div class='del'>-                240 = /dev/sdft         176th SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-131 block       SCSI disk devices (176-191)</div><div class='del'>-                  0 = /dev/sdfu         177th SCSI disk whole disk</div><div class='del'>-                 16 = /dev/sdfv         178th SCSI disk whole disk</div><div class='del'>-                 32 = /dev/sdfw         179th SCSI disk whole disk</div><div class='del'>-                    ...</div><div class='del'>-                240 = /dev/sdgj         192nd SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-132 block       SCSI disk devices (192-207)</div><div class='del'>-                  0 = /dev/sdgk         193rd SCSI disk whole disk</div><div class='del'>-                 16 = /dev/sdgl         194th SCSI disk whole disk</div><div class='del'>-                 32 = /dev/sdgm         195th SCSI disk whole disk</div><div class='del'>-                    ...</div><div class='del'>-                240 = /dev/sdgz         208th SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-133 block       SCSI disk devices (208-223)</div><div class='del'>-                  0 = /dev/sdha         209th SCSI disk whole disk</div><div class='del'>-                 16 = /dev/sdhb         210th SCSI disk whole disk</div><div class='del'>-                 32 = /dev/sdhc         211th SCSI disk whole disk</div><div class='del'>-                    ...</div><div class='del'>-                240 = /dev/sdhp         224th SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-134 block       SCSI disk devices (224-239)</div><div class='del'>-                  0 = /dev/sdhq         225th SCSI disk whole disk</div><div class='del'>-                 16 = /dev/sdhr         226th SCSI disk whole disk</div><div class='del'>-                 32 = /dev/sdhs         227th SCSI disk whole disk</div><div class='del'>-                    ...</div><div class='del'>-                240 = /dev/sdif         240th SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-135 block       SCSI disk devices (240-255)</div><div class='del'>-                  0 = /dev/sdig         241st SCSI disk whole disk</div><div class='del'>-                 16 = /dev/sdih         242nd SCSI disk whole disk</div><div class='del'>-                 32 = /dev/sdih         243rd SCSI disk whole disk</div><div class='del'>-                    ...</div><div class='del'>-                240 = /dev/sdiv         256th SCSI disk whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-136-143 char	Unix98 PTY slaves</div><div class='del'>-		  0 = /dev/pts/0	First Unix98 pseudo-TTY</div><div class='del'>-		  1 = /dev/pts/1	Second Unix98 pseudo-TTY</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		These device nodes are automatically generated with</div><div class='del'>-		the proper permissions and modes by mounting the</div><div class='del'>-		devpts filesystem onto /dev/pts with the appropriate</div><div class='del'>-		mount options (distribution dependent, however, on</div><div class='del'>-		*most* distributions the appropriate options are</div><div class='del'>-		"mode=0620,gid=&lt;gid of the "tty" group&gt;".)</div><div class='del'>-</div><div class='del'>-136 block	Mylex DAC960 PCI RAID controller; ninth controller</div><div class='del'>-		  0 = /dev/rd/c8d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c8d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c8d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>-137 block	Mylex DAC960 PCI RAID controller; tenth controller</div><div class='del'>-		  0 = /dev/rd/c9d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c9d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c9d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>-138 block	Mylex DAC960 PCI RAID controller; eleventh controller</div><div class='del'>-		  0 = /dev/rd/c10d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c10d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c10d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>-139 block	Mylex DAC960 PCI RAID controller; twelfth controller</div><div class='del'>-		  0 = /dev/rd/c11d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c11d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c11d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>-140 block	Mylex DAC960 PCI RAID controller; thirteenth controller</div><div class='del'>-		  0 = /dev/rd/c12d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c12d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c12d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>-141 block	Mylex DAC960 PCI RAID controller; fourteenth controller</div><div class='del'>-		  0 = /dev/rd/c13d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c13d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c13d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>-142 block	Mylex DAC960 PCI RAID controller; fifteenth controller</div><div class='del'>-		  0 = /dev/rd/c14d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c14d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c14d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>-143 block	Mylex DAC960 PCI RAID controller; sixteenth controller</div><div class='del'>-		  0 = /dev/rd/c15d0	First disk, whole disk</div><div class='del'>-		  8 = /dev/rd/c15d1	Second disk, whole disk</div><div class='del'>-		    ...</div><div class='del'>-		248 = /dev/rd/c15d31	32nd disk, whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled as for major 48.</div><div class='del'>-</div><div class='del'>-144 char	Encapsulated PPP</div><div class='del'>-		  0 = /dev/pppox0	First PPP over Ethernet</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/pppox63	64th PPP over Ethernet</div><div class='del'>-</div><div class='del'>-		This is primarily used for ADSL.</div><div class='del'>-</div><div class='del'>-		The SST 5136-DN DeviceNet interface driver has been</div><div class='del'>-		relocated to major 183 due to an unfortunate conflict.</div><div class='del'>-</div><div class='del'>-144 block	Expansion Area #1 for more non-device (e.g. NFS) mounts</div><div class='del'>-		  0 = mounted device 256</div><div class='del'>-		255 = mounted device 511</div><div class='del'>-</div><div class='del'>-145 char	SAM9407-based soundcard</div><div class='del'>-		  0 = /dev/sam0_mixer</div><div class='del'>-		  1 = /dev/sam0_sequencer</div><div class='del'>-		  2 = /dev/sam0_midi00</div><div class='del'>-		  3 = /dev/sam0_dsp</div><div class='del'>-		  4 = /dev/sam0_audio</div><div class='del'>-		  6 = /dev/sam0_sndstat</div><div class='del'>-		 18 = /dev/sam0_midi01</div><div class='del'>-		 34 = /dev/sam0_midi02</div><div class='del'>-		 50 = /dev/sam0_midi03</div><div class='del'>-		 64 = /dev/sam1_mixer</div><div class='del'>-		    ...</div><div class='del'>-		128 = /dev/sam2_mixer</div><div class='del'>-		    ...</div><div class='del'>-		192 = /dev/sam3_mixer</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		Device functions match OSS, but offer a number of</div><div class='del'>-		addons, which are sam9407 specific.  OSS can be</div><div class='del'>-		operated simultaneously, taking care of the codec.</div><div class='del'>-</div><div class='del'>-145 block	Expansion Area #2 for more non-device (e.g. NFS) mounts</div><div class='del'>-		  0 = mounted device 512</div><div class='del'>-		255 = mounted device 767</div><div class='del'>-</div><div class='del'>-146 char	SYSTRAM SCRAMNet mirrored-memory network</div><div class='del'>-		  0 = /dev/scramnet0	First SCRAMNet device</div><div class='del'>-		  1 = /dev/scramnet1	Second SCRAMNet device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-146 block	Expansion Area #3 for more non-device (e.g. NFS) mounts</div><div class='del'>-		  0 = mounted device 768</div><div class='del'>-		255 = mounted device 1023</div><div class='del'>-</div><div class='del'>-147 char	Aureal Semiconductor Vortex Audio device</div><div class='del'>-		  0 = /dev/aureal0	First Aureal Vortex</div><div class='del'>-		  1 = /dev/aureal1	Second Aureal Vortex</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-147 block	Distributed Replicated Block Device (DRBD)</div><div class='del'>-		  0 = /dev/drbd0	First DRBD device</div><div class='del'>-		  1 = /dev/drbd1	Second DRBD device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-148 char	Technology Concepts serial card</div><div class='del'>-		  0 = /dev/ttyT0	First TCL port</div><div class='del'>-		  1 = /dev/ttyT1	Second TCL port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-149 char	Technology Concepts serial card - alternate devices</div><div class='del'>-		  0 = /dev/cut0		Callout device for ttyT0</div><div class='del'>-		  1 = /dev/cut0		Callout device for ttyT1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-150 char	Real-Time Linux FIFOs</div><div class='del'>-		  0 = /dev/rtf0		First RTLinux FIFO</div><div class='del'>-		  1 = /dev/rtf1		Second RTLinux FIFO</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-151 char	DPT I2O SmartRaid V controller</div><div class='del'>-		  0 = /dev/dpti0	First DPT I2O adapter</div><div class='del'>-		  1 = /dev/dpti1	Second DPT I2O adapter</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-152 char	EtherDrive Control Device</div><div class='del'>-		  0 = /dev/etherd/ctl	Connect/Disconnect an EtherDrive</div><div class='del'>-		  1 = /dev/etherd/err	Monitor errors</div><div class='del'>-		  2 = /dev/etherd/raw	Raw AoE packet monitor</div><div class='del'>-</div><div class='del'>-152 block	EtherDrive Block Devices</div><div class='del'>-		  0 = /dev/etherd/0	EtherDrive 0</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/etherd/255	EtherDrive 255</div><div class='del'>-</div><div class='del'>-153 char	SPI Bus Interface (sometimes referred to as MicroWire)</div><div class='del'>-		  0 = /dev/spi0		First SPI device on the bus</div><div class='del'>-		  1 = /dev/spi1		Second SPI device on the bus</div><div class='del'>-		    ...</div><div class='del'>-		 15 = /dev/spi15	Sixteenth SPI device on the bus</div><div class='del'>-</div><div class='del'>-153 block	Enhanced Metadisk RAID (EMD) storage units</div><div class='del'>-		  0 = /dev/emd/0	First unit</div><div class='del'>-		  1 = /dev/emd/0p1	Partition 1 on First unit</div><div class='del'>-		  2 = /dev/emd/0p2	Partition 2 on First unit</div><div class='del'>-		    ...</div><div class='del'>-		 15 = /dev/emd/0p15	Partition 15 on First unit</div><div class='del'>-</div><div class='del'>-		 16 = /dev/emd/1	Second unit</div><div class='del'>-		 32 = /dev/emd/2	Third unit</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/emd/15	Sixteenth unit</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 15.</div><div class='del'>-</div><div class='del'>-154 char	Specialix RIO serial card</div><div class='del'>-		  0 = /dev/ttySR0	First RIO port</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/ttySR255	256th RIO port</div><div class='del'>-</div><div class='del'>-155 char	Specialix RIO serial card - alternate devices</div><div class='del'>-		  0 = /dev/cusr0	Callout device for ttySR0</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/cusr255	Callout device for ttySR255</div><div class='del'>-</div><div class='del'>-156 char	Specialix RIO serial card</div><div class='del'>-		  0 = /dev/ttySR256	257th RIO port</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/ttySR511	512th RIO port</div><div class='del'>-</div><div class='del'>-157 char	Specialix RIO serial card - alternate devices</div><div class='del'>-		  0 = /dev/cusr256	Callout device for ttySR256</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/cusr511	Callout device for ttySR511</div><div class='del'>-</div><div class='del'>-158 char	Dialogic GammaLink fax driver</div><div class='del'>-		  0 = /dev/gfax0	GammaLink channel 0</div><div class='del'>-		  1 = /dev/gfax1	GammaLink channel 1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-159 char	RESERVED</div><div class='del'>-</div><div class='del'>-159 block	RESERVED</div><div class='del'>-</div><div class='del'>-160 char	General Purpose Instrument Bus (GPIB)</div><div class='del'>-		  0 = /dev/gpib0	First GPIB bus</div><div class='del'>-		  1 = /dev/gpib1	Second GPIB bus</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-160 block       Carmel 8-port SATA Disks on First Controller</div><div class='del'>-		  0 = /dev/carmel/0     SATA disk 0 whole disk</div><div class='del'>-		  1 = /dev/carmel/0p1   SATA disk 0 partition 1</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/carmel/0p31  SATA disk 0 partition 31</div><div class='del'>-</div><div class='del'>-		 32 = /dev/carmel/1     SATA disk 1 whole disk</div><div class='del'>-		 64 = /dev/carmel/2     SATA disk 2 whole disk</div><div class='del'>-		    ...</div><div class='del'>-		224 = /dev/carmel/7     SATA disk 7 whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 31.</div><div class='del'>-</div><div class='del'>-161 char	IrCOMM devices (IrDA serial/parallel emulation)</div><div class='del'>-		  0 = /dev/ircomm0	First IrCOMM device</div><div class='del'>-		  1 = /dev/ircomm1	Second IrCOMM device</div><div class='del'>-		    ...</div><div class='del'>-		 16 = /dev/irlpt0	First IrLPT device</div><div class='del'>-		 17 = /dev/irlpt1	Second IrLPT device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-161 block       Carmel 8-port SATA Disks on Second Controller</div><div class='del'>-		  0 = /dev/carmel/8     SATA disk 8 whole disk</div><div class='del'>-		  1 = /dev/carmel/8p1   SATA disk 8 partition 1</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/carmel/8p31  SATA disk 8 partition 31</div><div class='del'>-</div><div class='del'>-		 32 = /dev/carmel/9     SATA disk 9 whole disk</div><div class='del'>-		 64 = /dev/carmel/10    SATA disk 10 whole disk</div><div class='del'>-		    ...</div><div class='del'>-		224 = /dev/carmel/15    SATA disk 15 whole disk</div><div class='del'>-</div><div class='del'>-		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) except that the limit on</div><div class='del'>-		partitions is 31.</div><div class='del'>-</div><div class='del'>-162 char	Raw block device interface</div><div class='del'>-		  0 = /dev/rawctl	Raw I/O control device</div><div class='del'>-		  1 = /dev/raw/raw1	First raw I/O device</div><div class='del'>-		  2 = /dev/raw/raw2	Second raw I/O device</div><div class='del'>-		    ...</div><div class='del'>-                 max minor number of raw device is set by kernel config</div><div class='del'>-                 MAX_RAW_DEVS or raw module parameter 'max_raw_devs'</div><div class='del'>-</div><div class='del'>-163 char</div><div class='del'>-</div><div class='del'>-164 char	Chase Research AT/PCI-Fast serial card</div><div class='del'>-		  0 = /dev/ttyCH0	AT/PCI-Fast board 0, port 0</div><div class='del'>-		    ...</div><div class='del'>-		 15 = /dev/ttyCH15	AT/PCI-Fast board 0, port 15</div><div class='del'>-		 16 = /dev/ttyCH16	AT/PCI-Fast board 1, port 0</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/ttyCH31	AT/PCI-Fast board 1, port 15</div><div class='del'>-		 32 = /dev/ttyCH32	AT/PCI-Fast board 2, port 0</div><div class='del'>-		    ...</div><div class='del'>-		 47 = /dev/ttyCH47	AT/PCI-Fast board 2, port 15</div><div class='del'>-		 48 = /dev/ttyCH48	AT/PCI-Fast board 3, port 0</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/ttyCH63	AT/PCI-Fast board 3, port 15</div><div class='del'>-</div><div class='del'>-165 char	Chase Research AT/PCI-Fast serial card - alternate devices</div><div class='del'>-		  0 = /dev/cuch0	Callout device for ttyCH0</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/cuch63	Callout device for ttyCH63</div><div class='del'>-</div><div class='del'>-166 char	ACM USB modems</div><div class='del'>-		  0 = /dev/ttyACM0	First ACM modem</div><div class='del'>-		  1 = /dev/ttyACM1	Second ACM modem</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-167 char	ACM USB modems - alternate devices</div><div class='del'>-		  0 = /dev/cuacm0	Callout device for ttyACM0</div><div class='del'>-		  1 = /dev/cuacm1	Callout device for ttyACM1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-168 char	Eracom CSA7000 PCI encryption adaptor</div><div class='del'>-		  0 = /dev/ecsa0	First CSA7000</div><div class='del'>-		  1 = /dev/ecsa1	Second CSA7000</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-169 char	Eracom CSA8000 PCI encryption adaptor</div><div class='del'>-		  0 = /dev/ecsa8-0	First CSA8000</div><div class='del'>-		  1 = /dev/ecsa8-1	Second CSA8000</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-170 char	AMI MegaRAC remote access controller</div><div class='del'>-		  0 = /dev/megarac0	First MegaRAC card</div><div class='del'>-		  1 = /dev/megarac1	Second MegaRAC card</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-171 char	Reserved for IEEE 1394 (Firewire)</div><div class='del'>-</div><div class='del'>-172 char	Moxa Intellio serial card</div><div class='del'>-		  0 = /dev/ttyMX0	First Moxa port</div><div class='del'>-		  1 = /dev/ttyMX1	Second Moxa port</div><div class='del'>-		    ...</div><div class='del'>-		127 = /dev/ttyMX127	128th Moxa port</div><div class='del'>-		128 = /dev/moxactl	Moxa control port</div><div class='del'>-</div><div class='del'>-173 char	Moxa Intellio serial card - alternate devices</div><div class='del'>-		  0 = /dev/cumx0	Callout device for ttyMX0</div><div class='del'>-		  1 = /dev/cumx1	Callout device for ttyMX1</div><div class='del'>-		    ...</div><div class='del'>-		127 = /dev/cumx127	Callout device for ttyMX127</div><div class='del'>-</div><div class='del'>-174 char	SmartIO serial card</div><div class='del'>-		  0 = /dev/ttySI0	First SmartIO port</div><div class='del'>-		  1 = /dev/ttySI1	Second SmartIO port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-175 char	SmartIO serial card - alternate devices</div><div class='del'>-		  0 = /dev/cusi0	Callout device for ttySI0</div><div class='del'>-		  1 = /dev/cusi1	Callout device for ttySI1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-176 char	nCipher nFast PCI crypto accelerator</div><div class='del'>-		  0 = /dev/nfastpci0	First nFast PCI device</div><div class='del'>-		  1 = /dev/nfastpci1	First nFast PCI device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-177 char	TI PCILynx memory spaces</div><div class='del'>-		  0 = /dev/pcilynx/aux0	 AUX space of first PCILynx card</div><div class='del'>-		    ...</div><div class='del'>-		 15 = /dev/pcilynx/aux15 AUX space of 16th PCILynx card</div><div class='del'>-		 16 = /dev/pcilynx/rom0	 ROM space of first PCILynx card</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/pcilynx/rom15 ROM space of 16th PCILynx card</div><div class='del'>-		 32 = /dev/pcilynx/ram0	 RAM space of first PCILynx card</div><div class='del'>-		    ...</div><div class='del'>-		 47 = /dev/pcilynx/ram15 RAM space of 16th PCILynx card</div><div class='del'>-</div><div class='del'>-178 char	Giganet cLAN1xxx virtual interface adapter</div><div class='del'>-		  0 = /dev/clanvi0	First cLAN adapter</div><div class='del'>-		  1 = /dev/clanvi1	Second cLAN adapter</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-179 block       MMC block devices</div><div class='del'>-		  0 = /dev/mmcblk0      First SD/MMC card</div><div class='del'>-		  1 = /dev/mmcblk0p1    First partition on first MMC card</div><div class='del'>-		  8 = /dev/mmcblk1      Second SD/MMC card</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		The start of next SD/MMC card can be configured with</div><div class='del'>-		CONFIG_MMC_BLOCK_MINORS, or overridden at boot/modprobe</div><div class='del'>-		time using the mmcblk.perdev_minors option. That would</div><div class='del'>-		bump the offset between each card to be the configured</div><div class='del'>-		value instead of the default 8.</div><div class='del'>-</div><div class='del'>-179 char	CCube DVXChip-based PCI products</div><div class='del'>-		  0 = /dev/dvxirq0	First DVX device</div><div class='del'>-		  1 = /dev/dvxirq1	Second DVX device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-180 char	USB devices</div><div class='del'>-		  0 = /dev/usb/lp0	First USB printer</div><div class='del'>-		    ...</div><div class='del'>-		 15 = /dev/usb/lp15	16th USB printer</div><div class='del'>-		 48 = /dev/usb/scanner0	First USB scanner</div><div class='del'>-		    ...</div><div class='del'>-		 63 = /dev/usb/scanner15 16th USB scanner</div><div class='del'>-		 64 = /dev/usb/rio500	Diamond Rio 500</div><div class='del'>-		 65 = /dev/usb/usblcd	USBLCD Interface (info@usblcd.de)</div><div class='del'>-		 66 = /dev/usb/cpad0	Synaptics cPad (mouse/LCD)</div><div class='del'>-		 96 = /dev/usb/hiddev0	1st USB HID device</div><div class='del'>-		    ...</div><div class='del'>-		111 = /dev/usb/hiddev15	16th USB HID device</div><div class='del'>-		112 = /dev/usb/auer0	1st auerswald ISDN device</div><div class='del'>-		    ...</div><div class='del'>-		127 = /dev/usb/auer15	16th auerswald ISDN device</div><div class='del'>-		128 = /dev/usb/brlvgr0	First Braille Voyager device</div><div class='del'>-		    ...</div><div class='del'>-		131 = /dev/usb/brlvgr3	Fourth Braille Voyager device</div><div class='del'>-		132 = /dev/usb/idmouse	ID Mouse (fingerprint scanner) device</div><div class='del'>-		133 = /dev/usb/sisusbvga1	First SiSUSB VGA device</div><div class='del'>-		    ...</div><div class='del'>-		140 = /dev/usb/sisusbvga8	Eighth SISUSB VGA device</div><div class='del'>-		144 = /dev/usb/lcd	USB LCD device</div><div class='del'>-		160 = /dev/usb/legousbtower0	1st USB Legotower device</div><div class='del'>-		    ...</div><div class='del'>-		175 = /dev/usb/legousbtower15	16th USB Legotower device</div><div class='del'>-		176 = /dev/usb/usbtmc1	First USB TMC device</div><div class='del'>-		   ...</div><div class='del'>-		191 = /dev/usb/usbtmc16	16th USB TMC device</div><div class='del'>-		192 = /dev/usb/yurex1	First USB Yurex device</div><div class='del'>-		   ...</div><div class='del'>-		209 = /dev/usb/yurex16	16th USB Yurex device</div><div class='del'>-</div><div class='del'>-180 block	USB block devices</div><div class='del'>-		  0 = /dev/uba		First USB block device</div><div class='del'>-		  8 = /dev/ubb		Second USB block device</div><div class='del'>-		 16 = /dev/ubc		Third USB block device</div><div class='del'>- 		    ...</div><div class='del'>-</div><div class='del'>-181 char	Conrad Electronic parallel port radio clocks</div><div class='del'>-		  0 = /dev/pcfclock0	First Conrad radio clock</div><div class='del'>-		  1 = /dev/pcfclock1	Second Conrad radio clock</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-182 char	Picture Elements THR2 binarizer</div><div class='del'>-		  0 = /dev/pethr0	First THR2 board</div><div class='del'>-		  1 = /dev/pethr1	Second THR2 board</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-183 char	SST 5136-DN DeviceNet interface</div><div class='del'>-		  0 = /dev/ss5136dn0	First DeviceNet interface</div><div class='del'>-		  1 = /dev/ss5136dn1	Second DeviceNet interface</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		This device used to be assigned to major number 144.</div><div class='del'>-		It had to be moved due to an unfortunate conflict.</div><div class='del'>-</div><div class='del'>-184 char	Picture Elements' video simulator/sender</div><div class='del'>-		  0 = /dev/pevss0	First sender board</div><div class='del'>-		  1 = /dev/pevss1	Second sender board</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-185 char	InterMezzo high availability file system</div><div class='del'>-		  0 = /dev/intermezzo0	First cache manager</div><div class='del'>-		  1 = /dev/intermezzo1	Second cache manager</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		See http://web.archive.org/web/20080115195241/</div><div class='del'>-		http://inter-mezzo.org/index.html</div><div class='del'>-</div><div class='del'>-186 char	Object-based storage control device</div><div class='del'>-		  0 = /dev/obd0		First obd control device</div><div class='del'>-		  1 = /dev/obd1		Second obd control device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		See ftp://ftp.lustre.org/pub/obd for code and information.</div><div class='del'>-</div><div class='del'>-187 char	DESkey hardware encryption device</div><div class='del'>-		  0 = /dev/deskey0	First DES key</div><div class='del'>-		  1 = /dev/deskey1	Second DES key</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-188 char	USB serial converters</div><div class='del'>-		  0 = /dev/ttyUSB0	First USB serial converter</div><div class='del'>-		  1 = /dev/ttyUSB1	Second USB serial converter</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-189 char	USB serial converters - alternate devices</div><div class='del'>-		  0 = /dev/cuusb0	Callout device for ttyUSB0</div><div class='del'>-		  1 = /dev/cuusb1	Callout device for ttyUSB1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-190 char	Kansas City tracker/tuner card</div><div class='del'>-		  0 = /dev/kctt0	First KCT/T card</div><div class='del'>-		  1 = /dev/kctt1	Second KCT/T card</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-191 char	Reserved for PCMCIA</div><div class='del'>-</div><div class='del'>-192 char	Kernel profiling interface</div><div class='del'>-		  0 = /dev/profile	Profiling control device</div><div class='del'>-		  1 = /dev/profile0	Profiling device for CPU 0</div><div class='del'>-		  2 = /dev/profile1	Profiling device for CPU 1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-193 char	Kernel event-tracing interface</div><div class='del'>-		  0 = /dev/trace	Tracing control device</div><div class='del'>-		  1 = /dev/trace0	Tracing device for CPU 0</div><div class='del'>-		  2 = /dev/trace1	Tracing device for CPU 1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-194 char	linVideoStreams (LINVS)</div><div class='del'>-		  0 = /dev/mvideo/status0	Video compression status</div><div class='del'>-		  1 = /dev/mvideo/stream0	Video stream</div><div class='del'>-		  2 = /dev/mvideo/frame0	Single compressed frame</div><div class='del'>-		  3 = /dev/mvideo/rawframe0	Raw uncompressed frame</div><div class='del'>-		  4 = /dev/mvideo/codec0	Direct codec access</div><div class='del'>-		  5 = /dev/mvideo/video4linux0	Video4Linux compatibility</div><div class='del'>-</div><div class='del'>-		 16 = /dev/mvideo/status1	Second device</div><div class='del'>-		    ...</div><div class='del'>-		 32 = /dev/mvideo/status2	Third device</div><div class='del'>-		    ...</div><div class='del'>-		    ...</div><div class='del'>-		240 = /dev/mvideo/status15	16th device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-195 char	Nvidia graphics devices</div><div class='del'>-		  0 = /dev/nvidia0		First Nvidia card</div><div class='del'>-		  1 = /dev/nvidia1		Second Nvidia card</div><div class='del'>-		    ...</div><div class='del'>-		255 = /dev/nvidiactl		Nvidia card control device</div><div class='del'>-</div><div class='del'>-196 char	Tormenta T1 card</div><div class='del'>-		  0 = /dev/tor/0		Master control channel for all cards</div><div class='del'>-		  1 = /dev/tor/1		First DS0</div><div class='del'>-		  2 = /dev/tor/2		Second DS0</div><div class='del'>-		    ...</div><div class='del'>-		 48 = /dev/tor/48		48th DS0</div><div class='del'>-		 49 = /dev/tor/49		First pseudo-channel</div><div class='del'>-		 50 = /dev/tor/50		Second pseudo-channel</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-197 char	OpenTNF tracing facility</div><div class='del'>-		  0 = /dev/tnf/t0		Trace 0 data extraction</div><div class='del'>-		  1 = /dev/tnf/t1		Trace 1 data extraction</div><div class='del'>-		    ...</div><div class='del'>-		128 = /dev/tnf/status		Tracing facility status</div><div class='del'>-		130 = /dev/tnf/trace		Tracing device</div><div class='del'>-</div><div class='del'>-198 char	Total Impact TPMP2 quad coprocessor PCI card</div><div class='del'>-		  0 = /dev/tpmp2/0		First card</div><div class='del'>-		  1 = /dev/tpmp2/1		Second card</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-199 char	Veritas volume manager (VxVM) volumes</div><div class='del'>-		  0 = /dev/vx/rdsk/*/*		First volume</div><div class='del'>-		  1 = /dev/vx/rdsk/*/*		Second volume</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-199 block	Veritas volume manager (VxVM) volumes</div><div class='del'>-		  0 = /dev/vx/dsk/*/*		First volume</div><div class='del'>-		  1 = /dev/vx/dsk/*/*		Second volume</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		The namespace in these directories is maintained by</div><div class='del'>-		the user space VxVM software.</div><div class='del'>-</div><div class='del'>-200 char	Veritas VxVM configuration interface</div><div class='del'>-                  0 = /dev/vx/config		Configuration access node</div><div class='del'>-                  1 = /dev/vx/trace		Volume i/o trace access node</div><div class='del'>-                  2 = /dev/vx/iod		Volume i/o daemon access node</div><div class='del'>-                  3 = /dev/vx/info		Volume information access node</div><div class='del'>-                  4 = /dev/vx/task		Volume tasks access node</div><div class='del'>-                  5 = /dev/vx/taskmon		Volume tasks monitor daemon</div><div class='del'>-</div><div class='del'>-201 char	Veritas VxVM dynamic multipathing driver</div><div class='del'>-		  0 = /dev/vx/rdmp/*		First multipath device</div><div class='del'>-		  1 = /dev/vx/rdmp/*		Second multipath device</div><div class='del'>-		    ...</div><div class='del'>-201 block	Veritas VxVM dynamic multipathing driver</div><div class='del'>-		  0 = /dev/vx/dmp/*		First multipath device</div><div class='del'>-		  1 = /dev/vx/dmp/*		Second multipath device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		The namespace in these directories is maintained by</div><div class='del'>-		the user space VxVM software.</div><div class='del'>-</div><div class='del'>-202 char	CPU model-specific registers</div><div class='del'>-		  0 = /dev/cpu/0/msr		MSRs on CPU 0</div><div class='del'>-		  1 = /dev/cpu/1/msr		MSRs on CPU 1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-202 block	Xen Virtual Block Device</div><div class='del'>-		  0 = /dev/xvda       First Xen VBD whole disk</div><div class='del'>-		  16 = /dev/xvdb      Second Xen VBD whole disk</div><div class='del'>-		  32 = /dev/xvdc      Third Xen VBD whole disk</div><div class='del'>-		    ...</div><div class='del'>-		  240 = /dev/xvdp     Sixteenth Xen VBD whole disk</div><div class='del'>-</div><div class='del'>-                Partitions are handled in the same way as for IDE</div><div class='del'>-                disks (see major number 3) except that the limit on</div><div class='del'>-                partitions is 15.</div><div class='del'>-</div><div class='del'>-203 char	CPU CPUID information</div><div class='del'>-		  0 = /dev/cpu/0/cpuid		CPUID on CPU 0</div><div class='del'>-		  1 = /dev/cpu/1/cpuid		CPUID on CPU 1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-204 char	Low-density serial ports</div><div class='del'>-		  0 = /dev/ttyLU0		LinkUp Systems L72xx UART - port 0</div><div class='del'>-		  1 = /dev/ttyLU1		LinkUp Systems L72xx UART - port 1</div><div class='del'>-		  2 = /dev/ttyLU2		LinkUp Systems L72xx UART - port 2</div><div class='del'>-		  3 = /dev/ttyLU3		LinkUp Systems L72xx UART - port 3</div><div class='del'>-		  4 = /dev/ttyFB0		Intel Footbridge (ARM)</div><div class='del'>-		  5 = /dev/ttySA0		StrongARM builtin serial port 0</div><div class='del'>-		  6 = /dev/ttySA1		StrongARM builtin serial port 1</div><div class='del'>-		  7 = /dev/ttySA2		StrongARM builtin serial port 2</div><div class='del'>-		  8 = /dev/ttySC0		SCI serial port (SuperH) - port 0</div><div class='del'>-		  9 = /dev/ttySC1		SCI serial port (SuperH) - port 1</div><div class='del'>-		 10 = /dev/ttySC2		SCI serial port (SuperH) - port 2</div><div class='del'>-		 11 = /dev/ttySC3		SCI serial port (SuperH) - port 3</div><div class='del'>-		 12 = /dev/ttyFW0		Firmware console - port 0</div><div class='del'>-		 13 = /dev/ttyFW1		Firmware console - port 1</div><div class='del'>-		 14 = /dev/ttyFW2		Firmware console - port 2</div><div class='del'>-		 15 = /dev/ttyFW3		Firmware console - port 3</div><div class='del'>-		 16 = /dev/ttyAM0		ARM "AMBA" serial port 0</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/ttyAM15		ARM "AMBA" serial port 15</div><div class='del'>-		 32 = /dev/ttyDB0		DataBooster serial port 0</div><div class='del'>-		    ...</div><div class='del'>-		 39 = /dev/ttyDB7		DataBooster serial port 7</div><div class='del'>-		 40 = /dev/ttySG0		SGI Altix console port</div><div class='del'>-		 41 = /dev/ttySMX0		Motorola i.MX - port 0</div><div class='del'>-		 42 = /dev/ttySMX1		Motorola i.MX - port 1</div><div class='del'>-		 43 = /dev/ttySMX2		Motorola i.MX - port 2</div><div class='del'>-		 44 = /dev/ttyMM0		Marvell MPSC - port 0</div><div class='del'>-		 45 = /dev/ttyMM1		Marvell MPSC - port 1</div><div class='del'>-		 46 = /dev/ttyCPM0		PPC CPM (SCC or SMC) - port 0</div><div class='del'>-		    ...</div><div class='del'>-		 47 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 5</div><div class='del'>-		 50 = /dev/ttyIOC0		Altix serial card</div><div class='del'>-		    ...</div><div class='del'>-		 81 = /dev/ttyIOC31		Altix serial card</div><div class='del'>-		 82 = /dev/ttyVR0		NEC VR4100 series SIU</div><div class='del'>-		 83 = /dev/ttyVR1		NEC VR4100 series DSIU</div><div class='del'>-		 84 = /dev/ttyIOC84		Altix ioc4 serial card</div><div class='del'>-		    ...</div><div class='del'>-		 115 = /dev/ttyIOC115		Altix ioc4 serial card</div><div class='del'>-		 116 = /dev/ttySIOC0		Altix ioc3 serial card</div><div class='del'>-		    ...</div><div class='del'>-		 147 = /dev/ttySIOC31		Altix ioc3 serial card</div><div class='del'>-		 148 = /dev/ttyPSC0		PPC PSC - port 0</div><div class='del'>-		    ...</div><div class='del'>-		 153 = /dev/ttyPSC5		PPC PSC - port 5</div><div class='del'>-		 154 = /dev/ttyAT0		ATMEL serial port 0</div><div class='del'>-		    ...</div><div class='del'>-		 169 = /dev/ttyAT15		ATMEL serial port 15</div><div class='del'>-		 170 = /dev/ttyNX0		Hilscher netX serial port 0</div><div class='del'>-		    ...</div><div class='del'>-		 185 = /dev/ttyNX15		Hilscher netX serial port 15</div><div class='del'>-		 186 = /dev/ttyJ0		JTAG1 DCC protocol based serial port emulation</div><div class='del'>-		 187 = /dev/ttyUL0		Xilinx uartlite - port 0</div><div class='del'>-		    ...</div><div class='del'>-		 190 = /dev/ttyUL3		Xilinx uartlite - port 3</div><div class='del'>-		 191 = /dev/xvc0		Xen virtual console - port 0</div><div class='del'>-		 192 = /dev/ttyPZ0		pmac_zilog - port 0</div><div class='del'>-		    ...</div><div class='del'>-		 195 = /dev/ttyPZ3		pmac_zilog - port 3</div><div class='del'>-		 196 = /dev/ttyTX0		TX39/49 serial port 0</div><div class='del'>-		    ...</div><div class='del'>-		 204 = /dev/ttyTX7		TX39/49 serial port 7</div><div class='del'>-		 205 = /dev/ttySC0		SC26xx serial port 0</div><div class='del'>-		 206 = /dev/ttySC1		SC26xx serial port 1</div><div class='del'>-		 207 = /dev/ttySC2		SC26xx serial port 2</div><div class='del'>-		 208 = /dev/ttySC3		SC26xx serial port 3</div><div class='del'>-		 209 = /dev/ttyMAX0		MAX3100 serial port 0</div><div class='del'>-		 210 = /dev/ttyMAX1		MAX3100 serial port 1</div><div class='del'>-		 211 = /dev/ttyMAX2		MAX3100 serial port 2</div><div class='del'>-		 212 = /dev/ttyMAX3		MAX3100 serial port 3</div><div class='del'>-</div><div class='del'>-205 char	Low-density serial ports (alternate device)</div><div class='del'>-		  0 = /dev/culu0		Callout device for ttyLU0</div><div class='del'>-		  1 = /dev/culu1		Callout device for ttyLU1</div><div class='del'>-		  2 = /dev/culu2		Callout device for ttyLU2</div><div class='del'>-		  3 = /dev/culu3		Callout device for ttyLU3</div><div class='del'>-		  4 = /dev/cufb0		Callout device for ttyFB0</div><div class='del'>-		  5 = /dev/cusa0		Callout device for ttySA0</div><div class='del'>-		  6 = /dev/cusa1		Callout device for ttySA1</div><div class='del'>-		  7 = /dev/cusa2		Callout device for ttySA2</div><div class='del'>-		  8 = /dev/cusc0		Callout device for ttySC0</div><div class='del'>-		  9 = /dev/cusc1		Callout device for ttySC1</div><div class='del'>-		 10 = /dev/cusc2		Callout device for ttySC2</div><div class='del'>-		 11 = /dev/cusc3		Callout device for ttySC3</div><div class='del'>-		 12 = /dev/cufw0		Callout device for ttyFW0</div><div class='del'>-		 13 = /dev/cufw1		Callout device for ttyFW1</div><div class='del'>-		 14 = /dev/cufw2		Callout device for ttyFW2</div><div class='del'>-		 15 = /dev/cufw3		Callout device for ttyFW3</div><div class='del'>-		 16 = /dev/cuam0		Callout device for ttyAM0</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/cuam15		Callout device for ttyAM15</div><div class='del'>-		 32 = /dev/cudb0		Callout device for ttyDB0</div><div class='del'>-		    ...</div><div class='del'>-		 39 = /dev/cudb7		Callout device for ttyDB7</div><div class='del'>-		 40 = /dev/cusg0		Callout device for ttySG0</div><div class='del'>-		 41 = /dev/ttycusmx0		Callout device for ttySMX0</div><div class='del'>-		 42 = /dev/ttycusmx1		Callout device for ttySMX1</div><div class='del'>-		 43 = /dev/ttycusmx2		Callout device for ttySMX2</div><div class='del'>-		 46 = /dev/cucpm0		Callout device for ttyCPM0</div><div class='del'>-		    ...</div><div class='del'>-		 49 = /dev/cucpm5		Callout device for ttyCPM5</div><div class='del'>-		 50 = /dev/cuioc40		Callout device for ttyIOC40</div><div class='del'>-		    ...</div><div class='del'>-		 81 = /dev/cuioc431		Callout device for ttyIOC431</div><div class='del'>-		 82 = /dev/cuvr0		Callout device for ttyVR0</div><div class='del'>-		 83 = /dev/cuvr1		Callout device for ttyVR1</div><div class='del'>-</div><div class='del'>-206 char	OnStream SC-x0 tape devices</div><div class='del'>-		  0 = /dev/osst0		First OnStream SCSI tape, mode 0</div><div class='del'>-		  1 = /dev/osst1		Second OnStream SCSI tape, mode 0</div><div class='del'>-		    ...</div><div class='del'>-		 32 = /dev/osst0l		First OnStream SCSI tape, mode 1</div><div class='del'>-		 33 = /dev/osst1l		Second OnStream SCSI tape, mode 1</div><div class='del'>-		    ...</div><div class='del'>-		 64 = /dev/osst0m		First OnStream SCSI tape, mode 2</div><div class='del'>-		 65 = /dev/osst1m		Second OnStream SCSI tape, mode 2</div><div class='del'>-		    ...</div><div class='del'>-		 96 = /dev/osst0a		First OnStream SCSI tape, mode 3</div><div class='del'>-		 97 = /dev/osst1a		Second OnStream SCSI tape, mode 3</div><div class='del'>-		    ...</div><div class='del'>-		128 = /dev/nosst0		No rewind version of /dev/osst0</div><div class='del'>-		129 = /dev/nosst1		No rewind version of /dev/osst1</div><div class='del'>-		    ...</div><div class='del'>-		160 = /dev/nosst0l		No rewind version of /dev/osst0l</div><div class='del'>-		161 = /dev/nosst1l		No rewind version of /dev/osst1l</div><div class='del'>-		    ...</div><div class='del'>-		192 = /dev/nosst0m		No rewind version of /dev/osst0m</div><div class='del'>-		193 = /dev/nosst1m		No rewind version of /dev/osst1m</div><div class='del'>-		    ...</div><div class='del'>-		224 = /dev/nosst0a		No rewind version of /dev/osst0a</div><div class='del'>-		225 = /dev/nosst1a		No rewind version of /dev/osst1a</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		The OnStream SC-x0 SCSI tapes do not support the</div><div class='del'>-		standard SCSI SASD command set and therefore need</div><div class='del'>-		their own driver "osst". Note that the IDE, USB (and</div><div class='del'>-		maybe ParPort) versions may be driven via ide-scsi or</div><div class='del'>-		usb-storage SCSI emulation and this osst device and</div><div class='del'>-		driver as well.  The ADR-x0 drives are QIC-157</div><div class='del'>-		compliant and don't need osst.</div><div class='del'>-</div><div class='del'>-207 char	Compaq ProLiant health feature indicate</div><div class='del'>-		  0 = /dev/cpqhealth/cpqw	Redirector interface</div><div class='del'>-		  1 = /dev/cpqhealth/crom	EISA CROM</div><div class='del'>-		  2 = /dev/cpqhealth/cdt	Data Table</div><div class='del'>-		  3 = /dev/cpqhealth/cevt	Event Log</div><div class='del'>-		  4 = /dev/cpqhealth/casr	Automatic Server Recovery</div><div class='del'>-		  5 = /dev/cpqhealth/cecc	ECC Memory</div><div class='del'>-		  6 = /dev/cpqhealth/cmca	Machine Check Architecture</div><div class='del'>-		  7 = /dev/cpqhealth/ccsm	Deprecated CDT</div><div class='del'>-		  8 = /dev/cpqhealth/cnmi	NMI Handling</div><div class='del'>-		  9 = /dev/cpqhealth/css	Sideshow Management</div><div class='del'>-		 10 = /dev/cpqhealth/cram	CMOS interface</div><div class='del'>-		 11 = /dev/cpqhealth/cpci	PCI IRQ interface</div><div class='del'>-</div><div class='del'>-208 char	User space serial ports</div><div class='del'>-		  0 = /dev/ttyU0		First user space serial port</div><div class='del'>-		  1 = /dev/ttyU1		Second user space serial port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-209 char	User space serial ports (alternate devices)</div><div class='del'>-		  0 = /dev/cuu0			Callout device for ttyU0</div><div class='del'>-		  1 = /dev/cuu1			Callout device for ttyU1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-210 char	SBE, Inc. sync/async serial card</div><div class='del'>-		  0 = /dev/sbei/wxcfg0		Configuration device for board 0</div><div class='del'>-		  1 = /dev/sbei/dld0		Download device for board 0</div><div class='del'>-		  2 = /dev/sbei/wan00		WAN device, port 0, board 0</div><div class='del'>-		  3 = /dev/sbei/wan01		WAN device, port 1, board 0</div><div class='del'>-		  4 = /dev/sbei/wan02		WAN device, port 2, board 0</div><div class='del'>-		  5 = /dev/sbei/wan03		WAN device, port 3, board 0</div><div class='del'>-		  6 = /dev/sbei/wanc00		WAN clone device, port 0, board 0</div><div class='del'>-		  7 = /dev/sbei/wanc01		WAN clone device, port 1, board 0</div><div class='del'>-		  8 = /dev/sbei/wanc02		WAN clone device, port 2, board 0</div><div class='del'>-		  9 = /dev/sbei/wanc03		WAN clone device, port 3, board 0</div><div class='del'>-		 10 = /dev/sbei/wxcfg1		Configuration device for board 1</div><div class='del'>-		 11 = /dev/sbei/dld1		Download device for board 1</div><div class='del'>-		 12 = /dev/sbei/wan10		WAN device, port 0, board 1</div><div class='del'>-		 13 = /dev/sbei/wan11		WAN device, port 1, board 1</div><div class='del'>-		 14 = /dev/sbei/wan12		WAN device, port 2, board 1</div><div class='del'>-		 15 = /dev/sbei/wan13		WAN device, port 3, board 1</div><div class='del'>-		 16 = /dev/sbei/wanc10		WAN clone device, port 0, board 1</div><div class='del'>-		 17 = /dev/sbei/wanc11		WAN clone device, port 1, board 1</div><div class='del'>-		 18 = /dev/sbei/wanc12		WAN clone device, port 2, board 1</div><div class='del'>-		 19 = /dev/sbei/wanc13		WAN clone device, port 3, board 1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		Yes, each board is really spaced 10 (decimal) apart.</div><div class='del'>-</div><div class='del'>-211 char	Addinum CPCI1500 digital I/O card</div><div class='del'>-		  0 = /dev/addinum/cpci1500/0	First CPCI1500 card</div><div class='del'>-		  1 = /dev/addinum/cpci1500/1	Second CPCI1500 card</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-212 char	LinuxTV.org DVB driver subsystem</div><div class='del'>-		  0 = /dev/dvb/adapter0/video0    first video decoder of first card</div><div class='del'>-		  1 = /dev/dvb/adapter0/audio0    first audio decoder of first card</div><div class='del'>-		  2 = /dev/dvb/adapter0/sec0      (obsolete/unused)</div><div class='del'>-		  3 = /dev/dvb/adapter0/frontend0 first frontend device of first card</div><div class='del'>-		  4 = /dev/dvb/adapter0/demux0    first demux device of first card</div><div class='del'>-		  5 = /dev/dvb/adapter0/dvr0      first digital video recoder device of first card</div><div class='del'>-		  6 = /dev/dvb/adapter0/ca0       first common access port of first card</div><div class='del'>-		  7 = /dev/dvb/adapter0/net0      first network device of first card</div><div class='del'>-		  8 = /dev/dvb/adapter0/osd0      first on-screen-display device of first card</div><div class='del'>-		  9 = /dev/dvb/adapter0/video1    second video decoder of first card</div><div class='del'>-		    ...</div><div class='del'>-		 64 = /dev/dvb/adapter1/video0    first video decoder of second card</div><div class='del'>-		    ...</div><div class='del'>-		128 = /dev/dvb/adapter2/video0    first video decoder of third card</div><div class='del'>-		    ...</div><div class='del'>-		196 = /dev/dvb/adapter3/video0    first video decoder of fourth card</div><div class='del'>-</div><div class='del'>-216 char	Bluetooth RFCOMM TTY devices</div><div class='del'>-		  0 = /dev/rfcomm0		First Bluetooth RFCOMM TTY device</div><div class='del'>-		  1 = /dev/rfcomm1		Second Bluetooth RFCOMM TTY device</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-217 char	Bluetooth RFCOMM TTY devices (alternate devices)</div><div class='del'>-		  0 = /dev/curf0		Callout device for rfcomm0</div><div class='del'>-		  1 = /dev/curf1		Callout device for rfcomm1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-218 char	The Logical Company bus Unibus/Qbus adapters</div><div class='del'>-		  0 = /dev/logicalco/bci/0	First bus adapter</div><div class='del'>-		  1 = /dev/logicalco/bci/1	First bus adapter</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-219 char	The Logical Company DCI-1300 digital I/O card</div><div class='del'>-		  0 = /dev/logicalco/dci1300/0	First DCI-1300 card</div><div class='del'>-		  1 = /dev/logicalco/dci1300/1	Second DCI-1300 card</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-220 char	Myricom Myrinet "GM" board</div><div class='del'>-		  0 = /dev/myricom/gm0		First Myrinet GM board</div><div class='del'>-		  1 = /dev/myricom/gmp0		First board "root access"</div><div class='del'>-		  2 = /dev/myricom/gm1		Second Myrinet GM board</div><div class='del'>-		  3 = /dev/myricom/gmp1		Second board "root access"</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-221 char	VME bus</div><div class='del'>-		  0 = /dev/bus/vme/m0		First master image</div><div class='del'>-		  1 = /dev/bus/vme/m1		Second master image</div><div class='del'>-		  2 = /dev/bus/vme/m2		Third master image</div><div class='del'>-		  3 = /dev/bus/vme/m3		Fourth master image</div><div class='del'>-		  4 = /dev/bus/vme/s0		First slave image</div><div class='del'>-		  5 = /dev/bus/vme/s1		Second slave image</div><div class='del'>-		  6 = /dev/bus/vme/s2		Third slave image</div><div class='del'>-		  7 = /dev/bus/vme/s3		Fourth slave image</div><div class='del'>-		  8 = /dev/bus/vme/ctl		Control</div><div class='del'>-</div><div class='del'>-		It is expected that all VME bus drivers will use the</div><div class='del'>-		same interface.  For interface documentation see</div><div class='del'>-		http://www.vmelinux.org/.</div><div class='del'>-</div><div class='del'>-224 char	A2232 serial card</div><div class='del'>-		  0 = /dev/ttyY0		First A2232 port</div><div class='del'>-		  1 = /dev/ttyY1		Second A2232 port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-225 char	A2232 serial card (alternate devices)</div><div class='del'>-		  0 = /dev/cuy0			Callout device for ttyY0</div><div class='del'>-		  1 = /dev/cuy1			Callout device for ttyY1</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-226 char	Direct Rendering Infrastructure (DRI)</div><div class='del'>-		  0 = /dev/dri/card0		First graphics card</div><div class='del'>-		  1 = /dev/dri/card1		Second graphics card</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-227 char	IBM 3270 terminal Unix tty access</div><div class='del'>-		  1 = /dev/3270/tty1		First 3270 terminal</div><div class='del'>-		  2 = /dev/3270/tty2		Seconds 3270 terminal</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-228 char	IBM 3270 terminal block-mode access</div><div class='del'>-		  0 = /dev/3270/tub		Controlling interface</div><div class='del'>-		  1 = /dev/3270/tub1		First 3270 terminal</div><div class='del'>-		  2 = /dev/3270/tub2		Second 3270 terminal</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-229 char	IBM iSeries/pSeries virtual console</div><div class='del'>-		  0 = /dev/hvc0			First console port</div><div class='del'>-		  1 = /dev/hvc1			Second console port</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-230 char	IBM iSeries virtual tape</div><div class='del'>-		  0 = /dev/iseries/vt0		First virtual tape, mode 0</div><div class='del'>-		  1 = /dev/iseries/vt1		Second virtual tape, mode 0</div><div class='del'>-		    ...</div><div class='del'>-		 32 = /dev/iseries/vt0l		First virtual tape, mode 1</div><div class='del'>-		 33 = /dev/iseries/vt1l		Second virtual tape, mode 1</div><div class='del'>-		    ...</div><div class='del'>-		 64 = /dev/iseries/vt0m		First virtual tape, mode 2</div><div class='del'>-		 65 = /dev/iseries/vt1m		Second virtual tape, mode 2</div><div class='del'>-		    ...</div><div class='del'>-		 96 = /dev/iseries/vt0a		First virtual tape, mode 3</div><div class='del'>-		 97 = /dev/iseries/vt1a		Second virtual tape, mode 3</div><div class='del'>-		      ...</div><div class='del'>-		128 = /dev/iseries/nvt0		First virtual tape, mode 0, no rewind</div><div class='del'>-		129 = /dev/iseries/nvt1		Second virtual tape, mode 0, no rewind</div><div class='del'>-		    ...</div><div class='del'>-		160 = /dev/iseries/nvt0l	First virtual tape, mode 1, no rewind</div><div class='del'>-		161 = /dev/iseries/nvt1l	Second virtual tape, mode 1, no rewind</div><div class='del'>-		    ...</div><div class='del'>-		192 = /dev/iseries/nvt0m	First virtual tape, mode 2, no rewind</div><div class='del'>-		193 = /dev/iseries/nvt1m	Second virtual tape, mode 2, no rewind</div><div class='del'>-		    ...</div><div class='del'>-		224 = /dev/iseries/nvt0a	First virtual tape, mode 3, no rewind</div><div class='del'>-		225 = /dev/iseries/nvt1a	Second virtual tape, mode 3, no rewind</div><div class='del'>-		    ...</div><div class='del'>-</div><div class='del'>-		"No rewind" refers to the omission of the default</div><div class='del'>-		automatic rewind on device close.  The MTREW or MTOFFL</div><div class='del'>-		ioctl()'s can be used to rewind the tape regardless of</div><div class='del'>-		the device used to access it.</div><div class='del'>-</div><div class='del'>-231 char	InfiniBand</div><div class='del'>-		0 = /dev/infiniband/umad0</div><div class='del'>-		1 = /dev/infiniband/umad1</div><div class='del'>-		  ...</div><div class='del'>-		63 = /dev/infiniband/umad63    63rd InfiniBandMad device</div><div class='del'>-		64 = /dev/infiniband/issm0     First InfiniBand IsSM device</div><div class='del'>-		65 = /dev/infiniband/issm1     Second InfiniBand IsSM device</div><div class='del'>-		  ...</div><div class='del'>-		127 = /dev/infiniband/issm63    63rd InfiniBand IsSM device</div><div class='del'>-		128 = /dev/infiniband/uverbs0   First InfiniBand verbs device</div><div class='del'>-		129 = /dev/infiniband/uverbs1   Second InfiniBand verbs device</div><div class='del'>-		  ...</div><div class='del'>-		159 = /dev/infiniband/uverbs31  31st InfiniBand verbs device</div><div class='del'>-</div><div class='del'>-232 char	Biometric Devices</div><div class='del'>-		0 = /dev/biometric/sensor0/fingerprint	first fingerprint sensor on first device</div><div class='del'>-		1 = /dev/biometric/sensor0/iris		first iris sensor on first device</div><div class='del'>-		2 = /dev/biometric/sensor0/retina	first retina sensor on first device</div><div class='del'>-		3 = /dev/biometric/sensor0/voiceprint	first voiceprint sensor on first device</div><div class='del'>-		4 = /dev/biometric/sensor0/facial	first facial sensor on first device</div><div class='del'>-		5 = /dev/biometric/sensor0/hand		first hand sensor on first device</div><div class='del'>-		  ...</div><div class='del'>-		10 = /dev/biometric/sensor1/fingerprint	first fingerprint sensor on second device</div><div class='del'>-		  ...</div><div class='del'>-		20 = /dev/biometric/sensor2/fingerprint	first fingerprint sensor on third device</div><div class='del'>-		  ...</div><div class='del'>-</div><div class='del'>-233 char	PathScale InfiniPath interconnect</div><div class='del'>-		0 = /dev/ipath        Primary device for programs (any unit)</div><div class='del'>-		1 = /dev/ipath0       Access specifically to unit 0</div><div class='del'>-		2 = /dev/ipath1       Access specifically to unit 1</div><div class='del'>-		  ...</div><div class='del'>-		4 = /dev/ipath3       Access specifically to unit 3</div><div class='del'>-		129 = /dev/ipath_sma    Device used by Subnet Management Agent</div><div class='del'>-		130 = /dev/ipath_diag   Device used by diagnostics programs</div><div class='del'>-</div><div class='del'>-234-254	char	RESERVED FOR DYNAMIC ASSIGNMENT</div><div class='del'>-		Character devices that request a dynamic allocation of major number will</div><div class='del'>-		take numbers starting from 254 and downward.</div><div class='del'>-</div><div class='del'>-240-254 block	LOCAL/EXPERIMENTAL USE</div><div class='del'>-		Allocated for local/experimental use.  For devices not</div><div class='del'>-		assigned official numbers, these ranges should be</div><div class='del'>-		used in order to avoid conflicting with future assignments.</div><div class='del'>-</div><div class='del'>-255 char	RESERVED</div><div class='del'>-</div><div class='del'>-255 block	RESERVED</div><div class='del'>-</div><div class='del'>-		This major is reserved to assist the expansion to a</div><div class='del'>-		larger number space.  No device nodes with this major</div><div class='del'>-		should ever be created on the filesystem.</div><div class='del'>-		(This is probably not true anymore, but I'll leave it</div><div class='del'>-		for now /Torben)</div><div class='del'>-</div><div class='del'>----LARGE MAJORS!!!!!---</div><div class='del'>-</div><div class='del'>-256 char	Equinox SST multi-port serial boards</div><div class='del'>-		   0 = /dev/ttyEQ0	First serial port on first Equinox SST board</div><div class='del'>-		 127 = /dev/ttyEQ127	Last serial port on first Equinox SST board</div><div class='del'>-		 128 = /dev/ttyEQ128	First serial port on second Equinox SST board</div><div class='del'>-		  ...</div><div class='del'>-		1027 = /dev/ttyEQ1027	Last serial port on eighth Equinox SST board</div><div class='del'>-</div><div class='del'>-256 block	Resident Flash Disk Flash Translation Layer</div><div class='del'>-		  0 = /dev/rfda		First RFD FTL layer</div><div class='del'>-		 16 = /dev/rfdb		Second RFD FTL layer</div><div class='del'>-		  ...</div><div class='del'>-		240 = /dev/rfdp		16th RFD FTL layer</div><div class='del'>-</div><div class='del'>-257 char	Phoenix Technologies Cryptographic Services Driver</div><div class='del'>-		  0 = /dev/ptlsec	Crypto Services Driver</div><div class='del'>-</div><div class='del'>-257 block	SSFDC Flash Translation Layer filesystem</div><div class='del'>-		  0 = /dev/ssfdca	First SSFDC layer</div><div class='del'>-		  8 = /dev/ssfdcb	Second SSFDC layer</div><div class='del'>-		 16 = /dev/ssfdcc	Third SSFDC layer</div><div class='del'>-		 24 = /dev/ssfdcd	4th SSFDC layer</div><div class='del'>-		 32 = /dev/ssfdce	5th SSFDC layer</div><div class='del'>-		 40 = /dev/ssfdcf	6th SSFDC layer</div><div class='del'>-		 48 = /dev/ssfdcg	7th SSFDC layer</div><div class='del'>-		 56 = /dev/ssfdch	8th SSFDC layer</div><div class='del'>-</div><div class='del'>-258 block	ROM/Flash read-only translation layer</div><div class='del'>-		  0 = /dev/blockrom0	First ROM card's translation layer interface</div><div class='del'>-		  1 = /dev/blockrom1	Second ROM card's translation layer interface</div><div class='del'>-		  ...</div><div class='del'>-</div><div class='del'>-259 block	Block Extended Major</div><div class='del'>-		  Used dynamically to hold additional partition minor</div><div class='del'>-		  numbers and allow large numbers of partitions per device</div><div class='del'>-</div><div class='del'>-259 char	FPGA configuration interfaces</div><div class='del'>-		  0 = /dev/icap0	First Xilinx internal configuration</div><div class='del'>-		  1 = /dev/icap1	Second Xilinx internal configuration</div><div class='del'>-</div><div class='del'>-260 char	OSD (Object-based-device) SCSI Device</div><div class='del'>-		  0 = /dev/osd0		First OSD Device</div><div class='del'>-		  1 = /dev/osd1		Second OSD Device</div><div class='del'>-		  ...</div><div class='del'>-		  255 = /dev/osd255	256th OSD Device</div><div class='del'>-</div><div class='del'>- ****	ADDITIONAL /dev DIRECTORY ENTRIES</div><div class='del'>-</div><div class='del'>-This section details additional entries that should or may exist in</div><div class='del'>-the /dev directory.  It is preferred that symbolic links use the same</div><div class='del'>-form (absolute or relative) as is indicated here.  Links are</div><div class='del'>-classified as "hard" or "symbolic" depending on the preferred type of</div><div class='del'>-link; if possible, the indicated type of link should be used.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	Compulsory links</div><div class='del'>-</div><div class='del'>-These links should exist on all systems:</div><div class='del'>-</div><div class='del'>-/dev/fd		/proc/self/fd	symbolic	File descriptors</div><div class='del'>-/dev/stdin	fd/0		symbolic	stdin file descriptor</div><div class='del'>-/dev/stdout	fd/1		symbolic	stdout file descriptor</div><div class='del'>-/dev/stderr	fd/2		symbolic	stderr file descriptor</div><div class='del'>-/dev/nfsd	socksys		symbolic	Required by iBCS-2</div><div class='del'>-/dev/X0R	null		symbolic	Required by iBCS-2</div><div class='del'>-</div><div class='del'>-Note: /dev/X0R is &lt;letter X&gt;-&lt;digit 0&gt;-&lt;letter R&gt;.</div><div class='del'>-</div><div class='del'>-	Recommended links</div><div class='del'>-</div><div class='del'>-It is recommended that these links exist on all systems:</div><div class='del'>-</div><div class='del'>-/dev/core	/proc/kcore	symbolic	Backward compatibility</div><div class='del'>-/dev/ramdisk	ram0		symbolic	Backward compatibility</div><div class='del'>-/dev/ftape	qft0		symbolic	Backward compatibility</div><div class='del'>-/dev/bttv0	video0		symbolic	Backward compatibility</div><div class='del'>-/dev/radio	radio0		symbolic	Backward compatibility</div><div class='del'>-/dev/i2o*	/dev/i2o/*	symbolic	Backward compatibility</div><div class='del'>-/dev/scd?	sr?		hard		Alternate SCSI CD-ROM name</div><div class='del'>-</div><div class='del'>-	Locally defined links</div><div class='del'>-</div><div class='del'>-The following links may be established locally to conform to the</div><div class='del'>-configuration of the system.  This is merely a tabulation of existing</div><div class='del'>-practice, and does not constitute a recommendation.  However, if they</div><div class='del'>-exist, they should have the following uses.</div><div class='del'>-</div><div class='del'>-/dev/mouse	mouse port	symbolic	Current mouse device</div><div class='del'>-/dev/tape	tape device	symbolic	Current tape device</div><div class='del'>-/dev/cdrom	CD-ROM device	symbolic	Current CD-ROM device</div><div class='del'>-/dev/cdwriter	CD-writer	symbolic	Current CD-writer device</div><div class='del'>-/dev/scanner	scanner		symbolic	Current scanner device</div><div class='del'>-/dev/modem	modem port	symbolic	Current dialout device</div><div class='del'>-/dev/root	root device	symbolic	Current root filesystem</div><div class='del'>-/dev/swap	swap device	symbolic	Current swap device</div><div class='del'>-</div><div class='del'>-/dev/modem should not be used for a modem which supports dialin as</div><div class='del'>-well as dialout, as it tends to cause lock file problems.  If it</div><div class='del'>-exists, /dev/modem should point to the appropriate primary TTY device</div><div class='del'>-(the use of the alternate callout devices is deprecated).</div><div class='del'>-</div><div class='del'>-For SCSI devices, /dev/tape and /dev/cdrom should point to the</div><div class='del'>-``cooked'' devices (/dev/st* and /dev/sr*, respectively), whereas</div><div class='del'>-/dev/cdwriter and /dev/scanner should point to the appropriate generic</div><div class='del'>-SCSI devices (/dev/sg*).</div><div class='del'>-</div><div class='del'>-/dev/mouse may point to a primary serial TTY device, a hardware mouse</div><div class='del'>-device, or a socket for a mouse driver program (e.g. /dev/gpmdata).</div><div class='del'>-</div><div class='del'>-	Sockets and pipes</div><div class='del'>-</div><div class='del'>-Non-transient sockets and named pipes may exist in /dev.  Common entries are:</div><div class='del'>-</div><div class='del'>-/dev/printer	socket		lpd local socket</div><div class='del'>-/dev/log	socket		syslog local socket</div><div class='del'>-/dev/gpmdata	socket		gpm mouse multiplexer</div><div class='del'>-</div><div class='del'>-	Mount points</div><div class='del'>-</div><div class='del'>-The following names are reserved for mounting special filesystems</div><div class='del'>-under /dev.  These special filesystems provide kernel interfaces that</div><div class='del'>-cannot be provided with standard device nodes.</div><div class='del'>-</div><div class='del'>-/dev/pts	devpts		PTY slave filesystem</div><div class='del'>-/dev/shm	tmpfs		POSIX shared memory maintenance access</div><div class='del'>-</div><div class='del'>- ****	TERMINAL DEVICES</div><div class='del'>-</div><div class='del'>-Terminal, or TTY devices are a special class of character devices.  A</div><div class='del'>-terminal device is any device that could act as a controlling terminal</div><div class='del'>-for a session; this includes virtual consoles, serial ports, and</div><div class='del'>-pseudoterminals (PTYs).</div><div class='del'>-</div><div class='del'>-All terminal devices share a common set of capabilities known as line</div><div class='del'>-disciplines; these include the common terminal line discipline as well</div><div class='del'>-as SLIP and PPP modes.</div><div class='del'>-</div><div class='del'>-All terminal devices are named similarly; this section explains the</div><div class='del'>-naming and use of the various types of TTYs.  Note that the naming</div><div class='del'>-conventions include several historical warts; some of these are</div><div class='del'>-Linux-specific, some were inherited from other systems, and some</div><div class='del'>-reflect Linux outgrowing a borrowed convention.</div><div class='del'>-</div><div class='del'>-A hash mark (#) in a device name is used here to indicate a decimal</div><div class='del'>-number without leading zeroes.</div><div class='del'>-</div><div class='del'>-	Virtual consoles and the console device</div><div class='del'>-</div><div class='del'>-Virtual consoles are full-screen terminal displays on the system video</div><div class='del'>-monitor.  Virtual consoles are named /dev/tty#, with numbering</div><div class='del'>-starting at /dev/tty1; /dev/tty0 is the current virtual console.</div><div class='del'>-/dev/tty0 is the device that should be used to access the system video</div><div class='del'>-card on those architectures for which the frame buffer devices</div><div class='del'>-(/dev/fb*) are not applicable.	Do not use /dev/console</div><div class='del'>-for this purpose.</div><div class='del'>-</div><div class='del'>-The console device, /dev/console, is the device to which system</div><div class='del'>-messages should be sent, and on which logins should be permitted in</div><div class='del'>-single-user mode.  Starting with Linux 2.1.71, /dev/console is managed</div><div class='del'>-by the kernel; for previous versions it should be a symbolic link to</div><div class='del'>-either /dev/tty0, a specific virtual console such as /dev/tty1, or to</div><div class='del'>-a serial port primary (tty*, not cu*) device, depending on the</div><div class='del'>-configuration of the system.</div><div class='del'>-</div><div class='del'>-	Serial ports</div><div class='del'>-</div><div class='del'>-Serial ports are RS-232 serial ports and any device which simulates</div><div class='del'>-one, either in hardware (such as internal modems) or in software (such</div><div class='del'>-as the ISDN driver.)  Under Linux, each serial ports has two device</div><div class='del'>-names, the primary or callin device and the alternate or callout one.</div><div class='del'>-Each kind of device is indicated by a different letter.	 For any</div><div class='del'>-letter X, the names of the devices are /dev/ttyX# and /dev/cux#,</div><div class='del'>-respectively; for historical reasons, /dev/ttyS# and /dev/ttyC#</div><div class='del'>-correspond to /dev/cua# and /dev/cub#.	In the future, it should be</div><div class='del'>-expected that multiple letters will be used; all letters will be upper</div><div class='del'>-case for the "tty" device (e.g. /dev/ttyDP#) and lower case for the</div><div class='del'>-"cu" device (e.g. /dev/cudp#).</div><div class='del'>-</div><div class='del'>-The names /dev/ttyQ# and /dev/cuq# are reserved for local use.</div><div class='del'>-</div><div class='del'>-The alternate devices provide for kernel-based exclusion and somewhat</div><div class='del'>-different defaults than the primary devices.  Their main purpose is to</div><div class='del'>-allow the use of serial ports with programs with no inherent or broken</div><div class='del'>-support for serial ports.  Their use is deprecated, and they may be</div><div class='del'>-removed from a future version of Linux.</div><div class='del'>-</div><div class='del'>-Arbitration of serial ports is provided by the use of lock files with</div><div class='del'>-the names /var/lock/LCK..ttyX#.	 The contents of the lock file should</div><div class='del'>-be the PID of the locking process as an ASCII number.</div><div class='del'>-</div><div class='del'>-It is common practice to install links such as /dev/modem</div><div class='del'>-which point to serial ports.  In order to ensure proper locking in the</div><div class='del'>-presence of these links, it is recommended that software chase</div><div class='del'>-symlinks and lock all possible names; additionally, it is recommended</div><div class='del'>-that a lock file be installed with the corresponding alternate</div><div class='del'>-device.	 In order to avoid deadlocks, it is recommended that the locks</div><div class='del'>-are acquired in the following order, and released in the reverse:</div><div class='del'>-</div><div class='del'>-	1. The symbolic link name, if any (/var/lock/LCK..modem)</div><div class='del'>-	2. The "tty" name (/var/lock/LCK..ttyS2)</div><div class='del'>-	3. The alternate device name (/var/lock/LCK..cua2)</div><div class='del'>-</div><div class='del'>-In the case of nested symbolic links, the lock files should be</div><div class='del'>-installed in the order the symlinks are resolved.</div><div class='del'>-</div><div class='del'>-Under no circumstances should an application hold a lock while waiting</div><div class='del'>-for another to be released.  In addition, applications which attempt</div><div class='del'>-to create lock files for the corresponding alternate device names</div><div class='del'>-should take into account the possibility of being used on a non-serial</div><div class='del'>-port TTY, for which no alternate device would exist.</div><div class='del'>-</div><div class='del'>-	Pseudoterminals (PTYs)</div><div class='del'>-</div><div class='del'>-Pseudoterminals, or PTYs, are used to create login sessions or provide</div><div class='del'>-other capabilities requiring a TTY line discipline (including SLIP or</div><div class='del'>-PPP capability) to arbitrary data-generation processes.	 Each PTY has</div><div class='del'>-a master side, named /dev/pty[p-za-e][0-9a-f], and a slave side, named</div><div class='del'>-/dev/tty[p-za-e][0-9a-f].  The kernel arbitrates the use of PTYs by</div><div class='del'>-allowing each master side to be opened only once.</div><div class='del'>-</div><div class='del'>-Once the master side has been opened, the corresponding slave device</div><div class='del'>-can be used in the same manner as any TTY device.  The master and</div><div class='del'>-slave devices are connected by the kernel, generating the equivalent</div><div class='del'>-of a bidirectional pipe with TTY capabilities.</div><div class='del'>-</div><div class='del'>-Recent versions of the Linux kernels and GNU libc contain support for</div><div class='del'>-the System V/Unix98 naming scheme for PTYs, which assigns a common</div><div class='del'>-device, /dev/ptmx, to all the masters (opening it will automatically</div><div class='del'>-give you a previously unassigned PTY) and a subdirectory, /dev/pts,</div><div class='del'>-for the slaves; the slaves are named with decimal integers (/dev/pts/#</div><div class='del'>-in our notation).  This removes the problem of exhausting the</div><div class='del'>-namespace and enables the kernel to automatically create the device</div><div class='del'>-nodes for the slaves on demand using the "devpts" filesystem.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/amlogic,scpi.txt b/Documentation/devicetree/bindings/arm/amlogic,scpi.txt<br/>new file mode 100644<br/>index 000000000000..7b9a861e9306<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/amlogic,scpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/amlogic,scpi.txt</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+System Control and Power Interface (SCPI) Message Protocol</div><div class='add'>+(in addition to the standard binding in [0])</div><div class='add'>+----------------------------------------------------------</div><div class='add'>+Required properties</div><div class='add'>+</div><div class='add'>+- compatible : should be "amlogic,meson-gxbb-scpi"</div><div class='add'>+</div><div class='add'>+AMLOGIC SRAM and Shared Memory for SCPI</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : should be "amlogic,meson-gxbb-sram"</div><div class='add'>+</div><div class='add'>+Each sub-node represents the reserved area for SCPI.</div><div class='add'>+</div><div class='add'>+Required sub-node properties:</div><div class='add'>+- compatible : should be "amlogic,meson-gxbb-scp-shmem" for SRAM based shared</div><div class='add'>+		memory on Amlogic GXBB SoC.</div><div class='add'>+</div><div class='add'>+[0] Documentation/devicetree/bindings/arm/arm,scpi.txt</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt<br/>index fcc6f6c10803..c246cd2730d9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/amlogic.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/amlogic.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/amlogic.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/amlogic.txt</a></div><div class='hunk'>@@ -17,6 +17,18 @@ Boards with the Amlogic Meson GXBaby SoC shall have the following properties:</div><div class='ctx'>   Required root node property:</div><div class='ctx'>     compatible: "amlogic,meson-gxbb";</div><div class='ctx'> </div><div class='add'>+Boards with the Amlogic Meson GXL S905X SoC shall have the following properties:</div><div class='add'>+  Required root node property:</div><div class='add'>+    compatible: "amlogic,s905x", "amlogic,meson-gxl";</div><div class='add'>+</div><div class='add'>+Boards with the Amlogic Meson GXL S905D SoC shall have the following properties:</div><div class='add'>+  Required root node property:</div><div class='add'>+    compatible: "amlogic,s905d", "amlogic,meson-gxl";</div><div class='add'>+</div><div class='add'>+Boards with the Amlogic Meson GXM S912 SoC shall have the following properties:</div><div class='add'>+  Required root node property:</div><div class='add'>+    compatible: "amlogic,s912", "amlogic,meson-gxm";</div><div class='add'>+</div><div class='ctx'> Board compatible values:</div><div class='ctx'>   - "geniatech,atv1200" (Meson6)</div><div class='ctx'>   - "minix,neo-x8" (Meson8)</div><div class='hunk'>@@ -28,3 +40,12 @@ Board compatible values:</div><div class='ctx'>   - "hardkernel,odroid-c2" (Meson gxbb)</div><div class='ctx'>   - "amlogic,p200" (Meson gxbb)</div><div class='ctx'>   - "amlogic,p201" (Meson gxbb)</div><div class='add'>+  - "wetek,hub" (Meson gxbb)</div><div class='add'>+  - "wetek,play2" (Meson gxbb)</div><div class='add'>+  - "amlogic,p212" (Meson gxl s905x)</div><div class='add'>+  - "amlogic,p230" (Meson gxl s905d)</div><div class='add'>+  - "amlogic,p231" (Meson gxl s905d)</div><div class='add'>+  - "amlogic,q200" (Meson gxm s912)</div><div class='add'>+  - "amlogic,q201" (Meson gxm s912)</div><div class='add'>+  - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)</div><div class='add'>+  - "nexbox,a1" (Meson gxm s912)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt<br/>index ef5fbe9a77c7..e926aea1147d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/arch_timer.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/arch_timer.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/arch_timer.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/arch_timer.txt</a></div><div class='hunk'>@@ -31,6 +31,12 @@ to deliver its interrupts via SPIs.</div><div class='ctx'>   This also affects writes to the tval register, due to the implicit</div><div class='ctx'>   counter read.</div><div class='ctx'> </div><div class='add'>+- hisilicon,erratum-161010101 : A boolean property. Indicates the</div><div class='add'>+  presence of Hisilicon erratum 161010101, which says that reading the</div><div class='add'>+  counters is unreliable in some cases, and reads may return a value 32</div><div class='add'>+  beyond the correct value. This also affects writes to the tval</div><div class='add'>+  registers, due to the implicit counter read.</div><div class='add'>+</div><div class='ctx'> ** Optional properties:</div><div class='ctx'> </div><div class='ctx'> - arm,cpu-registers-not-fw-configured : Firmware does not initialize</div><div class='hunk'>@@ -38,6 +44,11 @@ to deliver its interrupts via SPIs.</div><div class='ctx'>   architecturally-defined reset values. Only supported for 32-bit</div><div class='ctx'>   systems which follow the ARMv7 architected reset values.</div><div class='ctx'> </div><div class='add'>+- arm,no-tick-in-suspend : The main counter does not tick when the system is in</div><div class='add'>+  low-power system suspend on some SoCs. This behavior does not match the</div><div class='add'>+  Architecture Reference Manual's specification that the system counter "must</div><div class='add'>+  be implemented in an always-on power domain."</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/arm,scpi.txt b/Documentation/devicetree/bindings/arm/arm,scpi.txt<br/>index faa4b44572e3..401831973638 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/arm,scpi.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/arm,scpi.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/arm,scpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/arm,scpi.txt</a></div><div class='hunk'>@@ -7,7 +7,10 @@ by Linux to initiate various system control and power operations.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> </div><div class='del'>-- compatible : should be "arm,scpi"</div><div class='add'>+- compatible : should be</div><div class='add'>+	* "arm,scpi" : For implementations complying to SCPI v1.0 or above</div><div class='add'>+	* "arm,scpi-pre-1.0" : For implementations complying to all</div><div class='add'>+		unversioned releases prior to SCPI v1.0</div><div class='ctx'> - mboxes: List of phandle and mailbox channel specifiers</div><div class='ctx'> 	  All the channels reserved by remote SCP firmware for use by</div><div class='ctx'> 	  SCPI message protocol should be specified in any order</div><div class='hunk'>@@ -59,18 +62,14 @@ SRAM and Shared Memory for SCPI</div><div class='ctx'> A small area of SRAM is reserved for SCPI communication between application</div><div class='ctx'> processors and SCP.</div><div class='ctx'> </div><div class='del'>-Required properties:</div><div class='del'>-- compatible : should be "arm,juno-sram-ns" for Non-secure SRAM on Juno</div><div class='del'>-</div><div class='del'>-The rest of the properties should follow the generic mmio-sram description</div><div class='del'>-found in ../../sram/sram.txt</div><div class='add'>+The properties should follow the generic mmio-sram description found in [3]</div><div class='ctx'> </div><div class='ctx'> Each sub-node represents the reserved area for SCPI.</div><div class='ctx'> </div><div class='ctx'> Required sub-node properties:</div><div class='ctx'> - reg : The base offset and size of the reserved area with the SRAM</div><div class='del'>-- compatible : should be "arm,juno-scp-shmem" for Non-secure SRAM based</div><div class='del'>-	       shared memory on Juno platforms</div><div class='add'>+- compatible : should be "arm,scp-shmem" for Non-secure SRAM based</div><div class='add'>+	       shared memory</div><div class='ctx'> </div><div class='ctx'> Sensor bindings for the sensors based on SCPI Message Protocol</div><div class='ctx'> --------------------------------------------------------------</div><div class='hunk'>@@ -81,11 +80,9 @@ Required properties:</div><div class='ctx'> - #thermal-sensor-cells: should be set to 1. This property follows the</div><div class='ctx'> 			 thermal device tree bindings[2].</div><div class='ctx'> </div><div class='del'>-			 Valid cell values are raw identifiers (Sensor</div><div class='del'>-			 ID) as used by the firmware. Refer to</div><div class='del'>-			 platform documentation for your</div><div class='del'>-			 implementation for the IDs to use. For Juno</div><div class='del'>-			 R0 and Juno R1 refer to [3].</div><div class='add'>+			 Valid cell values are raw identifiers (Sensor ID)</div><div class='add'>+			 as used by the firmware. Refer to  platform details</div><div class='add'>+			 for your implementation for the IDs to use.</div><div class='ctx'> </div><div class='ctx'> Power domain bindings for the power domains based on SCPI Message Protocol</div><div class='ctx'> ------------------------------------------------------------</div><div class='hunk'>@@ -112,7 +109,7 @@ Required properties:</div><div class='ctx'> [0] http://infocenter.arm.com/help/topic/com.arm.doc.dui0922b/index.html</div><div class='ctx'> [1] Documentation/devicetree/bindings/clock/clock-bindings.txt</div><div class='ctx'> [2] Documentation/devicetree/bindings/thermal/thermal.txt</div><div class='del'>-[3] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0922b/apas03s22.html</div><div class='add'>+[3] Documentation/devicetree/bindings/sram/sram.txt</div><div class='ctx'> [4] Documentation/devicetree/bindings/power/power_domain.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards<br/>index ab318a56fca2..b6e810c2781a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/arm-boards?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/arm-boards</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/arm-boards?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/arm-boards</a></div><div class='hunk'>@@ -148,11 +148,12 @@ Example:</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "ARM RealView PB1176 with device tree";</div><div class='ctx'> 	compatible = "arm,realview-pb1176";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 	soc {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt<br/>index e1f5ad855f14..29737b9b616e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/atmel-at91.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/atmel-at91.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/atmel-at91.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/atmel-at91.txt</a></div><div class='hunk'>@@ -225,3 +225,19 @@ required properties:</div><div class='ctx'> 		compatible = "atmel,sama5d3-sfr", "syscon";</div><div class='ctx'> 		reg = &lt;0xf0038000 0x60&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+Security Module (SECUMOD)</div><div class='add'>+</div><div class='add'>+The Security Module macrocell provides all necessary secure functions to avoid</div><div class='add'>+voltage, temperature, frequency and mechanical attacks on the chip. It also</div><div class='add'>+embeds secure memories that can be scrambled</div><div class='add'>+</div><div class='add'>+required properties:</div><div class='add'>+- compatible: Should be "atmel,&lt;chip&gt;-secumod", "syscon".</div><div class='add'>+  &lt;chip&gt; can be "sama5d2".</div><div class='add'>+- reg: Should contain registers location and length</div><div class='add'>+</div><div class='add'>+	secumod@fc040000 {</div><div class='add'>+		compatible = "atmel,sama5d2-secumod", "syscon";</div><div class='add'>+		reg = &lt;0xfc040000 0x100&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/axentia.txt b/Documentation/devicetree/bindings/arm/axentia.txt<br/>new file mode 100644<br/>index 000000000000..ea3fb96ae465<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/axentia.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/axentia.txt</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+Device tree bindings for Axentia ARM devices</div><div class='add'>+============================================</div><div class='add'>+</div><div class='add'>+Linea CPU module</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Required root node properties:</div><div class='add'>+compatible = "axentia,linea",</div><div class='add'>+	     "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";</div><div class='add'>+and following the rules from atmel-at91.txt for a sama5d31 SoC.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+TSE-850 v3 board</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Required root node properties:</div><div class='add'>+compatible = "axentia,tse850v3", "axentia,linea",</div><div class='add'>+	     "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";</div><div class='add'>+and following the rules from above for the axentia,linea CPU module.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/bcm/ns2.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt<br/>index 35f056f4a1c3..35f056f4a1c3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/bcm/ns2.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/bcm/ns2.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt</a></div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/cpu-capacity.txt b/Documentation/devicetree/bindings/arm/cpu-capacity.txt<br/>new file mode 100644<br/>index 000000000000..7809fbe0cdb7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/cpu-capacity.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/cpu-capacity.txt</a></div><div class='hunk'>@@ -0,0 +1,236 @@</div><div class='add'>+==========================================</div><div class='add'>+ARM CPUs capacity bindings</div><div class='add'>+==========================================</div><div class='add'>+</div><div class='add'>+==========================================</div><div class='add'>+1 - Introduction</div><div class='add'>+==========================================</div><div class='add'>+</div><div class='add'>+ARM systems may be configured to have cpus with different power/performance</div><div class='add'>+characteristics within the same chip. In this case, additional information has</div><div class='add'>+to be made available to the kernel for it to be aware of such differences and</div><div class='add'>+take decisions accordingly.</div><div class='add'>+</div><div class='add'>+==========================================</div><div class='add'>+2 - CPU capacity definition</div><div class='add'>+==========================================</div><div class='add'>+</div><div class='add'>+CPU capacity is a number that provides the scheduler information about CPUs</div><div class='add'>+heterogeneity. Such heterogeneity can come from micro-architectural differences</div><div class='add'>+(e.g., ARM big.LITTLE systems) or maximum frequency at which CPUs can run</div><div class='add'>+(e.g., SMP systems with multiple frequency domains). Heterogeneity in this</div><div class='add'>+context is about differing performance characteristics; this binding tries to</div><div class='add'>+capture a first-order approximation of the relative performance of CPUs.</div><div class='add'>+</div><div class='add'>+CPU capacities are obtained by running a suitable benchmark. This binding makes</div><div class='add'>+no guarantees on the validity or suitability of any particular benchmark, the</div><div class='add'>+final capacity should, however, be:</div><div class='add'>+</div><div class='add'>+* A "single-threaded" or CPU affine benchmark</div><div class='add'>+* Divided by the running frequency of the CPU executing the benchmark</div><div class='add'>+* Not subject to dynamic frequency scaling of the CPU</div><div class='add'>+</div><div class='add'>+For the time being we however advise usage of the Dhrystone benchmark. What</div><div class='add'>+above thus becomes:</div><div class='add'>+</div><div class='add'>+CPU capacities are obtained by running the Dhrystone benchmark on each CPU at</div><div class='add'>+max frequency (with caches enabled). The obtained DMIPS score is then divided</div><div class='add'>+by the frequency (in MHz) at which the benchmark has been run, so that</div><div class='add'>+DMIPS/MHz are obtained.  Such values are then normalized w.r.t. the highest</div><div class='add'>+score obtained in the system.</div><div class='add'>+</div><div class='add'>+==========================================</div><div class='add'>+3 - capacity-dmips-mhz</div><div class='add'>+==========================================</div><div class='add'>+</div><div class='add'>+capacity-dmips-mhz is an optional cpu node [1] property: u32 value</div><div class='add'>+representing CPU capacity expressed in normalized DMIPS/MHz. At boot time, the</div><div class='add'>+maximum frequency available to the cpu is then used to calculate the capacity</div><div class='add'>+value internally used by the kernel.</div><div class='add'>+</div><div class='add'>+capacity-dmips-mhz property is all-or-nothing: if it is specified for a cpu</div><div class='add'>+node, it has to be specified for every other cpu nodes, or the system will</div><div class='add'>+fall back to the default capacity value for every CPU. If cpufreq is not</div><div class='add'>+available, final capacities are calculated by directly using capacity-dmips-</div><div class='add'>+mhz values (normalized w.r.t. the highest value found while parsing the DT).</div><div class='add'>+</div><div class='add'>+===========================================</div><div class='add'>+4 - Examples</div><div class='add'>+===========================================</div><div class='add'>+</div><div class='add'>+Example 1 (ARM 64-bit, 6-cpu system, two clusters):</div><div class='add'>+capacities-dmips-mhz are scaled w.r.t. 1024 (cpu@0 and cpu@1)</div><div class='add'>+supposing cluster0@max-freq=1100 and custer1@max-freq=850,</div><div class='add'>+final capacities are 1024 for cluster0 and 446 for cluster1</div><div class='add'>+</div><div class='add'>+cpus {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	cpu-map {</div><div class='add'>+		cluster0 {</div><div class='add'>+			core0 {</div><div class='add'>+				cpu = &lt;&amp;A57_0&gt;;</div><div class='add'>+			};</div><div class='add'>+			core1 {</div><div class='add'>+				cpu = &lt;&amp;A57_1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster1 {</div><div class='add'>+			core0 {</div><div class='add'>+				cpu = &lt;&amp;A53_0&gt;;</div><div class='add'>+			};</div><div class='add'>+			core1 {</div><div class='add'>+				cpu = &lt;&amp;A53_1&gt;;</div><div class='add'>+			};</div><div class='add'>+			core2 {</div><div class='add'>+				cpu = &lt;&amp;A53_2&gt;;</div><div class='add'>+			};</div><div class='add'>+			core3 {</div><div class='add'>+				cpu = &lt;&amp;A53_3&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	idle-states {</div><div class='add'>+		entry-method = "arm,psci";</div><div class='add'>+</div><div class='add'>+		CPU_SLEEP_0: cpu-sleep-0 {</div><div class='add'>+			compatible = "arm,idle-state";</div><div class='add'>+			arm,psci-suspend-param = &lt;0x0010000&gt;;</div><div class='add'>+			local-timer-stop;</div><div class='add'>+			entry-latency-us = &lt;100&gt;;</div><div class='add'>+			exit-latency-us = &lt;250&gt;;</div><div class='add'>+			min-residency-us = &lt;150&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		CLUSTER_SLEEP_0: cluster-sleep-0 {</div><div class='add'>+			compatible = "arm,idle-state";</div><div class='add'>+			arm,psci-suspend-param = &lt;0x1010000&gt;;</div><div class='add'>+			local-timer-stop;</div><div class='add'>+			entry-latency-us = &lt;800&gt;;</div><div class='add'>+			exit-latency-us = &lt;700&gt;;</div><div class='add'>+			min-residency-us = &lt;2500&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	A57_0: cpu@0 {</div><div class='add'>+		compatible = "arm,cortex-a57","arm,armv8";</div><div class='add'>+		reg = &lt;0x0 0x0&gt;;</div><div class='add'>+		device_type = "cpu";</div><div class='add'>+		enable-method = "psci";</div><div class='add'>+		next-level-cache = &lt;&amp;A57_L2&gt;;</div><div class='add'>+		clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='add'>+		cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+		capacity-dmips-mhz = &lt;1024&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	A57_1: cpu@1 {</div><div class='add'>+		compatible = "arm,cortex-a57","arm,armv8";</div><div class='add'>+		reg = &lt;0x0 0x1&gt;;</div><div class='add'>+		device_type = "cpu";</div><div class='add'>+		enable-method = "psci";</div><div class='add'>+		next-level-cache = &lt;&amp;A57_L2&gt;;</div><div class='add'>+		clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='add'>+		cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+		capacity-dmips-mhz = &lt;1024&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	A53_0: cpu@100 {</div><div class='add'>+		compatible = "arm,cortex-a53","arm,armv8";</div><div class='add'>+		reg = &lt;0x0 0x100&gt;;</div><div class='add'>+		device_type = "cpu";</div><div class='add'>+		enable-method = "psci";</div><div class='add'>+		next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='add'>+		clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='add'>+		cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+		capacity-dmips-mhz = &lt;578&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	A53_1: cpu@101 {</div><div class='add'>+		compatible = "arm,cortex-a53","arm,armv8";</div><div class='add'>+		reg = &lt;0x0 0x101&gt;;</div><div class='add'>+		device_type = "cpu";</div><div class='add'>+		enable-method = "psci";</div><div class='add'>+		next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='add'>+		clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='add'>+		cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+		capacity-dmips-mhz = &lt;578&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	A53_2: cpu@102 {</div><div class='add'>+		compatible = "arm,cortex-a53","arm,armv8";</div><div class='add'>+		reg = &lt;0x0 0x102&gt;;</div><div class='add'>+		device_type = "cpu";</div><div class='add'>+		enable-method = "psci";</div><div class='add'>+		next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='add'>+		clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='add'>+		cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+		capacity-dmips-mhz = &lt;578&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	A53_3: cpu@103 {</div><div class='add'>+		compatible = "arm,cortex-a53","arm,armv8";</div><div class='add'>+		reg = &lt;0x0 0x103&gt;;</div><div class='add'>+		device_type = "cpu";</div><div class='add'>+		enable-method = "psci";</div><div class='add'>+		next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='add'>+		clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='add'>+		cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+		capacity-dmips-mhz = &lt;578&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	A57_L2: l2-cache0 {</div><div class='add'>+		compatible = "cache";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	A53_L2: l2-cache1 {</div><div class='add'>+		compatible = "cache";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Example 2 (ARM 32-bit, 4-cpu system, two clusters,</div><div class='add'>+	   cpus 0,1@1GHz, cpus 2,3@500MHz):</div><div class='add'>+capacities-dmips-mhz are scaled w.r.t. 2 (cpu@0 and cpu@1), this means that first</div><div class='add'>+cpu@0 and cpu@1 are twice fast than cpu@2 and cpu@3 (at the same frequency)</div><div class='add'>+</div><div class='add'>+cpus {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	cpu0: cpu@0 {</div><div class='add'>+		device_type = "cpu";</div><div class='add'>+		compatible = "arm,cortex-a15";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		capacity-dmips-mhz = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpu1: cpu@1 {</div><div class='add'>+		device_type = "cpu";</div><div class='add'>+		compatible = "arm,cortex-a15";</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		capacity-dmips-mhz = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpu2: cpu@2 {</div><div class='add'>+		device_type = "cpu";</div><div class='add'>+		compatible = "arm,cortex-a15";</div><div class='add'>+		reg = &lt;0x100&gt;;</div><div class='add'>+		capacity-dmips-mhz = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpu3: cpu@3 {</div><div class='add'>+		device_type = "cpu";</div><div class='add'>+		compatible = "arm,cortex-a15";</div><div class='add'>+		reg = &lt;0x101&gt;;</div><div class='add'>+		capacity-dmips-mhz = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+===========================================</div><div class='add'>+5 - References</div><div class='add'>+===========================================</div><div class='add'>+</div><div class='add'>+[1] ARM Linux Kernel documentation - CPUs bindings</div><div class='add'>+    Documentation/devicetree/bindings/arm/cpus.txt</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt<br/>index e6782d50cbcd..698ad1f097fa 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/cpus.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/cpus.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/cpus.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/cpus.txt</a></div><div class='hunk'>@@ -158,6 +158,7 @@ nodes to be present and contain the properties described below.</div><div class='ctx'> 			    "arm,cortex-a53"</div><div class='ctx'> 			    "arm,cortex-a57"</div><div class='ctx'> 			    "arm,cortex-a72"</div><div class='add'>+			    "arm,cortex-a73"</div><div class='ctx'> 			    "arm,cortex-m0"</div><div class='ctx'> 			    "arm,cortex-m0+"</div><div class='ctx'> 			    "arm,cortex-m1"</div><div class='hunk'>@@ -178,6 +179,7 @@ nodes to be present and contain the properties described below.</div><div class='ctx'> 			    "marvell,pj4b"</div><div class='ctx'> 			    "marvell,sheeva-v5"</div><div class='ctx'> 			    "nvidia,tegra132-denver"</div><div class='add'>+			    "nvidia,tegra186-denver"</div><div class='ctx'> 			    "qcom,krait"</div><div class='ctx'> 			    "qcom,kryo"</div><div class='ctx'> 			    "qcom,scorpion"</div><div class='hunk'>@@ -201,6 +203,7 @@ nodes to be present and contain the properties described below.</div><div class='ctx'> 			    "marvell,armada-380-smp"</div><div class='ctx'> 			    "marvell,armada-390-smp"</div><div class='ctx'> 			    "marvell,armada-xp-smp"</div><div class='add'>+			    "marvell,98dx3236-smp"</div><div class='ctx'> 			    "mediatek,mt6589-smp"</div><div class='ctx'> 			    "mediatek,mt81xx-tz-smp"</div><div class='ctx'> 			    "qcom,gcc-msm8660"</div><div class='hunk'>@@ -241,6 +244,14 @@ nodes to be present and contain the properties described below.</div><div class='ctx'> 			# List of phandles to idle state nodes supported</div><div class='ctx'> 			  by this cpu [3].</div><div class='ctx'> </div><div class='add'>+	- capacity-dmips-mhz</div><div class='add'>+		Usage: Optional</div><div class='add'>+		Value type: &lt;u32&gt;</div><div class='add'>+		Definition:</div><div class='add'>+			# u32 value representing CPU capacity [3] in</div><div class='add'>+			  DMIPS/MHz, relative to highest capacity-dmips-mhz</div><div class='add'>+			  in the system.</div><div class='add'>+</div><div class='ctx'> 	- rockchip,pmu</div><div class='ctx'> 		Usage: optional for systems that have an "enable-method"</div><div class='ctx'> 		       property value of "rockchip,rk3066-smp"</div><div class='hunk'>@@ -464,3 +475,5 @@ cpus {</div><div class='ctx'> [2] arm/msm/qcom,kpss-acc.txt</div><div class='ctx'> [3] ARM Linux kernel documentation - idle states bindings</div><div class='ctx'>     Documentation/devicetree/bindings/arm/idle-states.txt</div><div class='add'>+[3] ARM Linux kernel documentation - cpu capacity bindings</div><div class='add'>+    Documentation/devicetree/bindings/arm/cpu-capacity.txt</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/davinci.txt b/Documentation/devicetree/bindings/arm/davinci.txt<br/>index f0841ce725b5..715622c36260 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/davinci.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/davinci.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/davinci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/davinci.txt</a></div><div class='hunk'>@@ -13,6 +13,10 @@ EnBW AM1808 based CMC board</div><div class='ctx'> Required root node properties:</div><div class='ctx'>     - compatible = "enbw,cmc", "ti,da850;</div><div class='ctx'> </div><div class='add'>+LEGO MINDSTORMS EV3 (AM1808 based)</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = "lego,ev3", "ti,da850";</div><div class='add'>+</div><div class='ctx'> Generic DaVinci Boards</div><div class='ctx'> ----------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt<br/>index dbbc0952021c..c9c567ae227f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/fsl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/fsl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/fsl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/fsl.txt</a></div><div class='hunk'>@@ -97,7 +97,7 @@ Freescale LS1021A Platform Device Tree Bindings</div><div class='ctx'> Required root node compatible properties:</div><div class='ctx'>   - compatible = "fsl,ls1021a";</div><div class='ctx'> </div><div class='del'>-Freescale LS1021A SoC-specific Device Tree Bindings</div><div class='add'>+Freescale SoC-specific Device Tree Bindings</div><div class='ctx'> -------------------------------------------</div><div class='ctx'> </div><div class='ctx'> Freescale SCFG</div><div class='hunk'>@@ -105,7 +105,11 @@ Freescale SCFG</div><div class='ctx'> configuration and status registers for the chip. Such as getting PEX port</div><div class='ctx'> status.</div><div class='ctx'>   Required properties:</div><div class='del'>-  - compatible: should be "fsl,ls1021a-scfg"</div><div class='add'>+  - compatible: Should contain a chip-specific compatible string,</div><div class='add'>+	Chip-specific strings are of the form "fsl,&lt;chip&gt;-scfg",</div><div class='add'>+	The following &lt;chip&gt;s are known to be supported:</div><div class='add'>+	ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.</div><div class='add'>+</div><div class='ctx'>   - reg: should contain base address and length of SCFG memory-mapped registers</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='hunk'>@@ -119,7 +123,11 @@ Freescale DCFG</div><div class='ctx'> configuration and status for the device. Such as setting the secondary</div><div class='ctx'> core start address and release the secondary core from holdoff and startup.</div><div class='ctx'>   Required properties:</div><div class='del'>-  - compatible: should be "fsl,ls1021a-dcfg"</div><div class='add'>+  - compatible: Should contain a chip-specific compatible string,</div><div class='add'>+	Chip-specific strings are of the form "fsl,&lt;chip&gt;-dcfg",</div><div class='add'>+	The following &lt;chip&gt;s are known to be supported:</div><div class='add'>+	ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.</div><div class='add'>+</div><div class='ctx'>   - reg : should contain base address and length of DCFG memory-mapped registers</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='hunk'>@@ -131,6 +139,26 @@ Example:</div><div class='ctx'> Freescale ARMv8 based Layerscape SoC family Device Tree Bindings</div><div class='ctx'> ----------------------------------------------------------------</div><div class='ctx'> </div><div class='add'>+LS1012A SoC</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = "fsl,ls1012a";</div><div class='add'>+</div><div class='add'>+LS1012A ARMv8 based RDB Board</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = "fsl,ls1012a-rdb", "fsl,ls1012a";</div><div class='add'>+</div><div class='add'>+LS1012A ARMv8 based FRDM Board</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = "fsl,ls1012a-frdm", "fsl,ls1012a";</div><div class='add'>+</div><div class='add'>+LS1012A ARMv8 based QDS Board</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = "fsl,ls1012a-qds", "fsl,ls1012a";</div><div class='add'>+</div><div class='add'>+LS1043A SoC</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = "fsl,ls1043a";</div><div class='add'>+</div><div class='ctx'> LS1043A ARMv8 based RDB Board</div><div class='ctx'> Required root node properties:</div><div class='ctx'>     - compatible = "fsl,ls1043a-rdb", "fsl,ls1043a";</div><div class='hunk'>@@ -139,6 +167,22 @@ LS1043A ARMv8 based QDS Board</div><div class='ctx'> Required root node properties:</div><div class='ctx'>     - compatible = "fsl,ls1043a-qds", "fsl,ls1043a";</div><div class='ctx'> </div><div class='add'>+LS1046A SoC</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = "fsl,ls1046a";</div><div class='add'>+</div><div class='add'>+LS1046A ARMv8 based QDS Board</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = "fsl,ls1046a-qds", "fsl,ls1046a";</div><div class='add'>+</div><div class='add'>+LS1046A ARMv8 based RDB Board</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = "fsl,ls1046a-rdb", "fsl,ls1046a";</div><div class='add'>+</div><div class='add'>+LS2080A SoC</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = "fsl,ls2080a";</div><div class='add'>+</div><div class='ctx'> LS2080A ARMv8 based Simulator model</div><div class='ctx'> Required root node properties:</div><div class='ctx'>     - compatible = "fsl,ls2080a-simu", "fsl,ls2080a";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt<br/>index 3f81575aa6be..f1c1e21a8110 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt</a></div><div class='hunk'>@@ -1,5 +1,9 @@</div><div class='ctx'> Hisilicon Platforms Device Tree Bindings</div><div class='ctx'> ----------------------------------------------------</div><div class='add'>+Hi3660 SoC</div><div class='add'>+Required root node properties:</div><div class='add'>+	- compatible = "hisilicon,hi3660";</div><div class='add'>+</div><div class='ctx'> Hi4511 Board</div><div class='ctx'> Required root node properties:</div><div class='ctx'> 	- compatible = "hisilicon,hi3620-hi4511";</div><div class='hunk'>@@ -28,6 +32,10 @@ HiP06 D03 Board</div><div class='ctx'> Required root node properties:</div><div class='ctx'> 	- compatible = "hisilicon,hip06-d03";</div><div class='ctx'> </div><div class='add'>+HiP07 D05 Board</div><div class='add'>+Required root node properties:</div><div class='add'>+	- compatible = "hisilicon,hip07-d05";</div><div class='add'>+</div><div class='ctx'> Hisilicon system controller</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/juno,scpi.txt b/Documentation/devicetree/bindings/arm/juno,scpi.txt<br/>new file mode 100644<br/>index 000000000000..2ace8696bbee<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/juno,scpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/juno,scpi.txt</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+System Control and Power Interface (SCPI) Message Protocol</div><div class='add'>+(in addition to the standard binding in [0])</div><div class='add'>+</div><div class='add'>+Juno SRAM and Shared Memory for SCPI</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : should be "arm,juno-sram-ns" for Non-secure SRAM</div><div class='add'>+</div><div class='add'>+Each sub-node represents the reserved area for SCPI.</div><div class='add'>+</div><div class='add'>+Required sub-node properties:</div><div class='add'>+- reg : The base offset and size of the reserved area with the SRAM</div><div class='add'>+- compatible : should be "arm,juno-scp-shmem" for Non-secure SRAM based</div><div class='add'>+	       shared memory on Juno platforms</div><div class='add'>+</div><div class='add'>+Sensor bindings for the sensors based on SCPI Message Protocol</div><div class='add'>+--------------------------------------------------------------</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : should be "arm,scpi-sensors".</div><div class='add'>+- #thermal-sensor-cells: should be set to 1.</div><div class='add'>+			 For Juno R0 and Juno R1 refer to [1] for the</div><div class='add'>+			 sensor identifiers</div><div class='add'>+</div><div class='add'>+[0] Documentation/devicetree/bindings/arm/arm,scpi.txt</div><div class='add'>+[1] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0922b/apas03s22.html</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/keystone/ti,sci.txt b/Documentation/devicetree/bindings/arm/keystone/ti,sci.txt<br/>new file mode 100644<br/>index 000000000000..31f5f9a104cc<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/keystone/ti,sci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/keystone/ti,sci.txt</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+Texas Instruments System Control Interface (TI-SCI) Message Protocol</div><div class='add'>+--------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Texas Instrument's processors including those belonging to Keystone generation</div><div class='add'>+of processors have separate hardware entity which is now responsible for the</div><div class='add'>+management of the System on Chip (SoC) system. These include various system</div><div class='add'>+level functions as well.</div><div class='add'>+</div><div class='add'>+An example of such an SoC is K2G, which contains the system control hardware</div><div class='add'>+block called Power Management Micro Controller (PMMC). This hardware block is</div><div class='add'>+initialized early into boot process and provides services to Operating Systems</div><div class='add'>+on multiple processors including ones running Linux.</div><div class='add'>+</div><div class='add'>+See http://processors.wiki.ti.com/index.php/TISCI for protocol definition.</div><div class='add'>+</div><div class='add'>+TI-SCI controller Device Node:</div><div class='add'>+=============================</div><div class='add'>+</div><div class='add'>+The TI-SCI node describes the Texas Instrument's System Controller entity node.</div><div class='add'>+This parent node may optionally have additional children nodes which describe</div><div class='add'>+specific functionality such as clocks, power domain, reset or additional</div><div class='add'>+functionality as may be required for the SoC. This hierarchy also describes the</div><div class='add'>+relationship between the TI-SCI parent node to the child node.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+-------------------</div><div class='add'>+- compatible: should be "ti,k2g-sci"</div><div class='add'>+- mbox-names:</div><div class='add'>+	"rx" - Mailbox corresponding to receive path</div><div class='add'>+	"tx" - Mailbox corresponding to transmit path</div><div class='add'>+</div><div class='add'>+- mboxes: Mailboxes corresponding to the mbox-names. Each value of the mboxes</div><div class='add'>+	  property should contain a phandle to the mailbox controller device</div><div class='add'>+	  node and an args specifier that will be the phandle to the intended</div><div class='add'>+	  sub-mailbox child node to be used for communication.</div><div class='add'>+</div><div class='add'>+See Documentation/devicetree/bindings/mailbox/mailbox.txt for more details</div><div class='add'>+about the generic mailbox controller and client driver bindings. Also see</div><div class='add'>+Documentation/devicetree/bindings/mailbox/ti,message-manager.txt for typical</div><div class='add'>+controller that is used to communicate with this System controllers.</div><div class='add'>+</div><div class='add'>+Optional Properties:</div><div class='add'>+-------------------</div><div class='add'>+- reg-names:</div><div class='add'>+	debug_messages - Map the Debug message region</div><div class='add'>+- reg:  register space corresponding to the debug_messages</div><div class='add'>+- ti,system-reboot-controller: If system reboot can be triggered by SoC reboot</div><div class='add'>+</div><div class='add'>+Example (K2G):</div><div class='add'>+-------------</div><div class='add'>+	pmmc: pmmc {</div><div class='add'>+		compatible = "ti,k2g-sci";</div><div class='add'>+		mbox-names = "rx", "tx";</div><div class='add'>+		mboxes= &lt;&amp;msgmgr &amp;msgmgr_proxy_pmmc_rx&gt;,</div><div class='add'>+			&lt;&amp;msgmgr &amp;msgmgr_proxy_pmmc_tx&gt;;</div><div class='add'>+		reg-names = "debug_messages";</div><div class='add'>+		reg = &lt;0x02921800 0x800&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+TI-SCI Client Device Node:</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+Client nodes are maintained as children of the relevant TI-SCI device node.</div><div class='add'>+</div><div class='add'>+Example (K2G):</div><div class='add'>+-------------</div><div class='add'>+	pmmc: pmmc {</div><div class='add'>+		compatible = "ti,k2g-sci";</div><div class='add'>+		...</div><div class='add'>+</div><div class='add'>+		my_clk_node: clk_node {</div><div class='add'>+			...</div><div class='add'>+			...</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		my_pd_node: pd_node {</div><div class='add'>+			...</div><div class='add'>+			...</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt b/Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt<br/>new file mode 100644<br/>index 000000000000..26eb9d3aa630<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+Resume Control</div><div class='add'>+--------------</div><div class='add'>+Available on Marvell SOCs: 98DX3336 and 98DX4251</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: must be "marvell,98dx3336-resume-ctrl"</div><div class='add'>+</div><div class='add'>+- reg: Should contain resume control registers location and length</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+resume@20980 {</div><div class='add'>+	compatible = "marvell,98dx3336-resume-ctrl";</div><div class='add'>+	reg = &lt;0x20980 0x10&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt b/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt<br/>new file mode 100644<br/>index 000000000000..64e8c73fc5ab<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/marvell/98dx3236.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/marvell/98dx3236.txt</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+Marvell 98DX3236, 98DX3336 and 98DX4251 Platforms Device Tree Bindings</div><div class='add'>+----------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Boards with a SoC of the Marvell 98DX3236, 98DX3336 and 98DX4251 families</div><div class='add'>+shall have the following property:</div><div class='add'>+</div><div class='add'>+Required root node property:</div><div class='add'>+</div><div class='add'>+compatible: must contain "marvell,armadaxp-98dx3236"</div><div class='add'>+</div><div class='add'>+In addition, boards using the Marvell 98DX3336 SoC shall have the</div><div class='add'>+following property:</div><div class='add'>+</div><div class='add'>+Required root node property:</div><div class='add'>+</div><div class='add'>+compatible: must contain "marvell,armadaxp-98dx3336"</div><div class='add'>+</div><div class='add'>+In addition, boards using the Marvell 98DX4251 SoC shall have the</div><div class='add'>+following property:</div><div class='add'>+</div><div class='add'>+Required root node property:</div><div class='add'>+</div><div class='add'>+compatible: must contain "marvell,armadaxp-98dx4251"</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt<br/>index f53e2ee65e35..8219b2c6bb29 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/omap/omap.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/omap/omap.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/omap/omap.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/omap/omap.txt</a></div><div class='hunk'>@@ -86,6 +86,9 @@ SoCs:</div><div class='ctx'> - DRA722</div><div class='ctx'>   compatible = "ti,dra722", "ti,dra72", "ti,dra7"</div><div class='ctx'> </div><div class='add'>+- DRA718</div><div class='add'>+  compatible = "ti,dra718", "ti,dra722", "ti,dra72", "ti,dra7"</div><div class='add'>+</div><div class='ctx'> - AM5728</div><div class='ctx'>   compatible = "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"</div><div class='ctx'> </div><div class='hunk'>@@ -148,6 +151,9 @@ Boards:</div><div class='ctx'> - AM335X SBC-T335 : single board computer, built around the Sitara AM3352/4</div><div class='ctx'>   compatible = "compulab,sbc-t335", "compulab,cm-t335", "ti,am33xx"</div><div class='ctx'> </div><div class='add'>+- AM335X phyCORE-AM335x: Development kit</div><div class='add'>+  compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx"</div><div class='add'>+</div><div class='ctx'> - OMAP5 EVM : Evaluation Module</div><div class='ctx'>   compatible = "ti,omap5-evm", "ti,omap5"</div><div class='ctx'> </div><div class='hunk'>@@ -175,12 +181,18 @@ Boards:</div><div class='ctx'> - AM5728 IDK</div><div class='ctx'>   compatible = "ti,am5728-idk", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"</div><div class='ctx'> </div><div class='add'>+- AM5718 IDK</div><div class='add'>+  compatible = "ti,am5718-idk", "ti,am5718", "ti,dra7"</div><div class='add'>+</div><div class='ctx'> - DRA742 EVM:  Software Development Board for DRA742</div><div class='ctx'>   compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7"</div><div class='ctx'> </div><div class='ctx'> - DRA722 EVM: Software Development Board for DRA722</div><div class='ctx'>   compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7"</div><div class='ctx'> </div><div class='add'>+- DRA718 EVM: Software Development Board for DRA718</div><div class='add'>+  compatible = "ti,dra718-evm", "ti,dra718", "ti,dra722", "ti,dra72", "ti,dra7"</div><div class='add'>+</div><div class='ctx'> - DM3730 Logic PD Torpedo + Wireless: Commercial System on Module with WiFi and Bluetooth</div><div class='ctx'>   compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3"</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/oxnas.txt b/Documentation/devicetree/bindings/arm/oxnas.txt<br/>index b9e49711ba05..ac64e60f99f1 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/oxnas.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/oxnas.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/oxnas.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/oxnas.txt</a></div><div class='hunk'>@@ -5,5 +5,10 @@ Boards with the OX810SE SoC shall have the following properties:</div><div class='ctx'>   Required root node property:</div><div class='ctx'>     compatible: "oxsemi,ox810se"</div><div class='ctx'> </div><div class='add'>+Boards with the OX820 SoC shall have the following properties:</div><div class='add'>+  Required root node property:</div><div class='add'>+    compatible: "oxsemi,ox820"</div><div class='add'>+</div><div class='ctx'> Board compatible values:</div><div class='ctx'>   - "wd,mbwe" (OX810SE)</div><div class='add'>+  - "cloudengines,pogoplugv3" (OX820)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/qcom.txt b/Documentation/devicetree/bindings/arm/qcom.txt<br/>index 3e24518c6678..028d16e72186 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/qcom.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/qcom.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/qcom.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/qcom.txt</a></div><div class='hunk'>@@ -21,7 +21,10 @@ The 'SoC' element must be one of the following strings:</div><div class='ctx'> 	apq8096</div><div class='ctx'> 	msm8916</div><div class='ctx'> 	msm8974</div><div class='add'>+	msm8992</div><div class='add'>+	msm8994</div><div class='ctx'> 	msm8996</div><div class='add'>+	mdm9615</div><div class='ctx'> </div><div class='ctx'> The 'board' element must be one of the following strings:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt<br/>index 55f388f954de..cc4ace6397ab 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/rockchip.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/rockchip.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/rockchip.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/rockchip.txt</a></div><div class='hunk'>@@ -25,6 +25,10 @@ Rockchip platforms device tree bindings</div><div class='ctx'>     Required root node properties:</div><div class='ctx'>       - compatible = "radxa,rock2-square", "rockchip,rk3288";</div><div class='ctx'> </div><div class='add'>+- Rikomagic MK808 v1 board:</div><div class='add'>+    Required root node properties:</div><div class='add'>+      - compatible = "rikomagic,mk808", "rockchip,rk3066a";</div><div class='add'>+</div><div class='ctx'> - Firefly Firefly-RK3288 board:</div><div class='ctx'>     Required root node properties:</div><div class='ctx'>       - compatible = "firefly,firefly-rk3288", "rockchip,rk3288";</div><div class='hunk'>@@ -99,6 +103,18 @@ Rockchip platforms device tree bindings</div><div class='ctx'>     Required root node properties:</div><div class='ctx'>       - compatible = "mqmaker,miqi", "rockchip,rk3288";</div><div class='ctx'> </div><div class='add'>+- Rockchip PX3 Evaluation board:</div><div class='add'>+    Required root node properties:</div><div class='add'>+      - compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188";</div><div class='add'>+</div><div class='add'>+- Rockchip PX5 Evaluation board:</div><div class='add'>+    Required root node properties:</div><div class='add'>+      - compatible = "rockchip,px5-evb", "rockchip,px5", "rockchip,rk3368";</div><div class='add'>+</div><div class='add'>+- Rockchip RK1108 Evaluation board</div><div class='add'>+    Required root node properties:</div><div class='add'>+      - compatible = "rockchip,rk1108-evb", "rockchip,rk1108";</div><div class='add'>+</div><div class='ctx'> - Rockchip RK3368 evb:</div><div class='ctx'>     Required root node properties:</div><div class='ctx'>       - compatible = "rockchip,rk3368-evb-act8846", "rockchip,rk3368";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt b/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt<br/>index 0ea7f14ef294..3c551894f621 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt</a></div><div class='hunk'>@@ -15,6 +15,8 @@ Required root node properties:</div><div class='ctx'> 	- "samsung,xyref5260"	- for Exynos5260-based Samsung board.</div><div class='ctx'> 	- "samsung,smdk5410"	- for Exynos5410-based Samsung SMDK5410 eval board.</div><div class='ctx'> 	- "samsung,smdk5420"	- for Exynos5420-based Samsung SMDK5420 eval board.</div><div class='add'>+	- "samsung,tm2"		- for Exynos5433-based Samsung TM2 board.</div><div class='add'>+	- "samsung,tm2e"	- for Exynos5433-based Samsung TM2E board.</div><div class='ctx'> 	- "samsung,sd5v1"	- for Exynos5440-based Samsung board.</div><div class='ctx'> 	- "samsung,ssdk5440"	- for Exynos5440-based Samsung board.</div><div class='ctx'> </div><div class='hunk'>@@ -22,6 +24,9 @@ Required root node properties:</div><div class='ctx'>   * FriendlyARM</div><div class='ctx'> 	- "friendlyarm,tiny4412"  - for Exynos4412-based FriendlyARM</div><div class='ctx'> 				    TINY4412 board.</div><div class='add'>+  * TOPEET</div><div class='add'>+	- "topeet,itop4412-elite" - for Exynos4412-based TOPEET</div><div class='add'>+                                    Elite base board.</div><div class='ctx'> </div><div class='ctx'>   * Google</div><div class='ctx'> 	- "google,pi"		- for Exynos5800-based Google Peach Pi</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt<br/>index 2f0b7169f132..c9502634316d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/shmobile.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/shmobile.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/shmobile.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/shmobile.txt</a></div><div class='hunk'>@@ -13,6 +13,10 @@ SoCs:</div><div class='ctx'>     compatible = "renesas,r8a73a4"</div><div class='ctx'>   - R-Mobile A1 (R8A77400)</div><div class='ctx'>     compatible = "renesas,r8a7740"</div><div class='add'>+  - RZ/G1M (R8A77430)</div><div class='add'>+    compatible = "renesas,r8a7743"</div><div class='add'>+  - RZ/G1E (R8A77450)</div><div class='add'>+    compatible = "renesas,r8a7745"</div><div class='ctx'>   - R-Car M1A (R8A77781)</div><div class='ctx'>     compatible = "renesas,r8a7778"</div><div class='ctx'>   - R-Car H1 (R8A77790)</div><div class='hunk'>@@ -35,7 +39,7 @@ SoCs:</div><div class='ctx'> </div><div class='ctx'> Boards:</div><div class='ctx'> </div><div class='del'>-  - Alt</div><div class='add'>+  - Alt (RTP0RC7794SEB00010S)</div><div class='ctx'>     compatible = "renesas,alt", "renesas,r8a7794"</div><div class='ctx'>   - APE6-EVM</div><div class='ctx'>     compatible = "renesas,ape6evm", "renesas,r8a73a4"</div><div class='hunk'>@@ -47,9 +51,9 @@ Boards:</div><div class='ctx'>     compatible = "renesas,bockw", "renesas,r8a7778"</div><div class='ctx'>   - Genmai (RTK772100BC00000BR)</div><div class='ctx'>     compatible = "renesas,genmai", "renesas,r7s72100"</div><div class='del'>-  - Gose</div><div class='add'>+  - Gose (RTP0RC7793SEB00010S)</div><div class='ctx'>     compatible = "renesas,gose", "renesas,r8a7793"</div><div class='del'>-  - H3ULCB (RTP0RC7795SKB00010S)</div><div class='add'>+  - H3ULCB (R-Car Starter Kit Premier, RTP0RC7795SKB00010S)</div><div class='ctx'>     compatible = "renesas,h3ulcb", "renesas,r8a7795";</div><div class='ctx'>   - Henninger</div><div class='ctx'>     compatible = "renesas,henninger", "renesas,r8a7791"</div><div class='hunk'>@@ -61,7 +65,9 @@ Boards:</div><div class='ctx'>     compatible = "renesas,kzm9g", "renesas,sh73a0"</div><div class='ctx'>   - Lager (RTP0RC7790SEB00010S)</div><div class='ctx'>     compatible = "renesas,lager", "renesas,r8a7790"</div><div class='del'>-  - Marzen</div><div class='add'>+  - M3ULCB (R-Car Starter Kit Pro, RTP0RC7796SKB00010S)</div><div class='add'>+    compatible = "renesas,m3ulcb", "renesas,r8a7796";</div><div class='add'>+  - Marzen (R0P7779A00010S)</div><div class='ctx'>     compatible = "renesas,marzen", "renesas,r8a7779"</div><div class='ctx'>   - Porter (M2-LCDP)</div><div class='ctx'>     compatible = "renesas,porter", "renesas,r8a7791"</div><div class='hunk'>@@ -69,9 +75,31 @@ Boards:</div><div class='ctx'>     compatible = "renesas,rskrza1", "renesas,r7s72100"</div><div class='ctx'>   - Salvator-X (RTP0RC7795SIPB0010S)</div><div class='ctx'>     compatible = "renesas,salvator-x", "renesas,r8a7795";</div><div class='del'>-  - Salvator-X</div><div class='add'>+  - Salvator-X (RTP0RC7796SIPB0011S)</div><div class='ctx'>     compatible = "renesas,salvator-x", "renesas,r8a7796";</div><div class='ctx'>   - SILK (RTP0RC7794LCB00011S)</div><div class='ctx'>     compatible = "renesas,silk", "renesas,r8a7794"</div><div class='add'>+  - SK-RZG1E (YR8A77450S000BE)</div><div class='add'>+    compatible = "renesas,sk-rzg1e", "renesas,r8a7745"</div><div class='add'>+  - SK-RZG1M (YR8A77430S000BE)</div><div class='add'>+    compatible = "renesas,sk-rzg1m", "renesas,r8a7743"</div><div class='ctx'>   - Wheat</div><div class='ctx'>     compatible = "renesas,wheat", "renesas,r8a7792"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Most Renesas ARM SoCs have a Product Register that allows to retrieve SoC</div><div class='add'>+product and revision information.  If present, a device node for this register</div><div class='add'>+should be added.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible: Must be "renesas,prr".</div><div class='add'>+  - reg: Base address and length of the register block.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Examples</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+	prr: chipid@ff000044 {</div><div class='add'>+		compatible = "renesas,prr";</div><div class='add'>+		reg = &lt;0 0xff000044 0 4&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt<br/>index 3975d0a0e4c2..d2c46449b4eb 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/sunxi.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/arm/sunxi.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/sunxi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/sunxi.txt</a></div><div class='hunk'>@@ -12,6 +12,8 @@ using one of the following compatible strings:</div><div class='ctx'>   allwinner,sun8i-a23</div><div class='ctx'>   allwinner,sun8i-a33</div><div class='ctx'>   allwinner,sun8i-a83t</div><div class='add'>+  allwinner,sun8i-h2-plus</div><div class='ctx'>   allwinner,sun8i-h3</div><div class='ctx'>   allwinner,sun9i-a80</div><div class='add'>+  allwinner,sun50i-a64</div><div class='ctx'>   nextthing,gr8</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/swir.txt b/Documentation/devicetree/bindings/arm/swir.txt<br/>new file mode 100644<br/>index 000000000000..042be73a95d3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/arm/swir.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/arm/swir.txt</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+Sierra Wireless Modules device tree bindings</div><div class='add'>+--------------------------------------------</div><div class='add'>+</div><div class='add'>+Supported Modules :</div><div class='add'>+ - WP8548 : Includes MDM9615 and PM8018 in a module</div><div class='add'>+</div><div class='add'>+Sierra Wireless modules shall have the following properties :</div><div class='add'>+  Required root node property</div><div class='add'>+   - compatible: "swir,wp8548" for the WP8548 CF3 Module</div><div class='add'>+</div><div class='add'>+Board compatible values:</div><div class='add'>+  - "swir,mangoh-green-wp8548" for the mangOH green board with the WP8548 module</div><div class='head'>diff --git a/Documentation/devicetree/bindings/ata/ahci-da850.txt b/Documentation/devicetree/bindings/ata/ahci-da850.txt<br/>new file mode 100644<br/>index 000000000000..5f8193417725<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/ata/ahci-da850.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/ata/ahci-da850.txt</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+Device tree binding for the TI DA850 AHCI SATA Controller</div><div class='add'>+---------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible: must be "ti,da850-ahci"</div><div class='add'>+  - reg: physical base addresses and sizes of the two register regions</div><div class='add'>+         used by the controller: the register map as defined by the</div><div class='add'>+         AHCI 1.1 standard and the Power Down Control Register (PWRDN)</div><div class='add'>+         for enabling/disabling the SATA clock receiver</div><div class='add'>+  - interrupts: interrupt specifier (refer to the interrupt binding)</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	sata: sata@218000 {</div><div class='add'>+		compatible = "ti,da850-ahci";</div><div class='add'>+		reg = &lt;0x218000 0x2000&gt;, &lt;0x22c018 0x4&gt;;</div><div class='add'>+		interrupts = &lt;67&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt b/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt<br/>index 032a7606b862..fc33ca01e9ba 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt</a></div><div class='hunk'>@@ -3,7 +3,7 @@ Binding for Freescale QorIQ AHCI SATA Controller</div><div class='ctx'> Required properties:</div><div class='ctx'>   - reg: Physical base address and size of the controller's register area.</div><div class='ctx'>   - compatible: Compatibility string. Must be 'fsl,&lt;chip&gt;-ahci', where</div><div class='del'>-    chip could be ls1021a, ls2080a, ls1043a etc.</div><div class='add'>+    chip could be ls1021a, ls1043a, ls1046a, ls2080a etc.</div><div class='ctx'>   - clocks: Input clock specifier. Refer to common clock bindings.</div><div class='ctx'>   - interrupts: Interrupt specifier. Refer to interrupt binding.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/ata/ahci-st.txt b/Documentation/devicetree/bindings/ata/ahci-st.txt<br/>index e1d01df8e3c1..909c9935360d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/ata/ahci-st.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/ata/ahci-st.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/ata/ahci-st.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/ata/ahci-st.txt</a></div><div class='hunk'>@@ -18,21 +18,6 @@ Optional properties:</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='del'>-	/* Example for stih416 */</div><div class='del'>-	sata0: sata@fe380000 {</div><div class='del'>-		compatible	= "st,ahci";</div><div class='del'>-		reg		= &lt;0xfe380000 0x1000&gt;;</div><div class='del'>-		interrupts	= &lt;GIC_SPI 157 IRQ_TYPE_NONE&gt;;</div><div class='del'>-		interrupt-names	= "hostc";</div><div class='del'>-		phys		= &lt;&amp;phy_port0 PHY_TYPE_SATA&gt;;</div><div class='del'>-		phy-names	= "ahci_phy";</div><div class='del'>-		resets		= &lt;&amp;powerdown STIH416_SATA0_POWERDOWN&gt;,</div><div class='del'>-				  &lt;&amp;softreset STIH416_SATA0_SOFTRESET&gt;;</div><div class='del'>-		reset-names	= "pwr-dwn", "sw-rst";</div><div class='del'>-		clocks		= &lt;&amp;clk_s_a0_ls CLK_ICN_REG&gt;;</div><div class='del'>-		clock-names	= "ahci_clk";</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	/* Example for stih407 family silicon */</div><div class='ctx'> 	sata0: sata@9b20000 {</div><div class='ctx'> 		compatible	= "st,ahci";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt b/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt<br/>new file mode 100644<br/>index 000000000000..83b0e54f727c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt</a></div><div class='hunk'>@@ -0,0 +1,132 @@</div><div class='add'>+Device tree bindings for NVIDIA Tegra Generic Memory Interface bus</div><div class='add'>+</div><div class='add'>+The Generic Memory Interface bus enables memory transfers between internal and</div><div class='add'>+external memory. Can be used to attach various high speed devices such as</div><div class='add'>+synchronous/asynchronous NOR, FPGA, UARTS and more.</div><div class='add'>+</div><div class='add'>+The actual devices are instantiated from the child nodes of a GMI node.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible : Should contain one of the following:</div><div class='add'>+        For Tegra20 must contain "nvidia,tegra20-gmi".</div><div class='add'>+        For Tegra30 must contain "nvidia,tegra30-gmi".</div><div class='add'>+ - reg: Should contain GMI controller registers location and length.</div><div class='add'>+ - clocks: Must contain an entry for each entry in clock-names.</div><div class='add'>+ - clock-names: Must include the following entries: "gmi"</div><div class='add'>+ - resets : Must contain an entry for each entry in reset-names.</div><div class='add'>+ - reset-names : Must include the following entries: "gmi"</div><div class='add'>+ - #address-cells: The number of cells used to represent physical base</div><div class='add'>+   addresses in the GMI address space. Should be 2.</div><div class='add'>+ - #size-cells: The number of cells used to represent the size of an address</div><div class='add'>+   range in the GMI address space. Should be 1.</div><div class='add'>+ - ranges: Must be set up to reflect the memory layout with three integer values</div><div class='add'>+   for each chip-select line in use (only one entry is supported, see below</div><div class='add'>+   comments):</div><div class='add'>+   &lt;cs-number&gt; &lt;offset&gt; &lt;physical address of mapping&gt; &lt;size&gt;</div><div class='add'>+</div><div class='add'>+Note that the GMI controller does not have any internal chip-select address</div><div class='add'>+decoding, because of that chip-selects either need to be managed via software</div><div class='add'>+or by employing external chip-select decoding logic.</div><div class='add'>+</div><div class='add'>+If external chip-select logic is used to support multiple devices it is assumed</div><div class='add'>+that the devices use the same timing and so are probably the same type. It also</div><div class='add'>+assumes that they can fit in the 256MB address range. In this case only one</div><div class='add'>+child device is supported which represents the active chip-select line, see</div><div class='add'>+examples for more insight.</div><div class='add'>+</div><div class='add'>+The chip-select number is decoded from the child nodes second address cell of</div><div class='add'>+'ranges' property, if 'ranges' property is not present or empty chip-select will</div><div class='add'>+then be decoded from the first cell of the 'reg' property.</div><div class='add'>+</div><div class='add'>+Optional child cs node properties:</div><div class='add'>+</div><div class='add'>+ - nvidia,snor-data-width-32bit: Use 32bit data-bus, default is 16bit.</div><div class='add'>+ - nvidia,snor-mux-mode: Enable address/data MUX mode.</div><div class='add'>+ - nvidia,snor-rdy-active-before-data: Assert RDY signal one cycle before data.</div><div class='add'>+   If omitted it will be asserted with data.</div><div class='add'>+ - nvidia,snor-rdy-active-high: RDY signal is active high</div><div class='add'>+ - nvidia,snor-adv-active-high: ADV signal is active high</div><div class='add'>+ - nvidia,snor-oe-active-high: WE/OE signal is active high</div><div class='add'>+ - nvidia,snor-cs-active-high: CS signal is active high</div><div class='add'>+</div><div class='add'>+  Note that there is some special handling for the timing values.</div><div class='add'>+  From Tegra TRM:</div><div class='add'>+  Programming 0 means 1 clock cycle: actual cycle = programmed cycle + 1</div><div class='add'>+</div><div class='add'>+ - nvidia,snor-muxed-width: Number of cycles MUX address/data asserted on the</div><div class='add'>+   bus. Valid values are 0-15, default is 1</div><div class='add'>+ - nvidia,snor-hold-width: Number of cycles CE stays asserted after the</div><div class='add'>+   de-assertion of WR_N (in case of SLAVE/MASTER Request) or OE_N</div><div class='add'>+   (in case of MASTER Request). Valid values are 0-15, default is 1</div><div class='add'>+ - nvidia,snor-adv-width: Number of cycles during which ADV stays asserted.</div><div class='add'>+   Valid values are 0-15, default is 1.</div><div class='add'>+ - nvidia,snor-ce-width: Number of cycles before CE is asserted.</div><div class='add'>+   Valid values are 0-15, default is 4</div><div class='add'>+ - nvidia,snor-we-width: Number of cycles during which WE stays asserted.</div><div class='add'>+   Valid values are 0-15, default is 1</div><div class='add'>+ - nvidia,snor-oe-width: Number of cycles during which OE stays asserted.</div><div class='add'>+   Valid values are 0-255, default is 1</div><div class='add'>+ - nvidia,snor-wait-width: Number of cycles before READY is asserted.</div><div class='add'>+   Valid values are 0-255, default is 3</div><div class='add'>+</div><div class='add'>+Example with two SJA1000 CAN controllers connected to the GMI bus. We wrap the</div><div class='add'>+controllers with a simple-bus node since they are all connected to the same</div><div class='add'>+chip-select (CS4), in this example external address decoding is provided:</div><div class='add'>+</div><div class='add'>+gmi@70090000 {</div><div class='add'>+	compatible = "nvidia,tegra20-gmi";</div><div class='add'>+	reg = &lt;0x70009000 0x1000&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	clocks = &lt;&amp;tegra_car TEGRA20_CLK_NOR&gt;;</div><div class='add'>+	clock-names = "gmi";</div><div class='add'>+	resets = &lt;&amp;tegra_car 42&gt;;</div><div class='add'>+	reset-names = "gmi";</div><div class='add'>+	ranges = &lt;4 0 0xd0000000 0xfffffff&gt;;</div><div class='add'>+</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	bus@4,0 {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges = &lt;0 4 0 0x40100&gt;;</div><div class='add'>+</div><div class='add'>+		nvidia,snor-mux-mode;</div><div class='add'>+		nvidia,snor-adv-active-high;</div><div class='add'>+</div><div class='add'>+		can@0 {</div><div class='add'>+			reg = &lt;0 0x100&gt;;</div><div class='add'>+			...</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		can@40000 {</div><div class='add'>+			reg = &lt;0x40000 0x100&gt;;</div><div class='add'>+			...</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Example with one SJA1000 CAN controller connected to the GMI bus</div><div class='add'>+on CS4:</div><div class='add'>+</div><div class='add'>+gmi@70090000 {</div><div class='add'>+	compatible = "nvidia,tegra20-gmi";</div><div class='add'>+	reg = &lt;0x70009000 0x1000&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	clocks = &lt;&amp;tegra_car TEGRA20_CLK_NOR&gt;;</div><div class='add'>+	clock-names = "gmi";</div><div class='add'>+	resets = &lt;&amp;tegra_car 42&gt;;</div><div class='add'>+	reset-names = "gmi";</div><div class='add'>+	ranges = &lt;4 0 0xd0000000 0xfffffff&gt;;</div><div class='add'>+</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	can@4,0 {</div><div class='add'>+		reg = &lt;4 0 0x100&gt;;</div><div class='add'>+		nvidia,snor-mux-mode;</div><div class='add'>+		nvidia,snor-adv-active-high;</div><div class='add'>+		...</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/bus/qcom,ebi2.txt b/Documentation/devicetree/bindings/bus/qcom,ebi2.txt<br/>index 920681f552db..5a7d567f6833 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/bus/qcom,ebi2.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/bus/qcom,ebi2.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/bus/qcom,ebi2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/bus/qcom,ebi2.txt</a></div><div class='hunk'>@@ -51,7 +51,7 @@ Required properties:</div><div class='ctx'> - compatible: should be one of:</div><div class='ctx'>   "qcom,msm8660-ebi2"</div><div class='ctx'>   "qcom,apq8060-ebi2"</div><div class='del'>-- #address-cells: shoule be &lt;2&gt;: the first cell is the chipselect,</div><div class='add'>+- #address-cells: should be &lt;2&gt;: the first cell is the chipselect,</div><div class='ctx'>   the second cell is the offset inside the memory range</div><div class='ctx'> - #size-cells: should be &lt;1&gt;</div><div class='ctx'> - ranges: should be set to:</div><div class='hunk'>@@ -64,7 +64,7 @@ Required properties:</div><div class='ctx'> - reg: two ranges of registers: EBI2 config and XMEM config areas</div><div class='ctx'> - reg-names: should be "ebi2", "xmem"</div><div class='ctx'> - clocks: two clocks, EBI_2X and EBI</div><div class='del'>-- clock-names: shoule be "ebi2x", "ebi2"</div><div class='add'>+- clock-names: should be "ebi2x", "ebi2"</div><div class='ctx'> </div><div class='ctx'> Optional subnodes:</div><div class='ctx'> - Nodes inside the EBI2 will be considered device nodes.</div><div class='hunk'>@@ -100,7 +100,7 @@ Optional properties arrays for FAST chip selects:</div><div class='ctx'>   assertion, with respect to the cycle where ADV (address valid) is asserted.</div><div class='ctx'>   2 means 2 cycles between ADV and OE. Valid values 0, 1, 2 or 3.</div><div class='ctx'> - qcom,xmem-read-hold-cycles: the length in cycles of the first segment of a</div><div class='del'>-  read transfer. For a single read trandfer this will be the time from CS</div><div class='add'>+  read transfer. For a single read transfer this will be the time from CS</div><div class='ctx'>   assertion to OE assertion. Valid values 0 thru 15.</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/bus/ti,da850-mstpri.txt b/Documentation/devicetree/bindings/bus/ti,da850-mstpri.txt<br/>new file mode 100644<br/>index 000000000000..72daefc6b4a1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/bus/ti,da850-mstpri.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/bus/ti,da850-mstpri.txt</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+* Device tree bindings for Texas Instruments da8xx master peripheral</div><div class='add'>+  priority driver</div><div class='add'>+</div><div class='add'>+DA8XX SoCs feature a set of registers allowing to change the priority of all</div><div class='add'>+peripherals classified as masters.</div><div class='add'>+</div><div class='add'>+Documentation:</div><div class='add'>+OMAP-L138 (DA850) - http://www.ti.com/lit/ug/spruh82c/spruh82c.pdf</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible:		"ti,da850-mstpri" - for da850 based boards</div><div class='add'>+- reg:			offset and length of the mstpri registers</div><div class='add'>+</div><div class='add'>+Example for da850-lcdk is shown below.</div><div class='add'>+</div><div class='add'>+mstpri {</div><div class='add'>+	compatible = "ti,da850-mstpri";</div><div class='add'>+	reg = &lt;0x14110 0x0c&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt b/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt<br/>index e56a1df3a9d3..dd906db34b32 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt</a></div><div class='hunk'>@@ -16,7 +16,20 @@ Required properties:</div><div class='ctx'> - #clock-cells:	Should be &lt;1&gt;. The permitted clock-specifier values can be</div><div class='ctx'> 		  found in include/dt-bindings/clock/bcm2835.h</div><div class='ctx'> - reg:		Specifies base physical address and size of the registers</div><div class='del'>-- clocks:	The external oscillator clock phandle</div><div class='add'>+- clocks:	phandles to the parent clocks used as input to the module, in</div><div class='add'>+		  the following order:</div><div class='add'>+</div><div class='add'>+		  - External oscillator</div><div class='add'>+		  - DSI0 byte clock</div><div class='add'>+		  - DSI0 DDR2 clock</div><div class='add'>+		  - DSI0 DDR clock</div><div class='add'>+		  - DSI1 byte clock</div><div class='add'>+		  - DSI1 DDR2 clock</div><div class='add'>+		  - DSI1 DDR clock</div><div class='add'>+</div><div class='add'>+		  Only external oscillator is required.  The DSI clocks may</div><div class='add'>+		  not be present, in which case their children will be</div><div class='add'>+		  unusable.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/exynos4415-clock.txt b/Documentation/devicetree/bindings/clock/exynos4415-clock.txt<br/>deleted file mode 100644<br/>index 847d98bae8cf..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/exynos4415-clock.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/exynos4415-clock.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,38 +0,0 @@</div><div class='del'>-* Samsung Exynos4415 Clock Controller</div><div class='del'>-</div><div class='del'>-The Exynos4415 clock controller generates and supplies clock to various</div><div class='del'>-consumer devices within the Exynos4415 SoC.</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-</div><div class='del'>-- compatible: should be one of the following:</div><div class='del'>-  - "samsung,exynos4415-cmu" - for the main system clocks controller</div><div class='del'>-    (CMU_LEFTBUS, CMU_RIGHTBUS, CMU_TOP, CMU_CPU clock domains).</div><div class='del'>-  - "samsung,exynos4415-cmu-dmc" - for the Exynos4415 SoC DRAM Memory</div><div class='del'>-    Controller (DMC) domain clock controller.</div><div class='del'>-</div><div class='del'>-- reg: physical base address of the controller and length of memory mapped</div><div class='del'>-  region.</div><div class='del'>-</div><div class='del'>-- #clock-cells: should be 1.</div><div class='del'>-</div><div class='del'>-Each clock is assigned an identifier and client nodes can use this identifier</div><div class='del'>-to specify the clock which they consume.</div><div class='del'>-</div><div class='del'>-All available clocks are defined as preprocessor macros in</div><div class='del'>-dt-bindings/clock/exynos4415.h header and can be used in device</div><div class='del'>-tree sources.</div><div class='del'>-</div><div class='del'>-Example 1: An example of a clock controller node is listed below.</div><div class='del'>-</div><div class='del'>-	cmu: clock-controller@10030000 {</div><div class='del'>-		compatible = "samsung,exynos4415-cmu";</div><div class='del'>-		reg = &lt;0x10030000 0x18000&gt;;</div><div class='del'>-		#clock-cells = &lt;1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cmu-dmc: clock-controller@105C0000 {</div><div class='del'>-		compatible = "samsung,exynos4415-cmu-dmc";</div><div class='del'>-		reg = &lt;0x105C0000 0x3000&gt;;</div><div class='del'>-		#clock-cells = &lt;1&gt;;</div><div class='del'>-	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/exynos5433-clock.txt b/Documentation/devicetree/bindings/clock/exynos5433-clock.txt<br/>index 63379b04e052..1dc80f8811fe 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/exynos5433-clock.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/exynos5433-clock.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/exynos5433-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/exynos5433-clock.txt</a></div><div class='hunk'>@@ -79,7 +79,7 @@ Required Properties:</div><div class='ctx'> 	Input clocks for fsys clock controller:</div><div class='ctx'> 		- oscclk</div><div class='ctx'> 		- sclk_ufs_mphy</div><div class='del'>-		- div_aclk_fsys_200</div><div class='add'>+		- aclk_fsys_200</div><div class='ctx'> 		- sclk_pcie_100_fsys</div><div class='ctx'> 		- sclk_ufsunipro_fsys</div><div class='ctx'> 		- sclk_mmc2_fsys</div><div class='hunk'>@@ -104,6 +104,10 @@ Required Properties:</div><div class='ctx'> 		- sclk_decon_tv_vclk_disp</div><div class='ctx'> 		- aclk_disp_333</div><div class='ctx'> </div><div class='add'>+	Input clocks for audio clock controller:</div><div class='add'>+		- oscclk</div><div class='add'>+		- fout_aud_pll</div><div class='add'>+</div><div class='ctx'> 	Input clocks for bus0 clock controller:</div><div class='ctx'> 		- aclk_bus0_400</div><div class='ctx'> </div><div class='hunk'>@@ -235,7 +239,7 @@ Example 2: Examples of clock controller nodes are listed below.</div><div class='ctx'> </div><div class='ctx'> 		clock-names = "oscclk",</div><div class='ctx'> 			"sclk_ufs_mphy",</div><div class='del'>-			"div_aclk_fsys_200",</div><div class='add'>+			"aclk_fsys_200",</div><div class='ctx'> 			"sclk_pcie_100_fsys",</div><div class='ctx'> 			"sclk_ufsunipro_fsys",</div><div class='ctx'> 			"sclk_mmc2_fsys",</div><div class='hunk'>@@ -245,7 +249,7 @@ Example 2: Examples of clock controller nodes are listed below.</div><div class='ctx'> 			"sclk_usbdrd30_fsys";</div><div class='ctx'> 		clocks = &lt;&amp;xxti&gt;,</div><div class='ctx'> 		       &lt;&amp;cmu_cpif CLK_SCLK_UFS_MPHY&gt;,</div><div class='del'>-		       &lt;&amp;cmu_top CLK_DIV_ACLK_FSYS_200&gt;,</div><div class='add'>+		       &lt;&amp;cmu_top CLK_ACLK_FSYS_200&gt;,</div><div class='ctx'> 		       &lt;&amp;cmu_top CLK_SCLK_PCIE_100_FSYS&gt;,</div><div class='ctx'> 		       &lt;&amp;cmu_top CLK_SCLK_UFSUNIPRO_FSYS&gt;,</div><div class='ctx'> 		       &lt;&amp;cmu_top CLK_SCLK_MMC2_FSYS&gt;,</div><div class='hunk'>@@ -297,6 +301,9 @@ Example 2: Examples of clock controller nodes are listed below.</div><div class='ctx'> 		compatible = "samsung,exynos5433-cmu-aud";</div><div class='ctx'> 		reg = &lt;0x114c0000 0x0b04&gt;;</div><div class='ctx'> 		#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		clock-names = "oscclk", "fout_aud_pll";</div><div class='add'>+		clocks = &lt;&amp;xxti&gt;, &lt;&amp;cmu_top CLK_FOUT_AUD_PLL&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cmu_bus0: clock-controller@13600000 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/hi3519-crg.txt b/Documentation/devicetree/bindings/clock/hi3519-crg.txt<br/>deleted file mode 100644<br/>index acd1f235d548..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/hi3519-crg.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/hi3519-crg.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-* Hisilicon Hi3519 Clock and Reset Generator(CRG)</div><div class='del'>-</div><div class='del'>-The Hi3519 CRG module provides clock and reset signals to various</div><div class='del'>-controllers within the SoC.</div><div class='del'>-</div><div class='del'>-This binding uses the following bindings:</div><div class='del'>-    Documentation/devicetree/bindings/clock/clock-bindings.txt</div><div class='del'>-    Documentation/devicetree/bindings/reset/reset.txt</div><div class='del'>-</div><div class='del'>-Required Properties:</div><div class='del'>-</div><div class='del'>-- compatible: should be one of the following.</div><div class='del'>-  - "hisilicon,hi3519-crg" - controller compatible with Hi3519 SoC.</div><div class='del'>-</div><div class='del'>-- reg: physical base address of the controller and length of memory mapped</div><div class='del'>-  region.</div><div class='del'>-</div><div class='del'>-- #clock-cells: should be 1.</div><div class='del'>-</div><div class='del'>-Each clock is assigned an identifier and client nodes use this identifier</div><div class='del'>-to specify the clock which they consume.</div><div class='del'>-</div><div class='del'>-All these identifier could be found in &lt;dt-bindings/clock/hi3519-clock.h&gt;.</div><div class='del'>-</div><div class='del'>-- #reset-cells: should be 2.</div><div class='del'>-</div><div class='del'>-A reset signal can be controlled by writing a bit register in the CRG module.</div><div class='del'>-The reset specifier consists of two cells. The first cell represents the</div><div class='del'>-register offset relative to the base address. The second cell represents the</div><div class='del'>-bit index in the register.</div><div class='del'>-</div><div class='del'>-Example: CRG nodes</div><div class='del'>-CRG: clock-reset-controller@12010000 {</div><div class='del'>-	compatible = "hisilicon,hi3519-crg";</div><div class='del'>-	reg = &lt;0x12010000 0x10000&gt;;</div><div class='del'>-	#clock-cells = &lt;1&gt;;</div><div class='del'>-	#reset-cells = &lt;2&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-Example: consumer nodes</div><div class='del'>-i2c0: i2c@12110000 {</div><div class='del'>-	compatible = "hisilicon,hi3519-i2c";</div><div class='del'>-	reg = &lt;0x12110000 0x1000&gt;;</div><div class='del'>-	clocks = &lt;&amp;CRG HI3519_I2C0_RST&gt;;</div><div class='del'>-	resets = &lt;&amp;CRG 0xe4 0&gt;;</div><div class='del'>-};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/hi3660-clock.txt b/Documentation/devicetree/bindings/clock/hi3660-clock.txt<br/>new file mode 100644<br/>index 000000000000..cc9b86c35758<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/hi3660-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/hi3660-clock.txt</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+* Hisilicon Hi3660 Clock Controller</div><div class='add'>+</div><div class='add'>+The Hi3660 clock controller generates and supplies clock to various</div><div class='add'>+controllers within the Hi3660 SoC.</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+- compatible: the compatible should be one of the following strings to</div><div class='add'>+	indicate the clock controller functionality.</div><div class='add'>+</div><div class='add'>+	- "hisilicon,hi3660-crgctrl"</div><div class='add'>+	- "hisilicon,hi3660-pctrl"</div><div class='add'>+	- "hisilicon,hi3660-pmuctrl"</div><div class='add'>+	- "hisilicon,hi3660-sctrl"</div><div class='add'>+	- "hisilicon,hi3660-iomcu"</div><div class='add'>+</div><div class='add'>+- reg: physical base address of the controller and length of memory mapped</div><div class='add'>+  region.</div><div class='add'>+</div><div class='add'>+- #clock-cells: should be 1.</div><div class='add'>+</div><div class='add'>+Each clock is assigned an identifier and client nodes use this identifier</div><div class='add'>+to specify the clock which they consume.</div><div class='add'>+</div><div class='add'>+All these identifier could be found in &lt;dt-bindings/clock/hi3660-clock.h&gt;.</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+	crg_ctrl: clock-controller@fff35000 {</div><div class='add'>+		compatible = "hisilicon,hi3660-crgctrl", "syscon";</div><div class='add'>+		reg = &lt;0x0 0xfff35000 0x0 0x1000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart0: serial@fdf02000 {</div><div class='add'>+		compatible = "arm,pl011", "arm,primecell";</div><div class='add'>+		reg = &lt;0x0 0xfdf02000 0x0 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;crg_ctrl HI3660_CLK_MUX_UART0&gt;,</div><div class='add'>+			 &lt;&amp;crg_ctrl HI3660_PCLK&gt;;</div><div class='add'>+		clock-names = "uartclk", "apb_pclk";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/hisi-crg.txt b/Documentation/devicetree/bindings/clock/hisi-crg.txt<br/>new file mode 100644<br/>index 000000000000..cc60b3d423f3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/hisi-crg.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/hisi-crg.txt</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+* HiSilicon Clock and Reset Generator(CRG)</div><div class='add'>+</div><div class='add'>+The CRG module provides clock and reset signals to various</div><div class='add'>+modules within the SoC.</div><div class='add'>+</div><div class='add'>+This binding uses the following bindings:</div><div class='add'>+    Documentation/devicetree/bindings/clock/clock-bindings.txt</div><div class='add'>+    Documentation/devicetree/bindings/reset/reset.txt</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+- compatible: should be one of the following.</div><div class='add'>+  - "hisilicon,hi3516cv300-crg"</div><div class='add'>+  - "hisilicon,hi3516cv300-sysctrl"</div><div class='add'>+  - "hisilicon,hi3519-crg"</div><div class='add'>+  - "hisilicon,hi3798cv200-crg"</div><div class='add'>+  - "hisilicon,hi3798cv200-sysctrl"</div><div class='add'>+</div><div class='add'>+- reg: physical base address of the controller and length of memory mapped</div><div class='add'>+  region.</div><div class='add'>+</div><div class='add'>+- #clock-cells: should be 1.</div><div class='add'>+</div><div class='add'>+Each clock is assigned an identifier and client nodes use this identifier</div><div class='add'>+to specify the clock which they consume.</div><div class='add'>+</div><div class='add'>+All these identifier could be found in &lt;dt-bindings/clock/hi3519-clock.h&gt;.</div><div class='add'>+</div><div class='add'>+- #reset-cells: should be 2.</div><div class='add'>+</div><div class='add'>+A reset signal can be controlled by writing a bit register in the CRG module.</div><div class='add'>+The reset specifier consists of two cells. The first cell represents the</div><div class='add'>+register offset relative to the base address. The second cell represents the</div><div class='add'>+bit index in the register.</div><div class='add'>+</div><div class='add'>+Example: CRG nodes</div><div class='add'>+CRG: clock-reset-controller@12010000 {</div><div class='add'>+	compatible = "hisilicon,hi3519-crg";</div><div class='add'>+	reg = &lt;0x12010000 0x10000&gt;;</div><div class='add'>+	#clock-cells = &lt;1&gt;;</div><div class='add'>+	#reset-cells = &lt;2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Example: consumer nodes</div><div class='add'>+i2c0: i2c@12110000 {</div><div class='add'>+	compatible = "hisilicon,hi3519-i2c";</div><div class='add'>+	reg = &lt;0x12110000 0x1000&gt;;</div><div class='add'>+	clocks = &lt;&amp;CRG HI3519_I2C0_RST&gt;;</div><div class='add'>+	resets = &lt;&amp;CRG 0xe4 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/idt,versaclock5.txt b/Documentation/devicetree/bindings/clock/idt,versaclock5.txt<br/>new file mode 100644<br/>index 000000000000..87e9c47a89a3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/idt,versaclock5.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/idt,versaclock5.txt</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+Binding for IDT VersaClock5 programmable i2c clock generator.</div><div class='add'>+</div><div class='add'>+The IDT VersaClock5 are programmable i2c clock generators providing</div><div class='add'>+from 3 to 12 output clocks.</div><div class='add'>+</div><div class='add'>+==I2C device node==</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:	shall be one of "idt,5p49v5923" , "idt,5p49v5933".</div><div class='add'>+- reg:		i2c device address, shall be 0x68 or 0x6a.</div><div class='add'>+- #clock-cells:	from common clock binding; shall be set to 1.</div><div class='add'>+- clocks:	from common clock binding; list of parent clock handles,</div><div class='add'>+		- 5p49v5923: (required) either or both of XTAL or CLKIN</div><div class='add'>+					reference clock.</div><div class='add'>+		- 5p49v5933: (optional) property not present (internal</div><div class='add'>+					Xtal used) or CLKIN reference</div><div class='add'>+					clock.</div><div class='add'>+- clock-names:	from common clock binding; clock input names, can be</div><div class='add'>+		- 5p49v5923: (required) either or both of "xin", "clkin".</div><div class='add'>+		- 5p49v5933: (optional) property not present or "clkin".</div><div class='add'>+</div><div class='add'>+==Mapping between clock specifier and physical pins==</div><div class='add'>+</div><div class='add'>+When referencing the provided clock in the DT using phandle and</div><div class='add'>+clock specifier, the following mapping applies:</div><div class='add'>+</div><div class='add'>+5P49V5923:</div><div class='add'>+	0 -- OUT0_SEL_I2CB</div><div class='add'>+	1 -- OUT1</div><div class='add'>+	2 -- OUT2</div><div class='add'>+</div><div class='add'>+5P49V5933:</div><div class='add'>+	0 -- OUT0_SEL_I2CB</div><div class='add'>+	1 -- OUT1</div><div class='add'>+	2 -- OUT4</div><div class='add'>+</div><div class='add'>+==Example==</div><div class='add'>+</div><div class='add'>+/* 25MHz reference crystal */</div><div class='add'>+ref25: ref25m {</div><div class='add'>+	compatible = "fixed-clock";</div><div class='add'>+	#clock-cells = &lt;0&gt;;</div><div class='add'>+	clock-frequency = &lt;25000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+i2c-master-node {</div><div class='add'>+</div><div class='add'>+	/* IDT 5P49V5923 i2c clock generator */</div><div class='add'>+	vc5: clock-generator@6a {</div><div class='add'>+		compatible = "idt,5p49v5923";</div><div class='add'>+		reg = &lt;0x6a&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		/* Connect XIN input to 25MHz reference */</div><div class='add'>+		clocks = &lt;&amp;ref25m&gt;;</div><div class='add'>+		clock-names = "xin";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Consumer referencing the 5P49V5923 pin OUT1 */</div><div class='add'>+consumer {</div><div class='add'>+	...</div><div class='add'>+	clocks = &lt;&amp;vc5 1&gt;;</div><div class='add'>+	...</div><div class='add'>+}</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/imx31-clock.txt b/Documentation/devicetree/bindings/clock/imx31-clock.txt<br/>index 19df842c694f..8163d565f697 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/imx31-clock.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/imx31-clock.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/imx31-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/imx31-clock.txt</a></div><div class='hunk'>@@ -77,7 +77,7 @@ Examples:</div><div class='ctx'> clks: ccm@53f80000{</div><div class='ctx'> 	compatible = "fsl,imx31-ccm";</div><div class='ctx'> 	reg = &lt;0x53f80000 0x4000&gt;;</div><div class='del'>-	interrupts = &lt;0 31 0x04 0 53 0x04&gt;;</div><div class='add'>+	interrupts = &lt;31&gt;, &lt;53&gt;;</div><div class='ctx'> 	#clock-cells = &lt;1&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt<br/>index 520562a7dc2a..c7b4e3a6b2c6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt</a></div><div class='hunk'>@@ -7,6 +7,7 @@ Required properties:</div><div class='ctx'> - compatible : must be "marvell,armada-370-corediv-clock",</div><div class='ctx'> 		       "marvell,armada-375-corediv-clock",</div><div class='ctx'> 		       "marvell,armada-380-corediv-clock",</div><div class='add'>+                       "marvell,mv98dx3236-corediv-clock",</div><div class='ctx'> </div><div class='ctx'> - reg : must be the register address of Core Divider control register</div><div class='ctx'> - #clock-cells : from common clock binding; shall be set to 1</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt<br/>index 99c214660bdc..7f28506eaee7 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt</a></div><div class='hunk'>@@ -3,6 +3,7 @@ Device Tree Clock bindings for cpu clock of Marvell EBU platforms</div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible : shall be one of the following:</div><div class='ctx'> 	"marvell,armada-xp-cpu-clock" - cpu clocks for Armada XP</div><div class='add'>+	"marvell,mv98dx3236-cpu-clock" - cpu clocks for 98DX3236 SoC</div><div class='ctx'> - reg : Address and length of the clock complex register set, followed</div><div class='ctx'>         by address and length of the PMU DFS registers</div><div class='ctx'> - #clock-cells : should be set to 1.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt<br/>index cb8542d910b3..5142efc8099d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt</a></div><div class='hunk'>@@ -117,7 +117,7 @@ ID	Clock	Peripheral</div><div class='ctx'> 25	tdm	Time Division Mplx</div><div class='ctx'> 28	xor1	XOR DMA 1</div><div class='ctx'> 29	sata1lnk</div><div class='del'>-30	sata1	SATA Host 0</div><div class='add'>+30	sata1	SATA Host 1</div><div class='ctx'> </div><div class='ctx'> The following is a list of provided IDs for Dove:</div><div class='ctx'> ID	Clock	Peripheral</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/oxnas,stdclk.txt b/Documentation/devicetree/bindings/clock/oxnas,stdclk.txt<br/>index 208cca6ac4ec..b652f3fb7796 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/oxnas,stdclk.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/oxnas,stdclk.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/oxnas,stdclk.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/oxnas,stdclk.txt</a></div><div class='hunk'>@@ -5,22 +5,15 @@ Please also refer to clock-bindings.txt in this directory for common clock</div><div class='ctx'> bindings usage.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Should be "oxsemi,ox810se-stdclk"</div><div class='add'>+- compatible: For OX810SE, should be "oxsemi,ox810se-stdclk"</div><div class='add'>+	      For OX820, should be "oxsemi,ox820-stdclk"</div><div class='ctx'> - #clock-cells: 1, see below</div><div class='ctx'> </div><div class='ctx'> Parent node should have the following properties :</div><div class='del'>-- compatible: Should be "oxsemi,ox810se-sys-ctrl", "syscon", "simple-mfd"</div><div class='del'>-</div><div class='del'>-For OX810SE, the clock indices are :</div><div class='del'>- - 0: LEON</div><div class='del'>- - 1: DMA_SGDMA</div><div class='del'>- - 2: CIPHER</div><div class='del'>- - 3: SATA</div><div class='del'>- - 4: AUDIO</div><div class='del'>- - 5: USBMPH</div><div class='del'>- - 6: ETHA</div><div class='del'>- - 7: PCIA</div><div class='del'>- - 8: NAND</div><div class='add'>+- compatible: For OX810SE, should be</div><div class='add'>+		"oxsemi,ox810se-sys-ctrl", "syscon", "simple-mfd"</div><div class='add'>+	      For OX820, should be</div><div class='add'>+		"oxsemi,ox820-sys-ctrl", "syscon", "simple-mfd"</div><div class='ctx'> </div><div class='ctx'> example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt b/Documentation/devicetree/bindings/clock/qcom,gcc.txt<br/>index 3cf44217068e..5b4dfc1ea54f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/qcom,gcc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/qcom,gcc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/qcom,gcc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/qcom,gcc.txt</a></div><div class='hunk'>@@ -14,6 +14,7 @@ Required properties :</div><div class='ctx'> 			"qcom,gcc-msm8974"</div><div class='ctx'> 			"qcom,gcc-msm8974pro"</div><div class='ctx'> 			"qcom,gcc-msm8974pro-ac"</div><div class='add'>+			"qcom,gcc-msm8994"</div><div class='ctx'> 			"qcom,gcc-msm8996"</div><div class='ctx'> 			"qcom,gcc-mdm9615"</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt<br/>new file mode 100644<br/>index 000000000000..a7235e9e1c97<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/qcom,rpmcc.txt</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+Qualcomm RPM Clock Controller Binding</div><div class='add'>+------------------------------------------------</div><div class='add'>+The RPM is a dedicated hardware engine for managing the shared</div><div class='add'>+SoC resources in order to keep the lowest power profile. It</div><div class='add'>+communicates with other hardware subsystems via shared memory</div><div class='add'>+and accepts clock requests, aggregates the requests and turns</div><div class='add'>+the clocks on/off or scales them on demand.</div><div class='add'>+</div><div class='add'>+Required properties :</div><div class='add'>+- compatible : shall contain only one of the following. The generic</div><div class='add'>+               compatible "qcom,rpmcc" should be also included.</div><div class='add'>+</div><div class='add'>+			"qcom,rpmcc-msm8916", "qcom,rpmcc"</div><div class='add'>+			"qcom,rpmcc-msm8974", "qcom,rpmcc"</div><div class='add'>+			"qcom,rpmcc-apq8064", "qcom,rpmcc"</div><div class='add'>+</div><div class='add'>+- #clock-cells : shall contain 1</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	smd {</div><div class='add'>+		compatible = "qcom,smd";</div><div class='add'>+</div><div class='add'>+		rpm {</div><div class='add'>+			interrupts = &lt;0 168 1&gt;;</div><div class='add'>+			qcom,ipc = &lt;&amp;apcs 8 0&gt;;</div><div class='add'>+			qcom,smd-edge = &lt;15&gt;;</div><div class='add'>+</div><div class='add'>+			rpm_requests {</div><div class='add'>+				compatible = "qcom,rpm-msm8916";</div><div class='add'>+				qcom,smd-channels = "rpm_requests";</div><div class='add'>+</div><div class='add'>+				rpmcc: clock-controller {</div><div class='add'>+					compatible = "qcom,rpmcc-msm8916", "qcom,rpmcc";</div><div class='add'>+					#clock-cells = &lt;1&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/qoriq-clock.txt b/Documentation/devicetree/bindings/clock/qoriq-clock.txt<br/>index 16a3ec433119..aa3526f229a7 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/qoriq-clock.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/qoriq-clock.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/qoriq-clock.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/qoriq-clock.txt</a></div><div class='hunk'>@@ -31,7 +31,11 @@ Required properties:</div><div class='ctx'> 	* "fsl,t4240-clockgen"</div><div class='ctx'> 	* "fsl,b4420-clockgen"</div><div class='ctx'> 	* "fsl,b4860-clockgen"</div><div class='add'>+	* "fsl,ls1012a-clockgen"</div><div class='ctx'> 	* "fsl,ls1021a-clockgen"</div><div class='add'>+	* "fsl,ls1043a-clockgen"</div><div class='add'>+	* "fsl,ls1046a-clockgen"</div><div class='add'>+	* "fsl,ls2080a-clockgen"</div><div class='ctx'> 	Chassis-version clock strings include:</div><div class='ctx'> 	* "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks</div><div class='ctx'> 	* "fsl,qoriq-clockgen-2.0": for chassis 2.0 clocks</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt<br/>index 394d725ac7e0..f4f944d81308 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt</a></div><div class='hunk'>@@ -13,6 +13,8 @@ They provide the following functionalities:</div><div class='ctx'> </div><div class='ctx'> Required Properties:</div><div class='ctx'>   - compatible: Must be one of:</div><div class='add'>+      - "renesas,r8a7743-cpg-mssr" for the r8a7743 SoC (RZ/G1M)</div><div class='add'>+      - "renesas,r8a7745-cpg-mssr" for the r8a7745 SoC (RZ/G1E)</div><div class='ctx'>       - "renesas,r8a7795-cpg-mssr" for the r8a7795 SoC (R-Car H3)</div><div class='ctx'>       - "renesas,r8a7796-cpg-mssr" for the r8a7796 SoC (R-Car M3-W)</div><div class='ctx'> </div><div class='hunk'>@@ -22,8 +24,9 @@ Required Properties:</div><div class='ctx'>   - clocks: References to external parent clocks, one entry for each entry in</div><div class='ctx'>     clock-names</div><div class='ctx'>   - clock-names: List of external parent clock names. Valid names are:</div><div class='del'>-      - "extal" (r8a7795, r8a7796)</div><div class='add'>+      - "extal" (r8a7743, r8a7745, r8a7795, r8a7796)</div><div class='ctx'>       - "extalr" (r8a7795, r8a7796)</div><div class='add'>+      - "usb_extal" (r8a7743, r8a7745)</div><div class='ctx'> </div><div class='ctx'>   - #clock-cells: Must be 2</div><div class='ctx'>       - For CPG core clocks, the two clock specifier cells must be "CPG_CORE"</div><div class='hunk'>@@ -39,6 +42,10 @@ Required Properties:</div><div class='ctx'> 	Domain bindings in</div><div class='ctx'> 	Documentation/devicetree/bindings/power/power_domain.txt.</div><div class='ctx'> </div><div class='add'>+  - #reset-cells: Must be 1</div><div class='add'>+      - The single reset specifier cell must be the module number, as defined</div><div class='add'>+	in the datasheet.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Examples</div><div class='ctx'> --------</div><div class='hunk'>@@ -52,6 +59,7 @@ Examples</div><div class='ctx'> 		clock-names = "extal", "extalr";</div><div class='ctx'> 		#clock-cells = &lt;2&gt;;</div><div class='ctx'> 		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		#reset-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -66,5 +74,6 @@ Examples</div><div class='ctx'> 		dmas = &lt;&amp;dmac1 0x13&gt;, &lt;&amp;dmac1 0x12&gt;;</div><div class='ctx'> 		dma-names = "tx", "rx";</div><div class='ctx'> 		power-domains = &lt;&amp;cpg&gt;;</div><div class='add'>+		resets = &lt;&amp;cpg 310&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/rockchip,rk1108-cru.txt b/Documentation/devicetree/bindings/clock/rockchip,rk1108-cru.txt<br/>new file mode 100644<br/>index 000000000000..4da126116cf0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/rockchip,rk1108-cru.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/rockchip,rk1108-cru.txt</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+* Rockchip RK1108 Clock and Reset Unit</div><div class='add'>+</div><div class='add'>+The RK1108 clock controller generates and supplies clock to various</div><div class='add'>+controllers within the SoC and also implements a reset controller for SoC</div><div class='add'>+peripherals.</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+- compatible: should be "rockchip,rk1108-cru"</div><div class='add'>+- reg: physical base address of the controller and length of memory mapped</div><div class='add'>+  region.</div><div class='add'>+- #clock-cells: should be 1.</div><div class='add'>+- #reset-cells: should be 1.</div><div class='add'>+</div><div class='add'>+Optional Properties:</div><div class='add'>+</div><div class='add'>+- rockchip,grf: phandle to the syscon managing the "general register files"</div><div class='add'>+  If missing pll rates are not changeable, due to the missing pll lock status.</div><div class='add'>+</div><div class='add'>+Each clock is assigned an identifier and client nodes can use this identifier</div><div class='add'>+to specify the clock which they consume. All available clocks are defined as</div><div class='add'>+preprocessor macros in the dt-bindings/clock/rk1108-cru.h headers and can be</div><div class='add'>+used in device tree sources. Similar macros exist for the reset sources in</div><div class='add'>+these files.</div><div class='add'>+</div><div class='add'>+External clocks:</div><div class='add'>+</div><div class='add'>+There are several clocks that are generated outside the SoC. It is expected</div><div class='add'>+that they are defined using standard clock bindings with following</div><div class='add'>+clock-output-names:</div><div class='add'>+ - "xin24m" - crystal input - required,</div><div class='add'>+ - "ext_vip" - external VIP clock - optional</div><div class='add'>+ - "ext_i2s" - external I2S clock - optional</div><div class='add'>+ - "ext_gmac" - external GMAC clock - optional</div><div class='add'>+ - "hdmiphy" - external clock input derived from HDMI PHY - optional</div><div class='add'>+ - "usbphy" - external clock input derived from USB PHY - optional</div><div class='add'>+</div><div class='add'>+Example: Clock controller node:</div><div class='add'>+</div><div class='add'>+	cru: cru@20200000 {</div><div class='add'>+		compatible = "rockchip,rk1108-cru";</div><div class='add'>+		reg = &lt;0x20200000 0x1000&gt;;</div><div class='add'>+		rockchip,grf = &lt;&amp;grf&gt;;</div><div class='add'>+</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+		#reset-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Example: UART controller node that consumes the clock generated by the clock</div><div class='add'>+  controller:</div><div class='add'>+</div><div class='add'>+	uart0: serial@10230000 {</div><div class='add'>+		compatible = "rockchip,rk1108-uart", "snps,dw-apb-uart";</div><div class='add'>+		reg = &lt;0x10230000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		reg-io-width = &lt;4&gt;;</div><div class='add'>+		clocks = &lt;&amp;cru SCLK_UART0&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt b/Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt<br/>new file mode 100644<br/>index 000000000000..e71c675ba5da<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+* Rockchip RK3328 Clock and Reset Unit</div><div class='add'>+</div><div class='add'>+The RK3328 clock controller generates and supplies clock to various</div><div class='add'>+controllers within the SoC and also implements a reset controller for SoC</div><div class='add'>+peripherals.</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+- compatible: should be "rockchip,rk3328-cru"</div><div class='add'>+- reg: physical base address of the controller and length of memory mapped</div><div class='add'>+  region.</div><div class='add'>+- #clock-cells: should be 1.</div><div class='add'>+- #reset-cells: should be 1.</div><div class='add'>+</div><div class='add'>+Optional Properties:</div><div class='add'>+</div><div class='add'>+- rockchip,grf: phandle to the syscon managing the "general register files"</div><div class='add'>+  If missing pll rates are not changeable, due to the missing pll lock status.</div><div class='add'>+</div><div class='add'>+Each clock is assigned an identifier and client nodes can use this identifier</div><div class='add'>+to specify the clock which they consume. All available clocks are defined as</div><div class='add'>+preprocessor macros in the dt-bindings/clock/rk3328-cru.h headers and can be</div><div class='add'>+used in device tree sources. Similar macros exist for the reset sources in</div><div class='add'>+these files.</div><div class='add'>+</div><div class='add'>+External clocks:</div><div class='add'>+</div><div class='add'>+There are several clocks that are generated outside the SoC. It is expected</div><div class='add'>+that they are defined using standard clock bindings with following</div><div class='add'>+clock-output-names:</div><div class='add'>+ - "xin24m" - crystal input - required,</div><div class='add'>+ - "clkin_i2s" - external I2S clock - optional,</div><div class='add'>+ - "gmac_clkin" - external GMAC clock - optional</div><div class='add'>+ - "phy_50m_out" - output clock of the pll in the mac phy</div><div class='add'>+</div><div class='add'>+Example: Clock controller node:</div><div class='add'>+</div><div class='add'>+	cru: clock-controller@ff440000 {</div><div class='add'>+		compatible = "rockchip,rk3328-cru";</div><div class='add'>+		reg = &lt;0x0 0xff440000 0x0 0x1000&gt;;</div><div class='add'>+		rockchip,grf = &lt;&amp;grf&gt;;</div><div class='add'>+</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+		#reset-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Example: UART controller node that consumes the clock generated by the clock</div><div class='add'>+  controller:</div><div class='add'>+</div><div class='add'>+	uart0: serial@ff120000 {</div><div class='add'>+		compatible = "snps,dw-apb-uart";</div><div class='add'>+		reg = &lt;0xff120000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		reg-io-width = &lt;4&gt;;</div><div class='add'>+		clocks = &lt;&amp;cru SCLK_UART0&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt b/Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt<br/>index 3888dd33fcbd..3bc56fae90ac 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt</a></div><div class='hunk'>@@ -13,6 +13,12 @@ Required Properties:</div><div class='ctx'> - #clock-cells: should be 1.</div><div class='ctx'> - #reset-cells: should be 1.</div><div class='ctx'> </div><div class='add'>+Optional Properties:</div><div class='add'>+</div><div class='add'>+- rockchip,grf: phandle to the syscon managing the "general register files".</div><div class='add'>+  It is used for GRF muxes, if missing any muxes present in the GRF will not</div><div class='add'>+  be available.</div><div class='add'>+</div><div class='ctx'> Each clock is assigned an identifier and client nodes can use this identifier</div><div class='ctx'> to specify the clock which they consume. All available clocks are defined as</div><div class='ctx'> preprocessor macros in the dt-bindings/clock/rk3399-cru.h headers and can be</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/st,stm32-rcc.txt b/Documentation/devicetree/bindings/clock/st,stm32-rcc.txt<br/>index c209de6cfadb..b240121d2ac9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/st,stm32-rcc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/st,stm32-rcc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/st,stm32-rcc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/st,stm32-rcc.txt</a></div><div class='hunk'>@@ -7,7 +7,10 @@ Please refer to clock-bindings.txt for common clock controller binding usage.</div><div class='ctx'> Please also refer to reset.txt for common reset controller binding usage.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Should be "st,stm32f42xx-rcc"</div><div class='add'>+- compatible: Should be:</div><div class='add'>+  "st,stm32f42xx-rcc"</div><div class='add'>+  "st,stm32f469-rcc"</div><div class='add'>+  "st,stm32f746-rcc"</div><div class='ctx'> - reg: should be register base and length as documented in the</div><div class='ctx'>   datasheet</div><div class='ctx'> - #reset-cells: 1, see below</div><div class='hunk'>@@ -15,6 +18,9 @@ Required properties:</div><div class='ctx'>   property, containing a phandle to the clock device node, an index selecting</div><div class='ctx'>   between gated clocks and other clocks and an index specifying the clock to</div><div class='ctx'>   use.</div><div class='add'>+- clocks: External oscillator clock phandle</div><div class='add'>+  - high speed external clock signal (HSE)</div><div class='add'>+  - external I2S clock (I2S_CKIN)</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='hunk'>@@ -23,6 +29,7 @@ Example:</div><div class='ctx'> 		#clock-cells = &lt;2&gt;</div><div class='ctx'> 		compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";</div><div class='ctx'> 		reg = &lt;0x40023800 0x400&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_hse&gt;, &lt;&amp;clk_i2s_ckin&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> Specifying gated clocks</div><div class='hunk'>@@ -64,6 +71,38 @@ The secondary index is bound with the following magic numbers:</div><div class='ctx'> </div><div class='ctx'> 	0	SYSTICK</div><div class='ctx'> 	1	FCLK</div><div class='add'>+	2	CLK_LSI		(low-power clock source)</div><div class='add'>+	3	CLK_LSE		(generated from a 32.768 kHz low-speed external</div><div class='add'>+				 crystal or ceramic resonator)</div><div class='add'>+	4	CLK_HSE_RTC	(HSE division factor for RTC clock)</div><div class='add'>+	5	CLK_RTC		(real-time clock)</div><div class='add'>+	6	PLL_VCO_I2S	(vco frequency of I2S pll)</div><div class='add'>+	7	PLL_VCO_SAI	(vco frequency of SAI pll)</div><div class='add'>+	8	CLK_LCD		(LCD-TFT)</div><div class='add'>+	9	CLK_I2S		(I2S clocks)</div><div class='add'>+	10	CLK_SAI1	(audio clocks)</div><div class='add'>+	11	CLK_SAI2</div><div class='add'>+	12	CLK_I2SQ_PDIV	(post divisor of pll i2s q divisor)</div><div class='add'>+	13	CLK_SAIQ_PDIV	(post divisor of pll sai q divisor)</div><div class='add'>+</div><div class='add'>+	14	CLK_HSI		(Internal ocscillator clock)</div><div class='add'>+	15	CLK_SYSCLK	(System Clock)</div><div class='add'>+	16	CLK_HDMI_CEC	(HDMI-CEC clock)</div><div class='add'>+	17	CLK_SPDIF	(SPDIF-Rx clock)</div><div class='add'>+	18	CLK_USART1	(U(s)arts clocks)</div><div class='add'>+	19	CLK_USART2</div><div class='add'>+	20	CLK_USART3</div><div class='add'>+	21	CLK_UART4</div><div class='add'>+	22	CLK_UART5</div><div class='add'>+	23	CLK_USART6</div><div class='add'>+	24	CLK_UART7</div><div class='add'>+	25	CLK_UART8</div><div class='add'>+	26	CLK_I2C1	(I2S clocks)</div><div class='add'>+	27	CLK_I2C2</div><div class='add'>+	28	CLK_I2C3</div><div class='add'>+	29	CLK_I2C4</div><div class='add'>+	30	CLK_LPTIMER	(LPTimer1 clock)</div><div class='add'>+)</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/stericsson,abx500.txt b/Documentation/devicetree/bindings/clock/stericsson,abx500.txt<br/>new file mode 100644<br/>index 000000000000..dbaa886b223e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/stericsson,abx500.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/stericsson,abx500.txt</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+Clock bindings for ST-Ericsson ABx500 clocks</div><div class='add'>+</div><div class='add'>+Required properties :</div><div class='add'>+- compatible : shall contain the following:</div><div class='add'>+  "stericsson,ab8500-clk"</div><div class='add'>+- #clock-cells should be &lt;1&gt;</div><div class='add'>+</div><div class='add'>+The ABx500 clocks need to be placed as a subnode of an AB8500</div><div class='add'>+device node, see mfd/ab8500.txt</div><div class='add'>+</div><div class='add'>+All available clocks are defined as preprocessor macros in</div><div class='add'>+dt-bindings/clock/ste-ab8500.h header and can be used in device</div><div class='add'>+tree sources.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+clock-controller {</div><div class='add'>+	compatible = "stericsson,ab8500-clk";</div><div class='add'>+	#clock-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/sun9i-de.txt b/Documentation/devicetree/bindings/clock/sun9i-de.txt<br/>new file mode 100644<br/>index 000000000000..fb18f327b97a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/sun9i-de.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/sun9i-de.txt</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+Allwinner A80 Display Engine Clock Control Binding</div><div class='add'>+--------------------------------------------------</div><div class='add'>+</div><div class='add'>+Required properties :</div><div class='add'>+- compatible: must contain one of the following compatibles:</div><div class='add'>+		- "allwinner,sun9i-a80-de-clks"</div><div class='add'>+</div><div class='add'>+- reg: Must contain the registers base address and length</div><div class='add'>+- clocks: phandle to the clocks feeding the display engine subsystem.</div><div class='add'>+	  Three are needed:</div><div class='add'>+  - "mod": the display engine module clock</div><div class='add'>+  - "dram": the DRAM bus clock for the system</div><div class='add'>+  - "bus": the bus clock for the whole display engine subsystem</div><div class='add'>+- clock-names: Must contain the clock names described just above</div><div class='add'>+- resets: phandle to the reset control for the display engine subsystem.</div><div class='add'>+- #clock-cells : must contain 1</div><div class='add'>+- #reset-cells : must contain 1</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+de_clocks: clock@3000000 {</div><div class='add'>+	compatible = "allwinner,sun9i-a80-de-clks";</div><div class='add'>+	reg = &lt;0x03000000 0x30&gt;;</div><div class='add'>+	clocks = &lt;&amp;ccu CLK_DE&gt;, &lt;&amp;ccu CLK_SDRAM&gt;, &lt;&amp;ccu CLK_BUS_DE&gt;;</div><div class='add'>+	clock-names = "mod", "dram", "bus";</div><div class='add'>+	resets = &lt;&amp;ccu RST_BUS_DE&gt;;</div><div class='add'>+	#clock-cells = &lt;1&gt;;</div><div class='add'>+	#reset-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/sun9i-usb.txt b/Documentation/devicetree/bindings/clock/sun9i-usb.txt<br/>new file mode 100644<br/>index 000000000000..3564bd4f2a20<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/sun9i-usb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/sun9i-usb.txt</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+Allwinner A80 USB Clock Control Binding</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+Required properties :</div><div class='add'>+- compatible: must contain one of the following compatibles:</div><div class='add'>+		- "allwinner,sun9i-a80-usb-clocks"</div><div class='add'>+</div><div class='add'>+- reg: Must contain the registers base address and length</div><div class='add'>+- clocks: phandle to the clocks feeding the USB subsystem. Two are needed:</div><div class='add'>+  - "bus": the bus clock for the whole USB subsystem</div><div class='add'>+  - "hosc": the high frequency oscillator (usually at 24MHz)</div><div class='add'>+- clock-names: Must contain the clock names described just above</div><div class='add'>+- #clock-cells : must contain 1</div><div class='add'>+- #reset-cells : must contain 1</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+usb_clocks: clock@a08000 {</div><div class='add'>+	compatible = "allwinner,sun9i-a80-usb-clks";</div><div class='add'>+	reg = &lt;0x00a08000 0x8&gt;;</div><div class='add'>+	clocks = &lt;&amp;ccu CLK_BUS_USB&gt;, &lt;&amp;osc24M&gt;;</div><div class='add'>+	clock-names = "bus", "hosc";</div><div class='add'>+	#clock-cells = &lt;1&gt;;</div><div class='add'>+	#reset-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/sunxi-ccu.txt b/Documentation/devicetree/bindings/clock/sunxi-ccu.txt<br/>index 3868458a5feb..bae5668cf427 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/sunxi-ccu.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/sunxi-ccu.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/sunxi-ccu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/sunxi-ccu.txt</a></div><div class='hunk'>@@ -7,6 +7,9 @@ Required properties :</div><div class='ctx'> 		- "allwinner,sun8i-a23-ccu"</div><div class='ctx'> 		- "allwinner,sun8i-a33-ccu"</div><div class='ctx'> 		- "allwinner,sun8i-h3-ccu"</div><div class='add'>+		- "allwinner,sun8i-v3s-ccu"</div><div class='add'>+		- "allwinner,sun9i-a80-ccu"</div><div class='add'>+		- "allwinner,sun50i-a64-ccu"</div><div class='ctx'> </div><div class='ctx'> - reg: Must contain the registers base address and length</div><div class='ctx'> - clocks: phandle to the oscillators feeding the CCU. Two are needed:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/ti,cdce925.txt b/Documentation/devicetree/bindings/clock/ti,cdce925.txt<br/>index 4c7669ad681b..0d01f2d5cc36 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/ti,cdce925.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/ti,cdce925.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/ti,cdce925.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/ti,cdce925.txt</a></div><div class='hunk'>@@ -1,15 +1,22 @@</div><div class='del'>-Binding for TO CDCE925 programmable I2C clock synthesizers.</div><div class='add'>+Binding for TI CDCE913/925/937/949 programmable I2C clock synthesizers.</div><div class='ctx'> </div><div class='ctx'> Reference</div><div class='ctx'> This binding uses the common clock binding[1].</div><div class='ctx'> </div><div class='ctx'> [1] Documentation/devicetree/bindings/clock/clock-bindings.txt</div><div class='del'>-[2] http://www.ti.com/product/cdce925</div><div class='add'>+[2] http://www.ti.com/product/cdce913</div><div class='add'>+[3] http://www.ti.com/product/cdce925</div><div class='add'>+[4] http://www.ti.com/product/cdce937</div><div class='add'>+[5] http://www.ti.com/product/cdce949</div><div class='ctx'> </div><div class='ctx'> The driver provides clock sources for each output Y1 through Y5.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>- - compatible: Shall be "ti,cdce925"</div><div class='add'>+ - compatible: Shall be one of the following:</div><div class='add'>+	- "ti,cdce913": 1-PLL, 3 Outputs</div><div class='add'>+	- "ti,cdce925": 2-PLL, 5 Outputs</div><div class='add'>+	- "ti,cdce937": 3-PLL, 7 Outputs</div><div class='add'>+	- "ti,cdce949": 4-PLL, 9 Outputs</div><div class='ctx'>  - reg: I2C device address.</div><div class='ctx'>  - clocks: Points to a fixed parent clock that provides the input frequency.</div><div class='ctx'>  - #clock-cells: From common clock bindings: Shall be 1.</div><div class='hunk'>@@ -18,7 +25,7 @@ Optional properties:</div><div class='ctx'>  - xtal-load-pf: Crystal load-capacitor value to fine-tune performance on a</div><div class='ctx'>                  board, or to compensate for external influences.</div><div class='ctx'> </div><div class='del'>-For both PLL1 and PLL2 an optional child node can be used to specify spread</div><div class='add'>+For all PLL1, PLL2, ... an optional child node can be used to specify spread</div><div class='ctx'> spectrum clocking parameters for a board.</div><div class='ctx'>   - spread-spectrum: SSC mode as defined in the data sheet.</div><div class='ctx'>   - spread-spectrum-center: Use "centered" mode instead of "max" mode. When</div><div class='head'>diff --git a/Documentation/devicetree/bindings/clock/zx296718-clk.txt b/Documentation/devicetree/bindings/clock/zx296718-clk.txt<br/>index 8c18b7b237bf..4ad703808407 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/zx296718-clk.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/clock/zx296718-clk.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/clock/zx296718-clk.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/clock/zx296718-clk.txt</a></div><div class='hunk'>@@ -13,6 +13,9 @@ Required properties:</div><div class='ctx'> 	"zte,zx296718-lsp1crm":</div><div class='ctx'> 		zx296718 device level clock selection and gating</div><div class='ctx'> </div><div class='add'>+	"zte,zx296718-audiocrm":</div><div class='add'>+		zx296718 audio clock selection, divider and gating</div><div class='add'>+</div><div class='ctx'> - reg: Address and length of the register set</div><div class='ctx'> </div><div class='ctx'> The clock consumer should specify the desired clock by having the clock</div><div class='head'>diff --git a/Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt b/Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt<br/>new file mode 100644<br/>index 000000000000..af2385795d78<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+Broadcom AVS mail box and interrupt register bindings</div><div class='add'>+=====================================================</div><div class='add'>+</div><div class='add'>+A total of three DT nodes are required. One node (brcm,avs-cpu-data-mem)</div><div class='add'>+references the mailbox register used to communicate with the AVS CPU[1]. The</div><div class='add'>+second node (brcm,avs-cpu-l2-intr) is required to trigger an interrupt on</div><div class='add'>+the AVS CPU. The interrupt tells the AVS CPU that it needs to process a</div><div class='add'>+command sent to it by a driver. Interrupting the AVS CPU is mandatory for</div><div class='add'>+commands to be processed.</div><div class='add'>+</div><div class='add'>+The interface also requires a reference to the AVS host interrupt controller,</div><div class='add'>+so a driver can react to interrupts generated by the AVS CPU whenever a command</div><div class='add'>+has been processed. See [2] for more information on the brcm,l2-intc node.</div><div class='add'>+</div><div class='add'>+[1] The AVS CPU is an independent co-processor that runs proprietary</div><div class='add'>+firmware. On some SoCs, this firmware supports DFS and DVFS in addition to</div><div class='add'>+Adaptive Voltage Scaling.</div><div class='add'>+</div><div class='add'>+[2] Documentation/devicetree/bindings/interrupt-controller/brcm,l2-intc.txt</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Node brcm,avs-cpu-data-mem</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must include: brcm,avs-cpu-data-mem and</div><div class='add'>+              should include: one of brcm,bcm7271-avs-cpu-data-mem or</div><div class='add'>+                              brcm,bcm7268-avs-cpu-data-mem</div><div class='add'>+- reg: Specifies base physical address and size of the registers.</div><div class='add'>+- interrupts: The interrupt that the AVS CPU will use to interrupt the host</div><div class='add'>+              when a command completed.</div><div class='add'>+- interrupt-parent: The interrupt controller the above interrupt is routed</div><div class='add'>+                    through.</div><div class='add'>+- interrupt-names: The name of the interrupt used to interrupt the host.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- None</div><div class='add'>+</div><div class='add'>+Node brcm,avs-cpu-l2-intr</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must include: brcm,avs-cpu-l2-intr and</div><div class='add'>+              should include: one of brcm,bcm7271-avs-cpu-l2-intr or</div><div class='add'>+                              brcm,bcm7268-avs-cpu-l2-intr</div><div class='add'>+- reg: Specifies base physical address and size of the registers.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- None</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+	avs_host_l2_intc: interrupt-controller@f04d1200 {</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "brcm,l2-intc";</div><div class='add'>+		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+		reg = &lt;0xf04d1200 0x48&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		interrupts = &lt;0x0 0x19 0x0&gt;;</div><div class='add'>+		interrupt-names = "avs";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	avs-cpu-data-mem@f04c4000 {</div><div class='add'>+		compatible = "brcm,bcm7271-avs-cpu-data-mem",</div><div class='add'>+				"brcm,avs-cpu-data-mem";</div><div class='add'>+		reg = &lt;0xf04c4000 0x60&gt;;</div><div class='add'>+		interrupts = &lt;0x1a&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;avs_host_l2_intc&gt;;</div><div class='add'>+		interrupt-names = "sw_intr";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	avs-cpu-l2-intr@f04d1100 {</div><div class='add'>+		compatible = "brcm,bcm7271-avs-cpu-l2-intr",</div><div class='add'>+				"brcm,avs-cpu-l2-intr";</div><div class='add'>+		reg = &lt;0xf04d1100 0x10&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/cpufreq/ti-cpufreq.txt b/Documentation/devicetree/bindings/cpufreq/ti-cpufreq.txt<br/>new file mode 100644<br/>index 000000000000..ba0e15ad5bd9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/cpufreq/ti-cpufreq.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/cpufreq/ti-cpufreq.txt</a></div><div class='hunk'>@@ -0,0 +1,128 @@</div><div class='add'>+TI CPUFreq and OPP bindings</div><div class='add'>+================================</div><div class='add'>+</div><div class='add'>+Certain TI SoCs, like those in the am335x, am437x, am57xx, and dra7xx</div><div class='add'>+families support different OPPs depending on the silicon variant in use.</div><div class='add'>+The ti-cpufreq driver can use revision and an efuse value from the SoC to</div><div class='add'>+provide the OPP framework with supported hardware information. This is</div><div class='add'>+used to determine which OPPs from the operating-points-v2 table get enabled</div><div class='add'>+when it is parsed by the OPP framework.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+--------------------</div><div class='add'>+In 'cpus' nodes:</div><div class='add'>+- operating-points-v2: Phandle to the operating-points-v2 table to use.</div><div class='add'>+</div><div class='add'>+In 'operating-points-v2' table:</div><div class='add'>+- compatible: Should be</div><div class='add'>+	- 'operating-points-v2-ti-cpu' for am335x, am43xx, and dra7xx/am57xx SoCs</div><div class='add'>+- syscon: A phandle pointing to a syscon node representing the control module</div><div class='add'>+	  register space of the SoC.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+--------------------</div><div class='add'>+For each opp entry in 'operating-points-v2' table:</div><div class='add'>+- opp-supported-hw: Two bitfields indicating:</div><div class='add'>+	1. Which revision of the SoC the OPP is supported by</div><div class='add'>+	2. Which eFuse bits indicate this OPP is available</div><div class='add'>+</div><div class='add'>+	A bitwise AND is performed against these values and if any bit</div><div class='add'>+	matches, the OPP gets enabled.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+/* From arch/arm/boot/dts/am33xx.dtsi */</div><div class='add'>+cpus {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	cpu@0 {</div><div class='add'>+		compatible = "arm,cortex-a8";</div><div class='add'>+		device_type = "cpu";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		operating-points-v2 = &lt;&amp;cpu0_opp_table&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;dpll_mpu_ck&gt;;</div><div class='add'>+		clock-names = "cpu";</div><div class='add'>+</div><div class='add'>+		clock-latency = &lt;300000&gt;; /* From omap-cpufreq driver */</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cpu0 has different OPPs depending on SoC revision and some on revisions</div><div class='add'>+ * 0x2 and 0x4 have eFuse bits that indicate if they are available or not</div><div class='add'>+ */</div><div class='add'>+cpu0_opp_table: opp-table {</div><div class='add'>+	compatible = "operating-points-v2-ti-cpu";</div><div class='add'>+	syscon = &lt;&amp;scm_conf&gt;;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The three following nodes are marked with opp-suspend</div><div class='add'>+	 * because they can not be enabled simultaneously on a</div><div class='add'>+	 * single SoC.</div><div class='add'>+	 */</div><div class='add'>+	opp50@300000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;300000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;950000 931000 969000&gt;;</div><div class='add'>+		opp-supported-hw = &lt;0x06 0x0010&gt;;</div><div class='add'>+		opp-suspend;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	opp100@275000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;275000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;1100000 1078000 1122000&gt;;</div><div class='add'>+		opp-supported-hw = &lt;0x01 0x00FF&gt;;</div><div class='add'>+		opp-suspend;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	opp100@300000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;300000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;1100000 1078000 1122000&gt;;</div><div class='add'>+		opp-supported-hw = &lt;0x06 0x0020&gt;;</div><div class='add'>+		opp-suspend;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	opp100@500000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;500000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;1100000 1078000 1122000&gt;;</div><div class='add'>+		opp-supported-hw = &lt;0x01 0xFFFF&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	opp100@600000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;600000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;1100000 1078000 1122000&gt;;</div><div class='add'>+		opp-supported-hw = &lt;0x06 0x0040&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	opp120@600000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;600000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;1200000 1176000 1224000&gt;;</div><div class='add'>+		opp-supported-hw = &lt;0x01 0xFFFF&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	opp120@720000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;720000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;1200000 1176000 1224000&gt;;</div><div class='add'>+		opp-supported-hw = &lt;0x06 0x0080&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	oppturbo@720000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;720000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;1260000 1234800 1285200&gt;;</div><div class='add'>+		opp-supported-hw = &lt;0x01 0xFFFF&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	oppturbo@800000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;800000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;1260000 1234800 1285200&gt;;</div><div class='add'>+		opp-supported-hw = &lt;0x06 0x0100&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	oppnitro@1000000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;1325000 1298500 1351500&gt;;</div><div class='add'>+		opp-supported-hw = &lt;0x04 0x0200&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/crypto/brcm,spu-crypto.txt b/Documentation/devicetree/bindings/crypto/brcm,spu-crypto.txt<br/>new file mode 100644<br/>index 000000000000..29b6007568eb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/crypto/brcm,spu-crypto.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/crypto/brcm,spu-crypto.txt</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+The Broadcom Secure Processing Unit (SPU) hardware supports symmetric</div><div class='add'>+cryptographic offload for Broadcom SoCs. A SoC may have multiple SPU hardware</div><div class='add'>+blocks.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Should be one of the following:</div><div class='add'>+  brcm,spum-crypto - for devices with SPU-M hardware</div><div class='add'>+  brcm,spu2-crypto - for devices with SPU2 hardware</div><div class='add'>+  brcm,spu2-v2-crypto - for devices with enhanced SPU2 hardware features like SHA3</div><div class='add'>+  and Rabin Fingerprint support</div><div class='add'>+  brcm,spum-nsp-crypto - for the Northstar Plus variant of the SPU-M hardware</div><div class='add'>+</div><div class='add'>+- reg: Should contain SPU registers location and length.</div><div class='add'>+- mboxes: The mailbox channel to be used to communicate with the SPU.</div><div class='add'>+  Mailbox channels correspond to DMA rings on the device.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	crypto@612d0000 {</div><div class='add'>+		compatible = "brcm,spum-crypto";</div><div class='add'>+		reg = &lt;0 0x612d0000 0 0x900&gt;;</div><div class='add'>+		mboxes = &lt;&amp;pdc0 0&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt<br/>index adeca34c5a33..10a425f451fc 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/crypto/fsl-sec4.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/crypto/fsl-sec4.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/crypto/fsl-sec4.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/crypto/fsl-sec4.txt</a></div><div class='hunk'>@@ -123,6 +123,9 @@ PROPERTIES</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> EXAMPLE</div><div class='add'>+</div><div class='add'>+iMX6QDL/SX requires four clocks</div><div class='add'>+</div><div class='ctx'> 	crypto@300000 {</div><div class='ctx'> 		compatible = "fsl,sec-v4.0";</div><div class='ctx'> 		fsl,sec-era = &lt;2&gt;;</div><div class='hunk'>@@ -139,6 +142,23 @@ EXAMPLE</div><div class='ctx'> 		clock-names = "mem", "aclk", "ipg", "emi_slow";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+iMX6UL does only require three clocks</div><div class='add'>+</div><div class='add'>+	crypto: caam@2140000 {</div><div class='add'>+		compatible = "fsl,sec-v4.0";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x2140000 0x3c000&gt;;</div><div class='add'>+		ranges = &lt;0 0x2140000 0x3c000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;clks IMX6UL_CLK_CAAM_MEM&gt;,</div><div class='add'>+			 &lt;&amp;clks IMX6UL_CLK_CAAM_ACLK&gt;,</div><div class='add'>+			 &lt;&amp;clks IMX6UL_CLK_CAAM_IPG&gt;;</div><div class='add'>+		clock-names = "mem", "aclk", "ipg";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> =====================================================================</div><div class='ctx'> Job Ring (JR) Node</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/crypto/mediatek-crypto.txt b/Documentation/devicetree/bindings/crypto/mediatek-crypto.txt<br/>new file mode 100644<br/>index 000000000000..c204725e5873<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/crypto/mediatek-crypto.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/crypto/mediatek-crypto.txt</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+MediaTek cryptographic accelerators</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Should be "mediatek,eip97-crypto"</div><div class='add'>+- reg: Address and length of the register set for the device</div><div class='add'>+- interrupts: Should contain the five crypto engines interrupts in numeric</div><div class='add'>+	order. These are global system and four descriptor rings.</div><div class='add'>+- clocks: the clock used by the core</div><div class='add'>+- clock-names: the names of the clock listed in the clocks property. These are</div><div class='add'>+	"ethif", "cryp"</div><div class='add'>+- power-domains: Must contain a reference to the PM domain.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	crypto: crypto@1b240000 {</div><div class='add'>+		compatible = "mediatek,eip97-crypto";</div><div class='add'>+		reg = &lt;0 0x1b240000 0 0x20000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 82 IRQ_TYPE_LEVEL_LOW&gt;,</div><div class='add'>+			     &lt;GIC_SPI 83 IRQ_TYPE_LEVEL_LOW&gt;,</div><div class='add'>+			     &lt;GIC_SPI 84 IRQ_TYPE_LEVEL_LOW&gt;,</div><div class='add'>+			     &lt;GIC_SPI 91 IRQ_TYPE_LEVEL_LOW&gt;,</div><div class='add'>+			     &lt;GIC_SPI 97 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;topckgen CLK_TOP_ETHIF_SEL&gt;,</div><div class='add'>+			 &lt;&amp;ethsys CLK_ETHSYS_CRYPTO&gt;;</div><div class='add'>+		clock-names = "ethif","cryp";</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT2701_POWER_DOMAIN_ETH&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/devfreq/exynos-bus.txt b/Documentation/devicetree/bindings/devfreq/exynos-bus.txt<br/>index d3ec8e676b6b..d085ef90d27c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/devfreq/exynos-bus.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/devfreq/exynos-bus.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/devfreq/exynos-bus.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/devfreq/exynos-bus.txt</a></div><div class='hunk'>@@ -123,6 +123,20 @@ Detailed correlation between sub-blocks and power line according to Exynos SoC:</div><div class='ctx'> 		|--- FSYS</div><div class='ctx'> 		|--- FSYS2</div><div class='ctx'> </div><div class='add'>+- In case of Exynos5433, there is VDD_INT power line as following:</div><div class='add'>+	VDD_INT |--- G2D (parent device)</div><div class='add'>+		|--- MSCL</div><div class='add'>+		|--- GSCL</div><div class='add'>+		|--- JPEG</div><div class='add'>+		|--- MFC</div><div class='add'>+		|--- HEVC</div><div class='add'>+		|--- BUS0</div><div class='add'>+		|--- BUS1</div><div class='add'>+		|--- BUS2</div><div class='add'>+		|--- PERIS (Fixed clock rate)</div><div class='add'>+		|--- PERIC (Fixed clock rate)</div><div class='add'>+		|--- FSYS  (Fixed clock rate)</div><div class='add'>+</div><div class='ctx'> Example1:</div><div class='ctx'> 	Show the AXI buses of Exynos3250 SoC. Exynos3250 divides the buses to</div><div class='ctx'> 	power line (regulator). The MIF (Memory Interface) AXI bus is used to</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt<br/>new file mode 100644<br/>index 000000000000..00f74bad1e95<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+Amlogic Meson Display Controller</div><div class='add'>+================================</div><div class='add'>+</div><div class='add'>+The Amlogic Meson Display controller is composed of several components</div><div class='add'>+that are going to be documented below:</div><div class='add'>+</div><div class='add'>+DMC|---------------VPU (Video Processing Unit)----------------|------HHI------|</div><div class='add'>+   | vd1   _______     _____________    _________________     |               |</div><div class='add'>+D  |-------|      |----|            |   |                |    |   HDMI PLL    |</div><div class='add'>+D  | vd2   | VIU  |    | Video Post |   | Video Encoders |&lt;---|-----VCLK      |</div><div class='add'>+R  |-------|      |----| Processing |   |                |    |               |</div><div class='add'>+   | osd2  |      |    |            |---| Enci ----------|----|-----VDAC------|</div><div class='add'>+R  |-------| CSC  |----| Scalers    |   | Encp ----------|----|----HDMI-TX----|</div><div class='add'>+A  | osd1  |      |    | Blenders   |   | Encl ----------|----|---------------|</div><div class='add'>+M  |-------|______|----|____________|   |________________|    |               |</div><div class='add'>+___|__________________________________________________________|_______________|</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+VIU: Video Input Unit</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The Video Input Unit is in charge of the pixel scanout from the DDR memory.</div><div class='add'>+It fetches the frames addresses, stride and parameters from the "Canvas" memory.</div><div class='add'>+This part is also in charge of the CSC (Colorspace Conversion).</div><div class='add'>+It can handle 2 OSD Planes and 2 Video Planes.</div><div class='add'>+</div><div class='add'>+VPP: Video Post Processing</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+The Video Post Processing is in charge of the scaling and blending of the</div><div class='add'>+various planes into a single pixel stream.</div><div class='add'>+There is a special "pre-blending" used by the video planes with a dedicated</div><div class='add'>+scaler and a "post-blending" to merge with the OSD Planes.</div><div class='add'>+The OSD planes also have a dedicated scaler for one of the OSD.</div><div class='add'>+</div><div class='add'>+VENC: Video Encoders</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+The VENC is composed of the multiple pixel encoders :</div><div class='add'>+ - ENCI : Interlace Video encoder for CVBS and Interlace HDMI</div><div class='add'>+ - ENCP : Progressive Video Encoder for HDMI</div><div class='add'>+ - ENCL : LCD LVDS Encoder</div><div class='add'>+The VENC Unit gets a Pixel Clocks (VCLK) from a dedicated HDMI PLL and clock</div><div class='add'>+tree and provides the scanout clock to the VPP and VIU.</div><div class='add'>+The ENCI is connected to a single VDAC for Composite Output.</div><div class='add'>+The ENCI and ENCP are connected to an on-chip HDMI Transceiver.</div><div class='add'>+</div><div class='add'>+Device Tree Bindings:</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+VPU: Video Processing Unit</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: value should be different for each SoC family as :</div><div class='add'>+	- GXBB (S905) : "amlogic,meson-gxbb-vpu"</div><div class='add'>+	- GXL (S905X, S905D) : "amlogic,meson-gxl-vpu"</div><div class='add'>+	- GXM (S912) : "amlogic,meson-gxm-vpu"</div><div class='add'>+	followed by the common "amlogic,meson-gx-vpu"</div><div class='add'>+- reg: base address and size of he following memory-mapped regions :</div><div class='add'>+	- vpu</div><div class='add'>+	- hhi</div><div class='add'>+	- dmc</div><div class='add'>+- reg-names: should contain the names of the previous memory regions</div><div class='add'>+- interrupts: should contain the VENC Vsync interrupt number</div><div class='add'>+</div><div class='add'>+Required nodes:</div><div class='add'>+</div><div class='add'>+The connections to the VPU output video ports are modeled using the OF graph</div><div class='add'>+bindings specified in Documentation/devicetree/bindings/graph.txt.</div><div class='add'>+</div><div class='add'>+The following table lists for each supported model the port number</div><div class='add'>+corresponding to each VPU output.</div><div class='add'>+</div><div class='add'>+		Port 0		Port 1</div><div class='add'>+-----------------------------------------</div><div class='add'>+ S905 (GXBB)	CVBS VDAC	HDMI-TX</div><div class='add'>+ S905X (GXL)	CVBS VDAC	HDMI-TX</div><div class='add'>+ S905D (GXL)	CVBS VDAC	HDMI-TX</div><div class='add'>+ S912 (GXM)	CVBS VDAC	HDMI-TX</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+tv-connector {</div><div class='add'>+	compatible = "composite-video-connector";</div><div class='add'>+</div><div class='add'>+	port {</div><div class='add'>+		tv_connector_in: endpoint {</div><div class='add'>+			remote-endpoint = &lt;&amp;cvbs_vdac_out&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+vpu: vpu@d0100000 {</div><div class='add'>+	compatible = "amlogic,meson-gxbb-vpu";</div><div class='add'>+	reg = &lt;0x0 0xd0100000 0x0 0x100000&gt;,</div><div class='add'>+	      &lt;0x0 0xc883c000 0x0 0x1000&gt;,</div><div class='add'>+	      &lt;0x0 0xc8838000 0x0 0x1000&gt;;</div><div class='add'>+	reg-names = "vpu", "hhi", "dmc";</div><div class='add'>+	interrupts = &lt;GIC_SPI 3 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	/* CVBS VDAC output port */</div><div class='add'>+	port@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cvbs_vdac_out: endpoint {</div><div class='add'>+			remote-endpoint = &lt;&amp;tv_connector_in&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/arm,pl11x.txt b/Documentation/devicetree/bindings/display/arm,pl11x.txt<br/>index 3e3039a8a253..ef89ab46b2c9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/arm,pl11x.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/arm,pl11x.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/arm,pl11x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/arm,pl11x.txt</a></div><div class='hunk'>@@ -22,7 +22,7 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> - clocks: contains phandle and clock specifier pairs for the entries</div><div class='ctx'> 	in the clock-names property. See</div><div class='del'>-	Documentation/devicetree/binding/clock/clock-bindings.txt</div><div class='add'>+	Documentation/devicetree/bindings/clock/clock-bindings.txt</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt<br/>index a5ea451e67fc..34c7fddcea39 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt</a></div><div class='hunk'>@@ -43,12 +43,31 @@ Required properties for DPI:</div><div class='ctx'> - port:		Port node with a single endpoint connecting to the panel</div><div class='ctx'> 		  device, as defined in [1]</div><div class='ctx'> </div><div class='add'>+Required properties for VEC:</div><div class='add'>+- compatible:	Should be "brcm,bcm2835-vec"</div><div class='add'>+- reg:		Physical base address and length of the registers</div><div class='add'>+- clocks:	The core clock the unit runs on</div><div class='add'>+- interrupts:	The interrupt number</div><div class='add'>+		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt</div><div class='add'>+</div><div class='ctx'> Required properties for V3D:</div><div class='ctx'> - compatible:	Should be "brcm,bcm2835-v3d"</div><div class='ctx'> - reg:		Physical base address and length of the V3D's registers</div><div class='ctx'> - interrupts:	The interrupt number</div><div class='ctx'> 		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt</div><div class='ctx'> </div><div class='add'>+Required properties for DSI:</div><div class='add'>+- compatible:	Should be "brcm,bcm2835-dsi0" or "brcm,bcm2835-dsi1"</div><div class='add'>+- reg:		Physical base address and length of the DSI block's registers</div><div class='add'>+- interrupts:	The interrupt number</div><div class='add'>+		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt</div><div class='add'>+- clocks:	a) phy: The DSI PLL clock feeding the DSI analog PHY</div><div class='add'>+		b) escape: The DSI ESC clock from CPRMAN</div><div class='add'>+		c) pixel: The DSI pixel clock from CPRMAN</div><div class='add'>+- clock-output-names:</div><div class='add'>+		The 3 clocks output from the DSI analog PHY: dsi[01]_byte,</div><div class='add'>+		dsi[01]_ddr2, and dsi[01]_ddr</div><div class='add'>+</div><div class='ctx'> [1] Documentation/devicetree/bindings/media/video-interfaces.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='hunk'>@@ -92,6 +111,36 @@ dpi: dpi@7e208000 {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+dsi1: dsi@7e700000 {</div><div class='add'>+	compatible = "brcm,bcm2835-dsi1";</div><div class='add'>+	reg = &lt;0x7e700000 0x8c&gt;;</div><div class='add'>+	interrupts = &lt;2 12&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+	clocks = &lt;&amp;clocks BCM2835_PLLD_DSI1&gt;,</div><div class='add'>+		 &lt;&amp;clocks BCM2835_CLOCK_DSI1E&gt;,</div><div class='add'>+		 &lt;&amp;clocks BCM2835_CLOCK_DSI1P&gt;;</div><div class='add'>+	clock-names = "phy", "escape", "pixel";</div><div class='add'>+</div><div class='add'>+	clock-output-names = "dsi1_byte", "dsi1_ddr2", "dsi1_ddr";</div><div class='add'>+</div><div class='add'>+	pitouchscreen: panel@0 {</div><div class='add'>+		compatible = "raspberrypi,touchscreen";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		&lt;...&gt;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+vec: vec@7e806000 {</div><div class='add'>+	compatible = "brcm,bcm2835-vec";</div><div class='add'>+	reg = &lt;0x7e806000 0x1000&gt;;</div><div class='add'>+	clocks = &lt;&amp;clocks BCM2835_CLOCK_VEC&gt;;</div><div class='add'>+	interrupts = &lt;2 27&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> v3d: v3d@7ec00000 {</div><div class='ctx'> 	compatible = "brcm,bcm2835-v3d";</div><div class='ctx'> 	reg = &lt;0x7ec00000 0x1000&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt b/Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt<br/>index 6532a59c9b43..00ea670b8c4d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt</a></div><div class='hunk'>@@ -38,10 +38,22 @@ The following input format properties are required except in "rgb 1x" and</div><div class='ctx'> - adi,input-justification: The input bit justification ("left", "evenly",</div><div class='ctx'>   "right").</div><div class='ctx'> </div><div class='add'>+- avdd-supply: A 1.8V supply that powers up the AVDD pin on the chip.</div><div class='add'>+- dvdd-supply: A 1.8V supply that powers up the DVDD pin on the chip.</div><div class='add'>+- pvdd-supply: A 1.8V supply that powers up the PVDD pin on the chip.</div><div class='add'>+- dvdd-3v-supply: A 3.3V supply that powers up the pin called DVDD_3V</div><div class='add'>+  on the chip.</div><div class='add'>+- bgvdd-supply: A 1.8V supply that powers up the BGVDD pin. This is</div><div class='add'>+  needed only for ADV7511.</div><div class='add'>+</div><div class='ctx'> The following properties are required for ADV7533:</div><div class='ctx'> </div><div class='ctx'> - adi,dsi-lanes: Number of DSI data lanes connected to the DSI host. It should</div><div class='ctx'>   be one of 1, 2, 3 or 4.</div><div class='add'>+- a2vdd-supply: 1.8V supply that powers up the A2VDD pin on the chip.</div><div class='add'>+- v3p3-supply: A 3.3V supply that powers up the V3P3 pin on the chip.</div><div class='add'>+- v1p2-supply: A supply that powers up the V1P2 pin on the chip. It can be</div><div class='add'>+  either 1.2V or 1.8V.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt b/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt<br/>index 4a0f4f7682ad..0c7473dd0e51 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/bridge/analogix_dp.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/analogix_dp.txt</a></div><div class='hunk'>@@ -33,7 +33,7 @@ Optional properties for dp-controller:</div><div class='ctx'> 		in Documentation/devicetree/bindings/media/video-interfaces.txt,</div><div class='ctx'> 		please refer to the SoC specific binding document:</div><div class='ctx'> 		* Documentation/devicetree/bindings/display/exynos/exynos_dp.txt</div><div class='del'>-		* Documentation/devicetree/bindings/video/analogix_dp-rockchip.txt</div><div class='add'>+		* Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt</div><div class='ctx'> </div><div class='ctx'> [1]: Documentation/devicetree/bindings/media/video-interfaces.txt</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='head'>diff --git a/Documentation/devicetree/bindings/video/bridge/anx7814.txt b/Documentation/devicetree/bindings/display/bridge/anx7814.txt<br/>index b2a22c28c9b3..b2a22c28c9b3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/video/bridge/anx7814.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/video/bridge/anx7814.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/anx7814.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/anx7814.txt</a></div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt b/Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt<br/>index 003bc246a270..164cbb15f04c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt</a></div><div class='hunk'>@@ -16,6 +16,8 @@ graph bindings specified in Documentation/devicetree/bindings/graph.txt.</div><div class='ctx'> - Video port 0 for RGB input</div><div class='ctx'> - Video port 1 for VGA output</div><div class='ctx'> </div><div class='add'>+Optional properties:</div><div class='add'>+- vdd-supply: Power supply for DAC</div><div class='ctx'> </div><div class='ctx'> Example</div><div class='ctx'> -------</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt b/Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt<br/>index dc1452f0d5d8..33bf981fbe33 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt</a></div><div class='hunk'>@@ -1,50 +1,33 @@</div><div class='del'>-DesignWare HDMI bridge bindings</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-- compatible: platform specific such as:</div><div class='del'>-   * "snps,dw-hdmi-tx"</div><div class='del'>-   * "fsl,imx6q-hdmi"</div><div class='del'>-   * "fsl,imx6dl-hdmi"</div><div class='del'>-   * "rockchip,rk3288-dw-hdmi"</div><div class='del'>-- reg: Physical base address and length of the controller's registers.</div><div class='del'>-- interrupts: The HDMI interrupt number</div><div class='del'>-- clocks, clock-names : must have the phandles to the HDMI iahb and isfr clocks,</div><div class='del'>-  as described in Documentation/devicetree/bindings/clock/clock-bindings.txt,</div><div class='del'>-  the clocks are soc specific, the clock-names should be "iahb", "isfr"</div><div class='del'>--port@[X]: SoC specific port nodes with endpoint definitions as defined</div><div class='del'>-   in Documentation/devicetree/bindings/media/video-interfaces.txt,</div><div class='del'>-   please refer to the SoC specific binding document:</div><div class='del'>-    * Documentation/devicetree/bindings/display/imx/hdmi.txt</div><div class='del'>-    * Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt</div><div class='del'>-</div><div class='del'>-Optional properties</div><div class='del'>-- reg-io-width: the width of the reg:1,4, default set to 1 if not present</div><div class='del'>-- ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing</div><div class='del'>-- clocks, clock-names: phandle to the HDMI CEC clock, name should be "cec"</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-	hdmi: hdmi@0120000 {</div><div class='del'>-		compatible = "fsl,imx6q-hdmi";</div><div class='del'>-		reg = &lt;0x00120000 0x9000&gt;;</div><div class='del'>-		interrupts = &lt;0 115 0x04&gt;;</div><div class='del'>-		gpr = &lt;&amp;gpr&gt;;</div><div class='del'>-		clocks = &lt;&amp;clks 123&gt;, &lt;&amp;clks 124&gt;;</div><div class='del'>-		clock-names = "iahb", "isfr";</div><div class='del'>-		ddc-i2c-bus = &lt;&amp;i2c2&gt;;</div><div class='del'>-</div><div class='del'>-		port@0 {</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-			hdmi_mux_0: endpoint {</div><div class='del'>-				remote-endpoint = &lt;&amp;ipu1_di0_hdmi&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		port@1 {</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-			hdmi_mux_1: endpoint {</div><div class='del'>-				remote-endpoint = &lt;&amp;ipu1_di1_hdmi&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='add'>+Synopsys DesignWare HDMI TX Encoder</div><div class='add'>+===================================</div><div class='add'>+</div><div class='add'>+This document defines device tree properties for the Synopsys DesignWare HDMI</div><div class='add'>+TX Encoder (DWC HDMI TX). It doesn't constitue a device tree binding</div><div class='add'>+specification by itself but is meant to be referenced by platform-specific</div><div class='add'>+device tree bindings.</div><div class='add'>+</div><div class='add'>+When referenced from platform device tree bindings the properties defined in</div><div class='add'>+this document are defined as follows. The platform device tree bindings are</div><div class='add'>+responsible for defining whether each property is required or optional.</div><div class='add'>+</div><div class='add'>+- reg: Memory mapped base address and length of the DWC HDMI TX registers.</div><div class='add'>+</div><div class='add'>+- reg-io-width: Width of the registers specified by the reg property. The</div><div class='add'>+  value is expressed in bytes and must be equal to 1 or 4 if specified. The</div><div class='add'>+  register width defaults to 1 if the property is not present.</div><div class='add'>+</div><div class='add'>+- interrupts: Reference to the DWC HDMI TX interrupt.</div><div class='add'>+</div><div class='add'>+- clocks: References to all the clocks specified in the clock-names property</div><div class='add'>+  as specified in Documentation/devicetree/bindings/clock/clock-bindings.txt.</div><div class='add'>+</div><div class='add'>+- clock-names: The DWC HDMI TX uses the following clocks.</div><div class='add'>+</div><div class='add'>+  - "iahb" is the bus clock for either AHB and APB (mandatory).</div><div class='add'>+  - "isfr" is the internal register configuration clock (mandatory).</div><div class='add'>+  - "cec" is the HDMI CEC controller main clock (optional).</div><div class='add'>+</div><div class='add'>+- ports: The connectivity of the DWC HDMI TX with the rest of the system is</div><div class='add'>+  expressed in using ports as specified in the device graph bindings defined</div><div class='add'>+  in Documentation/devicetree/bindings/graph.txt. The numbering of the ports</div><div class='add'>+  is platform-specific.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/bridge/sil-sii8620.txt b/Documentation/devicetree/bindings/display/bridge/sil-sii8620.txt<br/>new file mode 100644<br/>index 000000000000..9409d9c6a260<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/sil-sii8620.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/sil-sii8620.txt</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+Silicon Image SiI8620 HDMI/MHL bridge bindings</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+	- compatible: "sil,sii8620"</div><div class='add'>+	- reg: i2c address of the bridge</div><div class='add'>+	- cvcc10-supply: Digital Core Supply Voltage (1.0V)</div><div class='add'>+	- iovcc18-supply: I/O Supply Voltage (1.8V)</div><div class='add'>+	- interrupts, interrupt-parent: interrupt specifier of INT pin</div><div class='add'>+	- reset-gpios: gpio specifier of RESET pin</div><div class='add'>+	- clocks, clock-names: specification and name of "xtal" clock</div><div class='add'>+	- video interfaces: Device node can contain video interface port</div><div class='add'>+			    node for HDMI encoder according to [1].</div><div class='add'>+</div><div class='add'>+[1]: Documentation/devicetree/bindings/media/video-interfaces.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	sii8620@39 {</div><div class='add'>+		reg = &lt;0x39&gt;;</div><div class='add'>+		compatible = "sil,sii8620";</div><div class='add'>+		cvcc10-supply = &lt;&amp;ldo36_reg&gt;;</div><div class='add'>+		iovcc18-supply = &lt;&amp;ldo34_reg&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpf0&gt;;</div><div class='add'>+		interrupts = &lt;2 0&gt;;</div><div class='add'>+		reset-gpio = &lt;&amp;gpv7 0 0&gt;;</div><div class='add'>+		clocks = &lt;&amp;pmu_system_controller 0&gt;;</div><div class='add'>+		clock-names = "xtal";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			mhl_to_hdmi: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;hdmi_to_mhl&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt b/Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt<br/>new file mode 100644<br/>index 000000000000..54d7e31525ec<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+TFP410 DPI to DVI encoder</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: "ti,tfp410"</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- powerdown-gpios: power-down gpio</div><div class='add'>+- reg: I2C address. If and only if present the device node</div><div class='add'>+       should be placed into the i2c controller node where the</div><div class='add'>+       tfp410 i2c is connected to.</div><div class='add'>+</div><div class='add'>+Required nodes:</div><div class='add'>+- Video port 0 for DPI input [1].</div><div class='add'>+- Video port 1 for DVI output [1].</div><div class='add'>+</div><div class='add'>+[1]: Documentation/devicetree/bindings/media/video-interfaces.txt</div><div class='add'>+</div><div class='add'>+Example</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+tfp410: encoder@0 {</div><div class='add'>+	compatible = "ti,tfp410";</div><div class='add'>+	powerdown-gpios = &lt;&amp;twl_gpio 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+</div><div class='add'>+	ports {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		port@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			tfp410_in: endpoint@0 {</div><div class='add'>+				remote-endpoint = &lt;&amp;dpi_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port@1 {</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			tfp410_out: endpoint@0 {</div><div class='add'>+				remote-endpoint = &lt;&amp;dvi_connector_in&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt b/Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt<br/>new file mode 100644<br/>index 000000000000..6ec1a880ac18<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+THS8135 Video DAC</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+This is the binding for Texas Instruments THS8135 Video DAC bridge.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: Must be "ti,ths8135"</div><div class='add'>+</div><div class='add'>+Required nodes:</div><div class='add'>+</div><div class='add'>+This device has two video ports. Their connections are modelled using the OF</div><div class='add'>+graph bindings specified in Documentation/devicetree/bindings/graph.txt.</div><div class='add'>+</div><div class='add'>+- Video port 0 for RGB input</div><div class='add'>+- Video port 1 for VGA output</div><div class='add'>+</div><div class='add'>+Example</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+vga-bridge {</div><div class='add'>+	compatible = "ti,ths8135";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	ports {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		port@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			vga_bridge_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;lcdc_out_vga&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port@1 {</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			vga_bridge_out: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;vga_con_in&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt b/Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt<br/>index e9c65746e2f1..b0e506610400 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt</a></div><div class='hunk'>@@ -6,7 +6,7 @@ Required properties:</div><div class='ctx'>               location and size of the framebuffer memory.</div><div class='ctx'> - clocks    : phandle + clock specifier pair of the FB reference clock.</div><div class='ctx'> - display   : phandle to a display node as described in</div><div class='del'>-              Documentation/devicetree/bindings/display/display-timing.txt.</div><div class='add'>+              Documentation/devicetree/bindings/display/panel/display-timing.txt.</div><div class='ctx'>               Additionally, the display node has to define properties:</div><div class='ctx'>   - bits-per-pixel: Bits per pixel.</div><div class='ctx'>   - ac-prescale   : LCD AC bias frequency. This frequency is the required</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt b/Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt<br/>index 3938caacf11c..9e2e7f6f7609 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt</a></div><div class='hunk'>@@ -33,12 +33,12 @@ Required properties:</div><div class='ctx'> - i80-if-timings: timing configuration for lcd i80 interface support.</div><div class='ctx'> </div><div class='ctx'> Optional Properties:</div><div class='del'>-- samsung,power-domain: a phandle to DECON power domain node.</div><div class='add'>+- power-domains: a phandle to DECON power domain node.</div><div class='ctx'> - display-timings: timing settings for DECON, as described in document [1].</div><div class='ctx'> 		Can be used in case timings cannot be provided otherwise</div><div class='ctx'> 		or to override timings provided by the panel.</div><div class='ctx'> </div><div class='del'>-[1]: Documentation/devicetree/bindings/display/display-timing.txt</div><div class='add'>+[1]: Documentation/devicetree/bindings/display/panel/display-timing.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt b/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt<br/>index c7c6b9af87ac..18645e0228b0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt</a></div><div class='hunk'>@@ -83,7 +83,7 @@ in [2]. The following are properties specific to those nodes:</div><div class='ctx'> 		3 - for parallel output,</div><div class='ctx'> 		4 - for write-back interface</div><div class='ctx'> </div><div class='del'>-[1]: Documentation/devicetree/bindings/display/display-timing.txt</div><div class='add'>+[1]: Documentation/devicetree/bindings/display/panel/display-timing.txt</div><div class='ctx'> [2]: Documentation/devicetree/bindings/media/video-interfaces.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt b/Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt<br/>index 38dc9d60eef8..305a0e72a900 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt</a></div><div class='hunk'>@@ -16,7 +16,7 @@ Required properties:</div><div class='ctx'>   "clk_ade_core" for the ADE core clock.</div><div class='ctx'>   "clk_codec_jpeg" for the media NOC QoS clock, which use the same clock with</div><div class='ctx'>   jpeg codec.</div><div class='del'>-  "clk_ade_pix" for the ADE pixel clok.</div><div class='add'>+  "clk_ade_pix" for the ADE pixel clock.</div><div class='ctx'> - assigned-clocks: Should contain "clk_ade_core" and "clk_codec_jpeg" clocks'</div><div class='ctx'>   phandle + clock-specifier pairs.</div><div class='ctx'> - assigned-clock-rates: clock rates, one for each entry in assigned-clocks.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/ht16k33.txt b/Documentation/devicetree/bindings/display/ht16k33.txt<br/>new file mode 100644<br/>index 000000000000..8e5b30b87754<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/ht16k33.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/ht16k33.txt</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+Holtek ht16k33 RAM mapping 16*8 LED controller driver with keyscan</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:		"holtek,ht16k33"</div><div class='add'>+- reg:			I2C slave address of the chip.</div><div class='add'>+- interrupt-parent:	A phandle pointing to the interrupt controller</div><div class='add'>+			serving the interrupt for this chip.</div><div class='add'>+- interrupts:		Interrupt specification for the key pressed interrupt.</div><div class='add'>+- refresh-rate-hz:	Display update interval in HZ.</div><div class='add'>+- debounce-delay-ms:	Debouncing interval time in milliseconds.</div><div class='add'>+- linux,keymap: 	The keymap for keys as described in the binding</div><div class='add'>+			document (devicetree/bindings/input/matrix-keymap.txt).</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- linux,no-autorepeat:	Disable keyrepeat.</div><div class='add'>+- default-brightness-level: Initial brightness level [0-15] (default: 15).</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	ht16k33: ht16k33@70 {</div><div class='add'>+		compatible = "holtek,ht16k33";</div><div class='add'>+		reg = &lt;0x70&gt;;</div><div class='add'>+		refresh-rate-hz = &lt;20&gt;;</div><div class='add'>+		debounce-delay-ms = &lt;50&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio4&gt;;</div><div class='add'>+		interrupts = &lt;5 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)&gt;;</div><div class='add'>+		linux,keymap = &lt;</div><div class='add'>+			MATRIX_KEY(2, 0, KEY_F6)</div><div class='add'>+			MATRIX_KEY(3, 0, KEY_F8)</div><div class='add'>+			MATRIX_KEY(4, 0, KEY_F10)</div><div class='add'>+			MATRIX_KEY(5, 0, KEY_F4)</div><div class='add'>+			MATRIX_KEY(6, 0, KEY_F2)</div><div class='add'>+			MATRIX_KEY(2, 1, KEY_F5)</div><div class='add'>+			MATRIX_KEY(3, 1, KEY_F7)</div><div class='add'>+			MATRIX_KEY(4, 1, KEY_F9)</div><div class='add'>+			MATRIX_KEY(5, 1, KEY_F3)</div><div class='add'>+			MATRIX_KEY(6, 1, KEY_F1)</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt b/Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt<br/>index 00d5f8ea7ec6..7a5c0e204c8e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt</a></div><div class='hunk'>@@ -9,7 +9,7 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> Required nodes:</div><div class='ctx'> - display: Phandle to a display node as described in</div><div class='del'>-	Documentation/devicetree/bindings/display/display-timing.txt</div><div class='add'>+	Documentation/devicetree/bindings/display/panel/display-timing.txt</div><div class='ctx'> 	Additional, the display node has to define properties:</div><div class='ctx'> 	- bits-per-pixel: Bits per pixel</div><div class='ctx'> 	- fsl,pcr: LCDC PCR value</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/imx/hdmi.txt b/Documentation/devicetree/bindings/display/imx/hdmi.txt<br/>index 1b756cf9afb0..66a8f86e5d12 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/imx/hdmi.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/imx/hdmi.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/imx/hdmi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/imx/hdmi.txt</a></div><div class='hunk'>@@ -1,29 +1,36 @@</div><div class='del'>-Device-Tree bindings for HDMI Transmitter</div><div class='add'>+Freescale i.MX6 DWC HDMI TX Encoder</div><div class='add'>+===================================</div><div class='ctx'> </div><div class='del'>-HDMI Transmitter</div><div class='del'>-================</div><div class='add'>+The HDMI transmitter is a Synopsys DesignWare HDMI 1.4 TX controller IP</div><div class='add'>+with a companion PHY IP.</div><div class='add'>+</div><div class='add'>+These DT bindings follow the Synopsys DWC HDMI TX bindings defined in</div><div class='add'>+Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt with the</div><div class='add'>+following device-specific properties.</div><div class='ctx'> </div><div class='del'>-The HDMI Transmitter is a Synopsys DesignWare HDMI 1.4 TX controller IP</div><div class='del'>-with accompanying PHY IP.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>- - #address-cells : should be &lt;1&gt;</div><div class='del'>- - #size-cells : should be &lt;0&gt;</div><div class='del'>- - compatible : should be "fsl,imx6q-hdmi" or "fsl,imx6dl-hdmi".</div><div class='del'>- - gpr : should be &lt;&amp;gpr&gt;.</div><div class='del'>-   The phandle points to the iomuxc-gpr region containing the HDMI</div><div class='del'>-   multiplexer control register.</div><div class='del'>- - clocks, clock-names : phandles to the HDMI iahb and isrf clocks, as described</div><div class='del'>-   in Documentation/devicetree/bindings/clock/clock-bindings.txt and</div><div class='del'>-   Documentation/devicetree/bindings/clock/imx6q-clock.txt.</div><div class='del'>- - port@[0-4]: Up to four port nodes with endpoint definitions as defined in</div><div class='del'>-   Documentation/devicetree/bindings/media/video-interfaces.txt,</div><div class='del'>-   corresponding to the four inputs to the HDMI multiplexer.</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>- - ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing</div><div class='del'>-</div><div class='del'>-example:</div><div class='add'>+</div><div class='add'>+- compatible : Shall be one of "fsl,imx6q-hdmi" or "fsl,imx6dl-hdmi".</div><div class='add'>+- reg: See dw_hdmi.txt.</div><div class='add'>+- interrupts: HDMI interrupt number</div><div class='add'>+- clocks: See dw_hdmi.txt.</div><div class='add'>+- clock-names: Shall contain "iahb" and "isfr" as defined in dw_hdmi.txt.</div><div class='add'>+- ports: See dw_hdmi.txt. The DWC HDMI shall have between one and four ports,</div><div class='add'>+  numbered 0 to 3, corresponding to the four inputs of the HDMI multiplexer.</div><div class='add'>+  Each port shall have a single endpoint.</div><div class='add'>+- gpr : Shall contain a phandle to the iomuxc-gpr region containing the HDMI</div><div class='add'>+  multiplexer control register.</div><div class='add'>+</div><div class='add'>+Optional properties</div><div class='add'>+</div><div class='add'>+- ddc-i2c-bus: The HDMI DDC bus can be connected to either a system I2C master</div><div class='add'>+  or the functionally-reduced I2C master contained in the DWC HDMI. When</div><div class='add'>+  connected to a system I2C master this property contains a phandle to that</div><div class='add'>+  I2C master controller.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='ctx'> </div><div class='ctx'> 	gpr: iomuxc-gpr@020e0000 {</div><div class='ctx'> 		/* ... */</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/imx/ldb.txt b/Documentation/devicetree/bindings/display/imx/ldb.txt<br/>index a407462c885e..38c637fa39dd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/imx/ldb.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/imx/ldb.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/imx/ldb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/imx/ldb.txt</a></div><div class='hunk'>@@ -64,7 +64,7 @@ Required properties:</div><div class='ctx'> Optional properties (required if display-timings are used):</div><div class='ctx'>  - ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing</div><div class='ctx'>  - display-timings : A node that describes the display timings as defined in</div><div class='del'>-   Documentation/devicetree/bindings/display/display-timing.txt.</div><div class='add'>+   Documentation/devicetree/bindings/display/panel/display-timing.txt.</div><div class='ctx'>  - fsl,data-mapping : should be "spwg" or "jeida"</div><div class='ctx'>                       This describes how the color bits are laid out in the</div><div class='ctx'>                       serialized LVDS signal.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt<br/>index db6e77edbea8..708f5664a316 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt</a></div><div class='hunk'>@@ -55,7 +55,7 @@ Required properties (DMA function blocks):</div><div class='ctx'> 	"mediatek,&lt;chip&gt;-disp-rdma"</div><div class='ctx'> 	"mediatek,&lt;chip&gt;-disp-wdma"</div><div class='ctx'> - larb: Should contain a phandle pointing to the local arbiter device as defined</div><div class='del'>-  in Documentation/devicetree/bindings/soc/mediatek/mediatek,smi-larb.txt</div><div class='add'>+  in Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt</div><div class='ctx'> - iommus: Should point to the respective IOMMU block with master port as</div><div class='ctx'>   argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt</div><div class='ctx'>   for details.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/msm/dsi.txt b/Documentation/devicetree/bindings/display/msm/dsi.txt<br/>index 6b1cab17f52d..fa00e62e1cf6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/msm/dsi.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/msm/dsi.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/msm/dsi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/msm/dsi.txt</a></div><div class='hunk'>@@ -108,7 +108,7 @@ Optional properties:</div><div class='ctx'> - qcom,dsi-phy-regulator-ldo-mode: Boolean value indicating if the LDO mode PHY</div><div class='ctx'>   regulator is wanted.</div><div class='ctx'> </div><div class='del'>-[1] Documentation/devicetree/bindings/clocks/clock-bindings.txt</div><div class='add'>+[1] Documentation/devicetree/bindings/clock/clock-bindings.txt</div><div class='ctx'> [2] Documentation/devicetree/bindings/graph.txt</div><div class='ctx'> [3] Documentation/devicetree/bindings/media/video-interfaces.txt</div><div class='ctx'> [4] Documentation/devicetree/bindings/display/panel/</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/msm/edp.txt b/Documentation/devicetree/bindings/display/msm/edp.txt<br/>index 3a20f6ea5898..e63032be5401 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/msm/edp.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/msm/edp.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/msm/edp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/msm/edp.txt</a></div><div class='hunk'>@@ -10,7 +10,7 @@ Required properties:</div><div class='ctx'> - interrupts: The interrupt signal from the eDP block.</div><div class='ctx'> - power-domains: Should be &lt;&amp;mmcc MDSS_GDSC&gt;.</div><div class='ctx'> - clocks: device clocks</div><div class='del'>-  See Documentation/devicetree/bindings/clocks/clock-bindings.txt for details.</div><div class='add'>+  See Documentation/devicetree/bindings/clock/clock-bindings.txt for details.</div><div class='ctx'> - clock-names: the following clocks are required:</div><div class='ctx'>   * "core_clk"</div><div class='ctx'>   * "iface_clk"</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/msm/gpu.txt b/Documentation/devicetree/bindings/display/msm/gpu.txt<br/>index 67d0a58dbb77..43fac0fe09bb 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/msm/gpu.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/msm/gpu.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/msm/gpu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/msm/gpu.txt</a></div><div class='hunk'>@@ -1,23 +1,19 @@</div><div class='ctx'> Qualcomm adreno/snapdragon GPU</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: "qcom,adreno-3xx"</div><div class='add'>+- compatible: "qcom,adreno-XYZ.W", "qcom,adreno"</div><div class='add'>+    for example: "qcom,adreno-306.0", "qcom,adreno"</div><div class='add'>+  Note that you need to list the less specific "qcom,adreno" (since this</div><div class='add'>+  is what the device is matched on), in addition to the more specific</div><div class='add'>+  with the chip-id.</div><div class='ctx'> - reg: Physical base address and length of the controller's registers.</div><div class='ctx'> - interrupts: The interrupt signal from the gpu.</div><div class='ctx'> - clocks: device clocks</div><div class='ctx'>   See ../clocks/clock-bindings.txt for details.</div><div class='ctx'> - clock-names: the following clocks are required:</div><div class='del'>-  * "core_clk"</div><div class='del'>-  * "iface_clk"</div><div class='del'>-  * "mem_iface_clk"</div><div class='del'>-- qcom,chipid: gpu chip-id.  Note this may become optional for future</div><div class='del'>-  devices if we can reliably read the chipid from hw</div><div class='del'>-- qcom,gpu-pwrlevels: list of operating points</div><div class='del'>-  - compatible: "qcom,gpu-pwrlevels"</div><div class='del'>-  - for each qcom,gpu-pwrlevel:</div><div class='del'>-    - qcom,gpu-freq: requested gpu clock speed</div><div class='del'>-    - NOTE: downstream android driver defines additional parameters to</div><div class='del'>-      configure memory bandwidth scaling per OPP.</div><div class='add'>+  * "core"</div><div class='add'>+  * "iface"</div><div class='add'>+  * "mem_iface"</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='hunk'>@@ -25,28 +21,18 @@ Example:</div><div class='ctx'> 	...</div><div class='ctx'> </div><div class='ctx'> 	gpu: qcom,kgsl-3d0@4300000 {</div><div class='del'>-		compatible = "qcom,adreno-3xx";</div><div class='add'>+		compatible = "qcom,adreno-320.2", "qcom,adreno";</div><div class='ctx'> 		reg = &lt;0x04300000 0x20000&gt;;</div><div class='ctx'> 		reg-names = "kgsl_3d0_reg_memory";</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 80 0&gt;;</div><div class='ctx'> 		interrupt-names = "kgsl_3d0_irq";</div><div class='ctx'> 		clock-names =</div><div class='del'>-		    "core_clk",</div><div class='del'>-		    "iface_clk",</div><div class='del'>-		    "mem_iface_clk";</div><div class='add'>+		    "core",</div><div class='add'>+		    "iface",</div><div class='add'>+		    "mem_iface";</div><div class='ctx'> 		clocks =</div><div class='ctx'> 		    &lt;&amp;mmcc GFX3D_CLK&gt;,</div><div class='ctx'> 		    &lt;&amp;mmcc GFX3D_AHB_CLK&gt;,</div><div class='ctx'> 		    &lt;&amp;mmcc MMSS_IMEM_AHB_CLK&gt;;</div><div class='del'>-		qcom,chipid = &lt;0x03020100&gt;;</div><div class='del'>-		qcom,gpu-pwrlevels {</div><div class='del'>-			compatible = "qcom,gpu-pwrlevels";</div><div class='del'>-			qcom,gpu-pwrlevel@0 {</div><div class='del'>-				qcom,gpu-freq = &lt;450000000&gt;;</div><div class='del'>-			};</div><div class='del'>-			qcom,gpu-pwrlevel@1 {</div><div class='del'>-				qcom,gpu-freq = &lt;27000000&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/msm/hdmi.txt b/Documentation/devicetree/bindings/display/msm/hdmi.txt<br/>index 2ad578984fcf..2d306f402d18 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/msm/hdmi.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/msm/hdmi.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/msm/hdmi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/msm/hdmi.txt</a></div><div class='hunk'>@@ -49,7 +49,7 @@ Required properties:</div><div class='ctx'>     * "hdmi_tx_l4"</div><div class='ctx'> - power-domains: Should be &lt;&amp;mmcc MDSS_GDSC&gt;.</div><div class='ctx'> - clocks: device clocks</div><div class='del'>-  See Documentation/devicetree/bindings/clocks/clock-bindings.txt for details.</div><div class='add'>+  See Documentation/devicetree/bindings/clock/clock-bindings.txt for details.</div><div class='ctx'> - core-vdda-supply: phandle to vdda regulator device node</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt b/Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt<br/>new file mode 100644<br/>index 000000000000..eed48c3d4875<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+Multi-Inno MI0283QT display panel</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:	"multi-inno,mi0283qt".</div><div class='add'>+</div><div class='add'>+The node for this driver must be a child node of a SPI controller, hence</div><div class='add'>+all mandatory properties described in ../spi/spi-bus.txt must be specified.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- dc-gpios:	D/C pin. The presence/absence of this GPIO determines</div><div class='add'>+		the panel interface mode (IM[3:0] pins):</div><div class='add'>+		- present: IM=x110 4-wire 8-bit data serial interface</div><div class='add'>+		- absent:  IM=x101 3-wire 9-bit data serial interface</div><div class='add'>+- reset-gpios:	Reset pin</div><div class='add'>+- power-supply:	A regulator node for the supply voltage.</div><div class='add'>+- backlight:	phandle of the backlight device attached to the panel</div><div class='add'>+- rotation:	panel rotation in degrees counter clockwise (0,90,180,270)</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	mi0283qt@0{</div><div class='add'>+		compatible = "multi-inno,mi0283qt";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;32000000&gt;;</div><div class='add'>+		rotation = &lt;90&gt;;</div><div class='add'>+		dc-gpios = &lt;&amp;gpio 25 0&gt;;</div><div class='add'>+		backlight = &lt;&amp;backlight&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/mxsfb.txt b/Documentation/devicetree/bindings/display/mxsfb.txt<br/>index 96ec5179c8a0..472e1ea6c591 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/mxsfb.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/mxsfb.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/mxsfb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/mxsfb.txt</a></div><div class='hunk'>@@ -1,20 +1,57 @@</div><div class='ctx'> * Freescale MXS LCD Interface (LCDIF)</div><div class='ctx'> </div><div class='add'>+New bindings:</div><div class='add'>+=============</div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Should be "fsl,&lt;chip&gt;-lcdif".  Supported chips include</div><div class='del'>-  imx23 and imx28.</div><div class='del'>-- reg: Address and length of the register set for lcdif</div><div class='del'>-- interrupts: Should contain lcdif interrupts</div><div class='del'>-- display : phandle to display node (see below for details)</div><div class='add'>+- compatible:	Should be "fsl,imx23-lcdif" for i.MX23.</div><div class='add'>+		Should be "fsl,imx28-lcdif" for i.MX28.</div><div class='add'>+		Should be "fsl,imx6sx-lcdif" for i.MX6SX.</div><div class='add'>+- reg:		Address and length of the register set for LCDIF</div><div class='add'>+- interrupts:	Should contain LCDIF interrupt</div><div class='add'>+- clocks:	A list of phandle + clock-specifier pairs, one for each</div><div class='add'>+		entry in 'clock-names'.</div><div class='add'>+- clock-names:	A list of clock names. For MXSFB it should contain:</div><div class='add'>+    - "pix" for the LCDIF block clock</div><div class='add'>+    - (MX6SX-only) "axi", "disp_axi" for the bus interface clock</div><div class='add'>+</div><div class='add'>+Required sub-nodes:</div><div class='add'>+  - port: The connection to an encoder chip.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	lcdif1: display-controller@2220000 {</div><div class='add'>+		compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";</div><div class='add'>+		reg = &lt;0x02220000 0x4000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clks IMX6SX_CLK_LCDIF1_PIX&gt;,</div><div class='add'>+			 &lt;&amp;clks IMX6SX_CLK_LCDIF_APB&gt;,</div><div class='add'>+			 &lt;&amp;clks IMX6SX_CLK_DISPLAY_AXI&gt;;</div><div class='add'>+		clock-names = "pix", "axi", "disp_axi";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			parallel_out: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;panel_in_parallel&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Deprecated bindings:</div><div class='add'>+====================</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:	Should be "fsl,imx23-lcdif" for i.MX23.</div><div class='add'>+		Should be "fsl,imx28-lcdif" for i.MX28.</div><div class='add'>+- reg:		Address and length of the register set for LCDIF</div><div class='add'>+- interrupts:	Should contain LCDIF interrupts</div><div class='add'>+- display:	phandle to display node (see below for details)</div><div class='ctx'> </div><div class='ctx'> * display node</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- bits-per-pixel : &lt;16&gt; for RGB565, &lt;32&gt; for RGB888/666.</div><div class='del'>-- bus-width : number of data lines.  Could be &lt;8&gt;, &lt;16&gt;, &lt;18&gt; or &lt;24&gt;.</div><div class='add'>+- bits-per-pixel:	&lt;16&gt; for RGB565, &lt;32&gt; for RGB888/666.</div><div class='add'>+- bus-width:		number of data lines.  Could be &lt;8&gt;, &lt;16&gt;, &lt;18&gt; or &lt;24&gt;.</div><div class='ctx'> </div><div class='ctx'> Required sub-node:</div><div class='del'>-- display-timings : Refer to binding doc display-timing.txt for details.</div><div class='add'>+- display-timings:	Refer to binding doc display-timing.txt for details.</div><div class='ctx'> </div><div class='ctx'> Examples:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/auo,g133han01.txt b/Documentation/devicetree/bindings/display/panel/auo,g133han01.txt<br/>new file mode 100644<br/>index 000000000000..3afc76747824<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/auo,g133han01.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/auo,g133han01.txt</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+AU Optronics Corporation 13.3" FHD (1920x1080) TFT LCD panel</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "auo,g133han01"</div><div class='add'>+</div><div class='add'>+This binding is compatible with the simple-panel binding, which is specified</div><div class='add'>+in simple-panel.txt in this directory.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/auo,g185han01.txt b/Documentation/devicetree/bindings/display/panel/auo,g185han01.txt<br/>new file mode 100644<br/>index 000000000000..ed657c2141d4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/auo,g185han01.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/auo,g185han01.txt</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+AU Optronics Corporation 18.5" FHD (1920x1080) TFT LCD panel</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "auo,g185han01"</div><div class='add'>+</div><div class='add'>+This binding is compatible with the simple-panel binding, which is specified</div><div class='add'>+in simple-panel.txt in this directory.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/auo,t215hvn01.txt b/Documentation/devicetree/bindings/display/panel/auo,t215hvn01.txt<br/>new file mode 100644<br/>index 000000000000..cbd9da3f03b1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/auo,t215hvn01.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/auo,t215hvn01.txt</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+AU Optronics Corporation 21.5" FHD (1920x1080) color TFT LCD panel</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "auo,t215hvn01"</div><div class='add'>+</div><div class='add'>+This binding is compatible with the simple-panel binding, which is specified</div><div class='add'>+in simple-panel.txt in this directory.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt b/Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt<br/>new file mode 100644<br/>index 000000000000..b258d6a91ec6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+BOE OPTOELECTRONICS TECHNOLOGY 10.1" WXGA TFT LCD panel</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "boe,nv101wxmn51"</div><div class='add'>+</div><div class='add'>+This binding is compatible with the simple-panel binding, which is specified</div><div class='add'>+in simple-panel.txt in this directory.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/chunghwa,claa070wp03xg.txt b/Documentation/devicetree/bindings/display/panel/chunghwa,claa070wp03xg.txt<br/>new file mode 100644<br/>index 000000000000..dd22685d2adc<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/chunghwa,claa070wp03xg.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/chunghwa,claa070wp03xg.txt</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+Chunghwa Picture Tubes Ltd. 7" WXGA TFT LCD panel</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "chunghwa,claa070wp03xg"</div><div class='add'>+</div><div class='add'>+This binding is compatible with the simple-panel binding, which is specified</div><div class='add'>+in simple-panel.txt in this directory.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/display-timing.txt b/Documentation/devicetree/bindings/display/panel/display-timing.txt<br/>index e1d4a0b59612..81a75893d1b8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/display-timing.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/panel/display-timing.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/display-timing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/display-timing.txt</a></div><div class='hunk'>@@ -32,6 +32,14 @@ optional properties:</div><div class='ctx'> 			- active low  = drive pixel data on falling edge/</div><div class='ctx'> 					sample data on rising edge</div><div class='ctx'> 			- ignored     = ignored</div><div class='add'>+ - syncclk-active: with</div><div class='add'>+			- active high = drive sync on rising edge/</div><div class='add'>+					sample sync on falling edge of pixel</div><div class='add'>+					clock</div><div class='add'>+			- active low  = drive sync on falling edge/</div><div class='add'>+					sample sync on rising edge of pixel</div><div class='add'>+					clock</div><div class='add'>+			- omitted     = same configuration as pixelclk-active</div><div class='ctx'>  - interlaced (bool): boolean to enable interlaced mode</div><div class='ctx'>  - doublescan (bool): boolean to enable doublescan mode</div><div class='ctx'>  - doubleclk (bool): boolean to enable doubleclock mode</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt b/Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt<br/>new file mode 100644<br/>index 000000000000..c6d06b5eab51<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+Netron-DY E231732 7.0" WSVGA TFT LCD panel</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "netron-dy,e231732"</div><div class='add'>+</div><div class='add'>+This binding is compatible with the simple-panel binding, which is specified</div><div class='add'>+in simple-panel.txt in this directory.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/nvd,9128.txt b/Documentation/devicetree/bindings/display/panel/nvd,9128.txt<br/>new file mode 100644<br/>index 000000000000..17bcd017c678<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/nvd,9128.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/nvd,9128.txt</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+New Vision Display 7.0" 800 RGB x 480 TFT LCD panel</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "nvd,9128"</div><div class='add'>+</div><div class='add'>+This binding is compatible with the simple-panel binding, which is specified</div><div class='add'>+in simple-panel.txt in this directory.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/panel-dpi.txt b/Documentation/devicetree/bindings/display/panel/panel-dpi.txt<br/>index b52ac52757df..d4add13e592d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/panel-dpi.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/panel/panel-dpi.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/panel-dpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/panel-dpi.txt</a></div><div class='hunk'>@@ -12,7 +12,7 @@ Optional properties:</div><div class='ctx'> </div><div class='ctx'> Required nodes:</div><div class='ctx'> - "panel-timing" containing video timings</div><div class='del'>-  (Documentation/devicetree/bindings/display/display-timing.txt)</div><div class='add'>+  (Documentation/devicetree/bindings/display/panel/display-timing.txt)</div><div class='ctx'> - Video port for DPI input</div><div class='ctx'> </div><div class='ctx'> Example</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/panel.txt b/Documentation/devicetree/bindings/display/panel/panel.txt<br/>new file mode 100644<br/>index 000000000000..e2e6867852b8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/panel.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/panel.txt</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+Common display properties</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+- rotation:	Display rotation in degrees counter clockwise (0,90,180,270)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt b/Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt<br/>index fc595d9b985b..354d4d1df4ff 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt</a></div><div class='hunk'>@@ -20,7 +20,7 @@ The device node can contain one 'port' child node with one child</div><div class='ctx'> 'endpoint' node, according to the bindings defined in [3]. This</div><div class='ctx'> node should describe panel's video bus.</div><div class='ctx'> </div><div class='del'>-[1]: Documentation/devicetree/bindings/display/display-timing.txt</div><div class='add'>+[1]: Documentation/devicetree/bindings/display/panel/display-timing.txt</div><div class='ctx'> [2]: Documentation/devicetree/bindings/spi/spi-bus.txt</div><div class='ctx'> [3]: Documentation/devicetree/bindings/media/video-interfaces.txt</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt b/Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt<br/>index 25701c81b5e0..9e766c5f86da 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt</a></div><div class='hunk'>@@ -21,7 +21,7 @@ The device node can contain one 'port' child node with one child</div><div class='ctx'> 'endpoint' node, according to the bindings defined in [2]. This</div><div class='ctx'> node should describe panel's video bus.</div><div class='ctx'> </div><div class='del'>-[1]: Documentation/devicetree/bindings/display/display-timing.txt</div><div class='add'>+[1]: Documentation/devicetree/bindings/display/panel/display-timing.txt</div><div class='ctx'> [2]: Documentation/devicetree/bindings/media/video-interfaces.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/sharp,lq150x1lg11.txt b/Documentation/devicetree/bindings/display/panel/sharp,lq150x1lg11.txt<br/>new file mode 100644<br/>index 000000000000..0f57c3143506<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/sharp,lq150x1lg11.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/sharp,lq150x1lg11.txt</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+Sharp 15" LQ150X1LG11 XGA TFT LCD panel</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "sharp,lq150x1lg11"</div><div class='add'>+- power-supply: regulator to provide the VCC supply voltage (3.3 volts)</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- backlight: phandle of the backlight device</div><div class='add'>+- rlud-gpios: a single GPIO for the RL/UD (rotate 180 degrees) pin.</div><div class='add'>+- sellvds-gpios: a single GPIO for the SELLVDS pin.</div><div class='add'>+</div><div class='add'>+If rlud-gpios and/or sellvds-gpios are not specified, the RL/UD and/or SELLVDS</div><div class='add'>+pins are assumed to be handled appropriately by the hardware.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	backlight: backlight {</div><div class='add'>+		compatible = "pwm-backlight";</div><div class='add'>+		pwms = &lt;&amp;pwm 0 100000&gt;;                      /* VBR */</div><div class='add'>+</div><div class='add'>+		brightness-levels = &lt;0 20 40 60 80 100&gt;;</div><div class='add'>+		default-brightness-level = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		power-supply = &lt;&amp;vdd_12v_reg&gt;;               /* VDD */</div><div class='add'>+		enable-gpios = &lt;&amp;gpio 42 GPIO_ACTIVE_HIGH&gt;;  /* XSTABY */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	panel {</div><div class='add'>+		compatible = "sharp,lq150x1lg11";</div><div class='add'>+</div><div class='add'>+		power-supply = &lt;&amp;vcc_3v3_reg&gt;;               /* VCC */</div><div class='add'>+</div><div class='add'>+		backlight = &lt;&amp;backlight&gt;;</div><div class='add'>+		rlud-gpios = &lt;&amp;gpio 17 GPIO_ACTIVE_HIGH&gt;;    /* RL/UD */</div><div class='add'>+		sellvds-gpios = &lt;&amp;gpio 18 GPIO_ACTIVE_HIGH&gt;; /* SELLVDS */</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt b/Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt<br/>new file mode 100644<br/>index 000000000000..eb9501a82e25<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+Tianma Micro-electronics TM070JDHG30 7.0" WXGA TFT LCD panel</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "tianma,tm070jdhg30"</div><div class='add'>+</div><div class='add'>+This binding is compatible with the simple-panel binding, which is specified</div><div class='add'>+in simple-panel.txt in this directory.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt b/Documentation/devicetree/bindings/display/renesas,du.txt<br/>index 0d30e42e40be..1a02f099a0ff 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/renesas,du.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/renesas,du.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/renesas,du.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/renesas,du.txt</a></div><div class='hunk'>@@ -6,9 +6,11 @@ Required Properties:</div><div class='ctx'>     - "renesas,du-r8a7779" for R8A7779 (R-Car H1) compatible DU</div><div class='ctx'>     - "renesas,du-r8a7790" for R8A7790 (R-Car H2) compatible DU</div><div class='ctx'>     - "renesas,du-r8a7791" for R8A7791 (R-Car M2-W) compatible DU</div><div class='add'>+    - "renesas,du-r8a7792" for R8A7792 (R-Car V2H) compatible DU</div><div class='ctx'>     - "renesas,du-r8a7793" for R8A7793 (R-Car M2-N) compatible DU</div><div class='ctx'>     - "renesas,du-r8a7794" for R8A7794 (R-Car E2) compatible DU</div><div class='ctx'>     - "renesas,du-r8a7795" for R8A7795 (R-Car H3) compatible DU</div><div class='add'>+    - "renesas,du-r8a7796" for R8A7796 (R-Car M3-W) compatible DU</div><div class='ctx'> </div><div class='ctx'>   - reg: A list of base address and length of each memory resource, one for</div><div class='ctx'>     each entry in the reg-names property.</div><div class='hunk'>@@ -25,10 +27,10 @@ Required Properties:</div><div class='ctx'>   - clock-names: Name of the clocks. This property is model-dependent.</div><div class='ctx'>     - R8A7779 uses a single functional clock. The clock doesn't need to be</div><div class='ctx'>       named.</div><div class='del'>-    - R8A779[01345] use one functional clock per channel and one clock per LVDS</div><div class='del'>-      encoder (if available). The functional clocks must be named "du.x" with</div><div class='del'>-      "x" being the channel numerical index. The LVDS clocks must be named</div><div class='del'>-      "lvds.x" with "x" being the LVDS encoder numerical index.</div><div class='add'>+    - R8A779[0123456] use one functional clock per channel and one clock per</div><div class='add'>+      LVDS encoder (if available). The functional clocks must be named "du.x"</div><div class='add'>+      with "x" being the channel numerical index. The LVDS clocks must be</div><div class='add'>+      named "lvds.x" with "x" being the LVDS encoder numerical index.</div><div class='ctx'>     - In addition to the functional and encoder clocks, all DU versions also</div><div class='ctx'>       support externally supplied pixel clocks. Those clocks are optional.</div><div class='ctx'>       When supplied they must be named "dclkin.x" with "x" being the input</div><div class='hunk'>@@ -47,9 +49,11 @@ corresponding to each DU output.</div><div class='ctx'>  R8A7779 (H1)	DPAD 0		DPAD 1		-		-</div><div class='ctx'>  R8A7790 (H2)	DPAD		LVDS 0		LVDS 1		-</div><div class='ctx'>  R8A7791 (M2-W)	DPAD		LVDS 0		-		-</div><div class='add'>+ R8A7792 (V2H)	DPAD 0		DPAD 1		-		-</div><div class='ctx'>  R8A7793 (M2-N)	DPAD		LVDS 0		-		-</div><div class='ctx'>  R8A7794 (E2)	DPAD 0		DPAD 1		-		-</div><div class='ctx'>  R8A7795 (H3)	DPAD		HDMI 0		HDMI 1		LVDS</div><div class='add'>+ R8A7796 (M3-W)	DPAD		HDMI		LVDS		-</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Example: R8A7790 (R-Car H2) DU</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt<br/>index 01cced1c2a18..47665a12786f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt</a></div><div class='hunk'>@@ -35,7 +35,7 @@ Optional property for different chips:</div><div class='ctx'> 	       Required elements: "grf"</div><div class='ctx'> </div><div class='ctx'> For the below properties, please refer to Analogix DP binding document:</div><div class='del'>- * Documentation/devicetree/bindings/drm/bridge/analogix_dp.txt</div><div class='add'>+ * Documentation/devicetree/bindings/display/bridge/analogix_dp.txt</div><div class='ctx'> - phys (required)</div><div class='ctx'> - phy-names (required)</div><div class='ctx'> - hpd-gpios (optional)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt<br/>index 668091f27674..046076c6b277 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt</a></div><div class='hunk'>@@ -1,24 +1,39 @@</div><div class='del'>-Rockchip specific extensions to the Synopsys Designware HDMI</div><div class='del'>-================================</div><div class='add'>+Rockchip DWC HDMI TX Encoder</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+The HDMI transmitter is a Synopsys DesignWare HDMI 1.4 TX controller IP</div><div class='add'>+with a companion PHY IP.</div><div class='add'>+</div><div class='add'>+These DT bindings follow the Synopsys DWC HDMI TX bindings defined in</div><div class='add'>+Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt with the</div><div class='add'>+following device-specific properties.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: "rockchip,rk3288-dw-hdmi";</div><div class='del'>-- reg: Physical base address and length of the controller's registers.</div><div class='del'>-- clocks: phandle to hdmi iahb and isfr clocks.</div><div class='del'>-- clock-names: should be "iahb" "isfr"</div><div class='del'>-- rockchip,grf: this soc should set GRF regs to mux vopl/vopb.</div><div class='add'>+</div><div class='add'>+- compatible: Shall contain "rockchip,rk3288-dw-hdmi".</div><div class='add'>+- reg: See dw_hdmi.txt.</div><div class='add'>+- reg-io-width: See dw_hdmi.txt. Shall be 4.</div><div class='ctx'> - interrupts: HDMI interrupt number</div><div class='del'>-- ports: contain a port node with endpoint definitions as defined in</div><div class='del'>-  Documentation/devicetree/bindings/media/video-interfaces.txt. For</div><div class='del'>-  vopb,set the reg = &lt;0&gt; and set the reg = &lt;1&gt; for vopl.</div><div class='del'>-- reg-io-width: the width of the reg:1,4, the value should be 4 on</div><div class='del'>-  rk3288 platform</div><div class='add'>+- clocks: See dw_hdmi.txt.</div><div class='add'>+- clock-names: Shall contain "iahb" and "isfr" as defined in dw_hdmi.txt.</div><div class='add'>+- ports: See dw_hdmi.txt. The DWC HDMI shall have a single port numbered 0</div><div class='add'>+  corresponding to the video input of the controller. The port shall have two</div><div class='add'>+  endpoints, numbered 0 and 1, connected respectively to the vopb and vopl.</div><div class='add'>+- rockchip,grf: Shall reference the GRF to mux vopl/vopb.</div><div class='ctx'> </div><div class='ctx'> Optional properties</div><div class='del'>-- ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing</div><div class='del'>-- clocks, clock-names: phandle to the HDMI CEC clock, name should be "cec"</div><div class='add'>+</div><div class='add'>+- ddc-i2c-bus: The HDMI DDC bus can be connected to either a system I2C master</div><div class='add'>+  or the functionally-reduced I2C master contained in the DWC HDMI. When</div><div class='add'>+  connected to a system I2C master this property contains a phandle to that</div><div class='add'>+  I2C master controller.</div><div class='add'>+- clock-names: See dw_hdmi.txt. The "cec" clock is optional.</div><div class='add'>+- clock-names: May contain "cec" as defined in dw_hdmi.txt.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='add'>+</div><div class='ctx'> hdmi: hdmi@ff980000 {</div><div class='ctx'> 	compatible = "rockchip,rk3288-dw-hdmi";</div><div class='ctx'> 	reg = &lt;0xff980000 0x20000&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/ssd1307fb.txt b/Documentation/devicetree/bindings/display/ssd1307fb.txt<br/>index eb31ed47a283..209d931ef16c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/ssd1307fb.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/ssd1307fb.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/ssd1307fb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/ssd1307fb.txt</a></div><div class='hunk'>@@ -8,14 +8,15 @@ Required properties:</div><div class='ctx'>          0x3c or 0x3d</div><div class='ctx'>   - pwm: Should contain the pwm to use according to the OF device tree PWM</div><div class='ctx'>          specification [0]. Only required for the ssd1307.</div><div class='del'>-  - reset-gpios: Should contain the GPIO used to reset the OLED display</div><div class='ctx'>   - solomon,height: Height in pixel of the screen driven by the controller</div><div class='ctx'>   - solomon,width: Width in pixel of the screen driven by the controller</div><div class='ctx'>   - solomon,page-offset: Offset of pages (band of 8 pixels) that the screen is</div><div class='ctx'>     mapped to.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='del'>-  - reset-active-low: Is the reset gpio is active on physical low?</div><div class='add'>+  - reset-gpios: The GPIO used to reset the OLED display, if available. See</div><div class='add'>+                 Documentation/devicetree/bindings/gpio/gpio.txt for details.</div><div class='add'>+  - vbat-supply: The supply for VBAT</div><div class='ctx'>   - solomon,segment-no-remap: Display needs normal (non-inverted) data column</div><div class='ctx'>                               to segment mapping</div><div class='ctx'>   - solomon,com-seq: Display uses sequential COM pin configuration</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt<br/>index b95696d748c7..b82c00449468 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt</a></div><div class='hunk'>@@ -28,6 +28,8 @@ The TCON acts as a timing controller for RGB, LVDS and TV interfaces.</div><div class='ctx'> Required properties:</div><div class='ctx'>  - compatible: value must be either:</div><div class='ctx'>    * allwinner,sun5i-a13-tcon</div><div class='add'>+   * allwinner,sun6i-a31-tcon</div><div class='add'>+   * allwinner,sun6i-a31s-tcon</div><div class='ctx'>    * allwinner,sun8i-a33-tcon</div><div class='ctx'>  - reg: base address and size of memory-mapped region</div><div class='ctx'>  - interrupts: interrupt associated to this IP</div><div class='hunk'>@@ -50,7 +52,7 @@ Required properties:</div><div class='ctx'>   second the block connected to the TCON channel 1 (usually the TV</div><div class='ctx'>   encoder)</div><div class='ctx'> </div><div class='del'>-On the A13, there is one more clock required:</div><div class='add'>+On SoCs other than the A33, there is one more clock required:</div><div class='ctx'>    - 'tcon-ch1': The clock driving the TCON channel 1</div><div class='ctx'> </div><div class='ctx'> DRC</div><div class='hunk'>@@ -64,6 +66,8 @@ adaptive backlight control.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'>   - compatible: value must be one of:</div><div class='add'>+    * allwinner,sun6i-a31-drc</div><div class='add'>+    * allwinner,sun6i-a31s-drc</div><div class='ctx'>     * allwinner,sun8i-a33-drc</div><div class='ctx'>   - reg: base address and size of the memory-mapped region.</div><div class='ctx'>   - interrupts: interrupt associated to this IP</div><div class='hunk'>@@ -87,6 +91,7 @@ system.</div><div class='ctx'> Required properties:</div><div class='ctx'>   - compatible: value must be one of:</div><div class='ctx'>     * allwinner,sun5i-a13-display-backend</div><div class='add'>+    * allwinner,sun6i-a31-display-backend</div><div class='ctx'>     * allwinner,sun8i-a33-display-backend</div><div class='ctx'>   - reg: base address and size of the memory-mapped region.</div><div class='ctx'>   - clocks: phandles to the clocks feeding the frontend and backend</div><div class='hunk'>@@ -117,6 +122,7 @@ deinterlacing and color space conversion.</div><div class='ctx'> Required properties:</div><div class='ctx'>   - compatible: value must be one of:</div><div class='ctx'>     * allwinner,sun5i-a13-display-frontend</div><div class='add'>+    * allwinner,sun6i-a31-display-frontend</div><div class='ctx'>     * allwinner,sun8i-a33-display-frontend</div><div class='ctx'>   - reg: base address and size of the memory-mapped region.</div><div class='ctx'>   - interrupts: interrupt associated to this IP</div><div class='hunk'>@@ -142,6 +148,8 @@ extra node.</div><div class='ctx'> Required properties:</div><div class='ctx'>   - compatible: value must be one of:</div><div class='ctx'>     * allwinner,sun5i-a13-display-engine</div><div class='add'>+    * allwinner,sun6i-a31-display-engine</div><div class='add'>+    * allwinner,sun6i-a31s-display-engine</div><div class='ctx'>     * allwinner,sun8i-a33-display-engine</div><div class='ctx'> </div><div class='ctx'>   - allwinner,pipelines: list of phandle to the display engine</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/ti/ti,tfp410.txt b/Documentation/devicetree/bindings/display/ti/ti,tfp410.txt<br/>deleted file mode 100644<br/>index 2cbe32a3d0bb..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/ti/ti,tfp410.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/ti/ti,tfp410.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-TFP410 DPI to DVI encoder</div><div class='del'>-=========================</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-- compatible: "ti,tfp410"</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>-- powerdown-gpios: power-down gpio</div><div class='del'>-</div><div class='del'>-Required nodes:</div><div class='del'>-- Video port 0 for DPI input</div><div class='del'>-- Video port 1 for DVI output</div><div class='del'>-</div><div class='del'>-Example</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-tfp410: encoder@0 {</div><div class='del'>-	compatible = "ti,tfp410";</div><div class='del'>-	powerdown-gpios = &lt;&amp;twl_gpio 2 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-</div><div class='del'>-	ports {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		port@0 {</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-			tfp410_in: endpoint@0 {</div><div class='del'>-				remote-endpoint = &lt;&amp;dpi_out&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		port@1 {</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-			tfp410_out: endpoint@0 {</div><div class='del'>-				remote-endpoint = &lt;&amp;dvi_connector_in&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/tilcdc/panel.txt b/Documentation/devicetree/bindings/display/tilcdc/panel.txt<br/>index f20b31cdc59a..808216310ea2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/tilcdc/panel.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/tilcdc/panel.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/tilcdc/panel.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/tilcdc/panel.txt</a></div><div class='hunk'>@@ -15,7 +15,7 @@ Required properties:</div><div class='ctx'>  - display-timings: typical videomode of lcd panel.  Multiple video modes</div><div class='ctx'>    can be listed if the panel supports multiple timings, but the 'native-mode'</div><div class='ctx'>    should be the preferred/default resolution.  Refer to</div><div class='del'>-   Documentation/devicetree/bindings/display/display-timing.txt for display</div><div class='add'>+   Documentation/devicetree/bindings/display/panel/display-timing.txt for display</div><div class='ctx'>    timing binding details.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt b/Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt<br/>index a83abd79c55c..6fddb4f4f71a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt</a></div><div class='hunk'>@@ -1,7 +1,9 @@</div><div class='ctx'> Device-Tree bindings for tilcdc DRM driver</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>- - compatible: value should be "ti,am33xx-tilcdc".</div><div class='add'>+ - compatible: value should be one of the following:</div><div class='add'>+    - "ti,am33xx-tilcdc" for AM335x based boards</div><div class='add'>+    - "ti,da850-tilcdc" for DA850/AM18x/OMAP-L138 based boards</div><div class='ctx'>  - interrupts: the interrupt number</div><div class='ctx'>  - reg: base address and size of the LCDC device</div><div class='ctx'> </div><div class='hunk'>@@ -51,7 +53,7 @@ Optional nodes:</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	fb: fb@4830e000 {</div><div class='del'>-		compatible = "ti,am33xx-tilcdc";</div><div class='add'>+		compatible = "ti,am33xx-tilcdc", "ti,da850-tilcdc";</div><div class='ctx'> 		reg = &lt;0x4830e000 0x1000&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> 		interrupts = &lt;36&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/display/zte,vou.txt b/Documentation/devicetree/bindings/display/zte,vou.txt<br/>new file mode 100644<br/>index 000000000000..9c356284232b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/display/zte,vou.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/display/zte,vou.txt</a></div><div class='hunk'>@@ -0,0 +1,99 @@</div><div class='add'>+ZTE VOU Display Controller</div><div class='add'>+</div><div class='add'>+This is a display controller found on ZTE ZX296718 SoC.  It includes multiple</div><div class='add'>+Graphic Layer (GL) and Video Layer (VL), two Mixers/Channels, and a few blocks</div><div class='add'>+handling scaling, color space conversion etc.  VOU also integrates the support</div><div class='add'>+for typical output devices, like HDMI, TV Encoder, VGA, and RGB LCD.</div><div class='add'>+</div><div class='add'>+* Master VOU node</div><div class='add'>+</div><div class='add'>+It must be the parent node of all the sub-device nodes.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible: should be "zte,zx296718-vou"</div><div class='add'>+ - #address-cells: should be &lt;1&gt;</div><div class='add'>+ - #size-cells: should be &lt;1&gt;</div><div class='add'>+ - ranges: list of address translations between VOU and sub-devices</div><div class='add'>+</div><div class='add'>+* VOU DPC device</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible: should be "zte,zx296718-dpc"</div><div class='add'>+ - reg: Physical base address and length of DPC register regions, one for each</div><div class='add'>+   entry in 'reg-names'</div><div class='add'>+ - reg-names: The names of register regions. The following regions are required:</div><div class='add'>+	"osd"</div><div class='add'>+	"timing_ctrl"</div><div class='add'>+	"dtrc"</div><div class='add'>+	"vou_ctrl"</div><div class='add'>+	"otfppu"</div><div class='add'>+ - interrupts: VOU DPC interrupt number to CPU</div><div class='add'>+ - clocks: A list of phandle + clock-specifier pairs, one for each entry</div><div class='add'>+   in 'clock-names'</div><div class='add'>+ - clock-names: A list of clock names.  The following clocks are required:</div><div class='add'>+	"aclk"</div><div class='add'>+	"ppu_wclk"</div><div class='add'>+	"main_wclk"</div><div class='add'>+	"aux_wclk"</div><div class='add'>+</div><div class='add'>+* HDMI output device</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible: should be "zte,zx296718-hdmi"</div><div class='add'>+ - reg: Physical base address and length of the HDMI device IO region</div><div class='add'>+ - interrupts : HDMI interrupt number to CPU</div><div class='add'>+ - clocks: A list of phandle + clock-specifier pairs, one for each entry</div><div class='add'>+   in 'clock-names'</div><div class='add'>+ - clock-names: A list of clock names.  The following clocks are required:</div><div class='add'>+	"osc_cec"</div><div class='add'>+	"osc_clk"</div><div class='add'>+	"xclk"</div><div class='add'>+</div><div class='add'>+* TV Encoder output device</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible: should be "zte,zx296718-tvenc"</div><div class='add'>+ - reg: Physical base address and length of the TVENC device IO region</div><div class='add'>+ - zte,tvenc-power-control: the phandle to SYSCTRL block followed by two</div><div class='add'>+   integer cells.  The first cell is the offset of SYSCTRL register used</div><div class='add'>+   to control TV Encoder DAC power, and the second cell is the bit mask.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+vou: vou@1440000 {</div><div class='add'>+	compatible = "zte,zx296718-vou";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	ranges = &lt;0 0x1440000 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+	dpc: dpc@0 {</div><div class='add'>+		compatible = "zte,zx296718-dpc";</div><div class='add'>+		reg = &lt;0x0000 0x1000&gt;, &lt;0x1000 0x1000&gt;,</div><div class='add'>+		      &lt;0x5000 0x1000&gt;, &lt;0x6000 0x1000&gt;,</div><div class='add'>+		      &lt;0xa000 0x1000&gt;;</div><div class='add'>+		reg-names = "osd", "timing_ctrl",</div><div class='add'>+			    "dtrc", "vou_ctrl",</div><div class='add'>+			    "otfppu";</div><div class='add'>+		interrupts = &lt;GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;topcrm VOU_ACLK&gt;, &lt;&amp;topcrm VOU_PPU_WCLK&gt;,</div><div class='add'>+			 &lt;&amp;topcrm VOU_MAIN_WCLK&gt;, &lt;&amp;topcrm VOU_AUX_WCLK&gt;;</div><div class='add'>+		clock-names = "aclk", "ppu_wclk",</div><div class='add'>+			      "main_wclk", "aux_wclk";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hdmi: hdmi@c000 {</div><div class='add'>+		compatible = "zte,zx296718-hdmi";</div><div class='add'>+		reg = &lt;0xc000 0x4000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 82 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		clocks = &lt;&amp;topcrm HDMI_OSC_CEC&gt;,</div><div class='add'>+			 &lt;&amp;topcrm HDMI_OSC_CLK&gt;,</div><div class='add'>+			 &lt;&amp;topcrm HDMI_XCLK&gt;;</div><div class='add'>+		clock-names = "osc_cec", "osc_clk", "xclk";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	tvenc: tvenc@2000 {</div><div class='add'>+		compatible = "zte,zx296718-tvenc";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		zte,tvenc-power-control = &lt;&amp;sysctrl 0x170 0x10&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/dma/nbpfaxi.txt b/Documentation/devicetree/bindings/dma/nbpfaxi.txt<br/>index d5e2522b9ec1..d2e1e62e346a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/dma/nbpfaxi.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/dma/nbpfaxi.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/dma/nbpfaxi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/nbpfaxi.txt</a></div><div class='hunk'>@@ -23,6 +23,14 @@ Required properties</div><div class='ctx'> #define NBPF_SLAVE_RQ_LEVEL	4</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='add'>+- max-burst-mem-read:	limit burst size for memory reads</div><div class='add'>+  (DMA_MEM_TO_MEM/DMA_MEM_TO_DEV) to this value, specified in bytes, rather</div><div class='add'>+  than using the maximum burst size allowed by the hardware's buffer size.</div><div class='add'>+- max-burst-mem-write:	limit burst size for memory writes</div><div class='add'>+  (DMA_DEV_TO_MEM/DMA_MEM_TO_MEM) to this value, specified in bytes, rather</div><div class='add'>+  than using the maximum burst size allowed by the hardware's buffer size.</div><div class='add'>+  If both max-burst-mem-read and max-burst-mem-write are set, DMA_MEM_TO_MEM</div><div class='add'>+  will use the lower value.</div><div class='ctx'> </div><div class='ctx'> You can use dma-channels and dma-requests as described in dma.txt, although they</div><div class='ctx'> won't be used, this information is derived from the compatibility string.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt<br/>index fd5618bd8fbc..55492c264d17 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt</a></div><div class='hunk'>@@ -5,13 +5,13 @@ memcpy and memset capabilities. It has been designed for virtualized</div><div class='ctx'> environments.</div><div class='ctx'> </div><div class='ctx'> Each HIDMA HW instance consists of multiple DMA channels. These channels</div><div class='del'>-share the same bandwidth. The bandwidth utilization can be parititioned</div><div class='add'>+share the same bandwidth. The bandwidth utilization can be partitioned</div><div class='ctx'> among channels based on the priority and weight assignments.</div><div class='ctx'> </div><div class='ctx'> There are only two priority levels and 15 weigh assignments possible.</div><div class='ctx'> </div><div class='ctx'> Other parameters here determine how much of the system bus this HIDMA</div><div class='del'>-instance can use like maximum read/write request and and number of bytes to</div><div class='add'>+instance can use like maximum read/write request and number of bytes to</div><div class='ctx'> read/write in a single burst.</div><div class='ctx'> </div><div class='ctx'> Main node required properties:</div><div class='hunk'>@@ -47,12 +47,18 @@ When the OS is not in control of the management interface (i.e. it's a guest),</div><div class='ctx'> the channel nodes appear on their own, not under a management node.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: must contain "qcom,hidma-1.0"</div><div class='add'>+- compatible: must contain "qcom,hidma-1.0" for initial HW or "qcom,hidma-1.1"</div><div class='add'>+for MSI capable HW.</div><div class='ctx'> - reg: Addresses for the transfer and event channel</div><div class='ctx'> - interrupts: Should contain the event interrupt</div><div class='ctx'> - desc-count: Number of asynchronous requests this channel can handle</div><div class='ctx'> - iommus: required a iommu node</div><div class='ctx'> </div><div class='add'>+Optional properties for MSI:</div><div class='add'>+- msi-parent : See the generic MSI binding described in</div><div class='add'>+ devicetree/bindings/interrupt-controller/msi.txt for a description of the</div><div class='add'>+ msi-parent property.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> Hypervisor OS configuration:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt<br/>index 5f2ce669789a..3316a9c2e638 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt</a></div><div class='hunk'>@@ -24,6 +24,7 @@ Required Properties:</div><div class='ctx'> 		- "renesas,dmac-r8a7793" (R-Car M2-N)</div><div class='ctx'> 		- "renesas,dmac-r8a7794" (R-Car E2)</div><div class='ctx'> 		- "renesas,dmac-r8a7795" (R-Car H3)</div><div class='add'>+		- "renesas,dmac-r8a7796" (R-Car M3-W)</div><div class='ctx'> </div><div class='ctx'> - reg: base address and length of the registers block for the DMAC</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/dma/snps-dma.txt b/Documentation/devicetree/bindings/dma/snps-dma.txt<br/>index 0f5583293c9c..4775c66f4508 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/dma/snps-dma.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/dma/snps-dma.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/dma/snps-dma.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/snps-dma.txt</a></div><div class='hunk'>@@ -27,6 +27,8 @@ Optional properties:</div><div class='ctx'>   that services interrupts for this device</div><div class='ctx'> - is_private: The device channels should be marked as private and not for by the</div><div class='ctx'>   general purpose DMA channel allocator. False if not passed.</div><div class='add'>+- multi-block: Multi block transfers supported by hardware. Array property with</div><div class='add'>+  one cell per channel. 0: not supported, 1 (default): supported.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/dma/st_fdma.txt b/Documentation/devicetree/bindings/dma/st_fdma.txt<br/>new file mode 100644<br/>index 000000000000..495d853c569b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/dma/st_fdma.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/st_fdma.txt</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+* STMicroelectronics Flexible Direct Memory Access Device Tree bindings</div><div class='add'>+</div><div class='add'>+The FDMA is a general-purpose direct memory access controller capable of</div><div class='add'>+supporting 16 independent DMA channels. It accepts up to 32 DMA requests.</div><div class='add'>+The FDMA is based on a Slim processor which requires a firmware.</div><div class='add'>+</div><div class='add'>+* FDMA Controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible	: Should be one of</div><div class='add'>+		 - st,stih407-fdma-mpe31-11, "st,slim-rproc";</div><div class='add'>+		 - st,stih407-fdma-mpe31-12, "st,slim-rproc";</div><div class='add'>+		 - st,stih407-fdma-mpe31-13, "st,slim-rproc";</div><div class='add'>+- reg		: Should contain an entry for each name in reg-names</div><div class='add'>+- reg-names	: Must contain "slimcore", "dmem", "peripherals", "imem" entries</div><div class='add'>+- interrupts	: Should contain one interrupt shared by all channels</div><div class='add'>+- dma-channels	: Number of channels supported by the controller</div><div class='add'>+- #dma-cells	: Must be &lt;3&gt;. See DMA client section below</div><div class='add'>+- clocks	: Must contain an entry for each clock</div><div class='add'>+See: Documentation/devicetree/bindings/clock/clock-bindings.txt</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	fdma0: dma-controller@8e20000 {</div><div class='add'>+		compatible = "st,stih407-fdma-mpe31-11", "st,slim-rproc";</div><div class='add'>+		reg = &lt;0x8e20000 0x8000&gt;,</div><div class='add'>+		      &lt;0x8e30000 0x3000&gt;,</div><div class='add'>+		      &lt;0x8e37000 0x1000&gt;,</div><div class='add'>+		      &lt;0x8e38000 0x8000&gt;;</div><div class='add'>+		reg-names = "slimcore", "dmem", "peripherals", "imem";</div><div class='add'>+		clocks = &lt;&amp;clk_s_c0_flexgen CLK_FDMA&gt;,</div><div class='add'>+			 &lt;&amp;clk_s_c0_flexgen CLK_EXT2F_A9&gt;,</div><div class='add'>+			 &lt;&amp;clk_s_c0_flexgen CLK_EXT2F_A9&gt;,</div><div class='add'>+			 &lt;&amp;clk_s_c0_flexgen CLK_EXT2F_A9&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 5 IRQ_TYPE_NONE&gt;;</div><div class='add'>+		dma-channels = &lt;16&gt;;</div><div class='add'>+		#dma-cells = &lt;3&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+* DMA client</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- dmas: Comma separated list of dma channel requests</div><div class='add'>+- dma-names: Names of the aforementioned requested channels</div><div class='add'>+</div><div class='add'>+Each dmas request consists of 4 cells:</div><div class='add'>+1. A phandle pointing to the FDMA controller</div><div class='add'>+2. The request line number</div><div class='add'>+3. A 32bit mask specifying (see include/linux/platform_data/dma-st-fdma.h)</div><div class='add'>+ -bit 2-0: Holdoff value, dreq will be masked for</div><div class='add'>+	0x0: 0-0.5us</div><div class='add'>+	0x1: 0.5-1us</div><div class='add'>+	0x2: 1-1.5us</div><div class='add'>+ -bit 17: data swap</div><div class='add'>+	0x0: disabled</div><div class='add'>+	0x1: enabled</div><div class='add'>+ -bit 21: Increment Address</div><div class='add'>+	0x0: no address increment between transfers</div><div class='add'>+	0x1: increment address between transfers</div><div class='add'>+ -bit 22: 2 STBus Initiator Coprocessor interface</div><div class='add'>+	0x0: high priority port</div><div class='add'>+	0x1: low priority port</div><div class='add'>+4. transfers type</div><div class='add'>+ 0 free running</div><div class='add'>+ 1 paced</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	sti_uni_player2: sti-uni-player@2 {</div><div class='add'>+		compatible = "st,sti-uni-player";</div><div class='add'>+		status = "disabled";</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+		st,syscfg = &lt;&amp;syscfg_core&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_s_d0_flexgen CLK_PCM_2&gt;;</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_s_d0_flexgen CLK_PCM_2&gt;;</div><div class='add'>+		assigned-clock-parents = &lt;&amp;clk_s_d0_quadfs 2&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;50000000&gt;;</div><div class='add'>+		reg = &lt;0x8D82000 0x158&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 86 IRQ_TYPE_NONE&gt;;</div><div class='add'>+		dmas = &lt;&amp;fdma0 4 0 1&gt;;</div><div class='add'>+		dai-name = "Uni Player #1 (DAC)";</div><div class='add'>+		dma-names = "tx";</div><div class='add'>+		st,uniperiph-id = &lt;2&gt;;</div><div class='add'>+		st,version = &lt;5&gt;;</div><div class='add'>+		st,mode = "PCM";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/dma/stm32-dma.txt b/Documentation/devicetree/bindings/dma/stm32-dma.txt<br/>index 70cd13f1588a..4408af693d0c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/dma/stm32-dma.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/dma/stm32-dma.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/dma/stm32-dma.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/dma/stm32-dma.txt</a></div><div class='hunk'>@@ -40,8 +40,7 @@ Example:</div><div class='ctx'> </div><div class='ctx'> DMA clients connected to the STM32 DMA controller must use the format</div><div class='ctx'> described in the dma.txt file, using a five-cell specifier for each</div><div class='del'>-channel: a phandle plus four integer cells.</div><div class='del'>-The four cells in order are:</div><div class='add'>+channel: a phandle to the DMA controller plus the following four integer cells:</div><div class='ctx'> </div><div class='ctx'> 1. The channel id</div><div class='ctx'> 2. The request line number</div><div class='hunk'>@@ -61,7 +60,7 @@ The four cells in order are:</div><div class='ctx'> 	0x1: medium</div><div class='ctx'> 	0x2: high</div><div class='ctx'> 	0x3: very high</div><div class='del'>-5. A 32bit mask specifying the DMA FIFO threshold configuration which are device</div><div class='add'>+4. A 32bit mask specifying the DMA FIFO threshold configuration which are device</div><div class='ctx'>    dependent:</div><div class='ctx'>  -bit 0-1: Fifo threshold</div><div class='ctx'> 	0x0: 1/4 full FIFO</div><div class='head'>diff --git a/Documentation/devicetree/bindings/eeprom/eeprom.txt b/Documentation/devicetree/bindings/eeprom/eeprom.txt<br/>index 735bc94444bb..5696eb508e95 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/eeprom/eeprom.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/eeprom/eeprom.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/eeprom/eeprom.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/eeprom/eeprom.txt</a></div><div class='hunk'>@@ -10,6 +10,8 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> 	"catalyst,24c32"</div><div class='ctx'> </div><div class='add'>+	"microchip,24c128"</div><div class='add'>+</div><div class='ctx'> 	"ramtron,24c64"</div><div class='ctx'> </div><div class='ctx'> 	"renesas,r1ex24002"</div><div class='head'>diff --git a/Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt b/Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt<br/>index af0b903de293..dfc14f71e81f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt</a></div><div class='hunk'>@@ -5,7 +5,10 @@ connected to a GPIO pin.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible: Should be "linux,extcon-usb-gpio"</div><div class='add'>+</div><div class='add'>+Either one of id-gpio or vbus-gpio must be present. Both can be present as well.</div><div class='ctx'> - id-gpio: gpio for USB ID pin. See gpio binding.</div><div class='add'>+- vbus-gpio: gpio for USB VBUS pin.</div><div class='ctx'> </div><div class='ctx'> Example: Examples of extcon-usb-gpio node in dra7-evm.dts as listed below:</div><div class='ctx'> 	extcon_usb1 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/firmware/nvidia,tegra186-bpmp.txt b/Documentation/devicetree/bindings/firmware/nvidia,tegra186-bpmp.txt<br/>new file mode 100644<br/>index 000000000000..e821e16ad65b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/firmware/nvidia,tegra186-bpmp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/firmware/nvidia,tegra186-bpmp.txt</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+NVIDIA Tegra Boot and Power Management Processor (BPMP)</div><div class='add'>+</div><div class='add'>+The BPMP is a specific processor in Tegra chip, which is designed for</div><div class='add'>+booting process handling and offloading the power management, clock</div><div class='add'>+management, and reset control tasks from the CPU. The binding document</div><div class='add'>+defines the resources that would be used by the BPMP firmware driver,</div><div class='add'>+which can create the interprocessor communication (IPC) between the CPU</div><div class='add'>+and BPMP.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- name : Should be bpmp</div><div class='add'>+- compatible</div><div class='add'>+    Array of strings</div><div class='add'>+    One of:</div><div class='add'>+    - "nvidia,tegra186-bpmp"</div><div class='add'>+- mboxes : The phandle of mailbox controller and the mailbox specifier.</div><div class='add'>+- shmem : List of the phandle of the TX and RX shared memory area that</div><div class='add'>+	  the IPC between CPU and BPMP is based on.</div><div class='add'>+- #clock-cells : Should be 1.</div><div class='add'>+- #power-domain-cells : Should be 1.</div><div class='add'>+- #reset-cells : Should be 1.</div><div class='add'>+</div><div class='add'>+This node is a mailbox consumer. See the following files for details of</div><div class='add'>+the mailbox subsystem, and the specifiers implemented by the relevant</div><div class='add'>+provider(s):</div><div class='add'>+</div><div class='add'>+- .../mailbox/mailbox.txt</div><div class='add'>+- .../mailbox/nvidia,tegra186-hsp.txt</div><div class='add'>+</div><div class='add'>+This node is a clock, power domain, and reset provider. See the following</div><div class='add'>+files for general documentation of those features, and the specifiers</div><div class='add'>+implemented by this node:</div><div class='add'>+</div><div class='add'>+- .../clock/clock-bindings.txt</div><div class='add'>+- &lt;dt-bindings/clock/tegra186-clock.h&gt;</div><div class='add'>+- ../power/power_domain.txt</div><div class='add'>+- &lt;dt-bindings/power/tegra186-powergate.h&gt;</div><div class='add'>+- .../reset/reset.txt</div><div class='add'>+- &lt;dt-bindings/reset/tegra186-reset.h&gt;</div><div class='add'>+</div><div class='add'>+The BPMP implements some services which must be represented by separate nodes.</div><div class='add'>+For example, it can provide access to certain I2C controllers, and the I2C</div><div class='add'>+bindings represent each I2C controller as a device tree node. Such nodes should</div><div class='add'>+be nested directly inside the main BPMP node.</div><div class='add'>+</div><div class='add'>+Software can determine whether a child node of the BPMP node represents a device</div><div class='add'>+by checking for a compatible property. Any node with a compatible property</div><div class='add'>+represents a device that can be instantiated. Nodes without a compatible</div><div class='add'>+property may be used to provide configuration information regarding the BPMP</div><div class='add'>+itself, although no such configuration nodes are currently defined by this</div><div class='add'>+binding.</div><div class='add'>+</div><div class='add'>+The BPMP firmware defines no single global name-/numbering-space for such</div><div class='add'>+services. Put another way, the numbering scheme for I2C buses is distinct from</div><div class='add'>+the numbering scheme for any other service the BPMP may provide (e.g. a future</div><div class='add'>+hypothetical SPI bus service). As such, child device nodes will have no reg</div><div class='add'>+property, and the BPMP node will have no #address-cells or #size-cells property.</div><div class='add'>+</div><div class='add'>+The shared memory bindings for BPMP</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+The shared memory area for the IPC TX and RX between CPU and BPMP are</div><div class='add'>+predefined and work on top of sysram, which is an SRAM inside the chip.</div><div class='add'>+</div><div class='add'>+See ".../sram/sram.txt" for the bindings.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+hsp_top0: hsp@03c00000 {</div><div class='add'>+	...</div><div class='add'>+	#mbox-cells = &lt;2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+sysram@30000000 {</div><div class='add'>+	compatible = "nvidia,tegra186-sysram", "mmio-sram";</div><div class='add'>+	reg = &lt;0x0 0x30000000 0x0 0x50000&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	ranges = &lt;0 0x0 0x0 0x30000000 0x0 0x50000&gt;;</div><div class='add'>+</div><div class='add'>+	cpu_bpmp_tx: shmem@4e000 {</div><div class='add'>+		compatible = "nvidia,tegra186-bpmp-shmem";</div><div class='add'>+		reg = &lt;0x0 0x4e000 0x0 0x1000&gt;;</div><div class='add'>+		label = "cpu-bpmp-tx";</div><div class='add'>+		pool;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpu_bpmp_rx: shmem@4f000 {</div><div class='add'>+		compatible = "nvidia,tegra186-bpmp-shmem";</div><div class='add'>+		reg = &lt;0x0 0x4f000 0x0 0x1000&gt;;</div><div class='add'>+		label = "cpu-bpmp-rx";</div><div class='add'>+		pool;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bpmp {</div><div class='add'>+	compatible = "nvidia,tegra186-bpmp";</div><div class='add'>+	mboxes = &lt;&amp;hsp_top0 TEGRA_HSP_MBOX_TYPE_DB TEGRA_HSP_DB_MASTER_BPMP&gt;;</div><div class='add'>+	shmem = &lt;&amp;cpu_bpmp_tx &amp;cpu_bpmp_rx&gt;;</div><div class='add'>+	#clock-cells = &lt;1&gt;;</div><div class='add'>+	#power-domain-cells = &lt;1&gt;;</div><div class='add'>+	#reset-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+	i2c {</div><div class='add'>+		compatible = "...";</div><div class='add'>+		...</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.txt b/Documentation/devicetree/bindings/firmware/qcom,scm.txt<br/>index 3b4436e56865..20f26fbce875 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/firmware/qcom,scm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/firmware/qcom,scm.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/firmware/qcom,scm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/firmware/qcom,scm.txt</a></div><div class='hunk'>@@ -10,8 +10,10 @@ Required properties:</div><div class='ctx'>  * "qcom,scm-apq8064" for APQ8064 platforms</div><div class='ctx'>  * "qcom,scm-msm8660" for MSM8660 platforms</div><div class='ctx'>  * "qcom,scm-msm8690" for MSM8690 platforms</div><div class='add'>+ * "qcom,scm-msm8996" for MSM8996 platforms</div><div class='ctx'>  * "qcom,scm" for later processors (MSM8916, APQ8084, MSM8974, etc)</div><div class='ctx'> - clocks: One to three clocks may be required based on compatible.</div><div class='add'>+ * No clock required for "qcom,scm-msm8996"</div><div class='ctx'>  * Only core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660", and "qcom,scm-msm8960"</div><div class='ctx'>  * Core, iface, and bus clocks required for "qcom,scm"</div><div class='ctx'> - clock-names: Must contain "core" for the core clock, "iface" for the interface</div><div class='head'>diff --git a/Documentation/devicetree/bindings/fpga/altera-fpga2sdram-bridge.txt b/Documentation/devicetree/bindings/fpga/altera-fpga2sdram-bridge.txt<br/>new file mode 100644<br/>index 000000000000..817a8d4bf903<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/fpga/altera-fpga2sdram-bridge.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/fpga/altera-fpga2sdram-bridge.txt</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+Altera FPGA To SDRAM Bridge Driver</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible		: Should contain "altr,socfpga-fpga2sdram-bridge"</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- bridge-enable		: 0 if driver should disable bridge at startup</div><div class='add'>+			  1 if driver should enable bridge at startup</div><div class='add'>+			  Default is to leave bridge in current state.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	fpga_bridge3: fpga-bridge@ffc25080 {</div><div class='add'>+		compatible = "altr,socfpga-fpga2sdram-bridge";</div><div class='add'>+		reg = &lt;0xffc25080 0x4&gt;;</div><div class='add'>+		bridge-enable = &lt;0&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/fpga/altera-freeze-bridge.txt b/Documentation/devicetree/bindings/fpga/altera-freeze-bridge.txt<br/>new file mode 100644<br/>index 000000000000..f8e288c71b2d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/fpga/altera-freeze-bridge.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/fpga/altera-freeze-bridge.txt</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+Altera Freeze Bridge Controller Driver</div><div class='add'>+</div><div class='add'>+The Altera Freeze Bridge Controller manages one or more freeze bridges.</div><div class='add'>+The controller can freeze/disable the bridges which prevents signal</div><div class='add'>+changes from passing through the bridge.  The controller can also</div><div class='add'>+unfreeze/enable the bridges which allows traffic to pass through the</div><div class='add'>+bridge normally.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible		: Should contain "altr,freeze-bridge-controller"</div><div class='add'>+- regs			: base address and size for freeze bridge module</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- bridge-enable		: 0 if driver should disable bridge at startup</div><div class='add'>+			  1 if driver should enable bridge at startup</div><div class='add'>+			  Default is to leave bridge in current state.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	freeze-controller@100000450 {</div><div class='add'>+		compatible = "altr,freeze-bridge-controller";</div><div class='add'>+		regs = &lt;0x1000 0x10&gt;;</div><div class='add'>+		bridge-enable = &lt;0&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/fpga/altera-hps2fpga-bridge.txt b/Documentation/devicetree/bindings/fpga/altera-hps2fpga-bridge.txt<br/>new file mode 100644<br/>index 000000000000..6406f9337eeb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/fpga/altera-hps2fpga-bridge.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/fpga/altera-hps2fpga-bridge.txt</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+Altera FPGA/HPS Bridge Driver</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- regs		: base address and size for AXI bridge module</div><div class='add'>+- compatible	: Should contain one of:</div><div class='add'>+		  "altr,socfpga-lwhps2fpga-bridge",</div><div class='add'>+		  "altr,socfpga-hps2fpga-bridge", or</div><div class='add'>+		  "altr,socfpga-fpga2hps-bridge"</div><div class='add'>+- resets	: Phandle and reset specifier for this bridge's reset</div><div class='add'>+- clocks	: Clocks used by this module.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- bridge-enable	: 0 if driver should disable bridge at startup.</div><div class='add'>+		  1 if driver should enable bridge at startup.</div><div class='add'>+		  Default is to leave bridge in its current state.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	fpga_bridge0: fpga-bridge@ff400000 {</div><div class='add'>+		compatible = "altr,socfpga-lwhps2fpga-bridge";</div><div class='add'>+		reg = &lt;0xff400000 0x100000&gt;;</div><div class='add'>+		resets = &lt;&amp;rst LWHPS2FPGA_RESET&gt;;</div><div class='add'>+		clocks = &lt;&amp;l4_main_clk&gt;;</div><div class='add'>+		bridge-enable = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fpga_bridge1: fpga-bridge@ff500000 {</div><div class='add'>+		compatible = "altr,socfpga-hps2fpga-bridge";</div><div class='add'>+		reg = &lt;0xff500000 0x10000&gt;;</div><div class='add'>+		resets = &lt;&amp;rst HPS2FPGA_RESET&gt;;</div><div class='add'>+		clocks = &lt;&amp;l4_main_clk&gt;;</div><div class='add'>+		bridge-enable = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fpga_bridge2: fpga-bridge@ff600000 {</div><div class='add'>+		compatible = "altr,socfpga-fpga2hps-bridge";</div><div class='add'>+		reg = &lt;0xff600000 0x100000&gt;;</div><div class='add'>+		resets = &lt;&amp;rst FPGA2HPS_RESET&gt;;</div><div class='add'>+		clocks = &lt;&amp;l4_main_clk&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/fpga/altera-socfpga-a10-fpga-mgr.txt b/Documentation/devicetree/bindings/fpga/altera-socfpga-a10-fpga-mgr.txt<br/>new file mode 100644<br/>index 000000000000..2fd8e7a84734<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/fpga/altera-socfpga-a10-fpga-mgr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/fpga/altera-socfpga-a10-fpga-mgr.txt</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+Altera SOCFPGA Arria10 FPGA Manager</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : should contain "altr,socfpga-a10-fpga-mgr"</div><div class='add'>+- reg        : base address and size for memory mapped io.</div><div class='add'>+               - The first index is for FPGA manager register access.</div><div class='add'>+               - The second index is for writing FPGA configuration data.</div><div class='add'>+- resets     : Phandle and reset specifier for the device's reset.</div><div class='add'>+- clocks     : Clocks used by the device.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	fpga_mgr: fpga-mgr@ffd03000 {</div><div class='add'>+		compatible = "altr,socfpga-a10-fpga-mgr";</div><div class='add'>+		reg = &lt;0xffd03000 0x100</div><div class='add'>+		       0xffcfe400 0x20&gt;;</div><div class='add'>+		clocks = &lt;&amp;l4_mp_clk&gt;;</div><div class='add'>+		resets = &lt;&amp;rst FPGAMGR_RESET&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/fpga/fpga-region.txt b/Documentation/devicetree/bindings/fpga/fpga-region.txt<br/>new file mode 100644<br/>index 000000000000..3b32ba15a717<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/fpga/fpga-region.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/fpga/fpga-region.txt</a></div><div class='hunk'>@@ -0,0 +1,494 @@</div><div class='add'>+FPGA Region Device Tree Binding</div><div class='add'>+</div><div class='add'>+Alan Tull 2016</div><div class='add'>+</div><div class='add'>+ CONTENTS</div><div class='add'>+ - Introduction</div><div class='add'>+ - Terminology</div><div class='add'>+ - Sequence</div><div class='add'>+ - FPGA Region</div><div class='add'>+ - Supported Use Models</div><div class='add'>+ - Device Tree Examples</div><div class='add'>+ - Constraints</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+FPGA Regions represent FPGA's and partial reconfiguration regions of FPGA's in</div><div class='add'>+the Device Tree.  FPGA Regions provide a way to program FPGAs under device tree</div><div class='add'>+control.</div><div class='add'>+</div><div class='add'>+This device tree binding document hits some of the high points of FPGA usage and</div><div class='add'>+attempts to include terminology used by both major FPGA manufacturers.  This</div><div class='add'>+document isn't a replacement for any manufacturers specifications for FPGA</div><div class='add'>+usage.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Terminology</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+Full Reconfiguration</div><div class='add'>+ * The entire FPGA is programmed.</div><div class='add'>+</div><div class='add'>+Partial Reconfiguration (PR)</div><div class='add'>+ * A section of an FPGA is reprogrammed while the rest of the FPGA is not</div><div class='add'>+   affected.</div><div class='add'>+ * Not all FPGA's support PR.</div><div class='add'>+</div><div class='add'>+Partial Reconfiguration Region (PRR)</div><div class='add'>+ * Also called a "reconfigurable partition"</div><div class='add'>+ * A PRR is a specific section of a FPGA reserved for reconfiguration.</div><div class='add'>+ * A base (or static) FPGA image may create a set of PRR's that later may</div><div class='add'>+   be independently reprogrammed many times.</div><div class='add'>+ * The size and specific location of each PRR is fixed.</div><div class='add'>+ * The connections at the edge of each PRR are fixed.  The image that is loaded</div><div class='add'>+   into a PRR must fit and must use a subset of the region's connections.</div><div class='add'>+ * The busses within the FPGA are split such that each region gets its own</div><div class='add'>+   branch that may be gated independently.</div><div class='add'>+</div><div class='add'>+Persona</div><div class='add'>+ * Also called a "partial bit stream"</div><div class='add'>+ * An FPGA image that is designed to be loaded into a PRR.  There may be</div><div class='add'>+   any number of personas designed to fit into a PRR, but only one at at time</div><div class='add'>+   may be loaded.</div><div class='add'>+ * A persona may create more regions.</div><div class='add'>+</div><div class='add'>+FPGA Bridge</div><div class='add'>+ * FPGA Bridges gate bus signals between a host and FPGA.</div><div class='add'>+ * FPGA Bridges should be disabled while the FPGA is being programmed to</div><div class='add'>+   prevent spurious signals on the cpu bus and to the soft logic.</div><div class='add'>+ * FPGA bridges may be actual hardware or soft logic on an FPGA.</div><div class='add'>+ * During Full Reconfiguration, hardware bridges between the host and FPGA</div><div class='add'>+   will be disabled.</div><div class='add'>+ * During Partial Reconfiguration of a specific region, that region's bridge</div><div class='add'>+   will be used to gate the busses.  Traffic to other regions is not affected.</div><div class='add'>+ * In some implementations, the FPGA Manager transparantly handles gating the</div><div class='add'>+   buses, eliminating the need to show the hardware FPGA bridges in the</div><div class='add'>+   device tree.</div><div class='add'>+ * An FPGA image may create a set of reprogrammable regions, each having its</div><div class='add'>+   own bridge and its own split of the busses in the FPGA.</div><div class='add'>+</div><div class='add'>+FPGA Manager</div><div class='add'>+ * An FPGA Manager is a hardware block that programs an FPGA under the control</div><div class='add'>+   of a host processor.</div><div class='add'>+</div><div class='add'>+Base Image</div><div class='add'>+ * Also called the "static image"</div><div class='add'>+ * An FPGA image that is designed to do full reconfiguration of the FPGA.</div><div class='add'>+ * A base image may set up a set of partial reconfiguration regions that may</div><div class='add'>+   later be reprogrammed.</div><div class='add'>+</div><div class='add'>+    ----------------       ----------------------------------</div><div class='add'>+    |  Host CPU    |       |             FPGA               |</div><div class='add'>+    |              |       |                                |</div><div class='add'>+    |          ----|       |       -----------    --------  |</div><div class='add'>+    |          | H |       |   |==&gt;| Bridge0 |&lt;==&gt;| PRR0 |  |</div><div class='add'>+    |          | W |       |   |   -----------    --------  |</div><div class='add'>+    |          |   |       |   |                            |</div><div class='add'>+    |          | B |&lt;=====&gt;|&lt;==|   -----------    --------  |</div><div class='add'>+    |          | R |       |   |==&gt;| Bridge1 |&lt;==&gt;| PRR1 |  |</div><div class='add'>+    |          | I |       |   |   -----------    --------  |</div><div class='add'>+    |          | D |       |   |                            |</div><div class='add'>+    |          | G |       |   |   -----------    --------  |</div><div class='add'>+    |          | E |       |   |==&gt;| Bridge2 |&lt;==&gt;| PRR2 |  |</div><div class='add'>+    |          ----|       |       -----------    --------  |</div><div class='add'>+    |              |       |                                |</div><div class='add'>+    ----------------       ----------------------------------</div><div class='add'>+</div><div class='add'>+Figure 1: An FPGA set up with a base image that created three regions.  Each</div><div class='add'>+region (PRR0-2) gets its own split of the busses that is independently gated by</div><div class='add'>+a soft logic bridge (Bridge0-2) in the FPGA.  The contents of each PRR can be</div><div class='add'>+reprogrammed independently while the rest of the system continues to function.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Sequence</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+When a DT overlay that targets a FPGA Region is applied, the FPGA Region will</div><div class='add'>+do the following:</div><div class='add'>+</div><div class='add'>+ 1. Disable appropriate FPGA bridges.</div><div class='add'>+ 2. Program the FPGA using the FPGA manager.</div><div class='add'>+ 3. Enable the FPGA bridges.</div><div class='add'>+ 4. The Device Tree overlay is accepted into the live tree.</div><div class='add'>+ 5. Child devices are populated.</div><div class='add'>+</div><div class='add'>+When the overlay is removed, the child nodes will be removed and the FPGA Region</div><div class='add'>+will disable the bridges.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+FPGA Region</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+FPGA Regions represent FPGA's and FPGA PR regions in the device tree.  An FPGA</div><div class='add'>+Region brings together the elements needed to program on a running system and</div><div class='add'>+add the child devices:</div><div class='add'>+</div><div class='add'>+ * FPGA Manager</div><div class='add'>+ * FPGA Bridges</div><div class='add'>+ * image-specific information needed to to the programming.</div><div class='add'>+ * child nodes</div><div class='add'>+</div><div class='add'>+The intended use is that a Device Tree overlay (DTO) can be used to reprogram an</div><div class='add'>+FPGA while an operating system is running.</div><div class='add'>+</div><div class='add'>+An FPGA Region that exists in the live Device Tree reflects the current state.</div><div class='add'>+If the live tree shows a "firmware-name" property or child nodes under a FPGA</div><div class='add'>+Region, the FPGA already has been programmed.  A DTO that targets a FPGA Region</div><div class='add'>+and adds the "firmware-name" property is taken as a request to reprogram the</div><div class='add'>+FPGA.  After reprogramming is successful, the overlay is accepted into the live</div><div class='add'>+tree.</div><div class='add'>+</div><div class='add'>+The base FPGA Region in the device tree represents the FPGA and supports full</div><div class='add'>+reconfiguration.  It must include a phandle to an FPGA Manager.  The base</div><div class='add'>+FPGA region will be the child of one of the hardware bridges (the bridge that</div><div class='add'>+allows register access) between the cpu and the FPGA.  If there are more than</div><div class='add'>+one bridge to control during FPGA programming, the region will also contain a</div><div class='add'>+list of phandles to the additional hardware FPGA Bridges.</div><div class='add'>+</div><div class='add'>+For partial reconfiguration (PR), each PR region will have an FPGA Region.</div><div class='add'>+These FPGA regions are children of FPGA bridges which are then children of the</div><div class='add'>+base FPGA region.  The "Full Reconfiguration to add PRR's" example below shows</div><div class='add'>+this.</div><div class='add'>+</div><div class='add'>+If an FPGA Region does not specify a FPGA Manager, it will inherit the FPGA</div><div class='add'>+Manager specified by its ancestor FPGA Region.  This supports both the case</div><div class='add'>+where the same FPGA Manager is used for all of a FPGA as well the case where</div><div class='add'>+a different FPGA Manager is used for each region.</div><div class='add'>+</div><div class='add'>+FPGA Regions do not inherit their ancestor FPGA regions' bridges.  This prevents</div><div class='add'>+shutting down bridges that are upstream from the other active regions while one</div><div class='add'>+region is getting reconfigured (see Figure 1 above).  During PR, the FPGA's</div><div class='add'>+hardware bridges remain enabled.  The PR regions' bridges will be FPGA bridges</div><div class='add'>+within the static image of the FPGA.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : should contain "fpga-region"</div><div class='add'>+- fpga-mgr : should contain a phandle to an FPGA Manager.  Child FPGA Regions</div><div class='add'>+	inherit this property from their ancestor regions.  A fpga-mgr property</div><div class='add'>+	in a region will override any inherited FPGA manager.</div><div class='add'>+- #address-cells, #size-cells, ranges : must be present to handle address space</div><div class='add'>+	mapping for child nodes.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- firmware-name : should contain the name of an FPGA image file located on the</div><div class='add'>+	firmware search path.  If this property shows up in a live device tree</div><div class='add'>+	it indicates that the FPGA has already been programmed with this image.</div><div class='add'>+	If this property is in an overlay targeting a FPGA region, it is a</div><div class='add'>+	request to program the FPGA with that image.</div><div class='add'>+- fpga-bridges : should contain a list of phandles to FPGA Bridges that must be</div><div class='add'>+	controlled during FPGA programming along with the parent FPGA bridge.</div><div class='add'>+	This property is optional if the FPGA Manager handles the bridges.</div><div class='add'>+        If the fpga-region is  the child of a fpga-bridge, the list should not</div><div class='add'>+        contain the parent bridge.</div><div class='add'>+- partial-fpga-config : boolean, set if partial reconfiguration is to be done,</div><div class='add'>+	otherwise full reconfiguration is done.</div><div class='add'>+- external-fpga-config : boolean, set if the FPGA has already been configured</div><div class='add'>+	prior to OS boot up.</div><div class='add'>+- region-unfreeze-timeout-us : The maximum time in microseconds to wait for</div><div class='add'>+	bridges to successfully become enabled after the region has been</div><div class='add'>+	programmed.</div><div class='add'>+- region-freeze-timeout-us : The maximum time in microseconds to wait for</div><div class='add'>+	bridges to successfully become disabled before the region has been</div><div class='add'>+	programmed.</div><div class='add'>+- child nodes : devices in the FPGA after programming.</div><div class='add'>+</div><div class='add'>+In the example below, when an overlay is applied targeting fpga-region0,</div><div class='add'>+fpga_mgr is used to program the FPGA.  Two bridges are controlled during</div><div class='add'>+programming: the parent fpga_bridge0 and fpga_bridge1.  Because the region is</div><div class='add'>+the child of fpga_bridge0, only fpga_bridge1 needs to be specified in the</div><div class='add'>+fpga-bridges property.  During programming, these bridges are disabled, the</div><div class='add'>+firmware specified in the overlay is loaded to the FPGA using the FPGA manager</div><div class='add'>+specified in the region.  If FPGA programming succeeds, the bridges are</div><div class='add'>+reenabled and the overlay makes it into the live device tree.  The child devices</div><div class='add'>+are then populated.  If FPGA programming fails, the bridges are left disabled</div><div class='add'>+and the overlay is rejected.  The overlay's ranges property maps the lwhps</div><div class='add'>+bridge's region (0xff200000) and the hps bridge's region (0xc0000000) for use by</div><div class='add'>+the two child devices.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+Base tree contains:</div><div class='add'>+</div><div class='add'>+	fpga_mgr: fpga-mgr@ff706000 {</div><div class='add'>+		compatible = "altr,socfpga-fpga-mgr";</div><div class='add'>+		reg = &lt;0xff706000 0x1000</div><div class='add'>+		       0xffb90000 0x20&gt;;</div><div class='add'>+		interrupts = &lt;0 175 4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fpga_bridge0: fpga-bridge@ff400000 {</div><div class='add'>+		compatible = "altr,socfpga-lwhps2fpga-bridge";</div><div class='add'>+		reg = &lt;0xff400000 0x100000&gt;;</div><div class='add'>+		resets = &lt;&amp;rst LWHPS2FPGA_RESET&gt;;</div><div class='add'>+		clocks = &lt;&amp;l4_main_clk&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		fpga_region0: fpga-region0 {</div><div class='add'>+			compatible = "fpga-region";</div><div class='add'>+			fpga-mgr = &lt;&amp;fpga_mgr&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fpga_bridge1: fpga-bridge@ff500000 {</div><div class='add'>+		compatible = "altr,socfpga-hps2fpga-bridge";</div><div class='add'>+		reg = &lt;0xff500000 0x10000&gt;;</div><div class='add'>+		resets = &lt;&amp;rst HPS2FPGA_RESET&gt;;</div><div class='add'>+		clocks = &lt;&amp;l4_main_clk&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Overlay contains:</div><div class='add'>+</div><div class='add'>+/dts-v1/ /plugin/;</div><div class='add'>+/ {</div><div class='add'>+	fragment@0 {</div><div class='add'>+		target = &lt;&amp;fpga_region0&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		__overlay__ {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			firmware-name = "soc_system.rbf";</div><div class='add'>+			fpga-bridges = &lt;&amp;fpga_bridge1&gt;;</div><div class='add'>+			ranges = &lt;0x20000 0xff200000 0x100000&gt;,</div><div class='add'>+				 &lt;0x0 0xc0000000 0x20000000&gt;;</div><div class='add'>+</div><div class='add'>+			gpio@10040 {</div><div class='add'>+				compatible = "altr,pio-1.0";</div><div class='add'>+				reg = &lt;0x10040 0x20&gt;;</div><div class='add'>+				altr,gpio-bank-width = &lt;4&gt;;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				clocks = &lt;2&gt;;</div><div class='add'>+				gpio-controller;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			onchip-memory {</div><div class='add'>+				device_type = "memory";</div><div class='add'>+				compatible = "altr,onchipmem-15.1";</div><div class='add'>+				reg = &lt;0x0 0x10000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Supported Use Models</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+In all cases the live DT must have the FPGA Manager, FPGA Bridges (if any), and</div><div class='add'>+a FPGA Region.  The target of the Device Tree Overlay is the FPGA Region.  Some</div><div class='add'>+uses are specific to a FPGA device.</div><div class='add'>+</div><div class='add'>+ * No FPGA Bridges</div><div class='add'>+   In this case, the FPGA Manager which programs the FPGA also handles the</div><div class='add'>+   bridges behind the scenes.  No FPGA Bridge devices are needed for full</div><div class='add'>+   reconfiguration.</div><div class='add'>+</div><div class='add'>+ * Full reconfiguration with hardware bridges</div><div class='add'>+   In this case, there are hardware bridges between the processor and FPGA that</div><div class='add'>+   need to be controlled during full reconfiguration.  Before the overlay is</div><div class='add'>+   applied, the live DT must include the FPGA Manager, FPGA Bridges, and a</div><div class='add'>+   FPGA Region.  The FPGA Region is the child of the bridge that allows</div><div class='add'>+   register access to the FPGA.  Additional bridges may be listed in a</div><div class='add'>+   fpga-bridges property in the FPGA region or in the device tree overlay.</div><div class='add'>+</div><div class='add'>+ * Partial reconfiguration with bridges in the FPGA</div><div class='add'>+   In this case, the FPGA will have one or more PRR's that may be programmed</div><div class='add'>+   separately while the rest of the FPGA can remain active.  To manage this,</div><div class='add'>+   bridges need to exist in the FPGA that can gate the buses going to each FPGA</div><div class='add'>+   region while the buses are enabled for other sections.  Before any partial</div><div class='add'>+   reconfiguration can be done, a base FPGA image must be loaded which includes</div><div class='add'>+   PRR's with FPGA bridges.  The device tree should have a FPGA region for each</div><div class='add'>+   PRR.</div><div class='add'>+</div><div class='add'>+Device Tree Examples</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+The intention of this section is to give some simple examples, focusing on</div><div class='add'>+the placement of the elements detailed above, especially:</div><div class='add'>+ * FPGA Manager</div><div class='add'>+ * FPGA Bridges</div><div class='add'>+ * FPGA Region</div><div class='add'>+ * ranges</div><div class='add'>+ * target-path or target</div><div class='add'>+</div><div class='add'>+For the purposes of this section, I'm dividing the Device Tree into two parts,</div><div class='add'>+each with its own requirements.  The two parts are:</div><div class='add'>+ * The live DT prior to the overlay being added</div><div class='add'>+ * The DT overlay</div><div class='add'>+</div><div class='add'>+The live Device Tree must contain an FPGA Region, an FPGA Manager, and any FPGA</div><div class='add'>+Bridges.  The FPGA Region's "fpga-mgr" property specifies the manager by phandle</div><div class='add'>+to handle programming the FPGA.  If the FPGA Region is the child of another FPGA</div><div class='add'>+Region, the parent's FPGA Manager is used.  If FPGA Bridges need to be involved,</div><div class='add'>+they are specified in the FPGA Region by the "fpga-bridges" property.  During</div><div class='add'>+FPGA programming, the FPGA Region will disable the bridges that are in its</div><div class='add'>+"fpga-bridges" list and will re-enable them after FPGA programming has</div><div class='add'>+succeeded.</div><div class='add'>+</div><div class='add'>+The Device Tree Overlay will contain:</div><div class='add'>+ * "target-path" or "target"</div><div class='add'>+   The insertion point where the the contents of the overlay will go into the</div><div class='add'>+   live tree.  target-path is a full path, while target is a phandle.</div><div class='add'>+ * "ranges"</div><div class='add'>+    The address space mapping from processor to FPGA bus(ses).</div><div class='add'>+ * "firmware-name"</div><div class='add'>+   Specifies the name of the FPGA image file on the firmware search</div><div class='add'>+   path.  The search path is described in the firmware class documentation.</div><div class='add'>+ * "partial-fpga-config"</div><div class='add'>+   This binding is a boolean and should be present if partial reconfiguration</div><div class='add'>+   is to be done.</div><div class='add'>+ * child nodes corresponding to hardware that will be loaded in this region of</div><div class='add'>+   the FPGA.</div><div class='add'>+</div><div class='add'>+Device Tree Example: Full Reconfiguration without Bridges</div><div class='add'>+=========================================================</div><div class='add'>+</div><div class='add'>+Live Device Tree contains:</div><div class='add'>+	fpga_mgr0: fpga-mgr@f8007000 {</div><div class='add'>+		compatible = "xlnx,zynq-devcfg-1.0";</div><div class='add'>+		reg = &lt;0xf8007000 0x100&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+		interrupts = &lt;0 8 4&gt;;</div><div class='add'>+		clocks = &lt;&amp;clkc 12&gt;;</div><div class='add'>+		clock-names = "ref_clk";</div><div class='add'>+		syscon = &lt;&amp;slcr&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fpga_region0: fpga-region0 {</div><div class='add'>+		compatible = "fpga-region";</div><div class='add'>+		fpga-mgr = &lt;&amp;fpga_mgr0&gt;;</div><div class='add'>+		#address-cells = &lt;0x1&gt;;</div><div class='add'>+		#size-cells = &lt;0x1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+DT Overlay contains:</div><div class='add'>+/dts-v1/ /plugin/;</div><div class='add'>+/ {</div><div class='add'>+fragment@0 {</div><div class='add'>+	target = &lt;&amp;fpga_region0&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	__overlay__ {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		firmware-name = "zynq-gpio.bin";</div><div class='add'>+</div><div class='add'>+		gpio1: gpio@40000000 {</div><div class='add'>+			compatible = "xlnx,xps-gpio-1.00.a";</div><div class='add'>+			reg = &lt;0x40000000 0x10000&gt;;</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;0x2&gt;;</div><div class='add'>+			xlnx,gpio-width= &lt;0x6&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Device Tree Example: Full Reconfiguration to add PRR's</div><div class='add'>+======================================================</div><div class='add'>+</div><div class='add'>+The base FPGA Region is specified similar to the first example above.</div><div class='add'>+</div><div class='add'>+This example programs the FPGA to have two regions that can later be partially</div><div class='add'>+configured.  Each region has its own bridge in the FPGA fabric.</div><div class='add'>+</div><div class='add'>+DT Overlay contains:</div><div class='add'>+/dts-v1/ /plugin/;</div><div class='add'>+/ {</div><div class='add'>+	fragment@0 {</div><div class='add'>+		target = &lt;&amp;fpga_region0&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		__overlay__ {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			firmware-name = "base.rbf";</div><div class='add'>+</div><div class='add'>+			fpga-bridge@4400 {</div><div class='add'>+				compatible = "altr,freeze-bridge";</div><div class='add'>+				reg = &lt;0x4400 0x10&gt;;</div><div class='add'>+</div><div class='add'>+				fpga_region1: fpga-region1 {</div><div class='add'>+					compatible = "fpga-region";</div><div class='add'>+					#address-cells = &lt;0x1&gt;;</div><div class='add'>+					#size-cells = &lt;0x1&gt;;</div><div class='add'>+					ranges;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			fpga-bridge@4420 {</div><div class='add'>+				compatible = "altr,freeze-bridge";</div><div class='add'>+				reg = &lt;0x4420 0x10&gt;;</div><div class='add'>+</div><div class='add'>+				fpga_region2: fpga-region2 {</div><div class='add'>+					compatible = "fpga-region";</div><div class='add'>+					#address-cells = &lt;0x1&gt;;</div><div class='add'>+					#size-cells = &lt;0x1&gt;;</div><div class='add'>+					ranges;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Device Tree Example: Partial Reconfiguration</div><div class='add'>+============================================</div><div class='add'>+</div><div class='add'>+This example reprograms one of the PRR's set up in the previous example.</div><div class='add'>+</div><div class='add'>+The sequence that occurs when this overlay is similar to the above, the only</div><div class='add'>+differences are that the FPGA is partially reconfigured due to the</div><div class='add'>+"partial-fpga-config" boolean and the only bridge that is controlled during</div><div class='add'>+programming is the FPGA based bridge of fpga_region1.</div><div class='add'>+</div><div class='add'>+/dts-v1/ /plugin/;</div><div class='add'>+/ {</div><div class='add'>+	fragment@0 {</div><div class='add'>+		target = &lt;&amp;fpga_region1&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		__overlay__ {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			firmware-name = "soc_image2.rbf";</div><div class='add'>+			partial-fpga-config;</div><div class='add'>+</div><div class='add'>+			gpio@10040 {</div><div class='add'>+				compatible = "altr,pio-1.0";</div><div class='add'>+				reg = &lt;0x10040 0x20&gt;;</div><div class='add'>+				clocks = &lt;0x2&gt;;</div><div class='add'>+				altr,gpio-bank-width = &lt;0x4&gt;;</div><div class='add'>+				resetvalue = &lt;0x0&gt;;</div><div class='add'>+				#gpio-cells = &lt;0x2&gt;;</div><div class='add'>+				gpio-controller;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Constraints</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+It is beyond the scope of this document to fully describe all the FPGA design</div><div class='add'>+constraints required to make partial reconfiguration work[1] [2] [3], but a few</div><div class='add'>+deserve quick mention.</div><div class='add'>+</div><div class='add'>+A persona must have boundary connections that line up with those of the partion</div><div class='add'>+or region it is designed to go into.</div><div class='add'>+</div><div class='add'>+During programming, transactions through those connections must be stopped and</div><div class='add'>+the connections must be held at a fixed logic level.  This can be achieved by</div><div class='add'>+FPGA Bridges that exist on the FPGA fabric prior to the partial reconfiguration.</div><div class='add'>+</div><div class='add'>+--</div><div class='add'>+[1] www.altera.com/content/dam/altera-www/global/en_US/pdfs/literature/ug/ug_partrecon.pdf</div><div class='add'>+[2] tspace.library.utoronto.ca/bitstream/1807/67932/1/Byma_Stuart_A_201411_MAS_thesis.pdf</div><div class='add'>+[3] http://www.xilinx.com/support/documentation/sw_manuals/xilinx14_1/ug702.pdf</div><div class='head'>diff --git a/Documentation/devicetree/bindings/gpio/cortina,gemini-gpio.txt b/Documentation/devicetree/bindings/gpio/cortina,gemini-gpio.txt<br/>new file mode 100644<br/>index 000000000000..5c9246c054e5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/gpio/cortina,gemini-gpio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpio/cortina,gemini-gpio.txt</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+Cortina Systems Gemini GPIO Controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible : Must be "cortina,gemini-gpio"</div><div class='add'>+- reg : Should contain registers location and length</div><div class='add'>+- interrupts : Should contain the interrupt line for the GPIO block</div><div class='add'>+- gpio-controller : marks this as a GPIO controller</div><div class='add'>+- #gpio-cells : Should be 2, see gpio/gpio.txt</div><div class='add'>+- interrupt-controller : marks this as an interrupt controller</div><div class='add'>+- #interrupt-cells : a standard two-cell interrupt flag, see</div><div class='add'>+  interrupt-controller/interrupts.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+gpio@4d000000 {</div><div class='add'>+	compatible = "cortina,gemini-gpio";</div><div class='add'>+	reg = &lt;0x4d000000 0x100&gt;;</div><div class='add'>+	interrupts = &lt;22 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	gpio-controller;</div><div class='add'>+	#gpio-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-controller;</div><div class='add'>+	#interrupt-cells = &lt;2&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt b/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt<br/>index 08dd15f89ba9..e63935710011 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/gpio/gpio-pca953x.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/gpio/gpio-pca953x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpio/gpio-pca953x.txt</a></div><div class='hunk'>@@ -29,6 +29,10 @@ Required properties:</div><div class='ctx'> 	onsemi,pca9654</div><div class='ctx'> 	exar,xra1202</div><div class='ctx'> </div><div class='add'>+Optional properties:</div><div class='add'>+ - reset-gpios: GPIO specification for the RESET input. This is an</div><div class='add'>+		active low signal to the PCA953x.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/gpio/gpio-sx150x.txt b/Documentation/devicetree/bindings/gpio/gpio-sx150x.txt<br/>deleted file mode 100644<br/>index c809acb9c71b..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/gpio/gpio-sx150x.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/gpio/gpio-sx150x.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-SEMTECH SX150x GPIO expander bindings</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-</div><div class='del'>-- compatible: should be "semtech,sx1506q",</div><div class='del'>-			"semtech,sx1508q",</div><div class='del'>-			"semtech,sx1509q",</div><div class='del'>-			"semtech,sx1502q".</div><div class='del'>-</div><div class='del'>-- reg: The I2C slave address for this device.</div><div class='del'>-</div><div class='del'>-- interrupt-parent: phandle of the parent interrupt controller.</div><div class='del'>-</div><div class='del'>-- interrupts: Interrupt specifier for the controllers interrupt.</div><div class='del'>-</div><div class='del'>-- #gpio-cells: Should be 2. The first cell is the GPIO number and the</div><div class='del'>-		second cell is used to specify optional parameters:</div><div class='del'>-		bit 0: polarity (0: normal, 1: inverted)</div><div class='del'>-</div><div class='del'>-- gpio-controller: Marks the device as a GPIO controller.</div><div class='del'>-</div><div class='del'>-- interrupt-controller: Marks the device as a interrupt controller.</div><div class='del'>-</div><div class='del'>-The GPIO expander can optionally be used as an interrupt controller, in</div><div class='del'>-which case it uses the default two cell specifier as described in</div><div class='del'>-Documentation/devicetree/bindings/interrupt-controller/interrupts.txt.</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-	i2c_gpio_expander@20{</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		compatible = "semtech,sx1506q";</div><div class='del'>-		reg = &lt;0x20&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;gpio_1&gt;;</div><div class='del'>-		interrupts = &lt;16 0&gt;;</div><div class='del'>-</div><div class='del'>-		gpio-controller;</div><div class='del'>-		interrupt-controller;</div><div class='del'>-	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/gpio/gpio.txt b/Documentation/devicetree/bindings/gpio/gpio.txt<br/>index 68d28f62a6f4..84ede036f73d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/gpio/gpio.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/gpio/gpio.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/gpio/gpio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpio/gpio.txt</a></div><div class='hunk'>@@ -187,10 +187,10 @@ gpio-controller's driver probe function.</div><div class='ctx'> </div><div class='ctx'> Each GPIO hog definition is represented as a child node of the GPIO controller.</div><div class='ctx'> Required properties:</div><div class='del'>-- gpio-hog:   A property specifying that this child node represent a GPIO hog.</div><div class='del'>-- gpios:      Store the GPIO information (id, flags, ...). Shall contain the</div><div class='del'>-	      number of cells specified in its parent node (GPIO controller</div><div class='del'>-	      node).</div><div class='add'>+- gpio-hog:   A property specifying that this child node represents a GPIO hog.</div><div class='add'>+- gpios:      Store the GPIO information (id, flags, ...) for each GPIO to</div><div class='add'>+	      affect. Shall contain an integer multiple of the number of cells</div><div class='add'>+	      specified in its parent node (GPIO controller node).</div><div class='ctx'> Only one of the following properties scanned in the order shown below.</div><div class='ctx'> This means that when multiple properties are present they will be searched</div><div class='ctx'> in the order presented below and the first match is taken as the intended</div><div class='head'>diff --git a/Documentation/devicetree/bindings/gpio/gpio_oxnas.txt b/Documentation/devicetree/bindings/gpio/gpio_oxnas.txt<br/>index 928ed4f43907..966514744df4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/gpio/gpio_oxnas.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/gpio/gpio_oxnas.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/gpio/gpio_oxnas.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpio/gpio_oxnas.txt</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> Please refer to gpio.txt for generic information regarding GPIO bindings.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>- - compatible: "oxsemi,ox810se-gpio"</div><div class='add'>+ - compatible: "oxsemi,ox810se-gpio" or "oxsemi,ox820-gpio"</div><div class='ctx'>  - reg: Base address and length for the device.</div><div class='ctx'>  - interrupts: The port interrupt shared by all pins.</div><div class='ctx'>  - gpio-controller: Marks the port as GPIO controller.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt<br/>index c3d016532d8e..30fd2201b3d4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/gpio/mrvl-gpio.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpio/mrvl-gpio.txt</a></div><div class='hunk'>@@ -17,7 +17,9 @@ Required properties:</div><div class='ctx'> - #interrupt-cells: Specifies the number of cells needed to encode an</div><div class='ctx'>   interrupt source.</div><div class='ctx'> - gpio-controller : Marks the device node as a gpio controller.</div><div class='del'>-- #gpio-cells : Should be one.  It is the pin number.</div><div class='add'>+- #gpio-cells : Should be two.  The first cell is the pin number and</div><div class='add'>+  the second cell is used to specify flags. See gpio.txt for possible</div><div class='add'>+  values.</div><div class='ctx'> </div><div class='ctx'> Example for a MMP platform:</div><div class='ctx'> </div><div class='hunk'>@@ -27,7 +29,7 @@ Example for a MMP platform:</div><div class='ctx'> 		interrupts = &lt;49&gt;;</div><div class='ctx'> 		interrupt-names = "gpio_mux";</div><div class='ctx'> 		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;1&gt;;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'>       };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt<br/>new file mode 100644<br/>index 000000000000..476f5ea6c627<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+ARM Mali Utgard GPU</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible</div><div class='add'>+    * Must be one of the following:</div><div class='add'>+      + "arm,mali-300"</div><div class='add'>+      + "arm,mali-400"</div><div class='add'>+      + "arm,mali-450"</div><div class='add'>+    * And, optionally, one of the vendor specific compatible:</div><div class='add'>+      + allwinner,sun4i-a10-mali</div><div class='add'>+      + allwinner,sun7i-a20-mali</div><div class='add'>+      + amlogic,meson-gxbb-mali</div><div class='add'>+      + amlogic,meson-gxl-mali</div><div class='add'>+      + stericsson,db8500-mali</div><div class='add'>+</div><div class='add'>+  - reg: Physical base address and length of the GPU registers</div><div class='add'>+</div><div class='add'>+  - interrupts: an entry for each entry in interrupt-names.</div><div class='add'>+    See ../interrupt-controller/interrupts.txt for details.</div><div class='add'>+</div><div class='add'>+  - interrupt-names:</div><div class='add'>+    * ppX: Pixel Processor X interrupt (X from 0 to 7)</div><div class='add'>+    * ppmmuX: Pixel Processor X MMU interrupt (X from 0 to 7)</div><div class='add'>+    * pp: Pixel Processor broadcast interrupt (mali-450 only)</div><div class='add'>+    * gp: Geometry Processor interrupt</div><div class='add'>+    * gpmmu: Geometry Processor MMU interrupt</div><div class='add'>+</div><div class='add'>+  - clocks: an entry for each entry in clock-names</div><div class='add'>+  - clock-names:</div><div class='add'>+    * bus: bus clock for the GPU</div><div class='add'>+    * core: clock driving the GPU itself</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+  - interrupt-names and interrupts:</div><div class='add'>+    * pmu: Power Management Unit interrupt, if implemented in hardware</div><div class='add'>+</div><div class='add'>+Vendor-specific bindings</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+The Mali GPU is integrated very differently from one SoC to</div><div class='add'>+another. In order to accomodate those differences, you have the option</div><div class='add'>+to specify one more vendor-specific compatible, among:</div><div class='add'>+</div><div class='add'>+  - allwinner,sun4i-a10-mali</div><div class='add'>+    Required properties:</div><div class='add'>+      * resets: phandle to the reset line for the GPU</div><div class='add'>+</div><div class='add'>+  - allwinner,sun7i-a20-mali</div><div class='add'>+    Required properties:</div><div class='add'>+      * resets: phandle to the reset line for the GPU</div><div class='add'>+</div><div class='add'>+  - stericsson,db8500-mali</div><div class='add'>+    Required properties:</div><div class='add'>+      * interrupt-names and interrupts:</div><div class='add'>+        + combined: combined interrupt of all of the above lines</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+mali: gpu@1c40000 {</div><div class='add'>+	compatible = "allwinner,sun7i-a20-mali", "arm,mali-400";</div><div class='add'>+	reg = &lt;0x01c40000 0x10000&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	interrupt-names = "gp",</div><div class='add'>+			  "gpmmu",</div><div class='add'>+			  "pp0",</div><div class='add'>+			  "ppmmu0",</div><div class='add'>+			  "pp1",</div><div class='add'>+			  "ppmmu1",</div><div class='add'>+			  "pmu";</div><div class='add'>+	clocks = &lt;&amp;ccu CLK_BUS_GPU&gt;, &lt;&amp;ccu CLK_GPU&gt;;</div><div class='add'>+	clock-names = "bus", "core";</div><div class='add'>+	resets = &lt;&amp;ccu RST_BUS_GPU&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/adc128d818.txt b/Documentation/devicetree/bindings/hwmon/adc128d818.txt<br/>new file mode 100644<br/>index 000000000000..08bab0e94d25<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/hwmon/adc128d818.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/adc128d818.txt</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+TI ADC128D818 ADC System Monitor With Temperature Sensor</div><div class='add'>+--------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Operation modes:</div><div class='add'>+</div><div class='add'>+ - Mode 0:  7 single-ended voltage readings (IN0-IN6),</div><div class='add'>+            1 temperature reading (internal)</div><div class='add'>+ - Mode 1:  8 single-ended voltage readings (IN0-IN7),</div><div class='add'>+            no temperature</div><div class='add'>+ - Mode 2:  4 pseudo-differential voltage readings</div><div class='add'>+              (IN0-IN1, IN3-IN2, IN4-IN5, IN7-IN6),</div><div class='add'>+            1 temperature reading (internal)</div><div class='add'>+ - Mode 3:  4 single-ended voltage readings (IN0-IN3),</div><div class='add'>+            2 pseudo-differential voltage readings</div><div class='add'>+              (IN4-IN5, IN7-IN6),</div><div class='add'>+            1 temperature reading (internal)</div><div class='add'>+</div><div class='add'>+If no operation mode is configured via device tree, the driver keeps the</div><div class='add'>+currently active chip operation mode (default is mode 0).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Required node properties:</div><div class='add'>+</div><div class='add'>+ - compatible:  must be set to "ti,adc128d818"</div><div class='add'>+ - reg:         I2C address of the device</div><div class='add'>+</div><div class='add'>+Optional node properties:</div><div class='add'>+</div><div class='add'>+ - ti,mode:     Operation mode (see above).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example (operation mode 2):</div><div class='add'>+</div><div class='add'>+	adc128d818@1d {</div><div class='add'>+		compatible = "ti,adc128d818";</div><div class='add'>+		reg = &lt;0x1d&gt;;</div><div class='add'>+		ti,mode = &lt;2&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/lm70.txt b/Documentation/devicetree/bindings/hwmon/lm70.txt<br/>index e7fd921aa4f1..ea417a0d32af 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/hwmon/lm70.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/hwmon/lm70.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/hwmon/lm70.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/lm70.txt</a></div><div class='hunk'>@@ -4,6 +4,7 @@ Required properties:</div><div class='ctx'> - compatible: one of</div><div class='ctx'> 		"ti,lm70"</div><div class='ctx'> 		"ti,tmp121"</div><div class='add'>+		"ti,tmp122"</div><div class='ctx'> 		"ti,lm71"</div><div class='ctx'> 		"ti,lm74"</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/lm90.txt b/Documentation/devicetree/bindings/hwmon/lm90.txt<br/>index e8632486b9ef..97581266e329 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/hwmon/lm90.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/hwmon/lm90.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/hwmon/lm90.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/lm90.txt</a></div><div class='hunk'>@@ -33,6 +33,11 @@ Optional properties:</div><div class='ctx'>               LM90 "-ALERT" pin output.</div><div class='ctx'>               See interrupt-controller/interrupts.txt for the format.</div><div class='ctx'> </div><div class='add'>+- #thermal-sensor-cells: should be set to 1. See thermal/thermal.txt for</div><div class='add'>+	      details. See &lt;include/dt-bindings/thermal/lm90.h&gt; for the</div><div class='add'>+	      definition of the local, remote and 2nd remote sensor index</div><div class='add'>+	      constants.</div><div class='add'>+</div><div class='ctx'> Example LM90 node:</div><div class='ctx'> </div><div class='ctx'> temp-sensor {</div><div class='hunk'>@@ -41,4 +46,5 @@ temp-sensor {</div><div class='ctx'> 	vcc-supply = &lt;&amp;palmas_ldo6_reg&gt;;</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gpio&gt;;</div><div class='ctx'> 	interrupts = &lt;TEGRA_GPIO(O, 4) IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	#thermal-sensor-cells = &lt;1&gt;;</div><div class='ctx'> }</div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/mcp3021.txt b/Documentation/devicetree/bindings/hwmon/mcp3021.txt<br/>new file mode 100644<br/>index 000000000000..294318ba6914<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/hwmon/mcp3021.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/mcp3021.txt</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+mcp3021 properties</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Must be one of the following:</div><div class='add'>+	- "microchip,mcp3021" for mcp3021</div><div class='add'>+	- "microchip,mcp3221" for mcp3221</div><div class='add'>+- reg: I2C address</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- reference-voltage-microvolt</div><div class='add'>+	Reference voltage in microvolt (uV)</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+mcp3021@4d {</div><div class='add'>+	compatible = "microchip,mcp3021";</div><div class='add'>+	reg = &lt;0x4d&gt;;</div><div class='add'>+</div><div class='add'>+	reference-voltage-microvolt = &lt;4500000&gt;; /* 4.5 V */</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/sht15.txt b/Documentation/devicetree/bindings/hwmon/sht15.txt<br/>new file mode 100644<br/>index 000000000000..6a80277cc426<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/hwmon/sht15.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/sht15.txt</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+Sensirion SHT15 Humidity and Temperature Sensor</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+ - "compatible": must be "sensirion,sht15".</div><div class='add'>+ - "data-gpios": GPIO connected to the data line.</div><div class='add'>+ - "clk-gpios": GPIO connected to the clock line.</div><div class='add'>+ - "vcc-supply": regulator that drives the VCC pin.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	sensor {</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_sensor&gt;;</div><div class='add'>+		compatible = "sensirion,sht15";</div><div class='add'>+		clk-gpios = &lt;&amp;gpio4 12 0&gt;;</div><div class='add'>+		data-gpios = &lt;&amp;gpio4 13 0&gt;;</div><div class='add'>+		vcc-supply = &lt;&amp;reg_sht15&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/stts751.txt b/Documentation/devicetree/bindings/hwmon/stts751.txt<br/>new file mode 100644<br/>index 000000000000..3ee1dc30e72f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/hwmon/stts751.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/stts751.txt</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+* STTS751 thermometer.</div><div class='add'>+</div><div class='add'>+Required node properties:</div><div class='add'>+- compatible: "stts751"</div><div class='add'>+- reg: I2C bus address of the device</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- smbus-timeout-disable: when set, the smbus timeout function will be disabled</div><div class='add'>+</div><div class='add'>+Example stts751 node:</div><div class='add'>+</div><div class='add'>+temp-sensor {</div><div class='add'>+	compatible = "stts751";</div><div class='add'>+	reg = &lt;0x48&gt;;</div><div class='add'>+}</div><div class='head'>diff --git a/Documentation/devicetree/bindings/hwmon/tmp108.txt b/Documentation/devicetree/bindings/hwmon/tmp108.txt<br/>new file mode 100644<br/>index 000000000000..8c4b10df86d9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/hwmon/tmp108.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/hwmon/tmp108.txt</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+TMP108 temperature sensor</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+This device supports I2C only.</div><div class='add'>+</div><div class='add'>+Requires node properties:</div><div class='add'>+- compatible : "ti,tmp108"</div><div class='add'>+- reg : the I2C address of the device. This is 0x48, 0x49, 0x4a, or 0x4b.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	tmp108@48 {</div><div class='add'>+		compatible = "ti,tmp108";</div><div class='add'>+		reg = &lt;0x48&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt b/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt<br/>new file mode 100644<br/>index 000000000000..70c054a9a997<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+* Freescale Low Power Inter IC (LPI2C) for i.MX</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible :</div><div class='add'>+  - "fsl,imx7ulp-lpi2c" for LPI2C compatible with the one integrated on i.MX7ULP soc</div><div class='add'>+  - "fsl,imx8dv-lpi2c" for LPI2C compatible with the one integrated on i.MX8DV soc</div><div class='add'>+- reg : address and length of the lpi2c master registers</div><div class='add'>+- interrupt-parent : core interrupt controller</div><div class='add'>+- interrupts : lpi2c interrupt</div><div class='add'>+- clocks : lpi2c clock specifier</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+lpi2c7: lpi2c7@40A50000 {</div><div class='add'>+	compatible = "fsl,imx8dv-lpi2c";</div><div class='add'>+	reg = &lt;0x40A50000 0x10000&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	clocks = &lt;&amp;clks IMX7ULP_CLK_LPI2C7&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt<br/>index cf53d5fba20a..aa097045a10e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt</a></div><div class='hunk'>@@ -19,7 +19,14 @@ Optional Properties:</div><div class='ctx'>   - i2c-mux-idle-disconnect: Boolean; if defined, forces mux to disconnect all</div><div class='ctx'>     children in idle state. This is necessary for example, if there are several</div><div class='ctx'>     multiplexers on the bus and the devices behind them use same I2C addresses.</div><div class='del'>-</div><div class='add'>+  - interrupt-parent: Phandle for the interrupt controller that services</div><div class='add'>+    interrupts for this device.</div><div class='add'>+  - interrupts: Interrupt mapping for IRQ.</div><div class='add'>+  - interrupt-controller: Marks the device node as an interrupt controller.</div><div class='add'>+  - #interrupt-cells : Should be two.</div><div class='add'>+    - first cell is the pin number</div><div class='add'>+    - second cell is used to specify flags.</div><div class='add'>+    See also Documentation/devicetree/bindings/interrupt-controller/interrupts.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='hunk'>@@ -29,6 +36,11 @@ Example:</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		reg = &lt;0x74&gt;;</div><div class='ctx'> </div><div class='add'>+		interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='add'>+		interrupts = &lt;17 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='ctx'> 		i2c@2 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-pxa.txt b/Documentation/devicetree/bindings/i2c/i2c-pxa.txt<br/>index 12b78ac507e9..d30f0b11d853 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c-pxa.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/i2c/i2c-pxa.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c-pxa.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-pxa.txt</a></div><div class='hunk'>@@ -7,6 +7,7 @@ Required properties :</div><div class='ctx'>    compatible processor, e.g. pxa168, pxa910, mmp2, mmp3.</div><div class='ctx'>    For the pxa2xx/pxa3xx, an additional node "mrvl,pxa-i2c" is required</div><div class='ctx'>    as shown in the example below.</div><div class='add'>+   For the Armada 3700, the compatible should be "marvell,armada-3700-i2c".</div><div class='ctx'> </div><div class='ctx'> Recommended properties :</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-rcar.txt b/Documentation/devicetree/bindings/i2c/i2c-rcar.txt<br/>index 239632a0d709..2b8bd33dbf8d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c-rcar.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/i2c/i2c-rcar.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c-rcar.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-rcar.txt</a></div><div class='hunk'>@@ -1,17 +1,25 @@</div><div class='ctx'> I2C for R-Car platforms</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Must be one of</div><div class='del'>-	"renesas,i2c-rcar"</div><div class='del'>-	"renesas,i2c-r8a7778"</div><div class='del'>-	"renesas,i2c-r8a7779"</div><div class='del'>-	"renesas,i2c-r8a7790"</div><div class='del'>-	"renesas,i2c-r8a7791"</div><div class='del'>-	"renesas,i2c-r8a7792"</div><div class='del'>-	"renesas,i2c-r8a7793"</div><div class='del'>-	"renesas,i2c-r8a7794"</div><div class='del'>-	"renesas,i2c-r8a7795"</div><div class='del'>-	"renesas,i2c-r8a7796"</div><div class='add'>+- compatible:</div><div class='add'>+	"renesas,i2c-r8a7778" if the device is a part of a R8A7778 SoC.</div><div class='add'>+	"renesas,i2c-r8a7779" if the device is a part of a R8A7779 SoC.</div><div class='add'>+	"renesas,i2c-r8a7790" if the device is a part of a R8A7790 SoC.</div><div class='add'>+	"renesas,i2c-r8a7791" if the device is a part of a R8A7791 SoC.</div><div class='add'>+	"renesas,i2c-r8a7792" if the device is a part of a R8A7792 SoC.</div><div class='add'>+	"renesas,i2c-r8a7793" if the device is a part of a R8A7793 SoC.</div><div class='add'>+	"renesas,i2c-r8a7794" if the device is a part of a R8A7794 SoC.</div><div class='add'>+	"renesas,i2c-r8a7795" if the device is a part of a R8A7795 SoC.</div><div class='add'>+	"renesas,i2c-r8a7796" if the device is a part of a R8A7796 SoC.</div><div class='add'>+	"renesas,rcar-gen1-i2c" for a generic R-Car Gen1 compatible device.</div><div class='add'>+	"renesas,rcar-gen2-i2c" for a generic R-Car Gen2 compatible device.</div><div class='add'>+	"renesas,rcar-gen3-i2c" for a generic R-Car Gen3 compatible device.</div><div class='add'>+	"renesas,i2c-rcar" (deprecated)</div><div class='add'>+</div><div class='add'>+	When compatible with the generic version, nodes must list the</div><div class='add'>+	SoC-specific version corresponding to the platform first followed</div><div class='add'>+	by the generic version.</div><div class='add'>+</div><div class='ctx'> - reg: physical base address of the controller and length of memory mapped</div><div class='ctx'>   region.</div><div class='ctx'> - interrupts: interrupt specifier.</div><div class='hunk'>@@ -33,7 +41,7 @@ Examples :</div><div class='ctx'> i2c0: i2c@e6508000 {</div><div class='ctx'> 	#address-cells = &lt;1&gt;;</div><div class='ctx'> 	#size-cells = &lt;0&gt;;</div><div class='del'>-	compatible = "renesas,i2c-r8a7791";</div><div class='add'>+	compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 	reg = &lt;0 0xe6508000 0 0x40&gt;;</div><div class='ctx'> 	interrupts = &lt;0 287 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 	clocks = &lt;&amp;mstp9_clks R8A7791_CLK_I2C0&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt b/Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt<br/>index 214f94c25d37..ae9c2a735f39 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt</a></div><div class='hunk'>@@ -1,8 +1,7 @@</div><div class='ctx'> Device tree configuration for Renesas IIC (sh_mobile) driver</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible      : "renesas,iic-&lt;soctype&gt;". "renesas,rmobile-iic" as fallback</div><div class='del'>-		     Examples with soctypes are:</div><div class='add'>+- compatible      :</div><div class='ctx'> 			- "renesas,iic-r8a73a4" (R-Mobile APE6)</div><div class='ctx'> 			- "renesas,iic-r8a7740" (R-Mobile A1)</div><div class='ctx'> 			- "renesas,iic-r8a7790" (R-Car H2)</div><div class='hunk'>@@ -11,7 +10,19 @@ Required properties:</div><div class='ctx'> 			- "renesas,iic-r8a7793" (R-Car M2-N)</div><div class='ctx'> 			- "renesas,iic-r8a7794" (R-Car E2)</div><div class='ctx'> 			- "renesas,iic-r8a7795" (R-Car H3)</div><div class='add'>+			- "renesas,iic-r8a7796" (R-Car M3-W)</div><div class='ctx'> 			- "renesas,iic-sh73a0" (SH-Mobile AG5)</div><div class='add'>+			- "renesas,rcar-gen2-iic" (generic R-Car Gen2 compatible device)</div><div class='add'>+			- "renesas,rcar-gen3-iic" (generic R-Car Gen3 compatible device)</div><div class='add'>+			- "renesas,rmobile-iic" (generic device)</div><div class='add'>+</div><div class='add'>+			When compatible with a generic R-Car version, nodes</div><div class='add'>+			must list the SoC-specific version corresponding to</div><div class='add'>+			the platform first followed by the generic R-Car</div><div class='add'>+			version.</div><div class='add'>+</div><div class='add'>+			renesas,rmobile-iic must always follow.</div><div class='add'>+</div><div class='ctx'> - reg             : address start and address range size of device</div><div class='ctx'> - interrupts      : interrupt of device</div><div class='ctx'> - clocks          : clock for device</div><div class='hunk'>@@ -31,7 +42,8 @@ Pinctrl properties might be needed, too. See there.</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	iic0: i2c@e6500000 {</div><div class='del'>-		compatible = "renesas,iic-r8a7790", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe6500000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;0 174 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A7790_CLK_IIC0&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-stm32.txt b/Documentation/devicetree/bindings/i2c/i2c-stm32.txt<br/>new file mode 100644<br/>index 000000000000..78eaf7b718ed<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c-stm32.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c-stm32.txt</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+* I2C controller embedded in STMicroelectronics STM32 I2C platform</div><div class='add'>+</div><div class='add'>+Required properties :</div><div class='add'>+- compatible : Must be "st,stm32f4-i2c"</div><div class='add'>+- reg : Offset and length of the register set for the device</div><div class='add'>+- interrupts : Must contain the interrupt id for I2C event and then the</div><div class='add'>+  interrupt id for I2C error.</div><div class='add'>+- resets: Must contain the phandle to the reset controller.</div><div class='add'>+- clocks: Must contain the input clock of the I2C instance.</div><div class='add'>+- A pinctrl state named "default" must be defined to set pins in mode of</div><div class='add'>+  operation for I2C transfer</div><div class='add'>+- #address-cells = &lt;1&gt;;</div><div class='add'>+- #size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+Optional properties :</div><div class='add'>+- clock-frequency : Desired I2C bus clock frequency in Hz. If not specified,</div><div class='add'>+  the default 100 kHz frequency will be used. As only Normal and Fast modes</div><div class='add'>+  are supported, possible values are 100000 and 400000.</div><div class='add'>+</div><div class='add'>+Example :</div><div class='add'>+</div><div class='add'>+	i2c@40005400 {</div><div class='add'>+		compatible = "st,stm32f4-i2c";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0x40005400 0x400&gt;;</div><div class='add'>+		interrupts = &lt;31&gt;,</div><div class='add'>+			     &lt;32&gt;;</div><div class='add'>+		resets = &lt;&amp;rcc 277&gt;;</div><div class='add'>+		clocks = &lt;&amp;rcc 0 149&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;i2c1_sda_pin&gt;, &lt;&amp;i2c1_scl_pin&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c.txt b/Documentation/devicetree/bindings/i2c/i2c.txt<br/>index 5fa691e6f638..cee9d5055fa2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/i2c/i2c.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/i2c.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/i2c.txt</a></div><div class='hunk'>@@ -62,6 +62,9 @@ wants to support one of the below features, it should adapt the bindings below.</div><div class='ctx'> 	"irq" and "wakeup" names are recognized by I2C core, other names are</div><div class='ctx'> 	left to individual drivers.</div><div class='ctx'> </div><div class='add'>+- host-notify</div><div class='add'>+	device uses SMBus host notify protocol instead of interrupt line.</div><div class='add'>+</div><div class='ctx'> - multi-master</div><div class='ctx'> 	states that there is another master active on this bus. The OS can use</div><div class='ctx'> 	this information to adapt power management to keep the arbitration awake</div><div class='hunk'>@@ -81,6 +84,11 @@ Binding may contain optional "interrupts" property, describing interrupts</div><div class='ctx'> used by the device. I2C core will assign "irq" interrupt (or the very first</div><div class='ctx'> interrupt if not using interrupt names) as primary interrupt for the slave.</div><div class='ctx'> </div><div class='add'>+Alternatively, devices supporting SMbus Host Notify, and connected to</div><div class='add'>+adapters that support this feature, may use "host-notify" property. I2C</div><div class='add'>+core will create a virtual interrupt for Host Notify and assign it as</div><div class='add'>+primary interrupt for the slave.</div><div class='add'>+</div><div class='ctx'> Also, if device is marked as a wakeup source, I2C core will set up "wakeup"</div><div class='ctx'> interrupt for the device. If "wakeup" interrupt name is not present in the</div><div class='ctx'> binding, then primary interrupt will be used as wakeup interrupt.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt b/Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt<br/>new file mode 100644<br/>index 000000000000..ab240e10debc<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+NVIDIA Tegra186 BPMP I2C controller</div><div class='add'>+</div><div class='add'>+In Tegra186, the BPMP (Boot and Power Management Processor) owns certain HW</div><div class='add'>+devices, such as the I2C controller for the power management I2C bus. Software</div><div class='add'>+running on other CPUs must perform IPC to the BPMP in order to execute</div><div class='add'>+transactions on that I2C bus. This binding describes an I2C bus that is</div><div class='add'>+accessed in such a fashion.</div><div class='add'>+</div><div class='add'>+The BPMP I2C node must be located directly inside the main BPMP node. See</div><div class='add'>+../firmware/nvidia,tegra186-bpmp.txt for details of the BPMP binding.</div><div class='add'>+</div><div class='add'>+This node represents an I2C controller. See ../i2c/i2c.txt for details of the</div><div class='add'>+core I2C binding.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:</div><div class='add'>+    Array of strings.</div><div class='add'>+    One of:</div><div class='add'>+    - "nvidia,tegra186-bpmp-i2c".</div><div class='add'>+- #address-cells: Address cells for I2C device address.</div><div class='add'>+    Single-cell integer.</div><div class='add'>+    Must be &lt;1&gt;.</div><div class='add'>+- #size-cells:</div><div class='add'>+    Single-cell integer.</div><div class='add'>+    Must be &lt;0&gt;.</div><div class='add'>+- nvidia,bpmp-bus-id:</div><div class='add'>+    Single-cell integer.</div><div class='add'>+    Indicates the I2C bus number this DT node represent, as defined by the</div><div class='add'>+    BPMP firmware.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+bpmp {</div><div class='add'>+	...</div><div class='add'>+</div><div class='add'>+	i2c {</div><div class='add'>+		compatible = "nvidia,tegra186-bpmp-i2c";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		nvidia,bpmp-bus-id = &lt;5&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt<br/>index fbbad6446741..ad10fbe61562 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/trivial-devices.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/i2c/trivial-devices.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/i2c/trivial-devices.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/i2c/trivial-devices.txt</a></div><div class='hunk'>@@ -36,14 +36,17 @@ dallas,ds1775		Tiny Digital Thermometer and Thermostat</div><div class='ctx'> dallas,ds3232		Extremely Accurate I²C RTC with Integrated Crystal and SRAM</div><div class='ctx'> dallas,ds4510		CPU Supervisor with Nonvolatile Memory and Programmable I/O</div><div class='ctx'> dallas,ds75		Digital Thermometer and Thermostat</div><div class='add'>+devantech,srf08		Devantech SRF08 ultrasonic ranger</div><div class='ctx'> dlg,da9053		DA9053: flexible system level PMIC with multicore support</div><div class='ctx'> dlg,da9063		DA9063: system PMIC for quad-core application processors</div><div class='ctx'> domintech,dmard09	DMARD09: 3-axis Accelerometer</div><div class='add'>+domintech,dmard10	DMARD10: 3-axis Accelerometer</div><div class='ctx'> epson,rx8010		I2C-BUS INTERFACE REAL TIME CLOCK MODULE</div><div class='ctx'> epson,rx8025		High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE</div><div class='ctx'> epson,rx8581		I2C-BUS INTERFACE REAL TIME CLOCK MODULE</div><div class='ctx'> fsl,mag3110		MAG3110: Xtrinsic High Accuracy, 3D Magnetometer</div><div class='ctx'> fsl,mc13892		MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51</div><div class='add'>+fsl,mma7660		MMA7660FC: 3-Axis Orientation/Motion Detection Sensor</div><div class='ctx'> fsl,mma8450		MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer</div><div class='ctx'> fsl,mpl3115		MPL3115: Absolute Digital Pressure Sensor</div><div class='ctx'> fsl,mpr121		MPR121: Proximity Capacitive Touch Sensor Controller</div><div class='hunk'>@@ -57,6 +60,7 @@ maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs</div><div class='ctx'> maxim,max6625		9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface</div><div class='ctx'> mc,rv3029c2		Real Time Clock Module with I2C-Bus</div><div class='ctx'> mcube,mc3230		mCube 3-axis 8-bit digital accelerometer</div><div class='add'>+memsic,mxc6225		MEMSIC 2-axis 8-bit digital accelerometer</div><div class='ctx'> microchip,mcp4531-502	Microchip 7-bit Single I2C Digital Potentiometer (5k)</div><div class='ctx'> microchip,mcp4531-103	Microchip 7-bit Single I2C Digital Potentiometer (10k)</div><div class='ctx'> microchip,mcp4531-503	Microchip 7-bit Single I2C Digital Potentiometer (50k)</div><div class='hunk'>@@ -121,6 +125,11 @@ microchip,mcp4662-502	Microchip 8-bit Dual I2C Digital Potentiometer with NV Mem</div><div class='ctx'> microchip,mcp4662-103	Microchip 8-bit Dual I2C Digital Potentiometer with NV Memory (10k)</div><div class='ctx'> microchip,mcp4662-503	Microchip 8-bit Dual I2C Digital Potentiometer with NV Memory (50k)</div><div class='ctx'> microchip,mcp4662-104	Microchip 8-bit Dual I2C Digital Potentiometer with NV Memory (100k)</div><div class='add'>+microchip,tc654		PWM Fan Speed Controller With Fan Fault Detection</div><div class='add'>+microchip,tc655		PWM Fan Speed Controller With Fan Fault Detection</div><div class='add'>+miramems,da226		MiraMEMS DA226 2-axis 14-bit digital accelerometer</div><div class='add'>+miramems,da280		MiraMEMS DA280 3-axis 14-bit digital accelerometer</div><div class='add'>+miramems,da311		MiraMEMS DA311 3-axis 12-bit digital accelerometer</div><div class='ctx'> national,lm63		Temperature sensor with integrated fan control</div><div class='ctx'> national,lm75		I2C TEMP SENSOR</div><div class='ctx'> national,lm80		Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor</div><div class='hunk'>@@ -130,6 +139,8 @@ nuvoton,npct501		i2c trusted platform module (TPM)</div><div class='ctx'> nuvoton,npct601		i2c trusted platform module (TPM2)</div><div class='ctx'> nxp,pca9556		Octal SMBus and I2C registered interface</div><div class='ctx'> nxp,pca9557		8-bit I2C-bus and SMBus I/O port with reset</div><div class='add'>+nxp,pcf2127		Real-time clock</div><div class='add'>+nxp,pcf2129		Real-time clock</div><div class='ctx'> nxp,pcf8563		Real-time clock/calendar</div><div class='ctx'> nxp,pcf85063		Tiny Real-Time Clock</div><div class='ctx'> oki,ml86v7667		OKI ML86V7667 video decoder</div><div class='hunk'>@@ -146,6 +157,7 @@ ricoh,rv5c387a		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC</div><div class='ctx'> samsung,24ad0xd1	S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)</div><div class='ctx'> sgx,vz89x		SGX Sensortech VZ89X Sensors</div><div class='ctx'> sii,s35390a		2-wire CMOS real-time clock</div><div class='add'>+silabs,si7020		Relative Humidity and Temperature Sensors</div><div class='ctx'> skyworks,sky81452	Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply</div><div class='ctx'> st,24c256		i2c serial eeprom  (24cxx)</div><div class='ctx'> st,m41t00		Serial real-time clock (RTC)</div><div class='hunk'>@@ -158,4 +170,5 @@ ti,tsc2003		I2C Touch-Screen Controller</div><div class='ctx'> ti,tmp102		Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface</div><div class='ctx'> ti,tmp103		Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface</div><div class='ctx'> ti,tmp275		Digital Temperature Sensor</div><div class='add'>+winbond,w83793		Winbond/Nuvoton H/W Monitor</div><div class='ctx'> winbond,wpct301		i2c trusted platform module (TPM)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/accel/lis302.txt b/Documentation/devicetree/bindings/iio/accel/lis302.txt<br/>index 2a19bff9693f..dfdce67826ba 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/accel/lis302.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/iio/accel/lis302.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/accel/lis302.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/accel/lis302.txt</a></div><div class='hunk'>@@ -5,7 +5,7 @@ that apply in on the generic device (independent from the bus).</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Required properties for the SPI bindings:</div><div class='del'>- - compatible: 		should be set to "st,lis3lv02d_spi"</div><div class='add'>+ - compatible: 		should be set to "st,lis3lv02d-spi"</div><div class='ctx'>  - reg:			the chipselect index</div><div class='ctx'>  - spi-max-frequency:	maximal bus speed, should be set to 1000000 unless</div><div class='ctx'> 			constrained by external circuitry</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt b/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt<br/>new file mode 100644<br/>index 000000000000..f9e3ff2c656e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+* Amlogic Meson SAR (Successive Approximation Register) A/D converter</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:	depending on the SoC this should be one of:</div><div class='add'>+			- "amlogic,meson-gxbb-saradc" for GXBB</div><div class='add'>+			- "amlogic,meson-gxl-saradc" for GXL</div><div class='add'>+			- "amlogic,meson-gxm-saradc" for GXM</div><div class='add'>+		along with the generic "amlogic,meson-saradc"</div><div class='add'>+- reg:		the physical base address and length of the registers</div><div class='add'>+- clocks:	phandle and clock identifier (see clock-names)</div><div class='add'>+- clock-names:	mandatory clocks:</div><div class='add'>+			- "clkin" for the reference clock (typically XTAL)</div><div class='add'>+			- "core" for the SAR ADC core clock</div><div class='add'>+		optional clocks:</div><div class='add'>+			- "sana" for the analog clock</div><div class='add'>+			- "adc_clk" for the ADC (sampling) clock</div><div class='add'>+			- "adc_sel" for the ADC (sampling) clock mux</div><div class='add'>+- vref-supply:	the regulator supply for the ADC reference voltage</div><div class='add'>+- #io-channel-cells: must be 1, see ../iio-bindings.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	saradc: adc@8680 {</div><div class='add'>+		compatible = "amlogic,meson-gxl-saradc", "amlogic,meson-saradc";</div><div class='add'>+		#io-channel-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x0 0x8680 0x0 0x34&gt;;</div><div class='add'>+		clocks = &lt;&amp;xtal&gt;,</div><div class='add'>+			 &lt;&amp;clkc CLKID_SAR_ADC&gt;,</div><div class='add'>+			 &lt;&amp;clkc CLKID_SANA&gt;,</div><div class='add'>+			 &lt;&amp;clkc CLKID_SAR_ADC_CLK&gt;,</div><div class='add'>+			 &lt;&amp;clkc CLKID_SAR_ADC_SEL&gt;;</div><div class='add'>+		clock-names = "clkin", "core", "sana", "adc_clk", "adc_sel";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt b/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt<br/>new file mode 100644<br/>index 000000000000..b3629405f568<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/avia-hx711.txt</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+* AVIA HX711 ADC chip for weight cells</div><div class='add'>+  Bit-banging driver</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible:	Should be "avia,hx711"</div><div class='add'>+ - sck-gpios:	Definition of the GPIO for the clock</div><div class='add'>+ - dout-gpios:	Definition of the GPIO for data-out</div><div class='add'>+		See Documentation/devicetree/bindings/gpio/gpio.txt</div><div class='add'>+ - avdd-supply:	Definition of the regulator used as analog supply</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+weight@0 {</div><div class='add'>+	compatible = "avia,hx711";</div><div class='add'>+	sck-gpios = &lt;&amp;gpio3 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	dout-gpios = &lt;&amp;gpio0 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	avdd-suppy = &lt;&amp;avdd&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/envelope-detector.txt b/Documentation/devicetree/bindings/iio/adc/envelope-detector.txt<br/>new file mode 100644<br/>index 000000000000..27544bdd4478<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/adc/envelope-detector.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/envelope-detector.txt</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+Bindings for ADC envelope detector using a DAC and a comparator</div><div class='add'>+</div><div class='add'>+The DAC is used to find the peak level of an alternating voltage input</div><div class='add'>+signal by a binary search using the output of a comparator wired to</div><div class='add'>+an interrupt pin. Like so:</div><div class='add'>+                          _</div><div class='add'>+                         | \</div><div class='add'>+    input +------&gt;-------|+ \</div><div class='add'>+                         |   \</div><div class='add'>+           .-------.     |    }---.</div><div class='add'>+           |       |     |   /    |</div><div class='add'>+           |    dac|--&gt;--|- /     |</div><div class='add'>+           |       |     |_/      |</div><div class='add'>+           |       |              |</div><div class='add'>+           |       |              |</div><div class='add'>+           |    irq|------&lt;-------'</div><div class='add'>+           |       |</div><div class='add'>+           '-------'</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Should be "axentia,tse850-envelope-detector"</div><div class='add'>+- io-channels: Channel node of the dac to be used for comparator input.</div><div class='add'>+- io-channel-names: Should be "dac".</div><div class='add'>+- interrupt specification for one client interrupt,</div><div class='add'>+  see ../../interrupt-controller/interrupts.txt for details.</div><div class='add'>+- interrupt-names: Should be "comp".</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	&amp;i2c {</div><div class='add'>+		dpot: mcp4651-104@28 {</div><div class='add'>+			compatible = "microchip,mcp4651-104";</div><div class='add'>+			reg = &lt;0x28&gt;;</div><div class='add'>+			#io-channel-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dac: dac {</div><div class='add'>+		compatible = "dpot-dac";</div><div class='add'>+		vref-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+		io-channels = &lt;&amp;dpot 0&gt;;</div><div class='add'>+		io-channel-names = "dpot";</div><div class='add'>+		#io-channel-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	envelope-detector {</div><div class='add'>+		compatible = "axentia,tse850-envelope-detector";</div><div class='add'>+		io-channels = &lt;&amp;dac 0&gt;;</div><div class='add'>+		io-channel-names = "dac";</div><div class='add'>+</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio&gt;;</div><div class='add'>+		interrupts = &lt;3 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		interrupt-names = "comp";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/max11100.txt b/Documentation/devicetree/bindings/iio/adc/max11100.txt<br/>new file mode 100644<br/>index 000000000000..b7f7177b8aca<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/adc/max11100.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/max11100.txt</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+* Maxim max11100 Analog to Digital Converter (ADC)</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible: Should be "maxim,max11100"</div><div class='add'>+  - reg: the adc unit address</div><div class='add'>+  - vref-supply: phandle to the regulator that provides reference voltage</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+  - spi-max-frequency: SPI maximum frequency</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+max11100: adc@0 {</div><div class='add'>+        compatible = "maxim,max11100";</div><div class='add'>+        reg = &lt;0&gt;;</div><div class='add'>+        vref-supply = &lt;&amp;adc0_vref&gt;;</div><div class='add'>+        spi-max-frequency = &lt;240000&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt b/Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt<br/>new file mode 100644<br/>index 000000000000..53cd146d8096<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt</a></div><div class='hunk'>@@ -0,0 +1,149 @@</div><div class='add'>+Qualcomm's PM8xxx voltage XOADC</div><div class='add'>+</div><div class='add'>+The Qualcomm PM8xxx PMICs contain a HK/XO ADC (Housekeeping/Crystal</div><div class='add'>+oscillator ADC) encompassing PM8018, PM8038, PM8058 and PM8921.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: should be one of:</div><div class='add'>+  "qcom,pm8018-adc"</div><div class='add'>+  "qcom,pm8038-adc"</div><div class='add'>+  "qcom,pm8058-adc"</div><div class='add'>+  "qcom,pm8921-adc"</div><div class='add'>+</div><div class='add'>+- reg: should contain the ADC base address in the PMIC, typically</div><div class='add'>+  0x197.</div><div class='add'>+</div><div class='add'>+- xoadc-ref-supply: should reference a regulator that can supply</div><div class='add'>+  a reference voltage on demand. The reference voltage may vary</div><div class='add'>+  with PMIC variant but is typically something like 2.2 or 1.8V.</div><div class='add'>+</div><div class='add'>+The following required properties are standard for IO channels, see</div><div class='add'>+iio-bindings.txt for more details:</div><div class='add'>+</div><div class='add'>+- #address-cells: should be set to &lt;1&gt;</div><div class='add'>+</div><div class='add'>+- #size-cells: should be set to &lt;0&gt;</div><div class='add'>+</div><div class='add'>+- #io-channel-cells: should be set to &lt;1&gt;</div><div class='add'>+</div><div class='add'>+- interrupts: should refer to the parent PMIC interrupt controller</div><div class='add'>+  and reference the proper ADC interrupt.</div><div class='add'>+</div><div class='add'>+Required subnodes:</div><div class='add'>+</div><div class='add'>+The ADC channels are configured as subnodes of the ADC. Since some of</div><div class='add'>+them are used for calibrating the ADC, these nodes are compulsory:</div><div class='add'>+</div><div class='add'>+adc-channel@c {</div><div class='add'>+	reg = &lt;0x0c&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+adc-channel@d {</div><div class='add'>+	reg = &lt;0x0d&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+adc-channel@f {</div><div class='add'>+	reg = &lt;0x0f&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+These three nodes are used for absolute and ratiometric calibration</div><div class='add'>+and only need to have these reg values: they are by hardware definition</div><div class='add'>+1:1 ratio converters that sample 625, 1250 and 0 milliV and create</div><div class='add'>+an interpolation calibration for all other ADCs.</div><div class='add'>+</div><div class='add'>+Optional subnodes: any channels other than channel 0x0c, 0x0d and</div><div class='add'>+0x0f are optional.</div><div class='add'>+</div><div class='add'>+Required channel node properties:</div><div class='add'>+</div><div class='add'>+- reg: should contain the hardware channel number in the range</div><div class='add'>+  0 .. 0x0f (4 bits). The hardware only supports 16 channels.</div><div class='add'>+</div><div class='add'>+Optional channel node properties:</div><div class='add'>+</div><div class='add'>+- qcom,decimation:</div><div class='add'>+  Value type: &lt;u32&gt;</div><div class='add'>+  Definition: This parameter is used to decrease the ADC sampling rate.</div><div class='add'>+          Quicker measurements can be made by reducing the decimation ratio.</div><div class='add'>+          Valid values are 512, 1024, 2048, 4096.</div><div class='add'>+          If the property is not found, a default value of 512 will be used.</div><div class='add'>+</div><div class='add'>+- qcom,ratiometric:</div><div class='add'>+  Value type: &lt;u32&gt;</div><div class='add'>+  Definition: Channel calibration type. If this property is specified</div><div class='add'>+          VADC will use a special voltage references for channel</div><div class='add'>+          calibration. The available references are specified in the</div><div class='add'>+	  as a u32 value setting (see below) and it is compulsory</div><div class='add'>+	  to also specify this reference if ratiometric calibration</div><div class='add'>+	  is selected.</div><div class='add'>+</div><div class='add'>+	  If the property is not found, the channel will be</div><div class='add'>+          calibrated with the 0.625V and 1.25V reference channels, also</div><div class='add'>+          known as an absolute calibration.</div><div class='add'>+  The reference voltage pairs when using ratiometric calibration:</div><div class='add'>+	  0 = XO_IN/XOADC_GND</div><div class='add'>+	  1 = PMIC_IN/XOADC_GND</div><div class='add'>+	  2 = PMIC_IN/BMS_CSP</div><div class='add'>+	  3 (invalid)</div><div class='add'>+	  4 = XOADC_GND/XOADC_GND</div><div class='add'>+	  5 = XOADC_VREF/XOADC_GND</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+xoadc: xoadc@197 {</div><div class='add'>+	compatible = "qcom,pm8058-adc";</div><div class='add'>+	reg = &lt;0x197&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;pm8058&gt;;</div><div class='add'>+	interrupts = &lt;76 1&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	#io-channel-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+	vcoin: adc-channel@0 {</div><div class='add'>+		reg = &lt;0x00&gt;;</div><div class='add'>+	};</div><div class='add'>+	vbat: adc-channel@1 {</div><div class='add'>+		reg = &lt;0x01&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcin: adc-channel@2 {</div><div class='add'>+		reg = &lt;0x02&gt;;</div><div class='add'>+	};</div><div class='add'>+	ichg: adc-channel@3 {</div><div class='add'>+		reg = &lt;0x03&gt;;</div><div class='add'>+	};</div><div class='add'>+	vph_pwr: adc-channel@4 {</div><div class='add'>+		reg = &lt;0x04&gt;;</div><div class='add'>+	};</div><div class='add'>+	usb_vbus: adc-channel@a {</div><div class='add'>+		reg = &lt;0x0a&gt;;</div><div class='add'>+	};</div><div class='add'>+	die_temp: adc-channel@b {</div><div class='add'>+		reg = &lt;0x0b&gt;;</div><div class='add'>+	};</div><div class='add'>+	ref_625mv: adc-channel@c {</div><div class='add'>+		reg = &lt;0x0c&gt;;</div><div class='add'>+	};</div><div class='add'>+	ref_1250mv: adc-channel@d {</div><div class='add'>+		reg = &lt;0x0d&gt;;</div><div class='add'>+	};</div><div class='add'>+	ref_325mv: adc-channel@e {</div><div class='add'>+		reg = &lt;0x0e&gt;;</div><div class='add'>+	};</div><div class='add'>+	ref_muxoff: adc-channel@f {</div><div class='add'>+		reg = &lt;0x0f&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* IIO client node */</div><div class='add'>+iio-hwmon {</div><div class='add'>+	compatible = "iio-hwmon";</div><div class='add'>+	io-channels = &lt;&amp;xoadc 0x01&gt;, /* Battery */</div><div class='add'>+		    &lt;&amp;xoadc 0x02&gt;, /* DC in (charger) */</div><div class='add'>+		    &lt;&amp;xoadc 0x04&gt;, /* VPH the main system voltage */</div><div class='add'>+		    &lt;&amp;xoadc 0x0b&gt;, /* Die temperature */</div><div class='add'>+		    &lt;&amp;xoadc 0x0c&gt;, /* Reference voltage 1.25V */</div><div class='add'>+		    &lt;&amp;xoadc 0x0d&gt;, /* Reference voltage 0.625V */</div><div class='add'>+		    &lt;&amp;xoadc 0x0e&gt;; /* Reference voltage 0.325V */</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt b/Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt<br/>new file mode 100644<br/>index 000000000000..f5b0adae6010<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt</a></div><div class='hunk'>@@ -0,0 +1,99 @@</div><div class='add'>+* Renesas RCar GyroADC device driver</div><div class='add'>+</div><div class='add'>+The GyroADC block is a reduced SPI block with up to 8 chipselect lines,</div><div class='add'>+which supports the SPI protocol of a selected few SPI ADCs. The SPI ADCs</div><div class='add'>+are sampled by the GyroADC block in a round-robin fashion and the result</div><div class='add'>+presented in the GyroADC registers.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:	Should be "&lt;soc-specific&gt;", "renesas,rcar-gyroadc".</div><div class='add'>+                The &lt;soc-specific&gt; should be one of:</div><div class='add'>+		renesas,r8a7791-gyroadc - for the GyroADC block present</div><div class='add'>+					  in r8a7791 SoC</div><div class='add'>+		renesas,r8a7792-gyroadc - for the GyroADC with interrupt</div><div class='add'>+					  block present in r8a7792 SoC</div><div class='add'>+- reg:		Address and length of the register set for the device</div><div class='add'>+- clocks:	References to all the clocks specified in the clock-names</div><div class='add'>+		property as specified in</div><div class='add'>+		Documentation/devicetree/bindings/clock/clock-bindings.txt.</div><div class='add'>+- clock-names:	Shall contain "fck" and "if". The "fck" is the GyroADC block</div><div class='add'>+		clock, the "if" is the interface clock.</div><div class='add'>+- power-domains: Must contain a reference to the PM domain, if available.</div><div class='add'>+- #address-cells: Should be &lt;1&gt; (setting for the subnodes) for all ADCs</div><div class='add'>+		except for "fujitsu,mb88101a". Should be &lt;0&gt; (setting for</div><div class='add'>+		only subnode) for "fujitsu,mb88101a".</div><div class='add'>+- #size-cells:	Should be &lt;0&gt; (setting for the subnodes)</div><div class='add'>+</div><div class='add'>+Sub-nodes:</div><div class='add'>+You must define subnode(s) which select the connected ADC type and reference</div><div class='add'>+voltage for the GyroADC channels.</div><div class='add'>+</div><div class='add'>+Required properties for subnodes:</div><div class='add'>+- compatible:	Should be either of:</div><div class='add'>+		"fujitsu,mb88101a"</div><div class='add'>+			- Fujitsu MB88101A compatible mode,</div><div class='add'>+			  12bit sampling, up to 4 channels can be sampled in</div><div class='add'>+			  round-robin fashion. One Fujitsu chip supplies four</div><div class='add'>+			  GyroADC channels with data as it contains four ADCs</div><div class='add'>+			  on the chip and thus for 4-channel operation, single</div><div class='add'>+			  MB88101A is required. The Cx chipselect lines of the</div><div class='add'>+			  MB88101A connect directly to two CHS lines of the</div><div class='add'>+			  GyroADC, no demuxer is required. The data out line</div><div class='add'>+			  of each MB88101A connects to a shared input pin of</div><div class='add'>+			  the GyroADC.</div><div class='add'>+		"ti,adcs7476" or "ti,adc121" or "adi,ad7476"</div><div class='add'>+			- TI ADCS7476 / TI ADC121 / ADI AD7476 compatible mode,</div><div class='add'>+			  15bit sampling, up to 8 channels can be sampled in</div><div class='add'>+			  round-robin fashion. One TI/ADI chip supplies single</div><div class='add'>+			  ADC channel with data, thus for 8-channel operation,</div><div class='add'>+			  8 chips are required. A 3:8 chipselect demuxer is</div><div class='add'>+			  required to connect the nCS line of the TI/ADI chips</div><div class='add'>+			  to the GyroADC, while MISO line of each TI/ADI ADC</div><div class='add'>+			  connects to a shared input pin of the GyroADC.</div><div class='add'>+		"maxim,max1162" or "maxim,max11100"</div><div class='add'>+			- Maxim MAX1162 / Maxim MAX11100 compatible mode,</div><div class='add'>+			  16bit sampling, up to 8 channels can be sampled in</div><div class='add'>+			  round-robin fashion. One Maxim chip supplies single</div><div class='add'>+			  ADC channel with data, thus for 8-channel operation,</div><div class='add'>+			  8 chips are required. A 3:8 chipselect demuxer is</div><div class='add'>+			  required to connect the nCS line of the MAX chips</div><div class='add'>+			  to the GyroADC, while MISO line of each Maxim ADC</div><div class='add'>+			  connects to a shared input pin of the GyroADC.</div><div class='add'>+- reg:		Should be the number of the analog input. Should be present</div><div class='add'>+		for all ADCs except "fujitsu,mb88101a".</div><div class='add'>+- vref-supply:	Reference to the channel reference voltage regulator.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	vref_max1162: regulator-vref-max1162 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+</div><div class='add'>+		regulator-name = "MAX1162 Vref";</div><div class='add'>+		regulator-min-microvolt = &lt;4096000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;4096000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	adc@e6e54000 {</div><div class='add'>+		compatible = "renesas,r8a7791-gyroadc", "renesas,rcar-gyroadc";</div><div class='add'>+		reg = &lt;0 0xe6e54000 0 64&gt;;</div><div class='add'>+		clocks = &lt;&amp;mstp9_clks R8A7791_CLK_GYROADC&gt;, &lt;&amp;clk_65m&gt;;</div><div class='add'>+		clock-names = "fck", "if";</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A7791_PD_ALWAYS_ON&gt;;</div><div class='add'>+</div><div class='add'>+		pinctrl-0 = &lt;&amp;adc_pins&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		adc@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			compatible = "maxim,max1162";</div><div class='add'>+			vref-supply = &lt;&amp;vref_max1162&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		adc@1 {</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			compatible = "maxim,max1162";</div><div class='add'>+			vref-supply = &lt;&amp;vref_max1162&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt b/Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt<br/>new file mode 100644<br/>index 000000000000..5dfc88ec24a4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+STMicroelectronics STM32 ADC device driver</div><div class='add'>+</div><div class='add'>+STM32 ADC is a successive approximation analog-to-digital converter.</div><div class='add'>+It has several multiplexed input channels. Conversions can be performed</div><div class='add'>+in single, continuous, scan or discontinuous mode. Result of the ADC is</div><div class='add'>+stored in a left-aligned or right-aligned 32-bit data register.</div><div class='add'>+Conversions can be launched in software or using hardware triggers.</div><div class='add'>+</div><div class='add'>+The analog watchdog feature allows the application to detect if the input</div><div class='add'>+voltage goes beyond the user-defined, higher or lower thresholds.</div><div class='add'>+</div><div class='add'>+Each STM32 ADC block can have up to 3 ADC instances.</div><div class='add'>+</div><div class='add'>+Each instance supports two contexts to manage conversions, each one has its</div><div class='add'>+own configurable sequence and trigger:</div><div class='add'>+- regular conversion can be done in sequence, running in background</div><div class='add'>+- injected conversions have higher priority, and so have the ability to</div><div class='add'>+  interrupt regular conversion sequence (either triggered in SW or HW).</div><div class='add'>+  Regular sequence is resumed, in case it has been interrupted.</div><div class='add'>+</div><div class='add'>+Contents of a stm32 adc root node:</div><div class='add'>+-----------------------------------</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Should be "st,stm32f4-adc-core".</div><div class='add'>+- reg: Offset and length of the ADC block register set.</div><div class='add'>+- interrupts: Must contain the interrupt for ADC block.</div><div class='add'>+- clocks: Clock for the analog circuitry (common to all ADCs).</div><div class='add'>+- clock-names: Must be "adc".</div><div class='add'>+- interrupt-controller: Identifies the controller node as interrupt-parent</div><div class='add'>+- vref-supply: Phandle to the vref input analog reference voltage.</div><div class='add'>+- #interrupt-cells = &lt;1&gt;;</div><div class='add'>+- #address-cells = &lt;1&gt;;</div><div class='add'>+- #size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- A pinctrl state named "default" for each ADC channel may be defined to set</div><div class='add'>+  inX ADC pins in mode of operation for analog input on external pin.</div><div class='add'>+</div><div class='add'>+Contents of a stm32 adc child node:</div><div class='add'>+-----------------------------------</div><div class='add'>+An ADC block node should contain at least one subnode, representing an</div><div class='add'>+ADC instance available on the machine.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Should be "st,stm32f4-adc".</div><div class='add'>+- reg: Offset of ADC instance in ADC block (e.g. may be 0x0, 0x100, 0x200).</div><div class='add'>+- clocks: Input clock private to this ADC instance.</div><div class='add'>+- interrupt-parent: Phandle to the parent interrupt controller.</div><div class='add'>+- interrupts: IRQ Line for the ADC (e.g. may be 0 for adc@0, 1 for adc@100 or</div><div class='add'>+  2 for adc@200).</div><div class='add'>+- st,adc-channels: List of single-ended channels muxed for this ADC.</div><div class='add'>+  It can have up to 16 channels, numbered from 0 to 15 (resp. for in0..in15).</div><div class='add'>+- #io-channel-cells = &lt;1&gt;: See the IIO bindings section "IIO consumers" in</div><div class='add'>+  Documentation/devicetree/bindings/iio/iio-bindings.txt</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- dmas: Phandle to dma channel for this ADC instance.</div><div class='add'>+  See ../../dma/dma.txt for details.</div><div class='add'>+- dma-names: Must be "rx" when dmas property is being used.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	adc: adc@40012000 {</div><div class='add'>+		compatible = "st,stm32f4-adc-core";</div><div class='add'>+		reg = &lt;0x40012000 0x400&gt;;</div><div class='add'>+		interrupts = &lt;18&gt;;</div><div class='add'>+		clocks = &lt;&amp;rcc 0 168&gt;;</div><div class='add'>+		clock-names = "adc";</div><div class='add'>+		vref-supply = &lt;&amp;reg_vref&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;adc3_in8_pin&gt;;</div><div class='add'>+</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		adc@0 {</div><div class='add'>+			compatible = "st,stm32f4-adc";</div><div class='add'>+			#io-channel-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 168&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;adc&gt;;</div><div class='add'>+			interrupts = &lt;0&gt;;</div><div class='add'>+			st,adc-channels = &lt;8&gt;;</div><div class='add'>+			dmas = &lt;&amp;dma2 0 0 0x400 0x0&gt;;</div><div class='add'>+			dma-names = "rx";</div><div class='add'>+		};</div><div class='add'>+		...</div><div class='add'>+		other adc child nodes follow...</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt b/Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt<br/>index 9ed2315781e4..3d25011f0c99 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> Required properties:</div><div class='ctx'>  - compatible: Should be "ti,adc141s626" or "ti,adc161s626"</div><div class='ctx'>  - reg: spi chip select number for the device</div><div class='add'>+ - vdda-supply: supply voltage to VDDA pin</div><div class='ctx'> </div><div class='ctx'> Recommended properties:</div><div class='ctx'>  - spi-max-frequency: Definition as per</div><div class='hunk'>@@ -11,6 +12,7 @@ Recommended properties:</div><div class='ctx'> Example:</div><div class='ctx'> adc@0 {</div><div class='ctx'> 	compatible = "ti,adc161s626";</div><div class='add'>+	vdda-supply = &lt;&amp;vdda_fixed&gt;;</div><div class='ctx'> 	reg = &lt;0&gt;;</div><div class='ctx'> 	spi-max-frequency = &lt;4300000&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/adc/ti-ads7950.txt b/Documentation/devicetree/bindings/iio/adc/ti-ads7950.txt<br/>new file mode 100644<br/>index 000000000000..e77a6f7e1001<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/adc/ti-ads7950.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/adc/ti-ads7950.txt</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+* Texas Instruments ADS7950 family of A/DC chips</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible: Must be one of "ti,ads7950", "ti,ads7951", "ti,ads7952",</div><div class='add'>+   "ti,ads7953", "ti,ads7954", "ti,ads7955", "ti,ads7956", "ti,ads7957",</div><div class='add'>+   "ti,ads7958", "ti,ads7959", "ti,ads7960", or "ti,ads7961"</div><div class='add'>+ - reg: SPI chip select number for the device</div><div class='add'>+ - #io-channel-cells: Must be 1 as per ../iio-bindings.txt</div><div class='add'>+ - vref-supply: phandle to a regulator node that supplies the 2.5V or 5V</div><div class='add'>+   reference voltage</div><div class='add'>+</div><div class='add'>+Recommended properties:</div><div class='add'>+ - spi-max-frequency: Definition as per</div><div class='add'>+		Documentation/devicetree/bindings/spi/spi-bus.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+adc@0 {</div><div class='add'>+	compatible = "ti,ads7957";</div><div class='add'>+	reg = &lt;0&gt;;</div><div class='add'>+	#io-channel-cells = &lt;1&gt;;</div><div class='add'>+	vref-supply = &lt;&amp;refin_supply&gt;;</div><div class='add'>+	spi-max-frequency = &lt;10000000&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/dac/dpot-dac.txt b/Documentation/devicetree/bindings/iio/dac/dpot-dac.txt<br/>new file mode 100644<br/>index 000000000000..fdf47a01bfef<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/dac/dpot-dac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/dac/dpot-dac.txt</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+Bindings for DAC emulation using a digital potentiometer</div><div class='add'>+</div><div class='add'>+It is assumed that the dpot is used as a voltage divider between the</div><div class='add'>+current dpot wiper setting and the maximum resistance of the dpot. The</div><div class='add'>+divided voltage is provided by a vref regulator.</div><div class='add'>+</div><div class='add'>+                  .------.</div><div class='add'>+   .-----------.  |      |</div><div class='add'>+   | vref      |--'    .---.</div><div class='add'>+   | regulator |--.    |   |</div><div class='add'>+   '-----------'  |    | d |</div><div class='add'>+                  |    | p |</div><div class='add'>+                  |    | o |  wiper</div><div class='add'>+                  |    | t |&lt;---------+</div><div class='add'>+                  |    |   |</div><div class='add'>+                  |    '---'       dac output voltage</div><div class='add'>+                  |      |</div><div class='add'>+                  '------+------------+</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Should be "dpot-dac"</div><div class='add'>+- vref-supply: The regulator supplying the voltage divider.</div><div class='add'>+- io-channels: Channel node of the dpot to be used for the voltage division.</div><div class='add'>+- io-channel-names: Should be "dpot".</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	&amp;i2c {</div><div class='add'>+		dpot: mcp4651-503@28 {</div><div class='add'>+			compatible = "microchip,mcp4651-503";</div><div class='add'>+			reg = &lt;0x28&gt;;</div><div class='add'>+			#io-channel-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dac {</div><div class='add'>+		compatible = "dpot-dac";</div><div class='add'>+		vref-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+		io-channels = &lt;&amp;dpot 0&gt;;</div><div class='add'>+		io-channel-names = "dpot";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/dac/mcp4725.txt b/Documentation/devicetree/bindings/iio/dac/mcp4725.txt<br/>new file mode 100644<br/>index 000000000000..1bc6c093fbfe<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/dac/mcp4725.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/dac/mcp4725.txt</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+Microchip mcp4725 and mcp4726 DAC device driver</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+	- compatible: Must be "microchip,mcp4725" or "microchip,mcp4726"</div><div class='add'>+	- reg: Should contain the DAC I2C address</div><div class='add'>+	- vdd-supply: Phandle to the Vdd power supply. This supply is used as a</div><div class='add'>+	  voltage reference on mcp4725. It is used as a voltage reference on</div><div class='add'>+	  mcp4726 if there is no vref-supply specified.</div><div class='add'>+</div><div class='add'>+Optional properties (valid only for mcp4726):</div><div class='add'>+	- vref-supply: Optional phandle to the Vref power supply. Vref pin is</div><div class='add'>+	  used as a voltage reference when this supply is specified.</div><div class='add'>+	- microchip,vref-buffered: Boolean to enable buffering of the external</div><div class='add'>+	  Vref pin. This boolean is not valid without the vref-supply. Quoting</div><div class='add'>+	  the datasheet: This is offered in cases where the reference voltage</div><div class='add'>+	  does not have the current capability not to drop its voltage when</div><div class='add'>+	  connected to the internal resistor ladder circuit.</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+	/* simple mcp4725 */</div><div class='add'>+	mcp4725@60 {</div><div class='add'>+		compatible = "microchip,mcp4725";</div><div class='add'>+		reg = &lt;0x60&gt;;</div><div class='add'>+		vdd-supply = &lt;&amp;vdac_vdd&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* mcp4726 with the buffered external reference voltage */</div><div class='add'>+	mcp4726@60 {</div><div class='add'>+		compatible = "microchip,mcp4726";</div><div class='add'>+		reg = &lt;0x60&gt;;</div><div class='add'>+		vdd-supply = &lt;&amp;vdac_vdd&gt;;</div><div class='add'>+		vref-supply = &lt;&amp;vdac_vref&gt;;</div><div class='add'>+		microchip,vref-buffered;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt b/Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt<br/>new file mode 100644<br/>index 000000000000..b0d3b59966bc<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+Invensense MPU-3050 Gyroscope device tree bindings</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible : should be "invensense,mpu3050"</div><div class='add'>+  - reg : the I2C address of the sensor</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+  - interrupt-parent : should be the phandle for the interrupt controller</div><div class='add'>+  - interrupts : interrupt mapping for the trigger interrupt from the</div><div class='add'>+    internal oscillator. The following IRQ modes are supported:</div><div class='add'>+    IRQ_TYPE_EDGE_RISING, IRQ_TYPE_EDGE_FALLING, IRQ_TYPE_LEVEL_HIGH and</div><div class='add'>+    IRQ_TYPE_LEVEL_LOW. The driver should detect and configure the hardware</div><div class='add'>+    for the desired interrupt type.</div><div class='add'>+  - vdd-supply : supply regulator for the main power voltage.</div><div class='add'>+  - vlogic-supply : supply regulator for the signal voltage.</div><div class='add'>+  - mount-matrix : see iio/mount-matrix.txt</div><div class='add'>+</div><div class='add'>+Optional subnodes:</div><div class='add'>+  - The MPU-3050 will pass through and forward the I2C signals from the</div><div class='add'>+    incoming I2C bus, alternatively drive traffic to a slave device (usually</div><div class='add'>+    an accelerometer) on its own initiative. Therefore is supports a subnode</div><div class='add'>+    i2c gate node. For details see: i2c/i2c-gate.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+mpu3050@68 {</div><div class='add'>+	compatible = "invensense,mpu3050";</div><div class='add'>+	reg = &lt;0x68&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;foo&gt;;</div><div class='add'>+	interrupts = &lt;12 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+	vdd-supply = &lt;&amp;bar&gt;;</div><div class='add'>+	vlogic-supply = &lt;&amp;baz&gt;;</div><div class='add'>+</div><div class='add'>+	/* External I2C interface */</div><div class='add'>+	i2c-gate {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		fnord@18 {</div><div class='add'>+			compatible = "fnord";</div><div class='add'>+			reg = &lt;0x18&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;foo&gt;;</div><div class='add'>+			interrupts = &lt;13 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/humidity/hts221.txt b/Documentation/devicetree/bindings/iio/humidity/hts221.txt<br/>new file mode 100644<br/>index 000000000000..b20ab9c12080<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/humidity/hts221.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/humidity/hts221.txt</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+* HTS221 STM humidity + temperature sensor</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "st,hts221"</div><div class='add'>+- reg: i2c address of the sensor / spi cs line</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- interrupt-parent: should be the phandle for the interrupt controller</div><div class='add'>+- interrupts: interrupt mapping for IRQ. It should be configured with</div><div class='add'>+  flags IRQ_TYPE_LEVEL_HIGH or IRQ_TYPE_EDGE_RISING.</div><div class='add'>+</div><div class='add'>+  Refer to interrupt-controller/interrupts.txt for generic interrupt</div><div class='add'>+  client node bindings.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+hts221@5f {</div><div class='add'>+	compatible = "st,hts221";</div><div class='add'>+	reg = &lt;0x5f&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+	interrupts = &lt;0 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/imu/bmi160.txt b/Documentation/devicetree/bindings/iio/imu/bmi160.txt<br/>new file mode 100644<br/>index 000000000000..ae0112c7debc<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/imu/bmi160.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/imu/bmi160.txt</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+Bosch BMI160 - Inertial Measurement Unit with Accelerometer, Gyroscope</div><div class='add'>+and externally connectable Magnetometer</div><div class='add'>+</div><div class='add'>+https://www.bosch-sensortec.com/bst/products/all_products/bmi160</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible : should be "bosch,bmi160"</div><div class='add'>+ - reg : the I2C address or SPI chip select number of the sensor</div><div class='add'>+ - spi-max-frequency : set maximum clock frequency (only for SPI)</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+ - interrupt-parent : should be the phandle of the interrupt controller</div><div class='add'>+ - interrupts : interrupt mapping for IRQ, must be IRQ_TYPE_LEVEL_LOW</div><div class='add'>+ - interrupt-names : set to "INT1" if INT1 pin should be used as interrupt</div><div class='add'>+   input, set to "INT2" if INT2 pin should be used instead</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+bmi160@68 {</div><div class='add'>+	compatible = "bosch,bmi160";</div><div class='add'>+	reg = &lt;0x68&gt;;</div><div class='add'>+</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio4&gt;;</div><div class='add'>+	interrupts = &lt;12 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	interrupt-names = "INT1";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bmi160@0 {</div><div class='add'>+	compatible = "bosch,bmi160";</div><div class='add'>+	reg = &lt;0&gt;;</div><div class='add'>+	spi-max-frequency = &lt;10000000&gt;;</div><div class='add'>+</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio2&gt;;</div><div class='add'>+	interrupts = &lt;12 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	interrupt-names = "INT2";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt b/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt<br/>new file mode 100644<br/>index 000000000000..cf81afdf7803<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+* ST_LSM6DSx driver for STM 6-axis (acc + gyro) imu Mems sensors</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must be one of:</div><div class='add'>+  "st,lsm6ds3"</div><div class='add'>+  "st,lsm6dsm"</div><div class='add'>+- reg: i2c address of the sensor / spi cs line</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- st,drdy-int-pin: the pin on the package that will be used to signal</div><div class='add'>+  "data ready" (valid values: 1 or 2).</div><div class='add'>+- interrupt-parent: should be the phandle for the interrupt controller</div><div class='add'>+- interrupts: interrupt mapping for IRQ. It should be configured with</div><div class='add'>+  flags IRQ_TYPE_LEVEL_HIGH or IRQ_TYPE_EDGE_RISING.</div><div class='add'>+</div><div class='add'>+  Refer to interrupt-controller/interrupts.txt for generic interrupt</div><div class='add'>+  client node bindings.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+lsm6dsm@6b {</div><div class='add'>+	compatible = "st,lsm6dsm";</div><div class='add'>+	reg = &lt;0x6b&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+	interrupts = &lt;0 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/light/cm3605.txt b/Documentation/devicetree/bindings/iio/light/cm3605.txt<br/>new file mode 100644<br/>index 000000000000..56331a79f9ab<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/light/cm3605.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/light/cm3605.txt</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+Capella Microsystems CM3605</div><div class='add'>+Ambient Light and Short Distance Proximity Sensor</div><div class='add'>+</div><div class='add'>+The CM3605 is an entirely analog part which however require quite a bit of</div><div class='add'>+software logic to interface a host operating system.</div><div class='add'>+</div><div class='add'>+This ALS and proximity sensor was one of the very first deployed in mobile</div><div class='add'>+handsets, notably it is used in the very first Nexus One Android phone from</div><div class='add'>+2010.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must be: "capella,cm3605"</div><div class='add'>+- aset-gpios: GPIO line controlling the ASET line (drive low</div><div class='add'>+  to activate the ALS, should be flagged GPIO_ACTIVE_LOW)</div><div class='add'>+- interrupts: the IRQ line (such as a GPIO) that is connected to</div><div class='add'>+  the POUT (proximity sensor out) line. The edge detection must</div><div class='add'>+  be set to IRQ_TYPE_EDGE_BOTH so as to detect movements toward</div><div class='add'>+  and away from the proximity sensor.</div><div class='add'>+- io-channels: the ADC channel used for converting the voltage from</div><div class='add'>+  AOUT to a digital representation.</div><div class='add'>+- io-channel-names: must be "aout"</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- vdd-supply: regulator supplying VDD power to the component.</div><div class='add'>+- capella,aset-resistance-ohms: the sensitivity calibration resistance,</div><div class='add'>+  in Ohms. Valid values are: 50000, 100000, 300000 and 600000,</div><div class='add'>+  as these are the resistance values that we are supplied with</div><div class='add'>+  calibration curves for. If not supplied, 100 kOhm will be assumed</div><div class='add'>+  but it is strongly recommended to supply this.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+cm3605 {</div><div class='add'>+	compatible = "capella,cm3605";</div><div class='add'>+	vdd-supply = &lt;&amp;foo_reg&gt;;</div><div class='add'>+	aset-gpios = &lt;&amp;foo_gpio 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	capella,aset-resistance-ohms = &lt;100000&gt;;</div><div class='add'>+	interrupts = &lt;1 IRQ_TYPE_EDGE_BOTH&gt;;</div><div class='add'>+	io-channels = &lt;&amp;adc 0x01&gt;;</div><div class='add'>+	io-channel-names = "aout";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/light/isl29018.txt b/Documentation/devicetree/bindings/iio/light/isl29018.txt<br/>new file mode 100644<br/>index 000000000000..425ab459e209<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/light/isl29018.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/light/isl29018.txt</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+* ISL 29018/29023/29035 I2C ALS, Proximity, and Infrared sensor</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible: Should be one of</div><div class='add'>+		"isil,isl29018"</div><div class='add'>+		"isil,isl29023"</div><div class='add'>+		"isil,isl29035"</div><div class='add'>+  - reg: the I2C address of the device</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  - interrupt-parent: should be the phandle for the interrupt controller</div><div class='add'>+  - interrupts: the sole interrupt generated by the device</div><div class='add'>+</div><div class='add'>+  Refer to interrupt-controller/interrupts.txt for generic interrupt client</div><div class='add'>+  node bindings.</div><div class='add'>+</div><div class='add'>+  - vcc-supply: phandle to the regulator that provides power to the sensor.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+isl29018@44 {</div><div class='add'>+	compatible = "isil,isl29018";</div><div class='add'>+	reg = &lt;0x44&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio&gt;;</div><div class='add'>+	interrupts = &lt;TEGRA_GPIO(Z, 2) IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/light/tsl2583.txt b/Documentation/devicetree/bindings/iio/light/tsl2583.txt<br/>new file mode 100644<br/>index 000000000000..8e2066c83f70<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/light/tsl2583.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/light/tsl2583.txt</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+* TAOS TSL 2580/2581/2583 ALS sensor</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible: Should be one of</div><div class='add'>+		"amstaos,tsl2580"</div><div class='add'>+		"amstaos,tsl2581"</div><div class='add'>+		"amstaos,tsl2583"</div><div class='add'>+  - reg: the I2C address of the device</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  - interrupt-parent: should be the phandle for the interrupt controller</div><div class='add'>+  - interrupts: the sole interrupt generated by the device</div><div class='add'>+</div><div class='add'>+  Refer to interrupt-controller/interrupts.txt for generic interrupt client</div><div class='add'>+  node bindings.</div><div class='add'>+</div><div class='add'>+  - vcc-supply: phandle to the regulator that provides power to the sensor.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+tsl2581@29 {</div><div class='add'>+	compatible = "amstaos,tsl2581";</div><div class='add'>+	reg = &lt;0x29&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/potentiometer/max5481.txt b/Documentation/devicetree/bindings/iio/potentiometer/max5481.txt<br/>new file mode 100644<br/>index 000000000000..6a91b106e076<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/potentiometer/max5481.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/potentiometer/max5481.txt</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+* Maxim Linear-Taper Digital Potentiometer MAX5481-MAX5484</div><div class='add'>+</div><div class='add'>+The node for this driver must be a child node of a SPI controller, hence</div><div class='add'>+all mandatory properties described in</div><div class='add'>+</div><div class='add'>+        Documentation/devicetree/bindings/spi/spi-bus.txt</div><div class='add'>+</div><div class='add'>+must be specified.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+	- compatible:  	Must be one of the following, depending on the</div><div class='add'>+			model:</div><div class='add'>+			"maxim,max5481"</div><div class='add'>+			"maxim,max5482"</div><div class='add'>+			"maxim,max5483"</div><div class='add'>+			"maxim,max5484"</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+max548x: max548x@0 {</div><div class='add'>+	compatible = "maxim,max5482";</div><div class='add'>+	spi-max-frequency = &lt;7000000&gt;;</div><div class='add'>+	reg = &lt;0&gt;; /* chip-select */</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt b/Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt<br/>new file mode 100644<br/>index 000000000000..b9b621e94cd7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+* Texas Instruments LMP91000 potentiostat</div><div class='add'>+</div><div class='add'>+http://www.ti.com/lit/ds/symlink/lmp91000.pdf</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible: should be "ti,lmp91000"</div><div class='add'>+  - reg: the I2C address of the device</div><div class='add'>+  - io-channels: the phandle of the iio provider</div><div class='add'>+</div><div class='add'>+  - ti,external-tia-resistor: if the property ti,tia-gain-ohm is not defined this</div><div class='add'>+    needs to be set to signal that an external resistor value is being used.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  - ti,tia-gain-ohm: ohm value of the internal resistor for the transimpedance</div><div class='add'>+    amplifier. Must be 2750, 3500, 7000, 14000, 35000, 120000, or 350000 ohms.</div><div class='add'>+</div><div class='add'>+  - ti,rload-ohm: ohm value of the internal resistor load applied to the gas</div><div class='add'>+    sensor. Must be 10, 33, 50, or 100 (default) ohms.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+lmp91000@48 {</div><div class='add'>+	compatible = "ti,lmp91000";</div><div class='add'>+	reg = &lt;0x48&gt;;</div><div class='add'>+	ti,tia-gain-ohm = &lt;7500&gt;;</div><div class='add'>+	ti,rload = &lt;100&gt;;</div><div class='add'>+	io-channels = &lt;&amp;adc&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/st-sensors.txt b/Documentation/devicetree/bindings/iio/st-sensors.txt<br/>index e41fe340162b..eaa8fbba34e2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/st-sensors.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/iio/st-sensors.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/st-sensors.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/st-sensors.txt</a></div><div class='hunk'>@@ -27,6 +27,8 @@ standard bindings from pinctrl/pinctrl-bindings.txt.</div><div class='ctx'> Valid compatible strings:</div><div class='ctx'> </div><div class='ctx'> Accelerometers:</div><div class='add'>+- st,lis3lv02d (deprecated, use st,lis3lv02dl-accel)</div><div class='add'>+- st,lis302dl-spi (deprecated, use st,lis3lv02dl-accel)</div><div class='ctx'> - st,lis3lv02dl-accel</div><div class='ctx'> - st,lsm303dlh-accel</div><div class='ctx'> - st,lsm303dlhc-accel</div><div class='hunk'>@@ -42,6 +44,7 @@ Accelerometers:</div><div class='ctx'> - st,lsm303agr-accel</div><div class='ctx'> - st,lis2dh12-accel</div><div class='ctx'> - st,h3lis331dl-accel</div><div class='add'>+- st,lng2dm-accel</div><div class='ctx'> </div><div class='ctx'> Gyroscopes:</div><div class='ctx'> - st,l3g4200d-gyro</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/temperature/tmp007.txt b/Documentation/devicetree/bindings/iio/temperature/tmp007.txt<br/>new file mode 100644<br/>index 000000000000..b63aba91ef03<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/temperature/tmp007.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/temperature/tmp007.txt</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+* TI TMP007 - IR thermopile sensor with integrated math engine</div><div class='add'>+</div><div class='add'>+Link to datasheet: http://www.ti.com/lit/ds/symlink/tmp007.pdf</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible: should be "ti,tmp007"</div><div class='add'>+  - reg: the I2C address of the sensor (changeable via ADR pins)</div><div class='add'>+		------------------------------</div><div class='add'>+		|ADR1 | ADR0 | Device Address|</div><div class='add'>+		------------------------------</div><div class='add'>+		   0      0        0x40</div><div class='add'>+		   0	  1	   0x41</div><div class='add'>+		   0	 SDA       0x42</div><div class='add'>+		   0     SCL       0x43</div><div class='add'>+		   1      0        0x44</div><div class='add'>+		   1      1        0x45</div><div class='add'>+		   1	 SDA	   0x46</div><div class='add'>+		   1     SCL       0x47</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  - interrupt-parent: should be the phandle for the interrupt controller</div><div class='add'>+</div><div class='add'>+  - interrupts: interrupt mapping for GPIO IRQ (level active low)</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+tmp007@40 {</div><div class='add'>+        compatible = "ti,tmp007";</div><div class='add'>+        reg = &lt;0x40&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+	interrupts = &lt;5 0x08&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt b/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt<br/>new file mode 100644<br/>index 000000000000..55a653d15303<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+STMicroelectronics STM32 Timers IIO timer bindings</div><div class='add'>+</div><div class='add'>+Must be a sub-node of an STM32 Timers device tree node.</div><div class='add'>+See ../mfd/stm32-timers.txt for details about the parent node.</div><div class='add'>+</div><div class='add'>+Required parameters:</div><div class='add'>+- compatible:	Must be "st,stm32-timer-trigger".</div><div class='add'>+- reg:		Identify trigger hardware block.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	timers@40010000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "st,stm32-timers";</div><div class='add'>+		reg = &lt;0x40010000 0x400&gt;;</div><div class='add'>+		clocks = &lt;&amp;rcc 0 160&gt;;</div><div class='add'>+		clock-names = "clk_int";</div><div class='add'>+</div><div class='add'>+		timer@0 {</div><div class='add'>+			compatible = "st,stm32-timer-trigger";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt b/Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt<br/>new file mode 100644<br/>index 000000000000..635f62c756ee<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+Samsung tm2-touchkey</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must be "cypress,tm2-touchkey"</div><div class='add'>+- reg: I2C address of the chip.</div><div class='add'>+- interrupt-parent: a phandle for the interrupt controller (see interrupt</div><div class='add'>+	binding[0]).</div><div class='add'>+- interrupts: interrupt to which the chip is connected (see interrupt</div><div class='add'>+	binding[0]).</div><div class='add'>+- vcc-supply : internal regulator output. 1.8V</div><div class='add'>+- vdd-supply : power supply for IC 3.3V</div><div class='add'>+</div><div class='add'>+[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	&amp;i2c0 {</div><div class='add'>+		/* ... */</div><div class='add'>+</div><div class='add'>+		touchkey@20 {</div><div class='add'>+			compatible = "cypress,tm2-touchkey";</div><div class='add'>+			reg = &lt;0x20&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;gpa3&gt;;</div><div class='add'>+			interrupts = &lt;2 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+			vcc-supply=&lt;&amp;ldo32_reg&gt;;</div><div class='add'>+			vdd-supply=&lt;&amp;ldo33_reg&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/input/da9062-onkey.txt b/Documentation/devicetree/bindings/input/da9062-onkey.txt<br/>index ab0e0488fe92..5f9fbc68e58a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/da9062-onkey.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/input/da9062-onkey.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/da9062-onkey.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/da9062-onkey.txt</a></div><div class='hunk'>@@ -1,32 +1,47 @@</div><div class='del'>-* Dialog DA9062/63 OnKey Module</div><div class='add'>+* Dialog DA9061/62/63 OnKey Module</div><div class='ctx'> </div><div class='del'>-This module is part of the DA9062/DA9063. For more details about entire</div><div class='del'>-chips see Documentation/devicetree/bindings/mfd/da9062.txt and</div><div class='del'>-Documentation/devicetree/bindings/mfd/da9063.txt</div><div class='add'>+This module is part of the DA9061/DA9062/DA9063. For more details about entire</div><div class='add'>+DA9062 and DA9061 chips see Documentation/devicetree/bindings/mfd/da9062.txt</div><div class='add'>+For DA9063 see Documentation/devicetree/bindings/mfd/da9063.txt</div><div class='ctx'> </div><div class='del'>-This module provides KEY_POWER, KEY_SLEEP and events.</div><div class='add'>+This module provides the KEY_POWER event.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> </div><div class='del'>-- compatible: should be one of:</div><div class='del'>-	dlg,da9062-onkey</div><div class='del'>-	dlg,da9063-onkey</div><div class='add'>+- compatible: should be one of the following valid compatible string lines:</div><div class='add'>+	"dlg,da9061-onkey", "dlg,da9062-onkey"</div><div class='add'>+	"dlg,da9062-onkey"</div><div class='add'>+	"dlg,da9063-onkey"</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> </div><div class='del'>-  - dlg,disable-key-power : Disable power-down using a long key-press. If this</div><div class='add'>+- dlg,disable-key-power : Disable power-down using a long key-press. If this</div><div class='ctx'>     entry exists the OnKey driver will remove support for the KEY_POWER key</div><div class='del'>-    press. If this entry does not exist then by default the key-press</div><div class='del'>-    triggered power down is enabled and the OnKey will support both KEY_POWER</div><div class='del'>-    and KEY_SLEEP.</div><div class='add'>+    press when triggered using a long press of the OnKey.</div><div class='ctx'> </div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-	pmic0: da9062@58 {</div><div class='add'>+Example: DA9063</div><div class='ctx'> </div><div class='add'>+	pmic0: da9063@58 {</div><div class='ctx'> 		onkey {</div><div class='ctx'> 			compatible = "dlg,da9063-onkey";</div><div class='ctx'> 			dlg,disable-key-power;</div><div class='ctx'> 		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Example: DA9062</div><div class='add'>+</div><div class='add'>+	pmic0: da9062@58 {</div><div class='add'>+		onkey {</div><div class='add'>+			compatible = "dlg,da9062-onkey";</div><div class='add'>+			dlg,disable-key-power;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Example: DA9061 using a fall-back compatible for the DA9062 onkey driver</div><div class='ctx'> </div><div class='add'>+	pmic0: da9061@58 {</div><div class='add'>+		onkey {</div><div class='add'>+			compatible = "dlg,da9061-onkey", "dlg,da9062-onkey";</div><div class='add'>+			dlg,disable-key-power;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/input/mpr121-touchkey.txt b/Documentation/devicetree/bindings/input/mpr121-touchkey.txt<br/>new file mode 100644<br/>index 000000000000..b7c61ee5841b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/mpr121-touchkey.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/mpr121-touchkey.txt</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+* Freescale MPR121 Controllor</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+- compatible:		Should be "fsl,mpr121-touchkey"</div><div class='add'>+- reg:			The I2C slave address of the device.</div><div class='add'>+- interrupts:		The interrupt number to the cpu.</div><div class='add'>+- vdd-supply:		Phandle to the Vdd power supply.</div><div class='add'>+- linux,keycodes:	Specifies an array of numeric keycode values to</div><div class='add'>+			be used for reporting button presses. The array can</div><div class='add'>+			contain up to 12 entries.</div><div class='add'>+</div><div class='add'>+Optional Properties:</div><div class='add'>+- wakeup-source:	Use any event on keypad as wakeup event.</div><div class='add'>+- autorepeat:		Enable autorepeat feature.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+#include "dt-bindings/input/input.h"</div><div class='add'>+</div><div class='add'>+	touchkey: mpr121@5a {</div><div class='add'>+		compatible = "fsl,mpr121-touchkey";</div><div class='add'>+		reg = &lt;0x5a&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;28 2&gt;;</div><div class='add'>+		autorepeat;</div><div class='add'>+		vdd-supply = &lt;&amp;ldo4_reg&gt;;</div><div class='add'>+		linux,keycodes = &lt;KEY_0&gt;, &lt;KEY_1&gt;, &lt;KEY_2&gt;, &lt;KEY_3&gt;,</div><div class='add'>+				&lt;KEY_4&gt; &lt;KEY_5&gt;, &lt;KEY_6&gt;, &lt;KEY_7&gt;,</div><div class='add'>+				&lt;KEY_8&gt;, &lt;KEY_9&gt;, &lt;KEY_A&gt;, &lt;KEY_B&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/input/pwm-beeper.txt b/Documentation/devicetree/bindings/input/pwm-beeper.txt<br/>index be332ae4f2d6..529408b4431a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/pwm-beeper.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/input/pwm-beeper.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/pwm-beeper.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/pwm-beeper.txt</a></div><div class='hunk'>@@ -5,3 +5,19 @@ Registers a PWM device as beeper.</div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible: should be "pwm-beeper"</div><div class='ctx'> - pwms: phandle to the physical PWM device</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- amp-supply: phandle to a regulator that acts as an amplifier for the beeper</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+beeper_amp: amplifier {</div><div class='add'>+	compatible = "fixed-regulator";</div><div class='add'>+	gpios = &lt;&amp;gpio0 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+beeper {</div><div class='add'>+	compatible = "pwm-beeper";</div><div class='add'>+	pwms = &lt;&amp;pwm0&gt;;</div><div class='add'>+	amp-supply = &lt;&amp;beeper_amp&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt b/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt<br/>index 853dff96dd9f..d4927c202aef 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt</a></div><div class='hunk'>@@ -17,6 +17,8 @@ Optional properties:</div><div class='ctx'>   This value depends on the touch screen.</div><div class='ctx'> - pre-charge-time: the touch screen need some time to precharge.</div><div class='ctx'>   This value depends on the touch screen.</div><div class='add'>+- touchscreen-average-samples: Number of data samples which are averaged for</div><div class='add'>+  each read. Valid values are 1, 4, 8, 16 and 32.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> 	tsc: tsc@02040000 {</div><div class='hunk'>@@ -32,5 +34,6 @@ Example:</div><div class='ctx'> 		xnur-gpio = &lt;&amp;gpio1 3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		measure-delay-time = &lt;0xfff&gt;;</div><div class='ctx'> 		pre-charge-time = &lt;0xffff&gt;;</div><div class='add'>+		touchscreen-average-samples = &lt;32&gt;;</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt b/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt<br/>index 820fee4b77b6..ce85ee508238 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt</a></div><div class='hunk'>@@ -18,6 +18,8 @@ Optional properties:</div><div class='ctx'> - touchscreen-inverted-y  : See touchscreen.txt</div><div class='ctx'> - touchscreen-swapped-x-y : See touchscreen.txt</div><div class='ctx'> - silead,max-fingers	  : maximum number of fingers the touchscreen can detect</div><div class='add'>+- vddio-supply		  : regulator phandle for controller VDDIO</div><div class='add'>+- avdd-supply		  : regulator phandle for controller AVDD</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt b/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt<br/>index bccaa4e73045..537643e86f61 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt</a></div><div class='hunk'>@@ -14,6 +14,9 @@ Optional properties for Touchscreens:</div><div class='ctx'>  - touchscreen-fuzz-pressure	: pressure noise value of the absolute input</div><div class='ctx'> 				  device (arbitrary range dependent on the</div><div class='ctx'> 				  controller)</div><div class='add'>+ - touchscreen-average-samples : Number of data samples which are averaged</div><div class='add'>+				  for each read (valid values dependent on the</div><div class='add'>+				  controller)</div><div class='ctx'>  - touchscreen-inverted-x	: X axis is inverted (boolean)</div><div class='ctx'>  - touchscreen-inverted-y	: Y axis is inverted (boolean)</div><div class='ctx'>  - touchscreen-swapped-x-y	: X and Y axis are swapped (boolean)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/input/touchscreen/zet6223.txt b/Documentation/devicetree/bindings/input/touchscreen/zet6223.txt<br/>new file mode 100644<br/>index 000000000000..fe6a1feef703<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/touchscreen/zet6223.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/touchscreen/zet6223.txt</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+Zeitec ZET6223 I2C touchscreen controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible		  : "zeitec,zet6223"</div><div class='add'>+- reg			  : I2C slave address of the chip (0x76)</div><div class='add'>+- interrupt-parent	  : a phandle pointing to the interrupt controller</div><div class='add'>+			    serving the interrupt for this chip</div><div class='add'>+- interrupts		  : interrupt specification for the zet6223 interrupt</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- vio-supply		  : Specification for VIO supply (1.8V or 3.3V,</div><div class='add'>+			    depending on system interface needs).</div><div class='add'>+- vcc-supply		  : Specification for 3.3V VCC supply.</div><div class='add'>+- touchscreen-size-x	  : See touchscreen.txt</div><div class='add'>+- touchscreen-size-y	  : See touchscreen.txt</div><div class='add'>+- touchscreen-inverted-x  : See touchscreen.txt</div><div class='add'>+- touchscreen-inverted-y  : See touchscreen.txt</div><div class='add'>+- touchscreen-swapped-x-y : See touchscreen.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+i2c@00000000 {</div><div class='add'>+</div><div class='add'>+	zet6223: touchscreen@76 {</div><div class='add'>+		compatible = "zeitec,zet6223";</div><div class='add'>+		reg = &lt;0x76&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;pio&gt;;</div><div class='add'>+		interrupts = &lt;6 11 IRQ_TYPE_EDGE_FALLING&gt;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt b/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt<br/>index 3e5b9793341f..8682ab6d4a50 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt</a></div><div class='hunk'>@@ -8,8 +8,9 @@ This driver provides a simple power button event via an Interrupt.</div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible: should be "ti,tps65217-pwrbutton" or "ti,tps65218-pwrbutton"</div><div class='ctx'> </div><div class='del'>-Required properties for TPS65218:</div><div class='add'>+Required properties:</div><div class='ctx'> - interrupts: should be one of the following</div><div class='add'>+   - &lt;2&gt;: For controllers compatible with tps65217</div><div class='ctx'>    - &lt;3 IRQ_TYPE_EDGE_BOTH&gt;: For controllers compatible with tps65218</div><div class='ctx'> </div><div class='ctx'> Examples:</div><div class='hunk'>@@ -17,6 +18,7 @@ Examples:</div><div class='ctx'> &amp;tps {</div><div class='ctx'> 	tps65217-pwrbutton {</div><div class='ctx'> 		compatible = "ti,tps65217-pwrbutton";</div><div class='add'>+		interrupts = &lt;2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt b/Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt<br/>index 5393e2a45a42..560d8a727b8f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt</a></div><div class='hunk'>@@ -111,7 +111,7 @@ Example:</div><div class='ctx'> 		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0x2c001000 0x1000&gt;,</div><div class='del'>-		      &lt;0x2c002000 0x1000&gt;,</div><div class='add'>+		      &lt;0x2c002000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x2c004000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x2c006000 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;1 9 0xf04&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/interrupt-controller/cortina,gemini-interrupt-controller.txt b/Documentation/devicetree/bindings/interrupt-controller/cortina,gemini-interrupt-controller.txt<br/>new file mode 100644<br/>index 000000000000..97c1167fa533<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/interrupt-controller/cortina,gemini-interrupt-controller.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/interrupt-controller/cortina,gemini-interrupt-controller.txt</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+* Cortina Systems Gemini interrupt controller</div><div class='add'>+</div><div class='add'>+This interrupt controller is found on the Gemini SoCs.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must be "cortina,gemini-interrupt-controller"</div><div class='add'>+- reg: The register bank for the interrupt controller.</div><div class='add'>+- interrupt-controller: Identifies the node as an interrupt controller</div><div class='add'>+- #interrupt-cells: The number of cells to define the interrupts.</div><div class='add'>+  Must be 2 as the controller can specify level or rising edge</div><div class='add'>+  IRQs. The bindings follows the standard binding for controllers</div><div class='add'>+  with two cells specified in</div><div class='add'>+  interrupt-controller/interrupts.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+interrupt-controller@48000000 {</div><div class='add'>+	compatible = "cortina,gemini-interrupt-controller";</div><div class='add'>+	reg = &lt;0x48000000 0x1000&gt;;</div><div class='add'>+	interrupt-controller;</div><div class='add'>+	#interrupt-cells = &lt;2&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt<br/>index 0dcb7c7d3e40..8b46a34e05f1 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt</a></div><div class='hunk'>@@ -8,12 +8,11 @@ Properties:</div><div class='ctx'> - compatible: "snps,archs-idu-intc"</div><div class='ctx'> - interrupt-controller: This is an interrupt controller.</div><div class='ctx'> - interrupt-parent: &lt;reference to parent core intc&gt;</div><div class='del'>-- #interrupt-cells: Must be &lt;2&gt;.</div><div class='del'>-- interrupts: &lt;...&gt; specifies the upstream core irqs</div><div class='add'>+- #interrupt-cells: Must be &lt;1&gt;.</div><div class='ctx'> </div><div class='del'>-  First cell specifies the "common" IRQ from peripheral to IDU</div><div class='del'>-  Second cell specifies the irq distribution mode to cores</div><div class='del'>-     0=Round Robin; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3</div><div class='add'>+  Value of the cell specifies the "common" IRQ from peripheral to IDU. Number N</div><div class='add'>+  of the particular interrupt line of IDU corresponds to the line N+24 of the</div><div class='add'>+  core interrupt controller.</div><div class='ctx'> </div><div class='ctx'>   intc accessed via the special ARC AUX register interface, hence "reg" property</div><div class='ctx'>   is not specified.</div><div class='hunk'>@@ -29,18 +28,10 @@ Example:</div><div class='ctx'> 		compatible = "snps,archs-idu-intc";</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;core_intc&gt;;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * &lt;hwirq  distribution&gt;</div><div class='del'>-		 * distribution: 0=RR; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3</div><div class='del'>-		 */</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		/* upstream core irqs: downstream these are "COMMON" irq 0,1..  */</div><div class='del'>-		interrupts = &lt;24 25 26 27 28 29 30 31&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	some_device: serial@c0fc1000 {</div><div class='ctx'> 		interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='del'>-		interrupts = &lt;0 0&gt;;	/* upstream idu IRQ #24, Round Robin */</div><div class='add'>+		interrupts = &lt;0&gt;;	/* upstream idu IRQ #24 */</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt<br/>index e862d1485205..6cdf32d037fc 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iommu/arm,smmu.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/iommu/arm,smmu.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/iommu/arm,smmu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/iommu/arm,smmu.txt</a></div><div class='hunk'>@@ -36,15 +36,15 @@ conditions.</div><div class='ctx'>                   combined interrupt, it must be listed multiple times.</div><div class='ctx'> </div><div class='ctx'> - #iommu-cells  : See Documentation/devicetree/bindings/iommu/iommu.txt</div><div class='del'>-                  for details. With a value of 1, each "iommus" entry</div><div class='add'>+                  for details. With a value of 1, each IOMMU specifier</div><div class='ctx'>                   represents a distinct stream ID emitted by that device</div><div class='ctx'>                   into the relevant SMMU.</div><div class='ctx'> </div><div class='ctx'>                   SMMUs with stream matching support and complex masters</div><div class='del'>-                  may use a value of 2, where the second cell represents</div><div class='del'>-                  an SMR mask to combine with the ID in the first cell.</div><div class='del'>-                  Care must be taken to ensure the set of matched IDs</div><div class='del'>-                  does not result in conflicts.</div><div class='add'>+                  may use a value of 2, where the second cell of the</div><div class='add'>+                  IOMMU specifier represents an SMR mask to combine with</div><div class='add'>+                  the ID in the first cell.  Care must be taken to ensure</div><div class='add'>+                  the set of matched IDs does not result in conflicts.</div><div class='ctx'> </div><div class='ctx'> ** System MMU optional properties:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt<br/>index 696be5792625..24b656014089 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/leds/common.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/leds/common.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/leds/common.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/leds/common.txt</a></div><div class='hunk'>@@ -61,16 +61,24 @@ property can be omitted.</div><div class='ctx'> </div><div class='ctx'> Examples:</div><div class='ctx'> </div><div class='del'>-system-status {</div><div class='del'>-	label = "Status";</div><div class='del'>-	linux,default-trigger = "heartbeat";</div><div class='del'>-	...</div><div class='add'>+gpio-leds {</div><div class='add'>+	compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+	system-status {</div><div class='add'>+		label = "Status";</div><div class='add'>+		linux,default-trigger = "heartbeat";</div><div class='add'>+		gpios = &lt;&amp;gpio0 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-camera-flash {</div><div class='del'>-	label = "Flash";</div><div class='del'>-	led-sources = &lt;0&gt;, &lt;1&gt;;</div><div class='del'>-	led-max-microamp = &lt;50000&gt;;</div><div class='del'>-	flash-max-microamp = &lt;320000&gt;;</div><div class='del'>-	flash-max-timeout-us = &lt;500000&gt;;</div><div class='add'>+max77693-led {</div><div class='add'>+	compatible = "maxim,max77693-led";</div><div class='add'>+</div><div class='add'>+	camera-flash {</div><div class='add'>+		label = "Flash";</div><div class='add'>+		led-sources = &lt;0&gt;, &lt;1&gt;;</div><div class='add'>+		led-max-microamp = &lt;50000&gt;;</div><div class='add'>+		flash-max-microamp = &lt;320000&gt;;</div><div class='add'>+		flash-max-timeout-us = &lt;500000&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt b/Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt<br/>new file mode 100644<br/>index 000000000000..896b6997cf30<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+Device tree bindings for IR LED connected through SPI bus which is used as</div><div class='add'>+remote controller.</div><div class='add'>+</div><div class='add'>+The IR LED switch is connected to the MOSI line of the SPI device and the data</div><div class='add'>+are delivered thourgh that.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+	- compatible: should be "ir-spi-led".</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+	- duty-cycle: 8 bit balue that represents the percentage of one period</div><div class='add'>+	  in which the signal is active.  It can be 50, 60, 70, 75, 80 or 90.</div><div class='add'>+	- led-active-low: boolean value that specifies whether the output is</div><div class='add'>+	  negated with a NOT gate.</div><div class='add'>+	- power-supply: specifies the power source. It can either be a regulator</div><div class='add'>+	  or a gpio which enables a regulator, i.e. a regulator-fixed as</div><div class='add'>+	  described in</div><div class='add'>+	  Documentation/devicetree/bindings/regulator/fixed-regulator.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	irled@0 {</div><div class='add'>+		compatible = "ir-spi-led";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;5000000&gt;;</div><div class='add'>+		power-supply = &lt;&amp;vdd_led&gt;;</div><div class='add'>+		led-active-low;</div><div class='add'>+		duty-cycle = /bits/ 8 &lt;60&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/leds/pca963x.txt b/Documentation/devicetree/bindings/leds/pca963x.txt<br/>index dafbe9931c2b..dfbdb123a9bf 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/leds/pca963x.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/leds/pca963x.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/leds/pca963x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/leds/pca963x.txt</a></div><div class='hunk'>@@ -7,6 +7,9 @@ Optional properties:</div><div class='ctx'> - nxp,totem-pole : use totem pole (push-pull) instead of open-drain (pca9632 defaults</div><div class='ctx'>   to open-drain, newer chips to totem pole)</div><div class='ctx'> - nxp,hw-blink : use hardware blinking instead of software blinking</div><div class='add'>+- nxp,period-scale : In some configurations, the chip blinks faster than expected.</div><div class='add'>+		     This parameter provides a scaling ratio (fixed point, decimal divided</div><div class='add'>+		     by 1000) to compensate, e.g. 1300=1.3x and 750=0.75x.</div><div class='ctx'> </div><div class='ctx'> Each led is represented as a sub-node of the nxp,pca963x device.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt b/Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt<br/>index e893615ef635..b48d7d30012c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt</a></div><div class='hunk'>@@ -12,7 +12,7 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='del'>-mailbox: mailbox@7e00b800 {</div><div class='add'>+mailbox: mailbox@7e00b880 {</div><div class='ctx'> 	compatible = "brcm,bcm2835-mbox";</div><div class='ctx'> 	reg = &lt;0x7e00b880 0x40&gt;;</div><div class='ctx'> 	interrupts = &lt;0 1&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.txt b/Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.txt<br/>new file mode 100644<br/>index 000000000000..b99d25fc2f26<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.txt</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+NVIDIA Tegra Hardware Synchronization Primitives (HSP)</div><div class='add'>+</div><div class='add'>+The HSP modules are used for the processors to share resources and communicate</div><div class='add'>+together. It provides a set of hardware synchronization primitives for</div><div class='add'>+interprocessor communication. So the interprocessor communication (IPC)</div><div class='add'>+protocols can use hardware synchronization primitives, when operating between</div><div class='add'>+two processors not in an SMP relationship.</div><div class='add'>+</div><div class='add'>+The features that HSP supported are shared mailboxes, shared semaphores,</div><div class='add'>+arbitrated semaphores and doorbells.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- name : Should be hsp</div><div class='add'>+- compatible</div><div class='add'>+    Array of strings.</div><div class='add'>+    one of:</div><div class='add'>+    - "nvidia,tegra186-hsp"</div><div class='add'>+- reg : Offset and length of the register set for the device.</div><div class='add'>+- interrupt-names</div><div class='add'>+    Array of strings.</div><div class='add'>+    Contains a list of names for the interrupts described by the interrupt</div><div class='add'>+    property. May contain the following entries, in any order:</div><div class='add'>+    - "doorbell"</div><div class='add'>+    Users of this binding MUST look up entries in the interrupt property</div><div class='add'>+    by name, using this interrupt-names property to do so.</div><div class='add'>+- interrupts</div><div class='add'>+    Array of interrupt specifiers.</div><div class='add'>+    Must contain one entry per entry in the interrupt-names property,</div><div class='add'>+    in a matching order.</div><div class='add'>+- #mbox-cells : Should be 2.</div><div class='add'>+</div><div class='add'>+The mbox specifier of the "mboxes" property in the client node should</div><div class='add'>+contain two data. The first one should be the HSP type and the second</div><div class='add'>+one should be the ID that the client is going to use. Those information</div><div class='add'>+can be found in the following file.</div><div class='add'>+</div><div class='add'>+- &lt;dt-bindings/mailbox/tegra186-hsp.h&gt;.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+hsp_top0: hsp@3c00000 {</div><div class='add'>+	compatible = "nvidia,tegra186-hsp";</div><div class='add'>+	reg = &lt;0x0 0x03c00000 0x0 0xa0000&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	interrupt-names = "doorbell";</div><div class='add'>+	#mbox-cells = &lt;2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+client {</div><div class='add'>+	...</div><div class='add'>+	mboxes = &lt;&amp;hsp_top0 TEGRA_HSP_MBOX_TYPE_DB TEGRA_HSP_DB_MASTER_XXX&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/exynos5-gsc.txt b/Documentation/devicetree/bindings/media/exynos5-gsc.txt<br/>index 5fe9372abb37..26ca25b6d264 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/exynos5-gsc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/media/exynos5-gsc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/exynos5-gsc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/exynos5-gsc.txt</a></div><div class='hunk'>@@ -3,7 +3,8 @@</div><div class='ctx'> G-Scaler is used for scaling and color space conversion on EXYNOS5 SoCs.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: should be "samsung,exynos5-gsc"</div><div class='add'>+- compatible: should be "samsung,exynos5-gsc" (for Exynos 5250, 5420 and</div><div class='add'>+	      5422 SoCs) or "samsung,exynos5433-gsc" (Exynos 5433)</div><div class='ctx'> - reg: should contain G-Scaler physical address location and length.</div><div class='ctx'> - interrupts: should contain G-Scaler interrupt number</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/fsl-vdoa.txt b/Documentation/devicetree/bindings/media/fsl-vdoa.txt<br/>new file mode 100644<br/>index 000000000000..6c5628530bb7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/fsl-vdoa.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/fsl-vdoa.txt</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+Freescale Video Data Order Adapter</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+The Video Data Order Adapter (VDOA) is present on the i.MX6q. Its sole purpose</div><div class='add'>+is to reorder video data from the macroblock tiled order produced by the CODA</div><div class='add'>+960 VPU to the conventional raster-scan order for scanout.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must be "fsl,imx6q-vdoa"</div><div class='add'>+- reg: the register base and size for the device registers</div><div class='add'>+- interrupts: the VDOA interrupt</div><div class='add'>+- clocks: the vdoa clock</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+vdoa@21e4000 {</div><div class='add'>+        compatible = "fsl,imx6q-vdoa";</div><div class='add'>+        reg = &lt;0x021e4000 0x4000&gt;;</div><div class='add'>+        interrupts = &lt;0 18 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+        clocks = &lt;&amp;clks IMX6QDL_CLK_VDOA&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/gpio-ir-receiver.txt b/Documentation/devicetree/bindings/media/gpio-ir-receiver.txt<br/>index 56e726ef4bf2..58261fb7b408 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/gpio-ir-receiver.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/media/gpio-ir-receiver.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/gpio-ir-receiver.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/gpio-ir-receiver.txt</a></div><div class='hunk'>@@ -5,7 +5,8 @@ Required properties:</div><div class='ctx'> 	- gpios: specifies GPIO used for IR signal reception.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='del'>-	- linux,rc-map-name: Linux specific remote control map name.</div><div class='add'>+	- linux,rc-map-name: see rc.txt file in the same</div><div class='add'>+	  directory.</div><div class='ctx'> </div><div class='ctx'> Example node:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/hix5hd2-ir.txt b/Documentation/devicetree/bindings/media/hix5hd2-ir.txt<br/>index fb5e7606643a..13ebc0fac9ea 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/hix5hd2-ir.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/media/hix5hd2-ir.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/hix5hd2-ir.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/hix5hd2-ir.txt</a></div><div class='hunk'>@@ -8,10 +8,11 @@ Required properties:</div><div class='ctx'> 	  the device. The interrupt specifier format depends on the interrupt</div><div class='ctx'> 	  controller parent.</div><div class='ctx'> 	- clocks: clock phandle and specifier pair.</div><div class='del'>-	- hisilicon,power-syscon: phandle of syscon used to control power.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='del'>-	- linux,rc-map-name : Remote control map name.</div><div class='add'>+	- linux,rc-map-name: see rc.txt file in the same directory.</div><div class='add'>+	- hisilicon,power-syscon: DEPRECATED. Don't use this in new dts files.</div><div class='add'>+		Provide correct clocks instead.</div><div class='ctx'> </div><div class='ctx'> Example node:</div><div class='ctx'> </div><div class='hunk'>@@ -19,7 +20,6 @@ Example node:</div><div class='ctx'> 		compatible = "hisilicon,hix5hd2-ir";</div><div class='ctx'> 		reg = &lt;0xf8001000 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;0 47 4&gt;;</div><div class='del'>-		clocks = &lt;&amp;clock HIX5HD2_FIXED_24M&gt;;</div><div class='del'>-		hisilicon,power-syscon = &lt;&amp;sysctrl&gt;;</div><div class='add'>+		clocks = &lt;&amp;clock HIX5HD2_IR_CLOCK&gt;;</div><div class='ctx'> 		linux,rc-map-name = "rc-tivo";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/i2c/adv7604.txt b/Documentation/devicetree/bindings/media/i2c/adv7604.txt<br/>index 8337f75c75da..9cbd92eb5d05 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/i2c/adv7604.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/media/i2c/adv7604.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/i2c/adv7604.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/i2c/adv7604.txt</a></div><div class='hunk'>@@ -34,6 +34,7 @@ The digital output port node must contain at least one endpoint.</div><div class='ctx'> Optional Properties:</div><div class='ctx'> </div><div class='ctx'>   - reset-gpios: Reference to the GPIO connected to the device's reset pin.</div><div class='add'>+  - default-input: Select which input is selected after reset.</div><div class='ctx'> </div><div class='ctx'> Optional Endpoint Properties:</div><div class='ctx'> </div><div class='hunk'>@@ -47,8 +48,6 @@ Optional Endpoint Properties:</div><div class='ctx'>   If none of hsync-active, vsync-active and pclk-sample is specified the</div><div class='ctx'>   endpoint will use embedded BT.656 synchronization.</div><div class='ctx'> </div><div class='del'>-  - default-input: Select which input is selected after reset.</div><div class='del'>-</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	hdmi_receiver@4c {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/i2c/toshiba,et8ek8.txt b/Documentation/devicetree/bindings/media/i2c/toshiba,et8ek8.txt<br/>new file mode 100644<br/>index 000000000000..0b7b6a4d84ff<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/i2c/toshiba,et8ek8.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/i2c/toshiba,et8ek8.txt</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+Toshiba et8ek8 5MP sensor</div><div class='add'>+</div><div class='add'>+Toshiba et8ek8 5MP sensor is an image sensor found in Nokia N900 device</div><div class='add'>+</div><div class='add'>+More detailed documentation can be found in</div><div class='add'>+Documentation/devicetree/bindings/media/video-interfaces.txt .</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Mandatory properties</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+- compatible: "toshiba,et8ek8"</div><div class='add'>+- reg: I2C address (0x3e, or an alternative address)</div><div class='add'>+- vana-supply: Analogue voltage supply (VANA), 2.8 volts</div><div class='add'>+- clocks: External clock to the sensor</div><div class='add'>+- clock-frequency: Frequency of the external clock to the sensor. Camera</div><div class='add'>+  driver will set this frequency on the external clock. The clock frequency is</div><div class='add'>+  a pre-determined frequency known to be suitable to the board.</div><div class='add'>+- reset-gpios: XSHUTDOWN GPIO. The XSHUTDOWN signal is active low. The sensor</div><div class='add'>+  is in hardware standby mode when the signal is in the low state.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Endpoint node mandatory properties</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+- remote-endpoint: A phandle to the bus receiver's endpoint node.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+&amp;i2c3 {</div><div class='add'>+	clock-frequency = &lt;400000&gt;;</div><div class='add'>+</div><div class='add'>+	cam1: camera@3e {</div><div class='add'>+		compatible = "toshiba,et8ek8";</div><div class='add'>+		reg = &lt;0x3e&gt;;</div><div class='add'>+		vana-supply = &lt;&amp;vaux4&gt;;</div><div class='add'>+		clocks = &lt;&amp;isp 0&gt;;</div><div class='add'>+		clock-frequency = &lt;9600000&gt;;</div><div class='add'>+		reset-gpio = &lt;&amp;gpio4 6 GPIO_ACTIVE_HIGH&gt;; /* 102 */</div><div class='add'>+		port {</div><div class='add'>+			csi_cam1: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;csi_out1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/mediatek-mdp.txt b/Documentation/devicetree/bindings/media/mediatek-mdp.txt<br/>new file mode 100644<br/>index 000000000000..4182063a54db<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/mediatek-mdp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/mediatek-mdp.txt</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+* Mediatek Media Data Path</div><div class='add'>+</div><div class='add'>+Media Data Path is used for scaling and color space conversion.</div><div class='add'>+</div><div class='add'>+Required properties (controller (parent) node):</div><div class='add'>+- compatible: "mediatek,mt8173-mdp"</div><div class='add'>+- mediatek,vpu: the node of video processor unit, see</div><div class='add'>+  Documentation/devicetree/bindings/media/mediatek-vpu.txt for details.</div><div class='add'>+</div><div class='add'>+Required properties (all function blocks, child node):</div><div class='add'>+- compatible: Should be one of</div><div class='add'>+        "mediatek,mt8173-mdp-rdma"  - read DMA</div><div class='add'>+        "mediatek,mt8173-mdp-rsz"   - resizer</div><div class='add'>+        "mediatek,mt8173-mdp-wdma"  - write DMA</div><div class='add'>+        "mediatek,mt8173-mdp-wrot"  - write DMA with rotation</div><div class='add'>+- reg: Physical base address and length of the function block register space</div><div class='add'>+- clocks: device clocks, see</div><div class='add'>+  Documentation/devicetree/bindings/clock/clock-bindings.txt for details.</div><div class='add'>+- power-domains: a phandle to the power domain, see</div><div class='add'>+  Documentation/devicetree/bindings/power/power_domain.txt for details.</div><div class='add'>+</div><div class='add'>+Required properties (DMA function blocks, child node):</div><div class='add'>+- compatible: Should be one of</div><div class='add'>+        "mediatek,mt8173-mdp-rdma"</div><div class='add'>+        "mediatek,mt8173-mdp-wdma"</div><div class='add'>+        "mediatek,mt8173-mdp-wrot"</div><div class='add'>+- iommus: should point to the respective IOMMU block with master port as</div><div class='add'>+  argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt</div><div class='add'>+  for details.</div><div class='add'>+- mediatek,larb: must contain the local arbiters in the current Socs, see</div><div class='add'>+  Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt</div><div class='add'>+  for details.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+mdp {</div><div class='add'>+	compatible = "mediatek,mt8173-mdp";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	ranges;</div><div class='add'>+	mediatek,vpu = &lt;&amp;vpu&gt;;</div><div class='add'>+</div><div class='add'>+	mdp_rdma0: rdma@14001000 {</div><div class='add'>+		compatible = "mediatek,mt8173-mdp-rdma";</div><div class='add'>+		reg = &lt;0 0x14001000 0 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;mmsys CLK_MM_MDP_RDMA0&gt;,</div><div class='add'>+			 &lt;&amp;mmsys CLK_MM_MUTEX_32K&gt;;</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+		iommus = &lt;&amp;iommu M4U_PORT_MDP_RDMA0&gt;;</div><div class='add'>+		mediatek,larb = &lt;&amp;larb0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdp_rdma1: rdma@14002000 {</div><div class='add'>+		compatible = "mediatek,mt8173-mdp-rdma";</div><div class='add'>+		reg = &lt;0 0x14002000 0 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;mmsys CLK_MM_MDP_RDMA1&gt;,</div><div class='add'>+			 &lt;&amp;mmsys CLK_MM_MUTEX_32K&gt;;</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+		iommus = &lt;&amp;iommu M4U_PORT_MDP_RDMA1&gt;;</div><div class='add'>+		mediatek,larb = &lt;&amp;larb4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdp_rsz0: rsz@14003000 {</div><div class='add'>+		compatible = "mediatek,mt8173-mdp-rsz";</div><div class='add'>+		reg = &lt;0 0x14003000 0 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;mmsys CLK_MM_MDP_RSZ0&gt;;</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdp_rsz1: rsz@14004000 {</div><div class='add'>+		compatible = "mediatek,mt8173-mdp-rsz";</div><div class='add'>+		reg = &lt;0 0x14004000 0 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;mmsys CLK_MM_MDP_RSZ1&gt;;</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdp_rsz2: rsz@14005000 {</div><div class='add'>+		compatible = "mediatek,mt8173-mdp-rsz";</div><div class='add'>+		reg = &lt;0 0x14005000 0 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;mmsys CLK_MM_MDP_RSZ2&gt;;</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdp_wdma0: wdma@14006000 {</div><div class='add'>+		compatible = "mediatek,mt8173-mdp-wdma";</div><div class='add'>+		reg = &lt;0 0x14006000 0 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;mmsys CLK_MM_MDP_WDMA&gt;;</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+		iommus = &lt;&amp;iommu M4U_PORT_MDP_WDMA&gt;;</div><div class='add'>+		mediatek,larb = &lt;&amp;larb0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdp_wrot0: wrot@14007000 {</div><div class='add'>+		compatible = "mediatek,mt8173-mdp-wrot";</div><div class='add'>+		reg = &lt;0 0x14007000 0 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;mmsys CLK_MM_MDP_WROT0&gt;;</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+		iommus = &lt;&amp;iommu M4U_PORT_MDP_WROT0&gt;;</div><div class='add'>+		mediatek,larb = &lt;&amp;larb0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdp_wrot1: wrot@14008000 {</div><div class='add'>+		compatible = "mediatek,mt8173-mdp-wrot";</div><div class='add'>+		reg = &lt;0 0x14008000 0 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;mmsys CLK_MM_MDP_WROT1&gt;;</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+		iommus = &lt;&amp;iommu M4U_PORT_MDP_WROT1&gt;;</div><div class='add'>+		mediatek,larb = &lt;&amp;larb4&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt<br/>index 59a47a5b924b..46c15c54175d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/mediatek-vcodec.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/media/mediatek-vcodec.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/mediatek-vcodec.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/mediatek-vcodec.txt</a></div><div class='hunk'>@@ -1,25 +1,74 @@</div><div class='ctx'> Mediatek Video Codec</div><div class='ctx'> </div><div class='ctx'> Mediatek Video Codec is the video codec hw present in Mediatek SoCs which</div><div class='del'>-supports high resolution encoding functionalities.</div><div class='add'>+supports high resolution encoding and decoding functionalities.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible : "mediatek,mt8173-vcodec-enc" for encoder</div><div class='add'>+  "mediatek,mt8173-vcodec-dec" for decoder.</div><div class='ctx'> - reg : Physical base address of the video codec registers and length of</div><div class='ctx'>   memory mapped region.</div><div class='ctx'> - interrupts : interrupt number to the cpu.</div><div class='ctx'> - mediatek,larb : must contain the local arbiters in the current Socs.</div><div class='ctx'> - clocks : list of clock specifiers, corresponding to entries in</div><div class='ctx'>   the clock-names property.</div><div class='del'>-- clock-names: encoder must contain "venc_sel_src", "venc_sel",</div><div class='del'>-- "venc_lt_sel_src", "venc_lt_sel".</div><div class='add'>+- clock-names: encoder must contain "venc_sel_src", "venc_sel",,</div><div class='add'>+  "venc_lt_sel_src", "venc_lt_sel", decoder must contain "vcodecpll",</div><div class='add'>+  "univpll_d2", "clk_cci400_sel", "vdec_sel", "vdecpll", "vencpll",</div><div class='add'>+  "venc_lt_sel", "vdec_bus_clk_src".</div><div class='ctx'> - iommus : should point to the respective IOMMU block with master port as</div><div class='ctx'>   argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt</div><div class='ctx'>   for details.</div><div class='ctx'> - mediatek,vpu : the node of video processor unit</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> Example:</div><div class='del'>-vcodec_enc: vcodec@0x18002000 {</div><div class='add'>+</div><div class='add'>+vcodec_dec: vcodec@16000000 {</div><div class='add'>+    compatible = "mediatek,mt8173-vcodec-dec";</div><div class='add'>+    reg = &lt;0 0x16000000 0 0x100&gt;,   /*VDEC_SYS*/</div><div class='add'>+          &lt;0 0x16020000 0 0x1000&gt;,  /*VDEC_MISC*/</div><div class='add'>+          &lt;0 0x16021000 0 0x800&gt;,   /*VDEC_LD*/</div><div class='add'>+          &lt;0 0x16021800 0 0x800&gt;,   /*VDEC_TOP*/</div><div class='add'>+          &lt;0 0x16022000 0 0x1000&gt;,  /*VDEC_CM*/</div><div class='add'>+          &lt;0 0x16023000 0 0x1000&gt;,  /*VDEC_AD*/</div><div class='add'>+          &lt;0 0x16024000 0 0x1000&gt;,  /*VDEC_AV*/</div><div class='add'>+          &lt;0 0x16025000 0 0x1000&gt;,  /*VDEC_PP*/</div><div class='add'>+          &lt;0 0x16026800 0 0x800&gt;,   /*VP8_VD*/</div><div class='add'>+          &lt;0 0x16027000 0 0x800&gt;,   /*VP6_VD*/</div><div class='add'>+          &lt;0 0x16027800 0 0x800&gt;,   /*VP8_VL*/</div><div class='add'>+          &lt;0 0x16028400 0 0x400&gt;;   /*VP9_VD*/</div><div class='add'>+    interrupts = &lt;GIC_SPI 204 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+    mediatek,larb = &lt;&amp;larb1&gt;;</div><div class='add'>+    iommus = &lt;&amp;iommu M4U_PORT_HW_VDEC_MC_EXT&gt;,</div><div class='add'>+             &lt;&amp;iommu M4U_PORT_HW_VDEC_PP_EXT&gt;,</div><div class='add'>+             &lt;&amp;iommu M4U_PORT_HW_VDEC_AVC_MV_EXT&gt;,</div><div class='add'>+             &lt;&amp;iommu M4U_PORT_HW_VDEC_PRED_RD_EXT&gt;,</div><div class='add'>+             &lt;&amp;iommu M4U_PORT_HW_VDEC_PRED_WR_EXT&gt;,</div><div class='add'>+             &lt;&amp;iommu M4U_PORT_HW_VDEC_UFO_EXT&gt;,</div><div class='add'>+             &lt;&amp;iommu M4U_PORT_HW_VDEC_VLD_EXT&gt;,</div><div class='add'>+             &lt;&amp;iommu M4U_PORT_HW_VDEC_VLD2_EXT&gt;;</div><div class='add'>+    mediatek,vpu = &lt;&amp;vpu&gt;;</div><div class='add'>+    power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_VDEC&gt;;</div><div class='add'>+    clocks = &lt;&amp;apmixedsys CLK_APMIXED_VCODECPLL&gt;,</div><div class='add'>+             &lt;&amp;topckgen CLK_TOP_UNIVPLL_D2&gt;,</div><div class='add'>+             &lt;&amp;topckgen CLK_TOP_CCI400_SEL&gt;,</div><div class='add'>+             &lt;&amp;topckgen CLK_TOP_VDEC_SEL&gt;,</div><div class='add'>+             &lt;&amp;topckgen CLK_TOP_VCODECPLL&gt;,</div><div class='add'>+             &lt;&amp;apmixedsys CLK_APMIXED_VENCPLL&gt;,</div><div class='add'>+             &lt;&amp;topckgen CLK_TOP_VENC_LT_SEL&gt;,</div><div class='add'>+             &lt;&amp;topckgen CLK_TOP_VCODECPLL_370P5&gt;;</div><div class='add'>+    clock-names = "vcodecpll",</div><div class='add'>+                  "univpll_d2",</div><div class='add'>+                  "clk_cci400_sel",</div><div class='add'>+                  "vdec_sel",</div><div class='add'>+                  "vdecpll",</div><div class='add'>+                  "vencpll",</div><div class='add'>+                  "venc_lt_sel",</div><div class='add'>+                  "vdec_bus_clk_src";</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+  vcodec_enc: vcodec@0x18002000 {</div><div class='ctx'>     compatible = "mediatek,mt8173-vcodec-enc";</div><div class='ctx'>     reg = &lt;0 0x18002000 0 0x1000&gt;,    /*VENC_SYS*/</div><div class='ctx'>           &lt;0 0x19002000 0 0x1000&gt;;    /*VENC_LT_SYS*/</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/meson-ir.txt b/Documentation/devicetree/bindings/media/meson-ir.txt<br/>index e7e3f3c4fc8f..efd9d29a8f10 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/meson-ir.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/media/meson-ir.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/meson-ir.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/meson-ir.txt</a></div><div class='hunk'>@@ -8,6 +8,9 @@ Required properties:</div><div class='ctx'>  - reg		: physical base address and length of the device registers</div><div class='ctx'>  - interrupts	: a single specifier for the interrupt from the device</div><div class='ctx'> </div><div class='add'>+Optional properties:</div><div class='add'>+ - linux,rc-map-name:	see rc.txt file in the same directory.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	ir-receiver@c8100480 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/mtk-cir.txt b/Documentation/devicetree/bindings/media/mtk-cir.txt<br/>new file mode 100644<br/>index 000000000000..2be2005577d6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/mtk-cir.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/mtk-cir.txt</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+Device-Tree bindings for Mediatek consumer IR controller</div><div class='add'>+found in Mediatek SoC family</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible	    : "mediatek,mt7623-cir"</div><div class='add'>+- clocks	    : list of clock specifiers, corresponding to</div><div class='add'>+		      entries in clock-names property;</div><div class='add'>+- clock-names	    : should contain "clk" entries;</div><div class='add'>+- interrupts	    : should contain IR IRQ number;</div><div class='add'>+- reg		    : should contain IO map address for IR.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- linux,rc-map-name : see rc.txt file in the same directory.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+cir: cir@10013000 {</div><div class='add'>+	compatible = "mediatek,mt7623-cir";</div><div class='add'>+	reg = &lt;0 0x10013000 0 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 87 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	clocks = &lt;&amp;infracfg CLK_INFRA_IRRX&gt;;</div><div class='add'>+	clock-names = "clk";</div><div class='add'>+	linux,rc-map-name = "rc-rc6-mce";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/rc.txt b/Documentation/devicetree/bindings/media/rc.txt<br/>new file mode 100644<br/>index 000000000000..d3e7a012bfda<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/rc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/rc.txt</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+The following properties are common to the infrared remote controllers:</div><div class='add'>+</div><div class='add'>+- linux,rc-map-name: string, specifies the scancode/key mapping table</div><div class='add'>+  defined in-kernel for the remote controller. Support values are:</div><div class='add'>+  * "rc-adstech-dvb-t-pci"</div><div class='add'>+  * "rc-alink-dtu-m"</div><div class='add'>+  * "rc-anysee"</div><div class='add'>+  * "rc-apac-viewcomp"</div><div class='add'>+  * "rc-asus-pc39"</div><div class='add'>+  * "rc-asus-ps3-100"</div><div class='add'>+  * "rc-ati-tv-wonder-hd-600"</div><div class='add'>+  * "rc-ati-x10"</div><div class='add'>+  * "rc-avermedia-a16d"</div><div class='add'>+  * "rc-avermedia-cardbus"</div><div class='add'>+  * "rc-avermedia-dvbt"</div><div class='add'>+  * "rc-avermedia-m135a"</div><div class='add'>+  * "rc-avermedia-m733a-rm-k6"</div><div class='add'>+  * "rc-avermedia-rm-ks"</div><div class='add'>+  * "rc-avermedia"</div><div class='add'>+  * "rc-avertv-303"</div><div class='add'>+  * "rc-azurewave-ad-tu700"</div><div class='add'>+  * "rc-behold-columbus"</div><div class='add'>+  * "rc-behold"</div><div class='add'>+  * "rc-budget-ci-old"</div><div class='add'>+  * "rc-cec"</div><div class='add'>+  * "rc-cinergy-1400"</div><div class='add'>+  * "rc-cinergy"</div><div class='add'>+  * "rc-delock-61959"</div><div class='add'>+  * "rc-dib0700-nec"</div><div class='add'>+  * "rc-dib0700-rc5"</div><div class='add'>+  * "rc-digitalnow-tinytwin"</div><div class='add'>+  * "rc-digittrade"</div><div class='add'>+  * "rc-dm1105-nec"</div><div class='add'>+  * "rc-dntv-live-dvbt-pro"</div><div class='add'>+  * "rc-dntv-live-dvb-t"</div><div class='add'>+  * "rc-dtt200u"</div><div class='add'>+  * "rc-dvbsky"</div><div class='add'>+  * "rc-empty"</div><div class='add'>+  * "rc-em-terratec"</div><div class='add'>+  * "rc-encore-enltv2"</div><div class='add'>+  * "rc-encore-enltv-fm53"</div><div class='add'>+  * "rc-encore-enltv"</div><div class='add'>+  * "rc-evga-indtube"</div><div class='add'>+  * "rc-eztv"</div><div class='add'>+  * "rc-flydvb"</div><div class='add'>+  * "rc-flyvideo"</div><div class='add'>+  * "rc-fusionhdtv-mce"</div><div class='add'>+  * "rc-gadmei-rm008z"</div><div class='add'>+  * "rc-geekbox"</div><div class='add'>+  * "rc-genius-tvgo-a11mce"</div><div class='add'>+  * "rc-gotview7135"</div><div class='add'>+  * "rc-hauppauge"</div><div class='add'>+  * "rc-imon-mce"</div><div class='add'>+  * "rc-imon-pad"</div><div class='add'>+  * "rc-iodata-bctv7e"</div><div class='add'>+  * "rc-it913x-v1"</div><div class='add'>+  * "rc-it913x-v2"</div><div class='add'>+  * "rc-kaiomy"</div><div class='add'>+  * "rc-kworld-315u"</div><div class='add'>+  * "rc-kworld-pc150u"</div><div class='add'>+  * "rc-kworld-plus-tv-analog"</div><div class='add'>+  * "rc-leadtek-y04g0051"</div><div class='add'>+  * "rc-lirc"</div><div class='add'>+  * "rc-lme2510"</div><div class='add'>+  * "rc-manli"</div><div class='add'>+  * "rc-medion-x10"</div><div class='add'>+  * "rc-medion-x10-digitainer"</div><div class='add'>+  * "rc-medion-x10-or2x"</div><div class='add'>+  * "rc-msi-digivox-ii"</div><div class='add'>+  * "rc-msi-digivox-iii"</div><div class='add'>+  * "rc-msi-tvanywhere-plus"</div><div class='add'>+  * "rc-msi-tvanywhere"</div><div class='add'>+  * "rc-nebula"</div><div class='add'>+  * "rc-nec-terratec-cinergy-xs"</div><div class='add'>+  * "rc-norwood"</div><div class='add'>+  * "rc-npgtech"</div><div class='add'>+  * "rc-pctv-sedna"</div><div class='add'>+  * "rc-pinnacle-color"</div><div class='add'>+  * "rc-pinnacle-grey"</div><div class='add'>+  * "rc-pinnacle-pctv-hd"</div><div class='add'>+  * "rc-pixelview-new"</div><div class='add'>+  * "rc-pixelview"</div><div class='add'>+  * "rc-pixelview-002t"</div><div class='add'>+  * "rc-pixelview-mk12"</div><div class='add'>+  * "rc-powercolor-real-angel"</div><div class='add'>+  * "rc-proteus-2309"</div><div class='add'>+  * "rc-purpletv"</div><div class='add'>+  * "rc-pv951"</div><div class='add'>+  * "rc-hauppauge"</div><div class='add'>+  * "rc-rc5-tv"</div><div class='add'>+  * "rc-rc6-mce"</div><div class='add'>+  * "rc-real-audio-220-32-keys"</div><div class='add'>+  * "rc-reddo"</div><div class='add'>+  * "rc-snapstream-firefly"</div><div class='add'>+  * "rc-streamzap"</div><div class='add'>+  * "rc-tbs-nec"</div><div class='add'>+  * "rc-technisat-ts35"</div><div class='add'>+  * "rc-technisat-usb2"</div><div class='add'>+  * "rc-terratec-cinergy-c-pci"</div><div class='add'>+  * "rc-terratec-cinergy-s2-hd"</div><div class='add'>+  * "rc-terratec-cinergy-xs"</div><div class='add'>+  * "rc-terratec-slim"</div><div class='add'>+  * "rc-terratec-slim-2"</div><div class='add'>+  * "rc-tevii-nec"</div><div class='add'>+  * "rc-tivo"</div><div class='add'>+  * "rc-total-media-in-hand"</div><div class='add'>+  * "rc-total-media-in-hand-02"</div><div class='add'>+  * "rc-trekstor"</div><div class='add'>+  * "rc-tt-1500"</div><div class='add'>+  * "rc-twinhan-dtv-cab-ci"</div><div class='add'>+  * "rc-twinhan1027"</div><div class='add'>+  * "rc-videomate-k100"</div><div class='add'>+  * "rc-videomate-s350"</div><div class='add'>+  * "rc-videomate-tv-pvr"</div><div class='add'>+  * "rc-winfast"</div><div class='add'>+  * "rc-winfast-usbii-deluxe"</div><div class='add'>+  * "rc-su3000"</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/renesas,fcp.txt b/Documentation/devicetree/bindings/media/renesas,fcp.txt<br/>index 27f9b8e459ac..3ec91803ba58 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/renesas,fcp.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/media/renesas,fcp.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/renesas,fcp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/renesas,fcp.txt</a></div><div class='hunk'>@@ -11,15 +11,9 @@ are paired with. These DT bindings currently support the FCPV and FCPF.</div><div class='ctx'> </div><div class='ctx'>  - compatible: Must be one or more of the following</div><div class='ctx'> </div><div class='del'>-   - "renesas,r8a7795-fcpv" for R8A7795 (R-Car H3) compatible 'FCP for VSP'</div><div class='del'>-   - "renesas,r8a7795-fcpf" for R8A7795 (R-Car H3) compatible 'FCP for FDP'</div><div class='ctx'>    - "renesas,fcpv" for generic compatible 'FCP for VSP'</div><div class='ctx'>    - "renesas,fcpf" for generic compatible 'FCP for FDP'</div><div class='ctx'> </div><div class='del'>-   When compatible with the generic version, nodes must list the</div><div class='del'>-   SoC-specific version corresponding to the platform first, followed by the</div><div class='del'>-   family-specific and/or generic versions.</div><div class='del'>-</div><div class='ctx'>  - reg: the register base and size for the device registers</div><div class='ctx'>  - clocks: Reference to the functional clock</div><div class='ctx'> </div><div class='hunk'>@@ -32,7 +26,7 @@ Device node example</div><div class='ctx'> -------------------</div><div class='ctx'> </div><div class='ctx'> 	fcpvd1: fcp@fea2f000 {</div><div class='del'>-		compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";</div><div class='add'>+		compatible = "renesas,fcpv";</div><div class='ctx'> 		reg = &lt;0 0xfea2f000 0 0x200&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cpg CPG_MOD 602&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;sysc R8A7795_PD_A3VP&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/renesas,fdp1.txt b/Documentation/devicetree/bindings/media/renesas,fdp1.txt<br/>new file mode 100644<br/>index 000000000000..8dd1007bb573<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/renesas,fdp1.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/renesas,fdp1.txt</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+Renesas R-Car Fine Display Processor (FDP1)</div><div class='add'>+-------------------------------------------</div><div class='add'>+</div><div class='add'>+The FDP1 is a de-interlacing module which converts interlaced video to</div><div class='add'>+progressive video. It is capable of performing pixel format conversion between</div><div class='add'>+YCbCr/YUV formats and RGB formats. Only YCbCr/YUV formats are supported as</div><div class='add'>+an input to the module.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+ - compatible: must be "renesas,fdp1"</div><div class='add'>+ - reg: the register base and size for the device registers</div><div class='add'>+ - interrupts : interrupt specifier for the FDP1 instance</div><div class='add'>+ - clocks: reference to the functional clock</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+ - power-domains: reference to the power domain that the FDP1 belongs to, if</div><div class='add'>+                  any.</div><div class='add'>+ - renesas,fcp: a phandle referencing the FCP that handles memory accesses</div><div class='add'>+                for the FDP1. Not needed on Gen2, mandatory on Gen3.</div><div class='add'>+</div><div class='add'>+Please refer to the binding documentation for the clock and/or power domain</div><div class='add'>+providers for more details.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Device node example</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+	fdp1@fe940000 {</div><div class='add'>+		compatible = "renesas,fdp1";</div><div class='add'>+		reg = &lt;0 0xfe940000 0 0x2400&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;cpg CPG_MOD 119&gt;;</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A7795_PD_A3VP&gt;;</div><div class='add'>+		renesas,fcp = &lt;&amp;fcpf0&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt<br/>index 92c94f5ecbf1..2c901286d818 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/s5p-mfc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/media/s5p-mfc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/s5p-mfc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/s5p-mfc.txt</a></div><div class='hunk'>@@ -12,6 +12,7 @@ Required properties:</div><div class='ctx'> 	(b) "samsung,mfc-v6" for MFC v6 present in Exynos5 SoCs</div><div class='ctx'> 	(c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC</div><div class='ctx'> 	(d) "samsung,mfc-v8" for MFC v8 present in Exynos5800 SoC</div><div class='add'>+	(e) "samsung,exynos5433-mfc" for MFC v8 present in Exynos5433 SoC</div><div class='ctx'> </div><div class='ctx'>   - reg : Physical base address of the IP registers and length of memory</div><div class='ctx'> 	  mapped region.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/st,st-delta.txt b/Documentation/devicetree/bindings/media/st,st-delta.txt<br/>new file mode 100644<br/>index 000000000000..a538ab30a617<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/st,st-delta.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/st,st-delta.txt</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+* STMicroelectronics DELTA multi-format video decoder</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be "st,st-delta".</div><div class='add'>+- clocks: from common clock binding: handle hardware IP needed clocks, the</div><div class='add'>+  number of clocks may depend on the SoC type.</div><div class='add'>+  See ../clock/clock-bindings.txt for details.</div><div class='add'>+- clock-names: names of the clocks listed in clocks property in the same order.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	delta0 {</div><div class='add'>+		compatible = "st,st-delta";</div><div class='add'>+		clock-names = "delta", "delta-st231", "delta-flash-promip";</div><div class='add'>+		clocks = &lt;&amp;clk_s_c0_flexgen CLK_VID_DMU&gt;,</div><div class='add'>+			 &lt;&amp;clk_s_c0_flexgen CLK_ST231_DMU&gt;,</div><div class='add'>+			 &lt;&amp;clk_s_c0_flexgen CLK_FLASH_PROMIP&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/sunxi-ir.txt b/Documentation/devicetree/bindings/media/sunxi-ir.txt<br/>index 1811a067c72c..302a0b183cb8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/sunxi-ir.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/media/sunxi-ir.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/sunxi-ir.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/sunxi-ir.txt</a></div><div class='hunk'>@@ -9,7 +9,7 @@ Required properties:</div><div class='ctx'> - reg		    : should contain IO map address for IR.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='del'>-- linux,rc-map-name : Remote control map name.</div><div class='add'>+- linux,rc-map-name: see rc.txt file in the same directory.</div><div class='ctx'> - resets : phandle + reset specifier pair</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/media/ti,da850-vpif.txt b/Documentation/devicetree/bindings/media/ti,da850-vpif.txt<br/>new file mode 100644<br/>index 000000000000..6d25d7f23d26<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/media/ti,da850-vpif.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/media/ti,da850-vpif.txt</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+Texas Instruments VPIF</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+The TI Video Port InterFace (VPIF) is the primary component for video</div><div class='add'>+capture and display on the DA850/AM18x family of TI DaVinci/Sitara</div><div class='add'>+SoCs.</div><div class='add'>+</div><div class='add'>+TI Document reference: SPRUH82C, Chapter 35</div><div class='add'>+http://www.ti.com/lit/pdf/spruh82</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must be "ti,da850-vpif"</div><div class='add'>+- reg: physical base address and length of the registers set for the device;</div><div class='add'>+- interrupts: should contain IRQ line for the VPIF</div><div class='add'>+</div><div class='add'>+Video Capture:</div><div class='add'>+</div><div class='add'>+VPIF has a 16-bit parallel bus input, supporting 2 8-bit channels or a</div><div class='add'>+single 16-bit channel.  It should contain at least one port child node</div><div class='add'>+with child 'endpoint' node. Please refer to the bindings defined in</div><div class='add'>+Documentation/devicetree/bindings/media/video-interfaces.txt.</div><div class='add'>+</div><div class='add'>+Example using 2 8-bit input channels, one of which is connected to an</div><div class='add'>+I2C-connected TVP5147 decoder:</div><div class='add'>+</div><div class='add'>+	vpif: vpif@217000 {</div><div class='add'>+		compatible = "ti,da850-vpif";</div><div class='add'>+		reg = &lt;0x217000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;92&gt;;</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			vpif_ch0: endpoint@0 {</div><div class='add'>+				  reg = &lt;0&gt;;</div><div class='add'>+				  bus-width = &lt;8&gt;;</div><div class='add'>+				  remote-endpoint = &lt;&amp;composite&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vpif_ch1: endpoint@1 {</div><div class='add'>+				  reg = &lt;1&gt;;</div><div class='add'>+				  bus-width = &lt;8&gt;;</div><div class='add'>+				  data-shift = &lt;8&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+[ ... ]</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+</div><div class='add'>+	tvp5147@5d {</div><div class='add'>+		compatible = "ti,tvp5147";</div><div class='add'>+		reg = &lt;0x5d&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			composite: endpoint {</div><div class='add'>+				hsync-active = &lt;1&gt;;</div><div class='add'>+				vsync-active = &lt;1&gt;;</div><div class='add'>+				pclk-sample = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				/* VPIF channel 0 (lower 8-bits) */</div><div class='add'>+				remote-endpoint = &lt;&amp;vpif_ch0&gt;;</div><div class='add'>+				bus-width = &lt;8&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Alternatively, an example when the bus is configured as a single</div><div class='add'>+16-bit input (e.g. for raw-capture mode):</div><div class='add'>+</div><div class='add'>+	vpif: vpif@217000 {</div><div class='add'>+		compatible = "ti,da850-vpif";</div><div class='add'>+		reg = &lt;0x217000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;92&gt;;</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			vpif_ch0: endpoint {</div><div class='add'>+				  bus-width = &lt;16&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/memory-controllers/ti-da8xx-ddrctl.txt b/Documentation/devicetree/bindings/memory-controllers/ti-da8xx-ddrctl.txt<br/>new file mode 100644<br/>index 000000000000..ec1dd408d573<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/memory-controllers/ti-da8xx-ddrctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/memory-controllers/ti-da8xx-ddrctl.txt</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+* Device tree bindings for Texas Instruments da8xx DDR2/mDDR memory controller</div><div class='add'>+</div><div class='add'>+The DDR2/mDDR memory controller present on Texas Instruments da8xx SoCs features</div><div class='add'>+a set of registers which allow to tweak the controller's behavior.</div><div class='add'>+</div><div class='add'>+Documentation:</div><div class='add'>+OMAP-L138 (DA850) - http://www.ti.com/lit/ug/spruh82c/spruh82c.pdf</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible:		"ti,da850-ddr-controller" - for da850 SoC based boards</div><div class='add'>+- reg:			a tuple containing the base address of the memory</div><div class='add'>+			controller and the size of the memory area to map</div><div class='add'>+</div><div class='add'>+Example for da850 shown below.</div><div class='add'>+</div><div class='add'>+ddrctl {</div><div class='add'>+	compatible = "ti,da850-ddr-controller";</div><div class='add'>+	reg = &lt;0xb0000000 0xe8&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/altera-a10sr.txt b/Documentation/devicetree/bindings/mfd/altera-a10sr.txt<br/>new file mode 100644<br/>index 000000000000..ea151f295ad7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/altera-a10sr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/altera-a10sr.txt</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+* Altera Arria10 Development Kit System Resource Chip</div><div class='add'>+</div><div class='add'>+Required parent device properties:</div><div class='add'>+- compatible		: "altr,a10sr"</div><div class='add'>+- spi-max-frequency	: Maximum SPI frequency.</div><div class='add'>+- reg			: The SPI Chip Select address for the Arria10</div><div class='add'>+			  System Resource chip</div><div class='add'>+- interrupt-parent	: The parent interrupt controller.</div><div class='add'>+- interrupts		: The interrupt line the device is connected to.</div><div class='add'>+- interrupt-controller	: Marks the device node as an interrupt controller.</div><div class='add'>+- #interrupt-cells	: The number of cells to describe an IRQ, should be 2.</div><div class='add'>+			    The first cell is the IRQ number.</div><div class='add'>+			    The second cell is the flags, encoded as trigger</div><div class='add'>+			    masks from ../interrupt-controller/interrupts.txt.</div><div class='add'>+</div><div class='add'>+The A10SR consists of these sub-devices:</div><div class='add'>+</div><div class='add'>+Device                   Description</div><div class='add'>+------                   ----------</div><div class='add'>+a10sr_gpio               GPIO Controller</div><div class='add'>+</div><div class='add'>+Arria10 GPIO</div><div class='add'>+Required Properties:</div><div class='add'>+- compatible        : Should be "altr,a10sr-gpio"</div><div class='add'>+- gpio-controller   : Marks the device node as a GPIO Controller.</div><div class='add'>+- #gpio-cells       : Should be two.  The first cell is the pin number and</div><div class='add'>+                      the second cell is used to specify flags.</div><div class='add'>+                      See ../gpio/gpio.txt for more information.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+        resource-manager@0 {</div><div class='add'>+		compatible = "altr,a10sr";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;100000&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;portb&gt;;</div><div class='add'>+		interrupts = &lt;5 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		a10sr_gpio: gpio-controller {</div><div class='add'>+			compatible = "altr,a10sr-gpio";</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/as3722.txt b/Documentation/devicetree/bindings/mfd/as3722.txt<br/>index 4f64b2a73169..0b2a6099aa20 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/as3722.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mfd/as3722.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/as3722.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/as3722.txt</a></div><div class='hunk'>@@ -122,8 +122,7 @@ Following are properties of regulator subnode.</div><div class='ctx'> </div><div class='ctx'> Power-off:</div><div class='ctx'> =========</div><div class='del'>-AS3722 supports the system power off by turning off all its rail. This</div><div class='del'>-is provided through pm_power_off.</div><div class='add'>+AS3722 supports the system power off by turning off all its rails.</div><div class='ctx'> The device node should have the following properties to enable this</div><div class='ctx'> functionality</div><div class='ctx'> ams,system-power-controller: Boolean, to enable the power off functionality</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/aspeed-gfx.txt b/Documentation/devicetree/bindings/mfd/aspeed-gfx.txt<br/>new file mode 100644<br/>index 000000000000..aea5370efd97<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/aspeed-gfx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/aspeed-gfx.txt</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+* Device tree bindings for Aspeed SoC Display Controller (GFX)</div><div class='add'>+</div><div class='add'>+The Aspeed SoC Display Controller primarily does as its name suggests, but also</div><div class='add'>+participates in pinmux requests on the g5 SoCs. It is therefore considered a</div><div class='add'>+syscon device.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:		"aspeed,ast2500-gfx", "syscon"</div><div class='add'>+- reg:			contains offset/length value of the GFX memory</div><div class='add'>+			region.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+gfx: display@1e6e6000 {</div><div class='add'>+	compatible = "aspeed,ast2500-gfx", "syscon";</div><div class='add'>+	reg = &lt;0x1e6e6000 0x1000&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt b/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt<br/>new file mode 100644<br/>index 000000000000..514d82ced95b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/aspeed-lpc.txt</a></div><div class='hunk'>@@ -0,0 +1,137 @@</div><div class='add'>+======================================================================</div><div class='add'>+Device tree bindings for the Aspeed Low Pin Count (LPC) Bus Controller</div><div class='add'>+======================================================================</div><div class='add'>+</div><div class='add'>+The LPC bus is a means to bridge a host CPU to a number of low-bandwidth</div><div class='add'>+peripheral devices, replacing the use of the ISA bus in the age of PCI[0]. The</div><div class='add'>+primary use case of the Aspeed LPC controller is as a slave on the bus</div><div class='add'>+(typically in a Baseboard Management Controller SoC), but under certain</div><div class='add'>+conditions it can also take the role of bus master.</div><div class='add'>+</div><div class='add'>+The LPC controller is represented as a multi-function device to account for the</div><div class='add'>+mix of functionality it provides. The principle split is between the register</div><div class='add'>+layout at the start of the I/O space which is, to quote the Aspeed datasheet,</div><div class='add'>+"basically compatible with the [LPC registers from the] popular BMC controller</div><div class='add'>+H8S/2168[1]", and everything else, where everything else is an eclectic</div><div class='add'>+collection of functions with a esoteric register layout. "Everything else",</div><div class='add'>+here labeled the "host" portion of the controller, includes, but is not limited</div><div class='add'>+to:</div><div class='add'>+</div><div class='add'>+* An IPMI Block Transfer[2] Controller</div><div class='add'>+</div><div class='add'>+* An LPC Host Controller: Manages LPC functions such as host vs slave mode, the</div><div class='add'>+  physical properties of some LPC pins, configuration of serial IRQs, and</div><div class='add'>+  APB-to-LPC bridging amonst other functions.</div><div class='add'>+</div><div class='add'>+* An LPC Host Interface Controller: Manages functions exposed to the host such</div><div class='add'>+  as LPC firmware hub cycles, configuration of the LPC-to-AHB mapping, UART</div><div class='add'>+  management and bus snoop configuration.</div><div class='add'>+</div><div class='add'>+* A set of SuperIO[3] scratch registers: Enables implementation of e.g. custom</div><div class='add'>+  hardware management protocols for handover between the host and baseboard</div><div class='add'>+  management controller.</div><div class='add'>+</div><div class='add'>+Additionally the state of the LPC controller influences the pinmux</div><div class='add'>+configuration, therefore the host portion of the controller is exposed as a</div><div class='add'>+syscon as a means to arbitrate access.</div><div class='add'>+</div><div class='add'>+[0] http://www.intel.com/design/chipsets/industry/25128901.pdf</div><div class='add'>+[1] https://www.renesas.com/en-sg/doc/products/mpumcu/001/rej09b0078_h8s2168.pdf?key=7c88837454702128622bee53acbda8f4</div><div class='add'>+[2] http://www.intel.com/content/dam/www/public/us/en/documents/product-briefs/ipmi-second-gen-interface-spec-v2-rev1-1.pdf</div><div class='add'>+[3] https://en.wikipedia.org/wiki/Super_I/O</div><div class='add'>+</div><div class='add'>+Required properties</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+- compatible:	One of:</div><div class='add'>+		"aspeed,ast2400-lpc", "simple-mfd"</div><div class='add'>+		"aspeed,ast2500-lpc", "simple-mfd"</div><div class='add'>+</div><div class='add'>+- reg:		contains the physical address and length values of the Aspeed</div><div class='add'>+                LPC memory region.</div><div class='add'>+</div><div class='add'>+- #address-cells: &lt;1&gt;</div><div class='add'>+- #size-cells:	&lt;1&gt;</div><div class='add'>+- ranges: 	Maps 0 to the physical address and length of the LPC memory</div><div class='add'>+                region</div><div class='add'>+</div><div class='add'>+Required LPC Child nodes</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+BMC Node</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+- compatible:	One of:</div><div class='add'>+		"aspeed,ast2400-lpc-bmc"</div><div class='add'>+		"aspeed,ast2500-lpc-bmc"</div><div class='add'>+</div><div class='add'>+- reg:		contains the physical address and length values of the</div><div class='add'>+                H8S/2168-compatible LPC controller memory region</div><div class='add'>+</div><div class='add'>+Host Node</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+- compatible:   One of:</div><div class='add'>+		"aspeed,ast2400-lpc-host", "simple-mfd", "syscon"</div><div class='add'>+		"aspeed,ast2500-lpc-host", "simple-mfd", "syscon"</div><div class='add'>+</div><div class='add'>+- reg:		contains the address and length values of the host-related</div><div class='add'>+                register space for the Aspeed LPC controller</div><div class='add'>+</div><div class='add'>+- #address-cells: &lt;1&gt;</div><div class='add'>+- #size-cells:	&lt;1&gt;</div><div class='add'>+- ranges: 	Maps 0 to the address and length of the host-related LPC memory</div><div class='add'>+                region</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+lpc: lpc@1e789000 {</div><div class='add'>+	compatible = "aspeed,ast2500-lpc", "simple-mfd";</div><div class='add'>+	reg = &lt;0x1e789000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	ranges = &lt;0x0 0x1e789000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+	lpc_bmc: lpc-bmc@0 {</div><div class='add'>+		compatible = "aspeed,ast2500-lpc-bmc";</div><div class='add'>+		reg = &lt;0x0 0x80&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lpc_host: lpc-host@80 {</div><div class='add'>+		compatible = "aspeed,ast2500-lpc-host", "simple-mfd", "syscon";</div><div class='add'>+		reg = &lt;0x80 0x1e0&gt;;</div><div class='add'>+		reg-io-width = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges = &lt;0x0 0x80 0x1e0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Host Node Children</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+LPC Host Controller</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+The Aspeed LPC Host Controller configures the Low Pin Count (LPC) bus behaviour</div><div class='add'>+between the host and the baseboard management controller. The registers exist</div><div class='add'>+in the "host" portion of the Aspeed LPC controller, which must be the parent of</div><div class='add'>+the LPC host controller node.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible:	One of:</div><div class='add'>+		"aspeed,ast2400-lhc";</div><div class='add'>+		"aspeed,ast2500-lhc";</div><div class='add'>+</div><div class='add'>+- reg:		contains offset/length values of the LHC memory regions. In the</div><div class='add'>+		AST2400 and AST2500 there are two regions.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+lhc: lhc@20 {</div><div class='add'>+	compatible = "aspeed,ast2500-lhc";</div><div class='add'>+	reg = &lt;0x20 0x24 0x48 0x8&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/mfd.txt b/Documentation/devicetree/bindings/mfd/mfd.txt<br/>index af9d6931a1a2..bcb6abb9d413 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/mfd.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mfd/mfd.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/mfd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/mfd.txt</a></div><div class='hunk'>@@ -19,12 +19,22 @@ Optional properties:</div><div class='ctx'> </div><div class='ctx'> - compatible : "simple-mfd" - this signifies that the operating system should</div><div class='ctx'>   consider all subnodes of the MFD device as separate devices akin to how</div><div class='del'>-  "simple-bus" inidicates when to see subnodes as children for a simple</div><div class='add'>+  "simple-bus" indicates when to see subnodes as children for a simple</div><div class='ctx'>   memory-mapped bus. For more complex devices, when the nexus driver has to</div><div class='ctx'>   probe registers to figure out what child devices exist etc, this should not</div><div class='ctx'>   be used. In the latter case the child devices will be determined by the</div><div class='ctx'>   operating system.</div><div class='ctx'> </div><div class='add'>+- ranges: Describes the address mapping relationship to the parent. Should set</div><div class='add'>+  the child's base address to 0, the physical address within parent's address</div><div class='add'>+  space, and the length of the address map.</div><div class='add'>+</div><div class='add'>+- #address-cells: Specifies the number of cells used to represent physical base</div><div class='add'>+  addresses. Must be present if ranges is used.</div><div class='add'>+</div><div class='add'>+- #size-cells: Specifies the number of cells used to represent the size of an</div><div class='add'>+  address. Must be present if ranges is used.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> foo@1000 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/motorola-cpcap.txt b/Documentation/devicetree/bindings/mfd/motorola-cpcap.txt<br/>new file mode 100644<br/>index 000000000000..15bc885f9df4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/motorola-cpcap.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/motorola-cpcap.txt</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+Motorola CPCAP PMIC device tree binding</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible		: One or both of "motorola,cpcap" or "ste,6556002"</div><div class='add'>+- reg			: SPI chip select</div><div class='add'>+- interrupt-parent	: The parent interrupt controller</div><div class='add'>+- interrupts		: The interrupt line the device is connected to</div><div class='add'>+- interrupt-controller	: Marks the device node as an interrupt controller</div><div class='add'>+- #interrupt-cells	: The number of cells to describe an IRQ, should be 2</div><div class='add'>+- #address-cells	: Child device offset number of cells, should be 1</div><div class='add'>+- #size-cells		: Child device size number of cells, should be 0</div><div class='add'>+- spi-max-frequency	: Typically set to 3000000</div><div class='add'>+- spi-cs-high		: SPI chip select direction</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+&amp;mcspi1 {</div><div class='add'>+	cpcap: pmic@0 {</div><div class='add'>+		compatible = "motorola,cpcap", "ste,6556002";</div><div class='add'>+		reg = &lt;0&gt;;	/* cs0 */</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;7 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;3000000&gt;;</div><div class='add'>+		spi-cs-high;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/mt6397.txt b/Documentation/devicetree/bindings/mfd/mt6397.txt<br/>index 949c85f8d02c..c568d52af5af 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/mt6397.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mfd/mt6397.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/mt6397.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/mt6397.txt</a></div><div class='hunk'>@@ -34,6 +34,10 @@ Optional subnodes:</div><div class='ctx'> - clk</div><div class='ctx'> 	Required properties:</div><div class='ctx'> 		- compatible: "mediatek,mt6397-clk"</div><div class='add'>+- led</div><div class='add'>+	Required properties:</div><div class='add'>+		- compatible: "mediatek,mt6323-led"</div><div class='add'>+	see Documentation/devicetree/bindings/leds/leds-mt6323.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> 	pwrap: pwrap@1000f000 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/omap-usb-host.txt b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt<br/>index 4721b2d521e4..aa1eaa59581b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/omap-usb-host.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mfd/omap-usb-host.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/omap-usb-host.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/omap-usb-host.txt</a></div><div class='hunk'>@@ -64,8 +64,8 @@ Required properties if child node exists:</div><div class='ctx'> Properties for children:</div><div class='ctx'> </div><div class='ctx'> The OMAP HS USB Host subsystem contains EHCI and OHCI controllers.</div><div class='del'>-See Documentation/devicetree/bindings/usb/omap-ehci.txt and</div><div class='del'>-omap3-ohci.txt</div><div class='add'>+See Documentation/devicetree/bindings/usb/ehci-omap.txt and</div><div class='add'>+Documentation/devicetree/bindings/usb/ohci-omap3.txt.</div><div class='ctx'> </div><div class='ctx'> Example for OMAP4:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt b/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt<br/>index 37a088f9a648..9e5eba4a4f0d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt</a></div><div class='hunk'>@@ -10,6 +10,7 @@ voltages and other various functionality to Qualcomm SoCs.</div><div class='ctx'> 	Value type: &lt;string&gt;</div><div class='ctx'> 	Definition: must be one of:</div><div class='ctx'> 		    "qcom,pm8058"</div><div class='add'>+		    "qcom,pm8821"</div><div class='ctx'> 		    "qcom,pm8921"</div><div class='ctx'> </div><div class='ctx'> - #address-cells:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/qcom-rpm.txt b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt<br/>index 485bc59fcc48..3c91ad430eea 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/qcom-rpm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mfd/qcom-rpm.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/qcom-rpm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/qcom-rpm.txt</a></div><div class='hunk'>@@ -234,7 +234,7 @@ see regulator.txt - with additional custom properties described below:</div><div class='ctx'> - qcom,switch-mode-frequency:</div><div class='ctx'> 	Usage: required</div><div class='ctx'> 	Value type: &lt;u32&gt;</div><div class='del'>-	Definition: Frequency (Hz) of the swith mode power supply;</div><div class='add'>+	Definition: Frequency (Hz) of the switch mode power supply;</div><div class='ctx'> 		    must be one of:</div><div class='ctx'> 		    19200000, 9600000, 6400000, 4800000, 3840000, 3200000,</div><div class='ctx'> 		    2740000, 2400000, 2130000, 1920000, 1750000, 1600000,</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/rn5t618.txt b/Documentation/devicetree/bindings/mfd/rn5t618.txt<br/>index 9e6770b105c9..65c23263cc54 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/rn5t618.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mfd/rn5t618.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/rn5t618.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/rn5t618.txt</a></div><div class='hunk'>@@ -1,21 +1,25 @@</div><div class='ctx'> * Ricoh RN5T567/RN5T618 PMIC</div><div class='ctx'> </div><div class='del'>-Ricoh RN5T567/RN5T618 is a power management IC family which integrates</div><div class='del'>-3 to 4 step-down DCDC converters, 7 low-dropout regulators, GPIOs and</div><div class='del'>-a watchdog timer. The RN5T618 provides additionally a Li-ion battery</div><div class='del'>-charger, fuel gauge and an ADC. It can be controlled through an I2C</div><div class='del'>-interface.</div><div class='add'>+Ricoh RN5T567/RN5T618/RC5T619 is a power management IC family which</div><div class='add'>+integrates 3 to 5 step-down DCDC converters, 7 to 10 low-dropout regulators,</div><div class='add'>+GPIOs, and a watchdog timer. It can be controlled through an I2C interface.</div><div class='add'>+The RN5T618/RC5T619 provides additionally a Li-ion battery charger,</div><div class='add'>+fuel gauge, and an ADC.</div><div class='add'>+The RC5T619 additionnally includes USB charger detection and an RTC.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'>  - compatible: must be one of</div><div class='ctx'> 		"ricoh,rn5t567"</div><div class='ctx'> 		"ricoh,rn5t618"</div><div class='add'>+		"ricoh,rc5t619"</div><div class='ctx'>  - reg: the I2C slave address of the device</div><div class='ctx'> </div><div class='ctx'> Sub-nodes:</div><div class='ctx'>  - regulators: the node is required if the regulator functionality is</div><div class='ctx'>    needed. The valid regulator names are: DCDC1, DCDC2, DCDC3, DCDC4</div><div class='del'>-   (RN5T567), LDO1, LDO2, LDO3, LDO4, LDO5, LDORTC1 and LDORTC2.</div><div class='add'>+   (RN5T567/RC5T619), LDO1, LDO2, LDO3, LDO4, LDO5, LDO6, LDO7, LDO8,</div><div class='add'>+   LDO9, LDO10, LDORTC1 and LDORTC2.</div><div class='add'>+   LDO7-10 are specific to RC5T619.</div><div class='ctx'>    The common bindings for each individual regulator can be found in:</div><div class='ctx'>    Documentation/devicetree/bindings/regulator/regulator.txt</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/stm32-timers.txt b/Documentation/devicetree/bindings/mfd/stm32-timers.txt<br/>new file mode 100644<br/>index 000000000000..bbd083f5600a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mfd/stm32-timers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mfd/stm32-timers.txt</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+STM32 Timers driver bindings</div><div class='add'>+</div><div class='add'>+This IP provides 3 types of timer along with PWM functionality:</div><div class='add'>+- advanced-control timers consist of a 16-bit auto-reload counter driven by a programmable</div><div class='add'>+  prescaler, break input feature, PWM outputs and complementary PWM ouputs channels.</div><div class='add'>+- general-purpose timers consist of a 16-bit or 32-bit auto-reload counter driven by a</div><div class='add'>+  programmable prescaler and PWM outputs.</div><div class='add'>+- basic timers consist of a 16-bit auto-reload counter driven by a programmable prescaler.</div><div class='add'>+</div><div class='add'>+Required parameters:</div><div class='add'>+- compatible: must be "st,stm32-timers"</div><div class='add'>+</div><div class='add'>+- reg:			Physical base address and length of the controller's</div><div class='add'>+			registers.</div><div class='add'>+- clock-names:		Set to "int".</div><div class='add'>+- clocks: 		Phandle to the clock used by the timer module.</div><div class='add'>+			For Clk properties, please refer to ../clock/clock-bindings.txt</div><div class='add'>+</div><div class='add'>+Optional parameters:</div><div class='add'>+- resets:		Phandle to the parent reset controller.</div><div class='add'>+			See ../reset/st,stm32-rcc.txt</div><div class='add'>+</div><div class='add'>+Optional subnodes:</div><div class='add'>+- pwm:			See ../pwm/pwm-stm32.txt</div><div class='add'>+- timer:		See ../iio/timer/stm32-timer-trigger.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	timers@40010000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "st,stm32-timers";</div><div class='add'>+		reg = &lt;0x40010000 0x400&gt;;</div><div class='add'>+		clocks = &lt;&amp;rcc 0 160&gt;;</div><div class='add'>+		clock-names = "clk_int";</div><div class='add'>+</div><div class='add'>+		pwm {</div><div class='add'>+			compatible = "st,stm32-pwm";</div><div class='add'>+			pinctrl-0	= &lt;&amp;pwm1_pins&gt;;</div><div class='add'>+			pinctrl-names	= "default";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@0 {</div><div class='add'>+			compatible = "st,stm32-timer-trigger";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt b/Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt<br/>new file mode 100644<br/>index 000000000000..2d5126d529a2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+Imagination Technologies' Pistachio SoC based Marduk Board</div><div class='add'>+==========================================================</div><div class='add'>+</div><div class='add'>+Compatible string must be "img,pistachio-marduk", "img,pistachio"</div><div class='add'>+</div><div class='add'>+Hardware and other related documentation is available at</div><div class='add'>+https://docs.creatordev.io/ci40/</div><div class='add'>+</div><div class='add'>+It is also known as Creator Ci40. Marduk is legacy name and will</div><div class='add'>+be there for decades.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/misc/atmel-ssc.txt b/Documentation/devicetree/bindings/misc/atmel-ssc.txt<br/>index efc98ea1f23d..f8629bb73945 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/misc/atmel-ssc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/misc/atmel-ssc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/misc/atmel-ssc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/misc/atmel-ssc.txt</a></div><div class='hunk'>@@ -24,6 +24,8 @@ Optional properties:</div><div class='ctx'>        this parameter to choose where the clock from.</div><div class='ctx'>      - By default the clock is from TK pin, if the clock from RK pin, this</div><div class='ctx'>        property is needed.</div><div class='add'>+  - #sound-dai-cells: Should contain &lt;0&gt;.</div><div class='add'>+     - This property makes the SSC into an automatically registered DAI.</div><div class='ctx'> </div><div class='ctx'> Examples:</div><div class='ctx'> - PDC transfer:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/misc/idt_89hpesx.txt b/Documentation/devicetree/bindings/misc/idt_89hpesx.txt<br/>new file mode 100644<br/>index 000000000000..b9093b79ab7d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/misc/idt_89hpesx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/misc/idt_89hpesx.txt</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+EEPROM / CSR SMBus-slave interface of IDT 89HPESx devices</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible : should be "&lt;manufacturer&gt;,&lt;type&gt;"</div><div class='add'>+		 Basically there is only one manufacturer: idt, but some</div><div class='add'>+		 compatible devices may be produced in future. Following devices</div><div class='add'>+		 are supported: 89hpes8nt2, 89hpes12nt3, 89hpes24nt6ag2,</div><div class='add'>+		 89hpes32nt8ag2, 89hpes32nt8bg2, 89hpes12nt12g2, 89hpes16nt16g2,</div><div class='add'>+		 89hpes24nt24g2, 89hpes32nt24ag2, 89hpes32nt24bg2;</div><div class='add'>+		 89hpes12n3, 89hpes12n3a, 89hpes24n3, 89hpes24n3a;</div><div class='add'>+		 89hpes32h8, 89hpes32h8g2, 89hpes48h12, 89hpes48h12g2,</div><div class='add'>+		 89hpes48h12ag2, 89hpes16h16, 89hpes22h16, 89hpes22h16g2,</div><div class='add'>+		 89hpes34h16, 89hpes34h16g2, 89hpes64h16, 89hpes64h16g2,</div><div class='add'>+		 89hpes64h16ag2;</div><div class='add'>+		 89hpes12t3g2, 89hpes24t3g2, 89hpes16t4, 89hpes4t4g2,</div><div class='add'>+		 89hpes10t4g2, 89hpes16t4g2, 89hpes16t4ag2, 89hpes5t5,</div><div class='add'>+		 89hpes6t5, 89hpes8t5, 89hpes8t5a, 89hpes24t6, 89hpes6t6g2,</div><div class='add'>+		 89hpes24t6g2, 89hpes16t7, 89hpes32t8, 89hpes32t8g2,</div><div class='add'>+		 89hpes48t12, 89hpes48t12g2.</div><div class='add'>+  - reg :	 I2C address of the IDT 89HPESx device.</div><div class='add'>+</div><div class='add'>+Optionally there can be EEPROM-compatible subnode:</div><div class='add'>+  - compatible:  There are five EEPROM devices supported: 24c32, 24c64, 24c128,</div><div class='add'>+		 24c256 and 24c512 differed by size.</div><div class='add'>+  - reg:         Custom address of EEPROM device (If not specified IDT 89HPESx</div><div class='add'>+    (optional)	 device will try to communicate with EEPROM sited by default</div><div class='add'>+		 address - 0x50)</div><div class='add'>+  - read-only :	 Parameterless property disables writes to the EEPROM</div><div class='add'>+    (optional)</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	idt@60 {</div><div class='add'>+		compatible = "idt,89hpes32nt8ag2";</div><div class='add'>+		reg = &lt;0x74&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		eeprom@50 {</div><div class='add'>+			compatible = "onsemi,24c64";</div><div class='add'>+			reg = &lt;0x50&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt<br/>new file mode 100644<br/>index 000000000000..50bf611a4d2c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+Amlogic SD / eMMC controller for S905/GXBB family SoCs</div><div class='add'>+</div><div class='add'>+The MMC 5.1 compliant host controller on Amlogic provides the</div><div class='add'>+interface for SD, eMMC and SDIO devices.</div><div class='add'>+</div><div class='add'>+This file documents the properties in addition to those available in</div><div class='add'>+the MMC core bindings, documented by mmc.txt.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : contains one of:</div><div class='add'>+  - "amlogic,meson-gx-mmc"</div><div class='add'>+  - "amlogic,meson-gxbb-mmc"</div><div class='add'>+  - "amlogic,meson-gxl-mmc"</div><div class='add'>+  - "amlogic,meson-gxm-mmc"</div><div class='add'>+- clocks     : A list of phandle + clock-specifier pairs for the clocks listed in clock-names.</div><div class='add'>+- clock-names: Should contain the following:</div><div class='add'>+	"core" - Main peripheral bus clock</div><div class='add'>+	"clkin0" - Parent clock of internal mux</div><div class='add'>+	"clkin1" - Other parent clock of internal mux</div><div class='add'>+  The driver has an internal mux clock which switches between clkin0 and clkin1 depending on the</div><div class='add'>+  clock rate requested by the MMC core.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	sd_emmc_a: mmc@70000 {</div><div class='add'>+		compatible = "amlogic,meson-gxbb-mmc";</div><div class='add'>+		reg = &lt;0x0 0x70000 0x0 0x2000&gt;;</div><div class='add'>+		interrupts = &lt; GIC_SPI 216 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		clocks = &lt;&amp;clkc CLKID_SD_EMMC_A&gt;, &lt;&amp;xtal&gt;, &lt;&amp;clkc CLKID_FCLK_DIV2&gt;;</div><div class='add'>+		clock-names = "core", "clkin0", "clkin1";</div><div class='add'>+		pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt b/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt<br/>index be56d2bd474a..954561d09a8e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt</a></div><div class='hunk'>@@ -7,6 +7,15 @@ Required properties:</div><div class='ctx'> - compatible : Should be one of the following</div><div class='ctx'> 	       "brcm,bcm2835-sdhci"</div><div class='ctx'> 	       "brcm,sdhci-iproc-cygnus"</div><div class='add'>+	       "brcm,sdhci-iproc"</div><div class='add'>+</div><div class='add'>+Use brcm2835-sdhci for Rasperry PI.</div><div class='add'>+</div><div class='add'>+Use sdhci-iproc-cygnus for Broadcom SDHCI Controllers</div><div class='add'>+restricted to 32bit host accesses to SDHCI registers.</div><div class='add'>+</div><div class='add'>+Use sdhci-iproc for Broadcom SDHCI Controllers that allow standard</div><div class='add'>+8, 16, 32-bit host access to SDHCI register.</div><div class='ctx'> </div><div class='ctx'> - clocks : The clock feeding the SDHCI controller.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt b/Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt<br/>new file mode 100644<br/>index 000000000000..22e9340e4ba2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+* Marvell SD8787 power sequence provider</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must be "mmc-pwrseq-sd8787".</div><div class='add'>+- powerdown-gpios: contains a power down GPIO specifier with the</div><div class='add'>+		   default active state</div><div class='add'>+- reset-gpios: contains a reset GPIO specifier with the default</div><div class='add'>+		   active state</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	wifi_pwrseq: wifi_pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-sd8787";</div><div class='add'>+		powerdown-gpios = &lt;&amp;twl_gpio 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;twl_gpio 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	}</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt<br/>index 8a377827695b..c7f4a0ec48ed 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/mmc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mmc/mmc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/mmc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/mmc.txt</a></div><div class='hunk'>@@ -40,6 +40,7 @@ Optional properties:</div><div class='ctx'> - cap-mmc-hw-reset: eMMC hardware reset is supported</div><div class='ctx'> - cap-sdio-irq: enable SDIO IRQ signalling on this interface</div><div class='ctx'> - full-pwr-cycle: full power cycle of the card is supported</div><div class='add'>+- mmc-ddr-3_3v: eMMC high-speed DDR mode(3.3V I/O) is supported</div><div class='ctx'> - mmc-ddr-1_8v: eMMC high-speed DDR mode(1.8V I/O) is supported</div><div class='ctx'> - mmc-ddr-1_2v: eMMC high-speed DDR mode(1.2V I/O) is supported</div><div class='ctx'> - mmc-hs200-1_8v: eMMC HS200 mode(1.8V I/O) is supported</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/renesas,mmcif.txt b/Documentation/devicetree/bindings/mmc/renesas,mmcif.txt<br/>index ff611fa66871..e4ba92aa035e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/renesas,mmcif.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mmc/renesas,mmcif.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/renesas,mmcif.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/renesas,mmcif.txt</a></div><div class='hunk'>@@ -8,11 +8,14 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> - compatible: should be "renesas,mmcif-&lt;soctype&gt;", "renesas,sh-mmcif" as a</div><div class='ctx'>   fallback. Examples with &lt;soctype&gt; are:</div><div class='add'>+	- "renesas,mmcif-r8a73a4" for the MMCIF found in r8a73a4 SoCs</div><div class='ctx'> 	- "renesas,mmcif-r8a7740" for the MMCIF found in r8a7740 SoCs</div><div class='add'>+	- "renesas,mmcif-r8a7778" for the MMCIF found in r8a7778 SoCs</div><div class='ctx'> 	- "renesas,mmcif-r8a7790" for the MMCIF found in r8a7790 SoCs</div><div class='ctx'> 	- "renesas,mmcif-r8a7791" for the MMCIF found in r8a7791 SoCs</div><div class='ctx'> 	- "renesas,mmcif-r8a7793" for the MMCIF found in r8a7793 SoCs</div><div class='ctx'> 	- "renesas,mmcif-r8a7794" for the MMCIF found in r8a7794 SoCs</div><div class='add'>+	- "renesas,mmcif-sh73a0" for the MMCIF found in sh73a0 SoCs</div><div class='ctx'> </div><div class='ctx'> - clocks: reference to the functional clock</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt<br/>index 07184e8f894e..ea9c1c9607f6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt</a></div><div class='hunk'>@@ -13,6 +13,7 @@ Required Properties:</div><div class='ctx'> 	- "rockchip,rk2928-dw-mshc": for Rockchip RK2928 and following,</div><div class='ctx'> 							before RK3288</div><div class='ctx'> 	- "rockchip,rk3288-dw-mshc": for Rockchip RK3288</div><div class='add'>+	- "rockchip,rk1108-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK1108</div><div class='ctx'> 	- "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3036</div><div class='ctx'> 	- "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3368</div><div class='ctx'> 	- "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3399</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt b/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt<br/>new file mode 100644<br/>index 000000000000..c0f37cb41a9b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/sdhci-cadence.txt</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+* Cadence SD/SDIO/eMMC Host Controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be one of the following:</div><div class='add'>+    "cdns,sd4hc"               - default of the IP</div><div class='add'>+    "socionext,uniphier-sd4hc" - for Socionext UniPhier SoCs</div><div class='add'>+- reg: offset and length of the register set for the device.</div><div class='add'>+- interrupts: a single interrupt specifier.</div><div class='add'>+- clocks: phandle to the input clock.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+For eMMC configuration, supported speed modes are not indicated by the SDHCI</div><div class='add'>+Capabilities Register.  Instead, the following properties should be specified</div><div class='add'>+if supported.  See mmc.txt for details.</div><div class='add'>+- mmc-ddr-1_8v</div><div class='add'>+- mmc-ddr-1_2v</div><div class='add'>+- mmc-hs200-1_8v</div><div class='add'>+- mmc-hs200-1_2v</div><div class='add'>+- mmc-hs400-1_8v</div><div class='add'>+- mmc-hs400-1_2v</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	emmc: sdhci@5a000000 {</div><div class='add'>+		compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";</div><div class='add'>+		reg = &lt;0x5a000000 0x400&gt;;</div><div class='add'>+		interrupts = &lt;0 78 4&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk 4&gt;;</div><div class='add'>+		bus-width = &lt;8&gt;;</div><div class='add'>+		mmc-ddr-1_8v;</div><div class='add'>+		mmc-hs200-1_8v;</div><div class='add'>+		mmc-hs400-1_8v;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.txt b/Documentation/devicetree/bindings/mmc/sdhci-msm.txt<br/>index 485483a63d8c..0576264eab5e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/sdhci-msm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mmc/sdhci-msm.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/sdhci-msm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/sdhci-msm.txt</a></div><div class='hunk'>@@ -17,6 +17,7 @@ Required properties:</div><div class='ctx'> 	"iface" - Main peripheral bus clock (PCLK/HCLK - AHB Bus clock) (required)</div><div class='ctx'> 	"core"	- SDC MMC clock (MCLK) (required)</div><div class='ctx'> 	"bus"	- SDCC bus voter clock (optional)</div><div class='add'>+	"xo"	- TCXO clock (optional)</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/sdhci-st.txt b/Documentation/devicetree/bindings/mmc/sdhci-st.txt<br/>index 3cd4c43a3260..230fd696eb92 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/sdhci-st.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mmc/sdhci-st.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/sdhci-st.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/sdhci-st.txt</a></div><div class='hunk'>@@ -38,7 +38,7 @@ Optional properties:</div><div class='ctx'> - bus-width:		Number of data lines.</div><div class='ctx'> 			See:  Documentation/devicetree/bindings/mmc/mmc.txt.</div><div class='ctx'> </div><div class='del'>-- max-frequency:	Can be 200MHz, 100Mz or 50MHz (default) and used for</div><div class='add'>+- max-frequency:	Can be 200MHz, 100MHz or 50MHz (default) and used for</div><div class='ctx'> 			configuring the CCONFIG3 in the mmcss.</div><div class='ctx'> 			See:  Documentation/devicetree/bindings/mmc/mmc.txt.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/sdhci.txt b/Documentation/devicetree/bindings/mmc/sdhci.txt<br/>new file mode 100644<br/>index 000000000000..0e9923a64024<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/sdhci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/sdhci.txt</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+The properties specific for SD host controllers. For properties shared by MMC</div><div class='add'>+host controllers refer to the mmc[1] bindings.</div><div class='add'>+</div><div class='add'>+  [1] Documentation/devicetree/bindings/mmc/mmc.txt</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- sdhci-caps-mask: The sdhci capabilities register is incorrect. This 64bit</div><div class='add'>+  property corresponds to the bits in the sdhci capability register. If the bit</div><div class='add'>+  is on in the mask then the bit is incorrect in the register and should be</div><div class='add'>+  turned off, before applying sdhci-caps.</div><div class='add'>+- sdhci-caps: The sdhci capabilities register is incorrect. This 64bit</div><div class='add'>+  property corresponds to the bits in the sdhci capability register. If the</div><div class='add'>+  bit is on in the property then the bit should be turned on.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt b/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt<br/>index 55cdd804cdba..7d53a799f140 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mmc/sunxi-mmc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/sunxi-mmc.txt</a></div><div class='hunk'>@@ -13,6 +13,7 @@ Required properties:</div><div class='ctx'>    * "allwinner,sun5i-a13-mmc"</div><div class='ctx'>    * "allwinner,sun7i-a20-mmc"</div><div class='ctx'>    * "allwinner,sun9i-a80-mmc"</div><div class='add'>+   * "allwinner,sun50i-a64-emmc"</div><div class='ctx'>    * "allwinner,sun50i-a64-mmc"</div><div class='ctx'>  - reg : mmc controller base registers</div><div class='ctx'>  - clocks : a list with 4 phandle + clock specifier pairs</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt<br/>index bfa461aaac99..9cb55ca57461 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt</a></div><div class='hunk'>@@ -16,7 +16,7 @@ Required Properties:</div><div class='ctx'>   each child-node representing a supported slot. There should be atleast one</div><div class='ctx'>   child node representing a card slot. The name of the child node representing</div><div class='ctx'>   the slot is recommended to be slot@n where n is the unique number of the slot</div><div class='del'>-  connnected to the controller. The following are optional properties which</div><div class='add'>+  connected to the controller. The following are optional properties which</div><div class='ctx'>   can be included in the slot child node.</div><div class='ctx'> </div><div class='ctx'> 	* reg: specifies the physical slot number. The valid values of this</div><div class='hunk'>@@ -59,8 +59,9 @@ Optional properties:</div><div class='ctx'>   is specified and the ciu clock is specified then we'll try to set the ciu</div><div class='ctx'>   clock to this at probe time.</div><div class='ctx'> </div><div class='del'>-* clock-freq-min-max: Minimum and Maximum clock frequency for card output</div><div class='add'>+* clock-freq-min-max (DEPRECATED): Minimum and Maximum clock frequency for card output</div><div class='ctx'>   clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default.</div><div class='add'>+	  (Use the "max-frequency" instead of "clock-freq-min-max".)</div><div class='ctx'> </div><div class='ctx'> * num-slots: specifies the number of slots supported by the controller.</div><div class='ctx'>   The number of physical slots actually used could be equal or less than the</div><div class='hunk'>@@ -74,10 +75,16 @@ Optional properties:</div><div class='ctx'> * card-detect-delay: Delay in milli-seconds before detecting card after card</div><div class='ctx'>   insert event. The default value is 0.</div><div class='ctx'> </div><div class='del'>-* supports-highspeed (DEPRECATED): Enables support for high speed cards (up to 50MHz)</div><div class='del'>-			   (use "cap-mmc-highspeed" or "cap-sd-highspeed" instead)</div><div class='add'>+* data-addr: Override fifo address with value provided by DT. The default FIFO reg</div><div class='add'>+  offset is assumed as 0x100 (version &lt; 0x240A) and 0x200(version &gt;= 0x240A) by</div><div class='add'>+  driver. If the controller does not follow this rule, please use this property</div><div class='add'>+  to set fifo address in device tree.</div><div class='ctx'> </div><div class='del'>-* broken-cd: as documented in mmc core bindings.</div><div class='add'>+* fifo-watermark-aligned: Data done irq is expected if data length is less than</div><div class='add'>+  watermark in PIO mode. But fifo watermark is requested to be aligned with data</div><div class='add'>+  length in some SoC so that TX/RX irq can be generated with data done irq. Add this</div><div class='add'>+  watermark quirk to mark this requirement and force fifo watermark setting</div><div class='add'>+  accordingly.</div><div class='ctx'> </div><div class='ctx'> * vmmc-supply: The phandle to the regulator to use for vmmc.  If this is</div><div class='ctx'>   specified we'll defer probe until we can find this regulator.</div><div class='hunk'>@@ -106,6 +113,8 @@ board specific portions as listed below.</div><div class='ctx'> 		interrupts = &lt;0 75 0&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='add'>+		data-addr = &lt;0x200&gt;;</div><div class='add'>+		fifo-watermark-aligned;</div><div class='ctx'> 		resets = &lt;&amp;rst 20&gt;;</div><div class='ctx'> 		reset-names = "reset";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt<br/>index 13df9c2399c3..4fd8b7acc510 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/tmio_mmc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mmc/tmio_mmc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/tmio_mmc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/tmio_mmc.txt</a></div><div class='hunk'>@@ -11,8 +11,8 @@ optional bindings can be used.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible:	"renesas,sdhi-shmobile" - a generic sh-mobile SDHI unit</div><div class='del'>-		"renesas,sdhi-sh7372" - SDHI IP on SH7372 SoC</div><div class='ctx'> 		"renesas,sdhi-sh73a0" - SDHI IP on SH73A0 SoC</div><div class='add'>+		"renesas,sdhi-r7s72100" - SDHI IP on R7S72100 SoC</div><div class='ctx'> 		"renesas,sdhi-r8a73a4" - SDHI IP on R8A73A4 SoC</div><div class='ctx'> 		"renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC</div><div class='ctx'> 		"renesas,sdhi-r8a7778" - SDHI IP on R8A7778 SoC</div><div class='hunk'>@@ -25,6 +25,19 @@ Required properties:</div><div class='ctx'> 		"renesas,sdhi-r8a7795" - SDHI IP on R8A7795 SoC</div><div class='ctx'> 		"renesas,sdhi-r8a7796" - SDHI IP on R8A7796 SoC</div><div class='ctx'> </div><div class='add'>+- clocks: Most controllers only have 1 clock source per channel. However, on</div><div class='add'>+	  some variations of this controller, the internal card detection</div><div class='add'>+	  logic that exists in this controller is sectioned off to be run by a</div><div class='add'>+	  separate second clock source to allow the main core clock to be turned</div><div class='add'>+	  off to save power.</div><div class='add'>+	  If 2 clocks are specified by the hardware, you must name them as</div><div class='add'>+	  "core" and "cd". If the controller only has 1 clock, naming is not</div><div class='add'>+	  required.</div><div class='add'>+	  Below is the number clocks for each supported SoC:</div><div class='add'>+	   1: SH73A0, R8A73A4, R8A7740, R8A7778, R8A7779, R8A7790</div><div class='add'>+	      R8A7791, R8A7792, R8A7793, R8A7794, R8A7795, R8A7796</div><div class='add'>+	   2: R7S72100</div><div class='add'>+</div><div class='ctx'> Optional properties:</div><div class='ctx'> - toshiba,mmc-wrprotect-disable: write-protect detection is unavailable</div><div class='ctx'> - pinctrl-names: should be "default", "state_uhs"</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt<br/>new file mode 100644<br/>index 000000000000..eaade0e5adeb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+* ZTE specific extensions to the Synopsys Designware Mobile Storage</div><div class='add'>+  Host Controller</div><div class='add'>+</div><div class='add'>+The Synopsys designware mobile storage host controller is used to interface</div><div class='add'>+a SoC with storage medium such as eMMC or SD/MMC cards. This file documents</div><div class='add'>+differences between the core Synopsys dw mshc controller properties described</div><div class='add'>+by synopsys-dw-mshc.txt and the properties used by the ZTE specific</div><div class='add'>+extensions to the Synopsys Designware Mobile Storage Host Controller.</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+* compatible: should be</div><div class='add'>+	- "zte,zx296718-dw-mshc": for ZX SoCs</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	mmc1: mmc@1110000 {</div><div class='add'>+		compatible = "zte,zx296718-dw-mshc";</div><div class='add'>+		reg = &lt;0x01110000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		fifo-depth = &lt;32&gt;;</div><div class='add'>+		data-addr = &lt;0x200&gt;;</div><div class='add'>+		fifo-watermark-aligned;</div><div class='add'>+		bus-width = &lt;4&gt;;</div><div class='add'>+		clock-frequency = &lt;50000000&gt;;</div><div class='add'>+		clocks = &lt;&amp;topcrm SD0_AHB&gt;, &lt;&amp;topcrm SD0_WCLK&gt;;</div><div class='add'>+		clock-names = "biu", "ciu";</div><div class='add'>+		num-slots = &lt;1&gt;;</div><div class='add'>+		max-frequency = &lt;50000000&gt;;</div><div class='add'>+		cap-sdio-irq;</div><div class='add'>+		cap-sd-highspeed;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mtd/aspeed-smc.txt b/Documentation/devicetree/bindings/mtd/aspeed-smc.txt<br/>new file mode 100644<br/>index 000000000000..49f6528ef547<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mtd/aspeed-smc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/aspeed-smc.txt</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+* Aspeed Firmware Memory controller</div><div class='add'>+* Aspeed SPI Flash Memory Controller</div><div class='add'>+</div><div class='add'>+The Firmware Memory Controller in the Aspeed AST2500 SoC supports</div><div class='add'>+three chip selects, two of which are always of SPI type and the third</div><div class='add'>+can be SPI or NOR type flash. These bindings only describe SPI.</div><div class='add'>+</div><div class='add'>+The two SPI flash memory controllers in the AST2500 each support two</div><div class='add'>+chip selects.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible : Should be one of</div><div class='add'>+	"aspeed,ast2400-fmc" for the AST2400 Firmware Memory Controller</div><div class='add'>+	"aspeed,ast2400-spi" for the AST2400 SPI Flash memory Controller</div><div class='add'>+	"aspeed,ast2500-fmc" for the AST2500 Firmware Memory Controller</div><div class='add'>+	"aspeed,ast2500-spi" for the AST2500 SPI flash memory controllers</div><div class='add'>+</div><div class='add'>+  - reg : the first contains the control register location and length,</div><div class='add'>+          the second contains the memory window mapping address and length</div><div class='add'>+  - #address-cells : must be 1 corresponding to chip select child binding</div><div class='add'>+  - #size-cells : must be 0 corresponding to chip select child binding</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+  - interrupts : Should contain the interrupt for the dma device if an</div><div class='add'>+    FMC</div><div class='add'>+</div><div class='add'>+The child nodes are the SPI flash modules which must have a compatible</div><div class='add'>+property as specified in bindings/mtd/jedec,spi-nor.txt</div><div class='add'>+</div><div class='add'>+Optionally, the child node can contain properties for SPI mode (may be</div><div class='add'>+ignored):</div><div class='add'>+  - spi-max-frequency - max frequency of spi bus</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+fmc: fmc@1e620000 {</div><div class='add'>+	compatible = "aspeed,ast2500-fmc";</div><div class='add'>+	reg = &lt; 0x1e620000 0x94</div><div class='add'>+		0x20000000 0x02000000 &gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	interrupts = &lt;19&gt;;</div><div class='add'>+	flash@0 {</div><div class='add'>+		reg = &lt; 0 &gt;;</div><div class='add'>+		compatible = "jedec,spi-nor";</div><div class='add'>+		/* spi-max-frequency = &lt;&gt;; */</div><div class='add'>+		/* m25p,fast-read; */</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mtd/common.txt b/Documentation/devicetree/bindings/mtd/common.txt<br/>new file mode 100644<br/>index 000000000000..fc068b923d7a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mtd/common.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/common.txt</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+* Common properties of all MTD devices</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- label: user-defined MTD device name. Can be used to assign user</div><div class='add'>+  friendly names to MTD devices (instead of the flash model or flash</div><div class='add'>+  controller based name) in order to ease flash device identification</div><div class='add'>+  and/or describe what they are used for.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	flash@0 {</div><div class='add'>+		label = "System-firmware";</div><div class='add'>+</div><div class='add'>+		/* flash type specific properties */</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt b/Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt<br/>new file mode 100644<br/>index 000000000000..3fa1b34d69ad<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+Flash device on Cortina Systems Gemini SoC</div><div class='add'>+</div><div class='add'>+This flash is regular CFI compatible (Intel or AMD extended) flash chips with</div><div class='add'>+some special bits that can be controlled by the machine's system controller.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : must be "cortina,gemini-flash", "cfi-flash";</div><div class='add'>+- reg : memory address for the flash chip</div><div class='add'>+- syscon : must be a phandle to the system controller</div><div class='add'>+- bank-width : width in bytes of flash interface, should be &lt;2&gt;</div><div class='add'>+</div><div class='add'>+For the rest of the properties, see mtd-physmap.txt.</div><div class='add'>+</div><div class='add'>+The device tree may optionally contain sub-nodes describing partitions of the</div><div class='add'>+address space. See partition.txt for more detail.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+flash@30000000 {</div><div class='add'>+	compatible = "cortina,gemini-flash", "cfi-flash";</div><div class='add'>+	reg = &lt;0x30000000 0x01000000&gt;;</div><div class='add'>+	syscon = &lt;&amp;syscon&gt;;</div><div class='add'>+	bank-width = &lt;2&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt<br/>index 2c91c03e7eb0..3e920ec5c4d3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt</a></div><div class='hunk'>@@ -14,6 +14,8 @@ Required properties:</div><div class='ctx'>                  at25df641</div><div class='ctx'>                  at26df081a</div><div class='ctx'>                  mr25h256</div><div class='add'>+                 mr25h10</div><div class='add'>+                 mr25h40</div><div class='ctx'>                  mx25l4005a</div><div class='ctx'>                  mx25l1606e</div><div class='ctx'>                  mx25l6405d</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mtd/mtk-quadspi.txt b/Documentation/devicetree/bindings/mtd/mtk-quadspi.txt<br/>index fb314f09861b..5ded66ad7aef 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mtd/mtk-quadspi.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/mtd/mtk-quadspi.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mtd/mtk-quadspi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/mtk-quadspi.txt</a></div><div class='hunk'>@@ -1,7 +1,13 @@</div><div class='ctx'> * Serial NOR flash controller for MTK MT81xx (and similar)</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: 	  should be "mediatek,mt8173-nor";</div><div class='add'>+- compatible: 	  The possible values are:</div><div class='add'>+		  "mediatek,mt2701-nor"</div><div class='add'>+		  "mediatek,mt7623-nor"</div><div class='add'>+		  "mediatek,mt8173-nor"</div><div class='add'>+		  For mt8173, compatible should be "mediatek,mt8173-nor".</div><div class='add'>+		  For every other SoC, should contain both the SoC-specific compatible string</div><div class='add'>+		  and "mediatek,mt8173-nor".</div><div class='ctx'> - reg: 		  physical base address and length of the controller's register</div><div class='ctx'> - clocks: 	  the phandle of the clocks needed by the nor controller</div><div class='ctx'> - clock-names: 	  the names of the clocks</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mtd/oxnas-nand.txt b/Documentation/devicetree/bindings/mtd/oxnas-nand.txt<br/>new file mode 100644<br/>index 000000000000..56d5c19da41d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mtd/oxnas-nand.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/oxnas-nand.txt</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+* Oxford Semiconductor OXNAS NAND Controller</div><div class='add'>+</div><div class='add'>+Please refer to nand.txt for generic information regarding MTD NAND bindings.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible: "oxsemi,ox820-nand"</div><div class='add'>+ - reg: Base address and length for NAND mapped memory.</div><div class='add'>+</div><div class='add'>+Optional Properties:</div><div class='add'>+ - clocks: phandle to the NAND gate clock if needed.</div><div class='add'>+ - resets: phandle to the NAND reset control if needed.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+nandc: nand-controller@41000000 {</div><div class='add'>+	compatible = "oxsemi,ox820-nand";</div><div class='add'>+	reg = &lt;0x41000000 0x100000&gt;;</div><div class='add'>+	clocks = &lt;&amp;stdclk CLK_820_NAND&gt;;</div><div class='add'>+	resets = &lt;&amp;reset RESET_NAND&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	nand@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		nand-ecc-mode = "soft";</div><div class='add'>+		nand-ecc-algo = "hamming";</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "boot";</div><div class='add'>+			reg = &lt;0x00000000 0x00e00000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@e00000 {</div><div class='add'>+			label = "ubi";</div><div class='add'>+			reg = &lt;0x00e00000 0x07200000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mtd/samsung-s3c2410.txt b/Documentation/devicetree/bindings/mtd/samsung-s3c2410.txt<br/>new file mode 100644<br/>index 000000000000..0040eb8895e0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mtd/samsung-s3c2410.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/samsung-s3c2410.txt</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+* Samsung S3C2410 and compatible NAND flash controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : The possible values are:</div><div class='add'>+	"samsung,s3c2410-nand"</div><div class='add'>+	"samsung,s3c2412-nand"</div><div class='add'>+	"samsung,s3c2440-nand"</div><div class='add'>+- reg : register's location and length.</div><div class='add'>+- #address-cells, #size-cells : see nand.txt</div><div class='add'>+- clocks : phandle to the nand controller clock</div><div class='add'>+- clock-names : must contain "nand"</div><div class='add'>+</div><div class='add'>+Optional child nodes:</div><div class='add'>+Child nodes representing the available nand chips.</div><div class='add'>+</div><div class='add'>+Optional child properties:</div><div class='add'>+- nand-ecc-mode : see nand.txt</div><div class='add'>+- nand-on-flash-bbt : see nand.txt</div><div class='add'>+</div><div class='add'>+Each child device node may optionally contain a 'partitions' sub-node,</div><div class='add'>+which further contains sub-nodes describing the flash partition mapping.</div><div class='add'>+See partition.txt for more detail.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+nand-controller@4e000000 {</div><div class='add'>+	compatible = "samsung,s3c2440-nand";</div><div class='add'>+	reg = &lt;0x4e000000 0x40&gt;;</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+        #size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	clocks = &lt;&amp;clocks HCLK_NAND&gt;;</div><div class='add'>+	clock-names = "nand";</div><div class='add'>+</div><div class='add'>+	nand {</div><div class='add'>+		nand-ecc-mode = "soft";</div><div class='add'>+		nand-on-flash-bbt;</div><div class='add'>+</div><div class='add'>+		partitions {</div><div class='add'>+			compatible = "fixed-partitions";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			partition@0 {</div><div class='add'>+				label = "u-boot";</div><div class='add'>+				reg = &lt;0 0x040000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@40000 {</div><div class='add'>+				label = "kernel";</div><div class='add'>+				reg = &lt;0x040000 0x500000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mtd/tango-nand.txt b/Documentation/devicetree/bindings/mtd/tango-nand.txt<br/>new file mode 100644<br/>index 000000000000..cd1bf2ac9055<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/mtd/tango-nand.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/mtd/tango-nand.txt</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+Sigma Designs Tango4 NAND Flash Controller (NFC)</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: "sigma,smp8758-nand"</div><div class='add'>+- reg: address/size of nfc_reg, nfc_mem, and pbus_reg</div><div class='add'>+- dmas: reference to the DMA channel used by the controller</div><div class='add'>+- dma-names: "rxtx"</div><div class='add'>+- clocks: reference to the system clock</div><div class='add'>+- #address-cells: &lt;1&gt;</div><div class='add'>+- #size-cells: &lt;0&gt;</div><div class='add'>+</div><div class='add'>+Children nodes represent the available NAND chips.</div><div class='add'>+See Documentation/devicetree/bindings/mtd/nand.txt for generic bindings.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	nandc: nand-controller@2c000 {</div><div class='add'>+		compatible = "sigma,smp8758-nand";</div><div class='add'>+		reg = &lt;0x2c000 0x30&gt;, &lt;0x2d000 0x800&gt;, &lt;0x20000 0x1000&gt;;</div><div class='add'>+		dmas = &lt;&amp;dma0 3&gt;;</div><div class='add'>+		dma-names = "rxtx";</div><div class='add'>+		clocks = &lt;&amp;clkgen SYS_CLK&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		nand@0 {</div><div class='add'>+			reg = &lt;0&gt;; /* CS0 */</div><div class='add'>+			nand-ecc-strength = &lt;14&gt;;</div><div class='add'>+			nand-ecc-step-size = &lt;1024&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		nand@1 {</div><div class='add'>+			reg = &lt;1&gt;; /* CS1 */</div><div class='add'>+			nand-ecc-strength = &lt;14&gt;;</div><div class='add'>+			nand-ecc-step-size = &lt;1024&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/brcm,amac.txt b/Documentation/devicetree/bindings/net/brcm,amac.txt<br/>index ba5ecc1041a5..2fefa1a44afd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/brcm,amac.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/brcm,amac.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/brcm,amac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/brcm,amac.txt</a></div><div class='hunk'>@@ -2,11 +2,17 @@ Broadcom AMAC Ethernet Controller Device Tree Bindings</div><div class='ctx'> -------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>- - compatible:	"brcm,amac" or "brcm,nsp-amac"</div><div class='del'>- - reg:		Address and length of the GMAC registers,</div><div class='del'>-		Address and length of the GMAC IDM registers</div><div class='del'>- - reg-names:	Names of the registers.  Must have both "amac_base" and</div><div class='del'>-		"idm_base"</div><div class='add'>+ - compatible:	"brcm,amac"</div><div class='add'>+		"brcm,nsp-amac"</div><div class='add'>+		"brcm,ns2-amac"</div><div class='add'>+ - reg:		Address and length of the register set for the device. It</div><div class='add'>+		contains the information of registers in the same order as</div><div class='add'>+		described by reg-names</div><div class='add'>+ - reg-names:	Names of the registers.</div><div class='add'>+		"amac_base":	Address and length of the GMAC registers</div><div class='add'>+		"idm_base":	Address and length of the GMAC IDM registers</div><div class='add'>+		"nicpm_base":	Address and length of the NIC Port Manager</div><div class='add'>+				registers (required for Northstar2)</div><div class='ctx'>  - interrupts:	Interrupt number</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt b/Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt<br/>index fb40891ee606..9a734d808aa7 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> </div><div class='del'>-- compatible: should be "brcm,bcm7445-switch-v4.0"</div><div class='add'>+- compatible: should be "brcm,bcm7445-switch-v4.0" or "brcm,bcm7278-switch-v4.0"</div><div class='ctx'> - reg: addresses and length of the register sets for the device, must be 6</div><div class='ctx'>   pairs of register addresses and lengths</div><div class='ctx'> - interrupts: interrupts for the devices, must be two interrupts</div><div class='hunk'>@@ -41,6 +41,13 @@ Optional properties:</div><div class='ctx'>   Admission Control Block supports reporting the number of packets in-flight in a</div><div class='ctx'>   switch queue</div><div class='ctx'> </div><div class='add'>+Port subnodes:</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- brcm,use-bcm-hdr: boolean property, if present, indicates that the switch</div><div class='add'>+  port has Broadcom tags enabled (per-packet metadata)</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> switch_top@f0b00000 {</div><div class='hunk'>@@ -114,6 +121,7 @@ switch_top@f0b00000 {</div><div class='ctx'> 			port@0 {</div><div class='ctx'> 				label = "gphy";</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='add'>+				brcm,use-bcm-hdr;</div><div class='ctx'> 			};</div><div class='ctx'> 			...</div><div class='ctx'> 		};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/brcm,systemport.txt b/Documentation/devicetree/bindings/net/brcm,systemport.txt<br/>index 877da34145b0..83f29e0e11ba 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/brcm,systemport.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/brcm,systemport.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/brcm,systemport.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/brcm,systemport.txt</a></div><div class='hunk'>@@ -1,7 +1,10 @@</div><div class='ctx'> * Broadcom BCM7xxx Ethernet Systemport Controller (SYSTEMPORT)</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: should be one of "brcm,systemport-v1.00" or "brcm,systemport"</div><div class='add'>+- compatible: should be one of:</div><div class='add'>+	      "brcm,systemport-v1.00"</div><div class='add'>+	      "brcm,systemportlite-v1.00" or</div><div class='add'>+	      "brcm,systemport"</div><div class='ctx'> - reg: address and length of the register set for the device.</div><div class='ctx'> - interrupts: interrupts for the device, first cell must be for the rx</div><div class='ctx'>   interrupts, and the second cell should be for the transmit queues. An</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/btusb.txt b/Documentation/devicetree/bindings/net/btusb.txt<br/>new file mode 100644<br/>index 000000000000..01fa2d4188d4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/btusb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/btusb.txt</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+Generic Bluetooth controller over USB (btusb driver)</div><div class='add'>+---------------------------------------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible : should comply with the format "usbVID,PID" specified in</div><div class='add'>+		 Documentation/devicetree/bindings/usb/usb-device.txt</div><div class='add'>+		 At the time of writing, the only OF supported devices</div><div class='add'>+		 (more may be added later) are:</div><div class='add'>+</div><div class='add'>+		  "usb1286,204e" (Marvell 8997)</div><div class='add'>+</div><div class='add'>+Also, vendors that use btusb may have device additional properties, e.g:</div><div class='add'>+Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  - interrupt-parent: phandle of the parent interrupt controller</div><div class='add'>+  - interrupt-names: (see below)</div><div class='add'>+  - interrupts : The interrupt specified by the name "wakeup" is the interrupt</div><div class='add'>+		 that shall be used for out-of-band wake-on-bt. Driver will</div><div class='add'>+		 request this interrupt for wakeup. During system suspend, the</div><div class='add'>+		 irq will be enabled so that the bluetooth chip can wakeup host</div><div class='add'>+		 platform out of band. During system resume, the irq will be</div><div class='add'>+		 disabled to make sure unnecessary interrupt is not received.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+Following example uses irq pin number 3 of gpio0 for out of band wake-on-bt:</div><div class='add'>+</div><div class='add'>+&amp;usb_host1_ehci {</div><div class='add'>+    status = "okay";</div><div class='add'>+    #address-cells = &lt;1&gt;;</div><div class='add'>+    #size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+    mvl_bt1: bt@1 {</div><div class='add'>+	compatible = "usb1286,204e";</div><div class='add'>+	reg = &lt;1&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+	interrupt-name = "wakeup";</div><div class='add'>+	interrupts = &lt;3 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+    };</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/can/rcar_can.txt b/Documentation/devicetree/bindings/net/can/rcar_can.txt<br/>index 8d40ab27bc8c..06bb7cc334c8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/can/rcar_can.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/can/rcar_can.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/can/rcar_can.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/can/rcar_can.txt</a></div><div class='hunk'>@@ -10,6 +10,7 @@ Required properties:</div><div class='ctx'> 	      "renesas,can-r8a7793" if CAN controller is a part of R8A7793 SoC.</div><div class='ctx'> 	      "renesas,can-r8a7794" if CAN controller is a part of R8A7794 SoC.</div><div class='ctx'> 	      "renesas,can-r8a7795" if CAN controller is a part of R8A7795 SoC.</div><div class='add'>+	      "renesas,can-r8a7796" if CAN controller is a part of R8A7796 SoC.</div><div class='ctx'> 	      "renesas,rcar-gen1-can" for a generic R-Car Gen1 compatible device.</div><div class='ctx'> 	      "renesas,rcar-gen2-can" for a generic R-Car Gen2 compatible device.</div><div class='ctx'> 	      "renesas,rcar-gen3-can" for a generic R-Car Gen3 compatible device.</div><div class='hunk'>@@ -24,11 +25,12 @@ Required properties:</div><div class='ctx'> - pinctrl-0: pin control group to be used for this controller.</div><div class='ctx'> - pinctrl-names: must be "default".</div><div class='ctx'> </div><div class='del'>-Required properties for "renesas,can-r8a7795" compatible:</div><div class='del'>-In R8A7795 SoC, "clkp2" can be CANFD clock. This is a div6 clock and can be</div><div class='del'>-used by both CAN and CAN FD controller at the same time. It needs to be scaled</div><div class='del'>-to maximum frequency if any of these controllers use it. This is done using</div><div class='del'>-the below properties.</div><div class='add'>+Required properties for "renesas,can-r8a7795" and "renesas,can-r8a7796"</div><div class='add'>+compatible:</div><div class='add'>+In R8A7795 and R8A7796 SoCs, "clkp2" can be CANFD clock. This is a div6 clock</div><div class='add'>+and can be used by both CAN and CAN FD controller at the same time. It needs to</div><div class='add'>+be scaled to maximum frequency if any of these controllers use it. This is done</div><div class='add'>+using the below properties:</div><div class='ctx'> </div><div class='ctx'> - assigned-clocks: phandle of clkp2(CANFD) clock.</div><div class='ctx'> - assigned-clock-rates: maximum frequency of this clock.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/can/rcar_canfd.txt b/Documentation/devicetree/bindings/net/can/rcar_canfd.txt<br/>index 22a6f10bab05..93c3a6ae32f9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/can/rcar_canfd.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/can/rcar_canfd.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/can/rcar_canfd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/can/rcar_canfd.txt</a></div><div class='hunk'>@@ -5,13 +5,14 @@ Required properties:</div><div class='ctx'> - compatible: Must contain one or more of the following:</div><div class='ctx'>   - "renesas,rcar-gen3-canfd" for R-Car Gen3 compatible controller.</div><div class='ctx'>   - "renesas,r8a7795-canfd" for R8A7795 (R-Car H3) compatible controller.</div><div class='add'>+  - "renesas,r8a7796-canfd" for R8A7796 (R-Car M3) compatible controller.</div><div class='ctx'> </div><div class='ctx'>   When compatible with the generic version, nodes must list the</div><div class='ctx'>   SoC-specific version corresponding to the platform first, followed by the</div><div class='ctx'>   family-specific and/or generic versions.</div><div class='ctx'> </div><div class='ctx'> - reg: physical base address and size of the R-Car CAN FD register map.</div><div class='del'>-- interrupts: interrupt specifier for the Global &amp; Channel interrupts</div><div class='add'>+- interrupts: interrupt specifiers for the Channel &amp; Global interrupts</div><div class='ctx'> - clocks: phandles and clock specifiers for 3 clock inputs.</div><div class='ctx'> - clock-names: 3 clock input name strings: "fck", "canfd", "can_clk".</div><div class='ctx'> - pinctrl-0: pin control group to be used for this controller.</div><div class='hunk'>@@ -23,11 +24,12 @@ The name of the child nodes are "channel0" and "channel1" respectively. Each</div><div class='ctx'> child node supports the "status" property only, which is used to</div><div class='ctx'> enable/disable the respective channel.</div><div class='ctx'> </div><div class='del'>-Required properties for "renesas,r8a7795-canfd" compatible:</div><div class='del'>-In R8A7795 SoC, canfd clock is a div6 clock and can be used by both CAN</div><div class='del'>-and CAN FD controller at the same time. It needs to be scaled to maximum</div><div class='del'>-frequency if any of these controllers use it. This is done using the</div><div class='del'>-below properties.</div><div class='add'>+Required properties for "renesas,r8a7795-canfd" and "renesas,r8a7796-canfd"</div><div class='add'>+compatible:</div><div class='add'>+In R8A7795 and R8A7796 SoCs, canfd clock is a div6 clock and can be used by both</div><div class='add'>+CAN and CAN FD controller at the same time. It needs to be scaled to maximum</div><div class='add'>+frequency if any of these controllers use it. This is done using the below</div><div class='add'>+properties:</div><div class='ctx'> </div><div class='ctx'> - assigned-clocks: phandle of canfd clock.</div><div class='ctx'> - assigned-clock-rates: maximum frequency of this clock.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt<br/>index 5ad439f30135..7cc15c96ea95 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/cpsw.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/cpsw.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/cpsw.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/cpsw.txt</a></div><div class='hunk'>@@ -20,12 +20,9 @@ Required properties:</div><div class='ctx'> - slaves		: Specifies number for slaves</div><div class='ctx'> - active_slave		: Specifies the slave to use for time stamping,</div><div class='ctx'> 			  ethtool and SIOCGMIIPHY</div><div class='del'>-- cpts_clock_mult	: Numerator to convert input clock ticks into nanoseconds</div><div class='del'>-- cpts_clock_shift	: Denominator to convert input clock ticks into nanoseconds</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> - ti,hwmods		: Must be "cpgmac0"</div><div class='del'>-- no_bd_ram		: Must be 0 or 1</div><div class='ctx'> - dual_emac		: Specifies Switch to act as Dual EMAC</div><div class='ctx'> - syscon		: Phandle to the system control device node, which is</div><div class='ctx'> 			  the control module device of the am33x</div><div class='hunk'>@@ -35,7 +32,11 @@ Optional properties:</div><div class='ctx'> 			  For example in dra72x-evm, pcf gpio has to be</div><div class='ctx'> 			  driven low so that cpsw slave 0 and phy data</div><div class='ctx'> 			  lines are connected via mux.</div><div class='del'>-</div><div class='add'>+- cpts_clock_mult	: Numerator to convert input clock ticks into nanoseconds</div><div class='add'>+- cpts_clock_shift	: Denominator to convert input clock ticks into nanoseconds</div><div class='add'>+			  Mult and shift will be calculated basing on CPTS</div><div class='add'>+			  rftclk frequency if both cpts_clock_shift and</div><div class='add'>+			  cpts_clock_mult properties are not provided.</div><div class='ctx'> </div><div class='ctx'> Slave Properties:</div><div class='ctx'> Required properties:</div><div class='hunk'>@@ -68,7 +69,6 @@ Examples:</div><div class='ctx'> 		cpdma_channels = &lt;8&gt;;</div><div class='ctx'> 		ale_entries = &lt;1024&gt;;</div><div class='ctx'> 		bd_ram_size = &lt;0x2000&gt;;</div><div class='del'>-		no_bd_ram = &lt;0&gt;;</div><div class='ctx'> 		rx_descs = &lt;64&gt;;</div><div class='ctx'> 		mac_control = &lt;0x20&gt;;</div><div class='ctx'> 		slaves = &lt;2&gt;;</div><div class='hunk'>@@ -97,7 +97,6 @@ Examples:</div><div class='ctx'> 		cpdma_channels = &lt;8&gt;;</div><div class='ctx'> 		ale_entries = &lt;1024&gt;;</div><div class='ctx'> 		bd_ram_size = &lt;0x2000&gt;;</div><div class='del'>-		no_bd_ram = &lt;0&gt;;</div><div class='ctx'> 		rx_descs = &lt;64&gt;;</div><div class='ctx'> 		mac_control = &lt;0x20&gt;;</div><div class='ctx'> 		slaves = &lt;2&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.txt b/Documentation/devicetree/bindings/net/dsa/dsa.txt<br/>index a4a570fb2494..cfe8f64eca4f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/dsa/dsa.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/dsa/dsa.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/dsa/dsa.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/dsa/dsa.txt</a></div><div class='hunk'>@@ -34,13 +34,9 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> Each port children node must have the following mandatory properties:</div><div class='ctx'> - reg			: Describes the port address in the switch</div><div class='del'>-- label			: Describes the label associated with this port, which</div><div class='del'>-                          will become the netdev name. Special labels are</div><div class='del'>-			  "cpu" to indicate a CPU port and "dsa" to</div><div class='del'>-			  indicate an uplink/downlink port between switches in</div><div class='del'>-			  the cluster.</div><div class='ctx'> </div><div class='del'>-A port labelled "dsa" has the following mandatory property:</div><div class='add'>+An uplink/downlink port between switches in the cluster has the following</div><div class='add'>+mandatory property:</div><div class='ctx'> </div><div class='ctx'> - link			: Should be a list of phandles to other switch's DSA</div><div class='ctx'> 			  port. This port is used as the outgoing port</div><div class='hunk'>@@ -48,12 +44,17 @@ A port labelled "dsa" has the following mandatory property:</div><div class='ctx'> 			  information must be given, not just the one hop</div><div class='ctx'> 			  routes to neighbouring switches.</div><div class='ctx'> </div><div class='del'>-A port labelled "cpu" has the following mandatory property:</div><div class='add'>+A CPU port has the following mandatory property:</div><div class='ctx'> </div><div class='ctx'> - ethernet		: Should be a phandle to a valid Ethernet device node.</div><div class='ctx'>                           This host device is what the switch port is</div><div class='ctx'> 			  connected to.</div><div class='ctx'> </div><div class='add'>+A user port has the following optional property:</div><div class='add'>+</div><div class='add'>+- label			: Describes the label associated with this port, which</div><div class='add'>+                          will become the netdev name.</div><div class='add'>+</div><div class='ctx'> Port child nodes may also contain the following optional standardised</div><div class='ctx'> properties, described in binding documents:</div><div class='ctx'> </div><div class='hunk'>@@ -107,7 +108,6 @@ linked into one DSA cluster.</div><div class='ctx'> </div><div class='ctx'> 			switch0port5: port@5 {</div><div class='ctx'> 				reg = &lt;5&gt;;</div><div class='del'>-				label = "dsa";</div><div class='ctx'> 				phy-mode = "rgmii-txid";</div><div class='ctx'> 				link = &lt;&amp;switch1port6</div><div class='ctx'> 					&amp;switch2port9&gt;;</div><div class='hunk'>@@ -119,7 +119,6 @@ linked into one DSA cluster.</div><div class='ctx'> </div><div class='ctx'> 			port@6 {</div><div class='ctx'> 				reg = &lt;6&gt;;</div><div class='del'>-				label = "cpu";</div><div class='ctx'> 				ethernet = &lt;&amp;fec1&gt;;</div><div class='ctx'> 				fixed-link {</div><div class='ctx'> 					speed = &lt;100&gt;;</div><div class='hunk'>@@ -165,7 +164,6 @@ linked into one DSA cluster.</div><div class='ctx'> </div><div class='ctx'> 			switch1port5: port@5 {</div><div class='ctx'> 				reg = &lt;5&gt;;</div><div class='del'>-				label = "dsa";</div><div class='ctx'> 				link = &lt;&amp;switch2port9&gt;;</div><div class='ctx'> 				phy-mode = "rgmii-txid";</div><div class='ctx'> 				fixed-link {</div><div class='hunk'>@@ -176,7 +174,6 @@ linked into one DSA cluster.</div><div class='ctx'> </div><div class='ctx'> 			switch1port6: port@6 {</div><div class='ctx'> 				reg = &lt;6&gt;;</div><div class='del'>-				label = "dsa";</div><div class='ctx'> 				phy-mode = "rgmii-txid";</div><div class='ctx'> 				link = &lt;&amp;switch0port5&gt;;</div><div class='ctx'> 				fixed-link {</div><div class='hunk'>@@ -255,7 +252,6 @@ linked into one DSA cluster.</div><div class='ctx'> </div><div class='ctx'> 			switch2port9: port@9 {</div><div class='ctx'> 				reg = &lt;9&gt;;</div><div class='del'>-				label = "dsa";</div><div class='ctx'> 				phy-mode = "rgmii-txid";</div><div class='ctx'> 				link = &lt;&amp;switch1port5</div><div class='ctx'> 					&amp;switch0port5&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/dsa/marvell.txt b/Documentation/devicetree/bindings/net/dsa/marvell.txt<br/>index 7629189398aa..7ef9dbb08957 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/dsa/marvell.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/dsa/marvell.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/dsa/marvell.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/dsa/marvell.txt</a></div><div class='hunk'>@@ -14,22 +14,79 @@ The properties described here are those specific to Marvell devices.</div><div class='ctx'> Additional required and optional properties can be found in dsa.txt.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible           : Should be one of "marvell,mv88e6085",</div><div class='del'>-- reg                  : Address on the MII bus for the switch.</div><div class='add'>+- compatible		: Should be one of "marvell,mv88e6085" or</div><div class='add'>+			  "marvell,mv88e6190"</div><div class='add'>+- reg			: Address on the MII bus for the switch.</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> </div><div class='ctx'> - reset-gpios		: Should be a gpio specifier for a reset line</div><div class='add'>+- interrupt-parent	: Parent interrupt controller</div><div class='add'>+- interrupts		: Interrupt from the switch</div><div class='add'>+- interrupt-controller	: Indicates the switch is itself an interrupt</div><div class='add'>+			  controller. This is used for the PHY interrupts.</div><div class='add'>+#interrupt-cells = &lt;2&gt;	: Controller uses two cells, number and flag</div><div class='add'>+- mdio			: Container of PHY and devices on the switches MDIO</div><div class='add'>+			  bus.</div><div class='add'>+- mdio?		: Container of PHYs and devices on the external MDIO</div><div class='add'>+			  bus. The node must contains a compatible string of</div><div class='add'>+			  "marvell,mv88e6xxx-mdio-external"</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='del'>-       mdio {</div><div class='del'>-               #address-cells = &lt;1&gt;;</div><div class='del'>-               #size-cells = &lt;0&gt;;</div><div class='add'>+	mdio {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+		interrupts = &lt;27 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> </div><div class='del'>-               switch0: switch@0 {</div><div class='del'>-                       compatible = "marvell,mv88e6085";</div><div class='del'>-                       reg = &lt;0&gt;;</div><div class='del'>-		       reset-gpios = &lt;&amp;gpio5 1 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-               };</div><div class='del'>-       };</div><div class='add'>+		switch0: switch@0 {</div><div class='add'>+			compatible = "marvell,mv88e6085";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			reset-gpios = &lt;&amp;gpio5 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+		mdio {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			switch1phy0: switch1phy0@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;switch0&gt;;</div><div class='add'>+				interrupts = &lt;0 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+		interrupts = &lt;27 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		switch0: switch@0 {</div><div class='add'>+			compatible = "marvell,mv88e6390";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			reset-gpios = &lt;&amp;gpio5 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+		mdio {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			switch1phy0: switch1phy0@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;switch0&gt;;</div><div class='add'>+				interrupts = &lt;0 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mdio1 {</div><div class='add'>+			compatible = "marvell,mv88e6xxx-mdio-external";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			switch1phy9: switch1phy0@9 {</div><div class='add'>+				reg = &lt;9&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt<br/>index 05150957ecfd..3a6916909d90 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/ethernet.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/ethernet.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/ethernet.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/ethernet.txt</a></div><div class='hunk'>@@ -29,6 +29,9 @@ The following properties are common to the Ethernet controllers:</div><div class='ctx'>   * "smii"</div><div class='ctx'>   * "xgmii"</div><div class='ctx'>   * "trgmii"</div><div class='add'>+  * "2000base-x",</div><div class='add'>+  * "2500base-x",</div><div class='add'>+  * "rxaui"</div><div class='ctx'> - phy-connection-type: the same as "phy-mode" property but described in ePAPR;</div><div class='ctx'> - phy-handle: phandle, specifies a reference to a node representing a PHY</div><div class='ctx'>   device; this property is described in ePAPR and so preferred;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt<br/>index 75d398bb1fbb..eea73adc678f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt</a></div><div class='hunk'>@@ -1,7 +1,15 @@</div><div class='ctx'> Hisilicon hix5hd2 gmac controller</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: should be "hisilicon,hix5hd2-gmac".</div><div class='add'>+- compatible: should contain one of the following SoC strings:</div><div class='add'>+	* "hisilicon,hix5hd2-gmac"</div><div class='add'>+	* "hisilicon,hi3798cv200-gmac"</div><div class='add'>+	* "hisilicon,hi3516a-gmac"</div><div class='add'>+	and one of the following version string:</div><div class='add'>+	* "hisilicon,hisi-gmac-v1"</div><div class='add'>+	* "hisilicon,hisi-gmac-v2"</div><div class='add'>+  The version v1 includes SoCs hix5hd2.</div><div class='add'>+  The version v2 includes SoCs hi3798cv200, hi3516a.</div><div class='ctx'> - reg: specifies base physical address(s) and size of the device registers.</div><div class='ctx'>   The first region is the MAC register base and size.</div><div class='ctx'>   The second region is external interface control register.</div><div class='hunk'>@@ -12,6 +20,16 @@ Required properties:</div><div class='ctx'> - phy-handle: see ethernet.txt [1].</div><div class='ctx'> - mac-address: see ethernet.txt [1].</div><div class='ctx'> - clocks: clock phandle and specifier pair.</div><div class='add'>+- clock-names: contain the clock name "mac_core"(required) and "mac_ifc"(optional).</div><div class='add'>+- resets: should contain the phandle to the MAC core reset signal(optional),</div><div class='add'>+	the MAC interface reset signal(optional)</div><div class='add'>+	and the PHY reset signal(optional).</div><div class='add'>+- reset-names: contain the reset signal name "mac_core"(optional),</div><div class='add'>+	"mac_ifc"(optional) and "phy"(optional).</div><div class='add'>+- hisilicon,phy-reset-delays-us: triplet of delays if PHY reset signal given.</div><div class='add'>+	The 1st cell is reset pre-delay in micro seconds.</div><div class='add'>+	The 2nd cell is reset pulse in micro seconds.</div><div class='add'>+	The 3rd cell is reset post-delay in micro seconds.</div><div class='ctx'> </div><div class='ctx'> - PHY subnode: inherits from phy binding [2]</div><div class='ctx'> </div><div class='hunk'>@@ -20,15 +38,19 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> 	gmac0: ethernet@f9840000 {</div><div class='del'>-		compatible = "hisilicon,hix5hd2-gmac";</div><div class='add'>+		compatible = "hisilicon,hi3798cv200-gmac", "hisilicon,hisi-gmac-v2";</div><div class='ctx'> 		reg = &lt;0xf9840000 0x1000&gt;,&lt;0xf984300c 0x4&gt;;</div><div class='ctx'> 		interrupts = &lt;0 71 4&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		phy-mode = "mii";</div><div class='add'>+		phy-mode = "rgmii";</div><div class='ctx'> 		phy-handle = &lt;&amp;phy2&gt;;</div><div class='ctx'> 		mac-address = [00 00 00 00 00 00];</div><div class='del'>-		clocks = &lt;&amp;clock HIX5HD2_MAC0_CLK&gt;;</div><div class='add'>+		clocks = &lt;&amp;crg HISTB_ETH0_MAC_CLK&gt;, &lt;&amp;crg HISTB_ETH0_MACIF_CLK&gt;;</div><div class='add'>+		clock-names = "mac_core", "mac_ifc";</div><div class='add'>+		resets = &lt;&amp;crg 0xcc 8&gt;, &lt;&amp;crg 0xcc 10&gt;, &lt;&amp;crg 0xcc 12&gt;;</div><div class='add'>+		reset-names = "mac_core", "mac_ifc", "phy";</div><div class='add'>+		hisilicon,phy-reset-delays-us = &lt;10000 10000 30000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		phy2: ethernet-phy@2 {</div><div class='ctx'> 			reg = &lt;2&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt<br/>index d4b7f2e49984..abfbeecbcf39 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt</a></div><div class='hunk'>@@ -45,6 +45,12 @@ Required properties:</div><div class='ctx'>   depends on the hardware user manual.</div><div class='ctx'> - port-mode-offset: is offset of port mode field for each port in dsaf. Its</div><div class='ctx'>   value depends on the hardware user manual.</div><div class='add'>+- mc-mac-mask: mask of multicast address, determines bit in multicast address</div><div class='add'>+  to set:</div><div class='add'>+  1 stands for this bit will be precisely matched, TCAM will check this bit of</div><div class='add'>+    MAC address.</div><div class='add'>+  0 stands for this bit will be fuzzy matched, TCAM won't care about this bit</div><div class='add'>+    of MAC address.</div><div class='ctx'> </div><div class='ctx'> [1] Documentation/devicetree/bindings/net/phy.txt</div><div class='ctx'> </div><div class='hunk'>@@ -74,10 +80,12 @@ dsaf0: dsa@c7000000 {</div><div class='ctx'> 		reg = 0;</div><div class='ctx'> 		phy-handle = &lt;&amp;phy0&gt;;</div><div class='ctx'> 		serdes-syscon = &lt;&amp;serdes&gt;;</div><div class='add'>+		mc-mac-mask = [ff f0 00 00 00 00];</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	port@1 {</div><div class='ctx'>                 reg = 1;</div><div class='ctx'>                 serdes-syscon = &lt;&amp;serdes&gt;;</div><div class='add'>+		mc-mac-mask = [ff f0 00 00 00 00];</div><div class='ctx'>         };</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/marvell,prestera.txt b/Documentation/devicetree/bindings/net/marvell,prestera.txt<br/>new file mode 100644<br/>index 000000000000..5fbab29718e8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/marvell,prestera.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/marvell,prestera.txt</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+Marvell Prestera Switch Chip bindings</div><div class='add'>+-------------------------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: one of the following</div><div class='add'>+	"marvell,prestera-98dx3236",</div><div class='add'>+	"marvell,prestera-98dx3336",</div><div class='add'>+	"marvell,prestera-98dx4251",</div><div class='add'>+- reg: address and length of the register set for the device.</div><div class='add'>+- interrupts: interrupt for the device</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- dfx: phandle reference to the "DFX Server" node</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+switch {</div><div class='add'>+	compatible = "simple-bus";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	ranges = &lt;0 MBUS_ID(0x03, 0x00) 0 0x100000&gt;;</div><div class='add'>+</div><div class='add'>+	packet-processor@0 {</div><div class='add'>+		compatible = "marvell,prestera-98dx3236";</div><div class='add'>+		reg = &lt;0 0x4000000&gt;;</div><div class='add'>+		interrupts = &lt;33&gt;, &lt;34&gt;, &lt;35&gt;;</div><div class='add'>+		dfx = &lt;&amp;dfx&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DFX Server bindings</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must be "marvell,dfx-server"</div><div class='add'>+- reg: address and length of the register set for the device.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+dfx-registers {</div><div class='add'>+	compatible = "simple-bus";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	ranges = &lt;0 MBUS_ID(0x08, 0x00) 0 0x100000&gt;;</div><div class='add'>+</div><div class='add'>+	dfx: dfx@0 {</div><div class='add'>+		compatible = "marvell,dfx-server";</div><div class='add'>+		reg = &lt;0 0x100000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt<br/>index 73be8970815e..ae4234ca4ee4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt</a></div><div class='hunk'>@@ -1,7 +1,10 @@</div><div class='del'>-* Marvell Armada 370 / Armada XP Ethernet Controller (NETA)</div><div class='add'>+* Marvell Armada 370 / Armada XP / Armada 3700 Ethernet Controller (NETA)</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: "marvell,armada-370-neta" or "marvell,armada-xp-neta".</div><div class='add'>+- compatible: could be one of the following:</div><div class='add'>+	"marvell,armada-370-neta"</div><div class='add'>+	"marvell,armada-xp-neta"</div><div class='add'>+	"marvell,armada-3700-neta"</div><div class='ctx'> - reg: address and length of the register set for the device.</div><div class='ctx'> - interrupts: interrupt for the device</div><div class='ctx'> - phy: See ethernet.txt file in the same directory.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt b/Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt<br/>new file mode 100644<br/>index 000000000000..9be1059ff03f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt</a></div><div class='hunk'>@@ -0,0 +1,86 @@</div><div class='add'>+Marvell 8897/8997 (sd8897/sd8997) bluetooth devices (SDIO or USB based)</div><div class='add'>+------</div><div class='add'>+The 8997 devices supports multiple interfaces. When used on SDIO interfaces,</div><div class='add'>+the btmrvl driver is used and when used on USB interface, the btusb driver is</div><div class='add'>+used.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible : should be one of the following:</div><div class='add'>+	* "marvell,sd8897-bt" (for SDIO)</div><div class='add'>+	* "marvell,sd8997-bt" (for SDIO)</div><div class='add'>+	* "usb1286,204e"      (for USB)</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  - marvell,cal-data: Calibration data downloaded to the device during</div><div class='add'>+		      initialization. This is an array of 28 values(u8).</div><div class='add'>+		      This is only applicable to SDIO devices.</div><div class='add'>+</div><div class='add'>+  - marvell,wakeup-pin: It represents wakeup pin number of the bluetooth chip.</div><div class='add'>+		        firmware will use the pin to wakeup host system (u16).</div><div class='add'>+  - marvell,wakeup-gap-ms: wakeup gap represents wakeup latency of the host</div><div class='add'>+		      platform. The value will be configured to firmware. This</div><div class='add'>+		      is needed to work chip's sleep feature as expected (u16).</div><div class='add'>+  - interrupt-parent: phandle of the parent interrupt controller</div><div class='add'>+  - interrupt-names: Used only for USB based devices (See below)</div><div class='add'>+  - interrupts : specifies the interrupt pin number to the cpu. For SDIO, the</div><div class='add'>+		 driver will use the first interrupt specified in the interrupt</div><div class='add'>+		 array. For USB based devices, the driver will use the interrupt</div><div class='add'>+		 named "wakeup" from the interrupt-names and interrupt arrays.</div><div class='add'>+		 The driver will request an irq based on this interrupt number.</div><div class='add'>+		 During system suspend, the irq will be enabled so that the</div><div class='add'>+		 bluetooth chip can wakeup host platform under certain</div><div class='add'>+		 conditions. During system resume, the irq will be disabled</div><div class='add'>+		 to make sure unnecessary interrupt is not received.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+IRQ pin 119 is used as system wakeup source interrupt.</div><div class='add'>+wakeup pin 13 and gap 100ms are configured so that firmware can wakeup host</div><div class='add'>+using this device side pin and wakeup latency.</div><div class='add'>+</div><div class='add'>+Example for SDIO device follows (calibration data is also available in</div><div class='add'>+below example).</div><div class='add'>+</div><div class='add'>+&amp;mmc3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	vmmc-supply = &lt;&amp;wlan_en_reg&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-power-off-card;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	btmrvl: bluetooth@2 {</div><div class='add'>+		compatible = "marvell,sd8897-bt";</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;pio&gt;;</div><div class='add'>+		interrupts = &lt;119 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+</div><div class='add'>+		marvell,cal-data = /bits/ 8 &lt;</div><div class='add'>+			0x37 0x01 0x1c 0x00 0xff 0xff 0xff 0xff 0x01 0x7f 0x04 0x02</div><div class='add'>+			0x00 0x00 0xba 0xce 0xc0 0xc6 0x2d 0x00 0x00 0x00 0x00 0x00</div><div class='add'>+			0x00 0x00 0xf0 0x00&gt;;</div><div class='add'>+		marvell,wakeup-pin = /bits/ 16 &lt;0x0d&gt;;</div><div class='add'>+		marvell,wakeup-gap-ms = /bits/ 16 &lt;0x64&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Example for USB device:</div><div class='add'>+</div><div class='add'>+&amp;usb_host1_ohci {</div><div class='add'>+    status = "okay";</div><div class='add'>+    #address-cells = &lt;1&gt;;</div><div class='add'>+    #size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+    mvl_bt1: bt@1 {</div><div class='add'>+	compatible = "usb1286,204e";</div><div class='add'>+	reg = &lt;1&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+	interrupt-names = "wakeup";</div><div class='add'>+	interrupts = &lt;119 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	marvell,wakeup-pin = /bits/ 16 &lt;0x0d&gt;;</div><div class='add'>+	marvell,wakeup-gap-ms = /bits/ 16 &lt;0x64&gt;;</div><div class='add'>+    };</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt b/Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt<br/>deleted file mode 100644<br/>index 6a9a63cb0543..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-Marvell 8897/8997 (sd8897/sd8997) bluetooth SDIO devices</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-</div><div class='del'>-  - compatible : should be one of the following:</div><div class='del'>-	* "marvell,sd8897-bt"</div><div class='del'>-	* "marvell,sd8997-bt"</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>-</div><div class='del'>-  - marvell,cal-data: Calibration data downloaded to the device during</div><div class='del'>-		      initialization. This is an array of 28 values(u8).</div><div class='del'>-</div><div class='del'>-  - marvell,wakeup-pin: It represents wakeup pin number of the bluetooth chip.</div><div class='del'>-		        firmware will use the pin to wakeup host system (u16).</div><div class='del'>-  - marvell,wakeup-gap-ms: wakeup gap represents wakeup latency of the host</div><div class='del'>-		      platform. The value will be configured to firmware. This</div><div class='del'>-		      is needed to work chip's sleep feature as expected (u16).</div><div class='del'>-  - interrupt-parent: phandle of the parent interrupt controller</div><div class='del'>-  - interrupts : interrupt pin number to the cpu. Driver will request an irq based</div><div class='del'>-		 on this interrupt number. During system suspend, the irq will be</div><div class='del'>-		 enabled so that the bluetooth chip can wakeup host platform under</div><div class='del'>-		 certain condition. During system resume, the irq will be disabled</div><div class='del'>-		 to make sure unnecessary interrupt is not received.</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-IRQ pin 119 is used as system wakeup source interrupt.</div><div class='del'>-wakeup pin 13 and gap 100ms are configured so that firmware can wakeup host</div><div class='del'>-using this device side pin and wakeup latency.</div><div class='del'>-calibration data is also available in below example.</div><div class='del'>-</div><div class='del'>-&amp;mmc3 {</div><div class='del'>-	status = "okay";</div><div class='del'>-	vmmc-supply = &lt;&amp;wlan_en_reg&gt;;</div><div class='del'>-	bus-width = &lt;4&gt;;</div><div class='del'>-	cap-power-off-card;</div><div class='del'>-	keep-power-in-suspend;</div><div class='del'>-</div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;0&gt;;</div><div class='del'>-	btmrvl: bluetooth@2 {</div><div class='del'>-		compatible = "marvell,sd8897-bt";</div><div class='del'>-		reg = &lt;2&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;pio&gt;;</div><div class='del'>-		interrupts = &lt;119 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='del'>-</div><div class='del'>-		marvell,cal-data = /bits/ 8 &lt;</div><div class='del'>-			0x37 0x01 0x1c 0x00 0xff 0xff 0xff 0xff 0x01 0x7f 0x04 0x02</div><div class='del'>-			0x00 0x00 0xba 0xce 0xc0 0xc6 0x2d 0x00 0x00 0x00 0x00 0x00</div><div class='del'>-			0x00 0x00 0xf0 0x00&gt;;</div><div class='del'>-		marvell,wakeup-pin = /bits/ 16 &lt;0x0d&gt;;</div><div class='del'>-		marvell,wakeup-gap-ms = /bits/ 16 &lt;0x64&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/marvell-pp2.txt b/Documentation/devicetree/bindings/net/marvell-pp2.txt<br/>index aa4f4230bfd7..4754364df4c6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/marvell-pp2.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/marvell-pp2.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/marvell-pp2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/marvell-pp2.txt</a></div><div class='hunk'>@@ -27,9 +27,7 @@ Optional properties (port):</div><div class='ctx'> </div><div class='ctx'> - marvell,loopback: port is loopback mode</div><div class='ctx'> - phy: a phandle to a phy node defining the PHY address (as the reg</div><div class='del'>-  property, a single integer). Note: if this property isn't present,</div><div class='del'>-  then fixed link is assumed, and the 'fixed-link' property is</div><div class='del'>-  mandatory.</div><div class='add'>+  property, a single integer).</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt b/Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt<br/>index 8516929c7251..065e8bdb957d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt</a></div><div class='hunk'>@@ -3,7 +3,7 @@ Properties for an MDIO bus multiplexer controlled by a memory-mapped device</div><div class='ctx'> This is a special case of a MDIO bus multiplexer.  A memory-mapped device,</div><div class='ctx'> like an FPGA, is used to control which child bus is connected.  The mdio-mux</div><div class='ctx'> node must be a child of the memory-mapped device.  The driver currently only</div><div class='del'>-supports devices with eight-bit registers.</div><div class='add'>+supports devices with 8, 16 or 32-bit registers.</div><div class='ctx'> </div><div class='ctx'> Required properties in addition to the generic multiplexer properties:</div><div class='ctx'> </div><div class='hunk'>@@ -11,7 +11,7 @@ Required properties in addition to the generic multiplexer properties:</div><div class='ctx'> </div><div class='ctx'> - reg : integer, contains the offset of the register that controls the bus</div><div class='ctx'> 	multiplexer.  The size field in the 'reg' property is the size of</div><div class='del'>-	register, and must therefore be 1.</div><div class='add'>+	register, and must therefore be 1, 2, or 4.</div><div class='ctx'> </div><div class='ctx'> - mux-mask : integer, contains an eight-bit mask that specifies which</div><div class='ctx'> 	bits in the register control the actual bus multiplexer.  The</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/mediatek-net.txt b/Documentation/devicetree/bindings/net/mediatek-net.txt<br/>index c010fafc66a8..c7194e87d5f4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/mediatek-net.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/mediatek-net.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/mediatek-net.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/mediatek-net.txt</a></div><div class='hunk'>@@ -7,7 +7,7 @@ have dual GMAC each represented by a child node..</div><div class='ctx'> * Ethernet controller node</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Should be "mediatek,mt7623-eth"</div><div class='add'>+- compatible: Should be "mediatek,mt2701-eth"</div><div class='ctx'> - reg: Address and length of the register set for the device</div><div class='ctx'> - interrupts: Should contain the three frame engines interrupts in numeric</div><div class='ctx'> 	order. These are fe_int0, fe_int1 and fe_int2.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/meson-dwmac.txt b/Documentation/devicetree/bindings/net/meson-dwmac.txt<br/>index 89e62ddc69ca..0703ad3f3c1e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/meson-dwmac.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/meson-dwmac.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/meson-dwmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/meson-dwmac.txt</a></div><div class='hunk'>@@ -25,6 +25,22 @@ Required properties on Meson8b and newer:</div><div class='ctx'> 		- "clkin0" - first parent clock of the internal mux</div><div class='ctx'> 		- "clkin1" - second parent clock of the internal mux</div><div class='ctx'> </div><div class='add'>+Optional properties on Meson8b and newer:</div><div class='add'>+- amlogic,tx-delay-ns:	The internal RGMII TX clock delay (provided</div><div class='add'>+			by this driver) in nanoseconds. Allowed values</div><div class='add'>+			are: 0ns, 2ns, 4ns, 6ns.</div><div class='add'>+			When phy-mode is set to "rgmii" then the TX</div><div class='add'>+			delay should be explicitly configured. When</div><div class='add'>+			not configured a fallback of 2ns is used.</div><div class='add'>+			When the phy-mode is set to either "rgmii-id"</div><div class='add'>+			or "rgmii-txid" the TX clock delay is already</div><div class='add'>+			provided by the PHY. In that case this</div><div class='add'>+			property should be set to 0ns (which disables</div><div class='add'>+			the TX clock delay in the MAC to prevent the</div><div class='add'>+			clock from going off because both PHY and MAC</div><div class='add'>+			are adding a delay).</div><div class='add'>+			Any configuration is ignored when the phy-mode</div><div class='add'>+			is set to "rmii".</div><div class='ctx'> </div><div class='ctx'> Example for Meson6:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt b/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt<br/>index 99c7eb0a00c8..0eedabe22cc3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt</a></div><div class='hunk'>@@ -6,22 +6,35 @@ Required properties:</div><div class='ctx'> 		  Documentation/devicetree/bindings/net/phy.txt</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='del'>-- vsc8531,vddmac	: The vddmac in mV.</div><div class='add'>+- vsc8531,vddmac	: The vddmac in mV. Allowed values is listed</div><div class='add'>+			  in the first row of Table 1 (below).</div><div class='add'>+			  This property is only used in combination</div><div class='add'>+			  with the 'edge-slowdown' property.</div><div class='add'>+			  Default value is 3300.</div><div class='ctx'> - vsc8531,edge-slowdown	: % the edge should be slowed down relative to</div><div class='del'>-			  the fastest possible edge time. Native sign</div><div class='del'>-			  need not enter.</div><div class='add'>+			  the fastest possible edge time.</div><div class='ctx'> 			  Edge rate sets the drive strength of the MAC</div><div class='del'>-			  interface output signals.  Changing the drive</div><div class='del'>-			  strength will affect the edge rate of the output</div><div class='del'>-			  signal.  The goal of this setting is to help</div><div class='del'>-			  reduce electrical emission (EMI) by being able</div><div class='del'>-			  to reprogram drive strength and in effect slow</div><div class='del'>-			  down the edge rate if desired.  Table 1 shows the</div><div class='del'>-			  impact to the edge rate per VDDMAC supply for each</div><div class='del'>-			  drive strength setting.</div><div class='del'>-			  Ref: Table:1 - Edge rate change below.</div><div class='del'>-</div><div class='del'>-Note: see dt-bindings/net/mscc-phy-vsc8531.h for applicable values</div><div class='add'>+			  interface output signals.  Changing the</div><div class='add'>+			  drive strength will affect the edge rate of</div><div class='add'>+			  the output signal.  The goal of this setting</div><div class='add'>+			  is to help reduce electrical emission (EMI)</div><div class='add'>+			  by being able to reprogram drive strength</div><div class='add'>+			  and in effect slow down the edge rate if</div><div class='add'>+			  desired.</div><div class='add'>+			  To adjust the edge-slowdown, the 'vddmac'</div><div class='add'>+			  must be specified. Table 1 lists the</div><div class='add'>+			  supported edge-slowdown values for a given</div><div class='add'>+			  'vddmac'.</div><div class='add'>+			  Default value is 0%.</div><div class='add'>+			  Ref: Table:1 - Edge rate change (below).</div><div class='add'>+- vsc8531,led-0-mode	: LED mode. Specify how the LED[0] should behave.</div><div class='add'>+			  Allowed values are define in</div><div class='add'>+			  "include/dt-bindings/net/mscc-phy-vsc8531.h".</div><div class='add'>+			  Default value is VSC8531_LINK_1000_ACTIVITY (1).</div><div class='add'>+- vsc8531,led-1-mode	: LED mode. Specify how the LED[1] should behave.</div><div class='add'>+			  Allowed values are define in</div><div class='add'>+			  "include/dt-bindings/net/mscc-phy-vsc8531.h".</div><div class='add'>+			  Default value is VSC8531_LINK_100_ACTIVITY (2).</div><div class='ctx'> </div><div class='ctx'> Table: 1 - Edge rate change</div><div class='ctx'> ----------------------------------------------------------------|</div><div class='hunk'>@@ -29,23 +42,23 @@ Table: 1 - Edge rate change</div><div class='ctx'> |								|</div><div class='ctx'> | 3300 mV	2500 mV		1800 mV		1500 mV		|</div><div class='ctx'> |---------------------------------------------------------------|</div><div class='del'>-| Default	Deafult		Default		Default		|</div><div class='add'>+| 0%		0%		0%		0%		|</div><div class='ctx'> | (Fastest)			(recommended)	(recommended)	|</div><div class='ctx'> |---------------------------------------------------------------|</div><div class='del'>-| -2%		-3%		-5%		-6%		|</div><div class='add'>+| 2%		3%		5%		6%		|</div><div class='ctx'> |---------------------------------------------------------------|</div><div class='del'>-| -4%		-6%		-9%		-14%		|</div><div class='add'>+| 4%		6%		9%		14%		|</div><div class='ctx'> |---------------------------------------------------------------|</div><div class='del'>-| -7%		-10%		-16%		-21%		|</div><div class='add'>+| 7%		10%		16%		21%		|</div><div class='ctx'> |(recommended)	(recommended)					|</div><div class='ctx'> |---------------------------------------------------------------|</div><div class='del'>-| -10%		-14%		-23%		-29%		|</div><div class='add'>+| 10%		14%		23%		29%		|</div><div class='ctx'> |---------------------------------------------------------------|</div><div class='del'>-| -17%		-23%		-35%		-42%		|</div><div class='add'>+| 17%		23%		35%		42%		|</div><div class='ctx'> |---------------------------------------------------------------|</div><div class='del'>-| -29%		-37%		-52%		-58%		|</div><div class='add'>+| 29%		37%		52%		58%		|</div><div class='ctx'> |---------------------------------------------------------------|</div><div class='del'>-| -53%		-63%		-76%		-77%		|</div><div class='add'>+| 53%		63%		76%		77%		|</div><div class='ctx'> | (slowest)							|</div><div class='ctx'> |---------------------------------------------------------------|</div><div class='ctx'> </div><div class='hunk'>@@ -54,5 +67,7 @@ Example:</div><div class='ctx'>         vsc8531_0: ethernet-phy@0 {</div><div class='ctx'>                 compatible = "ethernet-phy-id0007.0570";</div><div class='ctx'>                 vsc8531,vddmac		= &lt;3300&gt;;</div><div class='del'>-                vsc8531,edge-slowdown	= &lt;21&gt;;</div><div class='add'>+                vsc8531,edge-slowdown	= &lt;7&gt;;</div><div class='add'>+                vsc8531,led-0-mode	= &lt;LINK_1000_ACTIVITY&gt;;</div><div class='add'>+                vsc8531,led-1-mode	= &lt;LINK_100_ACTIVITY&gt;;</div><div class='ctx'>         };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/oxnas-dwmac.txt b/Documentation/devicetree/bindings/net/oxnas-dwmac.txt<br/>new file mode 100644<br/>index 000000000000..df0534e2eda1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/oxnas-dwmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/oxnas-dwmac.txt</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+* Oxford Semiconductor OXNAS DWMAC Ethernet controller</div><div class='add'>+</div><div class='add'>+The device inherits all the properties of the dwmac/stmmac devices</div><div class='add'>+described in the file stmmac.txt in the current directory with the</div><div class='add'>+following changes.</div><div class='add'>+</div><div class='add'>+Required properties on all platforms:</div><div class='add'>+</div><div class='add'>+- compatible:	For the OX820 SoC, it should be :</div><div class='add'>+		- "oxsemi,ox820-dwmac" to select glue</div><div class='add'>+		- "snps,dwmac-3.512" to select IP version.</div><div class='add'>+</div><div class='add'>+- clocks: Should contain phandles to the following clocks</div><div class='add'>+- clock-names:	Should contain the following:</div><div class='add'>+		- "stmmaceth" for the host clock - see stmmac.txt</div><div class='add'>+		- "gmac" for the peripheral gate clock</div><div class='add'>+</div><div class='add'>+- oxsemi,sys-ctrl: a phandle to the system controller syscon node</div><div class='add'>+</div><div class='add'>+Example :</div><div class='add'>+</div><div class='add'>+etha: ethernet@40400000 {</div><div class='add'>+	compatible = "oxsemi,ox820-dwmac", "snps,dwmac-3.512";</div><div class='add'>+	reg = &lt;0x40400000 0x2000&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	interrupt-names = "macirq", "eth_wake_irq";</div><div class='add'>+	mac-address = [000000000000]; /* Filled in by U-Boot */</div><div class='add'>+	phy-mode = "rgmii";</div><div class='add'>+</div><div class='add'>+	clocks = &lt;&amp;stdclk CLK_820_ETHA&gt;, &lt;&amp;gmacclk&gt;;</div><div class='add'>+	clock-names = "gmac", "stmmaceth";</div><div class='add'>+	resets = &lt;&amp;reset RESET_MAC&gt;;</div><div class='add'>+</div><div class='add'>+	/* Regmap for sys registers */</div><div class='add'>+	oxsemi,sys-ctrl = &lt;&amp;sys&gt;;</div><div class='add'>+</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/phy.txt b/Documentation/devicetree/bindings/net/phy.txt<br/>index bc1c3c8bf8fa..b55857696fc3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/phy.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/phy.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/phy.txt</a></div><div class='hunk'>@@ -19,8 +19,9 @@ Optional Properties:</div><div class='ctx'>   specifications. If neither of these are specified, the default is to</div><div class='ctx'>   assume clause 22.</div><div class='ctx'> </div><div class='del'>-  If the phy's identifier is known then the list may contain an entry</div><div class='del'>-  of the form: "ethernet-phy-idAAAA.BBBB" where</div><div class='add'>+  If the PHY reports an incorrect ID (or none at all) then the</div><div class='add'>+  "compatible" list may contain an entry with the correct PHY ID in the</div><div class='add'>+  form: "ethernet-phy-idAAAA.BBBB" where</div><div class='ctx'>      AAAA - The value of the 16 bit Phy Identifier 1 register as</div><div class='ctx'>             4 hex digits. This is the chip vendor OUI bits 3:18</div><div class='ctx'>      BBBB - The value of the 16 bit Phy Identifier 2 register as</div><div class='hunk'>@@ -35,6 +36,22 @@ Optional Properties:</div><div class='ctx'> - broken-turn-around: If set, indicates the PHY device does not correctly</div><div class='ctx'>   release the turn around line low at the end of a MDIO transaction.</div><div class='ctx'> </div><div class='add'>+- enet-phy-lane-swap: If set, indicates the PHY will swap the TX/RX lanes to</div><div class='add'>+  compensate for the board being designed with the lanes swapped.</div><div class='add'>+</div><div class='add'>+- enet-phy-lane-no-swap: If set, indicates that PHY will disable swap of the</div><div class='add'>+  TX/RX lanes. This property allows the PHY to work correcly after e.g. wrong</div><div class='add'>+  bootstrap configuration caused by issues in PCB layout design.</div><div class='add'>+</div><div class='add'>+- eee-broken-100tx:</div><div class='add'>+- eee-broken-1000t:</div><div class='add'>+- eee-broken-10gt:</div><div class='add'>+- eee-broken-1000kx:</div><div class='add'>+- eee-broken-10gkx4:</div><div class='add'>+- eee-broken-10gkr:</div><div class='add'>+  Mark the corresponding energy efficient ethernet mode as broken and</div><div class='add'>+  request the ethernet to stop advertising it.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> ethernet-phy@0 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/rockchip-dwmac.txt b/Documentation/devicetree/bindings/net/rockchip-dwmac.txt<br/>index 95383c5131fc..8f427550720a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/rockchip-dwmac.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/rockchip-dwmac.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/rockchip-dwmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/rockchip-dwmac.txt</a></div><div class='hunk'>@@ -6,6 +6,7 @@ Required properties:</div><div class='ctx'>  - compatible: should be "rockchip,&lt;name&gt;-gamc"</div><div class='ctx'>    "rockchip,rk3228-gmac": found on RK322x SoCs</div><div class='ctx'>    "rockchip,rk3288-gmac": found on RK3288 SoCs</div><div class='add'>+   "rockchip,rk3328-gmac": found on RK3328 SoCs</div><div class='ctx'>    "rockchip,rk3366-gmac": found on RK3366 SoCs</div><div class='ctx'>    "rockchip,rk3368-gmac": found on RK3368 SoCs</div><div class='ctx'>    "rockchip,rk3399-gmac": found on RK3399 SoCs</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/smsc-lan91c111.txt b/Documentation/devicetree/bindings/net/smsc-lan91c111.txt<br/>index e77e167593db..309e37eb7c7c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/smsc-lan91c111.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/smsc-lan91c111.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/smsc-lan91c111.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/smsc-lan91c111.txt</a></div><div class='hunk'>@@ -13,3 +13,5 @@ Optional properties:</div><div class='ctx'>   16-bit access only.</div><div class='ctx'> - power-gpios: GPIO to control the PWRDWN pin</div><div class='ctx'> - reset-gpios: GPIO to control the RESET pin</div><div class='add'>+- pxa-u16-align4 : Boolean, put in place the workaround the force all</div><div class='add'>+		   u16 writes to be 32 bits aligned</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt b/Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt<br/>index d93f71ce8346..21d27aa4c68c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt</a></div><div class='hunk'>@@ -1,5 +1,8 @@</div><div class='ctx'> * Synopsys DWC Ethernet QoS IP version 4.10 driver (GMAC)</div><div class='ctx'> </div><div class='add'>+This binding is deprecated, but it continues to be supported, but new</div><div class='add'>+features should be preferably added to the stmmac binding document.</div><div class='add'>+</div><div class='ctx'> This binding supports the Synopsys Designware Ethernet QoS (Quality Of Service)</div><div class='ctx'> IP block. The IP supports multiple options for bus type, clocking and reset</div><div class='ctx'> structure, and feature list. Consequently, a number of properties and list</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt<br/>index 41b49e6075f5..d3bfc2b30fb5 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/stmmac.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/stmmac.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/stmmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/stmmac.txt</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> * STMicroelectronics 10/100/1000 Ethernet driver (GMAC)</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Should be "snps,dwmac-&lt;ip_version&gt;" "snps,dwmac"</div><div class='add'>+- compatible: Should be "snps,dwmac-&lt;ip_version&gt;", "snps,dwmac"</div><div class='ctx'> 	For backwards compatibility: "st,spear600-gmac" is also supported.</div><div class='ctx'> - reg: Address and length of the register set for the device</div><div class='ctx'> - interrupt-parent: Should be the phandle for the interrupt controller</div><div class='hunk'>@@ -34,7 +34,13 @@ Optional properties:</div><div class='ctx'>   platforms.</div><div class='ctx'> - tx-fifo-depth: See ethernet.txt file in the same directory</div><div class='ctx'> - rx-fifo-depth: See ethernet.txt file in the same directory</div><div class='del'>-- snps,pbl		Programmable Burst Length</div><div class='add'>+- snps,pbl		Programmable Burst Length (tx and rx)</div><div class='add'>+- snps,txpbl		Tx Programmable Burst Length. Only for GMAC and newer.</div><div class='add'>+			If set, DMA tx will use this value rather than snps,pbl.</div><div class='add'>+- snps,rxpbl		Rx Programmable Burst Length. Only for GMAC and newer.</div><div class='add'>+			If set, DMA rx will use this value rather than snps,pbl.</div><div class='add'>+- snps,no-pbl-x8	Don't multiply the pbl/txpbl/rxpbl values by 8.</div><div class='add'>+			For core rev &lt; 3.50, don't multiply the values by 4.</div><div class='ctx'> - snps,aal		Address-Aligned Beats</div><div class='ctx'> - snps,fixed-burst	Program the DMA to use the fixed burst mode</div><div class='ctx'> - snps,mixed-burst	Program the DMA to use the mixed burst mode</div><div class='hunk'>@@ -43,6 +49,8 @@ Optional properties:</div><div class='ctx'> - snps,force_sf_dma_mode	Force DMA to use the Store and Forward</div><div class='ctx'> 				mode for both tx and rx. This flag is</div><div class='ctx'> 				ignored if force_thresh_dma_mode is set.</div><div class='add'>+- snps,en-tx-lpi-clockgating	Enable gating of the MAC TX clock during</div><div class='add'>+				TX low-power mode</div><div class='ctx'> - snps,multicast-filter-bins:	Number of multicast filter hash bins</div><div class='ctx'> 				supported by this device instance</div><div class='ctx'> - snps,perfect-filter-entries:	Number of perfect filter entries supported</div><div class='hunk'>@@ -50,6 +58,8 @@ Optional properties:</div><div class='ctx'> - snps,ps-speed: port selection speed that can be passed to the core when</div><div class='ctx'> 		 PCS is supported. For example, this is used in case of SGMII</div><div class='ctx'> 		 and MAC2MAC connection.</div><div class='add'>+- snps,tso: this enables the TSO feature otherwise it will be managed by</div><div class='add'>+		 MAC HW capability register. Only for GMAC4 and newer.</div><div class='ctx'> - AXI BUS Mode parameters: below the list of all the parameters to program the</div><div class='ctx'> 			   AXI register inside the DMA module:</div><div class='ctx'> 	- snps,lpi_en: enable Low Power Interface</div><div class='hunk'>@@ -57,13 +67,10 @@ Optional properties:</div><div class='ctx'> 	- snps,wr_osr_lmt: max write outstanding req. limit</div><div class='ctx'> 	- snps,rd_osr_lmt: max read outstanding req. limit</div><div class='ctx'> 	- snps,kbbe: do not cross 1KiB boundary.</div><div class='del'>-	- snps,axi_all: align address</div><div class='ctx'> 	- snps,blen: this is a vector of supported burst length.</div><div class='ctx'> 	- snps,fb: fixed-burst</div><div class='ctx'> 	- snps,mb: mixed-burst</div><div class='ctx'> 	- snps,rb: rebuild INCRx Burst</div><div class='del'>-	- snps,tso: this enables the TSO feature otherwise it will be managed by</div><div class='del'>-	    MAC HW capability register.</div><div class='ctx'> - mdio: with compatible = "snps,dwmac-mdio", create and register mdio bus.</div><div class='ctx'> </div><div class='ctx'> Examples:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/ti,dp83867.txt b/Documentation/devicetree/bindings/net/ti,dp83867.txt<br/>index 5d21141a68b5..afe9630a5e7d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/ti,dp83867.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/ti,dp83867.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/ti,dp83867.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/ti,dp83867.txt</a></div><div class='hunk'>@@ -3,12 +3,26 @@</div><div class='ctx'> Required properties:</div><div class='ctx'> 	- reg - The ID number for the phy, usually a small integer</div><div class='ctx'> 	- ti,rx-internal-delay - RGMII Receive Clock Delay - see dt-bindings/net/ti-dp83867.h</div><div class='del'>-		for applicable values</div><div class='add'>+		for applicable values. Required only if interface type is</div><div class='add'>+		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_RXID</div><div class='ctx'> 	- ti,tx-internal-delay - RGMII Transmit Clock Delay - see dt-bindings/net/ti-dp83867.h</div><div class='del'>-		for applicable values</div><div class='add'>+		for applicable values. Required only if interface type is</div><div class='add'>+		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_TXID</div><div class='ctx'> 	- ti,fifo-depth - Transmitt FIFO depth- see dt-bindings/net/ti-dp83867.h</div><div class='ctx'> 		for applicable values</div><div class='ctx'> </div><div class='add'>+Optional property:</div><div class='add'>+	- ti,min-output-impedance - MAC Interface Impedance control to set</div><div class='add'>+				    the programmable output impedance to</div><div class='add'>+				    minimum value (35 ohms).</div><div class='add'>+	- ti,max-output-impedance - MAC Interface Impedance control to set</div><div class='add'>+				    the programmable output impedance to</div><div class='add'>+				    maximum value (70 ohms).</div><div class='add'>+</div><div class='add'>+Note: ti,min-output-impedance and ti,max-output-impedance are mutually</div><div class='add'>+      exclusive. When both properties are present ti,max-output-impedance</div><div class='add'>+      takes precedence.</div><div class='add'>+</div><div class='ctx'> Default child nodes are standard Ethernet PHY device</div><div class='ctx'> nodes as described in Documentation/devicetree/bindings/net/phy.txt</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/wireless/ieee80211.txt b/Documentation/devicetree/bindings/net/wireless/ieee80211.txt<br/>new file mode 100644<br/>index 000000000000..f6442b1397f5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/wireless/ieee80211.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/wireless/ieee80211.txt</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+Common IEEE 802.11 properties</div><div class='add'>+</div><div class='add'>+This provides documentation of common properties that are valid for all wireless</div><div class='add'>+devices.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+ - ieee80211-freq-limit : list of supported frequency ranges in KHz. This can be</div><div class='add'>+	used for devices that in a given config support less channels than</div><div class='add'>+	normally. It may happen chipset supports a wide wireless band but it is</div><div class='add'>+	limited to some part of it due to used antennas or power amplifier.</div><div class='add'>+	An example case for this can be tri-band wireless router with two</div><div class='add'>+	identical chipsets used for two different 5 GHz subbands. Using them</div><div class='add'>+	incorrectly could not work or decrease performance noticeably.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+pcie@0,0 {</div><div class='add'>+	reg = &lt;0x0000 0 0 0 0&gt;;</div><div class='add'>+	wifi@0,0 {</div><div class='add'>+		reg = &lt;0x0000 0 0 0 0&gt;;</div><div class='add'>+		ieee80211-freq-limit = &lt;2402000 2482000&gt;,</div><div class='add'>+				       &lt;5170000 5250000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt b/Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt<br/>new file mode 100644<br/>index 000000000000..0854451ff91d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+Marvell 8787/8897/8997 (sd8787/sd8897/sd8997/pcie8997) SDIO/PCIE devices</div><div class='add'>+------</div><div class='add'>+</div><div class='add'>+This node provides properties for controlling the Marvell SDIO/PCIE wireless device.</div><div class='add'>+The node is expected to be specified as a child node to the SDIO/PCIE controller that</div><div class='add'>+connects the device to the system.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible : should be one of the following:</div><div class='add'>+	* "marvell,sd8787"</div><div class='add'>+	* "marvell,sd8897"</div><div class='add'>+	* "marvell,sd8997"</div><div class='add'>+	* "pci11ab,2b42"</div><div class='add'>+	* "pci1b4b,2b42"</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  - marvell,caldata* : A series of properties with marvell,caldata prefix,</div><div class='add'>+		      represent calibration data downloaded to the device during</div><div class='add'>+		      initialization. This is an array of unsigned 8-bit values.</div><div class='add'>+		      the properties should follow below property name and</div><div class='add'>+		      corresponding array length:</div><div class='add'>+	"marvell,caldata-txpwrlimit-2g" (length = 566).</div><div class='add'>+	"marvell,caldata-txpwrlimit-5g-sub0" (length = 502).</div><div class='add'>+	"marvell,caldata-txpwrlimit-5g-sub1" (length = 688).</div><div class='add'>+	"marvell,caldata-txpwrlimit-5g-sub2" (length = 750).</div><div class='add'>+	"marvell,caldata-txpwrlimit-5g-sub3" (length = 502).</div><div class='add'>+  - marvell,wakeup-pin : a wakeup pin number of wifi chip which will be configured</div><div class='add'>+		      to firmware. Firmware will wakeup the host using this pin</div><div class='add'>+		      during suspend/resume.</div><div class='add'>+  - interrupt-parent: phandle of the parent interrupt controller</div><div class='add'>+  - interrupts : interrupt pin number to the cpu. driver will request an irq based on</div><div class='add'>+		 this interrupt number. during system suspend, the irq will be enabled</div><div class='add'>+		 so that the wifi chip can wakeup host platform under certain condition.</div><div class='add'>+		 during system resume, the irq will be disabled to make sure</div><div class='add'>+		 unnecessary interrupt is not received.</div><div class='add'>+  - vmmc-supply: a phandle of a regulator, supplying VCC to the card</div><div class='add'>+  - mmc-pwrseq:  phandle to the MMC power sequence node. See "mmc-pwrseq-*"</div><div class='add'>+		 for documentation of MMC power sequence bindings.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+Tx power limit calibration data is configured in below example.</div><div class='add'>+The calibration data is an array of unsigned values, the length</div><div class='add'>+can vary between hw versions.</div><div class='add'>+IRQ pin 38 is used as system wakeup source interrupt. wakeup pin 3 is configured</div><div class='add'>+so that firmware can wakeup host using this device side pin.</div><div class='add'>+</div><div class='add'>+&amp;mmc3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	vmmc-supply = &lt;&amp;wlan_en_reg&gt;;</div><div class='add'>+	mmc-pwrseq = &lt;&amp;wifi_pwrseq&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-power-off-card;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	mwifiex: wifi@1 {</div><div class='add'>+		compatible = "marvell,sd8897";</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;pio&gt;;</div><div class='add'>+		interrupts = &lt;38 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+</div><div class='add'>+		marvell,caldata_00_txpwrlimit_2g_cfg_set = /bits/ 8 &lt;</div><div class='add'>+	0x01 0x00 0x06 0x00 0x08 0x02 0x89 0x01&gt;;</div><div class='add'>+		marvell,wakeup-pin = &lt;3&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt b/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt<br/>deleted file mode 100644<br/>index c421aba0a5bc..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-Marvell 8897/8997 (sd8897/sd8997) SDIO devices</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-This node provides properties for controlling the marvell sdio wireless device.</div><div class='del'>-The node is expected to be specified as a child node to the SDIO controller that</div><div class='del'>-connects the device to the system.</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-</div><div class='del'>-  - compatible : should be one of the following:</div><div class='del'>-	* "marvell,sd8897"</div><div class='del'>-	* "marvell,sd8997"</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>-</div><div class='del'>-  - marvell,caldata* : A series of properties with marvell,caldata prefix,</div><div class='del'>-		      represent calibration data downloaded to the device during</div><div class='del'>-		      initialization. This is an array of unsigned 8-bit values.</div><div class='del'>-		      the properties should follow below property name and</div><div class='del'>-		      corresponding array length:</div><div class='del'>-	"marvell,caldata-txpwrlimit-2g" (length = 566).</div><div class='del'>-	"marvell,caldata-txpwrlimit-5g-sub0" (length = 502).</div><div class='del'>-	"marvell,caldata-txpwrlimit-5g-sub1" (length = 688).</div><div class='del'>-	"marvell,caldata-txpwrlimit-5g-sub2" (length = 750).</div><div class='del'>-	"marvell,caldata-txpwrlimit-5g-sub3" (length = 502).</div><div class='del'>-  - marvell,wakeup-pin : a wakeup pin number of wifi chip which will be configured</div><div class='del'>-		      to firmware. Firmware will wakeup the host using this pin</div><div class='del'>-		      during suspend/resume.</div><div class='del'>-  - interrupt-parent: phandle of the parent interrupt controller</div><div class='del'>-  - interrupts : interrupt pin number to the cpu. driver will request an irq based on</div><div class='del'>-		 this interrupt number. during system suspend, the irq will be enabled</div><div class='del'>-		 so that the wifi chip can wakeup host platform under certain condition.</div><div class='del'>-		 during system resume, the irq will be disabled to make sure</div><div class='del'>-		 unnecessary interrupt is not received.</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-Tx power limit calibration data is configured in below example.</div><div class='del'>-The calibration data is an array of unsigned values, the length</div><div class='del'>-can vary between hw versions.</div><div class='del'>-IRQ pin 38 is used as system wakeup source interrupt. wakeup pin 3 is configured</div><div class='del'>-so that firmware can wakeup host using this device side pin.</div><div class='del'>-</div><div class='del'>-&amp;mmc3 {</div><div class='del'>-	status = "okay";</div><div class='del'>-	vmmc-supply = &lt;&amp;wlan_en_reg&gt;;</div><div class='del'>-	bus-width = &lt;4&gt;;</div><div class='del'>-	cap-power-off-card;</div><div class='del'>-	keep-power-in-suspend;</div><div class='del'>-</div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;0&gt;;</div><div class='del'>-	mwifiex: wifi@1 {</div><div class='del'>-		compatible = "marvell,sd8897";</div><div class='del'>-		reg = &lt;1&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;pio&gt;;</div><div class='del'>-		interrupts = &lt;38 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='del'>-</div><div class='del'>-		marvell,caldata_00_txpwrlimit_2g_cfg_set = /bits/ 8 &lt;</div><div class='del'>-	0x01 0x00 0x06 0x00 0x08 0x02 0x89 0x01&gt;;</div><div class='del'>-		marvell,wakeup-pin = &lt;3&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt b/Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt<br/>new file mode 100644<br/>index 000000000000..b7396c8c271c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+* Qualcomm Atheros ath9k wireless devices</div><div class='add'>+</div><div class='add'>+This node provides properties for configuring the ath9k wireless device. The</div><div class='add'>+node is expected to be specified as a child node of the PCI controller to</div><div class='add'>+which the wireless chip is connected.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: For PCI and PCIe devices this should be an identifier following</div><div class='add'>+		the format as defined in "PCI Bus Binding to Open Firmware"</div><div class='add'>+		Revision 2.1. One of the possible formats is "pciVVVV,DDDD"</div><div class='add'>+		where VVVV is the PCI vendor ID and DDDD is PCI device ID.</div><div class='add'>+		Typically QCA's PCI vendor ID 168c is used while the PCI device</div><div class='add'>+		ID depends on the chipset - see the following (possibly</div><div class='add'>+		incomplete) list:</div><div class='add'>+			- 0023 for AR5416</div><div class='add'>+			- 0024 for AR5418</div><div class='add'>+			- 0027 for AR9160</div><div class='add'>+			- 0029 for AR9220 and AR9223</div><div class='add'>+			- 002a for AR9280 and AR9283</div><div class='add'>+			- 002b for AR9285</div><div class='add'>+			- 002c for AR2427</div><div class='add'>+			- 002d for AR9227</div><div class='add'>+			- 002e for AR9287</div><div class='add'>+			- 0030 for AR9380, AR9381 and AR9382</div><div class='add'>+			- 0032 for AR9485</div><div class='add'>+			- 0033 for AR9580 and AR9590</div><div class='add'>+			- 0034 for AR9462</div><div class='add'>+			- 0036 for AR9565</div><div class='add'>+			- 0037 for AR9485</div><div class='add'>+- reg: Address and length of the register set for the device.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- qca,no-eeprom: Indicates that there is no physical EEPROM connected to the</div><div class='add'>+			ath9k wireless chip (in this case the calibration /</div><div class='add'>+			EEPROM data will be loaded from userspace using the</div><div class='add'>+			kernel firmware loader).</div><div class='add'>+- mac-address: See ethernet.txt in the parent directory</div><div class='add'>+- local-mac-address: See ethernet.txt in the parent directory</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+In this example, the node is defined as child node of the PCI controller:</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	wifi@168c,002d {</div><div class='add'>+		compatible = "pci168c,002d";</div><div class='add'>+		reg = &lt;0x7000 0 0 0 0x1000&gt;;</div><div class='add'>+		qca,no-eeprom;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/nvmem/brcm,ocotp.txt b/Documentation/devicetree/bindings/nvmem/brcm,ocotp.txt<br/>new file mode 100644<br/>index 000000000000..6462e12d8de6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/nvmem/brcm,ocotp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/nvmem/brcm,ocotp.txt</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+Broadcom OTP memory controller</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+- compatible: "brcm,ocotp" for the first generation Broadcom OTPC which is used</div><div class='add'>+  in Cygnus and supports 32 bit read/write. Use "brcm,ocotp-v2" for the second</div><div class='add'>+  generation Broadcom OTPC which is used in SoC's such as Stingray and supports</div><div class='add'>+  64-bit read/write.</div><div class='add'>+- reg: Base address of the OTP controller.</div><div class='add'>+- brcm,ocotp-size: Amount of memory available, in 32 bit words</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+otp: otp@0301c800 {</div><div class='add'>+	compatible = "brcm,ocotp";</div><div class='add'>+	reg = &lt;0x0301c800 0x2c&gt;;</div><div class='add'>+	brcm,ocotp-size = &lt;2048&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt<br/>index 383d5889e95a..966a72ecc6bd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/nvmem/imx-ocotp.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/nvmem/imx-ocotp.txt</a></div><div class='hunk'>@@ -1,13 +1,15 @@</div><div class='ctx'> Freescale i.MX6 On-Chip OTP Controller (OCOTP) device tree bindings</div><div class='ctx'> </div><div class='ctx'> This binding represents the on-chip eFuse OTP controller found on</div><div class='del'>-i.MX6Q/D, i.MX6DL/S, i.MX6SL, and i.MX6SX SoCs.</div><div class='add'>+i.MX6Q/D, i.MX6DL/S, i.MX6SL, i.MX6SX and i.MX6UL SoCs.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible: should be one of</div><div class='ctx'> 	"fsl,imx6q-ocotp" (i.MX6Q/D/DL/S),</div><div class='ctx'> 	"fsl,imx6sl-ocotp" (i.MX6SL), or</div><div class='del'>-	"fsl,imx6sx-ocotp" (i.MX6SX), followed by "syscon".</div><div class='add'>+	"fsl,imx6sx-ocotp" (i.MX6SX),</div><div class='add'>+	"fsl,imx6ul-ocotp" (i.MX6UL),</div><div class='add'>+	followed by "syscon".</div><div class='ctx'> - reg: Should contain the register base and length.</div><div class='ctx'> - clocks: Should contain a phandle pointing to the gated peripheral clock.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/nvmem/lpc1850-otp.txt b/Documentation/devicetree/bindings/nvmem/lpc1850-otp.txt<br/>new file mode 100644<br/>index 000000000000..853b6a754644<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/nvmem/lpc1850-otp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/nvmem/lpc1850-otp.txt</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+* NXP LPC18xx OTP memory</div><div class='add'>+</div><div class='add'>+Internal OTP (One Time Programmable) memory for NXP LPC18xx/43xx devices.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible: Should be "nxp,lpc1850-otp"</div><div class='add'>+  - reg: Must contain an entry with the physical base address and length</div><div class='add'>+    for each entry in reg-names.</div><div class='add'>+  - address-cells: must be set to 1.</div><div class='add'>+  - size-cells: must be set to 1.</div><div class='add'>+</div><div class='add'>+See nvmem.txt for more information.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+  otp: otp@40045000 {</div><div class='add'>+    compatible = "nxp,lpc1850-otp";</div><div class='add'>+    reg = &lt;0x40045000 0x1000&gt;;</div><div class='add'>+    #address-cells = &lt;1&gt;;</div><div class='add'>+    #size-cells = &lt;1&gt;;</div><div class='add'>+  };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/opp/opp.txt b/Documentation/devicetree/bindings/opp/opp.txt<br/>index ee91cbdd95ee..63725498bd20 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/opp/opp.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/opp/opp.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/opp/opp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/opp/opp.txt</a></div><div class='hunk'>@@ -86,8 +86,14 @@ Optional properties:</div><div class='ctx'>   Single entry is for target voltage and three entries are for &lt;target min max&gt;</div><div class='ctx'>   voltages.</div><div class='ctx'> </div><div class='del'>-  Entries for multiple regulators must be present in the same order as</div><div class='del'>-  regulators are specified in device's DT node.</div><div class='add'>+  Entries for multiple regulators shall be provided in the same field separated</div><div class='add'>+  by angular brackets &lt;&gt;. The OPP binding doesn't provide any provisions to</div><div class='add'>+  relate the values to their power supplies or the order in which the supplies</div><div class='add'>+  need to be configured and that is left for the implementation specific</div><div class='add'>+  binding.</div><div class='add'>+</div><div class='add'>+  Entries for all regulators shall be of the same size, i.e. either all use a</div><div class='add'>+  single value or triplets.</div><div class='ctx'> </div><div class='ctx'> - opp-microvolt-&lt;name&gt;: Named opp-microvolt property. This is exactly similar to</div><div class='ctx'>   the above opp-microvolt property, but allows multiple voltage ranges to be</div><div class='hunk'>@@ -104,10 +110,13 @@ Optional properties:</div><div class='ctx'> </div><div class='ctx'>   Should only be set if opp-microvolt is set for the OPP.</div><div class='ctx'> </div><div class='del'>-  Entries for multiple regulators must be present in the same order as</div><div class='del'>-  regulators are specified in device's DT node. If this property isn't required</div><div class='del'>-  for few regulators, then this should be marked as zero for them. If it isn't</div><div class='del'>-  required for any regulator, then this property need not be present.</div><div class='add'>+  Entries for multiple regulators shall be provided in the same field separated</div><div class='add'>+  by angular brackets &lt;&gt;. If current values aren't required for a regulator,</div><div class='add'>+  then it shall be filled with 0. If current values aren't required for any of</div><div class='add'>+  the regulators, then this field is not required. The OPP binding doesn't</div><div class='add'>+  provide any provisions to relate the values to their power supplies or the</div><div class='add'>+  order in which the supplies need to be configured and that is left for the</div><div class='add'>+  implementation specific binding.</div><div class='ctx'> </div><div class='ctx'> - opp-microamp-&lt;name&gt;: Named opp-microamp property. Similar to</div><div class='ctx'>   opp-microvolt-&lt;name&gt; property, but for microamp instead.</div><div class='hunk'>@@ -127,7 +136,7 @@ Optional properties:</div><div class='ctx'>   larger OPP table, based on what version of the hardware we are running on. We</div><div class='ctx'>   still can't have multiple nodes with the same opp-hz value in OPP table.</div><div class='ctx'> </div><div class='del'>-  It's an user defined array containing a hierarchy of hardware version numbers,</div><div class='add'>+  It's a user defined array containing a hierarchy of hardware version numbers,</div><div class='ctx'>   supported by the OPP. For example: a platform with hierarchy of three levels</div><div class='ctx'>   of versions (A, B and C), this field should be like &lt;X Y Z&gt;, where X</div><div class='ctx'>   corresponds to Version hierarchy A, Y corresponds to version hierarchy B and Z</div><div class='hunk'>@@ -179,14 +188,14 @@ Example 1: Single cluster Dual-core ARM cortex A9, switch DVFS states together.</div><div class='ctx'> </div><div class='ctx'> 		opp@1000000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;970000 975000 985000&gt;;</div><div class='add'>+			opp-microvolt = &lt;975000 970000 985000&gt;;</div><div class='ctx'> 			opp-microamp = &lt;70000&gt;;</div><div class='ctx'> 			clock-latency-ns = &lt;300000&gt;;</div><div class='ctx'> 			opp-suspend;</div><div class='ctx'> 		};</div><div class='ctx'> 		opp@1100000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1100000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;980000 1000000 1010000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1000000 980000 1010000&gt;;</div><div class='ctx'> 			opp-microamp = &lt;80000&gt;;</div><div class='ctx'> 			clock-latency-ns = &lt;310000&gt;;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -258,14 +267,14 @@ independently.</div><div class='ctx'> </div><div class='ctx'> 		opp@1000000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;970000 975000 985000&gt;;</div><div class='add'>+			opp-microvolt = &lt;975000 970000 985000&gt;;</div><div class='ctx'> 			opp-microamp = &lt;70000&gt;;</div><div class='ctx'> 			clock-latency-ns = &lt;300000&gt;;</div><div class='ctx'> 			opp-suspend;</div><div class='ctx'> 		};</div><div class='ctx'> 		opp@1100000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1100000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;980000 1000000 1010000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1000000 980000 1010000&gt;;</div><div class='ctx'> 			opp-microamp = &lt;80000&gt;;</div><div class='ctx'> 			clock-latency-ns = &lt;310000&gt;;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -334,14 +343,14 @@ DVFS state together.</div><div class='ctx'> </div><div class='ctx'> 		opp@1000000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;970000 975000 985000&gt;;</div><div class='add'>+			opp-microvolt = &lt;975000 970000 985000&gt;;</div><div class='ctx'> 			opp-microamp = &lt;70000&gt;;</div><div class='ctx'> 			clock-latency-ns = &lt;300000&gt;;</div><div class='ctx'> 			opp-suspend;</div><div class='ctx'> 		};</div><div class='ctx'> 		opp@1100000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1100000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;980000 1000000 1010000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1000000 980000 1010000&gt;;</div><div class='ctx'> 			opp-microamp = &lt;80000&gt;;</div><div class='ctx'> 			clock-latency-ns = &lt;310000&gt;;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -360,7 +369,7 @@ DVFS state together.</div><div class='ctx'> </div><div class='ctx'> 		opp@1300000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1300000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1045000 1050000 1055000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1050000 1045000 1055000&gt;;</div><div class='ctx'> 			opp-microamp = &lt;95000&gt;;</div><div class='ctx'> 			clock-latency-ns = &lt;400000&gt;;</div><div class='ctx'> 			opp-suspend;</div><div class='hunk'>@@ -373,7 +382,7 @@ DVFS state together.</div><div class='ctx'> 		};</div><div class='ctx'> 		opp@1500000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1500000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1010000 1100000 1110000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1100000 1010000 1110000&gt;;</div><div class='ctx'> 			opp-microamp = &lt;95000&gt;;</div><div class='ctx'> 			clock-latency-ns = &lt;400000&gt;;</div><div class='ctx'> 			turbo-mode;</div><div class='hunk'>@@ -386,10 +395,12 @@ Example 4: Handling multiple regulators</div><div class='ctx'> / {</div><div class='ctx'> 	cpus {</div><div class='ctx'> 		cpu@0 {</div><div class='del'>-			compatible = "arm,cortex-a7";</div><div class='add'>+			compatible = "vendor,cpu-type";</div><div class='ctx'> 			...</div><div class='ctx'> </div><div class='del'>-			cpu-supply = &lt;&amp;cpu_supply0&gt;, &lt;&amp;cpu_supply1&gt;, &lt;&amp;cpu_supply2&gt;;</div><div class='add'>+			vcc0-supply = &lt;&amp;cpu_supply0&gt;;</div><div class='add'>+			vcc1-supply = &lt;&amp;cpu_supply1&gt;;</div><div class='add'>+			vcc2-supply = &lt;&amp;cpu_supply2&gt;;</div><div class='ctx'> 			operating-points-v2 = &lt;&amp;cpu0_opp_table&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -413,9 +424,9 @@ Example 4: Handling multiple regulators</div><div class='ctx'> </div><div class='ctx'> 		opp@1000000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;970000 975000 985000&gt;, /* Supply 0 */</div><div class='del'>-					&lt;960000 965000 975000&gt;, /* Supply 1 */</div><div class='del'>-					&lt;960000 965000 975000&gt;; /* Supply 2 */</div><div class='add'>+			opp-microvolt = &lt;975000 970000 985000&gt;, /* Supply 0 */</div><div class='add'>+					&lt;965000 960000 975000&gt;, /* Supply 1 */</div><div class='add'>+					&lt;965000 960000 975000&gt;; /* Supply 2 */</div><div class='ctx'> 			opp-microamp =  &lt;70000&gt;,		/* Supply 0 */</div><div class='ctx'> 					&lt;70000&gt;,		/* Supply 1 */</div><div class='ctx'> 					&lt;70000&gt;;		/* Supply 2 */</div><div class='hunk'>@@ -426,9 +437,9 @@ Example 4: Handling multiple regulators</div><div class='ctx'> </div><div class='ctx'> 		opp@1000000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;970000 975000 985000&gt;, /* Supply 0 */</div><div class='del'>-					&lt;960000 965000 975000&gt;, /* Supply 1 */</div><div class='del'>-					&lt;960000 965000 975000&gt;; /* Supply 2 */</div><div class='add'>+			opp-microvolt = &lt;975000 970000 985000&gt;, /* Supply 0 */</div><div class='add'>+					&lt;965000 960000 975000&gt;, /* Supply 1 */</div><div class='add'>+					&lt;965000 960000 975000&gt;; /* Supply 2 */</div><div class='ctx'> 			opp-microamp =  &lt;70000&gt;,		/* Supply 0 */</div><div class='ctx'> 					&lt;0&gt;,			/* Supply 1 doesn't need this */</div><div class='ctx'> 					&lt;70000&gt;;		/* Supply 2 */</div><div class='hunk'>@@ -463,7 +474,7 @@ Example 5: opp-supported-hw</div><div class='ctx'> 			 */</div><div class='ctx'> 			opp-supported-hw = &lt;0xF 0xFFFFFFFF 0xFFFFFFFF&gt;</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;600000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;900000 915000 925000&gt;;</div><div class='add'>+			opp-microvolt = &lt;915000 900000 925000&gt;;</div><div class='ctx'> 			...</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -476,7 +487,7 @@ Example 5: opp-supported-hw</div><div class='ctx'> 			 */</div><div class='ctx'> 			opp-supported-hw = &lt;0x20 0xff0000ff 0x0000f4f0&gt;</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;800000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;900000 915000 925000&gt;;</div><div class='add'>+			opp-microvolt = &lt;915000 900000 925000&gt;;</div><div class='ctx'> 			...</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -501,18 +512,18 @@ Example 6: opp-microvolt-&lt;name&gt;, opp-microamp-&lt;name&gt;:</div><div class='ctx'> </div><div class='ctx'> 		opp@1000000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='del'>-			opp-microvolt-slow = &lt;900000 915000 925000&gt;;</div><div class='del'>-			opp-microvolt-fast = &lt;970000 975000 985000&gt;;</div><div class='add'>+			opp-microvolt-slow = &lt;915000 900000 925000&gt;;</div><div class='add'>+			opp-microvolt-fast = &lt;975000 970000 985000&gt;;</div><div class='ctx'> 			opp-microamp-slow =  &lt;70000&gt;;</div><div class='ctx'> 			opp-microamp-fast =  &lt;71000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		opp@1200000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1200000000&gt;;</div><div class='del'>-			opp-microvolt-slow = &lt;900000 915000 925000&gt;, /* Supply vcc0 */</div><div class='del'>-					      &lt;910000 925000 935000&gt;; /* Supply vcc1 */</div><div class='del'>-			opp-microvolt-fast = &lt;970000 975000 985000&gt;, /* Supply vcc0 */</div><div class='del'>-					     &lt;960000 965000 975000&gt;; /* Supply vcc1 */</div><div class='add'>+			opp-microvolt-slow = &lt;915000 900000 925000&gt;, /* Supply vcc0 */</div><div class='add'>+					      &lt;925000 910000 935000&gt;; /* Supply vcc1 */</div><div class='add'>+			opp-microvolt-fast = &lt;975000 970000 985000&gt;, /* Supply vcc0 */</div><div class='add'>+					     &lt;965000 960000 975000&gt;; /* Supply vcc1 */</div><div class='ctx'> 			opp-microamp =  &lt;70000&gt;; /* Will be used for both slow/fast */</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt b/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt<br/>index 01b88f4e0d5b..b8e48b4762b2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt</a></div><div class='hunk'>@@ -1,10 +1,17 @@</div><div class='ctx'> * Broadcom iProc PCIe controller with the platform bus interface</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Must be "brcm,iproc-pcie" for PAXB, or "brcm,iproc-pcie-paxc"</div><div class='del'>-  for PAXC.  PAXB-based root complex is used for external endpoint devices.</div><div class='del'>-  PAXC-based root complex is connected to emulated endpoint devices</div><div class='del'>-  internal to the ASIC</div><div class='add'>+- compatible:</div><div class='add'>+      "brcm,iproc-pcie" for the first generation of PAXB based controller,</div><div class='add'>+used in SoCs including NSP, Cygnus, NS2, and Pegasus</div><div class='add'>+      "brcm,iproc-pcie-paxb-v2" for the second generation of PAXB-based</div><div class='add'>+controllers, used in Stingray</div><div class='add'>+      "brcm,iproc-pcie-paxc" for the first generation of PAXC based</div><div class='add'>+controller, used in NS2</div><div class='add'>+      "brcm,iproc-pcie-paxc-v2" for the second generation of PAXC based</div><div class='add'>+controller, used in Stingray</div><div class='add'>+  PAXB-based root complex is used for external endpoint devices. PAXC-based</div><div class='add'>+root complex is connected to emulated endpoint devices internal to the ASIC</div><div class='ctx'> - reg: base address and length of the PCIe controller I/O register space</div><div class='ctx'> - #interrupt-cells: set to &lt;1&gt;</div><div class='ctx'> - interrupt-map-mask and interrupt-map, standard PCI properties to define the</div><div class='hunk'>@@ -19,6 +26,10 @@ Required properties:</div><div class='ctx'> Optional properties:</div><div class='ctx'> - phys: phandle of the PCIe PHY device</div><div class='ctx'> - phy-names: must be "pcie-phy"</div><div class='add'>+- dma-coherent: present if DMA operations are coherent</div><div class='add'>+- dma-ranges: Some PAXB-based root complexes do not have inbound mapping done</div><div class='add'>+  by the ASIC after power on reset.  In this case, SW is required to configure</div><div class='add'>+the mapping, based on inbound memory regions specified by this property.</div><div class='ctx'> </div><div class='ctx'> - brcm,pcie-ob: Some iProc SoCs do not have the outbound address mapping done</div><div class='ctx'> by the ASIC after power on reset. In this case, SW needs to configure it</div><div class='hunk'>@@ -29,11 +40,6 @@ effective:</div><div class='ctx'> Required:</div><div class='ctx'> - brcm,pcie-ob-axi-offset: The offset from the AXI address to the internal</div><div class='ctx'> address used by the iProc PCIe core (not the PCIe address)</div><div class='del'>-- brcm,pcie-ob-window-size: The outbound address mapping window size (in MB)</div><div class='del'>-</div><div class='del'>-Optional:</div><div class='del'>-- brcm,pcie-ob-oarr-size: Some iProc SoCs need the OARR size bit to be set to</div><div class='del'>-increase the outbound window size</div><div class='ctx'> </div><div class='ctx'> MSI support (optional):</div><div class='ctx'> </div><div class='hunk'>@@ -41,10 +47,19 @@ For older platforms without MSI integrated in the GIC, iProc PCIe core provides</div><div class='ctx'> an event queue based MSI support.  The iProc MSI uses host memories to store</div><div class='ctx'> MSI posted writes in the event queues</div><div class='ctx'> </div><div class='del'>-- msi-parent: Link to the device node of the MSI controller.  On newer iProc</div><div class='del'>-platforms, the MSI controller may be gicv2m or gicv3-its.  On older iProc</div><div class='del'>-platforms without MSI support in its interrupt controller, one may use the</div><div class='del'>-event queue based MSI support integrated within the iProc PCIe core.</div><div class='add'>+On newer iProc platforms, gicv2m or gicv3-its based MSI support should be used</div><div class='add'>+</div><div class='add'>+- msi-map: Maps a Requester ID to an MSI controller and associated MSI</div><div class='add'>+sideband data</div><div class='add'>+</div><div class='add'>+- msi-parent: Link to the device node of the MSI controller, used when no MSI</div><div class='add'>+sideband data is passed between the iProc PCIe controller and the MSI</div><div class='add'>+controller</div><div class='add'>+</div><div class='add'>+Refer to the following binding documents for more detailed description on</div><div class='add'>+the use of 'msi-map' and 'msi-parent':</div><div class='add'>+  Documentation/devicetree/bindings/pci/pci-msi.txt</div><div class='add'>+  Documentation/devicetree/bindings/interrupt-controller/msi.txt</div><div class='ctx'> </div><div class='ctx'> When the iProc event queue based MSI is used, one needs to define the</div><div class='ctx'> following properties in the MSI device node:</div><div class='hunk'>@@ -80,9 +95,7 @@ Example:</div><div class='ctx'> 		phy-names = "pcie-phy";</div><div class='ctx'> </div><div class='ctx'> 		brcm,pcie-ob;</div><div class='del'>-		brcm,pcie-ob-oarr-size;</div><div class='ctx'> 		brcm,pcie-ob-axi-offset = &lt;0x00000000&gt;;</div><div class='del'>-		brcm,pcie-ob-window-size = &lt;256&gt;;</div><div class='ctx'> </div><div class='ctx'> 		msi-parent = &lt;&amp;msi0&gt;;</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt b/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt<br/>index 59c2f47aa303..b7fa3b97986d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pci/hisilicon-pcie.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/hisilicon-pcie.txt</a></div><div class='hunk'>@@ -42,3 +42,40 @@ Hip05 Example (note that Hip06 is the same except compatible):</div><div class='ctx'> 				 0x0 0 0 4 &amp;mbigen_pcie 4 13&gt;;</div><div class='ctx'> 		status = "ok";</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+HiSilicon Hip06/Hip07 PCIe host bridge DT (almost-ECAM) description.</div><div class='add'>+The properties and their meanings are identical to those described in</div><div class='add'>+host-generic-pci.txt except as listed below.</div><div class='add'>+</div><div class='add'>+Properties of the host controller node that differ from</div><div class='add'>+host-generic-pci.txt:</div><div class='add'>+</div><div class='add'>+- compatible     : Must be "hisilicon,pcie-almost-ecam"</div><div class='add'>+</div><div class='add'>+- reg            : Two entries: First the ECAM configuration space for any</div><div class='add'>+		   other bus underneath the root bus. Second, the base</div><div class='add'>+		   and size of the HiSilicon host bridge registers include</div><div class='add'>+		   the RC's own config space.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	pcie0: pcie@a0090000 {</div><div class='add'>+		compatible = "hisilicon,pcie-almost-ecam";</div><div class='add'>+		reg = &lt;0 0xb0000000 0 0x2000000&gt;,  /*  ECAM configuration space */</div><div class='add'>+		      &lt;0 0xa0090000 0 0x10000&gt;; /* host bridge registers */</div><div class='add'>+		bus-range = &lt;0  31&gt;;</div><div class='add'>+		msi-map = &lt;0x0000 &amp;its_dsa 0x0000 0x2000&gt;;</div><div class='add'>+		msi-map-mask = &lt;0xffff&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		dma-coherent;</div><div class='add'>+		ranges = &lt;0x02000000 0 0xb2000000 0x0 0xb2000000 0 0x5ff0000</div><div class='add'>+			  0x01000000 0 0 0 0xb7ff0000 0 0x10000&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;0x0 0 0 1 &amp;mbigen_pcie0 650 4</div><div class='add'>+				 0x0 0 0 2 &amp;mbigen_pcie0 650 4</div><div class='add'>+				 0x0 0 0 3 &amp;mbigen_pcie0 650 4</div><div class='add'>+				 0x0 0 0 4 &amp;mbigen_pcie0 650 4&gt;;</div><div class='add'>+		status = "ok";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt<br/>index 41e9f55a1467..ee1c72d5162e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/layerscape-pci.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pci/layerscape-pci.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/layerscape-pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/layerscape-pci.txt</a></div><div class='hunk'>@@ -15,6 +15,7 @@ Required properties:</div><div class='ctx'> - compatible: should contain the platform identifier such as:</div><div class='ctx'>         "fsl,ls1021a-pcie", "snps,dw-pcie"</div><div class='ctx'>         "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"</div><div class='add'>+        "fsl,ls1046a-pcie"</div><div class='ctx'> - reg: base addresses and lengths of the PCIe controller</div><div class='ctx'> - interrupts: A list of interrupt outputs of the controller. Must contain an</div><div class='ctx'>   entry for each entry in the interrupt-names property.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt<br/>index 08c716b2c6b6..2de6f65ecfb1 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/mvebu-pci.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pci/mvebu-pci.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/mvebu-pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/mvebu-pci.txt</a></div><div class='hunk'>@@ -78,7 +78,8 @@ and the following optional properties:</div><div class='ctx'>   multiple lanes. If this property is not found, we assume that the</div><div class='ctx'>   value is 0.</div><div class='ctx'> - reset-gpios: optional gpio to PERST#</div><div class='del'>-- reset-delay-us: delay in us to wait after reset de-assertion</div><div class='add'>+- reset-delay-us: delay in us to wait after reset de-assertion, if not</div><div class='add'>+  specified will default to 100ms, as required by the PCIe specification.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt b/Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt<br/>index b8cc395fffea..982a74ea6df9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt</a></div><div class='hunk'>@@ -110,6 +110,20 @@ Power supplies for Tegra124:</div><div class='ctx'>   - avdd-pll-erefe-supply: Power supply for PLLE (shared with USB3). Must</div><div class='ctx'>     supply 1.05 V.</div><div class='ctx'> </div><div class='add'>+Power supplies for Tegra210:</div><div class='add'>+- Required:</div><div class='add'>+  - avdd-pll-uerefe-supply: Power supply for PLLE (shared with USB3). Must</div><div class='add'>+    supply 1.05 V.</div><div class='add'>+  - hvddio-pex-supply: High-voltage supply for PCIe I/O and PCIe output</div><div class='add'>+    clocks. Must supply 1.8 V.</div><div class='add'>+  - dvddio-pex-supply: Power supply for digital PCIe I/O. Must supply 1.05 V.</div><div class='add'>+  - dvdd-pex-pll-supply: Power supply for dedicated (internal) PCIe PLL. Must</div><div class='add'>+    supply 1.05 V.</div><div class='add'>+  - hvdd-pex-pll-e-supply: High-voltage supply for PLLE (shared with USB3).</div><div class='add'>+    Must supply 3.3 V.</div><div class='add'>+  - vddio-pex-ctl-supply: Power supply for PCIe control I/O partition. Must</div><div class='add'>+    supply 1.8 V.</div><div class='add'>+</div><div class='ctx'> Root ports are defined as subnodes of the PCIe controller node.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='hunk'>@@ -436,3 +450,99 @@ Board DTS:</div><div class='ctx'> 			status = "okay";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+Tegra210:</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+SoC DTSI:</div><div class='add'>+</div><div class='add'>+	pcie-controller@01003000 {</div><div class='add'>+		compatible = "nvidia,tegra210-pcie";</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		reg = &lt;0x0 0x01003000 0x0 0x00000800   /* PADS registers */</div><div class='add'>+		       0x0 0x01003800 0x0 0x00000800   /* AFI registers */</div><div class='add'>+		       0x0 0x02000000 0x0 0x10000000&gt;; /* configuration space */</div><div class='add'>+		reg-names = "pads", "afi", "cs";</div><div class='add'>+		interrupts = &lt;GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH&gt;, /* controller interrupt */</div><div class='add'>+			     &lt;GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH&gt;; /* MSI interrupt */</div><div class='add'>+		interrupt-names = "intr", "msi";</div><div class='add'>+</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0 0 0 0&gt;;</div><div class='add'>+		interrupt-map = &lt;0 0 0 0 &amp;gic GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		bus-range = &lt;0x00 0xff&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		ranges = &lt;0x82000000 0 0x01000000 0x0 0x01000000 0 0x00001000   /* port 0 configuration space */</div><div class='add'>+			  0x82000000 0 0x01001000 0x0 0x01001000 0 0x00001000   /* port 1 configuration space */</div><div class='add'>+			  0x81000000 0 0x0        0x0 0x12000000 0 0x00010000   /* downstream I/O (64 KiB) */</div><div class='add'>+			  0x82000000 0 0x13000000 0x0 0x13000000 0 0x0d000000   /* non-prefetchable memory (208 MiB) */</div><div class='add'>+			  0xc2000000 0 0x20000000 0x0 0x20000000 0 0x20000000&gt;; /* prefetchable memory (512 MiB) */</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;tegra_car TEGRA210_CLK_PCIE&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car TEGRA210_CLK_AFI&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car TEGRA210_CLK_PLL_E&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car TEGRA210_CLK_CML0&gt;;</div><div class='add'>+		clock-names = "pex", "afi", "pll_e", "cml";</div><div class='add'>+		resets = &lt;&amp;tegra_car 70&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car 72&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car 74&gt;;</div><div class='add'>+		reset-names = "pex", "afi", "pcie_x";</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='add'>+		pci@1,0 {</div><div class='add'>+			device_type = "pci";</div><div class='add'>+			assigned-addresses = &lt;0x82000800 0 0x01000000 0 0x1000&gt;;</div><div class='add'>+			reg = &lt;0x000800 0 0 0 0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			nvidia,num-lanes = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pci@2,0 {</div><div class='add'>+			device_type = "pci";</div><div class='add'>+			assigned-addresses = &lt;0x82001000 0 0x01001000 0 0x1000&gt;;</div><div class='add'>+			reg = &lt;0x001000 0 0 0 0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			nvidia,num-lanes = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Board DTS:</div><div class='add'>+</div><div class='add'>+	pcie-controller@01003000 {</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		avdd-pll-uerefe-supply = &lt;&amp;avdd_1v05_pll&gt;;</div><div class='add'>+		hvddio-pex-supply = &lt;&amp;vdd_1v8&gt;;</div><div class='add'>+		dvddio-pex-supply = &lt;&amp;vdd_pex_1v05&gt;;</div><div class='add'>+		dvdd-pex-pll-supply = &lt;&amp;vdd_pex_1v05&gt;;</div><div class='add'>+		hvdd-pex-pll-e-supply = &lt;&amp;vdd_1v8&gt;;</div><div class='add'>+		vddio-pex-ctl-supply = &lt;&amp;vdd_1v8&gt;;</div><div class='add'>+</div><div class='add'>+		pci@1,0 {</div><div class='add'>+			phys = &lt;&amp;{/padctl@7009f000/pads/pcie/lanes/pcie-0}&gt;,</div><div class='add'>+			       &lt;&amp;{/padctl@7009f000/pads/pcie/lanes/pcie-1}&gt;,</div><div class='add'>+			       &lt;&amp;{/padctl@7009f000/pads/pcie/lanes/pcie-2}&gt;,</div><div class='add'>+			       &lt;&amp;{/padctl@7009f000/pads/pcie/lanes/pcie-3}&gt;;</div><div class='add'>+			phy-names = "pcie-0", "pcie-1", "pcie-2", "pcie-3";</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pci@2,0 {</div><div class='add'>+			phys = &lt;&amp;{/padctl@7009f000/pads/pcie/lanes/pcie-4}&gt;;</div><div class='add'>+			phy-names = "pcie-0";</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pci/pci-iommu.txt b/Documentation/devicetree/bindings/pci/pci-iommu.txt<br/>index 56c829621b9a..0def586fdcdf 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/pci-iommu.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pci/pci-iommu.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/pci-iommu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/pci-iommu.txt</a></div><div class='hunk'>@@ -32,17 +32,17 @@ PCI root complex</div><div class='ctx'> Optional properties</div><div class='ctx'> -------------------</div><div class='ctx'> </div><div class='del'>-- iommu-map: Maps a Requester ID to an IOMMU and associated iommu-specifier</div><div class='add'>+- iommu-map: Maps a Requester ID to an IOMMU and associated IOMMU specifier</div><div class='ctx'>   data.</div><div class='ctx'> </div><div class='ctx'>   The property is an arbitrary number of tuples of</div><div class='ctx'>   (rid-base,iommu,iommu-base,length).</div><div class='ctx'> </div><div class='ctx'>   Any RID r in the interval [rid-base, rid-base + length) is associated with</div><div class='del'>-  the listed IOMMU, with the iommu-specifier (r - rid-base + iommu-base).</div><div class='add'>+  the listed IOMMU, with the IOMMU specifier (r - rid-base + iommu-base).</div><div class='ctx'> </div><div class='ctx'> - iommu-map-mask: A mask to be applied to each Requester ID prior to being</div><div class='del'>-  mapped to an iommu-specifier per the iommu-map property.</div><div class='add'>+  mapped to an IOMMU specifier per the iommu-map property.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Example (1)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pci/pci.txt b/Documentation/devicetree/bindings/pci/pci.txt<br/>index 08dcfad09f8d..50f9e2ca5b13 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/pci.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pci/pci.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/pci.txt</a></div><div class='hunk'>@@ -18,3 +18,9 @@ driver implementation may support the following properties:</div><div class='ctx'>    host bridges in the system, otherwise potentially conflicting domain numbers</div><div class='ctx'>    may be assigned to root buses behind different host bridges.  The domain</div><div class='ctx'>    number for each host bridge in the system must be unique.</div><div class='add'>+- max-link-speed:</div><div class='add'>+   If present this property specifies PCI gen for link capability.  Host</div><div class='add'>+   drivers could add this as a strategy to avoid unnecessary operation for</div><div class='add'>+   unsupported link speed, for instance, trying to do training for</div><div class='add'>+   unsupported link speed, etc.  Must be '4' for gen4, '3' for gen3, '2'</div><div class='add'>+   for gen2, and '1' for gen1. Any other values are invalid.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.txt b/Documentation/devicetree/bindings/pci/qcom,pcie.txt<br/>index 4059a6f89bc1..e15f9b19901f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/qcom,pcie.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pci/qcom,pcie.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/qcom,pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/qcom,pcie.txt</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> 			- "qcom,pcie-ipq8064" for ipq8064</div><div class='ctx'> 			- "qcom,pcie-apq8064" for apq8064</div><div class='ctx'> 			- "qcom,pcie-apq8084" for apq8084</div><div class='add'>+			- "qcom,pcie-msm8996" for msm8996 or apq8096</div><div class='ctx'> </div><div class='ctx'> - reg:</div><div class='ctx'> 	Usage: required</div><div class='hunk'>@@ -92,6 +93,17 @@</div><div class='ctx'> 			- "aux"		Auxiliary (AUX) clock</div><div class='ctx'> 			- "bus_master"	Master AXI clock</div><div class='ctx'> 			- "bus_slave"	Slave AXI clock</div><div class='add'>+</div><div class='add'>+- clock-names:</div><div class='add'>+	Usage: required for msm8996/apq8096</div><div class='add'>+	Value type: &lt;stringlist&gt;</div><div class='add'>+	Definition: Should contain the following entries</div><div class='add'>+			- "pipe"	Pipe Clock driving internal logic</div><div class='add'>+			- "aux"		Auxiliary (AUX) clock</div><div class='add'>+			- "cfg"		Configuration clock</div><div class='add'>+			- "bus_master"	Master AXI clock</div><div class='add'>+			- "bus_slave"	Slave AXI clock</div><div class='add'>+</div><div class='ctx'> - resets:</div><div class='ctx'> 	Usage: required</div><div class='ctx'> 	Value type: &lt;prop-encoded-array&gt;</div><div class='hunk'>@@ -115,7 +127,7 @@</div><div class='ctx'> 			- "core" Core reset</div><div class='ctx'> </div><div class='ctx'> - power-domains:</div><div class='del'>-	Usage: required for apq8084</div><div class='add'>+	Usage: required for apq8084 and msm8996/apq8096</div><div class='ctx'> 	Value type: &lt;prop-encoded-array&gt;</div><div class='ctx'> 	Definition: A phandle and power domain specifier pair to the</div><div class='ctx'> 		    power domain which is responsible for collapsing</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pci/rcar-pci.txt b/Documentation/devicetree/bindings/pci/rcar-pci.txt<br/>index 6cf99690eef9..34712d6fd253 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/rcar-pci.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pci/rcar-pci.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/rcar-pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/rcar-pci.txt</a></div><div class='hunk'>@@ -6,7 +6,9 @@ compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;</div><div class='ctx'> 	    "renesas,pcie-r8a7791" for the R8A7791 SoC;</div><div class='ctx'> 	    "renesas,pcie-r8a7793" for the R8A7793 SoC;</div><div class='ctx'> 	    "renesas,pcie-r8a7795" for the R8A7795 SoC;</div><div class='add'>+	    "renesas,pcie-r8a7796" for the R8A7796 SoC;</div><div class='ctx'> 	    "renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device.</div><div class='add'>+	    "renesas,pcie-rcar-gen3" for a generic R-Car Gen3 compatible device.</div><div class='ctx'> </div><div class='ctx'> 	    When compatible with the generic version, nodes must list the</div><div class='ctx'> 	    SoC-specific version corresponding to the platform first</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pci/rockchip-pcie.txt b/Documentation/devicetree/bindings/pci/rockchip-pcie.txt<br/>index 71aeda1ca055..1453a734c2f5 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/rockchip-pcie.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pci/rockchip-pcie.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/rockchip-pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/rockchip-pcie.txt</a></div><div class='hunk'>@@ -43,6 +43,8 @@ Required properties:</div><div class='ctx'> - interrupt-map-mask and interrupt-map: standard PCI properties</div><div class='ctx'> </div><div class='ctx'> Optional Property:</div><div class='add'>+- aspm-no-l0s: RC won't support ASPM L0s. This property is needed if</div><div class='add'>+	using 24MHz OSC for RC's PHY.</div><div class='ctx'> - ep-gpios: contain the entry for pre-reset gpio</div><div class='ctx'> - num-lanes: number of lanes to use</div><div class='ctx'> - vpcie3v3-supply: The phandle to the 3.3v regulator to use for PCIe.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt b/Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt<br/>index 4f9d23d2ed67..7d3b09474657 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pci/samsung,exynos5440-pcie.txt</a></div><div class='hunk'>@@ -7,8 +7,19 @@ Required properties:</div><div class='ctx'> - compatible: "samsung,exynos5440-pcie"</div><div class='ctx'> - reg: base addresses and lengths of the pcie controller,</div><div class='ctx'> 	the phy controller, additional register for the phy controller.</div><div class='add'>+	(Registers for the phy controller are DEPRECATED.</div><div class='add'>+	 Use the PHY framework.)</div><div class='add'>+- reg-names : First name should be set to "elbi".</div><div class='add'>+	And use the "config" instead of getting the confgiruation address space</div><div class='add'>+	from "ranges".</div><div class='add'>+	NOTE: When use the "config" property, reg-names must be set.</div><div class='ctx'> - interrupts: A list of interrupt outputs for level interrupt,</div><div class='ctx'> 	pulse interrupt, special interrupt.</div><div class='add'>+- phys: From PHY binding. Phandle for the Generic PHY.</div><div class='add'>+	Refer to Documentation/devicetree/bindings/phy/samsung-phy.txt</div><div class='add'>+</div><div class='add'>+Other common properties refer to</div><div class='add'>+	Documentation/devicetree/binding/pci/designware-pcie.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='hunk'>@@ -54,6 +65,24 @@ SoC specific DT Entry:</div><div class='ctx'> 		num-lanes = &lt;4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+With using PHY framework:</div><div class='add'>+	pcie_phy0: pcie-phy@270000 {</div><div class='add'>+		...</div><div class='add'>+		reg = &lt;0x270000 0x1000&gt;, &lt;0x271000 0x40&gt;;</div><div class='add'>+		reg-names = "phy", "block";</div><div class='add'>+		...</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pcie@290000 {</div><div class='add'>+		...</div><div class='add'>+		reg = &lt;0x290000 0x1000&gt;, &lt;0x40000000 0x1000&gt;;</div><div class='add'>+		reg-names = "elbi", "config";</div><div class='add'>+		phys = &lt;&amp;pcie_phy0&gt;;</div><div class='add'>+		ranges = &lt;0x81000000 0 0	  0x60001000 0 0x00010000</div><div class='add'>+			  0x82000000 0 0x60011000 0x60011000 0 0x1ffef000&gt;;</div><div class='add'>+		...</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> Board specific DT Entry:</div><div class='ctx'> </div><div class='ctx'> 	pcie@290000 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt b/Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt<br/>new file mode 100644<br/>index 000000000000..e68ae5dec9c9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+Broadcom USB3 phy binding for northstar plus SoC</div><div class='add'>+The USB3 phy is internal to the SoC and is accessed using mdio interface.</div><div class='add'>+</div><div class='add'>+Required mdio bus properties:</div><div class='add'>+- reg: Should be 0x0 for SoC internal USB3 phy</div><div class='add'>+- #address-cells: must be 1</div><div class='add'>+- #size-cells: must be 0</div><div class='add'>+</div><div class='add'>+Required USB3 PHY properties:</div><div class='add'>+- compatible: should be "brcm,nsp-usb3-phy"</div><div class='add'>+- reg: USB3 Phy address on SoC internal MDIO bus and it should be 0x10.</div><div class='add'>+- usb3-ctrl-syscon: handler of syscon node defining physical address</div><div class='add'>+  of usb3 control register.</div><div class='add'>+- #phy-cells: must be 0</div><div class='add'>+</div><div class='add'>+Required usb3 control properties:</div><div class='add'>+- compatible: should be "brcm,nsp-usb3-ctrl"</div><div class='add'>+- reg: offset and length of the control registers</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	mdio@0 {</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		usb3_phy: usb-phy@10 {</div><div class='add'>+			compatible = "brcm,nsp-usb3-phy";</div><div class='add'>+			reg = &lt;0x10&gt;;</div><div class='add'>+			usb3-ctrl-syscon = &lt;&amp;usb3_ctrl&gt;;</div><div class='add'>+			#phy-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb3_ctrl: syscon@104408 {</div><div class='add'>+		compatible = "brcm,nsp-usb3-ctrl", "syscon";</div><div class='add'>+		reg = &lt;0x104408 0x3fc&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/meson-usb2-phy.txt b/Documentation/devicetree/bindings/phy/meson-usb2-phy.txt<br/>deleted file mode 100644<br/>index 9da5ea234154..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/phy/meson-usb2-phy.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/phy/meson-usb2-phy.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-* Amlogic USB2 PHY</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-- compatible:	Depending on the platform this should be one of:</div><div class='del'>-	"amlogic,meson8b-usb2-phy"</div><div class='del'>-	"amlogic,meson-gxbb-usb2-phy"</div><div class='del'>-- reg:		The base address and length of the registers</div><div class='del'>-- #phys-cells:	should be 0 (see phy-bindings.txt in this directory)</div><div class='del'>-- clocks:	phandle and clock identifier for the phy clocks</div><div class='del'>-- clock-names:	"usb_general" and "usb"</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>-- resets:	reference to the reset controller</div><div class='del'>-- phy-supply:	see phy-bindings.txt in this directory</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-usb0_phy: usb_phy@0 {</div><div class='del'>-	compatible = "amlogic,meson-gxbb-usb2-phy";</div><div class='del'>-	#phy-cells = &lt;0&gt;;</div><div class='del'>-	reg = &lt;0x0 0x0 0x0 0x20&gt;;</div><div class='del'>-	resets = &lt;&amp;reset RESET_USB_OTG&gt;;</div><div class='del'>-	clocks = &lt;&amp;clkc CLKID_USB&gt;, &lt;&amp;clkc CLKID_USB0&gt;;</div><div class='del'>-	clock-names = "usb_general", "usb";</div><div class='del'>-	phy-supply = &lt;&amp;usb_vbus&gt;;</div><div class='del'>-};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt b/Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt<br/>new file mode 100644<br/>index 000000000000..5fa73b9d20f5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+* Amlogic Meson8b and GXBB USB2 PHY</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible:	Depending on the platform this should be one of:</div><div class='add'>+	"amlogic,meson8b-usb2-phy"</div><div class='add'>+	"amlogic,meson-gxbb-usb2-phy"</div><div class='add'>+- reg:		The base address and length of the registers</div><div class='add'>+- #phys-cells:	should be 0 (see phy-bindings.txt in this directory)</div><div class='add'>+- clocks:	phandle and clock identifier for the phy clocks</div><div class='add'>+- clock-names:	"usb_general" and "usb"</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- resets:	reference to the reset controller</div><div class='add'>+- phy-supply:	see phy-bindings.txt in this directory</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+usb0_phy: usb-phy@c0000000 {</div><div class='add'>+	compatible = "amlogic,meson-gxbb-usb2-phy";</div><div class='add'>+	#phy-cells = &lt;0&gt;;</div><div class='add'>+	reg = &lt;0x0 0xc0000000 0x0 0x20&gt;;</div><div class='add'>+	resets = &lt;&amp;reset RESET_USB_OTG&gt;;</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_USB&gt;, &lt;&amp;clkc CLKID_USB0&gt;;</div><div class='add'>+	clock-names = "usb_general", "usb";</div><div class='add'>+	phy-supply = &lt;&amp;usb_vbus&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt<br/>new file mode 100644<br/>index 000000000000..b3b75c1e6285<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+Qualcomm's USB HS PHY</div><div class='add'>+</div><div class='add'>+PROPERTIES</div><div class='add'>+</div><div class='add'>+- compatible:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;string&gt;</div><div class='add'>+    Definition: Should contain "qcom,usb-hs-phy" and more specifically one of the</div><div class='add'>+                following:</div><div class='add'>+</div><div class='add'>+                        "qcom,usb-hs-phy-apq8064"</div><div class='add'>+                        "qcom,usb-hs-phy-msm8916"</div><div class='add'>+                        "qcom,usb-hs-phy-msm8974"</div><div class='add'>+</div><div class='add'>+- #phy-cells:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;u32&gt;</div><div class='add'>+    Definition: Should contain 0</div><div class='add'>+</div><div class='add'>+- clocks:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+    Definition: Should contain clock specifier for the reference and sleep</div><div class='add'>+                clocks</div><div class='add'>+</div><div class='add'>+- clock-names:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;stringlist&gt;</div><div class='add'>+    Definition: Should contain "ref" and "sleep" for the reference and sleep</div><div class='add'>+                clocks respectively</div><div class='add'>+</div><div class='add'>+- resets:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+    Definition: Should contain the phy and POR resets</div><div class='add'>+</div><div class='add'>+- reset-names:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;stringlist&gt;</div><div class='add'>+    Definition: Should contain "phy" and "por" for the phy and POR resets</div><div class='add'>+                respectively</div><div class='add'>+</div><div class='add'>+- v3p3-supply:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;phandle&gt;</div><div class='add'>+    Definition: Should contain a reference to the 3.3V supply</div><div class='add'>+</div><div class='add'>+- v1p8-supply:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;phandle&gt;</div><div class='add'>+    Definition: Should contain a reference to the 1.8V supply</div><div class='add'>+</div><div class='add'>+- extcon:</div><div class='add'>+    Usage: optional</div><div class='add'>+    Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+    Definition: Should contain the vbus extcon</div><div class='add'>+</div><div class='add'>+- qcom,init-seq:</div><div class='add'>+    Usage: optional</div><div class='add'>+    Value type: &lt;u8 array&gt;</div><div class='add'>+    Definition: Should contain a sequence of ULPI address and value pairs to</div><div class='add'>+                program into the ULPI_EXT_VENDOR_SPECIFIC area. This is related</div><div class='add'>+                to Device Mode Eye Diagram test. The addresses are offsets</div><div class='add'>+                from the ULPI_EXT_VENDOR_SPECIFIC address, for example,</div><div class='add'>+                &lt;0x1 0x53&gt; would mean "write the value 0x53 to address 0x81".</div><div class='add'>+</div><div class='add'>+EXAMPLE</div><div class='add'>+</div><div class='add'>+otg: usb-controller {</div><div class='add'>+	ulpi {</div><div class='add'>+		phy {</div><div class='add'>+			compatible = "qcom,usb-hs-phy-msm8974", "qcom,usb-hs-phy";</div><div class='add'>+			#phy-cells = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;xo_board&gt;, &lt;&amp;gcc GCC_USB2A_PHY_SLEEP_CLK&gt;;</div><div class='add'>+			clock-names = "ref", "sleep";</div><div class='add'>+			resets = &lt;&amp;gcc GCC_USB2A_PHY_BCR&gt;, &lt;&amp;otg 0&gt;;</div><div class='add'>+			reset-names = "phy", "por";</div><div class='add'>+			v3p3-supply = &lt;&amp;pm8941_l24&gt;;</div><div class='add'>+			v1p8-supply = &lt;&amp;pm8941_l6&gt;;</div><div class='add'>+			extcon = &lt;&amp;smbb&gt;;</div><div class='add'>+			qcom,init-seq = /bits/ 8 &lt;0x1 0x63&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.txt b/Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.txt<br/>new file mode 100644<br/>index 000000000000..3c7cb2be4b12<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.txt</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+Qualcomm's USB HSIC PHY</div><div class='add'>+</div><div class='add'>+PROPERTIES</div><div class='add'>+</div><div class='add'>+- compatible:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;string&gt;</div><div class='add'>+    Definition: Should contain "qcom,usb-hsic-phy" and more specifically one of the</div><div class='add'>+		following:</div><div class='add'>+</div><div class='add'>+			"qcom,usb-hsic-phy-mdm9615"</div><div class='add'>+			"qcom,usb-hsic-phy-msm8974"</div><div class='add'>+</div><div class='add'>+- #phy-cells:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;u32&gt;</div><div class='add'>+    Definition: Should contain 0</div><div class='add'>+</div><div class='add'>+- clocks:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+    Definition: Should contain clock specifier for phy, calibration and</div><div class='add'>+                a calibration sleep clock</div><div class='add'>+</div><div class='add'>+- clock-names:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;stringlist&gt;</div><div class='add'>+    Definition: Should contain "phy, "cal" and "cal_sleep"</div><div class='add'>+</div><div class='add'>+- pinctrl-names:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;stringlist&gt;</div><div class='add'>+    Definition: Should contain "init" and "default" in that order</div><div class='add'>+</div><div class='add'>+- pinctrl-0:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+    Definition: List of pinctrl settings to apply to keep HSIC pins in a glitch</div><div class='add'>+                free state</div><div class='add'>+</div><div class='add'>+- pinctrl-1:</div><div class='add'>+    Usage: required</div><div class='add'>+    Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+    Definition: List of pinctrl settings to apply to mux out the HSIC pins</div><div class='add'>+</div><div class='add'>+EXAMPLE</div><div class='add'>+</div><div class='add'>+usb-controller {</div><div class='add'>+	ulpi {</div><div class='add'>+		phy {</div><div class='add'>+			compatible = "qcom,usb-hsic-phy-msm8974",</div><div class='add'>+				     "qcom,usb-hsic-phy";</div><div class='add'>+			#phy-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "init", "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hsic_sleep&gt;;</div><div class='add'>+			pinctrl-1 = &lt;&amp;hsic_default&gt;;</div><div class='add'>+			clocks = &lt;&amp;gcc GCC_USB_HSIC_CLK&gt;,</div><div class='add'>+				 &lt;&amp;gcc GCC_USB_HSIC_IO_CAL_CLK&gt;,</div><div class='add'>+				 &lt;&amp;gcc GCC_USB_HSIC_IO_CAL_SLEEP_CLK&gt;;</div><div class='add'>+			clock-names = "phy", "cal", "cal_sleep";</div><div class='add'>+			assigned-clocks = &lt;&amp;gcc GCC_USB_HSIC_IO_CAL_CLK&gt;;</div><div class='add'>+			assigned-clock-rates = &lt;960000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt b/Documentation/devicetree/bindings/phy/samsung-phy.txt<br/>index 9872ba8546bd..ab80bfe31cb3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/phy/samsung-phy.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/phy/samsung-phy.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/phy/samsung-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/samsung-phy.txt</a></div><div class='hunk'>@@ -191,3 +191,20 @@ Example:</div><div class='ctx'> 		usbdrdphy0 = &amp;usb3_phy0;</div><div class='ctx'> 		usbdrdphy1 = &amp;usb3_phy1;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+Samsung Exynos SoC series PCIe PHY controller</div><div class='add'>+--------------------------------------------------</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : Should be set to "samsung,exynos5440-pcie-phy"</div><div class='add'>+- #phy-cells : Must be zero</div><div class='add'>+- reg : a register used by phy driver.</div><div class='add'>+	- First is for phy register, second is for block register.</div><div class='add'>+- reg-names : Must be set to "phy" and "block".</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	pcie_phy0: pcie-phy@270000 {</div><div class='add'>+		#phy-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "samsung,exynos5440-pcie-phy";</div><div class='add'>+		reg = &lt;0x270000 0x1000&gt;, &lt;0x271000 0x40&gt;;</div><div class='add'>+		reg-names = "phy", "block";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt b/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt<br/>index 287150db6db4..e42334258185 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt</a></div><div class='hunk'>@@ -10,6 +10,7 @@ Required properties:</div><div class='ctx'>   * allwinner,sun8i-a23-usb-phy</div><div class='ctx'>   * allwinner,sun8i-a33-usb-phy</div><div class='ctx'>   * allwinner,sun8i-h3-usb-phy</div><div class='add'>+  * allwinner,sun8i-v3s-usb-phy</div><div class='ctx'>   * allwinner,sun50i-a64-usb-phy</div><div class='ctx'> - reg : a list of offset + length pairs</div><div class='ctx'> - reg-names :</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt<br/>index 1685821eea41..2fd688c8dbdb 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt</a></div><div class='hunk'>@@ -6,7 +6,7 @@ the first two functions being GPIO in and out. The configuration on</div><div class='ctx'> the pins includes drive strength and pull-up.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Should be one of the followings (depending on you SoC):</div><div class='add'>+- compatible: Should be one of the following (depending on your SoC):</div><div class='ctx'>   "allwinner,sun4i-a10-pinctrl"</div><div class='ctx'>   "allwinner,sun5i-a10s-pinctrl"</div><div class='ctx'>   "allwinner,sun5i-a13-pinctrl"</div><div class='hunk'>@@ -23,11 +23,26 @@ Required properties:</div><div class='ctx'>   "allwinner,sun8i-h3-pinctrl"</div><div class='ctx'>   "allwinner,sun8i-h3-r-pinctrl"</div><div class='ctx'>   "allwinner,sun50i-a64-pinctrl"</div><div class='add'>+  "allwinner,sun50i-h5-r-pinctrl"</div><div class='ctx'>   "nextthing,gr8-pinctrl"</div><div class='ctx'> </div><div class='ctx'> - reg: Should contain the register physical address and length for the</div><div class='ctx'>   pin controller.</div><div class='ctx'> </div><div class='add'>+- clocks: phandle to the clocks feeding the pin controller:</div><div class='add'>+  - "apb": the gated APB parent clock</div><div class='add'>+  - "hosc": the high frequency oscillator in the system</div><div class='add'>+  - "losc": the low frequency oscillator in the system</div><div class='add'>+</div><div class='add'>+Note: For backward compatibility reasons, the hosc and losc clocks are only</div><div class='add'>+required if you need to use the optional input-debounce property. Any new</div><div class='add'>+device tree should set them.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+  - input-debounce: Array of debouncing periods in microseconds. One period per</div><div class='add'>+    irq bank found in the controller. 0 if no setup required.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Please refer to pinctrl-bindings.txt in this directory for details of the</div><div class='ctx'> common pinctrl bindings used by client devices.</div><div class='ctx'> </div><div class='hunk'>@@ -37,6 +52,22 @@ pins it needs, and how they should be configured, with regard to muxer</div><div class='ctx'> configuration, drive strength and pullups. If one of these options is</div><div class='ctx'> not set, its actual value will be unspecified.</div><div class='ctx'> </div><div class='add'>+This driver supports the generic pin multiplexing and configuration</div><div class='add'>+bindings. For details on each properties, you can refer to</div><div class='add'>+./pinctrl-bindings.txt.</div><div class='add'>+</div><div class='add'>+Required sub-node properties:</div><div class='add'>+  - pins</div><div class='add'>+  - function</div><div class='add'>+</div><div class='add'>+Optional sub-node properties:</div><div class='add'>+  - bias-disable</div><div class='add'>+  - bias-pull-up</div><div class='add'>+  - bias-pull-down</div><div class='add'>+  - drive-strength</div><div class='add'>+</div><div class='add'>+*** Deprecated pin configuration and multiplexing binding</div><div class='add'>+</div><div class='ctx'> Required subnode-properties:</div><div class='ctx'> </div><div class='ctx'> - allwinner,pins: List of strings containing the pin name.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt<br/>index b7a93e80a302..9a8a45d9d8ab 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt</a></div><div class='hunk'>@@ -98,6 +98,8 @@ DRIVE_STRENGTH (3 &lt;&lt; 5): indicate the drive strength of the pin using the</div><div class='ctx'> 				01 - Low</div><div class='ctx'> 				10 - Medium</div><div class='ctx'> 				11 - High</div><div class='add'>+OUTPUT		(1 &lt;&lt; 7): indicate this pin need to be configured as an output.</div><div class='add'>+OUTPUT_VAL	(1 &lt;&lt; 8): output val (1 = high, 0 = low)</div><div class='ctx'> DEBOUNCE	(1 &lt;&lt; 16): indicate this pin needs debounce.</div><div class='ctx'> DEBOUNCE_VAL	(0x3fff &lt;&lt; 17): debounce value.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt<br/>index 457b2c68d47b..8c5d27c5b562 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt</a></div><div class='hunk'>@@ -19,7 +19,7 @@ iomuxc: iomuxc@30330000 {</div><div class='ctx'> 	reg = &lt;0x30330000 0x10000&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-Pheriparials using pads from iomuxc-lpsr support low state retention power</div><div class='add'>+Peripherals using pads from iomuxc-lpsr support low state retention power</div><div class='ctx'> state, under LPSR mode GPIO's state of pads are retain.</div><div class='ctx'> </div><div class='ctx'> Please refer to fsl,imx-pinctrl.txt in this directory for common binding part</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-98dx3236-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-98dx3236-pinctrl.txt<br/>new file mode 100644<br/>index 000000000000..97aef67ee769<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/marvell,armada-98dx3236-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/marvell,armada-98dx3236-pinctrl.txt</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+* Marvell 98dx3236 pinctrl driver for mpp</div><div class='add'>+</div><div class='add'>+Please refer to marvell,mvebu-pinctrl.txt in this directory for common binding</div><div class='add'>+part and usage</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: "marvell,98dx3236-pinctrl" or "marvell,98dx4251-pinctrl"</div><div class='add'>+- reg: register specifier of MPP registers</div><div class='add'>+</div><div class='add'>+This driver supports all 98dx3236, 98dx3336 and 98dx4251 variants</div><div class='add'>+</div><div class='add'>+name          pins     functions</div><div class='add'>+================================================================================</div><div class='add'>+mpp0          0        gpo, spi0(mosi), dev(ad8)</div><div class='add'>+mpp1          1        gpio, spi0(miso), dev(ad9)</div><div class='add'>+mpp2          2        gpo, spi0(sck), dev(ad10)</div><div class='add'>+mpp3          3        gpio, spi0(cs0), dev(ad11)</div><div class='add'>+mpp4          4        gpio, spi0(cs1), smi(mdc), dev(cs0)</div><div class='add'>+mpp5          5        gpio, pex(rsto), sd0(cmd), dev(bootcs)</div><div class='add'>+mpp6          6        gpo, sd0(clk), dev(a2)</div><div class='add'>+mpp7          7        gpio, sd0(d0), dev(ale0)</div><div class='add'>+mpp8          8        gpio, sd0(d1), dev(ale1)</div><div class='add'>+mpp9          9        gpio, sd0(d2), dev(ready0)</div><div class='add'>+mpp10         10       gpio, sd0(d3), dev(ad12)</div><div class='add'>+mpp11         11       gpio, uart1(rxd), uart0(cts), dev(ad13)</div><div class='add'>+mpp12         12       gpo, uart1(txd), uart0(rts), dev(ad14)</div><div class='add'>+mpp13         13       gpio, intr(out), dev(ad15)</div><div class='add'>+mpp14         14       gpio, i2c0(sck)</div><div class='add'>+mpp15         15       gpio, i2c0(sda)</div><div class='add'>+mpp16         16       gpo, dev(oe)</div><div class='add'>+mpp17         17       gpo, dev(clkout)</div><div class='add'>+mpp18         18       gpio, uart1(txd)</div><div class='add'>+mpp19         19       gpio, uart1(rxd), dev(rb)</div><div class='add'>+mpp20         20       gpo, dev(we0)</div><div class='add'>+mpp21         21       gpo, dev(ad0)</div><div class='add'>+mpp22         22       gpo, dev(ad1)</div><div class='add'>+mpp23         23       gpo, dev(ad2)</div><div class='add'>+mpp24         24       gpo, dev(ad3)</div><div class='add'>+mpp25         25       gpo, dev(ad4)</div><div class='add'>+mpp26         26       gpo, dev(ad5)</div><div class='add'>+mpp27         27       gpo, dev(ad6)</div><div class='add'>+mpp28         28       gpo, dev(ad7)</div><div class='add'>+mpp29         29       gpo, dev(a0)</div><div class='add'>+mpp30         30       gpo, dev(a1)</div><div class='add'>+mpp31         31       gpio, slv_smi(mdc), smi(mdc), dev(we1)</div><div class='add'>+mpp32         32       gpio, slv_smi(mdio), smi(mdio), dev(cs1)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt<br/>index 730444a9a4de..6c0ea155b708 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt</a></div><div class='hunk'>@@ -44,16 +44,16 @@ mpp16         16       gpio, sdio(d2), uart0(cts), uart1(rxd), mii(crs)</div><div class='ctx'> mpp17         17       gpio, sdio(d3)</div><div class='ctx'> mpp18         18       gpo, nand(io0)</div><div class='ctx'> mpp19         19       gpo, nand(io1)</div><div class='del'>-mpp20         20       gpio, mii(rxerr)</div><div class='del'>-mpp21         21       gpio, audio(spdifi)</div><div class='del'>-mpp22         22       gpio, audio(spdifo)</div><div class='del'>-mpp23         23       gpio, audio(rmclk)</div><div class='del'>-mpp24         24       gpio, audio(bclk)</div><div class='del'>-mpp25         25       gpio, audio(sdo)</div><div class='del'>-mpp26         26       gpio, audio(lrclk)</div><div class='del'>-mpp27         27       gpio, audio(mclk)</div><div class='del'>-mpp28         28       gpio, audio(sdi)</div><div class='del'>-mpp29         29       gpio, audio(extclk)</div><div class='add'>+mpp35         35       gpio, mii(rxerr)</div><div class='add'>+mpp36         36       gpio, audio(spdifi)</div><div class='add'>+mpp37         37       gpio, audio(spdifo)</div><div class='add'>+mpp38         38       gpio, audio(rmclk)</div><div class='add'>+mpp39         39       gpio, audio(bclk)</div><div class='add'>+mpp40         40       gpio, audio(sdo)</div><div class='add'>+mpp41         41       gpio, audio(lrclk)</div><div class='add'>+mpp42         42       gpio, audio(mclk)</div><div class='add'>+mpp43         43       gpio, audio(sdi)</div><div class='add'>+mpp44         44       gpio, audio(extclk)</div><div class='ctx'> </div><div class='ctx'> * Marvell Kirkwood 88f6190</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt<br/>index fe7fe0b03cfb..2392557ede27 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt</a></div><div class='hunk'>@@ -7,6 +7,8 @@ Required properties for the root node:</div><div class='ctx'> 		      "amlogic,meson8b-aobus-pinctrl"</div><div class='ctx'> 		      "amlogic,meson-gxbb-periphs-pinctrl"</div><div class='ctx'> 		      "amlogic,meson-gxbb-aobus-pinctrl"</div><div class='add'>+		      "amlogic,meson-gxl-periphs-pinctrl"</div><div class='add'>+		      "amlogic,meson-gxl-aobus-pinctrl"</div><div class='ctx'>  - reg: address and size of registers controlling irq functionality</div><div class='ctx'> </div><div class='ctx'> === GPIO sub-nodes ===</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt<br/>index d6074321f730..09e81a95bbfd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt</a></div><div class='hunk'>@@ -9,7 +9,7 @@ used for a specific device or function. This node represents configurations of</div><div class='ctx'> pins, optional function, and optional mux related configuration.</div><div class='ctx'> </div><div class='ctx'> Required properties for pin controller node:</div><div class='del'>- - compatible: "oxsemi,ox810se-pinctrl"</div><div class='add'>+ - compatible: "oxsemi,ox810se-pinctrl" or "oxsemi,ox820-pinctrl"</div><div class='ctx'>  - oxsemi,sys-ctrl: a phandle to the system controller syscon node</div><div class='ctx'> </div><div class='ctx'> Required properties for pin configuration sub-nodes:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-aspeed.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-aspeed.txt<br/>index 2ad18c4ea55c..b98e6f030da8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-aspeed.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/pinctrl-aspeed.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-aspeed.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/pinctrl-aspeed.txt</a></div><div class='hunk'>@@ -1,25 +1,38 @@</div><div class='add'>+======================</div><div class='ctx'> Aspeed Pin Controllers</div><div class='del'>-----------------------</div><div class='add'>+======================</div><div class='ctx'> </div><div class='ctx'> The Aspeed SoCs vary in functionality inside a generation but have a common mux</div><div class='ctx'> device register layout.</div><div class='ctx'> </div><div class='del'>-Required properties:</div><div class='del'>-- compatible : Should be any one of the following:</div><div class='del'>-		"aspeed,ast2400-pinctrl"</div><div class='del'>-		"aspeed,g4-pinctrl"</div><div class='del'>-		"aspeed,ast2500-pinctrl"</div><div class='del'>-		"aspeed,g5-pinctrl"</div><div class='add'>+Required properties for g4:</div><div class='add'>+- compatible : 			Should be one of the following:</div><div class='add'>+				"aspeed,ast2400-pinctrl"</div><div class='add'>+				"aspeed,g4-pinctrl"</div><div class='ctx'> </div><div class='del'>-The pin controller node should be a child of a syscon node with the required</div><div class='add'>+Required properties for g5:</div><div class='add'>+- compatible : 			Should be one of the following:</div><div class='add'>+				"aspeed,ast2500-pinctrl"</div><div class='add'>+				"aspeed,g5-pinctrl"</div><div class='add'>+</div><div class='add'>+- aspeed,external-nodes:	A cell of phandles to external controller nodes:</div><div class='add'>+				0: compatible with "aspeed,ast2500-gfx", "syscon"</div><div class='add'>+				1: compatible with "aspeed,ast2500-lhc", "syscon"</div><div class='add'>+</div><div class='add'>+The pin controller node should be the child of a syscon node with the required</div><div class='ctx'> property:</div><div class='del'>-- compatible: "syscon", "simple-mfd"</div><div class='add'>+</div><div class='add'>+- compatible : 		Should be one of the following:</div><div class='add'>+			"aspeed,ast2400-scu", "syscon", "simple-mfd"</div><div class='add'>+			"aspeed,g4-scu", "syscon", "simple-mfd"</div><div class='add'>+			"aspeed,ast2500-scu", "syscon", "simple-mfd"</div><div class='add'>+			"aspeed,g5-scu", "syscon", "simple-mfd"</div><div class='ctx'> </div><div class='ctx'> Refer to the the bindings described in</div><div class='ctx'> Documentation/devicetree/bindings/mfd/syscon.txt</div><div class='ctx'> </div><div class='ctx'> Subnode Format</div><div class='del'>---------------</div><div class='add'>+==============</div><div class='ctx'> </div><div class='ctx'> The required properties of child nodes are (as defined in pinctrl-bindings):</div><div class='ctx'> - function</div><div class='hunk'>@@ -31,26 +44,43 @@ supported:</div><div class='ctx'> </div><div class='ctx'> aspeed,ast2400-pinctrl, aspeed,g4-pinctrl:</div><div class='ctx'> </div><div class='del'>-ACPI BMCINT DDCCLK DDCDAT FLACK FLBUSY FLWP GPID0 GPIE0 GPIE2 GPIE4 GPIE6 I2C10</div><div class='del'>-I2C11 I2C12 I2C13 I2C3 I2C4 I2C5 I2C6 I2C7 I2C8 I2C9 LPCPD LPCPME LPCSMI MDIO1</div><div class='del'>-MDIO2 NCTS1 NCTS3 NCTS4 NDCD1 NDCD3 NDCD4 NDSR1 NDSR3 NDTR1 NDTR3 NRI1 NRI3</div><div class='del'>-NRI4 NRTS1 NRTS3 PWM0 PWM1 PWM2 PWM3 PWM4 PWM5 PWM6 PWM7 RGMII1 RMII1 ROM16</div><div class='del'>-ROM8 ROMCS1 ROMCS2 ROMCS3 ROMCS4 RXD1 RXD3 RXD4 SD1 SGPMI SIOPBI SIOPBO TIMER3</div><div class='del'>-TIMER5 TIMER6 TIMER7 TIMER8 TXD1 TXD3 TXD4 UART6 VGAHS VGAVS VPI18 VPI24 VPI30</div><div class='del'>-VPO12 VPO24</div><div class='add'>+ACPI ADC0 ADC1 ADC10 ADC11 ADC12 ADC13 ADC14 ADC15 ADC2 ADC3 ADC4 ADC5 ADC6</div><div class='add'>+ADC7 ADC8 ADC9 BMCINT DDCCLK DDCDAT EXTRST FLACK FLBUSY FLWP GPID GPID0 GPID2</div><div class='add'>+GPID4 GPID6 GPIE0 GPIE2 GPIE4 GPIE6 I2C10 I2C11 I2C12 I2C13 I2C14 I2C3 I2C4</div><div class='add'>+I2C5 I2C6 I2C7 I2C8 I2C9 LPCPD LPCPME LPCRST LPCSMI MAC1LINK MAC2LINK MDIO1</div><div class='add'>+MDIO2 NCTS1 NCTS2 NCTS3 NCTS4 NDCD1 NDCD2 NDCD3 NDCD4 NDSR1 NDSR2 NDSR3 NDSR4</div><div class='add'>+NDTR1 NDTR2 NDTR3 NDTR4 NDTS4 NRI1 NRI2 NRI3 NRI4 NRTS1 NRTS2 NRTS3 OSCCLK PWM0</div><div class='add'>+PWM1 PWM2 PWM3 PWM4 PWM5 PWM6 PWM7 RGMII1 RGMII2 RMII1 RMII2 ROM16 ROM8 ROMCS1</div><div class='add'>+ROMCS2 ROMCS3 ROMCS4 RXD1 RXD2 RXD3 RXD4 SALT1 SALT2 SALT3 SALT4 SD1 SD2 SGPMCK</div><div class='add'>+SGPMI SGPMLD SGPMO SGPSCK SGPSI0 SGPSI1 SGPSLD SIOONCTRL SIOPBI SIOPBO SIOPWREQ</div><div class='add'>+SIOPWRGD SIOS3 SIOS5 SIOSCI SPI1 SPI1DEBUG SPI1PASSTHRU SPICS1 TIMER3 TIMER4</div><div class='add'>+TIMER5 TIMER6 TIMER7 TIMER8 TXD1 TXD2 TXD3 TXD4 UART6 USBCKI VGABIOS_ROM VGAHS</div><div class='add'>+VGAVS VPI18 VPI24 VPI30 VPO12 VPO24 WDTRST1 WDTRST2</div><div class='ctx'> </div><div class='ctx'> aspeed,ast2500-pinctrl, aspeed,g5-pinctrl:</div><div class='ctx'> </div><div class='del'>-GPID0 GPID2 GPIE0 I2C10 I2C11 I2C12 I2C13 I2C14 I2C3 I2C4 I2C5 I2C6 I2C7 I2C8</div><div class='del'>-I2C9 MAC1LINK MDIO1 MDIO2 OSCCLK PEWAKE PWM0 PWM1 PWM2 PWM3 PWM4 PWM5 PWM6 PWM7</div><div class='del'>-RGMII1 RGMII2 RMII1 RMII2 SD1 SPI1 SPI1DEBUG SPI1PASSTHRU TIMER4 TIMER5 TIMER6</div><div class='del'>-TIMER7 TIMER8 VGABIOSROM</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Examples:</div><div class='add'>+ACPI ADC0 ADC1 ADC10 ADC11 ADC12 ADC13 ADC14 ADC15 ADC2 ADC3 ADC4 ADC5 ADC6</div><div class='add'>+ADC7 ADC8 ADC9 BMCINT DDCCLK DDCDAT ESPI FWSPICS1 FWSPICS2 GPID0 GPID2 GPID4</div><div class='add'>+GPID6 GPIE0 GPIE2 GPIE4 GPIE6 I2C10 I2C11 I2C12 I2C13 I2C14 I2C3 I2C4 I2C5 I2C6</div><div class='add'>+I2C7 I2C8 I2C9 LAD0 LAD1 LAD2 LAD3 LCLK LFRAME LPCHC LPCPD LPCPLUS LPCPME</div><div class='add'>+LPCRST LPCSMI LSIRQ MAC1LINK MAC2LINK MDIO1 MDIO2 NCTS1 NCTS2 NCTS3 NCTS4 NDCD1</div><div class='add'>+NDCD2 NDCD3 NDCD4 NDSR1 NDSR2 NDSR3 NDSR4 NDTR1 NDTR2 NDTR3 NDTR4 NRI1 NRI2</div><div class='add'>+NRI3 NRI4 NRTS1 NRTS2 NRTS3 NRTS4 OSCCLK PEWAKE PNOR PWM0 PWM1 PWM2 PWM3 PWM4</div><div class='add'>+PWM5 PWM6 PWM7 RGMII1 RGMII2 RMII1 RMII2 RXD1 RXD2 RXD3 RXD4 SALT1 SALT10</div><div class='add'>+SALT11 SALT12 SALT13 SALT14 SALT2 SALT3 SALT4 SALT5 SALT6 SALT7 SALT8 SALT9</div><div class='add'>+SCL1 SCL2 SD1 SD2 SDA1 SDA2 SGPS1 SGPS2 SIOONCTRL SIOPBI SIOPBO SIOPWREQ</div><div class='add'>+SIOPWRGD SIOS3 SIOS5 SIOSCI SPI1 SPI1CS1 SPI1DEBUG SPI1PASSTHRU SPI2CK SPI2CS0</div><div class='add'>+SPI2CS1 SPI2MISO SPI2MOSI TIMER3 TIMER4 TIMER5 TIMER6 TIMER7 TIMER8 TXD1 TXD2</div><div class='add'>+TXD3 TXD4 UART6 USBCKI VGABIOSROM VGAHS VGAVS VPI24 VPO WDTRST1 WDTRST2</div><div class='add'>+</div><div class='add'>+Examples</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+g4 Example</div><div class='add'>+----------</div><div class='ctx'> </div><div class='ctx'> syscon: scu@1e6e2000 {</div><div class='del'>-	compatible = "syscon", "simple-mfd";</div><div class='add'>+	compatible = "aspeed,ast2400-scu", "syscon", "simple-mfd";</div><div class='ctx'> 	reg = &lt;0x1e6e2000 0x1a8&gt;;</div><div class='ctx'> </div><div class='ctx'> 	pinctrl: pinctrl {</div><div class='hunk'>@@ -63,5 +93,56 @@ syscon: scu@1e6e2000 {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+g5 Example</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+ahb {</div><div class='add'>+	apb {</div><div class='add'>+		syscon: scu@1e6e2000 {</div><div class='add'>+			compatible = "aspeed,ast2500-scu", "syscon", "simple-mfd";</div><div class='add'>+			reg = &lt;0x1e6e2000 0x1a8&gt;;</div><div class='add'>+</div><div class='add'>+			pinctrl: pinctrl {</div><div class='add'>+				compatible = "aspeed,g5-pinctrl";</div><div class='add'>+				aspeed,external-nodes = &lt;&amp;gfx &amp;lhc&gt;;</div><div class='add'>+</div><div class='add'>+				pinctrl_i2c3_default: i2c3_default {</div><div class='add'>+					function = "I2C3";</div><div class='add'>+					groups = "I2C3";</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gfx: display@1e6e6000 {</div><div class='add'>+			compatible = "aspeed,ast2500-gfx", "syscon";</div><div class='add'>+			reg = &lt;0x1e6e6000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lpc: lpc@1e789000 {</div><div class='add'>+		compatible = "aspeed,ast2500-lpc", "simple-mfd";</div><div class='add'>+		reg = &lt;0x1e789000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges = &lt;0x0 0x1e789000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+		lpc_host: lpc-host@80 {</div><div class='add'>+			compatible = "aspeed,ast2500-lpc-host", "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x80 0x1e0&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x80 0x1e0&gt;;</div><div class='add'>+</div><div class='add'>+			lhc: lhc@20 {</div><div class='add'>+			       compatible = "aspeed,ast2500-lhc";</div><div class='add'>+			       reg = &lt;0x20 0x24 0x48 0x8&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> Please refer to pinctrl-bindings.txt in this directory for details of the</div><div class='ctx'> common pinctrl bindings used by client devices.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt<br/>index b73c96d24f59..bf3f7b014724 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt</a></div><div class='hunk'>@@ -97,6 +97,11 @@ For example:</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> == Pin controller devices ==</div><div class='add'>+Required properties: See the pin controller driver specific documentation</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+#pinctrl-cells:	Number of pin control cells in addition to the index within the</div><div class='add'>+		pin controller device instance</div><div class='ctx'> </div><div class='ctx'> Pin controller devices should contain the pin configuration nodes that client</div><div class='ctx'> devices reference.</div><div class='hunk'>@@ -119,7 +124,8 @@ For example:</div><div class='ctx'> </div><div class='ctx'> The contents of each of those pin configuration child nodes is defined</div><div class='ctx'> entirely by the binding for the individual pin controller device. There</div><div class='del'>-exists no common standard for this content.</div><div class='add'>+exists no common standard for this content. The pinctrl framework only</div><div class='add'>+provides generic helper bindings that the pin controller driver can use.</div><div class='ctx'> </div><div class='ctx'> The pin configuration nodes need not be direct children of the pin controller</div><div class='ctx'> device; they may be grandchildren, for example. Whether this is legal, and</div><div class='hunk'>@@ -156,6 +162,42 @@ state_2_node_a {</div><div class='ctx'> 	pins = "mfio29", "mfio30";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+Optionally an altenative binding can be used if more suitable depending on the</div><div class='add'>+pin controller hardware. For hardaware where there is a large number of identical</div><div class='add'>+pin controller instances, naming each pin and function can easily become</div><div class='add'>+unmaintainable. This is especially the case if the same controller is used for</div><div class='add'>+different pins and functions depending on the SoC revision and packaging.</div><div class='add'>+</div><div class='add'>+For cases like this, the pin controller driver may use pinctrl-pin-array helper</div><div class='add'>+binding with a hardware based index and a number of pin configuration values:</div><div class='add'>+</div><div class='add'>+pincontroller {</div><div class='add'>+	... /* Standard DT properties for the device itself elided */</div><div class='add'>+	#pinctrl-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	state_0_node_a {</div><div class='add'>+		pinctrl-pin-array = &lt;</div><div class='add'>+			0 A_DELAY_PS(0) G_DELAY_PS(120)</div><div class='add'>+			4 A_DELAY_PS(0) G_DELAY_PS(360)</div><div class='add'>+			...</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+	...</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Above #pinctrl-cells specifies the number of value cells in addition to the</div><div class='add'>+index of the registers. This is similar to the interrupts-extended binding with</div><div class='add'>+one exception. There is no need to specify the phandle for each entry as that</div><div class='add'>+is already known as the defined pins are always children of the pin controller</div><div class='add'>+node. Further having the phandle pointing to another pin controller would not</div><div class='add'>+currently work as the pinctrl framework uses named modes to group pins for each</div><div class='add'>+pin control device.</div><div class='add'>+</div><div class='add'>+The index for pinctrl-pin-array must relate to the hardware for the pinctrl</div><div class='add'>+registers, and must not be a virtual index of pin instances. The reason for</div><div class='add'>+this is to avoid mapping of the index in the dts files and the pin controller</div><div class='add'>+driver as it can change.</div><div class='add'>+</div><div class='ctx'> == Generic pin configuration node content ==</div><div class='ctx'> </div><div class='ctx'> Many data items that are represented in a pin configuration node are common</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt<br/>index caf297bee1fb..c28d4eb83b76 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt</a></div><div class='hunk'>@@ -35,6 +35,15 @@ Optional properties:</div><div class='ctx'> - ti,palmas-enable-dvfs2: Enable DVFS2. Configure pins for DVFS2 mode.</div><div class='ctx'> 	Selection primary or secondary function associated to GPADC_START</div><div class='ctx'> 	and SYSEN2 pin/pad for DVFS2 interface</div><div class='add'>+- ti,palmas-override-powerhold: This is applicable for PMICs for which</div><div class='add'>+	GPIO7 is configured in POWERHOLD mode which has higher priority</div><div class='add'>+	over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON</div><div class='add'>+	bit is turned off. This property enables driver to over ride the</div><div class='add'>+	POWERHOLD value to GPIO7 so as to turn off the PMIC in power off</div><div class='add'>+	scenarios. So for GPIO7 if ti,palmas-override-powerhold is set</div><div class='add'>+	then the GPIO_7 field should never be muxed to anything else.</div><div class='add'>+	It should be set to POWERHOLD by default and only in case of</div><div class='add'>+	power off scenarios the driver will over ride the mux value.</div><div class='ctx'> </div><div class='ctx'> This binding uses the following generic properties as defined in</div><div class='ctx'> pinctrl-bindings.txt:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt<br/>index 66dcaa9efd74..e705acd3612c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt</a></div><div class='hunk'>@@ -7,6 +7,9 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> - reg : offset and length of the register set for the mux registers</div><div class='ctx'> </div><div class='add'>+- #pinctrl-cells : number of cells in addition to the index, set to 1</div><div class='add'>+  for pinctrl-single,pins and 2 for pinctrl-single,bits</div><div class='add'>+</div><div class='ctx'> - pinctrl-single,register-width : pinmux register access width in bits</div><div class='ctx'> </div><div class='ctx'> - pinctrl-single,function-mask : mask of allowed pinmux function bits</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt<br/>new file mode 100644<br/>index 000000000000..bf76867168e9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+SEMTECH SX150x GPIO expander bindings</div><div class='add'>+</div><div class='add'>+Please refer to pinctrl-bindings.txt, ../gpio/gpio.txt, and</div><div class='add'>+../interrupt-controller/interrupts.txt for generic information regarding</div><div class='add'>+pin controller, GPIO, and interrupt bindings.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be one of :</div><div class='add'>+			"semtech,sx1501q",</div><div class='add'>+			"semtech,sx1502q",</div><div class='add'>+			"semtech,sx1503q",</div><div class='add'>+			"semtech,sx1504q",</div><div class='add'>+			"semtech,sx1505q",</div><div class='add'>+			"semtech,sx1506q",</div><div class='add'>+			"semtech,sx1507q",</div><div class='add'>+			"semtech,sx1508q",</div><div class='add'>+			"semtech,sx1509q".</div><div class='add'>+</div><div class='add'>+- reg: The I2C slave address for this device.</div><div class='add'>+</div><div class='add'>+- #gpio-cells: Should be 2. The first cell is the GPIO number and the</div><div class='add'>+		second cell is used to specify optional parameters:</div><div class='add'>+		bit 0: polarity (0: normal, 1: inverted)</div><div class='add'>+</div><div class='add'>+- gpio-controller: Marks the device as a GPIO controller.</div><div class='add'>+</div><div class='add'>+Optional properties :</div><div class='add'>+- interrupt-parent: phandle of the parent interrupt controller.</div><div class='add'>+</div><div class='add'>+- interrupts: Interrupt specifier for the controllers interrupt.</div><div class='add'>+</div><div class='add'>+- interrupt-controller: Marks the device as a interrupt controller.</div><div class='add'>+</div><div class='add'>+- semtech,probe-reset: Will trigger a reset of the GPIO expander on probe,</div><div class='add'>+		only for sx1507q, sx1508q and sx1509q</div><div class='add'>+</div><div class='add'>+The GPIO expander can optionally be used as an interrupt controller, in</div><div class='add'>+which case it uses the default two cell specifier.</div><div class='add'>+</div><div class='add'>+Required properties for pin configuration sub-nodes:</div><div class='add'>+ - pins: List of pins to which the configuration applies.</div><div class='add'>+</div><div class='add'>+Optional properties for pin configuration sub-nodes:</div><div class='add'>+----------------------------------------------------</div><div class='add'>+ - bias-disable: disable any pin bias, except the OSCIO pin</div><div class='add'>+ - bias-pull-up: pull up the pin, except the OSCIO pin</div><div class='add'>+ - bias-pull-down: pull down the pin, except the OSCIO pin</div><div class='add'>+ - bias-pull-pin-default: use pin-default pull state, except the OSCIO pin</div><div class='add'>+ - drive-push-pull: drive actively high and low</div><div class='add'>+ - drive-open-drain: drive with open drain only for sx1507q, sx1508q and sx1509q and except the OSCIO pin</div><div class='add'>+ - output-low: set the pin to output mode with low level</div><div class='add'>+ - output-high: set the pin to output mode with high level</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	i2c0gpio-expander@20{</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		compatible = "semtech,sx1506q";</div><div class='add'>+		reg = &lt;0x20&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio_1&gt;;</div><div class='add'>+		interrupts = &lt;16 0&gt;;</div><div class='add'>+</div><div class='add'>+		gpio-controller;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;gpio1_cfg_pins&gt;;</div><div class='add'>+</div><div class='add'>+		gpio1_cfg_pins: gpio1-cfg {</div><div class='add'>+			pins = "gpio1";</div><div class='add'>+			bias-pull-up;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt<br/>new file mode 100644<br/>index 000000000000..13cd629f896e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt</a></div><div class='hunk'>@@ -0,0 +1,177 @@</div><div class='add'>+Qualcomm MSM8994 TLMM block</div><div class='add'>+</div><div class='add'>+This binding describes the Top Level Mode Multiplexer block found in the</div><div class='add'>+MSM8994 platform.</div><div class='add'>+</div><div class='add'>+- compatible:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;string&gt;</div><div class='add'>+	Definition: Should contain one of:</div><div class='add'>+		    "qcom,msm8992-pinctrl",</div><div class='add'>+		    "qcom,msm8994-pinctrl".</div><div class='add'>+</div><div class='add'>+- reg:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: the base address and size of the TLMM register space.</div><div class='add'>+</div><div class='add'>+- interrupts:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: should specify the TLMM summary IRQ.</div><div class='add'>+</div><div class='add'>+- interrupt-controller:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;none&gt;</div><div class='add'>+	Definition: identifies this node as an interrupt controller</div><div class='add'>+</div><div class='add'>+- #interrupt-cells:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;u32&gt;</div><div class='add'>+	Definition: must be 2. Specifying the pin number and flags, as defined</div><div class='add'>+		    in &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+</div><div class='add'>+- gpio-controller:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;none&gt;</div><div class='add'>+	Definition: identifies this node as a gpio controller</div><div class='add'>+</div><div class='add'>+- #gpio-cells:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;u32&gt;</div><div class='add'>+	Definition: must be 2. Specifying the pin number and flags, as defined</div><div class='add'>+		    in &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for</div><div class='add'>+a general description of GPIO and interrupt bindings.</div><div class='add'>+</div><div class='add'>+Please refer to pinctrl-bindings.txt in this directory for details of the</div><div class='add'>+common pinctrl bindings used by client devices, including the meaning of the</div><div class='add'>+phrase "pin configuration node".</div><div class='add'>+</div><div class='add'>+The pin configuration nodes act as a container for an arbitrary number of</div><div class='add'>+subnodes. Each of these subnodes represents some desired configuration for a</div><div class='add'>+pin, a group, or a list of pins or groups. This configuration can include the</div><div class='add'>+mux function to select on those pin(s)/group(s), and various pin configuration</div><div class='add'>+parameters, such as pull-up, drive strength, etc.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PIN CONFIGURATION NODES:</div><div class='add'>+</div><div class='add'>+The name of each subnode is not important; all subnodes should be enumerated</div><div class='add'>+and processed purely based on their content.</div><div class='add'>+</div><div class='add'>+Each subnode only affects those parameters that are explicitly listed. In</div><div class='add'>+other words, a subnode that lists a mux function but no pin configuration</div><div class='add'>+parameters implies no information about any pin configuration parameters.</div><div class='add'>+Similarly, a pin subnode that describes a pullup parameter implies no</div><div class='add'>+information about e.g. the mux function.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The following generic properties as defined in pinctrl-bindings.txt are valid</div><div class='add'>+to specify in a pin configuration subnode:</div><div class='add'>+</div><div class='add'>+- pins:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;string-array&gt;</div><div class='add'>+	Definition: List of gpio pins affected by the properties specified in</div><div class='add'>+		    this subnode.</div><div class='add'>+</div><div class='add'>+		    Valid pins are:</div><div class='add'>+		      gpio0-gpio145</div><div class='add'>+		        Supports mux, bias and drive-strength</div><div class='add'>+</div><div class='add'>+		      sdc1_clk, sdc1_cmd, sdc1_data sdc1_rclk, sdc2_clk,</div><div class='add'>+		      sdc2_cmd, sdc2_data</div><div class='add'>+		        Supports bias and drive-strength</div><div class='add'>+</div><div class='add'>+- function:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;string&gt;</div><div class='add'>+	Definition: Specify the alternative function to be configured for the</div><div class='add'>+		    specified pins. Functions are only valid for gpio pins.</div><div class='add'>+		    Valid values are:</div><div class='add'>+</div><div class='add'>+		    audio_ref_clk,  blsp_i2c1, blsp_i2c2, blsp_i2c3, blsp_i2c4, blsp_i2c5,</div><div class='add'>+		    blsp_i2c6, blsp_i2c7, blsp_i2c8, blsp_i2c9, blsp_i2c10, blsp_i2c11,</div><div class='add'>+		    blsp_i2c12, blsp_spi1, blsp_spi1_cs1, blsp_spi1_cs2, blsp_spi1_cs3,</div><div class='add'>+		    blsp_spi2, blsp_spi2_cs1, blsp_spi2_cs2, blsp_spi2_cs3, blsp_spi3,</div><div class='add'>+		    blsp_spi4, blsp_spi5, blsp_spi6, blsp_spi7, blsp_spi8, blsp_spi9,</div><div class='add'>+		    blsp_spi10, blsp_spi10_cs1, blsp_spi10_cs2, blsp_spi10_cs3, blsp_spi11,</div><div class='add'>+		    blsp_spi12, blsp_uart1, blsp_uart2, blsp_uart3, blsp_uart4, blsp_uart5,</div><div class='add'>+		    blsp_uart6, blsp_uart7, blsp_uart8, blsp_uart9, blsp_uart10, blsp_uart11,</div><div class='add'>+		    blsp_uart12, blsp_uim1, blsp_uim2, blsp_uim3, blsp_uim4, blsp_uim5,</div><div class='add'>+		    blsp_uim6, blsp_uim7, blsp_uim8, blsp_uim9, blsp_uim10, blsp_uim11,</div><div class='add'>+		    blsp_uim12, blsp11_i2c_scl_b, blsp11_i2c_sda_b, blsp11_uart_rx_b,</div><div class='add'>+		    blsp11_uart_tx_b, cam_mclk0, cam_mclk1, cam_mclk2, cam_mclk3,</div><div class='add'>+		    cci_async_in0, cci_async_in1, cci_async_in2, cci_i2c0, cci_i2c1,</div><div class='add'>+		    cci_timer0, cci_timer1, cci_timer2, cci_timer3, cci_timer4,</div><div class='add'>+		    gcc_gp1_clk_a, gcc_gp1_clk_b, gcc_gp2_clk_a, gcc_gp2_clk_b, gcc_gp3_clk_a,</div><div class='add'>+		    gcc_gp3_clk_b, gp_mn, gp_pdm0, gp_pdm1, gp_pdm2, gp0_clk,</div><div class='add'>+		    gp1_clk, gps_tx, gsm_tx, hdmi_cec, hdmi_ddc, hdmi_hpd, hdmi_rcv,</div><div class='add'>+		    mdp_vsync, mss_lte, nav_pps, nav_tsync, qdss_cti_trig_in_a,</div><div class='add'>+		    qdss_cti_trig_in_b, qdss_cti_trig_in_c, qdss_cti_trig_in_d,</div><div class='add'>+		    qdss_cti_trig_out_a, qdss_cti_trig_out_b, qdss_cti_trig_out_c,</div><div class='add'>+		    qdss_cti_trig_out_d, qdss_traceclk_a, qdss_traceclk_b, qdss_tracectl_a,</div><div class='add'>+		    qdss_tracectl_b, qdss_tracedata_a, qdss_tracedata_b, qua_mi2s, pci_e0,</div><div class='add'>+		    pci_e1, pri_mi2s, sdc4, sec_mi2s, slimbus, spkr_i2s, ter_mi2s, tsif1,</div><div class='add'>+		    tsif2, uim_batt_alarm, uim1, uim2, uim3, uim4, gpio</div><div class='add'>+</div><div class='add'>+- bias-disable:</div><div class='add'>+	Usage: optional</div><div class='add'>+	Value type: &lt;none&gt;</div><div class='add'>+	Definition: The specified pins should be configued as no pull.</div><div class='add'>+</div><div class='add'>+- bias-pull-down:</div><div class='add'>+	Usage: optional</div><div class='add'>+	Value type: &lt;none&gt;</div><div class='add'>+	Definition: The specified pins should be configued as pull down.</div><div class='add'>+</div><div class='add'>+- bias-pull-up:</div><div class='add'>+	Usage: optional</div><div class='add'>+	Value type: &lt;none&gt;</div><div class='add'>+	Definition: The specified pins should be configued as pull up.</div><div class='add'>+</div><div class='add'>+- output-high:</div><div class='add'>+	Usage: optional</div><div class='add'>+	Value type: &lt;none&gt;</div><div class='add'>+	Definition: The specified pins are configured in output mode, driven</div><div class='add'>+		    high.</div><div class='add'>+		    Not valid for sdc pins.</div><div class='add'>+</div><div class='add'>+- output-low:</div><div class='add'>+	Usage: optional</div><div class='add'>+	Value type: &lt;none&gt;</div><div class='add'>+	Definition: The specified pins are configured in output mode, driven</div><div class='add'>+		    low.</div><div class='add'>+		    Not valid for sdc pins.</div><div class='add'>+</div><div class='add'>+- drive-strength:</div><div class='add'>+	Usage: optional</div><div class='add'>+	Value type: &lt;u32&gt;</div><div class='add'>+	Definition: Selects the drive strength for the specified pins, in mA.</div><div class='add'>+		    Valid values are: 2, 4, 6, 8, 10, 12, 14 and 16</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	msmgpio: pinctrl@fd510000 {</div><div class='add'>+		compatible = "qcom,msm8994-pinctrl";</div><div class='add'>+		reg = &lt;0xfd510000 0x4000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		blsp1_uart2_default: blsp1_uart2_default {</div><div class='add'>+			pinmux {</div><div class='add'>+				pins = "gpio4", "gpio5";</div><div class='add'>+				function = "blsp_uart2";</div><div class='add'>+			};</div><div class='add'>+			pinconf {</div><div class='add'>+				pins = "gpio4", "gpio5";</div><div class='add'>+				drive-strength = &lt;16&gt;;</div><div class='add'>+				bias-disable;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt<br/>index c68b9554561f..4722bc61a1a2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt</a></div><div class='hunk'>@@ -19,10 +19,11 @@ The pins are grouped into up to 5 individual pin banks which need to be</div><div class='ctx'> defined as gpio sub-nodes of the pinmux controller.</div><div class='ctx'> </div><div class='ctx'> Required properties for iomux controller:</div><div class='del'>-  - compatible: one of "rockchip,rk2928-pinctrl", "rockchip,rk3066a-pinctrl"</div><div class='del'>-		       "rockchip,rk3066b-pinctrl", "rockchip,rk3188-pinctrl"</div><div class='del'>-		       "rockchip,rk3228-pinctrl", "rockchip,rk3288-pinctrl"</div><div class='del'>-		       "rockchip,rk3368-pinctrl", "rockchip,rk3399-pinctrl"</div><div class='add'>+  - compatible: one of "rockchip,rk1108-pinctrl", "rockchip,rk2928-pinctrl"</div><div class='add'>+		       "rockchip,rk3066a-pinctrl", "rockchip,rk3066b-pinctrl"</div><div class='add'>+		       "rockchip,rk3188-pinctrl", "rockchip,rk3228-pinctrl"</div><div class='add'>+		       "rockchip,rk3288-pinctrl", "rockchip,rk3368-pinctrl"</div><div class='add'>+		       "rockchip,rk3399-pinctrl"</div><div class='ctx'>   - rockchip,grf: phandle referencing a syscon providing the</div><div class='ctx'> 	 "general register files"</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt<br/>index d49e22d2a8b5..5e00a21de2bf 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt</a></div><div class='hunk'>@@ -13,17 +13,37 @@ Required Properties:</div><div class='ctx'>   - "samsung,s3c2450-pinctrl": for S3C2450-compatible pin-controller,</div><div class='ctx'>   - "samsung,s3c64xx-pinctrl": for S3C64xx-compatible pin-controller,</div><div class='ctx'>   - "samsung,s5pv210-pinctrl": for S5PV210-compatible pin-controller,</div><div class='add'>+  - "samsung,exynos3250-pinctrl": for Exynos3250 compatible pin-controller.</div><div class='ctx'>   - "samsung,exynos4210-pinctrl": for Exynos4210 compatible pin-controller.</div><div class='ctx'>   - "samsung,exynos4x12-pinctrl": for Exynos4x12 compatible pin-controller.</div><div class='ctx'>   - "samsung,exynos5250-pinctrl": for Exynos5250 compatible pin-controller.</div><div class='ctx'>   - "samsung,exynos5260-pinctrl": for Exynos5260 compatible pin-controller.</div><div class='ctx'>   - "samsung,exynos5410-pinctrl": for Exynos5410 compatible pin-controller.</div><div class='ctx'>   - "samsung,exynos5420-pinctrl": for Exynos5420 compatible pin-controller.</div><div class='add'>+  - "samsung,exynos5433-pinctrl": for Exynos5433 compatible pin-controller.</div><div class='ctx'>   - "samsung,exynos7-pinctrl": for Exynos7 compatible pin-controller.</div><div class='ctx'> </div><div class='ctx'> - reg: Base address of the pin controller hardware module and length of</div><div class='ctx'>   the address space it occupies.</div><div class='ctx'> </div><div class='add'>+  - reg: Second base address of the pin controller if the specific registers</div><div class='add'>+  of the pin controller are separated into the different base address.</div><div class='add'>+</div><div class='add'>+	Eg: GPF[1-5] of Exynos5433 are separated into the two base address.</div><div class='add'>+	- First base address is for GPAx and GPF[1-5] external interrupt</div><div class='add'>+	  registers.</div><div class='add'>+	- Second base address is for GPF[1-5] pinctrl registers.</div><div class='add'>+</div><div class='add'>+	pinctrl_0: pinctrl@10580000 {</div><div class='add'>+		compatible = "samsung,exynos5433-pinctrl";</div><div class='add'>+		reg = &lt;0x10580000 0x1a20&gt;, &lt;0x11090000 0x100&gt;;</div><div class='add'>+</div><div class='add'>+		wakeup-interrupt-controller {</div><div class='add'>+			compatible = "samsung,exynos7-wakeup-eint";</div><div class='add'>+			interrupts = &lt;0 16 0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> - Pin banks as child nodes: Pin banks of the controller are represented by child</div><div class='ctx'>   nodes of the controller node. Bank name is taken from name of the node. Each</div><div class='ctx'>   bank node must contain following properties:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt<br/>index b24583aa34c3..eac20aa33907 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt</a></div><div class='hunk'>@@ -8,8 +8,9 @@ controllers onto these pads.</div><div class='ctx'> Pin controller node:</div><div class='ctx'> Required properies:</div><div class='ctx'>  - compatible: value should be one of the following:</div><div class='del'>-   (a) "st,stm32f429-pinctrl"</div><div class='del'>-   (b) "st,stm32f746-pinctrl"</div><div class='add'>+   "st,stm32f429-pinctrl"</div><div class='add'>+   "st,stm32f746-pinctrl"</div><div class='add'>+   "st,stm32h743-pinctrl"</div><div class='ctx'>  - #address-cells: The value of this property must be 1</div><div class='ctx'>  - #size-cells	: The value of this property must be 1</div><div class='ctx'>  - ranges	: defines mapping between pin controller node (parent) to</div><div class='hunk'>@@ -37,8 +38,23 @@ Optional properties:</div><div class='ctx'>  - st,syscfg: Should be phandle/offset pair. The phandle to the syscon node</div><div class='ctx'>    which includes IRQ mux selection register, and the offset of the IRQ mux</div><div class='ctx'>    selection register.</div><div class='add'>+ - ngpios: Number of gpios in a bank (to use if bank gpio numbers is less</div><div class='add'>+   than 16).</div><div class='add'>+ - gpio-ranges: Define a dedicated mapping between a pin-controller and</div><div class='add'>+   a gpio controller. Format is &lt;&amp;phandle a b c&gt; with:</div><div class='add'>+	-(phandle): phandle of pin-controller.</div><div class='add'>+	-(a): gpio base offset in range.</div><div class='add'>+	-(b): pin base offset in range.</div><div class='add'>+	-(c): gpio count in range</div><div class='add'>+   This entry has to be used either if there are holes inside a bank:</div><div class='add'>+	GPIOB0/B1/B2/B14/B15 (see example 2)</div><div class='add'>+   or if banks are not contiguous:</div><div class='add'>+	GPIOA/B/C/E...</div><div class='add'>+   NOTE: If "gpio-ranges" is used for a gpio controller, all gpio-controller</div><div class='add'>+   have to use a "gpio-ranges" entry.</div><div class='add'>+   More details in Documentation/devicetree/bindings/gpio/gpio.txt.</div><div class='ctx'> </div><div class='del'>-Example:</div><div class='add'>+Example 1:</div><div class='ctx'> #include &lt;dt-bindings/pinctrl/stm32f429-pinfunc.h&gt;</div><div class='ctx'> ...</div><div class='ctx'> </div><div class='hunk'>@@ -60,6 +76,43 @@ Example:</div><div class='ctx'> 		pin-functions nodes follow...</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+Example 2:</div><div class='add'>+#include &lt;dt-bindings/pinctrl/stm32f429-pinfunc.h&gt;</div><div class='add'>+...</div><div class='add'>+</div><div class='add'>+	pinctrl: pin-controller {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "st,stm32f429-pinctrl";</div><div class='add'>+		ranges = &lt;0 0x40020000 0x3000&gt;;</div><div class='add'>+		pins-are-numbered;</div><div class='add'>+</div><div class='add'>+		gpioa: gpio@40020000 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			reg = &lt;0x0 0x400&gt;;</div><div class='add'>+			resets = &lt;&amp;reset_ahb1 0&gt;;</div><div class='add'>+			st,bank-name = "GPIOA";</div><div class='add'>+			gpio-ranges = &lt;&amp;pinctrl 0 0 16&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpiob: gpio@40020400 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			reg = &lt;0x0 0x400&gt;;</div><div class='add'>+			resets = &lt;&amp;reset_ahb1 0&gt;;</div><div class='add'>+			st,bank-name = "GPIOB";</div><div class='add'>+			ngpios = 4;</div><div class='add'>+			gpio-ranges = &lt;&amp;pinctrl 0 16 3&gt;,</div><div class='add'>+				      &lt;&amp;pinctrl 14 30 2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		...</div><div class='add'>+		pin-functions nodes follow...</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Contents of function subnode node:</div><div class='ctx'> ----------------------------------</div><div class='ctx'> Subnode format</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/ti,da850-pupd.txt b/Documentation/devicetree/bindings/pinctrl/ti,da850-pupd.txt<br/>new file mode 100644<br/>index 000000000000..7f2980567c9f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/ti,da850-pupd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/ti,da850-pupd.txt</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+* Pin configuration for TI DA850/OMAP-L138/AM18x</div><div class='add'>+</div><div class='add'>+These SoCs have a separate controller for setting bias (internal pullup/down).</div><div class='add'>+Bias can only be selected for groups rather than individual pins.</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+  - compatible: Must be "ti,da850-pupd"</div><div class='add'>+  - reg: Base address and length of the memory resource used by the pullup/down</div><div class='add'>+    controller hardware module.</div><div class='add'>+</div><div class='add'>+The controller node also acts as a container for pin group configuration nodes.</div><div class='add'>+The names of these groups are ignored.</div><div class='add'>+</div><div class='add'>+Pin Group Node Properties:</div><div class='add'>+</div><div class='add'>+- groups: An array of strings, each string containing the name of a pin group.</div><div class='add'>+          Valid names are "cp0".."cp31".</div><div class='add'>+</div><div class='add'>+The pin configuration parameters use the generic pinconf bindings defined in</div><div class='add'>+pinctrl-bindings.txt in this directory. The supported parameters are</div><div class='add'>+bias-disable, bias-pull-up, bias-pull-down.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+In common dtsi file:</div><div class='add'>+</div><div class='add'>+	pinconf: pin-controller@22c00c {</div><div class='add'>+		compatible = "ti,da850-pupd";</div><div class='add'>+		reg = &lt;0x22c00c 0x8&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+In board-specific file:</div><div class='add'>+</div><div class='add'>+	&amp;pinconf {</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinconf_bias_groups&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+		pinconf_bias_groups: bias-groups {</div><div class='add'>+			pull-up {</div><div class='add'>+				groups = "cp30", "cp31";</div><div class='add'>+				bias-pull-up;</div><div class='add'>+			};</div><div class='add'>+			pull-down {</div><div class='add'>+				groups = "cp29", "cp28";</div><div class='add'>+				bias-pull-down;</div><div class='add'>+			};</div><div class='add'>+			disable {</div><div class='add'>+				groups = "cp27", "cp26";</div><div class='add'>+				bias-disable;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pinctrl/ti,iodelay.txt b/Documentation/devicetree/bindings/pinctrl/ti,iodelay.txt<br/>new file mode 100644<br/>index 000000000000..c3ed1232b6a3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pinctrl/ti,iodelay.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pinctrl/ti,iodelay.txt</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+* Pin configuration for TI IODELAY controller</div><div class='add'>+</div><div class='add'>+TI dra7 based SoCs such as am57xx have a controller for setting the IO delay</div><div class='add'>+for each pin. For most part the IO delay values are programmed by the bootloader,</div><div class='add'>+but some pins need to be configured dynamically by the kernel such as the</div><div class='add'>+MMC pins.</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+  - compatible: Must be "ti,dra7-iodelay"</div><div class='add'>+  - reg: Base address and length of the memory resource used</div><div class='add'>+  - #address-cells: Number of address cells</div><div class='add'>+  - #size-cells: Size of cells</div><div class='add'>+  - #pinctrl-cells: Number of pinctrl cells, must be 2. See also</div><div class='add'>+    Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt</div><div class='add'>+</div><div class='add'>+Example</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+In the SoC specific dtsi file:</div><div class='add'>+</div><div class='add'>+	dra7_iodelay_core: padconf@4844a000 {</div><div class='add'>+		compatible = "ti,dra7-iodelay";</div><div class='add'>+		reg = &lt;0x4844a000 0x0d1c&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#pinctrl-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+In board-specific file:</div><div class='add'>+</div><div class='add'>+&amp;dra7_iodelay_core {</div><div class='add'>+	mmc2_iodelay_3v3_conf: mmc2_iodelay_3v3_conf {</div><div class='add'>+		pinctrl-pin-array = &lt;</div><div class='add'>+		0x18c A_DELAY_PS(0) G_DELAY_PS(120)	/* CFG_GPMC_A19_IN */</div><div class='add'>+		0x1a4 A_DELAY_PS(265) G_DELAY_PS(360)	/* CFG_GPMC_A20_IN */</div><div class='add'>+		0x1b0 A_DELAY_PS(0) G_DELAY_PS(120)	/* CFG_GPMC_A21_IN */</div><div class='add'>+		0x1bc A_DELAY_PS(0) G_DELAY_PS(120)	/* CFG_GPMC_A22_IN */</div><div class='add'>+		0x1c8 A_DELAY_PS(287) G_DELAY_PS(420)	/* CFG_GPMC_A23_IN */</div><div class='add'>+		0x1d4 A_DELAY_PS(144) G_DELAY_PS(240)	/* CFG_GPMC_A24_IN */</div><div class='add'>+		0x1e0 A_DELAY_PS(0) G_DELAY_PS(0)	/* CFG_GPMC_A25_IN */</div><div class='add'>+		0x1ec A_DELAY_PS(120) G_DELAY_PS(0)	/* CFG_GPMC_A26_IN */</div><div class='add'>+		0x1f8 A_DELAY_PS(120) G_DELAY_PS(180)	/* CFG_GPMC_A27_IN */</div><div class='add'>+		0x360 A_DELAY_PS(0) G_DELAY_PS(0)	/* CFG_GPMC_CS1_IN */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/domain-idle-state.txt b/Documentation/devicetree/bindings/power/domain-idle-state.txt<br/>new file mode 100644<br/>index 000000000000..eefc7ed22ca2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/domain-idle-state.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/domain-idle-state.txt</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+PM Domain Idle State Node:</div><div class='add'>+</div><div class='add'>+A domain idle state node represents the state parameters that will be used to</div><div class='add'>+select the state when there are no active components in the domain.</div><div class='add'>+</div><div class='add'>+The state node has the following parameters -</div><div class='add'>+</div><div class='add'>+- compatible:</div><div class='add'>+	Usage: Required</div><div class='add'>+	Value type: &lt;string&gt;</div><div class='add'>+	Definition: Must be "domain-idle-state".</div><div class='add'>+</div><div class='add'>+- entry-latency-us</div><div class='add'>+	Usage: Required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: u32 value representing worst case latency in</div><div class='add'>+		    microseconds required to enter the idle state.</div><div class='add'>+		    The exit-latency-us duration may be guaranteed</div><div class='add'>+		    only after entry-latency-us has passed.</div><div class='add'>+</div><div class='add'>+- exit-latency-us</div><div class='add'>+	Usage: Required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: u32 value representing worst case latency</div><div class='add'>+		    in microseconds required to exit the idle state.</div><div class='add'>+</div><div class='add'>+- min-residency-us</div><div class='add'>+	Usage: Required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: u32 value representing minimum residency duration</div><div class='add'>+		    in microseconds after which the idle state will yield</div><div class='add'>+		    power benefits after overcoming the overhead in entering</div><div class='add'>+i		    the idle state.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/pd-samsung.txt b/Documentation/devicetree/bindings/power/pd-samsung.txt<br/>index 4e947372a693..549f7dee9b9d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/pd-samsung.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/power/pd-samsung.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/pd-samsung.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/pd-samsung.txt</a></div><div class='hunk'>@@ -6,12 +6,15 @@ to gate power to one or more peripherals on the processor.</div><div class='ctx'> Required Properties:</div><div class='ctx'> - compatible: should be one of the following.</div><div class='ctx'>     * samsung,exynos4210-pd - for exynos4210 type power domain.</div><div class='add'>+    * samsung,exynos5433-pd - for exynos5433 type power domain.</div><div class='ctx'> - reg: physical base address of the controller and length of memory mapped</div><div class='ctx'>     region.</div><div class='ctx'> - #power-domain-cells: number of cells in power domain specifier;</div><div class='ctx'>     must be 0.</div><div class='ctx'> </div><div class='ctx'> Optional Properties:</div><div class='add'>+- label: Human readable string with domain name. Will be visible in userspace</div><div class='add'>+	to let user to distinguish between multiple domains in SoC.</div><div class='ctx'> - clocks: List of clock handles. The parent clocks of the input clocks to the</div><div class='ctx'> 	devices in this power domain are set to oscclk before power gating</div><div class='ctx'> 	and restored back after powering on a domain. This is required for</div><div class='hunk'>@@ -20,7 +23,7 @@ Optional Properties:</div><div class='ctx'> - clock-names: The following clocks can be specified:</div><div class='ctx'> 	- oscclk: Oscillator clock.</div><div class='ctx'> 	- clkN: Input clocks to the devices in this power domain. These clocks</div><div class='del'>-		will be reparented to oscclk before swithing power domain off.</div><div class='add'>+		will be reparented to oscclk before switching power domain off.</div><div class='ctx'> 		Their original parent will be brought back after turning on</div><div class='ctx'> 		the domain. Maximum of 4 clocks (N = 0 to 3) are supported.</div><div class='ctx'> 	- asbN: Clocks required by asynchronous bridges (ASB) present in</div><div class='hunk'>@@ -38,6 +41,7 @@ Example:</div><div class='ctx'> 		compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 		reg = &lt;0x10023C00 0x10&gt;;</div><div class='ctx'> 		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		label = "LCD0";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mfc_pd: power-domain@10044060 {</div><div class='hunk'>@@ -46,6 +50,7 @@ Example:</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_FIN_PLL&gt;, &lt;&amp;clock CLK_MOUT_USER_ACLK333&gt;;</div><div class='ctx'> 		clock-names = "oscclk", "clk0";</div><div class='ctx'> 		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		label = "MFC";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> See Documentation/devicetree/bindings/power/power_domain.txt for description</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/power_domain.txt b/Documentation/devicetree/bindings/power/power_domain.txt<br/>index 025b5e7df61c..723e1ad937da 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/power_domain.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/power/power_domain.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/power_domain.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/power_domain.txt</a></div><div class='hunk'>@@ -29,6 +29,15 @@ Optional properties:</div><div class='ctx'>    specified by this binding. More details about power domain specifier are</div><div class='ctx'>    available in the next section.</div><div class='ctx'> </div><div class='add'>+- domain-idle-states : A phandle of an idle-state that shall be soaked into a</div><div class='add'>+                generic domain power state. The idle state definitions are</div><div class='add'>+                compatible with domain-idle-state specified in [1].</div><div class='add'>+  The domain-idle-state property reflects the idle state of this PM domain and</div><div class='add'>+  not the idle states of the devices or sub-domains in the PM domain. Devices</div><div class='add'>+  and sub-domains have their own idle-states independent of the parent</div><div class='add'>+  domain's idle states. In the absence of this property, the domain would be</div><div class='add'>+  considered as capable of being powered-on or powered-off.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	power: power-controller@12340000 {</div><div class='hunk'>@@ -59,6 +68,38 @@ The nodes above define two power controllers: 'parent' and 'child'.</div><div class='ctx'> Domains created by the 'child' power controller are subdomains of '0' power</div><div class='ctx'> domain provided by the 'parent' power controller.</div><div class='ctx'> </div><div class='add'>+Example 3:</div><div class='add'>+	parent: power-controller@12340000 {</div><div class='add'>+		compatible = "foo,power-controller";</div><div class='add'>+		reg = &lt;0x12340000 0x1000&gt;;</div><div class='add'>+		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		domain-idle-states = &lt;&amp;DOMAIN_RET&gt;, &lt;&amp;DOMAIN_PWR_DN&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	child: power-controller@12341000 {</div><div class='add'>+		compatible = "foo,power-controller";</div><div class='add'>+		reg = &lt;0x12341000 0x1000&gt;;</div><div class='add'>+		power-domains = &lt;&amp;parent 0&gt;;</div><div class='add'>+		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		domain-idle-states = &lt;&amp;DOMAIN_PWR_DN&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	DOMAIN_RET: state@0 {</div><div class='add'>+		compatible = "domain-idle-state";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		entry-latency-us = &lt;1000&gt;;</div><div class='add'>+		exit-latency-us = &lt;2000&gt;;</div><div class='add'>+		min-residency-us = &lt;10000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	DOMAIN_PWR_DN: state@1 {</div><div class='add'>+		compatible = "domain-idle-state";</div><div class='add'>+		reg = &lt;0x1&gt;;</div><div class='add'>+		entry-latency-us = &lt;5000&gt;;</div><div class='add'>+		exit-latency-us = &lt;8000&gt;;</div><div class='add'>+		min-residency-us = &lt;7000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> ==PM domain consumers==</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='hunk'>@@ -76,3 +117,5 @@ Example:</div><div class='ctx'> The node above defines a typical PM domain consumer device, which is located</div><div class='ctx'> inside a PM domain with index 0 of a power controller represented by a node</div><div class='ctx'> with the label "power".</div><div class='add'>+</div><div class='add'>+[1]. Documentation/devicetree/bindings/power/domain-idle-state.txt</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt b/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt<br/>index 0725fb37a973..d91715bc8d52 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt</a></div><div class='hunk'>@@ -1,12 +1,14 @@</div><div class='del'>-DT bindings for the Renesas R-Car System Controller</div><div class='add'>+DT bindings for the Renesas R-Car (RZ/G) System Controller</div><div class='ctx'> </div><div class='ctx'> == System Controller Node ==</div><div class='ctx'> </div><div class='del'>-The R-Car System Controller provides power management for the CPU cores and</div><div class='del'>-various coprocessors.</div><div class='add'>+The R-Car (RZ/G) System Controller provides power management for the CPU cores</div><div class='add'>+and various coprocessors.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'>   - compatible: Must contain exactly one of the following:</div><div class='add'>+      - "renesas,r8a7743-sysc" (RZ/G1M)</div><div class='add'>+      - "renesas,r8a7745-sysc" (RZ/G1E)</div><div class='ctx'>       - "renesas,r8a7779-sysc" (R-Car H1)</div><div class='ctx'>       - "renesas,r8a7790-sysc" (R-Car H2)</div><div class='ctx'>       - "renesas,r8a7791-sysc" (R-Car M2-W)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt<br/>index d4eab9227ea4..e62d53d844cc 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt</a></div><div class='hunk'>@@ -2,12 +2,12 @@ Driver a GPIO line that can be used to turn the power off.</div><div class='ctx'> </div><div class='ctx'> The driver supports both level triggered and edge triggered power off.</div><div class='ctx'> At driver load time, the driver will request the given gpio line and</div><div class='del'>-install a pm_power_off handler. If the optional properties 'input' is</div><div class='del'>-not found, the GPIO line will be driven in the inactive</div><div class='add'>+install a handler to power off the system. If the optional properties</div><div class='add'>+'input' is not found, the GPIO line will be driven in the inactive</div><div class='ctx'> state. Otherwise its configured as an input.</div><div class='ctx'> </div><div class='del'>-When the pm_power_off is called, the gpio is configured as an output,</div><div class='del'>-and drive active, so triggering a level triggered power off</div><div class='add'>+When the power-off handler is called, the gpio is configured as an</div><div class='add'>+output, and drive active, so triggering a level triggered power off</div><div class='ctx'> condition. This will also cause an inactive-&gt;active edge condition, so</div><div class='ctx'> triggering positive edge triggered power off. After a delay of 100ms,</div><div class='ctx'> the GPIO is set to inactive, thus causing an active-&gt;inactive edge,</div><div class='hunk'>@@ -24,7 +24,7 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> - input : Initially configure the GPIO line as an input. Only reconfigure</div><div class='del'>-  it to an output when the pm_power_off function is called. If this optional</div><div class='add'>+  it to an output when the power-off handler is called. If this optional</div><div class='ctx'>   property is not specified, the GPIO is initialized as an output in its</div><div class='ctx'>   inactive state.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/reset/qnap-poweroff.txt b/Documentation/devicetree/bindings/power/reset/qnap-poweroff.txt<br/>index af25e77c0e0c..c363d7173129 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/reset/qnap-poweroff.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/power/reset/qnap-poweroff.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/reset/qnap-poweroff.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/reset/qnap-poweroff.txt</a></div><div class='hunk'>@@ -3,8 +3,7 @@</div><div class='ctx'> QNAP NAS devices have a microcontroller controlling the main power</div><div class='ctx'> supply. This microcontroller is connected to UART1 of the Kirkwood and</div><div class='ctx'> Orion5x SoCs. Sending the character 'A', at 19200 baud, tells the</div><div class='del'>-microcontroller to turn the power off. This driver adds a handler to</div><div class='del'>-pm_power_off which is called to turn the power off.</div><div class='add'>+microcontroller to turn the power off.</div><div class='ctx'> </div><div class='ctx'> Synology NAS devices use a similar scheme, but a different baud rate,</div><div class='ctx'> 9600, and a different character, '1'.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt b/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt<br/>new file mode 100644<br/>index 000000000000..826e8a879121<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+AXP20X and AXP22X PMICs' AC power supply</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+ - compatible: One of:</div><div class='add'>+			"x-powers,axp202-ac-power-supply"</div><div class='add'>+			"x-powers,axp221-ac-power-supply"</div><div class='add'>+</div><div class='add'>+This node is a subnode of the axp20x PMIC.</div><div class='add'>+</div><div class='add'>+The AXP20X can read the current current and voltage supplied by AC by</div><div class='add'>+reading ADC channels from the AXP20X ADC.</div><div class='add'>+</div><div class='add'>+The AXP22X is only able to tell if an AC power supply is present and</div><div class='add'>+usable.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+&amp;axp209 {</div><div class='add'>+	ac_power_supply: ac-power-supply {</div><div class='add'>+		compatible = "x-powers,axp202-ac-power-supply";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt b/Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt<br/>index f1d7beec45bf..ba8d35f66cbe 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt</a></div><div class='hunk'>@@ -3,6 +3,11 @@ AXP20x USB power supply</div><div class='ctx'> Required Properties:</div><div class='ctx'> -compatible: One of: "x-powers,axp202-usb-power-supply"</div><div class='ctx'>                      "x-powers,axp221-usb-power-supply"</div><div class='add'>+                     "x-powers,axp223-usb-power-supply"</div><div class='add'>+</div><div class='add'>+The AXP223 PMIC shares most of its behaviour with the AXP221 but has slight</div><div class='add'>+variations such as the former being able to set the VBUS power supply max</div><div class='add'>+current to 100mA, unlike the latter.</div><div class='ctx'> </div><div class='ctx'> This node is a subnode of the axp20x PMIC.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/supply/bq27xxx.txt b/Documentation/devicetree/bindings/power/supply/bq27xxx.txt<br/>new file mode 100644<br/>index 000000000000..b0c95ef63e68<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/supply/bq27xxx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/bq27xxx.txt</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+Binding for TI BQ27XXX fuel gauge family</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Should contain one of the following:</div><div class='add'>+ * "ti,bq27200" - BQ27200</div><div class='add'>+ * "ti,bq27210" - BQ27210</div><div class='add'>+ * "ti,bq27500" - deprecated, use revision specific property below</div><div class='add'>+ * "ti,bq27510" - deprecated, use revision specific property below</div><div class='add'>+ * "ti,bq27520" - deprecated, use revision specific property below</div><div class='add'>+ * "ti,bq27500-1" - BQ27500/1</div><div class='add'>+ * "ti,bq27510g1" - BQ27510-g1</div><div class='add'>+ * "ti,bq27510g2" - BQ27510-g2</div><div class='add'>+ * "ti,bq27510g3" - BQ27510-g3</div><div class='add'>+ * "ti,bq27520g1" - BQ27520-g1</div><div class='add'>+ * "ti,bq27520g2" - BQ27520-g2</div><div class='add'>+ * "ti,bq27520g3" - BQ27520-g3</div><div class='add'>+ * "ti,bq27520g4" - BQ27520-g4</div><div class='add'>+ * "ti,bq27530" - BQ27530</div><div class='add'>+ * "ti,bq27531" - BQ27531</div><div class='add'>+ * "ti,bq27541" - BQ27541</div><div class='add'>+ * "ti,bq27542" - BQ27542</div><div class='add'>+ * "ti,bq27546" - BQ27546</div><div class='add'>+ * "ti,bq27742" - BQ27742</div><div class='add'>+ * "ti,bq27545" - BQ27545</div><div class='add'>+ * "ti,bq27421" - BQ27421</div><div class='add'>+ * "ti,bq27425" - BQ27425</div><div class='add'>+ * "ti,bq27441" - BQ27441</div><div class='add'>+ * "ti,bq27621" - BQ27621</div><div class='add'>+- reg: integer, i2c address of the device.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+bq27510g3 {</div><div class='add'>+    compatible = "ti,bq27510g3";</div><div class='add'>+    reg = &lt;0x55&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/supply/qcom_smbb.txt b/Documentation/devicetree/bindings/power/supply/qcom_smbb.txt<br/>index 65b88fac854b..06f8a5ddb68e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/supply/qcom_smbb.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/power/supply/qcom_smbb.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/supply/qcom_smbb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/qcom_smbb.txt</a></div><div class='hunk'>@@ -105,6 +105,22 @@ PROPERTIES</div><div class='ctx'>                regulation must be done externally to fully comply with</div><div class='ctx'>                the JEITA safety guidelines if this flag is set.</div><div class='ctx'> </div><div class='add'>+- usb_otg_in-supply:</div><div class='add'>+  Usage: optional</div><div class='add'>+  Value type: &lt;phandle&gt;</div><div class='add'>+  Description: Reference to the regulator supplying power to the USB_OTG_IN</div><div class='add'>+               pin.</div><div class='add'>+</div><div class='add'>+child nodes:</div><div class='add'>+- otg-vbus:</div><div class='add'>+  Usage: optional</div><div class='add'>+  Description: This node defines a regulator used to control the direction</div><div class='add'>+               of VBUS voltage - specifically: whether to supply voltage</div><div class='add'>+               to VBUS for host mode operation of the OTG port, or allow</div><div class='add'>+               input voltage from external VBUS for charging.  In the</div><div class='add'>+               hardware, the supply for this regulator comes from</div><div class='add'>+               usb_otg_in-supply.</div><div class='add'>+</div><div class='ctx'> EXAMPLE</div><div class='ctx'> charger@1000 {</div><div class='ctx'>        compatible = "qcom,pm8941-charger";</div><div class='hunk'>@@ -128,4 +144,7 @@ charger@1000 {</div><div class='ctx'> </div><div class='ctx'>        qcom,fast-charge-current-limit = &lt;1000000&gt;;</div><div class='ctx'>        qcom,dc-charge-current-limit = &lt;1000000&gt;;</div><div class='add'>+       usb_otg_in-supply = &lt;&amp;pm8941_5vs1&gt;;</div><div class='add'>+</div><div class='add'>+       otg-vbus {};</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt b/Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt<br/>new file mode 100644<br/>index 000000000000..a3719623a94f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+SBS sbs-charger</div><div class='add'>+~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible: "&lt;vendor&gt;,&lt;part-number&gt;", "sbs,sbs-charger" as fallback. The part</div><div class='add'>+     number compatible string might be used in order to take care of vendor</div><div class='add'>+     specific registers.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- interrupt-parent: Should be the phandle for the interrupt controller. Use in</div><div class='add'>+    conjunction with "interrupts".</div><div class='add'>+- interrupts: Interrupt mapping for GPIO IRQ. Use in conjunction with</div><div class='add'>+    "interrupt-parent". If an interrupt is not provided the driver will switch</div><div class='add'>+    automatically to polling.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	ltc4100@9 {</div><div class='add'>+		compatible = "lltc,ltc4100", "sbs,sbs-charger";</div><div class='add'>+		reg = &lt;0x9&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio6&gt;;</div><div class='add'>+		interrupts = &lt;7 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/supply/ti,bq24735.txt b/Documentation/devicetree/bindings/power/supply/ti,bq24735.txt<br/>index 3bf55757ceec..de45e1a2a4d9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/supply/ti,bq24735.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/power/supply/ti,bq24735.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/supply/ti,bq24735.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/ti,bq24735.txt</a></div><div class='hunk'>@@ -8,8 +8,10 @@ Optional properties :</div><div class='ctx'>  - interrupts : Specify the interrupt to be used to trigger when the AC</div><div class='ctx'>    adapter is either plugged in or removed.</div><div class='ctx'>  - ti,ac-detect-gpios : This GPIO is optionally used to read the AC adapter</div><div class='del'>-   presence. This is a Host GPIO that is configured as an input and</div><div class='del'>-   connected to the bq24735.</div><div class='add'>+   status. This is a Host GPIO that is configured as an input and connected</div><div class='add'>+   to the ACOK pin on the bq24735. Note: for backwards compatibility reasons,</div><div class='add'>+   the GPIO must be active on AC adapter absence despite ACOK being active</div><div class='add'>+   (high) on AC adapter presence.</div><div class='ctx'>  - ti,charge-current : Used to control and set the charging current. This value</div><div class='ctx'>    must be between 128mA and 8.128A with a 64mA step resolution. The POR value</div><div class='ctx'>    is 0x0000h. This number is in mA (e.g. 8192), see spec for more information</div><div class='hunk'>@@ -25,6 +27,8 @@ Optional properties :</div><div class='ctx'>  - ti,external-control : Indicates that the charger is configured externally</div><div class='ctx'>    and that the host should not attempt to enable/disable charging or set the</div><div class='ctx'>    charge voltage/current.</div><div class='add'>+ - poll-interval : In case 'interrupts' is not specified, poll AC adapter</div><div class='add'>+   presence with this interval (milliseconds).</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt b/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt<br/>index 98d131acee95..a11072c5a866 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/power/supply/tps65217_charger.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power/supply/tps65217_charger.txt</a></div><div class='hunk'>@@ -2,11 +2,16 @@ TPS65217 Charger</div><div class='ctx'> </div><div class='ctx'> Required Properties:</div><div class='ctx'> -compatible: "ti,tps65217-charger"</div><div class='add'>+-interrupts: TPS65217 interrupt numbers for the AC and USB charger input change.</div><div class='add'>+             Should be &lt;0&gt; for the USB charger and &lt;1&gt; for the AC adapter.</div><div class='add'>+-interrupt-names: Should be "USB" and "AC"</div><div class='ctx'> </div><div class='ctx'> This node is a subnode of the tps65217 PMIC.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	tps65217-charger {</div><div class='del'>-		compatible = "ti,tps65090-charger";</div><div class='add'>+		compatible = "ti,tps65217-charger";</div><div class='add'>+		interrupts = &lt;0&gt;, &lt;1&gt;;</div><div class='add'>+		interrupt-names = "USB", "AC";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power_supply/maxim,max14656.txt b/Documentation/devicetree/bindings/power_supply/maxim,max14656.txt<br/>new file mode 100644<br/>index 000000000000..e03e85ae6572<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/power_supply/maxim,max14656.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/power_supply/maxim,max14656.txt</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+Maxim MAX14656 / AL32 USB Charger Detector</div><div class='add'>+</div><div class='add'>+Required properties :</div><div class='add'>+- compatible : "maxim,max14656";</div><div class='add'>+- reg: i2c slave address</div><div class='add'>+- interrupt-parent: the phandle for the interrupt controller</div><div class='add'>+- interrupts: interrupt line</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	clock-frequency = &lt;50000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	max14656@35 {</div><div class='add'>+		compatible = "maxim,max14656";</div><div class='add'>+		reg = &lt;0x35&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_charger_detect&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio6&gt;;</div><div class='add'>+		interrupts = &lt;26 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt b/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt<br/>index c41b2187eaa8..dc9bb3182525 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt</a></div><div class='hunk'>@@ -5,8 +5,46 @@ The cache bindings explained below are ePAPR compliant</div><div class='ctx'> </div><div class='ctx'> Required Properties:</div><div class='ctx'> </div><div class='del'>-- compatible	: Should include "fsl,chip-l2-cache-controller" and "cache"</div><div class='del'>-		  where chip is the processor (bsc9132, npc8572 etc.)</div><div class='add'>+- compatible	: Should include one of the following:</div><div class='add'>+		  "fsl,8540-l2-cache-controller"</div><div class='add'>+		  "fsl,8541-l2-cache-controller"</div><div class='add'>+		  "fsl,8544-l2-cache-controller"</div><div class='add'>+		  "fsl,8548-l2-cache-controller"</div><div class='add'>+		  "fsl,8555-l2-cache-controller"</div><div class='add'>+		  "fsl,8568-l2-cache-controller"</div><div class='add'>+		  "fsl,b4420-l2-cache-controller"</div><div class='add'>+		  "fsl,b4860-l2-cache-controller"</div><div class='add'>+		  "fsl,bsc9131-l2-cache-controller"</div><div class='add'>+		  "fsl,bsc9132-l2-cache-controller"</div><div class='add'>+		  "fsl,c293-l2-cache-controller"</div><div class='add'>+		  "fsl,mpc8536-l2-cache-controller"</div><div class='add'>+		  "fsl,mpc8540-l2-cache-controller"</div><div class='add'>+		  "fsl,mpc8541-l2-cache-controller"</div><div class='add'>+		  "fsl,mpc8544-l2-cache-controller"</div><div class='add'>+		  "fsl,mpc8548-l2-cache-controller"</div><div class='add'>+		  "fsl,mpc8555-l2-cache-controller"</div><div class='add'>+		  "fsl,mpc8560-l2-cache-controller"</div><div class='add'>+		  "fsl,mpc8568-l2-cache-controller"</div><div class='add'>+		  "fsl,mpc8569-l2-cache-controller"</div><div class='add'>+		  "fsl,mpc8572-l2-cache-controller"</div><div class='add'>+		  "fsl,p1010-l2-cache-controller"</div><div class='add'>+		  "fsl,p1011-l2-cache-controller"</div><div class='add'>+		  "fsl,p1012-l2-cache-controller"</div><div class='add'>+		  "fsl,p1013-l2-cache-controller"</div><div class='add'>+		  "fsl,p1014-l2-cache-controller"</div><div class='add'>+		  "fsl,p1015-l2-cache-controller"</div><div class='add'>+		  "fsl,p1016-l2-cache-controller"</div><div class='add'>+		  "fsl,p1020-l2-cache-controller"</div><div class='add'>+		  "fsl,p1021-l2-cache-controller"</div><div class='add'>+		  "fsl,p1022-l2-cache-controller"</div><div class='add'>+		  "fsl,p1023-l2-cache-controller"</div><div class='add'>+		  "fsl,p1024-l2-cache-controller"</div><div class='add'>+		  "fsl,p1025-l2-cache-controller"</div><div class='add'>+		  "fsl,p2010-l2-cache-controller"</div><div class='add'>+		  "fsl,p2020-l2-cache-controller"</div><div class='add'>+		  "fsl,t2080-l2-cache-controller"</div><div class='add'>+		  "fsl,t4240-l2-cache-controller"</div><div class='add'>+		  and "cache".</div><div class='ctx'> - reg		: Address and size of L2 cache controller registers</div><div class='ctx'> - cache-size	: Size of the entire L2 cache</div><div class='ctx'> - interrupts	: Error interrupt of L2 controller</div><div class='head'>diff --git a/Documentation/devicetree/bindings/powerpc/opal/power-mgt.txt b/Documentation/devicetree/bindings/powerpc/opal/power-mgt.txt<br/>new file mode 100644<br/>index 000000000000..9d619e955576<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/powerpc/opal/power-mgt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/powerpc/opal/power-mgt.txt</a></div><div class='hunk'>@@ -0,0 +1,118 @@</div><div class='add'>+IBM Power-Management Bindings</div><div class='add'>+=============================</div><div class='add'>+</div><div class='add'>+Linux running on baremetal POWER machines has access to the processor</div><div class='add'>+idle states. The description of these idle states is exposed via the</div><div class='add'>+node @power-mgt in the device-tree by the firmware.</div><div class='add'>+</div><div class='add'>+Definitions:</div><div class='add'>+----------------</div><div class='add'>+Typically each idle state has the following associated properties:</div><div class='add'>+</div><div class='add'>+- name: The name of the idle state as defined by the firmware.</div><div class='add'>+</div><div class='add'>+- flags: indicating some aspects of this idle states such as the</div><div class='add'>+         extent of state-loss, whether timebase is stopped on this</div><div class='add'>+         idle states and so on. The flag bits are as follows:</div><div class='add'>+</div><div class='add'>+- exit-latency: The latency involved in transitioning the state of the</div><div class='add'>+		CPU from idle to running.</div><div class='add'>+</div><div class='add'>+- target-residency: The minimum time that the CPU needs to reside in</div><div class='add'>+		    this idle state in order to accrue power-savings</div><div class='add'>+		    benefit.</div><div class='add'>+</div><div class='add'>+Properties</div><div class='add'>+----------------</div><div class='add'>+The following properties provide details about the idle states. These</div><div class='add'>+properties are exposed as arrays. Each entry in the property array</div><div class='add'>+provides the value of that property for the idle state associated with</div><div class='add'>+the array index of that entry.</div><div class='add'>+</div><div class='add'>+If idle-states are defined, then the properties</div><div class='add'>+"ibm,cpu-idle-state-names" and "ibm,cpu-idle-state-flags" are</div><div class='add'>+required. The other properties are required unless mentioned</div><div class='add'>+otherwise. The length of all the property arrays must be the same.</div><div class='add'>+</div><div class='add'>+- ibm,cpu-idle-state-names:</div><div class='add'>+	Array of strings containing the names of the idle states.</div><div class='add'>+</div><div class='add'>+- ibm,cpu-idle-state-flags:</div><div class='add'>+	Array of unsigned 32-bit values containing the values of the</div><div class='add'>+	flags associated with the the aforementioned idle-states. The</div><div class='add'>+	flag bits are as follows:</div><div class='add'>+		0x00000001 /* Decrementer would stop */</div><div class='add'>+		0x00000002 /* Needs timebase restore */</div><div class='add'>+		0x00001000 /* Restore GPRs like nap */</div><div class='add'>+		0x00002000 /* Restore hypervisor resource from PACA pointer */</div><div class='add'>+		0x00004000 /* Program PORE to restore PACA pointer */</div><div class='add'>+		0x00010000 /* This is a nap state (POWER7,POWER8) */</div><div class='add'>+		0x00020000 /* This is a fast-sleep state (POWER8)*/</div><div class='add'>+		0x00040000 /* This is a winkle state (POWER8) */</div><div class='add'>+		0x00080000 /* This is a fast-sleep state which requires a */</div><div class='add'>+			   /* software workaround for restoring the */</div><div class='add'>+			   /* timebase (POWER8) */</div><div class='add'>+		0x00800000 /* This state uses SPR PMICR instruction */</div><div class='add'>+			   /* (POWER8)*/</div><div class='add'>+		0x00100000 /* This is a fast stop state (POWER9) */</div><div class='add'>+		0x00200000 /* This is a deep-stop state (POWER9) */</div><div class='add'>+</div><div class='add'>+- ibm,cpu-idle-state-latencies-ns:</div><div class='add'>+	Array of unsigned 32-bit values containing the values of the</div><div class='add'>+	exit-latencies (in ns) for the idle states in</div><div class='add'>+	ibm,cpu-idle-state-names.</div><div class='add'>+</div><div class='add'>+- ibm,cpu-idle-state-residency-ns:</div><div class='add'>+	Array of unsigned 32-bit values containing the values of the</div><div class='add'>+	target-residency (in ns) for the idle states in</div><div class='add'>+	ibm,cpu-idle-state-names. On POWER8 this is an optional</div><div class='add'>+	property. If the property is absent, the target residency for</div><div class='add'>+	the "Nap", "FastSleep" are defined to 10000 and 300000000</div><div class='add'>+	respectively by the kernel. On POWER9 this property is required.</div><div class='add'>+</div><div class='add'>+- ibm,cpu-idle-state-psscr:</div><div class='add'>+	Array of unsigned 64-bit values containing the values for the</div><div class='add'>+	PSSCR for each of the idle states in ibm,cpu-idle-state-names.</div><div class='add'>+	This property is required on POWER9 and absent on POWER8.</div><div class='add'>+</div><div class='add'>+- ibm,cpu-idle-state-psscr-mask:</div><div class='add'>+	Array of unsigned 64-bit values containing the masks</div><div class='add'>+	indicating which psscr fields are set in the corresponding</div><div class='add'>+	entries of ibm,cpu-idle-state-psscr. This property is</div><div class='add'>+	required on POWER9 and absent on POWER8.</div><div class='add'>+</div><div class='add'>+	Whenever the firmware sets an entry in</div><div class='add'>+	ibm,cpu-idle-state-psscr-mask value to 0xf, it implies that</div><div class='add'>+	only the Requested Level (RL) field of the corresponding entry</div><div class='add'>+	in ibm,cpu-idle-state-psscr should be considered by the</div><div class='add'>+	kernel. For such idle states, the kernel would set the</div><div class='add'>+	remaining fields of the psscr to the following sane-default</div><div class='add'>+	values.</div><div class='add'>+</div><div class='add'>+		- ESL and EC bits are to 1. So wakeup from any stop</div><div class='add'>+		  state will be at vector 0x100.</div><div class='add'>+</div><div class='add'>+		- MTL and PSLL are set to the maximum allowed value as</div><div class='add'>+		  per the ISA, i.e. 15.</div><div class='add'>+</div><div class='add'>+		- The Transition Rate, TR is set to the Maximum value</div><div class='add'>+                  3.</div><div class='add'>+</div><div class='add'>+	For all the other values of the entry in</div><div class='add'>+	ibm,cpu-idle-state-psscr-mask, the kernel expects all the</div><div class='add'>+	psscr fields of the corresponding entry in</div><div class='add'>+	ibm,cpu-idle-state-psscr to be correctly set by the firmware.</div><div class='add'>+</div><div class='add'>+- ibm,cpu-idle-state-pmicr:</div><div class='add'>+	Array of unsigned 64-bit values containing the pmicr values</div><div class='add'>+	for the idle states in ibm,cpu-idle-state-names. This 64-bit</div><div class='add'>+	register value is to be set in pmicr for the corresponding</div><div class='add'>+	state if the flag indicates that pmicr SPR should be set. This</div><div class='add'>+	is an optional property on POWER8 and is absent on</div><div class='add'>+	POWER9.</div><div class='add'>+</div><div class='add'>+- ibm,cpu-idle-state-pmicr-mask:</div><div class='add'>+	Array of unsigned 64-bit values containing the mask indicating</div><div class='add'>+	which of the fields of the PMICR are set in the corresponding</div><div class='add'>+	entries in ibm,cpu-idle-state-pmicr. This is an optional</div><div class='add'>+	property on POWER8 and is absent on POWER9.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pwm/imx-pwm.txt b/Documentation/devicetree/bindings/pwm/imx-pwm.txt<br/>index e00c2e9f484d..c61bdf8cd41b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pwm/imx-pwm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pwm/imx-pwm.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pwm/imx-pwm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pwm/imx-pwm.txt</a></div><div class='hunk'>@@ -6,8 +6,8 @@ Required properties:</div><div class='ctx'>   - "fsl,imx1-pwm" for PWM compatible with the one integrated on i.MX1</div><div class='ctx'>   - "fsl,imx27-pwm" for PWM compatible with the one integrated on i.MX27</div><div class='ctx'> - reg: physical base address and length of the controller's registers</div><div class='del'>-- #pwm-cells: should be 2. See pwm.txt in this directory for a description of</div><div class='del'>-  the cells format.</div><div class='add'>+- #pwm-cells: 2 for i.MX1 and 3 for i.MX27 and newer SoCs. See pwm.txt</div><div class='add'>+  in this directory for a description of the cells format.</div><div class='ctx'> - clocks : Clock specifiers for both ipg and per clocks.</div><div class='ctx'> - clock-names : Clock names should include both "ipg" and "per"</div><div class='ctx'> See the clock consumer binding,</div><div class='hunk'>@@ -17,7 +17,7 @@ See the clock consumer binding,</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> pwm1: pwm@53fb4000 {</div><div class='del'>-	#pwm-cells = &lt;2&gt;;</div><div class='add'>+	#pwm-cells = &lt;3&gt;;</div><div class='ctx'> 	compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";</div><div class='ctx'> 	reg = &lt;0x53fb4000 0x4000&gt;;</div><div class='ctx'> 	clocks = &lt;&amp;clks IMX5_CLK_PWM1_IPG_GATE&gt;,</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt b/Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt<br/>index fb6fb31bc4c4..cf573e85b11d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt</a></div><div class='hunk'>@@ -3,7 +3,7 @@ BCM2835 PWM controller (Raspberry Pi controller)</div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible: should be "brcm,bcm2835-pwm"</div><div class='ctx'> - reg: physical base address and length of the controller's registers</div><div class='del'>-- clock: This clock defines the base clock frequency of the PWM hardware</div><div class='add'>+- clocks: This clock defines the base clock frequency of the PWM hardware</div><div class='ctx'>   system, the period and the duty_cycle of the PWM signal is a multiple of</div><div class='ctx'>   the base period.</div><div class='ctx'> - #pwm-cells: Should be 2. See pwm.txt in this directory for a description of</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pwm/pwm-hibvt.txt b/Documentation/devicetree/bindings/pwm/pwm-hibvt.txt<br/>new file mode 100644<br/>index 000000000000..fa7849d67836<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pwm/pwm-hibvt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pwm/pwm-hibvt.txt</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+Hisilicon PWM controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+-compatible: should contain one SoC specific compatible string</div><div class='add'>+ The SoC specific strings supported including:</div><div class='add'>+	"hisilicon,hi3516cv300-pwm"</div><div class='add'>+	"hisilicon,hi3519v100-pwm"</div><div class='add'>+- reg: physical base address and length of the controller's registers.</div><div class='add'>+- clocks: phandle and clock specifier of the PWM reference clock.</div><div class='add'>+- resets: phandle and reset specifier for the PWM controller reset.</div><div class='add'>+- #pwm-cells: Should be 3. See pwm.txt in this directory for a description of</div><div class='add'>+  the cells format.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	pwm: pwm@12130000 {</div><div class='add'>+		compatible = "hisilicon,hi3516cv300-pwm";</div><div class='add'>+		reg = &lt;0x12130000 0x10000&gt;;</div><div class='add'>+		clocks = &lt;&amp;crg_ctrl HI3516CV300_PWM_CLK&gt;;</div><div class='add'>+		resets = &lt;&amp;crg_ctrl 0x38 0&gt;;</div><div class='add'>+		#pwm-cells = &lt;3&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/pwm/pwm-stm32.txt b/Documentation/devicetree/bindings/pwm/pwm-stm32.txt<br/>new file mode 100644<br/>index 000000000000..6dd040363e5e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/pwm/pwm-stm32.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/pwm/pwm-stm32.txt</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+STMicroelectronics STM32 Timers PWM bindings</div><div class='add'>+</div><div class='add'>+Must be a sub-node of an STM32 Timers device tree node.</div><div class='add'>+See ../mfd/stm32-timers.txt for details about the parent node.</div><div class='add'>+</div><div class='add'>+Required parameters:</div><div class='add'>+- compatible:		Must be "st,stm32-pwm".</div><div class='add'>+- pinctrl-names: 	Set to "default".</div><div class='add'>+- pinctrl-0: 		List of phandles pointing to pin configuration nodes for PWM module.</div><div class='add'>+			For Pinctrl properties see ../pinctrl/pinctrl-bindings.txt</div><div class='add'>+</div><div class='add'>+Optional parameters:</div><div class='add'>+- st,breakinput:	One or two &lt;index level filter&gt; to describe break input configurations.</div><div class='add'>+			"index" indicates on which break input (0 or 1) the configuration</div><div class='add'>+			should be applied.</div><div class='add'>+			"level" gives the active level (0=low or 1=high) of the input signal</div><div class='add'>+			for this configuration.</div><div class='add'>+			"filter" gives the filtering value to be applied.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	timers@40010000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "st,stm32-timers";</div><div class='add'>+		reg = &lt;0x40010000 0x400&gt;;</div><div class='add'>+		clocks = &lt;&amp;rcc 0 160&gt;;</div><div class='add'>+		clock-names = "clk_int";</div><div class='add'>+</div><div class='add'>+		pwm {</div><div class='add'>+			compatible = "st,stm32-pwm";</div><div class='add'>+			pinctrl-0	= &lt;&amp;pwm1_pins&gt;;</div><div class='add'>+			pinctrl-names	= "default";</div><div class='add'>+			st,breakinput = &lt;0 1 5&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/regulator/anatop-regulator.txt b/Documentation/devicetree/bindings/regulator/anatop-regulator.txt<br/>index 37c4ea076f88..1d58c8cfdbc0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/regulator/anatop-regulator.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/regulator/anatop-regulator.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/regulator/anatop-regulator.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/regulator/anatop-regulator.txt</a></div><div class='hunk'>@@ -14,6 +14,7 @@ Optional properties:</div><div class='ctx'> - anatop-delay-bit-shift: Bit shift for the step time register</div><div class='ctx'> - anatop-delay-bit-width: Number of bits used in the step time register</div><div class='ctx'> - vin-supply: The supply for this regulator</div><div class='add'>+- anatop-enable-bit: Regulator enable bit offset</div><div class='ctx'> </div><div class='ctx'> Any property defined as part of the core regulator</div><div class='ctx'> binding, defined in regulator.txt, can also be used.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/regulator/cpcap-regulator.txt b/Documentation/devicetree/bindings/regulator/cpcap-regulator.txt<br/>new file mode 100644<br/>index 000000000000..675f4437ce92<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/regulator/cpcap-regulator.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/regulator/cpcap-regulator.txt</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+Motorola CPCAP PMIC voltage regulators</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+Requires node properties:</div><div class='add'>+- "compatible" value one of:</div><div class='add'>+    "motorola,cpcap-regulator"</div><div class='add'>+    "motorola,mapphone-cpcap-regulator"</div><div class='add'>+</div><div class='add'>+Required regulator properties:</div><div class='add'>+- "regulator-name"</div><div class='add'>+- "regulator-enable-ramp-delay"</div><div class='add'>+- "regulator-min-microvolt"</div><div class='add'>+- "regulator-max-microvolt"</div><div class='add'>+</div><div class='add'>+Optional regulator properties:</div><div class='add'>+- "regulator-boot-on"</div><div class='add'>+</div><div class='add'>+See Documentation/devicetree/bindings/regulator/regulator.txt</div><div class='add'>+for more details about the regulator properties.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+cpcap_regulator: regulator {</div><div class='add'>+	compatible = "motorola,cpcap-regulator";</div><div class='add'>+</div><div class='add'>+	cpcap_regulators: regulators {</div><div class='add'>+		sw5: SW5 {</div><div class='add'>+			regulator-min-microvolt = &lt;5050000&gt;;</div><div class='add'>+			regulator-max-microvolt = &lt;5050000&gt;;</div><div class='add'>+			regulator-enable-ramp-delay = &lt;50000&gt;;</div><div class='add'>+			regulator-boot-on;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt<br/>index e5cac1e0ca8a..dd1ed789728e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/regulator/gpio-regulator.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/regulator/gpio-regulator.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/regulator/gpio-regulator.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/regulator/gpio-regulator.txt</a></div><div class='hunk'>@@ -13,7 +13,7 @@ Optional properties:</div><div class='ctx'> - startup-delay-us	: Startup time in microseconds.</div><div class='ctx'> - enable-active-high	: Polarity of GPIO is active high (default is low).</div><div class='ctx'> - regulator-type	: Specifies what is being regulated, must be either</div><div class='del'>-			  "voltage" or "current", defaults to current.</div><div class='add'>+			  "voltage" or "current", defaults to voltage.</div><div class='ctx'> </div><div class='ctx'> Any property defined as part of the core regulator binding defined in</div><div class='ctx'> regulator.txt can also be used.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt b/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt<br/>index 1f8d6f84b657..4e3dfb5b5f16 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt</a></div><div class='hunk'>@@ -22,6 +22,7 @@ Regulator nodes are identified by their compatible:</div><div class='ctx'> 		    "qcom,rpm-pm8841-regulators"</div><div class='ctx'> 		    "qcom,rpm-pm8916-regulators"</div><div class='ctx'> 		    "qcom,rpm-pm8941-regulators"</div><div class='add'>+		    "qcom,rpm-pm8994-regulators"</div><div class='ctx'> 		    "qcom,rpm-pma8084-regulators"</div><div class='ctx'> </div><div class='ctx'> - vdd_s1-supply:</div><div class='hunk'>@@ -80,6 +81,56 @@ Regulator nodes are identified by their compatible:</div><div class='ctx'> - vdd_s10-supply:</div><div class='ctx'> - vdd_s11-supply:</div><div class='ctx'> - vdd_s12-supply:</div><div class='add'>+- vdd_l1-supply:</div><div class='add'>+- vdd_l2_l26_l28-supply:</div><div class='add'>+- vdd_l3_l11-supply:</div><div class='add'>+- vdd_l4_l27_l31-supply:</div><div class='add'>+- vdd_l5_l7-supply:</div><div class='add'>+- vdd_l6_l12_l32-supply:</div><div class='add'>+- vdd_l5_l7-supply:</div><div class='add'>+- vdd_l8_l16_l30-supply:</div><div class='add'>+- vdd_l9_l10_l18_l22-supply:</div><div class='add'>+- vdd_l9_l10_l18_l22-supply:</div><div class='add'>+- vdd_l3_l11-supply:</div><div class='add'>+- vdd_l6_l12_l32-supply:</div><div class='add'>+- vdd_l13_l19_l23_l24-supply:</div><div class='add'>+- vdd_l14_l15-supply:</div><div class='add'>+- vdd_l14_l15-supply:</div><div class='add'>+- vdd_l8_l16_l30-supply:</div><div class='add'>+- vdd_l17_l29-supply:</div><div class='add'>+- vdd_l9_l10_l18_l22-supply:</div><div class='add'>+- vdd_l13_l19_l23_l24-supply:</div><div class='add'>+- vdd_l20_l21-supply:</div><div class='add'>+- vdd_l20_l21-supply:</div><div class='add'>+- vdd_l9_l10_l18_l22-supply:</div><div class='add'>+- vdd_l13_l19_l23_l24-supply:</div><div class='add'>+- vdd_l13_l19_l23_l24-supply:</div><div class='add'>+- vdd_l25-supply:</div><div class='add'>+- vdd_l2_l26_l28-supply:</div><div class='add'>+- vdd_l4_l27_l31-supply:</div><div class='add'>+- vdd_l2_l26_l28-supply:</div><div class='add'>+- vdd_l17_l29-supply:</div><div class='add'>+- vdd_l8_l16_l30-supply:</div><div class='add'>+- vdd_l4_l27_l31-supply:</div><div class='add'>+- vdd_l6_l12_l32-supply:</div><div class='add'>+- vdd_lvs1_2-supply:</div><div class='add'>+	Usage: optional (pm8994 only)</div><div class='add'>+	Value type: &lt;phandle&gt;</div><div class='add'>+	Definition: reference to regulator supplying the input pin, as</div><div class='add'>+		    described in the data sheet</div><div class='add'>+</div><div class='add'>+- vdd_s1-supply:</div><div class='add'>+- vdd_s2-supply:</div><div class='add'>+- vdd_s3-supply:</div><div class='add'>+- vdd_s4-supply:</div><div class='add'>+- vdd_s5-supply:</div><div class='add'>+- vdd_s6-supply:</div><div class='add'>+- vdd_s7-supply:</div><div class='add'>+- vdd_s8-supply:</div><div class='add'>+- vdd_s9-supply:</div><div class='add'>+- vdd_s10-supply:</div><div class='add'>+- vdd_s11-supply:</div><div class='add'>+- vdd_s12-supply:</div><div class='ctx'> - vdd_l1_l11-supply:</div><div class='ctx'> - vdd_l2_l3_l4_l27-supply:</div><div class='ctx'> - vdd_l5_l7-supply:</div><div class='hunk'>@@ -113,6 +164,11 @@ pm8941:</div><div class='ctx'> 	l14, l15, l16, l17, l18, l19, l20, l21, l22, l23, l24, lvs1, lvs2,</div><div class='ctx'> 	lvs3, 5vs1, 5vs2</div><div class='ctx'> </div><div class='add'>+pm8994:</div><div class='add'>+	s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, l1, l2, l3, l4, l5,</div><div class='add'>+	l6, l7, l8, l9, l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l20,</div><div class='add'>+	l21, l22, l23, l24, l25, l26, l27, l28, l29, l30, l31, l32, lvs1, lvs2</div><div class='add'>+</div><div class='ctx'> pma8084:</div><div class='ctx'> 	s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, l1, l2, l3, l4, l5,</div><div class='ctx'> 	l6, l7, l8, l9, l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l20,</div><div class='head'>diff --git a/Documentation/devicetree/bindings/regulator/tps65218.txt b/Documentation/devicetree/bindings/regulator/tps65218.txt<br/>index fccc1d24af58..02f0e9bbfbf8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/regulator/tps65218.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/regulator/tps65218.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/regulator/tps65218.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/regulator/tps65218.txt</a></div><div class='hunk'>@@ -1,23 +1,78 @@</div><div class='ctx'> TPS65218 family of regulators</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-For tps65218 regulators/LDOs</div><div class='del'>-- compatible:</div><div class='del'>-  - "ti,tps65218-dcdc1" for DCDC1</div><div class='del'>-  - "ti,tps65218-dcdc2" for DCDC2</div><div class='del'>-  - "ti,tps65218-dcdc3" for DCDC3</div><div class='del'>-  - "ti,tps65218-dcdc4" for DCDC4</div><div class='del'>-  - "ti,tps65218-dcdc5" for DCDC5</div><div class='del'>-  - "ti,tps65218-dcdc6" for DCDC6</div><div class='del'>-  - "ti,tps65218-ldo1" for LDO1</div><div class='del'>-</div><div class='del'>-Optional properties:</div><div class='del'>-- Any optional property defined in bindings/regulator/regulator.txt</div><div class='add'>+- compatible: "ti,tps65218"</div><div class='add'>+- reg: I2C slave address</div><div class='add'>+</div><div class='add'>+- List of regulators provided by this controller, must be named</div><div class='add'>+  after their hardware counterparts: dcdc[1-6] and ldo1</div><div class='add'>+- This is the list of child nodes that specify the regulator</div><div class='add'>+  initialization data for defined regulators. Not all regulators for the given</div><div class='add'>+  device need to be present. The definition for each of these nodes is defined</div><div class='add'>+  using the standard binding for regulators found at ./regulator.txt.</div><div class='add'>+</div><div class='add'>+  The valid names for regulators are:</div><div class='add'>+  tps65217: regulator-dcdc1, regulator-dcdc2, regulator-dcdc3, regulator-dcdc4,</div><div class='add'>+  regulator-dcdc5, regulator-dcdc6, regulator-ldo1, regulator-ls3.</div><div class='add'>+  Each regulator is defined using the standard binding for regulators.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='add'>+tps65218: tps65218@24 {</div><div class='add'>+	reg = &lt;0x24&gt;;</div><div class='add'>+	compatible = "ti,tps65218";</div><div class='add'>+	interrupts = &lt;GIC_SPI 7 IRQ_TYPE_NONE&gt;; /* NMIn */</div><div class='add'>+	interrupt-controller;</div><div class='add'>+	#interrupt-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	dcdc1: regulator-dcdc1 {</div><div class='add'>+		regulator-name = "vdd_core";</div><div class='add'>+		regulator-min-microvolt = &lt;912000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1144000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dcdc2: regulator-dcdc2 {</div><div class='add'>+		regulator-name = "vdd_mpu";</div><div class='add'>+		regulator-min-microvolt = &lt;912000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1378000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dcdc3: regulator-dcdc3 {</div><div class='add'>+		regulator-name = "vdcdc3";</div><div class='add'>+		regulator-min-microvolt = &lt;1500000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1500000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dcdc5: regulator-dcdc5 {</div><div class='add'>+		regulator-name = "v1_0bat";</div><div class='add'>+		regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dcdc6: regulator-dcdc6 {</div><div class='add'>+		regulator-name = "v1_8bat";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ldo1: regulator-ldo1 {</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	xyz: regulator@0 {</div><div class='del'>-		compatible = "ti,tps65218-dcdc1";</div><div class='del'>-		regulator-min-microvolt  = &lt;1000000&gt;;</div><div class='del'>-		regulator-max-microvolt  = &lt;3000000&gt;;</div><div class='add'>+	ls3: regulator-ls3 {</div><div class='add'>+		regulator-min-microvolt = &lt;100000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1000000&gt;;</div><div class='ctx'> 	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt b/Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt<br/>new file mode 100644<br/>index 000000000000..75ad7b8df0b1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt</a></div><div class='hunk'>@@ -0,0 +1,133 @@</div><div class='add'>+Qualcomm ADSP Peripheral Image Loader</div><div class='add'>+</div><div class='add'>+This document defines the binding for a component that loads and boots firmware</div><div class='add'>+on the Qualcomm ADSP Hexagon core.</div><div class='add'>+</div><div class='add'>+- compatible:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;string&gt;</div><div class='add'>+	Definition: must be one of:</div><div class='add'>+		    "qcom,msm8974-adsp-pil"</div><div class='add'>+		    "qcom,msm8996-adsp-pil"</div><div class='add'>+		    "qcom,msm8996-slpi-pil"</div><div class='add'>+</div><div class='add'>+- interrupts-extended:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: must list the watchdog, fatal IRQs ready, handover and</div><div class='add'>+		    stop-ack IRQs</div><div class='add'>+</div><div class='add'>+- interrupt-names:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;stringlist&gt;</div><div class='add'>+	Definition: must be "wdog", "fatal", "ready", "handover", "stop-ack"</div><div class='add'>+</div><div class='add'>+- clocks:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: reference to the xo clock and optionally aggre2 clock to be</div><div class='add'>+		    held on behalf of the booting Hexagon core</div><div class='add'>+</div><div class='add'>+- clock-names:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;stringlist&gt;</div><div class='add'>+	Definition: must be "xo" and optionally include "aggre2"</div><div class='add'>+</div><div class='add'>+- cx-supply:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;phandle&gt;</div><div class='add'>+	Definition: reference to the regulator to be held on behalf of the</div><div class='add'>+		    booting Hexagon core</div><div class='add'>+</div><div class='add'>+- px-supply:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;phandle&gt;</div><div class='add'>+	Definition: reference to the px regulator to be held on behalf of the</div><div class='add'>+		    booting Hexagon core</div><div class='add'>+</div><div class='add'>+- memory-region:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;phandle&gt;</div><div class='add'>+	Definition: reference to the reserved-memory for the ADSP</div><div class='add'>+</div><div class='add'>+- qcom,smem-states:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;phandle&gt;</div><div class='add'>+	Definition: reference to the smem state for requesting the ADSP to</div><div class='add'>+		    shut down</div><div class='add'>+</div><div class='add'>+- qcom,smem-state-names:</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;stringlist&gt;</div><div class='add'>+	Definition: must be "stop"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+= SUBNODES</div><div class='add'>+The adsp node may have an subnode named "smd-edge" that describes the SMD edge,</div><div class='add'>+channels and devices related to the ADSP.  See ../soc/qcom/qcom,smd.txt for</div><div class='add'>+details on how to describe the SMD edge.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+= EXAMPLE</div><div class='add'>+The following example describes the resources needed to boot control the</div><div class='add'>+ADSP, as it is found on MSM8974 boards.</div><div class='add'>+</div><div class='add'>+	adsp {</div><div class='add'>+		compatible = "qcom,msm8974-adsp-pil";</div><div class='add'>+</div><div class='add'>+		interrupts-extended = &lt;&amp;intc 0 162 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		interrupt-names = "wdog",</div><div class='add'>+				  "fatal",</div><div class='add'>+				  "ready",</div><div class='add'>+				  "handover",</div><div class='add'>+				  "stop-ack";</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;rpmcc RPM_CXO_CLK&gt;;</div><div class='add'>+		clock-names = "xo";</div><div class='add'>+</div><div class='add'>+		cx-supply = &lt;&amp;pm8841_s2&gt;;</div><div class='add'>+</div><div class='add'>+		memory-region = &lt;&amp;adsp_region&gt;;</div><div class='add'>+</div><div class='add'>+		qcom,smem-states = &lt;&amp;adsp_smp2p_out 0&gt;;</div><div class='add'>+		qcom,smem-state-names = "stop";</div><div class='add'>+</div><div class='add'>+		smd-edge {</div><div class='add'>+			interrupts = &lt;0 156 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+</div><div class='add'>+			qcom,ipc = &lt;&amp;apcs 8 8&gt;;</div><div class='add'>+			qcom,smd-edge = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+The following example describes the resources needed to boot control the</div><div class='add'>+SLPI, as it is found on MSM8996 boards.</div><div class='add'>+</div><div class='add'>+	slpi {</div><div class='add'>+		compatible = "qcom,msm8996-slpi-pil";</div><div class='add'>+		interrupts-extended = &lt;&amp;intc 0 390 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;slpi_smp2p_in 0 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;slpi_smp2p_in 1 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;slpi_smp2p_in 2 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;slpi_smp2p_in 3 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		interrupt-names = "wdog",</div><div class='add'>+				  "fatal",</div><div class='add'>+				  "ready",</div><div class='add'>+				  "handover",</div><div class='add'>+				  "stop-ack";</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;rpmcc MSM8996_RPM_SMD_XO_CLK_SRC&gt;,</div><div class='add'>+		         &lt;&amp;rpmcc MSM8996_RPM_SMD_AGGR2_NOC_CLK&gt;;</div><div class='add'>+		clock-names = "xo", "aggre2";</div><div class='add'>+</div><div class='add'>+		cx-supply = &lt;&amp;pm8994_l26&gt;;</div><div class='add'>+		px-supply = &lt;&amp;pm8994_lvs2&gt;;</div><div class='add'>+</div><div class='add'>+		memory-region = &lt;&amp;slpi_region&gt;;</div><div class='add'>+		qcom,smem-states = &lt;&amp;slpi_smp2p_out 0&gt;;</div><div class='add'>+		qcom,smem-state-names = "stop";</div><div class='add'>+        };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt<br/>index 57cb49ec55ca..92347fe6890e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt</a></div><div class='hunk'>@@ -7,7 +7,9 @@ on the Qualcomm Hexagon core.</div><div class='ctx'> 	Usage: required</div><div class='ctx'> 	Value type: &lt;string&gt;</div><div class='ctx'> 	Definition: must be one of:</div><div class='del'>-		    "qcom,q6v5-pil"</div><div class='add'>+		    "qcom,q6v5-pil",</div><div class='add'>+		    "qcom,msm8916-mss-pil",</div><div class='add'>+		    "qcom,msm8974-mss-pil"</div><div class='ctx'> </div><div class='ctx'> - reg:</div><div class='ctx'> 	Usage: required</div><div class='head'>diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt b/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt<br/>index 0d2361ebe3d7..d420f84ddfb0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt</a></div><div class='hunk'>@@ -60,8 +60,8 @@ on the Qualcomm WCNSS core.</div><div class='ctx'> 		    see ../reserved-memory/reserved-memory.txt</div><div class='ctx'> </div><div class='ctx'> = SUBNODES</div><div class='del'>-A single subnode of the WCNSS PIL describes the attached rf module and its</div><div class='del'>-resource dependencies.</div><div class='add'>+A required subnode of the WCNSS PIL is used to describe the attached rf module</div><div class='add'>+and its resource dependencies. It is described by the following properties:</div><div class='ctx'> </div><div class='ctx'> - compatible:</div><div class='ctx'> 	Usage: required</div><div class='hunk'>@@ -90,6 +90,11 @@ resource dependencies.</div><div class='ctx'> 	Definition: reference to the regulators to be held on behalf of the</div><div class='ctx'> 		    booting of the WCNSS core</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+The wcnss node can also have an subnode named "smd-edge" that describes the SMD</div><div class='add'>+edge, channels and devices related to the WCNSS.</div><div class='add'>+See ../soc/qcom/qcom,smd.txt for details on how to describe the SMD edge.</div><div class='add'>+</div><div class='ctx'> = EXAMPLE</div><div class='ctx'> The following example describes the resources needed to boot control the WCNSS,</div><div class='ctx'> with attached WCN3680, as it is commonly found on MSM8974 boards.</div><div class='hunk'>@@ -129,4 +134,25 @@ pronto@fb204000 {</div><div class='ctx'> 		vddpa-supply = &lt;&amp;pm8941_l19&gt;;</div><div class='ctx'> 		vdddig-supply = &lt;&amp;pm8941_s3&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	smd-edge {</div><div class='add'>+		interrupts = &lt;0 142 1&gt;;</div><div class='add'>+</div><div class='add'>+		qcom,ipc = &lt;&amp;apcs 8 17&gt;;</div><div class='add'>+		qcom,smd-edge = &lt;6&gt;;</div><div class='add'>+		qcom,remote-pid = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+		label = "pronto";</div><div class='add'>+</div><div class='add'>+		wcnss {</div><div class='add'>+			compatible = "qcom,wcnss";</div><div class='add'>+			qcom,smd-channels = "WCNSS_CTRL";</div><div class='add'>+</div><div class='add'>+			qcom,mmio = &lt;&amp;pronto&gt;;</div><div class='add'>+</div><div class='add'>+			bt {</div><div class='add'>+				compatible = "qcom,wcnss-bt";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/reserved-memory/ramoops.txt b/Documentation/devicetree/bindings/reserved-memory/ramoops.txt<br/>index e81f821a2135..0eba562fe5c6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reserved-memory/ramoops.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/reserved-memory/ramoops.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reserved-memory/ramoops.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reserved-memory/ramoops.txt</a></div><div class='hunk'>@@ -46,3 +46,6 @@ Optional properties:</div><div class='ctx'>   (defaults to buffered mappings)</div><div class='ctx'> </div><div class='ctx'> - no-dump-oops: if present, only dump panics (defaults to panics and oops)</div><div class='add'>+</div><div class='add'>+- flags: if present, pass ramoops behavioral flags (defaults to 0,</div><div class='add'>+  see include/linux/pstore_ram.h RAMOOPS_FLAG_* for flag values).</div><div class='head'>diff --git a/Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt b/Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt<br/>new file mode 100644<br/>index 000000000000..2bf3344b2a02<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+Hisilicon System Reset Controller</div><div class='add'>+======================================</div><div class='add'>+</div><div class='add'>+Please also refer to reset.txt in this directory for common reset</div><div class='add'>+controller binding usage.</div><div class='add'>+</div><div class='add'>+The reset controller registers are part of the system-ctl block on</div><div class='add'>+hi3660 SoC.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be</div><div class='add'>+		 "hisilicon,hi3660-reset"</div><div class='add'>+- hisi,rst-syscon: phandle of the reset's syscon.</div><div class='add'>+- #reset-cells : Specifies the number of cells needed to encode a</div><div class='add'>+  reset source.  The type shall be a &lt;u32&gt; and the value shall be 2.</div><div class='add'>+</div><div class='add'>+	 Cell #1 : offset of the reset assert control</div><div class='add'>+	           register from the syscon register base</div><div class='add'>+		   offset + 4: deassert control register</div><div class='add'>+		   offset + 8: status control register</div><div class='add'>+	 Cell #2 : bit position of the reset in the reset control register</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	iomcu: iomcu@ffd7e000 {</div><div class='add'>+		compatible = "hisilicon,hi3660-iomcu", "syscon";</div><div class='add'>+		reg = &lt;0x0 0xffd7e000 0x0 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	iomcu_rst: iomcu_rst_controller {</div><div class='add'>+		compatible = "hisilicon,hi3660-reset";</div><div class='add'>+		hisi,rst-syscon = &lt;&amp;iomcu&gt;;</div><div class='add'>+		#reset-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Specifying reset lines connected to IP modules</div><div class='add'>+==============================================</div><div class='add'>+example:</div><div class='add'>+</div><div class='add'>+        i2c0: i2c@..... {</div><div class='add'>+                ...</div><div class='add'>+		resets = &lt;&amp;iomcu_rst 0x20 3&gt;; /* offset: 0x20; bit: 3 */</div><div class='add'>+                ...</div><div class='add'>+        };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/reset/oxnas,reset.txt b/Documentation/devicetree/bindings/reset/oxnas,reset.txt<br/>index 6f06db930030..d27ccb5d04fc 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/oxnas,reset.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/reset/oxnas,reset.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/oxnas,reset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/oxnas,reset.txt</a></div><div class='hunk'>@@ -5,45 +5,19 @@ Please also refer to reset.txt in this directory for common reset</div><div class='ctx'> controller binding usage.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Should be "oxsemi,ox810se-reset"</div><div class='add'>+- compatible: For OX810SE, should be "oxsemi,ox810se-reset"</div><div class='add'>+	      For OX820, should be "oxsemi,ox820-reset"</div><div class='ctx'> - #reset-cells: 1, see below</div><div class='ctx'> </div><div class='ctx'> Parent node should have the following properties :</div><div class='del'>-- compatible: Should be "oxsemi,ox810se-sys-ctrl", "syscon", "simple-mfd"</div><div class='add'>+- compatible: For OX810SE, should be :</div><div class='add'>+			"oxsemi,ox810se-sys-ctrl", "syscon", "simple-mfd"</div><div class='add'>+	      For OX820, should be :</div><div class='add'>+			"oxsemi,ox820-sys-ctrl", "syscon", "simple-mfd"</div><div class='ctx'> </div><div class='del'>-For OX810SE, the indices are :</div><div class='del'>- - 0 : ARM</div><div class='del'>- - 1 : COPRO</div><div class='del'>- - 2 : Reserved</div><div class='del'>- - 3 : Reserved</div><div class='del'>- - 4 : USBHS</div><div class='del'>- - 5 : USBHSPHY</div><div class='del'>- - 6 : MAC</div><div class='del'>- - 7 : PCI</div><div class='del'>- - 8 : DMA</div><div class='del'>- - 9 : DPE</div><div class='del'>- - 10 : DDR</div><div class='del'>- - 11 : SATA</div><div class='del'>- - 12 : SATA_LINK</div><div class='del'>- - 13 : SATA_PHY</div><div class='del'>- - 14 : Reserved</div><div class='del'>- - 15 : NAND</div><div class='del'>- - 16 : GPIO</div><div class='del'>- - 17 : UART1</div><div class='del'>- - 18 : UART2</div><div class='del'>- - 19 : MISC</div><div class='del'>- - 20 : I2S</div><div class='del'>- - 21 : AHB_MON</div><div class='del'>- - 22 : UART3</div><div class='del'>- - 23 : UART4</div><div class='del'>- - 24 : SGDMA</div><div class='del'>- - 25 : Reserved</div><div class='del'>- - 26 : Reserved</div><div class='del'>- - 27 : Reserved</div><div class='del'>- - 28 : Reserved</div><div class='del'>- - 29 : Reserved</div><div class='del'>- - 30 : Reserved</div><div class='del'>- - 31 : BUS</div><div class='add'>+Reset indices are in dt-bindings include files :</div><div class='add'>+- For OX810SE: include/dt-bindings/reset/oxsemi,ox810se.h</div><div class='add'>+- For OX820: include/dt-bindings/reset/oxsemi,ox820.h</div><div class='ctx'> </div><div class='ctx'> example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/reset/renesas,rst.txt b/Documentation/devicetree/bindings/reset/renesas,rst.txt<br/>new file mode 100644<br/>index 000000000000..fe5e0f37b3c9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/renesas,rst.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/renesas,rst.txt</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+DT bindings for the Renesas R-Car and RZ/G Reset Controllers</div><div class='add'>+</div><div class='add'>+The R-Car and RZ/G Reset Controllers provide reset control, and implement the</div><div class='add'>+following functions:</div><div class='add'>+  - Latching of the levels on mode pins when PRESET# is negated,</div><div class='add'>+  - Mode monitoring register,</div><div class='add'>+  - Reset control of peripheral devices (on R-Car Gen1),</div><div class='add'>+  - Watchdog timer (on R-Car Gen1),</div><div class='add'>+  - Register-based reset control and boot address registers for the various CPU</div><div class='add'>+    cores (on R-Car Gen2 and Gen3, and on RZ/G).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible: Should be</div><div class='add'>+		  - "renesas,&lt;soctype&gt;-reset-wdt" for R-Car Gen1,</div><div class='add'>+		  - "renesas,&lt;soctype&gt;-rst" for R-Car Gen2 and Gen3, and RZ/G</div><div class='add'>+		Examples with soctypes are:</div><div class='add'>+		  - "renesas,r8a7743-rst" (RZ/G1M)</div><div class='add'>+		  - "renesas,r8a7745-rst" (RZ/G1E)</div><div class='add'>+		  - "renesas,r8a7778-reset-wdt" (R-Car M1A)</div><div class='add'>+		  - "renesas,r8a7779-reset-wdt" (R-Car H1)</div><div class='add'>+		  - "renesas,r8a7790-rst" (R-Car H2)</div><div class='add'>+		  - "renesas,r8a7791-rst" (R-Car M2-W)</div><div class='add'>+		  - "renesas,r8a7792-rst" (R-Car V2H</div><div class='add'>+		  - "renesas,r8a7793-rst" (R-Car M2-N)</div><div class='add'>+		  - "renesas,r8a7794-rst" (R-Car E2)</div><div class='add'>+		  - "renesas,r8a7795-rst" (R-Car H3)</div><div class='add'>+		  - "renesas,r8a7796-rst" (R-Car M3-W)</div><div class='add'>+  - reg: Address start and address range for the device.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	rst: reset-controller@e6160000 {</div><div class='add'>+		compatible = "renesas,r8a7795-rst";</div><div class='add'>+		reg = &lt;0 0xe6160000 0 0x0200&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt<br/>index 1cfd21d1dfa1..92527138bc93 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/reset/st,sti-powerdown.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/st,sti-powerdown.txt</a></div><div class='hunk'>@@ -16,15 +16,14 @@ Please refer to reset.txt in this directory for common reset</div><div class='ctx'> controller binding usage.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Should be "st,&lt;chip&gt;-powerdown"</div><div class='del'>-	ex: "st,stih415-powerdown", "st,stih416-powerdown"</div><div class='add'>+- compatible: Should be "st,stih407-powerdown"</div><div class='ctx'> - #reset-cells: 1, see below</div><div class='ctx'> </div><div class='ctx'> example:</div><div class='ctx'> </div><div class='ctx'> 	powerdown: powerdown-controller {</div><div class='add'>+		compatible = "st,stih407-powerdown";</div><div class='ctx'> 		#reset-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "st,stih415-powerdown";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -37,11 +36,10 @@ index specifying which channel to use, as described in reset.txt</div><div class='ctx'> </div><div class='ctx'> example:</div><div class='ctx'> </div><div class='del'>-	usb1: usb@fe200000 {</div><div class='del'>-		resets	= &lt;&amp;powerdown STIH41X_USB1_POWERDOWN&gt;;</div><div class='add'>+	st_dwc3: dwc3@8f94000 {</div><div class='add'>+		resets          = &lt;&amp;powerdown STIH407_USB3_POWERDOWN&gt;,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> Macro definitions for the supported reset channels can be found in:</div><div class='ctx'> </div><div class='del'>-include/dt-bindings/reset/stih415-resets.h</div><div class='del'>-include/dt-bindings/reset/stih416-resets.h</div><div class='add'>+include/dt-bindings/reset/stih407-resets.h</div><div class='head'>diff --git a/Documentation/devicetree/bindings/reset/st,sti-softreset.txt b/Documentation/devicetree/bindings/reset/st,sti-softreset.txt<br/>index 891a2fd85ed6..a21658f18fe6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/st,sti-softreset.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/reset/st,sti-softreset.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/st,sti-softreset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/st,sti-softreset.txt</a></div><div class='hunk'>@@ -15,15 +15,14 @@ Please refer to reset.txt in this directory for common reset</div><div class='ctx'> controller binding usage.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Should be "st,&lt;chip&gt;-softreset" example:</div><div class='del'>-	"st,stih415-softreset" or "st,stih416-softreset";</div><div class='add'>+- compatible: Should be st,stih407-softreset";</div><div class='ctx'> - #reset-cells: 1, see below</div><div class='ctx'> </div><div class='ctx'> example:</div><div class='ctx'> </div><div class='ctx'> 	softreset: softreset-controller {</div><div class='ctx'> 		#reset-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "st,stih415-softreset";</div><div class='add'>+		compatible = "st,stih407-softreset";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -42,5 +41,4 @@ example:</div><div class='ctx'> </div><div class='ctx'> Macro definitions for the supported reset channels can be found in:</div><div class='ctx'> </div><div class='del'>-include/dt-bindings/reset/stih415-resets.h</div><div class='del'>-include/dt-bindings/reset/stih416-resets.h</div><div class='add'>+include/dt-bindings/reset/stih407-resets.h</div><div class='head'>diff --git a/Documentation/devicetree/bindings/reset/ti-syscon-reset.txt b/Documentation/devicetree/bindings/reset/ti-syscon-reset.txt<br/>index 164c7f34c451..c516d24959f2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/ti-syscon-reset.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/reset/ti-syscon-reset.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/ti-syscon-reset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/ti-syscon-reset.txt</a></div><div class='hunk'>@@ -63,7 +63,7 @@ Example:</div><div class='ctx'> --------</div><div class='ctx'> The following example demonstrates a syscon node, the reset controller node</div><div class='ctx'> using the syscon node, and a consumer (a DSP device) on the TI Keystone 2</div><div class='del'>-Edison SoC.</div><div class='add'>+66AK2E SoC.</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	soc {</div><div class='hunk'>@@ -71,13 +71,13 @@ Edison SoC.</div><div class='ctx'> 			compatible = "syscon", "simple-mfd";</div><div class='ctx'> 			reg = &lt;0x02350000 0x1000&gt;;</div><div class='ctx'> </div><div class='del'>-			pscrst: psc-reset {</div><div class='add'>+			pscrst: reset-controller {</div><div class='ctx'> 				compatible = "ti,k2e-pscrst", "ti,syscon-reset";</div><div class='ctx'> 				#reset-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 				ti,reset-bits = &lt;</div><div class='del'>-					0xa3c 8 0xa3c 8 0x83c 8 (ASSERT_SET|DEASSERT_CLEAR|STATUS_SET)   /* 0: pcrst-dsp0 */</div><div class='del'>-					0xa40 5 0xa44 3 0     0 (ASSERT_SET|DEASSERT_CLEAR|STATUS_NONE)  /* 1: pcrst-example */</div><div class='add'>+					0xa3c 8 0xa3c 8 0x83c 8 (ASSERT_CLEAR | DEASSERT_SET   | STATUS_CLEAR) /* 0: dsp0 */</div><div class='add'>+					0xa40 5 0xa44 3 0     0 (ASSERT_SET   | DEASSERT_CLEAR | STATUS_NONE)  /* 1: example */</div><div class='ctx'> 				&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/reset/uniphier-reset.txt b/Documentation/devicetree/bindings/reset/uniphier-reset.txt<br/>index 5020524cddeb..83ab0f599c40 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/uniphier-reset.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/reset/uniphier-reset.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/uniphier-reset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/uniphier-reset.txt</a></div><div class='hunk'>@@ -6,14 +6,14 @@ System reset</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible: should be one of the following:</div><div class='del'>-    "socionext,uniphier-sld3-reset" - for sLD3 SoC.</div><div class='del'>-    "socionext,uniphier-ld4-reset"  - for LD4 SoC.</div><div class='del'>-    "socionext,uniphier-pro4-reset" - for Pro4 SoC.</div><div class='del'>-    "socionext,uniphier-sld8-reset" - for sLD8 SoC.</div><div class='del'>-    "socionext,uniphier-pro5-reset" - for Pro5 SoC.</div><div class='del'>-    "socionext,uniphier-pxs2-reset" - for PXs2/LD6b SoC.</div><div class='del'>-    "socionext,uniphier-ld11-reset" - for LD11 SoC.</div><div class='del'>-    "socionext,uniphier-ld20-reset" - for LD20 SoC.</div><div class='add'>+    "socionext,uniphier-sld3-reset" - for sLD3 SoC</div><div class='add'>+    "socionext,uniphier-ld4-reset"  - for LD4 SoC</div><div class='add'>+    "socionext,uniphier-pro4-reset" - for Pro4 SoC</div><div class='add'>+    "socionext,uniphier-sld8-reset" - for sLD8 SoC</div><div class='add'>+    "socionext,uniphier-pro5-reset" - for Pro5 SoC</div><div class='add'>+    "socionext,uniphier-pxs2-reset" - for PXs2/LD6b SoC</div><div class='add'>+    "socionext,uniphier-ld11-reset" - for LD11 SoC</div><div class='add'>+    "socionext,uniphier-ld20-reset" - for LD20 SoC</div><div class='ctx'> - #reset-cells: should be 1.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='hunk'>@@ -37,14 +37,15 @@ Media I/O (MIO) reset, SD reset</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible: should be one of the following:</div><div class='del'>-    "socionext,uniphier-sld3-mio-reset" - for sLD3 SoC.</div><div class='del'>-    "socionext,uniphier-ld4-mio-reset"  - for LD4 SoC.</div><div class='del'>-    "socionext,uniphier-pro4-mio-reset" - for Pro4 SoC.</div><div class='del'>-    "socionext,uniphier-sld8-mio-reset" - for sLD8 SoC.</div><div class='del'>-    "socionext,uniphier-pro5-sd-reset"  - for Pro5 SoC.</div><div class='del'>-    "socionext,uniphier-pxs2-sd-reset"  - for PXs2/LD6b SoC.</div><div class='del'>-    "socionext,uniphier-ld11-mio-reset" - for LD11 SoC.</div><div class='del'>-    "socionext,uniphier-ld20-sd-reset"  - for LD20 SoC.</div><div class='add'>+    "socionext,uniphier-sld3-mio-reset" - for sLD3 SoC</div><div class='add'>+    "socionext,uniphier-ld4-mio-reset"  - for LD4 SoC</div><div class='add'>+    "socionext,uniphier-pro4-mio-reset" - for Pro4 SoC</div><div class='add'>+    "socionext,uniphier-sld8-mio-reset" - for sLD8 SoC</div><div class='add'>+    "socionext,uniphier-pro5-sd-reset"  - for Pro5 SoC</div><div class='add'>+    "socionext,uniphier-pxs2-sd-reset"  - for PXs2/LD6b SoC</div><div class='add'>+    "socionext,uniphier-ld11-mio-reset" - for LD11 SoC (MIO)</div><div class='add'>+    "socionext,uniphier-ld11-sd-reset"  - for LD11 SoC (SD)</div><div class='add'>+    "socionext,uniphier-ld20-sd-reset"  - for LD20 SoC</div><div class='ctx'> - #reset-cells: should be 1.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='hunk'>@@ -68,13 +69,13 @@ Peripheral reset</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible: should be one of the following:</div><div class='del'>-    "socionext,uniphier-ld4-peri-reset"  - for LD4 SoC.</div><div class='del'>-    "socionext,uniphier-pro4-peri-reset" - for Pro4 SoC.</div><div class='del'>-    "socionext,uniphier-sld8-peri-reset" - for sLD8 SoC.</div><div class='del'>-    "socionext,uniphier-pro5-peri-reset" - for Pro5 SoC.</div><div class='del'>-    "socionext,uniphier-pxs2-peri-reset" - for PXs2/LD6b SoC.</div><div class='del'>-    "socionext,uniphier-ld11-peri-reset" - for LD11 SoC.</div><div class='del'>-    "socionext,uniphier-ld20-peri-reset" - for LD20 SoC.</div><div class='add'>+    "socionext,uniphier-ld4-peri-reset"  - for LD4 SoC</div><div class='add'>+    "socionext,uniphier-pro4-peri-reset" - for Pro4 SoC</div><div class='add'>+    "socionext,uniphier-sld8-peri-reset" - for sLD8 SoC</div><div class='add'>+    "socionext,uniphier-pro5-peri-reset" - for Pro5 SoC</div><div class='add'>+    "socionext,uniphier-pxs2-peri-reset" - for PXs2/LD6b SoC</div><div class='add'>+    "socionext,uniphier-ld11-peri-reset" - for LD11 SoC</div><div class='add'>+    "socionext,uniphier-ld20-peri-reset" - for LD20 SoC</div><div class='ctx'> - #reset-cells: should be 1.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt b/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt<br/>new file mode 100644<br/>index 000000000000..b015508f9780<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+ZTE zx2967 SoCs Reset Controller</div><div class='add'>+=======================================</div><div class='add'>+</div><div class='add'>+Please also refer to reset.txt in this directory for common reset</div><div class='add'>+controller binding usage.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be one of the following.</div><div class='add'>+	* zte,zx296718-reset</div><div class='add'>+- reg: physical base address of the controller and length of memory mapped</div><div class='add'>+	region.</div><div class='add'>+- #reset-cells: must be 1.</div><div class='add'>+</div><div class='add'>+example:</div><div class='add'>+</div><div class='add'>+	reset: reset-controller@1461060 {</div><div class='add'>+		compatible = "zte,zx296718-reset";</div><div class='add'>+		reg = &lt;0x01461060 0x8&gt;;</div><div class='add'>+		#reset-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rng/omap_rng.txt b/Documentation/devicetree/bindings/rng/omap_rng.txt<br/>index 6a62acd86953..471477299ece 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rng/omap_rng.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/rng/omap_rng.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rng/omap_rng.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rng/omap_rng.txt</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-OMAP SoC HWRNG Module</div><div class='add'>+OMAP SoC and Inside-Secure HWRNG Module</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> </div><div class='hunk'>@@ -6,11 +6,13 @@ Required properties:</div><div class='ctx'>   RNG versions:</div><div class='ctx'>   - "ti,omap2-rng" for OMAP2.</div><div class='ctx'>   - "ti,omap4-rng" for OMAP4, OMAP5 and AM33XX.</div><div class='add'>+  - "inside-secure,safexcel-eip76" for SoCs with EIP76 IP block</div><div class='ctx'>   Note that these two versions are incompatible.</div><div class='ctx'> - ti,hwmods: Name of the hwmod associated with the RNG module</div><div class='ctx'> - reg : Offset and length of the register set for the module</div><div class='ctx'> - interrupts : the interrupt number for the RNG module.</div><div class='del'>-		Only used for "ti,omap4-rng".</div><div class='add'>+		Used for "ti,omap4-rng" and "inside-secure,safexcel-eip76"</div><div class='add'>+- clocks: the trng clock source</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> /* AM335x */</div><div class='hunk'>@@ -20,3 +22,11 @@ rng: rng@48310000 {</div><div class='ctx'> 	reg = &lt;0x48310000 0x2000&gt;;</div><div class='ctx'> 	interrupts = &lt;111&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* SafeXcel IP-76 */</div><div class='add'>+trng: rng@f2760000 {</div><div class='add'>+	compatible = "inside-secure,safexcel-eip76";</div><div class='add'>+	reg = &lt;0xf2760000 0x7d&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	clocks = &lt;&amp;cpm_syscon0 1 25&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/armada-380-rtc.txt b/Documentation/devicetree/bindings/rtc/armada-380-rtc.txt<br/>index 2eb9d4ee7dc0..c3c9a1226f9a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/armada-380-rtc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/rtc/armada-380-rtc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/armada-380-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/armada-380-rtc.txt</a></div><div class='hunk'>@@ -1,9 +1,11 @@</div><div class='del'>-* Real Time Clock of the Armada 38x SoCs</div><div class='add'>+* Real Time Clock of the Armada 38x/7K/8K SoCs</div><div class='ctx'> </div><div class='del'>-RTC controller for the Armada 38x SoCs</div><div class='add'>+RTC controller for the Armada 38x, 7K and 8K SoCs</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible : Should be "marvell,armada-380-rtc"</div><div class='add'>+- compatible : Should be one of the following:</div><div class='add'>+	"marvell,armada-380-rtc" for Armada 38x SoC</div><div class='add'>+	"marvell,armada-8k-rtc" for Aramda 7K/8K SoCs</div><div class='ctx'> - reg: a list of base address and size pairs, one for each entry in</div><div class='ctx'>   reg-names</div><div class='ctx'> - reg names: should contain:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/cortina,gemini.txt b/Documentation/devicetree/bindings/rtc/cortina,gemini.txt<br/>new file mode 100644<br/>index 000000000000..4ce4e794ddbb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/cortina,gemini.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/cortina,gemini.txt</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+* Cortina Systems Gemini RTC</div><div class='add'>+</div><div class='add'>+Gemini SoC real-time clock.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : Should be "cortina,gemini-rtc"</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+rtc@45000000 {</div><div class='add'>+	compatible = "cortina,gemini-rtc";</div><div class='add'>+	reg = &lt;0x45000000 0x100&gt;;</div><div class='add'>+	interrupts = &lt;17 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/epson,rtc7301.txt b/Documentation/devicetree/bindings/rtc/epson,rtc7301.txt<br/>new file mode 100644<br/>index 000000000000..5f9df3f1467c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/epson,rtc7301.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/epson,rtc7301.txt</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+EPSON TOYOCOM RTC-7301SF/DG</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: Should be "epson,rtc7301sf" or "epson,rtc7301dg"</div><div class='add'>+- reg: Specifies base physical address and size of the registers.</div><div class='add'>+- interrupts: A single interrupt specifier.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+rtc: rtc@44a00000 {</div><div class='add'>+	compatible = "epson,rtc7301dg";</div><div class='add'>+	reg = &lt;0x44a00000 0x10000&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;axi_intc_0&gt;;</div><div class='add'>+	interrupts = &lt;3 2&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/imxdi-rtc.txt b/Documentation/devicetree/bindings/rtc/imxdi-rtc.txt<br/>index c9d80d7da141..323cf26374cb 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/imxdi-rtc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/rtc/imxdi-rtc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/imxdi-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/imxdi-rtc.txt</a></div><div class='hunk'>@@ -8,10 +8,13 @@ Required properties:</div><div class='ctx'>   region.</div><div class='ctx'> - interrupts: rtc alarm interrupt</div><div class='ctx'> </div><div class='add'>+Optional properties:</div><div class='add'>+- interrupts: dryice security violation interrupt</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> rtc@80056000 {</div><div class='ctx'> 	compatible = "fsl,imx53-rtc", "fsl,imx25-rtc";</div><div class='ctx'> 	reg = &lt;0x80056000 2000&gt;;</div><div class='del'>-	interrupts = &lt;29&gt;;</div><div class='add'>+	interrupts = &lt;29 56&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt b/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt<br/>new file mode 100644<br/>index 000000000000..41c7ae18fd7b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+JZ4740 and similar SoCs real-time clock driver</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: One of:</div><div class='add'>+  - "ingenic,jz4740-rtc" - for use with the JZ4740 SoC</div><div class='add'>+  - "ingenic,jz4780-rtc" - for use with the JZ4780 SoC</div><div class='add'>+- reg: Address range of rtc register set</div><div class='add'>+- interrupts: IRQ number for the alarm interrupt</div><div class='add'>+- clocks: phandle to the "rtc" clock</div><div class='add'>+- clock-names: must be "rtc"</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- system-power-controller: To use this component as the</div><div class='add'>+  system power controller</div><div class='add'>+- reset-pin-assert-time-ms: Reset pin low-level assertion</div><div class='add'>+  time after wakeup (default 60ms; range 0-125ms if RTC clock</div><div class='add'>+  at 32 kHz)</div><div class='add'>+- min-wakeup-pin-assert-time-ms: Minimum wakeup pin assertion</div><div class='add'>+  time (default 100ms; range 0-2s if RTC clock at 32 kHz)</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+rtc@10003000 {</div><div class='add'>+	compatible = "ingenic,jz4740-rtc";</div><div class='add'>+	reg = &lt;0x10003000 0x40&gt;;</div><div class='add'>+</div><div class='add'>+	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+	interrupts = &lt;32&gt;;</div><div class='add'>+</div><div class='add'>+	clocks = &lt;&amp;rtc_clock&gt;;</div><div class='add'>+	clock-names = "rtc";</div><div class='add'>+</div><div class='add'>+	system-power-controller;</div><div class='add'>+	reset-pin-assert-time-ms = &lt;60&gt;;</div><div class='add'>+	min-wakeup-pin-assert-time-ms = &lt;100&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/maxim,ds3231.txt b/Documentation/devicetree/bindings/rtc/maxim,ds3231.txt<br/>index ddef330d2709..85be53a42180 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/maxim,ds3231.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/rtc/maxim,ds3231.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/maxim,ds3231.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/maxim,ds3231.txt</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='ctx'> * Maxim DS3231 Real Time Clock</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-see: Documentation/devicetree/bindings/i2c/trivial-devices.txt</div><div class='add'>+- compatible: Should contain "maxim,ds3231".</div><div class='add'>+- reg: I2C address for chip.</div><div class='ctx'> </div><div class='ctx'> Optional property:</div><div class='ctx'> - #clock-cells: Should be 1.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/pcf8563.txt b/Documentation/devicetree/bindings/rtc/pcf8563.txt<br/>index 72f6d2c9665e..36984acbb383 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/pcf8563.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/rtc/pcf8563.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/pcf8563.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/pcf8563.txt</a></div><div class='hunk'>@@ -3,7 +3,8 @@</div><div class='ctx'> Philips PCF8563/Epson RTC8564 Real Time Clock</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-see: Documentation/devicetree/bindings/i2c/trivial-devices.txt</div><div class='add'>+- compatible: Should contain "nxp,pcf8563".</div><div class='add'>+- reg: I2C address for chip.</div><div class='ctx'> </div><div class='ctx'> Optional property:</div><div class='ctx'> - #clock-cells: Should be 0.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt b/Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt<br/>new file mode 100644<br/>index 000000000000..e2837b951237<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+STM32 Real Time Clock</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: "st,stm32-rtc".</div><div class='add'>+- reg: address range of rtc register set.</div><div class='add'>+- clocks: reference to the clock entry ck_rtc.</div><div class='add'>+- interrupt-parent: phandle for the interrupt controller.</div><div class='add'>+- interrupts: rtc alarm interrupt.</div><div class='add'>+- st,syscfg: phandle for pwrcfg, mandatory to disable/enable backup domain</div><div class='add'>+  (RTC registers) write protection.</div><div class='add'>+</div><div class='add'>+Optional properties (to override default ck_rtc parent clock):</div><div class='add'>+- assigned-clocks: reference to the ck_rtc clock entry.</div><div class='add'>+- assigned-clock-parents: phandle of the new parent clock of ck_rtc.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	rtc: rtc@40002800 {</div><div class='add'>+		compatible = "st,stm32-rtc";</div><div class='add'>+		reg = &lt;0x40002800 0x400&gt;;</div><div class='add'>+		clocks = &lt;&amp;rcc 1 CLK_RTC&gt;;</div><div class='add'>+		assigned-clocks = &lt;&amp;rcc 1 CLK_RTC&gt;;</div><div class='add'>+		assigned-clock-parents = &lt;&amp;rcc 1 CLK_LSE&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;exti&gt;;</div><div class='add'>+		interrupts = &lt;17 1&gt;;</div><div class='add'>+		st,syscfg = &lt;&amp;pwrcfg&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/sun6i-rtc.txt b/Documentation/devicetree/bindings/rtc/sun6i-rtc.txt<br/>index f007e428a1ab..945934918b71 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/sun6i-rtc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/rtc/sun6i-rtc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/sun6i-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/sun6i-rtc.txt</a></div><div class='hunk'>@@ -8,10 +8,20 @@ Required properties:</div><div class='ctx'> 		  memory mapped region.</div><div class='ctx'> - interrupts	: IRQ lines for the RTC alarm 0 and alarm 1, in that order.</div><div class='ctx'> </div><div class='add'>+Required properties for new device trees</div><div class='add'>+- clocks	: phandle to the 32kHz external oscillator</div><div class='add'>+- clock-output-names : name of the LOSC clock created</div><div class='add'>+- #clock-cells  : must be equals to 1. The RTC provides two clocks: the</div><div class='add'>+		  LOSC and its external output, with index 0 and 1</div><div class='add'>+		  respectively.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> rtc: rtc@01f00000 {</div><div class='ctx'> 	compatible = "allwinner,sun6i-a31-rtc";</div><div class='ctx'> 	reg = &lt;0x01f00000 0x54&gt;;</div><div class='ctx'> 	interrupts = &lt;0 40 4&gt;, &lt;0 41 4&gt;;</div><div class='add'>+	clock-output-names = "osc32k";</div><div class='add'>+	clocks = &lt;&amp;ext_osc32k&gt;;</div><div class='add'>+	#clock-cells = &lt;1&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/twl-rtc.txt b/Documentation/devicetree/bindings/rtc/twl-rtc.txt<br/>index 596e0c97be7a..8f9a94f2f896 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/twl-rtc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/rtc/twl-rtc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/rtc/twl-rtc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/rtc/twl-rtc.txt</a></div><div class='hunk'>@@ -1,12 +1,11 @@</div><div class='del'>-* TI twl RTC</div><div class='del'>-</div><div class='del'>-The TWL family (twl4030/6030) contains a RTC.</div><div class='add'>+* Texas Instruments TWL4030/6030 RTC</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible : Should be twl4030-rtc</div><div class='del'>-</div><div class='del'>-Examples:</div><div class='del'>-</div><div class='del'>-rtc@0 {</div><div class='del'>-    compatible = "ti,twl4030-rtc";</div><div class='del'>-};</div><div class='add'>+- compatible : Should be "ti,twl4030-rtc"</div><div class='add'>+- interrupts : Should be the interrupt number.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	rtc {</div><div class='add'>+		compatible = "ti,twl4030-rtc";</div><div class='add'>+		interrupts = &lt;11&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt b/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt<br/>index bf2411f366e5..2a42a323fa1a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/scsi/hisilicon-sas.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/scsi/hisilicon-sas.txt</a></div><div class='hunk'>@@ -6,6 +6,7 @@ Main node required properties:</div><div class='ctx'>   - compatible : value should be as follows:</div><div class='ctx'> 	(a) "hisilicon,hip05-sas-v1" for v1 hw in hip05 chipset</div><div class='ctx'> 	(b) "hisilicon,hip06-sas-v2" for v2 hw in hip06 chipset</div><div class='add'>+	(c) "hisilicon,hip07-sas-v2" for v2 hw in hip07 chipset</div><div class='ctx'>   - sas-addr : array of 8 bytes for host SAS address</div><div class='ctx'>   - reg : Address and length of the SAS register</div><div class='ctx'>   - hisilicon,sas-syscon: phandle of syscon used for sas control</div><div class='head'>diff --git a/Documentation/devicetree/bindings/security/tpm/ibmvtpm.txt b/Documentation/devicetree/bindings/security/tpm/ibmvtpm.txt<br/>new file mode 100644<br/>index 000000000000..d89f99971368<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/security/tpm/ibmvtpm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/security/tpm/ibmvtpm.txt</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+* Device Tree Bindings for IBM Virtual Trusted Platform Module(vtpm)</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible            : property name that conveys the platform architecture</div><div class='add'>+                          identifiers, as 'IBM,vtpm'</div><div class='add'>+- device_type           : specifies type of virtual device</div><div class='add'>+- interrupts            : property specifying the interrupt source number and</div><div class='add'>+                          sense code associated with this virtual I/O Adapters</div><div class='add'>+- ibm,my-drc-index      : integer index for the connector between the device</div><div class='add'>+                          and its parent - present only if Dynamic</div><div class='add'>+                          Reconfiguration(DR) Connector is enabled</div><div class='add'>+- ibm,#dma-address-cells: specifies the number of cells that are used to</div><div class='add'>+                          encode the physical address field of dma-window</div><div class='add'>+                          properties</div><div class='add'>+- ibm,#dma-size-cells   : specifies the number of cells that are used to</div><div class='add'>+                          encode the size field of dma-window properties</div><div class='add'>+- ibm,my-dma-window     : specifies DMA window associated with this virtual</div><div class='add'>+                          IOA</div><div class='add'>+- ibm,loc-code          : specifies the unique and persistent location code</div><div class='add'>+                          associated with this virtual I/O Adapters</div><div class='add'>+- linux,sml-base        : 64-bit base address of the reserved memory allocated</div><div class='add'>+                          for the firmware event log</div><div class='add'>+- linux,sml-size        : size of the memory allocated for the firmware event log</div><div class='add'>+</div><div class='add'>+Example (IBM Virtual Trusted Platform Module)</div><div class='add'>+---------------------------------------------</div><div class='add'>+</div><div class='add'>+                vtpm@30000003 {</div><div class='add'>+                        ibm,#dma-size-cells = &lt;0x2&gt;;</div><div class='add'>+                        compatible = "IBM,vtpm";</div><div class='add'>+                        device_type = "IBM,vtpm";</div><div class='add'>+                        ibm,my-drc-index = &lt;0x30000003&gt;;</div><div class='add'>+                        ibm,#dma-address-cells = &lt;0x2&gt;;</div><div class='add'>+                        linux,sml-base = &lt;0xc60e 0x0&gt;;</div><div class='add'>+                        interrupts = &lt;0xa0003 0x0&gt;;</div><div class='add'>+                        ibm,my-dma-window = &lt;0x10000003 0x0 0x0 0x0 0x10000000&gt;;</div><div class='add'>+                        ibm,loc-code = "U8286.41A.10082DV-V3-C3";</div><div class='add'>+                        reg = &lt;0x30000003&gt;;</div><div class='add'>+                        linux,sml-size = &lt;0xbce10200&gt;;</div><div class='add'>+                };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt<br/>new file mode 100644<br/>index 000000000000..8cb638b7e89c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+* Device Tree Bindings for I2C based Trusted Platform Module(TPM)</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible     : 'manufacturer,model', eg. nuvoton,npct650</div><div class='add'>+- label          : human readable string describing the device, eg. "tpm"</div><div class='add'>+- linux,sml-base : 64-bit base address of the reserved memory allocated for</div><div class='add'>+                   the firmware event log</div><div class='add'>+- linux,sml-size : size of the memory allocated for the firmware event log</div><div class='add'>+</div><div class='add'>+Example (for OpenPower Systems with Nuvoton TPM 2.0 on I2C)</div><div class='add'>+----------------------------------------------------------</div><div class='add'>+</div><div class='add'>+tpm@57 {</div><div class='add'>+	reg = &lt;0x57&gt;;</div><div class='add'>+	label = "tpm";</div><div class='add'>+	compatible = "nuvoton,npct650", "nuvoton,npct601";</div><div class='add'>+	linux,sml-base = &lt;0x7f 0xfd450000&gt;;</div><div class='add'>+	linux,sml-size = &lt;0x10000&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/security/tpm/tpm_tis_mmio.txt b/Documentation/devicetree/bindings/security/tpm/tpm_tis_mmio.txt<br/>new file mode 100644<br/>index 000000000000..41d740545189<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/security/tpm/tpm_tis_mmio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/security/tpm/tpm_tis_mmio.txt</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+Trusted Computing Group MMIO Trusted Platform Module</div><div class='add'>+</div><div class='add'>+The TCG defines multi vendor standard for accessing a TPM chip, this</div><div class='add'>+is the standard protocol defined to access the TPM via MMIO. Typically</div><div class='add'>+this interface will be implemented over Intel's LPC bus.</div><div class='add'>+</div><div class='add'>+Refer to the 'TCG PC Client Specific TPM Interface Specification (TIS)' TCG</div><div class='add'>+publication for the specification.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: should contain a string below for the chip, followed by</div><div class='add'>+              "tcg,tpm-tis-mmio". Valid chip strings are:</div><div class='add'>+	          * "atmel,at97sc3204"</div><div class='add'>+- reg: The location of the MMIO registers, should be at least 0x5000 bytes</div><div class='add'>+- interrupt-parent/interrupts: An optional interrupt indicating command completion.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	tpm_tis@90000 {</div><div class='add'>+				compatible = "atmel,at97sc3204", "tcg,tpm-tis-mmio";</div><div class='add'>+				reg = &lt;0x90000 0x5000&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;EIC0&gt;;</div><div class='add'>+				interrupts = &lt;1 2&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/8250.txt b/Documentation/devicetree/bindings/serial/8250.txt<br/>index f86bb06c39e9..10276a46ecef 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/serial/8250.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/serial/8250.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/serial/8250.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/serial/8250.txt</a></div><div class='hunk'>@@ -19,6 +19,7 @@ Required properties:</div><div class='ctx'> 	- "altr,16550-FIFO128"</div><div class='ctx'> 	- "fsl,16550-FIFO64"</div><div class='ctx'> 	- "fsl,ns16550"</div><div class='add'>+	- "ti,da830-uart"</div><div class='ctx'> 	- "serial" if the port type is unknown.</div><div class='ctx'> - reg : offset and length of the register set for the device.</div><div class='ctx'> - interrupts : should contain uart interrupt.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt<br/>index 1e82802d8e32..574c3a2c77d5 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/serial/fsl-imx-uart.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/serial/fsl-imx-uart.txt</a></div><div class='hunk'>@@ -6,11 +6,13 @@ Required properties:</div><div class='ctx'> - interrupts : Should contain uart interrupt</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='del'>-- uart-has-rtscts : Indicate the uart has rts and cts</div><div class='ctx'> - fsl,irda-mode : Indicate the uart supports irda mode</div><div class='ctx'> - fsl,dte-mode : Indicate the uart works in DTE mode. The uart works</div><div class='ctx'>                   in DCE mode by default.</div><div class='ctx'> </div><div class='add'>+Please check Documentation/devicetree/bindings/serial/serial.txt</div><div class='add'>+for the complete list of generic properties.</div><div class='add'>+</div><div class='ctx'> Note: Each uart controller should have an alias correctly numbered</div><div class='ctx'> in "aliases" node.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt b/Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt<br/>index 845850caf088..c93a2d1c1a65 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt</a></div><div class='hunk'>@@ -10,7 +10,7 @@ Required properties:</div><div class='ctx'>   See ../reset/reset.txt for details.</div><div class='ctx'> - reset-names : Must include the following entries:</div><div class='ctx'>   - serial</div><div class='del'>-- dmas : Must contain an entry for each entry in clock-names.</div><div class='add'>+- dmas : Must contain an entry for each entry in dma-names.</div><div class='ctx'>   See ../dma/dma.txt for details.</div><div class='ctx'> - dma-names : Must include the following entries:</div><div class='ctx'>   - rx</div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/serial.txt b/Documentation/devicetree/bindings/serial/serial.txt<br/>index fd970f76a7b8..b542a0ecf06e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/serial/serial.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/serial/serial.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/serial/serial.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/serial/serial.txt</a></div><div class='hunk'>@@ -23,7 +23,8 @@ Optional properties:</div><div class='ctx'>     they are available for use (wired and enabled by pinmux configuration).</div><div class='ctx'>     This depends on both the UART hardware and the board wiring.</div><div class='ctx'>     Note that this property is mutually-exclusive with "cts-gpios" and</div><div class='del'>-    "rts-gpios" above.</div><div class='add'>+    "rts-gpios" above, unless support is provided to switch between modes</div><div class='add'>+    dynamically.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Examples:</div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/slave-device.txt b/Documentation/devicetree/bindings/serial/slave-device.txt<br/>new file mode 100644<br/>index 000000000000..f66037928f5f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/serial/slave-device.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/serial/slave-device.txt</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+Serial Slave Device DT binding</div><div class='add'>+</div><div class='add'>+This documents the binding structure and common properties for serial</div><div class='add'>+attached devices. Common examples include Bluetooth, WiFi, NFC and GPS</div><div class='add'>+devices.</div><div class='add'>+</div><div class='add'>+Serial attached devices shall be a child node of the host UART device the</div><div class='add'>+slave device is attached to. It is expected that the attached device is</div><div class='add'>+the only child node of the UART device. The slave device node name shall</div><div class='add'>+reflect the generic type of device for the node.</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+- compatible 	: A string reflecting the vendor and specific device the node</div><div class='add'>+		  represents.</div><div class='add'>+</div><div class='add'>+Optional Properties:</div><div class='add'>+</div><div class='add'>+- max-speed	: The maximum baud rate the device operates at. This should</div><div class='add'>+		  only be present if the maximum is less than the slave device</div><div class='add'>+		  can support. For example, a particular board has some signal</div><div class='add'>+		  quality issue or the host processor can't support higher</div><div class='add'>+		  baud rates.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+serial@1234 {</div><div class='add'>+	compatible = "ns16550a";</div><div class='add'>+	interrupts = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+	bluetooth {</div><div class='add'>+		compatible = "brcm,bcm43341-bt";</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio&gt;;</div><div class='add'>+		interrupts = &lt;10&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/powerpc/fsl/guts.txt b/Documentation/devicetree/bindings/soc/fsl/guts.txt<br/>index b71b2039e112..07adca914d3d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/powerpc/fsl/guts.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/powerpc/fsl/guts.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/fsl/guts.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/fsl/guts.txt</a></div><div class='hunk'>@@ -25,6 +25,9 @@ Recommended properties:</div><div class='ctx'>  - fsl,liodn-bits : Indicates the number of defined bits in the LIODN</div><div class='ctx'>    registers, for those SOCs that have a PAMU device.</div><div class='ctx'> </div><div class='add'>+ - little-endian : Indicates that the global utilities block is little</div><div class='add'>+   endian. The default is big endian.</div><div class='add'>+</div><div class='ctx'> Examples:</div><div class='ctx'> 	global-utilities@e0000 {	/* global utilities block */</div><div class='ctx'> 		compatible = "fsl,mpc8548-guts";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/soc/fsl/qman-portals.txt b/Documentation/devicetree/bindings/soc/fsl/qman-portals.txt<br/>index 47e46ccbc170..5a34f3ab7bea 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/fsl/qman-portals.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/soc/fsl/qman-portals.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/fsl/qman-portals.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/fsl/qman-portals.txt</a></div><div class='hunk'>@@ -5,7 +5,6 @@ Copyright (C) 2008 - 2014 Freescale Semiconductor Inc.</div><div class='ctx'> CONTENTS</div><div class='ctx'> </div><div class='ctx'> 	- QMan Portal</div><div class='del'>-	- QMan Pool Channel</div><div class='ctx'> 	- Example</div><div class='ctx'> </div><div class='ctx'> QMan Portal Node</div><div class='hunk'>@@ -82,25 +81,6 @@ These subnodes should have the following properties:</div><div class='ctx'> 	Definition:	The phandle to the particular hardware device that this</div><div class='ctx'> 			portal is connected to.</div><div class='ctx'> </div><div class='del'>-DPAA QMan Pool Channel Nodes</div><div class='del'>-</div><div class='del'>-Pool Channels are defined with the following properties.</div><div class='del'>-</div><div class='del'>-PROPERTIES</div><div class='del'>-</div><div class='del'>-- compatible</div><div class='del'>-	Usage:		Required</div><div class='del'>-	Value type:	&lt;stringlist&gt;</div><div class='del'>-	Definition:	Must include "fsl,qman-pool-channel"</div><div class='del'>-			May include "fsl,&lt;SoC&gt;-qman-pool-channel"</div><div class='del'>-</div><div class='del'>-- fsl,qman-channel-id</div><div class='del'>-	Usage:		Required</div><div class='del'>-	Value type:	&lt;u32&gt;</div><div class='del'>-	Definition:	The hardware index of the channel. This can also be</div><div class='del'>-			determined by dividing any of the channel's 8 work queue</div><div class='del'>-			IDs by 8</div><div class='del'>-</div><div class='ctx'> EXAMPLE</div><div class='ctx'> </div><div class='ctx'> The example below shows a (P4080) QMan portals container/bus node with two portals</div><div class='head'>diff --git a/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt b/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt<br/>index e8f15e34027f..16fe94d7783c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/soc/mediatek/scpsys.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/mediatek/scpsys.txt</a></div><div class='hunk'>@@ -9,17 +9,20 @@ domain control.</div><div class='ctx'> </div><div class='ctx'> The driver implements the Generic PM domain bindings described in</div><div class='ctx'> power/power_domain.txt. It provides the power domains defined in</div><div class='del'>-include/dt-bindings/power/mt8173-power.h.</div><div class='add'>+include/dt-bindings/power/mt8173-power.h and mt2701-power.h.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Must be "mediatek,mt8173-scpsys"</div><div class='add'>+- compatible: Should be one of:</div><div class='add'>+	- "mediatek,mt2701-scpsys"</div><div class='add'>+	- "mediatek,mt8173-scpsys"</div><div class='ctx'> - #power-domain-cells: Must be 1</div><div class='ctx'> - reg: Address range of the SCPSYS unit</div><div class='ctx'> - infracfg: must contain a phandle to the infracfg controller</div><div class='ctx'> - clock, clock-names: clocks according to the common clock binding.</div><div class='del'>-                      The clocks needed "mm", "mfg", "venc" and "venc_lt".</div><div class='del'>-		      These are the clocks which hardware needs to be enabled</div><div class='del'>-		      before enabling certain power domains.</div><div class='add'>+                      These are clocks which hardware needs to be</div><div class='add'>+                      enabled before enabling certain power domains.</div><div class='add'>+	Required clocks for MT2701: "mm", "mfg", "ethif"</div><div class='add'>+	Required clocks for MT8173: "mm", "mfg", "venc", "venc_lt"</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> - vdec-supply: Power supply for the vdec power domain</div><div class='head'>diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt<br/>index 97d9b3e1bf39..ea1dc75ec9ea 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt</a></div><div class='hunk'>@@ -43,6 +43,13 @@ The edge is described by the following properties:</div><div class='ctx'> 	Definition: the identifier for the remote processor as known by the rest</div><div class='ctx'> 		    of the system.</div><div class='ctx'> </div><div class='add'>+- label:</div><div class='add'>+	Usage: optional</div><div class='add'>+	Value type: &lt;string&gt;</div><div class='add'>+	Definition: name of the edge, used for debugging and identification</div><div class='add'>+		    purposes. The node name will be used if this is not</div><div class='add'>+		    present.</div><div class='add'>+</div><div class='ctx'> = SMD DEVICES</div><div class='ctx'> </div><div class='ctx'> In turn, subnodes of the "edges" represent devices tied to SMD channels on that</div><div class='head'>diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.txt b/Documentation/devicetree/bindings/soc/rockchip/grf.txt<br/>index 013e71a2cdc7..a0685c209218 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/rockchip/grf.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/soc/rockchip/grf.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/rockchip/grf.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/rockchip/grf.txt</a></div><div class='hunk'>@@ -5,20 +5,24 @@ is composed of many registers for system control.</div><div class='ctx'> </div><div class='ctx'> From RK3368 SoCs, the GRF is divided into two sections,</div><div class='ctx'> - GRF, used for general non-secure system,</div><div class='add'>+- SGRF, used for general secure system,</div><div class='ctx'> - PMUGRF, used for always on system</div><div class='ctx'> </div><div class='ctx'> Required Properties:</div><div class='ctx'> </div><div class='del'>-- compatible: GRF should be one of the followings</div><div class='add'>+- compatible: GRF should be one of the following:</div><div class='add'>+   - "rockchip,rk3036-grf", "syscon": for rk3036</div><div class='ctx'>    - "rockchip,rk3066-grf", "syscon": for rk3066</div><div class='ctx'>    - "rockchip,rk3188-grf", "syscon": for rk3188</div><div class='ctx'>    - "rockchip,rk3228-grf", "syscon": for rk3228</div><div class='ctx'>    - "rockchip,rk3288-grf", "syscon": for rk3288</div><div class='ctx'>    - "rockchip,rk3368-grf", "syscon": for rk3368</div><div class='ctx'>    - "rockchip,rk3399-grf", "syscon": for rk3399</div><div class='del'>-- compatible: PMUGRF should be one of the followings</div><div class='add'>+- compatible: PMUGRF should be one of the following:</div><div class='ctx'>    - "rockchip,rk3368-pmugrf", "syscon": for rk3368</div><div class='ctx'>    - "rockchip,rk3399-pmugrf", "syscon": for rk3399</div><div class='add'>+- compatible: SGRF should be one of the following</div><div class='add'>+   - "rockchip,rk3288-sgrf", "syscon": for rk3288</div><div class='ctx'> - reg: physical base address of the controller and length of memory mapped</div><div class='ctx'>   region.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt b/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt<br/>index f909ce06afc4..01bfb6745fbd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/soc/rockchip/power_domain.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/rockchip/power_domain.txt</a></div><div class='hunk'>@@ -6,6 +6,7 @@ powered up/down by software based on different application scenes to save power.</div><div class='ctx'> Required properties for power domain controller:</div><div class='ctx'> - compatible: Should be one of the following.</div><div class='ctx'> 	"rockchip,rk3288-power-controller" - for RK3288 SoCs.</div><div class='add'>+	"rockchip,rk3328-power-controller" - for RK3328 SoCs.</div><div class='ctx'> 	"rockchip,rk3368-power-controller" - for RK3368 SoCs.</div><div class='ctx'> 	"rockchip,rk3399-power-controller" - for RK3399 SoCs.</div><div class='ctx'> - #power-domain-cells: Number of cells in a power-domain specifier.</div><div class='hunk'>@@ -16,6 +17,7 @@ Required properties for power domain controller:</div><div class='ctx'> Required properties for power domain sub nodes:</div><div class='ctx'> - reg: index of the power domain, should use macros in:</div><div class='ctx'> 	"include/dt-bindings/power/rk3288-power.h" - for RK3288 type power domain.</div><div class='add'>+	"include/dt-bindings/power/rk3328-power.h" - for RK3328 type power domain.</div><div class='ctx'> 	"include/dt-bindings/power/rk3368-power.h" - for RK3368 type power domain.</div><div class='ctx'> 	"include/dt-bindings/power/rk3399-power.h" - for RK3399 type power domain.</div><div class='ctx'> - clocks (optional): phandles to clocks which need to be enabled while power domain</div><div class='hunk'>@@ -90,6 +92,7 @@ containing a phandle to the power device node and an index specifying which</div><div class='ctx'> power domain to use.</div><div class='ctx'> The index should use macros in:</div><div class='ctx'> 	"include/dt-bindings/power/rk3288-power.h" - for rk3288 type power domain.</div><div class='add'>+	"include/dt-bindings/power/rk3328-power.h" - for rk3328 type power domain.</div><div class='ctx'> 	"include/dt-bindings/power/rk3368-power.h" - for rk3368 type power domain.</div><div class='ctx'> 	"include/dt-bindings/power/rk3399-power.h" - for rk3399 type power domain.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt b/Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt<br/>new file mode 100644<br/>index 000000000000..7629de1c2c72<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+* ZTE zx2967 family Power Domains</div><div class='add'>+</div><div class='add'>+zx2967 family includes support for multiple power domains which are used</div><div class='add'>+to gate power to one or more peripherals on the processor.</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+  - compatible: should be one of the following.</div><div class='add'>+      * zte,zx296718-pcu - for zx296718 power domain.</div><div class='add'>+  - reg: physical base address of the controller and length of memory mapped</div><div class='add'>+      region.</div><div class='add'>+  - #power-domain-cells: Must be 1.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	pcu_domain: pcu@117000 {</div><div class='add'>+		compatible = "zte,zx296718-pcu";</div><div class='add'>+		reg = &lt;0x00117000 0x1000&gt;;</div><div class='add'>+		#power-domain-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt b/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt<br/>new file mode 100644<br/>index 000000000000..fdb25b492514<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt</a></div><div class='hunk'>@@ -0,0 +1,93 @@</div><div class='add'>+Devicetree bindings for the Axentia TSE-850 audio complex</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible: "axentia,tse850-pcm5142"</div><div class='add'>+  - axentia,cpu-dai: The phandle of the cpu dai.</div><div class='add'>+  - axentia,audio-codec: The phandle of the PCM5142 codec.</div><div class='add'>+  - axentia,add-gpios: gpio specifier that controls the mixer.</div><div class='add'>+  - axentia,loop1-gpios: gpio specifier that controls loop relays on channel 1.</div><div class='add'>+  - axentia,loop2-gpios: gpio specifier that controls loop relays on channel 2.</div><div class='add'>+  - axentia,ana-supply: Regulator that supplies the output amplifier. Must</div><div class='add'>+    support voltages in the 2V - 20V range, in 1V steps.</div><div class='add'>+</div><div class='add'>+The schematics explaining the gpios are as follows:</div><div class='add'>+</div><div class='add'>+               loop1 relays</div><div class='add'>+   IN1 +---o  +------------+  o---+ OUT1</div><div class='add'>+            \                /</div><div class='add'>+             +              +</div><div class='add'>+             |   /          |</div><div class='add'>+             +--o  +--.     |</div><div class='add'>+             |  add   |     |</div><div class='add'>+             |        V     |</div><div class='add'>+             |      .---.   |</div><div class='add'>+   DAC +-----------&gt;|Sum|---+</div><div class='add'>+             |      '---'   |</div><div class='add'>+             |              |</div><div class='add'>+             +              +</div><div class='add'>+</div><div class='add'>+   IN2 +---o--+------------+--o---+ OUT2</div><div class='add'>+               loop2 relays</div><div class='add'>+</div><div class='add'>+The 'loop1' gpio pin controlls two relays, which are either in loop position,</div><div class='add'>+meaning that input and output are directly connected, or they are in mixer</div><div class='add'>+position, meaning that the signal is passed through the 'Sum' mixer. Similarly</div><div class='add'>+for 'loop2'.</div><div class='add'>+</div><div class='add'>+In the above, the 'loop1' relays are inactive, thus feeding IN1 to the mixer</div><div class='add'>+(if 'add' is active) and feeding the mixer output to OUT1. The 'loop2' relays</div><div class='add'>+are active, short-cutting the TSE-850 from channel 2. IN1, IN2, OUT1 and OUT2</div><div class='add'>+are TSE-850 connectors and DAC is the PCB name of the (filtered) output from</div><div class='add'>+the PCM5142 codec.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	&amp;ssc0 {</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	&amp;i2c {</div><div class='add'>+		codec: pcm5142@4c {</div><div class='add'>+			compatible = "ti,pcm5142";</div><div class='add'>+</div><div class='add'>+			reg = &lt;0x4c&gt;;</div><div class='add'>+</div><div class='add'>+			AVDD-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+			DVDD-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+			CPVDD-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;sck&gt;;</div><div class='add'>+</div><div class='add'>+			pll-in = &lt;3&gt;;</div><div class='add'>+			pll-out = &lt;6&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ana: ana-reg {</div><div class='add'>+		compatible = "pwm-regulator";</div><div class='add'>+</div><div class='add'>+		regulator-name = "ANA";</div><div class='add'>+</div><div class='add'>+		pwms = &lt;&amp;pwm0 2 1000 PWM_POLARITY_INVERTED&gt;;</div><div class='add'>+		pwm-dutycycle-unit = &lt;1000&gt;;</div><div class='add'>+		pwm-dutycycle-range = &lt;100 1000&gt;;</div><div class='add'>+</div><div class='add'>+		regulator-min-microvolt = &lt;2000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;20000000&gt;;</div><div class='add'>+		regulator-ramp-delay = &lt;1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "axentia,tse850-pcm5142";</div><div class='add'>+</div><div class='add'>+		axentia,cpu-dai = &lt;&amp;ssc0&gt;;</div><div class='add'>+		axentia,audio-codec = &lt;&amp;codec&gt;;</div><div class='add'>+</div><div class='add'>+		axentia,add-gpios = &lt;&amp;pioA 8 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		axentia,loop1-gpios = &lt;&amp;pioA 10 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		axentia,loop2-gpios = &lt;&amp;pioA 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+</div><div class='add'>+		axentia,ana-supply = &lt;&amp;ana&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/cs35l34.txt b/Documentation/devicetree/bindings/sound/cs35l34.txt<br/>new file mode 100644<br/>index 000000000000..b218ead2e68e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/cs35l34.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/cs35l34.txt</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+CS35L34 Speaker Amplifier</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible : "cirrus,cs35l34"</div><div class='add'>+</div><div class='add'>+  - reg : the I2C address of the device for I2C.</div><div class='add'>+</div><div class='add'>+  - VA-supply, VP-supply : power supplies for the device,</div><div class='add'>+    as covered in</div><div class='add'>+    Documentation/devicetree/bindings/regulator/regulator.txt.</div><div class='add'>+</div><div class='add'>+  - cirrus,boost-vtge-millivolt : Boost Voltage Value.  Configures the boost</div><div class='add'>+    converter's output voltage in mV. The range is from VP to 8V with</div><div class='add'>+    increments of 100mV.</div><div class='add'>+</div><div class='add'>+  - cirrus,boost-nanohenry: Inductor value for boost converter. The value is</div><div class='add'>+    in nH and they can be values of 1000nH, 1100nH, 1200nH, 1500nH, and 2200nH.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  - reset-gpios: GPIO used to reset the amplifier.</div><div class='add'>+</div><div class='add'>+  - interrupt-parent : Specifies the phandle of the interrupt controller to</div><div class='add'>+    which the IRQs from CS35L34 are delivered to.</div><div class='add'>+  - interrupts : IRQ line info CS35L34.</div><div class='add'>+    (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt</div><div class='add'>+    for further information relating to interrupt properties)</div><div class='add'>+</div><div class='add'>+  - cirrus,boost-peak-milliamp : Boost converter peak current limit in mA. The</div><div class='add'>+    range starts at 1200mA and goes to a maximum of 3840mA with increments of</div><div class='add'>+    80mA. The default value is 2480mA.</div><div class='add'>+</div><div class='add'>+  - cirrus,i2s-sdinloc : ADSP SDIN I2S channel location. Indicates whether the</div><div class='add'>+    received mono data is in the left or right portion of the I2S frame</div><div class='add'>+    according to the AD0 pin or directly via this configuration.</div><div class='add'>+    0x0 (Default) = Selected by AD0 input (if AD0 = LOW, use left channel),</div><div class='add'>+    0x2 = Left,</div><div class='add'>+    0x1 = Selected by the inversion of the AD0 input (if AD0 = LOW, use right</div><div class='add'>+    channel),</div><div class='add'>+    0x3 = Right.</div><div class='add'>+</div><div class='add'>+  - cirrus,gain-zc-disable: Boolean property. If set, the gain change will take</div><div class='add'>+    effect without waiting for a zero cross.</div><div class='add'>+</div><div class='add'>+  - cirrus,tdm-rising-edge: Boolean property. If set, data is on the rising edge of</div><div class='add'>+    SCLK. Otherwise, data is on the falling edge of SCLK.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+cs35l34: cs35l34@40 {</div><div class='add'>+	compatible = "cirrus,cs35l34";</div><div class='add'>+	reg = &lt;0x40&gt;;</div><div class='add'>+</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio8&gt;;</div><div class='add'>+	interrupts = &lt;3 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+</div><div class='add'>+	reset-gpios = &lt;&amp;gpio 10 0&gt;;</div><div class='add'>+</div><div class='add'>+	cirrus,boost-vtge-milltvolt = &lt;8000&gt;; /* 8V */</div><div class='add'>+	cirrus,boost-ind-nanohenry = &lt;1000&gt;; /* 1uH */</div><div class='add'>+	cirrus,boost-peak-milliamp = &lt;3000&gt;; /* 3A */</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/cs42l42.txt b/Documentation/devicetree/bindings/sound/cs42l42.txt<br/>new file mode 100644<br/>index 000000000000..9a2c5e2423d5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/cs42l42.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/cs42l42.txt</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+CS42L42 audio CODEC</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible : "cirrus,cs42l42"</div><div class='add'>+</div><div class='add'>+  - reg : the I2C address of the device for I2C.</div><div class='add'>+</div><div class='add'>+  - VP-supply, VCP-supply, VD_FILT-supply, VL-supply, VA-supply :</div><div class='add'>+  power supplies for the device, as covered in</div><div class='add'>+  Documentation/devicetree/bindings/regulator/regulator.txt.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  - reset-gpios : a GPIO spec for the reset pin. If specified, it will be</div><div class='add'>+  deasserted before communication to the codec starts.</div><div class='add'>+</div><div class='add'>+  - interrupt-parent : Specifies the phandle of the interrupt controller to</div><div class='add'>+  which the IRQs from CS42L42 are delivered to.</div><div class='add'>+</div><div class='add'>+  - interrupts : IRQ line info CS42L42.</div><div class='add'>+  (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt</div><div class='add'>+  for further information relating to interrupt properties)</div><div class='add'>+</div><div class='add'>+  - cirrus,ts-inv : Boolean property. For jacks that invert the tip sense</div><div class='add'>+  polarity. Normal jacks will short tip sense pin to HS1 when headphones are</div><div class='add'>+  plugged in and leave tip sense floating when not plugged in. Inverting jacks</div><div class='add'>+  short tip sense when unplugged and float when plugged in.</div><div class='add'>+</div><div class='add'>+  0 = (Default) Non-inverted</div><div class='add'>+  1 = Inverted</div><div class='add'>+</div><div class='add'>+  - cirrus,ts-dbnc-rise : Debounce the rising edge of TIP_SENSE_PLUG. With no</div><div class='add'>+  debounce, the tip sense pin might be noisy on a plug event.</div><div class='add'>+</div><div class='add'>+  0 - 0ms,</div><div class='add'>+  1 - 125ms,</div><div class='add'>+  2 - 250ms,</div><div class='add'>+  3 - 500ms,</div><div class='add'>+  4 - 750ms,</div><div class='add'>+  5 - (Default) 1s,</div><div class='add'>+  6 - 1.25s,</div><div class='add'>+  7 - 1.5s,</div><div class='add'>+</div><div class='add'>+  - cirrus,ts-dbnc-fall : Debounce the falling edge of TIP_SENSE_UNPLUG.</div><div class='add'>+  With no debounce, the tip sense pin might be noisy on an unplug event.</div><div class='add'>+</div><div class='add'>+  0 - 0ms,</div><div class='add'>+  1 - 125ms,</div><div class='add'>+  2 - 250ms,</div><div class='add'>+  3 - 500ms,</div><div class='add'>+  4 - 750ms,</div><div class='add'>+  5 - (Default) 1s,</div><div class='add'>+  6 - 1.25s,</div><div class='add'>+  7 - 1.5s,</div><div class='add'>+</div><div class='add'>+  - cirrus,btn-det-init-dbnce : This sets how long the driver sleeps after</div><div class='add'>+  enabling button detection interrupts. After auto-detection and before</div><div class='add'>+  servicing button interrupts, the HS bias needs time to settle. If you</div><div class='add'>+  don't wait, there is possibility for erroneous button interrupt.</div><div class='add'>+</div><div class='add'>+  0ms - 200ms,</div><div class='add'>+  Default = 100ms</div><div class='add'>+</div><div class='add'>+  - cirrus,btn-det-event-dbnce : This sets how long the driver delays after</div><div class='add'>+  receiving a button press interrupt. With level detect interrupts, you want</div><div class='add'>+  to wait a small amount of time to make sure the button press is making a</div><div class='add'>+  clean connection with the bias resistors.</div><div class='add'>+</div><div class='add'>+  0ms - 20ms,</div><div class='add'>+  Default = 10ms</div><div class='add'>+</div><div class='add'>+  - cirrus,bias-lvls : For a level-detect headset button scheme, each button</div><div class='add'>+  will bias the mic pin to a certain voltage. To determine which button was</div><div class='add'>+  pressed, the driver will compare this biased voltage to sequential,</div><div class='add'>+  decreasing voltages and will stop when a comparator is tripped,</div><div class='add'>+  indicating a comparator voltage &lt; bias voltage. This value represents a</div><div class='add'>+  percentage of the internally generated HS bias voltage. For different</div><div class='add'>+  hardware setups, a designer might want to tweak this. This is an array of</div><div class='add'>+  descending values for the comparator voltage.</div><div class='add'>+</div><div class='add'>+  Array of 4 values</div><div class='add'>+  Each 0-63</div><div class='add'>+  &lt; x1 x2 x3 x4 &gt;</div><div class='add'>+  Default = &lt; 15 8 4 1&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+cs42l42: cs42l42@48 {</div><div class='add'>+	compatible = "cirrus,cs42l42";</div><div class='add'>+	reg = &lt;0x48&gt;;</div><div class='add'>+	VA-supply = &lt;&amp;dummy_vreg&gt;;</div><div class='add'>+	VP-supply = &lt;&amp;dummy_vreg&gt;;</div><div class='add'>+	VCP-supply = &lt;&amp;dummy_vreg&gt;;</div><div class='add'>+	VD_FILT-supply = &lt;&amp;dummy_vreg&gt;;</div><div class='add'>+	VL-supply = &lt;&amp;dummy_vreg&gt;;</div><div class='add'>+</div><div class='add'>+	reset-gpios = &lt;&amp;axi_gpio_0 1 0&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+	interrupts = &lt;55 8&gt;</div><div class='add'>+</div><div class='add'>+	cirrus,ts-inv = &lt;0x00&gt;;</div><div class='add'>+	cirrus,ts-dbnc-rise = &lt;0x05&gt;;</div><div class='add'>+	cirrus,ts-dbnc-fall = &lt;0x00&gt;;</div><div class='add'>+	cirrus,btn-det-init-dbnce = &lt;100&gt;;</div><div class='add'>+	cirrus,btn-det-event-dbnce = &lt;10&gt;;</div><div class='add'>+	cirrus,bias-lvls = &lt;0x0F 0x08 0x04 0x01&gt;;</div><div class='add'>+	cirrus,hs-bias-ramp-rate = &lt;0x02&gt;;</div><div class='add'>+};
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt b/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt<br/>index 55b53e1fd72c..e0b6165c9cfc 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/davinci-mcbsp.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/davinci-mcbsp.txt</a></div><div class='hunk'>@@ -43,7 +43,7 @@ mcbsp0: mcbsp@1d10000 {</div><div class='ctx'> 		&lt;0x00310000 0x1000&gt;;</div><div class='ctx'> 	reg-names = "mpu", "dat";</div><div class='ctx'> 	interrupts = &lt;97 98&gt;;</div><div class='del'>-	interrupts-names = "rx", "tx";</div><div class='add'>+	interrupt-names = "rx", "tx";</div><div class='ctx'> 	dmas = &lt;&amp;edma0 3 1</div><div class='ctx'> 		&amp;edma0 2 1&gt;;</div><div class='ctx'> 	dma-names = "tx", "rx";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/es8328.txt b/Documentation/devicetree/bindings/sound/es8328.txt<br/>index 30ea8a318ae9..33fbf058c997 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/es8328.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/es8328.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/es8328.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/es8328.txt</a></div><div class='hunk'>@@ -4,7 +4,7 @@ This device supports both I2C and SPI.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> </div><div class='del'>-  - compatible : "everest,es8328"</div><div class='add'>+  - compatible  : Should be "everest,es8328" or "everest,es8388"</div><div class='ctx'>   - DVDD-supply : Regulator providing digital core supply voltage 1.8 - 3.6V</div><div class='ctx'>   - AVDD-supply : Regulator providing analog supply voltage 3.3V</div><div class='ctx'>   - PVDD-supply : Regulator providing digital IO supply voltage 1.8 - 3.6V</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt b/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt<br/>index 3e623a724e55..9800a560e0c2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt</a></div><div class='hunk'>@@ -4,6 +4,7 @@ Required properties:</div><div class='ctx'> - compatible = "mediatek,mt2701-audio";</div><div class='ctx'> - reg: register location and size</div><div class='ctx'> - interrupts: Should contain AFE interrupt</div><div class='add'>+- power-domains: should define the power domain</div><div class='ctx'> - clock-names: should have these clock names:</div><div class='ctx'> 		"infra_sys_audio_clk",</div><div class='ctx'> 		"top_audio_mux1_sel",</div><div class='hunk'>@@ -58,6 +59,7 @@ Example:</div><div class='ctx'> 		      &lt;0 0x112A0000 0 0x20000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 104 IRQ_TYPE_LEVEL_LOW&gt;,</div><div class='ctx'> 			     &lt;GIC_SPI 132 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT2701_POWER_DOMAIN_IFR_MSC&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;infracfg CLK_INFRA_AUDIO&gt;,</div><div class='ctx'> 			 &lt;&amp;topckgen CLK_TOP_AUD_MUX1_SEL&gt;,</div><div class='ctx'> 			 &lt;&amp;topckgen CLK_TOP_AUD_MUX2_SEL&gt;,</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/nau8540.txt b/Documentation/devicetree/bindings/sound/nau8540.txt<br/>new file mode 100644<br/>index 000000000000..307a76528320<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/nau8540.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/nau8540.txt</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+NAU85L40 audio CODEC</div><div class='add'>+</div><div class='add'>+This device supports I2C only.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible : "nuvoton,nau8540"</div><div class='add'>+</div><div class='add'>+  - reg : the I2C address of the device.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+codec: nau8540@1c {</div><div class='add'>+       compatible = "nuvoton,nau8540";</div><div class='add'>+       reg = &lt;0x1c&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt b/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt<br/>index d9d8635ff94c..6a4aadc4ce06 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt</a></div><div class='hunk'>@@ -44,8 +44,7 @@ Required dai-link subnodes:</div><div class='ctx'> Required CPU/CODEC subnodes properties:</div><div class='ctx'> </div><div class='ctx'> -link-name		: Name of the dai link.</div><div class='del'>--sound-dai		: phandle and port of CPU/CODEC</div><div class='del'>--capture-dai		: phandle and port of CPU/CODEC</div><div class='add'>+-sound-dai		: phandle/s and port of CPU/CODEC</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='hunk'>@@ -73,7 +72,7 @@ sound: sound {</div><div class='ctx'> 			sound-dai = &lt;&amp;lpass MI2S_PRIMARY&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 		codec {</div><div class='del'>-			sound-dai = &lt;&amp;wcd_codec 0&gt;;</div><div class='add'>+			sound-dai = &lt;&amp;lpass_codec 0&gt;, &lt;&amp;wcd_codec 0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt<br/>new file mode 100644<br/>index 000000000000..ccb401cfef9d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+msm8916 analog audio CODEC</div><div class='add'>+</div><div class='add'>+Bindings for codec Analog IP which is integrated in pmic pm8916,</div><div class='add'>+</div><div class='add'>+## Bindings for codec core on pmic:</div><div class='add'>+</div><div class='add'>+Required properties</div><div class='add'>+ - compatible = "qcom,pm8916-wcd-analog-codec";</div><div class='add'>+ - reg: represents the slave base address provided to the peripheral.</div><div class='add'>+ - interrupt-parent : The parent interrupt controller.</div><div class='add'>+ - interrupts: List of interrupts in given SPMI peripheral.</div><div class='add'>+ - interrupt-names: Names specified to above list of interrupts in same</div><div class='add'>+		    order. List of supported interrupt names are:</div><div class='add'>+  "cdc_spk_cnp_int" - Speaker click and pop interrupt.</div><div class='add'>+  "cdc_spk_clip_int" - Speaker clip interrupt.</div><div class='add'>+  "cdc_spk_ocp_int" - Speaker over current protect interrupt.</div><div class='add'>+  "mbhc_ins_rem_det1" - jack insert removal detect interrupt 1.</div><div class='add'>+  "mbhc_but_rel_det" - button release interrupt.</div><div class='add'>+  "mbhc_but_press_det" - button press event</div><div class='add'>+  "mbhc_ins_rem_det" - jack insert removal detect interrupt.</div><div class='add'>+  "mbhc_switch_int"	- multi button headset interrupt.</div><div class='add'>+  "cdc_ear_ocp_int" - Earphone over current protect interrupt.</div><div class='add'>+  "cdc_hphr_ocp_int" - Headphone R over current protect interrupt.</div><div class='add'>+  "cdc_hphl_ocp_det" - Headphone L over current protect interrupt.</div><div class='add'>+  "cdc_ear_cnp_int" - earphone cnp interrupt.</div><div class='add'>+  "cdc_hphr_cnp_int" - hphr click and pop interrupt.</div><div class='add'>+  "cdc_hphl_cnp_int" - hphl click and pop interrupt.</div><div class='add'>+</div><div class='add'>+ - clocks: Handle to mclk.</div><div class='add'>+ - clock-names: should be "mclk"</div><div class='add'>+ - vdd-cdc-io-supply: phandle to VDD_CDC_IO regulator DT node.</div><div class='add'>+ - vdd-cdc-tx-rx-cx-supply: phandle to VDD_CDC_TX/RX/CX regulator DT node.</div><div class='add'>+ - vdd-micbias-supply: phandle of VDD_MICBIAS supply's regulator DT node.</div><div class='add'>+</div><div class='add'>+Optional Properties:</div><div class='add'>+- qcom,micbias1-ext-cap: boolean, present if micbias1 has external capacitor</div><div class='add'>+			 connected.</div><div class='add'>+- qcom,micbias2-ext-cap: boolean, present if micbias2 has external capacitor</div><div class='add'>+			 connected.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+spmi_bus {</div><div class='add'>+	...</div><div class='add'>+	audio-codec@f000{</div><div class='add'>+		compatible = "qcom,pm8916-wcd-analog-codec";</div><div class='add'>+		reg = &lt;0xf000 0x200&gt;;</div><div class='add'>+		reg-names = "pmic-codec-core";</div><div class='add'>+		clocks = &lt;&amp;gcc GCC_CODEC_DIGCODEC_CLK&gt;;</div><div class='add'>+		clock-names = "mclk";</div><div class='add'>+		interrupt-parent = &lt;&amp;spmi_bus&gt;;</div><div class='add'>+		interrupts = &lt;0x1 0xf0 0x0 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf0 0x1 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf0 0x2 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf0 0x3 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf0 0x4 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf0 0x5 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf0 0x6 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf0 0x7 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf1 0x0 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf1 0x1 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf1 0x2 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf1 0x3 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf1 0x4 IRQ_TYPE_NONE&gt;,</div><div class='add'>+			     &lt;0x1 0xf1 0x5 IRQ_TYPE_NONE&gt;;</div><div class='add'>+		interrupt-names = "cdc_spk_cnp_int",</div><div class='add'>+				  "cdc_spk_clip_int",</div><div class='add'>+				  "cdc_spk_ocp_int",</div><div class='add'>+				  "mbhc_ins_rem_det1",</div><div class='add'>+				  "mbhc_but_rel_det",</div><div class='add'>+				  "mbhc_but_press_det",</div><div class='add'>+				  "mbhc_ins_rem_det",</div><div class='add'>+				  "mbhc_switch_int",</div><div class='add'>+				  "cdc_ear_ocp_int",</div><div class='add'>+				  "cdc_hphr_ocp_int",</div><div class='add'>+				  "cdc_hphl_ocp_det",</div><div class='add'>+				  "cdc_ear_cnp_int",</div><div class='add'>+				  "cdc_hphr_cnp_int",</div><div class='add'>+				  "cdc_hphl_cnp_int";</div><div class='add'>+	               VDD-CDC-IO-supply = &lt;&amp;pm8916_l5&gt;;</div><div class='add'>+	               VDD-CDC-TX-RX-CX-supply = &lt;&amp;pm8916_l5&gt;;</div><div class='add'>+	               VDD-MICBIAS-supply = &lt;&amp;pm8916_l13&gt;;</div><div class='add'>+	               #sound-dai-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt<br/>new file mode 100644<br/>index 000000000000..1c8e4cb25176<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+msm8916 digital audio CODEC</div><div class='add'>+</div><div class='add'>+## Bindings for codec core in lpass:</div><div class='add'>+</div><div class='add'>+Required properties</div><div class='add'>+ - compatible = "qcom,msm8916-wcd-digital-codec";</div><div class='add'>+ - reg: address space for lpass codec.</div><div class='add'>+ - clocks: Handle to mclk and ahbclk</div><div class='add'>+ - clock-names: should be "mclk", "ahbix-clk".</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+audio-codec@771c000{</div><div class='add'>+	compatible = "qcom,msm8916-wcd-digital-codec";</div><div class='add'>+	reg = &lt;0x0771c000 0x400&gt;;</div><div class='add'>+	clocks = &lt;&amp;gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK&gt;,</div><div class='add'>+		 &lt;&amp;gcc GCC_CODEC_DIGCODEC_CLK&gt;;</div><div class='add'>+	clock-names = "ahbix-clk", "mclk";</div><div class='add'>+	#sound-dai-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt<br/>new file mode 100644<br/>index 000000000000..2539e1d68107<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+ROCKCHIP RK3288 with HDMI and analog audio</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: "rockchip,rk3288-hdmi-analog"</div><div class='add'>+- rockchip,model: The user-visible name of this sound complex</div><div class='add'>+- rockchip,i2s-controller: The phandle of the Rockchip I2S controller that's</div><div class='add'>+  connected to the CODEC</div><div class='add'>+- rockchip,audio-codec: The phandle of the analog audio codec.</div><div class='add'>+- rockchip,routing: A list of the connections between audio components.</div><div class='add'>+		    Each entry is a pair of strings, the first being the</div><div class='add'>+		    connection's sink, the second being the connection's</div><div class='add'>+		    source. For this driver the first string should always be</div><div class='add'>+		    "Analog".</div><div class='add'>+</div><div class='add'>+Optionnal properties:</div><div class='add'>+- rockchip,hp-en-gpios = The phandle of the GPIO that power up/down the</div><div class='add'>+  headphone (when the analog output is an headphone).</div><div class='add'>+- rockchip,hp-det-gpios = The phandle of the GPIO that detects the headphone</div><div class='add'>+  (when the analog output is an headphone).</div><div class='add'>+- pinctrl-names, pinctrl-0: Please refer to pinctrl-bindings.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+sound {</div><div class='add'>+	compatible = "rockchip,rockchip-audio-es8388";</div><div class='add'>+	rockchip,model = "Analog audio output";</div><div class='add'>+	rockchip,i2s-controller = &lt;&amp;i2s&gt;;</div><div class='add'>+	rockchip,audio-codec = &lt;&amp;es8388&gt;;</div><div class='add'>+	rockchip,routing = "Analog", "LOUT2",</div><div class='add'>+			   "Analog", "ROUT2";</div><div class='add'>+	rockchip,hp-en-gpios = &lt;&amp;gpio8 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	rockchip,hp-det-gpios = &lt;&amp;gpio7 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;headphone&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt<br/>index 4ea29aa9af59..a6600f6dea64 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/rockchip-i2s.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/rockchip-i2s.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/rockchip-i2s.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/rockchip-i2s.txt</a></div><div class='hunk'>@@ -5,7 +5,7 @@ audio data transfer between devices in the system.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> </div><div class='del'>-- compatible: should be one of the followings</div><div class='add'>+- compatible: should be one of the following:</div><div class='ctx'>    - "rockchip,rk3066-i2s": for rk3066</div><div class='ctx'>    - "rockchip,rk3188-i2s", "rockchip,rk3066-i2s": for rk3188</div><div class='ctx'>    - "rockchip,rk3288-i2s", "rockchip,rk3066-i2s": for rk3288</div><div class='hunk'>@@ -17,7 +17,7 @@ Required properties:</div><div class='ctx'> 	Documentation/devicetree/bindings/dma/dma.txt</div><div class='ctx'> - dma-names: should include "tx" and "rx".</div><div class='ctx'> - clocks: a list of phandle + clock-specifer pairs, one for each entry in clock-names.</div><div class='del'>-- clock-names: should contain followings:</div><div class='add'>+- clock-names: should contain the following:</div><div class='ctx'>    - "i2s_hclk": clock for I2S BUS</div><div class='ctx'>    - "i2s_clk" : clock for I2S controller</div><div class='ctx'> - rockchip,playback-channels: max playback channels, if not set, 8 channels default.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/rt5514.txt b/Documentation/devicetree/bindings/sound/rt5514.txt<br/>index 9cabfc18cb57..929ca6756b02 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/rt5514.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/rt5514.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/rt5514.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/rt5514.txt</a></div><div class='hunk'>@@ -13,6 +13,9 @@ Optional properties:</div><div class='ctx'> - clocks: The phandle of the master clock to the CODEC</div><div class='ctx'> - clock-names: Should be "mclk"</div><div class='ctx'> </div><div class='add'>+- realtek,dmic-init-delay-ms</div><div class='add'>+  Set the DMIC initial delay (ms) to wait it ready.</div><div class='add'>+</div><div class='ctx'> Pins on the device (for linking into audio routes) for RT5514:</div><div class='ctx'> </div><div class='ctx'>   * DMIC1L</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/rt5663.txt b/Documentation/devicetree/bindings/sound/rt5663.txt<br/>index 7d3c974c6e2e..70eaeaed2b18 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/rt5663.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/rt5663.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/rt5663.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/rt5663.txt</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='del'>-RT5663/RT5668 audio CODEC</div><div class='add'>+RT5663 audio CODEC</div><div class='ctx'> </div><div class='ctx'> This device supports I2C only.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> </div><div class='del'>-- compatible : One of "realtek,rt5663" or "realtek,rt5668".</div><div class='add'>+- compatible : "realtek,rt5663".</div><div class='ctx'> </div><div class='ctx'> - reg : The I2C address of the device.</div><div class='ctx'> </div><div class='hunk'>@@ -12,7 +12,7 @@ Required properties:</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> </div><div class='del'>-Pins on the device (for linking into audio routes) for RT5663/RT5668:</div><div class='add'>+Pins on the device (for linking into audio routes) for RT5663:</div><div class='ctx'> </div><div class='ctx'>   * IN1P</div><div class='ctx'>   * IN1N</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/rt5665.txt b/Documentation/devicetree/bindings/sound/rt5665.txt<br/>new file mode 100644<br/>index 000000000000..419c89219681<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/rt5665.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/rt5665.txt</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+RT5665/RT5666/RT5668 audio CODEC</div><div class='add'>+</div><div class='add'>+This device supports I2C only.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible : One of "realtek,rt5665", "realtek,rt5666" or "realtek,rt5668".</div><div class='add'>+</div><div class='add'>+- reg : The I2C address of the device.</div><div class='add'>+</div><div class='add'>+- interrupts : The CODEC's interrupt output.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- realtek,in1-differential</div><div class='add'>+- realtek,in2-differential</div><div class='add'>+- realtek,in3-differential</div><div class='add'>+- realtek,in4-differential</div><div class='add'>+  Boolean. Indicate MIC1/2/3/4 input are differential, rather than single-ended.</div><div class='add'>+</div><div class='add'>+- realtek,dmic1-data-pin</div><div class='add'>+  0: dmic1 is not used</div><div class='add'>+  1: using GPIO4 pin as dmic1 data pin</div><div class='add'>+  2: using IN2N pin as dmic2 data pin</div><div class='add'>+</div><div class='add'>+- realtek,dmic2-data-pin</div><div class='add'>+  0: dmic2 is not used</div><div class='add'>+  1: using GPIO5 pin as dmic2 data pin</div><div class='add'>+  2: using IN2P pin as dmic2 data pin</div><div class='add'>+</div><div class='add'>+- realtek,jd-src</div><div class='add'>+  0: No JD is used</div><div class='add'>+  1: using JD1 as JD source</div><div class='add'>+</div><div class='add'>+- realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin.</div><div class='add'>+</div><div class='add'>+Pins on the device (for linking into audio routes) for RT5659/RT5658:</div><div class='add'>+</div><div class='add'>+  * DMIC L1</div><div class='add'>+  * DMIC R1</div><div class='add'>+  * DMIC L2</div><div class='add'>+  * DMIC R2</div><div class='add'>+  * IN1P</div><div class='add'>+  * IN1N</div><div class='add'>+  * IN2P</div><div class='add'>+  * IN2N</div><div class='add'>+  * IN3P</div><div class='add'>+  * IN3N</div><div class='add'>+  * IN4P</div><div class='add'>+  * IN4N</div><div class='add'>+  * HPOL</div><div class='add'>+  * HPOR</div><div class='add'>+  * LOUTL</div><div class='add'>+  * LOUTR</div><div class='add'>+  * MONOOUT</div><div class='add'>+  * PDML</div><div class='add'>+  * PDMR</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+rt5659 {</div><div class='add'>+	compatible = "realtek,rt5665";</div><div class='add'>+	reg = &lt;0x1b&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio&gt;;</div><div class='add'>+	interrupts = &lt;TEGRA_GPIO(W, 3) GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	realtek,ldo1-en-gpios =</div><div class='add'>+		&lt;&amp;gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt b/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt<br/>new file mode 100644<br/>index 000000000000..94442e5673b3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+Samsung Exynos5433 TM2(E) audio complex with WM5110 codec</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+ - compatible		 : "samsung,tm2-audio"</div><div class='add'>+ - model		 : the user-visible name of this sound complex</div><div class='add'>+ - audio-codec		 : the phandle of the wm5110 audio codec node,</div><div class='add'>+			   as described in ../mfd/arizona.txt</div><div class='add'>+ - i2s-controller	 : the phandle of the I2S controller</div><div class='add'>+ - audio-amplifier	 : the phandle of the MAX98504 amplifier</div><div class='add'>+ - samsung,audio-routing : a list of the connections between audio components;</div><div class='add'>+			   each entry is a pair of strings, the first being the</div><div class='add'>+			   connection's sink, the second being the connection's</div><div class='add'>+			   source; valid names for sources and sinks are the</div><div class='add'>+			   WM5110's and MAX98504's pins and the jacks on the</div><div class='add'>+			   board: HP, SPK, Main Mic, Sub Mic, Third Mic,</div><div class='add'>+			   Headset Mic</div><div class='add'>+ - mic-bias-gpios	 : GPIO pin that enables the Main Mic bias regulator</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+sound {</div><div class='add'>+	compatible = "samsung,tm2-audio";</div><div class='add'>+	audio-codec = &lt;&amp;wm5110&gt;;</div><div class='add'>+	i2s-controller = &lt;&amp;i2s0&gt;;</div><div class='add'>+	audio-amplifier = &lt;&amp;max98504&gt;;</div><div class='add'>+	mic-bias-gpios = &lt;&amp;gpr3 2 0&gt;;</div><div class='add'>+	model = "wm5110";</div><div class='add'>+	samsung,audio-routing =</div><div class='add'>+		"HP", "HPOUT1L",</div><div class='add'>+		"HP", "HPOUT1R",</div><div class='add'>+		"SPK", "SPKOUT",</div><div class='add'>+		"SPKOUT", "HPOUT2L",</div><div class='add'>+		"SPKOUT", "HPOUT2R",</div><div class='add'>+		"Main Mic", "MICBIAS2",</div><div class='add'>+		"IN1R", "Main Mic";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/sun4i-codec.txt b/Documentation/devicetree/bindings/sound/sun4i-codec.txt<br/>index 0dce690f78f5..3863531d1e6d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/sun4i-codec.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/sun4i-codec.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/sun4i-codec.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/sun4i-codec.txt</a></div><div class='hunk'>@@ -1,8 +1,12 @@</div><div class='ctx'> * Allwinner A10 Codec</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: must be either "allwinner,sun4i-a10-codec" or</div><div class='del'>-  "allwinner,sun7i-a20-codec"</div><div class='add'>+- compatible: must be one of the following compatibles:</div><div class='add'>+		- "allwinner,sun4i-a10-codec"</div><div class='add'>+		- "allwinner,sun6i-a31-codec"</div><div class='add'>+		- "allwinner,sun7i-a20-codec"</div><div class='add'>+		- "allwinner,sun8i-a23-codec"</div><div class='add'>+		- "allwinner,sun8i-h3-codec"</div><div class='ctx'> - reg: must contain the registers location and length</div><div class='ctx'> - interrupts: must contain the codec interrupt</div><div class='ctx'> - dmas: DMA channels for tx and rx dma. See the DMA client binding,</div><div class='hunk'>@@ -10,13 +14,50 @@ Required properties:</div><div class='ctx'> - dma-names: should include "tx" and "rx".</div><div class='ctx'> - clocks: a list of phandle + clock-specifer pairs, one for each entry</div><div class='ctx'>   in clock-names.</div><div class='del'>-- clock-names: should contain followings:</div><div class='add'>+- clock-names: should contain the following:</div><div class='ctx'>    - "apb": the parent APB clock for this controller</div><div class='ctx'>    - "codec": the parent module clock</div><div class='ctx'> </div><div class='ctx'> Optional properties:</div><div class='ctx'> - allwinner,pa-gpios: gpio to enable external amplifier</div><div class='ctx'> </div><div class='add'>+Required properties for the following compatibles:</div><div class='add'>+		- "allwinner,sun6i-a31-codec"</div><div class='add'>+		- "allwinner,sun8i-a23-codec"</div><div class='add'>+		- "allwinner,sun8i-h3-codec"</div><div class='add'>+- resets: phandle to the reset control for this device</div><div class='add'>+- allwinner,audio-routing: A list of the connections between audio components.</div><div class='add'>+			   Each entry is a pair of strings, the first being the</div><div class='add'>+			   connection's sink, the second being the connection's</div><div class='add'>+			   source. Valid names include:</div><div class='add'>+</div><div class='add'>+			   Audio pins on the SoC:</div><div class='add'>+			   "HP"</div><div class='add'>+			   "HPCOM"</div><div class='add'>+			   "LINEIN"</div><div class='add'>+			   "LINEOUT"	(not on sun8i-a23)</div><div class='add'>+			   "MIC1"</div><div class='add'>+			   "MIC2"</div><div class='add'>+			   "MIC3"	(sun6i-a31 only)</div><div class='add'>+</div><div class='add'>+			   Microphone biases from the SoC:</div><div class='add'>+			   "HBIAS"</div><div class='add'>+			   "MBIAS"</div><div class='add'>+</div><div class='add'>+			   Board connectors:</div><div class='add'>+			   "Headphone"</div><div class='add'>+			   "Headset Mic"</div><div class='add'>+			   "Line In"</div><div class='add'>+			   "Line Out"</div><div class='add'>+			   "Mic"</div><div class='add'>+			   "Speaker"</div><div class='add'>+</div><div class='add'>+Required properties for the following compatibles:</div><div class='add'>+		- "allwinner,sun8i-a23-codec"</div><div class='add'>+		- "allwinner,sun8i-h3-codec"</div><div class='add'>+- allwinner,codec-analog-controls: A phandle to the codec analog controls</div><div class='add'>+				   block in the PRCM.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> codec: codec@01c22c00 {</div><div class='ctx'> 	#sound-dai-cells = &lt;0&gt;;</div><div class='hunk'>@@ -28,3 +69,23 @@ codec: codec@01c22c00 {</div><div class='ctx'> 	dmas = &lt;&amp;dma 0 19&gt;, &lt;&amp;dma 0 19&gt;;</div><div class='ctx'> 	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+codec: codec@01c22c00 {</div><div class='add'>+	#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+	compatible = "allwinner,sun6i-a31-codec";</div><div class='add'>+	reg = &lt;0x01c22c00 0x98&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	clocks = &lt;&amp;ccu CLK_APB1_CODEC&gt;, &lt;&amp;ccu CLK_CODEC&gt;;</div><div class='add'>+	clock-names = "apb", "codec";</div><div class='add'>+	resets = &lt;&amp;ccu RST_APB1_CODEC&gt;;</div><div class='add'>+	dmas = &lt;&amp;dma 15&gt;, &lt;&amp;dma 15&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='add'>+	allwinner,audio-routing =</div><div class='add'>+		"Headphone", "HP",</div><div class='add'>+		"Speaker", "LINEOUT",</div><div class='add'>+		"LINEIN", "Line In",</div><div class='add'>+		"MIC1",	"MBIAS",</div><div class='add'>+		"MIC1", "Mic",</div><div class='add'>+		"MIC2", "HBIAS",</div><div class='add'>+		"MIC2", "Headset Mic";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt<br/>index 7b526ec64991..ee21da865771 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/sun4i-i2s.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/sun4i-i2s.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/sun4i-i2s.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/sun4i-i2s.txt</a></div><div class='hunk'>@@ -5,8 +5,9 @@ audio data transfer between devices in the system.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> </div><div class='del'>-- compatible: should be one of the followings</div><div class='add'>+- compatible: should be one of the following:</div><div class='ctx'>    - "allwinner,sun4i-a10-i2s"</div><div class='add'>+   - "allwinner,sun6i-a31-i2s"</div><div class='ctx'> - reg: physical base address of the controller and length of memory mapped</div><div class='ctx'>   region.</div><div class='ctx'> - interrupts: should contain the I2S interrupt.</div><div class='hunk'>@@ -14,11 +15,15 @@ Required properties:</div><div class='ctx'> 	Documentation/devicetree/bindings/dma/dma.txt</div><div class='ctx'> - dma-names: should include "tx" and "rx".</div><div class='ctx'> - clocks: a list of phandle + clock-specifer pairs, one for each entry in clock-names.</div><div class='del'>-- clock-names: should contain followings:</div><div class='add'>+- clock-names: should contain the following:</div><div class='ctx'>    - "apb" : clock for the I2S bus interface</div><div class='ctx'>    - "mod" : module clock for the I2S controller</div><div class='ctx'> - #sound-dai-cells : Must be equal to 0</div><div class='ctx'> </div><div class='add'>+Required properties for the following compatibles:</div><div class='add'>+	- "allwinner,sun6i-a31-i2s"</div><div class='add'>+- resets: phandle to the reset line for this codec</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> i2s0: i2s@01c22400 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt b/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt<br/>new file mode 100644<br/>index 000000000000..399b1b4bae22<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+Allwinner SUN8I audio codec</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+On Sun8i-A33 SoCs, the audio is separated in different parts:</div><div class='add'>+	  - A DAI driver. It uses the "sun4i-i2s" driver which is</div><div class='add'>+	  documented here:</div><div class='add'>+	  Documentation/devicetree/bindings/sound/sun4i-i2s.txt</div><div class='add'>+	  - An analog part of the codec which is handled as PRCM registers.</div><div class='add'>+	  See Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt</div><div class='add'>+	  - An digital part of the codec which is documented in this current</div><div class='add'>+	  binding documentation.</div><div class='add'>+	  - And finally, an audio card which links all the above components.</div><div class='add'>+	  The simple-audio card will be used.</div><div class='add'>+	  See Documentation/devicetree/bindings/sound/simple-card.txt</div><div class='add'>+</div><div class='add'>+This bindings documentation exposes Sun8i codec (digital part).</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must be "allwinner,sun8i-a33-codec"</div><div class='add'>+- reg: must contain the registers location and length</div><div class='add'>+- interrupts: must contain the codec interrupt</div><div class='add'>+- clocks: a list of phandle + clock-specifer pairs, one for each entry</div><div class='add'>+  in clock-names.</div><div class='add'>+- clock-names: should contain followings:</div><div class='add'>+   - "bus": the parent APB clock for this controller</div><div class='add'>+   - "mod": the parent module clock</div><div class='add'>+</div><div class='add'>+Here is an example to add a sound card and the codec binding on sun8i SoCs that</div><div class='add'>+are similar to A33 using simple-card:</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "simple-audio-card";</div><div class='add'>+		simple-audio-card,name = "sun8i-a33-audio";</div><div class='add'>+		simple-audio-card,format = "i2s";</div><div class='add'>+		simple-audio-card,frame-master = &lt;&amp;link_codec&gt;;</div><div class='add'>+		simple-audio-card,bitclock-master = &lt;&amp;link_codec&gt;;</div><div class='add'>+		simple-audio-card,mclk-fs = &lt;512&gt;;</div><div class='add'>+		simple-audio-card,aux-devs = &lt;&amp;codec_analog&gt;;</div><div class='add'>+		simple-audio-card,routing =</div><div class='add'>+				"Left DAC", "Digital Left DAC",</div><div class='add'>+				"Right DAC", "Digital Right DAC";</div><div class='add'>+</div><div class='add'>+		simple-audio-card,cpu {</div><div class='add'>+			sound-dai = &lt;&amp;dai&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		link_codec: simple-audio-card,codec {</div><div class='add'>+			sound-dai = &lt;&amp;codec&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	soc@01c00000 {</div><div class='add'>+		[...]</div><div class='add'>+</div><div class='add'>+		audio-codec@1c22e00 {</div><div class='add'>+			#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "allwinner,sun8i-a33-codec";</div><div class='add'>+			reg = &lt;0x01c22e00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_CODEC&gt;, &lt;&amp;ccu CLK_AC_DIG&gt;;</div><div class='add'>+			clock-names = "bus", "mod";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt<br/>new file mode 100644<br/>index 000000000000..779b735781ba<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+* Allwinner Codec Analog Controls</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: must be one of the following compatibles:</div><div class='add'>+		- "allwinner,sun8i-a23-codec-analog"</div><div class='add'>+		- "allwinner,sun8i-h3-codec-analog"</div><div class='add'>+</div><div class='add'>+Required properties if not a sub-node of the PRCM node:</div><div class='add'>+- reg: must contain the registers location and length</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+prcm: prcm@01f01400 {</div><div class='add'>+	codec_analog: codec-analog {</div><div class='add'>+		compatible = "allwinner,sun8i-a23-codec-analog";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt b/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt<br/>index 0230c4d20506..fe0a65e6d629 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt</a></div><div class='hunk'>@@ -10,6 +10,7 @@ Required properties:</div><div class='ctx'>   - compatible		: should be one of the following:</div><div class='ctx'>     - "allwinner,sun4i-a10-spdif": for the Allwinner A10 SoC</div><div class='ctx'>     - "allwinner,sun6i-a31-spdif": for the Allwinner A31 SoC</div><div class='add'>+    - "allwinner,sun8i-h3-spdif": for the Allwinner H3 SoC</div><div class='ctx'> </div><div class='ctx'>   - reg			: Offset and length of the register set for the device.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt<br/>index 9340d2ddcc54..6fbba562eaa7 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/tlv320aic31xx.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/tlv320aic31xx.txt</a></div><div class='hunk'>@@ -12,6 +12,7 @@ Required properties:</div><div class='ctx'>     "ti,tlv320aic3120" - TLV320AIC3120 (mono speaker amp, MiniDSP)</div><div class='ctx'>     "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)</div><div class='ctx'>     "ti,tlv320dac3100" - TLV320DAC3100 (no ADC, mono speaker amp, no MiniDSP)</div><div class='add'>+    "ti,tlv320dac3101" - TLV320DAC3101 (no ADC, stereo speaker amp, no MiniDSP)</div><div class='ctx'> </div><div class='ctx'> - reg - &lt;int&gt; -  I2C slave address</div><div class='ctx'> - HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/wm8580.txt b/Documentation/devicetree/bindings/sound/wm8580.txt<br/>index 7d9821f348da..78fce9b14954 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/wm8580.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/wm8580.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/wm8580.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/wm8580.txt</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='del'>-WM8580 audio CODEC</div><div class='add'>+WM8580 and WM8581 audio CODEC</div><div class='ctx'> </div><div class='ctx'> This device supports I2C only.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> </div><div class='del'>-  - compatible : "wlf,wm8580"</div><div class='add'>+  - compatible : "wlf,wm8580", "wlf,wm8581"</div><div class='ctx'> </div><div class='ctx'>   - reg : the I2C address of the device.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt b/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt<br/>index 7e5aa6f6b5a1..292ad5083704 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sound/zte,zx-i2s.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sound/zte,zx-i2s.txt</a></div><div class='hunk'>@@ -1,10 +1,12 @@</div><div class='ctx'> ZTE ZX296702 I2S controller</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>- - compatible : Must be "zte,zx296702-i2s"</div><div class='add'>+ - compatible : Must be one of:</div><div class='add'>+	"zte,zx296718-i2s", "zte,zx296702-i2s"</div><div class='add'>+	"zte,zx296702-i2s"</div><div class='ctx'>  - reg : Must contain I2S core's registers location and length</div><div class='ctx'>  - clocks : Pairs of phandle and specifier referencing the controller's clocks.</div><div class='del'>- - clock-names: "tx" for the clock to the I2S interface.</div><div class='add'>+ - clock-names: "wclk" for the wclk, "pclk" for the pclk to the I2S interface.</div><div class='ctx'>  - dmas: Pairs of phandle and specifier for the DMA channel that is used by</div><div class='ctx'>    the core. The core expects two dma channels for transmit.</div><div class='ctx'>  - dma-names : Must be "tx" and "rx"</div><div class='hunk'>@@ -16,12 +18,12 @@ please check:</div><div class='ctx'> 	* dma/dma.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='del'>-	i2s0: i2s0@0b005000 {</div><div class='add'>+	i2s0: i2s@b005000 {</div><div class='ctx'> 		#sound-dai-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "zte,zx296702-i2s";</div><div class='add'>+		compatible = "zte,zx296718-i2s", "zte,zx296702-i2s";</div><div class='ctx'> 		reg = &lt;0x0b005000 0x1000&gt;;</div><div class='del'>-		clocks = &lt;&amp;lsp0clk ZX296702_I2S0_DIV&gt;;</div><div class='del'>-		clock-names = "tx";</div><div class='add'>+		clocks = &lt;&amp;audiocrm AUDIO_I2S0_WCLK&gt;, &lt;&amp;audiocrm AUDIO_I2S0_PCLK&gt;;</div><div class='add'>+		clock-names = "wclk", "pclk";</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		dmas = &lt;&amp;dma 5&gt;, &lt;&amp;dma 6&gt;;</div><div class='ctx'> 		dma-names = "tx", "rx";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt<br/>index aa005c1d10d9..dc975064fa27 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/spi/sh-msiof.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/spi/sh-msiof.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/spi/sh-msiof.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/sh-msiof.txt</a></div><div class='hunk'>@@ -1,16 +1,23 @@</div><div class='ctx'> Renesas MSIOF spi controller</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible           : "renesas,msiof-&lt;soctype&gt;" for SoCs,</div><div class='del'>-			 "renesas,sh-msiof" for SuperH, or</div><div class='del'>-			 "renesas,sh-mobile-msiof" for SH Mobile series.</div><div class='del'>-			 Examples with soctypes are:</div><div class='del'>-			 "renesas,msiof-r8a7790" (R-Car H2)</div><div class='add'>+- compatible           : "renesas,msiof-r8a7790" (R-Car H2)</div><div class='ctx'> 			 "renesas,msiof-r8a7791" (R-Car M2-W)</div><div class='ctx'> 			 "renesas,msiof-r8a7792" (R-Car V2H)</div><div class='ctx'> 			 "renesas,msiof-r8a7793" (R-Car M2-N)</div><div class='ctx'> 			 "renesas,msiof-r8a7794" (R-Car E2)</div><div class='add'>+			 "renesas,msiof-r8a7796" (R-Car M3-W)</div><div class='ctx'> 			 "renesas,msiof-sh73a0" (SH-Mobile AG5)</div><div class='add'>+			 "renesas,sh-mobile-msiof" (generic SH-Mobile compatibile device)</div><div class='add'>+			 "renesas,rcar-gen2-msiof" (generic R-Car Gen2 compatible device)</div><div class='add'>+			 "renesas,rcar-gen3-msiof" (generic R-Car Gen3 compatible device)</div><div class='add'>+			 "renesas,sh-msiof"      (deprecated)</div><div class='add'>+</div><div class='add'>+			 When compatible with the generic version, nodes</div><div class='add'>+			 must list the SoC-specific version corresponding</div><div class='add'>+			 to the platform first followed by the generic</div><div class='add'>+			 version.</div><div class='add'>+</div><div class='ctx'> - reg                  : A list of offsets and lengths of the register sets for</div><div class='ctx'> 			 the device.</div><div class='ctx'> 			 If only one register set is present, it is to be used</div><div class='hunk'>@@ -60,7 +67,8 @@ Documentation/devicetree/bindings/pinctrl/renesas,*.</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	msiof0: spi@e6e20000 {</div><div class='del'>-		compatible = "renesas,msiof-r8a7791";</div><div class='add'>+		compatible = "renesas,msiof-r8a7791",</div><div class='add'>+			     "renesas,rcar-gen2-msiof";</div><div class='ctx'> 		reg = &lt;0 0xe6e20000 0 0x0064&gt;;</div><div class='ctx'> 		interrupts = &lt;0 156 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp0_clks R8A7791_CLK_MSIOF0&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/spi-armada-3700.txt b/Documentation/devicetree/bindings/spi/spi-armada-3700.txt<br/>new file mode 100644<br/>index 000000000000..1564aa8c02cd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/spi/spi-armada-3700.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/spi-armada-3700.txt</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+* Marvell Armada 3700 SPI Controller</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+- compatible: should be "marvell,armada-3700-spi"</div><div class='add'>+- reg: physical base address of the controller and length of memory mapped</div><div class='add'>+       region.</div><div class='add'>+- interrupts: The interrupt number. The interrupt specifier format depends on</div><div class='add'>+	      the interrupt controller and of its driver.</div><div class='add'>+- clocks: Must contain the clock source, usually from the North Bridge clocks.</div><div class='add'>+- num-cs: The number of chip selects that is supported by this SPI Controller</div><div class='add'>+- #address-cells: should be 1.</div><div class='add'>+- #size-cells: should be 0.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	spi0: spi@10600 {</div><div class='add'>+		compatible = "marvell,armada-3700-spi";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0x10600 0x5d&gt;;</div><div class='add'>+		clocks = &lt;&amp;nb_perih_clk 7&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		num-cs = &lt;4&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt b/Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt<br/>new file mode 100644<br/>index 000000000000..225ace1d0c65<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+* Freescale Low Power SPI (LPSPI) for i.MX</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible :</div><div class='add'>+  - "fsl,imx7ulp-spi" for LPSPI compatible with the one integrated on i.MX7ULP soc</div><div class='add'>+- reg : address and length of the lpspi master registers</div><div class='add'>+- interrupt-parent : core interrupt controller</div><div class='add'>+- interrupts : lpspi interrupt</div><div class='add'>+- clocks : lpspi clock specifier</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+lpspi2: lpspi@40290000 {</div><div class='add'>+	compatible = "fsl,imx7ulp-spi";</div><div class='add'>+	reg = &lt;0x40290000 0x10000&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	clocks = &lt;&amp;clks IMX7ULP_CLK_LPSPI2&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/spi-lantiq-ssc.txt b/Documentation/devicetree/bindings/spi/spi-lantiq-ssc.txt<br/>new file mode 100644<br/>index 000000000000..6069b95a883d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/spi/spi-lantiq-ssc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/spi-lantiq-ssc.txt</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+Lantiq Synchronous Serial Controller (SSC) SPI master driver</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: "lantiq,ase-spi", "lantiq,falcon-spi", "lantiq,xrx100-spi"</div><div class='add'>+- #address-cells: see spi-bus.txt</div><div class='add'>+- #size-cells: see spi-bus.txt</div><div class='add'>+- reg: address and length of the spi master registers</div><div class='add'>+- interrupts: should contain the "spi_rx", "spi_tx" and "spi_err" interrupt.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- clocks: spi clock phandle</div><div class='add'>+- num-cs: see spi-bus.txt, set to 8 if unset</div><div class='add'>+- base-cs: the number of the first chip select, set to 1 if unset.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+spi: spi@E100800 {</div><div class='add'>+	compatible = "lantiq,xrx200-spi", "lantiq,xrx100-spi";</div><div class='add'>+	reg = &lt;0xE100800 0x100&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;icu0&gt;;</div><div class='add'>+	interrupts = &lt;22 23 24&gt;;</div><div class='add'>+	interrupt-names = "spi_rx", "spi_tx", "spi_err";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	num-cs = &lt;6&gt;;</div><div class='add'>+	base-cs = &lt;1&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.txt b/Documentation/devicetree/bindings/spi/spi-rockchip.txt<br/>index d2ca153614f9..83da4931d832 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/spi/spi-rockchip.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/spi/spi-rockchip.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/spi/spi-rockchip.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/spi-rockchip.txt</a></div><div class='hunk'>@@ -31,6 +31,10 @@ Optional Properties:</div><div class='ctx'> - rx-sample-delay-ns: nanoseconds to delay after the SCLK edge before sampling</div><div class='ctx'> 		Rx data (may need to be fine tuned for high capacitance lines).</div><div class='ctx'> 		No delay (0) by default.</div><div class='add'>+- pinctrl-names: Names for the pin configuration(s); may be "default" or</div><div class='add'>+		"sleep", where the "sleep" configuration may describe the state</div><div class='add'>+		the pins should be in during system suspend. See also</div><div class='add'>+		pinctrl/pinctrl-bindings.txt.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='hunk'>@@ -46,4 +50,7 @@ Example:</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru SCLK_SPI0&gt;, &lt;&amp;cru PCLK_SPI0&gt;;</div><div class='ctx'> 		clock-names = "spiclk", "apb_pclk";</div><div class='add'>+		pinctrl-0 = &lt;&amp;spi1_pins&gt;;</div><div class='add'>+		pinctrl-1 = &lt;&amp;spi1_sleep&gt;;</div><div class='add'>+		pinctrl-names = "default", "sleep";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/spi/spi-sun6i.txt b/Documentation/devicetree/bindings/spi/spi-sun6i.txt<br/>index 21de73db6a05..2ec99b86b622 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/spi/spi-sun6i.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/spi/spi-sun6i.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/spi/spi-sun6i.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/spi/spi-sun6i.txt</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='del'>-Allwinner A31 SPI controller</div><div class='add'>+Allwinner A31/H3 SPI controller</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible: Should be "allwinner,sun6i-a31-spi".</div><div class='add'>+- compatible: Should be "allwinner,sun6i-a31-spi" or "allwinner,sun8i-h3-spi".</div><div class='ctx'> - reg: Should contain register location and length.</div><div class='ctx'> - interrupts: Should contain interrupt.</div><div class='ctx'> - clocks: phandle to the clocks feeding the SPI controller. Two are</div><div class='hunk'>@@ -12,6 +12,11 @@ Required properties:</div><div class='ctx'> - resets: phandle to the reset controller asserting this device in</div><div class='ctx'>           reset</div><div class='ctx'> </div><div class='add'>+Optional properties:</div><div class='add'>+- dmas: DMA specifiers for rx and tx dma. See the DMA client binding,</div><div class='add'>+	Documentation/devicetree/bindings/dma/dma.txt</div><div class='add'>+- dma-names: DMA request names should include "rx" and "tx" if present.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> spi1: spi@01c69000 {</div><div class='hunk'>@@ -22,3 +27,19 @@ spi1: spi@01c69000 {</div><div class='ctx'> 	clock-names = "ahb", "mod";</div><div class='ctx'> 	resets = &lt;&amp;ahb1_rst 21&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+spi0: spi@01c68000 {</div><div class='add'>+	compatible = "allwinner,sun8i-h3-spi";</div><div class='add'>+	reg = &lt;0x01c68000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	clocks = &lt;&amp;ccu CLK_BUS_SPI0&gt;, &lt;&amp;ccu CLK_SPI0&gt;;</div><div class='add'>+	clock-names = "ahb", "mod";</div><div class='add'>+	dmas = &lt;&amp;dma 23&gt;, &lt;&amp;dma 23&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi0_pins&gt;;</div><div class='add'>+	resets = &lt;&amp;ccu RST_BUS_SPI0&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sram/sram.txt b/Documentation/devicetree/bindings/sram/sram.txt<br/>index add48f09015e..267da4410aef 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sram/sram.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/sram/sram.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/sram/sram.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/sram/sram.txt</a></div><div class='hunk'>@@ -4,7 +4,7 @@ Simple IO memory regions to be managed by the genalloc API.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> </div><div class='del'>-- compatible : mmio-sram</div><div class='add'>+- compatible : mmio-sram or atmel,sama5d2-securam</div><div class='ctx'> </div><div class='ctx'> - reg : SRAM iomem address range</div><div class='ctx'> </div><div class='hunk'>@@ -42,6 +42,12 @@ Optional properties in the area nodes:</div><div class='ctx'>          and in use by another device or devices</div><div class='ctx'> - export : indicates that the reserved SRAM area may be accessed outside</div><div class='ctx'>            of the kernel, e.g. by bootloader or userspace</div><div class='add'>+- protect-exec : Same as 'pool' above but with the additional</div><div class='add'>+		 constraint that code wil be run from the region and</div><div class='add'>+		 that the memory is maintained as read-only, executable</div><div class='add'>+		 during code execution. NOTE: This region must be page</div><div class='add'>+		 aligned on start and end in order to properly allow</div><div class='add'>+		 manipulation of the page attributes.</div><div class='ctx'> - label : the name for the reserved partition, if omitted, the label</div><div class='ctx'>           is taken from the node name excluding the unit address.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/submitting-patches.txt b/Documentation/devicetree/bindings/submitting-patches.txt<br/>index 7d44eae7ab0b..274058c583dd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/submitting-patches.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/submitting-patches.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/submitting-patches.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/submitting-patches.txt</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> I. For patch submitters</div><div class='ctx'> </div><div class='del'>-  0) Normal patch submission rules from Documentation/SubmittingPatches</div><div class='add'>+  0) Normal patch submission rules from Documentation/process/submitting-patches.rst</div><div class='ctx'>      applies.</div><div class='ctx'> </div><div class='ctx'>   1) The Documentation/ portion of the patch should be a separate patch.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt b/Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt<br/>new file mode 100644<br/>index 000000000000..474531d2b2c5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+Binding for Thermal Sensor driver for BCM2835 SoCs.</div><div class='add'>+</div><div class='add'>+Required parameters:</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+compatible: 	should be one of: "brcm,bcm2835-thermal",</div><div class='add'>+		"brcm,bcm2836-thermal" or "brcm,bcm2837-thermal"</div><div class='add'>+reg:		Address range of the thermal registers.</div><div class='add'>+clocks: 	Phandle of the clock used by the thermal sensor.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+thermal: thermal@7e212000 {</div><div class='add'>+	compatible = "brcm,bcm2835-thermal";</div><div class='add'>+	reg = &lt;0x7e212000 0x8&gt;;</div><div class='add'>+	clocks = &lt;&amp;clocks BCM2835_CLOCK_TSENS&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/thermal/qoriq-thermal.txt b/Documentation/devicetree/bindings/thermal/qoriq-thermal.txt<br/>index 66223d561972..20ca4ef9d776 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/thermal/qoriq-thermal.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/thermal/qoriq-thermal.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/thermal/qoriq-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/qoriq-thermal.txt</a></div><div class='hunk'>@@ -17,6 +17,12 @@ Required properties:</div><div class='ctx'> 	calibration data, as specified by the SoC reference manual.</div><div class='ctx'> 	The first cell of each pair is the value to be written to TTCFGR,</div><div class='ctx'> 	and the second is the value to be written to TSCFGR.</div><div class='add'>+- #thermal-sensor-cells : Must be 1. The sensor specifier is the monitoring</div><div class='add'>+	site ID, and represents the "n" in TRITSRn and TRATSRn.</div><div class='add'>+</div><div class='add'>+Optional property:</div><div class='add'>+- little-endian : If present, the TMU registers are little endian. If absent,</div><div class='add'>+	the default is big endian.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='hunk'>@@ -60,4 +66,5 @@ tmu@f0000 {</div><div class='ctx'> </div><div class='ctx'> 			       0x00030000 0x00000012</div><div class='ctx'> 			       0x00030001 0x0000001d&gt;;</div><div class='add'>+	#thermal-sensor-cells = &lt;1&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt<br/>new file mode 100644<br/>index 000000000000..07a9713ae6a7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+* DT bindings for Renesas R-Car Gen3 Thermal Sensor driver</div><div class='add'>+</div><div class='add'>+On R-Car Gen3 SoCs, the thermal sensor controllers (TSC) control the thermal</div><div class='add'>+sensors (THS) which are the analog circuits for measuring temperature (Tj)</div><div class='add'>+inside the LSI.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible		: "renesas,&lt;soctype&gt;-thermal",</div><div class='add'>+			  Examples with soctypes are:</div><div class='add'>+			    - "renesas,r8a7795-thermal" (R-Car H3)</div><div class='add'>+			    - "renesas,r8a7796-thermal" (R-Car M3-W)</div><div class='add'>+- reg			: Address ranges of the thermal registers. Each sensor</div><div class='add'>+			  needs one address range. Sorting must be done in</div><div class='add'>+			  increasing order according to datasheet, i.e.</div><div class='add'>+			  TSC1, TSC2, ...</div><div class='add'>+- clocks		: Must contain a reference to the functional clock.</div><div class='add'>+- #thermal-sensor-cells : must be &lt;1&gt;.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- interrupts           : interrupts routed to the TSC (3 for H3 and M3-W)</div><div class='add'>+- power-domain		: Must contain a reference to the power domain. This</div><div class='add'>+			  property is mandatory if the thermal sensor instance</div><div class='add'>+			  is part of a controllable power domain.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	tsc: thermal@e6198000 {</div><div class='add'>+		compatible = "renesas,r8a7795-thermal";</div><div class='add'>+		reg = &lt;0 0xe6198000 0 0x68&gt;,</div><div class='add'>+		      &lt;0 0xe61a0000 0 0x5c&gt;,</div><div class='add'>+		      &lt;0 0xe61a8000 0 0x5c&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;cpg CPG_MOD 522&gt;;</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='add'>+		#thermal-sensor-cells = &lt;1&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	thermal-zones {</div><div class='add'>+		sensor_thermal1: sensor-thermal1 {</div><div class='add'>+			polling-delay-passive = &lt;250&gt;;</div><div class='add'>+			polling-delay = &lt;1000&gt;;</div><div class='add'>+			thermal-sensors = &lt;&amp;tsc 0&gt;;</div><div class='add'>+</div><div class='add'>+			trips {</div><div class='add'>+				sensor1_crit: sensor1-crit {</div><div class='add'>+					temperature = &lt;90000&gt;;</div><div class='add'>+					hysteresis = &lt;2000&gt;;</div><div class='add'>+					type = "critical";</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt b/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt<br/>index 08efe6bc2193..43003aec94bd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/thermal/rockchip-thermal.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/rockchip-thermal.txt</a></div><div class='hunk'>@@ -22,10 +22,13 @@ Required properties:</div><div class='ctx'> 	      TSADC controller.</div><div class='ctx'> - pinctrl-2 : The "sleep" pinctrl state, it will be in for suspend.</div><div class='ctx'> - #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='ctx'> - rockchip,hw-tshut-temp : The hardware-controlled shutdown temperature value.</div><div class='ctx'> - rockchip,hw-tshut-mode : The hardware-controlled shutdown mode 0:CRU 1:GPIO.</div><div class='ctx'> - rockchip,hw-tshut-polarity : The hardware-controlled active polarity 0:LOW</div><div class='ctx'> 			       1:HIGH.</div><div class='add'>+- rockchip,grf : The phandle of the syscon node for the general register file.</div><div class='ctx'> </div><div class='ctx'> Exiample:</div><div class='ctx'> tsadc: tsadc@ff280000 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/thermal/st-thermal.txt b/Documentation/devicetree/bindings/thermal/st-thermal.txt<br/>index 3b9251b4a145..a2f939137e35 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/thermal/st-thermal.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/thermal/st-thermal.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/thermal/st-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/st-thermal.txt</a></div><div class='hunk'>@@ -3,17 +3,8 @@ Binding for Thermal Sensor driver for STMicroelectronics STi series of SoCs.</div><div class='ctx'> Required parameters:</div><div class='ctx'> -------------------</div><div class='ctx'> </div><div class='del'>-compatible : 	st,&lt;SoC&gt;-&lt;module&gt;-thermal; should be one of:</div><div class='del'>-		  "st,stih415-sas-thermal",</div><div class='del'>-		  "st,stih415-mpe-thermal",</div><div class='del'>-		  "st,stih416-sas-thermal"</div><div class='del'>-		  "st,stih416-mpe-thermal"</div><div class='del'>-		  "st,stid127-thermal" or</div><div class='del'>-		  "st,stih407-thermal"</div><div class='del'>-		according to the SoC type (stih415, stih416, stid127, stih407)</div><div class='del'>-		and module type (sas or mpe). On stid127 &amp; stih407 there is only</div><div class='del'>-		one die/module, so there is no module type in the compatible</div><div class='del'>-		string.</div><div class='add'>+compatible : 	Should be "st,stih407-thermal"</div><div class='add'>+</div><div class='ctx'> clock-names : 	Should be "thermal".</div><div class='ctx'> 		  See: Documentation/devicetree/bindings/resource-names.txt</div><div class='ctx'> clocks : 	Phandle of the clock used by the thermal sensor.</div><div class='hunk'>@@ -25,18 +16,17 @@ Optional parameters:</div><div class='ctx'> reg : 		For non-sysconf based sensors, this should be the physical base</div><div class='ctx'> 		address and length of the sensor's registers.</div><div class='ctx'> interrupts :	Standard way to define interrupt number.</div><div class='del'>-		Interrupt is mandatory to be defined when compatible is</div><div class='del'>-		"stih416-mpe-thermal".</div><div class='ctx'> 		  NB: For thermal sensor's for which no interrupt has been</div><div class='ctx'> 		  defined, a polling delay of 1000ms will be used to read the</div><div class='ctx'> 		  temperature from device.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='del'>-	temp1@fdfe8000 {</div><div class='del'>-		compatible	= "st,stih416-mpe-thermal";</div><div class='del'>-		reg		= &lt;0xfdfe8000 0x10&gt;;</div><div class='del'>-		clock-names	= "thermal";</div><div class='del'>-		clocks		= &lt;&amp;clk_m_mpethsens&gt;;</div><div class='del'>-		interrupts	= &lt;GIC_SPI 23 IRQ_TYPE_NONE&gt;;</div><div class='add'>+	temp0@91a0000 {</div><div class='add'>+		compatible = "st,stih407-thermal";</div><div class='add'>+		reg = &lt;0x91a0000 0x28&gt;;</div><div class='add'>+		clock-names = "thermal";</div><div class='add'>+		clocks = &lt;&amp;CLK_SYSIN&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 205 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		st,passive_cooling_temp = &lt;110&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/thermal/zx2967-thermal.txt b/Documentation/devicetree/bindings/thermal/zx2967-thermal.txt<br/>new file mode 100644<br/>index 000000000000..3dc1c6bf0478<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/thermal/zx2967-thermal.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/thermal/zx2967-thermal.txt</a></div><div class='hunk'>@@ -0,0 +1,116 @@</div><div class='add'>+* ZTE zx2967 family Thermal</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+- compatible: should be one of the following.</div><div class='add'>+    * zte,zx296718-thermal</div><div class='add'>+- reg: physical base address of the controller and length of memory mapped</div><div class='add'>+    region.</div><div class='add'>+- clocks : Pairs of phandle and specifier referencing the controller's clocks.</div><div class='add'>+- clock-names: "topcrm" for the topcrm clock.</div><div class='add'>+	       "apb" for the apb clock.</div><div class='add'>+- #thermal-sensor-cells: must be 0.</div><div class='add'>+</div><div class='add'>+Please note: slope coefficient defined in thermal-zones section need to be</div><div class='add'>+multiplied by 1000.</div><div class='add'>+</div><div class='add'>+Example for tempsensor:</div><div class='add'>+</div><div class='add'>+	tempsensor: tempsensor@148a000 {</div><div class='add'>+		compatible = "zte,zx296718-thermal";</div><div class='add'>+		reg = &lt;0x0148a000 0x20&gt;;</div><div class='add'>+		clocks = &lt;&amp;topcrm TEMPSENSOR_GATE&gt;, &lt;&amp;audiocrm AUDIO_TS_PCLK&gt;;</div><div class='add'>+		clock-names = "topcrm", "apb";</div><div class='add'>+		#thermal-sensor-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Example for cooling device:</div><div class='add'>+</div><div class='add'>+	cooling_dev: cooling_dev {</div><div class='add'>+		cluster0_cooling_dev: cluster0-cooling-dev {</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+			cpumask = &lt;0xf&gt;;</div><div class='add'>+			capacitance = &lt;1500&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	cluster1_cooling_dev: cluster1-cooling-dev {</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+			cpumask = &lt;0x30&gt;;</div><div class='add'>+			capacitance = &lt;2000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Example for thermal zones:</div><div class='add'>+</div><div class='add'>+	thermal-zones {</div><div class='add'>+		zx296718_thermal: zx296718_thermal {</div><div class='add'>+			polling-delay-passive = &lt;500&gt;;</div><div class='add'>+			polling-delay = &lt;1000&gt;;</div><div class='add'>+			sustainable-power = &lt;6500&gt;;</div><div class='add'>+</div><div class='add'>+			thermal-sensors = &lt;&amp;tempsensor 0&gt;;</div><div class='add'>+			/*</div><div class='add'>+			 * slope need to be multiplied by 1000.</div><div class='add'>+			 */</div><div class='add'>+			coefficients = &lt;1951 (-922)&gt;;</div><div class='add'>+</div><div class='add'>+			trips {</div><div class='add'>+				trip0: switch_on_temperature {</div><div class='add'>+					temperature = &lt;90000&gt;;</div><div class='add'>+					hysteresis = &lt;2000&gt;;</div><div class='add'>+					type = "passive";</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				trip1: desired_temperature {</div><div class='add'>+					temperature = &lt;100000&gt;;</div><div class='add'>+					hysteresis = &lt;2000&gt;;</div><div class='add'>+					type = "passive";</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				crit: critical_temperature {</div><div class='add'>+					temperature = &lt;110000&gt;;</div><div class='add'>+					hysteresis = &lt;2000&gt;;</div><div class='add'>+					type = "critical";</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cooling-maps {</div><div class='add'>+				map0 {</div><div class='add'>+					trip = &lt;&amp;trip0&gt;;</div><div class='add'>+					cooling-device = &lt;&amp;gpu 2 5&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				map1 {</div><div class='add'>+					trip = &lt;&amp;trip0&gt;;</div><div class='add'>+					cooling-device = &lt;&amp;cluster0_cooling_dev 1 2&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				map2 {</div><div class='add'>+					trip = &lt;&amp;trip1&gt;;</div><div class='add'>+					cooling-device = &lt;&amp;cluster0_cooling_dev 1 2&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				map3 {</div><div class='add'>+					trip = &lt;&amp;crit&gt;;</div><div class='add'>+					cooling-device = &lt;&amp;cluster0_cooling_dev 1 2&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				map4 {</div><div class='add'>+					trip = &lt;&amp;trip0&gt;;</div><div class='add'>+					cooling-device = &lt;&amp;cluster1_cooling_dev 1 2&gt;;</div><div class='add'>+					contribution = &lt;9000&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				map5 {</div><div class='add'>+					trip = &lt;&amp;trip1&gt;;</div><div class='add'>+					cooling-device = &lt;&amp;cluster1_cooling_dev 1 2&gt;;</div><div class='add'>+					contribution = &lt;4096&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				map6 {</div><div class='add'>+					trip = &lt;&amp;crit&gt;;</div><div class='add'>+					cooling-device = &lt;&amp;cluster1_cooling_dev 1 2&gt;;</div><div class='add'>+					contribution = &lt;4096&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/timer/cortina,gemini-timer.txt b/Documentation/devicetree/bindings/timer/cortina,gemini-timer.txt<br/>new file mode 100644<br/>index 000000000000..16ea1d3b2e9e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/timer/cortina,gemini-timer.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/timer/cortina,gemini-timer.txt</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+Cortina Systems Gemini timer</div><div class='add'>+</div><div class='add'>+This timer is embedded in the Cortina Systems Gemini SoCs.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible : Must be "cortina,gemini-timer"</div><div class='add'>+- reg : Should contain registers location and length</div><div class='add'>+- interrupts : Should contain the three timer interrupts with</div><div class='add'>+  flags for rising edge</div><div class='add'>+- syscon : a phandle to the global Gemini system controller</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+timer@43000000 {</div><div class='add'>+	compatible = "cortina,gemini-timer";</div><div class='add'>+	reg = &lt;0x43000000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;14 IRQ_TYPE_EDGE_RISING&gt;, /* Timer 1 */</div><div class='add'>+		   &lt;15 IRQ_TYPE_EDGE_RISING&gt;, /* Timer 2 */</div><div class='add'>+		   &lt;16 IRQ_TYPE_EDGE_RISING&gt;; /* Timer 3 */</div><div class='add'>+	syscon = &lt;&amp;syscon&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt b/Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt<br/>deleted file mode 100644<br/>index c8c03d700382..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-NPS Network Processor</div><div class='del'>-</div><div class='del'>-Required properties:</div><div class='del'>-</div><div class='del'>-- compatible :	should be "ezchip,nps400-timer"</div><div class='del'>-</div><div class='del'>-Clocks required for compatible = "ezchip,nps400-timer":</div><div class='del'>-- clocks : Must contain a single entry describing the clock input</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-timer {</div><div class='del'>-	compatible = "ezchip,nps400-timer";</div><div class='del'>-	clocks = &lt;&amp;sysclk&gt;;</div><div class='del'>-};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/timer/ezchip,nps400-timer0.txt b/Documentation/devicetree/bindings/timer/ezchip,nps400-timer0.txt<br/>new file mode 100644<br/>index 000000000000..e3cfce8fecc5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/timer/ezchip,nps400-timer0.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/timer/ezchip,nps400-timer0.txt</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+NPS Network Processor</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible :	should be "ezchip,nps400-timer0"</div><div class='add'>+</div><div class='add'>+Clocks required for compatible = "ezchip,nps400-timer0":</div><div class='add'>+- interrupts : The interrupt of the first timer</div><div class='add'>+- clocks : Must contain a single entry describing the clock input</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+timer {</div><div class='add'>+	compatible = "ezchip,nps400-timer0";</div><div class='add'>+	interrupts = &lt;3&gt;;</div><div class='add'>+	clocks = &lt;&amp;sysclk&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/timer/ezchip,nps400-timer1.txt b/Documentation/devicetree/bindings/timer/ezchip,nps400-timer1.txt<br/>new file mode 100644<br/>index 000000000000..c0ab4190b8fb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/timer/ezchip,nps400-timer1.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/timer/ezchip,nps400-timer1.txt</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+NPS Network Processor</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible :	should be "ezchip,nps400-timer1"</div><div class='add'>+</div><div class='add'>+Clocks required for compatible = "ezchip,nps400-timer1":</div><div class='add'>+- clocks : Must contain a single entry describing the clock input</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+timer {</div><div class='add'>+	compatible = "ezchip,nps400-timer1";</div><div class='add'>+	clocks = &lt;&amp;sysclk&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/timer/renesas,ostm.txt b/Documentation/devicetree/bindings/timer/renesas,ostm.txt<br/>new file mode 100644<br/>index 000000000000..be3ae0fdf775<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/timer/renesas,ostm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/timer/renesas,ostm.txt</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+* Renesas OS Timer (OSTM)</div><div class='add'>+</div><div class='add'>+The OSTM is a multi-channel 32-bit timer/counter with fixed clock</div><div class='add'>+source that can operate in either interval count down timer or free-running</div><div class='add'>+compare match mode.</div><div class='add'>+</div><div class='add'>+Channels are independent from each other.</div><div class='add'>+</div><div class='add'>+Required Properties:</div><div class='add'>+</div><div class='add'>+  - compatible: must be one or more of the following:</div><div class='add'>+    - "renesas,r7s72100-ostm" for the r7s72100 OSTM</div><div class='add'>+    - "renesas,ostm" for any OSTM</div><div class='add'>+		This is a fallback for the above renesas,*-ostm entries</div><div class='add'>+</div><div class='add'>+  - reg: base address and length of the register block for a timer channel.</div><div class='add'>+</div><div class='add'>+  - interrupts: interrupt specifier for the timer channel.</div><div class='add'>+</div><div class='add'>+  - clocks: clock specifier for the timer channel.</div><div class='add'>+</div><div class='add'>+Example: R7S72100 (RZ/A1H) OSTM node</div><div class='add'>+</div><div class='add'>+	ostm0: timer@fcfec000 {</div><div class='add'>+		compatible = "renesas,r7s72100-ostm", "renesas,ostm";</div><div class='add'>+		reg = &lt;0xfcfec000 0x30&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 102 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		clocks = &lt;&amp;mstp5_clks R7S72100_CLK_OSTM0&gt;;</div><div class='add'>+		power-domains = &lt;&amp;cpg_clocks&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/ufs/ufs-qcom.txt b/Documentation/devicetree/bindings/ufs/ufs-qcom.txt<br/>index 070baf4d7d97..1f69ee1a61ea 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/ufs/ufs-qcom.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/ufs/ufs-qcom.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/ufs/ufs-qcom.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/ufs/ufs-qcom.txt</a></div><div class='hunk'>@@ -7,8 +7,11 @@ To bind UFS PHY with UFS host controller, the controller node should</div><div class='ctx'> contain a phandle reference to UFS PHY node.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>-- compatible        : compatible list, contains "qcom,ufs-phy-qmp-20nm"</div><div class='del'>-		      or "qcom,ufs-phy-qmp-14nm" according to the relevant phy in use.</div><div class='add'>+- compatible        : compatible list, contains one of the following -</div><div class='add'>+			"qcom,ufs-phy-qmp-20nm" for 20nm ufs phy,</div><div class='add'>+			"qcom,ufs-phy-qmp-14nm" for legacy 14nm ufs phy,</div><div class='add'>+			"qcom,msm8996-ufs-phy-qmp-14nm" for 14nm ufs phy</div><div class='add'>+			 present on MSM8996 chipset.</div><div class='ctx'> - reg               : should contain PHY register address space (mandatory),</div><div class='ctx'> - reg-names         : indicates various resources passed to driver (via reg proptery) by name.</div><div class='ctx'>                       Required "reg-names" is "phy_mem".</div><div class='hunk'>@@ -26,7 +29,6 @@ Optional properties:</div><div class='ctx'> - vdda-pll-max-microamp : specifies max. load that can be drawn from pll supply</div><div class='ctx'> - vddp-ref-clk-supply   : phandle to UFS device ref_clk pad power supply</div><div class='ctx'> - vddp-ref-clk-max-microamp : specifies max. load that can be drawn from this supply</div><div class='del'>-- vddp-ref-clk-always-on : specifies if this supply needs to be kept always on</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt b/Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt<br/>index 862cd7c79805..d9b42da016f3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt</a></div><div class='hunk'>@@ -2,8 +2,8 @@ Allwinner sun4i A10 musb DRC/OTG controller</div><div class='ctx'> -------------------------------------------</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='del'>- - compatible      : "allwinner,sun4i-a10-musb", "allwinner,sun6i-a31-musb"</div><div class='del'>-                     or "allwinner,sun8i-a33-musb"</div><div class='add'>+ - compatible      : "allwinner,sun4i-a10-musb", "allwinner,sun6i-a31-musb",</div><div class='add'>+                     "allwinner,sun8i-a33-musb" or "allwinner,sun8i-h3-musb"</div><div class='ctx'>  - reg             : mmio address range of the musb controller</div><div class='ctx'>  - clocks          : clock specifier for the musb controller ahb gate clock</div><div class='ctx'>  - reset           : reset specifier for the ahb reset (A31 and newer only)</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/atmel-usb.txt b/Documentation/devicetree/bindings/usb/atmel-usb.txt<br/>index f4262ed60582..ad8ea56a9ed3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/atmel-usb.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/usb/atmel-usb.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/atmel-usb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/atmel-usb.txt</a></div><div class='hunk'>@@ -6,9 +6,9 @@ Required properties:</div><div class='ctx'>  - compatible: Should be "atmel,at91rm9200-ohci" for USB controllers</div><div class='ctx'>    used in host mode.</div><div class='ctx'>  - reg: Address and length of the register set for the device</div><div class='del'>- - interrupts: Should contain ehci interrupt</div><div class='add'>+ - interrupts: Should contain ohci interrupt</div><div class='ctx'>  - clocks: Should reference the peripheral, host and system clocks</div><div class='del'>- - clock-names: Should contains two strings</div><div class='add'>+ - clock-names: Should contain three strings</div><div class='ctx'> 		"ohci_clk" for the peripheral clock</div><div class='ctx'> 		"hclk" for the host clock</div><div class='ctx'> 		"uhpck" for the system clock</div><div class='hunk'>@@ -35,7 +35,7 @@ Required properties:</div><div class='ctx'>  - reg: Address and length of the register set for the device</div><div class='ctx'>  - interrupts: Should contain ehci interrupt</div><div class='ctx'>  - clocks: Should reference the peripheral and the UTMI clocks</div><div class='del'>- - clock-names: Should contains two strings</div><div class='add'>+ - clock-names: Should contain two strings</div><div class='ctx'> 		"ehci_clk" for the peripheral clock</div><div class='ctx'> 		"usb_clk" for the UTMI clock</div><div class='ctx'> </div><div class='hunk'>@@ -58,7 +58,7 @@ Required properties:</div><div class='ctx'>  - reg: Address and length of the register set for the device</div><div class='ctx'>  - interrupts: Should contain macb interrupt</div><div class='ctx'>  - clocks: Should reference the peripheral and the AHB clocks</div><div class='del'>- - clock-names: Should contains two strings</div><div class='add'>+ - clock-names: Should contain two strings</div><div class='ctx'> 		"pclk" for the peripheral clock</div><div class='ctx'> 		"hclk" for the AHB clock</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +85,7 @@ Required properties:</div><div class='ctx'>  - reg: Address and length of the register set for the device</div><div class='ctx'>  - interrupts: Should contain usba interrupt</div><div class='ctx'>  - clocks: Should reference the peripheral and host clocks</div><div class='del'>- - clock-names: Should contains two strings</div><div class='add'>+ - clock-names: Should contain two strings</div><div class='ctx'> 		"pclk" for the peripheral clock</div><div class='ctx'> 		"hclk" for the host clock</div><div class='ctx'>  - ep childnode: To specify the number of endpoints and their properties.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/da8xx-usb.txt b/Documentation/devicetree/bindings/usb/da8xx-usb.txt<br/>new file mode 100644<br/>index 000000000000..ccb844aba7d4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/da8xx-usb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/da8xx-usb.txt</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+TI DA8xx MUSB</div><div class='add'>+~~~~~~~~~~~~~</div><div class='add'>+For DA8xx/OMAP-L1x/AM17xx/AM18xx platforms.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ - compatible : Should be set to "ti,da830-musb".</div><div class='add'>+</div><div class='add'>+ - reg: Offset and length of the USB controller register set.</div><div class='add'>+</div><div class='add'>+ - interrupts: The USB interrupt number.</div><div class='add'>+</div><div class='add'>+ - interrupt-names: Should be set to "mc".</div><div class='add'>+</div><div class='add'>+ - dr_mode: The USB operation mode. Should be one of "host", "peripheral" or "otg".</div><div class='add'>+</div><div class='add'>+ - phys: Phandle for the PHY device</div><div class='add'>+</div><div class='add'>+ - phy-names: Should be "usb-phy"</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ - vbus-supply: Phandle to a regulator providing the USB bus power.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	usb_phy: usb-phy {</div><div class='add'>+		compatible = "ti,da830-usb-phy";</div><div class='add'>+		#phy-cells = &lt;0&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+	usb0: usb@200000 {</div><div class='add'>+		compatible = "ti,da830-musb";</div><div class='add'>+		reg =   &lt;0x00200000 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;58&gt;;</div><div class='add'>+		interrupt-names = "mc";</div><div class='add'>+</div><div class='add'>+		dr_mode = "host";</div><div class='add'>+		vbus-supply = &lt;&amp;usb_vbus&gt;;</div><div class='add'>+		phys = &lt;&amp;usb_phy 0&gt;;</div><div class='add'>+		phy-names = "usb-phy";</div><div class='add'>+</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt<br/>index 2c30a5479069..6c7c2bce6d0c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/dwc2.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/usb/dwc2.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/dwc2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/dwc2.txt</a></div><div class='hunk'>@@ -12,6 +12,7 @@ Required properties:</div><div class='ctx'>   - "lantiq,xrx200-usb": The DWC2 USB controller instance in Lantiq XRX SoCs;</div><div class='ctx'>   - "amlogic,meson8b-usb": The DWC2 USB controller instance in Amlogic Meson8b SoCs;</div><div class='ctx'>   - "amlogic,meson-gxbb-usb": The DWC2 USB controller instance in Amlogic S905 SoCs;</div><div class='add'>+  - "amcc,dwc-otg": The DWC2 USB controller instance in AMCC Canyonlands 460EX SoCs;</div><div class='ctx'>   - snps,dwc2: A generic DWC2 USB controller with default parameters.</div><div class='ctx'> - reg : Should contain 1 register range (address and length)</div><div class='ctx'> - interrupts : Should contain 1 interrupt</div><div class='hunk'>@@ -25,11 +26,13 @@ Optional properties:</div><div class='ctx'> Refer to phy/phy-bindings.txt for generic phy consumer properties</div><div class='ctx'> - dr_mode: shall be one of "host", "peripheral" and "otg"</div><div class='ctx'>   Refer to usb/generic.txt</div><div class='del'>-- g-use-dma: enable dma usage in gadget driver.</div><div class='ctx'> - g-rx-fifo-size: size of rx fifo size in gadget mode.</div><div class='ctx'> - g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode.</div><div class='ctx'> - g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.</div><div class='ctx'> </div><div class='add'>+Deprecated properties:</div><div class='add'>+- g-use-dma: gadget DMA mode is automatically detected</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'>         usb@101c0000 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/dwc3-st.txt b/Documentation/devicetree/bindings/usb/dwc3-st.txt<br/>index 01c71b1258f4..50dee3b44665 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/dwc3-st.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/usb/dwc3-st.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/dwc3-st.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/dwc3-st.txt</a></div><div class='hunk'>@@ -20,10 +20,10 @@ See: Documentation/devicetree/bindings/reset/reset.txt</div><div class='ctx'>    with 'reg' property</div><div class='ctx'> </div><div class='ctx'>  - pinctl-names	: A pinctrl state named "default" must be defined</div><div class='del'>-See: Documentation/devicetree/bindings/pinctrl/pinctrl-binding.txt</div><div class='add'>+See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt</div><div class='ctx'> </div><div class='ctx'>  - pinctrl-0	: Pin control group</div><div class='del'>-See: Documentation/devicetree/bindings/pinctrl/pinctrl-binding.txt</div><div class='add'>+See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt</div><div class='ctx'> </div><div class='ctx'>  - ranges	: allows valid 1:1 translation between child's address space and</div><div class='ctx'> 		  parent's address space</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt<br/>index e3e6983288e3..f658f394c2d3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/dwc3.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/usb/dwc3.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/dwc3.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/dwc3.txt</a></div><div class='hunk'>@@ -56,6 +56,10 @@ Optional properties:</div><div class='ctx'> </div><div class='ctx'>  - &lt;DEPRECATED&gt; tx-fifo-resize: determines if the FIFO *has* to be reallocated.</div><div class='ctx'> </div><div class='add'>+ - in addition all properties from usb-xhci.txt from the current directory are</div><div class='add'>+   supported as well</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> This is usually a subnode to DWC3 glue to which it is connected.</div><div class='ctx'> </div><div class='ctx'> dwc3@4a030000 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/ehci-omap.txt b/Documentation/devicetree/bindings/usb/ehci-omap.txt<br/>index 3dc231c832b0..d77e11a975a2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/ehci-omap.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/usb/ehci-omap.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/ehci-omap.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/ehci-omap.txt</a></div><div class='hunk'>@@ -29,4 +29,3 @@ usbhsehci: ehci@4a064c00 {</div><div class='ctx'> &amp;usbhsehci {</div><div class='ctx'> 	phys = &lt;&amp;hsusb1_phy 0 &amp;hsusb3_phy&gt;;</div><div class='ctx'> };</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/ehci-st.txt b/Documentation/devicetree/bindings/usb/ehci-st.txt<br/>index fb45fa5770bb..410d922cfdd7 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/ehci-st.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/usb/ehci-st.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/ehci-st.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/ehci-st.txt</a></div><div class='hunk'>@@ -7,7 +7,7 @@ Required properties:</div><div class='ctx'>  - interrupts		: one EHCI interrupt should be described here</div><div class='ctx'>  - pinctrl-names	: a pinctrl state named "default" must be defined</div><div class='ctx'>  - pinctrl-0		: phandle referencing pin configuration of the USB controller</div><div class='del'>-See: Documentation/devicetree/bindings/pinctrl/pinctrl-binding.txt</div><div class='add'>+See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt</div><div class='ctx'>  - clocks		: phandle list of usb clocks</div><div class='ctx'>  - clock-names		: should be "ic" for interconnect clock and "clk48"</div><div class='ctx'> See: Documentation/devicetree/bindings/clock/clock-bindings.txt</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/mt8173-mtu3.txt b/Documentation/devicetree/bindings/usb/mt8173-mtu3.txt<br/>new file mode 100644<br/>index 000000000000..1d7c3bc677f7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/mt8173-mtu3.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/mt8173-mtu3.txt</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+The device node for Mediatek USB3.0 DRD controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible : should be "mediatek,mt8173-mtu3"</div><div class='add'>+ - reg : specifies physical base address and size of the registers</div><div class='add'>+ - reg-names: should be "mac" for device IP and "ippc" for IP port control</div><div class='add'>+ - interrupts : interrupt used by the device IP</div><div class='add'>+ - power-domains : a phandle to USB power domain node to control USB's</div><div class='add'>+	mtcmos</div><div class='add'>+ - vusb33-supply : regulator of USB avdd3.3v</div><div class='add'>+ - clocks : a list of phandle + clock-specifier pairs, one for each</div><div class='add'>+	entry in clock-names</div><div class='add'>+ - clock-names : must contain "sys_ck" and "ref_ck" for clock of controller;</div><div class='add'>+	"wakeup_deb_p0" and "wakeup_deb_p1" are optional, they are</div><div class='add'>+	depends on "mediatek,enable-wakeup"</div><div class='add'>+ - phys : a list of phandle + phy specifier pairs</div><div class='add'>+ - dr_mode : should be one of "host", "peripheral" or "otg",</div><div class='add'>+	refer to usb/generic.txt</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+ - #address-cells, #size-cells : should be '2' if the device has sub-nodes</div><div class='add'>+	with 'reg' property</div><div class='add'>+ - ranges : allows valid 1:1 translation between child's address space and</div><div class='add'>+	parent's address space</div><div class='add'>+ - extcon : external connector for vbus and idpin changes detection, needed</div><div class='add'>+	when supports dual-role mode.</div><div class='add'>+ - vbus-supply : reference to the VBUS regulator, needed when supports</div><div class='add'>+	dual-role mode.</div><div class='add'>+ - pinctl-names : a pinctrl state named "default" must be defined,</div><div class='add'>+	"id_float" and "id_ground" are optinal which depends on</div><div class='add'>+	"mediatek,enable-manual-drd"</div><div class='add'>+ - pinctrl-0 : pin control group</div><div class='add'>+	See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt</div><div class='add'>+</div><div class='add'>+ - maximum-speed : valid arguments are "super-speed", "high-speed" and</div><div class='add'>+	"full-speed"; refer to usb/generic.txt</div><div class='add'>+ - enable-manual-drd : supports manual dual-role switch via debugfs; usually</div><div class='add'>+	used when receptacle is TYPE-A and also wants to support dual-role</div><div class='add'>+	mode.</div><div class='add'>+ - mediatek,enable-wakeup : supports ip sleep wakeup used by host mode</div><div class='add'>+ - mediatek,syscon-wakeup : phandle to syscon used to access USB wakeup</div><div class='add'>+	control register, it depends on "mediatek,enable-wakeup".</div><div class='add'>+</div><div class='add'>+Sub-nodes:</div><div class='add'>+The xhci should be added as subnode to mtu3 as shown in the following example</div><div class='add'>+if host mode is enabled. The DT binding details of xhci can be found in:</div><div class='add'>+Documentation/devicetree/bindings/usb/mt8173-xhci.txt</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+ssusb: usb@11271000 {</div><div class='add'>+	compatible = "mediatek,mt8173-mtu3";</div><div class='add'>+	reg = &lt;0 0x11271000 0 0x3000&gt;,</div><div class='add'>+	      &lt;0 0x11280700 0 0x0100&gt;;</div><div class='add'>+	reg-names = "mac", "ippc";</div><div class='add'>+	interrupts = &lt;GIC_SPI 64 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	phys = &lt;&amp;phy_port0 PHY_TYPE_USB3&gt;,</div><div class='add'>+	       &lt;&amp;phy_port1 PHY_TYPE_USB2&gt;;</div><div class='add'>+	power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_USB&gt;;</div><div class='add'>+	clocks = &lt;&amp;topckgen CLK_TOP_USB30_SEL&gt;, &lt;&amp;clk26m&gt;,</div><div class='add'>+		 &lt;&amp;pericfg CLK_PERI_USB0&gt;,</div><div class='add'>+		 &lt;&amp;pericfg CLK_PERI_USB1&gt;;</div><div class='add'>+	clock-names = "sys_ck", "ref_ck",</div><div class='add'>+		      "wakeup_deb_p0",</div><div class='add'>+		      "wakeup_deb_p1";</div><div class='add'>+	vusb33-supply = &lt;&amp;mt6397_vusb_reg&gt;;</div><div class='add'>+	vbus-supply = &lt;&amp;usb_p0_vbus&gt;;</div><div class='add'>+	extcon = &lt;&amp;extcon_usb&gt;;</div><div class='add'>+	dr_mode = "otg";</div><div class='add'>+	mediatek,enable-wakeup;</div><div class='add'>+	mediatek,syscon-wakeup = &lt;&amp;pericfg&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	ranges;</div><div class='add'>+	status = "disabled";</div><div class='add'>+</div><div class='add'>+	usb_host: xhci@11270000 {</div><div class='add'>+		compatible = "mediatek,mt8173-xhci";</div><div class='add'>+		reg = &lt;0 0x11270000 0 0x1000&gt;;</div><div class='add'>+		reg-names = "mac";</div><div class='add'>+		interrupts = &lt;GIC_SPI 115 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_USB&gt;;</div><div class='add'>+		clocks = &lt;&amp;topckgen CLK_TOP_USB30_SEL&gt;, &lt;&amp;clk26m&gt;;</div><div class='add'>+		clock-names = "sys_ck", "ref_ck";</div><div class='add'>+		vusb33-supply = &lt;&amp;mt6397_vusb_reg&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/mt8173-xhci.txt b/Documentation/devicetree/bindings/usb/mt8173-xhci.txt<br/>index b3a7ffa48852..0acfc8acbea1 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/mt8173-xhci.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/usb/mt8173-xhci.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/mt8173-xhci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/mt8173-xhci.txt</a></div><div class='hunk'>@@ -2,10 +2,18 @@ MT8173 xHCI</div><div class='ctx'> </div><div class='ctx'> The device node for Mediatek SOC USB3.0 host controller</div><div class='ctx'> </div><div class='add'>+There are two scenarios: the first one only supports xHCI driver;</div><div class='add'>+the second one supports dual-role mode, and the host is based on xHCI</div><div class='add'>+driver. Take account of backward compatibility, we divide bindings</div><div class='add'>+into two parts.</div><div class='add'>+</div><div class='add'>+1st: only supports xHCI driver</div><div class='add'>+------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Required properties:</div><div class='ctx'>  - compatible : should contain "mediatek,mt8173-xhci"</div><div class='del'>- - reg : specifies physical base address and size of the registers,</div><div class='del'>-	the first one for MAC, the second for IPPC</div><div class='add'>+ - reg : specifies physical base address and size of the registers</div><div class='add'>+ - reg-names: should be "mac" for xHCI MAC and "ippc" for IP port control</div><div class='ctx'>  - interrupts : interrupt used by the controller</div><div class='ctx'>  - power-domains : a phandle to USB power domain node to control USB's</div><div class='ctx'> 	mtcmos</div><div class='hunk'>@@ -15,6 +23,7 @@ Required properties:</div><div class='ctx'> 	entry in clock-names</div><div class='ctx'>  - clock-names : must contain</div><div class='ctx'> 	"sys_ck": for clock of xHCI MAC</div><div class='add'>+	"ref_ck": for reference clock of xHCI MAC</div><div class='ctx'> 	"wakeup_deb_p0": for USB wakeup debounce clock of port0</div><div class='ctx'> 	"wakeup_deb_p1": for USB wakeup debounce clock of port1</div><div class='ctx'> </div><div class='hunk'>@@ -27,18 +36,22 @@ Optional properties:</div><div class='ctx'> 	control register, it depends on "mediatek,wakeup-src".</div><div class='ctx'>  - vbus-supply : reference to the VBUS regulator;</div><div class='ctx'>  - usb3-lpm-capable : supports USB3.0 LPM</div><div class='add'>+ - pinctrl-names : a pinctrl state named "default" must be defined</div><div class='add'>+ - pinctrl-0 : pin control group</div><div class='add'>+	See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> usb30: usb@11270000 {</div><div class='ctx'> 	compatible = "mediatek,mt8173-xhci";</div><div class='ctx'> 	reg = &lt;0 0x11270000 0 0x1000&gt;,</div><div class='ctx'> 	      &lt;0 0x11280700 0 0x0100&gt;;</div><div class='add'>+	reg-names = "mac", "ippc";</div><div class='ctx'> 	interrupts = &lt;GIC_SPI 115 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 	power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_USB&gt;;</div><div class='del'>-	clocks = &lt;&amp;topckgen CLK_TOP_USB30_SEL&gt;,</div><div class='add'>+	clocks = &lt;&amp;topckgen CLK_TOP_USB30_SEL&gt;, &lt;&amp;clk26m&gt;,</div><div class='ctx'> 		 &lt;&amp;pericfg CLK_PERI_USB0&gt;,</div><div class='ctx'> 		 &lt;&amp;pericfg CLK_PERI_USB1&gt;;</div><div class='del'>-	clock-names = "sys_ck",</div><div class='add'>+	clock-names = "sys_ck", "ref_ck",</div><div class='ctx'> 		      "wakeup_deb_p0",</div><div class='ctx'> 		      "wakeup_deb_p1";</div><div class='ctx'> 	phys = &lt;&amp;phy_port0 PHY_TYPE_USB3&gt;,</div><div class='hunk'>@@ -49,3 +62,42 @@ usb30: usb@11270000 {</div><div class='ctx'> 	mediatek,syscon-wakeup = &lt;&amp;pericfg&gt;;</div><div class='ctx'> 	mediatek,wakeup-src = &lt;1&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+2nd: dual-role mode with xHCI driver</div><div class='add'>+------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+In the case, xhci is added as subnode to mtu3. An example and the DT binding</div><div class='add'>+details of mtu3 can be found in:</div><div class='add'>+Documentation/devicetree/bindings/usb/mt8173-mtu3.txt</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible : should contain "mediatek,mt8173-xhci"</div><div class='add'>+ - reg : specifies physical base address and size of the registers</div><div class='add'>+ - reg-names: should be "mac" for xHCI MAC</div><div class='add'>+ - interrupts : interrupt used by the host controller</div><div class='add'>+ - power-domains : a phandle to USB power domain node to control USB's</div><div class='add'>+	mtcmos</div><div class='add'>+ - vusb33-supply : regulator of USB avdd3.3v</div><div class='add'>+</div><div class='add'>+ - clocks : a list of phandle + clock-specifier pairs, one for each</div><div class='add'>+	entry in clock-names</div><div class='add'>+ - clock-names : must be</div><div class='add'>+	"sys_ck": for clock of xHCI MAC</div><div class='add'>+	"ref_ck": for reference clock of xHCI MAC</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+ - vbus-supply : reference to the VBUS regulator;</div><div class='add'>+ - usb3-lpm-capable : supports USB3.0 LPM</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+usb30: usb@11270000 {</div><div class='add'>+	compatible = "mediatek,mt8173-xhci";</div><div class='add'>+	reg = &lt;0 0x11270000 0 0x1000&gt;;</div><div class='add'>+	reg-names = "mac";</div><div class='add'>+	interrupts = &lt;GIC_SPI 115 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_USB&gt;;</div><div class='add'>+	clocks = &lt;&amp;topckgen CLK_TOP_USB30_SEL&gt;, &lt;&amp;clk26m&gt;;</div><div class='add'>+	clock-names = "sys_ck", "ref_ck";</div><div class='add'>+	vusb33-supply = &lt;&amp;mt6397_vusb_reg&gt;;</div><div class='add'>+	usb3-lpm-capable;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/ohci-da8xx.txt b/Documentation/devicetree/bindings/usb/ohci-da8xx.txt<br/>new file mode 100644<br/>index 000000000000..2dc8f67eda39<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/ohci-da8xx.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/ohci-da8xx.txt</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+DA8XX USB OHCI controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+ - compatible: Should be "ti,da830-ohci"</div><div class='add'>+ - reg:        Should contain one register range i.e. start and length</div><div class='add'>+ - interrupts: Description of the interrupt line</div><div class='add'>+ - phys:       Phandle for the PHY device</div><div class='add'>+ - phy-names:  Should be "usb-phy"</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+ - vbus-supply: phandle of regulator that controls vbus power / over-current</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+ohci: usb@0225000 {</div><div class='add'>+        compatible = "ti,da830-ohci";</div><div class='add'>+        reg = &lt;0x225000 0x1000&gt;;</div><div class='add'>+        interrupts = &lt;59&gt;;</div><div class='add'>+        phys = &lt;&amp;usb_phy 1&gt;;</div><div class='add'>+        phy-names = "usb-phy";</div><div class='add'>+        vbus-supply = &lt;&amp;reg_usb_ohci&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/qcom,dwc3.txt b/Documentation/devicetree/bindings/usb/qcom,dwc3.txt<br/>index 39acb084bce9..73cc0963e823 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/qcom,dwc3.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/usb/qcom,dwc3.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/qcom,dwc3.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/qcom,dwc3.txt</a></div><div class='hunk'>@@ -18,7 +18,7 @@ A child node must exist to represent the core DWC3 IP block. The name of</div><div class='ctx'> the node is not important. The content of the node is defined in dwc3.txt.</div><div class='ctx'> </div><div class='ctx'> Phy documentation is provided in the following places:</div><div class='del'>-Documentation/devicetree/bindings/phy/qcom,dwc3-usb-phy.txt</div><div class='add'>+Documentation/devicetree/bindings/phy/qcom-dwc3-usb-phy.txt</div><div class='ctx'> </div><div class='ctx'> Example device nodes:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/s3c2410-usb.txt b/Documentation/devicetree/bindings/usb/s3c2410-usb.txt<br/>new file mode 100644<br/>index 000000000000..e45b38ce2986<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/s3c2410-usb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/s3c2410-usb.txt</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+Samsung S3C2410 and compatible SoC USB controller</div><div class='add'>+</div><div class='add'>+OHCI</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+ - compatible: should be "samsung,s3c2410-ohci" for USB host controller</div><div class='add'>+ - reg: address and lenght of the controller memory mapped region</div><div class='add'>+ - interrupts: interrupt number for the USB OHCI controller</div><div class='add'>+ - clocks: Should reference the bus and host clocks</div><div class='add'>+ - clock-names: Should contain two strings</div><div class='add'>+		"usb-bus-host" for the USB bus clock</div><div class='add'>+		"usb-host" for the USB host clock</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+usb0: ohci@49000000 {</div><div class='add'>+	compatible = "samsung,s3c2410-ohci";</div><div class='add'>+	reg = &lt;0x49000000 0x100&gt;;</div><div class='add'>+	interrupts = &lt;0 0 26 3&gt;;</div><div class='add'>+	clocks = &lt;&amp;clocks UCLK&gt;, &lt;&amp;clocks HCLK_USBH&gt;;</div><div class='add'>+	clock-names = "usb-bus-host", "usb-host";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/ulpi.txt b/Documentation/devicetree/bindings/usb/ulpi.txt<br/>new file mode 100644<br/>index 000000000000..ca179dc4bd50<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/ulpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/ulpi.txt</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+ULPI bus binding</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Phys that are behind a ULPI connection can be described with the following</div><div class='add'>+binding. The host controller shall have a "ulpi" named node as a child, and</div><div class='add'>+that node shall have one enabled node underneath it representing the ulpi</div><div class='add'>+device on the bus.</div><div class='add'>+</div><div class='add'>+EXAMPLE</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+usb {</div><div class='add'>+	compatible = "vendor,usb-controller";</div><div class='add'>+</div><div class='add'>+	ulpi {</div><div class='add'>+		phy {</div><div class='add'>+			compatible = "vendor,phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt<br/>index 966885c636d0..2d80b60eeabe 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/usb-xhci.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/usb/usb-xhci.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/usb-xhci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/usb-xhci.txt</a></div><div class='hunk'>@@ -11,6 +11,7 @@ Required properties:</div><div class='ctx'>     - "renesas,xhci-r8a7791" for r8a7791 SoC</div><div class='ctx'>     - "renesas,xhci-r8a7793" for r8a7793 SoC</div><div class='ctx'>     - "renesas,xhci-r8a7795" for r8a7795 SoC</div><div class='add'>+    - "renesas,xhci-r8a7796" for r8a7796 SoC</div><div class='ctx'>     - "renesas,rcar-gen2-xhci" for a generic R-Car Gen2 compatible device</div><div class='ctx'>     - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 compatible device</div><div class='ctx'>     - "xhci-platform" (deprecated)</div><div class='hunk'>@@ -26,6 +27,7 @@ Required properties:</div><div class='ctx'> Optional properties:</div><div class='ctx'>   - clocks: reference to a clock</div><div class='ctx'>   - usb3-lpm-capable: determines if platform is USB3 LPM capable</div><div class='add'>+  - quirk-broken-port-ped: set if the controller has broken port disable mechanism</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='ctx'> 	usb@f0931000 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/usb251xb.txt b/Documentation/devicetree/bindings/usb/usb251xb.txt<br/>new file mode 100644<br/>index 000000000000..0c065f77658f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/usb/usb251xb.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/usb/usb251xb.txt</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+Microchip USB 2.0 Hi-Speed Hub Controller</div><div class='add'>+</div><div class='add'>+The device node for the configuration of a Microchip USB251xB/xBi USB 2.0</div><div class='add'>+Hi-Speed Controller.</div><div class='add'>+</div><div class='add'>+Required properties :</div><div class='add'>+ - compatible : Should be "microchip,usb251xb" or one of the specific types:</div><div class='add'>+	"microchip,usb2512b", "microchip,usb2512bi", "microchip,usb2513b",</div><div class='add'>+	"microchip,usb2513bi", "microchip,usb2514b", "microchip,usb2514bi"</div><div class='add'>+ - hub-reset-gpios : Should specify the gpio for hub reset</div><div class='add'>+</div><div class='add'>+Optional properties :</div><div class='add'>+ - reg : I2C address on the selected bus (default is &lt;0x2C&gt;)</div><div class='add'>+ - skip-config : Skip Hub configuration, but only send the USB-Attach command</div><div class='add'>+ - vendor-id : USB Vendor ID of the hub (16 bit, default is 0x0424)</div><div class='add'>+ - product-id : USB Product ID of the hub (16 bit, default depends on type)</div><div class='add'>+ - device-id : USB Device ID of the hub (16 bit, default is 0x0bb3)</div><div class='add'>+ - language-id : USB Language ID (16 bit, default is 0x0000)</div><div class='add'>+ - manufacturer : USB Manufacturer string (max 31 characters long)</div><div class='add'>+ - product : USB Product string (max 31 characters long)</div><div class='add'>+ - serial : USB Serial string (max 31 characters long)</div><div class='add'>+ - {bus,self}-powered : selects between self- and bus-powered operation (default</div><div class='add'>+	is self-powered)</div><div class='add'>+ - disable-hi-speed : disable USB Hi-Speed support</div><div class='add'>+ - {multi,single}-tt : selects between multi- and single-transaction-translator</div><div class='add'>+	(default is multi-tt)</div><div class='add'>+ - disable-eop : disable End of Packet generation in full-speed mode</div><div class='add'>+ - {ganged,individual}-sensing : select over-current sense type in self-powered</div><div class='add'>+	mode (default is individual)</div><div class='add'>+ - {ganged,individual}-port-switching : select port power switching mode</div><div class='add'>+	(default is individual)</div><div class='add'>+ - dynamic-power-switching : enable auto-switching from self- to bus-powered</div><div class='add'>+	operation if the local power source is removed or unavailable</div><div class='add'>+ - oc-delay-{100us,4ms,8ms,16ms} : set over current timer delay (default is 8ms)</div><div class='add'>+ - compound-device : indicated the hub is part of a compound device</div><div class='add'>+ - port-mapping-mode : enable port mapping mode</div><div class='add'>+ - string-support : enable string descriptor support (required for manufacturer,</div><div class='add'>+	product and serial string configuration)</div><div class='add'>+ - non-removable-ports : Should specify the ports which have a non-removable</div><div class='add'>+	device connected.</div><div class='add'>+ - sp-disabled-ports : Specifies the ports which will be self-power disabled</div><div class='add'>+ - bp-disabled-ports : Specifies the ports which will be bus-power disabled</div><div class='add'>+ - max-sp-power : Specifies the maximum current the hub consumes from an</div><div class='add'>+	upstream port when operating as self-powered hub including the power</div><div class='add'>+	consumption of a permanently attached peripheral if the hub is</div><div class='add'>+	configured as a compound device. The value is given in mA in a 0 - 500</div><div class='add'>+	range (default is 2).</div><div class='add'>+ - max-bp-power : Specifies the maximum current the hub consumes from an</div><div class='add'>+	upstream port when operating as bus-powered hub including the power</div><div class='add'>+	consumption of a permanently attached peripheral if the hub is</div><div class='add'>+	configured as a compound device. The value is given in mA in a 0 - 500</div><div class='add'>+	range (default is 100).</div><div class='add'>+ - max-sp-current : Specifies the maximum current the hub consumes from an</div><div class='add'>+	upstream port when operating as self-powered hub EXCLUDING the power</div><div class='add'>+	consumption of a permanently attached peripheral if the hub is</div><div class='add'>+	configured as a compound device. The value is given in mA in a 0 - 500</div><div class='add'>+	range (default is 2).</div><div class='add'>+ - max-bp-current : Specifies the maximum current the hub consumes from an</div><div class='add'>+	upstream port when operating as bus-powered hub EXCLUDING the power</div><div class='add'>+	consumption of a permanently attached peripheral if the hub is</div><div class='add'>+	configured as a compound device. The value is given in mA in a 0 - 500</div><div class='add'>+	range (default is 100).</div><div class='add'>+ - power-on-time : Specifies the time it takes from the time the host initiates</div><div class='add'>+	the power-on sequence to a port until the port has adequate power. The</div><div class='add'>+	value is given in ms in a 0 - 510 range (default is 100ms).</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+	usb2512b@2c {</div><div class='add'>+		compatible = "microchip,usb2512b";</div><div class='add'>+		hub-reset-gpios = &lt;&amp;gpio1 4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb2514b@2c {</div><div class='add'>+		compatible = "microchip,usb2514b";</div><div class='add'>+		reg = &lt;0x2c&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio1 4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		vendor-id = /bits/ 16 &lt;0x0000&gt;;</div><div class='add'>+		product-id = /bits/ 16 &lt;0x0000&gt;;</div><div class='add'>+		string-support;</div><div class='add'>+		manufacturer = "Foo";</div><div class='add'>+		product = "Foo-Bar";</div><div class='add'>+		serial = "1234567890A";</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt<br/>index f0a48ea78659..ec0bfb9bbebd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/vendor-prefixes.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/vendor-prefixes.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/vendor-prefixes.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/vendor-prefixes.txt</a></div><div class='hunk'>@@ -24,9 +24,11 @@ ampire	Ampire Co., Ltd.</div><div class='ctx'> ams	AMS AG</div><div class='ctx'> amstaos	AMS-Taos Inc.</div><div class='ctx'> analogix	Analogix Semiconductor, Inc.</div><div class='add'>+andestech	Andes Technology Corporation</div><div class='ctx'> apm	Applied Micro Circuits Corporation (APM)</div><div class='ctx'> aptina	Aptina Imaging</div><div class='ctx'> arasan	Arasan Chip Systems</div><div class='add'>+aries	Aries Embedded GmbH</div><div class='ctx'> arm	ARM Ltd.</div><div class='ctx'> armadeus	ARMadeus Systems SARL</div><div class='ctx'> arrow	Arrow Electronics</div><div class='hunk'>@@ -38,7 +40,9 @@ atmel	Atmel Corporation</div><div class='ctx'> auo	AU Optronics Corporation</div><div class='ctx'> auvidea Auvidea GmbH</div><div class='ctx'> avago	Avago Technologies</div><div class='add'>+avia	avia semiconductor</div><div class='ctx'> avic	Shanghai AVIC Optoelectronics Co., Ltd.</div><div class='add'>+axentia	Axentia Technologies AB</div><div class='ctx'> axis	Axis Communications AB</div><div class='ctx'> boe	BOE Technology Group Co., Ltd.</div><div class='ctx'> bosch	Bosch Sensortec GmbH</div><div class='hunk'>@@ -67,10 +71,12 @@ creative	Creative Technology Ltd</div><div class='ctx'> crystalfontz	Crystalfontz America, Inc.</div><div class='ctx'> cubietech	Cubietech, Ltd.</div><div class='ctx'> cypress	Cypress Semiconductor Corporation</div><div class='add'>+cznic	CZ.NIC, z.s.p.o.</div><div class='ctx'> dallas	Maxim Integrated Products (formerly Dallas Semiconductor)</div><div class='ctx'> davicom	DAVICOM Semiconductor, Inc.</div><div class='ctx'> delta	Delta Electronics, Inc.</div><div class='ctx'> denx	Denx Software Engineering</div><div class='add'>+devantech	Devantech, Ltd.</div><div class='ctx'> digi	Digi International Inc.</div><div class='ctx'> digilent	Diglent, Inc.</div><div class='ctx'> dlg	Dialog Semiconductor</div><div class='hunk'>@@ -98,11 +104,13 @@ everest	Everest Semiconductor Co. Ltd.</div><div class='ctx'> everspin	Everspin Technologies, Inc.</div><div class='ctx'> excito	Excito</div><div class='ctx'> ezchip	EZchip Semiconductor</div><div class='add'>+faraday	Faraday Technology Corporation</div><div class='ctx'> fcs	Fairchild Semiconductor</div><div class='ctx'> firefly	Firefly</div><div class='ctx'> focaltech	FocalTech Systems Co.,Ltd</div><div class='ctx'> friendlyarm	Guangzhou FriendlyARM Computer Tech Co., Ltd</div><div class='ctx'> fsl	Freescale Semiconductor</div><div class='add'>+fujitsu	Fujitsu Ltd.</div><div class='ctx'> ge	General Electric Company</div><div class='ctx'> geekbuying	GeekBuying</div><div class='ctx'> gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.</div><div class='hunk'>@@ -114,6 +122,7 @@ gmt	Global Mixed-mode Technology, Inc.</div><div class='ctx'> goodix	Shenzhen Huiding Technology Co., Ltd.</div><div class='ctx'> google	Google, Inc.</div><div class='ctx'> grinn	Grinn</div><div class='add'>+grmn	Garmin Limited</div><div class='ctx'> gumstix	Gumstix, Inc.</div><div class='ctx'> gw	Gateworks Corporation</div><div class='ctx'> hannstar	HannStar Display Corporation</div><div class='hunk'>@@ -126,6 +135,7 @@ hitex	Hitex Development Tools</div><div class='ctx'> holt	Holt Integrated Circuits, Inc.</div><div class='ctx'> honeywell	Honeywell</div><div class='ctx'> hp	Hewlett Packard</div><div class='add'>+holtek	Holtek Semiconductor, Inc.</div><div class='ctx'> i2se	I2SE GmbH</div><div class='ctx'> ibm	International Business Machines (IBM)</div><div class='ctx'> idt	Integrated Device Technologies, Inc.</div><div class='hunk'>@@ -135,6 +145,7 @@ infineon Infineon Technologies</div><div class='ctx'> inforce	Inforce Computing</div><div class='ctx'> ingenic	Ingenic Semiconductor</div><div class='ctx'> innolux	Innolux Corporation</div><div class='add'>+inside-secure	INSIDE Secure</div><div class='ctx'> intel	Intel Corporation</div><div class='ctx'> intercontrol	Inter Control Group</div><div class='ctx'> invensense	InvenSense Inc.</div><div class='hunk'>@@ -153,23 +164,30 @@ kosagi	Sutajio Ko-Usagi PTE Ltd.</div><div class='ctx'> kyo	Kyocera Corporation</div><div class='ctx'> lacie	LaCie</div><div class='ctx'> lantiq	Lantiq Semiconductor</div><div class='add'>+lego	LEGO Systems A/S</div><div class='ctx'> lenovo	Lenovo Group Ltd.</div><div class='ctx'> lg	LG Corporation</div><div class='add'>+licheepi	Lichee Pi</div><div class='ctx'> linux	Linux-specific binding</div><div class='ctx'> lltc	Linear Technology Corporation</div><div class='ctx'> lsi	LSI Corp. (LSI Logic)</div><div class='add'>+lwn	Liebherr-Werk Nenzing GmbH</div><div class='add'>+macnica	Macnica Americas</div><div class='ctx'> marvell	Marvell Technology Group Ltd.</div><div class='ctx'> maxim	Maxim Integrated Products</div><div class='add'>+mcube	mCube</div><div class='ctx'> meas	Measurement Specialties</div><div class='ctx'> mediatek	MediaTek Inc.</div><div class='ctx'> melexis	Melexis N.V.</div><div class='ctx'> melfas	MELFAS Inc.</div><div class='add'>+memsic	MEMSIC Inc.</div><div class='ctx'> merrii	Merrii Technology Co., Ltd.</div><div class='ctx'> micrel	Micrel Inc.</div><div class='ctx'> microchip	Microchip Technology Inc.</div><div class='ctx'> microcrystal	Micro Crystal AG</div><div class='ctx'> micron	Micron Technology Inc.</div><div class='ctx'> minix	MINIX Technology Ltd.</div><div class='add'>+miramems	MiraMEMS Sensing Technology Co., Ltd.</div><div class='ctx'> mitsubishi	Mitsubishi Electric Corporation</div><div class='ctx'> mosaixtech	Mosaix Technologies, Inc.</div><div class='ctx'> moxa	Moxa</div><div class='hunk'>@@ -177,22 +195,29 @@ mpl	MPL AG</div><div class='ctx'> mqmaker	mqmaker Inc.</div><div class='ctx'> msi	Micro-Star International Co. Ltd.</div><div class='ctx'> mti	Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)</div><div class='add'>+multi-inno	Multi-Inno Technology Co.,Ltd</div><div class='ctx'> mundoreader	Mundo Reader S.L.</div><div class='ctx'> murata	Murata Manufacturing Co., Ltd.</div><div class='ctx'> mxicy	Macronix International Co., Ltd.</div><div class='add'>+myir	MYIR Tech Limited</div><div class='ctx'> national	National Semiconductor</div><div class='ctx'> nec	NEC LCD Technologies, Ltd.</div><div class='ctx'> neonode		Neonode Inc.</div><div class='ctx'> netgear	NETGEAR</div><div class='ctx'> netlogic	Broadcom Corporation (formerly NetLogic Microsystems)</div><div class='add'>+netron-dy	Netron DY</div><div class='ctx'> netxeon		Shenzhen Netxeon Technology CO., LTD</div><div class='add'>+nexbox	Nexbox</div><div class='ctx'> newhaven	Newhaven Display International</div><div class='add'>+ni	National Instruments</div><div class='ctx'> nintendo	Nintendo</div><div class='ctx'> nokia	Nokia</div><div class='ctx'> nuvoton	Nuvoton Technology Corporation</div><div class='add'>+nvd	New Vision Display</div><div class='ctx'> nvidia	NVIDIA</div><div class='ctx'> nxp	NXP Semiconductors</div><div class='ctx'> okaya	Okaya Electric America, Inc.</div><div class='add'>+oki	Oki Electric Industry Co., Ltd.</div><div class='ctx'> olimex	OLIMEX Ltd.</div><div class='ctx'> onion	Onion Corporation</div><div class='ctx'> onnn	ON Semiconductor Corp.</div><div class='hunk'>@@ -208,9 +233,11 @@ parade	Parade Technologies Inc.</div><div class='ctx'> pericom	Pericom Technology Inc.</div><div class='ctx'> phytec	PHYTEC Messtechnik GmbH</div><div class='ctx'> picochip	Picochip Ltd</div><div class='add'>+pine64	Pine64</div><div class='ctx'> pixcir  PIXCIR MICROELECTRONICS Co., Ltd</div><div class='ctx'> plathome	Plat'Home Co., Ltd.</div><div class='ctx'> plda	PLDA</div><div class='add'>+poslab	Poslab Technology Co., Ltd.</div><div class='ctx'> powervr	PowerVR (deprecated, use img)</div><div class='ctx'> pulsedlight	PulsedLight, Inc</div><div class='ctx'> qca	Qualcomm Atheros, Inc.</div><div class='hunk'>@@ -229,8 +256,10 @@ realtek Realtek Semiconductor Corp.</div><div class='ctx'> renesas	Renesas Electronics Corporation</div><div class='ctx'> richtek	Richtek Technology Corporation</div><div class='ctx'> ricoh	Ricoh Co. Ltd.</div><div class='add'>+rikomagic	Rikomagic Tech Corp. Ltd</div><div class='ctx'> rockchip	Fuzhou Rockchip Electronics Co., Ltd</div><div class='ctx'> samsung	Samsung Semiconductor</div><div class='add'>+samtec	Samtec/Softing company</div><div class='ctx'> sandisk	Sandisk Corporation</div><div class='ctx'> sbs	Smart Battery System</div><div class='ctx'> schindler	Schindler</div><div class='hunk'>@@ -275,8 +304,10 @@ tcg	Trusted Computing Group</div><div class='ctx'> tcl	Toby Churchill Ltd.</div><div class='ctx'> technexion	TechNexion</div><div class='ctx'> technologic	Technologic Systems</div><div class='add'>+terasic	Terasic Inc.</div><div class='ctx'> thine	THine Electronics, Inc.</div><div class='ctx'> ti	Texas Instruments</div><div class='add'>+tianma	Tianma Micro-electronics Co., Ltd.</div><div class='ctx'> tlm	Trusted Logic Mobility</div><div class='ctx'> topeet  Topeet</div><div class='ctx'> toradex	Toradex AG</div><div class='hunk'>@@ -289,6 +320,7 @@ tronfy	Tronfy</div><div class='ctx'> tronsmart	Tronsmart</div><div class='ctx'> truly	Truly Semiconductors Limited</div><div class='ctx'> tyan	Tyan Computer Corporation</div><div class='add'>+udoo	Udoo</div><div class='ctx'> uniwest	United Western Technologies Corp (UniWest)</div><div class='ctx'> upisemi	uPI Semiconductor Corp.</div><div class='ctx'> urt	United Radiant Technology Corporation</div><div class='hunk'>@@ -300,6 +332,7 @@ virtio	Virtual I/O Device Specification, developed by the OASIS consortium</div><div class='ctx'> vivante	Vivante Corporation</div><div class='ctx'> voipac	Voipac Technologies s.r.o.</div><div class='ctx'> wd	Western Digital Corp.</div><div class='add'>+wetek	WeTek Electronics, limited.</div><div class='ctx'> wexler	Wexler</div><div class='ctx'> winbond Winbond Electronics corp.</div><div class='ctx'> wlf	Wolfson Microelectronics</div><div class='hunk'>@@ -308,7 +341,9 @@ x-powers	X-Powers</div><div class='ctx'> xes	Extreme Engineering Solutions (X-ES)</div><div class='ctx'> xillybus	Xillybus Ltd.</div><div class='ctx'> xlnx	Xilinx</div><div class='add'>+xunlong	Shenzhen Xunlong Software CO.,Limited</div><div class='ctx'> zarlink	Zarlink Semiconductor</div><div class='add'>+zeitec	ZEITEC Semiconductor Co., LTD.</div><div class='ctx'> zii	Zodiac Inflight Innovations</div><div class='ctx'> zte	ZTE Corp.</div><div class='ctx'> zyxel	ZyXEL Communications Corp.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/watchdog/cortina,gemin-watchdog.txt b/Documentation/devicetree/bindings/watchdog/cortina,gemin-watchdog.txt<br/>new file mode 100644<br/>index 000000000000..bc4b865d178b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/watchdog/cortina,gemin-watchdog.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/watchdog/cortina,gemin-watchdog.txt</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+Cortina Systems Gemini SoC Watchdog</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : must be "cortina,gemini-watchdog"</div><div class='add'>+- reg : shall contain base register location and length</div><div class='add'>+- interrupts : shall contain the interrupt for the watchdog</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- timeout-sec : the default watchdog timeout in seconds.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+watchdog@41000000 {</div><div class='add'>+	compatible = "cortina,gemini-watchdog";</div><div class='add'>+	reg = &lt;0x41000000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;3 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt b/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt<br/>index 8f3d96af81d7..1f6e101e299a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/bindings/watchdog/samsung-wdt.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/watchdog/samsung-wdt.txt</a></div><div class='hunk'>@@ -6,10 +6,11 @@ occurred.</div><div class='ctx'> </div><div class='ctx'> Required properties:</div><div class='ctx'> - compatible : should be one among the following</div><div class='del'>-	(a) "samsung,s3c2410-wdt" for Exynos4 and previous SoCs</div><div class='del'>-	(b) "samsung,exynos5250-wdt" for Exynos5250</div><div class='del'>-	(c) "samsung,exynos5420-wdt" for Exynos5420</div><div class='del'>-	(c) "samsung,exynos7-wdt" for Exynos7</div><div class='add'>+	- "samsung,s3c2410-wdt" for S3C2410</div><div class='add'>+	- "samsung,s3c6410-wdt" for S3C6410, S5PV210 and Exynos4</div><div class='add'>+	- "samsung,exynos5250-wdt" for Exynos5250</div><div class='add'>+	- "samsung,exynos5420-wdt" for Exynos5420</div><div class='add'>+	- "samsung,exynos7-wdt" for Exynos7</div><div class='ctx'> </div><div class='ctx'> - reg : base physical address of the controller and length of memory mapped</div><div class='ctx'> 	region.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt b/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt<br/>new file mode 100644<br/>index 000000000000..06ce67766756<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+ZTE zx2967 Watchdog timer</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible : should be one of the following.</div><div class='add'>+       * zte,zx296718-wdt</div><div class='add'>+- reg : Specifies base physical address and size of the registers.</div><div class='add'>+- clocks : Pairs of phandle and specifier referencing the controller's clocks.</div><div class='add'>+- resets : Reference to the reset controller controlling the watchdog</div><div class='add'>+           controller.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- timeout-sec : Contains the watchdog timeout in seconds.</div><div class='add'>+- zte,wdt-reset-sysctrl : Directs how to reset system by the watchdog.</div><div class='add'>+	if we don't want to restart system when watchdog been triggered,</div><div class='add'>+	it's not required, vice versa.</div><div class='add'>+	It should include following fields.</div><div class='add'>+	  * phandle of aon-sysctrl.</div><div class='add'>+	  * offset of register that be written, should be 0xb0.</div><div class='add'>+	  * configure value that be written to aon-sysctrl.</div><div class='add'>+	  * bit mask, corresponding bits will be affected.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+wdt: watchdog@1465000 {</div><div class='add'>+	compatible = "zte,zx296718-wdt";</div><div class='add'>+	reg = &lt;0x1465000 0x1000&gt;;</div><div class='add'>+	clocks = &lt;&amp;topcrm WDT_WCLK&gt;;</div><div class='add'>+	resets = &lt;&amp;toprst 35&gt;;</div><div class='add'>+	zte,wdt-reset-sysctrl = &lt;&amp;aon_sysctrl 0xb0 1 0x115&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/booting-without-of.txt b/Documentation/devicetree/booting-without-of.txt<br/>index 3f1437fbca6b..280d283304bb 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/devicetree/booting-without-of.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/devicetree/booting-without-of.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/devicetree/booting-without-of.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/devicetree/booting-without-of.txt</a></div><div class='hunk'>@@ -974,6 +974,13 @@ compatibility.</div><div class='ctx'>       4Gb. Some vendors prefer splitting those ranges into smaller</div><div class='ctx'>       segments, but the kernel doesn't care.</div><div class='ctx'> </div><div class='add'>+  Additional properties:</div><div class='add'>+</div><div class='add'>+    - hotpluggable : The presence of this property provides an explicit</div><div class='add'>+      hint to the operating system that this memory may potentially be</div><div class='add'>+      removed later. The kernel can take this into consideration when</div><div class='add'>+      doing nonmovable allocations and when laying out memory zones.</div><div class='add'>+</div><div class='ctx'>   e) The /chosen node</div><div class='ctx'> </div><div class='ctx'>   This node is a bit "special". Normally, that's where Open Firmware</div><div class='head'>diff --git a/Documentation/dma-buf-sharing.txt b/Documentation/dma-buf-sharing.txt<br/>deleted file mode 100644<br/>index ca44c5820585..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/dma-buf-sharing.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/dma-buf-sharing.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,482 +0,0 @@</div><div class='del'>-                    DMA Buffer Sharing API Guide</div><div class='del'>-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-                            Sumit Semwal</div><div class='del'>-                &lt;sumit dot semwal at linaro dot org&gt;</div><div class='del'>-                 &lt;sumit dot semwal at ti dot com&gt;</div><div class='del'>-</div><div class='del'>-This document serves as a guide to device-driver writers on what is the dma-buf</div><div class='del'>-buffer sharing API, how to use it for exporting and using shared buffers.</div><div class='del'>-</div><div class='del'>-Any device driver which wishes to be a part of DMA buffer sharing, can do so as</div><div class='del'>-either the 'exporter' of buffers, or the 'user' of buffers.</div><div class='del'>-</div><div class='del'>-Say a driver A wants to use buffers created by driver B, then we call B as the</div><div class='del'>-exporter, and A as buffer-user.</div><div class='del'>-</div><div class='del'>-The exporter</div><div class='del'>-- implements and manages operations[1] for the buffer</div><div class='del'>-- allows other users to share the buffer by using dma_buf sharing APIs,</div><div class='del'>-- manages the details of buffer allocation,</div><div class='del'>-- decides about the actual backing storage where this allocation happens,</div><div class='del'>-- takes care of any migration of scatterlist - for all (shared) users of this</div><div class='del'>-   buffer,</div><div class='del'>-</div><div class='del'>-The buffer-user</div><div class='del'>-- is one of (many) sharing users of the buffer.</div><div class='del'>-- doesn't need to worry about how the buffer is allocated, or where.</div><div class='del'>-- needs a mechanism to get access to the scatterlist that makes up this buffer</div><div class='del'>-   in memory, mapped into its own address space, so it can access the same area</div><div class='del'>-   of memory.</div><div class='del'>-</div><div class='del'>-dma-buf operations for device dma only</div><div class='del'>---------------------------------------</div><div class='del'>-</div><div class='del'>-The dma_buf buffer sharing API usage contains the following steps:</div><div class='del'>-</div><div class='del'>-1. Exporter announces that it wishes to export a buffer</div><div class='del'>-2. Userspace gets the file descriptor associated with the exported buffer, and</div><div class='del'>-   passes it around to potential buffer-users based on use case</div><div class='del'>-3. Each buffer-user 'connects' itself to the buffer</div><div class='del'>-4. When needed, buffer-user requests access to the buffer from exporter</div><div class='del'>-5. When finished with its use, the buffer-user notifies end-of-DMA to exporter</div><div class='del'>-6. when buffer-user is done using this buffer completely, it 'disconnects'</div><div class='del'>-   itself from the buffer.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1. Exporter's announcement of buffer export</div><div class='del'>-</div><div class='del'>-   The buffer exporter announces its wish to export a buffer. In this, it</div><div class='del'>-   connects its own private buffer data, provides implementation for operations</div><div class='del'>-   that can be performed on the exported dma_buf, and flags for the file</div><div class='del'>-   associated with this buffer. All these fields are filled in struct</div><div class='del'>-   dma_buf_export_info, defined via the DEFINE_DMA_BUF_EXPORT_INFO macro.</div><div class='del'>-</div><div class='del'>-   Interface:</div><div class='del'>-      DEFINE_DMA_BUF_EXPORT_INFO(exp_info)</div><div class='del'>-      struct dma_buf *dma_buf_export(struct dma_buf_export_info *exp_info)</div><div class='del'>-</div><div class='del'>-   If this succeeds, dma_buf_export allocates a dma_buf structure, and</div><div class='del'>-   returns a pointer to the same. It also associates an anonymous file with this</div><div class='del'>-   buffer, so it can be exported. On failure to allocate the dma_buf object,</div><div class='del'>-   it returns NULL.</div><div class='del'>-</div><div class='del'>-   'exp_name' in struct dma_buf_export_info is the name of exporter - to</div><div class='del'>-   facilitate information while debugging. It is set to KBUILD_MODNAME by</div><div class='del'>-   default, so exporters don't have to provide a specific name, if they don't</div><div class='del'>-   wish to.</div><div class='del'>-</div><div class='del'>-   DEFINE_DMA_BUF_EXPORT_INFO macro defines the struct dma_buf_export_info,</div><div class='del'>-   zeroes it out and pre-populates exp_name in it.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2. Userspace gets a handle to pass around to potential buffer-users</div><div class='del'>-</div><div class='del'>-   Userspace entity requests for a file-descriptor (fd) which is a handle to the</div><div class='del'>-   anonymous file associated with the buffer. It can then share the fd with other</div><div class='del'>-   drivers and/or processes.</div><div class='del'>-</div><div class='del'>-   Interface:</div><div class='del'>-      int dma_buf_fd(struct dma_buf *dmabuf, int flags)</div><div class='del'>-</div><div class='del'>-   This API installs an fd for the anonymous file associated with this buffer;</div><div class='del'>-   returns either 'fd', or error.</div><div class='del'>-</div><div class='del'>-3. Each buffer-user 'connects' itself to the buffer</div><div class='del'>-</div><div class='del'>-   Each buffer-user now gets a reference to the buffer, using the fd passed to</div><div class='del'>-   it.</div><div class='del'>-</div><div class='del'>-   Interface:</div><div class='del'>-      struct dma_buf *dma_buf_get(int fd)</div><div class='del'>-</div><div class='del'>-   This API will return a reference to the dma_buf, and increment refcount for</div><div class='del'>-   it.</div><div class='del'>-</div><div class='del'>-   After this, the buffer-user needs to attach its device with the buffer, which</div><div class='del'>-   helps the exporter to know of device buffer constraints.</div><div class='del'>-</div><div class='del'>-   Interface:</div><div class='del'>-      struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,</div><div class='del'>-                                                struct device *dev)</div><div class='del'>-</div><div class='del'>-   This API returns reference to an attachment structure, which is then used</div><div class='del'>-   for scatterlist operations. It will optionally call the 'attach' dma_buf</div><div class='del'>-   operation, if provided by the exporter.</div><div class='del'>-</div><div class='del'>-   The dma-buf sharing framework does the bookkeeping bits related to managing</div><div class='del'>-   the list of all attachments to a buffer.</div><div class='del'>-</div><div class='del'>-Until this stage, the buffer-exporter has the option to choose not to actually</div><div class='del'>-allocate the backing storage for this buffer, but wait for the first buffer-user</div><div class='del'>-to request use of buffer for allocation.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4. When needed, buffer-user requests access to the buffer</div><div class='del'>-</div><div class='del'>-   Whenever a buffer-user wants to use the buffer for any DMA, it asks for</div><div class='del'>-   access to the buffer using dma_buf_map_attachment API. At least one attach to</div><div class='del'>-   the buffer must have happened before map_dma_buf can be called.</div><div class='del'>-</div><div class='del'>-   Interface:</div><div class='del'>-      struct sg_table * dma_buf_map_attachment(struct dma_buf_attachment *,</div><div class='del'>-                                         enum dma_data_direction);</div><div class='del'>-</div><div class='del'>-   This is a wrapper to dma_buf-&gt;ops-&gt;map_dma_buf operation, which hides the</div><div class='del'>-   "dma_buf-&gt;ops-&gt;" indirection from the users of this interface.</div><div class='del'>-</div><div class='del'>-   In struct dma_buf_ops, map_dma_buf is defined as</div><div class='del'>-      struct sg_table * (*map_dma_buf)(struct dma_buf_attachment *,</div><div class='del'>-                                                enum dma_data_direction);</div><div class='del'>-</div><div class='del'>-   It is one of the buffer operations that must be implemented by the exporter.</div><div class='del'>-   It should return the sg_table containing scatterlist for this buffer, mapped</div><div class='del'>-   into caller's address space.</div><div class='del'>-</div><div class='del'>-   If this is being called for the first time, the exporter can now choose to</div><div class='del'>-   scan through the list of attachments for this buffer, collate the requirements</div><div class='del'>-   of the attached devices, and choose an appropriate backing storage for the</div><div class='del'>-   buffer.</div><div class='del'>-</div><div class='del'>-   Based on enum dma_data_direction, it might be possible to have multiple users</div><div class='del'>-   accessing at the same time (for reading, maybe), or any other kind of sharing</div><div class='del'>-   that the exporter might wish to make available to buffer-users.</div><div class='del'>-</div><div class='del'>-   map_dma_buf() operation can return -EINTR if it is interrupted by a signal.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5. When finished, the buffer-user notifies end-of-DMA to exporter</div><div class='del'>-</div><div class='del'>-   Once the DMA for the current buffer-user is over, it signals 'end-of-DMA' to</div><div class='del'>-   the exporter using the dma_buf_unmap_attachment API.</div><div class='del'>-</div><div class='del'>-   Interface:</div><div class='del'>-      void dma_buf_unmap_attachment(struct dma_buf_attachment *,</div><div class='del'>-                                    struct sg_table *);</div><div class='del'>-</div><div class='del'>-   This is a wrapper to dma_buf-&gt;ops-&gt;unmap_dma_buf() operation, which hides the</div><div class='del'>-   "dma_buf-&gt;ops-&gt;" indirection from the users of this interface.</div><div class='del'>-</div><div class='del'>-   In struct dma_buf_ops, unmap_dma_buf is defined as</div><div class='del'>-      void (*unmap_dma_buf)(struct dma_buf_attachment *,</div><div class='del'>-                            struct sg_table *,</div><div class='del'>-                            enum dma_data_direction);</div><div class='del'>-</div><div class='del'>-   unmap_dma_buf signifies the end-of-DMA for the attachment provided. Like</div><div class='del'>-   map_dma_buf, this API also must be implemented by the exporter.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-6. when buffer-user is done using this buffer, it 'disconnects' itself from the</div><div class='del'>-   buffer.</div><div class='del'>-</div><div class='del'>-   After the buffer-user has no more interest in using this buffer, it should</div><div class='del'>-   disconnect itself from the buffer:</div><div class='del'>-</div><div class='del'>-   - it first detaches itself from the buffer.</div><div class='del'>-</div><div class='del'>-   Interface:</div><div class='del'>-      void dma_buf_detach(struct dma_buf *dmabuf,</div><div class='del'>-                          struct dma_buf_attachment *dmabuf_attach);</div><div class='del'>-</div><div class='del'>-   This API removes the attachment from the list in dmabuf, and optionally calls</div><div class='del'>-   dma_buf-&gt;ops-&gt;detach(), if provided by exporter, for any housekeeping bits.</div><div class='del'>-</div><div class='del'>-   - Then, the buffer-user returns the buffer reference to exporter.</div><div class='del'>-</div><div class='del'>-   Interface:</div><div class='del'>-     void dma_buf_put(struct dma_buf *dmabuf);</div><div class='del'>-</div><div class='del'>-   This API then reduces the refcount for this buffer.</div><div class='del'>-</div><div class='del'>-   If, as a result of this call, the refcount becomes 0, the 'release' file</div><div class='del'>-   operation related to this fd is called. It calls the dmabuf-&gt;ops-&gt;release()</div><div class='del'>-   operation in turn, and frees the memory allocated for dmabuf when exported.</div><div class='del'>-</div><div class='del'>-NOTES:</div><div class='del'>-- Importance of attach-detach and {map,unmap}_dma_buf operation pairs</div><div class='del'>-   The attach-detach calls allow the exporter to figure out backing-storage</div><div class='del'>-   constraints for the currently-interested devices. This allows preferential</div><div class='del'>-   allocation, and/or migration of pages across different types of storage</div><div class='del'>-   available, if possible.</div><div class='del'>-</div><div class='del'>-   Bracketing of DMA access with {map,unmap}_dma_buf operations is essential</div><div class='del'>-   to allow just-in-time backing of storage, and migration mid-way through a</div><div class='del'>-   use-case.</div><div class='del'>-</div><div class='del'>-- Migration of backing storage if needed</div><div class='del'>-   If after</div><div class='del'>-   - at least one map_dma_buf has happened,</div><div class='del'>-   - and the backing storage has been allocated for this buffer,</div><div class='del'>-   another new buffer-user intends to attach itself to this buffer, it might</div><div class='del'>-   be allowed, if possible for the exporter.</div><div class='del'>-</div><div class='del'>-   In case it is allowed by the exporter:</div><div class='del'>-    if the new buffer-user has stricter 'backing-storage constraints', and the</div><div class='del'>-    exporter can handle these constraints, the exporter can just stall on the</div><div class='del'>-    map_dma_buf until all outstanding access is completed (as signalled by</div><div class='del'>-    unmap_dma_buf).</div><div class='del'>-    Once all users have finished accessing and have unmapped this buffer, the</div><div class='del'>-    exporter could potentially move the buffer to the stricter backing-storage,</div><div class='del'>-    and then allow further {map,unmap}_dma_buf operations from any buffer-user</div><div class='del'>-    from the migrated backing-storage.</div><div class='del'>-</div><div class='del'>-   If the exporter cannot fulfill the backing-storage constraints of the new</div><div class='del'>-   buffer-user device as requested, dma_buf_attach() would return an error to</div><div class='del'>-   denote non-compatibility of the new buffer-sharing request with the current</div><div class='del'>-   buffer.</div><div class='del'>-</div><div class='del'>-   If the exporter chooses not to allow an attach() operation once a</div><div class='del'>-   map_dma_buf() API has been called, it simply returns an error.</div><div class='del'>-</div><div class='del'>-Kernel cpu access to a dma-buf buffer object</div><div class='del'>---------------------------------------------</div><div class='del'>-</div><div class='del'>-The motivation to allow cpu access from the kernel to a dma-buf object from the</div><div class='del'>-importers side are:</div><div class='del'>-- fallback operations, e.g. if the devices is connected to a usb bus and the</div><div class='del'>-  kernel needs to shuffle the data around first before sending it away.</div><div class='del'>-- full transparency for existing users on the importer side, i.e. userspace</div><div class='del'>-  should not notice the difference between a normal object from that subsystem</div><div class='del'>-  and an imported one backed by a dma-buf. This is really important for drm</div><div class='del'>-  opengl drivers that expect to still use all the existing upload/download</div><div class='del'>-  paths.</div><div class='del'>-</div><div class='del'>-Access to a dma_buf from the kernel context involves three steps:</div><div class='del'>-</div><div class='del'>-1. Prepare access, which invalidate any necessary caches and make the object</div><div class='del'>-   available for cpu access.</div><div class='del'>-2. Access the object page-by-page with the dma_buf map apis</div><div class='del'>-3. Finish access, which will flush any necessary cpu caches and free reserved</div><div class='del'>-   resources.</div><div class='del'>-</div><div class='del'>-1. Prepare access</div><div class='del'>-</div><div class='del'>-   Before an importer can access a dma_buf object with the cpu from the kernel</div><div class='del'>-   context, it needs to notify the exporter of the access that is about to</div><div class='del'>-   happen.</div><div class='del'>-</div><div class='del'>-   Interface:</div><div class='del'>-      int dma_buf_begin_cpu_access(struct dma_buf *dmabuf,</div><div class='del'>-				   enum dma_data_direction direction)</div><div class='del'>-</div><div class='del'>-   This allows the exporter to ensure that the memory is actually available for</div><div class='del'>-   cpu access - the exporter might need to allocate or swap-in and pin the</div><div class='del'>-   backing storage. The exporter also needs to ensure that cpu access is</div><div class='del'>-   coherent for the access direction. The direction can be used by the exporter</div><div class='del'>-   to optimize the cache flushing, i.e. access with a different direction (read</div><div class='del'>-   instead of write) might return stale or even bogus data (e.g. when the</div><div class='del'>-   exporter needs to copy the data to temporary storage).</div><div class='del'>-</div><div class='del'>-   This step might fail, e.g. in oom conditions.</div><div class='del'>-</div><div class='del'>-2. Accessing the buffer</div><div class='del'>-</div><div class='del'>-   To support dma_buf objects residing in highmem cpu access is page-based using</div><div class='del'>-   an api similar to kmap. Accessing a dma_buf is done in aligned chunks of</div><div class='del'>-   PAGE_SIZE size. Before accessing a chunk it needs to be mapped, which returns</div><div class='del'>-   a pointer in kernel virtual address space. Afterwards the chunk needs to be</div><div class='del'>-   unmapped again. There is no limit on how often a given chunk can be mapped</div><div class='del'>-   and unmapped, i.e. the importer does not need to call begin_cpu_access again</div><div class='del'>-   before mapping the same chunk again.</div><div class='del'>-</div><div class='del'>-   Interfaces:</div><div class='del'>-      void *dma_buf_kmap(struct dma_buf *, unsigned long);</div><div class='del'>-      void dma_buf_kunmap(struct dma_buf *, unsigned long, void *);</div><div class='del'>-</div><div class='del'>-   There are also atomic variants of these interfaces. Like for kmap they</div><div class='del'>-   facilitate non-blocking fast-paths. Neither the importer nor the exporter (in</div><div class='del'>-   the callback) is allowed to block when using these.</div><div class='del'>-</div><div class='del'>-   Interfaces:</div><div class='del'>-      void *dma_buf_kmap_atomic(struct dma_buf *, unsigned long);</div><div class='del'>-      void dma_buf_kunmap_atomic(struct dma_buf *, unsigned long, void *);</div><div class='del'>-</div><div class='del'>-   For importers all the restrictions of using kmap apply, like the limited</div><div class='del'>-   supply of kmap_atomic slots. Hence an importer shall only hold onto at most 2</div><div class='del'>-   atomic dma_buf kmaps at the same time (in any given process context).</div><div class='del'>-</div><div class='del'>-   dma_buf kmap calls outside of the range specified in begin_cpu_access are</div><div class='del'>-   undefined. If the range is not PAGE_SIZE aligned, kmap needs to succeed on</div><div class='del'>-   the partial chunks at the beginning and end but may return stale or bogus</div><div class='del'>-   data outside of the range (in these partial chunks).</div><div class='del'>-</div><div class='del'>-   Note that these calls need to always succeed. The exporter needs to complete</div><div class='del'>-   any preparations that might fail in begin_cpu_access.</div><div class='del'>-</div><div class='del'>-   For some cases the overhead of kmap can be too high, a vmap interface</div><div class='del'>-   is introduced. This interface should be used very carefully, as vmalloc</div><div class='del'>-   space is a limited resources on many architectures.</div><div class='del'>-</div><div class='del'>-   Interfaces:</div><div class='del'>-      void *dma_buf_vmap(struct dma_buf *dmabuf)</div><div class='del'>-      void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)</div><div class='del'>-</div><div class='del'>-   The vmap call can fail if there is no vmap support in the exporter, or if it</div><div class='del'>-   runs out of vmalloc space. Fallback to kmap should be implemented. Note that</div><div class='del'>-   the dma-buf layer keeps a reference count for all vmap access and calls down</div><div class='del'>-   into the exporter's vmap function only when no vmapping exists, and only</div><div class='del'>-   unmaps it once. Protection against concurrent vmap/vunmap calls is provided</div><div class='del'>-   by taking the dma_buf-&gt;lock mutex.</div><div class='del'>-</div><div class='del'>-3. Finish access</div><div class='del'>-</div><div class='del'>-   When the importer is done accessing the CPU, it needs to announce this to</div><div class='del'>-   the exporter (to facilitate cache flushing and unpinning of any pinned</div><div class='del'>-   resources). The result of any dma_buf kmap calls after end_cpu_access is</div><div class='del'>-   undefined.</div><div class='del'>-</div><div class='del'>-   Interface:</div><div class='del'>-      void dma_buf_end_cpu_access(struct dma_buf *dma_buf,</div><div class='del'>-				  enum dma_data_direction dir);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Direct Userspace Access/mmap Support</div><div class='del'>-------------------------------------</div><div class='del'>-</div><div class='del'>-Being able to mmap an export dma-buf buffer object has 2 main use-cases:</div><div class='del'>-- CPU fallback processing in a pipeline and</div><div class='del'>-- supporting existing mmap interfaces in importers.</div><div class='del'>-</div><div class='del'>-1. CPU fallback processing in a pipeline</div><div class='del'>-</div><div class='del'>-   In many processing pipelines it is sometimes required that the cpu can access</div><div class='del'>-   the data in a dma-buf (e.g. for thumbnail creation, snapshots, ...). To avoid</div><div class='del'>-   the need to handle this specially in userspace frameworks for buffer sharing</div><div class='del'>-   it's ideal if the dma_buf fd itself can be used to access the backing storage</div><div class='del'>-   from userspace using mmap.</div><div class='del'>-</div><div class='del'>-   Furthermore Android's ION framework already supports this (and is otherwise</div><div class='del'>-   rather similar to dma-buf from a userspace consumer side with using fds as</div><div class='del'>-   handles, too). So it's beneficial to support this in a similar fashion on</div><div class='del'>-   dma-buf to have a good transition path for existing Android userspace.</div><div class='del'>-</div><div class='del'>-   No special interfaces, userspace simply calls mmap on the dma-buf fd, making</div><div class='del'>-   sure that the cache synchronization ioctl (DMA_BUF_IOCTL_SYNC) is *always*</div><div class='del'>-   used when the access happens. Note that DMA_BUF_IOCTL_SYNC can fail with</div><div class='del'>-   -EAGAIN or -EINTR, in which case it must be restarted.</div><div class='del'>-</div><div class='del'>-   Some systems might need some sort of cache coherency management e.g. when</div><div class='del'>-   CPU and GPU domains are being accessed through dma-buf at the same time. To</div><div class='del'>-   circumvent this problem there are begin/end coherency markers, that forward</div><div class='del'>-   directly to existing dma-buf device drivers vfunc hooks. Userspace can make</div><div class='del'>-   use of those markers through the DMA_BUF_IOCTL_SYNC ioctl. The sequence</div><div class='del'>-   would be used like following:</div><div class='del'>-     - mmap dma-buf fd</div><div class='del'>-     - for each drawing/upload cycle in CPU 1. SYNC_START ioctl, 2. read/write</div><div class='del'>-       to mmap area 3. SYNC_END ioctl. This can be repeated as often as you</div><div class='del'>-       want (with the new data being consumed by the GPU or say scanout device)</div><div class='del'>-     - munmap once you don't need the buffer any more</div><div class='del'>-</div><div class='del'>-    For correctness and optimal performance, it is always required to use</div><div class='del'>-    SYNC_START and SYNC_END before and after, respectively, when accessing the</div><div class='del'>-    mapped address. Userspace cannot rely on coherent access, even when there</div><div class='del'>-    are systems where it just works without calling these ioctls.</div><div class='del'>-</div><div class='del'>-2. Supporting existing mmap interfaces in importers</div><div class='del'>-</div><div class='del'>-   Similar to the motivation for kernel cpu access it is again important that</div><div class='del'>-   the userspace code of a given importing subsystem can use the same interfaces</div><div class='del'>-   with a imported dma-buf buffer object as with a native buffer object. This is</div><div class='del'>-   especially important for drm where the userspace part of contemporary OpenGL,</div><div class='del'>-   X, and other drivers is huge, and reworking them to use a different way to</div><div class='del'>-   mmap a buffer rather invasive.</div><div class='del'>-</div><div class='del'>-   The assumption in the current dma-buf interfaces is that redirecting the</div><div class='del'>-   initial mmap is all that's needed. A survey of some of the existing</div><div class='del'>-   subsystems shows that no driver seems to do any nefarious thing like syncing</div><div class='del'>-   up with outstanding asynchronous processing on the device or allocating</div><div class='del'>-   special resources at fault time. So hopefully this is good enough, since</div><div class='del'>-   adding interfaces to intercept pagefaults and allow pte shootdowns would</div><div class='del'>-   increase the complexity quite a bit.</div><div class='del'>-</div><div class='del'>-   Interface:</div><div class='del'>-      int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *,</div><div class='del'>-		       unsigned long);</div><div class='del'>-</div><div class='del'>-   If the importing subsystem simply provides a special-purpose mmap call to set</div><div class='del'>-   up a mapping in userspace, calling do_mmap with dma_buf-&gt;file will equally</div><div class='del'>-   achieve that for a dma-buf object.</div><div class='del'>-</div><div class='del'>-3. Implementation notes for exporters</div><div class='del'>-</div><div class='del'>-   Because dma-buf buffers have invariant size over their lifetime, the dma-buf</div><div class='del'>-   core checks whether a vma is too large and rejects such mappings. The</div><div class='del'>-   exporter hence does not need to duplicate this check.</div><div class='del'>-</div><div class='del'>-   Because existing importing subsystems might presume coherent mappings for</div><div class='del'>-   userspace, the exporter needs to set up a coherent mapping. If that's not</div><div class='del'>-   possible, it needs to fake coherency by manually shooting down ptes when</div><div class='del'>-   leaving the cpu domain and flushing caches at fault time. Note that all the</div><div class='del'>-   dma_buf files share the same anon inode, hence the exporter needs to replace</div><div class='del'>-   the dma_buf file stored in vma-&gt;vm_file with it's own if pte shootdown is</div><div class='del'>-   required. This is because the kernel uses the underlying inode's address_space</div><div class='del'>-   for vma tracking (and hence pte tracking at shootdown time with</div><div class='del'>-   unmap_mapping_range).</div><div class='del'>-</div><div class='del'>-   If the above shootdown dance turns out to be too expensive in certain</div><div class='del'>-   scenarios, we can extend dma-buf with a more explicit cache tracking scheme</div><div class='del'>-   for userspace mappings. But the current assumption is that using mmap is</div><div class='del'>-   always a slower path, so some inefficiencies should be acceptable.</div><div class='del'>-</div><div class='del'>-   Exporters that shoot down mappings (for any reasons) shall not do any</div><div class='del'>-   synchronization at fault time with outstanding device operations.</div><div class='del'>-   Synchronization is an orthogonal issue to sharing the backing storage of a</div><div class='del'>-   buffer and hence should not be handled by dma-buf itself. This is explicitly</div><div class='del'>-   mentioned here because many people seem to want something like this, but if</div><div class='del'>-   different exporters handle this differently, buffer sharing can fail in</div><div class='del'>-   interesting ways depending upong the exporter (if userspace starts depending</div><div class='del'>-   upon this implicit synchronization).</div><div class='del'>-</div><div class='del'>-Other Interfaces Exposed to Userspace on the dma-buf FD</div><div class='del'>-------------------------------------------------------</div><div class='del'>-</div><div class='del'>-- Since kernel 3.12 the dma-buf FD supports the llseek system call, but only</div><div class='del'>-  with offset=0 and whence=SEEK_END|SEEK_SET. SEEK_SET is supported to allow</div><div class='del'>-  the usual size discover pattern size = SEEK_END(0); SEEK_SET(0). Every other</div><div class='del'>-  llseek operation will report -EINVAL.</div><div class='del'>-</div><div class='del'>-  If llseek on dma-buf FDs isn't support the kernel will report -ESPIPE for all</div><div class='del'>-  cases. Userspace can use this to detect support for discovering the dma-buf</div><div class='del'>-  size using llseek.</div><div class='del'>-</div><div class='del'>-Miscellaneous notes</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-- Any exporters or users of the dma-buf buffer sharing framework must have</div><div class='del'>-  a 'select DMA_SHARED_BUFFER' in their respective Kconfigs.</div><div class='del'>-</div><div class='del'>-- In order to avoid fd leaks on exec, the FD_CLOEXEC flag must be set</div><div class='del'>-  on the file descriptor.  This is not just a resource leak, but a</div><div class='del'>-  potential security hole.  It could give the newly exec'd application</div><div class='del'>-  access to buffers, via the leaked fd, to which it should otherwise</div><div class='del'>-  not be permitted access.</div><div class='del'>-</div><div class='del'>-  The problem with doing this via a separate fcntl() call, versus doing it</div><div class='del'>-  atomically when the fd is created, is that this is inherently racy in a</div><div class='del'>-  multi-threaded app[3].  The issue is made worse when it is library code</div><div class='del'>-  opening/creating the file descriptor, as the application may not even be</div><div class='del'>-  aware of the fd's.</div><div class='del'>-</div><div class='del'>-  To avoid this problem, userspace must have a way to request O_CLOEXEC</div><div class='del'>-  flag be set when the dma-buf fd is created.  So any API provided by</div><div class='del'>-  the exporting driver to create a dmabuf fd must provide a way to let</div><div class='del'>-  userspace control setting of O_CLOEXEC flag passed in to dma_buf_fd().</div><div class='del'>-</div><div class='del'>-- If an exporter needs to manually flush caches and hence needs to fake</div><div class='del'>-  coherency for mmap support, it needs to be able to zap all the ptes pointing</div><div class='del'>-  at the backing storage. Now linux mm needs a struct address_space associated</div><div class='del'>-  with the struct file stored in vma-&gt;vm_file to do that with the function</div><div class='del'>-  unmap_mapping_range. But the dma_buf framework only backs every dma_buf fd</div><div class='del'>-  with the anon_file struct file, i.e. all dma_bufs share the same file.</div><div class='del'>-</div><div class='del'>-  Hence exporters need to setup their own file (and address_space) association</div><div class='del'>-  by setting vma-&gt;vm_file and adjusting vma-&gt;vm_pgoff in the dma_buf mmap</div><div class='del'>-  callback. In the specific case of a gem driver the exporter could use the</div><div class='del'>-  shmem file already provided by gem (and set vm_pgoff = 0). Exporters can then</div><div class='del'>-  zap ptes by unmapping the corresponding range of the struct address_space</div><div class='del'>-  associated with their own file.</div><div class='del'>-</div><div class='del'>-References:</div><div class='del'>-[1] struct dma_buf_ops in include/linux/dma-buf.h</div><div class='del'>-[2] All interfaces mentioned above defined in include/linux/dma-buf.h</div><div class='del'>-[3] https://lwn.net/Articles/236486/</div><div class='head'>diff --git a/Documentation/dmaengine/client.txt b/Documentation/dmaengine/client.txt<br/>index 9e33189745f0..c72b4563de10 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/dmaengine/client.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/dmaengine/client.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/dmaengine/client.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dmaengine/client.txt</a></div><div class='hunk'>@@ -37,8 +37,8 @@ The slave DMA usage consists of following steps:</div><div class='ctx'> 2. Set slave and controller specific parameters</div><div class='ctx'> </div><div class='ctx'>    Next step is always to pass some specific information to the DMA</div><div class='del'>-   driver.  Most of the generic information which a slave DMA can use</div><div class='del'>-   is in struct dma_slave_config.  This allows the clients to specify</div><div class='add'>+   driver. Most of the generic information which a slave DMA can use</div><div class='add'>+   is in struct dma_slave_config. This allows the clients to specify</div><div class='ctx'>    DMA direction, DMA addresses, bus widths, DMA burst lengths etc</div><div class='ctx'>    for the peripheral.</div><div class='ctx'> </div><div class='hunk'>@@ -52,7 +52,7 @@ The slave DMA usage consists of following steps:</div><div class='ctx'> 				  struct dma_slave_config *config)</div><div class='ctx'> </div><div class='ctx'>    Please see the dma_slave_config structure definition in dmaengine.h</div><div class='del'>-   for a detailed explanation of the struct members.  Please note</div><div class='add'>+   for a detailed explanation of the struct members. Please note</div><div class='ctx'>    that the 'direction' member will be going away as it duplicates the</div><div class='ctx'>    direction given in the prepare call.</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +101,7 @@ The slave DMA usage consists of following steps:</div><div class='ctx'> 	desc = dmaengine_prep_slave_sg(chan, sgl, nr_sg, direction, flags);</div><div class='ctx'> </div><div class='ctx'>    Once a descriptor has been obtained, the callback information can be</div><div class='del'>-   added and the descriptor must then be submitted.  Some DMA engine</div><div class='add'>+   added and the descriptor must then be submitted. Some DMA engine</div><div class='ctx'>    drivers may hold a spinlock between a successful preparation and</div><div class='ctx'>    submission so it is important that these two operations are closely</div><div class='ctx'>    paired.</div><div class='hunk'>@@ -138,7 +138,7 @@ The slave DMA usage consists of following steps:</div><div class='ctx'>    activity via other DMA engine calls not covered in this document.</div><div class='ctx'> </div><div class='ctx'>    dmaengine_submit() will not start the DMA operation, it merely adds</div><div class='del'>-   it to the pending queue.  For this, see step 5, dma_async_issue_pending.</div><div class='add'>+   it to the pending queue. For this, see step 5, dma_async_issue_pending.</div><div class='ctx'> </div><div class='ctx'> 5. Issue pending DMA requests and wait for callback notification</div><div class='ctx'> </div><div class='hunk'>@@ -184,13 +184,13 @@ Further APIs:</div><div class='ctx'> </div><div class='ctx'> 3. int dmaengine_resume(struct dma_chan *chan)</div><div class='ctx'> </div><div class='del'>-   Resume a previously paused DMA channel.  It is invalid to resume a</div><div class='add'>+   Resume a previously paused DMA channel. It is invalid to resume a</div><div class='ctx'>    channel which is not currently paused.</div><div class='ctx'> </div><div class='ctx'> 4. enum dma_status dma_async_is_tx_complete(struct dma_chan *chan,</div><div class='ctx'>         dma_cookie_t cookie, dma_cookie_t *last, dma_cookie_t *used)</div><div class='ctx'> </div><div class='del'>-   This can be used to check the status of the channel.  Please see</div><div class='add'>+   This can be used to check the status of the channel. Please see</div><div class='ctx'>    the documentation in include/linux/dmaengine.h for a more complete</div><div class='ctx'>    description of this API.</div><div class='ctx'> </div><div class='hunk'>@@ -200,7 +200,7 @@ Further APIs:</div><div class='ctx'> </div><div class='ctx'>    Note:</div><div class='ctx'> 	Not all DMA engine drivers can return reliable information for</div><div class='del'>-	a running DMA channel.  It is recommended that DMA engine users</div><div class='add'>+	a running DMA channel. It is recommended that DMA engine users</div><div class='ctx'> 	pause or stop (via dmaengine_terminate_all()) the channel before</div><div class='ctx'> 	using this API.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/dmaengine/dmatest.txt b/Documentation/dmaengine/dmatest.txt<br/>index dd77a81bdb80..fb683c72dea8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/dmaengine/dmatest.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/dmaengine/dmatest.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/dmaengine/dmatest.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dmaengine/dmatest.txt</a></div><div class='hunk'>@@ -34,7 +34,7 @@ command:</div><div class='ctx'> 	% ls -1 /sys/class/dma/</div><div class='ctx'> </div><div class='ctx'> Once started a message like "dmatest: Started 1 threads using dma0chan0" is</div><div class='del'>-emitted.  After that only test failure messages are reported until the test</div><div class='add'>+emitted. After that only test failure messages are reported until the test</div><div class='ctx'> stops.</div><div class='ctx'> </div><div class='ctx'> Note that running a new test will not stop any in progress test.</div><div class='hunk'>@@ -43,11 +43,11 @@ The following command returns the state of the test.</div><div class='ctx'> 	% cat /sys/module/dmatest/parameters/run</div><div class='ctx'> </div><div class='ctx'> To wait for test completion userpace can poll 'run' until it is false, or use</div><div class='del'>-the wait parameter.  Specifying 'wait=1' when loading the module causes module</div><div class='add'>+the wait parameter. Specifying 'wait=1' when loading the module causes module</div><div class='ctx'> initialization to pause until a test run has completed, while reading</div><div class='ctx'> /sys/module/dmatest/parameters/wait waits for any running test to complete</div><div class='del'>-before returning.  For example, the following scripts wait for 42 tests</div><div class='del'>-to complete before exiting.  Note that if 'iterations' is set to 'infinite' then</div><div class='add'>+before returning. For example, the following scripts wait for 42 tests</div><div class='add'>+to complete before exiting. Note that if 'iterations' is set to 'infinite' then</div><div class='ctx'> waiting is disabled.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='hunk'>@@ -81,7 +81,7 @@ Example of output:</div><div class='ctx'> </div><div class='ctx'> The message format is unified across the different types of errors. A number in</div><div class='ctx'> the parens represents additional information, e.g. error code, error counter,</div><div class='del'>-or status.  A test thread also emits a summary line at completion listing the</div><div class='add'>+or status. A test thread also emits a summary line at completion listing the</div><div class='ctx'> number of tests executed, number that failed, and a result code.</div><div class='ctx'> </div><div class='ctx'> Example:</div><div class='head'>diff --git a/Documentation/dmaengine/provider.txt b/Documentation/dmaengine/provider.txt<br/>index c4fd47540b31..e33bc1c8ed2c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/dmaengine/provider.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/dmaengine/provider.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/dmaengine/provider.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dmaengine/provider.txt</a></div><div class='hunk'>@@ -384,7 +384,7 @@ where to put them)</div><div class='ctx'>     - The descriptor should be prepared for reuse by invoking</div><div class='ctx'>       dmaengine_desc_set_reuse() which will set DMA_CTRL_REUSE.</div><div class='ctx'>     - dmaengine_desc_set_reuse() will succeed only when channel support</div><div class='del'>-      reusable descriptor as exhibited by capablities</div><div class='add'>+      reusable descriptor as exhibited by capabilities</div><div class='ctx'>     - As a consequence, if a device driver wants to skip the dma_map_sg() and</div><div class='ctx'>       dma_unmap_sg() in between 2 transfers, because the DMA'd data wasn't used,</div><div class='ctx'>       it can resubmit the transfer right after its completion.</div><div class='head'>diff --git a/Documentation/dmaengine/pxa_dma.txt b/Documentation/dmaengine/pxa_dma.txt<br/>index 413ef9cfaa4d..0736d44b5438 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/dmaengine/pxa_dma.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/dmaengine/pxa_dma.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/dmaengine/pxa_dma.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dmaengine/pxa_dma.txt</a></div><div class='hunk'>@@ -29,7 +29,7 @@ Constraints</div><div class='ctx'> </div><div class='ctx'>   d) Bandwidth guarantee</div><div class='ctx'>      The PXA architecture has 4 levels of DMAs priorities : high, normal, low.</div><div class='del'>-     The high prorities get twice as much bandwidth as the normal, which get twice</div><div class='add'>+     The high priorities get twice as much bandwidth as the normal, which get twice</div><div class='ctx'>      as much as the low priorities.</div><div class='ctx'>      A driver should be able to request a priority, especially the real-time</div><div class='ctx'>      ones such as pxa_camera with (big) throughputs.</div><div class='head'>diff --git a/Documentation/doc-guide/conf.py b/Documentation/doc-guide/conf.py<br/>new file mode 100644<br/>index 000000000000..fd3731182d5a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/doc-guide/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/conf.py</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# -*- coding: utf-8; mode: python -*-</div><div class='add'>+</div><div class='add'>+project = 'Linux Kernel Documentation Guide'</div><div class='add'>+</div><div class='add'>+tags.add("subproject")</div><div class='add'>+</div><div class='add'>+latex_documents = [</div><div class='add'>+    ('index', 'kernel-doc-guide.tex', 'Linux Kernel Documentation Guide',</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+]</div><div class='head'>diff --git a/Documentation/doc-guide/docbook.rst b/Documentation/doc-guide/docbook.rst<br/>new file mode 100644<br/>index 000000000000..d8bf04308b43<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/doc-guide/docbook.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/docbook.rst</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+DocBook XML [DEPRECATED]</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+.. attention::</div><div class='add'>+</div><div class='add'>+   This section describes the deprecated DocBook XML toolchain. Please do not</div><div class='add'>+   create new DocBook XML template files. Please consider converting existing</div><div class='add'>+   DocBook XML templates files to Sphinx/reStructuredText.</div><div class='add'>+</div><div class='add'>+Converting DocBook to Sphinx</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+Over time, we expect all of the documents under ``Documentation/DocBook`` to be</div><div class='add'>+converted to Sphinx and reStructuredText. For most DocBook XML documents, a good</div><div class='add'>+enough solution is to use the simple ``Documentation/sphinx/tmplcvt`` script,</div><div class='add'>+which uses ``pandoc`` under the hood. For example::</div><div class='add'>+</div><div class='add'>+  $ cd Documentation/sphinx</div><div class='add'>+  $ ./tmplcvt ../DocBook/in.tmpl ../out.rst</div><div class='add'>+</div><div class='add'>+Then edit the resulting rst files to fix any remaining issues, and add the</div><div class='add'>+document in the ``toctree`` in ``Documentation/index.rst``.</div><div class='add'>+</div><div class='add'>+Components of the kernel-doc system</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+Many places in the source tree have extractable documentation in the form of</div><div class='add'>+block comments above functions. The components of this system are:</div><div class='add'>+</div><div class='add'>+- ``scripts/kernel-doc``</div><div class='add'>+</div><div class='add'>+  This is a perl script that hunts for the block comments and can mark them up</div><div class='add'>+  directly into reStructuredText, DocBook, man, text, and HTML. (No, not</div><div class='add'>+  texinfo.)</div><div class='add'>+</div><div class='add'>+- ``Documentation/DocBook/*.tmpl``</div><div class='add'>+</div><div class='add'>+  These are XML template files, which are normal XML files with special</div><div class='add'>+  place-holders for where the extracted documentation should go.</div><div class='add'>+</div><div class='add'>+- ``scripts/docproc.c``</div><div class='add'>+</div><div class='add'>+  This is a program for converting XML template files into XML files. When a</div><div class='add'>+  file is referenced it is searched for symbols exported (EXPORT_SYMBOL), to be</div><div class='add'>+  able to distinguish between internal and external functions.</div><div class='add'>+</div><div class='add'>+  It invokes kernel-doc, giving it the list of functions that are to be</div><div class='add'>+  documented.</div><div class='add'>+</div><div class='add'>+  Additionally it is used to scan the XML template files to locate all the files</div><div class='add'>+  referenced herein. This is used to generate dependency information as used by</div><div class='add'>+  make.</div><div class='add'>+</div><div class='add'>+- ``Makefile``</div><div class='add'>+</div><div class='add'>+  The targets 'xmldocs', 'psdocs', 'pdfdocs', and 'htmldocs' are used to build</div><div class='add'>+  DocBook XML files, PostScript files, PDF files, and html files in</div><div class='add'>+  Documentation/DocBook. The older target 'sgmldocs' is equivalent to 'xmldocs'.</div><div class='add'>+</div><div class='add'>+- ``Documentation/DocBook/Makefile``</div><div class='add'>+</div><div class='add'>+  This is where C files are associated with SGML templates.</div><div class='add'>+</div><div class='add'>+How to use kernel-doc comments in DocBook XML template files</div><div class='add'>+------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+DocBook XML template files (\*.tmpl) are like normal XML files, except that they</div><div class='add'>+can contain escape sequences where extracted documentation should be inserted.</div><div class='add'>+</div><div class='add'>+``!E&lt;filename&gt;`` is replaced by the documentation, in ``&lt;filename&gt;``, for</div><div class='add'>+functions that are exported using ``EXPORT_SYMBOL``: the function list is</div><div class='add'>+collected from files listed in ``Documentation/DocBook/Makefile``.</div><div class='add'>+</div><div class='add'>+``!I&lt;filename&gt;`` is replaced by the documentation for functions that are **not**</div><div class='add'>+exported using ``EXPORT_SYMBOL``.</div><div class='add'>+</div><div class='add'>+``!D&lt;filename&gt;`` is used to name additional files to search for functions</div><div class='add'>+exported using ``EXPORT_SYMBOL``.</div><div class='add'>+</div><div class='add'>+``!F&lt;filename&gt; &lt;function [functions...]&gt;`` is replaced by the documentation, in</div><div class='add'>+``&lt;filename&gt;``, for the functions listed.</div><div class='add'>+</div><div class='add'>+``!P&lt;filename&gt; &lt;section title&gt;`` is replaced by the contents of the ``DOC:``</div><div class='add'>+section titled ``&lt;section title&gt;`` from ``&lt;filename&gt;``. Spaces are allowed in</div><div class='add'>+``&lt;section title&gt;``; do not quote the ``&lt;section title&gt;``.</div><div class='add'>+</div><div class='add'>+``!C&lt;filename&gt;`` is replaced by nothing, but makes the tools check that all DOC:</div><div class='add'>+sections and documented functions, symbols, etc. are used. This makes sense to</div><div class='add'>+use when you use ``!F`` or ``!P`` only and want to verify that all documentation</div><div class='add'>+is included.</div><div class='head'>diff --git a/Documentation/doc-guide/index.rst b/Documentation/doc-guide/index.rst<br/>new file mode 100644<br/>index 000000000000..6fff4024606e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/doc-guide/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/index.rst</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+.. _doc_guide:</div><div class='add'>+</div><div class='add'>+=================================</div><div class='add'>+How to write kernel documentation</div><div class='add'>+=================================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   sphinx.rst</div><div class='add'>+   kernel-doc.rst</div><div class='add'>+   parse-headers.rst</div><div class='add'>+   docbook.rst</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/doc-guide/kernel-doc.rst b/Documentation/doc-guide/kernel-doc.rst<br/>new file mode 100644<br/>index 000000000000..b32e4813ff6f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/doc-guide/kernel-doc.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/kernel-doc.rst</a></div><div class='hunk'>@@ -0,0 +1,368 @@</div><div class='add'>+Including kernel-doc comments</div><div class='add'>+=============================</div><div class='add'>+</div><div class='add'>+The Linux kernel source files may contain structured documentation comments, or</div><div class='add'>+kernel-doc comments to describe the functions and types and design of the</div><div class='add'>+code. The documentation comments may be included to any of the reStructuredText</div><div class='add'>+documents using a dedicated kernel-doc Sphinx directive extension.</div><div class='add'>+</div><div class='add'>+The kernel-doc directive is of the format::</div><div class='add'>+</div><div class='add'>+  .. kernel-doc:: source</div><div class='add'>+     :option:</div><div class='add'>+</div><div class='add'>+The *source* is the path to a source file, relative to the kernel source</div><div class='add'>+tree. The following directive options are supported:</div><div class='add'>+</div><div class='add'>+export: *[source-pattern ...]*</div><div class='add'>+  Include documentation for all functions in *source* that have been exported</div><div class='add'>+  using ``EXPORT_SYMBOL`` or ``EXPORT_SYMBOL_GPL`` either in *source* or in any</div><div class='add'>+  of the files specified by *source-pattern*.</div><div class='add'>+</div><div class='add'>+  The *source-pattern* is useful when the kernel-doc comments have been placed</div><div class='add'>+  in header files, while ``EXPORT_SYMBOL`` and ``EXPORT_SYMBOL_GPL`` are next to</div><div class='add'>+  the function definitions.</div><div class='add'>+</div><div class='add'>+  Examples::</div><div class='add'>+</div><div class='add'>+    .. kernel-doc:: lib/bitmap.c</div><div class='add'>+       :export:</div><div class='add'>+</div><div class='add'>+    .. kernel-doc:: include/net/mac80211.h</div><div class='add'>+       :export: net/mac80211/*.c</div><div class='add'>+</div><div class='add'>+internal: *[source-pattern ...]*</div><div class='add'>+  Include documentation for all functions and types in *source* that have</div><div class='add'>+  **not** been exported using ``EXPORT_SYMBOL`` or ``EXPORT_SYMBOL_GPL`` either</div><div class='add'>+  in *source* or in any of the files specified by *source-pattern*.</div><div class='add'>+</div><div class='add'>+  Example::</div><div class='add'>+</div><div class='add'>+    .. kernel-doc:: drivers/gpu/drm/i915/intel_audio.c</div><div class='add'>+       :internal:</div><div class='add'>+</div><div class='add'>+doc: *title*</div><div class='add'>+  Include documentation for the ``DOC:`` paragraph identified by *title* in</div><div class='add'>+  *source*. Spaces are allowed in *title*; do not quote the *title*. The *title*</div><div class='add'>+  is only used as an identifier for the paragraph, and is not included in the</div><div class='add'>+  output. Please make sure to have an appropriate heading in the enclosing</div><div class='add'>+  reStructuredText document.</div><div class='add'>+</div><div class='add'>+  Example::</div><div class='add'>+</div><div class='add'>+    .. kernel-doc:: drivers/gpu/drm/i915/intel_audio.c</div><div class='add'>+       :doc: High Definition Audio over HDMI and Display Port</div><div class='add'>+</div><div class='add'>+functions: *function* *[...]*</div><div class='add'>+  Include documentation for each *function* in *source*.</div><div class='add'>+</div><div class='add'>+  Example::</div><div class='add'>+</div><div class='add'>+    .. kernel-doc:: lib/bitmap.c</div><div class='add'>+       :functions: bitmap_parselist bitmap_parselist_user</div><div class='add'>+</div><div class='add'>+Without options, the kernel-doc directive includes all documentation comments</div><div class='add'>+from the source file.</div><div class='add'>+</div><div class='add'>+The kernel-doc extension is included in the kernel source tree, at</div><div class='add'>+``Documentation/sphinx/kernel-doc.py``. Internally, it uses the</div><div class='add'>+``scripts/kernel-doc`` script to extract the documentation comments from the</div><div class='add'>+source.</div><div class='add'>+</div><div class='add'>+.. _kernel_doc:</div><div class='add'>+</div><div class='add'>+Writing kernel-doc comments</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+In order to provide embedded, "C" friendly, easy to maintain, but consistent and</div><div class='add'>+extractable overview, function and type documentation, the Linux kernel has</div><div class='add'>+adopted a consistent style for documentation comments. The format for this</div><div class='add'>+documentation is called the kernel-doc format, described below. This style</div><div class='add'>+embeds the documentation within the source files, using a few simple conventions</div><div class='add'>+for adding documentation paragraphs and documenting functions and their</div><div class='add'>+parameters, structures and unions and their members, enumerations, and typedefs.</div><div class='add'>+</div><div class='add'>+.. note:: The kernel-doc format is deceptively similar to gtk-doc or Doxygen,</div><div class='add'>+   yet distinctively different, for historical reasons. The kernel source</div><div class='add'>+   contains tens of thousands of kernel-doc comments. Please stick to the style</div><div class='add'>+   described here.</div><div class='add'>+</div><div class='add'>+The ``scripts/kernel-doc`` script is used by the Sphinx kernel-doc extension in</div><div class='add'>+the documentation build to extract this embedded documentation into the various</div><div class='add'>+HTML, PDF, and other format documents.</div><div class='add'>+</div><div class='add'>+In order to provide good documentation of kernel functions and data structures,</div><div class='add'>+please use the following conventions to format your kernel-doc comments in the</div><div class='add'>+Linux kernel source.</div><div class='add'>+</div><div class='add'>+How to format kernel-doc comments</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+The opening comment mark ``/**`` is reserved for kernel-doc comments. Only</div><div class='add'>+comments so marked will be considered by the ``kernel-doc`` tool. Use it only</div><div class='add'>+for comment blocks that contain kernel-doc formatted comments. The usual ``*/``</div><div class='add'>+should be used as the closing comment marker. The lines in between should be</div><div class='add'>+prefixed by `` * `` (space star space).</div><div class='add'>+</div><div class='add'>+The function and type kernel-doc comments should be placed just before the</div><div class='add'>+function or type being described. The overview kernel-doc comments may be freely</div><div class='add'>+placed at the top indentation level.</div><div class='add'>+</div><div class='add'>+Example kernel-doc function comment::</div><div class='add'>+</div><div class='add'>+  /**</div><div class='add'>+   * foobar() - Brief description of foobar.</div><div class='add'>+   * @arg: Description of argument of foobar.</div><div class='add'>+   *</div><div class='add'>+   * Longer description of foobar.</div><div class='add'>+   *</div><div class='add'>+   * Return: Description of return value of foobar.</div><div class='add'>+   */</div><div class='add'>+  int foobar(int arg)</div><div class='add'>+</div><div class='add'>+The format is similar for documentation for structures, enums, paragraphs,</div><div class='add'>+etc. See the sections below for details.</div><div class='add'>+</div><div class='add'>+The kernel-doc structure is extracted from the comments, and proper `Sphinx C</div><div class='add'>+Domain`_ function and type descriptions with anchors are generated for them. The</div><div class='add'>+descriptions are filtered for special kernel-doc highlights and</div><div class='add'>+cross-references. See below for details.</div><div class='add'>+</div><div class='add'>+.. _Sphinx C Domain: http://www.sphinx-doc.org/en/stable/domains.html</div><div class='add'>+</div><div class='add'>+Highlights and cross-references</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+The following special patterns are recognized in the kernel-doc comment</div><div class='add'>+descriptive text and converted to proper reStructuredText markup and `Sphinx C</div><div class='add'>+Domain`_ references.</div><div class='add'>+</div><div class='add'>+.. attention:: The below are **only** recognized within kernel-doc comments,</div><div class='add'>+	       **not** within normal reStructuredText documents.</div><div class='add'>+</div><div class='add'>+``funcname()``</div><div class='add'>+  Function reference.</div><div class='add'>+</div><div class='add'>+``@parameter``</div><div class='add'>+  Name of a function parameter. (No cross-referencing, just formatting.)</div><div class='add'>+</div><div class='add'>+``%CONST``</div><div class='add'>+  Name of a constant. (No cross-referencing, just formatting.)</div><div class='add'>+</div><div class='add'>+``$ENVVAR``</div><div class='add'>+  Name of an environment variable. (No cross-referencing, just formatting.)</div><div class='add'>+</div><div class='add'>+``&amp;struct name``</div><div class='add'>+  Structure reference.</div><div class='add'>+</div><div class='add'>+``&amp;enum name``</div><div class='add'>+  Enum reference.</div><div class='add'>+</div><div class='add'>+``&amp;typedef name``</div><div class='add'>+  Typedef reference.</div><div class='add'>+</div><div class='add'>+``&amp;struct_name-&gt;member`` or ``&amp;struct_name.member``</div><div class='add'>+  Structure or union member reference. The cross-reference will be to the struct</div><div class='add'>+  or union definition, not the member directly.</div><div class='add'>+</div><div class='add'>+``&amp;name``</div><div class='add'>+  A generic type reference. Prefer using the full reference described above</div><div class='add'>+  instead. This is mostly for legacy comments.</div><div class='add'>+</div><div class='add'>+Cross-referencing from reStructuredText</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+To cross-reference the functions and types defined in the kernel-doc comments</div><div class='add'>+from reStructuredText documents, please use the `Sphinx C Domain`_</div><div class='add'>+references. For example::</div><div class='add'>+</div><div class='add'>+  See function :c:func:`foo` and struct/union/enum/typedef :c:type:`bar`.</div><div class='add'>+</div><div class='add'>+While the type reference works with just the type name, without the</div><div class='add'>+struct/union/enum/typedef part in front, you may want to use::</div><div class='add'>+</div><div class='add'>+  See :c:type:`struct foo &lt;foo&gt;`.</div><div class='add'>+  See :c:type:`union bar &lt;bar&gt;`.</div><div class='add'>+  See :c:type:`enum baz &lt;baz&gt;`.</div><div class='add'>+  See :c:type:`typedef meh &lt;meh&gt;`.</div><div class='add'>+</div><div class='add'>+This will produce prettier links, and is in line with how kernel-doc does the</div><div class='add'>+cross-references.</div><div class='add'>+</div><div class='add'>+For further details, please refer to the `Sphinx C Domain`_ documentation.</div><div class='add'>+</div><div class='add'>+Function documentation</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+The general format of a function and function-like macro kernel-doc comment is::</div><div class='add'>+</div><div class='add'>+  /**</div><div class='add'>+   * function_name() - Brief description of function.</div><div class='add'>+   * @arg1: Describe the first argument.</div><div class='add'>+   * @arg2: Describe the second argument.</div><div class='add'>+   *        One can provide multiple line descriptions</div><div class='add'>+   *        for arguments.</div><div class='add'>+   *</div><div class='add'>+   * A longer description, with more discussion of the function function_name()</div><div class='add'>+   * that might be useful to those using or modifying it. Begins with an</div><div class='add'>+   * empty comment line, and may include additional embedded empty</div><div class='add'>+   * comment lines.</div><div class='add'>+   *</div><div class='add'>+   * The longer description may have multiple paragraphs.</div><div class='add'>+   *</div><div class='add'>+   * Return: Describe the return value of foobar.</div><div class='add'>+   *</div><div class='add'>+   * The return value description can also have multiple paragraphs, and should</div><div class='add'>+   * be placed at the end of the comment block.</div><div class='add'>+   */</div><div class='add'>+</div><div class='add'>+The brief description following the function name may span multiple lines, and</div><div class='add'>+ends with an ``@argument:`` description, a blank comment line, or the end of the</div><div class='add'>+comment block.</div><div class='add'>+</div><div class='add'>+The kernel-doc function comments describe each parameter to the function, in</div><div class='add'>+order, with the ``@argument:`` descriptions. The ``@argument:`` descriptions</div><div class='add'>+must begin on the very next line following the opening brief function</div><div class='add'>+description line, with no intervening blank comment lines. The ``@argument:``</div><div class='add'>+descriptions may span multiple lines. The continuation lines may contain</div><div class='add'>+indentation. If a function parameter is ``...`` (varargs), it should be listed</div><div class='add'>+in kernel-doc notation as: ``@...:``.</div><div class='add'>+</div><div class='add'>+The return value, if any, should be described in a dedicated section at the end</div><div class='add'>+of the comment starting with "Return:".</div><div class='add'>+</div><div class='add'>+Structure, union, and enumeration documentation</div><div class='add'>+-----------------------------------------------</div><div class='add'>+</div><div class='add'>+The general format of a struct, union, and enum kernel-doc comment is::</div><div class='add'>+</div><div class='add'>+  /**</div><div class='add'>+   * struct struct_name - Brief description.</div><div class='add'>+   * @member_name: Description of member member_name.</div><div class='add'>+   *</div><div class='add'>+   * Description of the structure.</div><div class='add'>+   */</div><div class='add'>+</div><div class='add'>+Below, "struct" is used to mean structs, unions and enums, and "member" is used</div><div class='add'>+to mean struct and union members as well as enumerations in an enum.</div><div class='add'>+</div><div class='add'>+The brief description following the structure name may span multiple lines, and</div><div class='add'>+ends with a ``@member:`` description, a blank comment line, or the end of the</div><div class='add'>+comment block.</div><div class='add'>+</div><div class='add'>+The kernel-doc data structure comments describe each member of the structure, in</div><div class='add'>+order, with the ``@member:`` descriptions. The ``@member:`` descriptions must</div><div class='add'>+begin on the very next line following the opening brief function description</div><div class='add'>+line, with no intervening blank comment lines. The ``@member:`` descriptions may</div><div class='add'>+span multiple lines. The continuation lines may contain indentation.</div><div class='add'>+</div><div class='add'>+In-line member documentation comments</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The structure members may also be documented in-line within the definition.</div><div class='add'>+There are two styles, single-line comments where both the opening ``/**`` and</div><div class='add'>+closing ``*/`` are on the same line, and multi-line comments where they are each</div><div class='add'>+on a line of their own, like all other kernel-doc comments::</div><div class='add'>+</div><div class='add'>+  /**</div><div class='add'>+   * struct foo - Brief description.</div><div class='add'>+   * @foo: The Foo member.</div><div class='add'>+   */</div><div class='add'>+  struct foo {</div><div class='add'>+        int foo;</div><div class='add'>+        /**</div><div class='add'>+         * @bar: The Bar member.</div><div class='add'>+         */</div><div class='add'>+        int bar;</div><div class='add'>+        /**</div><div class='add'>+         * @baz: The Baz member.</div><div class='add'>+         *</div><div class='add'>+         * Here, the member description may contain several paragraphs.</div><div class='add'>+         */</div><div class='add'>+        int baz;</div><div class='add'>+        /** @foobar: Single line description. */</div><div class='add'>+        int foobar;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+Private members</div><div class='add'>+~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Inside a struct description, you can use the "private:" and "public:" comment</div><div class='add'>+tags. Structure fields that are inside a "private:" area are not listed in the</div><div class='add'>+generated output documentation.  The "private:" and "public:" tags must begin</div><div class='add'>+immediately following a ``/*`` comment marker.  They may optionally include</div><div class='add'>+comments between the ``:`` and the ending ``*/`` marker.</div><div class='add'>+</div><div class='add'>+Example::</div><div class='add'>+</div><div class='add'>+  /**</div><div class='add'>+   * struct my_struct - short description</div><div class='add'>+   * @a: first member</div><div class='add'>+   * @b: second member</div><div class='add'>+   *</div><div class='add'>+   * Longer description</div><div class='add'>+   */</div><div class='add'>+  struct my_struct {</div><div class='add'>+      int a;</div><div class='add'>+      int b;</div><div class='add'>+  /* private: internal use only */</div><div class='add'>+      int c;</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Typedef documentation</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The general format of a typedef kernel-doc comment is::</div><div class='add'>+</div><div class='add'>+  /**</div><div class='add'>+   * typedef type_name - Brief description.</div><div class='add'>+   *</div><div class='add'>+   * Description of the type.</div><div class='add'>+   */</div><div class='add'>+</div><div class='add'>+Overview documentation comments</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+To facilitate having source code and comments close together, you can include</div><div class='add'>+kernel-doc documentation blocks that are free-form comments instead of being</div><div class='add'>+kernel-doc for functions, structures, unions, enums, or typedefs. This could be</div><div class='add'>+used for something like a theory of operation for a driver or library code, for</div><div class='add'>+example.</div><div class='add'>+</div><div class='add'>+This is done by using a ``DOC:`` section keyword with a section title.</div><div class='add'>+</div><div class='add'>+The general format of an overview or high-level documentation comment is::</div><div class='add'>+</div><div class='add'>+  /**</div><div class='add'>+   * DOC: Theory of Operation</div><div class='add'>+   *</div><div class='add'>+   * The whizbang foobar is a dilly of a gizmo. It can do whatever you</div><div class='add'>+   * want it to do, at any time. It reads your mind. Here's how it works.</div><div class='add'>+   *</div><div class='add'>+   * foo bar splat</div><div class='add'>+   *</div><div class='add'>+   * The only drawback to this gizmo is that is can sometimes damage</div><div class='add'>+   * hardware, software, or its subject(s).</div><div class='add'>+   */</div><div class='add'>+</div><div class='add'>+The title following ``DOC:`` acts as a heading within the source file, but also</div><div class='add'>+as an identifier for extracting the documentation comment. Thus, the title must</div><div class='add'>+be unique within the file.</div><div class='add'>+</div><div class='add'>+Recommendations</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+We definitely need kernel-doc formatted documentation for functions that are</div><div class='add'>+exported to loadable modules using ``EXPORT_SYMBOL`` or ``EXPORT_SYMBOL_GPL``.</div><div class='add'>+</div><div class='add'>+We also look to provide kernel-doc formatted documentation for functions</div><div class='add'>+externally visible to other kernel files (not marked "static").</div><div class='add'>+</div><div class='add'>+We also recommend providing kernel-doc formatted documentation for private (file</div><div class='add'>+"static") routines, for consistency of kernel source code layout. But this is</div><div class='add'>+lower priority and at the discretion of the MAINTAINER of that kernel source</div><div class='add'>+file.</div><div class='add'>+</div><div class='add'>+Data structures visible in kernel include files should also be documented using</div><div class='add'>+kernel-doc formatted comments.</div><div class='head'>diff --git a/Documentation/doc-guide/parse-headers.rst b/Documentation/doc-guide/parse-headers.rst<br/>new file mode 100644<br/>index 000000000000..96a0423d5dba<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/doc-guide/parse-headers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/parse-headers.rst</a></div><div class='hunk'>@@ -0,0 +1,192 @@</div><div class='add'>+===========================</div><div class='add'>+Including uAPI header files</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+Sometimes, it is useful to include header files and C example codes in</div><div class='add'>+order to describe the userspace API and to generate cross-references</div><div class='add'>+between the code and the documentation. Adding cross-references for</div><div class='add'>+userspace API files has an additional vantage: Sphinx will generate warnings</div><div class='add'>+if a symbol is not found at the documentation. That helps to keep the</div><div class='add'>+uAPI documentation in sync with the Kernel changes.</div><div class='add'>+The :ref:`parse_headers.pl &lt;parse_headers&gt;` provide a way to generate such</div><div class='add'>+cross-references. It has to be called via Makefile, while building the</div><div class='add'>+documentation. Please see ``Documentation/media/Makefile`` for an example</div><div class='add'>+about how to use it inside the Kernel tree.</div><div class='add'>+</div><div class='add'>+.. _parse_headers:</div><div class='add'>+</div><div class='add'>+parse_headers.pl</div><div class='add'>+^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+NAME</div><div class='add'>+****</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+parse_headers.pl - parse a C file, in order to identify functions, structs,</div><div class='add'>+enums and defines and create cross-references to a Sphinx book.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+SYNOPSIS</div><div class='add'>+********</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+\ **parse_headers.pl**\  [&lt;options&gt;] &lt;C_FILE&gt; &lt;OUT_FILE&gt; [&lt;EXCEPTIONS_FILE&gt;]</div><div class='add'>+</div><div class='add'>+Where &lt;options&gt; can be: --debug, --help or --man.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+OPTIONS</div><div class='add'>+*******</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+\ **--debug**\</div><div class='add'>+</div><div class='add'>+ Put the script in verbose mode, useful for debugging.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+\ **--usage**\</div><div class='add'>+</div><div class='add'>+ Prints a brief help message and exits.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+\ **--help**\</div><div class='add'>+</div><div class='add'>+ Prints a more detailed help message and exits.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DESCRIPTION</div><div class='add'>+***********</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Convert a C header or source file (C_FILE), into a ReStructured Text</div><div class='add'>+included via ..parsed-literal block with cross-references for the</div><div class='add'>+documentation files that describe the API. It accepts an optional</div><div class='add'>+EXCEPTIONS_FILE with describes what elements will be either ignored or</div><div class='add'>+be pointed to a non-default reference.</div><div class='add'>+</div><div class='add'>+The output is written at the (OUT_FILE).</div><div class='add'>+</div><div class='add'>+It is capable of identifying defines, functions, structs, typedefs,</div><div class='add'>+enums and enum symbols and create cross-references for all of them.</div><div class='add'>+It is also capable of distinguish #define used for specifying a Linux</div><div class='add'>+ioctl.</div><div class='add'>+</div><div class='add'>+The EXCEPTIONS_FILE contain two types of statements: \ **ignore**\  or \ **replace**\ .</div><div class='add'>+</div><div class='add'>+The syntax for the ignore tag is:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ignore \ **type**\  \ **name**\</div><div class='add'>+</div><div class='add'>+The \ **ignore**\  means that it won't generate cross references for a</div><div class='add'>+\ **name**\  symbol of type \ **type**\ .</div><div class='add'>+</div><div class='add'>+The syntax for the replace tag is:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+replace \ **type**\  \ **name**\  \ **new_value**\</div><div class='add'>+</div><div class='add'>+The \ **replace**\  means that it will generate cross references for a</div><div class='add'>+\ **name**\  symbol of type \ **type**\ , but, instead of using the default</div><div class='add'>+replacement rule, it will use \ **new_value**\ .</div><div class='add'>+</div><div class='add'>+For both statements, \ **type**\  can be either one of the following:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+\ **ioctl**\</div><div class='add'>+</div><div class='add'>+ The ignore or replace statement will apply to ioctl definitions like:</div><div class='add'>+</div><div class='add'>+ #define	VIDIOC_DBG_S_REGISTER 	 _IOW('V', 79, struct v4l2_dbg_register)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+\ **define**\</div><div class='add'>+</div><div class='add'>+ The ignore or replace statement will apply to any other #define found</div><div class='add'>+ at C_FILE.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+\ **typedef**\</div><div class='add'>+</div><div class='add'>+ The ignore or replace statement will apply to typedef statements at C_FILE.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+\ **struct**\</div><div class='add'>+</div><div class='add'>+ The ignore or replace statement will apply to the name of struct statements</div><div class='add'>+ at C_FILE.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+\ **enum**\</div><div class='add'>+</div><div class='add'>+ The ignore or replace statement will apply to the name of enum statements</div><div class='add'>+ at C_FILE.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+\ **symbol**\</div><div class='add'>+</div><div class='add'>+ The ignore or replace statement will apply to the name of enum statements</div><div class='add'>+ at C_FILE.</div><div class='add'>+</div><div class='add'>+ For replace statements, \ **new_value**\  will automatically use :c:type:</div><div class='add'>+ references for \ **typedef**\ , \ **enum**\  and \ **struct**\  types. It will use :ref:</div><div class='add'>+ for \ **ioctl**\ , \ **define**\  and \ **symbol**\  types. The type of reference can</div><div class='add'>+ also be explicitly defined at the replace statement.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+EXAMPLES</div><div class='add'>+********</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ignore define _VIDEODEV2_H</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Ignore a #define _VIDEODEV2_H at the C_FILE.</div><div class='add'>+</div><div class='add'>+ignore symbol PRIVATE</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+On a struct like:</div><div class='add'>+</div><div class='add'>+enum foo { BAR1, BAR2, PRIVATE };</div><div class='add'>+</div><div class='add'>+It won't generate cross-references for \ **PRIVATE**\ .</div><div class='add'>+</div><div class='add'>+replace symbol BAR1 :c:type:\`foo\`</div><div class='add'>+replace symbol BAR2 :c:type:\`foo\`</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+On a struct like:</div><div class='add'>+</div><div class='add'>+enum foo { BAR1, BAR2, PRIVATE };</div><div class='add'>+</div><div class='add'>+It will make the BAR1 and BAR2 enum symbols to cross reference the foo</div><div class='add'>+symbol at the C domain.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+BUGS</div><div class='add'>+****</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Report bugs to Mauro Carvalho Chehab &lt;mchehab@s-opensource.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+COPYRIGHT</div><div class='add'>+*********</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Copyright (c) 2016 by Mauro Carvalho Chehab &lt;mchehab@s-opensource.com&gt;.</div><div class='add'>+</div><div class='add'>+License GPLv2: GNU GPL version 2 &lt;http://gnu.org/licenses/gpl.html&gt;.</div><div class='add'>+</div><div class='add'>+This is free software: you are free to change and redistribute it.</div><div class='add'>+There is NO WARRANTY, to the extent permitted by law.</div><div class='head'>diff --git a/Documentation/doc-guide/sphinx.rst b/Documentation/doc-guide/sphinx.rst<br/>new file mode 100644<br/>index 000000000000..96fe7ccb2c67<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/doc-guide/sphinx.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/doc-guide/sphinx.rst</a></div><div class='hunk'>@@ -0,0 +1,219 @@</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+The Linux kernel uses `Sphinx`_ to generate pretty documentation from</div><div class='add'>+`reStructuredText`_ files under ``Documentation``. To build the documentation in</div><div class='add'>+HTML or PDF formats, use ``make htmldocs`` or ``make pdfdocs``. The generated</div><div class='add'>+documentation is placed in ``Documentation/output``.</div><div class='add'>+</div><div class='add'>+.. _Sphinx: http://www.sphinx-doc.org/</div><div class='add'>+.. _reStructuredText: http://docutils.sourceforge.net/rst.html</div><div class='add'>+</div><div class='add'>+The reStructuredText files may contain directives to include structured</div><div class='add'>+documentation comments, or kernel-doc comments, from source files. Usually these</div><div class='add'>+are used to describe the functions and types and design of the code. The</div><div class='add'>+kernel-doc comments have some special structure and formatting, but beyond that</div><div class='add'>+they are also treated as reStructuredText.</div><div class='add'>+</div><div class='add'>+There is also the deprecated DocBook toolchain to generate documentation from</div><div class='add'>+DocBook XML template files under ``Documentation/DocBook``. The DocBook files</div><div class='add'>+are to be converted to reStructuredText, and the toolchain is slated to be</div><div class='add'>+removed.</div><div class='add'>+</div><div class='add'>+Finally, there are thousands of plain text documentation files scattered around</div><div class='add'>+``Documentation``. Some of these will likely be converted to reStructuredText</div><div class='add'>+over time, but the bulk of them will remain in plain text.</div><div class='add'>+</div><div class='add'>+Sphinx Build</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+The usual way to generate the documentation is to run ``make htmldocs`` or</div><div class='add'>+``make pdfdocs``. There are also other formats available, see the documentation</div><div class='add'>+section of ``make help``. The generated documentation is placed in</div><div class='add'>+format-specific subdirectories under ``Documentation/output``.</div><div class='add'>+</div><div class='add'>+To generate documentation, Sphinx (``sphinx-build``) must obviously be</div><div class='add'>+installed. For prettier HTML output, the Read the Docs Sphinx theme</div><div class='add'>+(``sphinx_rtd_theme``) is used if available. For PDF output, ``rst2pdf`` is also</div><div class='add'>+needed. All of these are widely available and packaged in distributions.</div><div class='add'>+</div><div class='add'>+To pass extra options to Sphinx, you can use the ``SPHINXOPTS`` make</div><div class='add'>+variable. For example, use ``make SPHINXOPTS=-v htmldocs`` to get more verbose</div><div class='add'>+output.</div><div class='add'>+</div><div class='add'>+To remove the generated documentation, run ``make cleandocs``.</div><div class='add'>+</div><div class='add'>+Writing Documentation</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+Adding new documentation can be as simple as:</div><div class='add'>+</div><div class='add'>+1. Add a new ``.rst`` file somewhere under ``Documentation``.</div><div class='add'>+2. Refer to it from the Sphinx main `TOC tree`_ in ``Documentation/index.rst``.</div><div class='add'>+</div><div class='add'>+.. _TOC tree: http://www.sphinx-doc.org/en/stable/markup/toctree.html</div><div class='add'>+</div><div class='add'>+This is usually good enough for simple documentation (like the one you're</div><div class='add'>+reading right now), but for larger documents it may be advisable to create a</div><div class='add'>+subdirectory (or use an existing one). For example, the graphics subsystem</div><div class='add'>+documentation is under ``Documentation/gpu``, split to several ``.rst`` files,</div><div class='add'>+and has a separate ``index.rst`` (with a ``toctree`` of its own) referenced from</div><div class='add'>+the main index.</div><div class='add'>+</div><div class='add'>+See the documentation for `Sphinx`_ and `reStructuredText`_ on what you can do</div><div class='add'>+with them. In particular, the Sphinx `reStructuredText Primer`_ is a good place</div><div class='add'>+to get started with reStructuredText. There are also some `Sphinx specific</div><div class='add'>+markup constructs`_.</div><div class='add'>+</div><div class='add'>+.. _reStructuredText Primer: http://www.sphinx-doc.org/en/stable/rest.html</div><div class='add'>+.. _Sphinx specific markup constructs: http://www.sphinx-doc.org/en/stable/markup/index.html</div><div class='add'>+</div><div class='add'>+Specific guidelines for the kernel documentation</div><div class='add'>+------------------------------------------------</div><div class='add'>+</div><div class='add'>+Here are some specific guidelines for the kernel documentation:</div><div class='add'>+</div><div class='add'>+* Please don't go overboard with reStructuredText markup. Keep it simple.</div><div class='add'>+</div><div class='add'>+* Please stick to this order of heading adornments:</div><div class='add'>+</div><div class='add'>+  1. ``=`` with overline for document title::</div><div class='add'>+</div><div class='add'>+       ==============</div><div class='add'>+       Document title</div><div class='add'>+       ==============</div><div class='add'>+</div><div class='add'>+  2. ``=`` for chapters::</div><div class='add'>+</div><div class='add'>+       Chapters</div><div class='add'>+       ========</div><div class='add'>+</div><div class='add'>+  3. ``-`` for sections::</div><div class='add'>+</div><div class='add'>+       Section</div><div class='add'>+       -------</div><div class='add'>+</div><div class='add'>+  4. ``~`` for subsections::</div><div class='add'>+</div><div class='add'>+       Subsection</div><div class='add'>+       ~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+  Although RST doesn't mandate a specific order ("Rather than imposing a fixed</div><div class='add'>+  number and order of section title adornment styles, the order enforced will be</div><div class='add'>+  the order as encountered."), having the higher levels the same overall makes</div><div class='add'>+  it easier to follow the documents.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+the C domain</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+The `Sphinx C Domain`_ (name c) is suited for documentation of C API. E.g. a</div><div class='add'>+function prototype:</div><div class='add'>+</div><div class='add'>+.. code-block:: rst</div><div class='add'>+</div><div class='add'>+    .. c:function:: int ioctl( int fd, int request )</div><div class='add'>+</div><div class='add'>+The C domain of the kernel-doc has some additional features. E.g. you can</div><div class='add'>+*rename* the reference name of a function with a common name like ``open`` or</div><div class='add'>+``ioctl``:</div><div class='add'>+</div><div class='add'>+.. code-block:: rst</div><div class='add'>+</div><div class='add'>+     .. c:function:: int ioctl( int fd, int request )</div><div class='add'>+        :name: VIDIOC_LOG_STATUS</div><div class='add'>+</div><div class='add'>+The func-name (e.g. ioctl) remains in the output but the ref-name changed from</div><div class='add'>+``ioctl`` to ``VIDIOC_LOG_STATUS``. The index entry for this function is also</div><div class='add'>+changed to ``VIDIOC_LOG_STATUS`` and the function can now referenced by:</div><div class='add'>+</div><div class='add'>+.. code-block:: rst</div><div class='add'>+</div><div class='add'>+     :c:func:`VIDIOC_LOG_STATUS`</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+list tables</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+We recommend the use of *list table* formats. The *list table* formats are</div><div class='add'>+double-stage lists. Compared to the ASCII-art they might not be as</div><div class='add'>+comfortable for</div><div class='add'>+readers of the text files. Their advantage is that they are easy to</div><div class='add'>+create or modify and that the diff of a modification is much more meaningful,</div><div class='add'>+because it is limited to the modified content.</div><div class='add'>+</div><div class='add'>+The ``flat-table`` is a double-stage list similar to the ``list-table`` with</div><div class='add'>+some additional features:</div><div class='add'>+</div><div class='add'>+* column-span: with the role ``cspan`` a cell can be extended through</div><div class='add'>+  additional columns</div><div class='add'>+</div><div class='add'>+* row-span: with the role ``rspan`` a cell can be extended through</div><div class='add'>+  additional rows</div><div class='add'>+</div><div class='add'>+* auto span rightmost cell of a table row over the missing cells on the right</div><div class='add'>+  side of that table-row.  With Option ``:fill-cells:`` this behavior can</div><div class='add'>+  changed from *auto span* to *auto fill*, which automatically inserts (empty)</div><div class='add'>+  cells instead of spanning the last cell.</div><div class='add'>+</div><div class='add'>+options:</div><div class='add'>+</div><div class='add'>+* ``:header-rows:``   [int] count of header rows</div><div class='add'>+* ``:stub-columns:``  [int] count of stub columns</div><div class='add'>+* ``:widths:``        [[int] [int] ... ] widths of columns</div><div class='add'>+* ``:fill-cells:``    instead of auto-spanning missing cells, insert missing cells</div><div class='add'>+</div><div class='add'>+roles:</div><div class='add'>+</div><div class='add'>+* ``:cspan:`` [int] additional columns (*morecols*)</div><div class='add'>+* ``:rspan:`` [int] additional rows (*morerows*)</div><div class='add'>+</div><div class='add'>+The example below shows how to use this markup.  The first level of the staged</div><div class='add'>+list is the *table-row*. In the *table-row* there is only one markup allowed,</div><div class='add'>+the list of the cells in this *table-row*. Exceptions are *comments* ( ``..`` )</div><div class='add'>+and *targets* (e.g. a ref to ``:ref:`last row &lt;last row&gt;``` / :ref:`last row</div><div class='add'>+&lt;last row&gt;`).</div><div class='add'>+</div><div class='add'>+.. code-block:: rst</div><div class='add'>+</div><div class='add'>+   .. flat-table:: table title</div><div class='add'>+      :widths: 2 1 1 3</div><div class='add'>+</div><div class='add'>+      * - head col 1</div><div class='add'>+        - head col 2</div><div class='add'>+        - head col 3</div><div class='add'>+        - head col 4</div><div class='add'>+</div><div class='add'>+      * - column 1</div><div class='add'>+        - field 1.1</div><div class='add'>+        - field 1.2 with autospan</div><div class='add'>+</div><div class='add'>+      * - column 2</div><div class='add'>+        - field 2.1</div><div class='add'>+        - :rspan:`1` :cspan:`1` field 2.2 - 3.3</div><div class='add'>+</div><div class='add'>+      * .. _`last row`:</div><div class='add'>+</div><div class='add'>+        - column 3</div><div class='add'>+</div><div class='add'>+Rendered as:</div><div class='add'>+</div><div class='add'>+   .. flat-table:: table title</div><div class='add'>+      :widths: 2 1 1 3</div><div class='add'>+</div><div class='add'>+      * - head col 1</div><div class='add'>+        - head col 2</div><div class='add'>+        - head col 3</div><div class='add'>+        - head col 4</div><div class='add'>+</div><div class='add'>+      * - column 1</div><div class='add'>+        - field 1.1</div><div class='add'>+        - field 1.2 with autospan</div><div class='add'>+</div><div class='add'>+      * - column 2</div><div class='add'>+        - field 2.1</div><div class='add'>+        - :rspan:`1` :cspan:`1` field 2.2 - 3.3</div><div class='add'>+</div><div class='add'>+      * .. _`last row`:</div><div class='add'>+</div><div class='add'>+        - column 3</div><div class='head'>diff --git a/Documentation/dontdiff b/Documentation/dontdiff<br/>index 5385cba941d2..77b92221f951 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/dontdiff?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/dontdiff</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/dontdiff?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/dontdiff</a></div><div class='hunk'>@@ -116,9 +116,11 @@ crc32table.h*</div><div class='ctx'> cscope.*</div><div class='ctx'> defkeymap.c</div><div class='ctx'> devlist.h*</div><div class='add'>+devicetable-offsets.h</div><div class='ctx'> dnotify_test</div><div class='ctx'> docproc</div><div class='ctx'> dslm</div><div class='add'>+dtc</div><div class='ctx'> elf2ecoff</div><div class='ctx'> elfconfig.h*</div><div class='ctx'> evergreen_reg_safe.h</div><div class='hunk'>@@ -139,7 +141,6 @@ hpet_example</div><div class='ctx'> hugepage-mmap</div><div class='ctx'> hugepage-shm</div><div class='ctx'> ihex2fw</div><div class='del'>-ikconfig.h*</div><div class='ctx'> inat-tables.c</div><div class='ctx'> initramfs_list</div><div class='ctx'> int16.c</div><div class='hunk'>@@ -154,8 +155,8 @@ keywords.c</div><div class='ctx'> ksym.c*</div><div class='ctx'> ksym.h*</div><div class='ctx'> kxgettext</div><div class='del'>-lex.c</div><div class='del'>-lex.*.c</div><div class='add'>+*lex.c</div><div class='add'>+*lex.*.c</div><div class='ctx'> linux</div><div class='ctx'> logo_*.c</div><div class='ctx'> logo_*_clut224.c</div><div class='hunk'>@@ -216,6 +217,7 @@ series</div><div class='ctx'> setup</div><div class='ctx'> setup.bin</div><div class='ctx'> setup.elf</div><div class='add'>+sortextable</div><div class='ctx'> sImage</div><div class='ctx'> sm_tbl*</div><div class='ctx'> split-include</div><div class='head'>diff --git a/Documentation/80211/cfg80211.rst b/Documentation/driver-api/80211/cfg80211.rst<br/>index b1e149ea6fee..eca534ab6172 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/80211/cfg80211.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/80211/cfg80211.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/80211/cfg80211.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/cfg80211.rst</a></div><div class='hunk'>@@ -45,6 +45,9 @@ Device registration</div><div class='ctx'>    :functions: wiphy_new</div><div class='ctx'> </div><div class='ctx'> .. kernel-doc:: include/net/cfg80211.h</div><div class='add'>+   :functions: wiphy_read_of_freq_limits</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/net/cfg80211.h</div><div class='ctx'>    :functions: wiphy_register</div><div class='ctx'> </div><div class='ctx'> .. kernel-doc:: include/net/cfg80211.h</div><div class='head'>diff --git a/Documentation/driver-api/80211/conf.py b/Documentation/driver-api/80211/conf.py<br/>new file mode 100644<br/>index 000000000000..4424b4b0b9c3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/80211/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/conf.py</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# -*- coding: utf-8; mode: python -*-</div><div class='add'>+</div><div class='add'>+project = "Linux 802.11 Driver Developer's Guide"</div><div class='add'>+</div><div class='add'>+tags.add("subproject")</div><div class='add'>+</div><div class='add'>+latex_documents = [</div><div class='add'>+    ('index', '80211.tex', project,</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+]</div><div class='head'>diff --git a/Documentation/driver-api/80211/index.rst b/Documentation/driver-api/80211/index.rst<br/>new file mode 100644<br/>index 000000000000..af210859d3e1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/80211/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/index.rst</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+=====================================</div><div class='add'>+Linux 802.11 Driver Developer's Guide</div><div class='add'>+=====================================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+</div><div class='add'>+   introduction</div><div class='add'>+   cfg80211</div><div class='add'>+   mac80211</div><div class='add'>+   mac80211-advanced</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/80211/introduction.rst b/Documentation/driver-api/80211/introduction.rst<br/>index 4938fa87691c..4938fa87691c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/80211/introduction.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/80211/introduction.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/80211/introduction.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/introduction.rst</a></div><div class='head'>diff --git a/Documentation/80211/mac80211-advanced.rst b/Documentation/driver-api/80211/mac80211-advanced.rst<br/>index 70a89b2163c2..70a89b2163c2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/80211/mac80211-advanced.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/80211/mac80211-advanced.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/80211/mac80211-advanced.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/mac80211-advanced.rst</a></div><div class='head'>diff --git a/Documentation/80211/mac80211.rst b/Documentation/driver-api/80211/mac80211.rst<br/>index 85a8335e80b6..85a8335e80b6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/80211/mac80211.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/80211/mac80211.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/80211/mac80211.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/80211/mac80211.rst</a></div><div class='head'>diff --git a/Documentation/driver-api/conf.py b/Documentation/driver-api/conf.py<br/>new file mode 100644<br/>index 000000000000..202726d20088<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/conf.py</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# -*- coding: utf-8; mode: python -*-</div><div class='add'>+</div><div class='add'>+project = "The Linux driver implementer's API guide"</div><div class='add'>+</div><div class='add'>+tags.add("subproject")</div><div class='add'>+</div><div class='add'>+latex_documents = [</div><div class='add'>+    ('index', 'driver-api.tex', project,</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+]</div><div class='head'>diff --git a/Documentation/driver-api/device-io.rst b/Documentation/driver-api/device-io.rst<br/>new file mode 100644<br/>index 000000000000..b00b23903078<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/device-io.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/device-io.rst</a></div><div class='hunk'>@@ -0,0 +1,201 @@</div><div class='add'>+.. Copyright 2001 Matthew Wilcox</div><div class='add'>+..</div><div class='add'>+..     This documentation is free software; you can redistribute</div><div class='add'>+..     it and/or modify it under the terms of the GNU General Public</div><div class='add'>+..     License as published by the Free Software Foundation; either</div><div class='add'>+..     version 2 of the License, or (at your option) any later</div><div class='add'>+..     version.</div><div class='add'>+</div><div class='add'>+===============================</div><div class='add'>+Bus-Independent Device Accesses</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+:Author: Matthew Wilcox</div><div class='add'>+:Author: Alan Cox</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+Linux provides an API which abstracts performing IO across all busses</div><div class='add'>+and devices, allowing device drivers to be written independently of bus</div><div class='add'>+type.</div><div class='add'>+</div><div class='add'>+Memory Mapped IO</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+Getting Access to the Device</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+The most widely supported form of IO is memory mapped IO. That is, a</div><div class='add'>+part of the CPU's address space is interpreted not as accesses to</div><div class='add'>+memory, but as accesses to a device. Some architectures define devices</div><div class='add'>+to be at a fixed address, but most have some method of discovering</div><div class='add'>+devices. The PCI bus walk is a good example of such a scheme. This</div><div class='add'>+document does not cover how to receive such an address, but assumes you</div><div class='add'>+are starting with one. Physical addresses are of type unsigned long.</div><div class='add'>+</div><div class='add'>+This address should not be used directly. Instead, to get an address</div><div class='add'>+suitable for passing to the accessor functions described below, you</div><div class='add'>+should call :c:func:`ioremap()`. An address suitable for accessing</div><div class='add'>+the device will be returned to you.</div><div class='add'>+</div><div class='add'>+After you've finished using the device (say, in your module's exit</div><div class='add'>+routine), call :c:func:`iounmap()` in order to return the address</div><div class='add'>+space to the kernel. Most architectures allocate new address space each</div><div class='add'>+time you call :c:func:`ioremap()`, and they can run out unless you</div><div class='add'>+call :c:func:`iounmap()`.</div><div class='add'>+</div><div class='add'>+Accessing the device</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+The part of the interface most used by drivers is reading and writing</div><div class='add'>+memory-mapped registers on the device. Linux provides interfaces to read</div><div class='add'>+and write 8-bit, 16-bit, 32-bit and 64-bit quantities. Due to a</div><div class='add'>+historical accident, these are named byte, word, long and quad accesses.</div><div class='add'>+Both read and write accesses are supported; there is no prefetch support</div><div class='add'>+at this time.</div><div class='add'>+</div><div class='add'>+The functions are named readb(), readw(), readl(), readq(),</div><div class='add'>+readb_relaxed(), readw_relaxed(), readl_relaxed(), readq_relaxed(),</div><div class='add'>+writeb(), writew(), writel() and writeq().</div><div class='add'>+</div><div class='add'>+Some devices (such as framebuffers) would like to use larger transfers than</div><div class='add'>+8 bytes at a time. For these devices, the :c:func:`memcpy_toio()`,</div><div class='add'>+:c:func:`memcpy_fromio()` and :c:func:`memset_io()` functions are</div><div class='add'>+provided. Do not use memset or memcpy on IO addresses; they are not</div><div class='add'>+guaranteed to copy data in order.</div><div class='add'>+</div><div class='add'>+The read and write functions are defined to be ordered. That is the</div><div class='add'>+compiler is not permitted to reorder the I/O sequence. When the ordering</div><div class='add'>+can be compiler optimised, you can use __readb() and friends to</div><div class='add'>+indicate the relaxed ordering. Use this with care.</div><div class='add'>+</div><div class='add'>+While the basic functions are defined to be synchronous with respect to</div><div class='add'>+each other and ordered with respect to each other the busses the devices</div><div class='add'>+sit on may themselves have asynchronicity. In particular many authors</div><div class='add'>+are burned by the fact that PCI bus writes are posted asynchronously. A</div><div class='add'>+driver author must issue a read from the same device to ensure that</div><div class='add'>+writes have occurred in the specific cases the author cares. This kind</div><div class='add'>+of property cannot be hidden from driver writers in the API. In some</div><div class='add'>+cases, the read used to flush the device may be expected to fail (if the</div><div class='add'>+card is resetting, for example). In that case, the read should be done</div><div class='add'>+from config space, which is guaranteed to soft-fail if the card doesn't</div><div class='add'>+respond.</div><div class='add'>+</div><div class='add'>+The following is an example of flushing a write to a device when the</div><div class='add'>+driver would like to ensure the write's effects are visible prior to</div><div class='add'>+continuing execution::</div><div class='add'>+</div><div class='add'>+    static inline void</div><div class='add'>+    qla1280_disable_intrs(struct scsi_qla_host *ha)</div><div class='add'>+    {</div><div class='add'>+        struct device_reg *reg;</div><div class='add'>+</div><div class='add'>+        reg = ha-&gt;iobase;</div><div class='add'>+        /* disable risc and host interrupts */</div><div class='add'>+        WRT_REG_WORD(&amp;reg-&gt;ictrl, 0);</div><div class='add'>+        /*</div><div class='add'>+         * The following read will ensure that the above write</div><div class='add'>+         * has been received by the device before we return from this</div><div class='add'>+         * function.</div><div class='add'>+         */</div><div class='add'>+        RD_REG_WORD(&amp;reg-&gt;ictrl);</div><div class='add'>+        ha-&gt;flags.ints_enabled = 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+In addition to write posting, on some large multiprocessing systems</div><div class='add'>+(e.g. SGI Challenge, Origin and Altix machines) posted writes won't be</div><div class='add'>+strongly ordered coming from different CPUs. Thus it's important to</div><div class='add'>+properly protect parts of your driver that do memory-mapped writes with</div><div class='add'>+locks and use the :c:func:`mmiowb()` to make sure they arrive in the</div><div class='add'>+order intended. Issuing a regular readX() will also ensure write ordering,</div><div class='add'>+but should only be used when the </div><div class='add'>+driver has to be sure that the write has actually arrived at the device</div><div class='add'>+(not that it's simply ordered with respect to other writes), since a</div><div class='add'>+full readX() is a relatively expensive operation.</div><div class='add'>+</div><div class='add'>+Generally, one should use :c:func:`mmiowb()` prior to releasing a spinlock</div><div class='add'>+that protects regions using :c:func:`writeb()` or similar functions that</div><div class='add'>+aren't surrounded by readb() calls, which will ensure ordering</div><div class='add'>+and flushing. The following pseudocode illustrates what might occur if</div><div class='add'>+write ordering isn't guaranteed via :c:func:`mmiowb()` or one of the</div><div class='add'>+readX() functions::</div><div class='add'>+</div><div class='add'>+    CPU A:  spin_lock_irqsave(&amp;dev_lock, flags)</div><div class='add'>+    CPU A:  ...</div><div class='add'>+    CPU A:  writel(newval, ring_ptr);</div><div class='add'>+    CPU A:  spin_unlock_irqrestore(&amp;dev_lock, flags)</div><div class='add'>+            ...</div><div class='add'>+    CPU B:  spin_lock_irqsave(&amp;dev_lock, flags)</div><div class='add'>+    CPU B:  writel(newval2, ring_ptr);</div><div class='add'>+    CPU B:  ...</div><div class='add'>+    CPU B:  spin_unlock_irqrestore(&amp;dev_lock, flags)</div><div class='add'>+</div><div class='add'>+In the case above, newval2 could be written to ring_ptr before newval.</div><div class='add'>+Fixing it is easy though::</div><div class='add'>+</div><div class='add'>+    CPU A:  spin_lock_irqsave(&amp;dev_lock, flags)</div><div class='add'>+    CPU A:  ...</div><div class='add'>+    CPU A:  writel(newval, ring_ptr);</div><div class='add'>+    CPU A:  mmiowb(); /* ensure no other writes beat us to the device */</div><div class='add'>+    CPU A:  spin_unlock_irqrestore(&amp;dev_lock, flags)</div><div class='add'>+            ...</div><div class='add'>+    CPU B:  spin_lock_irqsave(&amp;dev_lock, flags)</div><div class='add'>+    CPU B:  writel(newval2, ring_ptr);</div><div class='add'>+    CPU B:  ...</div><div class='add'>+    CPU B:  mmiowb();</div><div class='add'>+    CPU B:  spin_unlock_irqrestore(&amp;dev_lock, flags)</div><div class='add'>+</div><div class='add'>+See tg3.c for a real world example of how to use :c:func:`mmiowb()`</div><div class='add'>+</div><div class='add'>+PCI ordering rules also guarantee that PIO read responses arrive after any</div><div class='add'>+outstanding DMA writes from that bus, since for some devices the result of</div><div class='add'>+a readb() call may signal to the driver that a DMA transaction is</div><div class='add'>+complete. In many cases, however, the driver may want to indicate that the</div><div class='add'>+next readb() call has no relation to any previous DMA writes</div><div class='add'>+performed by the device. The driver can use readb_relaxed() for</div><div class='add'>+these cases, although only some platforms will honor the relaxed</div><div class='add'>+semantics. Using the relaxed read functions will provide significant</div><div class='add'>+performance benefits on platforms that support it. The qla2xxx driver</div><div class='add'>+provides examples of how to use readX_relaxed(). In many cases, a majority</div><div class='add'>+of the driver's readX() calls can safely be converted to readX_relaxed()</div><div class='add'>+calls, since only a few will indicate or depend on DMA completion.</div><div class='add'>+</div><div class='add'>+Port Space Accesses</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+Port Space Explained</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Another form of IO commonly supported is Port Space. This is a range of</div><div class='add'>+addresses separate to the normal memory address space. Access to these</div><div class='add'>+addresses is generally not as fast as accesses to the memory mapped</div><div class='add'>+addresses, and it also has a potentially smaller address space.</div><div class='add'>+</div><div class='add'>+Unlike memory mapped IO, no preparation is required to access port</div><div class='add'>+space.</div><div class='add'>+</div><div class='add'>+Accessing Port Space</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Accesses to this space are provided through a set of functions which</div><div class='add'>+allow 8-bit, 16-bit and 32-bit accesses; also known as byte, word and</div><div class='add'>+long. These functions are :c:func:`inb()`, :c:func:`inw()`,</div><div class='add'>+:c:func:`inl()`, :c:func:`outb()`, :c:func:`outw()` and</div><div class='add'>+:c:func:`outl()`.</div><div class='add'>+</div><div class='add'>+Some variants are provided for these functions. Some devices require</div><div class='add'>+that accesses to their ports are slowed down. This functionality is</div><div class='add'>+provided by appending a ``_p`` to the end of the function.</div><div class='add'>+There are also equivalents to memcpy. The :c:func:`ins()` and</div><div class='add'>+:c:func:`outs()` functions copy bytes, words or longs to the given</div><div class='add'>+port.</div><div class='add'>+</div><div class='add'>+Public Functions Provided</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: arch/x86/include/asm/io.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: lib/pci_iomap.c</div><div class='add'>+   :export:</div><div class='head'>diff --git a/Documentation/driver-api/device_link.rst b/Documentation/driver-api/device_link.rst<br/>new file mode 100644<br/>index 000000000000..70e328e16aad<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/device_link.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/device_link.rst</a></div><div class='hunk'>@@ -0,0 +1,281 @@</div><div class='add'>+.. |struct dev_pm_domain| replace:: :c:type:`struct dev_pm_domain &lt;dev_pm_domain&gt;`</div><div class='add'>+.. |struct generic_pm_domain| replace:: :c:type:`struct generic_pm_domain &lt;generic_pm_domain&gt;`</div><div class='add'>+</div><div class='add'>+============</div><div class='add'>+Device links</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+By default, the driver core only enforces dependencies between devices</div><div class='add'>+that are borne out of a parent/child relationship within the device</div><div class='add'>+hierarchy: When suspending, resuming or shutting down the system, devices</div><div class='add'>+are ordered based on this relationship, i.e. children are always suspended</div><div class='add'>+before their parent, and the parent is always resumed before its children.</div><div class='add'>+</div><div class='add'>+Sometimes there is a need to represent device dependencies beyond the</div><div class='add'>+mere parent/child relationship, e.g. between siblings, and have the</div><div class='add'>+driver core automatically take care of them.</div><div class='add'>+</div><div class='add'>+Secondly, the driver core by default does not enforce any driver presence</div><div class='add'>+dependencies, i.e. that one device must be bound to a driver before</div><div class='add'>+another one can probe or function correctly.</div><div class='add'>+</div><div class='add'>+Often these two dependency types come together, so a device depends on</div><div class='add'>+another one both with regards to driver presence *and* with regards to</div><div class='add'>+suspend/resume and shutdown ordering.</div><div class='add'>+</div><div class='add'>+Device links allow representation of such dependencies in the driver core.</div><div class='add'>+</div><div class='add'>+In its standard form, a device link combines *both* dependency types:</div><div class='add'>+It guarantees correct suspend/resume and shutdown ordering between a</div><div class='add'>+"supplier" device and its "consumer" devices, and it guarantees driver</div><div class='add'>+presence on the supplier.  The consumer devices are not probed before the</div><div class='add'>+supplier is bound to a driver, and they're unbound before the supplier</div><div class='add'>+is unbound.</div><div class='add'>+</div><div class='add'>+When driver presence on the supplier is irrelevant and only correct</div><div class='add'>+suspend/resume and shutdown ordering is needed, the device link may</div><div class='add'>+simply be set up with the ``DL_FLAG_STATELESS`` flag.  In other words,</div><div class='add'>+enforcing driver presence on the supplier is optional.</div><div class='add'>+</div><div class='add'>+Another optional feature is runtime PM integration:  By setting the</div><div class='add'>+``DL_FLAG_PM_RUNTIME`` flag on addition of the device link, the PM core</div><div class='add'>+is instructed to runtime resume the supplier and keep it active</div><div class='add'>+whenever and for as long as the consumer is runtime resumed.</div><div class='add'>+</div><div class='add'>+Usage</div><div class='add'>+=====</div><div class='add'>+</div><div class='add'>+The earliest point in time when device links can be added is after</div><div class='add'>+:c:func:`device_add()` has been called for the supplier and</div><div class='add'>+:c:func:`device_initialize()` has been called for the consumer.</div><div class='add'>+</div><div class='add'>+It is legal to add them later, but care must be taken that the system</div><div class='add'>+remains in a consistent state:  E.g. a device link cannot be added in</div><div class='add'>+the midst of a suspend/resume transition, so either commencement of</div><div class='add'>+such a transition needs to be prevented with :c:func:`lock_system_sleep()`,</div><div class='add'>+or the device link needs to be added from a function which is guaranteed</div><div class='add'>+not to run in parallel to a suspend/resume transition, such as from a</div><div class='add'>+device ``-&gt;probe`` callback or a boot-time PCI quirk.</div><div class='add'>+</div><div class='add'>+Another example for an inconsistent state would be a device link that</div><div class='add'>+represents a driver presence dependency, yet is added from the consumer's</div><div class='add'>+``-&gt;probe`` callback while the supplier hasn't probed yet:  Had the driver</div><div class='add'>+core known about the device link earlier, it wouldn't have probed the</div><div class='add'>+consumer in the first place.  The onus is thus on the consumer to check</div><div class='add'>+presence of the supplier after adding the link, and defer probing on</div><div class='add'>+non-presence.</div><div class='add'>+</div><div class='add'>+If a device link is added in the ``-&gt;probe`` callback of the supplier or</div><div class='add'>+consumer driver, it is typically deleted in its ``-&gt;remove`` callback for</div><div class='add'>+symmetry.  That way, if the driver is compiled as a module, the device</div><div class='add'>+link is added on module load and orderly deleted on unload.  The same</div><div class='add'>+restrictions that apply to device link addition (e.g. exclusion of a</div><div class='add'>+parallel suspend/resume transition) apply equally to deletion.</div><div class='add'>+</div><div class='add'>+Several flags may be specified on device link addition, two of which</div><div class='add'>+have already been mentioned above:  ``DL_FLAG_STATELESS`` to express that no</div><div class='add'>+driver presence dependency is needed (but only correct suspend/resume and</div><div class='add'>+shutdown ordering) and ``DL_FLAG_PM_RUNTIME`` to express that runtime PM</div><div class='add'>+integration is desired.</div><div class='add'>+</div><div class='add'>+Two other flags are specifically targeted at use cases where the device</div><div class='add'>+link is added from the consumer's ``-&gt;probe`` callback:  ``DL_FLAG_RPM_ACTIVE``</div><div class='add'>+can be specified to runtime resume the supplier upon addition of the</div><div class='add'>+device link.  ``DL_FLAG_AUTOREMOVE`` causes the device link to be automatically</div><div class='add'>+purged when the consumer fails to probe or later unbinds.  This obviates</div><div class='add'>+the need to explicitly delete the link in the ``-&gt;remove`` callback or in</div><div class='add'>+the error path of the ``-&gt;probe`` callback.</div><div class='add'>+</div><div class='add'>+Limitations</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+Driver authors should be aware that a driver presence dependency (i.e. when</div><div class='add'>+``DL_FLAG_STATELESS`` is not specified on link addition) may cause probing of</div><div class='add'>+the consumer to be deferred indefinitely.  This can become a problem if the</div><div class='add'>+consumer is required to probe before a certain initcall level is reached.</div><div class='add'>+Worse, if the supplier driver is blacklisted or missing, the consumer will</div><div class='add'>+never be probed.</div><div class='add'>+</div><div class='add'>+Sometimes drivers depend on optional resources.  They are able to operate</div><div class='add'>+in a degraded mode (reduced feature set or performance) when those resources</div><div class='add'>+are not present.  An example is an SPI controller that can use a DMA engine</div><div class='add'>+or work in PIO mode.  The controller can determine presence of the optional</div><div class='add'>+resources at probe time but on non-presence there is no way to know whether</div><div class='add'>+they will become available in the near future (due to a supplier driver</div><div class='add'>+probing) or never.  Consequently it cannot be determined whether to defer</div><div class='add'>+probing or not.  It would be possible to notify drivers when optional</div><div class='add'>+resources become available after probing, but it would come at a high cost</div><div class='add'>+for drivers as switching between modes of operation at runtime based on the</div><div class='add'>+availability of such resources would be much more complex than a mechanism</div><div class='add'>+based on probe deferral.  In any case optional resources are beyond the</div><div class='add'>+scope of device links.</div><div class='add'>+</div><div class='add'>+Examples</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+* An MMU device exists alongside a busmaster device, both are in the same</div><div class='add'>+  power domain.  The MMU implements DMA address translation for the busmaster</div><div class='add'>+  device and shall be runtime resumed and kept active whenever and as long</div><div class='add'>+  as the busmaster device is active.  The busmaster device's driver shall</div><div class='add'>+  not bind before the MMU is bound.  To achieve this, a device link with</div><div class='add'>+  runtime PM integration is added from the busmaster device (consumer)</div><div class='add'>+  to the MMU device (supplier).  The effect with regards to runtime PM</div><div class='add'>+  is the same as if the MMU was the parent of the master device.</div><div class='add'>+</div><div class='add'>+  The fact that both devices share the same power domain would normally</div><div class='add'>+  suggest usage of a |struct dev_pm_domain| or |struct generic_pm_domain|,</div><div class='add'>+  however these are not independent devices that happen to share a power</div><div class='add'>+  switch, but rather the MMU device serves the busmaster device and is</div><div class='add'>+  useless without it.  A device link creates a synthetic hierarchical</div><div class='add'>+  relationship between the devices and is thus more apt.</div><div class='add'>+</div><div class='add'>+* A Thunderbolt host controller comprises a number of PCIe hotplug ports</div><div class='add'>+  and an NHI device to manage the PCIe switch.  On resume from system sleep,</div><div class='add'>+  the NHI device needs to re-establish PCI tunnels to attached devices</div><div class='add'>+  before the hotplug ports can resume.  If the hotplug ports were children</div><div class='add'>+  of the NHI, this resume order would automatically be enforced by the</div><div class='add'>+  PM core, but unfortunately they're aunts.  The solution is to add</div><div class='add'>+  device links from the hotplug ports (consumers) to the NHI device</div><div class='add'>+  (supplier).  A driver presence dependency is not necessary for this</div><div class='add'>+  use case.</div><div class='add'>+</div><div class='add'>+* Discrete GPUs in hybrid graphics laptops often feature an HDA controller</div><div class='add'>+  for HDMI/DP audio.  In the device hierarchy the HDA controller is a sibling</div><div class='add'>+  of the VGA device, yet both share the same power domain and the HDA</div><div class='add'>+  controller is only ever needed when an HDMI/DP display is attached to the</div><div class='add'>+  VGA device.  A device link from the HDA controller (consumer) to the</div><div class='add'>+  VGA device (supplier) aptly represents this relationship.</div><div class='add'>+</div><div class='add'>+* ACPI allows definition of a device start order by way of _DEP objects.</div><div class='add'>+  A classical example is when ACPI power management methods on one device</div><div class='add'>+  are implemented in terms of I\ :sup:`2`\ C accesses and require a specific</div><div class='add'>+  I\ :sup:`2`\ C controller to be present and functional for the power</div><div class='add'>+  management of the device in question to work.</div><div class='add'>+</div><div class='add'>+* In some SoCs a functional dependency exists from display, video codec and</div><div class='add'>+  video processing IP cores on transparent memory access IP cores that handle</div><div class='add'>+  burst access and compression/decompression.</div><div class='add'>+</div><div class='add'>+Alternatives</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+* A |struct dev_pm_domain| can be used to override the bus,</div><div class='add'>+  class or device type callbacks.  It is intended for devices sharing</div><div class='add'>+  a single on/off switch, however it does not guarantee a specific</div><div class='add'>+  suspend/resume ordering, this needs to be implemented separately.</div><div class='add'>+  It also does not by itself track the runtime PM status of the involved</div><div class='add'>+  devices and turn off the power switch only when all of them are runtime</div><div class='add'>+  suspended.  Furthermore it cannot be used to enforce a specific shutdown</div><div class='add'>+  ordering or a driver presence dependency.</div><div class='add'>+</div><div class='add'>+* A |struct generic_pm_domain| is a lot more heavyweight than a</div><div class='add'>+  device link and does not allow for shutdown ordering or driver presence</div><div class='add'>+  dependencies.  It also cannot be used on ACPI systems.</div><div class='add'>+</div><div class='add'>+Implementation</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+The device hierarchy, which -- as the name implies -- is a tree,</div><div class='add'>+becomes a directed acyclic graph once device links are added.</div><div class='add'>+</div><div class='add'>+Ordering of these devices during suspend/resume is determined by the</div><div class='add'>+dpm_list.  During shutdown it is determined by the devices_kset.  With</div><div class='add'>+no device links present, the two lists are a flattened, one-dimensional</div><div class='add'>+representations of the device tree such that a device is placed behind</div><div class='add'>+all its ancestors.  That is achieved by traversing the ACPI namespace</div><div class='add'>+or OpenFirmware device tree top-down and appending devices to the lists</div><div class='add'>+as they are discovered.</div><div class='add'>+</div><div class='add'>+Once device links are added, the lists need to satisfy the additional</div><div class='add'>+constraint that a device is placed behind all its suppliers, recursively.</div><div class='add'>+To ensure this, upon addition of the device link the consumer and the</div><div class='add'>+entire sub-graph below it (all children and consumers of the consumer)</div><div class='add'>+are moved to the end of the list.  (Call to :c:func:`device_reorder_to_tail()`</div><div class='add'>+from :c:func:`device_link_add()`.)</div><div class='add'>+</div><div class='add'>+To prevent introduction of dependency loops into the graph, it is</div><div class='add'>+verified upon device link addition that the supplier is not dependent</div><div class='add'>+on the consumer or any children or consumers of the consumer.</div><div class='add'>+(Call to :c:func:`device_is_dependent()` from :c:func:`device_link_add()`.)</div><div class='add'>+If that constraint is violated, :c:func:`device_link_add()` will return</div><div class='add'>+``NULL`` and a ``WARNING`` will be logged.</div><div class='add'>+</div><div class='add'>+Notably this also prevents the addition of a device link from a parent</div><div class='add'>+device to a child.  However the converse is allowed, i.e. a device link</div><div class='add'>+from a child to a parent.  Since the driver core already guarantees</div><div class='add'>+correct suspend/resume and shutdown ordering between parent and child,</div><div class='add'>+such a device link only makes sense if a driver presence dependency is</div><div class='add'>+needed on top of that.  In this case driver authors should weigh</div><div class='add'>+carefully if a device link is at all the right tool for the purpose.</div><div class='add'>+A more suitable approach might be to simply use deferred probing or</div><div class='add'>+add a device flag causing the parent driver to be probed before the</div><div class='add'>+child one.</div><div class='add'>+</div><div class='add'>+State machine</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/device.h</div><div class='add'>+   :functions: device_link_state</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+                 .=============================.</div><div class='add'>+                 |                             |</div><div class='add'>+                 v                             |</div><div class='add'>+ DORMANT &lt;=&gt; AVAILABLE &lt;=&gt; CONSUMER_PROBE =&gt; ACTIVE</div><div class='add'>+    ^                                          |</div><div class='add'>+    |                                          |</div><div class='add'>+    '============ SUPPLIER_UNBIND &lt;============'</div><div class='add'>+</div><div class='add'>+* The initial state of a device link is automatically determined by</div><div class='add'>+  :c:func:`device_link_add()` based on the driver presence on the supplier</div><div class='add'>+  and consumer.  If the link is created before any devices are probed, it</div><div class='add'>+  is set to ``DL_STATE_DORMANT``.</div><div class='add'>+</div><div class='add'>+* When a supplier device is bound to a driver, links to its consumers</div><div class='add'>+  progress to ``DL_STATE_AVAILABLE``.</div><div class='add'>+  (Call to :c:func:`device_links_driver_bound()` from</div><div class='add'>+  :c:func:`driver_bound()`.)</div><div class='add'>+</div><div class='add'>+* Before a consumer device is probed, presence of supplier drivers is</div><div class='add'>+  verified by checking that links to suppliers are in ``DL_STATE_AVAILABLE``</div><div class='add'>+  state.  The state of the links is updated to ``DL_STATE_CONSUMER_PROBE``.</div><div class='add'>+  (Call to :c:func:`device_links_check_suppliers()` from</div><div class='add'>+  :c:func:`really_probe()`.)</div><div class='add'>+  This prevents the supplier from unbinding.</div><div class='add'>+  (Call to :c:func:`wait_for_device_probe()` from</div><div class='add'>+  :c:func:`device_links_unbind_consumers()`.)</div><div class='add'>+</div><div class='add'>+* If the probe fails, links to suppliers revert back to ``DL_STATE_AVAILABLE``.</div><div class='add'>+  (Call to :c:func:`device_links_no_driver()` from :c:func:`really_probe()`.)</div><div class='add'>+</div><div class='add'>+* If the probe succeeds, links to suppliers progress to ``DL_STATE_ACTIVE``.</div><div class='add'>+  (Call to :c:func:`device_links_driver_bound()` from :c:func:`driver_bound()`.)</div><div class='add'>+</div><div class='add'>+* When the consumer's driver is later on removed, links to suppliers revert</div><div class='add'>+  back to ``DL_STATE_AVAILABLE``.</div><div class='add'>+  (Call to :c:func:`__device_links_no_driver()` from</div><div class='add'>+  :c:func:`device_links_driver_cleanup()`, which in turn is called from</div><div class='add'>+  :c:func:`__device_release_driver()`.)</div><div class='add'>+</div><div class='add'>+* Before a supplier's driver is removed, links to consumers that are not</div><div class='add'>+  bound to a driver are updated to ``DL_STATE_SUPPLIER_UNBIND``.</div><div class='add'>+  (Call to :c:func:`device_links_busy()` from</div><div class='add'>+  :c:func:`__device_release_driver()`.)</div><div class='add'>+  This prevents the consumers from binding.</div><div class='add'>+  (Call to :c:func:`device_links_check_suppliers()` from</div><div class='add'>+  :c:func:`really_probe()`.)</div><div class='add'>+  Consumers that are bound are freed from their driver; consumers that are</div><div class='add'>+  probing are waited for until they are done.</div><div class='add'>+  (Call to :c:func:`device_links_unbind_consumers()` from</div><div class='add'>+  :c:func:`__device_release_driver()`.)</div><div class='add'>+  Once all links to consumers are in ``DL_STATE_SUPPLIER_UNBIND`` state,</div><div class='add'>+  the supplier driver is released and the links revert to ``DL_STATE_DORMANT``.</div><div class='add'>+  (Call to :c:func:`device_links_driver_cleanup()` from</div><div class='add'>+  :c:func:`__device_release_driver()`.)</div><div class='add'>+</div><div class='add'>+API</div><div class='add'>+===</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/base/core.c</div><div class='add'>+   :functions: device_link_add device_link_del</div><div class='head'>diff --git a/Documentation/driver-api/dma-buf.rst b/Documentation/driver-api/dma-buf.rst<br/>new file mode 100644<br/>index 000000000000..31671b469627<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/dma-buf.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/dma-buf.rst</a></div><div class='hunk'>@@ -0,0 +1,165 @@</div><div class='add'>+Buffer Sharing and Synchronization</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+The dma-buf subsystem provides the framework for sharing buffers for</div><div class='add'>+hardware (DMA) access across multiple device drivers and subsystems, and</div><div class='add'>+for synchronizing asynchronous hardware access.</div><div class='add'>+</div><div class='add'>+This is used, for example, by drm "prime" multi-GPU support, but is of</div><div class='add'>+course not limited to GPU use cases.</div><div class='add'>+</div><div class='add'>+The three main components of this are: (1) dma-buf, representing a</div><div class='add'>+sg_table and exposed to userspace as a file descriptor to allow passing</div><div class='add'>+between devices, (2) fence, which provides a mechanism to signal when</div><div class='add'>+one device as finished access, and (3) reservation, which manages the</div><div class='add'>+shared or exclusive fence(s) associated with the buffer.</div><div class='add'>+</div><div class='add'>+Shared DMA Buffers</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+This document serves as a guide to device-driver writers on what is the dma-buf</div><div class='add'>+buffer sharing API, how to use it for exporting and using shared buffers.</div><div class='add'>+</div><div class='add'>+Any device driver which wishes to be a part of DMA buffer sharing, can do so as</div><div class='add'>+either the 'exporter' of buffers, or the 'user' or 'importer' of buffers.</div><div class='add'>+</div><div class='add'>+Say a driver A wants to use buffers created by driver B, then we call B as the</div><div class='add'>+exporter, and A as buffer-user/importer.</div><div class='add'>+</div><div class='add'>+The exporter</div><div class='add'>+</div><div class='add'>+ - implements and manages operations in :c:type:`struct dma_buf_ops</div><div class='add'>+   &lt;dma_buf_ops&gt;` for the buffer,</div><div class='add'>+ - allows other users to share the buffer by using dma_buf sharing APIs,</div><div class='add'>+ - manages the details of buffer allocation, wrapped int a :c:type:`struct</div><div class='add'>+   dma_buf &lt;dma_buf&gt;`,</div><div class='add'>+ - decides about the actual backing storage where this allocation happens,</div><div class='add'>+ - and takes care of any migration of scatterlist - for all (shared) users of</div><div class='add'>+   this buffer.</div><div class='add'>+</div><div class='add'>+The buffer-user</div><div class='add'>+</div><div class='add'>+ - is one of (many) sharing users of the buffer.</div><div class='add'>+ - doesn't need to worry about how the buffer is allocated, or where.</div><div class='add'>+ - and needs a mechanism to get access to the scatterlist that makes up this</div><div class='add'>+   buffer in memory, mapped into its own address space, so it can access the</div><div class='add'>+   same area of memory. This interface is provided by :c:type:`struct</div><div class='add'>+   dma_buf_attachment &lt;dma_buf_attachment&gt;`.</div><div class='add'>+</div><div class='add'>+Any exporters or users of the dma-buf buffer sharing framework must have a</div><div class='add'>+'select DMA_SHARED_BUFFER' in their respective Kconfigs.</div><div class='add'>+</div><div class='add'>+Userspace Interface Notes</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Mostly a DMA buffer file descriptor is simply an opaque object for userspace,</div><div class='add'>+and hence the generic interface exposed is very minimal. There's a few things to</div><div class='add'>+consider though:</div><div class='add'>+</div><div class='add'>+- Since kernel 3.12 the dma-buf FD supports the llseek system call, but only</div><div class='add'>+  with offset=0 and whence=SEEK_END|SEEK_SET. SEEK_SET is supported to allow</div><div class='add'>+  the usual size discover pattern size = SEEK_END(0); SEEK_SET(0). Every other</div><div class='add'>+  llseek operation will report -EINVAL.</div><div class='add'>+</div><div class='add'>+  If llseek on dma-buf FDs isn't support the kernel will report -ESPIPE for all</div><div class='add'>+  cases. Userspace can use this to detect support for discovering the dma-buf</div><div class='add'>+  size using llseek.</div><div class='add'>+</div><div class='add'>+- In order to avoid fd leaks on exec, the FD_CLOEXEC flag must be set</div><div class='add'>+  on the file descriptor.  This is not just a resource leak, but a</div><div class='add'>+  potential security hole.  It could give the newly exec'd application</div><div class='add'>+  access to buffers, via the leaked fd, to which it should otherwise</div><div class='add'>+  not be permitted access.</div><div class='add'>+</div><div class='add'>+  The problem with doing this via a separate fcntl() call, versus doing it</div><div class='add'>+  atomically when the fd is created, is that this is inherently racy in a</div><div class='add'>+  multi-threaded app[3].  The issue is made worse when it is library code</div><div class='add'>+  opening/creating the file descriptor, as the application may not even be</div><div class='add'>+  aware of the fd's.</div><div class='add'>+</div><div class='add'>+  To avoid this problem, userspace must have a way to request O_CLOEXEC</div><div class='add'>+  flag be set when the dma-buf fd is created.  So any API provided by</div><div class='add'>+  the exporting driver to create a dmabuf fd must provide a way to let</div><div class='add'>+  userspace control setting of O_CLOEXEC flag passed in to dma_buf_fd().</div><div class='add'>+</div><div class='add'>+- Memory mapping the contents of the DMA buffer is also supported. See the</div><div class='add'>+  discussion below on `CPU Access to DMA Buffer Objects`_ for the full details.</div><div class='add'>+</div><div class='add'>+- The DMA buffer FD is also pollable, see `Fence Poll Support`_ below for</div><div class='add'>+  details.</div><div class='add'>+</div><div class='add'>+Basic Operation and Device DMA Access</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/dma-buf/dma-buf.c</div><div class='add'>+   :doc: dma buf device access</div><div class='add'>+</div><div class='add'>+CPU Access to DMA Buffer Objects</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/dma-buf/dma-buf.c</div><div class='add'>+   :doc: cpu access</div><div class='add'>+</div><div class='add'>+Fence Poll Support</div><div class='add'>+~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/dma-buf/dma-buf.c</div><div class='add'>+   :doc: fence polling</div><div class='add'>+</div><div class='add'>+Kernel Functions and Structures Reference</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/dma-buf/dma-buf.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/dma-buf.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+Reservation Objects</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/dma-buf/reservation.c</div><div class='add'>+   :doc: Reservation Object Overview</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/dma-buf/reservation.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/reservation.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+DMA Fences</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/dma-buf/dma-fence.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/dma-fence.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+Seqno Hardware Fences</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/dma-buf/seqno-fence.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/seqno-fence.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+DMA Fence Array</div><div class='add'>+~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/dma-buf/dma-fence-array.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/dma-fence-array.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+DMA Fence uABI/Sync File</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/dma-buf/sync_file.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/sync_file.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/driver-api/edac.rst b/Documentation/driver-api/edac.rst<br/>new file mode 100644<br/>index 000000000000..b8c742aa0a71<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/edac.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/edac.rst</a></div><div class='hunk'>@@ -0,0 +1,178 @@</div><div class='add'>+Error Detection And Correction (EDAC) Devices</div><div class='add'>+=============================================</div><div class='add'>+</div><div class='add'>+Main Concepts used at the EDAC subsystem</div><div class='add'>+----------------------------------------</div><div class='add'>+</div><div class='add'>+There are several things to be aware of that aren't at all obvious, like</div><div class='add'>+*sockets, *socket sets*, *banks*, *rows*, *chip-select rows*, *channels*,</div><div class='add'>+etc...</div><div class='add'>+</div><div class='add'>+These are some of the many terms that are thrown about that don't always</div><div class='add'>+mean what people think they mean (Inconceivable!).  In the interest of</div><div class='add'>+creating a common ground for discussion, terms and their definitions</div><div class='add'>+will be established.</div><div class='add'>+</div><div class='add'>+* Memory devices</div><div class='add'>+</div><div class='add'>+The individual DRAM chips on a memory stick.  These devices commonly</div><div class='add'>+output 4 and 8 bits each (x4, x8). Grouping several of these in parallel</div><div class='add'>+provides the number of bits that the memory controller expects:</div><div class='add'>+typically 72 bits, in order to provide 64 bits + 8 bits of ECC data.</div><div class='add'>+</div><div class='add'>+* Memory Stick</div><div class='add'>+</div><div class='add'>+A printed circuit board that aggregates multiple memory devices in</div><div class='add'>+parallel.  In general, this is the Field Replaceable Unit (FRU) which</div><div class='add'>+gets replaced, in the case of excessive errors. Most often it is also</div><div class='add'>+called DIMM (Dual Inline Memory Module).</div><div class='add'>+</div><div class='add'>+* Memory Socket</div><div class='add'>+</div><div class='add'>+A physical connector on the motherboard that accepts a single memory</div><div class='add'>+stick. Also called as "slot" on several datasheets.</div><div class='add'>+</div><div class='add'>+* Channel</div><div class='add'>+</div><div class='add'>+A memory controller channel, responsible to communicate with a group of</div><div class='add'>+DIMMs. Each channel has its own independent control (command) and data</div><div class='add'>+bus, and can be used independently or grouped with other channels.</div><div class='add'>+</div><div class='add'>+* Branch</div><div class='add'>+</div><div class='add'>+It is typically the highest hierarchy on a Fully-Buffered DIMM memory</div><div class='add'>+controller. Typically, it contains two channels. Two channels at the</div><div class='add'>+same branch can be used in single mode or in lockstep mode. When</div><div class='add'>+lockstep is enabled, the cacheline is doubled, but it generally brings</div><div class='add'>+some performance penalty. Also, it is generally not possible to point to</div><div class='add'>+just one memory stick when an error occurs, as the error correction code</div><div class='add'>+is calculated using two DIMMs instead of one. Due to that, it is capable</div><div class='add'>+of correcting more errors than on single mode.</div><div class='add'>+</div><div class='add'>+* Single-channel</div><div class='add'>+</div><div class='add'>+The data accessed by the memory controller is contained into one dimm</div><div class='add'>+only. E. g. if the data is 64 bits-wide, the data flows to the CPU using</div><div class='add'>+one 64 bits parallel access. Typically used with SDR, DDR, DDR2 and DDR3</div><div class='add'>+memories. FB-DIMM and RAMBUS use a different concept for channel, so</div><div class='add'>+this concept doesn't apply there.</div><div class='add'>+</div><div class='add'>+* Double-channel</div><div class='add'>+</div><div class='add'>+The data size accessed by the memory controller is interlaced into two</div><div class='add'>+dimms, accessed at the same time. E. g. if the DIMM is 64 bits-wide (72</div><div class='add'>+bits with ECC), the data flows to the CPU using a 128 bits parallel</div><div class='add'>+access.</div><div class='add'>+</div><div class='add'>+* Chip-select row</div><div class='add'>+</div><div class='add'>+This is the name of the DRAM signal used to select the DRAM ranks to be</div><div class='add'>+accessed. Common chip-select rows for single channel are 64 bits, for</div><div class='add'>+dual channel 128 bits. It may not be visible by the memory controller,</div><div class='add'>+as some DIMM types have a memory buffer that can hide direct access to</div><div class='add'>+it from the Memory Controller.</div><div class='add'>+</div><div class='add'>+* Single-Ranked stick</div><div class='add'>+</div><div class='add'>+A Single-ranked stick has 1 chip-select row of memory. Motherboards</div><div class='add'>+commonly drive two chip-select pins to a memory stick. A single-ranked</div><div class='add'>+stick, will occupy only one of those rows. The other will be unused.</div><div class='add'>+</div><div class='add'>+.. _doubleranked:</div><div class='add'>+</div><div class='add'>+* Double-Ranked stick</div><div class='add'>+</div><div class='add'>+A double-ranked stick has two chip-select rows which access different</div><div class='add'>+sets of memory devices.  The two rows cannot be accessed concurrently.</div><div class='add'>+</div><div class='add'>+* Double-sided stick</div><div class='add'>+</div><div class='add'>+**DEPRECATED TERM**, see :ref:`Double-Ranked stick &lt;doubleranked&gt;`.</div><div class='add'>+</div><div class='add'>+A double-sided stick has two chip-select rows which access different sets</div><div class='add'>+of memory devices. The two rows cannot be accessed concurrently.</div><div class='add'>+"Double-sided" is irrespective of the memory devices being mounted on</div><div class='add'>+both sides of the memory stick.</div><div class='add'>+</div><div class='add'>+* Socket set</div><div class='add'>+</div><div class='add'>+All of the memory sticks that are required for a single memory access or</div><div class='add'>+all of the memory sticks spanned by a chip-select row.  A single socket</div><div class='add'>+set has two chip-select rows and if double-sided sticks are used these</div><div class='add'>+will occupy those chip-select rows.</div><div class='add'>+</div><div class='add'>+* Bank</div><div class='add'>+</div><div class='add'>+This term is avoided because it is unclear when needing to distinguish</div><div class='add'>+between chip-select rows and socket sets.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Memory Controllers</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Most of the EDAC core is focused on doing Memory Controller error detection.</div><div class='add'>+The :c:func:`edac_mc_alloc`. It uses internally the struct ``mem_ctl_info``</div><div class='add'>+to describe the memory controllers, with is an opaque struct for the EDAC</div><div class='add'>+drivers. Only the EDAC core is allowed to touch it.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/edac.h</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/edac/edac_mc.h</div><div class='add'>+</div><div class='add'>+PCI Controllers</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+The EDAC subsystem provides a mechanism to handle PCI controllers by calling</div><div class='add'>+the :c:func:`edac_pci_alloc_ctl_info`. It will use the struct</div><div class='add'>+:c:type:`edac_pci_ctl_info` to describe the PCI controllers.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/edac/edac_pci.h</div><div class='add'>+</div><div class='add'>+EDAC Blocks</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The EDAC subsystem also provides a generic mechanism to report errors on</div><div class='add'>+other parts of the hardware via :c:func:`edac_device_alloc_ctl_info` function.</div><div class='add'>+</div><div class='add'>+The structures :c:type:`edac_dev_sysfs_block_attribute`,</div><div class='add'>+:c:type:`edac_device_block`, :c:type:`edac_device_instance` and</div><div class='add'>+:c:type:`edac_device_ctl_info` provide a generic or abstract 'edac_device'</div><div class='add'>+representation at sysfs.</div><div class='add'>+</div><div class='add'>+This set of structures and the code that implements the APIs for the same, provide for registering EDAC type devices which are NOT standard memory or</div><div class='add'>+PCI, like:</div><div class='add'>+</div><div class='add'>+- CPU caches (L1 and L2)</div><div class='add'>+- DMA engines</div><div class='add'>+- Core CPU switches</div><div class='add'>+- Fabric switch units</div><div class='add'>+- PCIe interface controllers</div><div class='add'>+- other EDAC/ECC type devices that can be monitored for</div><div class='add'>+  errors, etc.</div><div class='add'>+</div><div class='add'>+It allows for a 2 level set of hierarchy.</div><div class='add'>+</div><div class='add'>+For example, a cache could be composed of L1, L2 and L3 levels of cache.</div><div class='add'>+Each CPU core would have its own L1 cache, while sharing L2 and maybe L3</div><div class='add'>+caches. On such case, those can be represented via the following sysfs</div><div class='add'>+nodes::</div><div class='add'>+</div><div class='add'>+	/sys/devices/system/edac/..</div><div class='add'>+</div><div class='add'>+	pci/		&lt;existing pci directory (if available)&gt;</div><div class='add'>+	mc/		&lt;existing memory device directory&gt;</div><div class='add'>+	cpu/cpu0/..	&lt;L1 and L2 block directory&gt;</div><div class='add'>+		/L1-cache/ce_count</div><div class='add'>+			 /ue_count</div><div class='add'>+		/L2-cache/ce_count</div><div class='add'>+			 /ue_count</div><div class='add'>+	cpu/cpu1/..	&lt;L1 and L2 block directory&gt;</div><div class='add'>+		/L1-cache/ce_count</div><div class='add'>+			 /ue_count</div><div class='add'>+		/L2-cache/ce_count</div><div class='add'>+			 /ue_count</div><div class='add'>+	...</div><div class='add'>+</div><div class='add'>+	the L1 and L2 directories would be "edac_device_block's"</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/edac/edac_device.h</div><div class='head'>diff --git a/Documentation/driver-api/firmware/built-in-fw.rst b/Documentation/driver-api/firmware/built-in-fw.rst<br/>new file mode 100644<br/>index 000000000000..7300e66857f8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/firmware/built-in-fw.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/built-in-fw.rst</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+=================</div><div class='add'>+Built-in firmware</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+Firmware can be built-in to the kernel, this means building the firmware</div><div class='add'>+into vmlinux directly, to enable avoiding having to look for firmware from</div><div class='add'>+the filesystem. Instead, firmware can be looked for inside the kernel</div><div class='add'>+directly. You can enable built-in firmware using the kernel configuration</div><div class='add'>+options:</div><div class='add'>+</div><div class='add'>+  * CONFIG_EXTRA_FIRMWARE</div><div class='add'>+  * CONFIG_EXTRA_FIRMWARE_DIR</div><div class='add'>+</div><div class='add'>+This should not be confused with CONFIG_FIRMWARE_IN_KERNEL, this is for drivers</div><div class='add'>+which enables firmware to be built as part of the kernel build process. This</div><div class='add'>+option, CONFIG_FIRMWARE_IN_KERNEL, will build all firmware for all drivers</div><div class='add'>+enabled which ship its firmware inside the Linux kernel source tree.</div><div class='add'>+</div><div class='add'>+There are a few reasons why you might want to consider building your firmware</div><div class='add'>+into the kernel with CONFIG_EXTRA_FIRMWARE though:</div><div class='add'>+</div><div class='add'>+* Speed</div><div class='add'>+* Firmware is needed for accessing the boot device, and the user doesn't</div><div class='add'>+  want to stuff the firmware into the boot initramfs.</div><div class='add'>+</div><div class='add'>+Even if you have these needs there are a few reasons why you may not be</div><div class='add'>+able to make use of built-in firmware:</div><div class='add'>+</div><div class='add'>+* Legalese - firmware is non-GPL compatible</div><div class='add'>+* Some firmware may be optional</div><div class='add'>+* Firmware upgrades are possible, therefore a new firmware would implicate</div><div class='add'>+  a complete kernel rebuild.</div><div class='add'>+* Some firmware files may be really large in size. The remote-proc subsystem</div><div class='add'>+  is an example subsystem which deals with these sorts of firmware</div><div class='add'>+* The firmware may need to be scraped out from some device specific location</div><div class='add'>+  dynamically, an example is calibration data for for some WiFi chipsets. This</div><div class='add'>+  calibration data can be unique per sold device.</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/driver-api/firmware/core.rst b/Documentation/driver-api/firmware/core.rst<br/>new file mode 100644<br/>index 000000000000..1d1688cbc078<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/firmware/core.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/core.rst</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+==========================</div><div class='add'>+Firmware API core features</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+The firmware API has a rich set of core features available. This section</div><div class='add'>+documents these features.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+</div><div class='add'>+   fw_search_path</div><div class='add'>+   built-in-fw</div><div class='add'>+   firmware_cache</div><div class='add'>+   direct-fs-lookup</div><div class='add'>+   fallback-mechanisms</div><div class='add'>+   lookup-order</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/driver-api/firmware/direct-fs-lookup.rst b/Documentation/driver-api/firmware/direct-fs-lookup.rst<br/>new file mode 100644<br/>index 000000000000..82b4d585a213<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/firmware/direct-fs-lookup.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/direct-fs-lookup.rst</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+========================</div><div class='add'>+Direct filesystem lookup</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+Direct filesystem lookup is the most common form of firmware lookup performed</div><div class='add'>+by the kernel. The kernel looks for the firmware directly on the root</div><div class='add'>+filesystem in the paths documented in the section 'Firmware search paths'.</div><div class='add'>+The filesystem lookup is implemented in fw_get_filesystem_firmware(), it</div><div class='add'>+uses common core kernel file loader facility kernel_read_file_from_path().</div><div class='add'>+The max path allowed is PATH_MAX -- currently this is 4096 characters.</div><div class='add'>+</div><div class='add'>+It is recommended you keep /lib/firmware paths on your root filesystem,</div><div class='add'>+avoid having a separate partition for them in order to avoid possible</div><div class='add'>+races with lookups and avoid uses of the custom fallback mechanisms</div><div class='add'>+documented below.</div><div class='add'>+</div><div class='add'>+Firmware and initramfs</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+Drivers which are built-in to the kernel should have the firmware integrated</div><div class='add'>+also as part of the initramfs used to boot the kernel given that otherwise</div><div class='add'>+a race is possible with loading the driver and the real rootfs not yet being</div><div class='add'>+available. Stuffing the firmware into initramfs resolves this race issue,</div><div class='add'>+however note that using initrd does not suffice to address the same race.</div><div class='add'>+</div><div class='add'>+There are circumstances that justify not wanting to include firmware into</div><div class='add'>+initramfs, such as dealing with large firmware firmware files for the</div><div class='add'>+remote-proc subsystem. For such cases using a userspace fallback mechanism</div><div class='add'>+is currently the only viable solution as only userspace can know for sure</div><div class='add'>+when the real rootfs is ready and mounted.</div><div class='head'>diff --git a/Documentation/driver-api/firmware/fallback-mechanisms.rst b/Documentation/driver-api/firmware/fallback-mechanisms.rst<br/>new file mode 100644<br/>index 000000000000..d19354794e67<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/firmware/fallback-mechanisms.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/fallback-mechanisms.rst</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+===================</div><div class='add'>+Fallback mechanisms</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+A fallback mechanism is supported to allow to overcome failures to do a direct</div><div class='add'>+filesystem lookup on the root filesystem or when the firmware simply cannot be</div><div class='add'>+installed for practical reasons on the root filesystem. The kernel</div><div class='add'>+configuration options related to supporting the firmware fallback mechanism are:</div><div class='add'>+</div><div class='add'>+  * CONFIG_FW_LOADER_USER_HELPER: enables building the firmware fallback</div><div class='add'>+    mechanism. Most distributions enable this option today. If enabled but</div><div class='add'>+    CONFIG_FW_LOADER_USER_HELPER_FALLBACK is disabled, only the custom fallback</div><div class='add'>+    mechanism is available and for the request_firmware_nowait() call.</div><div class='add'>+  * CONFIG_FW_LOADER_USER_HELPER_FALLBACK: force enables each request to</div><div class='add'>+    enable the kobject uevent fallback mechanism on all firmware API calls</div><div class='add'>+    except request_firmware_direct(). Most distributions disable this option</div><div class='add'>+    today. The call request_firmware_nowait() allows for one alternative</div><div class='add'>+    fallback mechanism: if this kconfig option is enabled and your second</div><div class='add'>+    argument to request_firmware_nowait(), uevent, is set to false you are</div><div class='add'>+    informing the kernel that you have a custom fallback mechanism and it will</div><div class='add'>+    manually load the firmware. Read below for more details.</div><div class='add'>+</div><div class='add'>+Note that this means when having this configuration:</div><div class='add'>+</div><div class='add'>+CONFIG_FW_LOADER_USER_HELPER=y</div><div class='add'>+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=n</div><div class='add'>+</div><div class='add'>+the kobject uevent fallback mechanism will never take effect even</div><div class='add'>+for request_firmware_nowait() when uevent is set to true.</div><div class='add'>+</div><div class='add'>+Justifying the firmware fallback mechanism</div><div class='add'>+==========================================</div><div class='add'>+</div><div class='add'>+Direct filesystem lookups may fail for a variety of reasons. Known reasons for</div><div class='add'>+this are worth itemizing and documenting as it justifies the need for the</div><div class='add'>+fallback mechanism:</div><div class='add'>+</div><div class='add'>+* Race against access with the root filesystem upon bootup.</div><div class='add'>+</div><div class='add'>+* Races upon resume from suspend. This is resolved by the firmware cache, but</div><div class='add'>+  the firmware cache is only supported if you use uevents, and its not</div><div class='add'>+  supported for request_firmware_into_buf().</div><div class='add'>+</div><div class='add'>+* Firmware is not accessible through typical means:</div><div class='add'>+        * It cannot be installed into the root filesystem</div><div class='add'>+        * The firmware provides very unique device specific data tailored for</div><div class='add'>+          the unit gathered with local information. An example is calibration</div><div class='add'>+          data for WiFi chipsets for mobile devices. This calibration data is</div><div class='add'>+          not common to all units, but tailored per unit.  Such information may</div><div class='add'>+          be installed on a separate flash partition other than where the root</div><div class='add'>+          filesystem is provided.</div><div class='add'>+</div><div class='add'>+Types of fallback mechanisms</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+There are really two fallback mechanisms available using one shared sysfs</div><div class='add'>+interface as a loading facility:</div><div class='add'>+</div><div class='add'>+* Kobject uevent fallback mechanism</div><div class='add'>+* Custom fallback mechanism</div><div class='add'>+</div><div class='add'>+First lets document the shared sysfs loading facility.</div><div class='add'>+</div><div class='add'>+Firmware sysfs loading facility</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+In order to help device drivers upload firmware using a fallback mechanism</div><div class='add'>+the firmware infrastructure creates a sysfs interface to enable userspace</div><div class='add'>+to load and indicate when firmware is ready. The sysfs directory is created</div><div class='add'>+via fw_create_instance(). This call creates a new struct device named after</div><div class='add'>+the firmware requested, and establishes it in the device hierarchy by</div><div class='add'>+associating the device used to make the request as the device's parent.</div><div class='add'>+The sysfs directory's file attributes are defined and controlled through</div><div class='add'>+the new device's class (firmare_class) and group (fw_dev_attr_groups).</div><div class='add'>+This is actually where the original firmware_class.c file name comes from,</div><div class='add'>+as originally the only firmware loading mechanism available was the</div><div class='add'>+mechanism we now use as a fallback mechanism.</div><div class='add'>+</div><div class='add'>+To load firmware using the sysfs interface we expose a loading indicator,</div><div class='add'>+and a file upload firmware into:</div><div class='add'>+</div><div class='add'>+  * /sys/$DEVPATH/loading</div><div class='add'>+  * /sys/$DEVPATH/data</div><div class='add'>+</div><div class='add'>+To upload firmware you will echo 1 onto the loading file to indicate</div><div class='add'>+you are loading firmware. You then cat the firmware into the data file,</div><div class='add'>+and you notify the kernel the firmware is ready by echo'ing 0 onto</div><div class='add'>+the loading file.</div><div class='add'>+</div><div class='add'>+The firmware device used to help load firmware using sysfs is only created if</div><div class='add'>+direct firmware loading fails and if the fallback mechanism is enabled for your</div><div class='add'>+firmware request, this is set up with fw_load_from_user_helper().  It is</div><div class='add'>+important to re-iterate that no device is created if a direct filesystem lookup</div><div class='add'>+succeeded.</div><div class='add'>+</div><div class='add'>+Using::</div><div class='add'>+</div><div class='add'>+        echo 1 &gt; /sys/$DEVPATH/loading</div><div class='add'>+</div><div class='add'>+Will clean any previous partial load at once and make the firmware API</div><div class='add'>+return an error. When loading firmware the firmware_class grows a buffer</div><div class='add'>+for the firmware in PAGE_SIZE increments to hold the image as it comes in.</div><div class='add'>+</div><div class='add'>+firmware_data_read() and firmware_loading_show() are just provided for the</div><div class='add'>+test_firmware driver for testing, they are not called in normal use or</div><div class='add'>+expected to be used regularly by userspace.</div><div class='add'>+</div><div class='add'>+Firmware kobject uevent fallback mechanism</div><div class='add'>+==========================================</div><div class='add'>+</div><div class='add'>+Since a device is created for the sysfs interface to help load firmware as a</div><div class='add'>+fallback mechanism userspace can be informed of the addition of the device by</div><div class='add'>+relying on kobject uevents. The addition of the device into the device</div><div class='add'>+hierarchy means the fallback mechanism for firmware loading has been initiated.</div><div class='add'>+For details of implementation refer to _request_firmware_load(), in particular</div><div class='add'>+on the use of dev_set_uevent_suppress() and kobject_uevent().</div><div class='add'>+</div><div class='add'>+The kernel's kobject uevent mechanism is implemented in lib/kobject_uevent.c,</div><div class='add'>+it issues uevents to userspace. As a supplement to kobject uevents Linux</div><div class='add'>+distributions could also enable CONFIG_UEVENT_HELPER_PATH, which makes use of</div><div class='add'>+core kernel's usermode helper (UMH) functionality to call out to a userspace</div><div class='add'>+helper for kobject uevents. In practice though no standard distribution has</div><div class='add'>+ever used the CONFIG_UEVENT_HELPER_PATH. If CONFIG_UEVENT_HELPER_PATH is</div><div class='add'>+enabled this binary would be called each time kobject_uevent_env() gets called</div><div class='add'>+in the kernel for each kobject uevent triggered.</div><div class='add'>+</div><div class='add'>+Different implementations have been supported in userspace to take advantage of</div><div class='add'>+this fallback mechanism. When firmware loading was only possible using the</div><div class='add'>+sysfs mechanism the userspace component "hotplug" provided the functionality of</div><div class='add'>+monitoring for kobject events. Historically this was superseded be systemd's</div><div class='add'>+udev, however firmware loading support was removed from udev as of systemd</div><div class='add'>+commit be2ea723b1d0 ("udev: remove userspace firmware loading support")</div><div class='add'>+as of v217 on August, 2014. This means most Linux distributions today are</div><div class='add'>+not using or taking advantage of the firmware fallback mechanism provided</div><div class='add'>+by kobject uevents. This is specially exacerbated due to the fact that most</div><div class='add'>+distributions today disable CONFIG_FW_LOADER_USER_HELPER_FALLBACK.</div><div class='add'>+</div><div class='add'>+Refer to do_firmware_uevent() for details of the kobject event variables</div><div class='add'>+setup. Variables passwdd with a kobject add event:</div><div class='add'>+</div><div class='add'>+* FIRMWARE=firmware name</div><div class='add'>+* TIMEOUT=timeout value</div><div class='add'>+* ASYNC=whether or not the API request was asynchronous</div><div class='add'>+</div><div class='add'>+By default DEVPATH is set by the internal kernel kobject infrastructure.</div><div class='add'>+Below is an example simple kobject uevent script::</div><div class='add'>+</div><div class='add'>+        # Both $DEVPATH and $FIRMWARE are already provided in the environment.</div><div class='add'>+        MY_FW_DIR=/lib/firmware/</div><div class='add'>+        echo 1 &gt; /sys/$DEVPATH/loading</div><div class='add'>+        cat $MY_FW_DIR/$FIRMWARE &gt; /sys/$DEVPATH/data</div><div class='add'>+        echo 0 &gt; /sys/$DEVPATH/loading</div><div class='add'>+</div><div class='add'>+Firmware custom fallback mechanism</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+Users of the request_firmware_nowait() call have yet another option available</div><div class='add'>+at their disposal: rely on the sysfs fallback mechanism but request that no</div><div class='add'>+kobject uevents be issued to userspace. The original logic behind this</div><div class='add'>+was that utilities other than udev might be required to lookup firmware</div><div class='add'>+in non-traditional paths -- paths outside of the listing documented in the</div><div class='add'>+section 'Direct filesystem lookup'. This option is not available to any of</div><div class='add'>+the other API calls as uevents are always forced for them.</div><div class='add'>+</div><div class='add'>+Since uevents are only meaningful if the fallback mechanism is enabled</div><div class='add'>+in your kernel it would seem odd to enable uevents with kernels that do not</div><div class='add'>+have the fallback mechanism enabled in their kernels. Unfortunately we also</div><div class='add'>+rely on the uevent flag which can be disabled by request_firmware_nowait() to</div><div class='add'>+also setup the firmware cache for firmware requests. As documented above,</div><div class='add'>+the firmware cache is only set up if uevent is enabled for an API call.</div><div class='add'>+Although this can disable the firmware cache for request_firmware_nowait()</div><div class='add'>+calls, users of this API should not use it for the purposes of disabling</div><div class='add'>+the cache as that was not the original purpose of the flag. Not setting</div><div class='add'>+the uevent flag means you want to opt-in for the firmware fallback mechanism</div><div class='add'>+but you want to suppress kobject uevents, as you have a custom solution which</div><div class='add'>+will monitor for your device addition into the device hierarchy somehow and</div><div class='add'>+load firmware for you through a custom path.</div><div class='add'>+</div><div class='add'>+Firmware fallback timeout</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+The firmware fallback mechanism has a timeout. If firmware is not loaded</div><div class='add'>+onto the sysfs interface by the timeout value an error is sent to the</div><div class='add'>+driver. By default the timeout is set to 60 seconds if uevents are</div><div class='add'>+desirable, otherwise MAX_JIFFY_OFFSET is used (max timeout possible).</div><div class='add'>+The logic behind using MAX_JIFFY_OFFSET for non-uevents is that a custom</div><div class='add'>+solution will have as much time as it needs to load firmware.</div><div class='add'>+</div><div class='add'>+You can customize the firmware timeout by echo'ing your desired timeout into</div><div class='add'>+the following file:</div><div class='add'>+</div><div class='add'>+* /sys/class/firmware/timeout</div><div class='add'>+</div><div class='add'>+If you echo 0 into it means MAX_JIFFY_OFFSET will be used. The data type</div><div class='add'>+for the timeout is an int.</div><div class='head'>diff --git a/Documentation/driver-api/firmware/firmware_cache.rst b/Documentation/driver-api/firmware/firmware_cache.rst<br/>new file mode 100644<br/>index 000000000000..2210e5bfb332<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/firmware/firmware_cache.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/firmware_cache.rst</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+==============</div><div class='add'>+Firmware cache</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+When Linux resumes from suspend some device drivers require firmware lookups to</div><div class='add'>+re-initialize devices. During resume there may be a period of time during which</div><div class='add'>+firmware lookups are not possible, during this short period of time firmware</div><div class='add'>+requests will fail. Time is of essence though, and delaying drivers to wait for</div><div class='add'>+the root filesystem for firmware delays user experience with device</div><div class='add'>+functionality. In order to support these requirements the firmware</div><div class='add'>+infrastructure implements a firmware cache for device drivers for most API</div><div class='add'>+calls, automatically behind the scenes.</div><div class='add'>+</div><div class='add'>+The firmware cache makes using certain firmware API calls safe during a device</div><div class='add'>+driver's suspend and resume callback.  Users of these API calls needn't cache</div><div class='add'>+the firmware by themselves for dealing with firmware loss during system resume.</div><div class='add'>+</div><div class='add'>+The firmware cache works by requesting for firmware prior to suspend and</div><div class='add'>+caching it in memory. Upon resume device drivers using the firmware API will</div><div class='add'>+have access to the firmware immediately, without having to wait for the root</div><div class='add'>+filesystem to mount or dealing with possible race issues with lookups as the</div><div class='add'>+root filesystem mounts.</div><div class='add'>+</div><div class='add'>+Some implementation details about the firmware cache setup:</div><div class='add'>+</div><div class='add'>+* The firmware cache is setup by adding a devres entry for each device that</div><div class='add'>+  uses all synchronous call except :c:func:`request_firmware_into_buf`.</div><div class='add'>+</div><div class='add'>+* If an asynchronous call is used the firmware cache is only set up for a</div><div class='add'>+  device if if the second argument (uevent) to request_firmware_nowait() is</div><div class='add'>+  true. When uevent is true it requests that a kobject uevent be sent to</div><div class='add'>+  userspace for the firmware request. For details refer to the Fackback</div><div class='add'>+  mechanism documented below.</div><div class='add'>+</div><div class='add'>+* If the firmware cache is determined to be needed as per the above two</div><div class='add'>+  criteria the firmware cache is setup by adding a devres entry for the</div><div class='add'>+  device making the firmware request.</div><div class='add'>+</div><div class='add'>+* The firmware devres entry is maintained throughout the lifetime of the</div><div class='add'>+  device. This means that even if you release_firmware() the firmware cache</div><div class='add'>+  will still be used on resume from suspend.</div><div class='add'>+</div><div class='add'>+* The timeout for the fallback mechanism is temporarily reduced to 10 seconds</div><div class='add'>+  as the firmware cache is set up during suspend, the timeout is set back to</div><div class='add'>+  the old value you had configured after the cache is set up.</div><div class='add'>+</div><div class='add'>+* Upon suspend any pending non-uevent firmware requests are killed to avoid</div><div class='add'>+  stalling the kernel, this is done with kill_requests_without_uevent(). Kernel</div><div class='add'>+  calls requiring the non-uevent therefore need to implement their own firmware</div><div class='add'>+  cache mechanism but must not use the firmware API on suspend.</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/driver-api/firmware/fw_search_path.rst b/Documentation/driver-api/firmware/fw_search_path.rst<br/>new file mode 100644<br/>index 000000000000..a360f1009fa3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/firmware/fw_search_path.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/fw_search_path.rst</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+=====================</div><div class='add'>+Firmware search paths</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+The following search paths are used to look for firmware on your</div><div class='add'>+root filesystem.</div><div class='add'>+</div><div class='add'>+* fw_path_para - module parameter - default is empty so this is ignored</div><div class='add'>+* /lib/firmware/updates/UTS_RELEASE/</div><div class='add'>+* /lib/firmware/updates/</div><div class='add'>+* /lib/firmware/UTS_RELEASE/</div><div class='add'>+* /lib/firmware/</div><div class='add'>+</div><div class='add'>+The module parameter ''path'' can be passed to the firmware_class module</div><div class='add'>+to activate the first optional custom fw_path_para. The custom path can</div><div class='add'>+only be up to 256 characters long. The kernel parameter passed would be:</div><div class='add'>+</div><div class='add'>+* 'firmware_class.path=$CUSTOMIZED_PATH'</div><div class='add'>+</div><div class='add'>+There is an alternative to customize the path at run time after bootup, you</div><div class='add'>+can use the file:</div><div class='add'>+</div><div class='add'>+* /sys/module/firmware_class/parameters/path</div><div class='add'>+</div><div class='add'>+You would echo into it your custom path and firmware requested will be</div><div class='add'>+searched for there first.</div><div class='head'>diff --git a/Documentation/driver-api/firmware/index.rst b/Documentation/driver-api/firmware/index.rst<br/>new file mode 100644<br/>index 000000000000..1abe01793031<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/firmware/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/index.rst</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+==================</div><div class='add'>+Linux Firmware API</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+</div><div class='add'>+   introduction</div><div class='add'>+   core</div><div class='add'>+   request_firmware</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/driver-api/firmware/introduction.rst b/Documentation/driver-api/firmware/introduction.rst<br/>new file mode 100644<br/>index 000000000000..211cb44eb972<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/firmware/introduction.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/introduction.rst</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+============</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+The firmware API enables kernel code to request files required</div><div class='add'>+for functionality from userspace, the uses vary:</div><div class='add'>+</div><div class='add'>+* Microcode for CPU errata</div><div class='add'>+* Device driver firmware, required to be loaded onto device</div><div class='add'>+  microcontrollers</div><div class='add'>+* Device driver information data (calibration data, EEPROM overrides),</div><div class='add'>+  some of which can be completely optional.</div><div class='add'>+</div><div class='add'>+Types of firmware requests</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+There are two types of calls:</div><div class='add'>+</div><div class='add'>+* Synchronous</div><div class='add'>+* Asynchronous</div><div class='add'>+</div><div class='add'>+Which one you use vary depending on your requirements, the rule of thumb</div><div class='add'>+however is you should strive to use the asynchronous APIs unless you also</div><div class='add'>+are already using asynchronous initialization mechanisms which will not</div><div class='add'>+stall or delay boot. Even if loading firmware does not take a lot of time</div><div class='add'>+processing firmware might, and this can still delay boot or initialization,</div><div class='add'>+as such mechanisms such as asynchronous probe can help supplement drivers.</div><div class='head'>diff --git a/Documentation/driver-api/firmware/lookup-order.rst b/Documentation/driver-api/firmware/lookup-order.rst<br/>new file mode 100644<br/>index 000000000000..88c81739683c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/firmware/lookup-order.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/lookup-order.rst</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+=====================</div><div class='add'>+Firmware lookup order</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+Different functionality is available to enable firmware to be found.</div><div class='add'>+Below is chronological order of how firmware will be looked for once</div><div class='add'>+a driver issues a firmware API call.</div><div class='add'>+</div><div class='add'>+* The ''Built-in firmware'' is checked first, if the firmware is present we</div><div class='add'>+  return it immediately</div><div class='add'>+* The ''Firmware cache'' is looked at next. If the firmware is found we</div><div class='add'>+  return it immediately</div><div class='add'>+* The ''Direct filesystem lookup'' is performed next, if found we</div><div class='add'>+  return it immediately</div><div class='add'>+* If no firmware has been found and the fallback mechanism was enabled</div><div class='add'>+  the sysfs interface is created. After this either a kobject uevent</div><div class='add'>+  is issued or the custom firmware loading is relied upon for firmware</div><div class='add'>+  loading up to the timeout value.</div><div class='head'>diff --git a/Documentation/driver-api/firmware/request_firmware.rst b/Documentation/driver-api/firmware/request_firmware.rst<br/>new file mode 100644<br/>index 000000000000..cc0aea880824<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/firmware/request_firmware.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/firmware/request_firmware.rst</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+====================</div><div class='add'>+request_firmware API</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+You would typically load firmware and then load it into your device somehow.</div><div class='add'>+The typical firmware work flow is reflected below::</div><div class='add'>+</div><div class='add'>+	 if(request_firmware(&amp;fw_entry, $FIRMWARE, device) == 0)</div><div class='add'>+                copy_fw_to_device(fw_entry-&gt;data, fw_entry-&gt;size);</div><div class='add'>+	 release_firmware(fw_entry);</div><div class='add'>+</div><div class='add'>+Synchronous firmware requests</div><div class='add'>+=============================</div><div class='add'>+</div><div class='add'>+Synchronous firmware requests will wait until the firmware is found or until</div><div class='add'>+an error is returned.</div><div class='add'>+</div><div class='add'>+request_firmware</div><div class='add'>+----------------</div><div class='add'>+.. kernel-doc:: drivers/base/firmware_class.c</div><div class='add'>+   :functions: request_firmware</div><div class='add'>+</div><div class='add'>+request_firmware_direct</div><div class='add'>+-----------------------</div><div class='add'>+.. kernel-doc:: drivers/base/firmware_class.c</div><div class='add'>+   :functions: request_firmware_direct</div><div class='add'>+</div><div class='add'>+request_firmware_into_buf</div><div class='add'>+-------------------------</div><div class='add'>+.. kernel-doc:: drivers/base/firmware_class.c</div><div class='add'>+   :functions: request_firmware_into_buf</div><div class='add'>+</div><div class='add'>+Asynchronous firmware requests</div><div class='add'>+==============================</div><div class='add'>+</div><div class='add'>+Asynchronous firmware requests allow driver code to not have to wait</div><div class='add'>+until the firmware or an error is returned. Function callbacks are</div><div class='add'>+provided so that when the firmware or an error is found the driver is</div><div class='add'>+informed through the callback. request_firmware_nowait() cannot be called</div><div class='add'>+in atomic contexts.</div><div class='add'>+</div><div class='add'>+request_firmware_nowait</div><div class='add'>+-----------------------</div><div class='add'>+.. kernel-doc:: drivers/base/firmware_class.c</div><div class='add'>+   :functions: request_firmware_nowait</div><div class='add'>+</div><div class='add'>+request firmware API expected driver use</div><div class='add'>+========================================</div><div class='add'>+</div><div class='add'>+Once an API call returns you process the firmware and then release the</div><div class='add'>+firmware. For example if you used request_firmware() and it returns,</div><div class='add'>+the driver has the firmware image accessible in fw_entry-&gt;{data,size}.</div><div class='add'>+If something went wrong request_firmware() returns non-zero and fw_entry</div><div class='add'>+is set to NULL. Once your driver is done with processing the firmware it</div><div class='add'>+can call call release_firmware(fw_entry) to release the firmware image</div><div class='add'>+and any related resource.</div><div class='head'>diff --git a/Documentation/driver-api/iio/buffers.rst b/Documentation/driver-api/iio/buffers.rst<br/>new file mode 100644<br/>index 000000000000..02c99a6bee18<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/iio/buffers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/buffers.rst</a></div><div class='hunk'>@@ -0,0 +1,125 @@</div><div class='add'>+=======</div><div class='add'>+Buffers</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+* struct :c:type:`iio_buffer` — general buffer structure</div><div class='add'>+* :c:func:`iio_validate_scan_mask_onehot` — Validates that exactly one channel</div><div class='add'>+  is selected</div><div class='add'>+* :c:func:`iio_buffer_get` — Grab a reference to the buffer</div><div class='add'>+* :c:func:`iio_buffer_put` — Release the reference to the buffer</div><div class='add'>+</div><div class='add'>+The Industrial I/O core offers a way for continuous data capture based on a</div><div class='add'>+trigger source. Multiple data channels can be read at once from</div><div class='add'>+:file:`/dev/iio:device{X}` character device node, thus reducing the CPU load.</div><div class='add'>+</div><div class='add'>+IIO buffer sysfs interface</div><div class='add'>+==========================</div><div class='add'>+An IIO buffer has an associated attributes directory under</div><div class='add'>+:file:`/sys/bus/iio/iio:device{X}/buffer/*`. Here are some of the existing</div><div class='add'>+attributes:</div><div class='add'>+</div><div class='add'>+* :file:`length`, the total number of data samples (capacity) that can be</div><div class='add'>+  stored by the buffer.</div><div class='add'>+* :file:`enable`, activate buffer capture.</div><div class='add'>+</div><div class='add'>+IIO buffer setup</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+The meta information associated with a channel reading placed in a buffer is</div><div class='add'>+called a scan element . The important bits configuring scan elements are</div><div class='add'>+exposed to userspace applications via the</div><div class='add'>+:file:`/sys/bus/iio/iio:device{X}/scan_elements/*` directory. This file contains</div><div class='add'>+attributes of the following form:</div><div class='add'>+</div><div class='add'>+* :file:`enable`, used for enabling a channel. If and only if its attribute</div><div class='add'>+  is non *zero*, then a triggered capture will contain data samples for this</div><div class='add'>+  channel.</div><div class='add'>+* :file:`type`, description of the scan element data storage within the buffer</div><div class='add'>+  and hence the form in which it is read from user space.</div><div class='add'>+  Format is [be|le]:[s|u]bits/storagebitsXrepeat[&gt;&gt;shift] .</div><div class='add'>+  * *be* or *le*, specifies big or little endian.</div><div class='add'>+  * *s* or *u*, specifies if signed (2's complement) or unsigned.</div><div class='add'>+  * *bits*, is the number of valid data bits.</div><div class='add'>+  * *storagebits*, is the number of bits (after padding) that it occupies in the</div><div class='add'>+  buffer.</div><div class='add'>+  * *shift*, if specified, is the shift that needs to be applied prior to</div><div class='add'>+  masking out unused bits.</div><div class='add'>+  * *repeat*, specifies the number of bits/storagebits repetitions. When the</div><div class='add'>+  repeat element is 0 or 1, then the repeat value is omitted.</div><div class='add'>+</div><div class='add'>+For example, a driver for a 3-axis accelerometer with 12 bit resolution where</div><div class='add'>+data is stored in two 8-bits registers as follows::</div><div class='add'>+</div><div class='add'>+        7   6   5   4   3   2   1   0</div><div class='add'>+      +---+---+---+---+---+---+---+---+</div><div class='add'>+      |D3 |D2 |D1 |D0 | X | X | X | X | (LOW byte, address 0x06)</div><div class='add'>+      +---+---+---+---+---+---+---+---+</div><div class='add'>+</div><div class='add'>+        7   6   5   4   3   2   1   0</div><div class='add'>+      +---+---+---+---+---+---+---+---+</div><div class='add'>+      |D11|D10|D9 |D8 |D7 |D6 |D5 |D4 | (HIGH byte, address 0x07)</div><div class='add'>+      +---+---+---+---+---+---+---+---+</div><div class='add'>+</div><div class='add'>+will have the following scan element type for each axis::</div><div class='add'>+</div><div class='add'>+      $ cat /sys/bus/iio/devices/iio:device0/scan_elements/in_accel_y_type</div><div class='add'>+      le:s12/16&gt;&gt;4</div><div class='add'>+</div><div class='add'>+A user space application will interpret data samples read from the buffer as</div><div class='add'>+two byte little endian signed data, that needs a 4 bits right shift before</div><div class='add'>+masking out the 12 valid bits of data.</div><div class='add'>+</div><div class='add'>+For implementing buffer support a driver should initialize the following</div><div class='add'>+fields in iio_chan_spec definition::</div><div class='add'>+</div><div class='add'>+   struct iio_chan_spec {</div><div class='add'>+   /* other members */</div><div class='add'>+           int scan_index</div><div class='add'>+           struct {</div><div class='add'>+                   char sign;</div><div class='add'>+                   u8 realbits;</div><div class='add'>+                   u8 storagebits;</div><div class='add'>+                   u8 shift;</div><div class='add'>+                   u8 repeat;</div><div class='add'>+                   enum iio_endian endianness;</div><div class='add'>+                  } scan_type;</div><div class='add'>+          };</div><div class='add'>+</div><div class='add'>+The driver implementing the accelerometer described above will have the</div><div class='add'>+following channel definition::</div><div class='add'>+</div><div class='add'>+   struct struct iio_chan_spec accel_channels[] = {</div><div class='add'>+           {</div><div class='add'>+                   .type = IIO_ACCEL,</div><div class='add'>+		   .modified = 1,</div><div class='add'>+		   .channel2 = IIO_MOD_X,</div><div class='add'>+		   /* other stuff here */</div><div class='add'>+		   .scan_index = 0,</div><div class='add'>+		   .scan_type = {</div><div class='add'>+		           .sign = 's',</div><div class='add'>+			   .realbits = 12,</div><div class='add'>+			   .storagebits = 16,</div><div class='add'>+			   .shift = 4,</div><div class='add'>+			   .endianness = IIO_LE,</div><div class='add'>+		   },</div><div class='add'>+           }</div><div class='add'>+           /* similar for Y (with channel2 = IIO_MOD_Y, scan_index = 1)</div><div class='add'>+            * and Z (with channel2 = IIO_MOD_Z, scan_index = 2) axis</div><div class='add'>+            */</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+Here **scan_index** defines the order in which the enabled channels are placed</div><div class='add'>+inside the buffer. Channels with a lower **scan_index** will be placed before</div><div class='add'>+channels with a higher index. Each channel needs to have a unique</div><div class='add'>+**scan_index**.</div><div class='add'>+</div><div class='add'>+Setting **scan_index** to -1 can be used to indicate that the specific channel</div><div class='add'>+does not support buffered capture. In this case no entries will be created for</div><div class='add'>+the channel in the scan_elements directory.</div><div class='add'>+</div><div class='add'>+More details</div><div class='add'>+============</div><div class='add'>+.. kernel-doc:: include/linux/iio/buffer.h</div><div class='add'>+.. kernel-doc:: drivers/iio/industrialio-buffer.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/driver-api/iio/core.rst b/Documentation/driver-api/iio/core.rst<br/>new file mode 100644<br/>index 000000000000..9a34ae03b679<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/iio/core.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/core.rst</a></div><div class='hunk'>@@ -0,0 +1,182 @@</div><div class='add'>+=============</div><div class='add'>+Core elements</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+The Industrial I/O core offers a unified framework for writing drivers for</div><div class='add'>+many different types of embedded sensors. a standard interface to user space</div><div class='add'>+applications manipulating sensors. The implementation can be found under</div><div class='add'>+:file:`drivers/iio/industrialio-*`</div><div class='add'>+</div><div class='add'>+Industrial I/O Devices</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+* struct :c:type:`iio_dev` - industrial I/O device</div><div class='add'>+* :c:func:`iio_device_alloc()` - alocate an :c:type:`iio_dev` from a driver</div><div class='add'>+* :c:func:`iio_device_free()` - free an :c:type:`iio_dev` from a driver</div><div class='add'>+* :c:func:`iio_device_register()` - register a device with the IIO subsystem</div><div class='add'>+* :c:func:`iio_device_unregister()` - unregister a device from the IIO</div><div class='add'>+  subsystem</div><div class='add'>+</div><div class='add'>+An IIO device usually corresponds to a single hardware sensor and it</div><div class='add'>+provides all the information needed by a driver handling a device.</div><div class='add'>+Let's first have a look at the functionality embedded in an IIO device</div><div class='add'>+then we will show how a device driver makes use of an IIO device.</div><div class='add'>+</div><div class='add'>+There are two ways for a user space application to interact with an IIO driver.</div><div class='add'>+</div><div class='add'>+1. :file:`/sys/bus/iio/iio:device{X}/`, this represents a hardware sensor</div><div class='add'>+   and groups together the data channels of the same chip.</div><div class='add'>+2. :file:`/dev/iio:device{X}`, character device node interface used for</div><div class='add'>+   buffered data transfer and for events information retrieval.</div><div class='add'>+</div><div class='add'>+A typical IIO driver will register itself as an :doc:`I2C &lt;../i2c&gt;` or</div><div class='add'>+:doc:`SPI &lt;../spi&gt;` driver and will create two routines, probe and remove.</div><div class='add'>+</div><div class='add'>+At probe:</div><div class='add'>+</div><div class='add'>+1. Call :c:func:`iio_device_alloc()`, which allocates memory for an IIO device.</div><div class='add'>+2. Initialize IIO device fields with driver specific information (e.g.</div><div class='add'>+   device name, device channels).</div><div class='add'>+3. Call :c:func:`iio_device_register()`, this registers the device with the</div><div class='add'>+   IIO core. After this call the device is ready to accept requests from user</div><div class='add'>+   space applications.</div><div class='add'>+</div><div class='add'>+At remove, we free the resources allocated in probe in reverse order:</div><div class='add'>+</div><div class='add'>+1. :c:func:`iio_device_unregister()`, unregister the device from the IIO core.</div><div class='add'>+2. :c:func:`iio_device_free()`, free the memory allocated for the IIO device.</div><div class='add'>+</div><div class='add'>+IIO device sysfs interface</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+Attributes are sysfs files used to expose chip info and also allowing</div><div class='add'>+applications to set various configuration parameters. For device with</div><div class='add'>+index X, attributes can be found under /sys/bus/iio/iio:deviceX/ directory.</div><div class='add'>+Common attributes are:</div><div class='add'>+</div><div class='add'>+* :file:`name`, description of the physical chip.</div><div class='add'>+* :file:`dev`, shows the major:minor pair associated with</div><div class='add'>+  :file:`/dev/iio:deviceX` node.</div><div class='add'>+* :file:`sampling_frequency_available`, available discrete set of sampling</div><div class='add'>+  frequency values for device.</div><div class='add'>+* Available standard attributes for IIO devices are described in the</div><div class='add'>+  :file:`Documentation/ABI/testing/sysfs-bus-iio` file in the Linux kernel</div><div class='add'>+  sources.</div><div class='add'>+</div><div class='add'>+IIO device channels</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+struct :c:type:`iio_chan_spec` - specification of a single channel</div><div class='add'>+</div><div class='add'>+An IIO device channel is a representation of a data channel. An IIO device can</div><div class='add'>+have one or multiple channels. For example:</div><div class='add'>+</div><div class='add'>+* a thermometer sensor has one channel representing the temperature measurement.</div><div class='add'>+* a light sensor with two channels indicating the measurements in the visible</div><div class='add'>+  and infrared spectrum.</div><div class='add'>+* an accelerometer can have up to 3 channels representing acceleration on X, Y</div><div class='add'>+  and Z axes.</div><div class='add'>+</div><div class='add'>+An IIO channel is described by the struct :c:type:`iio_chan_spec`.</div><div class='add'>+A thermometer driver for the temperature sensor in the example above would</div><div class='add'>+have to describe its channel as follows::</div><div class='add'>+</div><div class='add'>+   static const struct iio_chan_spec temp_channel[] = {</div><div class='add'>+        {</div><div class='add'>+            .type = IIO_TEMP,</div><div class='add'>+            .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),</div><div class='add'>+        },</div><div class='add'>+   };</div><div class='add'>+</div><div class='add'>+Channel sysfs attributes exposed to userspace are specified in the form of</div><div class='add'>+bitmasks. Depending on their shared info, attributes can be set in one of the</div><div class='add'>+following masks:</div><div class='add'>+</div><div class='add'>+* **info_mask_separate**, attributes will be specific to</div><div class='add'>+  this channel</div><div class='add'>+* **info_mask_shared_by_type**, attributes are shared by all channels of the</div><div class='add'>+  same type</div><div class='add'>+* **info_mask_shared_by_dir**, attributes are shared by all channels of the same</div><div class='add'>+  direction</div><div class='add'>+* **info_mask_shared_by_all**, attributes are shared by all channels</div><div class='add'>+</div><div class='add'>+When there are multiple data channels per channel type we have two ways to</div><div class='add'>+distinguish between them:</div><div class='add'>+</div><div class='add'>+* set **.modified** field of :c:type:`iio_chan_spec` to 1. Modifiers are</div><div class='add'>+  specified using **.channel2** field of the same :c:type:`iio_chan_spec`</div><div class='add'>+  structure and are used to indicate a physically unique characteristic of the</div><div class='add'>+  channel such as its direction or spectral response. For example, a light</div><div class='add'>+  sensor can have two channels, one for infrared light and one for both</div><div class='add'>+  infrared and visible light.</div><div class='add'>+* set **.indexed** field of :c:type:`iio_chan_spec` to 1. In this case the</div><div class='add'>+  channel is simply another instance with an index specified by the **.channel**</div><div class='add'>+  field.</div><div class='add'>+</div><div class='add'>+Here is how we can make use of the channel's modifiers::</div><div class='add'>+</div><div class='add'>+   static const struct iio_chan_spec light_channels[] = {</div><div class='add'>+           {</div><div class='add'>+                   .type = IIO_INTENSITY,</div><div class='add'>+                   .modified = 1,</div><div class='add'>+                   .channel2 = IIO_MOD_LIGHT_IR,</div><div class='add'>+                   .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),</div><div class='add'>+                   .info_mask_shared = BIT(IIO_CHAN_INFO_SAMP_FREQ),</div><div class='add'>+           },</div><div class='add'>+           {</div><div class='add'>+                   .type = IIO_INTENSITY,</div><div class='add'>+                   .modified = 1,</div><div class='add'>+                   .channel2 = IIO_MOD_LIGHT_BOTH,</div><div class='add'>+                   .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),</div><div class='add'>+                   .info_mask_shared = BIT(IIO_CHAN_INFO_SAMP_FREQ),</div><div class='add'>+           },</div><div class='add'>+           {</div><div class='add'>+                   .type = IIO_LIGHT,</div><div class='add'>+                   .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),</div><div class='add'>+                   .info_mask_shared = BIT(IIO_CHAN_INFO_SAMP_FREQ),</div><div class='add'>+           },</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+This channel's definition will generate two separate sysfs files for raw data</div><div class='add'>+retrieval:</div><div class='add'>+</div><div class='add'>+* :file:`/sys/bus/iio/iio:device{X}/in_intensity_ir_raw`</div><div class='add'>+* :file:`/sys/bus/iio/iio:device{X}/in_intensity_both_raw`</div><div class='add'>+</div><div class='add'>+one file for processed data:</div><div class='add'>+</div><div class='add'>+* :file:`/sys/bus/iio/iio:device{X}/in_illuminance_input`</div><div class='add'>+</div><div class='add'>+and one shared sysfs file for sampling frequency:</div><div class='add'>+</div><div class='add'>+* :file:`/sys/bus/iio/iio:device{X}/sampling_frequency`.</div><div class='add'>+</div><div class='add'>+Here is how we can make use of the channel's indexing::</div><div class='add'>+</div><div class='add'>+   static const struct iio_chan_spec light_channels[] = {</div><div class='add'>+           {</div><div class='add'>+                   .type = IIO_VOLTAGE,</div><div class='add'>+		   .indexed = 1,</div><div class='add'>+		   .channel = 0,</div><div class='add'>+		   .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),</div><div class='add'>+	   },</div><div class='add'>+           {</div><div class='add'>+	           .type = IIO_VOLTAGE,</div><div class='add'>+                   .indexed = 1,</div><div class='add'>+                   .channel = 1,</div><div class='add'>+                   .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),</div><div class='add'>+           },</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+This will generate two separate attributes files for raw data retrieval:</div><div class='add'>+</div><div class='add'>+* :file:`/sys/bus/iio/devices/iio:device{X}/in_voltage0_raw`, representing</div><div class='add'>+  voltage measurement for channel 0.</div><div class='add'>+* :file:`/sys/bus/iio/devices/iio:device{X}/in_voltage1_raw`, representing</div><div class='add'>+  voltage measurement for channel 1.</div><div class='add'>+</div><div class='add'>+More details</div><div class='add'>+============</div><div class='add'>+.. kernel-doc:: include/linux/iio/iio.h</div><div class='add'>+.. kernel-doc:: drivers/iio/industrialio-core.c</div><div class='add'>+   :export:</div><div class='head'>diff --git a/Documentation/driver-api/iio/index.rst b/Documentation/driver-api/iio/index.rst<br/>new file mode 100644<br/>index 000000000000..e5c3922d1b6f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/iio/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/index.rst</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='add'>+Industrial I/O</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+**Copyright** |copy| 2015 Intel Corporation</div><div class='add'>+</div><div class='add'>+Contents:</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   intro</div><div class='add'>+   core</div><div class='add'>+   buffers</div><div class='add'>+   triggers</div><div class='add'>+   triggered-buffers</div><div class='head'>diff --git a/Documentation/driver-api/iio/intro.rst b/Documentation/driver-api/iio/intro.rst<br/>new file mode 100644<br/>index 000000000000..3653fbd57069<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/iio/intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/intro.rst</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+.. include:: &lt;isonum.txt&gt;</div><div class='add'>+</div><div class='add'>+============</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+The main purpose of the Industrial I/O subsystem (IIO) is to provide support</div><div class='add'>+for devices that in some sense perform either</div><div class='add'>+analog-to-digital conversion (ADC) or digital-to-analog conversion (DAC)</div><div class='add'>+or both. The aim is to fill the gap between the somewhat similar hwmon and</div><div class='add'>+:doc:`input &lt;../input&gt;` subsystems. Hwmon is directed at low sample rate</div><div class='add'>+sensors used to monitor and control the system itself, like fan speed control</div><div class='add'>+or temperature measurement. :doc:`Input &lt;../input&gt;` is, as its name suggests,</div><div class='add'>+focused on human interaction input devices (keyboard, mouse, touchscreen).</div><div class='add'>+In some cases there is considerable overlap between these and IIO.</div><div class='add'>+</div><div class='add'>+Devices that fall into this category include:</div><div class='add'>+</div><div class='add'>+* analog to digital converters (ADCs)</div><div class='add'>+* accelerometers</div><div class='add'>+* capacitance to digital converters (CDCs)</div><div class='add'>+* digital to analog converters (DACs)</div><div class='add'>+* gyroscopes</div><div class='add'>+* inertial measurement units (IMUs)</div><div class='add'>+* color and light sensors</div><div class='add'>+* magnetometers</div><div class='add'>+* pressure sensors</div><div class='add'>+* proximity sensors</div><div class='add'>+* temperature sensors</div><div class='add'>+</div><div class='add'>+Usually these sensors are connected via :doc:`SPI &lt;../spi&gt;` or</div><div class='add'>+:doc:`I2C &lt;../i2c&gt;`. A common use case of the sensors devices is to have</div><div class='add'>+combined functionality (e.g. light plus proximity sensor).</div><div class='head'>diff --git a/Documentation/driver-api/iio/triggered-buffers.rst b/Documentation/driver-api/iio/triggered-buffers.rst<br/>new file mode 100644<br/>index 000000000000..0db12660cc90<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/iio/triggered-buffers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/triggered-buffers.rst</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+=================</div><div class='add'>+Triggered Buffers</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+Now that we know what buffers and triggers are let's see how they work together.</div><div class='add'>+</div><div class='add'>+IIO triggered buffer setup</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+* :c:func:`iio_triggered_buffer_setup` — Setup triggered buffer and pollfunc</div><div class='add'>+* :c:func:`iio_triggered_buffer_cleanup` — Free resources allocated by</div><div class='add'>+  :c:func:`iio_triggered_buffer_setup`</div><div class='add'>+* struct :c:type:`iio_buffer_setup_ops` — buffer setup related callbacks</div><div class='add'>+</div><div class='add'>+A typical triggered buffer setup looks like this::</div><div class='add'>+</div><div class='add'>+    const struct iio_buffer_setup_ops sensor_buffer_setup_ops = {</div><div class='add'>+      .preenable    = sensor_buffer_preenable,</div><div class='add'>+      .postenable   = sensor_buffer_postenable,</div><div class='add'>+      .postdisable  = sensor_buffer_postdisable,</div><div class='add'>+      .predisable   = sensor_buffer_predisable,</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    irqreturn_t sensor_iio_pollfunc(int irq, void *p)</div><div class='add'>+    {</div><div class='add'>+        pf-&gt;timestamp = iio_get_time_ns((struct indio_dev *)p);</div><div class='add'>+        return IRQ_WAKE_THREAD;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    irqreturn_t sensor_trigger_handler(int irq, void *p)</div><div class='add'>+    {</div><div class='add'>+        u16 buf[8];</div><div class='add'>+        int i = 0;</div><div class='add'>+</div><div class='add'>+        /* read data for each active channel */</div><div class='add'>+        for_each_set_bit(bit, active_scan_mask, masklength)</div><div class='add'>+            buf[i++] = sensor_get_data(bit)</div><div class='add'>+</div><div class='add'>+        iio_push_to_buffers_with_timestamp(indio_dev, buf, timestamp);</div><div class='add'>+</div><div class='add'>+        iio_trigger_notify_done(trigger);</div><div class='add'>+        return IRQ_HANDLED;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* setup triggered buffer, usually in probe function */</div><div class='add'>+    iio_triggered_buffer_setup(indio_dev, sensor_iio_polfunc,</div><div class='add'>+                               sensor_trigger_handler,</div><div class='add'>+                               sensor_buffer_setup_ops);</div><div class='add'>+</div><div class='add'>+The important things to notice here are:</div><div class='add'>+</div><div class='add'>+* :c:type:`iio_buffer_setup_ops`, the buffer setup functions to be called at</div><div class='add'>+  predefined points in the buffer configuration sequence (e.g. before enable,</div><div class='add'>+  after disable). If not specified, the IIO core uses the default</div><div class='add'>+  iio_triggered_buffer_setup_ops.</div><div class='add'>+* **sensor_iio_pollfunc**, the function that will be used as top half of poll</div><div class='add'>+  function. It should do as little processing as possible, because it runs in</div><div class='add'>+  interrupt context. The most common operation is recording of the current</div><div class='add'>+  timestamp and for this reason one can use the IIO core defined</div><div class='add'>+  :c:func:`iio_pollfunc_store_time` function.</div><div class='add'>+* **sensor_trigger_handler**, the function that will be used as bottom half of</div><div class='add'>+  the poll function. This runs in the context of a kernel thread and all the</div><div class='add'>+  processing takes place here. It usually reads data from the device and</div><div class='add'>+  stores it in the internal buffer together with the timestamp recorded in the</div><div class='add'>+  top half.</div><div class='add'>+</div><div class='add'>+More details</div><div class='add'>+============</div><div class='add'>+.. kernel-doc:: drivers/iio/buffer/industrialio-triggered-buffer.c</div><div class='head'>diff --git a/Documentation/driver-api/iio/triggers.rst b/Documentation/driver-api/iio/triggers.rst<br/>new file mode 100644<br/>index 000000000000..f89d37e7dd82<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/iio/triggers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/iio/triggers.rst</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+========</div><div class='add'>+Triggers</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+* struct :c:type:`iio_trigger` — industrial I/O trigger device</div><div class='add'>+* :c:func:`devm_iio_trigger_alloc` — Resource-managed iio_trigger_alloc</div><div class='add'>+* :c:func:`devm_iio_trigger_free` — Resource-managed iio_trigger_free</div><div class='add'>+* :c:func:`devm_iio_trigger_register` — Resource-managed iio_trigger_register</div><div class='add'>+* :c:func:`devm_iio_trigger_unregister` — Resource-managed</div><div class='add'>+  iio_trigger_unregister</div><div class='add'>+* :c:func:`iio_trigger_validate_own_device` — Check if a trigger and IIO</div><div class='add'>+  device belong to the same device</div><div class='add'>+</div><div class='add'>+In many situations it is useful for a driver to be able to capture data based</div><div class='add'>+on some external event (trigger) as opposed to periodically polling for data.</div><div class='add'>+An IIO trigger can be provided by a device driver that also has an IIO device</div><div class='add'>+based on hardware generated events (e.g. data ready or threshold exceeded) or</div><div class='add'>+provided by a separate driver from an independent interrupt source (e.g. GPIO</div><div class='add'>+line connected to some external system, timer interrupt or user space writing</div><div class='add'>+a specific file in sysfs). A trigger may initiate data capture for a number of</div><div class='add'>+sensors and also it may be completely unrelated to the sensor itself.</div><div class='add'>+</div><div class='add'>+IIO trigger sysfs interface</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+There are two locations in sysfs related to triggers:</div><div class='add'>+</div><div class='add'>+* :file:`/sys/bus/iio/devices/trigger{Y}/*`, this file is created once an</div><div class='add'>+  IIO trigger is registered with the IIO core and corresponds to trigger</div><div class='add'>+  with index Y.</div><div class='add'>+  Because triggers can be very different depending on type there are few</div><div class='add'>+  standard attributes that we can describe here:</div><div class='add'>+</div><div class='add'>+  * :file:`name`, trigger name that can be later used for association with a</div><div class='add'>+    device.</div><div class='add'>+  * :file:`sampling_frequency`, some timer based triggers use this attribute to</div><div class='add'>+    specify the frequency for trigger calls.</div><div class='add'>+</div><div class='add'>+* :file:`/sys/bus/iio/devices/iio:device{X}/trigger/*`, this directory is</div><div class='add'>+  created once the device supports a triggered buffer. We can associate a</div><div class='add'>+  trigger with our  device by writing the trigger's name in the</div><div class='add'>+  :file:`current_trigger` file.</div><div class='add'>+</div><div class='add'>+IIO trigger setup</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+Let's see a simple example of how to setup a trigger to be used by a driver::</div><div class='add'>+</div><div class='add'>+      struct iio_trigger_ops trigger_ops = {</div><div class='add'>+          .set_trigger_state = sample_trigger_state,</div><div class='add'>+          .validate_device = sample_validate_device,</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      struct iio_trigger *trig;</div><div class='add'>+</div><div class='add'>+      /* first, allocate memory for our trigger */</div><div class='add'>+      trig = iio_trigger_alloc(dev, "trig-%s-%d", name, idx);</div><div class='add'>+</div><div class='add'>+      /* setup trigger operations field */</div><div class='add'>+      trig-&gt;ops = &amp;trigger_ops;</div><div class='add'>+</div><div class='add'>+      /* now register the trigger with the IIO core */</div><div class='add'>+      iio_trigger_register(trig);</div><div class='add'>+</div><div class='add'>+IIO trigger ops</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+* struct :c:type:`iio_trigger_ops` — operations structure for an iio_trigger.</div><div class='add'>+</div><div class='add'>+Notice that a trigger has a set of operations attached:</div><div class='add'>+</div><div class='add'>+* :file:`set_trigger_state`, switch the trigger on/off on demand.</div><div class='add'>+* :file:`validate_device`, function to validate the device when the current</div><div class='add'>+  trigger gets changed.</div><div class='add'>+</div><div class='add'>+More details</div><div class='add'>+============</div><div class='add'>+.. kernel-doc:: include/linux/iio/trigger.h</div><div class='add'>+.. kernel-doc:: drivers/iio/industrialio-trigger.c</div><div class='add'>+   :export:</div><div class='head'>diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst<br/>index 8e259c5d0322..60db00d1532b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/driver-api/index.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/driver-api/index.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/index.rst</a></div><div class='hunk'>@@ -16,11 +16,30 @@ available subsections can be seen below.</div><div class='ctx'> </div><div class='ctx'>    basics</div><div class='ctx'>    infrastructure</div><div class='add'>+   pm/index</div><div class='add'>+   device-io</div><div class='add'>+   dma-buf</div><div class='add'>+   device_link</div><div class='ctx'>    message-based</div><div class='ctx'>    sound</div><div class='ctx'>    frame-buffer</div><div class='add'>+   regulator</div><div class='add'>+   iio/index</div><div class='ctx'>    input</div><div class='add'>+   usb</div><div class='ctx'>    spi</div><div class='ctx'>    i2c</div><div class='ctx'>    hsi</div><div class='add'>+   edac</div><div class='ctx'>    miscellaneous</div><div class='add'>+   vme</div><div class='add'>+   80211/index</div><div class='add'>+   uio-howto</div><div class='add'>+   firmware/index</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/driver-api/infrastructure.rst b/Documentation/driver-api/infrastructure.rst<br/>index 5d50d6733db3..6d9ff316b608 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/driver-api/infrastructure.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/driver-api/infrastructure.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/infrastructure.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/infrastructure.rst</a></div><div class='hunk'>@@ -46,76 +46,6 @@ Device Drivers Base</div><div class='ctx'> .. kernel-doc:: drivers/base/bus.c</div><div class='ctx'>    :export:</div><div class='ctx'> </div><div class='del'>-Buffer Sharing and Synchronization</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-The dma-buf subsystem provides the framework for sharing buffers for</div><div class='del'>-hardware (DMA) access across multiple device drivers and subsystems, and</div><div class='del'>-for synchronizing asynchronous hardware access.</div><div class='del'>-</div><div class='del'>-This is used, for example, by drm "prime" multi-GPU support, but is of</div><div class='del'>-course not limited to GPU use cases.</div><div class='del'>-</div><div class='del'>-The three main components of this are: (1) dma-buf, representing a</div><div class='del'>-sg_table and exposed to userspace as a file descriptor to allow passing</div><div class='del'>-between devices, (2) fence, which provides a mechanism to signal when</div><div class='del'>-one device as finished access, and (3) reservation, which manages the</div><div class='del'>-shared or exclusive fence(s) associated with the buffer.</div><div class='del'>-</div><div class='del'>-dma-buf</div><div class='del'>-~~~~~~~</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/dma-buf/dma-buf.c</div><div class='del'>-   :export:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: include/linux/dma-buf.h</div><div class='del'>-   :internal:</div><div class='del'>-</div><div class='del'>-reservation</div><div class='del'>-~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/dma-buf/reservation.c</div><div class='del'>-   :doc: Reservation Object Overview</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/dma-buf/reservation.c</div><div class='del'>-   :export:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: include/linux/reservation.h</div><div class='del'>-   :internal:</div><div class='del'>-</div><div class='del'>-fence</div><div class='del'>-~~~~~</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/dma-buf/fence.c</div><div class='del'>-   :export:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: include/linux/fence.h</div><div class='del'>-   :internal:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/dma-buf/seqno-fence.c</div><div class='del'>-   :export:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: include/linux/seqno-fence.h</div><div class='del'>-   :internal:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/dma-buf/fence-array.c</div><div class='del'>-   :export:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: include/linux/fence-array.h</div><div class='del'>-   :internal:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/dma-buf/reservation.c</div><div class='del'>-   :export:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: include/linux/reservation.h</div><div class='del'>-   :internal:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/dma-buf/sync_file.c</div><div class='del'>-   :export:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: include/linux/sync_file.h</div><div class='del'>-   :internal:</div><div class='del'>-</div><div class='ctx'> Device Drivers DMA Management</div><div class='ctx'> -----------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -125,21 +55,6 @@ Device Drivers DMA Management</div><div class='ctx'> .. kernel-doc:: drivers/base/dma-mapping.c</div><div class='ctx'>    :export:</div><div class='ctx'> </div><div class='del'>-Device Drivers Power Management</div><div class='del'>--------------------------------</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/base/power/main.c</div><div class='del'>-   :export:</div><div class='del'>-</div><div class='del'>-Device Drivers ACPI Support</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/acpi/scan.c</div><div class='del'>-   :export:</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/acpi/scan.c</div><div class='del'>-   :internal:</div><div class='del'>-</div><div class='ctx'> Device drivers PnP support</div><div class='ctx'> --------------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/driver-api/pm/conf.py b/Documentation/driver-api/pm/conf.py<br/>new file mode 100644<br/>index 000000000000..a89fac11272f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/pm/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/pm/conf.py</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# -*- coding: utf-8; mode: python -*-</div><div class='add'>+</div><div class='add'>+project = "Device Power Management"</div><div class='add'>+</div><div class='add'>+tags.add("subproject")</div><div class='add'>+</div><div class='add'>+latex_documents = [</div><div class='add'>+    ('index', 'pm.tex', project,</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+]</div><div class='head'>diff --git a/Documentation/driver-api/pm/devices.rst b/Documentation/driver-api/pm/devices.rst<br/>new file mode 100644<br/>index 000000000000..bedd32388dac<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/pm/devices.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/pm/devices.rst</a></div><div class='hunk'>@@ -0,0 +1,736 @@</div><div class='add'>+.. |struct dev_pm_ops| replace:: :c:type:`struct dev_pm_ops &lt;dev_pm_ops&gt;`</div><div class='add'>+.. |struct dev_pm_domain| replace:: :c:type:`struct dev_pm_domain &lt;dev_pm_domain&gt;`</div><div class='add'>+.. |struct bus_type| replace:: :c:type:`struct bus_type &lt;bus_type&gt;`</div><div class='add'>+.. |struct device_type| replace:: :c:type:`struct device_type &lt;device_type&gt;`</div><div class='add'>+.. |struct class| replace:: :c:type:`struct class &lt;class&gt;`</div><div class='add'>+.. |struct wakeup_source| replace:: :c:type:`struct wakeup_source &lt;wakeup_source&gt;`</div><div class='add'>+.. |struct device| replace:: :c:type:`struct device &lt;device&gt;`</div><div class='add'>+</div><div class='add'>+==============================</div><div class='add'>+Device Power Management Basics</div><div class='add'>+==============================</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+ Copyright (c) 2010-2011 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Novell Inc.</div><div class='add'>+ Copyright (c) 2010 Alan Stern &lt;stern@rowland.harvard.edu&gt;</div><div class='add'>+ Copyright (c) 2016 Intel Corp., Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='add'>+</div><div class='add'>+Most of the code in Linux is device drivers, so most of the Linux power</div><div class='add'>+management (PM) code is also driver-specific.  Most drivers will do very</div><div class='add'>+little; others, especially for platforms with small batteries (like cell</div><div class='add'>+phones), will do a lot.</div><div class='add'>+</div><div class='add'>+This writeup gives an overview of how drivers interact with system-wide</div><div class='add'>+power management goals, emphasizing the models and interfaces that are</div><div class='add'>+shared by everything that hooks up to the driver model core.  Read it as</div><div class='add'>+background for the domain-specific work you'd do with any specific driver.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Two Models for Device Power Management</div><div class='add'>+======================================</div><div class='add'>+</div><div class='add'>+Drivers will use one or both of these models to put devices into low-power</div><div class='add'>+states:</div><div class='add'>+</div><div class='add'>+    System Sleep model:</div><div class='add'>+</div><div class='add'>+	Drivers can enter low-power states as part of entering system-wide</div><div class='add'>+	low-power states like "suspend" (also known as "suspend-to-RAM"), or</div><div class='add'>+	(mostly for systems with disks) "hibernation" (also known as</div><div class='add'>+	"suspend-to-disk").</div><div class='add'>+</div><div class='add'>+	This is something that device, bus, and class drivers collaborate on</div><div class='add'>+	by implementing various role-specific suspend and resume methods to</div><div class='add'>+	cleanly power down hardware and software subsystems, then reactivate</div><div class='add'>+	them without loss of data.</div><div class='add'>+</div><div class='add'>+	Some drivers can manage hardware wakeup events, which make the system</div><div class='add'>+	leave the low-power state.  This feature may be enabled or disabled</div><div class='add'>+	using the relevant :file:`/sys/devices/.../power/wakeup` file (for</div><div class='add'>+	Ethernet drivers the ioctl interface used by ethtool may also be used</div><div class='add'>+	for this purpose); enabling it may cost some power usage, but let the</div><div class='add'>+	whole system enter low-power states more often.</div><div class='add'>+</div><div class='add'>+    Runtime Power Management model:</div><div class='add'>+</div><div class='add'>+	Devices may also be put into low-power states while the system is</div><div class='add'>+	running, independently of other power management activity in principle.</div><div class='add'>+	However, devices are not generally independent of each other (for</div><div class='add'>+	example, a parent device cannot be suspended unless all of its child</div><div class='add'>+	devices have been suspended).  Moreover, depending on the bus type the</div><div class='add'>+	device is on, it may be necessary to carry out some bus-specific</div><div class='add'>+	operations on the device for this purpose.  Devices put into low power</div><div class='add'>+	states at run time may require special handling during system-wide power</div><div class='add'>+	transitions (suspend or hibernation).</div><div class='add'>+</div><div class='add'>+	For these reasons not only the device driver itself, but also the</div><div class='add'>+	appropriate subsystem (bus type, device type or device class) driver and</div><div class='add'>+	the PM core are involved in runtime power management.  As in the system</div><div class='add'>+	sleep power management case, they need to collaborate by implementing</div><div class='add'>+	various role-specific suspend and resume methods, so that the hardware</div><div class='add'>+	is cleanly powered down and reactivated without data or service loss.</div><div class='add'>+</div><div class='add'>+There's not a lot to be said about those low-power states except that they are</div><div class='add'>+very system-specific, and often device-specific.  Also, that if enough devices</div><div class='add'>+have been put into low-power states (at runtime), the effect may be very similar</div><div class='add'>+to entering some system-wide low-power state (system sleep) ... and that</div><div class='add'>+synergies exist, so that several drivers using runtime PM might put the system</div><div class='add'>+into a state where even deeper power saving options are available.</div><div class='add'>+</div><div class='add'>+Most suspended devices will have quiesced all I/O: no more DMA or IRQs (except</div><div class='add'>+for wakeup events), no more data read or written, and requests from upstream</div><div class='add'>+drivers are no longer accepted.  A given bus or platform may have different</div><div class='add'>+requirements though.</div><div class='add'>+</div><div class='add'>+Examples of hardware wakeup events include an alarm from a real time clock,</div><div class='add'>+network wake-on-LAN packets, keyboard or mouse activity, and media insertion</div><div class='add'>+or removal (for PCMCIA, MMC/SD, USB, and so on).</div><div class='add'>+</div><div class='add'>+Interfaces for Entering System Sleep States</div><div class='add'>+===========================================</div><div class='add'>+</div><div class='add'>+There are programming interfaces provided for subsystems (bus type, device type,</div><div class='add'>+device class) and device drivers to allow them to participate in the power</div><div class='add'>+management of devices they are concerned with.  These interfaces cover both</div><div class='add'>+system sleep and runtime power management.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Device Power Management Operations</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+Device power management operations, at the subsystem level as well as at the</div><div class='add'>+device driver level, are implemented by defining and populating objects of type</div><div class='add'>+|struct dev_pm_ops| defined in :file:`include/linux/pm.h`.  The roles of the</div><div class='add'>+methods included in it will be explained in what follows.  For now, it should be</div><div class='add'>+sufficient to remember that the last three methods are specific to runtime power</div><div class='add'>+management while the remaining ones are used during system-wide power</div><div class='add'>+transitions.</div><div class='add'>+</div><div class='add'>+There also is a deprecated "old" or "legacy" interface for power management</div><div class='add'>+operations available at least for some subsystems.  This approach does not use</div><div class='add'>+|struct dev_pm_ops| objects and it is suitable only for implementing system</div><div class='add'>+sleep power management methods in a limited way.  Therefore it is not described</div><div class='add'>+in this document, so please refer directly to the source code for more</div><div class='add'>+information about it.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Subsystem-Level Methods</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+The core methods to suspend and resume devices reside in</div><div class='add'>+|struct dev_pm_ops| pointed to by the :c:member:`ops` member of</div><div class='add'>+|struct dev_pm_domain|, or by the :c:member:`pm` member of |struct bus_type|,</div><div class='add'>+|struct device_type| and |struct class|.  They are mostly of interest to the</div><div class='add'>+people writing infrastructure for platforms and buses, like PCI or USB, or</div><div class='add'>+device type and device class drivers.  They also are relevant to the writers of</div><div class='add'>+device drivers whose subsystems (PM domains, device types, device classes and</div><div class='add'>+bus types) don't provide all power management methods.</div><div class='add'>+</div><div class='add'>+Bus drivers implement these methods as appropriate for the hardware and the</div><div class='add'>+drivers using it; PCI works differently from USB, and so on.  Not many people</div><div class='add'>+write subsystem-level drivers; most driver code is a "device driver" that builds</div><div class='add'>+on top of bus-specific framework code.</div><div class='add'>+</div><div class='add'>+For more information on these driver calls, see the description later;</div><div class='add'>+they are called in phases for every device, respecting the parent-child</div><div class='add'>+sequencing in the driver model tree.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+:file:`/sys/devices/.../power/wakeup` files</div><div class='add'>+-------------------------------------------</div><div class='add'>+</div><div class='add'>+All device objects in the driver model contain fields that control the handling</div><div class='add'>+of system wakeup events (hardware signals that can force the system out of a</div><div class='add'>+sleep state).  These fields are initialized by bus or device driver code using</div><div class='add'>+:c:func:`device_set_wakeup_capable()` and :c:func:`device_set_wakeup_enable()`,</div><div class='add'>+defined in :file:`include/linux/pm_wakeup.h`.</div><div class='add'>+</div><div class='add'>+The :c:member:`power.can_wakeup` flag just records whether the device (and its</div><div class='add'>+driver) can physically support wakeup events.  The</div><div class='add'>+:c:func:`device_set_wakeup_capable()` routine affects this flag.  The</div><div class='add'>+:c:member:`power.wakeup` field is a pointer to an object of type</div><div class='add'>+|struct wakeup_source| used for controlling whether or not the device should use</div><div class='add'>+its system wakeup mechanism and for notifying the PM core of system wakeup</div><div class='add'>+events signaled by the device.  This object is only present for wakeup-capable</div><div class='add'>+devices (i.e. devices whose :c:member:`can_wakeup` flags are set) and is created</div><div class='add'>+(or removed) by :c:func:`device_set_wakeup_capable()`.</div><div class='add'>+</div><div class='add'>+Whether or not a device is capable of issuing wakeup events is a hardware</div><div class='add'>+matter, and the kernel is responsible for keeping track of it.  By contrast,</div><div class='add'>+whether or not a wakeup-capable device should issue wakeup events is a policy</div><div class='add'>+decision, and it is managed by user space through a sysfs attribute: the</div><div class='add'>+:file:`power/wakeup` file.  User space can write the "enabled" or "disabled"</div><div class='add'>+strings to it to indicate whether or not, respectively, the device is supposed</div><div class='add'>+to signal system wakeup.  This file is only present if the</div><div class='add'>+:c:member:`power.wakeup` object exists for the given device and is created (or</div><div class='add'>+removed) along with that object, by :c:func:`device_set_wakeup_capable()`.</div><div class='add'>+Reads from the file will return the corresponding string.</div><div class='add'>+</div><div class='add'>+The initial value in the :file:`power/wakeup` file is "disabled" for the</div><div class='add'>+majority of devices; the major exceptions are power buttons, keyboards, and</div><div class='add'>+Ethernet adapters whose WoL (wake-on-LAN) feature has been set up with ethtool.</div><div class='add'>+It should also default to "enabled" for devices that don't generate wakeup</div><div class='add'>+requests on their own but merely forward wakeup requests from one bus to another</div><div class='add'>+(like PCI Express ports).</div><div class='add'>+</div><div class='add'>+The :c:func:`device_may_wakeup()` routine returns true only if the</div><div class='add'>+:c:member:`power.wakeup` object exists and the corresponding :file:`power/wakeup`</div><div class='add'>+file contains the "enabled" string.  This information is used by subsystems,</div><div class='add'>+like the PCI bus type code, to see whether or not to enable the devices' wakeup</div><div class='add'>+mechanisms.  If device wakeup mechanisms are enabled or disabled directly by</div><div class='add'>+drivers, they also should use :c:func:`device_may_wakeup()` to decide what to do</div><div class='add'>+during a system sleep transition.  Device drivers, however, are not expected to</div><div class='add'>+call :c:func:`device_set_wakeup_enable()` directly in any case.</div><div class='add'>+</div><div class='add'>+It ought to be noted that system wakeup is conceptually different from "remote</div><div class='add'>+wakeup" used by runtime power management, although it may be supported by the</div><div class='add'>+same physical mechanism.  Remote wakeup is a feature allowing devices in</div><div class='add'>+low-power states to trigger specific interrupts to signal conditions in which</div><div class='add'>+they should be put into the full-power state.  Those interrupts may or may not</div><div class='add'>+be used to signal system wakeup events, depending on the hardware design.  On</div><div class='add'>+some systems it is impossible to trigger them from system sleep states.  In any</div><div class='add'>+case, remote wakeup should always be enabled for runtime power management for</div><div class='add'>+all devices and drivers that support it.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+:file:`/sys/devices/.../power/control` files</div><div class='add'>+--------------------------------------------</div><div class='add'>+</div><div class='add'>+Each device in the driver model has a flag to control whether it is subject to</div><div class='add'>+runtime power management.  This flag, :c:member:`runtime_auto`, is initialized</div><div class='add'>+by the bus type (or generally subsystem) code using :c:func:`pm_runtime_allow()`</div><div class='add'>+or :c:func:`pm_runtime_forbid()`; the default is to allow runtime power</div><div class='add'>+management.</div><div class='add'>+</div><div class='add'>+The setting can be adjusted by user space by writing either "on" or "auto" to</div><div class='add'>+the device's :file:`power/control` sysfs file.  Writing "auto" calls</div><div class='add'>+:c:func:`pm_runtime_allow()`, setting the flag and allowing the device to be</div><div class='add'>+runtime power-managed by its driver.  Writing "on" calls</div><div class='add'>+:c:func:`pm_runtime_forbid()`, clearing the flag, returning the device to full</div><div class='add'>+power if it was in a low-power state, and preventing the</div><div class='add'>+device from being runtime power-managed.  User space can check the current value</div><div class='add'>+of the :c:member:`runtime_auto` flag by reading that file.</div><div class='add'>+</div><div class='add'>+The device's :c:member:`runtime_auto` flag has no effect on the handling of</div><div class='add'>+system-wide power transitions.  In particular, the device can (and in the</div><div class='add'>+majority of cases should and will) be put into a low-power state during a</div><div class='add'>+system-wide transition to a sleep state even though its :c:member:`runtime_auto`</div><div class='add'>+flag is clear.</div><div class='add'>+</div><div class='add'>+For more information about the runtime power management framework, refer to</div><div class='add'>+:file:`Documentation/power/runtime_pm.txt`.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Calling Drivers to Enter and Leave System Sleep States</div><div class='add'>+======================================================</div><div class='add'>+</div><div class='add'>+When the system goes into a sleep state, each device's driver is asked to</div><div class='add'>+suspend the device by putting it into a state compatible with the target</div><div class='add'>+system state.  That's usually some version of "off", but the details are</div><div class='add'>+system-specific.  Also, wakeup-enabled devices will usually stay partly</div><div class='add'>+functional in order to wake the system.</div><div class='add'>+</div><div class='add'>+When the system leaves that low-power state, the device's driver is asked to</div><div class='add'>+resume it by returning it to full power.  The suspend and resume operations</div><div class='add'>+always go together, and both are multi-phase operations.</div><div class='add'>+</div><div class='add'>+For simple drivers, suspend might quiesce the device using class code</div><div class='add'>+and then turn its hardware as "off" as possible during suspend_noirq.  The</div><div class='add'>+matching resume calls would then completely reinitialize the hardware</div><div class='add'>+before reactivating its class I/O queues.</div><div class='add'>+</div><div class='add'>+More power-aware drivers might prepare the devices for triggering system wakeup</div><div class='add'>+events.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Call Sequence Guarantees</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+To ensure that bridges and similar links needing to talk to a device are</div><div class='add'>+available when the device is suspended or resumed, the device hierarchy is</div><div class='add'>+walked in a bottom-up order to suspend devices.  A top-down order is</div><div class='add'>+used to resume those devices.</div><div class='add'>+</div><div class='add'>+The ordering of the device hierarchy is defined by the order in which devices</div><div class='add'>+get registered:  a child can never be registered, probed or resumed before</div><div class='add'>+its parent; and can't be removed or suspended after that parent.</div><div class='add'>+</div><div class='add'>+The policy is that the device hierarchy should match hardware bus topology.</div><div class='add'>+[Or at least the control bus, for devices which use multiple busses.]</div><div class='add'>+In particular, this means that a device registration may fail if the parent of</div><div class='add'>+the device is suspending (i.e. has been chosen by the PM core as the next</div><div class='add'>+device to suspend) or has already suspended, as well as after all of the other</div><div class='add'>+devices have been suspended.  Device drivers must be prepared to cope with such</div><div class='add'>+situations.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+System Power Management Phases</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+Suspending or resuming the system is done in several phases.  Different phases</div><div class='add'>+are used for suspend-to-idle, shallow (standby), and deep ("suspend-to-RAM")</div><div class='add'>+sleep states and the hibernation state ("suspend-to-disk").  Each phase involves</div><div class='add'>+executing callbacks for every device before the next phase begins.  Not all</div><div class='add'>+buses or classes support all these callbacks and not all drivers use all the</div><div class='add'>+callbacks.  The various phases always run after tasks have been frozen and</div><div class='add'>+before they are unfrozen.  Furthermore, the ``*_noirq phases`` run at a time</div><div class='add'>+when IRQ handlers have been disabled (except for those marked with the</div><div class='add'>+IRQF_NO_SUSPEND flag).</div><div class='add'>+</div><div class='add'>+All phases use PM domain, bus, type, class or driver callbacks (that is, methods</div><div class='add'>+defined in ``dev-&gt;pm_domain-&gt;ops``, ``dev-&gt;bus-&gt;pm``, ``dev-&gt;type-&gt;pm``,</div><div class='add'>+``dev-&gt;class-&gt;pm`` or ``dev-&gt;driver-&gt;pm``).  These callbacks are regarded by the</div><div class='add'>+PM core as mutually exclusive.  Moreover, PM domain callbacks always take</div><div class='add'>+precedence over all of the other callbacks and, for example, type callbacks take</div><div class='add'>+precedence over bus, class and driver callbacks.  To be precise, the following</div><div class='add'>+rules are used to determine which callback to execute in the given phase:</div><div class='add'>+</div><div class='add'>+    1.	If ``dev-&gt;pm_domain`` is present, the PM core will choose the callback</div><div class='add'>+	provided by ``dev-&gt;pm_domain-&gt;ops`` for execution.</div><div class='add'>+</div><div class='add'>+    2.	Otherwise, if both ``dev-&gt;type`` and ``dev-&gt;type-&gt;pm`` are present, the</div><div class='add'>+	callback provided by ``dev-&gt;type-&gt;pm`` will be chosen for execution.</div><div class='add'>+</div><div class='add'>+    3.	Otherwise, if both ``dev-&gt;class`` and ``dev-&gt;class-&gt;pm`` are present,</div><div class='add'>+	the callback provided by ``dev-&gt;class-&gt;pm`` will be chosen for</div><div class='add'>+	execution.</div><div class='add'>+</div><div class='add'>+    4.	Otherwise, if both ``dev-&gt;bus`` and ``dev-&gt;bus-&gt;pm`` are present, the</div><div class='add'>+	callback provided by ``dev-&gt;bus-&gt;pm`` will be chosen for execution.</div><div class='add'>+</div><div class='add'>+This allows PM domains and device types to override callbacks provided by bus</div><div class='add'>+types or device classes if necessary.</div><div class='add'>+</div><div class='add'>+The PM domain, type, class and bus callbacks may in turn invoke device- or</div><div class='add'>+driver-specific methods stored in ``dev-&gt;driver-&gt;pm``, but they don't have to do</div><div class='add'>+that.</div><div class='add'>+</div><div class='add'>+If the subsystem callback chosen for execution is not present, the PM core will</div><div class='add'>+execute the corresponding method from the ``dev-&gt;driver-&gt;pm`` set instead if</div><div class='add'>+there is one.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Entering System Suspend</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+When the system goes into the freeze, standby or memory sleep state,</div><div class='add'>+the phases are: ``prepare``, ``suspend``, ``suspend_late``, ``suspend_noirq``.</div><div class='add'>+</div><div class='add'>+    1.	The ``prepare`` phase is meant to prevent races by preventing new</div><div class='add'>+	devices from being registered; the PM core would never know that all the</div><div class='add'>+	children of a device had been suspended if new children could be</div><div class='add'>+	registered at will.  [By contrast, from the PM core's perspective,</div><div class='add'>+	devices may be unregistered at any time.]  Unlike the other</div><div class='add'>+	suspend-related phases, during the ``prepare`` phase the device</div><div class='add'>+	hierarchy is traversed top-down.</div><div class='add'>+</div><div class='add'>+	After the ``-&gt;prepare`` callback method returns, no new children may be</div><div class='add'>+	registered below the device.  The method may also prepare the device or</div><div class='add'>+	driver in some way for the upcoming system power transition, but it</div><div class='add'>+	should not put the device into a low-power state.</div><div class='add'>+</div><div class='add'>+	For devices supporting runtime power management, the return value of the</div><div class='add'>+	prepare callback can be used to indicate to the PM core that it may</div><div class='add'>+	safely leave the device in runtime suspend (if runtime-suspended</div><div class='add'>+	already), provided that all of the device's descendants are also left in</div><div class='add'>+	runtime suspend.  Namely, if the prepare callback returns a positive</div><div class='add'>+	number and that happens for all of the descendants of the device too,</div><div class='add'>+	and all of them (including the device itself) are runtime-suspended, the</div><div class='add'>+	PM core will skip the ``suspend``, ``suspend_late`` and</div><div class='add'>+	``suspend_noirq`` phases as well as all of the corresponding phases of</div><div class='add'>+	the subsequent device resume for all of these devices.	In that case,</div><div class='add'>+	the ``-&gt;complete`` callback will be invoked directly after the</div><div class='add'>+	``-&gt;prepare`` callback and is entirely responsible for putting the</div><div class='add'>+	device into a consistent state as appropriate.</div><div class='add'>+</div><div class='add'>+	Note that this direct-complete procedure applies even if the device is</div><div class='add'>+	disabled for runtime PM; only the runtime-PM status matters.  It follows</div><div class='add'>+	that if a device has system-sleep callbacks but does not support runtime</div><div class='add'>+	PM, then its prepare callback must never return a positive value.  This</div><div class='add'>+	is because all such devices are initially set to runtime-suspended with</div><div class='add'>+	runtime PM disabled.</div><div class='add'>+</div><div class='add'>+    2.	The ``-&gt;suspend`` methods should quiesce the device to stop it from</div><div class='add'>+	performing I/O.  They also may save the device registers and put it into</div><div class='add'>+	the appropriate low-power state, depending on the bus type the device is</div><div class='add'>+	on, and they may enable wakeup events.</div><div class='add'>+</div><div class='add'>+    3.	For a number of devices it is convenient to split suspend into the</div><div class='add'>+	"quiesce device" and "save device state" phases, in which cases</div><div class='add'>+	``suspend_late`` is meant to do the latter.  It is always executed after</div><div class='add'>+	runtime power management has been disabled for the device in question.</div><div class='add'>+</div><div class='add'>+    4.	The ``suspend_noirq`` phase occurs after IRQ handlers have been disabled,</div><div class='add'>+	which means that the driver's interrupt handler will not be called while</div><div class='add'>+	the callback method is running.  The ``-&gt;suspend_noirq`` methods should</div><div class='add'>+	save the values of the device's registers that weren't saved previously</div><div class='add'>+	and finally put the device into the appropriate low-power state.</div><div class='add'>+</div><div class='add'>+	The majority of subsystems and device drivers need not implement this</div><div class='add'>+	callback.  However, bus types allowing devices to share interrupt</div><div class='add'>+	vectors, like PCI, generally need it; otherwise a driver might encounter</div><div class='add'>+	an error during the suspend phase by fielding a shared interrupt</div><div class='add'>+	generated by some other device after its own device had been set to low</div><div class='add'>+	power.</div><div class='add'>+</div><div class='add'>+At the end of these phases, drivers should have stopped all I/O transactions</div><div class='add'>+(DMA, IRQs), saved enough state that they can re-initialize or restore previous</div><div class='add'>+state (as needed by the hardware), and placed the device into a low-power state.</div><div class='add'>+On many platforms they will gate off one or more clock sources; sometimes they</div><div class='add'>+will also switch off power supplies or reduce voltages.  [Drivers supporting</div><div class='add'>+runtime PM may already have performed some or all of these steps.]</div><div class='add'>+</div><div class='add'>+If :c:func:`device_may_wakeup(dev)` returns ``true``, the device should be</div><div class='add'>+prepared for generating hardware wakeup signals to trigger a system wakeup event</div><div class='add'>+when the system is in the sleep state.  For example, :c:func:`enable_irq_wake()`</div><div class='add'>+might identify GPIO signals hooked up to a switch or other external hardware,</div><div class='add'>+and :c:func:`pci_enable_wake()` does something similar for the PCI PME signal.</div><div class='add'>+</div><div class='add'>+If any of these callbacks returns an error, the system won't enter the desired</div><div class='add'>+low-power state.  Instead, the PM core will unwind its actions by resuming all</div><div class='add'>+the devices that were suspended.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Leaving System Suspend</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+When resuming from freeze, standby or memory sleep, the phases are:</div><div class='add'>+``resume_noirq``, ``resume_early``, ``resume``, ``complete``.</div><div class='add'>+</div><div class='add'>+    1.	The ``-&gt;resume_noirq`` callback methods should perform any actions</div><div class='add'>+	needed before the driver's interrupt handlers are invoked.  This</div><div class='add'>+	generally means undoing the actions of the ``suspend_noirq`` phase.  If</div><div class='add'>+	the bus type permits devices to share interrupt vectors, like PCI, the</div><div class='add'>+	method should bring the device and its driver into a state in which the</div><div class='add'>+	driver can recognize if the device is the source of incoming interrupts,</div><div class='add'>+	if any, and handle them correctly.</div><div class='add'>+</div><div class='add'>+	For example, the PCI bus type's ``-&gt;pm.resume_noirq()`` puts the device</div><div class='add'>+	into the full-power state (D0 in the PCI terminology) and restores the</div><div class='add'>+	standard configuration registers of the device.  Then it calls the</div><div class='add'>+	device driver's ``-&gt;pm.resume_noirq()`` method to perform device-specific</div><div class='add'>+	actions.</div><div class='add'>+</div><div class='add'>+    2.	The ``-&gt;resume_early`` methods should prepare devices for the execution</div><div class='add'>+	of the resume methods.  This generally involves undoing the actions of</div><div class='add'>+	the preceding ``suspend_late`` phase.</div><div class='add'>+</div><div class='add'>+    3.	The ``-&gt;resume`` methods should bring the device back to its operating</div><div class='add'>+	state, so that it can perform normal I/O.  This generally involves</div><div class='add'>+	undoing the actions of the ``suspend`` phase.</div><div class='add'>+</div><div class='add'>+    4.	The ``complete`` phase should undo the actions of the ``prepare`` phase.</div><div class='add'>+        For this reason, unlike the other resume-related phases, during the</div><div class='add'>+        ``complete`` phase the device hierarchy is traversed bottom-up.</div><div class='add'>+</div><div class='add'>+	Note, however, that new children may be registered below the device as</div><div class='add'>+	soon as the ``-&gt;resume`` callbacks occur; it's not necessary to wait</div><div class='add'>+	until the ``complete`` phase with that.</div><div class='add'>+</div><div class='add'>+	Moreover, if the preceding ``-&gt;prepare`` callback returned a positive</div><div class='add'>+	number, the device may have been left in runtime suspend throughout the</div><div class='add'>+	whole system suspend and resume (the ``suspend``, ``suspend_late``,</div><div class='add'>+	``suspend_noirq`` phases of system suspend and the ``resume_noirq``,</div><div class='add'>+	``resume_early``, ``resume`` phases of system resume may have been</div><div class='add'>+	skipped for it).  In that case, the ``-&gt;complete`` callback is entirely</div><div class='add'>+	responsible for putting the device into a consistent state after system</div><div class='add'>+	suspend if necessary.  [For example, it may need to queue up a runtime</div><div class='add'>+	resume request for the device for this purpose.]  To check if that is</div><div class='add'>+	the case, the ``-&gt;complete`` callback can consult the device's</div><div class='add'>+	``power.direct_complete`` flag.  Namely, if that flag is set when the</div><div class='add'>+	``-&gt;complete`` callback is being run, it has been called directly after</div><div class='add'>+	the preceding ``-&gt;prepare`` and special actions may be required</div><div class='add'>+	to make the device work correctly afterward.</div><div class='add'>+</div><div class='add'>+At the end of these phases, drivers should be as functional as they were before</div><div class='add'>+suspending: I/O can be performed using DMA and IRQs, and the relevant clocks are</div><div class='add'>+gated on.</div><div class='add'>+</div><div class='add'>+However, the details here may again be platform-specific.  For example,</div><div class='add'>+some systems support multiple "run" states, and the mode in effect at</div><div class='add'>+the end of resume might not be the one which preceded suspension.</div><div class='add'>+That means availability of certain clocks or power supplies changed,</div><div class='add'>+which could easily affect how a driver works.</div><div class='add'>+</div><div class='add'>+Drivers need to be able to handle hardware which has been reset since all of the</div><div class='add'>+suspend methods were called, for example by complete reinitialization.</div><div class='add'>+This may be the hardest part, and the one most protected by NDA'd documents</div><div class='add'>+and chip errata.  It's simplest if the hardware state hasn't changed since</div><div class='add'>+the suspend was carried out, but that can only be guaranteed if the target</div><div class='add'>+system sleep entered was suspend-to-idle.  For the other system sleep states</div><div class='add'>+that may not be the case (and usually isn't for ACPI-defined system sleep</div><div class='add'>+states, like S3).</div><div class='add'>+</div><div class='add'>+Drivers must also be prepared to notice that the device has been removed</div><div class='add'>+while the system was powered down, whenever that's physically possible.</div><div class='add'>+PCMCIA, MMC, USB, Firewire, SCSI, and even IDE are common examples of busses</div><div class='add'>+where common Linux platforms will see such removal.  Details of how drivers</div><div class='add'>+will notice and handle such removals are currently bus-specific, and often</div><div class='add'>+involve a separate thread.</div><div class='add'>+</div><div class='add'>+These callbacks may return an error value, but the PM core will ignore such</div><div class='add'>+errors since there's nothing it can do about them other than printing them in</div><div class='add'>+the system log.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Entering Hibernation</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Hibernating the system is more complicated than putting it into sleep states,</div><div class='add'>+because it involves creating and saving a system image.  Therefore there are</div><div class='add'>+more phases for hibernation, with a different set of callbacks.  These phases</div><div class='add'>+always run after tasks have been frozen and enough memory has been freed.</div><div class='add'>+</div><div class='add'>+The general procedure for hibernation is to quiesce all devices ("freeze"),</div><div class='add'>+create an image of the system memory while everything is stable, reactivate all</div><div class='add'>+devices ("thaw"), write the image to permanent storage, and finally shut down</div><div class='add'>+the system ("power off").  The phases used to accomplish this are: ``prepare``,</div><div class='add'>+``freeze``, ``freeze_late``, ``freeze_noirq``, ``thaw_noirq``, ``thaw_early``,</div><div class='add'>+``thaw``, ``complete``, ``prepare``, ``poweroff``, ``poweroff_late``,</div><div class='add'>+``poweroff_noirq``.</div><div class='add'>+</div><div class='add'>+    1.	The ``prepare`` phase is discussed in the "Entering System Suspend"</div><div class='add'>+	section above.</div><div class='add'>+</div><div class='add'>+    2.	The ``-&gt;freeze`` methods should quiesce the device so that it doesn't</div><div class='add'>+	generate IRQs or DMA, and they may need to save the values of device</div><div class='add'>+	registers.  However the device does not have to be put in a low-power</div><div class='add'>+	state, and to save time it's best not to do so.  Also, the device should</div><div class='add'>+	not be prepared to generate wakeup events.</div><div class='add'>+</div><div class='add'>+    3.	The ``freeze_late`` phase is analogous to the ``suspend_late`` phase</div><div class='add'>+	described earlier, except that the device should not be put into a</div><div class='add'>+	low-power state and should not be allowed to generate wakeup events.</div><div class='add'>+</div><div class='add'>+    4.	The ``freeze_noirq`` phase is analogous to the ``suspend_noirq`` phase</div><div class='add'>+	discussed earlier, except again that the device should not be put into</div><div class='add'>+	a low-power state and should not be allowed to generate wakeup events.</div><div class='add'>+</div><div class='add'>+At this point the system image is created.  All devices should be inactive and</div><div class='add'>+the contents of memory should remain undisturbed while this happens, so that the</div><div class='add'>+image forms an atomic snapshot of the system state.</div><div class='add'>+</div><div class='add'>+    5.	The ``thaw_noirq`` phase is analogous to the ``resume_noirq`` phase</div><div class='add'>+	discussed earlier.  The main difference is that its methods can assume</div><div class='add'>+	the device is in the same state as at the end of the ``freeze_noirq``</div><div class='add'>+	phase.</div><div class='add'>+</div><div class='add'>+    6.	The ``thaw_early`` phase is analogous to the ``resume_early`` phase</div><div class='add'>+	described above.  Its methods should undo the actions of the preceding</div><div class='add'>+	``freeze_late``, if necessary.</div><div class='add'>+</div><div class='add'>+    7.	The ``thaw`` phase is analogous to the ``resume`` phase discussed</div><div class='add'>+	earlier.  Its methods should bring the device back to an operating</div><div class='add'>+	state, so that it can be used for saving the image if necessary.</div><div class='add'>+</div><div class='add'>+    8.	The ``complete`` phase is discussed in the "Leaving System Suspend"</div><div class='add'>+	section above.</div><div class='add'>+</div><div class='add'>+At this point the system image is saved, and the devices then need to be</div><div class='add'>+prepared for the upcoming system shutdown.  This is much like suspending them</div><div class='add'>+before putting the system into the suspend-to-idle, shallow or deep sleep state,</div><div class='add'>+and the phases are similar.</div><div class='add'>+</div><div class='add'>+    9.	The ``prepare`` phase is discussed above.</div><div class='add'>+</div><div class='add'>+    10.	The ``poweroff`` phase is analogous to the ``suspend`` phase.</div><div class='add'>+</div><div class='add'>+    11.	The ``poweroff_late`` phase is analogous to the ``suspend_late`` phase.</div><div class='add'>+</div><div class='add'>+    12.	The ``poweroff_noirq`` phase is analogous to the ``suspend_noirq`` phase.</div><div class='add'>+</div><div class='add'>+The ``-&gt;poweroff``, ``-&gt;poweroff_late`` and ``-&gt;poweroff_noirq`` callbacks</div><div class='add'>+should do essentially the same things as the ``-&gt;suspend``, ``-&gt;suspend_late``</div><div class='add'>+and ``-&gt;suspend_noirq`` callbacks, respectively.  The only notable difference is</div><div class='add'>+that they need not store the device register values, because the registers</div><div class='add'>+should already have been stored during the ``freeze``, ``freeze_late`` or</div><div class='add'>+``freeze_noirq`` phases.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Leaving Hibernation</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Resuming from hibernation is, again, more complicated than resuming from a sleep</div><div class='add'>+state in which the contents of main memory are preserved, because it requires</div><div class='add'>+a system image to be loaded into memory and the pre-hibernation memory contents</div><div class='add'>+to be restored before control can be passed back to the image kernel.</div><div class='add'>+</div><div class='add'>+Although in principle the image might be loaded into memory and the</div><div class='add'>+pre-hibernation memory contents restored by the boot loader, in practice this</div><div class='add'>+can't be done because boot loaders aren't smart enough and there is no</div><div class='add'>+established protocol for passing the necessary information.  So instead, the</div><div class='add'>+boot loader loads a fresh instance of the kernel, called "the restore kernel",</div><div class='add'>+into memory and passes control to it in the usual way.  Then the restore kernel</div><div class='add'>+reads the system image, restores the pre-hibernation memory contents, and passes</div><div class='add'>+control to the image kernel.  Thus two different kernel instances are involved</div><div class='add'>+in resuming from hibernation.  In fact, the restore kernel may be completely</div><div class='add'>+different from the image kernel: a different configuration and even a different</div><div class='add'>+version.  This has important consequences for device drivers and their</div><div class='add'>+subsystems.</div><div class='add'>+</div><div class='add'>+To be able to load the system image into memory, the restore kernel needs to</div><div class='add'>+include at least a subset of device drivers allowing it to access the storage</div><div class='add'>+medium containing the image, although it doesn't need to include all of the</div><div class='add'>+drivers present in the image kernel.  After the image has been loaded, the</div><div class='add'>+devices managed by the boot kernel need to be prepared for passing control back</div><div class='add'>+to the image kernel.  This is very similar to the initial steps involved in</div><div class='add'>+creating a system image, and it is accomplished in the same way, using</div><div class='add'>+``prepare``, ``freeze``, and ``freeze_noirq`` phases.  However, the devices</div><div class='add'>+affected by these phases are only those having drivers in the restore kernel;</div><div class='add'>+other devices will still be in whatever state the boot loader left them.</div><div class='add'>+</div><div class='add'>+Should the restoration of the pre-hibernation memory contents fail, the restore</div><div class='add'>+kernel would go through the "thawing" procedure described above, using the</div><div class='add'>+``thaw_noirq``, ``thaw_early``, ``thaw``, and ``complete`` phases, and then</div><div class='add'>+continue running normally.  This happens only rarely.  Most often the</div><div class='add'>+pre-hibernation memory contents are restored successfully and control is passed</div><div class='add'>+to the image kernel, which then becomes responsible for bringing the system back</div><div class='add'>+to the working state.</div><div class='add'>+</div><div class='add'>+To achieve this, the image kernel must restore the devices' pre-hibernation</div><div class='add'>+functionality.  The operation is much like waking up from a sleep state (with</div><div class='add'>+the memory contents preserved), although it involves different phases:</div><div class='add'>+``restore_noirq``, ``restore_early``, ``restore``, ``complete``.</div><div class='add'>+</div><div class='add'>+    1.	The ``restore_noirq`` phase is analogous to the ``resume_noirq`` phase.</div><div class='add'>+</div><div class='add'>+    2.	The ``restore_early`` phase is analogous to the ``resume_early`` phase.</div><div class='add'>+</div><div class='add'>+    3.	The ``restore`` phase is analogous to the ``resume`` phase.</div><div class='add'>+</div><div class='add'>+    4.	The ``complete`` phase is discussed above.</div><div class='add'>+</div><div class='add'>+The main difference from ``resume[_early|_noirq]`` is that</div><div class='add'>+``restore[_early|_noirq]`` must assume the device has been accessed and</div><div class='add'>+reconfigured by the boot loader or the restore kernel.  Consequently, the state</div><div class='add'>+of the device may be different from the state remembered from the ``freeze``,</div><div class='add'>+``freeze_late`` and ``freeze_noirq`` phases.  The device may even need to be</div><div class='add'>+reset and completely re-initialized.  In many cases this difference doesn't</div><div class='add'>+matter, so the ``-&gt;resume[_early|_noirq]`` and ``-&gt;restore[_early|_norq]``</div><div class='add'>+method pointers can be set to the same routines.  Nevertheless, different</div><div class='add'>+callback pointers are used in case there is a situation where it actually does</div><div class='add'>+matter.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Power Management Notifiers</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+There are some operations that cannot be carried out by the power management</div><div class='add'>+callbacks discussed above, because the callbacks occur too late or too early.</div><div class='add'>+To handle these cases, subsystems and device drivers may register power</div><div class='add'>+management notifiers that are called before tasks are frozen and after they have</div><div class='add'>+been thawed.  Generally speaking, the PM notifiers are suitable for performing</div><div class='add'>+actions that either require user space to be available, or at least won't</div><div class='add'>+interfere with user space.</div><div class='add'>+</div><div class='add'>+For details refer to :doc:`notifiers`.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Device Low-Power (suspend) States</div><div class='add'>+=================================</div><div class='add'>+</div><div class='add'>+Device low-power states aren't standard.  One device might only handle</div><div class='add'>+"on" and "off", while another might support a dozen different versions of</div><div class='add'>+"on" (how many engines are active?), plus a state that gets back to "on"</div><div class='add'>+faster than from a full "off".</div><div class='add'>+</div><div class='add'>+Some buses define rules about what different suspend states mean.  PCI</div><div class='add'>+gives one example: after the suspend sequence completes, a non-legacy</div><div class='add'>+PCI device may not perform DMA or issue IRQs, and any wakeup events it</div><div class='add'>+issues would be issued through the PME# bus signal.  Plus, there are</div><div class='add'>+several PCI-standard device states, some of which are optional.</div><div class='add'>+</div><div class='add'>+In contrast, integrated system-on-chip processors often use IRQs as the</div><div class='add'>+wakeup event sources (so drivers would call :c:func:`enable_irq_wake`) and</div><div class='add'>+might be able to treat DMA completion as a wakeup event (sometimes DMA can stay</div><div class='add'>+active too, it'd only be the CPU and some peripherals that sleep).</div><div class='add'>+</div><div class='add'>+Some details here may be platform-specific.  Systems may have devices that</div><div class='add'>+can be fully active in certain sleep states, such as an LCD display that's</div><div class='add'>+refreshed using DMA while most of the system is sleeping lightly ... and</div><div class='add'>+its frame buffer might even be updated by a DSP or other non-Linux CPU while</div><div class='add'>+the Linux control processor stays idle.</div><div class='add'>+</div><div class='add'>+Moreover, the specific actions taken may depend on the target system state.</div><div class='add'>+One target system state might allow a given device to be very operational;</div><div class='add'>+another might require a hard shut down with re-initialization on resume.</div><div class='add'>+And two different target systems might use the same device in different</div><div class='add'>+ways; the aforementioned LCD might be active in one product's "standby",</div><div class='add'>+but a different product using the same SOC might work differently.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Device Power Management Domains</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+Sometimes devices share reference clocks or other power resources.  In those</div><div class='add'>+cases it generally is not possible to put devices into low-power states</div><div class='add'>+individually.  Instead, a set of devices sharing a power resource can be put</div><div class='add'>+into a low-power state together at the same time by turning off the shared</div><div class='add'>+power resource.  Of course, they also need to be put into the full-power state</div><div class='add'>+together, by turning the shared power resource on.  A set of devices with this</div><div class='add'>+property is often referred to as a power domain. A power domain may also be</div><div class='add'>+nested inside another power domain. The nested domain is referred to as the</div><div class='add'>+sub-domain of the parent domain.</div><div class='add'>+</div><div class='add'>+Support for power domains is provided through the :c:member:`pm_domain` field of</div><div class='add'>+|struct device|.  This field is a pointer to an object of type</div><div class='add'>+|struct dev_pm_domain|, defined in :file:`include/linux/pm.h``, providing a set</div><div class='add'>+of power management callbacks analogous to the subsystem-level and device driver</div><div class='add'>+callbacks that are executed for the given device during all power transitions,</div><div class='add'>+instead of the respective subsystem-level callbacks.  Specifically, if a</div><div class='add'>+device's :c:member:`pm_domain` pointer is not NULL, the ``-&gt;suspend()`` callback</div><div class='add'>+from the object pointed to by it will be executed instead of its subsystem's</div><div class='add'>+(e.g. bus type's) ``-&gt;suspend()`` callback and analogously for all of the</div><div class='add'>+remaining callbacks.  In other words, power management domain callbacks, if</div><div class='add'>+defined for the given device, always take precedence over the callbacks provided</div><div class='add'>+by the device's subsystem (e.g. bus type).</div><div class='add'>+</div><div class='add'>+The support for device power management domains is only relevant to platforms</div><div class='add'>+needing to use the same device driver power management callbacks in many</div><div class='add'>+different power domain configurations and wanting to avoid incorporating the</div><div class='add'>+support for power domains into subsystem-level callbacks, for example by</div><div class='add'>+modifying the platform bus type.  Other platforms need not implement it or take</div><div class='add'>+it into account in any way.</div><div class='add'>+</div><div class='add'>+Devices may be defined as IRQ-safe which indicates to the PM core that their</div><div class='add'>+runtime PM callbacks may be invoked with disabled interrupts (see</div><div class='add'>+:file:`Documentation/power/runtime_pm.txt` for more information).  If an</div><div class='add'>+IRQ-safe device belongs to a PM domain, the runtime PM of the domain will be</div><div class='add'>+disallowed, unless the domain itself is defined as IRQ-safe. However, it</div><div class='add'>+makes sense to define a PM domain as IRQ-safe only if all the devices in it</div><div class='add'>+are IRQ-safe. Moreover, if an IRQ-safe domain has a parent domain, the runtime</div><div class='add'>+PM of the parent is only allowed if the parent itself is IRQ-safe too with the</div><div class='add'>+additional restriction that all child domains of an IRQ-safe parent must also</div><div class='add'>+be IRQ-safe.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Runtime Power Management</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+Many devices are able to dynamically power down while the system is still</div><div class='add'>+running. This feature is useful for devices that are not being used, and</div><div class='add'>+can offer significant power savings on a running system.  These devices</div><div class='add'>+often support a range of runtime power states, which might use names such</div><div class='add'>+as "off", "sleep", "idle", "active", and so on.  Those states will in some</div><div class='add'>+cases (like PCI) be partially constrained by the bus the device uses, and will</div><div class='add'>+usually include hardware states that are also used in system sleep states.</div><div class='add'>+</div><div class='add'>+A system-wide power transition can be started while some devices are in low</div><div class='add'>+power states due to runtime power management.  The system sleep PM callbacks</div><div class='add'>+should recognize such situations and react to them appropriately, but the</div><div class='add'>+necessary actions are subsystem-specific.</div><div class='add'>+</div><div class='add'>+In some cases the decision may be made at the subsystem level while in other</div><div class='add'>+cases the device driver may be left to decide.  In some cases it may be</div><div class='add'>+desirable to leave a suspended device in that state during a system-wide power</div><div class='add'>+transition, but in other cases the device must be put back into the full-power</div><div class='add'>+state temporarily, for example so that its system wakeup capability can be</div><div class='add'>+disabled.  This all depends on the hardware and the design of the subsystem and</div><div class='add'>+device driver in question.</div><div class='add'>+</div><div class='add'>+During system-wide resume from a sleep state it's easiest to put devices into</div><div class='add'>+the full-power state, as explained in :file:`Documentation/power/runtime_pm.txt`.</div><div class='add'>+Refer to that document for more information regarding this particular issue as</div><div class='add'>+well as for information on the device runtime power management framework in</div><div class='add'>+general.</div><div class='head'>diff --git a/Documentation/driver-api/pm/index.rst b/Documentation/driver-api/pm/index.rst<br/>new file mode 100644<br/>index 000000000000..2f6d0e9cf6b7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/pm/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/pm/index.rst</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+=======================</div><div class='add'>+Device Power Management</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+</div><div class='add'>+   devices</div><div class='add'>+   notifiers</div><div class='add'>+   types</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/driver-api/pm/notifiers.rst b/Documentation/driver-api/pm/notifiers.rst<br/>new file mode 100644<br/>index 000000000000..62f860026992<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/pm/notifiers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/pm/notifiers.rst</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+=============================</div><div class='add'>+Suspend/Hibernation Notifiers</div><div class='add'>+=============================</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+ Copyright (c) 2016 Intel Corp., Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='add'>+</div><div class='add'>+There are some operations that subsystems or drivers may want to carry out</div><div class='add'>+before hibernation/suspend or after restore/resume, but they require the system</div><div class='add'>+to be fully functional, so the drivers' and subsystems' ``-&gt;suspend()`` and</div><div class='add'>+``-&gt;resume()`` or even ``-&gt;prepare()`` and ``-&gt;complete()`` callbacks are not</div><div class='add'>+suitable for this purpose.</div><div class='add'>+</div><div class='add'>+For example, device drivers may want to upload firmware to their devices after</div><div class='add'>+resume/restore, but they cannot do it by calling :c:func:`request_firmware()`</div><div class='add'>+from their ``-&gt;resume()`` or ``-&gt;complete()`` callback routines (user land</div><div class='add'>+processes are frozen at these points).  The solution may be to load the firmware</div><div class='add'>+into memory before processes are frozen and upload it from there in the</div><div class='add'>+``-&gt;resume()`` routine.  A suspend/hibernation notifier may be used for that.</div><div class='add'>+</div><div class='add'>+Subsystems or drivers having such needs can register suspend notifiers that</div><div class='add'>+will be called upon the following events by the PM core:</div><div class='add'>+</div><div class='add'>+``PM_HIBERNATION_PREPARE``</div><div class='add'>+	The system is going to hibernate, tasks will be frozen immediately. This</div><div class='add'>+	is different from ``PM_SUSPEND_PREPARE`` below,	because in this case</div><div class='add'>+	additional work is done between the notifiers and the invocation of PM</div><div class='add'>+	callbacks for the "freeze" transition.</div><div class='add'>+</div><div class='add'>+``PM_POST_HIBERNATION``</div><div class='add'>+	The system memory state has been restored from a hibernation image or an</div><div class='add'>+	error occurred during hibernation.  Device restore callbacks have been</div><div class='add'>+	executed and tasks have been thawed.</div><div class='add'>+</div><div class='add'>+``PM_RESTORE_PREPARE``</div><div class='add'>+	The system is going to restore a hibernation image.  If all goes well,</div><div class='add'>+	the restored image kernel will issue a ``PM_POST_HIBERNATION``</div><div class='add'>+	notification.</div><div class='add'>+</div><div class='add'>+``PM_POST_RESTORE``</div><div class='add'>+	An error occurred during restore from hibernation.  Device restore</div><div class='add'>+	callbacks have been executed and tasks have been thawed.</div><div class='add'>+</div><div class='add'>+``PM_SUSPEND_PREPARE``</div><div class='add'>+	The system is preparing for suspend.</div><div class='add'>+</div><div class='add'>+``PM_POST_SUSPEND``</div><div class='add'>+	The system has just resumed or an error occurred during suspend.  Device</div><div class='add'>+	resume callbacks have been executed and tasks have been thawed.</div><div class='add'>+</div><div class='add'>+It is generally assumed that whatever the notifiers do for</div><div class='add'>+``PM_HIBERNATION_PREPARE``, should be undone for ``PM_POST_HIBERNATION``.</div><div class='add'>+Analogously, operations carried out for ``PM_SUSPEND_PREPARE`` should be</div><div class='add'>+reversed for ``PM_POST_SUSPEND``.</div><div class='add'>+</div><div class='add'>+Moreover, if one of the notifiers fails for the ``PM_HIBERNATION_PREPARE`` or</div><div class='add'>+``PM_SUSPEND_PREPARE`` event, the notifiers that have already succeeded for that</div><div class='add'>+event will be called for ``PM_POST_HIBERNATION`` or ``PM_POST_SUSPEND``,</div><div class='add'>+respectively.</div><div class='add'>+</div><div class='add'>+The hibernation and suspend notifiers are called with :c:data:`pm_mutex` held.</div><div class='add'>+They are defined in the usual way, but their last argument is meaningless (it is</div><div class='add'>+always NULL).</div><div class='add'>+</div><div class='add'>+To register and/or unregister a suspend notifier use</div><div class='add'>+:c:func:`register_pm_notifier()` and :c:func:`unregister_pm_notifier()`,</div><div class='add'>+respectively (both defined in :file:`include/linux/suspend.h`).  If you don't</div><div class='add'>+need to unregister the notifier, you can also use the :c:func:`pm_notifier()`</div><div class='add'>+macro defined in :file:`include/linux/suspend.h`.</div><div class='head'>diff --git a/Documentation/driver-api/pm/types.rst b/Documentation/driver-api/pm/types.rst<br/>new file mode 100644<br/>index 000000000000..3ebdecc54104<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/pm/types.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/pm/types.rst</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+==================================</div><div class='add'>+Device Power Management Data Types</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/pm.h</div><div class='head'>diff --git a/Documentation/driver-api/regulator.rst b/Documentation/driver-api/regulator.rst<br/>new file mode 100644<br/>index 000000000000..520da0a5251d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/regulator.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/regulator.rst</a></div><div class='hunk'>@@ -0,0 +1,170 @@</div><div class='add'>+.. Copyright 2007-2008 Wolfson Microelectronics</div><div class='add'>+</div><div class='add'>+..   This documentation is free software; you can redistribute</div><div class='add'>+..   it and/or modify it under the terms of the GNU General Public</div><div class='add'>+..   License version 2 as published by the Free Software Foundation.</div><div class='add'>+</div><div class='add'>+=================================</div><div class='add'>+Voltage and current regulator API</div><div class='add'>+=================================</div><div class='add'>+</div><div class='add'>+:Author: Liam Girdwood</div><div class='add'>+:Author: Mark Brown</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+This framework is designed to provide a standard kernel interface to</div><div class='add'>+control voltage and current regulators.</div><div class='add'>+</div><div class='add'>+The intention is to allow systems to dynamically control regulator power</div><div class='add'>+output in order to save power and prolong battery life. This applies to</div><div class='add'>+both voltage regulators (where voltage output is controllable) and</div><div class='add'>+current sinks (where current limit is controllable).</div><div class='add'>+</div><div class='add'>+Note that additional (and currently more complete) documentation is</div><div class='add'>+available in the Linux kernel source under</div><div class='add'>+``Documentation/power/regulator``.</div><div class='add'>+</div><div class='add'>+Glossary</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+The regulator API uses a number of terms which may not be familiar:</div><div class='add'>+</div><div class='add'>+Regulator</div><div class='add'>+</div><div class='add'>+    Electronic device that supplies power to other devices. Most regulators</div><div class='add'>+    can enable and disable their output and some can also control their</div><div class='add'>+    output voltage or current.</div><div class='add'>+</div><div class='add'>+Consumer</div><div class='add'>+</div><div class='add'>+    Electronic device which consumes power provided by a regulator. These</div><div class='add'>+    may either be static, requiring only a fixed supply, or dynamic,</div><div class='add'>+    requiring active management of the regulator at runtime.</div><div class='add'>+</div><div class='add'>+Power Domain</div><div class='add'>+</div><div class='add'>+    The electronic circuit supplied by a given regulator, including the</div><div class='add'>+    regulator and all consumer devices. The configuration of the regulator</div><div class='add'>+    is shared between all the components in the circuit.</div><div class='add'>+</div><div class='add'>+Power Management Integrated Circuit (PMIC)</div><div class='add'>+</div><div class='add'>+    An IC which contains numerous regulators and often also other</div><div class='add'>+    subsystems. In an embedded system the primary PMIC is often equivalent</div><div class='add'>+    to a combination of the PSU and southbridge in a desktop system.</div><div class='add'>+</div><div class='add'>+Consumer driver interface</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+This offers a similar API to the kernel clock framework. Consumer</div><div class='add'>+drivers use `get &lt;#API-regulator-get&gt;`__ and</div><div class='add'>+`put &lt;#API-regulator-put&gt;`__ operations to acquire and release</div><div class='add'>+regulators. Functions are provided to `enable &lt;#API-regulator-enable&gt;`__</div><div class='add'>+and `disable &lt;#API-regulator-disable&gt;`__ the regulator and to get and</div><div class='add'>+set the runtime parameters of the regulator.</div><div class='add'>+</div><div class='add'>+When requesting regulators consumers use symbolic names for their</div><div class='add'>+supplies, such as "Vcc", which are mapped into actual regulator devices</div><div class='add'>+by the machine interface.</div><div class='add'>+</div><div class='add'>+A stub version of this API is provided when the regulator framework is</div><div class='add'>+not in use in order to minimise the need to use ifdefs.</div><div class='add'>+</div><div class='add'>+Enabling and disabling</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+The regulator API provides reference counted enabling and disabling of</div><div class='add'>+regulators. Consumer devices use the :c:func:`regulator_enable()` and</div><div class='add'>+:c:func:`regulator_disable()` functions to enable and disable</div><div class='add'>+regulators. Calls to the two functions must be balanced.</div><div class='add'>+</div><div class='add'>+Note that since multiple consumers may be using a regulator and machine</div><div class='add'>+constraints may not allow the regulator to be disabled there is no</div><div class='add'>+guarantee that calling :c:func:`regulator_disable()` will actually</div><div class='add'>+cause the supply provided by the regulator to be disabled. Consumer</div><div class='add'>+drivers should assume that the regulator may be enabled at all times.</div><div class='add'>+</div><div class='add'>+Configuration</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+Some consumer devices may need to be able to dynamically configure their</div><div class='add'>+supplies. For example, MMC drivers may need to select the correct</div><div class='add'>+operating voltage for their cards. This may be done while the regulator</div><div class='add'>+is enabled or disabled.</div><div class='add'>+</div><div class='add'>+The :c:func:`regulator_set_voltage()` and</div><div class='add'>+:c:func:`regulator_set_current_limit()` functions provide the primary</div><div class='add'>+interface for this. Both take ranges of voltages and currents, supporting</div><div class='add'>+drivers that do not require a specific value (eg, CPU frequency scaling</div><div class='add'>+normally permits the CPU to use a wider range of supply voltages at lower</div><div class='add'>+frequencies but does not require that the supply voltage be lowered). Where</div><div class='add'>+an exact value is required both minimum and maximum values should be</div><div class='add'>+identical.</div><div class='add'>+</div><div class='add'>+Callbacks</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+Callbacks may also be registered for events such as regulation failures.</div><div class='add'>+</div><div class='add'>+Regulator driver interface</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+Drivers for regulator chips register the regulators with the regulator</div><div class='add'>+core, providing operations structures to the core. A notifier interface</div><div class='add'>+allows error conditions to be reported to the core.</div><div class='add'>+</div><div class='add'>+Registration should be triggered by explicit setup done by the platform,</div><div class='add'>+supplying a struct :c:type:`regulator_init_data` for the regulator</div><div class='add'>+containing constraint and supply information.</div><div class='add'>+</div><div class='add'>+Machine interface</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+This interface provides a way to define how regulators are connected to</div><div class='add'>+consumers on a given system and what the valid operating parameters are</div><div class='add'>+for the system.</div><div class='add'>+</div><div class='add'>+Supplies</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+Regulator supplies are specified using struct</div><div class='add'>+:c:type:`regulator_consumer_supply`. This is done at driver registration</div><div class='add'>+time as part of the machine constraints.</div><div class='add'>+</div><div class='add'>+Constraints</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+As well as defining the connections the machine interface also provides</div><div class='add'>+constraints defining the operations that clients are allowed to perform</div><div class='add'>+and the parameters that may be set. This is required since generally</div><div class='add'>+regulator devices will offer more flexibility than it is safe to use on</div><div class='add'>+a given system, for example supporting higher supply voltages than the</div><div class='add'>+consumers are rated for.</div><div class='add'>+</div><div class='add'>+This is done at driver registration time` by providing a</div><div class='add'>+struct :c:type:`regulation_constraints`.</div><div class='add'>+</div><div class='add'>+The constraints may also specify an initial configuration for the</div><div class='add'>+regulator in the constraints, which is particularly useful for use with</div><div class='add'>+static consumers.</div><div class='add'>+</div><div class='add'>+API reference</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+Due to limitations of the kernel documentation framework and the</div><div class='add'>+existing layout of the source code the entire regulator API is</div><div class='add'>+documented here.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/regulator/consumer.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/regulator/machine.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/regulator/driver.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/regulator/core.c</div><div class='add'>+   :export:</div><div class='head'>diff --git a/Documentation/driver-api/uio-howto.rst b/Documentation/driver-api/uio-howto.rst<br/>new file mode 100644<br/>index 000000000000..f73d660b2956<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/uio-howto.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/uio-howto.rst</a></div><div class='hunk'>@@ -0,0 +1,705 @@</div><div class='add'>+=======================</div><div class='add'>+The Userspace I/O HOWTO</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+:Author: Hans-Jürgen Koch Linux developer, Linutronix</div><div class='add'>+:Date:   2006-12-11</div><div class='add'>+</div><div class='add'>+About this document</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+Translations</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+If you know of any translations for this document, or you are interested</div><div class='add'>+in translating it, please email me hjk@hansjkoch.de.</div><div class='add'>+</div><div class='add'>+Preface</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+For many types of devices, creating a Linux kernel driver is overkill.</div><div class='add'>+All that is really needed is some way to handle an interrupt and provide</div><div class='add'>+access to the memory space of the device. The logic of controlling the</div><div class='add'>+device does not necessarily have to be within the kernel, as the device</div><div class='add'>+does not need to take advantage of any of other resources that the</div><div class='add'>+kernel provides. One such common class of devices that are like this are</div><div class='add'>+for industrial I/O cards.</div><div class='add'>+</div><div class='add'>+To address this situation, the userspace I/O system (UIO) was designed.</div><div class='add'>+For typical industrial I/O cards, only a very small kernel module is</div><div class='add'>+needed. The main part of the driver will run in user space. This</div><div class='add'>+simplifies development and reduces the risk of serious bugs within a</div><div class='add'>+kernel module.</div><div class='add'>+</div><div class='add'>+Please note that UIO is not an universal driver interface. Devices that</div><div class='add'>+are already handled well by other kernel subsystems (like networking or</div><div class='add'>+serial or USB) are no candidates for an UIO driver. Hardware that is</div><div class='add'>+ideally suited for an UIO driver fulfills all of the following:</div><div class='add'>+</div><div class='add'>+-  The device has memory that can be mapped. The device can be</div><div class='add'>+   controlled completely by writing to this memory.</div><div class='add'>+</div><div class='add'>+-  The device usually generates interrupts.</div><div class='add'>+</div><div class='add'>+-  The device does not fit into one of the standard kernel subsystems.</div><div class='add'>+</div><div class='add'>+Acknowledgments</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+I'd like to thank Thomas Gleixner and Benedikt Spranger of Linutronix,</div><div class='add'>+who have not only written most of the UIO code, but also helped greatly</div><div class='add'>+writing this HOWTO by giving me all kinds of background information.</div><div class='add'>+</div><div class='add'>+Feedback</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+Find something wrong with this document? (Or perhaps something right?) I</div><div class='add'>+would love to hear from you. Please email me at hjk@hansjkoch.de.</div><div class='add'>+</div><div class='add'>+About UIO</div><div class='add'>+=========</div><div class='add'>+</div><div class='add'>+If you use UIO for your card's driver, here's what you get:</div><div class='add'>+</div><div class='add'>+-  only one small kernel module to write and maintain.</div><div class='add'>+</div><div class='add'>+-  develop the main part of your driver in user space, with all the</div><div class='add'>+   tools and libraries you're used to.</div><div class='add'>+</div><div class='add'>+-  bugs in your driver won't crash the kernel.</div><div class='add'>+</div><div class='add'>+-  updates of your driver can take place without recompiling the kernel.</div><div class='add'>+</div><div class='add'>+How UIO works</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+Each UIO device is accessed through a device file and several sysfs</div><div class='add'>+attribute files. The device file will be called ``/dev/uio0`` for the</div><div class='add'>+first device, and ``/dev/uio1``, ``/dev/uio2`` and so on for subsequent</div><div class='add'>+devices.</div><div class='add'>+</div><div class='add'>+``/dev/uioX`` is used to access the address space of the card. Just use</div><div class='add'>+:c:func:`mmap()` to access registers or RAM locations of your card.</div><div class='add'>+</div><div class='add'>+Interrupts are handled by reading from ``/dev/uioX``. A blocking</div><div class='add'>+:c:func:`read()` from ``/dev/uioX`` will return as soon as an</div><div class='add'>+interrupt occurs. You can also use :c:func:`select()` on</div><div class='add'>+``/dev/uioX`` to wait for an interrupt. The integer value read from</div><div class='add'>+``/dev/uioX`` represents the total interrupt count. You can use this</div><div class='add'>+number to figure out if you missed some interrupts.</div><div class='add'>+</div><div class='add'>+For some hardware that has more than one interrupt source internally,</div><div class='add'>+but not separate IRQ mask and status registers, there might be</div><div class='add'>+situations where userspace cannot determine what the interrupt source</div><div class='add'>+was if the kernel handler disables them by writing to the chip's IRQ</div><div class='add'>+register. In such a case, the kernel has to disable the IRQ completely</div><div class='add'>+to leave the chip's register untouched. Now the userspace part can</div><div class='add'>+determine the cause of the interrupt, but it cannot re-enable</div><div class='add'>+interrupts. Another cornercase is chips where re-enabling interrupts is</div><div class='add'>+a read-modify-write operation to a combined IRQ status/acknowledge</div><div class='add'>+register. This would be racy if a new interrupt occurred simultaneously.</div><div class='add'>+</div><div class='add'>+To address these problems, UIO also implements a write() function. It is</div><div class='add'>+normally not used and can be ignored for hardware that has only a single</div><div class='add'>+interrupt source or has separate IRQ mask and status registers. If you</div><div class='add'>+need it, however, a write to ``/dev/uioX`` will call the</div><div class='add'>+:c:func:`irqcontrol()` function implemented by the driver. You have</div><div class='add'>+to write a 32-bit value that is usually either 0 or 1 to disable or</div><div class='add'>+enable interrupts. If a driver does not implement</div><div class='add'>+:c:func:`irqcontrol()`, :c:func:`write()` will return with</div><div class='add'>+``-ENOSYS``.</div><div class='add'>+</div><div class='add'>+To handle interrupts properly, your custom kernel module can provide its</div><div class='add'>+own interrupt handler. It will automatically be called by the built-in</div><div class='add'>+handler.</div><div class='add'>+</div><div class='add'>+For cards that don't generate interrupts but need to be polled, there is</div><div class='add'>+the possibility to set up a timer that triggers the interrupt handler at</div><div class='add'>+configurable time intervals. This interrupt simulation is done by</div><div class='add'>+calling :c:func:`uio_event_notify()` from the timer's event</div><div class='add'>+handler.</div><div class='add'>+</div><div class='add'>+Each driver provides attributes that are used to read or write</div><div class='add'>+variables. These attributes are accessible through sysfs files. A custom</div><div class='add'>+kernel driver module can add its own attributes to the device owned by</div><div class='add'>+the uio driver, but not added to the UIO device itself at this time.</div><div class='add'>+This might change in the future if it would be found to be useful.</div><div class='add'>+</div><div class='add'>+The following standard attributes are provided by the UIO framework:</div><div class='add'>+</div><div class='add'>+-  ``name``: The name of your device. It is recommended to use the name</div><div class='add'>+   of your kernel module for this.</div><div class='add'>+</div><div class='add'>+-  ``version``: A version string defined by your driver. This allows the</div><div class='add'>+   user space part of your driver to deal with different versions of the</div><div class='add'>+   kernel module.</div><div class='add'>+</div><div class='add'>+-  ``event``: The total number of interrupts handled by the driver since</div><div class='add'>+   the last time the device node was read.</div><div class='add'>+</div><div class='add'>+These attributes appear under the ``/sys/class/uio/uioX`` directory.</div><div class='add'>+Please note that this directory might be a symlink, and not a real</div><div class='add'>+directory. Any userspace code that accesses it must be able to handle</div><div class='add'>+this.</div><div class='add'>+</div><div class='add'>+Each UIO device can make one or more memory regions available for memory</div><div class='add'>+mapping. This is necessary because some industrial I/O cards require</div><div class='add'>+access to more than one PCI memory region in a driver.</div><div class='add'>+</div><div class='add'>+Each mapping has its own directory in sysfs, the first mapping appears</div><div class='add'>+as ``/sys/class/uio/uioX/maps/map0/``. Subsequent mappings create</div><div class='add'>+directories ``map1/``, ``map2/``, and so on. These directories will only</div><div class='add'>+appear if the size of the mapping is not 0.</div><div class='add'>+</div><div class='add'>+Each ``mapX/`` directory contains four read-only files that show</div><div class='add'>+attributes of the memory:</div><div class='add'>+</div><div class='add'>+-  ``name``: A string identifier for this mapping. This is optional, the</div><div class='add'>+   string can be empty. Drivers can set this to make it easier for</div><div class='add'>+   userspace to find the correct mapping.</div><div class='add'>+</div><div class='add'>+-  ``addr``: The address of memory that can be mapped.</div><div class='add'>+</div><div class='add'>+-  ``size``: The size, in bytes, of the memory pointed to by addr.</div><div class='add'>+</div><div class='add'>+-  ``offset``: The offset, in bytes, that has to be added to the pointer</div><div class='add'>+   returned by :c:func:`mmap()` to get to the actual device memory.</div><div class='add'>+   This is important if the device's memory is not page aligned.</div><div class='add'>+   Remember that pointers returned by :c:func:`mmap()` are always</div><div class='add'>+   page aligned, so it is good style to always add this offset.</div><div class='add'>+</div><div class='add'>+From userspace, the different mappings are distinguished by adjusting</div><div class='add'>+the ``offset`` parameter of the :c:func:`mmap()` call. To map the</div><div class='add'>+memory of mapping N, you have to use N times the page size as your</div><div class='add'>+offset::</div><div class='add'>+</div><div class='add'>+    offset = N * getpagesize();</div><div class='add'>+</div><div class='add'>+Sometimes there is hardware with memory-like regions that can not be</div><div class='add'>+mapped with the technique described here, but there are still ways to</div><div class='add'>+access them from userspace. The most common example are x86 ioports. On</div><div class='add'>+x86 systems, userspace can access these ioports using</div><div class='add'>+:c:func:`ioperm()`, :c:func:`iopl()`, :c:func:`inb()`,</div><div class='add'>+:c:func:`outb()`, and similar functions.</div><div class='add'>+</div><div class='add'>+Since these ioport regions can not be mapped, they will not appear under</div><div class='add'>+``/sys/class/uio/uioX/maps/`` like the normal memory described above.</div><div class='add'>+Without information about the port regions a hardware has to offer, it</div><div class='add'>+becomes difficult for the userspace part of the driver to find out which</div><div class='add'>+ports belong to which UIO device.</div><div class='add'>+</div><div class='add'>+To address this situation, the new directory</div><div class='add'>+``/sys/class/uio/uioX/portio/`` was added. It only exists if the driver</div><div class='add'>+wants to pass information about one or more port regions to userspace.</div><div class='add'>+If that is the case, subdirectories named ``port0``, ``port1``, and so</div><div class='add'>+on, will appear underneath ``/sys/class/uio/uioX/portio/``.</div><div class='add'>+</div><div class='add'>+Each ``portX/`` directory contains four read-only files that show name,</div><div class='add'>+start, size, and type of the port region:</div><div class='add'>+</div><div class='add'>+-  ``name``: A string identifier for this port region. The string is</div><div class='add'>+   optional and can be empty. Drivers can set it to make it easier for</div><div class='add'>+   userspace to find a certain port region.</div><div class='add'>+</div><div class='add'>+-  ``start``: The first port of this region.</div><div class='add'>+</div><div class='add'>+-  ``size``: The number of ports in this region.</div><div class='add'>+</div><div class='add'>+-  ``porttype``: A string describing the type of port.</div><div class='add'>+</div><div class='add'>+Writing your own kernel module</div><div class='add'>+==============================</div><div class='add'>+</div><div class='add'>+Please have a look at ``uio_cif.c`` as an example. The following</div><div class='add'>+paragraphs explain the different sections of this file.</div><div class='add'>+</div><div class='add'>+struct uio_info</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+This structure tells the framework the details of your driver, Some of</div><div class='add'>+the members are required, others are optional.</div><div class='add'>+</div><div class='add'>+-  ``const char *name``: Required. The name of your driver as it will</div><div class='add'>+   appear in sysfs. I recommend using the name of your module for this.</div><div class='add'>+</div><div class='add'>+-  ``const char *version``: Required. This string appears in</div><div class='add'>+   ``/sys/class/uio/uioX/version``.</div><div class='add'>+</div><div class='add'>+-  ``struct uio_mem mem[ MAX_UIO_MAPS ]``: Required if you have memory</div><div class='add'>+   that can be mapped with :c:func:`mmap()`. For each mapping you</div><div class='add'>+   need to fill one of the ``uio_mem`` structures. See the description</div><div class='add'>+   below for details.</div><div class='add'>+</div><div class='add'>+-  ``struct uio_port port[ MAX_UIO_PORTS_REGIONS ]``: Required if you</div><div class='add'>+   want to pass information about ioports to userspace. For each port</div><div class='add'>+   region you need to fill one of the ``uio_port`` structures. See the</div><div class='add'>+   description below for details.</div><div class='add'>+</div><div class='add'>+-  ``long irq``: Required. If your hardware generates an interrupt, it's</div><div class='add'>+   your modules task to determine the irq number during initialization.</div><div class='add'>+   If you don't have a hardware generated interrupt but want to trigger</div><div class='add'>+   the interrupt handler in some other way, set ``irq`` to</div><div class='add'>+   ``UIO_IRQ_CUSTOM``. If you had no interrupt at all, you could set</div><div class='add'>+   ``irq`` to ``UIO_IRQ_NONE``, though this rarely makes sense.</div><div class='add'>+</div><div class='add'>+-  ``unsigned long irq_flags``: Required if you've set ``irq`` to a</div><div class='add'>+   hardware interrupt number. The flags given here will be used in the</div><div class='add'>+   call to :c:func:`request_irq()`.</div><div class='add'>+</div><div class='add'>+-  ``int (*mmap)(struct uio_info *info, struct vm_area_struct *vma)``:</div><div class='add'>+   Optional. If you need a special :c:func:`mmap()`</div><div class='add'>+   function, you can set it here. If this pointer is not NULL, your</div><div class='add'>+   :c:func:`mmap()` will be called instead of the built-in one.</div><div class='add'>+</div><div class='add'>+-  ``int (*open)(struct uio_info *info, struct inode *inode)``:</div><div class='add'>+   Optional. You might want to have your own :c:func:`open()`,</div><div class='add'>+   e.g. to enable interrupts only when your device is actually used.</div><div class='add'>+</div><div class='add'>+-  ``int (*release)(struct uio_info *info, struct inode *inode)``:</div><div class='add'>+   Optional. If you define your own :c:func:`open()`, you will</div><div class='add'>+   probably also want a custom :c:func:`release()` function.</div><div class='add'>+</div><div class='add'>+-  ``int (*irqcontrol)(struct uio_info *info, s32 irq_on)``:</div><div class='add'>+   Optional. If you need to be able to enable or disable interrupts</div><div class='add'>+   from userspace by writing to ``/dev/uioX``, you can implement this</div><div class='add'>+   function. The parameter ``irq_on`` will be 0 to disable interrupts</div><div class='add'>+   and 1 to enable them.</div><div class='add'>+</div><div class='add'>+Usually, your device will have one or more memory regions that can be</div><div class='add'>+mapped to user space. For each region, you have to set up a</div><div class='add'>+``struct uio_mem`` in the ``mem[]`` array. Here's a description of the</div><div class='add'>+fields of ``struct uio_mem``:</div><div class='add'>+</div><div class='add'>+-  ``const char *name``: Optional. Set this to help identify the memory</div><div class='add'>+   region, it will show up in the corresponding sysfs node.</div><div class='add'>+</div><div class='add'>+-  ``int memtype``: Required if the mapping is used. Set this to</div><div class='add'>+   ``UIO_MEM_PHYS`` if you you have physical memory on your card to be</div><div class='add'>+   mapped. Use ``UIO_MEM_LOGICAL`` for logical memory (e.g. allocated</div><div class='add'>+   with :c:func:`kmalloc()`). There's also ``UIO_MEM_VIRTUAL`` for</div><div class='add'>+   virtual memory.</div><div class='add'>+</div><div class='add'>+-  ``phys_addr_t addr``: Required if the mapping is used. Fill in the</div><div class='add'>+   address of your memory block. This address is the one that appears in</div><div class='add'>+   sysfs.</div><div class='add'>+</div><div class='add'>+-  ``resource_size_t size``: Fill in the size of the memory block that</div><div class='add'>+   ``addr`` points to. If ``size`` is zero, the mapping is considered</div><div class='add'>+   unused. Note that you *must* initialize ``size`` with zero for all</div><div class='add'>+   unused mappings.</div><div class='add'>+</div><div class='add'>+-  ``void *internal_addr``: If you have to access this memory region</div><div class='add'>+   from within your kernel module, you will want to map it internally by</div><div class='add'>+   using something like :c:func:`ioremap()`. Addresses returned by</div><div class='add'>+   this function cannot be mapped to user space, so you must not store</div><div class='add'>+   it in ``addr``. Use ``internal_addr`` instead to remember such an</div><div class='add'>+   address.</div><div class='add'>+</div><div class='add'>+Please do not touch the ``map`` element of ``struct uio_mem``! It is</div><div class='add'>+used by the UIO framework to set up sysfs files for this mapping. Simply</div><div class='add'>+leave it alone.</div><div class='add'>+</div><div class='add'>+Sometimes, your device can have one or more port regions which can not</div><div class='add'>+be mapped to userspace. But if there are other possibilities for</div><div class='add'>+userspace to access these ports, it makes sense to make information</div><div class='add'>+about the ports available in sysfs. For each region, you have to set up</div><div class='add'>+a ``struct uio_port`` in the ``port[]`` array. Here's a description of</div><div class='add'>+the fields of ``struct uio_port``:</div><div class='add'>+</div><div class='add'>+-  ``char *porttype``: Required. Set this to one of the predefined</div><div class='add'>+   constants. Use ``UIO_PORT_X86`` for the ioports found in x86</div><div class='add'>+   architectures.</div><div class='add'>+</div><div class='add'>+-  ``unsigned long start``: Required if the port region is used. Fill in</div><div class='add'>+   the number of the first port of this region.</div><div class='add'>+</div><div class='add'>+-  ``unsigned long size``: Fill in the number of ports in this region.</div><div class='add'>+   If ``size`` is zero, the region is considered unused. Note that you</div><div class='add'>+   *must* initialize ``size`` with zero for all unused regions.</div><div class='add'>+</div><div class='add'>+Please do not touch the ``portio`` element of ``struct uio_port``! It is</div><div class='add'>+used internally by the UIO framework to set up sysfs files for this</div><div class='add'>+region. Simply leave it alone.</div><div class='add'>+</div><div class='add'>+Adding an interrupt handler</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+What you need to do in your interrupt handler depends on your hardware</div><div class='add'>+and on how you want to handle it. You should try to keep the amount of</div><div class='add'>+code in your kernel interrupt handler low. If your hardware requires no</div><div class='add'>+action that you *have* to perform after each interrupt, then your</div><div class='add'>+handler can be empty.</div><div class='add'>+</div><div class='add'>+If, on the other hand, your hardware *needs* some action to be performed</div><div class='add'>+after each interrupt, then you *must* do it in your kernel module. Note</div><div class='add'>+that you cannot rely on the userspace part of your driver. Your</div><div class='add'>+userspace program can terminate at any time, possibly leaving your</div><div class='add'>+hardware in a state where proper interrupt handling is still required.</div><div class='add'>+</div><div class='add'>+There might also be applications where you want to read data from your</div><div class='add'>+hardware at each interrupt and buffer it in a piece of kernel memory</div><div class='add'>+you've allocated for that purpose. With this technique you could avoid</div><div class='add'>+loss of data if your userspace program misses an interrupt.</div><div class='add'>+</div><div class='add'>+A note on shared interrupts: Your driver should support interrupt</div><div class='add'>+sharing whenever this is possible. It is possible if and only if your</div><div class='add'>+driver can detect whether your hardware has triggered the interrupt or</div><div class='add'>+not. This is usually done by looking at an interrupt status register. If</div><div class='add'>+your driver sees that the IRQ bit is actually set, it will perform its</div><div class='add'>+actions, and the handler returns IRQ_HANDLED. If the driver detects</div><div class='add'>+that it was not your hardware that caused the interrupt, it will do</div><div class='add'>+nothing and return IRQ_NONE, allowing the kernel to call the next</div><div class='add'>+possible interrupt handler.</div><div class='add'>+</div><div class='add'>+If you decide not to support shared interrupts, your card won't work in</div><div class='add'>+computers with no free interrupts. As this frequently happens on the PC</div><div class='add'>+platform, you can save yourself a lot of trouble by supporting interrupt</div><div class='add'>+sharing.</div><div class='add'>+</div><div class='add'>+Using uio_pdrv for platform devices</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+In many cases, UIO drivers for platform devices can be handled in a</div><div class='add'>+generic way. In the same place where you define your</div><div class='add'>+``struct platform_device``, you simply also implement your interrupt</div><div class='add'>+handler and fill your ``struct uio_info``. A pointer to this</div><div class='add'>+``struct uio_info`` is then used as ``platform_data`` for your platform</div><div class='add'>+device.</div><div class='add'>+</div><div class='add'>+You also need to set up an array of ``struct resource`` containing</div><div class='add'>+addresses and sizes of your memory mappings. This information is passed</div><div class='add'>+to the driver using the ``.resource`` and ``.num_resources`` elements of</div><div class='add'>+``struct platform_device``.</div><div class='add'>+</div><div class='add'>+You now have to set the ``.name`` element of ``struct platform_device``</div><div class='add'>+to ``"uio_pdrv"`` to use the generic UIO platform device driver. This</div><div class='add'>+driver will fill the ``mem[]`` array according to the resources given,</div><div class='add'>+and register the device.</div><div class='add'>+</div><div class='add'>+The advantage of this approach is that you only have to edit a file you</div><div class='add'>+need to edit anyway. You do not have to create an extra driver.</div><div class='add'>+</div><div class='add'>+Using uio_pdrv_genirq for platform devices</div><div class='add'>+------------------------------------------</div><div class='add'>+</div><div class='add'>+Especially in embedded devices, you frequently find chips where the irq</div><div class='add'>+pin is tied to its own dedicated interrupt line. In such cases, where</div><div class='add'>+you can be really sure the interrupt is not shared, we can take the</div><div class='add'>+concept of ``uio_pdrv`` one step further and use a generic interrupt</div><div class='add'>+handler. That's what ``uio_pdrv_genirq`` does.</div><div class='add'>+</div><div class='add'>+The setup for this driver is the same as described above for</div><div class='add'>+``uio_pdrv``, except that you do not implement an interrupt handler. The</div><div class='add'>+``.handler`` element of ``struct uio_info`` must remain ``NULL``. The</div><div class='add'>+``.irq_flags`` element must not contain ``IRQF_SHARED``.</div><div class='add'>+</div><div class='add'>+You will set the ``.name`` element of ``struct platform_device`` to</div><div class='add'>+``"uio_pdrv_genirq"`` to use this driver.</div><div class='add'>+</div><div class='add'>+The generic interrupt handler of ``uio_pdrv_genirq`` will simply disable</div><div class='add'>+the interrupt line using :c:func:`disable_irq_nosync()`. After</div><div class='add'>+doing its work, userspace can reenable the interrupt by writing</div><div class='add'>+0x00000001 to the UIO device file. The driver already implements an</div><div class='add'>+:c:func:`irq_control()` to make this possible, you must not</div><div class='add'>+implement your own.</div><div class='add'>+</div><div class='add'>+Using ``uio_pdrv_genirq`` not only saves a few lines of interrupt</div><div class='add'>+handler code. You also do not need to know anything about the chip's</div><div class='add'>+internal registers to create the kernel part of the driver. All you need</div><div class='add'>+to know is the irq number of the pin the chip is connected to.</div><div class='add'>+</div><div class='add'>+Using uio_dmem_genirq for platform devices</div><div class='add'>+------------------------------------------</div><div class='add'>+</div><div class='add'>+In addition to statically allocated memory ranges, they may also be a</div><div class='add'>+desire to use dynamically allocated regions in a user space driver. In</div><div class='add'>+particular, being able to access memory made available through the</div><div class='add'>+dma-mapping API, may be particularly useful. The ``uio_dmem_genirq``</div><div class='add'>+driver provides a way to accomplish this.</div><div class='add'>+</div><div class='add'>+This driver is used in a similar manner to the ``"uio_pdrv_genirq"``</div><div class='add'>+driver with respect to interrupt configuration and handling.</div><div class='add'>+</div><div class='add'>+Set the ``.name`` element of ``struct platform_device`` to</div><div class='add'>+``"uio_dmem_genirq"`` to use this driver.</div><div class='add'>+</div><div class='add'>+When using this driver, fill in the ``.platform_data`` element of</div><div class='add'>+``struct platform_device``, which is of type</div><div class='add'>+``struct uio_dmem_genirq_pdata`` and which contains the following</div><div class='add'>+elements:</div><div class='add'>+</div><div class='add'>+-  ``struct uio_info uioinfo``: The same structure used as the</div><div class='add'>+   ``uio_pdrv_genirq`` platform data</div><div class='add'>+</div><div class='add'>+-  ``unsigned int *dynamic_region_sizes``: Pointer to list of sizes of</div><div class='add'>+   dynamic memory regions to be mapped into user space.</div><div class='add'>+</div><div class='add'>+-  ``unsigned int num_dynamic_regions``: Number of elements in</div><div class='add'>+   ``dynamic_region_sizes`` array.</div><div class='add'>+</div><div class='add'>+The dynamic regions defined in the platform data will be appended to the</div><div class='add'>+`` mem[] `` array after the platform device resources, which implies</div><div class='add'>+that the total number of static and dynamic memory regions cannot exceed</div><div class='add'>+``MAX_UIO_MAPS``.</div><div class='add'>+</div><div class='add'>+The dynamic memory regions will be allocated when the UIO device file,</div><div class='add'>+``/dev/uioX`` is opened. Similar to static memory resources, the memory</div><div class='add'>+region information for dynamic regions is then visible via sysfs at</div><div class='add'>+``/sys/class/uio/uioX/maps/mapY/*``. The dynamic memory regions will be</div><div class='add'>+freed when the UIO device file is closed. When no processes are holding</div><div class='add'>+the device file open, the address returned to userspace is ~0.</div><div class='add'>+</div><div class='add'>+Writing a driver in userspace</div><div class='add'>+=============================</div><div class='add'>+</div><div class='add'>+Once you have a working kernel module for your hardware, you can write</div><div class='add'>+the userspace part of your driver. You don't need any special libraries,</div><div class='add'>+your driver can be written in any reasonable language, you can use</div><div class='add'>+floating point numbers and so on. In short, you can use all the tools</div><div class='add'>+and libraries you'd normally use for writing a userspace application.</div><div class='add'>+</div><div class='add'>+Getting information about your UIO device</div><div class='add'>+-----------------------------------------</div><div class='add'>+</div><div class='add'>+Information about all UIO devices is available in sysfs. The first thing</div><div class='add'>+you should do in your driver is check ``name`` and ``version`` to make</div><div class='add'>+sure your talking to the right device and that its kernel driver has the</div><div class='add'>+version you expect.</div><div class='add'>+</div><div class='add'>+You should also make sure that the memory mapping you need exists and</div><div class='add'>+has the size you expect.</div><div class='add'>+</div><div class='add'>+There is a tool called ``lsuio`` that lists UIO devices and their</div><div class='add'>+attributes. It is available here:</div><div class='add'>+</div><div class='add'>+http://www.osadl.org/projects/downloads/UIO/user/</div><div class='add'>+</div><div class='add'>+With ``lsuio`` you can quickly check if your kernel module is loaded and</div><div class='add'>+which attributes it exports. Have a look at the manpage for details.</div><div class='add'>+</div><div class='add'>+The source code of ``lsuio`` can serve as an example for getting</div><div class='add'>+information about an UIO device. The file ``uio_helper.c`` contains a</div><div class='add'>+lot of functions you could use in your userspace driver code.</div><div class='add'>+</div><div class='add'>+mmap() device memory</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+After you made sure you've got the right device with the memory mappings</div><div class='add'>+you need, all you have to do is to call :c:func:`mmap()` to map the</div><div class='add'>+device's memory to userspace.</div><div class='add'>+</div><div class='add'>+The parameter ``offset`` of the :c:func:`mmap()` call has a special</div><div class='add'>+meaning for UIO devices: It is used to select which mapping of your</div><div class='add'>+device you want to map. To map the memory of mapping N, you have to use</div><div class='add'>+N times the page size as your offset::</div><div class='add'>+</div><div class='add'>+        offset = N * getpagesize();</div><div class='add'>+</div><div class='add'>+N starts from zero, so if you've got only one memory range to map, set</div><div class='add'>+``offset = 0``. A drawback of this technique is that memory is always</div><div class='add'>+mapped beginning with its start address.</div><div class='add'>+</div><div class='add'>+Waiting for interrupts</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+After you successfully mapped your devices memory, you can access it</div><div class='add'>+like an ordinary array. Usually, you will perform some initialization.</div><div class='add'>+After that, your hardware starts working and will generate an interrupt</div><div class='add'>+as soon as it's finished, has some data available, or needs your</div><div class='add'>+attention because an error occurred.</div><div class='add'>+</div><div class='add'>+``/dev/uioX`` is a read-only file. A :c:func:`read()` will always</div><div class='add'>+block until an interrupt occurs. There is only one legal value for the</div><div class='add'>+``count`` parameter of :c:func:`read()`, and that is the size of a</div><div class='add'>+signed 32 bit integer (4). Any other value for ``count`` causes</div><div class='add'>+:c:func:`read()` to fail. The signed 32 bit integer read is the</div><div class='add'>+interrupt count of your device. If the value is one more than the value</div><div class='add'>+you read the last time, everything is OK. If the difference is greater</div><div class='add'>+than one, you missed interrupts.</div><div class='add'>+</div><div class='add'>+You can also use :c:func:`select()` on ``/dev/uioX``.</div><div class='add'>+</div><div class='add'>+Generic PCI UIO driver</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+The generic driver is a kernel module named uio_pci_generic. It can</div><div class='add'>+work with any device compliant to PCI 2.3 (circa 2002) and any compliant</div><div class='add'>+PCI Express device. Using this, you only need to write the userspace</div><div class='add'>+driver, removing the need to write a hardware-specific kernel module.</div><div class='add'>+</div><div class='add'>+Making the driver recognize the device</div><div class='add'>+--------------------------------------</div><div class='add'>+</div><div class='add'>+Since the driver does not declare any device ids, it will not get loaded</div><div class='add'>+automatically and will not automatically bind to any devices, you must</div><div class='add'>+load it and allocate id to the driver yourself. For example::</div><div class='add'>+</div><div class='add'>+     modprobe uio_pci_generic</div><div class='add'>+     echo "8086 10f5" &gt; /sys/bus/pci/drivers/uio_pci_generic/new_id</div><div class='add'>+</div><div class='add'>+If there already is a hardware specific kernel driver for your device,</div><div class='add'>+the generic driver still won't bind to it, in this case if you want to</div><div class='add'>+use the generic driver (why would you?) you'll have to manually unbind</div><div class='add'>+the hardware specific driver and bind the generic driver, like this::</div><div class='add'>+</div><div class='add'>+        echo -n 0000:00:19.0 &gt; /sys/bus/pci/drivers/e1000e/unbind</div><div class='add'>+        echo -n 0000:00:19.0 &gt; /sys/bus/pci/drivers/uio_pci_generic/bind</div><div class='add'>+</div><div class='add'>+You can verify that the device has been bound to the driver by looking</div><div class='add'>+for it in sysfs, for example like the following::</div><div class='add'>+</div><div class='add'>+        ls -l /sys/bus/pci/devices/0000:00:19.0/driver</div><div class='add'>+</div><div class='add'>+Which if successful should print::</div><div class='add'>+</div><div class='add'>+      .../0000:00:19.0/driver -&gt; ../../../bus/pci/drivers/uio_pci_generic</div><div class='add'>+</div><div class='add'>+Note that the generic driver will not bind to old PCI 2.2 devices. If</div><div class='add'>+binding the device failed, run the following command::</div><div class='add'>+</div><div class='add'>+      dmesg</div><div class='add'>+</div><div class='add'>+and look in the output for failure reasons.</div><div class='add'>+</div><div class='add'>+Things to know about uio_pci_generic</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+Interrupts are handled using the Interrupt Disable bit in the PCI</div><div class='add'>+command register and Interrupt Status bit in the PCI status register.</div><div class='add'>+All devices compliant to PCI 2.3 (circa 2002) and all compliant PCI</div><div class='add'>+Express devices should support these bits. uio_pci_generic detects</div><div class='add'>+this support, and won't bind to devices which do not support the</div><div class='add'>+Interrupt Disable Bit in the command register.</div><div class='add'>+</div><div class='add'>+On each interrupt, uio_pci_generic sets the Interrupt Disable bit.</div><div class='add'>+This prevents the device from generating further interrupts until the</div><div class='add'>+bit is cleared. The userspace driver should clear this bit before</div><div class='add'>+blocking and waiting for more interrupts.</div><div class='add'>+</div><div class='add'>+Writing userspace driver using uio_pci_generic</div><div class='add'>+------------------------------------------------</div><div class='add'>+</div><div class='add'>+Userspace driver can use pci sysfs interface, or the libpci library that</div><div class='add'>+wraps it, to talk to the device and to re-enable interrupts by writing</div><div class='add'>+to the command register.</div><div class='add'>+</div><div class='add'>+Example code using uio_pci_generic</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+Here is some sample userspace driver code using uio_pci_generic::</div><div class='add'>+</div><div class='add'>+    #include &lt;stdlib.h&gt;</div><div class='add'>+    #include &lt;stdio.h&gt;</div><div class='add'>+    #include &lt;unistd.h&gt;</div><div class='add'>+    #include &lt;sys/types.h&gt;</div><div class='add'>+    #include &lt;sys/stat.h&gt;</div><div class='add'>+    #include &lt;fcntl.h&gt;</div><div class='add'>+    #include &lt;errno.h&gt;</div><div class='add'>+</div><div class='add'>+    int main()</div><div class='add'>+    {</div><div class='add'>+        int uiofd;</div><div class='add'>+        int configfd;</div><div class='add'>+        int err;</div><div class='add'>+        int i;</div><div class='add'>+        unsigned icount;</div><div class='add'>+        unsigned char command_high;</div><div class='add'>+</div><div class='add'>+        uiofd = open("/dev/uio0", O_RDONLY);</div><div class='add'>+        if (uiofd &lt; 0) {</div><div class='add'>+            perror("uio open:");</div><div class='add'>+            return errno;</div><div class='add'>+        }</div><div class='add'>+        configfd = open("/sys/class/uio/uio0/device/config", O_RDWR);</div><div class='add'>+        if (configfd &lt; 0) {</div><div class='add'>+            perror("config open:");</div><div class='add'>+            return errno;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* Read and cache command value */</div><div class='add'>+        err = pread(configfd, &amp;command_high, 1, 5);</div><div class='add'>+        if (err != 1) {</div><div class='add'>+            perror("command config read:");</div><div class='add'>+            return errno;</div><div class='add'>+        }</div><div class='add'>+        command_high &amp;= ~0x4;</div><div class='add'>+</div><div class='add'>+        for(i = 0;; ++i) {</div><div class='add'>+            /* Print out a message, for debugging. */</div><div class='add'>+            if (i == 0)</div><div class='add'>+                fprintf(stderr, "Started uio test driver.\n");</div><div class='add'>+            else</div><div class='add'>+                fprintf(stderr, "Interrupts: %d\n", icount);</div><div class='add'>+</div><div class='add'>+            /****************************************/</div><div class='add'>+            /* Here we got an interrupt from the</div><div class='add'>+               device. Do something to it. */</div><div class='add'>+            /****************************************/</div><div class='add'>+</div><div class='add'>+            /* Re-enable interrupts. */</div><div class='add'>+            err = pwrite(configfd, &amp;command_high, 1, 5);</div><div class='add'>+            if (err != 1) {</div><div class='add'>+                perror("config write:");</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* Wait for next interrupt. */</div><div class='add'>+            err = read(uiofd, &amp;icount, 4);</div><div class='add'>+            if (err != 4) {</div><div class='add'>+                perror("uio read:");</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+        }</div><div class='add'>+        return errno;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+Generic Hyper-V UIO driver</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+The generic driver is a kernel module named uio_hv_generic. It</div><div class='add'>+supports devices on the Hyper-V VMBus similar to uio_pci_generic on</div><div class='add'>+PCI bus.</div><div class='add'>+</div><div class='add'>+Making the driver recognize the device</div><div class='add'>+--------------------------------------</div><div class='add'>+</div><div class='add'>+Since the driver does not declare any device GUID's, it will not get</div><div class='add'>+loaded automatically and will not automatically bind to any devices, you</div><div class='add'>+must load it and allocate id to the driver yourself. For example, to use</div><div class='add'>+the network device GUID::</div><div class='add'>+</div><div class='add'>+     modprobe uio_hv_generic</div><div class='add'>+     echo "f8615163-df3e-46c5-913f-f2d2f965ed0e" &gt; /sys/bus/vmbus/drivers/uio_hv_generic/new_id</div><div class='add'>+</div><div class='add'>+If there already is a hardware specific kernel driver for the device,</div><div class='add'>+the generic driver still won't bind to it, in this case if you want to</div><div class='add'>+use the generic driver (why would you?) you'll have to manually unbind</div><div class='add'>+the hardware specific driver and bind the generic driver, like this::</div><div class='add'>+</div><div class='add'>+          echo -n vmbus-ed963694-e847-4b2a-85af-bc9cfc11d6f3 &gt; /sys/bus/vmbus/drivers/hv_netvsc/unbind</div><div class='add'>+          echo -n vmbus-ed963694-e847-4b2a-85af-bc9cfc11d6f3 &gt; /sys/bus/vmbus/drivers/uio_hv_generic/bind</div><div class='add'>+</div><div class='add'>+You can verify that the device has been bound to the driver by looking</div><div class='add'>+for it in sysfs, for example like the following::</div><div class='add'>+</div><div class='add'>+        ls -l /sys/bus/vmbus/devices/vmbus-ed963694-e847-4b2a-85af-bc9cfc11d6f3/driver</div><div class='add'>+</div><div class='add'>+Which if successful should print::</div><div class='add'>+</div><div class='add'>+      .../vmbus-ed963694-e847-4b2a-85af-bc9cfc11d6f3/driver -&gt; ../../../bus/vmbus/drivers/uio_hv_generic</div><div class='add'>+</div><div class='add'>+Things to know about uio_hv_generic</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+On each interrupt, uio_hv_generic sets the Interrupt Disable bit. This</div><div class='add'>+prevents the device from generating further interrupts until the bit is</div><div class='add'>+cleared. The userspace driver should clear this bit before blocking and</div><div class='add'>+waiting for more interrupts.</div><div class='add'>+</div><div class='add'>+Further information</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+-  `OSADL homepage. &lt;http://www.osadl.org&gt;`_</div><div class='add'>+</div><div class='add'>+-  `Linutronix homepage. &lt;http://www.linutronix.de&gt;`_</div><div class='head'>diff --git a/Documentation/driver-api/usb.rst b/Documentation/driver-api/usb.rst<br/>new file mode 100644<br/>index 000000000000..851cc40b66b5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/usb.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/usb.rst</a></div><div class='hunk'>@@ -0,0 +1,748 @@</div><div class='add'>+===========================</div><div class='add'>+The Linux-USB Host Side API</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+Introduction to USB on Linux</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+A Universal Serial Bus (USB) is used to connect a host, such as a PC or</div><div class='add'>+workstation, to a number of peripheral devices. USB uses a tree</div><div class='add'>+structure, with the host as the root (the system's master), hubs as</div><div class='add'>+interior nodes, and peripherals as leaves (and slaves). Modern PCs</div><div class='add'>+support several such trees of USB devices, usually</div><div class='add'>+a few USB 3.0 (5 GBit/s) or USB 3.1 (10 GBit/s) and some legacy</div><div class='add'>+USB 2.0 (480 MBit/s) busses just in case.</div><div class='add'>+</div><div class='add'>+That master/slave asymmetry was designed-in for a number of reasons, one</div><div class='add'>+being ease of use. It is not physically possible to mistake upstream and</div><div class='add'>+downstream or it does not matter with a type C plug (or they are built into the</div><div class='add'>+peripheral). Also, the host software doesn't need to deal with</div><div class='add'>+distributed auto-configuration since the pre-designated master node</div><div class='add'>+manages all that.</div><div class='add'>+</div><div class='add'>+Kernel developers added USB support to Linux early in the 2.2 kernel</div><div class='add'>+series and have been developing it further since then. Besides support</div><div class='add'>+for each new generation of USB, various host controllers gained support,</div><div class='add'>+new drivers for peripherals have been added and advanced features for latency</div><div class='add'>+measurement and improved power management introduced.</div><div class='add'>+</div><div class='add'>+Linux can run inside USB devices as well as on the hosts that control</div><div class='add'>+the devices. But USB device drivers running inside those peripherals</div><div class='add'>+don't do the same things as the ones running inside hosts, so they've</div><div class='add'>+been given a different name: *gadget drivers*. This document does not</div><div class='add'>+cover gadget drivers.</div><div class='add'>+</div><div class='add'>+USB Host-Side API Model</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+Host-side drivers for USB devices talk to the "usbcore" APIs. There are</div><div class='add'>+two. One is intended for *general-purpose* drivers (exposed through</div><div class='add'>+driver frameworks), and the other is for drivers that are *part of the</div><div class='add'>+core*. Such core drivers include the *hub* driver (which manages trees</div><div class='add'>+of USB devices) and several different kinds of *host controller</div><div class='add'>+drivers*, which control individual busses.</div><div class='add'>+</div><div class='add'>+The device model seen by USB drivers is relatively complex.</div><div class='add'>+</div><div class='add'>+-  USB supports four kinds of data transfers (control, bulk, interrupt,</div><div class='add'>+   and isochronous). Two of them (control and bulk) use bandwidth as</div><div class='add'>+   it's available, while the other two (interrupt and isochronous) are</div><div class='add'>+   scheduled to provide guaranteed bandwidth.</div><div class='add'>+</div><div class='add'>+-  The device description model includes one or more "configurations"</div><div class='add'>+   per device, only one of which is active at a time. Devices are supposed</div><div class='add'>+   to be capable of operating at lower than their top</div><div class='add'>+   speeds and may provide a BOS descriptor showing the lowest speed they</div><div class='add'>+   remain fully operational at.</div><div class='add'>+</div><div class='add'>+-  From USB 3.0 on configurations have one or more "functions", which</div><div class='add'>+   provide a common functionality and are grouped together for purposes</div><div class='add'>+   of power management.</div><div class='add'>+</div><div class='add'>+-  Configurations or functions have one or more "interfaces", each of which may have</div><div class='add'>+   "alternate settings". Interfaces may be standardized by USB "Class"</div><div class='add'>+   specifications, or may be specific to a vendor or device.</div><div class='add'>+</div><div class='add'>+   USB device drivers actually bind to interfaces, not devices. Think of</div><div class='add'>+   them as "interface drivers", though you may not see many devices</div><div class='add'>+   where the distinction is important. *Most USB devices are simple,</div><div class='add'>+   with only one function, one configuration, one interface, and one alternate</div><div class='add'>+   setting.*</div><div class='add'>+</div><div class='add'>+-  Interfaces have one or more "endpoints", each of which supports one</div><div class='add'>+   type and direction of data transfer such as "bulk out" or "interrupt</div><div class='add'>+   in". The entire configuration may have up to sixteen endpoints in</div><div class='add'>+   each direction, allocated as needed among all the interfaces.</div><div class='add'>+</div><div class='add'>+-  Data transfer on USB is packetized; each endpoint has a maximum</div><div class='add'>+   packet size. Drivers must often be aware of conventions such as</div><div class='add'>+   flagging the end of bulk transfers using "short" (including zero</div><div class='add'>+   length) packets.</div><div class='add'>+</div><div class='add'>+-  The Linux USB API supports synchronous calls for control and bulk</div><div class='add'>+   messages. It also supports asynchronous calls for all kinds of data</div><div class='add'>+   transfer, using request structures called "URBs" (USB Request</div><div class='add'>+   Blocks).</div><div class='add'>+</div><div class='add'>+Accordingly, the USB Core API exposed to device drivers covers quite a</div><div class='add'>+lot of territory. You'll probably need to consult the USB 3.0</div><div class='add'>+specification, available online from www.usb.org at no cost, as well as</div><div class='add'>+class or device specifications.</div><div class='add'>+</div><div class='add'>+The only host-side drivers that actually touch hardware (reading/writing</div><div class='add'>+registers, handling IRQs, and so on) are the HCDs. In theory, all HCDs</div><div class='add'>+provide the same functionality through the same API. In practice, that's</div><div class='add'>+becoming more true, but there are still differences</div><div class='add'>+that crop up especially with fault handling on the less common controllers.</div><div class='add'>+Different controllers don't</div><div class='add'>+necessarily report the same aspects of failures, and recovery from</div><div class='add'>+faults (including software-induced ones like unlinking an URB) isn't yet</div><div class='add'>+fully consistent. Device driver authors should make a point of doing</div><div class='add'>+disconnect testing (while the device is active) with each different host</div><div class='add'>+controller driver, to make sure drivers don't have bugs of their own as</div><div class='add'>+well as to make sure they aren't relying on some HCD-specific behavior.</div><div class='add'>+</div><div class='add'>+USB-Standard Types</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+In ``&lt;linux/usb/ch9.h&gt;`` you will find the USB data types defined in</div><div class='add'>+chapter 9 of the USB specification. These data types are used throughout</div><div class='add'>+USB, and in APIs including this host side API, gadget APIs, and usbfs.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/usb/ch9.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+Host-Side Data Types and Macros</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+The host side API exposes several layers to drivers, some of which are</div><div class='add'>+more necessary than others. These support lifecycle models for host side</div><div class='add'>+drivers and devices, and support passing buffers through usbcore to some</div><div class='add'>+HCD that performs the I/O for the device driver.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/linux/usb.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+USB Core APIs</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+There are two basic I/O models in the USB API. The most elemental one is</div><div class='add'>+asynchronous: drivers submit requests in the form of an URB, and the</div><div class='add'>+URB's completion callback handles the next step. All USB transfer types</div><div class='add'>+support that model, although there are special cases for control URBs</div><div class='add'>+(which always have setup and status stages, but may not have a data</div><div class='add'>+stage) and isochronous URBs (which allow large packets and include</div><div class='add'>+per-packet fault reports). Built on top of that is synchronous API</div><div class='add'>+support, where a driver calls a routine that allocates one or more URBs,</div><div class='add'>+submits them, and waits until they complete. There are synchronous</div><div class='add'>+wrappers for single-buffer control and bulk transfers (which are awkward</div><div class='add'>+to use in some driver disconnect scenarios), and for scatterlist based</div><div class='add'>+streaming i/o (bulk or interrupt).</div><div class='add'>+</div><div class='add'>+USB drivers need to provide buffers that can be used for DMA, although</div><div class='add'>+they don't necessarily need to provide the DMA mapping themselves. There</div><div class='add'>+are APIs to use used when allocating DMA buffers, which can prevent use</div><div class='add'>+of bounce buffers on some systems. In some cases, drivers may be able to</div><div class='add'>+rely on 64bit DMA to eliminate another kind of bounce buffer.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/usb/core/urb.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/usb/core/message.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/usb/core/file.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/usb/core/driver.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/usb/core/usb.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/usb/core/hub.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+Host Controller APIs</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+These APIs are only for use by host controller drivers, most of which</div><div class='add'>+implement standard register interfaces such as XHCI, EHCI, OHCI, or UHCI. UHCI</div><div class='add'>+was one of the first interfaces, designed by Intel and also used by VIA;</div><div class='add'>+it doesn't do much in hardware. OHCI was designed later, to have the</div><div class='add'>+hardware do more work (bigger transfers, tracking protocol state, and so</div><div class='add'>+on). EHCI was designed with USB 2.0; its design has features that</div><div class='add'>+resemble OHCI (hardware does much more work) as well as UHCI (some parts</div><div class='add'>+of ISO support, TD list processing). XHCI was designed with USB 3.0. It</div><div class='add'>+continues to shift support for functionality into hardware.</div><div class='add'>+</div><div class='add'>+There are host controllers other than the "big three", although most PCI</div><div class='add'>+based controllers (and a few non-PCI based ones) use one of those</div><div class='add'>+interfaces. Not all host controllers use DMA; some use PIO, and there is</div><div class='add'>+also a simulator and a virtual host controller to pipe USB over the network.</div><div class='add'>+</div><div class='add'>+The same basic APIs are available to drivers for all those controllers.</div><div class='add'>+For historical reasons they are in two layers: :c:type:`struct</div><div class='add'>+usb_bus &lt;usb_bus&gt;` is a rather thin layer that became available</div><div class='add'>+in the 2.2 kernels, while :c:type:`struct usb_hcd &lt;usb_hcd&gt;`</div><div class='add'>+is a more featureful layer</div><div class='add'>+that lets HCDs share common code, to shrink driver size and</div><div class='add'>+significantly reduce hcd-specific behaviors.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/usb/core/hcd.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/usb/core/hcd-pci.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/usb/core/buffer.c</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+The USB Filesystem (usbfs)</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+This chapter presents the Linux *usbfs*. You may prefer to avoid writing</div><div class='add'>+new kernel code for your USB driver; that's the problem that usbfs set</div><div class='add'>+out to solve. User mode device drivers are usually packaged as</div><div class='add'>+applications or libraries, and may use usbfs through some programming</div><div class='add'>+library that wraps it. Such libraries include</div><div class='add'>+`libusb &lt;http://libusb.sourceforge.net&gt;`__ for C/C++, and</div><div class='add'>+`jUSB &lt;http://jUSB.sourceforge.net&gt;`__ for Java.</div><div class='add'>+</div><div class='add'>+    **Note**</div><div class='add'>+</div><div class='add'>+    This particular documentation is incomplete, especially with respect</div><div class='add'>+    to the asynchronous mode. As of kernel 2.5.66 the code and this</div><div class='add'>+    (new) documentation need to be cross-reviewed.</div><div class='add'>+</div><div class='add'>+Configure usbfs into Linux kernels by enabling the *USB filesystem*</div><div class='add'>+option (CONFIG_USB_DEVICEFS), and you get basic support for user mode</div><div class='add'>+USB device drivers. Until relatively recently it was often (confusingly)</div><div class='add'>+called *usbdevfs* although it wasn't solving what *devfs* was. Every USB</div><div class='add'>+device will appear in usbfs, regardless of whether or not it has a</div><div class='add'>+kernel driver.</div><div class='add'>+</div><div class='add'>+What files are in "usbfs"?</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+Conventionally mounted at ``/proc/bus/usb``, usbfs features include:</div><div class='add'>+</div><div class='add'>+-  ``/proc/bus/usb/devices`` ... a text file showing each of the USB</div><div class='add'>+   devices on known to the kernel, and their configuration descriptors.</div><div class='add'>+   You can also poll() this to learn about new devices.</div><div class='add'>+</div><div class='add'>+-  ``/proc/bus/usb/BBB/DDD`` ... magic files exposing the each device's</div><div class='add'>+   configuration descriptors, and supporting a series of ioctls for</div><div class='add'>+   making device requests, including I/O to devices. (Purely for access</div><div class='add'>+   by programs.)</div><div class='add'>+</div><div class='add'>+Each bus is given a number (BBB) based on when it was enumerated; within</div><div class='add'>+each bus, each device is given a similar number (DDD). Those BBB/DDD</div><div class='add'>+paths are not "stable" identifiers; expect them to change even if you</div><div class='add'>+always leave the devices plugged in to the same hub port. *Don't even</div><div class='add'>+think of saving these in application configuration files.* Stable</div><div class='add'>+identifiers are available, for user mode applications that want to use</div><div class='add'>+them. HID and networking devices expose these stable IDs, so that for</div><div class='add'>+example you can be sure that you told the right UPS to power down its</div><div class='add'>+second server. "usbfs" doesn't (yet) expose those IDs.</div><div class='add'>+</div><div class='add'>+Mounting and Access Control</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+There are a number of mount options for usbfs, which will be of most</div><div class='add'>+interest to you if you need to override the default access control</div><div class='add'>+policy. That policy is that only root may read or write device files</div><div class='add'>+(``/proc/bus/BBB/DDD``) although anyone may read the ``devices`` or</div><div class='add'>+``drivers`` files. I/O requests to the device also need the</div><div class='add'>+CAP_SYS_RAWIO capability,</div><div class='add'>+</div><div class='add'>+The significance of that is that by default, all user mode device</div><div class='add'>+drivers need super-user privileges. You can change modes or ownership in</div><div class='add'>+a driver setup when the device hotplugs, or maye just start the driver</div><div class='add'>+right then, as a privileged server (or some activity within one). That's</div><div class='add'>+the most secure approach for multi-user systems, but for single user</div><div class='add'>+systems ("trusted" by that user) it's more convenient just to grant</div><div class='add'>+everyone all access (using the *devmode=0666* option) so the driver can</div><div class='add'>+start whenever it's needed.</div><div class='add'>+</div><div class='add'>+The mount options for usbfs, usable in /etc/fstab or in command line</div><div class='add'>+invocations of *mount*, are:</div><div class='add'>+</div><div class='add'>+*busgid*\ =NNNNN</div><div class='add'>+    Controls the GID used for the /proc/bus/usb/BBB directories.</div><div class='add'>+    (Default: 0)</div><div class='add'>+</div><div class='add'>+*busmode*\ =MMM</div><div class='add'>+    Controls the file mode used for the /proc/bus/usb/BBB directories.</div><div class='add'>+    (Default: 0555)</div><div class='add'>+</div><div class='add'>+*busuid*\ =NNNNN</div><div class='add'>+    Controls the UID used for the /proc/bus/usb/BBB directories.</div><div class='add'>+    (Default: 0)</div><div class='add'>+</div><div class='add'>+*devgid*\ =NNNNN</div><div class='add'>+    Controls the GID used for the /proc/bus/usb/BBB/DDD files. (Default:</div><div class='add'>+    0)</div><div class='add'>+</div><div class='add'>+*devmode*\ =MMM</div><div class='add'>+    Controls the file mode used for the /proc/bus/usb/BBB/DDD files.</div><div class='add'>+    (Default: 0644)</div><div class='add'>+</div><div class='add'>+*devuid*\ =NNNNN</div><div class='add'>+    Controls the UID used for the /proc/bus/usb/BBB/DDD files. (Default:</div><div class='add'>+    0)</div><div class='add'>+</div><div class='add'>+*listgid*\ =NNNNN</div><div class='add'>+    Controls the GID used for the /proc/bus/usb/devices and drivers</div><div class='add'>+    files. (Default: 0)</div><div class='add'>+</div><div class='add'>+*listmode*\ =MMM</div><div class='add'>+    Controls the file mode used for the /proc/bus/usb/devices and</div><div class='add'>+    drivers files. (Default: 0444)</div><div class='add'>+</div><div class='add'>+*listuid*\ =NNNNN</div><div class='add'>+    Controls the UID used for the /proc/bus/usb/devices and drivers</div><div class='add'>+    files. (Default: 0)</div><div class='add'>+</div><div class='add'>+Note that many Linux distributions hard-wire the mount options for usbfs</div><div class='add'>+in their init scripts, such as ``/etc/rc.d/rc.sysinit``, rather than</div><div class='add'>+making it easy to set this per-system policy in ``/etc/fstab``.</div><div class='add'>+</div><div class='add'>+/proc/bus/usb/devices</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+This file is handy for status viewing tools in user mode, which can scan</div><div class='add'>+the text format and ignore most of it. More detailed device status</div><div class='add'>+(including class and vendor status) is available from device-specific</div><div class='add'>+files. For information about the current format of this file, see the</div><div class='add'>+``Documentation/usb/proc_usb_info.txt`` file in your Linux kernel</div><div class='add'>+sources.</div><div class='add'>+</div><div class='add'>+This file, in combination with the poll() system call, can also be used</div><div class='add'>+to detect when devices are added or removed:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    int fd;</div><div class='add'>+    struct pollfd pfd;</div><div class='add'>+</div><div class='add'>+    fd = open("/proc/bus/usb/devices", O_RDONLY);</div><div class='add'>+    pfd = { fd, POLLIN, 0 };</div><div class='add'>+    for (;;) {</div><div class='add'>+        /* The first time through, this call will return immediately. */</div><div class='add'>+        poll(&amp;pfd, 1, -1);</div><div class='add'>+</div><div class='add'>+        /* To see what's changed, compare the file's previous and current</div><div class='add'>+           contents or scan the filesystem.  (Scanning is more precise.) */</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+Note that this behavior is intended to be used for informational and</div><div class='add'>+debug purposes. It would be more appropriate to use programs such as</div><div class='add'>+udev or HAL to initialize a device or start a user-mode helper program,</div><div class='add'>+for instance.</div><div class='add'>+</div><div class='add'>+/proc/bus/usb/BBB/DDD</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+Use these files in one of these basic ways:</div><div class='add'>+</div><div class='add'>+*They can be read,* producing first the device descriptor (18 bytes) and</div><div class='add'>+then the descriptors for the current configuration. See the USB 2.0 spec</div><div class='add'>+for details about those binary data formats. You'll need to convert most</div><div class='add'>+multibyte values from little endian format to your native host byte</div><div class='add'>+order, although a few of the fields in the device descriptor (both of</div><div class='add'>+the BCD-encoded fields, and the vendor and product IDs) will be</div><div class='add'>+byteswapped for you. Note that configuration descriptors include</div><div class='add'>+descriptors for interfaces, altsettings, endpoints, and maybe additional</div><div class='add'>+class descriptors.</div><div class='add'>+</div><div class='add'>+*Perform USB operations* using *ioctl()* requests to make endpoint I/O</div><div class='add'>+requests (synchronously or asynchronously) or manage the device. These</div><div class='add'>+requests need the CAP_SYS_RAWIO capability, as well as filesystem</div><div class='add'>+access permissions. Only one ioctl request can be made on one of these</div><div class='add'>+device files at a time. This means that if you are synchronously reading</div><div class='add'>+an endpoint from one thread, you won't be able to write to a different</div><div class='add'>+endpoint from another thread until the read completes. This works for</div><div class='add'>+*half duplex* protocols, but otherwise you'd use asynchronous i/o</div><div class='add'>+requests.</div><div class='add'>+</div><div class='add'>+Life Cycle of User Mode Drivers</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+Such a driver first needs to find a device file for a device it knows</div><div class='add'>+how to handle. Maybe it was told about it because a ``/sbin/hotplug``</div><div class='add'>+event handling agent chose that driver to handle the new device. Or</div><div class='add'>+maybe it's an application that scans all the /proc/bus/usb device files,</div><div class='add'>+and ignores most devices. In either case, it should :c:func:`read()`</div><div class='add'>+all the descriptors from the device file, and check them against what it</div><div class='add'>+knows how to handle. It might just reject everything except a particular</div><div class='add'>+vendor and product ID, or need a more complex policy.</div><div class='add'>+</div><div class='add'>+Never assume there will only be one such device on the system at a time!</div><div class='add'>+If your code can't handle more than one device at a time, at least</div><div class='add'>+detect when there's more than one, and have your users choose which</div><div class='add'>+device to use.</div><div class='add'>+</div><div class='add'>+Once your user mode driver knows what device to use, it interacts with</div><div class='add'>+it in either of two styles. The simple style is to make only control</div><div class='add'>+requests; some devices don't need more complex interactions than those.</div><div class='add'>+(An example might be software using vendor-specific control requests for</div><div class='add'>+some initialization or configuration tasks, with a kernel driver for the</div><div class='add'>+rest.)</div><div class='add'>+</div><div class='add'>+More likely, you need a more complex style driver: one using non-control</div><div class='add'>+endpoints, reading or writing data and claiming exclusive use of an</div><div class='add'>+interface. *Bulk* transfers are easiest to use, but only their sibling</div><div class='add'>+*interrupt* transfers work with low speed devices. Both interrupt and</div><div class='add'>+*isochronous* transfers offer service guarantees because their bandwidth</div><div class='add'>+is reserved. Such "periodic" transfers are awkward to use through usbfs,</div><div class='add'>+unless you're using the asynchronous calls. However, interrupt transfers</div><div class='add'>+can also be used in a synchronous "one shot" style.</div><div class='add'>+</div><div class='add'>+Your user-mode driver should never need to worry about cleaning up</div><div class='add'>+request state when the device is disconnected, although it should close</div><div class='add'>+its open file descriptors as soon as it starts seeing the ENODEV errors.</div><div class='add'>+</div><div class='add'>+The ioctl() Requests</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+To use these ioctls, you need to include the following headers in your</div><div class='add'>+userspace program:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    #include &lt;linux/usb.h&gt;</div><div class='add'>+    #include &lt;linux/usbdevice_fs.h&gt;</div><div class='add'>+    #include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+The standard USB device model requests, from "Chapter 9" of the USB 2.0</div><div class='add'>+specification, are automatically included from the ``&lt;linux/usb/ch9.h&gt;``</div><div class='add'>+header.</div><div class='add'>+</div><div class='add'>+Unless noted otherwise, the ioctl requests described here will update</div><div class='add'>+the modification time on the usbfs file to which they are applied</div><div class='add'>+(unless they fail). A return of zero indicates success; otherwise, a</div><div class='add'>+standard USB error code is returned. (These are documented in</div><div class='add'>+``Documentation/usb/error-codes.txt`` in your kernel sources.)</div><div class='add'>+</div><div class='add'>+Each of these files multiplexes access to several I/O streams, one per</div><div class='add'>+endpoint. Each device has one control endpoint (endpoint zero) which</div><div class='add'>+supports a limited RPC style RPC access. Devices are configured by</div><div class='add'>+hub_wq (in the kernel) setting a device-wide *configuration* that</div><div class='add'>+affects things like power consumption and basic functionality. The</div><div class='add'>+endpoints are part of USB *interfaces*, which may have *altsettings*</div><div class='add'>+affecting things like which endpoints are available. Many devices only</div><div class='add'>+have a single configuration and interface, so drivers for them will</div><div class='add'>+ignore configurations and altsettings.</div><div class='add'>+</div><div class='add'>+Management/Status Requests</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+A number of usbfs requests don't deal very directly with device I/O.</div><div class='add'>+They mostly relate to device management and status. These are all</div><div class='add'>+synchronous requests.</div><div class='add'>+</div><div class='add'>+USBDEVFS_CLAIMINTERFACE</div><div class='add'>+    This is used to force usbfs to claim a specific interface, which has</div><div class='add'>+    not previously been claimed by usbfs or any other kernel driver. The</div><div class='add'>+    ioctl parameter is an integer holding the number of the interface</div><div class='add'>+    (bInterfaceNumber from descriptor).</div><div class='add'>+</div><div class='add'>+    Note that if your driver doesn't claim an interface before trying to</div><div class='add'>+    use one of its endpoints, and no other driver has bound to it, then</div><div class='add'>+    the interface is automatically claimed by usbfs.</div><div class='add'>+</div><div class='add'>+    This claim will be released by a RELEASEINTERFACE ioctl, or by</div><div class='add'>+    closing the file descriptor. File modification time is not updated</div><div class='add'>+    by this request.</div><div class='add'>+</div><div class='add'>+USBDEVFS_CONNECTINFO</div><div class='add'>+    Says whether the device is lowspeed. The ioctl parameter points to a</div><div class='add'>+    structure like this:</div><div class='add'>+</div><div class='add'>+    ::</div><div class='add'>+</div><div class='add'>+        struct usbdevfs_connectinfo {</div><div class='add'>+                unsigned int   devnum;</div><div class='add'>+                unsigned char  slow;</div><div class='add'>+        };</div><div class='add'>+</div><div class='add'>+    File modification time is not updated by this request.</div><div class='add'>+</div><div class='add'>+    *You can't tell whether a "not slow" device is connected at high</div><div class='add'>+    speed (480 MBit/sec) or just full speed (12 MBit/sec).* You should</div><div class='add'>+    know the devnum value already, it's the DDD value of the device file</div><div class='add'>+    name.</div><div class='add'>+</div><div class='add'>+USBDEVFS_GETDRIVER</div><div class='add'>+    Returns the name of the kernel driver bound to a given interface (a</div><div class='add'>+    string). Parameter is a pointer to this structure, which is</div><div class='add'>+    modified:</div><div class='add'>+</div><div class='add'>+    ::</div><div class='add'>+</div><div class='add'>+        struct usbdevfs_getdriver {</div><div class='add'>+                unsigned int  interface;</div><div class='add'>+                char          driver[USBDEVFS_MAXDRIVERNAME + 1];</div><div class='add'>+        };</div><div class='add'>+</div><div class='add'>+    File modification time is not updated by this request.</div><div class='add'>+</div><div class='add'>+USBDEVFS_IOCTL</div><div class='add'>+    Passes a request from userspace through to a kernel driver that has</div><div class='add'>+    an ioctl entry in the *struct usb_driver* it registered.</div><div class='add'>+</div><div class='add'>+    ::</div><div class='add'>+</div><div class='add'>+        struct usbdevfs_ioctl {</div><div class='add'>+                int     ifno;</div><div class='add'>+                int     ioctl_code;</div><div class='add'>+                void    *data;</div><div class='add'>+        };</div><div class='add'>+</div><div class='add'>+        /* user mode call looks like this.</div><div class='add'>+         * 'request' becomes the driver-&gt;ioctl() 'code' parameter.</div><div class='add'>+         * the size of 'param' is encoded in 'request', and that data</div><div class='add'>+         * is copied to or from the driver-&gt;ioctl() 'buf' parameter.</div><div class='add'>+         */</div><div class='add'>+        static int</div><div class='add'>+        usbdev_ioctl (int fd, int ifno, unsigned request, void *param)</div><div class='add'>+        {</div><div class='add'>+                struct usbdevfs_ioctl   wrapper;</div><div class='add'>+</div><div class='add'>+                wrapper.ifno = ifno;</div><div class='add'>+                wrapper.ioctl_code = request;</div><div class='add'>+                wrapper.data = param;</div><div class='add'>+</div><div class='add'>+                return ioctl (fd, USBDEVFS_IOCTL, &amp;wrapper);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+    File modification time is not updated by this request.</div><div class='add'>+</div><div class='add'>+    This request lets kernel drivers talk to user mode code through</div><div class='add'>+    filesystem operations even when they don't create a character or</div><div class='add'>+    block special device. It's also been used to do things like ask</div><div class='add'>+    devices what device special file should be used. Two pre-defined</div><div class='add'>+    ioctls are used to disconnect and reconnect kernel drivers, so that</div><div class='add'>+    user mode code can completely manage binding and configuration of</div><div class='add'>+    devices.</div><div class='add'>+</div><div class='add'>+USBDEVFS_RELEASEINTERFACE</div><div class='add'>+    This is used to release the claim usbfs made on interface, either</div><div class='add'>+    implicitly or because of a USBDEVFS_CLAIMINTERFACE call, before the</div><div class='add'>+    file descriptor is closed. The ioctl parameter is an integer holding</div><div class='add'>+    the number of the interface (bInterfaceNumber from descriptor); File</div><div class='add'>+    modification time is not updated by this request.</div><div class='add'>+</div><div class='add'>+        **Warning**</div><div class='add'>+</div><div class='add'>+        *No security check is made to ensure that the task which made</div><div class='add'>+        the claim is the one which is releasing it. This means that user</div><div class='add'>+        mode driver may interfere other ones.*</div><div class='add'>+</div><div class='add'>+USBDEVFS_RESETEP</div><div class='add'>+    Resets the data toggle value for an endpoint (bulk or interrupt) to</div><div class='add'>+    DATA0. The ioctl parameter is an integer endpoint number (1 to 15,</div><div class='add'>+    as identified in the endpoint descriptor), with USB_DIR_IN added</div><div class='add'>+    if the device's endpoint sends data to the host.</div><div class='add'>+</div><div class='add'>+        **Warning**</div><div class='add'>+</div><div class='add'>+        *Avoid using this request. It should probably be removed.* Using</div><div class='add'>+        it typically means the device and driver will lose toggle</div><div class='add'>+        synchronization. If you really lost synchronization, you likely</div><div class='add'>+        need to completely handshake with the device, using a request</div><div class='add'>+        like CLEAR_HALT or SET_INTERFACE.</div><div class='add'>+</div><div class='add'>+USBDEVFS_DROP_PRIVILEGES</div><div class='add'>+    This is used to relinquish the ability to do certain operations</div><div class='add'>+    which are considered to be privileged on a usbfs file descriptor.</div><div class='add'>+    This includes claiming arbitrary interfaces, resetting a device on</div><div class='add'>+    which there are currently claimed interfaces from other users, and</div><div class='add'>+    issuing USBDEVFS_IOCTL calls. The ioctl parameter is a 32 bit mask</div><div class='add'>+    of interfaces the user is allowed to claim on this file descriptor.</div><div class='add'>+    You may issue this ioctl more than one time to narrow said mask.</div><div class='add'>+</div><div class='add'>+Synchronous I/O Support</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Synchronous requests involve the kernel blocking until the user mode</div><div class='add'>+request completes, either by finishing successfully or by reporting an</div><div class='add'>+error. In most cases this is the simplest way to use usbfs, although as</div><div class='add'>+noted above it does prevent performing I/O to more than one endpoint at</div><div class='add'>+a time.</div><div class='add'>+</div><div class='add'>+USBDEVFS_BULK</div><div class='add'>+    Issues a bulk read or write request to the device. The ioctl</div><div class='add'>+    parameter is a pointer to this structure:</div><div class='add'>+</div><div class='add'>+    ::</div><div class='add'>+</div><div class='add'>+        struct usbdevfs_bulktransfer {</div><div class='add'>+                unsigned int  ep;</div><div class='add'>+                unsigned int  len;</div><div class='add'>+                unsigned int  timeout; /* in milliseconds */</div><div class='add'>+                void          *data;</div><div class='add'>+        };</div><div class='add'>+</div><div class='add'>+    The "ep" value identifies a bulk endpoint number (1 to 15, as</div><div class='add'>+    identified in an endpoint descriptor), masked with USB_DIR_IN when</div><div class='add'>+    referring to an endpoint which sends data to the host from the</div><div class='add'>+    device. The length of the data buffer is identified by "len"; Recent</div><div class='add'>+    kernels support requests up to about 128KBytes. *FIXME say how read</div><div class='add'>+    length is returned, and how short reads are handled.*.</div><div class='add'>+</div><div class='add'>+USBDEVFS_CLEAR_HALT</div><div class='add'>+    Clears endpoint halt (stall) and resets the endpoint toggle. This is</div><div class='add'>+    only meaningful for bulk or interrupt endpoints. The ioctl parameter</div><div class='add'>+    is an integer endpoint number (1 to 15, as identified in an endpoint</div><div class='add'>+    descriptor), masked with USB_DIR_IN when referring to an endpoint</div><div class='add'>+    which sends data to the host from the device.</div><div class='add'>+</div><div class='add'>+    Use this on bulk or interrupt endpoints which have stalled,</div><div class='add'>+    returning *-EPIPE* status to a data transfer request. Do not issue</div><div class='add'>+    the control request directly, since that could invalidate the host's</div><div class='add'>+    record of the data toggle.</div><div class='add'>+</div><div class='add'>+USBDEVFS_CONTROL</div><div class='add'>+    Issues a control request to the device. The ioctl parameter points</div><div class='add'>+    to a structure like this:</div><div class='add'>+</div><div class='add'>+    ::</div><div class='add'>+</div><div class='add'>+        struct usbdevfs_ctrltransfer {</div><div class='add'>+                __u8   bRequestType;</div><div class='add'>+                __u8   bRequest;</div><div class='add'>+                __u16  wValue;</div><div class='add'>+                __u16  wIndex;</div><div class='add'>+                __u16  wLength;</div><div class='add'>+                __u32  timeout;  /* in milliseconds */</div><div class='add'>+                void   *data;</div><div class='add'>+        };</div><div class='add'>+</div><div class='add'>+    The first eight bytes of this structure are the contents of the</div><div class='add'>+    SETUP packet to be sent to the device; see the USB 2.0 specification</div><div class='add'>+    for details. The bRequestType value is composed by combining a</div><div class='add'>+    USB_TYPE_\* value, a USB_DIR_\* value, and a USB_RECIP_\*</div><div class='add'>+    value (from *&lt;linux/usb.h&gt;*). If wLength is nonzero, it describes</div><div class='add'>+    the length of the data buffer, which is either written to the device</div><div class='add'>+    (USB_DIR_OUT) or read from the device (USB_DIR_IN).</div><div class='add'>+</div><div class='add'>+    At this writing, you can't transfer more than 4 KBytes of data to or</div><div class='add'>+    from a device; usbfs has a limit, and some host controller drivers</div><div class='add'>+    have a limit. (That's not usually a problem.) *Also* there's no way</div><div class='add'>+    to say it's not OK to get a short read back from the device.</div><div class='add'>+</div><div class='add'>+USBDEVFS_RESET</div><div class='add'>+    Does a USB level device reset. The ioctl parameter is ignored. After</div><div class='add'>+    the reset, this rebinds all device interfaces. File modification</div><div class='add'>+    time is not updated by this request.</div><div class='add'>+</div><div class='add'>+        **Warning**</div><div class='add'>+</div><div class='add'>+        *Avoid using this call* until some usbcore bugs get fixed, since</div><div class='add'>+        it does not fully synchronize device, interface, and driver (not</div><div class='add'>+        just usbfs) state.</div><div class='add'>+</div><div class='add'>+USBDEVFS_SETINTERFACE</div><div class='add'>+    Sets the alternate setting for an interface. The ioctl parameter is</div><div class='add'>+    a pointer to a structure like this:</div><div class='add'>+</div><div class='add'>+    ::</div><div class='add'>+</div><div class='add'>+        struct usbdevfs_setinterface {</div><div class='add'>+                unsigned int  interface;</div><div class='add'>+                unsigned int  altsetting;</div><div class='add'>+        };</div><div class='add'>+</div><div class='add'>+    File modification time is not updated by this request.</div><div class='add'>+</div><div class='add'>+    Those struct members are from some interface descriptor applying to</div><div class='add'>+    the current configuration. The interface number is the</div><div class='add'>+    bInterfaceNumber value, and the altsetting number is the</div><div class='add'>+    bAlternateSetting value. (This resets each endpoint in the</div><div class='add'>+    interface.)</div><div class='add'>+</div><div class='add'>+USBDEVFS_SETCONFIGURATION</div><div class='add'>+    Issues the :c:func:`usb_set_configuration()` call for the</div><div class='add'>+    device. The parameter is an integer holding the number of a</div><div class='add'>+    configuration (bConfigurationValue from descriptor). File</div><div class='add'>+    modification time is not updated by this request.</div><div class='add'>+</div><div class='add'>+        **Warning**</div><div class='add'>+</div><div class='add'>+        *Avoid using this call* until some usbcore bugs get fixed, since</div><div class='add'>+        it does not fully synchronize device, interface, and driver (not</div><div class='add'>+        just usbfs) state.</div><div class='add'>+</div><div class='add'>+Asynchronous I/O Support</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+As mentioned above, there are situations where it may be important to</div><div class='add'>+initiate concurrent operations from user mode code. This is particularly</div><div class='add'>+important for periodic transfers (interrupt and isochronous), but it can</div><div class='add'>+be used for other kinds of USB requests too. In such cases, the</div><div class='add'>+asynchronous requests described here are essential. Rather than</div><div class='add'>+submitting one request and having the kernel block until it completes,</div><div class='add'>+the blocking is separate.</div><div class='add'>+</div><div class='add'>+These requests are packaged into a structure that resembles the URB used</div><div class='add'>+by kernel device drivers. (No POSIX Async I/O support here, sorry.) It</div><div class='add'>+identifies the endpoint type (USBDEVFS_URB_TYPE_\*), endpoint</div><div class='add'>+(number, masked with USB_DIR_IN as appropriate), buffer and length,</div><div class='add'>+and a user "context" value serving to uniquely identify each request.</div><div class='add'>+(It's usually a pointer to per-request data.) Flags can modify requests</div><div class='add'>+(not as many as supported for kernel drivers).</div><div class='add'>+</div><div class='add'>+Each request can specify a realtime signal number (between SIGRTMIN and</div><div class='add'>+SIGRTMAX, inclusive) to request a signal be sent when the request</div><div class='add'>+completes.</div><div class='add'>+</div><div class='add'>+When usbfs returns these urbs, the status value is updated, and the</div><div class='add'>+buffer may have been modified. Except for isochronous transfers, the</div><div class='add'>+actual_length is updated to say how many bytes were transferred; if the</div><div class='add'>+USBDEVFS_URB_DISABLE_SPD flag is set ("short packets are not OK"), if</div><div class='add'>+fewer bytes were read than were requested then you get an error report.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    struct usbdevfs_iso_packet_desc {</div><div class='add'>+            unsigned int                     length;</div><div class='add'>+            unsigned int                     actual_length;</div><div class='add'>+            unsigned int                     status;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    struct usbdevfs_urb {</div><div class='add'>+            unsigned char                    type;</div><div class='add'>+            unsigned char                    endpoint;</div><div class='add'>+            int                              status;</div><div class='add'>+            unsigned int                     flags;</div><div class='add'>+            void                             *buffer;</div><div class='add'>+            int                              buffer_length;</div><div class='add'>+            int                              actual_length;</div><div class='add'>+            int                              start_frame;</div><div class='add'>+            int                              number_of_packets;</div><div class='add'>+            int                              error_count;</div><div class='add'>+            unsigned int                     signr;</div><div class='add'>+            void                             *usercontext;</div><div class='add'>+            struct usbdevfs_iso_packet_desc  iso_frame_desc[];</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+For these asynchronous requests, the file modification time reflects</div><div class='add'>+when the request was initiated. This contrasts with their use with the</div><div class='add'>+synchronous requests, where it reflects when requests complete.</div><div class='add'>+</div><div class='add'>+USBDEVFS_DISCARDURB</div><div class='add'>+    *TBS* File modification time is not updated by this request.</div><div class='add'>+</div><div class='add'>+USBDEVFS_DISCSIGNAL</div><div class='add'>+    *TBS* File modification time is not updated by this request.</div><div class='add'>+</div><div class='add'>+USBDEVFS_REAPURB</div><div class='add'>+    *TBS* File modification time is not updated by this request.</div><div class='add'>+</div><div class='add'>+USBDEVFS_REAPURBNDELAY</div><div class='add'>+    *TBS* File modification time is not updated by this request.</div><div class='add'>+</div><div class='add'>+USBDEVFS_SUBMITURB</div><div class='add'>+    *TBS*</div><div class='head'>diff --git a/Documentation/driver-api/vme.rst b/Documentation/driver-api/vme.rst<br/>new file mode 100644<br/>index 000000000000..89776fb3c8bd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-api/vme.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-api/vme.rst</a></div><div class='hunk'>@@ -0,0 +1,474 @@</div><div class='add'>+VME Device Drivers</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+Driver registration</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+As with other subsystems within the Linux kernel, VME device drivers register</div><div class='add'>+with the VME subsystem, typically called from the devices init routine.  This is</div><div class='add'>+achieved via a call to the following function:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_register_driver (struct vme_driver *driver, unsigned int ndevs);</div><div class='add'>+</div><div class='add'>+If driver registration is successful this function returns zero, if an error</div><div class='add'>+occurred a negative error code will be returned.</div><div class='add'>+</div><div class='add'>+A pointer to a structure of type 'vme_driver' must be provided to the</div><div class='add'>+registration function. Along with ndevs, which is the number of devices your</div><div class='add'>+driver is able to support. The structure is as follows:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	struct vme_driver {</div><div class='add'>+		struct list_head node;</div><div class='add'>+		const char *name;</div><div class='add'>+		int (*match)(struct vme_dev *);</div><div class='add'>+		int (*probe)(struct vme_dev *);</div><div class='add'>+		int (*remove)(struct vme_dev *);</div><div class='add'>+		void (*shutdown)(void);</div><div class='add'>+		struct device_driver driver;</div><div class='add'>+		struct list_head devices;</div><div class='add'>+		unsigned int ndev;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+At the minimum, the '.name', '.match' and '.probe' elements of this structure</div><div class='add'>+should be correctly set. The '.name' element is a pointer to a string holding</div><div class='add'>+the device driver's name.</div><div class='add'>+</div><div class='add'>+The '.match' function allows control over which VME devices should be registered</div><div class='add'>+with the driver. The match function should return 1 if a device should be</div><div class='add'>+probed and 0 otherwise. This example match function (from vme_user.c) limits</div><div class='add'>+the number of devices probed to one:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define USER_BUS_MAX	1</div><div class='add'>+	...</div><div class='add'>+	static int vme_user_match(struct vme_dev *vdev)</div><div class='add'>+	{</div><div class='add'>+		if (vdev-&gt;id.num &gt;= USER_BUS_MAX)</div><div class='add'>+			return 0;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+The '.probe' element should contain a pointer to the probe routine. The</div><div class='add'>+probe routine is passed a 'struct vme_dev' pointer as an argument. The</div><div class='add'>+'struct vme_dev' structure looks like the following:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	struct vme_dev {</div><div class='add'>+		int num;</div><div class='add'>+		struct vme_bridge *bridge;</div><div class='add'>+		struct device dev;</div><div class='add'>+		struct list_head drv_list;</div><div class='add'>+		struct list_head bridge_list;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Here, the 'num' field refers to the sequential device ID for this specific</div><div class='add'>+driver. The bridge number (or bus number) can be accessed using</div><div class='add'>+dev-&gt;bridge-&gt;num.</div><div class='add'>+</div><div class='add'>+A function is also provided to unregister the driver from the VME core and is</div><div class='add'>+usually called from the device driver's exit routine:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	void vme_unregister_driver (struct vme_driver *driver);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Resource management</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Once a driver has registered with the VME core the provided match routine will</div><div class='add'>+be called the number of times specified during the registration. If a match</div><div class='add'>+succeeds, a non-zero value should be returned. A zero return value indicates</div><div class='add'>+failure. For all successful matches, the probe routine of the corresponding</div><div class='add'>+driver is called. The probe routine is passed a pointer to the devices</div><div class='add'>+device structure. This pointer should be saved, it will be required for</div><div class='add'>+requesting VME resources.</div><div class='add'>+</div><div class='add'>+The driver can request ownership of one or more master windows, slave windows</div><div class='add'>+and/or dma channels. Rather than allowing the device driver to request a</div><div class='add'>+specific window or DMA channel (which may be used by a different driver) this</div><div class='add'>+driver allows a resource to be assigned based on the required attributes of the</div><div class='add'>+driver in question:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	struct vme_resource * vme_master_request(struct vme_dev *dev,</div><div class='add'>+		u32 aspace, u32 cycle, u32 width);</div><div class='add'>+</div><div class='add'>+	struct vme_resource * vme_slave_request(struct vme_dev *dev, u32 aspace,</div><div class='add'>+		u32 cycle);</div><div class='add'>+</div><div class='add'>+	struct vme_resource *vme_dma_request(struct vme_dev *dev, u32 route);</div><div class='add'>+</div><div class='add'>+For slave windows these attributes are split into the VME address spaces that</div><div class='add'>+need to be accessed in 'aspace' and VME bus cycle types required in 'cycle'.</div><div class='add'>+Master windows add a further set of attributes in 'width' specifying the</div><div class='add'>+required data transfer widths. These attributes are defined as bitmasks and as</div><div class='add'>+such any combination of the attributes can be requested for a single window,</div><div class='add'>+the core will assign a window that meets the requirements, returning a pointer</div><div class='add'>+of type vme_resource that should be used to identify the allocated resource</div><div class='add'>+when it is used. For DMA controllers, the request function requires the</div><div class='add'>+potential direction of any transfers to be provided in the route attributes.</div><div class='add'>+This is typically VME-to-MEM and/or MEM-to-VME, though some hardware can</div><div class='add'>+support VME-to-VME and MEM-to-MEM transfers as well as test pattern generation.</div><div class='add'>+If an unallocated window fitting the requirements can not be found a NULL</div><div class='add'>+pointer will be returned.</div><div class='add'>+</div><div class='add'>+Functions are also provided to free window allocations once they are no longer</div><div class='add'>+required. These functions should be passed the pointer to the resource provided</div><div class='add'>+during resource allocation:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	void vme_master_free(struct vme_resource *res);</div><div class='add'>+</div><div class='add'>+	void vme_slave_free(struct vme_resource *res);</div><div class='add'>+</div><div class='add'>+	void vme_dma_free(struct vme_resource *res);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Master windows</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Master windows provide access from the local processor[s] out onto the VME bus.</div><div class='add'>+The number of windows available and the available access modes is dependent on</div><div class='add'>+the underlying chipset. A window must be configured before it can be used.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Master window configuration</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Once a master window has been assigned the following functions can be used to</div><div class='add'>+configure it and retrieve the current settings:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_master_set (struct vme_resource *res, int enabled,</div><div class='add'>+		unsigned long long base, unsigned long long size, u32 aspace,</div><div class='add'>+		u32 cycle, u32 width);</div><div class='add'>+</div><div class='add'>+	int vme_master_get (struct vme_resource *res, int *enabled,</div><div class='add'>+		unsigned long long *base, unsigned long long *size, u32 *aspace,</div><div class='add'>+		u32 *cycle, u32 *width);</div><div class='add'>+</div><div class='add'>+The address spaces, transfer widths and cycle types are the same as described</div><div class='add'>+under resource management, however some of the options are mutually exclusive.</div><div class='add'>+For example, only one address space may be specified.</div><div class='add'>+</div><div class='add'>+These functions return 0 on success or an error code should the call fail.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Master window access</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The following functions can be used to read from and write to configured master</div><div class='add'>+windows. These functions return the number of bytes copied:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	ssize_t vme_master_read(struct vme_resource *res, void *buf,</div><div class='add'>+		size_t count, loff_t offset);</div><div class='add'>+</div><div class='add'>+	ssize_t vme_master_write(struct vme_resource *res, void *buf,</div><div class='add'>+		size_t count, loff_t offset);</div><div class='add'>+</div><div class='add'>+In addition to simple reads and writes, a function is provided to do a</div><div class='add'>+read-modify-write transaction. This function returns the original value of the</div><div class='add'>+VME bus location :</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	unsigned int vme_master_rmw (struct vme_resource *res,</div><div class='add'>+		unsigned int mask, unsigned int compare, unsigned int swap,</div><div class='add'>+		loff_t offset);</div><div class='add'>+</div><div class='add'>+This functions by reading the offset, applying the mask. If the bits selected in</div><div class='add'>+the mask match with the values of the corresponding bits in the compare field,</div><div class='add'>+the value of swap is written the specified offset.</div><div class='add'>+</div><div class='add'>+Parts of a VME window can be mapped into user space memory using the following</div><div class='add'>+function:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_master_mmap(struct vme_resource *resource,</div><div class='add'>+		struct vm_area_struct *vma)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Slave windows</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+Slave windows provide devices on the VME bus access into mapped portions of the</div><div class='add'>+local memory. The number of windows available and the access modes that can be</div><div class='add'>+used is dependent on the underlying chipset. A window must be configured before</div><div class='add'>+it can be used.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Slave window configuration</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Once a slave window has been assigned the following functions can be used to</div><div class='add'>+configure it and retrieve the current settings:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_slave_set (struct vme_resource *res, int enabled,</div><div class='add'>+		unsigned long long base, unsigned long long size,</div><div class='add'>+		dma_addr_t mem, u32 aspace, u32 cycle);</div><div class='add'>+</div><div class='add'>+	int vme_slave_get (struct vme_resource *res, int *enabled,</div><div class='add'>+		unsigned long long *base, unsigned long long *size,</div><div class='add'>+		dma_addr_t *mem, u32 *aspace, u32 *cycle);</div><div class='add'>+</div><div class='add'>+The address spaces, transfer widths and cycle types are the same as described</div><div class='add'>+under resource management, however some of the options are mutually exclusive.</div><div class='add'>+For example, only one address space may be specified.</div><div class='add'>+</div><div class='add'>+These functions return 0 on success or an error code should the call fail.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Slave window buffer allocation</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Functions are provided to allow the user to allocate and free a contiguous</div><div class='add'>+buffers which will be accessible by the VME bridge. These functions do not have</div><div class='add'>+to be used, other methods can be used to allocate a buffer, though care must be</div><div class='add'>+taken to ensure that they are contiguous and accessible by the VME bridge:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	void * vme_alloc_consistent(struct vme_resource *res, size_t size,</div><div class='add'>+		dma_addr_t *mem);</div><div class='add'>+</div><div class='add'>+	void vme_free_consistent(struct vme_resource *res, size_t size,</div><div class='add'>+		void *virt,	dma_addr_t mem);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Slave window access</div><div class='add'>+~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Slave windows map local memory onto the VME bus, the standard methods for</div><div class='add'>+accessing memory should be used.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DMA channels</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+The VME DMA transfer provides the ability to run link-list DMA transfers. The</div><div class='add'>+API introduces the concept of DMA lists. Each DMA list is a link-list which can</div><div class='add'>+be passed to a DMA controller. Multiple lists can be created, extended,</div><div class='add'>+executed, reused and destroyed.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+List Management</div><div class='add'>+~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The following functions are provided to create and destroy DMA lists. Execution</div><div class='add'>+of a list will not automatically destroy the list, thus enabling a list to be</div><div class='add'>+reused for repetitive tasks:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	struct vme_dma_list *vme_new_dma_list(struct vme_resource *res);</div><div class='add'>+</div><div class='add'>+	int vme_dma_list_free(struct vme_dma_list *list);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+List Population</div><div class='add'>+~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+An item can be added to a list using the following function ( the source and</div><div class='add'>+destination attributes need to be created before calling this function, this is</div><div class='add'>+covered under "Transfer Attributes"):</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_dma_list_add(struct vme_dma_list *list,</div><div class='add'>+		struct vme_dma_attr *src, struct vme_dma_attr *dest,</div><div class='add'>+		size_t count);</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+	The detailed attributes of the transfers source and destination</div><div class='add'>+	are not checked until an entry is added to a DMA list, the request</div><div class='add'>+	for a DMA channel purely checks the directions in which the</div><div class='add'>+	controller is expected to transfer data. As a result it is</div><div class='add'>+	possible for this call to return an error, for example if the</div><div class='add'>+	source or destination is in an unsupported VME address space.</div><div class='add'>+</div><div class='add'>+Transfer Attributes</div><div class='add'>+~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The attributes for the source and destination are handled separately from adding</div><div class='add'>+an item to a list. This is due to the diverse attributes required for each type</div><div class='add'>+of source and destination. There are functions to create attributes for PCI, VME</div><div class='add'>+and pattern sources and destinations (where appropriate):</div><div class='add'>+</div><div class='add'>+Pattern source:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	struct vme_dma_attr *vme_dma_pattern_attribute(u32 pattern, u32 type);</div><div class='add'>+</div><div class='add'>+PCI source or destination:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	struct vme_dma_attr *vme_dma_pci_attribute(dma_addr_t mem);</div><div class='add'>+</div><div class='add'>+VME source or destination:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long base,</div><div class='add'>+		u32 aspace, u32 cycle, u32 width);</div><div class='add'>+</div><div class='add'>+The following function should be used to free an attribute:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	void vme_dma_free_attribute(struct vme_dma_attr *attr);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+List Execution</div><div class='add'>+~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The following function queues a list for execution. The function will return</div><div class='add'>+once the list has been executed:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_dma_list_exec(struct vme_dma_list *list);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Interrupts</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+The VME API provides functions to attach and detach callbacks to specific VME</div><div class='add'>+level and status ID combinations and for the generation of VME interrupts with</div><div class='add'>+specific VME level and status IDs.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Attaching Interrupt Handlers</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The following functions can be used to attach and free a specific VME level and</div><div class='add'>+status ID combination. Any given combination can only be assigned a single</div><div class='add'>+callback function. A void pointer parameter is provided, the value of which is</div><div class='add'>+passed to the callback function, the use of this pointer is user undefined:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_irq_request(struct vme_dev *dev, int level, int statid,</div><div class='add'>+		void (*callback)(int, int, void *), void *priv);</div><div class='add'>+</div><div class='add'>+	void vme_irq_free(struct vme_dev *dev, int level, int statid);</div><div class='add'>+</div><div class='add'>+The callback parameters are as follows. Care must be taken in writing a callback</div><div class='add'>+function, callback functions run in interrupt context:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	void callback(int level, int statid, void *priv);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Interrupt Generation</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The following function can be used to generate a VME interrupt at a given VME</div><div class='add'>+level and VME status ID:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_irq_generate(struct vme_dev *dev, int level, int statid);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Location monitors</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+The VME API provides the following functionality to configure the location</div><div class='add'>+monitor.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Location Monitor Management</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The following functions are provided to request the use of a block of location</div><div class='add'>+monitors and to free them after they are no longer required:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	struct vme_resource * vme_lm_request(struct vme_dev *dev);</div><div class='add'>+</div><div class='add'>+	void vme_lm_free(struct vme_resource * res);</div><div class='add'>+</div><div class='add'>+Each block may provide a number of location monitors, monitoring adjacent</div><div class='add'>+locations. The following function can be used to determine how many locations</div><div class='add'>+are provided:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_lm_count(struct vme_resource * res);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Location Monitor Configuration</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Once a bank of location monitors has been allocated, the following functions</div><div class='add'>+are provided to configure the location and mode of the location monitor:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_lm_set(struct vme_resource *res, unsigned long long base,</div><div class='add'>+		u32 aspace, u32 cycle);</div><div class='add'>+</div><div class='add'>+	int vme_lm_get(struct vme_resource *res, unsigned long long *base,</div><div class='add'>+		u32 *aspace, u32 *cycle);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Location Monitor Use</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The following functions allow a callback to be attached and detached from each</div><div class='add'>+location monitor location. Each location monitor can monitor a number of</div><div class='add'>+adjacent locations:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_lm_attach(struct vme_resource *res, int num,</div><div class='add'>+		void (*callback)(void *));</div><div class='add'>+</div><div class='add'>+	int vme_lm_detach(struct vme_resource *res, int num);</div><div class='add'>+</div><div class='add'>+The callback function is declared as follows.</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	void callback(void *data);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Slot Detection</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+This function returns the slot ID of the provided bridge.</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_slot_num(struct vme_dev *dev);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Bus Detection</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+This function returns the bus ID of the provided bridge.</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int vme_bus_num(struct vme_dev *dev);</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt<br/>index 167070895498..bf34d5b3a733 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/driver-model/devres.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/driver-model/devres.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/driver-model/devres.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/driver-model/devres.txt</a></div><div class='hunk'>@@ -306,6 +306,11 @@ IRQ</div><div class='ctx'>   devm_request_any_context_irq()</div><div class='ctx'>   devm_request_irq()</div><div class='ctx'>   devm_request_threaded_irq()</div><div class='add'>+  devm_irq_alloc_descs()</div><div class='add'>+  devm_irq_alloc_desc()</div><div class='add'>+  devm_irq_alloc_desc_at()</div><div class='add'>+  devm_irq_alloc_desc_from()</div><div class='add'>+  devm_irq_alloc_descs_from()</div><div class='ctx'> </div><div class='ctx'> LED</div><div class='ctx'>   devm_led_classdev_register()</div><div class='hunk'>@@ -332,6 +337,10 @@ MEM</div><div class='ctx'> MFD</div><div class='ctx'>  devm_mfd_add_devices()</div><div class='ctx'> </div><div class='add'>+PER-CPU MEM</div><div class='add'>+  devm_alloc_percpu()</div><div class='add'>+  devm_free_percpu()</div><div class='add'>+</div><div class='ctx'> PCI</div><div class='ctx'>   pcim_enable_device()	: after success, all PCI ops become managed</div><div class='ctx'>   pcim_pin_device()	: keep PCI device enabled after release</div><div class='head'>diff --git a/Documentation/dynamic-debug-howto.txt b/Documentation/dynamic-debug-howto.txt<br/>deleted file mode 100644<br/>index 9417871b8758..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/dynamic-debug-howto.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/dynamic-debug-howto.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,340 +0,0 @@</div><div class='del'>-</div><div class='del'>-Introduction</div><div class='del'>-============</div><div class='del'>-</div><div class='del'>-This document describes how to use the dynamic debug (dyndbg) feature.</div><div class='del'>-</div><div class='del'>-Dynamic debug is designed to allow you to dynamically enable/disable</div><div class='del'>-kernel code to obtain additional kernel information.  Currently, if</div><div class='del'>-CONFIG_DYNAMIC_DEBUG is set, then all pr_debug()/dev_dbg() and</div><div class='del'>-print_hex_dump_debug()/print_hex_dump_bytes() calls can be dynamically</div><div class='del'>-enabled per-callsite.</div><div class='del'>-</div><div class='del'>-If CONFIG_DYNAMIC_DEBUG is not set, print_hex_dump_debug() is just</div><div class='del'>-shortcut for print_hex_dump(KERN_DEBUG).</div><div class='del'>-</div><div class='del'>-For print_hex_dump_debug()/print_hex_dump_bytes(), format string is</div><div class='del'>-its 'prefix_str' argument, if it is constant string; or "hexdump"</div><div class='del'>-in case 'prefix_str' is build dynamically.</div><div class='del'>-</div><div class='del'>-Dynamic debug has even more useful features:</div><div class='del'>-</div><div class='del'>- * Simple query language allows turning on and off debugging</div><div class='del'>-   statements by matching any combination of 0 or 1 of:</div><div class='del'>-</div><div class='del'>-   - source filename</div><div class='del'>-   - function name</div><div class='del'>-   - line number (including ranges of line numbers)</div><div class='del'>-   - module name</div><div class='del'>-   - format string</div><div class='del'>-</div><div class='del'>- * Provides a debugfs control file: &lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-   which can be read to display the complete list of known debug</div><div class='del'>-   statements, to help guide you</div><div class='del'>-</div><div class='del'>-Controlling dynamic debug Behaviour</div><div class='del'>-===================================</div><div class='del'>-</div><div class='del'>-The behaviour of pr_debug()/dev_dbg()s are controlled via writing to a</div><div class='del'>-control file in the 'debugfs' filesystem. Thus, you must first mount</div><div class='del'>-the debugfs filesystem, in order to make use of this feature.</div><div class='del'>-Subsequently, we refer to the control file as:</div><div class='del'>-&lt;debugfs&gt;/dynamic_debug/control. For example, if you want to enable</div><div class='del'>-printing from source file 'svcsock.c', line 1603 you simply do:</div><div class='del'>-</div><div class='del'>-nullarbor:~ # echo 'file svcsock.c line 1603 +p' &gt;</div><div class='del'>-				&lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-If you make a mistake with the syntax, the write will fail thus:</div><div class='del'>-</div><div class='del'>-nullarbor:~ # echo 'file svcsock.c wtf 1 +p' &gt;</div><div class='del'>-				&lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>--bash: echo: write error: Invalid argument</div><div class='del'>-</div><div class='del'>-Viewing Dynamic Debug Behaviour</div><div class='del'>-===========================</div><div class='del'>-</div><div class='del'>-You can view the currently configured behaviour of all the debug</div><div class='del'>-statements via:</div><div class='del'>-</div><div class='del'>-nullarbor:~ # cat &lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-# filename:lineno [module]function flags format</div><div class='del'>-/usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:323 [svcxprt_rdma]svc_rdma_cleanup =_ "SVCRDMA Module Removed, deregister RPC RDMA transport\012"</div><div class='del'>-/usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:341 [svcxprt_rdma]svc_rdma_init =_ "\011max_inline       : %d\012"</div><div class='del'>-/usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:340 [svcxprt_rdma]svc_rdma_init =_ "\011sq_depth         : %d\012"</div><div class='del'>-/usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:338 [svcxprt_rdma]svc_rdma_init =_ "\011max_requests     : %d\012"</div><div class='del'>-...</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-You can also apply standard Unix text manipulation filters to this</div><div class='del'>-data, e.g.</div><div class='del'>-</div><div class='del'>-nullarbor:~ # grep -i rdma &lt;debugfs&gt;/dynamic_debug/control  | wc -l</div><div class='del'>-62</div><div class='del'>-</div><div class='del'>-nullarbor:~ # grep -i tcp &lt;debugfs&gt;/dynamic_debug/control | wc -l</div><div class='del'>-42</div><div class='del'>-</div><div class='del'>-The third column shows the currently enabled flags for each debug</div><div class='del'>-statement callsite (see below for definitions of the flags).  The</div><div class='del'>-default value, with no flags enabled, is "=_".  So you can view all</div><div class='del'>-the debug statement callsites with any non-default flags:</div><div class='del'>-</div><div class='del'>-nullarbor:~ # awk '$3 != "=_"' &lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-# filename:lineno [module]function flags format</div><div class='del'>-/usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svcsock.c:1603 [sunrpc]svc_send p "svc_process: st_sendto returned %d\012"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Command Language Reference</div><div class='del'>-==========================</div><div class='del'>-</div><div class='del'>-At the lexical level, a command comprises a sequence of words separated</div><div class='del'>-by spaces or tabs.  So these are all equivalent:</div><div class='del'>-</div><div class='del'>-nullarbor:~ # echo -c 'file svcsock.c line 1603 +p' &gt;</div><div class='del'>-				&lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-nullarbor:~ # echo -c '  file   svcsock.c     line  1603 +p  ' &gt;</div><div class='del'>-				&lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-nullarbor:~ # echo -n 'file svcsock.c line 1603 +p' &gt;</div><div class='del'>-				&lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-Command submissions are bounded by a write() system call.</div><div class='del'>-Multiple commands can be written together, separated by ';' or '\n'.</div><div class='del'>-</div><div class='del'>-  ~# echo "func pnpacpi_get_resources +p; func pnp_assign_mem +p" \</div><div class='del'>-     &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-If your query set is big, you can batch them too:</div><div class='del'>-</div><div class='del'>-  ~# cat query-batch-file &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-A another way is to use wildcard. The match rule support '*' (matches</div><div class='del'>-zero or more characters) and '?' (matches exactly one character).For</div><div class='del'>-example, you can match all usb drivers:</div><div class='del'>-</div><div class='del'>-  ~# echo "file drivers/usb/* +p" &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-At the syntactical level, a command comprises a sequence of match</div><div class='del'>-specifications, followed by a flags change specification.</div><div class='del'>-</div><div class='del'>-command ::= match-spec* flags-spec</div><div class='del'>-</div><div class='del'>-The match-spec's are used to choose a subset of the known pr_debug()</div><div class='del'>-callsites to which to apply the flags-spec.  Think of them as a query</div><div class='del'>-with implicit ANDs between each pair.  Note that an empty list of</div><div class='del'>-match-specs will select all debug statement callsites.</div><div class='del'>-</div><div class='del'>-A match specification comprises a keyword, which controls the</div><div class='del'>-attribute of the callsite to be compared, and a value to compare</div><div class='del'>-against.  Possible keywords are:</div><div class='del'>-</div><div class='del'>-match-spec ::= 'func' string |</div><div class='del'>-	       'file' string |</div><div class='del'>-	       'module' string |</div><div class='del'>-	       'format' string |</div><div class='del'>-	       'line' line-range</div><div class='del'>-</div><div class='del'>-line-range ::= lineno |</div><div class='del'>-	       '-'lineno |</div><div class='del'>-	       lineno'-' |</div><div class='del'>-	       lineno'-'lineno</div><div class='del'>-// Note: line-range cannot contain space, e.g.</div><div class='del'>-// "1-30" is valid range but "1 - 30" is not.</div><div class='del'>-</div><div class='del'>-lineno ::= unsigned-int</div><div class='del'>-</div><div class='del'>-The meanings of each keyword are:</div><div class='del'>-</div><div class='del'>-func</div><div class='del'>-    The given string is compared against the function name</div><div class='del'>-    of each callsite.  Example:</div><div class='del'>-</div><div class='del'>-    func svc_tcp_accept</div><div class='del'>-</div><div class='del'>-file</div><div class='del'>-    The given string is compared against either the full pathname, the</div><div class='del'>-    src-root relative pathname, or the basename of the source file of</div><div class='del'>-    each callsite.  Examples:</div><div class='del'>-</div><div class='del'>-    file svcsock.c</div><div class='del'>-    file kernel/freezer.c</div><div class='del'>-    file /usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svcsock.c</div><div class='del'>-</div><div class='del'>-module</div><div class='del'>-    The given string is compared against the module name</div><div class='del'>-    of each callsite.  The module name is the string as</div><div class='del'>-    seen in "lsmod", i.e. without the directory or the .ko</div><div class='del'>-    suffix and with '-' changed to '_'.  Examples:</div><div class='del'>-</div><div class='del'>-    module sunrpc</div><div class='del'>-    module nfsd</div><div class='del'>-</div><div class='del'>-format</div><div class='del'>-    The given string is searched for in the dynamic debug format</div><div class='del'>-    string.  Note that the string does not need to match the</div><div class='del'>-    entire format, only some part.  Whitespace and other</div><div class='del'>-    special characters can be escaped using C octal character</div><div class='del'>-    escape \ooo notation, e.g. the space character is \040.</div><div class='del'>-    Alternatively, the string can be enclosed in double quote</div><div class='del'>-    characters (") or single quote characters (').</div><div class='del'>-    Examples:</div><div class='del'>-</div><div class='del'>-    format svcrdma:	    // many of the NFS/RDMA server pr_debugs</div><div class='del'>-    format readahead	    // some pr_debugs in the readahead cache</div><div class='del'>-    format nfsd:\040SETATTR // one way to match a format with whitespace</div><div class='del'>-    format "nfsd: SETATTR"  // a neater way to match a format with whitespace</div><div class='del'>-    format 'nfsd: SETATTR'  // yet another way to match a format with whitespace</div><div class='del'>-</div><div class='del'>-line</div><div class='del'>-    The given line number or range of line numbers is compared</div><div class='del'>-    against the line number of each pr_debug() callsite.  A single</div><div class='del'>-    line number matches the callsite line number exactly.  A</div><div class='del'>-    range of line numbers matches any callsite between the first</div><div class='del'>-    and last line number inclusive.  An empty first number means</div><div class='del'>-    the first line in the file, an empty line number means the</div><div class='del'>-    last number in the file.  Examples:</div><div class='del'>-</div><div class='del'>-    line 1603	    // exactly line 1603</div><div class='del'>-    line 1600-1605  // the six lines from line 1600 to line 1605</div><div class='del'>-    line -1605	    // the 1605 lines from line 1 to line 1605</div><div class='del'>-    line 1600-	    // all lines from line 1600 to the end of the file</div><div class='del'>-</div><div class='del'>-The flags specification comprises a change operation followed</div><div class='del'>-by one or more flag characters.  The change operation is one</div><div class='del'>-of the characters:</div><div class='del'>-</div><div class='del'>-  -    remove the given flags</div><div class='del'>-  +    add the given flags</div><div class='del'>-  =    set the flags to the given flags</div><div class='del'>-</div><div class='del'>-The flags are:</div><div class='del'>-</div><div class='del'>-  p    enables the pr_debug() callsite.</div><div class='del'>-  f    Include the function name in the printed message</div><div class='del'>-  l    Include line number in the printed message</div><div class='del'>-  m    Include module name in the printed message</div><div class='del'>-  t    Include thread ID in messages not generated from interrupt context</div><div class='del'>-  _    No flags are set. (Or'd with others on input)</div><div class='del'>-</div><div class='del'>-For print_hex_dump_debug() and print_hex_dump_bytes(), only 'p' flag</div><div class='del'>-have meaning, other flags ignored.</div><div class='del'>-</div><div class='del'>-For display, the flags are preceded by '='</div><div class='del'>-(mnemonic: what the flags are currently equal to).</div><div class='del'>-</div><div class='del'>-Note the regexp ^[-+=][flmpt_]+$ matches a flags specification.</div><div class='del'>-To clear all flags at once, use "=_" or "-flmpt".</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Debug messages during Boot Process</div><div class='del'>-==================================</div><div class='del'>-</div><div class='del'>-To activate debug messages for core code and built-in modules during</div><div class='del'>-the boot process, even before userspace and debugfs exists, use</div><div class='del'>-dyndbg="QUERY", module.dyndbg="QUERY", or ddebug_query="QUERY"</div><div class='del'>-(ddebug_query is obsoleted by dyndbg, and deprecated).  QUERY follows</div><div class='del'>-the syntax described above, but must not exceed 1023 characters.  Your</div><div class='del'>-bootloader may impose lower limits.</div><div class='del'>-</div><div class='del'>-These dyndbg params are processed just after the ddebug tables are</div><div class='del'>-processed, as part of the arch_initcall.  Thus you can enable debug</div><div class='del'>-messages in all code run after this arch_initcall via this boot</div><div class='del'>-parameter.</div><div class='del'>-</div><div class='del'>-On an x86 system for example ACPI enablement is a subsys_initcall and</div><div class='del'>-   dyndbg="file ec.c +p"</div><div class='del'>-will show early Embedded Controller transactions during ACPI setup if</div><div class='del'>-your machine (typically a laptop) has an Embedded Controller.</div><div class='del'>-PCI (or other devices) initialization also is a hot candidate for using</div><div class='del'>-this boot parameter for debugging purposes.</div><div class='del'>-</div><div class='del'>-If foo module is not built-in, foo.dyndbg will still be processed at</div><div class='del'>-boot time, without effect, but will be reprocessed when module is</div><div class='del'>-loaded later.  dyndbg_query= and bare dyndbg= are only processed at</div><div class='del'>-boot.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Debug Messages at Module Initialization Time</div><div class='del'>-============================================</div><div class='del'>-</div><div class='del'>-When "modprobe foo" is called, modprobe scans /proc/cmdline for</div><div class='del'>-foo.params, strips "foo.", and passes them to the kernel along with</div><div class='del'>-params given in modprobe args or /etc/modprob.d/*.conf files,</div><div class='del'>-in the following order:</div><div class='del'>-</div><div class='del'>-1. # parameters given via /etc/modprobe.d/*.conf</div><div class='del'>-   options foo dyndbg=+pt</div><div class='del'>-   options foo dyndbg # defaults to +p</div><div class='del'>-</div><div class='del'>-2. # foo.dyndbg as given in boot args, "foo." is stripped and passed</div><div class='del'>-   foo.dyndbg=" func bar +p; func buz +mp"</div><div class='del'>-</div><div class='del'>-3. # args to modprobe</div><div class='del'>-   modprobe foo dyndbg==pmf # override previous settings</div><div class='del'>-</div><div class='del'>-These dyndbg queries are applied in order, with last having final say.</div><div class='del'>-This allows boot args to override or modify those from /etc/modprobe.d</div><div class='del'>-(sensible, since 1 is system wide, 2 is kernel or boot specific), and</div><div class='del'>-modprobe args to override both.</div><div class='del'>-</div><div class='del'>-In the foo.dyndbg="QUERY" form, the query must exclude "module foo".</div><div class='del'>-"foo" is extracted from the param-name, and applied to each query in</div><div class='del'>-"QUERY", and only 1 match-spec of each type is allowed.</div><div class='del'>-</div><div class='del'>-The dyndbg option is a "fake" module parameter, which means:</div><div class='del'>-</div><div class='del'>-- modules do not need to define it explicitly</div><div class='del'>-- every module gets it tacitly, whether they use pr_debug or not</div><div class='del'>-- it doesn't appear in /sys/module/$module/parameters/</div><div class='del'>-  To see it, grep the control file, or inspect /proc/cmdline.</div><div class='del'>-</div><div class='del'>-For CONFIG_DYNAMIC_DEBUG kernels, any settings given at boot-time (or</div><div class='del'>-enabled by -DDEBUG flag during compilation) can be disabled later via</div><div class='del'>-the sysfs interface if the debug messages are no longer needed:</div><div class='del'>-</div><div class='del'>-   echo "module module_name -p" &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-Examples</div><div class='del'>-========</div><div class='del'>-</div><div class='del'>-// enable the message at line 1603 of file svcsock.c</div><div class='del'>-nullarbor:~ # echo -n 'file svcsock.c line 1603 +p' &gt;</div><div class='del'>-				&lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-// enable all the messages in file svcsock.c</div><div class='del'>-nullarbor:~ # echo -n 'file svcsock.c +p' &gt;</div><div class='del'>-				&lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-// enable all the messages in the NFS server module</div><div class='del'>-nullarbor:~ # echo -n 'module nfsd +p' &gt;</div><div class='del'>-				&lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-// enable all 12 messages in the function svc_process()</div><div class='del'>-nullarbor:~ # echo -n 'func svc_process +p' &gt;</div><div class='del'>-				&lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-// disable all 12 messages in the function svc_process()</div><div class='del'>-nullarbor:~ # echo -n 'func svc_process -p' &gt;</div><div class='del'>-				&lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-// enable messages for NFS calls READ, READLINK, READDIR and READDIR+.</div><div class='del'>-nullarbor:~ # echo -n 'format "nfsd: READ" +p' &gt;</div><div class='del'>-				&lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-// enable messages in files of which the paths include string "usb"</div><div class='del'>-nullarbor:~ # echo -n '*usb* +p' &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-// enable all messages</div><div class='del'>-nullarbor:~ # echo -n '+p' &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-// add module, function to all enabled messages</div><div class='del'>-nullarbor:~ # echo -n '+mf' &gt; &lt;debugfs&gt;/dynamic_debug/control</div><div class='del'>-</div><div class='del'>-// boot-args example, with newlines and comments for readability</div><div class='del'>-Kernel command line: ...</div><div class='del'>-  // see whats going on in dyndbg=value processing</div><div class='del'>-  dynamic_debug.verbose=1</div><div class='del'>-  // enable pr_debugs in 2 builtins, #cmt is stripped</div><div class='del'>-  dyndbg="module params +p #cmt ; module sys +p"</div><div class='del'>-  // enable pr_debugs in 2 functions in a module loaded later</div><div class='del'>-  pc87360.dyndbg="func pc87360_init_device +p; func pc87360_find +p"</div><div class='head'>diff --git a/Documentation/edac.txt b/Documentation/edac.txt<br/>deleted file mode 100644<br/>index f89cfd85ae13..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/edac.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/edac.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,812 +0,0 @@</div><div class='del'>-EDAC - Error Detection And Correction</div><div class='del'>-=====================================</div><div class='del'>-</div><div class='del'>-"bluesmoke" was the name for this device driver when it</div><div class='del'>-was "out-of-tree" and maintained at sourceforge.net -</div><div class='del'>-bluesmoke.sourceforge.net. That site is mostly archaic now and can be</div><div class='del'>-used only for historical purposes.</div><div class='del'>-</div><div class='del'>-When the subsystem was pushed into 2.6.16 for the first time, it was</div><div class='del'>-renamed to 'EDAC'.</div><div class='del'>-</div><div class='del'>-PURPOSE</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-The 'edac' kernel module's goal is to detect and report hardware errors</div><div class='del'>-that occur within the computer system running under linux.</div><div class='del'>-</div><div class='del'>-MEMORY</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-Memory Correctable Errors (CE) and Uncorrectable Errors (UE) are the</div><div class='del'>-primary errors being harvested. These types of errors are harvested by</div><div class='del'>-the 'edac_mc' device.</div><div class='del'>-</div><div class='del'>-Detecting CE events, then harvesting those events and reporting them,</div><div class='del'>-*can* but must not necessarily be a predictor of future UE events. With</div><div class='del'>-CE events only, the system can and will continue to operate as no data</div><div class='del'>-has been damaged yet.</div><div class='del'>-</div><div class='del'>-However, preventive maintenance and proactive part replacement of memory</div><div class='del'>-DIMMs exhibiting CEs can reduce the likelihood of the dreaded UE events</div><div class='del'>-and system panics.</div><div class='del'>-</div><div class='del'>-OTHER HARDWARE ELEMENTS</div><div class='del'>------------------------</div><div class='del'>-</div><div class='del'>-A new feature for EDAC, the edac_device class of device, was added in</div><div class='del'>-the 2.6.23 version of the kernel.</div><div class='del'>-</div><div class='del'>-This new device type allows for non-memory type of ECC hardware detectors</div><div class='del'>-to have their states harvested and presented to userspace via the sysfs</div><div class='del'>-interface.</div><div class='del'>-</div><div class='del'>-Some architectures have ECC detectors for L1, L2 and L3 caches,</div><div class='del'>-along with DMA engines, fabric switches, main data path switches,</div><div class='del'>-interconnections, and various other hardware data paths. If the hardware</div><div class='del'>-reports it, then a edac_device device probably can be constructed to</div><div class='del'>-harvest and present that to userspace.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-PCI BUS SCANNING</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-In addition, PCI devices are scanned for PCI Bus Parity and SERR Errors</div><div class='del'>-in order to determine if errors are occurring during data transfers.</div><div class='del'>-</div><div class='del'>-The presence of PCI Parity errors must be examined with a grain of salt.</div><div class='del'>-There are several add-in adapters that do *not* follow the PCI specification</div><div class='del'>-with regards to Parity generation and reporting. The specification says</div><div class='del'>-the vendor should tie the parity status bits to 0 if they do not intend</div><div class='del'>-to generate parity.  Some vendors do not do this, and thus the parity bit</div><div class='del'>-can "float" giving false positives.</div><div class='del'>-</div><div class='del'>-There is a PCI device attribute located in sysfs that is checked by</div><div class='del'>-the EDAC PCI scanning code. If that attribute is set, PCI parity/error</div><div class='del'>-scanning is skipped for that device. The attribute is:</div><div class='del'>-</div><div class='del'>-	broken_parity_status</div><div class='del'>-</div><div class='del'>-and is located in /sys/devices/pci&lt;XXX&gt;/0000:XX:YY.Z directories for</div><div class='del'>-PCI devices.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-VERSIONING</div><div class='del'>-----------</div><div class='del'>-</div><div class='del'>-EDAC is composed of a "core" module (edac_core.ko) and several Memory</div><div class='del'>-Controller (MC) driver modules. On a given system, the CORE is loaded</div><div class='del'>-and one MC driver will be loaded. Both the CORE and the MC driver (or</div><div class='del'>-edac_device driver) have individual versions that reflect current</div><div class='del'>-release level of their respective modules.</div><div class='del'>-</div><div class='del'>-Thus, to "report" on what version a system is running, one must report</div><div class='del'>-both the CORE's and the MC driver's versions.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-LOADING</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-If 'edac' was statically linked with the kernel then no loading</div><div class='del'>-is necessary. If 'edac' was built as modules then simply modprobe</div><div class='del'>-the 'edac' pieces that you need. You should be able to modprobe</div><div class='del'>-hardware-specific modules and have the dependencies load the necessary</div><div class='del'>-core modules.</div><div class='del'>-</div><div class='del'>-Example:</div><div class='del'>-</div><div class='del'>-$&gt; modprobe amd76x_edac</div><div class='del'>-</div><div class='del'>-loads both the amd76x_edac.ko memory controller module and the edac_mc.ko</div><div class='del'>-core module.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SYSFS INTERFACE</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-EDAC presents a 'sysfs' interface for control and reporting purposes. It</div><div class='del'>-lives in the /sys/devices/system/edac directory.</div><div class='del'>-</div><div class='del'>-Within this directory there currently reside 2 components:</div><div class='del'>-</div><div class='del'>-	mc	memory controller(s) system</div><div class='del'>-	pci	PCI control and status system</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Memory Controller (mc) Model</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-Each 'mc' device controls a set of DIMM memory modules. These modules</div><div class='del'>-are laid out in a Chip-Select Row (csrowX) and Channel table (chX).</div><div class='del'>-There can be multiple csrows and multiple channels.</div><div class='del'>-</div><div class='del'>-Memory controllers allow for several csrows, with 8 csrows being a</div><div class='del'>-typical value. Yet, the actual number of csrows depends on the layout of</div><div class='del'>-a given motherboard, memory controller and DIMM characteristics.</div><div class='del'>-</div><div class='del'>-Dual channels allows for 128 bit data transfers to/from the CPU from/to</div><div class='del'>-memory. Some newer chipsets allow for more than 2 channels, like Fully</div><div class='del'>-Buffered DIMMs (FB-DIMMs). The following example will assume 2 channels:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		Channel 0	Channel 1</div><div class='del'>-	===================================</div><div class='del'>-	csrow0	| DIMM_A0	| DIMM_B0 |</div><div class='del'>-	csrow1	| DIMM_A0	| DIMM_B0 |</div><div class='del'>-	===================================</div><div class='del'>-</div><div class='del'>-	===================================</div><div class='del'>-	csrow2	| DIMM_A1	| DIMM_B1 |</div><div class='del'>-	csrow3	| DIMM_A1	| DIMM_B1 |</div><div class='del'>-	===================================</div><div class='del'>-</div><div class='del'>-In the above example table there are 4 physical slots on the motherboard</div><div class='del'>-for memory DIMMs:</div><div class='del'>-</div><div class='del'>-	DIMM_A0</div><div class='del'>-	DIMM_B0</div><div class='del'>-	DIMM_A1</div><div class='del'>-	DIMM_B1</div><div class='del'>-</div><div class='del'>-Labels for these slots are usually silk-screened on the motherboard.</div><div class='del'>-Slots labeled 'A' are channel 0 in this example. Slots labeled 'B' are</div><div class='del'>-channel 1. Notice that there are two csrows possible on a physical DIMM.</div><div class='del'>-These csrows are allocated their csrow assignment based on the slot into</div><div class='del'>-which the memory DIMM is placed. Thus, when 1 DIMM is placed in each</div><div class='del'>-Channel, the csrows cross both DIMMs.</div><div class='del'>-</div><div class='del'>-Memory DIMMs come single or dual "ranked". A rank is a populated csrow.</div><div class='del'>-Thus, 2 single ranked DIMMs, placed in slots DIMM_A0 and DIMM_B0 above</div><div class='del'>-will have 1 csrow, csrow0. csrow1 will be empty. On the other hand,</div><div class='del'>-when 2 dual ranked DIMMs are similarly placed, then both csrow0 and</div><div class='del'>-csrow1 will be populated. The pattern repeats itself for csrow2 and</div><div class='del'>-csrow3.</div><div class='del'>-</div><div class='del'>-The representation of the above is reflected in the directory</div><div class='del'>-tree in EDAC's sysfs interface. Starting in directory</div><div class='del'>-/sys/devices/system/edac/mc each memory controller will be represented</div><div class='del'>-by its own 'mcX' directory, where 'X' is the index of the MC.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	..../edac/mc/</div><div class='del'>-		   |</div><div class='del'>-		   |-&gt;mc0</div><div class='del'>-		   |-&gt;mc1</div><div class='del'>-		   |-&gt;mc2</div><div class='del'>-		   ....</div><div class='del'>-</div><div class='del'>-Under each 'mcX' directory each 'csrowX' is again represented by a</div><div class='del'>-'csrowX', where 'X' is the csrow index:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	.../mc/mc0/</div><div class='del'>-		|</div><div class='del'>-		|-&gt;csrow0</div><div class='del'>-		|-&gt;csrow2</div><div class='del'>-		|-&gt;csrow3</div><div class='del'>-		....</div><div class='del'>-</div><div class='del'>-Notice that there is no csrow1, which indicates that csrow0 is composed</div><div class='del'>-of a single ranked DIMMs. This should also apply in both Channels, in</div><div class='del'>-order to have dual-channel mode be operational. Since both csrow2 and</div><div class='del'>-csrow3 are populated, this indicates a dual ranked set of DIMMs for</div><div class='del'>-channels 0 and 1.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Within each of the 'mcX' and 'csrowX' directories are several EDAC</div><div class='del'>-control and attribute files.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-'mcX' directories</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-In 'mcX' directories are EDAC control and attribute files for</div><div class='del'>-this 'X' instance of the memory controllers.</div><div class='del'>-</div><div class='del'>-For a description of the sysfs API, please see:</div><div class='del'>-	Documentation/ABI/testing/sysfs-devices-edac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-'csrowX' directories</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-When CONFIG_EDAC_LEGACY_SYSFS is enabled, sysfs will contain the csrowX</div><div class='del'>-directories. As this API doesn't work properly for Rambus, FB-DIMMs and</div><div class='del'>-modern Intel Memory Controllers, this is being deprecated in favor of</div><div class='del'>-dimmX directories.</div><div class='del'>-</div><div class='del'>-In the 'csrowX' directories are EDAC control and attribute files for</div><div class='del'>-this 'X' instance of csrow:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Total Uncorrectable Errors count attribute file:</div><div class='del'>-</div><div class='del'>-	'ue_count'</div><div class='del'>-</div><div class='del'>-	This attribute file displays the total count of uncorrectable</div><div class='del'>-	errors that have occurred on this csrow. If panic_on_ue is set</div><div class='del'>-	this counter will not have a chance to increment, since EDAC</div><div class='del'>-	will panic the system.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Total Correctable Errors count attribute file:</div><div class='del'>-</div><div class='del'>-	'ce_count'</div><div class='del'>-</div><div class='del'>-	This attribute file displays the total count of correctable</div><div class='del'>-	errors that have occurred on this csrow. This count is very</div><div class='del'>-	important to examine. CEs provide early indications that a</div><div class='del'>-	DIMM is beginning to fail. This count field should be</div><div class='del'>-	monitored for non-zero values and report such information</div><div class='del'>-	to the system administrator.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Total memory managed by this csrow attribute file:</div><div class='del'>-</div><div class='del'>-	'size_mb'</div><div class='del'>-</div><div class='del'>-	This attribute file displays, in count of megabytes, the memory</div><div class='del'>-	that this csrow contains.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Memory Type attribute file:</div><div class='del'>-</div><div class='del'>-	'mem_type'</div><div class='del'>-</div><div class='del'>-	This attribute file will display what type of memory is currently</div><div class='del'>-	on this csrow. Normally, either buffered or unbuffered memory.</div><div class='del'>-	Examples:</div><div class='del'>-		Registered-DDR</div><div class='del'>-		Unbuffered-DDR</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EDAC Mode of operation attribute file:</div><div class='del'>-</div><div class='del'>-	'edac_mode'</div><div class='del'>-</div><div class='del'>-	This attribute file will display what type of Error detection</div><div class='del'>-	and correction is being utilized.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Device type attribute file:</div><div class='del'>-</div><div class='del'>-	'dev_type'</div><div class='del'>-</div><div class='del'>-	This attribute file will display what type of DRAM device is</div><div class='del'>-	being utilized on this DIMM.</div><div class='del'>-	Examples:</div><div class='del'>-		x1</div><div class='del'>-		x2</div><div class='del'>-		x4</div><div class='del'>-		x8</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Channel 0 CE Count attribute file:</div><div class='del'>-</div><div class='del'>-	'ch0_ce_count'</div><div class='del'>-</div><div class='del'>-	This attribute file will display the count of CEs on this</div><div class='del'>-	DIMM located in channel 0.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Channel 0 UE Count attribute file:</div><div class='del'>-</div><div class='del'>-	'ch0_ue_count'</div><div class='del'>-</div><div class='del'>-	This attribute file will display the count of UEs on this</div><div class='del'>-	DIMM located in channel 0.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Channel 0 DIMM Label control file:</div><div class='del'>-</div><div class='del'>-	'ch0_dimm_label'</div><div class='del'>-</div><div class='del'>-	This control file allows this DIMM to have a label assigned</div><div class='del'>-	to it. With this label in the module, when errors occur</div><div class='del'>-	the output can provide the DIMM label in the system log.</div><div class='del'>-	This becomes vital for panic events to isolate the</div><div class='del'>-	cause of the UE event.</div><div class='del'>-</div><div class='del'>-	DIMM Labels must be assigned after booting, with information</div><div class='del'>-	that correctly identifies the physical slot with its</div><div class='del'>-	silk screen label. This information is currently very</div><div class='del'>-	motherboard specific and determination of this information</div><div class='del'>-	must occur in userland at this time.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Channel 1 CE Count attribute file:</div><div class='del'>-</div><div class='del'>-	'ch1_ce_count'</div><div class='del'>-</div><div class='del'>-	This attribute file will display the count of CEs on this</div><div class='del'>-	DIMM located in channel 1.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Channel 1 UE Count attribute file:</div><div class='del'>-</div><div class='del'>-	'ch1_ue_count'</div><div class='del'>-</div><div class='del'>-	This attribute file will display the count of UEs on this</div><div class='del'>-	DIMM located in channel 0.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Channel 1 DIMM Label control file:</div><div class='del'>-</div><div class='del'>-	'ch1_dimm_label'</div><div class='del'>-</div><div class='del'>-	This control file allows this DIMM to have a label assigned</div><div class='del'>-	to it. With this label in the module, when errors occur</div><div class='del'>-	the output can provide the DIMM label in the system log.</div><div class='del'>-	This becomes vital for panic events to isolate the</div><div class='del'>-	cause of the UE event.</div><div class='del'>-</div><div class='del'>-	DIMM Labels must be assigned after booting, with information</div><div class='del'>-	that correctly identifies the physical slot with its</div><div class='del'>-	silk screen label. This information is currently very</div><div class='del'>-	motherboard specific and determination of this information</div><div class='del'>-	must occur in userland at this time.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SYSTEM LOGGING</div><div class='del'>---------------</div><div class='del'>-</div><div class='del'>-If logging for UEs and CEs is enabled, then system logs will contain</div><div class='del'>-information indicating that errors have been detected:</div><div class='del'>-</div><div class='del'>-EDAC MC0: CE page 0x283, offset 0xce0, grain 8, syndrome 0x6ec3, row 0,</div><div class='del'>-channel 1 "DIMM_B1": amd76x_edac</div><div class='del'>-</div><div class='del'>-EDAC MC0: CE page 0x1e5, offset 0xfb0, grain 8, syndrome 0xb741, row 0,</div><div class='del'>-channel 1 "DIMM_B1": amd76x_edac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The structure of the message is:</div><div class='del'>-	the memory controller			(MC0)</div><div class='del'>-	Error type				(CE)</div><div class='del'>-	memory page				(0x283)</div><div class='del'>-	offset in the page			(0xce0)</div><div class='del'>-	the byte granularity 			(grain 8)</div><div class='del'>-		or resolution of the error</div><div class='del'>-	the error syndrome			(0xb741)</div><div class='del'>-	memory row				(row 0)</div><div class='del'>-	memory channel				(channel 1)</div><div class='del'>-	DIMM label, if set prior		(DIMM B1</div><div class='del'>-	and then an optional, driver-specific message that may</div><div class='del'>-		have additional information.</div><div class='del'>-</div><div class='del'>-Both UEs and CEs with no info will lack all but memory controller, error</div><div class='del'>-type, a notice of "no info" and then an optional, driver-specific error</div><div class='del'>-message.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-PCI Bus Parity Detection</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-On Header Type 00 devices, the primary status is looked at for any</div><div class='del'>-parity error regardless of whether parity is enabled on the device or</div><div class='del'>-not. (The spec indicates parity is generated in some cases). On Header</div><div class='del'>-Type 01 bridges, the secondary status register is also looked at to see</div><div class='del'>-if parity occurred on the bus on the other side of the bridge.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SYSFS CONFIGURATION</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-Under /sys/devices/system/edac/pci are control and attribute files as follows:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Enable/Disable PCI Parity checking control file:</div><div class='del'>-</div><div class='del'>-	'check_pci_parity'</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	This control file enables or disables the PCI Bus Parity scanning</div><div class='del'>-	operation. Writing a 1 to this file enables the scanning. Writing</div><div class='del'>-	a 0 to this file disables the scanning.</div><div class='del'>-</div><div class='del'>-	Enable:</div><div class='del'>-	echo "1" &gt;/sys/devices/system/edac/pci/check_pci_parity</div><div class='del'>-</div><div class='del'>-	Disable:</div><div class='del'>-	echo "0" &gt;/sys/devices/system/edac/pci/check_pci_parity</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Parity Count:</div><div class='del'>-</div><div class='del'>-	'pci_parity_count'</div><div class='del'>-</div><div class='del'>-	This attribute file will display the number of parity errors that</div><div class='del'>-	have been detected.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MODULE PARAMETERS</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-Panic on UE control file:</div><div class='del'>-</div><div class='del'>-	'edac_mc_panic_on_ue'</div><div class='del'>-</div><div class='del'>-	An uncorrectable error will cause a machine panic.  This is usually</div><div class='del'>-	desirable.  It is a bad idea to continue when an uncorrectable error</div><div class='del'>-	occurs - it is indeterminate what was uncorrected and the operating</div><div class='del'>-	system context might be so mangled that continuing will lead to further</div><div class='del'>-	corruption. If the kernel has MCE configured, then EDAC will never</div><div class='del'>-	notice the UE.</div><div class='del'>-</div><div class='del'>-	LOAD TIME: module/kernel parameter: edac_mc_panic_on_ue=[0|1]</div><div class='del'>-</div><div class='del'>-	RUN TIME:  echo "1" &gt; /sys/module/edac_core/parameters/edac_mc_panic_on_ue</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Log UE control file:</div><div class='del'>-</div><div class='del'>-	'edac_mc_log_ue'</div><div class='del'>-</div><div class='del'>-	Generate kernel messages describing uncorrectable errors.  These errors</div><div class='del'>-	are reported through the system message log system.  UE statistics</div><div class='del'>-	will be accumulated even when UE logging is disabled.</div><div class='del'>-</div><div class='del'>-	LOAD TIME: module/kernel parameter: edac_mc_log_ue=[0|1]</div><div class='del'>-</div><div class='del'>-	RUN TIME: echo "1" &gt; /sys/module/edac_core/parameters/edac_mc_log_ue</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Log CE control file:</div><div class='del'>-</div><div class='del'>-	'edac_mc_log_ce'</div><div class='del'>-</div><div class='del'>-	Generate kernel messages describing correctable errors.  These</div><div class='del'>-	errors are reported through the system message log system.</div><div class='del'>-	CE statistics will be accumulated even when CE logging is disabled.</div><div class='del'>-</div><div class='del'>-	LOAD TIME: module/kernel parameter: edac_mc_log_ce=[0|1]</div><div class='del'>-</div><div class='del'>-	RUN TIME: echo "1" &gt; /sys/module/edac_core/parameters/edac_mc_log_ce</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Polling period control file:</div><div class='del'>-</div><div class='del'>-	'edac_mc_poll_msec'</div><div class='del'>-</div><div class='del'>-	The time period, in milliseconds, for polling for error information.</div><div class='del'>-	Too small a value wastes resources.  Too large a value might delay</div><div class='del'>-	necessary handling of errors and might loose valuable information for</div><div class='del'>-	locating the error.  1000 milliseconds (once each second) is the current</div><div class='del'>-	default. Systems which require all the bandwidth they can get, may</div><div class='del'>-	increase this.</div><div class='del'>-</div><div class='del'>-	LOAD TIME: module/kernel parameter: edac_mc_poll_msec=[0|1]</div><div class='del'>-</div><div class='del'>-	RUN TIME: echo "1000" &gt; /sys/module/edac_core/parameters/edac_mc_poll_msec</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Panic on PCI PARITY Error:</div><div class='del'>-</div><div class='del'>-	'panic_on_pci_parity'</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	This control file enables or disables panicking when a parity</div><div class='del'>-	error has been detected.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	module/kernel parameter: edac_panic_on_pci_pe=[0|1]</div><div class='del'>-</div><div class='del'>-	Enable:</div><div class='del'>-	echo "1" &gt; /sys/module/edac_core/parameters/edac_panic_on_pci_pe</div><div class='del'>-</div><div class='del'>-	Disable:</div><div class='del'>-	echo "0" &gt; /sys/module/edac_core/parameters/edac_panic_on_pci_pe</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EDAC device type</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-In the header file, edac_core.h, there is a series of edac_device structures</div><div class='del'>-and APIs for the EDAC_DEVICE.</div><div class='del'>-</div><div class='del'>-User space access to an edac_device is through the sysfs interface.</div><div class='del'>-</div><div class='del'>-At the location /sys/devices/system/edac (sysfs) new edac_device devices will</div><div class='del'>-appear.</div><div class='del'>-</div><div class='del'>-There is a three level tree beneath the above 'edac' directory. For example,</div><div class='del'>-the 'test_device_edac' device (found at the bluesmoke.sourceforget.net website)</div><div class='del'>-installs itself as:</div><div class='del'>-</div><div class='del'>-	/sys/devices/systm/edac/test-instance</div><div class='del'>-</div><div class='del'>-in this directory are various controls, a symlink and one or more 'instance'</div><div class='del'>-directories.</div><div class='del'>-</div><div class='del'>-The standard default controls are:</div><div class='del'>-</div><div class='del'>-	log_ce		boolean to log CE events</div><div class='del'>-	log_ue		boolean to log UE events</div><div class='del'>-	panic_on_ue	boolean to 'panic' the system if an UE is encountered</div><div class='del'>-			(default off, can be set true via startup script)</div><div class='del'>-	poll_msec	time period between POLL cycles for events</div><div class='del'>-</div><div class='del'>-The test_device_edac device adds at least one of its own custom control:</div><div class='del'>-</div><div class='del'>-	test_bits	which in the current test driver does nothing but</div><div class='del'>-			show how it is installed. A ported driver can</div><div class='del'>-			add one or more such controls and/or attributes</div><div class='del'>-			for specific uses.</div><div class='del'>-			One out-of-tree driver uses controls here to allow</div><div class='del'>-			for ERROR INJECTION operations to hardware</div><div class='del'>-			injection registers</div><div class='del'>-</div><div class='del'>-The symlink points to the 'struct dev' that is registered for this edac_device.</div><div class='del'>-</div><div class='del'>-INSTANCES</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-One or more instance directories are present. For the 'test_device_edac' case:</div><div class='del'>-</div><div class='del'>-	test-instance0</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-In this directory there are two default counter attributes, which are totals of</div><div class='del'>-counter in deeper subdirectories.</div><div class='del'>-</div><div class='del'>-	ce_count	total of CE events of subdirectories</div><div class='del'>-	ue_count	total of UE events of subdirectories</div><div class='del'>-</div><div class='del'>-BLOCKS</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-At the lowest directory level is the 'block' directory. There can be 0, 1</div><div class='del'>-or more blocks specified in each instance.</div><div class='del'>-</div><div class='del'>-	test-block0</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-In this directory the default attributes are:</div><div class='del'>-</div><div class='del'>-	ce_count	which is counter of CE events for this 'block'</div><div class='del'>-			of hardware being monitored</div><div class='del'>-	ue_count	which is counter of UE events for this 'block'</div><div class='del'>-			of hardware being monitored</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The 'test_device_edac' device adds 4 attributes and 1 control:</div><div class='del'>-</div><div class='del'>-	test-block-bits-0	for every POLL cycle this counter</div><div class='del'>-				is incremented</div><div class='del'>-	test-block-bits-1	every 10 cycles, this counter is bumped once,</div><div class='del'>-				and test-block-bits-0 is set to 0</div><div class='del'>-	test-block-bits-2	every 100 cycles, this counter is bumped once,</div><div class='del'>-				and test-block-bits-1 is set to 0</div><div class='del'>-	test-block-bits-3	every 1000 cycles, this counter is bumped once,</div><div class='del'>-				and test-block-bits-2 is set to 0</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	reset-counters		writing ANY thing to this control will</div><div class='del'>-				reset all the above counters.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Use of the 'test_device_edac' driver should enable any others to create their own</div><div class='del'>-unique drivers for their hardware systems.</div><div class='del'>-</div><div class='del'>-The 'test_device_edac' sample driver is located at the</div><div class='del'>-bluesmoke.sourceforge.net project site for EDAC.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-NEHALEM USAGE OF EDAC APIs</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-This chapter documents some EXPERIMENTAL mappings for EDAC API to handle</div><div class='del'>-Nehalem EDAC driver. They will likely be changed on future versions</div><div class='del'>-of the driver.</div><div class='del'>-</div><div class='del'>-Due to the way Nehalem exports Memory Controller data, some adjustments</div><div class='del'>-were done at i7core_edac driver. This chapter will cover those differences</div><div class='del'>-</div><div class='del'>-1) On Nehalem, there is one Memory Controller per Quick Patch Interconnect</div><div class='del'>-   (QPI). At the driver, the term "socket" means one QPI. This is</div><div class='del'>-   associated with a physical CPU socket.</div><div class='del'>-</div><div class='del'>-   Each MC have 3 physical read channels, 3 physical write channels and</div><div class='del'>-   3 logic channels. The driver currently sees it as just 3 channels.</div><div class='del'>-   Each channel can have up to 3 DIMMs.</div><div class='del'>-</div><div class='del'>-   The minimum known unity is DIMMs. There are no information about csrows.</div><div class='del'>-   As EDAC API maps the minimum unity is csrows, the driver sequentially</div><div class='del'>-   maps channel/dimm into different csrows.</div><div class='del'>-</div><div class='del'>-   For example, supposing the following layout:</div><div class='del'>-	Ch0 phy rd0, wr0 (0x063f4031): 2 ranks, UDIMMs</div><div class='del'>-	  dimm 0 1024 Mb offset: 0, bank: 8, rank: 1, row: 0x4000, col: 0x400</div><div class='del'>-	  dimm 1 1024 Mb offset: 4, bank: 8, rank: 1, row: 0x4000, col: 0x400</div><div class='del'>-        Ch1 phy rd1, wr1 (0x063f4031): 2 ranks, UDIMMs</div><div class='del'>-	  dimm 0 1024 Mb offset: 0, bank: 8, rank: 1, row: 0x4000, col: 0x400</div><div class='del'>-	Ch2 phy rd3, wr3 (0x063f4031): 2 ranks, UDIMMs</div><div class='del'>-	  dimm 0 1024 Mb offset: 0, bank: 8, rank: 1, row: 0x4000, col: 0x400</div><div class='del'>-   The driver will map it as:</div><div class='del'>-	csrow0: channel 0, dimm0</div><div class='del'>-	csrow1: channel 0, dimm1</div><div class='del'>-	csrow2: channel 1, dimm0</div><div class='del'>-	csrow3: channel 2, dimm0</div><div class='del'>-</div><div class='del'>-exports one</div><div class='del'>-   DIMM per csrow.</div><div class='del'>-</div><div class='del'>-   Each QPI is exported as a different memory controller.</div><div class='del'>-</div><div class='del'>-2) Nehalem MC has the ability to generate errors. The driver implements this</div><div class='del'>-   functionality via some error injection nodes:</div><div class='del'>-</div><div class='del'>-   For injecting a memory error, there are some sysfs nodes, under</div><div class='del'>-   /sys/devices/system/edac/mc/mc?/:</div><div class='del'>-</div><div class='del'>-   inject_addrmatch/*:</div><div class='del'>-      Controls the error injection mask register. It is possible to specify</div><div class='del'>-      several characteristics of the address to match an error code:</div><div class='del'>-         dimm = the affected dimm. Numbers are relative to a channel;</div><div class='del'>-         rank = the memory rank;</div><div class='del'>-         channel = the channel that will generate an error;</div><div class='del'>-         bank = the affected bank;</div><div class='del'>-         page = the page address;</div><div class='del'>-         column (or col) = the address column.</div><div class='del'>-      each of the above values can be set to "any" to match any valid value.</div><div class='del'>-</div><div class='del'>-      At driver init, all values are set to any.</div><div class='del'>-</div><div class='del'>-      For example, to generate an error at rank 1 of dimm 2, for any channel,</div><div class='del'>-      any bank, any page, any column:</div><div class='del'>-		echo 2 &gt;/sys/devices/system/edac/mc/mc0/inject_addrmatch/dimm</div><div class='del'>-		echo 1 &gt;/sys/devices/system/edac/mc/mc0/inject_addrmatch/rank</div><div class='del'>-</div><div class='del'>-	To return to the default behaviour of matching any, you can do:</div><div class='del'>-		echo any &gt;/sys/devices/system/edac/mc/mc0/inject_addrmatch/dimm</div><div class='del'>-		echo any &gt;/sys/devices/system/edac/mc/mc0/inject_addrmatch/rank</div><div class='del'>-</div><div class='del'>-   inject_eccmask:</div><div class='del'>-       specifies what bits will have troubles,</div><div class='del'>-</div><div class='del'>-   inject_section:</div><div class='del'>-       specifies what ECC cache section will get the error:</div><div class='del'>-		3 for both</div><div class='del'>-		2 for the highest</div><div class='del'>-		1 for the lowest</div><div class='del'>-</div><div class='del'>-   inject_type:</div><div class='del'>-       specifies the type of error, being a combination of the following bits:</div><div class='del'>-		bit 0 - repeat</div><div class='del'>-		bit 1 - ecc</div><div class='del'>-		bit 2 - parity</div><div class='del'>-</div><div class='del'>-       inject_enable starts the error generation when something different</div><div class='del'>-       than 0 is written.</div><div class='del'>-</div><div class='del'>-   All inject vars can be read. root permission is needed for write.</div><div class='del'>-</div><div class='del'>-   Datasheet states that the error will only be generated after a write on an</div><div class='del'>-   address that matches inject_addrmatch. It seems, however, that reading will</div><div class='del'>-   also produce an error.</div><div class='del'>-</div><div class='del'>-   For example, the following code will generate an error for any write access</div><div class='del'>-   at socket 0, on any DIMM/address on channel 2:</div><div class='del'>-</div><div class='del'>-   echo 2 &gt;/sys/devices/system/edac/mc/mc0/inject_addrmatch/channel</div><div class='del'>-   echo 2 &gt;/sys/devices/system/edac/mc/mc0/inject_type</div><div class='del'>-   echo 64 &gt;/sys/devices/system/edac/mc/mc0/inject_eccmask</div><div class='del'>-   echo 3 &gt;/sys/devices/system/edac/mc/mc0/inject_section</div><div class='del'>-   echo 1 &gt;/sys/devices/system/edac/mc/mc0/inject_enable</div><div class='del'>-   dd if=/dev/mem of=/dev/null seek=16k bs=4k count=1 &gt;&amp; /dev/null</div><div class='del'>-</div><div class='del'>-   For socket 1, it is needed to replace "mc0" by "mc1" at the above</div><div class='del'>-   commands.</div><div class='del'>-</div><div class='del'>-   The generated error message will look like:</div><div class='del'>-</div><div class='del'>-   EDAC MC0: UE row 0, channel-a= 0 channel-b= 0 labels "-": NON_FATAL (addr = 0x0075b980, socket=0, Dimm=0, Channel=2, syndrome=0x00000040, count=1, Err=8c0000400001009f:4000080482 (read error: read ECC error))</div><div class='del'>-</div><div class='del'>-3) Nehalem specific Corrected Error memory counters</div><div class='del'>-</div><div class='del'>-   Nehalem have some registers to count memory errors. The driver uses those</div><div class='del'>-   registers to report Corrected Errors on devices with Registered Dimms.</div><div class='del'>-</div><div class='del'>-   However, those counters don't work with Unregistered Dimms. As the chipset</div><div class='del'>-   offers some counters that also work with UDIMMS (but with a worse level of</div><div class='del'>-   granularity than the default ones), the driver exposes those registers for</div><div class='del'>-   UDIMM memories.</div><div class='del'>-</div><div class='del'>-   They can be read by looking at the contents of all_channel_counts/</div><div class='del'>-</div><div class='del'>-   $ for i in /sys/devices/system/edac/mc/mc0/all_channel_counts/*; do echo $i; cat $i; done</div><div class='del'>-	/sys/devices/system/edac/mc/mc0/all_channel_counts/udimm0</div><div class='del'>-	0</div><div class='del'>-	/sys/devices/system/edac/mc/mc0/all_channel_counts/udimm1</div><div class='del'>-	0</div><div class='del'>-	/sys/devices/system/edac/mc/mc0/all_channel_counts/udimm2</div><div class='del'>-	0</div><div class='del'>-</div><div class='del'>-   What happens here is that errors on different csrows, but at the same</div><div class='del'>-   dimm number will increment the same counter.</div><div class='del'>-   So, in this memory mapping:</div><div class='del'>-	csrow0: channel 0, dimm0</div><div class='del'>-	csrow1: channel 0, dimm1</div><div class='del'>-	csrow2: channel 1, dimm0</div><div class='del'>-	csrow3: channel 2, dimm0</div><div class='del'>-   The hardware will increment udimm0 for an error at the first dimm at either</div><div class='del'>-	csrow0, csrow2  or csrow3;</div><div class='del'>-   The hardware will increment udimm1 for an error at the second dimm at either</div><div class='del'>-	csrow0, csrow2  or csrow3;</div><div class='del'>-   The hardware will increment udimm2 for an error at the third dimm at either</div><div class='del'>-	csrow0, csrow2  or csrow3;</div><div class='del'>-</div><div class='del'>-4) Standard error counters</div><div class='del'>-</div><div class='del'>-   The standard error counters are generated when an mcelog error is received</div><div class='del'>-   by the driver. Since, with udimm, this is counted by software, it is</div><div class='del'>-   possible that some errors could be lost. With rdimm's, they display the</div><div class='del'>-   contents of the registers</div><div class='del'>-</div><div class='del'>-AMD64_EDAC REFERENCE DOCUMENTS USED</div><div class='del'>------------------------------------</div><div class='del'>-amd64_edac module is based on the following documents</div><div class='del'>-(available from http://support.amd.com/en-us/search/tech-docs):</div><div class='del'>-</div><div class='del'>-1. Title:  BIOS and Kernel Developer's Guide for AMD Athlon 64 and AMD</div><div class='del'>-	   Opteron Processors</div><div class='del'>-   AMD publication #: 26094</div><div class='del'>-   Revision: 3.26</div><div class='del'>-   Link: http://support.amd.com/TechDocs/26094.PDF</div><div class='del'>-</div><div class='del'>-2. Title:  BIOS and Kernel Developer's Guide for AMD NPT Family 0Fh</div><div class='del'>-	   Processors</div><div class='del'>-   AMD publication #: 32559</div><div class='del'>-   Revision: 3.00</div><div class='del'>-   Issue Date: May 2006</div><div class='del'>-   Link: http://support.amd.com/TechDocs/32559.pdf</div><div class='del'>-</div><div class='del'>-3. Title:  BIOS and Kernel Developer's Guide (BKDG) For AMD Family 10h</div><div class='del'>-	   Processors</div><div class='del'>-   AMD publication #: 31116</div><div class='del'>-   Revision: 3.00</div><div class='del'>-   Issue Date: September 07, 2007</div><div class='del'>-   Link: http://support.amd.com/TechDocs/31116.pdf</div><div class='del'>-</div><div class='del'>-4. Title: BIOS and Kernel Developer's Guide (BKDG) for AMD Family 15h</div><div class='del'>-	  Models 30h-3Fh Processors</div><div class='del'>-   AMD publication #: 49125</div><div class='del'>-   Revision: 3.06</div><div class='del'>-   Issue Date: 2/12/2015 (latest release)</div><div class='del'>-   Link: http://support.amd.com/TechDocs/49125_15h_Models_30h-3Fh_BKDG.pdf</div><div class='del'>-</div><div class='del'>-5. Title: BIOS and Kernel Developer's Guide (BKDG) for AMD Family 15h</div><div class='del'>-	  Models 60h-6Fh Processors</div><div class='del'>-   AMD publication #: 50742</div><div class='del'>-   Revision: 3.01</div><div class='del'>-   Issue Date: 7/23/2015 (latest release)</div><div class='del'>-   Link: http://support.amd.com/TechDocs/50742_15h_Models_60h-6Fh_BKDG.pdf</div><div class='del'>-</div><div class='del'>-6. Title: BIOS and Kernel Developer's Guide (BKDG) for AMD Family 16h</div><div class='del'>-	  Models 00h-0Fh Processors</div><div class='del'>-   AMD publication #: 48751</div><div class='del'>-   Revision: 3.03</div><div class='del'>-   Issue Date: 2/23/2015 (latest release)</div><div class='del'>-   Link: http://support.amd.com/TechDocs/48751_16h_bkdg.pdf</div><div class='del'>-</div><div class='del'>-CREDITS:</div><div class='del'>-========</div><div class='del'>-</div><div class='del'>-Written by Doug Thompson &lt;dougthompson@xmission.com&gt;</div><div class='del'>-7 Dec 2005</div><div class='del'>-17 Jul 2007	Updated</div><div class='del'>-</div><div class='del'>-(c) Mauro Carvalho Chehab</div><div class='del'>-05 Aug 2009	Nehalem interface</div><div class='del'>-</div><div class='del'>-EDAC authors/maintainers:</div><div class='del'>-</div><div class='del'>-	Doug Thompson, Dave Jiang, Dave Peterson et al,</div><div class='del'>-	Mauro Carvalho Chehab</div><div class='del'>-	Borislav Petkov</div><div class='del'>-	original author: Thayne Harbaugh</div><div class='head'>diff --git a/Documentation/extcon/intel-int3496.txt b/Documentation/extcon/intel-int3496.txt<br/>new file mode 100644<br/>index 000000000000..af0b366c25b7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/extcon/intel-int3496.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/extcon/intel-int3496.txt</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+Intel INT3496 ACPI device extcon driver documentation</div><div class='add'>+-----------------------------------------------------</div><div class='add'>+</div><div class='add'>+The Intel INT3496 ACPI device extcon driver is a driver for ACPI</div><div class='add'>+devices with an acpi-id of INT3496, such as found for example on</div><div class='add'>+Intel Baytrail and Cherrytrail tablets.</div><div class='add'>+</div><div class='add'>+This ACPI device describes how the OS can read the id-pin of the devices'</div><div class='add'>+USB-otg port, as well as how it optionally can enable Vbus output on the</div><div class='add'>+otg port and how it can optionally control the muxing of the data pins</div><div class='add'>+between an USB host and an USB peripheral controller.</div><div class='add'>+</div><div class='add'>+The ACPI devices exposes this functionality by returning an array with up</div><div class='add'>+to 3 gpio descriptors from its ACPI _CRS (Current Resource Settings) call:</div><div class='add'>+</div><div class='add'>+Index 0: The input gpio for the id-pin, this is always present and valid</div><div class='add'>+Index 1: The output gpio for enabling Vbus output from the device to the otg</div><div class='add'>+         port, write 1 to enable the Vbus output (this gpio descriptor may</div><div class='add'>+         be absent or invalid)</div><div class='add'>+Index 2: The output gpio for muxing of the data pins between the USB host and</div><div class='add'>+         the USB peripheral controller, write 1 to mux to the peripheral</div><div class='add'>+         controller</div><div class='head'>diff --git a/Documentation/features/io/dma-api-debug/arch-support.txt b/Documentation/features/io/dma-api-debug/arch-support.txt<br/>index 4f4a3443b114..ffa522a9bdfd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/features/io/dma-api-debug/arch-support.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/features/io/dma-api-debug/arch-support.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/features/io/dma-api-debug/arch-support.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/features/io/dma-api-debug/arch-support.txt</a></div><div class='hunk'>@@ -36,5 +36,5 @@</div><div class='ctx'>     |          um: | TODO |</div><div class='ctx'>     |   unicore32: | TODO |</div><div class='ctx'>     |         x86: |  ok  |</div><div class='del'>-    |      xtensa: | TODO |</div><div class='add'>+    |      xtensa: |  ok  |</div><div class='ctx'>     -----------------------</div><div class='head'>diff --git a/Documentation/features/io/dma-contiguous/arch-support.txt b/Documentation/features/io/dma-contiguous/arch-support.txt<br/>index a97e8e3f4ebb..83d2cf989ea3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/features/io/dma-contiguous/arch-support.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/features/io/dma-contiguous/arch-support.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/features/io/dma-contiguous/arch-support.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/features/io/dma-contiguous/arch-support.txt</a></div><div class='hunk'>@@ -36,5 +36,5 @@</div><div class='ctx'>     |          um: | TODO |</div><div class='ctx'>     |   unicore32: | TODO |</div><div class='ctx'>     |         x86: |  ok  |</div><div class='del'>-    |      xtensa: | TODO |</div><div class='add'>+    |      xtensa: |  ok  |</div><div class='ctx'>     -----------------------</div><div class='head'>diff --git a/Documentation/features/io/sg-chain/arch-support.txt b/Documentation/features/io/sg-chain/arch-support.txt<br/>index b9b675539b9d..6ca98f9911bb 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/features/io/sg-chain/arch-support.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/features/io/sg-chain/arch-support.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/features/io/sg-chain/arch-support.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/features/io/sg-chain/arch-support.txt</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>     |         arch |status|</div><div class='ctx'>     -----------------------</div><div class='ctx'>     |       alpha: | TODO |</div><div class='del'>-    |         arc: | TODO |</div><div class='add'>+    |         arc: |  ok  |</div><div class='ctx'>     |         arm: |  ok  |</div><div class='ctx'>     |       arm64: |  ok  |</div><div class='ctx'>     |       avr32: | TODO |</div><div class='head'>diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX<br/>index f66e748fc5e4..b7bd6c9009cc 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/00-INDEX?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/00-INDEX</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/00-INDEX?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/00-INDEX</a></div><div class='hunk'>@@ -87,8 +87,6 @@ jfs.txt</div><div class='ctx'> 	- info and mount options for the JFS filesystem.</div><div class='ctx'> locks.txt</div><div class='ctx'> 	- info on file locking implementations, flock() vs. fcntl(), etc.</div><div class='del'>-logfs.txt</div><div class='del'>-	- info on the LogFS flash filesystem.</div><div class='ctx'> mandatory-locking.txt</div><div class='ctx'> 	- info on the Linux implementation of Sys V mandatory file locking.</div><div class='ctx'> ncpfs.txt</div><div class='head'>diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking<br/>index 1b5f15653b1b..fdcfdd79682a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/Locking?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/Locking</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/Locking?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/Locking</a></div><div class='hunk'>@@ -20,7 +20,7 @@ prototypes:</div><div class='ctx'> 	void (*d_iput)(struct dentry *, struct inode *);</div><div class='ctx'> 	char *(*d_dname)((struct dentry *dentry, char *buffer, int buflen);</div><div class='ctx'> 	struct vfsmount *(*d_automount)(struct path *path);</div><div class='del'>-	int (*d_manage)(struct dentry *, bool);</div><div class='add'>+	int (*d_manage)(const struct path *, bool);</div><div class='ctx'> 	struct dentry *(*d_real)(struct dentry *, const struct inode *,</div><div class='ctx'> 				 unsigned int);</div><div class='ctx'> </div><div class='hunk'>@@ -58,7 +58,8 @@ prototypes:</div><div class='ctx'> 	int (*permission) (struct inode *, int, unsigned int);</div><div class='ctx'> 	int (*get_acl)(struct inode *, int);</div><div class='ctx'> 	int (*setattr) (struct dentry *, struct iattr *);</div><div class='del'>-	int (*getattr) (struct vfsmount *, struct dentry *, struct kstat *);</div><div class='add'>+	int (*getattr) (const struct path *, struct dentry *, struct kstat *,</div><div class='add'>+			u32, unsigned int);</div><div class='ctx'> 	ssize_t (*listxattr) (struct dentry *, char *, size_t);</div><div class='ctx'> 	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);</div><div class='ctx'> 	void (*update_time)(struct inode *, struct timespec *, int);</div><div class='hunk'>@@ -556,7 +557,7 @@ till "end_pgoff". -&gt;map_pages() is called with page table locked and must</div><div class='ctx'> not block.  If it's not possible to reach a page without blocking,</div><div class='ctx'> filesystem should skip it. Filesystem should use do_set_pte() to setup</div><div class='ctx'> page table entry. Pointer to entry associated with the page is passed in</div><div class='del'>-"pte" field in fault_env structure. Pointers to entries for other offsets</div><div class='add'>+"pte" field in vm_fault structure. Pointers to entries for other offsets</div><div class='ctx'> should be calculated relative to "pte".</div><div class='ctx'> </div><div class='ctx'> 	-&gt;page_mkwrite() is called when a previously read-only pte is</div><div class='head'>diff --git a/Documentation/filesystems/afs.txt b/Documentation/filesystems/afs.txt<br/>index ffef91c4e0d6..060da408923b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/afs.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/afs.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/afs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/afs.txt</a></div><div class='hunk'>@@ -64,8 +64,7 @@ USAGE</div><div class='ctx'> When inserting the driver modules the root cell must be specified along with a</div><div class='ctx'> list of volume location server IP addresses:</div><div class='ctx'> </div><div class='del'>-	modprobe af_rxrpc</div><div class='del'>-	modprobe rxkad</div><div class='add'>+	modprobe rxrpc</div><div class='ctx'> 	modprobe kafs rootcell=cambridge.redhat.com:172.16.18.73:172.16.18.91</div><div class='ctx'> </div><div class='ctx'> The first module is the AF_RXRPC network protocol driver.  This provides the</div><div class='hunk'>@@ -214,34 +213,3 @@ If a file is opened with a particular key and then the file descriptor is</div><div class='ctx'> passed to a process that doesn't have that key (perhaps over an AF_UNIX</div><div class='ctx'> socket), then the operations on the file will be made with key that was used to</div><div class='ctx'> open the file.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-========</div><div class='del'>-EXAMPLES</div><div class='del'>-========</div><div class='del'>-</div><div class='del'>-Here's what I use to test this.  Some of the names and IP addresses are local</div><div class='del'>-to my internal DNS.  My "root.afs" partition has a mount point within it for</div><div class='del'>-some public volumes volumes.</div><div class='del'>-</div><div class='del'>-insmod /tmp/rxrpc.o</div><div class='del'>-insmod /tmp/rxkad.o</div><div class='del'>-insmod /tmp/kafs.o rootcell=cambridge.redhat.com:172.16.18.91</div><div class='del'>-</div><div class='del'>-mount -t afs \%root.afs. /afs</div><div class='del'>-mount -t afs \%cambridge.redhat.com:root.cell. /afs/cambridge.redhat.com/</div><div class='del'>-</div><div class='del'>-echo add grand.central.org 18.9.48.14:128.2.203.61:130.237.48.87 &gt; /proc/fs/afs/cells</div><div class='del'>-mount -t afs "#grand.central.org:root.cell." /afs/grand.central.org/</div><div class='del'>-mount -t afs "#grand.central.org:root.archive." /afs/grand.central.org/archive</div><div class='del'>-mount -t afs "#grand.central.org:root.contrib." /afs/grand.central.org/contrib</div><div class='del'>-mount -t afs "#grand.central.org:root.doc." /afs/grand.central.org/doc</div><div class='del'>-mount -t afs "#grand.central.org:root.project." /afs/grand.central.org/project</div><div class='del'>-mount -t afs "#grand.central.org:root.service." /afs/grand.central.org/service</div><div class='del'>-mount -t afs "#grand.central.org:root.software." /afs/grand.central.org/software</div><div class='del'>-mount -t afs "#grand.central.org:root.user." /afs/grand.central.org/user</div><div class='del'>-</div><div class='del'>-umount /afs</div><div class='del'>-rmmod kafs</div><div class='del'>-rmmod rxkad</div><div class='del'>-rmmod rxrpc</div><div class='head'>diff --git a/Documentation/filesystems/autofs4-mount-control.txt b/Documentation/filesystems/autofs4-mount-control.txt<br/>index 50a3e01a36f8..e5177cb31a04 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/autofs4-mount-control.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/autofs4-mount-control.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/autofs4-mount-control.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/autofs4-mount-control.txt</a></div><div class='hunk'>@@ -179,6 +179,7 @@ struct autofs_dev_ioctl {</div><div class='ctx'> 				 * including this struct */</div><div class='ctx'> 	__s32 ioctlfd;          /* automount command fd */</div><div class='ctx'> </div><div class='add'>+	/* Command parameters */</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct args_protover		protover;</div><div class='ctx'> 		struct args_protosubver		protosubver;</div><div class='head'>diff --git a/Documentation/filesystems/autofs4.txt b/Documentation/filesystems/autofs4.txt<br/>index 8fac3fe7b8c9..f10dd590f69f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/autofs4.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/autofs4.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/autofs4.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/autofs4.txt</a></div><div class='hunk'>@@ -65,7 +65,7 @@ directory is a mount trap only if the filesystem is mounted *direct*</div><div class='ctx'> and the root is empty.</div><div class='ctx'> </div><div class='ctx'> Directories created in the root directory are mount traps only if the</div><div class='del'>-filesystem is mounted  *indirect* and they are empty.</div><div class='add'>+filesystem is mounted *indirect* and they are empty.</div><div class='ctx'> </div><div class='ctx'> Directories further down the tree depend on the *maxproto* mount</div><div class='ctx'> option and particularly whether it is less than five or not.</div><div class='hunk'>@@ -352,7 +352,7 @@ Communicating with autofs: root directory ioctls</div><div class='ctx'> ------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> The root directory of an autofs filesystem will respond to a number of</div><div class='del'>-ioctls.   The process issuing the ioctl must have the CAP_SYS_ADMIN</div><div class='add'>+ioctls.  The process issuing the ioctl must have the CAP_SYS_ADMIN</div><div class='ctx'> capability, or must be the automount daemon.</div><div class='ctx'> </div><div class='ctx'> The available ioctl commands are:</div><div class='hunk'>@@ -425,8 +425,20 @@ Each ioctl is passed a pointer to an `autofs_dev_ioctl` structure:</div><div class='ctx'>                                          * including this struct */</div><div class='ctx'>                 __s32 ioctlfd;          /* automount command fd */</div><div class='ctx'> </div><div class='del'>-                __u32 arg1;             /* Command parameters */</div><div class='del'>-                __u32 arg2;</div><div class='add'>+		/* Command parameters */</div><div class='add'>+		union {</div><div class='add'>+			struct args_protover		protover;</div><div class='add'>+			struct args_protosubver		protosubver;</div><div class='add'>+			struct args_openmount		openmount;</div><div class='add'>+			struct args_ready		ready;</div><div class='add'>+			struct args_fail		fail;</div><div class='add'>+			struct args_setpipefd		setpipefd;</div><div class='add'>+			struct args_timeout		timeout;</div><div class='add'>+			struct args_requester		requester;</div><div class='add'>+			struct args_expire		expire;</div><div class='add'>+			struct args_askumount		askumount;</div><div class='add'>+			struct args_ismountpoint	ismountpoint;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='ctx'>                 char path[0];</div><div class='ctx'>         };</div><div class='hunk'>@@ -446,25 +458,22 @@ Commands are:</div><div class='ctx'>     set version numbers.</div><div class='ctx'> - **AUTOFS_DEV_IOCTL_OPENMOUNT_CMD**: return an open file descriptor</div><div class='ctx'>     on the root of an autofs filesystem.  The filesystem is identified</div><div class='del'>-    by name and device number, which is stored in `arg1`.  Device</div><div class='del'>-    numbers for existing filesystems can be found in</div><div class='add'>+    by name and device number, which is stored in `openmount.devid`.</div><div class='add'>+    Device numbers for existing filesystems can be found in</div><div class='ctx'>     `/proc/self/mountinfo`.</div><div class='ctx'> - **AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD**: same as `close(ioctlfd)`.</div><div class='ctx'> - **AUTOFS_DEV_IOCTL_SETPIPEFD_CMD**: if the filesystem is in</div><div class='ctx'>     catatonic mode, this can provide the write end of a new pipe</div><div class='del'>-    in `arg1` to re-establish communication with a daemon.  The</div><div class='del'>-    process group of the calling process is used to identify the</div><div class='add'>+    in `setpipefd.pipefd` to re-establish communication with a daemon.</div><div class='add'>+    The process group of the calling process is used to identify the</div><div class='ctx'>     daemon.</div><div class='ctx'> - **AUTOFS_DEV_IOCTL_REQUESTER_CMD**: `path` should be a</div><div class='ctx'>     name within the filesystem that has been auto-mounted on.</div><div class='del'>-    arg1 is the dev number of the underlying autofs.  On successful</div><div class='del'>-    return, `arg1` and `arg2` will be the UID and GID of the process</div><div class='del'>-    which triggered that mount.</div><div class='del'>-</div><div class='add'>+    On successful return, `requester.uid` and `requester.gid` will be</div><div class='add'>+    the UID and GID of the process which triggered that mount.</div><div class='ctx'> - **AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD**: Check if path is a</div><div class='ctx'>     mountpoint of a particular type - see separate documentation for</div><div class='ctx'>     details.</div><div class='del'>-</div><div class='ctx'> - **AUTOFS_DEV_IOCTL_PROTOVER_CMD**:</div><div class='ctx'> - **AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD**:</div><div class='ctx'> - **AUTOFS_DEV_IOCTL_READY_CMD**:</div><div class='hunk'>@@ -474,7 +483,7 @@ Commands are:</div><div class='ctx'> - **AUTOFS_DEV_IOCTL_EXPIRE_CMD**:</div><div class='ctx'> - **AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD**:  These all have the same</div><div class='ctx'>     function as the similarly named **AUTOFS_IOC** ioctls, except</div><div class='del'>-    that **FAIL** can be given an explicit error number in `arg1`</div><div class='add'>+    that **FAIL** can be given an explicit error number in `fail.status`</div><div class='ctx'>     instead of assuming `ENOENT`, and this **EXPIRE** command</div><div class='ctx'>     corresponds to **AUTOFS_IOC_EXPIRE_MULTI**.</div><div class='ctx'> </div><div class='hunk'>@@ -512,7 +521,7 @@ always be mounted "shared". e.g.</div><div class='ctx'> </div><div class='ctx'> &gt; `mount --make-shared /autofs/mount/point`</div><div class='ctx'> </div><div class='del'>-The automount daemon is only able to mange a single mount location for</div><div class='add'>+The automount daemon is only able to manage a single mount location for</div><div class='ctx'> an autofs filesystem and if mounts on that are not 'shared', other</div><div class='ctx'> locations will not behave as expected.  In particular access to those</div><div class='ctx'> other locations will likely result in the `ELOOP` error</div><div class='head'>diff --git a/Documentation/filesystems/ceph.txt b/Documentation/filesystems/ceph.txt<br/>index f5306ee40ea9..0b302a11718a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/ceph.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/ceph.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/ceph.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/ceph.txt</a></div><div class='hunk'>@@ -98,11 +98,10 @@ Mount Options</div><div class='ctx'> 	size.</div><div class='ctx'> </div><div class='ctx'>   rsize=X</div><div class='del'>-	Specify the maximum read size in bytes.  By default there is no</div><div class='del'>-	maximum.</div><div class='add'>+	Specify the maximum read size in bytes.  Default: 64 MB.</div><div class='ctx'> </div><div class='ctx'>   rasize=X</div><div class='del'>-	Specify the maximum readahead.</div><div class='add'>+	Specify the maximum readahead.  Default: 8 MB.</div><div class='ctx'> </div><div class='ctx'>   mount_timeout=X</div><div class='ctx'> 	Specify the timeout value for mount (in seconds), in the case</div><div class='head'>diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt<br/>index 8ec9136aae56..3828e85345ae 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/configfs/configfs.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/configfs/configfs.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/configfs/configfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/configfs/configfs.txt</a></div><div class='hunk'>@@ -174,7 +174,7 @@ among other things.  For that, it needs a type.</div><div class='ctx'> 		void (*release)(struct config_item *);</div><div class='ctx'> 		int (*allow_link)(struct config_item *src,</div><div class='ctx'> 				  struct config_item *target);</div><div class='del'>-		int (*drop_link)(struct config_item *src,</div><div class='add'>+		void (*drop_link)(struct config_item *src,</div><div class='ctx'> 				 struct config_item *target);</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/filesystems/dax.txt b/Documentation/filesystems/dax.txt<br/>index 23d18b8a49d5..a7e6e14aeb08 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/dax.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/dax.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/dax.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/dax.txt</a></div><div class='hunk'>@@ -58,22 +58,22 @@ Implementation Tips for Filesystem Writers</div><div class='ctx'> Filesystem support consists of</div><div class='ctx'> - adding support to mark inodes as being DAX by setting the S_DAX flag in</div><div class='ctx'>   i_flags</div><div class='del'>-- implementing the direct_IO address space operation, and calling</div><div class='del'>-  dax_do_io() instead of blockdev_direct_IO() if S_DAX is set</div><div class='add'>+- implementing -&gt;read_iter and -&gt;write_iter operations which use dax_iomap_rw()</div><div class='add'>+  when inode has S_DAX flag set</div><div class='ctx'> - implementing an mmap file operation for DAX files which sets the</div><div class='ctx'>   VM_MIXEDMAP and VM_HUGEPAGE flags on the VMA, and setting the vm_ops to</div><div class='del'>-  include handlers for fault, pmd_fault and page_mkwrite (which should</div><div class='del'>-  probably call dax_fault(), dax_pmd_fault() and dax_mkwrite(), passing the</div><div class='del'>-  appropriate get_block() callback)</div><div class='del'>-- calling dax_truncate_page() instead of block_truncate_page() for DAX files</div><div class='del'>-- calling dax_zero_page_range() instead of zero_user() for DAX files</div><div class='add'>+  include handlers for fault, pmd_fault, page_mkwrite, pfn_mkwrite. These</div><div class='add'>+  handlers should probably call dax_iomap_fault() (for fault and page_mkwrite</div><div class='add'>+  handlers), dax_iomap_pmd_fault(), dax_pfn_mkwrite() passing the appropriate</div><div class='add'>+  iomap operations.</div><div class='add'>+- calling iomap_zero_range() passing appropriate iomap operations instead of</div><div class='add'>+  block_truncate_page() for DAX files</div><div class='ctx'> - ensuring that there is sufficient locking between reads, writes,</div><div class='ctx'>   truncates and page faults</div><div class='ctx'> </div><div class='del'>-The get_block() callback passed to the DAX functions may return</div><div class='del'>-uninitialised extents.  If it does, it must ensure that simultaneous</div><div class='del'>-calls to get_block() (for example by a page-fault racing with a read()</div><div class='del'>-or a write()) work correctly.</div><div class='add'>+The iomap handlers for allocating blocks must make sure that allocated blocks</div><div class='add'>+are zeroed out and converted to written extents before being returned to avoid</div><div class='add'>+exposure of uninitialized data through mmap.</div><div class='ctx'> </div><div class='ctx'> These filesystems may be used for inspiration:</div><div class='ctx'> - ext2: see Documentation/filesystems/ext2.txt</div><div class='head'>diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt<br/>index 6c0108eb0137..3698ed3146e3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/ext4.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/ext4.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/ext4.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/ext4.txt</a></div><div class='hunk'>@@ -351,14 +351,13 @@ nouid32			Disables 32-bit UIDs and GIDs.  This is for</div><div class='ctx'> 			interoperability  with  older kernels which only</div><div class='ctx'> 			store and expect 16-bit values.</div><div class='ctx'> </div><div class='del'>-block_validity		This options allows to enables/disables the in-kernel</div><div class='add'>+block_validity(*)	These options enable or disable the in-kernel</div><div class='ctx'> noblock_validity	facility for tracking filesystem metadata blocks</div><div class='del'>-			within internal data structures. This allows multi-</div><div class='del'>-			block allocator and other routines to quickly locate</div><div class='del'>-			extents which might overlap with filesystem metadata</div><div class='del'>-			blocks. This option is intended for debugging</div><div class='del'>-			purposes and since it negatively affects the</div><div class='del'>-			performance, it is off by default.</div><div class='add'>+			within internal data structures.  This allows multi-</div><div class='add'>+			block allocator and other routines to notice</div><div class='add'>+			bugs or corrupted allocation bitmaps which cause</div><div class='add'>+			blocks to be allocated which overlap with</div><div class='add'>+			filesystem metadata blocks.</div><div class='ctx'> </div><div class='ctx'> dioread_lock		Controls whether or not ext4 should use the DIO read</div><div class='ctx'> dioread_nolock		locking. If the dioread_nolock option is specified</div><div class='head'>diff --git a/Documentation/filesystems/f2fs.txt b/Documentation/filesystems/f2fs.txt<br/>index 753dd4f96afe..4f6531a4701b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/f2fs.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/f2fs.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/f2fs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/f2fs.txt</a></div><div class='hunk'>@@ -125,13 +125,14 @@ active_logs=%u         Support configuring the number of active logs. In the</div><div class='ctx'> disable_ext_identify   Disable the extension list configured by mkfs, so f2fs</div><div class='ctx'>                        does not aware of cold files such as media files.</div><div class='ctx'> inline_xattr           Enable the inline xattrs feature.</div><div class='add'>+noinline_xattr         Disable the inline xattrs feature.</div><div class='ctx'> inline_data            Enable the inline data feature: New created small(&lt;~3.4k)</div><div class='ctx'>                        files can be written into inode block.</div><div class='ctx'> inline_dentry          Enable the inline dir feature: data in new created</div><div class='ctx'>                        directory entries can be written into inode block. The</div><div class='ctx'>                        space of inode block which is used to store inline</div><div class='ctx'>                        dentries is limited to ~3.4k.</div><div class='del'>-noinline_dentry        Diable the inline dentry feature.</div><div class='add'>+noinline_dentry        Disable the inline dentry feature.</div><div class='ctx'> flush_merge	       Merge concurrent cache_flush commands as much as possible</div><div class='ctx'>                        to eliminate redundant command issues. If the underlying</div><div class='ctx'> 		       device handles the cache_flush command relatively slowly,</div><div class='hunk'>@@ -157,6 +158,8 @@ data_flush             Enable data flushing before checkpoint in order to</div><div class='ctx'> mode=%s                Control block allocation mode which supports "adaptive"</div><div class='ctx'>                        and "lfs". In "lfs" mode, there should be no random</div><div class='ctx'>                        writes towards main area.</div><div class='add'>+io_bits=%u             Set the bit size of write IO requests. It should be set</div><div class='add'>+                       with "mode=lfs".</div><div class='ctx'> </div><div class='ctx'> ================================================================================</div><div class='ctx'> DEBUGFS ENTRIES</div><div class='hunk'>@@ -174,7 +177,7 @@ f2fs. Each file shows the whole f2fs information.</div><div class='ctx'> SYSFS ENTRIES</div><div class='ctx'> ================================================================================</div><div class='ctx'> </div><div class='del'>-Information about mounted f2f2 file systems can be found in</div><div class='add'>+Information about mounted f2fs file systems can be found in</div><div class='ctx'> /sys/fs/f2fs.  Each mounted filesystem will have a directory in</div><div class='ctx'> /sys/fs/f2fs based on its device name (i.e., /sys/fs/f2fs/sda).</div><div class='ctx'> The files in each per-device directory are shown in table below.</div><div class='head'>diff --git a/Documentation/filesystems/locks.txt b/Documentation/filesystems/locks.txt<br/>index 2cf81082581d..5368690f412e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/locks.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/locks.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/locks.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/locks.txt</a></div><div class='hunk'>@@ -19,7 +19,7 @@ forever.</div><div class='ctx'> </div><div class='ctx'> This should not cause problems for anybody, since everybody using a</div><div class='ctx'> 2.1.x kernel should have updated their C library to a suitable version</div><div class='del'>-anyway (see the file "Documentation/Changes".)</div><div class='add'>+anyway (see the file "Documentation/process/changes.rst".)</div><div class='ctx'> </div><div class='ctx'> 1.2 Allow Mixed Locks Again</div><div class='ctx'> ---------------------------</div><div class='head'>diff --git a/Documentation/filesystems/logfs.txt b/Documentation/filesystems/logfs.txt<br/>deleted file mode 100644<br/>index bca42c22a143..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/logfs.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/logfs.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,241 +0,0 @@</div><div class='del'>-</div><div class='del'>-The LogFS Flash Filesystem</div><div class='del'>-==========================</div><div class='del'>-</div><div class='del'>-Specification</div><div class='del'>-=============</div><div class='del'>-</div><div class='del'>-Superblocks</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-Two superblocks exist at the beginning and end of the filesystem.</div><div class='del'>-Each superblock is 256 Bytes large, with another 3840 Bytes reserved</div><div class='del'>-for future purposes, making a total of 4096 Bytes.</div><div class='del'>-</div><div class='del'>-Superblock locations may differ for MTD and block devices.  On MTD the</div><div class='del'>-first non-bad block contains a superblock in the first 4096 Bytes and</div><div class='del'>-the last non-bad block contains a superblock in the last 4096 Bytes.</div><div class='del'>-On block devices, the first 4096 Bytes of the device contain the first</div><div class='del'>-superblock and the last aligned 4096 Byte-block contains the second</div><div class='del'>-superblock.</div><div class='del'>-</div><div class='del'>-For the most part, the superblocks can be considered read-only.  They</div><div class='del'>-are written only to correct errors detected within the superblocks,</div><div class='del'>-move the journal and change the filesystem parameters through tunefs.</div><div class='del'>-As a result, the superblock does not contain any fields that require</div><div class='del'>-constant updates, like the amount of free space, etc.</div><div class='del'>-</div><div class='del'>-Segments</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-The space in the device is split up into equal-sized segments.</div><div class='del'>-Segments are the primary write unit of LogFS.  Within each segments,</div><div class='del'>-writes happen from front (low addresses) to back (high addresses.  If</div><div class='del'>-only a partial segment has been written, the segment number, the</div><div class='del'>-current position within and optionally a write buffer are stored in</div><div class='del'>-the journal.</div><div class='del'>-</div><div class='del'>-Segments are erased as a whole.  Therefore Garbage Collection may be</div><div class='del'>-required to completely free a segment before doing so.</div><div class='del'>-</div><div class='del'>-Journal</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-The journal contains all global information about the filesystem that</div><div class='del'>-is subject to frequent change.  At mount time, it has to be scanned</div><div class='del'>-for the most recent commit entry, which contains a list of pointers to</div><div class='del'>-all currently valid entries.</div><div class='del'>-</div><div class='del'>-Object Store</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-All space except for the superblocks and journal is part of the object</div><div class='del'>-store.  Each segment contains a segment header and a number of</div><div class='del'>-objects, each consisting of the object header and the payload.</div><div class='del'>-Objects are either inodes, directory entries (dentries), file data</div><div class='del'>-blocks or indirect blocks.</div><div class='del'>-</div><div class='del'>-Levels</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-Garbage collection (GC) may fail if all data is written</div><div class='del'>-indiscriminately.  One requirement of GC is that data is separated</div><div class='del'>-roughly according to the distance between the tree root and the data.</div><div class='del'>-Effectively that means all file data is on level 0, indirect blocks</div><div class='del'>-are on levels 1, 2, 3 4 or 5 for 1x, 2x, 3x, 4x or 5x indirect blocks,</div><div class='del'>-respectively.  Inode file data is on level 6 for the inodes and 7-11</div><div class='del'>-for indirect blocks.</div><div class='del'>-</div><div class='del'>-Each segment contains objects of a single level only.  As a result,</div><div class='del'>-each level requires its own separate segment to be open for writing.</div><div class='del'>-</div><div class='del'>-Inode File</div><div class='del'>-----------</div><div class='del'>-</div><div class='del'>-All inodes are stored in a special file, the inode file.  Single</div><div class='del'>-exception is the inode file's inode (master inode) which for obvious</div><div class='del'>-reasons is stored in the journal instead.  Instead of data blocks, the</div><div class='del'>-leaf nodes of the inode files are inodes.</div><div class='del'>-</div><div class='del'>-Aliases</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-Writes in LogFS are done by means of a wandering tree.  A naïve</div><div class='del'>-implementation would require that for each write or a block, all</div><div class='del'>-parent blocks are written as well, since the block pointers have</div><div class='del'>-changed.  Such an implementation would not be very efficient.</div><div class='del'>-</div><div class='del'>-In LogFS, the block pointer changes are cached in the journal by means</div><div class='del'>-of alias entries.  Each alias consists of its logical address - inode</div><div class='del'>-number, block index, level and child number (index into block) - and</div><div class='del'>-the changed data.  Any 8-byte word can be changes in this manner.</div><div class='del'>-</div><div class='del'>-Currently aliases are used for block pointers, file size, file used</div><div class='del'>-bytes and the height of an inodes indirect tree.</div><div class='del'>-</div><div class='del'>-Segment Aliases</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-Related to regular aliases, these are used to handle bad blocks.</div><div class='del'>-Initially, bad blocks are handled by moving the affected segment</div><div class='del'>-content to a spare segment and noting this move in the journal with a</div><div class='del'>-segment alias, a simple (to, from) tupel.  GC will later empty this</div><div class='del'>-segment and the alias can be removed again.  This is used on MTD only.</div><div class='del'>-</div><div class='del'>-Vim</div><div class='del'>----</div><div class='del'>-</div><div class='del'>-By cleverly predicting the life time of data, it is possible to</div><div class='del'>-separate long-living data from short-living data and thereby reduce</div><div class='del'>-the GC overhead later.  Each type of distinc life expectency (vim) can</div><div class='del'>-have a separate segment open for writing.  Each (level, vim) tupel can</div><div class='del'>-be open just once.  If an open segment with unknown vim is encountered</div><div class='del'>-at mount time, it is closed and ignored henceforth.</div><div class='del'>-</div><div class='del'>-Indirect Tree</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-Inodes in LogFS are similar to FFS-style filesystems with direct and</div><div class='del'>-indirect block pointers.  One difference is that LogFS uses a single</div><div class='del'>-indirect pointer that can be either a 1x, 2x, etc. indirect pointer.</div><div class='del'>-A height field in the inode defines the height of the indirect tree</div><div class='del'>-and thereby the indirection of the pointer.</div><div class='del'>-</div><div class='del'>-Another difference is the addressing of indirect blocks.  In LogFS,</div><div class='del'>-the first 16 pointers in the first indirect block are left empty,</div><div class='del'>-corresponding to the 16 direct pointers in the inode.  In ext2 (maybe</div><div class='del'>-others as well) the first pointer in the first indirect block</div><div class='del'>-corresponds to logical block 12, skipping the 12 direct pointers.</div><div class='del'>-So where ext2 is using arithmetic to better utilize space, LogFS keeps</div><div class='del'>-arithmetic simple and uses compression to save space.</div><div class='del'>-</div><div class='del'>-Compression</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-Both file data and metadata can be compressed.  Compression for file</div><div class='del'>-data can be enabled with chattr +c and disabled with chattr -c.  Doing</div><div class='del'>-so has no effect on existing data, but new data will be stored</div><div class='del'>-accordingly.  New inodes will inherit the compression flag of the</div><div class='del'>-parent directory.</div><div class='del'>-</div><div class='del'>-Metadata is always compressed.  However, the space accounting ignores</div><div class='del'>-this and charges for the uncompressed size.  Failing to do so could</div><div class='del'>-result in GC failures when, after moving some data, indirect blocks</div><div class='del'>-compress worse than previously.  Even on a 100% full medium, GC may</div><div class='del'>-not consume any extra space, so the compression gains are lost space</div><div class='del'>-to the user.</div><div class='del'>-</div><div class='del'>-However, they are not lost space to the filesystem internals.  By</div><div class='del'>-cheating the user for those bytes, the filesystem gained some slack</div><div class='del'>-space and GC will run less often and faster.</div><div class='del'>-</div><div class='del'>-Garbage Collection and Wear Leveling</div><div class='del'>-------------------------------------</div><div class='del'>-</div><div class='del'>-Garbage collection is invoked whenever the number of free segments</div><div class='del'>-falls below a threshold.  The best (known) candidate is picked based</div><div class='del'>-on the least amount of valid data contained in the segment.  All</div><div class='del'>-remaining valid data is copied elsewhere, thereby invalidating it.</div><div class='del'>-</div><div class='del'>-The GC code also checks for aliases and writes then back if their</div><div class='del'>-number gets too large.</div><div class='del'>-</div><div class='del'>-Wear leveling is done by occasionally picking a suboptimal segment for</div><div class='del'>-garbage collection.  If a stale segments erase count is significantly</div><div class='del'>-lower than the active segments' erase counts, it will be picked.  Wear</div><div class='del'>-leveling is rate limited, so it will never monopolize the device for</div><div class='del'>-more than one segment worth at a time.</div><div class='del'>-</div><div class='del'>-Values for "occasionally", "significantly lower" are compile time</div><div class='del'>-constants.</div><div class='del'>-</div><div class='del'>-Hashed directories</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-To satisfy efficient lookup(), directory entries are hashed and</div><div class='del'>-located based on the hash.  In order to both support large directories</div><div class='del'>-and not be overly inefficient for small directories, several hash</div><div class='del'>-tables of increasing size are used.  For each table, the hash value</div><div class='del'>-modulo the table size gives the table index.</div><div class='del'>-</div><div class='del'>-Tables sizes are chosen to limit the number of indirect blocks with a</div><div class='del'>-fully populated table to 0, 1, 2 or 3 respectively.  So the first</div><div class='del'>-table contains 16 entries, the second 512-16, etc.</div><div class='del'>-</div><div class='del'>-The last table is special in several ways.  First its size depends on</div><div class='del'>-the effective 32bit limit on telldir/seekdir cookies.  Since logfs</div><div class='del'>-uses the upper half of the address space for indirect blocks, the size</div><div class='del'>-is limited to 2^31.  Secondly the table contains hash buckets with 16</div><div class='del'>-entries each.</div><div class='del'>-</div><div class='del'>-Using single-entry buckets would result in birthday "attacks".  At</div><div class='del'>-just 2^16 used entries, hash collisions would be likely (P &gt;= 0.5).</div><div class='del'>-My math skills are insufficient to do the combinatorics for the 17x</div><div class='del'>-collisions necessary to overflow a bucket, but testing showed that in</div><div class='del'>-10,000 runs the lowest directory fill before a bucket overflow was</div><div class='del'>-188,057,130 entries with an average of 315,149,915 entries.  So for</div><div class='del'>-directory sizes of up to a million, bucket overflows should be</div><div class='del'>-virtually impossible under normal circumstances.</div><div class='del'>-</div><div class='del'>-With carefully chosen filenames, it is obviously possible to cause an</div><div class='del'>-overflow with just 21 entries (4 higher tables + 16 entries + 1).  So</div><div class='del'>-there may be a security concern if a malicious user has write access</div><div class='del'>-to a directory.</div><div class='del'>-</div><div class='del'>-Open For Discussion</div><div class='del'>-===================</div><div class='del'>-</div><div class='del'>-Device Address Space</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-A device address space is used for caching.  Both block devices and</div><div class='del'>-MTD provide functions to either read a single page or write a segment.</div><div class='del'>-Partial segments may be written for data integrity, but where possible</div><div class='del'>-complete segments are written for performance on simple block device</div><div class='del'>-flash media.</div><div class='del'>-</div><div class='del'>-Meta Inodes</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-Inodes are stored in the inode file, which is just a regular file for</div><div class='del'>-most purposes.  At umount time, however, the inode file needs to</div><div class='del'>-remain open until all dirty inodes are written.  So</div><div class='del'>-generic_shutdown_super() may not close this inode, but shouldn't</div><div class='del'>-complain about remaining inodes due to the inode file either.  Same</div><div class='del'>-goes for mapping inode of the device address space.</div><div class='del'>-</div><div class='del'>-Currently logfs uses a hack that essentially copies part of fs/inode.c</div><div class='del'>-code over.  A general solution would be preferred.</div><div class='del'>-</div><div class='del'>-Indirect block mapping</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-With compression, the block device (or mapping inode) cannot be used</div><div class='del'>-to cache indirect blocks.  Some other place is required.  Currently</div><div class='del'>-logfs uses the top half of each inode's address space.  The low 8TB</div><div class='del'>-(on 32bit) are filled with file data, the high 8TB are used for</div><div class='del'>-indirect blocks.</div><div class='del'>-</div><div class='del'>-One problem is that 16TB files created on 64bit systems actually have</div><div class='del'>-data in the top 8TB.  But files &gt;16TB would cause problems anyway, so</div><div class='del'>-only the limit has changed.</div><div class='head'>diff --git a/Documentation/filesystems/nfs/nfsroot.txt b/Documentation/filesystems/nfs/nfsroot.txt<br/>index 0b2883b17d4c..5efae00f6c7f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/nfs/nfsroot.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/nfs/nfsroot.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/nfs/nfsroot.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/nfs/nfsroot.txt</a></div><div class='hunk'>@@ -11,7 +11,7 @@ Updated 2006 by Horms &lt;horms@verge.net.au&gt;</div><div class='ctx'> In order to use a diskless system, such as an X-terminal or printer server</div><div class='ctx'> for example, it is necessary for the root filesystem to be present on a</div><div class='ctx'> non-disk device. This may be an initramfs (see Documentation/filesystems/</div><div class='del'>-ramfs-rootfs-initramfs.txt), a ramdisk (see Documentation/initrd.txt) or a</div><div class='add'>+ramfs-rootfs-initramfs.txt), a ramdisk (see Documentation/admin-guide/initrd.rst) or a</div><div class='ctx'> filesystem mounted via NFS. The following text describes on how to use NFS</div><div class='ctx'> for the root filesystem. For the rest of this text 'client' means the</div><div class='ctx'> diskless system, and 'server' means the NFS server.</div><div class='hunk'>@@ -284,7 +284,7 @@ They depend on various facilities being available:</div><div class='ctx'> 	"kernel &lt;relative-path-below /tftpboot&gt;". The nfsroot parameters</div><div class='ctx'> 	are passed to the kernel by adding them to the "append" line.</div><div class='ctx'> 	It is common to use serial console in conjunction with pxeliunx,</div><div class='del'>-	see Documentation/serial-console.txt for more information.</div><div class='add'>+	see Documentation/admin-guide/serial-console.rst for more information.</div><div class='ctx'> </div><div class='ctx'> 	For more information on isolinux, including how to create bootdisks</div><div class='ctx'> 	for prebuilt kernels, see http://syslinux.zytor.com/</div><div class='head'>diff --git a/Documentation/filesystems/overlayfs.txt b/Documentation/filesystems/overlayfs.txt<br/>index bcbf9710e4af..634d03e20c2d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/overlayfs.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/overlayfs.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/overlayfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/overlayfs.txt</a></div><div class='hunk'>@@ -66,7 +66,7 @@ At mount time, the two directories given as mount options "lowerdir" and</div><div class='ctx'> "upperdir" are combined into a merged directory:</div><div class='ctx'> </div><div class='ctx'>   mount -t overlay overlay -olowerdir=/lower,upperdir=/upper,\</div><div class='del'>-workdir=/work /merged</div><div class='add'>+  workdir=/work /merged</div><div class='ctx'> </div><div class='ctx'> The "workdir" needs to be an empty directory on the same filesystem</div><div class='ctx'> as upperdir.</div><div class='hunk'>@@ -118,6 +118,7 @@ programs.</div><div class='ctx'> </div><div class='ctx'> seek offsets are assigned sequentially when the directories are read.</div><div class='ctx'> Thus if</div><div class='add'>+</div><div class='ctx'>   - read part of a directory</div><div class='ctx'>   - remember an offset, and close the directory</div><div class='ctx'>   - re-open the directory some time later</div><div class='hunk'>@@ -130,6 +131,23 @@ directory.</div><div class='ctx'> Readdir on directories that are not merged is simply handled by the</div><div class='ctx'> underlying directory (upper or lower).</div><div class='ctx'> </div><div class='add'>+renaming directories</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+When renaming a directory that is on the lower layer or merged (i.e. the</div><div class='add'>+directory was not created on the upper layer to start with) overlayfs can</div><div class='add'>+handle it in two different ways:</div><div class='add'>+</div><div class='add'>+1. return EXDEV error: this error is returned by rename(2) when trying to</div><div class='add'>+   move a file or directory across filesystem boundaries.  Hence</div><div class='add'>+   applications are usually prepared to hande this error (mv(1) for example</div><div class='add'>+   recursively copies the directory tree).  This is the default behavior.</div><div class='add'>+</div><div class='add'>+2. If the "redirect_dir" feature is enabled, then the directory will be</div><div class='add'>+   copied up (but not the contents).  Then the "trusted.overlay.redirect"</div><div class='add'>+   extended attribute is set to the path of the original location from the</div><div class='add'>+   root of the overlay.  Finally the directory is moved to the new</div><div class='add'>+   location.</div><div class='ctx'> </div><div class='ctx'> Non-directories</div><div class='ctx'> ---------------</div><div class='hunk'>@@ -185,13 +203,13 @@ filesystem, so both st_dev and st_ino of the file may change.</div><div class='ctx'> </div><div class='ctx'> Any open files referring to this inode will access the old data.</div><div class='ctx'> </div><div class='del'>-Any file locks (and leases) obtained before copy_up will not apply</div><div class='del'>-to the copied up file.</div><div class='del'>-</div><div class='ctx'> If a file with multiple hard links is copied up, then this will</div><div class='ctx'> "break" the link.  Changes will not be propagated to other names</div><div class='ctx'> referring to the same inode.</div><div class='ctx'> </div><div class='add'>+Unless "redirect_dir" feature is enabled, rename(2) on a lower or merged</div><div class='add'>+directory will fail with EXDEV.</div><div class='add'>+</div><div class='ctx'> Changes to underlying filesystems</div><div class='ctx'> ---------------------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting<br/>index bdd025ceb763..95280079c0b3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/porting?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/porting</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/porting?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/porting</a></div><div class='hunk'>@@ -596,3 +596,7 @@ in your dentry operations instead.</div><div class='ctx'> [mandatory]</div><div class='ctx'> 	-&gt;rename() has an added flags argument.  Any flags not handled by the</div><div class='ctx'>         filesystem should result in EINVAL being returned.</div><div class='add'>+--</div><div class='add'>+[recommended]</div><div class='add'>+	-&gt;readlink is optional for symlinks.  Don't set, unless filesystem needs</div><div class='add'>+	to fake something for readlink(2).</div><div class='head'>diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt<br/>index 74329fd0add2..c94b4675d021 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/proc.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/proc.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/proc.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/proc.txt</a></div><div class='hunk'>@@ -191,6 +191,7 @@ read the file /proc/PID/status:</div><div class='ctx'>   CapPrm: 0000000000000000</div><div class='ctx'>   CapEff: 0000000000000000</div><div class='ctx'>   CapBnd: ffffffffffffffff</div><div class='add'>+  NoNewPrivs:     0</div><div class='ctx'>   Seccomp:        0</div><div class='ctx'>   voluntary_ctxt_switches:        0</div><div class='ctx'>   nonvoluntary_ctxt_switches:     1</div><div class='hunk'>@@ -211,10 +212,11 @@ asynchronous manner and the value may not be very precise. To see a precise</div><div class='ctx'> snapshot of a moment, you can see /proc/&lt;pid&gt;/smaps file and scan page table.</div><div class='ctx'> It's slow but very precise.</div><div class='ctx'> </div><div class='del'>-Table 1-2: Contents of the status files (as of 4.1)</div><div class='add'>+Table 1-2: Contents of the status files (as of 4.8)</div><div class='ctx'> ..............................................................................</div><div class='ctx'>  Field                       Content</div><div class='ctx'>  Name                        filename of the executable</div><div class='add'>+ Umask                       file mode creation mask</div><div class='ctx'>  State                       state (R is running, S is sleeping, D is sleeping</div><div class='ctx'>                              in an uninterruptible wait, Z is zombie,</div><div class='ctx'> 			     T is traced or stopped)</div><div class='hunk'>@@ -225,7 +227,6 @@ Table 1-2: Contents of the status files (as of 4.1)</div><div class='ctx'>  TracerPid                   PID of process tracing this process (0 if not)</div><div class='ctx'>  Uid                         Real, effective, saved set, and  file system UIDs</div><div class='ctx'>  Gid                         Real, effective, saved set, and  file system GIDs</div><div class='del'>- Umask                       file mode creation mask</div><div class='ctx'>  FDSize                      number of file descriptor slots currently allocated</div><div class='ctx'>  Groups                      supplementary group list</div><div class='ctx'>  NStgid                      descendant namespace thread group ID hierarchy</div><div class='hunk'>@@ -235,6 +236,7 @@ Table 1-2: Contents of the status files (as of 4.1)</div><div class='ctx'>  VmPeak                      peak virtual memory size</div><div class='ctx'>  VmSize                      total program size</div><div class='ctx'>  VmLck                       locked memory size</div><div class='add'>+ VmPin                       pinned memory size</div><div class='ctx'>  VmHWM                       peak resident set size ("high water mark")</div><div class='ctx'>  VmRSS                       size of memory portions. It contains the three</div><div class='ctx'>                              following parts (VmRSS = RssAnon + RssFile + RssShmem)</div><div class='hunk'>@@ -262,6 +264,7 @@ Table 1-2: Contents of the status files (as of 4.1)</div><div class='ctx'>  CapPrm                      bitmap of permitted capabilities</div><div class='ctx'>  CapEff                      bitmap of effective capabilities</div><div class='ctx'>  CapBnd                      bitmap of capabilities bounding set</div><div class='add'>+ NoNewPrivs                  no_new_privs, like prctl(PR_GET_NO_NEW_PRIV, ...)</div><div class='ctx'>  Seccomp                     seccomp mode, like prctl(PR_GET_SECCOMP, ...)</div><div class='ctx'>  Cpus_allowed                mask of CPUs on which this process may run</div><div class='ctx'>  Cpus_allowed_list           Same as previous, but in "list format"</div><div class='hunk'>@@ -1305,7 +1308,16 @@ second).  The meanings of the columns are as follows, from left to right:</div><div class='ctx'> - nice: niced processes executing in user mode</div><div class='ctx'> - system: processes executing in kernel mode</div><div class='ctx'> - idle: twiddling thumbs</div><div class='del'>-- iowait: waiting for I/O to complete</div><div class='add'>+- iowait: In a word, iowait stands for waiting for I/O to complete. But there</div><div class='add'>+  are several problems:</div><div class='add'>+  1. Cpu will not wait for I/O to complete, iowait is the time that a task is</div><div class='add'>+     waiting for I/O to complete. When cpu goes into idle state for</div><div class='add'>+     outstanding task io, another task will be scheduled on this CPU.</div><div class='add'>+  2. In a multi-core CPU, the task waiting for I/O to complete is not running</div><div class='add'>+     on any CPU, so the iowait of each CPU is difficult to calculate.</div><div class='add'>+  3. The value of iowait field in /proc/stat will decrease in certain</div><div class='add'>+     conditions.</div><div class='add'>+  So, the iowait is not reliable by reading from /proc/stat.</div><div class='ctx'> - irq: servicing interrupts</div><div class='ctx'> - softirq: servicing softirqs</div><div class='ctx'> - steal: involuntary wait</div><div class='head'>diff --git a/Documentation/filesystems/quota.txt b/Documentation/filesystems/quota.txt<br/>index 29fc01552646..32874b06ebe9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/quota.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/quota.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/quota.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/quota.txt</a></div><div class='hunk'>@@ -6,7 +6,7 @@ Quota subsystem allows system administrator to set limits on used space and</div><div class='ctx'> number of used inodes (inode is a filesystem structure which is associated with</div><div class='ctx'> each file or directory) for users and/or groups. For both used space and number</div><div class='ctx'> of used inodes there are actually two limits. The first one is called softlimit</div><div class='del'>-and the second one hardlimit.  An user can never exceed a hardlimit for any</div><div class='add'>+and the second one hardlimit.  A user can never exceed a hardlimit for any</div><div class='ctx'> resource (unless he has CAP_SYS_RESOURCE capability). User is allowed to exceed</div><div class='ctx'> softlimit but only for limited period of time. This period is called "grace</div><div class='ctx'> period" or "grace time". When grace time is over, user is not able to allocate</div><div class='head'>diff --git a/Documentation/filesystems/sysfs-pci.txt b/Documentation/filesystems/sysfs-pci.txt<br/>index 74eaac26f8b8..6ea1ceda6f52 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/sysfs-pci.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/sysfs-pci.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/sysfs-pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/sysfs-pci.txt</a></div><div class='hunk'>@@ -17,6 +17,7 @@ that support it.  For example, a given bus might look like this:</div><div class='ctx'>      |   |-- resource0</div><div class='ctx'>      |   |-- resource1</div><div class='ctx'>      |   |-- resource2</div><div class='add'>+     |   |-- revision</div><div class='ctx'>      |   |-- rom</div><div class='ctx'>      |   |-- subsystem_device</div><div class='ctx'>      |   |-- subsystem_vendor</div><div class='hunk'>@@ -41,6 +42,7 @@ files, each with their own function.</div><div class='ctx'>        resource		   PCI resource host addresses (ascii, ro)</div><div class='ctx'>        resource0..N	   PCI resource N, if present (binary, mmap, rw[1])</div><div class='ctx'>        resource0_wc..N_wc  PCI WC map resource N, if prefetchable (binary, mmap)</div><div class='add'>+       revision		   PCI revision (ascii, ro)</div><div class='ctx'>        rom		   PCI ROM resource, if present (binary, ro)</div><div class='ctx'>        subsystem_device	   PCI subsystem device (ascii, ro)</div><div class='ctx'>        subsystem_vendor	   PCI subsystem vendor (ascii, ro)</div><div class='head'>diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt<br/>index b5039a00caaf..569211703721 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/vfs.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/vfs.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/vfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/vfs.txt</a></div><div class='hunk'>@@ -382,7 +382,8 @@ struct inode_operations {</div><div class='ctx'> 	int (*permission) (struct inode *, int);</div><div class='ctx'> 	int (*get_acl)(struct inode *, int);</div><div class='ctx'> 	int (*setattr) (struct dentry *, struct iattr *);</div><div class='del'>-	int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);</div><div class='add'>+	int (*getattr) (const struct path *, struct dentry *, struct kstat *,</div><div class='add'>+			u32, unsigned int);</div><div class='ctx'> 	ssize_t (*listxattr) (struct dentry *, char *, size_t);</div><div class='ctx'> 	void (*update_time)(struct inode *, struct timespec *, int);</div><div class='ctx'> 	int (*atomic_open)(struct inode *, struct dentry *, struct file *,</div><div class='hunk'>@@ -451,9 +452,6 @@ otherwise noted.</div><div class='ctx'> 	exist; this is checked by the VFS.  Unlike plain rename,</div><div class='ctx'> 	source and target may be of different type.</div><div class='ctx'> </div><div class='del'>-  readlink: called by the readlink(2) system call. Only required if</div><div class='del'>-	you want to support reading symbolic links</div><div class='del'>-</div><div class='ctx'>   get_link: called by the VFS to follow a symbolic link to the</div><div class='ctx'> 	inode it points to.  Only required if you want to support</div><div class='ctx'> 	symbolic links.  This method returns the symlink body</div><div class='hunk'>@@ -468,6 +466,12 @@ otherwise noted.</div><div class='ctx'> 	argument.  If request can't be handled without leaving RCU mode,</div><div class='ctx'> 	have it return ERR_PTR(-ECHILD).</div><div class='ctx'> </div><div class='add'>+  readlink: this is now just an override for use by readlink(2) for the</div><div class='add'>+	cases when -&gt;get_link uses nd_jump_link() or object is not in</div><div class='add'>+	fact a symlink.  Normally filesystems should only implement</div><div class='add'>+	-&gt;get_link for symlinks and readlink(2) will automatically use</div><div class='add'>+	that.</div><div class='add'>+</div><div class='ctx'>   permission: called by the VFS to check for access rights on a POSIX-like</div><div class='ctx'>   	filesystem.</div><div class='ctx'> </div><div class='hunk'>@@ -948,7 +952,7 @@ struct dentry_operations {</div><div class='ctx'> 	void (*d_iput)(struct dentry *, struct inode *);</div><div class='ctx'> 	char *(*d_dname)(struct dentry *, char *, int);</div><div class='ctx'> 	struct vfsmount *(*d_automount)(struct path *);</div><div class='del'>-	int (*d_manage)(struct dentry *, bool);</div><div class='add'>+	int (*d_manage)(const struct path *, bool);</div><div class='ctx'> 	struct dentry *(*d_real)(struct dentry *, const struct inode *,</div><div class='ctx'> 				 unsigned int);</div><div class='ctx'> };</div><div class='head'>diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt<br/>index c2d44e6e117b..3b9b5c149f32 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/filesystems/xfs.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/filesystems/xfs.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/filesystems/xfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/filesystems/xfs.txt</a></div><div class='hunk'>@@ -51,13 +51,6 @@ default behaviour.</div><div class='ctx'> 	CRC enabled filesystems always use the attr2 format, and so</div><div class='ctx'> 	will reject the noattr2 mount option if it is set.</div><div class='ctx'> </div><div class='del'>-  barrier (*)</div><div class='del'>-  nobarrier</div><div class='del'>-	Enables/disables the use of block layer write barriers for</div><div class='del'>-	writes into the journal and for data integrity operations.</div><div class='del'>-	This allows for drive level write caching to be enabled, for</div><div class='del'>-	devices that support write barriers.</div><div class='del'>-</div><div class='ctx'>   discard</div><div class='ctx'>   nodiscard (*)</div><div class='ctx'> 	Enable/disable the issuing of commands to let the block</div><div class='hunk'>@@ -228,7 +221,10 @@ default behaviour.</div><div class='ctx'> Deprecated Mount Options</div><div class='ctx'> ========================</div><div class='ctx'> </div><div class='del'>-None at present.</div><div class='add'>+  Name				Removal Schedule</div><div class='add'>+  ----				----------------</div><div class='add'>+  barrier			no earlier than v4.15</div><div class='add'>+  nobarrier			no earlier than v4.15</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Removed Mount Options</div><div class='head'>diff --git a/Documentation/firmware_class/README b/Documentation/firmware_class/README<br/>deleted file mode 100644<br/>index cafdca8b3b15..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/firmware_class/README?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/firmware_class/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,128 +0,0 @@</div><div class='del'>-</div><div class='del'>- request_firmware() hotplug interface:</div><div class='del'>- ------------------------------------</div><div class='del'>-	Copyright (C) 2003 Manuel Estrada Sainz</div><div class='del'>-</div><div class='del'>- Why:</div><div class='del'>- ---</div><div class='del'>-</div><div class='del'>- Today, the most extended way to use firmware in the Linux kernel is linking</div><div class='del'>- it statically in a header file. Which has political and technical issues:</div><div class='del'>-</div><div class='del'>-  1) Some firmware is not legal to redistribute.</div><div class='del'>-  2) The firmware occupies memory permanently, even though it often is just</div><div class='del'>-     used once.</div><div class='del'>-  3) Some people, like the Debian crowd, don't consider some firmware free</div><div class='del'>-     enough and remove entire drivers (e.g.: keyspan).</div><div class='del'>-</div><div class='del'>- High level behavior (mixed):</div><div class='del'>- ============================</div><div class='del'>-</div><div class='del'>- 1), kernel(driver):</div><div class='del'>-	- calls request_firmware(&amp;fw_entry, $FIRMWARE, device)</div><div class='del'>-	- kernel searches the firmware image with name $FIRMWARE directly</div><div class='del'>-	in the below search path of root filesystem:</div><div class='del'>-		User customized search path by module parameter 'path'[1]</div><div class='del'>-		"/lib/firmware/updates/" UTS_RELEASE,</div><div class='del'>-		"/lib/firmware/updates",</div><div class='del'>-		"/lib/firmware/" UTS_RELEASE,</div><div class='del'>-		"/lib/firmware"</div><div class='del'>-	- If found, goto 7), else goto 2)</div><div class='del'>-</div><div class='del'>-	[1], the 'path' is a string parameter which length should be less</div><div class='del'>-	than 256, user should pass 'firmware_class.path=$CUSTOMIZED_PATH'</div><div class='del'>-	if firmware_class is built in kernel(the general situation)</div><div class='del'>-</div><div class='del'>- 2), userspace:</div><div class='del'>- 	- /sys/class/firmware/xxx/{loading,data} appear.</div><div class='del'>-	- hotplug gets called with a firmware identifier in $FIRMWARE</div><div class='del'>-	  and the usual hotplug environment.</div><div class='del'>-		- hotplug: echo 1 &gt; /sys/class/firmware/xxx/loading</div><div class='del'>-</div><div class='del'>- 3), kernel: Discard any previous partial load.</div><div class='del'>-</div><div class='del'>- 4), userspace:</div><div class='del'>-		- hotplug: cat appropriate_firmware_image &gt; \</div><div class='del'>-					/sys/class/firmware/xxx/data</div><div class='del'>-</div><div class='del'>- 5), kernel: grows a buffer in PAGE_SIZE increments to hold the image as it</div><div class='del'>-	 comes in.</div><div class='del'>-</div><div class='del'>- 6), userspace:</div><div class='del'>-		- hotplug: echo 0 &gt; /sys/class/firmware/xxx/loading</div><div class='del'>-</div><div class='del'>- 7), kernel: request_firmware() returns and the driver has the firmware</div><div class='del'>-	 image in fw_entry-&gt;{data,size}. If something went wrong</div><div class='del'>-	 request_firmware() returns non-zero and fw_entry is set to</div><div class='del'>-	 NULL.</div><div class='del'>-</div><div class='del'>- 8), kernel(driver): Driver code calls release_firmware(fw_entry) releasing</div><div class='del'>-		 the firmware image and any related resource.</div><div class='del'>-</div><div class='del'>- High level behavior (driver code):</div><div class='del'>- ==================================</div><div class='del'>-</div><div class='del'>-	 if(request_firmware(&amp;fw_entry, $FIRMWARE, device) == 0)</div><div class='del'>-	 	copy_fw_to_device(fw_entry-&gt;data, fw_entry-&gt;size);</div><div class='del'>-	 release_firmware(fw_entry);</div><div class='del'>-</div><div class='del'>- Sample/simple hotplug script:</div><div class='del'>- ============================</div><div class='del'>-</div><div class='del'>-	# Both $DEVPATH and $FIRMWARE are already provided in the environment.</div><div class='del'>-</div><div class='del'>-	HOTPLUG_FW_DIR=/usr/lib/hotplug/firmware/</div><div class='del'>-</div><div class='del'>-	echo 1 &gt; /sys/$DEVPATH/loading</div><div class='del'>-	cat $HOTPLUG_FW_DIR/$FIRMWARE &gt; /sys/$DEVPATH/data</div><div class='del'>-	echo 0 &gt; /sys/$DEVPATH/loading</div><div class='del'>-</div><div class='del'>- Random notes:</div><div class='del'>- ============</div><div class='del'>-</div><div class='del'>- - "echo -1 &gt; /sys/class/firmware/xxx/loading" will cancel the load at</div><div class='del'>-   once and make request_firmware() return with error.</div><div class='del'>-</div><div class='del'>- - firmware_data_read() and firmware_loading_show() are just provided</div><div class='del'>-   for testing and completeness, they are not called in normal use.</div><div class='del'>-</div><div class='del'>- - There is also /sys/class/firmware/timeout which holds a timeout in</div><div class='del'>-   seconds for the whole load operation.</div><div class='del'>-</div><div class='del'>- - request_firmware_nowait() is also provided for convenience in</div><div class='del'>-   user contexts to request firmware asynchronously, but can't be called</div><div class='del'>-   in atomic contexts.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- about in-kernel persistence:</div><div class='del'>- ---------------------------</div><div class='del'>- Under some circumstances, as explained below, it would be interesting to keep</div><div class='del'>- firmware images in non-swappable kernel memory or even in the kernel image</div><div class='del'>- (probably within initramfs).</div><div class='del'>-</div><div class='del'>- Note that this functionality has not been implemented.</div><div class='del'>-</div><div class='del'>- - Why OPTIONAL in-kernel persistence may be a good idea sometimes:</div><div class='del'>- </div><div class='del'>-	- If the device that needs the firmware is needed to access the</div><div class='del'>-	  filesystem. When upon some error the device has to be reset and the</div><div class='del'>-	  firmware reloaded, it won't be possible to get it from userspace.</div><div class='del'>-	  e.g.:</div><div class='del'>-		- A diskless client with a network card that needs firmware.</div><div class='del'>-		- The filesystem is stored in a disk behind an scsi device</div><div class='del'>-		  that needs firmware.</div><div class='del'>-	- Replacing buggy DSDT/SSDT ACPI tables on boot.</div><div class='del'>-	  Note: this would require the persistent objects to be included</div><div class='del'>-	  within the kernel image, probably within initramfs.</div><div class='del'>-	  </div><div class='del'>-   And the same device can be needed to access the filesystem or not depending</div><div class='del'>-   on the setup, so I think that the choice on what firmware to make</div><div class='del'>-   persistent should be left to userspace.</div><div class='del'>-</div><div class='del'>- about firmware cache:</div><div class='del'>- --------------------</div><div class='del'>- After firmware cache mechanism is introduced during system sleep,</div><div class='del'>- request_firmware can be called safely inside device's suspend and</div><div class='del'>- resume callback, and callers needn't cache the firmware by</div><div class='del'>- themselves any more for dealing with firmware loss during system</div><div class='del'>- resume.</div><div class='head'>diff --git a/Documentation/fpga/fpga-mgr.txt b/Documentation/fpga/fpga-mgr.txt<br/>index ce3e84fa9023..78f197fadfd1 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/fpga/fpga-mgr.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/fpga/fpga-mgr.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/fpga/fpga-mgr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/fpga/fpga-mgr.txt</a></div><div class='hunk'>@@ -18,31 +18,46 @@ API Functions:</div><div class='ctx'> To program the FPGA from a file or from a buffer:</div><div class='ctx'> -------------------------------------------------</div><div class='ctx'> </div><div class='del'>-	int fpga_mgr_buf_load(struct fpga_manager *mgr, u32 flags,</div><div class='add'>+	int fpga_mgr_buf_load(struct fpga_manager *mgr,</div><div class='add'>+			      struct fpga_image_info *info,</div><div class='ctx'> 		              const char *buf, size_t count);</div><div class='ctx'> </div><div class='del'>-Load the FPGA from an image which exists as a buffer in memory.</div><div class='add'>+Load the FPGA from an image which exists as a contiguous buffer in</div><div class='add'>+memory. Allocating contiguous kernel memory for the buffer should be avoided,</div><div class='add'>+users are encouraged to use the _sg interface instead of this.</div><div class='ctx'> </div><div class='del'>-	int fpga_mgr_firmware_load(struct fpga_manager *mgr, u32 flags,</div><div class='add'>+        int fpga_mgr_buf_load_sg(struct fpga_manager *mgr,</div><div class='add'>+				 struct fpga_image_info *info,</div><div class='add'>+				 struct sg_table *sgt);</div><div class='add'>+</div><div class='add'>+Load the FPGA from an image from non-contiguous in memory. Callers can</div><div class='add'>+construct a sg_table using alloc_page backed memory.</div><div class='add'>+</div><div class='add'>+	int fpga_mgr_firmware_load(struct fpga_manager *mgr,</div><div class='add'>+				   struct fpga_image_info *info,</div><div class='ctx'> 		                   const char *image_name);</div><div class='ctx'> </div><div class='ctx'> Load the FPGA from an image which exists as a file.  The image file must be on</div><div class='del'>-the firmware search path (see the firmware class documentation).</div><div class='del'>-</div><div class='del'>-For both these functions, flags == 0 for normal full reconfiguration or</div><div class='del'>-FPGA_MGR_PARTIAL_RECONFIG for partial reconfiguration.  If successful, the FPGA</div><div class='del'>-ends up in operating mode.  Return 0 on success or a negative error code.</div><div class='add'>+the firmware search path (see the firmware class documentation).  If successful,</div><div class='add'>+the FPGA ends up in operating mode.  Return 0 on success or a negative error</div><div class='add'>+code.</div><div class='ctx'> </div><div class='add'>+A FPGA design contained in a FPGA image file will likely have particulars that</div><div class='add'>+affect how the image is programmed to the FPGA.  These are contained in struct</div><div class='add'>+fpga_image_info.  Currently the only such particular is a single flag bit</div><div class='add'>+indicating whether the image is for full or partial reconfiguration.</div><div class='ctx'> </div><div class='ctx'> To get/put a reference to a FPGA manager:</div><div class='ctx'> -----------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	struct fpga_manager *of_fpga_mgr_get(struct device_node *node);</div><div class='add'>+	struct fpga_manager *fpga_mgr_get(struct device *dev);</div><div class='add'>+</div><div class='add'>+Given a DT node or device, get an exclusive reference to a FPGA manager.</div><div class='ctx'> </div><div class='ctx'> 	void fpga_mgr_put(struct fpga_manager *mgr);</div><div class='ctx'> </div><div class='del'>-Given a DT node, get an exclusive reference to a FPGA manager or release</div><div class='del'>-the reference.</div><div class='add'>+Release the reference.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> To register or unregister the low level FPGA-specific driver:</div><div class='hunk'>@@ -70,8 +85,11 @@ struct device_node *mgr_node = ...</div><div class='ctx'> char *buf = ...</div><div class='ctx'> int count = ...</div><div class='ctx'> </div><div class='add'>+/* struct with information about the FPGA image to program. */</div><div class='add'>+struct fpga_image_info info;</div><div class='add'>+</div><div class='ctx'> /* flags indicates whether to do full or partial reconfiguration */</div><div class='del'>-int flags = 0;</div><div class='add'>+info.flags = 0;</div><div class='ctx'> </div><div class='ctx'> int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -79,7 +97,7 @@ int ret;</div><div class='ctx'> struct fpga_manager *mgr = of_fpga_mgr_get(mgr_node);</div><div class='ctx'> </div><div class='ctx'> /* Load the buffer to the FPGA */</div><div class='del'>-ret = fpga_mgr_buf_load(mgr, flags, buf, count);</div><div class='add'>+ret = fpga_mgr_buf_load(mgr, &amp;info, buf, count);</div><div class='ctx'> </div><div class='ctx'> /* Release the FPGA manager */</div><div class='ctx'> fpga_mgr_put(mgr);</div><div class='hunk'>@@ -96,8 +114,11 @@ struct device_node *mgr_node = ...</div><div class='ctx'> /* FPGA image is in this file which is in the firmware search path */</div><div class='ctx'> const char *path = "fpga-image-9.rbf"</div><div class='ctx'> </div><div class='add'>+/* struct with information about the FPGA image to program. */</div><div class='add'>+struct fpga_image_info info;</div><div class='add'>+</div><div class='ctx'> /* flags indicates whether to do full or partial reconfiguration */</div><div class='del'>-int flags = 0;</div><div class='add'>+info.flags = 0;</div><div class='ctx'> </div><div class='ctx'> int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +126,7 @@ int ret;</div><div class='ctx'> struct fpga_manager *mgr = of_fpga_mgr_get(mgr_node);</div><div class='ctx'> </div><div class='ctx'> /* Get the firmware image (path) and load it to the FPGA */</div><div class='del'>-ret = fpga_mgr_firmware_load(mgr, flags, path);</div><div class='add'>+ret = fpga_mgr_firmware_load(mgr, &amp;info, path);</div><div class='ctx'> </div><div class='ctx'> /* Release the FPGA manager */</div><div class='ctx'> fpga_mgr_put(mgr);</div><div class='hunk'>@@ -154,14 +175,21 @@ success or negative error codes otherwise.</div><div class='ctx'> </div><div class='ctx'> The programming sequence is:</div><div class='ctx'>  1. .write_init</div><div class='del'>- 2. .write (may be called once or multiple times)</div><div class='add'>+ 2. .write or .write_sg (may be called once or multiple times)</div><div class='ctx'>  3. .write_complete</div><div class='ctx'> </div><div class='del'>-The .write_init function will prepare the FPGA to receive the image data.</div><div class='add'>+The .write_init function will prepare the FPGA to receive the image data.  The</div><div class='add'>+buffer passed into .write_init will be atmost .initial_header_size bytes long,</div><div class='add'>+if the whole bitstream is not immediately available then the core code will</div><div class='add'>+buffer up at least this much before starting.</div><div class='ctx'> </div><div class='ctx'> The .write function writes a buffer to the FPGA. The buffer may be contain the</div><div class='ctx'> whole FPGA image or may be a smaller chunk of an FPGA image.  In the latter</div><div class='del'>-case, this function is called multiple times for successive chunks.</div><div class='add'>+case, this function is called multiple times for successive chunks. This interface</div><div class='add'>+is suitable for drivers which use PIO.</div><div class='add'>+</div><div class='add'>+The .write_sg version behaves the same as .write except the input is a sg_table</div><div class='add'>+scatter list. This interface is suitable for drivers which use DMA.</div><div class='ctx'> </div><div class='ctx'> The .write_complete function is called after all the image has been written</div><div class='ctx'> to put the FPGA into operating mode.</div><div class='head'>diff --git a/Documentation/frv/booting.txt b/Documentation/frv/booting.txt<br/>index 9bdf4b46e741..cd9dc1dfb144 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/frv/booting.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/frv/booting.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/frv/booting.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/frv/booting.txt</a></div><div class='hunk'>@@ -119,7 +119,7 @@ separated by spaces:</div><div class='ctx'> 	253:0		Device with major 253 and minor 0</div><div class='ctx'> </div><div class='ctx'>       Authoritative information can be found in</div><div class='del'>-      "Documentation/kernel-parameters.txt".</div><div class='add'>+      "Documentation/admin-guide/kernel-parameters.rst".</div><div class='ctx'> </div><div class='ctx'>   (*) rw</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/gpio/driver.txt b/Documentation/gpio/driver.txt<br/>index 368d5a294d89..fc1d2f83564d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/gpio/driver.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/gpio/driver.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/gpio/driver.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpio/driver.txt</a></div><div class='hunk'>@@ -41,34 +41,71 @@ In the gpiolib framework each GPIO controller is packaged as a "struct</div><div class='ctx'> gpio_chip" (see linux/gpio/driver.h for its complete definition) with members</div><div class='ctx'> common to each controller of that type:</div><div class='ctx'> </div><div class='del'>- - methods to establish GPIO direction</div><div class='del'>- - methods used to access GPIO values</div><div class='del'>- - method to return the IRQ number associated to a given GPIO</div><div class='add'>+ - methods to establish GPIO line direction</div><div class='add'>+ - methods used to access GPIO line values</div><div class='add'>+ - method to set electrical configuration to a a given GPIO line</div><div class='add'>+ - method to return the IRQ number associated to a given GPIO line</div><div class='ctx'>  - flag saying whether calls to its methods may sleep</div><div class='add'>+ - optional line names array to identify lines</div><div class='ctx'>  - optional debugfs dump method (showing extra state like pullup config)</div><div class='ctx'>  - optional base number (will be automatically assigned if omitted)</div><div class='del'>- - label for diagnostics and GPIOs mapping using platform data</div><div class='add'>+ - optional label for diagnostics and GPIO chip mapping using platform data</div><div class='ctx'> </div><div class='ctx'> The code implementing a gpio_chip should support multiple instances of the</div><div class='ctx'> controller, possibly using the driver model. That code will configure each</div><div class='del'>-gpio_chip and issue gpiochip_add(). Removing a GPIO controller should be rare;</div><div class='del'>-use gpiochip_remove() when it is unavoidable.</div><div class='add'>+gpio_chip and issue gpiochip_add[_data]() or devm_gpiochip_add_data().</div><div class='add'>+Removing a GPIO controller should be rare; use [devm_]gpiochip_remove() when</div><div class='add'>+it is unavoidable.</div><div class='ctx'> </div><div class='del'>-Most often a gpio_chip is part of an instance-specific structure with state not</div><div class='add'>+Often a gpio_chip is part of an instance-specific structure with states not</div><div class='ctx'> exposed by the GPIO interfaces, such as addressing, power management, and more.</div><div class='del'>-Chips such as codecs will have complex non-GPIO state.</div><div class='add'>+Chips such as audio codecs will have complex non-GPIO states.</div><div class='ctx'> </div><div class='ctx'> Any debugfs dump method should normally ignore signals which haven't been</div><div class='ctx'> requested as GPIOs. They can use gpiochip_is_requested(), which returns either</div><div class='ctx'> NULL or the label associated with that GPIO when it was requested.</div><div class='ctx'> </div><div class='del'>-RT_FULL: GPIO driver should not use spinlock_t or any sleepable APIs</div><div class='add'>+RT_FULL: the GPIO driver should not use spinlock_t or any sleepable APIs</div><div class='ctx'> (like PM runtime) in its gpio_chip implementation (.get/.set and direction</div><div class='ctx'> control callbacks) if it is expected to call GPIO APIs from atomic context</div><div class='ctx'> on -RT (inside hard IRQ handlers and similar contexts). Normally this should</div><div class='ctx'> not be required.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+GPIO electrical configuration</div><div class='add'>+-----------------------------</div><div class='add'>+</div><div class='add'>+GPIOs can be configured for several electrical modes of operation by using the</div><div class='add'>+.set_config() callback. Currently this API supports setting debouncing and</div><div class='add'>+single-ended modes (open drain/open source). These settings are described</div><div class='add'>+below.</div><div class='add'>+</div><div class='add'>+The .set_config() callback uses the same enumerators and configuration</div><div class='add'>+semantics as the generic pin control drivers. This is not a coincidence: it is</div><div class='add'>+possible to assign the .set_config() to the function gpiochip_generic_config()</div><div class='add'>+which will result in pinctrl_gpio_set_config() being called and eventually</div><div class='add'>+ending up in the pin control back-end "behind" the GPIO controller, usually</div><div class='add'>+closer to the actual pins. This way the pin controller can manage the below</div><div class='add'>+listed GPIO configurations.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+GPIOs with debounce support</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+Debouncing is a configuration set to a pin indicating that it is connected to</div><div class='add'>+a mechanical switch or button, or similar that may bounce. Bouncing means the</div><div class='add'>+line is pulled high/low quickly at very short intervals for mechanical</div><div class='add'>+reasons. This can result in the value being unstable or irqs fireing repeatedly</div><div class='add'>+unless the line is debounced.</div><div class='add'>+</div><div class='add'>+Debouncing in practice involves setting up a timer when something happens on</div><div class='add'>+the line, wait a little while and then sample the line again, so see if it</div><div class='add'>+still has the same value (low or high). This could also be repeated by a clever</div><div class='add'>+state machine, waiting for a line to become stable. In either case, it sets</div><div class='add'>+a certain number of milliseconds for debouncing, or just "on/off" if that time</div><div class='add'>+is not configurable.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> GPIOs with open drain/source support</div><div class='ctx'> ------------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -146,10 +183,11 @@ a pull-up resistor is needed on the outgoing rail to complete the circuit, and</div><div class='ctx'> in the second case, a pull-down resistor is needed on the rail.</div><div class='ctx'> </div><div class='ctx'> Hardware that supports open drain or open source or both, can implement a</div><div class='del'>-special callback in the gpio_chip: .set_single_ended() that takes an enum flag</div><div class='del'>-telling whether to configure the line as open drain, open source or push-pull.</div><div class='del'>-This will happen in response to the GPIO_OPEN_DRAIN or GPIO_OPEN_SOURCE flag</div><div class='del'>-set in the machine file, or coming from other hardware descriptions.</div><div class='add'>+special callback in the gpio_chip: .set_config() that takes a generic</div><div class='add'>+pinconf packed value telling whether to configure the line as open drain,</div><div class='add'>+open source or push-pull. This will happen in response to the</div><div class='add'>+GPIO_OPEN_DRAIN or GPIO_OPEN_SOURCE flag set in the machine file, or coming</div><div class='add'>+from other hardware descriptions.</div><div class='ctx'> </div><div class='ctx'> If this state can not be configured in hardware, i.e. if the GPIO hardware does</div><div class='ctx'> not support open drain/open source in hardware, the GPIO library will instead</div><div class='hunk'>@@ -175,8 +213,8 @@ The IRQ portions of the GPIO block are implemented using an irqchip, using</div><div class='ctx'> the header &lt;linux/irq.h&gt;. So basically such a driver is utilizing two sub-</div><div class='ctx'> systems simultaneously: gpio and irq.</div><div class='ctx'> </div><div class='del'>-RT_FULL: GPIO driver should not use spinlock_t or any sleepable APIs</div><div class='del'>-(like PM runtime) as part of its irq_chip implementation on -RT.</div><div class='add'>+RT_FULL: a realtime compliant GPIO driver should not use spinlock_t or any</div><div class='add'>+sleepable APIs (like PM runtime) as part of its irq_chip implementation.</div><div class='ctx'> - spinlock_t should be replaced with raw_spinlock_t [1].</div><div class='ctx'> - If sleepable APIs have to be used, these can be done from the .irq_bus_lock()</div><div class='ctx'>   and .irq_bus_unlock() callbacks, as these are the only slowpath callbacks</div><div class='hunk'>@@ -185,33 +223,32 @@ RT_FULL: GPIO driver should not use spinlock_t or any sleepable APIs</div><div class='ctx'> GPIO irqchips usually fall in one of two categories:</div><div class='ctx'> </div><div class='ctx'> * CHAINED GPIO irqchips: these are usually the type that is embedded on</div><div class='del'>-  an SoC. This means that there is a fast IRQ handler for the GPIOs that</div><div class='add'>+  an SoC. This means that there is a fast IRQ flow handler for the GPIOs that</div><div class='ctx'>   gets called in a chain from the parent IRQ handler, most typically the</div><div class='del'>-  system interrupt controller. This means the GPIO irqchip is registered</div><div class='del'>-  using irq_set_chained_handler() or the corresponding</div><div class='del'>-  gpiochip_set_chained_irqchip() helper function, and the GPIO irqchip</div><div class='del'>-  handler will be called immediately from the parent irqchip, while</div><div class='del'>-  holding the IRQs disabled. The GPIO irqchip will then end up calling</div><div class='del'>-  something like this sequence in its interrupt handler:</div><div class='del'>-</div><div class='del'>-  static irqreturn_t tc3589x_gpio_irq(int irq, void *data)</div><div class='add'>+  system interrupt controller. This means that the GPIO irqchip handler will</div><div class='add'>+  be called immediately from the parent irqchip, while holding the IRQs</div><div class='add'>+  disabled. The GPIO irqchip will then end up calling something like this</div><div class='add'>+  sequence in its interrupt handler:</div><div class='add'>+</div><div class='add'>+  static irqreturn_t foo_gpio_irq(int irq, void *data)</div><div class='ctx'>       chained_irq_enter(...);</div><div class='ctx'>       generic_handle_irq(...);</div><div class='ctx'>       chained_irq_exit(...);</div><div class='ctx'> </div><div class='ctx'>   Chained GPIO irqchips typically can NOT set the .can_sleep flag on</div><div class='del'>-  struct gpio_chip, as everything happens directly in the callbacks.</div><div class='add'>+  struct gpio_chip, as everything happens directly in the callbacks: no</div><div class='add'>+  slow bus traffic like I2C can be used.</div><div class='ctx'> </div><div class='ctx'>   RT_FULL: Note, chained IRQ handlers will not be forced threaded on -RT.</div><div class='ctx'>   As result, spinlock_t or any sleepable APIs (like PM runtime) can't be used</div><div class='ctx'>   in chained IRQ handler.</div><div class='del'>-  if required (and if it can't be converted to the nested threaded GPIO irqchip)</div><div class='del'>-  - chained IRQ handler can be converted to generic irq handler and this way</div><div class='del'>-  it will be threaded IRQ handler on -RT and hard IRQ handler on non-RT</div><div class='add'>+  If required (and if it can't be converted to the nested threaded GPIO irqchip)</div><div class='add'>+  a chained IRQ handler can be converted to generic irq handler and this way</div><div class='add'>+  it will be a threaded IRQ handler on -RT and a hard IRQ handler on non-RT</div><div class='ctx'>   (for example, see [3]).</div><div class='ctx'>   Know W/A: The generic_handle_irq() is expected to be called with IRQ disabled,</div><div class='del'>-  so IRQ core will complain if it will be called from IRQ handler which is</div><div class='del'>-  forced thread. The "fake?" raw lock can be used to W/A this problem:</div><div class='add'>+  so the IRQ core will complain if it is called from an IRQ handler which is</div><div class='add'>+  forced to a thread. The "fake?" raw lock can be used to W/A this problem:</div><div class='ctx'> </div><div class='ctx'> 	raw_spinlock_t wa_lock;</div><div class='ctx'> 	static irqreturn_t omap_gpio_irq_handler(int irq, void *gpiobank)</div><div class='hunk'>@@ -243,7 +280,7 @@ GPIO irqchips usually fall in one of two categories:</div><div class='ctx'>   by the driver. The hallmark of this driver is to call something like</div><div class='ctx'>   this in its interrupt handler:</div><div class='ctx'> </div><div class='del'>-  static irqreturn_t tc3589x_gpio_irq(int irq, void *data)</div><div class='add'>+  static irqreturn_t foo_gpio_irq(int irq, void *data)</div><div class='ctx'>       ...</div><div class='ctx'>       handle_nested_irq(irq);</div><div class='ctx'> </div><div class='hunk'>@@ -256,23 +293,31 @@ associated irqdomain and resource allocation callbacks, the gpiolib has</div><div class='ctx'> some helpers that can be enabled by selecting the GPIOLIB_IRQCHIP Kconfig</div><div class='ctx'> symbol:</div><div class='ctx'> </div><div class='del'>-* gpiochip_irqchip_add(): adds an irqchip to a gpiochip. It will pass</div><div class='add'>+* gpiochip_irqchip_add(): adds a chained irqchip to a gpiochip. It will pass</div><div class='ctx'>   the struct gpio_chip* for the chip to all IRQ callbacks, so the callbacks</div><div class='ctx'>   need to embed the gpio_chip in its state container and obtain a pointer</div><div class='ctx'>   to the container using container_of().</div><div class='ctx'>   (See Documentation/driver-model/design-patterns.txt)</div><div class='ctx'> </div><div class='del'>-  If there is a need to exclude certain GPIOs from the IRQ domain, one can</div><div class='del'>-  set .irq_need_valid_mask of the gpiochip before gpiochip_add_data() is</div><div class='del'>-  called. This allocates .irq_valid_mask with as many bits set as there are</div><div class='del'>-  GPIOs in the chip. Drivers can exclude GPIOs by clearing bits from this</div><div class='del'>-  mask. The mask must be filled in before gpiochip_irqchip_add() is called.</div><div class='add'>+* gpiochip_irqchip_add_nested(): adds a nested irqchip to a gpiochip.</div><div class='add'>+  Apart from that it works exactly like the chained irqchip.</div><div class='ctx'> </div><div class='ctx'> * gpiochip_set_chained_irqchip(): sets up a chained irq handler for a</div><div class='ctx'>   gpio_chip from a parent IRQ and passes the struct gpio_chip* as handler</div><div class='ctx'>   data. (Notice handler data, since the irqchip data is likely used by the</div><div class='del'>-  parent irqchip!) This is for the chained type of chip. This is also used</div><div class='del'>-  to set up a nested irqchip if NULL is passed as handler.</div><div class='add'>+  parent irqchip!).</div><div class='add'>+</div><div class='add'>+* gpiochip_set_nested_irqchip(): sets up a nested irq handler for a</div><div class='add'>+  gpio_chip from a parent IRQ. As the parent IRQ has usually been</div><div class='add'>+  explicitly requested by the driver, this does very little more than</div><div class='add'>+  mark all the child IRQs as having the other IRQ as parent.</div><div class='add'>+</div><div class='add'>+If there is a need to exclude certain GPIOs from the IRQ domain, you can</div><div class='add'>+set .irq_need_valid_mask of the gpiochip before gpiochip_add_data() is</div><div class='add'>+called. This allocates an .irq_valid_mask with as many bits set as there</div><div class='add'>+are GPIOs in the chip. Drivers can exclude GPIOs by clearing bits from this</div><div class='add'>+mask. The mask must be filled in before gpiochip_irqchip_add() or</div><div class='add'>+gpiochip_irqchip_add_nested() is called.</div><div class='ctx'> </div><div class='ctx'> To use the helpers please keep the following in mind:</div><div class='ctx'> </div><div class='hunk'>@@ -323,6 +368,9 @@ When implementing an irqchip inside a GPIO driver, these two functions should</div><div class='ctx'> typically be called in the .startup() and .shutdown() callbacks from the</div><div class='ctx'> irqchip.</div><div class='ctx'> </div><div class='add'>+When using the gpiolib irqchip helpers, these callback are automatically</div><div class='add'>+assigned.</div><div class='add'>+</div><div class='ctx'> Real-Time compliance for GPIO IRQ chips</div><div class='ctx'> ---------------------------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/gpu/conf.py b/Documentation/gpu/conf.py<br/>index 6314d1708230..1757b040fb32 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/gpu/conf.py?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/gpu/conf.py</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/gpu/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/conf.py</a></div><div class='hunk'>@@ -3,3 +3,8 @@</div><div class='ctx'> project = "Linux GPU Driver Developer's Guide"</div><div class='ctx'> </div><div class='ctx'> tags.add("subproject")</div><div class='add'>+</div><div class='add'>+latex_documents = [</div><div class='add'>+    ('index', 'gpu.tex', project,</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+]</div><div class='head'>diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/gpu/drm-internals.rst<br/>index 37284bcc7764..e35920db1f4c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/gpu/drm-internals.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/gpu/drm-internals.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/gpu/drm-internals.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/drm-internals.rst</a></div><div class='hunk'>@@ -143,6 +143,9 @@ Device Instance and Driver Handling</div><div class='ctx'> .. kernel-doc:: drivers/gpu/drm/drm_drv.c</div><div class='ctx'>    :export:</div><div class='ctx'> </div><div class='add'>+.. kernel-doc:: include/drm/drm_drv.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='ctx'> Driver Load</div><div class='ctx'> -----------</div><div class='ctx'> </div><div class='hunk'>@@ -350,6 +353,23 @@ how the ioctl is allowed to be called.</div><div class='ctx'> .. kernel-doc:: drivers/gpu/drm/drm_ioctl.c</div><div class='ctx'>    :export:</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+Misc Utilities</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+Printer</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/drm/drm_print.h</div><div class='add'>+   :doc: print</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/drm/drm_print.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_print.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Legacy Support Code</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst<br/>index bb4254d19cbb..03040aa14fe8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/gpu/drm-kms-helpers.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/gpu/drm-kms-helpers.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/gpu/drm-kms-helpers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/drm-kms-helpers.rst</a></div><div class='hunk'>@@ -63,6 +63,9 @@ Atomic State Reset and Initialization</div><div class='ctx'> .. kernel-doc:: drivers/gpu/drm/drm_atomic_helper.c</div><div class='ctx'>    :doc: atomic state reset and initialization</div><div class='ctx'> </div><div class='add'>+Helper Functions Reference</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='ctx'> .. kernel-doc:: include/drm/drm_atomic_helper.h</div><div class='ctx'>    :internal:</div><div class='ctx'> </div><div class='hunk'>@@ -261,14 +264,6 @@ Plane Helper Reference</div><div class='ctx'> .. kernel-doc:: drivers/gpu/drm/drm_plane_helper.c</div><div class='ctx'>    :export:</div><div class='ctx'> </div><div class='del'>-Tile group</div><div class='del'>-==========</div><div class='del'>-</div><div class='del'>-# FIXME: This should probably be moved into a property documentation section</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/gpu/drm/drm_crtc.c</div><div class='del'>-   :doc: Tile group</div><div class='del'>-</div><div class='ctx'> Auxiliary Modeset Helpers</div><div class='ctx'> =========================</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst<br/>index 53b872c105d2..4d4068855ec4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/gpu/drm-kms.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/gpu/drm-kms.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/gpu/drm-kms.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/drm-kms.rst</a></div><div class='hunk'>@@ -15,25 +15,24 @@ be setup by initializing the following fields.</div><div class='ctx'> -  struct drm_mode_config_funcs \*funcs;</div><div class='ctx'>    Mode setting functions.</div><div class='ctx'> </div><div class='del'>-Modeset Base Object Abstraction</div><div class='del'>-===============================</div><div class='add'>+Mode Configuration</div><div class='ctx'> </div><div class='del'>-.. kernel-doc:: include/drm/drm_mode_object.h</div><div class='del'>-   :internal:</div><div class='add'>+KMS Core Structures and Functions</div><div class='add'>+=================================</div><div class='ctx'> </div><div class='del'>-.. kernel-doc:: drivers/gpu/drm/drm_mode_object.c</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_mode_config.c</div><div class='ctx'>    :export:</div><div class='ctx'> </div><div class='del'>-KMS Data Structures</div><div class='del'>-===================</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: include/drm/drm_crtc.h</div><div class='add'>+.. kernel-doc:: include/drm/drm_mode_config.h</div><div class='ctx'>    :internal:</div><div class='ctx'> </div><div class='del'>-KMS API Functions</div><div class='del'>-=================</div><div class='add'>+Modeset Base Object Abstraction</div><div class='add'>+===============================</div><div class='ctx'> </div><div class='del'>-.. kernel-doc:: drivers/gpu/drm/drm_crtc.c</div><div class='add'>+.. kernel-doc:: include/drm/drm_mode_object.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_mode_object.c</div><div class='ctx'>    :export:</div><div class='ctx'> </div><div class='ctx'> Atomic Mode Setting Function Reference</div><div class='hunk'>@@ -45,6 +44,21 @@ Atomic Mode Setting Function Reference</div><div class='ctx'> .. kernel-doc:: include/drm/drm_atomic.h</div><div class='ctx'>    :internal:</div><div class='ctx'> </div><div class='add'>+CRTC Abstraction</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_crtc.c</div><div class='add'>+   :doc: overview</div><div class='add'>+</div><div class='add'>+CRTC Functions Reference</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/drm/drm_crtc.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_crtc.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='ctx'> Frame Buffer Abstraction</div><div class='ctx'> ========================</div><div class='ctx'> </div><div class='hunk'>@@ -63,52 +77,17 @@ Frame Buffer Functions Reference</div><div class='ctx'> DRM Format Handling</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='add'>+.. kernel-doc:: include/drm/drm_fourcc.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='ctx'> .. kernel-doc:: drivers/gpu/drm/drm_fourcc.c</div><div class='ctx'>    :export:</div><div class='ctx'> </div><div class='ctx'> Dumb Buffer Objects</div><div class='ctx'> ===================</div><div class='ctx'> </div><div class='del'>-The KMS API doesn't standardize backing storage object creation and</div><div class='del'>-leaves it to driver-specific ioctls. Furthermore actually creating a</div><div class='del'>-buffer object even for GEM-based drivers is done through a</div><div class='del'>-driver-specific ioctl - GEM only has a common userspace interface for</div><div class='del'>-sharing and destroying objects. While not an issue for full-fledged</div><div class='del'>-graphics stacks that include device-specific userspace components (in</div><div class='del'>-libdrm for instance), this limit makes DRM-based early boot graphics</div><div class='del'>-unnecessarily complex.</div><div class='del'>-</div><div class='del'>-Dumb objects partly alleviate the problem by providing a standard API to</div><div class='del'>-create dumb buffers suitable for scanout, which can then be used to</div><div class='del'>-create KMS frame buffers.</div><div class='del'>-</div><div class='del'>-To support dumb objects drivers must implement the dumb_create,</div><div class='del'>-dumb_destroy and dumb_map_offset operations.</div><div class='del'>-</div><div class='del'>--  int (\*dumb_create)(struct drm_file \*file_priv, struct</div><div class='del'>-   drm_device \*dev, struct drm_mode_create_dumb \*args);</div><div class='del'>-   The dumb_create operation creates a driver object (GEM or TTM</div><div class='del'>-   handle) suitable for scanout based on the width, height and depth</div><div class='del'>-   from the struct :c:type:`struct drm_mode_create_dumb</div><div class='del'>-   &lt;drm_mode_create_dumb&gt;` argument. It fills the argument's</div><div class='del'>-   handle, pitch and size fields with a handle for the newly created</div><div class='del'>-   object and its line pitch and size in bytes.</div><div class='del'>-</div><div class='del'>--  int (\*dumb_destroy)(struct drm_file \*file_priv, struct</div><div class='del'>-   drm_device \*dev, uint32_t handle);</div><div class='del'>-   The dumb_destroy operation destroys a dumb object created by</div><div class='del'>-   dumb_create.</div><div class='del'>-</div><div class='del'>--  int (\*dumb_map_offset)(struct drm_file \*file_priv, struct</div><div class='del'>-   drm_device \*dev, uint32_t handle, uint64_t \*offset);</div><div class='del'>-   The dumb_map_offset operation associates an mmap fake offset with</div><div class='del'>-   the object given by the handle and returns it. Drivers must use the</div><div class='del'>-   :c:func:`drm_gem_create_mmap_offset()` function to associate</div><div class='del'>-   the fake offset as described in ?.</div><div class='del'>-</div><div class='del'>-Note that dumb objects may not be used for gpu acceleration, as has been</div><div class='del'>-attempted on some ARM embedded platforms. Such drivers really must have</div><div class='del'>-a hardware-specific ioctl to allocate suitable buffer objects.</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_dumb_buffers.c</div><div class='add'>+   :doc: overview</div><div class='ctx'> </div><div class='ctx'> Plane Abstraction</div><div class='ctx'> =================</div><div class='hunk'>@@ -215,7 +194,7 @@ Connectors state change detection must be cleanup up with a call to</div><div class='ctx'> Output discovery and initialization example</div><div class='ctx'> -------------------------------------------</div><div class='ctx'> </div><div class='del'>-::</div><div class='add'>+.. code-block:: c</div><div class='ctx'> </div><div class='ctx'>     void intel_crt_init(struct drm_device *dev)</div><div class='ctx'>     {</div><div class='hunk'>@@ -287,6 +266,12 @@ Property Types and Blob Property Support</div><div class='ctx'> .. kernel-doc:: drivers/gpu/drm/drm_property.c</div><div class='ctx'>    :export:</div><div class='ctx'> </div><div class='add'>+Standard Connector Properties</div><div class='add'>+-----------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_connector.c</div><div class='add'>+   :doc: standard connector properties</div><div class='add'>+</div><div class='ctx'> Plane Composition Properties</div><div class='ctx'> ----------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -308,6 +293,18 @@ Color Management Properties</div><div class='ctx'> .. kernel-doc:: drivers/gpu/drm/drm_color_mgmt.c</div><div class='ctx'>    :export:</div><div class='ctx'> </div><div class='add'>+Tile Group Property</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_connector.c</div><div class='add'>+   :doc: Tile group</div><div class='add'>+</div><div class='add'>+Explicit Fencing Properties</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_atomic.c</div><div class='add'>+   :doc: explicit fencing properties</div><div class='add'>+</div><div class='ctx'> Existing KMS Properties</div><div class='ctx'> -----------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/gpu/drm-mm.rst b/Documentation/gpu/drm-mm.rst<br/>index bca808535dfd..f5760b140f13 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/gpu/drm-mm.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/gpu/drm-mm.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/gpu/drm-mm.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/drm-mm.rst</a></div><div class='hunk'>@@ -34,25 +34,26 @@ TTM initialization</div><div class='ctx'> ------------------</div><div class='ctx'> </div><div class='ctx'>     **Warning**</div><div class='del'>-</div><div class='ctx'>     This section is outdated.</div><div class='ctx'> </div><div class='del'>-Drivers wishing to support TTM must fill out a drm_bo_driver</div><div class='del'>-structure. The structure contains several fields with function pointers</div><div class='del'>-for initializing the TTM, allocating and freeing memory, waiting for</div><div class='del'>-command completion and fence synchronization, and memory migration. See</div><div class='del'>-the radeon_ttm.c file for an example of usage.</div><div class='add'>+Drivers wishing to support TTM must pass a filled :c:type:`ttm_bo_driver</div><div class='add'>+&lt;ttm_bo_driver&gt;` structure to ttm_bo_device_init, together with an</div><div class='add'>+initialized global reference to the memory manager.  The ttm_bo_driver</div><div class='add'>+structure contains several fields with function pointers for</div><div class='add'>+initializing the TTM, allocating and freeing memory, waiting for command</div><div class='add'>+completion and fence synchronization, and memory migration.</div><div class='ctx'> </div><div class='del'>-The ttm_global_reference structure is made up of several fields:</div><div class='add'>+The :c:type:`struct drm_global_reference &lt;drm_global_reference&gt;` is made</div><div class='add'>+up of several fields:</div><div class='ctx'> </div><div class='del'>-::</div><div class='add'>+.. code-block:: c</div><div class='ctx'> </div><div class='del'>-              struct ttm_global_reference {</div><div class='add'>+              struct drm_global_reference {</div><div class='ctx'>                       enum ttm_global_types global_type;</div><div class='ctx'>                       size_t size;</div><div class='ctx'>                       void *object;</div><div class='del'>-                      int (*init) (struct ttm_global_reference *);</div><div class='del'>-                      void (*release) (struct ttm_global_reference *);</div><div class='add'>+                      int (*init) (struct drm_global_reference *);</div><div class='add'>+                      void (*release) (struct drm_global_reference *);</div><div class='ctx'>               };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -76,6 +77,12 @@ ttm_bo_global_release(), respectively. Also, like the previous</div><div class='ctx'> object, ttm_global_item_ref() is used to create an initial reference</div><div class='ctx'> count for the TTM, which will call your initialization function.</div><div class='ctx'> </div><div class='add'>+See the radeon_ttm.c file for an example of usage.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_global.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> The Graphics Execution Manager (GEM)</div><div class='ctx'> ====================================</div><div class='ctx'> </div><div class='hunk'>@@ -284,10 +291,17 @@ To use :c:func:`drm_gem_mmap()`, drivers must fill the struct</div><div class='ctx'> :c:type:`struct drm_driver &lt;drm_driver&gt;` gem_vm_ops field</div><div class='ctx'> with a pointer to VM operations.</div><div class='ctx'> </div><div class='del'>-struct vm_operations_struct \*gem_vm_ops struct</div><div class='del'>-vm_operations_struct { void (\*open)(struct vm_area_struct \* area);</div><div class='del'>-void (\*close)(struct vm_area_struct \* area); int (\*fault)(struct</div><div class='del'>-vm_area_struct \*vma, struct vm_fault \*vmf); };</div><div class='add'>+The VM operations is a :c:type:`struct vm_operations_struct &lt;vm_operations_struct&gt;`</div><div class='add'>+made up of several fields, the more interesting ones being:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	struct vm_operations_struct {</div><div class='add'>+		void (*open)(struct vm_area_struct * area);</div><div class='add'>+		void (*close)(struct vm_area_struct * area);</div><div class='add'>+		int (*fault)(struct vm_fault *vmf);</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> The open and close operations must update the GEM object reference</div><div class='ctx'> count. Drivers can use the :c:func:`drm_gem_vm_open()` and</div><div class='hunk'>@@ -303,6 +317,17 @@ created.</div><div class='ctx'> Drivers that want to map the GEM object upfront instead of handling page</div><div class='ctx'> faults can implement their own mmap file operation handler.</div><div class='ctx'> </div><div class='add'>+For platforms without MMU the GEM core provides a helper method</div><div class='add'>+:c:func:`drm_gem_cma_get_unmapped_area`. The mmap() routines will call</div><div class='add'>+this to get a proposed address for the mapping.</div><div class='add'>+</div><div class='add'>+To use :c:func:`drm_gem_cma_get_unmapped_area`, drivers must fill the</div><div class='add'>+struct :c:type:`struct file_operations &lt;file_operations&gt;` get_unmapped_area</div><div class='add'>+field with a pointer on :c:func:`drm_gem_cma_get_unmapped_area`.</div><div class='add'>+</div><div class='add'>+More detailed information about get_unmapped_area can be found in</div><div class='add'>+Documentation/nommu-mmap.txt</div><div class='add'>+</div><div class='ctx'> Memory Coherency</div><div class='ctx'> ----------------</div><div class='ctx'> </div><div class='hunk'>@@ -442,7 +467,7 @@ LRU Scan/Eviction Support</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='ctx'> .. kernel-doc:: drivers/gpu/drm/drm_mm.c</div><div class='del'>-   :doc: lru scan roaster</div><div class='add'>+   :doc: lru scan roster</div><div class='ctx'> </div><div class='ctx'> DRM MM Range Allocator Function References</div><div class='ctx'> ------------------------------------------</div><div class='hunk'>@@ -452,3 +477,9 @@ DRM MM Range Allocator Function References</div><div class='ctx'> </div><div class='ctx'> .. kernel-doc:: include/drm/drm_mm.h</div><div class='ctx'>    :internal:</div><div class='add'>+</div><div class='add'>+DRM Cache Handling</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_cache.c</div><div class='add'>+   :export:</div><div class='head'>diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/gpu/drm-uapi.rst<br/>index 1ba301cebe16..fcc228ef5bc4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/gpu/drm-uapi.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/gpu/drm-uapi.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/gpu/drm-uapi.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/drm-uapi.rst</a></div><div class='hunk'>@@ -156,8 +156,12 @@ other hand, a driver requires shared state between clients which is</div><div class='ctx'> visible to user-space and accessible beyond open-file boundaries, they</div><div class='ctx'> cannot support render nodes.</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+Testing and validation</div><div class='add'>+======================</div><div class='add'>+</div><div class='ctx'> Validating changes with IGT</div><div class='del'>-===========================</div><div class='add'>+---------------------------</div><div class='ctx'> </div><div class='ctx'> There's a collection of tests that aims to cover the whole functionality of</div><div class='ctx'> DRM drivers and that can be used to check that changes to DRM drivers or the</div><div class='hunk'>@@ -193,6 +197,12 @@ run-tests.sh is a wrapper around piglit that will execute the tests matching</div><div class='ctx'> the -t options. A report in HTML format will be available in</div><div class='ctx'> ./results/html/index.html. Results can be compared with piglit.</div><div class='ctx'> </div><div class='add'>+Display CRC Support</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/drm_debugfs_crc.c</div><div class='add'>+   :doc: CRC ABI</div><div class='add'>+</div><div class='ctx'> VBlank event handling</div><div class='ctx'> =====================</div><div class='ctx'> </div><div class='hunk'>@@ -209,10 +219,3 @@ DRM_IOCTL_MODESET_CTL</div><div class='ctx'>     mode setting, since on many devices the vertical blank counter is</div><div class='ctx'>     reset to 0 at some point during modeset. Modern drivers should not</div><div class='ctx'>     call this any more since with kernel mode setting it is a no-op.</div><div class='del'>-</div><div class='del'>-This second part of the GPU Driver Developer's Guide documents driver</div><div class='del'>-code, implementation details and also all the driver-specific userspace</div><div class='del'>-interfaces. Especially since all hardware-acceleration interfaces to</div><div class='del'>-userspace are driver specific for efficiency and other reasons these</div><div class='del'>-interfaces can be rather substantial. Hence every driver has its own</div><div class='del'>-chapter.</div><div class='head'>diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst<br/>index 87aaffc22920..b0d6709b8600 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/gpu/i915.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/gpu/i915.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/gpu/i915.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/i915.rst</a></div><div class='hunk'>@@ -49,6 +49,15 @@ Intel GVT-g Guest Support(vGPU)</div><div class='ctx'> .. kernel-doc:: drivers/gpu/drm/i915/i915_vgpu.c</div><div class='ctx'>    :internal:</div><div class='ctx'> </div><div class='add'>+Intel GVT-g Host Support(vGPU device model)</div><div class='add'>+-------------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/intel_gvt.c</div><div class='add'>+   :doc: Intel GVT-g host support</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/intel_gvt.c</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='ctx'> Display Hardware Handling</div><div class='ctx'> =========================</div><div class='ctx'> </div><div class='hunk'>@@ -135,6 +144,15 @@ High Definition Audio</div><div class='ctx'> .. kernel-doc:: include/drm/i915_component.h</div><div class='ctx'>    :internal:</div><div class='ctx'> </div><div class='add'>+Intel HDMI LPE Audio Support</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c</div><div class='add'>+   :doc: LPE Audio integration for HDMI or DP playback</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='ctx'> Panel Self Refresh PSR (PSR/SRD)</div><div class='ctx'> --------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -180,7 +198,7 @@ Display Refresh Rate Switching (DRRS)</div><div class='ctx'> DPIO</div><div class='ctx'> ----</div><div class='ctx'> </div><div class='del'>-.. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/intel_dpio_phy.c</div><div class='ctx'>    :doc: DPIO</div><div class='ctx'> </div><div class='ctx'> CSR firmware support for DMC</div><div class='hunk'>@@ -204,6 +222,18 @@ Video BIOS Table (VBT)</div><div class='ctx'> .. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h</div><div class='ctx'>    :internal:</div><div class='ctx'> </div><div class='add'>+Display PLLs</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.c</div><div class='add'>+   :doc: Display PLLs</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.c</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='ctx'> Memory Management and Command Submission</div><div class='ctx'> ========================================</div><div class='ctx'> </div><div class='hunk'>@@ -249,19 +279,19 @@ Global GTT views</div><div class='ctx'> GTT Fences and Swizzling</div><div class='ctx'> ------------------------</div><div class='ctx'> </div><div class='del'>-.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_fence.c</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_fence_reg.c</div><div class='ctx'>    :internal:</div><div class='ctx'> </div><div class='ctx'> Global GTT Fence Handling</div><div class='ctx'> ~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='del'>-.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_fence.c</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_fence_reg.c</div><div class='ctx'>    :doc: fence register handling</div><div class='ctx'> </div><div class='ctx'> Hardware Tiling and Swizzling Details</div><div class='ctx'> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='del'>-.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_fence.c</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_fence_reg.c</div><div class='ctx'>    :doc: tiling swizzling details</div><div class='ctx'> </div><div class='ctx'> Object Tiling IOCTLs</div><div class='hunk'>@@ -347,4 +377,95 @@ switch_mm</div><div class='ctx'> .. kernel-doc:: drivers/gpu/drm/i915/i915_trace.h</div><div class='ctx'>    :doc: switch_mm tracepoint</div><div class='ctx'> </div><div class='add'>+Perf</div><div class='add'>+====</div><div class='add'>+</div><div class='add'>+Overview</div><div class='add'>+--------</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :doc: i915 Perf Overview</div><div class='add'>+</div><div class='add'>+Comparison with Core Perf</div><div class='add'>+-------------------------</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :doc: i915 Perf History and Comparison with Core Perf</div><div class='add'>+</div><div class='add'>+i915 Driver Entry Points</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+This section covers the entrypoints exported outside of i915_perf.c to</div><div class='add'>+integrate with drm/i915 and to handle the `DRM_I915_PERF_OPEN` ioctl.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_init</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_fini</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_register</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_unregister</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_open_ioctl</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_release</div><div class='add'>+</div><div class='add'>+i915 Perf Stream</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+This section covers the stream-semantics-agnostic structures and functions</div><div class='add'>+for representing an i915 perf stream FD and associated file operations.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_drv.h</div><div class='add'>+   :functions: i915_perf_stream</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_drv.h</div><div class='add'>+   :functions: i915_perf_stream_ops</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: read_properties_unlocked</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_open_ioctl_locked</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_destroy_locked</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_read</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_ioctl</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_enable_locked</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_disable_locked</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_poll</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_perf_poll_locked</div><div class='add'>+</div><div class='add'>+i915 Perf Observation Architecture Stream</div><div class='add'>+-----------------------------------------</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_drv.h</div><div class='add'>+   :functions: i915_oa_ops</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_oa_stream_init</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_oa_read</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_oa_stream_enable</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_oa_stream_disable</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_oa_wait_unlocked</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :functions: i915_oa_poll_wait</div><div class='add'>+</div><div class='add'>+All i915 Perf Internals</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+This section simply includes all currently documented i915 perf internals, in</div><div class='add'>+no particular order, but may include some more minor utilities or platform</div><div class='add'>+specific details than found in the more high-level sections.</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='ctx'> .. WARNING: DOCPROC directive not supported: !Cdrivers/gpu/drm/i915/i915_irq.c</div><div class='head'>diff --git a/Documentation/gpu/index.rst b/Documentation/gpu/index.rst<br/>index be0dafcf5556..f81278a7c2cc 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/gpu/index.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/gpu/index.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/gpu/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/index.rst</a></div><div class='hunk'>@@ -11,10 +11,11 @@ Linux GPU Driver Developer's Guide</div><div class='ctx'>    drm-kms-helpers</div><div class='ctx'>    drm-uapi</div><div class='ctx'>    i915</div><div class='add'>+   tinydrm</div><div class='ctx'>    vga-switcheroo</div><div class='ctx'>    vgaarbiter</div><div class='ctx'> </div><div class='del'>-.. only::  subproject</div><div class='add'>+.. only::  subproject and html</div><div class='ctx'> </div><div class='ctx'>    Indices</div><div class='ctx'>    =======</div><div class='head'>diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst<br/>index 1903595b5310..eb284eb748ba 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/gpu/introduction.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/gpu/introduction.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/gpu/introduction.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/introduction.rst</a></div><div class='hunk'>@@ -23,13 +23,12 @@ For consistency this documentation uses American English. Abbreviations</div><div class='ctx'> are written as all-uppercase, for example: DRM, KMS, IOCTL, CRTC, and so</div><div class='ctx'> on. To aid in reading, documentations make full use of the markup</div><div class='ctx'> characters kerneldoc provides: @parameter for function parameters,</div><div class='del'>-@member for structure members, &amp;structure to reference structures and</div><div class='del'>-function() for functions. These all get automatically hyperlinked if</div><div class='del'>-kerneldoc for the referenced objects exists. When referencing entries in</div><div class='del'>-function vtables please use -&gt;vfunc(). Note that kerneldoc does not</div><div class='del'>-support referencing struct members directly, so please add a reference</div><div class='del'>-to the vtable struct somewhere in the same paragraph or at least</div><div class='del'>-section.</div><div class='add'>+@member for structure members (within the same structure), &amp;struct structure to</div><div class='add'>+reference structures and function() for functions. These all get automatically</div><div class='add'>+hyperlinked if kerneldoc for the referenced objects exists. When referencing</div><div class='add'>+entries in function vtables (and structure members in general) please use</div><div class='add'>+&amp;vtable_name.vfunc. Unfortunately this does not yet yield a direct link to the</div><div class='add'>+member, only the structure.</div><div class='ctx'> </div><div class='ctx'> Except in special situations (to separate locked from unlocked variants)</div><div class='ctx'> locking requirements for functions aren't documented in the kerneldoc.</div><div class='hunk'>@@ -49,3 +48,5 @@ section name should be all upper-case or not, and whether it should end</div><div class='ctx'> in a colon or not. Go with the file-local style. Other common section</div><div class='ctx'> names are "Notes" with information for dangerous or tricky corner cases,</div><div class='ctx'> and "FIXME" where the interface could be cleaned up.</div><div class='add'>+</div><div class='add'>+Also read the :ref:`guidelines for the kernel documentation at large &lt;doc_guide&gt;`.</div><div class='head'>diff --git a/Documentation/gpu/tinydrm.rst b/Documentation/gpu/tinydrm.rst<br/>new file mode 100644<br/>index 000000000000..a913644bfc19<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/gpu/tinydrm.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/gpu/tinydrm.rst</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+==========================</div><div class='add'>+drm/tinydrm Driver library</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/tinydrm/core/tinydrm-core.c</div><div class='add'>+   :doc: overview</div><div class='add'>+</div><div class='add'>+Core functionality</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/tinydrm/core/tinydrm-core.c</div><div class='add'>+   :doc: core</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/drm/tinydrm/tinydrm.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/tinydrm/core/tinydrm-core.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+Additional helpers</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/drm/tinydrm/tinydrm-helpers.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c</div><div class='add'>+   :export:</div><div class='add'>+</div><div class='add'>+MIPI DBI Compatible Controllers</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/tinydrm/mipi-dbi.c</div><div class='add'>+   :doc: overview</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/drm/tinydrm/mipi-dbi.h</div><div class='add'>+   :internal:</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/gpu/drm/tinydrm/mipi-dbi.c</div><div class='add'>+   :export:</div><div class='head'>diff --git a/Documentation/hwmon/ds1621 b/Documentation/hwmon/ds1621<br/>index f775e612f582..fa3407997795 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/hwmon/ds1621?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/hwmon/ds1621</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/hwmon/ds1621?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/ds1621</a></div><div class='hunk'>@@ -117,10 +117,10 @@ support, which is achieved via the R0 and R1 config register bits, where:</div><div class='ctx'> </div><div class='ctx'> R0..R1</div><div class='ctx'> ------</div><div class='del'>- 0  0 =&gt; 9 bits, 0.5 degrees Celcius</div><div class='del'>- 1  0 =&gt; 10 bits, 0.25 degrees Celcius</div><div class='del'>- 0  1 =&gt; 11 bits, 0.125 degrees Celcius</div><div class='del'>- 1  1 =&gt; 12 bits, 0.0625 degrees Celcius</div><div class='add'>+ 0  0 =&gt; 9 bits, 0.5 degrees Celsius</div><div class='add'>+ 1  0 =&gt; 10 bits, 0.25 degrees Celsius</div><div class='add'>+ 0  1 =&gt; 11 bits, 0.125 degrees Celsius</div><div class='add'>+ 1  1 =&gt; 12 bits, 0.0625 degrees Celsius</div><div class='ctx'> </div><div class='ctx'> Note:</div><div class='ctx'> At initial device power-on, the default resolution is set to 12-bits.</div><div class='head'>diff --git a/Documentation/hwmon/hwmon-kernel-api.txt b/Documentation/hwmon/hwmon-kernel-api.txt<br/>index ef9d74947f5c..53a806696c64 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/hwmon/hwmon-kernel-api.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/hwmon/hwmon-kernel-api.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/hwmon/hwmon-kernel-api.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/hwmon-kernel-api.txt</a></div><div class='hunk'>@@ -23,7 +23,6 @@ Each hardware monitoring driver must #include &lt;linux/hwmon.h&gt; and, in most</div><div class='ctx'> cases, &lt;linux/hwmon-sysfs.h&gt;. linux/hwmon.h declares the following</div><div class='ctx'> register/unregister functions:</div><div class='ctx'> </div><div class='del'>-struct device *hwmon_device_register(struct device *dev);</div><div class='ctx'> struct device *</div><div class='ctx'> hwmon_device_register_with_groups(struct device *dev, const char *name,</div><div class='ctx'> 				  void *drvdata,</div><div class='hunk'>@@ -38,36 +37,31 @@ struct device *</div><div class='ctx'> hwmon_device_register_with_info(struct device *dev,</div><div class='ctx'> 				const char *name, void *drvdata,</div><div class='ctx'> 				const struct hwmon_chip_info *info,</div><div class='del'>-				const struct attribute_group **groups);</div><div class='add'>+				const struct attribute_group **extra_groups);</div><div class='ctx'> </div><div class='ctx'> struct device *</div><div class='ctx'> devm_hwmon_device_register_with_info(struct device *dev,</div><div class='del'>-				     const char *name,</div><div class='del'>-				     void *drvdata,</div><div class='del'>-				     const struct hwmon_chip_info *info,</div><div class='del'>-				     const struct attribute_group **groups);</div><div class='add'>+				const char *name,</div><div class='add'>+				void *drvdata,</div><div class='add'>+				const struct hwmon_chip_info *info,</div><div class='add'>+				const struct attribute_group **extra_groups);</div><div class='ctx'> </div><div class='ctx'> void hwmon_device_unregister(struct device *dev);</div><div class='ctx'> void devm_hwmon_device_unregister(struct device *dev);</div><div class='ctx'> </div><div class='del'>-hwmon_device_register registers a hardware monitoring device. The parameter</div><div class='del'>-of this function is a pointer to the parent device.</div><div class='del'>-This function returns a pointer to the newly created hardware monitoring device</div><div class='del'>-or PTR_ERR for failure. If this registration function is used, hardware</div><div class='del'>-monitoring sysfs attributes are expected to have been created and attached to</div><div class='del'>-the parent device prior to calling hwmon_device_register. A name attribute must</div><div class='del'>-have been created by the caller.</div><div class='del'>-</div><div class='del'>-hwmon_device_register_with_groups is similar to hwmon_device_register. However,</div><div class='del'>-it has additional parameters. The name parameter is a pointer to the hwmon</div><div class='del'>-device name. The registration function wil create a name sysfs attribute</div><div class='del'>-pointing to this name. The drvdata parameter is the pointer to the local</div><div class='del'>-driver data.  hwmon_device_register_with_groups will attach this pointer</div><div class='del'>-to the newly allocated hwmon device. The pointer can be retrieved by the driver</div><div class='del'>-using dev_get_drvdata() on the hwmon device pointer. The groups parameter is</div><div class='add'>+hwmon_device_register_with_groups registers a hardware monitoring device.</div><div class='add'>+The first parameter of this function is a pointer to the parent device.</div><div class='add'>+The name parameter is a pointer to the hwmon device name. The registration</div><div class='add'>+function wil create a name sysfs attribute pointing to this name.</div><div class='add'>+The drvdata parameter is the pointer to the local driver data.</div><div class='add'>+hwmon_device_register_with_groups will attach this pointer to the newly</div><div class='add'>+allocated hwmon device. The pointer can be retrieved by the driver using</div><div class='add'>+dev_get_drvdata() on the hwmon device pointer. The groups parameter is</div><div class='ctx'> a pointer to a list of sysfs attribute groups. The list must be NULL terminated.</div><div class='ctx'> hwmon_device_register_with_groups creates the hwmon device with name attribute</div><div class='ctx'> as well as all sysfs attributes attached to the hwmon device.</div><div class='add'>+This function returns a pointer to the newly created hardware monitoring device</div><div class='add'>+or PTR_ERR for failure.</div><div class='ctx'> </div><div class='ctx'> devm_hwmon_device_register_with_groups is similar to</div><div class='ctx'> hwmon_device_register_with_groups. However, it is device managed, meaning the</div><div class='hunk'>@@ -87,13 +81,17 @@ hwmon_device_unregister deregisters a registered hardware monitoring device.</div><div class='ctx'> The parameter of this function is the pointer to the registered hardware</div><div class='ctx'> monitoring device structure. This function must be called from the driver</div><div class='ctx'> remove function if the hardware monitoring device was registered with</div><div class='del'>-hwmon_device_register, hwmon_device_register_with_groups, or</div><div class='del'>-hwmon_device_register_with_info.</div><div class='add'>+hwmon_device_register_with_groups or hwmon_device_register_with_info.</div><div class='ctx'> </div><div class='ctx'> devm_hwmon_device_unregister does not normally have to be called. It is only</div><div class='ctx'> needed for error handling, and only needed if the driver probe fails after</div><div class='del'>-the call to devm_hwmon_device_register_with_groups and if the automatic</div><div class='del'>-(device managed) removal would be too late.</div><div class='add'>+the call to devm_hwmon_device_register_with_groups or</div><div class='add'>+hwmon_device_register_with_info and if the automatic (device managed)</div><div class='add'>+removal would be too late.</div><div class='add'>+</div><div class='add'>+All supported hwmon device registration functions only accept valid device</div><div class='add'>+names. Device names including invalid characters (whitespace, '*', or '-')</div><div class='add'>+will be rejected. The 'name' parameter is mandatory.</div><div class='ctx'> </div><div class='ctx'> Using devm_hwmon_device_register_with_info()</div><div class='ctx'> --------------------------------------------</div><div class='hunk'>@@ -106,9 +104,9 @@ const char *name	Device name</div><div class='ctx'> void *drvdata		Driver private data</div><div class='ctx'> const struct hwmon_chip_info *info</div><div class='ctx'> 			Pointer to chip description.</div><div class='del'>-const struct attribute_group **groups</div><div class='del'>-			Null-terminated list of additional sysfs attribute</div><div class='del'>-			groups.</div><div class='add'>+const struct attribute_group **extra_groups</div><div class='add'>+			Null-terminated list of additional non-standard</div><div class='add'>+			sysfs attribute groups.</div><div class='ctx'> </div><div class='ctx'> This function returns a pointer to the created hardware monitoring device</div><div class='ctx'> on success and a negative error code for failure.</div><div class='hunk'>@@ -160,7 +158,7 @@ It contains following fields:</div><div class='ctx'> * type: The hardware monitoring sensor type.</div><div class='ctx'>   Supported sensor types are</div><div class='ctx'>   * hwmon_chip		A virtual sensor type, used to describe attributes</div><div class='del'>-			which apply to the entire chip.</div><div class='add'>+  *			which are not bound to a specific input or output</div><div class='ctx'>   * hwmon_temp		Temperature sensor</div><div class='ctx'>   * hwmon_in		Voltage sensor</div><div class='ctx'>   * hwmon_curr		Current sensor</div><div class='hunk'>@@ -293,9 +291,9 @@ Driver-provided sysfs attributes</div><div class='ctx'> </div><div class='ctx'> If the hardware monitoring device is registered with</div><div class='ctx'> hwmon_device_register_with_info or devm_hwmon_device_register_with_info,</div><div class='del'>-it is most likely not necessary to provide sysfs attributes. Only non-standard</div><div class='del'>-sysfs attributes need to be provided when one of those registration functions</div><div class='del'>-is used.</div><div class='add'>+it is most likely not necessary to provide sysfs attributes. Only additional</div><div class='add'>+non-standard sysfs attributes need to be provided when one of those registration</div><div class='add'>+functions is used.</div><div class='ctx'> </div><div class='ctx'> The header file linux/hwmon-sysfs.h provides a number of useful macros to</div><div class='ctx'> declare and use hardware monitoring sysfs attributes.</div><div class='head'>diff --git a/Documentation/hwmon/lm70 b/Documentation/hwmon/lm70<br/>index 1bb2db440671..c3a1f2ea017d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/hwmon/lm70?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/hwmon/lm70</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/hwmon/lm70?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/lm70</a></div><div class='hunk'>@@ -6,6 +6,8 @@ Supported chips:</div><div class='ctx'>     Datasheet: http://www.national.com/pf/LM/LM70.html</div><div class='ctx'>   * Texas Instruments TMP121/TMP123</div><div class='ctx'>     Information: http://focus.ti.com/docs/prod/folders/print/tmp121.html</div><div class='add'>+  * Texas Instruments TMP122/TMP124</div><div class='add'>+    Information: http://www.ti.com/product/tmp122</div><div class='ctx'>   * National Semiconductor LM71</div><div class='ctx'>     Datasheet: http://www.ti.com/product/LM71</div><div class='ctx'>   * National Semiconductor LM74</div><div class='hunk'>@@ -35,8 +37,10 @@ As a real (in-tree) example of this "SPI protocol driver" interfacing</div><div class='ctx'> with a "SPI master controller driver", see drivers/spi/spi_lm70llp.c</div><div class='ctx'> and its associated documentation.</div><div class='ctx'> </div><div class='del'>-The LM74 and TMP121/TMP123 are very similar; main difference is 13-bit</div><div class='del'>-temperature data (0.0625 degrees celsius resolution).</div><div class='add'>+The LM74 and TMP121/TMP122/TMP123/TMP124 are very similar; main difference is</div><div class='add'>+13-bit temperature data (0.0625 degrees celsius resolution).</div><div class='add'>+</div><div class='add'>+The TMP122/TMP124 also feature configurable temperature thresholds.</div><div class='ctx'> </div><div class='ctx'> The LM71 is also very similar; main difference is 14-bit temperature</div><div class='ctx'> data (0.03125 degrees celsius resolution).</div><div class='head'>diff --git a/Documentation/hwmon/sht21 b/Documentation/hwmon/sht21<br/>index db17fda45c3e..47f4765db256 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/hwmon/sht21?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/hwmon/sht21</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/hwmon/sht21?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/sht21</a></div><div class='hunk'>@@ -35,6 +35,7 @@ sysfs-Interface</div><div class='ctx'> </div><div class='ctx'> temp1_input - temperature input</div><div class='ctx'> humidity1_input - humidity input</div><div class='add'>+eic - Electronic Identification Code</div><div class='ctx'> </div><div class='ctx'> Notes</div><div class='ctx'> -----</div><div class='hunk'>@@ -45,5 +46,5 @@ humidity and 66 ms for temperature. To keep self heating below 0.1 degree</div><div class='ctx'> Celsius, the device should not be active for more than 10% of the time,</div><div class='ctx'> e.g. maximum two measurements per second at the given resolution.</div><div class='ctx'> </div><div class='del'>-Different resolutions, the on-chip heater, using the CRC checksum and reading</div><div class='del'>-the serial number are not supported yet.</div><div class='add'>+Different resolutions, the on-chip heater, and using the CRC checksum</div><div class='add'>+are not supported yet.</div><div class='head'>diff --git a/Documentation/hwmon/submitting-patches b/Documentation/hwmon/submitting-patches<br/>index 57f60307accc..f88221b46153 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/hwmon/submitting-patches?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/hwmon/submitting-patches</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/hwmon/submitting-patches?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/submitting-patches</a></div><div class='hunk'>@@ -10,10 +10,10 @@ increase the chances of your change being accepted.</div><div class='ctx'> ----------</div><div class='ctx'> </div><div class='ctx'> * It should be unnecessary to mention, but please read and follow</div><div class='del'>-    Documentation/SubmitChecklist</div><div class='del'>-    Documentation/SubmittingDrivers</div><div class='del'>-    Documentation/SubmittingPatches</div><div class='del'>-    Documentation/CodingStyle</div><div class='add'>+    Documentation/process/submit-checklist.rst</div><div class='add'>+    Documentation/process/submitting-drivers.rst</div><div class='add'>+    Documentation/process/submitting-patches.rst</div><div class='add'>+    Documentation/process/coding-style.rst</div><div class='ctx'> </div><div class='ctx'> * Please run your patch through 'checkpatch --strict'. There should be no</div><div class='ctx'>   errors, no warnings, and few if any check messages. If there are any</div><div class='head'>diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface<br/>index 2cc95ad46604..fc337c317c67 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/hwmon/sysfs-interface?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/hwmon/sysfs-interface</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/hwmon/sysfs-interface?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/sysfs-interface</a></div><div class='hunk'>@@ -86,8 +86,9 @@ given driver if the chip has the feature.</div><div class='ctx'> </div><div class='ctx'> name		The chip name.</div><div class='ctx'> 		This should be a short, lowercase string, not containing</div><div class='del'>-		spaces nor dashes, representing the chip name. This is</div><div class='del'>-		the only mandatory attribute.</div><div class='add'>+		whitespace, dashes, or the wildcard character '*'.</div><div class='add'>+		This attribute represents the chip name. It is the only</div><div class='add'>+		mandatory attribute.</div><div class='ctx'> 		I2C devices get this attribute created automatically.</div><div class='ctx'> 		RO</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/tc654 b/Documentation/hwmon/tc654<br/>new file mode 100644<br/>index 000000000000..91a2843f5f98<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/hwmon/tc654?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/tc654</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+Kernel driver tc654</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+  * Microship TC654 and TC655</div><div class='add'>+    Prefix: 'tc654'</div><div class='add'>+    Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/20001734C.pdf</div><div class='add'>+</div><div class='add'>+Authors:</div><div class='add'>+        Chris Packham &lt;chris.packham@alliedtelesis.co.nz&gt;</div><div class='add'>+        Masahiko Iwamoto &lt;iwamoto@allied-telesis.co.jp&gt;</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+This driver implements support for the Microchip TC654 and TC655.</div><div class='add'>+</div><div class='add'>+The TC654 uses the 2-wire interface compatible with the SMBUS 2.0</div><div class='add'>+specification. The TC654 has two (2) inputs for measuring fan RPM and</div><div class='add'>+one (1) PWM output which can be used for fan control.</div><div class='add'>+</div><div class='add'>+Configuration Notes</div><div class='add'>+-------------------</div><div class='add'>+Ordinarily the pwm1_mode ABI is used for controlling the pwm output</div><div class='add'>+mode.  However, for this chip the output is always pwm, and the</div><div class='add'>+pwm1_mode determines if the pwm output is controlled via the pwm1 value</div><div class='add'>+or via the Vin analog input.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Setting pwm1_mode to 1 will cause the pwm output to be driven based on</div><div class='add'>+the pwm1 value. Setting pwm1_mode to 0 will cause the pwm output to be</div><div class='add'>+driven based on the Vin input.</div><div class='head'>diff --git a/Documentation/hwmon/tmp108 b/Documentation/hwmon/tmp108<br/>new file mode 100644<br/>index 000000000000..25802df23010<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/hwmon/tmp108?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/hwmon/tmp108</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+Kernel driver tmp108</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+  * Texas Instruments TMP108</div><div class='add'>+    Prefix: 'tmp108'</div><div class='add'>+    Addresses scanned: none</div><div class='add'>+    Datasheet: http://www.ti.com/product/tmp108</div><div class='add'>+</div><div class='add'>+Author:</div><div class='add'>+	John Muir &lt;john@jmuir.com&gt;</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The Texas Instruments TMP108 implements one temperature sensor. An alert pin</div><div class='add'>+can be set when temperatures exceed minimum or maximum values plus or minus a</div><div class='add'>+hysteresis value. (This driver does not support interrupts for the alert pin,</div><div class='add'>+and the device runs in comparator mode.)</div><div class='add'>+</div><div class='add'>+The sensor is accurate to 0.75C over the range of -25 to +85 C, and to 1.0</div><div class='add'>+degree from -40 to +125 C. Resolution of the sensor is 0.0625 degree. The</div><div class='add'>+operating temperature has a minimum of -55 C and a maximum of +150 C.</div><div class='add'>+Hysteresis values can be set to 0, 1, 2, or 4C.</div><div class='add'>+</div><div class='add'>+The TMP108 has a programmable update rate that can select between 8, 4, 1, and</div><div class='add'>+0.5 Hz.</div><div class='add'>+</div><div class='add'>+By default the TMP108 reads the temperature continuously. To conserve power,</div><div class='add'>+the TMP108 has a one-shot mode where the device is normally shut-down. When a</div><div class='add'>+one shot is requested the temperature is read, the result can be retrieved,</div><div class='add'>+and then the device is shut down automatically. (This driver only supports</div><div class='add'>+continuous mode.)</div><div class='add'>+</div><div class='add'>+The driver provides the common sysfs-interface for temperatures (see</div><div class='add'>+Documentation/hwmon/sysfs-interface under Temperatures).</div><div class='head'>diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801<br/>index 1bba38dd2637..820d9040de16 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/i2c/busses/i2c-i801?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/i2c/busses/i2c-i801</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/i2c/busses/i2c-i801?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/i2c/busses/i2c-i801</a></div><div class='hunk'>@@ -33,6 +33,7 @@ Supported adapters:</div><div class='ctx'>   * Intel DNV (SOC)</div><div class='ctx'>   * Intel Broxton (SOC)</div><div class='ctx'>   * Intel Lewisburg (PCH)</div><div class='add'>+  * Intel Gemini Lake (SOC)</div><div class='ctx'>    Datasheets: Publicly available at the Intel website</div><div class='ctx'> </div><div class='ctx'> On Intel Patsburg and later chipsets, both the normal host SMBus controller</div><div class='head'>diff --git a/Documentation/i2c/busses/i2c-mlxcpld b/Documentation/i2c/busses/i2c-mlxcpld<br/>new file mode 100644<br/>index 000000000000..4e46c440b38d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/i2c/busses/i2c-mlxcpld?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/i2c/busses/i2c-mlxcpld</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+Driver i2c-mlxcpld</div><div class='add'>+</div><div class='add'>+Author: Michael Shych &lt;michaelsh@mellanox.com&gt;</div><div class='add'>+</div><div class='add'>+This is the Mellanox I2C controller logic, implemented in Lattice CPLD</div><div class='add'>+device.</div><div class='add'>+Device supports:</div><div class='add'>+ - Master mode.</div><div class='add'>+ - One physical bus.</div><div class='add'>+ - Polling mode.</div><div class='add'>+</div><div class='add'>+This controller is equipped within the next Mellanox systems:</div><div class='add'>+"msx6710", "msx6720", "msb7700", "msn2700", "msx1410", "msn2410", "msb7800",</div><div class='add'>+"msn2740", "msn2100".</div><div class='add'>+</div><div class='add'>+The next transaction types are supported:</div><div class='add'>+ - Receive Byte/Block.</div><div class='add'>+ - Send Byte/Block.</div><div class='add'>+ - Read Byte/Block.</div><div class='add'>+ - Write Byte/Block.</div><div class='add'>+</div><div class='add'>+Registers:</div><div class='add'>+CTRL		0x1 - control reg.</div><div class='add'>+			Resets all the registers.</div><div class='add'>+HALF_CYC	0x4 - cycle reg.</div><div class='add'>+			Configure the width of I2C SCL half clock cycle (in 4 LPC_CLK</div><div class='add'>+			units).</div><div class='add'>+I2C_HOLD	0x5 - hold reg.</div><div class='add'>+			OE (output enable) is delayed by value set to this register</div><div class='add'>+			(in LPC_CLK units)</div><div class='add'>+CMD			0x6 - command reg.</div><div class='add'>+			Bit 0, 0 = write, 1 = read.</div><div class='add'>+			Bits [7:1] - the 7bit Address of the I2C device.</div><div class='add'>+			It should be written last as it triggers an I2C transaction.</div><div class='add'>+NUM_DATA	0x7 - data size reg.</div><div class='add'>+			Number of data bytes to write in read transaction</div><div class='add'>+NUM_ADDR	0x8 - address reg.</div><div class='add'>+			Number of address bytes to write in read transaction.</div><div class='add'>+STATUS		0x9 - status reg.</div><div class='add'>+			Bit 0 - transaction is completed.</div><div class='add'>+			Bit 4 - ACK/NACK.</div><div class='add'>+DATAx		0xa - 0x54  - 68 bytes data buffer regs.</div><div class='add'>+			For write transaction address is specified in four first bytes</div><div class='add'>+			(DATA1 - DATA4), data starting from DATA4.</div><div class='add'>+			For read transactions address is sent in a separate transaction and</div><div class='add'>+			specified in the four first bytes (DATA0 - DATA3). Data is read</div><div class='add'>+			starting from DATA0.</div><div class='head'>diff --git a/Documentation/i2c/muxes/i2c-mux-gpio b/Documentation/i2c/muxes/i2c-mux-gpio<br/>index d4d91a53fc39..7a8d7d261632 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/i2c/muxes/i2c-mux-gpio?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/i2c/muxes/i2c-mux-gpio</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/i2c/muxes/i2c-mux-gpio?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/i2c/muxes/i2c-mux-gpio</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='del'>-Kernel driver i2c-gpio-mux</div><div class='add'>+Kernel driver i2c-mux-gpio</div><div class='ctx'> </div><div class='ctx'> Author: Peter Korsgaard &lt;peter.korsgaard@barco.com&gt;</div><div class='ctx'> </div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='ctx'> </div><div class='del'>-i2c-gpio-mux is an i2c mux driver providing access to I2C bus segments</div><div class='add'>+i2c-mux-gpio is an i2c mux driver providing access to I2C bus segments</div><div class='ctx'> from a master I2C bus and a hardware MUX controlled through GPIO pins.</div><div class='ctx'> </div><div class='ctx'> E.G.:</div><div class='hunk'>@@ -26,16 +26,16 @@ according to the settings of the GPIO pins 1..N.</div><div class='ctx'> Usage</div><div class='ctx'> -----</div><div class='ctx'> </div><div class='del'>-i2c-gpio-mux uses the platform bus, so you need to provide a struct</div><div class='add'>+i2c-mux-gpio uses the platform bus, so you need to provide a struct</div><div class='ctx'> platform_device with the platform_data pointing to a struct</div><div class='del'>-gpio_i2cmux_platform_data with the I2C adapter number of the master</div><div class='add'>+i2c_mux_gpio_platform_data with the I2C adapter number of the master</div><div class='ctx'> bus, the number of bus segments to create and the GPIO pins used</div><div class='del'>-to control it. See include/linux/i2c-gpio-mux.h for details.</div><div class='add'>+to control it. See include/linux/i2c-mux-gpio.h for details.</div><div class='ctx'> </div><div class='ctx'> E.G. something like this for a MUX providing 4 bus segments</div><div class='ctx'> controlled through 3 GPIO pins:</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/i2c-gpio-mux.h&gt;</div><div class='add'>+#include &lt;linux/i2c-mux-gpio.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const unsigned myboard_gpiomux_gpios[] = {</div><div class='hunk'>@@ -46,7 +46,7 @@ static const unsigned myboard_gpiomux_values[] = {</div><div class='ctx'> 	0, 1, 2, 3</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct gpio_i2cmux_platform_data myboard_i2cmux_data = {</div><div class='add'>+static struct i2c_mux_gpio_platform_data myboard_i2cmux_data = {</div><div class='ctx'> 	.parent		= 1,</div><div class='ctx'> 	.base_nr	= 2, /* optional */</div><div class='ctx'> 	.values		= myboard_gpiomux_values,</div><div class='hunk'>@@ -57,7 +57,7 @@ static struct gpio_i2cmux_platform_data myboard_i2cmux_data = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device myboard_i2cmux = {</div><div class='del'>-	.name		= "i2c-gpio-mux",</div><div class='add'>+	.name		= "i2c-mux-gpio",</div><div class='ctx'> 	.id		= 0,</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;myboard_i2cmux_data,</div><div class='hunk'>@@ -66,14 +66,14 @@ static struct platform_device myboard_i2cmux = {</div><div class='ctx'> </div><div class='ctx'> If you don't know the absolute GPIO pin numbers at registration time,</div><div class='ctx'> you can instead provide a chip name (.chip_name) and relative GPIO pin</div><div class='del'>-numbers, and the i2c-gpio-mux driver will do the work for you,</div><div class='add'>+numbers, and the i2c-mux-gpio driver will do the work for you,</div><div class='ctx'> including deferred probing if the GPIO chip isn't immediately</div><div class='ctx'> available.</div><div class='ctx'> </div><div class='ctx'> Device Registration</div><div class='ctx'> -------------------</div><div class='ctx'> </div><div class='del'>-When registering your i2c-gpio-mux device, you should pass the number</div><div class='add'>+When registering your i2c-mux-gpio device, you should pass the number</div><div class='ctx'> of any GPIO pin it uses as the device ID. This guarantees that every</div><div class='ctx'> instance has a different ID.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/i2c/smbus-protocol b/Documentation/i2c/smbus-protocol<br/>index 14d4ec1be245..092d474f5843 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/i2c/smbus-protocol?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/i2c/smbus-protocol</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/i2c/smbus-protocol?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/i2c/smbus-protocol</a></div><div class='hunk'>@@ -200,10 +200,14 @@ alerting device's address.</div><div class='ctx'> [S] [HostAddr] [Wr] A [DevAddr] A [DataLow] A [DataHigh] A [P]</div><div class='ctx'> </div><div class='ctx'> This is implemented in the following way in the Linux kernel:</div><div class='del'>-* I2C bus drivers which support SMBus Host Notify should call</div><div class='del'>-  i2c_setup_smbus_host_notify() to setup SMBus Host Notify support.</div><div class='del'>-* I2C drivers for devices which can trigger SMBus Host Notify should implement</div><div class='del'>-  the optional alert() callback.</div><div class='add'>+* I2C bus drivers which support SMBus Host Notify should report</div><div class='add'>+  I2C_FUNC_SMBUS_HOST_NOTIFY.</div><div class='add'>+* I2C bus drivers trigger SMBus Host Notify by a call to</div><div class='add'>+  i2c_handle_smbus_host_notify().</div><div class='add'>+* I2C drivers for devices which can trigger SMBus Host Notify will have</div><div class='add'>+  client-&gt;irq assigned to a Host Notify IRQ if noone else specified an other.</div><div class='add'>+</div><div class='add'>+There is currently no way to retrieve the data parameter from the client.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Packet Error Checking (PEC)</div><div class='head'>diff --git a/Documentation/index.rst b/Documentation/index.rst<br/>index c53d089455a4..f6e641a54bbc 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/index.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/index.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/index.rst</a></div><div class='hunk'>@@ -3,21 +3,78 @@</div><div class='ctx'>    You can adapt this file completely to your liking, but it should at least</div><div class='ctx'>    contain the root `toctree` directive.</div><div class='ctx'> </div><div class='del'>-Welcome to The Linux Kernel's documentation!</div><div class='del'>-============================================</div><div class='add'>+Welcome to The Linux Kernel's documentation</div><div class='add'>+===========================================</div><div class='ctx'> </div><div class='del'>-Contents:</div><div class='add'>+This is the top level of the kernel's documentation tree.  Kernel</div><div class='add'>+documentation, like the kernel itself, is very much a work in progress;</div><div class='add'>+that is especially true as we work to integrate our many scattered</div><div class='add'>+documents into a coherent whole.  Please note that improvements to the</div><div class='add'>+documentation are welcome; join the linux-doc list at vger.kernel.org if</div><div class='add'>+you want to help out.</div><div class='add'>+</div><div class='add'>+User-oriented documentation</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+The following manuals are written for *users* of the kernel — those who are</div><div class='add'>+trying to get it to work optimally on a given system.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   admin-guide/index</div><div class='add'>+</div><div class='add'>+Introduction to kernel development</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+These manuals contain overall information about how to develop the kernel.</div><div class='add'>+The kernel community is quite large, with thousands of developers</div><div class='add'>+contributing over the course of a year.  As with any large community,</div><div class='add'>+knowing how things are done will make the process of getting your changes</div><div class='add'>+merged much easier.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   process/index</div><div class='add'>+   dev-tools/index</div><div class='add'>+   doc-guide/index</div><div class='add'>+</div><div class='add'>+Kernel API documentation</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+These books get into the details of how specific kernel subsystems work</div><div class='add'>+from the point of view of a kernel developer.  Much of the information here</div><div class='add'>+is taken directly from the kernel source, with supplemental material added</div><div class='add'>+as needed (or at least as we managed to add it — probably *not* all that is</div><div class='add'>+needed).</div><div class='ctx'> </div><div class='ctx'> .. toctree::</div><div class='ctx'>    :maxdepth: 2</div><div class='ctx'> </div><div class='del'>-   kernel-documentation</div><div class='del'>-   development-process/index</div><div class='del'>-   dev-tools/tools</div><div class='ctx'>    driver-api/index</div><div class='add'>+   core-api/index</div><div class='ctx'>    media/index</div><div class='ctx'>    gpu/index</div><div class='del'>-   80211/index</div><div class='add'>+   security/index</div><div class='add'>+   sound/index</div><div class='add'>+   crypto/index</div><div class='add'>+</div><div class='add'>+Korean translations</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   translations/ko_KR/index</div><div class='add'>+</div><div class='add'>+Chinese translations</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   translations/zh_CN/index</div><div class='ctx'> </div><div class='ctx'> Indices and tables</div><div class='ctx'> ==================</div><div class='head'>diff --git a/Documentation/init.txt b/Documentation/init.txt<br/>deleted file mode 100644<br/>index 535ad5e82b98..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/init.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/init.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +0,0 @@</div><div class='del'>-Explaining the dreaded "No init found." boot hang message</div><div class='del'>-=========================================================</div><div class='del'>-</div><div class='del'>-OK, so you've got this pretty unintuitive message (currently located</div><div class='del'>-in init/main.c) and are wondering what the H*** went wrong.</div><div class='del'>-Some high-level reasons for failure (listed roughly in order of execution)</div><div class='del'>-to load the init binary are:</div><div class='del'>-A) Unable to mount root FS</div><div class='del'>-B) init binary doesn't exist on rootfs</div><div class='del'>-C) broken console device</div><div class='del'>-D) binary exists but dependencies not available</div><div class='del'>-E) binary cannot be loaded</div><div class='del'>-</div><div class='del'>-Detailed explanations:</div><div class='del'>-0) Set "debug" kernel parameter (in bootloader config file or CONFIG_CMDLINE)</div><div class='del'>-   to get more detailed kernel messages.</div><div class='del'>-A) make sure you have the correct root FS type</div><div class='del'>-   (and root= kernel parameter points to the correct partition),</div><div class='del'>-   required drivers such as storage hardware (such as SCSI or USB!)</div><div class='del'>-   and filesystem (ext3, jffs2 etc.) are builtin (alternatively as modules,</div><div class='del'>-   to be pre-loaded by an initrd)</div><div class='del'>-C) Possibly a conflict in console= setup --&gt; initial console unavailable.</div><div class='del'>-   E.g. some serial consoles are unreliable due to serial IRQ issues (e.g.</div><div class='del'>-   missing interrupt-based configuration).</div><div class='del'>-   Try using a different console= device or e.g. netconsole= .</div><div class='del'>-D) e.g. required library dependencies of the init binary such as</div><div class='del'>-   /lib/ld-linux.so.2 missing or broken. Use readelf -d &lt;INIT&gt;|grep NEEDED</div><div class='del'>-   to find out which libraries are required.</div><div class='del'>-E) make sure the binary's architecture matches your hardware.</div><div class='del'>-   E.g. i386 vs. x86_64 mismatch, or trying to load x86 on ARM hardware.</div><div class='del'>-   In case you tried loading a non-binary file here (shell script?),</div><div class='del'>-   you should make sure that the script specifies an interpreter in its shebang</div><div class='del'>-   header line (#!/...) that is fully working (including its library</div><div class='del'>-   dependencies). And before tackling scripts, better first test a simple</div><div class='del'>-   non-script binary such as /bin/sh and confirm its successful execution.</div><div class='del'>-   To find out more, add code to init/main.c to display kernel_execve()s</div><div class='del'>-   return values.</div><div class='del'>-</div><div class='del'>-Please extend this explanation whenever you find new failure causes</div><div class='del'>-(after all loading the init binary is a CRITICAL and hard transition step</div><div class='del'>-which needs to be made as painless as possible), then submit patch to LKML.</div><div class='del'>-Further TODOs:</div><div class='del'>-- Implement the various run_init_process() invocations via a struct array</div><div class='del'>-  which can then store the kernel_execve() result value and on failure</div><div class='del'>-  log it all by iterating over _all_ results (very important usability fix).</div><div class='del'>-- try to make the implementation itself more helpful in general,</div><div class='del'>-  e.g. by providing additional error messages at affected places.</div><div class='del'>-</div><div class='del'>-Andreas Mohr &lt;andi at lisas period de&gt;</div><div class='head'>diff --git a/Documentation/initrd.txt b/Documentation/initrd.txt<br/>deleted file mode 100644<br/>index 4e1839ccb555..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/initrd.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/initrd.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,366 +0,0 @@</div><div class='del'>-Using the initial RAM disk (initrd)</div><div class='del'>-===================================</div><div class='del'>-</div><div class='del'>-Written 1996,2000 by Werner Almesberger &lt;werner.almesberger@epfl.ch&gt; and</div><div class='del'>-                     Hans Lermen &lt;lermen@fgan.de&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-initrd provides the capability to load a RAM disk by the boot loader.</div><div class='del'>-This RAM disk can then be mounted as the root file system and programs</div><div class='del'>-can be run from it. Afterwards, a new root file system can be mounted</div><div class='del'>-from a different device. The previous root (from initrd) is then moved</div><div class='del'>-to a directory and can be subsequently unmounted.</div><div class='del'>-</div><div class='del'>-initrd is mainly designed to allow system startup to occur in two phases,</div><div class='del'>-where the kernel comes up with a minimum set of compiled-in drivers, and</div><div class='del'>-where additional modules are loaded from initrd.</div><div class='del'>-</div><div class='del'>-This document gives a brief overview of the use of initrd. A more detailed</div><div class='del'>-discussion of the boot process can be found in [1].</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Operation</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-When using initrd, the system typically boots as follows:</div><div class='del'>-</div><div class='del'>-  1) the boot loader loads the kernel and the initial RAM disk</div><div class='del'>-  2) the kernel converts initrd into a "normal" RAM disk and</div><div class='del'>-     frees the memory used by initrd</div><div class='del'>-  3) if the root device is not /dev/ram0, the old (deprecated)</div><div class='del'>-     change_root procedure is followed. see the "Obsolete root change</div><div class='del'>-     mechanism" section below.</div><div class='del'>-  4) root device is mounted. if it is /dev/ram0, the initrd image is</div><div class='del'>-     then mounted as root</div><div class='del'>-  5) /sbin/init is executed (this can be any valid executable, including</div><div class='del'>-     shell scripts; it is run with uid 0 and can do basically everything</div><div class='del'>-     init can do).</div><div class='del'>-  6) init mounts the "real" root file system</div><div class='del'>-  7) init places the root file system at the root directory using the</div><div class='del'>-     pivot_root system call</div><div class='del'>-  8) init execs the /sbin/init on the new root filesystem, performing</div><div class='del'>-     the usual boot sequence</div><div class='del'>-  9) the initrd file system is removed</div><div class='del'>-</div><div class='del'>-Note that changing the root directory does not involve unmounting it.</div><div class='del'>-It is therefore possible to leave processes running on initrd during that</div><div class='del'>-procedure. Also note that file systems mounted under initrd continue to</div><div class='del'>-be accessible.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Boot command-line options</div><div class='del'>--------------------------</div><div class='del'>-</div><div class='del'>-initrd adds the following new options:</div><div class='del'>-</div><div class='del'>-  initrd=&lt;path&gt;    (e.g. LOADLIN)</div><div class='del'>-</div><div class='del'>-    Loads the specified file as the initial RAM disk. When using LILO, you</div><div class='del'>-    have to specify the RAM disk image file in /etc/lilo.conf, using the</div><div class='del'>-    INITRD configuration variable.</div><div class='del'>-</div><div class='del'>-  noinitrd</div><div class='del'>-</div><div class='del'>-    initrd data is preserved but it is not converted to a RAM disk and</div><div class='del'>-    the "normal" root file system is mounted. initrd data can be read</div><div class='del'>-    from /dev/initrd. Note that the data in initrd can have any structure</div><div class='del'>-    in this case and doesn't necessarily have to be a file system image.</div><div class='del'>-    This option is used mainly for debugging.</div><div class='del'>-</div><div class='del'>-    Note: /dev/initrd is read-only and it can only be used once. As soon</div><div class='del'>-    as the last process has closed it, all data is freed and /dev/initrd</div><div class='del'>-    can't be opened anymore.</div><div class='del'>-</div><div class='del'>-  root=/dev/ram0</div><div class='del'>-</div><div class='del'>-    initrd is mounted as root, and the normal boot procedure is followed,</div><div class='del'>-    with the RAM disk mounted as root.</div><div class='del'>-</div><div class='del'>-Compressed cpio images</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-Recent kernels have support for populating a ramdisk from a compressed cpio</div><div class='del'>-archive. On such systems, the creation of a ramdisk image doesn't need to</div><div class='del'>-involve special block devices or loopbacks; you merely create a directory on</div><div class='del'>-disk with the desired initrd content, cd to that directory, and run (as an</div><div class='del'>-example):</div><div class='del'>-</div><div class='del'>-find . | cpio --quiet -H newc -o | gzip -9 -n &gt; /boot/imagefile.img</div><div class='del'>-</div><div class='del'>-Examining the contents of an existing image file is just as simple:</div><div class='del'>-</div><div class='del'>-mkdir /tmp/imagefile</div><div class='del'>-cd /tmp/imagefile</div><div class='del'>-gzip -cd /boot/imagefile.img | cpio -imd --quiet</div><div class='del'>-</div><div class='del'>-Installation</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-First, a directory for the initrd file system has to be created on the</div><div class='del'>-"normal" root file system, e.g.</div><div class='del'>-</div><div class='del'>-# mkdir /initrd</div><div class='del'>-</div><div class='del'>-The name is not relevant. More details can be found on the pivot_root(2)</div><div class='del'>-man page.</div><div class='del'>-</div><div class='del'>-If the root file system is created during the boot procedure (i.e. if</div><div class='del'>-you're building an install floppy), the root file system creation</div><div class='del'>-procedure should create the /initrd directory.</div><div class='del'>-</div><div class='del'>-If initrd will not be mounted in some cases, its content is still</div><div class='del'>-accessible if the following device has been created:</div><div class='del'>-</div><div class='del'>-# mknod /dev/initrd b 1 250 </div><div class='del'>-# chmod 400 /dev/initrd</div><div class='del'>-</div><div class='del'>-Second, the kernel has to be compiled with RAM disk support and with</div><div class='del'>-support for the initial RAM disk enabled. Also, at least all components</div><div class='del'>-needed to execute programs from initrd (e.g. executable format and file</div><div class='del'>-system) must be compiled into the kernel.</div><div class='del'>-</div><div class='del'>-Third, you have to create the RAM disk image. This is done by creating a</div><div class='del'>-file system on a block device, copying files to it as needed, and then</div><div class='del'>-copying the content of the block device to the initrd file. With recent</div><div class='del'>-kernels, at least three types of devices are suitable for that:</div><div class='del'>-</div><div class='del'>- - a floppy disk (works everywhere but it's painfully slow)</div><div class='del'>- - a RAM disk (fast, but allocates physical memory)</div><div class='del'>- - a loopback device (the most elegant solution)</div><div class='del'>-</div><div class='del'>-We'll describe the loopback device method:</div><div class='del'>-</div><div class='del'>- 1) make sure loopback block devices are configured into the kernel</div><div class='del'>- 2) create an empty file system of the appropriate size, e.g.</div><div class='del'>-    # dd if=/dev/zero of=initrd bs=300k count=1</div><div class='del'>-    # mke2fs -F -m0 initrd</div><div class='del'>-    (if space is critical, you may want to use the Minix FS instead of Ext2)</div><div class='del'>- 3) mount the file system, e.g.</div><div class='del'>-    # mount -t ext2 -o loop initrd /mnt</div><div class='del'>- 4) create the console device:</div><div class='del'>-    # mkdir /mnt/dev</div><div class='del'>-    # mknod /mnt/dev/console c 5 1</div><div class='del'>- 5) copy all the files that are needed to properly use the initrd</div><div class='del'>-    environment. Don't forget the most important file, /sbin/init</div><div class='del'>-    Note that /sbin/init's permissions must include "x" (execute).</div><div class='del'>- 6) correct operation the initrd environment can frequently be tested</div><div class='del'>-    even without rebooting with the command</div><div class='del'>-    # chroot /mnt /sbin/init</div><div class='del'>-    This is of course limited to initrds that do not interfere with the</div><div class='del'>-    general system state (e.g. by reconfiguring network interfaces,</div><div class='del'>-    overwriting mounted devices, trying to start already running demons,</div><div class='del'>-    etc. Note however that it is usually possible to use pivot_root in</div><div class='del'>-    such a chroot'ed initrd environment.)</div><div class='del'>- 7) unmount the file system</div><div class='del'>-    # umount /mnt</div><div class='del'>- 8) the initrd is now in the file "initrd". Optionally, it can now be</div><div class='del'>-    compressed</div><div class='del'>-    # gzip -9 initrd</div><div class='del'>-</div><div class='del'>-For experimenting with initrd, you may want to take a rescue floppy and</div><div class='del'>-only add a symbolic link from /sbin/init to /bin/sh. Alternatively, you</div><div class='del'>-can try the experimental newlib environment [2] to create a small</div><div class='del'>-initrd.</div><div class='del'>-</div><div class='del'>-Finally, you have to boot the kernel and load initrd. Almost all Linux</div><div class='del'>-boot loaders support initrd. Since the boot process is still compatible</div><div class='del'>-with an older mechanism, the following boot command line parameters</div><div class='del'>-have to be given:</div><div class='del'>-</div><div class='del'>-  root=/dev/ram0 rw</div><div class='del'>-</div><div class='del'>-(rw is only necessary if writing to the initrd file system.)</div><div class='del'>-</div><div class='del'>-With LOADLIN, you simply execute</div><div class='del'>-</div><div class='del'>-     LOADLIN &lt;kernel&gt; initrd=&lt;disk_image&gt;</div><div class='del'>-e.g. LOADLIN C:\LINUX\BZIMAGE initrd=C:\LINUX\INITRD.GZ root=/dev/ram0 rw</div><div class='del'>-</div><div class='del'>-With LILO, you add the option INITRD=&lt;path&gt; to either the global section</div><div class='del'>-or to the section of the respective kernel in /etc/lilo.conf, and pass</div><div class='del'>-the options using APPEND, e.g.</div><div class='del'>-</div><div class='del'>-  image = /bzImage</div><div class='del'>-    initrd = /boot/initrd.gz</div><div class='del'>-    append = "root=/dev/ram0 rw"</div><div class='del'>-</div><div class='del'>-and run /sbin/lilo</div><div class='del'>-</div><div class='del'>-For other boot loaders, please refer to the respective documentation.</div><div class='del'>-</div><div class='del'>-Now you can boot and enjoy using initrd.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Changing the root device</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-When finished with its duties, init typically changes the root device</div><div class='del'>-and proceeds with starting the Linux system on the "real" root device.</div><div class='del'>-</div><div class='del'>-The procedure involves the following steps:</div><div class='del'>- - mounting the new root file system</div><div class='del'>- - turning it into the root file system</div><div class='del'>- - removing all accesses to the old (initrd) root file system</div><div class='del'>- - unmounting the initrd file system and de-allocating the RAM disk</div><div class='del'>-</div><div class='del'>-Mounting the new root file system is easy: it just needs to be mounted on</div><div class='del'>-a directory under the current root. Example:</div><div class='del'>-</div><div class='del'>-# mkdir /new-root</div><div class='del'>-# mount -o ro /dev/hda1 /new-root</div><div class='del'>-</div><div class='del'>-The root change is accomplished with the pivot_root system call, which</div><div class='del'>-is also available via the pivot_root utility (see pivot_root(8) man</div><div class='del'>-page; pivot_root is distributed with util-linux version 2.10h or higher</div><div class='del'>-[3]). pivot_root moves the current root to a directory under the new</div><div class='del'>-root, and puts the new root at its place. The directory for the old root</div><div class='del'>-must exist before calling pivot_root. Example:</div><div class='del'>-</div><div class='del'>-# cd /new-root</div><div class='del'>-# mkdir initrd</div><div class='del'>-# pivot_root . initrd</div><div class='del'>-</div><div class='del'>-Now, the init process may still access the old root via its</div><div class='del'>-executable, shared libraries, standard input/output/error, and its</div><div class='del'>-current root directory. All these references are dropped by the</div><div class='del'>-following command:</div><div class='del'>-</div><div class='del'>-# exec chroot . what-follows &lt;dev/console &gt;dev/console 2&gt;&amp;1</div><div class='del'>-</div><div class='del'>-Where what-follows is a program under the new root, e.g. /sbin/init</div><div class='del'>-If the new root file system will be used with udev and has no valid</div><div class='del'>-/dev directory, udev must be initialized before invoking chroot in order</div><div class='del'>-to provide /dev/console.</div><div class='del'>-</div><div class='del'>-Note: implementation details of pivot_root may change with time. In order</div><div class='del'>-to ensure compatibility, the following points should be observed:</div><div class='del'>-</div><div class='del'>- - before calling pivot_root, the current directory of the invoking</div><div class='del'>-   process should point to the new root directory</div><div class='del'>- - use . as the first argument, and the _relative_ path of the directory</div><div class='del'>-   for the old root as the second argument</div><div class='del'>- - a chroot program must be available under the old and the new root</div><div class='del'>- - chroot to the new root afterwards</div><div class='del'>- - use relative paths for dev/console in the exec command</div><div class='del'>-</div><div class='del'>-Now, the initrd can be unmounted and the memory allocated by the RAM</div><div class='del'>-disk can be freed:</div><div class='del'>-</div><div class='del'>-# umount /initrd</div><div class='del'>-# blockdev --flushbufs /dev/ram0</div><div class='del'>-</div><div class='del'>-It is also possible to use initrd with an NFS-mounted root, see the</div><div class='del'>-pivot_root(8) man page for details.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Usage scenarios</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-The main motivation for implementing initrd was to allow for modular</div><div class='del'>-kernel configuration at system installation. The procedure would work</div><div class='del'>-as follows:</div><div class='del'>-</div><div class='del'>-  1) system boots from floppy or other media with a minimal kernel</div><div class='del'>-     (e.g. support for RAM disks, initrd, a.out, and the Ext2 FS) and</div><div class='del'>-     loads initrd</div><div class='del'>-  2) /sbin/init determines what is needed to (1) mount the "real" root FS</div><div class='del'>-     (i.e. device type, device drivers, file system) and (2) the</div><div class='del'>-     distribution media (e.g. CD-ROM, network, tape, ...). This can be</div><div class='del'>-     done by asking the user, by auto-probing, or by using a hybrid</div><div class='del'>-     approach.</div><div class='del'>-  3) /sbin/init loads the necessary kernel modules</div><div class='del'>-  4) /sbin/init creates and populates the root file system (this doesn't</div><div class='del'>-     have to be a very usable system yet)</div><div class='del'>-  5) /sbin/init invokes pivot_root to change the root file system and</div><div class='del'>-     execs - via chroot - a program that continues the installation</div><div class='del'>-  6) the boot loader is installed</div><div class='del'>-  7) the boot loader is configured to load an initrd with the set of</div><div class='del'>-     modules that was used to bring up the system (e.g. /initrd can be</div><div class='del'>-     modified, then unmounted, and finally, the image is written from</div><div class='del'>-     /dev/ram0 or /dev/rd/0 to a file)</div><div class='del'>-  8) now the system is bootable and additional installation tasks can be</div><div class='del'>-     performed</div><div class='del'>-</div><div class='del'>-The key role of initrd here is to re-use the configuration data during</div><div class='del'>-normal system operation without requiring the use of a bloated "generic"</div><div class='del'>-kernel or re-compiling or re-linking the kernel.</div><div class='del'>-</div><div class='del'>-A second scenario is for installations where Linux runs on systems with</div><div class='del'>-different hardware configurations in a single administrative domain. In</div><div class='del'>-such cases, it is desirable to generate only a small set of kernels</div><div class='del'>-(ideally only one) and to keep the system-specific part of configuration</div><div class='del'>-information as small as possible. In this case, a common initrd could be</div><div class='del'>-generated with all the necessary modules. Then, only /sbin/init or a file</div><div class='del'>-read by it would have to be different.</div><div class='del'>-</div><div class='del'>-A third scenario is more convenient recovery disks, because information</div><div class='del'>-like the location of the root FS partition doesn't have to be provided at</div><div class='del'>-boot time, but the system loaded from initrd can invoke a user-friendly</div><div class='del'>-dialog and it can also perform some sanity checks (or even some form of</div><div class='del'>-auto-detection).</div><div class='del'>-</div><div class='del'>-Last not least, CD-ROM distributors may use it for better installation</div><div class='del'>-from CD, e.g. by using a boot floppy and bootstrapping a bigger RAM disk</div><div class='del'>-via initrd from CD; or by booting via a loader like LOADLIN or directly</div><div class='del'>-from the CD-ROM, and loading the RAM disk from CD without need of</div><div class='del'>-floppies. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Obsolete root change mechanism</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-The following mechanism was used before the introduction of pivot_root.</div><div class='del'>-Current kernels still support it, but you should _not_ rely on its</div><div class='del'>-continued availability.</div><div class='del'>-</div><div class='del'>-It works by mounting the "real" root device (i.e. the one set with rdev</div><div class='del'>-in the kernel image or with root=... at the boot command line) as the</div><div class='del'>-root file system when linuxrc exits. The initrd file system is then</div><div class='del'>-unmounted, or, if it is still busy, moved to a directory /initrd, if</div><div class='del'>-such a directory exists on the new root file system.</div><div class='del'>-</div><div class='del'>-In order to use this mechanism, you do not have to specify the boot</div><div class='del'>-command options root, init, or rw. (If specified, they will affect</div><div class='del'>-the real root file system, not the initrd environment.)</div><div class='del'>-  </div><div class='del'>-If /proc is mounted, the "real" root device can be changed from within</div><div class='del'>-linuxrc by writing the number of the new root FS device to the special</div><div class='del'>-file /proc/sys/kernel/real-root-dev, e.g.</div><div class='del'>-</div><div class='del'>-  # echo 0x301 &gt;/proc/sys/kernel/real-root-dev</div><div class='del'>-</div><div class='del'>-Note that the mechanism is incompatible with NFS and similar file</div><div class='del'>-systems.</div><div class='del'>-</div><div class='del'>-This old, deprecated mechanism is commonly called "change_root", while</div><div class='del'>-the new, supported mechanism is called "pivot_root".</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Mixed change_root and pivot_root mechanism</div><div class='del'>-------------------------------------------</div><div class='del'>-</div><div class='del'>-In case you did not want to use root=/dev/ram0 to trigger the pivot_root</div><div class='del'>-mechanism, you may create both /linuxrc and /sbin/init in your initrd image.</div><div class='del'>-</div><div class='del'>-/linuxrc would contain only the following:</div><div class='del'>-</div><div class='del'>-#! /bin/sh</div><div class='del'>-mount -n -t proc proc /proc</div><div class='del'>-echo 0x0100 &gt;/proc/sys/kernel/real-root-dev</div><div class='del'>-umount -n /proc</div><div class='del'>-</div><div class='del'>-Once linuxrc exited, the kernel would mount again your initrd as root,</div><div class='del'>-this time executing /sbin/init. Again, it would be the duty of this init</div><div class='del'>-to build the right environment (maybe using the root= device passed on</div><div class='del'>-the cmdline) before the final execution of the real /sbin/init.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Resources</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-[1] Almesberger, Werner; "Booting Linux: The History and the Future"</div><div class='del'>-    http://www.almesberger.net/cv/papers/ols2k-9.ps.gz</div><div class='del'>-[2] newlib package (experimental), with initrd example</div><div class='del'>-    http://sources.redhat.com/newlib/</div><div class='del'>-[3] util-linux: Miscellaneous utilities for Linux</div><div class='del'>-    http://www.kernel.org/pub/linux/utils/util-linux/</div><div class='head'>diff --git a/Documentation/input/input.txt b/Documentation/input/input.txt<br/>index 0acfddbe2028..7ebce100fe90 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/input/input.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/input/input.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/input/input.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/input/input.txt</a></div><div class='hunk'>@@ -279,10 +279,10 @@ struct input_event {</div><div class='ctx'> </div><div class='ctx'>   'time' is the timestamp, it returns the time at which the event happened.</div><div class='ctx'> Type is for example EV_REL for relative moment, EV_KEY for a keypress or</div><div class='del'>-release. More types are defined in include/linux/input.h.</div><div class='add'>+release. More types are defined in include/uapi/linux/input-event-codes.h.</div><div class='ctx'> </div><div class='ctx'>   'code' is event code, for example REL_X or KEY_BACKSPACE, again a complete</div><div class='del'>-list is in include/linux/input.h.</div><div class='add'>+list is in include/uapi/linux/input-event-codes.h.</div><div class='ctx'> </div><div class='ctx'>   'value' is the value the event carries. Either a relative change for</div><div class='ctx'> EV_REL, absolute new value for EV_ABS (joysticks ...), or 0 for EV_KEY for</div><div class='head'>diff --git a/Documentation/ioctl/botching-up-ioctls.txt b/Documentation/ioctl/botching-up-ioctls.txt<br/>index 36138c632f7a..d02cfb48901c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ioctl/botching-up-ioctls.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ioctl/botching-up-ioctls.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ioctl/botching-up-ioctls.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ioctl/botching-up-ioctls.txt</a></div><div class='hunk'>@@ -24,7 +24,7 @@ Prerequisites</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='ctx'> First the prerequisites. Without these you have already failed, because you</div><div class='del'>-will need to add a a 32-bit compat layer:</div><div class='add'>+will need to add a 32-bit compat layer:</div><div class='ctx'> </div><div class='ctx'>  * Only use fixed sized integers. To avoid conflicts with typedefs in userspace</div><div class='ctx'>    the kernel has special types like __u32, __s64. Use them.</div><div class='head'>diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt<br/>index 81c7f2bb7daf..08244bea5048 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ioctl/ioctl-number.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ioctl/ioctl-number.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/ioctl/ioctl-number.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/ioctl/ioctl-number.txt</a></div><div class='hunk'>@@ -321,6 +321,7 @@ Code  Seq#(hex)	Include File		Comments</div><div class='ctx'> 0xB1	00-1F	PPPoX			&lt;mailto:mostrows@styx.uwaterloo.ca&gt;</div><div class='ctx'> 0xB3	00	linux/mmc/ioctl.h</div><div class='ctx'> 0xB4	00-0F	linux/gpio.h		&lt;mailto:linux-gpio@vger.kernel.org&gt;</div><div class='add'>+0xB5	00-0F	uapi/linux/rpmsg.h	&lt;mailto:linux-remoteproc@vger.kernel.org&gt;</div><div class='ctx'> 0xC0	00-0F	linux/usb/iowarrior.h</div><div class='ctx'> 0xCA	00-0F	uapi/misc/cxl.h</div><div class='ctx'> 0xCA	80-8F	uapi/scsi/cxlflash_ioctl.h</div><div class='head'>diff --git a/Documentation/isdn/README b/Documentation/isdn/README<br/>index cfb1884342ee..32d4e80c2c03 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/isdn/README?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/isdn/README</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/isdn/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/isdn/README</a></div><div class='hunk'>@@ -332,7 +332,7 @@ README for the ISDN-subsystem</div><div class='ctx'> 4. Device-inodes</div><div class='ctx'> </div><div class='ctx'>    The major and minor numbers and their names are described in</div><div class='del'>-   Documentation/devices.txt. The major numbers are:</div><div class='add'>+   Documentation/admin-guide/devices.rst. The major numbers are:</div><div class='ctx'> </div><div class='ctx'>      43 for the ISDN-tty's.</div><div class='ctx'>      44 for the ISDN-callout-tty's.</div><div class='head'>diff --git a/Documentation/ja_JP/HOWTO b/Documentation/ja_JP/HOWTO<br/>deleted file mode 100644<br/>index 581c14bdd7be..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/ja_JP/HOWTO?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ja_JP/HOWTO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,637 +0,0 @@</div><div class='del'>-NOTE:</div><div class='del'>-This is a version of Documentation/HOWTO translated into Japanese.</div><div class='del'>-This document is maintained by Tsugikazu Shibata &lt;tshibata@ab.jp.nec.com&gt;</div><div class='del'>-and the JF Project team &lt;www.linux.or.jp/JF&gt;.</div><div class='del'>-If you find any difference between this document and the original file</div><div class='del'>-or a problem with the translation,</div><div class='del'>-please contact the maintainer of this file or JF project.</div><div class='del'>-</div><div class='del'>-Please also note that the purpose of this file is to be easier to read</div><div class='del'>-for non English (read: Japanese) speakers and is not intended as a</div><div class='del'>-fork. So if you have any comments or updates for this file, please try</div><div class='del'>-to update the original English file first.</div><div class='del'>-</div><div class='del'>-Last Updated: 2013/07/19</div><div class='del'>-==================================</div><div class='del'>-これは、</div><div class='del'>-linux-3.10/Documentation/HOWTO</div><div class='del'>-の和訳です。</div><div class='del'>-</div><div class='del'>-翻訳団体： JF プロジェクト &lt; http://linuxjf.sourceforge.jp/ &gt;</div><div class='del'>-翻訳日： 2013/7/19</div><div class='del'>-翻訳者： Tsugikazu Shibata &lt;tshibata at ab dot jp dot nec dot com&gt;</div><div class='del'>-校正者： 松倉さん &lt;nbh--mats at nifty dot com&gt;</div><div class='del'>-         小林 雅典さん (Masanori Kobayasi) &lt;zap03216 at nifty dot ne dot jp&gt;</div><div class='del'>-         武井伸光さん、&lt;takei at webmasters dot gr dot jp&gt;</div><div class='del'>-         かねこさん (Seiji Kaneko) &lt;skaneko at a2 dot mbn dot or dot jp&gt;</div><div class='del'>-         野口さん (Kenji Noguchi) &lt;tokyo246 at gmail dot com&gt;</div><div class='del'>-         河内さん (Takayoshi Kochi) &lt;t-kochi at bq dot jp dot nec dot com&gt;</div><div class='del'>-         岩本さん (iwamoto) &lt;iwamoto.kn at ncos dot nec dot co dot jp&gt;</div><div class='del'>-         内田さん (Satoshi Uchida) &lt;s-uchida at ap dot jp dot nec dot com&gt;</div><div class='del'>-==================================</div><div class='del'>-</div><div class='del'>-Linux カーネル開発のやり方</div><div class='del'>--------------------------------</div><div class='del'>-</div><div class='del'>-これは上のトピック( Linux カーネル開発のやり方)の重要な事柄を網羅した</div><div class='del'>-ドキュメントです。ここには Linux カーネル開発者になるための方法と</div><div class='del'>-Linux カーネル開発コミュニティと共に活動するやり方を学ぶ方法が含まれて</div><div class='del'>-います。カーネルプログラミングに関する技術的な項目に関することは何も含</div><div class='del'>-めないようにしていますが、カーネル開発者となるための正しい方向に向かう</div><div class='del'>-手助けになります。</div><div class='del'>-</div><div class='del'>-もし、このドキュメントのどこかが古くなっていた場合には、このドキュメン</div><div class='del'>-トの最後にリストしたメンテナにパッチを送ってください。</div><div class='del'>-</div><div class='del'>-はじめに</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-あなたは　Linux カーネルの開発者になる方法を学びたいのでしょうか？　そ</div><div class='del'>-れともあなたは上司から「このデバイスの Linux ドライバを書くように」と</div><div class='del'>-言われているのでしょうか？　</div><div class='del'>-この文書の目的は、あなたが踏むべき手順と、コミュニティと一緒にうまく働</div><div class='del'>-くヒントを書き下すことで、あなたが知るべき全てのことを教えることです。</div><div class='del'>-また、このコミュニティがなぜ今うまくまわっているのかという理由の一部も</div><div class='del'>-説明しようと試みています。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-カーネルは 少量のアーキテクチャ依存部分がアセンブリ言語で書かれている</div><div class='del'>-以外は大部分は C 言語で書かれています。C言語をよく理解していることはカー</div><div class='del'>-ネル開発者には必要です。アーキテクチャ向けの低レベル部分の開発をするの</div><div class='del'>-でなければ、(どんなアーキテクチャでも)アセンブリ(訳注: 言語)は必要あり</div><div class='del'>-ません。以下の本は、C 言語の十分な知識や何年もの経験に取って代わるもの</div><div class='del'>-ではありませんが、少なくともリファレンスとしては良い本です。</div><div class='del'>- - "The C Programming Language" by Kernighan and Ritchie [Prentice Hall]</div><div class='del'>- -『プログラミング言語Ｃ第2版』(B.W. カーニハン/D.M. リッチー著 石田晴久訳) [共立出版]</div><div class='del'>- - "Practical C Programming" by Steve Oualline [O'Reilly]</div><div class='del'>- - 『C実践プログラミング第3版』(Steve Oualline著 望月康司監訳 谷口功訳) [オライリージャパン]</div><div class='del'>- - "C:  A Reference Manual" by Harbison and Steele [Prentice Hall]</div><div class='del'>- - 『新・詳説 C 言語 H&amp;S リファレンス』</div><div class='del'>-       (サミュエル P ハービソン/ガイ L スティール共著 斉藤 信男監訳)[ソフトバンク]</div><div class='del'>-</div><div class='del'>-カーネルは GNU C と GNU ツールチェインを使って書かれています。カーネル</div><div class='del'>-は ISO C89 仕様に準拠して書く一方で、標準には無い言語拡張を多く使って</div><div class='del'>-います。カーネルは標準 C ライブラリとは関係がないといった、C 言語フリー</div><div class='del'>-スタンディング環境です。そのため、C の標準で使えないものもあります。任</div><div class='del'>-意の long long の除算や浮動小数点は使えません。</div><div class='del'>-ときどき、カーネルがツールチェインや C 言語拡張に置いている前提がどう</div><div class='del'>-なっているのかわかりにくいことがあり、また、残念なことに決定的なリファ</div><div class='del'>-レンスは存在しません。情報を得るには、gcc の info ページ( info gcc )を</div><div class='del'>-見てください。</div><div class='del'>-</div><div class='del'>-あなたは既存の開発コミュニティと一緒に作業する方法を学ぼうとしているこ</div><div class='del'>-とに留意してください。そのコミュニティは、コーディング、スタイル、</div><div class='del'>-開発手順について高度な標準を持つ、多様な人の集まりです。</div><div class='del'>-地理的に分散した大規模なチームに対してもっともうまくいくとわかったこと</div><div class='del'>-をベースにしながら、これらの標準は長い時間をかけて築かれてきました。</div><div class='del'>-これらはきちんと文書化されていますから、事前にこれらの標準についてでき</div><div class='del'>-るだけたくさん学んでください。また皆があなたやあなたの会社のやり方に合わ</div><div class='del'>-せてくれると思わないでください。</div><div class='del'>-</div><div class='del'>-法的問題</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-Linux カーネルのソースコードは GPL ライセンスの下でリリースされていま</div><div class='del'>-す。ライセンスの詳細については、ソースツリーのメインディレクトリに存在</div><div class='del'>-する、COPYING のファイルを見てください。もしライセンスについてさらに質</div><div class='del'>-問があれば、Linux Kernel メーリングリストに質問するのではなく、どうぞ</div><div class='del'>-法律家に相談してください。メーリングリストの人達は法律家ではなく、法的</div><div class='del'>-問題については彼らの声明はあてにするべきではありません。</div><div class='del'>-</div><div class='del'>-GPL に関する共通の質問や回答については、以下を参照してください。</div><div class='del'>-	http://www.gnu.org/licenses/gpl-faq.html</div><div class='del'>-</div><div class='del'>-ドキュメント</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-Linux カーネルソースツリーは幅広い範囲のドキュメントを含んでおり、それ</div><div class='del'>-らはカーネルコミュニティと会話する方法を学ぶのに非常に貴重なものです。</div><div class='del'>-新しい機能がカーネルに追加される場合、その機能の使い方について説明した</div><div class='del'>-新しいドキュメントファイルも追加することを勧めます。</div><div class='del'>-カーネルの変更が、カーネルがユーザ空間に公開しているインターフェイスの</div><div class='del'>-変更を引き起こす場合、その変更を説明するマニュアルページのパッチや情報</div><div class='del'>-をマニュアルページのメンテナ mtk.manpages@gmail.com に送り、CC を</div><div class='del'>-linux-api@ver.kernel.org に送ることを勧めます。</div><div class='del'>-</div><div class='del'>-以下はカーネルソースツリーに含まれている読んでおくべきファイルの一覧で</div><div class='del'>-す-</div><div class='del'>-</div><div class='del'>-  README</div><div class='del'>-    このファイルは Linuxカーネルの簡単な背景とカーネルを設定(訳注</div><div class='del'>-    configure )し、生成(訳注 build )するために必要なことは何かが書かれ</div><div class='del'>-    ています。カーネルに関して初めての人はここからスタートすると良いで</div><div class='del'>-    しょう。</div><div class='del'>-</div><div class='del'>-  Documentation/Changes</div><div class='del'>-     このファイルはカーネルをうまく生成(訳注 build )し、走らせるのに最</div><div class='del'>-     小限のレベルで必要な数々のソフトウェアパッケージの一覧を示してい</div><div class='del'>-     ます。</div><div class='del'>-</div><div class='del'>-  Documentation/CodingStyle</div><div class='del'>-    これは Linux カーネルのコーディングスタイルと背景にある理由を記述</div><div class='del'>-    しています。全ての新しいコードはこのドキュメントにあるガイドライン</div><div class='del'>-    に従っていることを期待されています。大部分のメンテナはこれらのルー</div><div class='del'>-    ルに従っているものだけを受け付け、多くの人は正しいスタイルのコード</div><div class='del'>-    だけをレビューします。</div><div class='del'>-</div><div class='del'>-  Documentation/SubmittingPatches</div><div class='del'>-  Documentation/SubmittingDrivers</div><div class='del'>-     これらのファイルには、どうやってうまくパッチを作って投稿するかに</div><div class='del'>-     ついて非常に詳しく書かれており、以下を含みます(これだけに限らない</div><div class='del'>-     けれども)</div><div class='del'>-        - Email に含むこと</div><div class='del'>-        - Email の形式</div><div class='del'>-        - だれに送るか</div><div class='del'>-     これらのルールに従えばうまくいくことを保証することではありません</div><div class='del'>-     が (すべてのパッチは内容とスタイルについて精査を受けるので)、</div><div class='del'>-     ルールに従わなければ間違いなくうまくいかないでしょう。</div><div class='del'>-</div><div class='del'>-     この他にパッチを作る方法についてのよくできた記述は-</div><div class='del'>-</div><div class='del'>-	"The Perfect Patch"</div><div class='del'>-		http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='del'>-	"Linux kernel patch submission format"</div><div class='del'>-		http://linux.yyz.us/patch-format.html</div><div class='del'>-</div><div class='del'>-  Documentation/stable_api_nonsense.txt</div><div class='del'>-     このファイルはカーネルの中に不変のAPIを持たないことにした意識的な</div><div class='del'>-     決断の背景にある理由について書かれています。以下のようなことを含</div><div class='del'>-     んでいます-</div><div class='del'>-       - サブシステムとの間に層を作ること(コンパチビリティのため?)</div><div class='del'>-       - オペレーティングシステム間のドライバの移植性</div><div class='del'>-       - カーネルソースツリーの素早い変更を遅らせる(もしくは素早い変更</div><div class='del'>-         を妨げる)</div><div class='del'>-     このドキュメントは Linux 開発の思想を理解するのに非常に重要です。</div><div class='del'>-     そして、他のOSでの開発者が Linux に移る時にとても重要です。</div><div class='del'>-</div><div class='del'>-  Documentation/SecurityBugs</div><div class='del'>-    もし Linux カーネルでセキュリティ問題を発見したように思ったら、こ</div><div class='del'>-    のドキュメントのステップに従ってカーネル開発者に連絡し、問題解決を</div><div class='del'>-    支援してください。</div><div class='del'>-</div><div class='del'>-  Documentation/ManagementStyle</div><div class='del'>-    このドキュメントは Linux カーネルのメンテナ達がどう行動するか、</div><div class='del'>-    彼らの手法の背景にある共有されている精神について記述しています。こ</div><div class='del'>-    れはカーネル開発の初心者なら（もしくは、単に興味があるだけの人でも）</div><div class='del'>-    重要です。なぜならこのドキュメントは、カーネルメンテナ達の独特な</div><div class='del'>-    行動についての多くの誤解や混乱を解消するからです。</div><div class='del'>-</div><div class='del'>-  Documentation/stable_kernel_rules.txt</div><div class='del'>-    このファイルはどのように stable カーネルのリリースが行われるかのルー</div><div class='del'>-    ルが記述されています。そしてこれらのリリースの中のどこかで変更を取</div><div class='del'>-    り入れてもらいたい場合に何をすれば良いかが示されています。</div><div class='del'>-</div><div class='del'>-  Documentation/kernel-docs.txt</div><div class='del'>-　　カーネル開発に付随する外部ドキュメントのリストです。もしあなたが</div><div class='del'>-    探しているものがカーネル内のドキュメントでみつからなかった場合、</div><div class='del'>-    このリストをあたってみてください。</div><div class='del'>-</div><div class='del'>-  Documentation/applying-patches.txt</div><div class='del'>-    パッチとはなにか、パッチをどうやって様々なカーネルの開発ブランチに</div><div class='del'>-    適用するのかについて正確に記述した良い入門書です。</div><div class='del'>-</div><div class='del'>-カーネルはソースコードから自動的に生成可能な多数のドキュメントを自分自</div><div class='del'>-身でもっています。これにはカーネル内 API のすべての記述や、どう正しく</div><div class='del'>-ロックをかけるかの規則が含まれます。このドキュメントは</div><div class='del'>-Documentation/DocBook/ ディレクトリに作られ、以下のように</div><div class='del'>-	make pdfdocs</div><div class='del'>-	make psdocs</div><div class='del'>-	make htmldocs</div><div class='del'>-	make mandocs</div><div class='del'>-コマンドを実行するとメインカーネルのソースディレクトリから</div><div class='del'>-それぞれ、PDF, Postscript, HTML, man page の形式で生成されます。</div><div class='del'>-</div><div class='del'>-カーネル開発者になるには</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='del'>-もしあなたが、Linux カーネル開発について何も知らないならば、</div><div class='del'>-KernelNewbies プロジェクトを見るべきです</div><div class='del'>-	http://kernelnewbies.org</div><div class='del'>-</div><div class='del'>-このサイトには役に立つメーリングリストがあり、基本的なカーネル開発に関</div><div class='del'>-するほとんどどんな種類の質問もできます (既に回答されているようなことを</div><div class='del'>-聞く前にまずはアーカイブを調べてください)。</div><div class='del'>-またここには、リアルタイムで質問を聞くことができる IRC チャネルや、Linux</div><div class='del'>-カーネルの開発に関して学ぶのに便利なたくさんの役に立つドキュメントがあ</div><div class='del'>-ります。</div><div class='del'>-</div><div class='del'>-web サイトには、コードの構成、サブシステム、現在存在するプロジェクト(ツ</div><div class='del'>-リーにあるもの無いものの両方)の基本的な管理情報があります。</div><div class='del'>-ここには、また、カーネルのコンパイルのやり方やパッチの当て方などの間接</div><div class='del'>-的な基本情報も記述されています。</div><div class='del'>-</div><div class='del'>-あなたがどこからスタートして良いかわからないが、Linux カーネル開発コミュ</div><div class='del'>-ニティに参加して何かすることをさがしている場合には、Linux kernel</div><div class='del'>-Janitor's プロジェクトにいけば良いでしょう -</div><div class='del'>-	http://kernelnewbies.org/KernelJanitors</div><div class='del'>-ここはそのようなスタートをするのにうってつけの場所です。ここには、</div><div class='del'>-Linux カーネルソースツリーの中に含まれる、きれいにし、修正しなければな</div><div class='del'>-らない、単純な問題のリストが記述されています。このプロジェクトに関わる</div><div class='del'>-開発者と一緒に作業することで、あなたのパッチを Linuxカーネルツリーに入</div><div class='del'>-れるための基礎を学ぶことができ、そしてもしあなたがまだアイディアを持っ</div><div class='del'>-ていない場合には、次にやる仕事の方向性が見えてくるかもしれません。</div><div class='del'>-</div><div class='del'>-もしあなたが、すでにひとまとまりコードを書いていて、カーネルツリーに入</div><div class='del'>-れたいと思っていたり、それに関する適切な支援を求めたい場合、カーネル</div><div class='del'>-メンターズプロジェクトはそのような皆さんを助けるためにできました。</div><div class='del'>-ここにはメーリングリストがあり、以下から参照できます</div><div class='del'>-	http://selenic.com/mailman/listinfo/kernel-mentors</div><div class='del'>-</div><div class='del'>-実際に Linux カーネルのコードについて修正を加える前に、どうやってその</div><div class='del'>-コードが動作するのかを理解することが必要です。そのためには、特別なツー</div><div class='del'>-ルの助けを借りてでも、それを直接よく読むことが最良の方法です(ほとんど</div><div class='del'>-のトリッキーな部分は十分にコメントしてありますから)。そういうツールで</div><div class='del'>-特におすすめなのは、Linux クロスリファレンスプロジェクトです。これは、</div><div class='del'>-自己参照方式で、索引がついた web 形式で、ソースコードを参照することが</div><div class='del'>-できます。この最新の素晴しいカーネルコードのリポジトリは以下で見つかり</div><div class='del'>-ます-</div><div class='del'>-	http://lxr.free-electrons.com/</div><div class='del'>-</div><div class='del'>-開発プロセス</div><div class='del'>------------------------</div><div class='del'>-</div><div class='del'>-Linux カーネルの開発プロセスは現在幾つかの異なるメインカーネル「ブラン</div><div class='del'>-チ」と多数のサブシステム毎のカーネルブランチから構成されます。</div><div class='del'>-これらのブランチとは-</div><div class='del'>-  - メインの 3.x カーネルツリー</div><div class='del'>-  - 3.x.y -stable カーネルツリー</div><div class='del'>-  - 3.x -git カーネルパッチ</div><div class='del'>-  - サブシステム毎のカーネルツリーとパッチ</div><div class='del'>-  - 統合テストのための 3.x -next カーネルツリー</div><div class='del'>-</div><div class='del'>-3.x カーネルツリー</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-3.x カーネルは Linus Torvalds によってメンテナンスされ、kernel.org</div><div class='del'>-の pub/linux/kernel/v3.x/ ディレクトリに存在します。この開発プロセスは</div><div class='del'>-以下のとおり-</div><div class='del'>-</div><div class='del'>-  - 新しいカーネルがリリースされた直後に、2週間の特別期間が設けられ、</div><div class='del'>-    この期間中に、メンテナ達は Linus に大きな差分を送ることができます。</div><div class='del'>-    このような差分は通常 -next カーネルに数週間含まれてきたパッチです。</div><div class='del'>-    大きな変更は git(カーネルのソース管理ツール、詳細は</div><div class='del'>-    http://git-scm.com/ 参照) を使って送るのが好ましいやり方ですが、パッ</div><div class='del'>-    チファイルの形式のまま送るのでも十分です。</div><div class='del'>-</div><div class='del'>-  - 2週間後、-rc1 カーネルがリリースされ、この後にはカーネル全体の安定</div><div class='del'>-    性に影響をあたえるような新機能は含まない類のパッチしか取り込むこと</div><div class='del'>-    はできません。新しいドライバ(もしくはファイルシステム)のパッチは</div><div class='del'>-    -rc1 の後で受け付けられることもあることを覚えておいてください。な</div><div class='del'>-    ぜなら、変更が独立していて、追加されたコードの外の領域に影響を与え</div><div class='del'>-    ない限り、退行のリスクは無いからです。-rc1 がリリースされた後、</div><div class='del'>-    Linus へパッチを送付するのに git を使うこともできますが、パッチは</div><div class='del'>-    レビューのために、パブリックなメーリングリストへも同時に送る必要が</div><div class='del'>-    あります。</div><div class='del'>-</div><div class='del'>-  - 新しい -rc は Linus が、最新の git ツリーがテスト目的であれば十分</div><div class='del'>-    に安定した状態にあると判断したときにリリースされます。目標は毎週新</div><div class='del'>-    しい -rc カーネルをリリースすることです。</div><div class='del'>-</div><div class='del'>-  - このプロセスはカーネルが 「準備ができた」と考えられるまで継続しま</div><div class='del'>-    す。このプロセスはだいたい 6週間継続します。</div><div class='del'>-</div><div class='del'>-Andrew Morton が Linux-kernel メーリングリストにカーネルリリースについ</div><div class='del'>-て書いたことをここで言っておくことは価値があります-</div><div class='del'>-  「カーネルがいつリリースされるかは誰も知りません。なぜなら、これは現</div><div class='del'>-  実に認識されたバグの状況によりリリースされるのであり、前もって決めら</div><div class='del'>-  れた計画によってリリースされるものではないからです。」</div><div class='del'>-</div><div class='del'>-3.x.y -stable カーネルツリー</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='del'>-バージョン番号が3つの数字に分かれているカーネルは -stable カーネルです。</div><div class='del'>-これには、3.x カーネルで見つかったセキュリティ問題や重大な後戻りに対</div><div class='del'>-する比較的小さい重要な修正が含まれます。</div><div class='del'>-</div><div class='del'>-これは、開発/実験的バージョンのテストに協力することに興味が無く、</div><div class='del'>-最新の安定したカーネルを使いたいユーザに推奨するブランチです。</div><div class='del'>-</div><div class='del'>-もし、3.x.y カーネルが存在しない場合には、番号が一番大きい 3.x が</div><div class='del'>-最新の安定版カーネルです。</div><div class='del'>-</div><div class='del'>-3.x.y は "stable" チーム &lt;stable@vger.kernel.org&gt; でメンテされており、必</div><div class='del'>-要に応じてリリースされます。通常のリリース期間は 2週間毎ですが、差し迫っ</div><div class='del'>-た問題がなければもう少し長くなることもあります。セキュリティ関連の問題</div><div class='del'>-の場合はこれに対してだいたいの場合、すぐにリリースがされます。</div><div class='del'>-</div><div class='del'>-カーネルツリーに入っている、Documentation/stable_kernel_rules.txt ファ</div><div class='del'>-イルにはどのような種類の変更が -stable ツリーに受け入れ可能か、またリ</div><div class='del'>-リースプロセスがどう動くかが記述されています。</div><div class='del'>-</div><div class='del'>-3.x -git パッチ</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-git リポジトリで管理されているLinus のカーネルツリーの毎日のスナップ</div><div class='del'>-ショットがあります。(だから -git という名前がついています)。これらのパッ</div><div class='del'>-チはおおむね毎日リリースされており、Linus のツリーの現状を表します。こ</div><div class='del'>-れは -rc カーネルと比べて、パッチが大丈夫かどうかも確認しないで自動的</div><div class='del'>-に生成されるので、より実験的です。</div><div class='del'>-</div><div class='del'>-サブシステム毎のカーネルツリーとパッチ</div><div class='del'>--------------------------------------------</div><div class='del'>-</div><div class='del'>-それぞれのカーネルサブシステムのメンテナ達は --- そして多くのカーネル</div><div class='del'>-サブシステムの開発者達も --- 各自の最新の開発状況をソースリポジトリに</div><div class='del'>-公開しています。そのため、自分とは異なる領域のカーネルで何が起きている</div><div class='del'>-かを他の人が見られるようになっています。開発が早く進んでいる領域では、</div><div class='del'>-開発者は自身の投稿がどのサブシステムカーネルツリーを元にしているか質問</div><div class='del'>-されるので、その投稿とすでに進行中の他の作業との衝突が避けられます。</div><div class='del'>-</div><div class='del'>-大部分のこれらのリポジトリは git ツリーです。しかしその他の SCM や</div><div class='del'>-quilt シリーズとして公開されているパッチキューも使われています。これら</div><div class='del'>-のサブシステムリポジトリのアドレスは MAINTAINERS ファイルにリストされ</div><div class='del'>-ています。これらの多くは http://git.kernel.org/ で参照することができま</div><div class='del'>-す。</div><div class='del'>-</div><div class='del'>-提案されたパッチがこのようなサブシステムツリーにコミットされる前に、メー</div><div class='del'>-リングリストで事前にレビューにかけられます（以下の対応するセクションを</div><div class='del'>-参照）。いくつかのカーネルサブシステムでは、このレビューは patchwork</div><div class='del'>-というツールによって追跡されます。Patchwork は web インターフェイスに</div><div class='del'>-よってパッチ投稿の表示、パッチへのコメント付けや改訂などができ、そして</div><div class='del'>-メンテナはパッチに対して、レビュー中、受付済み、拒否というようなマーク</div><div class='del'>-をつけることができます。大部分のこれらの patchwork のサイトは</div><div class='del'>-http://patchwork.kernel.org/ でリストされています。</div><div class='del'>-</div><div class='del'>-統合テストのための 3.x -next カーネルツリー</div><div class='del'>----------------------------------------------</div><div class='del'>-</div><div class='del'>-サブシステムツリーの更新内容がメインラインの 3.x ツリーにマージされ</div><div class='del'>-る前に、それらは統合テストされる必要があります。この目的のため、実質的</div><div class='del'>-に全サブシステムツリーからほぼ毎日プルされてできる特別なテスト用のリ</div><div class='del'>-ポジトリが存在します-</div><div class='del'>-       http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git</div><div class='del'>-</div><div class='del'>-このやり方によって、-next カーネルは次のマージ機会でどんなものがメイン</div><div class='del'>-ラインカーネルにマージされるか、おおまかなの展望を提供します。-next </div><div class='del'>-カーネルの実行テストを行う冒険好きなテスターは大いに歓迎されます</div><div class='del'>-</div><div class='del'>-バグレポート</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-bugzilla.kernel.org は Linux カーネル開発者がカーネルのバグを追跡する</div><div class='del'>-場所です。ユーザは見つけたバグの全てをこのツールで報告すべきです。</div><div class='del'>-どう kernel bugzilla を使うかの詳細は、以下を参照してください-</div><div class='del'>-	http://bugzilla.kernel.org/page.cgi?id=faq.html</div><div class='del'>-メインカーネルソースディレクトリにあるファイル REPORTING-BUGS はカーネ</div><div class='del'>-ルバグらしいものについてどうレポートするかの良いテンプレートであり、問</div><div class='del'>-題の追跡を助けるためにカーネル開発者にとってどんな情報が必要なのかの詳</div><div class='del'>-細が書かれています。</div><div class='del'>-</div><div class='del'>-バグレポートの管理</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-あなたのハッキングのスキルを訓練する最高の方法のひとつに、他人がレポー</div><div class='del'>-トしたバグを修正することがあります。あなたがカーネルをより安定化させる</div><div class='del'>-こに寄与するということだけでなく、あなたは 現実の問題を修正することを</div><div class='del'>-学び、自分のスキルも強化でき、また他の開発者があなたの存在に気がつき</div><div class='del'>-ます。バグを修正することは、多くの開発者の中から自分が功績をあげる最善</div><div class='del'>-の道です、なぜなら多くの人は他人のバグの修正に時間を浪費することを好ま</div><div class='del'>-ないからです。</div><div class='del'>-</div><div class='del'>-すでにレポートされたバグのために仕事をするためには、</div><div class='del'>-http://bugzilla.kernel.org に行ってください。もし今後のバグレポートに</div><div class='del'>-ついてアドバイスを受けたいのであれば、bugme-new メーリングリスト(新し</div><div class='del'>-いバグレポートだけがここにメールされる) または bugme-janitor メーリン</div><div class='del'>-グリスト(bugzilla の変更毎にここにメールされる)を購読できます。</div><div class='del'>-</div><div class='del'>-	http://lists.linux-foundation.org/mailman/listinfo/bugme-new</div><div class='del'>-	http://lists.linux-foundation.org/mailman/listinfo/bugme-janitors</div><div class='del'>-</div><div class='del'>-メーリングリスト</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-上のいくつかのドキュメントで述べていますが、コアカーネル開発者の大部分</div><div class='del'>-は Linux kernel メーリングリストに参加しています。このリストの登録/脱</div><div class='del'>-退の方法については以下を参照してください-</div><div class='del'>-	http://vger.kernel.org/vger-lists.html#linux-kernel</div><div class='del'>-</div><div class='del'>-このメーリングリストのアーカイブは web 上の多数の場所に存在します。こ</div><div class='del'>-れらのアーカイブを探すにはサーチエンジンを使いましょう。例えば-</div><div class='del'>-	http://dir.gmane.org/gmane.linux.kernel</div><div class='del'>-</div><div class='del'>-リストに投稿する前にすでにその話題がアーカイブに存在するかどうかを検索</div><div class='del'>-することを是非やってください。多数の事がすでに詳細に渡って議論されて</div><div class='del'>-おり、アーカイブにのみ記録されています。</div><div class='del'>-</div><div class='del'>-大部分のカーネルサブシステムも自分の個別の開発を実施するメーリングリス</div><div class='del'>-トを持っています。個々のグループがどんなリストを持っているかは、</div><div class='del'>-MAINTAINERS ファイルにリストがありますので参照してください。</div><div class='del'>-</div><div class='del'>-多くのリストは kernel.org でホストされています。これらの情報は以下にあ</div><div class='del'>-ります-</div><div class='del'>-	http://vger.kernel.org/vger-lists.html</div><div class='del'>-</div><div class='del'>-メーリングリストを使う場合、良い行動習慣に従うようにしましょう。</div><div class='del'>-少し安っぽいが、以下の URL は上のリスト(や他のリスト)で会話する場合の</div><div class='del'>-シンプルなガイドラインを示しています-</div><div class='del'>-	http://www.albion.com/netiquette/</div><div class='del'>-</div><div class='del'>-もし複数の人があなたのメールに返事をした場合、CC: で受ける人のリストは</div><div class='del'>-だいぶ多くなるでしょう。良い理由がない場合、CC: リストから誰かを削除を</div><div class='del'>-しないように、また、メーリングリストのアドレスだけにリプライすることの</div><div class='del'>-ないようにしましょう。1つは送信者から、もう1つはリストからのように、メー</div><div class='del'>-ルを2回受けることになってもそれに慣れ、しゃれたメールヘッダーを追加し</div><div class='del'>-てこの状態を変えようとしないように。人々はそのようなことは好みません。</div><div class='del'>-</div><div class='del'>-今までのメールでのやりとりとその間のあなたの発言はそのまま残し、</div><div class='del'>-"John Kernelhacker wrote ...:" の行をあなたのリプライの先頭行にして、</div><div class='del'>-メールの先頭でなく、各引用行の間にあなたの言いたいことを追加するべきで</div><div class='del'>-す。</div><div class='del'>-</div><div class='del'>-もしパッチをメールに付ける場合は、Documentation/SubmittingPatches に提</div><div class='del'>-示されているように、それは プレーンな可読テキストにすることを忘れない</div><div class='del'>-ようにしましょう。カーネル開発者は 添付や圧縮したパッチを扱いたがりま</div><div class='del'>-せん-</div><div class='del'>-彼らはあなたのパッチの行毎にコメントを入れたいので、そのためにはそうす</div><div class='del'>-るしかありません。あなたのメールプログラムが空白やタブを圧縮しないよう</div><div class='del'>-に確認した方が良いです。最初の良いテストとしては、自分にメールを送って</div><div class='del'>-みて、そのパッチを自分で当ててみることです。もしそれがうまく行かないな</div><div class='del'>-ら、あなたのメールプログラムを直してもらうか、正しく動くように変えるべ</div><div class='del'>-きです。</div><div class='del'>-</div><div class='del'>-とりわけ、他の登録者に対する尊敬を表すようにすることを覚えておいてくだ</div><div class='del'>-さい。</div><div class='del'>-</div><div class='del'>-コミュニティと共に働くこと</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-カーネルコミュニティのゴールは可能なかぎり最高のカーネルを提供すること</div><div class='del'>-です。あなたがパッチを受け入れてもらうために投稿した場合、それは、技術</div><div class='del'>-的メリットだけがレビューされます。その際、あなたは何を予想すべきでしょ</div><div class='del'>-うか?</div><div class='del'>-  - 批判</div><div class='del'>-  - コメント</div><div class='del'>-  - 変更の要求</div><div class='del'>-  - パッチの正当性の証明要求</div><div class='del'>-  - 沈黙</div><div class='del'>-</div><div class='del'>-思い出してください、ここはあなたのパッチをカーネルに入れる話です。あ</div><div class='del'>-なたは、あなたのパッチに対する批判とコメントを受け入れるべきで、それら</div><div class='del'>-を技術的レベルで評価して、パッチを再作成するか、なぜそれらの変更をすべ</div><div class='del'>-きでないかを明確で簡潔な理由の説明を提供してください。</div><div class='del'>-もし、あなたのパッチに何も反応がない場合、たまにはメールの山に埋もれて</div><div class='del'>-見逃され、あなたの投稿が忘れられてしまうこともあるので、数日待って再度</div><div class='del'>-投稿してください。</div><div class='del'>-</div><div class='del'>-あなたがやるべきでないものは?</div><div class='del'>-  - 質問なしにあなたのパッチが受け入れられると想像すること</div><div class='del'>-  - 守りに入ること</div><div class='del'>-  - コメントを無視すること</div><div class='del'>-  - 要求された変更を何もしないでパッチを出し直すこと</div><div class='del'>-</div><div class='del'>-可能な限り最高の技術的解決を求めているコミュニティでは、パッチがどのく</div><div class='del'>-らい有益なのかについては常に異なる意見があります。あなたは協調的である</div><div class='del'>-べきですし、また、あなたのアイディアをカーネルに対してうまく合わせるよ</div><div class='del'>-うにすることが望まれています。もしくは、最低限あなたのアイディアがそれ</div><div class='del'>-だけの価値があるとすすんで証明するようにしなければなりません。</div><div class='del'>-正しい解決に向かって進もうという意志がある限り、間違うことがあっても許</div><div class='del'>-容されることを忘れないでください。</div><div class='del'>-</div><div class='del'>-あなたの最初のパッチに単に 1ダースもの修正を求めるリストの返答になるこ</div><div class='del'>-とも普通のことです。これはあなたのパッチが受け入れられないということで</div><div class='del'>-は *ありません*、そしてあなた自身に反対することを意味するのでも *ありま</div><div class='del'>-せん*。単に自分のパッチに対して指摘された問題を全て修正して再送すれば</div><div class='del'>-良いのです。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-カーネルコミュニティと企業組織のちがい</div><div class='del'>------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-カーネルコミュニティは大部分の伝統的な会社の開発環境とは異ったやり方で</div><div class='del'>-動いています。以下は問題を避けるためにできると良いことのリストです-</div><div class='del'>-</div><div class='del'>-  あなたの提案する変更について言うときのうまい言い方：</div><div class='del'>-</div><div class='del'>-    - "これは複数の問題を解決します"</div><div class='del'>-    - "これは2000行のコードを削除します"</div><div class='del'>-    - "以下のパッチは、私が言おうとしていることを説明するものです"</div><div class='del'>-    - "私はこれを5つの異なるアーキテクチャでテストしたのですが..."</div><div class='del'>-    - "以下は一連の小さなパッチ群ですが..."</div><div class='del'>-    - "これは典型的なマシンでの性能を向上させます.."</div><div class='del'>-</div><div class='del'>-  やめた方が良い悪い言い方：</div><div class='del'>-</div><div class='del'>-    - このやり方で AIX/ptx/Solaris ではできたので、できるはずだ</div><div class='del'>-    - 私はこれを20年もの間やってきた、だから</div><div class='del'>-    - これは、私の会社が金儲けをするために必要だ</div><div class='del'>-    - これは我々のエンタープライズ向け商品ラインのためである</div><div class='del'>-    - これは 私が自分のアイディアを記述した、1000ページの設計資料である</div><div class='del'>-    - 私はこれについて、6ケ月作業している。</div><div class='del'>-    - 以下は ... に関する5000行のパッチです</div><div class='del'>-    - 私は現在のぐちゃぐちゃを全部書き直した、それが以下です...</div><div class='del'>-    - 私は〆切がある、そのためこのパッチは今すぐ適用される必要がある</div><div class='del'>-</div><div class='del'>-カーネルコミュニティが大部分の伝統的なソフトウェアエンジニアリングの労</div><div class='del'>-働環境と異なるもう一つの点は、やりとりに顔を合わせないということです。</div><div class='del'>-email と irc を第一のコミュニケーションの形とする一つの利点は、性別や</div><div class='del'>-民族の差別がないことです。Linux カーネルの職場環境は女性や少数民族を受</div><div class='del'>-容します。なぜなら、email アドレスによってのみあなたが認識されるからで</div><div class='del'>-す。</div><div class='del'>-国際的な側面からも活動領域を均等にするようにします。なぜならば、あなた</div><div class='del'>-は人の名前で性別を想像できないからです。ある男性が アンドレアという名</div><div class='del'>-前で、女性の名前は パット かもしれません (訳注 Andrea は米国では女性、</div><div class='del'>-それ以外(欧州など)では男性名として使われることが多い。同様に、Pat は</div><div class='del'>-Patricia (主に女性名)や Patrick (主に男性名)の略称)。</div><div class='del'>-Linux カーネルの活動をして、意見を表明したことがある大部分の女性は、前</div><div class='del'>-向きな経験をもっています。</div><div class='del'>-</div><div class='del'>-言葉の壁は英語が得意でない一部の人には問題になります。</div><div class='del'>-メーリングリストの中できちんとアイディアを交換するには、相当うまく英語</div><div class='del'>-を操れる必要があることもあります。そのため、あなたは自分のメール</div><div class='del'>-を送る前に英語で意味が通じているかをチェックすることをお薦めします。</div><div class='del'>-</div><div class='del'>-変更を分割する</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-Linux カーネルコミュニティは、一度に大量のコードの塊を喜んで受容するこ</div><div class='del'>-とはありません。変更は正確に説明される必要があり、議論され、小さい、個</div><div class='del'>-別の部分に分割する必要があります。これはこれまで多くの会社がやり慣れて</div><div class='del'>-きたことと全く正反対のことです。あなたのプロポーザルは、開発プロセスのと</div><div class='del'>-ても早い段階から紹介されるべきです。そうすれば あなたは自分のやってい</div><div class='del'>-ることにフィードバックを得られます。これは、コミュニティからみれば、あ</div><div class='del'>-なたが彼らと一緒にやっているように感じられ、単にあなたの提案する機能の</div><div class='del'>-ゴミ捨て場として使っているのではない、と感じられるでしょう。</div><div class='del'>-しかし、一度に 50 もの email をメーリングリストに送りつけるようなことは</div><div class='del'>-やってはいけません、あなたのパッチ群はいつもどんな時でもそれよりは小さ</div><div class='del'>-くなければなりません。</div><div class='del'>-</div><div class='del'>-パッチを分割する理由は以下です-</div><div class='del'>-</div><div class='del'>-1) 小さいパッチはあなたのパッチが適用される見込みを大きくします、カー</div><div class='del'>-   ネルの人達はパッチが正しいかどうかを確認する時間や労力をかけないか</div><div class='del'>-   らです。5行のパッチはメンテナがたった1秒見るだけで適用できます。</div><div class='del'>-   しかし、500行のパッチは、正しいことをレビューするのに数時間かかるか</div><div class='del'>-   もしれません(時間はパッチのサイズなどにより指数関数に比例してかかり</div><div class='del'>-   ます)</div><div class='del'>-</div><div class='del'>-   小さいパッチは何かあったときにデバッグもとても簡単になります。パッ</div><div class='del'>-   チを1個1個取り除くのは、とても大きなパッチを当てた後に(かつ、何かお</div><div class='del'>-   かしくなった後で)解剖するのに比べればとても簡単です。</div><div class='del'>-</div><div class='del'>-2) 小さいパッチを送るだけでなく、送るまえに、書き直して、シンプルにす</div><div class='del'>-   る(もしくは、単に順番を変えるだけでも)ことも、とても重要です。</div><div class='del'>-</div><div class='del'>-以下はカーネル開発者の Al Viro のたとえ話です：</div><div class='del'>-</div><div class='del'>-        "生徒の数学の宿題を採点する先生のことを考えてみてください、先</div><div class='del'>-        生は生徒が解に到達するまでの試行錯誤を見たいとは思わないでしょ</div><div class='del'>-        う。先生は簡潔な最高の解を見たいのです。良い生徒はこれを知って</div><div class='del'>-        おり、そして最終解の前の中間作業を提出することは決してないので</div><div class='del'>-        す"</div><div class='del'>-</div><div class='del'>-        カーネル開発でもこれは同じです。メンテナ達とレビューア達は、</div><div class='del'>-        問題を解決する解の背後になる思考プロセスを見たいとは思いません。</div><div class='del'>-        彼らは単純であざやかな解決方法を見たいのです。</div><div class='del'>-</div><div class='del'>-あざやかな解を説明するのと、コミュニティと共に仕事をし、未解決の仕事を</div><div class='del'>-議論することのバランスをキープするのは難しいかもしれません。</div><div class='del'>-ですから、開発プロセスの早期段階で改善のためのフィードバックをもらうよ</div><div class='del'>-うにするのも良いですが、変更点を小さい部分に分割して全体ではまだ完成し</div><div class='del'>-ていない仕事を(部分的に)取り込んでもらえるようにすることも良いことです。</div><div class='del'>-</div><div class='del'>-また、でき上がっていないものや、"将来直す" ようなパッチを、本流に含め</div><div class='del'>-てもらうように送っても、それは受け付けられないことを理解してください。</div><div class='del'>-</div><div class='del'>-あなたの変更を正当化する</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-あなたのパッチを分割するのと同時に、なぜその変更を追加しなければならな</div><div class='del'>-いかを Linux コミュニティに知らせることはとても重要です。新機能は必要</div><div class='del'>-性と有用性で正当化されなければなりません。</div><div class='del'>-</div><div class='del'>-あなたの変更の説明</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-あなたのパッチを送付する場合には、メールの中のテキストで何を言うかにつ</div><div class='del'>-いて、特別に注意を払ってください。この情報はパッチの ChangeLog に使わ</div><div class='del'>-れ、いつも皆がみられるように保管されます。これは次のような項目を含め、</div><div class='del'>-パッチを完全に記述するべきです-</div><div class='del'>-</div><div class='del'>-  - なぜ変更が必要か</div><div class='del'>-  - パッチ全体の設計アプローチ</div><div class='del'>-  - 実装の詳細</div><div class='del'>-  - テスト結果</div><div class='del'>-</div><div class='del'>-これについて全てがどのようにあるべきかについての詳細は、以下のドキュメ</div><div class='del'>-ントの ChangeLog セクションを見てください-</div><div class='del'>-  "The Perfect Patch"</div><div class='del'>-      http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='del'>-</div><div class='del'>-これらのどれもが、時にはとても困難です。これらの慣例を完璧に実施するに</div><div class='del'>-は数年かかるかもしれません。これは継続的な改善のプロセスであり、そのた</div><div class='del'>-めには多数の忍耐と決意を必要とするものです。でも、諦めないで、これは可</div><div class='del'>-能なことです。多数の人がすでにできていますし、彼らも皆最初はあなたと同</div><div class='del'>-じところからスタートしたのですから。</div><div class='del'>-</div><div class='del'>-Paolo Ciarrocchi に感謝、彼は彼の書いた "Development Process"</div><div class='del'>-(http://lwn.net/Articles/94386/) セクションをこのテキストの原型にする</div><div class='del'>-ことを許可してくれました。Rundy Dunlap と Gerrit Huizenga はメーリング</div><div class='del'>-リストでやるべきこととやってはいけないことのリストを提供してくれました。</div><div class='del'>-以下の人々のレビュー、コメント、貢献に感謝。</div><div class='del'>-Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,</div><div class='del'>-Vojtech Pavlik, Jan Kara, Josh Boyer, Kees Cook, Andrew Morton, Andi</div><div class='del'>-Kleen, Vadim Lobanov, Jesper Juhl, Adrian Bunk, Keri Harris, Frans Pop,</div><div class='del'>-David A. Wheeler, Junio Hamano, Michael Kerrisk, と Alex Shepard</div><div class='del'>-彼らの支援なしでは、このドキュメントはできなかったでしょう。</div><div class='del'>-</div><div class='del'>-Maintainer: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/Documentation/ja_JP/SubmitChecklist b/Documentation/ja_JP/SubmitChecklist<br/>deleted file mode 100644<br/>index cb5507b1ac81..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/ja_JP/SubmitChecklist?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ja_JP/SubmitChecklist</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,111 +0,0 @@</div><div class='del'>-NOTE:</div><div class='del'>-This is a version of Documentation/SubmitChecklist into Japanese.</div><div class='del'>-This document is maintained by Takenori Nagano &lt;t-nagano@ah.jp.nec.com&gt;</div><div class='del'>-and the JF Project team &lt;http://www.linux.or.jp/JF/&gt;.</div><div class='del'>-If you find any difference between this document and the original file</div><div class='del'>-or a problem with the translation,</div><div class='del'>-please contact the maintainer of this file or JF project.</div><div class='del'>-</div><div class='del'>-Please also note that the purpose of this file is to be easier to read</div><div class='del'>-for non English (read: Japanese) speakers and is not intended as a</div><div class='del'>-fork. So if you have any comments or updates of this file, please try</div><div class='del'>-to update the original English file first.</div><div class='del'>-</div><div class='del'>-Last Updated: 2008/07/14</div><div class='del'>-==================================</div><div class='del'>-これは、</div><div class='del'>-linux-2.6.26/Documentation/SubmitChecklist の和訳です。</div><div class='del'>-</div><div class='del'>-翻訳団体： JF プロジェクト &lt; http://www.linux.or.jp/JF/ &gt;</div><div class='del'>-翻訳日： 2008/07/14</div><div class='del'>-翻訳者： Takenori Nagano &lt;t-nagano at ah dot jp dot nec dot com&gt;</div><div class='del'>-校正者： Masanori Kobayashi さん &lt;zap03216 at nifty dot ne dot jp&gt;</div><div class='del'>-==================================</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Linux カーネルパッチ投稿者向けチェックリスト</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-本書では、パッチをより素早く取り込んでもらいたい開発者が実践すべき基本的な事柄</div><div class='del'>-をいくつか紹介します。ここにある全ての事柄は、Documentation/SubmittingPatches</div><div class='del'>-などのLinuxカーネルパッチ投稿に際しての心得を補足するものです。</div><div class='del'>-</div><div class='del'>- 1: 妥当なCONFIGオプションや変更されたCONFIGオプション、つまり =y, =m, =n</div><div class='del'>-    全てで正しくビルドできることを確認してください。その際、gcc及びリンカが</div><div class='del'>-    warningやerrorを出していないことも確認してください。</div><div class='del'>-</div><div class='del'>- 2: allnoconfig, allmodconfig オプションを用いて正しくビルドできることを</div><div class='del'>-    確認してください。</div><div class='del'>-</div><div class='del'>- 3: 手許のクロスコンパイルツールやOSDLのPLMのようなものを用いて、複数の</div><div class='del'>-    アーキテクチャにおいても正しくビルドできることを確認してください。</div><div class='del'>-</div><div class='del'>- 4: 64bit長の'unsigned long'を使用しているppc64は、クロスコンパイルでの</div><div class='del'>-    チェックに適当なアーキテクチャです。</div><div class='del'>-</div><div class='del'>- 5: カーネルコーディングスタイルに準拠しているかどうか確認してください(!)</div><div class='del'>-</div><div class='del'>- 6: CONFIGオプションの追加・変更をした場合には、CONFIGメニューが壊れていない</div><div class='del'>-    ことを確認してください。</div><div class='del'>-</div><div class='del'>- 7: 新しくKconfigのオプションを追加する際には、必ずそのhelpも記述してください。</div><div class='del'>-</div><div class='del'>- 8: 適切なKconfigの依存関係を考えながら慎重にチェックしてください。</div><div class='del'>-    ただし、この作業はマシンを使ったテストできちんと行うのがとても困難です。</div><div class='del'>-    うまくやるには、自分の頭で考えることです。</div><div class='del'>-</div><div class='del'>- 9: sparseを利用してちゃんとしたコードチェックをしてください。</div><div class='del'>-</div><div class='del'>-10: 'make checkstack' と 'make namespacecheck' を利用し、問題が発見されたら</div><div class='del'>-    修正してください。'make checkstack' は明示的に問題を示しませんが、どれか</div><div class='del'>-    １つの関数が512バイトより大きいスタックを使っていれば、修正すべき候補と</div><div class='del'>-    なります。</div><div class='del'>-</div><div class='del'>-11: グローバルなkernel API を説明する kernel-doc をソースの中に含めてください。</div><div class='del'>-    ( staticな関数においては必須ではありませんが、含めてもらっても結構です )</div><div class='del'>-    そして、'make htmldocs' もしくは 'make mandocs' を利用して追記した</div><div class='del'>-    ドキュメントのチェックを行い、問題が見つかった場合には修正を行ってください。</div><div class='del'>-</div><div class='del'>-12: CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT, CONFIG_DEBUG_SLAB,</div><div class='del'>-    CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES, CONFIG_DEBUG_SPINLOCK,</div><div class='del'>-    CONFIG_DEBUG_ATOMIC_SLEEP これら全てを同時に有効にして動作確認を</div><div class='del'>-    行ってください。</div><div class='del'>-</div><div class='del'>-13: CONFIG_SMP, CONFIG_PREEMPT を有効にした場合と無効にした場合の両方で</div><div class='del'>-    ビルドした上、動作確認を行ってください。</div><div class='del'>-</div><div class='del'>-14: もしパッチがディスクのI/O性能などに影響を与えるようであれば、</div><div class='del'>-    'CONFIG_LBDAF'オプションを有効にした場合と無効にした場合の両方で</div><div class='del'>-    テストを実施してみてください。</div><div class='del'>-</div><div class='del'>-15: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。</div><div class='del'>-</div><div class='del'>-16: /proc に新しいエントリを追加した場合には、Documentation/ 配下に</div><div class='del'>-    必ずドキュメントを追加してください。</div><div class='del'>-</div><div class='del'>-17: 新しいブートパラメータを追加した場合には、</div><div class='del'>-    必ずDocumentation/kernel-parameters.txt に説明を追加してください。</div><div class='del'>-</div><div class='del'>-18: 新しくmoduleにパラメータを追加した場合には、MODULE_PARM_DESC()を</div><div class='del'>-    利用して必ずその説明を記述してください。</div><div class='del'>-</div><div class='del'>-19: 新しいuserspaceインタフェースを作成した場合には、Documentation/ABI/ に</div><div class='del'>-    Documentation/ABI/README を参考にして必ずドキュメントを追加してください。</div><div class='del'>-</div><div class='del'>-20: 'make headers_check'を実行して全く問題がないことを確認してください。</div><div class='del'>-</div><div class='del'>-21: 少なくともslabアロケーションとpageアロケーションに失敗した場合の</div><div class='del'>-    挙動について、fault-injectionを利用して確認してください。</div><div class='del'>-    Documentation/fault-injection/ を参照してください。</div><div class='del'>-</div><div class='del'>-    追加したコードがかなりの量であったならば、サブシステム特有の</div><div class='del'>-    fault-injectionを追加したほうが良いかもしれません。</div><div class='del'>-</div><div class='del'>-22: 新たに追加したコードは、`gcc -W'でコンパイルしてください。</div><div class='del'>-    このオプションは大量の不要なメッセージを出力しますが、</div><div class='del'>-    "warning: comparison between signed and unsigned" のようなメッセージは、</div><div class='del'>-    バグを見つけるのに役に立ちます。</div><div class='del'>-</div><div class='del'>-23: 投稿したパッチが -mm パッチセットにマージされた後、全ての既存のパッチや</div><div class='del'>-    VM, VFS およびその他のサブシステムに関する様々な変更と、現時点でも共存</div><div class='del'>-    できることを確認するテストを行ってください。</div><div class='head'>diff --git a/Documentation/ja_JP/SubmittingPatches b/Documentation/ja_JP/SubmittingPatches<br/>deleted file mode 100644<br/>index 5d6ae639bfa0..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/ja_JP/SubmittingPatches?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ja_JP/SubmittingPatches</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,719 +0,0 @@</div><div class='del'>-NOTE:</div><div class='del'>-This is a version of Documentation/SubmittingPatches into Japanese.</div><div class='del'>-This document is maintained by Keiichi KII &lt;k-keiichi@bx.jp.nec.com&gt;</div><div class='del'>-and the JF Project team &lt;http://www.linux.or.jp/JF/&gt;.</div><div class='del'>-If you find any difference between this document and the original file</div><div class='del'>-or a problem with the translation,</div><div class='del'>-please contact the maintainer of this file or JF project.</div><div class='del'>-</div><div class='del'>-Please also note that the purpose of this file is to be easier to read</div><div class='del'>-for non English (read: Japanese) speakers and is not intended as a</div><div class='del'>-fork. So if you have any comments or updates of this file, please try</div><div class='del'>-to update the original English file first.</div><div class='del'>-</div><div class='del'>-Last Updated: 2011/06/09</div><div class='del'>-</div><div class='del'>-==================================</div><div class='del'>-これは、</div><div class='del'>-linux-2.6.39/Documentation/SubmittingPatches の和訳</div><div class='del'>-です。</div><div class='del'>-翻訳団体： JF プロジェクト &lt; http://www.linux.or.jp/JF/ &gt;</div><div class='del'>-翻訳日： 2011/06/09</div><div class='del'>-翻訳者： Keiichi Kii &lt;k-keiichi at bx dot jp dot nec dot com&gt;</div><div class='del'>-校正者： Masanari Kobayashi さん &lt;zap03216 at nifty dot ne dot jp&gt;</div><div class='del'>-         Matsukura さん &lt;nbh--mats at nifty dot com&gt;</div><div class='del'>-         Takeshi Hamasaki さん &lt;hmatrjp at users dot sourceforge dot jp&gt;</div><div class='del'>-==================================</div><div class='del'>-</div><div class='del'>-        Linux カーネルに変更を加えるための Howto</div><div class='del'>-        又は</div><div class='del'>-        かの Linus Torvalds の取り扱い説明書</div><div class='del'>-</div><div class='del'>-Linux カーネルに変更を加えたいと思っている個人又は会社にとって、パッ</div><div class='del'>-チの投稿に関連した仕組みに慣れていなければ、その過程は時々みなさんを</div><div class='del'>-おじけづかせることもあります。この文章はあなたの変更を大いに受け入れ</div><div class='del'>-てもらえやすくする提案を集めたものです。</div><div class='del'>-</div><div class='del'>-コードを投稿する前に、Documentation/SubmitChecklist の項目リストに目</div><div class='del'>-を通してチェックしてください。もしあなたがドライバーを投稿しようとし</div><div class='del'>-ているなら、Documentation/SubmittingDrivers にも目を通してください。</div><div class='del'>-</div><div class='del'>---------------------------------------------</div><div class='del'>-セクション1 パッチの作り方と送り方</div><div class='del'>---------------------------------------------</div><div class='del'>-</div><div class='del'>-1) 「 diff -up 」</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-パッチの作成には「 diff -up 」又は「 diff -uprN 」を使ってください。</div><div class='del'>-</div><div class='del'>-Linux カーネルに対する全ての変更は diff(1) コマンドによるパッチの形式で</div><div class='del'>-生成してください。パッチを作成するときには、diff(1) コマンドに「 -u 」引</div><div class='del'>-数を指定して、unified 形式のパッチを作成することを確認してください。また、</div><div class='del'>-変更がどの C 関数で行われたのかを表示する「 -p 」引数を使ってください。</div><div class='del'>-この引数は生成した差分をずっと読みやすくしてくれます。パッチは Linux</div><div class='del'>-カーネルソースの中のサブディレクトリではなく Linux カーネルソースのルート</div><div class='del'>-ディレクトリを基準にしないといけません。</div><div class='del'>-</div><div class='del'>-1個のファイルについてのパッチを作成するためには、ほとんどの場合、</div><div class='del'>-以下の作業を行えば十分です。</div><div class='del'>-</div><div class='del'>-	SRCTREE= linux-2.6</div><div class='del'>-	MYFILE=  drivers/net/mydriver.c</div><div class='del'>-</div><div class='del'>-	cd $SRCTREE</div><div class='del'>-	cp $MYFILE $MYFILE.orig</div><div class='del'>-	vi $MYFILE	# make your change</div><div class='del'>-	cd ..</div><div class='del'>-	diff -up $SRCTREE/$MYFILE{.orig,} &gt; /tmp/patch</div><div class='del'>-</div><div class='del'>-複数のファイルについてのパッチを作成するためには、素の( vanilla )、す</div><div class='del'>-なわち変更を加えてない Linux カーネルを展開し、自分の Linux カーネル</div><div class='del'>-ソースとの差分を生成しないといけません。例えば、</div><div class='del'>-</div><div class='del'>-	MYSRC= /devel/linux-2.6</div><div class='del'>-</div><div class='del'>-	tar xvfz linux-2.6.12.tar.gz</div><div class='del'>-	mv linux-2.6.12 linux-2.6.12-vanilla</div><div class='del'>-	diff -uprN -X linux-2.6.12-vanilla/Documentation/dontdiff \</div><div class='del'>-		linux-2.6.12-vanilla $MYSRC &gt; /tmp/patch</div><div class='del'>-</div><div class='del'>-dontdiff ファイルには Linux カーネルのビルドプロセスの過程で生成された</div><div class='del'>-ファイルの一覧がのっています。そして、それらはパッチを生成する diff(1)</div><div class='del'>-コマンドで無視されるべきです。dontdiff ファイルは 2.6.12 以後のバージョ</div><div class='del'>-ンの Linux カーネルソースツリーに含まれています。それより前のバージョン</div><div class='del'>-の Linux カーネルソースツリーに対する dontdiff ファイルは、</div><div class='del'>-&lt;http://www.xenotime.net/linux/doc/dontdiff&gt;から取得することができます。</div><div class='del'>-</div><div class='del'>-投稿するパッチの中に関係のない余分なファイルが含まれていないことを確</div><div class='del'>-認してください。diff(1) コマンドで生成したパッチがあなたの意図したとお</div><div class='del'>-りのものであることを確認してください。</div><div class='del'>-</div><div class='del'>-もしあなたのパッチが多くの差分を生み出すのであれば、あなたはパッチ</div><div class='del'>-を意味のあるひとまとまりごとに分けたいと思うかもしれません。</div><div class='del'>-これは他のカーネル開発者にとってレビューしやすくなるので、あなたの</div><div class='del'>-パッチを受け入れてもらうためにはとても重要なことです。これを補助でき</div><div class='del'>-る多くのスクリプトがあります。</div><div class='del'>-</div><div class='del'>-Quilt:</div><div class='del'>-http://savannah.nongnu.org/projects/quilt</div><div class='del'>-</div><div class='del'>-2) パッチに対する説明</div><div class='del'>-</div><div class='del'>-パッチの中の変更点に対する技術的な詳細について説明してください。</div><div class='del'>-</div><div class='del'>-説明はできる限り具体的に。もっとも悪い説明は「ドライバー X を更新」、</div><div class='del'>-「ドライバー X に対するバグフィックス」あるいは「このパッチはサブシス</div><div class='del'>-テム X に対する更新を含んでいます。どうか取り入れてください。」などです。</div><div class='del'>-</div><div class='del'>-パッチの説明を Linux カーネルのソースコードマネジメントシステム「 git 」の</div><div class='del'>-コミットログとして簡単に引用できる形で書けば、メンテナから感謝されるでしょう。</div><div class='del'>-以下の #15 を見てください。</div><div class='del'>-</div><div class='del'>-説明が長くなりだしたのであれば、おそらくそれはパッチを分ける必要がある</div><div class='del'>-という兆候です。次の #3 を見てください。</div><div class='del'>-</div><div class='del'>-パッチ(シリーズ)を(再)投稿する時、十分なパッチの説明とそのパッチが必要な理由を</div><div class='del'>-パッチに含めてください。ただ「これはパッチ(シリーズ)のバージョン N」とだけ</div><div class='del'>-書かないでください。そして、パッチをマージする人にパッチの説明を探させそれを</div><div class='del'>-パッチに追記させるため、過去のバージョンのパッチやそのパッチの URL を参照する</div><div class='del'>-手間をかけさせないでください。</div><div class='del'>-つまり、パッチシリーズとその説明は一緒にあるべきです。これはパッチをマージする</div><div class='del'>-人、レビューする人、どちらのためにもなります。レビューする人の中には、おそらく</div><div class='del'>-過去のバージョンのパッチを受け取ってもいない人がいます。</div><div class='del'>-</div><div class='del'>-登録済みのバグエントリを修正するパッチであれば、そのバグエントリを示すバグ ID</div><div class='del'>-や URL を明記してください。</div><div class='del'>-</div><div class='del'>-3) パッチの分割</div><div class='del'>-</div><div class='del'>-意味のあるひとまとまりごとに変更を個々のパッチファイルに分けてください。</div><div class='del'>-</div><div class='del'>-例えば、もし1つのドライバーに対するバグフィックスとパフォーマンス強</div><div class='del'>-化の両方の変更を含んでいるのであれば、その変更を2つ以上のパッチに分</div><div class='del'>-けてください。もし変更箇所に API の更新と、その新しい API を使う新たな</div><div class='del'>-ドライバーが含まれているなら、2つのパッチに分けてください。</div><div class='del'>-</div><div class='del'>-一方で、もしあなたが多数のファイルに対して意味的に同じ1つの変更を加え</div><div class='del'>-るのであれば、その変更を1つのパッチにまとめてください。言いかえると、</div><div class='del'>-意味的に同じ1つの変更は1つのパッチの中に含まれます。</div><div class='del'>-</div><div class='del'>-あるパッチが変更を完結させるために他のパッチに依存していたとしても、</div><div class='del'>-それは問題ありません。パッチの説明の中で「このパッチはパッチ X に依存</div><div class='del'>-している」と簡単に注意書きをつけてください。</div><div class='del'>-</div><div class='del'>-もしパッチをより小さなパッチの集合に凝縮することができないなら、まずは</div><div class='del'>-15かそこらのパッチを送り、そのレビューと統合を待って下さい。</div><div class='del'>-</div><div class='del'>-4) パッチのスタイルチェック</div><div class='del'>-</div><div class='del'>-あなたのパッチが基本的な( Linux カーネルの)コーディングスタイルに違反し</div><div class='del'>-ていないかをチェックして下さい。その詳細を Documentation/CodingStyle で</div><div class='del'>-見つけることができます。コーディングスタイルの違反はレビューする人の</div><div class='del'>-時間を無駄にするだけなので、恐らくあなたのパッチは読まれることすらなく</div><div class='del'>-拒否されるでしょう。</div><div class='del'>-</div><div class='del'>-あなたはパッチを投稿する前に最低限パッチスタイルチェッカー</div><div class='del'>-( scripts/checkpatch.pl )を利用してパッチをチェックすべきです。</div><div class='del'>-もしパッチに違反がのこっているならば、それらの全てについてあなたは正当な</div><div class='del'>-理由を示せるようにしておく必要があります。</div><div class='del'>-</div><div class='del'>-5) 電子メールの宛先の選び方</div><div class='del'>-</div><div class='del'>-MAINTAINERS ファイルとソースコードに目を通してください。そして、その変</div><div class='del'>-更がメンテナのいる特定のサブシステムに加えられるものであることが分か</div><div class='del'>-れば、その人に電子メールを送ってください。</div><div class='del'>-</div><div class='del'>-もし、メンテナが載っていなかったり、メンテナからの応答がないなら、</div><div class='del'>-LKML ( linux-kernel@vger.kernel.org )へパッチを送ってください。ほとんど</div><div class='del'>-のカーネル開発者はこのメーリングリストに目を通しており、変更に対して</div><div class='del'>-コメントを得ることができます。</div><div class='del'>-</div><div class='del'>-15個より多くのパッチを同時に vger.kernel.org のメーリングリストへ送らな</div><div class='del'>-いでください!!!</div><div class='del'>-</div><div class='del'>-Linus Torvalds は Linux カーネルに入る全ての変更に対する最終的な意思決定者</div><div class='del'>-です。電子メールアドレスは torvalds@linux-foundation.org になります。彼は</div><div class='del'>-多くの電子メールを受け取っているため、できる限り彼に電子メールを送るのは</div><div class='del'>-避けるべきです。</div><div class='del'>-</div><div class='del'>-バグフィックスであったり、自明な変更であったり、話し合いをほとんど</div><div class='del'>-必要としないパッチは Linus へ電子メールを送るか CC しなければなりません。</div><div class='del'>-話し合いを必要としたり、明確なアドバンテージがないパッチは、通常まず</div><div class='del'>-は LKML へ送られるべきです。パッチが議論された後にだけ、そのパッチを</div><div class='del'>-Linus へ送るべきです。</div><div class='del'>-</div><div class='del'>-6) CC (カーボンコピー)先の選び方</div><div class='del'>-</div><div class='del'>-特に理由がないなら、LKML にも CC してください。</div><div class='del'>-</div><div class='del'>-Linus 以外のカーネル開発者は変更に気づく必要があり、その結果、彼らはそ</div><div class='del'>-の変更に対してコメントをくれたり、コードに対してレビューや提案をくれ</div><div class='del'>-るかもしれません。LKML とは Linux カーネル開発者にとって一番中心的なメー</div><div class='del'>-リングリストです。USB やフレームバッファデバイスや VFS や SCSI サブシステ</div><div class='del'>-ムなどの特定のサブシステムに関するメーリングリストもあります。あなた</div><div class='del'>-の変更に、はっきりと関連のあるメーリングリストについて知りたければ</div><div class='del'>-MAINTAINERS ファイルを参照してください。</div><div class='del'>-</div><div class='del'>-VGER.KERNEL.ORG でホスティングされているメーリングリストの一覧が下記の</div><div class='del'>-サイトに載っています。</div><div class='del'>-&lt;http://vger.kernel.org/vger-lists.html&gt;</div><div class='del'>-</div><div class='del'>-もし、変更がユーザランドのカーネルインタフェースに影響を与え</div><div class='del'>-るのであれば、MAN-PAGES のメンテナ( MAINTAINERS ファイルに一覧</div><div class='del'>-があります)に man ページのパッチを送ってください。少なくとも</div><div class='del'>-情報がマニュアルページの中に入ってくるように、変更が起きたという</div><div class='del'>-通知を送ってください。</div><div class='del'>-</div><div class='del'>-たとえ、メンテナが #5 で反応がなかったとしても、メンテナのコードに変更を</div><div class='del'>-加えたときには、いつもメンテナに CC するのを忘れないようにしてください。</div><div class='del'>-</div><div class='del'>-小さなパッチであれば、Trivial Patch Monkey(ちょっとしたパッチを集めている)</div><div class='del'>-&lt;trivial@kernel.org&gt;に CC してもいいです。その現管理者については MAINTAINERS</div><div class='del'>-ファイルを見てください。ちょっとしたパッチとは以下のルールのどれか1つを満たして</div><div class='del'>-いなければなりません。</div><div class='del'>- ・ドキュメントのスペルミスの修正</div><div class='del'>- ・grep(1) コマンドによる検索を困難にしているスペルの修正</div><div class='del'>- ・コンパイル時の警告の修正(無駄な警告が散乱することは好ましくないた</div><div class='del'>-   めです)</div><div class='del'>- ・コンパイル問題の修正(それらの修正が本当に正しい場合に限る)</div><div class='del'>- ・実行時の問題の修正(それらの修正が本当に問題を修正している場合に限る)</div><div class='del'>- ・廃止予定の関数やマクロを使用しているコードの除去(例 check_region )</div><div class='del'>- ・問い合わせ先やドキュメントの修正</div><div class='del'>- ・移植性のないコードから移植性のあるコードへの置き換え(小さい範囲で</div><div class='del'>-   あればアーキテクチャ特有のことでも他の人がコピーできます)</div><div class='del'>- ・作者やメンテナによる修正(すなわち patch monkey の再転送モード)</div><div class='del'>-</div><div class='del'>-7) MIME やリンクや圧縮ファイルや添付ファイルではなくプレインテキストのみ</div><div class='del'>-</div><div class='del'>-Linus や他のカーネル開発者はあなたが投稿した変更を読んで、コメントでき</div><div class='del'>-る必要があります。カーネル開発者にとって、あなたが書いたコードの特定の</div><div class='del'>-部分にコメントをするために、標準的な電子メールクライアントで変更が引用</div><div class='del'>-できることは重要です。</div><div class='del'>-</div><div class='del'>-上記の理由で、すべてのパッチは文中に含める形式の電子メールで投稿さ</div><div class='del'>-れるべきです。警告：あなたがパッチをコピー&amp;ペーストする際には、パッ</div><div class='del'>-チを改悪するエディターの折り返し機能に注意してください。</div><div class='del'>-</div><div class='del'>-パッチを圧縮の有無に関わらず MIME 形式で添付しないでください。多くのポ</div><div class='del'>-ピュラーな電子メールクライアントは MIME 形式の添付ファイルをプレーンテ</div><div class='del'>-キストとして送信するとは限らないでしょう。そうなると、電子メールクラ</div><div class='del'>-イアントがコードに対するコメントを付けることをできなくします。また、</div><div class='del'>-MIME 形式の添付ファイルは Linus に手間を取らせることになり、その変更を</div><div class='del'>-受け入れてもらう可能性が低くなってしまいます。</div><div class='del'>-</div><div class='del'>-例外：お使いの電子メールクライアントがパッチをめちゃくちゃにするので</div><div class='del'>-あれば、誰かが MIME 形式のパッチを再送するよう求めるかもしれません。</div><div class='del'>-</div><div class='del'>-余計な変更を加えずにあなたのパッチを送信するための電子メールクライアントの設定</div><div class='del'>-のヒントについては Documentation/email-clients.txt を参照してください。</div><div class='del'>-</div><div class='del'>-8) 電子メールのサイズ</div><div class='del'>-</div><div class='del'>-パッチを Linus へ送るときは常に #7 の手順に従ってください。</div><div class='del'>-</div><div class='del'>-大きなパッチはメーリングリストやメンテナにとって不親切です。パッチが</div><div class='del'>-未圧縮で 300KB を超えるようであるなら、インターネット上のアクセス可能な</div><div class='del'>-サーバに保存し、保存場所を示す URL を伝えるほうが適切です。</div><div class='del'>-</div><div class='del'>-9) カーネルバージョンの明記</div><div class='del'>-</div><div class='del'>-パッチが対象とするカーネルのバージョンをパッチの概要か電子メールの</div><div class='del'>-サブジェクトに付けることが重要です。</div><div class='del'>-</div><div class='del'>-パッチが最新バージョンのカーネルに正しく適用できなければ、Linus は</div><div class='del'>-そのパッチを採用しないでしょう。</div><div class='del'>-</div><div class='del'>-10) がっかりせず再投稿</div><div class='del'>-</div><div class='del'>-パッチを投稿した後は、辛抱強く待っていてください。Linus があなたのパッ</div><div class='del'>-チを気に入って採用すれば、Linus がリリースする次のバージョンのカーネル</div><div class='del'>-の中で姿を見せるでしょう。</div><div class='del'>-</div><div class='del'>-しかし、パッチが次のバージョンのカーネルに入っていないなら、いくつもの</div><div class='del'>-理由があるのでしょう。その原因を絞り込み、間違っているものを正し、更新</div><div class='del'>-したパッチを投稿するのはあなたの仕事です。</div><div class='del'>-</div><div class='del'>-Linus があなたのパッチに対して何のコメントもなく不採用にすることは極め</div><div class='del'>-て普通のことです。それは自然な姿です。もし、Linus があなたのパッチを受</div><div class='del'>-け取っていないのであれば、以下の理由が考えられます。</div><div class='del'>-* パッチが最新バージョンの Linux カーネルにきちんと適用できなかった</div><div class='del'>-* パッチが LKML で十分に議論されていなかった</div><div class='del'>-* スタイルの問題(セクション2を参照)</div><div class='del'>-* 電子メールフォーマットの問題(このセクションを参照)</div><div class='del'>-* パッチに対する技術的な問題</div><div class='del'>-* Linus はたくさんの電子メールを受け取っているので、どさくさに紛れて見</div><div class='del'>-  失った</div><div class='del'>-* 不愉快にさせている</div><div class='del'>-</div><div class='del'>-判断できない場合は、LKML にコメントを頼んでください。</div><div class='del'>-</div><div class='del'>-11) サブジェクトに「 PATCH 」</div><div class='del'>-</div><div class='del'>-Linus や LKML への大量の電子メールのために、サブジェクトのプレフィックスに</div><div class='del'>-「 [PATCH] 」を付けることが慣習となっています。これによって Linus や他の</div><div class='del'>-カーネル開発者がパッチであるのか、又は、他の議論に関する電子メールであるの</div><div class='del'>-かをより簡単に識別できます。</div><div class='del'>-</div><div class='del'>-12) パッチへの署名</div><div class='del'>-</div><div class='del'>-誰が何をしたのかを追いかけやすくするために (特に、パッチが何人かの</div><div class='del'>-メンテナを経て最終的に Linux カーネルに取り込まれる場合のために)、電子</div><div class='del'>-メールでやり取りされるパッチに対して「 sign-off 」という手続きを導入し</div><div class='del'>-ました。</div><div class='del'>-</div><div class='del'>-「 sign-off 」とは、パッチがあなたの書いたものであるか、あるいは、</div><div class='del'>-あなたがそのパッチをオープンソースとして提供する権利を保持している、</div><div class='del'>-という証明をパッチの説明の末尾に一行記載するというものです。</div><div class='del'>-ルールはとても単純です。以下の項目を確認して下さい。</div><div class='del'>-</div><div class='del'>-        原作者の証明書( DCO ) 1.1</div><div class='del'>-</div><div class='del'>-        このプロジェクトに寄与するものとして、以下のことを証明する。</div><div class='del'>-</div><div class='del'>-        (a) 本寄与は私が全体又は一部作成したものであり、私がそのファイ</div><div class='del'>-            ル中に明示されたオープンソースライセンスの下で公開する権利</div><div class='del'>-            を持っている。もしくは、</div><div class='del'>-</div><div class='del'>-        (b) 本寄与は、私が知る限り、適切なオープンソースライセンスでカバ</div><div class='del'>-            ーされている既存の作品を元にしている。同時に、私はそのライセ</div><div class='del'>-            ンスの下で、私が全体又は一部作成した修正物を、ファイル中で示</div><div class='del'>-            される同一のオープンソースライセンスで(異なるライセンスの下で</div><div class='del'>-            投稿することが許可されている場合を除いて)投稿する権利を持って</div><div class='del'>-            いる。もしくは、</div><div class='del'>-</div><div class='del'>-        (c) 本寄与は(a)、(b)、(c)を証明する第3者から私へ直接提供された</div><div class='del'>-            ものであり、私はそれに変更を加えていない。</div><div class='del'>-</div><div class='del'>-        (d) 私はこのプロジェクトと本寄与が公のものであることに理解及び同意す</div><div class='del'>-            る。同時に、関与した記録(投稿の際の全ての個人情報と sign-off を</div><div class='del'>-            含む)が無期限に保全されることと、当該プロジェクト又は関連する</div><div class='del'>-            オープンソースライセンスに沿った形で再配布されることに理解及び</div><div class='del'>-            同意する。</div><div class='del'>-</div><div class='del'>-もしこれに同意できるなら、以下のような1行を追加してください。</div><div class='del'>-</div><div class='del'>-	Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='del'>-</div><div class='del'>-実名を使ってください。(残念ですが、偽名や匿名による寄与はできません。)</div><div class='del'>-</div><div class='del'>-人によっては sign-off の近くに追加のタグを付加しています。それらは今のところ</div><div class='del'>-無視されますが、あなたはそのタグを社内の手続きに利用したり、sign-off に特別</div><div class='del'>-な情報を示したりすることができます。</div><div class='del'>-</div><div class='del'>-あなたがサブシステムまたはブランチのメンテナであれば、受け取ったパッチを自身の</div><div class='del'>-ツリーにマージするために、わずかに変更が必要となる場合があります。なぜなら</div><div class='del'>-あなたのツリーの中のコードと投稿者のツリーの中のコードは同一ではないためです。</div><div class='del'>-もし、あなたが厳密に上記ルール(c)にこだわるのであれば、投稿者に再度差分を</div><div class='del'>-とるよう依頼すべきです。しかし、これは時間とエネルギーを非生産的に浪費する</div><div class='del'>-ことになります。ルール(b)はあなたにコードを修正する権利を与えてくれます。</div><div class='del'>-しかし、投稿者のコードを修正し、その修正によるバグを投稿者に押し付けてしまう</div><div class='del'>-ことはとても失礼なことです。この問題を解決するために、末尾の投稿者の</div><div class='del'>-Signed-off-by とあなたがその末尾に追加する Signed-off-by の間に、修正を</div><div class='del'>-加えたことを示す1行を追加することが推奨されています。</div><div class='del'>-(その1行の書き方に)決まりはありませんが、大括弧の中に電子メールアドレスや氏名</div><div class='del'>-と修正内容を記載するやり方は目につきやすく、最終段階での変更の責任があなたに</div><div class='del'>-あることを明確にするのに十分な方法のようです。例えば、</div><div class='del'>-</div><div class='del'>-	Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='del'>-	[lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]</div><div class='del'>-	Signed-off-by: Lucky K Maintainer &lt;lucky@maintainer.example.org&gt;</div><div class='del'>-</div><div class='del'>-あなたが安定版のブランチを管理しており、作成者のクレジット、変更の追跡、</div><div class='del'>-修正のマージ、と同時に苦情からの投稿者の保護を行いたい場合、この慣習は特に</div><div class='del'>-有用となります。いかなる事情があってもチェンジログに出てくる作成者の</div><div class='del'>-アイデンティティ情報(From ヘッダ)は変更できないことに注意してください。</div><div class='del'>-</div><div class='del'>-バックポートする人のための特別な注意事項。追跡を容易に行うために、コミット</div><div class='del'>-メッセージのトップ(サブジェクト行のすぐ後)にパッチの起源を示す情報を記述する</div><div class='del'>-ことは一般的で有用な慣習です。例えば、これは 2.6-stable ツリーでの一例です。    </div><div class='del'>-</div><div class='del'>-    Date:   Tue May 13 19:10:30 2008 +0000</div><div class='del'>-</div><div class='del'>-        SCSI: libiscsi regression in 2.6.25: fix nop timer handling</div><div class='del'>-</div><div class='del'>-        commit 4cf1043593db6a337f10e006c23c69e5fc93e722 upstream</div><div class='del'>-</div><div class='del'>-そして、これは 2.4 ツリーでの一例です。</div><div class='del'>-</div><div class='del'>-    Date:   Tue May 13 22:12:27 2008 +0200</div><div class='del'>-</div><div class='del'>-        wireless, airo: waitbusy() won't delay</div><div class='del'>-</div><div class='del'>-        [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]</div><div class='del'>-</div><div class='del'>-どんな形式であれ、この情報はあなたのツリーを追跡する人やあなたのツリーのバグを</div><div class='del'>-解決しようとしている人にとって価値のある支援となります。</div><div class='del'>-</div><div class='del'>-13) いつ Acked-by: と Cc: を使うのか</div><div class='del'>-</div><div class='del'>-「 Signed-off-by: 」タグはその署名者がパッチの開発に関わっていたことやパッチ</div><div class='del'>-の伝播パスにいたことを示しています。</div><div class='del'>-</div><div class='del'>-ある人が直接パッチの準備や作成に関わっていないけれど、その人のパッチに対す</div><div class='del'>-る承認を記録し、示したいとします。その場合、その人を示すのに Acked-by: が使</div><div class='del'>-えます。Acked-by: はパッチのチェンジログにも追加されます。</div><div class='del'>-</div><div class='del'>-パッチの影響を受けるコードのメンテナがパッチに関わっていなかったり、パッチ</div><div class='del'>-の伝播パスにいなかった時にも、メンテナは Acked-by: をしばしば利用します。</div><div class='del'>-</div><div class='del'>-Acked-by: は Signed-off-by: のように公式なタグではありません。それはメンテナが</div><div class='del'>-少なくともパッチをレビューし、同意を示しているという記録です。そのような</div><div class='del'>-ことからパッチをマージする人がメンテナの「うん、良いと思うよ」という発言を</div><div class='del'>-Acked-by: へ置き換えることがあります。</div><div class='del'>-</div><div class='del'>-Acked-by: が必ずしもパッチ全体の承認を示しているわけではありません。例えば、</div><div class='del'>-あるパッチが複数のサブシステムへ影響を与えており、その中の1つのサブシステム</div><div class='del'>-のメンテナからの Acked-by: を持っているとします。その場合、Acked-by: は通常</div><div class='del'>-そのメンテナのコードに影響を与える一部分だけに対する承認を示しています。</div><div class='del'>-この点は、ご自分で判断してください。(その Acked-by: が)疑わしい場合は、</div><div class='del'>-メーリングリストアーカイブの中の大元の議論を参照すべきです。</div><div class='del'>-</div><div class='del'>-パッチにコメントする機会を持っていたが、その時にコメントしなかった人がいれば、</div><div class='del'>-その人を指す「Cc:」タグを任意で追加してもかまいません。これは指定された人からの</div><div class='del'>-明確なアクションなしに付与できる唯一のタグです。</div><div class='del'>-このタグはパッチに関心があると思われる人達がそのパッチの議論に含まれていたこと</div><div class='del'>-を明文化します。</div><div class='del'>-</div><div class='del'>-14) Reported-by と Tested-by: と Reviewed-by: の利用</div><div class='del'>-</div><div class='del'>-他の誰かによって報告された問題を修正するパッチであれば、問題報告者という寄与を</div><div class='del'>-クレジットするために、Reported-by: タグを追加することを検討してください。</div><div class='del'>-こまめにバグ報告者をクレジットしていくことで、うまくいけばその人たちが将来再び</div><div class='del'>-コミュニティの力となってくれるでしょう。</div><div class='del'>-ただし、報告者の許可無くこのタグを追加しないように注意してください。特に、</div><div class='del'>-問題が公の場で報告されていなかったのであれば。</div><div class='del'>-</div><div class='del'>-Tested-by: タグはタグで指定された人によって(ある環境下で)パッチのテストに成功</div><div class='del'>-していることを示します。このタグはメンテナにテストが実施済みであることを</div><div class='del'>-知らせ、将来の関連パッチのテスト協力者を見つける方法を提供し、テスト実施者に</div><div class='del'>-対するクレジットを保証します。</div><div class='del'>-</div><div class='del'>-Reviewed-by: タグは、それとは異なり、下記のレビューア宣言の下にレビューされ、</div><div class='del'>-受け入れ可能とみなされたパッチであることを示します。</div><div class='del'>-</div><div class='del'>-        レビューアによる監督宣言</div><div class='del'>-</div><div class='del'>-        私は Reviewed-by: タグを提示することによって、以下のことを明言する。</div><div class='del'>-</div><div class='del'>-        (a) 私はメインラインカーネルへの統合に向け、その妥当性及び「即応性</div><div class='del'>-            (訳注)」を検証し、技術的側面からパッチをレビュー済みである。</div><div class='del'>-</div><div class='del'>-        訳注:</div><div class='del'>-        「即応性」の原文は "readiness"。</div><div class='del'>-        パッチが十分な品質を持っており、メインラインカーネルへの統合を即座に</div><div class='del'>-        行うことができる状態であるかどうかを "readiness" という単語で表現</div><div class='del'>-        している。</div><div class='del'>-</div><div class='del'>-        (b) パッチに関するあらゆる問題、懸念、あるいは、疑問は投稿者へ伝達済み</div><div class='del'>-            である。私はそれらのコメントに対する投稿者の返答に満足している。</div><div class='del'>-</div><div class='del'>-        (c) 投稿に伴い改良されるコードがある一方で、現時点で、私は(1)それが</div><div class='del'>-            カーネルにとって価値のある変更であること、そして、(2)統合に際して</div><div class='del'>-            議論になり得るような問題はないものと確信している。</div><div class='del'>-</div><div class='del'>-        (d) 私はパッチをレビューし適切であると確信している一方で、あらゆる</div><div class='del'>-            状況においてその宣言した目的や機能が正しく実現することに関して、</div><div class='del'>-            いかなる保証もしない(特にどこかで明示しない限り)。</div><div class='del'>-</div><div class='del'>-Reviewd-by タグはそのパッチがカーネルに対して適切な修正であって、深刻な技術的</div><div class='del'>-問題を残していないという意見の宣言です。興味のあるレビューアは誰でも(レビュー</div><div class='del'>-作業を終えたら)パッチに対して Reviewed-by タグを提示できます。このタグは</div><div class='del'>-レビューアの寄与をクレジットする働き、レビューの進捗の度合いをメンテナに</div><div class='del'>-知らせる働きを持ちます。そのパッチの領域に詳しく、そして、しっかりとした</div><div class='del'>-レビューを実施したレビューアによって提供される時、Reviewed-by: タグがあなたの</div><div class='del'>-パッチをカーネルにマージする可能性を高めるでしょう。</div><div class='del'>-</div><div class='del'>-15) 標準的なパッチのフォーマット</div><div class='del'>-</div><div class='del'>-標準的なパッチのサブジェクトは以下のとおりです。</div><div class='del'>-</div><div class='del'>-    Subject: [PATCH 001/123] subsystem: summary phrase</div><div class='del'>-</div><div class='del'>-標準的なパッチの、電子メールのボディは以下の項目を含んでいます。</div><div class='del'>-</div><div class='del'>-  - パッチの作成者を明記する「 from 」行</div><div class='del'>-</div><div class='del'>-  - 空行</div><div class='del'>-</div><div class='del'>-  - 説明本体。これはこのパッチを説明するために無期限のチェンジログ</div><div class='del'>-    (変更履歴)にコピーされます。</div><div class='del'>-</div><div class='del'>-  - 上述した「 Signed-off-by: 」行。これも説明本体と同じくチェン</div><div class='del'>-    ジログ内にコピーされます。</div><div class='del'>-</div><div class='del'>-  - マーカー行は単純に「 --- 」です。</div><div class='del'>-</div><div class='del'>-  - 余計なコメントは、チェンジログには不適切です。</div><div class='del'>-</div><div class='del'>-  - 実際のパッチ(差分出力)</div><div class='del'>-</div><div class='del'>-サブジェクト行のフォーマットは、アルファベット順で電子メールをとても</div><div class='del'>-ソートしやすいものになっています。(ほとんどの電子メールクライアント</div><div class='del'>-はソートをサポートしています)パッチのサブジェクトの連番は0詰めであ</div><div class='del'>-るため、数字でのソートとアルファベットでのソートは同じ結果になります。</div><div class='del'>-</div><div class='del'>-電子メールのサブジェクト内のサブシステム表記は、パッチが適用される</div><div class='del'>-分野またはサブシステムを識別できるようにすべきです。</div><div class='del'>-</div><div class='del'>-電子メールのサブジェクトの「summary phrase」はそのパッチの概要を正確</div><div class='del'>-に表現しなければなりません。「summary phrase」をファイル名にしてはい</div><div class='del'>-けません。パッチシリーズ中でそれぞれのパッチは同じ「summary phrase」を</div><div class='del'>-使ってはいけません(「パッチシリーズ」とは順序付けられた関連のある複数の</div><div class='del'>-パッチ群です)。</div><div class='del'>-</div><div class='del'>-あなたの電子メールの「summary phrase」がそのパッチにとって世界で唯一の識別子に</div><div class='del'>-なるように心がけてください。「summary phrase」は git のチェンジログの中へ</div><div class='del'>-ずっと伝播していきます。「summary phrase」は、開発者が後でパッチを参照する</div><div class='del'>-ために議論の中で利用するかもしれません。</div><div class='del'>-人々はそのパッチに関連した議論を読むために「summary phrase」を使って google で</div><div class='del'>-検索したがるでしょう。それはまた2、3ヶ月あとで、人々が「gitk」や</div><div class='del'>-「git log --oneline」のようなツールを使用して何千ものパッチに目を通す時、</div><div class='del'>-唯一目にとまる情報となるでしょう。</div><div class='del'>-</div><div class='del'>-これらの理由のため、「summary phrase」はなぜパッチが必要であるか、パッチが何を</div><div class='del'>-変更するかの2つの情報をせいぜい70〜75文字で表現していなければなりません。</div><div class='del'>-「summary phrase」は簡潔であり説明的である表現を目指しつつ、うまく</div><div class='del'>-まとめられている概要となるべきです。</div><div class='del'>-</div><div class='del'>-「summary phrase」は「Subject: [PATCH tag] &lt;summary phrase&gt;」のように、</div><div class='del'>-大括弧で閉じられたタグを接頭辞として付加してもかまいません。このタグは</div><div class='del'>-「summary phrase」の一部とは考えませんが、パッチをどのように取り扱うべきかを</div><div class='del'>-表現します。</div><div class='del'>-一般的には「v1, v2, v3」のようなバージョン情報を表すタグ(過去のパッチに対する</div><div class='del'>-コメントを反映するために複数のバージョンのパッチが投稿されているのであれば)、</div><div class='del'>-「RFC」のようなコメントを要求するタグが挙げられます。パッチシリーズとして4つの</div><div class='del'>-パッチがあれば、個々のパッチに「1/4, 2/4, 3/4, 4/4」のように番号を付けても</div><div class='del'>-かまいません。これは開発者がパッチを適用する順番を確実に把握するためです。</div><div class='del'>-そして、開発者がパッチシリーズの中のすべてのパッチをもらさずレビュー或いは</div><div class='del'>-適用するのを保証するためです。</div><div class='del'>-</div><div class='del'>-サブジェクトの例を二つ</div><div class='del'>-</div><div class='del'>-    Subject: [patch 2/5] ext2: improve scalability of bitmap searching</div><div class='del'>-    Subject: [PATCHv2 001/207] x86: fix eflags tracking</div><div class='del'>-</div><div class='del'>-「 from 」行は電子メールのボディの一番最初の行でなければなりません。</div><div class='del'>-その形式は以下のとおりです。</div><div class='del'>-</div><div class='del'>-        From: Original Author &lt;author@example.com&gt;</div><div class='del'>-</div><div class='del'>-「 from 」行はチェンジログの中で、そのパッチの作成者としてクレジットされ</div><div class='del'>-ている人を特定するものです。「 from 」行がかけていると、電子メールのヘッ</div><div class='del'>-ダーの「 From: 」が、チェンジログの中でパッチの作成者を決定するために使わ</div><div class='del'>-れるでしょう。</div><div class='del'>-</div><div class='del'>-説明本体は無期限のソースのチェンジログにコミットされます。なので、説明</div><div class='del'>-本体はそのパッチに至った議論の詳細を忘れているある程度の技量を持っている人</div><div class='del'>-がその詳細を思い出すことができるものでなければなりません。パッチが対処する</div><div class='del'>-障害の症状(カーネルログメッセージや oops メッセージ等)を記載することは問題に</div><div class='del'>-対処可能なパッチを求めてコミットログを検索する人々にとって特に有用です。</div><div class='del'>-パッチがコンパイル問題を解決するのであれば、そのパッチを探している人が見つける</div><div class='del'>-ことができる情報だけで十分であり、コンパイル時の全てのエラーを含める必要は</div><div class='del'>-ありません。「summary phrase」と同様に、簡潔であり説明的であることが重要です。</div><div class='del'>-</div><div class='del'>-「 --- 」マーカー行はパッチ処理ツールに対して、チェンジログメッセージの終端</div><div class='del'>-部分を認識させるという重要な役目を果たします。</div><div class='del'>-</div><div class='del'>-「 --- 」マーカー行の後の追加コメントの良い使用方法の1つに diffstat コマンド</div><div class='del'>-があります。diffstat コマンドとは何のファイルが変更され、1ファイル当たり何行</div><div class='del'>-追加され何行消されたかを示すものです。diffstat コマンドは特に大きなパッチに</div><div class='del'>-おいて役立ちます。その時点でだけ又はメンテナにとってのみ関係のあるコメント</div><div class='del'>-は無期限に保存されるチェンジログにとって適切ではありません。そのため、この</div><div class='del'>-ようなコメントもマーカー行の後に書かれるべきです。</div><div class='del'>-このようなコメントの良い例として、v1 と v2 のバージョン間で何が変更されたかを</div><div class='del'>-表す「パッチの変更履歴」が挙げられます。</div><div class='del'>-</div><div class='del'>-「 --- 」マーカー行の後に diffstat コマンドの結果を含めるのであれば、ファイル</div><div class='del'>-名はカーネルソースツリーのトップディレクトリからの表記で列記されるため、横方向</div><div class='del'>-のスペースをとり過ぎないように、diffstat コマンドにオプション「 -p 1 -w 70 」</div><div class='del'>-を指定してください(インデントを含めてちょうど80列に合うでしょう)。</div><div class='del'>-</div><div class='del'>-適切なパッチのフォーマットの詳細についてはセクション3の参考文献を参照して</div><div class='del'>-ください。</div><div class='del'>-</div><div class='del'>-16) 「git pull」要求の送り方(Linus の電子メールから)</div><div class='del'>-</div><div class='del'>-間違ったブランチから引っ張るのを防ぐために、git リポジトリのアドレスと</div><div class='del'>-ブランチ名を同じ行に1行で記載してください。そうすることで、3回の連続クリック</div><div class='del'>-で全て選択できます。</div><div class='del'>-</div><div class='del'>-正しい形式は下記の通りです。</div><div class='del'>-</div><div class='del'>-	"Please pull from</div><div class='del'>-</div><div class='del'>-		git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus</div><div class='del'>-</div><div class='del'>-	 to get these changes:"</div><div class='del'>-</div><div class='del'>-その結果、アドレスを自分自身でタイピングして間違えることはなくなります(実際に、</div><div class='del'>-何度か間違ったブランチから引っ張ってきてしまい、その時に diffstat の結果を</div><div class='del'>-検証して間違っていることに気づいたことがあります。どこから何を引っ張るべきかを</div><div class='del'>-「探したり」、正しいブランチ名かどうかを重ねてチェックしたりする必要が</div><div class='del'>-なくなればより快適になるでしょう)。</div><div class='del'>-</div><div class='del'>-diffstat の結果を生成するために「 git diff -M --stat --summary 」を使って</div><div class='del'>-ください。-M オプションはファイル名の変更を検知でき、--summary オプションは</div><div class='del'>-新規ファイル、削除されたファイル、名前が変更されたファイルの概要を生成します。</div><div class='del'>-</div><div class='del'>--M オプション(ファイル名の変更検知)を指定すると、diffstat の結果はかなり</div><div class='del'>-異なってきます。git は大規模な変更(追加と削除のペア)をファイル名の変更と</div><div class='del'>-判断するためです。</div><div class='del'>-</div><div class='del'>-------------------------------------</div><div class='del'>-セクション2 - ヒントとTIPSと小技</div><div class='del'>-------------------------------------</div><div class='del'>-</div><div class='del'>-このセクションは Linux カーネルに変更を適用することに関係のある一般的な</div><div class='del'>-「お約束」の多くを載せています。物事には例外というものがあります。しか</div><div class='del'>-し例外を適用するには、本当に妥当な理由が不可欠です。あなたは恐らくこの</div><div class='del'>-セクションを Linus のコンピュータ・サイエンス101と呼ぶでしょう。</div><div class='del'>-</div><div class='del'>-1) Documentation/CodingStyleを参照</div><div class='del'>-</div><div class='del'>-言うまでもなく、あなたのコードがこのコーディングスタイルからあまりに</div><div class='del'>-も逸脱していると、レビューやコメントなしに受け取ってもらえないかもし</div><div class='del'>-れません。</div><div class='del'>-</div><div class='del'>-特筆すべき例外は、コードをあるファイルから別のファイルに移動</div><div class='del'>-するときです。この場合、コードを移動するパッチでは、移動されるコード</div><div class='del'>-に関して移動以外の変更を一切加えるべきではありません。これにより、</div><div class='del'>-コードの移動とあなたが行ったコードの修正を明確に区別できるようにな</div><div class='del'>-ります。これは実際に何が変更されたかをレビューする際の大きな助けに</div><div class='del'>-なるとともに、ツールにコードの履歴を追跡させることも容易になります。</div><div class='del'>-</div><div class='del'>-投稿するより前にパッチのスタイルチェッカー( scripts/checkpatch.pl )で</div><div class='del'>-あなたのパッチをチェックしてください。このスタイルチェッカーは最終結</div><div class='del'>-論としてではなく、指標としてみるべきです。もし、あなたのコードが違反</div><div class='del'>-はしているが修正するより良く見えるのであれば、おそらくそのままにする</div><div class='del'>-のがベストです。</div><div class='del'>-</div><div class='del'>-スタイルチェッカーによる3段階のレポート:</div><div class='del'>- - エラー: 間違っている可能性が高い</div><div class='del'>- - 警告：注意してレビューする必要がある</div><div class='del'>- - チェック：考慮する必要がある</div><div class='del'>-</div><div class='del'>-あなたはパッチに残っている全ての違反について、それがなぜ必要なのか正当な</div><div class='del'>-理由を示せるようにしておく必要があります。</div><div class='del'>-</div><div class='del'>-2) #ifdefは見苦しい</div><div class='del'>-</div><div class='del'>-ifdef が散乱したコードは、読むのもメンテナンスするのも面倒です。コードの中</div><div class='del'>-で ifdef を使わないでください。代わりに、ヘッダファイルの中に ifdef を入れて、</div><div class='del'>-条件付きで、コードの中で使われる関数を「 static inline 」関数かマクロで定義し</div><div class='del'>-てください。後はコンパイラが、何もしない箇所を最適化して取り去ってくれるで</div><div class='del'>-しょう。</div><div class='del'>-</div><div class='del'>-まずいコードの簡単な例</div><div class='del'>-</div><div class='del'>-	dev = alloc_etherdev (sizeof(struct funky_private));</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	#ifdef CONFIG_NET_FUNKINESS</div><div class='del'>-	init_funky_net(dev);</div><div class='del'>-	#endif</div><div class='del'>-</div><div class='del'>-クリーンアップしたコードの例</div><div class='del'>-</div><div class='del'>-(in header)</div><div class='del'>-	#ifndef CONFIG_NET_FUNKINESS</div><div class='del'>-	static inline void init_funky_net (struct net_device *d) {}</div><div class='del'>-	#endif</div><div class='del'>-</div><div class='del'>-(in the code itself)</div><div class='del'>-	dev = alloc_etherdev (sizeof(struct funky_private));</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	init_funky_net(dev);</div><div class='del'>-</div><div class='del'>-3) マクロより「 static inline 」を推奨</div><div class='del'>-</div><div class='del'>-「 static inline 」関数はマクロよりもずっと推奨されています。それらは、</div><div class='del'>-型安全性があり、長さにも制限が無く、フォーマットの制限もありません。</div><div class='del'>-gcc においては、マクロと同じくらい軽いです。</div><div class='del'>-</div><div class='del'>-マクロは「 static inline 」が明らかに不適切であると分かる場所(高速化パスの</div><div class='del'>-いくつかの特定のケース)や「 static inline 」関数を使うことができないような</div><div class='del'>-場所(マクロの引数の文字列連結のような)にだけ使われるべきです。</div><div class='del'>-</div><div class='del'>-「 static inline 」は「 static __inline__ 」や「 extern inline 」や</div><div class='del'>-「 extern __inline__ 」よりも適切です。</div><div class='del'>-</div><div class='del'>-4) 設計に凝りすぎるな</div><div class='del'>-</div><div class='del'>-それが有用になるかどうか分からないような不明瞭な将来を見越した設計</div><div class='del'>-をしないでください。「できる限り簡単に、そして、それ以上簡単になら</div><div class='del'>-ないような設計をしてください。」</div><div class='del'>-</div><div class='del'>-----------------------</div><div class='del'>-セクション3 参考文献</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-Andrew Morton, "The perfect patch" (tpp).</div><div class='del'>-  &lt;http://www.ozlabs.org/~akpm/stuff/tpp.txt&gt;</div><div class='del'>-</div><div class='del'>-Jeff Garzik, "Linux kernel patch submission format".</div><div class='del'>-  &lt;http://linux.yyz.us/patch-format.html&gt;</div><div class='del'>-</div><div class='del'>-Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".</div><div class='del'>-  &lt;http://www.kroah.com/log/2005/03/31/&gt;</div><div class='del'>-  &lt;http://www.kroah.com/log/2005/07/08/&gt;</div><div class='del'>-  &lt;http://www.kroah.com/log/2005/10/19/&gt;</div><div class='del'>-  &lt;http://www.kroah.com/log/2006/01/11/&gt;</div><div class='del'>-</div><div class='del'>-NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!</div><div class='del'>-  &lt;https://lkml.org/lkml/2005/7/11/336&gt;</div><div class='del'>-</div><div class='del'>-Kernel Documentation/CodingStyle:</div><div class='del'>-  &lt;http://users.sosdg.org/~qiyong/lxr/source/Documentation/CodingStyle&gt;</div><div class='del'>-</div><div class='del'>-Linus Torvalds's mail on the canonical patch format:</div><div class='del'>-  &lt;http://lkml.org/lkml/2005/4/7/183&gt;</div><div class='del'>-</div><div class='del'>-Andi Kleen, "On submitting kernel patches"</div><div class='del'>-  Some strategies to get difficult or controversial changes in.</div><div class='del'>-  http://halobates.de/on-submitting-patches.pdf</div><div class='del'>-</div><div class='del'>---</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/ja_JP/stable_api_nonsense.txt b/Documentation/ja_JP/stable_api_nonsense.txt<br/>deleted file mode 100644<br/>index 7653b5cbfed2..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/ja_JP/stable_api_nonsense.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ja_JP/stable_api_nonsense.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,263 +0,0 @@</div><div class='del'>-NOTE:</div><div class='del'>-This is a version of Documentation/stable_api_nonsense.txt into Japanese.</div><div class='del'>-This document is maintained by IKEDA, Munehiro &lt;m-ikeda@ds.jp.nec.com&gt;</div><div class='del'>-and the JF Project team &lt;http://www.linux.or.jp/JF/&gt;.</div><div class='del'>-If you find any difference between this document and the original file</div><div class='del'>-or a problem with the translation,</div><div class='del'>-please contact the maintainer of this file or JF project.</div><div class='del'>-</div><div class='del'>-Please also note that the purpose of this file is to be easier to read</div><div class='del'>-for non English (read: Japanese) speakers and is not intended as a</div><div class='del'>-fork. So if you have any comments or updates of this file, please try</div><div class='del'>-to update the original English file first.</div><div class='del'>-</div><div class='del'>-Last Updated: 2007/07/18</div><div class='del'>-==================================</div><div class='del'>-これは、</div><div class='del'>-linux-2.6.22-rc4/Documentation/stable_api_nonsense.txt の和訳</div><div class='del'>-です。</div><div class='del'>-翻訳団体： JF プロジェクト &lt; http://www.linux.or.jp/JF/ &gt;</div><div class='del'>-翻訳日 ： 2007/06/11</div><div class='del'>-原著作者: Greg Kroah-Hartman &lt; greg at kroah dot com &gt;</div><div class='del'>-翻訳者 ： 池田 宗広 &lt; m-ikeda at ds dot jp dot nec dot com &gt;</div><div class='del'>-校正者 ： Masanori Kobayashi さん &lt; zap03216 at nifty dot ne dot jp &gt;</div><div class='del'>-          Seiji Kaneko さん &lt; skaneko at a2 dot mbn dot or dot jp &gt;</div><div class='del'>-==================================</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Linux カーネルのドライバインターフェース</div><div class='del'>-（あなたの質問すべてに対する回答とその他諸々）</div><div class='del'>-</div><div class='del'>-Greg Kroah-Hartman &lt;greg at kroah dot com&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-この文書は、なぜ Linux ではバイナリカーネルインターフェースが定義</div><div class='del'>-されていないのか、またはなぜ不変のカーネルインターフェースを持たな</div><div class='del'>-いのか、ということを説明するために書かれた。ここでの話題は「カーネ</div><div class='del'>-ル内部の」インターフェースについてであり、ユーザー空間とのインター</div><div class='del'>-フェースではないことを理解してほしい。カーネルとユーザー空間とのイ</div><div class='del'>-ンターフェースとはアプリケーションプログラムが使用するものであり、</div><div class='del'>-つまりシステムコールのインターフェースがこれに当たる。これは今まで</div><div class='del'>-長きに渡り、かつ今後も「まさしく」不変である。私は確か 0.9 か何か</div><div class='del'>-より前のカーネルを使ってビルドした古いプログラムを持っているが、そ</div><div class='del'>-れは最新の 2.6 カーネルでもきちんと動作する。ユーザー空間とのイン</div><div class='del'>-ターフェースは、ユーザーとアプリケーションプログラマが不変性を信頼</div><div class='del'>-してよいものの一つである。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-要旨</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-あなたは不変のカーネルインターフェースが必要だと考えているかもしれ</div><div class='del'>-ないが、実際のところはそうではない。あなたは必要としているものが分</div><div class='del'>-かっていない。あなたが必要としているものは安定して動作するドライバ</div><div class='del'>-であり、それはドライバがメインのカーネルツリーに含まれる場合のみ得</div><div class='del'>-ることができる。ドライバがメインのカーネルツリーに含まれていると、</div><div class='del'>-他にも多くの良いことがある。それは、Linux をより強固で、安定な、成</div><div class='del'>-熟したオペレーティングシステムにすることができるということだ。これ</div><div class='del'>-こそ、そもそもあなたが Linux を使う理由のはずだ。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-はじめに</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-カーネル内部のインターフェース変更を心配しなければならないドライバ</div><div class='del'>-を書きたいなどというのは、変わり者だけだ。この世界のほとんどの人は、</div><div class='del'>-そのようなドライバがどんなインターフェースを使っているかなど知らな</div><div class='del'>-いし、そんなドライバのことなど全く気にもかけていない。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-まず初めに、クローズソースとか、ソースコードの隠蔽とか、バイナリの</div><div class='del'>-みが配布される使い物にならない代物[訳注(1)]とか、実体はバイナリ</div><div class='del'>-コードでそれを読み込むためのラッパー部分のみソースコードが公開され</div><div class='del'>-ているとか、その他用語は何であれ GPL の下にソースコードがリリース</div><div class='del'>-されていないカーネルドライバに関する法的な問題について、私は「いか</div><div class='del'>-なる議論も」行うつもりがない。法的な疑問があるのならば、プログラマ</div><div class='del'>-である私ではなく、弁護士に相談して欲しい。ここでは単に、技術的な問</div><div class='del'>-題について述べることにする。（法的な問題を軽視しているわけではない。</div><div class='del'>-それらは実際に存在するし、あなたはそれをいつも気にかけておく必要が</div><div class='del'>-ある）</div><div class='del'>-</div><div class='del'>-訳注(1)</div><div class='del'>-「使い物にならない代物」の原文は "blob"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-さてここでは、バイナリカーネルインターフェースについてと、ソースレ</div><div class='del'>-ベルでのインターフェースの不変性について、という二つの話題を取り上</div><div class='del'>-げる。この二つは互いに依存する関係にあるが、まずはバイナリインター</div><div class='del'>-フェースについて議論を行いやっつけてしまおう。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-バイナリカーネルインターフェース</div><div class='del'>---------------------------------</div><div class='del'>-</div><div class='del'>-もしソースレベルでのインターフェースが不変ならば、バイナリインター</div><div class='del'>-フェースも当然のように不変である、というのは正しいだろうか？正しく</div><div class='del'>-ない。Linux カーネルに関する以下の事実を考えてみてほしい。</div><div class='del'>-  - あなたが使用するＣコンパイラのバージョンによって、カーネル内部</div><div class='del'>-    の構造体の配置構造は異なったものになる。また、関数は異なった方</div><div class='del'>-    法でカーネルに含まれることになるかもしれない（例えばインライン</div><div class='del'>-    関数として扱われたり、扱われなかったりする）。個々の関数がどの</div><div class='del'>-    ようにコンパイルされるかはそれほど重要ではないが、構造体のパデ</div><div class='del'>-    ィングが異なるというのは非常に重要である。</div><div class='del'>-  - あなたがカーネルのビルドオプションをどのように設定するかによっ</div><div class='del'>-    て、カーネルには広い範囲で異なった事態が起こり得る。</div><div class='del'>-      - データ構造は異なるデータフィールドを持つかもしれない</div><div class='del'>-      - いくつかの関数は全く実装されていない状態になり得る</div><div class='del'>-        （例：SMP向けではないビルドでは、いくつかのロックは中身が</div><div class='del'>-          カラにコンパイルされる）</div><div class='del'>-      - カーネル内のメモリは、異なった方法で配置され得る。これはビ</div><div class='del'>-        ルドオプションに依存している。</div><div class='del'>-  - Linux は様々な異なるプロセッサアーキテクチャ上で動作する。</div><div class='del'>-    あるアーキテクチャ用のバイナリドライバを、他のアーキテクチャで</div><div class='del'>-    正常に動作させる方法はない。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ある特定のカーネル設定を使用し、カーネルをビルドしたのと正確に同じ</div><div class='del'>-Ｃコンパイラを使用して単にカーネルモジュールをコンパイルするだけで</div><div class='del'>-も、あなたはこれらいくつもの問題に直面することになる。ある特定の</div><div class='del'>-Linux ディストリビューションの、ある特定のリリースバージョン用にモ</div><div class='del'>-ジュールを提供しようと思っただけでも、これらの問題を引き起こすには</div><div class='del'>-十分である。にも関わらず Linux ディストリビューションの数と、サ</div><div class='del'>-ポートするディストリビューションのリリース数を掛け算し、それら一つ</div><div class='del'>-一つについてビルドを行ったとしたら、今度はリリースごとのビルドオプ</div><div class='del'>-ションの違いという悪夢にすぐさま悩まされることになる。また、ディス</div><div class='del'>-トリビューションの各リリースバージョンには、異なるハードウェア（プ</div><div class='del'>-ロセッサタイプや種々のオプション）に対応するため、何種類かのカーネ</div><div class='del'>-ルが含まれているということも理解して欲しい。従って、ある一つのリ</div><div class='del'>-リースバージョンだけのためにモジュールを作成する場合でも、あなたは</div><div class='del'>-何バージョンものモジュールを用意しなければならない。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-信じて欲しい。このような方法でサポートを続けようとするなら、あなた</div><div class='del'>-はいずれ正気を失うだろう。遠い昔、私はそれがいかに困難なことか、身</div><div class='del'>-をもって学んだのだ・・・</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-不変のカーネルソースレベルインターフェース</div><div class='del'>-------------------------------------------</div><div class='del'>-</div><div class='del'>-メインカーネルツリーに含まれていない Linux カーネルドライバを継続</div><div class='del'>-してサポートしていこうとしている人たちとの議論においては、これは極</div><div class='del'>-めて「引火性の高い」話題である。[訳注(2)]</div><div class='del'>-</div><div class='del'>-訳注(2)</div><div class='del'>-「引火性の高い」の原文は "volatile"。</div><div class='del'>-volatile には「揮発性の」「爆発しやすい」という意味の他、「変わり</div><div class='del'>-やすい」「移り気な」という意味がある。</div><div class='del'>-「（この話題は）爆発的に激しい論争を巻き起こしかねない」ということ</div><div class='del'>-を、「（カーネルのソースレベルインターフェースは）移ろい行くもので</div><div class='del'>-ある」ということを連想させる "volatile" という単語で表現している。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Linux カーネルの開発は継続的に速いペースで行われ、決して歩みを緩め</div><div class='del'>-ることがない。その中でカーネル開発者達は、現状のインターフェースに</div><div class='del'>-あるバグを見つけ、より良い方法を考え出す。彼らはやがて、現状のイン</div><div class='del'>-ターフェースがより正しく動作するように修正を行う。その過程で関数の</div><div class='del'>-名前は変更されるかもしれず、構造体は大きく、または小さくなるかもし</div><div class='del'>-れず、関数の引数は検討しなおされるかもしれない。そのような場合、引</div><div class='del'>-き続き全てが正常に動作するよう、カーネル内でこれらのインターフェー</div><div class='del'>-スを使用している個所も全て同時に修正される。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-具体的な例として、カーネル内の USB インターフェースを挙げる。USB</div><div class='del'>-サブシステムはこれまでに少なくとも３回の書き直しが行われ、その結果</div><div class='del'>-インターフェースが変更された。これらの書き直しはいくつかの異なった</div><div class='del'>-問題を修正するために行われた。</div><div class='del'>-  - 同期的データストリームが非同期に変更された。これにより多数のド</div><div class='del'>-    ライバを単純化でき、全てのドライバのスループットが向上した。今</div><div class='del'>-    やほとんど全ての USB デバイスは、考えられる最高の速度で動作し</div><div class='del'>-    ている。</div><div class='del'>-  - USB ドライバが USB サブシステムのコアから行う、データパケット</div><div class='del'>-    用のメモリ確保方法が変更された。これに伴い、いくつもの文書化さ</div><div class='del'>-    れたデッドロック条件を回避するため、全ての USB ドライバはより</div><div class='del'>-    多くの情報を USB コアに提供しなければならないようになっている。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-このできごとは、数多く存在するクローズソースのオペレーティングシス</div><div class='del'>-テムとは全く対照的だ。それらは長期に渡り古い USB インターフェース</div><div class='del'>-をメンテナンスしなければならない。古いインターフェースが残ることで、</div><div class='del'>-新たな開発者が偶然古いインターフェースを使い、正しくない方法で開発</div><div class='del'>-を行ってしまう可能性が生じる。これによりシステムの安定性は危険にさ</div><div class='del'>-らされることになる。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-上に挙げたどちらの例においても、開発者達はその変更が重要かつ必要で</div><div class='del'>-あることに合意し、比較的楽にそれを実行した。もし Linux がソースレ</div><div class='del'>-ベルでインターフェースの不変性を保証しなければならないとしたら、新</div><div class='del'>-しいインターフェースを作ると同時に、古い、問題のある方を今後ともメ</div><div class='del'>-ンテナンスするという余計な仕事を USB の開発者にさせなければならな</div><div class='del'>-い。Linux の USB 開発者は、自分の時間を使って仕事をしている。よっ</div><div class='del'>-て、価値のない余計な仕事を報酬もなしに実行しろと言うことはできない。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-セキュリティ問題も、Linux にとっては非常に重要である。ひとたびセキ</div><div class='del'>-ュリティに関する問題が発見されれば、それは極めて短期間のうちに修正</div><div class='del'>-される。セキュリティ問題の発生を防ぐための修正は、カーネルの内部イ</div><div class='del'>-ンターフェースの変更を何度も引き起こしてきた。その際同時に、変更さ</div><div class='del'>-れたインターフェースを使用する全てのドライバもまた変更された。これ</div><div class='del'>-により問題が解消し、将来偶然に問題が再発してしまわないことが保証さ</div><div class='del'>-れる。もし内部インターフェースの変更が許されないとしたら、このよう</div><div class='del'>-にセキュリティ問題を修正し、将来再発しないことを保証することなど不</div><div class='del'>-可能なのだ。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-カーネルのインターフェースは時が経つにつれクリーンナップを受ける。</div><div class='del'>-誰も使っていないインターフェースは削除される。これにより、可能な限</div><div class='del'>-りカーネルが小さく保たれ、現役の全てのインターフェースが可能な限り</div><div class='del'>-テストされることを保証しているのだ。（使われていないインターフェー</div><div class='del'>-スの妥当性をテストすることは不可能と言っていいだろう）</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-これから何をすべきか</div><div class='del'>------------------------</div><div class='del'>-</div><div class='del'>-では、もしメインのカーネルツリーに含まれない Linux カーネルドライ</div><div class='del'>-バがあったとして、あなたは、つまり開発者は何をするべきだろうか？全</div><div class='del'>-てのディストリビューションの全てのカーネルバージョン向けにバイナリ</div><div class='del'>-のドライバを供給することは悪夢であり、カーネルインターフェースの変</div><div class='del'>-更を追いかけ続けることもまた過酷な仕事だ。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-答えは簡単。そのドライバをメインのカーネルツリーに入れてしまえばよ</div><div class='del'>-い。（ここで言及しているのは、GPL に従って公開されるドライバのこと</div><div class='del'>-だということに注意してほしい。あなたのコードがそれに該当しないなら</div><div class='del'>-ば、さよなら。幸運を祈ります。ご自分で何とかしてください。Andrew</div><div class='del'>-と Linus からのコメント＜Andrew と Linus のコメントへのリンクをこ</div><div class='del'>-こに置く＞をどうぞ）ドライバがメインツリーに入れば、カーネルのイン</div><div class='del'>-ターフェースが変更された場合、変更を行った開発者によってドライバも</div><div class='del'>-修正されることになるだろう。あなたはほとんど労力を払うことなしに、</div><div class='del'>-常にビルド可能できちんと動作するドライバを手に入れることができる。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ドライバをメインのカーネルツリーに入れると、非常に好ましい以下の効</div><div class='del'>-果がある。</div><div class='del'>-  - ドライバの品質が向上する一方で、（元の開発者にとっての）メンテ</div><div class='del'>-    ナンスコストは下がる。</div><div class='del'>-  - あなたのドライバに他の開発者が機能を追加してくれる。</div><div class='del'>-  - 誰かがあなたのドライバにあるバグを見つけ、修正してくれる。</div><div class='del'>-  - 誰かがあなたのドライバにある改善点を見つけてくれる。</div><div class='del'>-  - 外部インターフェースが変更されドライバの更新が必要になった場合、</div><div class='del'>-    誰かがあなたの代わりに更新してくれる。</div><div class='del'>-  - ドライバを入れてくれとディストロに頼まなくても、そのドライバは</div><div class='del'>-    全ての Linux ディストリビューションに自動的に含まれてリリース</div><div class='del'>-    される。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Linux では、他のどのオペレーティングシステムよりも数多くのデバイス</div><div class='del'>-が「そのまま」使用できるようになった。また Linux は、どのオペレー</div><div class='del'>-ティングシステムよりも数多くのプロセッサアーキテクチャ上でそれらの</div><div class='del'>-デバイスを使用することができるようにもなった。このように、Linux の</div><div class='del'>-開発モデルは実証されており、今後も間違いなく正しい方向へと進んでい</div><div class='del'>-くだろう。:)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-この文書の初期の草稿に対し、Randy Dunlap, Andrew Morton, David</div><div class='del'>-Brownell, Hanna Linder, Robert Love, Nishanth Aravamudan から査読</div><div class='del'>-と助言を頂きました。感謝申し上げます。</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/ja_JP/stable_kernel_rules.txt b/Documentation/ja_JP/stable_kernel_rules.txt<br/>deleted file mode 100644<br/>index 9dbda9b5d21e..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/ja_JP/stable_kernel_rules.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ja_JP/stable_kernel_rules.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-NOTE:</div><div class='del'>-This is Japanese translated version of "Documentation/stable_kernel_rules.txt".</div><div class='del'>-This one is maintained by Tsugikazu Shibata &lt;tshibata@ab.jp.nec.com&gt;</div><div class='del'>-and JF Project team &lt;www.linux.or.jp/JF&gt;.</div><div class='del'>-If you find difference with original file or problem in translation,</div><div class='del'>-please contact maintainer of this file or JF project.</div><div class='del'>-</div><div class='del'>-Please also note that purpose of this file is easier to read for non</div><div class='del'>-English natives and do no intended to fork. So, if you have any</div><div class='del'>-comment or update of this file, please try to update Original(English)</div><div class='del'>-file at first.</div><div class='del'>-</div><div class='del'>-==================================</div><div class='del'>-これは、</div><div class='del'>-linux-2.6.29/Documentation/stable_kernel_rules.txt</div><div class='del'>-の和訳です。</div><div class='del'>-</div><div class='del'>-翻訳団体： JF プロジェクト &lt; http://www.linux.or.jp/JF/ &gt;</div><div class='del'>-翻訳日： 2009/1/14</div><div class='del'>-翻訳者： Tsugikazu Shibata &lt;tshibata at ab dot jp dot nec dot com&gt;</div><div class='del'>-校正者： 武井伸光さん、&lt;takei at webmasters dot gr dot jp&gt;</div><div class='del'>-         かねこさん (Seiji Kaneko) &lt;skaneko at a2 dot mbn dot or dot jp&gt;</div><div class='del'>-         小林 雅典さん (Masanori Kobayasi) &lt;zap03216 at nifty dot ne dot jp&gt;</div><div class='del'>-         野口さん (Kenji Noguchi) &lt;tokyo246 at gmail dot com&gt;</div><div class='del'>-         神宮信太郎さん &lt;jin at libjingu dot jp&gt;</div><div class='del'>-==================================</div><div class='del'>-</div><div class='del'>-ずっと知りたかった Linux 2.6 -stable リリースの全て</div><div class='del'>-</div><div class='del'>-"-stable" ツリーにどのような種類のパッチが受け入れられるか、どのような</div><div class='del'>-ものが受け入れられないか、についての規則-</div><div class='del'>-</div><div class='del'>- - 明らかに正しく、テストされているものでなければならない。</div><div class='del'>- - 文脈(変更行の前後)を含めて 100 行より大きくてはいけない。</div><div class='del'>- - ただ一個のことだけを修正しているべき。</div><div class='del'>- - 皆を悩ませている本物のバグを修正しなければならない。("これはバグで</div><div class='del'>-   あるかもしれないが..." のようなものではない)</div><div class='del'>- - ビルドエラー(CONFIG_BROKENになっているものを除く), oops, ハング、デー</div><div class='del'>-   タ破壊、現実のセキュリティ問題、その他 "ああ、これはダメだね"という</div><div class='del'>-   ようなものを修正しなければならない。短く言えば、重大な問題。</div><div class='del'>- - 新しい device ID とクオークも受け入れられる。</div><div class='del'>- - どのように競合状態が発生するかの説明も一緒に書かれていない限り、</div><div class='del'>-   "理論的には競合状態になる"ようなものは不可。</div><div class='del'>- - いかなる些細な修正も含めることはできない。(スペルの修正、空白のクリー</div><div class='del'>-   ンアップなど)</div><div class='del'>- - Documentation/SubmittingPatches の規則に従ったものでなければならない。</div><div class='del'>- - パッチ自体か同等の修正が Linus のツリーに既に存在しなければならない。</div><div class='del'>-　 Linus のツリーでのコミットID を -stable へのパッチ投稿の際に引用す</div><div class='del'>-   ること。</div><div class='del'>-</div><div class='del'>--stable ツリーにパッチを送付する手続き-</div><div class='del'>-</div><div class='del'>- - 上記の規則に従っているかを確認した後に、stable@vger.kernel.org にパッチ</div><div class='del'>-   を送る。</div><div class='del'>- - 送信者はパッチがキューに受け付けられた際には ACK を、却下された場合</div><div class='del'>-   には NAK を受け取る。この反応は開発者たちのスケジュールによって、数</div><div class='del'>-   日かかる場合がある。</div><div class='del'>- - もし受け取られたら、パッチは他の開発者たちと関連するサブシステムの</div><div class='del'>-   メンテナーによるレビューのために -stable キューに追加される。</div><div class='del'>- - パッチに stable@vger.kernel.org のアドレスが付加されているときには、それ</div><div class='del'>-   が Linus のツリーに入る時に自動的に stable チームに email される。</div><div class='del'>- - セキュリティパッチはこのエイリアス (stable@vger.kernel.org) に送られるべ</div><div class='del'>-   きではなく、代わりに security@kernel.org のアドレスに送られる。</div><div class='del'>-</div><div class='del'>-レビューサイクル-</div><div class='del'>-</div><div class='del'>- - -stable メンテナがレビューサイクルを決めるとき、パッチはレビュー委</div><div class='del'>-   員会とパッチが影響する領域のメンテナ(提供者がその領域のメンテナで無</div><div class='del'>-   い限り)に送られ、linux-kernel メーリングリストにCCされる。</div><div class='del'>- - レビュー委員会は 48時間の間に ACK か NAK を出す。</div><div class='del'>- - もしパッチが委員会のメンバから却下されるか、メンテナ達やメンバが気付</div><div class='del'>-   かなかった問題が持ちあがり、linux-kernel メンバがパッチに異議を唱え</div><div class='del'>-   た場合には、パッチはキューから削除される。</div><div class='del'>- - レビューサイクルの最後に、ACK を受けたパッチは最新の -stable リリー</div><div class='del'>-   スに追加され、その後に新しい -stable リリースが行われる。</div><div class='del'>- - セキュリティパッチは、通常のレビューサイクルを通らず、セキュリティ</div><div class='del'>-   カーネルチームから直接 -stable ツリーに受け付けられる。</div><div class='del'>-   この手続きの詳細については kernel security チームに問い合わせること。</div><div class='del'>-</div><div class='del'>-レビュー委員会-</div><div class='del'>-</div><div class='del'>- - この委員会は、このタスクについて活動する多くのボランティアと、少数の</div><div class='del'>-   非ボランティアのカーネル開発者達で構成されている。</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/java.txt b/Documentation/java.txt<br/>deleted file mode 100644<br/>index 418020584ccc..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/java.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/java.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,404 +0,0 @@</div><div class='del'>-               Java(tm) Binary Kernel Support for Linux v1.03</div><div class='del'>-               ----------------------------------------------</div><div class='del'>-</div><div class='del'>-Linux beats them ALL! While all other OS's are TALKING about direct</div><div class='del'>-support of Java Binaries in the OS, Linux is doing it!</div><div class='del'>-</div><div class='del'>-You can execute Java applications and Java Applets just like any</div><div class='del'>-other program after you have done the following:</div><div class='del'>-</div><div class='del'>-1) You MUST FIRST install the Java Developers Kit for Linux.</div><div class='del'>-   The Java on Linux HOWTO gives the details on getting and</div><div class='del'>-   installing this. This HOWTO can be found at:</div><div class='del'>-</div><div class='del'>-	ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/Java-HOWTO</div><div class='del'>-</div><div class='del'>-   You should also set up a reasonable CLASSPATH environment</div><div class='del'>-   variable to use Java applications that make use of any</div><div class='del'>-   nonstandard classes (not included in the same directory</div><div class='del'>-   as the application itself).</div><div class='del'>-</div><div class='del'>-2) You have to compile BINFMT_MISC either as a module or into</div><div class='del'>-   the kernel (CONFIG_BINFMT_MISC) and set it up properly.</div><div class='del'>-   If you choose to compile it as a module, you will have</div><div class='del'>-   to insert it manually with modprobe/insmod, as kmod</div><div class='del'>-   cannot easily be supported with binfmt_misc. </div><div class='del'>-   Read the file 'binfmt_misc.txt' in this directory to know</div><div class='del'>-   more about the configuration process.</div><div class='del'>-</div><div class='del'>-3) Add the following configuration items to binfmt_misc</div><div class='del'>-   (you should really have read binfmt_misc.txt now):</div><div class='del'>-   support for Java applications:</div><div class='del'>-     ':Java:M::\xca\xfe\xba\xbe::/usr/local/bin/javawrapper:'</div><div class='del'>-   support for executable Jar files:</div><div class='del'>-     ':ExecutableJAR:E::jar::/usr/local/bin/jarwrapper:'</div><div class='del'>-   support for Java Applets:</div><div class='del'>-     ':Applet:E::html::/usr/bin/appletviewer:'</div><div class='del'>-   or the following, if you want to be more selective:</div><div class='del'>-     ':Applet:M::&lt;!--applet::/usr/bin/appletviewer:'</div><div class='del'>-</div><div class='del'>-   Of course you have to fix the path names. The path/file names given in this</div><div class='del'>-   document match the Debian 2.1 system. (i.e. jdk installed in /usr,</div><div class='del'>-   custom wrappers from this document in /usr/local)</div><div class='del'>-</div><div class='del'>-   Note, that for the more selective applet support you have to modify</div><div class='del'>-   existing html-files to contain &lt;!--applet--&gt; in the first line</div><div class='del'>-   ('&lt;' has to be the first character!) to let this work!</div><div class='del'>-</div><div class='del'>-   For the compiled Java programs you need a wrapper script like the</div><div class='del'>-   following (this is because Java is broken in case of the filename</div><div class='del'>-   handling), again fix the path names, both in the script and in the</div><div class='del'>-   above given configuration string.</div><div class='del'>-</div><div class='del'>-   You, too, need the little program after the script. Compile like</div><div class='del'>-   gcc -O2 -o javaclassname javaclassname.c</div><div class='del'>-   and stick it to /usr/local/bin.</div><div class='del'>-</div><div class='del'>-   Both the javawrapper shellscript and the javaclassname program</div><div class='del'>-   were supplied by Colin J. Watson &lt;cjw44@cam.ac.uk&gt;.</div><div class='del'>-</div><div class='del'>-====================== Cut here ===================</div><div class='del'>-#!/bin/bash</div><div class='del'>-# /usr/local/bin/javawrapper - the wrapper for binfmt_misc/java</div><div class='del'>-</div><div class='del'>-if [ -z "$1" ]; then</div><div class='del'>-	exec 1&gt;&amp;2</div><div class='del'>-	echo Usage: $0 class-file</div><div class='del'>-	exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-CLASS=$1</div><div class='del'>-FQCLASS=`/usr/local/bin/javaclassname $1`</div><div class='del'>-FQCLASSN=`echo $FQCLASS | sed -e 's/^.*\.\([^.]*\)$/\1/'`</div><div class='del'>-FQCLASSP=`echo $FQCLASS | sed -e 's-\.-/-g' -e 's-^[^/]*$--' -e 's-/[^/]*$--'`</div><div class='del'>-</div><div class='del'>-# for example:</div><div class='del'>-# CLASS=Test.class</div><div class='del'>-# FQCLASS=foo.bar.Test</div><div class='del'>-# FQCLASSN=Test</div><div class='del'>-# FQCLASSP=foo/bar</div><div class='del'>-</div><div class='del'>-unset CLASSBASE</div><div class='del'>-</div><div class='del'>-declare -i LINKLEVEL=0</div><div class='del'>-</div><div class='del'>-while :; do</div><div class='del'>-	if [ "`basename $CLASS .class`" == "$FQCLASSN" ]; then</div><div class='del'>-		# See if this directory works straight off</div><div class='del'>-		cd -L `dirname $CLASS`</div><div class='del'>-		CLASSDIR=$PWD</div><div class='del'>-		cd $OLDPWD</div><div class='del'>-		if echo $CLASSDIR | grep -q "$FQCLASSP$"; then</div><div class='del'>-			CLASSBASE=`echo $CLASSDIR | sed -e "s.$FQCLASSP$.."`</div><div class='del'>-			break;</div><div class='del'>-		fi</div><div class='del'>-		# Try dereferencing the directory name</div><div class='del'>-		cd -P `dirname $CLASS`</div><div class='del'>-		CLASSDIR=$PWD</div><div class='del'>-		cd $OLDPWD</div><div class='del'>-		if echo $CLASSDIR | grep -q "$FQCLASSP$"; then</div><div class='del'>-			CLASSBASE=`echo $CLASSDIR | sed -e "s.$FQCLASSP$.."`</div><div class='del'>-			break;</div><div class='del'>-		fi</div><div class='del'>-		# If no other possible filename exists</div><div class='del'>-		if [ ! -L $CLASS ]; then</div><div class='del'>-			exec 1&gt;&amp;2</div><div class='del'>-			echo $0:</div><div class='del'>-			echo "  $CLASS should be in a" \</div><div class='del'>-			     "directory tree called $FQCLASSP"</div><div class='del'>-			exit 1</div><div class='del'>-		fi</div><div class='del'>-	fi</div><div class='del'>-	if [ ! -L $CLASS ]; then break; fi</div><div class='del'>-	# Go down one more level of symbolic links</div><div class='del'>-	let LINKLEVEL+=1</div><div class='del'>-	if [ $LINKLEVEL -gt 5 ]; then</div><div class='del'>-		exec 1&gt;&amp;2</div><div class='del'>-		echo $0:</div><div class='del'>-		echo "  Too many symbolic links encountered"</div><div class='del'>-		exit 1</div><div class='del'>-	fi</div><div class='del'>-	CLASS=`ls --color=no -l $CLASS | sed -e 's/^.* \([^ ]*\)$/\1/'`</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-if [ -z "$CLASSBASE" ]; then</div><div class='del'>-	if [ -z "$FQCLASSP" ]; then</div><div class='del'>-		GOODNAME=$FQCLASSN.class</div><div class='del'>-	else</div><div class='del'>-		GOODNAME=$FQCLASSP/$FQCLASSN.class</div><div class='del'>-	fi</div><div class='del'>-	exec 1&gt;&amp;2</div><div class='del'>-	echo $0:</div><div class='del'>-	echo "  $FQCLASS should be in a file called $GOODNAME"</div><div class='del'>-	exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if ! echo $CLASSPATH | grep -q "^\(.*:\)*$CLASSBASE\(:.*\)*"; then</div><div class='del'>-	# class is not in CLASSPATH, so prepend dir of class to CLASSPATH</div><div class='del'>-	if [ -z "${CLASSPATH}" ] ; then</div><div class='del'>-		export CLASSPATH=$CLASSBASE</div><div class='del'>-	else</div><div class='del'>-		export CLASSPATH=$CLASSBASE:$CLASSPATH</div><div class='del'>-	fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-shift</div><div class='del'>-/usr/bin/java $FQCLASS "$@"</div><div class='del'>-====================== Cut here ===================</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-====================== Cut here ===================</div><div class='del'>-/* javaclassname.c</div><div class='del'>- *</div><div class='del'>- * Extracts the class name from a Java class file; intended for use in a Java</div><div class='del'>- * wrapper of the type supported by the binfmt_misc option in the Linux kernel.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Colin J. Watson &lt;cjw44@cam.ac.uk&gt;.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-</div><div class='del'>-/* From Sun's Java VM Specification, as tag entries in the constant pool. */</div><div class='del'>-</div><div class='del'>-#define CP_UTF8 1</div><div class='del'>-#define CP_INTEGER 3</div><div class='del'>-#define CP_FLOAT 4</div><div class='del'>-#define CP_LONG 5</div><div class='del'>-#define CP_DOUBLE 6</div><div class='del'>-#define CP_CLASS 7</div><div class='del'>-#define CP_STRING 8</div><div class='del'>-#define CP_FIELDREF 9</div><div class='del'>-#define CP_METHODREF 10</div><div class='del'>-#define CP_INTERFACEMETHODREF 11</div><div class='del'>-#define CP_NAMEANDTYPE 12</div><div class='del'>-#define CP_METHODHANDLE 15</div><div class='del'>-#define CP_METHODTYPE 16</div><div class='del'>-#define CP_INVOKEDYNAMIC 18</div><div class='del'>-</div><div class='del'>-/* Define some commonly used error messages */</div><div class='del'>-</div><div class='del'>-#define seek_error() error("%s: Cannot seek\n", program)</div><div class='del'>-#define corrupt_error() error("%s: Class file corrupt\n", program)</div><div class='del'>-#define eof_error() error("%s: Unexpected end of file\n", program)</div><div class='del'>-#define utf8_error() error("%s: Only ASCII 1-255 supported\n", program);</div><div class='del'>-</div><div class='del'>-char *program;</div><div class='del'>-</div><div class='del'>-long *pool;</div><div class='del'>-</div><div class='del'>-u_int8_t read_8(FILE *classfile);</div><div class='del'>-u_int16_t read_16(FILE *classfile);</div><div class='del'>-void skip_constant(FILE *classfile, u_int16_t *cur);</div><div class='del'>-void error(const char *format, ...);</div><div class='del'>-int main(int argc, char **argv);</div><div class='del'>-</div><div class='del'>-/* Reads in an unsigned 8-bit integer. */</div><div class='del'>-u_int8_t read_8(FILE *classfile)</div><div class='del'>-{</div><div class='del'>-	int b = fgetc(classfile);</div><div class='del'>-	if(b == EOF)</div><div class='del'>-		eof_error();</div><div class='del'>-	return (u_int8_t)b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Reads in an unsigned 16-bit integer. */</div><div class='del'>-u_int16_t read_16(FILE *classfile)</div><div class='del'>-{</div><div class='del'>-	int b1, b2;</div><div class='del'>-	b1 = fgetc(classfile);</div><div class='del'>-	if(b1 == EOF)</div><div class='del'>-		eof_error();</div><div class='del'>-	b2 = fgetc(classfile);</div><div class='del'>-	if(b2 == EOF)</div><div class='del'>-		eof_error();</div><div class='del'>-	return (u_int16_t)((b1 &lt;&lt; 8) | b2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Reads in a value from the constant pool. */</div><div class='del'>-void skip_constant(FILE *classfile, u_int16_t *cur)</div><div class='del'>-{</div><div class='del'>-	u_int16_t len;</div><div class='del'>-	int seekerr = 1;</div><div class='del'>-	pool[*cur] = ftell(classfile);</div><div class='del'>-	switch(read_8(classfile))</div><div class='del'>-	{</div><div class='del'>-	case CP_UTF8:</div><div class='del'>-		len = read_16(classfile);</div><div class='del'>-		seekerr = fseek(classfile, len, SEEK_CUR);</div><div class='del'>-		break;</div><div class='del'>-	case CP_CLASS:</div><div class='del'>-	case CP_STRING:</div><div class='del'>-	case CP_METHODTYPE:</div><div class='del'>-		seekerr = fseek(classfile, 2, SEEK_CUR);</div><div class='del'>-		break;</div><div class='del'>-	case CP_METHODHANDLE:</div><div class='del'>-		seekerr = fseek(classfile, 3, SEEK_CUR);</div><div class='del'>-		break;</div><div class='del'>-	case CP_INTEGER:</div><div class='del'>-	case CP_FLOAT:</div><div class='del'>-	case CP_FIELDREF:</div><div class='del'>-	case CP_METHODREF:</div><div class='del'>-	case CP_INTERFACEMETHODREF:</div><div class='del'>-	case CP_NAMEANDTYPE:</div><div class='del'>-	case CP_INVOKEDYNAMIC:</div><div class='del'>-		seekerr = fseek(classfile, 4, SEEK_CUR);</div><div class='del'>-		break;</div><div class='del'>-	case CP_LONG:</div><div class='del'>-	case CP_DOUBLE:</div><div class='del'>-		seekerr = fseek(classfile, 8, SEEK_CUR);</div><div class='del'>-		++(*cur);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		corrupt_error();</div><div class='del'>-	}</div><div class='del'>-	if(seekerr)</div><div class='del'>-		seek_error();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void error(const char *format, ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-	va_start(ap, format);</div><div class='del'>-	vfprintf(stderr, format, ap);</div><div class='del'>-	va_end(ap);</div><div class='del'>-	exit(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	FILE *classfile;</div><div class='del'>-	u_int16_t cp_count, i, this_class, classinfo_ptr;</div><div class='del'>-	u_int8_t length;</div><div class='del'>-</div><div class='del'>-	program = argv[0];</div><div class='del'>-</div><div class='del'>-	if(!argv[1])</div><div class='del'>-		error("%s: Missing input file\n", program);</div><div class='del'>-	classfile = fopen(argv[1], "rb");</div><div class='del'>-	if(!classfile)</div><div class='del'>-		error("%s: Error opening %s\n", program, argv[1]);</div><div class='del'>-</div><div class='del'>-	if(fseek(classfile, 8, SEEK_SET))  /* skip magic and version numbers */</div><div class='del'>-		seek_error();</div><div class='del'>-	cp_count = read_16(classfile);</div><div class='del'>-	pool = calloc(cp_count, sizeof(long));</div><div class='del'>-	if(!pool)</div><div class='del'>-		error("%s: Out of memory for constant pool\n", program);</div><div class='del'>-</div><div class='del'>-	for(i = 1; i &lt; cp_count; ++i)</div><div class='del'>-		skip_constant(classfile, &amp;i);</div><div class='del'>-	if(fseek(classfile, 2, SEEK_CUR))	/* skip access flags */</div><div class='del'>-		seek_error();</div><div class='del'>-</div><div class='del'>-	this_class = read_16(classfile);</div><div class='del'>-	if(this_class &lt; 1 || this_class &gt;= cp_count)</div><div class='del'>-		corrupt_error();</div><div class='del'>-	if(!pool[this_class] || pool[this_class] == -1)</div><div class='del'>-		corrupt_error();</div><div class='del'>-	if(fseek(classfile, pool[this_class] + 1, SEEK_SET))</div><div class='del'>-		seek_error();</div><div class='del'>-</div><div class='del'>-	classinfo_ptr = read_16(classfile);</div><div class='del'>-	if(classinfo_ptr &lt; 1 || classinfo_ptr &gt;= cp_count)</div><div class='del'>-		corrupt_error();</div><div class='del'>-	if(!pool[classinfo_ptr] || pool[classinfo_ptr] == -1)</div><div class='del'>-		corrupt_error();</div><div class='del'>-	if(fseek(classfile, pool[classinfo_ptr] + 1, SEEK_SET))</div><div class='del'>-		seek_error();</div><div class='del'>-</div><div class='del'>-	length = read_16(classfile);</div><div class='del'>-	for(i = 0; i &lt; length; ++i)</div><div class='del'>-	{</div><div class='del'>-		u_int8_t x = read_8(classfile);</div><div class='del'>-		if((x &amp; 0x80) || !x)</div><div class='del'>-		{</div><div class='del'>-			if((x &amp; 0xE0) == 0xC0)</div><div class='del'>-			{</div><div class='del'>-				u_int8_t y = read_8(classfile);</div><div class='del'>-				if((y &amp; 0xC0) == 0x80)</div><div class='del'>-				{</div><div class='del'>-					int c = ((x &amp; 0x1f) &lt;&lt; 6) + (y &amp; 0x3f);</div><div class='del'>-					if(c) putchar(c);</div><div class='del'>-					else utf8_error();</div><div class='del'>-				}</div><div class='del'>-				else utf8_error();</div><div class='del'>-			}</div><div class='del'>-			else utf8_error();</div><div class='del'>-		}</div><div class='del'>-		else if(x == '/') putchar('.');</div><div class='del'>-		else putchar(x);</div><div class='del'>-	}</div><div class='del'>-	putchar('\n');</div><div class='del'>-	free(pool);</div><div class='del'>-	fclose(classfile);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-====================== Cut here ===================</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-====================== Cut here ===================</div><div class='del'>-#!/bin/bash</div><div class='del'>-# /usr/local/java/bin/jarwrapper - the wrapper for binfmt_misc/jar</div><div class='del'>-</div><div class='del'>-java -jar $1</div><div class='del'>-====================== Cut here ===================</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Now simply chmod +x the .class, .jar and/or .html files you want to execute.</div><div class='del'>-To add a Java program to your path best put a symbolic link to the main</div><div class='del'>-.class file into /usr/bin (or another place you like) omitting the .class</div><div class='del'>-extension. The directory containing the original .class file will be</div><div class='del'>-added to your CLASSPATH during execution.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-To test your new setup, enter in the following simple Java app, and name</div><div class='del'>-it "HelloWorld.java":</div><div class='del'>-</div><div class='del'>-	class HelloWorld {</div><div class='del'>-		public static void main(String args[]) {</div><div class='del'>-			System.out.println("Hello World!");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-Now compile the application with:</div><div class='del'>-	javac HelloWorld.java</div><div class='del'>-</div><div class='del'>-Set the executable permissions of the binary file, with:</div><div class='del'>-	chmod 755 HelloWorld.class</div><div class='del'>-</div><div class='del'>-And then execute it:</div><div class='del'>-	./HelloWorld.class</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-To execute Java Jar files, simple chmod the *.jar files to include</div><div class='del'>-the execution bit, then just do</div><div class='del'>-       ./Application.jar</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-To execute Java Applets, simple chmod the *.html files to include</div><div class='del'>-the execution bit, then just do</div><div class='del'>-	./Applet.html</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-originally by Brian A. Lantz, brian@lantz.com</div><div class='del'>-heavily edited for binfmt_misc by Richard Günther</div><div class='del'>-new scripts by Colin J. Watson &lt;cjw44@cam.ac.uk&gt;</div><div class='del'>-added executable Jar file support by Kurt Huwig &lt;kurt@iku-netz.de&gt;</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/kbuild/kconfig-language.txt b/Documentation/kbuild/kconfig-language.txt<br/>index 069fcb3eef6e..262722d8867b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/kbuild/kconfig-language.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/kbuild/kconfig-language.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/kbuild/kconfig-language.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/kbuild/kconfig-language.txt</a></div><div class='hunk'>@@ -113,6 +113,34 @@ applicable everywhere (see syntax).</div><div class='ctx'> 	That will limit the usefulness but on the other hand avoid</div><div class='ctx'> 	the illegal configurations all over.</div><div class='ctx'> </div><div class='add'>+- weak reverse dependencies: "imply" &lt;symbol&gt; ["if" &lt;expr&gt;]</div><div class='add'>+  This is similar to "select" as it enforces a lower limit on another</div><div class='add'>+  symbol except that the "implied" symbol's value may still be set to n</div><div class='add'>+  from a direct dependency or with a visible prompt.</div><div class='add'>+</div><div class='add'>+  Given the following example:</div><div class='add'>+</div><div class='add'>+  config FOO</div><div class='add'>+	tristate</div><div class='add'>+	imply BAZ</div><div class='add'>+</div><div class='add'>+  config BAZ</div><div class='add'>+	tristate</div><div class='add'>+	depends on BAR</div><div class='add'>+</div><div class='add'>+  The following values are possible:</div><div class='add'>+</div><div class='add'>+	FOO		BAR		BAZ's default	choice for BAZ</div><div class='add'>+	---		---		-------------	--------------</div><div class='add'>+	n		y		n		N/m/y</div><div class='add'>+	m		y		m		M/y/n</div><div class='add'>+	y		y		y		Y/n</div><div class='add'>+	y		n		*		N</div><div class='add'>+</div><div class='add'>+  This is useful e.g. with multiple drivers that want to indicate their</div><div class='add'>+  ability to hook into a secondary subsystem while allowing the user to</div><div class='add'>+  configure that subsystem out without also having to unset these drivers.</div><div class='add'>+</div><div class='ctx'> - limiting menu display: "visible if" &lt;expr&gt;</div><div class='ctx'>   This attribute is only applicable to menu blocks, if the condition is</div><div class='ctx'>   false, the menu block is not displayed to the user (the symbols</div><div class='hunk'>@@ -481,6 +509,7 @@ historical issues resolved through these different solutions.</div><div class='ctx'>   b) Match dependency semantics:</div><div class='ctx'> 	b1) Swap all "select FOO" to "depends on FOO" or,</div><div class='ctx'> 	b2) Swap all "depends on FOO" to "select FOO"</div><div class='add'>+  c) Consider the use of "imply" instead of "select"</div><div class='ctx'> </div><div class='ctx'> The resolution to a) can be tested with the sample Kconfig file</div><div class='ctx'> Documentation/kbuild/Kconfig.recursion-issue-01 through the removal</div><div class='head'>diff --git a/Documentation/kernel-doc-nano-HOWTO.txt b/Documentation/kernel-doc-nano-HOWTO.txt<br/>index 062e3af271b7..104740ea0041 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/kernel-doc-nano-HOWTO.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/kernel-doc-nano-HOWTO.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/kernel-doc-nano-HOWTO.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/kernel-doc-nano-HOWTO.txt</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> NOTE: this document is outdated and will eventually be removed.  See</div><div class='del'>-Documentation/kernel-documentation.rst for current information.</div><div class='add'>+Documentation/doc-guide/ for current information.</div><div class='ctx'> </div><div class='ctx'> kernel-doc nano-HOWTO</div><div class='ctx'> =====================</div><div class='head'>diff --git a/Documentation/kernel-documentation.rst b/Documentation/kernel-documentation.rst<br/>deleted file mode 100644<br/>index 10cc7ddb6235..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/kernel-documentation.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/kernel-documentation.rst</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,679 +0,0 @@</div><div class='del'>-==========================</div><div class='del'>-Linux Kernel Documentation</div><div class='del'>-==========================</div><div class='del'>-</div><div class='del'>-Introduction</div><div class='del'>-============</div><div class='del'>-</div><div class='del'>-The Linux kernel uses `Sphinx`_ to generate pretty documentation from</div><div class='del'>-`reStructuredText`_ files under ``Documentation``. To build the documentation in</div><div class='del'>-HTML or PDF formats, use ``make htmldocs`` or ``make pdfdocs``. The generated</div><div class='del'>-documentation is placed in ``Documentation/output``.</div><div class='del'>-</div><div class='del'>-.. _Sphinx: http://www.sphinx-doc.org/</div><div class='del'>-.. _reStructuredText: http://docutils.sourceforge.net/rst.html</div><div class='del'>-</div><div class='del'>-The reStructuredText files may contain directives to include structured</div><div class='del'>-documentation comments, or kernel-doc comments, from source files. Usually these</div><div class='del'>-are used to describe the functions and types and design of the code. The</div><div class='del'>-kernel-doc comments have some special structure and formatting, but beyond that</div><div class='del'>-they are also treated as reStructuredText.</div><div class='del'>-</div><div class='del'>-There is also the deprecated DocBook toolchain to generate documentation from</div><div class='del'>-DocBook XML template files under ``Documentation/DocBook``. The DocBook files</div><div class='del'>-are to be converted to reStructuredText, and the toolchain is slated to be</div><div class='del'>-removed.</div><div class='del'>-</div><div class='del'>-Finally, there are thousands of plain text documentation files scattered around</div><div class='del'>-``Documentation``. Some of these will likely be converted to reStructuredText</div><div class='del'>-over time, but the bulk of them will remain in plain text.</div><div class='del'>-</div><div class='del'>-Sphinx Build</div><div class='del'>-============</div><div class='del'>-</div><div class='del'>-The usual way to generate the documentation is to run ``make htmldocs`` or</div><div class='del'>-``make pdfdocs``. There are also other formats available, see the documentation</div><div class='del'>-section of ``make help``. The generated documentation is placed in</div><div class='del'>-format-specific subdirectories under ``Documentation/output``.</div><div class='del'>-</div><div class='del'>-To generate documentation, Sphinx (``sphinx-build``) must obviously be</div><div class='del'>-installed. For prettier HTML output, the Read the Docs Sphinx theme</div><div class='del'>-(``sphinx_rtd_theme``) is used if available. For PDF output, ``rst2pdf`` is also</div><div class='del'>-needed. All of these are widely available and packaged in distributions.</div><div class='del'>-</div><div class='del'>-To pass extra options to Sphinx, you can use the ``SPHINXOPTS`` make</div><div class='del'>-variable. For example, use ``make SPHINXOPTS=-v htmldocs`` to get more verbose</div><div class='del'>-output.</div><div class='del'>-</div><div class='del'>-To remove the generated documentation, run ``make cleandocs``.</div><div class='del'>-</div><div class='del'>-Writing Documentation</div><div class='del'>-=====================</div><div class='del'>-</div><div class='del'>-Adding new documentation can be as simple as:</div><div class='del'>-</div><div class='del'>-1. Add a new ``.rst`` file somewhere under ``Documentation``.</div><div class='del'>-2. Refer to it from the Sphinx main `TOC tree`_ in ``Documentation/index.rst``.</div><div class='del'>-</div><div class='del'>-.. _TOC tree: http://www.sphinx-doc.org/en/stable/markup/toctree.html</div><div class='del'>-</div><div class='del'>-This is usually good enough for simple documentation (like the one you're</div><div class='del'>-reading right now), but for larger documents it may be advisable to create a</div><div class='del'>-subdirectory (or use an existing one). For example, the graphics subsystem</div><div class='del'>-documentation is under ``Documentation/gpu``, split to several ``.rst`` files,</div><div class='del'>-and has a separate ``index.rst`` (with a ``toctree`` of its own) referenced from</div><div class='del'>-the main index.</div><div class='del'>-</div><div class='del'>-See the documentation for `Sphinx`_ and `reStructuredText`_ on what you can do</div><div class='del'>-with them. In particular, the Sphinx `reStructuredText Primer`_ is a good place</div><div class='del'>-to get started with reStructuredText. There are also some `Sphinx specific</div><div class='del'>-markup constructs`_.</div><div class='del'>-</div><div class='del'>-.. _reStructuredText Primer: http://www.sphinx-doc.org/en/stable/rest.html</div><div class='del'>-.. _Sphinx specific markup constructs: http://www.sphinx-doc.org/en/stable/markup/index.html</div><div class='del'>-</div><div class='del'>-Specific guidelines for the kernel documentation</div><div class='del'>-------------------------------------------------</div><div class='del'>-</div><div class='del'>-Here are some specific guidelines for the kernel documentation:</div><div class='del'>-</div><div class='del'>-* Please don't go overboard with reStructuredText markup. Keep it simple.</div><div class='del'>-</div><div class='del'>-* Please stick to this order of heading adornments:</div><div class='del'>-</div><div class='del'>-  1. ``=`` with overline for document title::</div><div class='del'>-</div><div class='del'>-       ==============</div><div class='del'>-       Document title</div><div class='del'>-       ==============</div><div class='del'>-</div><div class='del'>-  2. ``=`` for chapters::</div><div class='del'>-</div><div class='del'>-       Chapters</div><div class='del'>-       ========</div><div class='del'>-</div><div class='del'>-  3. ``-`` for sections::</div><div class='del'>-</div><div class='del'>-       Section</div><div class='del'>-       -------</div><div class='del'>-</div><div class='del'>-  4. ``~`` for subsections::</div><div class='del'>-</div><div class='del'>-       Subsection</div><div class='del'>-       ~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-  Although RST doesn't mandate a specific order ("Rather than imposing a fixed</div><div class='del'>-  number and order of section title adornment styles, the order enforced will be</div><div class='del'>-  the order as encountered."), having the higher levels the same overall makes</div><div class='del'>-  it easier to follow the documents.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-the C domain</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-The `Sphinx C Domain`_ (name c) is suited for documentation of C API. E.g. a</div><div class='del'>-function prototype:</div><div class='del'>-</div><div class='del'>-.. code-block:: rst</div><div class='del'>-</div><div class='del'>-    .. c:function:: int ioctl( int fd, int request )</div><div class='del'>-</div><div class='del'>-The C domain of the kernel-doc has some additional features. E.g. you can</div><div class='del'>-*rename* the reference name of a function with a common name like ``open`` or</div><div class='del'>-``ioctl``:</div><div class='del'>-</div><div class='del'>-.. code-block:: rst</div><div class='del'>-</div><div class='del'>-     .. c:function:: int ioctl( int fd, int request )</div><div class='del'>-        :name: VIDIOC_LOG_STATUS</div><div class='del'>-</div><div class='del'>-The func-name (e.g. ioctl) remains in the output but the ref-name changed from</div><div class='del'>-``ioctl`` to ``VIDIOC_LOG_STATUS``. The index entry for this function is also</div><div class='del'>-changed to ``VIDIOC_LOG_STATUS`` and the function can now referenced by:</div><div class='del'>-</div><div class='del'>-.. code-block:: rst</div><div class='del'>-</div><div class='del'>-     :c:func:`VIDIOC_LOG_STATUS`</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-list tables</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-We recommend the use of *list table* formats. The *list table* formats are</div><div class='del'>-double-stage lists. Compared to the ASCII-art they might not be as</div><div class='del'>-comfortable for </div><div class='del'>-readers of the text files. Their advantage is that they are easy to</div><div class='del'>-create or modify and that the diff of a modification is much more meaningful,</div><div class='del'>-because it is limited to the modified content.</div><div class='del'>-</div><div class='del'>-The ``flat-table`` is a double-stage list similar to the ``list-table`` with</div><div class='del'>-some additional features:</div><div class='del'>-</div><div class='del'>-* column-span: with the role ``cspan`` a cell can be extended through</div><div class='del'>-  additional columns</div><div class='del'>-</div><div class='del'>-* row-span: with the role ``rspan`` a cell can be extended through</div><div class='del'>-  additional rows</div><div class='del'>-</div><div class='del'>-* auto span rightmost cell of a table row over the missing cells on the right</div><div class='del'>-  side of that table-row.  With Option ``:fill-cells:`` this behavior can</div><div class='del'>-  changed from *auto span* to *auto fill*, which automatically inserts (empty)</div><div class='del'>-  cells instead of spanning the last cell.</div><div class='del'>-</div><div class='del'>-options:</div><div class='del'>-</div><div class='del'>-* ``:header-rows:``   [int] count of header rows</div><div class='del'>-* ``:stub-columns:``  [int] count of stub columns</div><div class='del'>-* ``:widths:``        [[int] [int] ... ] widths of columns</div><div class='del'>-* ``:fill-cells:``    instead of auto-spanning missing cells, insert missing cells</div><div class='del'>-</div><div class='del'>-roles:</div><div class='del'>-</div><div class='del'>-* ``:cspan:`` [int] additional columns (*morecols*)</div><div class='del'>-* ``:rspan:`` [int] additional rows (*morerows*)</div><div class='del'>-</div><div class='del'>-The example below shows how to use this markup.  The first level of the staged</div><div class='del'>-list is the *table-row*. In the *table-row* there is only one markup allowed,</div><div class='del'>-the list of the cells in this *table-row*. Exceptions are *comments* ( ``..`` )</div><div class='del'>-and *targets* (e.g. a ref to ``:ref:`last row &lt;last row&gt;``` / :ref:`last row</div><div class='del'>-&lt;last row&gt;`).</div><div class='del'>-</div><div class='del'>-.. code-block:: rst</div><div class='del'>-</div><div class='del'>-   .. flat-table:: table title</div><div class='del'>-      :widths: 2 1 1 3</div><div class='del'>-</div><div class='del'>-      * - head col 1</div><div class='del'>-        - head col 2</div><div class='del'>-        - head col 3</div><div class='del'>-        - head col 4</div><div class='del'>-</div><div class='del'>-      * - column 1</div><div class='del'>-        - field 1.1</div><div class='del'>-        - field 1.2 with autospan</div><div class='del'>-</div><div class='del'>-      * - column 2</div><div class='del'>-        - field 2.1</div><div class='del'>-        - :rspan:`1` :cspan:`1` field 2.2 - 3.3</div><div class='del'>-</div><div class='del'>-      * .. _`last row`:</div><div class='del'>-</div><div class='del'>-        - column 3</div><div class='del'>-</div><div class='del'>-Rendered as:</div><div class='del'>-</div><div class='del'>-   .. flat-table:: table title</div><div class='del'>-      :widths: 2 1 1 3</div><div class='del'>-</div><div class='del'>-      * - head col 1</div><div class='del'>-        - head col 2</div><div class='del'>-        - head col 3</div><div class='del'>-        - head col 4</div><div class='del'>-</div><div class='del'>-      * - column 1</div><div class='del'>-        - field 1.1</div><div class='del'>-        - field 1.2 with autospan</div><div class='del'>-</div><div class='del'>-      * - column 2</div><div class='del'>-        - field 2.1</div><div class='del'>-        - :rspan:`1` :cspan:`1` field 2.2 - 3.3</div><div class='del'>-</div><div class='del'>-      * .. _`last row`:</div><div class='del'>-</div><div class='del'>-        - column 3</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Including kernel-doc comments</div><div class='del'>-=============================</div><div class='del'>-</div><div class='del'>-The Linux kernel source files may contain structured documentation comments, or</div><div class='del'>-kernel-doc comments to describe the functions and types and design of the</div><div class='del'>-code. The documentation comments may be included to any of the reStructuredText</div><div class='del'>-documents using a dedicated kernel-doc Sphinx directive extension.</div><div class='del'>-</div><div class='del'>-The kernel-doc directive is of the format::</div><div class='del'>-</div><div class='del'>-  .. kernel-doc:: source</div><div class='del'>-     :option:</div><div class='del'>-</div><div class='del'>-The *source* is the path to a source file, relative to the kernel source</div><div class='del'>-tree. The following directive options are supported:</div><div class='del'>-</div><div class='del'>-export: *[source-pattern ...]*</div><div class='del'>-  Include documentation for all functions in *source* that have been exported</div><div class='del'>-  using ``EXPORT_SYMBOL`` or ``EXPORT_SYMBOL_GPL`` either in *source* or in any</div><div class='del'>-  of the files specified by *source-pattern*.</div><div class='del'>-</div><div class='del'>-  The *source-pattern* is useful when the kernel-doc comments have been placed</div><div class='del'>-  in header files, while ``EXPORT_SYMBOL`` and ``EXPORT_SYMBOL_GPL`` are next to</div><div class='del'>-  the function definitions.</div><div class='del'>-</div><div class='del'>-  Examples::</div><div class='del'>-</div><div class='del'>-    .. kernel-doc:: lib/bitmap.c</div><div class='del'>-       :export:</div><div class='del'>-</div><div class='del'>-    .. kernel-doc:: include/net/mac80211.h</div><div class='del'>-       :export: net/mac80211/*.c</div><div class='del'>-</div><div class='del'>-internal: *[source-pattern ...]*</div><div class='del'>-  Include documentation for all functions and types in *source* that have</div><div class='del'>-  **not** been exported using ``EXPORT_SYMBOL`` or ``EXPORT_SYMBOL_GPL`` either</div><div class='del'>-  in *source* or in any of the files specified by *source-pattern*.</div><div class='del'>-</div><div class='del'>-  Example::</div><div class='del'>-</div><div class='del'>-    .. kernel-doc:: drivers/gpu/drm/i915/intel_audio.c</div><div class='del'>-       :internal:</div><div class='del'>-</div><div class='del'>-doc: *title*</div><div class='del'>-  Include documentation for the ``DOC:`` paragraph identified by *title* in</div><div class='del'>-  *source*. Spaces are allowed in *title*; do not quote the *title*. The *title*</div><div class='del'>-  is only used as an identifier for the paragraph, and is not included in the</div><div class='del'>-  output. Please make sure to have an appropriate heading in the enclosing</div><div class='del'>-  reStructuredText document.</div><div class='del'>-</div><div class='del'>-  Example::</div><div class='del'>-</div><div class='del'>-    .. kernel-doc:: drivers/gpu/drm/i915/intel_audio.c</div><div class='del'>-       :doc: High Definition Audio over HDMI and Display Port</div><div class='del'>-</div><div class='del'>-functions: *function* *[...]*</div><div class='del'>-  Include documentation for each *function* in *source*.</div><div class='del'>-</div><div class='del'>-  Example::</div><div class='del'>-</div><div class='del'>-    .. kernel-doc:: lib/bitmap.c</div><div class='del'>-       :functions: bitmap_parselist bitmap_parselist_user</div><div class='del'>-</div><div class='del'>-Without options, the kernel-doc directive includes all documentation comments</div><div class='del'>-from the source file.</div><div class='del'>-</div><div class='del'>-The kernel-doc extension is included in the kernel source tree, at</div><div class='del'>-``Documentation/sphinx/kernel-doc.py``. Internally, it uses the</div><div class='del'>-``scripts/kernel-doc`` script to extract the documentation comments from the</div><div class='del'>-source.</div><div class='del'>-</div><div class='del'>-.. _kernel_doc:</div><div class='del'>-</div><div class='del'>-Writing kernel-doc comments</div><div class='del'>-===========================</div><div class='del'>-</div><div class='del'>-In order to provide embedded, "C" friendly, easy to maintain, but consistent and</div><div class='del'>-extractable overview, function and type documentation, the Linux kernel has</div><div class='del'>-adopted a consistent style for documentation comments. The format for this</div><div class='del'>-documentation is called the kernel-doc format, described below. This style</div><div class='del'>-embeds the documentation within the source files, using a few simple conventions</div><div class='del'>-for adding documentation paragraphs and documenting functions and their</div><div class='del'>-parameters, structures and unions and their members, enumerations, and typedefs.</div><div class='del'>-</div><div class='del'>-.. note:: The kernel-doc format is deceptively similar to gtk-doc or Doxygen,</div><div class='del'>-   yet distinctively different, for historical reasons. The kernel source</div><div class='del'>-   contains tens of thousands of kernel-doc comments. Please stick to the style</div><div class='del'>-   described here.</div><div class='del'>-</div><div class='del'>-The ``scripts/kernel-doc`` script is used by the Sphinx kernel-doc extension in</div><div class='del'>-the documentation build to extract this embedded documentation into the various</div><div class='del'>-HTML, PDF, and other format documents.</div><div class='del'>-</div><div class='del'>-In order to provide good documentation of kernel functions and data structures,</div><div class='del'>-please use the following conventions to format your kernel-doc comments in the</div><div class='del'>-Linux kernel source.</div><div class='del'>-</div><div class='del'>-How to format kernel-doc comments</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-The opening comment mark ``/**`` is reserved for kernel-doc comments. Only</div><div class='del'>-comments so marked will be considered by the ``kernel-doc`` tool. Use it only</div><div class='del'>-for comment blocks that contain kernel-doc formatted comments. The usual ``*/``</div><div class='del'>-should be used as the closing comment marker. The lines in between should be</div><div class='del'>-prefixed by `` * `` (space star space).</div><div class='del'>-</div><div class='del'>-The function and type kernel-doc comments should be placed just before the</div><div class='del'>-function or type being described. The overview kernel-doc comments may be freely</div><div class='del'>-placed at the top indentation level.</div><div class='del'>-</div><div class='del'>-Example kernel-doc function comment::</div><div class='del'>-</div><div class='del'>-  /**</div><div class='del'>-   * foobar() - Brief description of foobar.</div><div class='del'>-   * @arg: Description of argument of foobar.</div><div class='del'>-   *</div><div class='del'>-   * Longer description of foobar.</div><div class='del'>-   *</div><div class='del'>-   * Return: Description of return value of foobar.</div><div class='del'>-   */</div><div class='del'>-  int foobar(int arg)</div><div class='del'>-</div><div class='del'>-The format is similar for documentation for structures, enums, paragraphs,</div><div class='del'>-etc. See the sections below for details.</div><div class='del'>-</div><div class='del'>-The kernel-doc structure is extracted from the comments, and proper `Sphinx C</div><div class='del'>-Domain`_ function and type descriptions with anchors are generated for them. The</div><div class='del'>-descriptions are filtered for special kernel-doc highlights and</div><div class='del'>-cross-references. See below for details.</div><div class='del'>-</div><div class='del'>-.. _Sphinx C Domain: http://www.sphinx-doc.org/en/stable/domains.html</div><div class='del'>-</div><div class='del'>-Highlights and cross-references</div><div class='del'>--------------------------------</div><div class='del'>-</div><div class='del'>-The following special patterns are recognized in the kernel-doc comment</div><div class='del'>-descriptive text and converted to proper reStructuredText markup and `Sphinx C</div><div class='del'>-Domain`_ references.</div><div class='del'>-</div><div class='del'>-.. attention:: The below are **only** recognized within kernel-doc comments,</div><div class='del'>-	       **not** within normal reStructuredText documents.</div><div class='del'>-</div><div class='del'>-``funcname()``</div><div class='del'>-  Function reference.</div><div class='del'>-</div><div class='del'>-``@parameter``</div><div class='del'>-  Name of a function parameter. (No cross-referencing, just formatting.)</div><div class='del'>-</div><div class='del'>-``%CONST``</div><div class='del'>-  Name of a constant. (No cross-referencing, just formatting.)</div><div class='del'>-</div><div class='del'>-``$ENVVAR``</div><div class='del'>-  Name of an environment variable. (No cross-referencing, just formatting.)</div><div class='del'>-</div><div class='del'>-``&amp;struct name``</div><div class='del'>-  Structure reference.</div><div class='del'>-</div><div class='del'>-``&amp;enum name``</div><div class='del'>-  Enum reference.</div><div class='del'>-</div><div class='del'>-``&amp;typedef name``</div><div class='del'>-  Typedef reference.</div><div class='del'>-</div><div class='del'>-``&amp;struct_name-&gt;member`` or ``&amp;struct_name.member``</div><div class='del'>-  Structure or union member reference. The cross-reference will be to the struct</div><div class='del'>-  or union definition, not the member directly.</div><div class='del'>-</div><div class='del'>-``&amp;name``</div><div class='del'>-  A generic type reference. Prefer using the full reference described above</div><div class='del'>-  instead. This is mostly for legacy comments.</div><div class='del'>-</div><div class='del'>-Cross-referencing from reStructuredText</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-To cross-reference the functions and types defined in the kernel-doc comments</div><div class='del'>-from reStructuredText documents, please use the `Sphinx C Domain`_</div><div class='del'>-references. For example::</div><div class='del'>-</div><div class='del'>-  See function :c:func:`foo` and struct/union/enum/typedef :c:type:`bar`.</div><div class='del'>-</div><div class='del'>-While the type reference works with just the type name, without the</div><div class='del'>-struct/union/enum/typedef part in front, you may want to use::</div><div class='del'>-</div><div class='del'>-  See :c:type:`struct foo &lt;foo&gt;`.</div><div class='del'>-  See :c:type:`union bar &lt;bar&gt;`.</div><div class='del'>-  See :c:type:`enum baz &lt;baz&gt;`.</div><div class='del'>-  See :c:type:`typedef meh &lt;meh&gt;`.</div><div class='del'>-</div><div class='del'>-This will produce prettier links, and is in line with how kernel-doc does the</div><div class='del'>-cross-references.</div><div class='del'>-</div><div class='del'>-For further details, please refer to the `Sphinx C Domain`_ documentation.</div><div class='del'>-</div><div class='del'>-Function documentation</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-The general format of a function and function-like macro kernel-doc comment is::</div><div class='del'>-</div><div class='del'>-  /**</div><div class='del'>-   * function_name() - Brief description of function.</div><div class='del'>-   * @arg1: Describe the first argument.</div><div class='del'>-   * @arg2: Describe the second argument.</div><div class='del'>-   *        One can provide multiple line descriptions</div><div class='del'>-   *        for arguments.</div><div class='del'>-   *</div><div class='del'>-   * A longer description, with more discussion of the function function_name()</div><div class='del'>-   * that might be useful to those using or modifying it. Begins with an</div><div class='del'>-   * empty comment line, and may include additional embedded empty</div><div class='del'>-   * comment lines.</div><div class='del'>-   *</div><div class='del'>-   * The longer description may have multiple paragraphs.</div><div class='del'>-   *</div><div class='del'>-   * Return: Describe the return value of foobar.</div><div class='del'>-   *</div><div class='del'>-   * The return value description can also have multiple paragraphs, and should</div><div class='del'>-   * be placed at the end of the comment block.</div><div class='del'>-   */</div><div class='del'>-</div><div class='del'>-The brief description following the function name may span multiple lines, and</div><div class='del'>-ends with an ``@argument:`` description, a blank comment line, or the end of the</div><div class='del'>-comment block.</div><div class='del'>-</div><div class='del'>-The kernel-doc function comments describe each parameter to the function, in</div><div class='del'>-order, with the ``@argument:`` descriptions. The ``@argument:`` descriptions</div><div class='del'>-must begin on the very next line following the opening brief function</div><div class='del'>-description line, with no intervening blank comment lines. The ``@argument:``</div><div class='del'>-descriptions may span multiple lines. The continuation lines may contain</div><div class='del'>-indentation. If a function parameter is ``...`` (varargs), it should be listed</div><div class='del'>-in kernel-doc notation as: ``@...:``.</div><div class='del'>-</div><div class='del'>-The return value, if any, should be described in a dedicated section at the end</div><div class='del'>-of the comment starting with "Return:".</div><div class='del'>-</div><div class='del'>-Structure, union, and enumeration documentation</div><div class='del'>------------------------------------------------</div><div class='del'>-</div><div class='del'>-The general format of a struct, union, and enum kernel-doc comment is::</div><div class='del'>-</div><div class='del'>-  /**</div><div class='del'>-   * struct struct_name - Brief description.</div><div class='del'>-   * @member_name: Description of member member_name.</div><div class='del'>-   *</div><div class='del'>-   * Description of the structure.</div><div class='del'>-   */</div><div class='del'>-</div><div class='del'>-Below, "struct" is used to mean structs, unions and enums, and "member" is used</div><div class='del'>-to mean struct and union members as well as enumerations in an enum.</div><div class='del'>-</div><div class='del'>-The brief description following the structure name may span multiple lines, and</div><div class='del'>-ends with a ``@member:`` description, a blank comment line, or the end of the</div><div class='del'>-comment block.</div><div class='del'>-</div><div class='del'>-The kernel-doc data structure comments describe each member of the structure, in</div><div class='del'>-order, with the ``@member:`` descriptions. The ``@member:`` descriptions must</div><div class='del'>-begin on the very next line following the opening brief function description</div><div class='del'>-line, with no intervening blank comment lines. The ``@member:`` descriptions may</div><div class='del'>-span multiple lines. The continuation lines may contain indentation.</div><div class='del'>-</div><div class='del'>-In-line member documentation comments</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-The structure members may also be documented in-line within the definition::</div><div class='del'>-</div><div class='del'>-  /**</div><div class='del'>-   * struct foo - Brief description.</div><div class='del'>-   * @foo: The Foo member.</div><div class='del'>-   */</div><div class='del'>-  struct foo {</div><div class='del'>-        int foo;</div><div class='del'>-        /**</div><div class='del'>-         * @bar: The Bar member.</div><div class='del'>-         */</div><div class='del'>-        int bar;</div><div class='del'>-        /**</div><div class='del'>-         * @baz: The Baz member.</div><div class='del'>-         *</div><div class='del'>-         * Here, the member description may contain several paragraphs.</div><div class='del'>-         */</div><div class='del'>-        int baz;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-Private members</div><div class='del'>-~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-Inside a struct description, you can use the "private:" and "public:" comment</div><div class='del'>-tags. Structure fields that are inside a "private:" area are not listed in the</div><div class='del'>-generated output documentation.  The "private:" and "public:" tags must begin</div><div class='del'>-immediately following a ``/*`` comment marker.  They may optionally include</div><div class='del'>-comments between the ``:`` and the ending ``*/`` marker.</div><div class='del'>-</div><div class='del'>-Example::</div><div class='del'>-</div><div class='del'>-  /**</div><div class='del'>-   * struct my_struct - short description</div><div class='del'>-   * @a: first member</div><div class='del'>-   * @b: second member</div><div class='del'>-   *</div><div class='del'>-   * Longer description</div><div class='del'>-   */</div><div class='del'>-  struct my_struct {</div><div class='del'>-      int a;</div><div class='del'>-      int b;</div><div class='del'>-  /* private: internal use only */</div><div class='del'>-      int c;</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Typedef documentation</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-The general format of a typedef kernel-doc comment is::</div><div class='del'>-</div><div class='del'>-  /**</div><div class='del'>-   * typedef type_name - Brief description.</div><div class='del'>-   *</div><div class='del'>-   * Description of the type.</div><div class='del'>-   */</div><div class='del'>-</div><div class='del'>-Overview documentation comments</div><div class='del'>--------------------------------</div><div class='del'>-</div><div class='del'>-To facilitate having source code and comments close together, you can include</div><div class='del'>-kernel-doc documentation blocks that are free-form comments instead of being</div><div class='del'>-kernel-doc for functions, structures, unions, enums, or typedefs. This could be</div><div class='del'>-used for something like a theory of operation for a driver or library code, for</div><div class='del'>-example.</div><div class='del'>-</div><div class='del'>-This is done by using a ``DOC:`` section keyword with a section title.</div><div class='del'>-</div><div class='del'>-The general format of an overview or high-level documentation comment is::</div><div class='del'>-</div><div class='del'>-  /**</div><div class='del'>-   * DOC: Theory of Operation</div><div class='del'>-   *</div><div class='del'>-   * The whizbang foobar is a dilly of a gizmo. It can do whatever you</div><div class='del'>-   * want it to do, at any time. It reads your mind. Here's how it works.</div><div class='del'>-   *</div><div class='del'>-   * foo bar splat</div><div class='del'>-   *</div><div class='del'>-   * The only drawback to this gizmo is that is can sometimes damage</div><div class='del'>-   * hardware, software, or its subject(s).</div><div class='del'>-   */</div><div class='del'>-</div><div class='del'>-The title following ``DOC:`` acts as a heading within the source file, but also</div><div class='del'>-as an identifier for extracting the documentation comment. Thus, the title must</div><div class='del'>-be unique within the file.</div><div class='del'>-</div><div class='del'>-Recommendations</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-We definitely need kernel-doc formatted documentation for functions that are</div><div class='del'>-exported to loadable modules using ``EXPORT_SYMBOL`` or ``EXPORT_SYMBOL_GPL``.</div><div class='del'>-</div><div class='del'>-We also look to provide kernel-doc formatted documentation for functions</div><div class='del'>-externally visible to other kernel files (not marked "static").</div><div class='del'>-</div><div class='del'>-We also recommend providing kernel-doc formatted documentation for private (file</div><div class='del'>-"static") routines, for consistency of kernel source code layout. But this is</div><div class='del'>-lower priority and at the discretion of the MAINTAINER of that kernel source</div><div class='del'>-file.</div><div class='del'>-</div><div class='del'>-Data structures visible in kernel include files should also be documented using</div><div class='del'>-kernel-doc formatted comments.</div><div class='del'>-</div><div class='del'>-DocBook XML [DEPRECATED]</div><div class='del'>-========================</div><div class='del'>-</div><div class='del'>-.. attention::</div><div class='del'>-</div><div class='del'>-   This section describes the deprecated DocBook XML toolchain. Please do not</div><div class='del'>-   create new DocBook XML template files. Please consider converting existing</div><div class='del'>-   DocBook XML templates files to Sphinx/reStructuredText.</div><div class='del'>-</div><div class='del'>-Converting DocBook to Sphinx</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-Over time, we expect all of the documents under ``Documentation/DocBook`` to be</div><div class='del'>-converted to Sphinx and reStructuredText. For most DocBook XML documents, a good</div><div class='del'>-enough solution is to use the simple ``Documentation/sphinx/tmplcvt`` script,</div><div class='del'>-which uses ``pandoc`` under the hood. For example::</div><div class='del'>-</div><div class='del'>-  $ cd Documentation/sphinx</div><div class='del'>-  $ ./tmplcvt ../DocBook/in.tmpl ../out.rst</div><div class='del'>-</div><div class='del'>-Then edit the resulting rst files to fix any remaining issues, and add the</div><div class='del'>-document in the ``toctree`` in ``Documentation/index.rst``.</div><div class='del'>-</div><div class='del'>-Components of the kernel-doc system</div><div class='del'>------------------------------------</div><div class='del'>-</div><div class='del'>-Many places in the source tree have extractable documentation in the form of</div><div class='del'>-block comments above functions. The components of this system are:</div><div class='del'>-</div><div class='del'>-- ``scripts/kernel-doc``</div><div class='del'>-</div><div class='del'>-  This is a perl script that hunts for the block comments and can mark them up</div><div class='del'>-  directly into reStructuredText, DocBook, man, text, and HTML. (No, not</div><div class='del'>-  texinfo.)</div><div class='del'>-</div><div class='del'>-- ``Documentation/DocBook/*.tmpl``</div><div class='del'>-</div><div class='del'>-  These are XML template files, which are normal XML files with special</div><div class='del'>-  place-holders for where the extracted documentation should go.</div><div class='del'>-</div><div class='del'>-- ``scripts/docproc.c``</div><div class='del'>-</div><div class='del'>-  This is a program for converting XML template files into XML files. When a</div><div class='del'>-  file is referenced it is searched for symbols exported (EXPORT_SYMBOL), to be</div><div class='del'>-  able to distinguish between internal and external functions.</div><div class='del'>-</div><div class='del'>-  It invokes kernel-doc, giving it the list of functions that are to be</div><div class='del'>-  documented.</div><div class='del'>-</div><div class='del'>-  Additionally it is used to scan the XML template files to locate all the files</div><div class='del'>-  referenced herein. This is used to generate dependency information as used by</div><div class='del'>-  make.</div><div class='del'>-</div><div class='del'>-- ``Makefile``</div><div class='del'>-</div><div class='del'>-  The targets 'xmldocs', 'psdocs', 'pdfdocs', and 'htmldocs' are used to build</div><div class='del'>-  DocBook XML files, PostScript files, PDF files, and html files in</div><div class='del'>-  Documentation/DocBook. The older target 'sgmldocs' is equivalent to 'xmldocs'.</div><div class='del'>-</div><div class='del'>-- ``Documentation/DocBook/Makefile``</div><div class='del'>-</div><div class='del'>-  This is where C files are associated with SGML templates.</div><div class='del'>-</div><div class='del'>-How to use kernel-doc comments in DocBook XML template files</div><div class='del'>-------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-DocBook XML template files (\*.tmpl) are like normal XML files, except that they</div><div class='del'>-can contain escape sequences where extracted documentation should be inserted.</div><div class='del'>-</div><div class='del'>-``!E&lt;filename&gt;`` is replaced by the documentation, in ``&lt;filename&gt;``, for</div><div class='del'>-functions that are exported using ``EXPORT_SYMBOL``: the function list is</div><div class='del'>-collected from files listed in ``Documentation/DocBook/Makefile``.</div><div class='del'>-</div><div class='del'>-``!I&lt;filename&gt;`` is replaced by the documentation for functions that are **not**</div><div class='del'>-exported using ``EXPORT_SYMBOL``.</div><div class='del'>-</div><div class='del'>-``!D&lt;filename&gt;`` is used to name additional files to search for functions</div><div class='del'>-exported using ``EXPORT_SYMBOL``.</div><div class='del'>-</div><div class='del'>-``!F&lt;filename&gt; &lt;function [functions...]&gt;`` is replaced by the documentation, in</div><div class='del'>-``&lt;filename&gt;``, for the functions listed.</div><div class='del'>-</div><div class='del'>-``!P&lt;filename&gt; &lt;section title&gt;`` is replaced by the contents of the ``DOC:``</div><div class='del'>-section titled ``&lt;section title&gt;`` from ``&lt;filename&gt;``. Spaces are allowed in</div><div class='del'>-``&lt;section title&gt;``; do not quote the ``&lt;section title&gt;``.</div><div class='del'>-</div><div class='del'>-``!C&lt;filename&gt;`` is replaced by nothing, but makes the tools check that all DOC:</div><div class='del'>-sections and documented functions, symbols, etc. are used. This makes sense to</div><div class='del'>-use when you use ``!F`` or ``!P`` only and want to verify that all documentation</div><div class='del'>-is included.</div><div class='head'>diff --git a/Documentation/kernel-per-CPU-kthreads.txt b/Documentation/kernel-per-CPU-kthreads.txt<br/>index bbc3a8b8cff4..df31e30b6a02 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/kernel-per-CPU-kthreads.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/kernel-per-CPU-kthreads.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/kernel-per-CPU-kthreads.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/kernel-per-CPU-kthreads.txt</a></div><div class='hunk'>@@ -264,7 +264,7 @@ To reduce its OS jitter, do at least one of the following:</div><div class='ctx'> 	kthreads from being created in the first place.</div><div class='ctx'> 2.	Boot with "nosoftlockup=0", which will also prevent these kthreads</div><div class='ctx'> 	from being created.  Other related watchdog and softlockup boot</div><div class='del'>-	parameters may be found in Documentation/kernel-parameters.txt</div><div class='add'>+	parameters may be found in Documentation/admin-guide/kernel-parameters.rst</div><div class='ctx'> 	and Documentation/watchdog/watchdog-parameters.txt.</div><div class='ctx'> 3.	Echo a zero to /proc/sys/kernel/watchdog to disable the</div><div class='ctx'> 	watchdog timer.</div><div class='head'>diff --git a/Documentation/ko_KR/HOWTO b/Documentation/ko_KR/HOWTO<br/>deleted file mode 100644<br/>index 9a3e65924d54..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/ko_KR/HOWTO?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ko_KR/HOWTO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,585 +0,0 @@</div><div class='del'>-NOTE:</div><div class='del'>-This is a version of Documentation/HOWTO translated into korean</div><div class='del'>-This document is maintained by Minchan Kim &lt;minchan@kernel.org&gt;</div><div class='del'>-If you find any difference between this document and the original file or</div><div class='del'>-a problem with the translation, please contact the maintainer of this file.</div><div class='del'>-</div><div class='del'>-Please also note that the purpose of this file is to be easier to</div><div class='del'>-read for non English (read: korean) speakers and is not intended as</div><div class='del'>-a fork. So if you have any comments or updates for this file please</div><div class='del'>-try to update the original English file first.</div><div class='del'>-</div><div class='del'>-==================================</div><div class='del'>-이 문서는</div><div class='del'>-Documentation/HOWTO</div><div class='del'>-의 한글 번역입니다.</div><div class='del'>-</div><div class='del'>-역자： 김민찬 &lt;minchan@kernel.org&gt;</div><div class='del'>-감수： 이제이미 &lt;jamee.lee@samsung.com&gt;</div><div class='del'>-==================================</div><div class='del'>-</div><div class='del'>-어떻게 리눅스 커널 개발을 하는가</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-이 문서는 커널 개발에 있어 가장 중요한 문서이다. 이 문서는</div><div class='del'>-리눅스 커널 개발자가 되는 법과 리눅스 커널 개발 커뮤니티와 일하는</div><div class='del'>-법을 담고있다. 커널 프로그래밍의 기술적인 측면과 관련된 내용들은</div><div class='del'>-포함하지 않으려고 하였지만 올바른 길로 여러분을 안내하는 데는 도움이</div><div class='del'>-될 것이다.</div><div class='del'>-</div><div class='del'>-이 문서에서 오래된 것을 발견하면 문서의 아래쪽에 나열된 메인테이너에게</div><div class='del'>-패치를 보내달라.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-소개</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-자, 여러분은 리눅스 커널 개발자가 되는 법을 배우고 싶은가? 아니면</div><div class='del'>-상사로부터"이 장치를 위한 리눅스 드라이버를 작성하시오"라는 말을</div><div class='del'>-들었는가? 이 문서의 목적은 여러분이 겪게 될 과정과 커뮤니티와 협력하는</div><div class='del'>-법을 조언하여 여러분의 목적을 달성하기 위해 필요한 것 모두를 알려주기</div><div class='del'>-위함이다.</div><div class='del'>-</div><div class='del'>-커널은 대부분은 C로 작성되어 있고 몇몇 아키텍쳐의 의존적인 부분은</div><div class='del'>-어셈블리로 작성되어 있다. 커널 개발을 위해 C를 잘 이해하고 있어야 한다.</div><div class='del'>-여러분이 특정 아키텍쳐의 low-level 개발을 할 것이 아니라면</div><div class='del'>-어셈블리(특정 아키텍쳐)는 잘 알아야 할 필요는 없다.</div><div class='del'>-다음의 참고서적들은 기본에 충실한 C 교육이나 수년간의 경험에 견주지는</div><div class='del'>-못하지만 적어도 참고 용도로는 좋을 것이다</div><div class='del'>- - "The C Programming Language" by Kernighan and Ritchie [Prentice Hall]</div><div class='del'>- - "Practical C Programming" by Steve Oualline [O'Reilly]</div><div class='del'>- - "C:  A Reference Manual" by Harbison and Steele [Prentice Hall]</div><div class='del'>-</div><div class='del'>-커널은 GNU C와 GNU 툴체인을 사용하여 작성되었다. 이 툴들은 ISO C89 표준을</div><div class='del'>-따르는 반면 표준에 있지 않은 많은 확장기능도 가지고 있다. 커널은 표준 C</div><div class='del'>-라이브러리와는 관계없이 freestanding C 환경이어서 C 표준의 일부는</div><div class='del'>-지원되지 않는다. 임의의 long long 나누기나 floating point는 지원되지 않는다.</div><div class='del'>-때론 이런 이유로 커널이 그런 확장 기능을 가진 툴체인을 가지고 만들어졌다는</div><div class='del'>-것이 이해하기 어려울 수도 있고 게다가 불행하게도 그런 것을 정확하게 설명하는</div><div class='del'>-어떤 참고문서도 있지 않다. 정보를 얻기 위해서는 gcc info (`info gcc`)페이지를</div><div class='del'>-살펴보라.</div><div class='del'>-</div><div class='del'>-여러분은 기존의 개발 커뮤니티와 협력하는 법을 배우려고 하고 있다는 것을</div><div class='del'>-기억하라. 코딩, 스타일, 함수에 관한 훌륭한 표준을 가진 사람들이 모인</div><div class='del'>-다양한 그룹이 있다. 이 표준들은 오랜동안 크고 지역적으로 분산된 팀들에</div><div class='del'>-의해 가장 좋은 방법으로 일하기 위하여 찾은 것을 기초로 만들어져 왔다.</div><div class='del'>-그 표준들은 문서화가 잘 되어있기 때문에 가능한한 미리 많은 표준들에</div><div class='del'>-관하여 배우려고 시도하라. 다른 사람들은 여러분이나 여러분의 회사가</div><div class='del'>-일하는 방식에 적응하는 것을 원하지는 않는다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-법적 문제</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-리눅스 커널 소스 코드는 GPL로 배포(release)되었다. 소스트리의 메인</div><div class='del'>-디렉토리에 있는 라이센스에 관하여 상세하게 쓰여 있는 COPYING이라는</div><div class='del'>-파일을 봐라. 여러분이 라이센스에 관한 더 깊은 문제를 가지고 있다면</div><div class='del'>-리눅스 커널 메일링 리스트에 묻지말고 변호사와 연락하라. 메일링</div><div class='del'>-리스트들에 있는 사람들은 변호사가 아니기 때문에 법적 문제에 관하여</div><div class='del'>-그들의 말에 의지해서는 안된다.</div><div class='del'>-</div><div class='del'>-GPL에 관한 잦은 질문들과 답변들은 다음을 참조하라.</div><div class='del'>-    http://www.gnu.org/licenses/gpl-faq.html</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-문서</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-리눅스 커널 소스 트리는 커널 커뮤니티와 협력하는 법을 배우기위해 훌륭한</div><div class='del'>-다양한 문서들을 가지고 있다. 새로운 기능들이 커널에 들어가게 될 때,</div><div class='del'>-그 기능을 어떻게 사용하는지에 관한 설명을 위하여 새로운 문서 파일을</div><div class='del'>-추가하는 것을 권장한다. 커널이 유저스페이스로 노출하는 인터페이스를</div><div class='del'>-변경하게 되면 변경을 설명하는 메뉴얼 페이지들에 대한 패치나 정보를</div><div class='del'>-mtk.manpages@gmail.com의 메인테이너에게 보낼 것을 권장한다.</div><div class='del'>-</div><div class='del'>-다음은 커널 소스 트리에 있는 읽어야 할 파일들의 리스트이다.</div><div class='del'>-  README</div><div class='del'>-    이 파일은 리눅스 커널에 관하여 간단한 배경 설명과 커널을 설정하고</div><div class='del'>-    빌드하기 위해 필요한 것을 설명한다. 커널에 입문하는 사람들은 여기서</div><div class='del'>-    시작해야 한다.</div><div class='del'>-</div><div class='del'>-  Documentation/Changes</div><div class='del'>-    이 파일은 커널을 성공적으로 빌드하고 실행시키기 위해 필요한 다양한</div><div class='del'>-    소프트웨어 패키지들의 최소 버젼을 나열한다.</div><div class='del'>-</div><div class='del'>-  Documentation/CodingStyle</div><div class='del'>-    이 문서는 리눅스 커널 코딩 스타일과 그렇게 한 몇몇 이유를 설명한다.</div><div class='del'>-    모든 새로운 코드는 이 문서에 가이드라인들을 따라야 한다. 대부분의</div><div class='del'>-    메인테이너들은 이 규칙을 따르는 패치들만을 받아들일 것이고 많은 사람들이</div><div class='del'>-    그 패치가 올바른 스타일일 경우만 코드를 검토할 것이다.</div><div class='del'>-</div><div class='del'>-  Documentation/SubmittingPatches</div><div class='del'>-  Documentation/SubmittingDrivers</div><div class='del'>-    이 파일들은 성공적으로 패치를 만들고 보내는 법을 다음의 내용들로</div><div class='del'>-    굉장히 상세히 설명하고 있다(그러나 다음으로 한정되진 않는다).</div><div class='del'>-       - Email 내용들</div><div class='del'>-       - Email 양식</div><div class='del'>-       - 그것을 누구에게 보낼지</div><div class='del'>-    이러한 규칙들을 따르는 것이 성공(역자주: 패치가 받아들여 지는 것)을</div><div class='del'>-    보장하진 않는다(왜냐하면 모든 패치들은 내용과 스타일에 관하여</div><div class='del'>-    면밀히 검토되기 때문이다). 그러나 규칙을 따르지 않는다면 거의</div><div class='del'>-    성공하지도 못할 것이다.</div><div class='del'>-</div><div class='del'>-    올바른 패치들을 만드는 법에 관한 훌륭한 다른 문서들이 있다.</div><div class='del'>-    "The Perfect Patch"</div><div class='del'>-        http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='del'>-    "Linux kernel patch submission format"</div><div class='del'>-        http://linux.yyz.us/patch-format.html</div><div class='del'>-</div><div class='del'>-   Documentation/stable_api_nonsense.txt</div><div class='del'>-    이 문서는 의도적으로 커널이 불변하는 API를 갖지 않도록 결정한</div><div class='del'>-    이유를 설명하며 다음과 같은 것들을 포함한다.</div><div class='del'>-       - 서브시스템 shim-layer(호환성을 위해?)</div><div class='del'>-       - 운영체제들간의 드라이버 이식성</div><div class='del'>-       - 커널 소스 트리내에 빠른 변화를 늦추는 것(또는 빠른 변화를 막는 것)</div><div class='del'>-    이 문서는 리눅스 개발 철학을 이해하는데 필수적이며 다른 운영체제에서</div><div class='del'>-    리눅스로 전향하는 사람들에게는 매우 중요하다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  Documentation/SecurityBugs</div><div class='del'>-    여러분들이 리눅스 커널의 보안 문제를 발견했다고 생각한다면 이 문서에</div><div class='del'>-    나온 단계에 따라서 커널 개발자들에게 알리고 그 문제를 해결할 수 있도록</div><div class='del'>-    도와 달라.</div><div class='del'>-</div><div class='del'>-  Documentation/ManagementStyle</div><div class='del'>-    이 문서는 리눅스 커널 메인테이너들이 그들의 방법론에 녹아 있는</div><div class='del'>-    정신을 어떻게 공유하고 운영하는지를 설명한다. 이것은 커널 개발에 입문하는</div><div class='del'>-    모든 사람들(또는 커널 개발에 작은 호기심이라도 있는 사람들)이</div><div class='del'>-    읽어야 할 중요한 문서이다. 왜냐하면 이 문서는 커널 메인테이너들의</div><div class='del'>-    독특한 행동에 관하여 흔히 있는 오해들과 혼란들을 해소하고 있기</div><div class='del'>-    때문이다.</div><div class='del'>-</div><div class='del'>-  Documentation/stable_kernel_rules.txt</div><div class='del'>-    이 문서는 안정적인 커널 배포가 이루어지는 규칙을 설명하고 있으며</div><div class='del'>-    여러분들이 이러한 배포들 중 하나에 변경을 하길 원한다면</div><div class='del'>-    무엇을 해야 하는지를 설명한다.</div><div class='del'>-</div><div class='del'>-  Documentation/kernel-docs.txt</div><div class='del'>-    커널 개발에 관계된 외부 문서의 리스트이다. 커널 내의 포함된 문서들</div><div class='del'>-    중에 여러분이 찾고 싶은 문서를 발견하지 못할 경우 이 리스트를</div><div class='del'>-    살펴보라.</div><div class='del'>-</div><div class='del'>-  Documentation/applying-patches.txt</div><div class='del'>-    패치가 무엇이며 그것을 커널의 다른 개발 브랜치들에 어떻게</div><div class='del'>-    적용하는지에 관하여 자세히 설명하고 있는 좋은 입문서이다.</div><div class='del'>-</div><div class='del'>-커널은 소스 코드 그 자체에서 자동적으로 만들어질 수 있는 많은 문서들을</div><div class='del'>-가지고 있다. 이것은 커널 내의 API에 대한 모든 설명, 그리고 락킹을</div><div class='del'>-올바르게 처리하는 법에 관한 규칙을 포함하고 있다. 이 문서는</div><div class='del'>-Documentation/DocBook/ 디렉토리 내에서 만들어지며 PDF, Postscript, HTML,</div><div class='del'>-그리고 man 페이지들로 다음과 같이 실행하여 만들어 진다.</div><div class='del'>-         make pdfdocs</div><div class='del'>-         make psdocs</div><div class='del'>-         make htmldocs</div><div class='del'>-         make mandocs</div><div class='del'>-각각의 명령을 메인 커널 소스 디렉토리로부터 실행한다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-커널 개발자가 되는 것</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-여러분이 리눅스 커널 개발에 관하여 아무것도 모른다면 Linux KernelNewbies</div><div class='del'>-프로젝트를 봐야 한다.</div><div class='del'>-    http://kernelnewbies.org</div><div class='del'>-그곳은 거의 모든 종류의 기본적인 커널 개발 질문들(질문하기 전에 먼저</div><div class='del'>-아카이브를 찾아봐라. 과거에 이미 답변되었을 수도 있다)을 할 수 있는 도움이</div><div class='del'>-될만한 메일링 리스트가 있다. 또한 실시간으로 질문 할 수 있는 IRC 채널도</div><div class='del'>-가지고 있으며 리눅스 커널 개발을 배우는 데 유용한 문서들을 보유하고 있다.</div><div class='del'>-</div><div class='del'>-웹사이트는 코드구성, 서브시스템들, 그리고 현재 프로젝트들</div><div class='del'>-(트리 내, 외부에 존재하는)에 관한 기본적인 정보들을 가지고 있다. 또한</div><div class='del'>-그곳은 커널 컴파일이나 패치를 하는 법과 같은 기본적인 것들을  설명한다.</div><div class='del'>-</div><div class='del'>-여러분이 어디서 시작해야 할진 모르지만 커널 개발 커뮤니티에 참여할 수</div><div class='del'>-있는 일들을 찾길 원한다면 리눅스 커널 Janitor 프로젝트를 살펴봐라.</div><div class='del'>-	http://kernelnewbies.org/KernelJanitors</div><div class='del'>-그곳은 시작하기에 훌륭한 장소이다. 그곳은 리눅스 커널 소스 트리내에</div><div class='del'>-간단히 정리되고 수정될 수 있는 문제들에 관하여 설명한다. 여러분은 이</div><div class='del'>-프로젝트를 대표하는 개발자들과 일하면서 자신의 패치를 리눅스 커널 트리에</div><div class='del'>-반영하기 위한 기본적인 것들을 배우게 될것이며 여러분이 아직 아이디어를</div><div class='del'>-가지고 있지 않다면 다음에 무엇을 해야할지에 관한 방향을 배울 수 있을</div><div class='del'>-것이다.</div><div class='del'>-</div><div class='del'>-여러분들이 이미 커널 트리에 반영하길 원하는 코드 묶음을 가지고 있지만</div><div class='del'>-올바른 포맷으로 포장하는데 도움이 필요하다면 그러한 문제를 돕기 위해</div><div class='del'>-만들어진 kernel-mentors 프로젝트가 있다. 그곳은 메일링 리스트이며</div><div class='del'>-다음에서 참조할 수 있다.</div><div class='del'>-         http://selenic.com/mailman/listinfo/kernel-mentors</div><div class='del'>-</div><div class='del'>-리눅스 커널 코드에 실제 변경을 하기 전에 반드시 그 코드가 어떻게</div><div class='del'>-동작하는지 이해하고 있어야 한다. 코드를 분석하기 위하여 특정한 툴의</div><div class='del'>-도움을 빌려서라도 코드를 직접 읽는 것보다 좋은 것은 없다(대부분의</div><div class='del'>-자잘한 부분들은 잘 코멘트되어 있다). 그런 툴들 중에 특히 추천할만한</div><div class='del'>-것은 Linux Cross-Reference project이며 그것은 자기 참조 방식이며</div><div class='del'>-소스코드를 인덱스된 웹 페이지들의 형태로 보여준다. 최신의 멋진 커널</div><div class='del'>-코드 저장소는 다음을 통하여 참조할 수 있다.</div><div class='del'>-      http://lxr.free-electrons.com/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-개발 프로세스</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-리눅스 커널 개발 프로세스는 현재 몇몇 다른 메인 커널 "브랜치들"과</div><div class='del'>-서브시스템에 특화된 커널 브랜치들로 구성된다. 몇몇 다른 메인</div><div class='del'>-브랜치들은 다음과 같다.</div><div class='del'>-  - main 4.x 커널 트리</div><div class='del'>-  - 4.x.y - 안정된 커널 트리</div><div class='del'>-  - 4.x -git 커널 패치들</div><div class='del'>-  - 서브시스템을 위한 커널 트리들과 패치들</div><div class='del'>-  - 4.x - 통합 테스트를 위한 next 커널 트리</div><div class='del'>-</div><div class='del'>-4.x 커널 트리</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-4.x 커널들은 Linux Torvalds가 관리하며 kernel.org의 pub/linux/kernel/v4.x/</div><div class='del'>-디렉토리에서 참조될 수 있다.개발 프로세스는 다음과 같다.</div><div class='del'>-  - 새로운 커널이 배포되자마자 2주의 시간이 주어진다. 이 기간동은</div><div class='del'>-    메인테이너들은 큰 diff들을 Linus에게 제출할 수 있다. 대개 이 패치들은</div><div class='del'>-    몇 주 동안 -next 커널내에 이미 있었던 것들이다. 큰 변경들을 제출하는 데</div><div class='del'>-    선호되는 방법은  git(커널의 소스 관리 툴, 더 많은 정보들은</div><div class='del'>-    http://git-scm.com/ 에서 참조할 수 있다)를 사용하는 것이지만 순수한</div><div class='del'>-    패치파일의 형식으로 보내는 것도 무관하다.</div><div class='del'>-  - 2주 후에 -rc1 커널이 배포되며 지금부터는 전체 커널의 안정성에 영향을</div><div class='del'>-    미칠수 있는 새로운 기능들을 포함하지 않는 패치들만이 추가될 수 있다.</div><div class='del'>-    완전히 새로운 드라이버(혹은 파일시스템)는 -rc1 이후에만 받아들여진다는</div><div class='del'>-    것을 기억해라. 왜냐하면 변경이 자체내에서만 발생하고 추가된 코드가</div><div class='del'>-    드라이버 외부의 다른 부분에는 영향을 주지 않으므로 그런 변경은</div><div class='del'>-    회귀(역자주: 이전에는 존재하지 않았지만 새로운 기능추가나 변경으로 인해</div><div class='del'>-    생겨난 버그)를 일으킬 만한 위험을 가지고 있지 않기 때문이다. -rc1이</div><div class='del'>-    배포된 이후에 git를 사용하여 패치들을 Linus에게 보낼수 있지만 패치들은</div><div class='del'>-    공식적인 메일링 리스트로 보내서 검토를 받을 필요가 있다.</div><div class='del'>-  - 새로운 -rc는 Linus가 현재 git tree가 테스트 하기에 충분히 안정된 상태에</div><div class='del'>-    있다고 판단될 때마다 배포된다. 목표는 새로운 -rc 커널을 매주 배포하는</div><div class='del'>-    것이다.</div><div class='del'>-  - 이러한 프로세스는 커널이 "준비(ready)"되었다고 여겨질때까지 계속된다.</div><div class='del'>-    프로세스는 대체로 6주간 지속된다.</div><div class='del'>-</div><div class='del'>-커널 배포에 있어서 언급할만한 가치가 있는 리눅스 커널 메일링 리스트의</div><div class='del'>-Andrew Morton의 글이 있다.</div><div class='del'>-        "커널이 언제 배포될지는 아무도 모른다. 왜냐하면 배포는 알려진</div><div class='del'>-         버그의 상황에 따라 배포되는 것이지 미리정해 놓은 시간에 따라</div><div class='del'>-         배포되는 것은 아니기 때문이다."</div><div class='del'>-</div><div class='del'>-4.x.y - 안정 커널 트리</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-3 자리 숫자로 이루어진 버젼의 커널들은 -stable 커널들이다. 그것들은 4.x</div><div class='del'>-커널에서 발견된 큰 회귀들이나 보안 문제들 중 비교적 작고 중요한 수정들을</div><div class='del'>-포함한다.</div><div class='del'>-</div><div class='del'>-이것은 가장 최근의 안정적인 커널을 원하는 사용자에게 추천되는 브랜치이며,</div><div class='del'>-개발/실험적 버젼을 테스트하는 것을 돕고자 하는 사용자들과는 별로 관련이 없다.</div><div class='del'>-</div><div class='del'>-어떤 4.x.y 커널도 사용할 수 없다면 그때는 가장 높은 숫자의 4.x</div><div class='del'>-커널이 현재의 안정 커널이다.</div><div class='del'>-</div><div class='del'>-4.x.y는 "stable" 팀&lt;stable@vger.kernel.org&gt;에 의해 관리되며 거의 매번 격주로</div><div class='del'>-배포된다.</div><div class='del'>-</div><div class='del'>-커널 트리 문서들 내에 Documentation/stable_kernel_rules.txt 파일은 어떤</div><div class='del'>-종류의 변경들이 -stable 트리로 들어왔는지와 배포 프로세스가 어떻게</div><div class='del'>-진행되는지를 설명한다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4.x -git 패치들</div><div class='del'>-------------------</div><div class='del'>-git 저장소(그러므로 -git이라는 이름이 붙음)에는 날마다 관리되는 Linus의</div><div class='del'>-커널 트리의 snapshot 들이 있다. 이 패치들은 일반적으로 날마다 배포되며</div><div class='del'>-Linus의 트리의 현재 상태를 나타낸다. 이 패치들은 정상적인지 조금도</div><div class='del'>-살펴보지 않고 자동적으로 생성된 것이므로 -rc 커널들 보다도 더 실험적이다.</div><div class='del'>-</div><div class='del'>-서브시스템 커널 트리들과 패치들</div><div class='del'>--------------------------------</div><div class='del'>-다양한 커널 서브시스템의 메인테이너들 --- 그리고 많은 커널 서브시스템 개발자들</div><div class='del'>---- 은 그들의 현재 개발 상태를 소스 저장소로 노출한다. 이를 통해 다른 사람들도</div><div class='del'>-커널의 다른 영역에 어떤 변화가 이루어지고 있는지 알 수 있다. 급속히 개발이</div><div class='del'>-진행되는 영역이 있고 그렇지 않은 영역이 있으므로, 개발자는 다른 개발자가 제출한</div><div class='del'>-수정 사항과 자신의 수정사항의 충돌이나 동일한 일을 동시에 두사람이 따로</div><div class='del'>-진행하는 사태를 방지하기 위해 급속히 개발이 진행되고 있는 영역에 작업의</div><div class='del'>-베이스를 맞춰줄 것이 요구된다.</div><div class='del'>-</div><div class='del'>-대부분의 이러한 저장소는 git 트리지만, git이 아닌 SCM으로 관리되거나, quilt</div><div class='del'>-시리즈로 제공되는 패치들도 존재한다. 이러한 서브시스템 저장소들은 MAINTAINERS</div><div class='del'>-파일에 나열되어 있다. 대부분은 http://git.kernel.org 에서 볼 수 있다.</div><div class='del'>-</div><div class='del'>-제안된 패치는 서브시스템 트리에 커밋되기 전에 메일링 리스트를 통해</div><div class='del'>-리뷰된다(아래의 관련 섹션을 참고하기 바란다). 일부 커널 서브시스템의 경우, 이</div><div class='del'>-리뷰 프로세스는 patchwork라는 도구를 통해 추적된다. patchwork은 등록된 패치와</div><div class='del'>-패치에 대한 코멘트, 패치의 버전을 볼 수 있는 웹 인터페이스를 제공하고,</div><div class='del'>-메인테이너는 패치를 리뷰 중, 리뷰 통과, 또는 반려됨으로 표시할 수 있다.</div><div class='del'>-대부분의 이러한 patchwork 사이트는 http://patchwork.kernel.org/ 또는</div><div class='del'>-http://patchwork.ozlabs.org/ 에 나열되어 있다.</div><div class='del'>-</div><div class='del'>-4.x - 통합 테스트를 위한 next 커널 트리</div><div class='del'>------------------------------------------</div><div class='del'>-서브시스템 트리들의 변경사항들은 mainline 4.x 트리로 들어오기 전에 통합</div><div class='del'>-테스트를 거쳐야 한다. 이런 목적으로, 모든 서브시스템 트리의 변경사항을 거의</div><div class='del'>-매일 받아가는 특수한 테스트 저장소가 존재한다:</div><div class='del'>-       http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git</div><div class='del'>-</div><div class='del'>-이런 식으로, -next 커널을 통해 다음 머지 기간에 메인라인 커널에 어떤 변경이</div><div class='del'>-가해질 것인지 간략히 알 수 있다. 모험심 강한 테스터라면 -next 커널에서 테스트를</div><div class='del'>-수행하는 것도 좋을 것이다.</div><div class='del'>-</div><div class='del'>-버그 보고</div><div class='del'>----------</div><div class='del'>-bugzilla.kernel.org는 리눅스 커널 개발자들이 커널의 버그를 추적하는 곳이다.</div><div class='del'>-사용자들은 발견한 모든 버그들을 보고하기 위하여 이 툴을 사용할 것을 권장한다.</div><div class='del'>-kernel bugzilla를 사용하는 자세한 방법은 다음을 참조하라.</div><div class='del'>-    http://test.kernel.org/bugzilla/faq.html</div><div class='del'>-</div><div class='del'>-메인 커널 소스 디렉토리에 있는 REPORTING-BUGS 파일은 커널 버그라고 생각되는</div><div class='del'>-것을 보고하는 방법에 관한 좋은 템플릿이며 문제를 추적하기 위해서 커널</div><div class='del'>-개발자들이 필요로 하는 정보가 무엇들인지를 상세히 설명하고 있다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-버그 리포트들의 관리</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-여러분의 해킹 기술을 연습하는 가장 좋은 방법 중의 하는 다른 사람들이</div><div class='del'>-보고한 버그들을 수정하는 것이다. 여러분은 커널을 더욱 안정화시키는데</div><div class='del'>-도움을 줄 뿐만이 아니라 실제있는 문제들을 수정하는 법을 배우게 되고</div><div class='del'>-그와 함께 여러분들의 기술은 향상될 것이며 다른 개발자들이 여러분의</div><div class='del'>-존재에 대해 알게 될 것이다. 버그를 수정하는 것은 개발자들  사이에서</div><div class='del'>-점수를 얻을 수 있는 가장 좋은 방법중의 하나이다. 왜냐하면 많은 사람들은</div><div class='del'>-다른 사람들의 버그들을 수정하기 위하여 시간을 낭비하지 않기 때문이다.</div><div class='del'>-</div><div class='del'>-이미 보고된 버그 리포트들을 가지고 작업하기 위해서 http://bugzilla.kernel.org를</div><div class='del'>-참조하라. 여러분이 앞으로 생겨날 버그 리포트들의 조언자가 되길 원한다면</div><div class='del'>-bugme-new 메일링 리스트나(새로운 버그 리포트들만이 이곳에서 메일로 전해진다)</div><div class='del'>-bugme-janitor 메일링 리스트(bugzilla에 모든 변화들이 여기서 메일로 전해진다)</div><div class='del'>-에 등록하면 된다.</div><div class='del'>-</div><div class='del'>-      https://lists.linux-foundation.org/mailman/listinfo/bugme-new</div><div class='del'>-      https://lists.linux-foundation.org/mailman/listinfo/bugme-janitors</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-메일링 리스트들</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-위의 몇몇 문서들이 설명하였지만 핵심 커널 개발자들의 대다수는</div><div class='del'>-리눅스 커널 메일링 리스트에 참여하고 있다. 리스트에 등록하고 해지하는</div><div class='del'>-방법에 관한 자세한 사항은 다음에서 참조할 수 있다.</div><div class='del'>-    http://vger.kernel.org/vger-lists.html#linux-kernel</div><div class='del'>-웹상의 많은 다른 곳에도 메일링 리스트의 아카이브들이 있다.</div><div class='del'>-이러한 아카이브들을 찾으려면 검색 엔진을 사용하라. 예를 들어:</div><div class='del'>-      http://dir.gmane.org/gmane.linux.kernel</div><div class='del'>-여러분이 새로운 문제에 관해 리스트에 올리기 전에 말하고 싶은 주제에 관한</div><div class='del'>-것을 아카이브에서 먼저 찾아보기를 강력히 권장한다. 이미 상세하게 토론된 많은</div><div class='del'>-것들이 메일링 리스트의 아카이브에 기록되어 있다.</div><div class='del'>-</div><div class='del'>-각각의 커널 서브시스템들의 대부분은 자신들의 개발에 관한 노력들로 이루어진</div><div class='del'>-분리된 메일링 리스트를 따로 가지고 있다. 다른 그룹들이 무슨 리스트를 가지고</div><div class='del'>-있는지는 MAINTAINERS 파일을 참조하라.</div><div class='del'>-</div><div class='del'>-많은 리스트들은 kernel.org에서 호스트되고 있다. 그 정보들은 다음에서 참조될 수 있다.</div><div class='del'>-         http://vger.kernel.org/vger-lists.html</div><div class='del'>-</div><div class='del'>-리스트들을 사용할 때는 올바른 예절을 따를 것을 유념해라.</div><div class='del'>-대단하진 않지만 다음 URL은 리스트(혹은 모든 리스트)와 대화하는 몇몇 간단한</div><div class='del'>-가이드라인을 가지고 있다.</div><div class='del'>-         http://www.albion.com/netiquette/</div><div class='del'>-</div><div class='del'>-여러 사람들이 여러분의 메일에 응답한다면 CC: 즉 수신 리스트는 꽤 커지게</div><div class='del'>-될 것이다. 아무 이유없이 CC에서 어떤 사람도 제거하거나 리스트 주소로만</div><div class='del'>-회신하지 마라. 메일을 보낸 사람으로서 하나를 받고 리스트로부터 또</div><div class='del'>-하나를 받아 두번 받는 것에 익숙하여 있으니 mail-header를 조작하려고 하지</div><div class='del'>-말아라. 사람들은 그런 것을 좋아하지 않을 것이다.</div><div class='del'>-</div><div class='del'>-여러분의 회신의 문맥을 원래대로 유지해야 한다. 여러분들의 회신의 윗부분에</div><div class='del'>-"John 커널해커는 작성했다...."를 유지하며 여러분들의 의견을 그 메일의 윗부분에</div><div class='del'>-작성하지 말고 각 인용한 단락들 사이에 넣어라.</div><div class='del'>-</div><div class='del'>-여러분들이 패치들을 메일에 넣는다면 그것들은 Documentation/SubmittingPatches에</div><div class='del'>-나와있는데로 명백히(plain) 읽을 수 있는 텍스트여야 한다. 커널 개발자들은</div><div class='del'>-첨부파일이나 압축된 패치들을 원하지 않는다. 그들은 여러분들의 패치의</div><div class='del'>-각 라인 단위로 코멘트를 하길 원하며 압축하거나 첨부하지 않고 보내는 것이</div><div class='del'>-그렇게 할 수 있는 유일한 방법이다. 여러분들이 사용하는 메일 프로그램이</div><div class='del'>-스페이스나 탭 문자들을 조작하지 않는지 확인하라. 가장 좋은 첫 테스트는</div><div class='del'>-메일을 자신에게 보내보고 스스로 그 패치를 적용해보라. 그것이 동작하지</div><div class='del'>-않는다면 여러분의 메일 프로그램을 고치던가 제대로 동작하는 프로그램으로</div><div class='del'>-바꾸어라.</div><div class='del'>-</div><div class='del'>-무엇보다도 메일링 리스트의 다른 구독자들에게 보여주려 한다는 것을 기억하라.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-커뮤니티와 협력하는 법</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-커널 커뮤니티의 목적은 가능한한 가장 좋은 커널을 제공하는 것이다. 여러분이</div><div class='del'>-받아들여질 패치를 제출하게 되면 그 패치의 기술적인 이점으로 검토될 것이다.</div><div class='del'>-그럼 여러분들은 무엇을 기대하고 있어야 하는가?</div><div class='del'>- - 비판</div><div class='del'>- - 의견</div><div class='del'>- - 변경을 위한 요구</div><div class='del'>- - 당위성을 위한 요구</div><div class='del'>- - 침묵</div><div class='del'>-</div><div class='del'>-기억하라. 이것들은 여러분의 패치가 커널로 들어가기 위한 과정이다. 여러분의</div><div class='del'>-패치들은 비판과 다른 의견을 받을 수 있고 그것들을 기술적인 레벨로 평가하고</div><div class='del'>-재작업하거나 또는 왜 수정하면 안되는지에 관하여 명료하고 간결한 이유를</div><div class='del'>-말할 수 있어야 한다. 여러분이 제출한 것에 어떤 응답도 있지 않다면 몇 일을</div><div class='del'>-기다려보고 다시 시도해라. 때론 너무 많은 메일들 속에 묻혀버리기도 한다.</div><div class='del'>-</div><div class='del'>-여러분은 무엇을 해서는 안되는가?</div><div class='del'>- - 여러분의 패치가 아무 질문 없이 받아들여지기를 기대하는 것</div><div class='del'>- - 방어적이 되는 것</div><div class='del'>- - 의견을 무시하는 것</div><div class='del'>- - 요청된 변경을 하지 않고 패치를 다시 제출하는 것</div><div class='del'>-</div><div class='del'>-가능한한 가장 좋은 기술적인 해답을 찾고 있는 커뮤니티에서는 항상</div><div class='del'>-어떤 패치가 얼마나 좋은지에 관하여 다른 의견들이 있을 수 있다. 여러분은</div><div class='del'>-협조적이어야 하고 기꺼이 여러분의 생각을 커널 내에 맞추어야 한다. 아니면</div><div class='del'>-적어도 여러분의 것이 가치있다는 것을 증명하여야 한다. 잘못된 것도 여러분이</div><div class='del'>-올바른 방향의 해결책으로 이끌어갈 의지가 있다면 받아들여질 것이라는 점을</div><div class='del'>-기억하라.</div><div class='del'>-</div><div class='del'>-여러분의 첫 패치에 여러분이 수정해야하는 십여개 정도의 회신이 오는</div><div class='del'>-경우도 흔하다. 이것은 여러분의 패치가 받아들여지지 않을 것이라는 것을</div><div class='del'>-의미하는 것이 아니고 개인적으로 여러분에게 감정이 있어서 그러는 것도</div><div class='del'>-아니다. 간단히 여러분의 패치에 제기된 문제들을 수정하고 그것을 다시</div><div class='del'>-보내라.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-커널 커뮤니티와 기업 조직간의 차이점</div><div class='del'>------------------------------------------------------------------</div><div class='del'>-커널 커뮤니티는 가장 전통적인 회사의 개발 환경과는 다르다. 여기에 여러분들의</div><div class='del'>-문제를 피하기 위한 목록이 있다.</div><div class='del'>-  여러분들이 제안한 변경들에 관하여 말할 때 좋은 것들 :</div><div class='del'>-    - "이것은 여러 문제들을 해결합니다."</div><div class='del'>-    - "이것은 2000 라인의 코드를 줄입니다."</div><div class='del'>-    - "이것은 내가 말하려는 것에 관해 설명하는 패치입니다."</div><div class='del'>-    - "나는 5개의 다른 아키텍쳐에서 그것을 테스트 했으므로..."</div><div class='del'>-    - "여기에 일련의 작은 패치들이 있으므로..."</div><div class='del'>-    - "이것은 일반적인 머신에서 성능을 향상함으로..."</div><div class='del'>-</div><div class='del'>-  여러분들이 말할 때 피해야 할 좋지 않은 것들 :</div><div class='del'>-    - "우리는 그것을 AIX/ptx/Solaris에서 이러한 방법으로 했다. 그러므로 그것은 좋은 것임에 틀림없다..."</div><div class='del'>-    - "나는 20년동안 이것을 해왔다. 그러므로..."</div><div class='del'>-    - "이것은 돈을 벌기위해 나의 회사가 필요로 하는 것이다."</div><div class='del'>-    - "이것은 우리의 엔터프라이즈 상품 라인을 위한 것이다."</div><div class='del'>-    - "여기에 나의 생각을 말하고 있는 1000 페이지 설계 문서가 있다."</div><div class='del'>-    - "나는 6달동안 이것을 했으니..."</div><div class='del'>-    - "여기에 5000 라인 짜리 패치가 있으니..."</div><div class='del'>-    - "나는 현재 뒤죽박죽인 것을 재작성했다. 그리고 여기에..."</div><div class='del'>-    - "나는 마감시한을 가지고 있으므로 이 패치는 지금 적용될 필요가 있다."</div><div class='del'>-</div><div class='del'>-커널 커뮤니티가 전통적인 소프트웨어 엔지니어링 개발 환경들과</div><div class='del'>-또 다른 점은 얼굴을 보지 않고 일한다는 점이다. 이메일과 irc를 대화의</div><div class='del'>-주요수단으로 사용하는 것의 한가지 장점은 성별이나 인종의 차별이</div><div class='del'>-없다는 것이다. 리눅스 커널의 작업 환경에서는 단지 이메일 주소만</div><div class='del'>-알수 있기 때문에 여성과 소수 민족들도 모두 받아들여진다. 국제적으로</div><div class='del'>-일하게 되는 측면은 사람의 이름에 근거하여 성별을 추측할 수 없게</div><div class='del'>-하기때문에 차별을 없애는 데 도움을 준다. Andrea라는 이름을 가진 남자와</div><div class='del'>-Pat이라는 이름을 가진 여자가 있을 수도 있는 것이다. 리눅스 커널에서</div><div class='del'>-작업하며 생각을 표현해왔던 대부분의 여성들은 긍정적인 경험을 가지고</div><div class='del'>-있다.</div><div class='del'>-</div><div class='del'>-언어 장벽은 영어에 익숙하지 않은 몇몇 사람들에게 문제가 될 수도 있다.</div><div class='del'>-언어의 훌륭한 구사는 메일링 리스트에서 올바르게 자신의 생각을</div><div class='del'>-표현하기 위하여 필요하다. 그래서 여러분은 이메일을 보내기 전에</div><div class='del'>-영어를 올바르게 사용하고 있는지를 체크하는 것이 바람직하다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-여러분의 변경을 나누어라</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-리눅스 커널 커뮤니티는 한꺼번에 굉장히 큰 코드의 묶음(chunk)을 쉽게</div><div class='del'>-받아들이지 않는다. 변경은 적절하게 소개되고, 검토되고, 각각의</div><div class='del'>-부분으로 작게 나누어져야 한다. 이것은 회사에서 하는 것과는 정확히</div><div class='del'>-반대되는 것이다. 여러분들의 제안은 개발 초기에 일찍이 소개되야 한다.</div><div class='del'>-그래서 여러분들은 자신이 하고 있는 것에 관하여 피드백을 받을 수 있게</div><div class='del'>-된다. 커뮤니티가 여러분들이 커뮤니티와 함께 일하고 있다는 것을</div><div class='del'>-느끼도록 만들고 커뮤니티가 여러분의 기능을 위한 쓰레기 장으로써</div><div class='del'>-사용되지 않고 있다는 것을 느끼게 하자. 그러나 메일링 리스트에 한번에</div><div class='del'>-50개의 이메일을 보내지는 말아라. 여러분들의 일련의 패치들은 항상</div><div class='del'>-더 작아야 한다.</div><div class='del'>-</div><div class='del'>-패치를 나누는 이유는 다음과 같다.</div><div class='del'>-</div><div class='del'>-1) 작은 패치들은 여러분의 패치들이 적용될 수 있는 확률을 높여준다.</div><div class='del'>-   왜냐하면 다른 사람들은 정확성을 검증하기 위하여 많은 시간과 노력을</div><div class='del'>-   들이기를 원하지 않는다. 5줄의 패치는 메인테이너가 거의 몇 초간 힐끗</div><div class='del'>-   보면 적용될 수 있다. 그러나 500 줄의 패치는 정확성을 검토하기 위하여</div><div class='del'>-   몇시간이 걸릴 수도 있다(걸리는 시간은 패치의 크기 혹은 다른 것에</div><div class='del'>-   비례하여 기하급수적으로 늘어난다).</div><div class='del'>-</div><div class='del'>-   패치를 작게 만드는 것은 무엇인가 잘못되었을 때 디버그하는 것을</div><div class='del'>-   쉽게 만든다. 즉, 그렇게 만드는 것은 매우 큰 패치를 적용한 후에</div><div class='del'>-   조사하는 것 보다 작은 패치를 적용한 후에 (그리고 몇몇의 것이</div><div class='del'>-   깨졌을 때) 하나씩 패치들을 제거해가며 디버그 하기 쉽도록 만들어 준다.</div><div class='del'>-</div><div class='del'>-2) 작은 패치들을 보내는 것뿐만 아니라 패치들을 제출하기전에 재작성하고</div><div class='del'>-   간단하게(혹은 간단한게 재배치하여) 하는 것도 중요하다.</div><div class='del'>-</div><div class='del'>-여기에 커널 개발자 Al Viro의 이야기가 있다.</div><div class='del'>-    "학생의 수학 숙제를 채점하는 선생님을 생각해보라. 선생님은 학생들이</div><div class='del'>-    답을 얻을때까지 겪은 시행착오를 보길 원하지 않는다. 선생님들은</div><div class='del'>-    간결하고 가장 뛰어난 답을 보길 원한다. 훌륭한 학생은 이것을 알고</div><div class='del'>-    마지막으로 답을 얻기 전 중간 과정들을 제출하진 않는다.</div><div class='del'>-</div><div class='del'>-    커널 개발도 마찬가지이다. 메인테이너들과 검토하는 사람들은 문제를</div><div class='del'>-    풀어나가는 과정속에 숨겨진 과정을 보길 원하진 않는다. 그들은</div><div class='del'>-    간결하고 멋진 답을 보길 원한다."</div><div class='del'>-</div><div class='del'>-커뮤니티와 협력하며 뛰어난 답을 찾는 것과 여러분들의 끝마치지 못한 작업들</div><div class='del'>-사이에 균형을 유지해야 하는 것은 어려울지도 모른다. 그러므로 프로세스의</div><div class='del'>-초반에 여러분의 작업을 향상시키기위한 피드백을 얻는 것 뿐만 아니라</div><div class='del'>-여러분들의 변경들을 작은 묶음으로 유지해서 심지어는 여러분의 작업의</div><div class='del'>-모든 부분이 지금은 포함될 준비가 되어있지 않지만 작은 부분은 벌써</div><div class='del'>-받아들여질 수 있도록 유지하는 것이 바람직하다.</div><div class='del'>-</div><div class='del'>-또한 완성되지 않았고 "나중에 수정될 것이다." 와 같은 것들을 포함하는</div><div class='del'>-패치들은 받아들여지지 않을 것이라는 점을 유념하라.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-변경을 정당화해라</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-여러분들의 나누어진 패치들을 리눅스 커뮤니티가 왜 반영해야 하는지를</div><div class='del'>-알도록 하는 것은 매우 중요하다. 새로운 기능들이 필요하고 유용하다는</div><div class='del'>-것은 반드시 그에 합당한 이유가 있어야 한다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-변경을 문서화해라</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-여러분이 패치를 보내려 할때는 여러분이 무엇을 말하려고 하는지를 충분히</div><div class='del'>-생각하여 이메일을 작성해야 한다. 이 정보는 패치를 위한 ChangeLog가 될</div><div class='del'>-것이다. 그리고 항상 그 내용을 보길 원하는 모든 사람들을 위해 보존될</div><div class='del'>-것이다. 패치는 완벽하게 다음과 같은 내용들을 포함하여 설명해야 한다.</div><div class='del'>-  - 변경이 왜 필요한지</div><div class='del'>-  - 패치에 관한 전체 설계 접근(approach)</div><div class='del'>-  - 구현 상세들</div><div class='del'>-  - 테스트 결과들</div><div class='del'>-</div><div class='del'>-이것이 무엇인지 더 자세한 것을 알고 싶다면 다음 문서의 ChageLog 항을 봐라.</div><div class='del'>-   "The Perfect Patch"</div><div class='del'>-    http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-이 모든 것을 하는 것은 매우 어려운 일이다. 완벽히 소화하는 데는 적어도 몇년이</div><div class='del'>-걸릴 수도 있다. 많은 인내와 결심이 필요한 계속되는 개선의 과정이다. 그러나</div><div class='del'>-가능한한 포기하지 말라. 많은 사람들은 이전부터 해왔던 것이고 그 사람들도</div><div class='del'>-정확하게 여러분들이 지금 서 있는 그 곳부터  시작했었다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-----------</div><div class='del'>-"개발 프로세스"(http://lwn.net/Articles/94386/) 섹션을</div><div class='del'>-작성하는데 있어 참고할 문서를 사용하도록 허락해준 Paolo Ciarrocchi에게</div><div class='del'>-감사한다. 여러분들이 말해야 할 것과 말해서는 안되는 것의 목록 중 일부를 제공해준</div><div class='del'>-Randy Dunlap과 Gerrit Huizenga에게 감사한다. 또한 검토와 의견 그리고</div><div class='del'>-공헌을 아끼지 않은 Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,</div><div class='del'>-Vojtech Pavlik, Jan Kara, Josh Boyer, Kees Cook, Andrew Morton, Andi Kleen,</div><div class='del'>-Vadim Lobanov, Jesper Juhl, Adrian Bunk, Keri Harris, Frans Pop,</div><div class='del'>-David A. Wheeler, Junio Hamano, Michael Kerrisk, and Alex Shepard에게도 감사를 전한다.</div><div class='del'>-그들의 도움이 없었다면 이 문서는 존재하지 않았을 것이다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-메인테이너: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/Documentation/ko_KR/stable_api_nonsense.txt b/Documentation/ko_KR/stable_api_nonsense.txt<br/>deleted file mode 100644<br/>index 3ba10b11d556..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/ko_KR/stable_api_nonsense.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ko_KR/stable_api_nonsense.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,195 +0,0 @@</div><div class='del'>-NOTE:</div><div class='del'>-This is a version of Documentation/stable_api_nonsense.txt translated</div><div class='del'>-into korean</div><div class='del'>-This document is maintained by Minchan Kim &lt;minchan@kernel.org&gt;</div><div class='del'>-If you find any difference between this document and the original file or</div><div class='del'>-a problem with the translation, please contact the maintainer of this file.</div><div class='del'>-</div><div class='del'>-Please also note that the purpose of this file is to be easier to</div><div class='del'>-read for non English (read: korean) speakers and is not intended as</div><div class='del'>-a fork. So if you have any comments or updates for this file please</div><div class='del'>-try to update the original English file first.</div><div class='del'>-</div><div class='del'>-==================================</div><div class='del'>-이 문서는</div><div class='del'>-Documentation/stable_api_nonsense.txt</div><div class='del'>-의 한글 번역입니다.</div><div class='del'>-</div><div class='del'>-역자： 김민찬 &lt;minchan@kernel.org&gt;</div><div class='del'>-감수： 이제이미 &lt;jamee.lee@samsung.com&gt;</div><div class='del'>-==================================</div><div class='del'>-</div><div class='del'>-리눅스 커널 드라이버 인터페이스</div><div class='del'>-(여러분들의 모든 질문에 대한 답 그리고 다른 몇가지)</div><div class='del'>-</div><div class='del'>-Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='del'>-</div><div class='del'>-이 문서는 리눅스가 왜 바이너리 커널 인터페이스를 갖지 않는지, 왜 변하지</div><div class='del'>-않는(stable) 커널 인터페이스를 갖지 않는지를 설명하기 위해 쓰여졌다.</div><div class='del'>-이 문서는 커널과 유저공간 사이의 인터페이스가 아니라 커널 내부의</div><div class='del'>-인터페이스들을 설명하고 있다는 것을 유념하라. 커널과 유저공간 사이의</div><div class='del'>-인터페이스는 응용프로그램이 사용하는 syscall 인터페이스이다. 그 인터페이스는</div><div class='del'>-오랫동안 거의 변하지 않았고 앞으로도 변하지 않을 것이다. 나는 pre 0.9에서</div><div class='del'>-만들어졌지만 최신의 2.6 커널 배포에서도 잘 동작하는 프로그램을 가지고</div><div class='del'>-있다. 이 인터페이스는 사용자와 응용프로그램 개발자들이 변하지 않을 것이라고</div><div class='del'>-여길수 있는 것이다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-초록</div><div class='del'>-----</div><div class='del'>-여러분은 변하지 않는 커널 인터페이스를 원한다고 생각하지만 실제로는</div><div class='del'>-그렇지 않으며 심지어는 그것을 알아채지 못한다. 여러분이 원하는 것은</div><div class='del'>-안정되게 실행되는 드라이버이며 드라이버가 메인 커널 트리에 있을 때</div><div class='del'>-그런 안정적인 드라이버를 얻을 수 있게 된다. 또한 여러분의 드라이버가</div><div class='del'>-메인 커널 트리에 있다면 다른 많은 좋은 이점들을 얻게 된다. 그러한 것들이</div><div class='del'>-리눅스를 강건하고, 안정적이며, 성숙한 운영체제로 만들어 놓음으로써</div><div class='del'>-여러분들로 하여금 바로 리눅스를 사용하게 만드는 이유이다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-소개</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-커널 내부의 인터페이스가 바뀌는 것을 걱정하며 커널 드라이버를 작성하고</div><div class='del'>-싶어하는 사람은 정말 이상한 사람이다. 세상의 대다수의 사람들은 이 인터페이스를</div><div class='del'>-보지못할 것이며 전혀 걱정하지도 않는다.</div><div class='del'>-</div><div class='del'>-먼저, 나는 closed 소스, hidden 소스, binary blobs, 소스 wrappers, 또는 GPL로</div><div class='del'>-배포되었지만 소스 코드를 갖고 있지 않은 커널 드라이버들을 설명하는 어떤 다른</div><div class='del'>-용어들에 관한 어떤 법적인 문제에 관해서는 언급하지 않을 것이다. 어떤 법적인</div><div class='del'>-질문들을 가지고 있다면 변호사와 연락하라. 나는 프로그래머이므로 여기서 기술적인</div><div class='del'>-문제들만을 설명하려고 한다. (법적인 문제를 경시하는 것은 아니다. 그런 문제들은</div><div class='del'>-엄연히 현실에 있고 여러분들은 항상 그 문제들을 인식하고 있을 필요는 있다.)</div><div class='del'>-</div><div class='del'>-자, 두가지의 주요 주제가 있다. 바이너리 커널 인터페이스들과 변하지 않는</div><div class='del'>-커널 소스 인터페이들. 그것들은 서로 의존성을 가지고 있지만 바이너리</div><div class='del'>-문제를 먼저 풀고 넘어갈 것이다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-바이너리 커널 인터페이스</div><div class='del'>-------------------------</div><div class='del'>-우리가 변하지 않는 커널 소스 인터페이스를 가지고 있다고 가정하자. 그러면</div><div class='del'>-바이너리 인터페이스 또한 자연적으로 변하지 않을까? 틀렸다. 리눅스 커널에</div><div class='del'>-관한 다음 사실들을 생각해보라.</div><div class='del'>-   - 여러분들이 사용하는 C 컴파일러의 버젼에 따라 다른 커널 자료 구조들은</div><div class='del'>-     다른 alignmnet들을 갖게 될것이고 다른 방법으로(함수들을 inline으로</div><div class='del'>-     했느냐, 아니냐) 다른 함수들을 포함하는 것도 가능한다. 중요한 것은</div><div class='del'>-     개별적인 함수 구성이 아니라 자료 구조 패딩이 달라진다는 점이다.</div><div class='del'>-   - 여러분이 선택한 커널 빌드 옵션에 따라서 커널은 다양한 것들을 가정할</div><div class='del'>-     수 있다.</div><div class='del'>-      - 다른 구조체들은 다른 필드들을 포함할 수 있다.</div><div class='del'>-      - 몇몇 함수들은 전혀 구현되지 않을 수도 있다(즉, 몇몇 lock들은</div><div class='del'>-        non-SMP 빌드에서는 사라져 버릴수도 있다).</div><div class='del'>-      - 커널내에 메모리는 build optoin들에 따라 다른 방법으로 align될수</div><div class='del'>-        있다.</div><div class='del'>-      - 리눅스는 많은 다양한 프로세서 아키텍쳐에서 실행된다. 한 아키텍쳐의</div><div class='del'>-        바이너리 드라이버를 다른 아키텍쳐에서 정상적으로 실행시킬 방법은</div><div class='del'>-        없다.</div><div class='del'>-</div><div class='del'>-커널을 빌드했던 C 컴파일러와 정확하게 같은 것을 사용하고 정확하게 같은</div><div class='del'>-커널 구성(configuration)을 사용하여 여러분들의 모듈을 빌드하면 간단히</div><div class='del'>-많은 문제들을 해결할 수 있다. 이렇게 하는 것은 여러분들이 하나의 리눅스</div><div class='del'>-배포판의 하나의 배포 버젼을 위한 모듈만을 제공한다면 별일 아닐 것이다.</div><div class='del'>-그러나 각기 다른 리눅스 배포판마다 한번씩 빌드하는 수를 각 리눅스 배포판마다</div><div class='del'>-제공하는 다른 릴리즈의 수와 곱하게 되면 이번에는 각 릴리즈들의 다른 빌드</div><div class='del'>-옵션의 악몽과 마주하게  것이다. 또한 각 리눅스 배포판들은 다른 하드웨어</div><div class='del'>-종류에(다른 프로세서 타입과 다른 옵션들) 맞춰져 있는 많은 다른 커널들을</div><div class='del'>-배포한다. 그러므로 한번의 배포에서조차 여러분들의 모듈은 여러 버젼을</div><div class='del'>-만들 필요가 있다.</div><div class='del'>-</div><div class='del'>-나를 믿어라. 여러분들은 이러한 종류의 배포를 지원하려고 시도한다면 시간이</div><div class='del'>-지나면 미칠지경이 될 것이다. 난 이러한 것을 오래전에 아주 어렵게 배웠다...</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-변하지않는 커널 소스 인터페이스들</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-리눅스 커널 드라이버를 계속해서 메인 커널 트리에 반영하지 않고</div><div class='del'>-유지보수하려고 하는 사람들과 이 문제를 논의하게 되면 훨씬 더</div><div class='del'>-"논란의 여지가 많은" 주제가 될 것이다.</div><div class='del'>-</div><div class='del'>-리눅스 커널 개발은 끊임없이 빠른 속도로 이루어지고 있으며 결코</div><div class='del'>-느슨해진 적이 없다. 커널 개발자들이 현재 인터페이스들에서 버그를</div><div class='del'>-발견하거나 무엇인가 할 수 있는 더 좋은 방법을 찾게 되었다고 하자.</div><div class='del'>-그들이 발견한 것을 실행한다면 아마도 더 잘 동작하도록 현재 인터페이스들을</div><div class='del'>-수정하게 될 것이다. 그들이 그런 일을 하게되면 함수 이름들은 변하게 되고,</div><div class='del'>-구조체들은 늘어나거나 줄어들게 되고, 함수 파라미터들은 재작업될 것이다.</div><div class='del'>-이러한 일이 발생되면 커널 내에 이 인터페이스를 사용했던 인스턴스들이 동시에</div><div class='del'>-수정될 것이며 이러한 과정은 모든 것이 계속해서 올바르게 동작할 것이라는</div><div class='del'>-것을 보장한다.</div><div class='del'>-</div><div class='del'>-이러한 것의 한 예로써, 커널 내부의 USB 인터페이스들은 이 서브시스템이</div><div class='del'>-생긴 이후로 적어도 3번의 다른 재작업을 겪었다. 이 재작업들은 많은 다른</div><div class='del'>-문제들을 풀었다.</div><div class='del'>-   - 데이터 스트림들의 동기적인 모델에서 비동기적인 모델로의 변화. 이것은</div><div class='del'>-     많은 드라이버들의 복잡성을 줄이고 처리량을 향상시켜 현재는 거의 모든</div><div class='del'>-     USB 장치들의 거의 최대 속도로 실행되고 있다.</div><div class='del'>-   - USB 드라이버가 USB 코어로부터 데이터 패킷들을 할당받로록 한 변경으로</div><div class='del'>-     인해서 지금의 모든 드라이버들은 많은 문서화된 데드락을 수정하기 위하여</div><div class='del'>-     USB 코어에게 더 많은 정보를 제공해야만 한다.</div><div class='del'>-</div><div class='del'>-이것은 오랫동안 자신의 오래된 USB 인터페이스들을 유지해야 하는 closed 운영체제들과는</div><div class='del'>-완전히 반대되는 것이다. closed된 운영체제들은 새로운 개발자들에게 우연히 낡은</div><div class='del'>-인터페이스를 사용하게 할 기회를 주게되며, 적절하지 못한 방법으로 처리하게 되어</div><div class='del'>-운영체제의 안정성을 해치는 문제를 야기하게 된다.</div><div class='del'>-</div><div class='del'>-이 두가지의 예들 모두, 모든 개발자들은 꼭 이루어져야 하는 중요한 변화들이라고</div><div class='del'>-동의를 하였고 비교적 적은 고통으로 변경되어졌다. 리눅스가 변하지 않는 소스</div><div class='del'>-인터페이스를 고집한다면, 새로운 인터페이스가 만들어지게 되며 반면 기존의 오래된</div><div class='del'>-것들, 그리고 깨진 것들은 계속해서 유지되어야 하며 이러한 일들은 USB 개발자들에게</div><div class='del'>-또 다른 일거리를 주게 된다. 모든 리눅스 USB 개발자들에게 자신의 그들의 업무를</div><div class='del'>-마친 후 시간을 투자하여 아무 득도 없는 무료 봉사를 해달라고 하는 것은 가능성이</div><div class='del'>-희박한 일이다.</div><div class='del'>-</div><div class='del'>-보안 문제 역시 리눅스에게는 매우 중요하다. 보안 문제가 발견되면 그것은</div><div class='del'>-매우 짧은 시간 안에 수정된다. 보안 문제는 그 문제를 해결하기 위하여</div><div class='del'>-여러번 내부 커널 인터페이스들을 재작업하게 만들었다. 이러한 문제가</div><div class='del'>-발생하였을 때 그 인터페이스들을 사용하는 모든 드라이버들도 동시에</div><div class='del'>-수정되어 보안 문제가 앞으로 갑작스럽게 생기지는 않을 것이라는 것을</div><div class='del'>-보장한다. 내부 인터페이스들의 변경이 허락되지 않으면 이러한 종류의 보안</div><div class='del'>-문제를 수정하고 그것이 다시 발생하지 않을 것이라고 보장하는 것은 가능하지</div><div class='del'>-않을 것이다.</div><div class='del'>-</div><div class='del'>-커널 인터페이스들은 계속해서 정리되고 있다. 현재 인터페이스를 사용하는</div><div class='del'>-사람이 한명도 없다면 그것은 삭제된다. 이것은 커널이 가능한한 가장 작게</div><div class='del'>-유지되며 존재하는 모든 가능성이 있는 인터페이스들이 테스트된다는 것을</div><div class='del'>-보장한다(사용되지 않는 인터페이스들은 유효성 검증을 하기가 거의 불가능하다).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-무엇을 해야 하나</div><div class='del'>----------------</div><div class='del'>-자, 여러분이 메인 커널 트리에 있지 않은 리눅스 커널 드라이버를 가지고</div><div class='del'>-있다면 여러분은 즉, 개발자는 무엇을 해야 하나? 모든 배포판마다 다른</div><div class='del'>-커널 버젼을 위한 바이너리 드라이버를 배포하는 것은 악몽이며 계속해서</div><div class='del'>-변하고 있는 커널 인터페이스들의 맞처 유지보수하려고 시도하는 것은 힘든</div><div class='del'>-일이다.</div><div class='del'>-</div><div class='del'>-간단하다. 여러분의 커널 드라이버를 메인 커널 트리에 반영하라(우리는 여기서</div><div class='del'>-GPL을 따르는 배포 드라이버에 관해 얘기하고 있다는 것을 상기하라. 여러분의</div><div class='del'>-코드가 이러한 분류에 해당되지 않는다면 행운을 빈다. 여러분 스스로 어떻게든</div><div class='del'>-해야만 한다). 여러분의 드라이버가 트리에 있게되면 커널 인터페이스가</div><div class='del'>-변경되더라도 가장 먼저 커널에 변경을 가했던 사람에 의해서 수정될 것이다.</div><div class='del'>-이것은 여러분의 드라이버가 여러분의 별다른 노력없이 항상 빌드가 가능하며</div><div class='del'>-동작하는 것을 보장한다.</div><div class='del'>-</div><div class='del'>-메인 커널 트리에 여러분의 드라이버를 반영하면 얻게 되는 장점들은 다음과 같다.</div><div class='del'>-   - 관리에 드는 비용(원래 개발자의)은 줄어줄면서 드라이버의 질은 향상될 것이다.</div><div class='del'>-   - 다른 개발자들이 여러분의 드라이버에 기능들을 추가 할 것이다.</div><div class='del'>-   - 다른 사람들은 여러분의 드라이버에 버그를 발견하고 수정할 것이다.</div><div class='del'>-   - 다른 사람들은 여러분의 드라이버의 개선점을 찾을 줄 것이다.</div><div class='del'>-   - 외부 인터페이스 변경으로 인해 여러분의 드라이버의 수정이 필요하다면 다른</div><div class='del'>-     사람들이 드라이버를 업데이트할 것이다.</div><div class='del'>-   - 여러분의 드라이버는 별다른 노력 없이 모든 리눅스 배포판에  자동적으로</div><div class='del'>-     추가될 것이다.</div><div class='del'>-</div><div class='del'>-리눅스는 다른 운영 체제보다 "쉽게 쓸수 있는(out of the box)" 많은 다른 장치들을</div><div class='del'>-지원하고 어떤 다른 운영 체제보다 다양한 아키텍쳐위에서 이러한 장치들을 지원하기 때문에</div><div class='del'>-이러한 증명된 개발 모델은 틀림없이 바로 가고 있는 것이다.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-이 문서의 초안을 검토해주고 코멘트 해준 Randy Dunlap, Andrew Morton, David Brownell,</div><div class='del'>-Hanna Linder, Robert Love, 그리고 Nishanth Aravamudan에게 감사한다.</div><div class='head'>diff --git a/Documentation/kselftest.txt b/Documentation/kselftest.txt<br/>index 54bee77fa728..5bd590335839 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/kselftest.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/kselftest.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/kselftest.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/kselftest.txt</a></div><div class='hunk'>@@ -59,17 +59,28 @@ Install selftests</div><div class='ctx'> =================</div><div class='ctx'> </div><div class='ctx'> You can use kselftest_install.sh tool installs selftests in default</div><div class='del'>-location which is tools/testing/selftests/kselftest or an user specified</div><div class='add'>+location which is tools/testing/selftests/kselftest or a user specified</div><div class='ctx'> location.</div><div class='ctx'> </div><div class='ctx'> To install selftests in default location:</div><div class='ctx'>    $ cd tools/testing/selftests</div><div class='ctx'>    $ ./kselftest_install.sh</div><div class='ctx'> </div><div class='del'>-To install selftests in an user specified location:</div><div class='add'>+To install selftests in a user specified location:</div><div class='ctx'>    $ cd tools/testing/selftests</div><div class='ctx'>    $ ./kselftest_install.sh install_dir</div><div class='ctx'> </div><div class='add'>+Running installed selftests</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+Kselftest install as well as the Kselftest tarball provide a script</div><div class='add'>+named "run_kselftest.sh" to run the tests.</div><div class='add'>+</div><div class='add'>+You can simply do the following to run the installed Kselftests. Please</div><div class='add'>+note some tests will require root privileges.</div><div class='add'>+</div><div class='add'>+cd kselftest</div><div class='add'>+./run_kselftest.sh</div><div class='ctx'> </div><div class='ctx'> Contributing new tests</div><div class='ctx'> ======================</div><div class='hunk'>@@ -84,3 +95,15 @@ In general, the rules for selftests are</div><div class='ctx'> </div><div class='ctx'>  * Don't cause the top-level "make run_tests" to fail if your feature is</div><div class='ctx'>    unconfigured.</div><div class='add'>+</div><div class='add'>+Contributing new tests(details)</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+ * Use TEST_GEN_XXX if such binaries or files are generated during</div><div class='add'>+   compiling.</div><div class='add'>+   TEST_PROGS, TEST_GEN_PROGS mean it is the excutable tested by</div><div class='add'>+   default.</div><div class='add'>+   TEST_PROGS_EXTENDED, TEST_GEN_PROGS_EXTENDED mean it is the</div><div class='add'>+   executable which is not tested by default.</div><div class='add'>+   TEST_FILES, TEST_GEN_FILES mean it is the file which is used by</div><div class='add'>+   test.</div><div class='head'>diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt<br/>index 72a150d8f3df..ba2e7d254842 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/laptops/thinkpad-acpi.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/laptops/thinkpad-acpi.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/laptops/thinkpad-acpi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/laptops/thinkpad-acpi.txt</a></div><div class='hunk'>@@ -540,6 +540,7 @@ Events that are propagated by the driver to userspace:</div><div class='ctx'> 0x6022		ALARM: a sensor is extremely hot</div><div class='ctx'> 0x6030		System thermal table changed</div><div class='ctx'> 0x6040		Nvidia Optimus/AC adapter related (TO BE VERIFIED)</div><div class='add'>+0x60C0		X1 Yoga 2016, Tablet mode status changed</div><div class='ctx'> </div><div class='ctx'> Battery nearly empty alarms are a last resort attempt to get the</div><div class='ctx'> operating system to hibernate or shutdown cleanly (0x2313), or shutdown</div><div class='head'>diff --git a/Documentation/leds/leds-class.txt b/Documentation/leds/leds-class.txt<br/>index f1f7ec9f5cc5..836cb16d6f09 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/leds/leds-class.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/leds/leds-class.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/leds/leds-class.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/leds/leds-class.txt</a></div><div class='hunk'>@@ -65,6 +65,21 @@ LED subsystem core exposes following API for setting brightness:</div><div class='ctx'> 		blinking, returns -EBUSY if software blink fallback is enabled.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+LED registration API</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+A driver wanting to register a LED classdev for use by other drivers /</div><div class='add'>+userspace needs to allocate and fill a led_classdev struct and then call</div><div class='add'>+[devm_]led_classdev_register. If the non devm version is used the driver</div><div class='add'>+must call led_classdev_unregister from its remove function before</div><div class='add'>+free-ing the led_classdev struct.</div><div class='add'>+</div><div class='add'>+If the driver can detect hardware initiated brightness changes and thus</div><div class='add'>+wants to have a brightness_hw_changed attribute then the LED_BRIGHT_HW_CHANGED</div><div class='add'>+flag must be set in flags before registering. Calling</div><div class='add'>+led_classdev_notify_brightness_hw_changed on a classdev not registered with</div><div class='add'>+the LED_BRIGHT_HW_CHANGED flag is a bug and will trigger a WARN_ON.</div><div class='add'>+</div><div class='ctx'> Hardware accelerated blink of LEDs</div><div class='ctx'> ==================================</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/leds/leds-lp5523.txt b/Documentation/leds/leds-lp5523.txt<br/>index 0dbbd279c9b9..0961a060fc4d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/leds/leds-lp5523.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/leds/leds-lp5523.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/leds/leds-lp5523.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/leds/leds-lp5523.txt</a></div><div class='hunk'>@@ -34,8 +34,8 @@ There are two ways to run LED patterns.</div><div class='ctx'>   Control interface for the engines:</div><div class='ctx'>   x is 1 .. 3</div><div class='ctx'>   enginex_mode : disabled, load, run</div><div class='del'>-  enginex_load : microcode load (visible only in load mode)</div><div class='del'>-  enginex_leds : led mux control (visible only in load mode)</div><div class='add'>+  enginex_load : microcode load</div><div class='add'>+  enginex_leds : led mux control</div><div class='ctx'> </div><div class='ctx'>   cd /sys/class/leds/lp5523:channel2/device</div><div class='ctx'>   echo "load" &gt; engine3_mode</div><div class='head'>diff --git a/Documentation/leds/uleds.txt b/Documentation/leds/uleds.txt<br/>new file mode 100644<br/>index 000000000000..13e375a580f9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/leds/uleds.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/leds/uleds.txt</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+Userspace LEDs</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+The uleds driver supports userspace LEDs. This can be useful for testing</div><div class='add'>+triggers and can also be used to implement virtual LEDs.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Usage</div><div class='add'>+=====</div><div class='add'>+</div><div class='add'>+When the driver is loaded, a character device is created at /dev/uleds. To</div><div class='add'>+create a new LED class device, open /dev/uleds and write a uleds_user_dev</div><div class='add'>+structure to it (found in kernel public header file linux/uleds.h).</div><div class='add'>+</div><div class='add'>+    #define LED_MAX_NAME_SIZE 64</div><div class='add'>+</div><div class='add'>+    struct uleds_user_dev {</div><div class='add'>+        char name[LED_MAX_NAME_SIZE];</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+A new LED class device will be created with the name given. The name can be</div><div class='add'>+any valid sysfs device node name, but consider using the LED class naming</div><div class='add'>+convention of "devicename:color:function".</div><div class='add'>+</div><div class='add'>+The current brightness is found by reading a single byte from the character</div><div class='add'>+device. Values are unsigned: 0 to 255. Reading will block until the brightness</div><div class='add'>+changes. The device node can also be polled to notify when the brightness value</div><div class='add'>+changes.</div><div class='add'>+</div><div class='add'>+The LED class device will be removed when the open file handle to /dev/uleds</div><div class='add'>+is closed.</div><div class='add'>+</div><div class='add'>+Multiple LED class devices are created by opening additional file handles to</div><div class='add'>+/dev/uleds.</div><div class='add'>+</div><div class='add'>+See tools/leds/uledmon.c for an example userspace program.</div><div class='head'>diff --git a/Documentation/livepatch/livepatch.txt b/Documentation/livepatch/livepatch.txt<br/>index 6c43f6ebee8d..9d2096c7160d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/livepatch/livepatch.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/livepatch/livepatch.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/livepatch/livepatch.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/livepatch/livepatch.txt</a></div><div class='hunk'>@@ -87,7 +87,7 @@ The theory about how to apply functions a safe way is rather complex.</div><div class='ctx'> The aim is to define a so-called consistency model. It attempts to define</div><div class='ctx'> conditions when the new implementation could be used so that the system</div><div class='ctx'> stays consistent. The theory is not yet finished. See the discussion at</div><div class='del'>-http://thread.gmane.org/gmane.linux.kernel/1823033/focus=1828189</div><div class='add'>+https://lkml.kernel.org/r/20141107140458.GA21774@suse.cz</div><div class='ctx'> </div><div class='ctx'> The current consistency model is very simple. It guarantees that either</div><div class='ctx'> the old or the new function is called. But various functions get redirected</div><div class='hunk'>@@ -329,25 +329,6 @@ The current Livepatch implementation has several limitations:</div><div class='ctx'>     by "notrace".</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-  + Anything inlined into __schedule() can not be patched.</div><div class='del'>-</div><div class='del'>-    The switch_to macro is inlined into __schedule(). It switches the</div><div class='del'>-    context between two processes in the middle of the macro. It does</div><div class='del'>-    not save RIP in x86_64 version (contrary to 32-bit version). Instead,</div><div class='del'>-    the currently used __schedule()/switch_to() handles both processes.</div><div class='del'>-</div><div class='del'>-    Now, let's have two different tasks. One calls the original</div><div class='del'>-    __schedule(), its registers are stored in a defined order and it</div><div class='del'>-    goes to sleep in the switch_to macro and some other task is restored</div><div class='del'>-    using the original __schedule(). Then there is the second task which</div><div class='del'>-    calls patched__schedule(), it goes to sleep there and the first task</div><div class='del'>-    is picked by the patched__schedule(). Its RSP is restored and now</div><div class='del'>-    the registers should be restored as well. But the order is different</div><div class='del'>-    in the new patched__schedule(), so...</div><div class='del'>-</div><div class='del'>-    There is work in progress to remove this limitation.</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'>   + Livepatch modules can not be removed.</div><div class='ctx'> </div><div class='ctx'>     The current implementation just redirects the functions at the very</div><div class='hunk'>@@ -377,7 +358,7 @@ The current Livepatch implementation has several limitations:</div><div class='ctx'>     Each function has to handle TOC and save LR before it could call</div><div class='ctx'>     the ftrace handler. This operation has to be reverted on return.</div><div class='ctx'>     Fortunately, the generic ftrace code has the same problem and all</div><div class='del'>-    this is is handled on the ftrace level.</div><div class='add'>+    this is handled on the ftrace level.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>   + Kretprobes using the ftrace framework conflict with the patched</div><div class='head'>diff --git a/Documentation/local_ops.txt b/Documentation/local_ops.txt<br/>deleted file mode 100644<br/>index 407576a23317..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/local_ops.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/local_ops.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,191 +0,0 @@</div><div class='del'>-	     Semantics and Behavior of Local Atomic Operations</div><div class='del'>-</div><div class='del'>-			    Mathieu Desnoyers</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	This document explains the purpose of the local atomic operations, how</div><div class='del'>-to implement them for any given architecture and shows how they can be used</div><div class='del'>-properly. It also stresses on the precautions that must be taken when reading</div><div class='del'>-those local variables across CPUs when the order of memory writes matters.</div><div class='del'>-</div><div class='del'>-Note that local_t based operations are not recommended for general kernel use.</div><div class='del'>-Please use the this_cpu operations instead unless there is really a special purpose.</div><div class='del'>-Most uses of local_t in the kernel have been replaced by this_cpu operations.</div><div class='del'>-this_cpu operations combine the relocation with the local_t like semantics in</div><div class='del'>-a single instruction and yield more compact and faster executing code.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-* Purpose of local atomic operations</div><div class='del'>-</div><div class='del'>-Local atomic operations are meant to provide fast and highly reentrant per CPU</div><div class='del'>-counters. They minimize the performance cost of standard atomic operations by</div><div class='del'>-removing the LOCK prefix and memory barriers normally required to synchronize</div><div class='del'>-across CPUs.</div><div class='del'>-</div><div class='del'>-Having fast per CPU atomic counters is interesting in many cases : it does not</div><div class='del'>-require disabling interrupts to protect from interrupt handlers and it permits</div><div class='del'>-coherent counters in NMI handlers. It is especially useful for tracing purposes</div><div class='del'>-and for various performance monitoring counters.</div><div class='del'>-</div><div class='del'>-Local atomic operations only guarantee variable modification atomicity wrt the</div><div class='del'>-CPU which owns the data. Therefore, care must taken to make sure that only one</div><div class='del'>-CPU writes to the local_t data. This is done by using per cpu data and making</div><div class='del'>-sure that we modify it from within a preemption safe context. It is however</div><div class='del'>-permitted to read local_t data from any CPU : it will then appear to be written</div><div class='del'>-out of order wrt other memory writes by the owner CPU.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-* Implementation for a given architecture</div><div class='del'>-</div><div class='del'>-It can be done by slightly modifying the standard atomic operations : only</div><div class='del'>-their UP variant must be kept. It typically means removing LOCK prefix (on</div><div class='del'>-i386 and x86_64) and any SMP synchronization barrier. If the architecture does</div><div class='del'>-not have a different behavior between SMP and UP, including asm-generic/local.h</div><div class='del'>-in your architecture's local.h is sufficient.</div><div class='del'>-</div><div class='del'>-The local_t type is defined as an opaque signed long by embedding an</div><div class='del'>-atomic_long_t inside a structure. This is made so a cast from this type to a</div><div class='del'>-long fails. The definition looks like :</div><div class='del'>-</div><div class='del'>-typedef struct { atomic_long_t a; } local_t;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-* Rules to follow when using local atomic operations</div><div class='del'>-</div><div class='del'>-- Variables touched by local ops must be per cpu variables.</div><div class='del'>-- _Only_ the CPU owner of these variables must write to them.</div><div class='del'>-- This CPU can use local ops from any context (process, irq, softirq, nmi, ...)</div><div class='del'>-  to update its local_t variables.</div><div class='del'>-- Preemption (or interrupts) must be disabled when using local ops in</div><div class='del'>-  process context to   make sure the process won't be migrated to a</div><div class='del'>-  different CPU between getting the per-cpu variable and doing the</div><div class='del'>-  actual local op.</div><div class='del'>-- When using local ops in interrupt context, no special care must be</div><div class='del'>-  taken on a mainline kernel, since they will run on the local CPU with</div><div class='del'>-  preemption already disabled. I suggest, however, to explicitly</div><div class='del'>-  disable preemption anyway to make sure it will still work correctly on</div><div class='del'>-  -rt kernels.</div><div class='del'>-- Reading the local cpu variable will provide the current copy of the</div><div class='del'>-  variable.</div><div class='del'>-- Reads of these variables can be done from any CPU, because updates to</div><div class='del'>-  "long", aligned, variables are always atomic. Since no memory</div><div class='del'>-  synchronization is done by the writer CPU, an outdated copy of the</div><div class='del'>-  variable can be read when reading some _other_ cpu's variables.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-* How to use local atomic operations</div><div class='del'>-</div><div class='del'>-#include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;asm/local.h&gt;</div><div class='del'>-</div><div class='del'>-static DEFINE_PER_CPU(local_t, counters) = LOCAL_INIT(0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-* Counting</div><div class='del'>-</div><div class='del'>-Counting is done on all the bits of a signed long.</div><div class='del'>-</div><div class='del'>-In preemptible context, use get_cpu_var() and put_cpu_var() around local atomic</div><div class='del'>-operations : it makes sure that preemption is disabled around write access to</div><div class='del'>-the per cpu variable. For instance :</div><div class='del'>-</div><div class='del'>-	local_inc(&amp;get_cpu_var(counters));</div><div class='del'>-	put_cpu_var(counters);</div><div class='del'>-</div><div class='del'>-If you are already in a preemption-safe context, you can use</div><div class='del'>-this_cpu_ptr() instead.</div><div class='del'>-</div><div class='del'>-	local_inc(this_cpu_ptr(&amp;counters));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-* Reading the counters</div><div class='del'>-</div><div class='del'>-Those local counters can be read from foreign CPUs to sum the count. Note that</div><div class='del'>-the data seen by local_read across CPUs must be considered to be out of order</div><div class='del'>-relatively to other memory writes happening on the CPU that owns the data.</div><div class='del'>-</div><div class='del'>-	long sum = 0;</div><div class='del'>-	for_each_online_cpu(cpu)</div><div class='del'>-		sum += local_read(&amp;per_cpu(counters, cpu));</div><div class='del'>-</div><div class='del'>-If you want to use a remote local_read to synchronize access to a resource</div><div class='del'>-between CPUs, explicit smp_wmb() and smp_rmb() memory barriers must be used</div><div class='del'>-respectively on the writer and the reader CPUs. It would be the case if you use</div><div class='del'>-the local_t variable as a counter of bytes written in a buffer : there should</div><div class='del'>-be a smp_wmb() between the buffer write and the counter increment and also a</div><div class='del'>-smp_rmb() between the counter read and the buffer read.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Here is a sample module which implements a basic per cpu counter using local.h.</div><div class='del'>-</div><div class='del'>---- BEGIN ---</div><div class='del'>-/* test-local.c</div><div class='del'>- *</div><div class='del'>- * Sample module for local.h usage.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;asm/local.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-</div><div class='del'>-static DEFINE_PER_CPU(local_t, counters) = LOCAL_INIT(0);</div><div class='del'>-</div><div class='del'>-static struct timer_list test_timer;</div><div class='del'>-</div><div class='del'>-/* IPI called on each CPU. */</div><div class='del'>-static void test_each(void *info)</div><div class='del'>-{</div><div class='del'>-	/* Increment the counter from a non preemptible context */</div><div class='del'>-	printk("Increment on cpu %d\n", smp_processor_id());</div><div class='del'>-	local_inc(this_cpu_ptr(&amp;counters));</div><div class='del'>-</div><div class='del'>-	/* This is what incrementing the variable would look like within a</div><div class='del'>-	 * preemptible context (it disables preemption) :</div><div class='del'>-	 *</div><div class='del'>-	 * local_inc(&amp;get_cpu_var(counters));</div><div class='del'>-	 * put_cpu_var(counters);</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void do_test_timer(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	/* Increment the counters */</div><div class='del'>-	on_each_cpu(test_each, NULL, 1);</div><div class='del'>-	/* Read all the counters */</div><div class='del'>-	printk("Counters read from CPU %d\n", smp_processor_id());</div><div class='del'>-	for_each_online_cpu(cpu) {</div><div class='del'>-		printk("Read : CPU %d, count %ld\n", cpu,</div><div class='del'>-			local_read(&amp;per_cpu(counters, cpu)));</div><div class='del'>-	}</div><div class='del'>-	del_timer(&amp;test_timer);</div><div class='del'>-	test_timer.expires = jiffies + 1000;</div><div class='del'>-	add_timer(&amp;test_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init test_init(void)</div><div class='del'>-{</div><div class='del'>-	/* initialize the timer that will increment the counter */</div><div class='del'>-	init_timer(&amp;test_timer);</div><div class='del'>-	test_timer.function = do_test_timer;</div><div class='del'>-	test_timer.expires = jiffies + 1;</div><div class='del'>-	add_timer(&amp;test_timer);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit test_exit(void)</div><div class='del'>-{</div><div class='del'>-	del_timer_sync(&amp;test_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(test_init);</div><div class='del'>-module_exit(test_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Mathieu Desnoyers");</div><div class='del'>-MODULE_DESCRIPTION("Local Atomic Ops");</div><div class='del'>---- END ---</div><div class='head'>diff --git a/Documentation/locking/ww-mutex-design.txt b/Documentation/locking/ww-mutex-design.txt<br/>index 8a112dc304c3..34c3a1b50b9a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/locking/ww-mutex-design.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/locking/ww-mutex-design.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/locking/ww-mutex-design.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/locking/ww-mutex-design.txt</a></div><div class='hunk'>@@ -309,11 +309,15 @@ Design:</div><div class='ctx'>   normal mutex locks, which are far more common. As such there is only a small</div><div class='ctx'>   increase in code size if wait/wound mutexes are not used.</div><div class='ctx'> </div><div class='add'>+  We maintain the following invariants for the wait list:</div><div class='add'>+  (1) Waiters with an acquire context are sorted by stamp order; waiters</div><div class='add'>+      without an acquire context are interspersed in FIFO order.</div><div class='add'>+  (2) Among waiters with contexts, only the first one can have other locks</div><div class='add'>+      acquired already (ctx-&gt;acquired &gt; 0). Note that this waiter may come</div><div class='add'>+      after other waiters without contexts in the list.</div><div class='add'>+</div><div class='ctx'>   In general, not much contention is expected. The locks are typically used to</div><div class='del'>-  serialize access to resources for devices. The only way to make wakeups</div><div class='del'>-  smarter would be at the cost of adding a field to struct mutex_waiter. This</div><div class='del'>-  would add overhead to all cases where normal mutexes are used, and</div><div class='del'>-  ww_mutexes are generally less performance sensitive.</div><div class='add'>+  serialize access to resources for devices.</div><div class='ctx'> </div><div class='ctx'> Lockdep:</div><div class='ctx'>   Special care has been taken to warn for as many cases of api abuse</div><div class='head'>diff --git a/Documentation/lockup-watchdogs.txt b/Documentation/lockup-watchdogs.txt<br/>index 4a6e33e1af61..c8b8378513d6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/lockup-watchdogs.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/lockup-watchdogs.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/lockup-watchdogs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/lockup-watchdogs.txt</a></div><div class='hunk'>@@ -11,7 +11,7 @@ details), without giving other tasks a chance to run. The current</div><div class='ctx'> stack trace is displayed upon detection and, by default, the system</div><div class='ctx'> will stay locked up. Alternatively, the kernel can be configured to</div><div class='ctx'> panic; a sysctl, "kernel.softlockup_panic", a kernel parameter,</div><div class='del'>-"softlockup_panic" (see "Documentation/kernel-parameters.txt" for</div><div class='add'>+"softlockup_panic" (see "Documentation/admin-guide/kernel-parameters.rst" for</div><div class='ctx'> details), and a compile option, "BOOTPARAM_SOFTLOCKUP_PANIC", are</div><div class='ctx'> provided for this.</div><div class='ctx'> </div><div class='hunk'>@@ -23,7 +23,7 @@ upon detection and the system will stay locked up unless the default</div><div class='ctx'> behavior is changed, which can be done through a sysctl,</div><div class='ctx'> 'hardlockup_panic', a compile time knob, "BOOTPARAM_HARDLOCKUP_PANIC",</div><div class='ctx'> and a kernel parameter, "nmi_watchdog"</div><div class='del'>-(see "Documentation/kernel-parameters.txt" for details).</div><div class='add'>+(see "Documentation/admin-guide/kernel-parameters.rst" for details).</div><div class='ctx'> </div><div class='ctx'> The panic option can be used in combination with panic_timeout (this</div><div class='ctx'> timeout is set through the confusingly named "kernel.panic" sysctl),</div><div class='head'>diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt<br/>index eaf32a1fd0b1..79d21246c75a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/m68k/kernel-options.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/m68k/kernel-options.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/m68k/kernel-options.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/m68k/kernel-options.txt</a></div><div class='hunk'>@@ -139,7 +139,7 @@ follows:</div><div class='ctx'>   PARTUUID=00112233-4455-6677-8899-AABBCCDDEEFF/PARTNROFF=-2</div><div class='ctx'> </div><div class='ctx'> Authoritative information can be found in</div><div class='del'>-"Documentation/kernel-parameters.txt".</div><div class='add'>+"Documentation/admin-guide/kernel-parameters.rst".</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 2.2) ro, rw</div><div class='head'>diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt<br/>deleted file mode 100644<br/>index 28befed9f610..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/magic-number.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/magic-number.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,158 +0,0 @@</div><div class='del'>-This file is a registry of magic numbers which are in use.  When you</div><div class='del'>-add a magic number to a structure, you should also add it to this</div><div class='del'>-file, since it is best if the magic numbers used by various structures</div><div class='del'>-are unique.</div><div class='del'>-</div><div class='del'>-It is a *very* good idea to protect kernel data structures with magic</div><div class='del'>-numbers.  This allows you to check at run time whether (a) a structure</div><div class='del'>-has been clobbered, or (b) you've passed the wrong structure to a</div><div class='del'>-routine.  This last is especially useful --- particularly when you are</div><div class='del'>-passing pointers to structures via a void * pointer.  The tty code,</div><div class='del'>-for example, does this frequently to pass driver-specific and line</div><div class='del'>-discipline-specific structures back and forth.</div><div class='del'>-</div><div class='del'>-The way to use magic numbers is to declare then at the beginning of</div><div class='del'>-the structure, like so:</div><div class='del'>-</div><div class='del'>-struct tty_ldisc {</div><div class='del'>-	int	magic;</div><div class='del'>-	...</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-Please follow this discipline when you are adding future enhancements</div><div class='del'>-to the kernel!  It has saved me countless hours of debugging,</div><div class='del'>-especially in the screwy cases where an array has been overrun and</div><div class='del'>-structures following the array have been overwritten.  Using this</div><div class='del'>-discipline, these cases get detected quickly and safely.</div><div class='del'>-</div><div class='del'>-					Theodore Ts'o</div><div class='del'>-					31 Mar 94</div><div class='del'>-</div><div class='del'>-The magic table is current to Linux 2.1.55.</div><div class='del'>-</div><div class='del'>-					Michael Chastain</div><div class='del'>-					&lt;mailto:mec@shout.net&gt;</div><div class='del'>-					22 Sep 1997</div><div class='del'>-</div><div class='del'>-Now it should be up to date with Linux 2.1.112. Because</div><div class='del'>-we are in feature freeze time it is very unlikely that</div><div class='del'>-something will change before 2.2.x. The entries are</div><div class='del'>-sorted by number field.</div><div class='del'>-</div><div class='del'>-					Krzysztof G. Baranowski</div><div class='del'>-					&lt;mailto: kgb@knm.org.pl&gt;</div><div class='del'>-					29 Jul 1998</div><div class='del'>-</div><div class='del'>-Updated the magic table to Linux 2.5.45. Right over the feature freeze,</div><div class='del'>-but it is possible that some new magic numbers will sneak into the</div><div class='del'>-kernel before 2.6.x yet.</div><div class='del'>-</div><div class='del'>-					Petr Baudis</div><div class='del'>-					&lt;pasky@ucw.cz&gt;</div><div class='del'>-					03 Nov 2002</div><div class='del'>-</div><div class='del'>-Updated the magic table to Linux 2.5.74.</div><div class='del'>-</div><div class='del'>-					Fabian Frederick</div><div class='del'>-					&lt;ffrederick@users.sourceforge.net&gt;</div><div class='del'>-					09 Jul 2003</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Magic Name            Number      Structure            File</div><div class='del'>-===========================================================================</div><div class='del'>-PG_MAGIC              'P'         pg_{read,write}_hdr include/linux/pg.h</div><div class='del'>-CMAGIC                0x0111      user              include/linux/a.out.h</div><div class='del'>-MKISS_DRIVER_MAGIC    0x04bf      mkiss_channel     drivers/net/mkiss.h</div><div class='del'>-HDLC_MAGIC            0x239e      n_hdlc            drivers/char/n_hdlc.c</div><div class='del'>-APM_BIOS_MAGIC        0x4101      apm_user          arch/x86/kernel/apm_32.c</div><div class='del'>-CYCLADES_MAGIC        0x4359      cyclades_port     include/linux/cyclades.h</div><div class='del'>-DB_MAGIC              0x4442      fc_info           drivers/net/iph5526_novram.c</div><div class='del'>-DL_MAGIC              0x444d      fc_info           drivers/net/iph5526_novram.c</div><div class='del'>-FASYNC_MAGIC          0x4601      fasync_struct     include/linux/fs.h</div><div class='del'>-FF_MAGIC              0x4646      fc_info           drivers/net/iph5526_novram.c</div><div class='del'>-ISICOM_MAGIC          0x4d54      isi_port          include/linux/isicom.h</div><div class='del'>-PTY_MAGIC             0x5001                        drivers/char/pty.c</div><div class='del'>-PPP_MAGIC             0x5002      ppp               include/linux/if_pppvar.h</div><div class='del'>-SERIAL_MAGIC          0x5301      async_struct      include/linux/serial.h</div><div class='del'>-SSTATE_MAGIC          0x5302      serial_state      include/linux/serial.h</div><div class='del'>-SLIP_MAGIC            0x5302      slip              drivers/net/slip.h</div><div class='del'>-STRIP_MAGIC           0x5303      strip             drivers/net/strip.c</div><div class='del'>-X25_ASY_MAGIC         0x5303      x25_asy           drivers/net/x25_asy.h</div><div class='del'>-SIXPACK_MAGIC         0x5304      sixpack           drivers/net/hamradio/6pack.h</div><div class='del'>-AX25_MAGIC            0x5316      ax_disp           drivers/net/mkiss.h</div><div class='del'>-TTY_MAGIC             0x5401      tty_struct        include/linux/tty.h</div><div class='del'>-MGSL_MAGIC            0x5401      mgsl_info         drivers/char/synclink.c</div><div class='del'>-TTY_DRIVER_MAGIC      0x5402      tty_driver        include/linux/tty_driver.h</div><div class='del'>-MGSLPC_MAGIC          0x5402      mgslpc_info       drivers/char/pcmcia/synclink_cs.c</div><div class='del'>-TTY_LDISC_MAGIC       0x5403      tty_ldisc         include/linux/tty_ldisc.h</div><div class='del'>-USB_SERIAL_MAGIC      0x6702      usb_serial        drivers/usb/serial/usb-serial.h</div><div class='del'>-FULL_DUPLEX_MAGIC     0x6969                        drivers/net/ethernet/dec/tulip/de2104x.c</div><div class='del'>-USB_BLUETOOTH_MAGIC   0x6d02      usb_bluetooth     drivers/usb/class/bluetty.c</div><div class='del'>-RFCOMM_TTY_MAGIC      0x6d02                        net/bluetooth/rfcomm/tty.c</div><div class='del'>-USB_SERIAL_PORT_MAGIC 0x7301      usb_serial_port   drivers/usb/serial/usb-serial.h</div><div class='del'>-CG_MAGIC              0x00090255  ufs_cylinder_group include/linux/ufs_fs.h</div><div class='del'>-RPORT_MAGIC           0x00525001  r_port            drivers/char/rocket_int.h</div><div class='del'>-LSEMAGIC              0x05091998  lse               drivers/fc4/fc.c</div><div class='del'>-GDTIOCTL_MAGIC        0x06030f07  gdth_iowr_str     drivers/scsi/gdth_ioctl.h</div><div class='del'>-RIEBL_MAGIC           0x09051990                    drivers/net/atarilance.c</div><div class='del'>-NBD_REQUEST_MAGIC     0x12560953  nbd_request       include/linux/nbd.h</div><div class='del'>-RED_MAGIC2            0x170fc2a5  (any)             mm/slab.c</div><div class='del'>-BAYCOM_MAGIC          0x19730510  baycom_state      drivers/net/baycom_epp.c</div><div class='del'>-ISDN_X25IFACE_MAGIC   0x1e75a2b9  isdn_x25iface_proto_data</div><div class='del'>-                                                    drivers/isdn/isdn_x25iface.h</div><div class='del'>-ECP_MAGIC             0x21504345  cdkecpsig         include/linux/cdk.h</div><div class='del'>-LSOMAGIC              0x27091997  lso               drivers/fc4/fc.c</div><div class='del'>-LSMAGIC               0x2a3b4d2a  ls                drivers/fc4/fc.c</div><div class='del'>-WANPIPE_MAGIC         0x414C4453  sdla_{dump,exec}  include/linux/wanpipe.h</div><div class='del'>-CS_CARD_MAGIC         0x43525553  cs_card           sound/oss/cs46xx.c</div><div class='del'>-LABELCL_MAGIC         0x4857434c  labelcl_info_s    include/asm/ia64/sn/labelcl.h</div><div class='del'>-ISDN_ASYNC_MAGIC      0x49344C01  modem_info        include/linux/isdn.h</div><div class='del'>-CTC_ASYNC_MAGIC       0x49344C01  ctc_tty_info      drivers/s390/net/ctctty.c</div><div class='del'>-ISDN_NET_MAGIC        0x49344C02  isdn_net_local_s  drivers/isdn/i4l/isdn_net_lib.h</div><div class='del'>-SAVEKMSG_MAGIC2       0x4B4D5347  savekmsg          arch/*/amiga/config.c</div><div class='del'>-CS_STATE_MAGIC        0x4c4f4749  cs_state          sound/oss/cs46xx.c</div><div class='del'>-SLAB_C_MAGIC          0x4f17a36d  kmem_cache        mm/slab.c</div><div class='del'>-COW_MAGIC             0x4f4f4f4d  cow_header_v1     arch/um/drivers/ubd_user.c</div><div class='del'>-I810_CARD_MAGIC       0x5072696E  i810_card         sound/oss/i810_audio.c</div><div class='del'>-TRIDENT_CARD_MAGIC    0x5072696E  trident_card      sound/oss/trident.c</div><div class='del'>-ROUTER_MAGIC          0x524d4157  wan_device        [in wanrouter.h pre 3.9]</div><div class='del'>-SAVEKMSG_MAGIC1       0x53415645  savekmsg          arch/*/amiga/config.c</div><div class='del'>-GDA_MAGIC             0x58464552  gda               arch/mips/include/asm/sn/gda.h</div><div class='del'>-RED_MAGIC1            0x5a2cf071  (any)             mm/slab.c</div><div class='del'>-EEPROM_MAGIC_VALUE    0x5ab478d2  lanai_dev         drivers/atm/lanai.c</div><div class='del'>-HDLCDRV_MAGIC         0x5ac6e778  hdlcdrv_state     include/linux/hdlcdrv.h</div><div class='del'>-PCXX_MAGIC            0x5c6df104  channel           drivers/char/pcxx.h</div><div class='del'>-KV_MAGIC              0x5f4b565f  kernel_vars_s     arch/mips/include/asm/sn/klkernvars.h</div><div class='del'>-I810_STATE_MAGIC      0x63657373  i810_state        sound/oss/i810_audio.c</div><div class='del'>-TRIDENT_STATE_MAGIC   0x63657373  trient_state      sound/oss/trident.c</div><div class='del'>-M3_CARD_MAGIC         0x646e6f50  m3_card           sound/oss/maestro3.c</div><div class='del'>-FW_HEADER_MAGIC       0x65726F66  fw_header         drivers/atm/fore200e.h</div><div class='del'>-SLOT_MAGIC            0x67267321  slot              drivers/hotplug/cpqphp.h</div><div class='del'>-SLOT_MAGIC            0x67267322  slot              drivers/hotplug/acpiphp.h</div><div class='del'>-LO_MAGIC              0x68797548  nbd_device        include/linux/nbd.h</div><div class='del'>-OPROFILE_MAGIC        0x6f70726f  super_block       drivers/oprofile/oprofilefs.h</div><div class='del'>-M3_STATE_MAGIC        0x734d724d  m3_state          sound/oss/maestro3.c</div><div class='del'>-VMALLOC_MAGIC         0x87654320  snd_alloc_track   sound/core/memory.c</div><div class='del'>-KMALLOC_MAGIC         0x87654321  snd_alloc_track   sound/core/memory.c</div><div class='del'>-PWC_MAGIC             0x89DC10AB  pwc_device        drivers/usb/media/pwc.h</div><div class='del'>-NBD_REPLY_MAGIC       0x96744668  nbd_reply         include/linux/nbd.h</div><div class='del'>-ENI155_MAGIC          0xa54b872d  midway_eprom	    drivers/atm/eni.h</div><div class='del'>-CODA_MAGIC            0xC0DAC0DA  coda_file_info    fs/coda/coda_fs_i.h</div><div class='del'>-DPMEM_MAGIC           0xc0ffee11  gdt_pci_sram      drivers/scsi/gdth.h</div><div class='del'>-YAM_MAGIC             0xF10A7654  yam_port          drivers/net/hamradio/yam.c</div><div class='del'>-CCB_MAGIC             0xf2691ad2  ccb               drivers/scsi/ncr53c8xx.c</div><div class='del'>-QUEUE_MAGIC_FREE      0xf7e1c9a3  queue_entry       drivers/scsi/arm/queue.c</div><div class='del'>-QUEUE_MAGIC_USED      0xf7e1cc33  queue_entry       drivers/scsi/arm/queue.c</div><div class='del'>-HTB_CMAGIC            0xFEFAFEF1  htb_class         net/sched/sch_htb.c</div><div class='del'>-NMI_MAGIC             0x48414d4d455201 nmi_s        arch/mips/include/asm/sn/nmi.h</div><div class='del'>-</div><div class='del'>-Note that there are also defined special per-driver magic numbers in sound</div><div class='del'>-memory management. See include/sound/sndmagic.h for complete list of them. Many</div><div class='del'>-OSS sound drivers have their magic numbers constructed from the soundcard PCI</div><div class='del'>-ID - these are not listed here as well.</div><div class='del'>-</div><div class='del'>-IrDA subsystem also uses large number of own magic numbers, see</div><div class='del'>-include/net/irda/irda.h for a complete list of them.</div><div class='del'>-</div><div class='del'>-HFS is another larger user of magic numbers - you can find them in</div><div class='del'>-fs/hfs/hfs.h.</div><div class='head'>diff --git a/Documentation/md.txt b/Documentation/md.txt<br/>deleted file mode 100644<br/>index d6e2fcf27337..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/md.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/md.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,613 +0,0 @@</div><div class='del'>-Tools that manage md devices can be found at</div><div class='del'>-   http://www.kernel.org/pub/linux/utils/raid/ </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Boot time assembly of RAID arrays</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-You can boot with your md device with the following kernel command</div><div class='del'>-lines:</div><div class='del'>-</div><div class='del'>-for old raid arrays without persistent superblocks:</div><div class='del'>-  md=&lt;md device no.&gt;,&lt;raid level&gt;,&lt;chunk size factor&gt;,&lt;fault level&gt;,dev0,dev1,...,devn</div><div class='del'>-</div><div class='del'>-for raid arrays with persistent superblocks</div><div class='del'>-  md=&lt;md device no.&gt;,dev0,dev1,...,devn</div><div class='del'>-or, to assemble a partitionable array:</div><div class='del'>-  md=d&lt;md device no.&gt;,dev0,dev1,...,devn</div><div class='del'>-  </div><div class='del'>-md device no. = the number of the md device ... </div><div class='del'>-              0 means md0, </div><div class='del'>-	      1 md1,</div><div class='del'>-	      2 md2,</div><div class='del'>-	      3 md3,</div><div class='del'>-	      4 md4</div><div class='del'>-</div><div class='del'>-raid level = -1 linear mode</div><div class='del'>-              0 striped mode</div><div class='del'>-	      other modes are only supported with persistent super blocks</div><div class='del'>-</div><div class='del'>-chunk size factor = (raid-0 and raid-1 only)</div><div class='del'>-              Set  the chunk size as 4k &lt;&lt; n.</div><div class='del'>-	      </div><div class='del'>-fault level = totally ignored</div><div class='del'>-			    </div><div class='del'>-dev0-devn: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1</div><div class='del'>-			    </div><div class='del'>-A possible loadlin line (Harald Hoyer &lt;HarryH@Royal.Net&gt;)  looks like this:</div><div class='del'>-</div><div class='del'>-e:\loadlin\loadlin e:\zimage root=/dev/md0 md=0,0,4,0,/dev/hdb2,/dev/hdc3 ro</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Boot time autodetection of RAID arrays</div><div class='del'>---------------------------------------</div><div class='del'>-</div><div class='del'>-When md is compiled into the kernel (not as module), partitions of</div><div class='del'>-type 0xfd are scanned and automatically assembled into RAID arrays.</div><div class='del'>-This autodetection may be suppressed with the kernel parameter</div><div class='del'>-"raid=noautodetect".  As of kernel 2.6.9, only drives with a type 0</div><div class='del'>-superblock can be autodetected and run at boot time.</div><div class='del'>-</div><div class='del'>-The kernel parameter "raid=partitionable" (or "raid=part") means</div><div class='del'>-that all auto-detected arrays are assembled as partitionable.</div><div class='del'>-</div><div class='del'>-Boot time assembly of degraded/dirty arrays</div><div class='del'>--------------------------------------------</div><div class='del'>-</div><div class='del'>-If a raid5 or raid6 array is both dirty and degraded, it could have</div><div class='del'>-undetectable data corruption.  This is because the fact that it is</div><div class='del'>-'dirty' means that the parity cannot be trusted, and the fact that it</div><div class='del'>-is degraded means that some datablocks are missing and cannot reliably</div><div class='del'>-be reconstructed (due to no parity).</div><div class='del'>-</div><div class='del'>-For this reason, md will normally refuse to start such an array.  This</div><div class='del'>-requires the sysadmin to take action to explicitly start the array</div><div class='del'>-despite possible corruption.  This is normally done with</div><div class='del'>-   mdadm --assemble --force ....</div><div class='del'>-</div><div class='del'>-This option is not really available if the array has the root</div><div class='del'>-filesystem on it.  In order to support this booting from such an</div><div class='del'>-array, md supports a module parameter "start_dirty_degraded" which,</div><div class='del'>-when set to 1, bypassed the checks and will allows dirty degraded</div><div class='del'>-arrays to be started.</div><div class='del'>-</div><div class='del'>-So, to boot with a root filesystem of a dirty degraded raid[56], use</div><div class='del'>-</div><div class='del'>-   md-mod.start_dirty_degraded=1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Superblock formats</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-The md driver can support a variety of different superblock formats.</div><div class='del'>-Currently, it supports superblock formats "0.90.0" and the "md-1" format</div><div class='del'>-introduced in the 2.5 development series.</div><div class='del'>-</div><div class='del'>-The kernel will autodetect which format superblock is being used.</div><div class='del'>-</div><div class='del'>-Superblock format '0' is treated differently to others for legacy</div><div class='del'>-reasons - it is the original superblock format.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-General Rules - apply for all superblock formats</div><div class='del'>-------------------------------------------------</div><div class='del'>-</div><div class='del'>-An array is 'created' by writing appropriate superblocks to all</div><div class='del'>-devices.</div><div class='del'>-</div><div class='del'>-It is 'assembled' by associating each of these devices with an</div><div class='del'>-particular md virtual device.  Once it is completely assembled, it can</div><div class='del'>-be accessed.</div><div class='del'>-</div><div class='del'>-An array should be created by a user-space tool.  This will write</div><div class='del'>-superblocks to all devices.  It will usually mark the array as</div><div class='del'>-'unclean', or with some devices missing so that the kernel md driver</div><div class='del'>-can create appropriate redundancy (copying in raid1, parity</div><div class='del'>-calculation in raid4/5).</div><div class='del'>-</div><div class='del'>-When an array is assembled, it is first initialized with the</div><div class='del'>-SET_ARRAY_INFO ioctl.  This contains, in particular, a major and minor</div><div class='del'>-version number.  The major version number selects which superblock</div><div class='del'>-format is to be used.  The minor number might be used to tune handling</div><div class='del'>-of the format, such as suggesting where on each device to look for the</div><div class='del'>-superblock.</div><div class='del'>-</div><div class='del'>-Then each device is added using the ADD_NEW_DISK ioctl.  This</div><div class='del'>-provides, in particular, a major and minor number identifying the</div><div class='del'>-device to add.</div><div class='del'>-</div><div class='del'>-The array is started with the RUN_ARRAY ioctl.</div><div class='del'>-</div><div class='del'>-Once started, new devices can be added.  They should have an</div><div class='del'>-appropriate superblock written to them, and then be passed in with</div><div class='del'>-ADD_NEW_DISK.</div><div class='del'>-</div><div class='del'>-Devices that have failed or are not yet active can be detached from an</div><div class='del'>-array using HOT_REMOVE_DISK.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Specific Rules that apply to format-0 super block arrays, and</div><div class='del'>-       arrays with no superblock (non-persistent).</div><div class='del'>--------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-An array can be 'created' by describing the array (level, chunksize</div><div class='del'>-etc) in a SET_ARRAY_INFO ioctl.  This must have major_version==0 and</div><div class='del'>-raid_disks != 0.</div><div class='del'>-</div><div class='del'>-Then uninitialized devices can be added with ADD_NEW_DISK.  The</div><div class='del'>-structure passed to ADD_NEW_DISK must specify the state of the device</div><div class='del'>-and its role in the array.</div><div class='del'>-</div><div class='del'>-Once started with RUN_ARRAY, uninitialized spares can be added with</div><div class='del'>-HOT_ADD_DISK.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MD devices in sysfs</div><div class='del'>--------------------</div><div class='del'>-md devices appear in sysfs (/sys) as regular block devices,</div><div class='del'>-e.g.</div><div class='del'>-   /sys/block/md0</div><div class='del'>-</div><div class='del'>-Each 'md' device will contain a subdirectory called 'md' which</div><div class='del'>-contains further md-specific information about the device.</div><div class='del'>-</div><div class='del'>-All md devices contain:</div><div class='del'>-  level</div><div class='del'>-     a text file indicating the 'raid level'. e.g. raid0, raid1,</div><div class='del'>-     raid5, linear, multipath, faulty.</div><div class='del'>-     If no raid level has been set yet (array is still being</div><div class='del'>-     assembled), the value will reflect whatever has been written</div><div class='del'>-     to it, which may be a name like the above, or may be a number</div><div class='del'>-     such as '0', '5', etc.</div><div class='del'>-</div><div class='del'>-  raid_disks</div><div class='del'>-     a text file with a simple number indicating the number of devices</div><div class='del'>-     in a fully functional array.  If this is not yet known, the file</div><div class='del'>-     will be empty.  If an array is being resized this will contain</div><div class='del'>-     the new number of devices.</div><div class='del'>-     Some raid levels allow this value to be set while the array is</div><div class='del'>-     active.  This will reconfigure the array.   Otherwise it can only</div><div class='del'>-     be set while assembling an array.</div><div class='del'>-     A change to this attribute will not be permitted if it would</div><div class='del'>-     reduce the size of the array.  To reduce the number of drives</div><div class='del'>-     in an e.g. raid5, the array size must first be reduced by</div><div class='del'>-     setting the 'array_size' attribute.</div><div class='del'>-</div><div class='del'>-  chunk_size</div><div class='del'>-     This is the size in bytes for 'chunks' and is only relevant to</div><div class='del'>-     raid levels that involve striping (0,4,5,6,10). The address space</div><div class='del'>-     of the array is conceptually divided into chunks and consecutive</div><div class='del'>-     chunks are striped onto neighbouring devices.</div><div class='del'>-     The size should be at least PAGE_SIZE (4k) and should be a power</div><div class='del'>-     of 2.  This can only be set while assembling an array</div><div class='del'>-</div><div class='del'>-  layout</div><div class='del'>-     The "layout" for the array for the particular level.  This is</div><div class='del'>-     simply a number that is interpretted differently by different</div><div class='del'>-     levels.  It can be written while assembling an array.</div><div class='del'>-</div><div class='del'>-  array_size</div><div class='del'>-     This can be used to artificially constrain the available space in</div><div class='del'>-     the array to be less than is actually available on the combined</div><div class='del'>-     devices.  Writing a number (in Kilobytes) which is less than</div><div class='del'>-     the available size will set the size.  Any reconfiguration of the</div><div class='del'>-     array (e.g. adding devices) will not cause the size to change.</div><div class='del'>-     Writing the word 'default' will cause the effective size of the</div><div class='del'>-     array to be whatever size is actually available based on</div><div class='del'>-     'level', 'chunk_size' and 'component_size'.</div><div class='del'>-</div><div class='del'>-     This can be used to reduce the size of the array before reducing</div><div class='del'>-     the number of devices in a raid4/5/6, or to support external</div><div class='del'>-     metadata formats which mandate such clipping.</div><div class='del'>-</div><div class='del'>-  reshape_position</div><div class='del'>-     This is either "none" or a sector number within the devices of</div><div class='del'>-     the array where "reshape" is up to.  If this is set, the three</div><div class='del'>-     attributes mentioned above (raid_disks, chunk_size, layout) can</div><div class='del'>-     potentially have 2 values, an old and a new value.  If these</div><div class='del'>-     values differ, reading the attribute returns</div><div class='del'>-        new (old)</div><div class='del'>-     and writing will effect the 'new' value, leaving the 'old'</div><div class='del'>-     unchanged.</div><div class='del'>-</div><div class='del'>-  component_size</div><div class='del'>-     For arrays with data redundancy (i.e. not raid0, linear, faulty,</div><div class='del'>-     multipath), all components must be the same size - or at least</div><div class='del'>-     there must a size that they all provide space for.  This is a key</div><div class='del'>-     part or the geometry of the array.  It is measured in sectors</div><div class='del'>-     and can be read from here.  Writing to this value may resize</div><div class='del'>-     the array if the personality supports it (raid1, raid5, raid6),</div><div class='del'>-     and if the component drives are large enough.</div><div class='del'>-</div><div class='del'>-  metadata_version</div><div class='del'>-     This indicates the format that is being used to record metadata</div><div class='del'>-     about the array.  It can be 0.90 (traditional format), 1.0, 1.1,</div><div class='del'>-     1.2 (newer format in varying locations) or "none" indicating that</div><div class='del'>-     the kernel isn't managing metadata at all.</div><div class='del'>-     Alternately it can be "external:" followed by a string which</div><div class='del'>-     is set by user-space.  This indicates that metadata is managed</div><div class='del'>-     by a user-space program.  Any device failure or other event that</div><div class='del'>-     requires a metadata update will cause array activity to be</div><div class='del'>-     suspended until the event is acknowledged.</div><div class='del'>-</div><div class='del'>-  resync_start</div><div class='del'>-     The point at which resync should start.  If no resync is needed,</div><div class='del'>-     this will be a very large number (or 'none' since 2.6.30-rc1).  At</div><div class='del'>-     array creation it will default to 0, though starting the array as</div><div class='del'>-     'clean' will set it much larger.</div><div class='del'>-</div><div class='del'>-   new_dev</div><div class='del'>-     This file can be written but not read.  The value written should</div><div class='del'>-     be a block device number as major:minor.  e.g. 8:0</div><div class='del'>-     This will cause that device to be attached to the array, if it is</div><div class='del'>-     available.  It will then appear at md/dev-XXX (depending on the</div><div class='del'>-     name of the device) and further configuration is then possible.</div><div class='del'>-</div><div class='del'>-   safe_mode_delay</div><div class='del'>-     When an md array has seen no write requests for a certain period</div><div class='del'>-     of time, it will be marked as 'clean'.  When another write</div><div class='del'>-     request arrives, the array is marked as 'dirty' before the write</div><div class='del'>-     commences.  This is known as 'safe_mode'.</div><div class='del'>-     The 'certain period' is controlled by this file which stores the</div><div class='del'>-     period as a number of seconds.  The default is 200msec (0.200).</div><div class='del'>-     Writing a value of 0 disables safemode.</div><div class='del'>-</div><div class='del'>-   array_state</div><div class='del'>-     This file contains a single word which describes the current</div><div class='del'>-     state of the array.  In many cases, the state can be set by</div><div class='del'>-     writing the word for the desired state, however some states</div><div class='del'>-     cannot be explicitly set, and some transitions are not allowed.</div><div class='del'>-</div><div class='del'>-     Select/poll works on this file.  All changes except between</div><div class='del'>-     	active_idle and active (which can be frequent and are not</div><div class='del'>-	very interesting) are notified.  active-&gt;active_idle is</div><div class='del'>-	reported if the metadata is externally managed.</div><div class='del'>-</div><div class='del'>-     clear</div><div class='del'>-         No devices, no size, no level</div><div class='del'>-         Writing is equivalent to STOP_ARRAY ioctl</div><div class='del'>-     inactive</div><div class='del'>-         May have some settings, but array is not active</div><div class='del'>-            all IO results in error</div><div class='del'>-         When written, doesn't tear down array, but just stops it</div><div class='del'>-     suspended (not supported yet)</div><div class='del'>-         All IO requests will block. The array can be reconfigured.</div><div class='del'>-         Writing this, if accepted, will block until array is quiessent</div><div class='del'>-     readonly</div><div class='del'>-         no resync can happen.  no superblocks get written.</div><div class='del'>-         write requests fail</div><div class='del'>-     read-auto</div><div class='del'>-         like readonly, but behaves like 'clean' on a write request.</div><div class='del'>-</div><div class='del'>-     clean - no pending writes, but otherwise active.</div><div class='del'>-         When written to inactive array, starts without resync</div><div class='del'>-         If a write request arrives then</div><div class='del'>-           if metadata is known, mark 'dirty' and switch to 'active'.</div><div class='del'>-           if not known, block and switch to write-pending</div><div class='del'>-         If written to an active array that has pending writes, then fails.</div><div class='del'>-     active</div><div class='del'>-         fully active: IO and resync can be happening.</div><div class='del'>-         When written to inactive array, starts with resync</div><div class='del'>-</div><div class='del'>-     write-pending</div><div class='del'>-         clean, but writes are blocked waiting for 'active' to be written.</div><div class='del'>-</div><div class='del'>-     active-idle</div><div class='del'>-         like active, but no writes have been seen for a while (safe_mode_delay).</div><div class='del'>-</div><div class='del'>-  bitmap/location</div><div class='del'>-     This indicates where the write-intent bitmap for the array is</div><div class='del'>-     stored.</div><div class='del'>-     It can be one of "none", "file" or "[+-]N".</div><div class='del'>-     "file" may later be extended to "file:/file/name"</div><div class='del'>-     "[+-]N" means that many sectors from the start of the metadata.</div><div class='del'>-       This is replicated on all devices.  For arrays with externally</div><div class='del'>-       managed metadata, the offset is from the beginning of the</div><div class='del'>-       device.</div><div class='del'>-  bitmap/chunksize</div><div class='del'>-     The size, in bytes, of the chunk which will be represented by a</div><div class='del'>-     single bit.  For RAID456, it is a portion of an individual</div><div class='del'>-     device. For RAID10, it is a portion of the array.  For RAID1, it</div><div class='del'>-     is both (they come to the same thing).</div><div class='del'>-  bitmap/time_base</div><div class='del'>-     The time, in seconds, between looking for bits in the bitmap to</div><div class='del'>-     be cleared. In the current implementation, a bit will be cleared</div><div class='del'>-     between 2 and 3 times "time_base" after all the covered blocks</div><div class='del'>-     are known to be in-sync.</div><div class='del'>-  bitmap/backlog</div><div class='del'>-     When write-mostly devices are active in a RAID1, write requests</div><div class='del'>-     to those devices proceed in the background - the filesystem (or</div><div class='del'>-     other user of the device) does not have to wait for them.</div><div class='del'>-     'backlog' sets a limit on the number of concurrent background</div><div class='del'>-     writes.  If there are more than this, new writes will by</div><div class='del'>-     synchronous.</div><div class='del'>-  bitmap/metadata</div><div class='del'>-     This can be either 'internal' or 'external'.</div><div class='del'>-     'internal' is the default and means the metadata for the bitmap</div><div class='del'>-     is stored in the first 256 bytes of the allocated space and is</div><div class='del'>-     managed by the md module.</div><div class='del'>-     'external' means that bitmap metadata is managed externally to</div><div class='del'>-     the kernel (i.e. by some userspace program)</div><div class='del'>-  bitmap/can_clear</div><div class='del'>-     This is either 'true' or 'false'.  If 'true', then bits in the</div><div class='del'>-     bitmap will be cleared when the corresponding blocks are thought</div><div class='del'>-     to be in-sync.  If 'false', bits will never be cleared.</div><div class='del'>-     This is automatically set to 'false' if a write happens on a</div><div class='del'>-     degraded array, or if the array becomes degraded during a write.</div><div class='del'>-     When metadata is managed externally, it should be set to true</div><div class='del'>-     once the array becomes non-degraded, and this fact has been</div><div class='del'>-     recorded in the metadata.</div><div class='del'>-     </div><div class='del'>-     </div><div class='del'>-     </div><div class='del'>-</div><div class='del'>-As component devices are added to an md array, they appear in the 'md'</div><div class='del'>-directory as new directories named</div><div class='del'>-      dev-XXX</div><div class='del'>-where XXX is a name that the kernel knows for the device, e.g. hdb1.</div><div class='del'>-Each directory contains:</div><div class='del'>-</div><div class='del'>-      block</div><div class='del'>-        a symlink to the block device in /sys/block, e.g.</div><div class='del'>-	     /sys/block/md0/md/dev-hdb1/block -&gt; ../../../../block/hdb/hdb1</div><div class='del'>-</div><div class='del'>-      super</div><div class='del'>-        A file containing an image of the superblock read from, or</div><div class='del'>-        written to, that device.</div><div class='del'>-</div><div class='del'>-      state</div><div class='del'>-	A file recording the current state of the device in the array</div><div class='del'>-	which can be a comma separated list of</div><div class='del'>-	      faulty   - device has been kicked from active use due to</div><div class='del'>-			 a detected fault, or it has unacknowledged bad</div><div class='del'>-			 blocks</div><div class='del'>-	      in_sync  - device is a fully in-sync member of the array</div><div class='del'>-	      writemostly - device will only be subject to read</div><div class='del'>-			 requests if there are no other options.</div><div class='del'>-			 This applies only to raid1 arrays.</div><div class='del'>-	      blocked  - device has failed, and the failure hasn't been</div><div class='del'>-			 acknowledged yet by the metadata handler.</div><div class='del'>-			 Writes that would write to this device if</div><div class='del'>-			 it were not faulty are blocked.</div><div class='del'>-	      spare    - device is working, but not a full member.</div><div class='del'>-			 This includes spares that are in the process</div><div class='del'>-			 of being recovered to</div><div class='del'>-	      write_error - device has ever seen a write error.</div><div class='del'>-	      want_replacement - device is (mostly) working but probably</div><div class='del'>-			 should be replaced, either due to errors or</div><div class='del'>-			 due to user request.</div><div class='del'>-	      replacement - device is a replacement for another active</div><div class='del'>-			 device with same raid_disk.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	This list may grow in future.</div><div class='del'>-	This can be written to.</div><div class='del'>-	Writing "faulty"  simulates a failure on the device.</div><div class='del'>-	Writing "remove" removes the device from the array.</div><div class='del'>-	Writing "writemostly" sets the writemostly flag.</div><div class='del'>-	Writing "-writemostly" clears the writemostly flag.</div><div class='del'>-	Writing "blocked" sets the "blocked" flag.</div><div class='del'>-	Writing "-blocked" clears the "blocked" flags and allows writes</div><div class='del'>-		to complete and possibly simulates an error.</div><div class='del'>-	Writing "in_sync" sets the in_sync flag.</div><div class='del'>-	Writing "write_error" sets writeerrorseen flag.</div><div class='del'>-	Writing "-write_error" clears writeerrorseen flag.</div><div class='del'>-	Writing "want_replacement" is allowed at any time except to a</div><div class='del'>-		replacement device or a spare.  It sets the flag.</div><div class='del'>-	Writing "-want_replacement" is allowed at any time.  It clears</div><div class='del'>-		the flag.</div><div class='del'>-	Writing "replacement" or "-replacement" is only allowed before</div><div class='del'>-		starting the array.  It sets or clears the flag.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	This file responds to select/poll. Any change to 'faulty'</div><div class='del'>-	or 'blocked' causes an event.</div><div class='del'>-</div><div class='del'>-      errors</div><div class='del'>-	An approximate count of read errors that have been detected on</div><div class='del'>-	this device but have not caused the device to be evicted from</div><div class='del'>-	the array (either because they were corrected or because they</div><div class='del'>-	happened while the array was read-only).  When using version-1</div><div class='del'>-	metadata, this value persists across restarts of the array.</div><div class='del'>-</div><div class='del'>-	This value can be written while assembling an array thus</div><div class='del'>-	providing an ongoing count for arrays with metadata managed by</div><div class='del'>-	userspace.</div><div class='del'>-</div><div class='del'>-      slot</div><div class='del'>-        This gives the role that the device has in the array.  It will</div><div class='del'>-	either be 'none' if the device is not active in the array</div><div class='del'>-        (i.e. is a spare or has failed) or an integer less than the</div><div class='del'>-	'raid_disks' number for the array indicating which position</div><div class='del'>-	it currently fills.  This can only be set while assembling an</div><div class='del'>-	array.  A device for which this is set is assumed to be working.</div><div class='del'>-</div><div class='del'>-      offset</div><div class='del'>-        This gives the location in the device (in sectors from the</div><div class='del'>-        start) where data from the array will be stored.  Any part of</div><div class='del'>-        the device before this offset is not touched, unless it is</div><div class='del'>-        used for storing metadata (Formats 1.1 and 1.2).</div><div class='del'>-</div><div class='del'>-      size</div><div class='del'>-        The amount of the device, after the offset, that can be used</div><div class='del'>-        for storage of data.  This will normally be the same as the</div><div class='del'>-	component_size.  This can be written while assembling an</div><div class='del'>-        array.  If a value less than the current component_size is</div><div class='del'>-        written, it will be rejected.</div><div class='del'>-</div><div class='del'>-      recovery_start</div><div class='del'>-        When the device is not 'in_sync', this records the number of</div><div class='del'>-	sectors from the start of the device which are known to be</div><div class='del'>-	correct.  This is normally zero, but during a recovery</div><div class='del'>-	operation it will steadily increase, and if the recovery is</div><div class='del'>-	interrupted, restoring this value can cause recovery to</div><div class='del'>-	avoid repeating the earlier blocks.  With v1.x metadata, this</div><div class='del'>-	value is saved and restored automatically.</div><div class='del'>-</div><div class='del'>-	This can be set whenever the device is not an active member of</div><div class='del'>-	the array, either before the array is activated, or before</div><div class='del'>-	the 'slot' is set.</div><div class='del'>-</div><div class='del'>-	Setting this to 'none' is equivalent to setting 'in_sync'.</div><div class='del'>-	Setting to any other value also clears the 'in_sync' flag.</div><div class='del'>-	</div><div class='del'>-      bad_blocks</div><div class='del'>-	This gives the list of all known bad blocks in the form of</div><div class='del'>-	start address and length (in sectors respectively). If output</div><div class='del'>-	is too big to fit in a page, it will be truncated. Writing</div><div class='del'>-	"sector length" to this file adds new acknowledged (i.e.</div><div class='del'>-	recorded to disk safely) bad blocks.</div><div class='del'>-</div><div class='del'>-      unacknowledged_bad_blocks</div><div class='del'>-	This gives the list of known-but-not-yet-saved-to-disk bad</div><div class='del'>-	blocks in the same form of 'bad_blocks'. If output is too big</div><div class='del'>-	to fit in a page, it will be truncated. Writing to this file</div><div class='del'>-	adds bad blocks without acknowledging them. This is largely</div><div class='del'>-	for testing.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-An active md device will also contain an entry for each active device</div><div class='del'>-in the array.  These are named</div><div class='del'>-</div><div class='del'>-    rdNN</div><div class='del'>-</div><div class='del'>-where 'NN' is the position in the array, starting from 0.</div><div class='del'>-So for a 3 drive array there will be rd0, rd1, rd2.</div><div class='del'>-These are symbolic links to the appropriate 'dev-XXX' entry.</div><div class='del'>-Thus, for example,</div><div class='del'>-       cat /sys/block/md*/md/rd*/state</div><div class='del'>-will show 'in_sync' on every line.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Active md devices for levels that support data redundancy (1,4,5,6,10)</div><div class='del'>-also have</div><div class='del'>-</div><div class='del'>-   sync_action</div><div class='del'>-     a text file that can be used to monitor and control the rebuild</div><div class='del'>-     process.  It contains one word which can be one of:</div><div class='del'>-       resync        - redundancy is being recalculated after unclean</div><div class='del'>-                       shutdown or creation</div><div class='del'>-       recover       - a hot spare is being built to replace a</div><div class='del'>-                       failed/missing device</div><div class='del'>-       idle          - nothing is happening</div><div class='del'>-       check         - A full check of redundancy was requested and is</div><div class='del'>-                       happening.  This reads all blocks and checks</div><div class='del'>-                       them. A repair may also happen for some raid</div><div class='del'>-                       levels.</div><div class='del'>-       repair        - A full check and repair is happening.  This is</div><div class='del'>-                       similar to 'resync', but was requested by the</div><div class='del'>-                       user, and the write-intent bitmap is NOT used to</div><div class='del'>-		       optimise the process.</div><div class='del'>-</div><div class='del'>-      This file is writable, and each of the strings that could be</div><div class='del'>-      read are meaningful for writing.</div><div class='del'>-</div><div class='del'>-       'idle' will stop an active resync/recovery etc.  There is no</div><div class='del'>-           guarantee that another resync/recovery may not be automatically</div><div class='del'>-	   started again, though some event will be needed to trigger</div><div class='del'>-           this.</div><div class='del'>-	'resync' or 'recovery' can be used to restart the</div><div class='del'>-           corresponding operation if it was stopped with 'idle'.</div><div class='del'>-	'check' and 'repair' will start the appropriate process</div><div class='del'>-           providing the current state is 'idle'.</div><div class='del'>-</div><div class='del'>-      This file responds to select/poll.  Any important change in the value</div><div class='del'>-      triggers a poll event.  Sometimes the value will briefly be</div><div class='del'>-      "recover" if a recovery seems to be needed, but cannot be</div><div class='del'>-      achieved. In that case, the transition to "recover" isn't</div><div class='del'>-      notified, but the transition away is.</div><div class='del'>-</div><div class='del'>-   degraded</div><div class='del'>-      This contains a count of the number of devices by which the</div><div class='del'>-      arrays is degraded.  So an optimal array will show '0'.  A</div><div class='del'>-      single failed/missing drive will show '1', etc.</div><div class='del'>-      This file responds to select/poll, any increase or decrease</div><div class='del'>-      in the count of missing devices will trigger an event.</div><div class='del'>-</div><div class='del'>-   mismatch_count</div><div class='del'>-      When performing 'check' and 'repair', and possibly when</div><div class='del'>-      performing 'resync', md will count the number of errors that are</div><div class='del'>-      found.  The count in 'mismatch_cnt' is the number of sectors</div><div class='del'>-      that were re-written, or (for 'check') would have been</div><div class='del'>-      re-written.  As most raid levels work in units of pages rather</div><div class='del'>-      than sectors, this may be larger than the number of actual errors</div><div class='del'>-      by a factor of the number of sectors in a page.</div><div class='del'>-</div><div class='del'>-   bitmap_set_bits</div><div class='del'>-      If the array has a write-intent bitmap, then writing to this</div><div class='del'>-      attribute can set bits in the bitmap, indicating that a resync</div><div class='del'>-      would need to check the corresponding blocks. Either individual</div><div class='del'>-      numbers or start-end pairs can be written.  Multiple numbers</div><div class='del'>-      can be separated by a space.</div><div class='del'>-      Note that the numbers are 'bit' numbers, not 'block' numbers.</div><div class='del'>-      They should be scaled by the bitmap_chunksize.</div><div class='del'>-</div><div class='del'>-   sync_speed_min</div><div class='del'>-   sync_speed_max</div><div class='del'>-     This are similar to /proc/sys/dev/raid/speed_limit_{min,max}</div><div class='del'>-     however they only apply to the particular array.</div><div class='del'>-     If no value has been written to these, or if the word 'system'</div><div class='del'>-     is written, then the system-wide value is used.  If a value,</div><div class='del'>-     in kibibytes-per-second is written, then it is used.</div><div class='del'>-     When the files are read, they show the currently active value</div><div class='del'>-     followed by "(local)" or "(system)" depending on whether it is</div><div class='del'>-     a locally set or system-wide value.</div><div class='del'>-</div><div class='del'>-   sync_completed</div><div class='del'>-     This shows the number of sectors that have been completed of</div><div class='del'>-     whatever the current sync_action is, followed by the number of</div><div class='del'>-     sectors in total that could need to be processed.  The two</div><div class='del'>-     numbers are separated by a '/'  thus effectively showing one</div><div class='del'>-     value, a fraction of the process that is complete.</div><div class='del'>-     A 'select' on this attribute will return when resync completes,</div><div class='del'>-     when it reaches the current sync_max (below) and possibly at</div><div class='del'>-     other times.</div><div class='del'>-</div><div class='del'>-   sync_speed</div><div class='del'>-     This shows the current actual speed, in K/sec, of the current</div><div class='del'>-     sync_action.  It is averaged over the last 30 seconds.</div><div class='del'>-</div><div class='del'>-   suspend_lo</div><div class='del'>-   suspend_hi</div><div class='del'>-     The two values, given as numbers of sectors, indicate a range</div><div class='del'>-     within the array where IO will be blocked.  This is currently</div><div class='del'>-     only supported for raid4/5/6.</div><div class='del'>-</div><div class='del'>-   sync_min</div><div class='del'>-   sync_max</div><div class='del'>-     The two values, given as numbers of sectors, indicate a range</div><div class='del'>-     within the array where 'check'/'repair' will operate. Must be</div><div class='del'>-     a multiple of chunk_size. When it reaches "sync_max" it will</div><div class='del'>-     pause, rather than complete.</div><div class='del'>-     You can use 'select' or 'poll' on "sync_completed" to wait for</div><div class='del'>-     that number to reach sync_max.  Then you can either increase</div><div class='del'>-     "sync_max", or can write 'idle' to "sync_action".</div><div class='del'>-</div><div class='del'>-     The value of 'max' for "sync_max" effectively disables the limit.</div><div class='del'>-     When a resync is active, the value can only ever be increased,</div><div class='del'>-     never decreased.</div><div class='del'>-     The value of '0' is the minimum for "sync_min".</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Each active md device may also have attributes specific to the</div><div class='del'>-personality module that manages it.</div><div class='del'>-These are specific to the implementation of the module and could</div><div class='del'>-change substantially if the implementation changes.</div><div class='del'>-</div><div class='del'>-These currently include</div><div class='del'>-</div><div class='del'>-  stripe_cache_size  (currently raid5 only)</div><div class='del'>-      number of entries in the stripe cache.  This is writable, but</div><div class='del'>-      there are upper and lower limits (32768, 17).  Default is 256.</div><div class='del'>-  strip_cache_active (currently raid5 only)</div><div class='del'>-      number of active entries in the stripe cache</div><div class='del'>-  preread_bypass_threshold (currently raid5 only)</div><div class='del'>-      number of times a stripe requiring preread will be bypassed by</div><div class='del'>-      a stripe that does not require preread.  For fairness defaults</div><div class='del'>-      to 1.  Setting this to 0 disables bypass accounting and</div><div class='del'>-      requires preread stripes to wait until all full-width stripe-</div><div class='del'>-      writes are complete.  Valid values are 0 to stripe_cache_size.</div><div class='head'>diff --git a/Documentation/md-cluster.txt b/Documentation/md/md-cluster.txt<br/>index 38883276d31c..38883276d31c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/md-cluster.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/md-cluster.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/md/md-cluster.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/md/md-cluster.txt</a></div><div class='head'>diff --git a/Documentation/md/raid5-cache.txt b/Documentation/md/raid5-cache.txt<br/>new file mode 100644<br/>index 000000000000..2b210f295786<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/md/raid5-cache.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/md/raid5-cache.txt</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+RAID5 cache</div><div class='add'>+</div><div class='add'>+Raid 4/5/6 could include an extra disk for data cache besides normal RAID</div><div class='add'>+disks. The role of RAID disks isn't changed with the cache disk. The cache disk</div><div class='add'>+caches data to the RAID disks. The cache can be in write-through (supported</div><div class='add'>+since 4.4) or write-back mode (supported since 4.10). mdadm (supported since</div><div class='add'>+3.4) has a new option '--write-journal' to create array with cache. Please</div><div class='add'>+refer to mdadm manual for details. By default (RAID array starts), the cache is</div><div class='add'>+in write-through mode. A user can switch it to write-back mode by:</div><div class='add'>+</div><div class='add'>+echo "write-back" &gt; /sys/block/md0/md/journal_mode</div><div class='add'>+</div><div class='add'>+And switch it back to write-through mode by:</div><div class='add'>+</div><div class='add'>+echo "write-through" &gt; /sys/block/md0/md/journal_mode</div><div class='add'>+</div><div class='add'>+In both modes, all writes to the array will hit cache disk first. This means</div><div class='add'>+the cache disk must be fast and sustainable.</div><div class='add'>+</div><div class='add'>+-------------------------------------</div><div class='add'>+write-through mode:</div><div class='add'>+</div><div class='add'>+This mode mainly fixes the 'write hole' issue. For RAID 4/5/6 array, an unclean</div><div class='add'>+shutdown can cause data in some stripes to not be in consistent state, eg, data</div><div class='add'>+and parity don't match. The reason is that a stripe write involves several RAID</div><div class='add'>+disks and it's possible the writes don't hit all RAID disks yet before the</div><div class='add'>+unclean shutdown. We call an array degraded if it has inconsistent data. MD</div><div class='add'>+tries to resync the array to bring it back to normal state. But before the</div><div class='add'>+resync completes, any system crash will expose the chance of real data</div><div class='add'>+corruption in the RAID array. This problem is called 'write hole'.</div><div class='add'>+</div><div class='add'>+The write-through cache will cache all data on cache disk first. After the data</div><div class='add'>+is safe on the cache disk, the data will be flushed onto RAID disks. The</div><div class='add'>+two-step write will guarantee MD can recover correct data after unclean</div><div class='add'>+shutdown even the array is degraded. Thus the cache can close the 'write hole'.</div><div class='add'>+</div><div class='add'>+In write-through mode, MD reports IO completion to upper layer (usually</div><div class='add'>+filesystems) after the data is safe on RAID disks, so cache disk failure</div><div class='add'>+doesn't cause data loss. Of course cache disk failure means the array is</div><div class='add'>+exposed to 'write hole' again.</div><div class='add'>+</div><div class='add'>+In write-through mode, the cache disk isn't required to be big. Several</div><div class='add'>+hundreds megabytes are enough.</div><div class='add'>+</div><div class='add'>+--------------------------------------</div><div class='add'>+write-back mode:</div><div class='add'>+</div><div class='add'>+write-back mode fixes the 'write hole' issue too, since all write data is</div><div class='add'>+cached on cache disk. But the main goal of 'write-back' cache is to speed up</div><div class='add'>+write. If a write crosses all RAID disks of a stripe, we call it full-stripe</div><div class='add'>+write. For non-full-stripe writes, MD must read old data before the new parity</div><div class='add'>+can be calculated. These synchronous reads hurt write throughput. Some writes</div><div class='add'>+which are sequential but not dispatched in the same time will suffer from this</div><div class='add'>+overhead too. Write-back cache will aggregate the data and flush the data to</div><div class='add'>+RAID disks only after the data becomes a full stripe write. This will</div><div class='add'>+completely avoid the overhead, so it's very helpful for some workloads. A</div><div class='add'>+typical workload which does sequential write followed by fsync is an example.</div><div class='add'>+</div><div class='add'>+In write-back mode, MD reports IO completion to upper layer (usually</div><div class='add'>+filesystems) right after the data hits cache disk. The data is flushed to raid</div><div class='add'>+disks later after specific conditions met. So cache disk failure will cause</div><div class='add'>+data loss.</div><div class='add'>+</div><div class='add'>+In write-back mode, MD also caches data in memory. The memory cache includes</div><div class='add'>+the same data stored on cache disk, so a power loss doesn't cause data loss.</div><div class='add'>+The memory cache size has performance impact for the array. It's recommended</div><div class='add'>+the size is big. A user can configure the size by:</div><div class='add'>+</div><div class='add'>+echo "2048" &gt; /sys/block/md0/md/stripe_cache_size</div><div class='add'>+</div><div class='add'>+Too small cache disk will make the write aggregation less efficient in this</div><div class='add'>+mode depending on the workloads. It's recommended to use a cache disk with at</div><div class='add'>+least several gigabytes size in write-back mode.</div><div class='add'>+</div><div class='add'>+--------------------------------------</div><div class='add'>+The implementation:</div><div class='add'>+</div><div class='add'>+The write-through and write-back cache use the same disk format. The cache disk</div><div class='add'>+is organized as a simple write log. The log consists of 'meta data' and 'data'</div><div class='add'>+pairs. The meta data describes the data. It also includes checksum and sequence</div><div class='add'>+ID for recovery identification. Data can be IO data and parity data. Data is</div><div class='add'>+checksumed too. The checksum is stored in the meta data ahead of the data. The</div><div class='add'>+checksum is an optimization because MD can write meta and data freely without</div><div class='add'>+worry about the order. MD superblock has a field pointed to the valid meta data</div><div class='add'>+of log head.</div><div class='add'>+</div><div class='add'>+The log implementation is pretty straightforward. The difficult part is the</div><div class='add'>+order in which MD writes data to cache disk and RAID disks. Specifically, in</div><div class='add'>+write-through mode, MD calculates parity for IO data, writes both IO data and</div><div class='add'>+parity to the log, writes the data and parity to RAID disks after the data and</div><div class='add'>+parity is settled down in log and finally the IO is finished. Read just reads</div><div class='add'>+from raid disks as usual.</div><div class='add'>+</div><div class='add'>+In write-back mode, MD writes IO data to the log and reports IO completion. The</div><div class='add'>+data is also fully cached in memory at that time, which means read must query</div><div class='add'>+memory cache. If some conditions are met, MD will flush the data to RAID disks.</div><div class='add'>+MD will calculate parity for the data and write parity into the log. After this</div><div class='add'>+is finished, MD will write both data and parity into RAID disks, then MD can</div><div class='add'>+release the memory cache. The flush conditions could be stripe becomes a full</div><div class='add'>+stripe write, free cache disk space is low or free in-kernel memory cache space</div><div class='add'>+is low.</div><div class='add'>+</div><div class='add'>+After an unclean shutdown, MD does recovery. MD reads all meta data and data</div><div class='add'>+from the log. The sequence ID and checksum will help us detect corrupted meta</div><div class='add'>+data and data. If MD finds a stripe with data and valid parities (1 parity for</div><div class='add'>+raid4/5 and 2 for raid6), MD will write the data and parities to RAID disks. If</div><div class='add'>+parities are incompleted, they are discarded. If part of data is corrupted,</div><div class='add'>+they are discarded too. MD then loads valid data and writes them to RAID disks</div><div class='add'>+in normal way.</div><div class='head'>diff --git a/Documentation/media/.gitignore b/Documentation/media/.gitignore<br/>new file mode 100644<br/>index 000000000000..08b21de3ef94<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/.gitignore</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+*.pdf</div><div class='add'>+# Files generated from *.dot</div><div class='add'>+uapi/v4l/pipeline.svg</div><div class='head'>diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile<br/>index a7fb35291f6c..9b3e70b2cab2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/Makefile</a></div><div class='hunk'>@@ -1,23 +1,60 @@</div><div class='del'>-# Generate the *.h.rst files from uAPI headers</div><div class='add'>+# Rules to convert DOT and SVG to Sphinx images</div><div class='add'>+</div><div class='add'>+SRC_DIR=$(srctree)/Documentation/media</div><div class='add'>+</div><div class='add'>+DOTS = \</div><div class='add'>+	uapi/v4l/pipeline.dot \</div><div class='add'>+</div><div class='add'>+IMAGES = \</div><div class='add'>+	typical_media_device.svg \</div><div class='add'>+	uapi/dvb/dvbstb.svg \</div><div class='add'>+	uapi/v4l/bayer.svg \</div><div class='add'>+	uapi/v4l/constraints.svg \</div><div class='add'>+	uapi/v4l/crop.svg \</div><div class='add'>+	uapi/v4l/fieldseq_bt.svg \</div><div class='add'>+	uapi/v4l/fieldseq_tb.svg \</div><div class='add'>+	uapi/v4l/nv12mt.svg \</div><div class='add'>+	uapi/v4l/nv12mt_example.svg \</div><div class='add'>+	uapi/v4l/pipeline.svg \</div><div class='add'>+	uapi/v4l/selection.svg \</div><div class='add'>+	uapi/v4l/subdev-image-processing-full.svg \</div><div class='add'>+	uapi/v4l/subdev-image-processing-scaling-multi-source.svg \</div><div class='add'>+	uapi/v4l/subdev-image-processing-crop.svg \</div><div class='add'>+	uapi/v4l/vbi_525.svg \</div><div class='add'>+	uapi/v4l/vbi_625.svg \</div><div class='add'>+	uapi/v4l/vbi_hsync.svg \</div><div class='add'>+</div><div class='add'>+DOTTGT := $(patsubst %.dot,%.svg,$(DOTS))</div><div class='add'>+IMGDOT := $(patsubst %,$(SRC_DIR)/%,$(DOTTGT))</div><div class='add'>+</div><div class='add'>+IMGTGT := $(patsubst %.svg,%.pdf,$(IMAGES))</div><div class='add'>+IMGPDF := $(patsubst %,$(SRC_DIR)/%,$(IMGTGT))</div><div class='add'>+</div><div class='add'>+cmd = $(echo-cmd) $(cmd_$(1))</div><div class='add'>+</div><div class='add'>+quiet_cmd_genpdf = GENPDF  $2</div><div class='add'>+      cmd_genpdf = convert $2 $3</div><div class='add'>+</div><div class='add'>+quiet_cmd_gendot = DOT     $2</div><div class='add'>+      cmd_gendot = dot -Tsvg $2 &gt; $3 || { rm -f $3; exit 1; }</div><div class='add'>+</div><div class='add'>+%.pdf: %.svg</div><div class='add'>+	@$(call cmd,genpdf,$&lt;,$@)</div><div class='add'>+</div><div class='add'>+%.svg: %.dot</div><div class='add'>+	@$(call cmd,gendot,$&lt;,$@)</div><div class='add'>+</div><div class='add'>+# Rules to convert a .h file to inline RST documentation</div><div class='ctx'> </div><div class='ctx'> PARSER = $(srctree)/Documentation/sphinx/parse-headers.pl</div><div class='ctx'> UAPI = $(srctree)/include/uapi/linux</div><div class='ctx'> KAPI = $(srctree)/include/linux</div><div class='del'>-SRC_DIR=$(srctree)/Documentation/media</div><div class='ctx'> </div><div class='ctx'> FILES = audio.h.rst ca.h.rst dmx.h.rst frontend.h.rst net.h.rst video.h.rst \</div><div class='ctx'> 	  videodev2.h.rst media.h.rst cec.h.rst lirc.h.rst</div><div class='ctx'> </div><div class='ctx'> TARGETS := $(addprefix $(BUILDDIR)/, $(FILES))</div><div class='ctx'> </div><div class='del'>-.PHONY: all</div><div class='del'>-all: $(BUILDDIR) ${TARGETS}</div><div class='del'>-</div><div class='del'>-$(BUILDDIR):</div><div class='del'>-	$(Q)mkdir -p $@</div><div class='del'>-</div><div class='del'>-# Rule to convert a .h file to inline RST documentation</div><div class='del'>-</div><div class='ctx'> gen_rst = \</div><div class='ctx'> 	echo ${PARSER} $&lt; $@ $(SRC_DIR)/$(notdir $@).exceptions; \</div><div class='ctx'> 	${PARSER} $&lt; $@ $(SRC_DIR)/$(notdir $@).exceptions</div><div class='hunk'>@@ -51,11 +88,25 @@ $(BUILDDIR)/videodev2.h.rst: ${UAPI}/videodev2.h ${PARSER} $(SRC_DIR)/videodev2.</div><div class='ctx'> $(BUILDDIR)/media.h.rst: ${UAPI}/media.h ${PARSER} $(SRC_DIR)/media.h.rst.exceptions</div><div class='ctx'> 	@$($(quiet)gen_rst)</div><div class='ctx'> </div><div class='del'>-$(BUILDDIR)/cec.h.rst: ${KAPI}/cec.h ${PARSER} $(SRC_DIR)/cec.h.rst.exceptions</div><div class='add'>+$(BUILDDIR)/cec.h.rst: ${UAPI}/cec.h ${PARSER} $(SRC_DIR)/cec.h.rst.exceptions</div><div class='ctx'> 	@$($(quiet)gen_rst)</div><div class='ctx'> </div><div class='ctx'> $(BUILDDIR)/lirc.h.rst: ${UAPI}/lirc.h ${PARSER} $(SRC_DIR)/lirc.h.rst.exceptions</div><div class='ctx'> 	@$($(quiet)gen_rst)</div><div class='ctx'> </div><div class='del'>-cleandocs:</div><div class='del'>-	-rm ${TARGETS}</div><div class='add'>+# Media build rules</div><div class='add'>+</div><div class='add'>+.PHONY: all html epub xml latex</div><div class='add'>+</div><div class='add'>+all: $(IMGDOT) $(BUILDDIR) ${TARGETS}</div><div class='add'>+html: all</div><div class='add'>+epub: all</div><div class='add'>+xml: all</div><div class='add'>+latex: $(IMGPDF) all</div><div class='add'>+linkcheck:</div><div class='add'>+</div><div class='add'>+clean:</div><div class='add'>+	-rm -f $(DOTTGT) $(IMGTGT) ${TARGETS} 2&gt;/dev/null</div><div class='add'>+</div><div class='add'>+$(BUILDDIR):</div><div class='add'>+	$(Q)mkdir -p $@</div><div class='head'>diff --git a/Documentation/media/dvb-drivers/ci.rst b/Documentation/media/dvb-drivers/ci.rst<br/>index 8124bf5ce5ef..69b07e9d1816 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/dvb-drivers/ci.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/dvb-drivers/ci.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/dvb-drivers/ci.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/dvb-drivers/ci.rst</a></div><div class='hunk'>@@ -20,7 +20,7 @@ existing low level CI API.</div><div class='ctx'> ca_zap</div><div class='ctx'> ~~~~~~</div><div class='ctx'> </div><div class='del'>-An userspace application, like ``ca_zap`` is required to handle encrypted</div><div class='add'>+A userspace application, like ``ca_zap`` is required to handle encrypted</div><div class='ctx'> MPEG-TS streams.</div><div class='ctx'> </div><div class='ctx'> The ``ca_zap`` userland application is in charge of sending the</div><div class='head'>diff --git a/Documentation/media/dvb-drivers/intro.rst b/Documentation/media/dvb-drivers/intro.rst<br/>index 7681835ea76d..d6eeb2708b9b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/dvb-drivers/intro.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/dvb-drivers/intro.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/dvb-drivers/intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/dvb-drivers/intro.rst</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-Introdution</div><div class='del'>-===========</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='ctx'> </div><div class='ctx'> The main development site and GIT repository for these</div><div class='ctx'> drivers is https://linuxtv.org.</div><div class='head'>diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst<br/>index e347a3e7bdef..7f8f0af620ce 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/index.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/index.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/index.rst</a></div><div class='hunk'>@@ -1,11 +1,6 @@</div><div class='ctx'> Linux Media Subsystem Documentation</div><div class='ctx'> ===================================</div><div class='ctx'> </div><div class='del'>-.. Sphinx 1.4.x has a definition for DUrole that doesn't work on alltt blocks</div><div class='del'>-.. raw:: latex</div><div class='del'>-</div><div class='del'>-	\renewcommand*{\DUrole}[2]{ #2 }</div><div class='del'>-</div><div class='ctx'> Contents:</div><div class='ctx'> </div><div class='ctx'> .. toctree::</div><div class='head'>diff --git a/Documentation/media/intro.rst b/Documentation/media/intro.rst<br/>index f6086c159772..8f7490c9a8ef 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/intro.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/intro.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/intro.rst</a></div><div class='hunk'>@@ -13,8 +13,8 @@ A typical media device hardware is shown at :ref:`typical_media_device`.</div><div class='ctx'> </div><div class='ctx'> .. _typical_media_device:</div><div class='ctx'> </div><div class='del'>-.. figure::  media_api_files/typical_media_device.*</div><div class='del'>-    :alt:    typical_media_device.svg</div><div class='add'>+.. figure::  typical_media_device.*</div><div class='add'>+    :alt:    typical_media_device.pdf / typical_media_device.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     Typical Media Device</div><div class='head'>diff --git a/Documentation/media/kapi/cec-core.rst b/Documentation/media/kapi/cec-core.rst<br/>index 88c33b53ec13..81c6d8e93774 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/kapi/cec-core.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/kapi/cec-core.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/kapi/cec-core.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/kapi/cec-core.rst</a></div><div class='hunk'>@@ -37,9 +37,8 @@ The struct cec_adapter represents the CEC adapter hardware. It is created by</div><div class='ctx'> calling cec_allocate_adapter() and deleted by calling cec_delete_adapter():</div><div class='ctx'> </div><div class='ctx'> .. c:function::</div><div class='del'>-   struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,</div><div class='del'>-	       void *priv, const char *name, u32 caps, u8 available_las,</div><div class='del'>-	       struct device *parent);</div><div class='add'>+   struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops, void *priv,</div><div class='add'>+   const char *name, u32 caps, u8 available_las);</div><div class='ctx'> </div><div class='ctx'> .. c:function::</div><div class='ctx'>    void cec_delete_adapter(struct cec_adapter *adap);</div><div class='hunk'>@@ -66,20 +65,19 @@ available_las:</div><div class='ctx'> 	the number of simultaneous logical addresses that this</div><div class='ctx'> 	adapter can handle. Must be 1 &lt;= available_las &lt;= CEC_MAX_LOG_ADDRS.</div><div class='ctx'> </div><div class='del'>-parent:</div><div class='del'>-	the parent device.</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> To register the /dev/cecX device node and the remote control device (if</div><div class='ctx'> CEC_CAP_RC is set) you call:</div><div class='ctx'> </div><div class='ctx'> .. c:function::</div><div class='del'>-	int cec_register_adapter(struct cec_adapter \*adap);</div><div class='add'>+	int cec_register_adapter(struct cec_adapter *adap, struct device *parent);</div><div class='add'>+</div><div class='add'>+where parent is the parent device.</div><div class='ctx'> </div><div class='ctx'> To unregister the devices call:</div><div class='ctx'> </div><div class='ctx'> .. c:function::</div><div class='del'>-	void cec_unregister_adapter(struct cec_adapter \*adap);</div><div class='add'>+	void cec_unregister_adapter(struct cec_adapter *adap);</div><div class='ctx'> </div><div class='ctx'> Note: if cec_register_adapter() fails, then call cec_delete_adapter() to</div><div class='ctx'> clean up. But if cec_register_adapter() succeeded, then only call</div><div class='hunk'>@@ -106,13 +104,13 @@ your driver:</div><div class='ctx'> 		int (*adap_log_addr)(struct cec_adapter *adap, u8 logical_addr);</div><div class='ctx'> 		int (*adap_transmit)(struct cec_adapter *adap, u8 attempts,</div><div class='ctx'> 				      u32 signal_free_time, struct cec_msg *msg);</div><div class='del'>-		void (\*adap_log_status)(struct cec_adapter *adap);</div><div class='add'>+		void (*adap_status)(struct cec_adapter *adap, struct seq_file *file);</div><div class='ctx'> </div><div class='ctx'> 		/* High-level callbacks */</div><div class='ctx'> 		...</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-The three low-level ops deal with various aspects of controlling the CEC adapter</div><div class='add'>+The five low-level ops deal with various aspects of controlling the CEC adapter</div><div class='ctx'> hardware:</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -238,6 +236,18 @@ When a CEC message was received:</div><div class='ctx'> </div><div class='ctx'> Speaks for itself.</div><div class='ctx'> </div><div class='add'>+Implementing the interrupt handler</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+Typically the CEC hardware provides interrupts that signal when a transmit</div><div class='add'>+finished and whether it was successful or not, and it provides and interrupt</div><div class='add'>+when a CEC message was received.</div><div class='add'>+</div><div class='add'>+The CEC driver should always process the transmit interrupts first before</div><div class='add'>+handling the receive interrupt. The framework expects to see the cec_transmit_done</div><div class='add'>+call before the cec_received_msg call, otherwise it can get confused if the</div><div class='add'>+received message was in reply to the transmitted message.</div><div class='add'>+</div><div class='ctx'> Implementing the High-Level CEC Adapter</div><div class='ctx'> ---------------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -247,11 +257,11 @@ CEC protocol driven. The following high-level callbacks are available:</div><div class='ctx'> .. code-block:: none</div><div class='ctx'> </div><div class='ctx'> 	struct cec_adap_ops {</div><div class='del'>-		/\* Low-level callbacks \*/</div><div class='add'>+		/* Low-level callbacks */</div><div class='ctx'> 		...</div><div class='ctx'> </div><div class='del'>-		/\* High-level CEC message callback \*/</div><div class='del'>-		int (\*received)(struct cec_adapter \*adap, struct cec_msg \*msg);</div><div class='add'>+		/* High-level CEC message callback */</div><div class='add'>+		int (*received)(struct cec_adapter *adap, struct cec_msg *msg);</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> The received() callback allows the driver to optionally handle a newly</div><div class='hunk'>@@ -263,7 +273,7 @@ received CEC message</div><div class='ctx'> If the driver wants to process a CEC message, then it can implement this</div><div class='ctx'> callback. If it doesn't want to handle this message, then it should return</div><div class='ctx'> -ENOMSG, otherwise the CEC framework assumes it processed this message and</div><div class='del'>-it will not no anything with it.</div><div class='add'>+it will not do anything with it.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> CEC framework functions</div><div class='head'>diff --git a/Documentation/media/kapi/csi2.rst b/Documentation/media/kapi/csi2.rst<br/>new file mode 100644<br/>index 000000000000..2004db00b12b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/kapi/csi2.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/kapi/csi2.rst</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+MIPI CSI-2</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+CSI-2 is a data bus intended for transferring images from cameras to</div><div class='add'>+the host SoC. It is defined by the `MIPI alliance`_.</div><div class='add'>+</div><div class='add'>+.. _`MIPI alliance`: http://www.mipi.org/</div><div class='add'>+</div><div class='add'>+Transmitter drivers</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+CSI-2 transmitter, such as a sensor or a TV tuner, drivers need to</div><div class='add'>+provide the CSI-2 receiver with information on the CSI-2 bus</div><div class='add'>+configuration. These include the V4L2_CID_LINK_FREQ and</div><div class='add'>+V4L2_CID_PIXEL_RATE controls and</div><div class='add'>+(:c:type:`v4l2_subdev_video_ops`-&gt;s_stream() callback). These</div><div class='add'>+interface elements must be present on the sub-device represents the</div><div class='add'>+CSI-2 transmitter.</div><div class='add'>+</div><div class='add'>+The V4L2_CID_LINK_FREQ control is used to tell the receiver driver the</div><div class='add'>+frequency (and not the symbol rate) of the link. The</div><div class='add'>+V4L2_CID_PIXEL_RATE is may be used by the receiver to obtain the pixel</div><div class='add'>+rate the transmitter uses. The</div><div class='add'>+:c:type:`v4l2_subdev_video_ops`-&gt;s_stream() callback provides an</div><div class='add'>+ability to start and stop the stream.</div><div class='add'>+</div><div class='add'>+The value of the V4L2_CID_PIXEL_RATE is calculated as follows::</div><div class='add'>+</div><div class='add'>+	pixel_rate = link_freq * 2 * nr_of_lanes / bits_per_sample</div><div class='add'>+</div><div class='add'>+where</div><div class='add'>+</div><div class='add'>+.. list-table:: variables in pixel rate calculation</div><div class='add'>+   :header-rows: 1</div><div class='add'>+</div><div class='add'>+   * - variable or constant</div><div class='add'>+     - description</div><div class='add'>+   * - link_freq</div><div class='add'>+     - The value of the V4L2_CID_LINK_FREQ integer64 menu item.</div><div class='add'>+   * - nr_of_lanes</div><div class='add'>+     - Number of data lanes used on the CSI-2 link. This can</div><div class='add'>+       be obtained from the OF endpoint configuration.</div><div class='add'>+   * - 2</div><div class='add'>+     - Two bits are transferred per clock cycle per lane.</div><div class='add'>+   * - bits_per_sample</div><div class='add'>+     - Number of bits per sample.</div><div class='add'>+</div><div class='add'>+The transmitter drivers must configure the CSI-2 transmitter to *LP-11</div><div class='add'>+mode* whenever the transmitter is powered on but not active. Some</div><div class='add'>+transmitters do this automatically but some have to be explicitly</div><div class='add'>+programmed to do so.</div><div class='add'>+</div><div class='add'>+Receiver drivers</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Before the receiver driver may enable the CSI-2 transmitter by using</div><div class='add'>+the :c:type:`v4l2_subdev_video_ops`-&gt;s_stream(), it must have powered</div><div class='add'>+the transmitter up by using the</div><div class='add'>+:c:type:`v4l2_subdev_core_ops`-&gt;s_power() callback. This may take</div><div class='add'>+place either indirectly by using :c:func:`v4l2_pipeline_pm_use` or</div><div class='add'>+directly.</div><div class='head'>diff --git a/Documentation/media/kapi/dtv-core.rst b/Documentation/media/kapi/dtv-core.rst<br/>index a3c4642eabfc..ff86bf0abeae 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/kapi/dtv-core.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/kapi/dtv-core.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/kapi/dtv-core.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/kapi/dtv-core.rst</a></div><div class='hunk'>@@ -8,14 +8,6 @@ Digital TV Common functions</div><div class='ctx'> </div><div class='ctx'> .. kernel-doc:: drivers/media/dvb-core/dvbdev.h</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/media/dvb-core/dvb_math.h</div><div class='del'>-   :export: drivers/media/dvb-core/dvb_math.c</div><div class='del'>-</div><div class='del'>-.. kernel-doc:: drivers/media/dvb-core/dvbdev.h</div><div class='del'>-   :export: drivers/media/dvb-core/dvbdev.c</div><div class='del'>-</div><div class='ctx'> Digital TV Ring buffer</div><div class='ctx'> ----------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/kapi/mc-core.rst b/Documentation/media/kapi/mc-core.rst<br/>index 1a738e5f6056..0c05503eaf1f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/kapi/mc-core.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/kapi/mc-core.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/kapi/mc-core.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/kapi/mc-core.rst</a></div><div class='hunk'>@@ -162,13 +162,13 @@ framework provides a depth-first graph traversal API for that purpose.</div><div class='ctx'>    currently defined as 16.</div><div class='ctx'> </div><div class='ctx'> Drivers initiate a graph traversal by calling</div><div class='del'>-:c:func:`media_entity_graph_walk_start()`</div><div class='add'>+:c:func:`media_graph_walk_start()`</div><div class='ctx'> </div><div class='ctx'> The graph structure, provided by the caller, is initialized to start graph</div><div class='ctx'> traversal at the given entity.</div><div class='ctx'> </div><div class='ctx'> Drivers can then retrieve the next entity by calling</div><div class='del'>-:c:func:`media_entity_graph_walk_next()`</div><div class='add'>+:c:func:`media_graph_walk_next()`</div><div class='ctx'> </div><div class='ctx'> When the graph traversal is complete the function will return ``NULL``.</div><div class='ctx'> </div><div class='hunk'>@@ -206,7 +206,7 @@ Pipelines and media streams</div><div class='ctx'> </div><div class='ctx'> When starting streaming, drivers must notify all entities in the pipeline to</div><div class='ctx'> prevent link states from being modified during streaming by calling</div><div class='del'>-:c:func:`media_entity_pipeline_start()`.</div><div class='add'>+:c:func:`media_pipeline_start()`.</div><div class='ctx'> </div><div class='ctx'> The function will mark all entities connected to the given entity through</div><div class='ctx'> enabled links, either directly or indirectly, as streaming.</div><div class='hunk'>@@ -218,17 +218,17 @@ in higher-level pipeline structures and can then access the</div><div class='ctx'> pipeline through the struct :c:type:`media_entity`</div><div class='ctx'> pipe field.</div><div class='ctx'> </div><div class='del'>-Calls to :c:func:`media_entity_pipeline_start()` can be nested.</div><div class='add'>+Calls to :c:func:`media_pipeline_start()` can be nested.</div><div class='ctx'> The pipeline pointer must be identical for all nested calls to the function.</div><div class='ctx'> </div><div class='del'>-:c:func:`media_entity_pipeline_start()` may return an error. In that case,</div><div class='add'>+:c:func:`media_pipeline_start()` may return an error. In that case,</div><div class='ctx'> it will clean up any of the changes it did by itself.</div><div class='ctx'> </div><div class='ctx'> When stopping the stream, drivers must notify the entities with</div><div class='del'>-:c:func:`media_entity_pipeline_stop()`.</div><div class='add'>+:c:func:`media_pipeline_stop()`.</div><div class='ctx'> </div><div class='del'>-If multiple calls to :c:func:`media_entity_pipeline_start()` have been</div><div class='del'>-made the same number of :c:func:`media_entity_pipeline_stop()` calls</div><div class='add'>+If multiple calls to :c:func:`media_pipeline_start()` have been</div><div class='add'>+made the same number of :c:func:`media_pipeline_stop()` calls</div><div class='ctx'> are required to stop streaming.</div><div class='ctx'> The :c:type:`media_entity`.\ ``pipe`` field is reset to ``NULL`` on the last</div><div class='ctx'> nested stop call.</div><div class='hunk'>@@ -245,7 +245,7 @@ operation must be done with the media_device graph_mutex held.</div><div class='ctx'> Link validation</div><div class='ctx'> ^^^^^^^^^^^^^^^</div><div class='ctx'> </div><div class='del'>-Link validation is performed by :c:func:`media_entity_pipeline_start()`</div><div class='add'>+Link validation is performed by :c:func:`media_pipeline_start()`</div><div class='ctx'> for any entity which has sink pads in the pipeline. The</div><div class='ctx'> :c:type:`media_entity`.\ ``link_validate()`` callback is used for that</div><div class='ctx'> purpose. In ``link_validate()`` callback, entity driver should check</div><div class='head'>diff --git a/Documentation/media/media_api_files/typical_media_device.pdf b/Documentation/media/media_api_files/typical_media_device.pdf<br/>deleted file mode 100644<br/>index d000d802b20f..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/media_api_files/typical_media_device.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/media_api_files/typical_media_device.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/media_api_files/typical_media_device.svg b/Documentation/media/media_api_files/typical_media_device.svg<br/>deleted file mode 100644<br/>index f0c82f72c4b6..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/media_api_files/typical_media_device.svg?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/media_api_files/typical_media_device.svg</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='del'>-&lt;svg stroke-linejoin="round" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" clip-path="url(#a)" xml:space="preserve" fill-rule="evenodd" height="178.78mm" viewBox="0 0 24285.662 17877.829" width="251.99mm" version="1.2" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" preserveAspectRatio="xMidYMid" stroke-width="28.222"&gt;&lt;defs&gt;&lt;clipPath id="a" clipPathUnits="userSpaceOnUse"&gt;&lt;rect y="0" x="0" width="28000" height="21000"/&gt;&lt;/clipPath&gt;&lt;/defs&gt;&lt;g transform="matrix(1.004 0 0 1 -2185.6 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#fcf" d="m12231 4800c-516 0-1031 515-1031 1031v4124c0 516 515 1032 1031 1032h8538c516 0 1032-516 1032-1032v-4124c0-516-516-1031-1032-1031h-8538z"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#ffc" d="m3595 15607c-293 0-585 292-585 585v2340c0 293 292 586 585 586h3275c293 0 586-293 586-586v-2340c0-293-293-585-586-585h-3275z"/&gt;&lt;/g&gt;&lt;g transform="translate(-2197.3 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#e6e6e6" d="m2663 2186c-461 0-922 461-922 922v11169c0 461 461 923 922 923h3692c461 0 922-462 922-923v-11169c0-461-461-922-922-922h-3692z"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#ff8080" d="m4461 8602h-2260v-1086h4520v1086h-2260z"/&gt;&lt;path fill="none" d="m4461 8602h-2260v-1086h4520v1086h-2260z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="8275" x="2579" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Audio decoder&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#ff8080" d="m4461 11772h-2260v-1270h4520v1270h-2260z"/&gt;&lt;path fill="none" d="m4461 11772h-2260v-1270h4520v1270h-2260z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="11353" x="2617" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Video decoder&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#ff8080" d="m4453 10217h-2269v-1224h4537v1224h-2268z"/&gt;&lt;path fill="none" d="m4453 10217h-2269v-1224h4537v1224h-2268z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="9821" x="2571" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Audio encoder&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2468.2)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#cfc" d="m15711 12832h-3810v-1281h7620v1281h-3810z"/&gt;&lt;path fill="none" d="m15711 12832h-3810v-1281h7620v1281h-3810z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="12407" x="12377" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Button Key/IR input logic&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2411.8)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#cfe7f5" d="m14169 14572h-2268v-1412h4536v1412h-2268z"/&gt;&lt;path fill="none" d="m14169 14572h-2268v-1412h4536v1412h-2268z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="14082" x="12882" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;EEPROM&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#fc9" d="m5140 17662h-1563v-1715h3126v1715h-1563z"/&gt;&lt;path fill="none" d="m5140 17662h-1563v-1715h3126v1715h-1563z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="17020" x="4276" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Sensor&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m6719 8030 385-353v176h1167v-176l386 353-386 354v-177h-1167v177l-385-354z"/&gt;&lt;path fill="none" d="m6719 8030 385-353v176h1167v-176l386 353-386 354v-177h-1167v177l-385-354z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m6719 9612 385-353v176h1167v-176l386 353-386 354v-177h-1167v177l-385-354z"/&gt;&lt;path fill="none" d="m6719 9612 385-353v176h1167v-176l386 353-386 354v-177h-1167v177l-385-354z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m6721 11100 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z"/&gt;&lt;path fill="none" d="m6721 11100 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2411.8)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m9962 13854 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z"/&gt;&lt;path fill="none" d="m9962 13854 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2468.2)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m9962 12163 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z"/&gt;&lt;path fill="none" d="m9962 12163 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m9962 17158 670-353v176h2028v-176l671 353-671 354v-177h-2028v177l-670-354z"/&gt;&lt;path fill="none" d="m9962 17158 670-353v176h2028v-176l671 353-671 354v-177h-2028v177l-670-354z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="matrix(0 .83339 -1.0005 0 30268 -5276.3)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m23229 12779 1009-978 1009 978h-505v2959h505l-1009 979-1009-979h504v-2959h-504z"/&gt;&lt;path fill="none" d="m23229 12779 1009-978 1009 978h-505v2959h505l-1009 979-1009-979h504v-2959h-504z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-9973.6 -666.6)" class="com.sun.star.drawing.TextShape"&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="706px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="15832" x="24341" class="TextPosition" transform="matrix(0,-1,1,0,8509,40173)"&gt;&lt;tspan fill="#000000"&gt;System Bus&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#cff" d="m13151 9262h-1250v-875h2499v875h-1249z"/&gt;&lt;path fill="none" d="m13151 9262h-1250v-875h2499v875h-1249z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="9040" x="12215" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Demux&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m9996 8765 373-357v178h1130v-178l374 357-374 358v-179h-1130v179l-373-358z"/&gt;&lt;path fill="none" d="m9996 8765 373-357v178h1130v-178l374 357-374 358v-179h-1130v179l-373-358z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m9996 7378 373-358v179h1130v-179l374 358-374 358v-179h-1130v179l-373-358z"/&gt;&lt;path fill="none" d="m9996 7378 373-358v179h1130v-179l374 358-374 358v-179h-1130v179l-373-358z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#cff" d="m16322 7992h-4421v-1270h8841v1270h-4420z"/&gt;&lt;path fill="none" d="m16322 7992h-4421v-1270h8841v1270h-4420z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="7573" x="12786" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Conditional Access Module&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#ff8080" d="m4445 13287h-2269v-1224h4537v1224h-2268z"/&gt;&lt;path fill="none" d="m4445 13287h-2269v-1224h4537v1224h-2268z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="12891" x="2601" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Video encoder&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m6721 12634 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z"/&gt;&lt;path fill="none" d="m6721 12634 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m20791 7545 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z"/&gt;&lt;path fill="none" d="m20791 7545 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2028 -2186)" class="com.sun.star.drawing.TextShape"&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="14478" x="1990" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Radio / Analog TV&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.TextShape"&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="700" class="TextParagraph"&gt;&lt;tspan y="10724" x="14956" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Digital TV&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-8970.5 -1395.8)" class="com.sun.star.drawing.TextShape"&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="494px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="19167" x="14724" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;PS.: picture is not complete: other blocks may be present&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.TextShape"&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="18561" x="4199" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Webcam&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2468.2)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#f90" d="m14552 16372h-2650v-1412h5299v1412h-2649z"/&gt;&lt;path fill="none" d="m14552 16372h-2650v-1412h5299v1412h-2649z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="15882" x="12265" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Processing blocks&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2468.2)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m9962 15654 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z"/&gt;&lt;path fill="none" d="m9962 15654 385-353v176h1166v-176l386 353-386 354v-177h-1166v177l-385-354z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m6702 16954 397-353v176h1201v-176l398 353-398 354v-177h-1201v177l-397-354z"/&gt;&lt;path fill="none" d="m6702 16954 397-353v176h1201v-176l398 353-398 354v-177h-1201v177l-397-354z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2479.5 -2186)" class="com.sun.star.drawing.TextShape"&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="8792" x="22850" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Smartcard&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="matrix(1.0048 0 0 1 -2207.4 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#fcf" d="m2766 2600c-333 0-666 333-666 666v2668c0 333 333 666 666 666h18368c333 0 667-333 667-666v-2668c0-333-334-666-667-666h-18368z"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#ff8080" d="m5121 5155h-1614v-1816h3227v1816h-1613z"/&gt;&lt;path fill="none" d="m5121 5155h-1614v-1816h3227v1816h-1613z" stroke="#3465af"/&gt;&lt;text font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextShape"&gt;&lt;tspan class="TextParagraph"&gt;&lt;tspan y="4111" x="4374" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Tuner&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;tspan class="TextParagraph"&gt;&lt;tspan y="4814" x="4151" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;FM/TV&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#ff8080" d="m2902 3702c0 111 40 202 88 202h530c48 0 89-91 89-202 0-110-41-202-89-202h-530c-48 0-88 92-88 202z"/&gt;&lt;path fill="none" d="m2902 3702c0 111 40 202 88 202h530c48 0 89-91 89-202 0-110-41-202-89-202h-530c-48 0-88 92-88 202z" stroke="#3465af"/&gt;&lt;path fill="#ffb3b3" d="m2902 3702c0 111 40 202 88 202s88-91 88-202c0-110-40-202-88-202s-88 92-88 202z"/&gt;&lt;path fill="none" d="m2902 3702c0 111 40 202 88 202s88-91 88-202c0-110-40-202-88-202s-88 92-88 202z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#ff8080" d="m2903 4267c0 110 40 202 88 202h530c48 0 89-92 89-202s-41-203-89-203h-530c-48 0-88 93-88 203z"/&gt;&lt;path fill="none" d="m2903 4267c0 110 40 202 88 202h530c48 0 89-92 89-202s-41-203-89-203h-530c-48 0-88 93-88 203z" stroke="#3465af"/&gt;&lt;path fill="#ffb3b3" d="m2903 4267c0 110 40 202 88 202s88-92 88-202-40-203-88-203-88 93-88 203z"/&gt;&lt;path fill="none" d="m2903 4267c0 110 40 202 88 202s88-92 88-202-40-203-88-203-88 93-88 203z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m6719 4196 385-353v176h1167v-176l386 353-386 354v-177h-1167v177l-385-354z"/&gt;&lt;path fill="none" d="m6719 4196 385-353v176h1167v-176l386 353-386 354v-177h-1167v177l-385-354z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m9979 4150 402-368v184h1217v-184l403 368-403 369v-185h-1217v185l-402-369z"/&gt;&lt;path fill="none" d="m9979 4150 402-368v184h1217v-184l403 368-403 369v-185h-1217v185l-402-369z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.RectangleShape"&gt;&lt;path fill="#cff" d="m16500 6189h-4500v-1389h9e3v1389h-4500z"/&gt;&lt;path fill="none" d="m16500 6189h-4500v-1389h9e3v1389h-4500z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="5710" x="12051" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Satellite Equipment Control (SEC)&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#cff" d="m13400 4600h-1400v-1e3h2800v1e3h-1400z"/&gt;&lt;path fill="none" d="m13400 4600h-1400v-1e3h2800v1e3h-1400z" stroke="#3465af"/&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="4316" x="12465" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Demod&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="translate(-2140.9 -2186)" class="com.sun.star.drawing.CustomShape"&gt;&lt;path fill="#729fcf" d="m9979 5451 402-368v184h1217v-184l403 368-403 369v-185h-1217v185l-402-369z"/&gt;&lt;path fill="none" d="m9979 5451 402-368v184h1217v-184l403 368-403 369v-185h-1217v185l-402-369z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;path fill="#ff9" d="m7855.1 9099v7302h-1270v-14605h1270v7303z"/&gt;&lt;path fill="none" d="m7855.1 9099v7302h-1270v-14605h1270v7303z" stroke="#3465af"/&gt;&lt;text y="-6640.4663" x="-20770.572" transform="rotate(-90)" class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="7409.5396" x="-11193.634" class="TextPosition" transform="matrix(0,-1,1,0,-4473,23627)"&gt;&lt;tspan fill="#000000"&gt;I2C Bus (control bus)&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;g transform="translate(-2197.3 -2186)" class="com.sun.star.drawing.TextShape"&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="3278" x="9391" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Digital TV Frontend&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g transform="matrix(1.015 0 0 .99994 -2233.3 -2185.7)" class="com.sun.star.drawing.CustomShape"&gt;&lt;g stroke="#3465af" fill="none"&gt;&lt;path d="m3e3 2800c-18 0-35 1-53 3"/&gt;&lt;path d="m2915 2808c-17 3-35 7-52 12"/&gt;&lt;path d="m2832 2830c-16 6-33 12-49 20"/&gt;&lt;path d="m2754 2864c-15 8-31 17-46 27"/&gt;&lt;path d="m2681 2909c-14 10-28 21-42 32"/&gt;&lt;path d="m2614 2962c-13 12-26 24-38 37"/&gt;&lt;path d="m2554 3023c-11 13-22 27-33 41"/&gt;&lt;path d="m2502 3091c-10 14-19 29-28 45"/&gt;&lt;path d="m2459 3164c-8 16-15 32-22 49"/&gt;&lt;path d="m2426 3243c-5 17-10 34-14 51"/&gt;&lt;path d="m2406 3326c-3 18-5 35-6 53"/&gt;&lt;path d="m2400 3411v53"/&gt;&lt;path d="m2400 3497v53"/&gt;&lt;path d="m2400 3582v53"/&gt;&lt;path d="m2400 3668v53"/&gt;&lt;path d="m2400 3753v53"/&gt;&lt;path d="m2400 3839v53"/&gt;&lt;path d="m2400 3924v53"/&gt;&lt;path d="m2400 4009v54"/&gt;&lt;path d="m2400 4095v53"/&gt;&lt;path d="m2400 4180v53"/&gt;&lt;path d="m2400 4266v53"/&gt;&lt;path d="m2400 4351v53"/&gt;&lt;path d="m2400 4437v53"/&gt;&lt;path d="m2400 4522v53"/&gt;&lt;path d="m2400 4607v54"/&gt;&lt;path d="m2400 4693v53"/&gt;&lt;path d="m2400 4778v53"/&gt;&lt;path d="m2400 4864v53"/&gt;&lt;path d="m2400 4949v53"/&gt;&lt;path d="m2400 5035v53"/&gt;&lt;path d="m2400 5120v53"/&gt;&lt;path d="m2400 5205v54"/&gt;&lt;path d="m2400 5291v53"/&gt;&lt;path d="m2400 5376v53"/&gt;&lt;path d="m2400 5462v53"/&gt;&lt;path d="m2400 5547v53"/&gt;&lt;path d="m2400 5633v53"/&gt;&lt;path d="m2400 5718v53"/&gt;&lt;path d="m2400 5803c0 18 1 36 3 53"/&gt;&lt;path d="m2408 5888c4 18 8 35 13 52"/&gt;&lt;path d="m2431 5971c6 16 13 33 20 49"/&gt;&lt;path d="m2466 6049c8 15 17 31 27 46"/&gt;&lt;path d="m2511 6122c10 14 21 28 32 42"/&gt;&lt;path d="m2564 6188c12 13 25 26 38 38"/&gt;&lt;path d="m2626 6248c13 11 27 23 41 33"/&gt;&lt;path d="m2694 6300c14 10 29 19 45 27"/&gt;&lt;path d="m2768 6343c15 7 32 15 48 21"/&gt;&lt;path d="m2847 6375c17 5 34 10 51 14"/&gt;&lt;path d="m2930 6395c17 2 35 4 53 5"/&gt;&lt;path d="m3015 6400h53"/&gt;&lt;path d="m3100 6400h53"/&gt;&lt;path d="m3186 6400h53"/&gt;&lt;path d="m3271 6400h53"/&gt;&lt;path d="m3357 6400h53"/&gt;&lt;path d="m3442 6400h53"/&gt;&lt;path d="m3527 6400h54"/&gt;&lt;path d="m3613 6400h53"/&gt;&lt;path d="m3698 6400h53"/&gt;&lt;path d="m3784 6400h53"/&gt;&lt;path d="m3869 6400h53"/&gt;&lt;path d="m3955 6400h53"/&gt;&lt;path d="m4040 6400h53"/&gt;&lt;path d="m4125 6400h54"/&gt;&lt;path d="m4211 6400h53"/&gt;&lt;path d="m4296 6400h53"/&gt;&lt;path d="m4382 6400h53"/&gt;&lt;path d="m4467 6400h53"/&gt;&lt;path d="m4553 6400h53"/&gt;&lt;path d="m4638 6400h53"/&gt;&lt;path d="m4723 6400h54"/&gt;&lt;path d="m4809 6400h53"/&gt;&lt;path d="m4894 6400h53"/&gt;&lt;path d="m4980 6400h53"/&gt;&lt;path d="m5065 6400h53"/&gt;&lt;path d="m5151 6400h53"/&gt;&lt;path d="m5236 6400h53"/&gt;&lt;path d="m5322 6400h53"/&gt;&lt;path d="m5407 6400h53"/&gt;&lt;path d="m5492 6400h53"/&gt;&lt;path d="m5578 6400h53"/&gt;&lt;path d="m5663 6400h53"/&gt;&lt;path d="m5749 6400h53"/&gt;&lt;path d="m5834 6400h53"/&gt;&lt;path d="m5920 6400h53"/&gt;&lt;path d="m6005 6400h53"/&gt;&lt;path d="m6090 6400h53"/&gt;&lt;path d="m6176 6400h53"/&gt;&lt;path d="m6261 6400h53"/&gt;&lt;path d="m6347 6400h53"/&gt;&lt;path d="m6432 6400h53"/&gt;&lt;path d="m6518 6400h53"/&gt;&lt;path d="m6603 6400h53"/&gt;&lt;path d="m6688 6400h54"/&gt;&lt;path d="m6774 6400h53"/&gt;&lt;path d="m6859 6400h53"/&gt;&lt;path d="m6945 6400h53"/&gt;&lt;path d="m7030 6400h53"/&gt;&lt;path d="m7116 6400h53"/&gt;&lt;path d="m7201 6400h53"/&gt;&lt;path d="m7286 6400h54"/&gt;&lt;path d="m7372 6400h53"/&gt;&lt;path d="m7457 6400h53"/&gt;&lt;path d="m7543 6400h53"/&gt;&lt;path d="m7628 6400h53"/&gt;&lt;path d="m7714 6400h53"/&gt;&lt;path d="m7799 6400h53"/&gt;&lt;path d="m7884 6400h54"/&gt;&lt;path d="m7970 6400h53"/&gt;&lt;path d="m8055 6400h53"/&gt;&lt;path d="m8141 6400h53"/&gt;&lt;path d="m8226 6400h53"/&gt;&lt;path d="m8312 6400h53"/&gt;&lt;path d="m8397 6400h53"/&gt;&lt;path d="m8482 6400h54"/&gt;&lt;path d="m8568 6400h53"/&gt;&lt;path d="m8653 6400h53"/&gt;&lt;path d="m8739 6400h53"/&gt;&lt;path d="m8824 6400h53"/&gt;&lt;path d="m8910 6400h53"/&gt;&lt;path d="m8995 6400h53"/&gt;&lt;path d="m9081 6400h53"/&gt;&lt;path d="m9166 6400h53"/&gt;&lt;path d="m9251 6400h53"/&gt;&lt;path d="m9337 6400h53"/&gt;&lt;path d="m9422 6400h53"/&gt;&lt;path d="m9508 6400h53"/&gt;&lt;path d="m9593 6400h53"/&gt;&lt;path d="m9679 6400h53"/&gt;&lt;path d="m9764 6400h53"/&gt;&lt;path d="m9849 6400h53"/&gt;&lt;path d="m9935 6400h53"/&gt;&lt;path d="m10020 6400h53"/&gt;&lt;path d="m10106 6400h53"/&gt;&lt;path d="m10191 6400h53"/&gt;&lt;path d="m10277 6400h53"/&gt;&lt;path d="m10362 6400h53"/&gt;&lt;path d="m10447 6400h53"/&gt;&lt;path d="m10533 6400h53"/&gt;&lt;path d="m10618 6400h53"/&gt;&lt;path d="m10704 6400h53"/&gt;&lt;path d="m10789 6400h53"/&gt;&lt;path d="m10875 6400h53"/&gt;&lt;path d="m10960 6400h53"/&gt;&lt;path d="m11045 6400h54"/&gt;&lt;path d="m11131 6400h53"/&gt;&lt;path d="m11216 6400h53"/&gt;&lt;path d="m11302 6400h53"/&gt;&lt;path d="m11387 6400h53"/&gt;&lt;path d="m11473 6400h53"/&gt;&lt;path d="m11558 6400h53"/&gt;&lt;path d="m11643 6400h54"/&gt;&lt;path d="m11729 6400h53"/&gt;&lt;path d="m11814 6400h53"/&gt;&lt;path d="m11900 6400h53"/&gt;&lt;path d="m11985 6400h53"/&gt;&lt;path d="m12071 6400h53"/&gt;&lt;path d="m12156 6400h53"/&gt;&lt;path d="m12241 6400h54"/&gt;&lt;path d="m12327 6400h53"/&gt;&lt;path d="m12412 6400h53"/&gt;&lt;path d="m12498 6400h53"/&gt;&lt;path d="m12583 6400h53"/&gt;&lt;path d="m12669 6400h53"/&gt;&lt;path d="m12754 6400h53"/&gt;&lt;path d="m12839 6400h54"/&gt;&lt;path d="m12925 6400h53"/&gt;&lt;path d="m13010 6400h53"/&gt;&lt;path d="m13096 6400h53"/&gt;&lt;path d="m13181 6400h53"/&gt;&lt;path d="m13267 6400h53"/&gt;&lt;path d="m13352 6400h53"/&gt;&lt;path d="m13438 6400h53"/&gt;&lt;path d="m13523 6400h53"/&gt;&lt;path d="m13608 6400h53"/&gt;&lt;path d="m13694 6400h53"/&gt;&lt;path d="m13779 6400h53"/&gt;&lt;path d="m13865 6400h53"/&gt;&lt;path d="m13950 6400h53"/&gt;&lt;path d="m14036 6400h53"/&gt;&lt;path d="m14121 6400h53"/&gt;&lt;path d="m14206 6400h53"/&gt;&lt;path d="m14292 6400h53"/&gt;&lt;path d="m14377 6400h53"/&gt;&lt;path d="m14463 6400h53"/&gt;&lt;path d="m14548 6400h53"/&gt;&lt;path d="m14634 6400h53"/&gt;&lt;path d="m14719 6400h53"/&gt;&lt;path d="m14804 6400h54"/&gt;&lt;path d="m14890 6400h53"/&gt;&lt;path d="m14975 6400h53"/&gt;&lt;path d="m15061 6400h53"/&gt;&lt;path d="m15146 6400h53"/&gt;&lt;path d="m15232 6400h53"/&gt;&lt;path d="m15317 6400h53"/&gt;&lt;path d="m15402 6400h54"/&gt;&lt;path d="m15488 6400h53"/&gt;&lt;path d="m15573 6400h53"/&gt;&lt;path d="m15659 6400h53"/&gt;&lt;path d="m15744 6400h53"/&gt;&lt;path d="m15830 6400h53"/&gt;&lt;path d="m15915 6400h53"/&gt;&lt;path d="m16000 6400h54"/&gt;&lt;path d="m16086 6400h53"/&gt;&lt;path d="m16171 6400h53"/&gt;&lt;path d="m16257 6400h53"/&gt;&lt;path d="m16342 6400h53"/&gt;&lt;path d="m16428 6400h53"/&gt;&lt;path d="m16513 6400h53"/&gt;&lt;path d="m16598 6400h54"/&gt;&lt;path d="m16684 6400h53"/&gt;&lt;path d="m16769 6400h53"/&gt;&lt;path d="m16855 6400h53"/&gt;&lt;path d="m16940 6400h53"/&gt;&lt;path d="m17026 6400h53"/&gt;&lt;path d="m17111 6400h53"/&gt;&lt;path d="m17196 6400h54"/&gt;&lt;path d="m17282 6400h53"/&gt;&lt;path d="m17367 6400h53"/&gt;&lt;path d="m17453 6400h53"/&gt;&lt;path d="m17538 6400h53"/&gt;&lt;path d="m17624 6400h53"/&gt;&lt;path d="m17709 6400h53"/&gt;&lt;path d="m17795 6400h53"/&gt;&lt;path d="m17880 6400h53"/&gt;&lt;path d="m17965 6400h53"/&gt;&lt;path d="m18051 6400h53"/&gt;&lt;path d="m18136 6400h53"/&gt;&lt;path d="m18222 6400h53"/&gt;&lt;path d="m18307 6400h53"/&gt;&lt;path d="m18393 6400h53"/&gt;&lt;path d="m18478 6400h53"/&gt;&lt;path d="m18563 6400h53"/&gt;&lt;path d="m18649 6400h53"/&gt;&lt;path d="m18734 6400h53"/&gt;&lt;path d="m18820 6400h53"/&gt;&lt;path d="m18905 6400h53"/&gt;&lt;path d="m18991 6400h53"/&gt;&lt;path d="m19076 6400h53"/&gt;&lt;path d="m19161 6400h54"/&gt;&lt;path d="m19247 6400h53"/&gt;&lt;path d="m19332 6400h53"/&gt;&lt;path d="m19418 6400h53"/&gt;&lt;path d="m19503 6400h53"/&gt;&lt;path d="m19589 6400h53"/&gt;&lt;path d="m19674 6400h53"/&gt;&lt;path d="m19759 6400h54"/&gt;&lt;path d="m19845 6400h53"/&gt;&lt;path d="m19930 6400h53"/&gt;&lt;path d="m20016 6400h53"/&gt;&lt;path d="m20101 6400h53"/&gt;&lt;path d="m20187 6400h53"/&gt;&lt;path d="m20272 6400h53"/&gt;&lt;path d="m20357 6400h54"/&gt;&lt;path d="m20443 6400h53"/&gt;&lt;path d="m20528 6400h53"/&gt;&lt;path d="m20614 6400c17-1 35-2 53-5"/&gt;&lt;path d="m20699 6390c17-4 34-9 51-14"/&gt;&lt;path d="m20781 6365c16-6 32-13 48-21"/&gt;&lt;path d="m20858 6329c15-8 31-17 45-27"/&gt;&lt;path d="m20930 6283c14-10 28-21 42-32"/&gt;&lt;path d="m20996 6229c13-12 25-25 37-38"/&gt;&lt;path d="m21055 6167c11-14 22-28 33-42"/&gt;&lt;path d="m21106 6098c10-15 19-30 27-45"/&gt;&lt;path d="m21148 6024c7-16 14-33 20-49"/&gt;&lt;path d="m21179 5944c5-17 9-34 13-51"/&gt;&lt;path d="m21197 5861c2-18 4-35 4-53"/&gt;&lt;path d="m21201 5776v-54"/&gt;&lt;path d="m21201 5690v-53"/&gt;&lt;path d="m21201 5605v-53"/&gt;&lt;path d="m21201 5519v-53"/&gt;&lt;path d="m21201 5434v-53"/&gt;&lt;path d="m21201 5348v-53"/&gt;&lt;path d="m21201 5263v-53"/&gt;&lt;path d="m21201 5178v-54"/&gt;&lt;path d="m21201 5092v-53"/&gt;&lt;path d="m21201 5007v-53"/&gt;&lt;path d="m21201 4921v-53"/&gt;&lt;path d="m21201 4836v-53"/&gt;&lt;path d="m21201 4750v-53"/&gt;&lt;path d="m21201 4665v-53"/&gt;&lt;path d="m21201 4579v-53"/&gt;&lt;path d="m21201 4494v-53"/&gt;&lt;path d="m21201 4409v-53"/&gt;&lt;path d="m21201 4323v-53"/&gt;&lt;path d="m21201 4238v-53"/&gt;&lt;path d="m21201 4152v-53"/&gt;&lt;path d="m21201 4067v-53"/&gt;&lt;path d="m21201 3981v-53"/&gt;&lt;path d="m21201 3896v-53"/&gt;&lt;path d="m21201 3811v-53"/&gt;&lt;path d="m21201 3725v-53"/&gt;&lt;path d="m21201 3640v-53"/&gt;&lt;path d="m21201 3554v-53"/&gt;&lt;path d="m21201 3469v-53"/&gt;&lt;path d="m21201 3383c-1-17-3-35-5-52"/&gt;&lt;path d="m21190 3299c-4-17-8-35-14-51"/&gt;&lt;path d="m21165 3217c-6-16-13-33-21-49"/&gt;&lt;path d="m21129 3140c-9-16-18-31-28-46"/&gt;&lt;path d="m21082 3068c-10-14-21-28-33-42"/&gt;&lt;path d="m21027 3002c-12-13-24-25-37-37"/&gt;&lt;path d="m20965 2944c-14-12-28-22-42-33"/&gt;&lt;path d="m20896 2893c-15-9-30-18-46-27"/&gt;&lt;path d="m20821 2852c-16-8-32-14-49-20"/&gt;&lt;path d="m20741 2821c-17-5-34-9-51-12"/&gt;&lt;path d="m20658 2804c-18-3-35-4-53-4"/&gt;&lt;path d="m20573 2800h-53"/&gt;&lt;path d="m20487 2800h-53"/&gt;&lt;path d="m20402 2800h-53"/&gt;&lt;path d="m20316 2800h-53"/&gt;&lt;path d="m20231 2800h-53"/&gt;&lt;path d="m20146 2800h-54"/&gt;&lt;path d="m20060 2800h-53"/&gt;&lt;path d="m19975 2800h-53"/&gt;&lt;path d="m19889 2800h-53"/&gt;&lt;path d="m19804 2800h-53"/&gt;&lt;path d="m19718 2800h-53"/&gt;&lt;path d="m19633 2800h-53"/&gt;&lt;path d="m19548 2800h-54"/&gt;&lt;path d="m19462 2800h-53"/&gt;&lt;path d="m19377 2800h-53"/&gt;&lt;path d="m19291 2800h-53"/&gt;&lt;path d="m19206 2800h-53"/&gt;&lt;path d="m19120 2800h-53"/&gt;&lt;path d="m19035 2800h-53"/&gt;&lt;path d="m18950 2800h-54"/&gt;&lt;path d="m18864 2800h-53"/&gt;&lt;path d="m18779 2800h-53"/&gt;&lt;path d="m18693 2800h-53"/&gt;&lt;path d="m18608 2800h-53"/&gt;&lt;path d="m18522 2800h-53"/&gt;&lt;path d="m18437 2800h-53"/&gt;&lt;path d="m18352 2800h-54"/&gt;&lt;path d="m18266 2800h-53"/&gt;&lt;path d="m18181 2800h-53"/&gt;&lt;path d="m18095 2800h-53"/&gt;&lt;path d="m18010 2800h-53"/&gt;&lt;path d="m17924 2800h-53"/&gt;&lt;path d="m17839 2800h-53"/&gt;&lt;path d="m17753 2800h-53"/&gt;&lt;path d="m17668 2800h-53"/&gt;&lt;path d="m17583 2800h-53"/&gt;&lt;path d="m17497 2800h-53"/&gt;&lt;path d="m17412 2800h-53"/&gt;&lt;path d="m17326 2800h-53"/&gt;&lt;path d="m17241 2800h-53"/&gt;&lt;path d="m17155 2800h-53"/&gt;&lt;path d="m17070 2800h-53"/&gt;&lt;path d="m16985 2800h-53"/&gt;&lt;path d="m16899 2800h-53"/&gt;&lt;path d="m16814 2800h-53"/&gt;&lt;path d="m16728 2800h-53"/&gt;&lt;path d="m16643 2800h-53"/&gt;&lt;path d="m16557 2800h-53"/&gt;&lt;path d="m16472 2800h-53"/&gt;&lt;path d="m16387 2800h-54"/&gt;&lt;path d="m16301 2800h-53"/&gt;&lt;path d="m16216 2800h-53"/&gt;&lt;path d="m16130 2800h-53"/&gt;&lt;path d="m16045 2800h-53"/&gt;&lt;path d="m15959 2800h-53"/&gt;&lt;path d="m15874 2800h-53"/&gt;&lt;path d="m15789 2800h-54"/&gt;&lt;path d="m15703 2800h-53"/&gt;&lt;path d="m15618 2800h-53"/&gt;&lt;path d="m15532 2800h-53"/&gt;&lt;path d="m15447 2800h-53"/&gt;&lt;path d="m15361 2800h-53"/&gt;&lt;path d="m15276 2800h-53"/&gt;&lt;path d="m15191 2800h-54"/&gt;&lt;path d="m15105 2800h-53"/&gt;&lt;path d="m15020 2800h-53"/&gt;&lt;path d="m14934 2800h-53"/&gt;&lt;path d="m14849 2800h-53"/&gt;&lt;path d="m14763 2800h-53"/&gt;&lt;path d="m14678 2800h-53"/&gt;&lt;path d="m14593 2800h-54"/&gt;&lt;path d="m14507 2800h-53"/&gt;&lt;path d="m14422 2800h-53"/&gt;&lt;path d="m14336 2800h-53"/&gt;&lt;path d="m14251 2800h-53"/&gt;&lt;path d="m14165 2800h-53"/&gt;&lt;path d="m14080 2800h-53"/&gt;&lt;path d="m13994 2800h-53"/&gt;&lt;path d="m13909 2800h-53"/&gt;&lt;path d="m13824 2800h-53"/&gt;&lt;path d="m13738 2800h-53"/&gt;&lt;path d="m13653 2800h-53"/&gt;&lt;path d="m13567 2800h-53"/&gt;&lt;path d="m13482 2800h-53"/&gt;&lt;path d="m13396 2800h-53"/&gt;&lt;path d="m13311 2800h-53"/&gt;&lt;path d="m13226 2800h-53"/&gt;&lt;path d="m13140 2800h-53"/&gt;&lt;path d="m13055 2800h-53"/&gt;&lt;path d="m12969 2800h-53"/&gt;&lt;path d="m12884 2800h-53"/&gt;&lt;path d="m12798 2800h-53"/&gt;&lt;path d="m12713 2800h-53"/&gt;&lt;path d="m12628 2800h-53"/&gt;&lt;path d="m12542 2800h-53"/&gt;&lt;path d="m12457 2800h-53"/&gt;&lt;path d="m12371 2800h-53"/&gt;&lt;path d="m12286 2800h-53"/&gt;&lt;path d="m12200 2800h-53"/&gt;&lt;path d="m12115 2800h-53"/&gt;&lt;path d="m12030 2800h-54"/&gt;&lt;path d="m11944 2800h-53"/&gt;&lt;path d="m11859 2800h-53"/&gt;&lt;path d="m11773 2800h-53"/&gt;&lt;path d="m11688 2800h-53"/&gt;&lt;path d="m11602 2800h-53"/&gt;&lt;path d="m11517 2800h-53"/&gt;&lt;path d="m11432 2800h-54"/&gt;&lt;path d="m11346 2800h-53"/&gt;&lt;path d="m11261 2800h-53"/&gt;&lt;path d="m11175 2800h-53"/&gt;&lt;path d="m11090 2800h-53"/&gt;&lt;path d="m11004 2800h-53"/&gt;&lt;path d="m10919 2800h-53"/&gt;&lt;path d="m10834 2800h-54"/&gt;&lt;path d="m10748 2800h-53"/&gt;&lt;path d="m10663 2800h-53"/&gt;&lt;path d="m10577 2800h-53"/&gt;&lt;path d="m10492 2800h-53"/&gt;&lt;path d="m10406 2800h-53"/&gt;&lt;path d="m10321 2800h-53"/&gt;&lt;path d="m10236 2800h-54"/&gt;&lt;path d="m10150 2800h-53"/&gt;&lt;path d="m10065 2800h-53"/&gt;&lt;path d="m9979 2800h-53"/&gt;&lt;path d="m9894 2800h-53"/&gt;&lt;path d="m9808 2800h-53"/&gt;&lt;path d="m9723 2800h-53"/&gt;&lt;path d="m9637 2800h-53"/&gt;&lt;path d="m9552 2800h-53"/&gt;&lt;path d="m9467 2800h-53"/&gt;&lt;path d="m9381 2800h-53"/&gt;&lt;path d="m9296 2800h-53"/&gt;&lt;path d="m9210 2800h-53"/&gt;&lt;path d="m9125 2800h-53"/&gt;&lt;path d="m9039 2800h-53"/&gt;&lt;path d="m8954 2800h-53"/&gt;&lt;path d="m8869 2800h-53"/&gt;&lt;path d="m8783 2800h-53"/&gt;&lt;path d="m8698 2800h-53"/&gt;&lt;path d="m8612 2800h-53"/&gt;&lt;path d="m8527 2800h-53"/&gt;&lt;path d="m8441 2800h-53"/&gt;&lt;path d="m8356 2800h-53"/&gt;&lt;path d="m8271 2800h-54"/&gt;&lt;path d="m8185 2800h-53"/&gt;&lt;path d="m8100 2800h-53"/&gt;&lt;path d="m8014 2800h-53"/&gt;&lt;path d="m7929 2800h-53"/&gt;&lt;path d="m7843 2800h-53"/&gt;&lt;path d="m7758 2800h-53"/&gt;&lt;path d="m7673 2800h-54"/&gt;&lt;path d="m7587 2800h-53"/&gt;&lt;path d="m7502 2800h-53"/&gt;&lt;path d="m7416 2800h-53"/&gt;&lt;path d="m7331 2800h-53"/&gt;&lt;path d="m7245 2800h-53"/&gt;&lt;path d="m7160 2800h-53"/&gt;&lt;path d="m7075 2800h-54"/&gt;&lt;path d="m6989 2800h-53"/&gt;&lt;path d="m6904 2800h-53"/&gt;&lt;path d="m6818 2800h-53"/&gt;&lt;path d="m6733 2800h-53"/&gt;&lt;path d="m6647 2800h-53"/&gt;&lt;path d="m6562 2800h-53"/&gt;&lt;path d="m6477 2800h-54"/&gt;&lt;path d="m6391 2800h-53"/&gt;&lt;path d="m6306 2800h-53"/&gt;&lt;path d="m6220 2800h-53"/&gt;&lt;path d="m6135 2800h-53"/&gt;&lt;path d="m6049 2800h-53"/&gt;&lt;path d="m5964 2800h-53"/&gt;&lt;path d="m5879 2800h-54"/&gt;&lt;path d="m5793 2800h-53"/&gt;&lt;path d="m5708 2800h-53"/&gt;&lt;path d="m5622 2800h-53"/&gt;&lt;path d="m5537 2800h-53"/&gt;&lt;path d="m5451 2800h-53"/&gt;&lt;path d="m5366 2800h-53"/&gt;&lt;path d="m5280 2800h-53"/&gt;&lt;path d="m5195 2800h-53"/&gt;&lt;path d="m5110 2800h-53"/&gt;&lt;path d="m5024 2800h-53"/&gt;&lt;path d="m4939 2800h-53"/&gt;&lt;path d="m4853 2800h-53"/&gt;&lt;path d="m4768 2800h-53"/&gt;&lt;path d="m4682 2800h-53"/&gt;&lt;path d="m4597 2800h-53"/&gt;&lt;path d="m4512 2800h-53"/&gt;&lt;path d="m4426 2800h-53"/&gt;&lt;path d="m4341 2800h-53"/&gt;&lt;path d="m4255 2800h-53"/&gt;&lt;path d="m4170 2800h-53"/&gt;&lt;path d="m4084 2800h-53"/&gt;&lt;path d="m3999 2800h-53"/&gt;&lt;path d="m3914 2800h-54"/&gt;&lt;path d="m3828 2800h-53"/&gt;&lt;path d="m3743 2800h-53"/&gt;&lt;path d="m3657 2800h-53"/&gt;&lt;path d="m3572 2800h-53"/&gt;&lt;path d="m3486 2800h-53"/&gt;&lt;path d="m3401 2800h-53"/&gt;&lt;path d="m3316 2800h-54"/&gt;&lt;path d="m3230 2800h-53"/&gt;&lt;path d="m3145 2800h-53"/&gt;&lt;path d="m3059 2800h-53"/&gt;&lt;/g&gt;&lt;/g&gt;&lt;g transform="translate(-2197.3 -2186)"&gt;&lt;rect height="1100.7" width="1213.6" y="6917.1" x="23255" fill="#f3e777"/&gt;&lt;path fill="#ca4677" d="m22802 7700.4v-405.46l150.7-169.16c82.886-93.039 170.53-186.62 194.77-207.96l44.069-38.798 783.23-0.086 783.23-0.086v613.5 613.5h-978-978v-405.46zm1027.7 136.98v-78.372l-169.91 4.925-169.91 4.9249-5.09 45.854c-8.249 74.303 46.711 101.04 207.69 101.04h137.21v-78.372zm235.86-262.94 4.495-341.31 207.2-8.6408 207.2-8.6408 5.144-46.443c9.596-86.615-41.863-102.05-322.02-96.607l-246.71 4.7956-4.438 419.08-4.439 419.08h74.537 74.538l4.494-341.31zm391.3 313.72c26.41-19.286 36.255-41.399 32.697-73.447l-5.09-45.854h-174.05-174.05l-5.38 48.984c-9.97 90.771 0.993 97.91 150.36 97.91 99.305 0 148.27-7.6982 175.52-27.594zm-627.16-274.84v-77.768h-174.05-174.05v66.246c0 36.436 4.973 71.431 11.051 77.768 6.078 6.3366 84.401 11.521 174.05 11.521h163v-77.768zm659.89-4.9154 5.125-74.042-179.18 4.9155-179.18 4.9155-5.38 48.984c-10.473 95.348-2.259 99.57 183.28 94.197l170.2-4.9284 5.125-74.042zm-659.89-237.63v-78.372l-169.91 4.925-169.91 4.925-5.097 73.447-5.097 73.447h175 175v-78.372zm659.86 4.925-5.097-73.447h-174.05-174.05l-5.38 48.984c-10.289 93.673-2.146 97.91 188.15 97.91h175.52l-5.097-73.447zm-659.86-228.98v-77.768h-137.21c-97.358 0-147.91 7.8138-174.05 26.902-34.952 25.523-49.645 92.242-25.79 117.11 6.078 6.3366 84.401 11.521 174.05 11.521h163v-77.768z"/&gt;&lt;/g&gt;&lt;g transform="matrix(.84874 0 0 .76147 2408.1 3615.3)"&gt;&lt;rect height="3076.2" width="2734.3" y="13264" x="19249" fill="#6076b3"/&gt;&lt;g stroke-linejoin="round" fill-rule="evenodd" stroke-width="28.222" fill="#e0ee2c"&gt;&lt;rect y="13369" width="356.65" x="18937" height="180.95"/&gt;&lt;rect y="13708" width="356.65" x="18937" height="180.95"/&gt;&lt;rect y="14048" width="356.65" x="18937" height="180.95"/&gt;&lt;rect y="14387" width="356.65" x="18937" height="180.95"/&gt;&lt;rect y="14726" width="356.65" x="18937" height="180.95"/&gt;&lt;rect y="15066" width="356.65" x="18937" height="180.95"/&gt;&lt;rect y="15405" width="356.65" x="18937" height="180.95"/&gt;&lt;rect y="15744" width="356.65" x="18937" height="180.95"/&gt;&lt;rect y="16083" width="356.65" x="18937" height="180.95"/&gt;&lt;rect y="13324" width="356.65" x="21939" height="180.95"/&gt;&lt;rect y="13663" width="356.65" x="21939" height="180.95"/&gt;&lt;rect y="14002" width="356.65" x="21939" height="180.95"/&gt;&lt;rect y="14342" width="356.65" x="21939" height="180.95"/&gt;&lt;rect y="14681" width="356.65" x="21939" height="180.95"/&gt;&lt;rect y="15020" width="356.65" x="21939" height="180.95"/&gt;&lt;rect y="15360" width="356.65" x="21939" height="180.95"/&gt;&lt;rect y="15699" width="356.65" x="21939" height="180.95"/&gt;&lt;rect y="16038" width="356.65" x="21939" height="180.95"/&gt;&lt;/g&gt;&lt;g stroke-linejoin="round" fill-rule="evenodd" transform="matrix(.98702 0 0 .90336 -2675 7020.8)" class="com.sun.star.drawing.TextShape" stroke-width="28.222"&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"/&gt;&lt;/text&gt;</div><div class='del'>-&lt;text style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" font-size="1128.9px" y="9042.0264" x="22439.668" font-family="Sans" line-height="125%" fill="#000000"&gt;&lt;tspan y="9042.0264" x="22439.668"&gt;CPU&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;/g&gt;&lt;g stroke-linejoin="round" fill-rule="evenodd" transform="translate(-11752 543.6)" class="com.sun.star.drawing.TextShape" stroke-width="28.222"&gt;&lt;text class="TextShape"&gt;&lt;tspan font-size="706px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="15832" x="24341" class="TextPosition" transform="matrix(0,-1,1,0,8509,40173)"&gt;&lt;tspan fill="#000000"&gt;PCI, USB, SPI, I2C, ...&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;g stroke-linejoin="round" fill-rule="evenodd" transform="translate(-655.31 963.83)" class="com.sun.star.drawing.RectangleShape" stroke-width="28.222"&gt;&lt;g transform="matrix(.49166 0 0 1.0059 6045.6 -82.24)"&gt;&lt;path fill="#cfe7f5" d="m14169 14572h-2268v-1412h4536v1412h-2268z"/&gt;&lt;path fill="none" d="m14169 14572h-2268v-1412h4536v1412h-2268z" stroke="#3465af"/&gt;&lt;/g&gt;&lt;text y="-395.11282" x="-790.22229" class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="13686.9" x="12091.779" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt;Bridge&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;text y="338.66486" x="-846.66675" class="TextShape"&gt;&lt;tspan font-size="635px" font-family="&amp;apos;Times New Roman&amp;apos;, serif" font-weight="400" class="TextParagraph"&gt;&lt;tspan y="14420.677" x="12035.335" class="TextPosition"&gt;&lt;tspan fill="#000000"&gt; DMA&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='del'>-&lt;/g&gt;&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/media/media_kapi.rst b/Documentation/media/media_kapi.rst<br/>index f282ca270369..bc0638956a43 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/media_kapi.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/media_kapi.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/media_kapi.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/media_kapi.rst</a></div><div class='hunk'>@@ -33,3 +33,4 @@ For more details see the file COPYING in the source distribution of Linux.</div><div class='ctx'>     kapi/rc-core</div><div class='ctx'>     kapi/mc-core</div><div class='ctx'>     kapi/cec-core</div><div class='add'>+    kapi/csi2</div><div class='head'>diff --git a/Documentation/media/typical_media_device.svg b/Documentation/media/typical_media_device.svg<br/>new file mode 100644<br/>index 000000000000..0c8abd69f39a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/typical_media_device.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/typical_media_device.svg</a></div><div class='hunk'>@@ -0,0 +1,2948 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   clip-path="url(#a)"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   height="179mm"</div><div class='add'>+   viewBox="0 0 22648.239 17899.829"</div><div class='add'>+   width="235mm"</div><div class='add'>+   version="1.2"</div><div class='add'>+   preserveAspectRatio="xMidYMid"</div><div class='add'>+   id="svg2"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   sodipodi:docname="typical_media_device.svg"</div><div class='add'>+   style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"&gt;&lt;metadata</div><div class='add'>+     id="metadata1533"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title /&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview1531"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0"</div><div class='add'>+     inkscape:zoom="1.2707744"</div><div class='add'>+     inkscape:cx="410.32614"</div><div class='add'>+     inkscape:cy="316.736"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="svg2" /&gt;&lt;defs</div><div class='add'>+     id="defs4"&gt;&lt;clipPath</div><div class='add'>+       id="a"</div><div class='add'>+       clipPathUnits="userSpaceOnUse"&gt;&lt;rect</div><div class='add'>+         y="0"</div><div class='add'>+         x="0"</div><div class='add'>+         width="28000"</div><div class='add'>+         height="21000"</div><div class='add'>+         id="rect7" /&gt;&lt;/clipPath&gt;&lt;/defs&gt;&lt;path</div><div class='add'>+     style="fill:#ffccff"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path11"</div><div class='add'>+     d="m 10145.77,2636.013 c -518.0641,0 -1035.1241,515 -1035.1241,1031 l 0,4124 c 0,516 517.06,1032 1035.1241,1032 l 8572.152,0 c 518.064,0 1036.128,-516 1036.128,-1032 l 0,-4124 c 0,-516 -518.064,-1031 -1036.128,-1031 l -8572.152,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#ffffcc"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path15"</div><div class='add'>+     d="m 1505.5459,13443.013 c -293,0 -585,292 -585,585 l 0,2340 c 0,293 292,586 585,586 l 3275,0 c 293,0 586,-293 586,-586 l 0,-2340 c 0,-293 -293,-585 -586,-585 l -3275,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#e6e6e6"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path19"</div><div class='add'>+     d="m 517.1459,22.013 c -461,0 -922,461 -922,922 l 0,11169 c 0,461 461,923 922,923 l 3692,0 c 461,0 922,-462 922,-923 l 0,-11169 c 0,-461 -461,-922 -922,-922 l -3692,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#ff8080"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path23"</div><div class='add'>+     d="m 2371.5459,6438.013 -2260,0 0,-1086 4520,0 0,1086 -2260,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path25"</div><div class='add'>+     d="m 2371.5459,6438.013 -2260,0 0,-1086 4520,0 0,1086 -2260,0 z" /&gt;&lt;text</div><div class='add'>+     id="text27"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan29"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan31"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="489.5459"</div><div class='add'>+         y="6111.0132"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan33"&gt;Audio decoder&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#ff8080"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path37"</div><div class='add'>+     d="m 2371.5459,9608.013 -2260,0 0,-1270 4520,0 0,1270 -2260,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path39"</div><div class='add'>+     d="m 2371.5459,9608.013 -2260,0 0,-1270 4520,0 0,1270 -2260,0 z" /&gt;&lt;text</div><div class='add'>+     id="text41"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan43"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan45"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="527.5459"</div><div class='add'>+         y="9189.0127"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan47"&gt;Video decoder&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#ff8080"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path51"</div><div class='add'>+     d="m 2363.5459,8053.013 -2269,0 0,-1224 4537,0 0,1224 -2268,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path53"</div><div class='add'>+     d="m 2363.5459,8053.013 -2269,0 0,-1224 4537,0 0,1224 -2268,0 z" /&gt;&lt;text</div><div class='add'>+     id="text55"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan57"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan59"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="481.5459"</div><div class='add'>+         y="7657.0132"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan61"&gt;Audio encoder&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#ccffcc"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path65"</div><div class='add'>+     d="m 13621.546,10385.813 -3810.0001,0 0,-1281 7620.0001,0 0,1281 -3810,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path67"</div><div class='add'>+     d="m 13621.546,10385.813 -3810.0001,0 0,-1281 7620.0001,0 0,1281 -3810,0 z" /&gt;&lt;text</div><div class='add'>+     id="text69"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2446.187"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan71"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan73"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="10287.546"</div><div class='add'>+         y="9960.8135"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan75"&gt;Button Key/IR input logic&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#cfe7f5"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path79"</div><div class='add'>+     d="m 12079.546,12182.213 -2268.0001,0 0,-1412 4536.0001,0 0,1412 -2268,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path81"</div><div class='add'>+     d="m 12079.546,12182.213 -2268.0001,0 0,-1412 4536.0001,0 0,1412 -2268,0 z" /&gt;&lt;text</div><div class='add'>+     id="text83"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2389.7871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan85"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan87"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="10792.546"</div><div class='add'>+         y="11692.213"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan89"&gt;EEPROM&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#ffcc99"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path93"</div><div class='add'>+     d="m 3050.5459,15498.013 -1563,0 0,-1715 3126,0 0,1715 -1563,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path95"</div><div class='add'>+     d="m 3050.5459,15498.013 -1563,0 0,-1715 3126,0 0,1715 -1563,0 z" /&gt;&lt;text</div><div class='add'>+     id="text97"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan99"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan101"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="2186.5459"</div><div class='add'>+         y="14856.013"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan103"&gt;Sensor&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path107"</div><div class='add'>+     d="m 4629.5459,5866.013 385,-353 0,176 1167,0 0,-176 386,353 -386,354 0,-177 -1167,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path109"</div><div class='add'>+     d="m 4629.5459,5866.013 385,-353 0,176 1167,0 0,-176 386,353 -386,354 0,-177 -1167,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path113"</div><div class='add'>+     d="m 4629.5459,7448.013 385,-353 0,176 1167,0 0,-176 386,353 -386,354 0,-177 -1167,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path115"</div><div class='add'>+     d="m 4629.5459,7448.013 385,-353 0,176 1167,0 0,-176 386,353 -386,354 0,-177 -1167,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path119"</div><div class='add'>+     d="m 4631.5459,8936.013 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path121"</div><div class='add'>+     d="m 4631.5459,8936.013 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path125"</div><div class='add'>+     d="m 7872.5459,11464.213 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path127"</div><div class='add'>+     d="m 7872.5459,11464.213 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path131"</div><div class='add'>+     d="m 7872.5459,9716.813 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path133"</div><div class='add'>+     d="m 7872.5459,9716.813 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path137"</div><div class='add'>+     d="m 7872.5459,14994.013 670,-353 0,176 2028.0001,0 0,-176 671,353 -671,354 0,-177 -2028.0001,0 0,177 -670,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path139"</div><div class='add'>+     d="m 7872.5459,14994.013 670,-353 0,176 2028.0001,0 0,-176 671,353 -671,354 0,-177 -2028.0001,0 0,177 -670,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path143"</div><div class='add'>+     d="m 17534.058,14104.529 978.488,840.891 -978.488,840.89 0,-420.862 -2960.48,0 0,420.862 -979.489,-840.89 979.489,-840.891 0,420.029 2960.48,0 0,-420.029 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:25.77035904"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path145"</div><div class='add'>+     d="m 17534.058,14104.529 978.488,840.891 -978.488,840.89 0,-420.862 -2960.48,0 0,420.862 -979.489,-840.89 979.489,-840.891 0,420.029 2960.48,0 0,-420.029 z" /&gt;&lt;text</div><div class='add'>+     id="text149"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-9922.1533"</div><div class='add'>+     y="-644.58704"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:706px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan151"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="706px"&gt;&lt;tspan</div><div class='add'>+         id="tspan153"</div><div class='add'>+         transform="matrix(0,-1,1,0,8509,40173)"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="14418.847"</div><div class='add'>+         y="15187.413"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan155"&gt;System Bus&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#ccffff"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path159"</div><div class='add'>+     d="m 11061.546,7098.013 -1250.0001,0 0,-875 2499.0001,0 0,875 -1249,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path161"</div><div class='add'>+     d="m 11061.546,7098.013 -1250.0001,0 0,-875 2499.0001,0 0,875 -1249,0 z" /&gt;&lt;text</div><div class='add'>+     id="text163"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan165"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan167"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="10125.546"</div><div class='add'>+         y="6876.0132"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan169"&gt;Demux&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path173"</div><div class='add'>+     d="m 7906.5459,6601.013 373,-357 0,178 1130,0 0,-178 374,357 -374,358 0,-179 -1130,0 0,179 -373,-358 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path175"</div><div class='add'>+     d="m 7906.5459,6601.013 373,-357 0,178 1130,0 0,-178 374,357 -374,358 0,-179 -1130,0 0,179 -373,-358 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path179"</div><div class='add'>+     d="m 7906.5459,5214.013 373,-358 0,179 1130,0 0,-179 374,358 -374,358 0,-179 -1130,0 0,179 -373,-358 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path181"</div><div class='add'>+     d="m 7906.5459,5214.013 373,-358 0,179 1130,0 0,-179 374,358 -374,358 0,-179 -1130,0 0,179 -373,-358 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#ccffff"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path185"</div><div class='add'>+     d="m 14232.546,5828.013 -4421.0001,0 0,-1270 8841.0001,0 0,1270 -4420,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path187"</div><div class='add'>+     d="m 14232.546,5828.013 -4421.0001,0 0,-1270 8841.0001,0 0,1270 -4420,0 z" /&gt;&lt;text</div><div class='add'>+     id="text189"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan191"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan193"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="10696.546"</div><div class='add'>+         y="5409.0132"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan195"&gt;Conditional Access Module&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#ff8080"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path199"</div><div class='add'>+     d="m 2355.5459,11123.013 -2269,0 0,-1224 4537,0 0,1224 -2268,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path201"</div><div class='add'>+     d="m 2355.5459,11123.013 -2269,0 0,-1224 4537,0 0,1224 -2268,0 z" /&gt;&lt;text</div><div class='add'>+     id="text203"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan205"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan207"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="511.5459"</div><div class='add'>+         y="10727.013"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan209"&gt;Video encoder&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path213"</div><div class='add'>+     d="m 4631.5459,10470.013 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path215"</div><div class='add'>+     d="m 4631.5459,10470.013 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path219"</div><div class='add'>+     d="m 18701.546,5381.013 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path221"</div><div class='add'>+     d="m 18701.546,5381.013 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;text</div><div class='add'>+     id="text225"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-1976.5541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan227"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan229"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="13.4459"</div><div class='add'>+         y="12314.013"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan231"&gt;Radio / Analog TV&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+     id="text235"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:700;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan237"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="700"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan239"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="12866.546"</div><div class='add'>+         y="8560.0127"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan241"&gt;Digital TV&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+     id="text245"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-8919.0537"</div><div class='add'>+     y="-1373.787"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:494px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan247"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="494px"&gt;&lt;tspan</div><div class='add'>+         id="tspan249"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="5804.9458"</div><div class='add'>+         y="17793.213"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan251"&gt;PS.: picture is not complete: other blocks may be present&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+     id="text255"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan257"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan259"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="2109.5459"</div><div class='add'>+         y="16397.014"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan261"&gt;Webcam&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#ff9900"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path265"</div><div class='add'>+     d="m 12462.546,13925.813 -2650.0001,0 0,-1412 5299.0001,0 0,1412 -2649,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path267"</div><div class='add'>+     d="m 12462.546,13925.813 -2650.0001,0 0,-1412 5299.0001,0 0,1412 -2649,0 z" /&gt;&lt;text</div><div class='add'>+     id="text269"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2446.187"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan271"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan273"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="10175.546"</div><div class='add'>+         y="13435.813"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan275"&gt;Processing blocks&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path279"</div><div class='add'>+     d="m 7872.5459,13207.813 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path281"</div><div class='add'>+     d="m 7872.5459,13207.813 385,-353 0,176 1166,0 0,-176 386,353 -386,354 0,-177 -1166,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path285"</div><div class='add'>+     d="m 4612.5459,14790.013 397,-353 0,176 1201,0 0,-176 398,353 -398,354 0,-177 -1201,0 0,177 -397,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path287"</div><div class='add'>+     d="m 4612.5459,14790.013 397,-353 0,176 1201,0 0,-176 398,353 -398,354 0,-177 -1201,0 0,177 -397,-354 z" /&gt;&lt;text</div><div class='add'>+     id="text291"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2428.0542"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan293"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan295"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="20421.945"</div><div class='add'>+         y="6628.0132"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan297"&gt;Smartcard&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#ffccff"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path301"</div><div class='add'>+     d="m 623.3227,436.013 c -334.5984,0 -669.1968,333 -669.1968,666 l 0,2668 c 0,333 334.5984,666 669.1968,666 l 18456.1663,0 c 334.598,0 670.202,-333 670.202,-666 l 0,-2668 c 0,-333 -335.604,-666 -670.202,-666 l -18456.1663,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#ff8080"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path305"</div><div class='add'>+     d="m 3031.5459,2991.013 -1614,0 0,-1816 3227,0 0,1816 -1613,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path307"</div><div class='add'>+     d="m 3031.5459,2991.013 -1614,0 0,-1816 3227,0 0,1816 -1613,0 z" /&gt;&lt;text</div><div class='add'>+     style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+     id="text309"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     font-weight="400"</div><div class='add'>+     font-size="635px"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       id="tspan311"</div><div class='add'>+       class="TextParagraph"&gt;&lt;tspan</div><div class='add'>+         id="tspan313"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="2284.5459"</div><div class='add'>+         y="1947.0129"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan315"&gt;Tuner&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;tspan</div><div class='add'>+       id="tspan317"</div><div class='add'>+       class="TextParagraph"&gt;&lt;tspan</div><div class='add'>+         id="tspan319"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="2061.5459"</div><div class='add'>+         y="2650.0129"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan321"&gt;FM/TV&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#ff8080"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path325"</div><div class='add'>+     d="m 812.5459,1538.013 c 0,111 40,202 88,202 l 530,0 c 48,0 89,-91 89,-202 0,-110 -41,-202 -89,-202 l -530,0 c -48,0 -88,92 -88,202 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path327"</div><div class='add'>+     d="m 812.5459,1538.013 c 0,111 40,202 88,202 l 530,0 c 48,0 89,-91 89,-202 0,-110 -41,-202 -89,-202 l -530,0 c -48,0 -88,92 -88,202 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#ffb3b3"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path329"</div><div class='add'>+     d="m 812.5459,1538.013 c 0,111 40,202 88,202 48,0 88,-91 88,-202 0,-110 -40,-202 -88,-202 -48,0 -88,92 -88,202 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path331"</div><div class='add'>+     d="m 812.5459,1538.013 c 0,111 40,202 88,202 48,0 88,-91 88,-202 0,-110 -40,-202 -88,-202 -48,0 -88,92 -88,202 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#ff8080"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path335"</div><div class='add'>+     d="m 813.5459,2103.013 c 0,110 40,202 88,202 l 530,0 c 48,0 89,-92 89,-202 0,-110 -41,-203 -89,-203 l -530,0 c -48,0 -88,93 -88,203 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path337"</div><div class='add'>+     d="m 813.5459,2103.013 c 0,110 40,202 88,202 l 530,0 c 48,0 89,-92 89,-202 0,-110 -41,-203 -89,-203 l -530,0 c -48,0 -88,93 -88,203 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#ffb3b3"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path339"</div><div class='add'>+     d="m 813.5459,2103.013 c 0,110 40,202 88,202 48,0 88,-92 88,-202 0,-110 -40,-203 -88,-203 -48,0 -88,93 -88,203 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path341"</div><div class='add'>+     d="m 813.5459,2103.013 c 0,110 40,202 88,202 48,0 88,-92 88,-202 0,-110 -40,-203 -88,-203 -48,0 -88,93 -88,203 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path345"</div><div class='add'>+     d="m 4629.5459,2032.013 385,-353 0,176 1167,0 0,-176 386,353 -386,354 0,-177 -1167,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path347"</div><div class='add'>+     d="m 4629.5459,2032.013 385,-353 0,176 1167,0 0,-176 386,353 -386,354 0,-177 -1167,0 0,177 -385,-354 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path351"</div><div class='add'>+     d="m 7889.5459,1986.013 402,-368 0,184 1217,0 0,-184 403,368 -403,369 0,-185 -1217,0 0,185 -402,-369 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path353"</div><div class='add'>+     d="m 7889.5459,1986.013 402,-368 0,184 1217,0 0,-184 403,368 -403,369 0,-185 -1217,0 0,185 -402,-369 z" /&gt;&lt;path</div><div class='add'>+     style="fill:#ccffff"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path357"</div><div class='add'>+     d="m 14410.546,4025.013 -4500.0001,0 0,-1389 9000.0001,0 0,1389 -4500,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path359"</div><div class='add'>+     d="m 14410.546,4025.013 -4500.0001,0 0,-1389 9000.0001,0 0,1389 -4500,0 z" /&gt;&lt;text</div><div class='add'>+     id="text361"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan363"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan365"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="9961.5459"</div><div class='add'>+         y="3546.0129"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan367"&gt;Satellite Equipment Control (SEC)&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#ccffff"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path371"</div><div class='add'>+     d="m 11310.546,2436.013 -1400.0001,0 0,-1000 2800.0001,0 0,1000 -1400,0 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path373"</div><div class='add'>+     d="m 11310.546,2436.013 -1400.0001,0 0,-1000 2800.0001,0 0,1000 -1400,0 z" /&gt;&lt;text</div><div class='add'>+     id="text375"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2089.4541"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan377"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan379"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="10375.546"</div><div class='add'>+         y="2152.0129"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan381"&gt;Demod&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:#729fcf"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path385"</div><div class='add'>+     d="m 7889.5459,3287.013 402,-368 0,184 1217,0 0,-184 403,368 -403,369 0,-185 -1217,0 0,185 -402,-369 z" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     id="path387"</div><div class='add'>+     d="m 7889.5459,3287.013 402,-368 0,184 1217,0 0,-184 403,368 -403,369 0,-185 -1217,0 0,185 -402,-369 z" /&gt;&lt;path</div><div class='add'>+     d="m 7906.5459,9121.013 0,7302 -1270,0 0,-14605 1270,0 0,7303 z"</div><div class='add'>+     id="path389"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#ffff99" /&gt;&lt;path</div><div class='add'>+     d="m 7906.5459,9121.013 0,7302 -1270,0 0,-14605 1270,0 0,7303 z"</div><div class='add'>+     id="path391"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#3465af" /&gt;&lt;text</div><div class='add'>+     y="-6589.021"</div><div class='add'>+     x="-20792.584"</div><div class='add'>+     transform="matrix(0,-1,1,0,0,0)"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     id="text393"&gt;&lt;tspan</div><div class='add'>+       font-size="635px"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       id="tspan395"</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"&gt;&lt;tspan</div><div class='add'>+         y="7460.9849"</div><div class='add'>+         x="-11215.646"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         transform="matrix(0,-1,1,0,-4473,23627)"</div><div class='add'>+         id="tspan397"&gt;&lt;tspan</div><div class='add'>+           id="tspan399"</div><div class='add'>+           style="fill:#000000"&gt;I2C Bus (control bus)&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+     id="text403"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-2145.854"</div><div class='add'>+     y="-2163.9871"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan405"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan407"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="7245.146"</div><div class='add'>+         y="1114.0129"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan409"&gt;Digital TV Frontend&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 863.1459,636.145 c -18.27,0 -35.525,0.99994 -53.795,2.99982"</div><div class='add'>+     id="path415"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 776.8709,644.14452 c -17.255,2.99982 -35.525,6.99958 -52.78,11.99928"</div><div class='add'>+     id="path417"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 692.6259,666.1432 c -16.24,5.99964 -33.495,11.99928 -49.735,19.9988"</div><div class='add'>+     id="path419"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 613.4559,700.14116 c -15.225,7.99952 -31.465,16.99898 -46.69,26.99838"</div><div class='add'>+     id="path421"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 539.3609,745.13846 c -14.21,9.9994 -28.42,20.99874 -42.63,31.99808"</div><div class='add'>+     id="path423"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 471.3559,798.13528 c -13.195,11.99928 -26.39,23.99856 -38.57,36.99778"</div><div class='add'>+     id="path425"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 410.4559,859.13162 c -11.165,12.99922 -22.33,26.99838 -33.495,40.99754"</div><div class='add'>+     id="path427"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 357.6759,927.12754 c -10.15,13.99916 -19.285,28.99826 -28.42,44.9973"</div><div class='add'>+     id="path429"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 314.0309,1000.1232 c -8.12,15.999 -15.225,31.998 -22.33,48.997"</div><div class='add'>+     id="path431"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 280.5359,1079.1184 c -5.075,16.999 -10.15,33.998 -14.21,50.997"</div><div class='add'>+     id="path433"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 260.2359,1162.1134 c -3.045,17.999 -5.075,34.9979 -6.09,52.9969"</div><div class='add'>+     id="path435"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,1247.1083 0,52.9969"</div><div class='add'>+     id="path437"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,1333.1032 0,52.9968"</div><div class='add'>+     id="path439"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,1418.0981 0,52.9968"</div><div class='add'>+     id="path441"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,1504.0929 0,52.9968"</div><div class='add'>+     id="path443"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,1589.0878 0,52.9968"</div><div class='add'>+     id="path445"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,1675.0827 0,52.9968"</div><div class='add'>+     id="path447"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,1760.0776 0,52.9968"</div><div class='add'>+     id="path449"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,1845.0725 0,53.9967"</div><div class='add'>+     id="path451"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,1931.0673 0,52.9968"</div><div class='add'>+     id="path453"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2016.0622 0,52.9968"</div><div class='add'>+     id="path455"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2102.057 0,52.9969"</div><div class='add'>+     id="path457"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2187.0519 0,52.9969"</div><div class='add'>+     id="path459"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2273.0468 0,52.9968"</div><div class='add'>+     id="path461"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2358.0417 0,52.9968"</div><div class='add'>+     id="path463"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2443.0366 0,53.9967"</div><div class='add'>+     id="path465"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2529.0314 0,52.9968"</div><div class='add'>+     id="path467"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2614.0263 0,52.9968"</div><div class='add'>+     id="path469"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2700.0212 0,52.9968"</div><div class='add'>+     id="path471"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2785.0161 0,52.9968"</div><div class='add'>+     id="path473"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2871.0109 0,52.9968"</div><div class='add'>+     id="path475"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,2956.0058 0,52.9968"</div><div class='add'>+     id="path477"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,3041.0007 0,53.9968"</div><div class='add'>+     id="path479"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,3126.9955 0,52.9969"</div><div class='add'>+     id="path481"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,3211.9904 0,52.9969"</div><div class='add'>+     id="path483"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,3297.9853 0,52.9968"</div><div class='add'>+     id="path485"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,3382.9802 0,52.9968"</div><div class='add'>+     id="path487"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,3468.975 0,52.9968"</div><div class='add'>+     id="path489"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,3553.9699 0,52.9968"</div><div class='add'>+     id="path491"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 254.1459,3638.9648 c 0,17.9989 1.015,35.9979 3.045,52.9968"</div><div class='add'>+     id="path493"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 262.2659,3723.9597 c 4.06,17.9989 8.12,34.9979 13.195,51.9969"</div><div class='add'>+     id="path495"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 285.6109,3806.9547 c 6.09,15.9991 13.195,32.9981 20.3,48.9971"</div><div class='add'>+     id="path497"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 321.1359,3884.9501 c 8.12,14.9991 17.255,30.9981 27.405,45.9972"</div><div class='add'>+     id="path499"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 366.8109,3957.9457 c 10.15,13.9991 21.315,27.9983 32.48,41.9975"</div><div class='add'>+     id="path501"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 420.6059,4023.9417 c 12.18,12.9992 25.375,25.9985 38.57,37.9977"</div><div class='add'>+     id="path503"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 483.5359,4083.9381 c 13.195,10.9994 27.405,22.9986 41.615,32.998"</div><div class='add'>+     id="path505"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 552.5559,4135.935 c 14.21,9.9994 29.435,18.9989 45.675,26.9984"</div><div class='add'>+     id="path507"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 627.6659,4178.9324 c 15.225,6.9996 32.48,14.9991 48.72,20.9988"</div><div class='add'>+     id="path509"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 707.8509,4210.9305 c 17.255,4.9997 34.51,9.9994 51.765,13.9992"</div><div class='add'>+     id="path511"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 792.0959,4230.9293 c 17.255,1.9999 35.525,3.9998 53.795,4.9997"</div><div class='add'>+     id="path513"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 878.3709,4235.929 53.795,0"</div><div class='add'>+     id="path515"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 964.6459,4235.929 53.795,0"</div><div class='add'>+     id="path517"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1051.9359,4235.929 53.795,0"</div><div class='add'>+     id="path519"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1138.2109,4235.929 53.795,0"</div><div class='add'>+     id="path521"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1225.5009,4235.929 53.795,0"</div><div class='add'>+     id="path523"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1311.7759,4235.929 53.795,0"</div><div class='add'>+     id="path525"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1398.0509,4235.929 54.81,0"</div><div class='add'>+     id="path527"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1485.3409,4235.929 53.795,0"</div><div class='add'>+     id="path529"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1571.6159,4235.929 53.795,0"</div><div class='add'>+     id="path531"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1658.9059,4235.929 53.795,0"</div><div class='add'>+     id="path533"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1745.1809,4235.929 53.795,0"</div><div class='add'>+     id="path535"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1832.4709,4235.929 53.795,0"</div><div class='add'>+     id="path537"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1918.7459,4235.929 53.795,0"</div><div class='add'>+     id="path539"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2005.0209,4235.929 54.81,0"</div><div class='add'>+     id="path541"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2092.3109,4235.929 53.795,0"</div><div class='add'>+     id="path543"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2178.5859,4235.929 53.795,0"</div><div class='add'>+     id="path545"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2265.8759,4235.929 53.795,0"</div><div class='add'>+     id="path547"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2352.1509,4235.929 53.795,0"</div><div class='add'>+     id="path549"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2439.4409,4235.929 53.795,0"</div><div class='add'>+     id="path551"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2525.7159,4235.929 53.795,0"</div><div class='add'>+     id="path553"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2611.9909,4235.929 54.81,0"</div><div class='add'>+     id="path555"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2699.2809,4235.929 53.795,0"</div><div class='add'>+     id="path557"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2785.5559,4235.929 53.795,0"</div><div class='add'>+     id="path559"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2872.8459,4235.929 53.795,0"</div><div class='add'>+     id="path561"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2959.1209,4235.929 53.795,0"</div><div class='add'>+     id="path563"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3046.4109,4235.929 53.795,0"</div><div class='add'>+     id="path565"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3132.6859,4235.929 53.795,0"</div><div class='add'>+     id="path567"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3219.9759,4235.929 53.795,0"</div><div class='add'>+     id="path569"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3306.2509,4235.929 53.795,0"</div><div class='add'>+     id="path571"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3392.5259,4235.929 53.795,0"</div><div class='add'>+     id="path573"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3479.8159,4235.929 53.795,0"</div><div class='add'>+     id="path575"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3566.0909,4235.929 53.795,0"</div><div class='add'>+     id="path577"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3653.3809,4235.929 53.795,0"</div><div class='add'>+     id="path579"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3739.6559,4235.929 53.795,0"</div><div class='add'>+     id="path581"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3826.9459,4235.929 53.795,0"</div><div class='add'>+     id="path583"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3913.2209,4235.929 53.795,0"</div><div class='add'>+     id="path585"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3999.4959,4235.929 53.795,0"</div><div class='add'>+     id="path587"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4086.7859,4235.929 53.795,0"</div><div class='add'>+     id="path589"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4173.0609,4235.929 53.795,0"</div><div class='add'>+     id="path591"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4260.3509,4235.929 53.795,0"</div><div class='add'>+     id="path593"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4346.6259,4235.929 53.795,0"</div><div class='add'>+     id="path595"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4433.9159,4235.929 53.795,0"</div><div class='add'>+     id="path597"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4520.1909,4235.929 53.795,0"</div><div class='add'>+     id="path599"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4606.4659,4235.929 54.81,0"</div><div class='add'>+     id="path601"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4693.7559,4235.929 53.795,0"</div><div class='add'>+     id="path603"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4780.0309,4235.929 53.795,0"</div><div class='add'>+     id="path605"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4867.3209,4235.929 53.795,0"</div><div class='add'>+     id="path607"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4953.5959,4235.929 53.795,0"</div><div class='add'>+     id="path609"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5040.8859,4235.929 53.795,0"</div><div class='add'>+     id="path611"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5127.1609,4235.929 53.795,0"</div><div class='add'>+     id="path613"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5213.4359,4235.929 54.81,0"</div><div class='add'>+     id="path615"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5300.7259,4235.929 53.795,0"</div><div class='add'>+     id="path617"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5387.0009,4235.929 53.795,0"</div><div class='add'>+     id="path619"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5474.2909,4235.929 53.795,0"</div><div class='add'>+     id="path621"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5560.5659,4235.929 53.795,0"</div><div class='add'>+     id="path623"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5647.8559,4235.929 53.795,0"</div><div class='add'>+     id="path625"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5734.1309,4235.929 53.795,0"</div><div class='add'>+     id="path627"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5820.4059,4235.929 54.81,0"</div><div class='add'>+     id="path629"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5907.6959,4235.929 53.795,0"</div><div class='add'>+     id="path631"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5993.9709,4235.929 53.795,0"</div><div class='add'>+     id="path633"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6081.2609,4235.929 53.795,0"</div><div class='add'>+     id="path635"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6167.5359,4235.929 53.795,0"</div><div class='add'>+     id="path637"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6254.8259,4235.929 53.795,0"</div><div class='add'>+     id="path639"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6341.1009,4235.929 53.795,0"</div><div class='add'>+     id="path641"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6427.3759,4235.929 54.81,0"</div><div class='add'>+     id="path643"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6514.6659,4235.929 53.795,0"</div><div class='add'>+     id="path645"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6600.9409,4235.929 53.795,0"</div><div class='add'>+     id="path647"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6688.2309,4235.929 53.795,0"</div><div class='add'>+     id="path649"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6774.5059,4235.929 53.795,0"</div><div class='add'>+     id="path651"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6861.7959,4235.929 53.795,0"</div><div class='add'>+     id="path653"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6948.0709,4235.929 53.795,0"</div><div class='add'>+     id="path655"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7035.3609,4235.929 53.795,0"</div><div class='add'>+     id="path657"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7121.6359,4235.929 53.795,0"</div><div class='add'>+     id="path659"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7207.9109,4235.929 53.795,0"</div><div class='add'>+     id="path661"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7295.2009,4235.929 53.795,0"</div><div class='add'>+     id="path663"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7381.4759,4235.929 53.795,0"</div><div class='add'>+     id="path665"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7468.7659,4235.929 53.795,0"</div><div class='add'>+     id="path667"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7555.0409,4235.929 53.795,0"</div><div class='add'>+     id="path669"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7642.3309,4235.929 53.795,0"</div><div class='add'>+     id="path671"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7728.6059,4235.929 53.795,0"</div><div class='add'>+     id="path673"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7814.8809,4235.929 53.795,0"</div><div class='add'>+     id="path675"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7902.1709,4235.929 53.795,0"</div><div class='add'>+     id="path677"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7988.4459,4235.929 53.795,0"</div><div class='add'>+     id="path679"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8075.7359,4235.929 53.795,0"</div><div class='add'>+     id="path681"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8162.0109,4235.929 53.795,0"</div><div class='add'>+     id="path683"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8249.3009,4235.929 53.795,0"</div><div class='add'>+     id="path685"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8335.5759,4235.929 53.795,0"</div><div class='add'>+     id="path687"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8421.8509,4235.929 53.795,0"</div><div class='add'>+     id="path689"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8509.1409,4235.929 53.795,0"</div><div class='add'>+     id="path691"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8595.4159,4235.929 53.795,0"</div><div class='add'>+     id="path693"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8682.7059,4235.929 53.795,0"</div><div class='add'>+     id="path695"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8768.9809,4235.929 53.795,0"</div><div class='add'>+     id="path697"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8856.2709,4235.929 53.795,0"</div><div class='add'>+     id="path699"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8942.5459,4235.929 53.795,0"</div><div class='add'>+     id="path701"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9028.8209,4235.929 54.81,0"</div><div class='add'>+     id="path703"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9116.1109,4235.929 53.795,0"</div><div class='add'>+     id="path705"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9202.3859,4235.929 53.795,0"</div><div class='add'>+     id="path707"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9289.6759,4235.929 53.795,0"</div><div class='add'>+     id="path709"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9375.9509,4235.929 53.795,0"</div><div class='add'>+     id="path711"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9463.2409,4235.929 53.795,0"</div><div class='add'>+     id="path713"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9549.5159,4235.929 53.795,0"</div><div class='add'>+     id="path715"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9635.7909,4235.929 54.81,0"</div><div class='add'>+     id="path717"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9723.0809,4235.929 53.795,0"</div><div class='add'>+     id="path719"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9809.3559,4235.929 53.795,0"</div><div class='add'>+     id="path721"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9896.6459,4235.929 53.795,0"</div><div class='add'>+     id="path723"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9982.9209,4235.929 53.7951,0"</div><div class='add'>+     id="path725"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10070.211,4235.929 53.795,0"</div><div class='add'>+     id="path727"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10156.486,4235.929 53.795,0"</div><div class='add'>+     id="path729"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10242.761,4235.929 54.81,0"</div><div class='add'>+     id="path731"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10330.051,4235.929 53.795,0"</div><div class='add'>+     id="path733"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10416.326,4235.929 53.795,0"</div><div class='add'>+     id="path735"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10503.616,4235.929 53.795,0"</div><div class='add'>+     id="path737"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10589.891,4235.929 53.795,0"</div><div class='add'>+     id="path739"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10677.181,4235.929 53.795,0"</div><div class='add'>+     id="path741"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10763.456,4235.929 53.795,0"</div><div class='add'>+     id="path743"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10849.731,4235.929 54.81,0"</div><div class='add'>+     id="path745"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10937.021,4235.929 53.795,0"</div><div class='add'>+     id="path747"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11023.296,4235.929 53.795,0"</div><div class='add'>+     id="path749"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11110.586,4235.929 53.795,0"</div><div class='add'>+     id="path751"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11196.861,4235.929 53.795,0"</div><div class='add'>+     id="path753"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11284.151,4235.929 53.795,0"</div><div class='add'>+     id="path755"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11370.426,4235.929 53.795,0"</div><div class='add'>+     id="path757"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11457.716,4235.929 53.795,0"</div><div class='add'>+     id="path759"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11543.991,4235.929 53.795,0"</div><div class='add'>+     id="path761"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11630.266,4235.929 53.795,0"</div><div class='add'>+     id="path763"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11717.556,4235.929 53.795,0"</div><div class='add'>+     id="path765"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11803.831,4235.929 53.795,0"</div><div class='add'>+     id="path767"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11891.121,4235.929 53.795,0"</div><div class='add'>+     id="path769"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11977.396,4235.929 53.795,0"</div><div class='add'>+     id="path771"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12064.686,4235.929 53.795,0"</div><div class='add'>+     id="path773"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12150.961,4235.929 53.795,0"</div><div class='add'>+     id="path775"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12237.236,4235.929 53.795,0"</div><div class='add'>+     id="path777"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12324.526,4235.929 53.795,0"</div><div class='add'>+     id="path779"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12410.801,4235.929 53.795,0"</div><div class='add'>+     id="path781"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12498.091,4235.929 53.795,0"</div><div class='add'>+     id="path783"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12584.366,4235.929 53.795,0"</div><div class='add'>+     id="path785"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12671.656,4235.929 53.795,0"</div><div class='add'>+     id="path787"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12757.931,4235.929 53.795,0"</div><div class='add'>+     id="path789"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12844.206,4235.929 54.81,0"</div><div class='add'>+     id="path791"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12931.496,4235.929 53.795,0"</div><div class='add'>+     id="path793"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13017.771,4235.929 53.795,0"</div><div class='add'>+     id="path795"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13105.061,4235.929 53.795,0"</div><div class='add'>+     id="path797"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13191.336,4235.929 53.795,0"</div><div class='add'>+     id="path799"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13278.626,4235.929 53.795,0"</div><div class='add'>+     id="path801"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13364.901,4235.929 53.795,0"</div><div class='add'>+     id="path803"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13451.176,4235.929 54.81,0"</div><div class='add'>+     id="path805"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13538.466,4235.929 53.795,0"</div><div class='add'>+     id="path807"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13624.741,4235.929 53.795,0"</div><div class='add'>+     id="path809"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13712.031,4235.929 53.795,0"</div><div class='add'>+     id="path811"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13798.306,4235.929 53.795,0"</div><div class='add'>+     id="path813"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13885.596,4235.929 53.795,0"</div><div class='add'>+     id="path815"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13971.871,4235.929 53.795,0"</div><div class='add'>+     id="path817"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14058.146,4235.929 54.81,0"</div><div class='add'>+     id="path819"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14145.436,4235.929 53.795,0"</div><div class='add'>+     id="path821"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14231.711,4235.929 53.795,0"</div><div class='add'>+     id="path823"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14319.001,4235.929 53.795,0"</div><div class='add'>+     id="path825"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14405.276,4235.929 53.795,0"</div><div class='add'>+     id="path827"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14492.566,4235.929 53.795,0"</div><div class='add'>+     id="path829"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14578.841,4235.929 53.795,0"</div><div class='add'>+     id="path831"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14665.116,4235.929 54.81,0"</div><div class='add'>+     id="path833"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14752.406,4235.929 53.795,0"</div><div class='add'>+     id="path835"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14838.681,4235.929 53.795,0"</div><div class='add'>+     id="path837"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14925.971,4235.929 53.795,0"</div><div class='add'>+     id="path839"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15012.246,4235.929 53.795,0"</div><div class='add'>+     id="path841"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15099.536,4235.929 53.795,0"</div><div class='add'>+     id="path843"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15185.811,4235.929 53.795,0"</div><div class='add'>+     id="path845"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15272.086,4235.929 54.81,0"</div><div class='add'>+     id="path847"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15359.376,4235.929 53.795,0"</div><div class='add'>+     id="path849"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15445.651,4235.929 53.795,0"</div><div class='add'>+     id="path851"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15532.941,4235.929 53.795,0"</div><div class='add'>+     id="path853"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15619.216,4235.929 53.795,0"</div><div class='add'>+     id="path855"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15706.506,4235.929 53.795,0"</div><div class='add'>+     id="path857"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15792.781,4235.929 53.795,0"</div><div class='add'>+     id="path859"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15880.071,4235.929 53.795,0"</div><div class='add'>+     id="path861"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15966.346,4235.929 53.795,0"</div><div class='add'>+     id="path863"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16052.621,4235.929 53.795,0"</div><div class='add'>+     id="path865"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16139.911,4235.929 53.795,0"</div><div class='add'>+     id="path867"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16226.186,4235.929 53.795,0"</div><div class='add'>+     id="path869"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16313.476,4235.929 53.795,0"</div><div class='add'>+     id="path871"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16399.751,4235.929 53.795,0"</div><div class='add'>+     id="path873"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16487.041,4235.929 53.795,0"</div><div class='add'>+     id="path875"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16573.316,4235.929 53.795,0"</div><div class='add'>+     id="path877"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16659.591,4235.929 53.795,0"</div><div class='add'>+     id="path879"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16746.881,4235.929 53.795,0"</div><div class='add'>+     id="path881"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16833.156,4235.929 53.795,0"</div><div class='add'>+     id="path883"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16920.446,4235.929 53.795,0"</div><div class='add'>+     id="path885"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17006.721,4235.929 53.795,0"</div><div class='add'>+     id="path887"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17094.011,4235.929 53.795,0"</div><div class='add'>+     id="path889"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17180.286,4235.929 53.795,0"</div><div class='add'>+     id="path891"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17266.561,4235.929 54.81,0"</div><div class='add'>+     id="path893"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17353.851,4235.929 53.795,0"</div><div class='add'>+     id="path895"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17440.126,4235.929 53.795,0"</div><div class='add'>+     id="path897"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17527.416,4235.929 53.795,0"</div><div class='add'>+     id="path899"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17613.691,4235.929 53.795,0"</div><div class='add'>+     id="path901"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17700.981,4235.929 53.795,0"</div><div class='add'>+     id="path903"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17787.256,4235.929 53.795,0"</div><div class='add'>+     id="path905"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17873.531,4235.929 54.81,0"</div><div class='add'>+     id="path907"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17960.821,4235.929 53.795,0"</div><div class='add'>+     id="path909"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18047.096,4235.929 53.795,0"</div><div class='add'>+     id="path911"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18134.386,4235.929 53.795,0"</div><div class='add'>+     id="path913"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18220.661,4235.929 53.795,0"</div><div class='add'>+     id="path915"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18307.951,4235.929 53.795,0"</div><div class='add'>+     id="path917"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18394.226,4235.929 53.795,0"</div><div class='add'>+     id="path919"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18480.501,4235.929 54.81,0"</div><div class='add'>+     id="path921"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18567.791,4235.929 53.795,0"</div><div class='add'>+     id="path923"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18654.066,4235.929 53.795,0"</div><div class='add'>+     id="path925"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18741.356,4235.929 c 17.255,-0.9999 35.525,-1.9999 53.795,-4.9997"</div><div class='add'>+     id="path927"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18827.631,4225.9296 c 17.255,-3.9998 34.51,-8.9995 51.765,-13.9992"</div><div class='add'>+     id="path929"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18910.861,4200.9311 c 16.24,-5.9996 32.48,-12.9992 48.72,-20.9987"</div><div class='add'>+     id="path931"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18989.016,4164.9333 c 15.225,-7.9996 31.465,-16.999 45.675,-26.9984"</div><div class='add'>+     id="path933"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19062.096,4118.936 c 14.21,-9.9994 28.42,-20.9987 42.63,-31.9981"</div><div class='add'>+     id="path935"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19129.086,4064.9393 c 13.195,-11.9993 25.375,-24.9985 37.555,-37.9978"</div><div class='add'>+     id="path937"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19188.971,4002.943 c 11.165,-13.9992 22.33,-27.9983 33.495,-41.9975"</div><div class='add'>+     id="path939"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19240.736,3933.9471 c 10.15,-14.9991 19.285,-29.9982 27.405,-44.9973"</div><div class='add'>+     id="path941"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19283.366,3859.9516 c 7.105,-15.9991 14.21,-32.9981 20.3,-48.9971"</div><div class='add'>+     id="path943"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19314.831,3779.9564 c 5.075,-16.999 9.135,-33.998 13.195,-50.997"</div><div class='add'>+     id="path945"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19333.101,3696.9613 c 2.03,-17.9989 4.06,-34.9979 4.06,-52.9968"</div><div class='add'>+     id="path947"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,3611.9664 0,-53.9967"</div><div class='add'>+     id="path949"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,3525.9716 0,-52.9968"</div><div class='add'>+     id="path951"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,3440.9767 0,-52.9968"</div><div class='add'>+     id="path953"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,3354.9819 0,-52.9969"</div><div class='add'>+     id="path955"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,3269.987 0,-52.9969"</div><div class='add'>+     id="path957"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,3183.9921 0,-52.9968"</div><div class='add'>+     id="path959"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,3098.9972 0,-52.9968"</div><div class='add'>+     id="path961"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,3014.0023 0,-53.9967"</div><div class='add'>+     id="path963"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,2928.0075 0,-52.9968"</div><div class='add'>+     id="path965"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,2843.0126 0,-52.9968"</div><div class='add'>+     id="path967"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,2757.0177 0,-52.9968"</div><div class='add'>+     id="path969"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,2672.0228 0,-52.9968"</div><div class='add'>+     id="path971"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,2586.028 0,-52.9968"</div><div class='add'>+     id="path973"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,2501.0331 0,-52.9968"</div><div class='add'>+     id="path975"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,2415.0383 0,-52.9969"</div><div class='add'>+     id="path977"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,2330.0434 0,-52.9969"</div><div class='add'>+     id="path979"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,2245.0485 0,-52.9969"</div><div class='add'>+     id="path981"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,2159.0536 0,-52.9968"</div><div class='add'>+     id="path983"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,2074.0587 0,-52.9968"</div><div class='add'>+     id="path985"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,1988.0639 0,-52.9968"</div><div class='add'>+     id="path987"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,1903.069 0,-52.9968"</div><div class='add'>+     id="path989"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,1817.0741 0,-52.9968"</div><div class='add'>+     id="path991"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,1732.0792 0,-52.9968"</div><div class='add'>+     id="path993"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,1647.0843 0,-52.9968"</div><div class='add'>+     id="path995"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,1561.0895 0,-52.9968"</div><div class='add'>+     id="path997"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,1476.0946 0,-52.9968"</div><div class='add'>+     id="path999"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,1390.0998 0,-52.9969"</div><div class='add'>+     id="path1001"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,1305.1049 0,-52.9969"</div><div class='add'>+     id="path1003"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19337.161,1219.11 c -1.015,-16.999 -3.045,-34.9979 -5.075,-51.9969"</div><div class='add'>+     id="path1005"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19325.996,1135.1151 c -4.06,-16.999 -8.12,-34.9979 -14.21,-50.997"</div><div class='add'>+     id="path1007"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19300.621,1053.12 c -6.09,-15.9991 -13.195,-32.998 -21.315,-48.9971"</div><div class='add'>+     id="path1009"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19264.081,976.1246 c -9.135,-15.99904 -18.27,-30.99814 -28.42,-45.99724"</div><div class='add'>+     id="path1011"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19216.376,904.12892 c -10.15,-13.99916 -21.315,-27.99832 -33.495,-41.99748"</div><div class='add'>+     id="path1013"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19160.551,838.13288 c -12.18,-12.99922 -24.36,-24.9985 -37.555,-36.99778"</div><div class='add'>+     id="path1015"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19097.621,780.13636 c -14.21,-11.99928 -28.42,-21.99868 -42.63,-32.99802"</div><div class='add'>+     id="path1017"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 19027.586,729.13942 c -15.225,-8.99946 -30.45,-17.99892 -46.69,-26.99838"</div><div class='add'>+     id="path1019"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18951.461,688.14188 c -16.24,-7.99952 -32.48,-13.99916 -49.735,-19.9988"</div><div class='add'>+     id="path1021"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18870.261,657.14374 c -17.255,-4.9997 -34.51,-8.99946 -51.765,-11.99928"</div><div class='add'>+     id="path1023"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18786.016,640.14476 c -18.27,-2.99982 -35.525,-3.99976 -53.795,-3.99976"</div><div class='add'>+     id="path1025"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18699.741,636.145 -53.795,0"</div><div class='add'>+     id="path1027"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18612.451,636.145 -53.795,0"</div><div class='add'>+     id="path1029"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18526.176,636.145 -53.795,0"</div><div class='add'>+     id="path1031"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18438.886,636.145 -53.795,0"</div><div class='add'>+     id="path1033"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18352.611,636.145 -53.795,0"</div><div class='add'>+     id="path1035"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18266.336,636.145 -54.81,0"</div><div class='add'>+     id="path1037"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18179.046,636.145 -53.795,0"</div><div class='add'>+     id="path1039"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18092.771,636.145 -53.795,0"</div><div class='add'>+     id="path1041"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 18005.481,636.145 -53.795,0"</div><div class='add'>+     id="path1043"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17919.206,636.145 -53.795,0"</div><div class='add'>+     id="path1045"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17831.916,636.145 -53.795,0"</div><div class='add'>+     id="path1047"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17745.641,636.145 -53.795,0"</div><div class='add'>+     id="path1049"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17659.366,636.145 -54.81,0"</div><div class='add'>+     id="path1051"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17572.076,636.145 -53.795,0"</div><div class='add'>+     id="path1053"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17485.801,636.145 -53.795,0"</div><div class='add'>+     id="path1055"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17398.511,636.145 -53.795,0"</div><div class='add'>+     id="path1057"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17312.236,636.145 -53.795,0"</div><div class='add'>+     id="path1059"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17224.946,636.145 -53.795,0"</div><div class='add'>+     id="path1061"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17138.671,636.145 -53.795,0"</div><div class='add'>+     id="path1063"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 17052.396,636.145 -54.81,0"</div><div class='add'>+     id="path1065"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16965.106,636.145 -53.795,0"</div><div class='add'>+     id="path1067"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16878.831,636.145 -53.795,0"</div><div class='add'>+     id="path1069"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16791.541,636.145 -53.795,0"</div><div class='add'>+     id="path1071"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16705.266,636.145 -53.795,0"</div><div class='add'>+     id="path1073"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16617.976,636.145 -53.795,0"</div><div class='add'>+     id="path1075"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16531.701,636.145 -53.795,0"</div><div class='add'>+     id="path1077"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16445.426,636.145 -54.81,0"</div><div class='add'>+     id="path1079"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16358.136,636.145 -53.795,0"</div><div class='add'>+     id="path1081"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16271.861,636.145 -53.795,0"</div><div class='add'>+     id="path1083"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16184.571,636.145 -53.795,0"</div><div class='add'>+     id="path1085"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16098.296,636.145 -53.795,0"</div><div class='add'>+     id="path1087"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 16011.006,636.145 -53.795,0"</div><div class='add'>+     id="path1089"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15924.731,636.145 -53.795,0"</div><div class='add'>+     id="path1091"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15837.441,636.145 -53.795,0"</div><div class='add'>+     id="path1093"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15751.166,636.145 -53.795,0"</div><div class='add'>+     id="path1095"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15664.891,636.145 -53.795,0"</div><div class='add'>+     id="path1097"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15577.601,636.145 -53.795,0"</div><div class='add'>+     id="path1099"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15491.326,636.145 -53.795,0"</div><div class='add'>+     id="path1101"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15404.036,636.145 -53.795,0"</div><div class='add'>+     id="path1103"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15317.761,636.145 -53.795,0"</div><div class='add'>+     id="path1105"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15230.471,636.145 -53.795,0"</div><div class='add'>+     id="path1107"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15144.196,636.145 -53.795,0"</div><div class='add'>+     id="path1109"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 15057.921,636.145 -53.795,0"</div><div class='add'>+     id="path1111"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14970.631,636.145 -53.795,0"</div><div class='add'>+     id="path1113"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14884.356,636.145 -53.795,0"</div><div class='add'>+     id="path1115"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14797.066,636.145 -53.795,0"</div><div class='add'>+     id="path1117"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14710.791,636.145 -53.795,0"</div><div class='add'>+     id="path1119"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14623.501,636.145 -53.795,0"</div><div class='add'>+     id="path1121"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14537.226,636.145 -53.795,0"</div><div class='add'>+     id="path1123"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14450.951,636.145 -54.81,0"</div><div class='add'>+     id="path1125"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14363.661,636.145 -53.795,0"</div><div class='add'>+     id="path1127"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14277.386,636.145 -53.795,0"</div><div class='add'>+     id="path1129"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14190.096,636.145 -53.795,0"</div><div class='add'>+     id="path1131"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14103.821,636.145 -53.795,0"</div><div class='add'>+     id="path1133"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 14016.531,636.145 -53.795,0"</div><div class='add'>+     id="path1135"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13930.256,636.145 -53.795,0"</div><div class='add'>+     id="path1137"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13843.981,636.145 -54.81,0"</div><div class='add'>+     id="path1139"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13756.691,636.145 -53.795,0"</div><div class='add'>+     id="path1141"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13670.416,636.145 -53.795,0"</div><div class='add'>+     id="path1143"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13583.126,636.145 -53.795,0"</div><div class='add'>+     id="path1145"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13496.851,636.145 -53.795,0"</div><div class='add'>+     id="path1147"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13409.561,636.145 -53.795,0"</div><div class='add'>+     id="path1149"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13323.286,636.145 -53.795,0"</div><div class='add'>+     id="path1151"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13237.011,636.145 -54.81,0"</div><div class='add'>+     id="path1153"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13149.721,636.145 -53.795,0"</div><div class='add'>+     id="path1155"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 13063.446,636.145 -53.795,0"</div><div class='add'>+     id="path1157"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12976.156,636.145 -53.795,0"</div><div class='add'>+     id="path1159"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12889.881,636.145 -53.795,0"</div><div class='add'>+     id="path1161"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12802.591,636.145 -53.795,0"</div><div class='add'>+     id="path1163"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12716.316,636.145 -53.795,0"</div><div class='add'>+     id="path1165"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12630.041,636.145 -54.81,0"</div><div class='add'>+     id="path1167"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12542.751,636.145 -53.795,0"</div><div class='add'>+     id="path1169"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12456.476,636.145 -53.795,0"</div><div class='add'>+     id="path1171"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12369.186,636.145 -53.795,0"</div><div class='add'>+     id="path1173"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12282.911,636.145 -53.795,0"</div><div class='add'>+     id="path1175"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12195.621,636.145 -53.795,0"</div><div class='add'>+     id="path1177"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12109.346,636.145 -53.795,0"</div><div class='add'>+     id="path1179"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 12022.056,636.145 -53.795,0"</div><div class='add'>+     id="path1181"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11935.781,636.145 -53.795,0"</div><div class='add'>+     id="path1183"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11849.506,636.145 -53.795,0"</div><div class='add'>+     id="path1185"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11762.216,636.145 -53.795,0"</div><div class='add'>+     id="path1187"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11675.941,636.145 -53.795,0"</div><div class='add'>+     id="path1189"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11588.651,636.145 -53.795,0"</div><div class='add'>+     id="path1191"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11502.376,636.145 -53.795,0"</div><div class='add'>+     id="path1193"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11415.086,636.145 -53.795,0"</div><div class='add'>+     id="path1195"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11328.811,636.145 -53.795,0"</div><div class='add'>+     id="path1197"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11242.536,636.145 -53.795,0"</div><div class='add'>+     id="path1199"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11155.246,636.145 -53.795,0"</div><div class='add'>+     id="path1201"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 11068.971,636.145 -53.795,0"</div><div class='add'>+     id="path1203"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10981.681,636.145 -53.795,0"</div><div class='add'>+     id="path1205"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10895.406,636.145 -53.795,0"</div><div class='add'>+     id="path1207"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10808.116,636.145 -53.795,0"</div><div class='add'>+     id="path1209"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10721.841,636.145 -53.795,0"</div><div class='add'>+     id="path1211"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10635.566,636.145 -53.795,0"</div><div class='add'>+     id="path1213"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10548.276,636.145 -53.795,0"</div><div class='add'>+     id="path1215"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10462.001,636.145 -53.795,0"</div><div class='add'>+     id="path1217"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10374.711,636.145 -53.795,0"</div><div class='add'>+     id="path1219"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10288.436,636.145 -53.795,0"</div><div class='add'>+     id="path1221"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10201.146,636.145 -53.795,0"</div><div class='add'>+     id="path1223"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10114.871,636.145 -53.795,0"</div><div class='add'>+     id="path1225"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 10028.596,636.145 -54.8101,0"</div><div class='add'>+     id="path1227"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9941.3059,636.145 -53.795,0"</div><div class='add'>+     id="path1229"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9855.0309,636.145 -53.795,0"</div><div class='add'>+     id="path1231"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9767.7409,636.145 -53.795,0"</div><div class='add'>+     id="path1233"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9681.4659,636.145 -53.795,0"</div><div class='add'>+     id="path1235"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9594.1759,636.145 -53.795,0"</div><div class='add'>+     id="path1237"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9507.9009,636.145 -53.795,0"</div><div class='add'>+     id="path1239"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9421.6259,636.145 -54.81,0"</div><div class='add'>+     id="path1241"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9334.3359,636.145 -53.795,0"</div><div class='add'>+     id="path1243"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9248.0609,636.145 -53.795,0"</div><div class='add'>+     id="path1245"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9160.7709,636.145 -53.795,0"</div><div class='add'>+     id="path1247"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 9074.4959,636.145 -53.795,0"</div><div class='add'>+     id="path1249"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8987.2059,636.145 -53.795,0"</div><div class='add'>+     id="path1251"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8900.9309,636.145 -53.795,0"</div><div class='add'>+     id="path1253"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8814.6559,636.145 -54.81,0"</div><div class='add'>+     id="path1255"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8727.3659,636.145 -53.795,0"</div><div class='add'>+     id="path1257"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8641.0909,636.145 -53.795,0"</div><div class='add'>+     id="path1259"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8553.8009,636.145 -53.795,0"</div><div class='add'>+     id="path1261"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8467.5259,636.145 -53.795,0"</div><div class='add'>+     id="path1263"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8380.2359,636.145 -53.795,0"</div><div class='add'>+     id="path1265"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8293.9609,636.145 -53.795,0"</div><div class='add'>+     id="path1267"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8207.6859,636.145 -54.81,0"</div><div class='add'>+     id="path1269"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8120.3959,636.145 -53.795,0"</div><div class='add'>+     id="path1271"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 8034.1209,636.145 -53.795,0"</div><div class='add'>+     id="path1273"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7946.8309,636.145 -53.795,0"</div><div class='add'>+     id="path1275"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7860.5559,636.145 -53.795,0"</div><div class='add'>+     id="path1277"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7773.2659,636.145 -53.795,0"</div><div class='add'>+     id="path1279"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7686.9909,636.145 -53.795,0"</div><div class='add'>+     id="path1281"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7599.7009,636.145 -53.795,0"</div><div class='add'>+     id="path1283"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7513.4259,636.145 -53.795,0"</div><div class='add'>+     id="path1285"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7427.1509,636.145 -53.795,0"</div><div class='add'>+     id="path1287"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7339.8609,636.145 -53.795,0"</div><div class='add'>+     id="path1289"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7253.5859,636.145 -53.795,0"</div><div class='add'>+     id="path1291"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7166.2959,636.145 -53.795,0"</div><div class='add'>+     id="path1293"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 7080.0209,636.145 -53.795,0"</div><div class='add'>+     id="path1295"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6992.7309,636.145 -53.795,0"</div><div class='add'>+     id="path1297"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6906.4559,636.145 -53.795,0"</div><div class='add'>+     id="path1299"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6820.1809,636.145 -53.795,0"</div><div class='add'>+     id="path1301"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6732.8909,636.145 -53.795,0"</div><div class='add'>+     id="path1303"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6646.6159,636.145 -53.795,0"</div><div class='add'>+     id="path1305"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6559.3259,636.145 -53.795,0"</div><div class='add'>+     id="path1307"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6473.0509,636.145 -53.795,0"</div><div class='add'>+     id="path1309"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6385.7609,636.145 -53.795,0"</div><div class='add'>+     id="path1311"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6299.4859,636.145 -53.795,0"</div><div class='add'>+     id="path1313"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6213.2109,636.145 -54.81,0"</div><div class='add'>+     id="path1315"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6125.9209,636.145 -53.795,0"</div><div class='add'>+     id="path1317"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 6039.6459,636.145 -53.795,0"</div><div class='add'>+     id="path1319"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5952.3559,636.145 -53.795,0"</div><div class='add'>+     id="path1321"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5866.0809,636.145 -53.795,0"</div><div class='add'>+     id="path1323"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5778.7909,636.145 -53.795,0"</div><div class='add'>+     id="path1325"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5692.5159,636.145 -53.795,0"</div><div class='add'>+     id="path1327"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5606.2409,636.145 -54.81,0"</div><div class='add'>+     id="path1329"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5518.9509,636.145 -53.795,0"</div><div class='add'>+     id="path1331"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5432.6759,636.145 -53.795,0"</div><div class='add'>+     id="path1333"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5345.3859,636.145 -53.795,0"</div><div class='add'>+     id="path1335"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5259.1109,636.145 -53.795,0"</div><div class='add'>+     id="path1337"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5171.8209,636.145 -53.795,0"</div><div class='add'>+     id="path1339"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 5085.5459,636.145 -53.795,0"</div><div class='add'>+     id="path1341"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4999.2709,636.145 -54.81,0"</div><div class='add'>+     id="path1343"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4911.9809,636.145 -53.795,0"</div><div class='add'>+     id="path1345"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4825.7059,636.145 -53.795,0"</div><div class='add'>+     id="path1347"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4738.4159,636.145 -53.795,0"</div><div class='add'>+     id="path1349"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4652.1409,636.145 -53.795,0"</div><div class='add'>+     id="path1351"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4564.8509,636.145 -53.795,0"</div><div class='add'>+     id="path1353"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4478.5759,636.145 -53.795,0"</div><div class='add'>+     id="path1355"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4392.3009,636.145 -54.81,0"</div><div class='add'>+     id="path1357"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4305.0109,636.145 -53.795,0"</div><div class='add'>+     id="path1359"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4218.7359,636.145 -53.795,0"</div><div class='add'>+     id="path1361"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4131.4459,636.145 -53.795,0"</div><div class='add'>+     id="path1363"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 4045.1709,636.145 -53.795,0"</div><div class='add'>+     id="path1365"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3957.8809,636.145 -53.795,0"</div><div class='add'>+     id="path1367"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3871.6059,636.145 -53.795,0"</div><div class='add'>+     id="path1369"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3785.3309,636.145 -54.81,0"</div><div class='add'>+     id="path1371"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3698.0409,636.145 -53.795,0"</div><div class='add'>+     id="path1373"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3611.7659,636.145 -53.795,0"</div><div class='add'>+     id="path1375"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3524.4759,636.145 -53.795,0"</div><div class='add'>+     id="path1377"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3438.2009,636.145 -53.795,0"</div><div class='add'>+     id="path1379"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3350.9109,636.145 -53.795,0"</div><div class='add'>+     id="path1381"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3264.6359,636.145 -53.795,0"</div><div class='add'>+     id="path1383"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3177.3459,636.145 -53.795,0"</div><div class='add'>+     id="path1385"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3091.0709,636.145 -53.795,0"</div><div class='add'>+     id="path1387"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 3004.7959,636.145 -53.795,0"</div><div class='add'>+     id="path1389"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2917.5059,636.145 -53.795,0"</div><div class='add'>+     id="path1391"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2831.2309,636.145 -53.795,0"</div><div class='add'>+     id="path1393"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2743.9409,636.145 -53.795,0"</div><div class='add'>+     id="path1395"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2657.6659,636.145 -53.795,0"</div><div class='add'>+     id="path1397"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2570.3759,636.145 -53.795,0"</div><div class='add'>+     id="path1399"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2484.1009,636.145 -53.795,0"</div><div class='add'>+     id="path1401"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2397.8259,636.145 -53.795,0"</div><div class='add'>+     id="path1403"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2310.5359,636.145 -53.795,0"</div><div class='add'>+     id="path1405"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2224.2609,636.145 -53.795,0"</div><div class='add'>+     id="path1407"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2136.9709,636.145 -53.795,0"</div><div class='add'>+     id="path1409"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 2050.6959,636.145 -53.795,0"</div><div class='add'>+     id="path1411"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1963.4059,636.145 -53.795,0"</div><div class='add'>+     id="path1413"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1877.1309,636.145 -53.795,0"</div><div class='add'>+     id="path1415"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1790.8559,636.145 -54.81,0"</div><div class='add'>+     id="path1417"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1703.5659,636.145 -53.795,0"</div><div class='add'>+     id="path1419"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1617.2909,636.145 -53.795,0"</div><div class='add'>+     id="path1421"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1530.0009,636.145 -53.795,0"</div><div class='add'>+     id="path1423"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1443.7259,636.145 -53.795,0"</div><div class='add'>+     id="path1425"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1356.4359,636.145 -53.795,0"</div><div class='add'>+     id="path1427"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1270.1609,636.145 -53.795,0"</div><div class='add'>+     id="path1429"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1183.8859,636.145 -54.81,0"</div><div class='add'>+     id="path1431"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1096.5959,636.145 -53.795,0"</div><div class='add'>+     id="path1433"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 1010.3209,636.145 -53.795,0"</div><div class='add'>+     id="path1435"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+     style="fill:none;stroke:#3465af;stroke-width:28.432024"</div><div class='add'>+     d="m 923.0309,636.145 -53.795,0"</div><div class='add'>+     id="path1437"</div><div class='add'>+     inkscape:connector-curvature="0" /&gt;&lt;g</div><div class='add'>+     id="g4044"&gt;&lt;rect</div><div class='add'>+       height="1100.7"</div><div class='add'>+       width="1213.6"</div><div class='add'>+       y="4753.1133"</div><div class='add'>+       x="21109.146"</div><div class='add'>+       id="rect1441"</div><div class='add'>+       style="fill:#f3e777" /&gt;&lt;path</div><div class='add'>+       d="m 20656.146,5536.413 0,-405.46 150.7,-169.16 c 82.886,-93.039 170.53,-186.62 194.77,-207.96 l 44.069,-38.798 783.23,-0.086 783.23,-0.086 0,613.5 0,613.5 -978,0 -978,0 0,-405.46 z m 1027.7,136.98 0,-78.372 -169.91,4.925 -169.91,4.9249 -5.09,45.854 c -8.249,74.303 46.711,101.04 207.69,101.04 l 137.21,0 0,-78.372 z m 235.86,-262.94 4.495,-341.31 207.2,-8.6408 207.2,-8.6408 5.144,-46.443 c 9.596,-86.615 -41.863,-102.05 -322.02,-96.607 l -246.71,4.7956 -4.438,419.08 -4.439,419.08 74.537,0 74.538,0 4.494,-341.31 z m 391.3,313.72 c 26.41,-19.286 36.255,-41.399 32.697,-73.447 l -5.09,-45.854 -174.05,0 -174.05,0 -5.38,48.984 c -9.97,90.771 0.993,97.91 150.36,97.91 99.305,0 148.27,-7.6982 175.52,-27.594 z m -627.16,-274.84 0,-77.768 -174.05,0 -174.05,0 0,66.246 c 0,36.436 4.973,71.431 11.051,77.768 6.078,6.3366 84.401,11.521 174.05,11.521 l 163,0 0,-77.768 z m 659.89,-4.9154 5.125,-74.042 -179.18,4.9155 -179.18,4.9155 -5.38,48.984 c -10.473,95.348 -2.259,99.57 183.28,94.197 l 170.2,-4.9284 5.125,-74.042 z m -659.89,-237.63 0,-78.372 -169.91,4.925 -169.91,4.925 -5.097,73.447 -5.097,73.447 175,0 175,0 0,-78.372 z m 659.86,4.925 -5.097,-73.447 -174.05,0 -174.05,0 -5.38,48.984 c -10.289,93.673 -2.146,97.91 188.15,97.91 l 175.52,0 -5.097,-73.447 z m -659.86,-228.98 0,-77.768 -137.21,0 c -97.358,0 -147.91,7.8138 -174.05,26.902 -34.952,25.523 -49.645,92.242 -25.79,117.11 6.078,6.3366 84.401,11.521 174.05,11.521 l 163,0 0,-77.768 z"</div><div class='add'>+       id="path1443"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       style="fill:#ca4677" /&gt;&lt;/g&gt;&lt;text</div><div class='add'>+     style="font-size:9.10937119px;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     id="text1489"</div><div class='add'>+     transform="scale(1.1035537,0.9061634)"</div><div class='add'>+     x="171.41566"</div><div class='add'>+     y="9913.7109"&gt;&lt;tspan</div><div class='add'>+       font-size="635px"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       id="tspan1491"</div><div class='add'>+       style="font-weight:400;font-size:482.03753662px;font-family:'Times New Roman', serif" /&gt;&lt;/text&gt;</div><div class='add'>+&lt;g</div><div class='add'>+     id="g4048"&gt;&lt;rect</div><div class='add'>+       height="2342.4341"</div><div class='add'>+       width="2320.7097"</div><div class='add'>+       y="13737.451"</div><div class='add'>+       x="18796.941"</div><div class='add'>+       id="rect1447"</div><div class='add'>+       style="fill:#6076b3" /&gt;&lt;rect</div><div class='add'>+       id="rect1451"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="18532.135"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="13817.405"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1453"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="18532.135"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="14075.544"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1455"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="18532.135"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="14334.443"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1457"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="18532.135"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="14592.582"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1459"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="18532.135"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="14850.721"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1461"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="18532.135"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="15109.62"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1463"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="18532.135"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="15367.759"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1465"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="18532.135"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="15625.896"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1467"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="18532.135"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="15884.035"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1469"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="21080.053"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="13783.14"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1471"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="21080.053"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="14041.277"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1473"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="21080.053"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="14299.416"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1475"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="21080.053"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="14558.315"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1477"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="21080.053"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="14816.454"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1479"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="21080.053"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="15074.593"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1481"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="21080.053"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="15333.492"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1483"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="21080.053"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="15591.631"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;rect</div><div class='add'>+       id="rect1485"</div><div class='add'>+       height="137.78799"</div><div class='add'>+       x="21080.053"</div><div class='add'>+       width="302.70312"</div><div class='add'>+       y="15849.769"</div><div class='add'>+       style="fill:#e0ee2c;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;text</div><div class='add'>+       transform="scale(1.1035537,0.9061634)"</div><div class='add'>+       sodipodi:linespacing="125%"</div><div class='add'>+       id="text1493"</div><div class='add'>+       line-height="125%"</div><div class='add'>+       x="17205.688"</div><div class='add'>+       y="16777.641"</div><div class='add'>+       font-size="1128.9px"</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-size:856.96411133px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"&gt;&lt;tspan</div><div class='add'>+         id="tspan1495"</div><div class='add'>+         x="17205.688"</div><div class='add'>+         y="16777.641"&gt;CPU&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;text</div><div class='add'>+     style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"</div><div class='add'>+     id="text1499"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-11700.553"</div><div class='add'>+     y="565.61298"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:706px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan1501"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="706px"&gt;&lt;tspan</div><div class='add'>+         id="tspan1503"</div><div class='add'>+         transform="matrix(0,-1,1,0,8509,40173)"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="12640.447"</div><div class='add'>+         y="16397.613"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan1505"&gt;PCI, USB, SPI, I2C, ...&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;path</div><div class='add'>+     d="m 12408.066,15561.578 -1115.084,0 0,-1420.331 2230.169,0 0,1420.331 -1115.085,0 z"</div><div class='add'>+     id="path1511"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#cfe7f5;fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" /&gt;&lt;path</div><div class='add'>+     d="m 12408.066,15561.578 -1115.084,0 0,-1420.331 2230.169,0 0,1420.331 -1115.085,0 z"</div><div class='add'>+     id="path1513"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;fill-rule:evenodd;stroke:#3465af;stroke-width:19.84712601;stroke-linejoin:round" /&gt;&lt;text</div><div class='add'>+     style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"</div><div class='add'>+     id="text1515"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-1394.0863"</div><div class='add'>+     y="590.73016"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan1517"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan1519"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="11487.915"</div><div class='add'>+         y="14672.743"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan1521"&gt;Bridge&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+     style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"</div><div class='add'>+     id="text1523"</div><div class='add'>+     class="TextShape"</div><div class='add'>+     x="-1450.5308"</div><div class='add'>+     y="1324.5078"&gt;&lt;tspan</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Times New Roman', serif"</div><div class='add'>+       id="tspan1525"</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       font-size="635px"&gt;&lt;tspan</div><div class='add'>+         id="tspan1527"</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="11431.471"</div><div class='add'>+         y="15406.52"&gt;&lt;tspan</div><div class='add'>+           style="fill:#000000"</div><div class='add'>+           id="tspan1529"&gt; DMA&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/svg&gt;
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/media/uapi/cec/cec-func-close.rst b/Documentation/media/uapi/cec/cec-func-close.rst<br/>index 8267c31b317d..895d9c2d1c04 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-func-close.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/cec/cec-func-close.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-func-close.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-func-close.rst</a></div><div class='hunk'>@@ -33,11 +33,6 @@ Arguments</div><div class='ctx'> Description</div><div class='ctx'> ===========</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   This documents the proposed CEC API. This API is not yet finalized</div><div class='del'>-   and is currently only available as a staging kernel module.</div><div class='del'>-</div><div class='ctx'> Closes the cec device. Resources associated with the file descriptor are</div><div class='ctx'> freed. The device configuration remain unchanged.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/cec/cec-func-ioctl.rst b/Documentation/media/uapi/cec/cec-func-ioctl.rst<br/>index 9e8dbb118d6a..7dcfd178fb24 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-func-ioctl.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/cec/cec-func-ioctl.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-func-ioctl.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-func-ioctl.rst</a></div><div class='hunk'>@@ -39,11 +39,6 @@ Arguments</div><div class='ctx'> Description</div><div class='ctx'> ===========</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   This documents the proposed CEC API. This API is not yet finalized</div><div class='del'>-   and is currently only available as a staging kernel module.</div><div class='del'>-</div><div class='ctx'> The :c:func:`ioctl()` function manipulates cec device parameters. The</div><div class='ctx'> argument ``fd`` must be an open file descriptor.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/cec/cec-func-open.rst b/Documentation/media/uapi/cec/cec-func-open.rst<br/>index af3f5b5c24c6..0304388cd159 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-func-open.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/cec/cec-func-open.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-func-open.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-func-open.rst</a></div><div class='hunk'>@@ -46,11 +46,6 @@ Arguments</div><div class='ctx'> Description</div><div class='ctx'> ===========</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   This documents the proposed CEC API. This API is not yet finalized</div><div class='del'>-   and is currently only available as a staging kernel module.</div><div class='del'>-</div><div class='ctx'> To open a cec device applications call :c:func:`open()` with the</div><div class='ctx'> desired device name. The function has no side effects; the device</div><div class='ctx'> configuration remain unchanged.</div><div class='head'>diff --git a/Documentation/media/uapi/cec/cec-func-poll.rst b/Documentation/media/uapi/cec/cec-func-poll.rst<br/>index cfb73e6027a5..6a863cfda6e0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-func-poll.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/cec/cec-func-poll.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-func-poll.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-func-poll.rst</a></div><div class='hunk'>@@ -39,11 +39,6 @@ Arguments</div><div class='ctx'> Description</div><div class='ctx'> ===========</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   This documents the proposed CEC API. This API is not yet finalized</div><div class='del'>-   and is currently only available as a staging kernel module.</div><div class='del'>-</div><div class='ctx'> With the :c:func:`poll()` function applications can wait for CEC</div><div class='ctx'> events.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/cec/cec-intro.rst b/Documentation/media/uapi/cec/cec-intro.rst<br/>index 4a19ea5323a9..07ee2b8f89d6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-intro.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/cec/cec-intro.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-intro.rst</a></div><div class='hunk'>@@ -3,11 +3,6 @@</div><div class='ctx'> Introduction</div><div class='ctx'> ============</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   This documents the proposed CEC API. This API is not yet finalized</div><div class='del'>-   and is currently only available as a staging kernel module.</div><div class='del'>-</div><div class='ctx'> HDMI connectors provide a single pin for use by the Consumer Electronics</div><div class='ctx'> Control protocol. This protocol allows different devices connected by an</div><div class='ctx'> HDMI cable to communicate. The protocol for CEC version 1.4 is defined</div><div class='hunk'>@@ -31,3 +26,15 @@ control just the CEC pin.</div><div class='ctx'> Drivers that support CEC will create a CEC device node (/dev/cecX) to</div><div class='ctx'> give userspace access to the CEC adapter. The</div><div class='ctx'> :ref:`CEC_ADAP_G_CAPS` ioctl will tell userspace what it is allowed to do.</div><div class='add'>+</div><div class='add'>+In order to check the support and test it, it is suggested to download</div><div class='add'>+the `v4l-utils &lt;https://git.linuxtv.org/v4l-utils.git/&gt;`_ package. It</div><div class='add'>+provides three tools to handle CEC:</div><div class='add'>+</div><div class='add'>+- cec-ctl: the Swiss army knife of CEC. Allows you to configure, transmit</div><div class='add'>+  and monitor CEC messages.</div><div class='add'>+</div><div class='add'>+- cec-compliance: does a CEC compliance test of a remote CEC device to</div><div class='add'>+  determine how compliant the CEC implementation is.</div><div class='add'>+</div><div class='add'>+- cec-follower: emulates a CEC follower.</div><div class='head'>diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst<br/>index a35dca281178..a0e961f11017 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst</a></div><div class='hunk'>@@ -29,11 +29,6 @@ Arguments</div><div class='ctx'> Description</div><div class='ctx'> ===========</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   This documents the proposed CEC API. This API is not yet finalized</div><div class='del'>-   and is currently only available as a staging kernel module.</div><div class='del'>-</div><div class='ctx'> All cec devices must support :ref:`ioctl CEC_ADAP_G_CAPS &lt;CEC_ADAP_G_CAPS&gt;`. To query</div><div class='ctx'> device information, applications call the ioctl with a pointer to a</div><div class='ctx'> struct :c:type:`cec_caps`. The driver fills the structure and</div><div class='hunk'>@@ -48,41 +43,21 @@ returns the information to the application. The ioctl never fails.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       1 1 16</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-    -  .. row 1</div><div class='del'>-</div><div class='del'>-       -  char</div><div class='del'>-</div><div class='del'>-       -  ``driver[32]``</div><div class='del'>-</div><div class='del'>-       -  The name of the cec adapter driver.</div><div class='del'>-</div><div class='del'>-    -  .. row 2</div><div class='del'>-</div><div class='del'>-       -  char</div><div class='del'>-</div><div class='del'>-       -  ``name[32]``</div><div class='del'>-</div><div class='del'>-       -  The name of this CEC adapter. The combination ``driver`` and</div><div class='del'>-	  ``name`` must be unique.</div><div class='del'>-</div><div class='del'>-    -  .. row 3</div><div class='del'>-</div><div class='del'>-       -  __u32</div><div class='del'>-</div><div class='del'>-       -  ``capabilities``</div><div class='del'>-</div><div class='del'>-       -  The capabilities of the CEC adapter, see</div><div class='del'>-	  :ref:`cec-capabilities`.</div><div class='del'>-</div><div class='del'>-    -  .. row 4</div><div class='del'>-</div><div class='del'>-       -  __u32</div><div class='del'>-</div><div class='del'>-       -  ``version``</div><div class='del'>-</div><div class='del'>-       -  CEC Framework API version, formatted with the ``KERNEL_VERSION()``</div><div class='del'>-	  macro.</div><div class='add'>+    * - char</div><div class='add'>+      - ``driver[32]``</div><div class='add'>+      - The name of the cec adapter driver.</div><div class='add'>+    * - char</div><div class='add'>+      - ``name[32]``</div><div class='add'>+      - The name of this CEC adapter. The combination ``driver`` and</div><div class='add'>+	``name`` must be unique.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``capabilities``</div><div class='add'>+      - The capabilities of the CEC adapter, see</div><div class='add'>+	:ref:`cec-capabilities`.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``version``</div><div class='add'>+      - CEC Framework API version, formatted with the ``KERNEL_VERSION()``</div><div class='add'>+	macro.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{4.4cm}|p{2.5cm}|p{10.6cm}|</div><div class='hunk'>@@ -94,68 +69,50 @@ returns the information to the application. The ioctl never fails.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 8</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-CAP-PHYS-ADDR`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_CAP_PHYS_ADDR``</div><div class='del'>-</div><div class='del'>-       -  0x00000001</div><div class='del'>-</div><div class='del'>-       -  Userspace has to configure the physical address by calling</div><div class='del'>-	  :ref:`ioctl CEC_ADAP_S_PHYS_ADDR &lt;CEC_ADAP_S_PHYS_ADDR&gt;`. If</div><div class='del'>-	  this capability isn't set, then setting the physical address is</div><div class='del'>-	  handled by the kernel whenever the EDID is set (for an HDMI</div><div class='del'>-	  receiver) or read (for an HDMI transmitter).</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-CAP-LOG-ADDRS`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_CAP_LOG_ADDRS``</div><div class='del'>-</div><div class='del'>-       -  0x00000002</div><div class='del'>-</div><div class='del'>-       -  Userspace has to configure the logical addresses by calling</div><div class='del'>-	  :ref:`ioctl CEC_ADAP_S_LOG_ADDRS &lt;CEC_ADAP_S_LOG_ADDRS&gt;`. If</div><div class='del'>-	  this capability isn't set, then the kernel will have configured</div><div class='del'>-	  this.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-CAP-TRANSMIT`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_CAP_TRANSMIT``</div><div class='del'>-</div><div class='del'>-       -  0x00000004</div><div class='del'>-</div><div class='del'>-       -  Userspace can transmit CEC messages by calling</div><div class='del'>-	  :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;`. This implies that</div><div class='del'>-	  userspace can be a follower as well, since being able to transmit</div><div class='del'>-	  messages is a prerequisite of becoming a follower. If this</div><div class='del'>-	  capability isn't set, then the kernel will handle all CEC</div><div class='del'>-	  transmits and process all CEC messages it receives.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-CAP-PASSTHROUGH`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_CAP_PASSTHROUGH``</div><div class='del'>-</div><div class='del'>-       -  0x00000008</div><div class='del'>-</div><div class='del'>-       -  Userspace can use the passthrough mode by calling</div><div class='del'>-	  :ref:`ioctl CEC_S_MODE &lt;CEC_S_MODE&gt;`.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-CAP-RC`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_CAP_RC``</div><div class='del'>-</div><div class='del'>-       -  0x00000010</div><div class='del'>-</div><div class='del'>-       -  This adapter supports the remote control protocol.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-CAP-MONITOR-ALL`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_CAP_MONITOR_ALL``</div><div class='del'>-</div><div class='del'>-       -  0x00000020</div><div class='del'>-</div><div class='del'>-       -  The CEC hardware can monitor all messages, not just directed and</div><div class='del'>-	  broadcast messages.</div><div class='add'>+    * .. _`CEC-CAP-PHYS-ADDR`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_CAP_PHYS_ADDR``</div><div class='add'>+      - 0x00000001</div><div class='add'>+      - Userspace has to configure the physical address by calling</div><div class='add'>+	:ref:`ioctl CEC_ADAP_S_PHYS_ADDR &lt;CEC_ADAP_S_PHYS_ADDR&gt;`. If</div><div class='add'>+	this capability isn't set, then setting the physical address is</div><div class='add'>+	handled by the kernel whenever the EDID is set (for an HDMI</div><div class='add'>+	receiver) or read (for an HDMI transmitter).</div><div class='add'>+    * .. _`CEC-CAP-LOG-ADDRS`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_CAP_LOG_ADDRS``</div><div class='add'>+      - 0x00000002</div><div class='add'>+      - Userspace has to configure the logical addresses by calling</div><div class='add'>+	:ref:`ioctl CEC_ADAP_S_LOG_ADDRS &lt;CEC_ADAP_S_LOG_ADDRS&gt;`. If</div><div class='add'>+	this capability isn't set, then the kernel will have configured</div><div class='add'>+	this.</div><div class='add'>+    * .. _`CEC-CAP-TRANSMIT`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_CAP_TRANSMIT``</div><div class='add'>+      - 0x00000004</div><div class='add'>+      - Userspace can transmit CEC messages by calling</div><div class='add'>+	:ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;`. This implies that</div><div class='add'>+	userspace can be a follower as well, since being able to transmit</div><div class='add'>+	messages is a prerequisite of becoming a follower. If this</div><div class='add'>+	capability isn't set, then the kernel will handle all CEC</div><div class='add'>+	transmits and process all CEC messages it receives.</div><div class='add'>+    * .. _`CEC-CAP-PASSTHROUGH`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_CAP_PASSTHROUGH``</div><div class='add'>+      - 0x00000008</div><div class='add'>+      - Userspace can use the passthrough mode by calling</div><div class='add'>+	:ref:`ioctl CEC_S_MODE &lt;CEC_S_MODE&gt;`.</div><div class='add'>+    * .. _`CEC-CAP-RC`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_CAP_RC``</div><div class='add'>+      - 0x00000010</div><div class='add'>+      - This adapter supports the remote control protocol.</div><div class='add'>+    * .. _`CEC-CAP-MONITOR-ALL`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_CAP_MONITOR_ALL``</div><div class='add'>+      - 0x00000020</div><div class='add'>+      - The CEC hardware can monitor all messages, not just directed and</div><div class='add'>+	broadcast messages.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst<br/>index 940a16d8d55e..09f09bbe28d4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst</a></div><div class='hunk'>@@ -35,11 +35,6 @@ Arguments</div><div class='ctx'> Description</div><div class='ctx'> ===========</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   This documents the proposed CEC API. This API is not yet finalized</div><div class='del'>-   and is currently only available as a staging kernel module.</div><div class='del'>-</div><div class='ctx'> To query the current CEC logical addresses, applications call</div><div class='ctx'> :ref:`ioctl CEC_ADAP_G_LOG_ADDRS &lt;CEC_ADAP_G_LOG_ADDRS&gt;` with a pointer to a</div><div class='ctx'> struct :c:type:`cec_log_addrs` where the driver stores the logical addresses.</div><div class='hunk'>@@ -77,134 +72,79 @@ logical address types are already defined will return with error ``EBUSY``.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       1 1 16</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-    -  .. row 1</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``log_addr[CEC_MAX_LOG_ADDRS]``</div><div class='del'>-</div><div class='del'>-       -  The actual logical addresses that were claimed. This is set by the</div><div class='del'>-	  driver. If no logical address could be claimed, then it is set to</div><div class='del'>-	  ``CEC_LOG_ADDR_INVALID``. If this adapter is Unregistered, then</div><div class='del'>-	  ``log_addr[0]`` is set to 0xf and all others to</div><div class='del'>-	  ``CEC_LOG_ADDR_INVALID``.</div><div class='del'>-</div><div class='del'>-    -  .. row 2</div><div class='del'>-</div><div class='del'>-       -  __u16</div><div class='del'>-</div><div class='del'>-       -  ``log_addr_mask``</div><div class='del'>-</div><div class='del'>-       -  The bitmask of all logical addresses this adapter has claimed. If</div><div class='del'>-	  this adapter is Unregistered then ``log_addr_mask`` sets bit 15</div><div class='del'>-	  and clears all other bits. If this adapter is not configured at</div><div class='del'>-	  all, then ``log_addr_mask`` is set to 0. Set by the driver.</div><div class='del'>-</div><div class='del'>-    -  .. row 3</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``cec_version``</div><div class='del'>-</div><div class='del'>-       -  The CEC version that this adapter shall use. See</div><div class='del'>-	  :ref:`cec-versions`. Used to implement the</div><div class='del'>-	  ``CEC_MSG_CEC_VERSION`` and ``CEC_MSG_REPORT_FEATURES`` messages.</div><div class='del'>-	  Note that :ref:`CEC_OP_CEC_VERSION_1_3A &lt;CEC-OP-CEC-VERSION-1-3A&gt;` is not allowed by the CEC</div><div class='del'>-	  framework.</div><div class='del'>-</div><div class='del'>-    -  .. row 4</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``num_log_addrs``</div><div class='del'>-</div><div class='del'>-       -  Number of logical addresses to set up. Must be ≤</div><div class='del'>-	  ``available_log_addrs`` as returned by</div><div class='del'>-	  :ref:`CEC_ADAP_G_CAPS`. All arrays in</div><div class='del'>-	  this structure are only filled up to index</div><div class='del'>-	  ``available_log_addrs``-1. The remaining array elements will be</div><div class='del'>-	  ignored. Note that the CEC 2.0 standard allows for a maximum of 2</div><div class='del'>-	  logical addresses, although some hardware has support for more.</div><div class='del'>-	  ``CEC_MAX_LOG_ADDRS`` is 4. The driver will return the actual</div><div class='del'>-	  number of logical addresses it could claim, which may be less than</div><div class='del'>-	  what was requested. If this field is set to 0, then the CEC</div><div class='del'>-	  adapter shall clear all claimed logical addresses and all other</div><div class='del'>-	  fields will be ignored.</div><div class='del'>-</div><div class='del'>-    -  .. row 5</div><div class='del'>-</div><div class='del'>-       -  __u32</div><div class='del'>-</div><div class='del'>-       -  ``vendor_id``</div><div class='del'>-</div><div class='del'>-       -  The vendor ID is a 24-bit number that identifies the specific</div><div class='del'>-	  vendor or entity. Based on this ID vendor specific commands may be</div><div class='del'>-	  defined. If you do not want a vendor ID then set it to</div><div class='del'>-	  ``CEC_VENDOR_ID_NONE``.</div><div class='del'>-</div><div class='del'>-    -  .. row 6</div><div class='del'>-</div><div class='del'>-       -  __u32</div><div class='del'>-</div><div class='del'>-       -  ``flags``</div><div class='del'>-</div><div class='del'>-       -  Flags. See :ref:`cec-log-addrs-flags` for a list of available flags.</div><div class='del'>-</div><div class='del'>-    -  .. row 7</div><div class='del'>-</div><div class='del'>-       -  char</div><div class='del'>-</div><div class='del'>-       -  ``osd_name[15]``</div><div class='del'>-</div><div class='del'>-       -  The On-Screen Display name as is returned by the</div><div class='del'>-	  ``CEC_MSG_SET_OSD_NAME`` message.</div><div class='del'>-</div><div class='del'>-    -  .. row 8</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``primary_device_type[CEC_MAX_LOG_ADDRS]``</div><div class='del'>-</div><div class='del'>-       -  Primary device type for each logical address. See</div><div class='del'>-	  :ref:`cec-prim-dev-types` for possible types.</div><div class='del'>-</div><div class='del'>-    -  .. row 9</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``log_addr_type[CEC_MAX_LOG_ADDRS]``</div><div class='del'>-</div><div class='del'>-       -  Logical address types. See :ref:`cec-log-addr-types` for</div><div class='del'>-	  possible types. The driver will update this with the actual</div><div class='del'>-	  logical address type that it claimed (e.g. it may have to fallback</div><div class='del'>-	  to :ref:`CEC_LOG_ADDR_TYPE_UNREGISTERED &lt;CEC-LOG-ADDR-TYPE-UNREGISTERED&gt;`).</div><div class='del'>-</div><div class='del'>-    -  .. row 10</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``all_device_types[CEC_MAX_LOG_ADDRS]``</div><div class='del'>-</div><div class='del'>-       -  CEC 2.0 specific: the bit mask of all device types. See</div><div class='del'>-	  :ref:`cec-all-dev-types-flags`. It is used in the CEC 2.0</div><div class='del'>-	  ``CEC_MSG_REPORT_FEATURES`` message. For CEC 1.4 you can either leave</div><div class='del'>-	  this field to 0, or fill it in according to the CEC 2.0 guidelines to</div><div class='del'>-	  give the CEC framework more information about the device type, even</div><div class='del'>-	  though the framework won't use it directly in the CEC message.</div><div class='del'>-</div><div class='del'>-    -  .. row 11</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``features[CEC_MAX_LOG_ADDRS][12]``</div><div class='del'>-</div><div class='del'>-       -  Features for each logical address. It is used in the CEC 2.0</div><div class='del'>-	  ``CEC_MSG_REPORT_FEATURES`` message. The 12 bytes include both the</div><div class='del'>-	  RC Profile and the Device Features. For CEC 1.4 you can either leave</div><div class='del'>-          this field to all 0, or fill it in according to the CEC 2.0 guidelines to</div><div class='del'>-          give the CEC framework more information about the device type, even</div><div class='del'>-          though the framework won't use it directly in the CEC message.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``log_addr[CEC_MAX_LOG_ADDRS]``</div><div class='add'>+      - The actual logical addresses that were claimed. This is set by the</div><div class='add'>+	driver. If no logical address could be claimed, then it is set to</div><div class='add'>+	``CEC_LOG_ADDR_INVALID``. If this adapter is Unregistered, then</div><div class='add'>+	``log_addr[0]`` is set to 0xf and all others to</div><div class='add'>+	``CEC_LOG_ADDR_INVALID``.</div><div class='add'>+    * - __u16</div><div class='add'>+      - ``log_addr_mask``</div><div class='add'>+      - The bitmask of all logical addresses this adapter has claimed. If</div><div class='add'>+	this adapter is Unregistered then ``log_addr_mask`` sets bit 15</div><div class='add'>+	and clears all other bits. If this adapter is not configured at</div><div class='add'>+	all, then ``log_addr_mask`` is set to 0. Set by the driver.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``cec_version``</div><div class='add'>+      - The CEC version that this adapter shall use. See</div><div class='add'>+	:ref:`cec-versions`. Used to implement the</div><div class='add'>+	``CEC_MSG_CEC_VERSION`` and ``CEC_MSG_REPORT_FEATURES`` messages.</div><div class='add'>+	Note that :ref:`CEC_OP_CEC_VERSION_1_3A &lt;CEC-OP-CEC-VERSION-1-3A&gt;` is not allowed by the CEC</div><div class='add'>+	framework.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``num_log_addrs``</div><div class='add'>+      - Number of logical addresses to set up. Must be ≤</div><div class='add'>+	``available_log_addrs`` as returned by</div><div class='add'>+	:ref:`CEC_ADAP_G_CAPS`. All arrays in</div><div class='add'>+	this structure are only filled up to index</div><div class='add'>+	``available_log_addrs``-1. The remaining array elements will be</div><div class='add'>+	ignored. Note that the CEC 2.0 standard allows for a maximum of 2</div><div class='add'>+	logical addresses, although some hardware has support for more.</div><div class='add'>+	``CEC_MAX_LOG_ADDRS`` is 4. The driver will return the actual</div><div class='add'>+	number of logical addresses it could claim, which may be less than</div><div class='add'>+	what was requested. If this field is set to 0, then the CEC</div><div class='add'>+	adapter shall clear all claimed logical addresses and all other</div><div class='add'>+	fields will be ignored.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``vendor_id``</div><div class='add'>+      - The vendor ID is a 24-bit number that identifies the specific</div><div class='add'>+	vendor or entity. Based on this ID vendor specific commands may be</div><div class='add'>+	defined. If you do not want a vendor ID then set it to</div><div class='add'>+	``CEC_VENDOR_ID_NONE``.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``flags``</div><div class='add'>+      - Flags. See :ref:`cec-log-addrs-flags` for a list of available flags.</div><div class='add'>+    * - char</div><div class='add'>+      - ``osd_name[15]``</div><div class='add'>+      - The On-Screen Display name as is returned by the</div><div class='add'>+	``CEC_MSG_SET_OSD_NAME`` message.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``primary_device_type[CEC_MAX_LOG_ADDRS]``</div><div class='add'>+      - Primary device type for each logical address. See</div><div class='add'>+	:ref:`cec-prim-dev-types` for possible types.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``log_addr_type[CEC_MAX_LOG_ADDRS]``</div><div class='add'>+      - Logical address types. See :ref:`cec-log-addr-types` for</div><div class='add'>+	possible types. The driver will update this with the actual</div><div class='add'>+	logical address type that it claimed (e.g. it may have to fallback</div><div class='add'>+	to :ref:`CEC_LOG_ADDR_TYPE_UNREGISTERED &lt;CEC-LOG-ADDR-TYPE-UNREGISTERED&gt;`).</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``all_device_types[CEC_MAX_LOG_ADDRS]``</div><div class='add'>+      - CEC 2.0 specific: the bit mask of all device types. See</div><div class='add'>+	:ref:`cec-all-dev-types-flags`. It is used in the CEC 2.0</div><div class='add'>+	``CEC_MSG_REPORT_FEATURES`` message. For CEC 1.4 you can either leave</div><div class='add'>+	this field to 0, or fill it in according to the CEC 2.0 guidelines to</div><div class='add'>+	give the CEC framework more information about the device type, even</div><div class='add'>+	though the framework won't use it directly in the CEC message.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``features[CEC_MAX_LOG_ADDRS][12]``</div><div class='add'>+      - Features for each logical address. It is used in the CEC 2.0</div><div class='add'>+	``CEC_MSG_REPORT_FEATURES`` message. The 12 bytes include both the</div><div class='add'>+	RC Profile and the Device Features. For CEC 1.4 you can either leave</div><div class='add'>+        this field to all 0, or fill it in according to the CEC 2.0 guidelines to</div><div class='add'>+        give the CEC framework more information about the device type, even</div><div class='add'>+        though the framework won't use it directly in the CEC message.</div><div class='ctx'> </div><div class='ctx'> .. _cec-log-addrs-flags:</div><div class='ctx'> </div><div class='hunk'>@@ -213,17 +153,33 @@ logical address types are already defined will return with error ``EBUSY``.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 4</div><div class='ctx'> </div><div class='add'>+    * .. _`CEC-LOG-ADDRS-FL-ALLOW-UNREG-FALLBACK`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-LOG-ADDRS-FL-ALLOW-UNREG-FALLBACK`:</div><div class='add'>+      - ``CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK``</div><div class='add'>+      - 1</div><div class='add'>+      - By default if no logical address of the requested type can be claimed, then</div><div class='add'>+	it will go back to the unconfigured state. If this flag is set, then it will</div><div class='add'>+	fallback to the Unregistered logical address. Note that if the Unregistered</div><div class='add'>+	logical address was explicitly requested, then this flag has no effect.</div><div class='add'>+    * .. _`CEC-LOG-ADDRS-FL-ALLOW-RC-PASSTHRU`:</div><div class='ctx'> </div><div class='del'>-       -  ``CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK``</div><div class='add'>+      - ``CEC_LOG_ADDRS_FL_ALLOW_RC_PASSTHRU``</div><div class='add'>+      - 2</div><div class='add'>+      - By default the ``CEC_MSG_USER_CONTROL_PRESSED`` and ``CEC_MSG_USER_CONTROL_RELEASED``</div><div class='add'>+        messages are only passed on to the follower(s), if any. If this flag is set,</div><div class='add'>+	then these messages are also passed on to the remote control input subsystem</div><div class='add'>+	and will appear as keystrokes. This features needs to be enabled explicitly.</div><div class='add'>+	If CEC is used to enter e.g. passwords, then you may not want to enable this</div><div class='add'>+	to avoid trivial snooping of the keystrokes.</div><div class='add'>+    * .. _`CEC-LOG-ADDRS-FL-CDC-ONLY`:</div><div class='ctx'> </div><div class='del'>-       -  1</div><div class='add'>+      - `CEC_LOG_ADDRS_FL_CDC_ONLY`</div><div class='add'>+      - 4</div><div class='add'>+      - If this flag is set, then the device is CDC-Only. CDC-Only CEC devices</div><div class='add'>+	are CEC devices that can only handle CDC messages.</div><div class='add'>+</div><div class='add'>+	All other messages are ignored.</div><div class='ctx'> </div><div class='del'>-       -  By default if no logical address of the requested type can be claimed, then</div><div class='del'>-	  it will go back to the unconfigured state. If this flag is set, then it will</div><div class='del'>-	  fallback to the Unregistered logical address. Note that if the Unregistered</div><div class='del'>-	  logical address was explicitly requested, then this flag has no effect.</div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|</div><div class='ctx'> </div><div class='hunk'>@@ -234,30 +190,21 @@ logical address types are already defined will return with error ``EBUSY``.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 4</div><div class='ctx'> </div><div class='add'>+    * .. _`CEC-OP-CEC-VERSION-1-3A`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-OP-CEC-VERSION-1-3A`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_CEC_VERSION_1_3A``</div><div class='del'>-</div><div class='del'>-       -  4</div><div class='del'>-</div><div class='del'>-       -  CEC version according to the HDMI 1.3a standard.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-OP-CEC-VERSION-1-4B`:</div><div class='add'>+      - ``CEC_OP_CEC_VERSION_1_3A``</div><div class='add'>+      - 4</div><div class='add'>+      - CEC version according to the HDMI 1.3a standard.</div><div class='add'>+    * .. _`CEC-OP-CEC-VERSION-1-4B`:</div><div class='ctx'> </div><div class='del'>-       -  ``CEC_OP_CEC_VERSION_1_4B``</div><div class='add'>+      - ``CEC_OP_CEC_VERSION_1_4B``</div><div class='add'>+      - 5</div><div class='add'>+      - CEC version according to the HDMI 1.4b standard.</div><div class='add'>+    * .. _`CEC-OP-CEC-VERSION-2-0`:</div><div class='ctx'> </div><div class='del'>-       -  5</div><div class='del'>-</div><div class='del'>-       -  CEC version according to the HDMI 1.4b standard.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-OP-CEC-VERSION-2-0`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_CEC_VERSION_2_0``</div><div class='del'>-</div><div class='del'>-       -  6</div><div class='del'>-</div><div class='del'>-       -  CEC version according to the HDMI 2.0 standard.</div><div class='add'>+      - ``CEC_OP_CEC_VERSION_2_0``</div><div class='add'>+      - 6</div><div class='add'>+      - CEC version according to the HDMI 2.0 standard.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|</div><div class='hunk'>@@ -269,62 +216,41 @@ logical address types are already defined will return with error ``EBUSY``.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 4</div><div class='ctx'> </div><div class='add'>+    * .. _`CEC-OP-PRIM-DEVTYPE-TV`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-OP-PRIM-DEVTYPE-TV`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_PRIM_DEVTYPE_TV``</div><div class='del'>-</div><div class='del'>-       -  0</div><div class='add'>+      - ``CEC_OP_PRIM_DEVTYPE_TV``</div><div class='add'>+      - 0</div><div class='add'>+      - Use for a TV.</div><div class='add'>+    * .. _`CEC-OP-PRIM-DEVTYPE-RECORD`:</div><div class='ctx'> </div><div class='del'>-       -  Use for a TV.</div><div class='add'>+      - ``CEC_OP_PRIM_DEVTYPE_RECORD``</div><div class='add'>+      - 1</div><div class='add'>+      - Use for a recording device.</div><div class='add'>+    * .. _`CEC-OP-PRIM-DEVTYPE-TUNER`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-OP-PRIM-DEVTYPE-RECORD`:</div><div class='add'>+      - ``CEC_OP_PRIM_DEVTYPE_TUNER``</div><div class='add'>+      - 3</div><div class='add'>+      - Use for a device with a tuner.</div><div class='add'>+    * .. _`CEC-OP-PRIM-DEVTYPE-PLAYBACK`:</div><div class='ctx'> </div><div class='del'>-       -  ``CEC_OP_PRIM_DEVTYPE_RECORD``</div><div class='add'>+      - ``CEC_OP_PRIM_DEVTYPE_PLAYBACK``</div><div class='add'>+      - 4</div><div class='add'>+      - Use for a playback device.</div><div class='add'>+    * .. _`CEC-OP-PRIM-DEVTYPE-AUDIOSYSTEM`:</div><div class='ctx'> </div><div class='del'>-       -  1</div><div class='add'>+      - ``CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM``</div><div class='add'>+      - 5</div><div class='add'>+      - Use for an audio system (e.g. an audio/video receiver).</div><div class='add'>+    * .. _`CEC-OP-PRIM-DEVTYPE-SWITCH`:</div><div class='ctx'> </div><div class='del'>-       -  Use for a recording device.</div><div class='add'>+      - ``CEC_OP_PRIM_DEVTYPE_SWITCH``</div><div class='add'>+      - 6</div><div class='add'>+      - Use for a CEC switch.</div><div class='add'>+    * .. _`CEC-OP-PRIM-DEVTYPE-VIDEOPROC`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-OP-PRIM-DEVTYPE-TUNER`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_PRIM_DEVTYPE_TUNER``</div><div class='del'>-</div><div class='del'>-       -  3</div><div class='del'>-</div><div class='del'>-       -  Use for a device with a tuner.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-OP-PRIM-DEVTYPE-PLAYBACK`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_PRIM_DEVTYPE_PLAYBACK``</div><div class='del'>-</div><div class='del'>-       -  4</div><div class='del'>-</div><div class='del'>-       -  Use for a playback device.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-OP-PRIM-DEVTYPE-AUDIOSYSTEM`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM``</div><div class='del'>-</div><div class='del'>-       -  5</div><div class='del'>-</div><div class='del'>-       -  Use for an audio system (e.g. an audio/video receiver).</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-OP-PRIM-DEVTYPE-SWITCH`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_PRIM_DEVTYPE_SWITCH``</div><div class='del'>-</div><div class='del'>-       -  6</div><div class='del'>-</div><div class='del'>-       -  Use for a CEC switch.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-OP-PRIM-DEVTYPE-VIDEOPROC`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_PRIM_DEVTYPE_VIDEOPROC``</div><div class='del'>-</div><div class='del'>-       -  7</div><div class='del'>-</div><div class='del'>-       -  Use for a video processor device.</div><div class='add'>+      - ``CEC_OP_PRIM_DEVTYPE_VIDEOPROC``</div><div class='add'>+      - 7</div><div class='add'>+      - Use for a video processor device.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|</div><div class='hunk'>@@ -336,64 +262,43 @@ logical address types are already defined will return with error ``EBUSY``.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 16</div><div class='ctx'> </div><div class='add'>+    * .. _`CEC-LOG-ADDR-TYPE-TV`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-LOG-ADDR-TYPE-TV`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_LOG_ADDR_TYPE_TV``</div><div class='del'>-</div><div class='del'>-       -  0</div><div class='del'>-</div><div class='del'>-       -  Use for a TV.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-LOG-ADDR-TYPE-RECORD`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_LOG_ADDR_TYPE_RECORD``</div><div class='del'>-</div><div class='del'>-       -  1</div><div class='del'>-</div><div class='del'>-       -  Use for a recording device.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-LOG-ADDR-TYPE-TUNER`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_LOG_ADDR_TYPE_TUNER``</div><div class='del'>-</div><div class='del'>-       -  2</div><div class='add'>+      - ``CEC_LOG_ADDR_TYPE_TV``</div><div class='add'>+      - 0</div><div class='add'>+      - Use for a TV.</div><div class='add'>+    * .. _`CEC-LOG-ADDR-TYPE-RECORD`:</div><div class='ctx'> </div><div class='del'>-       -  Use for a tuner device.</div><div class='add'>+      - ``CEC_LOG_ADDR_TYPE_RECORD``</div><div class='add'>+      - 1</div><div class='add'>+      - Use for a recording device.</div><div class='add'>+    * .. _`CEC-LOG-ADDR-TYPE-TUNER`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-LOG-ADDR-TYPE-PLAYBACK`:</div><div class='add'>+      - ``CEC_LOG_ADDR_TYPE_TUNER``</div><div class='add'>+      - 2</div><div class='add'>+      - Use for a tuner device.</div><div class='add'>+    * .. _`CEC-LOG-ADDR-TYPE-PLAYBACK`:</div><div class='ctx'> </div><div class='del'>-       -  ``CEC_LOG_ADDR_TYPE_PLAYBACK``</div><div class='add'>+      - ``CEC_LOG_ADDR_TYPE_PLAYBACK``</div><div class='add'>+      - 3</div><div class='add'>+      - Use for a playback device.</div><div class='add'>+    * .. _`CEC-LOG-ADDR-TYPE-AUDIOSYSTEM`:</div><div class='ctx'> </div><div class='del'>-       -  3</div><div class='add'>+      - ``CEC_LOG_ADDR_TYPE_AUDIOSYSTEM``</div><div class='add'>+      - 4</div><div class='add'>+      - Use for an audio system device.</div><div class='add'>+    * .. _`CEC-LOG-ADDR-TYPE-SPECIFIC`:</div><div class='ctx'> </div><div class='del'>-       -  Use for a playback device.</div><div class='add'>+      - ``CEC_LOG_ADDR_TYPE_SPECIFIC``</div><div class='add'>+      - 5</div><div class='add'>+      - Use for a second TV or for a video processor device.</div><div class='add'>+    * .. _`CEC-LOG-ADDR-TYPE-UNREGISTERED`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-LOG-ADDR-TYPE-AUDIOSYSTEM`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_LOG_ADDR_TYPE_AUDIOSYSTEM``</div><div class='del'>-</div><div class='del'>-       -  4</div><div class='del'>-</div><div class='del'>-       -  Use for an audio system device.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-LOG-ADDR-TYPE-SPECIFIC`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_LOG_ADDR_TYPE_SPECIFIC``</div><div class='del'>-</div><div class='del'>-       -  5</div><div class='del'>-</div><div class='del'>-       -  Use for a second TV or for a video processor device.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-LOG-ADDR-TYPE-UNREGISTERED`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_LOG_ADDR_TYPE_UNREGISTERED``</div><div class='del'>-</div><div class='del'>-       -  6</div><div class='del'>-</div><div class='del'>-       -  Use this if you just want to remain unregistered. Used for pure</div><div class='del'>-	  CEC switches or CDC-only devices (CDC: Capability Discovery and</div><div class='del'>-	  Control).</div><div class='add'>+      - ``CEC_LOG_ADDR_TYPE_UNREGISTERED``</div><div class='add'>+      - 6</div><div class='add'>+      - Use this if you just want to remain unregistered. Used for pure</div><div class='add'>+	CEC switches or CDC-only devices (CDC: Capability Discovery and</div><div class='add'>+	Control).</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -406,54 +311,36 @@ logical address types are already defined will return with error ``EBUSY``.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 4</div><div class='ctx'> </div><div class='add'>+    * .. _`CEC-OP-ALL-DEVTYPE-TV`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-OP-ALL-DEVTYPE-TV`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_ALL_DEVTYPE_TV``</div><div class='del'>-</div><div class='del'>-       -  0x80</div><div class='del'>-</div><div class='del'>-       -  This supports the TV type.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-OP-ALL-DEVTYPE-RECORD`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_ALL_DEVTYPE_RECORD``</div><div class='del'>-</div><div class='del'>-       -  0x40</div><div class='del'>-</div><div class='del'>-       -  This supports the Recording type.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-OP-ALL-DEVTYPE-TUNER`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_ALL_DEVTYPE_TUNER``</div><div class='del'>-</div><div class='del'>-       -  0x20</div><div class='del'>-</div><div class='del'>-       -  This supports the Tuner type.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-OP-ALL-DEVTYPE-PLAYBACK`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_ALL_DEVTYPE_PLAYBACK``</div><div class='del'>-</div><div class='del'>-       -  0x10</div><div class='del'>-</div><div class='del'>-       -  This supports the Playback type.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-OP-ALL-DEVTYPE-AUDIOSYSTEM`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_OP_ALL_DEVTYPE_AUDIOSYSTEM``</div><div class='del'>-</div><div class='del'>-       -  0x08</div><div class='add'>+      - ``CEC_OP_ALL_DEVTYPE_TV``</div><div class='add'>+      - 0x80</div><div class='add'>+      - This supports the TV type.</div><div class='add'>+    * .. _`CEC-OP-ALL-DEVTYPE-RECORD`:</div><div class='ctx'> </div><div class='del'>-       -  This supports the Audio System type.</div><div class='add'>+      - ``CEC_OP_ALL_DEVTYPE_RECORD``</div><div class='add'>+      - 0x40</div><div class='add'>+      - This supports the Recording type.</div><div class='add'>+    * .. _`CEC-OP-ALL-DEVTYPE-TUNER`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-OP-ALL-DEVTYPE-SWITCH`:</div><div class='add'>+      - ``CEC_OP_ALL_DEVTYPE_TUNER``</div><div class='add'>+      - 0x20</div><div class='add'>+      - This supports the Tuner type.</div><div class='add'>+    * .. _`CEC-OP-ALL-DEVTYPE-PLAYBACK`:</div><div class='ctx'> </div><div class='del'>-       -  ``CEC_OP_ALL_DEVTYPE_SWITCH``</div><div class='add'>+      - ``CEC_OP_ALL_DEVTYPE_PLAYBACK``</div><div class='add'>+      - 0x10</div><div class='add'>+      - This supports the Playback type.</div><div class='add'>+    * .. _`CEC-OP-ALL-DEVTYPE-AUDIOSYSTEM`:</div><div class='ctx'> </div><div class='del'>-       -  0x04</div><div class='add'>+      - ``CEC_OP_ALL_DEVTYPE_AUDIOSYSTEM``</div><div class='add'>+      - 0x08</div><div class='add'>+      - This supports the Audio System type.</div><div class='add'>+    * .. _`CEC-OP-ALL-DEVTYPE-SWITCH`:</div><div class='ctx'> </div><div class='del'>-       -  This supports the CEC Switch or Video Processing type.</div><div class='add'>+      - ``CEC_OP_ALL_DEVTYPE_SWITCH``</div><div class='add'>+      - 0x04</div><div class='add'>+      - This supports the CEC Switch or Video Processing type.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst b/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst<br/>index 3357deb43c85..a3cdc75cec3e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst</a></div><div class='hunk'>@@ -35,11 +35,6 @@ Arguments</div><div class='ctx'> Description</div><div class='ctx'> ===========</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   This documents the proposed CEC API. This API is not yet finalized</div><div class='del'>-   and is currently only available as a staging kernel module.</div><div class='del'>-</div><div class='ctx'> To query the current physical address applications call</div><div class='ctx'> :ref:`ioctl CEC_ADAP_G_PHYS_ADDR &lt;CEC_ADAP_G_PHYS_ADDR&gt;` with a pointer to a __u16 where the</div><div class='ctx'> driver stores the physical address.</div><div class='head'>diff --git a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst<br/>index e283588a830b..6e589a1fae17 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-dqevent.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/cec/cec-ioc-dqevent.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-dqevent.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-dqevent.rst</a></div><div class='hunk'>@@ -30,11 +30,6 @@ Arguments</div><div class='ctx'> Description</div><div class='ctx'> ===========</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   This documents the proposed CEC API. This API is not yet finalized</div><div class='del'>-   and is currently only available as a staging kernel module.</div><div class='del'>-</div><div class='ctx'> CEC devices can send asynchronous events. These can be retrieved by</div><div class='ctx'> calling :c:func:`CEC_DQEVENT`. If the file descriptor is in</div><div class='ctx'> non-blocking mode and no event is pending, then it will return -1 and</div><div class='hunk'>@@ -58,26 +53,16 @@ it is guaranteed that the state did change in between the two events.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       1 1 8</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-    -  .. row 1</div><div class='del'>-</div><div class='del'>-       -  __u16</div><div class='del'>-</div><div class='del'>-       -  ``phys_addr``</div><div class='del'>-</div><div class='del'>-       -  The current physical address. This is ``CEC_PHYS_ADDR_INVALID`` if no</div><div class='add'>+    * - __u16</div><div class='add'>+      - ``phys_addr``</div><div class='add'>+      - The current physical address. This is ``CEC_PHYS_ADDR_INVALID`` if no</div><div class='ctx'>           valid physical address is set.</div><div class='del'>-</div><div class='del'>-    -  .. row 2</div><div class='del'>-</div><div class='del'>-       -  __u16</div><div class='del'>-</div><div class='del'>-       -  ``log_addr_mask``</div><div class='del'>-</div><div class='del'>-       -  The current set of claimed logical addresses. This is 0 if no logical</div><div class='del'>-          addresses are claimed or if ``phys_addr`` is ``CEC_PHYS_ADDR_INVALID``.</div><div class='del'>-	  If bit 15 is set (``1 &lt;&lt; CEC_LOG_ADDR_UNREGISTERED``) then this device</div><div class='del'>-	  has the unregistered logical address. In that case all other bits are 0.</div><div class='add'>+    * - __u16</div><div class='add'>+      - ``log_addr_mask``</div><div class='add'>+      - The current set of claimed logical addresses. This is 0 if no logical</div><div class='add'>+        addresses are claimed or if ``phys_addr`` is ``CEC_PHYS_ADDR_INVALID``.</div><div class='add'>+	If bit 15 is set (``1 &lt;&lt; CEC_LOG_ADDR_UNREGISTERED``) then this device</div><div class='add'>+	has the unregistered logical address. In that case all other bits are 0.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. c:type:: cec_event_lost_msgs</div><div class='hunk'>@@ -89,22 +74,17 @@ it is guaranteed that the state did change in between the two events.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       1 1 16</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-    -  .. row 1</div><div class='del'>-</div><div class='del'>-       -  __u32</div><div class='del'>-</div><div class='del'>-       -  ``lost_msgs``</div><div class='del'>-</div><div class='del'>-       -  Set to the number of lost messages since the filehandle was opened</div><div class='del'>-	  or since the last time this event was dequeued for this</div><div class='del'>-	  filehandle. The messages lost are the oldest messages. So when a</div><div class='del'>-	  new message arrives and there is no more room, then the oldest</div><div class='del'>-	  message is discarded to make room for the new one. The internal</div><div class='del'>-	  size of the message queue guarantees that all messages received in</div><div class='del'>-	  the last two seconds will be stored. Since messages should be</div><div class='del'>-	  replied to within a second according to the CEC specification,</div><div class='del'>-	  this is more than enough.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``lost_msgs``</div><div class='add'>+      - Set to the number of lost messages since the filehandle was opened</div><div class='add'>+	or since the last time this event was dequeued for this</div><div class='add'>+	filehandle. The messages lost are the oldest messages. So when a</div><div class='add'>+	new message arrives and there is no more room, then the oldest</div><div class='add'>+	message is discarded to make room for the new one. The internal</div><div class='add'>+	size of the message queue guarantees that all messages received in</div><div class='add'>+	the last two seconds will be stored. Since messages should be</div><div class='add'>+	replied to within a second according to the CEC specification,</div><div class='add'>+	this is more than enough.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{1.0cm}|p{4.2cm}|p{2.5cm}|p{8.8cm}|</div><div class='hunk'>@@ -116,62 +96,32 @@ it is guaranteed that the state did change in between the two events.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       1 1 1 8</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-    -  .. row 1</div><div class='del'>-</div><div class='del'>-       -  __u64</div><div class='del'>-</div><div class='del'>-       -  ``ts``</div><div class='del'>-</div><div class='del'>-       -  :cspan:`1` Timestamp of the event in ns.</div><div class='del'>-</div><div class='del'>-	  The timestamp has been taken from the ``CLOCK_MONOTONIC`` clock. To access</div><div class='del'>-	  the same clock from userspace use :c:func:`clock_gettime`.</div><div class='del'>-</div><div class='del'>-    -  .. row 2</div><div class='del'>-</div><div class='del'>-       -  __u32</div><div class='del'>-</div><div class='del'>-       -  ``event``</div><div class='del'>-</div><div class='del'>-       -  :cspan:`1` The CEC event type, see :ref:`cec-events`.</div><div class='del'>-</div><div class='del'>-    -  .. row 3</div><div class='del'>-</div><div class='del'>-       -  __u32</div><div class='del'>-</div><div class='del'>-       -  ``flags``</div><div class='del'>-</div><div class='del'>-       -  :cspan:`1` Event flags, see :ref:`cec-event-flags`.</div><div class='del'>-</div><div class='del'>-    -  .. row 4</div><div class='del'>-</div><div class='del'>-       -  union</div><div class='del'>-</div><div class='del'>-       -  (anonymous)</div><div class='del'>-</div><div class='del'>-       -</div><div class='del'>-       -</div><div class='del'>-</div><div class='del'>-    -  .. row 5</div><div class='del'>-</div><div class='del'>-       -</div><div class='del'>-       -  struct cec_event_state_change</div><div class='del'>-</div><div class='del'>-       -  ``state_change``</div><div class='del'>-</div><div class='del'>-       -  The new adapter state as sent by the :ref:`CEC_EVENT_STATE_CHANGE &lt;CEC-EVENT-STATE-CHANGE&gt;`</div><div class='del'>-	  event.</div><div class='del'>-</div><div class='del'>-    -  .. row 6</div><div class='del'>-</div><div class='del'>-       -</div><div class='del'>-       -  struct cec_event_lost_msgs</div><div class='del'>-</div><div class='del'>-       -  ``lost_msgs``</div><div class='del'>-</div><div class='del'>-       -  The number of lost messages as sent by the :ref:`CEC_EVENT_LOST_MSGS &lt;CEC-EVENT-LOST-MSGS&gt;`</div><div class='del'>-	  event.</div><div class='add'>+    * - __u64</div><div class='add'>+      - ``ts``</div><div class='add'>+      - :cspan:`1` Timestamp of the event in ns.</div><div class='add'>+</div><div class='add'>+	The timestamp has been taken from the ``CLOCK_MONOTONIC`` clock. To access</div><div class='add'>+	the same clock from userspace use :c:func:`clock_gettime`.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``event``</div><div class='add'>+      - :cspan:`1` The CEC event type, see :ref:`cec-events`.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``flags``</div><div class='add'>+      - :cspan:`1` Event flags, see :ref:`cec-event-flags`.</div><div class='add'>+    * - union</div><div class='add'>+      - (anonymous)</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+    * -</div><div class='add'>+      - struct cec_event_state_change</div><div class='add'>+      - ``state_change``</div><div class='add'>+      - The new adapter state as sent by the :ref:`CEC_EVENT_STATE_CHANGE &lt;CEC-EVENT-STATE-CHANGE&gt;`</div><div class='add'>+	event.</div><div class='add'>+    * -</div><div class='add'>+      - struct cec_event_lost_msgs</div><div class='add'>+      - ``lost_msgs``</div><div class='add'>+      - The number of lost messages as sent by the :ref:`CEC_EVENT_LOST_MSGS &lt;CEC-EVENT-LOST-MSGS&gt;`</div><div class='add'>+	event.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}|</div><div class='hunk'>@@ -183,25 +133,19 @@ it is guaranteed that the state did change in between the two events.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 16</div><div class='ctx'> </div><div class='add'>+    * .. _`CEC-EVENT-STATE-CHANGE`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-EVENT-STATE-CHANGE`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_EVENT_STATE_CHANGE``</div><div class='del'>-</div><div class='del'>-       -  1</div><div class='del'>-</div><div class='del'>-       -  Generated when the CEC Adapter's state changes. When open() is</div><div class='del'>-	  called an initial event will be generated for that filehandle with</div><div class='del'>-	  the CEC Adapter's state at that time.</div><div class='add'>+      - ``CEC_EVENT_STATE_CHANGE``</div><div class='add'>+      - 1</div><div class='add'>+      - Generated when the CEC Adapter's state changes. When open() is</div><div class='add'>+	called an initial event will be generated for that filehandle with</div><div class='add'>+	the CEC Adapter's state at that time.</div><div class='add'>+    * .. _`CEC-EVENT-LOST-MSGS`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-EVENT-LOST-MSGS`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_EVENT_LOST_MSGS``</div><div class='del'>-</div><div class='del'>-       -  2</div><div class='del'>-</div><div class='del'>-       -  Generated if one or more CEC messages were lost because the</div><div class='del'>-	  application didn't dequeue CEC messages fast enough.</div><div class='add'>+      - ``CEC_EVENT_LOST_MSGS``</div><div class='add'>+      - 2</div><div class='add'>+      - Generated if one or more CEC messages were lost because the</div><div class='add'>+	application didn't dequeue CEC messages fast enough.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{6.0cm}|p{0.6cm}|p{10.9cm}|</div><div class='hunk'>@@ -213,17 +157,14 @@ it is guaranteed that the state did change in between the two events.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 8</div><div class='ctx'> </div><div class='add'>+    * .. _`CEC-EVENT-FL-INITIAL-VALUE`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-EVENT-FL-INITIAL-VALUE`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_EVENT_FL_INITIAL_VALUE``</div><div class='del'>-</div><div class='del'>-       -  1</div><div class='del'>-</div><div class='del'>-       -  Set for the initial events that are generated when the device is</div><div class='del'>-	  opened. See the table above for which events do this. This allows</div><div class='del'>-	  applications to learn the initial state of the CEC adapter at</div><div class='del'>-	  open() time.</div><div class='add'>+      - ``CEC_EVENT_FL_INITIAL_VALUE``</div><div class='add'>+      - 1</div><div class='add'>+      - Set for the initial events that are generated when the device is</div><div class='add'>+	opened. See the table above for which events do this. This allows</div><div class='add'>+	applications to learn the initial state of the CEC adapter at</div><div class='add'>+	open() time.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/cec/cec-ioc-g-mode.rst b/Documentation/media/uapi/cec/cec-ioc-g-mode.rst<br/>index 70a41902ab58..e4ded9df0a84 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-g-mode.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/cec/cec-ioc-g-mode.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-g-mode.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-g-mode.rst</a></div><div class='hunk'>@@ -31,11 +31,6 @@ Arguments</div><div class='ctx'> Description</div><div class='ctx'> ===========</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   This documents the proposed CEC API. This API is not yet finalized</div><div class='del'>-   and is currently only available as a staging kernel module.</div><div class='del'>-</div><div class='ctx'> By default any filehandle can use :ref:`CEC_TRANSMIT`, but in order to prevent</div><div class='ctx'> applications from stepping on each others toes it must be possible to</div><div class='ctx'> obtain exclusive access to the CEC adapter. This ioctl sets the</div><div class='hunk'>@@ -83,37 +78,28 @@ Available initiator modes are:</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 16</div><div class='ctx'> </div><div class='add'>+    * .. _`CEC-MODE-NO-INITIATOR`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-MODE-NO-INITIATOR`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MODE_NO_INITIATOR``</div><div class='del'>-</div><div class='del'>-       -  0x0</div><div class='del'>-</div><div class='del'>-       -  This is not an initiator, i.e. it cannot transmit CEC messages or</div><div class='del'>-	  make any other changes to the CEC adapter.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MODE-INITIATOR`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MODE_INITIATOR``</div><div class='del'>-</div><div class='del'>-       -  0x1</div><div class='add'>+      - ``CEC_MODE_NO_INITIATOR``</div><div class='add'>+      - 0x0</div><div class='add'>+      - This is not an initiator, i.e. it cannot transmit CEC messages or</div><div class='add'>+	make any other changes to the CEC adapter.</div><div class='add'>+    * .. _`CEC-MODE-INITIATOR`:</div><div class='ctx'> </div><div class='del'>-       -  This is an initiator (the default when the device is opened) and</div><div class='del'>-	  it can transmit CEC messages and make changes to the CEC adapter,</div><div class='del'>-	  unless there is an exclusive initiator.</div><div class='add'>+      - ``CEC_MODE_INITIATOR``</div><div class='add'>+      - 0x1</div><div class='add'>+      - This is an initiator (the default when the device is opened) and</div><div class='add'>+	it can transmit CEC messages and make changes to the CEC adapter,</div><div class='add'>+	unless there is an exclusive initiator.</div><div class='add'>+    * .. _`CEC-MODE-EXCL-INITIATOR`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-MODE-EXCL-INITIATOR`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MODE_EXCL_INITIATOR``</div><div class='del'>-</div><div class='del'>-       -  0x2</div><div class='del'>-</div><div class='del'>-       -  This is an exclusive initiator and this file descriptor is the</div><div class='del'>-	  only one that can transmit CEC messages and make changes to the</div><div class='del'>-	  CEC adapter. If someone else is already the exclusive initiator</div><div class='del'>-	  then an attempt to become one will return the ``EBUSY`` error code</div><div class='del'>-	  error.</div><div class='add'>+      - ``CEC_MODE_EXCL_INITIATOR``</div><div class='add'>+      - 0x2</div><div class='add'>+      - This is an exclusive initiator and this file descriptor is the</div><div class='add'>+	only one that can transmit CEC messages and make changes to the</div><div class='add'>+	CEC adapter. If someone else is already the exclusive initiator</div><div class='add'>+	then an attempt to become one will return the ``EBUSY`` error code</div><div class='add'>+	error.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Available follower modes are:</div><div class='hunk'>@@ -127,86 +113,68 @@ Available follower modes are:</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 16</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MODE-NO-FOLLOWER`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MODE_NO_FOLLOWER``</div><div class='del'>-</div><div class='del'>-       -  0x00</div><div class='del'>-</div><div class='del'>-       -  This is not a follower (the default when the device is opened).</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MODE-FOLLOWER`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MODE_FOLLOWER``</div><div class='del'>-</div><div class='del'>-       -  0x10</div><div class='del'>-</div><div class='del'>-       -  This is a follower and it will receive CEC messages unless there</div><div class='del'>-	  is an exclusive follower. You cannot become a follower if</div><div class='del'>-	  :ref:`CEC_CAP_TRANSMIT &lt;CEC-CAP-TRANSMIT&gt;` is not set or if :ref:`CEC_MODE_NO_INITIATOR &lt;CEC-MODE-NO-INITIATOR&gt;`</div><div class='del'>-	  was specified, the ``EINVAL`` error code is returned in that case.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MODE-EXCL-FOLLOWER`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MODE_EXCL_FOLLOWER``</div><div class='del'>-</div><div class='del'>-       -  0x20</div><div class='del'>-</div><div class='del'>-       -  This is an exclusive follower and only this file descriptor will</div><div class='del'>-	  receive CEC messages for processing. If someone else is already</div><div class='del'>-	  the exclusive follower then an attempt to become one will return</div><div class='del'>-	  the ``EBUSY`` error code. You cannot become a follower if</div><div class='del'>-	  :ref:`CEC_CAP_TRANSMIT &lt;CEC-CAP-TRANSMIT&gt;` is not set or if :ref:`CEC_MODE_NO_INITIATOR &lt;CEC-MODE-NO-INITIATOR&gt;`</div><div class='del'>-	  was specified, the ``EINVAL`` error code is returned in that case.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MODE-EXCL-FOLLOWER-PASSTHRU`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MODE_EXCL_FOLLOWER_PASSTHRU``</div><div class='del'>-</div><div class='del'>-       -  0x30</div><div class='del'>-</div><div class='del'>-       -  This is an exclusive follower and only this file descriptor will</div><div class='del'>-	  receive CEC messages for processing. In addition it will put the</div><div class='del'>-	  CEC device into passthrough mode, allowing the exclusive follower</div><div class='del'>-	  to handle most core messages instead of relying on the CEC</div><div class='del'>-	  framework for that. If someone else is already the exclusive</div><div class='del'>-	  follower then an attempt to become one will return the ``EBUSY`` error</div><div class='del'>-	  code. You cannot become a follower if :ref:`CEC_CAP_TRANSMIT &lt;CEC-CAP-TRANSMIT&gt;`</div><div class='del'>-	  is not set or if :ref:`CEC_MODE_NO_INITIATOR &lt;CEC-MODE-NO-INITIATOR&gt;` was specified,</div><div class='del'>-	  the ``EINVAL`` error code is returned in that case.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MODE-MONITOR`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MODE_MONITOR``</div><div class='del'>-</div><div class='del'>-       -  0xe0</div><div class='del'>-</div><div class='del'>-       -  Put the file descriptor into monitor mode. Can only be used in</div><div class='del'>-	  combination with :ref:`CEC_MODE_NO_INITIATOR &lt;CEC-MODE-NO-INITIATOR&gt;`, otherwise EINVAL error</div><div class='del'>-	  code will be returned. In monitor mode all messages this CEC</div><div class='del'>-	  device transmits and all messages it receives (both broadcast</div><div class='del'>-	  messages and directed messages for one its logical addresses) will</div><div class='del'>-	  be reported. This is very useful for debugging. This is only</div><div class='del'>-	  allowed if the process has the ``CAP_NET_ADMIN`` capability. If</div><div class='del'>-	  that is not set, then the ``EPERM`` error code is returned.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MODE-MONITOR-ALL`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MODE_MONITOR_ALL``</div><div class='del'>-</div><div class='del'>-       -  0xf0</div><div class='del'>-</div><div class='del'>-       -  Put the file descriptor into 'monitor all' mode. Can only be used</div><div class='del'>-	  in combination with :ref:`CEC_MODE_NO_INITIATOR &lt;CEC-MODE-NO-INITIATOR&gt;`, otherwise</div><div class='del'>-	  the ``EINVAL`` error code will be returned. In 'monitor all' mode all messages</div><div class='del'>-	  this CEC device transmits and all messages it receives, including</div><div class='del'>-	  directed messages for other CEC devices will be reported. This is</div><div class='del'>-	  very useful for debugging, but not all devices support this. This</div><div class='del'>-	  mode requires that the :ref:`CEC_CAP_MONITOR_ALL &lt;CEC-CAP-MONITOR-ALL&gt;` capability is set,</div><div class='del'>-	  otherwise the ``EINVAL`` error code is returned. This is only allowed if</div><div class='del'>-	  the process has the ``CAP_NET_ADMIN`` capability. If that is not</div><div class='del'>-	  set, then the ``EPERM`` error code is returned.</div><div class='add'>+    * .. _`CEC-MODE-NO-FOLLOWER`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MODE_NO_FOLLOWER``</div><div class='add'>+      - 0x00</div><div class='add'>+      - This is not a follower (the default when the device is opened).</div><div class='add'>+    * .. _`CEC-MODE-FOLLOWER`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MODE_FOLLOWER``</div><div class='add'>+      - 0x10</div><div class='add'>+      - This is a follower and it will receive CEC messages unless there</div><div class='add'>+	is an exclusive follower. You cannot become a follower if</div><div class='add'>+	:ref:`CEC_CAP_TRANSMIT &lt;CEC-CAP-TRANSMIT&gt;` is not set or if :ref:`CEC_MODE_NO_INITIATOR &lt;CEC-MODE-NO-INITIATOR&gt;`</div><div class='add'>+	was specified, the ``EINVAL`` error code is returned in that case.</div><div class='add'>+    * .. _`CEC-MODE-EXCL-FOLLOWER`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MODE_EXCL_FOLLOWER``</div><div class='add'>+      - 0x20</div><div class='add'>+      - This is an exclusive follower and only this file descriptor will</div><div class='add'>+	receive CEC messages for processing. If someone else is already</div><div class='add'>+	the exclusive follower then an attempt to become one will return</div><div class='add'>+	the ``EBUSY`` error code. You cannot become a follower if</div><div class='add'>+	:ref:`CEC_CAP_TRANSMIT &lt;CEC-CAP-TRANSMIT&gt;` is not set or if :ref:`CEC_MODE_NO_INITIATOR &lt;CEC-MODE-NO-INITIATOR&gt;`</div><div class='add'>+	was specified, the ``EINVAL`` error code is returned in that case.</div><div class='add'>+    * .. _`CEC-MODE-EXCL-FOLLOWER-PASSTHRU`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MODE_EXCL_FOLLOWER_PASSTHRU``</div><div class='add'>+      - 0x30</div><div class='add'>+      - This is an exclusive follower and only this file descriptor will</div><div class='add'>+	receive CEC messages for processing. In addition it will put the</div><div class='add'>+	CEC device into passthrough mode, allowing the exclusive follower</div><div class='add'>+	to handle most core messages instead of relying on the CEC</div><div class='add'>+	framework for that. If someone else is already the exclusive</div><div class='add'>+	follower then an attempt to become one will return the ``EBUSY`` error</div><div class='add'>+	code. You cannot become a follower if :ref:`CEC_CAP_TRANSMIT &lt;CEC-CAP-TRANSMIT&gt;`</div><div class='add'>+	is not set or if :ref:`CEC_MODE_NO_INITIATOR &lt;CEC-MODE-NO-INITIATOR&gt;` was specified,</div><div class='add'>+	the ``EINVAL`` error code is returned in that case.</div><div class='add'>+    * .. _`CEC-MODE-MONITOR`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MODE_MONITOR``</div><div class='add'>+      - 0xe0</div><div class='add'>+      - Put the file descriptor into monitor mode. Can only be used in</div><div class='add'>+	combination with :ref:`CEC_MODE_NO_INITIATOR &lt;CEC-MODE-NO-INITIATOR&gt;`, otherwise EINVAL error</div><div class='add'>+	code will be returned. In monitor mode all messages this CEC</div><div class='add'>+	device transmits and all messages it receives (both broadcast</div><div class='add'>+	messages and directed messages for one its logical addresses) will</div><div class='add'>+	be reported. This is very useful for debugging. This is only</div><div class='add'>+	allowed if the process has the ``CAP_NET_ADMIN`` capability. If</div><div class='add'>+	that is not set, then the ``EPERM`` error code is returned.</div><div class='add'>+    * .. _`CEC-MODE-MONITOR-ALL`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MODE_MONITOR_ALL``</div><div class='add'>+      - 0xf0</div><div class='add'>+      - Put the file descriptor into 'monitor all' mode. Can only be used</div><div class='add'>+	in combination with :ref:`CEC_MODE_NO_INITIATOR &lt;CEC-MODE-NO-INITIATOR&gt;`, otherwise</div><div class='add'>+	the ``EINVAL`` error code will be returned. In 'monitor all' mode all messages</div><div class='add'>+	this CEC device transmits and all messages it receives, including</div><div class='add'>+	directed messages for other CEC devices will be reported. This is</div><div class='add'>+	very useful for debugging, but not all devices support this. This</div><div class='add'>+	mode requires that the :ref:`CEC_CAP_MONITOR_ALL &lt;CEC-CAP-MONITOR-ALL&gt;` capability is set,</div><div class='add'>+	otherwise the ``EINVAL`` error code is returned. This is only allowed if</div><div class='add'>+	the process has the ``CAP_NET_ADMIN`` capability. If that is not</div><div class='add'>+	set, then the ``EPERM`` error code is returned.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Core message processing details:</div><div class='hunk'>@@ -220,76 +188,58 @@ Core message processing details:</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths: 1 8</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MSG-GET-CEC-VERSION`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MSG_GET_CEC_VERSION``</div><div class='del'>-</div><div class='del'>-       -  When in passthrough mode this message has to be handled by</div><div class='del'>-	  userspace, otherwise the core will return the CEC version that was</div><div class='del'>-	  set with :ref:`ioctl CEC_ADAP_S_LOG_ADDRS &lt;CEC_ADAP_S_LOG_ADDRS&gt;`.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MSG-GIVE-DEVICE-VENDOR-ID`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MSG_GIVE_DEVICE_VENDOR_ID``</div><div class='del'>-</div><div class='del'>-       -  When in passthrough mode this message has to be handled by</div><div class='del'>-	  userspace, otherwise the core will return the vendor ID that was</div><div class='del'>-	  set with :ref:`ioctl CEC_ADAP_S_LOG_ADDRS &lt;CEC_ADAP_S_LOG_ADDRS&gt;`.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MSG-ABORT`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MSG_ABORT``</div><div class='del'>-</div><div class='del'>-       -  When in passthrough mode this message has to be handled by</div><div class='del'>-	  userspace, otherwise the core will return a feature refused</div><div class='del'>-	  message as per the specification.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MSG-GIVE-PHYSICAL-ADDR`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MSG_GIVE_PHYSICAL_ADDR``</div><div class='del'>-</div><div class='del'>-       -  When in passthrough mode this message has to be handled by</div><div class='del'>-	  userspace, otherwise the core will report the current physical</div><div class='del'>-	  address.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MSG-GIVE-OSD-NAME`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MSG_GIVE_OSD_NAME``</div><div class='del'>-</div><div class='del'>-       -  When in passthrough mode this message has to be handled by</div><div class='del'>-	  userspace, otherwise the core will report the current OSD name as</div><div class='del'>-	  was set with :ref:`ioctl CEC_ADAP_S_LOG_ADDRS &lt;CEC_ADAP_S_LOG_ADDRS&gt;`.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MSG-GIVE-FEATURES`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MSG_GIVE_FEATURES``</div><div class='del'>-</div><div class='del'>-       -  When in passthrough mode this message has to be handled by</div><div class='del'>-	  userspace, otherwise the core will report the current features as</div><div class='del'>-	  was set with :ref:`ioctl CEC_ADAP_S_LOG_ADDRS &lt;CEC_ADAP_S_LOG_ADDRS&gt;`</div><div class='del'>-	  or the message is ignored if the CEC version was older than 2.0.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MSG-USER-CONTROL-PRESSED`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MSG_USER_CONTROL_PRESSED``</div><div class='del'>-</div><div class='del'>-       -  If :ref:`CEC_CAP_RC &lt;CEC-CAP-RC&gt;` is set, then generate a remote control key</div><div class='del'>-	  press. This message is always passed on to userspace.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MSG-USER-CONTROL-RELEASED`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MSG_USER_CONTROL_RELEASED``</div><div class='del'>-</div><div class='del'>-       -  If :ref:`CEC_CAP_RC &lt;CEC-CAP-RC&gt;` is set, then generate a remote control key</div><div class='del'>-	  release. This message is always passed on to userspace.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-MSG-REPORT-PHYSICAL-ADDR`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_MSG_REPORT_PHYSICAL_ADDR``</div><div class='del'>-</div><div class='del'>-       -  The CEC framework will make note of the reported physical address</div><div class='del'>-	  and then just pass the message on to userspace.</div><div class='add'>+    * .. _`CEC-MSG-GET-CEC-VERSION`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MSG_GET_CEC_VERSION``</div><div class='add'>+      - When in passthrough mode this message has to be handled by</div><div class='add'>+	userspace, otherwise the core will return the CEC version that was</div><div class='add'>+	set with :ref:`ioctl CEC_ADAP_S_LOG_ADDRS &lt;CEC_ADAP_S_LOG_ADDRS&gt;`.</div><div class='add'>+    * .. _`CEC-MSG-GIVE-DEVICE-VENDOR-ID`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MSG_GIVE_DEVICE_VENDOR_ID``</div><div class='add'>+      - When in passthrough mode this message has to be handled by</div><div class='add'>+	userspace, otherwise the core will return the vendor ID that was</div><div class='add'>+	set with :ref:`ioctl CEC_ADAP_S_LOG_ADDRS &lt;CEC_ADAP_S_LOG_ADDRS&gt;`.</div><div class='add'>+    * .. _`CEC-MSG-ABORT`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MSG_ABORT``</div><div class='add'>+      - When in passthrough mode this message has to be handled by</div><div class='add'>+	userspace, otherwise the core will return a feature refused</div><div class='add'>+	message as per the specification.</div><div class='add'>+    * .. _`CEC-MSG-GIVE-PHYSICAL-ADDR`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MSG_GIVE_PHYSICAL_ADDR``</div><div class='add'>+      - When in passthrough mode this message has to be handled by</div><div class='add'>+	userspace, otherwise the core will report the current physical</div><div class='add'>+	address.</div><div class='add'>+    * .. _`CEC-MSG-GIVE-OSD-NAME`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MSG_GIVE_OSD_NAME``</div><div class='add'>+      - When in passthrough mode this message has to be handled by</div><div class='add'>+	userspace, otherwise the core will report the current OSD name as</div><div class='add'>+	was set with :ref:`ioctl CEC_ADAP_S_LOG_ADDRS &lt;CEC_ADAP_S_LOG_ADDRS&gt;`.</div><div class='add'>+    * .. _`CEC-MSG-GIVE-FEATURES`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MSG_GIVE_FEATURES``</div><div class='add'>+      - When in passthrough mode this message has to be handled by</div><div class='add'>+	userspace, otherwise the core will report the current features as</div><div class='add'>+	was set with :ref:`ioctl CEC_ADAP_S_LOG_ADDRS &lt;CEC_ADAP_S_LOG_ADDRS&gt;`</div><div class='add'>+	or the message is ignored if the CEC version was older than 2.0.</div><div class='add'>+    * .. _`CEC-MSG-USER-CONTROL-PRESSED`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MSG_USER_CONTROL_PRESSED``</div><div class='add'>+      - If :ref:`CEC_CAP_RC &lt;CEC-CAP-RC&gt;` is set, then generate a remote control key</div><div class='add'>+	press. This message is always passed on to userspace.</div><div class='add'>+    * .. _`CEC-MSG-USER-CONTROL-RELEASED`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MSG_USER_CONTROL_RELEASED``</div><div class='add'>+      - If :ref:`CEC_CAP_RC &lt;CEC-CAP-RC&gt;` is set, then generate a remote control key</div><div class='add'>+	release. This message is always passed on to userspace.</div><div class='add'>+    * .. _`CEC-MSG-REPORT-PHYSICAL-ADDR`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_MSG_REPORT_PHYSICAL_ADDR``</div><div class='add'>+      - The CEC framework will make note of the reported physical address</div><div class='add'>+	and then just pass the message on to userspace.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/cec/cec-ioc-receive.rst b/Documentation/media/uapi/cec/cec-ioc-receive.rst<br/>index d585b1bba6ac..dc2adb391c0a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-receive.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/cec/cec-ioc-receive.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/cec/cec-ioc-receive.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/cec/cec-ioc-receive.rst</a></div><div class='hunk'>@@ -34,11 +34,6 @@ Arguments</div><div class='ctx'> Description</div><div class='ctx'> ===========</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='del'>-</div><div class='del'>-   This documents the proposed CEC API. This API is not yet finalized</div><div class='del'>-   and is currently only available as a staging kernel module.</div><div class='del'>-</div><div class='ctx'> To receive a CEC message the application has to fill in the</div><div class='ctx'> ``timeout`` field of struct :c:type:`cec_msg` and pass it to</div><div class='ctx'> :ref:`ioctl CEC_RECEIVE &lt;CEC_RECEIVE&gt;`.</div><div class='hunk'>@@ -86,173 +81,126 @@ result.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       1 1 16</div><div class='ctx'> </div><div class='add'>+    * - __u64</div><div class='add'>+      - ``tx_ts``</div><div class='add'>+      - Timestamp in ns of when the last byte of the message was transmitted.</div><div class='add'>+	The timestamp has been taken from the ``CLOCK_MONOTONIC`` clock. To access</div><div class='add'>+	the same clock from userspace use :c:func:`clock_gettime`.</div><div class='add'>+    * - __u64</div><div class='add'>+      - ``rx_ts``</div><div class='add'>+      - Timestamp in ns of when the last byte of the message was received.</div><div class='add'>+	The timestamp has been taken from the ``CLOCK_MONOTONIC`` clock. To access</div><div class='add'>+	the same clock from userspace use :c:func:`clock_gettime`.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``len``</div><div class='add'>+      - The length of the message. For :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;` this is filled in</div><div class='add'>+	by the application. The driver will fill this in for</div><div class='add'>+	:ref:`ioctl CEC_RECEIVE &lt;CEC_RECEIVE&gt;`. For :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;` it will be</div><div class='add'>+	filled in by the driver with the length of the reply message if ``reply`` was set.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``timeout``</div><div class='add'>+      - The timeout in milliseconds. This is the time the device will wait</div><div class='add'>+	for a message to be received before timing out. If it is set to 0,</div><div class='add'>+	then it will wait indefinitely when it is called by :ref:`ioctl CEC_RECEIVE &lt;CEC_RECEIVE&gt;`.</div><div class='add'>+	If it is 0 and it is called by :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;`,</div><div class='add'>+	then it will be replaced by 1000 if the ``reply`` is non-zero or</div><div class='add'>+	ignored if ``reply`` is 0.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``sequence``</div><div class='add'>+      - A non-zero sequence number is automatically assigned by the CEC framework</div><div class='add'>+	for all transmitted messages. It is used by the CEC framework when it queues</div><div class='add'>+	the transmit result (when transmit was called in non-blocking mode). This</div><div class='add'>+	allows the application to associate the received message with the original</div><div class='add'>+	transmit.</div><div class='add'>+    * - __u32</div><div class='add'>+      - ``flags``</div><div class='add'>+      - Flags. See :ref:`cec-msg-flags` for a list of available flags.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``tx_status``</div><div class='add'>+      - The status bits of the transmitted message. See</div><div class='add'>+	:ref:`cec-tx-status` for the possible status values. It is 0 if</div><div class='add'>+	this messages was received, not transmitted.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``msg[16]``</div><div class='add'>+      - The message payload. For :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;` this is filled in by the</div><div class='add'>+	application. The driver will fill this in for :ref:`ioctl CEC_RECEIVE &lt;CEC_RECEIVE&gt;`.</div><div class='add'>+	For :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;` it will be filled in by the driver with</div><div class='add'>+	the payload of the reply message if ``timeout`` was set.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``reply``</div><div class='add'>+      - Wait until this message is replied. If ``reply`` is 0 and the</div><div class='add'>+	``timeout`` is 0, then don't wait for a reply but return after</div><div class='add'>+	transmitting the message. Ignored by :ref:`ioctl CEC_RECEIVE &lt;CEC_RECEIVE&gt;`.</div><div class='add'>+	The case where ``reply`` is 0 (this is the opcode for the Feature Abort</div><div class='add'>+	message) and ``timeout`` is non-zero is specifically allowed to make it</div><div class='add'>+	possible to send a message and wait up to ``timeout`` milliseconds for a</div><div class='add'>+	Feature Abort reply. In this case ``rx_status`` will either be set</div><div class='add'>+	to :ref:`CEC_RX_STATUS_TIMEOUT &lt;CEC-RX-STATUS-TIMEOUT&gt;` or</div><div class='add'>+	:ref:`CEC_RX_STATUS_FEATURE_ABORT &lt;CEC-RX-STATUS-FEATURE-ABORT&gt;`.</div><div class='add'>+</div><div class='add'>+	If the transmitter message is ``CEC_MSG_INITIATE_ARC`` then the ``reply``</div><div class='add'>+	values ``CEC_MSG_REPORT_ARC_INITIATED`` and ``CEC_MSG_REPORT_ARC_TERMINATED``</div><div class='add'>+	are processed differently: either value will match both possible replies.</div><div class='add'>+	The reason is that the ``CEC_MSG_INITIATE_ARC`` message is the only CEC</div><div class='add'>+	message that has two possible replies other than Feature Abort. The</div><div class='add'>+	``reply`` field will be updated with the actual reply so that it is</div><div class='add'>+	synchronized with the contents of the received message.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``rx_status``</div><div class='add'>+      - The status bits of the received message. See</div><div class='add'>+	:ref:`cec-rx-status` for the possible status values. It is 0 if</div><div class='add'>+	this message was transmitted, not received, unless this is the</div><div class='add'>+	reply to a transmitted message. In that case both ``rx_status``</div><div class='add'>+	and ``tx_status`` are set.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``tx_status``</div><div class='add'>+      - The status bits of the transmitted message. See</div><div class='add'>+	:ref:`cec-tx-status` for the possible status values. It is 0 if</div><div class='add'>+	this messages was received, not transmitted.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``tx_arb_lost_cnt``</div><div class='add'>+      - A counter of the number of transmit attempts that resulted in the</div><div class='add'>+	Arbitration Lost error. This is only set if the hardware supports</div><div class='add'>+	this, otherwise it is always 0. This counter is only valid if the</div><div class='add'>+	:ref:`CEC_TX_STATUS_ARB_LOST &lt;CEC-TX-STATUS-ARB-LOST&gt;` status bit is set.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``tx_nack_cnt``</div><div class='add'>+      - A counter of the number of transmit attempts that resulted in the</div><div class='add'>+	Not Acknowledged error. This is only set if the hardware supports</div><div class='add'>+	this, otherwise it is always 0. This counter is only valid if the</div><div class='add'>+	:ref:`CEC_TX_STATUS_NACK &lt;CEC-TX-STATUS-NACK&gt;` status bit is set.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``tx_low_drive_cnt``</div><div class='add'>+      - A counter of the number of transmit attempts that resulted in the</div><div class='add'>+	Arbitration Lost error. This is only set if the hardware supports</div><div class='add'>+	this, otherwise it is always 0. This counter is only valid if the</div><div class='add'>+	:ref:`CEC_TX_STATUS_LOW_DRIVE &lt;CEC-TX-STATUS-LOW-DRIVE&gt;` status bit is set.</div><div class='add'>+    * - __u8</div><div class='add'>+      - ``tx_error_cnt``</div><div class='add'>+      - A counter of the number of transmit errors other than Arbitration</div><div class='add'>+	Lost or Not Acknowledged. This is only set if the hardware</div><div class='add'>+	supports this, otherwise it is always 0. This counter is only</div><div class='add'>+	valid if the :ref:`CEC_TX_STATUS_ERROR &lt;CEC-TX-STATUS-ERROR&gt;` status bit is set.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. _cec-msg-flags:</div><div class='add'>+</div><div class='add'>+.. flat-table:: Flags for struct cec_msg</div><div class='add'>+    :header-rows:  0</div><div class='add'>+    :stub-columns: 0</div><div class='add'>+    :widths:       3 1 4</div><div class='ctx'> </div><div class='del'>-    -  .. row 1</div><div class='del'>-</div><div class='del'>-       -  __u64</div><div class='del'>-</div><div class='del'>-       -  ``tx_ts``</div><div class='del'>-</div><div class='del'>-       -  Timestamp in ns of when the last byte of the message was transmitted.</div><div class='del'>-	  The timestamp has been taken from the ``CLOCK_MONOTONIC`` clock. To access</div><div class='del'>-	  the same clock from userspace use :c:func:`clock_gettime`.</div><div class='del'>-</div><div class='del'>-    -  .. row 2</div><div class='del'>-</div><div class='del'>-       -  __u64</div><div class='del'>-</div><div class='del'>-       -  ``rx_ts``</div><div class='del'>-</div><div class='del'>-       -  Timestamp in ns of when the last byte of the message was received.</div><div class='del'>-	  The timestamp has been taken from the ``CLOCK_MONOTONIC`` clock. To access</div><div class='del'>-	  the same clock from userspace use :c:func:`clock_gettime`.</div><div class='del'>-</div><div class='del'>-    -  .. row 3</div><div class='del'>-</div><div class='del'>-       -  __u32</div><div class='del'>-</div><div class='del'>-       -  ``len``</div><div class='del'>-</div><div class='del'>-       -  The length of the message. For :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;` this is filled in</div><div class='del'>-	  by the application. The driver will fill this in for</div><div class='del'>-	  :ref:`ioctl CEC_RECEIVE &lt;CEC_RECEIVE&gt;`. For :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;` it will be</div><div class='del'>-	  filled in by the driver with the length of the reply message if ``reply`` was set.</div><div class='del'>-</div><div class='del'>-    -  .. row 4</div><div class='del'>-</div><div class='del'>-       -  __u32</div><div class='del'>-</div><div class='del'>-       -  ``timeout``</div><div class='del'>-</div><div class='del'>-       -  The timeout in milliseconds. This is the time the device will wait</div><div class='del'>-	  for a message to be received before timing out. If it is set to 0,</div><div class='del'>-	  then it will wait indefinitely when it is called by :ref:`ioctl CEC_RECEIVE &lt;CEC_RECEIVE&gt;`.</div><div class='del'>-	  If it is 0 and it is called by :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;`,</div><div class='del'>-	  then it will be replaced by 1000 if the ``reply`` is non-zero or</div><div class='del'>-	  ignored if ``reply`` is 0.</div><div class='del'>-</div><div class='del'>-    -  .. row 5</div><div class='del'>-</div><div class='del'>-       -  __u32</div><div class='del'>-</div><div class='del'>-       -  ``sequence``</div><div class='del'>-</div><div class='del'>-       -  A non-zero sequence number is automatically assigned by the CEC framework</div><div class='del'>-	  for all transmitted messages. It is used by the CEC framework when it queues</div><div class='del'>-	  the transmit result (when transmit was called in non-blocking mode). This</div><div class='del'>-	  allows the application to associate the received message with the original</div><div class='del'>-	  transmit.</div><div class='del'>-</div><div class='del'>-    -  .. row 6</div><div class='del'>-</div><div class='del'>-       -  __u32</div><div class='del'>-</div><div class='del'>-       -  ``flags``</div><div class='del'>-</div><div class='del'>-       -  Flags. No flags are defined yet, so set this to 0.</div><div class='del'>-</div><div class='del'>-    -  .. row 7</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``tx_status``</div><div class='del'>-</div><div class='del'>-       -  The status bits of the transmitted message. See</div><div class='del'>-	  :ref:`cec-tx-status` for the possible status values. It is 0 if</div><div class='del'>-	  this messages was received, not transmitted.</div><div class='del'>-</div><div class='del'>-    -  .. row 8</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``msg[16]``</div><div class='del'>-</div><div class='del'>-       -  The message payload. For :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;` this is filled in by the</div><div class='del'>-	  application. The driver will fill this in for :ref:`ioctl CEC_RECEIVE &lt;CEC_RECEIVE&gt;`.</div><div class='del'>-	  For :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;` it will be filled in by the driver with</div><div class='del'>-	  the payload of the reply message if ``timeout`` was set.</div><div class='del'>-</div><div class='del'>-    -  .. row 8</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``reply``</div><div class='del'>-</div><div class='del'>-       -  Wait until this message is replied. If ``reply`` is 0 and the</div><div class='del'>-	  ``timeout`` is 0, then don't wait for a reply but return after</div><div class='del'>-	  transmitting the message. Ignored by :ref:`ioctl CEC_RECEIVE &lt;CEC_RECEIVE&gt;`.</div><div class='del'>-	  The case where ``reply`` is 0 (this is the opcode for the Feature Abort</div><div class='del'>-	  message) and ``timeout`` is non-zero is specifically allowed to make it</div><div class='del'>-	  possible to send a message and wait up to ``timeout`` milliseconds for a</div><div class='del'>-	  Feature Abort reply. In this case ``rx_status`` will either be set</div><div class='del'>-	  to :ref:`CEC_RX_STATUS_TIMEOUT &lt;CEC-RX-STATUS-TIMEOUT&gt;` or</div><div class='del'>-	  :ref:`CEC_RX_STATUS_FEATURE_ABORT &lt;CEC-RX-STATUS-FEATURE-ABORT&gt;`.</div><div class='del'>-</div><div class='del'>-    -  .. row 9</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``rx_status``</div><div class='del'>-</div><div class='del'>-       -  The status bits of the received message. See</div><div class='del'>-	  :ref:`cec-rx-status` for the possible status values. It is 0 if</div><div class='del'>-	  this message was transmitted, not received, unless this is the</div><div class='del'>-	  reply to a transmitted message. In that case both ``rx_status``</div><div class='del'>-	  and ``tx_status`` are set.</div><div class='del'>-</div><div class='del'>-    -  .. row 10</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``tx_status``</div><div class='del'>-</div><div class='del'>-       -  The status bits of the transmitted message. See</div><div class='del'>-	  :ref:`cec-tx-status` for the possible status values. It is 0 if</div><div class='del'>-	  this messages was received, not transmitted.</div><div class='del'>-</div><div class='del'>-    -  .. row 11</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``tx_arb_lost_cnt``</div><div class='del'>-</div><div class='del'>-       -  A counter of the number of transmit attempts that resulted in the</div><div class='del'>-	  Arbitration Lost error. This is only set if the hardware supports</div><div class='del'>-	  this, otherwise it is always 0. This counter is only valid if the</div><div class='del'>-	  :ref:`CEC_TX_STATUS_ARB_LOST &lt;CEC-TX-STATUS-ARB-LOST&gt;` status bit is set.</div><div class='del'>-</div><div class='del'>-    -  .. row 12</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``tx_nack_cnt``</div><div class='del'>-</div><div class='del'>-       -  A counter of the number of transmit attempts that resulted in the</div><div class='del'>-	  Not Acknowledged error. This is only set if the hardware supports</div><div class='del'>-	  this, otherwise it is always 0. This counter is only valid if the</div><div class='del'>-	  :ref:`CEC_TX_STATUS_NACK &lt;CEC-TX-STATUS-NACK&gt;` status bit is set.</div><div class='del'>-</div><div class='del'>-    -  .. row 13</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``tx_low_drive_cnt``</div><div class='del'>-</div><div class='del'>-       -  A counter of the number of transmit attempts that resulted in the</div><div class='del'>-	  Arbitration Lost error. This is only set if the hardware supports</div><div class='del'>-	  this, otherwise it is always 0. This counter is only valid if the</div><div class='del'>-	  :ref:`CEC_TX_STATUS_LOW_DRIVE &lt;CEC-TX-STATUS-LOW-DRIVE&gt;` status bit is set.</div><div class='del'>-</div><div class='del'>-    -  .. row 14</div><div class='del'>-</div><div class='del'>-       -  __u8</div><div class='del'>-</div><div class='del'>-       -  ``tx_error_cnt``</div><div class='add'>+    * .. _`CEC-MSG-FL-REPLY-TO-FOLLOWERS`:</div><div class='ctx'> </div><div class='del'>-       -  A counter of the number of transmit errors other than Arbitration</div><div class='del'>-	  Lost or Not Acknowledged. This is only set if the hardware</div><div class='del'>-	  supports this, otherwise it is always 0. This counter is only</div><div class='del'>-	  valid if the :ref:`CEC_TX_STATUS_ERROR &lt;CEC-TX-STATUS-ERROR&gt;` status bit is set.</div><div class='add'>+      - ``CEC_MSG_FL_REPLY_TO_FOLLOWERS``</div><div class='add'>+      - 1</div><div class='add'>+      - If a CEC transmit expects a reply, then by default that reply is only sent to</div><div class='add'>+	the filehandle that called :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;`. If this</div><div class='add'>+	flag is set, then the reply is also sent to all followers, if any. If the</div><div class='add'>+	filehandle that called :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;` is also a</div><div class='add'>+	follower, then that filehandle will receive the reply twice: once as the</div><div class='add'>+	result of the :ref:`ioctl CEC_TRANSMIT &lt;CEC_TRANSMIT&gt;`, and once via</div><div class='add'>+	:ref:`ioctl CEC_RECEIVE &lt;CEC_RECEIVE&gt;`.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}|</div><div class='hunk'>@@ -264,64 +212,46 @@ result.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 16</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-TX-STATUS-OK`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_TX_STATUS_OK``</div><div class='del'>-</div><div class='del'>-       -  0x01</div><div class='del'>-</div><div class='del'>-       -  The message was transmitted successfully. This is mutually</div><div class='del'>-	  exclusive with :ref:`CEC_TX_STATUS_MAX_RETRIES &lt;CEC-TX-STATUS-MAX-RETRIES&gt;`. Other bits can still</div><div class='del'>-	  be set if earlier attempts met with failure before the transmit</div><div class='del'>-	  was eventually successful.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-TX-STATUS-ARB-LOST`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_TX_STATUS_ARB_LOST``</div><div class='del'>-</div><div class='del'>-       -  0x02</div><div class='del'>-</div><div class='del'>-       -  CEC line arbitration was lost.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-TX-STATUS-NACK`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_TX_STATUS_NACK``</div><div class='del'>-</div><div class='del'>-       -  0x04</div><div class='del'>-</div><div class='del'>-       -  Message was not acknowledged.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-TX-STATUS-LOW-DRIVE`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_TX_STATUS_LOW_DRIVE``</div><div class='del'>-</div><div class='del'>-       -  0x08</div><div class='del'>-</div><div class='del'>-       -  Low drive was detected on the CEC bus. This indicates that a</div><div class='del'>-	  follower detected an error on the bus and requests a</div><div class='del'>-	  retransmission.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-TX-STATUS-ERROR`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_TX_STATUS_ERROR``</div><div class='del'>-</div><div class='del'>-       -  0x10</div><div class='del'>-</div><div class='del'>-       -  Some error occurred. This is used for any errors that do not fit</div><div class='del'>-	  the previous two, either because the hardware could not tell which</div><div class='del'>-	  error occurred, or because the hardware tested for other</div><div class='del'>-	  conditions besides those two.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-TX-STATUS-MAX-RETRIES`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_TX_STATUS_MAX_RETRIES``</div><div class='del'>-</div><div class='del'>-       -  0x20</div><div class='del'>-</div><div class='del'>-       -  The transmit failed after one or more retries. This status bit is</div><div class='del'>-	  mutually exclusive with :ref:`CEC_TX_STATUS_OK &lt;CEC-TX-STATUS-OK&gt;`. Other bits can still</div><div class='del'>-	  be set to explain which failures were seen.</div><div class='add'>+    * .. _`CEC-TX-STATUS-OK`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_TX_STATUS_OK``</div><div class='add'>+      - 0x01</div><div class='add'>+      - The message was transmitted successfully. This is mutually</div><div class='add'>+	exclusive with :ref:`CEC_TX_STATUS_MAX_RETRIES &lt;CEC-TX-STATUS-MAX-RETRIES&gt;`. Other bits can still</div><div class='add'>+	be set if earlier attempts met with failure before the transmit</div><div class='add'>+	was eventually successful.</div><div class='add'>+    * .. _`CEC-TX-STATUS-ARB-LOST`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_TX_STATUS_ARB_LOST``</div><div class='add'>+      - 0x02</div><div class='add'>+      - CEC line arbitration was lost.</div><div class='add'>+    * .. _`CEC-TX-STATUS-NACK`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_TX_STATUS_NACK``</div><div class='add'>+      - 0x04</div><div class='add'>+      - Message was not acknowledged.</div><div class='add'>+    * .. _`CEC-TX-STATUS-LOW-DRIVE`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_TX_STATUS_LOW_DRIVE``</div><div class='add'>+      - 0x08</div><div class='add'>+      - Low drive was detected on the CEC bus. This indicates that a</div><div class='add'>+	follower detected an error on the bus and requests a</div><div class='add'>+	retransmission.</div><div class='add'>+    * .. _`CEC-TX-STATUS-ERROR`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_TX_STATUS_ERROR``</div><div class='add'>+      - 0x10</div><div class='add'>+      - Some error occurred. This is used for any errors that do not fit</div><div class='add'>+	the previous two, either because the hardware could not tell which</div><div class='add'>+	error occurred, or because the hardware tested for other</div><div class='add'>+	conditions besides those two.</div><div class='add'>+    * .. _`CEC-TX-STATUS-MAX-RETRIES`:</div><div class='add'>+</div><div class='add'>+      - ``CEC_TX_STATUS_MAX_RETRIES``</div><div class='add'>+      - 0x20</div><div class='add'>+      - The transmit failed after one or more retries. This status bit is</div><div class='add'>+	mutually exclusive with :ref:`CEC_TX_STATUS_OK &lt;CEC-TX-STATUS-OK&gt;`. Other bits can still</div><div class='add'>+	be set to explain which failures were seen.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}|</div><div class='hunk'>@@ -333,32 +263,23 @@ result.</div><div class='ctx'>     :stub-columns: 0</div><div class='ctx'>     :widths:       3 1 16</div><div class='ctx'> </div><div class='add'>+    * .. _`CEC-RX-STATUS-OK`:</div><div class='ctx'> </div><div class='del'>-    -  .. _`CEC-RX-STATUS-OK`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_RX_STATUS_OK``</div><div class='del'>-</div><div class='del'>-       -  0x01</div><div class='del'>-</div><div class='del'>-       -  The message was received successfully.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-RX-STATUS-TIMEOUT`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_RX_STATUS_TIMEOUT``</div><div class='del'>-</div><div class='del'>-       -  0x02</div><div class='del'>-</div><div class='del'>-       -  The reply to an earlier transmitted message timed out.</div><div class='del'>-</div><div class='del'>-    -  .. _`CEC-RX-STATUS-FEATURE-ABORT`:</div><div class='del'>-</div><div class='del'>-       -  ``CEC_RX_STATUS_FEATURE_ABORT``</div><div class='add'>+      - ``CEC_RX_STATUS_OK``</div><div class='add'>+      - 0x01</div><div class='add'>+      - The message was received successfully.</div><div class='add'>+    * .. _`CEC-RX-STATUS-TIMEOUT`:</div><div class='ctx'> </div><div class='del'>-       -  0x04</div><div class='add'>+      - ``CEC_RX_STATUS_TIMEOUT``</div><div class='add'>+      - 0x02</div><div class='add'>+      - The reply to an earlier transmitted message timed out.</div><div class='add'>+    * .. _`CEC-RX-STATUS-FEATURE-ABORT`:</div><div class='ctx'> </div><div class='del'>-       -  The message was received successfully but the reply was</div><div class='del'>-	  ``CEC_MSG_FEATURE_ABORT``. This status is only set if this message</div><div class='del'>-	  was the reply to an earlier transmitted message.</div><div class='add'>+      - ``CEC_RX_STATUS_FEATURE_ABORT``</div><div class='add'>+      - 0x04</div><div class='add'>+      - The message was received successfully but the reply was</div><div class='add'>+	``CEC_MSG_FEATURE_ABORT``. This status is only set if this message</div><div class='add'>+	was the reply to an earlier transmitted message.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst b/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst<br/>index bf31411fc9df..899fd5c3545e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/dvb/dvb-frontend-parameters.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/dvb/dvb-frontend-parameters.rst</a></div><div class='hunk'>@@ -9,7 +9,7 @@ frontend parameters</div><div class='ctx'> The kind of parameters passed to the frontend device for tuning depend</div><div class='ctx'> on the kind of hardware you are using.</div><div class='ctx'> </div><div class='del'>-The struct ``dvb_frontend_parameters`` uses an union with specific</div><div class='add'>+The struct ``dvb_frontend_parameters`` uses a union with specific</div><div class='ctx'> per-system parameters. However, as newer delivery systems required more</div><div class='ctx'> data, the structure size weren't enough to fit, and just extending its</div><div class='ctx'> size would break the existing applications. So, those parameters were</div><div class='hunk'>@@ -23,7 +23,7 @@ So, newer applications should use</div><div class='ctx'> instead, in order to be able to support the newer System Delivery like</div><div class='ctx'> DVB-S2, DVB-T2, DVB-C2, ISDB, etc.</div><div class='ctx'> </div><div class='del'>-All kinds of parameters are combined as an union in the</div><div class='add'>+All kinds of parameters are combined as a union in the</div><div class='ctx'> FrontendParameters structure:</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/dvb/dvbstb.svg b/Documentation/media/uapi/dvb/dvbstb.svg<br/>new file mode 100644<br/>index 000000000000..c4140fb518af<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/dvb/dvbstb.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/dvb/dvbstb.svg</a></div><div class='hunk'>@@ -0,0 +1,651 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   version="1.2"</div><div class='add'>+   width="237.70221mm"</div><div class='add'>+   height="126.28221mm"</div><div class='add'>+   viewBox="0 0 23770.221 12628.221"</div><div class='add'>+   preserveAspectRatio="xMidYMid"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   id="svg2"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   sodipodi:docname="dvbstb.svg"</div><div class='add'>+   style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"&gt;&lt;metadata</div><div class='add'>+     id="metadata519"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title /&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview517"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:zoom="1.0818519"</div><div class='add'>+     inkscape:cx="411.31718"</div><div class='add'>+     inkscape:cy="274.87517"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="svg2"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0" /&gt;&lt;defs</div><div class='add'>+     class="ClipPathGroup"</div><div class='add'>+     id="defs4" /&gt;&lt;defs</div><div class='add'>+     id="defs9" /&gt;&lt;defs</div><div class='add'>+     id="defs90" /&gt;&lt;defs</div><div class='add'>+     id="defs113" /&gt;&lt;defs</div><div class='add'>+     class="TextShapeIndex"</div><div class='add'>+     id="defs124" /&gt;&lt;defs</div><div class='add'>+     class="EmbeddedBulletChars"</div><div class='add'>+     id="defs128" /&gt;&lt;defs</div><div class='add'>+     class="TextEmbeddedBitmaps"</div><div class='add'>+     id="defs157" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="5355.1108"</div><div class='add'>+     y="13.111"</div><div class='add'>+     width="18403"</div><div class='add'>+     height="9603"</div><div class='add'>+     id="rect197"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 14556.111,9614.111 -9200,0 0,-9600 18400,0 0,9600 -9200,0 z"</div><div class='add'>+     id="path199"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 14556.111,9614.111 -9200,0 0,-9600 18400,0 0,9600 -9200,0 z"</div><div class='add'>+     id="path201"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="13.111"</div><div class='add'>+     y="4013.1111"</div><div class='add'>+     width="4544"</div><div class='add'>+     height="2403"</div><div class='add'>+     id="rect206"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 2285.111,6414.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path208"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 2285.111,6414.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path210"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;text</div><div class='add'>+     class="TextShape"</div><div class='add'>+     id="text212"</div><div class='add'>+     y="-4585.8892"</div><div class='add'>+     x="-2443.8889"&gt;&lt;tspan</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-size="635px"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       id="tspan214"</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="1281.111"</div><div class='add'>+         y="5435.1108"</div><div class='add'>+         id="tspan216"&gt;&lt;tspan</div><div class='add'>+           id="tspan218"</div><div class='add'>+           style="fill:#000000;stroke:none"&gt;Antena&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="6213.1108"</div><div class='add'>+     y="1813.111"</div><div class='add'>+     width="4544"</div><div class='add'>+     height="2403"</div><div class='add'>+     id="rect223"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 8485.111,4214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path225"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 8485.111,4214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path227"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;text</div><div class='add'>+     class="TextShape"</div><div class='add'>+     id="text229"</div><div class='add'>+     x="-2443.8889"</div><div class='add'>+     y="-4585.8892"&gt;&lt;tspan</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-size="635px"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       id="tspan231"</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="7217.1108"</div><div class='add'>+         y="3235.1111"</div><div class='add'>+         id="tspan233"&gt;&lt;tspan</div><div class='add'>+           id="tspan235"</div><div class='add'>+           style="fill:#000000;stroke:none"&gt;Frontend&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="12113.111"</div><div class='add'>+     y="1813.111"</div><div class='add'>+     width="4544"</div><div class='add'>+     height="2403"</div><div class='add'>+     id="rect240"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 14385.111,4214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path242"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 14385.111,4214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path244"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;text</div><div class='add'>+     class="TextShape"</div><div class='add'>+     id="text246"</div><div class='add'>+     x="-2443.8889"</div><div class='add'>+     y="-4585.8892"&gt;&lt;tspan</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-size="635px"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       id="tspan248"</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="13944.111"</div><div class='add'>+         y="3235.1111"</div><div class='add'>+         id="tspan250"&gt;&lt;tspan</div><div class='add'>+           id="tspan252"</div><div class='add'>+           style="fill:#000000;stroke:none"&gt;CA&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="18113.111"</div><div class='add'>+     y="1813.111"</div><div class='add'>+     width="4544"</div><div class='add'>+     height="2403"</div><div class='add'>+     id="rect257"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 20385.111,4214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path259"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 20385.111,4214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path261"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;text</div><div class='add'>+     class="TextShape"</div><div class='add'>+     id="text263"</div><div class='add'>+     x="-2443.8889"</div><div class='add'>+     y="-4585.8892"&gt;&lt;tspan</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-size="635px"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       id="tspan265"</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="19384.111"</div><div class='add'>+         y="3235.1111"</div><div class='add'>+         id="tspan267"&gt;&lt;tspan</div><div class='add'>+           id="tspan269"</div><div class='add'>+           style="fill:#000000;stroke:none"&gt;Demux&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="6113.1108"</div><div class='add'>+     y="5813.1108"</div><div class='add'>+     width="4544"</div><div class='add'>+     height="2403"</div><div class='add'>+     id="rect274"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 8385.111,8214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path276"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 8385.111,8214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path278"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;text</div><div class='add'>+     class="TextShape"</div><div class='add'>+     id="text280"</div><div class='add'>+     x="-2443.8889"</div><div class='add'>+     y="-4585.8892"&gt;&lt;tspan</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-size="635px"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       id="tspan282"</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="7733.1108"</div><div class='add'>+         y="7235.1108"</div><div class='add'>+         id="tspan284"&gt;&lt;tspan</div><div class='add'>+           id="tspan286"</div><div class='add'>+           style="fill:#000000;stroke:none"&gt;SEC&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="12213.111"</div><div class='add'>+     y="5813.1108"</div><div class='add'>+     width="4544"</div><div class='add'>+     height="2403"</div><div class='add'>+     id="rect291"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 14485.111,8214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path293"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 14485.111,8214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path295"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;text</div><div class='add'>+     class="TextShape"</div><div class='add'>+     id="text297"</div><div class='add'>+     x="-2443.8889"</div><div class='add'>+     y="-4585.8892"&gt;&lt;tspan</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-size="635px"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       id="tspan299"</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="13676.111"</div><div class='add'>+         y="7235.1108"</div><div class='add'>+         id="tspan301"&gt;&lt;tspan</div><div class='add'>+           id="tspan303"</div><div class='add'>+           style="fill:#000000;stroke:none"&gt;Audio&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="18113.111"</div><div class='add'>+     y="5813.1108"</div><div class='add'>+     width="4544"</div><div class='add'>+     height="2403"</div><div class='add'>+     id="rect308"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 20385.111,8214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path310"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 20385.111,8214.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path312"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;text</div><div class='add'>+     class="TextShape"</div><div class='add'>+     id="text314"</div><div class='add'>+     x="-2443.8889"</div><div class='add'>+     y="-4585.8892"&gt;&lt;tspan</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-size="635px"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       id="tspan316"</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="19583.111"</div><div class='add'>+         y="7235.1108"</div><div class='add'>+         id="tspan318"&gt;&lt;tspan</div><div class='add'>+           id="tspan320"</div><div class='add'>+           style="fill:#000000;stroke:none"&gt;Video&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="15213.111"</div><div class='add'>+     y="10213.111"</div><div class='add'>+     width="4544"</div><div class='add'>+     height="2403"</div><div class='add'>+     id="rect325"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 17485.111,12614.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path327"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 17485.111,12614.111 -2271,0 0,-2400 4541,0 0,2400 -2270,0 z"</div><div class='add'>+     id="path329"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;text</div><div class='add'>+     class="TextShape"</div><div class='add'>+     id="text331"</div><div class='add'>+     x="-2443.8889"</div><div class='add'>+     y="-4585.8892"&gt;&lt;tspan</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-size="635px"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       id="tspan333"</div><div class='add'>+       style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="17076.111"</div><div class='add'>+         y="11635.111"</div><div class='add'>+         id="tspan335"&gt;&lt;tspan</div><div class='add'>+           id="tspan337"</div><div class='add'>+           style="fill:#000000;stroke:none"&gt;TV&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="4555.1108"</div><div class='add'>+     y="3014.1111"</div><div class='add'>+     width="1661"</div><div class='add'>+     height="2202"</div><div class='add'>+     id="rect342"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 4556.111,5214.111 1400,-1857"</div><div class='add'>+     id="path344"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 6215.111,3014.111 -391,269 240,181 151,-450 z"</div><div class='add'>+     id="path346"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#000000;stroke:none" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="4555.1108"</div><div class='add'>+     y="5213.1108"</div><div class='add'>+     width="1561"</div><div class='add'>+     height="1802"</div><div class='add'>+     id="rect351"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 4556.111,5214.111 1277,1475"</div><div class='add'>+     id="path353"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 6115.111,7014.111 -181,-438 -227,196 408,242 z"</div><div class='add'>+     id="path355"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#000000;stroke:none" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="10755.111"</div><div class='add'>+     y="2864.1111"</div><div class='add'>+     width="1361"</div><div class='add'>+     height="301"</div><div class='add'>+     id="rect360"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 10756.111,3014.111 929,0"</div><div class='add'>+     id="path362"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 12115.111,3014.111 -450,-150 0,300 450,-150 z"</div><div class='add'>+     id="path364"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#000000;stroke:none" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="16655.111"</div><div class='add'>+     y="2864.1111"</div><div class='add'>+     width="1461"</div><div class='add'>+     height="301"</div><div class='add'>+     id="rect369"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 16656.111,3014.111 1029,0"</div><div class='add'>+     id="path371"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 18115.111,3014.111 -450,-150 0,300 450,-150 z"</div><div class='add'>+     id="path373"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#000000;stroke:none" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="20235.111"</div><div class='add'>+     y="4213.1108"</div><div class='add'>+     width="301"</div><div class='add'>+     height="1602"</div><div class='add'>+     id="rect378"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 20385.111,4214.111 0,1170"</div><div class='add'>+     id="path380"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 20385.111,5814.111 150,-450 -300,0 150,450 z"</div><div class='add'>+     id="path382"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#000000;stroke:none" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="17485.111"</div><div class='add'>+     y="8213.1113"</div><div class='add'>+     width="2902"</div><div class='add'>+     height="2002"</div><div class='add'>+     id="rect387"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 20385.111,8214.111 -2546,1756"</div><div class='add'>+     id="path389"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17485.111,10214.111 456,-132 -171,-247 -285,379 z"</div><div class='add'>+     id="path391"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#000000;stroke:none" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="14484.111"</div><div class='add'>+     y="8213.1113"</div><div class='add'>+     width="3002"</div><div class='add'>+     height="2002"</div><div class='add'>+     id="rect396"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 14485.111,8214.111 2642,1761"</div><div class='add'>+     id="path398"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17485.111,10214.111 -291,-374 -167,249 458,125 z"</div><div class='add'>+     id="path400"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#000000;stroke:none" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="14485.111"</div><div class='add'>+     y="4213.1108"</div><div class='add'>+     width="5902"</div><div class='add'>+     height="1629"</div><div class='add'>+     id="rect405"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 20385.111,4214.111 -51,14"</div><div class='add'>+     id="path407"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 20283.111,4242.111 -52,14"</div><div class='add'>+     id="path409"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 20180.111,4270.111 -51,13"</div><div class='add'>+     id="path411"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 20078.111,4297.111 -52,14"</div><div class='add'>+     id="path413"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 19975.111,4325.111 -51,14"</div><div class='add'>+     id="path415"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 19873.111,4353.111 -52,14"</div><div class='add'>+     id="path417"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 19770.111,4381.111 -51,14"</div><div class='add'>+     id="path419"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 19668.111,4409.111 -52,13"</div><div class='add'>+     id="path421"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 19565.111,4436.111 -51,14"</div><div class='add'>+     id="path423"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 19463.111,4464.111 -52,14"</div><div class='add'>+     id="path425"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 19360.111,4492.111 -51,14"</div><div class='add'>+     id="path427"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 19258.111,4520.111 -52,14"</div><div class='add'>+     id="path429"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 19155.111,4547.111 -51,14"</div><div class='add'>+     id="path431"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 19053.111,4575.111 -52,14"</div><div class='add'>+     id="path433"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 18950.111,4603.111 -51,14"</div><div class='add'>+     id="path435"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 18848.111,4631.111 -51,14"</div><div class='add'>+     id="path437"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 18745.111,4659.111 -51,14"</div><div class='add'>+     id="path439"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 18643.111,4686.111 -51,14"</div><div class='add'>+     id="path441"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 18540.111,4714.111 -51,14"</div><div class='add'>+     id="path443"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 18438.111,4742.111 -51,14"</div><div class='add'>+     id="path445"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 18335.111,4770.111 -51,14"</div><div class='add'>+     id="path447"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 18233.111,4798.111 -51,14"</div><div class='add'>+     id="path449"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 18130.111,4825.111 -51,14"</div><div class='add'>+     id="path451"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 18028.111,4853.111 -51,14"</div><div class='add'>+     id="path453"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17925.111,4881.111 -51,14"</div><div class='add'>+     id="path455"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17823.111,4909.111 -51,14"</div><div class='add'>+     id="path457"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17720.111,4937.111 -51,13"</div><div class='add'>+     id="path459"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17618.111,4964.111 -51,14"</div><div class='add'>+     id="path461"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17516.111,4992.111 -52,14"</div><div class='add'>+     id="path463"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17413.111,5020.111 -51,14"</div><div class='add'>+     id="path465"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17311.111,5048.111 -52,14"</div><div class='add'>+     id="path467"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17208.111,5076.111 -51,13"</div><div class='add'>+     id="path469"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17106.111,5103.111 -52,14"</div><div class='add'>+     id="path471"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 17003.111,5131.111 -51,14"</div><div class='add'>+     id="path473"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 16901.111,5159.111 -52,14"</div><div class='add'>+     id="path475"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 16798.111,5187.111 -51,14"</div><div class='add'>+     id="path477"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 16696.111,5214.111 -52,14"</div><div class='add'>+     id="path479"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 16593.111,5242.111 -51,14"</div><div class='add'>+     id="path481"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 16491.111,5270.111 -52,14"</div><div class='add'>+     id="path483"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 16388.111,5298.111 -51,14"</div><div class='add'>+     id="path485"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 16286.111,5326.111 -52,14"</div><div class='add'>+     id="path487"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 16183.111,5353.111 -51,14"</div><div class='add'>+     id="path489"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 16081.111,5381.111 -51,14"</div><div class='add'>+     id="path491"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 15978.111,5409.111 -51,14"</div><div class='add'>+     id="path493"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 15876.111,5437.111 -51,14"</div><div class='add'>+     id="path495"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 15773.111,5465.111 -51,14"</div><div class='add'>+     id="path497"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 15671.111,5492.111 -51,14"</div><div class='add'>+     id="path499"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 15568.111,5520.111 -51,14"</div><div class='add'>+     id="path501"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 15466.111,5548.111 -51,14"</div><div class='add'>+     id="path503"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 15363.111,5576.111 -51,14"</div><div class='add'>+     id="path505"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 15261.111,5604.111 -51,13"</div><div class='add'>+     id="path507"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 15158.111,5631.111 -51,14"</div><div class='add'>+     id="path509"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 15056.111,5659.111 -51,14"</div><div class='add'>+     id="path511"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 14953.111,5687.111 -51,14"</div><div class='add'>+     id="path513"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000" /&gt;&lt;path</div><div class='add'>+     d="m 14485.111,5814.111 474,27 -79,-290 -395,263 z"</div><div class='add'>+     id="path515"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#000000;stroke:none" /&gt;&lt;/svg&gt;
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/media/uapi/dvb/intro.rst b/Documentation/media/uapi/dvb/intro.rst<br/>index b61081d00a9f..2ed5c23102b4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/dvb/intro.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/dvb/intro.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/dvb/intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/dvb/intro.rst</a></div><div class='hunk'>@@ -55,8 +55,8 @@ Overview</div><div class='ctx'> </div><div class='ctx'> .. _stb_components:</div><div class='ctx'> </div><div class='del'>-.. figure::  intro_files/dvbstb.*</div><div class='del'>-    :alt:    dvbstb.pdf / dvbstb.png</div><div class='add'>+.. figure::  dvbstb.*</div><div class='add'>+    :alt:    dvbstb.pdf / dvbstb.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     Components of a DVB card/STB</div><div class='head'>diff --git a/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf b/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf<br/>deleted file mode 100644<br/>index 0fa75d90c3eb..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/dvb/intro_files/dvbstb.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/dvb/intro_files/dvbstb.png b/Documentation/media/uapi/dvb/intro_files/dvbstb.png<br/>deleted file mode 100644<br/>index 9b8f372e7afd..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/dvb/intro_files/dvbstb.png?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/dvb/intro_files/dvbstb.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/gen-errors.rst b/Documentation/media/uapi/gen-errors.rst<br/>index 6e983b9880fc..d39e34d1b19d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/gen-errors.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/gen-errors.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/gen-errors.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/gen-errors.rst</a></div><div class='hunk'>@@ -94,9 +94,17 @@ Generic Error Codes</div><div class='ctx'>        -  Permission denied. Can be returned if the device needs write</div><div class='ctx'> 	  permission, or some special capabilities is needed (e. g. root)</div><div class='ctx'> </div><div class='add'>+    -  .. row 11</div><div class='add'>+</div><div class='add'>+       -  ``EIO``</div><div class='add'>+</div><div class='add'>+       -  I/O error. Typically used when there are problems communicating with</div><div class='add'>+          a hardware device. This could indicate broken or flaky hardware.</div><div class='add'>+	  It's a 'Something is wrong, I give up!' type of error.</div><div class='add'>+</div><div class='ctx'> .. note::</div><div class='ctx'> </div><div class='del'>-  #. This list is not exaustive; ioctls may return other error codes.</div><div class='add'>+  #. This list is not exhaustive; ioctls may return other error codes.</div><div class='ctx'>      Since errors may have side effects such as a driver reset,</div><div class='ctx'>      applications should abort on unexpected errors, or otherwise</div><div class='ctx'>      assume that the device is in a bad state.</div><div class='head'>diff --git a/Documentation/media/uapi/rc/rc-sysfs-nodes.rst b/Documentation/media/uapi/rc/rc-sysfs-nodes.rst<br/>index 6fb944fe21fd..3476ae29708f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/rc/rc-sysfs-nodes.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/rc/rc-sysfs-nodes.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/rc/rc-sysfs-nodes.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/rc/rc-sysfs-nodes.rst</a></div><div class='hunk'>@@ -92,15 +92,16 @@ This value may be reset to 0 if the current protocol is altered.</div><div class='ctx'> Reading this file returns a list of available protocols to use for the</div><div class='ctx'> wakeup filter, something like:</div><div class='ctx'> </div><div class='del'>-``rc5 rc6 nec jvc [sony]``</div><div class='add'>+``rc-5 nec nec-x rc-6-0 rc-6-6a-24 [rc-6-6a-32] rc-6-mce``</div><div class='ctx'> </div><div class='del'>-The enabled wakeup protocol is shown in [] brackets.</div><div class='add'>+Note that protocol variants are listed, so "nec", "sony", "rc-5", "rc-6"</div><div class='add'>+have their different bit length encodings listed if available.</div><div class='ctx'> </div><div class='del'>-Writing "+proto" will add a protocol to the list of enabled wakeup</div><div class='del'>-protocols.</div><div class='add'>+Note that all protocol variants are listed.</div><div class='ctx'> </div><div class='del'>-Writing "-proto" will remove a protocol from the list of enabled wakeup</div><div class='del'>-protocols.</div><div class='add'>+The enabled wakeup protocol is shown in [] brackets.</div><div class='add'>+</div><div class='add'>+Only one protocol can be selected at a time.</div><div class='ctx'> </div><div class='ctx'> Writing "proto" will use "proto" for wakeup events.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/v4l/bayer.svg b/Documentation/media/uapi/v4l/bayer.svg<br/>new file mode 100644<br/>index 000000000000..fbd4cfb5e6bf<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/bayer.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/bayer.svg</a></div><div class='hunk'>@@ -0,0 +1,984 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   version="1.2"</div><div class='add'>+   width="164.15334mm"</div><div class='add'>+   height="46.771107mm"</div><div class='add'>+   viewBox="0 0 16415.333 4677.1107"</div><div class='add'>+   preserveAspectRatio="xMidYMid"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   id="svg2"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   sodipodi:docname="bayer.svg"</div><div class='add'>+   style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"&gt;&lt;metadata</div><div class='add'>+     id="metadata652"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title&gt;&lt;/dc:title&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview650"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0"</div><div class='add'>+     inkscape:zoom="2.4000866"</div><div class='add'>+     inkscape:cx="290.82284"</div><div class='add'>+     inkscape:cy="82.862197"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="svg2" /&gt;&lt;defs</div><div class='add'>+     class="ClipPathGroup"</div><div class='add'>+     id="defs4" /&gt;&lt;defs</div><div class='add'>+     id="defs9" /&gt;&lt;defs</div><div class='add'>+     id="defs82" /&gt;&lt;defs</div><div class='add'>+     id="defs105" /&gt;&lt;defs</div><div class='add'>+     class="TextShapeIndex"</div><div class='add'>+     id="defs116" /&gt;&lt;defs</div><div class='add'>+     class="EmbeddedBulletChars"</div><div class='add'>+     id="defs120" /&gt;&lt;defs</div><div class='add'>+     class="TextEmbeddedBitmaps"</div><div class='add'>+     id="defs149" /&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g186"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id6"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="3299"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect189"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 3950,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path191"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#0000ff;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 3950,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path193"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text195"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan197"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="3739"</div><div class='add'>+             y="4021"</div><div class='add'>+             id="tspan199"&gt;&lt;tspan</div><div class='add'>+               id="tspan201"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;B&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g203"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id7"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="4599"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect206"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 5250,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path208"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#00cc00;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 5250,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path210"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text212"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan214"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="5003"</div><div class='add'>+             y="4021"</div><div class='add'>+             id="tspan216"&gt;&lt;tspan</div><div class='add'>+               id="tspan218"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;G&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g220"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id8"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="3299"</div><div class='add'>+         y="4399"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect223"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 3950,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path225"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#00cc00;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 3950,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path227"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text229"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan231"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="3703"</div><div class='add'>+             y="5221"</div><div class='add'>+             id="tspan233"&gt;&lt;tspan</div><div class='add'>+               id="tspan235"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;G&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g237"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id9"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="4599"</div><div class='add'>+         y="4399"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect240"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 5250,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path242"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff0000;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 5250,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path244"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text246"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan248"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="5022"</div><div class='add'>+             y="5221"</div><div class='add'>+             id="tspan250"&gt;&lt;tspan</div><div class='add'>+               id="tspan252"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;R&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g254"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id10"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5999"</div><div class='add'>+         y="3299"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect257"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6500,4300 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path259"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#0000ff" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g261"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id11"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="4699"</div><div class='add'>+         y="5699"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect264"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 5200,6700 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path266"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#00cc00" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.TextShape"</div><div class='add'>+     id="g268"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id12"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="4000"</div><div class='add'>+         y="6900"</div><div class='add'>+         width="2374"</div><div class='add'>+         height="963"</div><div class='add'>+         id="rect271"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text273"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan275"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="4250"</div><div class='add'>+             y="7601"</div><div class='add'>+             id="tspan277"&gt;&lt;tspan</div><div class='add'>+               id="tspan279"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;BGGR&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g281"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id13"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="8799"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect284"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9450,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path286"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#0000ff;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9450,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path288"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text290"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan292"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="9239"</div><div class='add'>+             y="4021"</div><div class='add'>+             id="tspan294"&gt;&lt;tspan</div><div class='add'>+               id="tspan296"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;B&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g298"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id14"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="7499"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect301"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 8150,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path303"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#00cc00;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 8150,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path305"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text307"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan309"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="7903"</div><div class='add'>+             y="4021"</div><div class='add'>+             id="tspan311"&gt;&lt;tspan</div><div class='add'>+               id="tspan313"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;G&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g315"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id15"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="8799"</div><div class='add'>+         y="4399"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect318"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9450,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path320"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#00cc00;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9450,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path322"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text324"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan326"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="9203"</div><div class='add'>+             y="5221"</div><div class='add'>+             id="tspan328"&gt;&lt;tspan</div><div class='add'>+               id="tspan330"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;G&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g332"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id16"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="7499"</div><div class='add'>+         y="4399"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect335"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 8150,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path337"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff0000;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 8150,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path339"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text341"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan343"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="7922"</div><div class='add'>+             y="5221"</div><div class='add'>+             id="tspan345"&gt;&lt;tspan</div><div class='add'>+               id="tspan347"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;R&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.TextShape"</div><div class='add'>+     id="g349"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id17"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="8200"</div><div class='add'>+         y="6900"</div><div class='add'>+         width="2374"</div><div class='add'>+         height="963"</div><div class='add'>+         id="rect352"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text354"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan356"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="8450"</div><div class='add'>+             y="7601"</div><div class='add'>+             id="tspan358"&gt;&lt;tspan</div><div class='add'>+               id="tspan360"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;GBRG&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g362"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id18"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="17299"</div><div class='add'>+         y="4399"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect365"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 17950,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path367"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#0000ff;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 17950,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path369"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text371"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan373"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="17739"</div><div class='add'>+             y="5221"</div><div class='add'>+             id="tspan375"&gt;&lt;tspan</div><div class='add'>+               id="tspan377"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;B&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g379"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id19"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="17299"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect382"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 17950,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path384"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#00cc00;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 17950,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path386"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text388"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan390"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="17703"</div><div class='add'>+             y="4021"</div><div class='add'>+             id="tspan392"&gt;&lt;tspan</div><div class='add'>+               id="tspan394"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;G&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g396"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id20"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="15999"</div><div class='add'>+         y="4399"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect399"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 16650,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path401"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#00cc00;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 16650,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path403"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text405"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan407"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="16403"</div><div class='add'>+             y="5221"</div><div class='add'>+             id="tspan409"&gt;&lt;tspan</div><div class='add'>+               id="tspan411"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;G&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g413"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id21"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="15999"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect416"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 16650,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path418"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff0000;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 16650,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path420"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text422"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan424"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="16422"</div><div class='add'>+             y="4021"</div><div class='add'>+             id="tspan426"&gt;&lt;tspan</div><div class='add'>+               id="tspan428"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;R&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.TextShape"</div><div class='add'>+     id="g430"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id22"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="16700"</div><div class='add'>+         y="6900"</div><div class='add'>+         width="2374"</div><div class='add'>+         height="963"</div><div class='add'>+         id="rect433"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text435"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan437"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="16950"</div><div class='add'>+             y="7601"</div><div class='add'>+             id="tspan439"&gt;&lt;tspan</div><div class='add'>+               id="tspan441"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;RGGB&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g443"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id23"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="11699"</div><div class='add'>+         y="4399"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect446"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 12350,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path448"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#0000ff;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 12350,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path450"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text452"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan454"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="12139"</div><div class='add'>+             y="5221"</div><div class='add'>+             id="tspan456"&gt;&lt;tspan</div><div class='add'>+               id="tspan458"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;B&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g460"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id24"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="11699"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect463"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 12350,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path465"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#00cc00;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 12350,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path467"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text469"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan471"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="12103"</div><div class='add'>+             y="4021"</div><div class='add'>+             id="tspan473"&gt;&lt;tspan</div><div class='add'>+               id="tspan475"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;G&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g477"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id25"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12999"</div><div class='add'>+         y="4399"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect480"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 13650,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path482"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#00cc00;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 13650,5600 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path484"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text486"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan488"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="13403"</div><div class='add'>+             y="5221"</div><div class='add'>+             id="tspan490"&gt;&lt;tspan</div><div class='add'>+               id="tspan492"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;G&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g494"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id26"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12999"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="1303"</div><div class='add'>+         height="1203"</div><div class='add'>+         id="rect497"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 13650,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path499"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff0000;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 13650,4400 -650,0 0,-1200 1300,0 0,1200 -650,0 z"</div><div class='add'>+         id="path501"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text503"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan505"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="13422"</div><div class='add'>+             y="4021"</div><div class='add'>+             id="tspan507"&gt;&lt;tspan</div><div class='add'>+               id="tspan509"</div><div class='add'>+               style="fill:#ffffff;stroke:none"&gt;R&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.TextShape"</div><div class='add'>+     id="g511"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id27"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12400"</div><div class='add'>+         y="6900"</div><div class='add'>+         width="2374"</div><div class='add'>+         height="963"</div><div class='add'>+         id="rect514"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text516"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan518"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="12650"</div><div class='add'>+             y="7601"</div><div class='add'>+             id="tspan520"&gt;&lt;tspan</div><div class='add'>+               id="tspan522"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;GRBG&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g524"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id28"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5999"</div><div class='add'>+         y="5699"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect527"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6500,6700 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path529"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#0000ff" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g531"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id29"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="3399"</div><div class='add'>+         y="5699"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect534"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 3900,6700 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path536"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#0000ff" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g538"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id30"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5999"</div><div class='add'>+         y="4499"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect541"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6500,5500 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path543"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#00cc00" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g545"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id31"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="7599"</div><div class='add'>+         y="5799"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect548"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 8100,6800 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path550"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#00cc00" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g552"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id32"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="10199"</div><div class='add'>+         y="5799"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect555"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 10700,6800 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path557"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#00cc00" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g559"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id33"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="8899"</div><div class='add'>+         y="5799"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect562"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9400,6800 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path564"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#0000ff" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g566"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id34"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="10199"</div><div class='add'>+         y="4499"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect569"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 10700,5500 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path571"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff0000" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g573"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id35"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="10199"</div><div class='add'>+         y="3299"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect576"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 10700,4300 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path578"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#00cc00" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g580"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id36"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="14399"</div><div class='add'>+         y="3299"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect583"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14900,4300 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path585"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#00cc00" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g587"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id37"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="14399"</div><div class='add'>+         y="5799"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect590"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14900,6800 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path592"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#00cc00" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g594"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id38"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="11799"</div><div class='add'>+         y="5799"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect597"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 12300,6800 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path599"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#00cc00" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g601"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id39"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="14399"</div><div class='add'>+         y="4499"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect604"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14900,5500 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path606"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#0000ff" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g608"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id40"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="13099"</div><div class='add'>+         y="5799"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect611"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 13600,6800 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path613"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff0000" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g615"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id41"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="16099"</div><div class='add'>+         y="5799"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect618"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 16600,6800 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path620"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff0000" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g622"</div><div class='add'>+     transform="translate(-3398.7778,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id42"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="18799"</div><div class='add'>+         y="5799"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect625"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 19300,6800 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path627"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff0000" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g629"</div><div class='add'>+     transform="translate(-3398.7778,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id43"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="18799"</div><div class='add'>+         y="3299"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect632"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 19300,4300 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path634"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff0000" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g636"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id44"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="17399"</div><div class='add'>+         y="5799"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect639"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 17900,6800 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path641"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#00cc00" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g643"</div><div class='add'>+     transform="translate(-3398.7778,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id45"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="18799"</div><div class='add'>+         y="4499"</div><div class='add'>+         width="1003"</div><div class='add'>+         height="1003"</div><div class='add'>+         id="rect646"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 19300,5500 -500,0 0,-1000 1000,0 0,1000 -500,0 z"</div><div class='add'>+         id="path648"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#00cc00" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;/svg&gt;
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/constraints.svg b/Documentation/media/uapi/v4l/constraints.svg<br/>new file mode 100644<br/>index 000000000000..f710ee46b1f8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/constraints.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/constraints.svg</a></div><div class='hunk'>@@ -0,0 +1,346 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   version="1.2"</div><div class='add'>+   width="249.00998mm"</div><div class='add'>+   height="143.00999mm"</div><div class='add'>+   viewBox="0 0 24900.998 14300.999"</div><div class='add'>+   preserveAspectRatio="xMidYMid"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   id="svg2"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   sodipodi:docname="constraints.svg"</div><div class='add'>+   style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"&gt;&lt;metadata</div><div class='add'>+     id="metadata325"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title /&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview323"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:zoom="1.0818519"</div><div class='add'>+     inkscape:cx="270.29272"</div><div class='add'>+     inkscape:cy="249.83854"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="svg2"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0" /&gt;&lt;defs</div><div class='add'>+     class="ClipPathGroup"</div><div class='add'>+     id="defs4"&gt;&lt;marker</div><div class='add'>+       inkscape:isstock="true"</div><div class='add'>+       style="overflow:visible"</div><div class='add'>+       id="marker6261"</div><div class='add'>+       refX="0"</div><div class='add'>+       refY="0"</div><div class='add'>+       orient="auto"</div><div class='add'>+       inkscape:stockid="Arrow1Mend"&gt;&lt;path</div><div class='add'>+         transform="matrix(-0.4,0,0,-0.4,-4,0)"</div><div class='add'>+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"</div><div class='add'>+         id="path6263"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;&lt;/marker&gt;&lt;marker</div><div class='add'>+       inkscape:stockid="Arrow1Mend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="marker6125"</div><div class='add'>+       style="overflow:visible"</div><div class='add'>+       inkscape:isstock="true"</div><div class='add'>+       inkscape:collect="always"&gt;&lt;path</div><div class='add'>+         id="path6127"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"</div><div class='add'>+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1"</div><div class='add'>+         transform="matrix(-0.4,0,0,-0.4,-4,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;&lt;/marker&gt;&lt;marker</div><div class='add'>+       inkscape:isstock="true"</div><div class='add'>+       style="overflow:visible"</div><div class='add'>+       id="marker6001"</div><div class='add'>+       refX="0"</div><div class='add'>+       refY="0"</div><div class='add'>+       orient="auto"</div><div class='add'>+       inkscape:stockid="Arrow1Mend"</div><div class='add'>+       inkscape:collect="always"&gt;&lt;path</div><div class='add'>+         transform="matrix(-0.4,0,0,-0.4,-4,0)"</div><div class='add'>+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"</div><div class='add'>+         id="path6003"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;&lt;/marker&gt;&lt;marker</div><div class='add'>+       inkscape:stockid="Arrow1Mend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="marker5693"</div><div class='add'>+       style="overflow:visible"</div><div class='add'>+       inkscape:isstock="true"</div><div class='add'>+       inkscape:collect="always"&gt;&lt;path</div><div class='add'>+         id="path5695"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"</div><div class='add'>+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1"</div><div class='add'>+         transform="matrix(-0.4,0,0,-0.4,-4,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;&lt;/marker&gt;&lt;marker</div><div class='add'>+       inkscape:isstock="true"</div><div class='add'>+       style="overflow:visible"</div><div class='add'>+       id="marker5575"</div><div class='add'>+       refX="0"</div><div class='add'>+       refY="0"</div><div class='add'>+       orient="auto"</div><div class='add'>+       inkscape:stockid="Arrow1Mend"</div><div class='add'>+       inkscape:collect="always"&gt;&lt;path</div><div class='add'>+         transform="matrix(-0.4,0,0,-0.4,-4,0)"</div><div class='add'>+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"</div><div class='add'>+         id="path5577"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;&lt;/marker&gt;&lt;marker</div><div class='add'>+       inkscape:stockid="Arrow1Mend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="marker5469"</div><div class='add'>+       style="overflow:visible"</div><div class='add'>+       inkscape:isstock="true"</div><div class='add'>+       inkscape:collect="always"&gt;&lt;path</div><div class='add'>+         id="path5471"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"</div><div class='add'>+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"</div><div class='add'>+         transform="matrix(-0.4,0,0,-0.4,-4,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;&lt;/marker&gt;&lt;marker</div><div class='add'>+       inkscape:stockid="Arrow1Mend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="marker5259"</div><div class='add'>+       style="overflow:visible"</div><div class='add'>+       inkscape:isstock="true"&gt;&lt;path</div><div class='add'>+         id="path5261"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"</div><div class='add'>+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"</div><div class='add'>+         transform="matrix(-0.4,0,0,-0.4,-4,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;&lt;/marker&gt;&lt;marker</div><div class='add'>+       inkscape:stockid="Arrow2Mend"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow2Mend"</div><div class='add'>+       style="overflow:visible"</div><div class='add'>+       inkscape:isstock="true"&gt;&lt;path</div><div class='add'>+         id="path4241"</div><div class='add'>+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"</div><div class='add'>+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"</div><div class='add'>+         transform="scale(-0.6,-0.6)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;&lt;/marker&gt;&lt;/defs&gt;&lt;defs</div><div class='add'>+     id="defs9" /&gt;&lt;defs</div><div class='add'>+     id="defs100" /&gt;&lt;defs</div><div class='add'>+     id="defs123" /&gt;&lt;defs</div><div class='add'>+     class="TextShapeIndex"</div><div class='add'>+     id="defs134" /&gt;&lt;defs</div><div class='add'>+     class="EmbeddedBulletChars"</div><div class='add'>+     id="defs138" /&gt;&lt;defs</div><div class='add'>+     class="TextEmbeddedBitmaps"</div><div class='add'>+     id="defs167" /&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g204"</div><div class='add'>+     transform="translate(-1350,-3250)"&gt;&lt;g</div><div class='add'>+       id="id6"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="1350"</div><div class='add'>+         y="3250"</div><div class='add'>+         width="24901"</div><div class='add'>+         height="14301"</div><div class='add'>+         id="rect207"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 13800,17500 -12400,0 0,-14200 24800,0 0,14200 -12400,0 z"</div><div class='add'>+         id="path209"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 13800,17500 -12400,0 0,-14200 24800,0 0,14200 -12400,0 z"</div><div class='add'>+         id="path211"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff0000;stroke-width:100;stroke-linejoin:round" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text213"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="846px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan215"</div><div class='add'>+           style="font-weight:400;font-size:846px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="1652"</div><div class='add'>+             y="17093"</div><div class='add'>+             id="tspan217"&gt;&lt;tspan</div><div class='add'>+               id="tspan219"</div><div class='add'>+               style="fill:#ff0000;stroke:none" /&gt;&lt;tspan</div><div class='add'>+               id="tspan221"</div><div class='add'>+               style="fill:#ff0000;stroke:none"&gt;V4L2_SEL_FLAG_GE&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="3000"</div><div class='add'>+     y="2200"</div><div class='add'>+     width="18101"</div><div class='add'>+     height="10101"</div><div class='add'>+     id="rect226"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 12050,12250 -9000,0 0,-10000 18000,0 0,10000 -9000,0 z"</div><div class='add'>+     id="path228"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 12050,12250 -9000,0 0,-10000 18000,0 0,10000 -9000,0 z"</div><div class='add'>+     id="path230"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000000;stroke-width:100;stroke-linejoin:round" /&gt;&lt;text</div><div class='add'>+     class="TextShape"</div><div class='add'>+     id="text232"</div><div class='add'>+     x="-1350"</div><div class='add'>+     y="-3250"&gt;&lt;tspan</div><div class='add'>+       class="TextParagraph"</div><div class='add'>+       font-size="987px"</div><div class='add'>+       font-weight="400"</div><div class='add'>+       id="tspan234"</div><div class='add'>+       style="font-weight:400;font-size:987px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+         class="TextPosition"</div><div class='add'>+         x="3227"</div><div class='add'>+         y="11503"</div><div class='add'>+         id="tspan236"&gt;&lt;tspan</div><div class='add'>+           id="tspan238"</div><div class='add'>+           style="fill:#000000;stroke:none" /&gt;&lt;tspan</div><div class='add'>+           id="tspan240"</div><div class='add'>+           style="fill:#000000;stroke:none"&gt;ORIGINAL&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g242"</div><div class='add'>+     transform="translate(-1350,-3250)"&gt;&lt;g</div><div class='add'>+       id="id8"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="7050"</div><div class='add'>+         y="7950"</div><div class='add'>+         width="7901"</div><div class='add'>+         height="5501"</div><div class='add'>+         id="rect245"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 11000,13400 -3900,0 0,-5400 7800,0 0,5400 -3900,0 z"</div><div class='add'>+         id="path247"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ffffff;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 11000,13400 -3900,0 0,-5400 7800,0 0,5400 -3900,0 z"</div><div class='add'>+         id="path249"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4;stroke-width:100;stroke-linejoin:round" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text251"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="776px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan253"</div><div class='add'>+           style="font-weight:400;font-size:776px;font-family:'Liberation Sans', sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="7228"</div><div class='add'>+             y="10969"</div><div class='add'>+             id="tspan255"&gt;&lt;tspan</div><div class='add'>+               id="tspan257"</div><div class='add'>+               style="fill:#000080;stroke:none"&gt;V4L2_SEL_FLAG_LE&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="13700"</div><div class='add'>+     y="7100"</div><div class='add'>+     width="7101"</div><div class='add'>+     height="101"</div><div class='add'>+     id="rect262"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 20750,7150 -7000,0"</div><div class='add'>+     id="path264"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000080;stroke-width:99.99134064;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow2Mend)" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="3400"</div><div class='add'>+     y="7100"</div><div class='add'>+     width="2101"</div><div class='add'>+     height="101"</div><div class='add'>+     id="rect269"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 3450,7150 2000,0"</div><div class='add'>+     id="path271"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000080;stroke-width:100;stroke-linejoin:round;marker-end:url(#marker5575)" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="9800"</div><div class='add'>+     y="2900"</div><div class='add'>+     width="101"</div><div class='add'>+     height="1501"</div><div class='add'>+     id="rect276"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 9850,2950 0,1400"</div><div class='add'>+     id="path278"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000080;stroke-width:100;stroke-linejoin:round;marker-end:url(#marker5259)" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="9600"</div><div class='add'>+     y="10600"</div><div class='add'>+     width="101"</div><div class='add'>+     height="1301"</div><div class='add'>+     id="rect283"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 9650,11850 0,-1200"</div><div class='add'>+     id="path285"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#000080;stroke-width:100;stroke-linejoin:round;marker-end:url(#marker5469)" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="450"</div><div class='add'>+     y="6850"</div><div class='add'>+     width="2051"</div><div class='add'>+     height="601"</div><div class='add'>+     id="rect290"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 2450,7150 -2000.8696,0"</div><div class='add'>+     id="path292"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#ff0000;stroke-width:132.48202515;stroke-linejoin:round;marker-end:url(#marker6125)" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="21600"</div><div class='add'>+     y="6750"</div><div class='add'>+     width="2651"</div><div class='add'>+     height="601"</div><div class='add'>+     id="rect299"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 21650,7050 2522.609,0"</div><div class='add'>+     id="path301"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#ff0000;stroke-width:120.40660858;stroke-linejoin:round;marker-end:url(#marker6001)" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="9550"</div><div class='add'>+     y="550"</div><div class='add'>+     width="601"</div><div class='add'>+     height="1451"</div><div class='add'>+     id="rect308"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 9836.957,1950 0,-1453.0435"</div><div class='add'>+     id="path310"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#ff0000;stroke-width:164.03721619;stroke-linejoin:round;marker-end:url(#marker6261)" /&gt;&lt;rect</div><div class='add'>+     class="BoundingBox"</div><div class='add'>+     x="9350"</div><div class='add'>+     y="12500"</div><div class='add'>+     width="601"</div><div class='add'>+     height="1451"</div><div class='add'>+     id="rect317"</div><div class='add'>+     style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+     d="m 9650,12550 0,1505.217"</div><div class='add'>+     id="path319"</div><div class='add'>+     inkscape:connector-curvature="0"</div><div class='add'>+     style="fill:none;stroke:#ff0000;stroke-width:166.95626831;stroke-linejoin:round;marker-end:url(#marker5693)" /&gt;&lt;/svg&gt;
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/control.rst b/Documentation/media/uapi/v4l/control.rst<br/>index d3f1450c4b08..51112badb804 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/control.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/control.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/control.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/control.rst</a></div><div class='hunk'>@@ -312,21 +312,20 @@ more menu type controls.</div><div class='ctx'> </div><div class='ctx'> .. _enum_all_controls:</div><div class='ctx'> </div><div class='del'>-Example: Enumerating all user controls</div><div class='del'>-======================================</div><div class='add'>+Example: Enumerating all controls</div><div class='add'>+=================================</div><div class='ctx'> </div><div class='ctx'> .. code-block:: c</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'>     struct v4l2_queryctrl queryctrl;</div><div class='ctx'>     struct v4l2_querymenu querymenu;</div><div class='ctx'> </div><div class='del'>-    static void enumerate_menu(void)</div><div class='add'>+    static void enumerate_menu(__u32 id)</div><div class='ctx'>     {</div><div class='ctx'> 	printf("  Menu items:\\n");</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;querymenu, 0, sizeof(querymenu));</div><div class='del'>-	querymenu.id = queryctrl.id;</div><div class='add'>+	querymenu.id = id;</div><div class='ctx'> </div><div class='ctx'> 	for (querymenu.index = queryctrl.minimum;</div><div class='ctx'> 	     querymenu.index &lt;= queryctrl.maximum;</div><div class='hunk'>@@ -339,6 +338,55 @@ Example: Enumerating all user controls</div><div class='ctx'> </div><div class='ctx'>     memset(&amp;queryctrl, 0, sizeof(queryctrl));</div><div class='ctx'> </div><div class='add'>+    queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;</div><div class='add'>+    while (0 == ioctl(fd, VIDIOC_QUERYCTRL, &amp;queryctrl)) {</div><div class='add'>+	if (!(queryctrl.flags &amp; V4L2_CTRL_FLAG_DISABLED)) {</div><div class='add'>+	    printf("Control %s\\n", queryctrl.name);</div><div class='add'>+</div><div class='add'>+	    if (queryctrl.type == V4L2_CTRL_TYPE_MENU)</div><div class='add'>+	        enumerate_menu(queryctrl.id);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	queryctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;</div><div class='add'>+    }</div><div class='add'>+    if (errno != EINVAL) {</div><div class='add'>+	perror("VIDIOC_QUERYCTRL");</div><div class='add'>+	exit(EXIT_FAILURE);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+Example: Enumerating all controls including compound controls</div><div class='add'>+=============================================================</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+    struct v4l2_query_ext_ctrl query_ext_ctrl;</div><div class='add'>+</div><div class='add'>+    memset(&amp;query_ext_ctrl, 0, sizeof(query_ext_ctrl));</div><div class='add'>+</div><div class='add'>+    query_ext_ctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL | V4L2_CTRL_FLAG_NEXT_COMPOUND;</div><div class='add'>+    while (0 == ioctl(fd, VIDIOC_QUERY_EXT_CTRL, &amp;query_ext_ctrl)) {</div><div class='add'>+	if (!(query_ext_ctrl.flags &amp; V4L2_CTRL_FLAG_DISABLED)) {</div><div class='add'>+	    printf("Control %s\\n", query_ext_ctrl.name);</div><div class='add'>+</div><div class='add'>+	    if (query_ext_ctrl.type == V4L2_CTRL_TYPE_MENU)</div><div class='add'>+	        enumerate_menu(query_ext_ctrl.id);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	query_ext_ctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL | V4L2_CTRL_FLAG_NEXT_COMPOUND;</div><div class='add'>+    }</div><div class='add'>+    if (errno != EINVAL) {</div><div class='add'>+	perror("VIDIOC_QUERY_EXT_CTRL");</div><div class='add'>+	exit(EXIT_FAILURE);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+Example: Enumerating all user controls (old style)</div><div class='add'>+==================================================</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    memset(&amp;queryctrl, 0, sizeof(queryctrl));</div><div class='add'>+</div><div class='ctx'>     for (queryctrl.id = V4L2_CID_BASE;</div><div class='ctx'> 	 queryctrl.id &lt; V4L2_CID_LASTP1;</div><div class='ctx'> 	 queryctrl.id++) {</div><div class='hunk'>@@ -349,7 +397,7 @@ Example: Enumerating all user controls</div><div class='ctx'> 	    printf("Control %s\\n", queryctrl.name);</div><div class='ctx'> </div><div class='ctx'> 	    if (queryctrl.type == V4L2_CTRL_TYPE_MENU)</div><div class='del'>-		enumerate_menu();</div><div class='add'>+		enumerate_menu(queryctrl.id);</div><div class='ctx'> 	} else {</div><div class='ctx'> 	    if (errno == EINVAL)</div><div class='ctx'> 		continue;</div><div class='hunk'>@@ -368,7 +416,7 @@ Example: Enumerating all user controls</div><div class='ctx'> 	    printf("Control %s\\n", queryctrl.name);</div><div class='ctx'> </div><div class='ctx'> 	    if (queryctrl.type == V4L2_CTRL_TYPE_MENU)</div><div class='del'>-		enumerate_menu();</div><div class='add'>+		enumerate_menu(queryctrl.id);</div><div class='ctx'> 	} else {</div><div class='ctx'> 	    if (errno == EINVAL)</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -379,32 +427,6 @@ Example: Enumerating all user controls</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Example: Enumerating all user controls (alternative)</div><div class='del'>-====================================================</div><div class='del'>-</div><div class='del'>-.. code-block:: c</div><div class='del'>-</div><div class='del'>-    memset(&amp;queryctrl, 0, sizeof(queryctrl));</div><div class='del'>-</div><div class='del'>-    queryctrl.id = V4L2_CTRL_CLASS_USER | V4L2_CTRL_FLAG_NEXT_CTRL;</div><div class='del'>-    while (0 == ioctl(fd, VIDIOC_QUERYCTRL, &amp;queryctrl)) {</div><div class='del'>-	if (V4L2_CTRL_ID2CLASS(queryctrl.id) != V4L2_CTRL_CLASS_USER)</div><div class='del'>-	    break;</div><div class='del'>-	if (queryctrl.flags &amp; V4L2_CTRL_FLAG_DISABLED)</div><div class='del'>-	    continue;</div><div class='del'>-</div><div class='del'>-	printf("Control %s\\n", queryctrl.name);</div><div class='del'>-</div><div class='del'>-	if (queryctrl.type == V4L2_CTRL_TYPE_MENU)</div><div class='del'>-	    enumerate_menu();</div><div class='del'>-</div><div class='del'>-	queryctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;</div><div class='del'>-    }</div><div class='del'>-    if (errno != EINVAL) {</div><div class='del'>-	perror("VIDIOC_QUERYCTRL");</div><div class='del'>-	exit(EXIT_FAILURE);</div><div class='del'>-    }</div><div class='del'>-</div><div class='ctx'> Example: Changing controls</div><div class='ctx'> ==========================</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/v4l/crop.rst b/Documentation/media/uapi/v4l/crop.rst<br/>index 3ea733a8eef8..be58894c9c89 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/crop.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/crop.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/crop.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/crop.rst</a></div><div class='hunk'>@@ -53,8 +53,8 @@ Cropping Structures</div><div class='ctx'> </div><div class='ctx'> .. _crop-scale:</div><div class='ctx'> </div><div class='del'>-.. figure::  crop_files/crop.*</div><div class='del'>-    :alt:    crop.pdf / crop.gif</div><div class='add'>+.. figure::  crop.*</div><div class='add'>+    :alt:    crop.pdf / crop.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     Image Cropping, Insertion and Scaling</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/crop.svg b/Documentation/media/uapi/v4l/crop.svg<br/>new file mode 100644<br/>index 000000000000..dc9a471bae6b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/crop.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/crop.svg</a></div><div class='hunk'>@@ -0,0 +1,281 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   width="208.59436mm"</div><div class='add'>+   height="95.859146mm"</div><div class='add'>+   viewBox="0 0 739.11388 339.6584"</div><div class='add'>+   sodipodi:docname="crop.svg"&gt;&lt;metadata</div><div class='add'>+     id="metadata8"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title /&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;defs</div><div class='add'>+     id="defs6"&gt;&lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath44"&gt;&lt;path</div><div class='add'>+         d="m 0,0 0,1895 4118,0 L 4118,0 0,0 Z m 3051.62,250.48 8.19,17.01 -46.93,23.31 29.61,-25.515 -38.12,8.505 47.25,-23.31 z m -1559.25,800.73 -8.5,-17.01 46.93,-23.31 -29.29,25.2 37.8,-8.19 -46.94,23.31 z"</div><div class='add'>+         id="path46"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="clip-rule:evenodd" /&gt;&lt;/clipPath&gt;&lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath64"&gt;&lt;path</div><div class='add'>+         d="m 0,0 0,1895 4118,0 0,-1626 -1,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -1,0 0,-1 1,0 0,-1 1,0 0,-1 2,0 0,-1 1,0 0,-1 1,0 0,-1 1,0 0,-1 1,0 0,-1 1,0 0,-1 2,0 0,-1 1,0 0,-1 1,0 0,-1 1,0 0,-1 1,0 0,-1 1,0 0,-1 1,0 0,-1 2,0 0,-1 1,0 0,-1 1,0 0,-1 1,0 0,-1 1,0 0,-1 1,0 0,-1 -4,0 0,1 -5,0 0,1 -4,0 0,1 -5,0 0,1 -4,0 0,1 -4,0 0,1 -4,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 1,0 0,3 1,0 0,2 1,0 0,2 1,0 L 4118,0 0,0 Z m 4074,272 0,-1 1,0 0,1 -1,0 z m -1486,743 0,-1 1,0 0,1 -1,0 z m -2,1 0,-1 1,0 0,1 -1,0 0,1 -1,0 0,1 -1,0 0,1 -1,0 0,1 -1,0 0,1 -1,0 0,1 -2,0 0,1 -1,0 0,1 -1,0 0,1 -1,0 0,1 -1,0 0,1 -1,0 0,1 -2,0 0,1 -1,0 0,1 -1,0 0,1 -1,0 0,1 -1,0 0,1 -1,0 0,1 -2,0 0,1 -1,0 0,2 2,0 0,-1 4,0 0,-1 5,0 0,-1 4,0 0,-1 5,0 0,-1 5,0 0,-1 4,0 0,-1 3,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -3,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,1 -2,0 0,-2 -1,0 0,-2 -1,0 0,-2 -1,0 0,-2 -1,0 0,-2 -1,0 0,-2 -1,0 0,-2 -1,0 0,-2 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 0,-1 2,0 z"</div><div class='add'>+         id="path66"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="clip-rule:evenodd" /&gt;&lt;/clipPath&gt;&lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath84"&gt;&lt;path</div><div class='add'>+         d="m 0,0 0,1895 4118,0 0,-136 -3,0 0,-1 -11,0 0,-1 -11,0 0,-1 -11,0 0,-1 -11,0 0,-1 5,0 0,-1 6,0 0,-1 7,0 0,-1 6,0 0,-1 6,0 0,-1 4,0 0,-1 -1,0 0,-1 -3,0 0,-1 -3,0 0,-1 -2,0 0,-1 -3,0 0,-1 -3,0 0,-1 -3,0 0,-1 -3,0 0,-1 -3,0 0,-1 -3,0 0,-1 -3,0 0,-1 7,0 0,1 11,0 0,1 11,0 0,1 11,0 0,1 3,0 L 4118,0 0,0 Z m 2552,1599 0,-1 2,0 0,1 11,0 0,1 11,0 0,1 11,0 0,1 11,0 0,1 -4,0 0,1 -7,0 0,1 -6,0 0,1 -7,0 0,1 -6,0 0,1 -3,0 0,1 2,0 0,1 2,0 0,1 3,0 0,1 3,0 0,1 3,0 0,1 3,0 0,1 3,0 0,1 2,0 0,1 3,0 0,1 3,0 0,1 3,0 0,1 -7,0 0,-1 -12,0 0,-1 -11,0 0,-1 -11,0 0,-1 -4,0 0,-1 1,0 0,-12 1,0 0,-4 z"</div><div class='add'>+         id="path86"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="clip-rule:evenodd" /&gt;&lt;/clipPath&gt;&lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath104"&gt;&lt;path</div><div class='add'>+         d="m 0,0 0,1895 4118,0 L 4118,0 0,0 Z m 3056.98,1740.43 -1.58,18.9 -52.6,-4.72 38.74,-6.3 -36.85,-12.6 52.29,4.72 z m -1570.28,-123.79 1.58,-18.9 52.6,4.72 -38.43,5.99 36.54,12.91 -52.29,-4.72 z"</div><div class='add'>+         id="path106"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="clip-rule:evenodd" /&gt;&lt;/clipPath&gt;&lt;/defs&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview4"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:zoom="0.99625351"</div><div class='add'>+     inkscape:cx="-73.227122"</div><div class='add'>+     inkscape:cy="114.17568"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="g10"</div><div class='add'>+     units="mm"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0" /&gt;&lt;g</div><div class='add'>+     id="g10"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     inkscape:label="crop"</div><div class='add'>+     transform="matrix(1.25,0,0,-1.25,-0.35237428,339.91141)"&gt;&lt;path</div><div class='add'>+       d="m 411.08474,0.37218832 0,271.38551168 -37.17867,0 0,-1.94649 -205.3611,1.94649 0,-2.58046 -155.911966,0 0,-1.90192 17.977663,-264.3219406 -17.977663,0 0,-2.58119108 193.135216,0 0,2.58119108 -137.934309,0 0,264.3219406 333.650679,0 0,-264.3219406 -177.10547,0 0,-1.947197 149.52695,0 0,-0.63399408"</div><div class='add'>+       style="fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path16"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 411.08474,0.37218832 0,271.38551168 -37.17867,0 0,-1.94649 -205.3611,1.94649 0,-2.58046 -155.911966,0 0,-1.90192 17.977663,-264.3219406 -17.977663,0 0,-2.58119108 193.135216,0 0,2.58119108 -137.934309,0 0,264.3219406 333.650679,0 0,-264.3219406 -177.10547,0 0,-1.947197 149.52695,0 0,-0.63399408 37.17867,0 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.33962813;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path18"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 40.256106,6.8024838 366.979524,0 0,253.4078762 -366.979524,0 0,-253.4078762 z"</div><div class='add'>+       style="fill:none;stroke:#ff0000;stroke-width:0.33962813;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path20"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 77.434066,7.4364707 316.352284,0 0,244.4416893 -316.352284,0 0,-244.4416893 z"</div><div class='add'>+       style="fill:none;stroke:#0000ff;stroke-width:0.33962813;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path22"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 214.41669,149.49157 152.83195,0 0,81.51075 -152.83195,0 0,-81.51075 z"</div><div class='add'>+       style="fill:none;stroke:#00b000;stroke-width:0.33962813;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path24"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 438.57126,37.414285 152.83194,0 0,213.966445 -152.83194,0 0,-213.966445 z"</div><div class='add'>+       style="fill:none;stroke:#d100d1;stroke-width:0.33962813;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path26"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 0.45168907,271.7577 168.09328093,0 0,-2.58046 -155.911966,0 0,-1.90192 17.977663,0 0,-264.3219406 -17.977663,0 0,-2.58119108 -12.18131493,0"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path28"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 0.45168907,271.7577 168.09328093,0 0,-2.58046 -155.911966,0 0,-1.90192 17.977663,0 0,-264.3219406 -17.977663,0 0,-2.58119108 -12.18131493,0 0,271.38551168 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.33962813;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path30"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 373.90607,0.37218832 0,0.63399408 -149.52695,0 0,1.947197 -18.6109,0 0,-2.58119108"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path32"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 373.90607,0.37218832 0,0.63399408 -149.52695,0 0,1.947197 -18.6109,0 0,-2.58119108 168.13785,0 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.33962813;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path34"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 205.76822,271.7577 168.13785,0 0,-1.94649 -149.52695,0 0,-2.53589 -18.6109,0"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path36"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 205.76822,271.7577 168.13785,0 0,-1.94649 -149.52695,0 0,-2.53589 -18.6109,0 0,4.48238 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.33962813;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path38"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;g</div><div class='add'>+       id="g40"</div><div class='add'>+       transform="matrix(0.14375794,0,0,0.14375794,-0.12334269,-0.08856738)"&gt;&lt;g</div><div class='add'>+         clip-path="url(#clipPath44)"</div><div class='add'>+         id="g42"&gt;&lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           id="path48"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           d="M 1492.37,1040.5 3051.62,260.875" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       id="g50"</div><div class='add'>+       transform="matrix(0.14375794,0,0,0.14375794,-0.12334269,-0.08856738)"&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path52"</div><div class='add'>+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+         d="m 1539.31,1027.9 -37.8,8.19 29.29,-25.2 8.51,17.01" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path54"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:4.7249999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 1539.31,1027.9 -37.8,8.19 29.29,-25.2 8.51,17.01 z" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path56"</div><div class='add'>+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+         d="m 3004.37,273.79 38.12,-8.505 -29.61,25.515 -8.51,-17.01" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path58"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:4.7249999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 3004.37,273.79 38.12,-8.505 -29.61,25.515 -8.51,-17.01 z" /&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       id="g60"</div><div class='add'>+       transform="matrix(0.14375794,0,0,0.14375794,-0.12334269,-0.08856738)"&gt;&lt;g</div><div class='add'>+         clip-path="url(#clipPath64)"</div><div class='add'>+         id="g62"&gt;&lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           id="path68"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           d="M 2555.5,1040.5 4114.75,260.875" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       id="g70"</div><div class='add'>+       transform="matrix(0.14375794,0,0,0.14375794,-0.12334269,-0.08856738)"&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path72"</div><div class='add'>+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+         d="m 2602.43,1027.9 -37.8,8.19 29.3,-25.2 8.5,17.01" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path74"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:4.7249999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 2602.43,1027.9 -37.8,8.19 29.3,-25.2 8.5,17.01 z" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path76"</div><div class='add'>+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+         d="m 4067.5,273.79 38.11,-8.505 -29.61,25.515 -8.5,-17.01" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path78"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:4.7249999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 4067.5,273.79 38.11,-8.505 -29.61,25.515 -8.5,-17.01 z" /&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       id="g80"</div><div class='add'>+       transform="matrix(0.14375794,0,0,0.14375794,-0.12334269,-0.08856738)"&gt;&lt;g</div><div class='add'>+         clip-path="url(#clipPath84)"</div><div class='add'>+         id="g82"&gt;&lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           id="path88"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           d="m 2555.5,1607.5 1559.25,141.75" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       id="g90"</div><div class='add'>+       transform="matrix(0.14375794,0,0,0.14375794,-0.12334269,-0.08856738)"&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path92"</div><div class='add'>+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+         d="m 2602.12,1621.36 -36.54,-12.91 38.43,-5.99 -1.89,18.9" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path94"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:4.7249999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 2602.12,1621.36 -36.54,-12.91 38.43,-5.99 -1.89,18.9 z" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path96"</div><div class='add'>+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+         d="m 4067.81,1735.71 36.86,12.6 -38.75,6.3 1.89,-18.9" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path98"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:4.7249999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 4067.81,1735.71 36.86,12.6 -38.75,6.3 1.89,-18.9 z" /&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       id="g100"</div><div class='add'>+       transform="matrix(0.14375794,0,0,0.14375794,-0.12334269,-0.08856738)"&gt;&lt;g</div><div class='add'>+         clip-path="url(#clipPath104)"</div><div class='add'>+         id="g102"&gt;&lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           id="path108"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           d="m 1492.37,1607.5 1559.25,141.75" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;path</div><div class='add'>+       d="m 221.11869,232.99481 -5.25292,-1.85592 5.52462,-0.86111 -0.2717,2.71703"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path112"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 221.11869,232.99481 -5.25292,-1.85592 5.52462,-0.86111 -0.2717,2.71703 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.67925626;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path114"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 431.8247,249.43353 5.29748,1.81135 -5.56918,0.90567 0.2717,-2.71702"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path116"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 431.8247,249.43353 5.29748,1.81135 -5.56918,0.90567 0.2717,-2.71702 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.67925626;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path118"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;g</div><div class='add'>+       id="g120"</div><div class='add'>+       transform="matrix(1.4375794,0,0,1.4375794,-0.12334269,-0.08856738)"&gt;&lt;text</div><div class='add'>+         transform="matrix(1,0,0,-1,204.52,9.07751)"</div><div class='add'>+         style="font-variant:normal;font-weight:normal;font-size:6.61499977px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#d10000;fill-opacity:1;fill-rule:nonzero;stroke:none"</div><div class='add'>+         id="text122"&gt;&lt;tspan</div><div class='add'>+           x="0 3.3074999 6.9854398 8.45397 12.13191 15.80985 19.11735 21.320145 24.998085 28.676025 31.983524 35.661465 39.339405 41.178375 44.856316 48.534256 52.212196 55.890137 59.568073"</div><div class='add'>+           y="0"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan124"&gt;v4l2_cropcap.bounds&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;g</div><div class='add'>+       id="g126"</div><div class='add'>+       transform="matrix(1.4375794,0,0,1.4375794,-0.12334269,-0.08856738)"&gt;&lt;text</div><div class='add'>+         transform="matrix(1,0,0,-1,58.5175,166.42)"</div><div class='add'>+         style="font-variant:normal;font-weight:normal;font-size:6.61499977px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#0000d1;fill-opacity:1;fill-rule:nonzero;stroke:none"</div><div class='add'>+         id="text128"&gt;&lt;tspan</div><div class='add'>+           x="0 3.3074999 6.9854398 8.45397 12.13191 15.80985 19.11735 21.320145 24.998085 28.676025 31.983524 35.661465 39.339405 41.178375 44.856316 48.534256 50.373226 52.576019 56.25396 59.561459"</div><div class='add'>+           y="0"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan130"&gt;v4l2_cropcap.defrect&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;g</div><div class='add'>+       id="g132"</div><div class='add'>+       transform="matrix(1.4375794,0,0,1.4375794,-0.12334269,-0.08856738)"&gt;&lt;text</div><div class='add'>+         transform="matrix(1,0,0,-1,153.49,152.245)"</div><div class='add'>+         style="font-variant:normal;font-weight:normal;font-size:6.61499977px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#008f00;fill-opacity:1;fill-rule:nonzero;stroke:none"</div><div class='add'>+         id="text134"&gt;&lt;tspan</div><div class='add'>+           x="0 3.3074999 6.9854398 8.45397 12.13191 15.80985 19.11735 21.320145 24.998085 28.676025 30.514996"</div><div class='add'>+           y="0"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan136"&gt;v4l2_crop.c&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;g</div><div class='add'>+       id="g138"</div><div class='add'>+       transform="matrix(1.4375794,0,0,1.4375794,-0.12334269,-0.08856738)"&gt;&lt;text</div><div class='add'>+         transform="matrix(1,0,0,-1,309.415,30.34)"</div><div class='add'>+         style="font-variant:normal;font-weight:normal;font-size:6.61499977px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#b000b0;fill-opacity:1;fill-rule:nonzero;stroke:none"</div><div class='add'>+         id="text140"&gt;&lt;tspan</div><div class='add'>+           x="0 3.3074999 6.9854398 8.45397 12.13191 15.80985 17.648821 21.326759 23.529554 29.03985 32.717789"</div><div class='add'>+           y="0"</div><div class='add'>+           sodipodi:role="line"</div><div class='add'>+           id="tspan142"&gt;v4l2_format&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:32px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"</div><div class='add'>+       x="-99.291145"</div><div class='add'>+       y="-239.49893"</div><div class='add'>+       id="text3396"</div><div class='add'>+       sodipodi:linespacing="125%"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3398"</div><div class='add'>+         x="-99.291145"</div><div class='add'>+         y="-239.49893"&gt;&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         x="-99.291145"</div><div class='add'>+         y="-199.49893"</div><div class='add'>+         id="tspan3400" /&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/crop_files/crop.gif b/Documentation/media/uapi/v4l/crop_files/crop.gif<br/>deleted file mode 100644<br/>index 3b9e7d836d4b..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/crop_files/crop.gif?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/crop_files/crop.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/crop_files/crop.pdf b/Documentation/media/uapi/v4l/crop_files/crop.pdf<br/>deleted file mode 100644<br/>index c9fb81cd32f3..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/crop_files/crop.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/crop_files/crop.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-codec.rst b/Documentation/media/uapi/v4l/dev-codec.rst<br/>index d9f218449ddd..c61e938bd8dc 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-codec.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-codec.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-codec.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-codec.rst</a></div><div class='hunk'>@@ -26,7 +26,7 @@ parameters</div><div class='ctx'>    The MPEG controls actually support many more codecs than</div><div class='ctx'>    just MPEG. See :ref:`mpeg-controls`.</div><div class='ctx'> </div><div class='del'>-Memory-to-memory devices can often be used as a shared resource: you can</div><div class='add'>+Memory-to-memory devices function as a shared resource: you can</div><div class='ctx'> open the video node multiple times, each application setting up their</div><div class='ctx'> own codec properties that are local to the file handle, and each can use</div><div class='ctx'> it independently from the others. The driver will arbitrate access to</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi.rst b/Documentation/media/uapi/v4l/dev-raw-vbi.rst<br/>index b82d837e4ff1..baf5f2483927 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-raw-vbi.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-raw-vbi.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-raw-vbi.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-raw-vbi.rst</a></div><div class='hunk'>@@ -221,8 +221,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT &lt;VIDIOC_G_FMT&gt;` does</div><div class='ctx'> </div><div class='ctx'> .. _vbi-hsync:</div><div class='ctx'> </div><div class='del'>-.. figure::  dev-raw-vbi_files/vbi_hsync.*</div><div class='del'>-    :alt:    vbi_hsync.pdf / vbi_hsync.gif</div><div class='add'>+.. figure::  vbi_hsync.*</div><div class='add'>+    :alt:    vbi_hsync.pdf / vbi_hsync.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     **Figure 4.1. Line synchronization**</div><div class='hunk'>@@ -230,8 +230,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT &lt;VIDIOC_G_FMT&gt;` does</div><div class='ctx'> </div><div class='ctx'> .. _vbi-525:</div><div class='ctx'> </div><div class='del'>-.. figure::  dev-raw-vbi_files/vbi_525.*</div><div class='del'>-    :alt:    vbi_525.pdf / vbi_525.gif</div><div class='add'>+.. figure::  vbi_525.*</div><div class='add'>+    :alt:    vbi_525.pdf / vbi_525.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     **Figure 4.2. ITU-R 525 line numbering (M/NTSC and M/PAL)**</div><div class='hunk'>@@ -240,8 +240,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT &lt;VIDIOC_G_FMT&gt;` does</div><div class='ctx'> </div><div class='ctx'> .. _vbi-625:</div><div class='ctx'> </div><div class='del'>-.. figure::  dev-raw-vbi_files/vbi_625.*</div><div class='del'>-    :alt:    vbi_625.pdf / vbi_625.gif</div><div class='add'>+.. figure::  vbi_625.*</div><div class='add'>+    :alt:    vbi_625.pdf / vbi_625.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     **Figure 4.3. ITU-R 625 line numbering**</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif<br/>deleted file mode 100644<br/>index 5580b690d504..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf<br/>deleted file mode 100644<br/>index 0bae28385dfa..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif<br/>deleted file mode 100644<br/>index 34e3251983c4..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf<br/>deleted file mode 100644<br/>index bf29b95dcd08..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif<br/>deleted file mode 100644<br/>index b02434d3b356..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf<br/>deleted file mode 100644<br/>index 200b668189bf..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-subdev.rst b/Documentation/media/uapi/v4l/dev-subdev.rst<br/>index fb4d0d45b216..cd2870180208 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-subdev.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-subdev.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-subdev.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/dev-subdev.rst</a></div><div class='hunk'>@@ -99,8 +99,8 @@ the video sensor and the host image processing hardware.</div><div class='ctx'> </div><div class='ctx'> .. _pipeline-scaling:</div><div class='ctx'> </div><div class='del'>-.. figure::  dev-subdev_files/pipeline.*</div><div class='del'>-    :alt:    pipeline.pdf / pipeline.png</div><div class='add'>+.. figure::  pipeline.*</div><div class='add'>+    :alt:    pipeline.pdf / pipeline.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     Image Format Negotiation on Pipelines</div><div class='hunk'>@@ -404,8 +404,8 @@ selection will refer to the sink pad format dimensions instead.</div><div class='ctx'> </div><div class='ctx'> .. _subdev-image-processing-crop:</div><div class='ctx'> </div><div class='del'>-.. figure::  dev-subdev_files/subdev-image-processing-crop.*</div><div class='del'>-    :alt:    subdev-image-processing-crop.svg</div><div class='add'>+.. figure::  subdev-image-processing-crop.*</div><div class='add'>+    :alt:    subdev-image-processing-crop.pdf / subdev-image-processing-crop.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     **Figure 4.5. Image processing in subdevs: simple crop example**</div><div class='hunk'>@@ -421,8 +421,8 @@ pad.</div><div class='ctx'> </div><div class='ctx'> .. _subdev-image-processing-scaling-multi-source:</div><div class='ctx'> </div><div class='del'>-.. figure::  dev-subdev_files/subdev-image-processing-scaling-multi-source.*</div><div class='del'>-    :alt:    subdev-image-processing-scaling-multi-source.svg</div><div class='add'>+.. figure::  subdev-image-processing-scaling-multi-source.*</div><div class='add'>+    :alt:    subdev-image-processing-scaling-multi-source.pdf / subdev-image-processing-scaling-multi-source.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     **Figure 4.6. Image processing in subdevs: scaling with multiple sources**</div><div class='hunk'>@@ -437,8 +437,8 @@ an area at location specified by the source crop rectangle from it.</div><div class='ctx'> </div><div class='ctx'> .. _subdev-image-processing-full:</div><div class='ctx'> </div><div class='del'>-.. figure::  dev-subdev_files/subdev-image-processing-full.*</div><div class='del'>-    :alt:    subdev-image-processing-full.svg</div><div class='add'>+.. figure::  subdev-image-processing-full.*</div><div class='add'>+    :alt:    subdev-image-processing-full.pdf / subdev-image-processing-full.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     **Figure 4.7. Image processing in subdevs: scaling and composition with multiple sinks and sources**</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf<br/>deleted file mode 100644<br/>index ee3e37f04b6a..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png b/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png<br/>deleted file mode 100644<br/>index f19b86c2c24d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf<br/>deleted file mode 100644<br/>index 29a806f839b4..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg<br/>deleted file mode 100644<br/>index 18b0f5de9ed2..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='del'>-&lt;!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/PR-SVG-20010719/DTD/svg10.dtd"&gt;</div><div class='del'>-&lt;svg width="43cm" height="10cm" viewBox="-194 128 844 196" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"&gt;</div><div class='del'>-  &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x="-8" y="130" width="469.774" height="193"/&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="4.5" y="189" width="159" height="104"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a52a2a" x="4.5" y="189" width="159" height="104"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="63.5" y="211" width="94" height="77"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #0000ff" x="63.5" y="211" width="94" height="77"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #0000ff;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="74.5" y="227.75"&gt;</div><div class='del'>-    &lt;tspan x="74.5" y="227.75"&gt;sink&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="74.5" y="243.75"&gt;crop&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="74.5" y="259.75"&gt;selection&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="29.5" y="158"&gt;</div><div class='del'>-    &lt;tspan x="29.5" y="158"&gt;&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;text style="fill: #a52a2a;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="8.53836" y="157.914"&gt;</div><div class='del'>-    &lt;tspan x="8.53836" y="157.914"&gt;sink media&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="8.53836" y="173.914"&gt;bus format&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;text style="fill: #8b6914;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="349.774" y="155"&gt;</div><div class='del'>-    &lt;tspan x="349.774" y="155"&gt;source media&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="349.774" y="171"&gt;bus format&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="350.488" y="190.834" width="93.2863" height="75.166"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #8b6914" x="350.488" y="190.834" width="93.2863" height="75.166"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="350.488" y1="266" x2="63.5" y2="288"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="350.488" y1="190.834" x2="63.5" y2="211"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="443.774" y1="266" x2="157.5" y2="288"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="443.774" y1="190.834" x2="157.5" y2="211"/&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;ellipse style="fill: #ffffff" cx="473.1" cy="219.984" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="473.1" cy="219.984" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="473.1" cy="219.984" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x1="481.6" y1="219.984" x2="637.934" y2="220.012"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #000000" points="645.434,220.014 635.433,225.012 637.934,220.012 635.435,215.012 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" points="645.434,220.014 635.433,225.012 637.934,220.012 635.435,215.012 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="506.908" y="209.8"&gt;</div><div class='del'>-    &lt;tspan x="506.908" y="209.8"&gt;pad 1 (source)&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;ellipse style="fill: #ffffff" cx="-20.3982" cy="241.512" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="-20.3982" cy="241.512" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="-20.3982" cy="241.512" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x1="-192.398" y1="241.8" x2="-38.6343" y2="241.529"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #000000" points="-31.1343,241.516 -41.1254,246.534 -38.6343,241.529 -41.1431,236.534 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" points="-31.1343,241.516 -41.1254,246.534 -38.6343,241.529 -41.1431,236.534 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="-147.858" y="229.8"&gt;</div><div class='del'>-    &lt;tspan x="-147.858" y="229.8"&gt;pad 0 (sink)&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf<br/>deleted file mode 100644<br/>index b78a8e8f6b35..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg<br/>deleted file mode 100644<br/>index 3322cf4c0093..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,163 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='del'>-&lt;!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/PR-SVG-20010719/DTD/svg10.dtd"&gt;</div><div class='del'>-&lt;svg width="59cm" height="18cm" viewBox="-186 71 1178 346" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="318.9" y="129" width="208.1" height="249"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #ff765a" x="318.9" y="129" width="208.1" height="249"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x="-2" y="73" width="806" height="343"/&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;ellipse style="fill: #ffffff" cx="-12.5" cy="166.712" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="-12.5" cy="166.712" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="-12.5" cy="166.712" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;ellipse style="fill: #ffffff" cx="815.232" cy="205.184" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="815.232" cy="205.184" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="815.232" cy="205.184" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x1="-184.5" y1="167" x2="-30.7361" y2="166.729"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #000000" points="-23.2361,166.716 -33.2272,171.734 -30.7361,166.729 -33.2449,161.734 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" points="-23.2361,166.716 -33.2272,171.734 -30.7361,166.729 -33.2449,161.734 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x1="823.732" y1="205.184" x2="980.066" y2="205.212"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #000000" points="987.566,205.214 977.565,210.212 980.066,205.212 977.567,200.212 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" points="987.566,205.214 977.565,210.212 980.066,205.212 977.567,200.212 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="-139.96" y="155"&gt;</div><div class='del'>-    &lt;tspan x="-139.96" y="155"&gt;pad 0 (sink)&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="849.04" y="195"&gt;</div><div class='del'>-    &lt;tspan x="849.04" y="195"&gt;pad 2 (source)&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="5.5" y="120" width="159" height="104"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a52a2a" x="5.5" y="120" width="159" height="104"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="62.5" y="136" width="94" height="77"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #0000ff" x="62.5" y="136" width="94" height="77"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="30.5" y="89"&gt;</div><div class='del'>-    &lt;tspan x="30.5" y="89"&gt;&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;text style="fill: #a52a2a;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="9.53836" y="88.9138"&gt;</div><div class='del'>-    &lt;tspan x="9.53836" y="88.9138"&gt;sink media&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="9.53836" y="104.914"&gt;bus format&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="333.644" y="185.65" width="165.2" height="172.478"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #00ff00" x="333.644" y="185.65" width="165.2" height="172.478"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="333.644" y1="358.128" x2="62.5" y2="213"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="333.644" y1="185.65" x2="62.5" y2="136"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="498.844" y1="358.128" x2="156.5" y2="213"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="498.844" y1="185.65" x2="156.5" y2="136"/&gt;</div><div class='del'>-  &lt;text style="fill: #00ff00;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="334.704" y="149.442"&gt;</div><div class='del'>-    &lt;tspan x="334.704" y="149.442"&gt;sink compose&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="334.704" y="165.442"&gt;selection (scaling)&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="409.322" y="194.565" width="100.186" height="71.4523"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" x="409.322" y="194.565" width="100.186" height="71.4523"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #8b6914;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="689.5" y="105.128"&gt;</div><div class='del'>-    &lt;tspan x="689.5" y="105.128"&gt;source media&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="689.5" y="121.128"&gt;bus format&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="688.488" y="173.834" width="100.186" height="71.4523"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #8b6914" x="688.488" y="173.834" width="100.186" height="71.4523"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="688.488" y1="245.286" x2="409.322" y2="266.018"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="688.488" y1="173.834" x2="409.322" y2="194.565"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="788.674" y1="245.286" x2="509.508" y2="266.018"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="788.674" y1="173.834" x2="509.508" y2="194.565"/&gt;</div><div class='del'>-  &lt;text style="fill: #ff765a;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="325" y="103"&gt;</div><div class='del'>-    &lt;tspan x="325" y="103"&gt;sink compose&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="325" y="119"&gt;bounds selection&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;ellipse style="fill: #ffffff" cx="-12.0982" cy="341.512" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="-12.0982" cy="341.512" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="-12.0982" cy="341.512" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x1="-184.098" y1="341.8" x2="-30.3343" y2="341.529"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #000000" points="-22.8343,341.516 -32.8254,346.534 -30.3343,341.529 -32.8431,336.534 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" points="-22.8343,341.516 -32.8254,346.534 -30.3343,341.529 -32.8431,336.534 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="-139" y="329"&gt;</div><div class='del'>-    &lt;tspan x="-139" y="329"&gt;pad 1 (sink)&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="7.80824" y="292.8" width="112.092" height="82.2"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a52a2a" x="7.80824" y="292.8" width="112.092" height="82.2"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="52.9" y="314.8" width="58.1" height="50.2"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #0000ff" x="52.9" y="314.8" width="58.1" height="50.2"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="31.9" y="259.8"&gt;</div><div class='del'>-    &lt;tspan x="31.9" y="259.8"&gt;&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="358.9" y1="251.9" x2="52.9" y2="314.8"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="358.9" y1="316" x2="52.9" y2="365"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="434" y1="316" x2="111" y2="365"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="434" y1="251.9" x2="111" y2="314.8"/&gt;</div><div class='del'>-  &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #00ff00" x="358.9" y="251.9" width="75.1" height="64.1"/&gt;</div><div class='del'>-  &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" x="443.262" y="284.466" width="64.738" height="48.534"/&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="693.428" y="324.734" width="63.572" height="49.266"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #8b6914" x="693.428" y="324.734" width="63.572" height="49.266"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="693.428" y1="374" x2="443.262" y2="333"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="693.428" y1="324.734" x2="443.262" y2="284.466"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="757" y1="374" x2="508" y2="333"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="757" y1="324.734" x2="508" y2="284.466"/&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;ellipse style="fill: #ffffff" cx="815.44" cy="343.984" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="815.44" cy="343.984" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="815.44" cy="343.984" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x1="823.94" y1="343.984" x2="980.274" y2="344.012"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #000000" points="987.774,344.014 977.773,349.012 980.274,344.012 977.775,339.012 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" points="987.774,344.014 977.773,349.012 980.274,344.012 977.775,339.012 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="849.248" y="333.8"&gt;</div><div class='del'>-    &lt;tspan x="849.248" y="333.8"&gt;pad 3 (source)&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;text style="fill: #0000ff;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="197" y="91"&gt;</div><div class='del'>-    &lt;tspan x="197" y="91"&gt;sink&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="197" y="107"&gt;crop&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="197" y="123"&gt;selection&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;text style="fill: #a020f0;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="553" y="95"&gt;</div><div class='del'>-    &lt;tspan x="553" y="95"&gt;source&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="553" y="111"&gt;crop&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="553" y="127"&gt;selection&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #0000ff" x1="211" y1="132" x2="166.21" y2="135.287"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #0000ff" points="158.73,135.836 168.337,130.118 166.21,135.287 169.069,140.091 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #0000ff" points="158.73,135.836 168.337,130.118 166.21,135.287 169.069,140.091 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #0000ff" x1="209" y1="131" x2="115.581" y2="306.209"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #0000ff" points="112.052,312.827 112.345,301.65 115.581,306.209 121.169,306.355 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #0000ff" points="112.052,312.827 112.345,301.65 115.581,306.209 121.169,306.355 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" x1="550.492" y1="133.214" x2="514.916" y2="186.469"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #a020f0" points="510.75,192.706 512.147,181.613 514.916,186.469 520.463,187.168 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" points="510.75,192.706 512.147,181.613 514.916,186.469 520.463,187.168 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" x1="550.072" y1="133.787" x2="510.618" y2="275.089"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #a020f0" points="508.601,282.312 506.475,271.336 510.618,275.089 516.106,274.025 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" points="508.601,282.312 506.475,271.336 510.618,275.089 516.106,274.025 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf<br/>deleted file mode 100644<br/>index 8f7a95b6eb4d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg<br/>deleted file mode 100644<br/>index 2340c0f8bc92..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,116 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='del'>-&lt;!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/PR-SVG-20010719/DTD/svg10.dtd"&gt;</div><div class='del'>-&lt;svg width="59cm" height="17cm" viewBox="-194 128 1179 330" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"&gt;</div><div class='del'>-  &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x="-8" y="130" width="806" height="327"/&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="4.5" y="189" width="159" height="104"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a52a2a" x="4.5" y="189" width="159" height="104"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="49.5" y="204" width="94" height="77"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #0000ff" x="49.5" y="204" width="94" height="77"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #0000ff;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="60" y="224"&gt;</div><div class='del'>-    &lt;tspan x="60" y="224"&gt;sink&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="60" y="240"&gt;crop&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="60" y="256"&gt;selection&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="29.5" y="158"&gt;</div><div class='del'>-    &lt;tspan x="29.5" y="158"&gt;&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;text style="fill: #a52a2a;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="8.53836" y="157.914"&gt;</div><div class='del'>-    &lt;tspan x="8.53836" y="157.914"&gt;sink media&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="8.53836" y="173.914"&gt;bus format&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="333.644" y="185.65" width="165.2" height="172.478"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #00ff00" x="333.644" y="185.65" width="165.2" height="172.478"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="333.644" y1="358.128" x2="49.5" y2="281"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="333.644" y1="185.65" x2="49.5" y2="204"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="498.844" y1="358.128" x2="143.5" y2="281"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="498.844" y1="185.65" x2="143.5" y2="204"/&gt;</div><div class='del'>-  &lt;text style="fill: #00ff00;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="334.704" y="149.442"&gt;</div><div class='del'>-    &lt;tspan x="334.704" y="149.442"&gt;sink compose&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="334.704" y="165.442"&gt;selection (scaling)&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="382.322" y="199.565" width="100.186" height="71.4523"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" x="382.322" y="199.565" width="100.186" height="71.4523"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #a020f0;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="543.322" y="149.442"&gt;</div><div class='del'>-    &lt;tspan x="543.322" y="149.442"&gt;source&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="543.322" y="165.442"&gt;crop&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="543.322" y="181.442"&gt;selection&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;text style="fill: #8b6914;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="691.5" y="157.128"&gt;</div><div class='del'>-    &lt;tspan x="691.5" y="157.128"&gt;source media&lt;/tspan&gt;</div><div class='del'>-    &lt;tspan x="691.5" y="173.128"&gt;bus format&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="690.488" y="225.834" width="100.186" height="71.4523"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #8b6914" x="690.488" y="225.834" width="100.186" height="71.4523"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="690.488" y1="297.286" x2="382.322" y2="271.018"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="690.488" y1="225.834" x2="382.322" y2="199.565"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="790.674" y1="297.286" x2="482.508" y2="271.018"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="790.674" y1="225.834" x2="482.508" y2="199.565"/&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;ellipse style="fill: #ffffff" cx="808.1" cy="249.984" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="808.1" cy="249.984" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="808.1" cy="249.984" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x1="816.6" y1="249.984" x2="972.934" y2="250.012"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #000000" points="980.434,250.014 970.433,255.012 972.934,250.012 970.435,245.012 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" points="980.434,250.014 970.433,255.012 972.934,250.012 970.435,245.012 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="841.908" y="239.8"&gt;</div><div class='del'>-    &lt;tspan x="841.908" y="239.8"&gt;pad 1 (source)&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;ellipse style="fill: #ffffff" cx="-20.3982" cy="241.512" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="-20.3982" cy="241.512" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="-20.3982" cy="241.512" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x1="-192.398" y1="241.8" x2="-38.6343" y2="241.529"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #000000" points="-31.1343,241.516 -41.1254,246.534 -38.6343,241.529 -41.1431,236.534 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" points="-31.1343,241.516 -41.1254,246.534 -38.6343,241.529 -41.1431,236.534 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="-147.858" y="229.8"&gt;</div><div class='del'>-    &lt;tspan x="-147.858" y="229.8"&gt;pad 0 (sink)&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" x="389.822" y="276.666" width="100.186" height="71.4523"/&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;rect style="fill: #ffffff" x="689.988" y="345.934" width="100.186" height="71.4523"/&gt;</div><div class='del'>-    &lt;rect style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #8b6914" x="689.988" y="345.934" width="100.186" height="71.4523"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="689.988" y1="417.386" x2="389.822" y2="348.118"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="689.988" y1="345.934" x2="389.822" y2="276.666"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="790.174" y1="417.386" x2="490.008" y2="348.118"/&gt;</div><div class='del'>-  &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke-dasharray: 4; stroke: #e60505" x1="790.174" y1="345.934" x2="490.008" y2="276.666"/&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;ellipse style="fill: #ffffff" cx="805.6" cy="384.084" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="805.6" cy="384.084" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-    &lt;ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="805.6" cy="384.084" rx="8.5" ry="8.5"/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" x1="814.1" y1="384.084" x2="970.434" y2="384.112"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #000000" points="977.934,384.114 967.933,389.112 970.434,384.112 967.935,379.112 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" points="977.934,384.114 967.933,389.112 970.434,384.112 967.935,379.112 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;text style="fill: #000000;text-anchor:start;font-size:12.8;font-family:sanserif;font-style:normal;font-weight:normal" x="839.408" y="373.9"&gt;</div><div class='del'>-    &lt;tspan x="839.408" y="373.9"&gt;pad 2 (source)&lt;/tspan&gt;</div><div class='del'>-  &lt;/text&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" x1="546" y1="191" x2="492.157" y2="198.263"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #a020f0" points="484.724,199.266 493.966,192.974 492.157,198.263 495.303,202.884 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" points="484.724,199.266 493.966,192.974 492.157,198.263 495.303,202.884 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-  &lt;g&gt;</div><div class='del'>-    &lt;line style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" x1="546.908" y1="190.725" x2="495.383" y2="268.548"/&gt;</div><div class='del'>-    &lt;polygon style="fill: #a020f0" points="491.242,274.802 492.594,263.703 495.383,268.548 500.932,269.224 "/&gt;</div><div class='del'>-    &lt;polygon style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #a020f0" points="491.242,274.802 492.594,263.703 495.383,268.548 500.932,269.224 "/&gt;</div><div class='del'>-  &lt;/g&gt;</div><div class='del'>-&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/diff-v4l.rst b/Documentation/media/uapi/v4l/diff-v4l.rst<br/>index 76b2ecab8657..8209eeb63dd2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/diff-v4l.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/diff-v4l.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/diff-v4l.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/diff-v4l.rst</a></div><div class='hunk'>@@ -648,12 +648,12 @@ microcode programming. A new interface for MPEG compression and playback</div><div class='ctx'> devices is documented in :ref:`extended-controls`.</div><div class='ctx'> </div><div class='ctx'> .. [#f1]</div><div class='del'>-   According to Documentation/devices.txt these should be symbolic links</div><div class='add'>+   According to Documentation/admin-guide/devices.rst these should be symbolic links</div><div class='ctx'>    to ``/dev/video0``. Note the original bttv interface is not</div><div class='ctx'>    compatible with V4L or V4L2.</div><div class='ctx'> </div><div class='ctx'> .. [#f2]</div><div class='del'>-   According to ``Documentation/devices.txt`` a symbolic link to</div><div class='add'>+   According to ``Documentation/admin-guide/devices.rst`` a symbolic link to</div><div class='ctx'>    ``/dev/radio0``.</div><div class='ctx'> </div><div class='ctx'> .. [#f3]</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/extended-controls.rst b/Documentation/media/uapi/v4l/extended-controls.rst<br/>index 7725c33d8b69..abb105724c05 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/extended-controls.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/extended-controls.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/extended-controls.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/extended-controls.rst</a></div><div class='hunk'>@@ -2846,7 +2846,7 @@ JPEG Control IDs</div><div class='ctx'>     input image is sampled, in respect to maximum sample rate in each</div><div class='ctx'>     spatial dimension. See :ref:`itu-t81`, clause A.1.1. for more</div><div class='ctx'>     details. The ``V4L2_CID_JPEG_CHROMA_SUBSAMPLING`` control determines</div><div class='del'>-    how Cb and Cr components are downsampled after coverting an input</div><div class='add'>+    how Cb and Cr components are downsampled after converting an input</div><div class='ctx'>     image from RGB to Y'CbCr color space.</div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{7.0cm}|p{10.5cm}|</div><div class='hunk'>@@ -3017,6 +3017,10 @@ Image Process Control IDs</div><div class='ctx'>     test pattern images. These hardware specific test patterns can be</div><div class='ctx'>     used to test if a device is working properly.</div><div class='ctx'> </div><div class='add'>+``V4L2_CID_DEINTERLACING_MODE (menu)``</div><div class='add'>+    The video deinterlacing mode (such as Bob, Weave, ...). The menu items are</div><div class='add'>+    driver specific and are documented in :ref:`v4l-drivers`.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> .. _dv-controls:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/v4l/field-order.rst b/Documentation/media/uapi/v4l/field-order.rst<br/>index 50779a67c3fd..e05fb1041363 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/field-order.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/field-order.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/field-order.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/field-order.rst</a></div><div class='hunk'>@@ -141,8 +141,8 @@ enum v4l2_field</div><div class='ctx'> Field Order, Top Field First Transmitted</div><div class='ctx'> ========================================</div><div class='ctx'> </div><div class='del'>-.. figure::  field-order_files/fieldseq_tb.*</div><div class='del'>-    :alt:    fieldseq_tb.pdf / fieldseq_tb.gif</div><div class='add'>+.. figure::  fieldseq_tb.*</div><div class='add'>+    :alt:    fieldseq_tb.pdf / fieldseq_tb.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +151,7 @@ Field Order, Top Field First Transmitted</div><div class='ctx'> Field Order, Bottom Field First Transmitted</div><div class='ctx'> ===========================================</div><div class='ctx'> </div><div class='del'>-.. figure::  field-order_files/fieldseq_bt.*</div><div class='del'>-    :alt:    fieldseq_bt.pdf / fieldseq_bt.gif</div><div class='add'>+.. figure::  fieldseq_bt.*</div><div class='add'>+    :alt:    fieldseq_bt.pdf / fieldseq_bt.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif<br/>deleted file mode 100644<br/>index 60e8569a76c9..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf<br/>deleted file mode 100644<br/>index 26598b23f80d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif<br/>deleted file mode 100644<br/>index 718492f1cfc7..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf<br/>deleted file mode 100644<br/>index 4965b22ddb3a..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/fieldseq_bt.svg b/Documentation/media/uapi/v4l/fieldseq_bt.svg<br/>new file mode 100644<br/>index 000000000000..b195301771ce<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/fieldseq_bt.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/fieldseq_bt.svg</a></div><div class='hunk'>@@ -0,0 +1,2613 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   id="svg3619"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   width="198.48296mm"</div><div class='add'>+   height="211.89406mm"</div><div class='add'>+   viewBox="0 0 703.28606 750.80571"</div><div class='add'>+   sodipodi:docname="fieldseq_bt.svg"&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview3621"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     units="mm"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0"</div><div class='add'>+     inkscape:zoom="1.0721815"</div><div class='add'>+     inkscape:cx="8.4175633"</div><div class='add'>+     inkscape:cy="371.67214"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="g3627" /&gt;&lt;metadata</div><div class='add'>+     id="metadata3625"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title /&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;defs</div><div class='add'>+     id="defs3623"&gt;&lt;clipPath</div><div class='add'>+       id="clipPath4301"</div><div class='add'>+       clipPathUnits="userSpaceOnUse"&gt;&lt;path</div><div class='add'>+         style="clip-rule:evenodd"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path4303"</div><div class='add'>+         d="M 0,6040 0,0 l 5650,0 0,6040 -5650,0 z m 4786.76,-99.89 103.92,0 0,56.69 -103.92,0 0,0 85.03,-28.35 -85.03,-28.34 z" /&gt;&lt;/clipPath&gt;&lt;/defs&gt;&lt;g</div><div class='add'>+     transform="matrix(1.25,0,0,-1.25,-1.0537,751.94632)"</div><div class='add'>+     inkscape:label="fieldseq_bt"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="g3627"&gt;&lt;path</div><div class='add'>+       d="m 188.622,346.001 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3631"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 375.693,346.001 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3633"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 282.157,346.001 93.5355,0 0,42.516 -93.5355,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3635"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 469.228,346.001 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3637"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 95.0867,346.001 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3639"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1.55156,346.001 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3641"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 95.0867,482.052 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3643"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 469.228,482.052 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3645"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1.55156,414.027 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3647"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 188.622,414.027 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3649"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 375.693,414.027 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3651"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 469.228,214.201 93.5352,0 0,76.5289 -93.5352,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3653"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,579.839 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3655"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,579.839 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3657"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,571.336 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3659"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,571.336 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3661"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,562.832 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3663"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,562.832 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3665"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,554.329 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3667"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,554.329 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3669"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,575.587 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3671"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,575.587 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3673"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,567.084 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3675"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,567.084 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3677"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,558.581 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3679"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,558.581 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3681"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,550.078 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3683"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,550.078 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3685"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 282.157,482.052 93.5355,0 0,42.516 -93.5355,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3687"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,222.704 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3689"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,222.704 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3691"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,231.207 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3693"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,231.207 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3695"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,226.956 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3697"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,226.956 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3699"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,239.711 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3701"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,239.711 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3703"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,235.459 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3705"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,235.459 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3707"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,248.214 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3709"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,248.214 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3711"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,243.962 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3713"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,243.962 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3715"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,256.717 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3717"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,256.717 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3719"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,252.466 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3721"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,252.466 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3723"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,265.22 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3725"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,265.22 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3727"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,260.969 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3729"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,260.969 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3731"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,273.723 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3733"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,273.723 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3735"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,269.472 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3737"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,269.472 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3739"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,277.975 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3741"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,277.975 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3743"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,218.453 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3745"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,218.453 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3747"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,282.227 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3749"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,282.227 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3751"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,380.014 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3753"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,380.014 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3755"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,371.511 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3757"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,371.511 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3759"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,363.007 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3761"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,363.007 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3763"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,354.504 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3765"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,354.504 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3767"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,375.762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3769"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,375.762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3771"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,367.259 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3773"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,367.259 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3775"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,358.755 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3777"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,358.755 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3779"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,350.252 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3781"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,350.252 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3783"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,375.762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3785"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,375.762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3787"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,367.259 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3789"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,367.259 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3791"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,358.755 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3793"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,358.755 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3795"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,350.252 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3797"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,350.252 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3799"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,380.014 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3801"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,380.014 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3803"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,371.511 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3805"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,371.511 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3807"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,363.007 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3809"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,363.007 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3811"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,354.504 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3813"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,354.504 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3815"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,363.007 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3817"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,363.007 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3819"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,371.511 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3821"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,371.511 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3823"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,354.504 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3825"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,354.504 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3827"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,375.762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3829"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,375.762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3831"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,367.259 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3833"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,367.259 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3835"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,358.755 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3837"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,358.755 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3839"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,350.252 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3841"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,350.252 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3843"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,380.014 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3845"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,380.014 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3847"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,380.014 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3849"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,380.014 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3851"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,371.511 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3853"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,371.511 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3855"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,363.007 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3857"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,363.007 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3859"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,354.504 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3861"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,354.504 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3863"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,358.755 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3865"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,358.755 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3867"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,350.252 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3869"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,350.252 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3871"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,367.259 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3873"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,367.259 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3875"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,375.762 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3877"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,375.762 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3879"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,380.014 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3881"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,380.014 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3883"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,371.511 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3885"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,371.511 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3887"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,363.007 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3889"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,363.007 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3891"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,354.504 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3893"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,354.504 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3895"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,375.762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3897"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,375.762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3899"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,367.259 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3901"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,367.259 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3903"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,358.755 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3905"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,358.755 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3907"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,350.252 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3909"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,350.252 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3911"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,375.762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3913"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,375.762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3915"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,367.259 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3917"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,367.259 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3919"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,358.755 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3921"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,358.755 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3923"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,350.252 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3925"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,350.252 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3927"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,380.014 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3929"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,380.014 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3931"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,371.511 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3933"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,371.511 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3935"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,363.007 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3937"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,363.007 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3939"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,354.504 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3941"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,354.504 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3943"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,448.039 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3945"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,448.039 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3947"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,439.536 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3949"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,439.536 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3951"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,431.033 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3953"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,431.033 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3955"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,422.53 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3957"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,422.53 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3959"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,443.788 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3961"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,443.788 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3963"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,435.284 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3965"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,435.284 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3967"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,426.781 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3969"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,426.781 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3971"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,418.278 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3973"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,418.278 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3975"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,431.033 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3977"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,431.033 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3979"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,439.536 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3981"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,439.536 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3983"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,422.53 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3985"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,422.53 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3987"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,443.788 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3989"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,443.788 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3991"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,435.284 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3993"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,435.284 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3995"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,426.781 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path3997"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,426.781 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path3999"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,418.278 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4001"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,418.278 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4003"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,448.039 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4005"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,448.039 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4007"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,448.039 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4009"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,448.039 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4011"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,439.536 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4013"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,439.536 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4015"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,431.033 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4017"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,431.033 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4019"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,422.53 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4021"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,422.53 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4023"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,443.788 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4025"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,443.788 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4027"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,435.284 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4029"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,435.284 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4031"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,426.781 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4033"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,426.781 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4035"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,418.278 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4037"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,418.278 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4039"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,511.813 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4041"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,511.813 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4043"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,503.31 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4045"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,503.31 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4047"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,494.807 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4049"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,494.807 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4051"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,486.304 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4053"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,486.304 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4055"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,516.065 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4057"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,516.065 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4059"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,507.562 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4061"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,507.562 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4063"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,499.059 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4065"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,499.059 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4067"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,490.555 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4069"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,490.555 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4071"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,516.065 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4073"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,516.065 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4075"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,507.562 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4077"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,507.562 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4079"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,499.059 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4081"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,499.059 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4083"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,490.555 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4085"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,490.555 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4087"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,494.807 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4089"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,494.807 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4091"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,486.304 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4093"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,486.304 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4095"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,503.31 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4097"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,503.31 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4099"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,511.813 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4101"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,511.813 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4103"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,511.813 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4105"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,511.813 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4107"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,503.31 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4109"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,503.31 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4111"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,494.807 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4113"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,494.807 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4115"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,486.304 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4117"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,486.304 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4119"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,516.065 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4121"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,516.065 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4123"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,507.562 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4125"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,507.562 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4127"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,499.059 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4129"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,499.059 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4131"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,490.555 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4133"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,490.555 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4135"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,575.587 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4137"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,575.587 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4139"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,567.084 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4141"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,567.084 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4143"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,558.581 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4145"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,558.581 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4147"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,550.078 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4149"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,550.078 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4151"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,579.839 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4153"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,579.839 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4155"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,571.336 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4157"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,571.336 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4159"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,562.832 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4161"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,562.832 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4163"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,554.329 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4165"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,554.329 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4167"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,579.839 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4169"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,579.839 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4171"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,571.336 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4173"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,571.336 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4175"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,562.832 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4177"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,562.832 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4179"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,554.329 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4181"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,554.329 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4183"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,558.581 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4185"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,558.581 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4187"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,550.078 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4189"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,550.078 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4191"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,567.084 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4193"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,567.084 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4195"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,575.587 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4197"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,575.587 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4199"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,562.832 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4201"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,562.832 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4203"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,571.336 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4205"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,571.336 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4207"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,554.329 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4209"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,554.329 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4211"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,575.587 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4213"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,575.587 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4215"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,567.084 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4217"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,567.084 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4219"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,558.581 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4221"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,558.581 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4223"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,550.078 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4225"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,550.078 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4227"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,579.839 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4229"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,579.839 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4231"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,575.587 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4233"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,575.587 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4235"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,567.084 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4237"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,567.084 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4239"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,558.581 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4241"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,558.581 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4243"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,550.078 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4245"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,550.078 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4247"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,579.839 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4249"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,579.839 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4251"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,571.336 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4253"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,571.336 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4255"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,562.832 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4257"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,562.832 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4259"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,554.329 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4261"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,554.329 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4263"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,579.839 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4265"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,579.839 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4267"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,571.336 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4269"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,571.336 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4271"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,562.832 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4273"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,562.832 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4275"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,554.329 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4277"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,554.329 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4279"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,575.587 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4281"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,575.587 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4283"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,567.084 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4285"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,567.084 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4287"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,558.581 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4289"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,558.581 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4291"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,550.078 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4293"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,550.078 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4295"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;g</div><div class='add'>+       transform="scale(0.1,0.1)"</div><div class='add'>+       id="g4297"</div><div class='add'>+       style=""&gt;&lt;g</div><div class='add'>+         id="g4299"</div><div class='add'>+         clip-path="url(#clipPath4301)"</div><div class='add'>+         style=""&gt;&lt;path</div><div class='add'>+           d="m 3778.18,5968.45 1105.42,0"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:14.17199993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           id="path4305"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;path</div><div class='add'>+       d="m 478.676,594.011 8.503,2.834 -8.503,2.835 0,-5.669"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4307"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 478.676,594.011 8.503,2.834 -8.503,2.835 0,-5.669 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4309"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 95.0867,1.62109 93.5352,0 0,76.5289 -93.5352,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4311"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 282.157,1.62109 93.5355,0 0,76.5289 -93.5355,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4313"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 469.228,1.62109 93.5352,0 0,76.5289 -93.5352,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4315"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,10.1242 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4317"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,10.1242 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4319"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,18.6277 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4321"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,18.6277 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4323"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,27.1309 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4325"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,27.1309 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4327"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,35.634 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4329"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,35.634 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4331"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,5.87266 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4333"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,5.87266 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4335"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,14.3762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4337"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,14.3762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4339"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,22.8793 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4341"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,22.8793 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4343"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,31.3824 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4345"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,31.3824 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4347"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,10.1242 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4349"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,10.1242 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4351"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,18.6277 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4353"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,18.6277 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4355"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,27.1309 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4357"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,27.1309 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4359"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,35.634 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4361"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,35.634 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4363"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,5.87266 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4365"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,5.87266 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4367"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,14.3762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4369"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,14.3762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4371"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,22.8793 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4373"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,22.8793 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4375"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,31.3824 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4377"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,31.3824 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4379"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,69.6469 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4381"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,69.6469 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4383"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,65.3953 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4385"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,65.3953 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4387"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,61.1438 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4389"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,61.1438 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4391"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,56.8922 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4393"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,56.8922 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4395"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,52.6402 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4397"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,52.6402 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4399"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,48.3887 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4401"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,48.3887 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4403"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,44.1371 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4405"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,44.1371 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4407"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,5.87266 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4409"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,5.87266 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4411"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,10.1242 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4413"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,10.1242 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4415"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,14.3762 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4417"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,14.3762 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4419"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,18.6277 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4421"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,18.6277 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4423"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,22.8793 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4425"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,22.8793 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4427"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,27.1309 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4429"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,27.1309 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4431"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,31.3824 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4433"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,31.3824 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4435"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,39.8855 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4437"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,39.8855 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4439"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,35.634 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4441"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,35.634 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4443"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,39.8855 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4445"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,39.8855 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4447"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,48.3887 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4449"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,48.3887 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4451"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,56.8922 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4453"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,56.8922 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4455"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,65.3953 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4457"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,65.3953 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4459"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,44.1371 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4461"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,44.1371 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4463"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,52.6402 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4465"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,52.6402 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4467"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,61.1438 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4469"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,61.1438 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4471"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,69.6469 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4473"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,69.6469 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4475"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,39.8855 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4477"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,39.8855 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4479"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,48.3887 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4481"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,48.3887 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4483"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,56.8922 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4485"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,56.8922 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4487"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,65.3953 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4489"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,65.3953 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4491"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,44.1371 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4493"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,44.1371 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4495"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,52.6402 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4497"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,52.6402 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4499"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,61.1438 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4501"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,61.1438 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4503"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,69.6469 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4505"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,69.6469 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4507"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,116.414 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4509"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,116.414 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4511"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,112.163 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4513"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,112.163 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4515"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 188.622,107.911 93.5352,0 0,76.5285 -93.5352,0 0,-76.5285 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4517"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,116.414 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4519"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,116.414 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4521"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,112.163 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4523"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,112.163 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4525"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 375.693,107.911 93.5352,0 0,76.5285 -93.5352,0 0,-76.5285 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4527"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,116.414 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4529"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,116.414 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4531"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,112.163 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4533"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,112.163 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4535"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1.55156,107.911 93.5352,0 0,76.5285 -93.5352,0 0,-76.5285 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4537"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,175.937 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4539"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,175.937 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4541"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,167.434 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4543"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,167.434 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4545"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,158.93 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4547"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,158.93 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4549"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,150.427 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4551"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,150.427 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4553"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,141.924 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4555"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,141.924 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4557"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,133.421 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4559"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,133.421 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4561"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,124.918 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4563"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,124.918 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4565"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,171.685 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4567"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,171.685 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4569"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,163.182 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4571"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,163.182 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4573"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,154.679 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4575"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,154.679 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4577"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,146.176 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4579"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,146.176 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4581"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,137.672 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4583"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,137.672 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4585"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,129.169 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4587"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,129.169 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4589"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,120.666 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4591"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,120.666 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4593"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,175.937 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4595"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,175.937 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4597"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,167.434 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4599"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,167.434 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4601"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,158.93 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4603"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,158.93 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4605"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,150.427 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4607"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,150.427 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4609"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,141.924 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4611"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,141.924 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4613"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,133.421 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4615"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,133.421 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4617"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,124.918 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4619"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,124.918 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4621"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,171.685 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4623"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,171.685 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4625"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,163.182 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4627"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,163.182 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4629"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,154.679 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4631"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,154.679 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4633"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,146.176 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4635"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,146.176 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4637"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,137.672 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4639"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,137.672 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4641"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,129.169 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4643"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,129.169 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4645"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,120.666 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4647"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,120.666 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4649"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,175.937 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4651"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,175.937 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4653"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,167.434 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4655"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,167.434 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4657"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,158.93 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4659"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,158.93 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4661"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,150.427 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4663"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,150.427 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4665"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,141.924 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4667"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,141.924 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4669"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,133.421 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4671"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,133.421 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4673"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,124.918 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4675"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,124.918 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4677"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,171.685 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4679"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,171.685 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4681"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,163.182 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4683"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,163.182 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4685"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,154.679 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4687"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,154.679 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4689"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,146.176 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4691"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,146.176 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4693"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,137.672 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4695"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,137.672 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4697"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,129.169 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4699"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,129.169 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4701"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,120.666 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4703"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,120.666 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4705"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 95.0867,214.201 93.5352,0 0,76.5289 -93.5352,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4707"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,222.704 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4709"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,222.704 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4711"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,231.207 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4713"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,231.207 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4715"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,226.956 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4717"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,226.956 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4719"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,239.711 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4721"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,239.711 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4723"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,235.459 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4725"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,235.459 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4727"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,248.214 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4729"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,248.214 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4731"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,243.962 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4733"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,243.962 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4735"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,256.717 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4737"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,256.717 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4739"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,252.466 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4741"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,252.466 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4743"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,265.22 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4745"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,265.22 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4747"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,260.969 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4749"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,260.969 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4751"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,273.723 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4753"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,273.723 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4755"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,269.472 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4757"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,269.472 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4759"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,277.975 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4761"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,277.975 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4763"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,218.453 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4765"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,218.453 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4767"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,282.227 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4769"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,282.227 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4771"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 282.157,214.201 93.5355,0 0,76.5289 -93.5355,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4773"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,277.975 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4775"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,277.975 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4777"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,282.227 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4779"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,282.227 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4781"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,273.723 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4783"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,273.723 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4785"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,248.214 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4787"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,248.214 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4789"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,239.711 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4791"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,239.711 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4793"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,231.207 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4795"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,231.207 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4797"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,222.704 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4799"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,222.704 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4801"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,269.472 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4803"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,269.472 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4805"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,256.717 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4807"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,256.717 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4809"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,265.22 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4811"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,265.22 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4813"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,260.969 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4815"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,260.969 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4817"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,252.466 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4819"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,252.466 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4821"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,243.962 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4823"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,243.962 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4825"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,235.459 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4827"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,235.459 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4829"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,226.956 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4831"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,226.956 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4833"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,218.453 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path4835"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,218.453 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path4837"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;text</div><div class='add'>+       y="-533.07098"</div><div class='add'>+       x="5.8031301"</div><div class='add'>+       id="text4841"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan4843"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-533.07098"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 88.500237 97.835464"&gt;V4L2_FIELD_TOP&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan4845"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-465.04559"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 98.507408 105.83879 113.17018 122.5054"&gt;V4L2_FIELD_BOTTOM&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan4847"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-397.0202"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 95.843628 103.17502 111.17835 119.84163 128.5049 136.50824 143.83963"&gt;V4L2_FIELD_ALTERNATE&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-316.23969"</div><div class='add'>+       x="103.58983"</div><div class='add'>+       id="text4849"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:8.2495203px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan4851"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-316.23969"</div><div class='add'>+         x="103.58983 109.09226 113.67899 118.26572 122.85246 127.43919 132.47964 134.77301 140.27545 144.86218 150.81833 155.40506 160.44553 166.86365 188.62184 194.12427 198.711 203.29774 207.88448 212.47121 217.51166 219.80502 225.30746 229.8942 235.85034 240.43707 245.9395 252.35764 257.3981 262.43854 268.85669 375.69293 381.19534 385.78207 390.3688 394.95554 399.54227 404.58273 406.8761 412.37854 416.96527 422.92142 427.50815 433.01059 439.42871 444.46918 449.50961 455.92776 1.551828 7.0542617 11.640993 16.227724 20.814463 25.401194 30.441652 32.735016 38.237442 42.824177 48.780331 53.367065 58.869492 65.287621 70.328079 75.368538 81.786659"&gt;V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOM&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan4853"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-328.99481"</div><div class='add'>+         x="10.054964 14.17972 18.766451 20.597849 25.18458 29.771311 34.358047 38.944778 41.238144 43.531509 48.118244 50.865334 53.158699 55.452068 57.283459 61.870193 63.701588 68.288322"&gt;v4l2_buffer.field:&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-592.59381"</div><div class='add'>+       x="5.8034"</div><div class='add'>+       id="text4855"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan4857"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-592.59381"</div><div class='add'>+         x="5.8034 13.134789 19.806232 29.801399 36.472843 43.144287 47.139954 53.811398 56.475174 59.810898 66.482346 70.478004 77.149452 83.820892 87.816566 91.152283 94.488007 101.15945 107.83089 111.16662 114.50233 121.17377 131.16895 134.50468 137.84041 140.50418 147.17563 149.8394 156.51085 159.84657 163.1823 165.84607 169.84174 175.84123 179.17696 182.51268 185.8484 189.84407 196.51552 203.18695 209.18646 219.18163 221.8454 225.18112 228.51685 235.18829 241.85973 245.19545 249.19112 255.86256 259.19827 265.86972 269.20544 272.54117 282.53635 285.87207 294.53534 301.86673 309.87006 318.53336"&gt;Temporal order, bottom field first transmitted (e.g. M/NTSC)&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-316.23981"</div><div class='add'>+       x="290.6604"</div><div class='add'>+       id="text4859"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:8.2495203px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan4861"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-316.23981"</div><div class='add'>+         x="290.6604 296.16284 300.74957 305.3363 309.92303 314.50977 319.55023 321.8436 327.34601 331.93274 337.88889 342.47565 347.51608 353.9342 477.73062 483.23306 487.81979 492.40652 496.99326 501.57999 506.62045 508.91382 514.41626 519.00299 524.95911 529.5459 534.5863 541.00446"&gt;V4L2_FIELD_TOPV4L2_FIELD_TOP&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-299.23349"</div><div class='add'>+       x="5.8034"</div><div class='add'>+       id="text4863"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan4865"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-299.23349"</div><div class='add'>+         x="5.8034 13.806733 20.478176 27.149622 33.821064 40.492508 47.823895 51.159618 59.162952 65.834396 74.497673 81.169121 84.504837 93.168114 100.4995 108.50284 117.16611 123.83755 131.8409 140.50418 148.50751 157.17079 160.50652 163.84224 167.17796 175.18129 181.85274 188.52419 195.19562 201.86707 209.19846 212.53418 220.53751 227.20895 235.87224 242.54367 245.87939 254.54268 261.87405 269.87741 278.54068 285.21213 293.21545 301.87872 309.88205 318.54535 325.2168 333.22012"&gt;V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_BT&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan4867"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-192.9435"</div><div class='add'>+         x="1.5518398 9.5551729 16.226616 22.898062 29.569506 36.240948 43.572334 46.908058 54.911392 61.582836 70.246117 76.917557 80.253281 88.916557 96.247948 104.25128 112.91456 119.586 127.58932 136.25262 144.25595 152.91924 159.59067 166.92206 174.9254 178.26112 182.25679 192.25195 194.91573 200.91524 207.58667 210.25046 212.91423 219.58568 226.25713 232.92856 239.60001"&gt;V4L2_FIELD_INTERLACED_TB (misaligned)&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan4869"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-86.653496"</div><div class='add'>+         x="5.8034 13.806733 20.478176 27.149622 33.821064 40.492508 47.823895 51.159618 59.162952 65.834396 74.497673 81.169121 89.172447 97.175781 106.511 113.18245 121.18579"&gt;V4L2_FIELD_SEQ_BT&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-533.07098"</div><div class='add'>+       x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 88.500237 97.835464"</div><div class='add'>+       id="text4592"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan4594"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-533.07098"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 88.500237 97.835464"&gt;V4L2_FIELD_TOP&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-465.04559"</div><div class='add'>+       x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 98.507408 105.83879 113.17018 122.5054"</div><div class='add'>+       id="text4596"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan4598"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-465.04559"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 98.507408 105.83879 113.17018 122.5054"&gt;V4L2_FIELD_BOTTOM&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-397.0202"</div><div class='add'>+       x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 95.843628 103.17502 111.17835 119.84163 128.5049 136.50824 143.83963"</div><div class='add'>+       id="text4600"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan4602"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-397.0202"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 95.843628 103.17502 111.17835 119.84163 128.5049 136.50824 143.83963"&gt;V4L2_FIELD_ALTERNATE&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-299.23349"</div><div class='add'>+       x="5.8034 13.806733 20.478176 27.149622 33.821064 40.492508 47.823895 51.159618 59.162952 65.834396 74.497673 81.169121 84.504837 93.168114 100.4995 108.50284 117.16611 123.83755 131.8409 140.50418 148.50751 157.17079 160.50652 163.84224 167.17796 175.18129 181.85274 188.52419 195.19562 201.86707 209.19846 212.53418 220.53751 227.20895 235.87224 242.54367 245.87939 254.54268 261.87405 269.87741 278.54068 285.21213 293.21545 301.87872 309.88205 318.54535 325.2168 333.22012"</div><div class='add'>+       id="text5862"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan5864"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-299.23349"</div><div class='add'>+         x="5.8034 13.806733 20.478176 27.149622 33.821064 40.492508 47.823895 51.159618 59.162952 65.834396 74.497673 81.169121 84.504837 93.168114 100.4995 108.50284 117.16611 123.83755 131.8409 140.50418 148.50751 157.17079 160.50652 163.84224 167.17796 175.18129 181.85274 188.52419 195.19562 201.86707 209.19846 212.53418 220.53751 227.20895 235.87224 242.54367 245.87939 254.54268 261.87405 269.87741 278.54068 285.21213 293.21545 301.87872 309.88205 318.54535 325.2168 333.22012"&gt;V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_BT&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-192.9435"</div><div class='add'>+       x="1.5518398 9.5551729 16.226616 22.898062 29.569506 36.240948 43.572334 46.908058 54.911392 61.582836 70.246117 76.917557 80.253281 88.916557 96.247948 104.25128 112.91456 119.586 127.58932 136.25262 144.25595 152.91924 159.59067 166.92206 174.9254 178.26112 182.25679 192.25195 194.91573 200.91524 207.58667 210.25046 212.91423 219.58568 226.25713 232.92856 239.60001"</div><div class='add'>+       id="text5866"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan5868"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-192.9435"</div><div class='add'>+         x="1.5518398 9.5551729 16.226616 22.898062 29.569506 36.240948 43.572334 46.908058 54.911392 61.582836 70.246117 76.917557 80.253281 88.916557 96.247948 104.25128 112.91456 119.586 127.58932 136.25262 144.25595 152.91924 159.59067 166.92206 174.9254 178.26112 182.25679 192.25195 194.91573 200.91524 207.58667 210.25046 212.91423 219.58568 226.25713 232.92856 239.60001"&gt;V4L2_FIELD_INTERLACED_TB (misaligned)&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-86.653496"</div><div class='add'>+       x="5.8034 13.806733 20.478176 27.149622 33.821064 40.492508 47.823895 51.159618 59.162952 65.834396 74.497673 81.169121 89.172447 97.175781 106.511 113.18245 121.18579"</div><div class='add'>+       id="text5870"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan5872"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-86.653496"</div><div class='add'>+         x="5.8034 13.806733 20.478176 27.149622 33.821064 40.492508 47.823895 51.159618 59.162952 65.834396 74.497673 81.169121 89.172447 97.175781 106.511 113.18245 121.18579"&gt;V4L2_FIELD_SEQ_BT&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-316.23969"</div><div class='add'>+       x="103.58983 109.09226 113.67899 118.26572 122.85246 127.43919 132.47964 134.77301 140.27545 144.86218 150.81833 155.40506 160.44553 166.86365 188.62184 194.12427 198.711 203.29774 207.88448 212.47121 217.51166 219.80502 225.30746 229.8942 235.85034 240.43707 245.9395 252.35764 257.3981 262.43854 268.85669 375.69293 381.19534 385.78207 390.3688 394.95554 399.54227 404.58273 406.8761 412.37854 416.96527 422.92142 427.50815 433.01059 439.42871 444.46918 449.50961 455.92776 1.551828 7.0542617 11.640993 16.227724 20.814463 25.401194 30.441652 32.735016 38.237442 42.824177 48.780331 53.367065 58.869492 65.287621 70.328079 75.368538 81.786659"</div><div class='add'>+       id="text7144"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:8.2495203px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan7146"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-316.23969"</div><div class='add'>+         x="103.58983 109.09226 113.67899 118.26572 122.85246 127.43919 132.47964 134.77301 140.27545 144.86218 150.81833 155.40506 160.44553 166.86365 188.62184 194.12427 198.711 203.29774 207.88448 212.47121 217.51166 219.80502 225.30746 229.8942 235.85034 240.43707 245.9395 252.35764 257.3981 262.43854 268.85669 375.69293 381.19534 385.78207 390.3688 394.95554 399.54227 404.58273 406.8761 412.37854 416.96527 422.92142 427.50815 433.01059 439.42871 444.46918 449.50961 455.92776 1.551828 7.0542617 11.640993 16.227724 20.814463 25.401194 30.441652 32.735016 38.237442 42.824177 48.780331 53.367065 58.869492 65.287621 70.328079 75.368538 81.786659"&gt;V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOM&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-328.99481"</div><div class='add'>+       x="10.054964 14.17972 18.766451 20.597849 25.18458 29.771311 34.358047 38.944778 41.238144 43.531509 48.118244 50.865334 53.158699 55.452068 57.283459 61.870193 63.701588 68.288322"</div><div class='add'>+       id="text7148"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:8.2495203px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan7150"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-328.99481"</div><div class='add'>+         x="10.054964 14.17972 18.766451 20.597849 25.18458 29.771311 34.358047 38.944778 41.238144 43.531509 48.118244 50.865334 53.158699 55.452068 57.283459 61.870193 63.701588 68.288322"&gt;v4l2_buffer.field:&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/svg&gt;
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/fieldseq_tb.svg b/Documentation/media/uapi/v4l/fieldseq_tb.svg<br/>new file mode 100644<br/>index 000000000000..6a7b10ad4ab8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/fieldseq_tb.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/fieldseq_tb.svg</a></div><div class='hunk'>@@ -0,0 +1,2607 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   id="svg5543"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   width="198.48296mm"</div><div class='add'>+   height="210.39415mm"</div><div class='add'>+   viewBox="0 0 703.28607 745.49109"</div><div class='add'>+   sodipodi:docname="fieldseq_tb.svg"&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview5545"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0"</div><div class='add'>+     units="mm"</div><div class='add'>+     inkscape:zoom="1.0733333"</div><div class='add'>+     inkscape:cx="9.8391479"</div><div class='add'>+     inkscape:cy="370.19322"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="g5551" /&gt;&lt;metadata</div><div class='add'>+     id="metadata5549"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title /&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;defs</div><div class='add'>+     id="defs5547"&gt;&lt;clipPath</div><div class='add'>+       id="clipPath6753"</div><div class='add'>+       clipPathUnits="userSpaceOnUse"&gt;&lt;path</div><div class='add'>+         style="clip-rule:evenodd"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path6755"</div><div class='add'>+         d="M 0,6000 0,0 l 5660,0 0,6000 -5660,0 z m 4786.76,-102.89 103.92,0 0,56.69 -103.92,0 0,0 85.03,-28.35 -85.03,-28.34 z" /&gt;&lt;/clipPath&gt;&lt;/defs&gt;&lt;g</div><div class='add'>+     transform="matrix(1.25,0,0,-1.25,-1.0537,746.57119)"</div><div class='add'>+     inkscape:label="fieldseq_tb"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="g5551"&gt;&lt;path</div><div class='add'>+       d="m 379.944,571.287 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5555"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,571.287 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5557"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,562.784 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5559"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,562.784 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5561"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,554.281 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5563"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,554.281 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5565"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,545.778 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5567"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,545.778 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5569"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,575.539 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5571"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,575.539 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5573"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,567.036 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5575"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,567.036 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5577"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,558.532 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5579"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,558.532 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5581"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,550.029 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5583"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,550.029 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5585"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,575.539 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5587"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,575.539 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5589"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,567.036 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5591"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,567.036 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5593"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,558.532 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5595"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,558.532 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5597"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,550.029 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5599"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,550.029 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5601"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,571.287 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5603"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,571.287 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5605"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,562.784 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5607"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,562.784 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5609"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,554.281 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5611"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,554.281 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5613"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,545.778 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5615"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,545.778 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5617"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,507.513 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5619"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,507.513 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5621"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,499.01 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5623"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,499.01 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5625"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,490.507 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5627"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,490.507 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5629"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,482.004 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5631"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,482.004 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5633"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,511.765 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5635"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,511.765 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5637"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,503.262 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5639"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,503.262 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5641"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,494.759 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5643"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,494.759 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5645"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,486.255 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5647"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,486.255 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5649"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,443.739 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5651"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,443.739 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5653"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,435.236 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5655"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,435.236 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5657"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,426.733 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5659"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,426.733 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5661"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,418.23 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5663"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,418.23 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5665"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,439.488 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5667"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,439.488 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5669"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,430.984 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5671"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,430.984 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5673"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,422.481 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5675"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,422.481 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5677"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,413.978 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5679"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,413.978 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5681"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,218.404 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5683"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,218.404 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5685"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,226.907 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5687"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,226.907 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5689"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,222.656 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5691"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,222.656 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5693"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,235.411 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5695"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,235.411 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5697"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,231.159 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5699"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,231.159 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5701"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,243.914 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5703"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,243.914 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5705"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,239.662 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5707"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,239.662 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5709"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,252.417 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5711"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,252.417 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5713"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,248.166 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5715"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,248.166 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5717"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,260.92 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5719"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,260.92 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5721"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,256.669 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5723"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,256.669 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5725"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,269.423 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5727"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,269.423 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5729"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,265.172 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5731"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,265.172 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5733"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,273.675 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5735"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,273.675 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5737"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,214.153 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5739"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,214.153 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5741"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,277.927 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5743"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,277.927 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5745"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,218.404 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5747"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,218.404 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5749"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,226.907 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5751"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,226.907 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5753"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,222.656 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5755"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,222.656 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5757"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,235.411 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5759"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,235.411 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5761"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,231.159 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5763"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,231.159 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5765"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,243.914 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5767"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,243.914 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5769"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,239.662 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5771"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,239.662 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5773"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,252.417 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5775"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,252.417 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5777"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,248.166 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5779"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,248.166 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5781"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,260.92 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5783"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,260.92 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5785"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,256.669 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5787"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,256.669 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5789"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,269.423 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5791"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,269.423 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5793"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,265.172 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5795"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,265.172 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5797"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,273.675 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5799"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,273.675 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5801"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,214.153 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5803"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,214.153 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5805"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,277.927 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5807"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,277.927 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5809"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,375.714 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5811"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,375.714 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5813"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,367.211 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5815"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,367.211 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5817"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,358.707 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5819"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,358.707 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5821"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,350.204 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5823"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,350.204 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5825"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,371.462 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5827"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,371.462 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5829"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,362.959 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5831"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,362.959 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5833"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,354.455 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5835"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,354.455 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5837"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,345.952 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5839"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,345.952 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5841"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,371.462 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5843"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,371.462 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5845"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,362.959 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5847"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,362.959 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5849"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,354.455 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5851"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,354.455 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5853"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,345.952 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5855"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,345.952 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5857"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,375.714 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5859"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,375.714 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5861"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,367.211 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5863"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,367.211 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5865"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,358.707 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5867"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,358.707 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5869"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,350.204 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5871"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,350.204 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5873"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,35.5855 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5875"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,35.5855 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5877"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,27.0824 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5879"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,27.0824 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5881"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,18.5793 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5883"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,18.5793 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5885"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,10.0762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5887"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,10.0762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5889"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,31.334 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5891"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,31.334 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5893"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,22.8309 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5895"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,22.8309 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5897"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,14.3277 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5899"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,14.3277 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5901"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,5.82422 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5903"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,5.82422 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5905"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,35.5855 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5907"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,35.5855 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5909"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,27.0824 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5911"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,27.0824 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5913"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,18.5793 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5915"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,18.5793 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5917"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,10.0762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5919"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,10.0762 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5921"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,31.334 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5923"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,31.334 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5925"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,22.8309 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5927"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,22.8309 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5929"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,14.3277 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5931"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,14.3277 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5933"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,5.82422 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5935"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,5.82422 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5937"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 95.0867,409.727 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5939"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 282.157,409.727 93.5355,0 0,42.516 -93.5355,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5941"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 469.228,409.727 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5943"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 469.228,209.901 93.5352,0 0,76.5289 -93.5352,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5945"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 282.157,209.901 93.5355,0 0,76.5289 -93.5355,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5947"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 95.0867,209.901 93.5352,0 0,76.5289 -93.5352,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5949"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 95.0867,341.701 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5951"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 282.157,341.701 93.5355,0 0,42.516 -93.5355,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5953"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 469.228,341.701 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5955"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1.55156,341.701 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5957"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 188.622,341.701 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5959"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 375.693,341.701 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5961"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1.55156,477.752 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5963"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 188.622,477.752 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5965"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 375.693,477.752 93.5352,0 0,42.516 -93.5352,0 0,-42.516 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5967"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,571.287 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5969"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,571.287 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5971"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,562.784 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5973"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,562.784 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5975"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,554.281 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5977"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,554.281 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5979"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,545.778 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5981"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,545.778 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5983"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,575.539 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5985"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,575.539 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5987"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,567.036 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5989"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,567.036 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5991"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,558.532 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5993"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,558.532 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5995"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,550.029 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path5997"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,550.029 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path5999"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,575.539 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6001"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,575.539 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6003"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,567.036 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6005"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,567.036 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6007"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,558.532 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6009"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,558.532 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6011"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,550.029 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6013"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,550.029 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6015"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,571.287 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6017"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,571.287 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6019"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,562.784 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6021"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,562.784 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6023"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,554.281 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6025"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,554.281 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6027"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,545.778 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6029"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,545.778 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6031"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,507.513 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6033"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,507.513 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6035"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,499.01 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6037"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,499.01 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6039"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,490.507 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6041"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,490.507 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6043"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,482.004 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6045"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,482.004 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6047"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,511.765 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6049"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,511.765 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6051"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,503.262 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6053"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,503.262 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6055"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,494.759 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6057"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,494.759 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6059"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,486.255 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6061"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,486.255 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6063"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,443.739 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6065"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,443.739 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6067"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,435.236 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6069"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,435.236 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6071"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,426.733 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6073"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,426.733 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6075"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,418.23 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6077"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,418.23 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6079"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,439.488 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6081"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,439.488 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6083"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,430.984 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6085"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,430.984 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6087"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,422.481 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6089"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,422.481 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6091"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,413.978 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6093"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,413.978 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6095"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,575.539 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6097"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,575.539 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6099"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,575.539 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6101"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,575.539 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6103"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,571.287 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6105"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,571.287 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6107"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,567.036 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6109"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,567.036 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6111"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,562.784 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6113"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,562.784 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6115"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,558.532 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6117"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,558.532 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6119"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,554.281 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6121"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,554.281 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6123"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,550.029 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6125"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,550.029 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6127"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,545.778 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6129"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,545.778 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6131"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,511.765 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6133"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,511.765 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6135"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,507.513 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6137"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,507.513 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6139"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,503.262 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6141"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,503.262 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6143"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,499.01 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6145"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,499.01 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6147"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,494.759 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6149"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,494.759 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6151"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,490.507 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6153"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,490.507 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6155"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,486.255 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6157"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,486.255 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6159"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,482.004 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6161"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,482.004 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6163"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,375.714 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6165"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,375.714 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6167"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,371.462 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6169"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,371.462 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6171"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,367.211 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6173"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,367.211 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6175"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,362.959 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6177"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,362.959 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6179"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,358.707 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6181"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,358.707 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6183"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,354.455 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6185"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,354.455 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6187"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,350.204 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6189"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,350.204 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6191"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,345.952 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6193"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,345.952 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6195"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1.55156,107.863 93.5352,0 0,76.5289 -93.5352,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6197"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 188.622,107.863 93.5352,0 0,76.5289 -93.5352,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6199"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 375.693,107.863 93.5352,0 0,76.5289 -93.5352,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6201"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 95.0867,1.57266 93.5352,0 0,76.5289 -93.5352,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6203"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 282.157,1.57266 93.5355,0 0,76.5289 -93.5355,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6205"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 469.228,1.57266 93.5352,0 0,76.5289 -93.5352,0 0,-76.5289 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.41719997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6207"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,65.3469 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6209"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,65.3469 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6211"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,56.8438 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6213"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,56.8438 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6215"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,48.3402 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6217"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,48.3402 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6219"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,39.8371 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6221"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,39.8371 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6223"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,69.5984 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6225"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,69.5984 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6227"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,61.0953 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6229"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,61.0953 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6231"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,52.5922 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6233"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,52.5922 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6235"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,44.0887 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6237"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 473.479,44.0887 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6239"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,65.3469 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6241"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,65.3469 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6243"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,56.8438 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6245"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,56.8438 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6247"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,48.3402 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6249"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,48.3402 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6251"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,39.8371 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6253"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,39.8371 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6255"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,69.5984 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6257"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,69.5984 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6259"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,61.0953 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6261"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,61.0953 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6263"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,52.5922 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6265"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,52.5922 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6267"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,44.0887 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6269"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,44.0887 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6271"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,277.927 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6273"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,277.927 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6275"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,269.423 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6277"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,269.423 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6279"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,260.92 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6281"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,260.92 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6283"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,252.417 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6285"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,252.417 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6287"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,243.914 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6289"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,243.914 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6291"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,235.411 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6293"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,235.411 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6295"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,226.907 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6297"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,226.907 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6299"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,218.404 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6301"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,218.404 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6303"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,69.5984 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6305"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,69.5984 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6307"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,65.3469 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6309"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,65.3469 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6311"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,61.0953 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6313"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,61.0953 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6315"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,56.8438 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6317"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,56.8438 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6319"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,52.5922 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6321"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,52.5922 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6323"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,48.3402 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6325"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,48.3402 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6327"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,44.0887 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6329"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,44.0887 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6331"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,39.8371 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6333"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,39.8371 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6335"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,571.287 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6337"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,571.287 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6339"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,567.036 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6341"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,567.036 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6343"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,562.784 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6345"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,562.784 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6347"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,558.532 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6349"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,558.532 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6351"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,554.281 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6353"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,554.281 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6355"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,550.029 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6357"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,550.029 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6359"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,545.778 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6361"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,545.778 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6363"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,443.739 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6365"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,443.739 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6367"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,439.488 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6369"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,439.488 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6371"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,435.236 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6373"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,435.236 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6375"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,430.984 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6377"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,430.984 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6379"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,426.733 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6381"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,426.733 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6383"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,422.481 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6385"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,422.481 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6387"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,418.23 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6389"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,418.23 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6391"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,413.978 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6393"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,413.978 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6395"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,375.714 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6397"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,375.714 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6399"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,371.462 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6401"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,371.462 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6403"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,367.211 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6405"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,367.211 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6407"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,362.959 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6409"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,362.959 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6411"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,358.707 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6413"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,358.707 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6415"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,354.455 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6417"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,354.455 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6419"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,350.204 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6421"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,350.204 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6423"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,345.952 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6425"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,345.952 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6427"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,273.675 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6429"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,273.675 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6431"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,265.172 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6433"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,265.172 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6435"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,256.669 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6437"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,256.669 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6439"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,248.166 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6441"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,248.166 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6443"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,239.662 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6445"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,239.662 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6447"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,231.159 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6449"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,231.159 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6451"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,222.656 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6453"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,222.656 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6455"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,214.153 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6457"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,214.153 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6459"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,35.5855 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6461"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,35.5855 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6463"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,31.334 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6465"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,31.334 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6467"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,27.0824 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6469"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,27.0824 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6471"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,22.8309 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6473"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,22.8309 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6475"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,18.5793 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6477"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,18.5793 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6479"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,14.3277 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6481"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,14.3277 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6483"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,10.0762 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6485"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,10.0762 85.0316,0 0,4.25156 -85.0316,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6487"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,5.82422 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6489"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 286.409,5.82422 85.0316,0 0,4.25195 -85.0316,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6491"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,175.888 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6493"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,175.888 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6495"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,167.385 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6497"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,167.385 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6499"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,158.882 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6501"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,158.882 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6503"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,150.379 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6505"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,150.379 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6507"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,141.876 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6509"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,141.876 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6511"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,133.372 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6513"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,133.372 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6515"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,124.869 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6517"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,124.869 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6519"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,116.366 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#008f00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6521"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,116.366 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6523"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,371.462 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6525"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,371.462 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6527"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,362.959 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6529"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,362.959 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6531"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,354.455 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6533"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,354.455 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6535"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,345.952 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6537"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,345.952 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6539"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,375.714 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6541"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,375.714 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6543"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,367.211 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6545"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,367.211 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6547"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,358.707 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6549"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,358.707 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6551"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,350.204 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6553"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,350.204 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6555"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,175.888 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6557"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,175.888 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6559"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,167.385 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6561"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,167.385 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6563"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,158.882 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6565"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,158.882 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6567"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,150.379 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6569"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,150.379 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6571"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,141.876 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6573"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,141.876 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6575"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,133.372 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6577"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,133.372 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6579"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,124.869 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6581"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,124.869 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6583"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,116.366 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6585"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,116.366 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6587"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,175.888 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6589"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,175.888 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6591"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,167.385 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6593"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,167.385 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6595"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,158.882 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6597"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,158.882 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6599"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,150.379 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6601"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,150.379 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6603"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,141.876 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6605"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,141.876 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6607"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,133.372 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6609"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,133.372 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6611"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,124.869 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6613"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,124.869 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6615"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,116.366 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#d10000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6617"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,116.366 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6619"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,375.714 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6621"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,375.714 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6623"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,367.211 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6625"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,367.211 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6627"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,358.707 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6629"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,358.707 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6631"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,350.204 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6633"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,350.204 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6635"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,371.462 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6637"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,371.462 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6639"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,362.959 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6641"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,362.959 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6643"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,354.455 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6645"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,354.455 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6647"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,345.952 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6649"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 99.3383,345.952 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6651"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,171.637 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6653"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,171.637 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6655"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,163.134 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6657"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,163.134 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6659"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,154.63 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6661"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,154.63 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6663"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,146.127 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6665"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,146.127 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6667"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,137.624 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6669"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,137.624 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6671"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,129.121 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6673"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,129.121 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6675"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,120.618 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6677"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,120.618 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6679"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,112.114 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#0000d1;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6681"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 192.873,112.114 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6683"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,171.637 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6685"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,171.637 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6687"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,163.134 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6689"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,163.134 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6691"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,154.63 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6693"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,154.63 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6695"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,146.127 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6697"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,146.127 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6699"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,137.624 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6701"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,137.624 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6703"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,129.121 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6705"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,129.121 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6707"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,120.618 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6709"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,120.618 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6711"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,112.114 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6713"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 379.944,112.114 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6715"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,171.637 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6717"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,171.637 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6719"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,163.134 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6721"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,163.134 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6723"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,154.63 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6725"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,154.63 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6727"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,146.127 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6729"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,146.127 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6731"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,137.624 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6733"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,137.624 85.032,0 0,4.25195 -85.032,0 0,-4.25195 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6735"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,129.121 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6737"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,129.121 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6739"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,120.618 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6741"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,120.618 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6743"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,112.114 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6745"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.80312,112.114 85.032,0 0,4.25156 -85.032,0 0,-4.25156 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6747"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;g</div><div class='add'>+       transform="scale(0.1,0.1)"</div><div class='add'>+       id="g6749"</div><div class='add'>+       style=""&gt;&lt;g</div><div class='add'>+         id="g6751"</div><div class='add'>+         clip-path="url(#clipPath6753)"</div><div class='add'>+         style=""&gt;&lt;path</div><div class='add'>+           d="m 3778.18,5925.45 1105.42,0"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:14.17199993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           id="path6757"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;path</div><div class='add'>+       d="m 478.676,589.711 8.503,2.834 -8.503,2.835 0,-5.669"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path6759"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 478.676,589.711 8.503,2.834 -8.503,2.835 0,-5.669 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.35429999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path6761"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;text</div><div class='add'>+       y="-528.771"</div><div class='add'>+       x="5.8031301"</div><div class='add'>+       id="text6765"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan6767"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-528.771"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 88.500237 97.835464"&gt;V4L2_FIELD_TOP&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan6769"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-460.74561"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 98.507408 105.83879 113.17018 122.5054"&gt;V4L2_FIELD_BOTTOM&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan6771"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-392.72021"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 95.843628 103.17502 111.17835 119.84163 128.5049 136.50824 143.83963"&gt;V4L2_FIELD_ALTERNATE&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-324.69479"</div><div class='add'>+       x="10.05469"</div><div class='add'>+       id="text6773"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:8.2495203px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan6775"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-324.69479"</div><div class='add'>+         x="10.05469 14.17945 18.766184 20.597576 25.184309 29.771042 34.357777 38.944508 41.237877 43.531242 48.117977 50.865067 53.158432 55.451801 57.283192 61.869926 63.701321 68.288048"&gt;v4l2_buffer.field:&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan6777"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-311.9397"</div><div class='add'>+         x="10.05469 15.55712 20.143852 24.730585 29.317318 33.904053 38.944508 41.237877 46.740307 51.327042 57.283192 61.869926 66.910378 73.328506 95.0867 100.58913 105.17586 109.7626 114.34933 118.93606 123.97652 126.26987 131.77232 136.35905 142.3152 146.90193 152.40436 158.82249 163.86295 168.9034 175.32153 197.12534 202.62778 207.21451 211.80124 216.38797 220.9747 226.01515 228.30853 233.81096 238.39769 244.35384 248.94058 253.98103 260.39917 282.15695 287.65936 292.24609 296.83282 301.41956 306.00629 311.04675 313.34012 318.84256 323.42929 329.38544 333.97217 339.47461 345.89273 350.9332 355.97363 362.39175 384.19559 389.698 394.28473 398.87149 403.45822 408.04495 413.08539 415.37875 420.8812 425.46793 431.42407 436.0108 441.05127 447.46939 469.2276 474.73001 479.31674 483.90347 488.49023 493.07697 498.1174 500.41077 505.91321 510.49994 516.45612 521.04285 526.54523 532.96338 538.00385 543.04431 549.4624"&gt;V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOM&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-588.2937"</div><div class='add'>+       x="5.8031301"</div><div class='add'>+       id="text6779"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan6781"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-588.2937"</div><div class='add'>+         x="5.8031301 13.134519 19.805964 29.801128 36.472572 43.14402 47.139687 53.811131 56.474907 59.810631 66.482071 70.477737 77.149185 83.820625 87.816299 91.152016 94.48774 97.823463 104.4949 111.16635 114.50207 117.83779 120.50157 127.17302 129.83679 136.50824 139.84396 143.17969 145.84346 149.83913 155.83862 159.17435 162.51007 165.84579 169.84146 176.51291 183.18434 189.18385 199.17902 201.84279 205.17851 208.51424 215.18568 221.85713 225.19284 229.18851 235.85995 239.19568 245.86713 249.20285 252.53857 260.5419 269.87714 273.21286 281.21619 289.21951 295.89096"&gt;Temporal order, top field first transmitted (e.g. BG/PAL)&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan6783"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-86.604706"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 97.175514 106.51073 113.18218 120.51357"&gt;V4L2_FIELD_SEQ_TB&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan6785"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-192.89471"</div><div class='add'>+         x="10.05469 18.058023 24.729465 31.400909 38.072357 44.743801 52.075188 55.410912 63.414246 70.085686 78.748962 85.42041 88.756134 97.419411 104.7508 112.75413 121.41741 128.08885 136.09219 144.75546 152.7588 161.42207 168.09352 176.09685 183.42824 186.76396 190.75963 200.75479 203.41858 209.41808 216.08952 218.7533 221.41707 228.08852 234.75996 241.43141 248.10286"&gt;V4L2_FIELD_INTERLACED_BT (misaligned)&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan6787"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-294.93271"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 84.50457 93.167847 100.49924 108.50257 117.16585 123.83729 131.84062 140.50391 148.50723 157.17052 160.50624 163.84196 167.17769 175.18102 181.85246 188.52391 195.19534 201.86679 209.19818 212.53391 220.53723 227.20868 235.87196 242.5434 245.87912 254.5424 261.87378 269.87714 278.54041 285.21185 293.21518 301.87845 309.88177 318.54507 325.21652 332.54791"&gt;V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_TB&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-528.771"</div><div class='add'>+       x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 88.500237 97.835464"</div><div class='add'>+       id="text4583"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan4585"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-528.771"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 88.500237 97.835464"&gt;V4L2_FIELD_TOP&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-460.74561"</div><div class='add'>+       x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 98.507408 105.83879 113.17018 122.5054"</div><div class='add'>+       id="text4587"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan4589"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-460.74561"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 98.507408 105.83879 113.17018 122.5054"&gt;V4L2_FIELD_BOTTOM&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-392.72021"</div><div class='add'>+       x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 95.843628 103.17502 111.17835 119.84163 128.5049 136.50824 143.83963"</div><div class='add'>+       id="text4591"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan4593"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-392.72021"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 95.843628 103.17502 111.17835 119.84163 128.5049 136.50824 143.83963"&gt;V4L2_FIELD_ALTERNATE&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-588.2937"</div><div class='add'>+       x="5.8031301 13.134519 19.805964 29.801128 36.472572 43.14402 47.139687 53.811131 56.474907 59.810631 66.482071 70.477737 77.149185 83.820625 87.816299 91.152016 94.48774 97.823463 104.4949 111.16635 114.50207 117.83779 120.50157 127.17302 129.83679 136.50824 139.84396 143.17969 145.84346 149.83913 155.83862 159.17435 162.51007 165.84579 169.84146 176.51291 183.18434 189.18385 199.17902 201.84279 205.17851 208.51424 215.18568 221.85713 225.19284 229.18851 235.85995 239.19568 245.86713 249.20285 252.53857 260.5419 269.87714 273.21286 281.21619 289.21951 295.89096"</div><div class='add'>+       id="text5847"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan5849"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-588.2937"</div><div class='add'>+         x="5.8031301 13.134519 19.805964 29.801128 36.472572 43.14402 47.139687 53.811131 56.474907 59.810631 66.482071 70.477737 77.149185 83.820625 87.816299 91.152016 94.48774 97.823463 104.4949 111.16635 114.50207 117.83779 120.50157 127.17302 129.83679 136.50824 139.84396 143.17969 145.84346 149.83913 155.83862 159.17435 162.51007 165.84579 169.84146 176.51291 183.18434 189.18385 199.17902 201.84279 205.17851 208.51424 215.18568 221.85713 225.19284 229.18851 235.85995 239.19568 245.86713 249.20285 252.53857 260.5419 269.87714 273.21286 281.21619 289.21951 295.89096"&gt;Temporal order, top field first transmitted (e.g. BG/PAL)&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-86.604706"</div><div class='add'>+       x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 97.175514 106.51073 113.18218 120.51357"</div><div class='add'>+       id="text5851"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan5853"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-86.604706"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 89.17218 97.175514 106.51073 113.18218 120.51357"&gt;V4L2_FIELD_SEQ_TB&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-192.89471"</div><div class='add'>+       x="10.05469 18.058023 24.729465 31.400909 38.072357 44.743801 52.075188 55.410912 63.414246 70.085686 78.748962 85.42041 88.756134 97.419411 104.7508 112.75413 121.41741 128.08885 136.09219 144.75546 152.7588 161.42207 168.09352 176.09685 183.42824 186.76396 190.75963 200.75479 203.41858 209.41808 216.08952 218.7533 221.41707 228.08852 234.75996 241.43141 248.10286"</div><div class='add'>+       id="text5855"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan5857"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-192.89471"</div><div class='add'>+         x="10.05469 18.058023 24.729465 31.400909 38.072357 44.743801 52.075188 55.410912 63.414246 70.085686 78.748962 85.42041 88.756134 97.419411 104.7508 112.75413 121.41741 128.08885 136.09219 144.75546 152.7588 161.42207 168.09352 176.09685 183.42824 186.76396 190.75963 200.75479 203.41858 209.41808 216.08952 218.7533 221.41707 228.08852 234.75996 241.43141 248.10286"&gt;V4L2_FIELD_INTERLACED_BT (misaligned)&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-294.93271"</div><div class='add'>+       x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 84.50457 93.167847 100.49924 108.50257 117.16585 123.83729 131.84062 140.50391 148.50723 157.17052 160.50624 163.84196 167.17769 175.18102 181.85246 188.52391 195.19534 201.86679 209.19818 212.53391 220.53723 227.20868 235.87196 242.5434 245.87912 254.5424 261.87378 269.87714 278.54041 285.21185 293.21518 301.87845 309.88177 318.54507 325.21652 332.54791"</div><div class='add'>+       id="text5859"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan5861"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-294.93271"</div><div class='add'>+         x="5.8031301 13.806463 20.477907 27.149351 33.820797 40.492241 47.823627 51.159351 59.162685 65.834129 74.497406 81.168854 84.50457 93.167847 100.49924 108.50257 117.16585 123.83729 131.84062 140.50391 148.50723 157.17052 160.50624 163.84196 167.17769 175.18102 181.85246 188.52391 195.19534 201.86679 209.19818 212.53391 220.53723 227.20868 235.87196 242.5434 245.87912 254.5424 261.87378 269.87714 278.54041 285.21185 293.21518 301.87845 309.88177 318.54507 325.21652 332.54791"&gt;V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_TB&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-324.69479"</div><div class='add'>+       x="10.05469 14.17945 18.766184 20.597576 25.184309 29.771042 34.357777 38.944508 41.237877 43.531242 48.117977 50.865067 53.158432 55.451801 57.283192 61.869926 63.701321 68.288048"</div><div class='add'>+       id="text7131"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:8.2495203px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan7133"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-324.69479"</div><div class='add'>+         x="10.05469 14.17945 18.766184 20.597576 25.184309 29.771042 34.357777 38.944508 41.237877 43.531242 48.117977 50.865067 53.158432 55.451801 57.283192 61.869926 63.701321 68.288048"&gt;v4l2_buffer.field:&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-311.9397"</div><div class='add'>+       x="10.05469 15.55712 20.143852 24.730585 29.317318 33.904053 38.944508 41.237877 46.740307 51.327042 57.283192 61.869926 66.910378 73.328506 95.0867 100.58913 105.17586 109.7626 114.34933 118.93606 123.97652 126.26987 131.77232 136.35905 142.3152 146.90193 152.40436 158.82249 163.86295 168.9034 175.32153 197.12534 202.62778 207.21451 211.80124 216.38797 220.9747 226.01515 228.30853 233.81096 238.39769 244.35384 248.94058 253.98103 260.39917 282.15695 287.65936 292.24609 296.83282 301.41956 306.00629 311.04675 313.34012 318.84256 323.42929 329.38544 333.97217 339.47461 345.89273 350.9332 355.97363 362.39175 384.19559 389.698 394.28473 398.87149 403.45822 408.04495 413.08539 415.37875 420.8812 425.46793 431.42407 436.0108 441.05127 447.46939 469.2276 474.73001 479.31674 483.90347 488.49023 493.07697 498.1174 500.41077 505.91321 510.49994 516.45612 521.04285 526.54523 532.96338 538.00385 543.04431 549.4624"</div><div class='add'>+       id="text7135"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:8.2495203px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan7137"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-311.9397"</div><div class='add'>+         x="10.05469 15.55712 20.143852 24.730585 29.317318 33.904053 38.944508 41.237877 46.740307 51.327042 57.283192 61.869926 66.910378 73.328506 95.0867 100.58913 105.17586 109.7626 114.34933 118.93606 123.97652 126.26987 131.77232 136.35905 142.3152 146.90193 152.40436 158.82249 163.86295 168.9034 175.32153 197.12534 202.62778 207.21451 211.80124 216.38797 220.9747 226.01515 228.30853 233.81096 238.39769 244.35384 248.94058 253.98103 260.39917 282.15695 287.65936 292.24609 296.83282 301.41956 306.00629 311.04675 313.34012 318.84256 323.42929 329.38544 333.97217 339.47461 345.89273 350.9332 355.97363 362.39175 384.19559 389.698 394.28473 398.87149 403.45822 408.04495 413.08539 415.37875 420.8812 425.46793 431.42407 436.0108 441.05127 447.46939 469.2276 474.73001 479.31674 483.90347 488.49023 493.07697 498.1174 500.41077 505.91321 510.49994 516.45612 521.04285 526.54523 532.96338 538.00385 543.04431 549.4624"&gt;V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOM&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/svg&gt;
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/hsv-formats.rst b/Documentation/media/uapi/v4l/hsv-formats.rst<br/>new file mode 100644<br/>index 000000000000..f0f2615eaa95<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/hsv-formats.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/hsv-formats.rst</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+.. -*- coding: utf-8; mode: rst -*-</div><div class='add'>+</div><div class='add'>+.. _hsv-formats:</div><div class='add'>+</div><div class='add'>+***********</div><div class='add'>+HSV Formats</div><div class='add'>+***********</div><div class='add'>+</div><div class='add'>+These formats store the color information of the image</div><div class='add'>+in a geometrical representation. The colors are mapped into a</div><div class='add'>+cylinder, where the angle is the HUE, the height is the VALUE</div><div class='add'>+and the distance to the center is the SATURATION. This is a very</div><div class='add'>+useful format for image segmentation algorithms.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+    :maxdepth: 1</div><div class='add'>+</div><div class='add'>+    pixfmt-packed-hsv</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/nv12mt.svg b/Documentation/media/uapi/v4l/nv12mt.svg<br/>new file mode 100644<br/>index 000000000000..21fcccda9723<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/nv12mt.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/nv12mt.svg</a></div><div class='hunk'>@@ -0,0 +1,450 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   version="1.2"</div><div class='add'>+   width="96.282211mm"</div><div class='add'>+   height="28.282219mm"</div><div class='add'>+   viewBox="0 0 9628.2211 2828.2219"</div><div class='add'>+   preserveAspectRatio="xMidYMid"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   id="svg2"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   sodipodi:docname="nv12mt.svg"</div><div class='add'>+   style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"&gt;&lt;metadata</div><div class='add'>+     id="metadata383"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title&gt;&lt;/dc:title&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview381"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0"</div><div class='add'>+     inkscape:zoom="4.0919524"</div><div class='add'>+     inkscape:cx="170.57872"</div><div class='add'>+     inkscape:cy="50.106293"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="svg2" /&gt;&lt;defs</div><div class='add'>+     class="ClipPathGroup"</div><div class='add'>+     id="defs4"&gt;&lt;clipPath</div><div class='add'>+       id="presentation_clip_path"</div><div class='add'>+       clipPathUnits="userSpaceOnUse"&gt;&lt;rect</div><div class='add'>+         x="0"</div><div class='add'>+         y="0"</div><div class='add'>+         width="28000"</div><div class='add'>+         height="21000"</div><div class='add'>+         id="rect7" /&gt;&lt;/clipPath&gt;&lt;/defs&gt;&lt;defs</div><div class='add'>+     id="defs9" /&gt;&lt;defs</div><div class='add'>+     id="defs80" /&gt;&lt;defs</div><div class='add'>+     id="defs103" /&gt;&lt;defs</div><div class='add'>+     class="TextShapeIndex"</div><div class='add'>+     id="defs114" /&gt;&lt;defs</div><div class='add'>+     class="EmbeddedBulletChars"</div><div class='add'>+     id="defs118" /&gt;&lt;defs</div><div class='add'>+     class="TextEmbeddedBitmaps"</div><div class='add'>+     id="defs147" /&gt;&lt;g</div><div class='add'>+     class="SlideGroup"</div><div class='add'>+     id="g177"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="g179"&gt;&lt;g</div><div class='add'>+         id="id1"</div><div class='add'>+         class="Slide"</div><div class='add'>+         clip-path="url(#presentation_clip_path)"&gt;&lt;g</div><div class='add'>+           class="Page"</div><div class='add'>+           id="g182"&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.CustomShape"</div><div class='add'>+             id="g184"&gt;&lt;g</div><div class='add'>+               id="id6"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="3299"</div><div class='add'>+                 y="3199"</div><div class='add'>+                 width="2403"</div><div class='add'>+                 height="1403"</div><div class='add'>+                 id="rect187"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 4500,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+                 id="path189"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+                 class="TextShape"</div><div class='add'>+                 id="text191"&gt;&lt;tspan</div><div class='add'>+                   class="TextParagraph"</div><div class='add'>+                   font-size="635px"</div><div class='add'>+                   font-weight="400"</div><div class='add'>+                   id="tspan193"</div><div class='add'>+                   style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+                     class="TextPosition"</div><div class='add'>+                     x="4325"</div><div class='add'>+                     y="4121"</div><div class='add'>+                     id="tspan195"&gt;&lt;tspan</div><div class='add'>+                       id="tspan197"</div><div class='add'>+                       style="fill:#000000;stroke:none"&gt;0&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.CustomShape"</div><div class='add'>+             id="g199"&gt;&lt;g</div><div class='add'>+               id="id7"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="5699"</div><div class='add'>+                 y="3199"</div><div class='add'>+                 width="2403"</div><div class='add'>+                 height="1403"</div><div class='add'>+                 id="rect202"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 6900,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+                 id="path204"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.CustomShape"</div><div class='add'>+             id="g206"&gt;&lt;g</div><div class='add'>+               id="id8"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="8099"</div><div class='add'>+                 y="3199"</div><div class='add'>+                 width="2403"</div><div class='add'>+                 height="1403"</div><div class='add'>+                 id="rect209"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 9300,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+                 id="path211"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+                 class="TextShape"</div><div class='add'>+                 id="text213"&gt;&lt;tspan</div><div class='add'>+                   class="TextParagraph"</div><div class='add'>+                   font-size="635px"</div><div class='add'>+                   font-weight="400"</div><div class='add'>+                   id="tspan215"</div><div class='add'>+                   style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+                     class="TextPosition"</div><div class='add'>+                     x="9125"</div><div class='add'>+                     y="4121"</div><div class='add'>+                     id="tspan217"&gt;&lt;tspan</div><div class='add'>+                       id="tspan219"</div><div class='add'>+                       style="fill:#000000;stroke:none"&gt;6&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.CustomShape"</div><div class='add'>+             id="g221"&gt;&lt;g</div><div class='add'>+               id="id9"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="5699"</div><div class='add'>+                 y="3199"</div><div class='add'>+                 width="2403"</div><div class='add'>+                 height="1403"</div><div class='add'>+                 id="rect224"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 6900,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+                 id="path226"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+                 class="TextShape"</div><div class='add'>+                 id="text228"&gt;&lt;tspan</div><div class='add'>+                   class="TextParagraph"</div><div class='add'>+                   font-size="635px"</div><div class='add'>+                   font-weight="400"</div><div class='add'>+                   id="tspan230"</div><div class='add'>+                   style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+                     class="TextPosition"</div><div class='add'>+                     x="6725"</div><div class='add'>+                     y="4121"</div><div class='add'>+                     id="tspan232"&gt;&lt;tspan</div><div class='add'>+                       id="tspan234"</div><div class='add'>+                       style="fill:#000000;stroke:none"&gt;1&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.CustomShape"</div><div class='add'>+             id="g236"&gt;&lt;g</div><div class='add'>+               id="id10"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="10499"</div><div class='add'>+                 y="3199"</div><div class='add'>+                 width="2403"</div><div class='add'>+                 height="1403"</div><div class='add'>+                 id="rect239"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 11700,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+                 id="path241"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+                 class="TextShape"</div><div class='add'>+                 id="text243"&gt;&lt;tspan</div><div class='add'>+                   class="TextParagraph"</div><div class='add'>+                   font-size="635px"</div><div class='add'>+                   font-weight="400"</div><div class='add'>+                   id="tspan245"</div><div class='add'>+                   style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+                     class="TextPosition"</div><div class='add'>+                     x="11525"</div><div class='add'>+                     y="4121"</div><div class='add'>+                     id="tspan247"&gt;&lt;tspan</div><div class='add'>+                       id="tspan249"</div><div class='add'>+                       style="fill:#000000;stroke:none"&gt;7&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.CustomShape"</div><div class='add'>+             id="g251"&gt;&lt;g</div><div class='add'>+               id="id11"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="3299"</div><div class='add'>+                 y="4599"</div><div class='add'>+                 width="2403"</div><div class='add'>+                 height="1403"</div><div class='add'>+                 id="rect254"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 4500,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+                 id="path256"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+                 class="TextShape"</div><div class='add'>+                 id="text258"&gt;&lt;tspan</div><div class='add'>+                   class="TextParagraph"</div><div class='add'>+                   font-size="635px"</div><div class='add'>+                   font-weight="400"</div><div class='add'>+                   id="tspan260"</div><div class='add'>+                   style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+                     class="TextPosition"</div><div class='add'>+                     x="4325"</div><div class='add'>+                     y="5521"</div><div class='add'>+                     id="tspan262"&gt;&lt;tspan</div><div class='add'>+                       id="tspan264"</div><div class='add'>+                       style="fill:#000000;stroke:none"&gt;2&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.CustomShape"</div><div class='add'>+             id="g266"&gt;&lt;g</div><div class='add'>+               id="id12"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="5699"</div><div class='add'>+                 y="4599"</div><div class='add'>+                 width="2403"</div><div class='add'>+                 height="1403"</div><div class='add'>+                 id="rect269"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 6900,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+                 id="path271"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.CustomShape"</div><div class='add'>+             id="g273"&gt;&lt;g</div><div class='add'>+               id="id13"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="8099"</div><div class='add'>+                 y="4599"</div><div class='add'>+                 width="2403"</div><div class='add'>+                 height="1403"</div><div class='add'>+                 id="rect276"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 9300,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+                 id="path278"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+                 class="TextShape"</div><div class='add'>+                 id="text280"&gt;&lt;tspan</div><div class='add'>+                   class="TextParagraph"</div><div class='add'>+                   font-size="635px"</div><div class='add'>+                   font-weight="400"</div><div class='add'>+                   id="tspan282"</div><div class='add'>+                   style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+                     class="TextPosition"</div><div class='add'>+                     x="9125"</div><div class='add'>+                     y="5521"</div><div class='add'>+                     id="tspan284"&gt;&lt;tspan</div><div class='add'>+                       id="tspan286"</div><div class='add'>+                       style="fill:#000000;stroke:none"&gt;4&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.CustomShape"</div><div class='add'>+             id="g288"&gt;&lt;g</div><div class='add'>+               id="id14"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="5699"</div><div class='add'>+                 y="4599"</div><div class='add'>+                 width="2403"</div><div class='add'>+                 height="1403"</div><div class='add'>+                 id="rect291"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 6900,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+                 id="path293"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+                 class="TextShape"</div><div class='add'>+                 id="text295"&gt;&lt;tspan</div><div class='add'>+                   class="TextParagraph"</div><div class='add'>+                   font-size="635px"</div><div class='add'>+                   font-weight="400"</div><div class='add'>+                   id="tspan297"</div><div class='add'>+                   style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+                     class="TextPosition"</div><div class='add'>+                     x="6725"</div><div class='add'>+                     y="5521"</div><div class='add'>+                     id="tspan299"&gt;&lt;tspan</div><div class='add'>+                       id="tspan301"</div><div class='add'>+                       style="fill:#000000;stroke:none"&gt;3&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.CustomShape"</div><div class='add'>+             id="g303"&gt;&lt;g</div><div class='add'>+               id="id15"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="10499"</div><div class='add'>+                 y="4599"</div><div class='add'>+                 width="2403"</div><div class='add'>+                 height="1403"</div><div class='add'>+                 id="rect306"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 11700,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+                 id="path308"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+                 class="TextShape"</div><div class='add'>+                 id="text310"&gt;&lt;tspan</div><div class='add'>+                   class="TextParagraph"</div><div class='add'>+                   font-size="635px"</div><div class='add'>+                   font-weight="400"</div><div class='add'>+                   id="tspan312"</div><div class='add'>+                   style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+                     class="TextPosition"</div><div class='add'>+                     x="11525"</div><div class='add'>+                     y="5521"</div><div class='add'>+                     id="tspan314"&gt;&lt;tspan</div><div class='add'>+                       id="tspan316"</div><div class='add'>+                       style="fill:#000000;stroke:none"&gt;5&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.LineShape"</div><div class='add'>+             id="g318"&gt;&lt;g</div><div class='add'>+               id="id16"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="5199"</div><div class='add'>+                 y="3850"</div><div class='add'>+                 width="1402"</div><div class='add'>+                 height="301"</div><div class='add'>+                 id="rect321"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 5200,4000 970,0"</div><div class='add'>+                 id="path323"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+                 d="m 6600,4000 -450,-150 0,300 450,-150 z"</div><div class='add'>+                 id="path325"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.LineShape"</div><div class='add'>+             id="g327"&gt;&lt;g</div><div class='add'>+               id="id17"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="5000"</div><div class='add'>+                 y="4299"</div><div class='add'>+                 width="1202"</div><div class='add'>+                 height="802"</div><div class='add'>+                 id="rect330"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 6200,4300 -842,561"</div><div class='add'>+                 id="path332"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+                 d="m 5000,5100 458,-125 -167,-249 -291,374 z"</div><div class='add'>+                 id="path334"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.LineShape"</div><div class='add'>+             id="g336"&gt;&lt;g</div><div class='add'>+               id="id18"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="5399"</div><div class='add'>+                 y="5250"</div><div class='add'>+                 width="1202"</div><div class='add'>+                 height="301"</div><div class='add'>+                 id="rect339"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 5400,5400 770,0"</div><div class='add'>+                 id="path341"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+                 d="m 6600,5400 -450,-150 0,300 450,-150 z"</div><div class='add'>+                 id="path343"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.LineShape"</div><div class='add'>+             id="g345"&gt;&lt;g</div><div class='add'>+               id="id19"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="7599"</div><div class='add'>+                 y="5250"</div><div class='add'>+                 width="1202"</div><div class='add'>+                 height="301"</div><div class='add'>+                 id="rect348"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 7600,5400 770,0"</div><div class='add'>+                 id="path350"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+                 d="m 8800,5400 -450,-150 0,300 450,-150 z"</div><div class='add'>+                 id="path352"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.LineShape"</div><div class='add'>+             id="g354"&gt;&lt;g</div><div class='add'>+               id="id20"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="9799"</div><div class='add'>+                 y="5250"</div><div class='add'>+                 width="1402"</div><div class='add'>+                 height="301"</div><div class='add'>+                 id="rect357"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 9800,5400 970,0"</div><div class='add'>+                 id="path359"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+                 d="m 11200,5400 -450,-150 0,300 450,-150 z"</div><div class='add'>+                 id="path361"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.LineShape"</div><div class='add'>+             id="g363"&gt;&lt;g</div><div class='add'>+               id="id21"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="9900"</div><div class='add'>+                 y="4200"</div><div class='add'>+                 width="1202"</div><div class='add'>+                 height="802"</div><div class='add'>+                 id="rect366"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 11100,5000 -842,-561"</div><div class='add'>+                 id="path368"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+                 d="m 9900,4200 291,374 167,-249 -458,-125 z"</div><div class='add'>+                 id="path370"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+             class="com.sun.star.drawing.LineShape"</div><div class='add'>+             id="g372"&gt;&lt;g</div><div class='add'>+               id="id22"&gt;&lt;rect</div><div class='add'>+                 class="BoundingBox"</div><div class='add'>+                 x="9999"</div><div class='add'>+                 y="3850"</div><div class='add'>+                 width="1402"</div><div class='add'>+                 height="301"</div><div class='add'>+                 id="rect375"</div><div class='add'>+                 style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+                 d="m 10000,4000 970,0"</div><div class='add'>+                 id="path377"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+                 d="m 11400,4000 -450,-150 0,300 450,-150 z"</div><div class='add'>+                 id="path379"</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;/g&gt;&lt;/g&gt;&lt;/g&gt;&lt;/g&gt;&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/nv12mt_example.svg b/Documentation/media/uapi/v4l/nv12mt_example.svg<br/>new file mode 100644<br/>index 000000000000..d65d989ee73b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/nv12mt_example.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/nv12mt_example.svg</a></div><div class='hunk'>@@ -0,0 +1,1589 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   version="1.2"</div><div class='add'>+   width="144.28223mm"</div><div class='add'>+   height="70.282227mm"</div><div class='add'>+   viewBox="0 0 14428.222 7028.2226"</div><div class='add'>+   preserveAspectRatio="xMidYMid"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   id="svg2"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   sodipodi:docname="nv12mt_example.svg"</div><div class='add'>+   style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"&gt;&lt;metadata</div><div class='add'>+     id="metadata953"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title&gt;&lt;/dc:title&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview951"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0"</div><div class='add'>+     inkscape:zoom="2.7306359"</div><div class='add'>+     inkscape:cx="255.61812"</div><div class='add'>+     inkscape:cy="124.51576"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="svg2" /&gt;&lt;defs</div><div class='add'>+     class="ClipPathGroup"</div><div class='add'>+     id="defs4" /&gt;&lt;defs</div><div class='add'>+     id="defs9" /&gt;&lt;defs</div><div class='add'>+     id="defs84" /&gt;&lt;defs</div><div class='add'>+     id="defs107" /&gt;&lt;defs</div><div class='add'>+     class="TextShapeIndex"</div><div class='add'>+     id="defs118" /&gt;&lt;defs</div><div class='add'>+     class="EmbeddedBulletChars"</div><div class='add'>+     id="defs122" /&gt;&lt;defs</div><div class='add'>+     class="TextEmbeddedBitmaps"</div><div class='add'>+     id="defs151" /&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g188"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id6"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="3299"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect191"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 4500,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path193"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text195"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan197"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="4325"</div><div class='add'>+             y="4121"</div><div class='add'>+             id="tspan199"&gt;&lt;tspan</div><div class='add'>+               id="tspan201"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;0&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g203"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id7"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5699"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect206"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6900,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path208"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g210"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id8"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="8099"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect213"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9300,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path215"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text217"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan219"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="9125"</div><div class='add'>+             y="4121"</div><div class='add'>+             id="tspan221"&gt;&lt;tspan</div><div class='add'>+               id="tspan223"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;6&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g225"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id9"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5699"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect228"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6900,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path230"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text232"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan234"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="6725"</div><div class='add'>+             y="4121"</div><div class='add'>+             id="tspan236"&gt;&lt;tspan</div><div class='add'>+               id="tspan238"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;1&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g240"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id10"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="10499"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect243"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 11700,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path245"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text247"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan249"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="11525"</div><div class='add'>+             y="4121"</div><div class='add'>+             id="tspan251"&gt;&lt;tspan</div><div class='add'>+               id="tspan253"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;7&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g255"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id11"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12899"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect258"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14100,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path260"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g262"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id12"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="15299"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect265"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 16500,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path267"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text269"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan271"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="16325"</div><div class='add'>+             y="4121"</div><div class='add'>+             id="tspan273"&gt;&lt;tspan</div><div class='add'>+               id="tspan275"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;9&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g277"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id13"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12899"</div><div class='add'>+         y="3199"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect280"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14100,4600 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path282"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text284"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan286"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="13925"</div><div class='add'>+             y="4121"</div><div class='add'>+             id="tspan288"&gt;&lt;tspan</div><div class='add'>+               id="tspan290"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;8&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g292"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id14"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="3299"</div><div class='add'>+         y="4599"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect295"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 4500,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path297"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text299"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan301"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="4325"</div><div class='add'>+             y="5521"</div><div class='add'>+             id="tspan303"&gt;&lt;tspan</div><div class='add'>+               id="tspan305"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;2&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g307"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id15"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5699"</div><div class='add'>+         y="4599"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect310"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6900,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path312"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g314"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id16"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="8099"</div><div class='add'>+         y="4599"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect317"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9300,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path319"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text321"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan323"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="9125"</div><div class='add'>+             y="5521"</div><div class='add'>+             id="tspan325"&gt;&lt;tspan</div><div class='add'>+               id="tspan327"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;4&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g329"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id17"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5699"</div><div class='add'>+         y="4599"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect332"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6900,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path334"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text336"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan338"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="6725"</div><div class='add'>+             y="5521"</div><div class='add'>+             id="tspan340"&gt;&lt;tspan</div><div class='add'>+               id="tspan342"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;3&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g344"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id18"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="10499"</div><div class='add'>+         y="4599"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect347"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 11700,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path349"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text351"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan353"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="11525"</div><div class='add'>+             y="5521"</div><div class='add'>+             id="tspan355"&gt;&lt;tspan</div><div class='add'>+               id="tspan357"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;5&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g359"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id19"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12899"</div><div class='add'>+         y="4599"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect362"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14100,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path364"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g366"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id20"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="15299"</div><div class='add'>+         y="4599"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect369"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 16500,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path371"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text373"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan375"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="16149"</div><div class='add'>+             y="5521"</div><div class='add'>+             id="tspan377"&gt;&lt;tspan</div><div class='add'>+               id="tspan379"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;11&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g381"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id21"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12899"</div><div class='add'>+         y="4599"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect384"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14100,6000 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path386"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text388"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan390"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="13749"</div><div class='add'>+             y="5521"</div><div class='add'>+             id="tspan392"&gt;&lt;tspan</div><div class='add'>+               id="tspan394"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;10&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g396"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id22"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="3299"</div><div class='add'>+         y="5999"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect399"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 4500,7400 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path401"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text403"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan405"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="4149"</div><div class='add'>+             y="6921"</div><div class='add'>+             id="tspan407"&gt;&lt;tspan</div><div class='add'>+               id="tspan409"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;12&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g411"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id23"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5699"</div><div class='add'>+         y="5999"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect414"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6900,7400 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path416"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g418"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id24"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="8099"</div><div class='add'>+         y="5999"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect421"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9300,7400 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path423"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text425"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan427"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="8949"</div><div class='add'>+             y="6921"</div><div class='add'>+             id="tspan429"&gt;&lt;tspan</div><div class='add'>+               id="tspan431"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;18&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g433"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id25"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5699"</div><div class='add'>+         y="5999"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect436"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6900,7400 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path438"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text440"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan442"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="6549"</div><div class='add'>+             y="6921"</div><div class='add'>+             id="tspan444"&gt;&lt;tspan</div><div class='add'>+               id="tspan446"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;13&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g448"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id26"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="10499"</div><div class='add'>+         y="5999"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect451"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 11700,7400 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path453"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text455"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan457"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="11349"</div><div class='add'>+             y="6921"</div><div class='add'>+             id="tspan459"&gt;&lt;tspan</div><div class='add'>+               id="tspan461"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;19&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g463"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id27"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12899"</div><div class='add'>+         y="5999"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect466"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14100,7400 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path468"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g470"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id28"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="15299"</div><div class='add'>+         y="5999"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect473"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 16500,7400 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path475"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text477"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan479"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="16149"</div><div class='add'>+             y="6921"</div><div class='add'>+             id="tspan481"&gt;&lt;tspan</div><div class='add'>+               id="tspan483"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;21&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g485"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id29"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12899"</div><div class='add'>+         y="5999"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect488"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14100,7400 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path490"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text492"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan494"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="13749"</div><div class='add'>+             y="6921"</div><div class='add'>+             id="tspan496"&gt;&lt;tspan</div><div class='add'>+               id="tspan498"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;20&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g500"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id30"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="3299"</div><div class='add'>+         y="7399"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect503"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 4500,8800 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path505"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text507"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan509"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="4149"</div><div class='add'>+             y="8321"</div><div class='add'>+             id="tspan511"&gt;&lt;tspan</div><div class='add'>+               id="tspan513"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;14&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g515"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id31"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5699"</div><div class='add'>+         y="7399"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect518"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6900,8800 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path520"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g522"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id32"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="8099"</div><div class='add'>+         y="7399"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect525"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9300,8800 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path527"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text529"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan531"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="8949"</div><div class='add'>+             y="8321"</div><div class='add'>+             id="tspan533"&gt;&lt;tspan</div><div class='add'>+               id="tspan535"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;16&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g537"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id33"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5699"</div><div class='add'>+         y="7399"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect540"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6900,8800 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path542"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text544"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan546"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="6549"</div><div class='add'>+             y="8321"</div><div class='add'>+             id="tspan548"&gt;&lt;tspan</div><div class='add'>+               id="tspan550"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;15&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g552"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id34"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="10499"</div><div class='add'>+         y="7399"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect555"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 11700,8800 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path557"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text559"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan561"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="11349"</div><div class='add'>+             y="8321"</div><div class='add'>+             id="tspan563"&gt;&lt;tspan</div><div class='add'>+               id="tspan565"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;17&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g567"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id35"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12899"</div><div class='add'>+         y="7399"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect570"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14100,8800 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path572"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g574"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id36"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="15299"</div><div class='add'>+         y="7399"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect577"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 16500,8800 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path579"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text581"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan583"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="16149"</div><div class='add'>+             y="8321"</div><div class='add'>+             id="tspan585"&gt;&lt;tspan</div><div class='add'>+               id="tspan587"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;23&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g589"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id37"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12899"</div><div class='add'>+         y="7399"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect592"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14100,8800 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path594"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text596"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan598"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="13749"</div><div class='add'>+             y="8321"</div><div class='add'>+             id="tspan600"&gt;&lt;tspan</div><div class='add'>+               id="tspan602"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;22&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g604"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id38"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="3299"</div><div class='add'>+         y="8799"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect607"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 4500,10200 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path609"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text611"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan613"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="4149"</div><div class='add'>+             y="9721"</div><div class='add'>+             id="tspan615"&gt;&lt;tspan</div><div class='add'>+               id="tspan617"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;24&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g619"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id39"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5699"</div><div class='add'>+         y="8799"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect622"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6900,10200 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path624"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g626"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id40"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="8099"</div><div class='add'>+         y="8799"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect629"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9300,10200 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path631"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text633"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan635"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="8949"</div><div class='add'>+             y="9721"</div><div class='add'>+             id="tspan637"&gt;&lt;tspan</div><div class='add'>+               id="tspan639"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;26&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g641"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id41"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5699"</div><div class='add'>+         y="8799"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect644"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6900,10200 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path646"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text648"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan650"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="6549"</div><div class='add'>+             y="9721"</div><div class='add'>+             id="tspan652"&gt;&lt;tspan</div><div class='add'>+               id="tspan654"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;25&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g656"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id42"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="10499"</div><div class='add'>+         y="8799"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect659"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 11700,10200 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path661"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text663"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan665"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="11349"</div><div class='add'>+             y="9721"</div><div class='add'>+             id="tspan667"&gt;&lt;tspan</div><div class='add'>+               id="tspan669"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;27&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g671"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id43"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12899"</div><div class='add'>+         y="8799"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect674"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14100,10200 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path676"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g678"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id44"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="15299"</div><div class='add'>+         y="8799"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect681"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 16500,10200 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path683"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text685"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan687"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="16149"</div><div class='add'>+             y="9721"</div><div class='add'>+             id="tspan689"&gt;&lt;tspan</div><div class='add'>+               id="tspan691"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;29&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.CustomShape"</div><div class='add'>+     id="g693"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id45"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12899"</div><div class='add'>+         y="8799"</div><div class='add'>+         width="2403"</div><div class='add'>+         height="1403"</div><div class='add'>+         id="rect696"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14100,10200 -1200,0 0,-1400 2400,0 0,1400 -1200,0 z"</div><div class='add'>+         id="path698"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#3465a4" /&gt;&lt;text</div><div class='add'>+         class="TextShape"</div><div class='add'>+         id="text700"&gt;&lt;tspan</div><div class='add'>+           class="TextParagraph"</div><div class='add'>+           font-size="635px"</div><div class='add'>+           font-weight="400"</div><div class='add'>+           id="tspan702"</div><div class='add'>+           style="font-weight:400;font-size:635px;font-family:sans-serif"&gt;&lt;tspan</div><div class='add'>+             class="TextPosition"</div><div class='add'>+             x="13749"</div><div class='add'>+             y="9721"</div><div class='add'>+             id="tspan704"&gt;&lt;tspan</div><div class='add'>+               id="tspan706"</div><div class='add'>+               style="fill:#000000;stroke:none"&gt;28&lt;/tspan&gt;&lt;/tspan&gt;&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g708"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id46"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5199"</div><div class='add'>+         y="3850"</div><div class='add'>+         width="1402"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect711"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 5200,4000 970,0"</div><div class='add'>+         id="path713"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 6600,4000 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path715"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g717"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id47"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5000"</div><div class='add'>+         y="4299"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="802"</div><div class='add'>+         id="rect720"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6200,4300 -842,561"</div><div class='add'>+         id="path722"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 5000,5100 458,-125 -167,-249 -291,374 z"</div><div class='add'>+         id="path724"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g726"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id48"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5399"</div><div class='add'>+         y="5250"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect729"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 5400,5400 770,0"</div><div class='add'>+         id="path731"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 6600,5400 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path733"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g735"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id49"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="7599"</div><div class='add'>+         y="5250"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect738"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 7600,5400 770,0"</div><div class='add'>+         id="path740"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 8800,5400 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path742"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g744"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id50"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="9799"</div><div class='add'>+         y="5250"</div><div class='add'>+         width="1402"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect747"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9800,5400 970,0"</div><div class='add'>+         id="path749"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 11200,5400 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path751"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g753"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id51"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="9900"</div><div class='add'>+         y="4200"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="802"</div><div class='add'>+         id="rect756"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 11100,5000 -842,-561"</div><div class='add'>+         id="path758"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 9900,4200 291,374 167,-249 -458,-125 z"</div><div class='add'>+         id="path760"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g762"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id52"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="9999"</div><div class='add'>+         y="3850"</div><div class='add'>+         width="1402"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect765"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 10000,4000 970,0"</div><div class='add'>+         id="path767"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 11400,4000 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path769"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g771"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id53"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12399"</div><div class='add'>+         y="3850"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect774"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 12400,4000 770,0"</div><div class='add'>+         id="path776"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 13600,4000 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path778"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g780"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id54"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="14799"</div><div class='add'>+         y="3850"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect783"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14800,4000 770,0"</div><div class='add'>+         id="path785"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 16000,4000 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path787"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g789"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id55"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="14400"</div><div class='add'>+         y="4399"</div><div class='add'>+         width="1402"</div><div class='add'>+         height="602"</div><div class='add'>+         id="rect792"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 15800,4400 -1005,431"</div><div class='add'>+         id="path794"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 14400,5000 473,-39 -118,-276 -355,315 z"</div><div class='add'>+         id="path796"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g798"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id56"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="14599"</div><div class='add'>+         y="5250"</div><div class='add'>+         width="1402"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect801"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14600,5400 970,0"</div><div class='add'>+         id="path803"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 16000,5400 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path805"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g807"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id57"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5199"</div><div class='add'>+         y="6550"</div><div class='add'>+         width="1402"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect810"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 5200,6700 970,0"</div><div class='add'>+         id="path812"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 6600,6700 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path814"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g816"</div><div class='add'>+     transform="translate(-3285.889,-3129.4446)"&gt;&lt;g</div><div class='add'>+       id="id58"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5000"</div><div class='add'>+         y="6999"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="802"</div><div class='add'>+         id="rect819"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 6200,7000 -842,561"</div><div class='add'>+         id="path821"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 5000,7800 458,-125 -167,-249 -291,374 z"</div><div class='add'>+         id="path823"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g825"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id59"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5399"</div><div class='add'>+         y="7950"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect828"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 5400,8100 770,0"</div><div class='add'>+         id="path830"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 6600,8100 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path832"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g834"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id60"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="7599"</div><div class='add'>+         y="7950"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect837"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 7600,8100 770,0"</div><div class='add'>+         id="path839"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 8800,8100 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path841"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g843"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id61"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="9799"</div><div class='add'>+         y="7950"</div><div class='add'>+         width="1402"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect846"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 9800,8100 970,0"</div><div class='add'>+         id="path848"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 11200,8100 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path850"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g852"</div><div class='add'>+     transform="translate(-3285.889,-3129.4446)"&gt;&lt;g</div><div class='add'>+       id="id62"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="9900"</div><div class='add'>+         y="6900"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="802"</div><div class='add'>+         id="rect855"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 11100,7700 -842,-561"</div><div class='add'>+         id="path857"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 9900,6900 291,374 167,-249 -458,-125 z"</div><div class='add'>+         id="path859"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g861"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id63"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="9999"</div><div class='add'>+         y="6550"</div><div class='add'>+         width="1402"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect864"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 10000,6700 970,0"</div><div class='add'>+         id="path866"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 11400,6700 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path868"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g870"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id64"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12399"</div><div class='add'>+         y="6550"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect873"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 12400,6700 770,0"</div><div class='add'>+         id="path875"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 13600,6700 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path877"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g879"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id65"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="14799"</div><div class='add'>+         y="6550"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect882"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14800,6700 770,0"</div><div class='add'>+         id="path884"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 16000,6700 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path886"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g888"</div><div class='add'>+     transform="translate(-3285.889,-3129.4446)"&gt;&lt;g</div><div class='add'>+       id="id66"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="14400"</div><div class='add'>+         y="7099"</div><div class='add'>+         width="1402"</div><div class='add'>+         height="602"</div><div class='add'>+         id="rect891"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 15800,7100 -1005,431"</div><div class='add'>+         id="path893"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 14400,7700 473,-39 -118,-276 -355,315 z"</div><div class='add'>+         id="path895"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g897"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id67"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="14599"</div><div class='add'>+         y="7950"</div><div class='add'>+         width="1402"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect900"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14600,8100 970,0"</div><div class='add'>+         id="path902"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 16000,8100 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path904"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g906"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id68"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="5399"</div><div class='add'>+         y="9450"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect909"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 5400,9600 770,0"</div><div class='add'>+         id="path911"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 6600,9600 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path913"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g915"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id69"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="7599"</div><div class='add'>+         y="9450"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect918"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 7600,9600 770,0"</div><div class='add'>+         id="path920"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 8800,9600 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path922"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g924"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id70"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="9999"</div><div class='add'>+         y="9450"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect927"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 10000,9600 770,0"</div><div class='add'>+         id="path929"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 11200,9600 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path931"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g933"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id71"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="12399"</div><div class='add'>+         y="9450"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect936"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 12400,9600 770,0"</div><div class='add'>+         id="path938"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 13600,9600 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path940"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+     class="com.sun.star.drawing.LineShape"</div><div class='add'>+     id="g942"</div><div class='add'>+     transform="translate(-3285.889,-3185.889)"&gt;&lt;g</div><div class='add'>+       id="id72"&gt;&lt;rect</div><div class='add'>+         class="BoundingBox"</div><div class='add'>+         x="14799"</div><div class='add'>+         y="9450"</div><div class='add'>+         width="1202"</div><div class='add'>+         height="301"</div><div class='add'>+         id="rect945"</div><div class='add'>+         style="fill:none;stroke:none" /&gt;&lt;path</div><div class='add'>+         d="m 14800,9600 770,0"</div><div class='add'>+         id="path947"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:none;stroke:#ff3333" /&gt;&lt;path</div><div class='add'>+         d="m 16000,9600 -450,-150 0,300 450,-150 z"</div><div class='add'>+         id="path949"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="fill:#ff3333;stroke:none" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pipeline.dot b/Documentation/media/uapi/v4l/pipeline.dot<br/>new file mode 100644<br/>index 000000000000..02d7fcf12b26<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pipeline.dot?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pipeline.dot</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+digraph board {</div><div class='add'>+	rankdir=TB</div><div class='add'>+	colorscheme=x11</div><div class='add'>+	scaler [label="{&lt;scaler_0&gt; 0} | Host\nScaler | {&lt;scaler_1&gt; 1} ", shape=Mrecord, style=filled, fillcolor=lightblue]</div><div class='add'>+	frontend [label="{&lt;frontend_0&gt; 0} | Host\nFrontend | {&lt;frontend_1&gt; 1}", shape=Mrecord, style=filled, fillcolor=lightblue]</div><div class='add'>+	sensor [label="Sensor | {&lt;sensor_0&gt; 0}", shape=Mrecord, style=filled, fillcolor=aquamarine]</div><div class='add'>+	io [label="{&lt;io_0&gt; 0} | V4L I/O", shape=Mrecord, style=filled, fillcolor=aquamarine]</div><div class='add'>+</div><div class='add'>+	sensor:sensor_0 -&gt; frontend:frontend_0 [color=blue, label="HQ: 2592x1968\nHS: 1296x984"]</div><div class='add'>+	frontend:frontend_1 -&gt; scaler:scaler_0 [color=blue, label="HQ: 2592x1968\nHS: 1296x984"]</div><div class='add'>+	scaler:scaler_1 -&gt; io:io_0 [color=blue, label="HQ: 1280x720\nHS: 1280x720"]</div><div class='add'>+}</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-002.rst b/Documentation/media/uapi/v4l/pixfmt-002.rst<br/>index 0d9e697f5d4e..2ee164c25637 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-002.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-002.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-002.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-002.rst</a></div><div class='hunk'>@@ -121,6 +121,11 @@ Single-planar format structure</div><div class='ctx'>       - This information supplements the ``colorspace`` and must be set by</div><div class='ctx'> 	the driver for capture streams and by the application for output</div><div class='ctx'> 	streams, see :ref:`colorspaces`.</div><div class='add'>+    * - enum :c:type:`v4l2_hsv_encoding`</div><div class='add'>+      - ``hsv_enc``</div><div class='add'>+      - This information supplements the ``colorspace`` and must be set by</div><div class='add'>+	the driver for capture streams and by the application for output</div><div class='add'>+	streams, see :ref:`colorspaces`.</div><div class='ctx'>     * - enum :c:type:`v4l2_quantization`</div><div class='ctx'>       - ``quantization``</div><div class='ctx'>       - This information supplements the ``colorspace`` and must be set by</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-003.rst b/Documentation/media/uapi/v4l/pixfmt-003.rst<br/>index ae9ea7a791de..337e8188caf1 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-003.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-003.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-003.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-003.rst</a></div><div class='hunk'>@@ -78,6 +78,11 @@ describing all planes of that format.</div><div class='ctx'>       - This information supplements the ``colorspace`` and must be set by</div><div class='ctx'> 	the driver for capture streams and by the application for output</div><div class='ctx'> 	streams, see :ref:`colorspaces`.</div><div class='add'>+    * - enum :c:type:`v4l2_hsv_encoding`</div><div class='add'>+      - ``hsv_enc``</div><div class='add'>+      - This information supplements the ``colorspace`` and must be set by</div><div class='add'>+	the driver for capture streams and by the application for output</div><div class='add'>+	streams, see :ref:`colorspaces`.</div><div class='ctx'>     * - enum :c:type:`v4l2_quantization`</div><div class='ctx'>       - ``quantization``</div><div class='ctx'>       - This information supplements the ``colorspace`` and must be set by</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-006.rst b/Documentation/media/uapi/v4l/pixfmt-006.rst<br/>index a9890ff6038b..7ae7dcf73f63 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-006.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-006.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-006.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-006.rst</a></div><div class='hunk'>@@ -19,9 +19,16 @@ colorspace field of struct :c:type:`v4l2_pix_format`</div><div class='ctx'> or struct :c:type:`v4l2_pix_format_mplane`</div><div class='ctx'> needs to be filled in.</div><div class='ctx'> </div><div class='del'>-.. note::</div><div class='add'>+.. _hsv-colorspace:</div><div class='ctx'> </div><div class='del'>-   The default R'G'B' quantization is full range for all</div><div class='add'>+On :ref:`HSV formats &lt;hsv-formats&gt;` the *Hue* is defined as the angle on</div><div class='add'>+the cylindrical color representation. Usually this angle is measured in</div><div class='add'>+degrees, i.e. 0-360. When we map this angle value into 8 bits, there are</div><div class='add'>+two basic ways to do it: Divide the angular value by 2 (0-179), or use the</div><div class='add'>+whole range, 0-255, dividing the angular value by 1.41. The enum</div><div class='add'>+:c:type:`v4l2_hsv_encoding` specifies which encoding is used.</div><div class='add'>+</div><div class='add'>+.. note:: The default R'G'B' quantization is full range for all</div><div class='ctx'>    colorspaces except for BT.2020 which uses limited range R'G'B'</div><div class='ctx'>    quantization.</div><div class='ctx'> </div><div class='hunk'>@@ -123,6 +130,24 @@ needs to be filled in.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+.. c:type:: v4l2_hsv_encoding</div><div class='add'>+</div><div class='add'>+.. tabularcolumns:: |p{6.5cm}|p{11.0cm}|</div><div class='add'>+</div><div class='add'>+.. flat-table:: V4L2 HSV Encodings</div><div class='add'>+    :header-rows:  1</div><div class='add'>+    :stub-columns: 0</div><div class='add'>+</div><div class='add'>+    * - Identifier</div><div class='add'>+      - Details</div><div class='add'>+    * - ``V4L2_HSV_ENC_180``</div><div class='add'>+      - For the Hue, each LSB is two degrees.</div><div class='add'>+    * - ``V4L2_HSV_ENC_256``</div><div class='add'>+      - For the Hue, the 360 degrees are mapped into 8 bits, i.e. each</div><div class='add'>+	LSB is roughly 1.41 degrees.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> .. c:type:: v4l2_quantization</div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{6.5cm}|p{11.0cm}|</div><div class='hunk'>@@ -136,7 +161,7 @@ needs to be filled in.</div><div class='ctx'>     * - ``V4L2_QUANTIZATION_DEFAULT``</div><div class='ctx'>       - Use the default quantization encoding as defined by the</div><div class='ctx'> 	colorspace. This is always full range for R'G'B' (except for the</div><div class='del'>-	BT.2020 colorspace) and usually limited range for Y'CbCr.</div><div class='add'>+	BT.2020 colorspace) and HSV. It is usually limited range for Y'CbCr.</div><div class='ctx'>     * - ``V4L2_QUANTIZATION_FULL_RANGE``</div><div class='ctx'>       - Use the full range quantization encoding. I.e. the range [0…1] is</div><div class='ctx'> 	mapped to [0…255] (with possible clipping to [1…254] to avoid the</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-007.rst b/Documentation/media/uapi/v4l/pixfmt-007.rst<br/>index 44bb5a7059b3..95a23a28c595 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-007.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-007.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-007.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-007.rst</a></div><div class='hunk'>@@ -211,7 +211,13 @@ Colorspace sRGB (V4L2_COLORSPACE_SRGB)</div><div class='ctx'> The :ref:`srgb` standard defines the colorspace used by most webcams</div><div class='ctx'> and computer graphics. The default transfer function is</div><div class='ctx'> ``V4L2_XFER_FUNC_SRGB``. The default Y'CbCr encoding is</div><div class='del'>-``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is full range.</div><div class='add'>+``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is limited range.</div><div class='add'>+</div><div class='add'>+Note that the :ref:`sycc` standard specifies full range quantization,</div><div class='add'>+however all current capture hardware supported by the kernel convert</div><div class='add'>+R'G'B' to limited range Y'CbCr. So choosing full range as the default</div><div class='add'>+would break how applications interpret the quantization range.</div><div class='add'>+</div><div class='ctx'> The chromaticities of the primary colors and the white reference are:</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +282,7 @@ the following ``V4L2_YCBCR_ENC_601`` encoding as defined by :ref:`sycc`:</div><div class='ctx'> </div><div class='ctx'> Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range</div><div class='ctx'> [-0.5…0.5]. This transform is identical to one defined in SMPTE</div><div class='del'>-170M/BT.601. The Y'CbCr quantization is full range.</div><div class='add'>+170M/BT.601. The Y'CbCr quantization is limited range.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. _col-adobergb:</div><div class='hunk'>@@ -288,10 +294,15 @@ The :ref:`adobergb` standard defines the colorspace used by computer</div><div class='ctx'> graphics that use the AdobeRGB colorspace. This is also known as the</div><div class='ctx'> :ref:`oprgb` standard. The default transfer function is</div><div class='ctx'> ``V4L2_XFER_FUNC_ADOBERGB``. The default Y'CbCr encoding is</div><div class='del'>-``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is full</div><div class='del'>-range. The chromaticities of the primary colors and the white reference</div><div class='del'>-are:</div><div class='add'>+``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is limited</div><div class='add'>+range.</div><div class='add'>+</div><div class='add'>+Note that the :ref:`oprgb` standard specifies full range quantization,</div><div class='add'>+however all current capture hardware supported by the kernel convert</div><div class='add'>+R'G'B' to limited range Y'CbCr. So choosing full range as the default</div><div class='add'>+would break how applications interpret the quantization range.</div><div class='ctx'> </div><div class='add'>+The chromaticities of the primary colors and the white reference are:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|</div><div class='hunk'>@@ -344,7 +355,7 @@ the following ``V4L2_YCBCR_ENC_601`` encoding:</div><div class='ctx'> </div><div class='ctx'> Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range</div><div class='ctx'> [-0.5…0.5]. This transform is identical to one defined in SMPTE</div><div class='del'>-170M/BT.601. The Y'CbCr quantization is full range.</div><div class='add'>+170M/BT.601. The Y'CbCr quantization is limited range.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. _col-bt2020:</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-013.rst b/Documentation/media/uapi/v4l/pixfmt-013.rst<br/>index 542c087152e3..728d7ede10fa 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-013.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-013.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-013.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-013.rst</a></div><div class='hunk'>@@ -85,3 +85,8 @@ Compressed Formats</div><div class='ctx'>       - ``V4L2_PIX_FMT_VP8``</div><div class='ctx'>       - 'VP80'</div><div class='ctx'>       - VP8 video elementary stream.</div><div class='add'>+    * .. _V4L2-PIX-FMT-VP9:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_VP9``</div><div class='add'>+      - 'VP90'</div><div class='add'>+      - VP9 video elementary stream.</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst b/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst<br/>index 9f250a1df2f6..32d0c8743460 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-nv12mt.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-nv12mt.rst</a></div><div class='hunk'>@@ -33,8 +33,8 @@ Layout of macroblocks in memory is presented in the following figure.</div><div class='ctx'> </div><div class='ctx'> .. _nv12mt:</div><div class='ctx'> </div><div class='del'>-.. figure::  pixfmt-nv12mt_files/nv12mt.*</div><div class='del'>-    :alt:    nv12mt.png</div><div class='add'>+.. figure::  nv12mt.*</div><div class='add'>+    :alt:    nv12mt.pdf / nv12mt.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     V4L2_PIX_FMT_NV12MT macroblock Z shape memory layout</div><div class='hunk'>@@ -50,8 +50,8 @@ interleaved. Height of the buffer is aligned to 32.</div><div class='ctx'> </div><div class='ctx'> .. _nv12mt_ex:</div><div class='ctx'> </div><div class='del'>-.. figure::  pixfmt-nv12mt_files/nv12mt_example.*</div><div class='del'>-    :alt:    nv12mt_example.png</div><div class='add'>+.. figure::  nv12mt_example.*</div><div class='add'>+    :alt:    nv12mt_example.pdf / nv12mt_example.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     Example V4L2_PIX_FMT_NV12MT memory layout of macroblocks</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png<br/>deleted file mode 100644<br/>index 41401860fb73..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png<br/>deleted file mode 100644<br/>index 7775f5d7cc46..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst b/Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst<br/>new file mode 100644<br/>index 000000000000..3fdb34ce2f09<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst</a></div><div class='hunk'>@@ -0,0 +1,157 @@</div><div class='add'>+.. -*- coding: utf-8; mode: rst -*-</div><div class='add'>+</div><div class='add'>+.. _packed-hsv:</div><div class='add'>+</div><div class='add'>+******************</div><div class='add'>+Packed HSV formats</div><div class='add'>+******************</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+The *hue* (h) is measured in degrees, the equivalence between degrees and LSBs</div><div class='add'>+depends on the hsv-encoding used, see :ref:`colorspaces`.</div><div class='add'>+The *saturation* (s) and the *value* (v) are measured in percentage of the</div><div class='add'>+cylinder: 0 being the smallest value and 255 the maximum.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The values are packed in 24 or 32 bit formats.</div><div class='add'>+</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \newline\begin{adjustbox}{width=\columnwidth}</div><div class='add'>+</div><div class='add'>+.. tabularcolumns:: |p{4.2cm}|p{1.0cm}|p{0.7cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{1.7cm}|</div><div class='add'>+</div><div class='add'>+.. _packed-hsv-formats:</div><div class='add'>+</div><div class='add'>+.. flat-table:: Packed HSV Image Formats</div><div class='add'>+    :header-rows:  2</div><div class='add'>+    :stub-columns: 0</div><div class='add'>+</div><div class='add'>+    * - Identifier</div><div class='add'>+      - Code</div><div class='add'>+      -</div><div class='add'>+      - :cspan:`7` Byte 0 in memory</div><div class='add'>+      -</div><div class='add'>+      - :cspan:`7` Byte 1</div><div class='add'>+      -</div><div class='add'>+      - :cspan:`7` Byte 2</div><div class='add'>+      -</div><div class='add'>+      - :cspan:`7` Byte 3</div><div class='add'>+    * -</div><div class='add'>+      -</div><div class='add'>+      - Bit</div><div class='add'>+      - 7</div><div class='add'>+      - 6</div><div class='add'>+      - 5</div><div class='add'>+      - 4</div><div class='add'>+      - 3</div><div class='add'>+      - 2</div><div class='add'>+      - 1</div><div class='add'>+      - 0</div><div class='add'>+      -</div><div class='add'>+      - 7</div><div class='add'>+      - 6</div><div class='add'>+      - 5</div><div class='add'>+      - 4</div><div class='add'>+      - 3</div><div class='add'>+      - 2</div><div class='add'>+      - 1</div><div class='add'>+      - 0</div><div class='add'>+      -</div><div class='add'>+      - 7</div><div class='add'>+      - 6</div><div class='add'>+      - 5</div><div class='add'>+      - 4</div><div class='add'>+      - 3</div><div class='add'>+      - 2</div><div class='add'>+      - 1</div><div class='add'>+      - 0</div><div class='add'>+      -</div><div class='add'>+      - 7</div><div class='add'>+      - 6</div><div class='add'>+      - 5</div><div class='add'>+      - 4</div><div class='add'>+      - 3</div><div class='add'>+      - 2</div><div class='add'>+      - 1</div><div class='add'>+      - 0</div><div class='add'>+    * .. _V4L2-PIX-FMT-HSV32:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_HSV32``</div><div class='add'>+      - 'HSV4'</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+      - h\ :sub:`7`</div><div class='add'>+      - h\ :sub:`6`</div><div class='add'>+      - h\ :sub:`5`</div><div class='add'>+      - h\ :sub:`4`</div><div class='add'>+      - h\ :sub:`3`</div><div class='add'>+      - h\ :sub:`2`</div><div class='add'>+      - h\ :sub:`1`</div><div class='add'>+      - h\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+      - s\ :sub:`7`</div><div class='add'>+      - s\ :sub:`6`</div><div class='add'>+      - s\ :sub:`5`</div><div class='add'>+      - s\ :sub:`4`</div><div class='add'>+      - s\ :sub:`3`</div><div class='add'>+      - s\ :sub:`2`</div><div class='add'>+      - s\ :sub:`1`</div><div class='add'>+      - s\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+      - v\ :sub:`7`</div><div class='add'>+      - v\ :sub:`6`</div><div class='add'>+      - v\ :sub:`5`</div><div class='add'>+      - v\ :sub:`4`</div><div class='add'>+      - v\ :sub:`3`</div><div class='add'>+      - v\ :sub:`2`</div><div class='add'>+      - v\ :sub:`1`</div><div class='add'>+      - v\ :sub:`0`</div><div class='add'>+    * .. _V4L2-PIX-FMT-HSV24:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_HSV24``</div><div class='add'>+      - 'HSV3'</div><div class='add'>+      -</div><div class='add'>+      - h\ :sub:`7`</div><div class='add'>+      - h\ :sub:`6`</div><div class='add'>+      - h\ :sub:`5`</div><div class='add'>+      - h\ :sub:`4`</div><div class='add'>+      - h\ :sub:`3`</div><div class='add'>+      - h\ :sub:`2`</div><div class='add'>+      - h\ :sub:`1`</div><div class='add'>+      - h\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+      - s\ :sub:`7`</div><div class='add'>+      - s\ :sub:`6`</div><div class='add'>+      - s\ :sub:`5`</div><div class='add'>+      - s\ :sub:`4`</div><div class='add'>+      - s\ :sub:`3`</div><div class='add'>+      - s\ :sub:`2`</div><div class='add'>+      - s\ :sub:`1`</div><div class='add'>+      - s\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+      - v\ :sub:`7`</div><div class='add'>+      - v\ :sub:`6`</div><div class='add'>+      - v\ :sub:`5`</div><div class='add'>+      - v\ :sub:`4`</div><div class='add'>+      - v\ :sub:`3`</div><div class='add'>+      - v\ :sub:`2`</div><div class='add'>+      - v\ :sub:`1`</div><div class='add'>+      - v\ :sub:`0`</div><div class='add'>+      -</div><div class='add'>+      -</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+    \end{adjustbox}\newline\newline</div><div class='add'>+</div><div class='add'>+Bit 7 is the most significant bit.</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-reserved.rst b/Documentation/media/uapi/v4l/pixfmt-reserved.rst<br/>index bd7bf3dae6af..521adb795535 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-reserved.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-reserved.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-reserved.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-reserved.rst</a></div><div class='hunk'>@@ -234,7 +234,15 @@ please make a proposal on the linux-media mailing list.</div><div class='ctx'> 	repeated for each line, i.e. the number of entries in the pointer</div><div class='ctx'> 	array. Anything what's in between the UYVY lines is JPEG data and</div><div class='ctx'> 	should be concatenated to form the JPEG stream.</div><div class='del'>-</div><div class='add'>+    * .. _V4L2-PIX-FMT-MT21C:</div><div class='add'>+</div><div class='add'>+      - ``V4L2_PIX_FMT_MT21C``</div><div class='add'>+      - 'MT21'</div><div class='add'>+      - Compressed two-planar YVU420 format used by Mediatek MT8173.</div><div class='add'>+	The compression is lossless.</div><div class='add'>+	It is an opaque intermediate format and the MDP hardware must be</div><div class='add'>+	used to convert ``V4L2_PIX_FMT_MT21C`` to ``V4L2_PIX_FMT_NV12M``,</div><div class='add'>+	``V4L2_PIX_FMT_YUV420M`` or ``V4L2_PIX_FMT_YVU420``.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-rgb.rst b/Documentation/media/uapi/v4l/pixfmt-rgb.rst<br/>index 9cc980882e80..b0f35136021e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-rgb.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-rgb.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-rgb.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-rgb.rst</a></div><div class='hunk'>@@ -12,9 +12,9 @@ RGB Formats</div><div class='ctx'> </div><div class='ctx'>     pixfmt-packed-rgb</div><div class='ctx'>     pixfmt-srggb8</div><div class='del'>-    pixfmt-sbggr16</div><div class='ctx'>     pixfmt-srggb10</div><div class='ctx'>     pixfmt-srggb10p</div><div class='ctx'>     pixfmt-srggb10alaw8</div><div class='ctx'>     pixfmt-srggb10dpcm8</div><div class='ctx'>     pixfmt-srggb12</div><div class='add'>+    pixfmt-srggb16</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst<br/>deleted file mode 100644<br/>index 6f7f327db85c..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-sbggr16.rst</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-.. -*- coding: utf-8; mode: rst -*-</div><div class='del'>-</div><div class='del'>-.. _V4L2-PIX-FMT-SBGGR16:</div><div class='del'>-</div><div class='del'>-*****************************</div><div class='del'>-V4L2_PIX_FMT_SBGGR16 ('BYR2')</div><div class='del'>-*****************************</div><div class='del'>-</div><div class='del'>-Bayer RGB format</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Description</div><div class='del'>-===========</div><div class='del'>-</div><div class='del'>-This format is similar to</div><div class='del'>-:ref:`V4L2_PIX_FMT_SBGGR8 &lt;V4L2-PIX-FMT-SBGGR8&gt;`, except each pixel</div><div class='del'>-has a depth of 16 bits. The least significant byte is stored at lower</div><div class='del'>-memory addresses (little-endian).</div><div class='del'>-</div><div class='del'>-**Byte Order.**</div><div class='del'>-Each cell is one byte.</div><div class='del'>-</div><div class='del'>-.. flat-table::</div><div class='del'>-    :header-rows:  0</div><div class='del'>-    :stub-columns: 0</div><div class='del'>-</div><div class='del'>-    * - start + 0:</div><div class='del'>-      - B\ :sub:`00low`</div><div class='del'>-      - B\ :sub:`00high`</div><div class='del'>-      - G\ :sub:`01low`</div><div class='del'>-      - G\ :sub:`01high`</div><div class='del'>-      - B\ :sub:`02low`</div><div class='del'>-      - B\ :sub:`02high`</div><div class='del'>-      - G\ :sub:`03low`</div><div class='del'>-      - G\ :sub:`03high`</div><div class='del'>-    * - start + 8:</div><div class='del'>-      - G\ :sub:`10low`</div><div class='del'>-      - G\ :sub:`10high`</div><div class='del'>-      - R\ :sub:`11low`</div><div class='del'>-      - R\ :sub:`11high`</div><div class='del'>-      - G\ :sub:`12low`</div><div class='del'>-      - G\ :sub:`12high`</div><div class='del'>-      - R\ :sub:`13low`</div><div class='del'>-      - R\ :sub:`13high`</div><div class='del'>-    * - start + 16:</div><div class='del'>-      - B\ :sub:`20low`</div><div class='del'>-      - B\ :sub:`20high`</div><div class='del'>-      - G\ :sub:`21low`</div><div class='del'>-      - G\ :sub:`21high`</div><div class='del'>-      - B\ :sub:`22low`</div><div class='del'>-      - B\ :sub:`22high`</div><div class='del'>-      - G\ :sub:`23low`</div><div class='del'>-      - G\ :sub:`23high`</div><div class='del'>-    * - start + 24:</div><div class='del'>-      - G\ :sub:`30low`</div><div class='del'>-      - G\ :sub:`30high`</div><div class='del'>-      - R\ :sub:`31low`</div><div class='del'>-      - R\ :sub:`31high`</div><div class='del'>-      - G\ :sub:`32low`</div><div class='del'>-      - G\ :sub:`32high`</div><div class='del'>-      - R\ :sub:`33low`</div><div class='del'>-      - R\ :sub:`33high`</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst<br/>index 9a41c8d811d0..b6d426c70ccd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-srggb10p.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-srggb10p.rst</a></div><div class='hunk'>@@ -28,7 +28,7 @@ bits of each pixel, in the same order.</div><div class='ctx'> Each n-pixel row contains n/2 green samples and n/2 blue or red samples,</div><div class='ctx'> with alternating green-red and green-blue rows. They are conventionally</div><div class='ctx'> described as GRGR... BGBG..., RGRG... GBGB..., etc. Below is an example</div><div class='del'>-of one of these formats:</div><div class='add'>+of a small V4L2_PIX_FMT_SBGGR10P image:</div><div class='ctx'> </div><div class='ctx'> **Byte Order.**</div><div class='ctx'> Each cell is one byte.</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb12.rst b/Documentation/media/uapi/v4l/pixfmt-srggb12.rst<br/>index a50ee143cb08..15041e568a0a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-srggb12.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-srggb12.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-srggb12.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-srggb12.rst</a></div><div class='hunk'>@@ -26,7 +26,7 @@ high bits filled with zeros. Each n-pixel row contains n/2 green samples</div><div class='ctx'> and n/2 blue or red samples, with alternating red and blue rows. Bytes</div><div class='ctx'> are stored in memory in little endian order. They are conventionally</div><div class='ctx'> described as GRGR... BGBG..., RGRG... GBGB..., etc. Below is an example</div><div class='del'>-of one of these formats:</div><div class='add'>+of a small V4L2_PIX_FMT_SBGGR12 image:</div><div class='ctx'> </div><div class='ctx'> **Byte Order.**</div><div class='ctx'> Each cell is one byte, the 4 most significant bits in the high bytes are</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb16.rst b/Documentation/media/uapi/v4l/pixfmt-srggb16.rst<br/>new file mode 100644<br/>index 000000000000..d407b2b2050f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-srggb16.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-srggb16.rst</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+.. -*- coding: utf-8; mode: rst -*-</div><div class='add'>+</div><div class='add'>+.. _V4L2-PIX-FMT-SRGGB16:</div><div class='add'>+.. _v4l2-pix-fmt-sbggr16:</div><div class='add'>+.. _v4l2-pix-fmt-sgbrg16:</div><div class='add'>+.. _v4l2-pix-fmt-sgrbg16:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+***************************************************************************************************************************</div><div class='add'>+V4L2_PIX_FMT_SRGGB16 ('RG16'), V4L2_PIX_FMT_SGRBG16 ('GR16'), V4L2_PIX_FMT_SGBRG16 ('GB16'), V4L2_PIX_FMT_SBGGR16 ('BYR2'),</div><div class='add'>+***************************************************************************************************************************</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+16-bit Bayer formats</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+These four pixel formats are raw sRGB / Bayer formats with 16 bits per</div><div class='add'>+sample. Each sample is stored in a 16-bit word. Each n-pixel row contains</div><div class='add'>+n/2 green samples and n/2 blue or red samples, with alternating red and blue</div><div class='add'>+rows. Bytes are stored in memory in little endian order. They are</div><div class='add'>+conventionally described as GRGR... BGBG..., RGRG... GBGB..., etc. Below is</div><div class='add'>+an example of a small V4L2_PIX_FMT_SBGGR16 image:</div><div class='add'>+</div><div class='add'>+**Byte Order.**</div><div class='add'>+Each cell is one byte.</div><div class='add'>+</div><div class='add'>+.. flat-table::</div><div class='add'>+    :header-rows:  0</div><div class='add'>+    :stub-columns: 0</div><div class='add'>+</div><div class='add'>+    * - start + 0:</div><div class='add'>+      - B\ :sub:`00low`</div><div class='add'>+      - B\ :sub:`00high`</div><div class='add'>+      - G\ :sub:`01low`</div><div class='add'>+      - G\ :sub:`01high`</div><div class='add'>+      - B\ :sub:`02low`</div><div class='add'>+      - B\ :sub:`02high`</div><div class='add'>+      - G\ :sub:`03low`</div><div class='add'>+      - G\ :sub:`03high`</div><div class='add'>+    * - start + 8:</div><div class='add'>+      - G\ :sub:`10low`</div><div class='add'>+      - G\ :sub:`10high`</div><div class='add'>+      - R\ :sub:`11low`</div><div class='add'>+      - R\ :sub:`11high`</div><div class='add'>+      - G\ :sub:`12low`</div><div class='add'>+      - G\ :sub:`12high`</div><div class='add'>+      - R\ :sub:`13low`</div><div class='add'>+      - R\ :sub:`13high`</div><div class='add'>+    * - start + 16:</div><div class='add'>+      - B\ :sub:`20low`</div><div class='add'>+      - B\ :sub:`20high`</div><div class='add'>+      - G\ :sub:`21low`</div><div class='add'>+      - G\ :sub:`21high`</div><div class='add'>+      - B\ :sub:`22low`</div><div class='add'>+      - B\ :sub:`22high`</div><div class='add'>+      - G\ :sub:`23low`</div><div class='add'>+      - G\ :sub:`23high`</div><div class='add'>+    * - start + 24:</div><div class='add'>+      - G\ :sub:`30low`</div><div class='add'>+      - G\ :sub:`30high`</div><div class='add'>+      - R\ :sub:`31low`</div><div class='add'>+      - R\ :sub:`31high`</div><div class='add'>+      - G\ :sub:`32low`</div><div class='add'>+      - G\ :sub:`32high`</div><div class='add'>+      - R\ :sub:`33low`</div><div class='add'>+      - R\ :sub:`33high`</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb8.rst b/Documentation/media/uapi/v4l/pixfmt-srggb8.rst<br/>index a3987d2e97fd..5ac25a634d30 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-srggb8.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt-srggb8.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt-srggb8.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt-srggb8.rst</a></div><div class='hunk'>@@ -20,7 +20,7 @@ These four pixel formats are raw sRGB / Bayer formats with 8 bits per</div><div class='ctx'> sample. Each sample is stored in a byte. Each n-pixel row contains n/2</div><div class='ctx'> green samples and n/2 blue or red samples, with alternating red and</div><div class='ctx'> blue rows. They are conventionally described as GRGR... BGBG...,</div><div class='del'>-RGRG... GBGB..., etc. Below is an example of one of these formats:</div><div class='add'>+RGRG... GBGB..., etc. Below is an example of a small V4L2_PIX_FMT_SBGGR8 image:</div><div class='ctx'> </div><div class='ctx'> **Byte Order.**</div><div class='ctx'> Each cell is one byte.</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/pixfmt.rst b/Documentation/media/uapi/v4l/pixfmt.rst<br/>index 4d297f6eb5f1..4f184c7aedab 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/pixfmt.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/pixfmt.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/pixfmt.rst</a></div><div class='hunk'>@@ -29,6 +29,7 @@ see also :ref:`VIDIOC_G_FBUF &lt;VIDIOC_G_FBUF&gt;`.)</div><div class='ctx'>     pixfmt-indexed</div><div class='ctx'>     pixfmt-rgb</div><div class='ctx'>     yuv-formats</div><div class='add'>+    hsv-formats</div><div class='ctx'>     depth-formats</div><div class='ctx'>     pixfmt-013</div><div class='ctx'>     sdr-formats</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/selection-api-003.rst b/Documentation/media/uapi/v4l/selection-api-003.rst<br/>index 15cb3b79f12c..21686f93c38f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/selection-api-003.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/selection-api-003.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/selection-api-003.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/selection-api-003.rst</a></div><div class='hunk'>@@ -7,8 +7,8 @@ Selection targets</div><div class='ctx'> </div><div class='ctx'> .. _sel-targets-capture:</div><div class='ctx'> </div><div class='del'>-.. figure::  selection-api-003_files/selection.*</div><div class='del'>-    :alt:    selection.png</div><div class='add'>+.. figure::  selection.*</div><div class='add'>+    :alt:    selection.pdf / selection.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     Cropping and composing targets</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/selection-api-003_files/selection.png b/Documentation/media/uapi/v4l/selection-api-003_files/selection.png<br/>deleted file mode 100644<br/>index bfc523eae570..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/selection-api-003_files/selection.png?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/selection-api-003_files/selection.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/selection.svg b/Documentation/media/uapi/v4l/selection.svg<br/>new file mode 100644<br/>index 000000000000..d309187af967<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/selection.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/selection.svg</a></div><div class='hunk'>@@ -0,0 +1,5812 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:xlink="http://www.w3.org/1999/xlink"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="4226.3345"</div><div class='add'>+   height="1686.8481"</div><div class='add'>+   id="svg2"</div><div class='add'>+   sodipodi:version="0.32"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   sodipodi:docname="selection.svg"</div><div class='add'>+   inkscape:output_extension="org.inkscape.output.svg.inkscape"</div><div class='add'>+   version="1.0"</div><div class='add'>+   style="display:inline;enable-background:new"</div><div class='add'>+   inkscape:export-filename="/home/cheeseness/Documents/LCA09/mascot/tuz_final.png"</div><div class='add'>+   inkscape:export-xdpi="100.03588"</div><div class='add'>+   inkscape:export-ydpi="100.03588"&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     id="base"</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1.0"</div><div class='add'>+     gridtolerance="10000"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     inkscape:pageopacity="0.0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:zoom="0.32297491"</div><div class='add'>+     inkscape:cx="2113.1672"</div><div class='add'>+     inkscape:cy="843.42407"</div><div class='add'>+     inkscape:document-units="px"</div><div class='add'>+     inkscape:current-layer="layer16"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     showguides="false"</div><div class='add'>+     inkscape:guide-bbox="true"</div><div class='add'>+     units="mm"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0" /&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs4"&gt;</div><div class='add'>+    &lt;pattern</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#Strips1_1"</div><div class='add'>+       id="pattern5557"</div><div class='add'>+       patternTransform="matrix(5.4431804,0,0,10.10048,1808.3554,-48.222348)" /&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow1Send"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow1Send"</div><div class='add'>+       style="overflow:visible"</div><div class='add'>+       inkscape:isstock="true"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path7188"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"</div><div class='add'>+         style="fill:#f8d615;fill-opacity:1;fill-rule:evenodd;stroke:#f8d615;stroke-width:1pt;stroke-opacity:1"</div><div class='add'>+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+    &lt;pattern</div><div class='add'>+       inkscape:isstock="true"</div><div class='add'>+       inkscape:stockid="Stripes 1:1"</div><div class='add'>+       id="Strips1_1"</div><div class='add'>+       patternTransform="translate(0,0) scale(10,10)"</div><div class='add'>+       height="1"</div><div class='add'>+       width="2"</div><div class='add'>+       patternUnits="userSpaceOnUse"</div><div class='add'>+       inkscape:collect="always"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect5945"</div><div class='add'>+         height="2"</div><div class='add'>+         width="1"</div><div class='add'>+         y="-0.5"</div><div class='add'>+         x="0"</div><div class='add'>+         style="fill:#f815bb;stroke:none" /&gt;</div><div class='add'>+    &lt;/pattern&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient10954"</div><div class='add'>+       osb:paint="solid"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#d9f90b;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop10956" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient9165"</div><div class='add'>+       osb:paint="solid"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:0.31330472;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop9167" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       x="-0.084654994"</div><div class='add'>+       width="1.16931"</div><div class='add'>+       y="-0.36592469"</div><div class='add'>+       height="1.7318494"</div><div class='add'>+       id="filter11361"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="4.5740586"</div><div class='add'>+         id="feGaussianBlur11363" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient7622"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#ffffff;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop7624" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#ffffff;stop-opacity:0;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop7626" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient4113"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:0;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop4115" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop4117" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="linearGradient3660"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#ffffff;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop3662" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#ffffff;stop-opacity:0;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop3664" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient3627"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#ffffff;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop3629" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop3631" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient2843"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop2845"</div><div class='add'>+         offset="0"</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;"</div><div class='add'>+         offset="0.02188784"</div><div class='add'>+         id="stop2847" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;"</div><div class='add'>+         offset="0.75866222"</div><div class='add'>+         id="stop2849" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop2851"</div><div class='add'>+         offset="0.88508981"</div><div class='add'>+         style="stop-color:#232323;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop2853"</div><div class='add'>+         offset="1"</div><div class='add'>+         style="stop-color:#595959;stop-opacity:1;" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="linearGradient8964"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#1a1a1a;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop8966" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#1a1a1a;stop-opacity:0;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop8968" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient8952"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#0a0c0c;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop8954" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#1f2727;stop-opacity:0;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop8956" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient8430"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#1e2323;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop8432" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop8438"</div><div class='add'>+         offset="0.55992389"</div><div class='add'>+         style="stop-color:#181d1d;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop8434" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient8398"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#283131;stop-opacity:0;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop8400" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop8402"</div><div class='add'>+         offset="0.5125587"</div><div class='add'>+         style="stop-color:#1e2424;stop-opacity:0;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop8404" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="linearGradient4870"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#c7bd80;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop4872" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#c7bd80;stop-opacity:0;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop4874" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="linearGradient4862"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#e2e2e2;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop4864" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#e2e2e2;stop-opacity:0;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop4866" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient4478"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#f9eed3;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop4480" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:0;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop4482" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient4106"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#d9e002;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop4108" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop4114"</div><div class='add'>+         offset="0.5"</div><div class='add'>+         style="stop-color:#a9ae01;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#717501;stop-opacity:1;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop4110" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient4084"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#7d7d00;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop4086" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop4088"</div><div class='add'>+         offset="0.3636601"</div><div class='add'>+         style="stop-color:#c6c700;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#f6f800;stop-opacity:1;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop4090" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient4041"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop4043"</div><div class='add'>+         offset="0"</div><div class='add'>+         style="stop-color:#ffff00;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop4045"</div><div class='add'>+         offset="1"</div><div class='add'>+         style="stop-color:#ffff00;stop-opacity:0;" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient4025"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#ffffff;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop4027" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#ffffff;stop-opacity:0;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop4031" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient4013"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#ffff00;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop4015" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#b2b200;stop-opacity:1;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop4017" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient3985"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop3987" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#1d1d1d;stop-opacity:1;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop3989" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient3961"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#283131;stop-opacity:0;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop3963" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop3965"</div><div class='add'>+         offset="0.5"</div><div class='add'>+         style="stop-color:#1e2424;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop3967" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient3951"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop3953"</div><div class='add'>+         offset="0"</div><div class='add'>+         style="stop-color:#344040;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#222929;stop-opacity:1;"</div><div class='add'>+         offset="0.5"</div><div class='add'>+         id="stop3955" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop3957"</div><div class='add'>+         offset="1"</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient3909"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#283131;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop3911" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop3917"</div><div class='add'>+         offset="0.5"</div><div class='add'>+         style="stop-color:#1e2424;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop3913" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient3537"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#ada469;stop-opacity:1;"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop3539" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop3545"</div><div class='add'>+         offset="0.81132078"</div><div class='add'>+         style="stop-color:#ada469;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#ffffff;stop-opacity:1;"</div><div class='add'>+         offset="1"</div><div class='add'>+         id="stop3541" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       id="linearGradient3317"&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#cfc690;stop-opacity:1"</div><div class='add'>+         offset="0"</div><div class='add'>+         id="stop3319" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop3321"</div><div class='add'>+         offset="0.21161865"</div><div class='add'>+         style="stop-color:#afa775;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop3323"</div><div class='add'>+         offset="0.53408515"</div><div class='add'>+         style="stop-color:#615c3a;stop-opacity:1;" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         style="stop-color:#000000;stop-opacity:1;"</div><div class='add'>+         offset="0.76504093"</div><div class='add'>+         id="stop3325" /&gt;</div><div class='add'>+      &lt;stop</div><div class='add'>+         id="stop3327"</div><div class='add'>+         offset="1"</div><div class='add'>+         style="stop-color:#403518;stop-opacity:1;" /&gt;</div><div class='add'>+    &lt;/linearGradient&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3317"</div><div class='add'>+       id="radialGradient3315"</div><div class='add'>+       cx="543.6698"</div><div class='add'>+       cy="147.3131"</div><div class='add'>+       fx="543.6698"</div><div class='add'>+       fy="147.3131"</div><div class='add'>+       r="47.863216"</div><div class='add'>+       gradientTransform="matrix(2.1382256,0,0,2.3382884,-77.03847,-101.68704)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3537"</div><div class='add'>+       id="radialGradient3543"</div><div class='add'>+       cx="385"</div><div class='add'>+       cy="237.00504"</div><div class='add'>+       fx="385"</div><div class='add'>+       fy="237.00504"</div><div class='add'>+       r="86.928574"</div><div class='add'>+       gradientTransform="matrix(1,0,0,0.8562038,0,34.080427)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3909"</div><div class='add'>+       id="radialGradient3915"</div><div class='add'>+       cx="418.30365"</div><div class='add'>+       cy="342.47794"</div><div class='add'>+       fx="418.30365"</div><div class='add'>+       fy="342.47794"</div><div class='add'>+       r="131.4509"</div><div class='add'>+       gradientTransform="matrix(1.3957347,0.6211056,-0.4244067,0.9537174,-15.061913,-227.96711)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3951"</div><div class='add'>+       id="radialGradient3933"</div><div class='add'>+       cx="397.16388"</div><div class='add'>+       cy="336.95245"</div><div class='add'>+       fx="397.16388"</div><div class='add'>+       fy="336.95245"</div><div class='add'>+       r="36.75"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(1.9449972,2.4894837e-7,-2.4894833e-7,1.9449969,-375.31868,-318.41912)" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3961"</div><div class='add'>+       id="linearGradient3959"</div><div class='add'>+       x1="398.21429"</div><div class='add'>+       y1="343.52289"</div><div class='add'>+       x2="379.28571"</div><div class='add'>+       y2="265.30862"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="translate(450.03125,73.843964)" /&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter3981"</div><div class='add'>+       x="-0.30000001"</div><div class='add'>+       width="1.6"</div><div class='add'>+       y="-0.30000001"</div><div class='add'>+       height="1.6"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="2"</div><div class='add'>+         id="feGaussianBlur3983" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3985"</div><div class='add'>+       id="radialGradient3991"</div><div class='add'>+       cx="402.48898"</div><div class='add'>+       cy="317.23578"</div><div class='add'>+       fx="402.48898"</div><div class='add'>+       fy="317.23578"</div><div class='add'>+       r="23.714285"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(4.3776616,0,0,4.3776616,-1358.3025,-1070.7357)" /&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3999"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#f5ff04;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 179.64286,267.36218 c -22.41044,39.70292 -60.6161,115.78029 -69.28571,149.64286 -8.64721,33.7751 -8.77199,66.41654 -0.35715,86.42858 8.3602,19.88213 26.16398,35.6328 40.71428,41.42856 -0.59638,-14.37587 14.37295,-43.28583 72.85715,-72.5 58.62627,-29.28514 78.38163,-27.13086 103.57142,-47.14286 25.63006,-20.36176 12.61031,-67.04463 3.21429,-93.92857 -9.43424,-26.99328 -34.96741,-59.12448 -66.42857,-69.64285 -31.03327,-10.37532 -65.01776,-4.84837 -84.28571,5.71428 z"</div><div class='add'>+         id="path4001"</div><div class='add'>+         sodipodi:nodetypes="czzczzzzc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4013"</div><div class='add'>+       id="radialGradient4056"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(1.1323239,0.7659488,-1.4550286,2.1510098,588.75376,-711.79716)"</div><div class='add'>+       cx="228.81355"</div><div class='add'>+       cy="440.26971"</div><div class='add'>+       fx="228.81355"</div><div class='add'>+       fy="440.26971"</div><div class='add'>+       r="119.17509" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4041"</div><div class='add'>+       id="radialGradient4060"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(0.05911206,2.6869855,-0.7234268,0.01591495,408.72779,-424.56452)"</div><div class='add'>+       cx="275.4422"</div><div class='add'>+       cy="335.34866"</div><div class='add'>+       fx="275.4422"</div><div class='add'>+       fy="335.34866"</div><div class='add'>+       r="36.75" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4025"</div><div class='add'>+       id="radialGradient4062"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(0.05911206,2.6869855,-0.7234268,0.01591495,408.72779,-424.56452)"</div><div class='add'>+       cx="275.4422"</div><div class='add'>+       cy="335.34866"</div><div class='add'>+       fx="275.4422"</div><div class='add'>+       fy="335.34866"</div><div class='add'>+       r="36.75" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4084"</div><div class='add'>+       id="linearGradient4082"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="182.35046"</div><div class='add'>+       y1="256.11136"</div><div class='add'>+       x2="145.53348"</div><div class='add'>+       y2="542.20502" /&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath4100"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.9000755px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"</div><div class='add'>+         d="m 265.93541,126.68393 -18.76721,168.86308 174.10543,-73.12068 61.9544,88.65883 57.8844,-31.9903 -37.53442,-180.059677 -237.6426,27.648747 z"</div><div class='add'>+         id="path4102"</div><div class='add'>+         sodipodi:nodetypes="ccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4106"</div><div class='add'>+       id="radialGradient4112"</div><div class='add'>+       cx="250.22678"</div><div class='add'>+       cy="475.09763"</div><div class='add'>+       fx="250.22678"</div><div class='add'>+       fy="475.09763"</div><div class='add'>+       r="95.98877"</div><div class='add'>+       gradientTransform="matrix(1.2259004,-0.7077739,0.1413989,0.2449102,322.22326,608.91815)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4478"</div><div class='add'>+       id="linearGradient4484"</div><div class='add'>+       x1="412.08926"</div><div class='add'>+       y1="404.91574"</div><div class='add'>+       x2="417.375"</div><div class='add'>+       y2="401.82648"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4478"</div><div class='add'>+       id="linearGradient4486"</div><div class='add'>+       x1="411.91071"</div><div class='add'>+       y1="404.91577"</div><div class='add'>+       x2="417.375"</div><div class='add'>+       y2="401.82648"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4478"</div><div class='add'>+       id="linearGradient4488"</div><div class='add'>+       x1="411.91071"</div><div class='add'>+       y1="405.54077"</div><div class='add'>+       x2="417.375"</div><div class='add'>+       y2="401.82648"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4478"</div><div class='add'>+       id="linearGradient4490"</div><div class='add'>+       x1="412.08926"</div><div class='add'>+       y1="405.54077"</div><div class='add'>+       x2="417.375"</div><div class='add'>+       y2="401.82648"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4478"</div><div class='add'>+       id="linearGradient4492"</div><div class='add'>+       x1="411.73212"</div><div class='add'>+       y1="405.54077"</div><div class='add'>+       x2="417.375"</div><div class='add'>+       y2="401.82648"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4862"</div><div class='add'>+       id="radialGradient4868"</div><div class='add'>+       cx="429.56738"</div><div class='add'>+       cy="377.42877"</div><div class='add'>+       fx="429.56738"</div><div class='add'>+       fy="377.42877"</div><div class='add'>+       r="72.079735"</div><div class='add'>+       gradientTransform="matrix(1,0,0,0.618034,0,144.16496)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4870"</div><div class='add'>+       id="radialGradient4876"</div><div class='add'>+       cx="437.6991"</div><div class='add'>+       cy="391.21735"</div><div class='add'>+       fx="437.6991"</div><div class='add'>+       fy="391.21735"</div><div class='add'>+       r="36.611931"</div><div class='add'>+       gradientTransform="matrix(1,0,0,0.618034,0,149.43174)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4013"</div><div class='add'>+       id="radialGradient3585"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(1.1323239,0.7659488,-1.4550286,2.1510098,588.75376,-711.79716)"</div><div class='add'>+       cx="228.81355"</div><div class='add'>+       cy="440.26971"</div><div class='add'>+       fx="228.81355"</div><div class='add'>+       fy="440.26971"</div><div class='add'>+       r="119.17509" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4084"</div><div class='add'>+       id="linearGradient3587"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="182.35046"</div><div class='add'>+       y1="256.11136"</div><div class='add'>+       x2="145.53348"</div><div class='add'>+       y2="542.20502" /&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8514"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 352.24553,211.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.554046 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401283 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.35744 -122.78647,50.05304 -187.06988,59.00234 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.19824 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path8516"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8604"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 352.24553,211.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.554046 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401283 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.35744 -122.78647,50.05304 -187.06988,59.00234 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.19824 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path8606"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8610"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 352.24553,211.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.554046 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401283 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.35744 -122.78647,50.05304 -187.06988,59.00234 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.19824 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path8612"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8616"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 352.24553,211.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.554046 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401283 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.35744 -122.78647,50.05304 -187.06988,59.00234 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.19824 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path8618"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8622"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         d="m 821.64329,477.88997 c 0,0 22.61947,-6.50681 35.74275,-5.87273 13.12328,0.63409 30.64158,1.93862 43.70885,12.18619 13.06727,10.24756 25.06774,27.14007 34.11239,58.36965 9.04465,31.22958 1.69832,99.25201 -6.17603,143.34735 -7.87435,44.09534 -28.2651,106.11298 -45,140 -16.7349,33.88702 -49.79771,77.4952 -60.56943,89.87616 -11.36422,13.06197 -56.20589,36.42617 -79.43057,42.26667 5.3033,-10.6066 48.89976,-50.58884 35,-60.71426 -14.01897,-10.21226 -45.76009,45.98236 -84.29315,29.03317 21.38231,-13.13212 41.7794,-51.18606 34.04061,-66.59445 -7.84025,-15.61039 -30.70493,48.75757 -93.53554,37.01288 30.05204,-27.52666 55.40706,-70.90401 41.2627,-82.9797 -14.41516,-12.30687 -60.46175,54.29315 -60.46175,54.29315 0,0 -2.8219,-41.70118 13.7732,-68.60732 16.63935,-26.97787 79.65297,-81.61527 99.55313,-111.70342 19.90015,-30.08814 33.61256,-66.00902 42.13542,-92.51794 8.52286,-26.50892 15.80094,-77.09954 15.80094,-77.09954"</div><div class='add'>+         id="path8624"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzczczczczzzc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8642"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#0f0f0f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 366.88839,504.13471 c 0,0 -29.55406,40.57305 -47.85714,74.28571 -18.30309,33.71267 -58.62109,126.35694 -70.35714,171.07143 -11.7594,44.80344 -62.5,123.57144 -62.5,123.57144 l 76.07143,18.21428 c 0,0 11.80712,-12.82335 31.07142,-46.07143 19.2643,-33.24808 60.35715,-138.57143 60.35715,-138.57143 l 13.21428,-202.5 z"</div><div class='add'>+         id="path8644"</div><div class='add'>+         sodipodi:nodetypes="czzcczcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8658"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#0b0b0b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 569.03125,1018.7776 c -4.28571,0.7143 -27.62815,3.6181 -57.85714,10 -30.22899,6.3819 -99.77493,25.9619 -142.85715,35.7143 -43.08222,9.7524 -117.26443,34.816 -156.91262,27.2654 -39.64818,-7.5506 -89.51595,-64.4083 -89.51595,-64.4083 l 4.28572,-94.28571 c 0,0 85.88551,-16.20094 112.14285,-33.57143 26.25735,-17.37049 45.58238,-49.66598 59.28572,-71.42857 13.70334,-21.76259 32.85714,-71.42858 32.85714,-71.42858 l 238.57143,262.14289 z"</div><div class='add'>+         id="path8660"</div><div class='add'>+         sodipodi:nodetypes="czzzcczzcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8802"</div><div class='add'>+       x="-0.35311759"</div><div class='add'>+       width="1.7062352"</div><div class='add'>+       y="-0.1817714"</div><div class='add'>+       height="1.3635428"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="48.038491"</div><div class='add'>+         id="feGaussianBlur8804" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8806"</div><div class='add'>+       x="-0.61142862"</div><div class='add'>+       width="2.2228572"</div><div class='add'>+       y="-0.14930232"</div><div class='add'>+       height="1.2986046"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="37.830213"</div><div class='add'>+         id="feGaussianBlur8808" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8810"</div><div class='add'>+       x="-0.23519406"</div><div class='add'>+       width="1.4703881"</div><div class='add'>+       y="-0.24500646"</div><div class='add'>+       height="1.4900129"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="58.328041"</div><div class='add'>+         id="feGaussianBlur8812" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8814"</div><div class='add'>+       x="-0.20466694"</div><div class='add'>+       width="1.4093339"</div><div class='add'>+       y="-0.29007819"</div><div class='add'>+       height="1.5801564"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="22.300169"</div><div class='add'>+         id="feGaussianBlur8816" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8818"</div><div class='add'>+       x="-0.34381232"</div><div class='add'>+       width="1.6876246"</div><div class='add'>+       y="-0.18433961"</div><div class='add'>+       height="1.3686792"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="34.542167"</div><div class='add'>+         id="feGaussianBlur8820" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8822"</div><div class='add'>+       x="-0.2742857"</div><div class='add'>+       width="1.5485713"</div><div class='add'>+       y="-0.21333334"</div><div class='add'>+       height="1.4266667"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="11.313708"</div><div class='add'>+         id="feGaussianBlur8824" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8826"</div><div class='add'>+       x="-0.25894088"</div><div class='add'>+       width="1.5178818"</div><div class='add'>+       y="-0.2236412"</div><div class='add'>+       height="1.4472824"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="19.631544"</div><div class='add'>+         id="feGaussianBlur8828" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8856"</div><div class='add'>+       x="-0.3253231"</div><div class='add'>+       width="1.6506462"</div><div class='add'>+       y="-0.19013336"</div><div class='add'>+       height="1.3802667"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="28.712591"</div><div class='add'>+         id="feGaussianBlur8858" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8860"</div><div class='add'>+       x="-0.38093024"</div><div class='add'>+       width="1.7618605"</div><div class='add'>+       y="-0.17518716"</div><div class='add'>+       height="1.3503743"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="19.304015"</div><div class='add'>+         id="feGaussianBlur8862" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8888"</div><div class='add'>+       x="-0.2112188"</div><div class='add'>+       width="1.4224375"</div><div class='add'>+       y="-0.16808605"</div><div class='add'>+       height="1.3361721"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="8.3693583"</div><div class='add'>+         id="feGaussianBlur8890" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8892"</div><div class='add'>+       x="-0.18692794"</div><div class='add'>+       width="1.3738559"</div><div class='add'>+       y="-0.23646873"</div><div class='add'>+       height="1.4729375"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="31.21228"</div><div class='add'>+         id="feGaussianBlur8894" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8906"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 352.24553,211.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.554046 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401283 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.35744 -122.78647,50.05304 -187.06988,59.00234 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.19824 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path8908"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8940"</div><div class='add'>+       x="-0.25152978"</div><div class='add'>+       width="1.5030596"</div><div class='add'>+       y="-0.053035267"</div><div class='add'>+       height="1.1060705"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="13.024603"</div><div class='add'>+         id="feGaussianBlur8942" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient8952"</div><div class='add'>+       id="linearGradient8958"</div><div class='add'>+       x1="609.31244"</div><div class='add'>+       y1="239.46866"</div><div class='add'>+       x2="560.83142"</div><div class='add'>+       y2="262.86206"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="translate(450.03125,73.843964)" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient8964"</div><div class='add'>+       id="linearGradient8970"</div><div class='add'>+       x1="603.84064"</div><div class='add'>+       y1="627.85303"</div><div class='add'>+       x2="616.24396"</div><div class='add'>+       y2="585.42664"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="translate(450.03125,73.843964)" /&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter9020"</div><div class='add'>+       x="-0.32861114"</div><div class='add'>+       width="1.6572223"</div><div class='add'>+       y="-0.182"</div><div class='add'>+       height="1.364"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="20.912684"</div><div class='add'>+         id="feGaussianBlur9022" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter9024"</div><div class='add'>+       x="-0.55453134"</div><div class='add'>+       width="2.1090627"</div><div class='add'>+       y="-0.51434779"</div><div class='add'>+       height="2.0286956"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="20.912684"</div><div class='add'>+         id="feGaussianBlur9026" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter9044"</div><div class='add'>+       x="-0.32631579"</div><div class='add'>+       width="1.6526316"</div><div class='add'>+       y="-0.84545463"</div><div class='add'>+       height="2.6909094"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="21.92031"</div><div class='add'>+         id="feGaussianBlur9046" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter9048"</div><div class='add'>+       x="-0.40879121"</div><div class='add'>+       width="1.8175824"</div><div class='add'>+       y="-0.71538466"</div><div class='add'>+       height="2.4307692"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="21.92031"</div><div class='add'>+         id="feGaussianBlur9050" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter3587"</div><div class='add'>+       x="-0.1"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="8.881432"</div><div class='add'>+         id="feGaussianBlur3589" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3602"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzczczczczzzc"</div><div class='add'>+         id="path3604"</div><div class='add'>+         d="m 647.61204,540.04601 c 0,0 22.61947,-6.50681 35.74275,-5.87273 13.12328,0.63409 30.64158,1.93862 43.70885,12.18619 13.06727,10.24756 25.06774,27.14007 34.11239,58.36965 9.04465,31.22958 1.69832,99.25201 -6.17603,143.34735 -7.87435,44.09534 -28.2651,106.11298 -45,140 -16.7349,33.88702 -49.79771,77.4952 -60.56943,89.87616 -11.36422,13.06197 -56.20589,36.42617 -79.43057,42.26667 5.3033,-10.6066 48.89976,-50.58884 35,-60.71426 -14.01897,-10.21226 -45.76009,45.98236 -84.29315,29.03317 21.38231,-13.13212 41.7794,-51.18606 34.04061,-66.59445 -7.84025,-15.61039 -30.70493,48.75757 -93.53554,37.01288 30.05204,-27.52666 55.40706,-70.90401 41.2627,-82.9797 -14.41516,-12.30687 -60.46175,54.29315 -60.46175,54.29315 0,0 -2.8219,-41.70118 13.7732,-68.60732 16.63935,-26.97787 79.65297,-81.61527 99.55313,-111.70342 19.90015,-30.08814 33.61256,-66.00902 42.13542,-92.51794 8.52286,-26.50892 15.80094,-77.09954 15.80094,-77.09954"</div><div class='add'>+         style="display:inline;opacity:1;fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4120"</div><div class='add'>+       x="-0.2770822"</div><div class='add'>+       width="1.5541644"</div><div class='add'>+       y="-0.32482043"</div><div class='add'>+       height="1.6496409"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="19.956289"</div><div class='add'>+         id="feGaussianBlur4122" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3631"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         d="m 760.16396,935.83377 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.91234 -3.78268,51.80084 -2.90046,70.65614 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.08394 38.76107,-114.49737 44.6608,-149.76859 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         id="path3633"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3665"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzcczcc"</div><div class='add'>+         id="path3667"</div><div class='add'>+         d="m 366.88839,504.13471 c 0,0 -29.55406,40.57305 -47.85714,74.28571 -18.30309,33.71267 -58.62109,126.35694 -70.35714,171.07143 -11.7594,44.80344 -62.5,123.57144 -62.5,123.57144 l 76.07143,18.21428 c 0,0 11.80712,-12.82335 31.07142,-46.07143 19.2643,-33.24808 60.35715,-138.57143 60.35715,-138.57143 l 13.21428,-202.5 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#0f0f0f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3677"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         d="m 586.13271,997.98981 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.9123 -3.78268,51.8008 -2.90046,70.6561 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.0839 38.76107,-114.49733 44.6608,-149.76855 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         id="path3679"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter3898"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="10.892985"</div><div class='add'>+         id="feGaussianBlur3900" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4130"</div><div class='add'>+       x="-0.49509686"</div><div class='add'>+       width="1.9901937"</div><div class='add'>+       y="-0.26708817"</div><div class='add'>+       height="1.5341763"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="10.730622"</div><div class='add'>+         id="feGaussianBlur4132" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4141"</div><div class='add'>+       x="-0.40611032"</div><div class='add'>+       width="1.8122206"</div><div class='add'>+       y="-0.30260596"</div><div class='add'>+       height="1.6052119"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="9.8586086"</div><div class='add'>+         id="feGaussianBlur4143" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath4177"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path4179"</div><div class='add'>+         d="m 586.13271,997.98981 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.9123 -3.78268,51.8008 -2.90046,70.6561 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.0839 38.76107,-114.49733 44.6608,-149.76855 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4185"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="3.6164709"</div><div class='add'>+         id="feGaussianBlur4187" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4105"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="3.8640966"</div><div class='add'>+         id="feGaussianBlur4107" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath2833"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#292929;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 569.03125,1018.7776 c -4.28571,0.7143 -27.62815,3.6181 -57.85714,10 -30.22899,6.3819 -57.31395,4.9661 -135.78608,17.3296 -79.85178,12.5808 -94.06436,42.5423 -108.12225,47.0643 -14.70014,4.7286 -145.37739,-65.8225 -145.37739,-65.8225 l 4.28572,-94.28571 c 0,0 85.88551,-16.20094 112.14285,-33.57143 26.25735,-17.37049 45.58238,-49.66598 59.28572,-71.42857 13.70334,-21.76259 32.85714,-71.42858 32.85714,-71.42858 l 238.57143,262.14289 z"</div><div class='add'>+         id="path2835"</div><div class='add'>+         sodipodi:nodetypes="czzzcczzcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient2843"</div><div class='add'>+       id="linearGradient2841"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="347.89655"</div><div class='add'>+       y1="1070.2124"</div><div class='add'>+       x2="275.58191"</div><div class='add'>+       y2="867.97992" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3627"</div><div class='add'>+       id="linearGradient3688"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="699.32867"</div><div class='add'>+       y1="269.76755"</div><div class='add'>+       x2="698.97504"</div><div class='add'>+       y2="346.1351" /&gt;</div><div class='add'>+    &lt;mask</div><div class='add'>+       maskUnits="userSpaceOnUse"</div><div class='add'>+       id="mask3684"&gt;</div><div class='add'>+      &lt;ellipse</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3688);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.43724918px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         id="path3686"</div><div class='add'>+         transform="translate(-174.03125,62.156036)"</div><div class='add'>+         cx="579.474"</div><div class='add'>+         cy="260.57516"</div><div class='add'>+         rx="192.6866"</div><div class='add'>+         ry="164.04877" /&gt;</div><div class='add'>+    &lt;/mask&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3622"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         d="m 266.27183,924.57186 c -1.40727,18.80121 -1.1449,32.75103 2.08174,49.30328 3.22665,16.55234 16.40608,45.90736 20.3344,63.18376 3.92622,17.2671 2.69413,38.3096 -12.45944,51.1482 -15.31761,12.9774 -42.05127,21.5989 -67.8323,15.7338 -25.78106,-5.8653 -69.54907,-49.2234 -88.59019,-70.2283 C 100.6939,1012.6293 56.045183,939.86194 41.867508,909.43681 27.689836,879.01169 29.207903,872.71824 33.747793,863.90708 24.381071,839.38658 21.334081,813.84027 0.03533552,788.33044 30.360815,791.44488 43.915625,815.28677 60.161025,835.47019 54.631129,787.39416 42.10631,771.05369 31.787073,744.74589 c 29.994295,6.08166 50.57936,31.8724 63.979783,72.7125 9.554154,-3.91791 18.237764,-9.37294 30.187414,-9.0612 -11.2975,-41.6958 -17.94946,-69.91584 -36.687255,-101.06994 53.441965,5.67033 83.657025,80.63932 78.971425,87.9608 9.97797,-2.24399 19.00565,-6.53038 30.43653,-5.65167 -11.24896,-38.34702 -21.04781,-76.8679 -3.65971,-118.64818 0,0 48.28678,65.43687 54.38966,85.80577 6.10287,20.36891 1.51881,38.70052 1.51881,38.70052 0,0 16.95957,31.08529 20.29392,51.09413 3.3731,20.24135 -3.53269,59.10332 -4.94582,77.98324 z"</div><div class='add'>+         id="path3624"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3636"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         d="m 760.16396,935.83377 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.91234 -3.78268,51.80084 -2.90046,70.65614 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.08394 38.76107,-114.49737 44.6608,-149.76859 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         id="path3638"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3660"</div><div class='add'>+       id="linearGradient3666"</div><div class='add'>+       x1="1255.7386"</div><div class='add'>+       y1="667.09216"</div><div class='add'>+       x2="893.69995"</div><div class='add'>+       y2="858.01099"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter3779"</div><div class='add'>+       x="-0.087980822"</div><div class='add'>+       width="1.1759616"</div><div class='add'>+       y="-0.17728332"</div><div class='add'>+       height="1.3545666"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="16.340344"</div><div class='add'>+         id="feGaussianBlur3781" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       id="filter3785"</div><div class='add'>+       inkscape:label="White Fur"&gt;</div><div class='add'>+      &lt;feTurbulence</div><div class='add'>+         id="feTurbulence3787"</div><div class='add'>+         type="fractalNoise"</div><div class='add'>+         baseFrequency="0.24044943820224721"</div><div class='add'>+         numOctaves="10"</div><div class='add'>+         seed="655"</div><div class='add'>+         result="result0" /&gt;</div><div class='add'>+      &lt;feDisplacementMap</div><div class='add'>+         id="feDisplacementMap3789"</div><div class='add'>+         in="SourceGraphic"</div><div class='add'>+         in2="result0"</div><div class='add'>+         scale="62"</div><div class='add'>+         xChannelSelector="B"</div><div class='add'>+         yChannelSelector="G" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter3677"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="2.0397518"</div><div class='add'>+         id="feGaussianBlur3679" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3722"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#121212;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 709.28572,844.50504 c 54.28571,-1.42857 126.035,-15.05199 170,-26.78572 44.05271,-11.75714 125.88628,-36.34724 175.35708,-57.85714 49.3393,-21.45272 113.6037,-59.2816 154.2858,-92.14285 40.5081,-32.72069 52.3899,-55.81981 60.7143,-33.57143 8.3691,22.36779 -16.407,56.32562 -37.8572,81.07143 -21.6041,24.9234 -52.7313,52.70533 -98.9286,89.28571 C 1086.6598,841.08542 976.77458,906.08967 920,933.07647 c -57.06606,27.12536 -128.20334,58.23842 -172.14286,72.50003 -43.93952,14.2616 -131.42857,31.0714 -131.42857,31.0714 l 92.85715,-192.14286 z"</div><div class='add'>+         id="path3724"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzzzcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3986"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#121212;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 709.28572,844.50504 c 54.28571,-1.42857 126.035,-15.05199 170,-26.78572 44.05271,-11.75714 125.88628,-36.34724 175.35708,-57.85714 49.3393,-21.45272 113.6037,-59.2816 154.2858,-92.14285 40.5081,-32.72069 52.3899,-55.81981 60.7143,-33.57143 8.3691,22.36779 -16.407,56.32562 -37.8572,81.07143 -21.6041,24.9234 -52.7313,52.70533 -98.9286,89.28571 C 1086.6598,841.08542 976.77458,906.08967 920,933.07647 c -57.06606,27.12536 -128.20334,58.23842 -172.14286,72.50003 -43.93952,14.2616 -131.42857,31.0714 -131.42857,31.0714 l 92.85715,-192.14286 z"</div><div class='add'>+         id="path3988"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzzzcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3992"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#121212;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 709.28572,844.50504 c 54.28571,-1.42857 126.035,-15.05199 170,-26.78572 44.05271,-11.75714 125.88628,-36.34724 175.35708,-57.85714 49.3393,-21.45272 113.6037,-59.2816 154.2858,-92.14285 40.5081,-32.72069 52.3899,-55.81981 60.7143,-33.57143 8.3691,22.36779 -16.407,56.32562 -37.8572,81.07143 -21.6041,24.9234 -52.7313,52.70533 -98.9286,89.28571 C 1086.6598,841.08542 976.77458,906.08967 920,933.07647 c -57.06606,27.12536 -128.20334,58.23842 -172.14286,72.50003 -43.93952,14.2616 -131.42857,31.0714 -131.42857,31.0714 l 92.85715,-192.14286 z"</div><div class='add'>+         id="path3994"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzzzcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3998"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 178.21428,274.14789 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.55405 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401287 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.3574 -122.78647,50.053 -187.06988,59.0023 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.1982 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path4000"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4002"</div><div class='add'>+       x="-0.24334238"</div><div class='add'>+       width="1.4866848"</div><div class='add'>+       y="-0.39104807"</div><div class='add'>+       height="1.7820961"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="14.589518"</div><div class='add'>+         id="feGaussianBlur4004" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4010"</div><div class='add'>+       x="-0.14577261"</div><div class='add'>+       width="1.2915452"</div><div class='add'>+       y="-0.23523259"</div><div class='add'>+       height="1.4704652"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="4.4442907"</div><div class='add'>+         id="feGaussianBlur4012" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4053"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.6062947"</div><div class='add'>+         id="feGaussianBlur4055" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4079"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="6.5887624"</div><div class='add'>+         id="feGaussianBlur4081" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4083"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.5052066"</div><div class='add'>+         id="feGaussianBlur4085" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4113"</div><div class='add'>+       id="radialGradient4119"</div><div class='add'>+       cx="296.33783"</div><div class='add'>+       cy="427.17749"</div><div class='add'>+       fx="296.33783"</div><div class='add'>+       fy="427.17749"</div><div class='add'>+       r="19.704132"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(2.9797125,0,0,2.9797125,-599.28727,-827.0855)" /&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6949"</div><div class='add'>+       x="-0.10294895"</div><div class='add'>+       width="1.2058979"</div><div class='add'>+       y="-0.34224695"</div><div class='add'>+       height="1.6844939"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6951" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6953"</div><div class='add'>+       x="-0.098320946"</div><div class='add'>+       width="1.1966419"</div><div class='add'>+       y="-0.19750816"</div><div class='add'>+       height="1.3950163"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6955" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6957"</div><div class='add'>+       x="-0.098213427"</div><div class='add'>+       width="1.1964267"</div><div class='add'>+       y="-0.19838208"</div><div class='add'>+       height="1.3967642"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6959" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6961"</div><div class='add'>+       x="-0.09919104"</div><div class='add'>+       width="1.1983821"</div><div class='add'>+       y="-0.22643611"</div><div class='add'>+       height="1.4528722"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6963" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6965"</div><div class='add'>+       x="-0.099081434"</div><div class='add'>+       width="1.1981629"</div><div class='add'>+       y="-0.22529824"</div><div class='add'>+       height="1.4505965"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6967" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6969"</div><div class='add'>+       x="-0.10450897"</div><div class='add'>+       width="1.2090179"</div><div class='add'>+       y="-0.40468886"</div><div class='add'>+       height="1.8093777"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6971" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6973"</div><div class='add'>+       x="-0.10330495"</div><div class='add'>+       width="1.2066098"</div><div class='add'>+       y="-0.36439717"</div><div class='add'>+       height="1.7287945"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6975" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6977"</div><div class='add'>+       x="-0.10224481"</div><div class='add'>+       width="1.2044896"</div><div class='add'>+       y="-0.32371372"</div><div class='add'>+       height="1.6474274"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6979" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6981"</div><div class='add'>+       x="-0.10052545"</div><div class='add'>+       width="1.2010509"</div><div class='add'>+       y="-0.2742162"</div><div class='add'>+       height="1.5484324"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6983" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6985"</div><div class='add'>+       x="-0.098428868"</div><div class='add'>+       width="1.1968577"</div><div class='add'>+       y="-0.20853186"</div><div class='add'>+       height="1.4170637"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6987" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6989"</div><div class='add'>+       x="-0.098428868"</div><div class='add'>+       width="1.1968577"</div><div class='add'>+       y="-0.20287035"</div><div class='add'>+       height="1.4057407"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6991" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6993"</div><div class='add'>+       x="-0.098213255"</div><div class='add'>+       width="1.1964265"</div><div class='add'>+       y="-0.19838208"</div><div class='add'>+       height="1.3967642"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6995" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6997"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6999" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7001"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur7003" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7285"</div><div class='add'>+       x="-0.030884685"</div><div class='add'>+       width="1.0617694"</div><div class='add'>+       y="-0.10267408"</div><div class='add'>+       height="1.2053483"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7287" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7289"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7291" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7293"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7295" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7297"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7299" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7301"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7303" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7305"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7307" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7309"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7311" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7313"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7315" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7317"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7319" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7321"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7323" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7325"</div><div class='add'>+       x="-0.031352691"</div><div class='add'>+       width="1.0627054"</div><div class='add'>+       y="-0.12140666"</div><div class='add'>+       height="1.2428133"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7327" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7329"</div><div class='add'>+       x="-0.030991485"</div><div class='add'>+       width="1.061983"</div><div class='add'>+       y="-0.10931916"</div><div class='add'>+       height="1.2186383"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7331" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7333"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7335" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7337"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7339" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7345"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.7233839"</div><div class='add'>+         id="feGaussianBlur7347" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath7421"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:type="inkscape:offset"</div><div class='add'>+         inkscape:radius="0"</div><div class='add'>+         inkscape:original="M 1111.4062 -285.9375 L 1107.4688 -284.0625 C 1107.4283 -284.05228 1107.3692 -284.04201 1107.3438 -284.03125 C 1106.925 -283.8184 1107.1791 -283.93067 1106.6875 -283.71875 C 1106.2014 -283.50919 1104.9499 -283.13456 1102.5938 -282.25 C 1099.2626 -280.99942 1096.7895 -280.10016 1095.5938 -279.1875 C 1094.0576 -279.16623 1091.8733 -278.95419 1089.9375 -278.46875 C 1086.956 -277.72108 1085.0823 -277.29474 1083.1875 -276.875 C 1081.2927 -276.45527 1081.512 -276.23281 1080.3125 -276 C 1079.0159 -275.74833 1078.5911 -276.00899 1074.875 -275.21875 C 1071.3851 -274.4766 1065.9802 -273.28768 1064.7188 -272.53125 C 1063.1348 -272.71203 1060.8513 -272.85303 1058.875 -272.5625 C 1055.8346 -272.11554 1053.9588 -271.88974 1052.0312 -271.65625 C 1051.3758 -271.57687 1050.9902 -271.45547 1050.6875 -271.375 C 1050.2613 -271.24334 1050.0017 -271.11498 1049.3125 -271.03125 C 1048.0009 -270.87188 1047.5503 -271.18808 1043.7812 -270.75 C 1040.2273 -270.33691 1034.7758 -269.47718 1033.5312 -268.8125 C 1031.9322 -269.10979 1029.6735 -269.34669 1027.6875 -269.15625 C 1024.6287 -268.86293 1022.7155 -268.67226 1020.7812 -268.5 C 1018.847 -268.32773 1019.0926 -268.07763 1017.875 -267.96875 C 1016.5588 -267.85105 1016.1152 -268.13238 1012.3438 -267.71875 C 1008.8017 -267.3303 1003.3359 -266.50948 1002.0625 -265.84375 C 1000.4636 -266.13844 998.1753 -266.35076 996.1875 -266.15625 C 993.12921 -265.857 991.2463 -265.67601 989.3125 -265.5 C 988.65501 -265.44015 988.27245 -265.32144 987.96875 -265.25 C 987.54105 -265.13104 987.28525 -265.03193 986.59375 -264.96875 C 985.27775 -264.84849 984.834 -265.16363 981.0625 -264.75 C 977.50631 -264.35998 972.0569 -263.51084 970.8125 -262.84375 C 969.21381 -263.13793 966.95265 -263.36747 964.96875 -263.15625 C 961.91305 -262.83092 959.9947 -262.63001 958.0625 -262.4375 C 956.13031 -262.24499 956.37275 -261.99662 955.15625 -261.875 C 953.84137 -261.74353 953.3932 -262.03954 949.625 -261.59375 C 946.08611 -261.17509 940.6473 -260.30158 939.375 -259.625 C 937.77741 -259.90604 935.51505 -260.04543 933.53125 -259.8125 C 930.47927 -259.45413 928.58625 -259.24464 926.65625 -259.03125 C 926.00007 -258.95869 925.6156 -258.85856 925.3125 -258.78125 C 924.88571 -258.65402 924.6276 -258.51405 923.9375 -258.4375 C 922.62411 -258.29181 922.17015 -258.61152 918.40625 -258.125 C 914.85737 -257.66624 909.4276 -256.70598 908.1875 -256 C 906.59441 -256.24424 904.3537 -256.38135 902.375 -256.125 C 899.32741 -255.73018 897.4243 -255.47655 895.5 -255.21875 C 893.57571 -254.96096 893.7739 -254.72522 892.5625 -254.5625 C 891.25301 -254.3866 890.8153 -254.66688 887.0625 -254.09375 C 883.53821 -253.55551 878.1393 -252.39458 876.875 -251.65625 C 875.28751 -251.85979 873.0295 -251.91098 871.0625 -251.5625 C 868.03631 -251.02638 866.1636 -250.70081 864.25 -250.375 C 863.59941 -250.26423 863.2363 -250.10406 862.9375 -250 C 862.51681 -249.83512 862.27405 -249.6687 861.59375 -249.53125 C 860.29905 -249.26966 859.86665 -249.53745 856.15625 -248.71875 C 852.65777 -247.9468 847.31035 -246.33582 846.09375 -245.5 C 844.53085 -245.57745 842.33625 -245.41472 840.40625 -244.90625 C 837.43387 -244.12312 835.58855 -243.67416 833.71875 -243.15625 C 831.84875 -242.63835 832.0521 -242.38897 830.875 -242.0625 C 829.60251 -241.7096 829.17795 -241.95541 825.53125 -240.875 C 822.10657 -239.86037 816.88185 -237.94183 815.65625 -237.03125 C 814.11747 -237.01851 811.93645 -236.75903 810.03125 -236.15625 C 807.10027 -235.22891 805.2809 -234.69783 803.4375 -234.09375 C 802.81071 -233.88837 802.44585 -233.70117 802.15625 -233.5625 C 801.74867 -233.34889 801.50295 -233.15375 800.84375 -232.9375 C 799.58925 -232.52596 799.1576 -232.74846 795.5625 -231.5 C 792.17261 -230.32283 786.96755 -228.2863 785.78125 -227.34375 C 784.25737 -227.28408 782.1312 -226.94888 780.25 -226.28125 C 777.35261 -225.25296 775.55095 -224.60577 773.71875 -223.96875 C 771.88655 -223.33174 772.0909 -223.12021 770.9375 -222.71875 C 769.69071 -222.28479 769.27395 -222.51903 765.71875 -221.15625 C 762.38005 -219.87645 757.23165 -217.6737 756.03125 -216.6875 C 754.52407 -216.57981 752.39555 -216.1887 750.53125 -215.46875 C 747.66307 -214.36115 745.90735 -213.68719 744.09375 -213 C 743.47705 -212.76637 743.0973 -212.55797 742.8125 -212.40625 C 742.81251 -212.40625 742.8125 -212.37673 742.8125 -212.375 L 734.8125 -209.1875 L 736.625 -194.46875 C 736.36701 -194.52956 742.8125 -191.15625 742.8125 -191.15625 C 743.03891 -191.30093 743.26145 -191.42886 743.53125 -191.53125 C 744.61177 -191.94123 745.70285 -191.74702 749.53125 -193.21875 C 753.35977 -194.69049 754.7553 -195.22373 755.4375 -195.625 C 756.11711 -196.02478 757.04925 -196.50437 757.65625 -197.15625 C 759.48317 -197.294 761.22705 -197.64948 762.59375 -198.15625 C 765.56175 -199.25677 767.4691 -199.96244 769.375 -200.625 C 771.28081 -201.28754 771.72915 -202.03987 772.78125 -202.40625 C 773.87287 -202.78636 774.97635 -202.57163 778.84375 -203.9375 C 782.71115 -205.30336 784.1269 -205.76458 784.8125 -206.15625 C 785.51361 -206.55677 786.5133 -207.08923 787.125 -207.75 C 789.09581 -207.80466 790.94195 -208.13463 792.40625 -208.625 C 795.40777 -209.63008 797.3324 -210.24671 799.25 -210.875 C 800.78861 -211.3791 801.42415 -211.92177 802.15625 -212.3125 C 802.38647 -212.44681 802.63215 -212.56623 802.90625 -212.65625 C 804.00457 -213.01673 805.0877 -212.73762 809 -213.96875 C 812.91231 -215.19988 814.366 -215.6417 815.0625 -216 C 815.75641 -216.35697 816.6926 -216.79261 817.3125 -217.40625 C 819.17771 -217.42891 820.94835 -217.67308 822.34375 -218.09375 C 825.37415 -219.00729 827.33615 -219.52385 829.28125 -220.0625 C 831.22637 -220.60114 831.70745 -221.32702 832.78125 -221.625 C 833.89527 -221.93415 835.00125 -221.61761 838.96875 -222.65625 C 842.93625 -223.69488 844.38625 -224.08898 845.09375 -224.40625 C 845.82855 -224.73584 846.90765 -225.15997 847.53125 -225.78125 C 849.52907 -225.66525 851.3887 -225.80134 852.875 -226.15625 C 855.95311 -226.89125 857.9584 -227.25719 859.9375 -227.65625 C 861.52541 -227.97643 862.1818 -228.4468 862.9375 -228.75 C 863.17501 -228.8568 863.4044 -228.94276 863.6875 -229 C 864.82091 -229.22919 865.99215 -228.79107 870.03125 -229.5 C 874.07067 -230.20893 875.5315 -230.42709 876.25 -230.6875 C 876.96581 -230.94694 877.95435 -231.25474 878.59375 -231.78125 C 880.51795 -231.54176 882.34165 -231.55672 883.78125 -231.78125 C 886.90767 -232.26887 888.9358 -232.48192 890.9375 -232.75 C 892.93921 -233.01807 893.42625 -233.69514 894.53125 -233.84375 C 895.67767 -233.99793 896.8071 -233.54218 900.875 -234.0625 C 904.94281 -234.58282 906.43525 -234.75823 907.15625 -235 C 907.89337 -235.24714 908.95435 -235.58623 909.59375 -236.125 C 911.64375 -235.78947 913.56745 -235.72704 915.09375 -235.90625 C 918.23595 -236.27521 920.27375 -236.46561 922.28125 -236.6875 C 923.89207 -236.86552 924.5459 -237.2957 925.3125 -237.53125 C 925.55341 -237.61677 925.80655 -237.68685 926.09375 -237.71875 C 927.24345 -237.84647 928.39505 -237.3721 932.46875 -237.84375 C 936.54245 -238.3154 938.0278 -238.45435 938.75 -238.6875 C 939.46941 -238.91977 940.45025 -239.16096 941.09375 -239.65625 C 943.03005 -239.32279 944.8638 -239.25201 946.3125 -239.40625 C 949.45851 -239.7412 951.49 -239.92484 953.5 -240.125 C 955.50991 -240.32514 955.98415 -240.95139 957.09375 -241.0625 C 958.24485 -241.17778 959.39025 -240.69744 963.46875 -241.125 C 967.54725 -241.55256 969.05765 -241.68709 969.78125 -241.90625 C 970.52047 -242.13011 971.57685 -242.4195 972.21875 -242.9375 C 974.27575 -242.53883 976.2206 -242.4441 977.75 -242.59375 C 980.89871 -242.90185 982.9258 -243.067 984.9375 -243.25 C 986.55151 -243.39682 987.20055 -243.81055 987.96875 -244.03125 C 988.21005 -244.11211 988.4623 -244.16116 988.75 -244.1875 C 989.90211 -244.29295 991.0429 -243.79475 995.125 -244.1875 C 999.20711 -244.58025 1000.7139 -244.71834 1001.4375 -244.9375 C 1002.1584 -245.15583 1003.1371 -245.3852 1003.7812 -245.875 C 1005.7193 -245.52501 1007.5501 -245.42062 1009 -245.5625 C 1012.1487 -245.8706 1014.1758 -246.03575 1016.1875 -246.21875 C 1018.1991 -246.40174 1018.7017 -247.05677 1019.8125 -247.15625 C 1020.9648 -247.25948 1022.1047 -246.77142 1026.1875 -247.15625 C 1030.2704 -247.54107 1031.7762 -247.65725 1032.5 -247.875 C 1033.2393 -248.09743 1034.2956 -248.38949 1034.9375 -248.90625 C 1036.9949 -248.50448 1038.9404 -248.40292 1040.4688 -248.5625 C 1043.6153 -248.89102 1045.6458 -249.0852 1047.6562 -249.28125 C 1049.2692 -249.43854 1049.9219 -249.91273 1050.6875 -250.15625 C 1050.9282 -250.24429 1051.1507 -250.27762 1051.4375 -250.3125 C 1052.5858 -250.4522 1053.7542 -249.97259 1057.8125 -250.5625 C 1061.8708 -251.15242 1063.3743 -251.33964 1064.0938 -251.59375 C 1064.8104 -251.84691 1065.7684 -252.15182 1066.4062 -252.6875 C 1068.3259 -252.47556 1070.1262 -252.53609 1071.5625 -252.78125 C 1074.6816 -253.31365 1076.6741 -253.70986 1078.6562 -254.09375 C 1080.6383 -254.47762 1081.1305 -255.1334 1082.2188 -255.375 C 1083.3475 -255.62566 1084.489 -255.25871 1088.4688 -256.25 C 1092.4483 -257.24127 1093.8983 -257.6693 1094.5938 -258.03125 C 1095.316 -258.40725 1096.3555 -258.90183 1096.9688 -259.5625 C 1098.9317 -259.57454 1100.7625 -259.85355 1102.1875 -260.40625 C 1105.1387 -261.55085 1107.0607 -262.27567 1108.875 -263.15625 C 1110.3307 -263.86277 1111.1941 -264.85828 1111.4062 -265.15625 C 1111.6185 -265.4542 1111.5051 -265.8848 1111.5312 -265.90625 C 1111.5742 -265.94148 1111.8716 -266.00028 1112.0312 -266.34375 C 1112.8902 -268.19082 1114.3544 -271.97139 1114.4688 -272.65625 C 1114.5825 -273.33839 1114.6368 -274.00902 1114.6875 -274.40625 C 1114.7169 -274.63575 1114.5404 -275.28515 1114.5625 -275.34375 C 1114.5934 -275.42579 1114.8508 -275.59432 1114.9062 -275.84375 C 1115.1725 -277.04206 1114.9953 -278.05111 1114.7812 -279.46875 C 1114.5673 -280.88638 1113.8096 -284.08338 1113.1562 -284.9375 C 1112.4973 -285.79922 1111.9314 -285.94801 1111.4062 -285.9375 z "</div><div class='add'>+         style="display:inline;fill:#bcb786;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         id="path7423"</div><div class='add'>+         d="m 1111.4062,-285.9375 -3.9374,1.875 c -0.041,0.0102 -0.1,0.0205 -0.125,0.0312 -0.4188,0.21285 -0.1647,0.10058 -0.6563,0.3125 -0.4861,0.20956 -1.7376,0.58419 -4.0937,1.46875 -3.3312,1.25058 -5.8043,2.14984 -7,3.0625 -1.5362,0.0213 -3.7205,0.23331 -5.6563,0.71875 -2.9815,0.74767 -4.8552,1.17401 -6.75,1.59375 -1.8948,0.41973 -1.6755,0.64219 -2.875,0.875 -1.2966,0.25167 -1.7214,-0.009 -5.4375,0.78125 -3.4899,0.74215 -8.8948,1.93107 -10.1562,2.6875 -1.584,-0.18078 -3.8675,-0.32178 -5.8438,-0.0312 -3.0404,0.44696 -4.9162,0.67276 -6.8438,0.90625 -0.6554,0.0794 -1.041,0.20078 -1.3437,0.28125 -0.4262,0.13166 -0.6858,0.26002 -1.375,0.34375 -1.3116,0.15937 -1.7622,-0.15683 -5.5313,0.28125 -3.5539,0.41309 -9.0054,1.27282 -10.25,1.9375 -1.599,-0.29729 -3.8577,-0.53419 -5.8437,-0.34375 -3.0588,0.29332 -4.972,0.48399 -6.9063,0.65625 -1.9342,0.17227 -1.6886,0.42237 -2.9062,0.53125 -1.3162,0.1177 -1.7598,-0.16363 -5.5312,0.25 -3.5421,0.38845 -9.0079,1.20927 -10.2813,1.875 -1.5989,-0.29469 -3.8872,-0.50701 -5.875,-0.3125 -3.05829,0.29925 -4.9412,0.48024 -6.875,0.65625 -0.65749,0.0598 -1.04005,0.17856 -1.34375,0.25 -0.4277,0.11896 -0.6835,0.21807 -1.375,0.28125 -1.316,0.12026 -1.75975,-0.19488 -5.53125,0.21875 -3.55619,0.39002 -9.0056,1.23916 -10.25,1.90625 -1.59869,-0.29418 -3.85985,-0.52372 -5.84375,-0.3125 -3.0557,0.32533 -4.97405,0.52624 -6.90625,0.71875 -1.93219,0.19251 -1.68975,0.44088 -2.90625,0.5625 -1.31488,0.13147 -1.76305,-0.16454 -5.53125,0.28125 -3.53889,0.41866 -8.9777,1.29217 -10.25,1.96875 -1.59759,-0.28104 -3.85995,-0.42043 -5.84375,-0.1875 -3.05198,0.35837 -4.945,0.56786 -6.875,0.78125 -0.65618,0.0726 -1.04065,0.17269 -1.34375,0.25 -0.42679,0.12723 -0.6849,0.2672 -1.375,0.34375 -1.31339,0.14569 -1.76735,-0.17402 -5.53125,0.3125 -3.54888,0.45876 -8.97865,1.41902 -10.21875,2.125 -1.59309,-0.24424 -3.8338,-0.38135 -5.8125,-0.125 -3.04759,0.39482 -4.9507,0.64845 -6.875,0.90625 -1.92429,0.25779 -1.7261,0.49353 -2.9375,0.65625 -1.30949,0.1759 -1.7472,-0.10438 -5.5,0.46875 -3.52429,0.53824 -8.9232,1.69917 -10.1875,2.4375 -1.58749,-0.20354 -3.8455,-0.25473 -5.8125,0.0937 -3.02619,0.53612 -4.8989,0.86169 -6.8125,1.1875 -0.65059,0.11077 -1.0137,0.27094 -1.3125,0.375 -0.42069,0.16488 -0.66345,0.3313 -1.34375,0.46875 -1.2947,0.26159 -1.7271,-0.006 -5.4375,0.8125 -3.49848,0.77195 -8.8459,2.38293 -10.0625,3.21875 -1.5629,-0.0774 -3.7575,0.0853 -5.6875,0.59375 -2.97238,0.78313 -4.8177,1.23209 -6.6875,1.75 -1.87,0.5179 -1.66665,0.76728 -2.84375,1.09375 -1.27249,0.3529 -1.69705,0.10709 -5.34375,1.1875 -3.42468,1.01463 -8.6494,2.93317 -9.875,3.84375 -1.53878,0.0127 -3.7198,0.27222 -5.625,0.875 -2.93098,0.92734 -4.75035,1.45842 -6.59375,2.0625 -0.62679,0.20538 -0.99165,0.39258 -1.28125,0.53125 -0.40758,0.21361 -0.6533,0.40875 -1.3125,0.625 -1.2545,0.41154 -1.68615,0.18904 -5.28125,1.4375 -3.38989,1.17717 -8.59495,3.2137 -9.78125,4.15625 -1.52388,0.0597 -3.65005,0.39487 -5.53125,1.0625 -2.89739,1.02829 -4.69905,1.67548 -6.53125,2.3125 -1.8322,0.63701 -1.62785,0.84854 -2.78125,1.25 -1.24679,0.43396 -1.66355,0.19972 -5.21875,1.5625 -3.3387,1.2798 -8.4871,3.48255 -9.6875,4.46875 -1.50718,0.10769 -3.6357,0.4988 -5.5,1.21875 -2.86818,1.1076 -4.6239,1.78156 -6.4375,2.46875 -0.6167,0.23363 -0.99645,0.44203 -1.28125,0.59375 10e-6,0 0,0.0295 0,0.0312 l -8,3.1875 1.8125,14.71875 c -0.25799,-0.0608 6.1875,3.3125 6.1875,3.3125 0.22641,-0.14468 0.44895,-0.27261 0.71875,-0.375 1.08052,-0.40998 2.1716,-0.21577 6,-1.6875 3.82852,-1.47174 5.22405,-2.00498 5.90625,-2.40625 0.67961,-0.39978 1.61175,-0.87937 2.21875,-1.53125 1.82692,-0.13775 3.5708,-0.49323 4.9375,-1 2.968,-1.10052 4.87535,-1.80619 6.78125,-2.46875 1.90581,-0.66254 2.35415,-1.41487 3.40625,-1.78125 1.09162,-0.38011 2.1951,-0.16538 6.0625,-1.53125 3.8674,-1.36586 5.28315,-1.82708 5.96875,-2.21875 0.70111,-0.40052 1.7008,-0.93298 2.3125,-1.59375 1.97081,-0.0547 3.81695,-0.38463 5.28125,-0.875 3.00152,-1.00508 4.92615,-1.62171 6.84375,-2.25 1.53861,-0.5041 2.17415,-1.04677 2.90625,-1.4375 0.23022,-0.13431 0.4759,-0.25373 0.75,-0.34375 1.09832,-0.36048 2.18145,-0.0814 6.09375,-1.3125 3.91231,-1.23113 5.366,-1.67295 6.0625,-2.03125 0.69391,-0.35697 1.6301,-0.79261 2.25,-1.40625 1.86521,-0.0227 3.63585,-0.26683 5.03125,-0.6875 3.0304,-0.91354 4.9924,-1.4301 6.9375,-1.96875 1.94512,-0.53864 2.4262,-1.26452 3.5,-1.5625 1.11402,-0.30915 2.22,0.007 6.1875,-1.03125 3.9675,-1.03863 5.4175,-1.43273 6.125,-1.75 0.7348,-0.32959 1.8139,-0.75372 2.4375,-1.375 1.99782,0.116 3.85745,-0.0201 5.34375,-0.375 3.07811,-0.735 5.0834,-1.10094 7.0625,-1.5 1.58791,-0.32018 2.2443,-0.79055 3,-1.09375 0.23751,-0.1068 0.4669,-0.19276 0.75,-0.25 1.13341,-0.22919 2.30465,0.20893 6.34375,-0.5 4.03942,-0.70893 5.50025,-0.92709 6.21875,-1.1875 0.71581,-0.25944 1.70435,-0.56724 2.34375,-1.09375 1.9242,0.23949 3.7479,0.22453 5.1875,0 3.12642,-0.48762 5.15455,-0.70067 7.15625,-0.96875 2.00171,-0.26807 2.48875,-0.94514 3.59375,-1.09375 1.14642,-0.15418 2.27585,0.30157 6.34375,-0.21875 4.06781,-0.52032 5.56025,-0.69573 6.28125,-0.9375 0.73712,-0.24714 1.7981,-0.58623 2.4375,-1.125 2.05,0.33553 3.9737,0.39796 5.5,0.21875 3.1422,-0.36896 5.18,-0.55936 7.1875,-0.78125 1.61082,-0.17802 2.26465,-0.6082 3.03125,-0.84375 0.24091,-0.0855 0.49405,-0.1556 0.78125,-0.1875 1.1497,-0.12772 2.3013,0.34665 6.375,-0.125 4.0737,-0.47165 5.55905,-0.6106 6.28125,-0.84375 0.71941,-0.23227 1.70025,-0.47346 2.34375,-0.96875 1.9363,0.33346 3.77005,0.40424 5.21875,0.25 3.14601,-0.33495 5.1775,-0.51859 7.1875,-0.71875 2.00991,-0.20014 2.48415,-0.82639 3.59375,-0.9375 1.1511,-0.11528 2.2965,0.36506 6.375,-0.0625 4.0785,-0.42756 5.5889,-0.56209 6.3125,-0.78125 0.73922,-0.22386 1.7956,-0.51325 2.4375,-1.03125 2.057,0.39867 4.00185,0.4934 5.53125,0.34375 3.14871,-0.3081 5.1758,-0.47325 7.1875,-0.65625 1.61401,-0.14682 2.26305,-0.56055 3.03125,-0.78125 0.2413,-0.0809 0.49355,-0.12991 0.78125,-0.15625 1.15211,-0.10545 2.2929,0.39275 6.375,0 4.08211,-0.39275 5.5889,-0.53084 6.3125,-0.75 0.7209,-0.21833 1.6996,-0.4477 2.3437,-0.9375 1.9381,0.34999 3.7689,0.45438 5.2188,0.3125 3.1487,-0.3081 5.1758,-0.47325 7.1875,-0.65625 2.0116,-0.18299 2.5142,-0.83802 3.625,-0.9375 1.1523,-0.10323 2.2922,0.38483 6.375,0 4.0829,-0.38482 5.5887,-0.501 6.3125,-0.71875 0.7393,-0.22243 1.7956,-0.51449 2.4375,-1.03125 2.0574,0.40177 4.0029,0.50333 5.5313,0.34375 3.1465,-0.32852 5.177,-0.5227 7.1874,-0.71875 1.613,-0.15729 2.2657,-0.63148 3.0313,-0.875 0.2407,-0.088 0.4632,-0.12137 0.75,-0.15625 1.1483,-0.1397 2.3167,0.33991 6.375,-0.25 4.0583,-0.58992 5.5618,-0.77714 6.2813,-1.03125 0.7166,-0.25316 1.6746,-0.55807 2.3124,-1.09375 1.9197,0.21194 3.72,0.15141 5.1563,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0937,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5626,-1.28125 1.1287,-0.25066 2.2702,0.11629 6.25,-0.875 3.9795,-0.99127 5.4295,-1.4193 6.125,-1.78125 0.7222,-0.376 1.7617,-0.87058 2.375,-1.53125 1.9629,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.1446 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70652 2.3191,-1.70203 2.5312,-2 0.2123,-0.29795 0.099,-0.72855 0.125,-0.75 0.043,-0.0352 0.3404,-0.094 0.5,-0.4375 0.859,-1.84707 2.3232,-5.62764 2.4376,-6.3125 0.1137,-0.68214 0.168,-1.35277 0.2187,-1.75 0.029,-0.2295 -0.1471,-0.8789 -0.125,-0.9375 0.031,-0.082 0.2883,-0.25057 0.3437,-0.5 0.2663,-1.19831 0.089,-2.20736 -0.125,-3.625 -0.2139,-1.41763 -0.9716,-4.61463 -1.625,-5.46875 -0.6589,-0.86172 -1.2248,-1.01051 -1.75,-1 z"</div><div class='add'>+         transform="translate(0.08004571,-0.03125)" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7578"</div><div class='add'>+       x="-0.08160872"</div><div class='add'>+       width="1.1632174"</div><div class='add'>+       y="-0.22659944"</div><div class='add'>+       height="1.4531989"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="2.437399"</div><div class='add'>+         id="feGaussianBlur7580" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7594"</div><div class='add'>+       x="-0.040804356"</div><div class='add'>+       width="1.0816087"</div><div class='add'>+       y="-0.11329972"</div><div class='add'>+       height="1.2265995"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.2186995"</div><div class='add'>+         id="feGaussianBlur7596" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath7606"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path7608"</div><div class='add'>+         d="m 1049.205,-282.26672 -0.09,0.008 c -1.3874,0.88445 -6.6033,1.6072 -6.629,9.52344 -0.024,7.42525 15.0129,17.09146 17.1563,18.09375 1.7302,0.80909 3.5916,1.40876 5.4063,1.71875 l 1.4374,0.21875 c 1.9197,0.21194 3.72,0.15141 5.1563,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0937,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5626,-1.28125 1.1287,-0.25066 2.2702,0.11629 6.25,-0.875 3.9795,-0.99128 5.4294,-1.4193 6.125,-1.78125 0.7222,-0.37601 1.7617,-0.87058 2.375,-1.53125 1.9629,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.14461 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70653 2.3191,-1.70203 2.5312,-2 0.2123,-0.29796 0.099,-0.72855 0.125,-0.75 0.043,-0.0352 0.3405,-0.094 0.5,-0.4375 0.859,-1.84708 2.3232,-5.62764 2.4376,-6.3125 0.1137,-0.68215 0.168,-1.35277 0.2187,-1.75 0.029,-0.22951 -0.1471,-0.8789 -0.125,-0.9375 0.031,-0.082 0.2883,-0.25057 0.3437,-0.5 0.2663,-1.19832 0.089,-2.20736 -0.125,-3.625 -0.2139,-1.41764 -0.9716,-4.61463 -1.625,-5.46875 -0.4194,-0.54857 -0.7993,-0.7925 -1.1562,-0.90625 -0.067,-0.0173 -0.1239,-0.0467 -0.1875,-0.0625 -0.021,-0.004 -0.042,0.003 -0.062,0 -0.3116,-0.0755 -0.6085,-0.15867 -1.1562,-0.21875 -0.9855,-0.10812 -2.4247,-0.2594 -3.9688,-0.25 -0.5147,0.003 -1.0371,0.0476 -1.5625,0.0937 -3.5589,0.31228 -9.0098,0.99108 -10.2187,1.625 -1.6331,-0.33402 -3.9482,-0.61223 -5.9376,-0.46875 -3.064,0.22097 -4.9677,0.34219 -6.9062,0.46875 -1.9384,0.12655 -1.6861,0.38864 -2.9062,0.46875 -1.3191,0.0866 -1.7869,-0.22325 -5.5626,0.0937 -3.5457,0.29772 -8.9806,0.99317 -10.2187,1.625 -1.6334,-0.33451 -3.9459,-0.61239 -5.9375,-0.46875 -3.0642,0.22098 -4.9678,0.37344 -6.9062,0.5 -0.6592,0.043 -1.0424,0.12393 -1.3438,0.1875 z"</div><div class='add'>+         style="display:inline;opacity:0.82448976;fill:#bcb786;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7610"</div><div class='add'>+       x="-0.021942979"</div><div class='add'>+       width="1.0438859"</div><div class='add'>+       y="-0.10017137"</div><div class='add'>+       height="1.2003427"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.57530213"</div><div class='add'>+         id="feGaussianBlur7612" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath7616"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path7618"</div><div class='add'>+         d="m 205.47016,-408.97318 -0.0901,0.002 c -1.44563,0.78566 -6.69921,1.14335 -7.27625,9.03857 -0.54134,7.40553 13.78595,18.09566 15.85433,19.24481 1.66964,0.92764 3.48475,1.65551 5.27345,2.09115 l 1.41867,0.31834 c 1.90027,0.34514 3.70042,0.41015 5.15031,0.26563 3.1486,-0.31384 5.16386,-0.57031 7.16789,-0.8152 2.00402,-0.24488 2.5407,-0.86478 3.64319,-1.02999 1.14342,-0.17143 2.25659,0.27414 6.29577,-0.43753 4.03888,-0.71169 5.51507,-1.03768 6.23419,-1.3503 0.74664,-0.32479 1.81806,-0.74575 2.47589,-1.3621 1.95897,0.12471 3.80476,-0.0261 5.2648,-0.47819 3.02376,-0.93627 4.99157,-1.52544 6.8628,-2.27751 1.50138,-0.60342 2.43202,-1.53636 2.66436,-1.81883 0.23254,-0.28245 0.14951,-0.71989 0.17694,-0.73948 0.0453,-0.0322 0.34622,-0.0701 0.52926,-0.40161 0.98557,-1.78276 2.70955,-5.45215 2.87137,-6.12738 0.16094,-0.67257 0.26182,-1.33778 0.34007,-1.73051 0.0453,-0.22691 -0.0855,-0.88701 -0.0594,-0.94393 0.0365,-0.0797 0.30505,-0.22988 0.37769,-0.47485 0.34913,-1.17686 0.24274,-2.19578 0.1278,-3.6249 -0.11463,-1.42909 -0.64781,-4.6711 -1.24013,-5.56865 -0.38017,-0.57646 -0.74215,-0.84625 -1.09026,-0.98459 -0.0657,-0.0219 -0.12035,-0.0553 -0.1827,-0.0754 -0.0207,-0.005 -0.0418,2.3e-4 -0.0623,-0.004 -0.30559,-0.097 -0.59597,-0.20067 -1.13816,-0.29875 -0.97557,-0.1765 -2.40074,-0.42766 -3.94175,-0.52584 -0.51366,-0.0327 -1.0379,-0.0247 -1.56523,-0.0153 -3.57201,0.0636 -9.05695,0.3611 -10.30707,0.90928 -1.60587,-0.44697 -3.89597,-0.88576 -5.89053,-0.8812 -3.07195,0.007 -4.97947,-0.005 -6.92207,-0.0134 -1.94251,-0.009 -1.70908,0.27025 -2.9318,0.26518 -1.32192,-0.005 -1.76701,-0.34717 -5.55562,-0.29393 -3.55782,0.05 -9.02796,0.36522 -10.30706,0.90927 -1.60614,-0.44747 -3.89367,-0.88575 -5.89043,-0.88118 -3.07215,0.007 -4.98175,0.0265 -6.92426,0.0177 -0.66059,-0.003 -1.0485,0.051 -1.35359,0.0934 z"</div><div class='add'>+         style="display:inline;opacity:0.82448976;fill:#bcb786;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient7622"</div><div class='add'>+       id="linearGradient7708"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="translate(-19.091883,4.2426407)"</div><div class='add'>+       x1="774.97668"</div><div class='add'>+       y1="-211.87105"</div><div class='add'>+       x2="755.11584"</div><div class='add'>+       y2="-202.67865" /&gt;</div><div class='add'>+    &lt;mask</div><div class='add'>+       maskUnits="userSpaceOnUse"</div><div class='add'>+       id="mask7704"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="fill:url(#linearGradient7708);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"</div><div class='add'>+         d="m 718.40812,-224.31217 33.25,56 275.99998,-24 159.5,-48.25 -66.5,-82.75 -402.24998,99 z"</div><div class='add'>+         id="path7706"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/mask&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient8430"</div><div class='add'>+       id="radialGradient7904"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(-0.3324832,0.9022288,-0.9582407,-0.3531242,305.29227,19.909497)"</div><div class='add'>+       cx="142.95833"</div><div class='add'>+       cy="107.09234"</div><div class='add'>+       fx="142.95833"</div><div class='add'>+       fy="107.09234"</div><div class='add'>+       r="66.981766" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3317"</div><div class='add'>+       id="radialGradient7906"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(1.0036478,-1.0345492e-7,1.7124628e-7,1.6613125,-160.53487,-96.205369)"</div><div class='add'>+       cx="317.78754"</div><div class='add'>+       cy="129.65378"</div><div class='add'>+       fx="317.78754"</div><div class='add'>+       fy="129.65378"</div><div class='add'>+       r="47.863216" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient8398"</div><div class='add'>+       id="radialGradient7908"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(2.0747661,-0.1577957,0.2382425,3.1325183,-550.77432,-65.728909)"</div><div class='add'>+       cx="325.30847"</div><div class='add'>+       cy="80.909554"</div><div class='add'>+       fx="325.30847"</div><div class='add'>+       fy="80.909554"</div><div class='add'>+       r="26.937988" /&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8209"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czcc"</div><div class='add'>+         id="path8211"</div><div class='add'>+         d="m 734.03125,519.49186 c 0,0 16.75513,37.01806 28.70141,53.95395 11.94629,16.93589 52.72716,56.04605 52.72716,56.04605 l 0.59717,-138.58975"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8225"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="10.661912"</div><div class='add'>+         id="feGaussianBlur8227" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8333"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="7.18"</div><div class='add'>+         id="feGaussianBlur8335" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8338"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path8340"</div><div class='add'>+         d="m 266.27183,924.57185 c -1.40727,18.80122 -1.1449,32.75104 2.08174,49.30328 3.22666,16.55238 16.40609,45.90737 20.33441,63.18377 3.92621,17.2671 2.69413,38.3097 -12.45944,51.1482 -15.31761,12.9775 -42.05127,21.599 -67.8323,15.7338 -25.78106,-5.8653 -69.54908,-49.2234 -88.59019,-70.2283 C 100.6939,1012.6293 56.045182,939.86193 41.867507,909.4368 27.689835,879.01168 29.207902,872.71823 33.747792,863.90708 24.38107,839.38658 21.33408,813.84026 0.03533448,788.33044 30.360814,791.44487 43.915624,815.28676 60.161024,835.47019 54.631128,787.39416 42.106309,771.05368 31.787072,744.74589 c 29.994295,6.08165 50.57936,31.87239 63.979783,72.7125 9.554155,-3.91792 18.237765,-9.37294 30.187415,-9.0612 -11.2975,-41.6958 -17.94947,-69.91585 -36.687256,-101.06994 53.441966,5.67032 83.657026,80.63932 78.971426,87.9608 9.97797,-2.24399 19.00565,-6.53038 30.43653,-5.65167 -11.24897,-38.34703 -21.04782,-76.8679 -3.65971,-118.64819 0,0 48.28678,65.43688 54.38965,85.80578 6.10288,20.3689 1.51882,38.70051 1.51882,38.70051 0,0 16.95957,31.0853 20.29392,51.09414 3.3731,20.24134 -3.53269,59.10331 -4.94582,77.98323 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8354"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="6.82"</div><div class='add'>+         id="feGaussianBlur8356" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8359"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path8361"</div><div class='add'>+         d="m 266.27183,924.57185 c -1.40727,18.80122 -1.1449,32.75104 2.08174,49.30328 3.22666,16.55238 16.40609,45.90737 20.33441,63.18377 3.92621,17.2671 2.69413,38.3097 -12.45944,51.1482 -15.31761,12.9775 -42.05127,21.599 -67.8323,15.7338 -25.78106,-5.8653 -69.54908,-49.2234 -88.59019,-70.2283 C 100.6939,1012.6293 56.045182,939.86193 41.867507,909.4368 27.689835,879.01168 29.207902,872.71823 33.747792,863.90708 24.38107,839.38658 21.33408,813.84026 0.03533448,788.33044 30.360814,791.44487 43.915624,815.28676 60.161024,835.47019 54.631128,787.39416 42.106309,771.05368 31.787072,744.74589 c 29.994295,6.08165 50.57936,31.87239 63.979783,72.7125 9.554155,-3.91792 18.237765,-9.37294 30.187415,-9.0612 -11.2975,-41.6958 -17.94947,-69.91585 -36.687256,-101.06994 53.441966,5.67032 83.657026,80.63932 78.971426,87.9608 9.97797,-2.24399 19.00565,-6.53038 30.43653,-5.65167 -11.24897,-38.34703 -21.04782,-76.8679 -3.65971,-118.64819 0,0 48.28678,65.43688 54.38965,85.80578 6.10288,20.3689 1.51882,38.70051 1.51882,38.70051 0,0 16.95957,31.0853 20.29392,51.09414 3.3731,20.24134 -3.53269,59.10331 -4.94582,77.98323 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8379"</div><div class='add'>+       x="-0.14413793"</div><div class='add'>+       width="1.288276"</div><div class='add'>+       y="-0.10278689"</div><div class='add'>+       height="1.2055738"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="7.389266"</div><div class='add'>+         id="feGaussianBlur8381" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8392"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path8394"</div><div class='add'>+         d="m 760.16396,935.83377 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.91234 -3.78268,51.80084 -2.90046,70.65614 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.08394 38.76107,-114.49737 44.6608,-149.76859 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8404"</div><div class='add'>+       x="-0.090268657"</div><div class='add'>+       width="1.1805373"</div><div class='add'>+       y="-0.10250848"</div><div class='add'>+       height="1.205017"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="5.3457272"</div><div class='add'>+         id="feGaussianBlur8406" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8417"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path8419"</div><div class='add'>+         d="m 760.16396,935.83377 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.91234 -3.78268,51.80084 -2.90046,70.65614 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.08394 38.76107,-114.49737 44.6608,-149.76859 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       x="-0.084654994"</div><div class='add'>+       width="1.16931"</div><div class='add'>+       y="-0.36592469"</div><div class='add'>+       height="1.7318494"</div><div class='add'>+       id="filter11361-3"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="4.5740586"</div><div class='add'>+         id="feGaussianBlur11363-6" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient8430"</div><div class='add'>+       id="radialGradient7904-7"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(-0.3324832,0.9022288,-0.9582407,-0.3531242,305.29227,19.909497)"</div><div class='add'>+       cx="142.95833"</div><div class='add'>+       cy="107.09234"</div><div class='add'>+       fx="142.95833"</div><div class='add'>+       fy="107.09234"</div><div class='add'>+       r="66.981766" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3317"</div><div class='add'>+       id="radialGradient7906-6"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(1.0036478,-1.0345492e-7,1.7124628e-7,1.6613125,-160.53487,-96.205369)"</div><div class='add'>+       cx="317.78754"</div><div class='add'>+       cy="129.65378"</div><div class='add'>+       fx="317.78754"</div><div class='add'>+       fy="129.65378"</div><div class='add'>+       r="47.863216" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient8398"</div><div class='add'>+       id="radialGradient7908-0"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(2.0747661,-0.1577957,0.2382425,3.1325183,-550.77432,-65.728909)"</div><div class='add'>+       cx="325.30847"</div><div class='add'>+       cy="80.909554"</div><div class='add'>+       fx="325.30847"</div><div class='add'>+       fy="80.909554"</div><div class='add'>+       r="26.937988" /&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8658-06"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#0b0b0b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 569.03125,1018.7776 c -4.28571,0.7143 -27.62815,3.6181 -57.85714,10 -30.22899,6.3819 -99.77493,25.9619 -142.85715,35.7143 -43.08222,9.7524 -117.26443,34.816 -156.91262,27.2654 -39.64818,-7.5506 -89.51595,-64.4083 -89.51595,-64.4083 l 4.28572,-94.28571 c 0,0 85.88551,-16.20094 112.14285,-33.57143 26.25735,-17.37049 45.58238,-49.66598 59.28572,-71.42857 13.70334,-21.76259 32.85714,-71.42858 32.85714,-71.42858 l 238.57143,262.14289 z"</div><div class='add'>+         id="path8660-2"</div><div class='add'>+         sodipodi:nodetypes="czzzcczzcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8888-6"</div><div class='add'>+       x="-0.2112188"</div><div class='add'>+       width="1.4224375"</div><div class='add'>+       y="-0.16808605"</div><div class='add'>+       height="1.3361721"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="8.3693583"</div><div class='add'>+         id="feGaussianBlur8890-1" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath2833-2"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#292929;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 569.03125,1018.7776 c -4.28571,0.7143 -27.62815,3.6181 -57.85714,10 -30.22899,6.3819 -57.31395,4.9661 -135.78608,17.3296 -79.85178,12.5808 -94.06436,42.5423 -108.12225,47.0643 -14.70014,4.7286 -145.37739,-65.8225 -145.37739,-65.8225 l 4.28572,-94.28571 c 0,0 85.88551,-16.20094 112.14285,-33.57143 26.25735,-17.37049 45.58238,-49.66598 59.28572,-71.42857 13.70334,-21.76259 32.85714,-71.42858 32.85714,-71.42858 l 238.57143,262.14289 z"</div><div class='add'>+         id="path2835-3"</div><div class='add'>+         sodipodi:nodetypes="czzzcczzcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8892-7"</div><div class='add'>+       x="-0.18692794"</div><div class='add'>+       width="1.3738559"</div><div class='add'>+       y="-0.23646873"</div><div class='add'>+       height="1.4729375"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="31.21228"</div><div class='add'>+         id="feGaussianBlur8894-5" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3665-9"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzcczcc"</div><div class='add'>+         id="path3667-2"</div><div class='add'>+         d="m 366.88839,504.13471 c 0,0 -29.55406,40.57305 -47.85714,74.28571 -18.30309,33.71267 -58.62109,126.35694 -70.35714,171.07143 -11.7594,44.80344 -62.5,123.57144 -62.5,123.57144 l 76.07143,18.21428 c 0,0 11.80712,-12.82335 31.07142,-46.07143 19.2643,-33.24808 60.35715,-138.57143 60.35715,-138.57143 l 13.21428,-202.5 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#0f0f0f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8856-2"</div><div class='add'>+       x="-0.3253231"</div><div class='add'>+       width="1.6506462"</div><div class='add'>+       y="-0.19013336"</div><div class='add'>+       height="1.3802667"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="28.712591"</div><div class='add'>+         id="feGaussianBlur8858-8" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8642-9"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#0f0f0f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 366.88839,504.13471 c 0,0 -29.55406,40.57305 -47.85714,74.28571 -18.30309,33.71267 -58.62109,126.35694 -70.35714,171.07143 -11.7594,44.80344 -62.5,123.57144 -62.5,123.57144 l 76.07143,18.21428 c 0,0 11.80712,-12.82335 31.07142,-46.07143 19.2643,-33.24808 60.35715,-138.57143 60.35715,-138.57143 l 13.21428,-202.5 z"</div><div class='add'>+         id="path8644-7"</div><div class='add'>+         sodipodi:nodetypes="czzcczcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8860-3"</div><div class='add'>+       x="-0.38093024"</div><div class='add'>+       width="1.7618605"</div><div class='add'>+       y="-0.17518716"</div><div class='add'>+       height="1.3503743"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="19.304015"</div><div class='add'>+         id="feGaussianBlur8862-6" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath7616-1"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path7618-2"</div><div class='add'>+         d="m 205.47016,-408.97318 -0.0901,0.002 c -1.44563,0.78566 -6.69921,1.14335 -7.27625,9.03857 -0.54134,7.40553 13.78595,18.09566 15.85433,19.24481 1.66964,0.92764 3.48475,1.65551 5.27345,2.09115 l 1.41867,0.31834 c 1.90027,0.34514 3.70042,0.41015 5.15031,0.26563 3.1486,-0.31384 5.16386,-0.57031 7.16789,-0.8152 2.00402,-0.24488 2.5407,-0.86478 3.64319,-1.02999 1.14342,-0.17143 2.25659,0.27414 6.29577,-0.43753 4.03888,-0.71169 5.51507,-1.03768 6.23419,-1.3503 0.74664,-0.32479 1.81806,-0.74575 2.47589,-1.3621 1.95897,0.12471 3.80476,-0.0261 5.2648,-0.47819 3.02376,-0.93627 4.99157,-1.52544 6.8628,-2.27751 1.50138,-0.60342 2.43202,-1.53636 2.66436,-1.81883 0.23254,-0.28245 0.14951,-0.71989 0.17694,-0.73948 0.0453,-0.0322 0.34622,-0.0701 0.52926,-0.40161 0.98557,-1.78276 2.70955,-5.45215 2.87137,-6.12738 0.16094,-0.67257 0.26182,-1.33778 0.34007,-1.73051 0.0453,-0.22691 -0.0855,-0.88701 -0.0594,-0.94393 0.0365,-0.0797 0.30505,-0.22988 0.37769,-0.47485 0.34913,-1.17686 0.24274,-2.19578 0.1278,-3.6249 -0.11463,-1.42909 -0.64781,-4.6711 -1.24013,-5.56865 -0.38017,-0.57646 -0.74215,-0.84625 -1.09026,-0.98459 -0.0657,-0.0219 -0.12035,-0.0553 -0.1827,-0.0754 -0.0207,-0.005 -0.0418,2.3e-4 -0.0623,-0.004 -0.30559,-0.097 -0.59597,-0.20067 -1.13816,-0.29875 -0.97557,-0.1765 -2.40074,-0.42766 -3.94175,-0.52584 -0.51366,-0.0327 -1.0379,-0.0247 -1.56523,-0.0153 -3.57201,0.0636 -9.05695,0.3611 -10.30707,0.90928 -1.60587,-0.44697 -3.89597,-0.88576 -5.89053,-0.8812 -3.07195,0.007 -4.97947,-0.005 -6.92207,-0.0134 -1.94251,-0.009 -1.70908,0.27025 -2.9318,0.26518 -1.32192,-0.005 -1.76701,-0.34717 -5.55562,-0.29393 -3.55782,0.05 -9.02796,0.36522 -10.30706,0.90927 -1.60614,-0.44747 -3.89367,-0.88575 -5.89043,-0.88118 -3.07215,0.007 -4.98175,0.0265 -6.92426,0.0177 -0.66059,-0.003 -1.0485,0.051 -1.35359,0.0934 z"</div><div class='add'>+         style="display:inline;opacity:0.82448976;fill:#bcb786;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7610-9"</div><div class='add'>+       x="-0.021942979"</div><div class='add'>+       width="1.0438859"</div><div class='add'>+       y="-0.10017137"</div><div class='add'>+       height="1.2003427"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.57530213"</div><div class='add'>+         id="feGaussianBlur7612-3" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath7606-1"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path7608-9"</div><div class='add'>+         d="m 1049.205,-282.26672 -0.09,0.008 c -1.3874,0.88445 -6.6033,1.6072 -6.629,9.52344 -0.024,7.42525 15.0129,17.09146 17.1563,18.09375 1.7302,0.80909 3.5916,1.40876 5.4063,1.71875 l 1.4374,0.21875 c 1.9197,0.21194 3.72,0.15141 5.1563,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0937,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5626,-1.28125 1.1287,-0.25066 2.2702,0.11629 6.25,-0.875 3.9795,-0.99128 5.4294,-1.4193 6.125,-1.78125 0.7222,-0.37601 1.7617,-0.87058 2.375,-1.53125 1.9629,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.14461 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70653 2.3191,-1.70203 2.5312,-2 0.2123,-0.29796 0.099,-0.72855 0.125,-0.75 0.043,-0.0352 0.3405,-0.094 0.5,-0.4375 0.859,-1.84708 2.3232,-5.62764 2.4376,-6.3125 0.1137,-0.68215 0.168,-1.35277 0.2187,-1.75 0.029,-0.22951 -0.1471,-0.8789 -0.125,-0.9375 0.031,-0.082 0.2883,-0.25057 0.3437,-0.5 0.2663,-1.19832 0.089,-2.20736 -0.125,-3.625 -0.2139,-1.41764 -0.9716,-4.61463 -1.625,-5.46875 -0.4194,-0.54857 -0.7993,-0.7925 -1.1562,-0.90625 -0.067,-0.0173 -0.1239,-0.0467 -0.1875,-0.0625 -0.021,-0.004 -0.042,0.003 -0.062,0 -0.3116,-0.0755 -0.6085,-0.15867 -1.1562,-0.21875 -0.9855,-0.10812 -2.4247,-0.2594 -3.9688,-0.25 -0.5147,0.003 -1.0371,0.0476 -1.5625,0.0937 -3.5589,0.31228 -9.0098,0.99108 -10.2187,1.625 -1.6331,-0.33402 -3.9482,-0.61223 -5.9376,-0.46875 -3.064,0.22097 -4.9677,0.34219 -6.9062,0.46875 -1.9384,0.12655 -1.6861,0.38864 -2.9062,0.46875 -1.3191,0.0866 -1.7869,-0.22325 -5.5626,0.0937 -3.5457,0.29772 -8.9806,0.99317 -10.2187,1.625 -1.6334,-0.33451 -3.9459,-0.61239 -5.9375,-0.46875 -3.0642,0.22098 -4.9678,0.37344 -6.9062,0.5 -0.6592,0.043 -1.0424,0.12393 -1.3438,0.1875 z"</div><div class='add'>+         style="display:inline;opacity:0.82448976;fill:#bcb786;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7578-4"</div><div class='add'>+       x="-0.08160872"</div><div class='add'>+       width="1.1632174"</div><div class='add'>+       y="-0.22659944"</div><div class='add'>+       height="1.4531989"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="2.437399"</div><div class='add'>+         id="feGaussianBlur7580-7" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7594-8"</div><div class='add'>+       x="-0.040804356"</div><div class='add'>+       width="1.0816087"</div><div class='add'>+       y="-0.11329972"</div><div class='add'>+       height="1.2265995"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.2186995"</div><div class='add'>+         id="feGaussianBlur7596-4" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8616-5"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 352.24553,211.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.554046 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401283 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.35744 -122.78647,50.05304 -187.06988,59.00234 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.19824 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path8618-0"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8940-3"</div><div class='add'>+       x="-0.25152978"</div><div class='add'>+       width="1.5030596"</div><div class='add'>+       y="-0.053035267"</div><div class='add'>+       height="1.1060705"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="13.024603"</div><div class='add'>+         id="feGaussianBlur8942-6" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8209-6"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czcc"</div><div class='add'>+         id="path8211-3"</div><div class='add'>+         d="m 734.03125,519.49186 c 0,0 16.75513,37.01806 28.70141,53.95395 11.94629,16.93589 52.72716,56.04605 52.72716,56.04605 l 0.59717,-138.58975"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8822-2"</div><div class='add'>+       x="-0.2742857"</div><div class='add'>+       width="1.5485713"</div><div class='add'>+       y="-0.21333334"</div><div class='add'>+       height="1.4266667"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="11.313708"</div><div class='add'>+         id="feGaussianBlur8824-0" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3998-6"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 178.21428,274.14789 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.55405 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401287 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.3574 -122.78647,50.053 -187.06988,59.0023 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.1982 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path4000-1"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter3677-5"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="2.0397518"</div><div class='add'>+         id="feGaussianBlur3679-5" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       id="filter3785-4"</div><div class='add'>+       inkscape:label="White Fur"&gt;</div><div class='add'>+      &lt;feTurbulence</div><div class='add'>+         id="feTurbulence3787-7"</div><div class='add'>+         type="fractalNoise"</div><div class='add'>+         baseFrequency="0.24044943820224721"</div><div class='add'>+         numOctaves="10"</div><div class='add'>+         seed="655"</div><div class='add'>+         result="result0" /&gt;</div><div class='add'>+      &lt;feDisplacementMap</div><div class='add'>+         id="feDisplacementMap3789-65"</div><div class='add'>+         in="SourceGraphic"</div><div class='add'>+         in2="result0"</div><div class='add'>+         scale="62"</div><div class='add'>+         xChannelSelector="B"</div><div class='add'>+         yChannelSelector="G" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8604-69"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 352.24553,211.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.554046 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401283 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.35744 -122.78647,50.05304 -187.06988,59.00234 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.19824 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path8606-3"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8802-7"</div><div class='add'>+       x="-0.35311759"</div><div class='add'>+       width="1.7062352"</div><div class='add'>+       y="-0.1817714"</div><div class='add'>+       height="1.3635428"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="48.038491"</div><div class='add'>+         id="feGaussianBlur8804-4" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3317"</div><div class='add'>+       id="radialGradient3315-5"</div><div class='add'>+       cx="543.6698"</div><div class='add'>+       cy="147.3131"</div><div class='add'>+       fx="543.6698"</div><div class='add'>+       fy="147.3131"</div><div class='add'>+       r="47.863216"</div><div class='add'>+       gradientTransform="matrix(2.1382256,0,0,2.3382884,-77.03847,-101.68704)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3537"</div><div class='add'>+       id="radialGradient3543-4"</div><div class='add'>+       cx="385"</div><div class='add'>+       cy="237.00504"</div><div class='add'>+       fx="385"</div><div class='add'>+       fy="237.00504"</div><div class='add'>+       r="86.928574"</div><div class='add'>+       gradientTransform="matrix(1,0,0,0.8562038,0,34.080427)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath4100-3"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.9000755px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"</div><div class='add'>+         d="m 265.93541,126.68393 -18.76721,168.86308 174.10543,-73.12068 61.9544,88.65883 57.8844,-31.9903 -37.53442,-180.059677 -237.6426,27.648747 z"</div><div class='add'>+         id="path4102-0"</div><div class='add'>+         sodipodi:nodetypes="ccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4120-7"</div><div class='add'>+       x="-0.2770822"</div><div class='add'>+       width="1.5541644"</div><div class='add'>+       y="-0.32482043"</div><div class='add'>+       height="1.6496409"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="19.956289"</div><div class='add'>+         id="feGaussianBlur4122-8" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3961"</div><div class='add'>+       id="radialGradient3915-6"</div><div class='add'>+       cx="418.30365"</div><div class='add'>+       cy="342.47794"</div><div class='add'>+       fx="418.30365"</div><div class='add'>+       fy="342.47794"</div><div class='add'>+       r="131.4509"</div><div class='add'>+       gradientTransform="matrix(1.3957347,0.6211056,-0.4244067,0.9537174,-15.061913,-227.96711)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;mask</div><div class='add'>+       maskUnits="userSpaceOnUse"</div><div class='add'>+       id="mask3684-3"&gt;</div><div class='add'>+      &lt;ellipse</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3688);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.43724918px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         id="path3686-1"</div><div class='add'>+         transform="translate(-174.03125,62.156036)"</div><div class='add'>+         cx="579.474"</div><div class='add'>+         cy="260.57516"</div><div class='add'>+         rx="192.6866"</div><div class='add'>+         ry="164.04877" /&gt;</div><div class='add'>+    &lt;/mask&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3951"</div><div class='add'>+       id="radialGradient3933-8"</div><div class='add'>+       cx="397.16388"</div><div class='add'>+       cy="336.95245"</div><div class='add'>+       fx="397.16388"</div><div class='add'>+       fy="336.95245"</div><div class='add'>+       r="36.75"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(1.9449972,2.4894837e-7,-2.4894833e-7,1.9449969,-375.31868,-318.41912)" /&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8806-6"</div><div class='add'>+       x="-0.61142862"</div><div class='add'>+       width="2.2228572"</div><div class='add'>+       y="-0.14930232"</div><div class='add'>+       height="1.2986046"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="37.830213"</div><div class='add'>+         id="feGaussianBlur8808-4" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8826-9"</div><div class='add'>+       x="-0.25894088"</div><div class='add'>+       width="1.5178818"</div><div class='add'>+       y="-0.2236412"</div><div class='add'>+       height="1.4472824"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="19.631544"</div><div class='add'>+         id="feGaussianBlur8828-5" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3985"</div><div class='add'>+       id="radialGradient3991-0"</div><div class='add'>+       cx="402.48898"</div><div class='add'>+       cy="317.23578"</div><div class='add'>+       fx="402.48898"</div><div class='add'>+       fy="317.23578"</div><div class='add'>+       r="23.714285"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(4.3776616,0,0,4.3776616,-1358.3025,-1070.7357)" /&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter3981-7"</div><div class='add'>+       x="-0.30000001"</div><div class='add'>+       width="1.6"</div><div class='add'>+       y="-0.30000001"</div><div class='add'>+       height="1.6"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="2"</div><div class='add'>+         id="feGaussianBlur3983-1" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4106"</div><div class='add'>+       id="radialGradient4112-7"</div><div class='add'>+       cx="250.22678"</div><div class='add'>+       cy="475.09763"</div><div class='add'>+       fx="250.22678"</div><div class='add'>+       fy="475.09763"</div><div class='add'>+       r="95.98877"</div><div class='add'>+       gradientTransform="matrix(1.2259004,-0.7077739,0.1413989,0.2449102,322.22326,608.91815)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4013"</div><div class='add'>+       id="radialGradient3585-2"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(1.1323239,0.7659488,-1.4550286,2.1510098,588.75376,-711.79716)"</div><div class='add'>+       cx="228.81355"</div><div class='add'>+       cy="440.26971"</div><div class='add'>+       fx="228.81355"</div><div class='add'>+       fy="440.26971"</div><div class='add'>+       r="119.17509" /&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3999-0"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#f5ff04;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 179.64286,267.36218 c -22.41044,39.70292 -60.6161,115.78029 -69.28571,149.64286 -8.64721,33.7751 -8.77199,66.41654 -0.35715,86.42858 8.3602,19.88213 26.16398,35.6328 40.71428,41.42856 -0.59638,-14.37587 14.37295,-43.28583 72.85715,-72.5 58.62627,-29.28514 78.38163,-27.13086 103.57142,-47.14286 25.63006,-20.36176 12.61031,-67.04463 3.21429,-93.92857 -9.43424,-26.99328 -34.96741,-59.12448 -66.42857,-69.64285 -31.03327,-10.37532 -65.01776,-4.84837 -84.28571,5.71428 z"</div><div class='add'>+         id="path4001-61"</div><div class='add'>+         sodipodi:nodetypes="czzczzzzc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4041"</div><div class='add'>+       id="radialGradient4060-5"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(0.05911206,2.6869855,-0.7234268,0.01591495,408.72779,-424.56452)"</div><div class='add'>+       cx="275.4422"</div><div class='add'>+       cy="335.34866"</div><div class='add'>+       fx="275.4422"</div><div class='add'>+       fy="335.34866"</div><div class='add'>+       r="36.75" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient7622"</div><div class='add'>+       id="radialGradient4062-9"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(0.05911206,2.6869855,-0.7234268,0.01591495,408.72779,-424.56452)"</div><div class='add'>+       cx="275.4422"</div><div class='add'>+       cy="335.34866"</div><div class='add'>+       fx="275.4422"</div><div class='add'>+       fy="335.34866"</div><div class='add'>+       r="36.75" /&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4079-1"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="6.5887624"</div><div class='add'>+         id="feGaussianBlur4081-1" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4013"</div><div class='add'>+       id="radialGradient4056-5"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(1.1323239,0.7659488,-1.4550286,2.1510098,588.75376,-711.79716)"</div><div class='add'>+       cx="228.81355"</div><div class='add'>+       cy="440.26971"</div><div class='add'>+       fx="228.81355"</div><div class='add'>+       fy="440.26971"</div><div class='add'>+       r="119.17509" /&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4083-9"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.5052066"</div><div class='add'>+         id="feGaussianBlur4085-7" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4113"</div><div class='add'>+       id="radialGradient4119-7"</div><div class='add'>+       cx="296.33783"</div><div class='add'>+       cy="427.17749"</div><div class='add'>+       fx="296.33783"</div><div class='add'>+       fy="427.17749"</div><div class='add'>+       r="19.704132"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="matrix(2.9797125,0,0,2.9797125,-599.28727,-827.0855)" /&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4862"</div><div class='add'>+       id="radialGradient4868-3"</div><div class='add'>+       cx="429.56738"</div><div class='add'>+       cy="377.42877"</div><div class='add'>+       fx="429.56738"</div><div class='add'>+       fy="377.42877"</div><div class='add'>+       r="72.079735"</div><div class='add'>+       gradientTransform="matrix(1,0,0,0.618034,0,144.16496)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4002-6"</div><div class='add'>+       x="-0.24334238"</div><div class='add'>+       width="1.4866848"</div><div class='add'>+       y="-0.39104807"</div><div class='add'>+       height="1.7820961"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="14.589518"</div><div class='add'>+         id="feGaussianBlur4004-3" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;radialGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4870"</div><div class='add'>+       id="radialGradient4876-9"</div><div class='add'>+       cx="437.6991"</div><div class='add'>+       cy="391.21735"</div><div class='add'>+       fx="437.6991"</div><div class='add'>+       fy="391.21735"</div><div class='add'>+       r="36.611931"</div><div class='add'>+       gradientTransform="matrix(1,0,0,0.618034,0,149.43174)"</div><div class='add'>+       gradientUnits="userSpaceOnUse" /&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4010-1"</div><div class='add'>+       x="-0.14577261"</div><div class='add'>+       width="1.2915452"</div><div class='add'>+       y="-0.23523259"</div><div class='add'>+       height="1.4704652"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="4.4442907"</div><div class='add'>+         id="feGaussianBlur4012-2" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4053-9"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.6062947"</div><div class='add'>+         id="feGaussianBlur4055-3" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8514-8"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 352.24553,211.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.554046 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401283 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.35744 -122.78647,50.05304 -187.06988,59.00234 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.19824 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path8516-8"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8814-5"</div><div class='add'>+       x="-0.20466694"</div><div class='add'>+       width="1.4093339"</div><div class='add'>+       y="-0.29007819"</div><div class='add'>+       height="1.5801564"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="22.300169"</div><div class='add'>+         id="feGaussianBlur8816-0" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8610-9"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 352.24553,211.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.554046 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401283 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.35744 -122.78647,50.05304 -187.06988,59.00234 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.19824 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path8612-6"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8810-3"</div><div class='add'>+       x="-0.23519406"</div><div class='add'>+       width="1.4703881"</div><div class='add'>+       y="-0.24500646"</div><div class='add'>+       height="1.4900129"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="58.328041"</div><div class='add'>+         id="feGaussianBlur8812-8" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8622-5"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         d="m 821.64329,477.88997 c 0,0 22.61947,-6.50681 35.74275,-5.87273 13.12328,0.63409 30.64158,1.93862 43.70885,12.18619 13.06727,10.24756 25.06774,27.14007 34.11239,58.36965 9.04465,31.22958 1.69832,99.25201 -6.17603,143.34735 -7.87435,44.09534 -28.2651,106.11298 -45,140 -16.7349,33.88702 -49.79771,77.4952 -60.56943,89.87616 -11.36422,13.06197 -56.20589,36.42617 -79.43057,42.26667 5.3033,-10.6066 48.89976,-50.58884 35,-60.71426 -14.01897,-10.21226 -45.76009,45.98236 -84.29315,29.03317 21.38231,-13.13212 41.7794,-51.18606 34.04061,-66.59445 -7.84025,-15.61039 -30.70493,48.75757 -93.53554,37.01288 30.05204,-27.52666 55.40706,-70.90401 41.2627,-82.9797 -14.41516,-12.30687 -60.46175,54.29315 -60.46175,54.29315 0,0 -2.8219,-41.70118 13.7732,-68.60732 16.63935,-26.97787 79.65297,-81.61527 99.55313,-111.70342 19.90015,-30.08814 33.61256,-66.00902 42.13542,-92.51794 8.52286,-26.50892 15.80094,-77.09954 15.80094,-77.09954"</div><div class='add'>+         id="path8624-61"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzczczczczzzc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8818-1"</div><div class='add'>+       x="-0.34381232"</div><div class='add'>+       width="1.6876246"</div><div class='add'>+       y="-0.18433961"</div><div class='add'>+       height="1.3686792"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="34.542167"</div><div class='add'>+         id="feGaussianBlur8820-5" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8906-9"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262f2f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 352.24553,211.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.554046 36.34702,-65.295835 116.94091,-84.694685 185.93466,-91.465427 86.92239,-11.016801 184.91267,17.940072 233.37134,95.401283 54.12402,75.7333 56.67476,172.53912 80.61204,259.52795 29.43779,127.1276 54.77914,256.21414 60.39224,386.85035 -3.06348,78.18185 -8.42634,165.18415 -60.50321,228.13413 -48.02654,50.35744 -122.78647,50.05304 -187.06988,59.00234 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.19824 -64.77564,-37.94001 -95.73019,-113.47863 -97.2794,-186.01958 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         id="path8908-8"</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3602-4"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzczczczczzzc"</div><div class='add'>+         id="path3604-8"</div><div class='add'>+         d="m 647.61204,540.04601 c 0,0 22.61947,-6.50681 35.74275,-5.87273 13.12328,0.63409 30.64158,1.93862 43.70885,12.18619 13.06727,10.24756 25.06774,27.14007 34.11239,58.36965 9.04465,31.22958 1.69832,99.25201 -6.17603,143.34735 -7.87435,44.09534 -28.2651,106.11298 -45,140 -16.7349,33.88702 -49.79771,77.4952 -60.56943,89.87616 -11.36422,13.06197 -56.20589,36.42617 -79.43057,42.26667 5.3033,-10.6066 48.89976,-50.58884 35,-60.71426 -14.01897,-10.21226 -45.76009,45.98236 -84.29315,29.03317 21.38231,-13.13212 41.7794,-51.18606 34.04061,-66.59445 -7.84025,-15.61039 -30.70493,48.75757 -93.53554,37.01288 30.05204,-27.52666 55.40706,-70.90401 41.2627,-82.9797 -14.41516,-12.30687 -60.46175,54.29315 -60.46175,54.29315 0,0 -2.8219,-41.70118 13.7732,-68.60732 16.63935,-26.97787 79.65297,-81.61527 99.55313,-111.70342 19.90015,-30.08814 33.61256,-66.00902 42.13542,-92.51794 8.52286,-26.50892 15.80094,-77.09954 15.80094,-77.09954"</div><div class='add'>+         style="display:inline;opacity:1;fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter3587-1"</div><div class='add'>+       x="-0.1"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="8.881432"</div><div class='add'>+         id="feGaussianBlur3589-0" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3992-4"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#121212;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 709.28572,844.50504 c 54.28571,-1.42857 126.035,-15.05199 170,-26.78572 44.05271,-11.75714 125.88628,-36.34724 175.35708,-57.85714 49.3393,-21.45272 113.6037,-59.2816 154.2858,-92.14285 40.5081,-32.72069 52.3899,-55.81981 60.7143,-33.57143 8.3691,22.36779 -16.407,56.32562 -37.8572,81.07143 -21.6041,24.9234 -52.7313,52.70533 -98.9286,89.28571 C 1086.6598,841.08542 976.77458,906.08967 920,933.07647 c -57.06606,27.12536 -128.20334,58.23842 -172.14286,72.50003 -43.93952,14.2616 -131.42857,31.0714 -131.42857,31.0714 l 92.85715,-192.14286 z"</div><div class='add'>+         id="path3994-4"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzzzcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter3779-4"</div><div class='add'>+       x="-0.087980822"</div><div class='add'>+       width="1.1759616"</div><div class='add'>+       y="-0.17728332"</div><div class='add'>+       height="1.3545666"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="16.340344"</div><div class='add'>+         id="feGaussianBlur3781-4" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3986-7"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#121212;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 709.28572,844.50504 c 54.28571,-1.42857 126.035,-15.05199 170,-26.78572 44.05271,-11.75714 125.88628,-36.34724 175.35708,-57.85714 49.3393,-21.45272 113.6037,-59.2816 154.2858,-92.14285 40.5081,-32.72069 52.3899,-55.81981 60.7143,-33.57143 8.3691,22.36779 -16.407,56.32562 -37.8572,81.07143 -21.6041,24.9234 -52.7313,52.70533 -98.9286,89.28571 C 1086.6598,841.08542 976.77458,906.08967 920,933.07647 c -57.06606,27.12536 -128.20334,58.23842 -172.14286,72.50003 -43.93952,14.2616 -131.42857,31.0714 -131.42857,31.0714 l 92.85715,-192.14286 z"</div><div class='add'>+         id="path3988-6"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzzzcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3722-3"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#121212;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         d="m 709.28572,844.50504 c 54.28571,-1.42857 126.035,-15.05199 170,-26.78572 44.05271,-11.75714 125.88628,-36.34724 175.35708,-57.85714 49.3393,-21.45272 113.6037,-59.2816 154.2858,-92.14285 40.5081,-32.72069 52.3899,-55.81981 60.7143,-33.57143 8.3691,22.36779 -16.407,56.32562 -37.8572,81.07143 -21.6041,24.9234 -52.7313,52.70533 -98.9286,89.28571 C 1086.6598,841.08542 976.77458,906.08967 920,933.07647 c -57.06606,27.12536 -128.20334,58.23842 -172.14286,72.50003 -43.93952,14.2616 -131.42857,31.0714 -131.42857,31.0714 l 92.85715,-192.14286 z"</div><div class='add'>+         id="path3724-1"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzzzcc"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8225-7"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="10.661912"</div><div class='add'>+         id="feGaussianBlur8227-5" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;mask</div><div class='add'>+       maskUnits="userSpaceOnUse"</div><div class='add'>+       id="mask7704-9"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="fill:url(#linearGradient7708);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"</div><div class='add'>+         d="m 718.40812,-224.31217 33.25,56 275.99998,-24 159.5,-48.25 -66.5,-82.75 -402.24998,99 z"</div><div class='add'>+         id="path7706-6"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/mask&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath7421-7"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:type="inkscape:offset"</div><div class='add'>+         inkscape:radius="0"</div><div class='add'>+         inkscape:original="M 1111.4062 -285.9375 L 1107.4688 -284.0625 C 1107.4283 -284.05228 1107.3692 -284.04201 1107.3438 -284.03125 C 1106.925 -283.8184 1107.1791 -283.93067 1106.6875 -283.71875 C 1106.2014 -283.50919 1104.9499 -283.13456 1102.5938 -282.25 C 1099.2626 -280.99942 1096.7895 -280.10016 1095.5938 -279.1875 C 1094.0576 -279.16623 1091.8733 -278.95419 1089.9375 -278.46875 C 1086.956 -277.72108 1085.0823 -277.29474 1083.1875 -276.875 C 1081.2927 -276.45527 1081.512 -276.23281 1080.3125 -276 C 1079.0159 -275.74833 1078.5911 -276.00899 1074.875 -275.21875 C 1071.3851 -274.4766 1065.9802 -273.28768 1064.7188 -272.53125 C 1063.1348 -272.71203 1060.8513 -272.85303 1058.875 -272.5625 C 1055.8346 -272.11554 1053.9588 -271.88974 1052.0312 -271.65625 C 1051.3758 -271.57687 1050.9902 -271.45547 1050.6875 -271.375 C 1050.2613 -271.24334 1050.0017 -271.11498 1049.3125 -271.03125 C 1048.0009 -270.87188 1047.5503 -271.18808 1043.7812 -270.75 C 1040.2273 -270.33691 1034.7758 -269.47718 1033.5312 -268.8125 C 1031.9322 -269.10979 1029.6735 -269.34669 1027.6875 -269.15625 C 1024.6287 -268.86293 1022.7155 -268.67226 1020.7812 -268.5 C 1018.847 -268.32773 1019.0926 -268.07763 1017.875 -267.96875 C 1016.5588 -267.85105 1016.1152 -268.13238 1012.3438 -267.71875 C 1008.8017 -267.3303 1003.3359 -266.50948 1002.0625 -265.84375 C 1000.4636 -266.13844 998.1753 -266.35076 996.1875 -266.15625 C 993.12921 -265.857 991.2463 -265.67601 989.3125 -265.5 C 988.65501 -265.44015 988.27245 -265.32144 987.96875 -265.25 C 987.54105 -265.13104 987.28525 -265.03193 986.59375 -264.96875 C 985.27775 -264.84849 984.834 -265.16363 981.0625 -264.75 C 977.50631 -264.35998 972.0569 -263.51084 970.8125 -262.84375 C 969.21381 -263.13793 966.95265 -263.36747 964.96875 -263.15625 C 961.91305 -262.83092 959.9947 -262.63001 958.0625 -262.4375 C 956.13031 -262.24499 956.37275 -261.99662 955.15625 -261.875 C 953.84137 -261.74353 953.3932 -262.03954 949.625 -261.59375 C 946.08611 -261.17509 940.6473 -260.30158 939.375 -259.625 C 937.77741 -259.90604 935.51505 -260.04543 933.53125 -259.8125 C 930.47927 -259.45413 928.58625 -259.24464 926.65625 -259.03125 C 926.00007 -258.95869 925.6156 -258.85856 925.3125 -258.78125 C 924.88571 -258.65402 924.6276 -258.51405 923.9375 -258.4375 C 922.62411 -258.29181 922.17015 -258.61152 918.40625 -258.125 C 914.85737 -257.66624 909.4276 -256.70598 908.1875 -256 C 906.59441 -256.24424 904.3537 -256.38135 902.375 -256.125 C 899.32741 -255.73018 897.4243 -255.47655 895.5 -255.21875 C 893.57571 -254.96096 893.7739 -254.72522 892.5625 -254.5625 C 891.25301 -254.3866 890.8153 -254.66688 887.0625 -254.09375 C 883.53821 -253.55551 878.1393 -252.39458 876.875 -251.65625 C 875.28751 -251.85979 873.0295 -251.91098 871.0625 -251.5625 C 868.03631 -251.02638 866.1636 -250.70081 864.25 -250.375 C 863.59941 -250.26423 863.2363 -250.10406 862.9375 -250 C 862.51681 -249.83512 862.27405 -249.6687 861.59375 -249.53125 C 860.29905 -249.26966 859.86665 -249.53745 856.15625 -248.71875 C 852.65777 -247.9468 847.31035 -246.33582 846.09375 -245.5 C 844.53085 -245.57745 842.33625 -245.41472 840.40625 -244.90625 C 837.43387 -244.12312 835.58855 -243.67416 833.71875 -243.15625 C 831.84875 -242.63835 832.0521 -242.38897 830.875 -242.0625 C 829.60251 -241.7096 829.17795 -241.95541 825.53125 -240.875 C 822.10657 -239.86037 816.88185 -237.94183 815.65625 -237.03125 C 814.11747 -237.01851 811.93645 -236.75903 810.03125 -236.15625 C 807.10027 -235.22891 805.2809 -234.69783 803.4375 -234.09375 C 802.81071 -233.88837 802.44585 -233.70117 802.15625 -233.5625 C 801.74867 -233.34889 801.50295 -233.15375 800.84375 -232.9375 C 799.58925 -232.52596 799.1576 -232.74846 795.5625 -231.5 C 792.17261 -230.32283 786.96755 -228.2863 785.78125 -227.34375 C 784.25737 -227.28408 782.1312 -226.94888 780.25 -226.28125 C 777.35261 -225.25296 775.55095 -224.60577 773.71875 -223.96875 C 771.88655 -223.33174 772.0909 -223.12021 770.9375 -222.71875 C 769.69071 -222.28479 769.27395 -222.51903 765.71875 -221.15625 C 762.38005 -219.87645 757.23165 -217.6737 756.03125 -216.6875 C 754.52407 -216.57981 752.39555 -216.1887 750.53125 -215.46875 C 747.66307 -214.36115 745.90735 -213.68719 744.09375 -213 C 743.47705 -212.76637 743.0973 -212.55797 742.8125 -212.40625 C 742.81251 -212.40625 742.8125 -212.37673 742.8125 -212.375 L 734.8125 -209.1875 L 736.625 -194.46875 C 736.36701 -194.52956 742.8125 -191.15625 742.8125 -191.15625 C 743.03891 -191.30093 743.26145 -191.42886 743.53125 -191.53125 C 744.61177 -191.94123 745.70285 -191.74702 749.53125 -193.21875 C 753.35977 -194.69049 754.7553 -195.22373 755.4375 -195.625 C 756.11711 -196.02478 757.04925 -196.50437 757.65625 -197.15625 C 759.48317 -197.294 761.22705 -197.64948 762.59375 -198.15625 C 765.56175 -199.25677 767.4691 -199.96244 769.375 -200.625 C 771.28081 -201.28754 771.72915 -202.03987 772.78125 -202.40625 C 773.87287 -202.78636 774.97635 -202.57163 778.84375 -203.9375 C 782.71115 -205.30336 784.1269 -205.76458 784.8125 -206.15625 C 785.51361 -206.55677 786.5133 -207.08923 787.125 -207.75 C 789.09581 -207.80466 790.94195 -208.13463 792.40625 -208.625 C 795.40777 -209.63008 797.3324 -210.24671 799.25 -210.875 C 800.78861 -211.3791 801.42415 -211.92177 802.15625 -212.3125 C 802.38647 -212.44681 802.63215 -212.56623 802.90625 -212.65625 C 804.00457 -213.01673 805.0877 -212.73762 809 -213.96875 C 812.91231 -215.19988 814.366 -215.6417 815.0625 -216 C 815.75641 -216.35697 816.6926 -216.79261 817.3125 -217.40625 C 819.17771 -217.42891 820.94835 -217.67308 822.34375 -218.09375 C 825.37415 -219.00729 827.33615 -219.52385 829.28125 -220.0625 C 831.22637 -220.60114 831.70745 -221.32702 832.78125 -221.625 C 833.89527 -221.93415 835.00125 -221.61761 838.96875 -222.65625 C 842.93625 -223.69488 844.38625 -224.08898 845.09375 -224.40625 C 845.82855 -224.73584 846.90765 -225.15997 847.53125 -225.78125 C 849.52907 -225.66525 851.3887 -225.80134 852.875 -226.15625 C 855.95311 -226.89125 857.9584 -227.25719 859.9375 -227.65625 C 861.52541 -227.97643 862.1818 -228.4468 862.9375 -228.75 C 863.17501 -228.8568 863.4044 -228.94276 863.6875 -229 C 864.82091 -229.22919 865.99215 -228.79107 870.03125 -229.5 C 874.07067 -230.20893 875.5315 -230.42709 876.25 -230.6875 C 876.96581 -230.94694 877.95435 -231.25474 878.59375 -231.78125 C 880.51795 -231.54176 882.34165 -231.55672 883.78125 -231.78125 C 886.90767 -232.26887 888.9358 -232.48192 890.9375 -232.75 C 892.93921 -233.01807 893.42625 -233.69514 894.53125 -233.84375 C 895.67767 -233.99793 896.8071 -233.54218 900.875 -234.0625 C 904.94281 -234.58282 906.43525 -234.75823 907.15625 -235 C 907.89337 -235.24714 908.95435 -235.58623 909.59375 -236.125 C 911.64375 -235.78947 913.56745 -235.72704 915.09375 -235.90625 C 918.23595 -236.27521 920.27375 -236.46561 922.28125 -236.6875 C 923.89207 -236.86552 924.5459 -237.2957 925.3125 -237.53125 C 925.55341 -237.61677 925.80655 -237.68685 926.09375 -237.71875 C 927.24345 -237.84647 928.39505 -237.3721 932.46875 -237.84375 C 936.54245 -238.3154 938.0278 -238.45435 938.75 -238.6875 C 939.46941 -238.91977 940.45025 -239.16096 941.09375 -239.65625 C 943.03005 -239.32279 944.8638 -239.25201 946.3125 -239.40625 C 949.45851 -239.7412 951.49 -239.92484 953.5 -240.125 C 955.50991 -240.32514 955.98415 -240.95139 957.09375 -241.0625 C 958.24485 -241.17778 959.39025 -240.69744 963.46875 -241.125 C 967.54725 -241.55256 969.05765 -241.68709 969.78125 -241.90625 C 970.52047 -242.13011 971.57685 -242.4195 972.21875 -242.9375 C 974.27575 -242.53883 976.2206 -242.4441 977.75 -242.59375 C 980.89871 -242.90185 982.9258 -243.067 984.9375 -243.25 C 986.55151 -243.39682 987.20055 -243.81055 987.96875 -244.03125 C 988.21005 -244.11211 988.4623 -244.16116 988.75 -244.1875 C 989.90211 -244.29295 991.0429 -243.79475 995.125 -244.1875 C 999.20711 -244.58025 1000.7139 -244.71834 1001.4375 -244.9375 C 1002.1584 -245.15583 1003.1371 -245.3852 1003.7812 -245.875 C 1005.7193 -245.52501 1007.5501 -245.42062 1009 -245.5625 C 1012.1487 -245.8706 1014.1758 -246.03575 1016.1875 -246.21875 C 1018.1991 -246.40174 1018.7017 -247.05677 1019.8125 -247.15625 C 1020.9648 -247.25948 1022.1047 -246.77142 1026.1875 -247.15625 C 1030.2704 -247.54107 1031.7762 -247.65725 1032.5 -247.875 C 1033.2393 -248.09743 1034.2956 -248.38949 1034.9375 -248.90625 C 1036.9949 -248.50448 1038.9404 -248.40292 1040.4688 -248.5625 C 1043.6153 -248.89102 1045.6458 -249.0852 1047.6562 -249.28125 C 1049.2692 -249.43854 1049.9219 -249.91273 1050.6875 -250.15625 C 1050.9282 -250.24429 1051.1507 -250.27762 1051.4375 -250.3125 C 1052.5858 -250.4522 1053.7542 -249.97259 1057.8125 -250.5625 C 1061.8708 -251.15242 1063.3743 -251.33964 1064.0938 -251.59375 C 1064.8104 -251.84691 1065.7684 -252.15182 1066.4062 -252.6875 C 1068.3259 -252.47556 1070.1262 -252.53609 1071.5625 -252.78125 C 1074.6816 -253.31365 1076.6741 -253.70986 1078.6562 -254.09375 C 1080.6383 -254.47762 1081.1305 -255.1334 1082.2188 -255.375 C 1083.3475 -255.62566 1084.489 -255.25871 1088.4688 -256.25 C 1092.4483 -257.24127 1093.8983 -257.6693 1094.5938 -258.03125 C 1095.316 -258.40725 1096.3555 -258.90183 1096.9688 -259.5625 C 1098.9317 -259.57454 1100.7625 -259.85355 1102.1875 -260.40625 C 1105.1387 -261.55085 1107.0607 -262.27567 1108.875 -263.15625 C 1110.3307 -263.86277 1111.1941 -264.85828 1111.4062 -265.15625 C 1111.6185 -265.4542 1111.5051 -265.8848 1111.5312 -265.90625 C 1111.5742 -265.94148 1111.8716 -266.00028 1112.0312 -266.34375 C 1112.8902 -268.19082 1114.3544 -271.97139 1114.4688 -272.65625 C 1114.5825 -273.33839 1114.6368 -274.00902 1114.6875 -274.40625 C 1114.7169 -274.63575 1114.5404 -275.28515 1114.5625 -275.34375 C 1114.5934 -275.42579 1114.8508 -275.59432 1114.9062 -275.84375 C 1115.1725 -277.04206 1114.9953 -278.05111 1114.7812 -279.46875 C 1114.5673 -280.88638 1113.8096 -284.08338 1113.1562 -284.9375 C 1112.4973 -285.79922 1111.9314 -285.94801 1111.4062 -285.9375 z "</div><div class='add'>+         style="display:inline;fill:#bcb786;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         id="path7423-8"</div><div class='add'>+         d="m 1111.4062,-285.9375 -3.9374,1.875 c -0.041,0.0102 -0.1,0.0205 -0.125,0.0312 -0.4188,0.21285 -0.1647,0.10058 -0.6563,0.3125 -0.4861,0.20956 -1.7376,0.58419 -4.0937,1.46875 -3.3312,1.25058 -5.8043,2.14984 -7,3.0625 -1.5362,0.0213 -3.7205,0.23331 -5.6563,0.71875 -2.9815,0.74767 -4.8552,1.17401 -6.75,1.59375 -1.8948,0.41973 -1.6755,0.64219 -2.875,0.875 -1.2966,0.25167 -1.7214,-0.009 -5.4375,0.78125 -3.4899,0.74215 -8.8948,1.93107 -10.1562,2.6875 -1.584,-0.18078 -3.8675,-0.32178 -5.8438,-0.0312 -3.0404,0.44696 -4.9162,0.67276 -6.8438,0.90625 -0.6554,0.0794 -1.041,0.20078 -1.3437,0.28125 -0.4262,0.13166 -0.6858,0.26002 -1.375,0.34375 -1.3116,0.15937 -1.7622,-0.15683 -5.5313,0.28125 -3.5539,0.41309 -9.0054,1.27282 -10.25,1.9375 -1.599,-0.29729 -3.8577,-0.53419 -5.8437,-0.34375 -3.0588,0.29332 -4.972,0.48399 -6.9063,0.65625 -1.9342,0.17227 -1.6886,0.42237 -2.9062,0.53125 -1.3162,0.1177 -1.7598,-0.16363 -5.5312,0.25 -3.5421,0.38845 -9.0079,1.20927 -10.2813,1.875 -1.5989,-0.29469 -3.8872,-0.50701 -5.875,-0.3125 -3.05829,0.29925 -4.9412,0.48024 -6.875,0.65625 -0.65749,0.0598 -1.04005,0.17856 -1.34375,0.25 -0.4277,0.11896 -0.6835,0.21807 -1.375,0.28125 -1.316,0.12026 -1.75975,-0.19488 -5.53125,0.21875 -3.55619,0.39002 -9.0056,1.23916 -10.25,1.90625 -1.59869,-0.29418 -3.85985,-0.52372 -5.84375,-0.3125 -3.0557,0.32533 -4.97405,0.52624 -6.90625,0.71875 -1.93219,0.19251 -1.68975,0.44088 -2.90625,0.5625 -1.31488,0.13147 -1.76305,-0.16454 -5.53125,0.28125 -3.53889,0.41866 -8.9777,1.29217 -10.25,1.96875 -1.59759,-0.28104 -3.85995,-0.42043 -5.84375,-0.1875 -3.05198,0.35837 -4.945,0.56786 -6.875,0.78125 -0.65618,0.0726 -1.04065,0.17269 -1.34375,0.25 -0.42679,0.12723 -0.6849,0.2672 -1.375,0.34375 -1.31339,0.14569 -1.76735,-0.17402 -5.53125,0.3125 -3.54888,0.45876 -8.97865,1.41902 -10.21875,2.125 -1.59309,-0.24424 -3.8338,-0.38135 -5.8125,-0.125 -3.04759,0.39482 -4.9507,0.64845 -6.875,0.90625 -1.92429,0.25779 -1.7261,0.49353 -2.9375,0.65625 -1.30949,0.1759 -1.7472,-0.10438 -5.5,0.46875 -3.52429,0.53824 -8.9232,1.69917 -10.1875,2.4375 -1.58749,-0.20354 -3.8455,-0.25473 -5.8125,0.0937 -3.02619,0.53612 -4.8989,0.86169 -6.8125,1.1875 -0.65059,0.11077 -1.0137,0.27094 -1.3125,0.375 -0.42069,0.16488 -0.66345,0.3313 -1.34375,0.46875 -1.2947,0.26159 -1.7271,-0.006 -5.4375,0.8125 -3.49848,0.77195 -8.8459,2.38293 -10.0625,3.21875 -1.5629,-0.0774 -3.7575,0.0853 -5.6875,0.59375 -2.97238,0.78313 -4.8177,1.23209 -6.6875,1.75 -1.87,0.5179 -1.66665,0.76728 -2.84375,1.09375 -1.27249,0.3529 -1.69705,0.10709 -5.34375,1.1875 -3.42468,1.01463 -8.6494,2.93317 -9.875,3.84375 -1.53878,0.0127 -3.7198,0.27222 -5.625,0.875 -2.93098,0.92734 -4.75035,1.45842 -6.59375,2.0625 -0.62679,0.20538 -0.99165,0.39258 -1.28125,0.53125 -0.40758,0.21361 -0.6533,0.40875 -1.3125,0.625 -1.2545,0.41154 -1.68615,0.18904 -5.28125,1.4375 -3.38989,1.17717 -8.59495,3.2137 -9.78125,4.15625 -1.52388,0.0597 -3.65005,0.39487 -5.53125,1.0625 -2.89739,1.02829 -4.69905,1.67548 -6.53125,2.3125 -1.8322,0.63701 -1.62785,0.84854 -2.78125,1.25 -1.24679,0.43396 -1.66355,0.19972 -5.21875,1.5625 -3.3387,1.2798 -8.4871,3.48255 -9.6875,4.46875 -1.50718,0.10769 -3.6357,0.4988 -5.5,1.21875 -2.86818,1.1076 -4.6239,1.78156 -6.4375,2.46875 -0.6167,0.23363 -0.99645,0.44203 -1.28125,0.59375 10e-6,0 0,0.0295 0,0.0312 l -8,3.1875 1.8125,14.71875 c -0.25799,-0.0608 6.1875,3.3125 6.1875,3.3125 0.22641,-0.14468 0.44895,-0.27261 0.71875,-0.375 1.08052,-0.40998 2.1716,-0.21577 6,-1.6875 3.82852,-1.47174 5.22405,-2.00498 5.90625,-2.40625 0.67961,-0.39978 1.61175,-0.87937 2.21875,-1.53125 1.82692,-0.13775 3.5708,-0.49323 4.9375,-1 2.968,-1.10052 4.87535,-1.80619 6.78125,-2.46875 1.90581,-0.66254 2.35415,-1.41487 3.40625,-1.78125 1.09162,-0.38011 2.1951,-0.16538 6.0625,-1.53125 3.8674,-1.36586 5.28315,-1.82708 5.96875,-2.21875 0.70111,-0.40052 1.7008,-0.93298 2.3125,-1.59375 1.97081,-0.0547 3.81695,-0.38463 5.28125,-0.875 3.00152,-1.00508 4.92615,-1.62171 6.84375,-2.25 1.53861,-0.5041 2.17415,-1.04677 2.90625,-1.4375 0.23022,-0.13431 0.4759,-0.25373 0.75,-0.34375 1.09832,-0.36048 2.18145,-0.0814 6.09375,-1.3125 3.91231,-1.23113 5.366,-1.67295 6.0625,-2.03125 0.69391,-0.35697 1.6301,-0.79261 2.25,-1.40625 1.86521,-0.0227 3.63585,-0.26683 5.03125,-0.6875 3.0304,-0.91354 4.9924,-1.4301 6.9375,-1.96875 1.94512,-0.53864 2.4262,-1.26452 3.5,-1.5625 1.11402,-0.30915 2.22,0.007 6.1875,-1.03125 3.9675,-1.03863 5.4175,-1.43273 6.125,-1.75 0.7348,-0.32959 1.8139,-0.75372 2.4375,-1.375 1.99782,0.116 3.85745,-0.0201 5.34375,-0.375 3.07811,-0.735 5.0834,-1.10094 7.0625,-1.5 1.58791,-0.32018 2.2443,-0.79055 3,-1.09375 0.23751,-0.1068 0.4669,-0.19276 0.75,-0.25 1.13341,-0.22919 2.30465,0.20893 6.34375,-0.5 4.03942,-0.70893 5.50025,-0.92709 6.21875,-1.1875 0.71581,-0.25944 1.70435,-0.56724 2.34375,-1.09375 1.9242,0.23949 3.7479,0.22453 5.1875,0 3.12642,-0.48762 5.15455,-0.70067 7.15625,-0.96875 2.00171,-0.26807 2.48875,-0.94514 3.59375,-1.09375 1.14642,-0.15418 2.27585,0.30157 6.34375,-0.21875 4.06781,-0.52032 5.56025,-0.69573 6.28125,-0.9375 0.73712,-0.24714 1.7981,-0.58623 2.4375,-1.125 2.05,0.33553 3.9737,0.39796 5.5,0.21875 3.1422,-0.36896 5.18,-0.55936 7.1875,-0.78125 1.61082,-0.17802 2.26465,-0.6082 3.03125,-0.84375 0.24091,-0.0855 0.49405,-0.1556 0.78125,-0.1875 1.1497,-0.12772 2.3013,0.34665 6.375,-0.125 4.0737,-0.47165 5.55905,-0.6106 6.28125,-0.84375 0.71941,-0.23227 1.70025,-0.47346 2.34375,-0.96875 1.9363,0.33346 3.77005,0.40424 5.21875,0.25 3.14601,-0.33495 5.1775,-0.51859 7.1875,-0.71875 2.00991,-0.20014 2.48415,-0.82639 3.59375,-0.9375 1.1511,-0.11528 2.2965,0.36506 6.375,-0.0625 4.0785,-0.42756 5.5889,-0.56209 6.3125,-0.78125 0.73922,-0.22386 1.7956,-0.51325 2.4375,-1.03125 2.057,0.39867 4.00185,0.4934 5.53125,0.34375 3.14871,-0.3081 5.1758,-0.47325 7.1875,-0.65625 1.61401,-0.14682 2.26305,-0.56055 3.03125,-0.78125 0.2413,-0.0809 0.49355,-0.12991 0.78125,-0.15625 1.15211,-0.10545 2.2929,0.39275 6.375,0 4.08211,-0.39275 5.5889,-0.53084 6.3125,-0.75 0.7209,-0.21833 1.6996,-0.4477 2.3437,-0.9375 1.9381,0.34999 3.7689,0.45438 5.2188,0.3125 3.1487,-0.3081 5.1758,-0.47325 7.1875,-0.65625 2.0116,-0.18299 2.5142,-0.83802 3.625,-0.9375 1.1523,-0.10323 2.2922,0.38483 6.375,0 4.0829,-0.38482 5.5887,-0.501 6.3125,-0.71875 0.7393,-0.22243 1.7956,-0.51449 2.4375,-1.03125 2.0574,0.40177 4.0029,0.50333 5.5313,0.34375 3.1465,-0.32852 5.177,-0.5227 7.1874,-0.71875 1.613,-0.15729 2.2657,-0.63148 3.0313,-0.875 0.2407,-0.088 0.4632,-0.12137 0.75,-0.15625 1.1483,-0.1397 2.3167,0.33991 6.375,-0.25 4.0583,-0.58992 5.5618,-0.77714 6.2813,-1.03125 0.7166,-0.25316 1.6746,-0.55807 2.3124,-1.09375 1.9197,0.21194 3.72,0.15141 5.1563,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0937,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5626,-1.28125 1.1287,-0.25066 2.2702,0.11629 6.25,-0.875 3.9795,-0.99127 5.4295,-1.4193 6.125,-1.78125 0.7222,-0.376 1.7617,-0.87058 2.375,-1.53125 1.9629,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.1446 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70652 2.3191,-1.70203 2.5312,-2 0.2123,-0.29795 0.099,-0.72855 0.125,-0.75 0.043,-0.0352 0.3404,-0.094 0.5,-0.4375 0.859,-1.84707 2.3232,-5.62764 2.4376,-6.3125 0.1137,-0.68214 0.168,-1.35277 0.2187,-1.75 0.029,-0.2295 -0.1471,-0.8789 -0.125,-0.9375 0.031,-0.082 0.2883,-0.25057 0.3437,-0.5 0.2663,-1.19831 0.089,-2.20736 -0.125,-3.625 -0.2139,-1.41763 -0.9716,-4.61463 -1.625,-5.46875 -0.6589,-0.86172 -1.2248,-1.01051 -1.75,-1 z"</div><div class='add'>+         transform="translate(0.08004571,-0.03125)" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7001-5"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur7003-7" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6949-4"</div><div class='add'>+       x="-0.10294895"</div><div class='add'>+       width="1.2058979"</div><div class='add'>+       y="-0.34224695"</div><div class='add'>+       height="1.6844939"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6951-1" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6961-8"</div><div class='add'>+       x="-0.09919104"</div><div class='add'>+       width="1.1983821"</div><div class='add'>+       y="-0.22643611"</div><div class='add'>+       height="1.4528722"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6963-5" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6957-9"</div><div class='add'>+       x="-0.098213427"</div><div class='add'>+       width="1.1964267"</div><div class='add'>+       y="-0.19838208"</div><div class='add'>+       height="1.3967642"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6959-7" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6997-5"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6999-3" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6953-8"</div><div class='add'>+       x="-0.098320946"</div><div class='add'>+       width="1.1966419"</div><div class='add'>+       y="-0.19750816"</div><div class='add'>+       height="1.3950163"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6955-8" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6993-3"</div><div class='add'>+       x="-0.098213255"</div><div class='add'>+       width="1.1964265"</div><div class='add'>+       y="-0.19838208"</div><div class='add'>+       height="1.3967642"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6995-1" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6989-8"</div><div class='add'>+       x="-0.098428868"</div><div class='add'>+       width="1.1968577"</div><div class='add'>+       y="-0.20287035"</div><div class='add'>+       height="1.4057407"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6991-9" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6985-6"</div><div class='add'>+       x="-0.098428868"</div><div class='add'>+       width="1.1968577"</div><div class='add'>+       y="-0.20853186"</div><div class='add'>+       height="1.4170637"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6987-4" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6965-3"</div><div class='add'>+       x="-0.099081434"</div><div class='add'>+       width="1.1981629"</div><div class='add'>+       y="-0.22529824"</div><div class='add'>+       height="1.4505965"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6967-3" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6981-3"</div><div class='add'>+       x="-0.10052545"</div><div class='add'>+       width="1.2010509"</div><div class='add'>+       y="-0.2742162"</div><div class='add'>+       height="1.5484324"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6983-8" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6977-6"</div><div class='add'>+       x="-0.10224481"</div><div class='add'>+       width="1.2044896"</div><div class='add'>+       y="-0.32371372"</div><div class='add'>+       height="1.6474274"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6979-0" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6973-4"</div><div class='add'>+       x="-0.10330495"</div><div class='add'>+       width="1.2066098"</div><div class='add'>+       y="-0.36439717"</div><div class='add'>+       height="1.7287945"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6975-8" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter6969-8"</div><div class='add'>+       x="-0.10450897"</div><div class='add'>+       width="1.2090179"</div><div class='add'>+       y="-0.40468886"</div><div class='add'>+       height="1.8093777"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.1675612"</div><div class='add'>+         id="feGaussianBlur6971-8" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7345-9"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="1.7233839"</div><div class='add'>+         id="feGaussianBlur7347-7" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7333-7"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7335-6" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7285-4"</div><div class='add'>+       x="-0.030884685"</div><div class='add'>+       width="1.0617694"</div><div class='add'>+       y="-0.10267408"</div><div class='add'>+       height="1.2053483"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7287-3" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7289-0"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7291-3" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7293-0"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7295-9" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7337-2"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7339-5" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7297-4"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7299-0" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7301-5"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7303-9" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7305-4"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7307-6" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7309-9"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7311-2" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7313-2"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7315-4" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7317-7"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7319-7" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7321-5"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7323-4" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7329-8"</div><div class='add'>+       x="-0.030991485"</div><div class='add'>+       width="1.061983"</div><div class='add'>+       y="-0.10931916"</div><div class='add'>+       height="1.2186383"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7331-1" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter7325-2"</div><div class='add'>+       x="-0.031352691"</div><div class='add'>+       width="1.0627054"</div><div class='add'>+       y="-0.12140666"</div><div class='add'>+       height="1.2428133"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="0.35026836"</div><div class='add'>+         id="feGaussianBlur7327-8" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter9048-9"</div><div class='add'>+       x="-0.40879121"</div><div class='add'>+       width="1.8175824"</div><div class='add'>+       y="-0.71538466"</div><div class='add'>+       height="2.4307692"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="21.92031"</div><div class='add'>+         id="feGaussianBlur9050-3" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3631-6"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         d="m 760.16396,935.83377 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.91234 -3.78268,51.80084 -2.90046,70.65614 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.08394 38.76107,-114.49737 44.6608,-149.76859 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         id="path3633-8"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3677-0"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         d="m 586.13271,997.98981 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.9123 -3.78268,51.8008 -2.90046,70.6561 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.0839 38.76107,-114.49733 44.6608,-149.76855 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         id="path3679-2"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter3898-1"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="10.892985"</div><div class='add'>+         id="feGaussianBlur3900-0" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3622-5"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         d="m 266.27183,924.57186 c -1.40727,18.80121 -1.1449,32.75103 2.08174,49.30328 3.22665,16.55234 16.40608,45.90736 20.3344,63.18376 3.92622,17.2671 2.69413,38.3096 -12.45944,51.1482 -15.31761,12.9774 -42.05127,21.5989 -67.8323,15.7338 -25.78106,-5.8653 -69.54907,-49.2234 -88.59019,-70.2283 C 100.6939,1012.6293 56.045183,939.86194 41.867508,909.43681 27.689836,879.01169 29.207903,872.71824 33.747793,863.90708 24.381071,839.38658 21.334081,813.84027 0.03533552,788.33044 30.360815,791.44488 43.915625,815.28677 60.161025,835.47019 54.631129,787.39416 42.10631,771.05369 31.787073,744.74589 c 29.994295,6.08166 50.57936,31.8724 63.979783,72.7125 9.554154,-3.91791 18.237764,-9.37294 30.187414,-9.0612 -11.2975,-41.6958 -17.94946,-69.91584 -36.687255,-101.06994 53.441965,5.67033 83.657025,80.63932 78.971425,87.9608 9.97797,-2.24399 19.00565,-6.53038 30.43653,-5.65167 -11.24896,-38.34702 -21.04781,-76.8679 -3.65971,-118.64818 0,0 48.28678,65.43687 54.38966,85.80577 6.10287,20.36891 1.51881,38.70052 1.51881,38.70052 0,0 16.95957,31.08529 20.29392,51.09413 3.3731,20.24135 -3.53269,59.10332 -4.94582,77.98324 z"</div><div class='add'>+         id="path3624-1"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter9024-1"</div><div class='add'>+       x="-0.55453134"</div><div class='add'>+       width="2.1090627"</div><div class='add'>+       y="-0.51434779"</div><div class='add'>+       height="2.0286956"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="20.912684"</div><div class='add'>+         id="feGaussianBlur9026-0" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter9020-8"</div><div class='add'>+       x="-0.32861114"</div><div class='add'>+       width="1.6572223"</div><div class='add'>+       y="-0.182"</div><div class='add'>+       height="1.364"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="20.912684"</div><div class='add'>+         id="feGaussianBlur9022-5" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter9044-0"</div><div class='add'>+       x="-0.32631579"</div><div class='add'>+       width="1.6526316"</div><div class='add'>+       y="-0.84545463"</div><div class='add'>+       height="2.6909094"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="21.92031"</div><div class='add'>+         id="feGaussianBlur9046-6" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath4177-4"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path4179-6"</div><div class='add'>+         d="m 586.13271,997.98981 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.9123 -3.78268,51.8008 -2.90046,70.6561 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.0839 38.76107,-114.49733 44.6608,-149.76855 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4105-2"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="3.8640966"</div><div class='add'>+         id="feGaussianBlur4107-5" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4130-8"</div><div class='add'>+       x="-0.49509686"</div><div class='add'>+       width="1.9901937"</div><div class='add'>+       y="-0.26708817"</div><div class='add'>+       height="1.5341763"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="10.730622"</div><div class='add'>+         id="feGaussianBlur4132-6" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4141-2"</div><div class='add'>+       x="-0.40611032"</div><div class='add'>+       width="1.8122206"</div><div class='add'>+       y="-0.30260596"</div><div class='add'>+       height="1.6052119"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="9.8586086"</div><div class='add'>+         id="feGaussianBlur4143-8" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8338-4"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path8340-7"</div><div class='add'>+         d="m 266.27183,924.57185 c -1.40727,18.80122 -1.1449,32.75104 2.08174,49.30328 3.22666,16.55238 16.40609,45.90737 20.33441,63.18377 3.92621,17.2671 2.69413,38.3097 -12.45944,51.1482 -15.31761,12.9775 -42.05127,21.599 -67.8323,15.7338 -25.78106,-5.8653 -69.54908,-49.2234 -88.59019,-70.2283 C 100.6939,1012.6293 56.045182,939.86193 41.867507,909.4368 27.689835,879.01168 29.207902,872.71823 33.747792,863.90708 24.38107,839.38658 21.33408,813.84026 0.03533448,788.33044 30.360814,791.44487 43.915624,815.28676 60.161024,835.47019 54.631128,787.39416 42.106309,771.05368 31.787072,744.74589 c 29.994295,6.08165 50.57936,31.87239 63.979783,72.7125 9.554155,-3.91792 18.237765,-9.37294 30.187415,-9.0612 -11.2975,-41.6958 -17.94947,-69.91585 -36.687256,-101.06994 53.441966,5.67032 83.657026,80.63932 78.971426,87.9608 9.97797,-2.24399 19.00565,-6.53038 30.43653,-5.65167 -11.24897,-38.34703 -21.04782,-76.8679 -3.65971,-118.64819 0,0 48.28678,65.43688 54.38965,85.80578 6.10288,20.3689 1.51882,38.70051 1.51882,38.70051 0,0 16.95957,31.0853 20.29392,51.09414 3.3731,20.24134 -3.53269,59.10331 -4.94582,77.98323 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8333-2"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="7.18"</div><div class='add'>+         id="feGaussianBlur8335-4" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8359-0"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path8361-6"</div><div class='add'>+         d="m 266.27183,924.57185 c -1.40727,18.80122 -1.1449,32.75104 2.08174,49.30328 3.22666,16.55238 16.40609,45.90737 20.33441,63.18377 3.92621,17.2671 2.69413,38.3097 -12.45944,51.1482 -15.31761,12.9775 -42.05127,21.599 -67.8323,15.7338 -25.78106,-5.8653 -69.54908,-49.2234 -88.59019,-70.2283 C 100.6939,1012.6293 56.045182,939.86193 41.867507,909.4368 27.689835,879.01168 29.207902,872.71823 33.747792,863.90708 24.38107,839.38658 21.33408,813.84026 0.03533448,788.33044 30.360814,791.44487 43.915624,815.28676 60.161024,835.47019 54.631128,787.39416 42.106309,771.05368 31.787072,744.74589 c 29.994295,6.08165 50.57936,31.87239 63.979783,72.7125 9.554155,-3.91792 18.237765,-9.37294 30.187415,-9.0612 -11.2975,-41.6958 -17.94947,-69.91585 -36.687256,-101.06994 53.441966,5.67032 83.657026,80.63932 78.971426,87.9608 9.97797,-2.24399 19.00565,-6.53038 30.43653,-5.65167 -11.24897,-38.34703 -21.04782,-76.8679 -3.65971,-118.64819 0,0 48.28678,65.43688 54.38965,85.80578 6.10288,20.3689 1.51882,38.70051 1.51882,38.70051 0,0 16.95957,31.0853 20.29392,51.09414 3.3731,20.24134 -3.53269,59.10331 -4.94582,77.98323 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8354-2"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="6.82"</div><div class='add'>+         id="feGaussianBlur8356-9" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath3636-90"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         d="m 760.16396,935.83377 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.91234 -3.78268,51.80084 -2.90046,70.65614 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.08394 38.76107,-114.49737 44.6608,-149.76859 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         id="path3638-8"</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter4185-1"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="3.6164709"</div><div class='add'>+         id="feGaussianBlur4187-3" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8392-1"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path8394-1"</div><div class='add'>+         d="m 760.16396,935.83377 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.91234 -3.78268,51.80084 -2.90046,70.65614 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.08394 38.76107,-114.49737 44.6608,-149.76859 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8379-0"</div><div class='add'>+       x="-0.14413793"</div><div class='add'>+       width="1.288276"</div><div class='add'>+       y="-0.10278689"</div><div class='add'>+       height="1.2055738"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="7.389266"</div><div class='add'>+         id="feGaussianBlur8381-3" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath8417-4"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path8419-03"</div><div class='add'>+         d="m 760.16396,935.83377 c 6.7941,18.90279 10.49369,33.29969 11.8903,51.21189 1.39662,17.91234 -3.78268,51.80084 -2.90046,70.65614 0.88175,18.8452 8.13369,40.099 27.34463,48.9689 19.41887,8.9658 49.31924,10.2113 74.11984,-3.1456 24.8006,-13.357 57.40102,-70.3255 70.97426,-97.3087 13.62385,-27.08394 38.76107,-114.49737 44.6608,-149.76859 5.89973,-35.27121 2.55054,-41.30077 -4.61748,-49.05549 2.6403,-27.84015 -1.49972,-54.93543 13.10969,-87.18618 -30.24901,11.8257 -37.38229,40.1607 -48.31889,65.50508 -8.00091,-50.93293 0.20916,-71.27319 3.31889,-101.21936 -29.06476,14.77791 -42.86151,47.11402 -45,92.85714 -10.92395,-1.3042 -21.39144,-4.43423 -33.57143,-0.71429 -0.26404,-46.02334 -1.46356,-76.88941 8.91063,-114.20649 -53.25547,21.02686 -62.94728,106.5941 -56.05349,112.77792 -10.88282,0.535 -21.37108,-1.2973 -32.85714,2.85715 0.63892,-42.57135 -0.26046,-84.90861 -30,-122.85715 0,0 -30.95806,80.92234 -31.42857,103.57143 -0.47051,22.64909 9.45159,40.16588 9.45159,40.16588 0,0 -8.56807,36.74051 -6.29859,58.23223 2.29585,21.74146 20.4429,59.67617 27.26542,78.65809 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;filter</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       id="filter8404-9"</div><div class='add'>+       x="-0.090268657"</div><div class='add'>+       width="1.1805373"</div><div class='add'>+       y="-0.10250848"</div><div class='add'>+       height="1.205017"&gt;</div><div class='add'>+      &lt;feGaussianBlur</div><div class='add'>+         inkscape:collect="always"</div><div class='add'>+         stdDeviation="5.3457272"</div><div class='add'>+         id="feGaussianBlur8406-1" /&gt;</div><div class='add'>+    &lt;/filter&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient2843"</div><div class='add'>+       id="linearGradient6951"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="347.89655"</div><div class='add'>+       y1="1070.2124"</div><div class='add'>+       x2="275.58191"</div><div class='add'>+       y2="867.97992" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient8964"</div><div class='add'>+       id="linearGradient6953"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="translate(450.03125,73.843964)"</div><div class='add'>+       x1="603.84064"</div><div class='add'>+       y1="627.85303"</div><div class='add'>+       x2="616.24396"</div><div class='add'>+       y2="585.42664" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient8952"</div><div class='add'>+       id="linearGradient6955"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="translate(450.03125,73.843964)"</div><div class='add'>+       x1="609.31244"</div><div class='add'>+       y1="239.46866"</div><div class='add'>+       x2="560.83142"</div><div class='add'>+       y2="262.86206" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3961"</div><div class='add'>+       id="linearGradient6957"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       gradientTransform="translate(450.03125,73.843964)"</div><div class='add'>+       x1="398.21429"</div><div class='add'>+       y1="343.52289"</div><div class='add'>+       x2="379.28571"</div><div class='add'>+       y2="265.30862" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4084"</div><div class='add'>+       id="linearGradient6959"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="182.35046"</div><div class='add'>+       y1="256.11136"</div><div class='add'>+       x2="145.53348"</div><div class='add'>+       y2="542.20502" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4084"</div><div class='add'>+       id="linearGradient6961"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="182.35046"</div><div class='add'>+       y1="256.11136"</div><div class='add'>+       x2="145.53348"</div><div class='add'>+       y2="542.20502" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4478"</div><div class='add'>+       id="linearGradient6963"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="412.08926"</div><div class='add'>+       y1="404.91574"</div><div class='add'>+       x2="417.375"</div><div class='add'>+       y2="401.82648" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4478"</div><div class='add'>+       id="linearGradient6965"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="411.91071"</div><div class='add'>+       y1="404.91577"</div><div class='add'>+       x2="417.375"</div><div class='add'>+       y2="401.82648" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4478"</div><div class='add'>+       id="linearGradient6967"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="411.91071"</div><div class='add'>+       y1="405.54077"</div><div class='add'>+       x2="417.375"</div><div class='add'>+       y2="401.82648" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4478"</div><div class='add'>+       id="linearGradient6969"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="412.08926"</div><div class='add'>+       y1="405.54077"</div><div class='add'>+       x2="417.375"</div><div class='add'>+       y2="401.82648" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient4478"</div><div class='add'>+       id="linearGradient6971"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="411.73212"</div><div class='add'>+       y1="405.54077"</div><div class='add'>+       x2="417.375"</div><div class='add'>+       y2="401.82648" /&gt;</div><div class='add'>+    &lt;linearGradient</div><div class='add'>+       inkscape:collect="always"</div><div class='add'>+       xlink:href="#linearGradient3660"</div><div class='add'>+       id="linearGradient6973"</div><div class='add'>+       gradientUnits="userSpaceOnUse"</div><div class='add'>+       x1="1255.7386"</div><div class='add'>+       y1="667.09216"</div><div class='add'>+       x2="893.69995"</div><div class='add'>+       y2="858.01099" /&gt;</div><div class='add'>+    &lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath6975"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         id="rect6977"</div><div class='add'>+         width="440"</div><div class='add'>+         height="376"</div><div class='add'>+         x="547.99994"</div><div class='add'>+         y="205.32277"</div><div class='add'>+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#f8d615;stroke-width:18;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+    &lt;/clipPath&gt;</div><div class='add'>+    &lt;marker</div><div class='add'>+       inkscape:stockid="Arrow1Send"</div><div class='add'>+       orient="auto"</div><div class='add'>+       refY="0"</div><div class='add'>+       refX="0"</div><div class='add'>+       id="Arrow1Send-4"</div><div class='add'>+       style="overflow:visible"</div><div class='add'>+       inkscape:isstock="true"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path7188-9"</div><div class='add'>+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"</div><div class='add'>+         style="fill:#f8d615;fill-opacity:1;fill-rule:evenodd;stroke:#f8d615;stroke-width:1pt;stroke-opacity:1"</div><div class='add'>+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)" /&gt;</div><div class='add'>+    &lt;/marker&gt;</div><div class='add'>+  &lt;/defs&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata7"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title&gt;&lt;/dc:title&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer1"</div><div class='add'>+     inkscape:label="Shadow"</div><div class='add'>+     transform="translate(48.571445,195.53053)" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer20"</div><div class='add'>+     inkscape:label="New Ear"</div><div class='add'>+     transform="translate(48.571445,195.53053)" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer21"</div><div class='add'>+     inkscape:label="Rendered2"</div><div class='add'>+     style="display:inline"</div><div class='add'>+     transform="translate(48.571445,195.53053)" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer15"</div><div class='add'>+     inkscape:label="Feet"</div><div class='add'>+     style="display:inline"</div><div class='add'>+     transform="translate(48.571445,195.53053)" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="layer16"</div><div class='add'>+     inkscape:label="Left Foot"</div><div class='add'>+     style="display:inline"</div><div class='add'>+     transform="translate(48.571445,195.53053)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="display:inline;opacity:1;fill:#a8a8a8;fill-opacity:1;stroke:#000000;stroke-width:20.89992332;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"</div><div class='add'>+       id="rect6676-3-7-5"</div><div class='add'>+       width="1876.7191"</div><div class='add'>+       height="1562.9667"</div><div class='add'>+       x="-38.121483"</div><div class='add'>+       y="-86.153076" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:20.92477036;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"</div><div class='add'>+       id="rect6676-3-7"</div><div class='add'>+       width="1878.7875"</div><div class='add'>+       height="1564.9603"</div><div class='add'>+       x="2288.5129"</div><div class='add'>+       y="-84.10511" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="display:inline;opacity:1;fill:#a8a8a8;fill-opacity:1;stroke:#f83615;stroke-width:20.39127541;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"</div><div class='add'>+       id="rect6676-3"</div><div class='add'>+       width="1833.4282"</div><div class='add'>+       height="1522.9458"</div><div class='add'>+       x="2309.7717"</div><div class='add'>+       y="-62.567806" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g4303"&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         inkscape:export-ydpi="142.10527"</div><div class='add'>+         inkscape:export-xdpi="142.10527"</div><div class='add'>+         inkscape:export-filename="/home/cheeseness/Documents/LCA09/mascot/tuz_new.png"</div><div class='add'>+         transform="matrix(10.726753,0,0,10.726753,-2882.1235,-4565.4583)"</div><div class='add'>+         sodipodi:nodetypes="cccccccccsccccccccccc"</div><div class='add'>+         id="path10326"</div><div class='add'>+         d="m 304.64285,526.6479 c -10,0.35715 -18.21428,2.85714 -18.21428,2.85714 l 7.5,6.07143 10.35714,3.57143 16.07143,0.35714 22.5,-5.35714 7.85714,1.07143 20.35715,-2.14286 -10.35715,6.78572 c 5.45923,-1.02361 17.39329,3.56911 9.64286,5.35714 -1.74,0.40142 13.92857,-4.64285 13.92857,-4.64285 l 2.5,-4.64287 3.57143,-9.28571 11.42857,0 18.21428,-4.64286 3.57144,-4.99999 -16.07144,1.07142 -12.14285,2.14286 -14.64286,-5 -70.6921,16.70774 -5.37933,-5.27917 z"</div><div class='add'>+         style="display:inline;opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter11361);enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         transform="matrix(0.71084,-0.1937433,0.262963,0.9648058,503.68027,136.48399)"</div><div class='add'>+         id="g7882"</div><div class='add'>+         style="display:inline;opacity:1;enable-background:new"&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient7904);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 245.12255,100.05344 c 0,0 -47.12811,-31.646921 -67.21465,-35.800939 -20.03792,-4.143963 -38.4729,-3.317578 -51.93364,13.607323 -13.46074,16.924901 -12.07739,61.265196 -13.53554,86.969546 -1.45815,25.70435 2.54945,70.17701 17.6046,88.66552 15.05516,18.4885 45.88634,13.58502 49.92695,21.4137 2.21283,4.28736 65.15228,-174.85515 65.15228,-174.85515 z"</div><div class='add'>+           id="path7876"</div><div class='add'>+           sodipodi:nodetypes="czzzzcc"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient7906);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 135.37935,82.017807 c 0,0 26.34355,1.938783 37.63307,13.903188 11.41494,12.097335 13.73457,21.331515 15.29586,37.734585 1.56337,16.42499 -0.84957,28.41812 -7.81382,36.03734 -6.96425,7.61922 -1.00429,19.58332 -25.91605,12.07107 -24.91176,-7.51225 -27.03224,-27.78298 -26.51523,-46.30475 0.51721,-18.52898 7.31617,-53.441433 7.31617,-53.441433 z"</div><div class='add'>+           id="path7878"</div><div class='add'>+           sodipodi:nodetypes="czzzzzc"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;opacity:1;fill:url(#radialGradient7908);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           d="m 135.648,81.927211 c 0,0 -4.64465,16.365075 0.58825,28.563099 5.48794,12.79254 27.22425,44.26007 27.22425,54.65565 l 22.65625,-5 c 2.54218,-6.96644 3.21052,-15.75206 2.1875,-26.5 -1.56129,-16.40307 -3.8663,-25.62141 -15.28125,-37.718749 -9.65488,-10.232047 -31.59311,-13.374857 -37.375,-14 z"</div><div class='add'>+           id="path7880"</div><div class='add'>+           sodipodi:nodetypes="czccssc"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzcczzcc"</div><div class='add'>+         id="path7917"</div><div class='add'>+         d="m 845.03125,1154.7776 c -4.28571,0.7143 -27.62815,3.6181 -57.85714,10 -30.22899,6.3819 -57.31395,4.9661 -135.78608,17.3296 -79.85178,12.5808 -94.06436,42.5423 -108.12225,47.0643 -14.70014,4.7286 -145.37739,-65.8225 -145.37739,-65.8225 l 4.28572,-94.2857 c 0,0 85.88551,-16.2009 112.14285,-33.5714 26.25735,-17.3705 45.58238,-49.66602 59.28572,-71.42861 13.70334,-21.76259 32.85714,-71.42858 32.85714,-71.42858 l 238.57143,262.14289 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         sodipodi:nodetypes="ccccc"</div><div class='add'>+         clip-path="url(#clipPath8658)"</div><div class='add'>+         id="path7919"</div><div class='add'>+         d="m 332.34019,898.38549 -32.73181,-61.29956 -37.61734,45.10646 c 2.17675,1.31711 5.77425,-20.85603 45.6004,-64.41708 l 24.74875,80.61018 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8888);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         sodipodi:nodetypes="cccccc"</div><div class='add'>+         clip-path="url(#clipPath2833)"</div><div class='add'>+         id="path7923"</div><div class='add'>+         d="m 200.81833,863.03015 146.3711,-51.61879 243.95184,226.27414 -241.83052,140.0072 -181.01934,-87.6813 32.52692,-226.98125 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient2841);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8892);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzcczcc"</div><div class='add'>+         id="path7921"</div><div class='add'>+         d="m 642.88839,640.13471 c 0,0 -29.55406,40.57305 -47.85714,74.28571 -18.30309,33.71267 -58.62109,126.35694 -70.35714,171.07143 -11.7594,44.80344 -62.5,123.57145 -62.5,123.57145 l 76.07143,18.2143 c 0,0 11.80712,-12.8234 31.07142,-46.07146 19.2643,-33.24808 60.35715,-138.57143 60.35715,-138.57143 l 13.21428,-202.5 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#0f0f0f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath3665)"</div><div class='add'>+         sodipodi:nodetypes="ccccccc"</div><div class='add'>+         id="path7925"</div><div class='add'>+         d="m 430.28131,381.94122 c -7.07106,2.82843 -236.18124,32.15181 -236.18124,32.15181 l -39.63961,359.83304 90.19849,92.63961 52.3259,-114.5513 100.46804,-186.39192 32.82842,-183.68124 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.4;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8856);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzcc"</div><div class='add'>+         id="path7927"</div><div class='add'>+         d="m 969.67051,1164.0346 c 0,0 23.25628,11.3937 36.06779,20.4761 12.6974,9.0015 29.4724,24.6491 41.6924,37.3605 12.3055,12.8002 20.1127,22.5987 41.5327,24.1608 21.4322,1.5629 53.2824,-8.7876 73.296,-24.6642 20.0135,-15.8766 45.6469,-69.2328 45.6469,-69.2328 l -127.1608,-143.0717"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         sodipodi:nodetypes="ccccc"</div><div class='add'>+         clip-path="url(#clipPath8642)"</div><div class='add'>+         id="path7929"</div><div class='add'>+         d="M 331.34019,641.50471 216.17367,835.36467 260.2153,925.96265 357.79603,732.21539 331.34019,641.50471 Z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8860);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         inkscape:transform-center-y="-28.255779"</div><div class='add'>+         inkscape:transform-center-x="-347.89063"</div><div class='add'>+         transform="matrix(0.9934486,0.1142802,-0.1142802,0.9934486,-9.24324,588.09054)"</div><div class='add'>+         id="g7931"</div><div class='add'>+         style="display:inline;opacity:1;enable-background:new"&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           id="path7933"</div><div class='add'>+           d="m 1049.205,-282.26672 -0.09,0.008 c -1.3874,0.88445 -6.6033,1.6072 -6.629,9.52344 -0.024,7.42525 15.0129,17.09146 17.1563,18.09375 1.7302,0.80909 3.5916,1.40876 5.4063,1.71875 l 1.4374,0.21875 c 1.9197,0.21194 3.72,0.15141 5.1563,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0937,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5626,-1.28125 1.1287,-0.25066 2.2702,0.11629 6.25,-0.875 3.9795,-0.99128 5.4294,-1.4193 6.125,-1.78125 0.7222,-0.37601 1.7617,-0.87058 2.375,-1.53125 1.9629,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.14461 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70653 2.3191,-1.70203 2.5312,-2 0.2123,-0.29796 0.099,-0.72855 0.125,-0.75 0.043,-0.0352 0.3405,-0.094 0.5,-0.4375 0.859,-1.84708 2.3232,-5.62764 2.4376,-6.3125 0.1137,-0.68215 0.168,-1.35277 0.2187,-1.75 0.029,-0.22951 -0.1471,-0.8789 -0.125,-0.9375 0.031,-0.082 0.2883,-0.25057 0.3437,-0.5 0.2663,-1.19832 0.089,-2.20736 -0.125,-3.625 -0.2139,-1.41764 -0.9716,-4.61463 -1.625,-5.46875 -0.4194,-0.54857 -0.7993,-0.7925 -1.1562,-0.90625 -0.067,-0.0173 -0.1239,-0.0467 -0.1875,-0.0625 -0.021,-0.004 -0.042,0.003 -0.062,0 -0.3116,-0.0755 -0.6085,-0.15867 -1.1562,-0.21875 -0.9855,-0.10812 -2.4247,-0.2594 -3.9688,-0.25 -0.5147,0.003 -1.0371,0.0476 -1.5625,0.0937 -3.5589,0.31228 -9.0098,0.99108 -10.2187,1.625 -1.6331,-0.33402 -3.9482,-0.61223 -5.9376,-0.46875 -3.064,0.22097 -4.9677,0.34219 -6.9062,0.46875 -1.9384,0.12655 -1.6861,0.38864 -2.9062,0.46875 -1.3191,0.0866 -1.7869,-0.22325 -5.5626,0.0937 -3.5457,0.29772 -8.9806,0.99317 -10.2187,1.625 -1.6334,-0.33451 -3.9459,-0.61239 -5.9375,-0.46875 -3.0642,0.22098 -4.9678,0.37344 -6.9062,0.5 -0.6592,0.043 -1.0424,0.12393 -1.3438,0.1875 z"</div><div class='add'>+           style="display:inline;opacity:1;fill:#bcb786;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           transform="matrix(0.9975712,-0.06965428,0.06965428,0.9975712,872.72062,140.02502)"</div><div class='add'>+           id="g7935"</div><div class='add'>+           style="display:inline;filter:url(#filter7610);enable-background:new"</div><div class='add'>+           clip-path="url(#clipPath7616)"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+             d="m 229.94262,-409.12268 c -3.55781,0.05 -9.0242,0.36009 -10.30334,0.90414 -1.60609,-0.44747 -3.90316,-0.88131 -5.89995,-0.87674 -3.07199,0.007 -4.96469,0.009 -6.90727,0 -0.66047,-0.003 -1.04759,0.0672 -1.35267,0.10959 0,0 0,1.09593 0,1.09593 0.11972,-0.17947 0.39252,-0.69046 0.94975,-0.76715 0.74758,-0.10289 5.16928,-0.15123 7.31019,-0.1096 1.7746,0.0345 4.45523,0.27427 6.38921,0.95895 0.3214,0.11378 0.61925,0.27378 0.89219,0.41097 1.96342,0.98693 7.94336,4.30154 7.94336,4.30154 0,0 -6.63275,-3.94768 -7.48287,-4.43853 -0.20331,-0.11739 -0.57464,-0.25769 -1.03609,-0.41098 1.22063,-0.44779 5.07597,-0.61971 7.82823,-0.71235 3.0245,-0.10182 3.34776,-0.0896 5.41069,0.19179 2.12931,0.29043 3.33851,0.60276 3.33851,0.60276 -1e-5,0 -0.0784,-0.64118 1.03609,-0.79455 0.74757,-0.10289 5.16929,-0.15123 7.31019,-0.1096 2.0695,0.0403 5.36605,0.40716 7.2814,1.36992 1.00332,0.50433 3.03564,1.56863 4.79535,2.53571 l 0.0956,-0.0194 c 0,0 -3.58034,-2.16242 -4.43047,-2.65327 -0.20331,-0.11739 -0.57463,-0.25769 -1.03609,-0.41098 1.22062,-0.44779 5.04719,-0.61971 7.79945,-0.71235 3.0245,-0.10182 3.34775,-0.0896 5.41069,0.19179 1.95316,0.2664 3.01292,0.53006 3.19461,0.57536 0,0 -0.0271,-0.31146 -0.0271,-0.31146 -0.40903,-0.13645 -0.71424,-0.23335 -1.40038,-0.35748 -1.30081,-0.23533 -3.39912,-0.60156 -5.50857,-0.56398 -3.57195,0.0636 -9.05328,0.35596 -10.30334,0.90414 -1.60583,-0.44695 -3.87662,-0.8813 -5.87117,-0.87674 -3.07199,0.007 -4.99348,0.009 -6.93605,0 -1.94256,-0.009 -1.71268,0.27907 -2.93558,0.27398 -1.32191,-0.005 -1.76612,-0.35463 -5.55459,-0.30138 0,0 0,0 0,0"</div><div class='add'>+             id="path7937"</div><div class='add'>+             sodipodi:nodetypes="ccssscsssscscsscsssccscssccsscssscc"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             sodipodi:nodetypes="cssccsscc"</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+             d="m 206.1989,-407.47878 c 1.92021,0.81706 4.57715,2.19283 6.15897,3.39739 1.58184,1.20456 2.90757,1.77368 5.55459,3.91795 0.88557,0.71738 1.74865,1.34985 2.59193,1.92174 l 0.54057,-0.19011 c -0.71323,-0.48339 -1.46776,-1.02031 -2.26909,-1.62203 -2.82223,-2.11921 -3.62655,-2.80973 -6.01507,-4.27414 -2.38854,-1.4644 -4.09948,-2.36576 -6.5619,-3.1508 0,0 0,0 0,0"</div><div class='add'>+             id="path7939"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             sodipodi:nodetypes="csccscc"</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+             d="m 237.79963,-407.47878 c 1.92021,0.81706 4.60594,2.19283 6.18775,3.39739 0.81307,0.61916 1.55849,1.07042 2.45046,1.65401 l 0.649,-0.11666 c -0.79831,-0.57637 -1.57177,-1.09435 -2.69653,-1.78394 -2.38854,-1.4644 -4.12826,-2.36576 -6.59068,-3.1508 0,0 0,0 0,0"</div><div class='add'>+             id="path7941"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           id="g7943"</div><div class='add'>+           clip-path="url(#clipPath7606)"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             sodipodi:nodetypes="czzzzzzzzzzzzzz"</div><div class='add'>+             id="path7945"</div><div class='add'>+             d="m 1056.25,-278.80481 c 4.1446,-1.47877 10,3.125 10,3.125 0.899,0.28092 2.7251,-0.89447 2.6243,-1.68614 0,0 -1.5503,-1.86062 -0.3743,-2.93886 1.176,-1.07824 5.296,1.50738 7.5,1.625 2.204,0.11762 5.5621,-0.22941 7,-0.75 1.4379,-0.52059 1.1129,-1.42459 2.625,-1.75 1.5121,-0.32541 5.1189,1.03754 7.0605,1.16883 1.9416,0.13129 4.6481,0.33427 5.8145,-0.16883 1.1664,-0.5031 0.1782,-1.15921 1.875,-1.875 1.6968,-0.71579 7.7602,-0.95662 9.625,-0.125 1.8648,0.83162 1.8099,0.5192 2.625,3 0.8151,2.4808 7.4398,5.16285 -1.125,13.375 -8.5648,8.21215 -59.3779,13.78594 -65.625,2.75 -6.2471,-11.03594 6.2304,-14.27123 10.375,-15.75 z"</div><div class='add'>+             style="display:inline;opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7578);enable-background:new"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             sodipodi:nodetypes="czzzzzzzzzzzzzz"</div><div class='add'>+             id="path7947"</div><div class='add'>+             d="m 1058.5,-275.42981 c 4.1446,-1.47877 10,3.125 10,3.125 0.899,0.28092 2.7251,-0.89447 2.6243,-1.68614 0,0 -1.5503,-1.86062 -0.3743,-2.93886 1.176,-1.07824 5.296,1.50738 7.5,1.625 2.204,0.11762 5.5621,-0.22941 7,-0.75 1.4379,-0.52059 1.1129,-1.42459 2.625,-1.75 1.5121,-0.32541 5.1189,1.03754 7.0605,1.16883 1.9416,0.13129 4.6481,0.33427 5.8145,-0.16883 1.1664,-0.5031 0.1782,-1.15921 1.875,-1.875 1.6968,-0.71579 7.7602,-0.95662 9.625,-0.125 1.8648,0.83162 1.8099,0.5192 2.625,3 0.8151,2.4808 7.4398,5.16285 -1.125,13.375 -8.5648,8.21215 -59.3779,13.78594 -65.625,2.75 -6.2471,-11.03594 6.2304,-14.27123 10.375,-15.75 z"</div><div class='add'>+             style="display:inline;opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7594);enable-background:new"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="cscccccccccccc"</div><div class='add'>+         id="path7949"</div><div class='add'>+         d="m 628.24553,347.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.55405 36.34702,-65.29583 116.94091,-84.69468 185.93466,-91.46542 86.92239,-11.0168 184.91267,17.94007 233.37138,95.40128 54.124,75.7333 56.6747,172.53912 80.612,259.52795 29.4378,127.1276 54.7791,256.21414 60.3922,386.85035 -3.0634,78.18185 -8.4263,165.18417 -60.5032,228.13417 -48.0265,50.3574 -122.7864,50.053 -187.06985,59.0023 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.1982 -64.77564,-37.94 -95.73019,-113.47867 -97.2794,-186.01962 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#101414;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath8616)"</div><div class='add'>+         sodipodi:nodetypes="ccccczzzcc"</div><div class='add'>+         id="path7951"</div><div class='add'>+         d="m 311.83409,415.43155 9.8995,121.62237 -60.10408,136.47161 15.55635,174.65537 c 15.61326,61.8792 32.18545,98.66905 74.37615,117.05383 4.31911,-36.23998 -38.61152,-142.95988 -39.24264,-189.11984 -0.63145,-46.18445 10.83034,-108.60786 30.67767,-158.29647 20.04835,-50.19188 36.89674,-44.84642 42.12489,-92.59293 5.22815,-47.74651 -17.4264,-149.39192 -17.4264,-149.39192 l -55.86144,39.59798 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8940);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czcc"</div><div class='add'>+         id="path7953"</div><div class='add'>+         d="m 1010.0312,655.49186 c 0,0 16.7552,37.01806 28.7015,53.95395 11.9462,16.93589 52.7271,56.04605 52.7271,56.04605 l 52.5972,-127.58975"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient8970);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath8209)"</div><div class='add'>+         sodipodi:nodetypes="cccc"</div><div class='add'>+         id="path7955"</div><div class='add'>+         d="m 730.31998,536.56864 c 0,8.48528 42.54774,58.46803 42.54774,58.46803 l 12.60659,-28.76954 -55.15433,-29.69849 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.07999998;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8822);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         clip-path="url(#clipPath3998)"</div><div class='add'>+         id="g7957"</div><div class='add'>+         style="display:inline;opacity:1;enable-background:new"</div><div class='add'>+         transform="translate(450.03125,73.843964)"&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           id="g7959"</div><div class='add'>+           style="filter:url(#filter3677)"</div><div class='add'>+           transform="translate(-174.03125,62.156036)"&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             style="filter:url(#filter3785)"</div><div class='add'>+             id="g7961"&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 425.88244,476.99186 c 10.80543,-1.47866 24.74401,3.35451 44.64286,3.21428 19.89885,-0.14023 57.45322,-16.91122 82.14285,-17.14286 24.68963,-0.23164 62.7517,12.28406 79.28572,15 16.53402,2.71594 22.84832,-0.15852 27.49999,7.85715 4.65167,8.01567 1.92671,10.74724 -10.35714,20.71429 -12.28385,9.96705 -40.78968,12.63632 -66.07143,12.85714 -25.28234,0.22082 -70.38129,7.07852 -95.35714,3.92856 -24.97585,-3.14996 -56.93756,-7.82267 -68.92857,-17.85714 -11.99101,-10.03447 -19.85084,-16.73182 -17.5,-23.92857 2.35084,-7.19675 13.83743,-3.16419 24.64286,-4.64285 z"</div><div class='add'>+               id="path7963"</div><div class='add'>+               sodipodi:nodetypes="czzzzzzzzzz"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;rect</div><div class='add'>+               style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+               id="rect7965"</div><div class='add'>+               width="381.83765"</div><div class='add'>+               height="181.01935"</div><div class='add'>+               x="343.6539"</div><div class='add'>+               y="412.60312" /&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             style="filter:url(#filter3785)"</div><div class='add'>+             id="g7967"&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               transform="translate(174.03125,-62.156036)"</div><div class='add'>+               style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 687.14286,452.36218 c -10.46169,9.71443 -86.9796,19.00514 -100.71429,29.28572 -13.73469,10.28058 -14.75252,12.88826 -12.14286,20 2.60966,7.11174 6.54527,9.40572 25.71429,8.57142 19.16902,-0.8343 98.57143,-27.62172 98.57143,-21.42857 l -11.42857,-36.42857 z"</div><div class='add'>+               id="path7969"</div><div class='add'>+               sodipodi:nodetypes="czzzcc"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;rect</div><div class='add'>+               style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+               id="rect7971"</div><div class='add'>+               width="207.8894"</div><div class='add'>+               height="162.63455"</div><div class='add'>+               x="702.86414"</div><div class='add'>+               y="344.82138" /&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           id="g7973"</div><div class='add'>+           style="display:inline;opacity:0.18000004;enable-background:new"</div><div class='add'>+           transform="translate(-174.03125,62.156036)"&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             style="filter:url(#filter3785)"</div><div class='add'>+             id="g7975"&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 425.88244,476.99186 c 10.80543,-1.47866 24.74401,3.35451 44.64286,3.21428 19.89885,-0.14023 57.45322,-16.91122 82.14285,-17.14286 24.68963,-0.23164 62.7517,12.28406 79.28572,15 16.53402,2.71594 22.84832,-0.15852 27.49999,7.85715 4.65167,8.01567 1.92671,10.74724 -10.35714,20.71429 -12.28385,9.96705 -40.78968,12.63632 -66.07143,12.85714 -25.28234,0.22082 -70.38129,7.07852 -95.35714,3.92856 -24.97585,-3.14996 -56.93756,-7.82267 -68.92857,-17.85714 -11.99101,-10.03447 -19.85084,-16.73182 -17.5,-23.92857 2.35084,-7.19675 13.83743,-3.16419 24.64286,-4.64285 z"</div><div class='add'>+               id="path7977"</div><div class='add'>+               sodipodi:nodetypes="czzzzzzzzzz"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;rect</div><div class='add'>+               style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+               id="rect7979"</div><div class='add'>+               width="381.83765"</div><div class='add'>+               height="181.01935"</div><div class='add'>+               x="343.6539"</div><div class='add'>+               y="412.60312" /&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             style="filter:url(#filter3785)"</div><div class='add'>+             id="g7981"&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               transform="translate(174.03125,-62.156036)"</div><div class='add'>+               style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 687.14286,452.36218 c -10.46169,9.71443 -86.9796,19.00514 -100.71429,29.28572 -13.73469,10.28058 -14.75252,12.88826 -12.14286,20 2.60966,7.11174 6.54527,9.40572 25.71429,8.57142 19.16902,-0.8343 98.57143,-27.62172 98.57143,-21.42857 l -11.42857,-36.42857 z"</div><div class='add'>+               id="path7983"</div><div class='add'>+               sodipodi:nodetypes="czzzcc"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;rect</div><div class='add'>+               style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+               id="rect7985"</div><div class='add'>+               width="207.8894"</div><div class='add'>+               height="162.63455"</div><div class='add'>+               x="702.86414"</div><div class='add'>+               y="344.82138" /&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         sodipodi:nodetypes="cccccscc"</div><div class='add'>+         clip-path="url(#clipPath8604)"</div><div class='add'>+         id="path7987"</div><div class='add'>+         d="M 582.65599,-7.4183011 695.79307,78.848726 804.68752,337.64981 842.87128,545.5392 963.07944,637.46308 c 0,0 -12.72793,-287.08535 -19.799,-313.95541 C 936.20938,296.63761 793.37381,-69.643698 793.37381,-69.643698 L 582.65599,-7.4183011 Z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8802);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzc"</div><div class='add'>+         id="path7989"</div><div class='add'>+         d="m 964.13839,239.599 c 0,0 8.67732,10.89662 24.10715,11.96428 15.42986,1.06766 49.72166,-39.95267 70.17856,-52.14285 20.4793,-12.20353 47.0464,-26.60225 63.9286,-20.35714 16.8821,6.2451 22.1578,26.43609 27.8571,48.03571 5.6994,21.59961 6.7186,61.81389 -2.6785,92.85715 -9.3972,31.04325 -50.5033,73.10375 -65.3572,103.39285 -14.8539,30.2891 -11.6071,39.82143 -11.6071,39.82143"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient8958);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzc"</div><div class='add'>+         id="path7991"</div><div class='add'>+         d="m 1124.4955,207.63471 c -15.8928,-0.89286 -49.7188,12.10583 -66.0714,24.28572 -16.4386,12.2439 -29.2209,24.1144 -29.2857,52.14285 -0.065,28.20604 13.1191,39.07641 29.1071,46.96429 15.988,7.88789 33.6862,7.11928 51.9643,-11.78571 18.2782,-18.905 14.2857,-111.60715 14.2857,-111.60715 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:url(#radialGradient3315);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;ellipse</div><div class='add'>+         clip-path="url(#clipPath4100)"</div><div class='add'>+         transform="matrix(0.9434749,-0.1239943,0.1440089,1.0957669,451.94827,134.5988)"</div><div class='add'>+         id="path7993"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.75;fill:url(#radialGradient3543);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4120);enable-background:accumulate"</div><div class='add'>+         cx="385"</div><div class='add'>+         cy="237.00504"</div><div class='add'>+         rx="86.428574"</div><div class='add'>+         ry="73.928574" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         mask="url(#mask3684)"</div><div class='add'>+         sodipodi:nodetypes="csczzc"</div><div class='add'>+         id="path7995"</div><div class='add'>+         d="m 527.60588,407.44884 c 0,0 -122.04144,38.40348 -187.51434,9.63181 -65.47289,-28.77166 -74.37725,-124.71847 -74.37725,-124.71847 0,0 73.38158,-80.50393 129.92078,-83.61476 55.82705,-3.07164 90.57386,20.14332 114.87001,65.85171 24.352,45.81348 17.1008,132.84971 17.1008,132.84971 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3915);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         transform="translate(450.03125,73.843964)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czcc"</div><div class='add'>+         id="path7997"</div><div class='add'>+         d="m 772.17411,393.349 c 0,0 36.21754,-27.38247 51.60714,-35.89286 15.17734,-8.39301 25.71428,-11.60714 35.89285,-11.60714 l -15.53571,66.96428"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3959);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;circle</div><div class='add'>+         transform="translate(449.49554,74.915393)"</div><div class='add'>+         id="path7999"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3933);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         cx="409.28571"</div><div class='add'>+         cy="306.64789"</div><div class='add'>+         r="36.25" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath8616)"</div><div class='add'>+         sodipodi:nodetypes="cccccccccc"</div><div class='add'>+         id="path8001"</div><div class='add'>+         d="m 311.83409,415.43155 9.8995,121.62237 -60.10408,136.47161 15.55635,174.65537 c 15.61326,61.8792 32.18545,98.66905 74.37615,117.05383 4.31911,-36.23998 8.68161,-72.36764 -31.24264,-223.11984 l 17.67767,-69.29647 72.12489,-138.59293 -42.4264,-158.39192 -55.86144,39.59798 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8806);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzcc"</div><div class='add'>+         id="path8003"</div><div class='add'>+         d="m 635.21025,581.13004 c -14.14214,12.72792 39.23347,34.58015 76.36753,24.04163 37.13406,-10.53852 104.64487,-35.56437 103.23759,-79.19596 -1.40728,-43.63158 -76.36753,-128.69343 -76.36753,-128.69343 L 635.21025,581.13004 Z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8826);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;circle</div><div class='add'>+         transform="translate(449.67411,74.915393)"</div><div class='add'>+         id="path8005"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3991);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         cx="410"</div><div class='add'>+         cy="306.64789"</div><div class='add'>+         r="23.214285" /&gt;</div><div class='add'>+      &lt;circle</div><div class='add'>+         transform="translate(451.99554,73.486821)"</div><div class='add'>+         id="path8007"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter3981);enable-background:accumulate"</div><div class='add'>+         cx="414.28571"</div><div class='add'>+         cy="303.07648"</div><div class='add'>+         r="7.5" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzczc"</div><div class='add'>+         id="path8009"</div><div class='add'>+         d="m 789.31696,478.349 c 0,0 7.02281,19.56859 -1.07143,35 -8.09424,15.43141 -42.32317,38.98822 -67.49999,50 -25.30972,11.06991 -85.473,32.96393 -101.78572,41.96428 -16.46148,9.08243 -18.21428,12.67857 -18.21428,12.67857 0,0 -7.14693,-19.06441 28.74999,-51.7857 36.17211,-32.97214 142.02712,-48.0495 159.82143,-87.85715 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4112);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         transform="translate(780.74553,74.55825)"</div><div class='add'>+         id="g8011"</div><div class='add'>+         style="display:inline;opacity:1;enable-background:new"&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;opacity:1;fill:url(#radialGradient3585);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           d="m 179.64286,267.36218 c -22.41044,39.70292 -60.6161,115.78029 -69.28571,149.64286 -8.64721,33.7751 -8.77199,66.41654 -0.35715,86.42858 8.3602,19.88213 26.16398,35.6328 40.71428,41.42856 -0.59638,-14.37587 14.37295,-43.28583 72.85715,-72.5 58.62627,-29.28514 78.38163,-27.13086 103.57142,-47.14286 25.63006,-20.36176 8.20587,-79.64664 3.21429,-93.92857 -4.99158,-14.28193 -1.23663,-3.37974 -1.94602,-5.09301 -10.68928,-25.81592 -34.21432,-54.4303 -64.48255,-64.54984 -30.26823,-10.11954 -65.01776,-4.84837 -84.28571,5.71428 z"</div><div class='add'>+           id="path8013"</div><div class='add'>+           sodipodi:nodetypes="czzczzzszc"</div><div class='add'>+           clip-path="url(#clipPath3999)"</div><div class='add'>+           transform="translate(-329.81481,0)"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;ellipse</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4060);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="path8015"</div><div class='add'>+           transform="matrix(0.8823874,0.4705236,-0.4705236,0.8823874,-166.62245,2.387362)"</div><div class='add'>+           cx="183.57143"</div><div class='add'>+           cy="338.07648"</div><div class='add'>+           rx="64.715881"</div><div class='add'>+           ry="134.00607" /&gt;</div><div class='add'>+        &lt;ellipse</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4062);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="path8017"</div><div class='add'>+           transform="matrix(0.8823874,0.4705236,-0.4705236,0.8823874,-162.19388,-18.755495)"</div><div class='add'>+           cx="183.57143"</div><div class='add'>+           cy="338.07648"</div><div class='add'>+           rx="64.715881"</div><div class='add'>+           ry="134.00607" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3587);stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4079);enable-background:new"</div><div class='add'>+           d="m 179.64286,267.36218 c -22.41044,39.70292 -60.6161,115.78029 -69.28571,149.64286 -8.64721,33.7751 -8.77199,66.41654 -0.35715,86.42858 8.3602,19.88213 26.16398,35.6328 40.71428,41.42856 -0.59638,-14.37587 14.37295,-43.28583 72.85715,-72.5 58.62627,-29.28514 78.38163,-27.13086 103.57142,-47.14286 25.63006,-20.36176 8.20587,-79.64664 3.21429,-93.92857 -4.99158,-14.28193 -1.23663,-3.37974 -1.94602,-5.09301 -10.68928,-25.81592 -34.21432,-54.4303 -64.48255,-64.54984 -30.26823,-10.11954 -65.01776,-4.84837 -84.28571,5.71428 z"</div><div class='add'>+           id="path8019"</div><div class='add'>+           sodipodi:nodetypes="czzczzzszc"</div><div class='add'>+           clip-path="url(#clipPath3999)"</div><div class='add'>+           transform="translate(-329.81481,3e-7)"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;circle</div><div class='add'>+         transform="translate(452.55663,72.581273)"</div><div class='add'>+         id="path8021"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         cx="310.71429"</div><div class='add'>+         cy="398.07648"</div><div class='add'>+         r="19.704132" /&gt;</div><div class='add'>+      &lt;circle</div><div class='add'>+         transform="translate(450.55663,72.581273)"</div><div class='add'>+         id="path8023"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4056);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4082);stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4083);enable-background:accumulate"</div><div class='add'>+         cx="310.71429"</div><div class='add'>+         cy="398.07648"</div><div class='add'>+         r="19.704132" /&gt;</div><div class='add'>+      &lt;circle</div><div class='add'>+         transform="translate(450.55663,72.581273)"</div><div class='add'>+         id="path8025"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4119);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         cx="310.71429"</div><div class='add'>+         cy="398.07648"</div><div class='add'>+         r="19.704132" /&gt;</div><div class='add'>+      &lt;ellipse</div><div class='add'>+         inkscape:transform-center-y="-3.6935079"</div><div class='add'>+         inkscape:transform-center-x="-47.231976"</div><div class='add'>+         transform="matrix(0.9969564,-0.07796167,0.07796167,0.9969564,436.61877,125.29509)"</div><div class='add'>+         id="path8027"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4868);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4002);enable-background:accumulate"</div><div class='add'>+         cx="429.56738"</div><div class='add'>+         cy="377.42877"</div><div class='add'>+         rx="72.079735"</div><div class='add'>+         ry="44.547726" /&gt;</div><div class='add'>+      &lt;ellipse</div><div class='add'>+         inkscape:transform-center-y="-13.056625"</div><div class='add'>+         inkscape:transform-center-x="-20.955902"</div><div class='add'>+         transform="matrix(1.4357951,-0.06999104,0.06999104,1.4357951,235.18065,-63.86546)"</div><div class='add'>+         id="path8029"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4876);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4010);enable-background:accumulate"</div><div class='add'>+         cx="437.6991"</div><div class='add'>+         cy="391.21735"</div><div class='add'>+         rx="36.611931"</div><div class='add'>+         ry="22.627417" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         style="display:inline;opacity:1;filter:url(#filter4053);enable-background:new"</div><div class='add'>+         id="g8031"</div><div class='add'>+         transform="translate(450.03125,73.843964)"&gt;</div><div class='add'>+        &lt;circle</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4484);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="path8033"</div><div class='add'>+           cx="413.66071"</div><div class='add'>+           cy="401.82648"</div><div class='add'>+           r="3.2142856" /&gt;</div><div class='add'>+        &lt;circle</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4486);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="path8035"</div><div class='add'>+           transform="translate(13.125009,8.1249913)"</div><div class='add'>+           cx="413.66071"</div><div class='add'>+           cy="401.82648"</div><div class='add'>+           r="3.2142856" /&gt;</div><div class='add'>+        &lt;circle</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4488);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="path8037"</div><div class='add'>+           transform="translate(32.946437,7.4999913)"</div><div class='add'>+           cx="413.66071"</div><div class='add'>+           cy="401.82648"</div><div class='add'>+           r="3.2142856" /&gt;</div><div class='add'>+        &lt;circle</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4490);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="path8039"</div><div class='add'>+           transform="translate(24.910723,-10.267866)"</div><div class='add'>+           cx="413.66071"</div><div class='add'>+           cy="401.82648"</div><div class='add'>+           r="3.2142856" /&gt;</div><div class='add'>+        &lt;circle</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4492);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="path8041"</div><div class='add'>+           transform="translate(47.589294,-0.6250087)"</div><div class='add'>+           cx="413.66071"</div><div class='add'>+           cy="401.82648"</div><div class='add'>+           r="3.2142856" /&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="ccccccccc"</div><div class='add'>+         id="path8043"</div><div class='add'>+         d="m 896.20301,482.92837 c 0.98509,4.35008 4.53707,6.17948 7.38673,7.89182 4.46068,2.51292 6.52016,1.52211 9.15451,-0.75761 1.60195,-1.92117 10.68311,-4.69865 15.59423,-7.07107 4.32961,-1.45891 8.9033,-5.35873 13.38452,-8.33376 3.39514,-1.62724 5.34664,0.35464 7.82868,1.01015 2.94412,0.71661 4.41117,2.17175 6.06092,3.53554 2.39616,1.17519 -0.9279,3.14313 3.283,4.29314 1.19091,0.21794 2.41695,0.57645 3.28299,-0.50507"</div><div class='add'>+         style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="cccccccccccc"</div><div class='add'>+         id="path8045"</div><div class='add'>+         d="m 910.85021,475.35223 c 2.31494,-0.032 3.17778,0.64253 5.49271,-0.82075 3.45564,-3.08113 5.40254,-3.14477 7.95495,-4.41942 3.02657,-1.31523 6.5357,8.15169 10.10153,9.84899 2.39509,-0.82142 1.28914,1.79379 1.45209,2.65165 0.0571,2.64684 2.80694,3.67806 4.35628,5.42957 3.31604,2.25549 7.37523,6.29546 11.11168,5.3033 6.44525,-2.93107 10.27922,-1.28146 16.28871,-7.38674 0.70405,-1.18134 -0.58425,-6.8946 3.09359,-7.19734 2.52399,0.25338 4.16667,0.0502 6.06092,0.56822 5.441,2.11719 7.73778,6.45 14.71034,7.95495 6.1829,0.96639 7.61264,3.79426 13.88959,5.05076"</div><div class='add'>+         style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="ccccccccccccc"</div><div class='add'>+         id="path8047"</div><div class='add'>+         d="m 876.98133,483.52197 c 2.39858,-0.7938 6.10613,4.1921 8.17313,7.04568 0.59281,2.67952 1.15377,5.48645 0.75761,12.12183 0.78513,2.41754 2.68049,3.03095 4.79823,3.283 3.11745,-0.53678 5.87669,-1.3243 7.3236,-3.03046 1.8716,-1.94167 5.31253,2.39394 8.08122,4.04061 3.61009,1.91209 7.77378,1.97886 11.8693,2.27284 1.70358,-0.23064 2.3704,4.51515 3.28299,8.08123 0.38414,4.37806 -0.88544,6.89569 -1.76776,9.84898 -0.2943,2.49655 2.9885,3.52974 6.31345,4.54569 3.18244,0.74124 6.54424,1.66184 9.09137,1.76777 5.14186,0.87491 8.08874,2.69052 12.12183,4.04061 2.23914,0.81655 3.26019,2.24216 4.54569,3.53553"</div><div class='add'>+         style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath8514)"</div><div class='add'>+         id="path8049"</div><div class='add'>+         d="m 332,187.69519 c 0,0 57.5,-25.5 57.5,-28 0,-2.5 5.5,-52 5.5,-52 0,0 91,-48.500001 91.5,-50.500001 0.5,-2 86,-62.0000004 86,-62.0000004 L 386.5,17.195189 311,123.19519 l 21,64.5 z"</div><div class='add'>+         style="display:inline;opacity:0.25;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8814);enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path8051"</div><div class='add'>+         d="m 1697.2846,722.5514 c 0,0 -115.9655,73.5391 -123.0365,77.78174 -7.0711,4.24264 -230.5169,137.17872 -230.5169,137.17872 l 4.2427,39.59798 216.3747,-100.40917 117.3797,-101.82337 15.5563,-52.3259 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         sodipodi:nodetypes="cccccscccc"</div><div class='add'>+         clip-path="url(#clipPath8610)"</div><div class='add'>+         id="path8053"</div><div class='add'>+         d="m 528.91587,556.85291 c -5.65685,-1.41421 -181.01933,74.95332 -181.01933,74.95332 l -33.94113,181.01934 51.09546,193.94823 257.2031,67.6813 c 0,0 206.47518,152.735 212.13203,148.4924 5.65686,-4.2426 168.2914,-193.7473 168.2914,-193.7473 L 842.87128,845.35248 796.20224,667.16157 528.91587,556.85291 Z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8810);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzczczczczzzc"</div><div class='add'>+         id="path8055"</div><div class='add'>+         d="m 1097.6433,613.88997 c 0,0 22.6195,-6.50681 35.7427,-5.87273 13.1233,0.63409 30.6416,1.93862 43.7089,12.18619 13.0673,10.24756 25.0677,27.14007 34.1124,58.36965 9.0446,31.22958 1.6983,99.25201 -6.1761,143.34735 -7.8743,44.09534 -28.2651,106.11298 -45,140 -16.7348,33.88702 -49.7977,77.49517 -60.5694,89.87617 -11.3642,13.062 -56.2059,36.4262 -79.4306,42.2667 5.3034,-10.6066 48.8998,-50.5889 35,-60.7143 -14.0189,-10.2123 -45.76,45.9824 -84.2931,29.0332 21.38231,-13.1321 41.7794,-51.1861 34.0406,-66.59448 -7.84024,-15.61039 -30.70492,48.75758 -93.53553,37.01288 30.05204,-27.5267 55.40706,-70.90401 41.2627,-82.9797 -14.41516,-12.30687 -60.46175,54.2932 -60.46175,54.2932 0,0 -2.8219,-41.70123 13.7732,-68.60737 16.63935,-26.97787 79.65297,-81.61527 99.55308,-111.70342 19.9002,-30.08814 33.6126,-66.00902 42.1355,-92.51794 8.5228,-26.50892 15.8009,-77.09954 15.8009,-77.09954"</div><div class='add'>+         style="display:inline;opacity:1;fill:#0c0c0c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         sodipodi:nodetypes="cccccccccc"</div><div class='add'>+         clip-path="url(#clipPath8622)"</div><div class='add'>+         id="path8057"</div><div class='add'>+         d="m 770.74639,609.17881 -50.91169,97.58074 -79.90307,111.01576 34.64824,71.41778 42.42641,79.19597 72.12489,-45.25484 14.14214,-192.33305 21.2132,-138.59292 -14.14214,-90.15612 -39.59798,107.12668 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8818);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         sodipodi:nodetypes="cczcccccc"</div><div class='add'>+         clip-path="url(#clipPath8906)"</div><div class='add'>+         id="path8059"</div><div class='add'>+         d="m 295,846.19519 6.64488,-68.92285 c 0,0 90.31951,89.00457 162.35512,122.92285 72.03561,33.91828 308,62 308,62 l 154,-26 -36,162.00001 -286,26 -298,-89 -11,-189.00001 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8810);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         clip-path="url(#clipPath3602)"</div><div class='add'>+         sodipodi:nodetypes="cccccccccccc"</div><div class='add'>+         id="path8061"</div><div class='add'>+         d="m 405.79629,845.99023 74.95332,65.05383 2.49963,16.8804 19.40336,10.15891 6.49204,23.05109 31.70905,-8.3711 14.84924,48.08324 c 12.25652,12.7279 89.79344,-113.1097 55.86143,38.1838 l -60.81118,16.2635 -89.20292,-94.69286 -62.82503,-53.79963 7.07106,-60.81118 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3587);enable-background:new"</div><div class='add'>+         transform="translate(450.03125,73.843964)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzzzcc"</div><div class='add'>+         id="path8063"</div><div class='add'>+         d="m 1159.317,918.349 c 54.2857,-1.42857 126.035,-15.05199 170,-26.78572 44.0527,-11.75714 125.8863,-36.34724 175.357,-57.85714 49.3393,-21.45272 113.6038,-59.2816 154.2859,-92.14285 40.5081,-32.72069 52.3899,-55.81981 60.7142,-33.57143 8.3691,22.36779 -16.4069,56.32562 -37.8571,81.07143 -21.6042,24.9234 -52.7314,52.70533 -98.9287,89.28571 -46.1973,36.58038 -156.0825,101.58463 -212.8571,128.5714 -57.066,27.1254 -128.2033,58.2385 -172.1428,72.5001 -43.9395,14.2616 -131.4286,31.0714 -131.4286,31.0714 L 1159.317,918.349 Z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#121212;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         clip-path="url(#clipPath3992)"</div><div class='add'>+         sodipodi:nodetypes="czczzcc"</div><div class='add'>+         id="path8065"</div><div class='add'>+         d="m 1241.5965,652.95007 c 0,0 -64.7215,54.33706 -145.6639,98.99494 -82.0244,45.25484 -284.25704,93.3381 -284.25704,93.3381 0,0 -15.10137,21.05196 45.25489,28.28428 60.35626,7.23232 224.08195,-53.30069 278.60015,-96.16654 54.5182,-42.86585 120.2081,-111.72286 120.2081,-111.72286 l -14.1422,-12.72792 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:url(#linearGradient3666);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter3779);enable-background:accumulate"</div><div class='add'>+         transform="translate(450.03125,73.843964)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         clip-path="url(#clipPath3986)"</div><div class='add'>+         id="g8067"</div><div class='add'>+         style="display:inline;opacity:1;enable-background:new"</div><div class='add'>+         transform="translate(450.03125,73.843964)"&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           id="g8069"</div><div class='add'>+           style="filter:url(#filter3677)"</div><div class='add'>+           transform="translate(-174.03125,62.156036)"&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             id="g8071"</div><div class='add'>+             style="filter:url(#filter3785)"&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               transform="translate(174.03125,-62.156036)"</div><div class='add'>+               style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 1094.2857,725.93361 c 0,0 -0.2961,26.16091 4.6428,37.85715 4.9389,11.69624 20.0381,26.48665 28.5715,31.42857 8.5334,4.94192 18.9286,8.57142 18.9286,8.57142 l 117.8571,-115 17.8572,-75.71428 -96.4286,38.57143 -91.4286,74.28571 z"</div><div class='add'>+               id="path8073"</div><div class='add'>+               sodipodi:nodetypes="czzccccc"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;rect</div><div class='add'>+               style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+               id="rect8075"</div><div class='add'>+               width="333.75412"</div><div class='add'>+               height="309.71277"</div><div class='add'>+               x="1197.8389"</div><div class='add'>+               y="486.14224" /&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           id="g8077"</div><div class='add'>+           style="display:inline;opacity:0.18000004;enable-background:new"</div><div class='add'>+           transform="translate(-174.03125,62.156036)"&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             id="g8079"</div><div class='add'>+             style="filter:url(#filter3785)"&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               transform="translate(174.03125,-62.156036)"</div><div class='add'>+               style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 1094.2857,725.93361 c 0,0 -0.2961,26.16091 4.6428,37.85715 4.9389,11.69624 20.0381,26.48665 28.5715,31.42857 8.5334,4.94192 18.9286,8.57142 18.9286,8.57142 l 117.8571,-115 17.8572,-75.71428 -96.4286,38.57143 -91.4286,74.28571 z"</div><div class='add'>+               id="path8081"</div><div class='add'>+               sodipodi:nodetypes="czzccccc"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;rect</div><div class='add'>+               style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+               id="rect8083"</div><div class='add'>+               width="333.75412"</div><div class='add'>+               height="309.71277"</div><div class='add'>+               x="1197.8389"</div><div class='add'>+               y="486.14224" /&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="cssssccccccssssssssccssssssccssssc"</div><div class='add'>+         clip-path="url(#clipPath3722)"</div><div class='add'>+         id="path8085"</div><div class='add'>+         d="m 1264.1875,605 c -4.4911,0.73268 -8.157,3.45509 -11.9375,6.40625 -10.0813,7.86976 -28.1695,34.42524 -48.0312,50.46875 -39.8674,32.20316 -103.996,69.97701 -152.5626,91.09375 -48.614,21.13738 -130.54122,45.81801 -174.31245,57.5 -43.39821,11.58246 -115.04403,25.13107 -168.25,26.53125 l -4.5625,0.125 -2,4.125 -92.84375,192.125 -6.5,13.4688 14.65625,-2.8438 c 0,0 87.26968,-16.6514 132.34375,-31.2812 44.7252,-14.51667 115.79086,-45.66683 173.03125,-72.87505 C 980.82199,912.46306 1090.1551,847.86412 1137.5,810.375 c 46.3608,-36.70982 77.8049,-64.71682 99.9375,-90.25 10.9011,-12.576 22.7448,-27.53144 31.0313,-42.75 8.2864,-15.21856 19.1597,-44.21808 13.6874,-58.84375 -1.2177,-3.25474 -2.5514,-6.0613 -4.5937,-8.5 -2.0423,-2.4387 -8.4747,-1.57199 -8.5625,-5.03125 -0.2098,-8.26482 -3.3155,-0.24423 -4.8125,0 z m 2.1563,15.21875 c 0.4148,0.58574 1.0311,1.55766 1.7812,3.5625 2.8968,7.74213 -1.4407,31.89875 -8.8125,45.4375 -7.3718,13.53875 -22.6384,28.92394 -33.1875,41.09375 -21.0754,24.31356 -51.9037,51.86156 -97.9375,88.3125 -45.0496,35.67159 -155.46033,101.09459 -211.40625,127.6875 -56.89173,27.04249 -128.09616,58.1184 -171.25,72.125 -36.36491,11.8031 -95.84471,23.8338 -115.71875,27.7813 L 714.09375,851.75 c 54.70691,-2.0493 123.79259,-15.21635 167.125,-26.78125 44.33422,-11.83225 126.07865,-36.33633 176.40625,-58.21875 50.112,-21.78871 112.5344,-61.16816 154.0312,-94.6875 20.6464,-16.67721 41.7449,-42.54588 49.8126,-48.84375 2.437,-1.90242 4.0806,-2.6358 4.875,-3 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.83300003;fill:#050505;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter8225);enable-background:accumulate"</div><div class='add'>+         transform="translate(450.03125,73.843964)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         inkscape:transform-center-y="-12.859654"</div><div class='add'>+         inkscape:transform-center-x="-185.09603"</div><div class='add'>+         transform="matrix(0.9934486,0.1142802,-0.1142802,0.9934486,-9.24324,588.09054)"</div><div class='add'>+         mask="url(#mask7704)"</div><div class='add'>+         id="g8087"</div><div class='add'>+         style="display:inline;opacity:1;enable-background:new"&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           sodipodi:nodetypes="ccssscsssscssssscsssscssssscsssscssssscsssscssssscsssscssssscsssscssscccccssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsssssssssssc"</div><div class='add'>+           id="path8089"</div><div class='add'>+           d="m 1111.4062,-285.9375 -3.9374,1.875 c -0.041,0.0102 -0.1,0.0205 -0.125,0.0312 -0.4188,0.21285 -0.1647,0.10058 -0.6563,0.3125 -0.4861,0.20956 -1.7376,0.58419 -4.0937,1.46875 -3.3312,1.25058 -5.8043,2.14984 -7,3.0625 -1.5362,0.0213 -3.7205,0.23331 -5.6563,0.71875 -2.9815,0.74767 -4.8552,1.17401 -6.75,1.59375 -1.8948,0.41973 -1.6755,0.64219 -2.875,0.875 -1.2966,0.25167 -1.7214,-0.009 -5.4375,0.78125 -3.4899,0.74215 -8.8948,1.93107 -10.1562,2.6875 -1.584,-0.18078 -3.8675,-0.32178 -5.8438,-0.0312 -3.0404,0.44696 -4.9162,0.67276 -6.8438,0.90625 -0.6554,0.0794 -1.041,0.20078 -1.3437,0.28125 -0.4262,0.13166 -0.6858,0.26002 -1.375,0.34375 -1.3116,0.15937 -1.7622,-0.15683 -5.5313,0.28125 -3.5539,0.41309 -9.0054,1.27282 -10.25,1.9375 -1.599,-0.29729 -3.8577,-0.53419 -5.8437,-0.34375 -3.0588,0.29332 -4.972,0.48399 -6.9063,0.65625 -1.9342,0.17227 -1.6886,0.42237 -2.9062,0.53125 -1.3162,0.1177 -1.7598,-0.16363 -5.5312,0.25 -3.5421,0.38845 -9.0079,1.20927 -10.2813,1.875 -1.5989,-0.29469 -3.8872,-0.50701 -5.875,-0.3125 -3.05829,0.29925 -4.9412,0.48024 -6.875,0.65625 -0.65749,0.0598 -1.04005,0.17856 -1.34375,0.25 -0.4277,0.11896 -0.6835,0.21807 -1.375,0.28125 -1.316,0.12026 -1.75975,-0.19488 -5.53125,0.21875 -3.55619,0.39002 -9.0056,1.23916 -10.25,1.90625 -1.59869,-0.29418 -3.85985,-0.52372 -5.84375,-0.3125 -3.0557,0.32533 -4.97405,0.52624 -6.90625,0.71875 -1.93219,0.19251 -1.68975,0.44088 -2.90625,0.5625 -1.31488,0.13147 -1.76305,-0.16454 -5.53125,0.28125 -3.53889,0.41866 -8.9777,1.29217 -10.25,1.96875 -1.59759,-0.28104 -3.85995,-0.42043 -5.84375,-0.1875 -3.05198,0.35837 -4.945,0.56786 -6.875,0.78125 -0.65618,0.0726 -1.04065,0.17269 -1.34375,0.25 -0.42679,0.12723 -0.6849,0.2672 -1.375,0.34375 -1.31339,0.14569 -1.76735,-0.17402 -5.53125,0.3125 -3.54888,0.45876 -8.97865,1.41902 -10.21875,2.125 -1.59309,-0.24424 -3.8338,-0.38135 -5.8125,-0.125 -3.04759,0.39482 -4.9507,0.64845 -6.875,0.90625 -1.92429,0.25779 -1.7261,0.49353 -2.9375,0.65625 -1.30949,0.1759 -1.7472,-0.10438 -5.5,0.46875 -3.52429,0.53824 -8.9232,1.69917 -10.1875,2.4375 -1.58749,-0.20354 -3.8455,-0.25473 -5.8125,0.0937 -3.02619,0.53612 -4.8989,0.86169 -6.8125,1.1875 -0.65059,0.11077 -1.0137,0.27094 -1.3125,0.375 -0.42069,0.16488 -0.66345,0.3313 -1.34375,0.46875 -1.2947,0.26159 -1.7271,-0.006 -5.4375,0.8125 -3.49848,0.77195 -8.8459,2.38293 -10.0625,3.21875 -1.5629,-0.0774 -3.7575,0.0853 -5.6875,0.59375 -2.97238,0.78313 -4.8177,1.23209 -6.6875,1.75 -1.87,0.5179 -1.66665,0.76728 -2.84375,1.09375 -1.27249,0.3529 -1.69705,0.10709 -5.34375,1.1875 -3.42468,1.01463 -8.6494,2.93317 -9.875,3.84375 -1.53878,0.0127 -3.7198,0.27222 -5.625,0.875 -2.93098,0.92734 -4.75035,1.45842 -6.59375,2.0625 -0.62679,0.20538 -0.99165,0.39258 -1.28125,0.53125 -0.40758,0.21361 -0.6533,0.40875 -1.3125,0.625 -1.2545,0.41154 -1.68615,0.18904 -5.28125,1.4375 -3.38989,1.17717 -8.59495,3.2137 -9.78125,4.15625 -1.52388,0.0597 -3.65005,0.39487 -5.53125,1.0625 -2.89739,1.02829 -4.69905,1.67548 -6.53125,2.3125 -1.8322,0.63701 -1.62785,0.84854 -2.78125,1.25 -1.24679,0.43396 -1.66355,0.19972 -5.21875,1.5625 -3.3387,1.2798 -8.4871,3.48255 -9.6875,4.46875 -1.50718,0.10769 -3.6357,0.4988 -5.5,1.21875 -2.86818,1.1076 -4.6239,1.78156 -6.4375,2.46875 -0.6167,0.23363 -0.99645,0.44203 -1.28125,0.59375 10e-6,0 0,0.0295 0,0.0312 l -8,3.1875 -12.4759,3.49189 7.92966,19.27772 c -0.59163,1.97357 12.54624,-4.73836 12.54624,-4.73836 0.22641,-0.14468 0.44895,-0.27261 0.71875,-0.375 1.08052,-0.40998 2.1716,-0.21577 6,-1.6875 3.82852,-1.47174 5.22405,-2.00498 5.90625,-2.40625 0.67961,-0.39978 1.61175,-0.87937 2.21875,-1.53125 1.82692,-0.13775 3.5708,-0.49323 4.9375,-1 2.968,-1.10052 4.87535,-1.80619 6.78125,-2.46875 1.90581,-0.66254 2.35415,-1.41487 3.40625,-1.78125 1.09162,-0.38011 2.1951,-0.16538 6.0625,-1.53125 3.8674,-1.36586 5.28315,-1.82708 5.96875,-2.21875 0.70111,-0.40052 1.7008,-0.93298 2.3125,-1.59375 1.97081,-0.0547 3.81695,-0.38463 5.28125,-0.875 3.00152,-1.00508 4.92615,-1.62171 6.84375,-2.25 1.53861,-0.5041 2.17415,-1.04677 2.90625,-1.4375 0.23022,-0.13431 0.4759,-0.25373 0.75,-0.34375 1.09832,-0.36048 2.18145,-0.0814 6.09375,-1.3125 3.91231,-1.23113 5.366,-1.67295 6.0625,-2.03125 0.69391,-0.35697 1.6301,-0.79261 2.25,-1.40625 1.86521,-0.0227 3.63585,-0.26683 5.03125,-0.6875 3.0304,-0.91354 4.9924,-1.4301 6.9375,-1.96875 1.94512,-0.53864 2.4262,-1.26452 3.5,-1.5625 1.11402,-0.30915 2.22,0.007 6.1875,-1.03125 3.9675,-1.03863 5.4175,-1.43273 6.125,-1.75 0.7348,-0.32959 1.8139,-0.75372 2.4375,-1.375 1.99782,0.116 3.85745,-0.0201 5.34375,-0.375 3.07811,-0.735 5.0834,-1.10094 7.0625,-1.5 1.58791,-0.32018 2.2443,-0.79055 3,-1.09375 0.23751,-0.1068 0.4669,-0.19276 0.75,-0.25 1.13341,-0.22919 2.30465,0.20893 6.34375,-0.5 4.03942,-0.70893 5.50025,-0.92709 6.21875,-1.1875 0.71581,-0.25944 1.70435,-0.56724 2.34375,-1.09375 1.9242,0.23949 3.7479,0.22453 5.1875,0 3.12642,-0.48762 5.15455,-0.70067 7.15625,-0.96875 2.00171,-0.26807 2.48875,-0.94514 3.59375,-1.09375 1.14642,-0.15418 2.27585,0.30157 6.34375,-0.21875 4.06781,-0.52032 5.56025,-0.69573 6.28125,-0.9375 0.73712,-0.24714 1.7981,-0.58623 2.4375,-1.125 2.05,0.33553 3.9737,0.39796 5.5,0.21875 3.1422,-0.36896 5.18,-0.55936 7.1875,-0.78125 1.61082,-0.17802 2.26465,-0.6082 3.03125,-0.84375 0.24091,-0.0855 0.49405,-0.1556 0.78125,-0.1875 1.1497,-0.12772 2.3013,0.34665 6.375,-0.125 4.0737,-0.47165 5.55905,-0.6106 6.28125,-0.84375 0.71941,-0.23227 1.70025,-0.47346 2.34375,-0.96875 1.9363,0.33346 3.77005,0.40424 5.21875,0.25 3.14601,-0.33495 5.1775,-0.51859 7.1875,-0.71875 2.00991,-0.20014 2.48415,-0.82639 3.59375,-0.9375 1.1511,-0.11528 2.2965,0.36506 6.375,-0.0625 4.0785,-0.42756 5.5889,-0.56209 6.3125,-0.78125 0.73922,-0.22386 1.7956,-0.51325 2.4375,-1.03125 2.057,0.39867 4.00185,0.4934 5.53125,0.34375 3.14871,-0.3081 5.1758,-0.47325 7.1875,-0.65625 1.61401,-0.14682 2.26305,-0.56055 3.03125,-0.78125 0.2413,-0.0809 0.49355,-0.12991 0.78125,-0.15625 1.15211,-0.10545 2.2929,0.39275 6.375,0 4.08211,-0.39275 5.5889,-0.53084 6.3125,-0.75 0.7209,-0.21833 1.6996,-0.4477 2.3437,-0.9375 1.9381,0.34999 3.7689,0.45438 5.2188,0.3125 3.1487,-0.3081 5.1758,-0.47325 7.1875,-0.65625 2.0116,-0.18299 2.5142,-0.83802 3.625,-0.9375 1.1523,-0.10323 2.2922,0.38483 6.375,0 4.0829,-0.38482 5.5887,-0.501 6.3125,-0.71875 0.7393,-0.22243 1.7956,-0.51449 2.4375,-1.03125 2.0574,0.40177 4.0029,0.50333 5.5313,0.34375 3.1465,-0.32852 5.177,-0.5227 7.1874,-0.71875 1.613,-0.15729 2.2657,-0.63148 3.0313,-0.875 0.2407,-0.088 0.4632,-0.12137 0.75,-0.15625 1.1483,-0.1397 2.3167,0.33991 6.375,-0.25 4.0583,-0.58992 5.5618,-0.77714 6.2813,-1.03125 0.7166,-0.25316 1.6746,-0.55807 2.3124,-1.09375 1.9197,0.21194 3.72,0.15141 5.1563,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0937,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5626,-1.28125 1.1287,-0.25066 2.2702,0.11629 6.25,-0.875 3.9795,-0.99127 5.4295,-1.4193 6.125,-1.78125 0.7222,-0.376 1.7617,-0.87058 2.375,-1.53125 1.9629,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.1446 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70652 2.3191,-1.70203 2.5312,-2 0.2123,-0.29795 0.099,-0.72855 0.125,-0.75 0.043,-0.0352 0.3404,-0.094 0.5,-0.4375 0.859,-1.84707 2.3232,-5.62764 2.4376,-6.3125 0.1137,-0.68214 0.168,-1.35277 0.2187,-1.75 0.029,-0.2295 -0.1471,-0.8789 -0.125,-0.9375 0.031,-0.082 0.2883,-0.25057 0.3437,-0.5 0.2663,-1.19831 0.089,-2.20736 -0.125,-3.625 -0.2139,-1.41763 -0.9716,-4.61463 -1.625,-5.46875 -0.6589,-0.86172 -1.2248,-1.01051 -1.75,-1 z"</div><div class='add'>+           style="display:inline;fill:#bcb786;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           transform="translate(0.08004571,-0.03125)"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           id="g8091"</div><div class='add'>+           clip-path="url(#clipPath7421)"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             sodipodi:nodetypes="czscsssscssssscsssscssssscsssscssssscsssscssssscsssscssssscsssscssccsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscc"</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7001);enable-background:new"</div><div class='add'>+             d="m 1107.409,-284.04961 c -0.4187,0.21283 -0.1556,0.0939 -0.6472,0.30581 -0.4861,0.20954 -1.7234,0.57439 -4.0796,1.45895 -3.3311,1.25057 -5.8302,2.15344 -7.0259,3.0661 -1.5361,0.0213 -3.7205,0.23331 -5.6563,0.71875 -2.9815,0.74766 -4.8552,1.17401 -6.75,1.59375 -1.8948,0.41972 -1.6755,0.64219 -2.875,0.875 -1.2966,0.25166 -1.7214,-0.009 -5.4375,0.78125 -3.4899,0.74214 -8.8948,1.93107 -10.1562,2.6875 -1.5839,-0.18079 -3.8675,-0.32178 -5.8438,-0.0312 -3.0404,0.44695 -4.9162,0.67276 -6.8437,0.90625 -0.6554,0.0794 -1.0411,0.20078 -1.3438,0.28125 -0.4262,0.13165 -0.6858,0.26002 -1.375,0.34375 -1.3116,0.15936 -1.7622,-0.15683 -5.5312,0.28125 -3.5539,0.41308 -9.0054,1.27282 -10.25,1.9375 -1.599,-0.2973 -3.8578,-0.53419 -5.8438,-0.34375 -3.0588,0.29331 -4.972,0.48399 -6.9062,0.65625 -1.9343,0.17226 -1.6887,0.42237 -2.9063,0.53125 -1.3162,0.11769 -1.7598,-0.16363 -5.5312,0.25 -3.5419,0.38844 -9.0079,1.20927 -10.2813,1.875 -1.5989,-0.2947 -3.88717,-0.50701 -5.875,-0.3125 -3.05824,0.29924 -4.94113,0.48024 -6.875,0.65625 -0.65749,0.0598 -1.04004,0.17856 -1.34375,0.25 -0.42765,0.11895 -0.68351,0.21807 -1.375,0.28125 -1.31596,0.12025 -1.75976,-0.19488 -5.53125,0.21875 -3.55614,0.39001 -9.00554,1.23916 -10.25,1.90625 -1.59863,-0.29419 -3.85984,-0.52372 -5.84375,-0.3125 -3.0556,0.32532 -4.97404,0.52624 -6.90625,0.71875 -1.93221,0.1925 -1.68987,0.44088 -2.90625,0.5625 -1.31488,0.13146 -1.76298,-0.16454 -5.53125,0.28125 -3.53887,0.41865 -8.97768,1.29217 -10.25,1.96875 -1.59755,-0.28105 -3.85996,-0.42043 -5.84375,-0.1875 -3.05198,0.35836 -4.94508,0.56786 -6.875,0.78125 -0.6562,0.0725 -1.04066,0.17269 -1.34375,0.25 -0.42677,0.12722 -0.68491,0.2672 -1.375,0.34375 -1.31333,0.14568 -1.76746,-0.17402 -5.53125,0.3125 -3.54889,0.45875 -8.97863,1.41902 -10.21875,2.125 -1.59305,-0.24424 -3.83381,-0.38135 -5.8125,-0.125 -3.04759,0.39481 -4.95071,0.64845 -6.875,0.90625 -1.92428,0.25779 -1.72611,0.49353 -2.9375,0.65625 -1.30946,0.1759 -1.74719,-0.10438 -5.5,0.46875 -3.52429,0.53824 -8.92315,1.69917 -10.1875,2.4375 -1.5875,-0.20354 -3.8455,-0.25473 -5.8125,0.0937 -3.02617,0.53612 -4.89889,0.86169 -6.8125,1.1875 -0.65061,0.11077 -1.01371,0.27094 -1.3125,0.375 -0.42067,0.16488 -0.66345,0.3313 -1.34375,0.46875 -1.29465,0.26159 -1.72712,-0.006 -5.4375,0.8125 -3.49853,0.77195 -8.84595,2.38293 -10.0625,3.21875 -1.56278,-0.0774 -3.75758,0.0853 -5.6875,0.59375 -2.97244,0.78313 -4.81761,1.23209 -6.6875,1.75 -1.86988,0.5179 -1.6666,0.76728 -2.84375,1.09375 -1.27246,0.3529 -1.69703,0.10709 -5.34375,1.1875 -3.4247,1.01463 -8.64944,2.93317 -9.875,3.84375 -1.53883,0.0127 -3.71983,0.27222 -5.625,0.875 -2.93106,0.92734 -4.75031,1.45842 -6.59375,2.0625 -0.62676,0.20538 -0.99173,0.39258 -1.28125,0.53125 -0.40763,0.21361 -0.65334,0.40875 -1.3125,0.625 -1.25446,0.41154 -1.68611,0.18904 -5.28125,1.4375 -3.38985,1.17717 -8.59498,3.2137 -9.78125,4.15625 -1.52389,0.0597 -3.65005,0.39487 -5.53125,1.0625 -2.89739,1.02829 -4.69908,1.67548 -6.53125,2.3125 -1.83217,0.63701 -1.62785,0.84854 -2.78125,1.25 -1.24678,0.43396 -1.66361,0.19972 -5.21875,1.5625 -3.33867,1.2798 -8.48715,3.48255 -9.6875,4.46875 -1.50718,0.10769 -3.63569,0.4988 -5.5,1.21875 -2.86818,1.1076 -4.6238,1.78156 -6.4375,2.46875 -0.61666,0.23363 -0.99641,0.44203 -1.28125,0.59375 0,0 0,1.09375 0,1.09375 0.11178,-0.22236 0.38599,-0.81743 0.90625,-1.09375 0.69797,-0.37072 4.81363,-1.99337 6.8125,-2.71875 1.65686,-0.60125 4.15389,-1.32868 5.96875,-1.3125 0.30162,0.003 0.58762,0.0509 0.84375,0.0937 1.84249,0.30825 7.46875,1.5625 7.46875,1.5625 -10e-6,0 -6.23349,-1.64675 -7.03125,-1.84375 -0.19079,-0.0471 -0.53572,-0.0687 -0.96875,-0.0625 1.14546,-0.86971 4.761,-2.39351 7.34375,-3.4375 2.83822,-1.14727 3.11681,-1.25182 5.0625,-1.65625 2.0083,-0.41744 3.15625,-0.5 3.15625,-0.5 0,10e-6 -0.0824,-0.60114 0.96875,-1.125 0.7051,-0.35141 4.88702,-1.8924 6.90625,-2.5625 1.9519,-0.64773 5.0574,-1.3585 6.875,-1 1.86323,0.3675 7.53125,1.8125 7.53125,1.8125 10e-6,0 -6.287,-1.87111 -7.09375,-2.09375 -0.19292,-0.0532 -0.53084,-0.086 -0.96875,-0.0937 1.15834,-0.83288 4.79444,-2.19532 7.40625,-3.15625 2.87016,-1.05601 3.16734,-1.1618 5.125,-1.53125 1.85349,-0.34979 2.85884,-0.42548 3.03125,-0.4375 0.1136,-0.21724 0.37745,-0.81002 0.90625,-1.0625 0.70944,-0.33874 4.92607,-1.71275 6.96875,-2.3125 1.69317,-0.49711 4.24077,-1.03677 6.09375,-0.90625 0.30795,0.0217 0.61349,0.0973 0.875,0.15625 1.88118,0.42432 7.59375,2.03125 7.59375,2.03125 10e-6,0 -6.34174,-2.06525 -7.15625,-2.3125 -0.19479,-0.0591 -0.55788,-0.10394 -1,-0.125 1.16949,-0.79755 4.86302,-2.05622 7.5,-2.9375 2.89781,-0.96847 3.23301,-1.00332 5.21875,-1.28125 2.04965,-0.28689 3.1875,-0.3125 3.1875,-0.3125 -2e-5,0 -0.0728,-0.60697 1,-1.0625 0.7196,-0.30557 4.99098,-1.50075 7.0625,-2 2.00244,-0.48258 5.19849,-0.92829 7.0625,-0.40625 1.91078,0.53515 7.71875,2.5 7.71875,2.5 0,0 -6.42266,-2.42351 -7.25,-2.71875 -0.19784,-0.0706 -0.58216,-0.14039 -1.03125,-0.1875 1.1879,-0.72865 4.91527,-1.77408 7.59375,-2.5 2.94342,-0.79775 3.29208,-0.77083 5.3125,-0.90625 1.91289,-0.12823 2.94705,-0.0711 3.125,-0.0625 0.11728,-0.20366 0.39176,-0.77948 0.9375,-0.96875 0.73219,-0.25394 5.07852,-1.04789 7.1875,-1.375 1.74813,-0.27111 4.40088,-0.4847 6.3125,-0.0937 0.31766,0.065 0.60522,0.18551 0.875,0.28125 1.94074,0.68873 7.84375,3.09375 7.84375,3.09375 10e-6,0 -6.53471,-2.95077 -7.375,-3.3125 -0.20097,-0.0865 -0.57513,-0.16679 -1.03125,-0.25 1.2065,-0.63318 5.02956,-1.3956 7.75,-1.90625 2.98953,-0.56119 3.30023,-0.52954 5.34375,-0.53125 2.10926,-0.002 3.3125,0.125 3.3125,0.125 0,1e-5 -0.0727,-0.63119 1.03125,-0.9375 0.74052,-0.20547 5.12612,-0.83387 7.25,-1.0625 2.05302,-0.22099 5.31863,-0.25222 7.21875,0.46875 1.94779,0.73907 7.84375,3.375 7.84375,3.375 2e-5,0 -6.56288,-3.17897 -7.40625,-3.5625 -0.20168,-0.0917 -0.54221,-0.18621 -1,-0.28125 1.21092,-0.60188 4.98442,-1.24884 7.71875,-1.65625 3.0048,-0.44772 3.32551,-0.4517 5.375,-0.40625 1.94045,0.043 3.00699,0.19423 3.1875,0.21875 0.11892,-0.19316 0.3839,-0.76583 0.9375,-0.90625 0.74271,-0.18838 5.15429,-0.73428 7.28125,-0.9375 1.76303,-0.16842 4.42009,-0.23429 6.34375,0.25 0.31968,0.0805 0.60351,0.20359 0.875,0.3125 1.95293,0.78349 7.90625,3.46875 7.90625,3.46875 -2e-5,0 -6.59191,-3.25348 -7.4375,-3.65625 -0.20222,-0.0963 -0.57226,-0.20703 -1.03125,-0.3125 1.21414,-0.57427 5.04366,-1.12219 7.78125,-1.5 3.00838,-0.4152 3.32307,-0.44263 5.375,-0.375 2.11798,0.0698 3.3125,0.25 3.3125,0.25 -2e-5,0 -0.0773,-0.63741 1.03125,-0.90625 0.74362,-0.18035 5.15176,-0.66355 7.28125,-0.84375 2.05847,-0.17417 5.34324,-0.12432 7.25,0.65625 1.95459,0.80016 7.875,3.53125 7.875,3.53125 -2e-5,0 -6.55993,-3.30876 -7.40625,-3.71875 -0.20237,-0.0981 -0.57186,-0.2031 -1.03125,-0.3125 1.21517,-0.5639 5.01008,-1.1143 7.75,-1.46875 3.01091,-0.38952 3.32131,-0.39765 5.375,-0.3125 1.94439,0.0806 3.00663,0.25324 3.1875,0.28125 0.11916,-0.19086 0.38277,-0.74531 0.9375,-0.875 0.74426,-0.174 5.14993,-0.65047 7.28125,-0.8125 1.76662,-0.13427 4.4497,-0.12571 6.375,0.375 0.32,0.0832 0.6033,0.20127 0.875,0.3125 1.9546,0.80016 7.9063,3.5625 7.9063,3.5625 -10e-5,0 -6.5912,-3.34001 -7.4375,-3.75 -0.2024,-0.0981 -0.5719,-0.20311 -1.0313,-0.3125 1.2151,-0.5639 5.0413,-1.08306 7.7813,-1.4375 3.0109,-0.38953 3.3525,-0.4289 5.4062,-0.34375 2.1197,0.0879 3.3125,0.3125 3.3125,0.3125 0,0 -0.078,-0.64902 1.0313,-0.90625 0.7443,-0.17256 5.1495,-0.62336 7.2812,-0.78125 2.0606,-0.1526 5.3429,-0.0968 7.25,0.6875 1.955,0.80395 7.875,3.5 7.875,3.5 0,0 -6.5598,-3.27587 -7.4062,-3.6875 -0.2025,-0.0984 -0.5718,-0.20222 -1.0313,-0.3125 1.2154,-0.56154 5.0119,-1.12778 7.75,-1.5 3.009,-0.40905 3.3227,-0.41558 5.375,-0.34375 1.9431,0.068 3.0072,0.16485 3.1875,0.1875 0.1188,-0.1944 0.3846,-0.72881 0.9375,-0.875 0.7418,-0.19612 5.1311,-0.82878 7.25,-1.09375 1.7564,-0.21961 4.4053,-0.33231 6.3125,0.0312 0.3169,0.0604 0.6058,0.18938 0.875,0.28125 1.9362,0.66092 7.8438,2.9375 7.8438,2.9375 -1e-4,0 -6.5367,-2.80655 -7.375,-3.15625 -0.2005,-0.0836 -0.5762,-0.17333 -1.0313,-0.25 1.2037,-0.65046 5.0191,-1.37195 7.7188,-2 2.9667,-0.6902 3.2889,-0.75507 5.3125,-0.875 2.0886,-0.1238 3.2812,-0.0312 3.2812,-0.0312 0,1e-5 -0.087,-0.63205 1,-1.03125 0.7292,-0.2678 5.0472,-1.33797 7.125,-1.8125 2.0085,-0.45869 5.1679,-1.0293 7,-0.625 1.8781,0.41446 13.5782,3.01563 13.5782,3.01563 0,0 -12.3275,-3.02266 -13.1407,-3.26563 -0.1945,-0.0581 -0.5586,-0.10626 -1,-0.125 1.1676,-0.80369 3.5142,-1.6873 6.1094,-2.70312 1.6814,-0.65818 0.9237,-0.37659 2.7759,-1.0036 1.7536,-0.59366 2.4854,-1.01071 2.6304,-1.11299 0.3461,-0.20651 -0.356,-0.12188 -0.5442,-0.0424 z"</div><div class='add'>+             id="path8093"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6949);enable-background:new"</div><div class='add'>+             d="m 1082.625,-275.125 c 1.873,0.39348 4.4961,1.14555 6.0313,1.96875 1.5352,0.82319 2.8222,1.056 5.375,2.5 2.5266,1.42926 4.7958,2.00696 6.9687,2.53125 2.3476,0.56642 5.4354,0.71523 8.8438,1.1875 -1.0889,-0.83975 -6.6074,-1.17245 -8.4063,-1.5625 -1.7989,-0.39006 -3.8941,-1.01616 -6.5937,-2.3125 -2.6997,-1.29634 -3.4944,-1.79896 -5.8125,-2.6875 -2.3182,-0.88854 -4.0044,-1.38314 -6.4063,-1.625 z"</div><div class='add'>+             id="path8095"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6961);enable-background:new"</div><div class='add'>+             d="m 1051.4688,-270 c 1.9053,0.57759 4.5281,1.61572 6.0937,2.59375 1.5656,0.97802 2.8802,1.35981 5.5,3.125 2.593,1.74716 4.9859,2.70927 7.25,3.59375 2.4461,0.95557 5.6826,1.65713 9.4063,3.0625 -1.1896,-1.13784 -7.0631,-2.68675 -8.9375,-3.375 -1.8745,-0.68825 -4.0818,-1.5662 -6.875,-3.28125 -2.7933,-1.71504 -3.5736,-2.2839 -5.9375,-3.40625 -2.3641,-1.12234 -4.0567,-1.83455 -6.5,-2.3125 z"</div><div class='add'>+             id="path8097"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6957);enable-background:new"</div><div class='add'>+             d="m 1020.2188,-266.84375 c 1.9119,0.63811 4.5812,1.75536 6.1562,2.8125 1.5751,1.05715 2.8956,1.50867 5.5313,3.40625 2.6086,1.87821 5.0284,3.03003 7.3125,4.0625 2.4677,1.11545 5.7645,2.1733 9.5312,3.84375 -1.2033,-1.22253 -7.2028,-3.31423 -9.0937,-4.125 -1.891,-0.81077 -4.0649,-1.89379 -6.875,-3.75 -2.8102,-1.8562 -3.6218,-2.47693 -6,-3.71875 -2.3783,-1.2418 -4.1107,-1.97569 -6.5625,-2.53125 z"</div><div class='add'>+             id="path8099"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             sodipodi:nodetypes="cssscscsscsssccscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssccscsscscssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsszsszssszzcczzzczzzc"</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6997);enable-background:new"</div><div class='add'>+             d="m 1110.1719,-266.89063 c 0.1508,0.0486 0.688,0.631 0.1094,1.48438 -0.8101,1.19459 -5.7049,3.32429 -8.5625,4.125 -2.8449,0.79712 -6.2901,0.97774 -10.5625,-0.375 -4.3016,-1.36195 -5.4697,-2.46872 -10.6563,-4.3125 4.664,2.11517 6.1953,3.95233 10.125,5.34375 1.6207,0.57387 3.3671,0.9396 5.0625,1.03125 -0.4451,0.32563 -1.5303,0.9833 -3.5625,1.59375 -2.7955,0.83969 -6.6491,1.53378 -8.25,1.625 -1.5146,0.0863 -3.142,-0.51249 -3.4375,-0.625 0.1667,0.10308 0.3732,0.37734 -0.25,1.03125 -0.8993,0.94363 -6.1474,1.923 -9.125,2.25 -2.9643,0.32555 -6.5216,-0.016 -10.9062,-1.90625 -3.978,-1.71497 -5.339,-2.91536 -9.4063,-4.75 0,0 0,0.15625 0,0.15625 3.6431,2.09529 5.284,3.88327 8.875,5.5625 1.7302,0.80909 3.5917,1.40876 5.4063,1.71875 -0.5349,0.28676 -1.5578,0.71151 -3.4375,1.03125 -2.869,0.48796 -6.809,0.81614 -8.4375,0.75 -0.8507,-0.0345 -1.7286,-0.18437 -2.4063,-0.40625 -0.6848,-0.21488 -1.1897,-0.44467 -1.3125,-0.5 0.1694,0.10721 0.4311,0.40288 -0.2187,1.03125 -0.9097,0.87962 -6.2461,1.33638 -9.25,1.46875 -2.9905,0.13179 -6.5889,-0.45063 -11,-2.5625 -4.4412,-2.12626 -5.6415,-3.4016 -10.9063,-5.78125 4.7343,2.59704 6.2865,4.6291 10.3438,6.71875 1.6733,0.86185 3.4852,1.49425 5.25,1.9375 -0.4633,0.23332 -1.5894,0.68814 -3.6875,0.9375 -2.8863,0.34298 -6.8346,0.49288 -8.4688,0.375 -1.5462,-0.1115 -3.2312,-0.85696 -3.5312,-1 0.1691,0.12029 0.4138,0.41048 -0.2188,1 -0.9128,0.85073 -6.2441,1.26212 -9.25,1.375 -2.9925,0.11237 -6.5897,-0.49043 -11,-2.59375 -4.00125,-1.90823 -5.38803,-3.13783 -9.46875,-5.09375 -3e-5,0 0,0.15625 0,0.15625 3.65506,2.20392 5.29421,4.05255 8.90625,5.90625 1.74029,0.89315 3.637,1.52827 5.4688,1.96875 -0.54,0.2483 -1.5781,0.61533 -3.4688,0.84375 -2.88568,0.34858 -6.86605,0.52095 -8.5,0.40625 -0.85345,-0.0599 -1.72631,-0.25791 -2.40625,-0.5 -0.6871,-0.2353 -1.18935,-0.47226 -1.3125,-0.53125 0.16998,0.11227 0.46448,0.42225 -0.1875,1.03125 -0.91265,0.8525 -6.27533,1.29337 -9.28125,1.40625 -2.99246,0.11237 -6.59346,-0.52805 -11,-2.59375 -4.43653,-2.07978 -5.64688,-3.33171 -10.90625,-5.65625 4.72938,2.54749 6.29074,4.5778 10.34375,6.625 1.67155,0.84433 3.48554,1.46643 5.25,1.90625 -0.46323,0.23422 -1.5897,0.68407 -3.6875,0.9375 -2.88569,0.34858 -6.8362,0.56952 -8.46875,0.46875 -1.54456,-0.0953 -3.20031,-0.82885 -3.5,-0.96875 0.16899,0.11853 0.38192,0.40385 -0.25,1 -0.91186,0.86028 -6.24665,1.33025 -9.25,1.46875 -2.98995,0.1379 -6.56745,-0.45068 -10.96875,-2.46875 -3.99308,-1.83089 -5.36511,-3.0292 -9.4375,-4.90625 -2e-5,0 0,0.15625 0,0.15625 3.64761,2.13327 5.27033,3.93487 8.875,5.71875 1.73675,0.85951 3.60727,1.45014 5.4375,1.875 -0.53947,0.2529 -1.55063,0.64129 -3.4375,0.90625 -2.87978,0.40436 -6.83813,0.64562 -8.46875,0.5625 -0.85172,-0.0434 -1.7277,-0.20855 -2.40625,-0.4375 -0.68569,-0.22201 -1.1896,-0.44339 -1.3125,-0.5 0.16959,0.10899 0.4319,0.40965 -0.21875,1.03125 -0.91079,0.87014 -6.25021,1.39152 -9.25,1.5625 -2.98633,0.17021 -6.57381,-0.31577 -10.96875,-2.28125 -4.42489,-1.97888 -5.60596,-3.22819 -10.84375,-5.375 4.70997,2.38767 6.27017,4.38873 10.3125,6.34375 1.66715,0.80631 3.46043,1.39658 5.21875,1.78125 -0.46163,0.2487 -1.597,0.71225 -3.6875,1.03125 -2.8756,0.43876 -6.7804,0.7331 -8.40625,0.6875 -1.53823,-0.0431 -3.2328,-0.74522 -3.53125,-0.875 0.16833,0.11282 0.41057,0.41375 -0.21875,1.03125 -0.90812,0.8911 -6.20295,1.52825 -9.1875,1.8125 -2.97118,0.28298 -6.57342,-0.1758 -10.9375,-1.9375 -3.95934,-1.59831 -5.32915,-2.79487 -9.34375,-4.3125 3e-5,0 0,0.15625 0,0.15625 3.5959,1.81135 5.23831,3.58233 8.8125,5.15625 1.72207,0.75835 3.58748,1.28895 5.40625,1.625 -0.53609,0.27908 -1.56658,0.68763 -3.4375,1.0625 -2.85539,0.5721 -6.78942,1.01939 -8.40625,1.03125 -0.84451,0.006 -1.70608,-0.0809 -2.375,-0.25 -0.67591,-0.16151 -1.16009,-0.32923 -1.28125,-0.375 0.16722,0.094 0.42267,0.38348 -0.21875,1.0625 -0.89787,0.95052 -6.18648,1.91708 -9.125,2.4375 -2.92534,0.51809 -6.43215,0.37424 -10.71875,-1.03125 -4.3158,-1.41507 -5.47277,-2.52994 -10.5625,-3.96875 4.57685,1.75101 6.08855,3.56006 10.03125,5 1.62608,0.59389 3.36885,0.95565 5.09375,1.15625 -0.45285,0.29702 -1.55478,0.88339 -3.59375,1.46875 -2.80472,0.80517 -6.63886,1.57583 -8.21875,1.75 -1.49475,0.1648 -3.11623,-0.31681 -3.40625,-0.40625 0.16356,0.0901 0.39278,0.35993 -0.21875,1.0625 -0.88247,1.01385 -6.04452,2.37165 -8.9375,3.0625 -2.88002,0.68778 -6.3356,0.76002 -10.5625,-0.4375 -3.83485,-1.08645 -5.17258,-2.07237 -9.0625,-3.125 -10e-6,0 0,0.15625 0,0.15625 3.48418,1.39485 5.06941,2.9194 8.53125,4.03125 1.66793,0.53572 3.45578,0.78674 5.21875,0.875 -0.51964,0.35212 -1.50039,0.91452 -3.3125,1.53125 -2.76566,0.94125 -6.59024,1.93537 -8.15625,2.15625 -0.81794,0.11539 -1.6331,0.12283 -2.28125,0.0312 -0.65496,-0.0832 -1.1326,-0.21827 -1.25,-0.25 0.16204,0.0746 0.43399,0.34044 -0.1875,1.09375 -0.87,1.05453 -6.00963,2.65925 -8.875,3.4375 -2.85253,0.77476 -6.25912,0.9582 -10.4375,-0.0937 -4.20683,-1.05913 -5.35669,-2.04166 -10.34375,-3.15625 4.48454,1.45946 5.96935,3.13523 9.8125,4.25 1.58504,0.45977 3.28679,0.63825 4.96875,0.6875 -0.44157,0.33676 -1.51251,1.02773 -3.5,1.78125 -2.73393,1.03649 -6.45198,2.16269 -8,2.4375 -1.46462,0.26002 -3.05958,-0.11654 -3.34375,-0.1875 0.16025,0.0796 0.38044,0.32098 -0.21875,1.0625 -0.86466,1.07006 -5.91652,2.81815 -8.75,3.6875 -2.8208,0.86547 -6.2075,1.15631 -10.34375,0.21875 -3.75259,-0.85061 -5.04785,-1.71647 -8.875,-2.59375 0,0 0,0.15625 0,0.15625 3.42796,1.23779 4.98741,2.6323 8.375,3.53125 1.63216,0.43314 3.36704,0.58301 5.09375,0.5625 -0.50893,0.38417 -1.47675,1.02182 -3.25,1.75 -2.70634,1.11134 -6.43633,2.30781 -7.96875,2.625 -0.8004,0.16569 -1.61231,0.21862 -2.25,0.15625 0,0 0,0.51552 0,0.92229 0,0.26507 0,0.48396 0,0.48396 0.22645,-0.14468 0.44891,-0.27261 0.71875,-0.375 1.08052,-0.40998 2.17161,-0.21577 6,-1.6875 3.82843,-1.47174 5.22412,-2.00498 5.90625,-2.40625 0.6796,-0.39978 1.61165,-0.87937 2.21875,-1.53125 1.82685,-0.13775 3.57075,-0.49323 4.9375,-1 2.96812,-1.10052 4.87537,-1.80619 6.78125,-2.46875 1.90586,-0.66254 2.35409,-1.41487 3.40625,-1.78125 1.09155,-0.38011 2.19511,-0.16538 6.0625,-1.53125 3.86745,-1.36586 5.28316,-1.82708 5.96875,-2.21875 0.70109,-0.40052 1.70081,-0.93298 2.3125,-1.59375 1.9708,-0.0547 3.81685,-0.38463 5.28125,-0.875 3.00148,-1.00508 4.92615,-1.62171 6.84375,-2.25 1.5386,-0.5041 2.17402,-1.04677 2.90625,-1.4375 0.23016,-0.13431 0.47574,-0.25373 0.75,-0.34375 1.09823,-0.36048 2.18145,-0.0814 6.09375,-1.3125 3.91233,-1.23113 5.36605,-1.67295 6.0625,-2.03125 0.69388,-0.35697 1.63015,-0.79261 2.25,-1.40625 1.86521,-0.0227 3.63581,-0.26683 5.03125,-0.6875 3.03043,-0.91354 4.99238,-1.4301 6.9375,-1.96875 1.94511,-0.53864 2.42618,-1.26452 3.5,-1.5625 1.11401,-0.30915 2.21994,0.007 6.1875,-1.03125 3.96761,-1.03863 5.41758,-1.43273 6.125,-1.75 0.73487,-0.32959 1.81383,-0.75372 2.4375,-1.375 1.99774,0.116 3.85743,-0.0201 5.34375,-0.375 3.07811,-0.735 5.08344,-1.10094 7.0625,-1.5 1.58792,-0.32018 2.24429,-0.79055 3,-1.09375 0.23757,-0.1068 0.46695,-0.19276 0.75,-0.25 1.13347,-0.22919 2.30448,0.20893 6.34375,-0.5 4.03933,-0.70893 5.50025,-0.92709 6.21875,-1.1875 0.71586,-0.25944 1.70428,-0.56724 2.34375,-1.09375 1.92427,0.23949 3.74788,0.22453 5.1875,0 3.12633,-0.48762 5.15455,-0.70067 7.15625,-0.96875 2.00171,-0.26807 2.48869,-0.94514 3.59375,-1.09375 1.14639,-0.15418 2.27592,0.30157 6.34375,-0.21875 4.06784,-0.52032 5.56013,-0.69573 6.28125,-0.9375 0.7371,-0.24714 1.79809,-0.58623 2.4375,-1.125 2.05007,0.33553 3.97378,0.39796 5.5,0.21875 3.14231,-0.36896 5.17994,-0.55936 7.1875,-0.78125 1.61076,-0.17802 2.26467,-0.6082 3.03125,-0.84375 0.24094,-0.0855 0.49412,-0.1556 0.78125,-0.1875 1.14978,-0.12772 2.30129,0.34665 6.375,-0.125 4.07374,-0.47165 5.55909,-0.6106 6.28125,-0.84375 0.71946,-0.23227 1.70024,-0.47346 2.34375,-0.96875 1.93637,0.33346 3.77006,0.40424 5.21875,0.25 3.14602,-0.33495 5.17756,-0.51859 7.1875,-0.71875 2.00996,-0.20014 2.48414,-0.82639 3.59375,-0.9375 1.15114,-0.11528 2.29643,0.36506 6.375,-0.0625 4.07861,-0.42756 5.58886,-0.56209 6.3125,-0.78125 0.73915,-0.22386 1.79572,-0.51325 2.4375,-1.03125 2.0571,0.39867 4.00187,0.4934 5.53125,0.34375 3.14873,-0.3081 5.17584,-0.47325 7.1875,-0.65625 1.61407,-0.14682 2.2631,-0.56055 3.03125,-0.78125 0.24142,-0.0809 0.49353,-0.12991 0.78125,-0.15625 1.15211,-0.10545 2.29296,0.39275 6.375,0 4.08208,-0.39275 5.5889,-0.53084 6.3125,-0.75 0.7209,-0.21833 1.6997,-0.4477 2.3438,-0.9375 1.938,0.34999 3.7688,0.45438 5.2187,0.3125 3.1487,-0.3081 5.1758,-0.47325 7.1875,-0.65625 2.0116,-0.18299 2.5142,-0.83802 3.625,-0.9375 1.1523,-0.10323 2.2922,0.38483 6.375,0 4.0829,-0.38482 5.5887,-0.501 6.3125,-0.71875 0.7393,-0.22243 1.7956,-0.51449 2.4375,-1.03125 2.0574,0.40177 4.0029,0.50333 5.5313,0.34375 3.1466,-0.32852 5.1771,-0.5227 7.1875,-0.71875 1.613,-0.15729 2.2656,-0.63148 3.0312,-0.875 0.2407,-0.088 0.4632,-0.12137 0.75,-0.15625 1.1483,-0.1397 2.3167,0.33991 6.375,-0.25 4.0583,-0.58992 5.5618,-0.77714 6.2813,-1.03125 0.7167,-0.25316 1.6745,-0.55807 2.3125,-1.09375 1.9197,0.21194 3.7199,0.15141 5.1562,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0938,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5625,-1.28125 1.1288,-0.25066 2.2703,0.11629 6.25,-0.875 3.9796,-0.99128 5.4296,-1.4193 6.125,-1.78125 0.7223,-0.37601 1.7619,-0.87058 2.375,-1.53125 1.963,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.14461 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70653 2.3348,-1.68641 2.5469,-1.98438 0.2122,-0.29796 0.1118,-0.7453 0.1379,-0.76675 0.043,-0.0352 0.3193,-0.085 0.479,-0.42844 0.8589,-1.84708 2.321,-5.64459 2.4352,-6.32945 0.1137,-0.68216 0.1638,-1.34774 0.2145,-1.74497 0.029,-0.22952 -0.1467,-0.86544 -0.1246,-0.92404 0.031,-0.0821 0.3045,-0.26528 0.3599,-0.51471 0.2663,-1.19833 0.089,-2.19129 -0.1251,-3.60893 -0.214,-1.41764 -0.9837,-4.62214 -1.6369,-5.47626 -0.6589,-0.86172 -1.2229,-1.01117 -1.7479,-1.00066 -0.2086,0.26976 0.1368,0.26309 0.1626,0.31261 0.6806,0.0508 0.934,0.36864 1.4192,0.89662 0.4852,0.52798 1.4428,3.93956 1.5794,5.38995 0.1366,1.45039 0.19,2.8602 -0.088,3.46864 -0.2781,0.60845 -0.9442,0.42864 -1.2366,0.49452 0.531,0.18589 0.8908,0.21322 0.9524,1.05768 0.059,0.81338 -0.1332,1.63969 -0.5198,2.80562 -0.3912,1.18001 -1.8452,4.34998 -2.2857,4.59877 -0.4523,0.25551 -0.9524,0.18199 -1.288,0.0511 z"</div><div class='add'>+             id="path8101"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6953);enable-background:new"</div><div class='add'>+             d="m 988.75,-263.84375 c 1.91161,0.6344 4.55027,1.75841 6.125,2.8125 1.57477,1.05409 2.8961,1.48252 5.5313,3.375 2.6082,1.87314 5.0269,3.01522 7.3125,4.0625 2.4693,1.13147 5.7521,2.15474 9.5312,3.9375 -1.2072,-1.2584 -7.139,-3.36445 -9.0312,-4.1875 -1.8922,-0.82304 -4.128,-1.93049 -6.9375,-3.78125 -2.80961,-1.85075 -3.62224,-2.48154 -6.00005,-3.71875 -2.37782,-1.23719 -4.07988,-1.9492 -6.53125,-2.5 z"</div><div class='add'>+             id="path8103"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6993);enable-background:new"</div><div class='add'>+             d="m 957.5,-260.78125 c 1.91,0.6181 4.58288,1.70934 6.15625,2.75 1.57339,1.04066 2.89608,1.48252 5.53125,3.375 2.60823,1.87315 5.02692,3.01521 7.3125,4.0625 2.46931,1.13147 5.75213,2.15475 9.53125,3.9375 -1.20728,-1.2584 -7.20154,-3.3957 -9.09375,-4.21875 -1.89217,-0.82304 -4.09666,-1.9305 -6.90625,-3.78125 -2.80958,-1.85075 -3.59295,-2.43932 -5.96875,-3.65625 -2.37578,-1.21691 -4.11321,-1.93885 -6.5625,-2.46875 z"</div><div class='add'>+             id="path8105"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6989);enable-background:new"</div><div class='add'>+             d="m 926.09375,-257.375 c 1.90772,0.59745 4.55348,1.66384 6.125,2.6875 1.5715,1.02365 2.87022,1.43971 5.5,3.28125 2.60291,1.82273 5.02887,2.9722 7.3125,4 2.4672,1.11041 5.75535,2.09323 9.53125,3.84375 -1.20623,-1.2481 -7.1719,-3.31809 -9.0625,-4.125 -1.89058,-0.8069 -4.10242,-1.89104 -6.90625,-3.6875 -2.80385,-1.79644 -3.62704,-2.40251 -6,-3.59375 -2.37297,-1.19124 -4.05362,-1.90283 -6.5,-2.40625 z"</div><div class='add'>+             id="path8107"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6985);enable-background:new"</div><div class='add'>+             d="m 894.90625,-253.5625 c 1.90213,0.55355 4.58701,1.58887 6.15625,2.59375 1.56923,1.00487 2.87401,1.40864 5.5,3.21875 2.59912,1.79164 5.00034,2.87189 7.28125,3.875 2.46428,1.08374 5.75984,2.04029 9.53125,3.75 -1.2048,-1.23507 -7.17416,-3.24478 -9.0625,-4.03125 -1.88832,-0.78647 -4.0752,-1.8308 -6.875,-3.59375 -2.79977,-1.76294 -3.59919,-2.36836 -5.96875,-3.53125 -2.36957,-1.16288 -4.12325,-1.83412 -6.5625,-2.28125 z"</div><div class='add'>+             id="path8109"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6965);enable-background:new"</div><div class='add'>+             d="m 863.71875,-248.65625 c 1.88062,0.42909 4.50427,1.38038 6.0625,2.3125 1.55823,0.93211 2.85233,1.25776 5.46875,3 2.58971,1.72444 4.98067,2.70802 7.25,3.625 2.45176,0.99069 5.73959,1.87707 9.5,3.5 -1.20131,-1.20734 -7.15249,-3.06609 -9.03125,-3.78125 -1.87875,-0.71517 -4.0854,-1.68442 -6.875,-3.375 -2.78963,-1.69057 -3.58461,-2.22822 -5.9375,-3.28125 -2.35292,-1.05301 -4.02584,-1.71248 -6.4375,-2 z"</div><div class='add'>+             id="path8111"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6981);enable-background:new"</div><div class='add'>+             d="m 833.15625,-241.375 c 1.84836,0.29644 4.46945,0.97632 6,1.78125 1.53058,0.80493 2.81374,1.05573 5.375,2.53125 2.53504,1.46046 4.89068,2.32509 7.125,3.0625 2.41399,0.79668 5.65711,1.46689 9.375,2.84375 -1.18771,-1.12873 -7.08772,-2.58975 -8.9375,-3.15625 -1.84977,-0.5665 -4.00342,-1.37392 -6.75,-2.84375 -2.74657,-1.46983 -3.50136,-1.92028 -5.8125,-2.78125 -2.31115,-0.86095 -4.00471,-1.32009 -6.375,-1.4375 z"</div><div class='add'>+             id="path8113"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6977);enable-background:new"</div><div class='add'>+             d="m 802.90625,-232.3125 c 1.8222,0.21127 4.36576,0.80057 5.875,1.53125 1.50925,0.73066 2.75568,0.92998 5.28125,2.28125 2.49976,1.33746 4.83154,2.04843 7.03125,2.65625 2.37653,0.65667 5.56464,1.07288 9.21875,2.1875 -1.16735,-1.04496 -6.92888,-2.10329 -8.75,-2.5625 -1.82111,-0.45921 -3.95225,-1.12696 -6.65625,-2.4375 -2.70403,-1.31052 -3.47106,-1.7199 -5.75,-2.46875 -2.27895,-0.74883 -3.91325,-1.17931 -6.25,-1.1875 z"</div><div class='add'>+             id="path8115"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6973);enable-background:new"</div><div class='add'>+             d="m 773.1875,-222.1875 c 1.81109,0.1787 4.32059,0.66506 5.8125,1.34375 1.49194,0.67869 2.7534,0.79822 5.25,2.0625 2.47107,1.25138 4.79005,1.89614 6.96875,2.4375 2.35387,0.58488 5.49134,0.89752 9.09375,1.84375 -1.15084,-0.99116 -6.85251,-1.7833 -8.65625,-2.1875 -1.80372,-0.4042 -3.91553,-1.02116 -6.59375,-2.25 -2.67818,-1.22884 -3.40345,-1.61089 -5.65625,-2.28125 -2.25279,-0.67034 -3.89627,-1.00232 -6.21875,-0.96875 z"</div><div class='add'>+             id="path8117"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6969);enable-background:new"</div><div class='add'>+             d="m 743.5625,-211.1875 c 1.79281,0.12911 4.27313,0.54965 5.75,1.1875 1.4769,0.63785 2.7161,0.74156 5.1875,1.9375 2.44618,1.18372 4.72054,1.74666 6.875,2.21875 2.32767,0.51003 5.4196,0.68064 9,1.5625 -1.14379,-0.9706 -6.74759,-1.59065 -8.53125,-1.9375 -1.78367,-0.34684 -3.88285,-0.88756 -6.53125,-2.03125 -2.64841,-1.14368 -3.39495,-1.51631 -5.625,-2.125 -2.23008,-0.60868 -3.82594,-0.90966 -6.125,-0.8125 z"</div><div class='add'>+             id="path8119"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             style="fill:#ffffff;fill-opacity:1;filter:url(#filter7345)"</div><div class='add'>+             id="g8121"&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"</div><div class='add'>+               d="m 744.9375,-212.11731 c 0,0 7.22229,-3.22318 9.0625,-3.5 1.84021,-0.27682 3.35225,-0.003 6,0.5625 2.64775,0.56573 8.7357,2.21518 11.1875,3.375 2.4518,1.15982 5.3125,3.5625 5.3125,3.5625 0,0 -7.14644,-2.78019 -10.1875,-3.5625 -3.04106,-0.78231 -7.64461,-2.08374 -10.375,-2.3125 -2.73039,-0.22876 -11,1.875 -11,1.875 z"</div><div class='add'>+               id="path8123"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 735.46875,-206.95416 c 0,0 3.65979,-2.22318 5.5,-2.5 1.84021,-0.27682 3.66475,0.24677 6.3125,0.8125 2.64775,0.56573 8.7357,2.21518 11.1875,3.375 2.4518,1.15982 6.5625,2.125 6.5625,2.125 0,0 -8.39644,-1.34269 -11.4375,-2.125 -3.04106,-0.78231 -7.95711,-2.33374 -10.6875,-2.5625 -2.73039,-0.22876 -7.4375,0.875 -7.4375,0.875 z"</div><div class='add'>+               id="path8125"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 759.85042,-217.61116 c 0,0 8.5437,-3.29857 10.39778,-3.45786 1.85409,-0.1593 3.64166,0.4792 6.2481,1.21208 2.60644,0.73288 8.57724,2.76594 10.95036,4.07925 2.37312,1.31331 6.41417,2.53782 6.41417,2.53782 0,0 -8.29413,-1.87365 -11.27931,-2.84767 -2.98519,-0.97402 -7.79269,-2.83478 -10.50302,-3.23662 -2.71033,-0.40184 -12.22808,1.713 -12.22808,1.713 z"</div><div class='add'>+               id="path8127"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 775.19813,-223.2266 c 0,0 7.77133,-2.78244 9.62831,-2.90349 1.85697,-0.12104 3.631,0.55417 6.22178,1.34062 2.59077,0.78645 8.5184,2.94217 10.86394,4.30412 2.34555,1.36195 6.36049,2.6695 6.36049,2.6695 0,0 -8.25373,-2.04423 -11.21821,-3.07958 -2.96447,-1.03535 -7.73259,-2.99481 -10.43406,-3.45243 -2.70147,-0.45763 -11.42225,1.12126 -11.42225,1.12126 z"</div><div class='add'>+               id="path8129"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 789.64298,-227.95417 c 0,0 8.68256,-3.52031 10.54154,-3.60535 1.85897,-0.085 3.61958,0.62442 6.19463,1.46093 2.57505,0.83649 8.45979,3.10666 10.77851,4.5138 2.31872,1.40715 6.30757,2.79224 6.30757,2.79224 0,0 -8.21257,-2.20377 -11.15643,-3.29636 -2.94386,-1.09259 -7.67312,-3.14408 -10.36522,-3.65397 -2.69209,-0.50988 -12.3006,1.78871 -12.3006,1.78871 z"</div><div class='add'>+               id="path8131"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.852145"</div><div class='add'>+               inkscape:transform-center-y="-4.3190906"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 804.49513,-233.32948 c 0,0 7.80756,-2.58281 9.66654,-2.66785 1.85897,-0.085 3.61958,0.62442 6.19463,1.46093 2.57505,0.83649 8.45979,3.10666 10.77851,4.5138 2.31872,1.40715 6.30757,2.79224 6.30757,2.79224 0,0 -8.21257,-2.20377 -11.15643,-3.29636 -2.94386,-1.09259 -7.67312,-3.14408 -10.36522,-3.65397 -2.69209,-0.50988 -11.4256,0.85121 -11.4256,0.85121 z"</div><div class='add'>+               id="path8133"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.852145"</div><div class='add'>+               inkscape:transform-center-y="-4.3190906"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 819.55763,-237.57948 c 0,0 8.55756,-2.58281 10.41654,-2.66785 1.85897,-0.085 3.61958,0.62442 6.19463,1.46093 2.57505,0.83649 8.45979,3.10666 10.77851,4.5138 2.31872,1.40715 6.30757,2.79224 6.30757,2.79224 0,0 -8.21257,-2.20377 -11.15643,-3.29636 -2.94386,-1.09259 -7.67312,-3.14408 -10.36522,-3.65397 -2.69209,-0.50988 -12.1756,0.85121 -12.1756,0.85121 z"</div><div class='add'>+               id="path8135"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.852145"</div><div class='add'>+               inkscape:transform-center-y="-4.3190906"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 836.23395,-242.60125 c 0,0 6.96702,-1.98723 8.82784,-1.96757 1.86081,0.0197 3.57873,0.82702 6.10265,1.80705 2.52393,0.98 8.27166,3.57758 10.50756,5.11291 2.2359,1.53535 6.14053,3.14261 6.14053,3.14261 0,0 -8.07561,-2.66222 -10.95336,-3.91866 -2.87774,-1.25645 -7.48412,-3.5707 -10.14328,-4.23121 -2.65915,-0.66049 -10.48194,0.0549 -10.48194,0.0549 z"</div><div class='add'>+               id="path8137"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.64141"</div><div class='add'>+               inkscape:transform-center-y="-4.9269042"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 850.73028,-246.00461 c 0,0 7.68784,-2.02768 9.54782,-1.96854 1.85997,0.0592 3.56038,0.90279 6.06293,1.93616 2.50255,1.03334 8.19387,3.75232 10.39668,5.33475 2.20282,1.58245 6.07245,3.2722 6.07245,3.2722 0,0 -8.01729,-2.83298 -10.86772,-4.15022 -2.85043,-1.31723 -7.40666,-3.72872 -10.0512,-4.4455 -2.64454,-0.71678 -11.16096,0.0211 -11.16096,0.0211 z"</div><div class='add'>+               id="path8139"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.55068"</div><div class='add'>+               inkscape:transform-center-y="-5.1542119"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 864.82496,-249.21081 c 0,0 8.16952,-1.96906 10.02688,-1.85396 1.85735,0.11512 3.53158,1.00956 6.0019,2.11779 2.47031,1.10821 8.0772,3.99727 10.23138,5.64531 2.15418,1.64804 5.9712,3.45352 5.9712,3.45352 0,0 -7.92839,-3.07306 -10.73787,-4.4755 -2.80949,-1.40244 -7.29106,-3.94999 -9.91283,-4.74606 -2.62176,-0.79606 -11.58066,-0.1411 -11.58066,-0.1411 z"</div><div class='add'>+               id="path8141"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.41151"</div><div class='add'>+               inkscape:transform-center-y="-5.4740887"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 881.38485,-251.60282 c 0,0 8.08536,-1.90809 9.93837,-1.73664 1.853,0.17147 3.4993,1.11633 5.93482,2.29908 2.43553,1.18271 7.95209,4.2407 10.05523,5.95339 2.10314,1.7127 5.86357,3.63326 5.86357,3.63326 0,0 -7.8314,-3.3124 -10.597,-4.7995 -2.76561,-1.48712 -7.16775,-4.16959 -9.76414,-5.04491 -2.59637,-0.87531 -11.43085,-0.30468 -11.43085,-0.30468 z"</div><div class='add'>+               id="path8143"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.258805"</div><div class='add'>+               inkscape:transform-center-y="-5.79376"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 896.58415,-254.34724 c 0,0 7.64166,-1.4277 9.49547,-1.26515 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08372,5.90502 2.11134,1.70258 5.88096,3.60505 5.88096,3.60505 0,0 -7.84723,-3.27474 -10.61995,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -10.99774,-0.76897 -10.99774,-0.76897 z"</div><div class='add'>+               id="path8145"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.28378"</div><div class='add'>+               inkscape:transform-center-y="-5.7433893"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 911.45328,-255.98544 c 0,0 8.64166,-1.5527 10.49547,-1.39015 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08372,5.90502 2.11134,1.70258 5.88096,3.60505 5.88096,3.60505 0,0 -7.84723,-3.27474 -10.61995,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -11.99774,-0.64397 -11.99774,-0.64397 z"</div><div class='add'>+               id="path8147"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.28378"</div><div class='add'>+               inkscape:transform-center-y="-5.7433893"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 927.70328,-258.29794 c 0,0 7.64166,-0.8652 9.49547,-0.70265 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08372,5.90502 2.11134,1.70258 5.88096,3.60505 5.88096,3.60505 0,0 -7.84723,-3.27474 -10.61995,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -10.99774,-1.33147 -10.99774,-1.33147 z"</div><div class='add'>+               id="path8149"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.28378"</div><div class='add'>+               inkscape:transform-center-y="-5.7433893"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 942.82828,-259.48544 c 0,0 8.57916,-1.4902 10.43297,-1.32765 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08372,5.90502 2.11134,1.70258 5.88096,3.60505 5.88096,3.60505 0,0 -7.84723,-3.27474 -10.61995,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -11.93524,-0.70647 -11.93524,-0.70647 z"</div><div class='add'>+               id="path8151"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.28378"</div><div class='add'>+               inkscape:transform-center-y="-5.7433893"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 959.07828,-261.54794 c 0,0 7.82916,-0.8027 9.68297,-0.64015 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08372,5.90502 2.11134,1.70258 5.88096,3.60505 5.88096,3.60505 0,0 -7.84723,-3.27474 -10.61995,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -11.18524,-1.39397 -11.18524,-1.39397 z"</div><div class='add'>+               id="path8153"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.28378"</div><div class='add'>+               inkscape:transform-center-y="-5.7433893"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 974.45328,-262.79794 c 0,0 8.39166,-1.1777 10.24547,-1.01515 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08376,5.90502 2.1113,1.70258 5.8809,3.60505 5.8809,3.60505 0,0 -7.84721,-3.27474 -10.61993,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -11.74774,-1.01897 -11.74774,-1.01897 z"</div><div class='add'>+               id="path8155"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.28378"</div><div class='add'>+               inkscape:transform-center-y="-5.7433893"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 990.64078,-264.86044 c 0,0 6.89166,-0.9902 8.74547,-0.82765 1.85385,0.16256 3.50465,1.0995 5.94575,2.27053 2.4412,1.171 7.9724,4.20246 10.0838,5.90502 2.1113,1.70258 5.8809,3.60505 5.8809,3.60505 0,0 -7.8472,-3.27474 -10.6199,-4.74855 -2.7727,-1.4738 -7.1877,-4.13509 -9.7883,-4.99793 -2.60053,-0.86282 -10.24772,-1.20647 -10.24772,-1.20647 z"</div><div class='add'>+               id="path8157"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.28378"</div><div class='add'>+               inkscape:transform-center-y="-5.7433893"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 1007.7658,-265.79794 c 0,0 6.8291,-1.1777 8.683,-1.01515 1.8538,0.16256 3.5046,1.0995 5.9457,2.27053 2.4412,1.171 7.9724,4.20246 10.0838,5.90502 2.1113,1.70258 5.8809,3.60505 5.8809,3.60505 0,0 -7.8472,-3.27474 -10.6199,-4.74855 -2.7727,-1.4738 -7.1877,-4.13509 -9.7883,-4.99793 -2.6005,-0.86282 -10.1852,-1.01897 -10.1852,-1.01897 z"</div><div class='add'>+               id="path8159"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.28378"</div><div class='add'>+               inkscape:transform-center-y="-5.7433893"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 1023.8908,-267.79794 c 0,0 6.0791,-0.4277 7.933,-0.26515 1.8538,0.16256 3.5046,1.0995 5.9457,2.27053 2.4412,1.171 7.9724,4.20246 10.0838,5.90502 2.1113,1.70258 5.8809,3.60505 5.8809,3.60505 0,0 -7.8472,-3.27474 -10.6199,-4.74855 -2.7727,-1.4738 -7.1877,-4.13509 -9.7883,-4.99793 -2.6005,-0.86282 -9.4352,-1.76897 -9.4352,-1.76897 z"</div><div class='add'>+               id="path8161"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.28378"</div><div class='add'>+               inkscape:transform-center-y="-5.7433893"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 1039.7033,-269.17294 c 0,0 6.4541,-0.6777 8.308,-0.51515 1.8538,0.16256 3.5046,1.0995 5.9457,2.27053 2.4412,1.171 7.9724,4.20246 10.0838,5.90502 2.1113,1.70258 5.8809,3.60505 5.8809,3.60505 0,0 -7.8472,-3.27474 -10.6199,-4.74855 -2.7727,-1.4738 -7.1877,-4.13509 -9.7883,-4.99793 -2.6005,-0.86282 -9.8102,-1.51897 -9.8102,-1.51897 z"</div><div class='add'>+               id="path8163"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.28378"</div><div class='add'>+               inkscape:transform-center-y="-5.7433893"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 1055.2718,-271.03319 c 0,0 5.4976,-0.90945 7.3578,-0.85348 1.8601,0.056 3.5619,0.89674 6.0661,1.92586 2.5044,1.0291 8.2003,3.7384 10.4058,5.31709 2.2055,1.57871 6.078,3.2619 6.078,3.2619 0,0 -8.022,-2.81939 -10.8748,-4.13178 -2.8526,-1.31238 -7.4129,-3.71613 -10.0587,-4.42843 -2.6457,-0.71228 -8.9742,-1.09116 -8.9742,-1.09116 z"</div><div class='add'>+               id="path8165"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.55813"</div><div class='add'>+               inkscape:transform-center-y="-5.1360724"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 1072.7007,-273.48537 c 0,0 4.5472,-1.15581 6.408,-1.18621 1.8607,-0.0304 3.5996,0.73049 6.1489,1.64231 2.5494,0.91177 8.3649,3.35386 10.6414,4.8285 2.2763,1.47468 6.2227,2.97636 6.2227,2.97636 0,0 -8.1442,-2.44411 -11.0547,-3.62272 -2.9105,-1.1786 -7.5774,-3.36815 -10.2534,-3.95691 -2.6759,-0.58875 -8.1129,-0.68133 -8.1129,-0.68133 z"</div><div class='add'>+               id="path8167"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.74758"</div><div class='add'>+               inkscape:transform-center-y="-4.6370147"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               d="m 1087.1585,-276.5244 c 0,0 5.96,-1.77355 7.8202,-1.83024 1.86,-0.0567 3.6096,0.67955 6.1715,1.55525 2.562,0.87566 2.5226,0.85713 5.3335,1.49015 2.7969,0.62986 7.0767,1.51313 7.0767,1.51313 0,0 -3.6155,-0.0163 -6.7923,-0.46614 -3.1155,-0.44119 -7.3743,-1.69825 -10.0584,-2.24913 -2.6839,-0.55088 -9.5512,-0.013 -9.5512,-0.013 z"</div><div class='add'>+               id="path8169"</div><div class='add'>+               sodipodi:nodetypes="czzzczzc"</div><div class='add'>+               inkscape:transform-center-x="13.79933"</div><div class='add'>+               inkscape:transform-center-y="-4.4842392"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"</div><div class='add'>+               d="m 1099.25,-279.92981 c 0.1612,0.26862 11.2081,-4.60046 12.1875,-4.6875 0.9794,-0.087 2,3.125 2,3.125 0,0 -0.7751,-1.50434 -2.875,-1.0625 -2.0999,0.44184 -11.3009,2.67141 -11.3125,2.625 z"</div><div class='add'>+               id="path8171"</div><div class='add'>+               sodipodi:nodetypes="czczc"</div><div class='add'>+               inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             sodipodi:nodetypes="czscsssscssssscsssscssssscsssscssssscsssscssssscsssscssssscsssscssccsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscc"</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7333);enable-background:new"</div><div class='add'>+             d="m 1107.4532,-284.0938 c -0.4187,0.21283 -0.1556,0.0939 -0.6472,0.30581 -0.4861,0.20954 -1.7234,0.57439 -4.0796,1.45895 -3.3311,1.25057 -5.8302,2.15344 -7.0259,3.0661 -1.5361,0.0213 -3.7205,0.23331 -5.6563,0.71875 -2.9815,0.74766 -4.8552,1.17401 -6.75,1.59375 -1.8948,0.41972 -1.6755,0.64219 -2.875,0.875 -1.2966,0.25166 -1.7214,-0.009 -5.4375,0.78125 -3.4899,0.74214 -8.8948,1.93107 -10.1562,2.6875 -1.5839,-0.18079 -3.8675,-0.32178 -5.8438,-0.0312 -3.0404,0.44695 -4.9162,0.67276 -6.8437,0.90625 -0.6554,0.0794 -1.0411,0.20078 -1.3438,0.28125 -0.4262,0.13165 -0.6858,0.26002 -1.375,0.34375 -1.3116,0.15936 -1.7622,-0.15683 -5.5312,0.28125 -3.5539,0.41308 -9.0054,1.27282 -10.25,1.9375 -1.599,-0.2973 -3.8578,-0.53419 -5.8438,-0.34375 -3.0588,0.29331 -4.972,0.48399 -6.9062,0.65625 -1.9343,0.17226 -1.6887,0.42237 -2.9063,0.53125 -1.3162,0.11769 -1.7598,-0.16363 -5.5312,0.25 -3.5419,0.38844 -9.0079,1.20927 -10.2813,1.875 -1.5989,-0.2947 -3.88718,-0.50701 -5.87501,-0.3125 -3.05824,0.29924 -4.94113,0.48024 -6.875,0.65625 -0.65749,0.0598 -1.04004,0.17856 -1.34375,0.25 -0.42765,0.11895 -0.68351,0.21807 -1.375,0.28125 -1.31596,0.12025 -1.75976,-0.19488 -5.53125,0.21875 -3.55614,0.39001 -9.00554,1.23916 -10.25,1.90625 -1.59863,-0.29419 -3.85984,-0.52372 -5.84375,-0.3125 -3.0556,0.32532 -4.97404,0.52624 -6.90625,0.71875 -1.93221,0.1925 -1.68987,0.44088 -2.90625,0.5625 -1.31488,0.13146 -1.76298,-0.16454 -5.53125,0.28125 -3.53887,0.41865 -8.97768,1.29217 -10.25,1.96875 -1.59755,-0.28105 -3.85996,-0.42043 -5.84375,-0.1875 -3.05198,0.35836 -4.94508,0.56786 -6.875,0.78125 -0.6562,0.0726 -1.04066,0.17269 -1.34375,0.25 -0.42677,0.12722 -0.68491,0.2672 -1.375,0.34375 -1.31333,0.14568 -1.76746,-0.17402 -5.53125,0.3125 -3.54889,0.45875 -8.97863,1.41902 -10.21875,2.125 -1.59305,-0.24424 -3.83381,-0.38135 -5.8125,-0.125 -3.04759,0.39481 -4.95071,0.64845 -6.875,0.90625 -1.92428,0.25779 -1.72611,0.49353 -2.9375,0.65625 -1.30946,0.1759 -1.74719,-0.10438 -5.5,0.46875 -3.52429,0.53824 -8.92315,1.69917 -10.1875,2.4375 -1.5875,-0.20354 -3.8455,-0.25473 -5.8125,0.0937 -3.02617,0.53612 -4.89889,0.86169 -6.8125,1.1875 -0.65061,0.11077 -1.01371,0.27094 -1.3125,0.375 -0.42067,0.16488 -0.66345,0.3313 -1.34375,0.46875 -1.29465,0.26159 -1.72712,-0.006 -5.4375,0.8125 -3.49853,0.77195 -8.84595,2.38293 -10.0625,3.21875 -1.56278,-0.0775 -3.75758,0.0853 -5.6875,0.59375 -2.97244,0.78313 -4.81761,1.23209 -6.6875,1.75 -1.86988,0.5179 -1.6666,0.76728 -2.84375,1.09375 -1.27246,0.3529 -1.69703,0.10709 -5.34375,1.1875 -3.4247,1.01463 -8.64944,2.93317 -9.875,3.84375 -1.53883,0.0127 -3.71983,0.27222 -5.625,0.875 -2.93106,0.92734 -4.75031,1.45842 -6.59375,2.0625 -0.62676,0.20538 -0.99173,0.39258 -1.28125,0.53125 -0.40763,0.21361 -0.65334,0.40875 -1.3125,0.625 -1.25446,0.41154 -1.68611,0.18904 -5.28125,1.4375 -3.38985,1.17717 -8.59498,3.2137 -9.78125,4.15625 -1.52389,0.0597 -3.65005,0.39487 -5.53125,1.0625 -2.89739,1.02829 -4.69908,1.67548 -6.53125,2.3125 -1.83217,0.63701 -1.62785,0.84854 -2.78125,1.25 -1.24678,0.43396 -1.66361,0.19972 -5.21875,1.5625 -3.33867,1.2798 -8.48715,3.48255 -9.6875,4.46875 -1.50718,0.10769 -3.63569,0.4988 -5.5,1.21875 -2.86818,1.1076 -4.6238,1.78156 -6.4375,2.46875 -0.61666,0.23363 -0.99641,0.44203 -1.28125,0.59375 0,0 0,1.09375 0,1.09375 0.11178,-0.22236 0.38599,-0.81743 0.90625,-1.09375 0.69797,-0.37072 4.81363,-1.99337 6.8125,-2.71875 1.65686,-0.60125 4.15389,-1.32868 5.96875,-1.3125 0.30162,0.003 0.58762,0.0509 0.84375,0.0937 1.84249,0.30825 7.46875,1.5625 7.46875,1.5625 -10e-6,0 -6.23349,-1.64675 -7.03125,-1.84375 -0.19079,-0.0471 -0.53572,-0.0687 -0.96875,-0.0625 1.14546,-0.86971 4.761,-2.39351 7.34375,-3.4375 2.83822,-1.14727 3.11681,-1.25182 5.0625,-1.65625 2.0083,-0.41744 3.15625,-0.5 3.15625,-0.5 0,1e-5 -0.0824,-0.60114 0.96875,-1.125 0.7051,-0.35141 4.88702,-1.8924 6.90625,-2.5625 1.9519,-0.64773 5.0574,-1.3585 6.875,-1 1.86323,0.3675 7.53125,1.8125 7.53125,1.8125 1e-5,0 -6.287,-1.87111 -7.09375,-2.09375 -0.19292,-0.0533 -0.53084,-0.086 -0.96875,-0.0937 1.15834,-0.83288 4.79444,-2.19532 7.40625,-3.15625 2.87016,-1.05601 3.16734,-1.1618 5.125,-1.53125 1.85349,-0.34979 2.85884,-0.42548 3.03125,-0.4375 0.1136,-0.21724 0.37745,-0.81002 0.90625,-1.0625 0.70944,-0.33874 4.92607,-1.71275 6.96875,-2.3125 1.69317,-0.49711 4.24077,-1.03677 6.09375,-0.90625 0.30795,0.0217 0.61349,0.0973 0.875,0.15625 1.88118,0.42432 7.59375,2.03125 7.59375,2.03125 1e-5,0 -6.34174,-2.06525 -7.15625,-2.3125 -0.19479,-0.0591 -0.55788,-0.10394 -1,-0.125 1.16949,-0.79755 4.86302,-2.05622 7.5,-2.9375 2.89781,-0.96847 3.23301,-1.00332 5.21875,-1.28125 2.04965,-0.28689 3.1875,-0.3125 3.1875,-0.3125 -2e-5,0 -0.0727,-0.60697 1,-1.0625 0.7196,-0.30557 4.99098,-1.50075 7.0625,-2 2.00244,-0.48258 5.19849,-0.92829 7.0625,-0.40625 1.91078,0.53515 7.71875,2.5 7.71875,2.5 0,0 -6.42266,-2.42351 -7.25,-2.71875 -0.19784,-0.0706 -0.58216,-0.14039 -1.03125,-0.1875 1.1879,-0.72865 4.91527,-1.77408 7.59375,-2.5 2.94342,-0.79775 3.29208,-0.77083 5.3125,-0.90625 1.91289,-0.12823 2.94705,-0.0711 3.125,-0.0625 0.11728,-0.20366 0.39176,-0.77948 0.9375,-0.96875 0.73219,-0.25394 5.07852,-1.04789 7.1875,-1.375 1.74813,-0.27111 4.40088,-0.4847 6.3125,-0.0937 0.31766,0.065 0.60522,0.18551 0.875,0.28125 1.94074,0.68873 7.84375,3.09375 7.84375,3.09375 1e-5,0 -6.53471,-2.95077 -7.375,-3.3125 -0.20097,-0.0865 -0.57513,-0.16679 -1.03125,-0.25 1.2065,-0.63318 5.02956,-1.3956 7.75,-1.90625 2.98953,-0.56119 3.30023,-0.52954 5.34375,-0.53125 2.10926,-0.002 3.3125,0.125 3.3125,0.125 0,1e-5 -0.0727,-0.63119 1.03125,-0.9375 0.74052,-0.20547 5.12612,-0.83387 7.25,-1.0625 2.05302,-0.22099 5.31863,-0.25222 7.21875,0.46875 1.94779,0.73907 7.84375,3.375 7.84375,3.375 2e-5,0 -6.56288,-3.17897 -7.40625,-3.5625 -0.20168,-0.0917 -0.54221,-0.18621 -1,-0.28125 1.21092,-0.60188 4.98442,-1.24884 7.71875,-1.65625 3.0048,-0.44772 3.32551,-0.4517 5.375,-0.40625 1.94045,0.043 3.00699,0.19423 3.1875,0.21875 0.11892,-0.19316 0.3839,-0.76583 0.9375,-0.90625 0.74271,-0.18838 5.15429,-0.73428 7.28125,-0.9375 1.76303,-0.16842 4.42009,-0.23429 6.34375,0.25 0.31968,0.0805 0.60351,0.20359 0.875,0.3125 1.95293,0.78349 7.90625,3.46875 7.90625,3.46875 -2e-5,0 -6.59191,-3.25348 -7.4375,-3.65625 -0.20222,-0.0963 -0.57226,-0.20703 -1.03125,-0.3125 1.21414,-0.57427 5.04366,-1.12219 7.78125,-1.5 3.00838,-0.4152 3.32307,-0.44263 5.375,-0.375 2.11798,0.0698 3.3125,0.25 3.3125,0.25 -2e-5,0 -0.0772,-0.63741 1.03125,-0.90625 0.74362,-0.18035 5.15176,-0.66355 7.28125,-0.84375 2.05847,-0.17417 5.34324,-0.12432 7.25,0.65625 1.95459,0.80016 7.875,3.53125 7.875,3.53125 -2e-5,0 -6.55993,-3.30876 -7.40625,-3.71875 -0.20237,-0.0981 -0.57186,-0.2031 -1.03125,-0.3125 1.21517,-0.5639 5.01008,-1.1143 7.75,-1.46875 3.01091,-0.38952 3.32131,-0.39765 5.375,-0.3125 1.94439,0.0806 3.00663,0.25324 3.1875,0.28125 0.11916,-0.19086 0.38277,-0.74531 0.9375,-0.875 0.74426,-0.174 5.14993,-0.65047 7.28125,-0.8125 1.76662,-0.13427 4.44971,-0.12571 6.37501,0.375 0.32,0.0832 0.6033,0.20127 0.875,0.3125 1.9546,0.80016 7.9063,3.5625 7.9063,3.5625 -1e-4,0 -6.5912,-3.34001 -7.4375,-3.75 -0.2024,-0.0981 -0.5719,-0.20311 -1.0313,-0.3125 1.2151,-0.5639 5.0413,-1.08306 7.7813,-1.4375 3.0109,-0.38953 3.3525,-0.4289 5.4062,-0.34375 2.1197,0.0879 3.3125,0.3125 3.3125,0.3125 0,0 -0.078,-0.64902 1.0313,-0.90625 0.7443,-0.17256 5.1495,-0.62336 7.2812,-0.78125 2.0606,-0.1526 5.3429,-0.0968 7.25,0.6875 1.955,0.80395 7.875,3.5 7.875,3.5 0,0 -6.5598,-3.27587 -7.4062,-3.6875 -0.2025,-0.0984 -0.5718,-0.20222 -1.0313,-0.3125 1.2154,-0.56154 5.0119,-1.12778 7.75,-1.5 3.009,-0.40905 3.3227,-0.41558 5.375,-0.34375 1.9431,0.068 3.0072,0.16485 3.1875,0.1875 0.1188,-0.1944 0.3846,-0.72881 0.9375,-0.875 0.7418,-0.19612 5.1311,-0.82878 7.25,-1.09375 1.7564,-0.21961 4.4053,-0.33231 6.3125,0.0312 0.3169,0.0604 0.6058,0.18938 0.875,0.28125 1.9362,0.66092 7.8438,2.9375 7.8438,2.9375 -10e-5,0 -6.5367,-2.80655 -7.375,-3.15625 -0.2005,-0.0836 -0.5762,-0.17333 -1.0313,-0.25 1.2037,-0.65046 5.0191,-1.37195 7.7188,-2 2.9667,-0.6902 3.2889,-0.75507 5.3125,-0.875 2.0886,-0.1238 3.2812,-0.0312 3.2812,-0.0312 0,1e-5 -0.087,-0.63205 1,-1.03125 0.7292,-0.2678 5.0472,-1.33797 7.125,-1.8125 2.0085,-0.45869 5.1679,-1.0293 7,-0.625 1.8781,0.41446 13.5782,3.01563 13.5782,3.01563 0,0 -12.3275,-3.02266 -13.1407,-3.26563 -0.1945,-0.0581 -0.5586,-0.10626 -1,-0.125 1.1676,-0.80369 3.5142,-1.6873 6.1094,-2.70312 1.6814,-0.65818 0.9237,-0.37659 2.7759,-1.0036 1.7536,-0.59366 2.4854,-1.01071 2.6304,-1.11299 0.3461,-0.20651 -0.356,-0.12188 -0.5442,-0.0424 z"</div><div class='add'>+             id="path8173"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7285);enable-background:new"</div><div class='add'>+             d="m 1082.625,-275.125 c 1.873,0.39348 4.4961,1.14555 6.0313,1.96875 1.5352,0.82319 2.8222,1.056 5.375,2.5 2.5266,1.42926 4.7958,2.00696 6.9687,2.53125 2.3476,0.56642 5.4354,0.71523 8.8438,1.1875 -1.0889,-0.83975 -6.6074,-1.17245 -8.4063,-1.5625 -1.7989,-0.39006 -3.8941,-1.01616 -6.5937,-2.3125 -2.6997,-1.29634 -3.4944,-1.79896 -5.8125,-2.6875 -2.3182,-0.88854 -4.0044,-1.38314 -6.4063,-1.625 z"</div><div class='add'>+             id="path8175"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7289);enable-background:new"</div><div class='add'>+             d="m 1051.4688,-270 c 1.9053,0.57759 4.5281,1.61572 6.0937,2.59375 1.5656,0.97802 2.8802,1.35981 5.5,3.125 2.593,1.74716 4.9859,2.70927 7.25,3.59375 2.4461,0.95557 5.6826,1.65713 9.4063,3.0625 -1.1896,-1.13784 -7.0631,-2.68675 -8.9375,-3.375 -1.8745,-0.68825 -4.0818,-1.5662 -6.875,-3.28125 -2.7933,-1.71504 -3.5736,-2.2839 -5.9375,-3.40625 -2.3641,-1.12234 -4.0567,-1.83455 -6.5,-2.3125 z"</div><div class='add'>+             id="path8177"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7293);enable-background:new"</div><div class='add'>+             d="m 1020.2188,-266.84375 c 1.9119,0.63811 4.5812,1.75536 6.1562,2.8125 1.5751,1.05715 2.8956,1.50867 5.5313,3.40625 2.6086,1.87821 5.0284,3.03003 7.3125,4.0625 2.4677,1.11545 5.7645,2.1733 9.5312,3.84375 -1.2033,-1.22253 -7.2028,-3.31423 -9.0937,-4.125 -1.891,-0.81077 -4.0649,-1.89379 -6.875,-3.75 -2.8102,-1.8562 -3.6218,-2.47693 -6,-3.71875 -2.3783,-1.2418 -4.1107,-1.97569 -6.5625,-2.53125 z"</div><div class='add'>+             id="path8179"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             sodipodi:nodetypes="cssscscsscsssccscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssccscsscscssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsszsszssszzcczzzczzzc"</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7337);enable-background:new"</div><div class='add'>+             d="m 1110.1719,-266.89063 c 0.1508,0.0486 0.688,0.631 0.1094,1.48438 -0.8101,1.19459 -5.7049,3.32429 -8.5625,4.125 -2.8449,0.79712 -6.2901,0.97774 -10.5625,-0.375 -4.3016,-1.36195 -5.4697,-2.46872 -10.6563,-4.3125 4.664,2.11517 6.1953,3.95233 10.125,5.34375 1.6207,0.57387 3.3671,0.9396 5.0625,1.03125 -0.4451,0.32563 -1.5303,0.9833 -3.5625,1.59375 -2.7955,0.83969 -6.6491,1.53378 -8.25,1.625 -1.5146,0.0863 -3.142,-0.51249 -3.4375,-0.625 0.1667,0.10308 0.3732,0.37734 -0.25,1.03125 -0.8993,0.94363 -6.1474,1.923 -9.125,2.25 -2.9643,0.32555 -6.5216,-0.016 -10.9062,-1.90625 -3.978,-1.71497 -5.339,-2.91536 -9.4063,-4.75 0,0 0,0.15625 0,0.15625 3.6431,2.09529 5.284,3.88327 8.875,5.5625 1.7302,0.80909 3.5917,1.40876 5.4063,1.71875 -0.5349,0.28676 -1.5578,0.71151 -3.4375,1.03125 -2.869,0.48796 -6.809,0.81614 -8.4375,0.75 -0.8507,-0.0345 -1.7286,-0.18437 -2.4063,-0.40625 -0.6848,-0.21488 -1.1897,-0.44467 -1.3125,-0.5 0.1694,0.10721 0.4311,0.40288 -0.2187,1.03125 -0.9097,0.87962 -6.2461,1.33638 -9.25,1.46875 -2.9905,0.13179 -6.5889,-0.45063 -11,-2.5625 -4.4412,-2.12626 -5.6415,-3.4016 -10.9063,-5.78125 4.7343,2.59704 6.2865,4.6291 10.3438,6.71875 1.6733,0.86185 3.4852,1.49425 5.25,1.9375 -0.4633,0.23332 -1.5894,0.68814 -3.6875,0.9375 -2.8863,0.34298 -6.8346,0.49288 -8.4688,0.375 -1.5462,-0.1115 -3.2312,-0.85696 -3.5312,-1 0.1691,0.12029 0.4138,0.41048 -0.2188,1 -0.9128,0.85073 -6.2441,1.26212 -9.25,1.375 -2.9925,0.11237 -6.5897,-0.49043 -11,-2.59375 -4.00125,-1.90823 -5.38803,-3.13783 -9.46875,-5.09375 -3e-5,0 0,0.15625 0,0.15625 3.65506,2.20392 5.29421,4.05255 8.90625,5.90625 1.74029,0.89315 3.637,1.52827 5.4688,1.96875 -0.54,0.2483 -1.5781,0.61533 -3.4688,0.84375 -2.88568,0.34858 -6.86605,0.52095 -8.5,0.40625 -0.85345,-0.0599 -1.72631,-0.25791 -2.40625,-0.5 -0.6871,-0.2353 -1.18935,-0.47226 -1.3125,-0.53125 0.16998,0.11227 0.46448,0.42225 -0.1875,1.03125 -0.91265,0.8525 -6.27533,1.29337 -9.28125,1.40625 -2.99246,0.11237 -6.59346,-0.52805 -11,-2.59375 -4.43653,-2.07978 -5.64688,-3.33171 -10.90625,-5.65625 4.72938,2.54749 6.29074,4.5778 10.34375,6.625 1.67155,0.84433 3.48554,1.46643 5.25,1.90625 -0.46323,0.23422 -1.5897,0.68407 -3.6875,0.9375 -2.88569,0.34858 -6.8362,0.56952 -8.46875,0.46875 -1.54456,-0.0953 -3.20031,-0.82885 -3.5,-0.96875 0.16899,0.11853 0.38192,0.40385 -0.25,1 -0.91186,0.86028 -6.24665,1.33025 -9.25,1.46875 -2.98995,0.1379 -6.56745,-0.45068 -10.96875,-2.46875 -3.99308,-1.83089 -5.36511,-3.0292 -9.4375,-4.90625 -2e-5,0 0,0.15625 0,0.15625 3.64761,2.13327 5.27033,3.93487 8.875,5.71875 1.73675,0.85951 3.60727,1.45014 5.4375,1.875 -0.53947,0.2529 -1.55063,0.64129 -3.4375,0.90625 -2.87978,0.40436 -6.83813,0.64562 -8.46875,0.5625 -0.85172,-0.0434 -1.7277,-0.20855 -2.40625,-0.4375 -0.68569,-0.22201 -1.1896,-0.44339 -1.3125,-0.5 0.16959,0.10899 0.4319,0.40965 -0.21875,1.03125 -0.91079,0.87014 -6.25021,1.39152 -9.25,1.5625 -2.98633,0.17021 -6.57381,-0.31577 -10.96875,-2.28125 -4.42489,-1.97888 -5.60596,-3.22819 -10.84375,-5.375 4.70997,2.38767 6.27017,4.38873 10.3125,6.34375 1.66715,0.80631 3.46043,1.39658 5.21875,1.78125 -0.46163,0.2487 -1.597,0.71225 -3.6875,1.03125 -2.8756,0.43876 -6.7804,0.7331 -8.40625,0.6875 -1.53823,-0.0431 -3.2328,-0.74522 -3.53125,-0.875 0.16833,0.11282 0.41057,0.41375 -0.21875,1.03125 -0.90812,0.8911 -6.20295,1.52825 -9.1875,1.8125 -2.97118,0.28298 -6.57342,-0.1758 -10.9375,-1.9375 -3.95934,-1.59831 -5.32915,-2.79487 -9.34375,-4.3125 3e-5,0 0,0.15625 0,0.15625 3.5959,1.81135 5.23831,3.58233 8.8125,5.15625 1.72207,0.75835 3.58748,1.28895 5.40625,1.625 -0.53609,0.27908 -1.56658,0.68763 -3.4375,1.0625 -2.85539,0.5721 -6.78942,1.01939 -8.40625,1.03125 -0.84451,0.006 -1.70608,-0.0809 -2.375,-0.25 -0.67591,-0.16151 -1.16009,-0.32923 -1.28125,-0.375 0.16722,0.094 0.42267,0.38348 -0.21875,1.0625 -0.89787,0.95052 -6.18648,1.91708 -9.125,2.4375 -2.92534,0.51809 -6.43215,0.37424 -10.71875,-1.03125 -4.3158,-1.41507 -5.47277,-2.52994 -10.5625,-3.96875 4.57685,1.75101 6.08855,3.56006 10.03125,5 1.62608,0.59389 3.36885,0.95565 5.09375,1.15625 -0.45285,0.29702 -1.55478,0.88339 -3.59375,1.46875 -2.80472,0.80517 -6.63886,1.57583 -8.21875,1.75 -1.49475,0.1648 -3.11623,-0.31681 -3.40625,-0.40625 0.16356,0.0901 0.39278,0.35993 -0.21875,1.0625 -0.88247,1.01385 -6.04452,2.37165 -8.9375,3.0625 -2.88002,0.68778 -6.3356,0.76002 -10.5625,-0.4375 -3.83485,-1.08645 -5.17258,-2.07237 -9.0625,-3.125 -10e-6,0 0,0.15625 0,0.15625 3.48418,1.39485 5.06941,2.9194 8.53125,4.03125 1.66793,0.53572 3.45578,0.78674 5.21875,0.875 -0.51964,0.35212 -1.50039,0.91452 -3.3125,1.53125 -2.76566,0.94125 -6.59024,1.93537 -8.15625,2.15625 -0.81794,0.11539 -1.6331,0.12283 -2.28125,0.0312 -0.65496,-0.0832 -1.1326,-0.21827 -1.25,-0.25 0.16204,0.0746 0.43399,0.34044 -0.1875,1.09375 -0.87,1.05453 -6.00963,2.65925 -8.875,3.4375 -2.85253,0.77476 -6.25912,0.9582 -10.4375,-0.0937 -4.20683,-1.05913 -5.35669,-2.04166 -10.34375,-3.15625 4.48454,1.45946 5.96935,3.13523 9.8125,4.25 1.58504,0.45977 3.28679,0.63825 4.96875,0.6875 -0.44157,0.33676 -1.51251,1.02773 -3.5,1.78125 -2.73393,1.03649 -6.45198,2.16269 -8,2.4375 -1.46462,0.26002 -3.05958,-0.11654 -3.34375,-0.1875 0.16025,0.0796 0.38044,0.32098 -0.21875,1.0625 -0.86466,1.07006 -5.91652,2.81815 -8.75,3.6875 -2.8208,0.86547 -6.2075,1.15631 -10.34375,0.21875 -3.75259,-0.85061 -5.04785,-1.71647 -8.875,-2.59375 0,0 0,0.15625 0,0.15625 3.42796,1.23779 4.98741,2.6323 8.375,3.53125 1.63216,0.43314 3.36704,0.58301 5.09375,0.5625 -0.50893,0.38417 -1.47675,1.02182 -3.25,1.75 -2.70634,1.11134 -6.43633,2.30781 -7.96875,2.625 -0.8004,0.16569 -1.61231,0.21862 -2.25,0.15625 0,0 0,0.51552 0,0.92229 0,0.26507 0,0.48396 0,0.48396 0.22645,-0.14468 0.44891,-0.27261 0.71875,-0.375 1.08052,-0.40998 2.17161,-0.21577 6,-1.6875 3.82843,-1.47174 5.22412,-2.00498 5.90625,-2.40625 0.6796,-0.39978 1.61165,-0.87937 2.21875,-1.53125 1.82685,-0.13775 3.57075,-0.49323 4.9375,-1 2.96812,-1.10052 4.87537,-1.80619 6.78125,-2.46875 1.90586,-0.66254 2.35409,-1.41487 3.40625,-1.78125 1.09155,-0.38011 2.19511,-0.16538 6.0625,-1.53125 3.86745,-1.36586 5.28316,-1.82708 5.96875,-2.21875 0.70109,-0.40052 1.70081,-0.93298 2.3125,-1.59375 1.9708,-0.0547 3.81685,-0.38463 5.28125,-0.875 3.00148,-1.00508 4.92615,-1.62171 6.84375,-2.25 1.5386,-0.5041 2.17402,-1.04677 2.90625,-1.4375 0.23016,-0.13431 0.47574,-0.25373 0.75,-0.34375 1.09823,-0.36048 2.18145,-0.0814 6.09375,-1.3125 3.91233,-1.23113 5.36605,-1.67295 6.0625,-2.03125 0.69388,-0.35697 1.63015,-0.79261 2.25,-1.40625 1.86521,-0.0227 3.63581,-0.26683 5.03125,-0.6875 3.03043,-0.91354 4.99238,-1.4301 6.9375,-1.96875 1.94511,-0.53864 2.42618,-1.26452 3.5,-1.5625 1.11401,-0.30915 2.21994,0.007 6.1875,-1.03125 3.96761,-1.03863 5.41758,-1.43273 6.125,-1.75 0.73487,-0.32959 1.81383,-0.75372 2.4375,-1.375 1.99774,0.116 3.85743,-0.0201 5.34375,-0.375 3.07811,-0.735 5.08344,-1.10094 7.0625,-1.5 1.58792,-0.32018 2.24429,-0.79055 3,-1.09375 0.23757,-0.1068 0.46695,-0.19276 0.75,-0.25 1.13347,-0.22919 2.30448,0.20893 6.34375,-0.5 4.03933,-0.70893 5.50025,-0.92709 6.21875,-1.1875 0.71586,-0.25944 1.70428,-0.56724 2.34375,-1.09375 1.92427,0.23949 3.74788,0.22453 5.1875,0 3.12633,-0.48762 5.15455,-0.70067 7.15625,-0.96875 2.00171,-0.26807 2.48869,-0.94514 3.59375,-1.09375 1.14639,-0.15418 2.27592,0.30157 6.34375,-0.21875 4.06784,-0.52032 5.56013,-0.69573 6.28125,-0.9375 0.7371,-0.24714 1.79809,-0.58623 2.4375,-1.125 2.05007,0.33553 3.97378,0.39796 5.5,0.21875 3.14231,-0.36896 5.17994,-0.55936 7.1875,-0.78125 1.61076,-0.17802 2.26467,-0.6082 3.03125,-0.84375 0.24094,-0.0855 0.49412,-0.1556 0.78125,-0.1875 1.14978,-0.12772 2.30129,0.34665 6.375,-0.125 4.07374,-0.47165 5.55909,-0.6106 6.28125,-0.84375 0.71946,-0.23227 1.70024,-0.47346 2.34375,-0.96875 1.93637,0.33346 3.77006,0.40424 5.21875,0.25 3.14602,-0.33495 5.17756,-0.51859 7.1875,-0.71875 2.00996,-0.20014 2.48414,-0.82639 3.59375,-0.9375 1.15114,-0.11528 2.29643,0.36506 6.375,-0.0625 4.07861,-0.42756 5.58886,-0.56209 6.3125,-0.78125 0.73915,-0.22386 1.79572,-0.51325 2.4375,-1.03125 2.0571,0.39867 4.00187,0.4934 5.53125,0.34375 3.14873,-0.3081 5.17584,-0.47325 7.1875,-0.65625 1.61407,-0.14682 2.2631,-0.56055 3.03125,-0.78125 0.24142,-0.0809 0.49353,-0.12991 0.78125,-0.15625 1.15211,-0.10545 2.29296,0.39275 6.375,0 4.08208,-0.39275 5.5889,-0.53084 6.3125,-0.75 0.7209,-0.21833 1.6997,-0.4477 2.3438,-0.9375 1.938,0.34999 3.7688,0.45438 5.2187,0.3125 3.1487,-0.3081 5.1758,-0.47325 7.1875,-0.65625 2.0116,-0.18299 2.5142,-0.83802 3.625,-0.9375 1.1523,-0.10323 2.2922,0.38483 6.375,0 4.0829,-0.38482 5.5887,-0.501 6.3125,-0.71875 0.7393,-0.22243 1.7956,-0.51449 2.4375,-1.03125 2.0574,0.40177 4.0029,0.50333 5.5313,0.34375 3.1466,-0.32852 5.1771,-0.5227 7.1875,-0.71875 1.613,-0.15729 2.2656,-0.63148 3.0312,-0.875 0.2407,-0.088 0.4632,-0.12137 0.75,-0.15625 1.1483,-0.1397 2.3167,0.33991 6.375,-0.25 4.0583,-0.58992 5.5618,-0.77714 6.2813,-1.03125 0.7167,-0.25316 1.6745,-0.55807 2.3125,-1.09375 1.9197,0.21194 3.7199,0.15141 5.1562,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0938,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5625,-1.28125 1.1288,-0.25066 2.2703,0.11629 6.25,-0.875 3.9796,-0.99128 5.4296,-1.4193 6.125,-1.78125 0.7223,-0.37601 1.7619,-0.87058 2.375,-1.53125 1.963,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.14461 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70653 2.3348,-1.68641 2.5469,-1.98438 0.2122,-0.29796 0.1118,-0.7453 0.1379,-0.76675 0.043,-0.0352 0.3193,-0.085 0.479,-0.42844 0.8589,-1.84708 2.321,-5.64459 2.4352,-6.32945 0.1137,-0.68216 0.1638,-1.34774 0.2145,-1.74497 0.029,-0.22952 -0.1467,-0.86544 -0.1246,-0.92404 0.031,-0.0821 0.3045,-0.26528 0.3599,-0.51471 0.2663,-1.19833 0.089,-2.19129 -0.1251,-3.60893 -0.214,-1.41764 -0.9837,-4.62214 -1.6369,-5.47626 -0.6589,-0.86172 -1.2229,-1.01117 -1.7479,-1.00066 -0.2086,0.26976 0.1368,0.26309 0.1626,0.31261 0.6806,0.0508 0.934,0.36864 1.4192,0.89662 0.4852,0.52798 1.2218,3.85117 1.3584,5.30156 0.1366,1.45039 0.19,2.8602 -0.088,3.46864 -0.2781,0.60845 -0.7232,0.51703 -1.0156,0.58291 0.531,0.18589 0.6698,0.12483 0.7314,0.96929 0.059,0.81338 -0.1332,1.63969 -0.5198,2.80562 -0.3912,1.18001 -1.8452,4.34998 -2.2857,4.59877 -0.4523,0.25551 -0.7314,0.27038 -1.067,0.13944 z"</div><div class='add'>+             id="path8181"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7297);enable-background:new"</div><div class='add'>+             d="m 988.75,-263.84375 c 1.91161,0.6344 4.55027,1.75841 6.125,2.8125 1.57477,1.05409 2.8961,1.48252 5.5313,3.375 2.6082,1.87314 5.0269,3.01522 7.3125,4.0625 2.4693,1.13147 5.7521,2.15474 9.5312,3.9375 -1.2072,-1.2584 -7.139,-3.36445 -9.0312,-4.1875 -1.8922,-0.82304 -4.128,-1.93049 -6.9375,-3.78125 -2.80961,-1.85075 -3.62224,-2.48154 -6.00005,-3.71875 -2.37782,-1.23719 -4.07988,-1.9492 -6.53125,-2.5 z"</div><div class='add'>+             id="path8183"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7301);enable-background:new"</div><div class='add'>+             d="m 957.5,-260.78125 c 1.91,0.6181 4.58288,1.70934 6.15625,2.75 1.57339,1.04066 2.89608,1.48252 5.53125,3.375 2.60823,1.87315 5.02692,3.01521 7.3125,4.0625 2.46931,1.13147 5.75213,2.15475 9.53125,3.9375 -1.20728,-1.2584 -7.20154,-3.3957 -9.09375,-4.21875 -1.89217,-0.82304 -4.09666,-1.9305 -6.90625,-3.78125 -2.80958,-1.85075 -3.59295,-2.43932 -5.96875,-3.65625 -2.37578,-1.21691 -4.11321,-1.93885 -6.5625,-2.46875 z"</div><div class='add'>+             id="path8185"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7305);enable-background:new"</div><div class='add'>+             d="m 926.09375,-257.375 c 1.90772,0.59745 4.55348,1.66384 6.125,2.6875 1.5715,1.02365 2.87022,1.43971 5.5,3.28125 2.60291,1.82273 5.02887,2.9722 7.3125,4 2.4672,1.11041 5.75535,2.09323 9.53125,3.84375 -1.20623,-1.2481 -7.1719,-3.31809 -9.0625,-4.125 -1.89058,-0.8069 -4.10242,-1.89104 -6.90625,-3.6875 -2.80385,-1.79644 -3.62704,-2.40251 -6,-3.59375 -2.37297,-1.19124 -4.05362,-1.90283 -6.5,-2.40625 z"</div><div class='add'>+             id="path8187"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7309);enable-background:new"</div><div class='add'>+             d="m 894.90625,-253.5625 c 1.90213,0.55355 4.58701,1.58887 6.15625,2.59375 1.56923,1.00487 2.87401,1.40864 5.5,3.21875 2.59912,1.79164 5.00034,2.87189 7.28125,3.875 2.46428,1.08374 5.75984,2.04029 9.53125,3.75 -1.2048,-1.23507 -7.17416,-3.24478 -9.0625,-4.03125 -1.88832,-0.78647 -4.0752,-1.8308 -6.875,-3.59375 -2.79977,-1.76294 -3.59919,-2.36836 -5.96875,-3.53125 -2.36957,-1.16288 -4.12325,-1.83412 -6.5625,-2.28125 z"</div><div class='add'>+             id="path8189"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7313);enable-background:new"</div><div class='add'>+             d="m 863.71875,-248.65625 c 1.88062,0.42909 4.50427,1.38038 6.0625,2.3125 1.55823,0.93211 2.85233,1.25776 5.46875,3 2.58971,1.72444 4.98067,2.70802 7.25,3.625 2.45176,0.99069 5.73959,1.87707 9.5,3.5 -1.20131,-1.20734 -7.15249,-3.06609 -9.03125,-3.78125 -1.87875,-0.71517 -4.0854,-1.68442 -6.875,-3.375 -2.78963,-1.69057 -3.58461,-2.22822 -5.9375,-3.28125 -2.35292,-1.05301 -4.02584,-1.71248 -6.4375,-2 z"</div><div class='add'>+             id="path8191"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7317);enable-background:new"</div><div class='add'>+             d="m 833.15625,-241.375 c 1.84836,0.29644 4.46945,0.97632 6,1.78125 1.53058,0.80493 2.81374,1.05573 5.375,2.53125 2.53504,1.46046 4.89068,2.32509 7.125,3.0625 2.41399,0.79668 5.65711,1.46689 9.375,2.84375 -1.18771,-1.12873 -7.08772,-2.58975 -8.9375,-3.15625 -1.84977,-0.5665 -4.00342,-1.37392 -6.75,-2.84375 -2.74657,-1.46983 -3.50136,-1.92028 -5.8125,-2.78125 -2.31115,-0.86095 -4.00471,-1.32009 -6.375,-1.4375 z"</div><div class='add'>+             id="path8193"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7321);enable-background:new"</div><div class='add'>+             d="m 802.90625,-232.3125 c 1.8222,0.21127 4.36576,0.80057 5.875,1.53125 1.50925,0.73066 2.75568,0.92998 5.28125,2.28125 2.49976,1.33746 4.83154,2.04843 7.03125,2.65625 2.37653,0.65667 5.56464,1.07288 9.21875,2.1875 -1.16735,-1.04496 -6.92888,-2.10329 -8.75,-2.5625 -1.82111,-0.45921 -3.95225,-1.12696 -6.65625,-2.4375 -2.70403,-1.31052 -3.47106,-1.7199 -5.75,-2.46875 -2.27895,-0.74883 -3.91325,-1.17931 -6.25,-1.1875 z"</div><div class='add'>+             id="path8195"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7329);enable-background:new"</div><div class='add'>+             d="m 773.1875,-222.1875 c 1.81109,0.1787 4.32059,0.66506 5.8125,1.34375 1.49194,0.67869 2.7534,0.79822 5.25,2.0625 2.47107,1.25138 4.79005,1.89614 6.96875,2.4375 2.35387,0.58488 5.49134,0.89752 9.09375,1.84375 -1.15084,-0.99116 -6.85251,-1.7833 -8.65625,-2.1875 -1.80372,-0.4042 -3.91553,-1.02116 -6.59375,-2.25 -2.67818,-1.22884 -3.40345,-1.61089 -5.65625,-2.28125 -2.25279,-0.67034 -3.89627,-1.00232 -6.21875,-0.96875 z"</div><div class='add'>+             id="path8197"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7325);enable-background:new"</div><div class='add'>+             d="m 743.5625,-211.1875 c 1.79281,0.12911 4.27313,0.54965 5.75,1.1875 1.4769,0.63785 2.7161,0.74156 5.1875,1.9375 2.44618,1.18372 4.72054,1.74666 6.875,2.21875 2.32767,0.51003 5.4196,0.68064 9,1.5625 -1.14379,-0.9706 -6.74759,-1.59065 -8.53125,-1.9375 -1.78367,-0.34684 -3.88285,-0.88756 -6.53125,-2.03125 -2.64841,-1.14368 -3.39495,-1.51631 -5.625,-2.125 -2.23008,-0.60868 -3.82594,-0.90966 -6.125,-0.8125 z"</div><div class='add'>+             id="path8199"</div><div class='add'>+             inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="ccccccccc"</div><div class='add'>+         id="path8201"</div><div class='add'>+         d="m 863.87812,475.6679 c 1.64212,-3.218 3.51781,-5.73529 4.86136,-9.84898 0.79872,-3.65789 3.31204,-2.03073 7.26047,-8.3969 1.40193,-2.2395 5.47653,0.39136 8.9651,-2.39911 1.27072,-0.80319 2.88488,-0.40431 4.48256,-0.0631 3.76539,1.31896 5.82576,3.70355 8.33376,5.80837 6.13906,5.97023 20.53414,7.94327 23.48604,6.31346 1.43405,-2.90474 7.88128,-5.40888 12.37437,-11.11168 0.74811,-1.12267 11.72936,-8.74446 14.64721,-6.56599"</div><div class='add'>+         style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="ccccccccccc"</div><div class='add'>+         id="path8203"</div><div class='add'>+         d="m 888.50059,465.25071 c 7.36341,-3.23297 13.8109,-8.9084 20.70813,-13.38452 3.31057,-1.96954 6.86983,3.21601 10.796,3.59866 2.29773,-0.21813 3.7129,1.20259 5.68211,1.6415 5.15636,1.31779 2.39793,3.86488 9.97526,6.43972 6.15561,1.7204 8.9074,-6.79847 14.89975,-7.3236 4.87739,-0.50299 8.09892,-0.31603 11.61675,-0.25254 3.92696,0.13889 4.07855,-3.4976 6.06092,-5.3033 2.98056,-2.80522 7.15561,-1.84972 10.14485,-4.7409 1.01754,-1.38468 1.95458,-3.01085 2.73459,-5.10809 0.88201,-2.00034 3.04006,0.30598 4.79823,1.26269"</div><div class='add'>+         style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path8994"</div><div class='add'>+         d="m 403.27922,1056.3058 56.56854,-42.4264 72.12489,14.1421 -46.66904,52.3259 -53.74012,7.0711 -28.28427,-31.1127 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9048);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path4189"</div><div class='add'>+         d="m 542.27183,1060.5719 c -1.40727,18.8012 -1.1449,32.751 2.08174,49.3033 3.22666,16.5523 16.40609,45.9073 20.33441,63.1837 3.92621,17.2671 2.69413,38.3097 -12.45944,51.1483 -15.31761,12.9774 -42.05128,21.5989 -67.83231,15.7337 -25.78105,-5.8652 -69.54907,-49.2234 -88.59019,-70.2283 -19.11214,-21.0833 -63.76086,-93.8506 -77.93853,-124.2758 -14.17767,-30.4251 -12.65961,-36.7186 -8.11972,-45.52972 -9.36672,-24.5205 -12.41371,-50.06681 -33.71245,-75.57664 30.32547,3.11444 43.88028,26.95633 60.12568,47.13975 -5.52989,-48.07603 -18.05471,-64.4165 -28.37395,-90.7243 29.9943,6.08165 50.57936,31.87239 63.97979,72.7125 9.55415,-3.91791 18.23776,-9.37294 30.18741,-9.0612 -11.2975,-41.6958 -17.94946,-69.91584 -36.68725,-101.06994 53.44196,5.67033 83.65702,80.63932 78.97142,87.9608 9.97797,-2.24399 19.00565,-6.53038 30.43653,-5.65167 -11.24897,-38.34702 -21.04781,-76.8679 -3.65971,-118.64819 0,0 48.28678,65.43688 54.38966,85.80578 6.10287,20.3689 1.51881,38.70051 1.51881,38.70051 0,0 16.95957,31.0853 20.29392,51.09414 3.3731,20.24138 -3.53269,59.10328 -4.94582,77.98328 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,995.28646,23.53493)"</div><div class='add'>+         clip-path="url(#clipPath3631)"</div><div class='add'>+         sodipodi:nodetypes="cccccccccccccccccccccc"</div><div class='add'>+         id="path4191"</div><div class='add'>+         d="m 719.5,738.69519 18.31177,15.43196 44.41103,-15.38821 23.2772,-25.54375 11.46397,19.22065 30.67161,12.78354 25.09737,5.72837 L 892,723.19519 908.02309,747.02126 947,752.19519 l 10.24541,-6.19852 6.75471,8.6982 25.49988,11.00032 2,-40.5 L 955.94866,710.6576 923.45591,689.1305 883.0038,677.66492 861.69668,662.13148 840,685.19519 755.02878,638.61208 722,676.69519 l -2.5,62 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter3587);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,822.28931,10.93589)"</div><div class='add'>+         sodipodi:nodetypes="ccssscsssssssssssssccccscccccccccsscccccccccccssscccccccccccccccsccccssssssssssssscccsssc"</div><div class='add'>+         clip-path="url(#clipPath3677)"</div><div class='add'>+         id="path4193"</div><div class='add'>+         d="m 584,696.5 -6.5625,17.15625 c 0,0 -7.81152,20.36488 -15.6875,43.65625 -3.93799,11.64568 -7.88302,24.04145 -10.9375,35.125 -3.05448,11.08355 -5.33586,20.37986 -5.5,28.28125 -0.39807,19.16196 5.74653,34.8883 8.9375,41.75 -0.77153,3.55523 -1.99137,9.45432 -3.34375,18.09375 -1.92042,12.26821 -3.71827,27.15441 -2.375,39.875 1.38209,13.08835 6.81222,28.18765 12.59375,43.03125 5.78153,14.8436 12.05435,29.22711 15.21875,38.03125 6.63206,18.4519 9.99296,31.5763 11.3125,48.5 0.58135,7.4561 -0.24227,20.336 -1.25,33.375 -1.00773,13.039 -2.18661,26.3014 -1.6875,36.9688 0.98911,21.1398 9.32798,46.8347 33.375,57.9374 22.77483,10.5154 55.32682,11.7022 83.4375,-3.4374 16.15992,-8.7034 30.07634,-27.0976 43.375,-46.9063 13.29866,-19.8087 24.96917,-41.0534 31.9375,-54.9063 15.35292,-30.5212 39.39353,-115.46418 45.625,-152.7187 3.01859,-18.04653 3.92166,-29.06555 2.625,-38.03125 -0.97853,-6.76604 -3.82819,-12.1474 -6.875,-16.21875 2.04274,-27.50791 -0.73207,-51.36878 11.96875,-79.40625 L 840.75,763.375 l -23.8125,9.3125 c -17.48975,6.83753 -28.90164,19.04536 -36.59375,32.0625 -0.32251,0.54577 -0.56314,1.10776 -0.875,1.65625 0.22203,-22.51521 4.40784,-37.63759 6.59375,-58.6875 l 1.96875,-19 L 771,737.375 c -30.59449,15.55571 -45.69489,48.19321 -49.71875,90.21875 -4.24532,-0.62547 -8.8314,-1.01965 -13.8125,-0.84375 -0.29149,-39.18036 -0.39629,-67.03685 8.59375,-99.375 l 5.59375,-20.125 -19.4375,7.65625 c -30.90937,12.20394 -47.85954,41.93073 -56.625,68.375 -4.38273,13.22214 -6.74582,25.80121 -7.59375,35.9375 -0.23203,2.77373 -0.31106,5.31132 -0.3125,7.71875 -3.24187,-0.0364 -6.42052,0.13589 -10.0625,0.5 0.0416,-39.00473 -3.48424,-79.75415 -32.28125,-116.5 L 584,696.5 Z m 5.8125,43.8125 c 16.80691,30.64383 17.47451,63.96728 16.9375,99.75 l -0.21875,15.0625 12.03493,-6.53921 c 8.66205,-3.13302 19.56058,-0.22752 31.93382,-0.83579 l 14.67465,9.3566 -6.3309,-25.7941 c -0.0897,-0.22997 -0.22046,-0.41669 -0.25,-0.71875 -0.19951,-2.03986 -0.22232,-5.47307 0.125,-9.625 0.69464,-8.30386 2.78957,-19.58524 6.625,-31.15625 5.15532,-15.55294 13.48801,-31.19248 25.125,-42.53125 -4.68381,28.63798 -3.21559,60.25934 -3.01164,95.80514 l -2.76593,13.26164 15.49632,-7.59803 c 9.0294,-2.75771 17.18897,-0.34996 29.28125,1.09375 l 13.24632,9.44423 L 741.09375,840 c 1.44793,-30.97177 8.22149,-53.67808 20.71875,-68.875 -2.98688,19.77884 -5.43043,41.7848 0.3125,78.34375 l 1.06552,6.37318 -2.93815,11.51685 10.61711,-8.16818 9.18973,10.22198 -1.54828,-10.4636 L 781.9375,852 c 5.70102,-13.21149 10.17282,-26.21337 16.34375,-36.65625 0.95986,-1.62434 2.03153,-3.06436 3.0625,-4.5625 -3.68066,21.15535 -2.42716,40.20815 -4.09375,57.78125 l -4.68014,7.80698 7.39889,0.22427 c 3.22005,3.48361 3.8675,3.85068 4.5625,8.65625 0.695,4.80557 0.31862,14.40035 -2.5625,31.625 -5.56799,33.28792 -31.84562,77.83981 -43.7404,101.4864 -6.60491,13.1304 -18.52833,57.4859 -31.12335,76.2465 -12.59502,18.7605 -28.53137,39.7673 -37.17204,44.4209 -21.49052,11.5742 -44.55594,25.5059 -60.61889,18.0895 -14.37486,-6.637 -23.03969,-21.1927 -23.81407,-37.7433 -0.38311,-8.188 0.61279,-21.3092 1.625,-34.4062 1.01221,-13.0971 11.28891,-22.5708 15.42339,-36.5626 5.37229,-18.1808 -1.44687,-36.5944 -12.5,-53.93745 -6.48655,-10.17778 -23.9768,-24.2579 -29.54839,-38.5625 -5.57159,-14.3046 -10.36751,-29.00315 -11.28125,-37.65625 -0.92621,-8.77113 0.4225,-23.02502 2.21875,-34.5 1.79625,-11.47497 3.84375,-20.28125 3.84375,-20.28125 l 9.42278,-3.6152 -10.48528,-3.8848 c 0,0 -8.49889,-15.3101 -8.09375,-34.8125 0.0711,-3.42316 1.83626,-12.72805 4.71875,-23.1875 2.88249,-10.45945 6.76466,-22.55271 10.625,-33.96875 3.04439,-9.00308 5.78063,-16.60345 8.34375,-23.6875 z"</div><div class='add'>+         style="display:inline;opacity:0.58775509;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3898);enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath3622)"</div><div class='add'>+         id="g3617"</div><div class='add'>+         style="display:inline;enable-background:new"&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9024);enable-background:accumulate"</div><div class='add'>+           d="m -15.66751,843.48852 -49.49748,-15.55635 -26.87005,52.3259 41.01219,45.25484 49.49747,-38.18377 -14.14213,-43.84062 z"</div><div class='add'>+           id="path4195"</div><div class='add'>+           transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,-52.200498,74.09707)"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9020);enable-background:accumulate"</div><div class='add'>+           d="m 118.70648,859.93048 -55.154328,-46.66904 -43.84062,36.76955 33.94113,53.74011 -13.596814,85.46203 -39.44536579,28.29217 -41.01220021,11.3137 -2.82842,46.669 56.56854,25.4559 18.943987,-69.65 23.45655,-58.85663 46.347541,-72.61491 16.62,-39.91188 z"</div><div class='add'>+           id="path4197"</div><div class='add'>+           transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,-46.92842,75.511284)"</div><div class='add'>+           sodipodi:nodetypes="ccccccccccccc"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,229.07158,211.51128)"</div><div class='add'>+         id="path4199"</div><div class='add'>+         d="m -70.82184,932.58397 60.81118,-26.87005 100.40916,31.1127 -63.63961,31.11269 -82.02438,-16.97056 -15.55635,-18.38478 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9044);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,822.28931,10.93589)"</div><div class='add'>+         clip-path="url(#clipPath4177)"</div><div class='add'>+         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccczzzcccccc"</div><div class='add'>+         id="path4201"</div><div class='add'>+         d="m 583.0625,715.75 c -12.10609,34.44974 -26.7145,68.53333 -31.75,104.84375 -0.83208,14.92867 4.58915,29.15943 8.84375,43.0625 -5.91624,27.20126 -10.13681,56.89995 1.15625,83.125 13.51717,38.16085 35.00147,75.68215 32.42279,117.46825 -0.9483,29.2942 -9.01444,60.9941 5.38971,88.2817 10.19864,19.3348 33.13956,27.3117 53.96785,27.6676 27.86219,1.1741 56.46261,-11.6216 72.0009,-35.2613 22.59549,-29.3717 41.80051,-61.4973 55.23865,-96.0598 16.89053,-45.506 29.6718,-92.56072 37.93402,-140.3989 1.8244,-12.94106 3.10108,-27.46985 -4.57892,-38.82255 -3.43115,-7.33632 0.0421,-15.56014 -0.68457,-23.30977 0.674,-24.99466 4.01232,-50.66376 16.65332,-72.59648 -17.73313,6.4446 -35.07268,16.55971 -44.00307,33.86425 -3.93508,6.70955 -7.60482,13.57413 -11.37193,20.38575 -3.54999,-30.01408 3.71963,-59.64828 6.78125,-89.28125 -20.16604,9.05463 -36.87672,25.65522 -44.17495,46.682 -6.30463,15.58003 -8.80222,32.31718 -10.26255,49.03675 -8.25334,-1.51925 -16.68447,-2.10155 -25.0625,-1.5 -0.96308,-38.69787 -0.46696,-79.40715 10.96875,-115.90625 -18.68113,6.21776 -35.16621,18.73551 -45.62803,35.38723 -13.85254,20.87979 -21.2614,45.75395 -23.05947,70.61277 0.58534,4.32454 -0.0613,11.84009 -6.34375,9.875 -5.33118,0.0176 -10.62908,0.67883 -15.9375,1.09375 1.14784,-39.38148 -3.34144,-81.6282 -27.0625,-114.21875 -3.06071,-3.63717 -5.63685,-7.68438 -8.625,-11.34375 -0.9375,2.4375 -1.875,4.875 -2.8125,7.3125 z m 7.75,13.84375 c 18.56527,29.29629 22.4825,64.82012 22.125,98.875 0.20409,5.17526 -0.51656,11.8292 0.125,16.0625 12.31856,-6.10275 26.73912,-2.4399 39.78125,-2.1875 2.31712,1.22325 3.1921,1.65243 1.90625,-1.40625 -4.16455,-13.95285 -1.84828,-28.613 1.80504,-42.40764 6.36687,-26.29064 20.62828,-51.08798 42.81996,-67.02986 -8.61709,37.23706 -5.71658,76.56161 -6.09375,113.96875 12.25344,-6.9099 27.27879,-3.44613 40.03125,-0.25 3.39222,3.5348 2.28935,-0.72948 2.1875,-3.8125 -0.48309,-21.37058 4.13133,-43.06963 13.6875,-62.15625 5.96266,-10.68727 14.24338,-19.80379 22.4375,-28.875 -7.87156,33.8381 -9.2029,69.33593 -2.71875,103.5 1.72485,-1.41118 4.60681,-0.45414 5.65625,-0.375 9.68369,-21.23682 16.35112,-45.38062 34.89016,-60.74185 1.87329,-0.37122 -1.44818,8.52495 -1.48391,11.8981 -3.53488,21.84581 -7.17516,44.14234 -8.78421,66.21911 -8.78379,2.34171 2.84835,2.32354 3.46875,4.0625 7.92311,10.5658 4.66299,24.40472 3.63165,36.35334 -7.06405,45.03355 -22.14231,87.36194 -35.95355,130.6798 -12.07476,32.9493 -27.3742,58.8525 -47.88808,87.2015 -10.95257,13.5514 -23.24472,27.8513 -40.84375,32.5 -20.15601,6.2413 -44.20676,10.8769 -62.59956,0.046 -17.28966,-12.3414 -21.02393,-35.7089 -19.26226,-55.6864 0.0488,-15.8262 4.93886,-28.5121 4.4106,-43.4918 -0.53824,-15.2629 -2.29135,-30.5647 -6.54261,-46.8663 -4.25126,-16.30162 -9.04325,-24.91794 -16.11906,-41.57338 -7.24111,-17.04456 -15.07015,-36.74863 -18.20542,-56.28842 -1.74948,-18.62714 2.89171,-37.12262 5.78125,-55.25 3.29623,-2.83696 -1.59799,-5.19659 -2.3125,-8.1875 -7.60113,-17.01508 -8.40747,-36.7749 -2.74234,-54.55998 7.1302,-25.0723 15.76087,-49.63241 24.67984,-74.12752 0.70833,1.30208 1.41667,2.60417 2.125,3.90625 z"</div><div class='add'>+         style="display:inline;opacity:0.58775509;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4105);enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,995.28646,23.53493)"</div><div class='add'>+         clip-path="url(#clipPath3631)"</div><div class='add'>+         sodipodi:nodetypes="cccccccc"</div><div class='add'>+         id="path4203"</div><div class='add'>+         d="m 735.05635,733.03834 2.75542,21.08881 44.41103,-15.38821 4.85063,-22.38975 -3.93617,-22.05222 -22.45163,-36.59301 -8.28004,30.30494 -17.34924,45.02944 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4130);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,995.28646,23.53493)"</div><div class='add'>+         clip-path="url(#clipPath3631)"</div><div class='add'>+         sodipodi:nodetypes="cccccccc"</div><div class='add'>+         id="path4205"</div><div class='add'>+         d="m 831.81321,730.29452 15.82237,14.90486 20.85473,2.89994 -1.59029,-39.92598 8.32561,-30.50842 -7.16499,-6.34106 -21.69669,20.9424 -14.55074,38.02826 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4141);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath8338)"</div><div class='add'>+         style="display:inline;filter:url(#filter8333);enable-background:new"</div><div class='add'>+         id="g8317"&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 964.00012,754.69487 18.42881,7.46479 9.07107,-36.96447 -14.87031,4.83886 -12.62957,24.66082 z"</div><div class='add'>+           id="path4209"</div><div class='add'>+           sodipodi:nodetypes="ccccc"</div><div class='add'>+           clip-path="none"</div><div class='add'>+           transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,719.28646,-112.46507)"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;rect</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="rect8315"</div><div class='add'>+           width="182"</div><div class='add'>+           height="177"</div><div class='add'>+           x="-55"</div><div class='add'>+           y="757.19519" /&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath8359)"</div><div class='add'>+         style="display:inline;filter:url(#filter8354);enable-background:new"</div><div class='add'>+         id="g8346"&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 910.14441,746.31415 32.61295,5.17393 -0.36119,-23.87619 7.18853,-29.68221 -8.45112,-5.26365 -21.82194,26.51077 -9.16723,27.13735 z"</div><div class='add'>+           id="path4207"</div><div class='add'>+           sodipodi:nodetypes="ccccccc"</div><div class='add'>+           clip-path="none"</div><div class='add'>+           transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,719.28646,-112.46507)"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;rect</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="rect8344"</div><div class='add'>+           width="165"</div><div class='add'>+           height="176"</div><div class='add'>+           x="-22"</div><div class='add'>+           y="696.19519" /&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="czzzzzzcccccccccczczz"</div><div class='add'>+         id="path8848"</div><div class='add'>+         d="m 1036.164,1071.8338 c 6.7941,18.9028 10.4937,33.2997 11.8903,51.2119 1.3966,17.9123 -3.7827,51.8008 -2.9005,70.6561 0.8818,18.8452 8.1337,40.099 27.3446,48.9689 19.4189,8.9658 49.3193,10.2113 74.1199,-3.1456 24.8006,-13.357 57.401,-70.3255 70.9742,-97.3087 13.6239,-27.0839 38.7611,-114.4974 44.6608,-149.76859 5.8998,-35.27121 2.5506,-41.30077 -4.6174,-49.05549 2.6403,-27.84015 -1.4998,-54.93543 13.1096,-87.18618 -30.249,11.8257 -37.3823,40.1607 -48.3189,65.50508 -8.0009,-50.93293 0.2092,-71.27319 3.3189,-101.21936 -29.0647,14.77791 -42.8615,47.11402 -45,92.85714 -10.9239,-1.3042 -21.3914,-4.43423 -33.5714,-0.71429 -0.264,-46.02334 -1.4635,-76.88941 8.9106,-114.20649 -53.2554,21.02686 -62.9472,106.5941 -56.0535,112.77792 -10.8828,0.535 -21.371,-1.2973 -32.8571,2.85715 0.6389,-42.57135 -0.2605,-84.90861 -30,-122.85715 0,0 -30.958,80.92234 -31.4286,103.57143 -0.4705,22.64909 9.4516,40.16588 9.4516,40.16588 0,0 -8.568,36.74051 -6.2986,58.23223 2.2959,21.74142 20.4429,59.67622 27.2655,78.65812 z"</div><div class='add'>+         style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath3631)"</div><div class='add'>+         sodipodi:nodetypes="cccccccccccccccccccccc"</div><div class='add'>+         id="path3635"</div><div class='add'>+         d="m 719.5,738.69519 18.31177,15.43196 44.41103,-15.38821 23.2772,-25.54375 11.46397,19.22065 30.67161,12.78354 25.09737,5.72837 L 892,723.19519 908.02309,747.02126 947,752.19519 l 10.24541,-6.19852 6.75471,8.6982 25.49988,11.00032 2,-40.5 L 955.94866,710.6576 923.45591,689.1305 883.0038,677.66492 861.69668,662.13148 840,685.19519 755.02878,638.61208 722,676.69519 l -2.5,62 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter3587);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         sodipodi:nodetypes="ccssscsssssssssssssccccscccccccccsscccccccccccssscccccccccccccccsccccssssssssssssscccsssc"</div><div class='add'>+         clip-path="url(#clipPath3677)"</div><div class='add'>+         id="path3669"</div><div class='add'>+         d="m 584,696.5 -6.5625,17.15625 c 0,0 -7.81152,20.36488 -15.6875,43.65625 -3.93799,11.64568 -7.88302,24.04145 -10.9375,35.125 -3.05448,11.08355 -5.33586,20.37986 -5.5,28.28125 -0.39807,19.16196 5.74653,34.8883 8.9375,41.75 -0.77153,3.55523 -1.99137,9.45432 -3.34375,18.09375 -1.92042,12.26821 -3.71827,27.15441 -2.375,39.875 1.38209,13.08835 6.81222,28.18765 12.59375,43.03125 5.78153,14.8436 12.05435,29.22711 15.21875,38.03125 6.63206,18.4519 9.99296,31.5763 11.3125,48.5 0.58135,7.4561 -0.24227,20.336 -1.25,33.375 -1.00773,13.039 -2.18661,26.3014 -1.6875,36.9688 0.98911,21.1398 9.32798,46.8347 33.375,57.9374 22.77483,10.5154 55.32682,11.7022 83.4375,-3.4374 16.15992,-8.7034 30.07634,-27.0976 43.375,-46.9063 13.29866,-19.8087 24.96917,-41.0534 31.9375,-54.9063 15.35292,-30.5212 39.39353,-115.46418 45.625,-152.7187 3.01859,-18.04653 3.92166,-29.06555 2.625,-38.03125 -0.97853,-6.76604 -3.82819,-12.1474 -6.875,-16.21875 2.04274,-27.50791 -0.73207,-51.36878 11.96875,-79.40625 L 840.75,763.375 l -23.8125,9.3125 c -17.48975,6.83753 -28.90164,19.04536 -36.59375,32.0625 -0.32251,0.54577 -0.56314,1.10776 -0.875,1.65625 0.22203,-22.51521 4.40784,-37.63759 6.59375,-58.6875 l 1.96875,-19 L 771,737.375 c -30.59449,15.55571 -45.69489,48.19321 -49.71875,90.21875 -4.24532,-0.62547 -8.8314,-1.01965 -13.8125,-0.84375 -0.29149,-39.18036 -0.39629,-67.03685 8.59375,-99.375 l 5.59375,-20.125 -19.4375,7.65625 c -30.90937,12.20394 -47.85954,41.93073 -56.625,68.375 -4.38273,13.22214 -6.74582,25.80121 -7.59375,35.9375 -0.23203,2.77373 -0.31106,5.31132 -0.3125,7.71875 -3.24187,-0.0364 -6.42052,0.13589 -10.0625,0.5 0.0416,-39.00473 -3.48424,-79.75415 -32.28125,-116.5 L 584,696.5 Z m 5.8125,43.8125 c 16.80691,30.64383 17.47451,63.96728 16.9375,99.75 l -0.21875,15.0625 12.03493,-6.53921 c 8.66205,-3.13302 19.56058,-0.22752 31.93382,-0.83579 l 14.67465,9.3566 -6.3309,-25.7941 c -0.0897,-0.22997 -0.22046,-0.41669 -0.25,-0.71875 -0.19951,-2.03986 -0.22232,-5.47307 0.125,-9.625 0.69464,-8.30386 2.78957,-19.58524 6.625,-31.15625 5.15532,-15.55294 13.48801,-31.19248 25.125,-42.53125 -4.68381,28.63798 -3.21559,60.25934 -3.01164,95.80514 l -2.76593,13.26164 15.49632,-7.59803 c 9.0294,-2.75771 17.18897,-0.34996 29.28125,1.09375 l 13.24632,9.44423 L 741.09375,840 c 1.44793,-30.97177 8.22149,-53.67808 20.71875,-68.875 -2.98688,19.77884 -5.43043,41.7848 0.3125,78.34375 l 1.06552,6.37318 -2.93815,11.51685 10.61711,-8.16818 9.18973,10.22198 -1.54828,-10.4636 L 781.9375,852 c 5.70102,-13.21149 10.17282,-26.21337 16.34375,-36.65625 0.95986,-1.62434 2.03153,-3.06436 3.0625,-4.5625 -3.68066,21.15535 -2.42716,40.20815 -4.09375,57.78125 l -4.68014,7.80698 7.39889,0.22427 c 3.22005,3.48361 3.8675,3.85068 4.5625,8.65625 0.695,4.80557 0.31862,14.40035 -2.5625,31.625 -5.56799,33.28792 -31.79272,123.1659 -43.6875,146.8125 -6.60491,13.1304 -18.02998,33.8957 -30.625,52.6563 -12.59502,18.7605 -27.35933,35.5338 -36,40.1874 -21.49052,11.5742 -48.7808,10.2602 -64.84375,2.8438 -14.37486,-6.637 -20.53812,-23.4494 -21.3125,-40 -0.38311,-8.188 0.61279,-21.3092 1.625,-34.4062 1.01221,-13.0971 11.28891,-22.5708 15.42339,-36.5626 5.37229,-18.1808 -1.44687,-36.5944 -12.5,-53.93745 -6.48655,-10.17778 -23.9768,-24.2579 -29.54839,-38.5625 -5.57159,-14.3046 -10.36751,-29.00315 -11.28125,-37.65625 -0.92621,-8.77113 0.4225,-23.02502 2.21875,-34.5 1.79625,-11.47497 3.84375,-20.28125 3.84375,-20.28125 l 9.42278,-3.6152 -10.48528,-3.8848 c 0,0 -8.49889,-15.3101 -8.09375,-34.8125 0.0711,-3.42316 1.83626,-12.72805 4.71875,-23.1875 2.88249,-10.45945 6.76466,-22.55271 10.625,-33.96875 3.04439,-9.00308 5.78063,-16.60345 8.34375,-23.6875 z"</div><div class='add'>+         style="display:inline;opacity:0.58775509;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3898);enable-background:new"</div><div class='add'>+         transform="translate(450.03125,73.843964)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath3636)"</div><div class='add'>+         id="g3628"&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9024);enable-background:accumulate"</div><div class='add'>+           d="m 824.48651,818.48242 -49.49748,-15.55635 -26.87005,52.3259 41.01219,45.25484 49.49747,-38.18377 -14.14213,-43.84062 z"</div><div class='add'>+           id="path8988"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9020);enable-background:accumulate"</div><div class='add'>+           d="m 964.49365,855.25197 -55.15433,-46.66904 -43.84062,36.76955 33.94113,53.74011 7.07106,66.46804 -50.91168,35.35537 -41.0122,11.3137 -2.82842,46.669 56.56854,25.4559 63.63961,-76.3676 24.04163,-94.75227 8.48528,-57.98276 z"</div><div class='add'>+           id="path8990"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         id="path8992"</div><div class='add'>+         d="m 1045.3322,1043.5779 60.8112,-26.8701 100.4091,31.1127 -63.6396,31.1127 -82.0244,-16.9706 -15.5563,-18.3847 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9044);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         clip-path="url(#clipPath4177)"</div><div class='add'>+         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccczzzcccccc"</div><div class='add'>+         id="path4149"</div><div class='add'>+         d="m 583.0625,715.75 c -12.10609,34.44974 -26.7145,68.53333 -31.75,104.84375 -0.83208,14.92867 4.58915,29.15943 8.84375,43.0625 -5.91624,27.20126 -10.13681,56.89995 1.15625,83.125 13.51717,38.16085 35.00147,75.68215 32.42279,117.46825 -0.9483,29.2942 -9.01444,60.9941 5.38971,88.2817 10.19864,19.3348 33.13956,27.3117 53.96785,27.6676 27.86219,1.1741 56.46261,-11.6216 72.0009,-35.2613 22.59549,-29.3717 41.80051,-61.4973 55.23865,-96.0598 16.89053,-45.506 29.6718,-92.56072 37.93402,-140.3989 1.8244,-12.94106 3.10108,-27.46985 -4.57892,-38.82255 -3.43115,-7.33632 0.0421,-15.56014 -0.68457,-23.30977 0.674,-24.99466 4.01232,-50.66376 16.65332,-72.59648 -17.73313,6.4446 -35.07268,16.55971 -44.00307,33.86425 -3.93508,6.70955 -7.60482,13.57413 -11.37193,20.38575 -3.54999,-30.01408 3.71963,-59.64828 6.78125,-89.28125 -20.16604,9.05463 -36.87672,25.65522 -44.17495,46.682 -6.30463,15.58003 -8.80222,32.31718 -10.26255,49.03675 -8.25334,-1.51925 -16.68447,-2.10155 -25.0625,-1.5 -0.96308,-38.69787 -0.46696,-79.40715 10.96875,-115.90625 -18.68113,6.21776 -35.16621,18.73551 -45.62803,35.38723 -13.85254,20.87979 -21.2614,45.75395 -23.05947,70.61277 0.58534,4.32454 -0.0613,11.84009 -6.34375,9.875 -5.33118,0.0176 -10.62908,0.67883 -15.9375,1.09375 1.14784,-39.38148 -3.34144,-81.6282 -27.0625,-114.21875 -3.06071,-3.63717 -5.63685,-7.68438 -8.625,-11.34375 -0.9375,2.4375 -1.875,4.875 -2.8125,7.3125 z m 7.75,13.84375 c 18.56527,29.29629 22.4825,64.82012 22.125,98.875 0.20409,5.17526 -0.51656,11.8292 0.125,16.0625 12.31856,-6.10275 26.73912,-2.4399 39.78125,-2.1875 2.31712,1.22325 3.1921,1.65243 1.90625,-1.40625 -4.16455,-13.95285 -1.84828,-28.613 1.80504,-42.40764 6.36687,-26.29064 20.62828,-51.08798 42.81996,-67.02986 -8.61709,37.23706 -5.71658,76.56161 -6.09375,113.96875 12.25344,-6.9099 27.27879,-3.44613 40.03125,-0.25 3.39222,3.5348 2.28935,-0.72948 2.1875,-3.8125 -0.48309,-21.37058 4.13133,-43.06963 13.6875,-62.15625 5.96266,-10.68727 14.24338,-19.80379 22.4375,-28.875 -7.87156,33.8381 -9.2029,69.33593 -2.71875,103.5 1.72485,-1.41118 4.60681,-0.45414 5.65625,-0.375 9.68369,-21.23682 16.35112,-45.38062 34.89016,-60.74185 1.87329,-0.37122 -1.44818,8.52495 -1.48391,11.8981 -3.53488,21.84581 -3.2972,44.17323 -4.90625,66.25 -1.31238,1.37679 2.84835,2.32354 3.46875,4.0625 7.92311,10.5658 3.12294,24.83149 2.0916,36.78011 -7.06405,45.03355 -21.76553,88.37934 -35.57677,131.69714 -12.07476,32.9493 -30.7197,63.08 -51.23358,91.429 -10.95257,13.5514 -23.24472,27.8513 -40.84375,32.5 -20.15601,6.2413 -43.57595,5.1744 -61.96875,-5.6562 -17.28966,-12.3414 -21.02393,-35.7089 -19.26226,-55.6864 0.0488,-15.8262 2.37211,-27.8008 7.91747,-42.8053 5.54535,-15.0045 2.47105,-31.3317 -1.78021,-47.6333 -4.25126,-16.3016 -12.17903,-26.26002 -21.82158,-42.20417 -9.64255,-15.94415 -17.6369,-36.03734 -20.77217,-55.57713 -1.74948,-18.62714 2.89171,-37.12262 5.78125,-55.25 3.29623,-2.83696 -1.59799,-5.19659 -2.3125,-8.1875 -7.60113,-17.01508 -8.40747,-36.7749 -2.74234,-54.55998 7.1302,-25.0723 15.76087,-49.63241 24.67984,-74.12752 0.70833,1.30208 1.41667,2.60417 2.125,3.90625 z"</div><div class='add'>+         style="display:inline;opacity:0.58775509;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4185);enable-background:new"</div><div class='add'>+         transform="translate(450.03125,73.843964)"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath3631)"</div><div class='add'>+         sodipodi:nodetypes="cccccccc"</div><div class='add'>+         id="path3902"</div><div class='add'>+         d="m 735.05635,733.03834 2.75542,21.08881 44.41103,-15.38821 4.85063,-22.38975 -3.93617,-22.05222 -22.45163,-36.59301 -8.28004,30.30494 -17.34924,45.02944 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4130);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;path</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath3631)"</div><div class='add'>+         sodipodi:nodetypes="cccccccc"</div><div class='add'>+         id="path4135"</div><div class='add'>+         d="m 831.81321,730.29452 15.82237,14.90486 20.85473,2.89994 -1.59029,-39.92598 8.32561,-30.50842 -7.16499,-6.34106 -21.69669,20.9424 -14.55074,38.02826 z"</div><div class='add'>+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4141);enable-background:accumulate"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath8392)"</div><div class='add'>+         style="filter:url(#filter8379)"</div><div class='add'>+         id="g8367"&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 910.14441,746.31415 32.61295,5.17393 -0.36119,-23.87619 7.18853,-29.68221 -8.45112,-5.26365 -21.82194,26.51077 -9.16723,27.13735 z"</div><div class='add'>+           id="path4145"</div><div class='add'>+           sodipodi:nodetypes="ccccccc"</div><div class='add'>+           clip-path="none"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;rect</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="rect8365"</div><div class='add'>+           width="123.03658"</div><div class='add'>+           height="172.53406"</div><div class='add'>+           x="877.51953"</div><div class='add'>+           y="650.19098" /&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         transform="translate(276,136)"</div><div class='add'>+         clip-path="url(#clipPath8417)"</div><div class='add'>+         style="filter:url(#filter8404)"</div><div class='add'>+         id="g8400"&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 964.00012,754.69487 18.42881,7.46479 9.07107,-36.96447 -14.87031,4.83886 -12.62957,24.66082 z"</div><div class='add'>+           id="path4147"</div><div class='add'>+           sodipodi:nodetypes="ccccc"</div><div class='add'>+           clip-path="none"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;</div><div class='add'>+        &lt;rect</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="rect8398"</div><div class='add'>+           width="142.12846"</div><div class='add'>+           height="125.1579"</div><div class='add'>+           x="924.89569"</div><div class='add'>+           y="677.06104" /&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       id="rect6247"</div><div class='add'>+       width="440"</div><div class='add'>+       height="376"</div><div class='add'>+       x="548"</div><div class='add'>+       y="205.32275"</div><div class='add'>+       style="opacity:1;fill:none;fill-opacity:1;stroke:#f8d615;stroke-width:18;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="opacity:1;fill:none;fill-opacity:1;stroke:#f83615;stroke-width:18;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"</div><div class='add'>+       id="rect6676"</div><div class='add'>+       width="1684"</div><div class='add'>+       height="1292"</div><div class='add'>+       x="56"</div><div class='add'>+       y="53.322754" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="opacity:1;fill:url(#pattern5557);fill-opacity:1;stroke:#f815bb;stroke-width:13.34657478;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"</div><div class='add'>+       id="rect6731"</div><div class='add'>+       width="522.56604"</div><div class='add'>+       height="1182.4679"</div><div class='add'>+       x="3493.3721"</div><div class='add'>+       y="87.178711" /&gt;</div><div class='add'>+    &lt;g</div><div class='add'>+       id="g7477"</div><div class='add'>+       transform="matrix(0.53474256,0,0,1,1882.7509,3.0962157)"&gt;</div><div class='add'>+      &lt;rect</div><div class='add'>+         y="99.705269"</div><div class='add'>+         x="3039.4895"</div><div class='add'>+         height="902.66437"</div><div class='add'>+         width="818.51605"</div><div class='add'>+         id="rect6979"</div><div class='add'>+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#f8d615;stroke-width:18;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /&gt;</div><div class='add'>+      &lt;g</div><div class='add'>+         clip-path="url(#clipPath6975)"</div><div class='add'>+         id="g4303-9"</div><div class='add'>+         style="display:inline;enable-background:new"</div><div class='add'>+         transform="matrix(1.8806916,0,0,2.3994874,1997.8763,-394.32602)"&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter11361-3);enable-background:new"</div><div class='add'>+           d="m 304.64285,526.6479 c -10,0.35715 -18.21428,2.85714 -18.21428,2.85714 l 7.5,6.07143 10.35714,3.57143 16.07143,0.35714 22.5,-5.35714 7.85714,1.07143 20.35715,-2.14286 -10.35715,6.78572 c 5.45923,-1.02361 17.39329,3.56911 9.64286,5.35714 -1.74,0.40142 13.92857,-4.64285 13.92857,-4.64285 l 2.5,-4.64287 3.57143,-9.28571 11.42857,0 18.21428,-4.64286 3.57144,-4.99999 -16.07144,1.07142 -12.14285,2.14286 -14.64286,-5 -70.6921,16.70774 -5.37933,-5.27917 z"</div><div class='add'>+           id="path10326-6"</div><div class='add'>+           sodipodi:nodetypes="cccccccccsccccccccccc"</div><div class='add'>+           transform="matrix(10.726753,0,0,10.726753,-2882.1235,-4565.4583)"</div><div class='add'>+           inkscape:export-filename="/home/cheeseness/Documents/LCA09/mascot/tuz_new.png"</div><div class='add'>+           inkscape:export-xdpi="142.10527"</div><div class='add'>+           inkscape:export-ydpi="142.10527" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           style="display:inline;opacity:1;enable-background:new"</div><div class='add'>+           id="g7882-9"</div><div class='add'>+           transform="matrix(0.71084,-0.1937433,0.262963,0.9648058,503.68027,136.48399)"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             sodipodi:nodetypes="czzzzcc"</div><div class='add'>+             id="path7876-3"</div><div class='add'>+             d="m 245.12255,100.05344 c 0,0 -47.12811,-31.646921 -67.21465,-35.800939 -20.03792,-4.143963 -38.4729,-3.317578 -51.93364,13.607323 -13.46074,16.924901 -12.07739,61.265196 -13.53554,86.969546 -1.45815,25.70435 2.54945,70.17701 17.6046,88.66552 15.05516,18.4885 45.88634,13.58502 49.92695,21.4137 2.21283,4.28736 65.15228,-174.85515 65.15228,-174.85515 z"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient7904-7);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             sodipodi:nodetypes="czzzzzc"</div><div class='add'>+             id="path7878-3"</div><div class='add'>+             d="m 135.37935,82.017807 c 0,0 26.34355,1.938783 37.63307,13.903188 11.41494,12.097335 13.73457,21.331515 15.29586,37.734585 1.56337,16.42499 -0.84957,28.41812 -7.81382,36.03734 -6.96425,7.61922 -1.00429,19.58332 -25.91605,12.07107 -24.91176,-7.51225 -27.03224,-27.78298 -26.51523,-46.30475 0.51721,-18.52898 7.31617,-53.441433 7.31617,-53.441433 z"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient7906-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             sodipodi:nodetypes="czccssc"</div><div class='add'>+             id="path7880-8"</div><div class='add'>+             d="m 135.648,81.927211 c 0,0 -4.64465,16.365075 0.58825,28.563099 5.48794,12.79254 27.22425,44.26007 27.22425,54.65565 l 22.65625,-5 c 2.54218,-6.96644 3.21052,-15.75206 2.1875,-26.5 -1.56129,-16.40307 -3.8663,-25.62141 -15.28125,-37.718749 -9.65488,-10.232047 -31.59311,-13.374857 -37.375,-14 z"</div><div class='add'>+             style="display:inline;opacity:1;fill:url(#radialGradient7908-0);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 845.03125,1154.7776 c -4.28571,0.7143 -27.62815,3.6181 -57.85714,10 -30.22899,6.3819 -57.31395,4.9661 -135.78608,17.3296 -79.85178,12.5808 -94.06436,42.5423 -108.12225,47.0643 -14.70014,4.7286 -145.37739,-65.8225 -145.37739,-65.8225 l 4.28572,-94.2857 c 0,0 85.88551,-16.2009 112.14285,-33.5714 26.25735,-17.3705 45.58238,-49.66602 59.28572,-71.42861 13.70334,-21.76259 32.85714,-71.42858 32.85714,-71.42858 l 238.57143,262.14289 z"</div><div class='add'>+           id="path7917-0"</div><div class='add'>+           sodipodi:nodetypes="czzzcczzcc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8888-6);enable-background:accumulate"</div><div class='add'>+           d="m 332.34019,898.38549 -32.73181,-61.29956 -37.61734,45.10646 c 2.17675,1.31711 5.77425,-20.85603 45.6004,-64.41708 l 24.74875,80.61018 z"</div><div class='add'>+           id="path7919-5"</div><div class='add'>+           clip-path="url(#clipPath8658-06)"</div><div class='add'>+           sodipodi:nodetypes="ccccc"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient6951);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8892-7);enable-background:accumulate"</div><div class='add'>+           d="m 200.81833,863.03015 146.3711,-51.61879 243.95184,226.27414 -241.83052,140.0072 -181.01934,-87.6813 32.52692,-226.98125 z"</div><div class='add'>+           id="path7923-6"</div><div class='add'>+           clip-path="url(#clipPath2833-2)"</div><div class='add'>+           sodipodi:nodetypes="cccccc"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#0f0f0f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 642.88839,640.13471 c 0,0 -29.55406,40.57305 -47.85714,74.28571 -18.30309,33.71267 -58.62109,126.35694 -70.35714,171.07143 -11.7594,44.80344 -62.5,123.57145 -62.5,123.57145 l 76.07143,18.2143 c 0,0 11.80712,-12.8234 31.07142,-46.07146 19.2643,-33.24808 60.35715,-138.57143 60.35715,-138.57143 l 13.21428,-202.5 z"</div><div class='add'>+           id="path7921-6"</div><div class='add'>+           sodipodi:nodetypes="czzcczcc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.4;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8856-2);enable-background:accumulate"</div><div class='add'>+           d="m 430.28131,381.94122 c -7.07106,2.82843 -236.18124,32.15181 -236.18124,32.15181 l -39.63961,359.83304 90.19849,92.63961 52.3259,-114.5513 100.46804,-186.39192 32.82842,-183.68124 z"</div><div class='add'>+           id="path7925-4"</div><div class='add'>+           sodipodi:nodetypes="ccccccc"</div><div class='add'>+           clip-path="url(#clipPath3665-9)"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 969.67051,1164.0346 c 0,0 23.25628,11.3937 36.06779,20.4761 12.6974,9.0015 29.4724,24.6491 41.6924,37.3605 12.3055,12.8002 20.1127,22.5987 41.5327,24.1608 21.4322,1.5629 53.2824,-8.7876 73.296,-24.6642 20.0135,-15.8766 45.6469,-69.2328 45.6469,-69.2328 l -127.1608,-143.0717"</div><div class='add'>+           id="path7927-0"</div><div class='add'>+           sodipodi:nodetypes="czzzzcc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8860-3);enable-background:accumulate"</div><div class='add'>+           d="M 331.34019,641.50471 216.17367,835.36467 260.2153,925.96265 357.79603,732.21539 331.34019,641.50471 Z"</div><div class='add'>+           id="path7929-0"</div><div class='add'>+           clip-path="url(#clipPath8642-9)"</div><div class='add'>+           sodipodi:nodetypes="ccccc"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           style="display:inline;opacity:1;enable-background:new"</div><div class='add'>+           id="g7931-4"</div><div class='add'>+           transform="matrix(0.9934486,0.1142802,-0.1142802,0.9934486,-9.24324,588.09054)"</div><div class='add'>+           inkscape:transform-center-x="-347.89063"</div><div class='add'>+           inkscape:transform-center-y="-28.255779"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             style="display:inline;opacity:1;fill:#bcb786;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+             d="m 1049.205,-282.26672 -0.09,0.008 c -1.3874,0.88445 -6.6033,1.6072 -6.629,9.52344 -0.024,7.42525 15.0129,17.09146 17.1563,18.09375 1.7302,0.80909 3.5916,1.40876 5.4063,1.71875 l 1.4374,0.21875 c 1.9197,0.21194 3.72,0.15141 5.1563,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0937,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5626,-1.28125 1.1287,-0.25066 2.2702,0.11629 6.25,-0.875 3.9795,-0.99128 5.4294,-1.4193 6.125,-1.78125 0.7222,-0.37601 1.7617,-0.87058 2.375,-1.53125 1.9629,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.14461 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70653 2.3191,-1.70203 2.5312,-2 0.2123,-0.29796 0.099,-0.72855 0.125,-0.75 0.043,-0.0352 0.3405,-0.094 0.5,-0.4375 0.859,-1.84708 2.3232,-5.62764 2.4376,-6.3125 0.1137,-0.68215 0.168,-1.35277 0.2187,-1.75 0.029,-0.22951 -0.1471,-0.8789 -0.125,-0.9375 0.031,-0.082 0.2883,-0.25057 0.3437,-0.5 0.2663,-1.19832 0.089,-2.20736 -0.125,-3.625 -0.2139,-1.41764 -0.9716,-4.61463 -1.625,-5.46875 -0.4194,-0.54857 -0.7993,-0.7925 -1.1562,-0.90625 -0.067,-0.0173 -0.1239,-0.0467 -0.1875,-0.0625 -0.021,-0.004 -0.042,0.003 -0.062,0 -0.3116,-0.0755 -0.6085,-0.15867 -1.1562,-0.21875 -0.9855,-0.10812 -2.4247,-0.2594 -3.9688,-0.25 -0.5147,0.003 -1.0371,0.0476 -1.5625,0.0937 -3.5589,0.31228 -9.0098,0.99108 -10.2187,1.625 -1.6331,-0.33402 -3.9482,-0.61223 -5.9376,-0.46875 -3.064,0.22097 -4.9677,0.34219 -6.9062,0.46875 -1.9384,0.12655 -1.6861,0.38864 -2.9062,0.46875 -1.3191,0.0866 -1.7869,-0.22325 -5.5626,0.0937 -3.5457,0.29772 -8.9806,0.99317 -10.2187,1.625 -1.6334,-0.33451 -3.9459,-0.61239 -5.9375,-0.46875 -3.0642,0.22098 -4.9678,0.37344 -6.9062,0.5 -0.6592,0.043 -1.0424,0.12393 -1.3438,0.1875 z"</div><div class='add'>+             id="path7933-6" /&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             clip-path="url(#clipPath7616-1)"</div><div class='add'>+             style="display:inline;filter:url(#filter7610-9);enable-background:new"</div><div class='add'>+             id="g7935-2"</div><div class='add'>+             transform="matrix(0.9975712,-0.06965428,0.06965428,0.9975712,872.72062,140.02502)"&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               sodipodi:nodetypes="ccssscsssscscsscsssccscssccsscssscc"</div><div class='add'>+               id="path7937-6"</div><div class='add'>+               d="m 229.94262,-409.12268 c -3.55781,0.05 -9.0242,0.36009 -10.30334,0.90414 -1.60609,-0.44747 -3.90316,-0.88131 -5.89995,-0.87674 -3.07199,0.007 -4.96469,0.009 -6.90727,0 -0.66047,-0.003 -1.04759,0.0672 -1.35267,0.10959 0,0 0,1.09593 0,1.09593 0.11972,-0.17947 0.39252,-0.69046 0.94975,-0.76715 0.74758,-0.10289 5.16928,-0.15123 7.31019,-0.1096 1.7746,0.0345 4.45523,0.27427 6.38921,0.95895 0.3214,0.11378 0.61925,0.27378 0.89219,0.41097 1.96342,0.98693 7.94336,4.30154 7.94336,4.30154 0,0 -6.63275,-3.94768 -7.48287,-4.43853 -0.20331,-0.11739 -0.57464,-0.25769 -1.03609,-0.41098 1.22063,-0.44779 5.07597,-0.61971 7.82823,-0.71235 3.0245,-0.10182 3.34776,-0.0896 5.41069,0.19179 2.12931,0.29043 3.33851,0.60276 3.33851,0.60276 -1e-5,0 -0.0784,-0.64118 1.03609,-0.79455 0.74757,-0.10289 5.16929,-0.15123 7.31019,-0.1096 2.0695,0.0403 5.36605,0.40716 7.2814,1.36992 1.00332,0.50433 3.03564,1.56863 4.79535,2.53571 l 0.0956,-0.0194 c 0,0 -3.58034,-2.16242 -4.43047,-2.65327 -0.20331,-0.11739 -0.57463,-0.25769 -1.03609,-0.41098 1.22062,-0.44779 5.04719,-0.61971 7.79945,-0.71235 3.0245,-0.10182 3.34775,-0.0896 5.41069,0.19179 1.95316,0.2664 3.01292,0.53006 3.19461,0.57536 0,0 -0.0271,-0.31146 -0.0271,-0.31146 -0.40903,-0.13645 -0.71424,-0.23335 -1.40038,-0.35748 -1.30081,-0.23533 -3.39912,-0.60156 -5.50857,-0.56398 -3.57195,0.0636 -9.05328,0.35596 -10.30334,0.90414 -1.60583,-0.44695 -3.87662,-0.8813 -5.87117,-0.87674 -3.07199,0.007 -4.99348,0.009 -6.93605,0 -1.94256,-0.009 -1.71268,0.27907 -2.93558,0.27398 -1.32191,-0.005 -1.76612,-0.35463 -5.55459,-0.30138 0,0 0,0 0,0"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path7939-7"</div><div class='add'>+               d="m 206.1989,-407.47878 c 1.92021,0.81706 4.57715,2.19283 6.15897,3.39739 1.58184,1.20456 2.90757,1.77368 5.55459,3.91795 0.88557,0.71738 1.74865,1.34985 2.59193,1.92174 l 0.54057,-0.19011 c -0.71323,-0.48339 -1.46776,-1.02031 -2.26909,-1.62203 -2.82223,-2.11921 -3.62655,-2.80973 -6.01507,-4.27414 -2.38854,-1.4644 -4.09948,-2.36576 -6.5619,-3.1508 0,0 0,0 0,0"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               sodipodi:nodetypes="cssccsscc" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path7941-5"</div><div class='add'>+               d="m 237.79963,-407.47878 c 1.92021,0.81706 4.60594,2.19283 6.18775,3.39739 0.81307,0.61916 1.55849,1.07042 2.45046,1.65401 l 0.649,-0.11666 c -0.79831,-0.57637 -1.57177,-1.09435 -2.69653,-1.78394 -2.38854,-1.4644 -4.12826,-2.36576 -6.59068,-3.1508 0,0 0,0 0,0"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+               sodipodi:nodetypes="csccscc" /&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             clip-path="url(#clipPath7606-1)"</div><div class='add'>+             id="g7943-6"&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               style="display:inline;opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7578-4);enable-background:new"</div><div class='add'>+               d="m 1056.25,-278.80481 c 4.1446,-1.47877 10,3.125 10,3.125 0.899,0.28092 2.7251,-0.89447 2.6243,-1.68614 0,0 -1.5503,-1.86062 -0.3743,-2.93886 1.176,-1.07824 5.296,1.50738 7.5,1.625 2.204,0.11762 5.5621,-0.22941 7,-0.75 1.4379,-0.52059 1.1129,-1.42459 2.625,-1.75 1.5121,-0.32541 5.1189,1.03754 7.0605,1.16883 1.9416,0.13129 4.6481,0.33427 5.8145,-0.16883 1.1664,-0.5031 0.1782,-1.15921 1.875,-1.875 1.6968,-0.71579 7.7602,-0.95662 9.625,-0.125 1.8648,0.83162 1.8099,0.5192 2.625,3 0.8151,2.4808 7.4398,5.16285 -1.125,13.375 -8.5648,8.21215 -59.3779,13.78594 -65.625,2.75 -6.2471,-11.03594 6.2304,-14.27123 10.375,-15.75 z"</div><div class='add'>+               id="path7945-9"</div><div class='add'>+               sodipodi:nodetypes="czzzzzzzzzzzzzz" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               style="display:inline;opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7594-8);enable-background:new"</div><div class='add'>+               d="m 1058.5,-275.42981 c 4.1446,-1.47877 10,3.125 10,3.125 0.899,0.28092 2.7251,-0.89447 2.6243,-1.68614 0,0 -1.5503,-1.86062 -0.3743,-2.93886 1.176,-1.07824 5.296,1.50738 7.5,1.625 2.204,0.11762 5.5621,-0.22941 7,-0.75 1.4379,-0.52059 1.1129,-1.42459 2.625,-1.75 1.5121,-0.32541 5.1189,1.03754 7.0605,1.16883 1.9416,0.13129 4.6481,0.33427 5.8145,-0.16883 1.1664,-0.5031 0.1782,-1.15921 1.875,-1.875 1.6968,-0.71579 7.7602,-0.95662 9.625,-0.125 1.8648,0.83162 1.8099,0.5192 2.625,3 0.8151,2.4808 7.4398,5.16285 -1.125,13.375 -8.5648,8.21215 -59.3779,13.78594 -65.625,2.75 -6.2471,-11.03594 6.2304,-14.27123 10.375,-15.75 z"</div><div class='add'>+               id="path7947-8"</div><div class='add'>+               sodipodi:nodetypes="czzzzzzzzzzzzzz" /&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#101414;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 628.24553,347.99185 c -3.80443,-25.26423 -16.80972,-50.63802 -17.1568,-75.52523 -0.18626,-13.35552 3.27285,-26.57091 13.75553,-39.55405 36.34702,-65.29583 116.94091,-84.69468 185.93466,-91.46542 86.92239,-11.0168 184.91267,17.94007 233.37138,95.40128 54.124,75.7333 56.6747,172.53912 80.612,259.52795 29.4378,127.1276 54.7791,256.21414 60.3922,386.85035 -3.0634,78.18185 -8.4263,165.18417 -60.5032,228.13417 -48.0265,50.3574 -122.7864,50.053 -187.06985,59.0023 -90.55539,4.655 -184.35153,-16.1458 -261.7839,-64.1982 -64.77564,-37.94 -95.73019,-113.47867 -97.2794,-186.01962 -8.38917,-79.87516 26.39152,-153.80851 51.6204,-227.15961 7.47061,-82.76107 9.41286,-166.24775 9.65334,-249.38484 -0.83682,-32.19544 -7.08953,-63.81733 -11.54636,-95.60908 z"</div><div class='add'>+           id="path7949-7"</div><div class='add'>+           sodipodi:nodetypes="cscccccccccccc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8940-3);enable-background:accumulate"</div><div class='add'>+           d="m 311.83409,415.43155 9.8995,121.62237 -60.10408,136.47161 15.55635,174.65537 c 15.61326,61.8792 32.18545,98.66905 74.37615,117.05383 4.31911,-36.23998 -38.61152,-142.95988 -39.24264,-189.11984 -0.63145,-46.18445 10.83034,-108.60786 30.67767,-158.29647 20.04835,-50.19188 36.89674,-44.84642 42.12489,-92.59293 5.22815,-47.74651 -17.4264,-149.39192 -17.4264,-149.39192 l -55.86144,39.59798 z"</div><div class='add'>+           id="path7951-2"</div><div class='add'>+           sodipodi:nodetypes="ccccczzzcc"</div><div class='add'>+           clip-path="url(#clipPath8616-5)"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient6953);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 1010.0312,655.49186 c 0,0 16.7552,37.01806 28.7015,53.95395 11.9462,16.93589 52.7271,56.04605 52.7271,56.04605 l 52.5972,-127.58975"</div><div class='add'>+           id="path7953-8"</div><div class='add'>+           sodipodi:nodetypes="czcc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.07999998;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8822-2);enable-background:accumulate"</div><div class='add'>+           d="m 730.31998,536.56864 c 0,8.48528 42.54774,58.46803 42.54774,58.46803 l 12.60659,-28.76954 -55.15433,-29.69849 z"</div><div class='add'>+           id="path7955-2"</div><div class='add'>+           sodipodi:nodetypes="cccc"</div><div class='add'>+           clip-path="url(#clipPath8209-6)"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           transform="translate(450.03125,73.843964)"</div><div class='add'>+           style="display:inline;opacity:1;enable-background:new"</div><div class='add'>+           id="g7957-9"</div><div class='add'>+           clip-path="url(#clipPath3998-6)"&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             transform="translate(-174.03125,62.156036)"</div><div class='add'>+             style="filter:url(#filter3677-5)"</div><div class='add'>+             id="g7959-9"&gt;</div><div class='add'>+            &lt;g</div><div class='add'>+               id="g7961-6"</div><div class='add'>+               style="filter:url(#filter3785-4)"&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 sodipodi:nodetypes="czzzzzzzzzz"</div><div class='add'>+                 id="path7963-0"</div><div class='add'>+                 d="m 425.88244,476.99186 c 10.80543,-1.47866 24.74401,3.35451 44.64286,3.21428 19.89885,-0.14023 57.45322,-16.91122 82.14285,-17.14286 24.68963,-0.23164 62.7517,12.28406 79.28572,15 16.53402,2.71594 22.84832,-0.15852 27.49999,7.85715 4.65167,8.01567 1.92671,10.74724 -10.35714,20.71429 -12.28385,9.96705 -40.78968,12.63632 -66.07143,12.85714 -25.28234,0.22082 -70.38129,7.07852 -95.35714,3.92856 -24.97585,-3.14996 -56.93756,-7.82267 -68.92857,-17.85714 -11.99101,-10.03447 -19.85084,-16.73182 -17.5,-23.92857 2.35084,-7.19675 13.83743,-3.16419 24.64286,-4.64285 z"</div><div class='add'>+                 style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;rect</div><div class='add'>+                 y="412.60312"</div><div class='add'>+                 x="343.6539"</div><div class='add'>+                 height="181.01935"</div><div class='add'>+                 width="381.83765"</div><div class='add'>+                 id="rect7965-2"</div><div class='add'>+                 style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+            &lt;/g&gt;</div><div class='add'>+            &lt;g</div><div class='add'>+               id="g7967-7"</div><div class='add'>+               style="filter:url(#filter3785-4)"&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 sodipodi:nodetypes="czzzcc"</div><div class='add'>+                 id="path7969-6"</div><div class='add'>+                 d="m 687.14286,452.36218 c -10.46169,9.71443 -86.9796,19.00514 -100.71429,29.28572 -13.73469,10.28058 -14.75252,12.88826 -12.14286,20 2.60966,7.11174 6.54527,9.40572 25.71429,8.57142 19.16902,-0.8343 98.57143,-27.62172 98.57143,-21.42857 l -11.42857,-36.42857 z"</div><div class='add'>+                 style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+                 transform="translate(174.03125,-62.156036)" /&gt;</div><div class='add'>+              &lt;rect</div><div class='add'>+                 y="344.82138"</div><div class='add'>+                 x="702.86414"</div><div class='add'>+                 height="162.63455"</div><div class='add'>+                 width="207.8894"</div><div class='add'>+                 id="rect7971-1"</div><div class='add'>+                 style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+            &lt;/g&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             transform="translate(-174.03125,62.156036)"</div><div class='add'>+             style="display:inline;opacity:0.18000004;enable-background:new"</div><div class='add'>+             id="g7973-3"&gt;</div><div class='add'>+            &lt;g</div><div class='add'>+               id="g7975-2"</div><div class='add'>+               style="filter:url(#filter3785-4)"&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 sodipodi:nodetypes="czzzzzzzzzz"</div><div class='add'>+                 id="path7977-1"</div><div class='add'>+                 d="m 425.88244,476.99186 c 10.80543,-1.47866 24.74401,3.35451 44.64286,3.21428 19.89885,-0.14023 57.45322,-16.91122 82.14285,-17.14286 24.68963,-0.23164 62.7517,12.28406 79.28572,15 16.53402,2.71594 22.84832,-0.15852 27.49999,7.85715 4.65167,8.01567 1.92671,10.74724 -10.35714,20.71429 -12.28385,9.96705 -40.78968,12.63632 -66.07143,12.85714 -25.28234,0.22082 -70.38129,7.07852 -95.35714,3.92856 -24.97585,-3.14996 -56.93756,-7.82267 -68.92857,-17.85714 -11.99101,-10.03447 -19.85084,-16.73182 -17.5,-23.92857 2.35084,-7.19675 13.83743,-3.16419 24.64286,-4.64285 z"</div><div class='add'>+                 style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;rect</div><div class='add'>+                 y="412.60312"</div><div class='add'>+                 x="343.6539"</div><div class='add'>+                 height="181.01935"</div><div class='add'>+                 width="381.83765"</div><div class='add'>+                 id="rect7979-5"</div><div class='add'>+                 style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+            &lt;/g&gt;</div><div class='add'>+            &lt;g</div><div class='add'>+               id="g7981-9"</div><div class='add'>+               style="filter:url(#filter3785-4)"&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 sodipodi:nodetypes="czzzcc"</div><div class='add'>+                 id="path7983-9"</div><div class='add'>+                 d="m 687.14286,452.36218 c -10.46169,9.71443 -86.9796,19.00514 -100.71429,29.28572 -13.73469,10.28058 -14.75252,12.88826 -12.14286,20 2.60966,7.11174 6.54527,9.40572 25.71429,8.57142 19.16902,-0.8343 98.57143,-27.62172 98.57143,-21.42857 l -11.42857,-36.42857 z"</div><div class='add'>+                 style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+                 transform="translate(174.03125,-62.156036)" /&gt;</div><div class='add'>+              &lt;rect</div><div class='add'>+                 y="344.82138"</div><div class='add'>+                 x="702.86414"</div><div class='add'>+                 height="162.63455"</div><div class='add'>+                 width="207.8894"</div><div class='add'>+                 id="rect7985-1"</div><div class='add'>+                 style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+            &lt;/g&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8802-7);enable-background:accumulate"</div><div class='add'>+           d="M 582.65599,-7.4183011 695.79307,78.848726 804.68752,337.64981 842.87128,545.5392 963.07944,637.46308 c 0,0 -12.72793,-287.08535 -19.799,-313.95541 C 936.20938,296.63761 793.37381,-69.643698 793.37381,-69.643698 L 582.65599,-7.4183011 Z"</div><div class='add'>+           id="path7987-4"</div><div class='add'>+           clip-path="url(#clipPath8604-69)"</div><div class='add'>+           sodipodi:nodetypes="cccccscc"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient6955);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 964.13839,239.599 c 0,0 8.67732,10.89662 24.10715,11.96428 15.42986,1.06766 49.72166,-39.95267 70.17856,-52.14285 20.4793,-12.20353 47.0464,-26.60225 63.9286,-20.35714 16.8821,6.2451 22.1578,26.43609 27.8571,48.03571 5.6994,21.59961 6.7186,61.81389 -2.6785,92.85715 -9.3972,31.04325 -50.5033,73.10375 -65.3572,103.39285 -14.8539,30.2891 -11.6071,39.82143 -11.6071,39.82143"</div><div class='add'>+           id="path7989-9"</div><div class='add'>+           sodipodi:nodetypes="czzzzzzc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:1;fill:url(#radialGradient3315-5);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           d="m 1124.4955,207.63471 c -15.8928,-0.89286 -49.7188,12.10583 -66.0714,24.28572 -16.4386,12.2439 -29.2209,24.1144 -29.2857,52.14285 -0.065,28.20604 13.1191,39.07641 29.1071,46.96429 15.988,7.88789 33.6862,7.11928 51.9643,-11.78571 18.2782,-18.905 14.2857,-111.60715 14.2857,-111.60715 z"</div><div class='add'>+           id="path7991-1"</div><div class='add'>+           sodipodi:nodetypes="czzzzc" /&gt;</div><div class='add'>+        &lt;ellipse</div><div class='add'>+           ry="73.928574"</div><div class='add'>+           rx="86.428574"</div><div class='add'>+           cy="237.00504"</div><div class='add'>+           cx="385"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.75;fill:url(#radialGradient3543-4);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4120-7);enable-background:accumulate"</div><div class='add'>+           id="path7993-0"</div><div class='add'>+           transform="matrix(0.9434749,-0.1239943,0.1440089,1.0957669,451.94827,134.5988)"</div><div class='add'>+           clip-path="url(#clipPath4100-3)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           transform="translate(450.03125,73.843964)"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3915-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 527.60588,407.44884 c 0,0 -122.04144,38.40348 -187.51434,9.63181 -65.47289,-28.77166 -74.37725,-124.71847 -74.37725,-124.71847 0,0 73.38158,-80.50393 129.92078,-83.61476 55.82705,-3.07164 90.57386,20.14332 114.87001,65.85171 24.352,45.81348 17.1008,132.84971 17.1008,132.84971 z"</div><div class='add'>+           id="path7995-7"</div><div class='add'>+           sodipodi:nodetypes="csczzc"</div><div class='add'>+           mask="url(#mask3684-3)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient6957);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 772.17411,393.349 c 0,0 36.21754,-27.38247 51.60714,-35.89286 15.17734,-8.39301 25.71428,-11.60714 35.89285,-11.60714 l -15.53571,66.96428"</div><div class='add'>+           id="path7997-5"</div><div class='add'>+           sodipodi:nodetypes="czcc" /&gt;</div><div class='add'>+        &lt;circle</div><div class='add'>+           r="36.25"</div><div class='add'>+           cy="306.64789"</div><div class='add'>+           cx="409.28571"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3933-8);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="path7999-8"</div><div class='add'>+           transform="translate(449.49554,74.915393)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8806-6);enable-background:accumulate"</div><div class='add'>+           d="m 311.83409,415.43155 9.8995,121.62237 -60.10408,136.47161 15.55635,174.65537 c 15.61326,61.8792 32.18545,98.66905 74.37615,117.05383 4.31911,-36.23998 8.68161,-72.36764 -31.24264,-223.11984 l 17.67767,-69.29647 72.12489,-138.59293 -42.4264,-158.39192 -55.86144,39.59798 z"</div><div class='add'>+           id="path8001-7"</div><div class='add'>+           sodipodi:nodetypes="cccccccccc"</div><div class='add'>+           clip-path="url(#clipPath8616-5)"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8826-9);enable-background:accumulate"</div><div class='add'>+           d="m 635.21025,581.13004 c -14.14214,12.72792 39.23347,34.58015 76.36753,24.04163 37.13406,-10.53852 104.64487,-35.56437 103.23759,-79.19596 -1.40728,-43.63158 -76.36753,-128.69343 -76.36753,-128.69343 L 635.21025,581.13004 Z"</div><div class='add'>+           id="path8003-0"</div><div class='add'>+           sodipodi:nodetypes="czzcc" /&gt;</div><div class='add'>+        &lt;circle</div><div class='add'>+           r="23.214285"</div><div class='add'>+           cy="306.64789"</div><div class='add'>+           cx="410"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3991-0);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="path8005-4"</div><div class='add'>+           transform="translate(449.67411,74.915393)" /&gt;</div><div class='add'>+        &lt;circle</div><div class='add'>+           r="7.5"</div><div class='add'>+           cy="303.07648"</div><div class='add'>+           cx="414.28571"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter3981-7);enable-background:accumulate"</div><div class='add'>+           id="path8007-8"</div><div class='add'>+           transform="translate(451.99554,73.486821)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4112-7);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 789.31696,478.349 c 0,0 7.02281,19.56859 -1.07143,35 -8.09424,15.43141 -42.32317,38.98822 -67.49999,50 -25.30972,11.06991 -85.473,32.96393 -101.78572,41.96428 -16.46148,9.08243 -18.21428,12.67857 -18.21428,12.67857 0,0 -7.14693,-19.06441 28.74999,-51.7857 36.17211,-32.97214 142.02712,-48.0495 159.82143,-87.85715 z"</div><div class='add'>+           id="path8009-0"</div><div class='add'>+           sodipodi:nodetypes="czzzczc" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           style="display:inline;opacity:1;enable-background:new"</div><div class='add'>+           id="g8011-4"</div><div class='add'>+           transform="translate(780.74553,74.55825)"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             transform="translate(-329.81481,0)"</div><div class='add'>+             clip-path="url(#clipPath3999-0)"</div><div class='add'>+             sodipodi:nodetypes="czzczzzszc"</div><div class='add'>+             id="path8013-2"</div><div class='add'>+             d="m 179.64286,267.36218 c -22.41044,39.70292 -60.6161,115.78029 -69.28571,149.64286 -8.64721,33.7751 -8.77199,66.41654 -0.35715,86.42858 8.3602,19.88213 26.16398,35.6328 40.71428,41.42856 -0.59638,-14.37587 14.37295,-43.28583 72.85715,-72.5 58.62627,-29.28514 78.38163,-27.13086 103.57142,-47.14286 25.63006,-20.36176 8.20587,-79.64664 3.21429,-93.92857 -4.99158,-14.28193 -1.23663,-3.37974 -1.94602,-5.09301 -10.68928,-25.81592 -34.21432,-54.4303 -64.48255,-64.54984 -30.26823,-10.11954 -65.01776,-4.84837 -84.28571,5.71428 z"</div><div class='add'>+             style="display:inline;opacity:1;fill:url(#radialGradient3585-2);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /&gt;</div><div class='add'>+          &lt;ellipse</div><div class='add'>+             ry="134.00607"</div><div class='add'>+             rx="64.715881"</div><div class='add'>+             cy="338.07648"</div><div class='add'>+             cx="183.57143"</div><div class='add'>+             transform="matrix(0.8823874,0.4705236,-0.4705236,0.8823874,-166.62245,2.387362)"</div><div class='add'>+             id="path8015-9"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4060-5);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;ellipse</div><div class='add'>+             ry="134.00607"</div><div class='add'>+             rx="64.715881"</div><div class='add'>+             cy="338.07648"</div><div class='add'>+             cx="183.57143"</div><div class='add'>+             transform="matrix(0.8823874,0.4705236,-0.4705236,0.8823874,-162.19388,-18.755495)"</div><div class='add'>+             id="path8017-6"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4062-9);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             transform="translate(-329.81481,3e-7)"</div><div class='add'>+             clip-path="url(#clipPath3999-0)"</div><div class='add'>+             sodipodi:nodetypes="czzczzzszc"</div><div class='add'>+             id="path8019-1"</div><div class='add'>+             d="m 179.64286,267.36218 c -22.41044,39.70292 -60.6161,115.78029 -69.28571,149.64286 -8.64721,33.7751 -8.77199,66.41654 -0.35715,86.42858 8.3602,19.88213 26.16398,35.6328 40.71428,41.42856 -0.59638,-14.37587 14.37295,-43.28583 72.85715,-72.5 58.62627,-29.28514 78.38163,-27.13086 103.57142,-47.14286 25.63006,-20.36176 8.20587,-79.64664 3.21429,-93.92857 -4.99158,-14.28193 -1.23663,-3.37974 -1.94602,-5.09301 -10.68928,-25.81592 -34.21432,-54.4303 -64.48255,-64.54984 -30.26823,-10.11954 -65.01776,-4.84837 -84.28571,5.71428 z"</div><div class='add'>+             style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6959);stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4079-1);enable-background:new" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;circle</div><div class='add'>+           r="19.704132"</div><div class='add'>+           cy="398.07648"</div><div class='add'>+           cx="310.71429"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="path8021-0"</div><div class='add'>+           transform="translate(452.55663,72.581273)" /&gt;</div><div class='add'>+        &lt;circle</div><div class='add'>+           r="19.704132"</div><div class='add'>+           cy="398.07648"</div><div class='add'>+           cx="310.71429"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4056-5);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6961);stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4083-9);enable-background:accumulate"</div><div class='add'>+           id="path8023-4"</div><div class='add'>+           transform="translate(450.55663,72.581273)" /&gt;</div><div class='add'>+        &lt;circle</div><div class='add'>+           r="19.704132"</div><div class='add'>+           cy="398.07648"</div><div class='add'>+           cx="310.71429"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4119-7);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           id="path8025-2"</div><div class='add'>+           transform="translate(450.55663,72.581273)" /&gt;</div><div class='add'>+        &lt;ellipse</div><div class='add'>+           ry="44.547726"</div><div class='add'>+           rx="72.079735"</div><div class='add'>+           cy="377.42877"</div><div class='add'>+           cx="429.56738"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4868-3);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4002-6);enable-background:accumulate"</div><div class='add'>+           id="path8027-2"</div><div class='add'>+           transform="matrix(0.9969564,-0.07796167,0.07796167,0.9969564,436.61877,125.29509)"</div><div class='add'>+           inkscape:transform-center-x="-47.231976"</div><div class='add'>+           inkscape:transform-center-y="-3.6935079" /&gt;</div><div class='add'>+        &lt;ellipse</div><div class='add'>+           ry="22.627417"</div><div class='add'>+           rx="36.611931"</div><div class='add'>+           cy="391.21735"</div><div class='add'>+           cx="437.6991"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient4876-9);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4010-1);enable-background:accumulate"</div><div class='add'>+           id="path8029-2"</div><div class='add'>+           transform="matrix(1.4357951,-0.06999104,0.06999104,1.4357951,235.18065,-63.86546)"</div><div class='add'>+           inkscape:transform-center-x="-20.955902"</div><div class='add'>+           inkscape:transform-center-y="-13.056625" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           transform="translate(450.03125,73.843964)"</div><div class='add'>+           id="g8031-0"</div><div class='add'>+           style="display:inline;opacity:1;filter:url(#filter4053-9);enable-background:new"&gt;</div><div class='add'>+          &lt;circle</div><div class='add'>+             r="3.2142856"</div><div class='add'>+             cy="401.82648"</div><div class='add'>+             cx="413.66071"</div><div class='add'>+             id="path8033-5"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6963);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;circle</div><div class='add'>+             r="3.2142856"</div><div class='add'>+             cy="401.82648"</div><div class='add'>+             cx="413.66071"</div><div class='add'>+             transform="translate(13.125009,8.1249913)"</div><div class='add'>+             id="path8035-5"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6965);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;circle</div><div class='add'>+             r="3.2142856"</div><div class='add'>+             cy="401.82648"</div><div class='add'>+             cx="413.66071"</div><div class='add'>+             transform="translate(32.946437,7.4999913)"</div><div class='add'>+             id="path8037-2"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6967);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;circle</div><div class='add'>+             r="3.2142856"</div><div class='add'>+             cy="401.82648"</div><div class='add'>+             cx="413.66071"</div><div class='add'>+             transform="translate(24.910723,-10.267866)"</div><div class='add'>+             id="path8039-9"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6969);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;circle</div><div class='add'>+             r="3.2142856"</div><div class='add'>+             cy="401.82648"</div><div class='add'>+             cx="413.66071"</div><div class='add'>+             transform="translate(47.589294,-0.6250087)"</div><div class='add'>+             id="path8041-0"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6971);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           d="m 896.20301,482.92837 c 0.98509,4.35008 4.53707,6.17948 7.38673,7.89182 4.46068,2.51292 6.52016,1.52211 9.15451,-0.75761 1.60195,-1.92117 10.68311,-4.69865 15.59423,-7.07107 4.32961,-1.45891 8.9033,-5.35873 13.38452,-8.33376 3.39514,-1.62724 5.34664,0.35464 7.82868,1.01015 2.94412,0.71661 4.41117,2.17175 6.06092,3.53554 2.39616,1.17519 -0.9279,3.14313 3.283,4.29314 1.19091,0.21794 2.41695,0.57645 3.28299,-0.50507"</div><div class='add'>+           id="path8043-2"</div><div class='add'>+           sodipodi:nodetypes="ccccccccc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           d="m 910.85021,475.35223 c 2.31494,-0.032 3.17778,0.64253 5.49271,-0.82075 3.45564,-3.08113 5.40254,-3.14477 7.95495,-4.41942 3.02657,-1.31523 6.5357,8.15169 10.10153,9.84899 2.39509,-0.82142 1.28914,1.79379 1.45209,2.65165 0.0571,2.64684 2.80694,3.67806 4.35628,5.42957 3.31604,2.25549 7.37523,6.29546 11.11168,5.3033 6.44525,-2.93107 10.27922,-1.28146 16.28871,-7.38674 0.70405,-1.18134 -0.58425,-6.8946 3.09359,-7.19734 2.52399,0.25338 4.16667,0.0502 6.06092,0.56822 5.441,2.11719 7.73778,6.45 14.71034,7.95495 6.1829,0.96639 7.61264,3.79426 13.88959,5.05076"</div><div class='add'>+           id="path8045-8"</div><div class='add'>+           sodipodi:nodetypes="cccccccccccc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           d="m 876.98133,483.52197 c 2.39858,-0.7938 6.10613,4.1921 8.17313,7.04568 0.59281,2.67952 1.15377,5.48645 0.75761,12.12183 0.78513,2.41754 2.68049,3.03095 4.79823,3.283 3.11745,-0.53678 5.87669,-1.3243 7.3236,-3.03046 1.8716,-1.94167 5.31253,2.39394 8.08122,4.04061 3.61009,1.91209 7.77378,1.97886 11.8693,2.27284 1.70358,-0.23064 2.3704,4.51515 3.28299,8.08123 0.38414,4.37806 -0.88544,6.89569 -1.76776,9.84898 -0.2943,2.49655 2.9885,3.52974 6.31345,4.54569 3.18244,0.74124 6.54424,1.66184 9.09137,1.76777 5.14186,0.87491 8.08874,2.69052 12.12183,4.04061 2.23914,0.81655 3.26019,2.24216 4.54569,3.53553"</div><div class='add'>+           id="path8047-3"</div><div class='add'>+           sodipodi:nodetypes="ccccccccccccc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:0.25;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8814-5);enable-background:new"</div><div class='add'>+           d="m 332,187.69519 c 0,0 57.5,-25.5 57.5,-28 0,-2.5 5.5,-52 5.5,-52 0,0 91,-48.500001 91.5,-50.500001 0.5,-2 86,-62.0000004 86,-62.0000004 L 386.5,17.195189 311,123.19519 l 21,64.5 z"</div><div class='add'>+           id="path8049-8"</div><div class='add'>+           clip-path="url(#clipPath8514-8)"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 1697.2846,722.5514 c 0,0 -115.9655,73.5391 -123.0365,77.78174 -7.0711,4.24264 -230.5169,137.17872 -230.5169,137.17872 l 4.2427,39.59798 216.3747,-100.40917 117.3797,-101.82337 15.5563,-52.3259 z"</div><div class='add'>+           id="path8051-0" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8810-3);enable-background:accumulate"</div><div class='add'>+           d="m 528.91587,556.85291 c -5.65685,-1.41421 -181.01933,74.95332 -181.01933,74.95332 l -33.94113,181.01934 51.09546,193.94823 257.2031,67.6813 c 0,0 206.47518,152.735 212.13203,148.4924 5.65686,-4.2426 168.2914,-193.7473 168.2914,-193.7473 L 842.87128,845.35248 796.20224,667.16157 528.91587,556.85291 Z"</div><div class='add'>+           id="path8053-4"</div><div class='add'>+           clip-path="url(#clipPath8610-9)"</div><div class='add'>+           sodipodi:nodetypes="cccccscccc"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:1;fill:#0c0c0c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           d="m 1097.6433,613.88997 c 0,0 22.6195,-6.50681 35.7427,-5.87273 13.1233,0.63409 30.6416,1.93862 43.7089,12.18619 13.0673,10.24756 25.0677,27.14007 34.1124,58.36965 9.0446,31.22958 1.6983,99.25201 -6.1761,143.34735 -7.8743,44.09534 -28.2651,106.11298 -45,140 -16.7348,33.88702 -49.7977,77.49517 -60.5694,89.87617 -11.3642,13.062 -56.2059,36.4262 -79.4306,42.2667 5.3034,-10.6066 48.8998,-50.5889 35,-60.7143 -14.0189,-10.2123 -45.76,45.9824 -84.2931,29.0332 21.38231,-13.1321 41.7794,-51.1861 34.0406,-66.59448 -7.84024,-15.61039 -30.70492,48.75758 -93.53553,37.01288 30.05204,-27.5267 55.40706,-70.90401 41.2627,-82.9797 -14.41516,-12.30687 -60.46175,54.2932 -60.46175,54.2932 0,0 -2.8219,-41.70123 13.7732,-68.60737 16.63935,-26.97787 79.65297,-81.61527 99.55308,-111.70342 19.9002,-30.08814 33.6126,-66.00902 42.1355,-92.51794 8.5228,-26.50892 15.8009,-77.09954 15.8009,-77.09954"</div><div class='add'>+           id="path8055-0"</div><div class='add'>+           sodipodi:nodetypes="czzzzzzczczczczzzc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8818-1);enable-background:accumulate"</div><div class='add'>+           d="m 770.74639,609.17881 -50.91169,97.58074 -79.90307,111.01576 34.64824,71.41778 42.42641,79.19597 72.12489,-45.25484 14.14214,-192.33305 21.2132,-138.59292 -14.14214,-90.15612 -39.59798,107.12668 z"</div><div class='add'>+           id="path8057-9"</div><div class='add'>+           clip-path="url(#clipPath8622-5)"</div><div class='add'>+           sodipodi:nodetypes="cccccccccc"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter8810-3);enable-background:accumulate"</div><div class='add'>+           d="m 295,846.19519 6.64488,-68.92285 c 0,0 90.31951,89.00457 162.35512,122.92285 72.03561,33.91828 308,62 308,62 l 154,-26 -36,162.00001 -286,26 -298,-89 -11,-189.00001 z"</div><div class='add'>+           id="path8059-1"</div><div class='add'>+           clip-path="url(#clipPath8906-9)"</div><div class='add'>+           sodipodi:nodetypes="cczcccccc"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           transform="translate(450.03125,73.843964)"</div><div class='add'>+           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3587-1);enable-background:new"</div><div class='add'>+           d="m 405.79629,845.99023 74.95332,65.05383 2.49963,16.8804 19.40336,10.15891 6.49204,23.05109 31.70905,-8.3711 14.84924,48.08324 c 12.25652,12.7279 89.79344,-113.1097 55.86143,38.1838 l -60.81118,16.2635 -89.20292,-94.69286 -62.82503,-53.79963 7.07106,-60.81118 z"</div><div class='add'>+           id="path8061-9"</div><div class='add'>+           sodipodi:nodetypes="cccccccccccc"</div><div class='add'>+           clip-path="url(#clipPath3602-4)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#121212;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"</div><div class='add'>+           d="m 1159.317,918.349 c 54.2857,-1.42857 126.035,-15.05199 170,-26.78572 44.0527,-11.75714 125.8863,-36.34724 175.357,-57.85714 49.3393,-21.45272 113.6038,-59.2816 154.2859,-92.14285 40.5081,-32.72069 52.3899,-55.81981 60.7142,-33.57143 8.3691,22.36779 -16.4069,56.32562 -37.8571,81.07143 -21.6042,24.9234 -52.7314,52.70533 -98.9287,89.28571 -46.1973,36.58038 -156.0825,101.58463 -212.8571,128.5714 -57.066,27.1254 -128.2033,58.2385 -172.1428,72.5001 -43.9395,14.2616 -131.4286,31.0714 -131.4286,31.0714 L 1159.317,918.349 Z"</div><div class='add'>+           id="path8063-6"</div><div class='add'>+           sodipodi:nodetypes="czzzzzzzzcc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           transform="translate(450.03125,73.843964)"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:url(#linearGradient6973);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter3779-4);enable-background:accumulate"</div><div class='add'>+           d="m 1241.5965,652.95007 c 0,0 -64.7215,54.33706 -145.6639,98.99494 -82.0244,45.25484 -284.25704,93.3381 -284.25704,93.3381 0,0 -15.10137,21.05196 45.25489,28.28428 60.35626,7.23232 224.08195,-53.30069 278.60015,-96.16654 54.5182,-42.86585 120.2081,-111.72286 120.2081,-111.72286 l -14.1422,-12.72792 z"</div><div class='add'>+           id="path8065-2"</div><div class='add'>+           sodipodi:nodetypes="czczzcc"</div><div class='add'>+           clip-path="url(#clipPath3992-4)" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           transform="translate(450.03125,73.843964)"</div><div class='add'>+           style="display:inline;opacity:1;enable-background:new"</div><div class='add'>+           id="g8067-5"</div><div class='add'>+           clip-path="url(#clipPath3986-7)"&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             transform="translate(-174.03125,62.156036)"</div><div class='add'>+             style="filter:url(#filter3677-5)"</div><div class='add'>+             id="g8069-4"&gt;</div><div class='add'>+            &lt;g</div><div class='add'>+               style="filter:url(#filter3785-4)"</div><div class='add'>+               id="g8071-4"&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 sodipodi:nodetypes="czzccccc"</div><div class='add'>+                 id="path8073-9"</div><div class='add'>+                 d="m 1094.2857,725.93361 c 0,0 -0.2961,26.16091 4.6428,37.85715 4.9389,11.69624 20.0381,26.48665 28.5715,31.42857 8.5334,4.94192 18.9286,8.57142 18.9286,8.57142 l 117.8571,-115 17.8572,-75.71428 -96.4286,38.57143 -91.4286,74.28571 z"</div><div class='add'>+                 style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+                 transform="translate(174.03125,-62.156036)" /&gt;</div><div class='add'>+              &lt;rect</div><div class='add'>+                 y="486.14224"</div><div class='add'>+                 x="1197.8389"</div><div class='add'>+                 height="309.71277"</div><div class='add'>+                 width="333.75412"</div><div class='add'>+                 id="rect8075-9"</div><div class='add'>+                 style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+            &lt;/g&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             transform="translate(-174.03125,62.156036)"</div><div class='add'>+             style="display:inline;opacity:0.18000004;enable-background:new"</div><div class='add'>+             id="g8077-3"&gt;</div><div class='add'>+            &lt;g</div><div class='add'>+               style="filter:url(#filter3785-4)"</div><div class='add'>+               id="g8079-6"&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 sodipodi:nodetypes="czzccccc"</div><div class='add'>+                 id="path8081-0"</div><div class='add'>+                 d="m 1094.2857,725.93361 c 0,0 -0.2961,26.16091 4.6428,37.85715 4.9389,11.69624 20.0381,26.48665 28.5715,31.42857 8.5334,4.94192 18.9286,8.57142 18.9286,8.57142 l 117.8571,-115 17.8572,-75.71428 -96.4286,38.57143 -91.4286,74.28571 z"</div><div class='add'>+                 style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+                 transform="translate(174.03125,-62.156036)" /&gt;</div><div class='add'>+              &lt;rect</div><div class='add'>+                 y="486.14224"</div><div class='add'>+                 x="1197.8389"</div><div class='add'>+                 height="309.71277"</div><div class='add'>+                 width="333.75412"</div><div class='add'>+                 id="rect8083-5"</div><div class='add'>+                 style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+            &lt;/g&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           transform="translate(450.03125,73.843964)"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.83300003;fill:#050505;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter8225-7);enable-background:accumulate"</div><div class='add'>+           d="m 1264.1875,605 c -4.4911,0.73268 -8.157,3.45509 -11.9375,6.40625 -10.0813,7.86976 -28.1695,34.42524 -48.0312,50.46875 -39.8674,32.20316 -103.996,69.97701 -152.5626,91.09375 -48.614,21.13738 -130.54122,45.81801 -174.31245,57.5 -43.39821,11.58246 -115.04403,25.13107 -168.25,26.53125 l -4.5625,0.125 -2,4.125 -92.84375,192.125 -6.5,13.4688 14.65625,-2.8438 c 0,0 87.26968,-16.6514 132.34375,-31.2812 44.7252,-14.51667 115.79086,-45.66683 173.03125,-72.87505 C 980.82199,912.46306 1090.1551,847.86412 1137.5,810.375 c 46.3608,-36.70982 77.8049,-64.71682 99.9375,-90.25 10.9011,-12.576 22.7448,-27.53144 31.0313,-42.75 8.2864,-15.21856 19.1597,-44.21808 13.6874,-58.84375 -1.2177,-3.25474 -2.5514,-6.0613 -4.5937,-8.5 -2.0423,-2.4387 -8.4747,-1.57199 -8.5625,-5.03125 -0.2098,-8.26482 -3.3155,-0.24423 -4.8125,0 z m 2.1563,15.21875 c 0.4148,0.58574 1.0311,1.55766 1.7812,3.5625 2.8968,7.74213 -1.4407,31.89875 -8.8125,45.4375 -7.3718,13.53875 -22.6384,28.92394 -33.1875,41.09375 -21.0754,24.31356 -51.9037,51.86156 -97.9375,88.3125 -45.0496,35.67159 -155.46033,101.09459 -211.40625,127.6875 -56.89173,27.04249 -128.09616,58.1184 -171.25,72.125 -36.36491,11.8031 -95.84471,23.8338 -115.71875,27.7813 L 714.09375,851.75 c 54.70691,-2.0493 123.79259,-15.21635 167.125,-26.78125 44.33422,-11.83225 126.07865,-36.33633 176.40625,-58.21875 50.112,-21.78871 112.5344,-61.16816 154.0312,-94.6875 20.6464,-16.67721 41.7449,-42.54588 49.8126,-48.84375 2.437,-1.90242 4.0806,-2.6358 4.875,-3 z"</div><div class='add'>+           id="path8085-0"</div><div class='add'>+           clip-path="url(#clipPath3722-3)"</div><div class='add'>+           sodipodi:nodetypes="cssssccccccssssssssccssssssccssssc" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           style="display:inline;opacity:1;enable-background:new"</div><div class='add'>+           id="g8087-2"</div><div class='add'>+           mask="url(#mask7704-9)"</div><div class='add'>+           transform="matrix(0.9934486,0.1142802,-0.1142802,0.9934486,-9.24324,588.09054)"</div><div class='add'>+           inkscape:transform-center-x="-185.09603"</div><div class='add'>+           inkscape:transform-center-y="-12.859654"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             transform="translate(0.08004571,-0.03125)"</div><div class='add'>+             style="display:inline;fill:#bcb786;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+             d="m 1111.4062,-285.9375 -3.9374,1.875 c -0.041,0.0102 -0.1,0.0205 -0.125,0.0312 -0.4188,0.21285 -0.1647,0.10058 -0.6563,0.3125 -0.4861,0.20956 -1.7376,0.58419 -4.0937,1.46875 -3.3312,1.25058 -5.8043,2.14984 -7,3.0625 -1.5362,0.0213 -3.7205,0.23331 -5.6563,0.71875 -2.9815,0.74767 -4.8552,1.17401 -6.75,1.59375 -1.8948,0.41973 -1.6755,0.64219 -2.875,0.875 -1.2966,0.25167 -1.7214,-0.009 -5.4375,0.78125 -3.4899,0.74215 -8.8948,1.93107 -10.1562,2.6875 -1.584,-0.18078 -3.8675,-0.32178 -5.8438,-0.0312 -3.0404,0.44696 -4.9162,0.67276 -6.8438,0.90625 -0.6554,0.0794 -1.041,0.20078 -1.3437,0.28125 -0.4262,0.13166 -0.6858,0.26002 -1.375,0.34375 -1.3116,0.15937 -1.7622,-0.15683 -5.5313,0.28125 -3.5539,0.41309 -9.0054,1.27282 -10.25,1.9375 -1.599,-0.29729 -3.8577,-0.53419 -5.8437,-0.34375 -3.0588,0.29332 -4.972,0.48399 -6.9063,0.65625 -1.9342,0.17227 -1.6886,0.42237 -2.9062,0.53125 -1.3162,0.1177 -1.7598,-0.16363 -5.5312,0.25 -3.5421,0.38845 -9.0079,1.20927 -10.2813,1.875 -1.5989,-0.29469 -3.8872,-0.50701 -5.875,-0.3125 -3.05829,0.29925 -4.9412,0.48024 -6.875,0.65625 -0.65749,0.0598 -1.04005,0.17856 -1.34375,0.25 -0.4277,0.11896 -0.6835,0.21807 -1.375,0.28125 -1.316,0.12026 -1.75975,-0.19488 -5.53125,0.21875 -3.55619,0.39002 -9.0056,1.23916 -10.25,1.90625 -1.59869,-0.29418 -3.85985,-0.52372 -5.84375,-0.3125 -3.0557,0.32533 -4.97405,0.52624 -6.90625,0.71875 -1.93219,0.19251 -1.68975,0.44088 -2.90625,0.5625 -1.31488,0.13147 -1.76305,-0.16454 -5.53125,0.28125 -3.53889,0.41866 -8.9777,1.29217 -10.25,1.96875 -1.59759,-0.28104 -3.85995,-0.42043 -5.84375,-0.1875 -3.05198,0.35837 -4.945,0.56786 -6.875,0.78125 -0.65618,0.0726 -1.04065,0.17269 -1.34375,0.25 -0.42679,0.12723 -0.6849,0.2672 -1.375,0.34375 -1.31339,0.14569 -1.76735,-0.17402 -5.53125,0.3125 -3.54888,0.45876 -8.97865,1.41902 -10.21875,2.125 -1.59309,-0.24424 -3.8338,-0.38135 -5.8125,-0.125 -3.04759,0.39482 -4.9507,0.64845 -6.875,0.90625 -1.92429,0.25779 -1.7261,0.49353 -2.9375,0.65625 -1.30949,0.1759 -1.7472,-0.10438 -5.5,0.46875 -3.52429,0.53824 -8.9232,1.69917 -10.1875,2.4375 -1.58749,-0.20354 -3.8455,-0.25473 -5.8125,0.0937 -3.02619,0.53612 -4.8989,0.86169 -6.8125,1.1875 -0.65059,0.11077 -1.0137,0.27094 -1.3125,0.375 -0.42069,0.16488 -0.66345,0.3313 -1.34375,0.46875 -1.2947,0.26159 -1.7271,-0.006 -5.4375,0.8125 -3.49848,0.77195 -8.8459,2.38293 -10.0625,3.21875 -1.5629,-0.0774 -3.7575,0.0853 -5.6875,0.59375 -2.97238,0.78313 -4.8177,1.23209 -6.6875,1.75 -1.87,0.5179 -1.66665,0.76728 -2.84375,1.09375 -1.27249,0.3529 -1.69705,0.10709 -5.34375,1.1875 -3.42468,1.01463 -8.6494,2.93317 -9.875,3.84375 -1.53878,0.0127 -3.7198,0.27222 -5.625,0.875 -2.93098,0.92734 -4.75035,1.45842 -6.59375,2.0625 -0.62679,0.20538 -0.99165,0.39258 -1.28125,0.53125 -0.40758,0.21361 -0.6533,0.40875 -1.3125,0.625 -1.2545,0.41154 -1.68615,0.18904 -5.28125,1.4375 -3.38989,1.17717 -8.59495,3.2137 -9.78125,4.15625 -1.52388,0.0597 -3.65005,0.39487 -5.53125,1.0625 -2.89739,1.02829 -4.69905,1.67548 -6.53125,2.3125 -1.8322,0.63701 -1.62785,0.84854 -2.78125,1.25 -1.24679,0.43396 -1.66355,0.19972 -5.21875,1.5625 -3.3387,1.2798 -8.4871,3.48255 -9.6875,4.46875 -1.50718,0.10769 -3.6357,0.4988 -5.5,1.21875 -2.86818,1.1076 -4.6239,1.78156 -6.4375,2.46875 -0.6167,0.23363 -0.99645,0.44203 -1.28125,0.59375 10e-6,0 0,0.0295 0,0.0312 l -8,3.1875 -12.4759,3.49189 7.92966,19.27772 c -0.59163,1.97357 12.54624,-4.73836 12.54624,-4.73836 0.22641,-0.14468 0.44895,-0.27261 0.71875,-0.375 1.08052,-0.40998 2.1716,-0.21577 6,-1.6875 3.82852,-1.47174 5.22405,-2.00498 5.90625,-2.40625 0.67961,-0.39978 1.61175,-0.87937 2.21875,-1.53125 1.82692,-0.13775 3.5708,-0.49323 4.9375,-1 2.968,-1.10052 4.87535,-1.80619 6.78125,-2.46875 1.90581,-0.66254 2.35415,-1.41487 3.40625,-1.78125 1.09162,-0.38011 2.1951,-0.16538 6.0625,-1.53125 3.8674,-1.36586 5.28315,-1.82708 5.96875,-2.21875 0.70111,-0.40052 1.7008,-0.93298 2.3125,-1.59375 1.97081,-0.0547 3.81695,-0.38463 5.28125,-0.875 3.00152,-1.00508 4.92615,-1.62171 6.84375,-2.25 1.53861,-0.5041 2.17415,-1.04677 2.90625,-1.4375 0.23022,-0.13431 0.4759,-0.25373 0.75,-0.34375 1.09832,-0.36048 2.18145,-0.0814 6.09375,-1.3125 3.91231,-1.23113 5.366,-1.67295 6.0625,-2.03125 0.69391,-0.35697 1.6301,-0.79261 2.25,-1.40625 1.86521,-0.0227 3.63585,-0.26683 5.03125,-0.6875 3.0304,-0.91354 4.9924,-1.4301 6.9375,-1.96875 1.94512,-0.53864 2.4262,-1.26452 3.5,-1.5625 1.11402,-0.30915 2.22,0.007 6.1875,-1.03125 3.9675,-1.03863 5.4175,-1.43273 6.125,-1.75 0.7348,-0.32959 1.8139,-0.75372 2.4375,-1.375 1.99782,0.116 3.85745,-0.0201 5.34375,-0.375 3.07811,-0.735 5.0834,-1.10094 7.0625,-1.5 1.58791,-0.32018 2.2443,-0.79055 3,-1.09375 0.23751,-0.1068 0.4669,-0.19276 0.75,-0.25 1.13341,-0.22919 2.30465,0.20893 6.34375,-0.5 4.03942,-0.70893 5.50025,-0.92709 6.21875,-1.1875 0.71581,-0.25944 1.70435,-0.56724 2.34375,-1.09375 1.9242,0.23949 3.7479,0.22453 5.1875,0 3.12642,-0.48762 5.15455,-0.70067 7.15625,-0.96875 2.00171,-0.26807 2.48875,-0.94514 3.59375,-1.09375 1.14642,-0.15418 2.27585,0.30157 6.34375,-0.21875 4.06781,-0.52032 5.56025,-0.69573 6.28125,-0.9375 0.73712,-0.24714 1.7981,-0.58623 2.4375,-1.125 2.05,0.33553 3.9737,0.39796 5.5,0.21875 3.1422,-0.36896 5.18,-0.55936 7.1875,-0.78125 1.61082,-0.17802 2.26465,-0.6082 3.03125,-0.84375 0.24091,-0.0855 0.49405,-0.1556 0.78125,-0.1875 1.1497,-0.12772 2.3013,0.34665 6.375,-0.125 4.0737,-0.47165 5.55905,-0.6106 6.28125,-0.84375 0.71941,-0.23227 1.70025,-0.47346 2.34375,-0.96875 1.9363,0.33346 3.77005,0.40424 5.21875,0.25 3.14601,-0.33495 5.1775,-0.51859 7.1875,-0.71875 2.00991,-0.20014 2.48415,-0.82639 3.59375,-0.9375 1.1511,-0.11528 2.2965,0.36506 6.375,-0.0625 4.0785,-0.42756 5.5889,-0.56209 6.3125,-0.78125 0.73922,-0.22386 1.7956,-0.51325 2.4375,-1.03125 2.057,0.39867 4.00185,0.4934 5.53125,0.34375 3.14871,-0.3081 5.1758,-0.47325 7.1875,-0.65625 1.61401,-0.14682 2.26305,-0.56055 3.03125,-0.78125 0.2413,-0.0809 0.49355,-0.12991 0.78125,-0.15625 1.15211,-0.10545 2.2929,0.39275 6.375,0 4.08211,-0.39275 5.5889,-0.53084 6.3125,-0.75 0.7209,-0.21833 1.6996,-0.4477 2.3437,-0.9375 1.9381,0.34999 3.7689,0.45438 5.2188,0.3125 3.1487,-0.3081 5.1758,-0.47325 7.1875,-0.65625 2.0116,-0.18299 2.5142,-0.83802 3.625,-0.9375 1.1523,-0.10323 2.2922,0.38483 6.375,0 4.0829,-0.38482 5.5887,-0.501 6.3125,-0.71875 0.7393,-0.22243 1.7956,-0.51449 2.4375,-1.03125 2.0574,0.40177 4.0029,0.50333 5.5313,0.34375 3.1465,-0.32852 5.177,-0.5227 7.1874,-0.71875 1.613,-0.15729 2.2657,-0.63148 3.0313,-0.875 0.2407,-0.088 0.4632,-0.12137 0.75,-0.15625 1.1483,-0.1397 2.3167,0.33991 6.375,-0.25 4.0583,-0.58992 5.5618,-0.77714 6.2813,-1.03125 0.7166,-0.25316 1.6746,-0.55807 2.3124,-1.09375 1.9197,0.21194 3.72,0.15141 5.1563,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0937,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5626,-1.28125 1.1287,-0.25066 2.2702,0.11629 6.25,-0.875 3.9795,-0.99127 5.4295,-1.4193 6.125,-1.78125 0.7222,-0.376 1.7617,-0.87058 2.375,-1.53125 1.9629,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.1446 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70652 2.3191,-1.70203 2.5312,-2 0.2123,-0.29795 0.099,-0.72855 0.125,-0.75 0.043,-0.0352 0.3404,-0.094 0.5,-0.4375 0.859,-1.84707 2.3232,-5.62764 2.4376,-6.3125 0.1137,-0.68214 0.168,-1.35277 0.2187,-1.75 0.029,-0.2295 -0.1471,-0.8789 -0.125,-0.9375 0.031,-0.082 0.2883,-0.25057 0.3437,-0.5 0.2663,-1.19831 0.089,-2.20736 -0.125,-3.625 -0.2139,-1.41763 -0.9716,-4.61463 -1.625,-5.46875 -0.6589,-0.86172 -1.2248,-1.01051 -1.75,-1 z"</div><div class='add'>+             id="path8089-9"</div><div class='add'>+             sodipodi:nodetypes="ccssscsssscssssscsssscssssscsssscssssscsssscssssscsssscssssscsssscssscccccssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsssssssssssc" /&gt;</div><div class='add'>+          &lt;g</div><div class='add'>+             clip-path="url(#clipPath7421-7)"</div><div class='add'>+             id="g8091-4"&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8093-3"</div><div class='add'>+               d="m 1107.409,-284.04961 c -0.4187,0.21283 -0.1556,0.0939 -0.6472,0.30581 -0.4861,0.20954 -1.7234,0.57439 -4.0796,1.45895 -3.3311,1.25057 -5.8302,2.15344 -7.0259,3.0661 -1.5361,0.0213 -3.7205,0.23331 -5.6563,0.71875 -2.9815,0.74766 -4.8552,1.17401 -6.75,1.59375 -1.8948,0.41972 -1.6755,0.64219 -2.875,0.875 -1.2966,0.25166 -1.7214,-0.009 -5.4375,0.78125 -3.4899,0.74214 -8.8948,1.93107 -10.1562,2.6875 -1.5839,-0.18079 -3.8675,-0.32178 -5.8438,-0.0312 -3.0404,0.44695 -4.9162,0.67276 -6.8437,0.90625 -0.6554,0.0794 -1.0411,0.20078 -1.3438,0.28125 -0.4262,0.13165 -0.6858,0.26002 -1.375,0.34375 -1.3116,0.15936 -1.7622,-0.15683 -5.5312,0.28125 -3.5539,0.41308 -9.0054,1.27282 -10.25,1.9375 -1.599,-0.2973 -3.8578,-0.53419 -5.8438,-0.34375 -3.0588,0.29331 -4.972,0.48399 -6.9062,0.65625 -1.9343,0.17226 -1.6887,0.42237 -2.9063,0.53125 -1.3162,0.11769 -1.7598,-0.16363 -5.5312,0.25 -3.5419,0.38844 -9.0079,1.20927 -10.2813,1.875 -1.5989,-0.2947 -3.88717,-0.50701 -5.875,-0.3125 -3.05824,0.29924 -4.94113,0.48024 -6.875,0.65625 -0.65749,0.0598 -1.04004,0.17856 -1.34375,0.25 -0.42765,0.11895 -0.68351,0.21807 -1.375,0.28125 -1.31596,0.12025 -1.75976,-0.19488 -5.53125,0.21875 -3.55614,0.39001 -9.00554,1.23916 -10.25,1.90625 -1.59863,-0.29419 -3.85984,-0.52372 -5.84375,-0.3125 -3.0556,0.32532 -4.97404,0.52624 -6.90625,0.71875 -1.93221,0.1925 -1.68987,0.44088 -2.90625,0.5625 -1.31488,0.13146 -1.76298,-0.16454 -5.53125,0.28125 -3.53887,0.41865 -8.97768,1.29217 -10.25,1.96875 -1.59755,-0.28105 -3.85996,-0.42043 -5.84375,-0.1875 -3.05198,0.35836 -4.94508,0.56786 -6.875,0.78125 -0.6562,0.0725 -1.04066,0.17269 -1.34375,0.25 -0.42677,0.12722 -0.68491,0.2672 -1.375,0.34375 -1.31333,0.14568 -1.76746,-0.17402 -5.53125,0.3125 -3.54889,0.45875 -8.97863,1.41902 -10.21875,2.125 -1.59305,-0.24424 -3.83381,-0.38135 -5.8125,-0.125 -3.04759,0.39481 -4.95071,0.64845 -6.875,0.90625 -1.92428,0.25779 -1.72611,0.49353 -2.9375,0.65625 -1.30946,0.1759 -1.74719,-0.10438 -5.5,0.46875 -3.52429,0.53824 -8.92315,1.69917 -10.1875,2.4375 -1.5875,-0.20354 -3.8455,-0.25473 -5.8125,0.0937 -3.02617,0.53612 -4.89889,0.86169 -6.8125,1.1875 -0.65061,0.11077 -1.01371,0.27094 -1.3125,0.375 -0.42067,0.16488 -0.66345,0.3313 -1.34375,0.46875 -1.29465,0.26159 -1.72712,-0.006 -5.4375,0.8125 -3.49853,0.77195 -8.84595,2.38293 -10.0625,3.21875 -1.56278,-0.0774 -3.75758,0.0853 -5.6875,0.59375 -2.97244,0.78313 -4.81761,1.23209 -6.6875,1.75 -1.86988,0.5179 -1.6666,0.76728 -2.84375,1.09375 -1.27246,0.3529 -1.69703,0.10709 -5.34375,1.1875 -3.4247,1.01463 -8.64944,2.93317 -9.875,3.84375 -1.53883,0.0127 -3.71983,0.27222 -5.625,0.875 -2.93106,0.92734 -4.75031,1.45842 -6.59375,2.0625 -0.62676,0.20538 -0.99173,0.39258 -1.28125,0.53125 -0.40763,0.21361 -0.65334,0.40875 -1.3125,0.625 -1.25446,0.41154 -1.68611,0.18904 -5.28125,1.4375 -3.38985,1.17717 -8.59498,3.2137 -9.78125,4.15625 -1.52389,0.0597 -3.65005,0.39487 -5.53125,1.0625 -2.89739,1.02829 -4.69908,1.67548 -6.53125,2.3125 -1.83217,0.63701 -1.62785,0.84854 -2.78125,1.25 -1.24678,0.43396 -1.66361,0.19972 -5.21875,1.5625 -3.33867,1.2798 -8.48715,3.48255 -9.6875,4.46875 -1.50718,0.10769 -3.63569,0.4988 -5.5,1.21875 -2.86818,1.1076 -4.6238,1.78156 -6.4375,2.46875 -0.61666,0.23363 -0.99641,0.44203 -1.28125,0.59375 0,0 0,1.09375 0,1.09375 0.11178,-0.22236 0.38599,-0.81743 0.90625,-1.09375 0.69797,-0.37072 4.81363,-1.99337 6.8125,-2.71875 1.65686,-0.60125 4.15389,-1.32868 5.96875,-1.3125 0.30162,0.003 0.58762,0.0509 0.84375,0.0937 1.84249,0.30825 7.46875,1.5625 7.46875,1.5625 -10e-6,0 -6.23349,-1.64675 -7.03125,-1.84375 -0.19079,-0.0471 -0.53572,-0.0687 -0.96875,-0.0625 1.14546,-0.86971 4.761,-2.39351 7.34375,-3.4375 2.83822,-1.14727 3.11681,-1.25182 5.0625,-1.65625 2.0083,-0.41744 3.15625,-0.5 3.15625,-0.5 0,10e-6 -0.0824,-0.60114 0.96875,-1.125 0.7051,-0.35141 4.88702,-1.8924 6.90625,-2.5625 1.9519,-0.64773 5.0574,-1.3585 6.875,-1 1.86323,0.3675 7.53125,1.8125 7.53125,1.8125 10e-6,0 -6.287,-1.87111 -7.09375,-2.09375 -0.19292,-0.0532 -0.53084,-0.086 -0.96875,-0.0937 1.15834,-0.83288 4.79444,-2.19532 7.40625,-3.15625 2.87016,-1.05601 3.16734,-1.1618 5.125,-1.53125 1.85349,-0.34979 2.85884,-0.42548 3.03125,-0.4375 0.1136,-0.21724 0.37745,-0.81002 0.90625,-1.0625 0.70944,-0.33874 4.92607,-1.71275 6.96875,-2.3125 1.69317,-0.49711 4.24077,-1.03677 6.09375,-0.90625 0.30795,0.0217 0.61349,0.0973 0.875,0.15625 1.88118,0.42432 7.59375,2.03125 7.59375,2.03125 10e-6,0 -6.34174,-2.06525 -7.15625,-2.3125 -0.19479,-0.0591 -0.55788,-0.10394 -1,-0.125 1.16949,-0.79755 4.86302,-2.05622 7.5,-2.9375 2.89781,-0.96847 3.23301,-1.00332 5.21875,-1.28125 2.04965,-0.28689 3.1875,-0.3125 3.1875,-0.3125 -2e-5,0 -0.0728,-0.60697 1,-1.0625 0.7196,-0.30557 4.99098,-1.50075 7.0625,-2 2.00244,-0.48258 5.19849,-0.92829 7.0625,-0.40625 1.91078,0.53515 7.71875,2.5 7.71875,2.5 0,0 -6.42266,-2.42351 -7.25,-2.71875 -0.19784,-0.0706 -0.58216,-0.14039 -1.03125,-0.1875 1.1879,-0.72865 4.91527,-1.77408 7.59375,-2.5 2.94342,-0.79775 3.29208,-0.77083 5.3125,-0.90625 1.91289,-0.12823 2.94705,-0.0711 3.125,-0.0625 0.11728,-0.20366 0.39176,-0.77948 0.9375,-0.96875 0.73219,-0.25394 5.07852,-1.04789 7.1875,-1.375 1.74813,-0.27111 4.40088,-0.4847 6.3125,-0.0937 0.31766,0.065 0.60522,0.18551 0.875,0.28125 1.94074,0.68873 7.84375,3.09375 7.84375,3.09375 10e-6,0 -6.53471,-2.95077 -7.375,-3.3125 -0.20097,-0.0865 -0.57513,-0.16679 -1.03125,-0.25 1.2065,-0.63318 5.02956,-1.3956 7.75,-1.90625 2.98953,-0.56119 3.30023,-0.52954 5.34375,-0.53125 2.10926,-0.002 3.3125,0.125 3.3125,0.125 0,1e-5 -0.0727,-0.63119 1.03125,-0.9375 0.74052,-0.20547 5.12612,-0.83387 7.25,-1.0625 2.05302,-0.22099 5.31863,-0.25222 7.21875,0.46875 1.94779,0.73907 7.84375,3.375 7.84375,3.375 2e-5,0 -6.56288,-3.17897 -7.40625,-3.5625 -0.20168,-0.0917 -0.54221,-0.18621 -1,-0.28125 1.21092,-0.60188 4.98442,-1.24884 7.71875,-1.65625 3.0048,-0.44772 3.32551,-0.4517 5.375,-0.40625 1.94045,0.043 3.00699,0.19423 3.1875,0.21875 0.11892,-0.19316 0.3839,-0.76583 0.9375,-0.90625 0.74271,-0.18838 5.15429,-0.73428 7.28125,-0.9375 1.76303,-0.16842 4.42009,-0.23429 6.34375,0.25 0.31968,0.0805 0.60351,0.20359 0.875,0.3125 1.95293,0.78349 7.90625,3.46875 7.90625,3.46875 -2e-5,0 -6.59191,-3.25348 -7.4375,-3.65625 -0.20222,-0.0963 -0.57226,-0.20703 -1.03125,-0.3125 1.21414,-0.57427 5.04366,-1.12219 7.78125,-1.5 3.00838,-0.4152 3.32307,-0.44263 5.375,-0.375 2.11798,0.0698 3.3125,0.25 3.3125,0.25 -2e-5,0 -0.0773,-0.63741 1.03125,-0.90625 0.74362,-0.18035 5.15176,-0.66355 7.28125,-0.84375 2.05847,-0.17417 5.34324,-0.12432 7.25,0.65625 1.95459,0.80016 7.875,3.53125 7.875,3.53125 -2e-5,0 -6.55993,-3.30876 -7.40625,-3.71875 -0.20237,-0.0981 -0.57186,-0.2031 -1.03125,-0.3125 1.21517,-0.5639 5.01008,-1.1143 7.75,-1.46875 3.01091,-0.38952 3.32131,-0.39765 5.375,-0.3125 1.94439,0.0806 3.00663,0.25324 3.1875,0.28125 0.11916,-0.19086 0.38277,-0.74531 0.9375,-0.875 0.74426,-0.174 5.14993,-0.65047 7.28125,-0.8125 1.76662,-0.13427 4.4497,-0.12571 6.375,0.375 0.32,0.0832 0.6033,0.20127 0.875,0.3125 1.9546,0.80016 7.9063,3.5625 7.9063,3.5625 -10e-5,0 -6.5912,-3.34001 -7.4375,-3.75 -0.2024,-0.0981 -0.5719,-0.20311 -1.0313,-0.3125 1.2151,-0.5639 5.0413,-1.08306 7.7813,-1.4375 3.0109,-0.38953 3.3525,-0.4289 5.4062,-0.34375 2.1197,0.0879 3.3125,0.3125 3.3125,0.3125 0,0 -0.078,-0.64902 1.0313,-0.90625 0.7443,-0.17256 5.1495,-0.62336 7.2812,-0.78125 2.0606,-0.1526 5.3429,-0.0968 7.25,0.6875 1.955,0.80395 7.875,3.5 7.875,3.5 0,0 -6.5598,-3.27587 -7.4062,-3.6875 -0.2025,-0.0984 -0.5718,-0.20222 -1.0313,-0.3125 1.2154,-0.56154 5.0119,-1.12778 7.75,-1.5 3.009,-0.40905 3.3227,-0.41558 5.375,-0.34375 1.9431,0.068 3.0072,0.16485 3.1875,0.1875 0.1188,-0.1944 0.3846,-0.72881 0.9375,-0.875 0.7418,-0.19612 5.1311,-0.82878 7.25,-1.09375 1.7564,-0.21961 4.4053,-0.33231 6.3125,0.0312 0.3169,0.0604 0.6058,0.18938 0.875,0.28125 1.9362,0.66092 7.8438,2.9375 7.8438,2.9375 -1e-4,0 -6.5367,-2.80655 -7.375,-3.15625 -0.2005,-0.0836 -0.5762,-0.17333 -1.0313,-0.25 1.2037,-0.65046 5.0191,-1.37195 7.7188,-2 2.9667,-0.6902 3.2889,-0.75507 5.3125,-0.875 2.0886,-0.1238 3.2812,-0.0312 3.2812,-0.0312 0,1e-5 -0.087,-0.63205 1,-1.03125 0.7292,-0.2678 5.0472,-1.33797 7.125,-1.8125 2.0085,-0.45869 5.1679,-1.0293 7,-0.625 1.8781,0.41446 13.5782,3.01563 13.5782,3.01563 0,0 -12.3275,-3.02266 -13.1407,-3.26563 -0.1945,-0.0581 -0.5586,-0.10626 -1,-0.125 1.1676,-0.80369 3.5142,-1.6873 6.1094,-2.70312 1.6814,-0.65818 0.9237,-0.37659 2.7759,-1.0036 1.7536,-0.59366 2.4854,-1.01071 2.6304,-1.11299 0.3461,-0.20651 -0.356,-0.12188 -0.5442,-0.0424 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7001-5);enable-background:new"</div><div class='add'>+               sodipodi:nodetypes="czscsssscssssscsssscssssscsssscssssscsssscssssscsssscssssscsssscssccsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscc" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8095-5"</div><div class='add'>+               d="m 1082.625,-275.125 c 1.873,0.39348 4.4961,1.14555 6.0313,1.96875 1.5352,0.82319 2.8222,1.056 5.375,2.5 2.5266,1.42926 4.7958,2.00696 6.9687,2.53125 2.3476,0.56642 5.4354,0.71523 8.8438,1.1875 -1.0889,-0.83975 -6.6074,-1.17245 -8.4063,-1.5625 -1.7989,-0.39006 -3.8941,-1.01616 -6.5937,-2.3125 -2.6997,-1.29634 -3.4944,-1.79896 -5.8125,-2.6875 -2.3182,-0.88854 -4.0044,-1.38314 -6.4063,-1.625 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6949-4);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8097-1"</div><div class='add'>+               d="m 1051.4688,-270 c 1.9053,0.57759 4.5281,1.61572 6.0937,2.59375 1.5656,0.97802 2.8802,1.35981 5.5,3.125 2.593,1.74716 4.9859,2.70927 7.25,3.59375 2.4461,0.95557 5.6826,1.65713 9.4063,3.0625 -1.1896,-1.13784 -7.0631,-2.68675 -8.9375,-3.375 -1.8745,-0.68825 -4.0818,-1.5662 -6.875,-3.28125 -2.7933,-1.71504 -3.5736,-2.2839 -5.9375,-3.40625 -2.3641,-1.12234 -4.0567,-1.83455 -6.5,-2.3125 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6961-8);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8099-7"</div><div class='add'>+               d="m 1020.2188,-266.84375 c 1.9119,0.63811 4.5812,1.75536 6.1562,2.8125 1.5751,1.05715 2.8956,1.50867 5.5313,3.40625 2.6086,1.87821 5.0284,3.03003 7.3125,4.0625 2.4677,1.11545 5.7645,2.1733 9.5312,3.84375 -1.2033,-1.22253 -7.2028,-3.31423 -9.0937,-4.125 -1.891,-0.81077 -4.0649,-1.89379 -6.875,-3.75 -2.8102,-1.8562 -3.6218,-2.47693 -6,-3.71875 -2.3783,-1.2418 -4.1107,-1.97569 -6.5625,-2.53125 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6957-9);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8101-4"</div><div class='add'>+               d="m 1110.1719,-266.89063 c 0.1508,0.0486 0.688,0.631 0.1094,1.48438 -0.8101,1.19459 -5.7049,3.32429 -8.5625,4.125 -2.8449,0.79712 -6.2901,0.97774 -10.5625,-0.375 -4.3016,-1.36195 -5.4697,-2.46872 -10.6563,-4.3125 4.664,2.11517 6.1953,3.95233 10.125,5.34375 1.6207,0.57387 3.3671,0.9396 5.0625,1.03125 -0.4451,0.32563 -1.5303,0.9833 -3.5625,1.59375 -2.7955,0.83969 -6.6491,1.53378 -8.25,1.625 -1.5146,0.0863 -3.142,-0.51249 -3.4375,-0.625 0.1667,0.10308 0.3732,0.37734 -0.25,1.03125 -0.8993,0.94363 -6.1474,1.923 -9.125,2.25 -2.9643,0.32555 -6.5216,-0.016 -10.9062,-1.90625 -3.978,-1.71497 -5.339,-2.91536 -9.4063,-4.75 0,0 0,0.15625 0,0.15625 3.6431,2.09529 5.284,3.88327 8.875,5.5625 1.7302,0.80909 3.5917,1.40876 5.4063,1.71875 -0.5349,0.28676 -1.5578,0.71151 -3.4375,1.03125 -2.869,0.48796 -6.809,0.81614 -8.4375,0.75 -0.8507,-0.0345 -1.7286,-0.18437 -2.4063,-0.40625 -0.6848,-0.21488 -1.1897,-0.44467 -1.3125,-0.5 0.1694,0.10721 0.4311,0.40288 -0.2187,1.03125 -0.9097,0.87962 -6.2461,1.33638 -9.25,1.46875 -2.9905,0.13179 -6.5889,-0.45063 -11,-2.5625 -4.4412,-2.12626 -5.6415,-3.4016 -10.9063,-5.78125 4.7343,2.59704 6.2865,4.6291 10.3438,6.71875 1.6733,0.86185 3.4852,1.49425 5.25,1.9375 -0.4633,0.23332 -1.5894,0.68814 -3.6875,0.9375 -2.8863,0.34298 -6.8346,0.49288 -8.4688,0.375 -1.5462,-0.1115 -3.2312,-0.85696 -3.5312,-1 0.1691,0.12029 0.4138,0.41048 -0.2188,1 -0.9128,0.85073 -6.2441,1.26212 -9.25,1.375 -2.9925,0.11237 -6.5897,-0.49043 -11,-2.59375 -4.00125,-1.90823 -5.38803,-3.13783 -9.46875,-5.09375 -3e-5,0 0,0.15625 0,0.15625 3.65506,2.20392 5.29421,4.05255 8.90625,5.90625 1.74029,0.89315 3.637,1.52827 5.4688,1.96875 -0.54,0.2483 -1.5781,0.61533 -3.4688,0.84375 -2.88568,0.34858 -6.86605,0.52095 -8.5,0.40625 -0.85345,-0.0599 -1.72631,-0.25791 -2.40625,-0.5 -0.6871,-0.2353 -1.18935,-0.47226 -1.3125,-0.53125 0.16998,0.11227 0.46448,0.42225 -0.1875,1.03125 -0.91265,0.8525 -6.27533,1.29337 -9.28125,1.40625 -2.99246,0.11237 -6.59346,-0.52805 -11,-2.59375 -4.43653,-2.07978 -5.64688,-3.33171 -10.90625,-5.65625 4.72938,2.54749 6.29074,4.5778 10.34375,6.625 1.67155,0.84433 3.48554,1.46643 5.25,1.90625 -0.46323,0.23422 -1.5897,0.68407 -3.6875,0.9375 -2.88569,0.34858 -6.8362,0.56952 -8.46875,0.46875 -1.54456,-0.0953 -3.20031,-0.82885 -3.5,-0.96875 0.16899,0.11853 0.38192,0.40385 -0.25,1 -0.91186,0.86028 -6.24665,1.33025 -9.25,1.46875 -2.98995,0.1379 -6.56745,-0.45068 -10.96875,-2.46875 -3.99308,-1.83089 -5.36511,-3.0292 -9.4375,-4.90625 -2e-5,0 0,0.15625 0,0.15625 3.64761,2.13327 5.27033,3.93487 8.875,5.71875 1.73675,0.85951 3.60727,1.45014 5.4375,1.875 -0.53947,0.2529 -1.55063,0.64129 -3.4375,0.90625 -2.87978,0.40436 -6.83813,0.64562 -8.46875,0.5625 -0.85172,-0.0434 -1.7277,-0.20855 -2.40625,-0.4375 -0.68569,-0.22201 -1.1896,-0.44339 -1.3125,-0.5 0.16959,0.10899 0.4319,0.40965 -0.21875,1.03125 -0.91079,0.87014 -6.25021,1.39152 -9.25,1.5625 -2.98633,0.17021 -6.57381,-0.31577 -10.96875,-2.28125 -4.42489,-1.97888 -5.60596,-3.22819 -10.84375,-5.375 4.70997,2.38767 6.27017,4.38873 10.3125,6.34375 1.66715,0.80631 3.46043,1.39658 5.21875,1.78125 -0.46163,0.2487 -1.597,0.71225 -3.6875,1.03125 -2.8756,0.43876 -6.7804,0.7331 -8.40625,0.6875 -1.53823,-0.0431 -3.2328,-0.74522 -3.53125,-0.875 0.16833,0.11282 0.41057,0.41375 -0.21875,1.03125 -0.90812,0.8911 -6.20295,1.52825 -9.1875,1.8125 -2.97118,0.28298 -6.57342,-0.1758 -10.9375,-1.9375 -3.95934,-1.59831 -5.32915,-2.79487 -9.34375,-4.3125 3e-5,0 0,0.15625 0,0.15625 3.5959,1.81135 5.23831,3.58233 8.8125,5.15625 1.72207,0.75835 3.58748,1.28895 5.40625,1.625 -0.53609,0.27908 -1.56658,0.68763 -3.4375,1.0625 -2.85539,0.5721 -6.78942,1.01939 -8.40625,1.03125 -0.84451,0.006 -1.70608,-0.0809 -2.375,-0.25 -0.67591,-0.16151 -1.16009,-0.32923 -1.28125,-0.375 0.16722,0.094 0.42267,0.38348 -0.21875,1.0625 -0.89787,0.95052 -6.18648,1.91708 -9.125,2.4375 -2.92534,0.51809 -6.43215,0.37424 -10.71875,-1.03125 -4.3158,-1.41507 -5.47277,-2.52994 -10.5625,-3.96875 4.57685,1.75101 6.08855,3.56006 10.03125,5 1.62608,0.59389 3.36885,0.95565 5.09375,1.15625 -0.45285,0.29702 -1.55478,0.88339 -3.59375,1.46875 -2.80472,0.80517 -6.63886,1.57583 -8.21875,1.75 -1.49475,0.1648 -3.11623,-0.31681 -3.40625,-0.40625 0.16356,0.0901 0.39278,0.35993 -0.21875,1.0625 -0.88247,1.01385 -6.04452,2.37165 -8.9375,3.0625 -2.88002,0.68778 -6.3356,0.76002 -10.5625,-0.4375 -3.83485,-1.08645 -5.17258,-2.07237 -9.0625,-3.125 -10e-6,0 0,0.15625 0,0.15625 3.48418,1.39485 5.06941,2.9194 8.53125,4.03125 1.66793,0.53572 3.45578,0.78674 5.21875,0.875 -0.51964,0.35212 -1.50039,0.91452 -3.3125,1.53125 -2.76566,0.94125 -6.59024,1.93537 -8.15625,2.15625 -0.81794,0.11539 -1.6331,0.12283 -2.28125,0.0312 -0.65496,-0.0832 -1.1326,-0.21827 -1.25,-0.25 0.16204,0.0746 0.43399,0.34044 -0.1875,1.09375 -0.87,1.05453 -6.00963,2.65925 -8.875,3.4375 -2.85253,0.77476 -6.25912,0.9582 -10.4375,-0.0937 -4.20683,-1.05913 -5.35669,-2.04166 -10.34375,-3.15625 4.48454,1.45946 5.96935,3.13523 9.8125,4.25 1.58504,0.45977 3.28679,0.63825 4.96875,0.6875 -0.44157,0.33676 -1.51251,1.02773 -3.5,1.78125 -2.73393,1.03649 -6.45198,2.16269 -8,2.4375 -1.46462,0.26002 -3.05958,-0.11654 -3.34375,-0.1875 0.16025,0.0796 0.38044,0.32098 -0.21875,1.0625 -0.86466,1.07006 -5.91652,2.81815 -8.75,3.6875 -2.8208,0.86547 -6.2075,1.15631 -10.34375,0.21875 -3.75259,-0.85061 -5.04785,-1.71647 -8.875,-2.59375 0,0 0,0.15625 0,0.15625 3.42796,1.23779 4.98741,2.6323 8.375,3.53125 1.63216,0.43314 3.36704,0.58301 5.09375,0.5625 -0.50893,0.38417 -1.47675,1.02182 -3.25,1.75 -2.70634,1.11134 -6.43633,2.30781 -7.96875,2.625 -0.8004,0.16569 -1.61231,0.21862 -2.25,0.15625 0,0 0,0.51552 0,0.92229 0,0.26507 0,0.48396 0,0.48396 0.22645,-0.14468 0.44891,-0.27261 0.71875,-0.375 1.08052,-0.40998 2.17161,-0.21577 6,-1.6875 3.82843,-1.47174 5.22412,-2.00498 5.90625,-2.40625 0.6796,-0.39978 1.61165,-0.87937 2.21875,-1.53125 1.82685,-0.13775 3.57075,-0.49323 4.9375,-1 2.96812,-1.10052 4.87537,-1.80619 6.78125,-2.46875 1.90586,-0.66254 2.35409,-1.41487 3.40625,-1.78125 1.09155,-0.38011 2.19511,-0.16538 6.0625,-1.53125 3.86745,-1.36586 5.28316,-1.82708 5.96875,-2.21875 0.70109,-0.40052 1.70081,-0.93298 2.3125,-1.59375 1.9708,-0.0547 3.81685,-0.38463 5.28125,-0.875 3.00148,-1.00508 4.92615,-1.62171 6.84375,-2.25 1.5386,-0.5041 2.17402,-1.04677 2.90625,-1.4375 0.23016,-0.13431 0.47574,-0.25373 0.75,-0.34375 1.09823,-0.36048 2.18145,-0.0814 6.09375,-1.3125 3.91233,-1.23113 5.36605,-1.67295 6.0625,-2.03125 0.69388,-0.35697 1.63015,-0.79261 2.25,-1.40625 1.86521,-0.0227 3.63581,-0.26683 5.03125,-0.6875 3.03043,-0.91354 4.99238,-1.4301 6.9375,-1.96875 1.94511,-0.53864 2.42618,-1.26452 3.5,-1.5625 1.11401,-0.30915 2.21994,0.007 6.1875,-1.03125 3.96761,-1.03863 5.41758,-1.43273 6.125,-1.75 0.73487,-0.32959 1.81383,-0.75372 2.4375,-1.375 1.99774,0.116 3.85743,-0.0201 5.34375,-0.375 3.07811,-0.735 5.08344,-1.10094 7.0625,-1.5 1.58792,-0.32018 2.24429,-0.79055 3,-1.09375 0.23757,-0.1068 0.46695,-0.19276 0.75,-0.25 1.13347,-0.22919 2.30448,0.20893 6.34375,-0.5 4.03933,-0.70893 5.50025,-0.92709 6.21875,-1.1875 0.71586,-0.25944 1.70428,-0.56724 2.34375,-1.09375 1.92427,0.23949 3.74788,0.22453 5.1875,0 3.12633,-0.48762 5.15455,-0.70067 7.15625,-0.96875 2.00171,-0.26807 2.48869,-0.94514 3.59375,-1.09375 1.14639,-0.15418 2.27592,0.30157 6.34375,-0.21875 4.06784,-0.52032 5.56013,-0.69573 6.28125,-0.9375 0.7371,-0.24714 1.79809,-0.58623 2.4375,-1.125 2.05007,0.33553 3.97378,0.39796 5.5,0.21875 3.14231,-0.36896 5.17994,-0.55936 7.1875,-0.78125 1.61076,-0.17802 2.26467,-0.6082 3.03125,-0.84375 0.24094,-0.0855 0.49412,-0.1556 0.78125,-0.1875 1.14978,-0.12772 2.30129,0.34665 6.375,-0.125 4.07374,-0.47165 5.55909,-0.6106 6.28125,-0.84375 0.71946,-0.23227 1.70024,-0.47346 2.34375,-0.96875 1.93637,0.33346 3.77006,0.40424 5.21875,0.25 3.14602,-0.33495 5.17756,-0.51859 7.1875,-0.71875 2.00996,-0.20014 2.48414,-0.82639 3.59375,-0.9375 1.15114,-0.11528 2.29643,0.36506 6.375,-0.0625 4.07861,-0.42756 5.58886,-0.56209 6.3125,-0.78125 0.73915,-0.22386 1.79572,-0.51325 2.4375,-1.03125 2.0571,0.39867 4.00187,0.4934 5.53125,0.34375 3.14873,-0.3081 5.17584,-0.47325 7.1875,-0.65625 1.61407,-0.14682 2.2631,-0.56055 3.03125,-0.78125 0.24142,-0.0809 0.49353,-0.12991 0.78125,-0.15625 1.15211,-0.10545 2.29296,0.39275 6.375,0 4.08208,-0.39275 5.5889,-0.53084 6.3125,-0.75 0.7209,-0.21833 1.6997,-0.4477 2.3438,-0.9375 1.938,0.34999 3.7688,0.45438 5.2187,0.3125 3.1487,-0.3081 5.1758,-0.47325 7.1875,-0.65625 2.0116,-0.18299 2.5142,-0.83802 3.625,-0.9375 1.1523,-0.10323 2.2922,0.38483 6.375,0 4.0829,-0.38482 5.5887,-0.501 6.3125,-0.71875 0.7393,-0.22243 1.7956,-0.51449 2.4375,-1.03125 2.0574,0.40177 4.0029,0.50333 5.5313,0.34375 3.1466,-0.32852 5.1771,-0.5227 7.1875,-0.71875 1.613,-0.15729 2.2656,-0.63148 3.0312,-0.875 0.2407,-0.088 0.4632,-0.12137 0.75,-0.15625 1.1483,-0.1397 2.3167,0.33991 6.375,-0.25 4.0583,-0.58992 5.5618,-0.77714 6.2813,-1.03125 0.7167,-0.25316 1.6745,-0.55807 2.3125,-1.09375 1.9197,0.21194 3.7199,0.15141 5.1562,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0938,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5625,-1.28125 1.1288,-0.25066 2.2703,0.11629 6.25,-0.875 3.9796,-0.99128 5.4296,-1.4193 6.125,-1.78125 0.7223,-0.37601 1.7619,-0.87058 2.375,-1.53125 1.963,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.14461 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70653 2.3348,-1.68641 2.5469,-1.98438 0.2122,-0.29796 0.1118,-0.7453 0.1379,-0.76675 0.043,-0.0352 0.3193,-0.085 0.479,-0.42844 0.8589,-1.84708 2.321,-5.64459 2.4352,-6.32945 0.1137,-0.68216 0.1638,-1.34774 0.2145,-1.74497 0.029,-0.22952 -0.1467,-0.86544 -0.1246,-0.92404 0.031,-0.0821 0.3045,-0.26528 0.3599,-0.51471 0.2663,-1.19833 0.089,-2.19129 -0.1251,-3.60893 -0.214,-1.41764 -0.9837,-4.62214 -1.6369,-5.47626 -0.6589,-0.86172 -1.2229,-1.01117 -1.7479,-1.00066 -0.2086,0.26976 0.1368,0.26309 0.1626,0.31261 0.6806,0.0508 0.934,0.36864 1.4192,0.89662 0.4852,0.52798 1.4428,3.93956 1.5794,5.38995 0.1366,1.45039 0.19,2.8602 -0.088,3.46864 -0.2781,0.60845 -0.9442,0.42864 -1.2366,0.49452 0.531,0.18589 0.8908,0.21322 0.9524,1.05768 0.059,0.81338 -0.1332,1.63969 -0.5198,2.80562 -0.3912,1.18001 -1.8452,4.34998 -2.2857,4.59877 -0.4523,0.25551 -0.9524,0.18199 -1.288,0.0511 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6997-5);enable-background:new"</div><div class='add'>+               sodipodi:nodetypes="cssscscsscsssccscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssccscsscscssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsszsszssszzcczzzczzzc" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8103-3"</div><div class='add'>+               d="m 988.75,-263.84375 c 1.91161,0.6344 4.55027,1.75841 6.125,2.8125 1.57477,1.05409 2.8961,1.48252 5.5313,3.375 2.6082,1.87314 5.0269,3.01522 7.3125,4.0625 2.4693,1.13147 5.7521,2.15474 9.5312,3.9375 -1.2072,-1.2584 -7.139,-3.36445 -9.0312,-4.1875 -1.8922,-0.82304 -4.128,-1.93049 -6.9375,-3.78125 -2.80961,-1.85075 -3.62224,-2.48154 -6.00005,-3.71875 -2.37782,-1.23719 -4.07988,-1.9492 -6.53125,-2.5 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6953-8);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8105-1"</div><div class='add'>+               d="m 957.5,-260.78125 c 1.91,0.6181 4.58288,1.70934 6.15625,2.75 1.57339,1.04066 2.89608,1.48252 5.53125,3.375 2.60823,1.87315 5.02692,3.01521 7.3125,4.0625 2.46931,1.13147 5.75213,2.15475 9.53125,3.9375 -1.20728,-1.2584 -7.20154,-3.3957 -9.09375,-4.21875 -1.89217,-0.82304 -4.09666,-1.9305 -6.90625,-3.78125 -2.80958,-1.85075 -3.59295,-2.43932 -5.96875,-3.65625 -2.37578,-1.21691 -4.11321,-1.93885 -6.5625,-2.46875 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6993-3);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8107-4"</div><div class='add'>+               d="m 926.09375,-257.375 c 1.90772,0.59745 4.55348,1.66384 6.125,2.6875 1.5715,1.02365 2.87022,1.43971 5.5,3.28125 2.60291,1.82273 5.02887,2.9722 7.3125,4 2.4672,1.11041 5.75535,2.09323 9.53125,3.84375 -1.20623,-1.2481 -7.1719,-3.31809 -9.0625,-4.125 -1.89058,-0.8069 -4.10242,-1.89104 -6.90625,-3.6875 -2.80385,-1.79644 -3.62704,-2.40251 -6,-3.59375 -2.37297,-1.19124 -4.05362,-1.90283 -6.5,-2.40625 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6989-8);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8109-6"</div><div class='add'>+               d="m 894.90625,-253.5625 c 1.90213,0.55355 4.58701,1.58887 6.15625,2.59375 1.56923,1.00487 2.87401,1.40864 5.5,3.21875 2.59912,1.79164 5.00034,2.87189 7.28125,3.875 2.46428,1.08374 5.75984,2.04029 9.53125,3.75 -1.2048,-1.23507 -7.17416,-3.24478 -9.0625,-4.03125 -1.88832,-0.78647 -4.0752,-1.8308 -6.875,-3.59375 -2.79977,-1.76294 -3.59919,-2.36836 -5.96875,-3.53125 -2.36957,-1.16288 -4.12325,-1.83412 -6.5625,-2.28125 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6985-6);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8111-9"</div><div class='add'>+               d="m 863.71875,-248.65625 c 1.88062,0.42909 4.50427,1.38038 6.0625,2.3125 1.55823,0.93211 2.85233,1.25776 5.46875,3 2.58971,1.72444 4.98067,2.70802 7.25,3.625 2.45176,0.99069 5.73959,1.87707 9.5,3.5 -1.20131,-1.20734 -7.15249,-3.06609 -9.03125,-3.78125 -1.87875,-0.71517 -4.0854,-1.68442 -6.875,-3.375 -2.78963,-1.69057 -3.58461,-2.22822 -5.9375,-3.28125 -2.35292,-1.05301 -4.02584,-1.71248 -6.4375,-2 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6965-3);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8113-4"</div><div class='add'>+               d="m 833.15625,-241.375 c 1.84836,0.29644 4.46945,0.97632 6,1.78125 1.53058,0.80493 2.81374,1.05573 5.375,2.53125 2.53504,1.46046 4.89068,2.32509 7.125,3.0625 2.41399,0.79668 5.65711,1.46689 9.375,2.84375 -1.18771,-1.12873 -7.08772,-2.58975 -8.9375,-3.15625 -1.84977,-0.5665 -4.00342,-1.37392 -6.75,-2.84375 -2.74657,-1.46983 -3.50136,-1.92028 -5.8125,-2.78125 -2.31115,-0.86095 -4.00471,-1.32009 -6.375,-1.4375 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6981-3);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8115-2"</div><div class='add'>+               d="m 802.90625,-232.3125 c 1.8222,0.21127 4.36576,0.80057 5.875,1.53125 1.50925,0.73066 2.75568,0.92998 5.28125,2.28125 2.49976,1.33746 4.83154,2.04843 7.03125,2.65625 2.37653,0.65667 5.56464,1.07288 9.21875,2.1875 -1.16735,-1.04496 -6.92888,-2.10329 -8.75,-2.5625 -1.82111,-0.45921 -3.95225,-1.12696 -6.65625,-2.4375 -2.70403,-1.31052 -3.47106,-1.7199 -5.75,-2.46875 -2.27895,-0.74883 -3.91325,-1.17931 -6.25,-1.1875 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6977-6);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8117-2"</div><div class='add'>+               d="m 773.1875,-222.1875 c 1.81109,0.1787 4.32059,0.66506 5.8125,1.34375 1.49194,0.67869 2.7534,0.79822 5.25,2.0625 2.47107,1.25138 4.79005,1.89614 6.96875,2.4375 2.35387,0.58488 5.49134,0.89752 9.09375,1.84375 -1.15084,-0.99116 -6.85251,-1.7833 -8.65625,-2.1875 -1.80372,-0.4042 -3.91553,-1.02116 -6.59375,-2.25 -2.67818,-1.22884 -3.40345,-1.61089 -5.65625,-2.28125 -2.25279,-0.67034 -3.89627,-1.00232 -6.21875,-0.96875 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6973-4);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8119-6"</div><div class='add'>+               d="m 743.5625,-211.1875 c 1.79281,0.12911 4.27313,0.54965 5.75,1.1875 1.4769,0.63785 2.7161,0.74156 5.1875,1.9375 2.44618,1.18372 4.72054,1.74666 6.875,2.21875 2.32767,0.51003 5.4196,0.68064 9,1.5625 -1.14379,-0.9706 -6.74759,-1.59065 -8.53125,-1.9375 -1.78367,-0.34684 -3.88285,-0.88756 -6.53125,-2.03125 -2.64841,-1.14368 -3.39495,-1.51631 -5.625,-2.125 -2.23008,-0.60868 -3.82594,-0.90966 -6.125,-0.8125 z"</div><div class='add'>+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6969-8);enable-background:new" /&gt;</div><div class='add'>+            &lt;g</div><div class='add'>+               id="g8121-4"</div><div class='add'>+               style="fill:#ffffff;fill-opacity:1;filter:url(#filter7345-9)"&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8123-1"</div><div class='add'>+                 d="m 744.9375,-212.11731 c 0,0 7.22229,-3.22318 9.0625,-3.5 1.84021,-0.27682 3.35225,-0.003 6,0.5625 2.64775,0.56573 8.7357,2.21518 11.1875,3.375 2.4518,1.15982 5.3125,3.5625 5.3125,3.5625 0,0 -7.14644,-2.78019 -10.1875,-3.5625 -3.04106,-0.78231 -7.64461,-2.08374 -10.375,-2.3125 -2.73039,-0.22876 -11,1.875 -11,1.875 z"</div><div class='add'>+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8125-2"</div><div class='add'>+                 d="m 735.46875,-206.95416 c 0,0 3.65979,-2.22318 5.5,-2.5 1.84021,-0.27682 3.66475,0.24677 6.3125,0.8125 2.64775,0.56573 8.7357,2.21518 11.1875,3.375 2.4518,1.15982 6.5625,2.125 6.5625,2.125 0,0 -8.39644,-1.34269 -11.4375,-2.125 -3.04106,-0.78231 -7.95711,-2.33374 -10.6875,-2.5625 -2.73039,-0.22876 -7.4375,0.875 -7.4375,0.875 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8127-8"</div><div class='add'>+                 d="m 759.85042,-217.61116 c 0,0 8.5437,-3.29857 10.39778,-3.45786 1.85409,-0.1593 3.64166,0.4792 6.2481,1.21208 2.60644,0.73288 8.57724,2.76594 10.95036,4.07925 2.37312,1.31331 6.41417,2.53782 6.41417,2.53782 0,0 -8.29413,-1.87365 -11.27931,-2.84767 -2.98519,-0.97402 -7.79269,-2.83478 -10.50302,-3.23662 -2.71033,-0.40184 -12.22808,1.713 -12.22808,1.713 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8129-8"</div><div class='add'>+                 d="m 775.19813,-223.2266 c 0,0 7.77133,-2.78244 9.62831,-2.90349 1.85697,-0.12104 3.631,0.55417 6.22178,1.34062 2.59077,0.78645 8.5184,2.94217 10.86394,4.30412 2.34555,1.36195 6.36049,2.6695 6.36049,2.6695 0,0 -8.25373,-2.04423 -11.21821,-3.07958 -2.96447,-1.03535 -7.73259,-2.99481 -10.43406,-3.45243 -2.70147,-0.45763 -11.42225,1.12126 -11.42225,1.12126 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-4.3190906"</div><div class='add'>+                 inkscape:transform-center-x="13.852145"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8131-9"</div><div class='add'>+                 d="m 789.64298,-227.95417 c 0,0 8.68256,-3.52031 10.54154,-3.60535 1.85897,-0.085 3.61958,0.62442 6.19463,1.46093 2.57505,0.83649 8.45979,3.10666 10.77851,4.5138 2.31872,1.40715 6.30757,2.79224 6.30757,2.79224 0,0 -8.21257,-2.20377 -11.15643,-3.29636 -2.94386,-1.09259 -7.67312,-3.14408 -10.36522,-3.65397 -2.69209,-0.50988 -12.3006,1.78871 -12.3006,1.78871 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-4.3190906"</div><div class='add'>+                 inkscape:transform-center-x="13.852145"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8133-2"</div><div class='add'>+                 d="m 804.49513,-233.32948 c 0,0 7.80756,-2.58281 9.66654,-2.66785 1.85897,-0.085 3.61958,0.62442 6.19463,1.46093 2.57505,0.83649 8.45979,3.10666 10.77851,4.5138 2.31872,1.40715 6.30757,2.79224 6.30757,2.79224 0,0 -8.21257,-2.20377 -11.15643,-3.29636 -2.94386,-1.09259 -7.67312,-3.14408 -10.36522,-3.65397 -2.69209,-0.50988 -11.4256,0.85121 -11.4256,0.85121 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-4.3190906"</div><div class='add'>+                 inkscape:transform-center-x="13.852145"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8135-8"</div><div class='add'>+                 d="m 819.55763,-237.57948 c 0,0 8.55756,-2.58281 10.41654,-2.66785 1.85897,-0.085 3.61958,0.62442 6.19463,1.46093 2.57505,0.83649 8.45979,3.10666 10.77851,4.5138 2.31872,1.40715 6.30757,2.79224 6.30757,2.79224 0,0 -8.21257,-2.20377 -11.15643,-3.29636 -2.94386,-1.09259 -7.67312,-3.14408 -10.36522,-3.65397 -2.69209,-0.50988 -12.1756,0.85121 -12.1756,0.85121 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-4.9269042"</div><div class='add'>+                 inkscape:transform-center-x="13.64141"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8137-8"</div><div class='add'>+                 d="m 836.23395,-242.60125 c 0,0 6.96702,-1.98723 8.82784,-1.96757 1.86081,0.0197 3.57873,0.82702 6.10265,1.80705 2.52393,0.98 8.27166,3.57758 10.50756,5.11291 2.2359,1.53535 6.14053,3.14261 6.14053,3.14261 0,0 -8.07561,-2.66222 -10.95336,-3.91866 -2.87774,-1.25645 -7.48412,-3.5707 -10.14328,-4.23121 -2.65915,-0.66049 -10.48194,0.0549 -10.48194,0.0549 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.1542119"</div><div class='add'>+                 inkscape:transform-center-x="13.55068"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8139-8"</div><div class='add'>+                 d="m 850.73028,-246.00461 c 0,0 7.68784,-2.02768 9.54782,-1.96854 1.85997,0.0592 3.56038,0.90279 6.06293,1.93616 2.50255,1.03334 8.19387,3.75232 10.39668,5.33475 2.20282,1.58245 6.07245,3.2722 6.07245,3.2722 0,0 -8.01729,-2.83298 -10.86772,-4.15022 -2.85043,-1.31723 -7.40666,-3.72872 -10.0512,-4.4455 -2.64454,-0.71678 -11.16096,0.0211 -11.16096,0.0211 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.4740887"</div><div class='add'>+                 inkscape:transform-center-x="13.41151"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8141-6"</div><div class='add'>+                 d="m 864.82496,-249.21081 c 0,0 8.16952,-1.96906 10.02688,-1.85396 1.85735,0.11512 3.53158,1.00956 6.0019,2.11779 2.47031,1.10821 8.0772,3.99727 10.23138,5.64531 2.15418,1.64804 5.9712,3.45352 5.9712,3.45352 0,0 -7.92839,-3.07306 -10.73787,-4.4755 -2.80949,-1.40244 -7.29106,-3.94999 -9.91283,-4.74606 -2.62176,-0.79606 -11.58066,-0.1411 -11.58066,-0.1411 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.79376"</div><div class='add'>+                 inkscape:transform-center-x="13.258805"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8143-8"</div><div class='add'>+                 d="m 881.38485,-251.60282 c 0,0 8.08536,-1.90809 9.93837,-1.73664 1.853,0.17147 3.4993,1.11633 5.93482,2.29908 2.43553,1.18271 7.95209,4.2407 10.05523,5.95339 2.10314,1.7127 5.86357,3.63326 5.86357,3.63326 0,0 -7.8314,-3.3124 -10.597,-4.7995 -2.76561,-1.48712 -7.16775,-4.16959 -9.76414,-5.04491 -2.59637,-0.87531 -11.43085,-0.30468 -11.43085,-0.30468 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.7433893"</div><div class='add'>+                 inkscape:transform-center-x="13.28378"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8145-3"</div><div class='add'>+                 d="m 896.58415,-254.34724 c 0,0 7.64166,-1.4277 9.49547,-1.26515 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08372,5.90502 2.11134,1.70258 5.88096,3.60505 5.88096,3.60505 0,0 -7.84723,-3.27474 -10.61995,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -10.99774,-0.76897 -10.99774,-0.76897 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.7433893"</div><div class='add'>+                 inkscape:transform-center-x="13.28378"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8147-8"</div><div class='add'>+                 d="m 911.45328,-255.98544 c 0,0 8.64166,-1.5527 10.49547,-1.39015 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08372,5.90502 2.11134,1.70258 5.88096,3.60505 5.88096,3.60505 0,0 -7.84723,-3.27474 -10.61995,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -11.99774,-0.64397 -11.99774,-0.64397 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.7433893"</div><div class='add'>+                 inkscape:transform-center-x="13.28378"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8149-3"</div><div class='add'>+                 d="m 927.70328,-258.29794 c 0,0 7.64166,-0.8652 9.49547,-0.70265 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08372,5.90502 2.11134,1.70258 5.88096,3.60505 5.88096,3.60505 0,0 -7.84723,-3.27474 -10.61995,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -10.99774,-1.33147 -10.99774,-1.33147 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.7433893"</div><div class='add'>+                 inkscape:transform-center-x="13.28378"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8151-3"</div><div class='add'>+                 d="m 942.82828,-259.48544 c 0,0 8.57916,-1.4902 10.43297,-1.32765 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08372,5.90502 2.11134,1.70258 5.88096,3.60505 5.88096,3.60505 0,0 -7.84723,-3.27474 -10.61995,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -11.93524,-0.70647 -11.93524,-0.70647 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.7433893"</div><div class='add'>+                 inkscape:transform-center-x="13.28378"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8153-3"</div><div class='add'>+                 d="m 959.07828,-261.54794 c 0,0 7.82916,-0.8027 9.68297,-0.64015 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08372,5.90502 2.11134,1.70258 5.88096,3.60505 5.88096,3.60505 0,0 -7.84723,-3.27474 -10.61995,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -11.18524,-1.39397 -11.18524,-1.39397 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.7433893"</div><div class='add'>+                 inkscape:transform-center-x="13.28378"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8155-8"</div><div class='add'>+                 d="m 974.45328,-262.79794 c 0,0 8.39166,-1.1777 10.24547,-1.01515 1.8538,0.16256 3.50462,1.0995 5.94579,2.27053 2.44118,1.171 7.97238,4.20246 10.08376,5.90502 2.1113,1.70258 5.8809,3.60505 5.8809,3.60505 0,0 -7.84721,-3.27474 -10.61993,-4.74855 -2.77271,-1.4738 -7.18769,-4.13509 -9.78825,-4.99793 -2.60055,-0.86282 -11.74774,-1.01897 -11.74774,-1.01897 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.7433893"</div><div class='add'>+                 inkscape:transform-center-x="13.28378"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8157-0"</div><div class='add'>+                 d="m 990.64078,-264.86044 c 0,0 6.89166,-0.9902 8.74547,-0.82765 1.85385,0.16256 3.50465,1.0995 5.94575,2.27053 2.4412,1.171 7.9724,4.20246 10.0838,5.90502 2.1113,1.70258 5.8809,3.60505 5.8809,3.60505 0,0 -7.8472,-3.27474 -10.6199,-4.74855 -2.7727,-1.4738 -7.1877,-4.13509 -9.7883,-4.99793 -2.60053,-0.86282 -10.24772,-1.20647 -10.24772,-1.20647 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.7433893"</div><div class='add'>+                 inkscape:transform-center-x="13.28378"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8159-4"</div><div class='add'>+                 d="m 1007.7658,-265.79794 c 0,0 6.8291,-1.1777 8.683,-1.01515 1.8538,0.16256 3.5046,1.0995 5.9457,2.27053 2.4412,1.171 7.9724,4.20246 10.0838,5.90502 2.1113,1.70258 5.8809,3.60505 5.8809,3.60505 0,0 -7.8472,-3.27474 -10.6199,-4.74855 -2.7727,-1.4738 -7.1877,-4.13509 -9.7883,-4.99793 -2.6005,-0.86282 -10.1852,-1.01897 -10.1852,-1.01897 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.7433893"</div><div class='add'>+                 inkscape:transform-center-x="13.28378"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8161-7"</div><div class='add'>+                 d="m 1023.8908,-267.79794 c 0,0 6.0791,-0.4277 7.933,-0.26515 1.8538,0.16256 3.5046,1.0995 5.9457,2.27053 2.4412,1.171 7.9724,4.20246 10.0838,5.90502 2.1113,1.70258 5.8809,3.60505 5.8809,3.60505 0,0 -7.8472,-3.27474 -10.6199,-4.74855 -2.7727,-1.4738 -7.1877,-4.13509 -9.7883,-4.99793 -2.6005,-0.86282 -9.4352,-1.76897 -9.4352,-1.76897 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.7433893"</div><div class='add'>+                 inkscape:transform-center-x="13.28378"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8163-6"</div><div class='add'>+                 d="m 1039.7033,-269.17294 c 0,0 6.4541,-0.6777 8.308,-0.51515 1.8538,0.16256 3.5046,1.0995 5.9457,2.27053 2.4412,1.171 7.9724,4.20246 10.0838,5.90502 2.1113,1.70258 5.8809,3.60505 5.8809,3.60505 0,0 -7.8472,-3.27474 -10.6199,-4.74855 -2.7727,-1.4738 -7.1877,-4.13509 -9.7883,-4.99793 -2.6005,-0.86282 -9.8102,-1.51897 -9.8102,-1.51897 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-5.1360724"</div><div class='add'>+                 inkscape:transform-center-x="13.55813"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8165-8"</div><div class='add'>+                 d="m 1055.2718,-271.03319 c 0,0 5.4976,-0.90945 7.3578,-0.85348 1.8601,0.056 3.5619,0.89674 6.0661,1.92586 2.5044,1.0291 8.2003,3.7384 10.4058,5.31709 2.2055,1.57871 6.078,3.2619 6.078,3.2619 0,0 -8.022,-2.81939 -10.8748,-4.13178 -2.8526,-1.31238 -7.4129,-3.71613 -10.0587,-4.42843 -2.6457,-0.71228 -8.9742,-1.09116 -8.9742,-1.09116 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-4.6370147"</div><div class='add'>+                 inkscape:transform-center-x="13.74758"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8167-9"</div><div class='add'>+                 d="m 1072.7007,-273.48537 c 0,0 4.5472,-1.15581 6.408,-1.18621 1.8607,-0.0304 3.5996,0.73049 6.1489,1.64231 2.5494,0.91177 8.3649,3.35386 10.6414,4.8285 2.2763,1.47468 6.2227,2.97636 6.2227,2.97636 0,0 -8.1442,-2.44411 -11.0547,-3.62272 -2.9105,-1.1786 -7.5774,-3.36815 -10.2534,-3.95691 -2.6759,-0.58875 -8.1129,-0.68133 -8.1129,-0.68133 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 inkscape:transform-center-y="-4.4842392"</div><div class='add'>+                 inkscape:transform-center-x="13.79933"</div><div class='add'>+                 sodipodi:nodetypes="czzzczzc"</div><div class='add'>+                 id="path8169-0"</div><div class='add'>+                 d="m 1087.1585,-276.5244 c 0,0 5.96,-1.77355 7.8202,-1.83024 1.86,-0.0567 3.6096,0.67955 6.1715,1.55525 2.562,0.87566 2.5226,0.85713 5.3335,1.49015 2.7969,0.62986 7.0767,1.51313 7.0767,1.51313 0,0 -3.6155,-0.0163 -6.7923,-0.46614 -3.1155,-0.44119 -7.3743,-1.69825 -10.0584,-2.24913 -2.6839,-0.55088 -9.5512,-0.013 -9.5512,-0.013 z"</div><div class='add'>+                 style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" /&gt;</div><div class='add'>+              &lt;path</div><div class='add'>+                 inkscape:connector-curvature="0"</div><div class='add'>+                 sodipodi:nodetypes="czczc"</div><div class='add'>+                 id="path8171-6"</div><div class='add'>+                 d="m 1099.25,-279.92981 c 0.1612,0.26862 11.2081,-4.60046 12.1875,-4.6875 0.9794,-0.087 2,3.125 2,3.125 0,0 -0.7751,-1.50434 -2.875,-1.0625 -2.0999,0.44184 -11.3009,2.67141 -11.3125,2.625 z"</div><div class='add'>+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /&gt;</div><div class='add'>+            &lt;/g&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8173-8"</div><div class='add'>+               d="m 1107.4532,-284.0938 c -0.4187,0.21283 -0.1556,0.0939 -0.6472,0.30581 -0.4861,0.20954 -1.7234,0.57439 -4.0796,1.45895 -3.3311,1.25057 -5.8302,2.15344 -7.0259,3.0661 -1.5361,0.0213 -3.7205,0.23331 -5.6563,0.71875 -2.9815,0.74766 -4.8552,1.17401 -6.75,1.59375 -1.8948,0.41972 -1.6755,0.64219 -2.875,0.875 -1.2966,0.25166 -1.7214,-0.009 -5.4375,0.78125 -3.4899,0.74214 -8.8948,1.93107 -10.1562,2.6875 -1.5839,-0.18079 -3.8675,-0.32178 -5.8438,-0.0312 -3.0404,0.44695 -4.9162,0.67276 -6.8437,0.90625 -0.6554,0.0794 -1.0411,0.20078 -1.3438,0.28125 -0.4262,0.13165 -0.6858,0.26002 -1.375,0.34375 -1.3116,0.15936 -1.7622,-0.15683 -5.5312,0.28125 -3.5539,0.41308 -9.0054,1.27282 -10.25,1.9375 -1.599,-0.2973 -3.8578,-0.53419 -5.8438,-0.34375 -3.0588,0.29331 -4.972,0.48399 -6.9062,0.65625 -1.9343,0.17226 -1.6887,0.42237 -2.9063,0.53125 -1.3162,0.11769 -1.7598,-0.16363 -5.5312,0.25 -3.5419,0.38844 -9.0079,1.20927 -10.2813,1.875 -1.5989,-0.2947 -3.88718,-0.50701 -5.87501,-0.3125 -3.05824,0.29924 -4.94113,0.48024 -6.875,0.65625 -0.65749,0.0598 -1.04004,0.17856 -1.34375,0.25 -0.42765,0.11895 -0.68351,0.21807 -1.375,0.28125 -1.31596,0.12025 -1.75976,-0.19488 -5.53125,0.21875 -3.55614,0.39001 -9.00554,1.23916 -10.25,1.90625 -1.59863,-0.29419 -3.85984,-0.52372 -5.84375,-0.3125 -3.0556,0.32532 -4.97404,0.52624 -6.90625,0.71875 -1.93221,0.1925 -1.68987,0.44088 -2.90625,0.5625 -1.31488,0.13146 -1.76298,-0.16454 -5.53125,0.28125 -3.53887,0.41865 -8.97768,1.29217 -10.25,1.96875 -1.59755,-0.28105 -3.85996,-0.42043 -5.84375,-0.1875 -3.05198,0.35836 -4.94508,0.56786 -6.875,0.78125 -0.6562,0.0726 -1.04066,0.17269 -1.34375,0.25 -0.42677,0.12722 -0.68491,0.2672 -1.375,0.34375 -1.31333,0.14568 -1.76746,-0.17402 -5.53125,0.3125 -3.54889,0.45875 -8.97863,1.41902 -10.21875,2.125 -1.59305,-0.24424 -3.83381,-0.38135 -5.8125,-0.125 -3.04759,0.39481 -4.95071,0.64845 -6.875,0.90625 -1.92428,0.25779 -1.72611,0.49353 -2.9375,0.65625 -1.30946,0.1759 -1.74719,-0.10438 -5.5,0.46875 -3.52429,0.53824 -8.92315,1.69917 -10.1875,2.4375 -1.5875,-0.20354 -3.8455,-0.25473 -5.8125,0.0937 -3.02617,0.53612 -4.89889,0.86169 -6.8125,1.1875 -0.65061,0.11077 -1.01371,0.27094 -1.3125,0.375 -0.42067,0.16488 -0.66345,0.3313 -1.34375,0.46875 -1.29465,0.26159 -1.72712,-0.006 -5.4375,0.8125 -3.49853,0.77195 -8.84595,2.38293 -10.0625,3.21875 -1.56278,-0.0775 -3.75758,0.0853 -5.6875,0.59375 -2.97244,0.78313 -4.81761,1.23209 -6.6875,1.75 -1.86988,0.5179 -1.6666,0.76728 -2.84375,1.09375 -1.27246,0.3529 -1.69703,0.10709 -5.34375,1.1875 -3.4247,1.01463 -8.64944,2.93317 -9.875,3.84375 -1.53883,0.0127 -3.71983,0.27222 -5.625,0.875 -2.93106,0.92734 -4.75031,1.45842 -6.59375,2.0625 -0.62676,0.20538 -0.99173,0.39258 -1.28125,0.53125 -0.40763,0.21361 -0.65334,0.40875 -1.3125,0.625 -1.25446,0.41154 -1.68611,0.18904 -5.28125,1.4375 -3.38985,1.17717 -8.59498,3.2137 -9.78125,4.15625 -1.52389,0.0597 -3.65005,0.39487 -5.53125,1.0625 -2.89739,1.02829 -4.69908,1.67548 -6.53125,2.3125 -1.83217,0.63701 -1.62785,0.84854 -2.78125,1.25 -1.24678,0.43396 -1.66361,0.19972 -5.21875,1.5625 -3.33867,1.2798 -8.48715,3.48255 -9.6875,4.46875 -1.50718,0.10769 -3.63569,0.4988 -5.5,1.21875 -2.86818,1.1076 -4.6238,1.78156 -6.4375,2.46875 -0.61666,0.23363 -0.99641,0.44203 -1.28125,0.59375 0,0 0,1.09375 0,1.09375 0.11178,-0.22236 0.38599,-0.81743 0.90625,-1.09375 0.69797,-0.37072 4.81363,-1.99337 6.8125,-2.71875 1.65686,-0.60125 4.15389,-1.32868 5.96875,-1.3125 0.30162,0.003 0.58762,0.0509 0.84375,0.0937 1.84249,0.30825 7.46875,1.5625 7.46875,1.5625 -10e-6,0 -6.23349,-1.64675 -7.03125,-1.84375 -0.19079,-0.0471 -0.53572,-0.0687 -0.96875,-0.0625 1.14546,-0.86971 4.761,-2.39351 7.34375,-3.4375 2.83822,-1.14727 3.11681,-1.25182 5.0625,-1.65625 2.0083,-0.41744 3.15625,-0.5 3.15625,-0.5 0,1e-5 -0.0824,-0.60114 0.96875,-1.125 0.7051,-0.35141 4.88702,-1.8924 6.90625,-2.5625 1.9519,-0.64773 5.0574,-1.3585 6.875,-1 1.86323,0.3675 7.53125,1.8125 7.53125,1.8125 1e-5,0 -6.287,-1.87111 -7.09375,-2.09375 -0.19292,-0.0533 -0.53084,-0.086 -0.96875,-0.0937 1.15834,-0.83288 4.79444,-2.19532 7.40625,-3.15625 2.87016,-1.05601 3.16734,-1.1618 5.125,-1.53125 1.85349,-0.34979 2.85884,-0.42548 3.03125,-0.4375 0.1136,-0.21724 0.37745,-0.81002 0.90625,-1.0625 0.70944,-0.33874 4.92607,-1.71275 6.96875,-2.3125 1.69317,-0.49711 4.24077,-1.03677 6.09375,-0.90625 0.30795,0.0217 0.61349,0.0973 0.875,0.15625 1.88118,0.42432 7.59375,2.03125 7.59375,2.03125 1e-5,0 -6.34174,-2.06525 -7.15625,-2.3125 -0.19479,-0.0591 -0.55788,-0.10394 -1,-0.125 1.16949,-0.79755 4.86302,-2.05622 7.5,-2.9375 2.89781,-0.96847 3.23301,-1.00332 5.21875,-1.28125 2.04965,-0.28689 3.1875,-0.3125 3.1875,-0.3125 -2e-5,0 -0.0727,-0.60697 1,-1.0625 0.7196,-0.30557 4.99098,-1.50075 7.0625,-2 2.00244,-0.48258 5.19849,-0.92829 7.0625,-0.40625 1.91078,0.53515 7.71875,2.5 7.71875,2.5 0,0 -6.42266,-2.42351 -7.25,-2.71875 -0.19784,-0.0706 -0.58216,-0.14039 -1.03125,-0.1875 1.1879,-0.72865 4.91527,-1.77408 7.59375,-2.5 2.94342,-0.79775 3.29208,-0.77083 5.3125,-0.90625 1.91289,-0.12823 2.94705,-0.0711 3.125,-0.0625 0.11728,-0.20366 0.39176,-0.77948 0.9375,-0.96875 0.73219,-0.25394 5.07852,-1.04789 7.1875,-1.375 1.74813,-0.27111 4.40088,-0.4847 6.3125,-0.0937 0.31766,0.065 0.60522,0.18551 0.875,0.28125 1.94074,0.68873 7.84375,3.09375 7.84375,3.09375 1e-5,0 -6.53471,-2.95077 -7.375,-3.3125 -0.20097,-0.0865 -0.57513,-0.16679 -1.03125,-0.25 1.2065,-0.63318 5.02956,-1.3956 7.75,-1.90625 2.98953,-0.56119 3.30023,-0.52954 5.34375,-0.53125 2.10926,-0.002 3.3125,0.125 3.3125,0.125 0,1e-5 -0.0727,-0.63119 1.03125,-0.9375 0.74052,-0.20547 5.12612,-0.83387 7.25,-1.0625 2.05302,-0.22099 5.31863,-0.25222 7.21875,0.46875 1.94779,0.73907 7.84375,3.375 7.84375,3.375 2e-5,0 -6.56288,-3.17897 -7.40625,-3.5625 -0.20168,-0.0917 -0.54221,-0.18621 -1,-0.28125 1.21092,-0.60188 4.98442,-1.24884 7.71875,-1.65625 3.0048,-0.44772 3.32551,-0.4517 5.375,-0.40625 1.94045,0.043 3.00699,0.19423 3.1875,0.21875 0.11892,-0.19316 0.3839,-0.76583 0.9375,-0.90625 0.74271,-0.18838 5.15429,-0.73428 7.28125,-0.9375 1.76303,-0.16842 4.42009,-0.23429 6.34375,0.25 0.31968,0.0805 0.60351,0.20359 0.875,0.3125 1.95293,0.78349 7.90625,3.46875 7.90625,3.46875 -2e-5,0 -6.59191,-3.25348 -7.4375,-3.65625 -0.20222,-0.0963 -0.57226,-0.20703 -1.03125,-0.3125 1.21414,-0.57427 5.04366,-1.12219 7.78125,-1.5 3.00838,-0.4152 3.32307,-0.44263 5.375,-0.375 2.11798,0.0698 3.3125,0.25 3.3125,0.25 -2e-5,0 -0.0772,-0.63741 1.03125,-0.90625 0.74362,-0.18035 5.15176,-0.66355 7.28125,-0.84375 2.05847,-0.17417 5.34324,-0.12432 7.25,0.65625 1.95459,0.80016 7.875,3.53125 7.875,3.53125 -2e-5,0 -6.55993,-3.30876 -7.40625,-3.71875 -0.20237,-0.0981 -0.57186,-0.2031 -1.03125,-0.3125 1.21517,-0.5639 5.01008,-1.1143 7.75,-1.46875 3.01091,-0.38952 3.32131,-0.39765 5.375,-0.3125 1.94439,0.0806 3.00663,0.25324 3.1875,0.28125 0.11916,-0.19086 0.38277,-0.74531 0.9375,-0.875 0.74426,-0.174 5.14993,-0.65047 7.28125,-0.8125 1.76662,-0.13427 4.44971,-0.12571 6.37501,0.375 0.32,0.0832 0.6033,0.20127 0.875,0.3125 1.9546,0.80016 7.9063,3.5625 7.9063,3.5625 -1e-4,0 -6.5912,-3.34001 -7.4375,-3.75 -0.2024,-0.0981 -0.5719,-0.20311 -1.0313,-0.3125 1.2151,-0.5639 5.0413,-1.08306 7.7813,-1.4375 3.0109,-0.38953 3.3525,-0.4289 5.4062,-0.34375 2.1197,0.0879 3.3125,0.3125 3.3125,0.3125 0,0 -0.078,-0.64902 1.0313,-0.90625 0.7443,-0.17256 5.1495,-0.62336 7.2812,-0.78125 2.0606,-0.1526 5.3429,-0.0968 7.25,0.6875 1.955,0.80395 7.875,3.5 7.875,3.5 0,0 -6.5598,-3.27587 -7.4062,-3.6875 -0.2025,-0.0984 -0.5718,-0.20222 -1.0313,-0.3125 1.2154,-0.56154 5.0119,-1.12778 7.75,-1.5 3.009,-0.40905 3.3227,-0.41558 5.375,-0.34375 1.9431,0.068 3.0072,0.16485 3.1875,0.1875 0.1188,-0.1944 0.3846,-0.72881 0.9375,-0.875 0.7418,-0.19612 5.1311,-0.82878 7.25,-1.09375 1.7564,-0.21961 4.4053,-0.33231 6.3125,0.0312 0.3169,0.0604 0.6058,0.18938 0.875,0.28125 1.9362,0.66092 7.8438,2.9375 7.8438,2.9375 -10e-5,0 -6.5367,-2.80655 -7.375,-3.15625 -0.2005,-0.0836 -0.5762,-0.17333 -1.0313,-0.25 1.2037,-0.65046 5.0191,-1.37195 7.7188,-2 2.9667,-0.6902 3.2889,-0.75507 5.3125,-0.875 2.0886,-0.1238 3.2812,-0.0312 3.2812,-0.0312 0,1e-5 -0.087,-0.63205 1,-1.03125 0.7292,-0.2678 5.0472,-1.33797 7.125,-1.8125 2.0085,-0.45869 5.1679,-1.0293 7,-0.625 1.8781,0.41446 13.5782,3.01563 13.5782,3.01563 0,0 -12.3275,-3.02266 -13.1407,-3.26563 -0.1945,-0.0581 -0.5586,-0.10626 -1,-0.125 1.1676,-0.80369 3.5142,-1.6873 6.1094,-2.70312 1.6814,-0.65818 0.9237,-0.37659 2.7759,-1.0036 1.7536,-0.59366 2.4854,-1.01071 2.6304,-1.11299 0.3461,-0.20651 -0.356,-0.12188 -0.5442,-0.0424 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7333-7);enable-background:new"</div><div class='add'>+               sodipodi:nodetypes="czscsssscssssscsssscssssscsssscssssscsssscssssscsssscssssscsssscssccsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscsssscscsscssscscsscc" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8175-7"</div><div class='add'>+               d="m 1082.625,-275.125 c 1.873,0.39348 4.4961,1.14555 6.0313,1.96875 1.5352,0.82319 2.8222,1.056 5.375,2.5 2.5266,1.42926 4.7958,2.00696 6.9687,2.53125 2.3476,0.56642 5.4354,0.71523 8.8438,1.1875 -1.0889,-0.83975 -6.6074,-1.17245 -8.4063,-1.5625 -1.7989,-0.39006 -3.8941,-1.01616 -6.5937,-2.3125 -2.6997,-1.29634 -3.4944,-1.79896 -5.8125,-2.6875 -2.3182,-0.88854 -4.0044,-1.38314 -6.4063,-1.625 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7285-4);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8177-9"</div><div class='add'>+               d="m 1051.4688,-270 c 1.9053,0.57759 4.5281,1.61572 6.0937,2.59375 1.5656,0.97802 2.8802,1.35981 5.5,3.125 2.593,1.74716 4.9859,2.70927 7.25,3.59375 2.4461,0.95557 5.6826,1.65713 9.4063,3.0625 -1.1896,-1.13784 -7.0631,-2.68675 -8.9375,-3.375 -1.8745,-0.68825 -4.0818,-1.5662 -6.875,-3.28125 -2.7933,-1.71504 -3.5736,-2.2839 -5.9375,-3.40625 -2.3641,-1.12234 -4.0567,-1.83455 -6.5,-2.3125 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7289-0);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8179-0"</div><div class='add'>+               d="m 1020.2188,-266.84375 c 1.9119,0.63811 4.5812,1.75536 6.1562,2.8125 1.5751,1.05715 2.8956,1.50867 5.5313,3.40625 2.6086,1.87821 5.0284,3.03003 7.3125,4.0625 2.4677,1.11545 5.7645,2.1733 9.5312,3.84375 -1.2033,-1.22253 -7.2028,-3.31423 -9.0937,-4.125 -1.891,-0.81077 -4.0649,-1.89379 -6.875,-3.75 -2.8102,-1.8562 -3.6218,-2.47693 -6,-3.71875 -2.3783,-1.2418 -4.1107,-1.97569 -6.5625,-2.53125 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7293-0);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8181-3"</div><div class='add'>+               d="m 1110.1719,-266.89063 c 0.1508,0.0486 0.688,0.631 0.1094,1.48438 -0.8101,1.19459 -5.7049,3.32429 -8.5625,4.125 -2.8449,0.79712 -6.2901,0.97774 -10.5625,-0.375 -4.3016,-1.36195 -5.4697,-2.46872 -10.6563,-4.3125 4.664,2.11517 6.1953,3.95233 10.125,5.34375 1.6207,0.57387 3.3671,0.9396 5.0625,1.03125 -0.4451,0.32563 -1.5303,0.9833 -3.5625,1.59375 -2.7955,0.83969 -6.6491,1.53378 -8.25,1.625 -1.5146,0.0863 -3.142,-0.51249 -3.4375,-0.625 0.1667,0.10308 0.3732,0.37734 -0.25,1.03125 -0.8993,0.94363 -6.1474,1.923 -9.125,2.25 -2.9643,0.32555 -6.5216,-0.016 -10.9062,-1.90625 -3.978,-1.71497 -5.339,-2.91536 -9.4063,-4.75 0,0 0,0.15625 0,0.15625 3.6431,2.09529 5.284,3.88327 8.875,5.5625 1.7302,0.80909 3.5917,1.40876 5.4063,1.71875 -0.5349,0.28676 -1.5578,0.71151 -3.4375,1.03125 -2.869,0.48796 -6.809,0.81614 -8.4375,0.75 -0.8507,-0.0345 -1.7286,-0.18437 -2.4063,-0.40625 -0.6848,-0.21488 -1.1897,-0.44467 -1.3125,-0.5 0.1694,0.10721 0.4311,0.40288 -0.2187,1.03125 -0.9097,0.87962 -6.2461,1.33638 -9.25,1.46875 -2.9905,0.13179 -6.5889,-0.45063 -11,-2.5625 -4.4412,-2.12626 -5.6415,-3.4016 -10.9063,-5.78125 4.7343,2.59704 6.2865,4.6291 10.3438,6.71875 1.6733,0.86185 3.4852,1.49425 5.25,1.9375 -0.4633,0.23332 -1.5894,0.68814 -3.6875,0.9375 -2.8863,0.34298 -6.8346,0.49288 -8.4688,0.375 -1.5462,-0.1115 -3.2312,-0.85696 -3.5312,-1 0.1691,0.12029 0.4138,0.41048 -0.2188,1 -0.9128,0.85073 -6.2441,1.26212 -9.25,1.375 -2.9925,0.11237 -6.5897,-0.49043 -11,-2.59375 -4.00125,-1.90823 -5.38803,-3.13783 -9.46875,-5.09375 -3e-5,0 0,0.15625 0,0.15625 3.65506,2.20392 5.29421,4.05255 8.90625,5.90625 1.74029,0.89315 3.637,1.52827 5.4688,1.96875 -0.54,0.2483 -1.5781,0.61533 -3.4688,0.84375 -2.88568,0.34858 -6.86605,0.52095 -8.5,0.40625 -0.85345,-0.0599 -1.72631,-0.25791 -2.40625,-0.5 -0.6871,-0.2353 -1.18935,-0.47226 -1.3125,-0.53125 0.16998,0.11227 0.46448,0.42225 -0.1875,1.03125 -0.91265,0.8525 -6.27533,1.29337 -9.28125,1.40625 -2.99246,0.11237 -6.59346,-0.52805 -11,-2.59375 -4.43653,-2.07978 -5.64688,-3.33171 -10.90625,-5.65625 4.72938,2.54749 6.29074,4.5778 10.34375,6.625 1.67155,0.84433 3.48554,1.46643 5.25,1.90625 -0.46323,0.23422 -1.5897,0.68407 -3.6875,0.9375 -2.88569,0.34858 -6.8362,0.56952 -8.46875,0.46875 -1.54456,-0.0953 -3.20031,-0.82885 -3.5,-0.96875 0.16899,0.11853 0.38192,0.40385 -0.25,1 -0.91186,0.86028 -6.24665,1.33025 -9.25,1.46875 -2.98995,0.1379 -6.56745,-0.45068 -10.96875,-2.46875 -3.99308,-1.83089 -5.36511,-3.0292 -9.4375,-4.90625 -2e-5,0 0,0.15625 0,0.15625 3.64761,2.13327 5.27033,3.93487 8.875,5.71875 1.73675,0.85951 3.60727,1.45014 5.4375,1.875 -0.53947,0.2529 -1.55063,0.64129 -3.4375,0.90625 -2.87978,0.40436 -6.83813,0.64562 -8.46875,0.5625 -0.85172,-0.0434 -1.7277,-0.20855 -2.40625,-0.4375 -0.68569,-0.22201 -1.1896,-0.44339 -1.3125,-0.5 0.16959,0.10899 0.4319,0.40965 -0.21875,1.03125 -0.91079,0.87014 -6.25021,1.39152 -9.25,1.5625 -2.98633,0.17021 -6.57381,-0.31577 -10.96875,-2.28125 -4.42489,-1.97888 -5.60596,-3.22819 -10.84375,-5.375 4.70997,2.38767 6.27017,4.38873 10.3125,6.34375 1.66715,0.80631 3.46043,1.39658 5.21875,1.78125 -0.46163,0.2487 -1.597,0.71225 -3.6875,1.03125 -2.8756,0.43876 -6.7804,0.7331 -8.40625,0.6875 -1.53823,-0.0431 -3.2328,-0.74522 -3.53125,-0.875 0.16833,0.11282 0.41057,0.41375 -0.21875,1.03125 -0.90812,0.8911 -6.20295,1.52825 -9.1875,1.8125 -2.97118,0.28298 -6.57342,-0.1758 -10.9375,-1.9375 -3.95934,-1.59831 -5.32915,-2.79487 -9.34375,-4.3125 3e-5,0 0,0.15625 0,0.15625 3.5959,1.81135 5.23831,3.58233 8.8125,5.15625 1.72207,0.75835 3.58748,1.28895 5.40625,1.625 -0.53609,0.27908 -1.56658,0.68763 -3.4375,1.0625 -2.85539,0.5721 -6.78942,1.01939 -8.40625,1.03125 -0.84451,0.006 -1.70608,-0.0809 -2.375,-0.25 -0.67591,-0.16151 -1.16009,-0.32923 -1.28125,-0.375 0.16722,0.094 0.42267,0.38348 -0.21875,1.0625 -0.89787,0.95052 -6.18648,1.91708 -9.125,2.4375 -2.92534,0.51809 -6.43215,0.37424 -10.71875,-1.03125 -4.3158,-1.41507 -5.47277,-2.52994 -10.5625,-3.96875 4.57685,1.75101 6.08855,3.56006 10.03125,5 1.62608,0.59389 3.36885,0.95565 5.09375,1.15625 -0.45285,0.29702 -1.55478,0.88339 -3.59375,1.46875 -2.80472,0.80517 -6.63886,1.57583 -8.21875,1.75 -1.49475,0.1648 -3.11623,-0.31681 -3.40625,-0.40625 0.16356,0.0901 0.39278,0.35993 -0.21875,1.0625 -0.88247,1.01385 -6.04452,2.37165 -8.9375,3.0625 -2.88002,0.68778 -6.3356,0.76002 -10.5625,-0.4375 -3.83485,-1.08645 -5.17258,-2.07237 -9.0625,-3.125 -10e-6,0 0,0.15625 0,0.15625 3.48418,1.39485 5.06941,2.9194 8.53125,4.03125 1.66793,0.53572 3.45578,0.78674 5.21875,0.875 -0.51964,0.35212 -1.50039,0.91452 -3.3125,1.53125 -2.76566,0.94125 -6.59024,1.93537 -8.15625,2.15625 -0.81794,0.11539 -1.6331,0.12283 -2.28125,0.0312 -0.65496,-0.0832 -1.1326,-0.21827 -1.25,-0.25 0.16204,0.0746 0.43399,0.34044 -0.1875,1.09375 -0.87,1.05453 -6.00963,2.65925 -8.875,3.4375 -2.85253,0.77476 -6.25912,0.9582 -10.4375,-0.0937 -4.20683,-1.05913 -5.35669,-2.04166 -10.34375,-3.15625 4.48454,1.45946 5.96935,3.13523 9.8125,4.25 1.58504,0.45977 3.28679,0.63825 4.96875,0.6875 -0.44157,0.33676 -1.51251,1.02773 -3.5,1.78125 -2.73393,1.03649 -6.45198,2.16269 -8,2.4375 -1.46462,0.26002 -3.05958,-0.11654 -3.34375,-0.1875 0.16025,0.0796 0.38044,0.32098 -0.21875,1.0625 -0.86466,1.07006 -5.91652,2.81815 -8.75,3.6875 -2.8208,0.86547 -6.2075,1.15631 -10.34375,0.21875 -3.75259,-0.85061 -5.04785,-1.71647 -8.875,-2.59375 0,0 0,0.15625 0,0.15625 3.42796,1.23779 4.98741,2.6323 8.375,3.53125 1.63216,0.43314 3.36704,0.58301 5.09375,0.5625 -0.50893,0.38417 -1.47675,1.02182 -3.25,1.75 -2.70634,1.11134 -6.43633,2.30781 -7.96875,2.625 -0.8004,0.16569 -1.61231,0.21862 -2.25,0.15625 0,0 0,0.51552 0,0.92229 0,0.26507 0,0.48396 0,0.48396 0.22645,-0.14468 0.44891,-0.27261 0.71875,-0.375 1.08052,-0.40998 2.17161,-0.21577 6,-1.6875 3.82843,-1.47174 5.22412,-2.00498 5.90625,-2.40625 0.6796,-0.39978 1.61165,-0.87937 2.21875,-1.53125 1.82685,-0.13775 3.57075,-0.49323 4.9375,-1 2.96812,-1.10052 4.87537,-1.80619 6.78125,-2.46875 1.90586,-0.66254 2.35409,-1.41487 3.40625,-1.78125 1.09155,-0.38011 2.19511,-0.16538 6.0625,-1.53125 3.86745,-1.36586 5.28316,-1.82708 5.96875,-2.21875 0.70109,-0.40052 1.70081,-0.93298 2.3125,-1.59375 1.9708,-0.0547 3.81685,-0.38463 5.28125,-0.875 3.00148,-1.00508 4.92615,-1.62171 6.84375,-2.25 1.5386,-0.5041 2.17402,-1.04677 2.90625,-1.4375 0.23016,-0.13431 0.47574,-0.25373 0.75,-0.34375 1.09823,-0.36048 2.18145,-0.0814 6.09375,-1.3125 3.91233,-1.23113 5.36605,-1.67295 6.0625,-2.03125 0.69388,-0.35697 1.63015,-0.79261 2.25,-1.40625 1.86521,-0.0227 3.63581,-0.26683 5.03125,-0.6875 3.03043,-0.91354 4.99238,-1.4301 6.9375,-1.96875 1.94511,-0.53864 2.42618,-1.26452 3.5,-1.5625 1.11401,-0.30915 2.21994,0.007 6.1875,-1.03125 3.96761,-1.03863 5.41758,-1.43273 6.125,-1.75 0.73487,-0.32959 1.81383,-0.75372 2.4375,-1.375 1.99774,0.116 3.85743,-0.0201 5.34375,-0.375 3.07811,-0.735 5.08344,-1.10094 7.0625,-1.5 1.58792,-0.32018 2.24429,-0.79055 3,-1.09375 0.23757,-0.1068 0.46695,-0.19276 0.75,-0.25 1.13347,-0.22919 2.30448,0.20893 6.34375,-0.5 4.03933,-0.70893 5.50025,-0.92709 6.21875,-1.1875 0.71586,-0.25944 1.70428,-0.56724 2.34375,-1.09375 1.92427,0.23949 3.74788,0.22453 5.1875,0 3.12633,-0.48762 5.15455,-0.70067 7.15625,-0.96875 2.00171,-0.26807 2.48869,-0.94514 3.59375,-1.09375 1.14639,-0.15418 2.27592,0.30157 6.34375,-0.21875 4.06784,-0.52032 5.56013,-0.69573 6.28125,-0.9375 0.7371,-0.24714 1.79809,-0.58623 2.4375,-1.125 2.05007,0.33553 3.97378,0.39796 5.5,0.21875 3.14231,-0.36896 5.17994,-0.55936 7.1875,-0.78125 1.61076,-0.17802 2.26467,-0.6082 3.03125,-0.84375 0.24094,-0.0855 0.49412,-0.1556 0.78125,-0.1875 1.14978,-0.12772 2.30129,0.34665 6.375,-0.125 4.07374,-0.47165 5.55909,-0.6106 6.28125,-0.84375 0.71946,-0.23227 1.70024,-0.47346 2.34375,-0.96875 1.93637,0.33346 3.77006,0.40424 5.21875,0.25 3.14602,-0.33495 5.17756,-0.51859 7.1875,-0.71875 2.00996,-0.20014 2.48414,-0.82639 3.59375,-0.9375 1.15114,-0.11528 2.29643,0.36506 6.375,-0.0625 4.07861,-0.42756 5.58886,-0.56209 6.3125,-0.78125 0.73915,-0.22386 1.79572,-0.51325 2.4375,-1.03125 2.0571,0.39867 4.00187,0.4934 5.53125,0.34375 3.14873,-0.3081 5.17584,-0.47325 7.1875,-0.65625 1.61407,-0.14682 2.2631,-0.56055 3.03125,-0.78125 0.24142,-0.0809 0.49353,-0.12991 0.78125,-0.15625 1.15211,-0.10545 2.29296,0.39275 6.375,0 4.08208,-0.39275 5.5889,-0.53084 6.3125,-0.75 0.7209,-0.21833 1.6997,-0.4477 2.3438,-0.9375 1.938,0.34999 3.7688,0.45438 5.2187,0.3125 3.1487,-0.3081 5.1758,-0.47325 7.1875,-0.65625 2.0116,-0.18299 2.5142,-0.83802 3.625,-0.9375 1.1523,-0.10323 2.2922,0.38483 6.375,0 4.0829,-0.38482 5.5887,-0.501 6.3125,-0.71875 0.7393,-0.22243 1.7956,-0.51449 2.4375,-1.03125 2.0574,0.40177 4.0029,0.50333 5.5313,0.34375 3.1466,-0.32852 5.1771,-0.5227 7.1875,-0.71875 1.613,-0.15729 2.2656,-0.63148 3.0312,-0.875 0.2407,-0.088 0.4632,-0.12137 0.75,-0.15625 1.1483,-0.1397 2.3167,0.33991 6.375,-0.25 4.0583,-0.58992 5.5618,-0.77714 6.2813,-1.03125 0.7167,-0.25316 1.6745,-0.55807 2.3125,-1.09375 1.9197,0.21194 3.7199,0.15141 5.1562,-0.0937 3.1191,-0.5324 5.1116,-0.92861 7.0938,-1.3125 1.9821,-0.38387 2.4743,-1.03965 3.5625,-1.28125 1.1288,-0.25066 2.2703,0.11629 6.25,-0.875 3.9796,-0.99128 5.4296,-1.4193 6.125,-1.78125 0.7223,-0.37601 1.7619,-0.87058 2.375,-1.53125 1.963,-0.012 3.7937,-0.29105 5.2187,-0.84375 2.9512,-1.14461 4.8732,-1.86942 6.6875,-2.75 1.4557,-0.70653 2.3348,-1.68641 2.5469,-1.98438 0.2122,-0.29796 0.1118,-0.7453 0.1379,-0.76675 0.043,-0.0352 0.3193,-0.085 0.479,-0.42844 0.8589,-1.84708 2.321,-5.64459 2.4352,-6.32945 0.1137,-0.68216 0.1638,-1.34774 0.2145,-1.74497 0.029,-0.22952 -0.1467,-0.86544 -0.1246,-0.92404 0.031,-0.0821 0.3045,-0.26528 0.3599,-0.51471 0.2663,-1.19833 0.089,-2.19129 -0.1251,-3.60893 -0.214,-1.41764 -0.9837,-4.62214 -1.6369,-5.47626 -0.6589,-0.86172 -1.2229,-1.01117 -1.7479,-1.00066 -0.2086,0.26976 0.1368,0.26309 0.1626,0.31261 0.6806,0.0508 0.934,0.36864 1.4192,0.89662 0.4852,0.52798 1.2218,3.85117 1.3584,5.30156 0.1366,1.45039 0.19,2.8602 -0.088,3.46864 -0.2781,0.60845 -0.7232,0.51703 -1.0156,0.58291 0.531,0.18589 0.6698,0.12483 0.7314,0.96929 0.059,0.81338 -0.1332,1.63969 -0.5198,2.80562 -0.3912,1.18001 -1.8452,4.34998 -2.2857,4.59877 -0.4523,0.25551 -0.7314,0.27038 -1.067,0.13944 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7337-2);enable-background:new"</div><div class='add'>+               sodipodi:nodetypes="cssscscsscsssccscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssscscssssssscscsscsssccscsscscssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsssssscssssscsszsszssszzcczzzczzzc" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8183-3"</div><div class='add'>+               d="m 988.75,-263.84375 c 1.91161,0.6344 4.55027,1.75841 6.125,2.8125 1.57477,1.05409 2.8961,1.48252 5.5313,3.375 2.6082,1.87314 5.0269,3.01522 7.3125,4.0625 2.4693,1.13147 5.7521,2.15474 9.5312,3.9375 -1.2072,-1.2584 -7.139,-3.36445 -9.0312,-4.1875 -1.8922,-0.82304 -4.128,-1.93049 -6.9375,-3.78125 -2.80961,-1.85075 -3.62224,-2.48154 -6.00005,-3.71875 -2.37782,-1.23719 -4.07988,-1.9492 -6.53125,-2.5 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7297-4);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8185-3"</div><div class='add'>+               d="m 957.5,-260.78125 c 1.91,0.6181 4.58288,1.70934 6.15625,2.75 1.57339,1.04066 2.89608,1.48252 5.53125,3.375 2.60823,1.87315 5.02692,3.01521 7.3125,4.0625 2.46931,1.13147 5.75213,2.15475 9.53125,3.9375 -1.20728,-1.2584 -7.20154,-3.3957 -9.09375,-4.21875 -1.89217,-0.82304 -4.09666,-1.9305 -6.90625,-3.78125 -2.80958,-1.85075 -3.59295,-2.43932 -5.96875,-3.65625 -2.37578,-1.21691 -4.11321,-1.93885 -6.5625,-2.46875 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7301-5);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8187-7"</div><div class='add'>+               d="m 926.09375,-257.375 c 1.90772,0.59745 4.55348,1.66384 6.125,2.6875 1.5715,1.02365 2.87022,1.43971 5.5,3.28125 2.60291,1.82273 5.02887,2.9722 7.3125,4 2.4672,1.11041 5.75535,2.09323 9.53125,3.84375 -1.20623,-1.2481 -7.1719,-3.31809 -9.0625,-4.125 -1.89058,-0.8069 -4.10242,-1.89104 -6.90625,-3.6875 -2.80385,-1.79644 -3.62704,-2.40251 -6,-3.59375 -2.37297,-1.19124 -4.05362,-1.90283 -6.5,-2.40625 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7305-4);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8189-3"</div><div class='add'>+               d="m 894.90625,-253.5625 c 1.90213,0.55355 4.58701,1.58887 6.15625,2.59375 1.56923,1.00487 2.87401,1.40864 5.5,3.21875 2.59912,1.79164 5.00034,2.87189 7.28125,3.875 2.46428,1.08374 5.75984,2.04029 9.53125,3.75 -1.2048,-1.23507 -7.17416,-3.24478 -9.0625,-4.03125 -1.88832,-0.78647 -4.0752,-1.8308 -6.875,-3.59375 -2.79977,-1.76294 -3.59919,-2.36836 -5.96875,-3.53125 -2.36957,-1.16288 -4.12325,-1.83412 -6.5625,-2.28125 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7309-9);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8191-2"</div><div class='add'>+               d="m 863.71875,-248.65625 c 1.88062,0.42909 4.50427,1.38038 6.0625,2.3125 1.55823,0.93211 2.85233,1.25776 5.46875,3 2.58971,1.72444 4.98067,2.70802 7.25,3.625 2.45176,0.99069 5.73959,1.87707 9.5,3.5 -1.20131,-1.20734 -7.15249,-3.06609 -9.03125,-3.78125 -1.87875,-0.71517 -4.0854,-1.68442 -6.875,-3.375 -2.78963,-1.69057 -3.58461,-2.22822 -5.9375,-3.28125 -2.35292,-1.05301 -4.02584,-1.71248 -6.4375,-2 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7313-2);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8193-6"</div><div class='add'>+               d="m 833.15625,-241.375 c 1.84836,0.29644 4.46945,0.97632 6,1.78125 1.53058,0.80493 2.81374,1.05573 5.375,2.53125 2.53504,1.46046 4.89068,2.32509 7.125,3.0625 2.41399,0.79668 5.65711,1.46689 9.375,2.84375 -1.18771,-1.12873 -7.08772,-2.58975 -8.9375,-3.15625 -1.84977,-0.5665 -4.00342,-1.37392 -6.75,-2.84375 -2.74657,-1.46983 -3.50136,-1.92028 -5.8125,-2.78125 -2.31115,-0.86095 -4.00471,-1.32009 -6.375,-1.4375 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7317-7);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8195-5"</div><div class='add'>+               d="m 802.90625,-232.3125 c 1.8222,0.21127 4.36576,0.80057 5.875,1.53125 1.50925,0.73066 2.75568,0.92998 5.28125,2.28125 2.49976,1.33746 4.83154,2.04843 7.03125,2.65625 2.37653,0.65667 5.56464,1.07288 9.21875,2.1875 -1.16735,-1.04496 -6.92888,-2.10329 -8.75,-2.5625 -1.82111,-0.45921 -3.95225,-1.12696 -6.65625,-2.4375 -2.70403,-1.31052 -3.47106,-1.7199 -5.75,-2.46875 -2.27895,-0.74883 -3.91325,-1.17931 -6.25,-1.1875 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7321-5);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8197-2"</div><div class='add'>+               d="m 773.1875,-222.1875 c 1.81109,0.1787 4.32059,0.66506 5.8125,1.34375 1.49194,0.67869 2.7534,0.79822 5.25,2.0625 2.47107,1.25138 4.79005,1.89614 6.96875,2.4375 2.35387,0.58488 5.49134,0.89752 9.09375,1.84375 -1.15084,-0.99116 -6.85251,-1.7833 -8.65625,-2.1875 -1.80372,-0.4042 -3.91553,-1.02116 -6.59375,-2.25 -2.67818,-1.22884 -3.40345,-1.61089 -5.65625,-2.28125 -2.25279,-0.67034 -3.89627,-1.00232 -6.21875,-0.96875 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7329-8);enable-background:new" /&gt;</div><div class='add'>+            &lt;path</div><div class='add'>+               inkscape:connector-curvature="0"</div><div class='add'>+               id="path8199-6"</div><div class='add'>+               d="m 743.5625,-211.1875 c 1.79281,0.12911 4.27313,0.54965 5.75,1.1875 1.4769,0.63785 2.7161,0.74156 5.1875,1.9375 2.44618,1.18372 4.72054,1.74666 6.875,2.21875 2.32767,0.51003 5.4196,0.68064 9,1.5625 -1.14379,-0.9706 -6.74759,-1.59065 -8.53125,-1.9375 -1.78367,-0.34684 -3.88285,-0.88756 -6.53125,-2.03125 -2.64841,-1.14368 -3.39495,-1.51631 -5.625,-2.125 -2.23008,-0.60868 -3.82594,-0.90966 -6.125,-0.8125 z"</div><div class='add'>+               style="display:inline;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7325-2);enable-background:new" /&gt;</div><div class='add'>+          &lt;/g&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           d="m 863.87812,475.6679 c 1.64212,-3.218 3.51781,-5.73529 4.86136,-9.84898 0.79872,-3.65789 3.31204,-2.03073 7.26047,-8.3969 1.40193,-2.2395 5.47653,0.39136 8.9651,-2.39911 1.27072,-0.80319 2.88488,-0.40431 4.48256,-0.0631 3.76539,1.31896 5.82576,3.70355 8.33376,5.80837 6.13906,5.97023 20.53414,7.94327 23.48604,6.31346 1.43405,-2.90474 7.88128,-5.40888 12.37437,-11.11168 0.74811,-1.12267 11.72936,-8.74446 14.64721,-6.56599"</div><div class='add'>+           id="path8201-5"</div><div class='add'>+           sodipodi:nodetypes="ccccccccc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           d="m 888.50059,465.25071 c 7.36341,-3.23297 13.8109,-8.9084 20.70813,-13.38452 3.31057,-1.96954 6.86983,3.21601 10.796,3.59866 2.29773,-0.21813 3.7129,1.20259 5.68211,1.6415 5.15636,1.31779 2.39793,3.86488 9.97526,6.43972 6.15561,1.7204 8.9074,-6.79847 14.89975,-7.3236 4.87739,-0.50299 8.09892,-0.31603 11.61675,-0.25254 3.92696,0.13889 4.07855,-3.4976 6.06092,-5.3033 2.98056,-2.80522 7.15561,-1.84972 10.14485,-4.7409 1.01754,-1.38468 1.95458,-3.01085 2.73459,-5.10809 0.88201,-2.00034 3.04006,0.30598 4.79823,1.26269"</div><div class='add'>+           id="path8203-8"</div><div class='add'>+           sodipodi:nodetypes="ccccccccccc" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9048-9);enable-background:accumulate"</div><div class='add'>+           d="m 403.27922,1056.3058 56.56854,-42.4264 72.12489,14.1421 -46.66904,52.3259 -53.74012,7.0711 -28.28427,-31.1127 z"</div><div class='add'>+           id="path8994-7" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           d="m 542.27183,1060.5719 c -1.40727,18.8012 -1.1449,32.751 2.08174,49.3033 3.22666,16.5523 16.40609,45.9073 20.33441,63.1837 3.92621,17.2671 2.69413,38.3097 -12.45944,51.1483 -15.31761,12.9774 -42.05128,21.5989 -67.83231,15.7337 -25.78105,-5.8652 -69.54907,-49.2234 -88.59019,-70.2283 -19.11214,-21.0833 -63.76086,-93.8506 -77.93853,-124.2758 -14.17767,-30.4251 -12.65961,-36.7186 -8.11972,-45.52972 -9.36672,-24.5205 -12.41371,-50.06681 -33.71245,-75.57664 30.32547,3.11444 43.88028,26.95633 60.12568,47.13975 -5.52989,-48.07603 -18.05471,-64.4165 -28.37395,-90.7243 29.9943,6.08165 50.57936,31.87239 63.97979,72.7125 9.55415,-3.91791 18.23776,-9.37294 30.18741,-9.0612 -11.2975,-41.6958 -17.94946,-69.91584 -36.68725,-101.06994 53.44196,5.67033 83.65702,80.63932 78.97142,87.9608 9.97797,-2.24399 19.00565,-6.53038 30.43653,-5.65167 -11.24897,-38.34702 -21.04781,-76.8679 -3.65971,-118.64819 0,0 48.28678,65.43688 54.38966,85.80578 6.10287,20.3689 1.51881,38.70051 1.51881,38.70051 0,0 16.95957,31.0853 20.29392,51.09414 3.3731,20.24138 -3.53269,59.10328 -4.94582,77.98328 z"</div><div class='add'>+           id="path4189-9"</div><div class='add'>+           sodipodi:nodetypes="czzzzzzcccccccccczczz" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter3587-1);enable-background:accumulate"</div><div class='add'>+           d="m 719.5,738.69519 18.31177,15.43196 44.41103,-15.38821 23.2772,-25.54375 11.46397,19.22065 30.67161,12.78354 25.09737,5.72837 L 892,723.19519 908.02309,747.02126 947,752.19519 l 10.24541,-6.19852 6.75471,8.6982 25.49988,11.00032 2,-40.5 L 955.94866,710.6576 923.45591,689.1305 883.0038,677.66492 861.69668,662.13148 840,685.19519 755.02878,638.61208 722,676.69519 l -2.5,62 z"</div><div class='add'>+           id="path4191-6"</div><div class='add'>+           sodipodi:nodetypes="cccccccccccccccccccccc"</div><div class='add'>+           clip-path="url(#clipPath3631-6)"</div><div class='add'>+           transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,995.28646,23.53493)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:0.58775509;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3898-1);enable-background:new"</div><div class='add'>+           d="m 584,696.5 -6.5625,17.15625 c 0,0 -7.81152,20.36488 -15.6875,43.65625 -3.93799,11.64568 -7.88302,24.04145 -10.9375,35.125 -3.05448,11.08355 -5.33586,20.37986 -5.5,28.28125 -0.39807,19.16196 5.74653,34.8883 8.9375,41.75 -0.77153,3.55523 -1.99137,9.45432 -3.34375,18.09375 -1.92042,12.26821 -3.71827,27.15441 -2.375,39.875 1.38209,13.08835 6.81222,28.18765 12.59375,43.03125 5.78153,14.8436 12.05435,29.22711 15.21875,38.03125 6.63206,18.4519 9.99296,31.5763 11.3125,48.5 0.58135,7.4561 -0.24227,20.336 -1.25,33.375 -1.00773,13.039 -2.18661,26.3014 -1.6875,36.9688 0.98911,21.1398 9.32798,46.8347 33.375,57.9374 22.77483,10.5154 55.32682,11.7022 83.4375,-3.4374 16.15992,-8.7034 30.07634,-27.0976 43.375,-46.9063 13.29866,-19.8087 24.96917,-41.0534 31.9375,-54.9063 15.35292,-30.5212 39.39353,-115.46418 45.625,-152.7187 3.01859,-18.04653 3.92166,-29.06555 2.625,-38.03125 -0.97853,-6.76604 -3.82819,-12.1474 -6.875,-16.21875 2.04274,-27.50791 -0.73207,-51.36878 11.96875,-79.40625 L 840.75,763.375 l -23.8125,9.3125 c -17.48975,6.83753 -28.90164,19.04536 -36.59375,32.0625 -0.32251,0.54577 -0.56314,1.10776 -0.875,1.65625 0.22203,-22.51521 4.40784,-37.63759 6.59375,-58.6875 l 1.96875,-19 L 771,737.375 c -30.59449,15.55571 -45.69489,48.19321 -49.71875,90.21875 -4.24532,-0.62547 -8.8314,-1.01965 -13.8125,-0.84375 -0.29149,-39.18036 -0.39629,-67.03685 8.59375,-99.375 l 5.59375,-20.125 -19.4375,7.65625 c -30.90937,12.20394 -47.85954,41.93073 -56.625,68.375 -4.38273,13.22214 -6.74582,25.80121 -7.59375,35.9375 -0.23203,2.77373 -0.31106,5.31132 -0.3125,7.71875 -3.24187,-0.0364 -6.42052,0.13589 -10.0625,0.5 0.0416,-39.00473 -3.48424,-79.75415 -32.28125,-116.5 L 584,696.5 Z m 5.8125,43.8125 c 16.80691,30.64383 17.47451,63.96728 16.9375,99.75 l -0.21875,15.0625 12.03493,-6.53921 c 8.66205,-3.13302 19.56058,-0.22752 31.93382,-0.83579 l 14.67465,9.3566 -6.3309,-25.7941 c -0.0897,-0.22997 -0.22046,-0.41669 -0.25,-0.71875 -0.19951,-2.03986 -0.22232,-5.47307 0.125,-9.625 0.69464,-8.30386 2.78957,-19.58524 6.625,-31.15625 5.15532,-15.55294 13.48801,-31.19248 25.125,-42.53125 -4.68381,28.63798 -3.21559,60.25934 -3.01164,95.80514 l -2.76593,13.26164 15.49632,-7.59803 c 9.0294,-2.75771 17.18897,-0.34996 29.28125,1.09375 l 13.24632,9.44423 L 741.09375,840 c 1.44793,-30.97177 8.22149,-53.67808 20.71875,-68.875 -2.98688,19.77884 -5.43043,41.7848 0.3125,78.34375 l 1.06552,6.37318 -2.93815,11.51685 10.61711,-8.16818 9.18973,10.22198 -1.54828,-10.4636 L 781.9375,852 c 5.70102,-13.21149 10.17282,-26.21337 16.34375,-36.65625 0.95986,-1.62434 2.03153,-3.06436 3.0625,-4.5625 -3.68066,21.15535 -2.42716,40.20815 -4.09375,57.78125 l -4.68014,7.80698 7.39889,0.22427 c 3.22005,3.48361 3.8675,3.85068 4.5625,8.65625 0.695,4.80557 0.31862,14.40035 -2.5625,31.625 -5.56799,33.28792 -31.84562,77.83981 -43.7404,101.4864 -6.60491,13.1304 -18.52833,57.4859 -31.12335,76.2465 -12.59502,18.7605 -28.53137,39.7673 -37.17204,44.4209 -21.49052,11.5742 -44.55594,25.5059 -60.61889,18.0895 -14.37486,-6.637 -23.03969,-21.1927 -23.81407,-37.7433 -0.38311,-8.188 0.61279,-21.3092 1.625,-34.4062 1.01221,-13.0971 11.28891,-22.5708 15.42339,-36.5626 5.37229,-18.1808 -1.44687,-36.5944 -12.5,-53.93745 -6.48655,-10.17778 -23.9768,-24.2579 -29.54839,-38.5625 -5.57159,-14.3046 -10.36751,-29.00315 -11.28125,-37.65625 -0.92621,-8.77113 0.4225,-23.02502 2.21875,-34.5 1.79625,-11.47497 3.84375,-20.28125 3.84375,-20.28125 l 9.42278,-3.6152 -10.48528,-3.8848 c 0,0 -8.49889,-15.3101 -8.09375,-34.8125 0.0711,-3.42316 1.83626,-12.72805 4.71875,-23.1875 2.88249,-10.45945 6.76466,-22.55271 10.625,-33.96875 3.04439,-9.00308 5.78063,-16.60345 8.34375,-23.6875 z"</div><div class='add'>+           id="path4193-0"</div><div class='add'>+           clip-path="url(#clipPath3677-0)"</div><div class='add'>+           sodipodi:nodetypes="ccssscsssssssssssssccccscccccccccsscccccccccccssscccccccccccccccsccccssssssssssssscccsssc"</div><div class='add'>+           transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,822.28931,10.93589)" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           style="display:inline;enable-background:new"</div><div class='add'>+           id="g3617-4"</div><div class='add'>+           clip-path="url(#clipPath3622-5)"</div><div class='add'>+           transform="translate(276,136)"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,-52.200498,74.09707)"</div><div class='add'>+             id="path4195-1"</div><div class='add'>+             d="m -15.66751,843.48852 -49.49748,-15.55635 -26.87005,52.3259 41.01219,45.25484 49.49747,-38.18377 -14.14213,-43.84062 z"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9024-1);enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             sodipodi:nodetypes="ccccccccccccc"</div><div class='add'>+             transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,-46.92842,75.511284)"</div><div class='add'>+             id="path4197-0"</div><div class='add'>+             d="m 118.70648,859.93048 -55.154328,-46.66904 -43.84062,36.76955 33.94113,53.74011 -13.596814,85.46203 -39.44536579,28.29217 -41.01220021,11.3137 -2.82842,46.669 56.56854,25.4559 18.943987,-69.65 23.45655,-58.85663 46.347541,-72.61491 16.62,-39.91188 z"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9020-8);enable-background:accumulate" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9044-0);enable-background:accumulate"</div><div class='add'>+           d="m -70.82184,932.58397 60.81118,-26.87005 100.40916,31.1127 -63.63961,31.11269 -82.02438,-16.97056 -15.55635,-18.38478 z"</div><div class='add'>+           id="path4199-4"</div><div class='add'>+           transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,229.07158,211.51128)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:0.58775509;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4105-2);enable-background:new"</div><div class='add'>+           d="m 583.0625,715.75 c -12.10609,34.44974 -26.7145,68.53333 -31.75,104.84375 -0.83208,14.92867 4.58915,29.15943 8.84375,43.0625 -5.91624,27.20126 -10.13681,56.89995 1.15625,83.125 13.51717,38.16085 35.00147,75.68215 32.42279,117.46825 -0.9483,29.2942 -9.01444,60.9941 5.38971,88.2817 10.19864,19.3348 33.13956,27.3117 53.96785,27.6676 27.86219,1.1741 56.46261,-11.6216 72.0009,-35.2613 22.59549,-29.3717 41.80051,-61.4973 55.23865,-96.0598 16.89053,-45.506 29.6718,-92.56072 37.93402,-140.3989 1.8244,-12.94106 3.10108,-27.46985 -4.57892,-38.82255 -3.43115,-7.33632 0.0421,-15.56014 -0.68457,-23.30977 0.674,-24.99466 4.01232,-50.66376 16.65332,-72.59648 -17.73313,6.4446 -35.07268,16.55971 -44.00307,33.86425 -3.93508,6.70955 -7.60482,13.57413 -11.37193,20.38575 -3.54999,-30.01408 3.71963,-59.64828 6.78125,-89.28125 -20.16604,9.05463 -36.87672,25.65522 -44.17495,46.682 -6.30463,15.58003 -8.80222,32.31718 -10.26255,49.03675 -8.25334,-1.51925 -16.68447,-2.10155 -25.0625,-1.5 -0.96308,-38.69787 -0.46696,-79.40715 10.96875,-115.90625 -18.68113,6.21776 -35.16621,18.73551 -45.62803,35.38723 -13.85254,20.87979 -21.2614,45.75395 -23.05947,70.61277 0.58534,4.32454 -0.0613,11.84009 -6.34375,9.875 -5.33118,0.0176 -10.62908,0.67883 -15.9375,1.09375 1.14784,-39.38148 -3.34144,-81.6282 -27.0625,-114.21875 -3.06071,-3.63717 -5.63685,-7.68438 -8.625,-11.34375 -0.9375,2.4375 -1.875,4.875 -2.8125,7.3125 z m 7.75,13.84375 c 18.56527,29.29629 22.4825,64.82012 22.125,98.875 0.20409,5.17526 -0.51656,11.8292 0.125,16.0625 12.31856,-6.10275 26.73912,-2.4399 39.78125,-2.1875 2.31712,1.22325 3.1921,1.65243 1.90625,-1.40625 -4.16455,-13.95285 -1.84828,-28.613 1.80504,-42.40764 6.36687,-26.29064 20.62828,-51.08798 42.81996,-67.02986 -8.61709,37.23706 -5.71658,76.56161 -6.09375,113.96875 12.25344,-6.9099 27.27879,-3.44613 40.03125,-0.25 3.39222,3.5348 2.28935,-0.72948 2.1875,-3.8125 -0.48309,-21.37058 4.13133,-43.06963 13.6875,-62.15625 5.96266,-10.68727 14.24338,-19.80379 22.4375,-28.875 -7.87156,33.8381 -9.2029,69.33593 -2.71875,103.5 1.72485,-1.41118 4.60681,-0.45414 5.65625,-0.375 9.68369,-21.23682 16.35112,-45.38062 34.89016,-60.74185 1.87329,-0.37122 -1.44818,8.52495 -1.48391,11.8981 -3.53488,21.84581 -7.17516,44.14234 -8.78421,66.21911 -8.78379,2.34171 2.84835,2.32354 3.46875,4.0625 7.92311,10.5658 4.66299,24.40472 3.63165,36.35334 -7.06405,45.03355 -22.14231,87.36194 -35.95355,130.6798 -12.07476,32.9493 -27.3742,58.8525 -47.88808,87.2015 -10.95257,13.5514 -23.24472,27.8513 -40.84375,32.5 -20.15601,6.2413 -44.20676,10.8769 -62.59956,0.046 -17.28966,-12.3414 -21.02393,-35.7089 -19.26226,-55.6864 0.0488,-15.8262 4.93886,-28.5121 4.4106,-43.4918 -0.53824,-15.2629 -2.29135,-30.5647 -6.54261,-46.8663 -4.25126,-16.30162 -9.04325,-24.91794 -16.11906,-41.57338 -7.24111,-17.04456 -15.07015,-36.74863 -18.20542,-56.28842 -1.74948,-18.62714 2.89171,-37.12262 5.78125,-55.25 3.29623,-2.83696 -1.59799,-5.19659 -2.3125,-8.1875 -7.60113,-17.01508 -8.40747,-36.7749 -2.74234,-54.55998 7.1302,-25.0723 15.76087,-49.63241 24.67984,-74.12752 0.70833,1.30208 1.41667,2.60417 2.125,3.90625 z"</div><div class='add'>+           id="path4201-8"</div><div class='add'>+           sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccczzzcccccc"</div><div class='add'>+           clip-path="url(#clipPath4177-4)"</div><div class='add'>+           transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,822.28931,10.93589)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4130-8);enable-background:accumulate"</div><div class='add'>+           d="m 735.05635,733.03834 2.75542,21.08881 44.41103,-15.38821 4.85063,-22.38975 -3.93617,-22.05222 -22.45163,-36.59301 -8.28004,30.30494 -17.34924,45.02944 z"</div><div class='add'>+           id="path4203-7"</div><div class='add'>+           sodipodi:nodetypes="cccccccc"</div><div class='add'>+           clip-path="url(#clipPath3631-6)"</div><div class='add'>+           transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,995.28646,23.53493)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4141-2);enable-background:accumulate"</div><div class='add'>+           d="m 831.81321,730.29452 15.82237,14.90486 20.85473,2.89994 -1.59029,-39.92598 8.32561,-30.50842 -7.16499,-6.34106 -21.69669,20.9424 -14.55074,38.02826 z"</div><div class='add'>+           id="path4205-0"</div><div class='add'>+           sodipodi:nodetypes="cccccccc"</div><div class='add'>+           clip-path="url(#clipPath3631-6)"</div><div class='add'>+           transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,995.28646,23.53493)" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           id="g8317-8"</div><div class='add'>+           style="display:inline;filter:url(#filter8333-2);enable-background:new"</div><div class='add'>+           clip-path="url(#clipPath8338-4)"</div><div class='add'>+           transform="translate(276,136)"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,719.28646,-112.46507)"</div><div class='add'>+             clip-path="none"</div><div class='add'>+             sodipodi:nodetypes="ccccc"</div><div class='add'>+             id="path4209-6"</div><div class='add'>+             d="m 964.00012,754.69487 18.42881,7.46479 9.07107,-36.96447 -14.87031,4.83886 -12.62957,24.66082 z"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;rect</div><div class='add'>+             y="757.19519"</div><div class='add'>+             x="-55"</div><div class='add'>+             height="177"</div><div class='add'>+             width="182"</div><div class='add'>+             id="rect8315-2"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           id="g8346-4"</div><div class='add'>+           style="display:inline;filter:url(#filter8354-2);enable-background:new"</div><div class='add'>+           clip-path="url(#clipPath8359-0)"</div><div class='add'>+           transform="translate(276,136)"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             transform="matrix(-0.9045327,0.2506626,0.2506626,0.9045327,719.28646,-112.46507)"</div><div class='add'>+             clip-path="none"</div><div class='add'>+             sodipodi:nodetypes="ccccccc"</div><div class='add'>+             id="path4207-7"</div><div class='add'>+             d="m 910.14441,746.31415 32.61295,5.17393 -0.36119,-23.87619 7.18853,-29.68221 -8.45112,-5.26365 -21.82194,26.51077 -9.16723,27.13735 z"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;rect</div><div class='add'>+             y="696.19519"</div><div class='add'>+             x="-22"</div><div class='add'>+             height="176"</div><div class='add'>+             width="165"</div><div class='add'>+             id="rect8344-9"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;opacity:1;fill:#ada469;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+           d="m 1036.164,1071.8338 c 6.7941,18.9028 10.4937,33.2997 11.8903,51.2119 1.3966,17.9123 -3.7827,51.8008 -2.9005,70.6561 0.8818,18.8452 8.1337,40.099 27.3446,48.9689 19.4189,8.9658 49.3193,10.2113 74.1199,-3.1456 24.8006,-13.357 57.401,-70.3255 70.9742,-97.3087 13.6239,-27.0839 38.7611,-114.4974 44.6608,-149.76859 5.8998,-35.27121 2.5506,-41.30077 -4.6174,-49.05549 2.6403,-27.84015 -1.4998,-54.93543 13.1096,-87.18618 -30.249,11.8257 -37.3823,40.1607 -48.3189,65.50508 -8.0009,-50.93293 0.2092,-71.27319 3.3189,-101.21936 -29.0647,14.77791 -42.8615,47.11402 -45,92.85714 -10.9239,-1.3042 -21.3914,-4.43423 -33.5714,-0.71429 -0.264,-46.02334 -1.4635,-76.88941 8.9106,-114.20649 -53.2554,21.02686 -62.9472,106.5941 -56.0535,112.77792 -10.8828,0.535 -21.371,-1.2973 -32.8571,2.85715 0.6389,-42.57135 -0.2605,-84.90861 -30,-122.85715 0,0 -30.958,80.92234 -31.4286,103.57143 -0.4705,22.64909 9.4516,40.16588 9.4516,40.16588 0,0 -8.568,36.74051 -6.2986,58.23223 2.2959,21.74142 20.4429,59.67622 27.2655,78.65812 z"</div><div class='add'>+           id="path8848-3"</div><div class='add'>+           sodipodi:nodetypes="czzzzzzcccccccccczczz" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter3587-1);enable-background:accumulate"</div><div class='add'>+           d="m 719.5,738.69519 18.31177,15.43196 44.41103,-15.38821 23.2772,-25.54375 11.46397,19.22065 30.67161,12.78354 25.09737,5.72837 L 892,723.19519 908.02309,747.02126 947,752.19519 l 10.24541,-6.19852 6.75471,8.6982 25.49988,11.00032 2,-40.5 L 955.94866,710.6576 923.45591,689.1305 883.0038,677.66492 861.69668,662.13148 840,685.19519 755.02878,638.61208 722,676.69519 l -2.5,62 z"</div><div class='add'>+           id="path3635-9"</div><div class='add'>+           sodipodi:nodetypes="cccccccccccccccccccccc"</div><div class='add'>+           clip-path="url(#clipPath3631-6)"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           transform="translate(450.03125,73.843964)"</div><div class='add'>+           style="display:inline;opacity:0.58775509;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3898-1);enable-background:new"</div><div class='add'>+           d="m 584,696.5 -6.5625,17.15625 c 0,0 -7.81152,20.36488 -15.6875,43.65625 -3.93799,11.64568 -7.88302,24.04145 -10.9375,35.125 -3.05448,11.08355 -5.33586,20.37986 -5.5,28.28125 -0.39807,19.16196 5.74653,34.8883 8.9375,41.75 -0.77153,3.55523 -1.99137,9.45432 -3.34375,18.09375 -1.92042,12.26821 -3.71827,27.15441 -2.375,39.875 1.38209,13.08835 6.81222,28.18765 12.59375,43.03125 5.78153,14.8436 12.05435,29.22711 15.21875,38.03125 6.63206,18.4519 9.99296,31.5763 11.3125,48.5 0.58135,7.4561 -0.24227,20.336 -1.25,33.375 -1.00773,13.039 -2.18661,26.3014 -1.6875,36.9688 0.98911,21.1398 9.32798,46.8347 33.375,57.9374 22.77483,10.5154 55.32682,11.7022 83.4375,-3.4374 16.15992,-8.7034 30.07634,-27.0976 43.375,-46.9063 13.29866,-19.8087 24.96917,-41.0534 31.9375,-54.9063 15.35292,-30.5212 39.39353,-115.46418 45.625,-152.7187 3.01859,-18.04653 3.92166,-29.06555 2.625,-38.03125 -0.97853,-6.76604 -3.82819,-12.1474 -6.875,-16.21875 2.04274,-27.50791 -0.73207,-51.36878 11.96875,-79.40625 L 840.75,763.375 l -23.8125,9.3125 c -17.48975,6.83753 -28.90164,19.04536 -36.59375,32.0625 -0.32251,0.54577 -0.56314,1.10776 -0.875,1.65625 0.22203,-22.51521 4.40784,-37.63759 6.59375,-58.6875 l 1.96875,-19 L 771,737.375 c -30.59449,15.55571 -45.69489,48.19321 -49.71875,90.21875 -4.24532,-0.62547 -8.8314,-1.01965 -13.8125,-0.84375 -0.29149,-39.18036 -0.39629,-67.03685 8.59375,-99.375 l 5.59375,-20.125 -19.4375,7.65625 c -30.90937,12.20394 -47.85954,41.93073 -56.625,68.375 -4.38273,13.22214 -6.74582,25.80121 -7.59375,35.9375 -0.23203,2.77373 -0.31106,5.31132 -0.3125,7.71875 -3.24187,-0.0364 -6.42052,0.13589 -10.0625,0.5 0.0416,-39.00473 -3.48424,-79.75415 -32.28125,-116.5 L 584,696.5 Z m 5.8125,43.8125 c 16.80691,30.64383 17.47451,63.96728 16.9375,99.75 l -0.21875,15.0625 12.03493,-6.53921 c 8.66205,-3.13302 19.56058,-0.22752 31.93382,-0.83579 l 14.67465,9.3566 -6.3309,-25.7941 c -0.0897,-0.22997 -0.22046,-0.41669 -0.25,-0.71875 -0.19951,-2.03986 -0.22232,-5.47307 0.125,-9.625 0.69464,-8.30386 2.78957,-19.58524 6.625,-31.15625 5.15532,-15.55294 13.48801,-31.19248 25.125,-42.53125 -4.68381,28.63798 -3.21559,60.25934 -3.01164,95.80514 l -2.76593,13.26164 15.49632,-7.59803 c 9.0294,-2.75771 17.18897,-0.34996 29.28125,1.09375 l 13.24632,9.44423 L 741.09375,840 c 1.44793,-30.97177 8.22149,-53.67808 20.71875,-68.875 -2.98688,19.77884 -5.43043,41.7848 0.3125,78.34375 l 1.06552,6.37318 -2.93815,11.51685 10.61711,-8.16818 9.18973,10.22198 -1.54828,-10.4636 L 781.9375,852 c 5.70102,-13.21149 10.17282,-26.21337 16.34375,-36.65625 0.95986,-1.62434 2.03153,-3.06436 3.0625,-4.5625 -3.68066,21.15535 -2.42716,40.20815 -4.09375,57.78125 l -4.68014,7.80698 7.39889,0.22427 c 3.22005,3.48361 3.8675,3.85068 4.5625,8.65625 0.695,4.80557 0.31862,14.40035 -2.5625,31.625 -5.56799,33.28792 -31.79272,123.1659 -43.6875,146.8125 -6.60491,13.1304 -18.02998,33.8957 -30.625,52.6563 -12.59502,18.7605 -27.35933,35.5338 -36,40.1874 -21.49052,11.5742 -48.7808,10.2602 -64.84375,2.8438 -14.37486,-6.637 -20.53812,-23.4494 -21.3125,-40 -0.38311,-8.188 0.61279,-21.3092 1.625,-34.4062 1.01221,-13.0971 11.28891,-22.5708 15.42339,-36.5626 5.37229,-18.1808 -1.44687,-36.5944 -12.5,-53.93745 -6.48655,-10.17778 -23.9768,-24.2579 -29.54839,-38.5625 -5.57159,-14.3046 -10.36751,-29.00315 -11.28125,-37.65625 -0.92621,-8.77113 0.4225,-23.02502 2.21875,-34.5 1.79625,-11.47497 3.84375,-20.28125 3.84375,-20.28125 l 9.42278,-3.6152 -10.48528,-3.8848 c 0,0 -8.49889,-15.3101 -8.09375,-34.8125 0.0711,-3.42316 1.83626,-12.72805 4.71875,-23.1875 2.88249,-10.45945 6.76466,-22.55271 10.625,-33.96875 3.04439,-9.00308 5.78063,-16.60345 8.34375,-23.6875 z"</div><div class='add'>+           id="path3669-2"</div><div class='add'>+           clip-path="url(#clipPath3677-0)"</div><div class='add'>+           sodipodi:nodetypes="ccssscsssssssssssssccccscccccccccsscccccccccccssscccccccccccccccsccccssssssssssssscccsssc" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           id="g3628-8"</div><div class='add'>+           clip-path="url(#clipPath3636-90)"</div><div class='add'>+           transform="translate(276,136)"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             id="path8988-3"</div><div class='add'>+             d="m 824.48651,818.48242 -49.49748,-15.55635 -26.87005,52.3259 41.01219,45.25484 49.49747,-38.18377 -14.14213,-43.84062 z"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9024-1);enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             id="path8990-0"</div><div class='add'>+             d="m 964.49365,855.25197 -55.15433,-46.66904 -43.84062,36.76955 33.94113,53.74011 7.07106,66.46804 -50.91168,35.35537 -41.0122,11.3137 -2.82842,46.669 56.56854,25.4559 63.63961,-76.3676 24.04163,-94.75227 8.48528,-57.98276 z"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9020-8);enable-background:accumulate" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter9044-0);enable-background:accumulate"</div><div class='add'>+           d="m 1045.3322,1043.5779 60.8112,-26.8701 100.4091,31.1127 -63.6396,31.1127 -82.0244,-16.9706 -15.5563,-18.3847 z"</div><div class='add'>+           id="path8992-1" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           transform="translate(450.03125,73.843964)"</div><div class='add'>+           style="display:inline;opacity:0.58775509;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20.79999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4185-1);enable-background:new"</div><div class='add'>+           d="m 583.0625,715.75 c -12.10609,34.44974 -26.7145,68.53333 -31.75,104.84375 -0.83208,14.92867 4.58915,29.15943 8.84375,43.0625 -5.91624,27.20126 -10.13681,56.89995 1.15625,83.125 13.51717,38.16085 35.00147,75.68215 32.42279,117.46825 -0.9483,29.2942 -9.01444,60.9941 5.38971,88.2817 10.19864,19.3348 33.13956,27.3117 53.96785,27.6676 27.86219,1.1741 56.46261,-11.6216 72.0009,-35.2613 22.59549,-29.3717 41.80051,-61.4973 55.23865,-96.0598 16.89053,-45.506 29.6718,-92.56072 37.93402,-140.3989 1.8244,-12.94106 3.10108,-27.46985 -4.57892,-38.82255 -3.43115,-7.33632 0.0421,-15.56014 -0.68457,-23.30977 0.674,-24.99466 4.01232,-50.66376 16.65332,-72.59648 -17.73313,6.4446 -35.07268,16.55971 -44.00307,33.86425 -3.93508,6.70955 -7.60482,13.57413 -11.37193,20.38575 -3.54999,-30.01408 3.71963,-59.64828 6.78125,-89.28125 -20.16604,9.05463 -36.87672,25.65522 -44.17495,46.682 -6.30463,15.58003 -8.80222,32.31718 -10.26255,49.03675 -8.25334,-1.51925 -16.68447,-2.10155 -25.0625,-1.5 -0.96308,-38.69787 -0.46696,-79.40715 10.96875,-115.90625 -18.68113,6.21776 -35.16621,18.73551 -45.62803,35.38723 -13.85254,20.87979 -21.2614,45.75395 -23.05947,70.61277 0.58534,4.32454 -0.0613,11.84009 -6.34375,9.875 -5.33118,0.0176 -10.62908,0.67883 -15.9375,1.09375 1.14784,-39.38148 -3.34144,-81.6282 -27.0625,-114.21875 -3.06071,-3.63717 -5.63685,-7.68438 -8.625,-11.34375 -0.9375,2.4375 -1.875,4.875 -2.8125,7.3125 z m 7.75,13.84375 c 18.56527,29.29629 22.4825,64.82012 22.125,98.875 0.20409,5.17526 -0.51656,11.8292 0.125,16.0625 12.31856,-6.10275 26.73912,-2.4399 39.78125,-2.1875 2.31712,1.22325 3.1921,1.65243 1.90625,-1.40625 -4.16455,-13.95285 -1.84828,-28.613 1.80504,-42.40764 6.36687,-26.29064 20.62828,-51.08798 42.81996,-67.02986 -8.61709,37.23706 -5.71658,76.56161 -6.09375,113.96875 12.25344,-6.9099 27.27879,-3.44613 40.03125,-0.25 3.39222,3.5348 2.28935,-0.72948 2.1875,-3.8125 -0.48309,-21.37058 4.13133,-43.06963 13.6875,-62.15625 5.96266,-10.68727 14.24338,-19.80379 22.4375,-28.875 -7.87156,33.8381 -9.2029,69.33593 -2.71875,103.5 1.72485,-1.41118 4.60681,-0.45414 5.65625,-0.375 9.68369,-21.23682 16.35112,-45.38062 34.89016,-60.74185 1.87329,-0.37122 -1.44818,8.52495 -1.48391,11.8981 -3.53488,21.84581 -3.2972,44.17323 -4.90625,66.25 -1.31238,1.37679 2.84835,2.32354 3.46875,4.0625 7.92311,10.5658 3.12294,24.83149 2.0916,36.78011 -7.06405,45.03355 -21.76553,88.37934 -35.57677,131.69714 -12.07476,32.9493 -30.7197,63.08 -51.23358,91.429 -10.95257,13.5514 -23.24472,27.8513 -40.84375,32.5 -20.15601,6.2413 -43.57595,5.1744 -61.96875,-5.6562 -17.28966,-12.3414 -21.02393,-35.7089 -19.26226,-55.6864 0.0488,-15.8262 2.37211,-27.8008 7.91747,-42.8053 5.54535,-15.0045 2.47105,-31.3317 -1.78021,-47.6333 -4.25126,-16.3016 -12.17903,-26.26002 -21.82158,-42.20417 -9.64255,-15.94415 -17.6369,-36.03734 -20.77217,-55.57713 -1.74948,-18.62714 2.89171,-37.12262 5.78125,-55.25 3.29623,-2.83696 -1.59799,-5.19659 -2.3125,-8.1875 -7.60113,-17.01508 -8.40747,-36.7749 -2.74234,-54.55998 7.1302,-25.0723 15.76087,-49.63241 24.67984,-74.12752 0.70833,1.30208 1.41667,2.60417 2.125,3.90625 z"</div><div class='add'>+           id="path4149-7"</div><div class='add'>+           sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccczzzcccccc"</div><div class='add'>+           clip-path="url(#clipPath4177-4)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4130-8);enable-background:accumulate"</div><div class='add'>+           d="m 735.05635,733.03834 2.75542,21.08881 44.41103,-15.38821 4.85063,-22.38975 -3.93617,-22.05222 -22.45163,-36.59301 -8.28004,30.30494 -17.34924,45.02944 z"</div><div class='add'>+           id="path3902-8"</div><div class='add'>+           sodipodi:nodetypes="cccccccc"</div><div class='add'>+           clip-path="url(#clipPath3631-6)"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4141-2);enable-background:accumulate"</div><div class='add'>+           d="m 831.81321,730.29452 15.82237,14.90486 20.85473,2.89994 -1.59029,-39.92598 8.32561,-30.50842 -7.16499,-6.34106 -21.69669,20.9424 -14.55074,38.02826 z"</div><div class='add'>+           id="path4135-9"</div><div class='add'>+           sodipodi:nodetypes="cccccccc"</div><div class='add'>+           clip-path="url(#clipPath3631-6)"</div><div class='add'>+           transform="translate(276,136)" /&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           id="g8367-1"</div><div class='add'>+           style="filter:url(#filter8379-0)"</div><div class='add'>+           clip-path="url(#clipPath8392-1)"</div><div class='add'>+           transform="translate(276,136)"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             clip-path="none"</div><div class='add'>+             sodipodi:nodetypes="ccccccc"</div><div class='add'>+             id="path4145-5"</div><div class='add'>+             d="m 910.14441,746.31415 32.61295,5.17393 -0.36119,-23.87619 7.18853,-29.68221 -8.45112,-5.26365 -21.82194,26.51077 -9.16723,27.13735 z"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;rect</div><div class='add'>+             y="650.19098"</div><div class='add'>+             x="877.51953"</div><div class='add'>+             height="172.53406"</div><div class='add'>+             width="123.03658"</div><div class='add'>+             id="rect8365-4"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+        &lt;g</div><div class='add'>+           id="g8400-9"</div><div class='add'>+           style="filter:url(#filter8404-9)"</div><div class='add'>+           clip-path="url(#clipPath8417-4)"</div><div class='add'>+           transform="translate(276,136)"&gt;</div><div class='add'>+          &lt;path</div><div class='add'>+             inkscape:connector-curvature="0"</div><div class='add'>+             clip-path="none"</div><div class='add'>+             sodipodi:nodetypes="ccccc"</div><div class='add'>+             id="path4147-2"</div><div class='add'>+             d="m 964.00012,754.69487 18.42881,7.46479 9.07107,-36.96447 -14.87031,4.83886 -12.62957,24.66082 z"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+          &lt;rect</div><div class='add'>+             y="677.06104"</div><div class='add'>+             x="924.89569"</div><div class='add'>+             height="125.1579"</div><div class='add'>+             width="142.12846"</div><div class='add'>+             id="rect8398-5"</div><div class='add'>+             style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /&gt;</div><div class='add'>+        &lt;/g&gt;</div><div class='add'>+      &lt;/g&gt;</div><div class='add'>+    &lt;/g&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="fill:#f8d615;fill-opacity:1;fill-rule:evenodd;stroke:#f8d615;stroke-width:17.84425545;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Send)"</div><div class='add'>+       d="M 544.23337,203.09259 3443.746,100.92806"</div><div class='add'>+       id="path7167"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;path</div><div class='add'>+       style="display:inline;fill:#f8d615;fill-opacity:1;fill-rule:evenodd;stroke:#f8d615;stroke-width:18;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Send-4);enable-background:new"</div><div class='add'>+       d="M 527.91203,584.39421 3442.4188,1000.8355"</div><div class='add'>+       id="path7167-9"</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       sodipodi:nodetypes="cc" /&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f83615;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"</div><div class='add'>+       x="80.219048"</div><div class='add'>+       y="107.38741"</div><div class='add'>+       id="text8200"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan8202"</div><div class='add'>+         x="80.219048"</div><div class='add'>+         y="107.38741"</div><div class='add'>+         style="font-size:50px;fill:#f83615;fill-opacity:1"&gt;CROP_DEFAULT&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:45.31394196px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#f80000;fill-opacity:0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+       x="3861.3669"</div><div class='add'>+       y="1281.7198"</div><div class='add'>+       id="text8200-4"</div><div class='add'>+       sodipodi:linespacing="125%"</div><div class='add'>+       transform="scale(0.96105877,1.0405191)"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan8202-5"</div><div class='add'>+         x="3861.3669"</div><div class='add'>+         y="1281.7198"</div><div class='add'>+         style="font-size:56.64243317px;fill:#f80000;fill-opacity:0"&gt;COMPOSE_PADDED&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:45.31394196px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#f8d615;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+       x="3615.1545"</div><div class='add'>+       y="49.156631"</div><div class='add'>+       id="text8200-4-9"</div><div class='add'>+       sodipodi:linespacing="125%"</div><div class='add'>+       transform="scale(0.96105877,1.0405191)"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan8202-5-3"</div><div class='add'>+         x="3615.1545"</div><div class='add'>+         y="49.156631"</div><div class='add'>+         style="font-size:50px;fill:#f8d615;fill-opacity:1"&gt;COMPOSE_ACTIVE&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:45.31394196px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#f83615;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+       x="2429.1526"</div><div class='add'>+       y="-3.1657715"</div><div class='add'>+       id="text8200-4-5"</div><div class='add'>+       sodipodi:linespacing="125%"</div><div class='add'>+       transform="scale(0.96105878,1.0405191)"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan8202-5-7"</div><div class='add'>+         x="2429.1526"</div><div class='add'>+         y="-3.1657715"</div><div class='add'>+         style="font-size:49.99999958px;fill:#f83615;fill-opacity:1"&gt;COMPOSE_DEFAULT&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:45.31394196px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#f815bb;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+       x="3681.5449"</div><div class='add'>+       y="1289.9539"</div><div class='add'>+       id="text8200-4-9-3"</div><div class='add'>+       sodipodi:linespacing="125%"</div><div class='add'>+       transform="scale(0.96105877,1.0405191)"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan8202-5-3-6"</div><div class='add'>+         x="3681.5449"</div><div class='add'>+         y="1289.9539"</div><div class='add'>+         style="font-size:50px;fill:#f815bb;fill-opacity:1"&gt;COMPOSE_PADDED&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:50px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new;"</div><div class='add'>+       x="2438.0618"</div><div class='add'>+       y="1368.4291"</div><div class='add'>+       id="text8200-4-9-3-5"</div><div class='add'>+       sodipodi:linespacing="125%"</div><div class='add'>+       transform="scale(0.96105877,1.0405191)"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan8202-5-3-6-3"</div><div class='add'>+         x="2438.0618"</div><div class='add'>+         y="1368.4291"</div><div class='add'>+         style="font-size:50px;fill:#000000;fill-opacity:1;"&gt;COMPOSE_BONDS&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+       x="8.0815096"</div><div class='add'>+       y="1438.8961"</div><div class='add'>+       id="text8200-4-9-3-5-6"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan8202-5-3-6-3-2"</div><div class='add'>+         x="8.0815096"</div><div class='add'>+         y="1438.8961"</div><div class='add'>+         style="font-size:50px;fill:#000000;fill-opacity:1"&gt;CROP_BONDS&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+       x="1455.4426"</div><div class='add'>+       y="-26.808125"</div><div class='add'>+       id="text8200-4-9-3-5-6-9"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan8202-5-3-6-3-2-1"</div><div class='add'>+         x="1455.4426"</div><div class='add'>+         y="-26.808125"</div><div class='add'>+         style="font-size:50px;fill:#000000;fill-opacity:1"&gt;overscan area&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#f8d615;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+       x="179.63055"</div><div class='add'>+       y="385.38785"</div><div class='add'>+       id="text8200-4-9-2"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan8202-5-3-7"</div><div class='add'>+         x="179.63055"</div><div class='add'>+         y="385.38785"</div><div class='add'>+         style="font-size:50px;fill:#f8d615;fill-opacity:1"&gt;CROP_ACTIVE&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+       x="636.67419"</div><div class='add'>+       y="-138.84549"</div><div class='add'>+       id="text8200-4-9-3-5-6-0"</div><div class='add'>+       sodipodi:linespacing="125%"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan8202-5-3-6-3-2-9"</div><div class='add'>+         x="636.67419"</div><div class='add'>+         y="-138.84549"</div><div class='add'>+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:70px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#000000;fill-opacity:1"&gt;DATA SOURCE&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;text</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       style="font-style:normal;font-weight:normal;font-size:45.31394196px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"</div><div class='add'>+       x="3178.7151"</div><div class='add'>+       y="-129.06131"</div><div class='add'>+       id="text8200-4-9-3-5-6-0-3"</div><div class='add'>+       sodipodi:linespacing="125%"</div><div class='add'>+       transform="scale(0.96105877,1.0405191)"&gt;&lt;tspan</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan8202-5-3-6-3-2-9-6"</div><div class='add'>+         x="3178.7151"</div><div class='add'>+         y="-129.06131"</div><div class='add'>+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:69.99999978px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#000000;fill-opacity:1"&gt;DATA SINK&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+    &lt;flowRoot</div><div class='add'>+       xml:space="preserve"</div><div class='add'>+       id="flowRoot7469"</div><div class='add'>+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:57.5px;line-height:125%;letter-spacing:0px;word-spacing:0px;"&gt;&lt;flowRegion</div><div class='add'>+         id="flowRegion7471"&gt;&lt;rect</div><div class='add'>+           id="rect7473"</div><div class='add'>+           width="4297.5474"</div><div class='add'>+           height="1851.537"</div><div class='add'>+           x="-52.635666"</div><div class='add'>+           y="70.623535"</div><div class='add'>+           style="font-size:57.5px;" /&gt;&lt;/flowRegion&gt;&lt;flowPara</div><div class='add'>+         id="flowPara7475"&gt;&lt;/flowPara&gt;&lt;/flowRoot&gt;  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst<br/>index e144370f62a0..d6152c907b8b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/subdev-formats.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/subdev-formats.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/subdev-formats.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/subdev-formats.rst</a></div><div class='hunk'>@@ -1514,23 +1514,28 @@ be named ``MEDIA_BUS_FMT_SRGGB10_2X8_PADHI_LE``.</div><div class='ctx'> </div><div class='ctx'> .. _bayer-patterns:</div><div class='ctx'> </div><div class='del'>-.. figure::  subdev-formats_files/bayer.*</div><div class='del'>-    :alt:    bayer.png</div><div class='add'>+.. figure::  bayer.*</div><div class='add'>+    :alt:    bayer.pdf / bayer.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     **Figure 4.8 Bayer Patterns**</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> The following table lists existing packed Bayer formats. The data</div><div class='ctx'> organization is given as an example for the first pixel only.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+.. HACK: ideally, we would be using adjustbox here. However, Sphinx</div><div class='add'>+.. is a very bad behaviored guy: if the table has more than 30 cols,</div><div class='add'>+.. it switches to long table, and there's no way to override it.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> .. raw:: latex</div><div class='ctx'> </div><div class='del'>-    \newline\newline\begin{adjustbox}{width=\columnwidth}</div><div class='add'>+    \begingroup</div><div class='add'>+    \tiny</div><div class='add'>+    \setlength{\tabcolsep}{2pt}</div><div class='ctx'> </div><div class='del'>-.. tabularcolumns:: |p{7.6cm}|p{1.6cm}|p{0.7cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|</div><div class='add'>+.. tabularcolumns:: |p{4.0cm}|p{0.7cm}|p{0.3cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|</div><div class='ctx'> </div><div class='ctx'> .. _v4l2-mbus-pixelcode-bayer:</div><div class='ctx'> </div><div class='hunk'>@@ -2314,7 +2319,7 @@ organization is given as an example for the first pixel only.</div><div class='ctx'> </div><div class='ctx'> .. raw:: latex</div><div class='ctx'> </div><div class='del'>-    \end{adjustbox}\newline\newline</div><div class='add'>+    \endgroup</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Packed YUV Formats</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/subdev-formats_files/bayer.png b/Documentation/media/uapi/v4l/subdev-formats_files/bayer.png<br/>deleted file mode 100644<br/>index 9b15fb22e817..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/subdev-formats_files/bayer.png?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/subdev-formats_files/bayer.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg b/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg<br/>new file mode 100644<br/>index 000000000000..1903dd3846c2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/subdev-image-processing-crop.svg</a></div><div class='hunk'>@@ -0,0 +1,302 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="42.799767cm"</div><div class='add'>+   height="9.9348345cm"</div><div class='add'>+   viewBox="-194 128 840.06984 194.72276"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   sodipodi:docname="subdev-image-processing-crop.svg"&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata100"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs98" /&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview96"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0"</div><div class='add'>+     inkscape:zoom="0.3649199"</div><div class='add'>+     inkscape:cx="764.40286"</div><div class='add'>+     inkscape:cy="176.91347"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="svg2" /&gt;</div><div class='add'>+  &lt;rect</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+     x="-9.6002426"</div><div class='add'>+     y="128.86047"</div><div class='add'>+     width="469.77399"</div><div class='add'>+     height="193"</div><div class='add'>+     id="rect4" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g6"</div><div class='add'>+     transform="translate(-1.6002426,-1.1395339)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="4.5"</div><div class='add'>+       y="189"</div><div class='add'>+       width="159"</div><div class='add'>+       height="104"</div><div class='add'>+       id="rect8" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a52a2a;stroke-width:2"</div><div class='add'>+       x="4.5"</div><div class='add'>+       y="189"</div><div class='add'>+       width="159"</div><div class='add'>+       height="104"</div><div class='add'>+       id="rect10" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g12"</div><div class='add'>+     transform="translate(-1.6002426,-1.1395339)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="63.5"</div><div class='add'>+       y="211"</div><div class='add'>+       width="94"</div><div class='add'>+       height="77"</div><div class='add'>+       id="rect14" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#0000ff;stroke-width:2"</div><div class='add'>+       x="63.5"</div><div class='add'>+       y="211"</div><div class='add'>+       width="94"</div><div class='add'>+       height="77"</div><div class='add'>+       id="rect16" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#0000ff"</div><div class='add'>+     x="72.899757"</div><div class='add'>+     y="226.61047"</div><div class='add'>+     id="text18"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="72.899757"</div><div class='add'>+       y="226.61047"</div><div class='add'>+       id="tspan20"&gt;sink&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="72.899757"</div><div class='add'>+       y="242.61047"</div><div class='add'>+       id="tspan22"&gt;crop&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="72.899757"</div><div class='add'>+       y="258.61047"</div><div class='add'>+       id="tspan24"&gt;selection&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="27.899757"</div><div class='add'>+     y="156.86047"</div><div class='add'>+     id="text26"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="27.899757"</div><div class='add'>+       y="156.86047"</div><div class='add'>+       id="tspan28" /&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#a52a2a"</div><div class='add'>+     x="6.938117"</div><div class='add'>+     y="156.77448"</div><div class='add'>+     id="text30"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="6.938117"</div><div class='add'>+       y="156.77448"</div><div class='add'>+       id="tspan32"&gt;sink media&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="6.938117"</div><div class='add'>+       y="172.77448"</div><div class='add'>+       id="tspan34"&gt;bus format&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#8b6914"</div><div class='add'>+     x="348.17374"</div><div class='add'>+     y="153.86047"</div><div class='add'>+     id="text36"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="348.17374"</div><div class='add'>+       y="153.86047"</div><div class='add'>+       id="tspan38"&gt;source media&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="348.17374"</div><div class='add'>+       y="169.86047"</div><div class='add'>+       id="tspan40"&gt;bus format&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g42"</div><div class='add'>+     transform="translate(-1.6002426,-1.1395339)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="350.48801"</div><div class='add'>+       y="190.834"</div><div class='add'>+       width="93.286301"</div><div class='add'>+       height="75.166"</div><div class='add'>+       id="rect44" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#8b6914;stroke-width:2"</div><div class='add'>+       x="350.48801"</div><div class='add'>+       y="190.834"</div><div class='add'>+       width="93.286301"</div><div class='add'>+       height="75.166"</div><div class='add'>+       id="rect46" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="348.88776"</div><div class='add'>+     y1="264.86047"</div><div class='add'>+     x2="61.899757"</div><div class='add'>+     y2="286.86047"</div><div class='add'>+     id="line48" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="348.88776"</div><div class='add'>+     y1="189.69447"</div><div class='add'>+     x2="61.899757"</div><div class='add'>+     y2="209.86047"</div><div class='add'>+     id="line50" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="442.17374"</div><div class='add'>+     y1="264.86047"</div><div class='add'>+     x2="155.89977"</div><div class='add'>+     y2="286.86047"</div><div class='add'>+     id="line52" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="442.17374"</div><div class='add'>+     y1="189.69447"</div><div class='add'>+     x2="155.89977"</div><div class='add'>+     y2="209.86047"</div><div class='add'>+     id="line54" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g56"</div><div class='add'>+     transform="translate(-1.6002426,-1.1395339)"&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       cx="473.10001"</div><div class='add'>+       cy="219.98399"</div><div class='add'>+       id="ellipse58"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="473.10001"</div><div class='add'>+       cy="219.98399"</div><div class='add'>+       id="ellipse60"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="473.10001"</div><div class='add'>+       cy="219.98399"</div><div class='add'>+       id="ellipse62"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g64"</div><div class='add'>+     transform="translate(-1.6002426,-1.1395339)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       x1="481.60001"</div><div class='add'>+       y1="219.98399"</div><div class='add'>+       x2="637.93402"</div><div class='add'>+       y2="220.01199"</div><div class='add'>+       id="line66" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#000000"</div><div class='add'>+       points="635.435,215.012 645.434,220.014 635.433,225.012 637.934,220.012 "</div><div class='add'>+       id="polygon68" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       points="635.435,215.012 645.434,220.014 635.433,225.012 637.934,220.012 "</div><div class='add'>+       id="polygon70" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="505.30774"</div><div class='add'>+     y="208.66048"</div><div class='add'>+     id="text72"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="505.30774"</div><div class='add'>+       y="208.66048"</div><div class='add'>+       id="tspan74"&gt;pad 1 (source)&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g76"</div><div class='add'>+     transform="translate(-1.6002426,-1.1395339)"&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       cx="-20.398199"</div><div class='add'>+       cy="241.51199"</div><div class='add'>+       id="ellipse78"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="-20.398199"</div><div class='add'>+       cy="241.51199"</div><div class='add'>+       id="ellipse80"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="-20.398199"</div><div class='add'>+       cy="241.51199"</div><div class='add'>+       id="ellipse82"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g84"</div><div class='add'>+     transform="translate(-1.6002426,-1.1395339)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       x1="-192.39799"</div><div class='add'>+       y1="241.8"</div><div class='add'>+       x2="-38.6343"</div><div class='add'>+       y2="241.52901"</div><div class='add'>+       id="line86" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#000000"</div><div class='add'>+       points="-41.1431,236.534 -31.1343,241.516 -41.1254,246.534 -38.6343,241.529 "</div><div class='add'>+       id="polygon88" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       points="-41.1431,236.534 -31.1343,241.516 -41.1254,246.534 -38.6343,241.529 "</div><div class='add'>+       id="polygon90" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="-149.45824"</div><div class='add'>+     y="228.66048"</div><div class='add'>+     id="text92"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="-149.45824"</div><div class='add'>+       y="228.66048"</div><div class='add'>+       id="tspan94"&gt;pad 0 (sink)&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-full.svg b/Documentation/media/uapi/v4l/subdev-image-processing-full.svg<br/>new file mode 100644<br/>index 000000000000..91cf51832c12<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/subdev-image-processing-full.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/subdev-image-processing-full.svg</a></div><div class='hunk'>@@ -0,0 +1,742 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="58.825298cm"</div><div class='add'>+   height="17.279287cm"</div><div class='add'>+   viewBox="-186 71 1174.5119 332.1463"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   sodipodi:docname="subdev-image-processing-full.svg"&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata260"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs258" /&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview256"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0"</div><div class='add'>+     inkscape:zoom="0.26595857"</div><div class='add'>+     inkscape:cx="1050.1367"</div><div class='add'>+     inkscape:cy="307.01645"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="svg2" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g4"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="318.89999"</div><div class='add'>+       y="129"</div><div class='add'>+       width="208.10001"</div><div class='add'>+       height="249"</div><div class='add'>+       id="rect6" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#ff765a;stroke-width:2"</div><div class='add'>+       x="318.89999"</div><div class='add'>+       y="129"</div><div class='add'>+       width="208.10001"</div><div class='add'>+       height="249"</div><div class='add'>+       id="rect8" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;rect</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+     x="-3.4982376"</div><div class='add'>+     y="65.305092"</div><div class='add'>+     width="806"</div><div class='add'>+     height="343"</div><div class='add'>+     id="rect10" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g12"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       cx="-12.5"</div><div class='add'>+       cy="166.71201"</div><div class='add'>+       id="ellipse14"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="-12.5"</div><div class='add'>+       cy="166.71201"</div><div class='add'>+       id="ellipse16"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="-12.5"</div><div class='add'>+       cy="166.71201"</div><div class='add'>+       id="ellipse18"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g20"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       cx="815.23199"</div><div class='add'>+       cy="205.18401"</div><div class='add'>+       id="ellipse22"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="815.23199"</div><div class='add'>+       cy="205.18401"</div><div class='add'>+       id="ellipse24"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="815.23199"</div><div class='add'>+       cy="205.18401"</div><div class='add'>+       id="ellipse26"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g28"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       x1="-184.5"</div><div class='add'>+       y1="167"</div><div class='add'>+       x2="-30.736099"</div><div class='add'>+       y2="166.729"</div><div class='add'>+       id="line30" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#000000"</div><div class='add'>+       points="-33.2449,161.734 -23.2361,166.716 -33.2272,171.734 -30.7361,166.729 "</div><div class='add'>+       id="polygon32" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       points="-33.2449,161.734 -23.2361,166.716 -33.2272,171.734 -30.7361,166.729 "</div><div class='add'>+       id="polygon34" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g36"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       x1="823.73199"</div><div class='add'>+       y1="205.18401"</div><div class='add'>+       x2="980.06598"</div><div class='add'>+       y2="205.21201"</div><div class='add'>+       id="line38" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#000000"</div><div class='add'>+       points="977.567,200.212 987.566,205.214 977.565,210.212 980.066,205.212 "</div><div class='add'>+       id="polygon40" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       points="977.567,200.212 987.566,205.214 977.565,210.212 980.066,205.212 "</div><div class='add'>+       id="polygon42" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="-141.45824"</div><div class='add'>+     y="147.3051"</div><div class='add'>+     id="text44"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="-141.45824"</div><div class='add'>+       y="147.3051"</div><div class='add'>+       id="tspan46"&gt;pad 0 (sink)&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="847.54175"</div><div class='add'>+     y="187.3051"</div><div class='add'>+     id="text48"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="847.54175"</div><div class='add'>+       y="187.3051"</div><div class='add'>+       id="tspan50"&gt;pad 2 (source)&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g52"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="5.5"</div><div class='add'>+       y="120"</div><div class='add'>+       width="159"</div><div class='add'>+       height="104"</div><div class='add'>+       id="rect54" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a52a2a;stroke-width:2"</div><div class='add'>+       x="5.5"</div><div class='add'>+       y="120"</div><div class='add'>+       width="159"</div><div class='add'>+       height="104"</div><div class='add'>+       id="rect56" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g58"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="62.5"</div><div class='add'>+       y="136"</div><div class='add'>+       width="94"</div><div class='add'>+       height="77"</div><div class='add'>+       id="rect60" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#0000ff;stroke-width:2"</div><div class='add'>+       x="62.5"</div><div class='add'>+       y="136"</div><div class='add'>+       width="94"</div><div class='add'>+       height="77"</div><div class='add'>+       id="rect62" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="29.001762"</div><div class='add'>+     y="81.305092"</div><div class='add'>+     id="text64"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="29.001762"</div><div class='add'>+       y="81.305092"</div><div class='add'>+       id="tspan66" /&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#a52a2a"</div><div class='add'>+     x="8.040122"</div><div class='add'>+     y="81.218895"</div><div class='add'>+     id="text68"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="8.040122"</div><div class='add'>+       y="81.218895"</div><div class='add'>+       id="tspan70"&gt;sink media&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="8.040122"</div><div class='add'>+       y="97.219093"</div><div class='add'>+       id="tspan72"&gt;bus format&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g74"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="333.64401"</div><div class='add'>+       y="185.64999"</div><div class='add'>+       width="165.2"</div><div class='add'>+       height="172.478"</div><div class='add'>+       id="rect76" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#00ff00;stroke-width:2"</div><div class='add'>+       x="333.64401"</div><div class='add'>+       y="185.64999"</div><div class='add'>+       width="165.2"</div><div class='add'>+       height="172.478"</div><div class='add'>+       id="rect78" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="332.14578"</div><div class='add'>+     y1="350.43307"</div><div class='add'>+     x2="61.001762"</div><div class='add'>+     y2="205.3051"</div><div class='add'>+     id="line80" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="332.14578"</div><div class='add'>+     y1="177.95509"</div><div class='add'>+     x2="61.001762"</div><div class='add'>+     y2="128.3051"</div><div class='add'>+     id="line82" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="497.34576"</div><div class='add'>+     y1="350.43307"</div><div class='add'>+     x2="155.00177"</div><div class='add'>+     y2="205.3051"</div><div class='add'>+     id="line84" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="497.34576"</div><div class='add'>+     y1="177.95509"</div><div class='add'>+     x2="155.00177"</div><div class='add'>+     y2="128.3051"</div><div class='add'>+     id="line86" /&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#00ff00"</div><div class='add'>+     x="333.20578"</div><div class='add'>+     y="141.7471"</div><div class='add'>+     id="text88"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="333.20578"</div><div class='add'>+       y="141.7471"</div><div class='add'>+       id="tspan90"&gt;sink compose&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="333.20578"</div><div class='add'>+       y="157.7471"</div><div class='add'>+       id="tspan92"&gt;selection (scaling)&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g94"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="409.32199"</div><div class='add'>+       y="194.565"</div><div class='add'>+       width="100.186"</div><div class='add'>+       height="71.452301"</div><div class='add'>+       id="rect96" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+       x="409.32199"</div><div class='add'>+       y="194.565"</div><div class='add'>+       width="100.186"</div><div class='add'>+       height="71.452301"</div><div class='add'>+       id="rect98" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#8b6914"</div><div class='add'>+     x="688.00177"</div><div class='add'>+     y="97.43309"</div><div class='add'>+     id="text100"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="688.00177"</div><div class='add'>+       y="97.43309"</div><div class='add'>+       id="tspan102"&gt;source media&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="688.00177"</div><div class='add'>+       y="113.43309"</div><div class='add'>+       id="tspan104"&gt;bus format&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g106"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="688.48798"</div><div class='add'>+       y="173.834"</div><div class='add'>+       width="100.186"</div><div class='add'>+       height="71.452301"</div><div class='add'>+       id="rect108" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#8b6914;stroke-width:2"</div><div class='add'>+       x="688.48798"</div><div class='add'>+       y="173.834"</div><div class='add'>+       width="100.186"</div><div class='add'>+       height="71.452301"</div><div class='add'>+       id="rect110" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="686.98975"</div><div class='add'>+     y1="237.59109"</div><div class='add'>+     x2="407.82376"</div><div class='add'>+     y2="258.32309"</div><div class='add'>+     id="line112" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="686.98975"</div><div class='add'>+     y1="166.1391"</div><div class='add'>+     x2="407.82376"</div><div class='add'>+     y2="186.8701"</div><div class='add'>+     id="line114" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="787.17578"</div><div class='add'>+     y1="237.59109"</div><div class='add'>+     x2="508.00977"</div><div class='add'>+     y2="258.32309"</div><div class='add'>+     id="line116" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="787.17578"</div><div class='add'>+     y1="166.1391"</div><div class='add'>+     x2="508.00977"</div><div class='add'>+     y2="186.8701"</div><div class='add'>+     id="line118" /&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#ff765a"</div><div class='add'>+     x="323.50177"</div><div class='add'>+     y="95.305092"</div><div class='add'>+     id="text120"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="323.50177"</div><div class='add'>+       y="95.305092"</div><div class='add'>+       id="tspan122"&gt;sink compose&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="323.50177"</div><div class='add'>+       y="111.30509"</div><div class='add'>+       id="tspan124"&gt;bounds selection&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g126"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       cx="-12.0982"</div><div class='add'>+       cy="341.51199"</div><div class='add'>+       id="ellipse128"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="-12.0982"</div><div class='add'>+       cy="341.51199"</div><div class='add'>+       id="ellipse130"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="-12.0982"</div><div class='add'>+       cy="341.51199"</div><div class='add'>+       id="ellipse132"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g134"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       x1="-184.09801"</div><div class='add'>+       y1="341.79999"</div><div class='add'>+       x2="-30.334299"</div><div class='add'>+       y2="341.52899"</div><div class='add'>+       id="line136" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#000000"</div><div class='add'>+       points="-32.8431,336.534 -22.8343,341.516 -32.8254,346.534 -30.3343,341.529 "</div><div class='add'>+       id="polygon138" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       points="-32.8431,336.534 -22.8343,341.516 -32.8254,346.534 -30.3343,341.529 "</div><div class='add'>+       id="polygon140" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="-140.49823"</div><div class='add'>+     y="321.30508"</div><div class='add'>+     id="text142"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="-140.49823"</div><div class='add'>+       y="321.30508"</div><div class='add'>+       id="tspan144"&gt;pad 1 (sink)&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g146"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="7.8082399"</div><div class='add'>+       y="292.79999"</div><div class='add'>+       width="112.092"</div><div class='add'>+       height="82.199997"</div><div class='add'>+       id="rect148" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a52a2a;stroke-width:2"</div><div class='add'>+       x="7.8082399"</div><div class='add'>+       y="292.79999"</div><div class='add'>+       width="112.092"</div><div class='add'>+       height="82.199997"</div><div class='add'>+       id="rect150" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g152"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="52.900002"</div><div class='add'>+       y="314.79999"</div><div class='add'>+       width="58.099998"</div><div class='add'>+       height="50.200001"</div><div class='add'>+       id="rect154" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#0000ff;stroke-width:2"</div><div class='add'>+       x="52.900002"</div><div class='add'>+       y="314.79999"</div><div class='add'>+       width="58.099998"</div><div class='add'>+       height="50.200001"</div><div class='add'>+       id="rect156" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="30.401762"</div><div class='add'>+     y="252.10509"</div><div class='add'>+     id="text158"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="30.401762"</div><div class='add'>+       y="252.10509"</div><div class='add'>+       id="tspan160" /&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="357.40176"</div><div class='add'>+     y1="244.20509"</div><div class='add'>+     x2="51.401764"</div><div class='add'>+     y2="307.10507"</div><div class='add'>+     id="line162" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="357.40176"</div><div class='add'>+     y1="308.30508"</div><div class='add'>+     x2="51.401764"</div><div class='add'>+     y2="357.30508"</div><div class='add'>+     id="line164" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="432.50177"</div><div class='add'>+     y1="308.30508"</div><div class='add'>+     x2="109.50176"</div><div class='add'>+     y2="357.30508"</div><div class='add'>+     id="line166" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="432.50177"</div><div class='add'>+     y1="244.20509"</div><div class='add'>+     x2="109.50176"</div><div class='add'>+     y2="307.10507"</div><div class='add'>+     id="line168" /&gt;</div><div class='add'>+  &lt;rect</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#00ff00;stroke-width:2"</div><div class='add'>+     x="357.40176"</div><div class='add'>+     y="244.20509"</div><div class='add'>+     width="75.099998"</div><div class='add'>+     height="64.099998"</div><div class='add'>+     id="rect170" /&gt;</div><div class='add'>+  &lt;rect</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+     x="441.76376"</div><div class='add'>+     y="276.77109"</div><div class='add'>+     width="64.737999"</div><div class='add'>+     height="48.534"</div><div class='add'>+     id="rect172" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g174"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="693.42798"</div><div class='add'>+       y="324.73401"</div><div class='add'>+       width="63.571999"</div><div class='add'>+       height="49.265999"</div><div class='add'>+       id="rect176" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#8b6914;stroke-width:2"</div><div class='add'>+       x="693.42798"</div><div class='add'>+       y="324.73401"</div><div class='add'>+       width="63.571999"</div><div class='add'>+       height="49.265999"</div><div class='add'>+       id="rect178" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="691.92975"</div><div class='add'>+     y1="366.30508"</div><div class='add'>+     x2="441.76376"</div><div class='add'>+     y2="325.30508"</div><div class='add'>+     id="line180" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="691.92975"</div><div class='add'>+     y1="317.03909"</div><div class='add'>+     x2="441.76376"</div><div class='add'>+     y2="276.77109"</div><div class='add'>+     id="line182" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="755.50177"</div><div class='add'>+     y1="366.30508"</div><div class='add'>+     x2="506.50177"</div><div class='add'>+     y2="325.30508"</div><div class='add'>+     id="line184" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="755.50177"</div><div class='add'>+     y1="317.03909"</div><div class='add'>+     x2="506.50177"</div><div class='add'>+     y2="276.77109"</div><div class='add'>+     id="line186" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g188"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       cx="815.44"</div><div class='add'>+       cy="343.98401"</div><div class='add'>+       id="ellipse190"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="815.44"</div><div class='add'>+       cy="343.98401"</div><div class='add'>+       id="ellipse192"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="815.44"</div><div class='add'>+       cy="343.98401"</div><div class='add'>+       id="ellipse194"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g196"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       x1="823.94"</div><div class='add'>+       y1="343.98401"</div><div class='add'>+       x2="980.27399"</div><div class='add'>+       y2="344.01199"</div><div class='add'>+       id="line198" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#000000"</div><div class='add'>+       points="977.775,339.012 987.774,344.014 977.773,349.012 980.274,344.012 "</div><div class='add'>+       id="polygon200" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       points="977.775,339.012 987.774,344.014 977.773,349.012 980.274,344.012 "</div><div class='add'>+       id="polygon202" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="847.74976"</div><div class='add'>+     y="326.10507"</div><div class='add'>+     id="text204"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="847.74976"</div><div class='add'>+       y="326.10507"</div><div class='add'>+       id="tspan206"&gt;pad 3 (source)&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#0000ff"</div><div class='add'>+     x="195.50177"</div><div class='add'>+     y="83.305092"</div><div class='add'>+     id="text208"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="195.50177"</div><div class='add'>+       y="83.305092"</div><div class='add'>+       id="tspan210"&gt;sink&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="195.50177"</div><div class='add'>+       y="99.305092"</div><div class='add'>+       id="tspan212"&gt;crop&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="195.50177"</div><div class='add'>+       y="115.30509"</div><div class='add'>+       id="tspan214"&gt;selection&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#a020f0"</div><div class='add'>+     x="551.50177"</div><div class='add'>+     y="87.305092"</div><div class='add'>+     id="text216"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="551.50177"</div><div class='add'>+       y="87.305092"</div><div class='add'>+       id="tspan218"&gt;source&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="551.50177"</div><div class='add'>+       y="103.30509"</div><div class='add'>+       id="tspan220"&gt;crop&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="551.50177"</div><div class='add'>+       y="119.30509"</div><div class='add'>+       id="tspan222"&gt;selection&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g224"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#0000ff;stroke-width:2"</div><div class='add'>+       x1="211"</div><div class='add'>+       y1="132"</div><div class='add'>+       x2="166.21001"</div><div class='add'>+       y2="135.287"</div><div class='add'>+       id="line226" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#0000ff"</div><div class='add'>+       points="169.069,140.091 158.73,135.836 168.337,130.118 166.21,135.287 "</div><div class='add'>+       id="polygon228" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#0000ff;stroke-width:2"</div><div class='add'>+       points="169.069,140.091 158.73,135.836 168.337,130.118 166.21,135.287 "</div><div class='add'>+       id="polygon230" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g232"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#0000ff;stroke-width:2"</div><div class='add'>+       x1="209"</div><div class='add'>+       y1="131"</div><div class='add'>+       x2="115.581"</div><div class='add'>+       y2="306.20901"</div><div class='add'>+       id="line234" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#0000ff"</div><div class='add'>+       points="121.169,306.355 112.052,312.827 112.345,301.65 115.581,306.209 "</div><div class='add'>+       id="polygon236" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#0000ff;stroke-width:2"</div><div class='add'>+       points="121.169,306.355 112.052,312.827 112.345,301.65 115.581,306.209 "</div><div class='add'>+       id="polygon238" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g240"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+       x1="550.492"</div><div class='add'>+       y1="133.214"</div><div class='add'>+       x2="514.91602"</div><div class='add'>+       y2="186.46899"</div><div class='add'>+       id="line242" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#a020f0"</div><div class='add'>+       points="520.463,187.168 510.75,192.706 512.147,181.613 514.916,186.469 "</div><div class='add'>+       id="polygon244" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+       points="520.463,187.168 510.75,192.706 512.147,181.613 514.916,186.469 "</div><div class='add'>+       id="polygon246" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g248"</div><div class='add'>+     transform="translate(-1.4982376,-7.6949076)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+       x1="550.07202"</div><div class='add'>+       y1="133.787"</div><div class='add'>+       x2="510.61801"</div><div class='add'>+       y2="275.08899"</div><div class='add'>+       id="line250" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#a020f0"</div><div class='add'>+       points="516.106,274.025 508.601,282.312 506.475,271.336 510.618,275.089 "</div><div class='add'>+       id="polygon252" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+       points="516.106,274.025 508.601,282.312 506.475,271.336 510.618,275.089 "</div><div class='add'>+       id="polygon254" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg b/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg<br/>new file mode 100644<br/>index 000000000000..cedcbf598923<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg</a></div><div class='hunk'>@@ -0,0 +1,540 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   width="58.803326cm"</div><div class='add'>+   height="16.463955cm"</div><div class='add'>+   viewBox="-194 128 1175.0698 319.59442"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   sodipodi:docname="subdev-image-processing-scaling-multi-source.svg"&gt;</div><div class='add'>+  &lt;metadata</div><div class='add'>+     id="metadata186"&gt;</div><div class='add'>+    &lt;rdf:RDF&gt;</div><div class='add'>+      &lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;</div><div class='add'>+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;</div><div class='add'>+        &lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;</div><div class='add'>+        &lt;dc:title /&gt;</div><div class='add'>+      &lt;/cc:Work&gt;</div><div class='add'>+    &lt;/rdf:RDF&gt;</div><div class='add'>+  &lt;/metadata&gt;</div><div class='add'>+  &lt;defs</div><div class='add'>+     id="defs184" /&gt;</div><div class='add'>+  &lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview182"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0"</div><div class='add'>+     inkscape:zoom="0.26595857"</div><div class='add'>+     inkscape:cx="1049.9581"</div><div class='add'>+     inkscape:cy="292.5708"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="svg2" /&gt;</div><div class='add'>+  &lt;rect</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+     x="-9.6002426"</div><div class='add'>+     y="124.14409"</div><div class='add'>+     width="806"</div><div class='add'>+     height="327"</div><div class='add'>+     id="rect4" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g6"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="4.5"</div><div class='add'>+       y="189"</div><div class='add'>+       width="159"</div><div class='add'>+       height="104"</div><div class='add'>+       id="rect8" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a52a2a;stroke-width:2"</div><div class='add'>+       x="4.5"</div><div class='add'>+       y="189"</div><div class='add'>+       width="159"</div><div class='add'>+       height="104"</div><div class='add'>+       id="rect10" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g12"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="49.5"</div><div class='add'>+       y="204"</div><div class='add'>+       width="94"</div><div class='add'>+       height="77"</div><div class='add'>+       id="rect14" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#0000ff;stroke-width:2"</div><div class='add'>+       x="49.5"</div><div class='add'>+       y="204"</div><div class='add'>+       width="94"</div><div class='add'>+       height="77"</div><div class='add'>+       id="rect16" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#0000ff"</div><div class='add'>+     x="58.399757"</div><div class='add'>+     y="218.14409"</div><div class='add'>+     id="text18"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="58.399757"</div><div class='add'>+       y="218.14409"</div><div class='add'>+       id="tspan20"&gt;sink&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="58.399757"</div><div class='add'>+       y="234.14409"</div><div class='add'>+       id="tspan22"&gt;crop&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="58.399757"</div><div class='add'>+       y="250.14409"</div><div class='add'>+       id="tspan24"&gt;selection&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="27.899757"</div><div class='add'>+     y="152.14409"</div><div class='add'>+     id="text26"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="27.899757"</div><div class='add'>+       y="152.14409"</div><div class='add'>+       id="tspan28" /&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#a52a2a"</div><div class='add'>+     x="6.938117"</div><div class='add'>+     y="152.05809"</div><div class='add'>+     id="text30"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="6.938117"</div><div class='add'>+       y="152.05809"</div><div class='add'>+       id="tspan32"&gt;sink media&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="6.938117"</div><div class='add'>+       y="168.05809"</div><div class='add'>+       id="tspan34"&gt;bus format&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g36"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="333.64401"</div><div class='add'>+       y="185.64999"</div><div class='add'>+       width="165.2"</div><div class='add'>+       height="172.478"</div><div class='add'>+       id="rect38" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#00ff00;stroke-width:2"</div><div class='add'>+       x="333.64401"</div><div class='add'>+       y="185.64999"</div><div class='add'>+       width="165.2"</div><div class='add'>+       height="172.478"</div><div class='add'>+       id="rect40" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="332.04376"</div><div class='add'>+     y1="352.27206"</div><div class='add'>+     x2="47.899757"</div><div class='add'>+     y2="275.14407"</div><div class='add'>+     id="line42" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="332.04376"</div><div class='add'>+     y1="179.79408"</div><div class='add'>+     x2="47.899757"</div><div class='add'>+     y2="198.14409"</div><div class='add'>+     id="line44" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="497.24374"</div><div class='add'>+     y1="352.27206"</div><div class='add'>+     x2="141.89977"</div><div class='add'>+     y2="275.14407"</div><div class='add'>+     id="line46" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="497.24374"</div><div class='add'>+     y1="179.79408"</div><div class='add'>+     x2="141.89977"</div><div class='add'>+     y2="198.14409"</div><div class='add'>+     id="line48" /&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#00ff00"</div><div class='add'>+     x="333.10376"</div><div class='add'>+     y="143.58609"</div><div class='add'>+     id="text50"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="333.10376"</div><div class='add'>+       y="143.58609"</div><div class='add'>+       id="tspan52"&gt;sink compose&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="333.10376"</div><div class='add'>+       y="159.58609"</div><div class='add'>+       id="tspan54"&gt;selection (scaling)&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g56"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="382.32199"</div><div class='add'>+       y="199.565"</div><div class='add'>+       width="100.186"</div><div class='add'>+       height="71.452301"</div><div class='add'>+       id="rect58" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+       x="382.32199"</div><div class='add'>+       y="199.565"</div><div class='add'>+       width="100.186"</div><div class='add'>+       height="71.452301"</div><div class='add'>+       id="rect60" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#a020f0"</div><div class='add'>+     x="541.7218"</div><div class='add'>+     y="143.58609"</div><div class='add'>+     id="text62"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="541.7218"</div><div class='add'>+       y="143.58609"</div><div class='add'>+       id="tspan64"&gt;source&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="541.7218"</div><div class='add'>+       y="159.58609"</div><div class='add'>+       id="tspan66"&gt;crop&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="541.7218"</div><div class='add'>+       y="175.58609"</div><div class='add'>+       id="tspan68"&gt;selection&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#8b6914"</div><div class='add'>+     x="689.89978"</div><div class='add'>+     y="151.27209"</div><div class='add'>+     id="text70"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="689.89978"</div><div class='add'>+       y="151.27209"</div><div class='add'>+       id="tspan72"&gt;source media&lt;/tspan&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="689.89978"</div><div class='add'>+       y="167.27209"</div><div class='add'>+       id="tspan74"&gt;bus format&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g76"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="690.48798"</div><div class='add'>+       y="225.834"</div><div class='add'>+       width="100.186"</div><div class='add'>+       height="71.452301"</div><div class='add'>+       id="rect78" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#8b6914;stroke-width:2"</div><div class='add'>+       x="690.48798"</div><div class='add'>+       y="225.834"</div><div class='add'>+       width="100.186"</div><div class='add'>+       height="71.452301"</div><div class='add'>+       id="rect80" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="688.88776"</div><div class='add'>+     y1="291.43008"</div><div class='add'>+     x2="380.72174"</div><div class='add'>+     y2="265.16208"</div><div class='add'>+     id="line82" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="688.88776"</div><div class='add'>+     y1="219.97809"</div><div class='add'>+     x2="380.72174"</div><div class='add'>+     y2="193.70909"</div><div class='add'>+     id="line84" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="789.07379"</div><div class='add'>+     y1="291.43008"</div><div class='add'>+     x2="480.90775"</div><div class='add'>+     y2="265.16208"</div><div class='add'>+     id="line86" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="789.07379"</div><div class='add'>+     y1="219.97809"</div><div class='add'>+     x2="480.90775"</div><div class='add'>+     y2="193.70909"</div><div class='add'>+     id="line88" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g90"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       cx="808.09998"</div><div class='add'>+       cy="249.98399"</div><div class='add'>+       id="ellipse92"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="808.09998"</div><div class='add'>+       cy="249.98399"</div><div class='add'>+       id="ellipse94"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="808.09998"</div><div class='add'>+       cy="249.98399"</div><div class='add'>+       id="ellipse96"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g98"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       x1="816.59998"</div><div class='add'>+       y1="249.98399"</div><div class='add'>+       x2="972.93402"</div><div class='add'>+       y2="250.01199"</div><div class='add'>+       id="line100" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#000000"</div><div class='add'>+       points="970.435,245.012 980.434,250.014 970.433,255.012 972.934,250.012 "</div><div class='add'>+       id="polygon102" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       points="970.435,245.012 980.434,250.014 970.433,255.012 972.934,250.012 "</div><div class='add'>+       id="polygon104" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="840.3078"</div><div class='add'>+     y="233.94409"</div><div class='add'>+     id="text106"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="840.3078"</div><div class='add'>+       y="233.94409"</div><div class='add'>+       id="tspan108"&gt;pad 1 (source)&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g110"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       cx="-20.398199"</div><div class='add'>+       cy="241.51199"</div><div class='add'>+       id="ellipse112"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="-20.398199"</div><div class='add'>+       cy="241.51199"</div><div class='add'>+       id="ellipse114"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="-20.398199"</div><div class='add'>+       cy="241.51199"</div><div class='add'>+       id="ellipse116"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g118"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       x1="-192.39799"</div><div class='add'>+       y1="241.8"</div><div class='add'>+       x2="-38.6343"</div><div class='add'>+       y2="241.52901"</div><div class='add'>+       id="line120" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#000000"</div><div class='add'>+       points="-41.1431,236.534 -31.1343,241.516 -41.1254,246.534 -38.6343,241.529 "</div><div class='add'>+       id="polygon122" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       points="-41.1431,236.534 -31.1343,241.516 -41.1254,246.534 -38.6343,241.529 "</div><div class='add'>+       id="polygon124" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="-149.45824"</div><div class='add'>+     y="223.94409"</div><div class='add'>+     id="text126"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="-149.45824"</div><div class='add'>+       y="223.94409"</div><div class='add'>+       id="tspan128"&gt;pad 0 (sink)&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;rect</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+     x="388.22174"</div><div class='add'>+     y="270.81006"</div><div class='add'>+     width="100.186"</div><div class='add'>+     height="71.452301"</div><div class='add'>+     id="rect130" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g132"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       x="689.98798"</div><div class='add'>+       y="345.93399"</div><div class='add'>+       width="100.186"</div><div class='add'>+       height="71.452301"</div><div class='add'>+       id="rect134" /&gt;</div><div class='add'>+    &lt;rect</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#8b6914;stroke-width:2"</div><div class='add'>+       x="689.98798"</div><div class='add'>+       y="345.93399"</div><div class='add'>+       width="100.186"</div><div class='add'>+       height="71.452301"</div><div class='add'>+       id="rect136" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="688.38776"</div><div class='add'>+     y1="411.53006"</div><div class='add'>+     x2="388.22174"</div><div class='add'>+     y2="342.26208"</div><div class='add'>+     id="line138" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="688.38776"</div><div class='add'>+     y1="340.07806"</div><div class='add'>+     x2="388.22174"</div><div class='add'>+     y2="270.81006"</div><div class='add'>+     id="line140" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="788.57379"</div><div class='add'>+     y1="411.53006"</div><div class='add'>+     x2="488.40775"</div><div class='add'>+     y2="342.26208"</div><div class='add'>+     id="line142" /&gt;</div><div class='add'>+  &lt;line</div><div class='add'>+     style="fill:none;fill-opacity:0;stroke:#e60505;stroke-width:2;stroke-dasharray:4"</div><div class='add'>+     x1="788.57379"</div><div class='add'>+     y1="340.07806"</div><div class='add'>+     x2="488.40775"</div><div class='add'>+     y2="270.81006"</div><div class='add'>+     id="line144" /&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g146"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:#ffffff"</div><div class='add'>+       cx="805.59998"</div><div class='add'>+       cy="384.08401"</div><div class='add'>+       id="ellipse148"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="805.59998"</div><div class='add'>+       cy="384.08401"</div><div class='add'>+       id="ellipse150"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+    &lt;circle</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       cx="805.59998"</div><div class='add'>+       cy="384.08401"</div><div class='add'>+       id="ellipse152"</div><div class='add'>+       r="8.5" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g154"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       x1="814.09998"</div><div class='add'>+       y1="384.08401"</div><div class='add'>+       x2="970.43402"</div><div class='add'>+       y2="384.112"</div><div class='add'>+       id="line156" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#000000"</div><div class='add'>+       points="967.935,379.112 977.934,384.114 967.933,389.112 970.434,384.112 "</div><div class='add'>+       id="polygon158" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"</div><div class='add'>+       points="967.935,379.112 977.934,384.114 967.933,389.112 970.434,384.112 "</div><div class='add'>+       id="polygon160" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;text</div><div class='add'>+     style="font-style:normal;font-weight:normal;font-size:12.80000019px;font-family:sanserif;text-anchor:start;fill:#000000"</div><div class='add'>+     x="837.8078"</div><div class='add'>+     y="368.04407"</div><div class='add'>+     id="text162"&gt;</div><div class='add'>+    &lt;tspan</div><div class='add'>+       x="837.8078"</div><div class='add'>+       y="368.04407"</div><div class='add'>+       id="tspan164"&gt;pad 2 (source)&lt;/tspan&gt;</div><div class='add'>+  &lt;/text&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g166"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+       x1="546"</div><div class='add'>+       y1="191"</div><div class='add'>+       x2="492.15701"</div><div class='add'>+       y2="198.263"</div><div class='add'>+       id="line168" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#a020f0"</div><div class='add'>+       points="495.303,202.884 484.724,199.266 493.966,192.974 492.157,198.263 "</div><div class='add'>+       id="polygon170" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+       points="495.303,202.884 484.724,199.266 493.966,192.974 492.157,198.263 "</div><div class='add'>+       id="polygon172" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+  &lt;g</div><div class='add'>+     id="g174"</div><div class='add'>+     transform="translate(-1.6002426,-5.8559115)"&gt;</div><div class='add'>+    &lt;line</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+       x1="546.90802"</div><div class='add'>+       y1="190.72501"</div><div class='add'>+       x2="495.383"</div><div class='add'>+       y2="268.548"</div><div class='add'>+       id="line176" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:#a020f0"</div><div class='add'>+       points="500.932,269.224 491.242,274.802 492.594,263.703 495.383,268.548 "</div><div class='add'>+       id="polygon178" /&gt;</div><div class='add'>+    &lt;polygon</div><div class='add'>+       style="fill:none;fill-opacity:0;stroke:#a020f0;stroke-width:2"</div><div class='add'>+       points="500.932,269.224 491.242,274.802 492.594,263.703 495.383,268.548 "</div><div class='add'>+       id="polygon180" /&gt;</div><div class='add'>+  &lt;/g&gt;</div><div class='add'>+&lt;/svg&gt;</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/v4l2.rst b/Documentation/media/uapi/v4l/v4l2.rst<br/>index 55b959dda07e..f52a11c949d3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/v4l2.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/v4l2.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/v4l2.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/v4l2.rst</a></div><div class='hunk'>@@ -68,6 +68,10 @@ Authors, in alphabetical order:</div><div class='ctx'> </div><div class='ctx'>   - SDR API.</div><div class='ctx'> </div><div class='add'>+- Ribalda, Ricardo</div><div class='add'>+</div><div class='add'>+  - Introduce HSV formats and other minor changes.</div><div class='add'>+</div><div class='ctx'> - Rubli, Martin</div><div class='ctx'> </div><div class='ctx'>   - Designed and documented the VIDIOC_ENUM_FRAMESIZES and VIDIOC_ENUM_FRAMEINTERVALS ioctls.</div><div class='hunk'>@@ -89,6 +93,11 @@ part can be used and distributed without restrictions.</div><div class='ctx'> Revision History</div><div class='ctx'> ****************</div><div class='ctx'> </div><div class='add'>+:revision: 4.10 / 2016-07-15 (*rr*)</div><div class='add'>+</div><div class='add'>+Introduce HSV formats.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> :revision: 4.5 / 2015-10-29 (*rr*)</div><div class='ctx'> </div><div class='ctx'> Extend VIDIOC_G_EXT_CTRLS;. Replace ctrl_class with a new union with</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/vbi_525.svg b/Documentation/media/uapi/v4l/vbi_525.svg<br/>new file mode 100644<br/>index 000000000000..b05f7777ccf8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/vbi_525.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vbi_525.svg</a></div><div class='hunk'>@@ -0,0 +1,811 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   width="208.73068mm"</div><div class='add'>+   height="51.395489mm"</div><div class='add'>+   viewBox="0 0 739.59691 182.11"</div><div class='add'>+   sodipodi:docname="vbi_525.svg"&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview4"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0"</div><div class='add'>+     inkscape:zoom="1.5350601"</div><div class='add'>+     inkscape:cx="264.23387"</div><div class='add'>+     inkscape:cy="44.916942"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="g10"</div><div class='add'>+     units="mm" /&gt;&lt;metadata</div><div class='add'>+     id="metadata8"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title /&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;defs</div><div class='add'>+     id="defs6"&gt;&lt;clipPath</div><div class='add'>+       id="clipPath20"</div><div class='add'>+       clipPathUnits="userSpaceOnUse"&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path22"</div><div class='add'>+         d="m 0,0 5950,0 0,3922 L 0,3922 0,0 Z m 0,3922 5950,0 0,1 -5950,0 0,-1 z m 0,1 1359,0 0,1 -1359,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1363,0 0,1 -1363,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1367,0 0,1 -1367,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1371,0 0,1 -1371,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1375,0 0,1 -1375,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1379,0 0,1 -1379,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1383,0 0,1 -1383,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1387,0 0,1 -1387,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1391,0 0,1 -1391,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1390,0 0,1 -1390,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1386,0 0,1 -1386,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1382,0 0,1 -1382,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1378,0 0,1 -1378,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1374,0 0,1 -1374,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1370,0 0,1 -1370,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1366,0 0,1 -1366,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1362,0 0,1 -1362,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1358,0 0,1 -1358,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 5950,0 0,1 -5950,0 0,-1 z m 0,1 5950,0 0,4478 -5950,0 0,-4478 z" /&gt;&lt;/clipPath&gt;&lt;clipPath</div><div class='add'>+       id="clipPath98"</div><div class='add'>+       clipPathUnits="userSpaceOnUse"&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path100"</div><div class='add'>+         d="m 0,0 5950,0 0,4546 L 0,4546 0,0 Z m 0,4546 5950,0 0,1 -5950,0 0,-1 z m 0,1 1360,0 0,1 -1360,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1364,0 0,1 -1364,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1368,0 0,1 -1368,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1372,0 0,1 -1372,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1376,0 0,1 -1376,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1380,0 0,1 -1380,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1384,0 0,1 -1384,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1388,0 0,1 -1388,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1391,0 0,1 -1391,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1389,0 0,1 -1389,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1385,0 0,1 -1385,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1381,0 0,1 -1381,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1377,0 0,1 -1377,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1373,0 0,1 -1373,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1369,0 0,1 -1369,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1365,0 0,1 -1365,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1361,0 0,1 -1361,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 1357,0 0,1 -1357,0 0,-1 z m 1399,0 4551,0 0,1 -4551,0 0,-1 z m -1399,1 5950,0 0,1 -5950,0 0,-1 z m 0,1 5950,0 0,3854 -5950,0 0,-3854 z" /&gt;&lt;/clipPath&gt;&lt;/defs&gt;&lt;g</div><div class='add'>+     transform="matrix(0.125,0,0,-0.125,-87.571875,638.05691)"</div><div class='add'>+     inkscape:label="vbi_525"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     id="g10"&gt;&lt;g</div><div class='add'>+       transform="matrix(1.3000026,0,0,1.3000026,-210.17435,-1094.2823)"</div><div class='add'>+       id="g12"</div><div class='add'>+       style=""&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path14"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 1281.75,3974.45 0,-85.05" /&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       transform="matrix(1.3000026,0,0,1.3000026,-210.17435,-1094.2823)"</div><div class='add'>+       id="g16"</div><div class='add'>+       style=""&gt;&lt;g</div><div class='add'>+         clip-path="url(#clipPath20)"</div><div class='add'>+         id="g18"</div><div class='add'>+         style=""&gt;&lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           id="path24"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           d="m 1281.75,3931.93 113.4,0" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       transform="matrix(1.3000026,0,0,1.3000026,-210.17435,-1094.2823)"</div><div class='add'>+       id="g26"</div><div class='add'>+       style=""&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path28"</div><div class='add'>+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+         d="m 1352.31,3922.48 37.8,9.45 -37.8,9.45 0,-18.9" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path30"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 1352.31,3922.48 37.8,9.45 -37.8,9.45 0,-18.9 z" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path32"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 4683.75,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path34"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 4400.25,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path36"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 4116.75,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path38"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 3833.25,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path40"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 3549.75,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path42"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 3266.25,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path44"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 2982.75,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path46"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 2699.25,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path48"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 2415.75,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path50"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 2132.25,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path52"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 1848.75,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path54"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 1565.25,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path56"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 1281.75,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path58"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 998.25,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path60"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 714.75,4059.5 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path62"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 4683.75,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path64"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 4400.25,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path66"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 4116.75,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path68"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 3833.25,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path70"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 3549.75,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path72"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 3266.25,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path74"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 2982.75,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path76"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 2699.25,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path78"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 2415.75,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path80"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 2132.25,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path82"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 1848.75,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path84"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 1565.25,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path86"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 1281.75,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path88"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 998.25,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path90"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 714.75,4144.55 0,-56.7" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path92"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 1281.75,4598.15 0,-85.05" /&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       transform="matrix(1.3000026,0,0,1.3000026,-210.17435,-1094.2823)"</div><div class='add'>+       id="g94"</div><div class='add'>+       style=""&gt;&lt;g</div><div class='add'>+         clip-path="url(#clipPath98)"</div><div class='add'>+         id="g96"</div><div class='add'>+         style=""&gt;&lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           id="path102"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           d="m 1281.75,4555.63 113.4,0" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;path</div><div class='add'>+       d="m 1547.8322,4815.7637 49.1401,12.2851 -49.1401,12.285 0,-24.5701"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path106"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1547.8322,4815.7637 49.1401,12.2851 -49.1401,12.285 0,-24.5701 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path108"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1456.104,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path110"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1824.6548,5030.7452 0,73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path112"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 2193.2055,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path114"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 2561.7563,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path116"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 2930.307,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path118"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 3298.8578,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path120"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 3667.4085,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path122"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4035.9593,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path124"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4404.51,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path126"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4773.0608,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path128"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5141.6115,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path130"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5510.1623,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path132"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5878.713,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path134"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1456.104,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path136"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1824.6548,4920.1799 0,73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path138"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 2193.2055,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path140"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 2561.7563,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path142"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 2930.307,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path144"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 3298.8578,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path146"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 3667.4085,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path148"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4035.9593,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path150"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4404.51,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path152"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4773.0608,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path154"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5141.6115,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path156"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5510.1623,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path158"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5878.713,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path160"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 719.00254,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path162"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 719.00254,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path164"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1087.5533,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path166"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1087.5533,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path168"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 700.575,4735.9046 18.42754,0 0,-110.5653 36.85507,0 0,110.5653 18.42754,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path170"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 774.28515,4680.6285 18.42754,0 0,110.5652 -18.42754,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path172"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 792.71269,4735.9046 18.42753,0 0,92.1442 18.42754,-18.4341 18.42754,36.8551 18.42754,-36.8551 18.42753,36.8551 18.42754,-55.2761 18.42754,55.2761 18.42754,-18.421 18.42753,55.2761 18.42754,-55.2761 18.42754,18.421 18.4275,36.8551 18.4276,-92.1312 18.4275,55.2761 18.4275,-55.2761 0,-55.2891"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path174"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1069.1257,4735.9046 18.4276,0 0,-110.5653 36.8551,0 0,110.5653 18.421,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path176"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1142.8294,4680.6285 18.4275,0 0,110.5652 -18.4275,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path178"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1456.104,4735.9046 0,-110.5653 18.4211,0 0,110.5653 165.8543,0 0,-110.5653 18.421,0 0,110.5653 165.8544,0 0,-110.5653 18.421,0 0,110.5653 165.8544,0 0,-110.5653 18.421,0 0,110.5653 165.8543,0 0,-110.5653 18.4211,0 0,110.5653 165.8543,0 0,-110.5653 18.421,0 0,110.5653 165.8544,0 0,-110.5653 147.4203,0 0,110.5653 36.8551,0 0,-110.5653 147.4203,0 0,110.5653 36.855,0 0,-110.5653 147.4203,0 0,110.5653 36.8551,0 0,-110.5653 147.4203,0 0,110.5653 36.8551,0 0,-110.5653 147.4203,0 0,110.5653 36.855,0 0,-110.5653 147.4203,0 0,110.5653 36.8551,0 0,-110.5653 18.4211,0 0,110.5653 165.8543,0 0,-110.5653 18.421,0 0,110.5653 165.8544,0 0,-110.5653 18.421,0 0,110.5653 165.8543,0 0,-110.5653 18.4211,0 0,110.5653 165.8543,0 0,-110.5653 18.4211,0 0,110.5653 165.8543,0 0,-110.5653 18.421,0 0,110.5653 165.8544,0 0,-110.5653 36.855,0 0,110.5653 18.4211,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path180"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1161.2634,4735.9046 294.8406,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path182"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6320.9739,4735.9046 18.421,0 0,92.1442 18.4341,-18.4341 18.421,73.7102 18.4341,-55.2761 18.421,36.855 18.434,-18.434 18.4211,36.8551 18.434,-36.8551 18.421,36.8551 18.4341,-36.8551 18.421,18.434 18.4341,-36.855 18.421,36.855 18.434,-36.855 18.4211,-18.4341 0,-73.7101 18.434,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path184"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4828.3369,4680.6285 18.4275,0 0,110.5652 -18.4275,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path186"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4846.7709,4735.9046 294.8406,0 0,-110.5653 36.8551,0 0,110.5653 18.421,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path188"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5196.8876,4680.6285 18.4276,0 0,110.5652 -18.4276,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path190"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5565.4384,4680.6285 18.4275,0 0,110.5652 -18.4275,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path192"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5933.9891,4680.6285 18.4276,0 0,110.5652 -18.4276,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path194"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5952.4232,4735.9046 294.8406,0 0,-110.5653 36.855,0 0,110.5653 18.4211,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path196"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6302.5399,4680.6285 18.4275,0 0,110.5652 -18.4275,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path198"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5786.5688,4735.9046 92.1442,0 0,-110.5653 36.8551,0 0,110.5653 18.421,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path200"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5805.0029,4791.1937 -36.8551,-110.5652"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path202"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5583.8724,4735.9046 165.8414,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path204"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5768.1478,4791.1937 -36.8551,-110.5652"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path206"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5215.3217,4735.9046 294.8406,0 0,-110.5653 36.855,0 0,110.5653 18.4211,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path208"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6247.2638,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path210"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6247.2638,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path212"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6615.8145,5104.4553 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path214"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6615.8145,4993.8901 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path216"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 700.575,3925.0929 18.42754,0 0,-110.5652 36.85507,0 0,110.5652 18.42754,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path218"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 774.28515,3869.8168 18.42754,0 0,110.5652 -18.42754,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path220"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1142.8294,3869.8168 18.4275,0 0,110.5652 -18.4275,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path222"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 792.71269,3925.0929 18.42753,0 0,110.5652 18.42754,-36.855 18.42754,18.434 18.42754,-36.8551 18.42753,36.8551 0,-92.1442 202.70293,0 0,-110.5652 36.8551,0 0,110.5652 18.421,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path224"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 1161.2634,3925.0929 110.5653,0 0,-110.5652 18.421,0 0,110.5652 165.8543,0 0,-110.5652 18.4211,0 0,110.5652 165.8543,0 0,-110.5652 18.421,0 0,110.5652 165.8544,0 0,-110.5652 18.421,0 0,110.5652 165.8544,0 0,-110.5652 18.421,0 0,110.5652 165.8543,0 0,-110.5652 18.4211,0 0,110.5652 165.8543,0 0,-110.5652 147.4203,0 0,110.5652 36.8551,0 0,-110.5652 147.4203,0 0,110.5652 36.8551,0 0,-110.5652 147.4203,0 0,110.5652 36.855,0 0,-110.5652 147.4203,0 0,110.5652 36.8551,0 0,-110.5652 147.4203,0 0,110.5652 36.8551,0 0,-110.5652 147.4203,0 0,110.5652 36.855,0 0,-110.5652 18.4211,0 0,110.5652 165.8543,0 0,-110.5652 18.4211,0 0,110.5652 165.8543,0 0,-110.5652 18.421,0 0,110.5652 165.8544,0 0,-110.5652 18.421,0 0,110.5652 165.8543,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path226"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4220.2346,3925.0929 0,-110.5652 18.4211,0 0,110.5652 165.8543,0 0,-110.5652 18.4211,0 0,110.5652 55.2891,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path228"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4478.2202,3925.0929 294.8406,0 0,-110.5652 36.855,0 0,110.5652 18.4211,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path230"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5952.4232,3925.0929 128.9862,0 0,73.7102 18.4341,36.855 18.421,-18.421 18.434,36.8551 18.4211,-36.8551 18.434,18.421 18.421,-36.855 18.4341,18.434 18.421,-36.8551 0,-55.2891 18.4341,0 0,-110.5652 36.855,0 0,110.5652 18.4211,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path232"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6302.5399,3869.8168 18.4275,0 0,110.5652 -18.4275,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path234"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6320.9739,3925.0929 18.421,0 0,73.7102 18.4341,36.855 18.421,-36.855 18.4341,36.855 18.421,-18.421 18.434,0 18.4211,-36.8551 18.434,55.2761 18.421,-18.421 0,36.8551 18.4341,-18.4341 18.421,18.4341 18.4341,-36.8551 18.421,18.421 18.434,-55.2761 18.4211,18.4211 0,-73.7102 18.434,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path236"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5933.9891,3869.8168 18.4276,0 0,110.5652 -18.4276,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path238"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5786.5688,3925.0929 92.1442,0 0,-110.5652 36.8551,0 0,110.5652 18.421,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path240"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5805.0029,3980.382 -36.8551,-110.5652"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path242"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5768.1478,3980.382 -36.8551,-110.5652"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path244"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4828.3369,3869.8168 18.4275,0 0,110.5652 -18.4275,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path246"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5583.8724,3925.0929 165.8414,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path248"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 4846.7709,3925.0929 294.8406,0 0,-110.5652 36.8551,0 0,110.5652 18.421,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path250"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5196.8876,3869.8168 18.4276,0 0,110.5652 -18.4276,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path252"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5215.3217,3925.0929 294.8406,0 0,-110.5652 36.855,0 0,110.5652 18.4211,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path254"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5565.4384,3869.8168 18.4275,0 0,110.5652 -18.4275,0 0,-110.5652 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path256"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6247.2638,4293.6437 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path258"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6247.2638,4183.0784 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path260"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6615.8145,4293.6437 0,-73.7102"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path262"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 6615.8145,4183.0784 0,-73.7101"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.07125616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path264"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;text</div><div class='add'>+       y="-4035.6582"</div><div class='add'>+       x="1621.9453"</div><div class='add'>+       id="text268"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:61.42512512px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan270"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4035.6582"</div><div class='add'>+         x="1621.9453 1642.3999 1676.5522"&gt;(1)&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4127.7959"</div><div class='add'>+       x="4199.7334"</div><div class='add'>+       id="text272"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan274"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4127.7959"</div><div class='add'>+         x="4199.7334 3831.1829 2725.5305 3112.509 3462.6321 4568.2842 4916.3442 4957.3271 5653.4458 5694.4287 5284.895 5325.8779 2356.9773 1988.4264 1210.3424 1251.3252 1292.3081 1619.8759 841.79163 882.77454 923.75732"&gt;874569101211322631262&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan276"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4238.3613"</div><div class='add'>+         x="4158.748 4199.7314 4240.7144 3790.1975 3831.1807 3872.1633 2684.5457 2725.5283 2766.5112 3071.5237 3112.5063 3153.4895 3421.647 3462.6299 3503.6125 4527.2988 4568.2822 4609.2646 4895.8496 4936.833 4977.8154 5632.9517 5673.9341 5714.917 5264.4009 5305.3833 5346.3662 2315.9946 2356.9775 2397.9604 1947.444 1988.4269 2029.4097 1210.3424 1251.3252 1292.3081 1578.8931 1619.876 1660.8589 841.79163 882.77454 923.75732"&gt;271270267268269272273275274266265263264262&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan278"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-5049.1729"</div><div class='add'>+         x="2725.5347 4568.2881 1988.4331 2356.9839 1619.8822 3094.0852 3462.636 4916.3506 4957.334 5284.9019 5325.8843 5653.4526 5694.4351 3812.7656 4181.3164"&gt;492315610111278&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan280"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4938.6074"</div><div class='add'>+         x="2725.5474 4568.3013 1988.446 2356.9966 1619.8953 3094.0981 3462.6489 4916.3638 4957.3472 5284.9146 5325.8975 5653.4653 5694.4482 3812.7788 4181.3296"&gt;492315610111278&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan282"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-5049.1729"</div><div class='add'>+         x="841.81781 882.8006 923.78326"&gt;524&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan284"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4938.6074"</div><div class='add'>+         x="841.81781 882.8006 923.78326"&gt;261&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan286"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-5049.1729"</div><div class='add'>+         x="1210.3684 1251.3512 1292.3342"&gt;525&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan288"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4938.6074"</div><div class='add'>+         x="1210.3684 1251.3512 1292.3342"&gt;262&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan290"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-5049.1729"</div><div class='add'>+         x="6022.0161 6062.999"&gt;22&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan292"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4938.6074"</div><div class='add'>+         x="6022.0161 6062.999"&gt;22&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan294"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-5049.1729"</div><div class='add'>+         x="6390.5669 6431.5498"&gt;23&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan296"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4938.6074"</div><div class='add'>+         x="6390.5669 6431.5498"&gt;23&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan298"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4238.3623"</div><div class='add'>+         x="6001.5244 6042.5068 6083.4902"&gt;285&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan300"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4127.7964"</div><div class='add'>+         x="6022.0156 6062.9985"&gt;22&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan302"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4238.3623"</div><div class='add'>+         x="6370.0747 6411.0571 6452.04"&gt;286&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan304"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4127.7964"</div><div class='add'>+         x="6390.5664 6431.5493"&gt;23&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan306"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4459.4922"</div><div class='add'>+         x="3540.4146 3581.3972 3618.2522 3638.7437 3659.2354 3679.7266 3696.0901 3737.073 3753.4365"&gt;1st field&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan308"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-3648.6809"</div><div class='add'>+         x="3528.1047 3569.0876 3610.0703 3651.0532 3671.5447 3692.0361 3708.3999 3749.3826 3765.7463"&gt;2nd field&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4127.7959"</div><div class='add'>+       x="4199.7334 3831.1829 2725.5305 3112.509 3462.6321 4568.2842 4916.3442 4957.3271 5653.4458 5694.4287 5284.895 5325.8779 2356.9773 1988.4264 1210.3424 1251.3252 1292.3081 1619.8759 841.79163 882.77454 923.75732"</div><div class='add'>+       id="text3632"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3634"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4127.7959"</div><div class='add'>+         x="4199.7334 3831.1829 2725.5305 3112.509 3462.6321 4568.2842 4916.3442 4957.3271 5653.4458 5694.4287 5284.895 5325.8779 2356.9773 1988.4264 1210.3424 1251.3252 1292.3081 1619.8759 841.79163 882.77454 923.75732"&gt;874569101211322631262&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4238.3613"</div><div class='add'>+       x="4158.748 4199.7314 4240.7144 3790.1975 3831.1807 3872.1633 2684.5457 2725.5283 2766.5112 3071.5237 3112.5063 3153.4895 3421.647 3462.6299 3503.6125 4527.2988 4568.2822 4609.2646 4895.8496 4936.833 4977.8154 5632.9517 5673.9341 5714.917 5264.4009 5305.3833 5346.3662 2315.9946 2356.9775 2397.9604 1947.444 1988.4269 2029.4097 1210.3424 1251.3252 1292.3081 1578.8931 1619.876 1660.8589 841.79163 882.77454 923.75732"</div><div class='add'>+       id="text3636"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3638"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4238.3613"</div><div class='add'>+         x="4158.748 4199.7314 4240.7144 3790.1975 3831.1807 3872.1633 2684.5457 2725.5283 2766.5112 3071.5237 3112.5063 3153.4895 3421.647 3462.6299 3503.6125 4527.2988 4568.2822 4609.2646 4895.8496 4936.833 4977.8154 5632.9517 5673.9341 5714.917 5264.4009 5305.3833 5346.3662 2315.9946 2356.9775 2397.9604 1947.444 1988.4269 2029.4097 1210.3424 1251.3252 1292.3081 1578.8931 1619.876 1660.8589 841.79163 882.77454 923.75732"&gt;271270267268269272273275274266265263264262&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-5049.1729"</div><div class='add'>+       x="2725.5347 4568.2881 1988.4331 2356.9839 1619.8822 3094.0852 3462.636 4916.3506 4957.334 5284.9019 5325.8843 5653.4526 5694.4351 3812.7656 4181.3164"</div><div class='add'>+       id="text3640"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3642"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-5049.1729"</div><div class='add'>+         x="2725.5347 4568.2881 1988.4331 2356.9839 1619.8822 3094.0852 3462.636 4916.3506 4957.334 5284.9019 5325.8843 5653.4526 5694.4351 3812.7656 4181.3164"&gt;492315610111278&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4938.6074"</div><div class='add'>+       x="2725.5474 4568.3013 1988.446 2356.9966 1619.8953 3094.0981 3462.6489 4916.3638 4957.3472 5284.9146 5325.8975 5653.4653 5694.4482 3812.7788 4181.3296"</div><div class='add'>+       id="text3644"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3646"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4938.6074"</div><div class='add'>+         x="2725.5474 4568.3013 1988.446 2356.9966 1619.8953 3094.0981 3462.6489 4916.3638 4957.3472 5284.9146 5325.8975 5653.4653 5694.4482 3812.7788 4181.3296"&gt;492315610111278&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-5049.1729"</div><div class='add'>+       x="841.81781 882.8006 923.78326"</div><div class='add'>+       id="text3648"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3650"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-5049.1729"</div><div class='add'>+         x="841.81781 882.8006 923.78326"&gt;524&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4938.6074"</div><div class='add'>+       x="841.81781 882.8006 923.78326"</div><div class='add'>+       id="text3652"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3654"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4938.6074"</div><div class='add'>+         x="841.81781 882.8006 923.78326"&gt;261&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-5049.1729"</div><div class='add'>+       x="1210.3684 1251.3512 1292.3342"</div><div class='add'>+       id="text3656"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3658"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-5049.1729"</div><div class='add'>+         x="1210.3684 1251.3512 1292.3342"&gt;525&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4938.6074"</div><div class='add'>+       x="1210.3684 1251.3512 1292.3342"</div><div class='add'>+       id="text3660"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3662"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4938.6074"</div><div class='add'>+         x="1210.3684 1251.3512 1292.3342"&gt;262&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-5049.1729"</div><div class='add'>+       x="6022.0161 6062.999"</div><div class='add'>+       id="text3664"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3666"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-5049.1729"</div><div class='add'>+         x="6022.0161 6062.999"&gt;22&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4938.6074"</div><div class='add'>+       x="6022.0161 6062.999"</div><div class='add'>+       id="text3668"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3670"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4938.6074"</div><div class='add'>+         x="6022.0161 6062.999"&gt;22&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-5049.1729"</div><div class='add'>+       x="6390.5669 6431.5498"</div><div class='add'>+       id="text3672"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3674"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-5049.1729"</div><div class='add'>+         x="6390.5669 6431.5498"&gt;23&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4938.6074"</div><div class='add'>+       x="6390.5669 6431.5498"</div><div class='add'>+       id="text3676"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3678"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4938.6074"</div><div class='add'>+         x="6390.5669 6431.5498"&gt;23&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4238.3623"</div><div class='add'>+       x="6001.5244 6042.5068 6083.4902"</div><div class='add'>+       id="text3680"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3682"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4238.3623"</div><div class='add'>+         x="6001.5244 6042.5068 6083.4902"&gt;285&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4127.7964"</div><div class='add'>+       x="6022.0156 6062.9985"</div><div class='add'>+       id="text3684"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3686"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4127.7964"</div><div class='add'>+         x="6022.0156 6062.9985"&gt;22&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4238.3623"</div><div class='add'>+       x="6370.0747 6411.0571 6452.04"</div><div class='add'>+       id="text3688"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3690"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4238.3623"</div><div class='add'>+         x="6370.0747 6411.0571 6452.04"&gt;286&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4127.7964"</div><div class='add'>+       x="6390.5664 6431.5493"</div><div class='add'>+       id="text3692"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3694"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4127.7964"</div><div class='add'>+         x="6390.5664 6431.5493"&gt;23&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-4459.4922"</div><div class='add'>+       x="3540.4146 3581.3972 3618.2522 3638.7437 3659.2354 3679.7266 3696.0901 3737.073 3753.4365"</div><div class='add'>+       id="text3696"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3698"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4459.4922"</div><div class='add'>+         x="3540.4146 3581.3972 3618.2522 3638.7437 3659.2354 3679.7266 3696.0901 3737.073 3753.4365"&gt;1st field&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       y="-3648.6809"</div><div class='add'>+       x="3528.1047 3569.0876 3610.0703 3651.0532 3671.5447 3692.0361 3708.3999 3749.3826 3765.7463"</div><div class='add'>+       id="text3700"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.71015167px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"&gt;&lt;tspan</div><div class='add'>+         id="tspan3702"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-3648.6809"</div><div class='add'>+         x="3528.1047 3569.0876 3610.0703 3651.0532 3671.5447 3692.0361 3708.3999 3749.3826 3765.7463"&gt;2nd field&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/svg&gt;
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/vbi_625.svg b/Documentation/media/uapi/v4l/vbi_625.svg<br/>new file mode 100644<br/>index 000000000000..c117ddb7bf7e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/vbi_625.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vbi_625.svg</a></div><div class='hunk'>@@ -0,0 +1,858 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   width="209.46608mm"</div><div class='add'>+   height="51.576824mm"</div><div class='add'>+   viewBox="0 0 742.20265 182.75252"</div><div class='add'>+   sodipodi:docname="vbi_625.svg"&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview4"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0"</div><div class='add'>+     inkscape:zoom="1.5350601"</div><div class='add'>+     inkscape:cx="288.91482"</div><div class='add'>+     inkscape:cy="170.67667"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="g10"</div><div class='add'>+     units="mm" /&gt;&lt;metadata</div><div class='add'>+     id="metadata8"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title /&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;defs</div><div class='add'>+     id="defs6"&gt;&lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath20"&gt;&lt;path</div><div class='add'>+         d="m 0,0 5950,0 0,4546 L 0,4546 0,0 Z m 0,4546 5950,0 0,1 -5950,0 0,-1 z m 0,1 2211,0 0,1 -2211,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2215,0 0,1 -2215,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2219,0 0,1 -2219,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2223,0 0,1 -2223,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2227,0 0,1 -2227,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2231,0 0,1 -2231,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2235,0 0,1 -2235,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2239,0 0,1 -2239,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2241,0 0,1 -2241,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2240,0 0,1 -2240,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2236,0 0,1 -2236,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2232,0 0,1 -2232,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2228,0 0,1 -2228,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2224,0 0,1 -2224,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2220,0 0,1 -2220,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2216,0 0,1 -2216,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2212,0 0,1 -2212,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2208,0 0,1 -2208,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 5950,0 0,1 -5950,0 0,-1 z m 0,1 5950,0 0,3854 -5950,0 0,-3854 z"</div><div class='add'>+         id="path22"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;&lt;/clipPath&gt;&lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath98"&gt;&lt;path</div><div class='add'>+         d="m 0,0 5950,0 0,3922 L 0,3922 0,0 Z m 0,3922 5950,0 0,1 -5950,0 0,-1 z m 0,1 2209,0 0,1 -2209,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2213,0 0,1 -2213,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2217,0 0,1 -2217,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2221,0 0,1 -2221,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2225,0 0,1 -2225,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2229,0 0,1 -2229,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2233,0 0,1 -2233,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2237,0 0,1 -2237,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2241,0 0,1 -2241,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2241,0 0,1 -2241,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2237,0 0,1 -2237,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2233,0 0,1 -2233,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2229,0 0,1 -2229,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2225,0 0,1 -2225,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2221,0 0,1 -2221,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2217,0 0,1 -2217,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2213,0 0,1 -2213,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 2209,0 0,1 -2209,0 0,-1 z m 2250,0 3700,0 0,1 -3700,0 0,-1 z m -2250,1 5950,0 0,1 -5950,0 0,-1 z m 0,1 5950,0 0,4478 -5950,0 0,-4478 z"</div><div class='add'>+         id="path100"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;&lt;/clipPath&gt;&lt;/defs&gt;&lt;g</div><div class='add'>+     id="g10"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     inkscape:label="vbi_625"</div><div class='add'>+     transform="matrix(0.125,0,0,-0.125,-87.571875,638.69874)"&gt;&lt;g</div><div class='add'>+       id="g12"</div><div class='add'>+       transform="matrix(1.3045828,0,0,1.3045828,-213.38312,-1110.9872)"</div><div class='add'>+       style=""&gt;&lt;path</div><div class='add'>+         d="m 2132.25,4598.15 0,-85.05"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         id="path14"</div><div class='add'>+         inkscape:connector-curvature="0" /&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       id="g16"</div><div class='add'>+       transform="matrix(1.3045828,0,0,1.3045828,-213.38312,-1110.9872)"</div><div class='add'>+       style=""&gt;&lt;g</div><div class='add'>+         id="g18"</div><div class='add'>+         clip-path="url(#clipPath20)"</div><div class='add'>+         style=""&gt;&lt;path</div><div class='add'>+           d="m 2132.25,4555.63 113.4,0"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           id="path24"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path28"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       d="m 2660.3649,4819.881 49.3132,12.3283 -49.3132,12.3283 0,-24.6566" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path30"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2660.3649,4819.881 49.3132,12.3283 -49.3132,12.3283 0,-24.6566 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path32"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1828.6151,4924.6651 0,73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path34"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2198.4643,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path36"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2568.3136,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path38"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2938.1628,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path40"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 3308.012,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path42"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 3677.8612,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path44"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4047.7105,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path46"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4417.5597,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path48"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4787.4089,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path50"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5157.2581,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path52"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5527.1073,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path54"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5896.9566,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path56"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1458.7659,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path58"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1828.6151,5035.6199 0,73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path60"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2198.4643,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path62"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2568.3136,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path64"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2938.1628,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path66"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 3308.012,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path68"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 3677.8612,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path70"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4047.7105,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path72"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4417.5597,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path74"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4787.4089,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path76"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5157.2581,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path78"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5527.1073,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path80"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5896.9566,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path82"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1458.7659,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path84"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 719.06744,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path86"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 719.06744,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path88"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1088.9167,4998.635 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path90"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1088.9167,5109.5897 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path92"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2568.3136,4074.0119 0,-110.9548" /&gt;&lt;g</div><div class='add'>+       id="g94"</div><div class='add'>+       transform="matrix(1.3045828,0,0,1.3045828,-213.38312,-1110.9872)"</div><div class='add'>+       style=""&gt;&lt;g</div><div class='add'>+         id="g96"</div><div class='add'>+         clip-path="url(#clipPath98)"</div><div class='add'>+         style=""&gt;&lt;path</div><div class='add'>+           d="m 2132.25,3931.93 113.4,0"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:2.36249995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           id="path102"</div><div class='add'>+           inkscape:connector-curvature="0" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path106"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       d="m 2660.365,4006.2129 49.3132,12.3283 -49.3132,12.3283 0,-24.6566" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path108"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2660.365,4006.2129 49.3132,12.3283 -49.3132,12.3283 0,-24.6566 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path110"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6266.806,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path112"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5896.9567,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path114"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5527.1075,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path116"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5157.2583,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path118"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4787.409,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path120"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4417.5598,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path122"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4047.7106,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path124"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 3677.8613,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path126"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 3308.0121,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path128"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2938.1629,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path130"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2568.3136,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path132"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2198.4644,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path134"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1828.6152,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path136"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1458.7659,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path138"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6266.806,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path140"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5896.9567,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path142"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5527.1075,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path144"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5157.2583,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path146"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4787.409,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path148"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4417.5598,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path150"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4047.7106,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path152"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 3677.8613,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path154"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 3308.0121,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path156"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2938.1629,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path158"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2568.3136,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path160"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 2198.4644,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path162"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1828.6152,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path164"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1458.7659,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path166"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 719.06746,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path168"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 719.06746,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path170"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1088.9167,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path172"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1088.9167,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path174"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1144.3876,4684.2698 18.4924,0 0,110.9548 -18.4924,0 0,-110.9548 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path176"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1070.4242,4739.7407 18.4925,0 0,-110.9548 36.9849,0 0,110.9548 18.486,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path178"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 700.575,4739.7407 18.49246,0 0,-110.9548 36.98492,0 0,110.9548 18.49247,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path180"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 809.886,4739.7407 3.28754,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path182"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 809.886,4739.7407 3.28754,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path184"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 774.54485,4684.2698 18.49246,0 0,110.9548 -18.49246,0 0,-110.9548 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path186"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 793.03731,4739.7407 18.49246,0 18.49246,73.9698 18.49246,-36.9849 18.49246,92.4688 18.49247,-55.4839 18.49246,18.499 18.49246,-36.9849 18.49246,55.4708 18.49246,-73.9698 18.49246,55.4839 18.49247,-73.9699 18.49241,110.9548 18.4925,-92.4688 18.4925,55.4839 18.4924,-55.4839 0,-36.9849" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path188"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1162.8865,4739.7407 18.486,0 0,92.4688 18.499,-18.499 18.4859,36.9849 18.499,-36.9849 18.4859,36.9849 18.499,-55.4708 18.4859,55.4708 18.499,-18.4859 18.486,55.4708 18.499,-55.4708 18.4859,18.4859 18.499,36.9849 18.4859,-73.9698 18.499,36.9849 18.4859,-55.4708 0,-55.4839 18.499,0 0,-110.9548 36.985,0 0,110.9548 18.4859,0 0,55.4839 18.499,36.9849 18.4859,-36.9849 18.499,55.4708 18.4859,-18.4859 18.499,55.4708 18.486,-18.4859 0,-129.4537 18.4989,0 0,-110.9548 18.486,0 0,110.9548 166.4387,0 0,-110.9548 18.4859,0 0,110.9548 166.4387,0 0,-110.9548 18.4859,0 0,110.9548 166.4387,0 0,-110.9548 18.4859,0 0,110.9548 166.4387,0 0,-110.9548 18.4859,0 0,110.9548 166.4387,0 0,-110.9548 147.9397,0 0,110.9548 36.9849,0 0,-110.9548 147.9397,0 0,110.9548 36.985,0 0,-110.9548 147.9397,0 0,110.9548 36.9849,0 0,-110.9548 147.9397,0 0,110.9548 36.9849,0 0,-110.9548 147.9397,0 0,110.9548 36.9849,0 0,-110.9548 18.4859,0 0,110.9548 166.4387,0 0,-110.9548 18.486,0 0,110.9548 166.4386,0 0,-110.9548 18.486,0 0,110.9548 166.4387,0 0,-110.9548 18.4859,0 0,110.9548 166.4387,0 0,-110.9548 18.4859,0 0,110.9548 166.4387,0 0,-110.9548 36.9849,0 0,110.9548 332.8643,0 0,-110.9548 36.9849,0 0,110.9548 18.486,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path190"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 700.575,3926.0723 18.49246,0 0,-110.9547 36.98492,0 0,110.9547 18.49247,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path192"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 774.54485,3870.6015 18.49246,0 0,110.9547 -18.49246,0 0,-110.9547 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path194"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 793.03731,3926.0723 18.49246,0 0,92.4689 18.49246,-36.985 18.49246,73.9699 18.49246,-73.9699 18.49247,73.9699 18.49246,-36.9849 18.49246,18.4859 18.49246,-73.9698 18.49246,55.4839 18.49246,-18.499 18.49247,36.9849 18.49241,-73.9698 18.4925,92.4688 18.4925,-92.4688 18.4924,55.4839 0,-92.4689" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path196"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1070.4242,3926.0723 18.4925,0 0,-110.9547 36.9849,0 0,110.9547 18.486,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path198"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1144.3876,3870.6015 18.4924,0 0,110.9547 -18.4924,0 0,-110.9547 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path200"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 1162.8865,3926.0723 18.486,0 0,55.4839 18.499,92.4558 18.4859,-55.4708 36.9849,36.9849 18.499,-55.4839 18.4859,18.499 18.499,-36.985 18.486,55.4709 18.499,-18.4859 18.4859,-36.985 18.499,18.486 18.4859,36.9849 18.499,-36.9849 18.4859,36.9849 0,-110.9548 18.499,0 0,-110.9547 18.486,0 0,110.9547 166.4386,0 0,-110.9547 18.486,0 0,110.9547 166.4387,0 0,-110.9547 18.4859,0 0,110.9547 166.4387,0 0,-110.9547 18.4859,0 0,110.9547 166.4387,0 0,-110.9547 18.4859,0 0,110.9547 166.4387,0 0,-110.9547 147.9397,0 0,110.9547 36.9849,0 0,-110.9547 147.9397,0 0,110.9547 36.9849,0 0,-110.9547 147.9397,0 0,110.9547 36.985,0 0,-110.9547 147.9397,0 0,110.9547 36.9849,0 0,-110.9547 147.9397,0 0,110.9547 36.9849,0 0,-110.9547 18.4859,0 0,110.9547 166.4387,0 0,-110.9547 18.4859,0 0,110.9547 166.4387,0 0,-110.9547 18.486,0 0,110.9547 166.4386,0 0,-110.9547 18.486,0 0,110.9547 166.4387,0 0,-110.9547 18.4859,0 0,110.9547 351.3633,0 0,-110.9547 36.9849,0 0,110.9547 18.486,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path202"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5453.1376,4795.2246 -36.9849,-110.9548" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path204"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5434.6387,4739.7407 92.4688,0 0,-110.9548 36.9849,0 0,110.9548 18.486,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path206"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5582.5784,4684.2698 18.4924,0 0,110.9548 -18.4924,0 0,-110.9548 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path208"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5601.0773,4739.7407 295.8794,0 0,-110.9548 36.9849,0 0,110.9548 18.486,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path210"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5952.4276,4684.2698 18.4924,0 0,110.9548 -18.4924,0 0,-110.9548 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path212"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5970.9266,4739.7407 129.4407,0 0,147.9396 18.499,-36.9849 18.4859,36.9849 18.499,-36.9849 18.4859,18.499 18.499,-36.9849 18.4859,36.9849 18.499,-36.9849 18.486,-18.499 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path214"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4842.8799,4684.2698 18.4924,0 0,110.9548 -18.4924,0 0,-110.9548 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path216"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4861.3789,4739.7407 295.8794,0 0,-110.9548 36.9849,0 0,110.9548 18.4859,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path218"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5212.7291,4684.2698 18.4925,0 0,110.9548 -18.4925,0 0,-110.9548 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path220"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5231.2281,4739.7407 166.4256,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path222"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5416.1527,4795.2246 -36.9849,-110.9548" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path224"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4473.0307,3870.6015 18.4924,0 0,110.9547 -18.4924,0 0,-110.9547 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path226"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4491.5296,3926.0723 295.8794,0 0,-110.9547 36.9849,0 0,110.9547 18.486,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path228"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4842.8799,3870.6015 18.4924,0 0,110.9547 -18.4924,0 0,-110.9547 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path230"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 4861.3789,3926.0723 295.8794,0 0,-110.9547 36.9849,0 0,110.9547 18.4859,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path232"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5212.7291,3870.6015 18.4925,0 0,110.9547 -18.4925,0 0,-110.9547 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path234"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5416.1527,3981.5562 -36.9849,-110.9547" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path236"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5231.2281,3926.0723 166.4256,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path238"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5453.1376,3981.5562 -36.9849,-110.9547" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path240"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5434.6387,3926.0723 92.4688,0 0,-110.9547 36.9849,0 0,110.9547 18.486,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path242"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5582.5784,3870.6015 18.4924,0 0,110.9547 -18.4924,0 0,-110.9547 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path244"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5601.0773,3926.0723 295.8794,0 0,-110.9547 36.9849,0 0,110.9547 18.486,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path246"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5952.4276,3870.6015 18.4924,0 0,110.9547 -18.4924,0 0,-110.9547 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path248"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 5970.9266,3926.0723 18.4859,0 0,73.9699 18.499,36.9849 18.4859,-36.9849 18.499,36.9849 18.486,-18.4859 18.4989,0 18.486,-36.985 18.499,55.4709 18.4859,-18.4859 0,36.9849 18.499,-18.499 18.4859,18.499 18.499,-36.9849 18.4859,18.4859 18.499,-55.4709 18.486,18.486 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path250"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6248.307,4739.7407 18.499,0 0,-110.9548 36.9849,0 0,110.9548 18.4859,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path252"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6248.307,3926.0723 18.499,0 0,-110.9547 36.9849,0 0,110.9547 18.4859,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path254"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6322.2768,3870.6015 18.4925,0 0,110.9547 -18.4925,0 0,-110.9547 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path256"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6322.2768,4684.2698 18.4925,0 0,110.9548 -18.4925,0 0,-110.9548 z" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path258"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6340.7758,4739.7407 18.4859,0 0,55.4839 18.499,55.4708 18.486,-92.4558 18.4989,55.4709 18.486,0 18.499,55.4839 18.4859,-73.9698 18.499,36.9849 18.4859,-36.9849 36.985,73.9698 18.4989,-36.9849 18.486,36.9849 18.499,-55.4839 18.4859,36.9849 0,-110.9547 18.499,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path260"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6340.7758,3926.0723 18.4859,0 0,129.4538 18.499,-18.499 18.486,18.499 18.4989,-36.9849 18.486,18.4859 18.499,-36.9849 18.4859,18.499 18.499,-18.499 18.4859,55.4839 18.499,-18.499 18.486,36.9849 18.4989,-73.9698 18.486,55.4839 18.499,-55.4839 18.4859,36.9849 0,-110.9548 18.499,0" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path262"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6636.6552,4184.9668 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path264"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6636.6552,4295.9216 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path266"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6266.806,4998.6351 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path268"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6266.806,5109.5899 0,-73.9699" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path270"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6636.6552,4998.6351 0,-73.9698" /&gt;&lt;path</div><div class='add'>+       inkscape:connector-curvature="0"</div><div class='add'>+       id="path272"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:3.08207679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       d="m 6636.6552,5109.5899 0,-73.9699" /&gt;&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text276"</div><div class='add'>+       x="3550.4165"</div><div class='add'>+       y="-4462.3472"&gt;&lt;tspan</div><div class='add'>+         x="3550.4165 3591.5437 3628.5286 3649.0923 3669.656 3690.2195 3706.6409 3747.7681 3764.1895"</div><div class='add'>+         y="-4462.3472"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan278"&gt;1st field&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="2732.6792 3823.7344 4193.5835 4581.9253 4951.7744 5321.6235 3472.3777 3102.5283 2321.7029 2362.8303 2403.9575 1951.8538 1992.981 2034.1083 1582.0045 1623.132 1664.259 5670.9062 5712.0337"</div><div class='add'>+         y="-4943.1509"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan280"&gt;1456783231231131022&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="2732.6726 3823.7278 4193.5771 4581.9189 4951.7681 5321.6172 3472.3711 3102.522 2321.6965 2362.8237 2403.9509 1951.8473 1992.9745 2034.1018 1581.998 1623.1254 1664.2524 5670.8999 5712.0269"</div><div class='add'>+         y="-5054.1064"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan282"&gt;1456783262562462322&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="842.29962 883.42694 924.55408"</div><div class='add'>+         y="-4943.1509"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan284"&gt;308&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="842.29962 883.42694 924.55408"</div><div class='add'>+         y="-5054.1064"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan286"&gt;621&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="1212.1489 1253.276 1294.4033"</div><div class='add'>+         y="-4943.1509"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan288"&gt;309&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="1212.1489 1253.276 1294.4033"</div><div class='add'>+         y="-5054.1064"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan290"&gt;622&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="3538.0635 3579.1907 3620.3179 3661.4451 3682.0088 3702.5723 3718.9937 3760.1208 3776.5422"</div><div class='add'>+         y="-3648.6792"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan292"&gt;2nd field&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:61.64153671px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text294"</div><div class='add'>+       x="2734.751"</div><div class='add'>+       y="-4037.021"&gt;&lt;tspan</div><div class='add'>+         x="2734.751 2755.2776 2789.5503"</div><div class='add'>+         y="-4037.021"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan296"&gt;(1)&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text298"</div><div class='add'>+       x="4951.772"</div><div class='add'>+       y="-4129.4834"&gt;&lt;tspan</div><div class='add'>+         x="4951.772 4581.9229 4212.0737 3842.2244 3490.8677 3102.5259 2321.7004 2362.8276 2403.9551 1951.8512 1992.9785 2034.1057 1582.0022 1623.1293 1664.2563"</div><div class='add'>+         y="-4129.4834"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan300"&gt;765432313312311&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="6020.1929 6061.3198 6102.4473 5650.3433 5691.4707 5732.5981 5280.4941 5321.6216 5362.7485 4910.645 4951.7725 4992.8994 4540.7959 4581.9229 4623.0503 4170.9468 4212.0737 4253.2012 3801.0974 3842.2246 3883.3518 3449.7405 3490.8677 3531.9951 3061.3989 3102.5261 3143.6533 2691.5496 2732.677 2773.8042 2321.7004 2362.8276 2403.9551 1951.8512 1992.9785 2034.1057 1582.0022 1623.1293 1664.2563"</div><div class='add'>+         y="-4240.4385"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan302"&gt;336335321320319318317316315314313312311&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="2732.6765 5321.6211 5670.9062 5712.0337 6040.7554 6081.8828 842.30634 883.43323 924.56055"</div><div class='add'>+         y="-4129.4834"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan304"&gt;182223309&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="842.30634 883.43323 924.56055"</div><div class='add'>+         y="-4240.4385"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan306"&gt;309&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="1212.1553 1253.2826 1294.4099"</div><div class='add'>+         y="-4129.4834"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan308"&gt;310&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="1212.1553 1253.2826 1294.4099"</div><div class='add'>+         y="-4240.4385"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan310"&gt;310&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="6410.605 6451.7319"</div><div class='add'>+         y="-4129.4834"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan312"&gt;24&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="6390.041 6431.1685 6472.2954"</div><div class='add'>+         y="-4240.4385"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan314"&gt;337&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="6040.7559 6081.8833"</div><div class='add'>+         y="-4943.1504"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan316"&gt;23&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="6040.7559 6081.8833"</div><div class='add'>+         y="-5054.106"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan318"&gt;23&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="6410.605 6451.7324"</div><div class='add'>+         y="-4943.1504"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan320"&gt;24&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         x="6410.605 6451.7324"</div><div class='add'>+         y="-5054.106"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan322"&gt;24&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text3671"</div><div class='add'>+       x="3550.4165 3591.5437 3628.5286 3649.0923 3669.656 3690.2195 3706.6409 3747.7681 3764.1895"</div><div class='add'>+       y="-4462.3472"&gt;&lt;tspan</div><div class='add'>+         x="3550.4165 3591.5437 3628.5286 3649.0923 3669.656 3690.2195 3706.6409 3747.7681 3764.1895"</div><div class='add'>+         y="-4462.3472"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3673"&gt;1st field&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text3675"</div><div class='add'>+       x="2732.6792 3823.7344 4193.5835 4581.9253 4951.7744 5321.6235 3472.3777 3102.5283 2321.7029 2362.8303 2403.9575 1951.8538 1992.981 2034.1083 1582.0045 1623.132 1664.259 5670.9062 5712.0337"</div><div class='add'>+       y="-4943.1509"&gt;&lt;tspan</div><div class='add'>+         x="2732.6792 3823.7344 4193.5835 4581.9253 4951.7744 5321.6235 3472.3777 3102.5283 2321.7029 2362.8303 2403.9575 1951.8538 1992.981 2034.1083 1582.0045 1623.132 1664.259 5670.9062 5712.0337"</div><div class='add'>+         y="-4943.1509"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3677"&gt;1456783231231131022&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text3679"</div><div class='add'>+       x="2732.6726 3823.7278 4193.5771 4581.9189 4951.7681 5321.6172 3472.3711 3102.522 2321.6965 2362.8237 2403.9509 1951.8473 1992.9745 2034.1018 1581.998 1623.1254 1664.2524 5670.8999 5712.0269"</div><div class='add'>+       y="-5054.1064"&gt;&lt;tspan</div><div class='add'>+         x="2732.6726 3823.7278 4193.5771 4581.9189 4951.7681 5321.6172 3472.3711 3102.522 2321.6965 2362.8237 2403.9509 1951.8473 1992.9745 2034.1018 1581.998 1623.1254 1664.2524 5670.8999 5712.0269"</div><div class='add'>+         y="-5054.1064"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3681"&gt;1456783262562462322&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text3683"</div><div class='add'>+       x="842.29962 883.42694 924.55408"</div><div class='add'>+       y="-4943.1509"&gt;&lt;tspan</div><div class='add'>+         x="842.29962 883.42694 924.55408"</div><div class='add'>+         y="-4943.1509"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3685"&gt;308&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text3687"</div><div class='add'>+       x="842.29962 883.42694 924.55408"</div><div class='add'>+       y="-5054.1064"&gt;&lt;tspan</div><div class='add'>+         x="842.29962 883.42694 924.55408"</div><div class='add'>+         y="-5054.1064"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3689"&gt;621&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text3691"</div><div class='add'>+       x="1212.1489 1253.276 1294.4033"</div><div class='add'>+       y="-4943.1509"&gt;&lt;tspan</div><div class='add'>+         x="1212.1489 1253.276 1294.4033"</div><div class='add'>+         y="-4943.1509"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3693"&gt;309&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text3695"</div><div class='add'>+       x="1212.1489 1253.276 1294.4033"</div><div class='add'>+       y="-5054.1064"&gt;&lt;tspan</div><div class='add'>+         x="1212.1489 1253.276 1294.4033"</div><div class='add'>+         y="-5054.1064"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3697"&gt;622&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text3699"</div><div class='add'>+       x="3538.0635 3579.1907 3620.3179 3661.4451 3682.0088 3702.5723 3718.9937 3760.1208 3776.5422"</div><div class='add'>+       y="-3648.6792"&gt;&lt;tspan</div><div class='add'>+         x="3538.0635 3579.1907 3620.3179 3661.4451 3682.0088 3702.5723 3718.9937 3760.1208 3776.5422"</div><div class='add'>+         y="-3648.6792"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan3701"&gt;2nd field&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4083"</div><div class='add'>+       x="4951.772 4581.9229 4212.0737 3842.2244 3490.8677 3102.5259 2321.7004 2362.8276 2403.9551 1951.8512 1992.9785 2034.1057 1582.0022 1623.1293 1664.2563"</div><div class='add'>+       y="-4129.4834"&gt;&lt;tspan</div><div class='add'>+         x="4951.772 4581.9229 4212.0737 3842.2244 3490.8677 3102.5259 2321.7004 2362.8276 2403.9551 1951.8512 1992.9785 2034.1057 1582.0022 1623.1293 1664.2563"</div><div class='add'>+         y="-4129.4834"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4085"&gt;765432313312311&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4087"</div><div class='add'>+       x="6020.1929 6061.3198 6102.4473 5650.3433 5691.4707 5732.5981 5280.4941 5321.6216 5362.7485 4910.645 4951.7725 4992.8994 4540.7959 4581.9229 4623.0503 4170.9468 4212.0737 4253.2012 3801.0974 3842.2246 3883.3518 3449.7405 3490.8677 3531.9951 3061.3989 3102.5261 3143.6533 2691.5496 2732.677 2773.8042 2321.7004 2362.8276 2403.9551 1951.8512 1992.9785 2034.1057 1582.0022 1623.1293 1664.2563"</div><div class='add'>+       y="-4240.4385"&gt;&lt;tspan</div><div class='add'>+         x="6020.1929 6061.3198 6102.4473 5650.3433 5691.4707 5732.5981 5280.4941 5321.6216 5362.7485 4910.645 4951.7725 4992.8994 4540.7959 4581.9229 4623.0503 4170.9468 4212.0737 4253.2012 3801.0974 3842.2246 3883.3518 3449.7405 3490.8677 3531.9951 3061.3989 3102.5261 3143.6533 2691.5496 2732.677 2773.8042 2321.7004 2362.8276 2403.9551 1951.8512 1992.9785 2034.1057 1582.0022 1623.1293 1664.2563"</div><div class='add'>+         y="-4240.4385"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4089"&gt;336335321320319318317316315314313312311&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4091"</div><div class='add'>+       x="2732.6765 5321.6211 5670.9062 5712.0337 6040.7554 6081.8828 842.30634 883.43323 924.56055"</div><div class='add'>+       y="-4129.4834"&gt;&lt;tspan</div><div class='add'>+         x="2732.6765 5321.6211 5670.9062 5712.0337 6040.7554 6081.8828 842.30634 883.43323 924.56055"</div><div class='add'>+         y="-4129.4834"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4093"&gt;182223309&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4095"</div><div class='add'>+       x="842.30634 883.43323 924.56055"</div><div class='add'>+       y="-4240.4385"&gt;&lt;tspan</div><div class='add'>+         x="842.30634 883.43323 924.56055"</div><div class='add'>+         y="-4240.4385"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4097"&gt;309&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4099"</div><div class='add'>+       x="1212.1553 1253.2826 1294.4099"</div><div class='add'>+       y="-4129.4834"&gt;&lt;tspan</div><div class='add'>+         x="1212.1553 1253.2826 1294.4099"</div><div class='add'>+         y="-4129.4834"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4101"&gt;310&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4103"</div><div class='add'>+       x="1212.1553 1253.2826 1294.4099"</div><div class='add'>+       y="-4240.4385"&gt;&lt;tspan</div><div class='add'>+         x="1212.1553 1253.2826 1294.4099"</div><div class='add'>+         y="-4240.4385"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4105"&gt;310&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4107"</div><div class='add'>+       x="6410.605 6451.7319"</div><div class='add'>+       y="-4129.4834"&gt;&lt;tspan</div><div class='add'>+         x="6410.605 6451.7319"</div><div class='add'>+         y="-4129.4834"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4109"&gt;24&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4111"</div><div class='add'>+       x="6390.041 6431.1685 6472.2954"</div><div class='add'>+       y="-4240.4385"&gt;&lt;tspan</div><div class='add'>+         x="6390.041 6431.1685 6472.2954"</div><div class='add'>+         y="-4240.4385"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4113"&gt;337&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4115"</div><div class='add'>+       x="6040.7559 6081.8833"</div><div class='add'>+       y="-4943.1504"&gt;&lt;tspan</div><div class='add'>+         x="6040.7559 6081.8833"</div><div class='add'>+         y="-4943.1504"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4117"&gt;23&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4119"</div><div class='add'>+       x="6040.7559 6081.8833"</div><div class='add'>+       y="-5054.106"&gt;&lt;tspan</div><div class='add'>+         x="6040.7559 6081.8833"</div><div class='add'>+         y="-5054.106"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4121"&gt;23&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4123"</div><div class='add'>+       x="6410.605 6451.7324"</div><div class='add'>+       y="-4943.1504"&gt;&lt;tspan</div><div class='add'>+         x="6410.605 6451.7324"</div><div class='add'>+         y="-4943.1504"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4125"&gt;24&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       id="text4127"</div><div class='add'>+       x="6410.605 6451.7324"</div><div class='add'>+       y="-5054.106"&gt;&lt;tspan</div><div class='add'>+         x="6410.605 6451.7324"</div><div class='add'>+         y="-5054.106"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         id="tspan4129"&gt;24&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/svg&gt;
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/vbi_hsync.svg b/Documentation/media/uapi/v4l/vbi_hsync.svg<br/>new file mode 100644<br/>index 000000000000..4d5c0b4f146e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/vbi_hsync.svg?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vbi_hsync.svg</a></div><div class='hunk'>@@ -0,0 +1,313 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;</div><div class='add'>+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;</div><div class='add'>+</div><div class='add'>+&lt;svg</div><div class='add'>+   xmlns:dc="http://purl.org/dc/elements/1.1/"</div><div class='add'>+   xmlns:cc="http://creativecommons.org/ns#"</div><div class='add'>+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"</div><div class='add'>+   xmlns:svg="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns="http://www.w3.org/2000/svg"</div><div class='add'>+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"</div><div class='add'>+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"</div><div class='add'>+   id="svg2"</div><div class='add'>+   version="1.1"</div><div class='add'>+   inkscape:version="0.91 r13725"</div><div class='add'>+   xml:space="preserve"</div><div class='add'>+   width="192.39857mm"</div><div class='add'>+   height="146.83536mm"</div><div class='add'>+   viewBox="0 0 681.72724 520.28277"</div><div class='add'>+   sodipodi:docname="vbi_hsync.svg"&gt;&lt;sodipodi:namedview</div><div class='add'>+     pagecolor="#ffffff"</div><div class='add'>+     bordercolor="#666666"</div><div class='add'>+     borderopacity="1"</div><div class='add'>+     objecttolerance="10"</div><div class='add'>+     gridtolerance="10"</div><div class='add'>+     guidetolerance="10"</div><div class='add'>+     inkscape:pageopacity="0"</div><div class='add'>+     inkscape:pageshadow="2"</div><div class='add'>+     inkscape:window-width="1920"</div><div class='add'>+     inkscape:window-height="997"</div><div class='add'>+     id="namedview4"</div><div class='add'>+     showgrid="false"</div><div class='add'>+     inkscape:zoom="1.5350601"</div><div class='add'>+     inkscape:cx="131.95463"</div><div class='add'>+     inkscape:cy="428.88132"</div><div class='add'>+     inkscape:window-x="1920"</div><div class='add'>+     inkscape:window-y="30"</div><div class='add'>+     inkscape:window-maximized="1"</div><div class='add'>+     inkscape:current-layer="g10"</div><div class='add'>+     units="mm"</div><div class='add'>+     fit-margin-top="0"</div><div class='add'>+     fit-margin-left="0"</div><div class='add'>+     fit-margin-right="0"</div><div class='add'>+     fit-margin-bottom="0" /&gt;&lt;metadata</div><div class='add'>+     id="metadata8"&gt;&lt;rdf:RDF&gt;&lt;cc:Work</div><div class='add'>+         rdf:about=""&gt;&lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;&lt;dc:type</div><div class='add'>+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;&lt;dc:title /&gt;&lt;/cc:Work&gt;&lt;/rdf:RDF&gt;&lt;/metadata&gt;&lt;defs</div><div class='add'>+     id="defs6"&gt;&lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath30"&gt;&lt;path</div><div class='add'>+         d="m 0,0 0,1163 1544,0 L 1544,0 0,0 Z m 187.184,836.05 0,-19.278 48.517,0 -38.556,9.639 38.556,9.639 -48.517,0 z m 689.189,-19.278 0,19.278 -48.516,0 38.556,-9.639 -38.556,-9.639 48.516,0 z"</div><div class='add'>+         id="path32"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="clip-rule:evenodd" /&gt;&lt;/clipPath&gt;&lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath52"&gt;&lt;path</div><div class='add'>+         d="m 0,0 0,1163 1544,0 L 1544,0 0,0 Z m 804.08,79.3887 0,19.2778 -48.516,0 38.556,-9.6389 -38.556,-9.6389 48.516,0 z m -703.647,19.2778 0,-19.2778 48.517,0 -38.556,9.6389 38.556,9.6389 -48.517,0 z"</div><div class='add'>+         id="path54"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="clip-rule:evenodd" /&gt;&lt;/clipPath&gt;&lt;clipPath</div><div class='add'>+       clipPathUnits="userSpaceOnUse"</div><div class='add'>+       id="clipPath94"&gt;&lt;path</div><div class='add'>+         d="m 0,0 0,1163 1544,0 L 1544,0 0,0 Z m 471.535,195.057 0,19.278 -48.516,0 38.555,-9.639 -38.555,-9.639 48.516,0 z m -284.351,19.278 0,-19.278 48.517,0 -38.556,9.639 38.556,9.639 -48.517,0 z"</div><div class='add'>+         id="path96"</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         style="clip-rule:evenodd" /&gt;&lt;/clipPath&gt;&lt;/defs&gt;&lt;g</div><div class='add'>+     id="g10"</div><div class='add'>+     inkscape:groupmode="layer"</div><div class='add'>+     inkscape:label="vbi_hsync"</div><div class='add'>+     transform="matrix(1.25,0,0,-1.25,-0.3625824,520.79867)"&gt;&lt;g</div><div class='add'>+       id="g14"</div><div class='add'>+       transform="matrix(0.36030235,0,0,0.36030235,-0.75498483,-1.0743684)"</div><div class='add'>+       style=""&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path16"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.40974998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="M 32.9604,580.617 4.04346,493.866" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path18"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.40974998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 192.004,855.328 0,-665.091" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path20"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.40974998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 466.715,392.656 0,-202.419" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path22"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.40974998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 799.261,508.324 0,-433.7549" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path24"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:4.81949997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 857.095,537.241 231.335,0" /&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       id="g26"</div><div class='add'>+       transform="matrix(0.36030235,0,0,0.36030235,-0.75498483,-1.0743684)"</div><div class='add'>+       style=""&gt;&lt;g</div><div class='add'>+         clip-path="url(#clipPath30)"</div><div class='add'>+         id="g28"</div><div class='add'>+         style=""&gt;&lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           id="path34"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:2.40974998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           d="m 871.553,826.411 -679.549,0" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       id="g36"</div><div class='add'>+       transform="matrix(0.36030235,0,0,0.36030235,-0.75498483,-1.0743684)"</div><div class='add'>+       style=""&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path38"</div><div class='add'>+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+         d="m 827.857,816.772 38.556,9.639 -38.556,9.639 0,-19.278" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path40"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.40974998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 827.857,816.772 38.556,9.639 -38.556,9.639 0,-19.278 z" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path42"</div><div class='add'>+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+         d="m 235.701,836.05 -38.556,-9.639 38.556,-9.639 0,19.278" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path44"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.40974998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 235.701,836.05 -38.556,-9.639 38.556,-9.639 0,19.278 z" /&gt;&lt;path</div><div class='add'>+         inkscape:connector-curvature="0"</div><div class='add'>+         id="path46"</div><div class='add'>+         style="fill:none;stroke:#000000;stroke-width:2.40974998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+         d="m 1073.97,493.866 28.92,86.751" /&gt;&lt;/g&gt;&lt;g</div><div class='add'>+       id="g48"</div><div class='add'>+       transform="matrix(0.36030235,0,0,0.36030235,-0.75498483,-1.0743684)"</div><div class='add'>+       style=""&gt;&lt;g</div><div class='add'>+         clip-path="url(#clipPath52)"</div><div class='add'>+         id="g50"</div><div class='add'>+         style=""&gt;&lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           id="path56"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:2.40974998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           d="m 105.253,89.0276 694.008,0" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;path</div><div class='add'>+       d="m 52.91205,34.475403 -13.891817,-3.472918 13.891817,-3.472918 0,6.945836"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path60"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 52.91205,34.475403 -13.891817,-3.472918 13.891817,-3.472918 0,6.945836 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path62"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 271.4765,27.529567 13.89182,3.472918 -13.89182,3.472918 0,-6.945836"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path64"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 271.4765,27.529567 13.89182,3.472918 -13.89182,3.472918 0,-6.945836 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path66"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 5.9113292,192.49483 31.2565888,0 0,-10.41887 26.046978,0 10.418863,-93.769765 88.560511,0 10.41887,93.769765 10.41886,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.73647714;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path68"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 162.19427,88.306195 260.47086,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path70"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 37.167918,182.07596 0,-156.282907"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path72"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 235.12632,182.07596 52.09431,0 0,10.41887 20.83773,0 10.41886,208.3769 83.35162,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.73647714;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path74"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 391.4089,192.49483 31.25623,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path76"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 401.82884,400.87173 20.83629,0"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path78"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 328.89608,192.49483 10.41887,208.3769"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path80"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 349.73381,192.49483 10.41886,208.3769"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path82"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 370.57262,192.49483 10.41634,208.3769"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path84"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 396.61887,385.24541 10.41995,31.25623"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path86"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 183.032,135.19126 52.09432,0 0,93.76977 -52.09432,0 0,-93.76977 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:1.73647714;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path88"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;g</div><div class='add'>+       id="g90"</div><div class='add'>+       transform="matrix(0.36030235,0,0,0.36030235,-0.75498483,-1.0743684)"</div><div class='add'>+       style=""&gt;&lt;g</div><div class='add'>+         clip-path="url(#clipPath94)"</div><div class='add'>+         id="g92"</div><div class='add'>+         style=""&gt;&lt;path</div><div class='add'>+           inkscape:connector-curvature="0"</div><div class='add'>+           id="path98"</div><div class='add'>+           style="fill:none;stroke:#000000;stroke-width:2.40974998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+           d="m 192.004,204.696 274.711,0" /&gt;&lt;/g&gt;&lt;/g&gt;&lt;path</div><div class='add'>+       d="m 84.168639,76.151036 -13.891817,-3.472955 13.891817,-3.472954 0,6.945909"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path102"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 84.168639,76.151036 -13.891817,-3.472955 13.891817,-3.472954 0,6.945909 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path104"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 151.65975,69.205127 13.89146,3.472954 -13.89146,3.472955 0,-6.945909"</div><div class='add'>+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"</div><div class='add'>+       id="path106"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;path</div><div class='add'>+       d="m 151.65975,69.205127 13.89146,3.472954 -13.89146,3.472955 0,-6.945909 z"</div><div class='add'>+       style="fill:none;stroke:#000000;stroke-width:0.86823857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"</div><div class='add'>+       id="path108"</div><div class='add'>+       inkscape:connector-curvature="0" /&gt;&lt;text</div><div class='add'>+       id="text112"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:20.83772659px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       x="438.29504"</div><div class='add'>+       y="-187.28558"&gt;&lt;tspan</div><div class='add'>+         id="tspan114"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-187.28558"</div><div class='add'>+         x="438.29504 452.19382 456.81979 468.40555 478.82443 489.24329 495.03619 506.62195 518.2077 528.62659 540.21234"&gt;Black Level&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan116"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-83.096947"</div><div class='add'>+         x="438.29504 452.19382 462.61267 474.19846 484.61731 490.41019 501.99597 513.58173 524.00061 535.58636"&gt;Sync Level&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan118"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-395.66284"</div><div class='add'>+         x="438.29504 457.96585 469.55164 474.17761 479.97049 491.55627 497.34915 508.93494 520.52069 530.93958 542.52533"&gt;White Level&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       id="text120"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:20.83772659px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       x="159.88258"</div><div class='add'>+       y="-270.63647"&gt;&lt;tspan</div><div class='add'>+         id="tspan122"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-270.63647"</div><div class='add'>+         x="159.88258 172.61443 179.55339 186.49236 198.07812 209.66391"&gt;offset&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       id="text124"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:20.83772659px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       x="46.973549"</div><div class='add'>+       y="-46.630745"&gt;&lt;tspan</div><div class='add'>+         id="tspan126"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-46.630745"</div><div class='add'>+         x="46.973549 58.559322 63.185299 74.771072 86.35685 92.149734 102.5686 112.98746 124.57324 134.9921 146.57788 153.51685 159.30972 165.10262 176.68839 188.27417 192.90015 203.319"&gt;Line synchr. pulse&lt;/tspan&gt;&lt;tspan</div><div class='add'>+         id="tspan128"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4.9552913"</div><div class='add'>+         x="100.80776 112.39354 117.01952 128.60529 140.19107 145.98395 157.56973 162.19569 173.78148 185.36726 195.78612 200.41209 211.99788"&gt;Line blanking&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       id="text3473"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:20.83772659px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       x="46.973549 58.559322 63.185299 74.771072 86.35685 92.149734 102.5686 112.98746 124.57324 134.9921 146.57788 153.51685 159.30972 165.10262 176.68839 188.27417 192.90015 203.319"</div><div class='add'>+       y="-46.630745"&gt;&lt;tspan</div><div class='add'>+         id="tspan3475"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-46.630745"</div><div class='add'>+         x="46.973549 58.559322 63.185299 74.771072 86.35685 92.149734 102.5686 112.98746 124.57324 134.9921 146.57788 153.51685 159.30972 165.10262 176.68839 188.27417 192.90015 203.319"&gt;Line synchr. pulse&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       id="text3477"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:20.83772659px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       x="100.80776 112.39354 117.01952 128.60529 140.19107 145.98395 157.56973 162.19569 173.78148 185.36726 195.78612 200.41209 211.99788"</div><div class='add'>+       y="-4.9552913"&gt;&lt;tspan</div><div class='add'>+         id="tspan3479"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-4.9552913"</div><div class='add'>+         x="100.80776 112.39354 117.01952 128.60529 140.19107 145.98395 157.56973 162.19569 173.78148 185.36726 195.78612 200.41209 211.99788"&gt;Line blanking&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       id="text3607"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:20.83772659px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       x="438.29504 452.19382 456.81979 468.40555 478.82443 489.24329 495.03619 506.62195 518.2077 528.62659 540.21234"</div><div class='add'>+       y="-187.28558"&gt;&lt;tspan</div><div class='add'>+         id="tspan3609"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-187.28558"</div><div class='add'>+         x="438.29504 452.19382 456.81979 468.40555 478.82443 489.24329 495.03619 506.62195 518.2077 528.62659 540.21234"&gt;Black Level&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       id="text3611"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:20.83772659px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       x="438.29504 452.19382 462.61267 474.19846 484.61731 490.41019 501.99597 513.58173 524.00061 535.58636"</div><div class='add'>+       y="-83.096947"&gt;&lt;tspan</div><div class='add'>+         id="tspan3613"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-83.096947"</div><div class='add'>+         x="438.29504 452.19382 462.61267 474.19846 484.61731 490.41019 501.99597 513.58173 524.00061 535.58636"&gt;Sync Level&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;text</div><div class='add'>+       id="text3615"</div><div class='add'>+       style="font-variant:normal;font-weight:normal;font-size:20.83772659px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;"</div><div class='add'>+       transform="scale(1,-1)"</div><div class='add'>+       x="438.29504 457.96585 469.55164 474.17761 479.97049 491.55627 497.34915 508.93494 520.52069 530.93958 542.52533"</div><div class='add'>+       y="-395.66284"&gt;&lt;tspan</div><div class='add'>+         id="tspan3617"</div><div class='add'>+         sodipodi:role="line"</div><div class='add'>+         y="-395.66284"</div><div class='add'>+         x="438.29504 457.96585 469.55164 474.17761 479.97049 491.55627 497.34915 508.93494 520.52069 530.93958 542.52533"&gt;White Level&lt;/tspan&gt;&lt;/text&gt;</div><div class='add'>+&lt;/g&gt;&lt;/svg&gt;
\ No newline at end of file</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst<br/>index 7dd943ff14cd..aea276502f5e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst</a></div><div class='hunk'>@@ -270,3 +270,14 @@ EBUSY</div><div class='ctx'>       - Some formats like SMPTE-125M have an interlaced signal with a odd</div><div class='ctx'> 	total height. For these formats, if this flag is set, the first</div><div class='ctx'> 	field has the extra line. Else, it is the second field.</div><div class='add'>+    * - ``V4L2_DV_FL_HAS_PICTURE_ASPECT``</div><div class='add'>+      - If set, then the picture_aspect field is valid. Otherwise assume that</div><div class='add'>+        the pixels are square, so the picture aspect ratio is the same as the</div><div class='add'>+	width to height ratio.</div><div class='add'>+    * - ``V4L2_DV_FL_HAS_CEA861_VIC``</div><div class='add'>+      - If set, then the cea861_vic field is valid and contains the Video</div><div class='add'>+        Identification Code as per the CEA-861 standard.</div><div class='add'>+    * - ``V4L2_DV_FL_HAS_HDMI_VIC``</div><div class='add'>+      - If set, then the hdmi_vic field is valid and contains the Video</div><div class='add'>+        Identification Code as per the HDMI standard (HDMI Vendor Specific</div><div class='add'>+	InfoFrame).</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/vidioc-g-selection.rst b/Documentation/media/uapi/v4l/vidioc-g-selection.rst<br/>index 3145a9166bad..deb1f6fb473b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/vidioc-g-selection.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/vidioc-g-selection.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/vidioc-g-selection.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vidioc-g-selection.rst</a></div><div class='hunk'>@@ -129,8 +129,8 @@ Selection targets and flags are documented in</div><div class='ctx'> </div><div class='ctx'> .. _sel-const-adjust:</div><div class='ctx'> </div><div class='del'>-.. figure::  vidioc-g-selection_files/constraints.*</div><div class='del'>-    :alt:    constraints.png</div><div class='add'>+.. figure::  constraints.*</div><div class='add'>+    :alt:    constraints.pdf / constraints.svg</div><div class='ctx'>     :align:  center</div><div class='ctx'> </div><div class='ctx'>     Size adjustments with constraint flags.</div><div class='head'>diff --git a/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png b/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png<br/>deleted file mode 100644<br/>index 20228d2c5504..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst<br/>index e8aa8cd7065f..57c79fa43866 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/vidioc-g-tuner.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/uapi/v4l/vidioc-g-tuner.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/uapi/v4l/vidioc-g-tuner.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/uapi/v4l/vidioc-g-tuner.rst</a></div><div class='hunk'>@@ -201,10 +201,10 @@ To change the radio frequency the</div><div class='ctx'>     * - ``V4L2_TUNER_SDR``</div><div class='ctx'>       - 4</div><div class='ctx'>       - Tuner controls the A/D and/or D/A block of a</div><div class='del'>-	Sofware Digital Radio (SDR)</div><div class='add'>+	Software Digital Radio (SDR)</div><div class='ctx'>     * - ``V4L2_TUNER_RF``</div><div class='ctx'>       - 5</div><div class='del'>-      - Tuner controls the RF part of a Sofware Digital Radio (SDR)</div><div class='add'>+      - Tuner controls the RF part of a Software Digital Radio (SDR)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/au0828-cardlist.rst b/Documentation/media/v4l-drivers/au0828-cardlist.rst<br/>index aed51b4ffb46..82d2567bc7c1 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/au0828-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/au0828-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/au0828-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/au0828-cardlist.rst</a></div><div class='hunk'>@@ -1,11 +1,13 @@</div><div class='ctx'> AU0828 cards list</div><div class='ctx'> =================</div><div class='ctx'> </div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	  0 -&gt; Unknown board                            (au0828)</div><div class='del'>-	  1 -&gt; Hauppauge HVR950Q                        (au0828)        [2040:7200,2040:7210,2040:7217,2040:721b,2040:721e,2040:721f,2040:7280,0fd9:0008,2040:7260,2040:7213,2040:7270]</div><div class='del'>-	  2 -&gt; Hauppauge HVR850                         (au0828)        [2040:7240]</div><div class='del'>-	  3 -&gt; DViCO FusionHDTV USB                     (au0828)        [0fe9:d620]</div><div class='del'>-	  4 -&gt; Hauppauge HVR950Q rev xxF8               (au0828)        [2040:7201,2040:7211,2040:7281]</div><div class='del'>-	  5 -&gt; Hauppauge Woodbury                       (au0828)        [05e1:0480,2040:8200]</div><div class='add'>+=========== ========================== =======================================================================================================================</div><div class='add'>+Card number Card name                  USB IDs</div><div class='add'>+=========== ========================== =======================================================================================================================</div><div class='add'>+0           Unknown board</div><div class='add'>+1           Hauppauge HVR950Q          2040:7200, 2040:7210, 2040:7217, 2040:721b, 2040:721e, 2040:721f, 2040:7280, 0fd9:0008, 2040:7260, 2040:7213, 2040:7270</div><div class='add'>+2           Hauppauge HVR850           2040:7240</div><div class='add'>+3           DViCO FusionHDTV USB       0fe9:d620</div><div class='add'>+4           Hauppauge HVR950Q rev xxF8 2040:7201, 2040:7211, 2040:7281</div><div class='add'>+5           Hauppauge Woodbury         05e1:0480, 2040:8200</div><div class='add'>+=========== ========================== =======================================================================================================================</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/bttv-cardlist.rst b/Documentation/media/v4l-drivers/bttv-cardlist.rst<br/>index 97a966e7f9c4..28a01cd6cf2e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/bttv-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/bttv-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/bttv-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/bttv-cardlist.rst</a></div><div class='hunk'>@@ -1,172 +1,174 @@</div><div class='ctx'> BTTV cards list</div><div class='ctx'> ===============</div><div class='ctx'> </div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	  0 -&gt;  *** UNKNOWN/GENERIC ***</div><div class='del'>-	  1 -&gt; MIRO PCTV</div><div class='del'>-	  2 -&gt; Hauppauge (bt848)</div><div class='del'>-	  3 -&gt; STB, Gateway P/N 6000699 (bt848)</div><div class='del'>-	  4 -&gt; Intel Create and Share PCI/ Smart Video Recorder III</div><div class='del'>-	  5 -&gt; Diamond DTV2000</div><div class='del'>-	  6 -&gt; AVerMedia TVPhone</div><div class='del'>-	  7 -&gt; MATRIX-Vision MV-Delta</div><div class='del'>-	  8 -&gt; Lifeview FlyVideo II (Bt848) LR26 / MAXI TV Video PCI2 LR26</div><div class='del'>-	  9 -&gt; IMS/IXmicro TurboTV</div><div class='del'>-	 10 -&gt; Hauppauge (bt878)                                   [0070:13eb,0070:3900,2636:10b4]</div><div class='del'>-	 11 -&gt; MIRO PCTV pro</div><div class='del'>-	 12 -&gt; ADS Technologies Channel Surfer TV (bt848)</div><div class='del'>-	 13 -&gt; AVerMedia TVCapture 98                              [1461:0002,1461:0004,1461:0300]</div><div class='del'>-	 14 -&gt; Aimslab Video Highway Xtreme (VHX)</div><div class='del'>-	 15 -&gt; Zoltrix TV-Max                                      [a1a0:a0fc]</div><div class='del'>-	 16 -&gt; Prolink Pixelview PlayTV (bt878)</div><div class='del'>-	 17 -&gt; Leadtek WinView 601</div><div class='del'>-	 18 -&gt; AVEC Intercapture</div><div class='del'>-	 19 -&gt; Lifeview FlyVideo II EZ /FlyKit LR38 Bt848 (capture only)</div><div class='del'>-	 20 -&gt; CEI Raffles Card</div><div class='del'>-	 21 -&gt; Lifeview FlyVideo 98/ Lucky Star Image World ConferenceTV LR50</div><div class='del'>-	 22 -&gt; Askey CPH050/ Phoebe Tv Master + FM                 [14ff:3002]</div><div class='del'>-	 23 -&gt; Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV, bt878 [14c7:0101]</div><div class='del'>-	 24 -&gt; Askey CPH05X/06X (bt878) [many vendors]             [144f:3002,144f:3005,144f:5000,14ff:3000]</div><div class='del'>-	 25 -&gt; Terratec TerraTV+ Version 1.0 (Bt848)/ Terra TValue Version 1.0/ Vobis TV-Boostar</div><div class='del'>-	 26 -&gt; Hauppauge WinCam newer (bt878)</div><div class='del'>-	 27 -&gt; Lifeview FlyVideo 98/ MAXI TV Video PCI2 LR50</div><div class='del'>-	 28 -&gt; Terratec TerraTV+ Version 1.1 (bt878)               [153b:1127,1852:1852]</div><div class='del'>-	 29 -&gt; Imagenation PXC200                                  [1295:200a]</div><div class='del'>-	 30 -&gt; Lifeview FlyVideo 98 LR50                           [1f7f:1850]</div><div class='del'>-	 31 -&gt; Formac iProTV, Formac ProTV I (bt848)</div><div class='del'>-	 32 -&gt; Intel Create and Share PCI/ Smart Video Recorder III</div><div class='del'>-	 33 -&gt; Terratec TerraTValue Version Bt878                  [153b:1117,153b:1118,153b:1119,153b:111a,153b:1134,153b:5018]</div><div class='del'>-	 34 -&gt; Leadtek WinFast 2000/ WinFast 2000 XP               [107d:6606,107d:6609,6606:217d,f6ff:fff6]</div><div class='del'>-	 35 -&gt; Lifeview FlyVideo 98 LR50 / Chronos Video Shuttle II [1851:1850,1851:a050]</div><div class='del'>-	 36 -&gt; Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner [1852:1852]</div><div class='del'>-	 37 -&gt; Prolink PixelView PlayTV pro</div><div class='del'>-	 38 -&gt; Askey CPH06X TView99                                [144f:3000,144f:a005,a04f:a0fc]</div><div class='del'>-	 39 -&gt; Pinnacle PCTV Studio/Rave                           [11bd:0012,bd11:1200,bd11:ff00,11bd:ff12]</div><div class='del'>-	 40 -&gt; STB TV PCI FM, Gateway P/N 6000704 (bt878), 3Dfx VoodooTV 100 [10b4:2636,10b4:2645,121a:3060]</div><div class='del'>-	 41 -&gt; AVerMedia TVPhone 98                                [1461:0001,1461:0003]</div><div class='del'>-	 42 -&gt; ProVideo PV951                                      [aa0c:146c]</div><div class='del'>-	 43 -&gt; Little OnAir TV</div><div class='del'>-	 44 -&gt; Sigma TVII-FM</div><div class='del'>-	 45 -&gt; MATRIX-Vision MV-Delta 2</div><div class='del'>-	 46 -&gt; Zoltrix Genie TV/FM                                 [15b0:4000,15b0:400a,15b0:400d,15b0:4010,15b0:4016]</div><div class='del'>-	 47 -&gt; Terratec TV/Radio+                                  [153b:1123]</div><div class='del'>-	 48 -&gt; Askey CPH03x/ Dynalink Magic TView</div><div class='del'>-	 49 -&gt; IODATA GV-BCTV3/PCI                                 [10fc:4020]</div><div class='del'>-	 50 -&gt; Prolink PV-BT878P+4E / PixelView PlayTV PAK / Lenco MXTV-9578 CP</div><div class='del'>-	 51 -&gt; Eagle Wireless Capricorn2 (bt878A)</div><div class='del'>-	 52 -&gt; Pinnacle PCTV Studio Pro</div><div class='del'>-	 53 -&gt; Typhoon TView RDS + FM Stereo / KNC1 TV Station RDS</div><div class='del'>-	 54 -&gt; Lifeview FlyVideo 2000 /FlyVideo A2/ Lifetec LT 9415 TV [LR90]</div><div class='del'>-	 55 -&gt; Askey CPH031/ BESTBUY Easy TV</div><div class='del'>-	 56 -&gt; Lifeview FlyVideo 98FM LR50                         [a051:41a0]</div><div class='del'>-	 57 -&gt; GrandTec 'Grand Video Capture' (Bt848)              [4344:4142]</div><div class='del'>-	 58 -&gt; Askey CPH060/ Phoebe TV Master Only (No FM)</div><div class='del'>-	 59 -&gt; Askey CPH03x TV Capturer</div><div class='del'>-	 60 -&gt; Modular Technology MM100PCTV</div><div class='del'>-	 61 -&gt; AG Electronics GMV1                                 [15cb:0101]</div><div class='del'>-	 62 -&gt; Askey CPH061/ BESTBUY Easy TV (bt878)</div><div class='del'>-	 63 -&gt; ATI TV-Wonder                                       [1002:0001]</div><div class='del'>-	 64 -&gt; ATI TV-Wonder VE                                    [1002:0003]</div><div class='del'>-	 65 -&gt; Lifeview FlyVideo 2000S LR90</div><div class='del'>-	 66 -&gt; Terratec TValueRadio                                [153b:1135,153b:ff3b]</div><div class='del'>-	 67 -&gt; IODATA GV-BCTV4/PCI                                 [10fc:4050]</div><div class='del'>-	 68 -&gt; 3Dfx VoodooTV FM (Euro)                             [10b4:2637]</div><div class='del'>-	 69 -&gt; Active Imaging AIMMS</div><div class='del'>-	 70 -&gt; Prolink Pixelview PV-BT878P+ (Rev.4C,8E)</div><div class='del'>-	 71 -&gt; Lifeview FlyVideo 98EZ (capture only) LR51          [1851:1851]</div><div class='del'>-	 72 -&gt; Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM) [1554:4011]</div><div class='del'>-	 73 -&gt; Sensoray 311/611                                    [6000:0311,6000:0611]</div><div class='del'>-	 74 -&gt; RemoteVision MX (RV605)</div><div class='del'>-	 75 -&gt; Powercolor MTV878/ MTV878R/ MTV878F</div><div class='del'>-	 76 -&gt; Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP) [0e11:0079]</div><div class='del'>-	 77 -&gt; GrandTec Multi Capture Card (Bt878)</div><div class='del'>-	 78 -&gt; Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF   [0a01:17de]</div><div class='del'>-	 79 -&gt; DSP Design TCVIDEO</div><div class='del'>-	 80 -&gt; Hauppauge WinTV PVR                                 [0070:4500]</div><div class='del'>-	 81 -&gt; IODATA GV-BCTV5/PCI                                 [10fc:4070,10fc:d018]</div><div class='del'>-	 82 -&gt; Osprey 100/150 (878)                                [0070:ff00]</div><div class='del'>-	 83 -&gt; Osprey 100/150 (848)</div><div class='del'>-	 84 -&gt; Osprey 101 (848)</div><div class='del'>-	 85 -&gt; Osprey 101/151</div><div class='del'>-	 86 -&gt; Osprey 101/151 w/ svid</div><div class='del'>-	 87 -&gt; Osprey 200/201/250/251</div><div class='del'>-	 88 -&gt; Osprey 200/250                                      [0070:ff01]</div><div class='del'>-	 89 -&gt; Osprey 210/220/230</div><div class='del'>-	 90 -&gt; Osprey 500                                          [0070:ff02]</div><div class='del'>-	 91 -&gt; Osprey 540                                          [0070:ff04]</div><div class='del'>-	 92 -&gt; Osprey 2000                                         [0070:ff03]</div><div class='del'>-	 93 -&gt; IDS Eagle</div><div class='del'>-	 94 -&gt; Pinnacle PCTV Sat                                   [11bd:001c]</div><div class='del'>-	 95 -&gt; Formac ProTV II (bt878)</div><div class='del'>-	 96 -&gt; MachTV</div><div class='del'>-	 97 -&gt; Euresys Picolo</div><div class='del'>-	 98 -&gt; ProVideo PV150                                      [aa00:1460,aa01:1461,aa02:1462,aa03:1463,aa04:1464,aa05:1465,aa06:1466,aa07:1467]</div><div class='del'>-	 99 -&gt; AD-TVK503</div><div class='del'>-	100 -&gt; Hercules Smart TV Stereo</div><div class='del'>-	101 -&gt; Pace TV &amp; Radio Card</div><div class='del'>-	102 -&gt; IVC-200                                             [0000:a155,0001:a155,0002:a155,0003:a155,0100:a155,0101:a155,0102:a155,0103:a155,0800:a155,0801:a155,0802:a155,0803:a155]</div><div class='del'>-	103 -&gt; Grand X-Guard / Trust 814PCI                        [0304:0102]</div><div class='del'>-	104 -&gt; Nebula Electronics DigiTV                           [0071:0101]</div><div class='del'>-	105 -&gt; ProVideo PV143                                      [aa00:1430,aa00:1431,aa00:1432,aa00:1433,aa03:1433]</div><div class='del'>-	106 -&gt; PHYTEC VD-009-X1 VD-011 MiniDIN (bt878)</div><div class='del'>-	107 -&gt; PHYTEC VD-009-X1 VD-011 Combi (bt878)</div><div class='del'>-	108 -&gt; PHYTEC VD-009 MiniDIN (bt878)</div><div class='del'>-	109 -&gt; PHYTEC VD-009 Combi (bt878)</div><div class='del'>-	110 -&gt; IVC-100                                             [ff00:a132]</div><div class='del'>-	111 -&gt; IVC-120G                                            [ff00:a182,ff01:a182,ff02:a182,ff03:a182,ff04:a182,ff05:a182,ff06:a182,ff07:a182,ff08:a182,ff09:a182,ff0a:a182,ff0b:a182,ff0c:a182,ff0d:a182,ff0e:a182,ff0f:a182]</div><div class='del'>-	112 -&gt; pcHDTV HD-2000 TV                                   [7063:2000]</div><div class='del'>-	113 -&gt; Twinhan DST + clones                                [11bd:0026,1822:0001,270f:fc00,1822:0026]</div><div class='del'>-	114 -&gt; Winfast VC100                                       [107d:6607]</div><div class='del'>-	115 -&gt; Teppro TEV-560/InterVision IV-560</div><div class='del'>-	116 -&gt; SIMUS GVC1100                                       [aa6a:82b2]</div><div class='del'>-	117 -&gt; NGS NGSTV+</div><div class='del'>-	118 -&gt; LMLBT4</div><div class='del'>-	119 -&gt; Tekram M205 PRO</div><div class='del'>-	120 -&gt; Conceptronic CONTVFMi</div><div class='del'>-	121 -&gt; Euresys Picolo Tetra                                [1805:0105,1805:0106,1805:0107,1805:0108]</div><div class='del'>-	122 -&gt; Spirit TV Tuner</div><div class='del'>-	123 -&gt; AVerMedia AVerTV DVB-T 771                          [1461:0771]</div><div class='del'>-	124 -&gt; AverMedia AverTV DVB-T 761                          [1461:0761]</div><div class='del'>-	125 -&gt; MATRIX Vision Sigma-SQ</div><div class='del'>-	126 -&gt; MATRIX Vision Sigma-SLC</div><div class='del'>-	127 -&gt; APAC Viewcomp 878(AMAX)</div><div class='del'>-	128 -&gt; DViCO FusionHDTV DVB-T Lite                         [18ac:db10,18ac:db11]</div><div class='del'>-	129 -&gt; V-Gear MyVCD</div><div class='del'>-	130 -&gt; Super TV Tuner</div><div class='del'>-	131 -&gt; Tibet Systems 'Progress DVR' CS16</div><div class='del'>-	132 -&gt; Kodicom 4400R (master)</div><div class='del'>-	133 -&gt; Kodicom 4400R (slave)</div><div class='del'>-	134 -&gt; Adlink RTV24</div><div class='del'>-	135 -&gt; DViCO FusionHDTV 5 Lite                             [18ac:d500]</div><div class='del'>-	136 -&gt; Acorp Y878F                                         [9511:1540]</div><div class='del'>-	137 -&gt; Conceptronic CTVFMi v2                              [036e:109e]</div><div class='del'>-	138 -&gt; Prolink Pixelview PV-BT878P+ (Rev.2E)</div><div class='del'>-	139 -&gt; Prolink PixelView PlayTV MPEG2 PV-M4900</div><div class='del'>-	140 -&gt; Osprey 440                                          [0070:ff07]</div><div class='del'>-	141 -&gt; Asound Skyeye PCTV</div><div class='del'>-	142 -&gt; Sabrent TV-FM (bttv version)</div><div class='del'>-	143 -&gt; Hauppauge ImpactVCB (bt878)                         [0070:13eb]</div><div class='del'>-	144 -&gt; MagicTV</div><div class='del'>-	145 -&gt; SSAI Security Video Interface                       [4149:5353]</div><div class='del'>-	146 -&gt; SSAI Ultrasound Video Interface                     [414a:5353]</div><div class='del'>-	147 -&gt; VoodooTV 200 (USA)                                  [121a:3000]</div><div class='del'>-	148 -&gt; DViCO FusionHDTV 2                                  [dbc0:d200]</div><div class='del'>-	149 -&gt; Typhoon TV-Tuner PCI (50684)</div><div class='del'>-	150 -&gt; Geovision GV-600                                    [008a:763c]</div><div class='del'>-	151 -&gt; Kozumi KTV-01C</div><div class='del'>-	152 -&gt; Encore ENL TV-FM-2                                  [1000:1801]</div><div class='del'>-	153 -&gt; PHYTEC VD-012 (bt878)</div><div class='del'>-	154 -&gt; PHYTEC VD-012-X1 (bt878)</div><div class='del'>-	155 -&gt; PHYTEC VD-012-X2 (bt878)</div><div class='del'>-	156 -&gt; IVCE-8784                                           [0000:f050,0001:f050,0002:f050,0003:f050]</div><div class='del'>-	157 -&gt; Geovision GV-800(S) (master)                        [800a:763d]</div><div class='del'>-	158 -&gt; Geovision GV-800(S) (slave)                         [800b:763d,800c:763d,800d:763d]</div><div class='del'>-	159 -&gt; ProVideo PV183                                      [1830:1540,1831:1540,1832:1540,1833:1540,1834:1540,1835:1540,1836:1540,1837:1540]</div><div class='del'>-	160 -&gt; Tongwei Video Technology TD-3116                    [f200:3116]</div><div class='del'>-	161 -&gt; Aposonic W-DVR                                      [0279:0228]</div><div class='del'>-	162 -&gt; Adlink MPG24</div><div class='del'>-	163 -&gt; Bt848 Capture 14MHz</div><div class='del'>-	164 -&gt; CyberVision CV06 (SV)</div><div class='del'>-	165 -&gt; Kworld V-Stream Xpert TV PVR878</div><div class='del'>-	166 -&gt; PCI-8604PW</div><div class='add'>+=========== ================================================================================= ==============================================================================================================================================================================</div><div class='add'>+Card number Card name                                                                         PCI IDs</div><div class='add'>+=========== ================================================================================= ==============================================================================================================================================================================</div><div class='add'>+0            *** UNKNOWN/GENERIC ***</div><div class='add'>+1           MIRO PCTV</div><div class='add'>+2           Hauppauge (bt848)</div><div class='add'>+3           STB, Gateway P/N 6000699 (bt848)</div><div class='add'>+4           Intel Create and Share PCI/ Smart Video Recorder III</div><div class='add'>+5           Diamond DTV2000</div><div class='add'>+6           AVerMedia TVPhone</div><div class='add'>+7           MATRIX-Vision MV-Delta</div><div class='add'>+8           Lifeview FlyVideo II (Bt848) LR26 / MAXI TV Video PCI2 LR26</div><div class='add'>+9           IMS/IXmicro TurboTV</div><div class='add'>+10          Hauppauge (bt878)                                                                 0070:13eb, 0070:3900, 2636:10b4</div><div class='add'>+11          MIRO PCTV pro</div><div class='add'>+12          ADS Technologies Channel Surfer TV (bt848)</div><div class='add'>+13          AVerMedia TVCapture 98                                                            1461:0002, 1461:0004, 1461:0300</div><div class='add'>+14          Aimslab Video Highway Xtreme (VHX)</div><div class='add'>+15          Zoltrix TV-Max                                                                    a1a0:a0fc</div><div class='add'>+16          Prolink Pixelview PlayTV (bt878)</div><div class='add'>+17          Leadtek WinView 601</div><div class='add'>+18          AVEC Intercapture</div><div class='add'>+19          Lifeview FlyVideo II EZ /FlyKit LR38 Bt848 (capture only)</div><div class='add'>+20          CEI Raffles Card</div><div class='add'>+21          Lifeview FlyVideo 98/ Lucky Star Image World ConferenceTV LR50</div><div class='add'>+22          Askey CPH050/ Phoebe Tv Master + FM                                               14ff:3002</div><div class='add'>+23          Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV, bt878                      14c7:0101</div><div class='add'>+24          Askey CPH05X/06X (bt878) [many vendors]                                           144f:3002, 144f:3005, 144f:5000, 14ff:3000</div><div class='add'>+25          Terratec TerraTV+ Version 1.0 (Bt848)/ Terra TValue Version 1.0/ Vobis TV-Boostar</div><div class='add'>+26          Hauppauge WinCam newer (bt878)</div><div class='add'>+27          Lifeview FlyVideo 98/ MAXI TV Video PCI2 LR50</div><div class='add'>+28          Terratec TerraTV+ Version 1.1 (bt878)                                             153b:1127, 1852:1852</div><div class='add'>+29          Imagenation PXC200                                                                1295:200a</div><div class='add'>+30          Lifeview FlyVideo 98 LR50                                                         1f7f:1850</div><div class='add'>+31          Formac iProTV, Formac ProTV I (bt848)</div><div class='add'>+32          Intel Create and Share PCI/ Smart Video Recorder III</div><div class='add'>+33          Terratec TerraTValue Version Bt878                                                153b:1117, 153b:1118, 153b:1119, 153b:111a, 153b:1134, 153b:5018</div><div class='add'>+34          Leadtek WinFast 2000/ WinFast 2000 XP                                             107d:6606, 107d:6609, 6606:217d, f6ff:fff6</div><div class='add'>+35          Lifeview FlyVideo 98 LR50 / Chronos Video Shuttle II                              1851:1850, 1851:a050</div><div class='add'>+36          Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner                           1852:1852</div><div class='add'>+37          Prolink PixelView PlayTV pro</div><div class='add'>+38          Askey CPH06X TView99                                                              144f:3000, 144f:a005, a04f:a0fc</div><div class='add'>+39          Pinnacle PCTV Studio/Rave                                                         11bd:0012, bd11:1200, bd11:ff00, 11bd:ff12</div><div class='add'>+40          STB TV PCI FM, Gateway P/N 6000704 (bt878), 3Dfx VoodooTV 100                     10b4:2636, 10b4:2645, 121a:3060</div><div class='add'>+41          AVerMedia TVPhone 98                                                              1461:0001, 1461:0003</div><div class='add'>+42          ProVideo PV951                                                                    aa0c:146c</div><div class='add'>+43          Little OnAir TV</div><div class='add'>+44          Sigma TVII-FM</div><div class='add'>+45          MATRIX-Vision MV-Delta 2</div><div class='add'>+46          Zoltrix Genie TV/FM                                                               15b0:4000, 15b0:400a, 15b0:400d, 15b0:4010, 15b0:4016</div><div class='add'>+47          Terratec TV/Radio+                                                                153b:1123</div><div class='add'>+48          Askey CPH03x/ Dynalink Magic TView</div><div class='add'>+49          IODATA GV-BCTV3/PCI                                                               10fc:4020</div><div class='add'>+50          Prolink PV-BT878P+4E / PixelView PlayTV PAK / Lenco MXTV-9578 CP</div><div class='add'>+51          Eagle Wireless Capricorn2 (bt878A)</div><div class='add'>+52          Pinnacle PCTV Studio Pro</div><div class='add'>+53          Typhoon TView RDS + FM Stereo / KNC1 TV Station RDS</div><div class='add'>+54          Lifeview FlyVideo 2000 /FlyVideo A2/ Lifetec LT 9415 TV [LR90]</div><div class='add'>+55          Askey CPH031/ BESTBUY Easy TV</div><div class='add'>+56          Lifeview FlyVideo 98FM LR50                                                       a051:41a0</div><div class='add'>+57          GrandTec 'Grand Video Capture' (Bt848)                                            4344:4142</div><div class='add'>+58          Askey CPH060/ Phoebe TV Master Only (No FM)</div><div class='add'>+59          Askey CPH03x TV Capturer</div><div class='add'>+60          Modular Technology MM100PCTV</div><div class='add'>+61          AG Electronics GMV1                                                               15cb:0101</div><div class='add'>+62          Askey CPH061/ BESTBUY Easy TV (bt878)</div><div class='add'>+63          ATI TV-Wonder                                                                     1002:0001</div><div class='add'>+64          ATI TV-Wonder VE                                                                  1002:0003</div><div class='add'>+65          Lifeview FlyVideo 2000S LR90</div><div class='add'>+66          Terratec TValueRadio                                                              153b:1135, 153b:ff3b</div><div class='add'>+67          IODATA GV-BCTV4/PCI                                                               10fc:4050</div><div class='add'>+68          3Dfx VoodooTV FM (Euro)                                                           10b4:2637</div><div class='add'>+69          Active Imaging AIMMS</div><div class='add'>+70          Prolink Pixelview PV-BT878P+ (Rev.4C,8E)</div><div class='add'>+71          Lifeview FlyVideo 98EZ (capture only) LR51                                        1851:1851</div><div class='add'>+72          Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM)                       1554:4011</div><div class='add'>+73          Sensoray 311/611                                                                  6000:0311, 6000:0611</div><div class='add'>+74          RemoteVision MX (RV605)</div><div class='add'>+75          Powercolor MTV878/ MTV878R/ MTV878F</div><div class='add'>+76          Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)                               0e11:0079</div><div class='add'>+77          GrandTec Multi Capture Card (Bt878)</div><div class='add'>+78          Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF                                 0a01:17de</div><div class='add'>+79          DSP Design TCVIDEO</div><div class='add'>+80          Hauppauge WinTV PVR                                                               0070:4500</div><div class='add'>+81          IODATA GV-BCTV5/PCI                                                               10fc:4070, 10fc:d018</div><div class='add'>+82          Osprey 100/150 (878)                                                              0070:ff00</div><div class='add'>+83          Osprey 100/150 (848)</div><div class='add'>+84          Osprey 101 (848)</div><div class='add'>+85          Osprey 101/151</div><div class='add'>+86          Osprey 101/151 w/ svid</div><div class='add'>+87          Osprey 200/201/250/251</div><div class='add'>+88          Osprey 200/250                                                                    0070:ff01</div><div class='add'>+89          Osprey 210/220/230</div><div class='add'>+90          Osprey 500                                                                        0070:ff02</div><div class='add'>+91          Osprey 540                                                                        0070:ff04</div><div class='add'>+92          Osprey 2000                                                                       0070:ff03</div><div class='add'>+93          IDS Eagle</div><div class='add'>+94          Pinnacle PCTV Sat                                                                 11bd:001c</div><div class='add'>+95          Formac ProTV II (bt878)</div><div class='add'>+96          MachTV</div><div class='add'>+97          Euresys Picolo</div><div class='add'>+98          ProVideo PV150                                                                    aa00:1460, aa01:1461, aa02:1462, aa03:1463, aa04:1464, aa05:1465, aa06:1466, aa07:1467</div><div class='add'>+99          AD-TVK503</div><div class='add'>+100         Hercules Smart TV Stereo</div><div class='add'>+101         Pace TV &amp; Radio Card</div><div class='add'>+102         IVC-200                                                                           0000:a155, 0001:a155, 0002:a155, 0003:a155, 0100:a155, 0101:a155, 0102:a155, 0103:a155, 0800:a155, 0801:a155, 0802:a155, 0803:a155</div><div class='add'>+103         Grand X-Guard / Trust 814PCI                                                      0304:0102</div><div class='add'>+104         Nebula Electronics DigiTV                                                         0071:0101</div><div class='add'>+105         ProVideo PV143                                                                    aa00:1430, aa00:1431, aa00:1432, aa00:1433, aa03:1433</div><div class='add'>+106         PHYTEC VD-009-X1 VD-011 MiniDIN (bt878)</div><div class='add'>+107         PHYTEC VD-009-X1 VD-011 Combi (bt878)</div><div class='add'>+108         PHYTEC VD-009 MiniDIN (bt878)</div><div class='add'>+109         PHYTEC VD-009 Combi (bt878)</div><div class='add'>+110         IVC-100                                                                           ff00:a132</div><div class='add'>+111         IVC-120G                                                                          ff00:a182, ff01:a182, ff02:a182, ff03:a182, ff04:a182, ff05:a182, ff06:a182, ff07:a182, ff08:a182, ff09:a182, ff0a:a182, ff0b:a182, ff0c:a182, ff0d:a182, ff0e:a182, ff0f:a182</div><div class='add'>+112         pcHDTV HD-2000 TV                                                                 7063:2000</div><div class='add'>+113         Twinhan DST + clones                                                              11bd:0026, 1822:0001, 270f:fc00, 1822:0026</div><div class='add'>+114         Winfast VC100                                                                     107d:6607</div><div class='add'>+115         Teppro TEV-560/InterVision IV-560</div><div class='add'>+116         SIMUS GVC1100                                                                     aa6a:82b2</div><div class='add'>+117         NGS NGSTV+</div><div class='add'>+118         LMLBT4</div><div class='add'>+119         Tekram M205 PRO</div><div class='add'>+120         Conceptronic CONTVFMi</div><div class='add'>+121         Euresys Picolo Tetra                                                              1805:0105, 1805:0106, 1805:0107, 1805:0108</div><div class='add'>+122         Spirit TV Tuner</div><div class='add'>+123         AVerMedia AVerTV DVB-T 771                                                        1461:0771</div><div class='add'>+124         AverMedia AverTV DVB-T 761                                                        1461:0761</div><div class='add'>+125         MATRIX Vision Sigma-SQ</div><div class='add'>+126         MATRIX Vision Sigma-SLC</div><div class='add'>+127         APAC Viewcomp 878(AMAX)</div><div class='add'>+128         DViCO FusionHDTV DVB-T Lite                                                       18ac:db10, 18ac:db11</div><div class='add'>+129         V-Gear MyVCD</div><div class='add'>+130         Super TV Tuner</div><div class='add'>+131         Tibet Systems 'Progress DVR' CS16</div><div class='add'>+132         Kodicom 4400R (master)</div><div class='add'>+133         Kodicom 4400R (slave)</div><div class='add'>+134         Adlink RTV24</div><div class='add'>+135         DViCO FusionHDTV 5 Lite                                                           18ac:d500</div><div class='add'>+136         Acorp Y878F                                                                       9511:1540</div><div class='add'>+137         Conceptronic CTVFMi v2                                                            036e:109e</div><div class='add'>+138         Prolink Pixelview PV-BT878P+ (Rev.2E)</div><div class='add'>+139         Prolink PixelView PlayTV MPEG2 PV-M4900</div><div class='add'>+140         Osprey 440                                                                        0070:ff07</div><div class='add'>+141         Asound Skyeye PCTV</div><div class='add'>+142         Sabrent TV-FM (bttv version)</div><div class='add'>+143         Hauppauge ImpactVCB (bt878)                                                       0070:13eb</div><div class='add'>+144         MagicTV</div><div class='add'>+145         SSAI Security Video Interface                                                     4149:5353</div><div class='add'>+146         SSAI Ultrasound Video Interface                                                   414a:5353</div><div class='add'>+147         VoodooTV 200 (USA)                                                                121a:3000</div><div class='add'>+148         DViCO FusionHDTV 2                                                                dbc0:d200</div><div class='add'>+149         Typhoon TV-Tuner PCI (50684)</div><div class='add'>+150         Geovision GV-600                                                                  008a:763c</div><div class='add'>+151         Kozumi KTV-01C</div><div class='add'>+152         Encore ENL TV-FM-2                                                                1000:1801</div><div class='add'>+153         PHYTEC VD-012 (bt878)</div><div class='add'>+154         PHYTEC VD-012-X1 (bt878)</div><div class='add'>+155         PHYTEC VD-012-X2 (bt878)</div><div class='add'>+156         IVCE-8784                                                                         0000:f050, 0001:f050, 0002:f050, 0003:f050</div><div class='add'>+157         Geovision GV-800(S) (master)                                                      800a:763d</div><div class='add'>+158         Geovision GV-800(S) (slave)                                                       800b:763d, 800c:763d, 800d:763d</div><div class='add'>+159         ProVideo PV183                                                                    1830:1540, 1831:1540, 1832:1540, 1833:1540, 1834:1540, 1835:1540, 1836:1540, 1837:1540</div><div class='add'>+160         Tongwei Video Technology TD-3116                                                  f200:3116</div><div class='add'>+161         Aposonic W-DVR                                                                    0279:0228</div><div class='add'>+162         Adlink MPG24</div><div class='add'>+163         Bt848 Capture 14MHz</div><div class='add'>+164         CyberVision CV06 (SV)</div><div class='add'>+165         Kworld V-Stream Xpert TV PVR878</div><div class='add'>+166         PCI-8604PW</div><div class='add'>+=========== ================================================================================= ==============================================================================================================================================================================</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/bttv.rst b/Documentation/media/v4l-drivers/bttv.rst<br/>index 7abc1c9a261b..195ccaac2816 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/bttv.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/bttv.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/bttv.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/bttv.rst</a></div><div class='hunk'>@@ -304,15 +304,15 @@ bug.  It is very helpful if you can tell where exactly it broke</div><div class='ctx'> With a hard freeze you probably doesn't find anything in the logfiles.</div><div class='ctx'> The only way to capture any kernel messages is to hook up a serial</div><div class='ctx'> console and let some terminal application log the messages.  /me uses</div><div class='del'>-screen.  See Documentation/serial-console.txt for details on setting</div><div class='add'>+screen.  See Documentation/admin-guide/serial-console.rst for details on setting</div><div class='ctx'> up a serial console.</div><div class='ctx'> </div><div class='del'>-Read Documentation/oops-tracing.txt to learn how to get any useful</div><div class='add'>+Read Documentation/admin-guide/oops-tracing.rst to learn how to get any useful</div><div class='ctx'> information out of a register+stack dump printed by the kernel on</div><div class='ctx'> protection faults (so-called "kernel oops").</div><div class='ctx'> </div><div class='ctx'> If you run into some kind of deadlock, you can try to dump a call trace</div><div class='del'>-for each process using sysrq-t (see Documentation/sysrq.txt).</div><div class='add'>+for each process using sysrq-t (see Documentation/admin-guide/sysrq.rst).</div><div class='ctx'> This way it is possible to figure where *exactly* some process in "D"</div><div class='ctx'> state is stuck.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/media/v4l-drivers/cafe_ccic.rst b/Documentation/media/v4l-drivers/cafe_ccic.rst<br/>index b98eb3b7cb4a..94f0f58ebe37 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/cafe_ccic.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/cafe_ccic.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/cafe_ccic.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/cafe_ccic.rst</a></div><div class='hunk'>@@ -3,8 +3,8 @@ The cafe_ccic driver</div><div class='ctx'> </div><div class='ctx'> Author: Jonathan Corbet &lt;corbet@lwn.net&gt;</div><div class='ctx'> </div><div class='del'>-Introdution</div><div class='del'>------------</div><div class='add'>+Introduction</div><div class='add'>+------------</div><div class='ctx'> </div><div class='ctx'> "cafe_ccic" is a driver for the Marvell 88ALP01 "cafe" CMOS camera</div><div class='ctx'> controller.  This is the controller found in first-generation OLPC systems,</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/cx23885-cardlist.rst b/Documentation/media/v4l-drivers/cx23885-cardlist.rst<br/>index f38003255b9a..fd20b50d2c1d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/cx23885-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/cx23885-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/cx23885-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/cx23885-cardlist.rst</a></div><div class='hunk'>@@ -1,63 +1,65 @@</div><div class='ctx'> cx23885 cards list</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	  0 -&gt; UNKNOWN/GENERIC                                     [0070:3400]</div><div class='del'>-	  1 -&gt; Hauppauge WinTV-HVR1800lp                           [0070:7600]</div><div class='del'>-	  2 -&gt; Hauppauge WinTV-HVR1800                             [0070:7800,0070:7801,0070:7809]</div><div class='del'>-	  3 -&gt; Hauppauge WinTV-HVR1250                             [0070:7911]</div><div class='del'>-	  4 -&gt; DViCO FusionHDTV5 Express                           [18ac:d500]</div><div class='del'>-	  5 -&gt; Hauppauge WinTV-HVR1500Q                            [0070:7790,0070:7797]</div><div class='del'>-	  6 -&gt; Hauppauge WinTV-HVR1500                             [0070:7710,0070:7717]</div><div class='del'>-	  7 -&gt; Hauppauge WinTV-HVR1200                             [0070:71d1,0070:71d3]</div><div class='del'>-	  8 -&gt; Hauppauge WinTV-HVR1700                             [0070:8101]</div><div class='del'>-	  9 -&gt; Hauppauge WinTV-HVR1400                             [0070:8010]</div><div class='del'>-	 10 -&gt; DViCO FusionHDTV7 Dual Express                      [18ac:d618]</div><div class='del'>-	 11 -&gt; DViCO FusionHDTV DVB-T Dual Express                 [18ac:db78]</div><div class='del'>-	 12 -&gt; Leadtek Winfast PxDVR3200 H                         [107d:6681]</div><div class='del'>-	 13 -&gt; Compro VideoMate E650F                              [185b:e800]</div><div class='del'>-	 14 -&gt; TurboSight TBS 6920                                 [6920:8888]</div><div class='del'>-	 15 -&gt; TeVii S470                                          [d470:9022]</div><div class='del'>-	 16 -&gt; DVBWorld DVB-S2 2005                                [0001:2005]</div><div class='del'>-	 17 -&gt; NetUP Dual DVB-S2 CI                                [1b55:2a2c]</div><div class='del'>-	 18 -&gt; Hauppauge WinTV-HVR1270                             [0070:2211]</div><div class='del'>-	 19 -&gt; Hauppauge WinTV-HVR1275                             [0070:2215,0070:221d,0070:22f2]</div><div class='del'>-	 20 -&gt; Hauppauge WinTV-HVR1255                             [0070:2251,0070:22f1]</div><div class='del'>-	 21 -&gt; Hauppauge WinTV-HVR1210                             [0070:2291,0070:2295,0070:2299,0070:229d,0070:22f0,0070:22f3,0070:22f4,0070:22f5]</div><div class='del'>-	 22 -&gt; Mygica X8506 DMB-TH                                 [14f1:8651]</div><div class='del'>-	 23 -&gt; Magic-Pro ProHDTV Extreme 2                         [14f1:8657]</div><div class='del'>-	 24 -&gt; Hauppauge WinTV-HVR1850                             [0070:8541]</div><div class='del'>-	 25 -&gt; Compro VideoMate E800                               [1858:e800]</div><div class='del'>-	 26 -&gt; Hauppauge WinTV-HVR1290                             [0070:8551]</div><div class='del'>-	 27 -&gt; Mygica X8558 PRO DMB-TH                             [14f1:8578]</div><div class='del'>-	 28 -&gt; LEADTEK WinFast PxTV1200                            [107d:6f22]</div><div class='del'>-	 29 -&gt; GoTView X5 3D Hybrid                                [5654:2390]</div><div class='del'>-	 30 -&gt; NetUP Dual DVB-T/C-CI RF                            [1b55:e2e4]</div><div class='del'>-	 31 -&gt; Leadtek Winfast PxDVR3200 H XC4000                  [107d:6f39]</div><div class='del'>-	 32 -&gt; MPX-885</div><div class='del'>-	 33 -&gt; Mygica X8502/X8507 ISDB-T                           [14f1:8502]</div><div class='del'>-	 34 -&gt; TerraTec Cinergy T PCIe Dual                        [153b:117e]</div><div class='del'>-	 35 -&gt; TeVii S471                                          [d471:9022]</div><div class='del'>-	 36 -&gt; Hauppauge WinTV-HVR1255                             [0070:2259]</div><div class='del'>-	 37 -&gt; Prof Revolution DVB-S2 8000                         [8000:3034]</div><div class='del'>-	 38 -&gt; Hauppauge WinTV-HVR4400/HVR5500                     [0070:c108,0070:c138,0070:c1f8]</div><div class='del'>-	 39 -&gt; AVerTV Hybrid Express Slim HC81R                    [1461:d939]</div><div class='del'>-	 40 -&gt; TurboSight TBS 6981                                 [6981:8888]</div><div class='del'>-	 41 -&gt; TurboSight TBS 6980                                 [6980:8888]</div><div class='del'>-	 42 -&gt; Leadtek Winfast PxPVR2200                           [107d:6f21]</div><div class='del'>-	 43 -&gt; Hauppauge ImpactVCB-e                               [0070:7133]</div><div class='del'>-	 44 -&gt; DViCO FusionHDTV DVB-T Dual Express2                [18ac:db98]</div><div class='del'>-	 45 -&gt; DVBSky T9580                                        [4254:9580]</div><div class='del'>-	 46 -&gt; DVBSky T980C                                        [4254:980c]</div><div class='del'>-	 47 -&gt; DVBSky S950C                                        [4254:950c]</div><div class='del'>-	 48 -&gt; Technotrend TT-budget CT2-4500 CI                   [13c2:3013]</div><div class='del'>-	 49 -&gt; DVBSky S950                                         [4254:0950]</div><div class='del'>-	 50 -&gt; DVBSky S952                                         [4254:0952]</div><div class='del'>-	 51 -&gt; DVBSky T982                                         [4254:0982]</div><div class='del'>-	 52 -&gt; Hauppauge WinTV-HVR5525                             [0070:f038]</div><div class='del'>-	 53 -&gt; Hauppauge WinTV Starburst                           [0070:c12a]</div><div class='del'>-	 54 -&gt; ViewCast 260e                                       [1576:0260]</div><div class='del'>-	 55 -&gt; ViewCast 460e                                       [1576:0460]</div><div class='del'>-	 56 -&gt; Hauppauge WinTV-QuadHD-DVB                          [0070:6a28,0070:6b28]</div><div class='del'>-	 57 -&gt; Hauppauge WinTV-QuadHD-ATSC                         [0070:6a18,0070:6b18]</div><div class='add'>+=========== ==================================== ======================================================================================</div><div class='add'>+Card number Card name                            PCI IDs</div><div class='add'>+=========== ==================================== ======================================================================================</div><div class='add'>+0           UNKNOWN/GENERIC                      0070:3400</div><div class='add'>+1           Hauppauge WinTV-HVR1800lp            0070:7600</div><div class='add'>+2           Hauppauge WinTV-HVR1800              0070:7800, 0070:7801, 0070:7809</div><div class='add'>+3           Hauppauge WinTV-HVR1250              0070:7911</div><div class='add'>+4           DViCO FusionHDTV5 Express            18ac:d500</div><div class='add'>+5           Hauppauge WinTV-HVR1500Q             0070:7790, 0070:7797</div><div class='add'>+6           Hauppauge WinTV-HVR1500              0070:7710, 0070:7717</div><div class='add'>+7           Hauppauge WinTV-HVR1200              0070:71d1, 0070:71d3</div><div class='add'>+8           Hauppauge WinTV-HVR1700              0070:8101</div><div class='add'>+9           Hauppauge WinTV-HVR1400              0070:8010</div><div class='add'>+10          DViCO FusionHDTV7 Dual Express       18ac:d618</div><div class='add'>+11          DViCO FusionHDTV DVB-T Dual Express  18ac:db78</div><div class='add'>+12          Leadtek Winfast PxDVR3200 H          107d:6681</div><div class='add'>+13          Compro VideoMate E650F               185b:e800</div><div class='add'>+14          TurboSight TBS 6920                  6920:8888</div><div class='add'>+15          TeVii S470                           d470:9022</div><div class='add'>+16          DVBWorld DVB-S2 2005                 0001:2005</div><div class='add'>+17          NetUP Dual DVB-S2 CI                 1b55:2a2c</div><div class='add'>+18          Hauppauge WinTV-HVR1270              0070:2211</div><div class='add'>+19          Hauppauge WinTV-HVR1275              0070:2215, 0070:221d, 0070:22f2</div><div class='add'>+20          Hauppauge WinTV-HVR1255              0070:2251, 0070:22f1</div><div class='add'>+21          Hauppauge WinTV-HVR1210              0070:2291, 0070:2295, 0070:2299, 0070:229d, 0070:22f0, 0070:22f3, 0070:22f4, 0070:22f5</div><div class='add'>+22          Mygica X8506 DMB-TH                  14f1:8651</div><div class='add'>+23          Magic-Pro ProHDTV Extreme 2          14f1:8657</div><div class='add'>+24          Hauppauge WinTV-HVR1850              0070:8541</div><div class='add'>+25          Compro VideoMate E800                1858:e800</div><div class='add'>+26          Hauppauge WinTV-HVR1290              0070:8551</div><div class='add'>+27          Mygica X8558 PRO DMB-TH              14f1:8578</div><div class='add'>+28          LEADTEK WinFast PxTV1200             107d:6f22</div><div class='add'>+29          GoTView X5 3D Hybrid                 5654:2390</div><div class='add'>+30          NetUP Dual DVB-T/C-CI RF             1b55:e2e4</div><div class='add'>+31          Leadtek Winfast PxDVR3200 H XC4000   107d:6f39</div><div class='add'>+32          MPX-885</div><div class='add'>+33          Mygica X8502/X8507 ISDB-T            14f1:8502</div><div class='add'>+34          TerraTec Cinergy T PCIe Dual         153b:117e</div><div class='add'>+35          TeVii S471                           d471:9022</div><div class='add'>+36          Hauppauge WinTV-HVR1255              0070:2259</div><div class='add'>+37          Prof Revolution DVB-S2 8000          8000:3034</div><div class='add'>+38          Hauppauge WinTV-HVR4400/HVR5500      0070:c108, 0070:c138, 0070:c1f8</div><div class='add'>+39          AVerTV Hybrid Express Slim HC81R     1461:d939</div><div class='add'>+40          TurboSight TBS 6981                  6981:8888</div><div class='add'>+41          TurboSight TBS 6980                  6980:8888</div><div class='add'>+42          Leadtek Winfast PxPVR2200            107d:6f21</div><div class='add'>+43          Hauppauge ImpactVCB-e                0070:7133</div><div class='add'>+44          DViCO FusionHDTV DVB-T Dual Express2 18ac:db98</div><div class='add'>+45          DVBSky T9580                         4254:9580</div><div class='add'>+46          DVBSky T980C                         4254:980c</div><div class='add'>+47          DVBSky S950C                         4254:950c</div><div class='add'>+48          Technotrend TT-budget CT2-4500 CI    13c2:3013</div><div class='add'>+49          DVBSky S950                          4254:0950</div><div class='add'>+50          DVBSky S952                          4254:0952</div><div class='add'>+51          DVBSky T982                          4254:0982</div><div class='add'>+52          Hauppauge WinTV-HVR5525              0070:f038</div><div class='add'>+53          Hauppauge WinTV Starburst            0070:c12a</div><div class='add'>+54          ViewCast 260e                        1576:0260</div><div class='add'>+55          ViewCast 460e                        1576:0460</div><div class='add'>+56          Hauppauge WinTV-QuadHD-DVB           0070:6a28, 0070:6b28</div><div class='add'>+57          Hauppauge WinTV-QuadHD-ATSC          0070:6a18, 0070:6b18</div><div class='add'>+=========== ==================================== ======================================================================================</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/cx88-cardlist.rst b/Documentation/media/v4l-drivers/cx88-cardlist.rst<br/>index 01128341e1ea..8cc1cea17035 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/cx88-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/cx88-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/cx88-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/cx88-cardlist.rst</a></div><div class='hunk'>@@ -1,96 +1,98 @@</div><div class='ctx'> CX88 cards list</div><div class='ctx'> ===============</div><div class='ctx'> </div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	  0 -&gt; UNKNOWN/GENERIC</div><div class='del'>-	  1 -&gt; Hauppauge WinTV 34xxx models                        [0070:3400,0070:3401]</div><div class='del'>-	  2 -&gt; GDI Black Gold                                      [14c7:0106,14c7:0107]</div><div class='del'>-	  3 -&gt; PixelView                                           [1554:4811]</div><div class='del'>-	  4 -&gt; ATI TV Wonder Pro                                   [1002:00f8,1002:00f9]</div><div class='del'>-	  5 -&gt; Leadtek Winfast 2000XP Expert                       [107d:6611,107d:6613]</div><div class='del'>-	  6 -&gt; AverTV Studio 303 (M126)                            [1461:000b]</div><div class='del'>-	  7 -&gt; MSI TV-@nywhere Master                              [1462:8606]</div><div class='del'>-	  8 -&gt; Leadtek Winfast DV2000                              [107d:6620,107d:6621]</div><div class='del'>-	  9 -&gt; Leadtek PVR 2000                                    [107d:663b,107d:663c,107d:6632,107d:6630,107d:6638,107d:6631,107d:6637,107d:663d]</div><div class='del'>-	 10 -&gt; IODATA GV-VCP3/PCI                                  [10fc:d003]</div><div class='del'>-	 11 -&gt; Prolink PlayTV PVR</div><div class='del'>-	 12 -&gt; ASUS PVR-416                                        [1043:4823,1461:c111]</div><div class='del'>-	 13 -&gt; MSI TV-@nywhere</div><div class='del'>-	 14 -&gt; KWorld/VStream XPert DVB-T                          [17de:08a6]</div><div class='del'>-	 15 -&gt; DViCO FusionHDTV DVB-T1                             [18ac:db00]</div><div class='del'>-	 16 -&gt; KWorld LTV883RF</div><div class='del'>-	 17 -&gt; DViCO FusionHDTV 3 Gold-Q                           [18ac:d810,18ac:d800]</div><div class='del'>-	 18 -&gt; Hauppauge Nova-T DVB-T                              [0070:9002,0070:9001,0070:9000]</div><div class='del'>-	 19 -&gt; Conexant DVB-T reference design                     [14f1:0187]</div><div class='del'>-	 20 -&gt; Provideo PV259                                      [1540:2580]</div><div class='del'>-	 21 -&gt; DViCO FusionHDTV DVB-T Plus                         [18ac:db10,18ac:db11]</div><div class='del'>-	 22 -&gt; pcHDTV HD3000 HDTV                                  [7063:3000]</div><div class='del'>-	 23 -&gt; digitalnow DNTV Live! DVB-T                         [17de:a8a6]</div><div class='del'>-	 24 -&gt; Hauppauge WinTV 28xxx (Roslyn) models               [0070:2801]</div><div class='del'>-	 25 -&gt; Digital-Logic MICROSPACE Entertainment Center (MEC) [14f1:0342]</div><div class='del'>-	 26 -&gt; IODATA GV/BCTV7E                                    [10fc:d035]</div><div class='del'>-	 27 -&gt; PixelView PlayTV Ultra Pro (Stereo)</div><div class='del'>-	 28 -&gt; DViCO FusionHDTV 3 Gold-T                           [18ac:d820]</div><div class='del'>-	 29 -&gt; ADS Tech Instant TV DVB-T PCI                       [1421:0334]</div><div class='del'>-	 30 -&gt; TerraTec Cinergy 1400 DVB-T                         [153b:1166]</div><div class='del'>-	 31 -&gt; DViCO FusionHDTV 5 Gold                             [18ac:d500]</div><div class='del'>-	 32 -&gt; AverMedia UltraTV Media Center PCI 550              [1461:8011]</div><div class='del'>-	 33 -&gt; Kworld V-Stream Xpert DVD</div><div class='del'>-	 34 -&gt; ATI HDTV Wonder                                     [1002:a101]</div><div class='del'>-	 35 -&gt; WinFast DTV1000-T                                   [107d:665f]</div><div class='del'>-	 36 -&gt; AVerTV 303 (M126)                                   [1461:000a]</div><div class='del'>-	 37 -&gt; Hauppauge Nova-S-Plus DVB-S                         [0070:9201,0070:9202]</div><div class='del'>-	 38 -&gt; Hauppauge Nova-SE2 DVB-S                            [0070:9200]</div><div class='del'>-	 39 -&gt; KWorld DVB-S 100                                    [17de:08b2,1421:0341]</div><div class='del'>-	 40 -&gt; Hauppauge WinTV-HVR1100 DVB-T/Hybrid                [0070:9400,0070:9402]</div><div class='del'>-	 41 -&gt; Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile)  [0070:9800,0070:9802]</div><div class='del'>-	 42 -&gt; digitalnow DNTV Live! DVB-T Pro                     [1822:0025,1822:0019]</div><div class='del'>-	 43 -&gt; KWorld/VStream XPert DVB-T with cx22702             [17de:08a1,12ab:2300]</div><div class='del'>-	 44 -&gt; DViCO FusionHDTV DVB-T Dual Digital                 [18ac:db50,18ac:db54]</div><div class='del'>-	 45 -&gt; KWorld HardwareMpegTV XPert                         [17de:0840,1421:0305]</div><div class='del'>-	 46 -&gt; DViCO FusionHDTV DVB-T Hybrid                       [18ac:db40,18ac:db44]</div><div class='del'>-	 47 -&gt; pcHDTV HD5500 HDTV                                  [7063:5500]</div><div class='del'>-	 48 -&gt; Kworld MCE 200 Deluxe                               [17de:0841]</div><div class='del'>-	 49 -&gt; PixelView PlayTV P7000                              [1554:4813]</div><div class='del'>-	 50 -&gt; NPG Tech Real TV FM Top 10                          [14f1:0842]</div><div class='del'>-	 51 -&gt; WinFast DTV2000 H                                   [107d:665e]</div><div class='del'>-	 52 -&gt; Geniatech DVB-S                                     [14f1:0084]</div><div class='del'>-	 53 -&gt; Hauppauge WinTV-HVR3000 TriMode Analog/DVB-S/DVB-T  [0070:1404,0070:1400,0070:1401,0070:1402]</div><div class='del'>-	 54 -&gt; Norwood Micro TV Tuner</div><div class='del'>-	 55 -&gt; Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM  [c180:c980]</div><div class='del'>-	 56 -&gt; Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder   [0070:9600,0070:9601,0070:9602]</div><div class='del'>-	 57 -&gt; ADS Tech Instant Video PCI                          [1421:0390]</div><div class='del'>-	 58 -&gt; Pinnacle PCTV HD 800i                               [11bd:0051]</div><div class='del'>-	 59 -&gt; DViCO FusionHDTV 5 PCI nano                         [18ac:d530]</div><div class='del'>-	 60 -&gt; Pinnacle Hybrid PCTV                                [12ab:1788]</div><div class='del'>-	 61 -&gt; Leadtek TV2000 XP Global                            [107d:6f18,107d:6618,107d:6619]</div><div class='del'>-	 62 -&gt; PowerColor RA330                                    [14f1:ea3d]</div><div class='del'>-	 63 -&gt; Geniatech X8000-MT DVBT                             [14f1:8852]</div><div class='del'>-	 64 -&gt; DViCO FusionHDTV DVB-T PRO                          [18ac:db30]</div><div class='del'>-	 65 -&gt; DViCO FusionHDTV 7 Gold                             [18ac:d610]</div><div class='del'>-	 66 -&gt; Prolink Pixelview MPEG 8000GT                       [1554:4935]</div><div class='del'>-	 67 -&gt; Kworld PlusTV HD PCI 120 (ATSC 120)                 [17de:08c1]</div><div class='del'>-	 68 -&gt; Hauppauge WinTV-HVR4000 DVB-S/S2/T/Hybrid           [0070:6900,0070:6904,0070:6902]</div><div class='del'>-	 69 -&gt; Hauppauge WinTV-HVR4000(Lite) DVB-S/S2              [0070:6905,0070:6906]</div><div class='del'>-	 70 -&gt; TeVii S460 DVB-S/S2                                 [d460:9022]</div><div class='del'>-	 71 -&gt; Omicom SS4 DVB-S/S2 PCI                             [A044:2011]</div><div class='del'>-	 72 -&gt; TBS 8920 DVB-S/S2                                   [8920:8888]</div><div class='del'>-	 73 -&gt; TeVii S420 DVB-S                                    [d420:9022]</div><div class='del'>-	 74 -&gt; Prolink Pixelview Global Extreme                    [1554:4976]</div><div class='del'>-	 75 -&gt; PROF 7300 DVB-S/S2                                  [B033:3033]</div><div class='del'>-	 76 -&gt; SATTRADE ST4200 DVB-S/S2                            [b200:4200]</div><div class='del'>-	 77 -&gt; TBS 8910 DVB-S                                      [8910:8888]</div><div class='del'>-	 78 -&gt; Prof 6200 DVB-S                                     [b022:3022]</div><div class='del'>-	 79 -&gt; Terratec Cinergy HT PCI MKII                        [153b:1177]</div><div class='del'>-	 80 -&gt; Hauppauge WinTV-IR Only                             [0070:9290]</div><div class='del'>-	 81 -&gt; Leadtek WinFast DTV1800 Hybrid                      [107d:6654]</div><div class='del'>-	 82 -&gt; WinFast DTV2000 H rev. J                            [107d:6f2b]</div><div class='del'>-	 83 -&gt; Prof 7301 DVB-S/S2                                  [b034:3034]</div><div class='del'>-	 84 -&gt; Samsung SMT 7020 DVB-S                              [18ac:dc00,18ac:dccd]</div><div class='del'>-	 85 -&gt; Twinhan VP-1027 DVB-S                               [1822:0023]</div><div class='del'>-	 86 -&gt; TeVii S464 DVB-S/S2                                 [d464:9022]</div><div class='del'>-	 87 -&gt; Leadtek WinFast DTV2000 H PLUS                      [107d:6f42]</div><div class='del'>-	 88 -&gt; Leadtek WinFast DTV1800 H (XC4000)                  [107d:6f38]</div><div class='del'>-	 89 -&gt; Leadtek TV2000 XP Global (SC4100)                   [107d:6f36]</div><div class='del'>-	 90 -&gt; Leadtek TV2000 XP Global (XC4100)                   [107d:6f43]</div><div class='add'>+=========== =================================================== ======================================================================================</div><div class='add'>+Card number Card name                                           PCI IDs</div><div class='add'>+=========== =================================================== ======================================================================================</div><div class='add'>+0           UNKNOWN/GENERIC</div><div class='add'>+1           Hauppauge WinTV 34xxx models                        0070:3400, 0070:3401</div><div class='add'>+2           GDI Black Gold                                      14c7:0106, 14c7:0107</div><div class='add'>+3           PixelView                                           1554:4811</div><div class='add'>+4           ATI TV Wonder Pro                                   1002:00f8, 1002:00f9</div><div class='add'>+5           Leadtek Winfast 2000XP Expert                       107d:6611, 107d:6613</div><div class='add'>+6           AverTV Studio 303 (M126)                            1461:000b</div><div class='add'>+7           MSI TV-@nywhere Master                              1462:8606</div><div class='add'>+8           Leadtek Winfast DV2000                              107d:6620, 107d:6621</div><div class='add'>+9           Leadtek PVR 2000                                    107d:663b, 107d:663c, 107d:6632, 107d:6630, 107d:6638, 107d:6631, 107d:6637, 107d:663d</div><div class='add'>+10          IODATA GV-VCP3/PCI                                  10fc:d003</div><div class='add'>+11          Prolink PlayTV PVR</div><div class='add'>+12          ASUS PVR-416                                        1043:4823, 1461:c111</div><div class='add'>+13          MSI TV-@nywhere</div><div class='add'>+14          KWorld/VStream XPert DVB-T                          17de:08a6</div><div class='add'>+15          DViCO FusionHDTV DVB-T1                             18ac:db00</div><div class='add'>+16          KWorld LTV883RF</div><div class='add'>+17          DViCO FusionHDTV 3 Gold-Q                           18ac:d810, 18ac:d800</div><div class='add'>+18          Hauppauge Nova-T DVB-T                              0070:9002, 0070:9001, 0070:9000</div><div class='add'>+19          Conexant DVB-T reference design                     14f1:0187</div><div class='add'>+20          Provideo PV259                                      1540:2580</div><div class='add'>+21          DViCO FusionHDTV DVB-T Plus                         18ac:db10, 18ac:db11</div><div class='add'>+22          pcHDTV HD3000 HDTV                                  7063:3000</div><div class='add'>+23          digitalnow DNTV Live! DVB-T                         17de:a8a6</div><div class='add'>+24          Hauppauge WinTV 28xxx (Roslyn) models               0070:2801</div><div class='add'>+25          Digital-Logic MICROSPACE Entertainment Center (MEC) 14f1:0342</div><div class='add'>+26          IODATA GV/BCTV7E                                    10fc:d035</div><div class='add'>+27          PixelView PlayTV Ultra Pro (Stereo)</div><div class='add'>+28          DViCO FusionHDTV 3 Gold-T                           18ac:d820</div><div class='add'>+29          ADS Tech Instant TV DVB-T PCI                       1421:0334</div><div class='add'>+30          TerraTec Cinergy 1400 DVB-T                         153b:1166</div><div class='add'>+31          DViCO FusionHDTV 5 Gold                             18ac:d500</div><div class='add'>+32          AverMedia UltraTV Media Center PCI 550              1461:8011</div><div class='add'>+33          Kworld V-Stream Xpert DVD</div><div class='add'>+34          ATI HDTV Wonder                                     1002:a101</div><div class='add'>+35          WinFast DTV1000-T                                   107d:665f</div><div class='add'>+36          AVerTV 303 (M126)                                   1461:000a</div><div class='add'>+37          Hauppauge Nova-S-Plus DVB-S                         0070:9201, 0070:9202</div><div class='add'>+38          Hauppauge Nova-SE2 DVB-S                            0070:9200</div><div class='add'>+39          KWorld DVB-S 100                                    17de:08b2, 1421:0341</div><div class='add'>+40          Hauppauge WinTV-HVR1100 DVB-T/Hybrid                0070:9400, 0070:9402</div><div class='add'>+41          Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile)  0070:9800, 0070:9802</div><div class='add'>+42          digitalnow DNTV Live! DVB-T Pro                     1822:0025, 1822:0019</div><div class='add'>+43          KWorld/VStream XPert DVB-T with cx22702             17de:08a1, 12ab:2300</div><div class='add'>+44          DViCO FusionHDTV DVB-T Dual Digital                 18ac:db50, 18ac:db54</div><div class='add'>+45          KWorld HardwareMpegTV XPert                         17de:0840, 1421:0305</div><div class='add'>+46          DViCO FusionHDTV DVB-T Hybrid                       18ac:db40, 18ac:db44</div><div class='add'>+47          pcHDTV HD5500 HDTV                                  7063:5500</div><div class='add'>+48          Kworld MCE 200 Deluxe                               17de:0841</div><div class='add'>+49          PixelView PlayTV P7000                              1554:4813</div><div class='add'>+50          NPG Tech Real TV FM Top 10                          14f1:0842</div><div class='add'>+51          WinFast DTV2000 H                                   107d:665e</div><div class='add'>+52          Geniatech DVB-S                                     14f1:0084</div><div class='add'>+53          Hauppauge WinTV-HVR3000 TriMode Analog/DVB-S/DVB-T  0070:1404, 0070:1400, 0070:1401, 0070:1402</div><div class='add'>+54          Norwood Micro TV Tuner</div><div class='add'>+55          Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM  c180:c980</div><div class='add'>+56          Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder   0070:9600, 0070:9601, 0070:9602</div><div class='add'>+57          ADS Tech Instant Video PCI                          1421:0390</div><div class='add'>+58          Pinnacle PCTV HD 800i                               11bd:0051</div><div class='add'>+59          DViCO FusionHDTV 5 PCI nano                         18ac:d530</div><div class='add'>+60          Pinnacle Hybrid PCTV                                12ab:1788</div><div class='add'>+61          Leadtek TV2000 XP Global                            107d:6f18, 107d:6618, 107d:6619</div><div class='add'>+62          PowerColor RA330                                    14f1:ea3d</div><div class='add'>+63          Geniatech X8000-MT DVBT                             14f1:8852</div><div class='add'>+64          DViCO FusionHDTV DVB-T PRO                          18ac:db30</div><div class='add'>+65          DViCO FusionHDTV 7 Gold                             18ac:d610</div><div class='add'>+66          Prolink Pixelview MPEG 8000GT                       1554:4935</div><div class='add'>+67          Kworld PlusTV HD PCI 120 (ATSC 120)                 17de:08c1</div><div class='add'>+68          Hauppauge WinTV-HVR4000 DVB-S/S2/T/Hybrid           0070:6900, 0070:6904, 0070:6902</div><div class='add'>+69          Hauppauge WinTV-HVR4000(Lite) DVB-S/S2              0070:6905, 0070:6906</div><div class='add'>+70          TeVii S460 DVB-S/S2                                 d460:9022</div><div class='add'>+71          Omicom SS4 DVB-S/S2 PCI                             A044:2011</div><div class='add'>+72          TBS 8920 DVB-S/S2                                   8920:8888</div><div class='add'>+73          TeVii S420 DVB-S                                    d420:9022</div><div class='add'>+74          Prolink Pixelview Global Extreme                    1554:4976</div><div class='add'>+75          PROF 7300 DVB-S/S2                                  B033:3033</div><div class='add'>+76          SATTRADE ST4200 DVB-S/S2                            b200:4200</div><div class='add'>+77          TBS 8910 DVB-S                                      8910:8888</div><div class='add'>+78          Prof 6200 DVB-S                                     b022:3022</div><div class='add'>+79          Terratec Cinergy HT PCI MKII                        153b:1177</div><div class='add'>+80          Hauppauge WinTV-IR Only                             0070:9290</div><div class='add'>+81          Leadtek WinFast DTV1800 Hybrid                      107d:6654</div><div class='add'>+82          WinFast DTV2000 H rev. J                            107d:6f2b</div><div class='add'>+83          Prof 7301 DVB-S/S2                                  b034:3034</div><div class='add'>+84          Samsung SMT 7020 DVB-S                              18ac:dc00, 18ac:dccd</div><div class='add'>+85          Twinhan VP-1027 DVB-S                               1822:0023</div><div class='add'>+86          TeVii S464 DVB-S/S2                                 d464:9022</div><div class='add'>+87          Leadtek WinFast DTV2000 H PLUS                      107d:6f42</div><div class='add'>+88          Leadtek WinFast DTV1800 H (XC4000)                  107d:6f38</div><div class='add'>+89          Leadtek TV2000 XP Global (SC4100)                   107d:6f36</div><div class='add'>+90          Leadtek TV2000 XP Global (XC4100)                   107d:6f43</div><div class='add'>+=========== =================================================== ======================================================================================</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/em28xx-cardlist.rst b/Documentation/media/v4l-drivers/em28xx-cardlist.rst<br/>index e72f2e5c0898..76b1d301754c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/em28xx-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/em28xx-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/em28xx-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/em28xx-cardlist.rst</a></div><div class='hunk'>@@ -1,105 +1,107 @@</div><div class='ctx'> EM28xx cards list</div><div class='ctx'> =================</div><div class='ctx'> </div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	  0 -&gt; Unknown EM2800 video grabber             (em2800)        [eb1a:2800]</div><div class='del'>-	  1 -&gt; Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2862,eb1a:2863,eb1a:2870,eb1a:2881,eb1a:2883,eb1a:2868,eb1a:2875]</div><div class='del'>-	  2 -&gt; Terratec Cinergy 250 USB                 (em2820/em2840) [0ccd:0036]</div><div class='del'>-	  3 -&gt; Pinnacle PCTV USB 2                      (em2820/em2840) [2304:0208]</div><div class='del'>-	  4 -&gt; Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200,2040:4201]</div><div class='del'>-	  5 -&gt; MSI VOX USB 2.0                          (em2820/em2840)</div><div class='del'>-	  6 -&gt; Terratec Cinergy 200 USB                 (em2800)</div><div class='del'>-	  7 -&gt; Leadtek Winfast USB II                   (em2800)        [0413:6023]</div><div class='del'>-	  8 -&gt; Kworld USB2800                           (em2800)</div><div class='del'>-	  9 -&gt; Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker  (em2820/em2840) [1b80:e302,1b80:e304,2304:0207,2304:021a,093b:a003]</div><div class='del'>-	 10 -&gt; Hauppauge WinTV HVR 900                  (em2880)        [2040:6500]</div><div class='del'>-	 11 -&gt; Terratec Hybrid XS                       (em2880)</div><div class='del'>-	 12 -&gt; Kworld PVR TV 2800 RF                    (em2820/em2840)</div><div class='del'>-	 13 -&gt; Terratec Prodigy XS                      (em2880)</div><div class='del'>-	 14 -&gt; SIIG AVTuner-PVR / Pixelview Prolink PlayTV USB 2.0 (em2820/em2840)</div><div class='del'>-	 15 -&gt; V-Gear PocketTV                          (em2800)</div><div class='del'>-	 16 -&gt; Hauppauge WinTV HVR 950                  (em2883)        [2040:6513,2040:6517,2040:651b]</div><div class='del'>-	 17 -&gt; Pinnacle PCTV HD Pro Stick               (em2880)        [2304:0227]</div><div class='del'>-	 18 -&gt; Hauppauge WinTV HVR 900 (R2)             (em2880)        [2040:6502]</div><div class='del'>-	 19 -&gt; EM2860/SAA711X Reference Design          (em2860)</div><div class='del'>-	 20 -&gt; AMD ATI TV Wonder HD 600                 (em2880)        [0438:b002]</div><div class='del'>-	 21 -&gt; eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800)        [eb1a:2801]</div><div class='del'>-	 22 -&gt; EM2710/EM2750/EM2751 webcam grabber      (em2750)        [eb1a:2750,eb1a:2751]</div><div class='del'>-	 23 -&gt; Huaqi DLCW-130                           (em2750)</div><div class='del'>-	 24 -&gt; D-Link DUB-T210 TV Tuner                 (em2820/em2840) [2001:f112]</div><div class='del'>-	 25 -&gt; Gadmei UTV310                            (em2820/em2840)</div><div class='del'>-	 26 -&gt; Hercules Smart TV USB 2.0                (em2820/em2840)</div><div class='del'>-	 27 -&gt; Pinnacle PCTV USB 2 (Philips FM1216ME)   (em2820/em2840)</div><div class='del'>-	 28 -&gt; Leadtek Winfast USB II Deluxe            (em2820/em2840)</div><div class='del'>-	 29 -&gt; EM2860/TVP5150 Reference Design          (em2860)</div><div class='del'>-	 30 -&gt; Videology 20K14XUSB USB2.0               (em2820/em2840)</div><div class='del'>-	 31 -&gt; Usbgear VD204v9                          (em2821)</div><div class='del'>-	 32 -&gt; Supercomp USB 2.0 TV                     (em2821)</div><div class='del'>-	 33 -&gt; Elgato Video Capture                     (em2860)        [0fd9:0033]</div><div class='del'>-	 34 -&gt; Terratec Cinergy A Hybrid XS             (em2860)        [0ccd:004f]</div><div class='del'>-	 35 -&gt; Typhoon DVD Maker                        (em2860)</div><div class='del'>-	 36 -&gt; NetGMBH Cam                              (em2860)</div><div class='del'>-	 37 -&gt; Gadmei UTV330                            (em2860)        [eb1a:50a6]</div><div class='del'>-	 38 -&gt; Yakumo MovieMixer                        (em2861)</div><div class='del'>-	 39 -&gt; KWorld PVRTV 300U                        (em2861)        [eb1a:e300]</div><div class='del'>-	 40 -&gt; Plextor ConvertX PX-TV100U               (em2861)        [093b:a005]</div><div class='del'>-	 41 -&gt; Kworld 350 U DVB-T                       (em2870)        [eb1a:e350]</div><div class='del'>-	 42 -&gt; Kworld 355 U DVB-T                       (em2870)        [eb1a:e355,eb1a:e357,eb1a:e359]</div><div class='del'>-	 43 -&gt; Terratec Cinergy T XS                    (em2870)</div><div class='del'>-	 44 -&gt; Terratec Cinergy T XS (MT2060)           (em2870)        [0ccd:0043]</div><div class='del'>-	 45 -&gt; Pinnacle PCTV DVB-T                      (em2870)</div><div class='del'>-	 46 -&gt; Compro, VideoMate U3                     (em2870)        [185b:2870]</div><div class='del'>-	 47 -&gt; KWorld DVB-T 305U                        (em2880)        [eb1a:e305]</div><div class='del'>-	 48 -&gt; KWorld DVB-T 310U                        (em2880)</div><div class='del'>-	 49 -&gt; MSI DigiVox A/D                          (em2880)        [eb1a:e310]</div><div class='del'>-	 50 -&gt; MSI DigiVox A/D II                       (em2880)        [eb1a:e320]</div><div class='del'>-	 51 -&gt; Terratec Hybrid XS Secam                 (em2880)        [0ccd:004c]</div><div class='del'>-	 52 -&gt; DNT DA2 Hybrid                           (em2881)</div><div class='del'>-	 53 -&gt; Pinnacle Hybrid Pro                      (em2881)</div><div class='del'>-	 54 -&gt; Kworld VS-DVB-T 323UR                    (em2882)        [eb1a:e323]</div><div class='del'>-	 55 -&gt; Terratec Cinnergy Hybrid T USB XS (em2882) (em2882)        [0ccd:005e,0ccd:0042]</div><div class='del'>-	 56 -&gt; Pinnacle Hybrid Pro (330e)               (em2882)        [2304:0226]</div><div class='del'>-	 57 -&gt; Kworld PlusTV HD Hybrid 330              (em2883)        [eb1a:a316]</div><div class='del'>-	 58 -&gt; Compro VideoMate ForYou/Stereo           (em2820/em2840) [185b:2041]</div><div class='del'>-	 59 -&gt; Pinnacle PCTV HD Mini                    (em2874)        [2304:023f]</div><div class='del'>-	 60 -&gt; Hauppauge WinTV HVR 850                  (em2883)        [2040:651f]</div><div class='del'>-	 61 -&gt; Pixelview PlayTV Box 4 USB 2.0           (em2820/em2840)</div><div class='del'>-	 62 -&gt; Gadmei TVR200                            (em2820/em2840)</div><div class='del'>-	 63 -&gt; Kaiomy TVnPC U2                          (em2860)        [eb1a:e303]</div><div class='del'>-	 64 -&gt; Easy Cap Capture DC-60                   (em2860)        [1b80:e309]</div><div class='del'>-	 65 -&gt; IO-DATA GV-MVP/SZ                        (em2820/em2840) [04bb:0515]</div><div class='del'>-	 66 -&gt; Empire dual TV                           (em2880)</div><div class='del'>-	 67 -&gt; Terratec Grabby                          (em2860)        [0ccd:0096,0ccd:10AF]</div><div class='del'>-	 68 -&gt; Terratec AV350                           (em2860)        [0ccd:0084]</div><div class='del'>-	 69 -&gt; KWorld ATSC 315U HDTV TV Box             (em2882)        [eb1a:a313]</div><div class='del'>-	 70 -&gt; Evga inDtube                             (em2882)</div><div class='del'>-	 71 -&gt; Silvercrest Webcam 1.3mpix               (em2820/em2840)</div><div class='del'>-	 72 -&gt; Gadmei UTV330+                           (em2861)</div><div class='del'>-	 73 -&gt; Reddo DVB-C USB TV Box                   (em2870)</div><div class='del'>-	 74 -&gt; Actionmaster/LinXcel/Digitus VC211A      (em2800)</div><div class='del'>-	 75 -&gt; Dikom DK300                              (em2882)</div><div class='del'>-	 76 -&gt; KWorld PlusTV 340U or UB435-Q (ATSC)     (em2870)        [1b80:a340]</div><div class='del'>-	 77 -&gt; EM2874 Leadership ISDBT                  (em2874)</div><div class='del'>-	 78 -&gt; PCTV nanoStick T2 290e                   (em28174)       [2013:024f]</div><div class='del'>-	 79 -&gt; Terratec Cinergy H5                      (em2884)        [eb1a:2885,0ccd:10a2,0ccd:10ad,0ccd:10b6]</div><div class='del'>-	 80 -&gt; PCTV DVB-S2 Stick (460e)                 (em28174)       [2013:024c]</div><div class='del'>-	 81 -&gt; Hauppauge WinTV HVR 930C                 (em2884)        [2040:1605]</div><div class='del'>-	 82 -&gt; Terratec Cinergy HTC Stick               (em2884)        [0ccd:00b2]</div><div class='del'>-	 83 -&gt; Honestech Vidbox NW03                    (em2860)        [eb1a:5006]</div><div class='del'>-	 84 -&gt; MaxMedia UB425-TC                        (em2874)        [1b80:e425]</div><div class='del'>-	 85 -&gt; PCTV QuatroStick (510e)                  (em2884)        [2304:0242]</div><div class='del'>-	 86 -&gt; PCTV QuatroStick nano (520e)             (em2884)        [2013:0251]</div><div class='del'>-	 87 -&gt; Terratec Cinergy HTC USB XS              (em2884)        [0ccd:008e,0ccd:00ac]</div><div class='del'>-	 88 -&gt; C3 Tech Digital Duo HDTV/SDTV USB        (em2884)        [1b80:e755]</div><div class='del'>-	 89 -&gt; Delock 61959                             (em2874)        [1b80:e1cc]</div><div class='del'>-	 90 -&gt; KWorld USB ATSC TV Stick UB435-Q V2      (em2874)        [1b80:e346]</div><div class='del'>-	 91 -&gt; SpeedLink Vicious And Devine Laplace webcam (em2765)        [1ae7:9003,1ae7:9004]</div><div class='del'>-	 92 -&gt; PCTV DVB-S2 Stick (461e)                 (em28178)       [2013:0258]</div><div class='del'>-	 93 -&gt; KWorld USB ATSC TV Stick UB435-Q V3      (em2874)        [1b80:e34c]</div><div class='del'>-	 94 -&gt; PCTV tripleStick (292e)                  (em28178)       [2013:025f,2040:0264]</div><div class='del'>-	 95 -&gt; Leadtek VC100                            (em2861)        [0413:6f07]</div><div class='del'>-	 96 -&gt; Terratec Cinergy T2 Stick HD             (em28178)       [eb1a:8179]</div><div class='del'>-	 97 -&gt; Elgato EyeTV Hybrid 2008 INT             (em2884)        [0fd9:0018]</div><div class='del'>-	 98 -&gt; PLEX PX-BCUD                             (em28178)       [3275:0085]</div><div class='del'>-	 99 -&gt; Hauppauge WinTV-dualHD DVB               (em28174)       [2040:0265]</div><div class='add'>+=========== ==================================================================== ================ ==================================================================================================================================</div><div class='add'>+Card number Card name                                                            Empia Chip       USB IDs</div><div class='add'>+=========== ==================================================================== ================ ==================================================================================================================================</div><div class='add'>+0           Unknown EM2800 video grabber                                         em2800           eb1a:2800</div><div class='add'>+1           Unknown EM2750/28xx video grabber                                    em2820 or em2840 eb1a:2710, eb1a:2820, eb1a:2821, eb1a:2860, eb1a:2861, eb1a:2862, eb1a:2863, eb1a:2870, eb1a:2881, eb1a:2883, eb1a:2868, eb1a:2875</div><div class='add'>+2           Terratec Cinergy 250 USB                                             em2820 or em2840 0ccd:0036</div><div class='add'>+3           Pinnacle PCTV USB 2                                                  em2820 or em2840 2304:0208</div><div class='add'>+4           Hauppauge WinTV USB 2                                                em2820 or em2840 2040:4200, 2040:4201</div><div class='add'>+5           MSI VOX USB 2.0                                                      em2820 or em2840</div><div class='add'>+6           Terratec Cinergy 200 USB                                             em2800</div><div class='add'>+7           Leadtek Winfast USB II                                               em2800           0413:6023</div><div class='add'>+8           Kworld USB2800                                                       em2800</div><div class='add'>+9           Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker  em2820 or em2840 1b80:e302, 1b80:e304, 2304:0207, 2304:021a, 093b:a003</div><div class='add'>+10          Hauppauge WinTV HVR 900                                              em2880           2040:6500</div><div class='add'>+11          Terratec Hybrid XS                                                   em2880</div><div class='add'>+12          Kworld PVR TV 2800 RF                                                em2820 or em2840</div><div class='add'>+13          Terratec Prodigy XS                                                  em2880</div><div class='add'>+14          SIIG AVTuner-PVR / Pixelview Prolink PlayTV USB 2.0                  em2820 or em2840</div><div class='add'>+15          V-Gear PocketTV                                                      em2800</div><div class='add'>+16          Hauppauge WinTV HVR 950                                              em2883           2040:6513, 2040:6517, 2040:651b</div><div class='add'>+17          Pinnacle PCTV HD Pro Stick                                           em2880           2304:0227</div><div class='add'>+18          Hauppauge WinTV HVR 900 (R2)                                         em2880           2040:6502</div><div class='add'>+19          EM2860/SAA711X Reference Design                                      em2860</div><div class='add'>+20          AMD ATI TV Wonder HD 600                                             em2880           0438:b002</div><div class='add'>+21          eMPIA Technology, Inc. GrabBeeX+ Video Encoder                       em2800           eb1a:2801</div><div class='add'>+22          EM2710/EM2750/EM2751 webcam grabber                                  em2750           eb1a:2750, eb1a:2751</div><div class='add'>+23          Huaqi DLCW-130                                                       em2750</div><div class='add'>+24          D-Link DUB-T210 TV Tuner                                             em2820 or em2840 2001:f112</div><div class='add'>+25          Gadmei UTV310                                                        em2820 or em2840</div><div class='add'>+26          Hercules Smart TV USB 2.0                                            em2820 or em2840</div><div class='add'>+27          Pinnacle PCTV USB 2 (Philips FM1216ME)                               em2820 or em2840</div><div class='add'>+28          Leadtek Winfast USB II Deluxe                                        em2820 or em2840</div><div class='add'>+29          EM2860/TVP5150 Reference Design                                      em2860</div><div class='add'>+30          Videology 20K14XUSB USB2.0                                           em2820 or em2840</div><div class='add'>+31          Usbgear VD204v9                                                      em2821</div><div class='add'>+32          Supercomp USB 2.0 TV                                                 em2821</div><div class='add'>+33          Elgato Video Capture                                                 em2860           0fd9:0033</div><div class='add'>+34          Terratec Cinergy A Hybrid XS                                         em2860           0ccd:004f</div><div class='add'>+35          Typhoon DVD Maker                                                    em2860</div><div class='add'>+36          NetGMBH Cam                                                          em2860</div><div class='add'>+37          Gadmei UTV330                                                        em2860           eb1a:50a6</div><div class='add'>+38          Yakumo MovieMixer                                                    em2861</div><div class='add'>+39          KWorld PVRTV 300U                                                    em2861           eb1a:e300</div><div class='add'>+40          Plextor ConvertX PX-TV100U                                           em2861           093b:a005</div><div class='add'>+41          Kworld 350 U DVB-T                                                   em2870           eb1a:e350</div><div class='add'>+42          Kworld 355 U DVB-T                                                   em2870           eb1a:e355, eb1a:e357, eb1a:e359</div><div class='add'>+43          Terratec Cinergy T XS                                                em2870</div><div class='add'>+44          Terratec Cinergy T XS (MT2060)                                       em2870           0ccd:0043</div><div class='add'>+45          Pinnacle PCTV DVB-T                                                  em2870</div><div class='add'>+46          Compro, VideoMate U3                                                 em2870           185b:2870</div><div class='add'>+47          KWorld DVB-T 305U                                                    em2880           eb1a:e305</div><div class='add'>+48          KWorld DVB-T 310U                                                    em2880</div><div class='add'>+49          MSI DigiVox A/D                                                      em2880           eb1a:e310</div><div class='add'>+50          MSI DigiVox A/D II                                                   em2880           eb1a:e320</div><div class='add'>+51          Terratec Hybrid XS Secam                                             em2880           0ccd:004c</div><div class='add'>+52          DNT DA2 Hybrid                                                       em2881</div><div class='add'>+53          Pinnacle Hybrid Pro                                                  em2881</div><div class='add'>+54          Kworld VS-DVB-T 323UR                                                em2882           eb1a:e323</div><div class='add'>+55          Terratec Cinnergy Hybrid T USB XS (em2882)                           em2882           0ccd:005e, 0ccd:0042</div><div class='add'>+56          Pinnacle Hybrid Pro (330e)                                           em2882           2304:0226</div><div class='add'>+57          Kworld PlusTV HD Hybrid 330                                          em2883           eb1a:a316</div><div class='add'>+58          Compro VideoMate ForYou/Stereo                                       em2820 or em2840 185b:2041</div><div class='add'>+59          Pinnacle PCTV HD Mini                                                em2874           2304:023f</div><div class='add'>+60          Hauppauge WinTV HVR 850                                              em2883           2040:651f</div><div class='add'>+61          Pixelview PlayTV Box 4 USB 2.0                                       em2820 or em2840</div><div class='add'>+62          Gadmei TVR200                                                        em2820 or em2840</div><div class='add'>+63          Kaiomy TVnPC U2                                                      em2860           eb1a:e303</div><div class='add'>+64          Easy Cap Capture DC-60                                               em2860           1b80:e309</div><div class='add'>+65          IO-DATA GV-MVP/SZ                                                    em2820 or em2840 04bb:0515</div><div class='add'>+66          Empire dual TV                                                       em2880</div><div class='add'>+67          Terratec Grabby                                                      em2860           0ccd:0096, 0ccd:10AF</div><div class='add'>+68          Terratec AV350                                                       em2860           0ccd:0084</div><div class='add'>+69          KWorld ATSC 315U HDTV TV Box                                         em2882           eb1a:a313</div><div class='add'>+70          Evga inDtube                                                         em2882</div><div class='add'>+71          Silvercrest Webcam 1.3mpix                                           em2820 or em2840</div><div class='add'>+72          Gadmei UTV330+                                                       em2861</div><div class='add'>+73          Reddo DVB-C USB TV Box                                               em2870</div><div class='add'>+74          Actionmaster/LinXcel/Digitus VC211A                                  em2800</div><div class='add'>+75          Dikom DK300                                                          em2882</div><div class='add'>+76          KWorld PlusTV 340U or UB435-Q (ATSC)                                 em2870           1b80:a340</div><div class='add'>+77          EM2874 Leadership ISDBT                                              em2874</div><div class='add'>+78          PCTV nanoStick T2 290e                                               em28174          2013:024f</div><div class='add'>+79          Terratec Cinergy H5                                                  em2884           eb1a:2885, 0ccd:10a2, 0ccd:10ad, 0ccd:10b6</div><div class='add'>+80          PCTV DVB-S2 Stick (460e)                                             em28174          2013:024c</div><div class='add'>+81          Hauppauge WinTV HVR 930C                                             em2884           2040:1605</div><div class='add'>+82          Terratec Cinergy HTC Stick                                           em2884           0ccd:00b2</div><div class='add'>+83          Honestech Vidbox NW03                                                em2860           eb1a:5006</div><div class='add'>+84          MaxMedia UB425-TC                                                    em2874           1b80:e425</div><div class='add'>+85          PCTV QuatroStick (510e)                                              em2884           2304:0242</div><div class='add'>+86          PCTV QuatroStick nano (520e)                                         em2884           2013:0251</div><div class='add'>+87          Terratec Cinergy HTC USB XS                                          em2884           0ccd:008e, 0ccd:00ac</div><div class='add'>+88          C3 Tech Digital Duo HDTV/SDTV USB                                    em2884           1b80:e755</div><div class='add'>+89          Delock 61959                                                         em2874           1b80:e1cc</div><div class='add'>+90          KWorld USB ATSC TV Stick UB435-Q V2                                  em2874           1b80:e346</div><div class='add'>+91          SpeedLink Vicious And Devine Laplace webcam                          em2765           1ae7:9003, 1ae7:9004</div><div class='add'>+92          PCTV DVB-S2 Stick (461e)                                             em28178          2013:0258</div><div class='add'>+93          KWorld USB ATSC TV Stick UB435-Q V3                                  em2874           1b80:e34c</div><div class='add'>+94          PCTV tripleStick (292e)                                              em28178          2013:025f, 2040:0264</div><div class='add'>+95          Leadtek VC100                                                        em2861           0413:6f07</div><div class='add'>+96          Terratec Cinergy T2 Stick HD                                         em28178          eb1a:8179</div><div class='add'>+97          Elgato EyeTV Hybrid 2008 INT                                         em2884           0fd9:0018</div><div class='add'>+98          PLEX PX-BCUD                                                         em28178          3275:0085</div><div class='add'>+99          Hauppauge WinTV-dualHD DVB                                           em28174          2040:0265</div><div class='add'>+=========== ==================================================================== ================ ==================================================================================================================================</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/gspca-cardlist.rst b/Documentation/media/v4l-drivers/gspca-cardlist.rst<br/>index 33a8ac7d73ab..e18d87e80d78 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/gspca-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/gspca-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/gspca-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/gspca-cardlist.rst</a></div><div class='hunk'>@@ -6,407 +6,444 @@ The modules for the gspca webcam drivers are:</div><div class='ctx'> - gspca_main: main driver</div><div class='ctx'> - gspca\_\ *driver*: subdriver module with *driver* as follows</div><div class='ctx'> </div><div class='del'>-=========	=========	====================================================================</div><div class='add'>+=========	=========	===================================================================</div><div class='ctx'> *driver*	vend:prod	Device</div><div class='del'>-=========	=========	====================================================================</div><div class='del'>-spca501		0000:0000	MystFromOri Unknown Camera</div><div class='del'>-spca508		0130:0130	Clone Digital Webcam 11043</div><div class='del'>-zc3xx		03f0:1b07	HP Premium Starter Cam</div><div class='del'>-m5602		0402:5602	ALi Video Camera Controller</div><div class='del'>-spca501		040a:0002	Kodak DVC-325</div><div class='del'>-spca500		040a:0300	Kodak EZ200</div><div class='del'>-zc3xx		041e:041e	Creative WebCam Live!</div><div class='del'>-ov519		041e:4003	Video Blaster WebCam Go Plus</div><div class='del'>-spca500		041e:400a	Creative PC-CAM 300</div><div class='del'>-sunplus		041e:400b	Creative PC-CAM 600</div><div class='del'>-sunplus		041e:4012	PC-Cam350</div><div class='del'>-sunplus		041e:4013	Creative Pccam750</div><div class='del'>-zc3xx		041e:4017	Creative Webcam Mobile PD1090</div><div class='del'>-spca508		041e:4018	Creative Webcam Vista (PD1100)</div><div class='del'>-spca561		041e:401a	Creative Webcam Vista (PD1100)</div><div class='del'>-zc3xx		041e:401c	Creative NX</div><div class='del'>-spca505		041e:401d	Creative Webcam NX ULTRA</div><div class='del'>-zc3xx		041e:401e	Creative Nx Pro</div><div class='del'>-zc3xx		041e:401f	Creative Webcam Notebook PD1171</div><div class='del'>-pac207		041e:4028	Creative Webcam Vista Plus</div><div class='del'>-zc3xx		041e:4029	Creative WebCam Vista Pro</div><div class='del'>-zc3xx		041e:4034	Creative Instant P0620</div><div class='del'>-zc3xx		041e:4035	Creative Instant P0620D</div><div class='del'>-zc3xx		041e:4036	Creative Live !</div><div class='del'>-sq930x		041e:4038	Creative Joy-IT</div><div class='del'>-zc3xx		041e:403a	Creative Nx Pro 2</div><div class='del'>-spca561		041e:403b	Creative Webcam Vista (VF0010)</div><div class='del'>-sq930x		041e:403c	Creative Live! Ultra</div><div class='del'>-sq930x		041e:403d	Creative Live! Ultra for Notebooks</div><div class='del'>-sq930x		041e:4041	Creative Live! Motion</div><div class='del'>-zc3xx		041e:4051	Creative Live!Cam Notebook Pro (VF0250)</div><div class='del'>-ov519		041e:4052	Creative Live! VISTA IM</div><div class='del'>-zc3xx		041e:4053	Creative Live!Cam Video IM</div><div class='del'>-vc032x		041e:405b	Creative Live! Cam Notebook Ultra (VC0130)</div><div class='del'>-ov519		041e:405f	Creative Live! VISTA VF0330</div><div class='del'>-ov519		041e:4060	Creative Live! VISTA VF0350</div><div class='del'>-ov519		041e:4061	Creative Live! VISTA VF0400</div><div class='del'>-ov519		041e:4064	Creative Live! VISTA VF0420</div><div class='del'>-ov519		041e:4067	Creative Live! Cam Video IM (VF0350)</div><div class='del'>-ov519		041e:4068	Creative Live! VISTA VF0470</div><div class='del'>-spca561		0458:7004	Genius VideoCAM Express V2</div><div class='del'>-sn9c2028	0458:7005	Genius Smart 300, version 2</div><div class='del'>-sunplus		0458:7006	Genius Dsc 1.3 Smart</div><div class='del'>-zc3xx		0458:7007	Genius VideoCam V2</div><div class='del'>-zc3xx		0458:700c	Genius VideoCam V3</div><div class='del'>-zc3xx		0458:700f	Genius VideoCam Web V2</div><div class='del'>-sonixj		0458:7025	Genius Eye 311Q</div><div class='del'>-sn9c20x		0458:7029	Genius Look 320s</div><div class='del'>-sonixj		0458:702e	Genius Slim 310 NB</div><div class='del'>-sn9c20x		0458:7045	Genius Look 1320 V2</div><div class='del'>-sn9c20x		0458:704a	Genius Slim 1320</div><div class='del'>-sn9c20x		0458:704c	Genius i-Look 1321</div><div class='del'>-sn9c20x		045e:00f4	LifeCam VX-6000 (SN9C20x + OV9650)</div><div class='del'>-sonixj		045e:00f5	MicroSoft VX3000</div><div class='del'>-sonixj		045e:00f7	MicroSoft VX1000</div><div class='del'>-ov519		045e:028c	Micro$oft xbox cam</div><div class='del'>-spca508		0461:0815	Micro Innovation IC200</div><div class='del'>-sunplus		0461:0821	Fujifilm MV-1</div><div class='del'>-zc3xx		0461:0a00	MicroInnovation WebCam320</div><div class='del'>-stv06xx		046d:0840	QuickCam Express</div><div class='del'>-stv06xx		046d:0850	LEGO cam / QuickCam Web</div><div class='del'>-stv06xx		046d:0870	Dexxa WebCam USB</div><div class='del'>-spca500		046d:0890	Logitech QuickCam traveler</div><div class='del'>-vc032x		046d:0892	Logitech Orbicam</div><div class='del'>-vc032x		046d:0896	Logitech Orbicam</div><div class='del'>-vc032x		046d:0897	Logitech QuickCam for Dell notebooks</div><div class='del'>-zc3xx		046d:089d	Logitech QuickCam E2500</div><div class='del'>-zc3xx		046d:08a0	Logitech QC IM</div><div class='del'>-zc3xx		046d:08a1	Logitech QC IM 0x08A1 +sound</div><div class='del'>-zc3xx		046d:08a2	Labtec Webcam Pro</div><div class='del'>-zc3xx		046d:08a3	Logitech QC Chat</div><div class='del'>-zc3xx		046d:08a6	Logitech QCim</div><div class='del'>-zc3xx		046d:08a7	Logitech QuickCam Image</div><div class='del'>-zc3xx		046d:08a9	Logitech Notebook Deluxe</div><div class='del'>-zc3xx		046d:08aa	Labtec Webcam Notebook</div><div class='del'>-zc3xx		046d:08ac	Logitech QuickCam Cool</div><div class='del'>-zc3xx		046d:08ad	Logitech QCCommunicate STX</div><div class='del'>-zc3xx		046d:08ae	Logitech QuickCam for Notebooks</div><div class='del'>-zc3xx		046d:08af	Logitech QuickCam Cool</div><div class='del'>-zc3xx		046d:08b9	Logitech QuickCam Express</div><div class='del'>-zc3xx		046d:08d7	Logitech QCam STX</div><div class='del'>-zc3xx		046d:08d9	Logitech QuickCam IM/Connect</div><div class='del'>-zc3xx		046d:08d8	Logitech Notebook Deluxe</div><div class='del'>-zc3xx		046d:08da	Logitech QuickCam Messenger</div><div class='del'>-zc3xx		046d:08dd	Logitech QuickCam for Notebooks</div><div class='del'>-spca500		046d:0900	Logitech Inc. ClickSmart 310</div><div class='del'>-spca500		046d:0901	Logitech Inc. ClickSmart 510</div><div class='del'>-sunplus		046d:0905	Logitech ClickSmart 820</div><div class='del'>-tv8532		046d:0920	Logitech QuickCam Express</div><div class='del'>-tv8532		046d:0921	Labtec Webcam</div><div class='del'>-spca561		046d:0928	Logitech QC Express Etch2</div><div class='del'>-spca561		046d:0929	Labtec Webcam Elch2</div><div class='del'>-spca561		046d:092a	Logitech QC for Notebook</div><div class='del'>-spca561		046d:092b	Labtec Webcam Plus</div><div class='del'>-spca561		046d:092c	Logitech QC chat Elch2</div><div class='del'>-spca561		046d:092d	Logitech QC Elch2</div><div class='del'>-spca561		046d:092e	Logitech QC Elch2</div><div class='del'>-spca561		046d:092f	Logitech QuickCam Express Plus</div><div class='del'>-sunplus		046d:0960	Logitech ClickSmart 420</div><div class='del'>-nw80x		046d:d001	Logitech QuickCam Pro (dark focus ring)</div><div class='del'>-sunplus		0471:0322	Philips DMVC1300K</div><div class='del'>-zc3xx		0471:0325	Philips SPC 200 NC</div><div class='del'>-zc3xx		0471:0326	Philips SPC 300 NC</div><div class='del'>-sonixj		0471:0327	Philips SPC 600 NC</div><div class='del'>-sonixj		0471:0328	Philips SPC 700 NC</div><div class='del'>-zc3xx		0471:032d	Philips SPC 210 NC</div><div class='del'>-zc3xx		0471:032e	Philips SPC 315 NC</div><div class='del'>-sonixj		0471:0330	Philips SPC 710 NC</div><div class='del'>-spca501		0497:c001	Smile International</div><div class='del'>-sunplus		04a5:3003	Benq DC 1300</div><div class='del'>-sunplus		04a5:3008	Benq DC 1500</div><div class='del'>-sunplus		04a5:300a	Benq DC 3410</div><div class='del'>-spca500		04a5:300c	Benq DC 1016</div><div class='del'>-benq		04a5:3035	Benq DC E300</div><div class='del'>-finepix		04cb:0104	Fujifilm FinePix 4800</div><div class='del'>-finepix		04cb:0109	Fujifilm FinePix A202</div><div class='del'>-finepix		04cb:010b	Fujifilm FinePix A203</div><div class='del'>-finepix		04cb:010f	Fujifilm FinePix A204</div><div class='del'>-finepix		04cb:0111	Fujifilm FinePix A205</div><div class='del'>-finepix		04cb:0113	Fujifilm FinePix A210</div><div class='del'>-finepix		04cb:0115	Fujifilm FinePix A303</div><div class='del'>-finepix		04cb:0117	Fujifilm FinePix A310</div><div class='del'>-finepix		04cb:0119	Fujifilm FinePix F401</div><div class='del'>-finepix		04cb:011b	Fujifilm FinePix F402</div><div class='del'>-finepix		04cb:011d	Fujifilm FinePix F410</div><div class='del'>-finepix		04cb:0121	Fujifilm FinePix F601</div><div class='del'>-finepix		04cb:0123	Fujifilm FinePix F700</div><div class='del'>-finepix		04cb:0125	Fujifilm FinePix M603</div><div class='del'>-finepix		04cb:0127	Fujifilm FinePix S300</div><div class='del'>-finepix		04cb:0129	Fujifilm FinePix S304</div><div class='del'>-finepix		04cb:012b	Fujifilm FinePix S500</div><div class='del'>-finepix		04cb:012d	Fujifilm FinePix S602</div><div class='del'>-finepix		04cb:012f	Fujifilm FinePix S700</div><div class='del'>-finepix		04cb:0131	Fujifilm FinePix unknown model</div><div class='del'>-finepix		04cb:013b	Fujifilm FinePix unknown model</div><div class='del'>-finepix		04cb:013d	Fujifilm FinePix unknown model</div><div class='del'>-finepix		04cb:013f	Fujifilm FinePix F420</div><div class='del'>-sunplus		04f1:1001	JVC GC A50</div><div class='del'>-spca561		04fc:0561	Flexcam 100</div><div class='del'>-spca1528	04fc:1528	Sunplus MD80 clone</div><div class='del'>-sunplus		04fc:500c	Sunplus CA500C</div><div class='del'>-sunplus		04fc:504a	Aiptek Mini PenCam 1.3</div><div class='del'>-sunplus		04fc:504b	Maxell MaxPocket LE 1.3</div><div class='del'>-sunplus		04fc:5330	Digitrex 2110</div><div class='del'>-sunplus		04fc:5360	Sunplus Generic</div><div class='del'>-spca500		04fc:7333	PalmPixDC85</div><div class='del'>-sunplus		04fc:ffff	Pure DigitalDakota</div><div class='del'>-nw80x		0502:d001	DVC V6</div><div class='del'>-spca501		0506:00df	3Com HomeConnect Lite</div><div class='del'>-sunplus		052b:1507	Megapixel 5 Pretec DC-1007</div><div class='del'>-sunplus		052b:1513	Megapix V4</div><div class='del'>-sunplus		052b:1803	MegaImage VI</div><div class='del'>-nw80x		052b:d001	EZCam Pro p35u</div><div class='del'>-tv8532		0545:808b	Veo Stingray</div><div class='del'>-tv8532		0545:8333	Veo Stingray</div><div class='del'>-sunplus		0546:3155	Polaroid PDC3070</div><div class='del'>-sunplus		0546:3191	Polaroid Ion 80</div><div class='del'>-sunplus		0546:3273	Polaroid PDC2030</div><div class='del'>-ov519		054c:0154	Sonny toy4</div><div class='del'>-ov519		054c:0155	Sonny toy5</div><div class='del'>-cpia1		0553:0002	CPIA CPiA (version1) based cameras</div><div class='del'>-zc3xx		055f:c005	Mustek Wcam300A</div><div class='del'>-spca500		055f:c200	Mustek Gsmart 300</div><div class='del'>-sunplus		055f:c211	Kowa Bs888e Microcamera</div><div class='del'>-spca500		055f:c220	Gsmart Mini</div><div class='del'>-sunplus		055f:c230	Mustek Digicam 330K</div><div class='del'>-sunplus		055f:c232	Mustek MDC3500</div><div class='del'>-sunplus		055f:c360	Mustek DV4000 Mpeg4</div><div class='del'>-sunplus		055f:c420	Mustek gSmart Mini 2</div><div class='del'>-sunplus		055f:c430	Mustek Gsmart LCD 2</div><div class='del'>-sunplus		055f:c440	Mustek DV 3000</div><div class='del'>-sunplus		055f:c520	Mustek gSmart Mini 3</div><div class='del'>-sunplus		055f:c530	Mustek Gsmart LCD 3</div><div class='del'>-sunplus		055f:c540	Gsmart D30</div><div class='del'>-sunplus		055f:c630	Mustek MDC4000</div><div class='del'>-sunplus		055f:c650	Mustek MDC5500Z</div><div class='del'>-nw80x		055f:d001	Mustek Wcam 300 mini</div><div class='del'>-zc3xx		055f:d003	Mustek WCam300A</div><div class='del'>-zc3xx		055f:d004	Mustek WCam300 AN</div><div class='del'>-conex		0572:0041	Creative Notebook cx11646</div><div class='del'>-ov519		05a9:0511	Video Blaster WebCam 3/WebCam Plus, D-Link USB Digital Video Camera</div><div class='del'>-ov519		05a9:0518	Creative WebCam</div><div class='del'>-ov519		05a9:0519	OV519 Microphone</div><div class='del'>-ov519		05a9:0530	OmniVision</div><div class='del'>-ov534_9		05a9:1550	OmniVision VEHO Filmscanner</div><div class='del'>-ov519		05a9:2800	OmniVision SuperCAM</div><div class='del'>-ov519		05a9:4519	Webcam Classic</div><div class='del'>-ov534_9		05a9:8065	OmniVision test kit ov538+ov9712</div><div class='del'>-ov519		05a9:8519	OmniVision</div><div class='del'>-ov519		05a9:a511	D-Link USB Digital Video Camera</div><div class='del'>-ov519		05a9:a518	D-Link DSB-C310 Webcam</div><div class='del'>-sunplus		05da:1018	Digital Dream Enigma 1.3</div><div class='del'>-stk014		05e1:0893	Syntek DV4000</div><div class='del'>-gl860		05e3:0503	Genesys Logic PC Camera</div><div class='del'>-gl860		05e3:f191	Genesys Logic PC Camera</div><div class='del'>-spca561		060b:a001	Maxell Compact Pc PM3</div><div class='del'>-zc3xx		0698:2003	CTX M730V built in</div><div class='del'>-topro		06a2:0003	TP6800 PC Camera, CmoX CX0342 webcam</div><div class='del'>-topro		06a2:6810	Creative Qmax</div><div class='del'>-nw80x		06a5:0000	Typhoon Webcam 100 USB</div><div class='del'>-nw80x		06a5:d001	Divio based webcams</div><div class='del'>-nw80x		06a5:d800	Divio Chicony TwinkleCam, Trust SpaceCam</div><div class='del'>-spca500		06bd:0404	Agfa CL20</div><div class='del'>-spca500		06be:0800	Optimedia</div><div class='del'>-nw80x		06be:d001	EZCam Pro p35u</div><div class='del'>-sunplus		06d6:0031	Trust 610 LCD PowerC@m Zoom</div><div class='del'>-spca506		06e1:a190	ADS Instant VCD</div><div class='del'>-ov534		06f8:3002	Hercules Blog Webcam</div><div class='del'>-ov534_9		06f8:3003	Hercules Dualpix HD Weblog</div><div class='del'>-sonixj		06f8:3004	Hercules Classic Silver</div><div class='del'>-sonixj		06f8:3008	Hercules Deluxe Optical Glass</div><div class='del'>-pac7302		06f8:3009	Hercules Classic Link</div><div class='del'>-pac7302		06f8:301b	Hercules Link</div><div class='del'>-nw80x		0728:d001	AVerMedia Camguard</div><div class='del'>-spca508		0733:0110	ViewQuest VQ110</div><div class='del'>-spca501		0733:0401	Intel Create and Share</div><div class='del'>-spca501		0733:0402	ViewQuest M318B</div><div class='del'>-spca505		0733:0430	Intel PC Camera Pro</div><div class='del'>-sunplus		0733:1311	Digital Dream Epsilon 1.3</div><div class='del'>-sunplus		0733:1314	Mercury 2.1MEG Deluxe Classic Cam</div><div class='del'>-sunplus		0733:2211	Jenoptik jdc 21 LCD</div><div class='del'>-sunplus		0733:2221	Mercury Digital Pro 3.1p</div><div class='del'>-sunplus		0733:3261	Concord 3045 spca536a</div><div class='del'>-sunplus		0733:3281	Cyberpix S550V</div><div class='del'>-spca506		0734:043b	3DeMon USB Capture aka</div><div class='del'>-cpia1		0813:0001	QX3 camera</div><div class='del'>-ov519		0813:0002	Dual Mode USB Camera Plus</div><div class='del'>-spca500		084d:0003	D-Link DSC-350</div><div class='del'>-spca500		08ca:0103	Aiptek PocketDV</div><div class='del'>-sunplus		08ca:0104	Aiptek PocketDVII 1.3</div><div class='del'>-sunplus		08ca:0106	Aiptek Pocket DV3100+</div><div class='del'>-mr97310a	08ca:0110	Trust Spyc@m 100</div><div class='del'>-mr97310a	08ca:0111	Aiptek PenCam VGA+</div><div class='del'>-sunplus		08ca:2008	Aiptek Mini PenCam 2 M</div><div class='del'>-sunplus		08ca:2010	Aiptek PocketCam 3M</div><div class='del'>-sunplus		08ca:2016	Aiptek PocketCam 2 Mega</div><div class='del'>-sunplus		08ca:2018	Aiptek Pencam SD 2M</div><div class='del'>-sunplus		08ca:2020	Aiptek Slim 3000F</div><div class='del'>-sunplus		08ca:2022	Aiptek Slim 3200</div><div class='del'>-sunplus		08ca:2024	Aiptek DV3500 Mpeg4</div><div class='del'>-sunplus		08ca:2028	Aiptek PocketCam4M</div><div class='del'>-sunplus		08ca:2040	Aiptek PocketDV4100M</div><div class='del'>-sunplus		08ca:2042	Aiptek PocketDV5100</div><div class='del'>-sunplus		08ca:2050	Medion MD 41437</div><div class='del'>-sunplus		08ca:2060	Aiptek PocketDV5300</div><div class='del'>-tv8532		0923:010f	ICM532 cams</div><div class='del'>-mars		093a:050f	Mars-Semi Pc-Camera</div><div class='del'>-mr97310a	093a:010e	All known CIF cams with this ID</div><div class='del'>-mr97310a	093a:010f	All known VGA cams with this ID</div><div class='del'>-pac207		093a:2460	Qtec Webcam 100</div><div class='del'>-pac207		093a:2461	HP Webcam</div><div class='del'>-pac207		093a:2463	Philips SPC 220 NC</div><div class='del'>-pac207		093a:2464	Labtec Webcam 1200</div><div class='del'>-pac207		093a:2468	Webcam WB-1400T</div><div class='del'>-pac207		093a:2470	Genius GF112</div><div class='del'>-pac207		093a:2471	Genius VideoCam ge111</div><div class='del'>-pac207		093a:2472	Genius VideoCam ge110</div><div class='del'>-pac207		093a:2474	Genius iLook 111</div><div class='del'>-pac207		093a:2476	Genius e-Messenger 112</div><div class='del'>-pac7311		093a:2600	PAC7311 Typhoon</div><div class='del'>-pac7311		093a:2601	Philips SPC 610 NC</div><div class='del'>-pac7311		093a:2603	Philips SPC 500 NC</div><div class='del'>-pac7311		093a:2608	Trust WB-3300p</div><div class='del'>-pac7311		093a:260e	Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350</div><div class='del'>-pac7311		093a:260f	SnakeCam</div><div class='del'>-pac7302		093a:2620	Apollo AC-905</div><div class='del'>-pac7302		093a:2621	PAC731x</div><div class='del'>-pac7302		093a:2622	Genius Eye 312</div><div class='del'>-pac7302		093a:2624	PAC7302</div><div class='del'>-pac7302		093a:2625	Genius iSlim 310</div><div class='del'>-pac7302		093a:2626	Labtec 2200</div><div class='del'>-pac7302		093a:2627	Genius FaceCam 300</div><div class='del'>-pac7302		093a:2628	Genius iLook 300</div><div class='del'>-pac7302		093a:2629	Genious iSlim 300</div><div class='del'>-pac7302		093a:262a	Webcam 300k</div><div class='del'>-pac7302		093a:262c	Philips SPC 230 NC</div><div class='del'>-jl2005bcd	0979:0227	Various brands, 19 known cameras supported</div><div class='del'>-jeilinj		0979:0280	Sakar 57379</div><div class='del'>-jeilinj		0979:0280	Sportscam DV15</div><div class='del'>-zc3xx		0ac8:0302	Z-star Vimicro zc0302</div><div class='del'>-vc032x		0ac8:0321	Vimicro generic vc0321</div><div class='del'>-vc032x		0ac8:0323	Vimicro Vc0323</div><div class='del'>-vc032x		0ac8:0328	A4Tech PK-130MG</div><div class='del'>-zc3xx		0ac8:301b	Z-Star zc301b</div><div class='del'>-zc3xx		0ac8:303b	Vimicro 0x303b</div><div class='del'>-zc3xx		0ac8:305b	Z-star Vimicro zc0305b</div><div class='del'>-zc3xx		0ac8:307b	PC Camera (ZS0211)</div><div class='del'>-vc032x		0ac8:c001	Sony embedded vimicro</div><div class='del'>-vc032x		0ac8:c002	Sony embedded vimicro</div><div class='del'>-vc032x		0ac8:c301	Samsung Q1 Ultra Premium</div><div class='del'>-spca508		0af9:0010	Hama USB Sightcam 100</div><div class='del'>-spca508		0af9:0011	Hama USB Sightcam 100</div><div class='del'>-ov519		0b62:0059	iBOT2 Webcam</div><div class='del'>-sonixb		0c45:6001	Genius VideoCAM NB</div><div class='del'>-sonixb		0c45:6005	Microdia Sweex Mini Webcam</div><div class='del'>-sonixb		0c45:6007	Sonix sn9c101 + Tas5110D</div><div class='del'>-sonixb		0c45:6009	spcaCam@120</div><div class='del'>-sonixb		0c45:600d	spcaCam@120</div><div class='del'>-sonixb		0c45:6011	Microdia PC Camera (SN9C102)</div><div class='del'>-sonixb		0c45:6019	Generic Sonix OV7630</div><div class='del'>-sonixb		0c45:6024	Generic Sonix Tas5130c</div><div class='del'>-sonixb		0c45:6025	Xcam Shanga</div><div class='del'>-sonixb		0c45:6028	Sonix Btc Pc380</div><div class='del'>-sonixb		0c45:6029	spcaCam@150</div><div class='del'>-sonixb		0c45:602c	Generic Sonix OV7630</div><div class='del'>-sonixb		0c45:602d	LIC-200 LG</div><div class='del'>-sonixb		0c45:602e	Genius VideoCam Messenger</div><div class='del'>-sonixj		0c45:6040	Speed NVC 350K</div><div class='del'>-sonixj		0c45:607c	Sonix sn9c102p Hv7131R</div><div class='del'>-sonixj		0c45:60c0	Sangha Sn535</div><div class='del'>-sonixj		0c45:60ce	USB-PC-Camera-168 (TALK-5067)</div><div class='del'>-sonixj		0c45:60ec	SN9C105+MO4000</div><div class='del'>-sonixj		0c45:60fb	Surfer NoName</div><div class='del'>-sonixj		0c45:60fc	LG-LIC300</div><div class='del'>-sonixj		0c45:60fe	Microdia Audio</div><div class='del'>-sonixj		0c45:6100	PC Camera (SN9C128)</div><div class='del'>-sonixj		0c45:6102	PC Camera (SN9C128)</div><div class='del'>-sonixj		0c45:610a	PC Camera (SN9C128)</div><div class='del'>-sonixj		0c45:610b	PC Camera (SN9C128)</div><div class='del'>-sonixj		0c45:610c	PC Camera (SN9C128)</div><div class='del'>-sonixj		0c45:610e	PC Camera (SN9C128)</div><div class='del'>-sonixj		0c45:6128	Microdia/Sonix SNP325</div><div class='del'>-sonixj		0c45:612a	Avant Camera</div><div class='del'>-sonixj		0c45:612b	Speed-Link REFLECT2</div><div class='del'>-sonixj		0c45:612c	Typhoon Rasy Cam 1.3MPix</div><div class='del'>-sonixj		0c45:6130	Sonix Pccam</div><div class='del'>-sonixj		0c45:6138	Sn9c120 Mo4000</div><div class='del'>-sonixj		0c45:613a	Microdia Sonix PC Camera</div><div class='del'>-sonixj		0c45:613b	Surfer SN-206</div><div class='del'>-sonixj		0c45:613c	Sonix Pccam168</div><div class='del'>-sonixj		0c45:6142	Hama PC-Webcam AC-150</div><div class='del'>-sonixj		0c45:6143	Sonix Pccam168</div><div class='del'>-sonixj		0c45:6148	Digitus DA-70811/ZSMC USB PC Camera ZS211/Microdia</div><div class='del'>-sonixj		0c45:614a	Frontech E-Ccam (JIL-2225)</div><div class='del'>-sn9c20x		0c45:6240	PC Camera (SN9C201 + MT9M001)</div><div class='del'>-sn9c20x		0c45:6242	PC Camera (SN9C201 + MT9M111)</div><div class='del'>-sn9c20x		0c45:6248	PC Camera (SN9C201 + OV9655)</div><div class='del'>-sn9c20x		0c45:624c	PC Camera (SN9C201 + MT9M112)</div><div class='del'>-sn9c20x		0c45:624e	PC Camera (SN9C201 + SOI968)</div><div class='del'>-sn9c20x		0c45:624f	PC Camera (SN9C201 + OV9650)</div><div class='del'>-sn9c20x		0c45:6251	PC Camera (SN9C201 + OV9650)</div><div class='del'>-sn9c20x		0c45:6253	PC Camera (SN9C201 + OV9650)</div><div class='del'>-sn9c20x		0c45:6260	PC Camera (SN9C201 + OV7670)</div><div class='del'>-sn9c20x		0c45:6270	PC Camera (SN9C201 + MT9V011/MT9V111/MT9V112)</div><div class='del'>-sn9c20x		0c45:627b	PC Camera (SN9C201 + OV7660)</div><div class='del'>-sn9c20x		0c45:627c	PC Camera (SN9C201 + HV7131R)</div><div class='del'>-sn9c20x		0c45:627f	PC Camera (SN9C201 + OV9650)</div><div class='del'>-sn9c20x		0c45:6280	PC Camera (SN9C202 + MT9M001)</div><div class='del'>-sn9c20x		0c45:6282	PC Camera (SN9C202 + MT9M111)</div><div class='del'>-sn9c20x		0c45:6288	PC Camera (SN9C202 + OV9655)</div><div class='del'>-sn9c20x		0c45:628c	PC Camera (SN9C201 + MT9M112)</div><div class='del'>-sn9c20x		0c45:628e	PC Camera (SN9C202 + SOI968)</div><div class='del'>-sn9c20x		0c45:628f	PC Camera (SN9C202 + OV9650)</div><div class='del'>-sn9c20x		0c45:62a0	PC Camera (SN9C202 + OV7670)</div><div class='del'>-sn9c20x		0c45:62b0	PC Camera (SN9C202 + MT9V011/MT9V111/MT9V112)</div><div class='del'>-sn9c20x		0c45:62b3	PC Camera (SN9C202 + OV9655)</div><div class='del'>-sn9c20x		0c45:62bb	PC Camera (SN9C202 + OV7660)</div><div class='del'>-sn9c20x		0c45:62bc	PC Camera (SN9C202 + HV7131R)</div><div class='del'>-sn9c2028	0c45:8001	Wild Planet Digital Spy Camera</div><div class='del'>-sn9c2028	0c45:8003	Sakar #11199, #6637x, #67480 keychain cams</div><div class='del'>-sn9c2028	0c45:8008	Mini-Shotz ms-350</div><div class='del'>-sn9c2028	0c45:800a	Vivitar Vivicam 3350B</div><div class='del'>-sunplus		0d64:0303	Sunplus FashionCam DXG</div><div class='del'>-ov519		0e96:c001	TRUST 380 USB2 SPACEC@M</div><div class='del'>-etoms		102c:6151	Qcam Sangha CIF</div><div class='del'>-etoms		102c:6251	Qcam xxxxxx VGA</div><div class='del'>-ov519		1046:9967	W9967CF/W9968CF WebCam IC, Video Blaster WebCam Go</div><div class='del'>-zc3xx		10fd:0128	Typhoon Webshot II USB 300k 0x0128</div><div class='del'>-spca561		10fd:7e50	FlyCam Usb 100</div><div class='del'>-zc3xx		10fd:8050	Typhoon Webshot II USB 300k</div><div class='del'>-ov534		1415:2000	Sony HD Eye for PS3 (SLEH 00201)</div><div class='del'>-pac207		145f:013a	Trust WB-1300N</div><div class='del'>-sn9c20x		145f:013d	Trust WB-3600R</div><div class='del'>-vc032x		15b8:6001	HP 2.0 Megapixel</div><div class='del'>-vc032x		15b8:6002	HP 2.0 Megapixel rz406aa</div><div class='del'>-spca501		1776:501c	Arowana 300K CMOS Camera</div><div class='del'>-t613		17a1:0128	TASCORP JPEG Webcam, NGS Cyclops</div><div class='del'>-vc032x		17ef:4802	Lenovo Vc0323+MI1310_SOC</div><div class='del'>-pac207		2001:f115	D-Link DSB-C120</div><div class='del'>-sq905c		2770:9050	Disney pix micro (CIF)</div><div class='del'>-sq905c		2770:9051	Lego Bionicle</div><div class='del'>-sq905c		2770:9052	Disney pix micro 2 (VGA)</div><div class='del'>-sq905c		2770:905c	All 11 known cameras with this ID</div><div class='del'>-sq905		2770:9120	All 24 known cameras with this ID</div><div class='del'>-sq905c		2770:913d	All 4 known cameras with this ID</div><div class='del'>-sq930x		2770:930b	Sweex Motion Tracking / I-Tec iCam Tracer</div><div class='del'>-sq930x		2770:930c	Trust WB-3500T / NSG Robbie 2.0</div><div class='del'>-spca500		2899:012c	Toptro Industrial</div><div class='del'>-ov519		8020:ef04	ov519</div><div class='del'>-spca508		8086:0110	Intel Easy PC Camera</div><div class='del'>-spca500		8086:0630	Intel Pocket PC Camera</div><div class='del'>-spca506		99fa:8988	Grandtec V.cap</div><div class='del'>-sn9c20x		a168:0610	Dino-Lite Digital Microscope (SN9C201 + HV7131R)</div><div class='del'>-sn9c20x		a168:0611	Dino-Lite Digital Microscope (SN9C201 + HV7131R)</div><div class='del'>-sn9c20x		a168:0613	Dino-Lite Digital Microscope (SN9C201 + HV7131R)</div><div class='del'>-sn9c20x		a168:0618	Dino-Lite Digital Microscope (SN9C201 + HV7131R)</div><div class='del'>-sn9c20x		a168:0614	Dino-Lite Digital Microscope (SN9C201 + MT9M111)</div><div class='del'>-sn9c20x		a168:0615	Dino-Lite Digital Microscope (SN9C201 + MT9M111)</div><div class='del'>-sn9c20x		a168:0617	Dino-Lite Digital Microscope (SN9C201 + MT9M111)</div><div class='del'>-spca561		abcd:cdee	Petcam</div><div class='del'>-=========	=========	====================================================================</div><div class='add'>+=========	=========	===================================================================</div><div class='add'>+spca501         0000:0000	MystFromOri Unknown Camera</div><div class='add'>+spca508         0130:0130	Clone Digital Webcam 11043</div><div class='add'>+se401           03e8:0004	Endpoints/AoxSE401</div><div class='add'>+zc3xx           03f0:1b07	HP Premium Starter Cam</div><div class='add'>+m5602           0402:5602	ALi Video Camera Controller</div><div class='add'>+spca501         040a:0002	Kodak DVC-325</div><div class='add'>+spca500         040a:0300	Kodak EZ200</div><div class='add'>+zc3xx           041e:041e	Creative WebCam Live!</div><div class='add'>+ov519           041e:4003	Video Blaster WebCam Go Plus</div><div class='add'>+stv0680         041e:4007	Go Mini</div><div class='add'>+spca500         041e:400a	Creative PC-CAM 300</div><div class='add'>+sunplus         041e:400b	Creative PC-CAM 600</div><div class='add'>+sunplus         041e:4012	PC-Cam350</div><div class='add'>+sunplus         041e:4013	Creative Pccam750</div><div class='add'>+zc3xx           041e:4017	Creative Webcam Mobile PD1090</div><div class='add'>+spca508         041e:4018	Creative Webcam Vista (PD1100)</div><div class='add'>+spca561         041e:401a	Creative Webcam Vista (PD1100)</div><div class='add'>+zc3xx           041e:401c	Creative NX</div><div class='add'>+spca505         041e:401d	Creative Webcam NX ULTRA</div><div class='add'>+zc3xx           041e:401e	Creative Nx Pro</div><div class='add'>+zc3xx           041e:401f	Creative Webcam Notebook PD1171</div><div class='add'>+zc3xx           041e:4022	Webcam NX Pro</div><div class='add'>+pac207          041e:4028	Creative Webcam Vista Plus</div><div class='add'>+zc3xx           041e:4029	Creative WebCam Vista Pro</div><div class='add'>+zc3xx           041e:4034	Creative Instant P0620</div><div class='add'>+zc3xx           041e:4035	Creative Instant P0620D</div><div class='add'>+zc3xx           041e:4036	Creative Live !</div><div class='add'>+sq930x          041e:4038	Creative Joy-IT</div><div class='add'>+zc3xx           041e:403a	Creative Nx Pro 2</div><div class='add'>+spca561         041e:403b	Creative Webcam Vista (VF0010)</div><div class='add'>+sq930x          041e:403c	Creative Live! Ultra</div><div class='add'>+sq930x          041e:403d	Creative Live! Ultra for Notebooks</div><div class='add'>+sq930x          041e:4041	Creative Live! Motion</div><div class='add'>+zc3xx           041e:4051	Creative Live!Cam Notebook Pro (VF0250)</div><div class='add'>+ov519           041e:4052	Creative Live! VISTA IM</div><div class='add'>+zc3xx           041e:4053	Creative Live!Cam Video IM</div><div class='add'>+vc032x          041e:405b	Creative Live! Cam Notebook Ultra (VC0130)</div><div class='add'>+ov519           041e:405f	Creative Live! VISTA VF0330</div><div class='add'>+ov519           041e:4060	Creative Live! VISTA VF0350</div><div class='add'>+ov519           041e:4061	Creative Live! VISTA VF0400</div><div class='add'>+ov519           041e:4064	Creative Live! VISTA VF0420</div><div class='add'>+ov519           041e:4067	Creative Live! Cam Video IM (VF0350)</div><div class='add'>+ov519           041e:4068	Creative Live! VISTA VF0470</div><div class='add'>+sn9c2028        0458:7003	GeniusVideocam Live v2</div><div class='add'>+spca561         0458:7004	Genius VideoCAM Express V2</div><div class='add'>+sn9c2028        0458:7005	Genius Smart 300, version 2</div><div class='add'>+sunplus         0458:7006	Genius Dsc 1.3 Smart</div><div class='add'>+zc3xx           0458:7007	Genius VideoCam V2</div><div class='add'>+zc3xx           0458:700c	Genius VideoCam V3</div><div class='add'>+zc3xx           0458:700f	Genius VideoCam Web V2</div><div class='add'>+sonixj          0458:7025	Genius Eye 311Q</div><div class='add'>+sn9c20x         0458:7029	Genius Look 320s</div><div class='add'>+sonixj          0458:702e	Genius Slim 310 NB</div><div class='add'>+sn9c20x         0458:7045	Genius Look 1320 V2</div><div class='add'>+sn9c20x         0458:704a	Genius Slim 1320</div><div class='add'>+sn9c20x         0458:704c	Genius i-Look 1321</div><div class='add'>+sn9c20x         045e:00f4	LifeCam VX-6000 (SN9C20x + OV9650)</div><div class='add'>+sonixj          045e:00f5	MicroSoft VX3000</div><div class='add'>+sonixj          045e:00f7	MicroSoft VX1000</div><div class='add'>+ov519           045e:028c	Micro$oft xbox cam</div><div class='add'>+kinect          045e:02ae	Xbox NUI Camera</div><div class='add'>+kinect          045e:02bf	Kinect for Windows NUI Camera</div><div class='add'>+spca561         0461:0815	Micro Innovations IC200 Webcam</div><div class='add'>+sunplus         0461:0821	Fujifilm MV-1</div><div class='add'>+zc3xx           0461:0a00	MicroInnovation WebCam320</div><div class='add'>+stv06xx         046D:08F0	QuickCamMessenger</div><div class='add'>+stv06xx         046D:08F5	QuickCamCommunicate</div><div class='add'>+stv06xx         046D:08F6	QuickCamMessenger (new)</div><div class='add'>+stv06xx         046d:0840	QuickCamExpress</div><div class='add'>+stv06xx         046d:0850	LEGOcam / QuickCam Web</div><div class='add'>+stv06xx         046d:0870	DexxaWebCam USB</div><div class='add'>+spca500         046d:0890	Logitech QuickCam traveler</div><div class='add'>+vc032x          046d:0892	Logitech Orbicam</div><div class='add'>+vc032x          046d:0896	Logitech Orbicam</div><div class='add'>+vc032x          046d:0897	Logitech QuickCam for Dell notebooks</div><div class='add'>+zc3xx           046d:089d	Logitech QuickCam E2500</div><div class='add'>+zc3xx           046d:08a0	Logitech QC IM</div><div class='add'>+zc3xx           046d:08a1	Logitech QC IM 0x08A1 +sound</div><div class='add'>+zc3xx           046d:08a2	Labtec Webcam Pro</div><div class='add'>+zc3xx           046d:08a3	Logitech QC Chat</div><div class='add'>+zc3xx           046d:08a6	Logitech QCim</div><div class='add'>+zc3xx           046d:08a7	Logitech QuickCam Image</div><div class='add'>+zc3xx           046d:08a9	Logitech Notebook Deluxe</div><div class='add'>+zc3xx           046d:08aa	Labtec Webcam Notebook</div><div class='add'>+zc3xx           046d:08ac	Logitech QuickCam Cool</div><div class='add'>+zc3xx           046d:08ad	Logitech QCCommunicate STX</div><div class='add'>+zc3xx           046d:08ae	Logitech QuickCam for Notebooks</div><div class='add'>+zc3xx           046d:08af	Logitech QuickCam Cool</div><div class='add'>+zc3xx           046d:08b9	Logitech QuickCam Express</div><div class='add'>+zc3xx           046d:08d7	Logitech QCam STX</div><div class='add'>+zc3xx           046d:08d8	Logitech Notebook Deluxe</div><div class='add'>+zc3xx           046d:08d9	Logitech QuickCam IM/Connect</div><div class='add'>+zc3xx           046d:08da	Logitech QuickCam Messenger</div><div class='add'>+zc3xx           046d:08dd	Logitech QuickCam for Notebooks</div><div class='add'>+spca500         046d:0900	Logitech Inc. ClickSmart 310</div><div class='add'>+spca500         046d:0901	Logitech Inc. ClickSmart 510</div><div class='add'>+sunplus         046d:0905	Logitech ClickSmart 820</div><div class='add'>+tv8532          046d:0920	Logitech QuickCam Express</div><div class='add'>+tv8532          046d:0921	Labtec Webcam</div><div class='add'>+spca561         046d:0928	Logitech QC Express Etch2</div><div class='add'>+spca561         046d:0929	Labtec Webcam Elch2</div><div class='add'>+spca561         046d:092a	Logitech QC for Notebook</div><div class='add'>+spca561         046d:092b	Labtec Webcam Plus</div><div class='add'>+spca561         046d:092c	Logitech QC chat Elch2</div><div class='add'>+spca561         046d:092d	Logitech QC Elch2</div><div class='add'>+spca561         046d:092e	Logitech QC Elch2</div><div class='add'>+spca561         046d:092f	Logitech QuickCam Express Plus</div><div class='add'>+sunplus         046d:0960	Logitech ClickSmart 420</div><div class='add'>+nw80x           046d:d001	Logitech QuickCam Pro (dark focus ring)</div><div class='add'>+se401           0471:030b	PhilipsPCVC665K</div><div class='add'>+sunplus         0471:0322	Philips DMVC1300K</div><div class='add'>+zc3xx           0471:0325	Philips SPC 200 NC</div><div class='add'>+zc3xx           0471:0326	Philips SPC 300 NC</div><div class='add'>+sonixj          0471:0327	Philips SPC 600 NC</div><div class='add'>+sonixj          0471:0328	Philips SPC 700 NC</div><div class='add'>+zc3xx           0471:032d	Philips SPC 210 NC</div><div class='add'>+zc3xx           0471:032e	Philips SPC 315 NC</div><div class='add'>+sonixj          0471:0330	Philips SPC 710 NC</div><div class='add'>+se401           047d:5001	Kensington67014</div><div class='add'>+se401           047d:5002	Kensington6701(5/7)</div><div class='add'>+se401           047d:5003	Kensington67016</div><div class='add'>+spca501         0497:c001	Smile International</div><div class='add'>+sunplus         04a5:3003	Benq DC 1300</div><div class='add'>+sunplus         04a5:3008	Benq DC 1500</div><div class='add'>+sunplus         04a5:300a	Benq DC 3410</div><div class='add'>+spca500         04a5:300c	Benq DC 1016</div><div class='add'>+benq            04a5:3035	Benq DC E300</div><div class='add'>+vicam           04c1:009d	HomeConnect Webcam [vicam]</div><div class='add'>+konica          04c8:0720	IntelYC 76</div><div class='add'>+finepix         04cb:0104	Fujifilm FinePix 4800</div><div class='add'>+finepix         04cb:0109	Fujifilm FinePix A202</div><div class='add'>+finepix         04cb:010b	Fujifilm FinePix A203</div><div class='add'>+finepix         04cb:010f	Fujifilm FinePix A204</div><div class='add'>+finepix         04cb:0111	Fujifilm FinePix A205</div><div class='add'>+finepix         04cb:0113	Fujifilm FinePix A210</div><div class='add'>+finepix         04cb:0115	Fujifilm FinePix A303</div><div class='add'>+finepix         04cb:0117	Fujifilm FinePix A310</div><div class='add'>+finepix         04cb:0119	Fujifilm FinePix F401</div><div class='add'>+finepix         04cb:011b	Fujifilm FinePix F402</div><div class='add'>+finepix         04cb:011d	Fujifilm FinePix F410</div><div class='add'>+finepix         04cb:0121	Fujifilm FinePix F601</div><div class='add'>+finepix         04cb:0123	Fujifilm FinePix F700</div><div class='add'>+finepix         04cb:0125	Fujifilm FinePix M603</div><div class='add'>+finepix         04cb:0127	Fujifilm FinePix S300</div><div class='add'>+finepix         04cb:0129	Fujifilm FinePix S304</div><div class='add'>+finepix         04cb:012b	Fujifilm FinePix S500</div><div class='add'>+finepix         04cb:012d	Fujifilm FinePix S602</div><div class='add'>+finepix         04cb:012f	Fujifilm FinePix S700</div><div class='add'>+finepix         04cb:0131	Fujifilm FinePix unknown model</div><div class='add'>+finepix         04cb:013b	Fujifilm FinePix unknown model</div><div class='add'>+finepix         04cb:013d	Fujifilm FinePix unknown model</div><div class='add'>+finepix         04cb:013f	Fujifilm FinePix F420</div><div class='add'>+sunplus         04f1:1001	JVC GC A50</div><div class='add'>+spca561         04fc:0561	Flexcam 100</div><div class='add'>+spca1528        04fc:1528	Sunplus MD80 clone</div><div class='add'>+sunplus         04fc:500c	Sunplus CA500C</div><div class='add'>+sunplus         04fc:504a	Aiptek Mini PenCam 1.3</div><div class='add'>+sunplus         04fc:504b	Maxell MaxPocket LE 1.3</div><div class='add'>+sunplus         04fc:5330	Digitrex 2110</div><div class='add'>+sunplus         04fc:5360	Sunplus Generic</div><div class='add'>+spca500         04fc:7333	PalmPixDC85</div><div class='add'>+sunplus         04fc:ffff	Pure DigitalDakota</div><div class='add'>+nw80x           0502:d001	DVC V6</div><div class='add'>+spca501         0506:00df	3Com HomeConnect Lite</div><div class='add'>+sunplus         052b:1507	Megapixel 5 Pretec DC-1007</div><div class='add'>+sunplus         052b:1513	Megapix V4</div><div class='add'>+sunplus         052b:1803	MegaImage VI</div><div class='add'>+nw80x           052b:d001	EZCam Pro p35u</div><div class='add'>+tv8532          0545:808b	Veo Stingray</div><div class='add'>+tv8532          0545:8333	Veo Stingray</div><div class='add'>+sunplus         0546:3155	Polaroid PDC3070</div><div class='add'>+sunplus         0546:3191	Polaroid Ion 80</div><div class='add'>+sunplus         0546:3273	Polaroid PDC2030</div><div class='add'>+touptek         0547:6801	TTUCMOS08000KPB, AS MU800</div><div class='add'>+dtcs033         0547:7303	Anchor Chips, Inc</div><div class='add'>+ov519           054c:0154	Sonny toy4</div><div class='add'>+ov519           054c:0155	Sonny toy5</div><div class='add'>+cpia1           0553:0002	CPIA CPiA (version1) based cameras</div><div class='add'>+stv0680         0553:0202	STV0680 Camera</div><div class='add'>+zc3xx           055f:c005	Mustek Wcam300A</div><div class='add'>+spca500         055f:c200	Mustek Gsmart 300</div><div class='add'>+sunplus         055f:c211	Kowa Bs888e Microcamera</div><div class='add'>+spca500         055f:c220	Gsmart Mini</div><div class='add'>+sunplus         055f:c230	Mustek Digicam 330K</div><div class='add'>+sunplus         055f:c232	Mustek MDC3500</div><div class='add'>+sunplus         055f:c360	Mustek DV4000 Mpeg4</div><div class='add'>+sunplus         055f:c420	Mustek gSmart Mini 2</div><div class='add'>+sunplus         055f:c430	Mustek Gsmart LCD 2</div><div class='add'>+sunplus         055f:c440	Mustek DV 3000</div><div class='add'>+sunplus         055f:c520	Mustek gSmart Mini 3</div><div class='add'>+sunplus         055f:c530	Mustek Gsmart LCD 3</div><div class='add'>+sunplus         055f:c540	Gsmart D30</div><div class='add'>+sunplus         055f:c630	Mustek MDC4000</div><div class='add'>+sunplus         055f:c650	Mustek MDC5500Z</div><div class='add'>+nw80x           055f:d001	Mustek Wcam 300 mini</div><div class='add'>+zc3xx           055f:d003	Mustek WCam300A</div><div class='add'>+zc3xx           055f:d004	Mustek WCam300 AN</div><div class='add'>+conex           0572:0041	Creative Notebook cx11646</div><div class='add'>+ov519           05a9:0511	Video Blaster WebCam 3/WebCam Plus, D-Link USB Digital Video Camera</div><div class='add'>+ov519           05a9:0518	Creative WebCam</div><div class='add'>+ov519           05a9:0519	OV519 Microphone</div><div class='add'>+ov519           05a9:0530	OmniVision</div><div class='add'>+ov534_9         05a9:1550	OmniVision VEHO Filmscanner</div><div class='add'>+ov519           05a9:2800	OmniVision SuperCAM</div><div class='add'>+ov519           05a9:4519	Webcam Classic</div><div class='add'>+ov534_9         05a9:8065	OmniVision test kit ov538+ov9712</div><div class='add'>+ov519           05a9:8519	OmniVision</div><div class='add'>+ov519           05a9:a511	D-Link USB Digital Video Camera</div><div class='add'>+ov519           05a9:a518	D-Link DSB-C310 Webcam</div><div class='add'>+sunplus         05da:1018	Digital Dream Enigma 1.3</div><div class='add'>+stk014          05e1:0893	Syntek DV4000</div><div class='add'>+gl860           05e3:0503	Genesys Logic PC Camera</div><div class='add'>+gl860           05e3:f191	Genesys Logic PC Camera</div><div class='add'>+vicam           0602:1001	ViCam Webcam</div><div class='add'>+spca561         060b:a001	Maxell Compact Pc PM3</div><div class='add'>+zc3xx           0698:2003	CTX M730V built in</div><div class='add'>+topro           06a2:0003	TP6800 PC Camera, CmoX CX0342 webcam</div><div class='add'>+topro           06a2:6810	Creative Qmax</div><div class='add'>+nw80x           06a5:0000	Typhoon Webcam 100 USB</div><div class='add'>+nw80x           06a5:d001	Divio based webcams</div><div class='add'>+nw80x           06a5:d800	Divio Chicony TwinkleCam, Trust SpaceCam</div><div class='add'>+spca500         06bd:0404	Agfa CL20</div><div class='add'>+spca500         06be:0800	Optimedia</div><div class='add'>+nw80x           06be:d001	EZCam Pro p35u</div><div class='add'>+sunplus         06d6:0031	Trust 610 LCD PowerC@m Zoom</div><div class='add'>+sunplus         06d6:0041	Aashima Technology B.V.</div><div class='add'>+spca506         06e1:a190	ADS Instant VCD</div><div class='add'>+ov534           06f8:3002	Hercules Blog Webcam</div><div class='add'>+ov534_9         06f8:3003	Hercules Dualpix HD Weblog</div><div class='add'>+sonixj          06f8:3004	Hercules Classic Silver</div><div class='add'>+sonixj          06f8:3008	Hercules Deluxe Optical Glass</div><div class='add'>+pac7302         06f8:3009	Hercules Classic Link</div><div class='add'>+pac7302         06f8:301b	Hercules Link</div><div class='add'>+nw80x           0728:d001	AVerMedia Camguard</div><div class='add'>+spca508         0733:0110	ViewQuest VQ110</div><div class='add'>+spca501         0733:0401	Intel Create and Share</div><div class='add'>+spca501         0733:0402	ViewQuest M318B</div><div class='add'>+spca505         0733:0430	Intel PC Camera Pro</div><div class='add'>+sunplus         0733:1311	Digital Dream Epsilon 1.3</div><div class='add'>+sunplus         0733:1314	Mercury 2.1MEG Deluxe Classic Cam</div><div class='add'>+sunplus         0733:2211	Jenoptik jdc 21 LCD</div><div class='add'>+sunplus         0733:2221	Mercury Digital Pro 3.1p</div><div class='add'>+sunplus         0733:3261	Concord 3045 spca536a</div><div class='add'>+sunplus         0733:3281	Cyberpix S550V</div><div class='add'>+spca506         0734:043b	3DeMon USB Capture aka</div><div class='add'>+cpia1           0813:0001	QX3 camera</div><div class='add'>+ov519           0813:0002	Dual Mode USB Camera Plus</div><div class='add'>+spca500         084d:0003	D-Link DSC-350</div><div class='add'>+spca500         08ca:0103	Aiptek PocketDV</div><div class='add'>+sunplus         08ca:0104	Aiptek PocketDVII 1.3</div><div class='add'>+sunplus         08ca:0106	Aiptek Pocket DV3100+</div><div class='add'>+mr97310a        08ca:0110	Trust Spyc@m 100</div><div class='add'>+mr97310a        08ca:0111	Aiptek PenCam VGA+</div><div class='add'>+sunplus         08ca:2008	Aiptek Mini PenCam 2 M</div><div class='add'>+sunplus         08ca:2010	Aiptek PocketCam 3M</div><div class='add'>+sunplus         08ca:2016	Aiptek PocketCam 2 Mega</div><div class='add'>+sunplus         08ca:2018	Aiptek Pencam SD 2M</div><div class='add'>+sunplus         08ca:2020	Aiptek Slim 3000F</div><div class='add'>+sunplus         08ca:2022	Aiptek Slim 3200</div><div class='add'>+sunplus         08ca:2024	Aiptek DV3500 Mpeg4</div><div class='add'>+sunplus         08ca:2028	Aiptek PocketCam4M</div><div class='add'>+sunplus         08ca:2040	Aiptek PocketDV4100M</div><div class='add'>+sunplus         08ca:2042	Aiptek PocketDV5100</div><div class='add'>+sunplus         08ca:2050	Medion MD 41437</div><div class='add'>+sunplus         08ca:2060	Aiptek PocketDV5300</div><div class='add'>+tv8532          0923:010f	ICM532 cams</div><div class='add'>+mr97310a        093a:010e	All known CIF cams with this ID</div><div class='add'>+mr97310a        093a:010f	All known VGA cams with this ID</div><div class='add'>+mars            093a:050f	Mars-Semi Pc-Camera</div><div class='add'>+pac207          093a:2460	Qtec Webcam 100</div><div class='add'>+pac207          093a:2461	HP Webcam</div><div class='add'>+pac207          093a:2463	Philips SPC 220 NC</div><div class='add'>+pac207          093a:2464	Labtec Webcam 1200</div><div class='add'>+pac207          093a:2468	Webcam WB-1400T</div><div class='add'>+pac207          093a:2470	Genius GF112</div><div class='add'>+pac207          093a:2471	Genius VideoCam ge111</div><div class='add'>+pac207          093a:2472	Genius VideoCam ge110</div><div class='add'>+pac207          093a:2474	Genius iLook 111</div><div class='add'>+pac207          093a:2476	Genius e-Messenger 112</div><div class='add'>+pac7311         093a:2600	PAC7311 Typhoon</div><div class='add'>+pac7311         093a:2601	Philips SPC 610 NC</div><div class='add'>+pac7311         093a:2603	Philips SPC 500 NC</div><div class='add'>+pac7311         093a:2608	Trust WB-3300p</div><div class='add'>+pac7311         093a:260e	Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350</div><div class='add'>+pac7311         093a:260f	SnakeCam</div><div class='add'>+pac7302         093a:2620	Apollo AC-905</div><div class='add'>+pac7302         093a:2621	PAC731x</div><div class='add'>+pac7302         093a:2622	Genius Eye 312</div><div class='add'>+pac7302         093a:2623	Pixart Imaging, Inc.</div><div class='add'>+pac7302         093a:2624	PAC7302</div><div class='add'>+pac7302         093a:2625	Genius iSlim 310</div><div class='add'>+pac7302         093a:2626	Labtec 2200</div><div class='add'>+pac7302         093a:2627	Genius FaceCam 300</div><div class='add'>+pac7302         093a:2628	Genius iLook 300</div><div class='add'>+pac7302         093a:2629	Genious iSlim 300</div><div class='add'>+pac7302         093a:262a	Webcam 300k</div><div class='add'>+pac7302         093a:262c	Philips SPC 230 NC</div><div class='add'>+jl2005bcd       0979:0227	Various brands, 19 known cameras supported</div><div class='add'>+jeilinj         0979:0270	Sakar 57379</div><div class='add'>+jeilinj         0979:0280	Sportscam DV15, Sakar 57379</div><div class='add'>+zc3xx           0ac8:0301	Web Camera</div><div class='add'>+zc3xx           0ac8:0302	Z-star Vimicro zc0302</div><div class='add'>+vc032x          0ac8:0321	Vimicro generic vc0321</div><div class='add'>+vc032x          0ac8:0323	Vimicro Vc0323</div><div class='add'>+vc032x          0ac8:0328	A4Tech PK-130MG</div><div class='add'>+zc3xx           0ac8:301b	Z-Star zc301b</div><div class='add'>+zc3xx           0ac8:303b	Vimicro 0x303b</div><div class='add'>+zc3xx           0ac8:305b	Z-star Vimicro zc0305b</div><div class='add'>+zc3xx           0ac8:307b	PC Camera (ZS0211)</div><div class='add'>+vc032x          0ac8:c001	Sony embedded vimicro</div><div class='add'>+vc032x          0ac8:c002	Sony embedded vimicro</div><div class='add'>+vc032x          0ac8:c301	Samsung Q1 Ultra Premium</div><div class='add'>+spca508         0af9:0010	Hama USB Sightcam 100</div><div class='add'>+spca508         0af9:0011	Hama USB Sightcam 100</div><div class='add'>+ov519           0b62:0059	iBOT2 Webcam</div><div class='add'>+sonixb          0c45:6001	Genius VideoCAM NB</div><div class='add'>+sonixb          0c45:6005	Microdia Sweex Mini Webcam</div><div class='add'>+sonixb          0c45:6007	Sonix sn9c101 + Tas5110D</div><div class='add'>+sonixb          0c45:6009	spcaCam@120</div><div class='add'>+sonixb          0c45:600d	spcaCam@120</div><div class='add'>+sonixb          0c45:6011	Microdia PC Camera (SN9C102)</div><div class='add'>+sonixb          0c45:6019	Generic Sonix OV7630</div><div class='add'>+sonixb          0c45:6024	Generic Sonix Tas5130c</div><div class='add'>+sonixb          0c45:6025	Xcam Shanga</div><div class='add'>+sonixb          0c45:6027	GeniusEye 310</div><div class='add'>+sonixb          0c45:6028	Sonix Btc Pc380</div><div class='add'>+sonixb          0c45:6029	spcaCam@150</div><div class='add'>+sonixb          0c45:602a	Meade ETX-105EC Camera</div><div class='add'>+sonixb          0c45:602c	Generic Sonix OV7630</div><div class='add'>+sonixb          0c45:602d	LIC-200 LG</div><div class='add'>+sonixb          0c45:602e	Genius VideoCam Messenger</div><div class='add'>+sonixj          0c45:6040	Speed NVC 350K</div><div class='add'>+sonixj          0c45:607c	Sonix sn9c102p Hv7131R</div><div class='add'>+sonixb          0c45:6083	VideoCAM Look</div><div class='add'>+sonixb          0c45:608c	VideoCAM Look</div><div class='add'>+sonixb          0c45:608f	PC Camera (SN9C103 + OV7630)</div><div class='add'>+sonixb          0c45:60a8	VideoCAM Look</div><div class='add'>+sonixb          0c45:60aa	VideoCAM Look</div><div class='add'>+sonixb          0c45:60af	VideoCAM Look</div><div class='add'>+sonixb          0c45:60b0	Genius VideoCam Look</div><div class='add'>+sonixj          0c45:60c0	Sangha Sn535</div><div class='add'>+sonixj          0c45:60ce	USB-PC-Camera-168 (TALK-5067)</div><div class='add'>+sonixj          0c45:60ec	SN9C105+MO4000</div><div class='add'>+sonixj          0c45:60fb	Surfer NoName</div><div class='add'>+sonixj          0c45:60fc	LG-LIC300</div><div class='add'>+sonixj          0c45:60fe	Microdia Audio</div><div class='add'>+sonixj          0c45:6100	PC Camera (SN9C128)</div><div class='add'>+sonixj          0c45:6102	PC Camera (SN9C128)</div><div class='add'>+sonixj          0c45:610a	PC Camera (SN9C128)</div><div class='add'>+sonixj          0c45:610b	PC Camera (SN9C128)</div><div class='add'>+sonixj          0c45:610c	PC Camera (SN9C128)</div><div class='add'>+sonixj          0c45:610e	PC Camera (SN9C128)</div><div class='add'>+sonixj          0c45:6128	Microdia/Sonix SNP325</div><div class='add'>+sonixj          0c45:612a	Avant Camera</div><div class='add'>+sonixj          0c45:612b	Speed-Link REFLECT2</div><div class='add'>+sonixj          0c45:612c	Typhoon Rasy Cam 1.3MPix</div><div class='add'>+sonixj          0c45:612e	PC Camera (SN9C110)</div><div class='add'>+sonixj          0c45:6130	Sonix Pccam</div><div class='add'>+sonixj          0c45:6138	Sn9c120 Mo4000</div><div class='add'>+sonixj          0c45:613a	Microdia Sonix PC Camera</div><div class='add'>+sonixj          0c45:613b	Surfer SN-206</div><div class='add'>+sonixj          0c45:613c	Sonix Pccam168</div><div class='add'>+sonixj          0c45:613e	PC Camera (SN9C120)</div><div class='add'>+sonixj          0c45:6142	Hama PC-Webcam AC-150</div><div class='add'>+sonixj          0c45:6143	Sonix Pccam168</div><div class='add'>+sonixj          0c45:6148	Digitus DA-70811/ZSMC USB PC Camera ZS211/Microdia</div><div class='add'>+sonixj          0c45:614a	Frontech E-Ccam (JIL-2225)</div><div class='add'>+sn9c20x         0c45:6240	PC Camera (SN9C201 + MT9M001)</div><div class='add'>+sn9c20x         0c45:6242	PC Camera (SN9C201 + MT9M111)</div><div class='add'>+sn9c20x         0c45:6248	PC Camera (SN9C201 + OV9655)</div><div class='add'>+sn9c20x         0c45:624c	PC Camera (SN9C201 + MT9M112)</div><div class='add'>+sn9c20x         0c45:624e	PC Camera (SN9C201 + SOI968)</div><div class='add'>+sn9c20x         0c45:624f	PC Camera (SN9C201 + OV9650)</div><div class='add'>+sn9c20x         0c45:6251	PC Camera (SN9C201 + OV9650)</div><div class='add'>+sn9c20x         0c45:6253	PC Camera (SN9C201 + OV9650)</div><div class='add'>+sn9c20x         0c45:6260	PC Camera (SN9C201 + OV7670)</div><div class='add'>+sn9c20x         0c45:6270	PC Camera (SN9C201 + MT9V011/MT9V111/MT9V112)</div><div class='add'>+sn9c20x         0c45:627b	PC Camera (SN9C201 + OV7660)</div><div class='add'>+sn9c20x         0c45:627c	PC Camera (SN9C201 + HV7131R)</div><div class='add'>+sn9c20x         0c45:627f	PC Camera (SN9C201 + OV9650)</div><div class='add'>+sn9c20x         0c45:6280	PC Camera (SN9C202 + MT9M001)</div><div class='add'>+sn9c20x         0c45:6282	PC Camera (SN9C202 + MT9M111)</div><div class='add'>+sn9c20x         0c45:6288	PC Camera (SN9C202 + OV9655)</div><div class='add'>+sn9c20x         0c45:628c	PC Camera (SN9C201 + MT9M112)</div><div class='add'>+sn9c20x         0c45:628e	PC Camera (SN9C202 + SOI968)</div><div class='add'>+sn9c20x         0c45:628f	PC Camera (SN9C202 + OV9650)</div><div class='add'>+sn9c20x         0c45:62a0	PC Camera (SN9C202 + OV7670)</div><div class='add'>+sn9c20x         0c45:62b0	PC Camera (SN9C202 + MT9V011/MT9V111/MT9V112)</div><div class='add'>+sn9c20x         0c45:62b3	PC Camera (SN9C202 + OV9655)</div><div class='add'>+sn9c20x         0c45:62bb	PC Camera (SN9C202 + OV7660)</div><div class='add'>+sn9c20x         0c45:62bc	PC Camera (SN9C202 + HV7131R)</div><div class='add'>+sn9c2028        0c45:8001	Wild Planet Digital Spy Camera</div><div class='add'>+sn9c2028        0c45:8003	Sakar #11199, #6637x, #67480 keychain cams</div><div class='add'>+sn9c2028        0c45:8008	Mini-Shotz ms-350</div><div class='add'>+sn9c2028        0c45:800a	Vivitar Vivicam 3350B</div><div class='add'>+sunplus         0d64:0303	Sunplus FashionCam DXG</div><div class='add'>+ov519           0e96:c001	TRUST 380 USB2 SPACEC@M</div><div class='add'>+etoms           102c:6151	Qcam Sangha CIF</div><div class='add'>+etoms           102c:6251	Qcam xxxxxx VGA</div><div class='add'>+ov519           1046:9967	W9967CF/W9968CF WebCam IC, Video Blaster WebCam Go</div><div class='add'>+zc3xx           10fd:0128	Typhoon Webshot II USB 300k 0x0128</div><div class='add'>+spca561         10fd:7e50	FlyCam Usb 100</div><div class='add'>+zc3xx           10fd:804d	Typhoon Webshot II Webcam [zc0301]</div><div class='add'>+zc3xx           10fd:8050	Typhoon Webshot II USB 300k</div><div class='add'>+ov534           1415:2000	Sony HD Eye for PS3 (SLEH 00201)</div><div class='add'>+pac207          145f:013a	Trust WB-1300N</div><div class='add'>+pac7302         145f:013c	Trust</div><div class='add'>+sn9c20x         145f:013d	Trust WB-3600R</div><div class='add'>+vc032x          15b8:6001	HP 2.0 Megapixel</div><div class='add'>+vc032x          15b8:6002	HP 2.0 Megapixel rz406aa</div><div class='add'>+stk1135         174f:6a31	ASUSlaptop, MT9M112 sensor</div><div class='add'>+spca501         1776:501c	Arowana 300K CMOS Camera</div><div class='add'>+t613            17a1:0128	TASCORP JPEG Webcam, NGS Cyclops</div><div class='add'>+vc032x          17ef:4802	Lenovo Vc0323+MI1310_SOC</div><div class='add'>+pac7302         1ae7:2001	SpeedLinkSnappy Mic SL-6825-SBK</div><div class='add'>+pac207          2001:f115	D-Link DSB-C120</div><div class='add'>+sq905c          2770:9050	Disney pix micro (CIF)</div><div class='add'>+sq905c          2770:9051	Lego Bionicle</div><div class='add'>+sq905c          2770:9052	Disney pix micro 2 (VGA)</div><div class='add'>+sq905c          2770:905c	All 11 known cameras with this ID</div><div class='add'>+sq905           2770:9120	All 24 known cameras with this ID</div><div class='add'>+sq905c          2770:913d	All 4 known cameras with this ID</div><div class='add'>+sq930x          2770:930b	Sweex Motion Tracking / I-Tec iCam Tracer</div><div class='add'>+sq930x          2770:930c	Trust WB-3500T / NSG Robbie 2.0</div><div class='add'>+spca500         2899:012c	Toptro Industrial</div><div class='add'>+ov519           8020:ef04	ov519</div><div class='add'>+spca508         8086:0110	Intel Easy PC Camera</div><div class='add'>+spca500         8086:0630	Intel Pocket PC Camera</div><div class='add'>+spca506         99fa:8988	Grandtec V.cap</div><div class='add'>+sn9c20x         a168:0610	Dino-Lite Digital Microscope (SN9C201 + HV7131R)</div><div class='add'>+sn9c20x         a168:0611	Dino-Lite Digital Microscope (SN9C201 + HV7131R)</div><div class='add'>+sn9c20x         a168:0613	Dino-Lite Digital Microscope (SN9C201 + HV7131R)</div><div class='add'>+sn9c20x         a168:0614	Dino-Lite Digital Microscope (SN9C201 + MT9M111)</div><div class='add'>+sn9c20x         a168:0615	Dino-Lite Digital Microscope (SN9C201 + MT9M111)</div><div class='add'>+sn9c20x         a168:0617	Dino-Lite Digital Microscope (SN9C201 + MT9M111)</div><div class='add'>+sn9c20x         a168:0618	Dino-Lite Digital Microscope (SN9C201 + HV7131R)</div><div class='add'>+spca561         abcd:cdee	Petcam</div><div class='add'>+=========	=========	===================================================================</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst<br/>index aac566f88833..a606d1cdac13 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/index.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/index.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/index.rst</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> </div><div class='ctx'> .. include:: &lt;isonum.txt&gt;</div><div class='ctx'> </div><div class='add'>+.. _v4l-drivers:</div><div class='add'>+</div><div class='ctx'> ################################################</div><div class='ctx'> Video4Linux (V4L)  driver-specific documentation</div><div class='ctx'> ################################################</div><div class='hunk'>@@ -46,6 +48,7 @@ For more details see the file COPYING in the source distribution of Linux.</div><div class='ctx'> 	pvrusb2</div><div class='ctx'> 	pxa_camera</div><div class='ctx'> 	radiotrack</div><div class='add'>+	rcar-fdp1</div><div class='ctx'> 	saa7134</div><div class='ctx'> 	sh_mobile_ceu_camera</div><div class='ctx'> 	si470x</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/ivtv-cardlist.rst b/Documentation/media/v4l-drivers/ivtv-cardlist.rst<br/>index cd7e79d2963e..754ffa820b4c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/ivtv-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/ivtv-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/ivtv-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/ivtv-cardlist.rst</a></div><div class='hunk'>@@ -1,29 +1,38 @@</div><div class='ctx'> IVTV cards list</div><div class='ctx'> ===============</div><div class='ctx'> </div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	 1 -&gt; Hauppauge WinTV PVR-250</div><div class='del'>-	 2 -&gt; Hauppauge WinTV PVR-350</div><div class='del'>-	 3 -&gt; Hauppauge WinTV PVR-150 or PVR-500</div><div class='del'>-	 4 -&gt; AVerMedia M179				[1461:a3ce,1461:a3cf]</div><div class='del'>-	 5 -&gt; Yuan MPG600/Kuroutoshikou iTVC16-STVLP	[12ab:fff3,12ab:ffff]</div><div class='del'>-	 6 -&gt; Yuan MPG160/Kuroutoshikou iTVC15-STVLP	[12ab:0000,10fc:40a0]</div><div class='del'>-	 7 -&gt; Yuan PG600/DiamondMM PVR-550		[ff92:0070,ffab:0600]</div><div class='del'>-	 8 -&gt; Adaptec AVC-2410				[9005:0093]</div><div class='del'>-	 9 -&gt; Adaptec AVC-2010				[9005:0092]</div><div class='del'>-	10 -&gt; NAGASE TRANSGEAR 5000TV			[1461:bfff]</div><div class='del'>-	11 -&gt; AOpen VA2000MAX-STN6			[0000:ff5f]</div><div class='del'>-	12 -&gt; YUAN MPG600GR/Kuroutoshikou CX23416GYC-STVLP [12ab:0600,fbab:0600,1154:0523]</div><div class='del'>-	13 -&gt; I/O Data GV-MVP/RX			[10fc:d01e,10fc:d038,10fc:d039]</div><div class='del'>-	14 -&gt; I/O Data GV-MVP/RX2E			[10fc:d025]</div><div class='del'>-	15 -&gt; GOTVIEW PCI DVD (partial support only)	[12ab:0600]</div><div class='del'>-	16 -&gt; GOTVIEW PCI DVD2 Deluxe			[ffac:0600]</div><div class='del'>-	17 -&gt; Yuan MPC622				[ff01:d998]</div><div class='del'>-	18 -&gt; Digital Cowboy DCT-MTVP1			[1461:bfff]</div><div class='del'>-	19 -&gt; Yuan PG600V2/GotView PCI DVD Lite	[ffab:0600,ffad:0600]</div><div class='del'>-	20 -&gt; Club3D ZAP-TV1x01				[ffab:0600]</div><div class='del'>-	21 -&gt; AverTV MCE 116 Plus			[1461:c439]</div><div class='del'>-	22 -&gt; ASUS Falcon2				[1043:4b66,1043:462e,1043:4b2e]</div><div class='del'>-	23 -&gt; AverMedia PVR-150 Plus			[1461:c035]</div><div class='del'>-	24 -&gt; AverMedia EZMaker PCI Deluxe		[1461:c03f]</div><div class='add'>+=========== ============================================================= ====================================================</div><div class='add'>+Card number Card name                                                     PCI IDs</div><div class='add'>+=========== ============================================================= ====================================================</div><div class='add'>+0           Hauppauge WinTV PVR-250                                       IVTV16 104d:813d</div><div class='add'>+1           Hauppauge WinTV PVR-350                                       IVTV16 104d:813d</div><div class='add'>+2           Hauppauge WinTV PVR-150                                       IVTV16 104d:813d</div><div class='add'>+3           AVerMedia M179                                                IVTV15 1461:a3cf, IVTV15 1461:a3ce</div><div class='add'>+4           Yuan MPG600, Kuroutoshikou ITVC16-STVLP                       IVTV16 12ab:fff3, IVTV16 12ab:ffff</div><div class='add'>+5           YUAN MPG160, Kuroutoshikou ITVC15-STVLP, I/O Data GV-M2TV/PCI IVTV15 10fc:40a0</div><div class='add'>+6           Yuan PG600, Diamond PVR-550                                   IVTV16 ff92:0070, IVTV16 ffab:0600</div><div class='add'>+7           Adaptec VideOh! AVC-2410                                      IVTV16 9005:0093</div><div class='add'>+8           Adaptec VideOh! AVC-2010                                      IVTV16 9005:0092</div><div class='add'>+9           Nagase Transgear 5000TV                                       IVTV16 1461:bfff</div><div class='add'>+10          AOpen VA2000MAX-SNT6                                          IVTV16 0000:ff5f</div><div class='add'>+11          Yuan MPG600GR, Kuroutoshikou CX23416GYC-STVLP                 IVTV16 12ab:0600, IVTV16 fbab:0600, IVTV16 1154:0523</div><div class='add'>+12          I/O Data GV-MVP/RX, GV-MVP/RX2W (dual tuner)                  IVTV16 10fc:d01e, IVTV16 10fc:d038, IVTV16 10fc:d039</div><div class='add'>+13          I/O Data GV-MVP/RX2E                                          IVTV16 10fc:d025</div><div class='add'>+14          GotView PCI DVD                                               IVTV16 12ab:0600</div><div class='add'>+15          GotView PCI DVD2 Deluxe                                       IVTV16 ffac:0600</div><div class='add'>+16          Yuan MPC622                                                   IVTV16 ff01:d998</div><div class='add'>+17          Digital Cowboy DCT-MTVP1                                      IVTV16 1461:bfff</div><div class='add'>+18          Yuan PG600-2, GotView PCI DVD Lite                            IVTV16 ffab:0600, IVTV16 ffad:0600</div><div class='add'>+19          Club3D ZAP-TV1x01                                             IVTV16 ffab:0600</div><div class='add'>+20          AVerTV MCE 116 Plus                                           IVTV16 1461:c439</div><div class='add'>+21          ASUS Falcon2                                                  IVTV16 1043:4b66, IVTV16 1043:462e, IVTV16 1043:4b2e</div><div class='add'>+22          AVerMedia PVR-150 Plus / AVerTV M113 Partsnic (Daewoo) Tuner  IVTV16 1461:c034, IVTV16 1461:c035</div><div class='add'>+23          AVerMedia EZMaker PCI Deluxe                                  IVTV16 1461:c03f</div><div class='add'>+24          AVerMedia M104                                                IVTV16 1461:c136</div><div class='add'>+25          Buffalo PC-MV5L/PCI                                           IVTV16 1154:052b</div><div class='add'>+26          AVerMedia UltraTV 1500 MCE / AVerTV M113 Philips Tuner        IVTV16 1461:c019, IVTV16 1461:c01b</div><div class='add'>+27          Sony VAIO Giga Pocket (ENX Kikyou)                            IVTV16 104d:813d</div><div class='add'>+28          Hauppauge WinTV PVR-350 (V1)                                  IVTV16 104d:813d</div><div class='add'>+29          Yuan MPG600GR, Kuroutoshikou CX23416GYC-STVLP (no GR)         IVTV16 104d:813d</div><div class='add'>+30          Yuan MPG600GR, Kuroutoshikou CX23416GYC-STVLP (no GR/YCS)     IVTV16 104d:813d</div><div class='add'>+=========== ============================================================= ====================================================</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/rcar-fdp1.rst b/Documentation/media/v4l-drivers/rcar-fdp1.rst<br/>new file mode 100644<br/>index 000000000000..a59b1e8e3e9c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/rcar-fdp1.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/rcar-fdp1.rst</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+Renesas R-Car Fine Display Processor (FDP1) Driver</div><div class='add'>+==================================================</div><div class='add'>+</div><div class='add'>+The R-Car FDP1 driver implements driver-specific controls as follows.</div><div class='add'>+</div><div class='add'>+``V4L2_CID_DEINTERLACING_MODE (menu)``</div><div class='add'>+    The video deinterlacing mode (such as Bob, Weave, ...). The R-Car FDP1</div><div class='add'>+    driver implements the following modes.</div><div class='add'>+</div><div class='add'>+.. flat-table::</div><div class='add'>+    :header-rows:  0</div><div class='add'>+    :stub-columns: 0</div><div class='add'>+    :widths:       1 4</div><div class='add'>+</div><div class='add'>+    * - ``"Progressive" (0)``</div><div class='add'>+      - The input image video stream is progressive (not interlaced). No</div><div class='add'>+        deinterlacing is performed. Apart from (optional) format and encoding</div><div class='add'>+        conversion output frames are identical to the input frames.</div><div class='add'>+    * - ``"Adaptive 2D/3D" (1)``</div><div class='add'>+      - Motion adaptive version of 2D and 3D deinterlacing. Use 3D deinterlacing</div><div class='add'>+        in the presence of fast motion and 2D deinterlacing with diagonal</div><div class='add'>+        interpolation otherwise.</div><div class='add'>+    * - ``"Fixed 2D" (2)``</div><div class='add'>+      - The current field is scaled vertically by averaging adjacent lines to</div><div class='add'>+        recover missing lines. This method is also known as blending or Line</div><div class='add'>+        Averaging (LAV).</div><div class='add'>+    * - ``"Fixed 3D" (3)``</div><div class='add'>+      - The previous and next fields are averaged to recover lines missing from</div><div class='add'>+        the current field. This method is also known as Field Averaging (FAV).</div><div class='add'>+    * - ``"Previous field" (4)``</div><div class='add'>+      - The current field is weaved with the previous field, i.e. the previous</div><div class='add'>+        field is used to fill missing lines from the current field. This method</div><div class='add'>+        is also known as weave deinterlacing.</div><div class='add'>+    * - ``"Next field" (5)``</div><div class='add'>+      - The current field is weaved with the next field, i.e. the next field is</div><div class='add'>+        used to fill missing lines from the current field. This method is also</div><div class='add'>+        known as weave deinterlacing.</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/saa7134-cardlist.rst b/Documentation/media/v4l-drivers/saa7134-cardlist.rst<br/>index 22c1510d9fa6..a5efa8f4b8e4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/saa7134-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/saa7134-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/saa7134-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/saa7134-cardlist.rst</a></div><div class='hunk'>@@ -1,202 +1,204 @@</div><div class='ctx'> SAA7134 cards list</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	  0 -&gt; UNKNOWN/GENERIC</div><div class='del'>-	  1 -&gt; Proteus Pro [philips reference design]   [1131:2001,1131:2001]</div><div class='del'>-	  2 -&gt; LifeView FlyVIDEO3000                    [5168:0138,4e42:0138]</div><div class='del'>-	  3 -&gt; LifeView/Typhoon FlyVIDEO2000            [5168:0138,4e42:0138]</div><div class='del'>-	  4 -&gt; EMPRESS                                  [1131:6752]</div><div class='del'>-	  5 -&gt; SKNet Monster TV                         [1131:4e85]</div><div class='del'>-	  6 -&gt; Tevion MD 9717</div><div class='del'>-	  7 -&gt; KNC One TV-Station RDS / Typhoon TV Tuner RDS [1131:fe01,1894:fe01]</div><div class='del'>-	  8 -&gt; Terratec Cinergy 400 TV                  [153b:1142]</div><div class='del'>-	  9 -&gt; Medion 5044</div><div class='del'>-	 10 -&gt; Kworld/KuroutoShikou SAA7130-TVPCI</div><div class='del'>-	 11 -&gt; Terratec Cinergy 600 TV                  [153b:1143]</div><div class='del'>-	 12 -&gt; Medion 7134                              [16be:0003,16be:5000]</div><div class='del'>-	 13 -&gt; Typhoon TV+Radio 90031</div><div class='del'>-	 14 -&gt; ELSA EX-VISION 300TV                     [1048:226b]</div><div class='del'>-	 15 -&gt; ELSA EX-VISION 500TV                     [1048:226a]</div><div class='del'>-	 16 -&gt; ASUS TV-FM 7134                          [1043:4842,1043:4830,1043:4840]</div><div class='del'>-	 17 -&gt; AOPEN VA1000 POWER                       [1131:7133]</div><div class='del'>-	 18 -&gt; BMK MPEX No Tuner</div><div class='del'>-	 19 -&gt; Compro VideoMate TV                      [185b:c100]</div><div class='del'>-	 20 -&gt; Matrox CronosPlus                        [102B:48d0]</div><div class='del'>-	 21 -&gt; 10MOONS PCI TV CAPTURE CARD              [1131:2001]</div><div class='del'>-	 22 -&gt; AverMedia M156 / Medion 2819             [1461:a70b]</div><div class='del'>-	 23 -&gt; BMK MPEX Tuner</div><div class='del'>-	 24 -&gt; KNC One TV-Station DVR                   [1894:a006]</div><div class='del'>-	 25 -&gt; ASUS TV-FM 7133                          [1043:4843]</div><div class='del'>-	 26 -&gt; Pinnacle PCTV Stereo (saa7134)           [11bd:002b]</div><div class='del'>-	 27 -&gt; Manli MuchTV M-TV002</div><div class='del'>-	 28 -&gt; Manli MuchTV M-TV001</div><div class='del'>-	 29 -&gt; Nagase Sangyo TransGear 3000TV           [1461:050c]</div><div class='del'>-	 30 -&gt; Elitegroup ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM)  [1019:4cb4]</div><div class='del'>-	 31 -&gt; Elitegroup ECS TVP3XP FM1236 Tuner Card (NTSC,FM) [1019:4cb5]</div><div class='del'>-	 32 -&gt; AVACS SmartTV</div><div class='del'>-	 33 -&gt; AVerMedia DVD EZMaker                    [1461:10ff]</div><div class='del'>-	 34 -&gt; Noval Prime TV 7133</div><div class='del'>-	 35 -&gt; AverMedia AverTV Studio 305              [1461:2115]</div><div class='del'>-	 36 -&gt; UPMOST PURPLE TV                         [12ab:0800]</div><div class='del'>-	 37 -&gt; Items MuchTV Plus / IT-005</div><div class='del'>-	 38 -&gt; Terratec Cinergy 200 TV                  [153b:1152]</div><div class='del'>-	 39 -&gt; LifeView FlyTV Platinum Mini             [5168:0212,4e42:0212,5169:1502]</div><div class='del'>-	 40 -&gt; Compro VideoMate TV PVR/FM               [185b:c100]</div><div class='del'>-	 41 -&gt; Compro VideoMate TV Gold+                [185b:c100]</div><div class='del'>-	 42 -&gt; Sabrent SBT-TVFM (saa7130)</div><div class='del'>-	 43 -&gt; :Zolid Xpert TV7134</div><div class='del'>-	 44 -&gt; Empire PCI TV-Radio LE</div><div class='del'>-	 45 -&gt; Avermedia AVerTV Studio 307              [1461:9715]</div><div class='del'>-	 46 -&gt; AVerMedia Cardbus TV/Radio (E500)        [1461:d6ee]</div><div class='del'>-	 47 -&gt; Terratec Cinergy 400 mobile              [153b:1162]</div><div class='del'>-	 48 -&gt; Terratec Cinergy 600 TV MK3              [153b:1158]</div><div class='del'>-	 49 -&gt; Compro VideoMate Gold+ Pal               [185b:c200]</div><div class='del'>-	 50 -&gt; Pinnacle PCTV 300i DVB-T + PAL           [11bd:002d]</div><div class='del'>-	 51 -&gt; ProVideo PV952                           [1540:9524]</div><div class='del'>-	 52 -&gt; AverMedia AverTV/305                     [1461:2108]</div><div class='del'>-	 53 -&gt; ASUS TV-FM 7135                          [1043:4845]</div><div class='del'>-	 54 -&gt; LifeView FlyTV Platinum FM / Gold        [5168:0214,5168:5214,1489:0214,5168:0304]</div><div class='del'>-	 55 -&gt; LifeView FlyDVB-T DUO / MSI TV@nywhere Duo [5168:0306,4E42:0306]</div><div class='del'>-	 56 -&gt; Avermedia AVerTV 307                     [1461:a70a]</div><div class='del'>-	 57 -&gt; Avermedia AVerTV GO 007 FM               [1461:f31f]</div><div class='del'>-	 58 -&gt; ADS Tech Instant TV (saa7135)            [1421:0350,1421:0351,1421:0370,1421:1370]</div><div class='del'>-	 59 -&gt; Kworld/Tevion V-Stream Xpert TV PVR7134</div><div class='del'>-	 60 -&gt; LifeView/Typhoon/Genius FlyDVB-T Duo Cardbus [5168:0502,4e42:0502,1489:0502]</div><div class='del'>-	 61 -&gt; Philips TOUGH DVB-T reference design     [1131:2004]</div><div class='del'>-	 62 -&gt; Compro VideoMate TV Gold+II</div><div class='del'>-	 63 -&gt; Kworld Xpert TV PVR7134</div><div class='del'>-	 64 -&gt; FlyTV mini Asus Digimatrix               [1043:0210]</div><div class='del'>-	 65 -&gt; V-Stream Studio TV Terminator</div><div class='del'>-	 66 -&gt; Yuan TUN-900 (saa7135)</div><div class='del'>-	 67 -&gt; Beholder BeholdTV 409 FM                 [0000:4091]</div><div class='del'>-	 68 -&gt; GoTView 7135 PCI                         [5456:7135]</div><div class='del'>-	 69 -&gt; Philips EUROPA V3 reference design       [1131:2004]</div><div class='del'>-	 70 -&gt; Compro Videomate DVB-T300                [185b:c900]</div><div class='del'>-	 71 -&gt; Compro Videomate DVB-T200                [185b:c901]</div><div class='del'>-	 72 -&gt; RTD Embedded Technologies VFG7350        [1435:7350]</div><div class='del'>-	 73 -&gt; RTD Embedded Technologies VFG7330        [1435:7330]</div><div class='del'>-	 74 -&gt; LifeView FlyTV Platinum Mini2            [14c0:1212]</div><div class='del'>-	 75 -&gt; AVerMedia AVerTVHD MCE A180              [1461:1044]</div><div class='del'>-	 76 -&gt; SKNet MonsterTV Mobile                   [1131:4ee9]</div><div class='del'>-	 77 -&gt; Pinnacle PCTV 40i/50i/110i (saa7133)     [11bd:002e]</div><div class='del'>-	 78 -&gt; ASUSTeK P7131 Dual                       [1043:4862]</div><div class='del'>-	 79 -&gt; Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)</div><div class='del'>-	 80 -&gt; ASUS Digimatrix TV                       [1043:0210]</div><div class='del'>-	 81 -&gt; Philips Tiger reference design           [1131:2018]</div><div class='del'>-	 82 -&gt; MSI TV@Anywhere plus                     [1462:6231,1462:8624]</div><div class='del'>-	 83 -&gt; Terratec Cinergy 250 PCI TV              [153b:1160]</div><div class='del'>-	 84 -&gt; LifeView FlyDVB Trio                     [5168:0319]</div><div class='del'>-	 85 -&gt; AverTV DVB-T 777                         [1461:2c05,1461:2c05]</div><div class='del'>-	 86 -&gt; LifeView FlyDVB-T / Genius VideoWonder DVB-T [5168:0301,1489:0301]</div><div class='del'>-	 87 -&gt; ADS Instant TV Duo Cardbus PTV331        [0331:1421]</div><div class='del'>-	 88 -&gt; Tevion/KWorld DVB-T 220RF                [17de:7201]</div><div class='del'>-	 89 -&gt; ELSA EX-VISION 700TV                     [1048:226c]</div><div class='del'>-	 90 -&gt; Kworld ATSC110/115                       [17de:7350,17de:7352]</div><div class='del'>-	 91 -&gt; AVerMedia A169 B                         [1461:7360]</div><div class='del'>-	 92 -&gt; AVerMedia A169 B1                        [1461:6360]</div><div class='del'>-	 93 -&gt; Medion 7134 Bridge #2                    [16be:0005]</div><div class='del'>-	 94 -&gt; LifeView FlyDVB-T Hybrid Cardbus/MSI TV @nywhere A/D NB [5168:3306,5168:3502,5168:3307,4e42:3502]</div><div class='del'>-	 95 -&gt; LifeView FlyVIDEO3000 (NTSC)             [5169:0138]</div><div class='del'>-	 96 -&gt; Medion Md8800 Quadro                     [16be:0007,16be:0008,16be:000d]</div><div class='del'>-	 97 -&gt; LifeView FlyDVB-S /Acorp TV134DS         [5168:0300,4e42:0300]</div><div class='del'>-	 98 -&gt; Proteus Pro 2309                         [0919:2003]</div><div class='del'>-	 99 -&gt; AVerMedia TV Hybrid A16AR                [1461:2c00]</div><div class='del'>-	100 -&gt; Asus Europa2 OEM                         [1043:4860]</div><div class='del'>-	101 -&gt; Pinnacle PCTV 310i                       [11bd:002f]</div><div class='del'>-	102 -&gt; Avermedia AVerTV Studio 507              [1461:9715]</div><div class='del'>-	103 -&gt; Compro Videomate DVB-T200A</div><div class='del'>-	104 -&gt; Hauppauge WinTV-HVR1110 DVB-T/Hybrid     [0070:6700,0070:6701,0070:6702,0070:6703,0070:6704,0070:6705]</div><div class='del'>-	105 -&gt; Terratec Cinergy HT PCMCIA               [153b:1172]</div><div class='del'>-	106 -&gt; Encore ENLTV                             [1131:2342,1131:2341,3016:2344]</div><div class='del'>-	107 -&gt; Encore ENLTV-FM                          [1131:230f]</div><div class='del'>-	108 -&gt; Terratec Cinergy HT PCI                  [153b:1175]</div><div class='del'>-	109 -&gt; Philips Tiger - S Reference design</div><div class='del'>-	110 -&gt; Avermedia M102                           [1461:f31e]</div><div class='del'>-	111 -&gt; ASUS P7131 4871                          [1043:4871]</div><div class='del'>-	112 -&gt; ASUSTeK P7131 Hybrid                     [1043:4876]</div><div class='del'>-	113 -&gt; Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM) [1019:4cb6]</div><div class='del'>-	114 -&gt; KWorld DVB-T 210                         [17de:7250]</div><div class='del'>-	115 -&gt; Sabrent PCMCIA TV-PCB05                  [0919:2003]</div><div class='del'>-	116 -&gt; 10MOONS TM300 TV Card                    [1131:2304]</div><div class='del'>-	117 -&gt; Avermedia Super 007                      [1461:f01d]</div><div class='del'>-	118 -&gt; Beholder BeholdTV 401                    [0000:4016]</div><div class='del'>-	119 -&gt; Beholder BeholdTV 403                    [0000:4036]</div><div class='del'>-	120 -&gt; Beholder BeholdTV 403 FM                 [0000:4037]</div><div class='del'>-	121 -&gt; Beholder BeholdTV 405                    [0000:4050]</div><div class='del'>-	122 -&gt; Beholder BeholdTV 405 FM                 [0000:4051]</div><div class='del'>-	123 -&gt; Beholder BeholdTV 407                    [0000:4070]</div><div class='del'>-	124 -&gt; Beholder BeholdTV 407 FM                 [0000:4071]</div><div class='del'>-	125 -&gt; Beholder BeholdTV 409                    [0000:4090]</div><div class='del'>-	126 -&gt; Beholder BeholdTV 505 FM                 [5ace:5050]</div><div class='del'>-	127 -&gt; Beholder BeholdTV 507 FM / BeholdTV 509 FM [5ace:5070,5ace:5090]</div><div class='del'>-	128 -&gt; Beholder BeholdTV Columbus TV/FM         [0000:5201]</div><div class='del'>-	129 -&gt; Beholder BeholdTV 607 FM                 [5ace:6070]</div><div class='del'>-	130 -&gt; Beholder BeholdTV M6                     [5ace:6190]</div><div class='del'>-	131 -&gt; Twinhan Hybrid DTV-DVB 3056 PCI          [1822:0022]</div><div class='del'>-	132 -&gt; Genius TVGO AM11MCE</div><div class='del'>-	133 -&gt; NXP Snake DVB-S reference design</div><div class='del'>-	134 -&gt; Medion/Creatix CTX953 Hybrid             [16be:0010]</div><div class='del'>-	135 -&gt; MSI TV@nywhere A/D v1.1                  [1462:8625]</div><div class='del'>-	136 -&gt; AVerMedia Cardbus TV/Radio (E506R)       [1461:f436]</div><div class='del'>-	137 -&gt; AVerMedia Hybrid TV/Radio (A16D)         [1461:f936]</div><div class='del'>-	138 -&gt; Avermedia M115                           [1461:a836]</div><div class='del'>-	139 -&gt; Compro VideoMate T750                    [185b:c900]</div><div class='del'>-	140 -&gt; Avermedia DVB-S Pro A700                 [1461:a7a1]</div><div class='del'>-	141 -&gt; Avermedia DVB-S Hybrid+FM A700           [1461:a7a2]</div><div class='del'>-	142 -&gt; Beholder BeholdTV H6                     [5ace:6290]</div><div class='del'>-	143 -&gt; Beholder BeholdTV M63                    [5ace:6191]</div><div class='del'>-	144 -&gt; Beholder BeholdTV M6 Extra               [5ace:6193]</div><div class='del'>-	145 -&gt; AVerMedia MiniPCI DVB-T Hybrid M103      [1461:f636,1461:f736]</div><div class='del'>-	146 -&gt; ASUSTeK P7131 Analog</div><div class='del'>-	147 -&gt; Asus Tiger 3in1                          [1043:4878]</div><div class='del'>-	148 -&gt; Encore ENLTV-FM v5.3                     [1a7f:2008]</div><div class='del'>-	149 -&gt; Avermedia PCI pure analog (M135A)        [1461:f11d]</div><div class='del'>-	150 -&gt; Zogis Real Angel 220</div><div class='del'>-	151 -&gt; ADS Tech Instant HDTV                    [1421:0380]</div><div class='del'>-	152 -&gt; Asus Tiger Rev:1.00                      [1043:4857]</div><div class='del'>-	153 -&gt; Kworld Plus TV Analog Lite PCI           [17de:7128]</div><div class='del'>-	154 -&gt; Avermedia AVerTV GO 007 FM Plus          [1461:f31d]</div><div class='del'>-	155 -&gt; Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid  [0070:6706,0070:6708]</div><div class='del'>-	156 -&gt; Hauppauge WinTV-HVR1120 DVB-T/Hybrid     [0070:6707,0070:6709,0070:670a]</div><div class='del'>-	157 -&gt; Avermedia AVerTV Studio 507UA            [1461:a11b]</div><div class='del'>-	158 -&gt; AVerMedia Cardbus TV/Radio (E501R)       [1461:b7e9]</div><div class='del'>-	159 -&gt; Beholder BeholdTV 505 RDS                [0000:505B]</div><div class='del'>-	160 -&gt; Beholder BeholdTV 507 RDS                [0000:5071]</div><div class='del'>-	161 -&gt; Beholder BeholdTV 507 RDS                [0000:507B]</div><div class='del'>-	162 -&gt; Beholder BeholdTV 607 FM                 [5ace:6071]</div><div class='del'>-	163 -&gt; Beholder BeholdTV 609 FM                 [5ace:6090]</div><div class='del'>-	164 -&gt; Beholder BeholdTV 609 FM                 [5ace:6091]</div><div class='del'>-	165 -&gt; Beholder BeholdTV 607 RDS                [5ace:6072]</div><div class='del'>-	166 -&gt; Beholder BeholdTV 607 RDS                [5ace:6073]</div><div class='del'>-	167 -&gt; Beholder BeholdTV 609 RDS                [5ace:6092]</div><div class='del'>-	168 -&gt; Beholder BeholdTV 609 RDS                [5ace:6093]</div><div class='del'>-	169 -&gt; Compro VideoMate S350/S300               [185b:c900]</div><div class='del'>-	170 -&gt; AverMedia AverTV Studio 505              [1461:a115]</div><div class='del'>-	171 -&gt; Beholder BeholdTV X7                     [5ace:7595]</div><div class='del'>-	172 -&gt; RoverMedia TV Link Pro FM                [19d1:0138]</div><div class='del'>-	173 -&gt; Zolid Hybrid TV Tuner PCI                [1131:2004]</div><div class='del'>-	174 -&gt; Asus Europa Hybrid OEM                   [1043:4847]</div><div class='del'>-	175 -&gt; Leadtek Winfast DTV1000S                 [107d:6655]</div><div class='del'>-	176 -&gt; Beholder BeholdTV 505 RDS                [0000:5051]</div><div class='del'>-	177 -&gt; Hawell HW-404M7</div><div class='del'>-	178 -&gt; Beholder BeholdTV H7                     [5ace:7190]</div><div class='del'>-	179 -&gt; Beholder BeholdTV A7                     [5ace:7090]</div><div class='del'>-	180 -&gt; Avermedia PCI M733A                      [1461:4155,1461:4255]</div><div class='del'>-	181 -&gt; TechoTrend TT-budget T-3000              [13c2:2804]</div><div class='del'>-	182 -&gt; Kworld PCI SBTVD/ISDB-T Full-Seg Hybrid  [17de:b136]</div><div class='del'>-	183 -&gt; Compro VideoMate Vista M1F               [185b:c900]</div><div class='del'>-	184 -&gt; Encore ENLTV-FM 3                        [1a7f:2108]</div><div class='del'>-	185 -&gt; MagicPro ProHDTV Pro2 DMB-TH/Hybrid      [17de:d136]</div><div class='del'>-	186 -&gt; Beholder BeholdTV 501                    [5ace:5010]</div><div class='del'>-	187 -&gt; Beholder BeholdTV 503 FM                 [5ace:5030]</div><div class='del'>-	188 -&gt; Sensoray 811/911                         [6000:0811,6000:0911]</div><div class='del'>-	189 -&gt; Kworld PC150-U                           [17de:a134]</div><div class='del'>-	190 -&gt; Asus My Cinema PS3-100                   [1043:48cd]</div><div class='del'>-	191 -&gt; Hawell HW-9004V1</div><div class='del'>-	192 -&gt; AverMedia AverTV Satellite Hybrid+FM A706 [1461:2055]</div><div class='del'>-	193 -&gt; WIS Voyager or compatible                [1905:7007]</div><div class='del'>-	194 -&gt; AverMedia AverTV/505                     [1461:a10a]</div><div class='del'>-	195 -&gt; Leadtek Winfast TV2100 FM                [107d:6f3a]</div><div class='del'>-	196 -&gt; SnaZio* TVPVR PRO                        [1779:13cf]</div><div class='add'>+=========== ======================================================= ================================================================</div><div class='add'>+Card number Card name                                               PCI IDs</div><div class='add'>+=========== ======================================================= ================================================================</div><div class='add'>+0           UNKNOWN/GENERIC</div><div class='add'>+1           Proteus Pro [philips reference design]                  1131:2001, 1131:2001</div><div class='add'>+2           LifeView FlyVIDEO3000                                   5168:0138, 4e42:0138</div><div class='add'>+3           LifeView/Typhoon FlyVIDEO2000                           5168:0138, 4e42:0138</div><div class='add'>+4           EMPRESS                                                 1131:6752</div><div class='add'>+5           SKNet Monster TV                                        1131:4e85</div><div class='add'>+6           Tevion MD 9717</div><div class='add'>+7           KNC One TV-Station RDS / Typhoon TV Tuner RDS           1131:fe01, 1894:fe01</div><div class='add'>+8           Terratec Cinergy 400 TV                                 153b:1142</div><div class='add'>+9           Medion 5044</div><div class='add'>+10          Kworld/KuroutoShikou SAA7130-TVPCI</div><div class='add'>+11          Terratec Cinergy 600 TV                                 153b:1143</div><div class='add'>+12          Medion 7134                                             16be:0003, 16be:5000</div><div class='add'>+13          Typhoon TV+Radio 90031</div><div class='add'>+14          ELSA EX-VISION 300TV                                    1048:226b</div><div class='add'>+15          ELSA EX-VISION 500TV                                    1048:226a</div><div class='add'>+16          ASUS TV-FM 7134                                         1043:4842, 1043:4830, 1043:4840</div><div class='add'>+17          AOPEN VA1000 POWER                                      1131:7133</div><div class='add'>+18          BMK MPEX No Tuner</div><div class='add'>+19          Compro VideoMate TV                                     185b:c100</div><div class='add'>+20          Matrox CronosPlus                                       102B:48d0</div><div class='add'>+21          10MOONS PCI TV CAPTURE CARD                             1131:2001</div><div class='add'>+22          AverMedia M156 / Medion 2819                            1461:a70b</div><div class='add'>+23          BMK MPEX Tuner</div><div class='add'>+24          KNC One TV-Station DVR                                  1894:a006</div><div class='add'>+25          ASUS TV-FM 7133                                         1043:4843</div><div class='add'>+26          Pinnacle PCTV Stereo (saa7134)                          11bd:002b</div><div class='add'>+27          Manli MuchTV M-TV002</div><div class='add'>+28          Manli MuchTV M-TV001</div><div class='add'>+29          Nagase Sangyo TransGear 3000TV                          1461:050c</div><div class='add'>+30          Elitegroup ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM)      1019:4cb4</div><div class='add'>+31          Elitegroup ECS TVP3XP FM1236 Tuner Card (NTSC,FM)       1019:4cb5</div><div class='add'>+32          AVACS SmartTV</div><div class='add'>+33          AVerMedia DVD EZMaker                                   1461:10ff</div><div class='add'>+34          Noval Prime TV 7133</div><div class='add'>+35          AverMedia AverTV Studio 305                             1461:2115</div><div class='add'>+36          UPMOST PURPLE TV                                        12ab:0800</div><div class='add'>+37          Items MuchTV Plus / IT-005</div><div class='add'>+38          Terratec Cinergy 200 TV                                 153b:1152</div><div class='add'>+39          LifeView FlyTV Platinum Mini                            5168:0212, 4e42:0212, 5169:1502</div><div class='add'>+40          Compro VideoMate TV PVR/FM                              185b:c100</div><div class='add'>+41          Compro VideoMate TV Gold+                               185b:c100</div><div class='add'>+42          Sabrent SBT-TVFM (saa7130)</div><div class='add'>+43          :Zolid Xpert TV7134</div><div class='add'>+44          Empire PCI TV-Radio LE</div><div class='add'>+45          Avermedia AVerTV Studio 307                             1461:9715</div><div class='add'>+46          AVerMedia Cardbus TV/Radio (E500)                       1461:d6ee</div><div class='add'>+47          Terratec Cinergy 400 mobile                             153b:1162</div><div class='add'>+48          Terratec Cinergy 600 TV MK3                             153b:1158</div><div class='add'>+49          Compro VideoMate Gold+ Pal                              185b:c200</div><div class='add'>+50          Pinnacle PCTV 300i DVB-T + PAL                          11bd:002d</div><div class='add'>+51          ProVideo PV952                                          1540:9524</div><div class='add'>+52          AverMedia AverTV/305                                    1461:2108</div><div class='add'>+53          ASUS TV-FM 7135                                         1043:4845</div><div class='add'>+54          LifeView FlyTV Platinum FM / Gold                       5168:0214, 5168:5214, 1489:0214, 5168:0304</div><div class='add'>+55          LifeView FlyDVB-T DUO / MSI TV@nywhere Duo              5168:0306, 4E42:0306</div><div class='add'>+56          Avermedia AVerTV 307                                    1461:a70a</div><div class='add'>+57          Avermedia AVerTV GO 007 FM                              1461:f31f</div><div class='add'>+58          ADS Tech Instant TV (saa7135)                           1421:0350, 1421:0351, 1421:0370, 1421:1370</div><div class='add'>+59          Kworld/Tevion V-Stream Xpert TV PVR7134</div><div class='add'>+60          LifeView/Typhoon/Genius FlyDVB-T Duo Cardbus            5168:0502, 4e42:0502, 1489:0502</div><div class='add'>+61          Philips TOUGH DVB-T reference design                    1131:2004</div><div class='add'>+62          Compro VideoMate TV Gold+II</div><div class='add'>+63          Kworld Xpert TV PVR7134</div><div class='add'>+64          FlyTV mini Asus Digimatrix                              1043:0210</div><div class='add'>+65          V-Stream Studio TV Terminator</div><div class='add'>+66          Yuan TUN-900 (saa7135)</div><div class='add'>+67          Beholder BeholdTV 409 FM                                0000:4091</div><div class='add'>+68          GoTView 7135 PCI                                        5456:7135</div><div class='add'>+69          Philips EUROPA V3 reference design                      1131:2004</div><div class='add'>+70          Compro Videomate DVB-T300                               185b:c900</div><div class='add'>+71          Compro Videomate DVB-T200                               185b:c901</div><div class='add'>+72          RTD Embedded Technologies VFG7350                       1435:7350</div><div class='add'>+73          RTD Embedded Technologies VFG7330                       1435:7330</div><div class='add'>+74          LifeView FlyTV Platinum Mini2                           14c0:1212</div><div class='add'>+75          AVerMedia AVerTVHD MCE A180                             1461:1044</div><div class='add'>+76          SKNet MonsterTV Mobile                                  1131:4ee9</div><div class='add'>+77          Pinnacle PCTV 40i/50i/110i (saa7133)                    11bd:002e</div><div class='add'>+78          ASUSTeK P7131 Dual                                      1043:4862</div><div class='add'>+79          Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)</div><div class='add'>+80          ASUS Digimatrix TV                                      1043:0210</div><div class='add'>+81          Philips Tiger reference design                          1131:2018</div><div class='add'>+82          MSI TV@Anywhere plus                                    1462:6231, 1462:8624</div><div class='add'>+83          Terratec Cinergy 250 PCI TV                             153b:1160</div><div class='add'>+84          LifeView FlyDVB Trio                                    5168:0319</div><div class='add'>+85          AverTV DVB-T 777                                        1461:2c05, 1461:2c05</div><div class='add'>+86          LifeView FlyDVB-T / Genius VideoWonder DVB-T            5168:0301, 1489:0301</div><div class='add'>+87          ADS Instant TV Duo Cardbus PTV331                       0331:1421</div><div class='add'>+88          Tevion/KWorld DVB-T 220RF                               17de:7201</div><div class='add'>+89          ELSA EX-VISION 700TV                                    1048:226c</div><div class='add'>+90          Kworld ATSC110/115                                      17de:7350, 17de:7352</div><div class='add'>+91          AVerMedia A169 B                                        1461:7360</div><div class='add'>+92          AVerMedia A169 B1                                       1461:6360</div><div class='add'>+93          Medion 7134 Bridge #2                                   16be:0005</div><div class='add'>+94          LifeView FlyDVB-T Hybrid Cardbus/MSI TV @nywhere A/D NB 5168:3306, 5168:3502, 5168:3307, 4e42:3502</div><div class='add'>+95          LifeView FlyVIDEO3000 (NTSC)                            5169:0138</div><div class='add'>+96          Medion Md8800 Quadro                                    16be:0007, 16be:0008, 16be:000d</div><div class='add'>+97          LifeView FlyDVB-S /Acorp TV134DS                        5168:0300, 4e42:0300</div><div class='add'>+98          Proteus Pro 2309                                        0919:2003</div><div class='add'>+99          AVerMedia TV Hybrid A16AR                               1461:2c00</div><div class='add'>+100         Asus Europa2 OEM                                        1043:4860</div><div class='add'>+101         Pinnacle PCTV 310i                                      11bd:002f</div><div class='add'>+102         Avermedia AVerTV Studio 507                             1461:9715</div><div class='add'>+103         Compro Videomate DVB-T200A</div><div class='add'>+104         Hauppauge WinTV-HVR1110 DVB-T/Hybrid                    0070:6700, 0070:6701, 0070:6702, 0070:6703, 0070:6704, 0070:6705</div><div class='add'>+105         Terratec Cinergy HT PCMCIA                              153b:1172</div><div class='add'>+106         Encore ENLTV                                            1131:2342, 1131:2341, 3016:2344</div><div class='add'>+107         Encore ENLTV-FM                                         1131:230f</div><div class='add'>+108         Terratec Cinergy HT PCI                                 153b:1175</div><div class='add'>+109         Philips Tiger - S Reference design</div><div class='add'>+110         Avermedia M102                                          1461:f31e</div><div class='add'>+111         ASUS P7131 4871                                         1043:4871</div><div class='add'>+112         ASUSTeK P7131 Hybrid                                    1043:4876</div><div class='add'>+113         Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM)        1019:4cb6</div><div class='add'>+114         KWorld DVB-T 210                                        17de:7250</div><div class='add'>+115         Sabrent PCMCIA TV-PCB05                                 0919:2003</div><div class='add'>+116         10MOONS TM300 TV Card                                   1131:2304</div><div class='add'>+117         Avermedia Super 007                                     1461:f01d</div><div class='add'>+118         Beholder BeholdTV 401                                   0000:4016</div><div class='add'>+119         Beholder BeholdTV 403                                   0000:4036</div><div class='add'>+120         Beholder BeholdTV 403 FM                                0000:4037</div><div class='add'>+121         Beholder BeholdTV 405                                   0000:4050</div><div class='add'>+122         Beholder BeholdTV 405 FM                                0000:4051</div><div class='add'>+123         Beholder BeholdTV 407                                   0000:4070</div><div class='add'>+124         Beholder BeholdTV 407 FM                                0000:4071</div><div class='add'>+125         Beholder BeholdTV 409                                   0000:4090</div><div class='add'>+126         Beholder BeholdTV 505 FM                                5ace:5050</div><div class='add'>+127         Beholder BeholdTV 507 FM / BeholdTV 509 FM              5ace:5070, 5ace:5090</div><div class='add'>+128         Beholder BeholdTV Columbus TV/FM                        0000:5201</div><div class='add'>+129         Beholder BeholdTV 607 FM                                5ace:6070</div><div class='add'>+130         Beholder BeholdTV M6                                    5ace:6190</div><div class='add'>+131         Twinhan Hybrid DTV-DVB 3056 PCI                         1822:0022</div><div class='add'>+132         Genius TVGO AM11MCE</div><div class='add'>+133         NXP Snake DVB-S reference design</div><div class='add'>+134         Medion/Creatix CTX953 Hybrid                            16be:0010</div><div class='add'>+135         MSI TV@nywhere A/D v1.1                                 1462:8625</div><div class='add'>+136         AVerMedia Cardbus TV/Radio (E506R)                      1461:f436</div><div class='add'>+137         AVerMedia Hybrid TV/Radio (A16D)                        1461:f936</div><div class='add'>+138         Avermedia M115                                          1461:a836</div><div class='add'>+139         Compro VideoMate T750                                   185b:c900</div><div class='add'>+140         Avermedia DVB-S Pro A700                                1461:a7a1</div><div class='add'>+141         Avermedia DVB-S Hybrid+FM A700                          1461:a7a2</div><div class='add'>+142         Beholder BeholdTV H6                                    5ace:6290</div><div class='add'>+143         Beholder BeholdTV M63                                   5ace:6191</div><div class='add'>+144         Beholder BeholdTV M6 Extra                              5ace:6193</div><div class='add'>+145         AVerMedia MiniPCI DVB-T Hybrid M103                     1461:f636, 1461:f736</div><div class='add'>+146         ASUSTeK P7131 Analog</div><div class='add'>+147         Asus Tiger 3in1                                         1043:4878</div><div class='add'>+148         Encore ENLTV-FM v5.3                                    1a7f:2008</div><div class='add'>+149         Avermedia PCI pure analog (M135A)                       1461:f11d</div><div class='add'>+150         Zogis Real Angel 220</div><div class='add'>+151         ADS Tech Instant HDTV                                   1421:0380</div><div class='add'>+152         Asus Tiger Rev:1.00                                     1043:4857</div><div class='add'>+153         Kworld Plus TV Analog Lite PCI                          17de:7128</div><div class='add'>+154         Avermedia AVerTV GO 007 FM Plus                         1461:f31d</div><div class='add'>+155         Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid                 0070:6706, 0070:6708</div><div class='add'>+156         Hauppauge WinTV-HVR1120 DVB-T/Hybrid                    0070:6707, 0070:6709, 0070:670a</div><div class='add'>+157         Avermedia AVerTV Studio 507UA                           1461:a11b</div><div class='add'>+158         AVerMedia Cardbus TV/Radio (E501R)                      1461:b7e9</div><div class='add'>+159         Beholder BeholdTV 505 RDS                               0000:505B</div><div class='add'>+160         Beholder BeholdTV 507 RDS                               0000:5071</div><div class='add'>+161         Beholder BeholdTV 507 RDS                               0000:507B</div><div class='add'>+162         Beholder BeholdTV 607 FM                                5ace:6071</div><div class='add'>+163         Beholder BeholdTV 609 FM                                5ace:6090</div><div class='add'>+164         Beholder BeholdTV 609 FM                                5ace:6091</div><div class='add'>+165         Beholder BeholdTV 607 RDS                               5ace:6072</div><div class='add'>+166         Beholder BeholdTV 607 RDS                               5ace:6073</div><div class='add'>+167         Beholder BeholdTV 609 RDS                               5ace:6092</div><div class='add'>+168         Beholder BeholdTV 609 RDS                               5ace:6093</div><div class='add'>+169         Compro VideoMate S350/S300                              185b:c900</div><div class='add'>+170         AverMedia AverTV Studio 505                             1461:a115</div><div class='add'>+171         Beholder BeholdTV X7                                    5ace:7595</div><div class='add'>+172         RoverMedia TV Link Pro FM                               19d1:0138</div><div class='add'>+173         Zolid Hybrid TV Tuner PCI                               1131:2004</div><div class='add'>+174         Asus Europa Hybrid OEM                                  1043:4847</div><div class='add'>+175         Leadtek Winfast DTV1000S                                107d:6655</div><div class='add'>+176         Beholder BeholdTV 505 RDS                               0000:5051</div><div class='add'>+177         Hawell HW-404M7</div><div class='add'>+178         Beholder BeholdTV H7                                    5ace:7190</div><div class='add'>+179         Beholder BeholdTV A7                                    5ace:7090</div><div class='add'>+180         Avermedia PCI M733A                                     1461:4155, 1461:4255</div><div class='add'>+181         TechoTrend TT-budget T-3000                             13c2:2804</div><div class='add'>+182         Kworld PCI SBTVD/ISDB-T Full-Seg Hybrid                 17de:b136</div><div class='add'>+183         Compro VideoMate Vista M1F                              185b:c900</div><div class='add'>+184         Encore ENLTV-FM 3                                       1a7f:2108</div><div class='add'>+185         MagicPro ProHDTV Pro2 DMB-TH/Hybrid                     17de:d136</div><div class='add'>+186         Beholder BeholdTV 501                                   5ace:5010</div><div class='add'>+187         Beholder BeholdTV 503 FM                                5ace:5030</div><div class='add'>+188         Sensoray 811/911                                        6000:0811, 6000:0911</div><div class='add'>+189         Kworld PC150-U                                          17de:a134</div><div class='add'>+190         Asus My Cinema PS3-100                                  1043:48cd</div><div class='add'>+191         Hawell HW-9004V1</div><div class='add'>+192         AverMedia AverTV Satellite Hybrid+FM A706               1461:2055</div><div class='add'>+193         WIS Voyager or compatible                               1905:7007</div><div class='add'>+194         AverMedia AverTV/505                                    1461:a10a</div><div class='add'>+195         Leadtek Winfast TV2100 FM                               107d:6f3a</div><div class='add'>+196         SnaZio* TVPVR PRO                                       1779:13cf</div><div class='add'>+=========== ======================================================= ================================================================</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/saa7164-cardlist.rst b/Documentation/media/v4l-drivers/saa7164-cardlist.rst<br/>index b937836cd54c..7d17d38df3bc 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/saa7164-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/saa7164-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/saa7164-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/saa7164-cardlist.rst</a></div><div class='hunk'>@@ -1,19 +1,21 @@</div><div class='del'>-SAA7134 cards list</div><div class='add'>+SAA7164 cards list</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	  0 -&gt; Unknown</div><div class='del'>-	  1 -&gt; Generic Rev2</div><div class='del'>-	  2 -&gt; Generic Rev3</div><div class='del'>-	  3 -&gt; Hauppauge WinTV-HVR2250                             [0070:8880,0070:8810]</div><div class='del'>-	  4 -&gt; Hauppauge WinTV-HVR2200                             [0070:8980]</div><div class='del'>-	  5 -&gt; Hauppauge WinTV-HVR2200                             [0070:8900]</div><div class='del'>-	  6 -&gt; Hauppauge WinTV-HVR2200                             [0070:8901]</div><div class='del'>-	  7 -&gt; Hauppauge WinTV-HVR2250                             [0070:8891,0070:8851]</div><div class='del'>-	  8 -&gt; Hauppauge WinTV-HVR2250                             [0070:88A1]</div><div class='del'>-	  9 -&gt; Hauppauge WinTV-HVR2200                             [0070:8940]</div><div class='del'>-	 10 -&gt; Hauppauge WinTV-HVR2200                             [0070:8953]</div><div class='del'>-	 11 -&gt; Hauppauge WinTV-HVR2255(proto)</div><div class='del'>-	 12 -&gt; Hauppauge WinTV-HVR2255                             [0070:f111]</div><div class='del'>-	 13 -&gt; Hauppauge WinTV-HVR2205                             [0070:f123,0070:f120]</div><div class='add'>+=========== ==================================== ====================</div><div class='add'>+Card number Card name                            PCI IDs</div><div class='add'>+=========== ==================================== ====================</div><div class='add'>+0           Unknown</div><div class='add'>+1           Generic Rev2</div><div class='add'>+2           Generic Rev3</div><div class='add'>+3           Hauppauge WinTV-HVR2250              0070:8880, 0070:8810</div><div class='add'>+4           Hauppauge WinTV-HVR2200              0070:8980</div><div class='add'>+5           Hauppauge WinTV-HVR2200              0070:8900</div><div class='add'>+6           Hauppauge WinTV-HVR2200              0070:8901</div><div class='add'>+7           Hauppauge WinTV-HVR2250              0070:8891, 0070:8851</div><div class='add'>+8           Hauppauge WinTV-HVR2250              0070:88A1</div><div class='add'>+9           Hauppauge WinTV-HVR2200              0070:8940</div><div class='add'>+10          Hauppauge WinTV-HVR2200              0070:8953</div><div class='add'>+11          Hauppauge WinTV-HVR2255(proto)       0070:f111</div><div class='add'>+12          Hauppauge WinTV-HVR2255              0070:f111</div><div class='add'>+13          Hauppauge WinTV-HVR2205              0070:f123, 0070:f120</div><div class='add'>+=========== ==================================== ====================</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/tm6000-cardlist.rst b/Documentation/media/v4l-drivers/tm6000-cardlist.rst<br/>index 2fbd3886b5f0..ae2952683ccf 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/tm6000-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/tm6000-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/tm6000-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/tm6000-cardlist.rst</a></div><div class='hunk'>@@ -1,21 +1,24 @@</div><div class='ctx'> TM6000 cards list</div><div class='ctx'> =================</div><div class='ctx'> </div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	  1 -&gt; Generic tm5600 board                   (tm5600)          [6000:0001]</div><div class='del'>-	  2 -&gt; Generic tm6000 board                   (tm6000)          [6000:0001]</div><div class='del'>-	  3 -&gt; Generic tm6010 board                   (tm6010)          [6000:0002]</div><div class='del'>-	  4 -&gt; 10Moons UT821                          (tm5600)          [6000:0001]</div><div class='del'>-	  5 -&gt; 10Moons UT330                          (tm5600)</div><div class='del'>-	  6 -&gt; ADSTech Dual TV                        (tm6000)          [06e1:f332]</div><div class='del'>-	  7 -&gt; FreeCom and similar                    (tm6000)          [14aa:0620]</div><div class='del'>-	  8 -&gt; ADSTech Mini Dual TV                   (tm6000)          [06e1:b339]</div><div class='del'>-	  9 -&gt; Hauppauge WinTV HVR-900H/USB2 Stick    (tm6010)          [2040:6600,2040:6601,2040:6610,2040:6611]</div><div class='del'>-	 10 -&gt; Beholder Wander                        (tm6010)          [6000:dec0]</div><div class='del'>-	 11 -&gt; Beholder Voyager                       (tm6010)          [6000:dec1]</div><div class='del'>-	 12 -&gt; TerraTec Cinergy Hybrid XE/Cinergy Hybrid Stick (tm6010) [0ccd:0086,0ccd:00a5]</div><div class='del'>-	 13 -&gt; TwinHan TU501                          (tm6010)          [13d3:3240,13d3:3241,13d3:3243,13d3:3264]</div><div class='del'>-	 14 -&gt; Beholder Wander Lite                   (tm6010)          [6000:dec2]</div><div class='del'>-	 15 -&gt; Beholder Voyager Lite                  (tm6010)          [6000:dec3]</div><div class='del'>-</div><div class='add'>+=========== ================================================= ==========================================</div><div class='add'>+Card number Card name                                         USB IDs</div><div class='add'>+=========== ================================================= ==========================================</div><div class='add'>+0           Unknown tm6000 video grabber</div><div class='add'>+1           Generic tm5600 board                              6000:0001</div><div class='add'>+2           Generic tm6000 board</div><div class='add'>+3           Generic tm6010 board                              6000:0002</div><div class='add'>+4           10Moons UT 821</div><div class='add'>+5           10Moons UT 330</div><div class='add'>+6           ADSTECH Dual TV USB                               06e1:f332</div><div class='add'>+7           Freecom Hybrid Stick / Moka DVB-T Receiver Dual   14aa:0620</div><div class='add'>+8           ADSTECH Mini Dual TV USB                          06e1:b339</div><div class='add'>+9           Hauppauge WinTV HVR-900H / WinTV USB2-Stick       2040:6600, 2040:6601, 2040:6610, 2040:6611</div><div class='add'>+10          Beholder Wander DVB-T/TV/FM USB2.0                6000:dec0</div><div class='add'>+11          Beholder Voyager TV/FM USB2.0                     6000:dec1</div><div class='add'>+12          Terratec Cinergy Hybrid XE / Cinergy Hybrid-Stick 0ccd:0086, 0ccd:00A5</div><div class='add'>+13          Twinhan TU501(704D1)                              13d3:3240, 13d3:3241, 13d3:3243, 13d3:3264</div><div class='add'>+14          Beholder Wander Lite DVB-T/TV/FM USB2.0           6000:dec2</div><div class='add'>+15          Beholder Voyager Lite TV/FM USB2.0                6000:dec3</div><div class='add'>+16          Terratec Grabster AV 150/250 MX                   0ccd:0079</div><div class='add'>+=========== ================================================= ==========================================</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/tuner-cardlist.rst b/Documentation/media/v4l-drivers/tuner-cardlist.rst<br/>index 2f1e1029c04e..276dd90e0c59 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/tuner-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/tuner-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/tuner-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/tuner-cardlist.rst</a></div><div class='hunk'>@@ -1,96 +1,98 @@</div><div class='ctx'> Tuner cards list</div><div class='ctx'> ================</div><div class='ctx'> </div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	tuner=0 - Temic PAL (4002 FH5)</div><div class='del'>-	tuner=1 - Philips PAL_I (FI1246 and compatibles)</div><div class='del'>-	tuner=2 - Philips NTSC (FI1236,FM1236 and compatibles)</div><div class='del'>-	tuner=3 - Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)</div><div class='del'>-	tuner=4 - NoTuner</div><div class='del'>-	tuner=5 - Philips PAL_BG (FI1216 and compatibles)</div><div class='del'>-	tuner=6 - Temic NTSC (4032 FY5)</div><div class='del'>-	tuner=7 - Temic PAL_I (4062 FY5)</div><div class='del'>-	tuner=8 - Temic NTSC (4036 FY5)</div><div class='del'>-	tuner=9 - Alps HSBH1</div><div class='del'>-	tuner=10 - Alps TSBE1</div><div class='del'>-	tuner=11 - Alps TSBB5</div><div class='del'>-	tuner=12 - Alps TSBE5</div><div class='del'>-	tuner=13 - Alps TSBC5</div><div class='del'>-	tuner=14 - Temic PAL_BG (4006FH5)</div><div class='del'>-	tuner=15 - Alps TSCH6</div><div class='del'>-	tuner=16 - Temic PAL_DK (4016 FY5)</div><div class='del'>-	tuner=17 - Philips NTSC_M (MK2)</div><div class='del'>-	tuner=18 - Temic PAL_I (4066 FY5)</div><div class='del'>-	tuner=19 - Temic PAL* auto (4006 FN5)</div><div class='del'>-	tuner=20 - Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)</div><div class='del'>-	tuner=21 - Temic NTSC (4039 FR5)</div><div class='del'>-	tuner=22 - Temic PAL/SECAM multi (4046 FM5)</div><div class='del'>-	tuner=23 - Philips PAL_DK (FI1256 and compatibles)</div><div class='del'>-	tuner=24 - Philips PAL/SECAM multi (FQ1216ME)</div><div class='del'>-	tuner=25 - LG PAL_I+FM (TAPC-I001D)</div><div class='del'>-	tuner=26 - LG PAL_I (TAPC-I701D)</div><div class='del'>-	tuner=27 - LG NTSC+FM (TPI8NSR01F)</div><div class='del'>-	tuner=28 - LG PAL_BG+FM (TPI8PSB01D)</div><div class='del'>-	tuner=29 - LG PAL_BG (TPI8PSB11D)</div><div class='del'>-	tuner=30 - Temic PAL* auto + FM (4009 FN5)</div><div class='del'>-	tuner=31 - SHARP NTSC_JP (2U5JF5540)</div><div class='del'>-	tuner=32 - Samsung PAL TCPM9091PD27</div><div class='del'>-	tuner=33 - MT20xx universal</div><div class='del'>-	tuner=34 - Temic PAL_BG (4106 FH5)</div><div class='del'>-	tuner=35 - Temic PAL_DK/SECAM_L (4012 FY5)</div><div class='del'>-	tuner=36 - Temic NTSC (4136 FY5)</div><div class='del'>-	tuner=37 - LG PAL (newer TAPC series)</div><div class='del'>-	tuner=38 - Philips PAL/SECAM multi (FM1216ME MK3)</div><div class='del'>-	tuner=39 - LG NTSC (newer TAPC series)</div><div class='del'>-	tuner=40 - HITACHI V7-J180AT</div><div class='del'>-	tuner=41 - Philips PAL_MK (FI1216 MK)</div><div class='del'>-	tuner=42 - Philips FCV1236D ATSC/NTSC dual in</div><div class='del'>-	tuner=43 - Philips NTSC MK3 (FM1236MK3 or FM1236/F)</div><div class='del'>-	tuner=44 - Philips 4 in 1 (ATI TV Wonder Pro/Conexant)</div><div class='del'>-	tuner=45 - Microtune 4049 FM5</div><div class='del'>-	tuner=46 - Panasonic VP27s/ENGE4324D</div><div class='del'>-	tuner=47 - LG NTSC (TAPE series)</div><div class='del'>-	tuner=48 - Tenna TNF 8831 BGFF)</div><div class='del'>-	tuner=49 - Microtune 4042 FI5 ATSC/NTSC dual in</div><div class='del'>-	tuner=50 - TCL 2002N</div><div class='del'>-	tuner=51 - Philips PAL/SECAM_D (FM 1256 I-H3)</div><div class='del'>-	tuner=52 - Thomson DTT 7610 (ATSC/NTSC)</div><div class='del'>-	tuner=53 - Philips FQ1286</div><div class='del'>-	tuner=54 - Philips/NXP TDA 8290/8295 + 8275/8275A/18271</div><div class='del'>-	tuner=55 - TCL 2002MB</div><div class='del'>-	tuner=56 - Philips PAL/SECAM multi (FQ1216AME MK4)</div><div class='del'>-	tuner=57 - Philips FQ1236A MK4</div><div class='del'>-	tuner=58 - Ymec TVision TVF-8531MF/8831MF/8731MF</div><div class='del'>-	tuner=59 - Ymec TVision TVF-5533MF</div><div class='del'>-	tuner=60 - Thomson DTT 761X (ATSC/NTSC)</div><div class='del'>-	tuner=61 - Tena TNF9533-D/IF/TNF9533-B/DF</div><div class='del'>-	tuner=62 - Philips TEA5767HN FM Radio</div><div class='del'>-	tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner</div><div class='del'>-	tuner=64 - LG TDVS-H06xF</div><div class='del'>-	tuner=65 - Ymec TVF66T5-B/DFF</div><div class='del'>-	tuner=66 - LG TALN series</div><div class='del'>-	tuner=67 - Philips TD1316 Hybrid Tuner</div><div class='del'>-	tuner=68 - Philips TUV1236D ATSC/NTSC dual in</div><div class='del'>-	tuner=69 - Tena TNF 5335 and similar models</div><div class='del'>-	tuner=70 - Samsung TCPN 2121P30A</div><div class='del'>-	tuner=71 - Xceive xc2028/xc3028 tuner</div><div class='del'>-	tuner=72 - Thomson FE6600</div><div class='del'>-	tuner=73 - Samsung TCPG 6121P30A</div><div class='del'>-	tuner=75 - Philips TEA5761 FM Radio</div><div class='del'>-	tuner=76 - Xceive 5000 tuner</div><div class='del'>-	tuner=77 - TCL tuner MF02GIP-5N-E</div><div class='del'>-	tuner=78 - Philips FMD1216MEX MK3 Hybrid Tuner</div><div class='del'>-	tuner=79 - Philips PAL/SECAM multi (FM1216 MK5)</div><div class='del'>-	tuner=80 - Philips FQ1216LME MK3 PAL/SECAM w/active loopthrough</div><div class='del'>-	tuner=81 - Partsnic (Daewoo) PTI-5NF05</div><div class='del'>-	tuner=82 - Philips CU1216L</div><div class='del'>-	tuner=83 - NXP TDA18271</div><div class='del'>-	tuner=84 - Sony BTF-Pxn01Z</div><div class='del'>-	tuner=85 - Philips FQ1236 MK5</div><div class='del'>-	tuner=86 - Tena TNF5337 MFD</div><div class='del'>-	tuner=87 - Xceive 4000 tuner</div><div class='del'>-	tuner=88 - Xceive 5000C tuner</div><div class='del'>-	tuner=89 - Sony BTF-PG472Z PAL/SECAM</div><div class='del'>-	tuner=90 - Sony BTF-PK467Z NTSC-M-JP</div><div class='del'>-	tuner=91 - Sony BTF-PB463Z NTSC-M</div><div class='add'>+============ =====================================================</div><div class='add'>+Tuner number Card name</div><div class='add'>+============ =====================================================</div><div class='add'>+0            Temic PAL (4002 FH5)</div><div class='add'>+1            Philips PAL_I (FI1246 and compatibles)</div><div class='add'>+2            Philips NTSC (FI1236,FM1236 and compatibles)</div><div class='add'>+3            Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)</div><div class='add'>+4            NoTuner</div><div class='add'>+5            Philips PAL_BG (FI1216 and compatibles)</div><div class='add'>+6            Temic NTSC (4032 FY5)</div><div class='add'>+7            Temic PAL_I (4062 FY5)</div><div class='add'>+8            Temic NTSC (4036 FY5)</div><div class='add'>+9            Alps HSBH1</div><div class='add'>+10           Alps TSBE1</div><div class='add'>+11           Alps TSBB5</div><div class='add'>+12           Alps TSBE5</div><div class='add'>+13           Alps TSBC5</div><div class='add'>+14           Temic PAL_BG (4006FH5)</div><div class='add'>+15           Alps TSCH6</div><div class='add'>+16           Temic PAL_DK (4016 FY5)</div><div class='add'>+17           Philips NTSC_M (MK2)</div><div class='add'>+18           Temic PAL_I (4066 FY5)</div><div class='add'>+19           Temic PAL* auto (4006 FN5)</div><div class='add'>+20           Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)</div><div class='add'>+21           Temic NTSC (4039 FR5)</div><div class='add'>+22           Temic PAL/SECAM multi (4046 FM5)</div><div class='add'>+23           Philips PAL_DK (FI1256 and compatibles)</div><div class='add'>+24           Philips PAL/SECAM multi (FQ1216ME)</div><div class='add'>+25           LG PAL_I+FM (TAPC-I001D)</div><div class='add'>+26           LG PAL_I (TAPC-I701D)</div><div class='add'>+27           LG NTSC+FM (TPI8NSR01F)</div><div class='add'>+28           LG PAL_BG+FM (TPI8PSB01D)</div><div class='add'>+29           LG PAL_BG (TPI8PSB11D)</div><div class='add'>+30           Temic PAL* auto + FM (4009 FN5)</div><div class='add'>+31           SHARP NTSC_JP (2U5JF5540)</div><div class='add'>+32           Samsung PAL TCPM9091PD27</div><div class='add'>+33           MT20xx universal</div><div class='add'>+34           Temic PAL_BG (4106 FH5)</div><div class='add'>+35           Temic PAL_DK/SECAM_L (4012 FY5)</div><div class='add'>+36           Temic NTSC (4136 FY5)</div><div class='add'>+37           LG PAL (newer TAPC series)</div><div class='add'>+38           Philips PAL/SECAM multi (FM1216ME MK3)</div><div class='add'>+39           LG NTSC (newer TAPC series)</div><div class='add'>+40           HITACHI V7-J180AT</div><div class='add'>+41           Philips PAL_MK (FI1216 MK)</div><div class='add'>+42           Philips FCV1236D ATSC/NTSC dual in</div><div class='add'>+43           Philips NTSC MK3 (FM1236MK3 or FM1236/F)</div><div class='add'>+44           Philips 4 in 1 (ATI TV Wonder Pro/Conexant)</div><div class='add'>+45           Microtune 4049 FM5</div><div class='add'>+46           Panasonic VP27s/ENGE4324D</div><div class='add'>+47           LG NTSC (TAPE series)</div><div class='add'>+48           Tenna TNF 8831 BGFF)</div><div class='add'>+49           Microtune 4042 FI5 ATSC/NTSC dual in</div><div class='add'>+50           TCL 2002N</div><div class='add'>+51           Philips PAL/SECAM_D (FM 1256 I-H3)</div><div class='add'>+52           Thomson DTT 7610 (ATSC/NTSC)</div><div class='add'>+53           Philips FQ1286</div><div class='add'>+54           Philips/NXP TDA 8290/8295 + 8275/8275A/18271</div><div class='add'>+55           TCL 2002MB</div><div class='add'>+56           Philips PAL/SECAM multi (FQ1216AME MK4)</div><div class='add'>+57           Philips FQ1236A MK4</div><div class='add'>+58           Ymec TVision TVF-8531MF/8831MF/8731MF</div><div class='add'>+59           Ymec TVision TVF-5533MF</div><div class='add'>+60           Thomson DTT 761X (ATSC/NTSC)</div><div class='add'>+61           Tena TNF9533-D/IF/TNF9533-B/DF</div><div class='add'>+62           Philips TEA5767HN FM Radio</div><div class='add'>+63           Philips FMD1216ME MK3 Hybrid Tuner</div><div class='add'>+64           LG TDVS-H06xF</div><div class='add'>+65           Ymec TVF66T5-B/DFF</div><div class='add'>+66           LG TALN series</div><div class='add'>+67           Philips TD1316 Hybrid Tuner</div><div class='add'>+68           Philips TUV1236D ATSC/NTSC dual in</div><div class='add'>+69           Tena TNF 5335 and similar models</div><div class='add'>+70           Samsung TCPN 2121P30A</div><div class='add'>+71           Xceive xc2028/xc3028 tuner</div><div class='add'>+72           Thomson FE6600</div><div class='add'>+73           Samsung TCPG 6121P30A</div><div class='add'>+75           Philips TEA5761 FM Radio</div><div class='add'>+76           Xceive 5000 tuner</div><div class='add'>+77           TCL tuner MF02GIP-5N-E</div><div class='add'>+78           Philips FMD1216MEX MK3 Hybrid Tuner</div><div class='add'>+79           Philips PAL/SECAM multi (FM1216 MK5)</div><div class='add'>+80           Philips FQ1216LME MK3 PAL/SECAM w/active loopthrough</div><div class='add'>+81           Partsnic (Daewoo) PTI-5NF05</div><div class='add'>+82           Philips CU1216L</div><div class='add'>+83           NXP TDA18271</div><div class='add'>+84           Sony BTF-Pxn01Z</div><div class='add'>+85           Philips FQ1236 MK5</div><div class='add'>+86           Tena TNF5337 MFD</div><div class='add'>+87           Xceive 4000 tuner</div><div class='add'>+88           Xceive 5000C tuner</div><div class='add'>+89           Sony BTF-PG472Z PAL/SECAM</div><div class='add'>+90           Sony BTF-PK467Z NTSC-M-JP</div><div class='add'>+91           Sony BTF-PB463Z NTSC-M</div><div class='add'>+============ =====================================================</div><div class='head'>diff --git a/Documentation/media/v4l-drivers/usbvision-cardlist.rst b/Documentation/media/v4l-drivers/usbvision-cardlist.rst<br/>index 3d8be9cb1b5a..44d53dff0984 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/usbvision-cardlist.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/v4l-drivers/usbvision-cardlist.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/v4l-drivers/usbvision-cardlist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/v4l-drivers/usbvision-cardlist.rst</a></div><div class='hunk'>@@ -1,72 +1,74 @@</div><div class='del'>-Usbvision cards list</div><div class='add'>+USBvision cards list</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-	  0 -&gt; Xanboo                                                   [0a6f:0400]</div><div class='del'>-	  1 -&gt; Belkin USB VideoBus II Adapter                           [050d:0106]</div><div class='del'>-	  2 -&gt; Belkin Components USB VideoBus                           [050d:0207]</div><div class='del'>-	  3 -&gt; Belkin USB VideoBus II                                   [050d:0208]</div><div class='del'>-	  4 -&gt; echoFX InterView Lite                                    [0571:0002]</div><div class='del'>-	  5 -&gt; USBGear USBG-V1 resp. HAMA USB                           [0573:0003]</div><div class='del'>-	  6 -&gt; D-Link V100                                              [0573:0400]</div><div class='del'>-	  7 -&gt; X10 USB Camera                                           [0573:2000]</div><div class='del'>-	  8 -&gt; Hauppauge WinTV USB Live (PAL B/G)                       [0573:2d00]</div><div class='del'>-	  9 -&gt; Hauppauge WinTV USB Live Pro (NTSC M/N)                  [0573:2d01]</div><div class='del'>-	 10 -&gt; Zoran Co. PMD (Nogatech) AV-grabber Manhattan            [0573:2101]</div><div class='del'>-	 11 -&gt; Nogatech USB-TV (NTSC) FM                                [0573:4100]</div><div class='del'>-	 12 -&gt; PNY USB-TV (NTSC) FM                                     [0573:4110]</div><div class='del'>-	 13 -&gt; PixelView PlayTv-USB PRO (PAL) FM                        [0573:4450]</div><div class='del'>-	 14 -&gt; ZTV ZT-721 2.4GHz USB A/V Receiver                       [0573:4550]</div><div class='del'>-	 15 -&gt; Hauppauge WinTV USB (NTSC M/N)                           [0573:4d00]</div><div class='del'>-	 16 -&gt; Hauppauge WinTV USB (PAL B/G)                            [0573:4d01]</div><div class='del'>-	 17 -&gt; Hauppauge WinTV USB (PAL I)                              [0573:4d02]</div><div class='del'>-	 18 -&gt; Hauppauge WinTV USB (PAL/SECAM L)                        [0573:4d03]</div><div class='del'>-	 19 -&gt; Hauppauge WinTV USB (PAL D/K)                            [0573:4d04]</div><div class='del'>-	 20 -&gt; Hauppauge WinTV USB (NTSC FM)                            [0573:4d10]</div><div class='del'>-	 21 -&gt; Hauppauge WinTV USB (PAL B/G FM)                         [0573:4d11]</div><div class='del'>-	 22 -&gt; Hauppauge WinTV USB (PAL I FM)                           [0573:4d12]</div><div class='del'>-	 23 -&gt; Hauppauge WinTV USB (PAL D/K FM)                         [0573:4d14]</div><div class='del'>-	 24 -&gt; Hauppauge WinTV USB Pro (NTSC M/N)                       [0573:4d2a]</div><div class='del'>-	 25 -&gt; Hauppauge WinTV USB Pro (NTSC M/N) V2                    [0573:4d2b]</div><div class='del'>-	 26 -&gt; Hauppauge WinTV USB Pro (PAL/SECAM B/G/I/D/K/L)          [0573:4d2c]</div><div class='del'>-	 27 -&gt; Hauppauge WinTV USB Pro (NTSC M/N) V3                    [0573:4d20]</div><div class='del'>-	 28 -&gt; Hauppauge WinTV USB Pro (PAL B/G)                        [0573:4d21]</div><div class='del'>-	 29 -&gt; Hauppauge WinTV USB Pro (PAL I)                          [0573:4d22]</div><div class='del'>-	 30 -&gt; Hauppauge WinTV USB Pro (PAL/SECAM L)                    [0573:4d23]</div><div class='del'>-	 31 -&gt; Hauppauge WinTV USB Pro (PAL D/K)                        [0573:4d24]</div><div class='del'>-	 32 -&gt; Hauppauge WinTV USB Pro (PAL/SECAM BGDK/I/L)             [0573:4d25]</div><div class='del'>-	 33 -&gt; Hauppauge WinTV USB Pro (PAL/SECAM BGDK/I/L) V2          [0573:4d26]</div><div class='del'>-	 34 -&gt; Hauppauge WinTV USB Pro (PAL B/G) V2                     [0573:4d27]</div><div class='del'>-	 35 -&gt; Hauppauge WinTV USB Pro (PAL B/G,D/K)                    [0573:4d28]</div><div class='del'>-	 36 -&gt; Hauppauge WinTV USB Pro (PAL I,D/K)                      [0573:4d29]</div><div class='del'>-	 37 -&gt; Hauppauge WinTV USB Pro (NTSC M/N FM)                    [0573:4d30]</div><div class='del'>-	 38 -&gt; Hauppauge WinTV USB Pro (PAL B/G FM)                     [0573:4d31]</div><div class='del'>-	 39 -&gt; Hauppauge WinTV USB Pro (PAL I FM)                       [0573:4d32]</div><div class='del'>-	 40 -&gt; Hauppauge WinTV USB Pro (PAL D/K FM)                     [0573:4d34]</div><div class='del'>-	 41 -&gt; Hauppauge WinTV USB Pro (Temic PAL/SECAM B/G/I/D/K/L FM) [0573:4d35]</div><div class='del'>-	 42 -&gt; Hauppauge WinTV USB Pro (Temic PAL B/G FM)               [0573:4d36]</div><div class='del'>-	 43 -&gt; Hauppauge WinTV USB Pro (PAL/SECAM B/G/I/D/K/L FM)       [0573:4d37]</div><div class='del'>-	 44 -&gt; Hauppauge WinTV USB Pro (NTSC M/N FM) V2                 [0573:4d38]</div><div class='del'>-	 45 -&gt; Camtel Technology USB TV Genie Pro FM Model TVB330       [0768:0006]</div><div class='del'>-	 46 -&gt; Digital Video Creator I                                  [07d0:0001]</div><div class='del'>-	 47 -&gt; Global Village GV-007 (NTSC)                             [07d0:0002]</div><div class='del'>-	 48 -&gt; Dazzle Fusion Model DVC-50 Rev 1 (NTSC)                  [07d0:0003]</div><div class='del'>-	 49 -&gt; Dazzle Fusion Model DVC-80 Rev 1 (PAL)                   [07d0:0004]</div><div class='del'>-	 50 -&gt; Dazzle Fusion Model DVC-90 Rev 1 (SECAM)                 [07d0:0005]</div><div class='del'>-	 51 -&gt; Eskape Labs MyTV2Go                                      [07f8:9104]</div><div class='del'>-	 52 -&gt; Pinnacle Studio PCTV USB (PAL)                           [2304:010d]</div><div class='del'>-	 53 -&gt; Pinnacle Studio PCTV USB (SECAM)                         [2304:0109]</div><div class='del'>-	 54 -&gt; Pinnacle Studio PCTV USB (PAL) FM                        [2304:0110]</div><div class='del'>-	 55 -&gt; Miro PCTV USB                                            [2304:0111]</div><div class='del'>-	 56 -&gt; Pinnacle Studio PCTV USB (NTSC) FM                       [2304:0112]</div><div class='del'>-	 57 -&gt; Pinnacle Studio PCTV USB (PAL) FM V2                     [2304:0210]</div><div class='del'>-	 58 -&gt; Pinnacle Studio PCTV USB (NTSC) FM V2                    [2304:0212]</div><div class='del'>-	 59 -&gt; Pinnacle Studio PCTV USB (PAL) FM V3                     [2304:0214]</div><div class='del'>-	 60 -&gt; Pinnacle Studio Linx Video input cable (NTSC)            [2304:0300]</div><div class='del'>-	 61 -&gt; Pinnacle Studio Linx Video input cable (PAL)             [2304:0301]</div><div class='del'>-	 62 -&gt; Pinnacle PCTV Bungee USB (PAL) FM                        [2304:0419]</div><div class='del'>-	 63 -&gt; Hauppauge WinTv-USB                                      [2400:4200]</div><div class='del'>-	 64 -&gt; Pinnacle Studio PCTV USB (NTSC) FM V3                    [2304:0113]</div><div class='del'>-	 65 -&gt; Nogatech USB MicroCam NTSC (NV3000N)                     [0573:3000]</div><div class='del'>-	 66 -&gt; Nogatech USB MicroCam PAL (NV3001P)                      [0573:3001]</div><div class='add'>+=========== ======================================================== =========</div><div class='add'>+Card number Card name                                                USB IDs</div><div class='add'>+=========== ======================================================== =========</div><div class='add'>+0           Xanboo                                                   0a6f:0400</div><div class='add'>+1           Belkin USB VideoBus II Adapter                           050d:0106</div><div class='add'>+2           Belkin Components USB VideoBus                           050d:0207</div><div class='add'>+3           Belkin USB VideoBus II                                   050d:0208</div><div class='add'>+4           echoFX InterView Lite                                    0571:0002</div><div class='add'>+5           USBGear USBG-V1 resp. HAMA USB                           0573:0003</div><div class='add'>+6           D-Link V100                                              0573:0400</div><div class='add'>+7           X10 USB Camera                                           0573:2000</div><div class='add'>+8           Hauppauge WinTV USB Live (PAL B/G)                       0573:2d00</div><div class='add'>+9           Hauppauge WinTV USB Live Pro (NTSC M/N)                  0573:2d01</div><div class='add'>+10          Zoran Co. PMD (Nogatech) AV-grabber Manhattan            0573:2101</div><div class='add'>+11          Nogatech USB-TV (NTSC) FM                                0573:4100</div><div class='add'>+12          PNY USB-TV (NTSC) FM                                     0573:4110</div><div class='add'>+13          PixelView PlayTv-USB PRO (PAL) FM                        0573:4450</div><div class='add'>+14          ZTV ZT-721 2.4GHz USB A/V Receiver                       0573:4550</div><div class='add'>+15          Hauppauge WinTV USB (NTSC M/N)                           0573:4d00</div><div class='add'>+16          Hauppauge WinTV USB (PAL B/G)                            0573:4d01</div><div class='add'>+17          Hauppauge WinTV USB (PAL I)                              0573:4d02</div><div class='add'>+18          Hauppauge WinTV USB (PAL/SECAM L)                        0573:4d03</div><div class='add'>+19          Hauppauge WinTV USB (PAL D/K)                            0573:4d04</div><div class='add'>+20          Hauppauge WinTV USB (NTSC FM)                            0573:4d10</div><div class='add'>+21          Hauppauge WinTV USB (PAL B/G FM)                         0573:4d11</div><div class='add'>+22          Hauppauge WinTV USB (PAL I FM)                           0573:4d12</div><div class='add'>+23          Hauppauge WinTV USB (PAL D/K FM)                         0573:4d14</div><div class='add'>+24          Hauppauge WinTV USB Pro (NTSC M/N)                       0573:4d2a</div><div class='add'>+25          Hauppauge WinTV USB Pro (NTSC M/N) V2                    0573:4d2b</div><div class='add'>+26          Hauppauge WinTV USB Pro (PAL/SECAM B/G/I/D/K/L)          0573:4d2c</div><div class='add'>+27          Hauppauge WinTV USB Pro (NTSC M/N) V3                    0573:4d20</div><div class='add'>+28          Hauppauge WinTV USB Pro (PAL B/G)                        0573:4d21</div><div class='add'>+29          Hauppauge WinTV USB Pro (PAL I)                          0573:4d22</div><div class='add'>+30          Hauppauge WinTV USB Pro (PAL/SECAM L)                    0573:4d23</div><div class='add'>+31          Hauppauge WinTV USB Pro (PAL D/K)                        0573:4d24</div><div class='add'>+32          Hauppauge WinTV USB Pro (PAL/SECAM BGDK/I/L)             0573:4d25</div><div class='add'>+33          Hauppauge WinTV USB Pro (PAL/SECAM BGDK/I/L) V2          0573:4d26</div><div class='add'>+34          Hauppauge WinTV USB Pro (PAL B/G) V2                     0573:4d27</div><div class='add'>+35          Hauppauge WinTV USB Pro (PAL B/G,D/K)                    0573:4d28</div><div class='add'>+36          Hauppauge WinTV USB Pro (PAL I,D/K)                      0573:4d29</div><div class='add'>+37          Hauppauge WinTV USB Pro (NTSC M/N FM)                    0573:4d30</div><div class='add'>+38          Hauppauge WinTV USB Pro (PAL B/G FM)                     0573:4d31</div><div class='add'>+39          Hauppauge WinTV USB Pro (PAL I FM)                       0573:4d32</div><div class='add'>+40          Hauppauge WinTV USB Pro (PAL D/K FM)                     0573:4d34</div><div class='add'>+41          Hauppauge WinTV USB Pro (Temic PAL/SECAM B/G/I/D/K/L FM) 0573:4d35</div><div class='add'>+42          Hauppauge WinTV USB Pro (Temic PAL B/G FM)               0573:4d36</div><div class='add'>+43          Hauppauge WinTV USB Pro (PAL/SECAM B/G/I/D/K/L FM)       0573:4d37</div><div class='add'>+44          Hauppauge WinTV USB Pro (NTSC M/N FM) V2                 0573:4d38</div><div class='add'>+45          Camtel Technology USB TV Genie Pro FM Model TVB330       0768:0006</div><div class='add'>+46          Digital Video Creator I                                  07d0:0001</div><div class='add'>+47          Global Village GV-007 (NTSC)                             07d0:0002</div><div class='add'>+48          Dazzle Fusion Model DVC-50 Rev 1 (NTSC)                  07d0:0003</div><div class='add'>+49          Dazzle Fusion Model DVC-80 Rev 1 (PAL)                   07d0:0004</div><div class='add'>+50          Dazzle Fusion Model DVC-90 Rev 1 (SECAM)                 07d0:0005</div><div class='add'>+51          Eskape Labs MyTV2Go                                      07f8:9104</div><div class='add'>+52          Pinnacle Studio PCTV USB (PAL)                           2304:010d</div><div class='add'>+53          Pinnacle Studio PCTV USB (SECAM)                         2304:0109</div><div class='add'>+54          Pinnacle Studio PCTV USB (PAL) FM                        2304:0110</div><div class='add'>+55          Miro PCTV USB                                            2304:0111</div><div class='add'>+56          Pinnacle Studio PCTV USB (NTSC) FM                       2304:0112</div><div class='add'>+57          Pinnacle Studio PCTV USB (PAL) FM V2                     2304:0210</div><div class='add'>+58          Pinnacle Studio PCTV USB (NTSC) FM V2                    2304:0212</div><div class='add'>+59          Pinnacle Studio PCTV USB (PAL) FM V3                     2304:0214</div><div class='add'>+60          Pinnacle Studio Linx Video input cable (NTSC)            2304:0300</div><div class='add'>+61          Pinnacle Studio Linx Video input cable (PAL)             2304:0301</div><div class='add'>+62          Pinnacle PCTV Bungee USB (PAL) FM                        2304:0419</div><div class='add'>+63          Hauppauge WinTv-USB                                      2400:4200</div><div class='add'>+64          Pinnacle Studio PCTV USB (NTSC) FM V3                    2304:0113</div><div class='add'>+65          Nogatech USB MicroCam NTSC (NV3000N)                     0573:3000</div><div class='add'>+66          Nogatech USB MicroCam PAL (NV3001P)                      0573:3001</div><div class='add'>+=========== ======================================================== =========</div><div class='head'>diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions<br/>index 1d3f27d922b2..e11a0d0a8931 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/media/videodev2.h.rst.exceptions?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/media/videodev2.h.rst.exceptions</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/media/videodev2.h.rst.exceptions?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/media/videodev2.h.rst.exceptions</a></div><div class='hunk'>@@ -87,6 +87,10 @@ replace symbol V4L2_YCBCR_ENC_XV601 :c:type:`v4l2_ycbcr_encoding`</div><div class='ctx'> replace symbol V4L2_YCBCR_ENC_XV709 :c:type:`v4l2_ycbcr_encoding`</div><div class='ctx'> replace symbol V4L2_YCBCR_ENC_SMPTE240M :c:type:`v4l2_ycbcr_encoding`</div><div class='ctx'> </div><div class='add'>+# Documented enum v4l2_hsv_encoding</div><div class='add'>+replace symbol V4L2_HSV_ENC_180 :c:type:`v4l2_hsv_encoding`</div><div class='add'>+replace symbol V4L2_HSV_ENC_256 :c:type:`v4l2_hsv_encoding`</div><div class='add'>+</div><div class='ctx'> # Documented enum v4l2_quantization</div><div class='ctx'> replace symbol V4L2_QUANTIZATION_DEFAULT :c:type:`v4l2_quantization`</div><div class='ctx'> replace symbol V4L2_QUANTIZATION_FULL_RANGE :c:type:`v4l2_quantization`</div><div class='hunk'>@@ -276,6 +280,9 @@ replace define V4L2_DV_FL_REDUCED_FPS dv-bt-standards</div><div class='ctx'> replace define V4L2_DV_FL_HALF_LINE dv-bt-standards</div><div class='ctx'> replace define V4L2_DV_FL_IS_CE_VIDEO dv-bt-standards</div><div class='ctx'> replace define V4L2_DV_FL_FIRST_FIELD_EXTRA_LINE dv-bt-standards</div><div class='add'>+replace define V4L2_DV_FL_HAS_PICTURE_ASPECT dv-bt-standards</div><div class='add'>+replace define V4L2_DV_FL_HAS_CEA861_VIC dv-bt-standards</div><div class='add'>+replace define V4L2_DV_FL_HAS_HDMI_VIC dv-bt-standards</div><div class='ctx'> </div><div class='ctx'> replace define V4L2_DV_BT_656_1120 dv-timing-types</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt<br/>index ba818ecce6f9..d2b0a8d81258 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/memory-barriers.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/memory-barriers.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/memory-barriers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/memory-barriers.txt</a></div><div class='hunk'>@@ -640,6 +640,10 @@ See also the subsection on "Cache Coherency" for a more thorough example.</div><div class='ctx'> CONTROL DEPENDENCIES</div><div class='ctx'> --------------------</div><div class='ctx'> </div><div class='add'>+Control dependencies can be a bit tricky because current compilers do</div><div class='add'>+not understand them.  The purpose of this section is to help you prevent</div><div class='add'>+the compiler's ignorance from breaking your code.</div><div class='add'>+</div><div class='ctx'> A load-load control dependency requires a full read memory barrier, not</div><div class='ctx'> simply a data dependency barrier to make it work correctly.  Consider the</div><div class='ctx'> following bit of code:</div><div class='hunk'>@@ -667,14 +671,15 @@ for load-store control dependencies, as in the following example:</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	if (q) {</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-Control dependencies pair normally with other types of barriers.  That</div><div class='del'>-said, please note that READ_ONCE() is not optional! Without the</div><div class='del'>-READ_ONCE(), the compiler might combine the load from 'a' with other</div><div class='del'>-loads from 'a', and the store to 'b' with other stores to 'b', with</div><div class='del'>-possible highly counterintuitive effects on ordering.</div><div class='add'>+Control dependencies pair normally with other types of barriers.</div><div class='add'>+That said, please note that neither READ_ONCE() nor WRITE_ONCE()</div><div class='add'>+are optional! Without the READ_ONCE(), the compiler might combine the</div><div class='add'>+load from 'a' with other loads from 'a'.  Without the WRITE_ONCE(),</div><div class='add'>+the compiler might combine the store to 'b' with other stores to 'b'.</div><div class='add'>+Either can result in highly counterintuitive effects on ordering.</div><div class='ctx'> </div><div class='ctx'> Worse yet, if the compiler is able to prove (say) that the value of</div><div class='ctx'> variable 'a' is always non-zero, it would be well within its rights</div><div class='hunk'>@@ -682,7 +687,7 @@ to optimize the original example by eliminating the "if" statement</div><div class='ctx'> as follows:</div><div class='ctx'> </div><div class='ctx'> 	q = a;</div><div class='del'>-	b = p;  /* BUG: Compiler and CPU can both reorder!!! */</div><div class='add'>+	b = 1;  /* BUG: Compiler and CPU can both reorder!!! */</div><div class='ctx'> </div><div class='ctx'> So don't leave out the READ_ONCE().</div><div class='ctx'> </div><div class='hunk'>@@ -692,11 +697,11 @@ branches of the "if" statement as follows:</div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	if (q) {</div><div class='ctx'> 		barrier();</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='ctx'> 		barrier();</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -705,12 +710,12 @@ optimization levels:</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	barrier();</div><div class='del'>-	WRITE_ONCE(b, p);  /* BUG: No ordering vs. load from a!!! */</div><div class='add'>+	WRITE_ONCE(b, 1);  /* BUG: No ordering vs. load from a!!! */</div><div class='ctx'> 	if (q) {</div><div class='del'>-		/* WRITE_ONCE(b, p); -- moved up, BUG!!! */</div><div class='add'>+		/* WRITE_ONCE(b, 1); -- moved up, BUG!!! */</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='del'>-		/* WRITE_ONCE(b, p); -- moved up, BUG!!! */</div><div class='add'>+		/* WRITE_ONCE(b, 1); -- moved up, BUG!!! */</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -723,10 +728,10 @@ memory barriers, for example, smp_store_release():</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	if (q) {</div><div class='del'>-		smp_store_release(&amp;b, p);</div><div class='add'>+		smp_store_release(&amp;b, 1);</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='del'>-		smp_store_release(&amp;b, p);</div><div class='add'>+		smp_store_release(&amp;b, 1);</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -735,10 +740,10 @@ ordering is guaranteed only when the stores differ, for example:</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	if (q) {</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='del'>-		WRITE_ONCE(b, r);</div><div class='add'>+		WRITE_ONCE(b, 2);</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -751,10 +756,10 @@ the needed conditional.  For example:</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	if (q % MAX) {</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='del'>-		WRITE_ONCE(b, r);</div><div class='add'>+		WRITE_ONCE(b, 2);</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -763,7 +768,7 @@ equal to zero, in which case the compiler is within its rights to</div><div class='ctx'> transform the above code into the following:</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='del'>-	WRITE_ONCE(b, p);</div><div class='add'>+	WRITE_ONCE(b, 1);</div><div class='ctx'> 	do_something_else();</div><div class='ctx'> </div><div class='ctx'> Given this transformation, the CPU is not required to respect the ordering</div><div class='hunk'>@@ -776,10 +781,10 @@ one, perhaps as follows:</div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	BUILD_BUG_ON(MAX &lt;= 1); /* Order load from a with store to b. */</div><div class='ctx'> 	if (q % MAX) {</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='del'>-		WRITE_ONCE(b, r);</div><div class='add'>+		WRITE_ONCE(b, 2);</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -812,30 +817,28 @@ not necessarily apply to code following the if-statement:</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	if (q) {</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 	} else {</div><div class='del'>-		WRITE_ONCE(b, r);</div><div class='add'>+		WRITE_ONCE(b, 2);</div><div class='ctx'> 	}</div><div class='del'>-	WRITE_ONCE(c, 1);  /* BUG: No ordering against the read from "a". */</div><div class='add'>+	WRITE_ONCE(c, 1);  /* BUG: No ordering against the read from 'a'. */</div><div class='ctx'> </div><div class='ctx'> It is tempting to argue that there in fact is ordering because the</div><div class='ctx'> compiler cannot reorder volatile accesses and also cannot reorder</div><div class='del'>-the writes to "b" with the condition.  Unfortunately for this line</div><div class='del'>-of reasoning, the compiler might compile the two writes to "b" as</div><div class='add'>+the writes to 'b' with the condition.  Unfortunately for this line</div><div class='add'>+of reasoning, the compiler might compile the two writes to 'b' as</div><div class='ctx'> conditional-move instructions, as in this fanciful pseudo-assembly</div><div class='ctx'> language:</div><div class='ctx'> </div><div class='ctx'> 	ld r1,a</div><div class='del'>-	ld r2,p</div><div class='del'>-	ld r3,r</div><div class='ctx'> 	cmp r1,$0</div><div class='del'>-	cmov,ne r4,r2</div><div class='del'>-	cmov,eq r4,r3</div><div class='add'>+	cmov,ne r4,$1</div><div class='add'>+	cmov,eq r4,$2</div><div class='ctx'> 	st r4,b</div><div class='ctx'> 	st $1,c</div><div class='ctx'> </div><div class='ctx'> A weakly ordered CPU would have no dependency of any sort between the load</div><div class='del'>-from "a" and the store to "c".  The control dependencies would extend</div><div class='add'>+from 'a' and the store to 'c'.  The control dependencies would extend</div><div class='ctx'> only to the pair of cmov instructions and the store depending on them.</div><div class='ctx'> In short, control dependencies apply only to the stores in the then-clause</div><div class='ctx'> and else-clause of the if-statement in question (including functions</div><div class='hunk'>@@ -843,7 +846,7 @@ invoked by those two clauses), not to code following that if-statement.</div><div class='ctx'> </div><div class='ctx'> Finally, control dependencies do -not- provide transitivity.  This is</div><div class='ctx'> demonstrated by two related examples, with the initial values of</div><div class='del'>-x and y both being zero:</div><div class='add'>+'x' and 'y' both being zero:</div><div class='ctx'> </div><div class='ctx'> 	CPU 0                     CPU 1</div><div class='ctx'> 	=======================   =======================</div><div class='hunk'>@@ -915,6 +918,9 @@ In summary:</div><div class='ctx'>   (*) Control dependencies do -not- provide transitivity.  If you</div><div class='ctx'>       need transitivity, use smp_mb().</div><div class='ctx'> </div><div class='add'>+  (*) Compilers do not understand control dependencies.  It is therefore</div><div class='add'>+      your job to ensure that they do not break your code.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> SMP BARRIER PAIRING</div><div class='ctx'> -------------------</div><div class='head'>diff --git a/Documentation/memory-hotplug.txt b/Documentation/memory-hotplug.txt<br/>index 0d7cb955aa01..670f3ded0802 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/memory-hotplug.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/memory-hotplug.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/memory-hotplug.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/memory-hotplug.txt</a></div><div class='hunk'>@@ -114,11 +114,11 @@ config options.</div><div class='ctx'>     Memory model -&gt; Sparse Memory  (CONFIG_SPARSEMEM)</div><div class='ctx'>     Allow for memory hot-add       (CONFIG_MEMORY_HOTPLUG)</div><div class='ctx'> </div><div class='del'>-- To enable memory removal, the followings are also necessary</div><div class='add'>+- To enable memory removal, the following are also necessary</div><div class='ctx'>     Allow for memory hot remove    (CONFIG_MEMORY_HOTREMOVE)</div><div class='ctx'>     Page Migration                 (CONFIG_MIGRATION)</div><div class='ctx'> </div><div class='del'>-- For ACPI memory hotplug, the followings are also necessary</div><div class='add'>+- For ACPI memory hotplug, the following are also necessary</div><div class='ctx'>     Memory hotplug (under ACPI Support menu) (CONFIG_ACPI_HOTPLUG_MEMORY)</div><div class='ctx'>     This option can be kernel module.</div><div class='ctx'> </div><div class='hunk'>@@ -324,7 +324,7 @@ guarantee that the memory block contains only migratable pages.</div><div class='ctx'> Now, a boot option for making a memory block which consists of migratable pages</div><div class='ctx'> is supported. By specifying "kernelcore=" or "movablecore=" boot option, you can</div><div class='ctx'> create ZONE_MOVABLE...a zone which is just used for movable pages.</div><div class='del'>-(See also Documentation/kernel-parameters.txt)</div><div class='add'>+(See also Documentation/admin-guide/kernel-parameters.rst)</div><div class='ctx'> </div><div class='ctx'> Assume the system has "TOTAL" amount of memory at boot time, this boot option</div><div class='ctx'> creates ZONE_MOVABLE as following.</div><div class='head'>diff --git a/Documentation/module-signing.txt b/Documentation/module-signing.txt<br/>deleted file mode 100644<br/>index f0e3361db20c..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/module-signing.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/module-signing.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,279 +0,0 @@</div><div class='del'>-			==============================</div><div class='del'>-			KERNEL MODULE SIGNING FACILITY</div><div class='del'>-			==============================</div><div class='del'>-</div><div class='del'>-CONTENTS</div><div class='del'>-</div><div class='del'>- - Overview.</div><div class='del'>- - Configuring module signing.</div><div class='del'>- - Generating signing keys.</div><div class='del'>- - Public keys in the kernel.</div><div class='del'>- - Manually signing modules.</div><div class='del'>- - Signed modules and stripping.</div><div class='del'>- - Loading signed modules.</div><div class='del'>- - Non-valid signatures and unsigned modules.</div><div class='del'>- - Administering/protecting the private key.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-========</div><div class='del'>-OVERVIEW</div><div class='del'>-========</div><div class='del'>-</div><div class='del'>-The kernel module signing facility cryptographically signs modules during</div><div class='del'>-installation and then checks the signature upon loading the module.  This</div><div class='del'>-allows increased kernel security by disallowing the loading of unsigned modules</div><div class='del'>-or modules signed with an invalid key.  Module signing increases security by</div><div class='del'>-making it harder to load a malicious module into the kernel.  The module</div><div class='del'>-signature checking is done by the kernel so that it is not necessary to have</div><div class='del'>-trusted userspace bits.</div><div class='del'>-</div><div class='del'>-This facility uses X.509 ITU-T standard certificates to encode the public keys</div><div class='del'>-involved.  The signatures are not themselves encoded in any industrial standard</div><div class='del'>-type.  The facility currently only supports the RSA public key encryption</div><div class='del'>-standard (though it is pluggable and permits others to be used).  The possible</div><div class='del'>-hash algorithms that can be used are SHA-1, SHA-224, SHA-256, SHA-384, and</div><div class='del'>-SHA-512 (the algorithm is selected by data in the signature).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-==========================</div><div class='del'>-CONFIGURING MODULE SIGNING</div><div class='del'>-==========================</div><div class='del'>-</div><div class='del'>-The module signing facility is enabled by going to the "Enable Loadable Module</div><div class='del'>-Support" section of the kernel configuration and turning on</div><div class='del'>-</div><div class='del'>-	CONFIG_MODULE_SIG	"Module signature verification"</div><div class='del'>-</div><div class='del'>-This has a number of options available:</div><div class='del'>-</div><div class='del'>- (1) "Require modules to be validly signed" (CONFIG_MODULE_SIG_FORCE)</div><div class='del'>-</div><div class='del'>-     This specifies how the kernel should deal with a module that has a</div><div class='del'>-     signature for which the key is not known or a module that is unsigned.</div><div class='del'>-</div><div class='del'>-     If this is off (ie. "permissive"), then modules for which the key is not</div><div class='del'>-     available and modules that are unsigned are permitted, but the kernel will</div><div class='del'>-     be marked as being tainted, and the concerned modules will be marked as</div><div class='del'>-     tainted, shown with the character 'E'.</div><div class='del'>-</div><div class='del'>-     If this is on (ie. "restrictive"), only modules that have a valid</div><div class='del'>-     signature that can be verified by a public key in the kernel's possession</div><div class='del'>-     will be loaded.  All other modules will generate an error.</div><div class='del'>-</div><div class='del'>-     Irrespective of the setting here, if the module has a signature block that</div><div class='del'>-     cannot be parsed, it will be rejected out of hand.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (2) "Automatically sign all modules" (CONFIG_MODULE_SIG_ALL)</div><div class='del'>-</div><div class='del'>-     If this is on then modules will be automatically signed during the</div><div class='del'>-     modules_install phase of a build.  If this is off, then the modules must</div><div class='del'>-     be signed manually using:</div><div class='del'>-</div><div class='del'>-	scripts/sign-file</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (3) "Which hash algorithm should modules be signed with?"</div><div class='del'>-</div><div class='del'>-     This presents a choice of which hash algorithm the installation phase will</div><div class='del'>-     sign the modules with:</div><div class='del'>-</div><div class='del'>-	CONFIG_MODULE_SIG_SHA1		"Sign modules with SHA-1"</div><div class='del'>-	CONFIG_MODULE_SIG_SHA224	"Sign modules with SHA-224"</div><div class='del'>-	CONFIG_MODULE_SIG_SHA256	"Sign modules with SHA-256"</div><div class='del'>-	CONFIG_MODULE_SIG_SHA384	"Sign modules with SHA-384"</div><div class='del'>-	CONFIG_MODULE_SIG_SHA512	"Sign modules with SHA-512"</div><div class='del'>-</div><div class='del'>-     The algorithm selected here will also be built into the kernel (rather</div><div class='del'>-     than being a module) so that modules signed with that algorithm can have</div><div class='del'>-     their signatures checked without causing a dependency loop.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (4) "File name or PKCS#11 URI of module signing key" (CONFIG_MODULE_SIG_KEY)</div><div class='del'>-</div><div class='del'>-     Setting this option to something other than its default of</div><div class='del'>-     "certs/signing_key.pem" will disable the autogeneration of signing keys</div><div class='del'>-     and allow the kernel modules to be signed with a key of your choosing.</div><div class='del'>-     The string provided should identify a file containing both a private key</div><div class='del'>-     and its corresponding X.509 certificate in PEM form, or — on systems where</div><div class='del'>-     the OpenSSL ENGINE_pkcs11 is functional — a PKCS#11 URI as defined by</div><div class='del'>-     RFC7512. In the latter case, the PKCS#11 URI should reference both a</div><div class='del'>-     certificate and a private key.</div><div class='del'>-</div><div class='del'>-     If the PEM file containing the private key is encrypted, or if the</div><div class='del'>-     PKCS#11 token requries a PIN, this can be provided at build time by</div><div class='del'>-     means of the KBUILD_SIGN_PIN variable.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- (5) "Additional X.509 keys for default system keyring" (CONFIG_SYSTEM_TRUSTED_KEYS)</div><div class='del'>-</div><div class='del'>-     This option can be set to the filename of a PEM-encoded file containing</div><div class='del'>-     additional certificates which will be included in the system keyring by</div><div class='del'>-     default.</div><div class='del'>-</div><div class='del'>-Note that enabling module signing adds a dependency on the OpenSSL devel</div><div class='del'>-packages to the kernel build processes for the tool that does the signing.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-=======================</div><div class='del'>-GENERATING SIGNING KEYS</div><div class='del'>-=======================</div><div class='del'>-</div><div class='del'>-Cryptographic keypairs are required to generate and check signatures.  A</div><div class='del'>-private key is used to generate a signature and the corresponding public key is</div><div class='del'>-used to check it.  The private key is only needed during the build, after which</div><div class='del'>-it can be deleted or stored securely.  The public key gets built into the</div><div class='del'>-kernel so that it can be used to check the signatures as the modules are</div><div class='del'>-loaded.</div><div class='del'>-</div><div class='del'>-Under normal conditions, when CONFIG_MODULE_SIG_KEY is unchanged from its</div><div class='del'>-default, the kernel build will automatically generate a new keypair using</div><div class='del'>-openssl if one does not exist in the file:</div><div class='del'>-</div><div class='del'>-	certs/signing_key.pem</div><div class='del'>-</div><div class='del'>-during the building of vmlinux (the public part of the key needs to be built</div><div class='del'>-into vmlinux) using parameters in the:</div><div class='del'>-</div><div class='del'>-	certs/x509.genkey</div><div class='del'>-</div><div class='del'>-file (which is also generated if it does not already exist).</div><div class='del'>-</div><div class='del'>-It is strongly recommended that you provide your own x509.genkey file.</div><div class='del'>-</div><div class='del'>-Most notably, in the x509.genkey file, the req_distinguished_name section</div><div class='del'>-should be altered from the default:</div><div class='del'>-</div><div class='del'>-	[ req_distinguished_name ]</div><div class='del'>-	#O = Unspecified company</div><div class='del'>-	CN = Build time autogenerated kernel key</div><div class='del'>-	#emailAddress = unspecified.user@unspecified.company</div><div class='del'>-</div><div class='del'>-The generated RSA key size can also be set with:</div><div class='del'>-</div><div class='del'>-	[ req ]</div><div class='del'>-	default_bits = 4096</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-It is also possible to manually generate the key private/public files using the</div><div class='del'>-x509.genkey key generation configuration file in the root node of the Linux</div><div class='del'>-kernel sources tree and the openssl command.  The following is an example to</div><div class='del'>-generate the public/private key files:</div><div class='del'>-</div><div class='del'>-	openssl req -new -nodes -utf8 -sha256 -days 36500 -batch -x509 \</div><div class='del'>-	   -config x509.genkey -outform PEM -out kernel_key.pem \</div><div class='del'>-	   -keyout kernel_key.pem</div><div class='del'>-</div><div class='del'>-The full pathname for the resulting kernel_key.pem file can then be specified</div><div class='del'>-in the CONFIG_MODULE_SIG_KEY option, and the certificate and key therein will</div><div class='del'>-be used instead of an autogenerated keypair.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-=========================</div><div class='del'>-PUBLIC KEYS IN THE KERNEL</div><div class='del'>-=========================</div><div class='del'>-</div><div class='del'>-The kernel contains a ring of public keys that can be viewed by root.  They're</div><div class='del'>-in a keyring called ".system_keyring" that can be seen by:</div><div class='del'>-</div><div class='del'>-	[root@deneb ~]# cat /proc/keys</div><div class='del'>-	...</div><div class='del'>-	223c7853 I------     1 perm 1f030000     0     0 keyring   .system_keyring: 1</div><div class='del'>-	302d2d52 I------     1 perm 1f010000     0     0 asymmetri Fedora kernel signing key: d69a84e6bce3d216b979e9505b3e3ef9a7118079: X509.RSA a7118079 []</div><div class='del'>-	...</div><div class='del'>-</div><div class='del'>-Beyond the public key generated specifically for module signing, additional</div><div class='del'>-trusted certificates can be provided in a PEM-encoded file referenced by the</div><div class='del'>-CONFIG_SYSTEM_TRUSTED_KEYS configuration option.</div><div class='del'>-</div><div class='del'>-Further, the architecture code may take public keys from a hardware store and</div><div class='del'>-add those in also (e.g. from the UEFI key database).</div><div class='del'>-</div><div class='del'>-Finally, it is possible to add additional public keys by doing:</div><div class='del'>-</div><div class='del'>-	keyctl padd asymmetric "" [.system_keyring-ID] &lt;[key-file]</div><div class='del'>-</div><div class='del'>-e.g.:</div><div class='del'>-</div><div class='del'>-	keyctl padd asymmetric "" 0x223c7853 &lt;my_public_key.x509</div><div class='del'>-</div><div class='del'>-Note, however, that the kernel will only permit keys to be added to</div><div class='del'>-.system_keyring _if_ the new key's X.509 wrapper is validly signed by a key</div><div class='del'>-that is already resident in the .system_keyring at the time the key was added.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-=========================</div><div class='del'>-MANUALLY SIGNING MODULES</div><div class='del'>-=========================</div><div class='del'>-</div><div class='del'>-To manually sign a module, use the scripts/sign-file tool available in</div><div class='del'>-the Linux kernel source tree.  The script requires 4 arguments:</div><div class='del'>-</div><div class='del'>-	1.  The hash algorithm (e.g., sha256)</div><div class='del'>-	2.  The private key filename or PKCS#11 URI</div><div class='del'>-	3.  The public key filename</div><div class='del'>-	4.  The kernel module to be signed</div><div class='del'>-</div><div class='del'>-The following is an example to sign a kernel module:</div><div class='del'>-</div><div class='del'>-	scripts/sign-file sha512 kernel-signkey.priv \</div><div class='del'>-		kernel-signkey.x509 module.ko</div><div class='del'>-</div><div class='del'>-The hash algorithm used does not have to match the one configured, but if it</div><div class='del'>-doesn't, you should make sure that hash algorithm is either built into the</div><div class='del'>-kernel or can be loaded without requiring itself.</div><div class='del'>-</div><div class='del'>-If the private key requires a passphrase or PIN, it can be provided in the</div><div class='del'>-$KBUILD_SIGN_PIN environment variable.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-============================</div><div class='del'>-SIGNED MODULES AND STRIPPING</div><div class='del'>-============================</div><div class='del'>-</div><div class='del'>-A signed module has a digital signature simply appended at the end.  The string</div><div class='del'>-"~Module signature appended~." at the end of the module's file confirms that a</div><div class='del'>-signature is present but it does not confirm that the signature is valid!</div><div class='del'>-</div><div class='del'>-Signed modules are BRITTLE as the signature is outside of the defined ELF</div><div class='del'>-container.  Thus they MAY NOT be stripped once the signature is computed and</div><div class='del'>-attached.  Note the entire module is the signed payload, including any and all</div><div class='del'>-debug information present at the time of signing.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-======================</div><div class='del'>-LOADING SIGNED MODULES</div><div class='del'>-======================</div><div class='del'>-</div><div class='del'>-Modules are loaded with insmod, modprobe, init_module() or finit_module(),</div><div class='del'>-exactly as for unsigned modules as no processing is done in userspace.  The</div><div class='del'>-signature checking is all done within the kernel.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-=========================================</div><div class='del'>-NON-VALID SIGNATURES AND UNSIGNED MODULES</div><div class='del'>-=========================================</div><div class='del'>-</div><div class='del'>-If CONFIG_MODULE_SIG_FORCE is enabled or module.sig_enforce=1 is supplied on</div><div class='del'>-the kernel command line, the kernel will only load validly signed modules</div><div class='del'>-for which it has a public key.   Otherwise, it will also load modules that are</div><div class='del'>-unsigned.   Any module for which the kernel has a key, but which proves to have</div><div class='del'>-a signature mismatch will not be permitted to load.</div><div class='del'>-</div><div class='del'>-Any module that has an unparseable signature will be rejected.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-=========================================</div><div class='del'>-ADMINISTERING/PROTECTING THE PRIVATE KEY</div><div class='del'>-=========================================</div><div class='del'>-</div><div class='del'>-Since the private key is used to sign modules, viruses and malware could use</div><div class='del'>-the private key to sign modules and compromise the operating system.  The</div><div class='del'>-private key must be either destroyed or moved to a secure location and not kept</div><div class='del'>-in the root node of the kernel source tree.</div><div class='del'>-</div><div class='del'>-If you use the same private key to sign modules for multiple kernel</div><div class='del'>-configurations, you must ensure that the module version information is</div><div class='del'>-sufficient to prevent loading a module into a different kernel.  Either</div><div class='del'>-set CONFIG_MODVERSIONS=y or ensure that each configuration has a different</div><div class='del'>-kernel release string by changing EXTRAVERSION or CONFIG_LOCALVERSION.</div><div class='head'>diff --git a/Documentation/mono.txt b/Documentation/mono.txt<br/>deleted file mode 100644<br/>index d01ac6052194..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/mono.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/mono.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-               Mono(tm) Binary Kernel Support for Linux</div><div class='del'>-               -----------------------------------------</div><div class='del'>-</div><div class='del'>-To configure Linux to automatically execute Mono-based .NET binaries</div><div class='del'>-(in the form of .exe files) without the need to use the mono CLR</div><div class='del'>-wrapper, you can use the BINFMT_MISC kernel support.</div><div class='del'>-</div><div class='del'>-This will allow you to execute Mono-based .NET binaries just like any</div><div class='del'>-other program after you have done the following:</div><div class='del'>-</div><div class='del'>-1) You MUST FIRST install the Mono CLR support, either by downloading</div><div class='del'>-   a binary package, a source tarball or by installing from CVS. Binary</div><div class='del'>-   packages for several distributions can be found at:</div><div class='del'>-</div><div class='del'>-	http://go-mono.com/download.html</div><div class='del'>-</div><div class='del'>-   Instructions for compiling Mono can be found at:</div><div class='del'>-</div><div class='del'>-	http://www.go-mono.com/compiling.html</div><div class='del'>-</div><div class='del'>-   Once the Mono CLR support has been installed, just check that</div><div class='del'>-   /usr/bin/mono (which could be located elsewhere, for example</div><div class='del'>-   /usr/local/bin/mono) is working.</div><div class='del'>-</div><div class='del'>-2) You have to compile BINFMT_MISC either as a module or into</div><div class='del'>-   the kernel (CONFIG_BINFMT_MISC) and set it up properly.</div><div class='del'>-   If you choose to compile it as a module, you will have</div><div class='del'>-   to insert it manually with modprobe/insmod, as kmod</div><div class='del'>-   cannot be easily supported with binfmt_misc. </div><div class='del'>-   Read the file 'binfmt_misc.txt' in this directory to know</div><div class='del'>-   more about the configuration process.</div><div class='del'>-</div><div class='del'>-3) Add the following entries to /etc/rc.local or similar script</div><div class='del'>-   to be run at system startup:</div><div class='del'>-</div><div class='del'>-# Insert BINFMT_MISC module into the kernel</div><div class='del'>-if [ ! -e /proc/sys/fs/binfmt_misc/register ]; then</div><div class='del'>-        /sbin/modprobe binfmt_misc</div><div class='del'>-	# Some distributions, like Fedora Core, perform</div><div class='del'>-	# the following command automatically when the</div><div class='del'>-	# binfmt_misc module is loaded into the kernel</div><div class='del'>-	# or during normal boot up (systemd-based systems).</div><div class='del'>-	# Thus, it is possible that the following line</div><div class='del'>-	# is not needed at all.</div><div class='del'>-	mount -t binfmt_misc none /proc/sys/fs/binfmt_misc</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Register support for .NET CLR binaries</div><div class='del'>-if [ -e /proc/sys/fs/binfmt_misc/register ]; then</div><div class='del'>-	# Replace /usr/bin/mono with the correct pathname to</div><div class='del'>-	# the Mono CLR runtime (usually /usr/local/bin/mono</div><div class='del'>-	# when compiling from sources or CVS).</div><div class='del'>-        echo ':CLR:M::MZ::/usr/bin/mono:' &gt; /proc/sys/fs/binfmt_misc/register</div><div class='del'>-else</div><div class='del'>-        echo "No binfmt_misc support"</div><div class='del'>-        exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-4) Check that .exe binaries can be ran without the need of a</div><div class='del'>-   wrapper script, simply by launching the .exe file directly</div><div class='del'>-   from a command prompt, for example:</div><div class='del'>-</div><div class='del'>-	/usr/bin/xsd.exe</div><div class='del'>-</div><div class='del'>-   NOTE: If this fails with a permission denied error, check</div><div class='del'>-         that the .exe file has execute permissions.</div><div class='head'>diff --git a/Documentation/mtd/intel-spi.txt b/Documentation/mtd/intel-spi.txt<br/>new file mode 100644<br/>index 000000000000..bc357729c2cb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/mtd/intel-spi.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/mtd/intel-spi.txt</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+Upgrading BIOS using intel-spi</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+Many Intel CPUs like Baytrail and Braswell include SPI serial flash host</div><div class='add'>+controller which is used to hold BIOS and other platform specific data.</div><div class='add'>+Since contents of the SPI serial flash is crucial for machine to function,</div><div class='add'>+it is typically protected by different hardware protection mechanisms to</div><div class='add'>+avoid accidental (or on purpose) overwrite of the content.</div><div class='add'>+</div><div class='add'>+Not all manufacturers protect the SPI serial flash, mainly because it</div><div class='add'>+allows upgrading the BIOS image directly from an OS.</div><div class='add'>+</div><div class='add'>+The intel-spi driver makes it possible to read and write the SPI serial</div><div class='add'>+flash, if certain protection bits are not set and locked. If it finds</div><div class='add'>+any of them set, the whole MTD device is made read-only to prevent</div><div class='add'>+partial overwrites. By default the driver exposes SPI serial flash</div><div class='add'>+contents as read-only but it can be changed from kernel command line,</div><div class='add'>+passing "intel-spi.writeable=1".</div><div class='add'>+</div><div class='add'>+Please keep in mind that overwriting the BIOS image on SPI serial flash</div><div class='add'>+might render the machine unbootable and requires special equipment like</div><div class='add'>+Dediprog to revive. You have been warned!</div><div class='add'>+</div><div class='add'>+Below are the steps how to upgrade MinnowBoard MAX BIOS directly from</div><div class='add'>+Linux.</div><div class='add'>+</div><div class='add'>+ 1) Download and extract the latest Minnowboard MAX BIOS SPI image</div><div class='add'>+    [1]. At the time writing this the latest image is v92.</div><div class='add'>+</div><div class='add'>+ 2) Install mtd-utils package [2]. We need this in order to erase the SPI</div><div class='add'>+    serial flash. Distros like Debian and Fedora have this prepackaged with</div><div class='add'>+    name "mtd-utils".</div><div class='add'>+</div><div class='add'>+ 3) Add "intel-spi.writeable=1" to the kernel command line and reboot</div><div class='add'>+    the board (you can also reload the driver passing "writeable=1" as</div><div class='add'>+    module parameter to modprobe).</div><div class='add'>+</div><div class='add'>+ 4) Once the board is up and running again, find the right MTD partition</div><div class='add'>+    (it is named as "BIOS"):</div><div class='add'>+</div><div class='add'>+    # cat /proc/mtd</div><div class='add'>+    dev:    size   erasesize  name</div><div class='add'>+    mtd0: 00800000 00001000 "BIOS"</div><div class='add'>+</div><div class='add'>+    So here it will be /dev/mtd0 but it may vary.</div><div class='add'>+</div><div class='add'>+ 5) Make backup of the existing image first:</div><div class='add'>+</div><div class='add'>+    # dd if=/dev/mtd0ro of=bios.bak</div><div class='add'>+    16384+0 records in</div><div class='add'>+    16384+0 records out</div><div class='add'>+    8388608 bytes (8.4 MB) copied, 10.0269 s, 837 kB/s</div><div class='add'>+</div><div class='add'>+ 6) Verify the backup</div><div class='add'>+</div><div class='add'>+    # sha1sum /dev/mtd0ro bios.bak</div><div class='add'>+    fdbb011920572ca6c991377c4b418a0502668b73  /dev/mtd0ro</div><div class='add'>+    fdbb011920572ca6c991377c4b418a0502668b73  bios.bak</div><div class='add'>+</div><div class='add'>+    The SHA1 sums must match. Otherwise do not continue any further!</div><div class='add'>+</div><div class='add'>+ 7) Erase the SPI serial flash. After this step, do not reboot the</div><div class='add'>+    board! Otherwise it will not start anymore.</div><div class='add'>+</div><div class='add'>+    # flash_erase /dev/mtd0 0 0</div><div class='add'>+    Erasing 4 Kibyte @ 7ff000 -- 100 % complete</div><div class='add'>+</div><div class='add'>+ 8) Once completed without errors you can write the new BIOS image:</div><div class='add'>+</div><div class='add'>+    # dd if=MNW2MAX1.X64.0092.R01.1605221712.bin of=/dev/mtd0</div><div class='add'>+</div><div class='add'>+ 9) Verify that the new content of the SPI serial flash matches the new</div><div class='add'>+    BIOS image:</div><div class='add'>+</div><div class='add'>+    # sha1sum /dev/mtd0ro MNW2MAX1.X64.0092.R01.1605221712.bin</div><div class='add'>+    9b4df9e4be2057fceec3a5529ec3d950836c87a2  /dev/mtd0ro</div><div class='add'>+    9b4df9e4be2057fceec3a5529ec3d950836c87a2 MNW2MAX1.X64.0092.R01.1605221712.bin</div><div class='add'>+</div><div class='add'>+    The SHA1 sums should match.</div><div class='add'>+</div><div class='add'>+ 10) Now you can reboot your board and observe the new BIOS starting up</div><div class='add'>+     properly.</div><div class='add'>+</div><div class='add'>+References</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+[1] https://firmware.intel.com/sites/default/files/MinnowBoard.MAX_.X64.92.R01.zip</div><div class='add'>+[2] http://www.linux-mtd.infradead.org/</div><div class='head'>diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt<br/>index 8a8d3d96f6c6..ccf94677b240 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/batman-adv.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/batman-adv.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/batman-adv.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/batman-adv.txt</a></div><div class='hunk'>@@ -32,7 +32,7 @@ compatible interfaces. Once found, it will create  subfolders  in</div><div class='ctx'> the /sys directories of each supported interface, e.g.</div><div class='ctx'> </div><div class='ctx'> # ls /sys/class/net/eth0/batman_adv/</div><div class='del'>-# iface_status  mesh_iface</div><div class='add'>+# elp_interval  iface_status  mesh_iface  throughput_override</div><div class='ctx'> </div><div class='ctx'> If an interface does not have the "batman_adv" subfolder it prob-</div><div class='ctx'> ably is not supported. Not supported  interfaces  are:  loopback,</div><div class='hunk'>@@ -71,17 +71,19 @@ All  mesh  wide  settings  can be found in batman's own interface</div><div class='ctx'> folder:</div><div class='ctx'> </div><div class='ctx'> # ls /sys/class/net/bat0/mesh/</div><div class='del'>-#aggregated_ogms        distributed_arp_table  gw_sel_class    orig_interval</div><div class='del'>-#ap_isolation           fragmentation          hop_penalty     routing_algo</div><div class='del'>-#bonding                gw_bandwidth           isolation_mark  vlan0</div><div class='del'>-#bridge_loop_avoidance  gw_mode                log_level</div><div class='add'>+# aggregated_ogms        fragmentation  isolation_mark  routing_algo</div><div class='add'>+# ap_isolation           gw_bandwidth   log_level       vlan0</div><div class='add'>+# bonding                gw_mode        multicast_mode</div><div class='add'>+# bridge_loop_avoidance  gw_sel_class   network_coding</div><div class='add'>+# distributed_arp_table  hop_penalty    orig_interval</div><div class='ctx'> </div><div class='ctx'> There is a special folder for debugging information:</div><div class='ctx'> </div><div class='ctx'> # ls /sys/kernel/debug/batman_adv/bat0/</div><div class='del'>-# bla_backbone_table  log                 transtable_global</div><div class='del'>-# bla_claim_table     originators         transtable_local</div><div class='del'>-# gateways            socket</div><div class='add'>+# bla_backbone_table  log          neighbors          transtable_local</div><div class='add'>+# bla_claim_table     mcast_flags  originators</div><div class='add'>+# dat_cache           nc           socket</div><div class='add'>+# gateways            nc_nodes     transtable_global</div><div class='ctx'> </div><div class='ctx'> Some of the files contain all sort of status information  regard-</div><div class='ctx'> ing  the  mesh  network.  For  example, you can view the table of</div><div class='hunk'>@@ -159,13 +161,16 @@ file in debugfs</div><div class='ctx'> The additional debug output is by default disabled. It can be en-</div><div class='ctx'> abled  during run time. Following log_levels are defined:</div><div class='ctx'> </div><div class='del'>-0 - All  debug  output  disabled</div><div class='del'>-1 - Enable messages related to routing / flooding / broadcasting</div><div class='del'>-2 - Enable messages related to route added / changed / deleted</div><div class='del'>-4 - Enable messages related to translation table operations</div><div class='del'>-8 - Enable messages related to bridge loop avoidance</div><div class='del'>-16 - Enable messaged related to DAT, ARP snooping and parsing</div><div class='del'>-31 - Enable all messages</div><div class='add'>+  0 - All  debug  output  disabled</div><div class='add'>+  1 - Enable messages related to routing / flooding / broadcasting</div><div class='add'>+  2 - Enable messages related to route added / changed / deleted</div><div class='add'>+  4 - Enable messages related to translation table operations</div><div class='add'>+  8 - Enable messages related to bridge loop avoidance</div><div class='add'>+ 16 - Enable messages related to DAT, ARP snooping and parsing</div><div class='add'>+ 32 - Enable messages related to network coding</div><div class='add'>+ 64 - Enable messages related to multicast</div><div class='add'>+128 - Enable messages related to throughput meter</div><div class='add'>+255 - Enable all messages</div><div class='ctx'> </div><div class='ctx'> The debug output can be changed at runtime  using  the  file</div><div class='ctx'> /sys/class/net/bat0/mesh/log_level. e.g.</div><div class='head'>diff --git a/Documentation/networking/cdc_mbim.txt b/Documentation/networking/cdc_mbim.txt<br/>index a15ea602aa52..b9482ca10254 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/cdc_mbim.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/cdc_mbim.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/cdc_mbim.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/cdc_mbim.txt</a></div><div class='hunk'>@@ -38,7 +38,7 @@ Basic usage</div><div class='ctx'> ===========</div><div class='ctx'> </div><div class='ctx'> MBIM functions are inactive when unmanaged. The cdc_mbim driver only</div><div class='del'>-provides an userspace interface to the MBIM control channel, and will</div><div class='add'>+provides a userspace interface to the MBIM control channel, and will</div><div class='ctx'> not participate in the management of the function. This implies that a</div><div class='ctx'> userspace MBIM management application always is required to enable a</div><div class='ctx'> MBIM function.</div><div class='hunk'>@@ -200,7 +200,7 @@ structure described in section 10.5.29 of [1].</div><div class='ctx'> The DSS VLAN subdevices are used as a practical interface between the</div><div class='ctx'> shared MBIM data channel and a MBIM DSS aware userspace application.</div><div class='ctx'> It is not intended to be presented as-is to an end user. The</div><div class='del'>-assumption is that an userspace application initiating a DSS session</div><div class='add'>+assumption is that a userspace application initiating a DSS session</div><div class='ctx'> also takes care of the necessary framing of the DSS data, presenting</div><div class='ctx'> the stream to the end user in an appropriate way for the stream type.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/networking/dsa/dsa.txt b/Documentation/networking/dsa/dsa.txt<br/>index 63912ef34606..b8b40753133e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/dsa/dsa.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/dsa/dsa.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/dsa/dsa.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/dsa/dsa.txt</a></div><div class='hunk'>@@ -295,7 +295,6 @@ DSA currently leverages the following subsystems:</div><div class='ctx'> - MDIO/PHY library: drivers/net/phy/phy.c, mdio_bus.c</div><div class='ctx'> - Switchdev: net/switchdev/*</div><div class='ctx'> - Device Tree for various of_* functions</div><div class='del'>-- HWMON: drivers/hwmon/*</div><div class='ctx'> </div><div class='ctx'> MDIO/PHY library</div><div class='ctx'> ----------------</div><div class='hunk'>@@ -349,12 +348,6 @@ Documentation/devicetree/bindings/net/dsa/dsa.txt. PHY/MDIO library helper</div><div class='ctx'> functions such as of_get_phy_mode(), of_phy_connect() are also used to query</div><div class='ctx'> per-port PHY specific details: interface connection, MDIO bus location etc..</div><div class='ctx'> </div><div class='del'>-HWMON</div><div class='del'>------</div><div class='del'>-</div><div class='del'>-Some switch drivers feature internal temperature sensors which are exposed as</div><div class='del'>-regular HWMON devices in /sys/class/hwmon/.</div><div class='del'>-</div><div class='ctx'> Driver development</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='hunk'>@@ -495,23 +488,6 @@ Power management</div><div class='ctx'>   BR_STATE_DISABLED and propagating changes to the hardware if this port is</div><div class='ctx'>   disabled while being a bridge member</div><div class='ctx'> </div><div class='del'>-Hardware monitoring</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-These callbacks are only available if CONFIG_NET_DSA_HWMON is enabled:</div><div class='del'>-</div><div class='del'>-- get_temp: this function queries the given switch for its temperature</div><div class='del'>-</div><div class='del'>-- get_temp_limit: this function returns the switch current maximum temperature</div><div class='del'>-  limit</div><div class='del'>-</div><div class='del'>-- set_temp_limit: this function configures the maximum temperature limit allowed</div><div class='del'>-</div><div class='del'>-- get_temp_alarm: this function returns the critical temperature threshold</div><div class='del'>-  returning an alarm notification</div><div class='del'>-</div><div class='del'>-See Documentation/hwmon/sysfs-interface for details.</div><div class='del'>-</div><div class='ctx'> Bridge layer</div><div class='ctx'> ------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/networking/gtp.txt b/Documentation/networking/gtp.txt<br/>new file mode 100644<br/>index 000000000000..93e96750f103<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/gtp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/gtp.txt</a></div><div class='hunk'>@@ -0,0 +1,135 @@</div><div class='add'>+The Linux kernel GTP tunneling module</div><div class='add'>+======================================================================</div><div class='add'>+Documentation by Harald Welte &lt;laforge@gnumonks.org&gt;</div><div class='add'>+</div><div class='add'>+In 'drivers/net/gtp.c' you are finding a kernel-level implementation</div><div class='add'>+of a GTP tunnel endpoint.</div><div class='add'>+</div><div class='add'>+== What is GTP ==</div><div class='add'>+</div><div class='add'>+GTP is the Generic Tunnel Protocol, which is a 3GPP protocol used for</div><div class='add'>+tunneling User-IP payload between a mobile station (phone, modem)</div><div class='add'>+and the interconnection between an external packet data network (such</div><div class='add'>+as the internet).</div><div class='add'>+</div><div class='add'>+So when you start a 'data connection' from your mobile phone, the</div><div class='add'>+phone will use the control plane to signal for the establishment of</div><div class='add'>+such a tunnel between that external data network and the phone.  The</div><div class='add'>+tunnel endpoints thus reside on the phone and in the gateway.  All</div><div class='add'>+intermediate nodes just transport the encapsulated packet.</div><div class='add'>+</div><div class='add'>+The phone itself does not implement GTP but uses some other</div><div class='add'>+technology-dependent protocol stack for transmitting the user IP</div><div class='add'>+payload, such as LLC/SNDCP/RLC/MAC.</div><div class='add'>+</div><div class='add'>+At some network element inside the cellular operator infrastructure</div><div class='add'>+(SGSN in case of GPRS/EGPRS or classic UMTS, hNodeB in case of a 3G</div><div class='add'>+femtocell, eNodeB in case of 4G/LTE), the cellular protocol stacking</div><div class='add'>+is translated into GTP *without breaking the end-to-end tunnel*.  So</div><div class='add'>+intermediate nodes just perform some specific relay function.</div><div class='add'>+</div><div class='add'>+At some point the GTP packet ends up on the so-called GGSN (GSM/UMTS)</div><div class='add'>+or P-GW (LTE), which terminates the tunnel, decapsulates the packet</div><div class='add'>+and forwards it onto an external packet data network.  This can be</div><div class='add'>+public internet, but can also be any private IP network (or even</div><div class='add'>+theoretically some non-IP network like X.25).</div><div class='add'>+</div><div class='add'>+You can find the protocol specification in 3GPP TS 29.060, available</div><div class='add'>+publicly via the 3GPP website at http://www.3gpp.org/DynaReport/29060.htm</div><div class='add'>+</div><div class='add'>+A direct PDF link to v13.6.0 is provided for convenience below:</div><div class='add'>+http://www.etsi.org/deliver/etsi_ts/129000_129099/129060/13.06.00_60/ts_129060v130600p.pdf</div><div class='add'>+</div><div class='add'>+== The Linux GTP tunnelling module ==</div><div class='add'>+</div><div class='add'>+The module implements the function of a tunnel endpoint, i.e. it is</div><div class='add'>+able to decapsulate tunneled IP packets in the uplink originated by</div><div class='add'>+the phone, and encapsulate raw IP packets received from the external</div><div class='add'>+packet network in downlink towards the phone.</div><div class='add'>+</div><div class='add'>+It *only* implements the so-called 'user plane', carrying the User-IP</div><div class='add'>+payload, called GTP-U.  It does not implement the 'control plane',</div><div class='add'>+which is a signaling protocol used for establishment and teardown of</div><div class='add'>+GTP tunnels (GTP-C).</div><div class='add'>+</div><div class='add'>+So in order to have a working GGSN/P-GW setup, you will need a</div><div class='add'>+userspace program that implements the GTP-C protocol and which then</div><div class='add'>+uses the netlink interface provided by the GTP-U module in the kernel</div><div class='add'>+to configure the kernel module.</div><div class='add'>+</div><div class='add'>+This split architecture follows the tunneling modules of other</div><div class='add'>+protocols, e.g. PPPoE or L2TP, where you also run a userspace daemon</div><div class='add'>+to handle the tunnel establishment, authentication etc. and only the</div><div class='add'>+data plane is accelerated inside the kernel.</div><div class='add'>+</div><div class='add'>+Don't be confused by terminology:  The GTP User Plane goes through</div><div class='add'>+kernel accelerated path, while the GTP Control Plane goes to</div><div class='add'>+Userspace :)</div><div class='add'>+</div><div class='add'>+The official homepge of the module is at</div><div class='add'>+https://osmocom.org/projects/linux-kernel-gtp-u/wiki</div><div class='add'>+</div><div class='add'>+== Userspace Programs with Linux Kernel GTP-U support ==</div><div class='add'>+</div><div class='add'>+At the time of this writing, there are at least two Free Software</div><div class='add'>+implementations that implement GTP-C and can use the netlink interface</div><div class='add'>+to make use of the Linux kernel GTP-U support:</div><div class='add'>+</div><div class='add'>+* OpenGGSN (classic 2G/3G GGSN in C):</div><div class='add'>+  https://osmocom.org/projects/openggsn/wiki/OpenGGSN</div><div class='add'>+</div><div class='add'>+* ergw (GGSN + P-GW in Erlang):</div><div class='add'>+  https://github.com/travelping/ergw</div><div class='add'>+</div><div class='add'>+== Userspace Library / Command Line Utilities ==</div><div class='add'>+</div><div class='add'>+There is a userspace library called 'libgtpnl' which is based on</div><div class='add'>+libmnl and which implements a C-language API towards the netlink</div><div class='add'>+interface provided by the Kernel GTP module:</div><div class='add'>+</div><div class='add'>+http://git.osmocom.org/libgtpnl/</div><div class='add'>+</div><div class='add'>+== Protocol Versions ==</div><div class='add'>+</div><div class='add'>+There are two different versions of GTP-U: v0 and v1.  Both are</div><div class='add'>+implemented in the Kernel GTP module.  Version 0 is a legacy version,</div><div class='add'>+and deprecated from recent 3GPP specifications.</div><div class='add'>+</div><div class='add'>+There are three versions of GTP-C: v0, v1, and v2.  As the kernel</div><div class='add'>+doesn't implement GTP-C, we don't have to worry about this.  It's the</div><div class='add'>+responsibility of the control plane implementation in userspace to</div><div class='add'>+implement that.</div><div class='add'>+</div><div class='add'>+== IPv6 ==</div><div class='add'>+</div><div class='add'>+The 3GPP specifications indicate either IPv4 or IPv6 can be used both</div><div class='add'>+on the inner (user) IP layer, or on the outer (transport) layer.</div><div class='add'>+</div><div class='add'>+Unfortunately, the Kernel module currently supports IPv6 neither for</div><div class='add'>+the User IP payload, nor for the outer IP layer.  Patches or other</div><div class='add'>+Contributions to fix this are most welcome!</div><div class='add'>+</div><div class='add'>+== Mailing List ==</div><div class='add'>+</div><div class='add'>+If yo have questions regarding how to use the Kernel GTP module from</div><div class='add'>+your own software, or want to contribute to the code, please use the</div><div class='add'>+osmocom-net-grps mailing list for related discussion. The list can be</div><div class='add'>+reached at osmocom-net-gprs@lists.osmocom.org and the mailman</div><div class='add'>+interface for managign your subscription is at</div><div class='add'>+https://lists.osmocom.org/mailman/listinfo/osmocom-net-gprs</div><div class='add'>+</div><div class='add'>+== Issue Tracker ==</div><div class='add'>+</div><div class='add'>+The Osmocom project maintains an issue tracker for the Kernel GTP-U</div><div class='add'>+module at</div><div class='add'>+https://osmocom.org/projects/linux-kernel-gtp-u/issues</div><div class='add'>+</div><div class='add'>+== History / Acknowledgements ==</div><div class='add'>+</div><div class='add'>+The Module was originally created in 2012 by Harald Welte, but never</div><div class='add'>+completed.  Pablo came in to finish the mess Harald left behind.  But</div><div class='add'>+doe to a lack of user interest, it never got merged.</div><div class='add'>+</div><div class='add'>+In 2015, Andreas Schultz came to the rescue and fixed lots more bugs,</div><div class='add'>+extended it with new features and finally pushed all of us to get it</div><div class='add'>+mainline, where it was merged in 4.7.0.</div><div class='head'>diff --git a/Documentation/networking/ieee802154.txt b/Documentation/networking/ieee802154.txt<br/>index aa69ccc481db..c4114346f054 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/ieee802154.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/ieee802154.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/ieee802154.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/ieee802154.txt</a></div><div class='hunk'>@@ -4,20 +4,20 @@</div><div class='ctx'> </div><div class='ctx'> Introduction</div><div class='ctx'> ============</div><div class='del'>-The IEEE 802.15.4 working group focuses on standardization of bottom</div><div class='del'>-two layers: Medium Access Control (MAC) and Physical (PHY). And there</div><div class='add'>+The IEEE 802.15.4 working group focuses on standardization of the bottom</div><div class='add'>+two layers: Medium Access Control (MAC) and Physical access (PHY). And there</div><div class='ctx'> are mainly two options available for upper layers:</div><div class='ctx'>  - ZigBee - proprietary protocol from the ZigBee Alliance</div><div class='ctx'>  - 6LoWPAN - IPv6 networking over low rate personal area networks</div><div class='ctx'> </div><div class='del'>-The linux-wpan project goal is to provide a complete implementation</div><div class='add'>+The goal of the Linux-wpan is to provide a complete implementation</div><div class='ctx'> of the IEEE 802.15.4 and 6LoWPAN protocols. IEEE 802.15.4 is a stack</div><div class='ctx'> of protocols for organizing Low-Rate Wireless Personal Area Networks.</div><div class='ctx'> </div><div class='ctx'> The stack is composed of three main parts:</div><div class='ctx'>  - IEEE 802.15.4 layer;  We have chosen to use plain Berkeley socket API,</div><div class='del'>-   the generic Linux networking stack to transfer IEEE 802.15.4 messages</div><div class='del'>-   and a special protocol over genetlink for configuration/management</div><div class='add'>+   the generic Linux networking stack to transfer IEEE 802.15.4 data</div><div class='add'>+   messages and a special protocol over netlink for configuration/management</div><div class='ctx'>  - MAC - provides access to shared channel and reliable data delivery</div><div class='ctx'>  - PHY - represents device drivers</div><div class='ctx'> </div><div class='hunk'>@@ -33,15 +33,13 @@ include/net/af_ieee802154.h header or in the special header</div><div class='ctx'> in the userspace package (see either http://wpan.cakelab.org/ or the</div><div class='ctx'> git tree at https://github.com/linux-wpan/wpan-tools).</div><div class='ctx'> </div><div class='del'>-One can use SOCK_RAW for passing raw data towards device xmit function. YMMV.</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> Kernel side</div><div class='ctx'> =============</div><div class='ctx'> </div><div class='ctx'> Like with WiFi, there are several types of devices implementing IEEE 802.15.4.</div><div class='ctx'> 1) 'HardMAC'. The MAC layer is implemented in the device itself, the device</div><div class='del'>-   exports MLME and data API.</div><div class='add'>+   exports a management (e.g. MLME) and data API.</div><div class='ctx'> 2) 'SoftMAC' or just radio. These types of devices are just radio transceivers</div><div class='ctx'>    possibly with some kinds of acceleration like automatic CRC computation and</div><div class='ctx'>    comparation, automagic ACK handling, address matching, etc.</div><div class='hunk'>@@ -106,7 +104,7 @@ Fake drivers</div><div class='ctx'> </div><div class='ctx'> In addition there is a driver available which simulates a real device with</div><div class='ctx'> SoftMAC (fakelb - IEEE 802.15.4 loopback driver) interface. This option</div><div class='del'>-provides possibility to test and debug stack without usage of real hardware.</div><div class='add'>+provides a possibility to test and debug the stack without usage of real hardware.</div><div class='ctx'> </div><div class='ctx'> See sources in drivers/net/ieee802154 folder for more details.</div><div class='ctx'> </div><div class='hunk'>@@ -125,17 +123,15 @@ to support the IPv6 minimum MTU requirement [RFC2460], and stateless header</div><div class='ctx'> compression for IPv6 datagrams (LOWPAN_HC1 and LOWPAN_HC2) to reduce the</div><div class='ctx'> relatively large IPv6 and UDP headers down to (in the best case) several bytes.</div><div class='ctx'> </div><div class='del'>-In Semptember 2011 the standard update was published - [RFC6282].</div><div class='add'>+In September 2011 the standard update was published - [RFC6282].</div><div class='ctx'> It deprecates HC1 and HC2 compression and defines IPHC encoding format which is</div><div class='ctx'> used in this Linux implementation.</div><div class='ctx'> </div><div class='ctx'> All the code related to 6lowpan you may find in files: net/6lowpan/*</div><div class='ctx'> and net/ieee802154/6lowpan/*</div><div class='ctx'> </div><div class='del'>-To setup 6lowpan interface you need (busybox release &gt; 1.17.0):</div><div class='del'>-1. Add IEEE802.15.4 interface and initialize PANid;</div><div class='add'>+To setup a 6LoWPAN interface you need:</div><div class='add'>+1. Add IEEE802.15.4 interface and set channel and PAN ID;</div><div class='ctx'> 2. Add 6lowpan interface by command like:</div><div class='ctx'>    # ip link add link wpan0 name lowpan0 type lowpan</div><div class='del'>-3. Set MAC (if needs):</div><div class='del'>-   # ip link set lowpan0 address de:ad:be:ef:ca:fe:ba:be</div><div class='del'>-4. Bring up 'lowpan0' interface</div><div class='add'>+3. Bring up 'lowpan0' interface</div><div class='head'>diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt<br/>index 3db8c67d2c8d..fc73eeb7b3b8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/ip-sysctl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/ip-sysctl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/ip-sysctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/ip-sysctl.txt</a></div><div class='hunk'>@@ -246,21 +246,12 @@ tcp_dsack - BOOLEAN</div><div class='ctx'> 	Allows TCP to send "duplicate" SACKs.</div><div class='ctx'> </div><div class='ctx'> tcp_early_retrans - INTEGER</div><div class='del'>-	Enable Early Retransmit (ER), per RFC 5827. ER lowers the threshold</div><div class='del'>-	for triggering fast retransmit when the amount of outstanding data is</div><div class='del'>-	small and when no previously unsent data can be transmitted (such</div><div class='del'>-	that limited transmit could be used). Also controls the use of</div><div class='del'>-	Tail loss probe (TLP) that converts RTOs occurring due to tail</div><div class='del'>-	losses into fast recovery (draft-dukkipati-tcpm-tcp-loss-probe-01).</div><div class='add'>+	Tail loss probe (TLP) converts RTOs occurring due to tail</div><div class='add'>+	losses into fast recovery (draft-ietf-tcpm-rack). Note that</div><div class='add'>+	TLP requires RACK to function properly (see tcp_recovery below)</div><div class='ctx'> 	Possible values:</div><div class='del'>-		0 disables ER</div><div class='del'>-		1 enables ER</div><div class='del'>-		2 enables ER but delays fast recovery and fast retransmit</div><div class='del'>-		  by a fourth of RTT. This mitigates connection falsely</div><div class='del'>-		  recovers when network has a small degree of reordering</div><div class='del'>-		  (less than 3 packets).</div><div class='del'>-		3 enables delayed ER and TLP.</div><div class='del'>-		4 enables TLP only.</div><div class='add'>+		0 disables TLP</div><div class='add'>+		3 or 4 enables TLP</div><div class='ctx'> 	Default: 3</div><div class='ctx'> </div><div class='ctx'> tcp_ecn - INTEGER</div><div class='hunk'>@@ -610,8 +601,13 @@ tcp_syn_retries - INTEGER</div><div class='ctx'> 	with the current initial RTO of 1second. With this the final timeout</div><div class='ctx'> 	for an active TCP connection attempt will happen after 127seconds.</div><div class='ctx'> </div><div class='del'>-tcp_timestamps - BOOLEAN</div><div class='del'>-	Enable timestamps as defined in RFC1323.</div><div class='add'>+tcp_timestamps - INTEGER</div><div class='add'>+Enable timestamps as defined in RFC1323.</div><div class='add'>+	0: Disabled.</div><div class='add'>+	1: Enable timestamps as defined in RFC1323 and use random offset for</div><div class='add'>+	each connection rather than only using the current time.</div><div class='add'>+	2: Like 1, but without random offsets.</div><div class='add'>+	Default: 1</div><div class='ctx'> </div><div class='ctx'> tcp_min_tso_segs - INTEGER</div><div class='ctx'> 	Minimal number of segments per TSO frame.</div><div class='hunk'>@@ -707,18 +703,6 @@ tcp_thin_linear_timeouts - BOOLEAN</div><div class='ctx'> 	Documentation/networking/tcp-thin.txt</div><div class='ctx'> 	Default: 0</div><div class='ctx'> </div><div class='del'>-tcp_thin_dupack - BOOLEAN</div><div class='del'>-	Enable dynamic triggering of retransmissions after one dupACK</div><div class='del'>-	for thin streams. If set, a check is performed upon reception</div><div class='del'>-	of a dupACK to determine if the stream is thin (less than 4</div><div class='del'>-	packets in flight). As long as the stream is found to be thin,</div><div class='del'>-	data is retransmitted on the first received dupACK. This</div><div class='del'>-	improves retransmission latency for non-aggressive thin</div><div class='del'>-	streams, often found to be time-dependent.</div><div class='del'>-	For more information on thin streams, see</div><div class='del'>-	Documentation/networking/tcp-thin.txt</div><div class='del'>-	Default: 0</div><div class='del'>-</div><div class='ctx'> tcp_limit_output_bytes - INTEGER</div><div class='ctx'> 	Controls TCP Small Queue limit per tcp socket.</div><div class='ctx'> 	TCP bulk sender tends to increase packets in flight until it</div><div class='hunk'>@@ -737,6 +721,13 @@ tcp_challenge_ack_limit - INTEGER</div><div class='ctx'> </div><div class='ctx'> UDP variables:</div><div class='ctx'> </div><div class='add'>+udp_l3mdev_accept - BOOLEAN</div><div class='add'>+	Enabling this option allows a "global" bound socket to work</div><div class='add'>+	across L3 master domains (e.g., VRFs) with packets capable of</div><div class='add'>+	being received regardless of the L3 domain in which they</div><div class='add'>+	originated. Only valid when the kernel was compiled with</div><div class='add'>+	CONFIG_NET_L3_MASTER_DEV.</div><div class='add'>+</div><div class='ctx'> udp_mem - vector of 3 INTEGERs: min, pressure, max</div><div class='ctx'> 	Number of pages allowed for queueing by all UDP sockets.</div><div class='ctx'> </div><div class='hunk'>@@ -838,6 +829,15 @@ ip_local_reserved_ports - list of comma separated ranges</div><div class='ctx'> </div><div class='ctx'> 	Default: Empty</div><div class='ctx'> </div><div class='add'>+ip_unprivileged_port_start - INTEGER</div><div class='add'>+	This is a per-namespace sysctl.  It defines the first</div><div class='add'>+	unprivileged port in the network namespace.  Privileged ports</div><div class='add'>+	require root or CAP_NET_BIND_SERVICE in order to bind to them.</div><div class='add'>+	To disable all privileged ports, set this to 0.  It may not</div><div class='add'>+	overlap with the ip_local_reserved_ports range.</div><div class='add'>+</div><div class='add'>+	Default: 1024</div><div class='add'>+</div><div class='ctx'> ip_nonlocal_bind - BOOLEAN</div><div class='ctx'> 	If set, allows processes to bind() to non-local IP addresses,</div><div class='ctx'> 	which can be quite useful - but may break some applications.</div><div class='hunk'>@@ -967,6 +967,21 @@ igmp_qrv - INTEGER</div><div class='ctx'> 	Default: 2 (as specified by RFC2236 8.1)</div><div class='ctx'> 	Minimum: 1 (as specified by RFC6636 4.5)</div><div class='ctx'> </div><div class='add'>+force_igmp_version - INTEGER</div><div class='add'>+	0 - (default) No enforcement of a IGMP version, IGMPv1/v2 fallback</div><div class='add'>+	    allowed. Will back to IGMPv3 mode again if all IGMPv1/v2 Querier</div><div class='add'>+	    Present timer expires.</div><div class='add'>+	1 - Enforce to use IGMP version 1. Will also reply IGMPv1 report if</div><div class='add'>+	    receive IGMPv2/v3 query.</div><div class='add'>+	2 - Enforce to use IGMP version 2. Will fallback to IGMPv1 if receive</div><div class='add'>+	    IGMPv1 query message. Will reply report if receive IGMPv3 query.</div><div class='add'>+	3 - Enforce to use IGMP version 3. The same react with default 0.</div><div class='add'>+</div><div class='add'>+	Note: this is not the same with force_mld_version because IGMPv3 RFC3376</div><div class='add'>+	Security Considerations does not have clear description that we could</div><div class='add'>+	ignore other version messages completely as MLDv2 RFC3810. So make</div><div class='add'>+	this value as default 0 is recommended.</div><div class='add'>+</div><div class='ctx'> conf/interface/*  changes special settings per interface (where</div><div class='ctx'> "interface" is the name of your network interface)</div><div class='ctx'> </div><div class='hunk'>@@ -1714,6 +1729,15 @@ drop_unsolicited_na - BOOLEAN</div><div class='ctx'> </div><div class='ctx'> 	By default this is turned off.</div><div class='ctx'> </div><div class='add'>+enhanced_dad - BOOLEAN</div><div class='add'>+	Include a nonce option in the IPv6 neighbor solicitation messages used for</div><div class='add'>+	duplicate address detection per RFC7527. A received DAD NS will only signal</div><div class='add'>+	a duplicate address if the nonce is different. This avoids any false</div><div class='add'>+	detection of duplicates due to loopback of the NS messages that we send.</div><div class='add'>+	The nonce option will be sent on an interface unless both of</div><div class='add'>+	conf/{all,interface}/enhanced_dad are set to FALSE.</div><div class='add'>+	Default: TRUE</div><div class='add'>+</div><div class='ctx'> icmp/*:</div><div class='ctx'> ratelimit - INTEGER</div><div class='ctx'> 	Limit the maximal rates for sending ICMPv6 packets.</div><div class='head'>diff --git a/Documentation/networking/kcm.txt b/Documentation/networking/kcm.txt<br/>index 3476ede5bc2c..9a513295b07c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/kcm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/kcm.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/kcm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/kcm.txt</a></div><div class='hunk'>@@ -272,7 +272,7 @@ on the socket thus waking up the application thread. When the application</div><div class='ctx'> sees the error (which may just be a disconnect) it should unattach the</div><div class='ctx'> socket from KCM and then close it. It is assumed that once an error is</div><div class='ctx'> posted on the TCP socket the data stream is unrecoverable (i.e. an error</div><div class='del'>-may have occurred in in the middle of receiving a messssge).</div><div class='add'>+may have occurred in the middle of receiving a messssge).</div><div class='ctx'> </div><div class='ctx'> TCP connection monitoring</div><div class='ctx'> -------------------------</div><div class='head'>diff --git a/Documentation/networking/l2tp.txt b/Documentation/networking/l2tp.txt<br/>index 4650a00ed012..9bc271cdc9a8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/l2tp.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/l2tp.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/l2tp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/l2tp.txt</a></div><div class='hunk'>@@ -177,10 +177,10 @@ setsockopt on the PPPoX socket to set a debug mask.</div><div class='ctx'> </div><div class='ctx'> The following debug mask bits are available:</div><div class='ctx'> </div><div class='del'>-PPPOL2TP_MSG_DEBUG    verbose debug (if compiled in)</div><div class='del'>-PPPOL2TP_MSG_CONTROL  userspace - kernel interface</div><div class='del'>-PPPOL2TP_MSG_SEQ      sequence numbers handling</div><div class='del'>-PPPOL2TP_MSG_DATA     data packets</div><div class='add'>+L2TP_MSG_DEBUG    verbose debug (if compiled in)</div><div class='add'>+L2TP_MSG_CONTROL  userspace - kernel interface</div><div class='add'>+L2TP_MSG_SEQ      sequence numbers handling</div><div class='add'>+L2TP_MSG_DATA     data packets</div><div class='ctx'> </div><div class='ctx'> If enabled, files under a l2tp debugfs directory can be used to dump</div><div class='ctx'> kernel state about L2TP tunnels and sessions. To access it, the</div><div class='head'>diff --git a/Documentation/networking/mac80211_hwsim/README b/Documentation/networking/mac80211_hwsim/README<br/>index 24ac91d56698..3566a725d19c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/mac80211_hwsim/README?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/mac80211_hwsim/README</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/mac80211_hwsim/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/mac80211_hwsim/README</a></div><div class='hunk'>@@ -60,7 +60,7 @@ modprobe mac80211_hwsim</div><div class='ctx'> hostapd hostapd.conf</div><div class='ctx'> </div><div class='ctx'> # Run wpa_supplicant (station) for wlan1</div><div class='del'>-wpa_supplicant -Dwext -iwlan1 -c wpa_supplicant.conf</div><div class='add'>+wpa_supplicant -Dnl80211 -iwlan1 -c wpa_supplicant.conf</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> More test cases are available in hostap.git:</div><div class='head'>diff --git a/Documentation/networking/mpls-sysctl.txt b/Documentation/networking/mpls-sysctl.txt<br/>index 9ed15f86c17c..15d8d16934fd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/mpls-sysctl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/mpls-sysctl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/mpls-sysctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/mpls-sysctl.txt</a></div><div class='hunk'>@@ -5,8 +5,8 @@ platform_labels - INTEGER</div><div class='ctx'> 	possible to configure forwarding for label values equal to or</div><div class='ctx'> 	greater than the number of platform labels.</div><div class='ctx'> </div><div class='del'>-	A dense utliziation of the entries in the platform label table</div><div class='del'>-	is possible and expected aas the platform labels are locally</div><div class='add'>+	A dense utilization of the entries in the platform label table</div><div class='add'>+	is possible and expected as the platform labels are locally</div><div class='ctx'> 	allocated.</div><div class='ctx'> </div><div class='ctx'> 	If the number of platform label table entries is set to 0 no</div><div class='head'>diff --git a/Documentation/networking/netconsole.txt b/Documentation/networking/netconsole.txt<br/>index 30409a36e95d..296ea00fd3eb 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/netconsole.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/netconsole.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/netconsole.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/netconsole.txt</a></div><div class='hunk'>@@ -200,7 +200,7 @@ priority messages to the console. You can change this at runtime using:</div><div class='ctx'> or by specifying "debug" on the kernel command line at boot, to send</div><div class='ctx'> all kernel messages to the console. A specific value for this parameter</div><div class='ctx'> can also be set using the "loglevel" kernel boot option. See the</div><div class='del'>-dmesg(8) man page and Documentation/kernel-parameters.txt for details.</div><div class='add'>+dmesg(8) man page and Documentation/admin-guide/kernel-parameters.rst for details.</div><div class='ctx'> </div><div class='ctx'> Netconsole was designed to be as instantaneous as possible, to</div><div class='ctx'> enable the logging of even the most critical kernel bugs. It works</div><div class='head'>diff --git a/Documentation/networking/netdev-FAQ.txt b/Documentation/networking/netdev-FAQ.txt<br/>index a20b2fae942b..247a30ba8e17 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/netdev-FAQ.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/netdev-FAQ.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/netdev-FAQ.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/netdev-FAQ.txt</a></div><div class='hunk'>@@ -136,14 +136,14 @@ A: Normally Greg Kroah-Hartman collects stable commits himself, but</div><div class='ctx'> </div><div class='ctx'> Q: I see a network patch and I think it should be backported to stable.</div><div class='ctx'>    Should I request it via "stable@vger.kernel.org" like the references in</div><div class='del'>-   the kernel's Documentation/stable_kernel_rules.txt file say?</div><div class='add'>+   the kernel's Documentation/process/stable-kernel-rules.rst file say?</div><div class='ctx'> </div><div class='ctx'> A: No, not for networking.  Check the stable queues as per above 1st to see</div><div class='ctx'>    if it is already queued.  If not, then send a mail to netdev, listing</div><div class='ctx'>    the upstream commit ID and why you think it should be a stable candidate.</div><div class='ctx'> </div><div class='ctx'>    Before you jump to go do the above, do note that the normal stable rules</div><div class='del'>-   in Documentation/stable_kernel_rules.txt still apply.  So you need to</div><div class='add'>+   in Documentation/process/stable-kernel-rules.rst still apply.  So you need to</div><div class='ctx'>    explicitly indicate why it is a critical fix and exactly what users are</div><div class='ctx'>    impacted.  In addition, you need to convince yourself that you _really_</div><div class='ctx'>    think it has been overlooked, vs. having been considered and rejected.</div><div class='hunk'>@@ -165,7 +165,7 @@ A: No.  See above answer.  In short, if you think it really belongs in</div><div class='ctx'> </div><div class='ctx'>    If you think there is some valid information relating to it being in</div><div class='ctx'>    stable that does _not_ belong in the commit log, then use the three</div><div class='del'>-   dash marker line as described in Documentation/SubmittingPatches to</div><div class='add'>+   dash marker line as described in Documentation/process/submitting-patches.rst to</div><div class='ctx'>    temporarily embed that information into the patch that you send.</div><div class='ctx'> </div><div class='ctx'> Q: Someone said that the comment style and coding convention is different</div><div class='hunk'>@@ -220,5 +220,5 @@ A: Attention to detail.  Re-read your own work as if you were the</div><div class='ctx'>    If it is your first patch, mail it to yourself so you can test apply</div><div class='ctx'>    it to an unpatched tree to confirm infrastructure didn't mangle it.</div><div class='ctx'> </div><div class='del'>-   Finally, go back and read Documentation/SubmittingPatches to be</div><div class='add'>+   Finally, go back and read Documentation/process/submitting-patches.rst to be</div><div class='ctx'>    sure you are not repeating some common mistake documented there.</div><div class='head'>diff --git a/Documentation/networking/netfilter-sysctl.txt b/Documentation/networking/netfilter-sysctl.txt<br/>new file mode 100644<br/>index 000000000000..55791e50e169<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/netfilter-sysctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/netfilter-sysctl.txt</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+/proc/sys/net/netfilter/* Variables:</div><div class='add'>+</div><div class='add'>+nf_log_all_netns - BOOLEAN</div><div class='add'>+	0 - disabled (default)</div><div class='add'>+	not 0 - enabled</div><div class='add'>+</div><div class='add'>+	By default, only init_net namespace can log packets into kernel log</div><div class='add'>+	with LOG target; this aims to prevent containers from flooding host</div><div class='add'>+	kernel log. If enabled, this target also works in other network</div><div class='add'>+	namespaces. This variable is only accessible from init_net.</div><div class='head'>diff --git a/Documentation/networking/nf_conntrack-sysctl.txt b/Documentation/networking/nf_conntrack-sysctl.txt<br/>index 433b6724797a..497d668288f9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/nf_conntrack-sysctl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/nf_conntrack-sysctl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/nf_conntrack-sysctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/nf_conntrack-sysctl.txt</a></div><div class='hunk'>@@ -96,6 +96,17 @@ nf_conntrack_max - INTEGER</div><div class='ctx'> 	Size of connection tracking table.  Default value is</div><div class='ctx'> 	nf_conntrack_buckets value * 4.</div><div class='ctx'> </div><div class='add'>+nf_conntrack_default_on - BOOLEAN</div><div class='add'>+	0 - don't register conntrack in new net namespaces</div><div class='add'>+	1 - register conntrack in new net namespaces (default)</div><div class='add'>+</div><div class='add'>+	This controls wheter newly created network namespaces have connection</div><div class='add'>+	tracking enabled by default.  It will be enabled automatically</div><div class='add'>+	regardless of this setting if the new net namespace requires</div><div class='add'>+	connection tracking, e.g. when NAT rules are created.</div><div class='add'>+	This setting is only visible in initial user namespace, it has no</div><div class='add'>+	effect on existing namespaces.</div><div class='add'>+</div><div class='ctx'> nf_conntrack_tcp_be_liberal - BOOLEAN</div><div class='ctx'> 	0 - disabled (default)</div><div class='ctx'> 	not 0 - enabled</div><div class='head'>diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt<br/>index daa015af16a0..f3b9e507ab05 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/packet_mmap.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/packet_mmap.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/packet_mmap.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/packet_mmap.txt</a></div><div class='hunk'>@@ -565,7 +565,7 @@ TPACKET_V1 --&gt; TPACKET_V2:</div><div class='ctx'> 		   (void *)hdr + TPACKET_ALIGN(sizeof(struct tpacket_hdr))</div><div class='ctx'> </div><div class='ctx'> TPACKET_V2 --&gt; TPACKET_V3:</div><div class='del'>-	- Flexible buffer implementation:</div><div class='add'>+	- Flexible buffer implementation for RX_RING:</div><div class='ctx'> 		1. Blocks can be configured with non-static frame-size</div><div class='ctx'> 		2. Read/poll is at a block-level (as opposed to packet-level)</div><div class='ctx'> 		3. Added poll timeout to avoid indefinite user-space wait</div><div class='hunk'>@@ -574,7 +574,12 @@ TPACKET_V2 --&gt; TPACKET_V3:</div><div class='ctx'> 			4.1 block::timeout</div><div class='ctx'> 			4.2 tpkt_hdr::sk_rxhash</div><div class='ctx'> 	- RX Hash data available in user space</div><div class='del'>-	- Currently only RX_RING available</div><div class='add'>+	- TX_RING semantics are conceptually similar to TPACKET_V2;</div><div class='add'>+	  use tpacket3_hdr instead of tpacket2_hdr, and TPACKET3_HDRLEN</div><div class='add'>+	  instead of TPACKET2_HDRLEN. In the current implementation,</div><div class='add'>+	  the tp_next_offset field in the tpacket3_hdr MUST be set to</div><div class='add'>+	  zero, indicating that the ring does not hold variable sized frames.</div><div class='add'>+	  Packets with non-zero values of tp_next_offset will be dropped.</div><div class='ctx'> </div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> + AF_PACKET fanout mode</div><div class='head'>diff --git a/Documentation/networking/phy.txt b/Documentation/networking/phy.txt<br/>index 7ab9404a8412..16f90d817224 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/phy.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/phy.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/phy.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/phy.txt</a></div><div class='hunk'>@@ -65,6 +65,83 @@ The MDIO bus</div><div class='ctx'>  drivers/net/ethernet/freescale/fsl_pq_mdio.c and an associated DTS file</div><div class='ctx'>  for one of the users. (e.g. "git grep fsl,.*-mdio arch/powerpc/boot/dts/")</div><div class='ctx'> </div><div class='add'>+(RG)MII/electrical interface considerations</div><div class='add'>+</div><div class='add'>+ The Reduced Gigabit Medium Independent Interface (RGMII) is a 12-pin</div><div class='add'>+ electrical signal interface using a synchronous 125Mhz clock signal and several</div><div class='add'>+ data lines. Due to this design decision, a 1.5ns to 2ns delay must be added</div><div class='add'>+ between the clock line (RXC or TXC) and the data lines to let the PHY (clock</div><div class='add'>+ sink) have enough setup and hold times to sample the data lines correctly. The</div><div class='add'>+ PHY library offers different types of PHY_INTERFACE_MODE_RGMII* values to let</div><div class='add'>+ the PHY driver and optionally the MAC driver, implement the required delay. The</div><div class='add'>+ values of phy_interface_t must be understood from the perspective of the PHY</div><div class='add'>+ device itself, leading to the following:</div><div class='add'>+</div><div class='add'>+ * PHY_INTERFACE_MODE_RGMII: the PHY is not responsible for inserting any</div><div class='add'>+   internal delay by itself, it assumes that either the Ethernet MAC (if capable</div><div class='add'>+   or the PCB traces) insert the correct 1.5-2ns delay</div><div class='add'>+</div><div class='add'>+ * PHY_INTERFACE_MODE_RGMII_TXID: the PHY should insert an internal delay</div><div class='add'>+   for the transmit data lines (TXD[3:0]) processed by the PHY device</div><div class='add'>+</div><div class='add'>+ * PHY_INTERFACE_MODE_RGMII_RXID: the PHY should insert an internal delay</div><div class='add'>+   for the receive data lines (RXD[3:0]) processed by the PHY device</div><div class='add'>+</div><div class='add'>+ * PHY_INTERFACE_MODE_RGMII_ID: the PHY should insert internal delays for</div><div class='add'>+   both transmit AND receive data lines from/to the PHY device</div><div class='add'>+</div><div class='add'>+ Whenever possible, use the PHY side RGMII delay for these reasons:</div><div class='add'>+</div><div class='add'>+ * PHY devices may offer sub-nanosecond granularity in how they allow a</div><div class='add'>+   receiver/transmitter side delay (e.g: 0.5, 1.0, 1.5ns) to be specified. Such</div><div class='add'>+   precision may be required to account for differences in PCB trace lengths</div><div class='add'>+</div><div class='add'>+ * PHY devices are typically qualified for a large range of applications</div><div class='add'>+   (industrial, medical, automotive...), and they provide a constant and</div><div class='add'>+   reliable delay across temperature/pressure/voltage ranges</div><div class='add'>+</div><div class='add'>+ * PHY device drivers in PHYLIB being reusable by nature, being able to</div><div class='add'>+   configure correctly a specified delay enables more designs with similar delay</div><div class='add'>+   requirements to be operate correctly</div><div class='add'>+</div><div class='add'>+ For cases where the PHY is not capable of providing this delay, but the</div><div class='add'>+ Ethernet MAC driver is capable of doing so, the correct phy_interface_t value</div><div class='add'>+ should be PHY_INTERFACE_MODE_RGMII, and the Ethernet MAC driver should be</div><div class='add'>+ configured correctly in order to provide the required transmit and/or receive</div><div class='add'>+ side delay from the perspective of the PHY device. Conversely, if the Ethernet</div><div class='add'>+ MAC driver looks at the phy_interface_t value, for any other mode but</div><div class='add'>+ PHY_INTERFACE_MODE_RGMII, it should make sure that the MAC-level delays are</div><div class='add'>+ disabled.</div><div class='add'>+</div><div class='add'>+ In case neither the Ethernet MAC, nor the PHY are capable of providing the</div><div class='add'>+ required delays, as defined per the RGMII standard, several options may be</div><div class='add'>+ available:</div><div class='add'>+</div><div class='add'>+ * Some SoCs may offer a pin pad/mux/controller capable of configuring a given</div><div class='add'>+   set of pins'strength, delays, and voltage; and it may be a suitable</div><div class='add'>+   option to insert the expected 2ns RGMII delay.</div><div class='add'>+</div><div class='add'>+ * Modifying the PCB design to include a fixed delay (e.g: using a specifically</div><div class='add'>+   designed serpentine), which may not require software configuration at all.</div><div class='add'>+</div><div class='add'>+Common problems with RGMII delay mismatch</div><div class='add'>+</div><div class='add'>+ When there is a RGMII delay mismatch between the Ethernet MAC and the PHY, this</div><div class='add'>+ will most likely result in the clock and data line signals to be unstable when</div><div class='add'>+ the PHY or MAC take a snapshot of these signals to translate them into logical</div><div class='add'>+ 1 or 0 states and reconstruct the data being transmitted/received. Typical</div><div class='add'>+ symptoms include:</div><div class='add'>+</div><div class='add'>+ * Transmission/reception partially works, and there is frequent or occasional</div><div class='add'>+   packet loss observed</div><div class='add'>+</div><div class='add'>+ * Ethernet MAC may report some or all packets ingressing with a FCS/CRC error,</div><div class='add'>+   or just discard them all</div><div class='add'>+</div><div class='add'>+ * Switching to lower speeds such as 10/100Mbits/sec makes the problem go away</div><div class='add'>+   (since there is enough setup/hold time in that case)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Connecting to a PHY</div><div class='ctx'> </div><div class='ctx'>  Sometime during startup, the network driver needs to establish a connection</div><div class='hunk'>@@ -127,8 +204,9 @@ Letting the PHY Abstraction Layer do Everything</div><div class='ctx'>  values pruned from them which don't make sense for your controller (a 10/100</div><div class='ctx'>  controller may be connected to a gigabit capable PHY, so you would need to</div><div class='ctx'>  mask off SUPPORTED_1000baseT*).  See include/linux/ethtool.h for definitions</div><div class='del'>- for these bitfields. Note that you should not SET any bits, or the PHY may</div><div class='del'>- get put into an unsupported state.</div><div class='add'>+ for these bitfields. Note that you should not SET any bits, except the</div><div class='add'>+ SUPPORTED_Pause and SUPPORTED_AsymPause bits (see below), or the PHY may get</div><div class='add'>+ put into an unsupported state.</div><div class='ctx'> </div><div class='ctx'>  Lastly, once the controller is ready to handle network traffic, you call</div><div class='ctx'>  phy_start(phydev).  This tells the PAL that you are ready, and configures the</div><div class='hunk'>@@ -139,6 +217,19 @@ Letting the PHY Abstraction Layer do Everything</div><div class='ctx'>  When you want to disconnect from the network (even if just briefly), you call</div><div class='ctx'>  phy_stop(phydev).</div><div class='ctx'> </div><div class='add'>+Pause frames / flow control</div><div class='add'>+</div><div class='add'>+ The PHY does not participate directly in flow control/pause frames except by</div><div class='add'>+ making sure that the SUPPORTED_Pause and SUPPORTED_AsymPause bits are set in</div><div class='add'>+ MII_ADVERTISE to indicate towards the link partner that the Ethernet MAC</div><div class='add'>+ controller supports such a thing. Since flow control/pause frames generation</div><div class='add'>+ involves the Ethernet MAC driver, it is recommended that this driver takes care</div><div class='add'>+ of properly indicating advertisement and support for such features by setting</div><div class='add'>+ the SUPPORTED_Pause and SUPPORTED_AsymPause bits accordingly. This can be done</div><div class='add'>+ either before or after phy_connect() and/or as a result of implementing the</div><div class='add'>+ ethtool::set_pauseparam feature.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Keeping Close Tabs on the PAL</div><div class='ctx'> </div><div class='ctx'>  It is possible that the PAL's built-in state machine needs a little help to</div><div class='hunk'>@@ -251,39 +342,8 @@ Writing a PHY driver</div><div class='ctx'>  PHY_BASIC_FEATURES, but you can look in include/mii.h for other</div><div class='ctx'>  features.</div><div class='ctx'> </div><div class='del'>- Each driver consists of a number of function pointers:</div><div class='del'>-</div><div class='del'>-   soft_reset: perform a PHY software reset</div><div class='del'>-   config_init: configures PHY into a sane state after a reset.</div><div class='del'>-     For instance, a Davicom PHY requires descrambling disabled.</div><div class='del'>-   probe: Allocate phy-&gt;priv, optionally refuse to bind.</div><div class='del'>-   PHY may not have been reset or had fixups run yet.</div><div class='del'>-   suspend/resume: power management</div><div class='del'>-   config_aneg: Changes the speed/duplex/negotiation settings</div><div class='del'>-   aneg_done: Determines the auto-negotiation result</div><div class='del'>-   read_status: Reads the current speed/duplex/negotiation settings</div><div class='del'>-   ack_interrupt: Clear a pending interrupt</div><div class='del'>-   did_interrupt: Checks if the PHY generated an interrupt</div><div class='del'>-   config_intr: Enable or disable interrupts</div><div class='del'>-   remove: Does any driver take-down</div><div class='del'>-   ts_info: Queries about the HW timestamping status</div><div class='del'>-   match_phy_device: used for Clause 45 capable PHYs to match devices</div><div class='del'>-   in package and ensure they are compatible</div><div class='del'>-   hwtstamp: Set the PHY HW timestamping configuration</div><div class='del'>-   rxtstamp: Requests a receive timestamp at the PHY level for a 'skb'</div><div class='del'>-   txtsamp: Requests a transmit timestamp at the PHY level for a 'skb'</div><div class='del'>-   set_wol: Enable Wake-on-LAN at the PHY level</div><div class='del'>-   get_wol: Get the Wake-on-LAN status at the PHY level</div><div class='del'>-   link_change_notify: called to inform the core is about to change the</div><div class='del'>-   link state, can be used to work around bogus PHY between state changes</div><div class='del'>-   read_mmd_indirect: Read PHY MMD indirect register</div><div class='del'>-   write_mmd_indirect: Write PHY MMD indirect register</div><div class='del'>-   module_info: Get the size and type of an EEPROM contained in an plug-in</div><div class='del'>-   module</div><div class='del'>-   module_eeprom: Get EEPROM information of a plug-in module</div><div class='del'>-   get_sset_count: Get number of strings sets that get_strings will count</div><div class='del'>-   get_strings: Get strings from requested objects (statistics)</div><div class='del'>-   get_stats: Get the extended statistics from the PHY device</div><div class='add'>+ Each driver consists of a number of function pointers, documented</div><div class='add'>+ in include/linux/phy.h under the phy_driver structure.</div><div class='ctx'> </div><div class='ctx'>  Of these, only config_aneg and read_status are required to be</div><div class='ctx'>  assigned by the driver code.  The rest are optional.  Also, it is</div><div class='hunk'>@@ -347,3 +407,22 @@ Board Fixups</div><div class='ctx'>  The stubs set one of the two matching criteria, and set the other one to</div><div class='ctx'>  match anything.</div><div class='ctx'> </div><div class='add'>+ When phy_register_fixup() or *_for_uid()/*_for_id() is called at module,</div><div class='add'>+ unregister fixup and free allocate memory are required.</div><div class='add'>+</div><div class='add'>+ Call one of following function before unloading module.</div><div class='add'>+</div><div class='add'>+ int phy_unregister_fixup(const char *phy_id, u32 phy_uid, u32 phy_uid_mask);</div><div class='add'>+ int phy_unregister_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask);</div><div class='add'>+ int phy_register_fixup_for_id(const char *phy_id);</div><div class='add'>+</div><div class='add'>+Standards</div><div class='add'>+</div><div class='add'>+ IEEE Standard 802.3: CSMA/CD Access Method and Physical Layer Specifications, Section Two:</div><div class='add'>+ http://standards.ieee.org/getieee802/download/802.3-2008_section2.pdf</div><div class='add'>+</div><div class='add'>+ RGMII v1.3:</div><div class='add'>+ http://web.archive.org/web/20160303212629/http://www.hp.com/rnd/pdfs/RGMIIv1_3.pdf</div><div class='add'>+</div><div class='add'>+ RGMII v2.0:</div><div class='add'>+ http://web.archive.org/web/20160303171328/http://www.hp.com/rnd/pdfs/RGMIIv2_0_final_hp.pdf</div><div class='head'>diff --git a/Documentation/networking/regulatory.txt b/Documentation/networking/regulatory.txt<br/>index 356f791af574..7818b5fe448b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/regulatory.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/regulatory.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/regulatory.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/regulatory.txt</a></div><div class='hunk'>@@ -156,12 +156,12 @@ struct ieee80211_regdomain mydriver_jp_regdom = {</div><div class='ctx'> 	//.alpha2 =  "99", /* If I have no alpha2 to map it to */</div><div class='ctx'> 	.reg_rules = {</div><div class='ctx'> 		/* IEEE 802.11b/g, channels 1..14 */</div><div class='del'>-		REG_RULE(2412-20, 2484+20, 40, 6, 20, 0),</div><div class='add'>+		REG_RULE(2412-10, 2484+10, 40, 6, 20, 0),</div><div class='ctx'> 		/* IEEE 802.11a, channels 34..48 */</div><div class='del'>-		REG_RULE(5170-20, 5240+20, 40, 6, 20,</div><div class='add'>+		REG_RULE(5170-10, 5240+10, 40, 6, 20,</div><div class='ctx'> 			NL80211_RRF_NO_IR),</div><div class='ctx'> 		/* IEEE 802.11a, channels 52..64 */</div><div class='del'>-		REG_RULE(5260-20, 5320+20, 40, 6, 20,</div><div class='add'>+		REG_RULE(5260-10, 5320+10, 40, 6, 20,</div><div class='ctx'> 			NL80211_RRF_NO_IR|</div><div class='ctx'> 			NL80211_RRF_DFS),</div><div class='ctx'> 	}</div><div class='hunk'>@@ -205,7 +205,7 @@ the data in regdb.c as an alternative to using CRDA.</div><div class='ctx'> The file net/wireless/db.txt should be kept up-to-date with the db.txt</div><div class='ctx'> file available in the git repository here:</div><div class='ctx'> </div><div class='del'>-    git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git</div><div class='add'>+    git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git</div><div class='ctx'> </div><div class='ctx'> Again, most users in most situations should be using the CRDA package</div><div class='ctx'> provided with their distribution, and in most other situations users</div><div class='head'>diff --git a/Documentation/networking/seg6-sysctl.txt b/Documentation/networking/seg6-sysctl.txt<br/>new file mode 100644<br/>index 000000000000..bdbde23b19cb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/seg6-sysctl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/seg6-sysctl.txt</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/proc/sys/net/conf/&lt;iface&gt;/seg6_* variables:</div><div class='add'>+</div><div class='add'>+seg6_enabled - BOOL</div><div class='add'>+	Accept or drop SR-enabled IPv6 packets on this interface.</div><div class='add'>+</div><div class='add'>+	Relevant packets are those with SRH present and DA = local.</div><div class='add'>+</div><div class='add'>+	0 - disabled (default)</div><div class='add'>+	not 0 - enabled</div><div class='add'>+</div><div class='add'>+seg6_require_hmac - INTEGER</div><div class='add'>+	Define HMAC policy for ingress SR-enabled packets on this interface.</div><div class='add'>+</div><div class='add'>+	-1 - Ignore HMAC field</div><div class='add'>+	0 - Accept SR packets without HMAC, validate SR packets with HMAC</div><div class='add'>+	1 - Drop SR packets without HMAC, validate SR packets with HMAC</div><div class='add'>+</div><div class='add'>+	Default is 0.</div><div class='head'>diff --git a/Documentation/networking/stmmac.txt b/Documentation/networking/stmmac.txt<br/>index e226f8925c9e..2bb07078f535 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/stmmac.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/stmmac.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/stmmac.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/stmmac.txt</a></div><div class='hunk'>@@ -28,8 +28,6 @@ CONFIG_STMMAC_PCI: is to enable the pci driver.</div><div class='ctx'> 2) Driver parameters list:</div><div class='ctx'> 	debug: message level (0: no output, 16: all);</div><div class='ctx'> 	phyaddr: to manually provide the physical address to the PHY device;</div><div class='del'>-	dma_rxsize: DMA rx ring size;</div><div class='del'>-	dma_txsize: DMA tx ring size;</div><div class='ctx'> 	buf_sz: DMA buffer size;</div><div class='ctx'> 	tc: control the HW FIFO threshold;</div><div class='ctx'> 	watchdog: transmit timeout (in milliseconds);</div><div class='hunk'>@@ -40,31 +38,31 @@ CONFIG_STMMAC_PCI: is to enable the pci driver.</div><div class='ctx'> </div><div class='ctx'> 3) Command line options</div><div class='ctx'> Driver parameters can be also passed in command line by using:</div><div class='del'>-	stmmaceth=dma_rxsize:128,dma_txsize:512</div><div class='add'>+	stmmaceth=watchdog:100,chain_mode=1</div><div class='ctx'> </div><div class='ctx'> 4) Driver information and notes</div><div class='ctx'> </div><div class='ctx'> 4.1) Transmit process</div><div class='ctx'> The xmit method is invoked when the kernel needs to transmit a packet; it sets</div><div class='del'>-the descriptors in the ring and informs the DMA engine that there is a packet</div><div class='add'>+the descriptors in the ring and informs the DMA engine, that there is a packet</div><div class='ctx'> ready to be transmitted.</div><div class='ctx'> By default, the driver sets the NETIF_F_SG bit in the features field of the</div><div class='del'>-net_device structure enabling the scatter-gather feature. This is true on</div><div class='add'>+net_device structure, enabling the scatter-gather feature. This is true on</div><div class='ctx'> chips and configurations where the checksum can be done in hardware.</div><div class='del'>-Once the controller has finished transmitting the packet, napi will be</div><div class='add'>+Once the controller has finished transmitting the packet, timer will be</div><div class='ctx'> scheduled to release the transmit resources.</div><div class='ctx'> </div><div class='ctx'> 4.2) Receive process</div><div class='ctx'> When one or more packets are received, an interrupt happens. The interrupts</div><div class='del'>-are not queued so the driver has to scan all the descriptors in the ring during</div><div class='add'>+are not queued, so the driver has to scan all the descriptors in the ring during</div><div class='ctx'> the receive process.</div><div class='del'>-This is based on NAPI so the interrupt handler signals only if there is work</div><div class='add'>+This is based on NAPI, so the interrupt handler signals only if there is work</div><div class='ctx'> to be done, and it exits.</div><div class='ctx'> Then the poll method will be scheduled at some future point.</div><div class='ctx'> The incoming packets are stored, by the DMA, in a list of pre-allocated socket</div><div class='ctx'> buffers in order to avoid the memcpy (zero-copy).</div><div class='ctx'> </div><div class='del'>-4.3) Interrupt Mitigation</div><div class='add'>+4.3) Interrupt mitigation</div><div class='ctx'> The driver is able to mitigate the number of its DMA interrupts</div><div class='ctx'> using NAPI for the reception on chips older than the 3.50.</div><div class='ctx'> New chips have an HW RX-Watchdog used for this mitigation.</div><div class='hunk'>@@ -88,19 +86,20 @@ the list, hence creating the explicit chaining in the descriptor itself,</div><div class='ctx'> whereas such explicit chaining is not possible in RING mode.</div><div class='ctx'> </div><div class='ctx'> 4.5.1) Extended descriptors</div><div class='del'>-	The extended descriptors give us information about the Ethernet payload</div><div class='del'>-	when it is carrying PTP packets or TCP/UDP/ICMP over IP.</div><div class='del'>-	These are not available on GMAC Synopsys chips older than the 3.50.</div><div class='del'>-	At probe time the driver will decide if these can be actually used.</div><div class='del'>-	This support also is mandatory for PTPv2 because the extra descriptors</div><div class='del'>-	are used for saving the hardware timestamps and Extended Status.</div><div class='add'>+The extended descriptors give us information about the Ethernet payload</div><div class='add'>+when it is carrying PTP packets or TCP/UDP/ICMP over IP.</div><div class='add'>+These are not available on GMAC Synopsys chips older than the 3.50.</div><div class='add'>+At probe time the driver will decide if these can be actually used.</div><div class='add'>+This support also is mandatory for PTPv2 because the extra descriptors</div><div class='add'>+are used for saving the hardware timestamps and Extended Status.</div><div class='ctx'> </div><div class='ctx'> 4.6) Ethtool support</div><div class='ctx'> Ethtool is supported.</div><div class='ctx'> </div><div class='ctx'> For example, driver statistics (including RMON), internal errors can be taken</div><div class='ctx'> using:</div><div class='del'>-  # ethtool -S ethX command</div><div class='add'>+  # ethtool -S ethX</div><div class='add'>+command</div><div class='ctx'> </div><div class='ctx'> 4.7) Jumbo and Segmentation Offloading</div><div class='ctx'> Jumbo frames are supported and tested for the GMAC.</div><div class='hunk'>@@ -153,8 +152,10 @@ Where:</div><div class='ctx'>  o dma_cfg: internal DMA parameters</div><div class='ctx'>    o pbl: the Programmable Burst Length is maximum number of beats to</div><div class='ctx'>        be transferred in one DMA transaction.</div><div class='del'>-       GMAC also enables the 4xPBL by default.</div><div class='del'>-   o fixed_burst/mixed_burst/burst_len</div><div class='add'>+       GMAC also enables the 4xPBL by default. (8xPBL for GMAC 3.50 and newer)</div><div class='add'>+   o txpbl/rxpbl: GMAC and newer supports independent DMA pbl for tx/rx.</div><div class='add'>+   o pblx8: Enable 8xPBL (4xPBL for core rev &lt; 3.50). Enabled by default.</div><div class='add'>+   o fixed_burst/mixed_burst/aal</div><div class='ctx'>  o clk_csr: fixed CSR Clock range selection.</div><div class='ctx'>  o has_gmac: uses the GMAC core.</div><div class='ctx'>  o enh_desc: if sets the MAC will use the enhanced descriptor structure.</div><div class='hunk'>@@ -206,16 +207,24 @@ tuned according to the HW capabilities.</div><div class='ctx'> </div><div class='ctx'> struct stmmac_dma_cfg {</div><div class='ctx'> 	int pbl;</div><div class='add'>+	int txpbl;</div><div class='add'>+	int rxpbl;</div><div class='add'>+	bool pblx8;</div><div class='ctx'> 	int fixed_burst;</div><div class='del'>-	int burst_len_supported;</div><div class='add'>+	int mixed_burst;</div><div class='add'>+	bool aal;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> Where:</div><div class='del'>- o pbl: Programmable Burst Length</div><div class='add'>+ o pbl: Programmable Burst Length (tx and rx)</div><div class='add'>+ o txpbl: Transmit Programmable Burst Length. Only for GMAC and newer.</div><div class='add'>+	 If set, DMA tx will use this value rather than pbl.</div><div class='add'>+ o rxpbl: Receive Programmable Burst Length. Only for GMAC and newer.</div><div class='add'>+	 If set, DMA rx will use this value rather than pbl.</div><div class='add'>+ o pblx8: Enable 8xPBL (4xPBL for core rev &lt; 3.50). Enabled by default.</div><div class='ctx'>  o fixed_burst: program the DMA to use the fixed burst mode</div><div class='del'>- o burst_len: this is the value we put in the register</div><div class='del'>-	      supported values are provided as macros in</div><div class='del'>-	      linux/stmmac.h header file.</div><div class='add'>+ o mixed_burst: program the DMA to use the mixed burst mode</div><div class='add'>+ o aal: Address-Aligned Beats</div><div class='ctx'> </div><div class='ctx'> ---</div><div class='ctx'> </div><div class='hunk'>@@ -275,11 +284,11 @@ Please see the following document:</div><div class='ctx'> 	Documentation/devicetree/bindings/net/stmmac.txt</div><div class='ctx'> </div><div class='ctx'> 4.11) This is a summary of the content of some relevant files:</div><div class='del'>- o stmmac_main.c: to implement the main network device driver;</div><div class='del'>- o stmmac_mdio.c: to provide mdio functions;</div><div class='del'>- o stmmac_pci: this the PCI driver;</div><div class='del'>- o stmmac_platform.c: this the platform driver (OF supported)</div><div class='del'>- o stmmac_ethtool.c: to implement the ethtool support;</div><div class='add'>+ o stmmac_main.c: implements the main network device driver;</div><div class='add'>+ o stmmac_mdio.c: provides MDIO functions;</div><div class='add'>+ o stmmac_pci: this is the PCI driver;</div><div class='add'>+ o stmmac_platform.c: this the platform driver (OF supported);</div><div class='add'>+ o stmmac_ethtool.c: implements the ethtool support;</div><div class='ctx'>  o stmmac.h: private driver structure;</div><div class='ctx'>  o common.h: common definitions and VFTs;</div><div class='ctx'>  o mmc_core.c/mmc.h: Management MAC Counters;</div><div class='hunk'>@@ -381,12 +390,12 @@ In addition to the basic timestamp features mentioned in IEEE 1588-2002</div><div class='ctx'> Timestamps, new GMAC cores support the advanced timestamp features.</div><div class='ctx'> IEEE 1588-2008 that can be enabled when configure the Kernel.</div><div class='ctx'> </div><div class='del'>-8) SGMII/RGMII supports</div><div class='add'>+8) SGMII/RGMII support</div><div class='ctx'> New GMAC devices provide own way to manage RGMII/SGMII.</div><div class='ctx'> This information is available at run-time by looking at the</div><div class='ctx'> HW capability register. This means that the stmmac can manage</div><div class='del'>-auto-negotiation and link status w/o using the PHYLIB stuff</div><div class='add'>+auto-negotiation and link status w/o using the PHYLIB stuff.</div><div class='ctx'> In fact, the HW provides a subset of extended registers to</div><div class='ctx'> restart the ANE, verify Full/Half duplex mode and Speed.</div><div class='del'>-Also thanks to these registers it is possible to look at the</div><div class='add'>+Thanks to these registers, it is possible to look at the</div><div class='ctx'> Auto-negotiated Link Parter Ability.</div><div class='head'>diff --git a/Documentation/networking/timestamping.txt b/Documentation/networking/timestamping.txt<br/>index 671cccf0dcd2..96f50694a748 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/timestamping.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/timestamping.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/timestamping.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/timestamping.txt</a></div><div class='hunk'>@@ -182,6 +182,16 @@ SOF_TIMESTAMPING_OPT_TSONLY:</div><div class='ctx'>   the timestamp even if sysctl net.core.tstamp_allow_data is 0.</div><div class='ctx'>   This option disables SOF_TIMESTAMPING_OPT_CMSG.</div><div class='ctx'> </div><div class='add'>+SOF_TIMESTAMPING_OPT_STATS:</div><div class='add'>+</div><div class='add'>+  Optional stats that are obtained along with the transmit timestamps.</div><div class='add'>+  It must be used together with SOF_TIMESTAMPING_OPT_TSONLY. When the</div><div class='add'>+  transmit timestamp is available, the stats are available in a</div><div class='add'>+  separate control message of type SCM_TIMESTAMPING_OPT_STATS, as a</div><div class='add'>+  list of TLVs (struct nlattr) of types. These stats allow the</div><div class='add'>+  application to associate various transport layer stats with</div><div class='add'>+  the transmit timestamps, such as how long a certain block of</div><div class='add'>+  data was limited by peer's receiver window.</div><div class='ctx'> </div><div class='ctx'> New applications are encouraged to pass SOF_TIMESTAMPING_OPT_ID to</div><div class='ctx'> disambiguate timestamps and SOF_TIMESTAMPING_OPT_TSONLY to operate</div><div class='head'>diff --git a/Documentation/networking/vortex.txt b/Documentation/networking/vortex.txt<br/>index 97282da82b75..ad3dead052a4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/vortex.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/vortex.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/vortex.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/vortex.txt</a></div><div class='hunk'>@@ -364,7 +364,7 @@ steps you should take:</div><div class='ctx'> </div><div class='ctx'> - The contents of your report will vary a lot depending upon the</div><div class='ctx'>   problem.  If it's a kernel crash then you should refer to the</div><div class='del'>-  REPORTING-BUGS file.</div><div class='add'>+  admin-guide/reporting-bugs.rst file.</div><div class='ctx'> </div><div class='ctx'>   But for most problems it is useful to provide the following:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/networking/vrf.txt b/Documentation/networking/vrf.txt<br/>index 755dab856392..3918dae964d4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/networking/vrf.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/networking/vrf.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/networking/vrf.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/networking/vrf.txt</a></div><div class='hunk'>@@ -98,10 +98,11 @@ VRF device:</div><div class='ctx'> </div><div class='ctx'> or to specify the output device using cmsg and IP_PKTINFO.</div><div class='ctx'> </div><div class='del'>-TCP services running in the default VRF context (ie., not bound to any VRF</div><div class='del'>-device) can work across all VRF domains by enabling the tcp_l3mdev_accept</div><div class='del'>-sysctl option:</div><div class='add'>+TCP &amp; UDP services running in the default VRF context (ie., not bound</div><div class='add'>+to any VRF device) can work across all VRF domains by enabling the</div><div class='add'>+tcp_l3mdev_accept and udp_l3mdev_accept sysctl options:</div><div class='ctx'>     sysctl -w net.ipv4.tcp_l3mdev_accept=1</div><div class='add'>+    sysctl -w net.ipv4.udp_l3mdev_accept=1</div><div class='ctx'> </div><div class='ctx'> netfilter rules on the VRF device can be used to limit access to services</div><div class='ctx'> running in the default VRF context as well.</div><div class='head'>diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt<br/>deleted file mode 100644<br/>index f3ac05cc23e4..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/oops-tracing.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/oops-tracing.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,279 +0,0 @@</div><div class='del'>-NOTE: ksymoops is useless on 2.6.  Please use the Oops in its original format</div><div class='del'>-(from dmesg, etc).  Ignore any references in this or other docs to "decoding</div><div class='del'>-the Oops" or "running it through ksymoops".  If you post an Oops from 2.6 that</div><div class='del'>-has been run through ksymoops, people will just tell you to repost it.</div><div class='del'>-</div><div class='del'>-Quick Summary</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-Find the Oops and send it to the maintainer of the kernel area that seems to be</div><div class='del'>-involved with the problem.  Don't worry too much about getting the wrong person.</div><div class='del'>-If you are unsure send it to the person responsible for the code relevant to</div><div class='del'>-what you were doing.  If it occurs repeatably try and describe how to recreate</div><div class='del'>-it.  That's worth even more than the oops.</div><div class='del'>-</div><div class='del'>-If you are totally stumped as to whom to send the report, send it to </div><div class='del'>-linux-kernel@vger.kernel.org. Thanks for your help in making Linux as</div><div class='del'>-stable as humanly possible.</div><div class='del'>-</div><div class='del'>-Where is the Oops?</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-Normally the Oops text is read from the kernel buffers by klogd and</div><div class='del'>-handed to syslogd which writes it to a syslog file, typically</div><div class='del'>-/var/log/messages (depends on /etc/syslog.conf).  Sometimes klogd dies,</div><div class='del'>-in which case you can run dmesg &gt; file to read the data from the kernel</div><div class='del'>-buffers and save it.  Or you can cat /proc/kmsg &gt; file, however you</div><div class='del'>-have to break in to stop the transfer, kmsg is a "never ending file".</div><div class='del'>-If the machine has crashed so badly that you cannot enter commands or</div><div class='del'>-the disk is not available then you have three options :-</div><div class='del'>-</div><div class='del'>-(1) Hand copy the text from the screen and type it in after the machine</div><div class='del'>-    has restarted.  Messy but it is the only option if you have not</div><div class='del'>-    planned for a crash. Alternatively, you can take a picture of</div><div class='del'>-    the screen with a digital camera - not nice, but better than</div><div class='del'>-    nothing.  If the messages scroll off the top of the console, you</div><div class='del'>-    may find that booting with a higher resolution (eg, vga=791)</div><div class='del'>-    will allow you to read more of the text. (Caveat: This needs vesafb,</div><div class='del'>-    so won't help for 'early' oopses)</div><div class='del'>-</div><div class='del'>-(2) Boot with a serial console (see Documentation/serial-console.txt),</div><div class='del'>-    run a null modem to a second machine and capture the output there</div><div class='del'>-    using your favourite communication program.  Minicom works well.</div><div class='del'>-</div><div class='del'>-(3) Use Kdump (see Documentation/kdump/kdump.txt),</div><div class='del'>-    extract the kernel ring buffer from old memory with using dmesg</div><div class='del'>-    gdbmacro in Documentation/kdump/gdbmacros.txt.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Full Information</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-NOTE: the message from Linus below applies to 2.4 kernel.  I have preserved it</div><div class='del'>-for historical reasons, and because some of the information in it still</div><div class='del'>-applies.  Especially, please ignore any references to ksymoops. </div><div class='del'>-</div><div class='del'>-From: Linus Torvalds &lt;torvalds@osdl.org&gt;</div><div class='del'>-</div><div class='del'>-How to track down an Oops.. [originally a mail to linux-kernel]</div><div class='del'>-</div><div class='del'>-The main trick is having 5 years of experience with those pesky oops </div><div class='del'>-messages ;-)</div><div class='del'>-</div><div class='del'>-Actually, there are things you can do that make this easier. I have two </div><div class='del'>-separate approaches:</div><div class='del'>-</div><div class='del'>-	gdb /usr/src/linux/vmlinux</div><div class='del'>-	gdb&gt; disassemble &lt;offending_function&gt;</div><div class='del'>-</div><div class='del'>-That's the easy way to find the problem, at least if the bug-report is </div><div class='del'>-well made (like this one was - run through ksymoops to get the </div><div class='del'>-information of which function and the offset in the function that it </div><div class='del'>-happened in).</div><div class='del'>-</div><div class='del'>-Oh, it helps if the report happens on a kernel that is compiled with the </div><div class='del'>-same compiler and similar setups.</div><div class='del'>-</div><div class='del'>-The other thing to do is disassemble the "Code:" part of the bug report: </div><div class='del'>-ksymoops will do this too with the correct tools, but if you don't have</div><div class='del'>-the tools you can just do a silly program:</div><div class='del'>-</div><div class='del'>-	char str[] = "\xXX\xXX\xXX...";</div><div class='del'>-	main(){}</div><div class='del'>-</div><div class='del'>-and compile it with gcc -g and then do "disassemble str" (where the "XX" </div><div class='del'>-stuff are the values reported by the Oops - you can just cut-and-paste </div><div class='del'>-and do a replace of spaces to "\x" - that's what I do, as I'm too lazy </div><div class='del'>-to write a program to automate this all).</div><div class='del'>-</div><div class='del'>-Alternatively, you can use the shell script in scripts/decodecode.</div><div class='del'>-Its usage is:  decodecode &lt; oops.txt</div><div class='del'>-</div><div class='del'>-The hex bytes that follow "Code:" may (in some architectures) have a series</div><div class='del'>-of bytes that precede the current instruction pointer as well as bytes at and</div><div class='del'>-following the current instruction pointer.  In some cases, one instruction</div><div class='del'>-byte or word is surrounded by &lt;&gt; or (), as in "&lt;86&gt;" or "(f00d)".  These</div><div class='del'>-&lt;&gt; or () markings indicate the current instruction pointer.  Example from</div><div class='del'>-i386, split into multiple lines for readability:</div><div class='del'>-</div><div class='del'>-Code: f9 0f 8d f9 00 00 00 8d 42 0c e8 dd 26 11 c7 a1 60 ea 2b f9 8b 50 08 a1</div><div class='del'>-64 ea 2b f9 8d 34 82 8b 1e 85 db 74 6d 8b 15 60 ea 2b f9 &lt;8b&gt; 43 04 39 42 54</div><div class='del'>-7e 04 40 89 42 54 8b 43 04 3b 05 00 f6 52 c0</div><div class='del'>-</div><div class='del'>-Finally, if you want to see where the code comes from, you can do</div><div class='del'>-</div><div class='del'>-	cd /usr/src/linux</div><div class='del'>-	make fs/buffer.s 	# or whatever file the bug happened in</div><div class='del'>-</div><div class='del'>-and then you get a better idea of what happens than with the gdb </div><div class='del'>-disassembly.</div><div class='del'>-</div><div class='del'>-Now, the trick is just then to combine all the data you have: the C </div><div class='del'>-sources (and general knowledge of what it _should_ do), the assembly </div><div class='del'>-listing and the code disassembly (and additionally the register dump you </div><div class='del'>-also get from the "oops" message - that can be useful to see _what_ the </div><div class='del'>-corrupted pointers were, and when you have the assembler listing you can </div><div class='del'>-also match the other registers to whatever C expressions they were used </div><div class='del'>-for).</div><div class='del'>-</div><div class='del'>-Essentially, you just look at what doesn't match (in this case it was the </div><div class='del'>-"Code" disassembly that didn't match with what the compiler generated). </div><div class='del'>-Then you need to find out _why_ they don't match. Often it's simple - you </div><div class='del'>-see that the code uses a NULL pointer and then you look at the code and </div><div class='del'>-wonder how the NULL pointer got there, and if it's a valid thing to do </div><div class='del'>-you just check against it..</div><div class='del'>-</div><div class='del'>-Now, if somebody gets the idea that this is time-consuming and requires </div><div class='del'>-some small amount of concentration, you're right. Which is why I will </div><div class='del'>-mostly just ignore any panic reports that don't have the symbol table </div><div class='del'>-info etc looked up: it simply gets too hard to look it up (I have some </div><div class='del'>-programs to search for specific patterns in the kernel code segment, and </div><div class='del'>-sometimes I have been able to look up those kinds of panics too, but </div><div class='del'>-that really requires pretty good knowledge of the kernel just to be able </div><div class='del'>-to pick out the right sequences etc..)</div><div class='del'>-</div><div class='del'>-_Sometimes_ it happens that I just see the disassembled code sequence </div><div class='del'>-from the panic, and I know immediately where it's coming from. That's when </div><div class='del'>-I get worried that I've been doing this for too long ;-)</div><div class='del'>-</div><div class='del'>-		Linus</div><div class='del'>-</div><div class='del'>-</div><div class='del'>----------------------------------------------------------------------------</div><div class='del'>-Notes on Oops tracing with klogd:</div><div class='del'>-</div><div class='del'>-In order to help Linus and the other kernel developers there has been</div><div class='del'>-substantial support incorporated into klogd for processing protection</div><div class='del'>-faults.  In order to have full support for address resolution at least</div><div class='del'>-version 1.3-pl3 of the sysklogd package should be used.</div><div class='del'>-</div><div class='del'>-When a protection fault occurs the klogd daemon automatically</div><div class='del'>-translates important addresses in the kernel log messages to their</div><div class='del'>-symbolic equivalents.  This translated kernel message is then</div><div class='del'>-forwarded through whatever reporting mechanism klogd is using.  The</div><div class='del'>-protection fault message can be simply cut out of the message files</div><div class='del'>-and forwarded to the kernel developers.</div><div class='del'>-</div><div class='del'>-Two types of address resolution are performed by klogd.  The first is</div><div class='del'>-static translation and the second is dynamic translation.  Static</div><div class='del'>-translation uses the System.map file in much the same manner that</div><div class='del'>-ksymoops does.  In order to do static translation the klogd daemon</div><div class='del'>-must be able to find a system map file at daemon initialization time.</div><div class='del'>-See the klogd man page for information on how klogd searches for map</div><div class='del'>-files.</div><div class='del'>-</div><div class='del'>-Dynamic address translation is important when kernel loadable modules</div><div class='del'>-are being used.  Since memory for kernel modules is allocated from the</div><div class='del'>-kernel's dynamic memory pools there are no fixed locations for either</div><div class='del'>-the start of the module or for functions and symbols in the module.</div><div class='del'>-</div><div class='del'>-The kernel supports system calls which allow a program to determine</div><div class='del'>-which modules are loaded and their location in memory.  Using these</div><div class='del'>-system calls the klogd daemon builds a symbol table which can be used</div><div class='del'>-to debug a protection fault which occurs in a loadable kernel module.</div><div class='del'>-</div><div class='del'>-At the very minimum klogd will provide the name of the module which</div><div class='del'>-generated the protection fault.  There may be additional symbolic</div><div class='del'>-information available if the developer of the loadable module chose to</div><div class='del'>-export symbol information from the module.</div><div class='del'>-</div><div class='del'>-Since the kernel module environment can be dynamic there must be a</div><div class='del'>-mechanism for notifying the klogd daemon when a change in module</div><div class='del'>-environment occurs.  There are command line options available which</div><div class='del'>-allow klogd to signal the currently executing daemon that symbol</div><div class='del'>-information should be refreshed.  See the klogd manual page for more</div><div class='del'>-information.</div><div class='del'>-</div><div class='del'>-A patch is included with the sysklogd distribution which modifies the</div><div class='del'>-modules-2.0.0 package to automatically signal klogd whenever a module</div><div class='del'>-is loaded or unloaded.  Applying this patch provides essentially</div><div class='del'>-seamless support for debugging protection faults which occur with</div><div class='del'>-kernel loadable modules.</div><div class='del'>-</div><div class='del'>-The following is an example of a protection fault in a loadable module</div><div class='del'>-processed by klogd:</div><div class='del'>----------------------------------------------------------------------------</div><div class='del'>-Aug 29 09:51:01 blizard kernel: Unable to handle kernel paging request at virtual address f15e97cc</div><div class='del'>-Aug 29 09:51:01 blizard kernel: current-&gt;tss.cr3 = 0062d000, %cr3 = 0062d000</div><div class='del'>-Aug 29 09:51:01 blizard kernel: *pde = 00000000</div><div class='del'>-Aug 29 09:51:01 blizard kernel: Oops: 0002</div><div class='del'>-Aug 29 09:51:01 blizard kernel: CPU:    0</div><div class='del'>-Aug 29 09:51:01 blizard kernel: EIP:    0010:[oops:_oops+16/3868]</div><div class='del'>-Aug 29 09:51:01 blizard kernel: EFLAGS: 00010212</div><div class='del'>-Aug 29 09:51:01 blizard kernel: eax: 315e97cc   ebx: 003a6f80   ecx: 001be77b   edx: 00237c0c</div><div class='del'>-Aug 29 09:51:01 blizard kernel: esi: 00000000   edi: bffffdb3   ebp: 00589f90   esp: 00589f8c</div><div class='del'>-Aug 29 09:51:01 blizard kernel: ds: 0018   es: 0018   fs: 002b   gs: 002b   ss: 0018</div><div class='del'>-Aug 29 09:51:01 blizard kernel: Process oops_test (pid: 3374, process nr: 21, stackpage=00589000)</div><div class='del'>-Aug 29 09:51:01 blizard kernel: Stack: 315e97cc 00589f98 0100b0b4 bffffed4 0012e38e 00240c64 003a6f80 00000001 </div><div class='del'>-Aug 29 09:51:01 blizard kernel:        00000000 00237810 bfffff00 0010a7fa 00000003 00000001 00000000 bfffff00 </div><div class='del'>-Aug 29 09:51:01 blizard kernel:        bffffdb3 bffffed4 ffffffda 0000002b 0007002b 0000002b 0000002b 00000036 </div><div class='del'>-Aug 29 09:51:01 blizard kernel: Call Trace: [oops:_oops_ioctl+48/80] [_sys_ioctl+254/272] [_system_call+82/128] </div><div class='del'>-Aug 29 09:51:01 blizard kernel: Code: c7 00 05 00 00 00 eb 08 90 90 90 90 90 90 90 90 89 ec 5d c3 </div><div class='del'>----------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-Dr. G.W. Wettstein           Oncology Research Div. Computing Facility</div><div class='del'>-Roger Maris Cancer Center    INTERNET: greg@wind.rmcc.com</div><div class='del'>-820 4th St. N.</div><div class='del'>-Fargo, ND  58122</div><div class='del'>-Phone: 701-234-7556</div><div class='del'>-</div><div class='del'>-</div><div class='del'>----------------------------------------------------------------------------</div><div class='del'>-Tainted kernels:</div><div class='del'>-</div><div class='del'>-Some oops reports contain the string 'Tainted: ' after the program</div><div class='del'>-counter. This indicates that the kernel has been tainted by some</div><div class='del'>-mechanism.  The string is followed by a series of position-sensitive</div><div class='del'>-characters, each representing a particular tainted value.</div><div class='del'>-</div><div class='del'>-  1: 'G' if all modules loaded have a GPL or compatible license, 'P' if</div><div class='del'>-     any proprietary module has been loaded.  Modules without a</div><div class='del'>-     MODULE_LICENSE or with a MODULE_LICENSE that is not recognised by</div><div class='del'>-     insmod as GPL compatible are assumed to be proprietary.</div><div class='del'>-</div><div class='del'>-  2: 'F' if any module was force loaded by "insmod -f", ' ' if all</div><div class='del'>-     modules were loaded normally.</div><div class='del'>-</div><div class='del'>-  3: 'S' if the oops occurred on an SMP kernel running on hardware that</div><div class='del'>-     hasn't been certified as safe to run multiprocessor.</div><div class='del'>-     Currently this occurs only on various Athlons that are not</div><div class='del'>-     SMP capable.</div><div class='del'>-</div><div class='del'>-  4: 'R' if a module was force unloaded by "rmmod -f", ' ' if all</div><div class='del'>-     modules were unloaded normally.</div><div class='del'>-</div><div class='del'>-  5: 'M' if any processor has reported a Machine Check Exception,</div><div class='del'>-     ' ' if no Machine Check Exceptions have occurred.</div><div class='del'>-</div><div class='del'>-  6: 'B' if a page-release function has found a bad page reference or</div><div class='del'>-     some unexpected page flags.</div><div class='del'>-</div><div class='del'>-  7: 'U' if a user or user application specifically requested that the</div><div class='del'>-     Tainted flag be set, ' ' otherwise.</div><div class='del'>-</div><div class='del'>-  8: 'D' if the kernel has died recently, i.e. there was an OOPS or BUG.</div><div class='del'>-</div><div class='del'>-  9: 'A' if the ACPI table has been overridden.</div><div class='del'>-</div><div class='del'>- 10: 'W' if a warning has previously been issued by the kernel.</div><div class='del'>-     (Though some warnings may set more specific taint flags.)</div><div class='del'>-</div><div class='del'>- 11: 'C' if a staging driver has been loaded.</div><div class='del'>-</div><div class='del'>- 12: 'I' if the kernel is working around a severe bug in the platform</div><div class='del'>-     firmware (BIOS or similar).</div><div class='del'>-</div><div class='del'>- 13: 'O' if an externally-built ("out-of-tree") module has been loaded.</div><div class='del'>-</div><div class='del'>- 14: 'E' if an unsigned module has been loaded in a kernel supporting</div><div class='del'>-     module signature.</div><div class='del'>-</div><div class='del'>- 15: 'L' if a soft lockup has previously occurred on the system.</div><div class='del'>-</div><div class='del'>- 16: 'K' if the kernel has been live patched.</div><div class='del'>-</div><div class='del'>-The primary reason for the 'Tainted: ' string is to tell kernel</div><div class='del'>-debuggers if this is a clean kernel or if anything unusual has</div><div class='del'>-occurred.  Tainting is permanent: even if an offending module is</div><div class='del'>-unloaded, the tainted value remains to indicate that the kernel is not</div><div class='del'>-trustworthy.</div><div class='head'>diff --git a/Documentation/parport.txt b/Documentation/parport.txt<br/>deleted file mode 100644<br/>index c208e4366c03..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/parport.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/parport.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,267 +0,0 @@</div><div class='del'>-The `parport' code provides parallel-port support under Linux.  This</div><div class='del'>-includes the ability to share one port between multiple device</div><div class='del'>-drivers.</div><div class='del'>-</div><div class='del'>-You can pass parameters to the parport code to override its automatic</div><div class='del'>-detection of your hardware.  This is particularly useful if you want</div><div class='del'>-to use IRQs, since in general these can't be autoprobed successfully.</div><div class='del'>-By default IRQs are not used even if they _can_ be probed.  This is</div><div class='del'>-because there are a lot of people using the same IRQ for their</div><div class='del'>-parallel port and a sound card or network card.</div><div class='del'>-</div><div class='del'>-The parport code is split into two parts: generic (which deals with</div><div class='del'>-port-sharing) and architecture-dependent (which deals with actually</div><div class='del'>-using the port).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Parport as modules</div><div class='del'>-==================</div><div class='del'>-</div><div class='del'>-If you load the parport code as a module, say</div><div class='del'>-</div><div class='del'>-	# insmod parport</div><div class='del'>-</div><div class='del'>-to load the generic parport code.  You then must load the</div><div class='del'>-architecture-dependent code with (for example):</div><div class='del'>-</div><div class='del'>-	# insmod parport_pc io=0x3bc,0x378,0x278 irq=none,7,auto</div><div class='del'>-</div><div class='del'>-to tell the parport code that you want three PC-style ports, one at</div><div class='del'>-0x3bc with no IRQ, one at 0x378 using IRQ 7, and one at 0x278 with an</div><div class='del'>-auto-detected IRQ.  Currently, PC-style (parport_pc), Sun `bpp',</div><div class='del'>-Amiga, Atari, and MFC3 hardware is supported.</div><div class='del'>-</div><div class='del'>-PCI parallel I/O card support comes from parport_pc.  Base I/O</div><div class='del'>-addresses should not be specified for supported PCI cards since they</div><div class='del'>-are automatically detected.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-modprobe</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-If you use modprobe , you will find it useful to add lines as below to a</div><div class='del'>-configuration file in /etc/modprobe.d/ directory:.</div><div class='del'>-</div><div class='del'>-	alias parport_lowlevel parport_pc</div><div class='del'>-	options parport_pc io=0x378,0x278 irq=7,auto</div><div class='del'>-</div><div class='del'>-modprobe will load parport_pc (with the options "io=0x378,0x278 irq=7,auto")</div><div class='del'>-whenever a parallel port device driver (such as lp) is loaded.</div><div class='del'>-</div><div class='del'>-Note that these are example lines only!  You shouldn't in general need</div><div class='del'>-to specify any options to parport_pc in order to be able to use a</div><div class='del'>-parallel port.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Parport probe [optional]</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-In 2.2 kernels there was a module called parport_probe, which was used</div><div class='del'>-for collecting IEEE 1284 device ID information.  This has now been</div><div class='del'>-enhanced and now lives with the IEEE 1284 support.  When a parallel</div><div class='del'>-port is detected, the devices that are connected to it are analysed,</div><div class='del'>-and information is logged like this:</div><div class='del'>-</div><div class='del'>-	parport0: Printer, BJC-210 (Canon)</div><div class='del'>-</div><div class='del'>-The probe information is available from files in /proc/sys/dev/parport/.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Parport linked into the kernel statically</div><div class='del'>-=========================================</div><div class='del'>-</div><div class='del'>-If you compile the parport code into the kernel, then you can use</div><div class='del'>-kernel boot parameters to get the same effect.  Add something like the</div><div class='del'>-following to your LILO command line:</div><div class='del'>-</div><div class='del'>-	parport=0x3bc parport=0x378,7 parport=0x278,auto,nofifo</div><div class='del'>-</div><div class='del'>-You can have many `parport=...' statements, one for each port you want</div><div class='del'>-to add.  Adding `parport=0' to the kernel command-line will disable</div><div class='del'>-parport support entirely.  Adding `parport=auto' to the kernel</div><div class='del'>-command-line will make parport use any IRQ lines or DMA channels that</div><div class='del'>-it auto-detects.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Files in /proc</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-If you have configured the /proc filesystem into your kernel, you will</div><div class='del'>-see a new directory entry: /proc/sys/dev/parport.  In there will be a</div><div class='del'>-directory entry for each parallel port for which parport is</div><div class='del'>-configured.  In each of those directories are a collection of files</div><div class='del'>-describing that parallel port.</div><div class='del'>-</div><div class='del'>-The /proc/sys/dev/parport directory tree looks like:</div><div class='del'>-</div><div class='del'>-parport</div><div class='del'>-|-- default</div><div class='del'>-|   |-- spintime</div><div class='del'>-|   `-- timeslice</div><div class='del'>-|-- parport0</div><div class='del'>-|   |-- autoprobe</div><div class='del'>-|   |-- autoprobe0</div><div class='del'>-|   |-- autoprobe1</div><div class='del'>-|   |-- autoprobe2</div><div class='del'>-|   |-- autoprobe3</div><div class='del'>-|   |-- devices</div><div class='del'>-|   |   |-- active</div><div class='del'>-|   |   `-- lp</div><div class='del'>-|   |       `-- timeslice</div><div class='del'>-|   |-- base-addr</div><div class='del'>-|   |-- irq</div><div class='del'>-|   |-- dma</div><div class='del'>-|   |-- modes</div><div class='del'>-|   `-- spintime</div><div class='del'>-`-- parport1</div><div class='del'>-    |-- autoprobe</div><div class='del'>-    |-- autoprobe0</div><div class='del'>-    |-- autoprobe1</div><div class='del'>-    |-- autoprobe2</div><div class='del'>-    |-- autoprobe3</div><div class='del'>-    |-- devices</div><div class='del'>-    |   |-- active</div><div class='del'>-    |   `-- ppa</div><div class='del'>-    |       `-- timeslice</div><div class='del'>-    |-- base-addr</div><div class='del'>-    |-- irq</div><div class='del'>-    |-- dma</div><div class='del'>-    |-- modes</div><div class='del'>-    `-- spintime</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-File:		Contents:</div><div class='del'>-</div><div class='del'>-devices/active	A list of the device drivers using that port.  A "+"</div><div class='del'>-		will appear by the name of the device currently using</div><div class='del'>-		the port (it might not appear against any).  The</div><div class='del'>-		string "none" means that there are no device drivers</div><div class='del'>-		using that port.</div><div class='del'>-</div><div class='del'>-base-addr	Parallel port's base address, or addresses if the port</div><div class='del'>-		has more than one in which case they are separated</div><div class='del'>-		with tabs.  These values might not have any sensible</div><div class='del'>-		meaning for some ports.</div><div class='del'>-</div><div class='del'>-irq		Parallel port's IRQ, or -1 if none is being used.</div><div class='del'>-</div><div class='del'>-dma		Parallel port's DMA channel, or -1 if none is being</div><div class='del'>-		used.</div><div class='del'>-</div><div class='del'>-modes		Parallel port's hardware modes, comma-separated,</div><div class='del'>-		meaning:</div><div class='del'>-</div><div class='del'>-		PCSPP		PC-style SPP registers are available.</div><div class='del'>-		TRISTATE	Port is bidirectional.</div><div class='del'>-		COMPAT		Hardware acceleration for printers is</div><div class='del'>-				available and will be used.</div><div class='del'>-		EPP		Hardware acceleration for EPP protocol</div><div class='del'>-				is available and will be used.</div><div class='del'>-		ECP		Hardware acceleration for ECP protocol</div><div class='del'>-				is available and will be used.</div><div class='del'>-		DMA		DMA is available and will be used.</div><div class='del'>-</div><div class='del'>-		Note that the current implementation will only take</div><div class='del'>-		advantage of COMPAT and ECP modes if it has an IRQ</div><div class='del'>-		line to use.</div><div class='del'>-</div><div class='del'>-autoprobe	Any IEEE-1284 device ID information that has been</div><div class='del'>-		acquired from the (non-IEEE 1284.3) device.</div><div class='del'>-</div><div class='del'>-autoprobe[0-3]	IEEE 1284 device ID information retrieved from</div><div class='del'>-		daisy-chain devices that conform to IEEE 1284.3.</div><div class='del'>-</div><div class='del'>-spintime	The number of microseconds to busy-loop while waiting</div><div class='del'>-		for the peripheral to respond.  You might find that</div><div class='del'>-		adjusting this improves performance, depending on your</div><div class='del'>-		peripherals.  This is a port-wide setting, i.e. it</div><div class='del'>-		applies to all devices on a particular port.</div><div class='del'>-</div><div class='del'>-timeslice	The number of milliseconds that a device driver is</div><div class='del'>-		allowed to keep a port claimed for.  This is advisory,</div><div class='del'>-		and driver can ignore it if it must.</div><div class='del'>-</div><div class='del'>-default/*	The defaults for spintime and timeslice. When a new</div><div class='del'>-		port is	registered, it picks up the default spintime.</div><div class='del'>-		When a new device is registered, it picks up the</div><div class='del'>-		default timeslice.</div><div class='del'>-</div><div class='del'>-Device drivers</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-Once the parport code is initialised, you can attach device drivers to</div><div class='del'>-specific ports.  Normally this happens automatically; if the lp driver</div><div class='del'>-is loaded it will create one lp device for each port found.  You can</div><div class='del'>-override this, though, by using parameters either when you load the lp</div><div class='del'>-driver:</div><div class='del'>-</div><div class='del'>-	# insmod lp parport=0,2</div><div class='del'>-</div><div class='del'>-or on the LILO command line:</div><div class='del'>-</div><div class='del'>-	lp=parport0 lp=parport2</div><div class='del'>-</div><div class='del'>-Both the above examples would inform lp that you want /dev/lp0 to be</div><div class='del'>-the first parallel port, and /dev/lp1 to be the _third_ parallel port,</div><div class='del'>-with no lp device associated with the second port (parport1).  Note</div><div class='del'>-that this is different to the way older kernels worked; there used to</div><div class='del'>-be a static association between the I/O port address and the device</div><div class='del'>-name, so /dev/lp0 was always the port at 0x3bc.  This is no longer the</div><div class='del'>-case - if you only have one port, it will default to being /dev/lp0,</div><div class='del'>-regardless of base address.</div><div class='del'>-</div><div class='del'>-Also:</div><div class='del'>-</div><div class='del'>- * If you selected the IEEE 1284 support at compile time, you can say</div><div class='del'>-   `lp=auto' on the kernel command line, and lp will create devices</div><div class='del'>-   only for those ports that seem to have printers attached.</div><div class='del'>-</div><div class='del'>- * If you give PLIP the `timid' parameter, either with `plip=timid' on</div><div class='del'>-   the command line, or with `insmod plip timid=1' when using modules,</div><div class='del'>-   it will avoid any ports that seem to be in use by other devices.</div><div class='del'>-</div><div class='del'>- * IRQ autoprobing works only for a few port types at the moment.</div><div class='del'>-</div><div class='del'>-Reporting printer problems with parport</div><div class='del'>-=======================================</div><div class='del'>-</div><div class='del'>-If you are having problems printing, please go through these steps to</div><div class='del'>-try to narrow down where the problem area is.</div><div class='del'>-</div><div class='del'>-When reporting problems with parport, really you need to give all of</div><div class='del'>-the messages that parport_pc spits out when it initialises.  There are</div><div class='del'>-several code paths:</div><div class='del'>-</div><div class='del'>-o polling</div><div class='del'>-o interrupt-driven, protocol in software</div><div class='del'>-o interrupt-driven, protocol in hardware using PIO</div><div class='del'>-o interrupt-driven, protocol in hardware using DMA</div><div class='del'>-</div><div class='del'>-The kernel messages that parport_pc logs give an indication of which</div><div class='del'>-code path is being used. (They could be a lot better actually..)</div><div class='del'>-</div><div class='del'>-For normal printer protocol, having IEEE 1284 modes enabled or not</div><div class='del'>-should not make a difference.</div><div class='del'>-</div><div class='del'>-To turn off the 'protocol in hardware' code paths, disable</div><div class='del'>-CONFIG_PARPORT_PC_FIFO.  Note that when they are enabled they are not</div><div class='del'>-necessarily _used_; it depends on whether the hardware is available,</div><div class='del'>-enabled by the BIOS, and detected by the driver.</div><div class='del'>-</div><div class='del'>-So, to start with, disable CONFIG_PARPORT_PC_FIFO, and load parport_pc</div><div class='del'>-with 'irq=none'. See if printing works then.  It really should,</div><div class='del'>-because this is the simplest code path.</div><div class='del'>-</div><div class='del'>-If that works fine, try with 'io=0x378 irq=7' (adjust for your</div><div class='del'>-hardware), to make it use interrupt-driven in-software protocol.</div><div class='del'>-</div><div class='del'>-If _that_ works fine, then one of the hardware modes isn't working</div><div class='del'>-right.  Enable CONFIG_PARPORT_PC_FIFO (no, it isn't a module option,</div><div class='del'>-and yes, it should be), set the port to ECP mode in the BIOS and note</div><div class='del'>-the DMA channel, and try with:</div><div class='del'>-</div><div class='del'>-    io=0x378 irq=7 dma=none (for PIO)</div><div class='del'>-    io=0x378 irq=7 dma=3 (for DMA)</div><div class='del'>---</div><div class='del'>-philb@gnu.org</div><div class='del'>-tim@cyberelk.net</div><div class='head'>diff --git a/Documentation/perf/qcom_l2_pmu.txt b/Documentation/perf/qcom_l2_pmu.txt<br/>new file mode 100644<br/>index 000000000000..b25b97659ab9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/perf/qcom_l2_pmu.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/perf/qcom_l2_pmu.txt</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+Qualcomm Technologies Level-2 Cache Performance Monitoring Unit (PMU)</div><div class='add'>+=====================================================================</div><div class='add'>+</div><div class='add'>+This driver supports the L2 cache clusters found in Qualcomm Technologies</div><div class='add'>+Centriq SoCs. There are multiple physical L2 cache clusters, each with their</div><div class='add'>+own PMU. Each cluster has one or more CPUs associated with it.</div><div class='add'>+</div><div class='add'>+There is one logical L2 PMU exposed, which aggregates the results from</div><div class='add'>+the physical PMUs.</div><div class='add'>+</div><div class='add'>+The driver provides a description of its available events and configuration</div><div class='add'>+options in sysfs, see /sys/devices/l2cache_0.</div><div class='add'>+</div><div class='add'>+The "format" directory describes the format of the events.</div><div class='add'>+</div><div class='add'>+Events can be envisioned as a 2-dimensional array. Each column represents</div><div class='add'>+a group of events. There are 8 groups. Only one entry from each</div><div class='add'>+group can be in use at a time. If multiple events from the same group</div><div class='add'>+are specified, the conflicting events cannot be counted at the same time.</div><div class='add'>+</div><div class='add'>+Events are specified as 0xCCG, where CC is 2 hex digits specifying</div><div class='add'>+the code (array row) and G specifies the group (column) 0-7.</div><div class='add'>+</div><div class='add'>+In addition there is a cycle counter event specified by the value 0xFE</div><div class='add'>+which is outside the above scheme.</div><div class='add'>+</div><div class='add'>+The driver provides a "cpumask" sysfs attribute which contains a mask</div><div class='add'>+consisting of one CPU per cluster which will be used to handle all the PMU</div><div class='add'>+events on that cluster.</div><div class='add'>+</div><div class='add'>+Examples for use with perf:</div><div class='add'>+</div><div class='add'>+  perf stat -e l2cache_0/config=0x001/,l2cache_0/config=0x042/ -a sleep 1</div><div class='add'>+</div><div class='add'>+  perf stat -e l2cache_0/config=0xfe/ -C 2 sleep 1</div><div class='add'>+</div><div class='add'>+The driver does not support sampling, therefore "perf record" will</div><div class='add'>+not work. Per-task perf sessions are not supported.</div><div class='head'>diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt<br/>index 0d3b9ce0a0b9..54bd5faa8782 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/pinctrl.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/pinctrl.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/pinctrl.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/pinctrl.txt</a></div><div class='hunk'>@@ -79,9 +79,7 @@ int __init foo_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pinctrl_dev *pctl;</div><div class='ctx'> </div><div class='del'>-	pctl = pinctrl_register(&amp;foo_desc, &lt;PARENT&gt;, NULL);</div><div class='del'>-	if (!pctl)</div><div class='del'>-		pr_err("could not register foo pin driver\n");</div><div class='add'>+	return pinctrl_register_and_init(&amp;foo_desc, &lt;PARENT&gt;, NULL, &amp;pctl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> To enable the pinctrl subsystem and the subgroups for PINMUX and PINCONF and</div><div class='head'>diff --git a/Documentation/power/00-INDEX b/Documentation/power/00-INDEX<br/>index ad04cc8097ed..7f3c2def2cac 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/power/00-INDEX?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/power/00-INDEX</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/power/00-INDEX?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/00-INDEX</a></div><div class='hunk'>@@ -6,7 +6,7 @@ basic-pm-debugging.txt</div><div class='ctx'> 	- Debugging suspend and resume</div><div class='ctx'> charger-manager.txt</div><div class='ctx'> 	- Battery charger management.</div><div class='del'>-devices.txt</div><div class='add'>+admin-guide/devices.rst</div><div class='ctx'> 	- How drivers interact with system-wide power management</div><div class='ctx'> drivers-testing.txt</div><div class='ctx'> 	- Testing suspend and resume support in device drivers</div><div class='hunk'>@@ -14,8 +14,6 @@ freezing-of-tasks.txt</div><div class='ctx'> 	- How processes and controlled during suspend</div><div class='ctx'> interface.txt</div><div class='ctx'> 	- Power management user interface in /sys/power</div><div class='del'>-notifiers.txt</div><div class='del'>-	- Registering suspend notifiers in device drivers</div><div class='ctx'> opp.txt</div><div class='ctx'> 	- Operating Performance Point library</div><div class='ctx'> pci.txt</div><div class='head'>diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt<br/>deleted file mode 100644<br/>index 8ba6625fdd63..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/power/devices.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/power/devices.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,704 +0,0 @@</div><div class='del'>-Device Power Management</div><div class='del'>-</div><div class='del'>-Copyright (c) 2010-2011 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Novell Inc.</div><div class='del'>-Copyright (c) 2010 Alan Stern &lt;stern@rowland.harvard.edu&gt;</div><div class='del'>-Copyright (c) 2014 Intel Corp., Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Most of the code in Linux is device drivers, so most of the Linux power</div><div class='del'>-management (PM) code is also driver-specific.  Most drivers will do very</div><div class='del'>-little; others, especially for platforms with small batteries (like cell</div><div class='del'>-phones), will do a lot.</div><div class='del'>-</div><div class='del'>-This writeup gives an overview of how drivers interact with system-wide</div><div class='del'>-power management goals, emphasizing the models and interfaces that are</div><div class='del'>-shared by everything that hooks up to the driver model core.  Read it as</div><div class='del'>-background for the domain-specific work you'd do with any specific driver.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Two Models for Device Power Management</div><div class='del'>-======================================</div><div class='del'>-Drivers will use one or both of these models to put devices into low-power</div><div class='del'>-states:</div><div class='del'>-</div><div class='del'>-    System Sleep model:</div><div class='del'>-	Drivers can enter low-power states as part of entering system-wide</div><div class='del'>-	low-power states like "suspend" (also known as "suspend-to-RAM"), or</div><div class='del'>-	(mostly for systems with disks) "hibernation" (also known as</div><div class='del'>-	"suspend-to-disk").</div><div class='del'>-</div><div class='del'>-	This is something that device, bus, and class drivers collaborate on</div><div class='del'>-	by implementing various role-specific suspend and resume methods to</div><div class='del'>-	cleanly power down hardware and software subsystems, then reactivate</div><div class='del'>-	them without loss of data.</div><div class='del'>-</div><div class='del'>-	Some drivers can manage hardware wakeup events, which make the system</div><div class='del'>-	leave the low-power state.  This feature may be enabled or disabled</div><div class='del'>-	using the relevant /sys/devices/.../power/wakeup file (for Ethernet</div><div class='del'>-	drivers the ioctl interface used by ethtool may also be used for this</div><div class='del'>-	purpose); enabling it may cost some power usage, but let the whole</div><div class='del'>-	system enter low-power states more often.</div><div class='del'>-</div><div class='del'>-    Runtime Power Management model:</div><div class='del'>-	Devices may also be put into low-power states while the system is</div><div class='del'>-	running, independently of other power management activity in principle.</div><div class='del'>-	However, devices are not generally independent of each other (for</div><div class='del'>-	example, a parent device cannot be suspended unless all of its child</div><div class='del'>-	devices have been suspended).  Moreover, depending on the bus type the</div><div class='del'>-	device is on, it may be necessary to carry out some bus-specific</div><div class='del'>-	operations on the device for this purpose.  Devices put into low power</div><div class='del'>-	states at run time may require special handling during system-wide power</div><div class='del'>-	transitions (suspend or hibernation).</div><div class='del'>-</div><div class='del'>-	For these reasons not only the device driver itself, but also the</div><div class='del'>-	appropriate subsystem (bus type, device type or device class) driver and</div><div class='del'>-	the PM core are involved in runtime power management.  As in the system</div><div class='del'>-	sleep power management case, they need to collaborate by implementing</div><div class='del'>-	various role-specific suspend and resume methods, so that the hardware</div><div class='del'>-	is cleanly powered down and reactivated without data or service loss.</div><div class='del'>-</div><div class='del'>-There's not a lot to be said about those low-power states except that they are</div><div class='del'>-very system-specific, and often device-specific.  Also, that if enough devices</div><div class='del'>-have been put into low-power states (at runtime), the effect may be very similar</div><div class='del'>-to entering some system-wide low-power state (system sleep) ... and that</div><div class='del'>-synergies exist, so that several drivers using runtime PM might put the system</div><div class='del'>-into a state where even deeper power saving options are available.</div><div class='del'>-</div><div class='del'>-Most suspended devices will have quiesced all I/O: no more DMA or IRQs (except</div><div class='del'>-for wakeup events), no more data read or written, and requests from upstream</div><div class='del'>-drivers are no longer accepted.  A given bus or platform may have different</div><div class='del'>-requirements though.</div><div class='del'>-</div><div class='del'>-Examples of hardware wakeup events include an alarm from a real time clock,</div><div class='del'>-network wake-on-LAN packets, keyboard or mouse activity, and media insertion</div><div class='del'>-or removal (for PCMCIA, MMC/SD, USB, and so on).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Interfaces for Entering System Sleep States</div><div class='del'>-===========================================</div><div class='del'>-There are programming interfaces provided for subsystems (bus type, device type,</div><div class='del'>-device class) and device drivers to allow them to participate in the power</div><div class='del'>-management of devices they are concerned with.  These interfaces cover both</div><div class='del'>-system sleep and runtime power management.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Device Power Management Operations</div><div class='del'>-----------------------------------</div><div class='del'>-Device power management operations, at the subsystem level as well as at the</div><div class='del'>-device driver level, are implemented by defining and populating objects of type</div><div class='del'>-struct dev_pm_ops:</div><div class='del'>-</div><div class='del'>-struct dev_pm_ops {</div><div class='del'>-	int (*prepare)(struct device *dev);</div><div class='del'>-	void (*complete)(struct device *dev);</div><div class='del'>-	int (*suspend)(struct device *dev);</div><div class='del'>-	int (*resume)(struct device *dev);</div><div class='del'>-	int (*freeze)(struct device *dev);</div><div class='del'>-	int (*thaw)(struct device *dev);</div><div class='del'>-	int (*poweroff)(struct device *dev);</div><div class='del'>-	int (*restore)(struct device *dev);</div><div class='del'>-	int (*suspend_late)(struct device *dev);</div><div class='del'>-	int (*resume_early)(struct device *dev);</div><div class='del'>-	int (*freeze_late)(struct device *dev);</div><div class='del'>-	int (*thaw_early)(struct device *dev);</div><div class='del'>-	int (*poweroff_late)(struct device *dev);</div><div class='del'>-	int (*restore_early)(struct device *dev);</div><div class='del'>-	int (*suspend_noirq)(struct device *dev);</div><div class='del'>-	int (*resume_noirq)(struct device *dev);</div><div class='del'>-	int (*freeze_noirq)(struct device *dev);</div><div class='del'>-	int (*thaw_noirq)(struct device *dev);</div><div class='del'>-	int (*poweroff_noirq)(struct device *dev);</div><div class='del'>-	int (*restore_noirq)(struct device *dev);</div><div class='del'>-	int (*runtime_suspend)(struct device *dev);</div><div class='del'>-	int (*runtime_resume)(struct device *dev);</div><div class='del'>-	int (*runtime_idle)(struct device *dev);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-This structure is defined in include/linux/pm.h and the methods included in it</div><div class='del'>-are also described in that file.  Their roles will be explained in what follows.</div><div class='del'>-For now, it should be sufficient to remember that the last three methods are</div><div class='del'>-specific to runtime power management while the remaining ones are used during</div><div class='del'>-system-wide power transitions.</div><div class='del'>-</div><div class='del'>-There also is a deprecated "old" or "legacy" interface for power management</div><div class='del'>-operations available at least for some subsystems.  This approach does not use</div><div class='del'>-struct dev_pm_ops objects and it is suitable only for implementing system sleep</div><div class='del'>-power management methods.  Therefore it is not described in this document, so</div><div class='del'>-please refer directly to the source code for more information about it.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Subsystem-Level Methods</div><div class='del'>------------------------</div><div class='del'>-The core methods to suspend and resume devices reside in struct dev_pm_ops</div><div class='del'>-pointed to by the ops member of struct dev_pm_domain, or by the pm member of</div><div class='del'>-struct bus_type, struct device_type and struct class.  They are mostly of</div><div class='del'>-interest to the people writing infrastructure for platforms and buses, like PCI</div><div class='del'>-or USB, or device type and device class drivers.  They also are relevant to the</div><div class='del'>-writers of device drivers whose subsystems (PM domains, device types, device</div><div class='del'>-classes and bus types) don't provide all power management methods.</div><div class='del'>-</div><div class='del'>-Bus drivers implement these methods as appropriate for the hardware and the</div><div class='del'>-drivers using it; PCI works differently from USB, and so on.  Not many people</div><div class='del'>-write subsystem-level drivers; most driver code is a "device driver" that builds</div><div class='del'>-on top of bus-specific framework code.</div><div class='del'>-</div><div class='del'>-For more information on these driver calls, see the description later;</div><div class='del'>-they are called in phases for every device, respecting the parent-child</div><div class='del'>-sequencing in the driver model tree.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/sys/devices/.../power/wakeup files</div><div class='del'>------------------------------------</div><div class='del'>-All device objects in the driver model contain fields that control the handling</div><div class='del'>-of system wakeup events (hardware signals that can force the system out of a</div><div class='del'>-sleep state).  These fields are initialized by bus or device driver code using</div><div class='del'>-device_set_wakeup_capable() and device_set_wakeup_enable(), defined in</div><div class='del'>-include/linux/pm_wakeup.h.</div><div class='del'>-</div><div class='del'>-The "power.can_wakeup" flag just records whether the device (and its driver) can</div><div class='del'>-physically support wakeup events.  The device_set_wakeup_capable() routine</div><div class='del'>-affects this flag.  The "power.wakeup" field is a pointer to an object of type</div><div class='del'>-struct wakeup_source used for controlling whether or not the device should use</div><div class='del'>-its system wakeup mechanism and for notifying the PM core of system wakeup</div><div class='del'>-events signaled by the device.  This object is only present for wakeup-capable</div><div class='del'>-devices (i.e. devices whose "can_wakeup" flags are set) and is created (or</div><div class='del'>-removed) by device_set_wakeup_capable().</div><div class='del'>-</div><div class='del'>-Whether or not a device is capable of issuing wakeup events is a hardware</div><div class='del'>-matter, and the kernel is responsible for keeping track of it.  By contrast,</div><div class='del'>-whether or not a wakeup-capable device should issue wakeup events is a policy</div><div class='del'>-decision, and it is managed by user space through a sysfs attribute: the</div><div class='del'>-"power/wakeup" file.  User space can write the strings "enabled" or "disabled"</div><div class='del'>-to it to indicate whether or not, respectively, the device is supposed to signal</div><div class='del'>-system wakeup.  This file is only present if the "power.wakeup" object exists</div><div class='del'>-for the given device and is created (or removed) along with that object, by</div><div class='del'>-device_set_wakeup_capable().  Reads from the file will return the corresponding</div><div class='del'>-string.</div><div class='del'>-</div><div class='del'>-The "power/wakeup" file is supposed to contain the "disabled" string initially</div><div class='del'>-for the majority of devices; the major exceptions are power buttons, keyboards,</div><div class='del'>-and Ethernet adapters whose WoL (wake-on-LAN) feature has been set up with</div><div class='del'>-ethtool.  It should also default to "enabled" for devices that don't generate</div><div class='del'>-wakeup requests on their own but merely forward wakeup requests from one bus to</div><div class='del'>-another (like PCI Express ports).</div><div class='del'>-</div><div class='del'>-The device_may_wakeup() routine returns true only if the "power.wakeup" object</div><div class='del'>-exists and the corresponding "power/wakeup" file contains the string "enabled".</div><div class='del'>-This information is used by subsystems, like the PCI bus type code, to see</div><div class='del'>-whether or not to enable the devices' wakeup mechanisms.  If device wakeup</div><div class='del'>-mechanisms are enabled or disabled directly by drivers, they also should use</div><div class='del'>-device_may_wakeup() to decide what to do during a system sleep transition.</div><div class='del'>-Device drivers, however, are not supposed to call device_set_wakeup_enable()</div><div class='del'>-directly in any case.</div><div class='del'>-</div><div class='del'>-It ought to be noted that system wakeup is conceptually different from "remote</div><div class='del'>-wakeup" used by runtime power management, although it may be supported by the</div><div class='del'>-same physical mechanism.  Remote wakeup is a feature allowing devices in</div><div class='del'>-low-power states to trigger specific interrupts to signal conditions in which</div><div class='del'>-they should be put into the full-power state.  Those interrupts may or may not</div><div class='del'>-be used to signal system wakeup events, depending on the hardware design.  On</div><div class='del'>-some systems it is impossible to trigger them from system sleep states.  In any</div><div class='del'>-case, remote wakeup should always be enabled for runtime power management for</div><div class='del'>-all devices and drivers that support it.</div><div class='del'>-</div><div class='del'>-/sys/devices/.../power/control files</div><div class='del'>-------------------------------------</div><div class='del'>-Each device in the driver model has a flag to control whether it is subject to</div><div class='del'>-runtime power management.  This flag, called runtime_auto, is initialized by the</div><div class='del'>-bus type (or generally subsystem) code using pm_runtime_allow() or</div><div class='del'>-pm_runtime_forbid(); the default is to allow runtime power management.</div><div class='del'>-</div><div class='del'>-The setting can be adjusted by user space by writing either "on" or "auto" to</div><div class='del'>-the device's power/control sysfs file.  Writing "auto" calls pm_runtime_allow(),</div><div class='del'>-setting the flag and allowing the device to be runtime power-managed by its</div><div class='del'>-driver.  Writing "on" calls pm_runtime_forbid(), clearing the flag, returning</div><div class='del'>-the device to full power if it was in a low-power state, and preventing the</div><div class='del'>-device from being runtime power-managed.  User space can check the current value</div><div class='del'>-of the runtime_auto flag by reading the file.</div><div class='del'>-</div><div class='del'>-The device's runtime_auto flag has no effect on the handling of system-wide</div><div class='del'>-power transitions.  In particular, the device can (and in the majority of cases</div><div class='del'>-should and will) be put into a low-power state during a system-wide transition</div><div class='del'>-to a sleep state even though its runtime_auto flag is clear.</div><div class='del'>-</div><div class='del'>-For more information about the runtime power management framework, refer to</div><div class='del'>-Documentation/power/runtime_pm.txt.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Calling Drivers to Enter and Leave System Sleep States</div><div class='del'>-======================================================</div><div class='del'>-When the system goes into a sleep state, each device's driver is asked to</div><div class='del'>-suspend the device by putting it into a state compatible with the target</div><div class='del'>-system state.  That's usually some version of "off", but the details are</div><div class='del'>-system-specific.  Also, wakeup-enabled devices will usually stay partly</div><div class='del'>-functional in order to wake the system.</div><div class='del'>-</div><div class='del'>-When the system leaves that low-power state, the device's driver is asked to</div><div class='del'>-resume it by returning it to full power.  The suspend and resume operations</div><div class='del'>-always go together, and both are multi-phase operations.</div><div class='del'>-</div><div class='del'>-For simple drivers, suspend might quiesce the device using class code</div><div class='del'>-and then turn its hardware as "off" as possible during suspend_noirq.  The</div><div class='del'>-matching resume calls would then completely reinitialize the hardware</div><div class='del'>-before reactivating its class I/O queues.</div><div class='del'>-</div><div class='del'>-More power-aware drivers might prepare the devices for triggering system wakeup</div><div class='del'>-events.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Call Sequence Guarantees</div><div class='del'>-------------------------</div><div class='del'>-To ensure that bridges and similar links needing to talk to a device are</div><div class='del'>-available when the device is suspended or resumed, the device tree is</div><div class='del'>-walked in a bottom-up order to suspend devices.  A top-down order is</div><div class='del'>-used to resume those devices.</div><div class='del'>-</div><div class='del'>-The ordering of the device tree is defined by the order in which devices</div><div class='del'>-get registered:  a child can never be registered, probed or resumed before</div><div class='del'>-its parent; and can't be removed or suspended after that parent.</div><div class='del'>-</div><div class='del'>-The policy is that the device tree should match hardware bus topology.</div><div class='del'>-(Or at least the control bus, for devices which use multiple busses.)</div><div class='del'>-In particular, this means that a device registration may fail if the parent of</div><div class='del'>-the device is suspending (i.e. has been chosen by the PM core as the next</div><div class='del'>-device to suspend) or has already suspended, as well as after all of the other</div><div class='del'>-devices have been suspended.  Device drivers must be prepared to cope with such</div><div class='del'>-situations.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-System Power Management Phases</div><div class='del'>-------------------------------</div><div class='del'>-Suspending or resuming the system is done in several phases.  Different phases</div><div class='del'>-are used for freeze, standby, and memory sleep states ("suspend-to-RAM") and the</div><div class='del'>-hibernation state ("suspend-to-disk").  Each phase involves executing callbacks</div><div class='del'>-for every device before the next phase begins.  Not all busses or classes</div><div class='del'>-support all these callbacks and not all drivers use all the callbacks.  The</div><div class='del'>-various phases always run after tasks have been frozen and before they are</div><div class='del'>-unfrozen.  Furthermore, the *_noirq phases run at a time when IRQ handlers have</div><div class='del'>-been disabled (except for those marked with the IRQF_NO_SUSPEND flag).</div><div class='del'>-</div><div class='del'>-All phases use PM domain, bus, type, class or driver callbacks (that is, methods</div><div class='del'>-defined in dev-&gt;pm_domain-&gt;ops, dev-&gt;bus-&gt;pm, dev-&gt;type-&gt;pm, dev-&gt;class-&gt;pm or</div><div class='del'>-dev-&gt;driver-&gt;pm).  These callbacks are regarded by the PM core as mutually</div><div class='del'>-exclusive.  Moreover, PM domain callbacks always take precedence over all of the</div><div class='del'>-other callbacks and, for example, type callbacks take precedence over bus, class</div><div class='del'>-and driver callbacks.  To be precise, the following rules are used to determine</div><div class='del'>-which callback to execute in the given phase:</div><div class='del'>-</div><div class='del'>-    1.	If dev-&gt;pm_domain is present, the PM core will choose the callback</div><div class='del'>-	included in dev-&gt;pm_domain-&gt;ops for execution</div><div class='del'>-</div><div class='del'>-    2.	Otherwise, if both dev-&gt;type and dev-&gt;type-&gt;pm are present, the callback</div><div class='del'>-	included in dev-&gt;type-&gt;pm will be chosen for execution.</div><div class='del'>-</div><div class='del'>-    3.	Otherwise, if both dev-&gt;class and dev-&gt;class-&gt;pm are present, the</div><div class='del'>-	callback included in dev-&gt;class-&gt;pm will be chosen for execution.</div><div class='del'>-</div><div class='del'>-    4.	Otherwise, if both dev-&gt;bus and dev-&gt;bus-&gt;pm are present, the callback</div><div class='del'>-	included in dev-&gt;bus-&gt;pm will be chosen for execution.</div><div class='del'>-</div><div class='del'>-This allows PM domains and device types to override callbacks provided by bus</div><div class='del'>-types or device classes if necessary.</div><div class='del'>-</div><div class='del'>-The PM domain, type, class and bus callbacks may in turn invoke device- or</div><div class='del'>-driver-specific methods stored in dev-&gt;driver-&gt;pm, but they don't have to do</div><div class='del'>-that.</div><div class='del'>-</div><div class='del'>-If the subsystem callback chosen for execution is not present, the PM core will</div><div class='del'>-execute the corresponding method from dev-&gt;driver-&gt;pm instead if there is one.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Entering System Suspend</div><div class='del'>------------------------</div><div class='del'>-When the system goes into the freeze, standby or memory sleep state,</div><div class='del'>-the phases are:</div><div class='del'>-</div><div class='del'>-		prepare, suspend, suspend_late, suspend_noirq.</div><div class='del'>-</div><div class='del'>-    1.	The prepare phase is meant to prevent races by preventing new devices</div><div class='del'>-	from being registered; the PM core would never know that all the</div><div class='del'>-	children of a device had been suspended if new children could be</div><div class='del'>-	registered at will.  (By contrast, devices may be unregistered at any</div><div class='del'>-	time.)  Unlike the other suspend-related phases, during the prepare</div><div class='del'>-	phase the device tree is traversed top-down.</div><div class='del'>-</div><div class='del'>-	After the prepare callback method returns, no new children may be</div><div class='del'>-	registered below the device.  The method may also prepare the device or</div><div class='del'>-	driver in some way for the upcoming system power transition, but it</div><div class='del'>-	should not put the device into a low-power state.</div><div class='del'>-</div><div class='del'>-	For devices supporting runtime power management, the return value of the</div><div class='del'>-	prepare callback can be used to indicate to the PM core that it may</div><div class='del'>-	safely leave the device in runtime suspend (if runtime-suspended</div><div class='del'>-	already), provided that all of the device's descendants are also left in</div><div class='del'>-	runtime suspend.  Namely, if the prepare callback returns a positive</div><div class='del'>-	number and that happens for all of the descendants of the device too,</div><div class='del'>-	and all of them (including the device itself) are runtime-suspended, the</div><div class='del'>-	PM core will skip the suspend, suspend_late and	suspend_noirq suspend</div><div class='del'>-	phases as well as the resume_noirq, resume_early and resume phases of</div><div class='del'>-	the following system resume for all of these devices.	In that case,</div><div class='del'>-	the complete callback will be called directly after the prepare callback</div><div class='del'>-	and is entirely responsible for bringing the device back to the</div><div class='del'>-	functional state as appropriate.</div><div class='del'>-</div><div class='del'>-	Note that this direct-complete procedure applies even if the device is</div><div class='del'>-	disabled for runtime PM; only the runtime-PM status matters.  It follows</div><div class='del'>-	that if a device has system-sleep callbacks but does not support runtime</div><div class='del'>-	PM, then its prepare callback must never return a positive value.  This</div><div class='del'>-	is because all devices are initially set to runtime-suspended with</div><div class='del'>-	runtime PM disabled.</div><div class='del'>-</div><div class='del'>-    2.	The suspend methods should quiesce the device to stop it from performing</div><div class='del'>-	I/O.  They also may save the device registers and put it into the</div><div class='del'>-	appropriate low-power state, depending on the bus type the device is on,</div><div class='del'>-	and they may enable wakeup events.</div><div class='del'>-</div><div class='del'>-    3	For a number of devices it is convenient to split suspend into the</div><div class='del'>-	"quiesce device" and "save device state" phases, in which cases</div><div class='del'>-	suspend_late is meant to do the latter.  It is always executed after</div><div class='del'>-	runtime power management has been disabled for all devices.</div><div class='del'>-</div><div class='del'>-    4.	The suspend_noirq phase occurs after IRQ handlers have been disabled,</div><div class='del'>-	which means that the driver's interrupt handler will not be called while</div><div class='del'>-	the callback method is running.  The methods should save the values of</div><div class='del'>-	the device's registers that weren't saved previously and finally put the</div><div class='del'>-	device into the appropriate low-power state.</div><div class='del'>-</div><div class='del'>-	The majority of subsystems and device drivers need not implement this</div><div class='del'>-	callback.  However, bus types allowing devices to share interrupt</div><div class='del'>-	vectors, like PCI, generally need it; otherwise a driver might encounter</div><div class='del'>-	an error during the suspend phase by fielding a shared interrupt</div><div class='del'>-	generated by some other device after its own device had been set to low</div><div class='del'>-	power.</div><div class='del'>-</div><div class='del'>-At the end of these phases, drivers should have stopped all I/O transactions</div><div class='del'>-(DMA, IRQs), saved enough state that they can re-initialize or restore previous</div><div class='del'>-state (as needed by the hardware), and placed the device into a low-power state.</div><div class='del'>-On many platforms they will gate off one or more clock sources; sometimes they</div><div class='del'>-will also switch off power supplies or reduce voltages.  (Drivers supporting</div><div class='del'>-runtime PM may already have performed some or all of these steps.)</div><div class='del'>-</div><div class='del'>-If device_may_wakeup(dev) returns true, the device should be prepared for</div><div class='del'>-generating hardware wakeup signals to trigger a system wakeup event when the</div><div class='del'>-system is in the sleep state.  For example, enable_irq_wake() might identify</div><div class='del'>-GPIO signals hooked up to a switch or other external hardware, and</div><div class='del'>-pci_enable_wake() does something similar for the PCI PME signal.</div><div class='del'>-</div><div class='del'>-If any of these callbacks returns an error, the system won't enter the desired</div><div class='del'>-low-power state.  Instead the PM core will unwind its actions by resuming all</div><div class='del'>-the devices that were suspended.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Leaving System Suspend</div><div class='del'>-----------------------</div><div class='del'>-When resuming from freeze, standby or memory sleep, the phases are:</div><div class='del'>-</div><div class='del'>-		resume_noirq, resume_early, resume, complete.</div><div class='del'>-</div><div class='del'>-    1.	The resume_noirq callback methods should perform any actions needed</div><div class='del'>-	before the driver's interrupt handlers are invoked.  This generally</div><div class='del'>-	means undoing the actions of the suspend_noirq phase.  If the bus type</div><div class='del'>-	permits devices to share interrupt vectors, like PCI, the method should</div><div class='del'>-	bring the device and its driver into a state in which the driver can</div><div class='del'>-	recognize if the device is the source of incoming interrupts, if any,</div><div class='del'>-	and handle them correctly.</div><div class='del'>-</div><div class='del'>-	For example, the PCI bus type's -&gt;pm.resume_noirq() puts the device into</div><div class='del'>-	the full-power state (D0 in the PCI terminology) and restores the</div><div class='del'>-	standard configuration registers of the device.  Then it calls the</div><div class='del'>-	device driver's -&gt;pm.resume_noirq() method to perform device-specific</div><div class='del'>-	actions.</div><div class='del'>-</div><div class='del'>-    2.	The resume_early methods should prepare devices for the execution of</div><div class='del'>-	the resume methods.  This generally involves undoing the actions of the</div><div class='del'>-	preceding suspend_late phase.</div><div class='del'>-</div><div class='del'>-    3	The resume methods should bring the device back to its operating</div><div class='del'>-	state, so that it can perform normal I/O.  This generally involves</div><div class='del'>-	undoing the actions of the suspend phase.</div><div class='del'>-</div><div class='del'>-    4.	The complete phase should undo the actions of the prepare phase.  Note,</div><div class='del'>-	however, that new children may be registered below the device as soon as</div><div class='del'>-	the resume callbacks occur; it's not necessary to wait until the</div><div class='del'>-	complete phase.</div><div class='del'>-</div><div class='del'>-	Moreover, if the preceding prepare callback returned a positive number,</div><div class='del'>-	the device may have been left in runtime suspend throughout the whole</div><div class='del'>-	system suspend and resume (the suspend, suspend_late, suspend_noirq</div><div class='del'>-	phases of system suspend and the resume_noirq, resume_early, resume</div><div class='del'>-	phases of system resume may have been skipped for it).  In that case,</div><div class='del'>-	the complete callback is entirely responsible for bringing the device</div><div class='del'>-	back to the functional state after system suspend if necessary.  [For</div><div class='del'>-	example, it may need to queue up a runtime resume request for the device</div><div class='del'>-	for this purpose.]  To check if that is the case, the complete callback</div><div class='del'>-	can consult the device's power.direct_complete flag.  Namely, if that</div><div class='del'>-	flag is set when the complete callback is being run, it has been called</div><div class='del'>-	directly after the preceding prepare and special action may be required</div><div class='del'>-	to make the device work correctly afterward.</div><div class='del'>-</div><div class='del'>-At the end of these phases, drivers should be as functional as they were before</div><div class='del'>-suspending: I/O can be performed using DMA and IRQs, and the relevant clocks are</div><div class='del'>-gated on.</div><div class='del'>-</div><div class='del'>-However, the details here may again be platform-specific.  For example,</div><div class='del'>-some systems support multiple "run" states, and the mode in effect at</div><div class='del'>-the end of resume might not be the one which preceded suspension.</div><div class='del'>-That means availability of certain clocks or power supplies changed,</div><div class='del'>-which could easily affect how a driver works.</div><div class='del'>-</div><div class='del'>-Drivers need to be able to handle hardware which has been reset since the</div><div class='del'>-suspend methods were called, for example by complete reinitialization.</div><div class='del'>-This may be the hardest part, and the one most protected by NDA'd documents</div><div class='del'>-and chip errata.  It's simplest if the hardware state hasn't changed since</div><div class='del'>-the suspend was carried out, but that can't be guaranteed (in fact, it usually</div><div class='del'>-is not the case).</div><div class='del'>-</div><div class='del'>-Drivers must also be prepared to notice that the device has been removed</div><div class='del'>-while the system was powered down, whenever that's physically possible.</div><div class='del'>-PCMCIA, MMC, USB, Firewire, SCSI, and even IDE are common examples of busses</div><div class='del'>-where common Linux platforms will see such removal.  Details of how drivers</div><div class='del'>-will notice and handle such removals are currently bus-specific, and often</div><div class='del'>-involve a separate thread.</div><div class='del'>-</div><div class='del'>-These callbacks may return an error value, but the PM core will ignore such</div><div class='del'>-errors since there's nothing it can do about them other than printing them in</div><div class='del'>-the system log.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Entering Hibernation</div><div class='del'>---------------------</div><div class='del'>-Hibernating the system is more complicated than putting it into the other</div><div class='del'>-sleep states, because it involves creating and saving a system image.</div><div class='del'>-Therefore there are more phases for hibernation, with a different set of</div><div class='del'>-callbacks.  These phases always run after tasks have been frozen and memory has</div><div class='del'>-been freed.</div><div class='del'>-</div><div class='del'>-The general procedure for hibernation is to quiesce all devices (freeze), create</div><div class='del'>-an image of the system memory while everything is stable, reactivate all</div><div class='del'>-devices (thaw), write the image to permanent storage, and finally shut down the</div><div class='del'>-system (poweroff).  The phases used to accomplish this are:</div><div class='del'>-</div><div class='del'>-	prepare, freeze, freeze_late, freeze_noirq, thaw_noirq, thaw_early,</div><div class='del'>-	thaw, complete, prepare, poweroff, poweroff_late, poweroff_noirq</div><div class='del'>-</div><div class='del'>-    1.	The prepare phase is discussed in the "Entering System Suspend" section</div><div class='del'>-	above.</div><div class='del'>-</div><div class='del'>-    2.	The freeze methods should quiesce the device so that it doesn't generate</div><div class='del'>-	IRQs or DMA, and they may need to save the values of device registers.</div><div class='del'>-	However the device does not have to be put in a low-power state, and to</div><div class='del'>-	save time it's best not to do so.  Also, the device should not be</div><div class='del'>-	prepared to generate wakeup events.</div><div class='del'>-</div><div class='del'>-    3.	The freeze_late phase is analogous to the suspend_late phase described</div><div class='del'>-	above, except that the device should not be put in a low-power state and</div><div class='del'>-	should not be allowed to generate wakeup events by it.</div><div class='del'>-</div><div class='del'>-    4.	The freeze_noirq phase is analogous to the suspend_noirq phase discussed</div><div class='del'>-	above, except again that the device should not be put in a low-power</div><div class='del'>-	state and should not be allowed to generate wakeup events.</div><div class='del'>-</div><div class='del'>-At this point the system image is created.  All devices should be inactive and</div><div class='del'>-the contents of memory should remain undisturbed while this happens, so that the</div><div class='del'>-image forms an atomic snapshot of the system state.</div><div class='del'>-</div><div class='del'>-    5.	The thaw_noirq phase is analogous to the resume_noirq phase discussed</div><div class='del'>-	above.  The main difference is that its methods can assume the device is</div><div class='del'>-	in the same state as at the end of the freeze_noirq phase.</div><div class='del'>-</div><div class='del'>-    6.	The thaw_early phase is analogous to the resume_early phase described</div><div class='del'>-	above.  Its methods should undo the actions of the preceding</div><div class='del'>-	freeze_late, if necessary.</div><div class='del'>-</div><div class='del'>-    7.	The thaw phase is analogous to the resume phase discussed above.  Its</div><div class='del'>-	methods should bring the device back to an operating state, so that it</div><div class='del'>-	can be used for saving the image if necessary.</div><div class='del'>-</div><div class='del'>-    8.	The complete phase is discussed in the "Leaving System Suspend" section</div><div class='del'>-	above.</div><div class='del'>-</div><div class='del'>-At this point the system image is saved, and the devices then need to be</div><div class='del'>-prepared for the upcoming system shutdown.  This is much like suspending them</div><div class='del'>-before putting the system into the freeze, standby or memory sleep state,</div><div class='del'>-and the phases are similar.</div><div class='del'>-</div><div class='del'>-    9.	The prepare phase is discussed above.</div><div class='del'>-</div><div class='del'>-    10.	The poweroff phase is analogous to the suspend phase.</div><div class='del'>-</div><div class='del'>-    11.	The poweroff_late phase is analogous to the suspend_late phase.</div><div class='del'>-</div><div class='del'>-    12.	The poweroff_noirq phase is analogous to the suspend_noirq phase.</div><div class='del'>-</div><div class='del'>-The poweroff, poweroff_late and poweroff_noirq callbacks should do essentially</div><div class='del'>-the same things as the suspend, suspend_late and suspend_noirq callbacks,</div><div class='del'>-respectively.  The only notable difference is that they need not store the</div><div class='del'>-device register values, because the registers should already have been stored</div><div class='del'>-during the freeze, freeze_late or freeze_noirq phases.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Leaving Hibernation</div><div class='del'>--------------------</div><div class='del'>-Resuming from hibernation is, again, more complicated than resuming from a sleep</div><div class='del'>-state in which the contents of main memory are preserved, because it requires</div><div class='del'>-a system image to be loaded into memory and the pre-hibernation memory contents</div><div class='del'>-to be restored before control can be passed back to the image kernel.</div><div class='del'>-</div><div class='del'>-Although in principle, the image might be loaded into memory and the</div><div class='del'>-pre-hibernation memory contents restored by the boot loader, in practice this</div><div class='del'>-can't be done because boot loaders aren't smart enough and there is no</div><div class='del'>-established protocol for passing the necessary information.  So instead, the</div><div class='del'>-boot loader loads a fresh instance of the kernel, called the boot kernel, into</div><div class='del'>-memory and passes control to it in the usual way.  Then the boot kernel reads</div><div class='del'>-the system image, restores the pre-hibernation memory contents, and passes</div><div class='del'>-control to the image kernel.  Thus two different kernels are involved in</div><div class='del'>-resuming from hibernation.  In fact, the boot kernel may be completely different</div><div class='del'>-from the image kernel: a different configuration and even a different version.</div><div class='del'>-This has important consequences for device drivers and their subsystems.</div><div class='del'>-</div><div class='del'>-To be able to load the system image into memory, the boot kernel needs to</div><div class='del'>-include at least a subset of device drivers allowing it to access the storage</div><div class='del'>-medium containing the image, although it doesn't need to include all of the</div><div class='del'>-drivers present in the image kernel.  After the image has been loaded, the</div><div class='del'>-devices managed by the boot kernel need to be prepared for passing control back</div><div class='del'>-to the image kernel.  This is very similar to the initial steps involved in</div><div class='del'>-creating a system image, and it is accomplished in the same way, using prepare,</div><div class='del'>-freeze, and freeze_noirq phases.  However the devices affected by these phases</div><div class='del'>-are only those having drivers in the boot kernel; other devices will still be in</div><div class='del'>-whatever state the boot loader left them.</div><div class='del'>-</div><div class='del'>-Should the restoration of the pre-hibernation memory contents fail, the boot</div><div class='del'>-kernel would go through the "thawing" procedure described above, using the</div><div class='del'>-thaw_noirq, thaw, and complete phases, and then continue running normally.  This</div><div class='del'>-happens only rarely.  Most often the pre-hibernation memory contents are</div><div class='del'>-restored successfully and control is passed to the image kernel, which then</div><div class='del'>-becomes responsible for bringing the system back to the working state.</div><div class='del'>-</div><div class='del'>-To achieve this, the image kernel must restore the devices' pre-hibernation</div><div class='del'>-functionality.  The operation is much like waking up from the memory sleep</div><div class='del'>-state, although it involves different phases:</div><div class='del'>-</div><div class='del'>-	restore_noirq, restore_early, restore, complete</div><div class='del'>-</div><div class='del'>-    1.	The restore_noirq phase is analogous to the resume_noirq phase.</div><div class='del'>-</div><div class='del'>-    2.	The restore_early phase is analogous to the resume_early phase.</div><div class='del'>-</div><div class='del'>-    3.	The restore phase is analogous to the resume phase.</div><div class='del'>-</div><div class='del'>-    4.	The complete phase is discussed above.</div><div class='del'>-</div><div class='del'>-The main difference from resume[_early|_noirq] is that restore[_early|_noirq]</div><div class='del'>-must assume the device has been accessed and reconfigured by the boot loader or</div><div class='del'>-the boot kernel.  Consequently the state of the device may be different from the</div><div class='del'>-state remembered from the freeze, freeze_late and freeze_noirq phases.  The</div><div class='del'>-device may even need to be reset and completely re-initialized.  In many cases</div><div class='del'>-this difference doesn't matter, so the resume[_early|_noirq] and</div><div class='del'>-restore[_early|_norq] method pointers can be set to the same routines.</div><div class='del'>-Nevertheless, different callback pointers are used in case there is a situation</div><div class='del'>-where it actually does matter.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Device Power Management Domains</div><div class='del'>--------------------------------</div><div class='del'>-Sometimes devices share reference clocks or other power resources.  In those</div><div class='del'>-cases it generally is not possible to put devices into low-power states</div><div class='del'>-individually.  Instead, a set of devices sharing a power resource can be put</div><div class='del'>-into a low-power state together at the same time by turning off the shared</div><div class='del'>-power resource.  Of course, they also need to be put into the full-power state</div><div class='del'>-together, by turning the shared power resource on.  A set of devices with this</div><div class='del'>-property is often referred to as a power domain.</div><div class='del'>-</div><div class='del'>-Support for power domains is provided through the pm_domain field of struct</div><div class='del'>-device.  This field is a pointer to an object of type struct dev_pm_domain,</div><div class='del'>-defined in include/linux/pm.h, providing a set of power management callbacks</div><div class='del'>-analogous to the subsystem-level and device driver callbacks that are executed</div><div class='del'>-for the given device during all power transitions, instead of the respective</div><div class='del'>-subsystem-level callbacks.  Specifically, if a device's pm_domain pointer is</div><div class='del'>-not NULL, the -&gt;suspend() callback from the object pointed to by it will be</div><div class='del'>-executed instead of its subsystem's (e.g. bus type's) -&gt;suspend() callback and</div><div class='del'>-analogously for all of the remaining callbacks.  In other words, power</div><div class='del'>-management domain callbacks, if defined for the given device, always take</div><div class='del'>-precedence over the callbacks provided by the device's subsystem (e.g. bus</div><div class='del'>-type).</div><div class='del'>-</div><div class='del'>-The support for device power management domains is only relevant to platforms</div><div class='del'>-needing to use the same device driver power management callbacks in many</div><div class='del'>-different power domain configurations and wanting to avoid incorporating the</div><div class='del'>-support for power domains into subsystem-level callbacks, for example by</div><div class='del'>-modifying the platform bus type.  Other platforms need not implement it or take</div><div class='del'>-it into account in any way.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Device Low Power (suspend) States</div><div class='del'>----------------------------------</div><div class='del'>-Device low-power states aren't standard.  One device might only handle</div><div class='del'>-"on" and "off", while another might support a dozen different versions of</div><div class='del'>-"on" (how many engines are active?), plus a state that gets back to "on"</div><div class='del'>-faster than from a full "off".</div><div class='del'>-</div><div class='del'>-Some busses define rules about what different suspend states mean.  PCI</div><div class='del'>-gives one example:  after the suspend sequence completes, a non-legacy</div><div class='del'>-PCI device may not perform DMA or issue IRQs, and any wakeup events it</div><div class='del'>-issues would be issued through the PME# bus signal.  Plus, there are</div><div class='del'>-several PCI-standard device states, some of which are optional.</div><div class='del'>-</div><div class='del'>-In contrast, integrated system-on-chip processors often use IRQs as the</div><div class='del'>-wakeup event sources (so drivers would call enable_irq_wake) and might</div><div class='del'>-be able to treat DMA completion as a wakeup event (sometimes DMA can stay</div><div class='del'>-active too, it'd only be the CPU and some peripherals that sleep).</div><div class='del'>-</div><div class='del'>-Some details here may be platform-specific.  Systems may have devices that</div><div class='del'>-can be fully active in certain sleep states, such as an LCD display that's</div><div class='del'>-refreshed using DMA while most of the system is sleeping lightly ... and</div><div class='del'>-its frame buffer might even be updated by a DSP or other non-Linux CPU while</div><div class='del'>-the Linux control processor stays idle.</div><div class='del'>-</div><div class='del'>-Moreover, the specific actions taken may depend on the target system state.</div><div class='del'>-One target system state might allow a given device to be very operational;</div><div class='del'>-another might require a hard shut down with re-initialization on resume.</div><div class='del'>-And two different target systems might use the same device in different</div><div class='del'>-ways; the aforementioned LCD might be active in one product's "standby",</div><div class='del'>-but a different product using the same SOC might work differently.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Power Management Notifiers</div><div class='del'>---------------------------</div><div class='del'>-There are some operations that cannot be carried out by the power management</div><div class='del'>-callbacks discussed above, because the callbacks occur too late or too early.</div><div class='del'>-To handle these cases, subsystems and device drivers may register power</div><div class='del'>-management notifiers that are called before tasks are frozen and after they have</div><div class='del'>-been thawed.  Generally speaking, the PM notifiers are suitable for performing</div><div class='del'>-actions that either require user space to be available, or at least won't</div><div class='del'>-interfere with user space.</div><div class='del'>-</div><div class='del'>-For details refer to Documentation/power/notifiers.txt.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Runtime Power Management</div><div class='del'>-========================</div><div class='del'>-Many devices are able to dynamically power down while the system is still</div><div class='del'>-running. This feature is useful for devices that are not being used, and</div><div class='del'>-can offer significant power savings on a running system.  These devices</div><div class='del'>-often support a range of runtime power states, which might use names such</div><div class='del'>-as "off", "sleep", "idle", "active", and so on.  Those states will in some</div><div class='del'>-cases (like PCI) be partially constrained by the bus the device uses, and will</div><div class='del'>-usually include hardware states that are also used in system sleep states.</div><div class='del'>-</div><div class='del'>-A system-wide power transition can be started while some devices are in low</div><div class='del'>-power states due to runtime power management.  The system sleep PM callbacks</div><div class='del'>-should recognize such situations and react to them appropriately, but the</div><div class='del'>-necessary actions are subsystem-specific.</div><div class='del'>-</div><div class='del'>-In some cases the decision may be made at the subsystem level while in other</div><div class='del'>-cases the device driver may be left to decide.  In some cases it may be</div><div class='del'>-desirable to leave a suspended device in that state during a system-wide power</div><div class='del'>-transition, but in other cases the device must be put back into the full-power</div><div class='del'>-state temporarily, for example so that its system wakeup capability can be</div><div class='del'>-disabled.  This all depends on the hardware and the design of the subsystem and</div><div class='del'>-device driver in question.</div><div class='del'>-</div><div class='del'>-During system-wide resume from a sleep state it's easiest to put devices into</div><div class='del'>-the full-power state, as explained in Documentation/power/runtime_pm.txt.  Refer</div><div class='del'>-to that document for more information regarding this particular issue as well as</div><div class='del'>-for information on the device runtime power management framework in general.</div><div class='head'>diff --git a/Documentation/power/freezing-of-tasks.txt b/Documentation/power/freezing-of-tasks.txt<br/>index 85894d83b352..af005770e767 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/power/freezing-of-tasks.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/power/freezing-of-tasks.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/power/freezing-of-tasks.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/freezing-of-tasks.txt</a></div><div class='hunk'>@@ -197,7 +197,8 @@ tasks, since it generally exists anyway.</div><div class='ctx'> </div><div class='ctx'> A driver must have all firmwares it may need in RAM before suspend() is called.</div><div class='ctx'> If keeping them is not practical, for example due to their size, they must be</div><div class='del'>-requested early enough using the suspend notifier API described in notifiers.txt.</div><div class='add'>+requested early enough using the suspend notifier API described in</div><div class='add'>+Documentation/driver-api/pm/notifiers.rst.</div><div class='ctx'> </div><div class='ctx'> VI. Are there any precautions to be taken to prevent freezing failures?</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/power/notifiers.txt b/Documentation/power/notifiers.txt<br/>deleted file mode 100644<br/>index a81fa254303d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/power/notifiers.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/power/notifiers.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-Suspend notifiers</div><div class='del'>-	(C) 2007-2011 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, GPL</div><div class='del'>-</div><div class='del'>-There are some operations that subsystems or drivers may want to carry out</div><div class='del'>-before hibernation/suspend or after restore/resume, but they require the system</div><div class='del'>-to be fully functional, so the drivers' and subsystems' .suspend() and .resume()</div><div class='del'>-or even .prepare() and .complete() callbacks are not suitable for this purpose.</div><div class='del'>-For example, device drivers may want to upload firmware to their devices after</div><div class='del'>-resume/restore, but they cannot do it by calling request_firmware() from their</div><div class='del'>-.resume() or .complete() routines (user land processes are frozen at these</div><div class='del'>-points).  The solution may be to load the firmware into memory before processes</div><div class='del'>-are frozen and upload it from there in the .resume() routine.</div><div class='del'>-A suspend/hibernation notifier may be used for this purpose.</div><div class='del'>-</div><div class='del'>-The subsystems or drivers having such needs can register suspend notifiers that</div><div class='del'>-will be called upon the following events by the PM core:</div><div class='del'>-</div><div class='del'>-PM_HIBERNATION_PREPARE	The system is going to hibernate, tasks will be frozen</div><div class='del'>-			immediately. This is different from PM_SUSPEND_PREPARE</div><div class='del'>-			below because here we do additional work between notifiers</div><div class='del'>-			and drivers freezing.</div><div class='del'>-</div><div class='del'>-PM_POST_HIBERNATION	The system memory state has been restored from a</div><div class='del'>-			hibernation image or an error occurred during</div><div class='del'>-			hibernation.  Device drivers' restore callbacks have</div><div class='del'>-			been executed and tasks have been thawed.</div><div class='del'>-</div><div class='del'>-PM_RESTORE_PREPARE	The system is going to restore a hibernation image.</div><div class='del'>-			If all goes well, the restored kernel will issue a</div><div class='del'>-			PM_POST_HIBERNATION notification.</div><div class='del'>-</div><div class='del'>-PM_POST_RESTORE		An error occurred during restore from hibernation.</div><div class='del'>-			Device drivers' restore callbacks have been executed</div><div class='del'>-			and tasks have been thawed.</div><div class='del'>-</div><div class='del'>-PM_SUSPEND_PREPARE	The system is preparing for suspend.</div><div class='del'>-</div><div class='del'>-PM_POST_SUSPEND		The system has just resumed or an error occurred during</div><div class='del'>-			suspend.  Device drivers' resume callbacks have been</div><div class='del'>-			executed and tasks have been thawed.</div><div class='del'>-</div><div class='del'>-It is generally assumed that whatever the notifiers do for</div><div class='del'>-PM_HIBERNATION_PREPARE, should be undone for PM_POST_HIBERNATION.  Analogously,</div><div class='del'>-operations performed for PM_SUSPEND_PREPARE should be reversed for</div><div class='del'>-PM_POST_SUSPEND.  Additionally, all of the notifiers are called for</div><div class='del'>-PM_POST_HIBERNATION if one of them fails for PM_HIBERNATION_PREPARE, and</div><div class='del'>-all of the notifiers are called for PM_POST_SUSPEND if one of them fails for</div><div class='del'>-PM_SUSPEND_PREPARE.</div><div class='del'>-</div><div class='del'>-The hibernation and suspend notifiers are called with pm_mutex held.  They are</div><div class='del'>-defined in the usual way, but their last argument is meaningless (it is always</div><div class='del'>-NULL).  To register and/or unregister a suspend notifier use the functions</div><div class='del'>-register_pm_notifier() and unregister_pm_notifier(), respectively, defined in</div><div class='del'>-include/linux/suspend.h .  If you don't need to unregister the notifier, you can</div><div class='del'>-also use the pm_notifier() macro defined in include/linux/suspend.h .</div><div class='head'>diff --git a/Documentation/power/opp.txt b/Documentation/power/opp.txt<br/>index c6279c2be47c..0c007e250cd1 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/power/opp.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/power/opp.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/power/opp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/opp.txt</a></div><div class='hunk'>@@ -79,22 +79,6 @@ dependent subsystems such as cpufreq are left to the discretion of the SoC</div><div class='ctx'> specific framework which uses the OPP library. Similar care needs to be taken</div><div class='ctx'> care to refresh the cpufreq table in cases of these operations.</div><div class='ctx'> </div><div class='del'>-WARNING on OPP List locking mechanism:</div><div class='del'>--------------------------------------------------</div><div class='del'>-OPP library uses RCU for exclusivity. RCU allows the query functions to operate</div><div class='del'>-in multiple contexts and this synchronization mechanism is optimal for a read</div><div class='del'>-intensive operations on data structure as the OPP library caters to.</div><div class='del'>-</div><div class='del'>-To ensure that the data retrieved are sane, the users such as SoC framework</div><div class='del'>-should ensure that the section of code operating on OPP queries are locked</div><div class='del'>-using RCU read locks. The opp_find_freq_{exact,ceil,floor},</div><div class='del'>-opp_get_{voltage, freq, opp_count} fall into this category.</div><div class='del'>-</div><div class='del'>-opp_{add,enable,disable} are updaters which use mutex and implement it's own</div><div class='del'>-RCU locking mechanisms. These functions should *NOT* be called under RCU locks</div><div class='del'>-and other contexts that prevent blocking functions in RCU or mutex operations</div><div class='del'>-from working.</div><div class='del'>-</div><div class='ctx'> 2. Initial OPP List Registration</div><div class='ctx'> ================================</div><div class='ctx'> The SoC implementation calls dev_pm_opp_add function iteratively to add OPPs per</div><div class='hunk'>@@ -137,15 +121,18 @@ functions return the matching pointer representing the opp if a match is</div><div class='ctx'> found, else returns error. These errors are expected to be handled by standard</div><div class='ctx'> error checks such as IS_ERR() and appropriate actions taken by the caller.</div><div class='ctx'> </div><div class='add'>+Callers of these functions shall call dev_pm_opp_put() after they have used the</div><div class='add'>+OPP. Otherwise the memory for the OPP will never get freed and result in</div><div class='add'>+memleak.</div><div class='add'>+</div><div class='ctx'> dev_pm_opp_find_freq_exact - Search for an OPP based on an *exact* frequency and</div><div class='ctx'> 	availability. This function is especially useful to enable an OPP which</div><div class='ctx'> 	is not available by default.</div><div class='ctx'> 	Example: In a case when SoC framework detects a situation where a</div><div class='ctx'> 	higher frequency could be made available, it can use this function to</div><div class='ctx'> 	find the OPP prior to call the dev_pm_opp_enable to actually make it available.</div><div class='del'>-	 rcu_read_lock();</div><div class='ctx'> 	 opp = dev_pm_opp_find_freq_exact(dev, 1000000000, false);</div><div class='del'>-	 rcu_read_unlock();</div><div class='add'>+	 dev_pm_opp_put(opp);</div><div class='ctx'> 	 /* dont operate on the pointer.. just do a sanity check.. */</div><div class='ctx'> 	 if (IS_ERR(opp)) {</div><div class='ctx'> 		pr_err("frequency not disabled!\n");</div><div class='hunk'>@@ -163,9 +150,8 @@ dev_pm_opp_find_freq_floor - Search for an available OPP which is *at most* the</div><div class='ctx'> 	frequency.</div><div class='ctx'> 	Example: To find the highest opp for a device:</div><div class='ctx'> 	 freq = ULONG_MAX;</div><div class='del'>-	 rcu_read_lock();</div><div class='del'>-	 dev_pm_opp_find_freq_floor(dev, &amp;freq);</div><div class='del'>-	 rcu_read_unlock();</div><div class='add'>+	 opp = dev_pm_opp_find_freq_floor(dev, &amp;freq);</div><div class='add'>+	 dev_pm_opp_put(opp);</div><div class='ctx'> </div><div class='ctx'> dev_pm_opp_find_freq_ceil - Search for an available OPP which is *at least* the</div><div class='ctx'> 	provided frequency. This function is useful while searching for a</div><div class='hunk'>@@ -173,17 +159,15 @@ dev_pm_opp_find_freq_ceil - Search for an available OPP which is *at least* the</div><div class='ctx'> 	frequency.</div><div class='ctx'> 	Example 1: To find the lowest opp for a device:</div><div class='ctx'> 	 freq = 0;</div><div class='del'>-	 rcu_read_lock();</div><div class='del'>-	 dev_pm_opp_find_freq_ceil(dev, &amp;freq);</div><div class='del'>-	 rcu_read_unlock();</div><div class='add'>+	 opp = dev_pm_opp_find_freq_ceil(dev, &amp;freq);</div><div class='add'>+	 dev_pm_opp_put(opp);</div><div class='ctx'> 	Example 2: A simplified implementation of a SoC cpufreq_driver-&gt;target:</div><div class='ctx'> 	 soc_cpufreq_target(..)</div><div class='ctx'> 	 {</div><div class='ctx'> 		/* Do stuff like policy checks etc. */</div><div class='ctx'> 		/* Find the best frequency match for the req */</div><div class='del'>-		rcu_read_lock();</div><div class='ctx'> 		opp = dev_pm_opp_find_freq_ceil(dev, &amp;freq);</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+		dev_pm_opp_put(opp);</div><div class='ctx'> 		if (!IS_ERR(opp))</div><div class='ctx'> 			soc_switch_to_freq_voltage(freq);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -208,9 +192,8 @@ dev_pm_opp_enable - Make a OPP available for operation.</div><div class='ctx'> 	implementation might choose to do something as follows:</div><div class='ctx'> 	 if (cur_temp &lt; temp_low_thresh) {</div><div class='ctx'> 		/* Enable 1GHz if it was disabled */</div><div class='del'>-		rcu_read_lock();</div><div class='ctx'> 		opp = dev_pm_opp_find_freq_exact(dev, 1000000000, false);</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+		dev_pm_opp_put(opp);</div><div class='ctx'> 		/* just error check */</div><div class='ctx'> 		if (!IS_ERR(opp))</div><div class='ctx'> 			ret = dev_pm_opp_enable(dev, 1000000000);</div><div class='hunk'>@@ -224,9 +207,8 @@ dev_pm_opp_disable - Make an OPP to be not available for operation</div><div class='ctx'> 	choose to do something as follows:</div><div class='ctx'> 	 if (cur_temp &gt; temp_high_thresh) {</div><div class='ctx'> 		/* Disable 1GHz if it was enabled */</div><div class='del'>-		rcu_read_lock();</div><div class='ctx'> 		opp = dev_pm_opp_find_freq_exact(dev, 1000000000, true);</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+		dev_pm_opp_put(opp);</div><div class='ctx'> 		/* just error check */</div><div class='ctx'> 		if (!IS_ERR(opp))</div><div class='ctx'> 			ret = dev_pm_opp_disable(dev, 1000000000);</div><div class='hunk'>@@ -249,10 +231,9 @@ dev_pm_opp_get_voltage - Retrieve the voltage represented by the opp pointer.</div><div class='ctx'> 	 soc_switch_to_freq_voltage(freq)</div><div class='ctx'> 	 {</div><div class='ctx'> 		/* do things */</div><div class='del'>-		rcu_read_lock();</div><div class='ctx'> 		opp = dev_pm_opp_find_freq_ceil(dev, &amp;freq);</div><div class='ctx'> 		v = dev_pm_opp_get_voltage(opp);</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+		dev_pm_opp_put(opp);</div><div class='ctx'> 		if (v)</div><div class='ctx'> 			regulator_set_voltage(.., v);</div><div class='ctx'> 		/* do other things */</div><div class='hunk'>@@ -266,12 +247,12 @@ dev_pm_opp_get_freq - Retrieve the freq represented by the opp pointer.</div><div class='ctx'> 	 {</div><div class='ctx'> 		/* do things.. */</div><div class='ctx'> 		 max_freq = ULONG_MAX;</div><div class='del'>-		 rcu_read_lock();</div><div class='ctx'> 		 max_opp = dev_pm_opp_find_freq_floor(dev,&amp;max_freq);</div><div class='ctx'> 		 requested_opp = dev_pm_opp_find_freq_ceil(dev,&amp;freq);</div><div class='ctx'> 		 if (!IS_ERR(max_opp) &amp;&amp; !IS_ERR(requested_opp))</div><div class='ctx'> 			r = soc_test_validity(max_opp, requested_opp);</div><div class='del'>-		 rcu_read_unlock();</div><div class='add'>+		 dev_pm_opp_put(max_opp);</div><div class='add'>+		 dev_pm_opp_put(requested_opp);</div><div class='ctx'> 		/* do other things */</div><div class='ctx'> 	 }</div><div class='ctx'> 	 soc_test_validity(..)</div><div class='hunk'>@@ -289,7 +270,6 @@ dev_pm_opp_get_opp_count - Retrieve the number of available opps for a device</div><div class='ctx'> 	 soc_notify_coproc_available_frequencies()</div><div class='ctx'> 	 {</div><div class='ctx'> 		/* Do things */</div><div class='del'>-		rcu_read_lock();</div><div class='ctx'> 		num_available = dev_pm_opp_get_opp_count(dev);</div><div class='ctx'> 		speeds = kzalloc(sizeof(u32) * num_available, GFP_KERNEL);</div><div class='ctx'> 		/* populate the table in increasing order */</div><div class='hunk'>@@ -298,8 +278,8 @@ dev_pm_opp_get_opp_count - Retrieve the number of available opps for a device</div><div class='ctx'> 			speeds[i] = freq;</div><div class='ctx'> 			freq++;</div><div class='ctx'> 			i++;</div><div class='add'>+			dev_pm_opp_put(opp);</div><div class='ctx'> 		}</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 		soc_notify_coproc(AVAILABLE_FREQs, speeds, num_available);</div><div class='ctx'> 		/* Do other things */</div><div class='head'>diff --git a/Documentation/power/pci.txt b/Documentation/power/pci.txt<br/>index 44558882aa60..a1b7f7158930 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/power/pci.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/power/pci.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/power/pci.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/pci.txt</a></div><div class='hunk'>@@ -8,7 +8,7 @@ management.  Based on previous work by Patrick Mochel &lt;mochel@transmeta.com&gt;</div><div class='ctx'> </div><div class='ctx'> This document only covers the aspects of power management specific to PCI</div><div class='ctx'> devices.  For general description of the kernel's interfaces related to device</div><div class='del'>-power management refer to Documentation/power/devices.txt and</div><div class='add'>+power management refer to Documentation/power/admin-guide/devices.rst and</div><div class='ctx'> Documentation/power/runtime_pm.txt.</div><div class='ctx'> </div><div class='ctx'> ---------------------------------------------------------------------------</div><div class='hunk'>@@ -417,7 +417,7 @@ pm-&gt;runtime_idle() callback.</div><div class='ctx'> 2.4. System-Wide Power Transitions</div><div class='ctx'> ----------------------------------</div><div class='ctx'> There are a few different types of system-wide power transitions, described in</div><div class='del'>-Documentation/power/devices.txt.  Each of them requires devices to be handled</div><div class='add'>+Documentation/power/admin-guide/devices.rst.  Each of them requires devices to be handled</div><div class='ctx'> in a specific way and the PM core executes subsystem-level power management</div><div class='ctx'> callbacks for this purpose.  They are executed in phases such that each phase</div><div class='ctx'> involves executing the same subsystem-level callback for every device belonging</div><div class='hunk'>@@ -623,7 +623,7 @@ System restore requires a hibernation image to be loaded into memory and the</div><div class='ctx'> pre-hibernation memory contents to be restored before the pre-hibernation system</div><div class='ctx'> activity can be resumed.</div><div class='ctx'> </div><div class='del'>-As described in Documentation/power/devices.txt, the hibernation image is loaded</div><div class='add'>+As described in Documentation/power/admin-guide/devices.rst, the hibernation image is loaded</div><div class='ctx'> into memory by a fresh instance of the kernel, called the boot kernel, which in</div><div class='ctx'> turn is loaded and run by a boot loader in the usual way.  After the boot kernel</div><div class='ctx'> has loaded the image, it needs to replace its own code and data with the code</div><div class='hunk'>@@ -677,7 +677,7 @@ controlling the runtime power management of their devices.</div><div class='ctx'> </div><div class='ctx'> At the time of this writing there are two ways to define power management</div><div class='ctx'> callbacks for a PCI device driver, the recommended one, based on using a</div><div class='del'>-dev_pm_ops structure described in Documentation/power/devices.txt, and the</div><div class='add'>+dev_pm_ops structure described in Documentation/power/admin-guide/devices.rst, and the</div><div class='ctx'> "legacy" one, in which the .suspend(), .suspend_late(), .resume_early(), and</div><div class='ctx'> .resume() callbacks from struct pci_driver are used.  The legacy approach,</div><div class='ctx'> however, doesn't allow one to define runtime power management callbacks and is</div><div class='hunk'>@@ -713,7 +713,7 @@ In addition to that the prepare() callback may carry out some operations</div><div class='ctx'> preparing the device to be suspended, although it should not allocate memory</div><div class='ctx'> (if additional memory is required to suspend the device, it has to be</div><div class='ctx'> preallocated earlier, for example in a suspend/hibernate notifier as described</div><div class='del'>-in Documentation/power/notifiers.txt).</div><div class='add'>+in Documentation/driver-api/pm/notifiers.rst).</div><div class='ctx'> </div><div class='ctx'> 3.1.2. suspend()</div><div class='ctx'> </div><div class='hunk'>@@ -1046,5 +1046,5 @@ PCI Local Bus Specification, Rev. 3.0</div><div class='ctx'> PCI Bus Power Management Interface Specification, Rev. 1.2</div><div class='ctx'> Advanced Configuration and Power Interface (ACPI) Specification, Rev. 3.0b</div><div class='ctx'> PCI Express Base Specification, Rev. 2.0</div><div class='del'>-Documentation/power/devices.txt</div><div class='add'>+Documentation/power/admin-guide/devices.rst</div><div class='ctx'> Documentation/power/runtime_pm.txt</div><div class='head'>diff --git a/Documentation/power/pm_qos_interface.txt b/Documentation/power/pm_qos_interface.txt<br/>index 129f7c0e1483..21d2d48f87a2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/power/pm_qos_interface.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/power/pm_qos_interface.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/power/pm_qos_interface.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/pm_qos_interface.txt</a></div><div class='hunk'>@@ -163,8 +163,7 @@ of flags and remove sysfs attributes pm_qos_no_power_off and pm_qos_remote_wakeu</div><div class='ctx'> under the device's power directory.</div><div class='ctx'> </div><div class='ctx'> Notification mechanisms:</div><div class='del'>-The per-device PM QoS framework has 2 different and distinct notification trees:</div><div class='del'>-a per-device notification tree and a global notification tree.</div><div class='add'>+The per-device PM QoS framework has a per-device notification tree.</div><div class='ctx'> </div><div class='ctx'> int dev_pm_qos_add_notifier(device, notifier):</div><div class='ctx'> Adds a notification callback function for the device.</div><div class='hunk'>@@ -174,16 +173,6 @@ is changed (for resume latency device PM QoS only).</div><div class='ctx'> int dev_pm_qos_remove_notifier(device, notifier):</div><div class='ctx'> Removes the notification callback function for the device.</div><div class='ctx'> </div><div class='del'>-int dev_pm_qos_add_global_notifier(notifier):</div><div class='del'>-Adds a notification callback function in the global notification tree of the</div><div class='del'>-framework.</div><div class='del'>-The callback is called when the aggregated value for any device is changed</div><div class='del'>-(for resume latency device PM QoS only).</div><div class='del'>-</div><div class='del'>-int dev_pm_qos_remove_global_notifier(notifier):</div><div class='del'>-Removes the notification callback function from the global notification tree</div><div class='del'>-of the framework.</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> Active state latency tolerance</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt<br/>index 1fd1fbe9ce95..64546eb9a16a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/power/runtime_pm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/power/runtime_pm.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/power/runtime_pm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/runtime_pm.txt</a></div><div class='hunk'>@@ -100,7 +100,7 @@ knows what to do to handle the device).</div><div class='ctx'>   * If the suspend callback returns an error code different from -EBUSY and</div><div class='ctx'>     -EAGAIN, the PM core regards this as a fatal error and will refuse to run</div><div class='ctx'>     the helper functions described in Section 4 for the device until its status</div><div class='del'>-    is directly set to  either'active', or 'suspended' (the PM core provides</div><div class='add'>+    is directly set to  either 'active', or 'suspended' (the PM core provides</div><div class='ctx'>     special helper functions for this purpose).</div><div class='ctx'> </div><div class='ctx'> In particular, if the driver requires remote wakeup capability (i.e. hardware</div><div class='hunk'>@@ -217,7 +217,7 @@ defined in include/linux/pm.h:</div><div class='ctx'>       one to complete</div><div class='ctx'> </div><div class='ctx'>   spinlock_t lock;</div><div class='del'>-    - lock used for synchronisation</div><div class='add'>+    - lock used for synchronization</div><div class='ctx'> </div><div class='ctx'>   atomic_t usage_count;</div><div class='ctx'>     - the usage counter of the device</div><div class='hunk'>@@ -565,7 +565,7 @@ appropriate to ensure that the device is not put back to sleep during the</div><div class='ctx'> probe. This can happen with systems such as the network device layer.</div><div class='ctx'> </div><div class='ctx'> It may be desirable to suspend the device once -&gt;probe() has finished.</div><div class='del'>-Therefore the driver core uses the asyncronous pm_request_idle() to submit a</div><div class='add'>+Therefore the driver core uses the asynchronous pm_request_idle() to submit a</div><div class='ctx'> request to execute the subsystem-level idle callback for the device at that</div><div class='ctx'> time.  A driver that makes use of the runtime autosuspend feature, may want to</div><div class='ctx'> update the last busy mark before returning from -&gt;probe().</div><div class='hunk'>@@ -674,7 +674,7 @@ left in runtime suspend.  If that happens, the PM core will not execute any</div><div class='ctx'> system suspend and resume callbacks for all of those devices, except for the</div><div class='ctx'> complete callback, which is then entirely responsible for handling the device</div><div class='ctx'> as appropriate.  This only applies to system suspend transitions that are not</div><div class='del'>-related to hibernation (see Documentation/power/devices.txt for more</div><div class='add'>+related to hibernation (see Documentation/power/admin-guide/devices.rst for more</div><div class='ctx'> information).</div><div class='ctx'> </div><div class='ctx'> The PM core does its best to reduce the probability of race conditions between</div><div class='head'>diff --git a/Documentation/power/states.txt b/Documentation/power/states.txt<br/>index 50f3ef9177c1..bc4548245a24 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/power/states.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/power/states.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/power/states.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/states.txt</a></div><div class='hunk'>@@ -8,25 +8,41 @@ for each state.</div><div class='ctx'> </div><div class='ctx'> The states are represented by strings that can be read or written to the</div><div class='ctx'> /sys/power/state file.  Those strings may be "mem", "standby", "freeze" and</div><div class='del'>-"disk", where the last one always represents hibernation (Suspend-To-Disk) and</div><div class='del'>-the meaning of the remaining ones depends on the relative_sleep_states command</div><div class='del'>-line argument.</div><div class='del'>-</div><div class='del'>-For relative_sleep_states=1, the strings "mem", "standby" and "freeze" label the</div><div class='del'>-available non-hibernation sleep states from the deepest to the shallowest,</div><div class='del'>-respectively.  In that case, "mem" is always present in /sys/power/state,</div><div class='del'>-because there is at least one non-hibernation sleep state in every system.  If</div><div class='del'>-the given system supports two non-hibernation sleep states, "standby" is present</div><div class='del'>-in /sys/power/state in addition to "mem".  If the system supports three</div><div class='del'>-non-hibernation sleep states, "freeze" will be present in /sys/power/state in</div><div class='del'>-addition to "mem" and "standby".</div><div class='del'>-</div><div class='del'>-For relative_sleep_states=0, which is the default, the following descriptions</div><div class='del'>-apply.</div><div class='del'>-</div><div class='del'>-state:		Suspend-To-Idle</div><div class='add'>+"disk", where the last three always represent Power-On Suspend (if supported),</div><div class='add'>+Suspend-To-Idle and hibernation (Suspend-To-Disk), respectively.</div><div class='add'>+</div><div class='add'>+The meaning of the "mem" string is controlled by the /sys/power/mem_sleep file.</div><div class='add'>+It contains strings representing the available modes of system suspend that may</div><div class='add'>+be triggered by writing "mem" to /sys/power/state.  These modes are "s2idle"</div><div class='add'>+(Suspend-To-Idle), "shallow" (Power-On Suspend) and "deep" (Suspend-To-RAM).</div><div class='add'>+The "s2idle" mode is always available, while the other ones are only available</div><div class='add'>+if supported by the platform (if not supported, the strings representing them</div><div class='add'>+are not present in /sys/power/mem_sleep).  The string representing the suspend</div><div class='add'>+mode to be used subsequently is enclosed in square brackets.  Writing one of</div><div class='add'>+the other strings present in /sys/power/mem_sleep to it causes the suspend mode</div><div class='add'>+to be used subsequently to change to the one represented by that string.</div><div class='add'>+</div><div class='add'>+Consequently, there are two ways to cause the system to go into the</div><div class='add'>+Suspend-To-Idle sleep state.  The first one is to write "freeze" directly to</div><div class='add'>+/sys/power/state.  The second one is to write "s2idle" to /sys/power/mem_sleep</div><div class='add'>+and then to write "mem" to /sys/power/state.  Similarly, there are two ways</div><div class='add'>+to cause the system to go into the Power-On Suspend sleep state (the strings to</div><div class='add'>+write to the control files in that case are "standby" or "shallow" and "mem",</div><div class='add'>+respectively) if that state is supported by the platform.  In turn, there is</div><div class='add'>+only one way to cause the system to go into the Suspend-To-RAM state (write</div><div class='add'>+"deep" into /sys/power/mem_sleep and "mem" into /sys/power/state).</div><div class='add'>+</div><div class='add'>+The default suspend mode (ie. the one to be used without writing anything into</div><div class='add'>+/sys/power/mem_sleep) is either "deep" (if Suspend-To-RAM is supported) or</div><div class='add'>+"s2idle", but it can be overridden by the value of the "mem_sleep_default"</div><div class='add'>+parameter in the kernel command line.</div><div class='add'>+</div><div class='add'>+The properties of all of the sleep states are described below.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+State:		Suspend-To-Idle</div><div class='ctx'> ACPI state:	S0</div><div class='del'>-Label:		"freeze"</div><div class='add'>+Label:		"s2idle" ("freeze")</div><div class='ctx'> </div><div class='ctx'> This state is a generic, pure software, light-weight, system sleep state.</div><div class='ctx'> It allows more energy to be saved relative to runtime idle by freezing user</div><div class='hunk'>@@ -35,13 +51,13 @@ lower-power than available at run time), such that the processors can</div><div class='ctx'> spend more time in their idle states.</div><div class='ctx'> </div><div class='ctx'> This state can be used for platforms without Power-On Suspend/Suspend-to-RAM</div><div class='del'>-support, or it can be used in addition to Suspend-to-RAM (memory sleep)</div><div class='del'>-to provide reduced resume latency.  It is always supported.</div><div class='add'>+support, or it can be used in addition to Suspend-to-RAM to provide reduced</div><div class='add'>+resume latency.  It is always supported.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> State:		Standby / Power-On Suspend</div><div class='ctx'> ACPI State:	S1</div><div class='del'>-Label:		"standby"</div><div class='add'>+Label:		"shallow" ("standby")</div><div class='ctx'> </div><div class='ctx'> This state, if supported, offers moderate, though real, power savings, while</div><div class='ctx'> providing a relatively low-latency transition back to a working system.  No</div><div class='hunk'>@@ -58,7 +74,7 @@ state.</div><div class='ctx'> </div><div class='ctx'> State:		Suspend-to-RAM</div><div class='ctx'> ACPI State:	S3</div><div class='del'>-Label:		"mem"</div><div class='add'>+Label:		"deep"</div><div class='ctx'> </div><div class='ctx'> This state, if supported, offers significant power savings as everything in the</div><div class='ctx'> system is put into a low-power state, except for memory, which should be placed</div><div class='head'>diff --git a/Documentation/power/swsusp-dmcrypt.txt b/Documentation/power/swsusp-dmcrypt.txt<br/>index 59931b46ff7e..b802fbfd95ef 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/power/swsusp-dmcrypt.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/power/swsusp-dmcrypt.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/power/swsusp-dmcrypt.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/power/swsusp-dmcrypt.txt</a></div><div class='hunk'>@@ -8,7 +8,7 @@ Some prerequisites:</div><div class='ctx'> You know how dm-crypt works. If not, visit the following web page:</div><div class='ctx'> http://www.saout.de/misc/dm-crypt/</div><div class='ctx'> You have read Documentation/power/swsusp.txt and understand it.</div><div class='del'>-You did read Documentation/initrd.txt and know how an initrd works.</div><div class='add'>+You did read Documentation/admin-guide/initrd.rst and know how an initrd works.</div><div class='ctx'> You know how to create or how to modify an initrd.</div><div class='ctx'> </div><div class='ctx'> Now your system is properly set up, your disk is encrypted except for</div><div class='head'>diff --git a/Documentation/pps/pps.txt b/Documentation/pps/pps.txt<br/>index 50022b3c8ebf..1fdbd5447216 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/pps/pps.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/pps/pps.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/pps/pps.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/pps/pps.txt</a></div><div class='hunk'>@@ -63,7 +63,7 @@ for instance) is a PPS source too, and if not they should provide the</div><div class='ctx'> possibility to open another device as PPS source.</div><div class='ctx'> </div><div class='ctx'> In LinuxPPS the PPS sources are simply char devices usually mapped</div><div class='del'>-into files /dev/pps0, /dev/pps1, etc..</div><div class='add'>+into files /dev/pps0, /dev/pps1, etc.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> PPS with USB to serial devices</div><div class='hunk'>@@ -71,9 +71,12 @@ PPS with USB to serial devices</div><div class='ctx'> </div><div class='ctx'> It is possible to grab the PPS from an USB to serial device. However,</div><div class='ctx'> you should take into account the latencies and jitter introduced by</div><div class='del'>-the USB stack. Users has reported clock instability around +-1ms when</div><div class='del'>-synchronized with PPS through USB. This isn't suited for time server</div><div class='del'>-synchronization.</div><div class='add'>+the USB stack. Users have reported clock instability around +-1ms when</div><div class='add'>+synchronized with PPS through USB. With USB 2.0, jitter may decrease</div><div class='add'>+down to the order of 125 microseconds.</div><div class='add'>+</div><div class='add'>+This may be suitable for time server synchronization with NTP because</div><div class='add'>+of its undersampling and algorithms.</div><div class='ctx'> </div><div class='ctx'> If your device doesn't report PPS, you can check that the feature is</div><div class='ctx'> supported by its driver. Most of the time, you only need to add a call</div><div class='hunk'>@@ -166,7 +169,8 @@ Testing the PPS support</div><div class='ctx'> </div><div class='ctx'> In order to test the PPS support even without specific hardware you can use</div><div class='ctx'> the ktimer driver (see the client subsection in the PPS configuration menu)</div><div class='del'>-and the userland tools provided in the Documentation/pps/ directory.</div><div class='add'>+and the userland tools available in your distribution's pps-tools package,</div><div class='add'>+http://linuxpps.org , or https://github.com/ago/pps-tools .</div><div class='ctx'> </div><div class='ctx'> Once you have enabled the compilation of ktimer just modprobe it (if</div><div class='ctx'> not statically compiled):</div><div class='hunk'>@@ -183,8 +187,8 @@ and the run ppstest as follow:</div><div class='ctx'>    source 0 - assert 1186592700.388931295, sequence: 365 - clear  0.000000000, sequence: 0</div><div class='ctx'>    source 0 - assert 1186592701.389032765, sequence: 366 - clear  0.000000000, sequence: 0</div><div class='ctx'> </div><div class='del'>-Please, note that to compile userland programs you need the file timepps.h</div><div class='del'>-(see Documentation/pps/).</div><div class='add'>+Please, note that to compile userland programs you need the file timepps.h .</div><div class='add'>+This is available in the pps-tools repository mentioned above.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Generators</div><div class='head'>diff --git a/Documentation/development-process/1.Intro.rst b/Documentation/process/1.Intro.rst<br/>index 22642b3fe903..e782ae2eef58 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/development-process/1.Intro.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/development-process/1.Intro.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/1.Intro.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/1.Intro.rst</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-Introdution</div><div class='del'>-===========</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='ctx'> </div><div class='ctx'> Executive summary</div><div class='ctx'> -----------------</div><div class='head'>diff --git a/Documentation/development-process/2.Process.rst b/Documentation/process/2.Process.rst<br/>index ce5561bb3f8e..ce5561bb3f8e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/development-process/2.Process.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/development-process/2.Process.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/2.Process.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/2.Process.rst</a></div><div class='head'>diff --git a/Documentation/development-process/3.Early-stage.rst b/Documentation/process/3.Early-stage.rst<br/>index af2c0af931d6..af2c0af931d6 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/development-process/3.Early-stage.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/development-process/3.Early-stage.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/3.Early-stage.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/3.Early-stage.rst</a></div><div class='head'>diff --git a/Documentation/development-process/4.Coding.rst b/Documentation/process/4.Coding.rst<br/>index 9d5cef996f7f..2a728d898fc5 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/development-process/4.Coding.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/development-process/4.Coding.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/4.Coding.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/4.Coding.rst</a></div><div class='hunk'>@@ -22,7 +22,7 @@ Coding style</div><div class='ctx'> ************</div><div class='ctx'> </div><div class='ctx'> The kernel has long had a standard coding style, described in</div><div class='del'>-Documentation/CodingStyle.  For much of that time, the policies described</div><div class='add'>+Documentation/process/coding-style.rst.  For much of that time, the policies described</div><div class='ctx'> in that file were taken as being, at most, advisory.  As a result, there is</div><div class='ctx'> a substantial amount of code in the kernel which does not meet the coding</div><div class='ctx'> style guidelines.  The presence of that code leads to two independent</div><div class='hunk'>@@ -343,7 +343,7 @@ user-space developers to know what they are working with.  See</div><div class='ctx'> Documentation/ABI/README for a description of how this documentation should</div><div class='ctx'> be formatted and what information needs to be provided.</div><div class='ctx'> </div><div class='del'>-The file Documentation/kernel-parameters.txt describes all of the kernel's</div><div class='add'>+The file Documentation/admin-guide/kernel-parameters.rst describes all of the kernel's</div><div class='ctx'> boot-time parameters.  Any patch which adds new parameters should add the</div><div class='ctx'> appropriate entries to this file.</div><div class='ctx'> </div><div class='hunk'>@@ -358,8 +358,8 @@ them, as appropriate, for externally-available functions.  Even in areas</div><div class='ctx'> which have not been so documented, there is no harm in adding kerneldoc</div><div class='ctx'> comments for the future; indeed, this can be a useful activity for</div><div class='ctx'> beginning kernel developers.  The format of these comments, along with some</div><div class='del'>-information on how to create kerneldoc templates can be found in the file</div><div class='del'>-Documentation/kernel-documentation.rst.</div><div class='add'>+information on how to create kerneldoc templates can be found at</div><div class='add'>+:ref:`Documentation/doc-guide/ &lt;doc_guide&gt;`.</div><div class='ctx'> </div><div class='ctx'> Anybody who reads through a significant amount of existing kernel code will</div><div class='ctx'> note that, often, comments are most notable by their absence.  Once again,</div><div class='head'>diff --git a/Documentation/development-process/5.Posting.rst b/Documentation/process/5.Posting.rst<br/>index b511ddf7e82a..1b7728b19ea7 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/development-process/5.Posting.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/development-process/5.Posting.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/5.Posting.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/5.Posting.rst</a></div><div class='hunk'>@@ -9,8 +9,8 @@ kernel.  Unsurprisingly, the kernel development community has evolved a set</div><div class='ctx'> of conventions and procedures which are used in the posting of patches;</div><div class='ctx'> following them will make life much easier for everybody involved.  This</div><div class='ctx'> document will attempt to cover these expectations in reasonable detail;</div><div class='del'>-more information can also be found in the files SubmittingPatches,</div><div class='del'>-SubmittingDrivers, and SubmitChecklist in the kernel documentation</div><div class='add'>+more information can also be found in the files process/submitting-patches.rst,</div><div class='add'>+process/submitting-drivers.rst, and process/submit-checklist.rst in the kernel documentation</div><div class='ctx'> directory.</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -198,7 +198,7 @@ pass it to diff with the "-X" option.</div><div class='ctx'> </div><div class='ctx'> The tags mentioned above are used to describe how various developers have</div><div class='ctx'> been associated with the development of this patch.  They are described in</div><div class='del'>-detail in the SubmittingPatches document; what follows here is a brief</div><div class='add'>+detail in the process/submitting-patches.rst document; what follows here is a brief</div><div class='ctx'> summary.  Each of these lines has the format:</div><div class='ctx'> </div><div class='ctx'> ::</div><div class='hunk'>@@ -210,7 +210,7 @@ The tags in common use are:</div><div class='ctx'>  - Signed-off-by: this is a developer's certification that he or she has</div><div class='ctx'>    the right to submit the patch for inclusion into the kernel.  It is an</div><div class='ctx'>    agreement to the Developer's Certificate of Origin, the full text of</div><div class='del'>-   which can be found in Documentation/SubmittingPatches.  Code without a</div><div class='add'>+   which can be found in Documentation/process/submitting-patches.rst.  Code without a</div><div class='ctx'>    proper signoff cannot be merged into the mainline.</div><div class='ctx'> </div><div class='ctx'>  - Acked-by: indicates an agreement by another developer (often a</div><div class='hunk'>@@ -221,7 +221,7 @@ The tags in common use are:</div><div class='ctx'>    it to work.</div><div class='ctx'> </div><div class='ctx'>  - Reviewed-by: the named developer has reviewed the patch for correctness;</div><div class='del'>-   see the reviewer's statement in Documentation/SubmittingPatches for more</div><div class='add'>+   see the reviewer's statement in Documentation/process/submitting-patches.rst for more</div><div class='ctx'>    detail.</div><div class='ctx'> </div><div class='ctx'>  - Reported-by: names a user who reported a problem which is fixed by this</div><div class='hunk'>@@ -248,7 +248,7 @@ take care of:</div><div class='ctx'>    be examined in any detail.  If there is any doubt at all, mail the patch</div><div class='ctx'>    to yourself and convince yourself that it shows up intact.</div><div class='ctx'> </div><div class='del'>-   Documentation/email-clients.txt has some helpful hints on making</div><div class='add'>+   Documentation/process/email-clients.rst has some helpful hints on making</div><div class='ctx'>    specific mail clients work for sending patches.</div><div class='ctx'> </div><div class='ctx'>  - Are you sure your patch is free of silly mistakes?  You should always</div><div class='head'>diff --git a/Documentation/development-process/6.Followthrough.rst b/Documentation/process/6.Followthrough.rst<br/>index a173cd5f93d2..a173cd5f93d2 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/development-process/6.Followthrough.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/development-process/6.Followthrough.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/6.Followthrough.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/6.Followthrough.rst</a></div><div class='head'>diff --git a/Documentation/development-process/7.AdvancedTopics.rst b/Documentation/process/7.AdvancedTopics.rst<br/>index 81d61c5d62dd..172733cff097 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/development-process/7.AdvancedTopics.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/development-process/7.AdvancedTopics.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/7.AdvancedTopics.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/7.AdvancedTopics.rst</a></div><div class='hunk'>@@ -176,5 +176,3 @@ security issues, duplication of code found elsewhere, adequate</div><div class='ctx'> documentation, adverse effects on performance, user-space ABI changes, etc.</div><div class='ctx'> All types of review, if they lead to better code going into the kernel, are</div><div class='ctx'> welcome and worthwhile.</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/development-process/8.Conclusion.rst b/Documentation/process/8.Conclusion.rst<br/>index 23ec7cbc2d2b..1c7f54cd0261 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/development-process/8.Conclusion.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/development-process/8.Conclusion.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/8.Conclusion.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/8.Conclusion.rst</a></div><div class='hunk'>@@ -5,9 +5,9 @@ For more information</div><div class='ctx'> </div><div class='ctx'> There are numerous sources of information on Linux kernel development and</div><div class='ctx'> related topics.  First among those will always be the Documentation</div><div class='del'>-directory found in the kernel source distribution.  The top-level HOWTO</div><div class='del'>-file is an important starting point; SubmittingPatches and</div><div class='del'>-SubmittingDrivers are also something which all kernel developers should</div><div class='add'>+directory found in the kernel source distribution.  The top-level process/howto.rst</div><div class='add'>+file is an important starting point; process/submitting-patches.rst and</div><div class='add'>+process/submitting-drivers.rst are also something which all kernel developers should</div><div class='ctx'> read.  Many internal kernel APIs are documented using the kerneldoc</div><div class='ctx'> mechanism; "make htmldocs" or "make pdfdocs" can be used to generate those</div><div class='ctx'> documents in HTML or PDF format (though the version of TeX shipped by some</div><div class='head'>diff --git a/Documentation/process/adding-syscalls.rst b/Documentation/process/adding-syscalls.rst<br/>new file mode 100644<br/>index 000000000000..8cc25a06f353<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/adding-syscalls.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/adding-syscalls.rst</a></div><div class='hunk'>@@ -0,0 +1,542 @@</div><div class='add'>+Adding a New System Call</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+This document describes what's involved in adding a new system call to the</div><div class='add'>+Linux kernel, over and above the normal submission advice in</div><div class='add'>+:ref:`Documentation/process/submitting-patches.rst &lt;submittingpatches&gt;`.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+System Call Alternatives</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+The first thing to consider when adding a new system call is whether one of</div><div class='add'>+the alternatives might be suitable instead.  Although system calls are the</div><div class='add'>+most traditional and most obvious interaction points between userspace and the</div><div class='add'>+kernel, there are other possibilities -- choose what fits best for your</div><div class='add'>+interface.</div><div class='add'>+</div><div class='add'>+ - If the operations involved can be made to look like a filesystem-like</div><div class='add'>+   object, it may make more sense to create a new filesystem or device.  This</div><div class='add'>+   also makes it easier to encapsulate the new functionality in a kernel module</div><div class='add'>+   rather than requiring it to be built into the main kernel.</div><div class='add'>+</div><div class='add'>+     - If the new functionality involves operations where the kernel notifies</div><div class='add'>+       userspace that something has happened, then returning a new file</div><div class='add'>+       descriptor for the relevant object allows userspace to use</div><div class='add'>+       ``poll``/``select``/``epoll`` to receive that notification.</div><div class='add'>+     - However, operations that don't map to</div><div class='add'>+       :manpage:`read(2)`/:manpage:`write(2)`-like operations</div><div class='add'>+       have to be implemented as :manpage:`ioctl(2)` requests, which can lead</div><div class='add'>+       to a somewhat opaque API.</div><div class='add'>+</div><div class='add'>+ - If you're just exposing runtime system information, a new node in sysfs</div><div class='add'>+   (see ``Documentation/filesystems/sysfs.txt``) or the ``/proc`` filesystem may</div><div class='add'>+   be more appropriate.  However, access to these mechanisms requires that the</div><div class='add'>+   relevant filesystem is mounted, which might not always be the case (e.g.</div><div class='add'>+   in a namespaced/sandboxed/chrooted environment).  Avoid adding any API to</div><div class='add'>+   debugfs, as this is not considered a 'production' interface to userspace.</div><div class='add'>+ - If the operation is specific to a particular file or file descriptor, then</div><div class='add'>+   an additional :manpage:`fcntl(2)` command option may be more appropriate.  However,</div><div class='add'>+   :manpage:`fcntl(2)` is a multiplexing system call that hides a lot of complexity, so</div><div class='add'>+   this option is best for when the new function is closely analogous to</div><div class='add'>+   existing :manpage:`fcntl(2)` functionality, or the new functionality is very simple</div><div class='add'>+   (for example, getting/setting a simple flag related to a file descriptor).</div><div class='add'>+ - If the operation is specific to a particular task or process, then an</div><div class='add'>+   additional :manpage:`prctl(2)` command option may be more appropriate.  As</div><div class='add'>+   with :manpage:`fcntl(2)`, this system call is a complicated multiplexor so</div><div class='add'>+   is best reserved for near-analogs of existing ``prctl()`` commands or</div><div class='add'>+   getting/setting a simple flag related to a process.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Designing the API: Planning for Extension</div><div class='add'>+-----------------------------------------</div><div class='add'>+</div><div class='add'>+A new system call forms part of the API of the kernel, and has to be supported</div><div class='add'>+indefinitely.  As such, it's a very good idea to explicitly discuss the</div><div class='add'>+interface on the kernel mailing list, and it's important to plan for future</div><div class='add'>+extensions of the interface.</div><div class='add'>+</div><div class='add'>+(The syscall table is littered with historical examples where this wasn't done,</div><div class='add'>+together with the corresponding follow-up system calls --</div><div class='add'>+``eventfd``/``eventfd2``, ``dup2``/``dup3``, ``inotify_init``/``inotify_init1``,</div><div class='add'>+``pipe``/``pipe2``, ``renameat``/``renameat2`` -- so</div><div class='add'>+learn from the history of the kernel and plan for extensions from the start.)</div><div class='add'>+</div><div class='add'>+For simpler system calls that only take a couple of arguments, the preferred</div><div class='add'>+way to allow for future extensibility is to include a flags argument to the</div><div class='add'>+system call.  To make sure that userspace programs can safely use flags</div><div class='add'>+between kernel versions, check whether the flags value holds any unknown</div><div class='add'>+flags, and reject the system call (with ``EINVAL``) if it does::</div><div class='add'>+</div><div class='add'>+    if (flags &amp; ~(THING_FLAG1 | THING_FLAG2 | THING_FLAG3))</div><div class='add'>+        return -EINVAL;</div><div class='add'>+</div><div class='add'>+(If no flags values are used yet, check that the flags argument is zero.)</div><div class='add'>+</div><div class='add'>+For more sophisticated system calls that involve a larger number of arguments,</div><div class='add'>+it's preferred to encapsulate the majority of the arguments into a structure</div><div class='add'>+that is passed in by pointer.  Such a structure can cope with future extension</div><div class='add'>+by including a size argument in the structure::</div><div class='add'>+</div><div class='add'>+    struct xyzzy_params {</div><div class='add'>+        u32 size; /* userspace sets p-&gt;size = sizeof(struct xyzzy_params) */</div><div class='add'>+        u32 param_1;</div><div class='add'>+        u64 param_2;</div><div class='add'>+        u64 param_3;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+As long as any subsequently added field, say ``param_4``, is designed so that a</div><div class='add'>+zero value gives the previous behaviour, then this allows both directions of</div><div class='add'>+version mismatch:</div><div class='add'>+</div><div class='add'>+ - To cope with a later userspace program calling an older kernel, the kernel</div><div class='add'>+   code should check that any memory beyond the size of the structure that it</div><div class='add'>+   expects is zero (effectively checking that ``param_4 == 0``).</div><div class='add'>+ - To cope with an older userspace program calling a newer kernel, the kernel</div><div class='add'>+   code can zero-extend a smaller instance of the structure (effectively</div><div class='add'>+   setting ``param_4 = 0``).</div><div class='add'>+</div><div class='add'>+See :manpage:`perf_event_open(2)` and the ``perf_copy_attr()`` function (in</div><div class='add'>+``kernel/events/core.c``) for an example of this approach.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Designing the API: Other Considerations</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+If your new system call allows userspace to refer to a kernel object, it</div><div class='add'>+should use a file descriptor as the handle for that object -- don't invent a</div><div class='add'>+new type of userspace object handle when the kernel already has mechanisms and</div><div class='add'>+well-defined semantics for using file descriptors.</div><div class='add'>+</div><div class='add'>+If your new :manpage:`xyzzy(2)` system call does return a new file descriptor,</div><div class='add'>+then the flags argument should include a value that is equivalent to setting</div><div class='add'>+``O_CLOEXEC`` on the new FD.  This makes it possible for userspace to close</div><div class='add'>+the timing window between ``xyzzy()`` and calling</div><div class='add'>+``fcntl(fd, F_SETFD, FD_CLOEXEC)``, where an unexpected ``fork()`` and</div><div class='add'>+``execve()`` in another thread could leak a descriptor to</div><div class='add'>+the exec'ed program. (However, resist the temptation to re-use the actual value</div><div class='add'>+of the ``O_CLOEXEC`` constant, as it is architecture-specific and is part of a</div><div class='add'>+numbering space of ``O_*`` flags that is fairly full.)</div><div class='add'>+</div><div class='add'>+If your system call returns a new file descriptor, you should also consider</div><div class='add'>+what it means to use the :manpage:`poll(2)` family of system calls on that file</div><div class='add'>+descriptor. Making a file descriptor ready for reading or writing is the</div><div class='add'>+normal way for the kernel to indicate to userspace that an event has</div><div class='add'>+occurred on the corresponding kernel object.</div><div class='add'>+</div><div class='add'>+If your new :manpage:`xyzzy(2)` system call involves a filename argument::</div><div class='add'>+</div><div class='add'>+    int sys_xyzzy(const char __user *path, ..., unsigned int flags);</div><div class='add'>+</div><div class='add'>+you should also consider whether an :manpage:`xyzzyat(2)` version is more appropriate::</div><div class='add'>+</div><div class='add'>+    int sys_xyzzyat(int dfd, const char __user *path, ..., unsigned int flags);</div><div class='add'>+</div><div class='add'>+This allows more flexibility for how userspace specifies the file in question;</div><div class='add'>+in particular it allows userspace to request the functionality for an</div><div class='add'>+already-opened file descriptor using the ``AT_EMPTY_PATH`` flag, effectively</div><div class='add'>+giving an :manpage:`fxyzzy(3)` operation for free::</div><div class='add'>+</div><div class='add'>+ - xyzzyat(AT_FDCWD, path, ..., 0) is equivalent to xyzzy(path,...)</div><div class='add'>+ - xyzzyat(fd, "", ..., AT_EMPTY_PATH) is equivalent to fxyzzy(fd, ...)</div><div class='add'>+</div><div class='add'>+(For more details on the rationale of the \*at() calls, see the</div><div class='add'>+:manpage:`openat(2)` man page; for an example of AT_EMPTY_PATH, see the</div><div class='add'>+:manpage:`fstatat(2)` man page.)</div><div class='add'>+</div><div class='add'>+If your new :manpage:`xyzzy(2)` system call involves a parameter describing an</div><div class='add'>+offset within a file, make its type ``loff_t`` so that 64-bit offsets can be</div><div class='add'>+supported even on 32-bit architectures.</div><div class='add'>+</div><div class='add'>+If your new :manpage:`xyzzy(2)` system call involves privileged functionality,</div><div class='add'>+it needs to be governed by the appropriate Linux capability bit (checked with</div><div class='add'>+a call to ``capable()``), as described in the :manpage:`capabilities(7)` man</div><div class='add'>+page.  Choose an existing capability bit that governs related functionality,</div><div class='add'>+but try to avoid combining lots of only vaguely related functions together</div><div class='add'>+under the same bit, as this goes against capabilities' purpose of splitting</div><div class='add'>+the power of root.  In particular, avoid adding new uses of the already</div><div class='add'>+overly-general ``CAP_SYS_ADMIN`` capability.</div><div class='add'>+</div><div class='add'>+If your new :manpage:`xyzzy(2)` system call manipulates a process other than</div><div class='add'>+the calling process, it should be restricted (using a call to</div><div class='add'>+``ptrace_may_access()``) so that only a calling process with the same</div><div class='add'>+permissions as the target process, or with the necessary capabilities, can</div><div class='add'>+manipulate the target process.</div><div class='add'>+</div><div class='add'>+Finally, be aware that some non-x86 architectures have an easier time if</div><div class='add'>+system call parameters that are explicitly 64-bit fall on odd-numbered</div><div class='add'>+arguments (i.e. parameter 1, 3, 5), to allow use of contiguous pairs of 32-bit</div><div class='add'>+registers.  (This concern does not apply if the arguments are part of a</div><div class='add'>+structure that's passed in by pointer.)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Proposing the API</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+To make new system calls easy to review, it's best to divide up the patchset</div><div class='add'>+into separate chunks.  These should include at least the following items as</div><div class='add'>+distinct commits (each of which is described further below):</div><div class='add'>+</div><div class='add'>+ - The core implementation of the system call, together with prototypes,</div><div class='add'>+   generic numbering, Kconfig changes and fallback stub implementation.</div><div class='add'>+ - Wiring up of the new system call for one particular architecture, usually</div><div class='add'>+   x86 (including all of x86_64, x86_32 and x32).</div><div class='add'>+ - A demonstration of the use of the new system call in userspace via a</div><div class='add'>+   selftest in ``tools/testing/selftests/``.</div><div class='add'>+ - A draft man-page for the new system call, either as plain text in the</div><div class='add'>+   cover letter, or as a patch to the (separate) man-pages repository.</div><div class='add'>+</div><div class='add'>+New system call proposals, like any change to the kernel's API, should always</div><div class='add'>+be cc'ed to linux-api@vger.kernel.org.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Generic System Call Implementation</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+The main entry point for your new :manpage:`xyzzy(2)` system call will be called</div><div class='add'>+``sys_xyzzy()``, but you add this entry point with the appropriate</div><div class='add'>+``SYSCALL_DEFINEn()`` macro rather than explicitly.  The 'n' indicates the</div><div class='add'>+number of arguments to the system call, and the macro takes the system call name</div><div class='add'>+followed by the (type, name) pairs for the parameters as arguments.  Using</div><div class='add'>+this macro allows metadata about the new system call to be made available for</div><div class='add'>+other tools.</div><div class='add'>+</div><div class='add'>+The new entry point also needs a corresponding function prototype, in</div><div class='add'>+``include/linux/syscalls.h``, marked as asmlinkage to match the way that system</div><div class='add'>+calls are invoked::</div><div class='add'>+</div><div class='add'>+    asmlinkage long sys_xyzzy(...);</div><div class='add'>+</div><div class='add'>+Some architectures (e.g. x86) have their own architecture-specific syscall</div><div class='add'>+tables, but several other architectures share a generic syscall table. Add your</div><div class='add'>+new system call to the generic list by adding an entry to the list in</div><div class='add'>+``include/uapi/asm-generic/unistd.h``::</div><div class='add'>+</div><div class='add'>+    #define __NR_xyzzy 292</div><div class='add'>+    __SYSCALL(__NR_xyzzy, sys_xyzzy)</div><div class='add'>+</div><div class='add'>+Also update the __NR_syscalls count to reflect the additional system call, and</div><div class='add'>+note that if multiple new system calls are added in the same merge window,</div><div class='add'>+your new syscall number may get adjusted to resolve conflicts.</div><div class='add'>+</div><div class='add'>+The file ``kernel/sys_ni.c`` provides a fallback stub implementation of each</div><div class='add'>+system call, returning ``-ENOSYS``.  Add your new system call here too::</div><div class='add'>+</div><div class='add'>+    cond_syscall(sys_xyzzy);</div><div class='add'>+</div><div class='add'>+Your new kernel functionality, and the system call that controls it, should</div><div class='add'>+normally be optional, so add a ``CONFIG`` option (typically to</div><div class='add'>+``init/Kconfig``) for it. As usual for new ``CONFIG`` options:</div><div class='add'>+</div><div class='add'>+ - Include a description of the new functionality and system call controlled</div><div class='add'>+   by the option.</div><div class='add'>+ - Make the option depend on EXPERT if it should be hidden from normal users.</div><div class='add'>+ - Make any new source files implementing the function dependent on the CONFIG</div><div class='add'>+   option in the Makefile (e.g. ``obj-$(CONFIG_XYZZY_SYSCALL) += xyzzy.c``).</div><div class='add'>+ - Double check that the kernel still builds with the new CONFIG option turned</div><div class='add'>+   off.</div><div class='add'>+</div><div class='add'>+To summarize, you need a commit that includes:</div><div class='add'>+</div><div class='add'>+ - ``CONFIG`` option for the new function, normally in ``init/Kconfig``</div><div class='add'>+ - ``SYSCALL_DEFINEn(xyzzy, ...)`` for the entry point</div><div class='add'>+ - corresponding prototype in ``include/linux/syscalls.h``</div><div class='add'>+ - generic table entry in ``include/uapi/asm-generic/unistd.h``</div><div class='add'>+ - fallback stub in ``kernel/sys_ni.c``</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+x86 System Call Implementation</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+To wire up your new system call for x86 platforms, you need to update the</div><div class='add'>+master syscall tables.  Assuming your new system call isn't special in some</div><div class='add'>+way (see below), this involves a "common" entry (for x86_64 and x32) in</div><div class='add'>+arch/x86/entry/syscalls/syscall_64.tbl::</div><div class='add'>+</div><div class='add'>+    333   common   xyzzy     sys_xyzzy</div><div class='add'>+</div><div class='add'>+and an "i386" entry in ``arch/x86/entry/syscalls/syscall_32.tbl``::</div><div class='add'>+</div><div class='add'>+    380   i386     xyzzy     sys_xyzzy</div><div class='add'>+</div><div class='add'>+Again, these numbers are liable to be changed if there are conflicts in the</div><div class='add'>+relevant merge window.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Compatibility System Calls (Generic)</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+For most system calls the same 64-bit implementation can be invoked even when</div><div class='add'>+the userspace program is itself 32-bit; even if the system call's parameters</div><div class='add'>+include an explicit pointer, this is handled transparently.</div><div class='add'>+</div><div class='add'>+However, there are a couple of situations where a compatibility layer is</div><div class='add'>+needed to cope with size differences between 32-bit and 64-bit.</div><div class='add'>+</div><div class='add'>+The first is if the 64-bit kernel also supports 32-bit userspace programs, and</div><div class='add'>+so needs to parse areas of (``__user``) memory that could hold either 32-bit or</div><div class='add'>+64-bit values.  In particular, this is needed whenever a system call argument</div><div class='add'>+is:</div><div class='add'>+</div><div class='add'>+ - a pointer to a pointer</div><div class='add'>+ - a pointer to a struct containing a pointer (e.g. ``struct iovec __user *``)</div><div class='add'>+ - a pointer to a varying sized integral type (``time_t``, ``off_t``,</div><div class='add'>+   ``long``, ...)</div><div class='add'>+ - a pointer to a struct containing a varying sized integral type.</div><div class='add'>+</div><div class='add'>+The second situation that requires a compatibility layer is if one of the</div><div class='add'>+system call's arguments has a type that is explicitly 64-bit even on a 32-bit</div><div class='add'>+architecture, for example ``loff_t`` or ``__u64``.  In this case, a value that</div><div class='add'>+arrives at a 64-bit kernel from a 32-bit application will be split into two</div><div class='add'>+32-bit values, which then need to be re-assembled in the compatibility layer.</div><div class='add'>+</div><div class='add'>+(Note that a system call argument that's a pointer to an explicit 64-bit type</div><div class='add'>+does **not** need a compatibility layer; for example, :manpage:`splice(2)`'s arguments of</div><div class='add'>+type ``loff_t __user *`` do not trigger the need for a ``compat_`` system call.)</div><div class='add'>+</div><div class='add'>+The compatibility version of the system call is called ``compat_sys_xyzzy()``,</div><div class='add'>+and is added with the ``COMPAT_SYSCALL_DEFINEn()`` macro, analogously to</div><div class='add'>+SYSCALL_DEFINEn.  This version of the implementation runs as part of a 64-bit</div><div class='add'>+kernel, but expects to receive 32-bit parameter values and does whatever is</div><div class='add'>+needed to deal with them.  (Typically, the ``compat_sys_`` version converts the</div><div class='add'>+values to 64-bit versions and either calls on to the ``sys_`` version, or both of</div><div class='add'>+them call a common inner implementation function.)</div><div class='add'>+</div><div class='add'>+The compat entry point also needs a corresponding function prototype, in</div><div class='add'>+``include/linux/compat.h``, marked as asmlinkage to match the way that system</div><div class='add'>+calls are invoked::</div><div class='add'>+</div><div class='add'>+    asmlinkage long compat_sys_xyzzy(...);</div><div class='add'>+</div><div class='add'>+If the system call involves a structure that is laid out differently on 32-bit</div><div class='add'>+and 64-bit systems, say ``struct xyzzy_args``, then the include/linux/compat.h</div><div class='add'>+header file should also include a compat version of the structure (``struct</div><div class='add'>+compat_xyzzy_args``) where each variable-size field has the appropriate</div><div class='add'>+``compat_`` type that corresponds to the type in ``struct xyzzy_args``.  The</div><div class='add'>+``compat_sys_xyzzy()`` routine can then use this ``compat_`` structure to</div><div class='add'>+parse the arguments from a 32-bit invocation.</div><div class='add'>+</div><div class='add'>+For example, if there are fields::</div><div class='add'>+</div><div class='add'>+    struct xyzzy_args {</div><div class='add'>+        const char __user *ptr;</div><div class='add'>+        __kernel_long_t varying_val;</div><div class='add'>+        u64 fixed_val;</div><div class='add'>+        /* ... */</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+in struct xyzzy_args, then struct compat_xyzzy_args would have::</div><div class='add'>+</div><div class='add'>+    struct compat_xyzzy_args {</div><div class='add'>+        compat_uptr_t ptr;</div><div class='add'>+        compat_long_t varying_val;</div><div class='add'>+        u64 fixed_val;</div><div class='add'>+        /* ... */</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+The generic system call list also needs adjusting to allow for the compat</div><div class='add'>+version; the entry in ``include/uapi/asm-generic/unistd.h`` should use</div><div class='add'>+``__SC_COMP`` rather than ``__SYSCALL``::</div><div class='add'>+</div><div class='add'>+    #define __NR_xyzzy 292</div><div class='add'>+    __SC_COMP(__NR_xyzzy, sys_xyzzy, compat_sys_xyzzy)</div><div class='add'>+</div><div class='add'>+To summarize, you need:</div><div class='add'>+</div><div class='add'>+ - a ``COMPAT_SYSCALL_DEFINEn(xyzzy, ...)`` for the compat entry point</div><div class='add'>+ - corresponding prototype in ``include/linux/compat.h``</div><div class='add'>+ - (if needed) 32-bit mapping struct in ``include/linux/compat.h``</div><div class='add'>+ - instance of ``__SC_COMP`` not ``__SYSCALL`` in</div><div class='add'>+   ``include/uapi/asm-generic/unistd.h``</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Compatibility System Calls (x86)</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+To wire up the x86 architecture of a system call with a compatibility version,</div><div class='add'>+the entries in the syscall tables need to be adjusted.</div><div class='add'>+</div><div class='add'>+First, the entry in ``arch/x86/entry/syscalls/syscall_32.tbl`` gets an extra</div><div class='add'>+column to indicate that a 32-bit userspace program running on a 64-bit kernel</div><div class='add'>+should hit the compat entry point::</div><div class='add'>+</div><div class='add'>+    380   i386     xyzzy     sys_xyzzy    compat_sys_xyzzy</div><div class='add'>+</div><div class='add'>+Second, you need to figure out what should happen for the x32 ABI version of</div><div class='add'>+the new system call.  There's a choice here: the layout of the arguments</div><div class='add'>+should either match the 64-bit version or the 32-bit version.</div><div class='add'>+</div><div class='add'>+If there's a pointer-to-a-pointer involved, the decision is easy: x32 is</div><div class='add'>+ILP32, so the layout should match the 32-bit version, and the entry in</div><div class='add'>+``arch/x86/entry/syscalls/syscall_64.tbl`` is split so that x32 programs hit</div><div class='add'>+the compatibility wrapper::</div><div class='add'>+</div><div class='add'>+    333   64       xyzzy     sys_xyzzy</div><div class='add'>+    ...</div><div class='add'>+    555   x32      xyzzy     compat_sys_xyzzy</div><div class='add'>+</div><div class='add'>+If no pointers are involved, then it is preferable to re-use the 64-bit system</div><div class='add'>+call for the x32 ABI (and consequently the entry in</div><div class='add'>+arch/x86/entry/syscalls/syscall_64.tbl is unchanged).</div><div class='add'>+</div><div class='add'>+In either case, you should check that the types involved in your argument</div><div class='add'>+layout do indeed map exactly from x32 (-mx32) to either the 32-bit (-m32) or</div><div class='add'>+64-bit (-m64) equivalents.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+System Calls Returning Elsewhere</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+For most system calls, once the system call is complete the user program</div><div class='add'>+continues exactly where it left off -- at the next instruction, with the</div><div class='add'>+stack the same and most of the registers the same as before the system call,</div><div class='add'>+and with the same virtual memory space.</div><div class='add'>+</div><div class='add'>+However, a few system calls do things differently.  They might return to a</div><div class='add'>+different location (``rt_sigreturn``) or change the memory space</div><div class='add'>+(``fork``/``vfork``/``clone``) or even architecture (``execve``/``execveat``)</div><div class='add'>+of the program.</div><div class='add'>+</div><div class='add'>+To allow for this, the kernel implementation of the system call may need to</div><div class='add'>+save and restore additional registers to the kernel stack, allowing complete</div><div class='add'>+control of where and how execution continues after the system call.</div><div class='add'>+</div><div class='add'>+This is arch-specific, but typically involves defining assembly entry points</div><div class='add'>+that save/restore additional registers and invoke the real system call entry</div><div class='add'>+point.</div><div class='add'>+</div><div class='add'>+For x86_64, this is implemented as a ``stub_xyzzy`` entry point in</div><div class='add'>+``arch/x86/entry/entry_64.S``, and the entry in the syscall table</div><div class='add'>+(``arch/x86/entry/syscalls/syscall_64.tbl``) is adjusted to match::</div><div class='add'>+</div><div class='add'>+    333   common   xyzzy     stub_xyzzy</div><div class='add'>+</div><div class='add'>+The equivalent for 32-bit programs running on a 64-bit kernel is normally</div><div class='add'>+called ``stub32_xyzzy`` and implemented in ``arch/x86/entry/entry_64_compat.S``,</div><div class='add'>+with the corresponding syscall table adjustment in</div><div class='add'>+``arch/x86/entry/syscalls/syscall_32.tbl``::</div><div class='add'>+</div><div class='add'>+    380   i386     xyzzy     sys_xyzzy    stub32_xyzzy</div><div class='add'>+</div><div class='add'>+If the system call needs a compatibility layer (as in the previous section)</div><div class='add'>+then the ``stub32_`` version needs to call on to the ``compat_sys_`` version</div><div class='add'>+of the system call rather than the native 64-bit version.  Also, if the x32 ABI</div><div class='add'>+implementation is not common with the x86_64 version, then its syscall</div><div class='add'>+table will also need to invoke a stub that calls on to the ``compat_sys_``</div><div class='add'>+version.</div><div class='add'>+</div><div class='add'>+For completeness, it's also nice to set up a mapping so that user-mode Linux</div><div class='add'>+still works -- its syscall table will reference stub_xyzzy, but the UML build</div><div class='add'>+doesn't include ``arch/x86/entry/entry_64.S`` implementation (because UML</div><div class='add'>+simulates registers etc).  Fixing this is as simple as adding a #define to</div><div class='add'>+``arch/x86/um/sys_call_table_64.c``::</div><div class='add'>+</div><div class='add'>+    #define stub_xyzzy sys_xyzzy</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Other Details</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+Most of the kernel treats system calls in a generic way, but there is the</div><div class='add'>+occasional exception that may need updating for your particular system call.</div><div class='add'>+</div><div class='add'>+The audit subsystem is one such special case; it includes (arch-specific)</div><div class='add'>+functions that classify some special types of system call -- specifically</div><div class='add'>+file open (``open``/``openat``), program execution (``execve``/``exeveat``) or</div><div class='add'>+socket multiplexor (``socketcall``) operations. If your new system call is</div><div class='add'>+analogous to one of these, then the audit system should be updated.</div><div class='add'>+</div><div class='add'>+More generally, if there is an existing system call that is analogous to your</div><div class='add'>+new system call, it's worth doing a kernel-wide grep for the existing system</div><div class='add'>+call to check there are no other special cases.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Testing</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+A new system call should obviously be tested; it is also useful to provide</div><div class='add'>+reviewers with a demonstration of how user space programs will use the system</div><div class='add'>+call.  A good way to combine these aims is to include a simple self-test</div><div class='add'>+program in a new directory under ``tools/testing/selftests/``.</div><div class='add'>+</div><div class='add'>+For a new system call, there will obviously be no libc wrapper function and so</div><div class='add'>+the test will need to invoke it using ``syscall()``; also, if the system call</div><div class='add'>+involves a new userspace-visible structure, the corresponding header will need</div><div class='add'>+to be installed to compile the test.</div><div class='add'>+</div><div class='add'>+Make sure the selftest runs successfully on all supported architectures.  For</div><div class='add'>+example, check that it works when compiled as an x86_64 (-m64), x86_32 (-m32)</div><div class='add'>+and x32 (-mx32) ABI program.</div><div class='add'>+</div><div class='add'>+For more extensive and thorough testing of new functionality, you should also</div><div class='add'>+consider adding tests to the Linux Test Project, or to the xfstests project</div><div class='add'>+for filesystem-related changes.</div><div class='add'>+</div><div class='add'>+ - https://linux-test-project.github.io/</div><div class='add'>+ - git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Man Page</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+All new system calls should come with a complete man page, ideally using groff</div><div class='add'>+markup, but plain text will do.  If groff is used, it's helpful to include a</div><div class='add'>+pre-rendered ASCII version of the man page in the cover email for the</div><div class='add'>+patchset, for the convenience of reviewers.</div><div class='add'>+</div><div class='add'>+The man page should be cc'ed to linux-man@vger.kernel.org</div><div class='add'>+For more details, see https://www.kernel.org/doc/man-pages/patches.html</div><div class='add'>+</div><div class='add'>+References and Sources</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+ - LWN article from Michael Kerrisk on use of flags argument in system calls:</div><div class='add'>+   https://lwn.net/Articles/585415/</div><div class='add'>+ - LWN article from Michael Kerrisk on how to handle unknown flags in a system</div><div class='add'>+   call: https://lwn.net/Articles/588444/</div><div class='add'>+ - LWN article from Jake Edge describing constraints on 64-bit system call</div><div class='add'>+   arguments: https://lwn.net/Articles/311630/</div><div class='add'>+ - Pair of LWN articles from David Drysdale that describe the system call</div><div class='add'>+   implementation paths in detail for v3.14:</div><div class='add'>+</div><div class='add'>+    - https://lwn.net/Articles/604287/</div><div class='add'>+    - https://lwn.net/Articles/604515/</div><div class='add'>+</div><div class='add'>+ - Architecture-specific requirements for system calls are discussed in the</div><div class='add'>+   :manpage:`syscall(2)` man-page:</div><div class='add'>+   http://man7.org/linux/man-pages/man2/syscall.2.html#NOTES</div><div class='add'>+ - Collated emails from Linus Torvalds discussing the problems with ``ioctl()``:</div><div class='add'>+   http://yarchive.net/comp/linux/ioctl.html</div><div class='add'>+ - "How to not invent kernel interfaces", Arnd Bergmann,</div><div class='add'>+   http://www.ukuug.org/events/linux2007/2007/papers/Bergmann.pdf</div><div class='add'>+ - LWN article from Michael Kerrisk on avoiding new uses of CAP_SYS_ADMIN:</div><div class='add'>+   https://lwn.net/Articles/486306/</div><div class='add'>+ - Recommendation from Andrew Morton that all related information for a new</div><div class='add'>+   system call should come in the same email thread:</div><div class='add'>+   https://lkml.org/lkml/2014/7/24/641</div><div class='add'>+ - Recommendation from Michael Kerrisk that a new system call should come with</div><div class='add'>+   a man page: https://lkml.org/lkml/2014/6/13/309</div><div class='add'>+ - Suggestion from Thomas Gleixner that x86 wire-up should be in a separate</div><div class='add'>+   commit: https://lkml.org/lkml/2014/11/19/254</div><div class='add'>+ - Suggestion from Greg Kroah-Hartman that it's good for new system calls to</div><div class='add'>+   come with a man-page &amp; selftest: https://lkml.org/lkml/2014/3/19/710</div><div class='add'>+ - Discussion from Michael Kerrisk of new system call vs. :manpage:`prctl(2)` extension:</div><div class='add'>+   https://lkml.org/lkml/2014/6/3/411</div><div class='add'>+ - Suggestion from Ingo Molnar that system calls that involve multiple</div><div class='add'>+   arguments should encapsulate those arguments in a struct, which includes a</div><div class='add'>+   size field for future extensibility: https://lkml.org/lkml/2015/7/30/117</div><div class='add'>+ - Numbering oddities arising from (re-)use of O_* numbering space flags:</div><div class='add'>+</div><div class='add'>+    - commit 75069f2b5bfb ("vfs: renumber FMODE_NONOTIFY and add to uniqueness</div><div class='add'>+      check")</div><div class='add'>+    - commit 12ed2e36c98a ("fanotify: FMODE_NONOTIFY and __O_SYNC in sparc</div><div class='add'>+      conflict")</div><div class='add'>+    - commit bb458c644a59 ("Safer ABI for O_TMPFILE")</div><div class='add'>+</div><div class='add'>+ - Discussion from Matthew Wilcox about restrictions on 64-bit arguments:</div><div class='add'>+   https://lkml.org/lkml/2008/12/12/187</div><div class='add'>+ - Recommendation from Greg Kroah-Hartman that unknown flags should be</div><div class='add'>+   policed: https://lkml.org/lkml/2014/7/17/577</div><div class='add'>+ - Recommendation from Linus Torvalds that x32 system calls should prefer</div><div class='add'>+   compatibility with 64-bit versions rather than 32-bit versions:</div><div class='add'>+   https://lkml.org/lkml/2011/8/31/244</div><div class='head'>diff --git a/Documentation/process/applying-patches.rst b/Documentation/process/applying-patches.rst<br/>new file mode 100644<br/>index 000000000000..87825cf96f33<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/applying-patches.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/applying-patches.rst</a></div><div class='hunk'>@@ -0,0 +1,468 @@</div><div class='add'>+.. _applying_patches:</div><div class='add'>+</div><div class='add'>+Applying Patches To The Linux Kernel</div><div class='add'>+++++++++++++++++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+Original by:</div><div class='add'>+	Jesper Juhl, August 2005</div><div class='add'>+</div><div class='add'>+Last update:</div><div class='add'>+	2016-09-14</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+   This document is obsolete.  In most cases, rather than using ``patch``</div><div class='add'>+   manually, you'll almost certainly want to look at using Git instead.</div><div class='add'>+</div><div class='add'>+A frequently asked question on the Linux Kernel Mailing List is how to apply</div><div class='add'>+a patch to the kernel or, more specifically, what base kernel a patch for</div><div class='add'>+one of the many trees/branches should be applied to. Hopefully this document</div><div class='add'>+will explain this to you.</div><div class='add'>+</div><div class='add'>+In addition to explaining how to apply and revert patches, a brief</div><div class='add'>+description of the different kernel trees (and examples of how to apply</div><div class='add'>+their specific patches) is also provided.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+What is a patch?</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+A patch is a small text document containing a delta of changes between two</div><div class='add'>+different versions of a source tree. Patches are created with the ``diff``</div><div class='add'>+program.</div><div class='add'>+</div><div class='add'>+To correctly apply a patch you need to know what base it was generated from</div><div class='add'>+and what new version the patch will change the source tree into. These</div><div class='add'>+should both be present in the patch file metadata or be possible to deduce</div><div class='add'>+from the filename.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+How do I apply or revert a patch?</div><div class='add'>+=================================</div><div class='add'>+</div><div class='add'>+You apply a patch with the ``patch`` program. The patch program reads a diff</div><div class='add'>+(or patch) file and makes the changes to the source tree described in it.</div><div class='add'>+</div><div class='add'>+Patches for the Linux kernel are generated relative to the parent directory</div><div class='add'>+holding the kernel source dir.</div><div class='add'>+</div><div class='add'>+This means that paths to files inside the patch file contain the name of the</div><div class='add'>+kernel source directories it was generated against (or some other directory</div><div class='add'>+names like "a/" and "b/").</div><div class='add'>+</div><div class='add'>+Since this is unlikely to match the name of the kernel source dir on your</div><div class='add'>+local machine (but is often useful info to see what version an otherwise</div><div class='add'>+unlabeled patch was generated against) you should change into your kernel</div><div class='add'>+source directory and then strip the first element of the path from filenames</div><div class='add'>+in the patch file when applying it (the ``-p1`` argument to ``patch`` does</div><div class='add'>+this).</div><div class='add'>+</div><div class='add'>+To revert a previously applied patch, use the -R argument to patch.</div><div class='add'>+So, if you applied a patch like this::</div><div class='add'>+</div><div class='add'>+	patch -p1 &lt; ../patch-x.y.z</div><div class='add'>+</div><div class='add'>+You can revert (undo) it like this::</div><div class='add'>+</div><div class='add'>+	patch -R -p1 &lt; ../patch-x.y.z</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+How do I feed a patch/diff file to ``patch``?</div><div class='add'>+=============================================</div><div class='add'>+</div><div class='add'>+This (as usual with Linux and other UNIX like operating systems) can be</div><div class='add'>+done in several different ways.</div><div class='add'>+</div><div class='add'>+In all the examples below I feed the file (in uncompressed form) to patch</div><div class='add'>+via stdin using the following syntax::</div><div class='add'>+</div><div class='add'>+	patch -p1 &lt; path/to/patch-x.y.z</div><div class='add'>+</div><div class='add'>+If you just want to be able to follow the examples below and don't want to</div><div class='add'>+know of more than one way to use patch, then you can stop reading this</div><div class='add'>+section here.</div><div class='add'>+</div><div class='add'>+Patch can also get the name of the file to use via the -i argument, like</div><div class='add'>+this::</div><div class='add'>+</div><div class='add'>+	patch -p1 -i path/to/patch-x.y.z</div><div class='add'>+</div><div class='add'>+If your patch file is compressed with gzip or xz and you don't want to</div><div class='add'>+uncompress it before applying it, then you can feed it to patch like this</div><div class='add'>+instead::</div><div class='add'>+</div><div class='add'>+	xzcat path/to/patch-x.y.z.xz | patch -p1</div><div class='add'>+	bzcat path/to/patch-x.y.z.gz | patch -p1</div><div class='add'>+</div><div class='add'>+If you wish to uncompress the patch file by hand first before applying it</div><div class='add'>+(what I assume you've done in the examples below), then you simply run</div><div class='add'>+gunzip or xz on the file -- like this::</div><div class='add'>+</div><div class='add'>+	gunzip patch-x.y.z.gz</div><div class='add'>+	xz -d patch-x.y.z.xz</div><div class='add'>+</div><div class='add'>+Which will leave you with a plain text patch-x.y.z file that you can feed to</div><div class='add'>+patch via stdin or the ``-i`` argument, as you prefer.</div><div class='add'>+</div><div class='add'>+A few other nice arguments for patch are ``-s`` which causes patch to be silent</div><div class='add'>+except for errors which is nice to prevent errors from scrolling out of the</div><div class='add'>+screen too fast, and ``--dry-run`` which causes patch to just print a listing of</div><div class='add'>+what would happen, but doesn't actually make any changes. Finally ``--verbose``</div><div class='add'>+tells patch to print more information about the work being done.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Common errors when patching</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+When patch applies a patch file it attempts to verify the sanity of the</div><div class='add'>+file in different ways.</div><div class='add'>+</div><div class='add'>+Checking that the file looks like a valid patch file and checking the code</div><div class='add'>+around the bits being modified matches the context provided in the patch are</div><div class='add'>+just two of the basic sanity checks patch does.</div><div class='add'>+</div><div class='add'>+If patch encounters something that doesn't look quite right it has two</div><div class='add'>+options. It can either refuse to apply the changes and abort or it can try</div><div class='add'>+to find a way to make the patch apply with a few minor changes.</div><div class='add'>+</div><div class='add'>+One example of something that's not 'quite right' that patch will attempt to</div><div class='add'>+fix up is if all the context matches, the lines being changed match, but the</div><div class='add'>+line numbers are different. This can happen, for example, if the patch makes</div><div class='add'>+a change in the middle of the file but for some reasons a few lines have</div><div class='add'>+been added or removed near the beginning of the file. In that case</div><div class='add'>+everything looks good it has just moved up or down a bit, and patch will</div><div class='add'>+usually adjust the line numbers and apply the patch.</div><div class='add'>+</div><div class='add'>+Whenever patch applies a patch that it had to modify a bit to make it fit</div><div class='add'>+it'll tell you about it by saying the patch applied with **fuzz**.</div><div class='add'>+You should be wary of such changes since even though patch probably got it</div><div class='add'>+right it doesn't /always/ get it right, and the result will sometimes be</div><div class='add'>+wrong.</div><div class='add'>+</div><div class='add'>+When patch encounters a change that it can't fix up with fuzz it rejects it</div><div class='add'>+outright and leaves a file with a ``.rej`` extension (a reject file). You can</div><div class='add'>+read this file to see exactly what change couldn't be applied, so you can</div><div class='add'>+go fix it up by hand if you wish.</div><div class='add'>+</div><div class='add'>+If you don't have any third-party patches applied to your kernel source, but</div><div class='add'>+only patches from kernel.org and you apply the patches in the correct order,</div><div class='add'>+and have made no modifications yourself to the source files, then you should</div><div class='add'>+never see a fuzz or reject message from patch. If you do see such messages</div><div class='add'>+anyway, then there's a high risk that either your local source tree or the</div><div class='add'>+patch file is corrupted in some way. In that case you should probably try</div><div class='add'>+re-downloading the patch and if things are still not OK then you'd be advised</div><div class='add'>+to start with a fresh tree downloaded in full from kernel.org.</div><div class='add'>+</div><div class='add'>+Let's look a bit more at some of the messages patch can produce.</div><div class='add'>+</div><div class='add'>+If patch stops and presents a ``File to patch:`` prompt, then patch could not</div><div class='add'>+find a file to be patched. Most likely you forgot to specify -p1 or you are</div><div class='add'>+in the wrong directory. Less often, you'll find patches that need to be</div><div class='add'>+applied with ``-p0`` instead of ``-p1`` (reading the patch file should reveal if</div><div class='add'>+this is the case -- if so, then this is an error by the person who created</div><div class='add'>+the patch but is not fatal).</div><div class='add'>+</div><div class='add'>+If you get ``Hunk #2 succeeded at 1887 with fuzz 2 (offset 7 lines).`` or a</div><div class='add'>+message similar to that, then it means that patch had to adjust the location</div><div class='add'>+of the change (in this example it needed to move 7 lines from where it</div><div class='add'>+expected to make the change to make it fit).</div><div class='add'>+</div><div class='add'>+The resulting file may or may not be OK, depending on the reason the file</div><div class='add'>+was different than expected.</div><div class='add'>+</div><div class='add'>+This often happens if you try to apply a patch that was generated against a</div><div class='add'>+different kernel version than the one you are trying to patch.</div><div class='add'>+</div><div class='add'>+If you get a message like ``Hunk #3 FAILED at 2387.``, then it means that the</div><div class='add'>+patch could not be applied correctly and the patch program was unable to</div><div class='add'>+fuzz its way through. This will generate a ``.rej`` file with the change that</div><div class='add'>+caused the patch to fail and also a ``.orig`` file showing you the original</div><div class='add'>+content that couldn't be changed.</div><div class='add'>+</div><div class='add'>+If you get ``Reversed (or previously applied) patch detected!  Assume -R? [n]``</div><div class='add'>+then patch detected that the change contained in the patch seems to have</div><div class='add'>+already been made.</div><div class='add'>+</div><div class='add'>+If you actually did apply this patch previously and you just re-applied it</div><div class='add'>+in error, then just say [n]o and abort this patch. If you applied this patch</div><div class='add'>+previously and actually intended to revert it, but forgot to specify -R,</div><div class='add'>+then you can say [**y**]es here to make patch revert it for you.</div><div class='add'>+</div><div class='add'>+This can also happen if the creator of the patch reversed the source and</div><div class='add'>+destination directories when creating the patch, and in that case reverting</div><div class='add'>+the patch will in fact apply it.</div><div class='add'>+</div><div class='add'>+A message similar to ``patch: **** unexpected end of file in patch`` or</div><div class='add'>+``patch unexpectedly ends in middle of line`` means that patch could make no</div><div class='add'>+sense of the file you fed to it. Either your download is broken, you tried to</div><div class='add'>+feed patch a compressed patch file without uncompressing it first, or the patch</div><div class='add'>+file that you are using has been mangled by a mail client or mail transfer</div><div class='add'>+agent along the way somewhere, e.g., by splitting a long line into two lines.</div><div class='add'>+Often these warnings can easily be fixed by joining (concatenating) the</div><div class='add'>+two lines that had been split.</div><div class='add'>+</div><div class='add'>+As I already mentioned above, these errors should never happen if you apply</div><div class='add'>+a patch from kernel.org to the correct version of an unmodified source tree.</div><div class='add'>+So if you get these errors with kernel.org patches then you should probably</div><div class='add'>+assume that either your patch file or your tree is broken and I'd advise you</div><div class='add'>+to start over with a fresh download of a full kernel tree and the patch you</div><div class='add'>+wish to apply.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Are there any alternatives to ``patch``?</div><div class='add'>+========================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Yes there are alternatives.</div><div class='add'>+</div><div class='add'>+You can use the ``interdiff`` program (http://cyberelk.net/tim/patchutils/) to</div><div class='add'>+generate a patch representing the differences between two patches and then</div><div class='add'>+apply the result.</div><div class='add'>+</div><div class='add'>+This will let you move from something like 4.7.2 to 4.7.3 in a single</div><div class='add'>+step. The -z flag to interdiff will even let you feed it patches in gzip or</div><div class='add'>+bzip2 compressed form directly without the use of zcat or bzcat or manual</div><div class='add'>+decompression.</div><div class='add'>+</div><div class='add'>+Here's how you'd go from 4.7.2 to 4.7.3 in a single step::</div><div class='add'>+</div><div class='add'>+	interdiff -z ../patch-4.7.2.gz ../patch-4.7.3.gz | patch -p1</div><div class='add'>+</div><div class='add'>+Although interdiff may save you a step or two you are generally advised to</div><div class='add'>+do the additional steps since interdiff can get things wrong in some cases.</div><div class='add'>+</div><div class='add'>+Another alternative is ``ketchup``, which is a python script for automatic</div><div class='add'>+downloading and applying of patches (http://www.selenic.com/ketchup/).</div><div class='add'>+</div><div class='add'>+Other nice tools are diffstat, which shows a summary of changes made by a</div><div class='add'>+patch; lsdiff, which displays a short listing of affected files in a patch</div><div class='add'>+file, along with (optionally) the line numbers of the start of each patch;</div><div class='add'>+and grepdiff, which displays a list of the files modified by a patch where</div><div class='add'>+the patch contains a given regular expression.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Where can I download the patches?</div><div class='add'>+=================================</div><div class='add'>+</div><div class='add'>+The patches are available at http://kernel.org/</div><div class='add'>+Most recent patches are linked from the front page, but they also have</div><div class='add'>+specific homes.</div><div class='add'>+</div><div class='add'>+The 4.x.y (-stable) and 4.x patches live at</div><div class='add'>+</div><div class='add'>+	ftp://ftp.kernel.org/pub/linux/kernel/v4.x/</div><div class='add'>+</div><div class='add'>+The -rc patches live at</div><div class='add'>+</div><div class='add'>+	ftp://ftp.kernel.org/pub/linux/kernel/v4.x/testing/</div><div class='add'>+</div><div class='add'>+In place of ``ftp.kernel.org`` you can use ``ftp.cc.kernel.org``, where cc is a</div><div class='add'>+country code. This way you'll be downloading from a mirror site that's most</div><div class='add'>+likely geographically closer to you, resulting in faster downloads for you,</div><div class='add'>+less bandwidth used globally and less load on the main kernel.org servers --</div><div class='add'>+these are good things, so do use mirrors when possible.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The 4.x kernels</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+These are the base stable releases released by Linus. The highest numbered</div><div class='add'>+release is the most recent.</div><div class='add'>+</div><div class='add'>+If regressions or other serious flaws are found, then a -stable fix patch</div><div class='add'>+will be released (see below) on top of this base. Once a new 4.x base</div><div class='add'>+kernel is released, a patch is made available that is a delta between the</div><div class='add'>+previous 4.x kernel and the new one.</div><div class='add'>+</div><div class='add'>+To apply a patch moving from 4.6 to 4.7, you'd do the following (note</div><div class='add'>+that such patches do **NOT** apply on top of 4.x.y kernels but on top of the</div><div class='add'>+base 4.x kernel -- if you need to move from 4.x.y to 4.x+1 you need to</div><div class='add'>+first revert the 4.x.y patch).</div><div class='add'>+</div><div class='add'>+Here are some examples::</div><div class='add'>+</div><div class='add'>+	# moving from 4.6 to 4.7</div><div class='add'>+</div><div class='add'>+	$ cd ~/linux-4.6		# change to kernel source dir</div><div class='add'>+	$ patch -p1 &lt; ../patch-4.7	# apply the 4.7 patch</div><div class='add'>+	$ cd ..</div><div class='add'>+	$ mv linux-4.6 linux-4.7	# rename source dir</div><div class='add'>+</div><div class='add'>+	# moving from 4.6.1 to 4.7</div><div class='add'>+</div><div class='add'>+	$ cd ~/linux-4.6.1		# change to kernel source dir</div><div class='add'>+	$ patch -p1 -R &lt; ../patch-4.6.1	# revert the 4.6.1 patch</div><div class='add'>+					# source dir is now 4.6</div><div class='add'>+	$ patch -p1 &lt; ../patch-4.7	# apply new 4.7 patch</div><div class='add'>+	$ cd ..</div><div class='add'>+	$ mv linux-4.6.1 linux-4.7	# rename source dir</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The 4.x.y kernels</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+Kernels with 3-digit versions are -stable kernels. They contain small(ish)</div><div class='add'>+critical fixes for security problems or significant regressions discovered</div><div class='add'>+in a given 4.x kernel.</div><div class='add'>+</div><div class='add'>+This is the recommended branch for users who want the most recent stable</div><div class='add'>+kernel and are not interested in helping test development/experimental</div><div class='add'>+versions.</div><div class='add'>+</div><div class='add'>+If no 4.x.y kernel is available, then the highest numbered 4.x kernel is</div><div class='add'>+the current stable kernel.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+ The -stable team usually do make incremental patches available as well</div><div class='add'>+ as patches against the latest mainline release, but I only cover the</div><div class='add'>+ non-incremental ones below. The incremental ones can be found at</div><div class='add'>+ ftp://ftp.kernel.org/pub/linux/kernel/v4.x/incr/</div><div class='add'>+</div><div class='add'>+These patches are not incremental, meaning that for example the 4.7.3</div><div class='add'>+patch does not apply on top of the 4.7.2 kernel source, but rather on top</div><div class='add'>+of the base 4.7 kernel source.</div><div class='add'>+</div><div class='add'>+So, in order to apply the 4.7.3 patch to your existing 4.7.2 kernel</div><div class='add'>+source you have to first back out the 4.7.2 patch (so you are left with a</div><div class='add'>+base 4.7 kernel source) and then apply the new 4.7.3 patch.</div><div class='add'>+</div><div class='add'>+Here's a small example::</div><div class='add'>+</div><div class='add'>+	$ cd ~/linux-4.7.2		# change to the kernel source dir</div><div class='add'>+	$ patch -p1 -R &lt; ../patch-4.7.2	# revert the 4.7.2 patch</div><div class='add'>+	$ patch -p1 &lt; ../patch-4.7.3	# apply the new 4.7.3 patch</div><div class='add'>+	$ cd ..</div><div class='add'>+	$ mv linux-4.7.2 linux-4.7.3	# rename the kernel source dir</div><div class='add'>+</div><div class='add'>+The -rc kernels</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+These are release-candidate kernels. These are development kernels released</div><div class='add'>+by Linus whenever he deems the current git (the kernel's source management</div><div class='add'>+tool) tree to be in a reasonably sane state adequate for testing.</div><div class='add'>+</div><div class='add'>+These kernels are not stable and you should expect occasional breakage if</div><div class='add'>+you intend to run them. This is however the most stable of the main</div><div class='add'>+development branches and is also what will eventually turn into the next</div><div class='add'>+stable kernel, so it is important that it be tested by as many people as</div><div class='add'>+possible.</div><div class='add'>+</div><div class='add'>+This is a good branch to run for people who want to help out testing</div><div class='add'>+development kernels but do not want to run some of the really experimental</div><div class='add'>+stuff (such people should see the sections about -git and -mm kernels below).</div><div class='add'>+</div><div class='add'>+The -rc patches are not incremental, they apply to a base 4.x kernel, just</div><div class='add'>+like the 4.x.y patches described above. The kernel version before the -rcN</div><div class='add'>+suffix denotes the version of the kernel that this -rc kernel will eventually</div><div class='add'>+turn into.</div><div class='add'>+</div><div class='add'>+So, 4.8-rc5 means that this is the fifth release candidate for the 4.8</div><div class='add'>+kernel and the patch should be applied on top of the 4.7 kernel source.</div><div class='add'>+</div><div class='add'>+Here are 3 examples of how to apply these patches::</div><div class='add'>+</div><div class='add'>+	# first an example of moving from 4.7 to 4.8-rc3</div><div class='add'>+</div><div class='add'>+	$ cd ~/linux-4.7			# change to the 4.7 source dir</div><div class='add'>+	$ patch -p1 &lt; ../patch-4.8-rc3		# apply the 4.8-rc3 patch</div><div class='add'>+	$ cd ..</div><div class='add'>+	$ mv linux-4.7 linux-4.8-rc3		# rename the source dir</div><div class='add'>+</div><div class='add'>+	# now let's move from 4.8-rc3 to 4.8-rc5</div><div class='add'>+</div><div class='add'>+	$ cd ~/linux-4.8-rc3			# change to the 4.8-rc3 dir</div><div class='add'>+	$ patch -p1 -R &lt; ../patch-4.8-rc3	# revert the 4.8-rc3 patch</div><div class='add'>+	$ patch -p1 &lt; ../patch-4.8-rc5		# apply the new 4.8-rc5 patch</div><div class='add'>+	$ cd ..</div><div class='add'>+	$ mv linux-4.8-rc3 linux-4.8-rc5	# rename the source dir</div><div class='add'>+</div><div class='add'>+	# finally let's try and move from 4.7.3 to 4.8-rc5</div><div class='add'>+</div><div class='add'>+	$ cd ~/linux-4.7.3			# change to the kernel source dir</div><div class='add'>+	$ patch -p1 -R &lt; ../patch-4.7.3		# revert the 4.7.3 patch</div><div class='add'>+	$ patch -p1 &lt; ../patch-4.8-rc5		# apply new 4.8-rc5 patch</div><div class='add'>+	$ cd ..</div><div class='add'>+	$ mv linux-4.7.3 linux-4.8-rc5		# rename the kernel source dir</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The -git kernels</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+These are daily snapshots of Linus' kernel tree (managed in a git</div><div class='add'>+repository, hence the name).</div><div class='add'>+</div><div class='add'>+These patches are usually released daily and represent the current state of</div><div class='add'>+Linus's tree. They are more experimental than -rc kernels since they are</div><div class='add'>+generated automatically without even a cursory glance to see if they are</div><div class='add'>+sane.</div><div class='add'>+</div><div class='add'>+-git patches are not incremental and apply either to a base 4.x kernel or</div><div class='add'>+a base 4.x-rc kernel -- you can see which from their name.</div><div class='add'>+A patch named 4.7-git1 applies to the 4.7 kernel source and a patch</div><div class='add'>+named 4.8-rc3-git2 applies to the source of the 4.8-rc3 kernel.</div><div class='add'>+</div><div class='add'>+Here are some examples of how to apply these patches::</div><div class='add'>+</div><div class='add'>+	# moving from 4.7 to 4.7-git1</div><div class='add'>+</div><div class='add'>+	$ cd ~/linux-4.7			# change to the kernel source dir</div><div class='add'>+	$ patch -p1 &lt; ../patch-4.7-git1		# apply the 4.7-git1 patch</div><div class='add'>+	$ cd ..</div><div class='add'>+	$ mv linux-4.7 linux-4.7-git1		# rename the kernel source dir</div><div class='add'>+</div><div class='add'>+	# moving from 4.7-git1 to 4.8-rc2-git3</div><div class='add'>+</div><div class='add'>+	$ cd ~/linux-4.7-git1			# change to the kernel source dir</div><div class='add'>+	$ patch -p1 -R &lt; ../patch-4.7-git1	# revert the 4.7-git1 patch</div><div class='add'>+						# we now have a 4.7 kernel</div><div class='add'>+	$ patch -p1 &lt; ../patch-4.8-rc2		# apply the 4.8-rc2 patch</div><div class='add'>+						# the kernel is now 4.8-rc2</div><div class='add'>+	$ patch -p1 &lt; ../patch-4.8-rc2-git3	# apply the 4.8-rc2-git3 patch</div><div class='add'>+						# the kernel is now 4.8-rc2-git3</div><div class='add'>+	$ cd ..</div><div class='add'>+	$ mv linux-4.7-git1 linux-4.8-rc2-git3	# rename source dir</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The -mm patches and the linux-next tree</div><div class='add'>+=======================================</div><div class='add'>+</div><div class='add'>+The -mm patches are experimental patches released by Andrew Morton.</div><div class='add'>+</div><div class='add'>+In the past, -mm tree were used to also test subsystem patches, but this</div><div class='add'>+function is now done via the</div><div class='add'>+`linux-next &lt;https://www.kernel.org/doc/man-pages/linux-next.html&gt;`</div><div class='add'>+tree. The Subsystem maintainers push their patches first to linux-next,</div><div class='add'>+and, during the merge window, sends them directly to Linus.</div><div class='add'>+</div><div class='add'>+The -mm patches serve as a sort of proving ground for new features and other</div><div class='add'>+experimental patches that aren't merged via a subsystem tree.</div><div class='add'>+Once such patches has proved its worth in -mm for a while Andrew pushes</div><div class='add'>+it on to Linus for inclusion in mainline.</div><div class='add'>+</div><div class='add'>+The linux-next tree is daily updated, and includes the -mm patches.</div><div class='add'>+Both are in constant flux and contains many experimental features, a</div><div class='add'>+lot of debugging patches not appropriate for mainline etc., and is the most</div><div class='add'>+experimental of the branches described in this document.</div><div class='add'>+</div><div class='add'>+These patches are not appropriate for use on systems that are supposed to be</div><div class='add'>+stable and they are more risky to run than any of the other branches (make</div><div class='add'>+sure you have up-to-date backups -- that goes for any experimental kernel but</div><div class='add'>+even more so for -mm patches or using a Kernel from the linux-next tree).</div><div class='add'>+</div><div class='add'>+Testing of -mm patches and linux-next is greatly appreciated since the whole</div><div class='add'>+point of those are to weed out regressions, crashes, data corruption bugs,</div><div class='add'>+build breakage (and any other bug in general) before changes are merged into</div><div class='add'>+the more stable mainline Linus tree.</div><div class='add'>+</div><div class='add'>+But testers of -mm and linux-next should be aware that breakages are</div><div class='add'>+more common than in any other tree.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+This concludes this list of explanations of the various kernel trees.</div><div class='add'>+I hope you are now clear on how to apply the various patches and help testing</div><div class='add'>+the kernel.</div><div class='add'>+</div><div class='add'>+Thank you's to Randy Dunlap, Rolf Eike Beer, Linus Torvalds, Bodo Eggert,</div><div class='add'>+Johannes Stezenbach, Grant Coady, Pavel Machek and others that I may have</div><div class='add'>+forgotten for their reviews and contributions to this document.</div><div class='head'>diff --git a/Documentation/process/changes.rst b/Documentation/process/changes.rst<br/>new file mode 100644<br/>index 000000000000..56ce66114665<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/changes.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/changes.rst</a></div><div class='hunk'>@@ -0,0 +1,485 @@</div><div class='add'>+.. _changes:</div><div class='add'>+</div><div class='add'>+Minimal requirements to compile the Kernel</div><div class='add'>+++++++++++++++++++++++++++++++++++++++++++</div><div class='add'>+</div><div class='add'>+Intro</div><div class='add'>+=====</div><div class='add'>+</div><div class='add'>+This document is designed to provide a list of the minimum levels of</div><div class='add'>+software necessary to run the 4.x kernels.</div><div class='add'>+</div><div class='add'>+This document is originally based on my "Changes" file for 2.0.x kernels</div><div class='add'>+and therefore owes credit to the same people as that file (Jared Mauch,</div><div class='add'>+Axel Boldt, Alessandro Sigala, and countless other users all over the</div><div class='add'>+'net).</div><div class='add'>+</div><div class='add'>+Current Minimal Requirements</div><div class='add'>+****************************</div><div class='add'>+</div><div class='add'>+Upgrade to at **least** these software revisions before thinking you've</div><div class='add'>+encountered a bug!  If you're unsure what version you're currently</div><div class='add'>+running, the suggested command should tell you.</div><div class='add'>+</div><div class='add'>+Again, keep in mind that this list assumes you are already functionally</div><div class='add'>+running a Linux kernel.  Also, not all tools are necessary on all</div><div class='add'>+systems; obviously, if you don't have any ISDN hardware, for example,</div><div class='add'>+you probably needn't concern yourself with isdn4k-utils.</div><div class='add'>+</div><div class='add'>+====================== ===============  ========================================</div><div class='add'>+        Program        Minimal version       Command to check the version</div><div class='add'>+====================== ===============  ========================================</div><div class='add'>+GNU C                  3.2              gcc --version</div><div class='add'>+GNU make               3.80             make --version</div><div class='add'>+binutils               2.12             ld -v</div><div class='add'>+util-linux             2.10o            fdformat --version</div><div class='add'>+module-init-tools      0.9.10           depmod -V</div><div class='add'>+e2fsprogs              1.41.4           e2fsck -V</div><div class='add'>+jfsutils               1.1.3            fsck.jfs -V</div><div class='add'>+reiserfsprogs          3.6.3            reiserfsck -V</div><div class='add'>+xfsprogs               2.6.0            xfs_db -V</div><div class='add'>+squashfs-tools         4.0              mksquashfs -version</div><div class='add'>+btrfs-progs            0.18             btrfsck</div><div class='add'>+pcmciautils            004              pccardctl -V</div><div class='add'>+quota-tools            3.09             quota -V</div><div class='add'>+PPP                    2.4.0            pppd --version</div><div class='add'>+isdn4k-utils           3.1pre1          isdnctrl 2&gt;&amp;1|grep version</div><div class='add'>+nfs-utils              1.0.5            showmount --version</div><div class='add'>+procps                 3.2.0            ps --version</div><div class='add'>+oprofile               0.9              oprofiled --version</div><div class='add'>+udev                   081              udevd --version</div><div class='add'>+grub                   0.93             grub --version || grub-install --version</div><div class='add'>+mcelog                 0.6              mcelog --version</div><div class='add'>+iptables               1.4.2            iptables -V</div><div class='add'>+openssl &amp; libcrypto    1.0.0            openssl version</div><div class='add'>+bc                     1.06.95          bc --version</div><div class='add'>+Sphinx\ [#f1]_	       1.2		sphinx-build --version</div><div class='add'>+====================== ===============  ========================================</div><div class='add'>+</div><div class='add'>+.. [#f1] Sphinx is needed only to build the Kernel documentation</div><div class='add'>+</div><div class='add'>+Kernel compilation</div><div class='add'>+******************</div><div class='add'>+</div><div class='add'>+GCC</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+The gcc version requirements may vary depending on the type of CPU in your</div><div class='add'>+computer.</div><div class='add'>+</div><div class='add'>+Make</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+You will need GNU make 3.80 or later to build the kernel.</div><div class='add'>+</div><div class='add'>+Binutils</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+Linux on IA-32 has recently switched from using ``as86`` to using ``gas`` for</div><div class='add'>+assembling the 16-bit boot code, removing the need for ``as86`` to compile</div><div class='add'>+your kernel.  This change does, however, mean that you need a recent</div><div class='add'>+release of binutils.</div><div class='add'>+</div><div class='add'>+Perl</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+You will need perl 5 and the following modules: ``Getopt::Long``,</div><div class='add'>+``Getopt::Std``, ``File::Basename``, and ``File::Find`` to build the kernel.</div><div class='add'>+</div><div class='add'>+BC</div><div class='add'>+--</div><div class='add'>+</div><div class='add'>+You will need bc to build kernels 3.10 and higher</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+OpenSSL</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+Module signing and external certificate handling use the OpenSSL program and</div><div class='add'>+crypto library to do key creation and signature generation.</div><div class='add'>+</div><div class='add'>+You will need openssl to build kernels 3.7 and higher if module signing is</div><div class='add'>+enabled.  You will also need openssl development packages to build kernels 4.3</div><div class='add'>+and higher.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+System utilities</div><div class='add'>+****************</div><div class='add'>+</div><div class='add'>+Architectural changes</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+DevFS has been obsoleted in favour of udev</div><div class='add'>+(http://www.kernel.org/pub/linux/utils/kernel/hotplug/)</div><div class='add'>+</div><div class='add'>+32-bit UID support is now in place.  Have fun!</div><div class='add'>+</div><div class='add'>+Linux documentation for functions is transitioning to inline</div><div class='add'>+documentation via specially-formatted comments near their</div><div class='add'>+definitions in the source.  These comments can be combined with the</div><div class='add'>+SGML templates in the Documentation/DocBook directory to make DocBook</div><div class='add'>+files, which can then be converted by DocBook stylesheets to PostScript,</div><div class='add'>+HTML, PDF files, and several other formats.  In order to convert from</div><div class='add'>+DocBook format to a format of your choice, you'll need to install Jade as</div><div class='add'>+well as the desired DocBook stylesheets.</div><div class='add'>+</div><div class='add'>+Util-linux</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+New versions of util-linux provide ``fdisk`` support for larger disks,</div><div class='add'>+support new options to mount, recognize more supported partition</div><div class='add'>+types, have a fdformat which works with 2.4 kernels, and similar goodies.</div><div class='add'>+You'll probably want to upgrade.</div><div class='add'>+</div><div class='add'>+Ksymoops</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+If the unthinkable happens and your kernel oopses, you may need the</div><div class='add'>+ksymoops tool to decode it, but in most cases you don't.</div><div class='add'>+It is generally preferred to build the kernel with ``CONFIG_KALLSYMS`` so</div><div class='add'>+that it produces readable dumps that can be used as-is (this also</div><div class='add'>+produces better output than ksymoops).  If for some reason your kernel</div><div class='add'>+is not build with ``CONFIG_KALLSYMS`` and you have no way to rebuild and</div><div class='add'>+reproduce the Oops with that option, then you can still decode that Oops</div><div class='add'>+with ksymoops.</div><div class='add'>+</div><div class='add'>+Module-Init-Tools</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+A new module loader is now in the kernel that requires ``module-init-tools``</div><div class='add'>+to use.  It is backward compatible with the 2.4.x series kernels.</div><div class='add'>+</div><div class='add'>+Mkinitrd</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+These changes to the ``/lib/modules`` file tree layout also require that</div><div class='add'>+mkinitrd be upgraded.</div><div class='add'>+</div><div class='add'>+E2fsprogs</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+The latest version of ``e2fsprogs`` fixes several bugs in fsck and</div><div class='add'>+debugfs.  Obviously, it's a good idea to upgrade.</div><div class='add'>+</div><div class='add'>+JFSutils</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+The ``jfsutils`` package contains the utilities for the file system.</div><div class='add'>+The following utilities are available:</div><div class='add'>+</div><div class='add'>+- ``fsck.jfs`` - initiate replay of the transaction log, and check</div><div class='add'>+  and repair a JFS formatted partition.</div><div class='add'>+</div><div class='add'>+- ``mkfs.jfs`` - create a JFS formatted partition.</div><div class='add'>+</div><div class='add'>+- other file system utilities are also available in this package.</div><div class='add'>+</div><div class='add'>+Reiserfsprogs</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+The reiserfsprogs package should be used for reiserfs-3.6.x</div><div class='add'>+(Linux kernels 2.4.x). It is a combined package and contains working</div><div class='add'>+versions of ``mkreiserfs``, ``resize_reiserfs``, ``debugreiserfs`` and</div><div class='add'>+``reiserfsck``. These utils work on both i386 and alpha platforms.</div><div class='add'>+</div><div class='add'>+Xfsprogs</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+The latest version of ``xfsprogs`` contains ``mkfs.xfs``, ``xfs_db``, and the</div><div class='add'>+``xfs_repair`` utilities, among others, for the XFS filesystem.  It is</div><div class='add'>+architecture independent and any version from 2.0.0 onward should</div><div class='add'>+work correctly with this version of the XFS kernel code (2.6.0 or</div><div class='add'>+later is recommended, due to some significant improvements).</div><div class='add'>+</div><div class='add'>+PCMCIAutils</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+PCMCIAutils replaces ``pcmcia-cs``. It properly sets up</div><div class='add'>+PCMCIA sockets at system startup and loads the appropriate modules</div><div class='add'>+for 16-bit PCMCIA devices if the kernel is modularized and the hotplug</div><div class='add'>+subsystem is used.</div><div class='add'>+</div><div class='add'>+Quota-tools</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+Support for 32 bit uid's and gid's is required if you want to use</div><div class='add'>+the newer version 2 quota format.  Quota-tools version 3.07 and</div><div class='add'>+newer has this support.  Use the recommended version or newer</div><div class='add'>+from the table above.</div><div class='add'>+</div><div class='add'>+Intel IA32 microcode</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+A driver has been added to allow updating of Intel IA32 microcode,</div><div class='add'>+accessible as a normal (misc) character device.  If you are not using</div><div class='add'>+udev you may need to::</div><div class='add'>+</div><div class='add'>+  mkdir /dev/cpu</div><div class='add'>+  mknod /dev/cpu/microcode c 10 184</div><div class='add'>+  chmod 0644 /dev/cpu/microcode</div><div class='add'>+</div><div class='add'>+as root before you can use this.  You'll probably also want to</div><div class='add'>+get the user-space microcode_ctl utility to use with this.</div><div class='add'>+</div><div class='add'>+udev</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+``udev`` is a userspace application for populating ``/dev`` dynamically with</div><div class='add'>+only entries for devices actually present. ``udev`` replaces the basic</div><div class='add'>+functionality of devfs, while allowing persistent device naming for</div><div class='add'>+devices.</div><div class='add'>+</div><div class='add'>+FUSE</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+Needs libfuse 2.4.0 or later.  Absolute minimum is 2.3.0 but mount</div><div class='add'>+options ``direct_io`` and ``kernel_cache`` won't work.</div><div class='add'>+</div><div class='add'>+Networking</div><div class='add'>+**********</div><div class='add'>+</div><div class='add'>+General changes</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+If you have advanced network configuration needs, you should probably</div><div class='add'>+consider using the network tools from ip-route2.</div><div class='add'>+</div><div class='add'>+Packet Filter / NAT</div><div class='add'>+-------------------</div><div class='add'>+The packet filtering and NAT code uses the same tools like the previous 2.4.x</div><div class='add'>+kernel series (iptables).  It still includes backwards-compatibility modules</div><div class='add'>+for 2.2.x-style ipchains and 2.0.x-style ipfwadm.</div><div class='add'>+</div><div class='add'>+PPP</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+The PPP driver has been restructured to support multilink and to</div><div class='add'>+enable it to operate over diverse media layers.  If you use PPP,</div><div class='add'>+upgrade pppd to at least 2.4.0.</div><div class='add'>+</div><div class='add'>+If you are not using udev, you must have the device file /dev/ppp</div><div class='add'>+which can be made by::</div><div class='add'>+</div><div class='add'>+  mknod /dev/ppp c 108 0</div><div class='add'>+</div><div class='add'>+as root.</div><div class='add'>+</div><div class='add'>+Isdn4k-utils</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+Due to changes in the length of the phone number field, isdn4k-utils</div><div class='add'>+needs to be recompiled or (preferably) upgraded.</div><div class='add'>+</div><div class='add'>+NFS-utils</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+In ancient (2.4 and earlier) kernels, the nfs server needed to know</div><div class='add'>+about any client that expected to be able to access files via NFS.  This</div><div class='add'>+information would be given to the kernel by ``mountd`` when the client</div><div class='add'>+mounted the filesystem, or by ``exportfs`` at system startup.  exportfs</div><div class='add'>+would take information about active clients from ``/var/lib/nfs/rmtab``.</div><div class='add'>+</div><div class='add'>+This approach is quite fragile as it depends on rmtab being correct</div><div class='add'>+which is not always easy, particularly when trying to implement</div><div class='add'>+fail-over.  Even when the system is working well, ``rmtab`` suffers from</div><div class='add'>+getting lots of old entries that never get removed.</div><div class='add'>+</div><div class='add'>+With modern kernels we have the option of having the kernel tell mountd</div><div class='add'>+when it gets a request from an unknown host, and mountd can give</div><div class='add'>+appropriate export information to the kernel.  This removes the</div><div class='add'>+dependency on ``rmtab`` and means that the kernel only needs to know about</div><div class='add'>+currently active clients.</div><div class='add'>+</div><div class='add'>+To enable this new functionality, you need to::</div><div class='add'>+</div><div class='add'>+  mount -t nfsd nfsd /proc/fs/nfsd</div><div class='add'>+</div><div class='add'>+before running exportfs or mountd.  It is recommended that all NFS</div><div class='add'>+services be protected from the internet-at-large by a firewall where</div><div class='add'>+that is possible.</div><div class='add'>+</div><div class='add'>+mcelog</div><div class='add'>+------</div><div class='add'>+</div><div class='add'>+On x86 kernels the mcelog utility is needed to process and log machine check</div><div class='add'>+events when ``CONFIG_X86_MCE`` is enabled. Machine check events are errors</div><div class='add'>+reported by the CPU. Processing them is strongly encouraged.</div><div class='add'>+</div><div class='add'>+Kernel documentation</div><div class='add'>+********************</div><div class='add'>+</div><div class='add'>+Sphinx</div><div class='add'>+------</div><div class='add'>+</div><div class='add'>+The ReST markups currently used by the Documentation/ files are meant to be</div><div class='add'>+built with ``Sphinx`` version 1.2 or upper. If you're desiring to build</div><div class='add'>+PDF outputs, it is recommended to use version 1.4.6.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+  Please notice that, for PDF and LaTeX output, you'll also need ``XeLaTeX``</div><div class='add'>+  version 3.14159265. Depending on the distribution, you may also need</div><div class='add'>+  to install a series of ``texlive`` packages that provide the minimal</div><div class='add'>+  set of functionalities required for ``XeLaTex`` to work.</div><div class='add'>+</div><div class='add'>+Other tools</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+In order to produce documentation from DocBook, you'll also need ``xmlto``.</div><div class='add'>+Please notice, however, that we're currently migrating all documents to use</div><div class='add'>+``Sphinx``.</div><div class='add'>+</div><div class='add'>+Getting updated software</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+Kernel compilation</div><div class='add'>+******************</div><div class='add'>+</div><div class='add'>+gcc</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+- &lt;ftp://ftp.gnu.org/gnu/gcc/&gt;</div><div class='add'>+</div><div class='add'>+Make</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+- &lt;ftp://ftp.gnu.org/gnu/make/&gt;</div><div class='add'>+</div><div class='add'>+Binutils</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+- &lt;ftp://ftp.kernel.org/pub/linux/devel/binutils/&gt;</div><div class='add'>+</div><div class='add'>+OpenSSL</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+- &lt;https://www.openssl.org/&gt;</div><div class='add'>+</div><div class='add'>+System utilities</div><div class='add'>+****************</div><div class='add'>+</div><div class='add'>+Util-linux</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+- &lt;ftp://ftp.kernel.org/pub/linux/utils/util-linux/&gt;</div><div class='add'>+</div><div class='add'>+Ksymoops</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+- &lt;ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/&gt;</div><div class='add'>+</div><div class='add'>+Module-Init-Tools</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+- &lt;ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/&gt;</div><div class='add'>+</div><div class='add'>+Mkinitrd</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+- &lt;https://code.launchpad.net/initrd-tools/main&gt;</div><div class='add'>+</div><div class='add'>+E2fsprogs</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+- &lt;http://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.29.tar.gz&gt;</div><div class='add'>+</div><div class='add'>+JFSutils</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+- &lt;http://jfs.sourceforge.net/&gt;</div><div class='add'>+</div><div class='add'>+Reiserfsprogs</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+- &lt;http://www.kernel.org/pub/linux/utils/fs/reiserfs/&gt;</div><div class='add'>+</div><div class='add'>+Xfsprogs</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+- &lt;ftp://oss.sgi.com/projects/xfs/&gt;</div><div class='add'>+</div><div class='add'>+Pcmciautils</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+- &lt;ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/&gt;</div><div class='add'>+</div><div class='add'>+Quota-tools</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+- &lt;http://sourceforge.net/projects/linuxquota/&gt;</div><div class='add'>+</div><div class='add'>+DocBook Stylesheets</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+- &lt;http://sourceforge.net/projects/docbook/files/docbook-dsssl/&gt;</div><div class='add'>+</div><div class='add'>+XMLTO XSLT Frontend</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+- &lt;http://cyberelk.net/tim/xmlto/&gt;</div><div class='add'>+</div><div class='add'>+Intel P6 microcode</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+- &lt;https://downloadcenter.intel.com/&gt;</div><div class='add'>+</div><div class='add'>+udev</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+- &lt;http://www.freedesktop.org/software/systemd/man/udev.html&gt;</div><div class='add'>+</div><div class='add'>+FUSE</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+- &lt;http://sourceforge.net/projects/fuse&gt;</div><div class='add'>+</div><div class='add'>+mcelog</div><div class='add'>+------</div><div class='add'>+</div><div class='add'>+- &lt;http://www.mcelog.org/&gt;</div><div class='add'>+</div><div class='add'>+Networking</div><div class='add'>+**********</div><div class='add'>+</div><div class='add'>+PPP</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+- &lt;ftp://ftp.samba.org/pub/ppp/&gt;</div><div class='add'>+</div><div class='add'>+Isdn4k-utils</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+- &lt;ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/&gt;</div><div class='add'>+</div><div class='add'>+NFS-utils</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+- &lt;http://sourceforge.net/project/showfiles.php?group_id=14&gt;</div><div class='add'>+</div><div class='add'>+Iptables</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+- &lt;http://www.iptables.org/downloads.html&gt;</div><div class='add'>+</div><div class='add'>+Ip-route2</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+- &lt;https://www.kernel.org/pub/linux/utils/net/iproute2/&gt;</div><div class='add'>+</div><div class='add'>+OProfile</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+- &lt;http://oprofile.sf.net/download/&gt;</div><div class='add'>+</div><div class='add'>+NFS-Utils</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+- &lt;http://nfs.sourceforge.net/&gt;</div><div class='add'>+</div><div class='add'>+Kernel documentation</div><div class='add'>+********************</div><div class='add'>+</div><div class='add'>+Sphinx</div><div class='add'>+------</div><div class='add'>+</div><div class='add'>+- &lt;http://www.sphinx-doc.org/&gt;</div><div class='head'>diff --git a/Documentation/process/code-of-conflict.rst b/Documentation/process/code-of-conflict.rst<br/>new file mode 100644<br/>index 000000000000..47b6de763203<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/code-of-conflict.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/code-of-conflict.rst</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+Code of Conflict</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+The Linux kernel development effort is a very personal process compared</div><div class='add'>+to "traditional" ways of developing software.  Your code and ideas</div><div class='add'>+behind it will be carefully reviewed, often resulting in critique and</div><div class='add'>+criticism.  The review will almost always require improvements to the</div><div class='add'>+code before it can be included in the kernel.  Know that this happens</div><div class='add'>+because everyone involved wants to see the best possible solution for</div><div class='add'>+the overall success of Linux.  This development process has been proven</div><div class='add'>+to create the most robust operating system kernel ever, and we do not</div><div class='add'>+want to do anything to cause the quality of submission and eventual</div><div class='add'>+result to ever decrease.</div><div class='add'>+</div><div class='add'>+If however, anyone feels personally abused, threatened, or otherwise</div><div class='add'>+uncomfortable due to this process, that is not acceptable.  If so,</div><div class='add'>+please contact the Linux Foundation's Technical Advisory Board at</div><div class='add'>+&lt;tab@lists.linux-foundation.org&gt;, or the individual members, and they</div><div class='add'>+will work to resolve the issue to the best of their ability.  For more</div><div class='add'>+information on who is on the Technical Advisory Board and what their</div><div class='add'>+role is, please see:</div><div class='add'>+</div><div class='add'>+	- http://www.linuxfoundation.org/projects/linux/tab</div><div class='add'>+</div><div class='add'>+As a reviewer of code, please strive to keep things civil and focused on</div><div class='add'>+the technical issues involved.  We are all humans, and frustrations can</div><div class='add'>+be high on both sides of the process.  Try to keep in mind the immortal</div><div class='add'>+words of Bill and Ted, "Be excellent to each other."</div><div class='head'>diff --git a/Documentation/process/coding-style.rst b/Documentation/process/coding-style.rst<br/>new file mode 100644<br/>index 000000000000..d20d52a4d812<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/coding-style.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/coding-style.rst</a></div><div class='hunk'>@@ -0,0 +1,1062 @@</div><div class='add'>+.. _codingstyle:</div><div class='add'>+</div><div class='add'>+Linux kernel coding style</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+This is a short document describing the preferred coding style for the</div><div class='add'>+linux kernel.  Coding style is very personal, and I won't **force** my</div><div class='add'>+views on anybody, but this is what goes for anything that I have to be</div><div class='add'>+able to maintain, and I'd prefer it for most other things too.  Please</div><div class='add'>+at least consider the points made here.</div><div class='add'>+</div><div class='add'>+First off, I'd suggest printing out a copy of the GNU coding standards,</div><div class='add'>+and NOT read it.  Burn them, it's a great symbolic gesture.</div><div class='add'>+</div><div class='add'>+Anyway, here goes:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1) Indentation</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Tabs are 8 characters, and thus indentations are also 8 characters.</div><div class='add'>+There are heretic movements that try to make indentations 4 (or even 2!)</div><div class='add'>+characters deep, and that is akin to trying to define the value of PI to</div><div class='add'>+be 3.</div><div class='add'>+</div><div class='add'>+Rationale: The whole idea behind indentation is to clearly define where</div><div class='add'>+a block of control starts and ends.  Especially when you've been looking</div><div class='add'>+at your screen for 20 straight hours, you'll find it a lot easier to see</div><div class='add'>+how the indentation works if you have large indentations.</div><div class='add'>+</div><div class='add'>+Now, some people will claim that having 8-character indentations makes</div><div class='add'>+the code move too far to the right, and makes it hard to read on a</div><div class='add'>+80-character terminal screen.  The answer to that is that if you need</div><div class='add'>+more than 3 levels of indentation, you're screwed anyway, and should fix</div><div class='add'>+your program.</div><div class='add'>+</div><div class='add'>+In short, 8-char indents make things easier to read, and have the added</div><div class='add'>+benefit of warning you when you're nesting your functions too deep.</div><div class='add'>+Heed that warning.</div><div class='add'>+</div><div class='add'>+The preferred way to ease multiple indentation levels in a switch statement is</div><div class='add'>+to align the ``switch`` and its subordinate ``case`` labels in the same column</div><div class='add'>+instead of ``double-indenting`` the ``case`` labels.  E.g.:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	switch (suffix) {</div><div class='add'>+	case 'G':</div><div class='add'>+	case 'g':</div><div class='add'>+		mem &lt;&lt;= 30;</div><div class='add'>+		break;</div><div class='add'>+	case 'M':</div><div class='add'>+	case 'm':</div><div class='add'>+		mem &lt;&lt;= 20;</div><div class='add'>+		break;</div><div class='add'>+	case 'K':</div><div class='add'>+	case 'k':</div><div class='add'>+		mem &lt;&lt;= 10;</div><div class='add'>+		/* fall through */</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+Don't put multiple statements on a single line unless you have</div><div class='add'>+something to hide:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (condition) do_this;</div><div class='add'>+	  do_something_everytime;</div><div class='add'>+</div><div class='add'>+Don't put multiple assignments on a single line either.  Kernel coding style</div><div class='add'>+is super simple.  Avoid tricky expressions.</div><div class='add'>+</div><div class='add'>+Outside of comments, documentation and except in Kconfig, spaces are never</div><div class='add'>+used for indentation, and the above example is deliberately broken.</div><div class='add'>+</div><div class='add'>+Get a decent editor and don't leave whitespace at the end of lines.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2) Breaking long lines and strings</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+Coding style is all about readability and maintainability using commonly</div><div class='add'>+available tools.</div><div class='add'>+</div><div class='add'>+The limit on the length of lines is 80 columns and this is a strongly</div><div class='add'>+preferred limit.</div><div class='add'>+</div><div class='add'>+Statements longer than 80 columns will be broken into sensible chunks, unless</div><div class='add'>+exceeding 80 columns significantly increases readability and does not hide</div><div class='add'>+information. Descendants are always substantially shorter than the parent and</div><div class='add'>+are placed substantially to the right. The same applies to function headers</div><div class='add'>+with a long argument list. However, never break user-visible strings such as</div><div class='add'>+printk messages, because that breaks the ability to grep for them.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3) Placing Braces and Spaces</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+The other issue that always comes up in C styling is the placement of</div><div class='add'>+braces.  Unlike the indent size, there are few technical reasons to</div><div class='add'>+choose one placement strategy over the other, but the preferred way, as</div><div class='add'>+shown to us by the prophets Kernighan and Ritchie, is to put the opening</div><div class='add'>+brace last on the line, and put the closing brace first, thusly:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (x is true) {</div><div class='add'>+		we do y</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+This applies to all non-function statement blocks (if, switch, for,</div><div class='add'>+while, do).  E.g.:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case KOBJ_ADD:</div><div class='add'>+		return "add";</div><div class='add'>+	case KOBJ_REMOVE:</div><div class='add'>+		return "remove";</div><div class='add'>+	case KOBJ_CHANGE:</div><div class='add'>+		return "change";</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+However, there is one special case, namely functions: they have the</div><div class='add'>+opening brace at the beginning of the next line, thus:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int function(int x)</div><div class='add'>+	{</div><div class='add'>+		body of function</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+Heretic people all over the world have claimed that this inconsistency</div><div class='add'>+is ...  well ...  inconsistent, but all right-thinking people know that</div><div class='add'>+(a) K&amp;R are **right** and (b) K&amp;R are right.  Besides, functions are</div><div class='add'>+special anyway (you can't nest them in C).</div><div class='add'>+</div><div class='add'>+Note that the closing brace is empty on a line of its own, **except** in</div><div class='add'>+the cases where it is followed by a continuation of the same statement,</div><div class='add'>+ie a ``while`` in a do-statement or an ``else`` in an if-statement, like</div><div class='add'>+this:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		body of do-loop</div><div class='add'>+	} while (condition);</div><div class='add'>+</div><div class='add'>+and</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (x == y) {</div><div class='add'>+		..</div><div class='add'>+	} else if (x &gt; y) {</div><div class='add'>+		...</div><div class='add'>+	} else {</div><div class='add'>+		....</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+Rationale: K&amp;R.</div><div class='add'>+</div><div class='add'>+Also, note that this brace-placement also minimizes the number of empty</div><div class='add'>+(or almost empty) lines, without any loss of readability.  Thus, as the</div><div class='add'>+supply of new-lines on your screen is not a renewable resource (think</div><div class='add'>+25-line terminal screens here), you have more empty lines to put</div><div class='add'>+comments on.</div><div class='add'>+</div><div class='add'>+Do not unnecessarily use braces where a single statement will do.</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (condition)</div><div class='add'>+		action();</div><div class='add'>+</div><div class='add'>+and</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+	if (condition)</div><div class='add'>+		do_this();</div><div class='add'>+	else</div><div class='add'>+		do_that();</div><div class='add'>+</div><div class='add'>+This does not apply if only one branch of a conditional statement is a single</div><div class='add'>+statement; in the latter case use braces in both branches:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (condition) {</div><div class='add'>+		do_this();</div><div class='add'>+		do_that();</div><div class='add'>+	} else {</div><div class='add'>+		otherwise();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+3.1) Spaces</div><div class='add'>+***********</div><div class='add'>+</div><div class='add'>+Linux kernel style for use of spaces depends (mostly) on</div><div class='add'>+function-versus-keyword usage.  Use a space after (most) keywords.  The</div><div class='add'>+notable exceptions are sizeof, typeof, alignof, and __attribute__, which look</div><div class='add'>+somewhat like functions (and are usually used with parentheses in Linux,</div><div class='add'>+although they are not required in the language, as in: ``sizeof info`` after</div><div class='add'>+``struct fileinfo info;`` is declared).</div><div class='add'>+</div><div class='add'>+So use a space after these keywords::</div><div class='add'>+</div><div class='add'>+	if, switch, case, for, do, while</div><div class='add'>+</div><div class='add'>+but not with sizeof, typeof, alignof, or __attribute__.  E.g.,</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	s = sizeof(struct file);</div><div class='add'>+</div><div class='add'>+Do not add spaces around (inside) parenthesized expressions.  This example is</div><div class='add'>+**bad**:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	s = sizeof( struct file );</div><div class='add'>+</div><div class='add'>+When declaring pointer data or a function that returns a pointer type, the</div><div class='add'>+preferred use of ``*`` is adjacent to the data name or function name and not</div><div class='add'>+adjacent to the type name.  Examples:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	char *linux_banner;</div><div class='add'>+	unsigned long long memparse(char *ptr, char **retptr);</div><div class='add'>+	char *match_strdup(substring_t *s);</div><div class='add'>+</div><div class='add'>+Use one space around (on each side of) most binary and ternary operators,</div><div class='add'>+such as any of these::</div><div class='add'>+</div><div class='add'>+	=  +  -  &lt;  &gt;  *  /  %  |  &amp;  ^  &lt;=  &gt;=  ==  !=  ?  :</div><div class='add'>+</div><div class='add'>+but no space after unary operators::</div><div class='add'>+</div><div class='add'>+	&amp;  *  +  -  ~  !  sizeof  typeof  alignof  __attribute__  defined</div><div class='add'>+</div><div class='add'>+no space before the postfix increment &amp; decrement unary operators::</div><div class='add'>+</div><div class='add'>+	++  --</div><div class='add'>+</div><div class='add'>+no space after the prefix increment &amp; decrement unary operators::</div><div class='add'>+</div><div class='add'>+	++  --</div><div class='add'>+</div><div class='add'>+and no space around the ``.`` and ``-&gt;`` structure member operators.</div><div class='add'>+</div><div class='add'>+Do not leave trailing whitespace at the ends of lines.  Some editors with</div><div class='add'>+``smart`` indentation will insert whitespace at the beginning of new lines as</div><div class='add'>+appropriate, so you can start typing the next line of code right away.</div><div class='add'>+However, some such editors do not remove the whitespace if you end up not</div><div class='add'>+putting a line of code there, such as if you leave a blank line.  As a result,</div><div class='add'>+you end up with lines containing trailing whitespace.</div><div class='add'>+</div><div class='add'>+Git will warn you about patches that introduce trailing whitespace, and can</div><div class='add'>+optionally strip the trailing whitespace for you; however, if applying a series</div><div class='add'>+of patches, this may make later patches in the series fail by changing their</div><div class='add'>+context lines.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4) Naming</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+C is a Spartan language, and so should your naming be.  Unlike Modula-2</div><div class='add'>+and Pascal programmers, C programmers do not use cute names like</div><div class='add'>+ThisVariableIsATemporaryCounter.  A C programmer would call that</div><div class='add'>+variable ``tmp``, which is much easier to write, and not the least more</div><div class='add'>+difficult to understand.</div><div class='add'>+</div><div class='add'>+HOWEVER, while mixed-case names are frowned upon, descriptive names for</div><div class='add'>+global variables are a must.  To call a global function ``foo`` is a</div><div class='add'>+shooting offense.</div><div class='add'>+</div><div class='add'>+GLOBAL variables (to be used only if you **really** need them) need to</div><div class='add'>+have descriptive names, as do global functions.  If you have a function</div><div class='add'>+that counts the number of active users, you should call that</div><div class='add'>+``count_active_users()`` or similar, you should **not** call it ``cntusr()``.</div><div class='add'>+</div><div class='add'>+Encoding the type of a function into the name (so-called Hungarian</div><div class='add'>+notation) is brain damaged - the compiler knows the types anyway and can</div><div class='add'>+check those, and it only confuses the programmer.  No wonder MicroSoft</div><div class='add'>+makes buggy programs.</div><div class='add'>+</div><div class='add'>+LOCAL variable names should be short, and to the point.  If you have</div><div class='add'>+some random integer loop counter, it should probably be called ``i``.</div><div class='add'>+Calling it ``loop_counter`` is non-productive, if there is no chance of it</div><div class='add'>+being mis-understood.  Similarly, ``tmp`` can be just about any type of</div><div class='add'>+variable that is used to hold a temporary value.</div><div class='add'>+</div><div class='add'>+If you are afraid to mix up your local variable names, you have another</div><div class='add'>+problem, which is called the function-growth-hormone-imbalance syndrome.</div><div class='add'>+See chapter 6 (Functions).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5) Typedefs</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+Please don't use things like ``vps_t``.</div><div class='add'>+It's a **mistake** to use typedef for structures and pointers. When you see a</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	vps_t a;</div><div class='add'>+</div><div class='add'>+in the source, what does it mean?</div><div class='add'>+In contrast, if it says</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	struct virtual_container *a;</div><div class='add'>+</div><div class='add'>+you can actually tell what ``a`` is.</div><div class='add'>+</div><div class='add'>+Lots of people think that typedefs ``help readability``. Not so. They are</div><div class='add'>+useful only for:</div><div class='add'>+</div><div class='add'>+ (a) totally opaque objects (where the typedef is actively used to **hide**</div><div class='add'>+     what the object is).</div><div class='add'>+</div><div class='add'>+     Example: ``pte_t`` etc. opaque objects that you can only access using</div><div class='add'>+     the proper accessor functions.</div><div class='add'>+</div><div class='add'>+     .. note::</div><div class='add'>+</div><div class='add'>+       Opaqueness and ``accessor functions`` are not good in themselves.</div><div class='add'>+       The reason we have them for things like pte_t etc. is that there</div><div class='add'>+       really is absolutely **zero** portably accessible information there.</div><div class='add'>+</div><div class='add'>+ (b) Clear integer types, where the abstraction **helps** avoid confusion</div><div class='add'>+     whether it is ``int`` or ``long``.</div><div class='add'>+</div><div class='add'>+     u8/u16/u32 are perfectly fine typedefs, although they fit into</div><div class='add'>+     category (d) better than here.</div><div class='add'>+</div><div class='add'>+     .. note::</div><div class='add'>+</div><div class='add'>+       Again - there needs to be a **reason** for this. If something is</div><div class='add'>+       ``unsigned long``, then there's no reason to do</div><div class='add'>+</div><div class='add'>+	typedef unsigned long myflags_t;</div><div class='add'>+</div><div class='add'>+     but if there is a clear reason for why it under certain circumstances</div><div class='add'>+     might be an ``unsigned int`` and under other configurations might be</div><div class='add'>+     ``unsigned long``, then by all means go ahead and use a typedef.</div><div class='add'>+</div><div class='add'>+ (c) when you use sparse to literally create a **new** type for</div><div class='add'>+     type-checking.</div><div class='add'>+</div><div class='add'>+ (d) New types which are identical to standard C99 types, in certain</div><div class='add'>+     exceptional circumstances.</div><div class='add'>+</div><div class='add'>+     Although it would only take a short amount of time for the eyes and</div><div class='add'>+     brain to become accustomed to the standard types like ``uint32_t``,</div><div class='add'>+     some people object to their use anyway.</div><div class='add'>+</div><div class='add'>+     Therefore, the Linux-specific ``u8/u16/u32/u64`` types and their</div><div class='add'>+     signed equivalents which are identical to standard types are</div><div class='add'>+     permitted -- although they are not mandatory in new code of your</div><div class='add'>+     own.</div><div class='add'>+</div><div class='add'>+     When editing existing code which already uses one or the other set</div><div class='add'>+     of types, you should conform to the existing choices in that code.</div><div class='add'>+</div><div class='add'>+ (e) Types safe for use in userspace.</div><div class='add'>+</div><div class='add'>+     In certain structures which are visible to userspace, we cannot</div><div class='add'>+     require C99 types and cannot use the ``u32`` form above. Thus, we</div><div class='add'>+     use __u32 and similar types in all structures which are shared</div><div class='add'>+     with userspace.</div><div class='add'>+</div><div class='add'>+Maybe there are other cases too, but the rule should basically be to NEVER</div><div class='add'>+EVER use a typedef unless you can clearly match one of those rules.</div><div class='add'>+</div><div class='add'>+In general, a pointer, or a struct that has elements that can reasonably</div><div class='add'>+be directly accessed should **never** be a typedef.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6) Functions</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+Functions should be short and sweet, and do just one thing.  They should</div><div class='add'>+fit on one or two screenfuls of text (the ISO/ANSI screen size is 80x24,</div><div class='add'>+as we all know), and do one thing and do that well.</div><div class='add'>+</div><div class='add'>+The maximum length of a function is inversely proportional to the</div><div class='add'>+complexity and indentation level of that function.  So, if you have a</div><div class='add'>+conceptually simple function that is just one long (but simple)</div><div class='add'>+case-statement, where you have to do lots of small things for a lot of</div><div class='add'>+different cases, it's OK to have a longer function.</div><div class='add'>+</div><div class='add'>+However, if you have a complex function, and you suspect that a</div><div class='add'>+less-than-gifted first-year high-school student might not even</div><div class='add'>+understand what the function is all about, you should adhere to the</div><div class='add'>+maximum limits all the more closely.  Use helper functions with</div><div class='add'>+descriptive names (you can ask the compiler to in-line them if you think</div><div class='add'>+it's performance-critical, and it will probably do a better job of it</div><div class='add'>+than you would have done).</div><div class='add'>+</div><div class='add'>+Another measure of the function is the number of local variables.  They</div><div class='add'>+shouldn't exceed 5-10, or you're doing something wrong.  Re-think the</div><div class='add'>+function, and split it into smaller pieces.  A human brain can</div><div class='add'>+generally easily keep track of about 7 different things, anything more</div><div class='add'>+and it gets confused.  You know you're brilliant, but maybe you'd like</div><div class='add'>+to understand what you did 2 weeks from now.</div><div class='add'>+</div><div class='add'>+In source files, separate functions with one blank line.  If the function is</div><div class='add'>+exported, the **EXPORT** macro for it should follow immediately after the</div><div class='add'>+closing function brace line.  E.g.:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int system_is_up(void)</div><div class='add'>+	{</div><div class='add'>+		return system_state == SYSTEM_RUNNING;</div><div class='add'>+	}</div><div class='add'>+	EXPORT_SYMBOL(system_is_up);</div><div class='add'>+</div><div class='add'>+In function prototypes, include parameter names with their data types.</div><div class='add'>+Although this is not required by the C language, it is preferred in Linux</div><div class='add'>+because it is a simple way to add valuable information for the reader.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+7) Centralized exiting of functions</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+Albeit deprecated by some people, the equivalent of the goto statement is</div><div class='add'>+used frequently by compilers in form of the unconditional jump instruction.</div><div class='add'>+</div><div class='add'>+The goto statement comes in handy when a function exits from multiple</div><div class='add'>+locations and some common work such as cleanup has to be done.  If there is no</div><div class='add'>+cleanup needed then just return directly.</div><div class='add'>+</div><div class='add'>+Choose label names which say what the goto does or why the goto exists.  An</div><div class='add'>+example of a good name could be ``out_free_buffer:`` if the goto frees ``buffer``.</div><div class='add'>+Avoid using GW-BASIC names like ``err1:`` and ``err2:``, as you would have to</div><div class='add'>+renumber them if you ever add or remove exit paths, and they make correctness</div><div class='add'>+difficult to verify anyway.</div><div class='add'>+</div><div class='add'>+The rationale for using gotos is:</div><div class='add'>+</div><div class='add'>+- unconditional statements are easier to understand and follow</div><div class='add'>+- nesting is reduced</div><div class='add'>+- errors by not updating individual exit points when making</div><div class='add'>+  modifications are prevented</div><div class='add'>+- saves the compiler work to optimize redundant code away ;)</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int fun(int a)</div><div class='add'>+	{</div><div class='add'>+		int result = 0;</div><div class='add'>+		char *buffer;</div><div class='add'>+</div><div class='add'>+		buffer = kmalloc(SIZE, GFP_KERNEL);</div><div class='add'>+		if (!buffer)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (condition1) {</div><div class='add'>+			while (loop1) {</div><div class='add'>+				...</div><div class='add'>+			}</div><div class='add'>+			result = 1;</div><div class='add'>+			goto out_free_buffer;</div><div class='add'>+		}</div><div class='add'>+		...</div><div class='add'>+	out_free_buffer:</div><div class='add'>+		kfree(buffer);</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+A common type of bug to be aware of is ``one err bugs`` which look like this:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	err:</div><div class='add'>+		kfree(foo-&gt;bar);</div><div class='add'>+		kfree(foo);</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+The bug in this code is that on some exit paths ``foo`` is NULL.  Normally the</div><div class='add'>+fix for this is to split it up into two error labels ``err_free_bar:`` and</div><div class='add'>+``err_free_foo:``:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	 err_free_bar:</div><div class='add'>+		kfree(foo-&gt;bar);</div><div class='add'>+	 err_free_foo:</div><div class='add'>+		kfree(foo);</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+Ideally you should simulate errors to test all exit paths.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+8) Commenting</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+Comments are good, but there is also a danger of over-commenting.  NEVER</div><div class='add'>+try to explain HOW your code works in a comment: it's much better to</div><div class='add'>+write the code so that the **working** is obvious, and it's a waste of</div><div class='add'>+time to explain badly written code.</div><div class='add'>+</div><div class='add'>+Generally, you want your comments to tell WHAT your code does, not HOW.</div><div class='add'>+Also, try to avoid putting comments inside a function body: if the</div><div class='add'>+function is so complex that you need to separately comment parts of it,</div><div class='add'>+you should probably go back to chapter 6 for a while.  You can make</div><div class='add'>+small comments to note or warn about something particularly clever (or</div><div class='add'>+ugly), but try to avoid excess.  Instead, put the comments at the head</div><div class='add'>+of the function, telling people what it does, and possibly WHY it does</div><div class='add'>+it.</div><div class='add'>+</div><div class='add'>+When commenting the kernel API functions, please use the kernel-doc format.</div><div class='add'>+See the files at :ref:`Documentation/doc-guide/ &lt;doc_guide&gt;` and</div><div class='add'>+``scripts/kernel-doc`` for details.</div><div class='add'>+</div><div class='add'>+The preferred style for long (multi-line) comments is:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is the preferred style for multi-line</div><div class='add'>+	 * comments in the Linux kernel source code.</div><div class='add'>+	 * Please use it consistently.</div><div class='add'>+	 *</div><div class='add'>+	 * Description:  A column of asterisks on the left side,</div><div class='add'>+	 * with beginning and ending almost-blank lines.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+For files in net/ and drivers/net/ the preferred style for long (multi-line)</div><div class='add'>+comments is a little different.</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	/* The preferred comment style for files in net/ and drivers/net</div><div class='add'>+	 * looks like this.</div><div class='add'>+	 *</div><div class='add'>+	 * It is nearly the same as the generally preferred comment style,</div><div class='add'>+	 * but there is no initial almost-blank line.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+It's also important to comment data, whether they are basic types or derived</div><div class='add'>+types.  To this end, use just one data declaration per line (no commas for</div><div class='add'>+multiple data declarations).  This leaves you room for a small comment on each</div><div class='add'>+item, explaining its use.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+9) You've made a mess of it</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+That's OK, we all do.  You've probably been told by your long-time Unix</div><div class='add'>+user helper that ``GNU emacs`` automatically formats the C sources for</div><div class='add'>+you, and you've noticed that yes, it does do that, but the defaults it</div><div class='add'>+uses are less than desirable (in fact, they are worse than random</div><div class='add'>+typing - an infinite number of monkeys typing into GNU emacs would never</div><div class='add'>+make a good program).</div><div class='add'>+</div><div class='add'>+So, you can either get rid of GNU emacs, or change it to use saner</div><div class='add'>+values.  To do the latter, you can stick the following in your .emacs file:</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+  (defun c-lineup-arglist-tabs-only (ignored)</div><div class='add'>+    "Line up argument lists by tabs, not spaces"</div><div class='add'>+    (let* ((anchor (c-langelem-pos c-syntactic-element))</div><div class='add'>+           (column (c-langelem-2nd-pos c-syntactic-element))</div><div class='add'>+           (offset (- (1+ column) anchor))</div><div class='add'>+           (steps (floor offset c-basic-offset)))</div><div class='add'>+      (* (max steps 1)</div><div class='add'>+         c-basic-offset)))</div><div class='add'>+</div><div class='add'>+  (add-hook 'c-mode-common-hook</div><div class='add'>+            (lambda ()</div><div class='add'>+              ;; Add kernel style</div><div class='add'>+              (c-add-style</div><div class='add'>+               "linux-tabs-only"</div><div class='add'>+               '("linux" (c-offsets-alist</div><div class='add'>+                          (arglist-cont-nonempty</div><div class='add'>+                           c-lineup-gcc-asm-reg</div><div class='add'>+                           c-lineup-arglist-tabs-only))))))</div><div class='add'>+</div><div class='add'>+  (add-hook 'c-mode-hook</div><div class='add'>+            (lambda ()</div><div class='add'>+              (let ((filename (buffer-file-name)))</div><div class='add'>+                ;; Enable kernel mode for the appropriate files</div><div class='add'>+                (when (and filename</div><div class='add'>+                           (string-match (expand-file-name "~/src/linux-trees")</div><div class='add'>+                                         filename))</div><div class='add'>+                  (setq indent-tabs-mode t)</div><div class='add'>+                  (setq show-trailing-whitespace t)</div><div class='add'>+                  (c-set-style "linux-tabs-only")))))</div><div class='add'>+</div><div class='add'>+This will make emacs go better with the kernel coding style for C</div><div class='add'>+files below ``~/src/linux-trees``.</div><div class='add'>+</div><div class='add'>+But even if you fail in getting emacs to do sane formatting, not</div><div class='add'>+everything is lost: use ``indent``.</div><div class='add'>+</div><div class='add'>+Now, again, GNU indent has the same brain-dead settings that GNU emacs</div><div class='add'>+has, which is why you need to give it a few command line options.</div><div class='add'>+However, that's not too bad, because even the makers of GNU indent</div><div class='add'>+recognize the authority of K&amp;R (the GNU people aren't evil, they are</div><div class='add'>+just severely misguided in this matter), so you just give indent the</div><div class='add'>+options ``-kr -i8`` (stands for ``K&amp;R, 8 character indents``), or use</div><div class='add'>+``scripts/Lindent``, which indents in the latest style.</div><div class='add'>+</div><div class='add'>+``indent`` has a lot of options, and especially when it comes to comment</div><div class='add'>+re-formatting you may want to take a look at the man page.  But</div><div class='add'>+remember: ``indent`` is not a fix for bad programming.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+10) Kconfig configuration files</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+For all of the Kconfig* configuration files throughout the source tree,</div><div class='add'>+the indentation is somewhat different.  Lines under a ``config`` definition</div><div class='add'>+are indented with one tab, while help text is indented an additional two</div><div class='add'>+spaces.  Example::</div><div class='add'>+</div><div class='add'>+  config AUDIT</div><div class='add'>+	bool "Auditing support"</div><div class='add'>+	depends on NET</div><div class='add'>+	help</div><div class='add'>+	  Enable auditing infrastructure that can be used with another</div><div class='add'>+	  kernel subsystem, such as SELinux (which requires this for</div><div class='add'>+	  logging of avc messages output).  Does not do system-call</div><div class='add'>+	  auditing without CONFIG_AUDITSYSCALL.</div><div class='add'>+</div><div class='add'>+Seriously dangerous features (such as write support for certain</div><div class='add'>+filesystems) should advertise this prominently in their prompt string::</div><div class='add'>+</div><div class='add'>+  config ADFS_FS_RW</div><div class='add'>+	bool "ADFS write support (DANGEROUS)"</div><div class='add'>+	depends on ADFS_FS</div><div class='add'>+	...</div><div class='add'>+</div><div class='add'>+For full documentation on the configuration files, see the file</div><div class='add'>+Documentation/kbuild/kconfig-language.txt.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+11) Data structures</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Data structures that have visibility outside the single-threaded</div><div class='add'>+environment they are created and destroyed in should always have</div><div class='add'>+reference counts.  In the kernel, garbage collection doesn't exist (and</div><div class='add'>+outside the kernel garbage collection is slow and inefficient), which</div><div class='add'>+means that you absolutely **have** to reference count all your uses.</div><div class='add'>+</div><div class='add'>+Reference counting means that you can avoid locking, and allows multiple</div><div class='add'>+users to have access to the data structure in parallel - and not having</div><div class='add'>+to worry about the structure suddenly going away from under them just</div><div class='add'>+because they slept or did something else for a while.</div><div class='add'>+</div><div class='add'>+Note that locking is **not** a replacement for reference counting.</div><div class='add'>+Locking is used to keep data structures coherent, while reference</div><div class='add'>+counting is a memory management technique.  Usually both are needed, and</div><div class='add'>+they are not to be confused with each other.</div><div class='add'>+</div><div class='add'>+Many data structures can indeed have two levels of reference counting,</div><div class='add'>+when there are users of different ``classes``.  The subclass count counts</div><div class='add'>+the number of subclass users, and decrements the global count just once</div><div class='add'>+when the subclass count goes to zero.</div><div class='add'>+</div><div class='add'>+Examples of this kind of ``multi-level-reference-counting`` can be found in</div><div class='add'>+memory management (``struct mm_struct``: mm_users and mm_count), and in</div><div class='add'>+filesystem code (``struct super_block``: s_count and s_active).</div><div class='add'>+</div><div class='add'>+Remember: if another thread can find your data structure, and you don't</div><div class='add'>+have a reference count on it, you almost certainly have a bug.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+12) Macros, Enums and RTL</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+Names of macros defining constants and labels in enums are capitalized.</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define CONSTANT 0x12345</div><div class='add'>+</div><div class='add'>+Enums are preferred when defining several related constants.</div><div class='add'>+</div><div class='add'>+CAPITALIZED macro names are appreciated but macros resembling functions</div><div class='add'>+may be named in lower case.</div><div class='add'>+</div><div class='add'>+Generally, inline functions are preferable to macros resembling functions.</div><div class='add'>+</div><div class='add'>+Macros with multiple statements should be enclosed in a do - while block:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define macrofun(a, b, c)			\</div><div class='add'>+		do {					\</div><div class='add'>+			if (a == 5)			\</div><div class='add'>+				do_this(b, c);		\</div><div class='add'>+		} while (0)</div><div class='add'>+</div><div class='add'>+Things to avoid when using macros:</div><div class='add'>+</div><div class='add'>+1) macros that affect control flow:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define FOO(x)					\</div><div class='add'>+		do {					\</div><div class='add'>+			if (blah(x) &lt; 0)		\</div><div class='add'>+				return -EBUGGERED;	\</div><div class='add'>+		} while (0)</div><div class='add'>+</div><div class='add'>+is a **very** bad idea.  It looks like a function call but exits the ``calling``</div><div class='add'>+function; don't break the internal parsers of those who will read the code.</div><div class='add'>+</div><div class='add'>+2) macros that depend on having a local variable with a magic name:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define FOO(val) bar(index, val)</div><div class='add'>+</div><div class='add'>+might look like a good thing, but it's confusing as hell when one reads the</div><div class='add'>+code and it's prone to breakage from seemingly innocent changes.</div><div class='add'>+</div><div class='add'>+3) macros with arguments that are used as l-values: FOO(x) = y; will</div><div class='add'>+bite you if somebody e.g. turns FOO into an inline function.</div><div class='add'>+</div><div class='add'>+4) forgetting about precedence: macros defining constants using expressions</div><div class='add'>+must enclose the expression in parentheses. Beware of similar issues with</div><div class='add'>+macros using parameters.</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define CONSTANT 0x4000</div><div class='add'>+	#define CONSTEXP (CONSTANT | 3)</div><div class='add'>+</div><div class='add'>+5) namespace collisions when defining local variables in macros resembling</div><div class='add'>+functions:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define FOO(x)				\</div><div class='add'>+	({					\</div><div class='add'>+		typeof(x) ret;			\</div><div class='add'>+		ret = calc_ret(x);		\</div><div class='add'>+		(ret);				\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+ret is a common name for a local variable - __foo_ret is less likely</div><div class='add'>+to collide with an existing variable.</div><div class='add'>+</div><div class='add'>+The cpp manual deals with macros exhaustively. The gcc internals manual also</div><div class='add'>+covers RTL which is used frequently with assembly language in the kernel.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+13) Printing kernel messages</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+Kernel developers like to be seen as literate. Do mind the spelling</div><div class='add'>+of kernel messages to make a good impression. Do not use crippled</div><div class='add'>+words like ``dont``; use ``do not`` or ``don't`` instead.  Make the messages</div><div class='add'>+concise, clear, and unambiguous.</div><div class='add'>+</div><div class='add'>+Kernel messages do not have to be terminated with a period.</div><div class='add'>+</div><div class='add'>+Printing numbers in parentheses (%d) adds no value and should be avoided.</div><div class='add'>+</div><div class='add'>+There are a number of driver model diagnostic macros in &lt;linux/device.h&gt;</div><div class='add'>+which you should use to make sure messages are matched to the right device</div><div class='add'>+and driver, and are tagged with the right level:  dev_err(), dev_warn(),</div><div class='add'>+dev_info(), and so forth.  For messages that aren't associated with a</div><div class='add'>+particular device, &lt;linux/printk.h&gt; defines pr_notice(), pr_info(),</div><div class='add'>+pr_warn(), pr_err(), etc.</div><div class='add'>+</div><div class='add'>+Coming up with good debugging messages can be quite a challenge; and once</div><div class='add'>+you have them, they can be a huge help for remote troubleshooting.  However</div><div class='add'>+debug message printing is handled differently than printing other non-debug</div><div class='add'>+messages.  While the other pr_XXX() functions print unconditionally,</div><div class='add'>+pr_debug() does not; it is compiled out by default, unless either DEBUG is</div><div class='add'>+defined or CONFIG_DYNAMIC_DEBUG is set.  That is true for dev_dbg() also,</div><div class='add'>+and a related convention uses VERBOSE_DEBUG to add dev_vdbg() messages to</div><div class='add'>+the ones already enabled by DEBUG.</div><div class='add'>+</div><div class='add'>+Many subsystems have Kconfig debug options to turn on -DDEBUG in the</div><div class='add'>+corresponding Makefile; in other cases specific files #define DEBUG.  And</div><div class='add'>+when a debug message should be unconditionally printed, such as if it is</div><div class='add'>+already inside a debug-related #ifdef section, printk(KERN_DEBUG ...) can be</div><div class='add'>+used.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+14) Allocating memory</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The kernel provides the following general purpose memory allocators:</div><div class='add'>+kmalloc(), kzalloc(), kmalloc_array(), kcalloc(), vmalloc(), and</div><div class='add'>+vzalloc().  Please refer to the API documentation for further information</div><div class='add'>+about them.</div><div class='add'>+</div><div class='add'>+The preferred form for passing a size of a struct is the following:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	p = kmalloc(sizeof(*p), ...);</div><div class='add'>+</div><div class='add'>+The alternative form where struct name is spelled out hurts readability and</div><div class='add'>+introduces an opportunity for a bug when the pointer variable type is changed</div><div class='add'>+but the corresponding sizeof that is passed to a memory allocator is not.</div><div class='add'>+</div><div class='add'>+Casting the return value which is a void pointer is redundant. The conversion</div><div class='add'>+from void pointer to any other pointer type is guaranteed by the C programming</div><div class='add'>+language.</div><div class='add'>+</div><div class='add'>+The preferred form for allocating an array is the following:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	p = kmalloc_array(n, sizeof(...), ...);</div><div class='add'>+</div><div class='add'>+The preferred form for allocating a zeroed array is the following:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	p = kcalloc(n, sizeof(...), ...);</div><div class='add'>+</div><div class='add'>+Both forms check for overflow on the allocation size n * sizeof(...),</div><div class='add'>+and return NULL if that occurred.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+15) The inline disease</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+There appears to be a common misperception that gcc has a magic "make me</div><div class='add'>+faster" speedup option called ``inline``. While the use of inlines can be</div><div class='add'>+appropriate (for example as a means of replacing macros, see Chapter 12), it</div><div class='add'>+very often is not. Abundant use of the inline keyword leads to a much bigger</div><div class='add'>+kernel, which in turn slows the system as a whole down, due to a bigger</div><div class='add'>+icache footprint for the CPU and simply because there is less memory</div><div class='add'>+available for the pagecache. Just think about it; a pagecache miss causes a</div><div class='add'>+disk seek, which easily takes 5 milliseconds. There are a LOT of cpu cycles</div><div class='add'>+that can go into these 5 milliseconds.</div><div class='add'>+</div><div class='add'>+A reasonable rule of thumb is to not put inline at functions that have more</div><div class='add'>+than 3 lines of code in them. An exception to this rule are the cases where</div><div class='add'>+a parameter is known to be a compiletime constant, and as a result of this</div><div class='add'>+constantness you *know* the compiler will be able to optimize most of your</div><div class='add'>+function away at compile time. For a good example of this later case, see</div><div class='add'>+the kmalloc() inline function.</div><div class='add'>+</div><div class='add'>+Often people argue that adding inline to functions that are static and used</div><div class='add'>+only once is always a win since there is no space tradeoff. While this is</div><div class='add'>+technically correct, gcc is capable of inlining these automatically without</div><div class='add'>+help, and the maintenance issue of removing the inline when a second user</div><div class='add'>+appears outweighs the potential value of the hint that tells gcc to do</div><div class='add'>+something it would have done anyway.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+16) Function return values and names</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+Functions can return values of many different kinds, and one of the</div><div class='add'>+most common is a value indicating whether the function succeeded or</div><div class='add'>+failed.  Such a value can be represented as an error-code integer</div><div class='add'>+(-Exxx = failure, 0 = success) or a ``succeeded`` boolean (0 = failure,</div><div class='add'>+non-zero = success).</div><div class='add'>+</div><div class='add'>+Mixing up these two sorts of representations is a fertile source of</div><div class='add'>+difficult-to-find bugs.  If the C language included a strong distinction</div><div class='add'>+between integers and booleans then the compiler would find these mistakes</div><div class='add'>+for us... but it doesn't.  To help prevent such bugs, always follow this</div><div class='add'>+convention::</div><div class='add'>+</div><div class='add'>+	If the name of a function is an action or an imperative command,</div><div class='add'>+	the function should return an error-code integer.  If the name</div><div class='add'>+	is a predicate, the function should return a "succeeded" boolean.</div><div class='add'>+</div><div class='add'>+For example, ``add work`` is a command, and the add_work() function returns 0</div><div class='add'>+for success or -EBUSY for failure.  In the same way, ``PCI device present`` is</div><div class='add'>+a predicate, and the pci_dev_present() function returns 1 if it succeeds in</div><div class='add'>+finding a matching device or 0 if it doesn't.</div><div class='add'>+</div><div class='add'>+All EXPORTed functions must respect this convention, and so should all</div><div class='add'>+public functions.  Private (static) functions need not, but it is</div><div class='add'>+recommended that they do.</div><div class='add'>+</div><div class='add'>+Functions whose return value is the actual result of a computation, rather</div><div class='add'>+than an indication of whether the computation succeeded, are not subject to</div><div class='add'>+this rule.  Generally they indicate failure by returning some out-of-range</div><div class='add'>+result.  Typical examples would be functions that return pointers; they use</div><div class='add'>+NULL or the ERR_PTR mechanism to report failure.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+17) Don't re-invent the kernel macros</div><div class='add'>+-------------------------------------</div><div class='add'>+</div><div class='add'>+The header file include/linux/kernel.h contains a number of macros that</div><div class='add'>+you should use, rather than explicitly coding some variant of them yourself.</div><div class='add'>+For example, if you need to calculate the length of an array, take advantage</div><div class='add'>+of the macro</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))</div><div class='add'>+</div><div class='add'>+Similarly, if you need to calculate the size of some structure member, use</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)-&gt;f))</div><div class='add'>+</div><div class='add'>+There are also min() and max() macros that do strict type checking if you</div><div class='add'>+need them.  Feel free to peruse that header file to see what else is already</div><div class='add'>+defined that you shouldn't reproduce in your code.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+18) Editor modelines and other cruft</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+Some editors can interpret configuration information embedded in source files,</div><div class='add'>+indicated with special markers.  For example, emacs interprets lines marked</div><div class='add'>+like this:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	-*- mode: c -*-</div><div class='add'>+</div><div class='add'>+Or like this:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	Local Variables:</div><div class='add'>+	compile-command: "gcc -DMAGIC_DEBUG_FLAG foo.c"</div><div class='add'>+	End:</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+Vim interprets markers that look like this:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	/* vim:set sw=8 noet */</div><div class='add'>+</div><div class='add'>+Do not include any of these in source files.  People have their own personal</div><div class='add'>+editor configurations, and your source files should not override them.  This</div><div class='add'>+includes markers for indentation and mode configuration.  People may use their</div><div class='add'>+own custom mode, or may have some other magic method for making indentation</div><div class='add'>+work correctly.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+19) Inline assembly</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+In architecture-specific code, you may need to use inline assembly to interface</div><div class='add'>+with CPU or platform functionality.  Don't hesitate to do so when necessary.</div><div class='add'>+However, don't use inline assembly gratuitously when C can do the job.  You can</div><div class='add'>+and should poke hardware from C when possible.</div><div class='add'>+</div><div class='add'>+Consider writing simple helper functions that wrap common bits of inline</div><div class='add'>+assembly, rather than repeatedly writing them with slight variations.  Remember</div><div class='add'>+that inline assembly can use C parameters.</div><div class='add'>+</div><div class='add'>+Large, non-trivial assembly functions should go in .S files, with corresponding</div><div class='add'>+C prototypes defined in C header files.  The C prototypes for assembly</div><div class='add'>+functions should use ``asmlinkage``.</div><div class='add'>+</div><div class='add'>+You may need to mark your asm statement as volatile, to prevent GCC from</div><div class='add'>+removing it if GCC doesn't notice any side effects.  You don't always need to</div><div class='add'>+do so, though, and doing so unnecessarily can limit optimization.</div><div class='add'>+</div><div class='add'>+When writing a single inline assembly statement containing multiple</div><div class='add'>+instructions, put each instruction on a separate line in a separate quoted</div><div class='add'>+string, and end each string except the last with \n\t to properly indent the</div><div class='add'>+next instruction in the assembly output:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	asm ("magic %reg1, #42\n\t"</div><div class='add'>+	     "more_magic %reg2, %reg3"</div><div class='add'>+	     : /* outputs */ : /* inputs */ : /* clobbers */);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+20) Conditional Compilation</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+Wherever possible, don't use preprocessor conditionals (#if, #ifdef) in .c</div><div class='add'>+files; doing so makes code harder to read and logic harder to follow.  Instead,</div><div class='add'>+use such conditionals in a header file defining functions for use in those .c</div><div class='add'>+files, providing no-op stub versions in the #else case, and then call those</div><div class='add'>+functions unconditionally from .c files.  The compiler will avoid generating</div><div class='add'>+any code for the stub calls, producing identical results, but the logic will</div><div class='add'>+remain easy to follow.</div><div class='add'>+</div><div class='add'>+Prefer to compile out entire functions, rather than portions of functions or</div><div class='add'>+portions of expressions.  Rather than putting an ifdef in an expression, factor</div><div class='add'>+out part or all of the expression into a separate helper function and apply the</div><div class='add'>+conditional to that function.</div><div class='add'>+</div><div class='add'>+If you have a function or variable which may potentially go unused in a</div><div class='add'>+particular configuration, and the compiler would warn about its definition</div><div class='add'>+going unused, mark the definition as __maybe_unused rather than wrapping it in</div><div class='add'>+a preprocessor conditional.  (However, if a function or variable *always* goes</div><div class='add'>+unused, delete it.)</div><div class='add'>+</div><div class='add'>+Within code, where possible, use the IS_ENABLED macro to convert a Kconfig</div><div class='add'>+symbol into a C boolean expression, and use it in a normal C conditional:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_SOMETHING)) {</div><div class='add'>+		...</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+The compiler will constant-fold the conditional away, and include or exclude</div><div class='add'>+the block of code just as with an #ifdef, so this will not add any runtime</div><div class='add'>+overhead.  However, this approach still allows the C compiler to see the code</div><div class='add'>+inside the block, and check it for correctness (syntax, types, symbol</div><div class='add'>+references, etc).  Thus, you still have to use an #ifdef if the code inside the</div><div class='add'>+block references symbols that will not exist if the condition is not met.</div><div class='add'>+</div><div class='add'>+At the end of any non-trivial #if or #ifdef block (more than a few lines),</div><div class='add'>+place a comment after the #endif on the same line, noting the conditional</div><div class='add'>+expression used.  For instance:</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#ifdef CONFIG_SOMETHING</div><div class='add'>+	...</div><div class='add'>+	#endif /* CONFIG_SOMETHING */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Appendix I) References</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+The C Programming Language, Second Edition</div><div class='add'>+by Brian W. Kernighan and Dennis M. Ritchie.</div><div class='add'>+Prentice Hall, Inc., 1988.</div><div class='add'>+ISBN 0-13-110362-8 (paperback), 0-13-110370-9 (hardback).</div><div class='add'>+</div><div class='add'>+The Practice of Programming</div><div class='add'>+by Brian W. Kernighan and Rob Pike.</div><div class='add'>+Addison-Wesley, Inc., 1999.</div><div class='add'>+ISBN 0-201-61586-X.</div><div class='add'>+</div><div class='add'>+GNU manuals - where in compliance with K&amp;R and this text - for cpp, gcc,</div><div class='add'>+gcc internals and indent, all available from http://www.gnu.org/manual/</div><div class='add'>+</div><div class='add'>+WG14 is the international standardization working group for the programming</div><div class='add'>+language C, URL: http://www.open-std.org/JTC1/SC22/WG14/</div><div class='add'>+</div><div class='add'>+Kernel process/coding-style.rst, by greg@kroah.com at OLS 2002:</div><div class='add'>+http://www.kroah.com/linux/talks/ols_2002_kernel_codingstyle_talk/html/</div><div class='head'>diff --git a/Documentation/process/conf.py b/Documentation/process/conf.py<br/>new file mode 100644<br/>index 000000000000..1b01a80ad9ce<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/conf.py</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# -*- coding: utf-8; mode: python -*-</div><div class='add'>+</div><div class='add'>+project = 'Linux Kernel Development Documentation'</div><div class='add'>+</div><div class='add'>+tags.add("subproject")</div><div class='add'>+</div><div class='add'>+latex_documents = [</div><div class='add'>+    ('index', 'process.tex', 'Linux Kernel Development Documentation',</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+]</div><div class='head'>diff --git a/Documentation/development-process/development-process.rst b/Documentation/process/development-process.rst<br/>index bd1399f7202a..61c627e41ba8 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/development-process/development-process.rst?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/development-process/development-process.rst</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/development-process.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/development-process.rst</a></div><div class='hunk'>@@ -26,4 +26,3 @@ development (or, indeed, free software development in general).  While</div><div class='ctx'> there is some technical material here, this is very much a process-oriented</div><div class='ctx'> discussion which does not require a deep knowledge of kernel programming to</div><div class='ctx'> understand.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/email-clients.txt b/Documentation/process/email-clients.rst<br/>index ac892b30815e..ac892b30815e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/email-clients.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/email-clients.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/email-clients.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/email-clients.rst</a></div><div class='head'>diff --git a/Documentation/process/howto.rst b/Documentation/process/howto.rst<br/>new file mode 100644<br/>index 000000000000..1260f60d4cb9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/howto.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/howto.rst</a></div><div class='hunk'>@@ -0,0 +1,658 @@</div><div class='add'>+HOWTO do Linux kernel development</div><div class='add'>+=================================</div><div class='add'>+</div><div class='add'>+This is the be-all, end-all document on this topic.  It contains</div><div class='add'>+instructions on how to become a Linux kernel developer and how to learn</div><div class='add'>+to work with the Linux kernel development community.  It tries to not</div><div class='add'>+contain anything related to the technical aspects of kernel programming,</div><div class='add'>+but will help point you in the right direction for that.</div><div class='add'>+</div><div class='add'>+If anything in this document becomes out of date, please send in patches</div><div class='add'>+to the maintainer of this file, who is listed at the bottom of the</div><div class='add'>+document.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+So, you want to learn how to become a Linux kernel developer?  Or you</div><div class='add'>+have been told by your manager, "Go write a Linux driver for this</div><div class='add'>+device."  This document's goal is to teach you everything you need to</div><div class='add'>+know to achieve this by describing the process you need to go through,</div><div class='add'>+and hints on how to work with the community.  It will also try to</div><div class='add'>+explain some of the reasons why the community works like it does.</div><div class='add'>+</div><div class='add'>+The kernel is written mostly in C, with some architecture-dependent</div><div class='add'>+parts written in assembly. A good understanding of C is required for</div><div class='add'>+kernel development.  Assembly (any architecture) is not required unless</div><div class='add'>+you plan to do low-level development for that architecture.  Though they</div><div class='add'>+are not a good substitute for a solid C education and/or years of</div><div class='add'>+experience, the following books are good for, if anything, reference:</div><div class='add'>+</div><div class='add'>+ - "The C Programming Language" by Kernighan and Ritchie [Prentice Hall]</div><div class='add'>+ - "Practical C Programming" by Steve Oualline [O'Reilly]</div><div class='add'>+ - "C:  A Reference Manual" by Harbison and Steele [Prentice Hall]</div><div class='add'>+</div><div class='add'>+The kernel is written using GNU C and the GNU toolchain.  While it</div><div class='add'>+adheres to the ISO C89 standard, it uses a number of extensions that are</div><div class='add'>+not featured in the standard.  The kernel is a freestanding C</div><div class='add'>+environment, with no reliance on the standard C library, so some</div><div class='add'>+portions of the C standard are not supported.  Arbitrary long long</div><div class='add'>+divisions and floating point are not allowed.  It can sometimes be</div><div class='add'>+difficult to understand the assumptions the kernel has on the toolchain</div><div class='add'>+and the extensions that it uses, and unfortunately there is no</div><div class='add'>+definitive reference for them.  Please check the gcc info pages (`info</div><div class='add'>+gcc`) for some information on them.</div><div class='add'>+</div><div class='add'>+Please remember that you are trying to learn how to work with the</div><div class='add'>+existing development community.  It is a diverse group of people, with</div><div class='add'>+high standards for coding, style and procedure.  These standards have</div><div class='add'>+been created over time based on what they have found to work best for</div><div class='add'>+such a large and geographically dispersed team.  Try to learn as much as</div><div class='add'>+possible about these standards ahead of time, as they are well</div><div class='add'>+documented; do not expect people to adapt to you or your company's way</div><div class='add'>+of doing things.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Legal Issues</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+The Linux kernel source code is released under the GPL.  Please see the</div><div class='add'>+file, COPYING, in the main directory of the source tree, for details on</div><div class='add'>+the license.  If you have further questions about the license, please</div><div class='add'>+contact a lawyer, and do not ask on the Linux kernel mailing list.  The</div><div class='add'>+people on the mailing lists are not lawyers, and you should not rely on</div><div class='add'>+their statements on legal matters.</div><div class='add'>+</div><div class='add'>+For common questions and answers about the GPL, please see:</div><div class='add'>+</div><div class='add'>+	https://www.gnu.org/licenses/gpl-faq.html</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Documentation</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+The Linux kernel source tree has a large range of documents that are</div><div class='add'>+invaluable for learning how to interact with the kernel community.  When</div><div class='add'>+new features are added to the kernel, it is recommended that new</div><div class='add'>+documentation files are also added which explain how to use the feature.</div><div class='add'>+When a kernel change causes the interface that the kernel exposes to</div><div class='add'>+userspace to change, it is recommended that you send the information or</div><div class='add'>+a patch to the manual pages explaining the change to the manual pages</div><div class='add'>+maintainer at mtk.manpages@gmail.com, and CC the list</div><div class='add'>+linux-api@vger.kernel.org.</div><div class='add'>+</div><div class='add'>+Here is a list of files that are in the kernel source tree that are</div><div class='add'>+required reading:</div><div class='add'>+</div><div class='add'>+  README</div><div class='add'>+    This file gives a short background on the Linux kernel and describes</div><div class='add'>+    what is necessary to do to configure and build the kernel.  People</div><div class='add'>+    who are new to the kernel should start here.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/changes.rst &lt;changes&gt;`</div><div class='add'>+    This file gives a list of the minimum levels of various software</div><div class='add'>+    packages that are necessary to build and run the kernel</div><div class='add'>+    successfully.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/coding-style.rst &lt;codingstyle&gt;`</div><div class='add'>+    This describes the Linux kernel coding style, and some of the</div><div class='add'>+    rationale behind it. All new code is expected to follow the</div><div class='add'>+    guidelines in this document. Most maintainers will only accept</div><div class='add'>+    patches if these rules are followed, and many people will only</div><div class='add'>+    review code if it is in the proper style.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/submitting-patches.rst &lt;submittingpatches&gt;` and :ref:`Documentation/process/submitting-drivers.rst &lt;submittingdrivers&gt;`</div><div class='add'>+    These files describe in explicit detail how to successfully create</div><div class='add'>+    and send a patch, including (but not limited to):</div><div class='add'>+</div><div class='add'>+       - Email contents</div><div class='add'>+       - Email format</div><div class='add'>+       - Who to send it to</div><div class='add'>+</div><div class='add'>+    Following these rules will not guarantee success (as all patches are</div><div class='add'>+    subject to scrutiny for content and style), but not following them</div><div class='add'>+    will almost always prevent it.</div><div class='add'>+</div><div class='add'>+    Other excellent descriptions of how to create patches properly are:</div><div class='add'>+</div><div class='add'>+	"The Perfect Patch"</div><div class='add'>+		https://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='add'>+</div><div class='add'>+	"Linux kernel patch submission format"</div><div class='add'>+		http://linux.yyz.us/patch-format.html</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/stable-api-nonsense.rst &lt;stable_api_nonsense&gt;`</div><div class='add'>+    This file describes the rationale behind the conscious decision to</div><div class='add'>+    not have a stable API within the kernel, including things like:</div><div class='add'>+</div><div class='add'>+      - Subsystem shim-layers (for compatibility?)</div><div class='add'>+      - Driver portability between Operating Systems.</div><div class='add'>+      - Mitigating rapid change within the kernel source tree (or</div><div class='add'>+	preventing rapid change)</div><div class='add'>+</div><div class='add'>+    This document is crucial for understanding the Linux development</div><div class='add'>+    philosophy and is very important for people moving to Linux from</div><div class='add'>+    development on other Operating Systems.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/admin-guide/security-bugs.rst &lt;securitybugs&gt;`</div><div class='add'>+    If you feel you have found a security problem in the Linux kernel,</div><div class='add'>+    please follow the steps in this document to help notify the kernel</div><div class='add'>+    developers, and help solve the issue.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/management-style.rst &lt;managementstyle&gt;`</div><div class='add'>+    This document describes how Linux kernel maintainers operate and the</div><div class='add'>+    shared ethos behind their methodologies.  This is important reading</div><div class='add'>+    for anyone new to kernel development (or anyone simply curious about</div><div class='add'>+    it), as it resolves a lot of common misconceptions and confusion</div><div class='add'>+    about the unique behavior of kernel maintainers.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/stable-kernel-rules.rst &lt;stable_kernel_rules&gt;`</div><div class='add'>+    This file describes the rules on how the stable kernel releases</div><div class='add'>+    happen, and what to do if you want to get a change into one of these</div><div class='add'>+    releases.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/kernel-docs.rst &lt;kernel_docs&gt;`</div><div class='add'>+    A list of external documentation that pertains to kernel</div><div class='add'>+    development.  Please consult this list if you do not find what you</div><div class='add'>+    are looking for within the in-kernel documentation.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/applying-patches.rst &lt;applying_patches&gt;`</div><div class='add'>+    A good introduction describing exactly what a patch is and how to</div><div class='add'>+    apply it to the different development branches of the kernel.</div><div class='add'>+</div><div class='add'>+The kernel also has a large number of documents that can be</div><div class='add'>+automatically generated from the source code itself or from</div><div class='add'>+ReStructuredText markups (ReST), like this one. This includes a</div><div class='add'>+full description of the in-kernel API, and rules on how to handle</div><div class='add'>+locking properly.</div><div class='add'>+</div><div class='add'>+All such documents can be generated as PDF or HTML by running::</div><div class='add'>+</div><div class='add'>+	make pdfdocs</div><div class='add'>+	make htmldocs</div><div class='add'>+</div><div class='add'>+respectively from the main kernel source directory.</div><div class='add'>+</div><div class='add'>+The documents that uses ReST markup will be generated at Documentation/output.</div><div class='add'>+They can also be generated on LaTeX and ePub formats with::</div><div class='add'>+</div><div class='add'>+	make latexdocs</div><div class='add'>+	make epubdocs</div><div class='add'>+</div><div class='add'>+Currently, there are some documents written on DocBook that are in</div><div class='add'>+the process of conversion to ReST. Such documents will be created in the</div><div class='add'>+Documentation/DocBook/ directory and can be generated also as</div><div class='add'>+Postscript or man pages by running::</div><div class='add'>+</div><div class='add'>+	make psdocs</div><div class='add'>+	make mandocs</div><div class='add'>+</div><div class='add'>+Becoming A Kernel Developer</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+If you do not know anything about Linux kernel development, you should</div><div class='add'>+look at the Linux KernelNewbies project:</div><div class='add'>+</div><div class='add'>+	https://kernelnewbies.org</div><div class='add'>+</div><div class='add'>+It consists of a helpful mailing list where you can ask almost any type</div><div class='add'>+of basic kernel development question (make sure to search the archives</div><div class='add'>+first, before asking something that has already been answered in the</div><div class='add'>+past.)  It also has an IRC channel that you can use to ask questions in</div><div class='add'>+real-time, and a lot of helpful documentation that is useful for</div><div class='add'>+learning about Linux kernel development.</div><div class='add'>+</div><div class='add'>+The website has basic information about code organization, subsystems,</div><div class='add'>+and current projects (both in-tree and out-of-tree). It also describes</div><div class='add'>+some basic logistical information, like how to compile a kernel and</div><div class='add'>+apply a patch.</div><div class='add'>+</div><div class='add'>+If you do not know where you want to start, but you want to look for</div><div class='add'>+some task to start doing to join into the kernel development community,</div><div class='add'>+go to the Linux Kernel Janitor's project:</div><div class='add'>+</div><div class='add'>+	https://kernelnewbies.org/KernelJanitors</div><div class='add'>+</div><div class='add'>+It is a great place to start.  It describes a list of relatively simple</div><div class='add'>+problems that need to be cleaned up and fixed within the Linux kernel</div><div class='add'>+source tree.  Working with the developers in charge of this project, you</div><div class='add'>+will learn the basics of getting your patch into the Linux kernel tree,</div><div class='add'>+and possibly be pointed in the direction of what to go work on next, if</div><div class='add'>+you do not already have an idea.</div><div class='add'>+</div><div class='add'>+If you already have a chunk of code that you want to put into the kernel</div><div class='add'>+tree, but need some help getting it in the proper form, the</div><div class='add'>+kernel-mentors project was created to help you out with this.  It is a</div><div class='add'>+mailing list, and can be found at:</div><div class='add'>+</div><div class='add'>+	https://selenic.com/mailman/listinfo/kernel-mentors</div><div class='add'>+</div><div class='add'>+Before making any actual modifications to the Linux kernel code, it is</div><div class='add'>+imperative to understand how the code in question works.  For this</div><div class='add'>+purpose, nothing is better than reading through it directly (most tricky</div><div class='add'>+bits are commented well), perhaps even with the help of specialized</div><div class='add'>+tools.  One such tool that is particularly recommended is the Linux</div><div class='add'>+Cross-Reference project, which is able to present source code in a</div><div class='add'>+self-referential, indexed webpage format. An excellent up-to-date</div><div class='add'>+repository of the kernel code may be found at:</div><div class='add'>+</div><div class='add'>+	http://lxr.free-electrons.com/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The development process</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Linux kernel development process currently consists of a few different</div><div class='add'>+main kernel "branches" and lots of different subsystem-specific kernel</div><div class='add'>+branches.  These different branches are:</div><div class='add'>+</div><div class='add'>+  - main 4.x kernel tree</div><div class='add'>+  - 4.x.y -stable kernel tree</div><div class='add'>+  - 4.x -git kernel patches</div><div class='add'>+  - subsystem specific kernel trees and patches</div><div class='add'>+  - the 4.x -next kernel tree for integration tests</div><div class='add'>+</div><div class='add'>+4.x kernel tree</div><div class='add'>+~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+4.x kernels are maintained by Linus Torvalds, and can be found on</div><div class='add'>+https://kernel.org in the pub/linux/kernel/v4.x/ directory.  Its development</div><div class='add'>+process is as follows:</div><div class='add'>+</div><div class='add'>+  - As soon as a new kernel is released a two weeks window is open,</div><div class='add'>+    during this period of time maintainers can submit big diffs to</div><div class='add'>+    Linus, usually the patches that have already been included in the</div><div class='add'>+    -next kernel for a few weeks.  The preferred way to submit big changes</div><div class='add'>+    is using git (the kernel's source management tool, more information</div><div class='add'>+    can be found at https://git-scm.com/) but plain patches are also just</div><div class='add'>+    fine.</div><div class='add'>+  - After two weeks a -rc1 kernel is released and the focus is on making the</div><div class='add'>+    new kernel as rock solid as possible.  Most of the patches at this point</div><div class='add'>+    should fix a regression.  Bugs that have always existed are not</div><div class='add'>+    regressions, so only push these kinds of fixes if they are important.</div><div class='add'>+    Please note that a whole new driver (or filesystem) might be accepted</div><div class='add'>+    after -rc1 because there is no risk of causing regressions with such a</div><div class='add'>+    change as long as the change is self-contained and does not affect areas</div><div class='add'>+    outside of the code that is being added.  git can be used to send</div><div class='add'>+    patches to Linus after -rc1 is released, but the patches need to also be</div><div class='add'>+    sent to a public mailing list for review.</div><div class='add'>+  - A new -rc is released whenever Linus deems the current git tree to</div><div class='add'>+    be in a reasonably sane state adequate for testing.  The goal is to</div><div class='add'>+    release a new -rc kernel every week.</div><div class='add'>+  - Process continues until the kernel is considered "ready", the</div><div class='add'>+    process should last around 6 weeks.</div><div class='add'>+</div><div class='add'>+It is worth mentioning what Andrew Morton wrote on the linux-kernel</div><div class='add'>+mailing list about kernel releases:</div><div class='add'>+</div><div class='add'>+	*"Nobody knows when a kernel will be released, because it's</div><div class='add'>+	released according to perceived bug status, not according to a</div><div class='add'>+	preconceived timeline."*</div><div class='add'>+</div><div class='add'>+4.x.y -stable kernel tree</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Kernels with 3-part versions are -stable kernels. They contain</div><div class='add'>+relatively small and critical fixes for security problems or significant</div><div class='add'>+regressions discovered in a given 4.x kernel.</div><div class='add'>+</div><div class='add'>+This is the recommended branch for users who want the most recent stable</div><div class='add'>+kernel and are not interested in helping test development/experimental</div><div class='add'>+versions.</div><div class='add'>+</div><div class='add'>+If no 4.x.y kernel is available, then the highest numbered 4.x</div><div class='add'>+kernel is the current stable kernel.</div><div class='add'>+</div><div class='add'>+4.x.y are maintained by the "stable" team &lt;stable@vger.kernel.org&gt;, and</div><div class='add'>+are released as needs dictate.  The normal release period is approximately</div><div class='add'>+two weeks, but it can be longer if there are no pressing problems.  A</div><div class='add'>+security-related problem, instead, can cause a release to happen almost</div><div class='add'>+instantly.</div><div class='add'>+</div><div class='add'>+The file Documentation/process/stable-kernel-rules.rst in the kernel tree</div><div class='add'>+documents what kinds of changes are acceptable for the -stable tree, and</div><div class='add'>+how the release process works.</div><div class='add'>+</div><div class='add'>+4.x -git patches</div><div class='add'>+~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+These are daily snapshots of Linus' kernel tree which are managed in a</div><div class='add'>+git repository (hence the name.) These patches are usually released</div><div class='add'>+daily and represent the current state of Linus' tree.  They are more</div><div class='add'>+experimental than -rc kernels since they are generated automatically</div><div class='add'>+without even a cursory glance to see if they are sane.</div><div class='add'>+</div><div class='add'>+Subsystem Specific kernel trees and patches</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The maintainers of the various kernel subsystems --- and also many</div><div class='add'>+kernel subsystem developers --- expose their current state of</div><div class='add'>+development in source repositories.  That way, others can see what is</div><div class='add'>+happening in the different areas of the kernel.  In areas where</div><div class='add'>+development is rapid, a developer may be asked to base his submissions</div><div class='add'>+onto such a subsystem kernel tree so that conflicts between the</div><div class='add'>+submission and other already ongoing work are avoided.</div><div class='add'>+</div><div class='add'>+Most of these repositories are git trees, but there are also other SCMs</div><div class='add'>+in use, or patch queues being published as quilt series.  Addresses of</div><div class='add'>+these subsystem repositories are listed in the MAINTAINERS file.  Many</div><div class='add'>+of them can be browsed at https://git.kernel.org/.</div><div class='add'>+</div><div class='add'>+Before a proposed patch is committed to such a subsystem tree, it is</div><div class='add'>+subject to review which primarily happens on mailing lists (see the</div><div class='add'>+respective section below).  For several kernel subsystems, this review</div><div class='add'>+process is tracked with the tool patchwork.  Patchwork offers a web</div><div class='add'>+interface which shows patch postings, any comments on a patch or</div><div class='add'>+revisions to it, and maintainers can mark patches as under review,</div><div class='add'>+accepted, or rejected.  Most of these patchwork sites are listed at</div><div class='add'>+https://patchwork.kernel.org/.</div><div class='add'>+</div><div class='add'>+4.x -next kernel tree for integration tests</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Before updates from subsystem trees are merged into the mainline 4.x</div><div class='add'>+tree, they need to be integration-tested.  For this purpose, a special</div><div class='add'>+testing repository exists into which virtually all subsystem trees are</div><div class='add'>+pulled on an almost daily basis:</div><div class='add'>+</div><div class='add'>+	https://git.kernel.org/?p=linux/kernel/git/next/linux-next.git</div><div class='add'>+</div><div class='add'>+This way, the -next kernel gives a summary outlook onto what will be</div><div class='add'>+expected to go into the mainline kernel at the next merge period.</div><div class='add'>+Adventurous testers are very welcome to runtime-test the -next kernel.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Bug Reporting</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+https://bugzilla.kernel.org is where the Linux kernel developers track kernel</div><div class='add'>+bugs.  Users are encouraged to report all bugs that they find in this</div><div class='add'>+tool.  For details on how to use the kernel bugzilla, please see:</div><div class='add'>+</div><div class='add'>+	https://bugzilla.kernel.org/page.cgi?id=faq.html</div><div class='add'>+</div><div class='add'>+The file admin-guide/reporting-bugs.rst in the main kernel source directory has a good</div><div class='add'>+template for how to report a possible kernel bug, and details what kind</div><div class='add'>+of information is needed by the kernel developers to help track down the</div><div class='add'>+problem.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Managing bug reports</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+One of the best ways to put into practice your hacking skills is by fixing</div><div class='add'>+bugs reported by other people. Not only you will help to make the kernel</div><div class='add'>+more stable, you'll learn to fix real world problems and you will improve</div><div class='add'>+your skills, and other developers will be aware of your presence. Fixing</div><div class='add'>+bugs is one of the best ways to get merits among other developers, because</div><div class='add'>+not many people like wasting time fixing other people's bugs.</div><div class='add'>+</div><div class='add'>+To work in the already reported bug reports, go to https://bugzilla.kernel.org.</div><div class='add'>+If you want to be advised of the future bug reports, you can subscribe to the</div><div class='add'>+bugme-new mailing list (only new bug reports are mailed here) or to the</div><div class='add'>+bugme-janitor mailing list (every change in the bugzilla is mailed here)</div><div class='add'>+</div><div class='add'>+	https://lists.linux-foundation.org/mailman/listinfo/bugme-new</div><div class='add'>+</div><div class='add'>+	https://lists.linux-foundation.org/mailman/listinfo/bugme-janitors</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Mailing lists</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+As some of the above documents describe, the majority of the core kernel</div><div class='add'>+developers participate on the Linux Kernel Mailing list.  Details on how</div><div class='add'>+to subscribe and unsubscribe from the list can be found at:</div><div class='add'>+</div><div class='add'>+	http://vger.kernel.org/vger-lists.html#linux-kernel</div><div class='add'>+</div><div class='add'>+There are archives of the mailing list on the web in many different</div><div class='add'>+places.  Use a search engine to find these archives.  For example:</div><div class='add'>+</div><div class='add'>+	http://dir.gmane.org/gmane.linux.kernel</div><div class='add'>+</div><div class='add'>+It is highly recommended that you search the archives about the topic</div><div class='add'>+you want to bring up, before you post it to the list. A lot of things</div><div class='add'>+already discussed in detail are only recorded at the mailing list</div><div class='add'>+archives.</div><div class='add'>+</div><div class='add'>+Most of the individual kernel subsystems also have their own separate</div><div class='add'>+mailing list where they do their development efforts.  See the</div><div class='add'>+MAINTAINERS file for a list of what these lists are for the different</div><div class='add'>+groups.</div><div class='add'>+</div><div class='add'>+Many of the lists are hosted on kernel.org. Information on them can be</div><div class='add'>+found at:</div><div class='add'>+</div><div class='add'>+	http://vger.kernel.org/vger-lists.html</div><div class='add'>+</div><div class='add'>+Please remember to follow good behavioral habits when using the lists.</div><div class='add'>+Though a bit cheesy, the following URL has some simple guidelines for</div><div class='add'>+interacting with the list (or any list):</div><div class='add'>+</div><div class='add'>+	http://www.albion.com/netiquette/</div><div class='add'>+</div><div class='add'>+If multiple people respond to your mail, the CC: list of recipients may</div><div class='add'>+get pretty large. Don't remove anybody from the CC: list without a good</div><div class='add'>+reason, or don't reply only to the list address. Get used to receiving the</div><div class='add'>+mail twice, one from the sender and the one from the list, and don't try</div><div class='add'>+to tune that by adding fancy mail-headers, people will not like it.</div><div class='add'>+</div><div class='add'>+Remember to keep the context and the attribution of your replies intact,</div><div class='add'>+keep the "John Kernelhacker wrote ...:" lines at the top of your reply, and</div><div class='add'>+add your statements between the individual quoted sections instead of</div><div class='add'>+writing at the top of the mail.</div><div class='add'>+</div><div class='add'>+If you add patches to your mail, make sure they are plain readable text</div><div class='add'>+as stated in Documentation/process/submitting-patches.rst.</div><div class='add'>+Kernel developers don't want to deal with</div><div class='add'>+attachments or compressed patches; they may want to comment on</div><div class='add'>+individual lines of your patch, which works only that way. Make sure you</div><div class='add'>+use a mail program that does not mangle spaces and tab characters. A</div><div class='add'>+good first test is to send the mail to yourself and try to apply your</div><div class='add'>+own patch by yourself. If that doesn't work, get your mail program fixed</div><div class='add'>+or change it until it works.</div><div class='add'>+</div><div class='add'>+Above all, please remember to show respect to other subscribers.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Working with the community</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+The goal of the kernel community is to provide the best possible kernel</div><div class='add'>+there is.  When you submit a patch for acceptance, it will be reviewed</div><div class='add'>+on its technical merits and those alone.  So, what should you be</div><div class='add'>+expecting?</div><div class='add'>+</div><div class='add'>+  - criticism</div><div class='add'>+  - comments</div><div class='add'>+  - requests for change</div><div class='add'>+  - requests for justification</div><div class='add'>+  - silence</div><div class='add'>+</div><div class='add'>+Remember, this is part of getting your patch into the kernel.  You have</div><div class='add'>+to be able to take criticism and comments about your patches, evaluate</div><div class='add'>+them at a technical level and either rework your patches or provide</div><div class='add'>+clear and concise reasoning as to why those changes should not be made.</div><div class='add'>+If there are no responses to your posting, wait a few days and try</div><div class='add'>+again, sometimes things get lost in the huge volume.</div><div class='add'>+</div><div class='add'>+What should you not do?</div><div class='add'>+</div><div class='add'>+  - expect your patch to be accepted without question</div><div class='add'>+  - become defensive</div><div class='add'>+  - ignore comments</div><div class='add'>+  - resubmit the patch without making any of the requested changes</div><div class='add'>+</div><div class='add'>+In a community that is looking for the best technical solution possible,</div><div class='add'>+there will always be differing opinions on how beneficial a patch is.</div><div class='add'>+You have to be cooperative, and willing to adapt your idea to fit within</div><div class='add'>+the kernel.  Or at least be willing to prove your idea is worth it.</div><div class='add'>+Remember, being wrong is acceptable as long as you are willing to work</div><div class='add'>+toward a solution that is right.</div><div class='add'>+</div><div class='add'>+It is normal that the answers to your first patch might simply be a list</div><div class='add'>+of a dozen things you should correct.  This does **not** imply that your</div><div class='add'>+patch will not be accepted, and it is **not** meant against you</div><div class='add'>+personally.  Simply correct all issues raised against your patch and</div><div class='add'>+resend it.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Differences between the kernel community and corporate structures</div><div class='add'>+-----------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+The kernel community works differently than most traditional corporate</div><div class='add'>+development environments.  Here are a list of things that you can try to</div><div class='add'>+do to avoid problems:</div><div class='add'>+</div><div class='add'>+  Good things to say regarding your proposed changes:</div><div class='add'>+</div><div class='add'>+    - "This solves multiple problems."</div><div class='add'>+    - "This deletes 2000 lines of code."</div><div class='add'>+    - "Here is a patch that explains what I am trying to describe."</div><div class='add'>+    - "I tested it on 5 different architectures..."</div><div class='add'>+    - "Here is a series of small patches that..."</div><div class='add'>+    - "This increases performance on typical machines..."</div><div class='add'>+</div><div class='add'>+  Bad things you should avoid saying:</div><div class='add'>+</div><div class='add'>+    - "We did it this way in AIX/ptx/Solaris, so therefore it must be</div><div class='add'>+      good..."</div><div class='add'>+    - "I've being doing this for 20 years, so..."</div><div class='add'>+    - "This is required for my company to make money"</div><div class='add'>+    - "This is for our Enterprise product line."</div><div class='add'>+    - "Here is my 1000 page design document that describes my idea"</div><div class='add'>+    - "I've been working on this for 6 months..."</div><div class='add'>+    - "Here's a 5000 line patch that..."</div><div class='add'>+    - "I rewrote all of the current mess, and here it is..."</div><div class='add'>+    - "I have a deadline, and this patch needs to be applied now."</div><div class='add'>+</div><div class='add'>+Another way the kernel community is different than most traditional</div><div class='add'>+software engineering work environments is the faceless nature of</div><div class='add'>+interaction.  One benefit of using email and irc as the primary forms of</div><div class='add'>+communication is the lack of discrimination based on gender or race.</div><div class='add'>+The Linux kernel work environment is accepting of women and minorities</div><div class='add'>+because all you are is an email address.  The international aspect also</div><div class='add'>+helps to level the playing field because you can't guess gender based on</div><div class='add'>+a person's name. A man may be named Andrea and a woman may be named Pat.</div><div class='add'>+Most women who have worked in the Linux kernel and have expressed an</div><div class='add'>+opinion have had positive experiences.</div><div class='add'>+</div><div class='add'>+The language barrier can cause problems for some people who are not</div><div class='add'>+comfortable with English.  A good grasp of the language can be needed in</div><div class='add'>+order to get ideas across properly on mailing lists, so it is</div><div class='add'>+recommended that you check your emails to make sure they make sense in</div><div class='add'>+English before sending them.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Break up your changes</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The Linux kernel community does not gladly accept large chunks of code</div><div class='add'>+dropped on it all at once.  The changes need to be properly introduced,</div><div class='add'>+discussed, and broken up into tiny, individual portions.  This is almost</div><div class='add'>+the exact opposite of what companies are used to doing.  Your proposal</div><div class='add'>+should also be introduced very early in the development process, so that</div><div class='add'>+you can receive feedback on what you are doing.  It also lets the</div><div class='add'>+community feel that you are working with them, and not simply using them</div><div class='add'>+as a dumping ground for your feature.  However, don't send 50 emails at</div><div class='add'>+one time to a mailing list, your patch series should be smaller than</div><div class='add'>+that almost all of the time.</div><div class='add'>+</div><div class='add'>+The reasons for breaking things up are the following:</div><div class='add'>+</div><div class='add'>+1) Small patches increase the likelihood that your patches will be</div><div class='add'>+   applied, since they don't take much time or effort to verify for</div><div class='add'>+   correctness.  A 5 line patch can be applied by a maintainer with</div><div class='add'>+   barely a second glance. However, a 500 line patch may take hours to</div><div class='add'>+   review for correctness (the time it takes is exponentially</div><div class='add'>+   proportional to the size of the patch, or something).</div><div class='add'>+</div><div class='add'>+   Small patches also make it very easy to debug when something goes</div><div class='add'>+   wrong.  It's much easier to back out patches one by one than it is</div><div class='add'>+   to dissect a very large patch after it's been applied (and broken</div><div class='add'>+   something).</div><div class='add'>+</div><div class='add'>+2) It's important not only to send small patches, but also to rewrite</div><div class='add'>+   and simplify (or simply re-order) patches before submitting them.</div><div class='add'>+</div><div class='add'>+Here is an analogy from kernel developer Al Viro:</div><div class='add'>+</div><div class='add'>+	*"Think of a teacher grading homework from a math student.  The</div><div class='add'>+	teacher does not want to see the student's trials and errors</div><div class='add'>+	before they came up with the solution. They want to see the</div><div class='add'>+	cleanest, most elegant answer.  A good student knows this, and</div><div class='add'>+	would never submit her intermediate work before the final</div><div class='add'>+	solution.*</div><div class='add'>+</div><div class='add'>+	*The same is true of kernel development. The maintainers and</div><div class='add'>+	reviewers do not want to see the thought process behind the</div><div class='add'>+	solution to the problem one is solving. They want to see a</div><div class='add'>+	simple and elegant solution."*</div><div class='add'>+</div><div class='add'>+It may be challenging to keep the balance between presenting an elegant</div><div class='add'>+solution and working together with the community and discussing your</div><div class='add'>+unfinished work. Therefore it is good to get early in the process to</div><div class='add'>+get feedback to improve your work, but also keep your changes in small</div><div class='add'>+chunks that they may get already accepted, even when your whole task is</div><div class='add'>+not ready for inclusion now.</div><div class='add'>+</div><div class='add'>+Also realize that it is not acceptable to send patches for inclusion</div><div class='add'>+that are unfinished and will be "fixed up later."</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Justify your change</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Along with breaking up your patches, it is very important for you to let</div><div class='add'>+the Linux community know why they should add this change.  New features</div><div class='add'>+must be justified as being needed and useful.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Document your change</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+When sending in your patches, pay special attention to what you say in</div><div class='add'>+the text in your email.  This information will become the ChangeLog</div><div class='add'>+information for the patch, and will be preserved for everyone to see for</div><div class='add'>+all time.  It should describe the patch completely, containing:</div><div class='add'>+</div><div class='add'>+  - why the change is necessary</div><div class='add'>+  - the overall design approach in the patch</div><div class='add'>+  - implementation details</div><div class='add'>+  - testing results</div><div class='add'>+</div><div class='add'>+For more details on what this should all look like, please see the</div><div class='add'>+ChangeLog section of the document:</div><div class='add'>+</div><div class='add'>+  "The Perfect Patch"</div><div class='add'>+      http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+All of these things are sometimes very hard to do. It can take years to</div><div class='add'>+perfect these practices (if at all). It's a continuous process of</div><div class='add'>+improvement that requires a lot of patience and determination. But</div><div class='add'>+don't give up, it's possible. Many have done it before, and each had to</div><div class='add'>+start exactly where you are now.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+Thanks to Paolo Ciarrocchi who allowed the "Development Process"</div><div class='add'>+(https://lwn.net/Articles/94386/) section</div><div class='add'>+to be based on text he had written, and to Randy Dunlap and Gerrit</div><div class='add'>+Huizenga for some of the list of things you should and should not say.</div><div class='add'>+Also thanks to Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,</div><div class='add'>+Vojtech Pavlik, Jan Kara, Josh Boyer, Kees Cook, Andrew Morton, Andi</div><div class='add'>+Kleen, Vadim Lobanov, Jesper Juhl, Adrian Bunk, Keri Harris, Frans Pop,</div><div class='add'>+David A. Wheeler, Junio Hamano, Michael Kerrisk, and Alex Shepard for</div><div class='add'>+their review, comments, and contributions.  Without their help, this</div><div class='add'>+document would not have been possible.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Maintainer: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/Documentation/process/index.rst b/Documentation/process/index.rst<br/>new file mode 100644<br/>index 000000000000..10aa6920709a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/index.rst</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+	\renewcommand\thesection*</div><div class='add'>+	\renewcommand\thesubsection*</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Working with the kernel development community</div><div class='add'>+=============================================</div><div class='add'>+</div><div class='add'>+So you want to be a Linux kernel developer?  Welcome!  While there is a lot</div><div class='add'>+to be learned about the kernel in a technical sense, it is also important</div><div class='add'>+to learn about how our community works.  Reading these documents will make</div><div class='add'>+it much easier for you to get your changes merged with a minimum of</div><div class='add'>+trouble.</div><div class='add'>+</div><div class='add'>+Below are the essential guides that every developer should read.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   howto</div><div class='add'>+   code-of-conflict</div><div class='add'>+   development-process</div><div class='add'>+   submitting-patches</div><div class='add'>+   coding-style</div><div class='add'>+   email-clients</div><div class='add'>+</div><div class='add'>+Other guides to the community that are of interest to most developers are: </div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   changes</div><div class='add'>+   submitting-drivers</div><div class='add'>+   stable-api-nonsense</div><div class='add'>+   management-style</div><div class='add'>+   stable-kernel-rules</div><div class='add'>+   submit-checklist</div><div class='add'>+   kernel-docs</div><div class='add'>+</div><div class='add'>+These are some overall technical guides that have been put here for now for</div><div class='add'>+lack of a better place.</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   applying-patches</div><div class='add'>+   adding-syscalls</div><div class='add'>+   magic-number</div><div class='add'>+   volatile-considered-harmful</div><div class='add'>+</div><div class='add'>+.. only::  subproject and html</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/kernel-docs.txt b/Documentation/process/kernel-docs.rst<br/>index 05a7857a4a83..05a7857a4a83 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/kernel-docs.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/kernel-docs.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/kernel-docs.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/kernel-docs.rst</a></div><div class='head'>diff --git a/Documentation/process/magic-number.rst b/Documentation/process/magic-number.rst<br/>new file mode 100644<br/>index 000000000000..c74199f60c6c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/magic-number.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/magic-number.rst</a></div><div class='hunk'>@@ -0,0 +1,164 @@</div><div class='add'>+Linux magic numbers</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+This file is a registry of magic numbers which are in use.  When you</div><div class='add'>+add a magic number to a structure, you should also add it to this</div><div class='add'>+file, since it is best if the magic numbers used by various structures</div><div class='add'>+are unique.</div><div class='add'>+</div><div class='add'>+It is a **very** good idea to protect kernel data structures with magic</div><div class='add'>+numbers.  This allows you to check at run time whether (a) a structure</div><div class='add'>+has been clobbered, or (b) you've passed the wrong structure to a</div><div class='add'>+routine.  This last is especially useful --- particularly when you are</div><div class='add'>+passing pointers to structures via a void * pointer.  The tty code,</div><div class='add'>+for example, does this frequently to pass driver-specific and line</div><div class='add'>+discipline-specific structures back and forth.</div><div class='add'>+</div><div class='add'>+The way to use magic numbers is to declare then at the beginning of</div><div class='add'>+the structure, like so::</div><div class='add'>+</div><div class='add'>+	struct tty_ldisc {</div><div class='add'>+		int	magic;</div><div class='add'>+		...</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Please follow this discipline when you are adding future enhancements</div><div class='add'>+to the kernel!  It has saved me countless hours of debugging,</div><div class='add'>+especially in the screwy cases where an array has been overrun and</div><div class='add'>+structures following the array have been overwritten.  Using this</div><div class='add'>+discipline, these cases get detected quickly and safely.</div><div class='add'>+</div><div class='add'>+Changelog::</div><div class='add'>+</div><div class='add'>+					Theodore Ts'o</div><div class='add'>+					31 Mar 94</div><div class='add'>+</div><div class='add'>+  The magic table is current to Linux 2.1.55.</div><div class='add'>+</div><div class='add'>+					Michael Chastain</div><div class='add'>+					&lt;mailto:mec@shout.net&gt;</div><div class='add'>+					22 Sep 1997</div><div class='add'>+</div><div class='add'>+  Now it should be up to date with Linux 2.1.112. Because</div><div class='add'>+  we are in feature freeze time it is very unlikely that</div><div class='add'>+  something will change before 2.2.x. The entries are</div><div class='add'>+  sorted by number field.</div><div class='add'>+</div><div class='add'>+					Krzysztof G. Baranowski</div><div class='add'>+					&lt;mailto: kgb@knm.org.pl&gt;</div><div class='add'>+					29 Jul 1998</div><div class='add'>+</div><div class='add'>+  Updated the magic table to Linux 2.5.45. Right over the feature freeze,</div><div class='add'>+  but it is possible that some new magic numbers will sneak into the</div><div class='add'>+  kernel before 2.6.x yet.</div><div class='add'>+</div><div class='add'>+					Petr Baudis</div><div class='add'>+					&lt;pasky@ucw.cz&gt;</div><div class='add'>+					03 Nov 2002</div><div class='add'>+</div><div class='add'>+  Updated the magic table to Linux 2.5.74.</div><div class='add'>+</div><div class='add'>+					Fabian Frederick</div><div class='add'>+					&lt;ffrederick@users.sourceforge.net&gt;</div><div class='add'>+					09 Jul 2003</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+===================== ================ ======================== ==========================================</div><div class='add'>+Magic Name            Number           Structure                File</div><div class='add'>+===================== ================ ======================== ==========================================</div><div class='add'>+PG_MAGIC              'P'              pg_{read,write}_hdr      ``include/linux/pg.h``</div><div class='add'>+CMAGIC                0x0111           user                     ``include/linux/a.out.h``</div><div class='add'>+MKISS_DRIVER_MAGIC    0x04bf           mkiss_channel            ``drivers/net/mkiss.h``</div><div class='add'>+HDLC_MAGIC            0x239e           n_hdlc                   ``drivers/char/n_hdlc.c``</div><div class='add'>+APM_BIOS_MAGIC        0x4101           apm_user                 ``arch/x86/kernel/apm_32.c``</div><div class='add'>+CYCLADES_MAGIC        0x4359           cyclades_port            ``include/linux/cyclades.h``</div><div class='add'>+DB_MAGIC              0x4442           fc_info                  ``drivers/net/iph5526_novram.c``</div><div class='add'>+DL_MAGIC              0x444d           fc_info                  ``drivers/net/iph5526_novram.c``</div><div class='add'>+FASYNC_MAGIC          0x4601           fasync_struct            ``include/linux/fs.h``</div><div class='add'>+FF_MAGIC              0x4646           fc_info                  ``drivers/net/iph5526_novram.c``</div><div class='add'>+ISICOM_MAGIC          0x4d54           isi_port                 ``include/linux/isicom.h``</div><div class='add'>+PTY_MAGIC             0x5001                                    ``drivers/char/pty.c``</div><div class='add'>+PPP_MAGIC             0x5002           ppp                      ``include/linux/if_pppvar.h``</div><div class='add'>+SERIAL_MAGIC          0x5301           async_struct             ``include/linux/serial.h``</div><div class='add'>+SSTATE_MAGIC          0x5302           serial_state             ``include/linux/serial.h``</div><div class='add'>+SLIP_MAGIC            0x5302           slip                     ``drivers/net/slip.h``</div><div class='add'>+STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``</div><div class='add'>+X25_ASY_MAGIC         0x5303           x25_asy                  ``drivers/net/x25_asy.h``</div><div class='add'>+SIXPACK_MAGIC         0x5304           sixpack                  ``drivers/net/hamradio/6pack.h``</div><div class='add'>+AX25_MAGIC            0x5316           ax_disp                  ``drivers/net/mkiss.h``</div><div class='add'>+TTY_MAGIC             0x5401           tty_struct               ``include/linux/tty.h``</div><div class='add'>+MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``</div><div class='add'>+TTY_DRIVER_MAGIC      0x5402           tty_driver               ``include/linux/tty_driver.h``</div><div class='add'>+MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``</div><div class='add'>+TTY_LDISC_MAGIC       0x5403           tty_ldisc                ``include/linux/tty_ldisc.h``</div><div class='add'>+USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``</div><div class='add'>+FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``</div><div class='add'>+USB_BLUETOOTH_MAGIC   0x6d02           usb_bluetooth            ``drivers/usb/class/bluetty.c``</div><div class='add'>+RFCOMM_TTY_MAGIC      0x6d02                                    ``net/bluetooth/rfcomm/tty.c``</div><div class='add'>+USB_SERIAL_PORT_MAGIC 0x7301           usb_serial_port          ``drivers/usb/serial/usb-serial.h``</div><div class='add'>+CG_MAGIC              0x00090255       ufs_cylinder_group       ``include/linux/ufs_fs.h``</div><div class='add'>+RPORT_MAGIC           0x00525001       r_port                   ``drivers/char/rocket_int.h``</div><div class='add'>+LSEMAGIC              0x05091998       lse                      ``drivers/fc4/fc.c``</div><div class='add'>+GDTIOCTL_MAGIC        0x06030f07       gdth_iowr_str            ``drivers/scsi/gdth_ioctl.h``</div><div class='add'>+RIEBL_MAGIC           0x09051990                                ``drivers/net/atarilance.c``</div><div class='add'>+NBD_REQUEST_MAGIC     0x12560953       nbd_request              ``include/linux/nbd.h``</div><div class='add'>+RED_MAGIC2            0x170fc2a5       (any)                    ``mm/slab.c``</div><div class='add'>+BAYCOM_MAGIC          0x19730510       baycom_state             ``drivers/net/baycom_epp.c``</div><div class='add'>+ISDN_X25IFACE_MAGIC   0x1e75a2b9       isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``</div><div class='add'>+ECP_MAGIC             0x21504345       cdkecpsig                ``include/linux/cdk.h``</div><div class='add'>+LSOMAGIC              0x27091997       lso                      ``drivers/fc4/fc.c``</div><div class='add'>+LSMAGIC               0x2a3b4d2a       ls                       ``drivers/fc4/fc.c``</div><div class='add'>+WANPIPE_MAGIC         0x414C4453       sdla_{dump,exec}         ``include/linux/wanpipe.h``</div><div class='add'>+CS_CARD_MAGIC         0x43525553       cs_card                  ``sound/oss/cs46xx.c``</div><div class='add'>+LABELCL_MAGIC         0x4857434c       labelcl_info_s           ``include/asm/ia64/sn/labelcl.h``</div><div class='add'>+ISDN_ASYNC_MAGIC      0x49344C01       modem_info               ``include/linux/isdn.h``</div><div class='add'>+CTC_ASYNC_MAGIC       0x49344C01       ctc_tty_info             ``drivers/s390/net/ctctty.c``</div><div class='add'>+ISDN_NET_MAGIC        0x49344C02       isdn_net_local_s         ``drivers/isdn/i4l/isdn_net_lib.h``</div><div class='add'>+SAVEKMSG_MAGIC2       0x4B4D5347       savekmsg                 ``arch/*/amiga/config.c``</div><div class='add'>+CS_STATE_MAGIC        0x4c4f4749       cs_state                 ``sound/oss/cs46xx.c``</div><div class='add'>+SLAB_C_MAGIC          0x4f17a36d       kmem_cache               ``mm/slab.c``</div><div class='add'>+COW_MAGIC             0x4f4f4f4d       cow_header_v1            ``arch/um/drivers/ubd_user.c``</div><div class='add'>+I810_CARD_MAGIC       0x5072696E       i810_card                ``sound/oss/i810_audio.c``</div><div class='add'>+TRIDENT_CARD_MAGIC    0x5072696E       trident_card             ``sound/oss/trident.c``</div><div class='add'>+ROUTER_MAGIC          0x524d4157       wan_device               [in ``wanrouter.h`` pre 3.9]</div><div class='add'>+SAVEKMSG_MAGIC1       0x53415645       savekmsg                 ``arch/*/amiga/config.c``</div><div class='add'>+GDA_MAGIC             0x58464552       gda                      ``arch/mips/include/asm/sn/gda.h``</div><div class='add'>+RED_MAGIC1            0x5a2cf071       (any)                    ``mm/slab.c``</div><div class='add'>+EEPROM_MAGIC_VALUE    0x5ab478d2       lanai_dev                ``drivers/atm/lanai.c``</div><div class='add'>+HDLCDRV_MAGIC         0x5ac6e778       hdlcdrv_state            ``include/linux/hdlcdrv.h``</div><div class='add'>+PCXX_MAGIC            0x5c6df104       channel                  ``drivers/char/pcxx.h``</div><div class='add'>+KV_MAGIC              0x5f4b565f       kernel_vars_s            ``arch/mips/include/asm/sn/klkernvars.h``</div><div class='add'>+I810_STATE_MAGIC      0x63657373       i810_state               ``sound/oss/i810_audio.c``</div><div class='add'>+TRIDENT_STATE_MAGIC   0x63657373       trient_state             ``sound/oss/trident.c``</div><div class='add'>+M3_CARD_MAGIC         0x646e6f50       m3_card                  ``sound/oss/maestro3.c``</div><div class='add'>+FW_HEADER_MAGIC       0x65726F66       fw_header                ``drivers/atm/fore200e.h``</div><div class='add'>+SLOT_MAGIC            0x67267321       slot                     ``drivers/hotplug/cpqphp.h``</div><div class='add'>+SLOT_MAGIC            0x67267322       slot                     ``drivers/hotplug/acpiphp.h``</div><div class='add'>+LO_MAGIC              0x68797548       nbd_device               ``include/linux/nbd.h``</div><div class='add'>+OPROFILE_MAGIC        0x6f70726f       super_block              ``drivers/oprofile/oprofilefs.h``</div><div class='add'>+M3_STATE_MAGIC        0x734d724d       m3_state                 ``sound/oss/maestro3.c``</div><div class='add'>+VMALLOC_MAGIC         0x87654320       snd_alloc_track          ``sound/core/memory.c``</div><div class='add'>+KMALLOC_MAGIC         0x87654321       snd_alloc_track          ``sound/core/memory.c``</div><div class='add'>+PWC_MAGIC             0x89DC10AB       pwc_device               ``drivers/usb/media/pwc.h``</div><div class='add'>+NBD_REPLY_MAGIC       0x96744668       nbd_reply                ``include/linux/nbd.h``</div><div class='add'>+ENI155_MAGIC          0xa54b872d       midway_eprom	        ``drivers/atm/eni.h``</div><div class='add'>+CODA_MAGIC            0xC0DAC0DA       coda_file_info           ``fs/coda/coda_fs_i.h``</div><div class='add'>+DPMEM_MAGIC           0xc0ffee11       gdt_pci_sram             ``drivers/scsi/gdth.h``</div><div class='add'>+YAM_MAGIC             0xF10A7654       yam_port                 ``drivers/net/hamradio/yam.c``</div><div class='add'>+CCB_MAGIC             0xf2691ad2       ccb                      ``drivers/scsi/ncr53c8xx.c``</div><div class='add'>+QUEUE_MAGIC_FREE      0xf7e1c9a3       queue_entry              ``drivers/scsi/arm/queue.c``</div><div class='add'>+QUEUE_MAGIC_USED      0xf7e1cc33       queue_entry              ``drivers/scsi/arm/queue.c``</div><div class='add'>+HTB_CMAGIC            0xFEFAFEF1       htb_class                ``net/sched/sch_htb.c``</div><div class='add'>+NMI_MAGIC             0x48414d4d455201 nmi_s                    ``arch/mips/include/asm/sn/nmi.h``</div><div class='add'>+===================== ================ ======================== ==========================================</div><div class='add'>+</div><div class='add'>+Note that there are also defined special per-driver magic numbers in sound</div><div class='add'>+memory management. See ``include/sound/sndmagic.h`` for complete list of them. Many</div><div class='add'>+OSS sound drivers have their magic numbers constructed from the soundcard PCI</div><div class='add'>+ID - these are not listed here as well.</div><div class='add'>+</div><div class='add'>+IrDA subsystem also uses large number of own magic numbers, see</div><div class='add'>+``include/net/irda/irda.h`` for a complete list of them.</div><div class='add'>+</div><div class='add'>+HFS is another larger user of magic numbers - you can find them in</div><div class='add'>+``fs/hfs/hfs.h``.</div><div class='head'>diff --git a/Documentation/process/management-style.rst b/Documentation/process/management-style.rst<br/>new file mode 100644<br/>index 000000000000..45595fd8a66b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/management-style.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/management-style.rst</a></div><div class='hunk'>@@ -0,0 +1,288 @@</div><div class='add'>+.. _managementstyle:</div><div class='add'>+</div><div class='add'>+Linux kernel management style</div><div class='add'>+=============================</div><div class='add'>+</div><div class='add'>+This is a short document describing the preferred (or made up, depending</div><div class='add'>+on who you ask) management style for the linux kernel.  It's meant to</div><div class='add'>+mirror the process/coding-style.rst document to some degree, and mainly written to</div><div class='add'>+avoid answering [#f1]_  the same (or similar) questions over and over again.</div><div class='add'>+</div><div class='add'>+Management style is very personal and much harder to quantify than</div><div class='add'>+simple coding style rules, so this document may or may not have anything</div><div class='add'>+to do with reality.  It started as a lark, but that doesn't mean that it</div><div class='add'>+might not actually be true. You'll have to decide for yourself.</div><div class='add'>+</div><div class='add'>+Btw, when talking about "kernel manager", it's all about the technical</div><div class='add'>+lead persons, not the people who do traditional management inside</div><div class='add'>+companies.  If you sign purchase orders or you have any clue about the</div><div class='add'>+budget of your group, you're almost certainly not a kernel manager.</div><div class='add'>+These suggestions may or may not apply to you.</div><div class='add'>+</div><div class='add'>+First off, I'd suggest buying "Seven Habits of Highly Effective</div><div class='add'>+People", and NOT read it.  Burn it, it's a great symbolic gesture.</div><div class='add'>+</div><div class='add'>+.. [#f1] This document does so not so much by answering the question, but by</div><div class='add'>+  making it painfully obvious to the questioner that we don't have a clue</div><div class='add'>+  to what the answer is.</div><div class='add'>+</div><div class='add'>+Anyway, here goes:</div><div class='add'>+</div><div class='add'>+.. _decisions:</div><div class='add'>+</div><div class='add'>+1) Decisions</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+Everybody thinks managers make decisions, and that decision-making is</div><div class='add'>+important.  The bigger and more painful the decision, the bigger the</div><div class='add'>+manager must be to make it.  That's very deep and obvious, but it's not</div><div class='add'>+actually true.</div><div class='add'>+</div><div class='add'>+The name of the game is to **avoid** having to make a decision.  In</div><div class='add'>+particular, if somebody tells you "choose (a) or (b), we really need you</div><div class='add'>+to decide on this", you're in trouble as a manager.  The people you</div><div class='add'>+manage had better know the details better than you, so if they come to</div><div class='add'>+you for a technical decision, you're screwed.  You're clearly not</div><div class='add'>+competent to make that decision for them.</div><div class='add'>+</div><div class='add'>+(Corollary:if the people you manage don't know the details better than</div><div class='add'>+you, you're also screwed, although for a totally different reason.</div><div class='add'>+Namely that you are in the wrong job, and that **they** should be managing</div><div class='add'>+your brilliance instead).</div><div class='add'>+</div><div class='add'>+So the name of the game is to **avoid** decisions, at least the big and</div><div class='add'>+painful ones.  Making small and non-consequential decisions is fine, and</div><div class='add'>+makes you look like you know what you're doing, so what a kernel manager</div><div class='add'>+needs to do is to turn the big and painful ones into small things where</div><div class='add'>+nobody really cares.</div><div class='add'>+</div><div class='add'>+It helps to realize that the key difference between a big decision and a</div><div class='add'>+small one is whether you can fix your decision afterwards.  Any decision</div><div class='add'>+can be made small by just always making sure that if you were wrong (and</div><div class='add'>+you **will** be wrong), you can always undo the damage later by</div><div class='add'>+backtracking.  Suddenly, you get to be doubly managerial for making</div><div class='add'>+**two** inconsequential decisions - the wrong one **and** the right one.</div><div class='add'>+</div><div class='add'>+And people will even see that as true leadership (*cough* bullshit</div><div class='add'>+*cough*).</div><div class='add'>+</div><div class='add'>+Thus the key to avoiding big decisions becomes to just avoiding to do</div><div class='add'>+things that can't be undone.  Don't get ushered into a corner from which</div><div class='add'>+you cannot escape.  A cornered rat may be dangerous - a cornered manager</div><div class='add'>+is just pitiful.</div><div class='add'>+</div><div class='add'>+It turns out that since nobody would be stupid enough to ever really let</div><div class='add'>+a kernel manager have huge fiscal responsibility **anyway**, it's usually</div><div class='add'>+fairly easy to backtrack.  Since you're not going to be able to waste</div><div class='add'>+huge amounts of money that you might not be able to repay, the only</div><div class='add'>+thing you can backtrack on is a technical decision, and there</div><div class='add'>+back-tracking is very easy: just tell everybody that you were an</div><div class='add'>+incompetent nincompoop, say you're sorry, and undo all the worthless</div><div class='add'>+work you had people work on for the last year.  Suddenly the decision</div><div class='add'>+you made a year ago wasn't a big decision after all, since it could be</div><div class='add'>+easily undone.</div><div class='add'>+</div><div class='add'>+It turns out that some people have trouble with this approach, for two</div><div class='add'>+reasons:</div><div class='add'>+</div><div class='add'>+ - admitting you were an idiot is harder than it looks.  We all like to</div><div class='add'>+   maintain appearances, and coming out in public to say that you were</div><div class='add'>+   wrong is sometimes very hard indeed.</div><div class='add'>+ - having somebody tell you that what you worked on for the last year</div><div class='add'>+   wasn't worthwhile after all can be hard on the poor lowly engineers</div><div class='add'>+   too, and while the actual **work** was easy enough to undo by just</div><div class='add'>+   deleting it, you may have irrevocably lost the trust of that</div><div class='add'>+   engineer.  And remember: "irrevocable" was what we tried to avoid in</div><div class='add'>+   the first place, and your decision ended up being a big one after</div><div class='add'>+   all.</div><div class='add'>+</div><div class='add'>+Happily, both of these reasons can be mitigated effectively by just</div><div class='add'>+admitting up-front that you don't have a friggin' clue, and telling</div><div class='add'>+people ahead of the fact that your decision is purely preliminary, and</div><div class='add'>+might be the wrong thing.  You should always reserve the right to change</div><div class='add'>+your mind, and make people very **aware** of that.  And it's much easier</div><div class='add'>+to admit that you are stupid when you haven't **yet** done the really</div><div class='add'>+stupid thing.</div><div class='add'>+</div><div class='add'>+Then, when it really does turn out to be stupid, people just roll their</div><div class='add'>+eyes and say "Oops, he did it again".</div><div class='add'>+</div><div class='add'>+This preemptive admission of incompetence might also make the people who</div><div class='add'>+actually do the work also think twice about whether it's worth doing or</div><div class='add'>+not.  After all, if **they** aren't certain whether it's a good idea, you</div><div class='add'>+sure as hell shouldn't encourage them by promising them that what they</div><div class='add'>+work on will be included.  Make them at least think twice before they</div><div class='add'>+embark on a big endeavor.</div><div class='add'>+</div><div class='add'>+Remember: they'd better know more about the details than you do, and</div><div class='add'>+they usually already think they have the answer to everything.  The best</div><div class='add'>+thing you can do as a manager is not to instill confidence, but rather a</div><div class='add'>+healthy dose of critical thinking on what they do.</div><div class='add'>+</div><div class='add'>+Btw, another way to avoid a decision is to plaintively just whine "can't</div><div class='add'>+we just do both?" and look pitiful.  Trust me, it works.  If it's not</div><div class='add'>+clear which approach is better, they'll eventually figure it out.  The</div><div class='add'>+answer may end up being that both teams get so frustrated by the</div><div class='add'>+situation that they just give up.</div><div class='add'>+</div><div class='add'>+That may sound like a failure, but it's usually a sign that there was</div><div class='add'>+something wrong with both projects, and the reason the people involved</div><div class='add'>+couldn't decide was that they were both wrong.  You end up coming up</div><div class='add'>+smelling like roses, and you avoided yet another decision that you could</div><div class='add'>+have screwed up on.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2) People</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+Most people are idiots, and being a manager means you'll have to deal</div><div class='add'>+with it, and perhaps more importantly, that **they** have to deal with</div><div class='add'>+**you**.</div><div class='add'>+</div><div class='add'>+It turns out that while it's easy to undo technical mistakes, it's not</div><div class='add'>+as easy to undo personality disorders.  You just have to live with</div><div class='add'>+theirs - and yours.</div><div class='add'>+</div><div class='add'>+However, in order to prepare yourself as a kernel manager, it's best to</div><div class='add'>+remember not to burn any bridges, bomb any innocent villagers, or</div><div class='add'>+alienate too many kernel developers. It turns out that alienating people</div><div class='add'>+is fairly easy, and un-alienating them is hard. Thus "alienating"</div><div class='add'>+immediately falls under the heading of "not reversible", and becomes a</div><div class='add'>+no-no according to :ref:`decisions`.</div><div class='add'>+</div><div class='add'>+There's just a few simple rules here:</div><div class='add'>+</div><div class='add'>+ (1) don't call people d*ckheads (at least not in public)</div><div class='add'>+ (2) learn how to apologize when you forgot rule (1)</div><div class='add'>+</div><div class='add'>+The problem with #1 is that it's very easy to do, since you can say</div><div class='add'>+"you're a d*ckhead" in millions of different ways [#f2]_, sometimes without</div><div class='add'>+even realizing it, and almost always with a white-hot conviction that</div><div class='add'>+you are right.</div><div class='add'>+</div><div class='add'>+And the more convinced you are that you are right (and let's face it,</div><div class='add'>+you can call just about **anybody** a d*ckhead, and you often **will** be</div><div class='add'>+right), the harder it ends up being to apologize afterwards.</div><div class='add'>+</div><div class='add'>+To solve this problem, you really only have two options:</div><div class='add'>+</div><div class='add'>+ - get really good at apologies</div><div class='add'>+ - spread the "love" out so evenly that nobody really ends up feeling</div><div class='add'>+   like they get unfairly targeted.  Make it inventive enough, and they</div><div class='add'>+   might even be amused.</div><div class='add'>+</div><div class='add'>+The option of being unfailingly polite really doesn't exist. Nobody will</div><div class='add'>+trust somebody who is so clearly hiding his true character.</div><div class='add'>+</div><div class='add'>+.. [#f2] Paul Simon sang "Fifty Ways to Leave Your Lover", because quite</div><div class='add'>+  frankly, "A Million Ways to Tell a Developer He Is a D*ckhead" doesn't</div><div class='add'>+  scan nearly as well.  But I'm sure he thought about it.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3) People II - the Good Kind</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+While it turns out that most people are idiots, the corollary to that is</div><div class='add'>+sadly that you are one too, and that while we can all bask in the secure</div><div class='add'>+knowledge that we're better than the average person (let's face it,</div><div class='add'>+nobody ever believes that they're average or below-average), we should</div><div class='add'>+also admit that we're not the sharpest knife around, and there will be</div><div class='add'>+other people that are less of an idiot than you are.</div><div class='add'>+</div><div class='add'>+Some people react badly to smart people.  Others take advantage of them.</div><div class='add'>+</div><div class='add'>+Make sure that you, as a kernel maintainer, are in the second group.</div><div class='add'>+Suck up to them, because they are the people who will make your job</div><div class='add'>+easier. In particular, they'll be able to make your decisions for you,</div><div class='add'>+which is what the game is all about.</div><div class='add'>+</div><div class='add'>+So when you find somebody smarter than you are, just coast along.  Your</div><div class='add'>+management responsibilities largely become ones of saying "Sounds like a</div><div class='add'>+good idea - go wild", or "That sounds good, but what about xxx?".  The</div><div class='add'>+second version in particular is a great way to either learn something</div><div class='add'>+new about "xxx" or seem **extra** managerial by pointing out something the</div><div class='add'>+smarter person hadn't thought about.  In either case, you win.</div><div class='add'>+</div><div class='add'>+One thing to look out for is to realize that greatness in one area does</div><div class='add'>+not necessarily translate to other areas.  So you might prod people in</div><div class='add'>+specific directions, but let's face it, they might be good at what they</div><div class='add'>+do, and suck at everything else.  The good news is that people tend to</div><div class='add'>+naturally gravitate back to what they are good at, so it's not like you</div><div class='add'>+are doing something irreversible when you **do** prod them in some</div><div class='add'>+direction, just don't push too hard.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4) Placing blame</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Things will go wrong, and people want somebody to blame. Tag, you're it.</div><div class='add'>+</div><div class='add'>+It's not actually that hard to accept the blame, especially if people</div><div class='add'>+kind of realize that it wasn't **all** your fault.  Which brings us to the</div><div class='add'>+best way of taking the blame: do it for another guy. You'll feel good</div><div class='add'>+for taking the fall, he'll feel good about not getting blamed, and the</div><div class='add'>+guy who lost his whole 36GB porn-collection because of your incompetence</div><div class='add'>+will grudgingly admit that you at least didn't try to weasel out of it.</div><div class='add'>+</div><div class='add'>+Then make the developer who really screwed up (if you can find him) know</div><div class='add'>+**in_private** that he screwed up.  Not just so he can avoid it in the</div><div class='add'>+future, but so that he knows he owes you one.  And, perhaps even more</div><div class='add'>+importantly, he's also likely the person who can fix it.  Because, let's</div><div class='add'>+face it, it sure ain't you.</div><div class='add'>+</div><div class='add'>+Taking the blame is also why you get to be manager in the first place.</div><div class='add'>+It's part of what makes people trust you, and allow you the potential</div><div class='add'>+glory, because you're the one who gets to say "I screwed up".  And if</div><div class='add'>+you've followed the previous rules, you'll be pretty good at saying that</div><div class='add'>+by now.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5) Things to avoid</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+There's one thing people hate even more than being called "d*ckhead",</div><div class='add'>+and that is being called a "d*ckhead" in a sanctimonious voice.  The</div><div class='add'>+first you can apologize for, the second one you won't really get the</div><div class='add'>+chance.  They likely will no longer be listening even if you otherwise</div><div class='add'>+do a good job.</div><div class='add'>+</div><div class='add'>+We all think we're better than anybody else, which means that when</div><div class='add'>+somebody else puts on airs, it **really** rubs us the wrong way.  You may</div><div class='add'>+be morally and intellectually superior to everybody around you, but</div><div class='add'>+don't try to make it too obvious unless you really **intend** to irritate</div><div class='add'>+somebody [#f3]_.</div><div class='add'>+</div><div class='add'>+Similarly, don't be too polite or subtle about things. Politeness easily</div><div class='add'>+ends up going overboard and hiding the problem, and as they say, "On the</div><div class='add'>+internet, nobody can hear you being subtle". Use a big blunt object to</div><div class='add'>+hammer the point in, because you can't really depend on people getting</div><div class='add'>+your point otherwise.</div><div class='add'>+</div><div class='add'>+Some humor can help pad both the bluntness and the moralizing.  Going</div><div class='add'>+overboard to the point of being ridiculous can drive a point home</div><div class='add'>+without making it painful to the recipient, who just thinks you're being</div><div class='add'>+silly.  It can thus help get through the personal mental block we all</div><div class='add'>+have about criticism.</div><div class='add'>+</div><div class='add'>+.. [#f3] Hint: internet newsgroups that are not directly related to your work</div><div class='add'>+  are great ways to take out your frustrations at other people. Write</div><div class='add'>+  insulting posts with a sneer just to get into a good flame every once in</div><div class='add'>+  a while, and you'll feel cleansed. Just don't crap too close to home.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6) Why me?</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+Since your main responsibility seems to be to take the blame for other</div><div class='add'>+peoples mistakes, and make it painfully obvious to everybody else that</div><div class='add'>+you're incompetent, the obvious question becomes one of why do it in the</div><div class='add'>+first place?</div><div class='add'>+</div><div class='add'>+First off, while you may or may not get screaming teenage girls (or</div><div class='add'>+boys, let's not be judgmental or sexist here) knocking on your dressing</div><div class='add'>+room door, you **will** get an immense feeling of personal accomplishment</div><div class='add'>+for being "in charge".  Never mind the fact that you're really leading</div><div class='add'>+by trying to keep up with everybody else and running after them as fast</div><div class='add'>+as you can.  Everybody will still think you're the person in charge.</div><div class='add'>+</div><div class='add'>+It's a great job if you can hack it.</div><div class='head'>diff --git a/Documentation/stable_api_nonsense.txt b/Documentation/process/stable-api-nonsense.rst<br/>index 24f5aeecee91..24f5aeecee91 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/stable_api_nonsense.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/stable_api_nonsense.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/process/stable-api-nonsense.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/stable-api-nonsense.rst</a></div><div class='head'>diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst<br/>new file mode 100644<br/>index 000000000000..11ec2d93a5e0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/stable-kernel-rules.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/stable-kernel-rules.rst</a></div><div class='hunk'>@@ -0,0 +1,181 @@</div><div class='add'>+.. _stable_kernel_rules:</div><div class='add'>+</div><div class='add'>+Everything you ever wanted to know about Linux -stable releases</div><div class='add'>+===============================================================</div><div class='add'>+</div><div class='add'>+Rules on what kind of patches are accepted, and which ones are not, into the</div><div class='add'>+"-stable" tree:</div><div class='add'>+</div><div class='add'>+ - It must be obviously correct and tested.</div><div class='add'>+ - It cannot be bigger than 100 lines, with context.</div><div class='add'>+ - It must fix only one thing.</div><div class='add'>+ - It must fix a real bug that bothers people (not a, "This could be a</div><div class='add'>+   problem..." type thing).</div><div class='add'>+ - It must fix a problem that causes a build error (but not for things</div><div class='add'>+   marked CONFIG_BROKEN), an oops, a hang, data corruption, a real</div><div class='add'>+   security issue, or some "oh, that's not good" issue.  In short, something</div><div class='add'>+   critical.</div><div class='add'>+ - Serious issues as reported by a user of a distribution kernel may also</div><div class='add'>+   be considered if they fix a notable performance or interactivity issue.</div><div class='add'>+   As these fixes are not as obvious and have a higher risk of a subtle</div><div class='add'>+   regression they should only be submitted by a distribution kernel</div><div class='add'>+   maintainer and include an addendum linking to a bugzilla entry if it</div><div class='add'>+   exists and additional information on the user-visible impact.</div><div class='add'>+ - New device IDs and quirks are also accepted.</div><div class='add'>+ - No "theoretical race condition" issues, unless an explanation of how the</div><div class='add'>+   race can be exploited is also provided.</div><div class='add'>+ - It cannot contain any "trivial" fixes in it (spelling changes,</div><div class='add'>+   whitespace cleanups, etc).</div><div class='add'>+ - It must follow the</div><div class='add'>+   :ref:`Documentation/process/submitting-patches.rst &lt;submittingpatches&gt;`</div><div class='add'>+   rules.</div><div class='add'>+ - It or an equivalent fix must already exist in Linus' tree (upstream).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Procedure for submitting patches to the -stable tree</div><div class='add'>+----------------------------------------------------</div><div class='add'>+</div><div class='add'>+ - If the patch covers files in net/ or drivers/net please follow netdev stable</div><div class='add'>+   submission guidelines as described in</div><div class='add'>+   Documentation/networking/netdev-FAQ.txt</div><div class='add'>+ - Security patches should not be handled (solely) by the -stable review</div><div class='add'>+   process but should follow the procedures in</div><div class='add'>+   :ref:`Documentation/admin-guide/security-bugs.rst &lt;securitybugs&gt;`.</div><div class='add'>+</div><div class='add'>+For all other submissions, choose one of the following procedures</div><div class='add'>+-----------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+.. _option_1:</div><div class='add'>+</div><div class='add'>+Option 1</div><div class='add'>+********</div><div class='add'>+</div><div class='add'>+To have the patch automatically included in the stable tree, add the tag</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+     Cc: stable@vger.kernel.org</div><div class='add'>+</div><div class='add'>+in the sign-off area. Once the patch is merged it will be applied to</div><div class='add'>+the stable tree without anything else needing to be done by the author</div><div class='add'>+or subsystem maintainer.</div><div class='add'>+</div><div class='add'>+.. _option_2:</div><div class='add'>+</div><div class='add'>+Option 2</div><div class='add'>+********</div><div class='add'>+</div><div class='add'>+After the patch has been merged to Linus' tree, send an email to</div><div class='add'>+stable@vger.kernel.org containing the subject of the patch, the commit ID,</div><div class='add'>+why you think it should be applied, and what kernel version you wish it to</div><div class='add'>+be applied to.</div><div class='add'>+</div><div class='add'>+.. _option_3:</div><div class='add'>+</div><div class='add'>+Option 3</div><div class='add'>+********</div><div class='add'>+</div><div class='add'>+Send the patch, after verifying that it follows the above rules, to</div><div class='add'>+stable@vger.kernel.org.  You must note the upstream commit ID in the</div><div class='add'>+changelog of your submission, as well as the kernel version you wish</div><div class='add'>+it to be applied to.</div><div class='add'>+</div><div class='add'>+:ref:`option_1` is **strongly** preferred, is the easiest and most common.</div><div class='add'>+:ref:`option_2` and :ref:`option_3` are more useful if the patch isn't deemed</div><div class='add'>+worthy at the time it is applied to a public git tree (for instance, because</div><div class='add'>+it deserves more regression testing first).  :ref:`option_3` is especially</div><div class='add'>+useful if the patch needs some special handling to apply to an older kernel</div><div class='add'>+(e.g., if API's have changed in the meantime).</div><div class='add'>+</div><div class='add'>+Note that for :ref:`option_3`, if the patch deviates from the original</div><div class='add'>+upstream patch (for example because it had to be backported) this must be very</div><div class='add'>+clearly documented and justified in the patch description.</div><div class='add'>+</div><div class='add'>+The upstream commit ID must be specified with a separate line above the commit</div><div class='add'>+text, like this:</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+    commit &lt;sha1&gt; upstream.</div><div class='add'>+</div><div class='add'>+Additionally, some patches submitted via Option 1 may have additional patch</div><div class='add'>+prerequisites which can be cherry-picked. This can be specified in the following</div><div class='add'>+format in the sign-off area:</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x: a1f84a3: sched: Check for idle</div><div class='add'>+     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x: 1b9508f: sched: Rate-limit newidle</div><div class='add'>+     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x: fd21073: sched: Fix affinity logic</div><div class='add'>+     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x</div><div class='add'>+     Signed-off-by: Ingo Molnar &lt;mingo@elte.hu&gt;</div><div class='add'>+</div><div class='add'>+The tag sequence has the meaning of:</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+     git cherry-pick a1f84a3</div><div class='add'>+     git cherry-pick 1b9508f</div><div class='add'>+     git cherry-pick fd21073</div><div class='add'>+     git cherry-pick &lt;this commit&gt;</div><div class='add'>+</div><div class='add'>+Also, some patches may have kernel version prerequisites.  This can be</div><div class='add'>+specified in the following format in the sign-off area:</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x-</div><div class='add'>+</div><div class='add'>+The tag has the meaning of:</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+     git cherry-pick &lt;this commit&gt;</div><div class='add'>+</div><div class='add'>+For each "-stable" tree starting with the specified version.</div><div class='add'>+</div><div class='add'>+Following the submission:</div><div class='add'>+</div><div class='add'>+ - The sender will receive an ACK when the patch has been accepted into the</div><div class='add'>+   queue, or a NAK if the patch is rejected.  This response might take a few</div><div class='add'>+   days, according to the developer's schedules.</div><div class='add'>+ - If accepted, the patch will be added to the -stable queue, for review by</div><div class='add'>+   other developers and by the relevant subsystem maintainer.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Review cycle</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+ - When the -stable maintainers decide for a review cycle, the patches will be</div><div class='add'>+   sent to the review committee, and the maintainer of the affected area of</div><div class='add'>+   the patch (unless the submitter is the maintainer of the area) and CC: to</div><div class='add'>+   the linux-kernel mailing list.</div><div class='add'>+ - The review committee has 48 hours in which to ACK or NAK the patch.</div><div class='add'>+ - If the patch is rejected by a member of the committee, or linux-kernel</div><div class='add'>+   members object to the patch, bringing up issues that the maintainers and</div><div class='add'>+   members did not realize, the patch will be dropped from the queue.</div><div class='add'>+ - At the end of the review cycle, the ACKed patches will be added to the</div><div class='add'>+   latest -stable release, and a new -stable release will happen.</div><div class='add'>+ - Security patches will be accepted into the -stable tree directly from the</div><div class='add'>+   security kernel team, and not go through the normal review cycle.</div><div class='add'>+   Contact the kernel security team for more details on this procedure.</div><div class='add'>+</div><div class='add'>+Trees</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+ - The queues of patches, for both completed versions and in progress</div><div class='add'>+   versions can be found at:</div><div class='add'>+</div><div class='add'>+	http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git</div><div class='add'>+</div><div class='add'>+ - The finalized and tagged releases of all stable kernels can be found</div><div class='add'>+   in separate branches per version at:</div><div class='add'>+</div><div class='add'>+	http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Review committee</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+ - This is made up of a number of kernel developers who have volunteered for</div><div class='add'>+   this task, and a few that haven't.</div><div class='head'>diff --git a/Documentation/process/submit-checklist.rst b/Documentation/process/submit-checklist.rst<br/>new file mode 100644<br/>index 000000000000..a0d9d34bfb6d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/submit-checklist.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/submit-checklist.rst</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+.. _submitchecklist:</div><div class='add'>+</div><div class='add'>+Linux Kernel patch submission checklist</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Here are some basic things that developers should do if they want to see their</div><div class='add'>+kernel patch submissions accepted more quickly.</div><div class='add'>+</div><div class='add'>+These are all above and beyond the documentation that is provided in</div><div class='add'>+:ref:`Documentation/process/submitting-patches.rst &lt;submittingpatches&gt;`</div><div class='add'>+and elsewhere regarding submitting Linux kernel patches.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1) If you use a facility then #include the file that defines/declares</div><div class='add'>+   that facility.  Don't depend on other header files pulling in ones</div><div class='add'>+   that you use.</div><div class='add'>+</div><div class='add'>+2) Builds cleanly:</div><div class='add'>+</div><div class='add'>+  a) with applicable or modified ``CONFIG`` options ``=y``, ``=m``, and</div><div class='add'>+     ``=n``.  No ``gcc`` warnings/errors, no linker warnings/errors.</div><div class='add'>+</div><div class='add'>+  b) Passes ``allnoconfig``, ``allmodconfig``</div><div class='add'>+</div><div class='add'>+  c) Builds successfully when using ``O=builddir``</div><div class='add'>+</div><div class='add'>+3) Builds on multiple CPU architectures by using local cross-compile tools</div><div class='add'>+   or some other build farm.</div><div class='add'>+</div><div class='add'>+4) ppc64 is a good architecture for cross-compilation checking because it</div><div class='add'>+   tends to use ``unsigned long`` for 64-bit quantities.</div><div class='add'>+</div><div class='add'>+5) Check your patch for general style as detailed in</div><div class='add'>+   :ref:`Documentation/process/coding-style.rst &lt;codingstyle&gt;`.</div><div class='add'>+   Check for trivial violations with the patch style checker prior to</div><div class='add'>+   submission (``scripts/checkpatch.pl``).</div><div class='add'>+   You should be able to justify all violations that remain in</div><div class='add'>+   your patch.</div><div class='add'>+</div><div class='add'>+6) Any new or modified ``CONFIG`` options don't muck up the config menu.</div><div class='add'>+</div><div class='add'>+7) All new ``Kconfig`` options have help text.</div><div class='add'>+</div><div class='add'>+8) Has been carefully reviewed with respect to relevant ``Kconfig``</div><div class='add'>+   combinations.  This is very hard to get right with testing -- brainpower</div><div class='add'>+   pays off here.</div><div class='add'>+</div><div class='add'>+9) Check cleanly with sparse.</div><div class='add'>+</div><div class='add'>+10) Use ``make checkstack`` and ``make namespacecheck`` and fix any problems</div><div class='add'>+    that they find.</div><div class='add'>+</div><div class='add'>+    .. note::</div><div class='add'>+</div><div class='add'>+       ``checkstack`` does not point out problems explicitly,</div><div class='add'>+       but any one function that uses more than 512 bytes on the stack is a</div><div class='add'>+       candidate for change.</div><div class='add'>+</div><div class='add'>+11) Include :ref:`kernel-doc &lt;kernel_doc&gt;` to document global  kernel APIs.</div><div class='add'>+    (Not required for static functions, but OK there also.) Use</div><div class='add'>+    ``make htmldocs`` or ``make pdfdocs`` to check the</div><div class='add'>+    :ref:`kernel-doc &lt;kernel_doc&gt;` and fix any issues.</div><div class='add'>+</div><div class='add'>+12) Has been tested with ``CONFIG_PREEMPT``, ``CONFIG_DEBUG_PREEMPT``,</div><div class='add'>+    ``CONFIG_DEBUG_SLAB``, ``CONFIG_DEBUG_PAGEALLOC``, ``CONFIG_DEBUG_MUTEXES``,</div><div class='add'>+    ``CONFIG_DEBUG_SPINLOCK``, ``CONFIG_DEBUG_ATOMIC_SLEEP``,</div><div class='add'>+    ``CONFIG_PROVE_RCU`` and ``CONFIG_DEBUG_OBJECTS_RCU_HEAD`` all</div><div class='add'>+    simultaneously enabled.</div><div class='add'>+</div><div class='add'>+13) Has been build- and runtime tested with and without ``CONFIG_SMP`` and</div><div class='add'>+    ``CONFIG_PREEMPT.``</div><div class='add'>+</div><div class='add'>+14) If the patch affects IO/Disk, etc: has been tested with and without</div><div class='add'>+    ``CONFIG_LBDAF.``</div><div class='add'>+</div><div class='add'>+15) All codepaths have been exercised with all lockdep features enabled.</div><div class='add'>+</div><div class='add'>+16) All new ``/proc`` entries are documented under ``Documentation/``</div><div class='add'>+</div><div class='add'>+17) All new kernel boot parameters are documented in</div><div class='add'>+    ``Documentation/admin-guide/kernel-parameters.rst``.</div><div class='add'>+</div><div class='add'>+18) All new module parameters are documented with ``MODULE_PARM_DESC()``</div><div class='add'>+</div><div class='add'>+19) All new userspace interfaces are documented in ``Documentation/ABI/``.</div><div class='add'>+    See ``Documentation/ABI/README`` for more information.</div><div class='add'>+    Patches that change userspace interfaces should be CCed to</div><div class='add'>+    linux-api@vger.kernel.org.</div><div class='add'>+</div><div class='add'>+20) Check that it all passes ``make headers_check``.</div><div class='add'>+</div><div class='add'>+21) Has been checked with injection of at least slab and page-allocation</div><div class='add'>+    failures.  See ``Documentation/fault-injection/``.</div><div class='add'>+</div><div class='add'>+    If the new code is substantial, addition of subsystem-specific fault</div><div class='add'>+    injection might be appropriate.</div><div class='add'>+</div><div class='add'>+22) Newly-added code has been compiled with ``gcc -W`` (use</div><div class='add'>+    ``make EXTRA_CFLAGS=-W``).  This will generate lots of noise, but is good</div><div class='add'>+    for finding bugs like "warning: comparison between signed and unsigned".</div><div class='add'>+</div><div class='add'>+23) Tested after it has been merged into the -mm patchset to make sure</div><div class='add'>+    that it still works with all of the other queued patches and various</div><div class='add'>+    changes in the VM, VFS, and other subsystems.</div><div class='add'>+</div><div class='add'>+24) All memory barriers {e.g., ``barrier()``, ``rmb()``, ``wmb()``} need a</div><div class='add'>+    comment in the source code that explains the logic of what they are doing</div><div class='add'>+    and why.</div><div class='add'>+</div><div class='add'>+25) If any ioctl's are added by the patch, then also update</div><div class='add'>+    ``Documentation/ioctl/ioctl-number.txt``.</div><div class='add'>+</div><div class='add'>+26) If your modified source code depends on or uses any of the kernel</div><div class='add'>+    APIs or features that are related to the following ``Kconfig`` symbols,</div><div class='add'>+    then test multiple builds with the related ``Kconfig`` symbols disabled</div><div class='add'>+    and/or ``=m`` (if that option is available) [not all of these at the</div><div class='add'>+    same time, just various/random combinations of them]:</div><div class='add'>+</div><div class='add'>+    ``CONFIG_SMP``, ``CONFIG_SYSFS``, ``CONFIG_PROC_FS``, ``CONFIG_INPUT``, ``CONFIG_PCI``, ``CONFIG_BLOCK``, ``CONFIG_PM``, ``CONFIG_MAGIC_SYSRQ``,</div><div class='add'>+    ``CONFIG_NET``, ``CONFIG_INET=n`` (but latter with ``CONFIG_NET=y``).</div><div class='head'>diff --git a/Documentation/process/submitting-drivers.rst b/Documentation/process/submitting-drivers.rst<br/>new file mode 100644<br/>index 000000000000..afb82ee0cbea<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/submitting-drivers.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/submitting-drivers.rst</a></div><div class='hunk'>@@ -0,0 +1,191 @@</div><div class='add'>+.. _submittingdrivers:</div><div class='add'>+</div><div class='add'>+Submitting Drivers For The Linux Kernel</div><div class='add'>+=======================================</div><div class='add'>+</div><div class='add'>+This document is intended to explain how to submit device drivers to the</div><div class='add'>+various kernel trees. Note that if you are interested in video card drivers</div><div class='add'>+you should probably talk to XFree86 (http://www.xfree86.org/) and/or X.Org</div><div class='add'>+(http://x.org/) instead.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+</div><div class='add'>+   This document is old and has seen little maintenance in recent years; it</div><div class='add'>+   should probably be updated or, perhaps better, just deleted.  Most of</div><div class='add'>+   what is here can be found in the other development documents anyway.</div><div class='add'>+</div><div class='add'>+   Oh, and we don't really recommend submitting changes to XFree86 :)</div><div class='add'>+</div><div class='add'>+Also read the Documentation/process/submitting-patches.rst document.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Allocating Device Numbers</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+Major and minor numbers for block and character devices are allocated</div><div class='add'>+by the Linux assigned name and number authority (currently this is</div><div class='add'>+Torben Mathiasen). The site is http://www.lanana.org/. This</div><div class='add'>+also deals with allocating numbers for devices that are not going to</div><div class='add'>+be submitted to the mainstream kernel.</div><div class='add'>+See Documentation/admin-guide/devices.rst for more information on this.</div><div class='add'>+</div><div class='add'>+If you don't use assigned numbers then when your device is submitted it will</div><div class='add'>+be given an assigned number even if that is different from values you may</div><div class='add'>+have shipped to customers before.</div><div class='add'>+</div><div class='add'>+Who To Submit Drivers To</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+Linux 2.0:</div><div class='add'>+	No new drivers are accepted for this kernel tree.</div><div class='add'>+</div><div class='add'>+Linux 2.2:</div><div class='add'>+	No new drivers are accepted for this kernel tree.</div><div class='add'>+</div><div class='add'>+Linux 2.4:</div><div class='add'>+	If the code area has a general maintainer then please submit it to</div><div class='add'>+	the maintainer listed in MAINTAINERS in the kernel file. If the</div><div class='add'>+	maintainer does not respond or you cannot find the appropriate</div><div class='add'>+	maintainer then please contact Willy Tarreau &lt;w@1wt.eu&gt;.</div><div class='add'>+</div><div class='add'>+Linux 2.6 and upper:</div><div class='add'>+	The same rules apply as 2.4 except that you should follow linux-kernel</div><div class='add'>+	to track changes in API's. The final contact point for Linux 2.6+</div><div class='add'>+	submissions is Andrew Morton.</div><div class='add'>+</div><div class='add'>+What Criteria Determine Acceptance</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+Licensing:</div><div class='add'>+		The code must be released to us under the</div><div class='add'>+		GNU General Public License. We don't insist on any kind</div><div class='add'>+		of exclusive GPL licensing, and if you wish the driver</div><div class='add'>+		to be useful to other communities such as BSD you may well</div><div class='add'>+		wish to release under multiple licenses.</div><div class='add'>+		See accepted licenses at include/linux/module.h</div><div class='add'>+</div><div class='add'>+Copyright:</div><div class='add'>+		The copyright owner must agree to use of GPL.</div><div class='add'>+		It's best if the submitter and copyright owner</div><div class='add'>+		are the same person/entity. If not, the name of</div><div class='add'>+		the person/entity authorizing use of GPL should be</div><div class='add'>+		listed in case it's necessary to verify the will of</div><div class='add'>+		the copyright owner.</div><div class='add'>+</div><div class='add'>+Interfaces:</div><div class='add'>+		If your driver uses existing interfaces and behaves like</div><div class='add'>+		other drivers in the same class it will be much more likely</div><div class='add'>+		to be accepted than if it invents gratuitous new ones.</div><div class='add'>+		If you need to implement a common API over Linux and NT</div><div class='add'>+		drivers do it in userspace.</div><div class='add'>+</div><div class='add'>+Code:</div><div class='add'>+		Please use the Linux style of code formatting as documented</div><div class='add'>+		in :ref:`Documentation/process/coding-style.rst &lt;codingStyle&gt;`.</div><div class='add'>+		If you have sections of code</div><div class='add'>+		that need to be in other formats, for example because they</div><div class='add'>+		are shared with a windows driver kit and you want to</div><div class='add'>+		maintain them just once separate them out nicely and note</div><div class='add'>+		this fact.</div><div class='add'>+</div><div class='add'>+Portability:</div><div class='add'>+		Pointers are not always 32bits, not all computers are little</div><div class='add'>+		endian, people do not all have floating point and you</div><div class='add'>+		shouldn't use inline x86 assembler in your driver without</div><div class='add'>+		careful thought. Pure x86 drivers generally are not popular.</div><div class='add'>+		If you only have x86 hardware it is hard to test portability</div><div class='add'>+		but it is easy to make sure the code can easily be made</div><div class='add'>+		portable.</div><div class='add'>+</div><div class='add'>+Clarity:</div><div class='add'>+		It helps if anyone can see how to fix the driver. It helps</div><div class='add'>+		you because you get patches not bug reports. If you submit a</div><div class='add'>+		driver that intentionally obfuscates how the hardware works</div><div class='add'>+		it will go in the bitbucket.</div><div class='add'>+</div><div class='add'>+PM support:</div><div class='add'>+		Since Linux is used on many portable and desktop systems, your</div><div class='add'>+		driver is likely to be used on such a system and therefore it</div><div class='add'>+		should support basic power management by implementing, if</div><div class='add'>+		necessary, the .suspend and .resume methods used during the</div><div class='add'>+		system-wide suspend and resume transitions.  You should verify</div><div class='add'>+		that your driver correctly handles the suspend and resume, but</div><div class='add'>+		if you are unable to ensure that, please at least define the</div><div class='add'>+		.suspend method returning the -ENOSYS ("Function not</div><div class='add'>+		implemented") error.  You should also try to make sure that your</div><div class='add'>+		driver uses as little power as possible when it's not doing</div><div class='add'>+		anything.  For the driver testing instructions see</div><div class='add'>+		Documentation/power/drivers-testing.txt and for a relatively</div><div class='add'>+		complete overview of the power management issues related to</div><div class='add'>+		drivers see Documentation/power/admin-guide/devices.rst .</div><div class='add'>+</div><div class='add'>+Control:</div><div class='add'>+		In general if there is active maintenance of a driver by</div><div class='add'>+		the author then patches will be redirected to them unless</div><div class='add'>+		they are totally obvious and without need of checking.</div><div class='add'>+		If you want to be the contact and update point for the</div><div class='add'>+		driver it is a good idea to state this in the comments,</div><div class='add'>+		and include an entry in MAINTAINERS for your driver.</div><div class='add'>+</div><div class='add'>+What Criteria Do Not Determine Acceptance</div><div class='add'>+-----------------------------------------</div><div class='add'>+</div><div class='add'>+Vendor:</div><div class='add'>+		Being the hardware vendor and maintaining the driver is</div><div class='add'>+		often a good thing. If there is a stable working driver from</div><div class='add'>+		other people already in the tree don't expect 'we are the</div><div class='add'>+		vendor' to get your driver chosen. Ideally work with the</div><div class='add'>+		existing driver author to build a single perfect driver.</div><div class='add'>+</div><div class='add'>+Author:</div><div class='add'>+		It doesn't matter if a large Linux company wrote the driver,</div><div class='add'>+		or you did. Nobody has any special access to the kernel</div><div class='add'>+		tree. Anyone who tells you otherwise isn't telling the</div><div class='add'>+		whole story.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Resources</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+Linux kernel master tree:</div><div class='add'>+	ftp.\ *country_code*\ .kernel.org:/pub/linux/kernel/...</div><div class='add'>+</div><div class='add'>+	where *country_code* == your country code, such as</div><div class='add'>+	**us**, **uk**, **fr**, etc.</div><div class='add'>+</div><div class='add'>+	http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git</div><div class='add'>+</div><div class='add'>+Linux kernel mailing list:</div><div class='add'>+	linux-kernel@vger.kernel.org</div><div class='add'>+	[mail majordomo@vger.kernel.org to subscribe]</div><div class='add'>+</div><div class='add'>+Linux Device Drivers, Third Edition (covers 2.6.10):</div><div class='add'>+	http://lwn.net/Kernel/LDD3/  (free version)</div><div class='add'>+</div><div class='add'>+LWN.net:</div><div class='add'>+	Weekly summary of kernel development activity - http://lwn.net/</div><div class='add'>+</div><div class='add'>+	2.6 API changes:</div><div class='add'>+</div><div class='add'>+		http://lwn.net/Articles/2.6-kernel-api/</div><div class='add'>+</div><div class='add'>+	Porting drivers from prior kernels to 2.6:</div><div class='add'>+</div><div class='add'>+		http://lwn.net/Articles/driver-porting/</div><div class='add'>+</div><div class='add'>+KernelNewbies:</div><div class='add'>+	Documentation and assistance for new kernel programmers</div><div class='add'>+</div><div class='add'>+		http://kernelnewbies.org/</div><div class='add'>+</div><div class='add'>+Linux USB project:</div><div class='add'>+	http://www.linux-usb.org/</div><div class='add'>+</div><div class='add'>+How to NOT write kernel driver by Arjan van de Ven:</div><div class='add'>+	http://www.fenrus.org/how-to-not-write-a-device-driver-paper.pdf</div><div class='add'>+</div><div class='add'>+Kernel Janitor:</div><div class='add'>+	http://kernelnewbies.org/KernelJanitors</div><div class='add'>+</div><div class='add'>+GIT, Fast Version Control System:</div><div class='add'>+	http://git-scm.com/</div><div class='head'>diff --git a/Documentation/process/submitting-patches.rst b/Documentation/process/submitting-patches.rst<br/>new file mode 100644<br/>index 000000000000..3e10719fee35<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/submitting-patches.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/submitting-patches.rst</a></div><div class='hunk'>@@ -0,0 +1,836 @@</div><div class='add'>+.. _submittingpatches:</div><div class='add'>+</div><div class='add'>+Submitting patches: the essential guide to getting your code into the kernel</div><div class='add'>+============================================================================</div><div class='add'>+</div><div class='add'>+For a person or company who wishes to submit a change to the Linux</div><div class='add'>+kernel, the process can sometimes be daunting if you're not familiar</div><div class='add'>+with "the system."  This text is a collection of suggestions which</div><div class='add'>+can greatly increase the chances of your change being accepted.</div><div class='add'>+</div><div class='add'>+This document contains a large number of suggestions in a relatively terse</div><div class='add'>+format.  For detailed information on how the kernel development process</div><div class='add'>+works, see :ref:`Documentation/process &lt;development_process_main&gt;`.</div><div class='add'>+Also, read :ref:`Documentation/process/submit-checklist.rst &lt;submitchecklist&gt;`</div><div class='add'>+for a list of items to check before</div><div class='add'>+submitting code.  If you are submitting a driver, also read</div><div class='add'>+:ref:`Documentation/process/submitting-drivers.rst &lt;submittingdrivers&gt;`;</div><div class='add'>+for device tree binding patches, read</div><div class='add'>+Documentation/devicetree/bindings/submitting-patches.txt.</div><div class='add'>+</div><div class='add'>+Many of these steps describe the default behavior of the ``git`` version</div><div class='add'>+control system; if you use ``git`` to prepare your patches, you'll find much</div><div class='add'>+of the mechanical work done for you, though you'll still need to prepare</div><div class='add'>+and document a sensible set of patches.  In general, use of ``git`` will make</div><div class='add'>+your life as a kernel developer easier.</div><div class='add'>+</div><div class='add'>+0) Obtain a current source tree</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+If you do not have a repository with the current kernel source handy, use</div><div class='add'>+``git`` to obtain one.  You'll want to start with the mainline repository,</div><div class='add'>+which can be grabbed with::</div><div class='add'>+</div><div class='add'>+  git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git</div><div class='add'>+</div><div class='add'>+Note, however, that you may not want to develop against the mainline tree</div><div class='add'>+directly.  Most subsystem maintainers run their own trees and want to see</div><div class='add'>+patches prepared against those trees.  See the **T:** entry for the subsystem</div><div class='add'>+in the MAINTAINERS file to find that tree, or simply ask the maintainer if</div><div class='add'>+the tree is not listed there.</div><div class='add'>+</div><div class='add'>+It is still possible to download kernel releases via tarballs (as described</div><div class='add'>+in the next section), but that is the hard way to do kernel development.</div><div class='add'>+</div><div class='add'>+1) ``diff -up``</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+If you must generate your patches by hand, use ``diff -up`` or ``diff -uprN``</div><div class='add'>+to create patches.  Git generates patches in this form by default; if</div><div class='add'>+you're using ``git``, you can skip this section entirely.</div><div class='add'>+</div><div class='add'>+All changes to the Linux kernel occur in the form of patches, as</div><div class='add'>+generated by :manpage:`diff(1)`.  When creating your patch, make sure to</div><div class='add'>+create it in "unified diff" format, as supplied by the ``-u`` argument</div><div class='add'>+to :manpage:`diff(1)`.</div><div class='add'>+Also, please use the ``-p`` argument which shows which C function each</div><div class='add'>+change is in - that makes the resultant ``diff`` a lot easier to read.</div><div class='add'>+Patches should be based in the root kernel source directory,</div><div class='add'>+not in any lower subdirectory.</div><div class='add'>+</div><div class='add'>+To create a patch for a single file, it is often sufficient to do::</div><div class='add'>+</div><div class='add'>+	SRCTREE= linux</div><div class='add'>+	MYFILE=  drivers/net/mydriver.c</div><div class='add'>+</div><div class='add'>+	cd $SRCTREE</div><div class='add'>+	cp $MYFILE $MYFILE.orig</div><div class='add'>+	vi $MYFILE	# make your change</div><div class='add'>+	cd ..</div><div class='add'>+	diff -up $SRCTREE/$MYFILE{.orig,} &gt; /tmp/patch</div><div class='add'>+</div><div class='add'>+To create a patch for multiple files, you should unpack a "vanilla",</div><div class='add'>+or unmodified kernel source tree, and generate a ``diff`` against your</div><div class='add'>+own source tree.  For example::</div><div class='add'>+</div><div class='add'>+	MYSRC= /devel/linux</div><div class='add'>+</div><div class='add'>+	tar xvfz linux-3.19.tar.gz</div><div class='add'>+	mv linux-3.19 linux-3.19-vanilla</div><div class='add'>+	diff -uprN -X linux-3.19-vanilla/Documentation/dontdiff \</div><div class='add'>+		linux-3.19-vanilla $MYSRC &gt; /tmp/patch</div><div class='add'>+</div><div class='add'>+``dontdiff`` is a list of files which are generated by the kernel during</div><div class='add'>+the build process, and should be ignored in any :manpage:`diff(1)`-generated</div><div class='add'>+patch.</div><div class='add'>+</div><div class='add'>+Make sure your patch does not include any extra files which do not</div><div class='add'>+belong in a patch submission.  Make sure to review your patch -after-</div><div class='add'>+generating it with :manpage:`diff(1)`, to ensure accuracy.</div><div class='add'>+</div><div class='add'>+If your changes produce a lot of deltas, you need to split them into</div><div class='add'>+individual patches which modify things in logical stages; see</div><div class='add'>+:ref:`split_changes`.  This will facilitate review by other kernel developers,</div><div class='add'>+very important if you want your patch accepted.</div><div class='add'>+</div><div class='add'>+If you're using ``git``, ``git rebase -i`` can help you with this process.  If</div><div class='add'>+you're not using ``git``, ``quilt`` &lt;http://savannah.nongnu.org/projects/quilt&gt;</div><div class='add'>+is another popular alternative.</div><div class='add'>+</div><div class='add'>+.. _describe_changes:</div><div class='add'>+</div><div class='add'>+2) Describe your changes</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+Describe your problem.  Whether your patch is a one-line bug fix or</div><div class='add'>+5000 lines of a new feature, there must be an underlying problem that</div><div class='add'>+motivated you to do this work.  Convince the reviewer that there is a</div><div class='add'>+problem worth fixing and that it makes sense for them to read past the</div><div class='add'>+first paragraph.</div><div class='add'>+</div><div class='add'>+Describe user-visible impact.  Straight up crashes and lockups are</div><div class='add'>+pretty convincing, but not all bugs are that blatant.  Even if the</div><div class='add'>+problem was spotted during code review, describe the impact you think</div><div class='add'>+it can have on users.  Keep in mind that the majority of Linux</div><div class='add'>+installations run kernels from secondary stable trees or</div><div class='add'>+vendor/product-specific trees that cherry-pick only specific patches</div><div class='add'>+from upstream, so include anything that could help route your change</div><div class='add'>+downstream: provoking circumstances, excerpts from dmesg, crash</div><div class='add'>+descriptions, performance regressions, latency spikes, lockups, etc.</div><div class='add'>+</div><div class='add'>+Quantify optimizations and trade-offs.  If you claim improvements in</div><div class='add'>+performance, memory consumption, stack footprint, or binary size,</div><div class='add'>+include numbers that back them up.  But also describe non-obvious</div><div class='add'>+costs.  Optimizations usually aren't free but trade-offs between CPU,</div><div class='add'>+memory, and readability; or, when it comes to heuristics, between</div><div class='add'>+different workloads.  Describe the expected downsides of your</div><div class='add'>+optimization so that the reviewer can weigh costs against benefits.</div><div class='add'>+</div><div class='add'>+Once the problem is established, describe what you are actually doing</div><div class='add'>+about it in technical detail.  It's important to describe the change</div><div class='add'>+in plain English for the reviewer to verify that the code is behaving</div><div class='add'>+as you intend it to.</div><div class='add'>+</div><div class='add'>+The maintainer will thank you if you write your patch description in a</div><div class='add'>+form which can be easily pulled into Linux's source code management</div><div class='add'>+system, ``git``, as a "commit log".  See :ref:`explicit_in_reply_to`.</div><div class='add'>+</div><div class='add'>+Solve only one problem per patch.  If your description starts to get</div><div class='add'>+long, that's a sign that you probably need to split up your patch.</div><div class='add'>+See :ref:`split_changes`.</div><div class='add'>+</div><div class='add'>+When you submit or resubmit a patch or patch series, include the</div><div class='add'>+complete patch description and justification for it.  Don't just</div><div class='add'>+say that this is version N of the patch (series).  Don't expect the</div><div class='add'>+subsystem maintainer to refer back to earlier patch versions or referenced</div><div class='add'>+URLs to find the patch description and put that into the patch.</div><div class='add'>+I.e., the patch (series) and its description should be self-contained.</div><div class='add'>+This benefits both the maintainers and reviewers.  Some reviewers</div><div class='add'>+probably didn't even receive earlier versions of the patch.</div><div class='add'>+</div><div class='add'>+Describe your changes in imperative mood, e.g. "make xyzzy do frotz"</div><div class='add'>+instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy</div><div class='add'>+to do frotz", as if you are giving orders to the codebase to change</div><div class='add'>+its behaviour.</div><div class='add'>+</div><div class='add'>+If the patch fixes a logged bug entry, refer to that bug entry by</div><div class='add'>+number and URL.  If the patch follows from a mailing list discussion,</div><div class='add'>+give a URL to the mailing list archive; use the https://lkml.kernel.org/</div><div class='add'>+redirector with a ``Message-Id``, to ensure that the links cannot become</div><div class='add'>+stale.</div><div class='add'>+</div><div class='add'>+However, try to make your explanation understandable without external</div><div class='add'>+resources.  In addition to giving a URL to a mailing list archive or</div><div class='add'>+bug, summarize the relevant points of the discussion that led to the</div><div class='add'>+patch as submitted.</div><div class='add'>+</div><div class='add'>+If you want to refer to a specific commit, don't just refer to the</div><div class='add'>+SHA-1 ID of the commit. Please also include the oneline summary of</div><div class='add'>+the commit, to make it easier for reviewers to know what it is about.</div><div class='add'>+Example::</div><div class='add'>+</div><div class='add'>+	Commit e21d2170f36602ae2708 ("video: remove unnecessary</div><div class='add'>+	platform_set_drvdata()") removed the unnecessary</div><div class='add'>+	platform_set_drvdata(), but left the variable "dev" unused,</div><div class='add'>+	delete it.</div><div class='add'>+</div><div class='add'>+You should also be sure to use at least the first twelve characters of the</div><div class='add'>+SHA-1 ID.  The kernel repository holds a *lot* of objects, making</div><div class='add'>+collisions with shorter IDs a real possibility.  Bear in mind that, even if</div><div class='add'>+there is no collision with your six-character ID now, that condition may</div><div class='add'>+change five years from now.</div><div class='add'>+</div><div class='add'>+If your patch fixes a bug in a specific commit, e.g. you found an issue using</div><div class='add'>+``git bisect``, please use the 'Fixes:' tag with the first 12 characters of</div><div class='add'>+the SHA-1 ID, and the one line summary.  For example::</div><div class='add'>+</div><div class='add'>+	Fixes: e21d2170f366 ("video: remove unnecessary platform_set_drvdata()")</div><div class='add'>+</div><div class='add'>+The following ``git config`` settings can be used to add a pretty format for</div><div class='add'>+outputting the above style in the ``git log`` or ``git show`` commands::</div><div class='add'>+</div><div class='add'>+	[core]</div><div class='add'>+		abbrev = 12</div><div class='add'>+	[pretty]</div><div class='add'>+		fixes = Fixes: %h (\"%s\")</div><div class='add'>+</div><div class='add'>+.. _split_changes:</div><div class='add'>+</div><div class='add'>+3) Separate your changes</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+Separate each **logical change** into a separate patch.</div><div class='add'>+</div><div class='add'>+For example, if your changes include both bug fixes and performance</div><div class='add'>+enhancements for a single driver, separate those changes into two</div><div class='add'>+or more patches.  If your changes include an API update, and a new</div><div class='add'>+driver which uses that new API, separate those into two patches.</div><div class='add'>+</div><div class='add'>+On the other hand, if you make a single change to numerous files,</div><div class='add'>+group those changes into a single patch.  Thus a single logical change</div><div class='add'>+is contained within a single patch.</div><div class='add'>+</div><div class='add'>+The point to remember is that each patch should make an easily understood</div><div class='add'>+change that can be verified by reviewers.  Each patch should be justifiable</div><div class='add'>+on its own merits.</div><div class='add'>+</div><div class='add'>+If one patch depends on another patch in order for a change to be</div><div class='add'>+complete, that is OK.  Simply note **"this patch depends on patch X"**</div><div class='add'>+in your patch description.</div><div class='add'>+</div><div class='add'>+When dividing your change into a series of patches, take special care to</div><div class='add'>+ensure that the kernel builds and runs properly after each patch in the</div><div class='add'>+series.  Developers using ``git bisect`` to track down a problem can end up</div><div class='add'>+splitting your patch series at any point; they will not thank you if you</div><div class='add'>+introduce bugs in the middle.</div><div class='add'>+</div><div class='add'>+If you cannot condense your patch set into a smaller set of patches,</div><div class='add'>+then only post say 15 or so at a time and wait for review and integration.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4) Style-check your changes</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+Check your patch for basic style violations, details of which can be</div><div class='add'>+found in</div><div class='add'>+:ref:`Documentation/process/coding-style.rst &lt;codingstyle&gt;`.</div><div class='add'>+Failure to do so simply wastes</div><div class='add'>+the reviewers time and will get your patch rejected, probably</div><div class='add'>+without even being read.</div><div class='add'>+</div><div class='add'>+One significant exception is when moving code from one file to</div><div class='add'>+another -- in this case you should not modify the moved code at all in</div><div class='add'>+the same patch which moves it.  This clearly delineates the act of</div><div class='add'>+moving the code and your changes.  This greatly aids review of the</div><div class='add'>+actual differences and allows tools to better track the history of</div><div class='add'>+the code itself.</div><div class='add'>+</div><div class='add'>+Check your patches with the patch style checker prior to submission</div><div class='add'>+(scripts/checkpatch.pl).  Note, though, that the style checker should be</div><div class='add'>+viewed as a guide, not as a replacement for human judgment.  If your code</div><div class='add'>+looks better with a violation then its probably best left alone.</div><div class='add'>+</div><div class='add'>+The checker reports at three levels:</div><div class='add'>+ - ERROR: things that are very likely to be wrong</div><div class='add'>+ - WARNING: things requiring careful review</div><div class='add'>+ - CHECK: things requiring thought</div><div class='add'>+</div><div class='add'>+You should be able to justify all violations that remain in your</div><div class='add'>+patch.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5) Select the recipients for your patch</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+You should always copy the appropriate subsystem maintainer(s) on any patch</div><div class='add'>+to code that they maintain; look through the MAINTAINERS file and the</div><div class='add'>+source code revision history to see who those maintainers are.  The</div><div class='add'>+script scripts/get_maintainer.pl can be very useful at this step.  If you</div><div class='add'>+cannot find a maintainer for the subsystem you are working on, Andrew</div><div class='add'>+Morton (akpm@linux-foundation.org) serves as a maintainer of last resort.</div><div class='add'>+</div><div class='add'>+You should also normally choose at least one mailing list to receive a copy</div><div class='add'>+of your patch set.  linux-kernel@vger.kernel.org functions as a list of</div><div class='add'>+last resort, but the volume on that list has caused a number of developers</div><div class='add'>+to tune it out.  Look in the MAINTAINERS file for a subsystem-specific</div><div class='add'>+list; your patch will probably get more attention there.  Please do not</div><div class='add'>+spam unrelated lists, though.</div><div class='add'>+</div><div class='add'>+Many kernel-related lists are hosted on vger.kernel.org; you can find a</div><div class='add'>+list of them at http://vger.kernel.org/vger-lists.html.  There are</div><div class='add'>+kernel-related lists hosted elsewhere as well, though.</div><div class='add'>+</div><div class='add'>+Do not send more than 15 patches at once to the vger mailing lists!!!</div><div class='add'>+</div><div class='add'>+Linus Torvalds is the final arbiter of all changes accepted into the</div><div class='add'>+Linux kernel.  His e-mail address is &lt;torvalds@linux-foundation.org&gt;.</div><div class='add'>+He gets a lot of e-mail, and, at this point, very few patches go through</div><div class='add'>+Linus directly, so typically you should do your best to -avoid-</div><div class='add'>+sending him e-mail.</div><div class='add'>+</div><div class='add'>+If you have a patch that fixes an exploitable security bug, send that patch</div><div class='add'>+to security@kernel.org.  For severe bugs, a short embargo may be considered</div><div class='add'>+to allow distributors to get the patch out to users; in such cases,</div><div class='add'>+obviously, the patch should not be sent to any public lists.</div><div class='add'>+</div><div class='add'>+Patches that fix a severe bug in a released kernel should be directed</div><div class='add'>+toward the stable maintainers by putting a line like this::</div><div class='add'>+</div><div class='add'>+  Cc: stable@vger.kernel.org</div><div class='add'>+</div><div class='add'>+into the sign-off area of your patch (note, NOT an email recipient).  You</div><div class='add'>+should also read</div><div class='add'>+:ref:`Documentation/process/stable-kernel-rules.rst &lt;stable_kernel_rules&gt;`</div><div class='add'>+in addition to this file.</div><div class='add'>+</div><div class='add'>+Note, however, that some subsystem maintainers want to come to their own</div><div class='add'>+conclusions on which patches should go to the stable trees.  The networking</div><div class='add'>+maintainer, in particular, would rather not see individual developers</div><div class='add'>+adding lines like the above to their patches.</div><div class='add'>+</div><div class='add'>+If changes affect userland-kernel interfaces, please send the MAN-PAGES</div><div class='add'>+maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at</div><div class='add'>+least a notification of the change, so that some information makes its way</div><div class='add'>+into the manual pages.  User-space API changes should also be copied to</div><div class='add'>+linux-api@vger.kernel.org.</div><div class='add'>+</div><div class='add'>+For small patches you may want to CC the Trivial Patch Monkey</div><div class='add'>+trivial@kernel.org which collects "trivial" patches. Have a look</div><div class='add'>+into the MAINTAINERS file for its current manager.</div><div class='add'>+</div><div class='add'>+Trivial patches must qualify for one of the following rules:</div><div class='add'>+</div><div class='add'>+- Spelling fixes in documentation</div><div class='add'>+- Spelling fixes for errors which could break :manpage:`grep(1)`</div><div class='add'>+- Warning fixes (cluttering with useless warnings is bad)</div><div class='add'>+- Compilation fixes (only if they are actually correct)</div><div class='add'>+- Runtime fixes (only if they actually fix things)</div><div class='add'>+- Removing use of deprecated functions/macros</div><div class='add'>+- Contact detail and documentation fixes</div><div class='add'>+- Non-portable code replaced by portable code (even in arch-specific,</div><div class='add'>+  since people copy, as long as it's trivial)</div><div class='add'>+- Any fix by the author/maintainer of the file (ie. patch monkey</div><div class='add'>+  in re-transmission mode)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6) No MIME, no links, no compression, no attachments.  Just plain text</div><div class='add'>+----------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Linus and other kernel developers need to be able to read and comment</div><div class='add'>+on the changes you are submitting.  It is important for a kernel</div><div class='add'>+developer to be able to "quote" your changes, using standard e-mail</div><div class='add'>+tools, so that they may comment on specific portions of your code.</div><div class='add'>+</div><div class='add'>+For this reason, all patches should be submitted by e-mail "inline".</div><div class='add'>+</div><div class='add'>+.. warning::</div><div class='add'>+</div><div class='add'>+  Be wary of your editor's word-wrap corrupting your patch,</div><div class='add'>+  if you choose to cut-n-paste your patch.</div><div class='add'>+</div><div class='add'>+Do not attach the patch as a MIME attachment, compressed or not.</div><div class='add'>+Many popular e-mail applications will not always transmit a MIME</div><div class='add'>+attachment as plain text, making it impossible to comment on your</div><div class='add'>+code.  A MIME attachment also takes Linus a bit more time to process,</div><div class='add'>+decreasing the likelihood of your MIME-attached change being accepted.</div><div class='add'>+</div><div class='add'>+Exception:  If your mailer is mangling patches then someone may ask</div><div class='add'>+you to re-send them using MIME.</div><div class='add'>+</div><div class='add'>+See :ref:`Documentation/process/email-clients.rst &lt;email_clients&gt;`</div><div class='add'>+for hints about configuring your e-mail client so that it sends your patches</div><div class='add'>+untouched.</div><div class='add'>+</div><div class='add'>+7) E-mail size</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Large changes are not appropriate for mailing lists, and some</div><div class='add'>+maintainers.  If your patch, uncompressed, exceeds 300 kB in size,</div><div class='add'>+it is preferred that you store your patch on an Internet-accessible</div><div class='add'>+server, and provide instead a URL (link) pointing to your patch.  But note</div><div class='add'>+that if your patch exceeds 300 kB, it almost certainly needs to be broken up</div><div class='add'>+anyway.</div><div class='add'>+</div><div class='add'>+8) Respond to review comments</div><div class='add'>+-----------------------------</div><div class='add'>+</div><div class='add'>+Your patch will almost certainly get comments from reviewers on ways in</div><div class='add'>+which the patch can be improved.  You must respond to those comments;</div><div class='add'>+ignoring reviewers is a good way to get ignored in return.  Review comments</div><div class='add'>+or questions that do not lead to a code change should almost certainly</div><div class='add'>+bring about a comment or changelog entry so that the next reviewer better</div><div class='add'>+understands what is going on.</div><div class='add'>+</div><div class='add'>+Be sure to tell the reviewers what changes you are making and to thank them</div><div class='add'>+for their time.  Code review is a tiring and time-consuming process, and</div><div class='add'>+reviewers sometimes get grumpy.  Even in that case, though, respond</div><div class='add'>+politely and address the problems they have pointed out.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+9) Don't get discouraged - or impatient</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+After you have submitted your change, be patient and wait.  Reviewers are</div><div class='add'>+busy people and may not get to your patch right away.</div><div class='add'>+</div><div class='add'>+Once upon a time, patches used to disappear into the void without comment,</div><div class='add'>+but the development process works more smoothly than that now.  You should</div><div class='add'>+receive comments within a week or so; if that does not happen, make sure</div><div class='add'>+that you have sent your patches to the right place.  Wait for a minimum of</div><div class='add'>+one week before resubmitting or pinging reviewers - possibly longer during</div><div class='add'>+busy times like merge windows.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+10) Include PATCH in the subject</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+Due to high e-mail traffic to Linus, and to linux-kernel, it is common</div><div class='add'>+convention to prefix your subject line with [PATCH].  This lets Linus</div><div class='add'>+and other kernel developers more easily distinguish patches from other</div><div class='add'>+e-mail discussions.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+11) Sign your work — the Developer's Certificate of Origin</div><div class='add'>+----------------------------------------------------------</div><div class='add'>+</div><div class='add'>+To improve tracking of who did what, especially with patches that can</div><div class='add'>+percolate to their final resting place in the kernel through several</div><div class='add'>+layers of maintainers, we've introduced a "sign-off" procedure on</div><div class='add'>+patches that are being emailed around.</div><div class='add'>+</div><div class='add'>+The sign-off is a simple line at the end of the explanation for the</div><div class='add'>+patch, which certifies that you wrote it or otherwise have the right to</div><div class='add'>+pass it on as an open-source patch.  The rules are pretty simple: if you</div><div class='add'>+can certify the below:</div><div class='add'>+</div><div class='add'>+Developer's Certificate of Origin 1.1</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+By making a contribution to this project, I certify that:</div><div class='add'>+</div><div class='add'>+        (a) The contribution was created in whole or in part by me and I</div><div class='add'>+            have the right to submit it under the open source license</div><div class='add'>+            indicated in the file; or</div><div class='add'>+</div><div class='add'>+        (b) The contribution is based upon previous work that, to the best</div><div class='add'>+            of my knowledge, is covered under an appropriate open source</div><div class='add'>+            license and I have the right under that license to submit that</div><div class='add'>+            work with modifications, whether created in whole or in part</div><div class='add'>+            by me, under the same open source license (unless I am</div><div class='add'>+            permitted to submit under a different license), as indicated</div><div class='add'>+            in the file; or</div><div class='add'>+</div><div class='add'>+        (c) The contribution was provided directly to me by some other</div><div class='add'>+            person who certified (a), (b) or (c) and I have not modified</div><div class='add'>+            it.</div><div class='add'>+</div><div class='add'>+        (d) I understand and agree that this project and the contribution</div><div class='add'>+            are public and that a record of the contribution (including all</div><div class='add'>+            personal information I submit with it, including my sign-off) is</div><div class='add'>+            maintained indefinitely and may be redistributed consistent with</div><div class='add'>+            this project or the open source license(s) involved.</div><div class='add'>+</div><div class='add'>+then you just add a line saying::</div><div class='add'>+</div><div class='add'>+	Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='add'>+</div><div class='add'>+using your real name (sorry, no pseudonyms or anonymous contributions.)</div><div class='add'>+</div><div class='add'>+Some people also put extra tags at the end.  They'll just be ignored for</div><div class='add'>+now, but you can do this to mark internal company procedures or just</div><div class='add'>+point out some special detail about the sign-off.</div><div class='add'>+</div><div class='add'>+If you are a subsystem or branch maintainer, sometimes you need to slightly</div><div class='add'>+modify patches you receive in order to merge them, because the code is not</div><div class='add'>+exactly the same in your tree and the submitters'. If you stick strictly to</div><div class='add'>+rule (c), you should ask the submitter to rediff, but this is a totally</div><div class='add'>+counter-productive waste of time and energy. Rule (b) allows you to adjust</div><div class='add'>+the code, but then it is very impolite to change one submitter's code and</div><div class='add'>+make him endorse your bugs. To solve this problem, it is recommended that</div><div class='add'>+you add a line between the last Signed-off-by header and yours, indicating</div><div class='add'>+the nature of your changes. While there is nothing mandatory about this, it</div><div class='add'>+seems like prepending the description with your mail and/or name, all</div><div class='add'>+enclosed in square brackets, is noticeable enough to make it obvious that</div><div class='add'>+you are responsible for last-minute changes. Example::</div><div class='add'>+</div><div class='add'>+	Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='add'>+	[lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]</div><div class='add'>+	Signed-off-by: Lucky K Maintainer &lt;lucky@maintainer.example.org&gt;</div><div class='add'>+</div><div class='add'>+This practice is particularly helpful if you maintain a stable branch and</div><div class='add'>+want at the same time to credit the author, track changes, merge the fix,</div><div class='add'>+and protect the submitter from complaints. Note that under no circumstances</div><div class='add'>+can you change the author's identity (the From header), as it is the one</div><div class='add'>+which appears in the changelog.</div><div class='add'>+</div><div class='add'>+Special note to back-porters: It seems to be a common and useful practice</div><div class='add'>+to insert an indication of the origin of a patch at the top of the commit</div><div class='add'>+message (just after the subject line) to facilitate tracking. For instance,</div><div class='add'>+here's what we see in a 3.x-stable release::</div><div class='add'>+</div><div class='add'>+  Date:   Tue Oct 7 07:26:38 2014 -0400</div><div class='add'>+</div><div class='add'>+    libata: Un-break ATA blacklist</div><div class='add'>+</div><div class='add'>+    commit 1c40279960bcd7d52dbdf1d466b20d24b99176c8 upstream.</div><div class='add'>+</div><div class='add'>+And here's what might appear in an older kernel once a patch is backported::</div><div class='add'>+</div><div class='add'>+    Date:   Tue May 13 22:12:27 2008 +0200</div><div class='add'>+</div><div class='add'>+        wireless, airo: waitbusy() won't delay</div><div class='add'>+</div><div class='add'>+        [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]</div><div class='add'>+</div><div class='add'>+Whatever the format, this information provides a valuable help to people</div><div class='add'>+tracking your trees, and to people trying to troubleshoot bugs in your</div><div class='add'>+tree.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+12) When to use Acked-by: and Cc:</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+The Signed-off-by: tag indicates that the signer was involved in the</div><div class='add'>+development of the patch, or that he/she was in the patch's delivery path.</div><div class='add'>+</div><div class='add'>+If a person was not directly involved in the preparation or handling of a</div><div class='add'>+patch but wishes to signify and record their approval of it then they can</div><div class='add'>+ask to have an Acked-by: line added to the patch's changelog.</div><div class='add'>+</div><div class='add'>+Acked-by: is often used by the maintainer of the affected code when that</div><div class='add'>+maintainer neither contributed to nor forwarded the patch.</div><div class='add'>+</div><div class='add'>+Acked-by: is not as formal as Signed-off-by:.  It is a record that the acker</div><div class='add'>+has at least reviewed the patch and has indicated acceptance.  Hence patch</div><div class='add'>+mergers will sometimes manually convert an acker's "yep, looks good to me"</div><div class='add'>+into an Acked-by: (but note that it is usually better to ask for an</div><div class='add'>+explicit ack).</div><div class='add'>+</div><div class='add'>+Acked-by: does not necessarily indicate acknowledgement of the entire patch.</div><div class='add'>+For example, if a patch affects multiple subsystems and has an Acked-by: from</div><div class='add'>+one subsystem maintainer then this usually indicates acknowledgement of just</div><div class='add'>+the part which affects that maintainer's code.  Judgement should be used here.</div><div class='add'>+When in doubt people should refer to the original discussion in the mailing</div><div class='add'>+list archives.</div><div class='add'>+</div><div class='add'>+If a person has had the opportunity to comment on a patch, but has not</div><div class='add'>+provided such comments, you may optionally add a ``Cc:`` tag to the patch.</div><div class='add'>+This is the only tag which might be added without an explicit action by the</div><div class='add'>+person it names - but it should indicate that this person was copied on the</div><div class='add'>+patch.  This tag documents that potentially interested parties</div><div class='add'>+have been included in the discussion.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+13) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:</div><div class='add'>+--------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+The Reported-by tag gives credit to people who find bugs and report them and it</div><div class='add'>+hopefully inspires them to help us again in the future.  Please note that if</div><div class='add'>+the bug was reported in private, then ask for permission first before using the</div><div class='add'>+Reported-by tag.</div><div class='add'>+</div><div class='add'>+A Tested-by: tag indicates that the patch has been successfully tested (in</div><div class='add'>+some environment) by the person named.  This tag informs maintainers that</div><div class='add'>+some testing has been performed, provides a means to locate testers for</div><div class='add'>+future patches, and ensures credit for the testers.</div><div class='add'>+</div><div class='add'>+Reviewed-by:, instead, indicates that the patch has been reviewed and found</div><div class='add'>+acceptable according to the Reviewer's Statement:</div><div class='add'>+</div><div class='add'>+Reviewer's statement of oversight</div><div class='add'>+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^</div><div class='add'>+</div><div class='add'>+By offering my Reviewed-by: tag, I state that:</div><div class='add'>+</div><div class='add'>+	 (a) I have carried out a technical review of this patch to</div><div class='add'>+	     evaluate its appropriateness and readiness for inclusion into</div><div class='add'>+	     the mainline kernel.</div><div class='add'>+</div><div class='add'>+	 (b) Any problems, concerns, or questions relating to the patch</div><div class='add'>+	     have been communicated back to the submitter.  I am satisfied</div><div class='add'>+	     with the submitter's response to my comments.</div><div class='add'>+</div><div class='add'>+	 (c) While there may be things that could be improved with this</div><div class='add'>+	     submission, I believe that it is, at this time, (1) a</div><div class='add'>+	     worthwhile modification to the kernel, and (2) free of known</div><div class='add'>+	     issues which would argue against its inclusion.</div><div class='add'>+</div><div class='add'>+	 (d) While I have reviewed the patch and believe it to be sound, I</div><div class='add'>+	     do not (unless explicitly stated elsewhere) make any</div><div class='add'>+	     warranties or guarantees that it will achieve its stated</div><div class='add'>+	     purpose or function properly in any given situation.</div><div class='add'>+</div><div class='add'>+A Reviewed-by tag is a statement of opinion that the patch is an</div><div class='add'>+appropriate modification of the kernel without any remaining serious</div><div class='add'>+technical issues.  Any interested reviewer (who has done the work) can</div><div class='add'>+offer a Reviewed-by tag for a patch.  This tag serves to give credit to</div><div class='add'>+reviewers and to inform maintainers of the degree of review which has been</div><div class='add'>+done on the patch.  Reviewed-by: tags, when supplied by reviewers known to</div><div class='add'>+understand the subject area and to perform thorough reviews, will normally</div><div class='add'>+increase the likelihood of your patch getting into the kernel.</div><div class='add'>+</div><div class='add'>+A Suggested-by: tag indicates that the patch idea is suggested by the person</div><div class='add'>+named and ensures credit to the person for the idea. Please note that this</div><div class='add'>+tag should not be added without the reporter's permission, especially if the</div><div class='add'>+idea was not posted in a public forum. That said, if we diligently credit our</div><div class='add'>+idea reporters, they will, hopefully, be inspired to help us again in the</div><div class='add'>+future.</div><div class='add'>+</div><div class='add'>+A Fixes: tag indicates that the patch fixes an issue in a previous commit. It</div><div class='add'>+is used to make it easy to determine where a bug originated, which can help</div><div class='add'>+review a bug fix. This tag also assists the stable kernel team in determining</div><div class='add'>+which stable kernel versions should receive your fix. This is the preferred</div><div class='add'>+method for indicating a bug fixed by the patch. See :ref:`describe_changes`</div><div class='add'>+for more details.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+14) The canonical patch format</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+This section describes how the patch itself should be formatted.  Note</div><div class='add'>+that, if you have your patches stored in a ``git`` repository, proper patch</div><div class='add'>+formatting can be had with ``git format-patch``.  The tools cannot create</div><div class='add'>+the necessary text, though, so read the instructions below anyway.</div><div class='add'>+</div><div class='add'>+The canonical patch subject line is::</div><div class='add'>+</div><div class='add'>+    Subject: [PATCH 001/123] subsystem: summary phrase</div><div class='add'>+</div><div class='add'>+The canonical patch message body contains the following:</div><div class='add'>+</div><div class='add'>+  - A ``from`` line specifying the patch author (only needed if the person</div><div class='add'>+    sending the patch is not the author).</div><div class='add'>+</div><div class='add'>+  - An empty line.</div><div class='add'>+</div><div class='add'>+  - The body of the explanation, line wrapped at 75 columns, which will</div><div class='add'>+    be copied to the permanent changelog to describe this patch.</div><div class='add'>+</div><div class='add'>+  - The ``Signed-off-by:`` lines, described above, which will</div><div class='add'>+    also go in the changelog.</div><div class='add'>+</div><div class='add'>+  - A marker line containing simply ``---``.</div><div class='add'>+</div><div class='add'>+  - Any additional comments not suitable for the changelog.</div><div class='add'>+</div><div class='add'>+  - The actual patch (``diff`` output).</div><div class='add'>+</div><div class='add'>+The Subject line format makes it very easy to sort the emails</div><div class='add'>+alphabetically by subject line - pretty much any email reader will</div><div class='add'>+support that - since because the sequence number is zero-padded,</div><div class='add'>+the numerical and alphabetic sort is the same.</div><div class='add'>+</div><div class='add'>+The ``subsystem`` in the email's Subject should identify which</div><div class='add'>+area or subsystem of the kernel is being patched.</div><div class='add'>+</div><div class='add'>+The ``summary phrase`` in the email's Subject should concisely</div><div class='add'>+describe the patch which that email contains.  The ``summary</div><div class='add'>+phrase`` should not be a filename.  Do not use the same ``summary</div><div class='add'>+phrase`` for every patch in a whole patch series (where a ``patch</div><div class='add'>+series`` is an ordered sequence of multiple, related patches).</div><div class='add'>+</div><div class='add'>+Bear in mind that the ``summary phrase`` of your email becomes a</div><div class='add'>+globally-unique identifier for that patch.  It propagates all the way</div><div class='add'>+into the ``git`` changelog.  The ``summary phrase`` may later be used in</div><div class='add'>+developer discussions which refer to the patch.  People will want to</div><div class='add'>+google for the ``summary phrase`` to read discussion regarding that</div><div class='add'>+patch.  It will also be the only thing that people may quickly see</div><div class='add'>+when, two or three months later, they are going through perhaps</div><div class='add'>+thousands of patches using tools such as ``gitk`` or ``git log</div><div class='add'>+--oneline``.</div><div class='add'>+</div><div class='add'>+For these reasons, the ``summary`` must be no more than 70-75</div><div class='add'>+characters, and it must describe both what the patch changes, as well</div><div class='add'>+as why the patch might be necessary.  It is challenging to be both</div><div class='add'>+succinct and descriptive, but that is what a well-written summary</div><div class='add'>+should do.</div><div class='add'>+</div><div class='add'>+The ``summary phrase`` may be prefixed by tags enclosed in square</div><div class='add'>+brackets: "Subject: [PATCH &lt;tag&gt;...] &lt;summary phrase&gt;".  The tags are</div><div class='add'>+not considered part of the summary phrase, but describe how the patch</div><div class='add'>+should be treated.  Common tags might include a version descriptor if</div><div class='add'>+the multiple versions of the patch have been sent out in response to</div><div class='add'>+comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for</div><div class='add'>+comments.  If there are four patches in a patch series the individual</div><div class='add'>+patches may be numbered like this: 1/4, 2/4, 3/4, 4/4.  This assures</div><div class='add'>+that developers understand the order in which the patches should be</div><div class='add'>+applied and that they have reviewed or applied all of the patches in</div><div class='add'>+the patch series.</div><div class='add'>+</div><div class='add'>+A couple of example Subjects::</div><div class='add'>+</div><div class='add'>+    Subject: [PATCH 2/5] ext2: improve scalability of bitmap searching</div><div class='add'>+    Subject: [PATCH v2 01/27] x86: fix eflags tracking</div><div class='add'>+</div><div class='add'>+The ``from`` line must be the very first line in the message body,</div><div class='add'>+and has the form:</div><div class='add'>+</div><div class='add'>+        From: Original Author &lt;author@example.com&gt;</div><div class='add'>+</div><div class='add'>+The ``from`` line specifies who will be credited as the author of the</div><div class='add'>+patch in the permanent changelog.  If the ``from`` line is missing,</div><div class='add'>+then the ``From:`` line from the email header will be used to determine</div><div class='add'>+the patch author in the changelog.</div><div class='add'>+</div><div class='add'>+The explanation body will be committed to the permanent source</div><div class='add'>+changelog, so should make sense to a competent reader who has long</div><div class='add'>+since forgotten the immediate details of the discussion that might</div><div class='add'>+have led to this patch.  Including symptoms of the failure which the</div><div class='add'>+patch addresses (kernel log messages, oops messages, etc.) is</div><div class='add'>+especially useful for people who might be searching the commit logs</div><div class='add'>+looking for the applicable patch.  If a patch fixes a compile failure,</div><div class='add'>+it may not be necessary to include _all_ of the compile failures; just</div><div class='add'>+enough that it is likely that someone searching for the patch can find</div><div class='add'>+it.  As in the ``summary phrase``, it is important to be both succinct as</div><div class='add'>+well as descriptive.</div><div class='add'>+</div><div class='add'>+The ``---`` marker line serves the essential purpose of marking for patch</div><div class='add'>+handling tools where the changelog message ends.</div><div class='add'>+</div><div class='add'>+One good use for the additional comments after the ``---`` marker is for</div><div class='add'>+a ``diffstat``, to show what files have changed, and the number of</div><div class='add'>+inserted and deleted lines per file.  A ``diffstat`` is especially useful</div><div class='add'>+on bigger patches.  Other comments relevant only to the moment or the</div><div class='add'>+maintainer, not suitable for the permanent changelog, should also go</div><div class='add'>+here.  A good example of such comments might be ``patch changelogs``</div><div class='add'>+which describe what has changed between the v1 and v2 version of the</div><div class='add'>+patch.</div><div class='add'>+</div><div class='add'>+If you are going to include a ``diffstat`` after the ``---`` marker, please</div><div class='add'>+use ``diffstat`` options ``-p 1 -w 70`` so that filenames are listed from</div><div class='add'>+the top of the kernel source tree and don't use too much horizontal</div><div class='add'>+space (easily fit in 80 columns, maybe with some indentation).  (``git``</div><div class='add'>+generates appropriate diffstats by default.)</div><div class='add'>+</div><div class='add'>+See more details on the proper patch format in the following</div><div class='add'>+references.</div><div class='add'>+</div><div class='add'>+.. _explicit_in_reply_to:</div><div class='add'>+</div><div class='add'>+15) Explicit In-Reply-To headers</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+It can be helpful to manually add In-Reply-To: headers to a patch</div><div class='add'>+(e.g., when using ``git send-email``) to associate the patch with</div><div class='add'>+previous relevant discussion, e.g. to link a bug fix to the email with</div><div class='add'>+the bug report.  However, for a multi-patch series, it is generally</div><div class='add'>+best to avoid using In-Reply-To: to link to older versions of the</div><div class='add'>+series.  This way multiple versions of the patch don't become an</div><div class='add'>+unmanageable forest of references in email clients.  If a link is</div><div class='add'>+helpful, you can use the https://lkml.kernel.org/ redirector (e.g., in</div><div class='add'>+the cover email text) to link to an earlier version of the patch series.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+16) Sending ``git pull`` requests</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+If you have a series of patches, it may be most convenient to have the</div><div class='add'>+maintainer pull them directly into the subsystem repository with a</div><div class='add'>+``git pull`` operation.  Note, however, that pulling patches from a developer</div><div class='add'>+requires a higher degree of trust than taking patches from a mailing list.</div><div class='add'>+As a result, many subsystem maintainers are reluctant to take pull</div><div class='add'>+requests, especially from new, unknown developers.  If in doubt you can use</div><div class='add'>+the pull request as the cover letter for a normal posting of the patch</div><div class='add'>+series, giving the maintainer the option of using either.</div><div class='add'>+</div><div class='add'>+A pull request should have [GIT] or [PULL] in the subject line.  The</div><div class='add'>+request itself should include the repository name and the branch of</div><div class='add'>+interest on a single line; it should look something like::</div><div class='add'>+</div><div class='add'>+  Please pull from</div><div class='add'>+</div><div class='add'>+      git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus</div><div class='add'>+</div><div class='add'>+  to get these changes:</div><div class='add'>+</div><div class='add'>+A pull request should also include an overall message saying what will be</div><div class='add'>+included in the request, a ``git shortlog`` listing of the patches</div><div class='add'>+themselves, and a ``diffstat`` showing the overall effect of the patch series.</div><div class='add'>+The easiest way to get all this information together is, of course, to let</div><div class='add'>+``git`` do it for you with the ``git request-pull`` command.</div><div class='add'>+</div><div class='add'>+Some maintainers (including Linus) want to see pull requests from signed</div><div class='add'>+commits; that increases their confidence that the request actually came</div><div class='add'>+from you.  Linus, in particular, will not pull from public hosting sites</div><div class='add'>+like GitHub in the absence of a signed tag.</div><div class='add'>+</div><div class='add'>+The first step toward creating such tags is to make a GNUPG key and get it</div><div class='add'>+signed by one or more core kernel developers.  This step can be hard for</div><div class='add'>+new developers, but there is no way around it.  Attending conferences can</div><div class='add'>+be a good way to find developers who can sign your key.</div><div class='add'>+</div><div class='add'>+Once you have prepared a patch series in ``git`` that you wish to have somebody</div><div class='add'>+pull, create a signed tag with ``git tag -s``.  This will create a new tag</div><div class='add'>+identifying the last commit in the series and containing a signature</div><div class='add'>+created with your private key.  You will also have the opportunity to add a</div><div class='add'>+changelog-style message to the tag; this is an ideal place to describe the</div><div class='add'>+effects of the pull request as a whole.</div><div class='add'>+</div><div class='add'>+If the tree the maintainer will be pulling from is not the repository you</div><div class='add'>+are working from, don't forget to push the signed tag explicitly to the</div><div class='add'>+public tree.</div><div class='add'>+</div><div class='add'>+When generating your pull request, use the signed tag as the target.  A</div><div class='add'>+command like this will do the trick::</div><div class='add'>+</div><div class='add'>+  git request-pull master git://my.public.tree/linux.git my-signed-tag</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+References</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+Andrew Morton, "The perfect patch" (tpp).</div><div class='add'>+  &lt;http://www.ozlabs.org/~akpm/stuff/tpp.txt&gt;</div><div class='add'>+</div><div class='add'>+Jeff Garzik, "Linux kernel patch submission format".</div><div class='add'>+  &lt;http://linux.yyz.us/patch-format.html&gt;</div><div class='add'>+</div><div class='add'>+Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer.html&gt;</div><div class='add'>+</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer-02.html&gt;</div><div class='add'>+</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer-03.html&gt;</div><div class='add'>+</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer-04.html&gt;</div><div class='add'>+</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer-05.html&gt;</div><div class='add'>+</div><div class='add'>+  &lt;http://www.kroah.com/log/linux/maintainer-06.html&gt;</div><div class='add'>+</div><div class='add'>+NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!</div><div class='add'>+  &lt;https://lkml.org/lkml/2005/7/11/336&gt;</div><div class='add'>+</div><div class='add'>+Kernel Documentation/process/coding-style.rst:</div><div class='add'>+  :ref:`Documentation/process/coding-style.rst &lt;codingstyle&gt;`</div><div class='add'>+</div><div class='add'>+Linus Torvalds's mail on the canonical patch format:</div><div class='add'>+  &lt;http://lkml.org/lkml/2005/4/7/183&gt;</div><div class='add'>+</div><div class='add'>+Andi Kleen, "On submitting kernel patches"</div><div class='add'>+  Some strategies to get difficult or controversial changes in.</div><div class='add'>+</div><div class='add'>+  http://halobates.de/on-submitting-patches.pdf</div><div class='head'>diff --git a/Documentation/process/volatile-considered-harmful.rst b/Documentation/process/volatile-considered-harmful.rst<br/>new file mode 100644<br/>index 000000000000..4934e656a6f3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/process/volatile-considered-harmful.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/process/volatile-considered-harmful.rst</a></div><div class='hunk'>@@ -0,0 +1,125 @@</div><div class='add'>+</div><div class='add'>+.. _volatile_considered_harmful:</div><div class='add'>+</div><div class='add'>+Why the "volatile" type class should not be used</div><div class='add'>+------------------------------------------------</div><div class='add'>+</div><div class='add'>+C programmers have often taken volatile to mean that the variable could be</div><div class='add'>+changed outside of the current thread of execution; as a result, they are</div><div class='add'>+sometimes tempted to use it in kernel code when shared data structures are</div><div class='add'>+being used.  In other words, they have been known to treat volatile types</div><div class='add'>+as a sort of easy atomic variable, which they are not.  The use of volatile in</div><div class='add'>+kernel code is almost never correct; this document describes why.</div><div class='add'>+</div><div class='add'>+The key point to understand with regard to volatile is that its purpose is</div><div class='add'>+to suppress optimization, which is almost never what one really wants to</div><div class='add'>+do.  In the kernel, one must protect shared data structures against</div><div class='add'>+unwanted concurrent access, which is very much a different task.  The</div><div class='add'>+process of protecting against unwanted concurrency will also avoid almost</div><div class='add'>+all optimization-related problems in a more efficient way.</div><div class='add'>+</div><div class='add'>+Like volatile, the kernel primitives which make concurrent access to data</div><div class='add'>+safe (spinlocks, mutexes, memory barriers, etc.) are designed to prevent</div><div class='add'>+unwanted optimization.  If they are being used properly, there will be no</div><div class='add'>+need to use volatile as well.  If volatile is still necessary, there is</div><div class='add'>+almost certainly a bug in the code somewhere.  In properly-written kernel</div><div class='add'>+code, volatile can only serve to slow things down.</div><div class='add'>+</div><div class='add'>+Consider a typical block of kernel code::</div><div class='add'>+</div><div class='add'>+    spin_lock(&amp;the_lock);</div><div class='add'>+    do_something_on(&amp;shared_data);</div><div class='add'>+    do_something_else_with(&amp;shared_data);</div><div class='add'>+    spin_unlock(&amp;the_lock);</div><div class='add'>+</div><div class='add'>+If all the code follows the locking rules, the value of shared_data cannot</div><div class='add'>+change unexpectedly while the_lock is held.  Any other code which might</div><div class='add'>+want to play with that data will be waiting on the lock.  The spinlock</div><div class='add'>+primitives act as memory barriers - they are explicitly written to do so -</div><div class='add'>+meaning that data accesses will not be optimized across them.  So the</div><div class='add'>+compiler might think it knows what will be in shared_data, but the</div><div class='add'>+spin_lock() call, since it acts as a memory barrier, will force it to</div><div class='add'>+forget anything it knows.  There will be no optimization problems with</div><div class='add'>+accesses to that data.</div><div class='add'>+</div><div class='add'>+If shared_data were declared volatile, the locking would still be</div><div class='add'>+necessary.  But the compiler would also be prevented from optimizing access</div><div class='add'>+to shared_data _within_ the critical section, when we know that nobody else</div><div class='add'>+can be working with it.  While the lock is held, shared_data is not</div><div class='add'>+volatile.  When dealing with shared data, proper locking makes volatile</div><div class='add'>+unnecessary - and potentially harmful.</div><div class='add'>+</div><div class='add'>+The volatile storage class was originally meant for memory-mapped I/O</div><div class='add'>+registers.  Within the kernel, register accesses, too, should be protected</div><div class='add'>+by locks, but one also does not want the compiler "optimizing" register</div><div class='add'>+accesses within a critical section.  But, within the kernel, I/O memory</div><div class='add'>+accesses are always done through accessor functions; accessing I/O memory</div><div class='add'>+directly through pointers is frowned upon and does not work on all</div><div class='add'>+architectures.  Those accessors are written to prevent unwanted</div><div class='add'>+optimization, so, once again, volatile is unnecessary.</div><div class='add'>+</div><div class='add'>+Another situation where one might be tempted to use volatile is</div><div class='add'>+when the processor is busy-waiting on the value of a variable.  The right</div><div class='add'>+way to perform a busy wait is::</div><div class='add'>+</div><div class='add'>+    while (my_variable != what_i_want)</div><div class='add'>+        cpu_relax();</div><div class='add'>+</div><div class='add'>+The cpu_relax() call can lower CPU power consumption or yield to a</div><div class='add'>+hyperthreaded twin processor; it also happens to serve as a compiler</div><div class='add'>+barrier, so, once again, volatile is unnecessary.  Of course, busy-</div><div class='add'>+waiting is generally an anti-social act to begin with.</div><div class='add'>+</div><div class='add'>+There are still a few rare situations where volatile makes sense in the</div><div class='add'>+kernel:</div><div class='add'>+</div><div class='add'>+  - The above-mentioned accessor functions might use volatile on</div><div class='add'>+    architectures where direct I/O memory access does work.  Essentially,</div><div class='add'>+    each accessor call becomes a little critical section on its own and</div><div class='add'>+    ensures that the access happens as expected by the programmer.</div><div class='add'>+</div><div class='add'>+  - Inline assembly code which changes memory, but which has no other</div><div class='add'>+    visible side effects, risks being deleted by GCC.  Adding the volatile</div><div class='add'>+    keyword to asm statements will prevent this removal.</div><div class='add'>+</div><div class='add'>+  - The jiffies variable is special in that it can have a different value</div><div class='add'>+    every time it is referenced, but it can be read without any special</div><div class='add'>+    locking.  So jiffies can be volatile, but the addition of other</div><div class='add'>+    variables of this type is strongly frowned upon.  Jiffies is considered</div><div class='add'>+    to be a "stupid legacy" issue (Linus's words) in this regard; fixing it</div><div class='add'>+    would be more trouble than it is worth.</div><div class='add'>+</div><div class='add'>+  - Pointers to data structures in coherent memory which might be modified</div><div class='add'>+    by I/O devices can, sometimes, legitimately be volatile.  A ring buffer</div><div class='add'>+    used by a network adapter, where that adapter changes pointers to</div><div class='add'>+    indicate which descriptors have been processed, is an example of this</div><div class='add'>+    type of situation.</div><div class='add'>+</div><div class='add'>+For most code, none of the above justifications for volatile apply.  As a</div><div class='add'>+result, the use of volatile is likely to be seen as a bug and will bring</div><div class='add'>+additional scrutiny to the code.  Developers who are tempted to use</div><div class='add'>+volatile should take a step back and think about what they are truly trying</div><div class='add'>+to accomplish.</div><div class='add'>+</div><div class='add'>+Patches to remove volatile variables are generally welcome - as long as</div><div class='add'>+they come with a justification which shows that the concurrency issues have</div><div class='add'>+been properly thought through.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+References</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+[1] http://lwn.net/Articles/233481/</div><div class='add'>+</div><div class='add'>+[2] http://lwn.net/Articles/233482/</div><div class='add'>+</div><div class='add'>+Credits</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+Original impetus and research by Randy Dunlap</div><div class='add'>+</div><div class='add'>+Written by Jonathan Corbet</div><div class='add'>+</div><div class='add'>+Improvements via comments from Satyam Sharma, Johannes Stezenbach, Jesper</div><div class='add'>+Juhl, Heikki Orsila, H. Peter Anvin, Philipp Hahn, and Stefan</div><div class='add'>+Richter.</div><div class='head'>diff --git a/Documentation/ramoops.txt b/Documentation/ramoops.txt<br/>deleted file mode 100644<br/>index 26b9f31cf65a..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/ramoops.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ramoops.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,146 +0,0 @@</div><div class='del'>-Ramoops oops/panic logger</div><div class='del'>-=========================</div><div class='del'>-</div><div class='del'>-Sergiu Iordache &lt;sergiu@chromium.org&gt;</div><div class='del'>-</div><div class='del'>-Updated: 17 November 2011</div><div class='del'>-</div><div class='del'>-0. Introduction</div><div class='del'>-</div><div class='del'>-Ramoops is an oops/panic logger that writes its logs to RAM before the system</div><div class='del'>-crashes. It works by logging oopses and panics in a circular buffer. Ramoops</div><div class='del'>-needs a system with persistent RAM so that the content of that area can</div><div class='del'>-survive after a restart.</div><div class='del'>-</div><div class='del'>-1. Ramoops concepts</div><div class='del'>-</div><div class='del'>-Ramoops uses a predefined memory area to store the dump. The start and size</div><div class='del'>-and type of the memory area are set using three variables:</div><div class='del'>-  * "mem_address" for the start</div><div class='del'>-  * "mem_size" for the size. The memory size will be rounded down to a</div><div class='del'>-  power of two.</div><div class='del'>-  * "mem_type" to specifiy if the memory type (default is pgprot_writecombine).</div><div class='del'>-</div><div class='del'>-Typically the default value of mem_type=0 should be used as that sets the pstore</div><div class='del'>-mapping to pgprot_writecombine. Setting mem_type=1 attempts to use</div><div class='del'>-pgprot_noncached, which only works on some platforms. This is because pstore</div><div class='del'>-depends on atomic operations. At least on ARM, pgprot_noncached causes the</div><div class='del'>-memory to be mapped strongly ordered, and atomic operations on strongly ordered</div><div class='del'>-memory are implementation defined, and won't work on many ARMs such as omaps.</div><div class='del'>-</div><div class='del'>-The memory area is divided into "record_size" chunks (also rounded down to</div><div class='del'>-power of two) and each oops/panic writes a "record_size" chunk of</div><div class='del'>-information.</div><div class='del'>-</div><div class='del'>-Dumping both oopses and panics can be done by setting 1 in the "dump_oops"</div><div class='del'>-variable while setting 0 in that variable dumps only the panics.</div><div class='del'>-</div><div class='del'>-The module uses a counter to record multiple dumps but the counter gets reset</div><div class='del'>-on restart (i.e. new dumps after the restart will overwrite old ones).</div><div class='del'>-</div><div class='del'>-Ramoops also supports software ECC protection of persistent memory regions.</div><div class='del'>-This might be useful when a hardware reset was used to bring the machine back</div><div class='del'>-to life (i.e. a watchdog triggered). In such cases, RAM may be somewhat</div><div class='del'>-corrupt, but usually it is restorable.</div><div class='del'>-</div><div class='del'>-2. Setting the parameters</div><div class='del'>-</div><div class='del'>-Setting the ramoops parameters can be done in several different manners:</div><div class='del'>-</div><div class='del'>- A. Use the module parameters (which have the names of the variables described</div><div class='del'>- as before). For quick debugging, you can also reserve parts of memory during</div><div class='del'>- boot and then use the reserved memory for ramoops. For example, assuming a</div><div class='del'>- machine with &gt; 128 MB of memory, the following kernel command line will tell</div><div class='del'>- the kernel to use only the first 128 MB of memory, and place ECC-protected</div><div class='del'>- ramoops region at 128 MB boundary:</div><div class='del'>- "mem=128M ramoops.mem_address=0x8000000 ramoops.ecc=1"</div><div class='del'>-</div><div class='del'>- B. Use Device Tree bindings, as described in</div><div class='del'>- Documentation/device-tree/bindings/reserved-memory/ramoops.txt.</div><div class='del'>- For example:</div><div class='del'>-</div><div class='del'>-	reserved-memory {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		ranges;</div><div class='del'>-</div><div class='del'>-		ramoops@8f000000 {</div><div class='del'>-			compatible = "ramoops";</div><div class='del'>-			reg = &lt;0 0x8f000000 0 0x100000&gt;;</div><div class='del'>-			record-size = &lt;0x4000&gt;;</div><div class='del'>-			console-size = &lt;0x4000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>- C. Use a platform device and set the platform data. The parameters can then</div><div class='del'>- be set through that platform data. An example of doing that is:</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pstore_ram.h&gt;</div><div class='del'>-[...]</div><div class='del'>-</div><div class='del'>-static struct ramoops_platform_data ramoops_data = {</div><div class='del'>-        .mem_size               = &lt;...&gt;,</div><div class='del'>-        .mem_address            = &lt;...&gt;,</div><div class='del'>-        .mem_type               = &lt;...&gt;,</div><div class='del'>-        .record_size            = &lt;...&gt;,</div><div class='del'>-        .dump_oops              = &lt;...&gt;,</div><div class='del'>-        .ecc                    = &lt;...&gt;,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device ramoops_dev = {</div><div class='del'>-        .name = "ramoops",</div><div class='del'>-        .dev = {</div><div class='del'>-                .platform_data = &amp;ramoops_data,</div><div class='del'>-        },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-[... inside a function ...]</div><div class='del'>-int ret;</div><div class='del'>-</div><div class='del'>-ret = platform_device_register(&amp;ramoops_dev);</div><div class='del'>-if (ret) {</div><div class='del'>-	printk(KERN_ERR "unable to register platform device\n");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-You can specify either RAM memory or peripheral devices' memory. However, when</div><div class='del'>-specifying RAM, be sure to reserve the memory by issuing memblock_reserve()</div><div class='del'>-very early in the architecture code, e.g.:</div><div class='del'>-</div><div class='del'>-#include &lt;linux/memblock.h&gt;</div><div class='del'>-</div><div class='del'>-memblock_reserve(ramoops_data.mem_address, ramoops_data.mem_size);</div><div class='del'>-</div><div class='del'>-3. Dump format</div><div class='del'>-</div><div class='del'>-The data dump begins with a header, currently defined as "====" followed by a</div><div class='del'>-timestamp and a new line. The dump then continues with the actual data.</div><div class='del'>-</div><div class='del'>-4. Reading the data</div><div class='del'>-</div><div class='del'>-The dump data can be read from the pstore filesystem. The format for these</div><div class='del'>-files is "dmesg-ramoops-N", where N is the record number in memory. To delete</div><div class='del'>-a stored record from RAM, simply unlink the respective pstore file.</div><div class='del'>-</div><div class='del'>-5. Persistent function tracing</div><div class='del'>-</div><div class='del'>-Persistent function tracing might be useful for debugging software or hardware</div><div class='del'>-related hangs. The functions call chain log is stored in a "ftrace-ramoops"</div><div class='del'>-file. Here is an example of usage:</div><div class='del'>-</div><div class='del'>- # mount -t debugfs debugfs /sys/kernel/debug/</div><div class='del'>- # echo 1 &gt; /sys/kernel/debug/pstore/record_ftrace</div><div class='del'>- # reboot -f</div><div class='del'>- [...]</div><div class='del'>- # mount -t pstore pstore /mnt/</div><div class='del'>- # tail /mnt/ftrace-ramoops</div><div class='del'>- 0 ffffffff8101ea64  ffffffff8101bcda  native_apic_mem_read &lt;- disconnect_bsp_APIC+0x6a/0xc0</div><div class='del'>- 0 ffffffff8101ea44  ffffffff8101bcf6  native_apic_mem_write &lt;- disconnect_bsp_APIC+0x86/0xc0</div><div class='del'>- 0 ffffffff81020084  ffffffff8101a4b5  hpet_disable &lt;- native_machine_shutdown+0x75/0x90</div><div class='del'>- 0 ffffffff81005f94  ffffffff8101a4bb  iommu_shutdown_noop &lt;- native_machine_shutdown+0x7b/0x90</div><div class='del'>- 0 ffffffff8101a6a1  ffffffff8101a437  native_machine_emergency_restart &lt;- native_machine_restart+0x37/0x40</div><div class='del'>- 0 ffffffff811f9876  ffffffff8101a73a  acpi_reboot &lt;- native_machine_emergency_restart+0xaa/0x1e0</div><div class='del'>- 0 ffffffff8101a514  ffffffff8101a772  mach_reboot_fixups &lt;- native_machine_emergency_restart+0xe2/0x1e0</div><div class='del'>- 0 ffffffff811d9c54  ffffffff8101a7a0  __const_udelay &lt;- native_machine_emergency_restart+0x110/0x1e0</div><div class='del'>- 0 ffffffff811d9c34  ffffffff811d9c80  __delay &lt;- __const_udelay+0x30/0x40</div><div class='del'>- 0 ffffffff811d9d14  ffffffff811d9c3f  delay_tsc &lt;- __delay+0xf/0x20</div><div class='head'>diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt<br/>index 1f0c27049340..8c174063b3f0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/rfkill.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/rfkill.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/rfkill.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/rfkill.txt</a></div><div class='hunk'>@@ -26,7 +26,7 @@ whether they can be changed or not:</div><div class='ctx'>                the system software.</div><div class='ctx'> </div><div class='ctx'> The rfkill subsystem has two parameters, rfkill.default_state and</div><div class='del'>-rfkill.master_switch_mode, which are documented in kernel-parameters.txt.</div><div class='add'>+rfkill.master_switch_mode, which are documented in admin-guide/kernel-parameters.rst.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 2. Implementation details</div><div class='head'>diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt<br/>index 3df8babcdc41..5ae7f868a007 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/s390/Debugging390.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/s390/Debugging390.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/s390/Debugging390.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/s390/Debugging390.txt</a></div><div class='hunk'>@@ -2116,7 +2116,7 @@ The sysrq key reading is very picky ( I have to type the keys in an</div><div class='ctx'> This is particularly useful for syncing disks unmounting &amp; rebooting</div><div class='ctx'> if the machine gets partially hung.</div><div class='ctx'> </div><div class='del'>-Read Documentation/sysrq.txt for more info</div><div class='add'>+Read Documentation/admin-guide/sysrq.rst for more info</div><div class='ctx'> </div><div class='ctx'> References:</div><div class='ctx'> ===========</div><div class='head'>diff --git a/Documentation/scheduler/completion.txt b/Documentation/scheduler/completion.txt<br/>index 2622bc7a188b..656cf803c006 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/scheduler/completion.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/scheduler/completion.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/scheduler/completion.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scheduler/completion.txt</a></div><div class='hunk'>@@ -25,8 +25,7 @@ struct completion that tells the waiting threads of execution if they</div><div class='ctx'> can continue safely.</div><div class='ctx'> </div><div class='ctx'> As completions are scheduling related, the code is found in</div><div class='del'>-kernel/sched/completion.c - for details on completion design and</div><div class='del'>-implementation see completions-design.txt</div><div class='add'>+kernel/sched/completion.c.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Usage:</div><div class='head'>diff --git a/Documentation/scheduler/sched-deadline.txt b/Documentation/scheduler/sched-deadline.txt<br/>index 8e37b0ba2c9d..cbc1b46cbf70 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/scheduler/sched-deadline.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/scheduler/sched-deadline.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/scheduler/sched-deadline.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scheduler/sched-deadline.txt</a></div><div class='hunk'>@@ -408,6 +408,11 @@ CONTENTS</div><div class='ctx'>   * the new scheduling related syscalls that manipulate it, i.e.,</div><div class='ctx'>     sched_setattr() and sched_getattr() are implemented.</div><div class='ctx'> </div><div class='add'>+ For debugging purposes, the leftover runtime and absolute deadline of a</div><div class='add'>+ SCHED_DEADLINE task can be retrieved through /proc/&lt;pid&gt;/sched (entries</div><div class='add'>+ dl.runtime and dl.deadline, both values in ns). A programmatic way to</div><div class='add'>+ retrieve these values from production code is under discussion.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 4.3 Default behavior</div><div class='ctx'> ---------------------</div><div class='hunk'>@@ -476,6 +481,7 @@ CONTENTS</div><div class='ctx'> </div><div class='ctx'>  Still missing:</div><div class='ctx'> </div><div class='add'>+  - programmatic way to retrieve current runtime and absolute deadline</div><div class='ctx'>   - refinements to deadline inheritance, especially regarding the possibility</div><div class='ctx'>     of retaining bandwidth isolation among non-interacting tasks. This is</div><div class='ctx'>     being studied from both theoretical and practical points of view, and</div><div class='head'>diff --git a/Documentation/scheduler/sched-rt-group.txt b/Documentation/scheduler/sched-rt-group.txt<br/>index a03f0d944fe6..d8fce3e78457 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/scheduler/sched-rt-group.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/scheduler/sched-rt-group.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/scheduler/sched-rt-group.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scheduler/sched-rt-group.txt</a></div><div class='hunk'>@@ -158,11 +158,11 @@ as its prone to starvation without deadline scheduling.</div><div class='ctx'> Consider two sibling groups A and B; both have 50% bandwidth, but A's</div><div class='ctx'> period is twice the length of B's.</div><div class='ctx'> </div><div class='del'>-* group A: period=100000us, runtime=10000us</div><div class='del'>-	- this runs for 0.01s once every 0.1s</div><div class='add'>+* group A: period=100000us, runtime=50000us</div><div class='add'>+	- this runs for 0.05s once every 0.1s</div><div class='ctx'> </div><div class='del'>-* group B: period= 50000us, runtime=10000us</div><div class='del'>-	- this runs for 0.01s twice every 0.1s (or once every 0.05 sec).</div><div class='add'>+* group B: period= 50000us, runtime=25000us</div><div class='add'>+	- this runs for 0.025s twice every 0.1s (or once every 0.05 sec).</div><div class='ctx'> </div><div class='ctx'> This means that currently a while (1) loop in A will run for the full period of</div><div class='ctx'> B and can starve B's tasks (assuming they are of lower priority) for a whole</div><div class='head'>diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/scsi/ChangeLog.megaraid_sas<br/>index 00ffdf187f0b..234ddabb23ef 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/scsi/ChangeLog.megaraid_sas?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/scsi/ChangeLog.megaraid_sas</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/scsi/ChangeLog.megaraid_sas?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scsi/ChangeLog.megaraid_sas</a></div><div class='hunk'>@@ -549,7 +549,7 @@ ii.	Reduced by 1 max cmds sent to FW from Driver to make the reply_q_sz same</div><div class='ctx'> 3 Older Version   : 00.00.03.02</div><div class='ctx'> </div><div class='ctx'> i.	Send stop adapter to FW &amp; Dump pending FW cmds before declaring adapter dead.</div><div class='del'>-	New varible added to set dbg level.</div><div class='add'>+	New variable added to set dbg level.</div><div class='ctx'> ii.	Disable interrupt made as fn pointer as they are different for 1068 / 1078</div><div class='ctx'> iii.	Frame count optimization. Main frame can contain 2 SGE for 64 bit SGLs and</div><div class='ctx'> 	3 SGE for 32 bit SGL</div><div class='head'>diff --git a/Documentation/scsi/g_NCR5380.txt b/Documentation/scsi/g_NCR5380.txt<br/>index e2c187947e58..37b1967a00a9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/scsi/g_NCR5380.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/scsi/g_NCR5380.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/scsi/g_NCR5380.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scsi/g_NCR5380.txt</a></div><div class='hunk'>@@ -6,17 +6,15 @@ NCR53c400 extensions (c) 1994,1995,1996 Kevin Lentin</div><div class='ctx'> This file documents the NCR53c400 extensions by Kevin Lentin and some</div><div class='ctx'> enhancements to the NCR5380 core.</div><div class='ctx'> </div><div class='del'>-This driver supports both NCR5380 and NCR53c400 cards in port or memory</div><div class='del'>-mapped modes. Currently this driver can only support one of those mapping</div><div class='del'>-modes at a time but it does support both of these chips at the same time.</div><div class='del'>-The next release of this driver will support port &amp; memory mapped cards at</div><div class='del'>-the same time. It should be able to handle multiple different cards in the</div><div class='del'>-same machine.</div><div class='add'>+This driver supports NCR5380 and NCR53c400 and compatible cards in port or</div><div class='add'>+memory mapped modes.</div><div class='ctx'> </div><div class='del'>-The drivers/scsi/Makefile has an override in it for the most common</div><div class='del'>-NCR53c400 card, the Trantor T130B in its default configuration:</div><div class='del'>-	Port: 0x350</div><div class='del'>-	IRQ : 5</div><div class='add'>+Use of an interrupt is recommended, if supported by the board, as this will</div><div class='add'>+allow targets to disconnect and thereby improve SCSI bus utilization.</div><div class='add'>+</div><div class='add'>+If the irq parameter is 254 or is omitted entirely, the driver will probe</div><div class='add'>+for the correct IRQ line automatically. If the irq parameter is 0 or 255</div><div class='add'>+then no IRQ will be used.</div><div class='ctx'> </div><div class='ctx'> The NCR53c400 does not support DMA but it does have Pseudo-DMA which is</div><div class='ctx'> supported by the driver.</div><div class='hunk'>@@ -47,22 +45,24 @@ These old-style parameters can support only one card:</div><div class='ctx'>   dtc_3181e=1  to set up for a Domex Technology Corp 3181E board</div><div class='ctx'>   hp_c2502=1   to set up for a Hewlett Packard C2502 board</div><div class='ctx'> </div><div class='del'>-e.g.</div><div class='del'>-OLD: modprobe g_NCR5380 ncr_irq=5 ncr_addr=0x350 ncr_5380=1</div><div class='del'>-NEW: modprobe g_NCR5380 irq=5 base=0x350 card=0</div><div class='del'>-  for a port mapped NCR5380 board or</div><div class='del'>-</div><div class='del'>-OLD: modprobe g_NCR5380 ncr_irq=255 ncr_addr=0xc8000 ncr_53c400=1</div><div class='del'>-NEW: modprobe g_NCR5380 irq=255 base=0xc8000 card=1</div><div class='del'>-  for a memory mapped NCR53C400 board with interrupts disabled or</div><div class='add'>+E.g. Trantor T130B in its default configuration:</div><div class='add'>+modprobe g_NCR5380 irq=5 base=0x350 card=1</div><div class='add'>+or alternatively, using the old syntax,</div><div class='add'>+modprobe g_NCR5380 ncr_irq=5 ncr_addr=0x350 ncr_53c400=1</div><div class='ctx'> </div><div class='del'>-NEW: modprobe g_NCR5380 irq=0,7 base=0x240,0x300 card=3,4</div><div class='del'>-  for two cards: DTC3181 (in non-PnP mode) at 0x240 with no IRQ</div><div class='del'>-             and HP C2502 at 0x300 with IRQ 7</div><div class='add'>+E.g. a port mapped NCR5380 board, driver to probe for IRQ:</div><div class='add'>+modprobe g_NCR5380 base=0x350 card=0</div><div class='add'>+or alternatively,</div><div class='add'>+modprobe g_NCR5380 ncr_addr=0x350 ncr_5380=1</div><div class='ctx'> </div><div class='del'>-(255 should be specified for no or DMA interrupt, 254 to autoprobe for an </div><div class='del'>-     IRQ line if overridden on the command line.)</div><div class='add'>+E.g. a memory mapped NCR53C400 board with no IRQ:</div><div class='add'>+modprobe g_NCR5380 irq=255 base=0xc8000 card=1</div><div class='add'>+or alternatively,</div><div class='add'>+modprobe g_NCR5380 ncr_irq=255 ncr_addr=0xc8000 ncr_53c400=1</div><div class='ctx'> </div><div class='add'>+E.g. two cards, DTC3181 (in non-PnP mode) at 0x240 with no IRQ</div><div class='add'>+and HP C2502 at 0x300 with IRQ 7:</div><div class='add'>+modprobe g_NCR5380 irq=0,7 base=0x240,0x300 card=3,4</div><div class='ctx'> </div><div class='ctx'> Kevin Lentin</div><div class='ctx'> K.Lentin@cs.monash.edu.au</div><div class='head'>diff --git a/Documentation/scsi/scsi-parameters.txt b/Documentation/scsi/scsi-parameters.txt<br/>index 8e66dafa41e1..8477655c0e46 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/scsi/scsi-parameters.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/scsi/scsi-parameters.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/scsi/scsi-parameters.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scsi/scsi-parameters.txt</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'>                           SCSI Kernel Parameters</div><div class='ctx'>                           ~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='del'>-See Documentation/kernel-parameters.txt for general information on</div><div class='add'>+See Documentation/admin-guide/kernel-parameters.rst for general information on</div><div class='ctx'> specifying module parameters.</div><div class='ctx'> </div><div class='ctx'> This document may not be entirely up to date and comprehensive. The command</div><div class='head'>diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/scsi/scsi_mid_low_api.txt<br/>index 255075157511..6338400eed73 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/scsi/scsi_mid_low_api.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/scsi/scsi_mid_low_api.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/scsi/scsi_mid_low_api.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scsi/scsi_mid_low_api.txt</a></div><div class='hunk'>@@ -336,7 +336,7 @@ in parallel by these functions.</div><div class='ctx'> Conventions</div><div class='ctx'> ===========</div><div class='ctx'> First, Linus Torvalds's thoughts on C coding style can be found in the</div><div class='del'>-Documentation/CodingStyle file. </div><div class='add'>+Documentation/process/coding-style.rst file.</div><div class='ctx'> </div><div class='ctx'> Next, there is a movement to "outlaw" typedefs introducing synonyms for </div><div class='ctx'> struct tags. Both can be still found in the SCSI subsystem, but</div><div class='head'>diff --git a/Documentation/scsi/sym53c8xx_2.txt b/Documentation/scsi/sym53c8xx_2.txt<br/>index 6af8f7a7770f..d28186553fb0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/scsi/sym53c8xx_2.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/scsi/sym53c8xx_2.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/scsi/sym53c8xx_2.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/scsi/sym53c8xx_2.txt</a></div><div class='hunk'>@@ -427,7 +427,7 @@ Synchronous transfers frequency       (default answer: 80)</div><div class='ctx'> 10.1 Syntax</div><div class='ctx'> </div><div class='ctx'> Setup commands can be passed to the driver either at boot time or as</div><div class='del'>-parameters to modprobe, as described in Documentation/kernel-parameters.txt</div><div class='add'>+parameters to modprobe, as described in Documentation/admin-guide/kernel-parameters.rst</div><div class='ctx'> </div><div class='ctx'> Example of boot setup command under lilo prompt:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/security/LSM.txt b/Documentation/security/LSM.txt<br/>index 3db7e671c440..c2683f28ed36 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/security/LSM.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/security/LSM.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/security/LSM.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/LSM.txt</a></div><div class='hunk'>@@ -22,6 +22,13 @@ system, building their checks on top of the defined capability hooks.</div><div class='ctx'> For more details on capabilities, see capabilities(7) in the Linux</div><div class='ctx'> man-pages project.</div><div class='ctx'> </div><div class='add'>+A list of the active security modules can be found by reading</div><div class='add'>+/sys/kernel/security/lsm. This is a comma separated list, and</div><div class='add'>+will always include the capability module. The list reflects the</div><div class='add'>+order in which checks are made. The capability module will always</div><div class='add'>+be first, followed by any "minor" modules (e.g. Yama) and then</div><div class='add'>+the one "major" module (e.g. SELinux) if there is one configured.</div><div class='add'>+</div><div class='ctx'> Based on https://lkml.org/lkml/2007/10/26/215,</div><div class='ctx'> a new LSM is accepted into the kernel when its intent (a description of</div><div class='ctx'> what it tries to protect against and in what cases one would expect to</div><div class='head'>diff --git a/Documentation/security/conf.py b/Documentation/security/conf.py<br/>new file mode 100644<br/>index 000000000000..472fc9a8eb67<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/security/conf.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/conf.py</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+project = "The kernel security subsystem manual"</div><div class='add'>+</div><div class='add'>+tags.add("subproject")</div><div class='add'>+</div><div class='add'>+latex_documents = [</div><div class='add'>+    ('index', 'security.tex', project,</div><div class='add'>+     'The kernel development community', 'manual'),</div><div class='add'>+]</div><div class='head'>diff --git a/Documentation/security/index.rst b/Documentation/security/index.rst<br/>new file mode 100644<br/>index 000000000000..9bae6bb20e7f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/security/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/index.rst</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+======================</div><div class='add'>+Security documentation</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+</div><div class='add'>+   tpm/index</div><div class='head'>diff --git a/Documentation/security/keys-trusted-encrypted.txt b/Documentation/security/keys-trusted-encrypted.txt<br/>index 324ddf5223b3..b20a993a32af 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/security/keys-trusted-encrypted.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/security/keys-trusted-encrypted.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/security/keys-trusted-encrypted.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/keys-trusted-encrypted.txt</a></div><div class='hunk'>@@ -32,8 +32,6 @@ Usage:</div><div class='ctx'>                      (40 ascii zeros)</div><div class='ctx'>        blobauth=     ascii hex auth for sealed data default 0x00...</div><div class='ctx'>                      (40 ascii zeros)</div><div class='del'>-       blobauth=     ascii hex auth for sealed data default 0x00...</div><div class='del'>-                     (40 ascii zeros)</div><div class='ctx'>        pcrinfo=	     ascii hex of PCR_INFO or PCR_INFO_LONG (no default)</div><div class='ctx'>        pcrlock=	     pcr number to be extended to "lock" blob</div><div class='ctx'>        migratable=   0|1 indicating permission to reseal to new PCR values,</div><div class='head'>diff --git a/Documentation/security/keys.txt b/Documentation/security/keys.txt<br/>index 3849814bfe6d..0e03baf271bd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/security/keys.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/security/keys.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/security/keys.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/keys.txt</a></div><div class='hunk'>@@ -1151,8 +1151,21 @@ access the data:</div><div class='ctx'>      usage.  This is called key-&gt;payload.rcu_data0.  The following accessors</div><div class='ctx'>      wrap the RCU calls to this element:</div><div class='ctx'> </div><div class='del'>-	rcu_assign_keypointer(struct key *key, void *data);</div><div class='del'>-	void *rcu_dereference_key(struct key *key);</div><div class='add'>+     (a) Set or change the first payload pointer:</div><div class='add'>+</div><div class='add'>+		rcu_assign_keypointer(struct key *key, void *data);</div><div class='add'>+</div><div class='add'>+     (b) Read the first payload pointer with the key semaphore held:</div><div class='add'>+</div><div class='add'>+		[const] void *dereference_key_locked([const] struct key *key);</div><div class='add'>+</div><div class='add'>+	 Note that the return value will inherit its constness from the key</div><div class='add'>+	 parameter.  Static analysis will give an error if it things the lock</div><div class='add'>+	 isn't held.</div><div class='add'>+</div><div class='add'>+     (c) Read the first payload pointer with the RCU read lock held:</div><div class='add'>+</div><div class='add'>+		const void *dereference_key_rcu(const struct key *key);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ===================</div><div class='head'>diff --git a/Documentation/security/self-protection.txt b/Documentation/security/self-protection.txt<br/>index 3010576c9fca..141acfebe6ef 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/security/self-protection.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/security/self-protection.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/security/self-protection.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/self-protection.txt</a></div><div class='hunk'>@@ -51,11 +51,17 @@ kernel, they are implemented in a way where the memory is temporarily</div><div class='ctx'> made writable during the update, and then returned to the original</div><div class='ctx'> permissions.)</div><div class='ctx'> </div><div class='del'>-In support of this are (the poorly named) CONFIG_DEBUG_RODATA and</div><div class='del'>-CONFIG_DEBUG_SET_MODULE_RONX, which seek to make sure that code is not</div><div class='add'>+In support of this are CONFIG_STRICT_KERNEL_RWX and</div><div class='add'>+CONFIG_STRICT_MODULE_RWX, which seek to make sure that code is not</div><div class='ctx'> writable, data is not executable, and read-only data is neither writable</div><div class='ctx'> nor executable.</div><div class='ctx'> </div><div class='add'>+Most architectures have these options on by default and not user selectable.</div><div class='add'>+For some architectures like arm that wish to have these be selectable,</div><div class='add'>+the architecture Kconfig can select ARCH_OPTIONAL_KERNEL_RWX to enable</div><div class='add'>+a Kconfig prompt. CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT determines</div><div class='add'>+the default setting when ARCH_OPTIONAL_KERNEL_RWX is enabled.</div><div class='add'>+</div><div class='ctx'> #### Function pointers and sensitive variables must not be writable</div><div class='ctx'> </div><div class='ctx'> Vast areas of kernel memory contain function pointers that are looked</div><div class='head'>diff --git a/Documentation/security/tpm/index.rst b/Documentation/security/tpm/index.rst<br/>new file mode 100644<br/>index 000000000000..af77a7bbb070<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/security/tpm/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/tpm/index.rst</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+=====================================</div><div class='add'>+Trusted Platform Module documentation</div><div class='add'>+=====================================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+</div><div class='add'>+   tpm_vtpm_proxy</div><div class='head'>diff --git a/Documentation/security/tpm/tpm_vtpm_proxy.rst b/Documentation/security/tpm/tpm_vtpm_proxy.rst<br/>new file mode 100644<br/>index 000000000000..ea08e76b17f5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/security/tpm/tpm_vtpm_proxy.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/tpm/tpm_vtpm_proxy.rst</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+=============================================</div><div class='add'>+Virtual TPM Proxy Driver for Linux Containers</div><div class='add'>+=============================================</div><div class='add'>+</div><div class='add'>+| Authors:</div><div class='add'>+| Stefan Berger &lt;stefanb@linux.vnet.ibm.com&gt;</div><div class='add'>+</div><div class='add'>+This document describes the virtual Trusted Platform Module (vTPM)</div><div class='add'>+proxy device driver for Linux containers.</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+The goal of this work is to provide TPM functionality to each Linux</div><div class='add'>+container. This allows programs to interact with a TPM in a container</div><div class='add'>+the same way they interact with a TPM on the physical system. Each</div><div class='add'>+container gets its own unique, emulated, software TPM.</div><div class='add'>+</div><div class='add'>+Design</div><div class='add'>+======</div><div class='add'>+</div><div class='add'>+To make an emulated software TPM available to each container, the container</div><div class='add'>+management stack needs to create a device pair consisting of a client TPM</div><div class='add'>+character device ``/dev/tpmX`` (with X=0,1,2...) and a 'server side' file</div><div class='add'>+descriptor. The former is moved into the container by creating a character</div><div class='add'>+device with the appropriate major and minor numbers while the file descriptor</div><div class='add'>+is passed to the TPM emulator. Software inside the container can then send</div><div class='add'>+TPM commands using the character device and the emulator will receive the</div><div class='add'>+commands via the file descriptor and use it for sending back responses.</div><div class='add'>+</div><div class='add'>+To support this, the virtual TPM proxy driver provides a device ``/dev/vtpmx``</div><div class='add'>+that is used to create device pairs using an ioctl. The ioctl takes as</div><div class='add'>+an input flags for configuring the device. The flags  for example indicate</div><div class='add'>+whether TPM 1.2 or TPM 2 functionality is supported by the TPM emulator.</div><div class='add'>+The result of the ioctl are the file descriptor for the 'server side'</div><div class='add'>+as well as the major and minor numbers of the character device that was created.</div><div class='add'>+Besides that the number of the TPM character device is returned. If for</div><div class='add'>+example ``/dev/tpm10`` was created, the number (``dev_num``) 10 is returned.</div><div class='add'>+</div><div class='add'>+Once the device has been created, the driver will immediately try to talk</div><div class='add'>+to the TPM. All commands from the driver can be read from the file descriptor</div><div class='add'>+returned by the ioctl. The commands should be responded to immediately.</div><div class='add'>+</div><div class='add'>+UAPI</div><div class='add'>+====</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: include/uapi/linux/vtpm_proxy.h</div><div class='add'>+</div><div class='add'>+.. kernel-doc:: drivers/char/tpm/tpm_vtpm_proxy.c</div><div class='add'>+   :functions: vtpmx_ioc_new_dev</div><div class='head'>diff --git a/Documentation/tpm/xen-tpmfront.txt b/Documentation/security/tpm/xen-tpmfront.txt<br/>index 69346de87ff3..69346de87ff3 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/tpm/xen-tpmfront.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/tpm/xen-tpmfront.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/security/tpm/xen-tpmfront.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/security/tpm/xen-tpmfront.txt</a></div><div class='head'>diff --git a/Documentation/serial-console.txt b/Documentation/serial-console.txt<br/>deleted file mode 100644<br/>index 9a7bc8b3f479..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/serial-console.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/serial-console.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-                       Linux Serial Console</div><div class='del'>-</div><div class='del'>-To use a serial port as console you need to compile the support into your</div><div class='del'>-kernel - by default it is not compiled in. For PC style serial ports</div><div class='del'>-it's the config option next to "Standard/generic (dumb) serial support".</div><div class='del'>-You must compile serial support into the kernel and not as a module.</div><div class='del'>-</div><div class='del'>-It is possible to specify multiple devices for console output. You can</div><div class='del'>-define a new kernel command line option to select which device(s) to</div><div class='del'>-use for console output.</div><div class='del'>-</div><div class='del'>-The format of this option is:</div><div class='del'>-</div><div class='del'>-	console=device,options</div><div class='del'>-</div><div class='del'>-	device:		tty0 for the foreground virtual console</div><div class='del'>-			ttyX for any other virtual console</div><div class='del'>-			ttySx for a serial port</div><div class='del'>-			lp0 for the first parallel port</div><div class='del'>-			ttyUSB0 for the first USB serial device</div><div class='del'>-</div><div class='del'>-	options:	depend on the driver. For the serial port this</div><div class='del'>-			defines the baudrate/parity/bits/flow control of</div><div class='del'>-			the port, in the format BBBBPNF, where BBBB is the</div><div class='del'>-			speed, P is parity (n/o/e), N is number of bits,</div><div class='del'>-			and F is flow control ('r' for RTS). Default is</div><div class='del'>-			9600n8. The maximum baudrate is 115200.</div><div class='del'>-</div><div class='del'>-You can specify multiple console= options on the kernel command line.</div><div class='del'>-Output will appear on all of them. The last device will be used when</div><div class='del'>-you open /dev/console. So, for example:</div><div class='del'>-</div><div class='del'>-	console=ttyS1,9600 console=tty0</div><div class='del'>-</div><div class='del'>-defines that opening /dev/console will get you the current foreground</div><div class='del'>-virtual console, and kernel messages will appear on both the VGA</div><div class='del'>-console and the 2nd serial port (ttyS1 or COM2) at 9600 baud.</div><div class='del'>-</div><div class='del'>-Note that you can only define one console per device type (serial, video).</div><div class='del'>-</div><div class='del'>-If no console device is specified, the first device found capable of</div><div class='del'>-acting as a system console will be used. At this time, the system</div><div class='del'>-first looks for a VGA card and then for a serial port. So if you don't</div><div class='del'>-have a VGA card in your system the first serial port will automatically</div><div class='del'>-become the console.</div><div class='del'>-</div><div class='del'>-You will need to create a new device to use /dev/console. The official</div><div class='del'>-/dev/console is now character device 5,1.</div><div class='del'>-</div><div class='del'>-(You can also use a network device as a console.  See</div><div class='del'>-Documentation/networking/netconsole.txt for information on that.)</div><div class='del'>-</div><div class='del'>-Here's an example that will use /dev/ttyS1 (COM2) as the console.</div><div class='del'>-Replace the sample values as needed.</div><div class='del'>-</div><div class='del'>-1. Create /dev/console (real console) and /dev/tty0 (master virtual</div><div class='del'>-   console):</div><div class='del'>-</div><div class='del'>-   cd /dev</div><div class='del'>-   rm -f console tty0</div><div class='del'>-   mknod -m 622 console c 5 1</div><div class='del'>-   mknod -m 622 tty0 c 4 0</div><div class='del'>-</div><div class='del'>-2. LILO can also take input from a serial device. This is a very</div><div class='del'>-   useful option. To tell LILO to use the serial port:</div><div class='del'>-   In lilo.conf (global section): </div><div class='del'>-</div><div class='del'>-   serial  = 1,9600n8 (ttyS1, 9600 bd, no parity, 8 bits)</div><div class='del'>-</div><div class='del'>-3. Adjust to kernel flags for the new kernel,</div><div class='del'>-   again in lilo.conf (kernel section)</div><div class='del'>-</div><div class='del'>-   append = "console=ttyS1,9600" </div><div class='del'>-</div><div class='del'>-4. Make sure a getty runs on the serial port so that you can login to</div><div class='del'>-   it once the system is done booting. This is done by adding a line</div><div class='del'>-   like this to /etc/inittab (exact syntax depends on your getty):</div><div class='del'>-</div><div class='del'>-   S1:23:respawn:/sbin/getty -L ttyS1 9600 vt100</div><div class='del'>-</div><div class='del'>-5. Init and /etc/ioctl.save</div><div class='del'>-</div><div class='del'>-   Sysvinit remembers its stty settings in a file in /etc, called</div><div class='del'>-   `/etc/ioctl.save'. REMOVE THIS FILE before using the serial</div><div class='del'>-   console for the first time, because otherwise init will probably</div><div class='del'>-   set the baudrate to 38400 (baudrate of the virtual console).</div><div class='del'>-</div><div class='del'>-6. /dev/console and X</div><div class='del'>-   Programs that want to do something with the virtual console usually</div><div class='del'>-   open /dev/console. If you have created the new /dev/console device,</div><div class='del'>-   and your console is NOT the virtual console some programs will fail.</div><div class='del'>-   Those are programs that want to access the VT interface, and use</div><div class='del'>-   /dev/console instead of /dev/tty0. Some of those programs are:</div><div class='del'>-</div><div class='del'>-   Xfree86, svgalib, gpm, SVGATextMode</div><div class='del'>-</div><div class='del'>-   It should be fixed in modern versions of these programs though.</div><div class='del'>-</div><div class='del'>-   Note that if you boot without a console= option (or with</div><div class='del'>-   console=/dev/tty0), /dev/console is the same as /dev/tty0. In that</div><div class='del'>-   case everything will still work.</div><div class='del'>-</div><div class='del'>-7. Thanks</div><div class='del'>-</div><div class='del'>-   Thanks to Geert Uytterhoeven &lt;geert@linux-m68k.org&gt;</div><div class='del'>-   for porting the patches from 2.1.4x to 2.1.6x for taking care of</div><div class='del'>-   the integration of these patches into m68k, ppc and alpha.</div><div class='del'>-</div><div class='del'>-Miquel van Smoorenburg &lt;miquels@cistron.nl&gt;, 11-Jun-2000</div><div class='head'>diff --git a/Documentation/siphash.txt b/Documentation/siphash.txt<br/>new file mode 100644<br/>index 000000000000..908d348ff777<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/siphash.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/siphash.txt</a></div><div class='hunk'>@@ -0,0 +1,175 @@</div><div class='add'>+         SipHash - a short input PRF</div><div class='add'>+-----------------------------------------------</div><div class='add'>+Written by Jason A. Donenfeld &lt;jason@zx2c4.com&gt;</div><div class='add'>+</div><div class='add'>+SipHash is a cryptographically secure PRF -- a keyed hash function -- that</div><div class='add'>+performs very well for short inputs, hence the name. It was designed by</div><div class='add'>+cryptographers Daniel J. Bernstein and Jean-Philippe Aumasson. It is intended</div><div class='add'>+as a replacement for some uses of: `jhash`, `md5_transform`, `sha_transform`,</div><div class='add'>+and so forth.</div><div class='add'>+</div><div class='add'>+SipHash takes a secret key filled with randomly generated numbers and either</div><div class='add'>+an input buffer or several input integers. It spits out an integer that is</div><div class='add'>+indistinguishable from random. You may then use that integer as part of secure</div><div class='add'>+sequence numbers, secure cookies, or mask it off for use in a hash table.</div><div class='add'>+</div><div class='add'>+1. Generating a key</div><div class='add'>+</div><div class='add'>+Keys should always be generated from a cryptographically secure source of</div><div class='add'>+random numbers, either using get_random_bytes or get_random_once:</div><div class='add'>+</div><div class='add'>+siphash_key_t key;</div><div class='add'>+get_random_bytes(&amp;key, sizeof(key));</div><div class='add'>+</div><div class='add'>+If you're not deriving your key from here, you're doing it wrong.</div><div class='add'>+</div><div class='add'>+2. Using the functions</div><div class='add'>+</div><div class='add'>+There are two variants of the function, one that takes a list of integers, and</div><div class='add'>+one that takes a buffer:</div><div class='add'>+</div><div class='add'>+u64 siphash(const void *data, size_t len, const siphash_key_t *key);</div><div class='add'>+</div><div class='add'>+And:</div><div class='add'>+</div><div class='add'>+u64 siphash_1u64(u64, const siphash_key_t *key);</div><div class='add'>+u64 siphash_2u64(u64, u64, const siphash_key_t *key);</div><div class='add'>+u64 siphash_3u64(u64, u64, u64, const siphash_key_t *key);</div><div class='add'>+u64 siphash_4u64(u64, u64, u64, u64, const siphash_key_t *key);</div><div class='add'>+u64 siphash_1u32(u32, const siphash_key_t *key);</div><div class='add'>+u64 siphash_2u32(u32, u32, const siphash_key_t *key);</div><div class='add'>+u64 siphash_3u32(u32, u32, u32, const siphash_key_t *key);</div><div class='add'>+u64 siphash_4u32(u32, u32, u32, u32, const siphash_key_t *key);</div><div class='add'>+</div><div class='add'>+If you pass the generic siphash function something of a constant length, it</div><div class='add'>+will constant fold at compile-time and automatically choose one of the</div><div class='add'>+optimized functions.</div><div class='add'>+</div><div class='add'>+3. Hashtable key function usage:</div><div class='add'>+</div><div class='add'>+struct some_hashtable {</div><div class='add'>+	DECLARE_HASHTABLE(hashtable, 8);</div><div class='add'>+	siphash_key_t key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void init_hashtable(struct some_hashtable *table)</div><div class='add'>+{</div><div class='add'>+	get_random_bytes(&amp;table-&gt;key, sizeof(table-&gt;key));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline hlist_head *some_hashtable_bucket(struct some_hashtable *table, struct interesting_input *input)</div><div class='add'>+{</div><div class='add'>+	return &amp;table-&gt;hashtable[siphash(input, sizeof(*input), &amp;table-&gt;key) &amp; (HASH_SIZE(table-&gt;hashtable) - 1)];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+You may then iterate like usual over the returned hash bucket.</div><div class='add'>+</div><div class='add'>+4. Security</div><div class='add'>+</div><div class='add'>+SipHash has a very high security margin, with its 128-bit key. So long as the</div><div class='add'>+key is kept secret, it is impossible for an attacker to guess the outputs of</div><div class='add'>+the function, even if being able to observe many outputs, since 2^128 outputs</div><div class='add'>+is significant.</div><div class='add'>+</div><div class='add'>+Linux implements the "2-4" variant of SipHash.</div><div class='add'>+</div><div class='add'>+5. Struct-passing Pitfalls</div><div class='add'>+</div><div class='add'>+Often times the XuY functions will not be large enough, and instead you'll</div><div class='add'>+want to pass a pre-filled struct to siphash. When doing this, it's important</div><div class='add'>+to always ensure the struct has no padding holes. The easiest way to do this</div><div class='add'>+is to simply arrange the members of the struct in descending order of size,</div><div class='add'>+and to use offsetendof() instead of sizeof() for getting the size. For</div><div class='add'>+performance reasons, if possible, it's probably a good thing to align the</div><div class='add'>+struct to the right boundary. Here's an example:</div><div class='add'>+</div><div class='add'>+const struct {</div><div class='add'>+	struct in6_addr saddr;</div><div class='add'>+	u32 counter;</div><div class='add'>+	u16 dport;</div><div class='add'>+} __aligned(SIPHASH_ALIGNMENT) combined = {</div><div class='add'>+	.saddr = *(struct in6_addr *)saddr,</div><div class='add'>+	.counter = counter,</div><div class='add'>+	.dport = dport</div><div class='add'>+};</div><div class='add'>+u64 h = siphash(&amp;combined, offsetofend(typeof(combined), dport), &amp;secret);</div><div class='add'>+</div><div class='add'>+6. Resources</div><div class='add'>+</div><div class='add'>+Read the SipHash paper if you're interested in learning more:</div><div class='add'>+https://131002.net/siphash/siphash.pdf</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~</div><div class='add'>+</div><div class='add'>+HalfSipHash - SipHash's insecure younger cousin</div><div class='add'>+-----------------------------------------------</div><div class='add'>+Written by Jason A. Donenfeld &lt;jason@zx2c4.com&gt;</div><div class='add'>+</div><div class='add'>+On the off-chance that SipHash is not fast enough for your needs, you might be</div><div class='add'>+able to justify using HalfSipHash, a terrifying but potentially useful</div><div class='add'>+possibility. HalfSipHash cuts SipHash's rounds down from "2-4" to "1-3" and,</div><div class='add'>+even scarier, uses an easily brute-forcable 64-bit key (with a 32-bit output)</div><div class='add'>+instead of SipHash's 128-bit key. However, this may appeal to some</div><div class='add'>+high-performance `jhash` users.</div><div class='add'>+</div><div class='add'>+Danger!</div><div class='add'>+</div><div class='add'>+Do not ever use HalfSipHash except for as a hashtable key function, and only</div><div class='add'>+then when you can be absolutely certain that the outputs will never be</div><div class='add'>+transmitted out of the kernel. This is only remotely useful over `jhash` as a</div><div class='add'>+means of mitigating hashtable flooding denial of service attacks.</div><div class='add'>+</div><div class='add'>+1. Generating a key</div><div class='add'>+</div><div class='add'>+Keys should always be generated from a cryptographically secure source of</div><div class='add'>+random numbers, either using get_random_bytes or get_random_once:</div><div class='add'>+</div><div class='add'>+hsiphash_key_t key;</div><div class='add'>+get_random_bytes(&amp;key, sizeof(key));</div><div class='add'>+</div><div class='add'>+If you're not deriving your key from here, you're doing it wrong.</div><div class='add'>+</div><div class='add'>+2. Using the functions</div><div class='add'>+</div><div class='add'>+There are two variants of the function, one that takes a list of integers, and</div><div class='add'>+one that takes a buffer:</div><div class='add'>+</div><div class='add'>+u32 hsiphash(const void *data, size_t len, const hsiphash_key_t *key);</div><div class='add'>+</div><div class='add'>+And:</div><div class='add'>+</div><div class='add'>+u32 hsiphash_1u32(u32, const hsiphash_key_t *key);</div><div class='add'>+u32 hsiphash_2u32(u32, u32, const hsiphash_key_t *key);</div><div class='add'>+u32 hsiphash_3u32(u32, u32, u32, const hsiphash_key_t *key);</div><div class='add'>+u32 hsiphash_4u32(u32, u32, u32, u32, const hsiphash_key_t *key);</div><div class='add'>+</div><div class='add'>+If you pass the generic hsiphash function something of a constant length, it</div><div class='add'>+will constant fold at compile-time and automatically choose one of the</div><div class='add'>+optimized functions.</div><div class='add'>+</div><div class='add'>+3. Hashtable key function usage:</div><div class='add'>+</div><div class='add'>+struct some_hashtable {</div><div class='add'>+	DECLARE_HASHTABLE(hashtable, 8);</div><div class='add'>+	hsiphash_key_t key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void init_hashtable(struct some_hashtable *table)</div><div class='add'>+{</div><div class='add'>+	get_random_bytes(&amp;table-&gt;key, sizeof(table-&gt;key));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline hlist_head *some_hashtable_bucket(struct some_hashtable *table, struct interesting_input *input)</div><div class='add'>+{</div><div class='add'>+	return &amp;table-&gt;hashtable[hsiphash(input, sizeof(*input), &amp;table-&gt;key) &amp; (HASH_SIZE(table-&gt;hashtable) - 1)];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+You may then iterate like usual over the returned hash bucket.</div><div class='add'>+</div><div class='add'>+4. Performance</div><div class='add'>+</div><div class='add'>+HalfSipHash is roughly 3 times slower than JenkinsHash. For many replacements,</div><div class='add'>+this will not be a problem, as the hashtable lookup isn't the bottleneck. And</div><div class='add'>+in general, this is probably a good sacrifice to make for the security and DoS</div><div class='add'>+resistance of HalfSipHash.</div><div class='head'>diff --git a/Documentation/sound/alsa-configuration.rst b/Documentation/sound/alsa-configuration.rst<br/>new file mode 100644<br/>index 000000000000..aed6b4fb8e46<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/alsa-configuration.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/alsa-configuration.rst</a></div><div class='hunk'>@@ -0,0 +1,2683 @@</div><div class='add'>+==============================================================</div><div class='add'>+Advanced Linux Sound Architecture - Driver Configuration guide</div><div class='add'>+==============================================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Kernel Configuration</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+To enable ALSA support you need at least to build the kernel with</div><div class='add'>+primary sound card support (``CONFIG_SOUND``).  Since ALSA can emulate</div><div class='add'>+OSS, you don't have to choose any of the OSS modules.</div><div class='add'>+</div><div class='add'>+Enable "OSS API emulation" (``CONFIG_SND_OSSEMUL``) and both OSS mixer</div><div class='add'>+and PCM supports if you want to run OSS applications with ALSA.</div><div class='add'>+</div><div class='add'>+If you want to support the WaveTable functionality on cards such as</div><div class='add'>+SB Live! then you need to enable "Sequencer support"</div><div class='add'>+(``CONFIG_SND_SEQUENCER``).</div><div class='add'>+</div><div class='add'>+To make ALSA debug messages more verbose, enable the "Verbose printk"</div><div class='add'>+and "Debug" options.  To check for memory leaks, turn on "Debug memory"</div><div class='add'>+too.  "Debug detection" will add checks for the detection of cards.</div><div class='add'>+</div><div class='add'>+Please note that all the ALSA ISA drivers support the Linux isapnp API</div><div class='add'>+(if the card supports ISA PnP).  You don't need to configure the cards</div><div class='add'>+using isapnptools.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Module parameters</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+The user can load modules with options. If the module supports more than</div><div class='add'>+one card and you have more than one card of the same type then you can</div><div class='add'>+specify multiple values for the option separated by commas.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Module snd</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+The core ALSA module.  It is used by all ALSA card drivers.</div><div class='add'>+It takes the following options which have global effects.</div><div class='add'>+</div><div class='add'>+major</div><div class='add'>+    major number for sound driver;</div><div class='add'>+    Default: 116</div><div class='add'>+cards_limit</div><div class='add'>+    limiting card index for auto-loading (1-8);</div><div class='add'>+    Default: 1;</div><div class='add'>+    For auto-loading more than one card, specify this option</div><div class='add'>+    together with snd-card-X aliases.</div><div class='add'>+slots</div><div class='add'>+    Reserve the slot index for the given driver;</div><div class='add'>+    This option takes multiple strings.</div><div class='add'>+    See `Module Autoloading Support`_ section for details.</div><div class='add'>+debug</div><div class='add'>+    Specifies the debug message level;</div><div class='add'>+    (0 = disable debug prints, 1 = normal debug messages,</div><div class='add'>+    2 = verbose debug messages);</div><div class='add'>+    This option appears only when ``CONFIG_SND_DEBUG=y``.</div><div class='add'>+    This option can be dynamically changed via sysfs</div><div class='add'>+    /sys/modules/snd/parameters/debug file.</div><div class='add'>+  </div><div class='add'>+Module snd-pcm-oss</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+The PCM OSS emulation module.</div><div class='add'>+This module takes options which change the mapping of devices.</div><div class='add'>+</div><div class='add'>+dsp_map</div><div class='add'>+    PCM device number maps assigned to the 1st OSS device;</div><div class='add'>+    Default: 0</div><div class='add'>+adsp_map</div><div class='add'>+    PCM device number maps assigned to the 2st OSS device;</div><div class='add'>+    Default: 1</div><div class='add'>+nonblock_open</div><div class='add'>+    Don't block opening busy PCM devices;</div><div class='add'>+    Default: 1</div><div class='add'>+</div><div class='add'>+For example, when ``dsp_map=2``, /dev/dsp will be mapped to PCM #2 of</div><div class='add'>+the card #0.  Similarly, when ``adsp_map=0``, /dev/adsp will be mapped</div><div class='add'>+to PCM #0 of the card #0.</div><div class='add'>+For changing the second or later card, specify the option with</div><div class='add'>+commas, such like ``dsp_map=0,1``.</div><div class='add'>+</div><div class='add'>+``nonblock_open`` option is used to change the behavior of the PCM</div><div class='add'>+regarding opening the device.  When this option is non-zero,</div><div class='add'>+opening a busy OSS PCM device won't be blocked but return</div><div class='add'>+immediately with EAGAIN (just like O_NONBLOCK flag).</div><div class='add'>+    </div><div class='add'>+Module snd-rawmidi</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+This module takes options which change the mapping of devices.</div><div class='add'>+similar to those of the snd-pcm-oss module.</div><div class='add'>+</div><div class='add'>+midi_map</div><div class='add'>+    MIDI device number maps assigned to the 1st OSS device;</div><div class='add'>+    Default: 0</div><div class='add'>+amidi_map</div><div class='add'>+    MIDI device number maps assigned to the 2st OSS device;</div><div class='add'>+    Default: 1</div><div class='add'>+</div><div class='add'>+Common parameters for top sound card modules</div><div class='add'>+--------------------------------------------</div><div class='add'>+</div><div class='add'>+Each of top level sound card module takes the following options.</div><div class='add'>+</div><div class='add'>+index</div><div class='add'>+    index (slot #) of sound card;</div><div class='add'>+    Values: 0 through 31 or negative;</div><div class='add'>+    If nonnegative, assign that index number;</div><div class='add'>+    if negative, interpret as a bitmask of permissible indices;</div><div class='add'>+    the first free permitted index is assigned;</div><div class='add'>+    Default: -1</div><div class='add'>+id</div><div class='add'>+    card ID (identifier or name);</div><div class='add'>+    Can be up to 15 characters long;</div><div class='add'>+    Default: the card type;</div><div class='add'>+    A directory by this name is created under /proc/asound/</div><div class='add'>+    containing information about the card;</div><div class='add'>+    This ID can be used instead of the index number in</div><div class='add'>+    identifying the card</div><div class='add'>+enable</div><div class='add'>+    enable card;</div><div class='add'>+    Default: enabled, for PCI and ISA PnP cards</div><div class='add'>+</div><div class='add'>+Module snd-adlib</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for AdLib FM cards.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for OPL chip</div><div class='add'>+</div><div class='add'>+This module supports multiple cards. It does not support autoprobe, so</div><div class='add'>+the port must be specified. For actual AdLib FM cards it will be 0x388.</div><div class='add'>+Note that this card does not have PCM support and no mixer; only FM</div><div class='add'>+synthesis.</div><div class='add'>+</div><div class='add'>+Make sure you have ``sbiload`` from the alsa-tools package available and,</div><div class='add'>+after loading the module, find out the assigned ALSA sequencer port</div><div class='add'>+number through ``sbiload -l``.</div><div class='add'>+</div><div class='add'>+Example output:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      Port     Client name                       Port name</div><div class='add'>+      64:0     OPL2 FM synth                     OPL2 FM Port</div><div class='add'>+</div><div class='add'>+Load the ``std.sb`` and ``drums.sb`` patches also supplied by ``sbiload``:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      sbiload -p 64:0 std.sb drums.sb</div><div class='add'>+</div><div class='add'>+If you use this driver to drive an OPL3, you can use ``std.o3`` and ``drums.o3``</div><div class='add'>+instead. To have the card produce sound, use ``aplaymidi`` from alsa-utils:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      aplaymidi -p 64:0 foo.mid</div><div class='add'>+</div><div class='add'>+Module snd-ad1816a</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on Analog Devices AD1816A/AD1815 ISA chips.</div><div class='add'>+</div><div class='add'>+clockfreq</div><div class='add'>+    Clock frequency for AD1816A chip (default = 0, 33000Hz)</div><div class='add'>+    </div><div class='add'>+This module supports multiple cards, autoprobe and PnP.</div><div class='add'>+    </div><div class='add'>+Module snd-ad1848</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on AD1848/AD1847/CS4248 ISA chips.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for AD1848 chip</div><div class='add'>+irq</div><div class='add'>+    IRQ # for AD1848  chip</div><div class='add'>+dma1</div><div class='add'>+    DMA # for AD1848 chip (0,1,3)</div><div class='add'>+    </div><div class='add'>+This module supports multiple cards.  It does not support autoprobe</div><div class='add'>+thus main port must be specified!!! Other ports are optional.</div><div class='add'>+    </div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-ad1889</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Analog Devices AD1889 chips.</div><div class='add'>+</div><div class='add'>+ac97_quirk</div><div class='add'>+    AC'97 workaround for strange hardware;</div><div class='add'>+    See the description of intel8x0 module for details.</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-ali5451</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for ALi M5451 PCI chip.</div><div class='add'>+</div><div class='add'>+pcm_channels</div><div class='add'>+    Number of hardware channels assigned for PCM</div><div class='add'>+spdif</div><div class='add'>+    Support SPDIF I/O;</div><div class='add'>+    Default: disabled</div><div class='add'>+</div><div class='add'>+This module supports one chip and autoprobe.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-als100</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on Avance Logic ALS100/ALS120 ISA chips.</div><div class='add'>+</div><div class='add'>+This module supports multiple cards, autoprobe and PnP.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-als300</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Avance Logic ALS300 and ALS300+</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-als4000</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on Avance Logic ALS4000 PCI chip.</div><div class='add'>+</div><div class='add'>+joystick_port</div><div class='add'>+    port # for legacy joystick support;</div><div class='add'>+    0 = disabled (default), 1 = auto-detect</div><div class='add'>+    </div><div class='add'>+This module supports multiple cards, autoprobe and PnP.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-asihpi</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for AudioScience ASI soundcards</div><div class='add'>+</div><div class='add'>+enable_hpi_hwdep</div><div class='add'>+    enable HPI hwdep for AudioScience soundcard</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-atiixp</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for ATI IXP 150/200/250/400 AC97 controllers.</div><div class='add'>+</div><div class='add'>+ac97_clock</div><div class='add'>+    AC'97 clock (default = 48000)</div><div class='add'>+ac97_quirk</div><div class='add'>+    AC'97 workaround for strange hardware;</div><div class='add'>+    See `AC97 Quirk Option`_ section below.</div><div class='add'>+ac97_codec</div><div class='add'>+    Workaround to specify which AC'97 codec instead of probing.</div><div class='add'>+    If this works for you file a bug with your `lspci -vn` output.</div><div class='add'>+    (-2 = Force probing, -1 = Default behavior, 0-2 = Use the</div><div class='add'>+    specified codec.)</div><div class='add'>+spdif_aclink</div><div class='add'>+    S/PDIF transfer over AC-link (default = 1)</div><div class='add'>+</div><div class='add'>+This module supports one card and autoprobe.</div><div class='add'>+</div><div class='add'>+ATI IXP has two different methods to control SPDIF output.  One is</div><div class='add'>+over AC-link and another is over the "direct" SPDIF output.  The</div><div class='add'>+implementation depends on the motherboard, and you'll need to</div><div class='add'>+choose the correct one via spdif_aclink module option.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-atiixp-modem</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Module for ATI IXP 150/200/250 AC97 modem controllers.</div><div class='add'>+</div><div class='add'>+This module supports one card and autoprobe.</div><div class='add'>+</div><div class='add'>+Note: The default index value of this module is -2, i.e. the first</div><div class='add'>+slot is excluded.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-au8810, snd-au8820, snd-au8830</div><div class='add'>+-----------------------------------------</div><div class='add'>+</div><div class='add'>+Module for Aureal Vortex, Vortex2 and Advantage device.</div><div class='add'>+</div><div class='add'>+pcifix</div><div class='add'>+    Control PCI workarounds;</div><div class='add'>+    0 = Disable all workarounds,</div><div class='add'>+    1 = Force the PCI latency of the Aureal card to 0xff,</div><div class='add'>+    2 = Force the Extend PCI#2 Internal Master for Efficient</div><div class='add'>+    Handling of Dummy Requests on the VIA KT133 AGP Bridge,</div><div class='add'>+    3 = Force both settings,</div><div class='add'>+    255 = Autodetect what is required (default)</div><div class='add'>+</div><div class='add'>+This module supports all ADB PCM channels, ac97 mixer, SPDIF, hardware</div><div class='add'>+EQ, mpu401, gameport. A3D and wavetable support are still in development.</div><div class='add'>+Development and reverse engineering work is being coordinated at</div><div class='add'>+http://savannah.nongnu.org/projects/openvortex/</div><div class='add'>+SPDIF output has a copy of the AC97 codec output, unless you use the</div><div class='add'>+``spdif`` pcm device, which allows raw data passthru.</div><div class='add'>+The hardware EQ hardware and SPDIF is only present in the Vortex2 and </div><div class='add'>+Advantage.</div><div class='add'>+</div><div class='add'>+Note: Some ALSA mixer applications don't handle the SPDIF sample rate </div><div class='add'>+control correctly. If you have problems regarding this, try</div><div class='add'>+another ALSA compliant mixer (alsamixer works).</div><div class='add'>+</div><div class='add'>+Module snd-azt1605</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Aztech Sound Galaxy soundcards based on the Aztech AZT1605</div><div class='add'>+chipset.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for BASE (0x220,0x240,0x260,0x280)</div><div class='add'>+wss_port</div><div class='add'>+    port # for WSS (0x530,0x604,0xe80,0xf40)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for WSS (7,9,10,11)</div><div class='add'>+dma1</div><div class='add'>+    DMA # for WSS playback (0,1,3)</div><div class='add'>+dma2</div><div class='add'>+    DMA # for WSS capture (0,1), -1 = disabled (default)</div><div class='add'>+mpu_port</div><div class='add'>+    port # for MPU-401 UART (0x300,0x330), -1 = disabled (default)</div><div class='add'>+mpu_irq</div><div class='add'>+    IRQ # for MPU-401 UART (3,5,7,9), -1 = disabled (default)</div><div class='add'>+fm_port</div><div class='add'>+    port # for OPL3 (0x388), -1 = disabled (default)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards. It does not support autoprobe:</div><div class='add'>+``port``, ``wss_port``, ``irq`` and ``dma1`` have to be specified.</div><div class='add'>+The other values are optional.</div><div class='add'>+</div><div class='add'>+``port`` needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)</div><div class='add'>+or the value stored in the card's EEPROM for cards that have an EEPROM and</div><div class='add'>+their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can</div><div class='add'>+be chosen freely from the options enumerated above.</div><div class='add'>+</div><div class='add'>+If ``dma2`` is specified and different from ``dma1``, the card will operate in</div><div class='add'>+full-duplex mode. When ``dma1=3``, only ``dma2=0`` is valid and the only way to</div><div class='add'>+enable capture since only channels 0 and 1 are available for capture.</div><div class='add'>+</div><div class='add'>+Generic settings are ``port=0x220 wss_port=0x530 irq=10 dma1=1 dma2=0</div><div class='add'>+mpu_port=0x330 mpu_irq=9 fm_port=0x388``.</div><div class='add'>+</div><div class='add'>+Whatever IRQ and DMA channels you pick, be sure to reserve them for</div><div class='add'>+legacy ISA in your BIOS.</div><div class='add'>+</div><div class='add'>+Module snd-azt2316</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Aztech Sound Galaxy soundcards based on the Aztech AZT2316</div><div class='add'>+chipset.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for BASE (0x220,0x240,0x260,0x280)</div><div class='add'>+wss_port</div><div class='add'>+    port # for WSS (0x530,0x604,0xe80,0xf40)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for WSS (7,9,10,11)</div><div class='add'>+dma1</div><div class='add'>+    DMA # for WSS playback (0,1,3)</div><div class='add'>+dma2</div><div class='add'>+    DMA # for WSS capture (0,1), -1 = disabled (default)</div><div class='add'>+mpu_port</div><div class='add'>+    port # for MPU-401 UART (0x300,0x330), -1 = disabled (default)</div><div class='add'>+mpu_irq</div><div class='add'>+    IRQ # for MPU-401 UART (5,7,9,10), -1 = disabled (default)</div><div class='add'>+fm_port</div><div class='add'>+    port # for OPL3 (0x388), -1 = disabled (default)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards. It does not support autoprobe:</div><div class='add'>+``port``, ``wss_port``, ``irq`` and ``dma1`` have to be specified.</div><div class='add'>+The other values are optional.</div><div class='add'>+</div><div class='add'>+``port`` needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)</div><div class='add'>+or the value stored in the card's EEPROM for cards that have an EEPROM and</div><div class='add'>+their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can</div><div class='add'>+be chosen freely from the options enumerated above.</div><div class='add'>+</div><div class='add'>+If ``dma2`` is specified and different from ``dma1``, the card will operate in</div><div class='add'>+full-duplex mode. When ``dma1=3``, only ``dma2=0`` is valid and the only way to</div><div class='add'>+enable capture since only channels 0 and 1 are available for capture.</div><div class='add'>+</div><div class='add'>+Generic settings are ``port=0x220 wss_port=0x530 irq=10 dma1=1 dma2=0</div><div class='add'>+mpu_port=0x330 mpu_irq=9 fm_port=0x388``.</div><div class='add'>+</div><div class='add'>+Whatever IRQ and DMA channels you pick, be sure to reserve them for</div><div class='add'>+legacy ISA in your BIOS.</div><div class='add'>+</div><div class='add'>+Module snd-aw2</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Module for Audiowerk2 sound card</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-azt2320</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on Aztech System AZT2320 ISA chip (PnP only).</div><div class='add'>+</div><div class='add'>+This module supports multiple cards, PnP and autoprobe.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-azt3328</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on Aztech AZF3328 PCI chip.</div><div class='add'>+</div><div class='add'>+joystick</div><div class='add'>+    Enable joystick (default off)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-bt87x</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for video cards based on Bt87x chips.</div><div class='add'>+</div><div class='add'>+digital_rate</div><div class='add'>+    Override the default digital rate (Hz)</div><div class='add'>+load_all</div><div class='add'>+    Load the driver even if the card model isn't known</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Note: The default index value of this module is -2, i.e. the first</div><div class='add'>+slot is excluded.</div><div class='add'>+</div><div class='add'>+Module snd-ca0106</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Creative Audigy LS and SB Live 24bit</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Module snd-cmi8330</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on C-Media CMI8330 ISA chips.</div><div class='add'>+</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+with ``isapnp=0``, the following options are available:</div><div class='add'>+</div><div class='add'>+wssport</div><div class='add'>+    port # for CMI8330 chip (WSS)</div><div class='add'>+wssirq</div><div class='add'>+    IRQ # for CMI8330 chip (WSS)</div><div class='add'>+wssdma</div><div class='add'>+    first DMA # for CMI8330 chip (WSS)</div><div class='add'>+sbport</div><div class='add'>+    port # for CMI8330 chip (SB16)</div><div class='add'>+sbirq</div><div class='add'>+    IRQ # for CMI8330 chip (SB16)</div><div class='add'>+sbdma8</div><div class='add'>+    8bit DMA # for CMI8330 chip (SB16)</div><div class='add'>+sbdma16</div><div class='add'>+    16bit DMA # for CMI8330 chip (SB16)</div><div class='add'>+fmport</div><div class='add'>+    (optional) OPL3 I/O port</div><div class='add'>+mpuport</div><div class='add'>+    (optional) MPU401 I/O port</div><div class='add'>+mpuirq</div><div class='add'>+    (optional) MPU401 irq #</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-cmipci</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for C-Media CMI8338/8738/8768/8770 PCI sound cards.</div><div class='add'>+</div><div class='add'>+mpu_port</div><div class='add'>+    port address of MIDI interface (8338 only):</div><div class='add'>+    0x300,0x310,0x320,0x330 = legacy port,</div><div class='add'>+    0 = disable (default)</div><div class='add'>+fm_port</div><div class='add'>+    port address of OPL-3 FM synthesizer (8x38 only):</div><div class='add'>+    0x388 = legacy port,</div><div class='add'>+    1 = integrated PCI port (default on 8738),</div><div class='add'>+    0 = disable</div><div class='add'>+soft_ac3</div><div class='add'>+    Software-conversion of raw SPDIF packets (model 033 only) (default = 1)</div><div class='add'>+joystick_port</div><div class='add'>+    Joystick port address (0 = disable, 1 = auto-detect)</div><div class='add'>+</div><div class='add'>+This module supports autoprobe and multiple cards.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-cs4231</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on CS4231 ISA chips.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for CS4231 chip</div><div class='add'>+mpu_port</div><div class='add'>+    port # for MPU-401 UART (optional), -1 = disable</div><div class='add'>+irq</div><div class='add'>+    IRQ # for CS4231 chip</div><div class='add'>+mpu_irq</div><div class='add'>+    IRQ # for MPU-401 UART</div><div class='add'>+dma1</div><div class='add'>+    first DMA # for CS4231 chip</div><div class='add'>+dma2</div><div class='add'>+    second DMA # for CS4231 chip</div><div class='add'>+</div><div class='add'>+This module supports multiple cards. This module does not support autoprobe</div><div class='add'>+thus main port must be specified!!! Other ports are optional.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-cs4236</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on CS4232/CS4232A,</div><div class='add'>+CS4235/CS4236/CS4236B/CS4237B/CS4238B/CS4239 ISA chips.</div><div class='add'>+</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+with ``isapnp=0``, the following options are available:</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for CS4236 chip (PnP setup - 0x534)</div><div class='add'>+cport</div><div class='add'>+    control port # for CS4236 chip (PnP setup - 0x120,0x210,0xf00)</div><div class='add'>+mpu_port</div><div class='add'>+    port # for MPU-401 UART (PnP setup - 0x300), -1 = disable</div><div class='add'>+fm_port</div><div class='add'>+    FM port # for CS4236 chip (PnP setup - 0x388), -1 = disable</div><div class='add'>+irq</div><div class='add'>+    IRQ # for CS4236 chip (5,7,9,11,12,15)</div><div class='add'>+mpu_irq</div><div class='add'>+    IRQ # for MPU-401 UART (9,11,12,15)</div><div class='add'>+dma1</div><div class='add'>+    first DMA # for CS4236 chip (0,1,3)</div><div class='add'>+dma2</div><div class='add'>+    second DMA # for CS4236 chip (0,1,3), -1 = disable</div><div class='add'>+</div><div class='add'>+This module supports multiple cards. This module does not support autoprobe</div><div class='add'>+(if ISA PnP is not used) thus main port and control port must be</div><div class='add'>+specified!!! Other ports are optional.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+This module is aliased as snd-cs4232 since it provides the old</div><div class='add'>+snd-cs4232 functionality, too.</div><div class='add'>+</div><div class='add'>+Module snd-cs4281</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Cirrus Logic CS4281 soundchip.</div><div class='add'>+</div><div class='add'>+dual_codec</div><div class='add'>+    Secondary codec ID (0 = disable, default)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-cs46xx</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for PCI sound cards based on CS4610/CS4612/CS4614/CS4615/CS4622/</div><div class='add'>+CS4624/CS4630/CS4280 PCI chips.</div><div class='add'>+</div><div class='add'>+external_amp</div><div class='add'>+    Force to enable external amplifier.</div><div class='add'>+thinkpad</div><div class='add'>+    Force to enable Thinkpad's CLKRUN control.</div><div class='add'>+mmap_valid</div><div class='add'>+    Support OSS mmap mode (default = 0).</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+Usually external amp and CLKRUN controls are detected automatically</div><div class='add'>+from PCI sub vendor/device ids.  If they don't work, give the options</div><div class='add'>+above explicitly.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-cs5530</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Cyrix/NatSemi Geode 5530 chip. </div><div class='add'>+</div><div class='add'>+Module snd-cs5535audio</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+Module for multifunction CS5535 companion PCI device</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-ctxfi</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for Creative Sound Blaster X-Fi boards (20k1 / 20k2 chips)</div><div class='add'>+</div><div class='add'>+* Creative Sound Blaster X-Fi Titanium Fatal1ty Champion Series</div><div class='add'>+* Creative Sound Blaster X-Fi Titanium Fatal1ty Professional Series</div><div class='add'>+* Creative Sound Blaster X-Fi Titanium Professional Audio</div><div class='add'>+* Creative Sound Blaster X-Fi Titanium</div><div class='add'>+* Creative Sound Blaster X-Fi Elite Pro</div><div class='add'>+* Creative Sound Blaster X-Fi Platinum</div><div class='add'>+* Creative Sound Blaster X-Fi Fatal1ty</div><div class='add'>+* Creative Sound Blaster X-Fi XtremeGamer</div><div class='add'>+* Creative Sound Blaster X-Fi XtremeMusic</div><div class='add'>+	</div><div class='add'>+reference_rate</div><div class='add'>+    reference sample rate, 44100 or 48000 (default)</div><div class='add'>+multiple</div><div class='add'>+    multiple to ref. sample rate, 1 or 2 (default)</div><div class='add'>+subsystem</div><div class='add'>+    override the PCI SSID for probing;</div><div class='add'>+    the value consists of SSVID &lt;&lt; 16 | SSDID.</div><div class='add'>+    The default is zero, which means no override.</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-darla20</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio Darla20</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-darla24</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio Darla24</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-dt019x</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Diamond Technologies DT-019X / Avance Logic ALS-007 (PnP</div><div class='add'>+only)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.  This module is enabled only with</div><div class='add'>+ISA PnP support.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-dummy</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for the dummy sound card. This "card" doesn't do any output</div><div class='add'>+or input, but you may use this module for any application which</div><div class='add'>+requires a sound card (like RealPlayer).</div><div class='add'>+</div><div class='add'>+pcm_devs</div><div class='add'>+    Number of PCM devices assigned to each card (default = 1, up to 4)</div><div class='add'>+pcm_substreams</div><div class='add'>+    Number of PCM substreams assigned to each PCM (default = 8, up to 128)</div><div class='add'>+hrtimer</div><div class='add'>+    Use hrtimer (=1, default) or system timer (=0)</div><div class='add'>+fake_buffer</div><div class='add'>+    Fake buffer allocations (default = 1)</div><div class='add'>+</div><div class='add'>+When multiple PCM devices are created, snd-dummy gives different</div><div class='add'>+behavior to each PCM device:</div><div class='add'>+* 0 = interleaved with mmap support</div><div class='add'>+* 1 = non-interleaved with mmap support</div><div class='add'>+* 2 = interleaved without mmap </div><div class='add'>+* 3 = non-interleaved without mmap</div><div class='add'>+</div><div class='add'>+As default, snd-dummy drivers doesn't allocate the real buffers</div><div class='add'>+but either ignores read/write or mmap a single dummy page to all</div><div class='add'>+buffer pages, in order to save the resources.  If your apps need</div><div class='add'>+the read/ written buffer data to be consistent, pass fake_buffer=0</div><div class='add'>+option.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-echo3g</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio 3G cards (Gina3G/Layla3G)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-emu10k1</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for EMU10K1/EMU10k2 based PCI sound cards.</div><div class='add'>+</div><div class='add'>+* Sound Blaster Live!</div><div class='add'>+* Sound Blaster PCI 512</div><div class='add'>+* Emu APS (partially supported)</div><div class='add'>+* Sound Blaster Audigy</div><div class='add'>+	</div><div class='add'>+extin</div><div class='add'>+    bitmap of available external inputs for FX8010 (see bellow)</div><div class='add'>+extout</div><div class='add'>+    bitmap of available external outputs for FX8010 (see bellow)</div><div class='add'>+seq_ports</div><div class='add'>+    allocated sequencer ports (4 by default)</div><div class='add'>+max_synth_voices</div><div class='add'>+    limit of voices used for wavetable (64 by default)</div><div class='add'>+max_buffer_size</div><div class='add'>+    specifies the maximum size of wavetable/pcm buffers given in MB</div><div class='add'>+    unit.  Default value is 128.</div><div class='add'>+enable_ir</div><div class='add'>+    enable IR</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+Input &amp; Output configurations 			[extin/extout]</div><div class='add'>+* Creative Card wo/Digital out			[0x0003/0x1f03]</div><div class='add'>+* Creative Card w/Digital out			[0x0003/0x1f0f]</div><div class='add'>+* Creative Card w/Digital CD in			[0x000f/0x1f0f]</div><div class='add'>+* Creative Card wo/Digital out + LiveDrive	[0x3fc3/0x1fc3]</div><div class='add'>+* Creative Card w/Digital out + LiveDrive	[0x3fc3/0x1fcf]</div><div class='add'>+* Creative Card w/Digital CD in + LiveDrive	[0x3fcf/0x1fcf]</div><div class='add'>+* Creative Card wo/Digital out + Digital I/O 2  [0x0fc3/0x1f0f]</div><div class='add'>+* Creative Card w/Digital out + Digital I/O 2	[0x0fc3/0x1f0f]</div><div class='add'>+* Creative Card w/Digital CD in + Digital I/O 2	[0x0fcf/0x1f0f]</div><div class='add'>+* Creative Card 5.1/w Digital out + LiveDrive	[0x3fc3/0x1fff]</div><div class='add'>+* Creative Card 5.1 (c) 2003			[0x3fc3/0x7cff]</div><div class='add'>+* Creative Card all ins and outs		[0x3fff/0x7fff]</div><div class='add'>+  </div><div class='add'>+The power-management is supported.</div><div class='add'>+  </div><div class='add'>+Module snd-emu10k1x</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Module for Creative Emu10k1X (SB Live Dell OEM version)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-ens1370</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Ensoniq AudioPCI ES1370 PCI sound cards.</div><div class='add'>+</div><div class='add'>+* SoundBlaster PCI 64</div><div class='add'>+* SoundBlaster PCI 128</div><div class='add'>+    </div><div class='add'>+joystick</div><div class='add'>+    Enable joystick (default off)</div><div class='add'>+  </div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-ens1371</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Ensoniq AudioPCI ES1371 PCI sound cards.</div><div class='add'>+</div><div class='add'>+* SoundBlaster PCI 64</div><div class='add'>+* SoundBlaster PCI 128</div><div class='add'>+* SoundBlaster Vibra PCI</div><div class='add'>+      </div><div class='add'>+joystick_port</div><div class='add'>+    port # for joystick (0x200,0x208,0x210,0x218), 0 = disable</div><div class='add'>+    (default), 1 = auto-detect</div><div class='add'>+  </div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-es1688</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for ESS AudioDrive ES-1688 and ES-688 sound cards.</div><div class='add'>+</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+mpu_port</div><div class='add'>+    port # for MPU-401 port (0x300,0x310,0x320,0x330), -1 = disable (default)</div><div class='add'>+mpu_irq</div><div class='add'>+    IRQ # for MPU-401 port (5,7,9,10)</div><div class='add'>+fm_port</div><div class='add'>+    port # for OPL3 (option; share the same port as default)</div><div class='add'>+</div><div class='add'>+with ``isapnp=0``, the following additional options are available:</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for ES-1688 chip (0x220,0x240,0x260)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for ES-1688 chip (5,7,9,10)</div><div class='add'>+dma8</div><div class='add'>+    DMA # for ES-1688 chip (0,1,3)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe (without MPU-401 port)</div><div class='add'>+and PnP with the ES968 chip.</div><div class='add'>+</div><div class='add'>+Module snd-es18xx</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for ESS AudioDrive ES-18xx sound cards.</div><div class='add'>+</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+with ``isapnp=0``, the following options are available:</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for ES-18xx chip (0x220,0x240,0x260)</div><div class='add'>+mpu_port</div><div class='add'>+    port # for MPU-401 port (0x300,0x310,0x320,0x330), -1 = disable (default)</div><div class='add'>+fm_port</div><div class='add'>+    port # for FM (optional, not used)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for ES-18xx chip (5,7,9,10)</div><div class='add'>+dma1</div><div class='add'>+    first DMA # for ES-18xx chip (0,1,3)</div><div class='add'>+dma2</div><div class='add'>+    first DMA # for ES-18xx chip (0,1,3)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards, ISA PnP and autoprobe (without MPU-401</div><div class='add'>+port if native ISA PnP routines are not used).</div><div class='add'>+When ``dma2`` is equal with ``dma1``, the driver works as half-duplex.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-es1938</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on ESS Solo-1 (ES1938,ES1946) chips.</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-es1968</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on ESS Maestro-1/2/2E (ES1968/ES1978) chips.</div><div class='add'>+</div><div class='add'>+total_bufsize</div><div class='add'>+    total buffer size in kB (1-4096kB)</div><div class='add'>+pcm_substreams_p</div><div class='add'>+    playback channels (1-8, default=2)</div><div class='add'>+pcm_substreams_c</div><div class='add'>+    capture channels (1-8, default=0)</div><div class='add'>+clock</div><div class='add'>+    clock (0 = auto-detection)</div><div class='add'>+use_pm</div><div class='add'>+    support the power-management (0 = off, 1 = on, 2 = auto (default))</div><div class='add'>+enable_mpu</div><div class='add'>+    enable MPU401 (0 = off, 1 = on, 2 = auto (default))</div><div class='add'>+joystick</div><div class='add'>+    enable joystick (default off)       </div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-fm801</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for ForteMedia FM801 based PCI sound cards.</div><div class='add'>+</div><div class='add'>+tea575x_tuner</div><div class='add'>+    Enable TEA575x tuner;</div><div class='add'>+    1 = MediaForte 256-PCS,</div><div class='add'>+    2 = MediaForte 256-PCPR,</div><div class='add'>+    3 = MediaForte 64-PCR</div><div class='add'>+    High 16-bits are video (radio) device number + 1;</div><div class='add'>+    example: 0x10002 (MediaForte 256-PCPR, device 1)</div><div class='add'>+	  </div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-gina20</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio Gina20</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-gina24</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio Gina24</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-gusclassic</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+Module for Gravis UltraSound Classic sound card.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for GF1 chip (0x220,0x230,0x240,0x250,0x260)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for GF1 chip (3,5,9,11,12,15)</div><div class='add'>+dma1</div><div class='add'>+    DMA # for GF1 chip (1,3,5,6,7)</div><div class='add'>+dma2</div><div class='add'>+    DMA # for GF1 chip (1,3,5,6,7,-1=disable)</div><div class='add'>+joystick_dac</div><div class='add'>+    0 to 31, (0.59V-4.52V or 0.389V-2.98V)</div><div class='add'>+voices</div><div class='add'>+    GF1 voices limit (14-32)</div><div class='add'>+pcm_voices</div><div class='add'>+    reserved PCM voices</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+Module snd-gusextreme</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+Module for Gravis UltraSound Extreme (Synergy ViperMax) sound card.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for ES-1688 chip (0x220,0x230,0x240,0x250,0x260)</div><div class='add'>+gf1_port</div><div class='add'>+    port # for GF1 chip (0x210,0x220,0x230,0x240,0x250,0x260,0x270)</div><div class='add'>+mpu_port</div><div class='add'>+    port # for MPU-401 port (0x300,0x310,0x320,0x330), -1 = disable</div><div class='add'>+irq</div><div class='add'>+    IRQ # for ES-1688 chip (5,7,9,10)</div><div class='add'>+gf1_irq</div><div class='add'>+    IRQ # for GF1 chip (3,5,9,11,12,15)</div><div class='add'>+mpu_irq</div><div class='add'>+    IRQ # for MPU-401 port (5,7,9,10)</div><div class='add'>+dma8</div><div class='add'>+    DMA # for ES-1688 chip (0,1,3)</div><div class='add'>+dma1</div><div class='add'>+    DMA # for GF1 chip (1,3,5,6,7)</div><div class='add'>+joystick_dac</div><div class='add'>+    0 to 31, (0.59V-4.52V or 0.389V-2.98V)</div><div class='add'>+voices</div><div class='add'>+    GF1 voices limit (14-32)</div><div class='add'>+pcm_voices</div><div class='add'>+    reserved PCM voices</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe (without MPU-401 port).</div><div class='add'>+</div><div class='add'>+Module snd-gusmax</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Gravis UltraSound MAX sound card.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for GF1 chip (0x220,0x230,0x240,0x250,0x260)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for GF1 chip (3,5,9,11,12,15)</div><div class='add'>+dma1</div><div class='add'>+    DMA # for GF1 chip (1,3,5,6,7)</div><div class='add'>+dma2</div><div class='add'>+    DMA # for GF1 chip (1,3,5,6,7,-1=disable)</div><div class='add'>+joystick_dac</div><div class='add'>+    0 to 31, (0.59V-4.52V or 0.389V-2.98V)</div><div class='add'>+voices</div><div class='add'>+    GF1 voices limit (14-32)</div><div class='add'>+pcm_voices</div><div class='add'>+    reserved PCM voices</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+Module snd-hda-intel</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Module for Intel HD Audio (ICH6, ICH6M, ESB2, ICH7, ICH8, ICH9, ICH10,</div><div class='add'>+PCH, SCH), ATI SB450, SB600, R600, RS600, RS690, RS780, RV610, RV620,</div><div class='add'>+RV630, RV635, RV670, RV770, VIA VT8251/VT8237A, SIS966, ULI M5461</div><div class='add'>+</div><div class='add'>+[Multiple options for each card instance]</div><div class='add'>+</div><div class='add'>+model</div><div class='add'>+    force the model name</div><div class='add'>+position_fix</div><div class='add'>+    Fix DMA pointer;</div><div class='add'>+    -1 = system default: choose appropriate one per controller hardware,</div><div class='add'>+    0 = auto: falls back to LPIB when POSBUF doesn't work,</div><div class='add'>+    1 = use LPIB,</div><div class='add'>+    2 = POSBUF: use position buffer,</div><div class='add'>+    3 = VIACOMBO: VIA-specific workaround for capture,</div><div class='add'>+    4 = COMBO: use LPIB for playback, auto for capture stream</div><div class='add'>+probe_mask</div><div class='add'>+    Bitmask to probe codecs (default = -1, meaning all slots);</div><div class='add'>+    When the bit 8 (0x100) is set, the lower 8 bits are used</div><div class='add'>+    as the "fixed" codec slots; i.e. the driver probes the</div><div class='add'>+    slots regardless what hardware reports back</div><div class='add'>+probe_only</div><div class='add'>+    Only probing and no codec initialization (default=off);</div><div class='add'>+    Useful to check the initial codec status for debugging</div><div class='add'>+bdl_pos_adj</div><div class='add'>+    Specifies the DMA IRQ timing delay in samples.</div><div class='add'>+    Passing -1 will make the driver to choose the appropriate</div><div class='add'>+    value based on the controller chip.</div><div class='add'>+patch</div><div class='add'>+    Specifies the early "patch" files to modify the HD-audio setup</div><div class='add'>+    before initializing the codecs.</div><div class='add'>+    This option is available only when ``CONFIG_SND_HDA_PATCH_LOADER=y``</div><div class='add'>+    is set.  See hd-audio/notes.rst for details.</div><div class='add'>+beep_mode</div><div class='add'>+    Selects the beep registration mode (0=off, 1=on);</div><div class='add'>+    default value is set via ``CONFIG_SND_HDA_INPUT_BEEP_MODE`` kconfig.</div><div class='add'>+</div><div class='add'>+[Single (global) options]</div><div class='add'>+</div><div class='add'>+single_cmd</div><div class='add'>+    Use single immediate commands to communicate with codecs</div><div class='add'>+    (for debugging only)</div><div class='add'>+enable_msi</div><div class='add'>+    Enable Message Signaled Interrupt (MSI) (default = off)</div><div class='add'>+power_save</div><div class='add'>+    Automatic power-saving timeout (in second, 0 = disable)</div><div class='add'>+power_save_controller</div><div class='add'>+    Reset HD-audio controller in power-saving mode (default = on)</div><div class='add'>+align_buffer_size</div><div class='add'>+    Force rounding of buffer/period sizes to multiples of 128 bytes.</div><div class='add'>+    This is more efficient in terms of memory access but isn't</div><div class='add'>+    required by the HDA spec and prevents users from specifying</div><div class='add'>+    exact period/buffer sizes. (default = on)</div><div class='add'>+snoop</div><div class='add'>+    Enable/disable snooping (default = on)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+See hd-audio/notes.rst for more details about HD-audio driver.</div><div class='add'>+</div><div class='add'>+Each codec may have a model table for different configurations.</div><div class='add'>+If your machine isn't listed there, the default (usually minimal)</div><div class='add'>+configuration is set up.  You can pass ``model=&lt;name&gt;`` option to</div><div class='add'>+specify a certain model in such a case.  There are different</div><div class='add'>+models depending on the codec chip.  The list of available models</div><div class='add'>+is found in hd-audio/models.rst.</div><div class='add'>+</div><div class='add'>+The model name ``generic`` is treated as a special case.  When this</div><div class='add'>+model is given, the driver uses the generic codec parser without</div><div class='add'>+"codec-patch".  It's sometimes good for testing and debugging.</div><div class='add'>+</div><div class='add'>+If the default configuration doesn't work and one of the above</div><div class='add'>+matches with your device, report it together with alsa-info.sh</div><div class='add'>+output (with ``--no-upload`` option) to kernel bugzilla or alsa-devel</div><div class='add'>+ML (see the section `Links and Addresses`_).</div><div class='add'>+</div><div class='add'>+``power_save`` and ``power_save_controller`` options are for power-saving</div><div class='add'>+mode.  See powersave.txt for details.</div><div class='add'>+</div><div class='add'>+Note 2: If you get click noises on output, try the module option</div><div class='add'>+``position_fix=1`` or ``2``.  ``position_fix=1`` will use the SD_LPIB</div><div class='add'>+register value without FIFO size correction as the current</div><div class='add'>+DMA pointer.  ``position_fix=2`` will make the driver to use</div><div class='add'>+the position buffer instead of reading SD_LPIB register.</div><div class='add'>+(Usually SD_LPIB register is more accurate than the</div><div class='add'>+position buffer.)</div><div class='add'>+</div><div class='add'>+``position_fix=3`` is specific to VIA devices.  The position</div><div class='add'>+of the capture stream is checked from both LPIB and POSBUF</div><div class='add'>+values.  ``position_fix=4`` is a combination mode, using LPIB</div><div class='add'>+for playback and POSBUF for capture.</div><div class='add'>+</div><div class='add'>+NB: If you get many ``azx_get_response timeout`` messages at</div><div class='add'>+loading, it's likely a problem of interrupts (e.g. ACPI irq</div><div class='add'>+routing).  Try to boot with options like ``pci=noacpi``.  Also, you</div><div class='add'>+can try ``single_cmd=1`` module option.  This will switch the</div><div class='add'>+communication method between HDA controller and codecs to the</div><div class='add'>+single immediate commands instead of CORB/RIRB.  Basically, the</div><div class='add'>+single command mode is provided only for BIOS, and you won't get</div><div class='add'>+unsolicited events, too.  But, at least, this works independently</div><div class='add'>+from the irq.  Remember this is a last resort, and should be</div><div class='add'>+avoided as much as possible...</div><div class='add'>+</div><div class='add'>+MORE NOTES ON ``azx_get_response timeout`` PROBLEMS:</div><div class='add'>+On some hardware, you may need to add a proper probe_mask option</div><div class='add'>+to avoid the ``azx_get_response timeout`` problem above, instead.</div><div class='add'>+This occurs when the access to non-existing or non-working codec slot</div><div class='add'>+(likely a modem one) causes a stall of the communication via HD-audio</div><div class='add'>+bus.  You can see which codec slots are probed by enabling</div><div class='add'>+``CONFIG_SND_DEBUG_VERBOSE``, or simply from the file name of the codec</div><div class='add'>+proc files.  Then limit the slots to probe by probe_mask option.</div><div class='add'>+For example, ``probe_mask=1`` means to probe only the first slot, and</div><div class='add'>+``probe_mask=4`` means only the third slot.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-hdsp</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Module for RME Hammerfall DSP audio interface(s)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Note: The firmware data can be automatically loaded via hotplug</div><div class='add'>+when ``CONFIG_FW_LOADER`` is set.  Otherwise, you need to load</div><div class='add'>+the firmware via hdsploader utility included in alsa-tools</div><div class='add'>+package.</div><div class='add'>+The firmware data is found in alsa-firmware package.</div><div class='add'>+</div><div class='add'>+Note: snd-page-alloc module does the job which snd-hammerfall-mem</div><div class='add'>+module did formerly.  It will allocate the buffers in advance</div><div class='add'>+when any HDSP cards are found.  To make the buffer</div><div class='add'>+allocation sure, load snd-page-alloc module in the early</div><div class='add'>+stage of boot sequence.  See `Early Buffer Allocation`_</div><div class='add'>+section.</div><div class='add'>+</div><div class='add'>+Module snd-hdspm</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for RME HDSP MADI board.</div><div class='add'>+</div><div class='add'>+precise_ptr</div><div class='add'>+    Enable precise pointer, or disable.</div><div class='add'>+line_outs_monitor</div><div class='add'>+    Send playback streams to analog outs by default.</div><div class='add'>+enable_monitor</div><div class='add'>+    Enable Analog Out on Channel 63/64 by default.</div><div class='add'>+</div><div class='add'>+See hdspm.txt for details.</div><div class='add'>+</div><div class='add'>+Module snd-ice1712</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Envy24 (ICE1712) based PCI sound cards.</div><div class='add'>+</div><div class='add'>+* MidiMan M Audio Delta 1010</div><div class='add'>+* MidiMan M Audio Delta 1010LT</div><div class='add'>+* MidiMan M Audio Delta DiO 2496</div><div class='add'>+* MidiMan M Audio Delta 66</div><div class='add'>+* MidiMan M Audio Delta 44</div><div class='add'>+* MidiMan M Audio Delta 410</div><div class='add'>+* MidiMan M Audio Audiophile 2496</div><div class='add'>+* TerraTec EWS 88MT</div><div class='add'>+* TerraTec EWS 88D</div><div class='add'>+* TerraTec EWX 24/96</div><div class='add'>+* TerraTec DMX 6Fire</div><div class='add'>+* TerraTec Phase 88</div><div class='add'>+* Hoontech SoundTrack DSP 24</div><div class='add'>+* Hoontech SoundTrack DSP 24 Value</div><div class='add'>+* Hoontech SoundTrack DSP 24 Media 7.1</div><div class='add'>+* Event Electronics, EZ8</div><div class='add'>+* Digigram VX442</div><div class='add'>+* Lionstracs, Mediastaton</div><div class='add'>+* Terrasoniq TS 88</div><div class='add'>+			</div><div class='add'>+model</div><div class='add'>+    Use the given board model, one of the following:</div><div class='add'>+    delta1010, dio2496, delta66, delta44, audiophile, delta410,</div><div class='add'>+    delta1010lt, vx442, ewx2496, ews88mt, ews88mt_new, ews88d,</div><div class='add'>+    dmx6fire, dsp24, dsp24_value, dsp24_71, ez8,</div><div class='add'>+    phase88, mediastation</div><div class='add'>+omni</div><div class='add'>+    Omni I/O support for MidiMan M-Audio Delta44/66</div><div class='add'>+cs8427_timeout</div><div class='add'>+    reset timeout for the CS8427 chip (S/PDIF transceiver) in msec</div><div class='add'>+    resolution, default value is 500 (0.5 sec)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+Note: The consumer part is not used with all Envy24 based cards (for</div><div class='add'>+example in the MidiMan Delta siree).</div><div class='add'>+</div><div class='add'>+Note: The supported board is detected by reading EEPROM or PCI</div><div class='add'>+SSID (if EEPROM isn't available).  You can override the</div><div class='add'>+model by passing ``model`` module option in case that the</div><div class='add'>+driver isn't configured properly or you want to try another</div><div class='add'>+type for testing.</div><div class='add'>+</div><div class='add'>+Module snd-ice1724</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Envy24HT (VT/ICE1724), Envy24PT (VT1720) based PCI sound cards.</div><div class='add'>+</div><div class='add'>+* MidiMan M Audio Revolution 5.1</div><div class='add'>+* MidiMan M Audio Revolution 7.1</div><div class='add'>+* MidiMan M Audio Audiophile 192</div><div class='add'>+* AMP Ltd AUDIO2000</div><div class='add'>+* TerraTec Aureon 5.1 Sky</div><div class='add'>+* TerraTec Aureon 7.1 Space</div><div class='add'>+* TerraTec Aureon 7.1 Universe</div><div class='add'>+* TerraTec Phase 22</div><div class='add'>+* TerraTec Phase 28</div><div class='add'>+* AudioTrak Prodigy 7.1</div><div class='add'>+* AudioTrak Prodigy 7.1 LT</div><div class='add'>+* AudioTrak Prodigy 7.1 XT</div><div class='add'>+* AudioTrak Prodigy 7.1 HIFI</div><div class='add'>+* AudioTrak Prodigy 7.1 HD2</div><div class='add'>+* AudioTrak Prodigy 192</div><div class='add'>+* Pontis MS300</div><div class='add'>+* Albatron K8X800 Pro II </div><div class='add'>+* Chaintech ZNF3-150</div><div class='add'>+* Chaintech ZNF3-250</div><div class='add'>+* Chaintech 9CJS</div><div class='add'>+* Chaintech AV-710</div><div class='add'>+* Shuttle SN25P</div><div class='add'>+* Onkyo SE-90PCI</div><div class='add'>+* Onkyo SE-200PCI</div><div class='add'>+* ESI Juli@</div><div class='add'>+* ESI Maya44</div><div class='add'>+* Hercules Fortissimo IV</div><div class='add'>+* EGO-SYS WaveTerminal 192M</div><div class='add'>+			</div><div class='add'>+model</div><div class='add'>+    Use the given board model, one of the following:</div><div class='add'>+    revo51, revo71, amp2000, prodigy71, prodigy71lt,</div><div class='add'>+    prodigy71xt, prodigy71hifi, prodigyhd2, prodigy192,</div><div class='add'>+    juli, aureon51, aureon71, universe, ap192, k8x800,</div><div class='add'>+    phase22, phase28, ms300, av710, se200pci, se90pci,</div><div class='add'>+    fortissimo4, sn25p, WT192M, maya44</div><div class='add'>+  </div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+Note: The supported board is detected by reading EEPROM or PCI</div><div class='add'>+SSID (if EEPROM isn't available).  You can override the</div><div class='add'>+model by passing ``model`` module option in case that the</div><div class='add'>+driver isn't configured properly or you want to try another</div><div class='add'>+type for testing.</div><div class='add'>+</div><div class='add'>+Module snd-indigo</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio Indigo</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-indigodj</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio Indigo DJ</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-indigoio</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio Indigo IO</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-intel8x0</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Module for AC'97 motherboards from Intel and compatibles.</div><div class='add'>+</div><div class='add'>+* Intel i810/810E, i815, i820, i830, i84x, MX440 ICH5, ICH6, ICH7,</div><div class='add'>+  6300ESB, ESB2 </div><div class='add'>+* SiS 7012 (SiS 735)</div><div class='add'>+* NVidia NForce, NForce2, NForce3, MCP04, CK804 CK8, CK8S, MCP501</div><div class='add'>+* AMD AMD768, AMD8111</div><div class='add'>+* ALi m5455</div><div class='add'>+	  </div><div class='add'>+ac97_clock</div><div class='add'>+    AC'97 codec clock base (0 = auto-detect)</div><div class='add'>+ac97_quirk</div><div class='add'>+    AC'97 workaround for strange hardware;</div><div class='add'>+    See `AC97 Quirk Option`_ section below.</div><div class='add'>+buggy_irq</div><div class='add'>+    Enable workaround for buggy interrupts on some motherboards</div><div class='add'>+    (default yes on nForce chips, otherwise off)</div><div class='add'>+buggy_semaphore</div><div class='add'>+    Enable workaround for hardware with buggy semaphores (e.g. on some</div><div class='add'>+    ASUS laptops) (default off)</div><div class='add'>+spdif_aclink</div><div class='add'>+    Use S/PDIF over AC-link instead of direct connection from the</div><div class='add'>+    controller chip (0 = off, 1 = on, -1 = default)</div><div class='add'>+</div><div class='add'>+This module supports one chip and autoprobe.</div><div class='add'>+</div><div class='add'>+Note: the latest driver supports auto-detection of chip clock.</div><div class='add'>+if you still encounter too fast playback, specify the clock</div><div class='add'>+explicitly via the module option ``ac97_clock=41194``.</div><div class='add'>+</div><div class='add'>+Joystick/MIDI ports are not supported by this driver.  If your</div><div class='add'>+motherboard has these devices, use the ns558 or snd-mpu401</div><div class='add'>+modules, respectively.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-intel8x0m</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Module for Intel ICH (i8x0) chipset MC97 modems.</div><div class='add'>+</div><div class='add'>+* Intel i810/810E, i815, i820, i830, i84x, MX440 ICH5, ICH6, ICH7</div><div class='add'>+* SiS 7013 (SiS 735)</div><div class='add'>+* NVidia NForce, NForce2, NForce2s, NForce3</div><div class='add'>+* AMD AMD8111</div><div class='add'>+* ALi m5455</div><div class='add'>+	  </div><div class='add'>+ac97_clock</div><div class='add'>+    AC'97 codec clock base (0 = auto-detect)</div><div class='add'>+  </div><div class='add'>+This module supports one card and autoprobe.</div><div class='add'>+</div><div class='add'>+Note: The default index value of this module is -2, i.e. the first</div><div class='add'>+slot is excluded.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-interwave</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Module for Gravis UltraSound PnP, Dynasonic 3-D/Pro, STB Sound Rage 32</div><div class='add'>+and other sound cards based on AMD InterWave (tm) chip.</div><div class='add'>+</div><div class='add'>+joystick_dac</div><div class='add'>+    0 to 31, (0.59V-4.52V or 0.389V-2.98V)</div><div class='add'>+midi</div><div class='add'>+    1 = MIDI UART enable, 0 = MIDI UART disable (default)</div><div class='add'>+pcm_voices</div><div class='add'>+    reserved PCM voices for the synthesizer (default 2)</div><div class='add'>+effect</div><div class='add'>+    1 = InterWave effects enable (default 0); requires 8 voices</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+with ``isapnp=0``, the following options are available:</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for InterWave chip (0x210,0x220,0x230,0x240,0x250,0x260)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for InterWave chip (3,5,9,11,12,15)</div><div class='add'>+dma1</div><div class='add'>+    DMA # for InterWave chip (0,1,3,5,6,7)</div><div class='add'>+dma2</div><div class='add'>+    DMA # for InterWave chip (0,1,3,5,6,7,-1=disable)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards, autoprobe and ISA PnP.</div><div class='add'>+</div><div class='add'>+Module snd-interwave-stb</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+Module for UltraSound 32-Pro (sound card from STB used by Compaq)</div><div class='add'>+and other sound cards based on AMD InterWave (tm) chip with TEA6330T</div><div class='add'>+circuit for extended control of bass, treble and master volume.</div><div class='add'>+</div><div class='add'>+joystick_dac</div><div class='add'>+    0 to 31, (0.59V-4.52V or 0.389V-2.98V)</div><div class='add'>+midi</div><div class='add'>+    1 = MIDI UART enable, 0 = MIDI UART disable (default)</div><div class='add'>+pcm_voices</div><div class='add'>+    reserved PCM voices for the synthesizer (default 2)</div><div class='add'>+effect</div><div class='add'>+    1 = InterWave effects enable (default 0); requires 8 voices</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+with ``isapnp=0``, the following options are available:</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for InterWave chip (0x210,0x220,0x230,0x240,0x250,0x260)</div><div class='add'>+port_tc</div><div class='add'>+    tone control (i2c bus) port # for TEA6330T chip (0x350,0x360,0x370,0x380)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for InterWave chip (3,5,9,11,12,15)</div><div class='add'>+dma1</div><div class='add'>+    DMA # for InterWave chip (0,1,3,5,6,7)</div><div class='add'>+dma2</div><div class='add'>+    DMA # for InterWave chip (0,1,3,5,6,7,-1=disable)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards, autoprobe and ISA PnP.</div><div class='add'>+</div><div class='add'>+Module snd-jazz16</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Module for Media Vision Jazz16 chipset. The chipset consists of 3 chips:</div><div class='add'>+MVD1216 + MVA416 + MVA514.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for SB DSP chip (0x210,0x220,0x230,0x240,0x250,0x260)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for SB DSP chip (3,5,7,9,10,15)</div><div class='add'>+dma8</div><div class='add'>+    DMA # for SB DSP chip (1,3)</div><div class='add'>+dma16</div><div class='add'>+    DMA # for SB DSP chip (5,7)</div><div class='add'>+mpu_port</div><div class='add'>+    MPU-401 port # (0x300,0x310,0x320,0x330)</div><div class='add'>+mpu_irq</div><div class='add'>+    MPU-401 irq # (2,3,5,7)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-korg1212</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Module for Korg 1212 IO PCI card</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-layla20</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio Layla20</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-layla24</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio Layla24</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-lola</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Module for Digigram Lola PCI-e boards</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-lx6464es</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Module for Digigram LX6464ES boards</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-maestro3</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Module for Allegro/Maestro3 chips</div><div class='add'>+</div><div class='add'>+external_amp</div><div class='add'>+    enable external amp (enabled by default)</div><div class='add'>+amp_gpio</div><div class='add'>+    GPIO pin number for external amp (0-15) or -1 for default pin (8</div><div class='add'>+    for allegro, 1 for others) </div><div class='add'>+</div><div class='add'>+This module supports autoprobe and multiple chips.</div><div class='add'>+</div><div class='add'>+Note: the binding of amplifier is dependent on hardware.</div><div class='add'>+If there is no sound even though all channels are unmuted, try to</div><div class='add'>+specify other gpio connection via amp_gpio option. </div><div class='add'>+For example, a Panasonic notebook might need ``amp_gpio=0x0d``</div><div class='add'>+option.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-mia</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio Mia</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-miro</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Module for Miro soundcards: miroSOUND PCM 1 pro, miroSOUND PCM 12,</div><div class='add'>+miroSOUND PCM 20 Radio.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    Port # (0x530,0x604,0xe80,0xf40)</div><div class='add'>+irq</div><div class='add'>+    IRQ # (5,7,9,10,11)</div><div class='add'>+dma1</div><div class='add'>+    1st dma # (0,1,3)</div><div class='add'>+dma2</div><div class='add'>+    2nd dma # (0,1)</div><div class='add'>+mpu_port</div><div class='add'>+    MPU-401 port # (0x300,0x310,0x320,0x330)</div><div class='add'>+mpu_irq</div><div class='add'>+    MPU-401 irq # (5,7,9,10)</div><div class='add'>+fm_port</div><div class='add'>+    FM Port # (0x388)</div><div class='add'>+wss</div><div class='add'>+    enable WSS mode</div><div class='add'>+ide</div><div class='add'>+    enable onboard ide support</div><div class='add'>+</div><div class='add'>+Module snd-mixart</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Digigram miXart8 sound cards.</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+Note: One miXart8 board will be represented as 4 alsa cards.</div><div class='add'>+See MIXART.txt for details.</div><div class='add'>+</div><div class='add'>+When the driver is compiled as a module and the hotplug firmware</div><div class='add'>+is supported, the firmware data is loaded via hotplug automatically.</div><div class='add'>+Install the necessary firmware files in alsa-firmware package.</div><div class='add'>+When no hotplug fw loader is available, you need to load the</div><div class='add'>+firmware via mixartloader utility in alsa-tools package.</div><div class='add'>+</div><div class='add'>+Module snd-mona</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Module for Echoaudio Mona</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-mpu401</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for MPU-401 UART devices.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port number or -1 (disable)</div><div class='add'>+irq</div><div class='add'>+    IRQ number or -1 (disable)</div><div class='add'>+pnp</div><div class='add'>+    PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+This module supports multiple devices and PnP.</div><div class='add'>+</div><div class='add'>+Module snd-msnd-classic</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Module for Turtle Beach MultiSound Classic, Tahiti or Monterey</div><div class='add'>+soundcards.</div><div class='add'>+</div><div class='add'>+io</div><div class='add'>+    Port # for msnd-classic card</div><div class='add'>+irq</div><div class='add'>+    IRQ # for msnd-classic card</div><div class='add'>+mem</div><div class='add'>+    Memory address (0xb0000, 0xc8000, 0xd0000, 0xd8000, 0xe0000 or 0xe8000)</div><div class='add'>+write_ndelay</div><div class='add'>+    enable write ndelay (default = 1)</div><div class='add'>+calibrate_signal</div><div class='add'>+    calibrate signal (default = 0)</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+digital</div><div class='add'>+    Digital daughterboard present (default = 0)</div><div class='add'>+cfg</div><div class='add'>+    Config port (0x250, 0x260 or 0x270) default = PnP</div><div class='add'>+reset</div><div class='add'>+    Reset all devices</div><div class='add'>+mpu_io</div><div class='add'>+    MPU401 I/O port</div><div class='add'>+mpu_irq</div><div class='add'>+    MPU401 irq#</div><div class='add'>+ide_io0</div><div class='add'>+    IDE port #0</div><div class='add'>+ide_io1</div><div class='add'>+    IDE port #1</div><div class='add'>+ide_irq</div><div class='add'>+    IDE irq#</div><div class='add'>+joystick_io</div><div class='add'>+    Joystick I/O port</div><div class='add'>+</div><div class='add'>+The driver requires firmware files ``turtlebeach/msndinit.bin`` and</div><div class='add'>+``turtlebeach/msndperm.bin`` in the proper firmware directory.</div><div class='add'>+</div><div class='add'>+See Documentation/sound/oss/MultiSound for important information</div><div class='add'>+about this driver.  Note that it has been discontinued, but the </div><div class='add'>+Voyetra Turtle Beach knowledge base entry for it is still available</div><div class='add'>+at</div><div class='add'>+http://www.turtlebeach.com</div><div class='add'>+</div><div class='add'>+Module snd-msnd-pinnacle</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+Module for Turtle Beach MultiSound Pinnacle/Fiji soundcards.</div><div class='add'>+</div><div class='add'>+io</div><div class='add'>+    Port # for pinnacle/fiji card</div><div class='add'>+irq</div><div class='add'>+    IRQ # for pinnalce/fiji card</div><div class='add'>+mem</div><div class='add'>+    Memory address (0xb0000, 0xc8000, 0xd0000, 0xd8000, 0xe0000 or 0xe8000)</div><div class='add'>+write_ndelay</div><div class='add'>+    enable write ndelay (default = 1)</div><div class='add'>+calibrate_signal</div><div class='add'>+    calibrate signal (default = 0)</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+The driver requires firmware files ``turtlebeach/pndspini.bin`` and</div><div class='add'>+``turtlebeach/pndsperm.bin`` in the proper firmware directory.</div><div class='add'>+</div><div class='add'>+Module snd-mtpav</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for MOTU MidiTimePiece AV multiport MIDI (on the parallel</div><div class='add'>+port).</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    I/O port # for MTPAV (0x378,0x278, default=0x378)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for MTPAV (7,5, default=7)</div><div class='add'>+hwports</div><div class='add'>+    number of supported hardware ports, default=8.</div><div class='add'>+</div><div class='add'>+Module supports only 1 card.  This module has no enable option.</div><div class='add'>+</div><div class='add'>+Module snd-mts64</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for Ego Systems (ESI) Miditerminal 4140</div><div class='add'>+</div><div class='add'>+This module supports multiple devices.</div><div class='add'>+Requires parport (``CONFIG_PARPORT``).</div><div class='add'>+</div><div class='add'>+Module snd-nm256</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for NeoMagic NM256AV/ZX chips</div><div class='add'>+</div><div class='add'>+playback_bufsize</div><div class='add'>+    max playback frame size in kB (4-128kB)</div><div class='add'>+capture_bufsize</div><div class='add'>+    max capture frame size in kB (4-128kB)</div><div class='add'>+force_ac97</div><div class='add'>+    0 or 1 (disabled by default)</div><div class='add'>+buffer_top</div><div class='add'>+    specify buffer top address</div><div class='add'>+use_cache</div><div class='add'>+    0 or 1 (disabled by default)</div><div class='add'>+vaio_hack</div><div class='add'>+    alias buffer_top=0x25a800</div><div class='add'>+reset_workaround</div><div class='add'>+    enable AC97 RESET workaround for some laptops</div><div class='add'>+reset_workaround2</div><div class='add'>+    enable extended AC97 RESET workaround for some other laptops</div><div class='add'>+</div><div class='add'>+This module supports one chip and autoprobe.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Note: on some notebooks the buffer address cannot be detected</div><div class='add'>+automatically, or causes hang-up during initialization.</div><div class='add'>+In such a case, specify the buffer top address explicitly via</div><div class='add'>+the buffer_top option.</div><div class='add'>+For example,</div><div class='add'>+Sony F250: buffer_top=0x25a800</div><div class='add'>+Sony F270: buffer_top=0x272800</div><div class='add'>+The driver supports only ac97 codec.  It's possible to force</div><div class='add'>+to initialize/use ac97 although it's not detected.  In such a</div><div class='add'>+case, use ``force_ac97=1`` option - but *NO* guarantee whether it</div><div class='add'>+works!</div><div class='add'>+</div><div class='add'>+Note: The NM256 chip can be linked internally with non-AC97</div><div class='add'>+codecs.  This driver supports only the AC97 codec, and won't work</div><div class='add'>+with machines with other (most likely CS423x or OPL3SAx) chips,</div><div class='add'>+even though the device is detected in lspci.  In such a case, try</div><div class='add'>+other drivers, e.g. snd-cs4232 or snd-opl3sa2.  Some has ISA-PnP</div><div class='add'>+but some doesn't have ISA PnP.  You'll need to specify ``isapnp=0``</div><div class='add'>+and proper hardware parameters in the case without ISA PnP.</div><div class='add'>+</div><div class='add'>+Note: some laptops need a workaround for AC97 RESET.  For the</div><div class='add'>+known hardware like Dell Latitude LS and Sony PCG-F305, this</div><div class='add'>+workaround is enabled automatically.  For other laptops with a</div><div class='add'>+hard freeze, you can try ``reset_workaround=1`` option.</div><div class='add'>+</div><div class='add'>+Note: Dell Latitude CSx laptops have another problem regarding</div><div class='add'>+AC97 RESET.  On these laptops, reset_workaround2 option is</div><div class='add'>+turned on as default.  This option is worth to try if the</div><div class='add'>+previous reset_workaround option doesn't help.</div><div class='add'>+</div><div class='add'>+Note: This driver is really crappy.  It's a porting from the</div><div class='add'>+OSS driver, which is a result of black-magic reverse engineering.</div><div class='add'>+The detection of codec will fail if the driver is loaded *after*</div><div class='add'>+X-server as described above.  You might be able to force to load</div><div class='add'>+the module, but it may result in hang-up.   Hence, make sure that</div><div class='add'>+you load this module *before* X if you encounter this kind of</div><div class='add'>+problem.</div><div class='add'>+</div><div class='add'>+Module snd-opl3sa2</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Yamaha OPL3-SA2/SA3 sound cards.</div><div class='add'>+</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+with ``isapnp=0``, the following options are available:</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    control port # for OPL3-SA chip (0x370)</div><div class='add'>+sb_port</div><div class='add'>+    SB port # for OPL3-SA chip (0x220,0x240)</div><div class='add'>+wss_port</div><div class='add'>+    WSS port # for OPL3-SA chip (0x530,0xe80,0xf40,0x604)</div><div class='add'>+midi_port</div><div class='add'>+    port # for MPU-401 UART (0x300,0x330), -1 = disable</div><div class='add'>+fm_port</div><div class='add'>+    FM port # for OPL3-SA chip (0x388), -1 = disable</div><div class='add'>+irq</div><div class='add'>+    IRQ # for OPL3-SA chip (5,7,9,10)</div><div class='add'>+dma1</div><div class='add'>+    first DMA # for Yamaha OPL3-SA chip (0,1,3)</div><div class='add'>+dma2</div><div class='add'>+    second DMA # for Yamaha OPL3-SA chip (0,1,3), -1 = disable</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and ISA PnP.  It does not support</div><div class='add'>+autoprobe (if ISA PnP is not used) thus all ports must be specified!!!</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-opti92x-ad1848</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on OPTi 82c92x and Analog Devices AD1848 chips.</div><div class='add'>+Module works with OAK Mozart cards as well.</div><div class='add'>+</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+with ``isapnp=0``, the following options are available:</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for WSS chip (0x530,0xe80,0xf40,0x604)</div><div class='add'>+mpu_port</div><div class='add'>+    port # for MPU-401 UART (0x300,0x310,0x320,0x330)</div><div class='add'>+fm_port</div><div class='add'>+    port # for OPL3 device (0x388)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for WSS chip (5,7,9,10,11)</div><div class='add'>+mpu_irq</div><div class='add'>+    IRQ # for MPU-401 UART (5,7,9,10)</div><div class='add'>+dma1</div><div class='add'>+    first DMA # for WSS chip (0,1,3)</div><div class='add'>+</div><div class='add'>+This module supports only one card, autoprobe and PnP.</div><div class='add'>+</div><div class='add'>+Module snd-opti92x-cs4231</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on OPTi 82c92x and Crystal CS4231 chips.</div><div class='add'>+</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+with ``isapnp=0``, the following options are available:</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for WSS chip (0x530,0xe80,0xf40,0x604)</div><div class='add'>+mpu_port</div><div class='add'>+    port # for MPU-401 UART (0x300,0x310,0x320,0x330)</div><div class='add'>+fm_port</div><div class='add'>+    port # for OPL3 device (0x388)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for WSS chip (5,7,9,10,11)</div><div class='add'>+mpu_irq</div><div class='add'>+    IRQ # for MPU-401 UART (5,7,9,10)</div><div class='add'>+dma1</div><div class='add'>+    first DMA # for WSS chip (0,1,3)</div><div class='add'>+dma2</div><div class='add'>+    second DMA # for WSS chip (0,1,3)</div><div class='add'>+</div><div class='add'>+This module supports only one card, autoprobe and PnP.</div><div class='add'>+</div><div class='add'>+Module snd-opti93x</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on OPTi 82c93x chips.</div><div class='add'>+</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+with ``isapnp=0``, the following options are available:</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for WSS chip (0x530,0xe80,0xf40,0x604)</div><div class='add'>+mpu_port</div><div class='add'>+    port # for MPU-401 UART (0x300,0x310,0x320,0x330)</div><div class='add'>+fm_port</div><div class='add'>+    port # for OPL3 device (0x388)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for WSS chip (5,7,9,10,11)</div><div class='add'>+mpu_irq</div><div class='add'>+    IRQ # for MPU-401 UART (5,7,9,10)</div><div class='add'>+dma1</div><div class='add'>+    first DMA # for WSS chip (0,1,3)</div><div class='add'>+dma2</div><div class='add'>+    second DMA # for WSS chip (0,1,3)</div><div class='add'>+</div><div class='add'>+This module supports only one card, autoprobe and PnP.</div><div class='add'>+</div><div class='add'>+Module snd-oxygen</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on the C-Media CMI8786/8787/8788 chip:</div><div class='add'>+</div><div class='add'>+* Asound A-8788</div><div class='add'>+* Asus Xonar DG/DGX</div><div class='add'>+* AuzenTech X-Meridian</div><div class='add'>+* AuzenTech X-Meridian 2G</div><div class='add'>+* Bgears b-Enspirer</div><div class='add'>+* Club3D Theatron DTS</div><div class='add'>+* HT-Omega Claro (plus)</div><div class='add'>+* HT-Omega Claro halo (XT)</div><div class='add'>+* Kuroutoshikou CMI8787-HG2PCI</div><div class='add'>+* Razer Barracuda AC-1</div><div class='add'>+* Sondigo Inferno</div><div class='add'>+* TempoTec HiFier Fantasia</div><div class='add'>+* TempoTec HiFier Serenade</div><div class='add'>+    </div><div class='add'>+This module supports autoprobe and multiple cards.</div><div class='add'>+  </div><div class='add'>+Module snd-pcsp</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Module for internal PC-Speaker.</div><div class='add'>+</div><div class='add'>+nopcm</div><div class='add'>+    Disable PC-Speaker PCM sound. Only beeps remain.</div><div class='add'>+nforce_wa</div><div class='add'>+    enable NForce chipset workaround. Expect bad sound.</div><div class='add'>+</div><div class='add'>+This module supports system beeps, some kind of PCM playback and</div><div class='add'>+even a few mixer controls.</div><div class='add'>+</div><div class='add'>+Module snd-pcxhr</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for Digigram PCXHR boards</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-portman2x4</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+Module for Midiman Portman 2x4 parallel port MIDI interface</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-powermac (on ppc only)</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+Module for PowerMac, iMac and iBook on-board soundchips</div><div class='add'>+</div><div class='add'>+enable_beep</div><div class='add'>+    enable beep using PCM (enabled as default)</div><div class='add'>+</div><div class='add'>+Module supports autoprobe a chip.</div><div class='add'>+</div><div class='add'>+Note: the driver may have problems regarding endianness.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-pxa2xx-ac97 (on arm only)</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+Module for AC97 driver for the Intel PXA2xx chip</div><div class='add'>+</div><div class='add'>+For ARM architecture only.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-riptide</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Conexant Riptide chip</div><div class='add'>+</div><div class='add'>+joystick_port</div><div class='add'>+    Joystick port # (default: 0x200)</div><div class='add'>+mpu_port</div><div class='add'>+    MPU401 port # (default: 0x330)</div><div class='add'>+opl3_port</div><div class='add'>+    OPL3 port # (default: 0x388)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+You need to install the firmware file ``riptide.hex`` to the standard</div><div class='add'>+firmware path (e.g. /lib/firmware).</div><div class='add'>+</div><div class='add'>+Module snd-rme32</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for RME Digi32, Digi32 Pro and Digi32/8 (Sek'd Prodif32, </div><div class='add'>+Prodif96 and Prodif Gold) sound cards.</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-rme96</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for RME Digi96, Digi96/8 and Digi96/8 PRO/PAD/PST sound cards.</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-rme9652</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for RME Digi9652 (Hammerfall, Hammerfall-Light) sound cards.</div><div class='add'>+</div><div class='add'>+precise_ptr</div><div class='add'>+    Enable precise pointer (doesn't work reliably). (default = 0)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Note: snd-page-alloc module does the job which snd-hammerfall-mem</div><div class='add'>+module did formerly.  It will allocate the buffers in advance</div><div class='add'>+when any RME9652 cards are found.  To make the buffer</div><div class='add'>+allocation sure, load snd-page-alloc module in the early</div><div class='add'>+stage of boot sequence.  See `Early Buffer Allocation`_</div><div class='add'>+section.</div><div class='add'>+</div><div class='add'>+Module snd-sa11xx-uda1341 (on arm only)</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+Module for Philips UDA1341TS on Compaq iPAQ H3600 sound card.</div><div class='add'>+</div><div class='add'>+Module supports only one card.</div><div class='add'>+Module has no enable and index options.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-sb8</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Module for 8-bit SoundBlaster cards: SoundBlaster 1.0, SoundBlaster 2.0,</div><div class='add'>+SoundBlaster Pro</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for SB DSP chip (0x220,0x240,0x260)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for SB DSP chip (5,7,9,10)</div><div class='add'>+dma8</div><div class='add'>+    DMA # for SB DSP chip (1,3)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-sb16 and snd-sbawe</div><div class='add'>+-----------------------------</div><div class='add'>+</div><div class='add'>+Module for 16-bit SoundBlaster cards: SoundBlaster 16 (PnP),</div><div class='add'>+SoundBlaster AWE 32 (PnP), SoundBlaster AWE 64 PnP</div><div class='add'>+</div><div class='add'>+mic_agc</div><div class='add'>+    Mic Auto-Gain-Control - 0 = disable, 1 = enable (default)</div><div class='add'>+csp</div><div class='add'>+    ASP/CSP chip support - 0 = disable (default), 1 = enable</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+with isapnp=0, the following options are available:</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for SB DSP 4.x chip (0x220,0x240,0x260)</div><div class='add'>+mpu_port</div><div class='add'>+    port # for MPU-401 UART (0x300,0x330), -1 = disable</div><div class='add'>+awe_port</div><div class='add'>+    base port # for EMU8000 synthesizer (0x620,0x640,0x660) (snd-sbawe</div><div class='add'>+    module only)</div><div class='add'>+irq</div><div class='add'>+    IRQ # for SB DSP 4.x chip (5,7,9,10)</div><div class='add'>+dma8</div><div class='add'>+    8-bit DMA # for SB DSP 4.x chip (0,1,3)</div><div class='add'>+dma16</div><div class='add'>+    16-bit DMA # for SB DSP 4.x chip (5,6,7)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards, autoprobe and ISA PnP.</div><div class='add'>+</div><div class='add'>+Note: To use Vibra16X cards in 16-bit half duplex mode, you must</div><div class='add'>+disable 16bit DMA with dma16 = -1 module parameter.</div><div class='add'>+Also, all Sound Blaster 16 type cards can operate in 16-bit</div><div class='add'>+half duplex mode through 8-bit DMA channel by disabling their</div><div class='add'>+16-bit DMA channel.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-sc6000</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Gallant SC-6000 soundcard and later models: SC-6600 and</div><div class='add'>+SC-7000.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    Port # (0x220 or 0x240)</div><div class='add'>+mss_port</div><div class='add'>+    MSS Port # (0x530 or 0xe80)</div><div class='add'>+irq</div><div class='add'>+    IRQ # (5,7,9,10,11)</div><div class='add'>+mpu_irq</div><div class='add'>+    MPU-401 IRQ # (5,7,9,10) ,0 - no MPU-401 irq</div><div class='add'>+dma</div><div class='add'>+    DMA # (1,3,0)</div><div class='add'>+joystick</div><div class='add'>+    Enable gameport - 0 = disable (default), 1 = enable</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+This card is also known as Audio Excel DSP 16 or Zoltrix AV302.</div><div class='add'>+</div><div class='add'>+Module snd-sscape</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for ENSONIQ SoundScape cards.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    Port # (PnP setup)</div><div class='add'>+wss_port</div><div class='add'>+    WSS Port # (PnP setup)</div><div class='add'>+irq</div><div class='add'>+    IRQ # (PnP setup)</div><div class='add'>+mpu_irq</div><div class='add'>+    MPU-401 IRQ # (PnP setup)</div><div class='add'>+dma</div><div class='add'>+    DMA # (PnP setup)</div><div class='add'>+dma2</div><div class='add'>+    2nd DMA # (PnP setup, -1 to disable)</div><div class='add'>+joystick</div><div class='add'>+    Enable gameport - 0 = disable (default), 1 = enable</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+Module snd-sun-amd7930 (on sparc only)</div><div class='add'>+--------------------------------------</div><div class='add'>+</div><div class='add'>+Module for AMD7930 sound chips found on Sparcs.</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-sun-cs4231 (on sparc only)</div><div class='add'>+-------------------------------------</div><div class='add'>+</div><div class='add'>+Module for CS4231 sound chips found on Sparcs.</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-sun-dbri (on sparc only)</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+Module for DBRI sound chips found on Sparcs.</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-wavefront</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Module for Turtle Beach Maui, Tropez and Tropez+ sound cards.</div><div class='add'>+</div><div class='add'>+use_cs4232_midi</div><div class='add'>+    Use CS4232 MPU-401 interface</div><div class='add'>+    (inaccessibly located inside your computer)</div><div class='add'>+isapnp</div><div class='add'>+    ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='add'>+</div><div class='add'>+with isapnp=0, the following options are available:</div><div class='add'>+</div><div class='add'>+cs4232_pcm_port</div><div class='add'>+    Port # for CS4232 PCM interface.</div><div class='add'>+cs4232_pcm_irq</div><div class='add'>+    IRQ # for CS4232 PCM interface (5,7,9,11,12,15).</div><div class='add'>+cs4232_mpu_port</div><div class='add'>+    Port # for CS4232 MPU-401 interface.</div><div class='add'>+cs4232_mpu_irq</div><div class='add'>+    IRQ # for CS4232 MPU-401 interface (9,11,12,15).</div><div class='add'>+ics2115_port</div><div class='add'>+    Port # for ICS2115</div><div class='add'>+ics2115_irq</div><div class='add'>+    IRQ # for ICS2115</div><div class='add'>+fm_port</div><div class='add'>+    FM OPL-3 Port #</div><div class='add'>+dma1</div><div class='add'>+    DMA1 # for CS4232 PCM interface.</div><div class='add'>+dma2</div><div class='add'>+    DMA2 # for CS4232 PCM interface.</div><div class='add'>+</div><div class='add'>+The below are options for wavefront_synth features:</div><div class='add'>+</div><div class='add'>+wf_raw</div><div class='add'>+    Assume that we need to boot the OS (default:no);</div><div class='add'>+    If yes, then during driver loading, the state of the board is</div><div class='add'>+    ignored, and we reset the board and load the firmware anyway.</div><div class='add'>+fx_raw</div><div class='add'>+    Assume that the FX process needs help (default:yes);</div><div class='add'>+    If false, we'll leave the FX processor in whatever state it is</div><div class='add'>+    when the driver is loaded.  The default is to download the</div><div class='add'>+    microprogram and associated coefficients to set it up for</div><div class='add'>+    "default" operation, whatever that means.</div><div class='add'>+debug_default</div><div class='add'>+    Debug parameters for card initialization</div><div class='add'>+wait_usecs</div><div class='add'>+    How long to wait without sleeping, usecs (default:150);</div><div class='add'>+    This magic number seems to give pretty optimal throughput</div><div class='add'>+    based on my limited experimentation. </div><div class='add'>+    If you want to play around with it and find a better value, be</div><div class='add'>+    my guest. Remember, the idea is to get a number that causes us</div><div class='add'>+    to just busy wait for as many WaveFront commands as possible,</div><div class='add'>+    without coming up with a number so large that we hog the whole</div><div class='add'>+    CPU. </div><div class='add'>+    Specifically, with this number, out of about 134,000 status</div><div class='add'>+    waits, only about 250 result in a sleep. </div><div class='add'>+sleep_interval</div><div class='add'>+    How long to sleep when waiting for reply (default: 100)</div><div class='add'>+sleep_tries</div><div class='add'>+    How many times to try sleeping during a wait (default: 50)</div><div class='add'>+ospath</div><div class='add'>+    Pathname to processed ICS2115 OS firmware (default:wavefront.os);</div><div class='add'>+    The path name of the ISC2115 OS firmware.  In the recent</div><div class='add'>+    version, it's handled via firmware loader framework, so it</div><div class='add'>+    must be installed in the proper path, typically,</div><div class='add'>+    /lib/firmware.</div><div class='add'>+reset_time</div><div class='add'>+    How long to wait for a reset to take effect (default:2)</div><div class='add'>+ramcheck_time</div><div class='add'>+    How many seconds to wait for the RAM test (default:20)</div><div class='add'>+osrun_time</div><div class='add'>+    How many seconds to wait for the ICS2115 OS (default:10)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and ISA PnP.</div><div class='add'>+</div><div class='add'>+Note: the firmware file ``wavefront.os`` was located in the earlier</div><div class='add'>+version in /etc.  Now it's loaded via firmware loader, and</div><div class='add'>+must be in the proper firmware path, such as /lib/firmware.</div><div class='add'>+Copy (or symlink) the file appropriately if you get an error</div><div class='add'>+regarding firmware downloading after upgrading the kernel.</div><div class='add'>+</div><div class='add'>+Module snd-sonicvibes</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+Module for S3 SonicVibes PCI sound cards.</div><div class='add'>+* PINE Schubert 32 PCI</div><div class='add'>+  </div><div class='add'>+reverb</div><div class='add'>+    Reverb Enable - 1 = enable, 0 = disable (default);</div><div class='add'>+    SoundCard must have onboard SRAM for this.</div><div class='add'>+mge</div><div class='add'>+    Mic Gain Enable - 1 = enable, 0 = disable (default)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+Module snd-serial-u16550</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+Module for UART16550A serial MIDI ports.</div><div class='add'>+</div><div class='add'>+port</div><div class='add'>+    port # for UART16550A chip</div><div class='add'>+irq</div><div class='add'>+    IRQ # for UART16550A chip, -1 = poll mode</div><div class='add'>+speed</div><div class='add'>+    speed in bauds (9600,19200,38400,57600,115200)</div><div class='add'>+    38400 = default</div><div class='add'>+base</div><div class='add'>+    base for divisor in bauds (57600,115200,230400,460800)</div><div class='add'>+    115200 = default</div><div class='add'>+outs</div><div class='add'>+    number of MIDI ports in a serial port (1-4)</div><div class='add'>+    1 = default</div><div class='add'>+adaptor</div><div class='add'>+    Type of adaptor.</div><div class='add'>+	0 = Soundcanvas, 1 = MS-124T, 2 = MS-124W S/A,</div><div class='add'>+	3 = MS-124W M/B, 4 = Generic</div><div class='add'>+</div><div class='add'>+This module supports multiple cards. This module does not support autoprobe</div><div class='add'>+thus the main port must be specified!!! Other options are optional.</div><div class='add'>+</div><div class='add'>+Module snd-trident</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for Trident 4DWave DX/NX sound cards.</div><div class='add'>+* Best Union  Miss Melody 4DWave PCI</div><div class='add'>+* HIS  4DWave PCI</div><div class='add'>+* Warpspeed  ONSpeed 4DWave PCI</div><div class='add'>+* AzTech  PCI 64-Q3D</div><div class='add'>+* Addonics  SV 750</div><div class='add'>+* CHIC  True Sound 4Dwave</div><div class='add'>+* Shark  Predator4D-PCI</div><div class='add'>+* Jaton  SonicWave 4D</div><div class='add'>+* SiS SI7018 PCI Audio</div><div class='add'>+* Hoontech SoundTrack Digital 4DWave NX</div><div class='add'>+		    </div><div class='add'>+pcm_channels</div><div class='add'>+    max channels (voices) reserved for PCM</div><div class='add'>+wavetable_size</div><div class='add'>+    max wavetable size in kB (4-?kb)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards and autoprobe.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-ua101</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for the Edirol UA-101/UA-1000 audio/MIDI interfaces.</div><div class='add'>+</div><div class='add'>+This module supports multiple devices, autoprobe and hotplugging.</div><div class='add'>+</div><div class='add'>+Module snd-usb-audio</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Module for USB audio and USB MIDI devices.</div><div class='add'>+</div><div class='add'>+vid</div><div class='add'>+    Vendor ID for the device (optional)</div><div class='add'>+pid</div><div class='add'>+    Product ID for the device (optional)</div><div class='add'>+nrpacks</div><div class='add'>+    Max. number of packets per URB (default: 8)</div><div class='add'>+device_setup</div><div class='add'>+    Device specific magic number (optional);</div><div class='add'>+    Influence depends on the device</div><div class='add'>+    Default: 0x0000 </div><div class='add'>+ignore_ctl_error</div><div class='add'>+    Ignore any USB-controller regarding mixer interface (default: no)</div><div class='add'>+autoclock</div><div class='add'>+    Enable auto-clock selection for UAC2 devices (default: yes)</div><div class='add'>+quirk_alias</div><div class='add'>+    Quirk alias list, pass strings like ``0123abcd:5678beef``, which</div><div class='add'>+    applies the existing quirk for the device 5678:beef to a new</div><div class='add'>+    device 0123:abcd.</div><div class='add'>+</div><div class='add'>+This module supports multiple devices, autoprobe and hotplugging.</div><div class='add'>+</div><div class='add'>+NB: ``nrpacks`` parameter can be modified dynamically via sysfs.</div><div class='add'>+Don't put the value over 20.  Changing via sysfs has no sanity</div><div class='add'>+check.</div><div class='add'>+</div><div class='add'>+NB: ``ignore_ctl_error=1`` may help when you get an error at accessing</div><div class='add'>+the mixer element such as URB error -22.  This happens on some</div><div class='add'>+buggy USB device or the controller.</div><div class='add'>+</div><div class='add'>+NB: quirk_alias option is provided only for testing / development.</div><div class='add'>+If you want to have a proper support, contact to upstream for</div><div class='add'>+adding the matching quirk in the driver code statically.</div><div class='add'>+</div><div class='add'>+Module snd-usb-caiaq</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Module for caiaq UB audio interfaces,</div><div class='add'>+</div><div class='add'>+* Native Instruments RigKontrol2</div><div class='add'>+* Native Instruments Kore Controller</div><div class='add'>+* Native Instruments Audio Kontrol 1</div><div class='add'>+* Native Instruments Audio 8 DJ</div><div class='add'>+	</div><div class='add'>+This module supports multiple devices, autoprobe and hotplugging.</div><div class='add'>+  </div><div class='add'>+Module snd-usb-usx2y</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Module for Tascam USB US-122, US-224 and US-428 devices.</div><div class='add'>+</div><div class='add'>+This module supports multiple devices, autoprobe and hotplugging.</div><div class='add'>+</div><div class='add'>+Note: you need to load the firmware via ``usx2yloader`` utility included</div><div class='add'>+in alsa-tools and alsa-firmware packages.</div><div class='add'>+</div><div class='add'>+Module snd-via82xx</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for AC'97 motherboards based on VIA 82C686A/686B, 8233, 8233A,</div><div class='add'>+8233C, 8235, 8237 (south) bridge.</div><div class='add'>+</div><div class='add'>+mpu_port</div><div class='add'>+    0x300,0x310,0x320,0x330, otherwise obtain BIOS setup</div><div class='add'>+    [VIA686A/686B only]</div><div class='add'>+joystick</div><div class='add'>+    Enable joystick (default off) [VIA686A/686B only]</div><div class='add'>+ac97_clock</div><div class='add'>+    AC'97 codec clock base (default 48000Hz)</div><div class='add'>+dxs_support</div><div class='add'>+    support DXS channels, 0 = auto (default), 1 = enable, 2 = disable,</div><div class='add'>+    3 = 48k only, 4 = no VRA, 5 = enable any sample rate and different</div><div class='add'>+    sample rates on different channels [VIA8233/C, 8235, 8237 only]</div><div class='add'>+ac97_quirk</div><div class='add'>+    AC'97 workaround for strange hardware;</div><div class='add'>+    See `AC97 Quirk Option`_ section below.</div><div class='add'>+</div><div class='add'>+This module supports one chip and autoprobe.</div><div class='add'>+</div><div class='add'>+Note: on some SMP motherboards like MSI 694D the interrupts might</div><div class='add'>+not be generated properly.  In such a case, please try to</div><div class='add'>+set the SMP (or MPS) version on BIOS to 1.1 instead of</div><div class='add'>+default value 1.4.  Then the interrupt number will be</div><div class='add'>+assigned under 15. You might also upgrade your BIOS.</div><div class='add'>+</div><div class='add'>+Note: VIA8233/5/7 (not VIA8233A) can support DXS (direct sound)</div><div class='add'>+channels as the first PCM.  On these channels, up to 4</div><div class='add'>+streams can be played at the same time, and the controller</div><div class='add'>+can perform sample rate conversion with separate rates for</div><div class='add'>+each channel.</div><div class='add'>+As default (``dxs_support = 0``), 48k fixed rate is chosen</div><div class='add'>+except for the known devices since the output is often</div><div class='add'>+noisy except for 48k on some mother boards due to the</div><div class='add'>+bug of BIOS.</div><div class='add'>+Please try once ``dxs_support=5`` and if it works on other</div><div class='add'>+sample rates (e.g. 44.1kHz of mp3 playback), please let us</div><div class='add'>+know the PCI subsystem vendor/device id's (output of</div><div class='add'>+``lspci -nv``).</div><div class='add'>+If ``dxs_support=5`` does not work, try ``dxs_support=4``; if it</div><div class='add'>+doesn't work too, try dxs_support=1.  (dxs_support=1 is</div><div class='add'>+usually for old motherboards.  The correct implemented</div><div class='add'>+board should work with 4 or 5.)  If it still doesn't</div><div class='add'>+work and the default setting is ok, ``dxs_support=3`` is the</div><div class='add'>+right choice.  If the default setting doesn't work at all,</div><div class='add'>+try ``dxs_support=2`` to disable the DXS channels.</div><div class='add'>+In any cases, please let us know the result and the</div><div class='add'>+subsystem vendor/device ids.  See `Links and Addresses`_</div><div class='add'>+below.</div><div class='add'>+</div><div class='add'>+Note: for the MPU401 on VIA823x, use snd-mpu401 driver</div><div class='add'>+additionally.  The mpu_port option is for VIA686 chips only.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-via82xx-modem</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+Module for VIA82xx AC97 modem</div><div class='add'>+</div><div class='add'>+ac97_clock</div><div class='add'>+    AC'97 codec clock base (default 48000Hz)</div><div class='add'>+</div><div class='add'>+This module supports one card and autoprobe.</div><div class='add'>+</div><div class='add'>+Note: The default index value of this module is -2, i.e. the first</div><div class='add'>+slot is excluded.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-virmidi</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Module for virtual rawmidi devices.</div><div class='add'>+This module creates virtual rawmidi devices which communicate</div><div class='add'>+to the corresponding ALSA sequencer ports.</div><div class='add'>+</div><div class='add'>+midi_devs</div><div class='add'>+    MIDI devices # (1-4, default=4)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-virtuoso</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Module for sound cards based on the Asus AV66/AV100/AV200 chips,</div><div class='add'>+i.e., Xonar D1, DX, D2, D2X, DS, DSX, Essence ST (Deluxe),</div><div class='add'>+Essence STX (II), HDAV1.3 (Deluxe), and HDAV1.3 Slim.</div><div class='add'>+</div><div class='add'>+This module supports autoprobe and multiple cards.</div><div class='add'>+</div><div class='add'>+Module snd-vx222</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Module for Digigram VX-Pocket VX222, V222 v2 and Mic cards.</div><div class='add'>+</div><div class='add'>+mic</div><div class='add'>+    Enable Microphone on V222 Mic (NYI)</div><div class='add'>+ibl</div><div class='add'>+    Capture IBL size. (default = 0, minimum size)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.</div><div class='add'>+</div><div class='add'>+When the driver is compiled as a module and the hotplug firmware</div><div class='add'>+is supported, the firmware data is loaded via hotplug automatically.</div><div class='add'>+Install the necessary firmware files in alsa-firmware package.</div><div class='add'>+When no hotplug fw loader is available, you need to load the</div><div class='add'>+firmware via vxloader utility in alsa-tools package.  To invoke</div><div class='add'>+vxloader automatically, add the following to /etc/modprobe.d/alsa.conf</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  install snd-vx222 /sbin/modprobe --first-time -i snd-vx222\</div><div class='add'>+    &amp;&amp; /usr/bin/vxloader</div><div class='add'>+</div><div class='add'>+(for 2.2/2.4 kernels, add ``post-install /usr/bin/vxloader`` to</div><div class='add'>+/etc/modules.conf, instead.)</div><div class='add'>+IBL size defines the interrupts period for PCM.  The smaller size</div><div class='add'>+gives smaller latency but leads to more CPU consumption, too.</div><div class='add'>+The size is usually aligned to 126.  As default (=0), the smallest</div><div class='add'>+size is chosen.  The possible IBL values can be found in</div><div class='add'>+/proc/asound/cardX/vx-status proc file.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-vxpocket</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Module for Digigram VX-Pocket VX2 and 440 PCMCIA cards.</div><div class='add'>+</div><div class='add'>+ibl</div><div class='add'>+    Capture IBL size. (default = 0, minimum size)</div><div class='add'>+</div><div class='add'>+This module supports multiple cards.  The module is compiled only when</div><div class='add'>+PCMCIA is supported on kernel.</div><div class='add'>+</div><div class='add'>+With the older 2.6.x kernel, to activate the driver via the card</div><div class='add'>+manager, you'll need to set up /etc/pcmcia/vxpocket.conf.  See the</div><div class='add'>+sound/pcmcia/vx/vxpocket.c.  2.6.13 or later kernel requires no</div><div class='add'>+longer require a config file.</div><div class='add'>+</div><div class='add'>+When the driver is compiled as a module and the hotplug firmware</div><div class='add'>+is supported, the firmware data is loaded via hotplug automatically.</div><div class='add'>+Install the necessary firmware files in alsa-firmware package.</div><div class='add'>+When no hotplug fw loader is available, you need to load the</div><div class='add'>+firmware via vxloader utility in alsa-tools package.</div><div class='add'>+</div><div class='add'>+About capture IBL, see the description of snd-vx222 module.</div><div class='add'>+</div><div class='add'>+Note: snd-vxp440 driver is merged to snd-vxpocket driver since</div><div class='add'>+ALSA 1.0.10.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-ymfpci</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Module for Yamaha PCI chips (YMF72x, YMF74x &amp; YMF75x).</div><div class='add'>+</div><div class='add'>+mpu_port</div><div class='add'>+    0x300,0x330,0x332,0x334, 0 (disable) by default,</div><div class='add'>+    1 (auto-detect for YMF744/754 only)</div><div class='add'>+fm_port</div><div class='add'>+    0x388,0x398,0x3a0,0x3a8, 0 (disable) by default</div><div class='add'>+    1 (auto-detect for YMF744/754 only)</div><div class='add'>+joystick_port</div><div class='add'>+    0x201,0x202,0x204,0x205, 0 (disable) by default,</div><div class='add'>+    1 (auto-detect)</div><div class='add'>+rear_switch</div><div class='add'>+    enable shared rear/line-in switch (bool)</div><div class='add'>+</div><div class='add'>+This module supports autoprobe and multiple chips.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+Module snd-pdaudiocf</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Module for Sound Core PDAudioCF sound card.</div><div class='add'>+</div><div class='add'>+The power-management is supported.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AC97 Quirk Option</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+The ac97_quirk option is used to enable/override the workaround for</div><div class='add'>+specific devices on drivers for on-board AC'97 controllers like</div><div class='add'>+snd-intel8x0.  Some hardware have swapped output pins between Master</div><div class='add'>+and Headphone, or Surround (thanks to confusion of AC'97</div><div class='add'>+specifications from version to version :-)</div><div class='add'>+</div><div class='add'>+The driver provides the auto-detection of known problematic devices,</div><div class='add'>+but some might be unknown or wrongly detected.  In such a case, pass</div><div class='add'>+the proper value with this option.</div><div class='add'>+</div><div class='add'>+The following strings are accepted:</div><div class='add'>+</div><div class='add'>+default</div><div class='add'>+    Don't override the default setting</div><div class='add'>+none</div><div class='add'>+    Disable the quirk</div><div class='add'>+hp_only</div><div class='add'>+    Bind Master and Headphone controls as a single control</div><div class='add'>+swap_hp</div><div class='add'>+    Swap headphone and master controls</div><div class='add'>+swap_surround</div><div class='add'>+    Swap master and surround controls</div><div class='add'>+ad_sharing</div><div class='add'>+    For AD1985, turn on OMS bit and use headphone</div><div class='add'>+alc_jack</div><div class='add'>+    For ALC65x, turn on the jack sense mode</div><div class='add'>+inv_eapd</div><div class='add'>+    Inverted EAPD implementation</div><div class='add'>+mute_led</div><div class='add'>+    Bind EAPD bit for turning on/off mute LED</div><div class='add'>+</div><div class='add'>+For backward compatibility, the corresponding integer value -1, 0, ...</div><div class='add'>+are  accepted, too.</div><div class='add'>+</div><div class='add'>+For example, if ``Master`` volume control has no effect on your device</div><div class='add'>+but only ``Headphone`` does, pass ac97_quirk=hp_only module option.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Configuring Non-ISAPNP Cards</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+When the kernel is configured with ISA-PnP support, the modules</div><div class='add'>+supporting the isapnp cards will have module options ``isapnp``.</div><div class='add'>+If this option is set, *only* the ISA-PnP devices will be probed.</div><div class='add'>+For probing the non ISA-PnP cards, you have to pass ``isapnp=0`` option</div><div class='add'>+together with the proper i/o and irq configuration.</div><div class='add'>+</div><div class='add'>+When the kernel is configured without ISA-PnP support, isapnp option</div><div class='add'>+will be not built in.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Module Autoloading Support</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+The ALSA drivers can be loaded automatically on demand by defining</div><div class='add'>+module aliases.  The string ``snd-card-%1`` is requested for ALSA native</div><div class='add'>+devices where ``%i`` is sound card number from zero to seven.</div><div class='add'>+</div><div class='add'>+To auto-load an ALSA driver for OSS services, define the string</div><div class='add'>+``sound-slot-%i`` where ``%i`` means the slot number for OSS, which</div><div class='add'>+corresponds to the card index of ALSA.  Usually, define this</div><div class='add'>+as the same card module.</div><div class='add'>+</div><div class='add'>+An example configuration for a single emu10k1 card is like below:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    ----- /etc/modprobe.d/alsa.conf</div><div class='add'>+    alias snd-card-0 snd-emu10k1</div><div class='add'>+    alias sound-slot-0 snd-emu10k1</div><div class='add'>+    ----- /etc/modprobe.d/alsa.conf</div><div class='add'>+</div><div class='add'>+The available number of auto-loaded sound cards depends on the module</div><div class='add'>+option ``cards_limit`` of snd module.  As default it's set to 1.</div><div class='add'>+To enable the auto-loading of multiple cards, specify the number of</div><div class='add'>+sound cards in that option.</div><div class='add'>+</div><div class='add'>+When multiple cards are available, it'd better to specify the index</div><div class='add'>+number for each card via module option, too, so that the order of</div><div class='add'>+cards is kept consistent.</div><div class='add'>+</div><div class='add'>+An example configuration for two sound cards is like below:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    ----- /etc/modprobe.d/alsa.conf</div><div class='add'>+    # ALSA portion</div><div class='add'>+    options snd cards_limit=2</div><div class='add'>+    alias snd-card-0 snd-interwave</div><div class='add'>+    alias snd-card-1 snd-ens1371</div><div class='add'>+    options snd-interwave index=0</div><div class='add'>+    options snd-ens1371 index=1</div><div class='add'>+    # OSS/Free portion</div><div class='add'>+    alias sound-slot-0 snd-interwave</div><div class='add'>+    alias sound-slot-1 snd-ens1371</div><div class='add'>+    ----- /etc/modprobe.d/alsa.conf</div><div class='add'>+</div><div class='add'>+In this example, the interwave card is always loaded as the first card</div><div class='add'>+(index 0) and ens1371 as the second (index 1).</div><div class='add'>+</div><div class='add'>+Alternative (and new) way to fixate the slot assignment is to use</div><div class='add'>+``slots`` option of snd module.  In the case above, specify like the</div><div class='add'>+following: </div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    options snd slots=snd-interwave,snd-ens1371</div><div class='add'>+</div><div class='add'>+Then, the first slot (#0) is reserved for snd-interwave driver, and</div><div class='add'>+the second (#1) for snd-ens1371.  You can omit index option in each</div><div class='add'>+driver if slots option is used (although you can still have them at</div><div class='add'>+the same time as long as they don't conflict).</div><div class='add'>+</div><div class='add'>+The slots option is especially useful for avoiding the possible</div><div class='add'>+hot-plugging and the resultant slot conflict.  For example, in the</div><div class='add'>+case above again, the first two slots are already reserved.  If any</div><div class='add'>+other driver (e.g. snd-usb-audio) is loaded before snd-interwave or</div><div class='add'>+snd-ens1371, it will be assigned to the third or later slot.</div><div class='add'>+</div><div class='add'>+When a module name is given with '!', the slot will be given for any</div><div class='add'>+modules but that name.  For example, ``slots=!snd-pcsp`` will reserve</div><div class='add'>+the first slot for any modules but snd-pcsp. </div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ALSA PCM devices to OSS devices mapping</div><div class='add'>+=======================================</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    /dev/snd/pcmC0D0[c|p]  -&gt; /dev/audio0 (/dev/audio) -&gt; minor 4</div><div class='add'>+    /dev/snd/pcmC0D0[c|p]  -&gt; /dev/dsp0 (/dev/dsp)     -&gt; minor 3</div><div class='add'>+    /dev/snd/pcmC0D1[c|p]  -&gt; /dev/adsp0 (/dev/adsp)   -&gt; minor 12</div><div class='add'>+    /dev/snd/pcmC1D0[c|p]  -&gt; /dev/audio1              -&gt; minor 4+16 = 20</div><div class='add'>+    /dev/snd/pcmC1D0[c|p]  -&gt; /dev/dsp1                -&gt; minor 3+16 = 19</div><div class='add'>+    /dev/snd/pcmC1D1[c|p]  -&gt; /dev/adsp1               -&gt; minor 12+16 = 28</div><div class='add'>+    /dev/snd/pcmC2D0[c|p]  -&gt; /dev/audio2              -&gt; minor 4+32 = 36</div><div class='add'>+    /dev/snd/pcmC2D0[c|p]  -&gt; /dev/dsp2                -&gt; minor 3+32 = 39</div><div class='add'>+    /dev/snd/pcmC2D1[c|p]  -&gt; /dev/adsp2               -&gt; minor 12+32 = 44</div><div class='add'>+</div><div class='add'>+The first number from ``/dev/snd/pcmC{X}D{Y}[c|p]`` expression means</div><div class='add'>+sound card number and second means device number.  The ALSA devices</div><div class='add'>+have either ``c`` or ``p`` suffix indicating the direction, capture and</div><div class='add'>+playback, respectively.</div><div class='add'>+</div><div class='add'>+Please note that the device mapping above may be varied via the module</div><div class='add'>+options of snd-pcm-oss module.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Proc interfaces (/proc/asound)</div><div class='add'>+==============================</div><div class='add'>+</div><div class='add'>+/proc/asound/card#/pcm#[cp]/oss</div><div class='add'>+-------------------------------</div><div class='add'>+erase</div><div class='add'>+    erase all additional information about OSS applications</div><div class='add'>+</div><div class='add'>+&lt;app_name&gt; &lt;fragments&gt; &lt;fragment_size&gt; [&lt;options&gt;]</div><div class='add'>+    &lt;app_name&gt;</div><div class='add'>+	name of application with (higher priority) or without path</div><div class='add'>+    &lt;fragments&gt;</div><div class='add'>+	 number of fragments or zero if auto</div><div class='add'>+    &lt;fragment_size&gt;</div><div class='add'>+	 size of fragment in bytes or zero if auto</div><div class='add'>+    &lt;options&gt;</div><div class='add'>+	optional parameters</div><div class='add'>+</div><div class='add'>+	disable</div><div class='add'>+	    the application tries to open a pcm device for</div><div class='add'>+	    this channel but does not want to use it.</div><div class='add'>+	    (Cause a bug or mmap needs)</div><div class='add'>+	    It's good for Quake etc...</div><div class='add'>+	direct</div><div class='add'>+	    don't use plugins</div><div class='add'>+	block</div><div class='add'>+	     force block mode (rvplayer)</div><div class='add'>+	non-block</div><div class='add'>+	    force non-block mode</div><div class='add'>+	whole-frag</div><div class='add'>+	    write only whole fragments (optimization affecting</div><div class='add'>+	    playback only)</div><div class='add'>+	no-silence</div><div class='add'>+	    do not fill silence ahead to avoid clicks</div><div class='add'>+	buggy-ptr</div><div class='add'>+	    Returns the whitespace blocks in GETOPTR ioctl</div><div class='add'>+	    instead of filled blocks</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    echo "x11amp 128 16384" &gt; /proc/asound/card0/pcm0p/oss</div><div class='add'>+    echo "squake 0 0 disable" &gt; /proc/asound/card0/pcm0c/oss</div><div class='add'>+    echo "rvplayer 0 0 block" &gt; /proc/asound/card0/pcm0p/oss</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Early Buffer Allocation</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+Some drivers (e.g. hdsp) require the large contiguous buffers, and</div><div class='add'>+sometimes it's too late to find such spaces when the driver module is</div><div class='add'>+actually loaded due to memory fragmentation.  You can pre-allocate the</div><div class='add'>+PCM buffers by loading snd-page-alloc module and write commands to its</div><div class='add'>+proc file in prior, for example, in the early boot stage like</div><div class='add'>+``/etc/init.d/*.local`` scripts.</div><div class='add'>+</div><div class='add'>+Reading the proc file /proc/drivers/snd-page-alloc shows the current</div><div class='add'>+usage of page allocation.  In writing, you can send the following</div><div class='add'>+commands to the snd-page-alloc driver:</div><div class='add'>+</div><div class='add'>+* add VENDOR DEVICE MASK SIZE BUFFERS</div><div class='add'>+</div><div class='add'>+VENDOR and DEVICE are PCI vendor and device IDs.  They take</div><div class='add'>+integer numbers (0x prefix is needed for the hex).</div><div class='add'>+MASK is the PCI DMA mask.  Pass 0 if not restricted.</div><div class='add'>+SIZE is the size of each buffer to allocate.  You can pass</div><div class='add'>+k and m suffix for KB and MB.  The max number is 16MB.</div><div class='add'>+BUFFERS is the number of buffers to allocate.  It must be greater</div><div class='add'>+than 0.  The max number is 4.</div><div class='add'>+</div><div class='add'>+* erase</div><div class='add'>+</div><div class='add'>+This will erase the all pre-allocated buffers which are not in</div><div class='add'>+use.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Links and Addresses</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+ALSA project homepage</div><div class='add'>+    http://www.alsa-project.org</div><div class='add'>+Kernel Bugzilla</div><div class='add'>+    http://bugzilla.kernel.org/</div><div class='add'>+ALSA Developers ML</div><div class='add'>+    mailto:alsa-devel@alsa-project.org</div><div class='add'>+alsa-info.sh script</div><div class='add'>+    http://www.alsa-project.org/alsa-info.sh</div><div class='head'>diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt<br/>deleted file mode 100644<br/>index fc53ccd9a629..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/ALSA-Configuration.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/ALSA-Configuration.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2330 +0,0 @@</div><div class='del'>-</div><div class='del'>-		Advanced Linux Sound Architecture - Driver</div><div class='del'>-		==========================================</div><div class='del'>-			    Configuration guide</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Kernel Configuration</div><div class='del'>-====================</div><div class='del'>-</div><div class='del'>-To enable ALSA support you need at least to build the kernel with</div><div class='del'>-primary sound card support (CONFIG_SOUND).  Since ALSA can emulate OSS,</div><div class='del'>-you don't have to choose any of the OSS modules.</div><div class='del'>-</div><div class='del'>-Enable "OSS API emulation" (CONFIG_SND_OSSEMUL) and both OSS mixer and</div><div class='del'>-PCM supports if you want to run OSS applications with ALSA.</div><div class='del'>-</div><div class='del'>-If you want to support the WaveTable functionality on cards such as</div><div class='del'>-SB Live! then you need to enable "Sequencer support"</div><div class='del'>-(CONFIG_SND_SEQUENCER).</div><div class='del'>-</div><div class='del'>-To make ALSA debug messages more verbose, enable the "Verbose printk"</div><div class='del'>-and "Debug" options.  To check for memory leaks, turn on "Debug memory"</div><div class='del'>-too.  "Debug detection" will add checks for the detection of cards.</div><div class='del'>-</div><div class='del'>-Please note that all the ALSA ISA drivers support the Linux isapnp API</div><div class='del'>-(if the card supports ISA PnP).  You don't need to configure the cards</div><div class='del'>-using isapnptools.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Creating ALSA devices</div><div class='del'>-=====================</div><div class='del'>-</div><div class='del'>-This depends on your distribution, but normally you use the /dev/MAKEDEV</div><div class='del'>-script to create the necessary device nodes.  On some systems you use a</div><div class='del'>-script named 'snddevices'.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Module parameters</div><div class='del'>-=================</div><div class='del'>-</div><div class='del'>-The user can load modules with options. If the module supports more than</div><div class='del'>-one card and you have more than one card of the same type then you can</div><div class='del'>-specify multiple values for the option separated by commas.</div><div class='del'>-</div><div class='del'>-Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='del'>-</div><div class='del'>-  Module snd</div><div class='del'>-  ----------</div><div class='del'>-</div><div class='del'>-    The core ALSA module.  It is used by all ALSA card drivers.</div><div class='del'>-    It takes the following options which have global effects.</div><div class='del'>-</div><div class='del'>-    major	- major number for sound driver</div><div class='del'>-		- Default: 116</div><div class='del'>-    cards_limit</div><div class='del'>-		- limiting card index for auto-loading (1-8)</div><div class='del'>-		- Default: 1</div><div class='del'>-		- For auto-loading more than one card, specify this</div><div class='del'>-		  option together with snd-card-X aliases.</div><div class='del'>-    slots	- Reserve the slot index for the given driver.</div><div class='del'>-		  This option takes multiple strings.		</div><div class='del'>-		  See "Module Autoloading Support" section for details.</div><div class='del'>-    debug	- Specifies the debug message level</div><div class='del'>-		  (0 = disable debug prints, 1 = normal debug messages,</div><div class='del'>-		   2 = verbose debug messages)</div><div class='del'>-		  This option appears only when CONFIG_SND_DEBUG=y.</div><div class='del'>-		  This option can be dynamically changed via sysfs</div><div class='del'>-		  /sys/modules/snd/parameters/debug file.</div><div class='del'>-  </div><div class='del'>-  Module snd-pcm-oss</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    The PCM OSS emulation module.</div><div class='del'>-    This module takes options which change the mapping of devices.</div><div class='del'>-</div><div class='del'>-    dsp_map	- PCM device number maps assigned to the 1st OSS device.</div><div class='del'>-		- Default: 0</div><div class='del'>-    adsp_map	- PCM device number maps assigned to the 2st OSS device.</div><div class='del'>-		- Default: 1</div><div class='del'>-    nonblock_open</div><div class='del'>-		- Don't block opening busy PCM devices.  Default: 1</div><div class='del'>-</div><div class='del'>-    For example, when dsp_map=2, /dev/dsp will be mapped to PCM #2 of</div><div class='del'>-    the card #0.  Similarly, when adsp_map=0, /dev/adsp will be mapped</div><div class='del'>-    to PCM #0 of the card #0.</div><div class='del'>-    For changing the second or later card, specify the option with</div><div class='del'>-    commas, such like "dsp_map=0,1".</div><div class='del'>-</div><div class='del'>-    nonblock_open option is used to change the behavior of the PCM</div><div class='del'>-    regarding opening the device.  When this option is non-zero,</div><div class='del'>-    opening a busy OSS PCM device won't be blocked but return</div><div class='del'>-    immediately with EAGAIN (just like O_NONBLOCK flag).</div><div class='del'>-    </div><div class='del'>-  Module snd-rawmidi</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    This module takes options which change the mapping of devices.</div><div class='del'>-    similar to those of the snd-pcm-oss module.</div><div class='del'>-</div><div class='del'>-    midi_map	- MIDI device number maps assigned to the 1st OSS device.</div><div class='del'>-		- Default: 0</div><div class='del'>-    amidi_map	- MIDI device number maps assigned to the 2st OSS device.</div><div class='del'>-		- Default: 1</div><div class='del'>-</div><div class='del'>-  Common parameters for top sound card modules</div><div class='del'>-  --------------------------------------------</div><div class='del'>-</div><div class='del'>-    Each of top level sound card module takes the following options.</div><div class='del'>-</div><div class='del'>-    index	- index (slot #) of sound card</div><div class='del'>-		- Values: 0 through 31 or negative</div><div class='del'>-		- If nonnegative, assign that index number</div><div class='del'>-                - if negative, interpret as a bitmask of permissible</div><div class='del'>-		  indices; the first free permitted index is assigned</div><div class='del'>-		- Default: -1</div><div class='del'>-    id		- card ID (identifier or name)</div><div class='del'>-		- Can be up to 15 characters long</div><div class='del'>-		- Default: the card type</div><div class='del'>-		- A directory by this name is created under /proc/asound/</div><div class='del'>-		  containing information about the card</div><div class='del'>-		- This ID can be used instead of the index number in</div><div class='del'>-		  identifying the card</div><div class='del'>-    enable  	- enable card</div><div class='del'>-		- Default: enabled, for PCI and ISA PnP cards</div><div class='del'>-</div><div class='del'>-  Module snd-adlib</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for AdLib FM cards.</div><div class='del'>-</div><div class='del'>-    port	- port # for OPL chip</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards. It does not support autoprobe, so</div><div class='del'>-    the port must be specified. For actual AdLib FM cards it will be 0x388.</div><div class='del'>-    Note that this card does not have PCM support and no mixer; only FM</div><div class='del'>-    synthesis.</div><div class='del'>-</div><div class='del'>-    Make sure you have "sbiload" from the alsa-tools package available and,</div><div class='del'>-    after loading the module, find out the assigned ALSA sequencer port</div><div class='del'>-    number through "sbiload -l". Example output:</div><div class='del'>-</div><div class='del'>-      Port     Client name                       Port name</div><div class='del'>-      64:0     OPL2 FM synth                     OPL2 FM Port</div><div class='del'>-</div><div class='del'>-    Load the std.sb and drums.sb patches also supplied by sbiload:</div><div class='del'>-</div><div class='del'>-      sbiload -p 64:0 std.sb drums.sb</div><div class='del'>-</div><div class='del'>-    If you use this driver to drive an OPL3, you can use std.o3 and drums.o3</div><div class='del'>-    instead. To have the card produce sound, use aplaymidi from alsa-utils:</div><div class='del'>-</div><div class='del'>-      aplaymidi -p 64:0 foo.mid</div><div class='del'>-</div><div class='del'>-  Module snd-ad1816a</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on Analog Devices AD1816A/AD1815 ISA chips.</div><div class='del'>-</div><div class='del'>-    clockfreq   - Clock frequency for AD1816A chip (default = 0, 33000Hz)</div><div class='del'>-    </div><div class='del'>-    This module supports multiple cards, autoprobe and PnP.</div><div class='del'>-    </div><div class='del'>-  Module snd-ad1848</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on AD1848/AD1847/CS4248 ISA chips.</div><div class='del'>-</div><div class='del'>-    port	- port # for AD1848 chip</div><div class='del'>-    irq		- IRQ # for AD1848  chip</div><div class='del'>-    dma1	- DMA # for AD1848 chip (0,1,3)</div><div class='del'>-    </div><div class='del'>-    This module supports multiple cards.  It does not support autoprobe</div><div class='del'>-    thus main port must be specified!!! Other ports are optional.</div><div class='del'>-    </div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-ad1889</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Analog Devices AD1889 chips.</div><div class='del'>-</div><div class='del'>-    ac97_quirk  - AC'97 workaround for strange hardware</div><div class='del'>-                  See the description of intel8x0 module for details.</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-ali5451</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for ALi M5451 PCI chip.</div><div class='del'>-</div><div class='del'>-    pcm_channels    - Number of hardware channels assigned for PCM</div><div class='del'>-    spdif           - Support SPDIF I/O</div><div class='del'>-    		    - Default: disabled</div><div class='del'>-</div><div class='del'>-    This module supports one chip and autoprobe.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-als100</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on Avance Logic ALS100/ALS120 ISA chips.</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards, autoprobe and PnP.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-als300</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for  Avance Logic ALS300 and ALS300+</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-als4000</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on Avance Logic ALS4000 PCI chip.</div><div class='del'>-</div><div class='del'>-    joystick_port - port # for legacy joystick support.</div><div class='del'>-                    0 = disabled (default), 1 = auto-detect</div><div class='del'>-    </div><div class='del'>-    This module supports multiple cards, autoprobe and PnP.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-asihpi</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for AudioScience ASI soundcards</div><div class='del'>-</div><div class='del'>-    enable_hpi_hwdep	- enable HPI hwdep for AudioScience soundcard</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-atiixp</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for ATI IXP 150/200/250/400 AC97 controllers.</div><div class='del'>-</div><div class='del'>-    ac97_clock		- AC'97 clock (default = 48000)</div><div class='del'>-    ac97_quirk		- AC'97 workaround for strange hardware</div><div class='del'>-			  See "AC97 Quirk Option" section below.</div><div class='del'>-    ac97_codec		- Workaround to specify which AC'97 codec </div><div class='del'>-			  instead of probing.  If this works for you</div><div class='del'>-			  file a bug with your `lspci -vn` output.</div><div class='del'>-			  -2  -- Force probing.</div><div class='del'>-			  -1  -- Default behavior.</div><div class='del'>-			  0-2 -- Use the specified codec.</div><div class='del'>-    spdif_aclink	- S/PDIF transfer over AC-link (default = 1)</div><div class='del'>-</div><div class='del'>-    This module supports one card and autoprobe.</div><div class='del'>-</div><div class='del'>-    ATI IXP has two different methods to control SPDIF output.  One is</div><div class='del'>-    over AC-link and another is over the "direct" SPDIF output.  The</div><div class='del'>-    implementation depends on the motherboard, and you'll need to</div><div class='del'>-    choose the correct one via spdif_aclink module option.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-atiixp-modem</div><div class='del'>-  -----------------------</div><div class='del'>-</div><div class='del'>-    Module for ATI IXP 150/200/250 AC97 modem controllers.</div><div class='del'>-</div><div class='del'>-    This module supports one card and autoprobe.</div><div class='del'>-</div><div class='del'>-    Note: The default index value of this module is -2, i.e. the first</div><div class='del'>-          slot is excluded.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-au8810, snd-au8820, snd-au8830</div><div class='del'>-  -----------------------------------------</div><div class='del'>-</div><div class='del'>-    Module for Aureal Vortex, Vortex2 and Advantage device.</div><div class='del'>-</div><div class='del'>-    pcifix	- Control PCI workarounds</div><div class='del'>-		  0 = Disable all workarounds</div><div class='del'>-		  1 = Force the PCI latency of the Aureal card to 0xff</div><div class='del'>-		  2 = Force the Extend PCI#2 Internal Master for Efficient</div><div class='del'>-		      Handling of Dummy Requests on the VIA KT133 AGP Bridge</div><div class='del'>-		  3 = Force both settings</div><div class='del'>-		  255 = Autodetect what is required (default)</div><div class='del'>-</div><div class='del'>-    This module supports all ADB PCM channels, ac97 mixer, SPDIF, hardware</div><div class='del'>-    EQ, mpu401, gameport. A3D and wavetable support are still in development.</div><div class='del'>-    Development and reverse engineering work is being coordinated at</div><div class='del'>-    http://savannah.nongnu.org/projects/openvortex/</div><div class='del'>-    SPDIF output has a copy of the AC97 codec output, unless you use the</div><div class='del'>-    "spdif" pcm device, which allows raw data passthru.</div><div class='del'>-    The hardware EQ hardware and SPDIF is only present in the Vortex2 and </div><div class='del'>-    Advantage.</div><div class='del'>-</div><div class='del'>-    Note: Some ALSA mixer applications don't handle the SPDIF sample rate </div><div class='del'>-           control correctly. If you have problems regarding this, try</div><div class='del'>-           another ALSA compliant mixer (alsamixer works).</div><div class='del'>-</div><div class='del'>-  Module snd-azt1605</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Aztech Sound Galaxy soundcards based on the Aztech AZT1605</div><div class='del'>-    chipset.</div><div class='del'>-</div><div class='del'>-    port	- port # for BASE (0x220,0x240,0x260,0x280)</div><div class='del'>-    wss_port	- port # for WSS (0x530,0x604,0xe80,0xf40)</div><div class='del'>-    irq		- IRQ # for WSS (7,9,10,11)</div><div class='del'>-    dma1	- DMA # for WSS playback (0,1,3)</div><div class='del'>-    dma2	- DMA # for WSS capture (0,1), -1 = disabled (default)</div><div class='del'>-    mpu_port	- port # for MPU-401 UART (0x300,0x330), -1 = disabled (default)</div><div class='del'>-    mpu_irq	- IRQ # for MPU-401 UART (3,5,7,9), -1 = disabled (default)</div><div class='del'>-    fm_port	- port # for OPL3 (0x388), -1 = disabled (default)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards. It does not support autoprobe: port,</div><div class='del'>-    wss_port, irq and dma1 have to be specified. The other values are</div><div class='del'>-    optional.</div><div class='del'>-</div><div class='del'>-    "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)</div><div class='del'>-    or the value stored in the card's EEPROM for cards that have an EEPROM and</div><div class='del'>-    their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can</div><div class='del'>-    be chosen freely from the options enumerated above.</div><div class='del'>-</div><div class='del'>-    If dma2 is specified and different from dma1, the card will operate in</div><div class='del'>-    full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to</div><div class='del'>-    enable capture since only channels 0 and 1 are available for capture.</div><div class='del'>-</div><div class='del'>-    Generic settings are "port=0x220 wss_port=0x530 irq=10 dma1=1 dma2=0</div><div class='del'>-    mpu_port=0x330 mpu_irq=9 fm_port=0x388".</div><div class='del'>-</div><div class='del'>-    Whatever IRQ and DMA channels you pick, be sure to reserve them for</div><div class='del'>-    legacy ISA in your BIOS.</div><div class='del'>-</div><div class='del'>-  Module snd-azt2316</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Aztech Sound Galaxy soundcards based on the Aztech AZT2316</div><div class='del'>-    chipset.</div><div class='del'>-</div><div class='del'>-    port	- port # for BASE (0x220,0x240,0x260,0x280)</div><div class='del'>-    wss_port	- port # for WSS (0x530,0x604,0xe80,0xf40)</div><div class='del'>-    irq		- IRQ # for WSS (7,9,10,11)</div><div class='del'>-    dma1	- DMA # for WSS playback (0,1,3)</div><div class='del'>-    dma2	- DMA # for WSS capture (0,1), -1 = disabled (default)</div><div class='del'>-    mpu_port	- port # for MPU-401 UART (0x300,0x330), -1 = disabled (default)</div><div class='del'>-    mpu_irq	- IRQ # for MPU-401 UART (5,7,9,10), -1 = disabled (default)</div><div class='del'>-    fm_port	- port # for OPL3 (0x388), -1 = disabled (default)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards. It does not support autoprobe: port,</div><div class='del'>-    wss_port, irq and dma1 have to be specified. The other values are</div><div class='del'>-    optional.</div><div class='del'>-</div><div class='del'>-    "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)</div><div class='del'>-    or the value stored in the card's EEPROM for cards that have an EEPROM and</div><div class='del'>-    their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can</div><div class='del'>-    be chosen freely from the options enumerated above.</div><div class='del'>-</div><div class='del'>-    If dma2 is specified and different from dma1, the card will operate in</div><div class='del'>-    full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to</div><div class='del'>-    enable capture since only channels 0 and 1 are available for capture.</div><div class='del'>-</div><div class='del'>-    Generic settings are "port=0x220 wss_port=0x530 irq=10 dma1=1 dma2=0</div><div class='del'>-    mpu_port=0x330 mpu_irq=9 fm_port=0x388".</div><div class='del'>-</div><div class='del'>-    Whatever IRQ and DMA channels you pick, be sure to reserve them for</div><div class='del'>-    legacy ISA in your BIOS.</div><div class='del'>-</div><div class='del'>-  Module snd-aw2</div><div class='del'>-  --------------</div><div class='del'>-</div><div class='del'>-    Module for Audiowerk2 sound card</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-azt2320</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on Aztech System AZT2320 ISA chip (PnP only).</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards, PnP and autoprobe.</div><div class='del'>-    </div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-azt3328</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on Aztech AZF3328 PCI chip.</div><div class='del'>-</div><div class='del'>-    joystick	- Enable joystick (default off)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-bt87x</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for video cards based on Bt87x chips.</div><div class='del'>-</div><div class='del'>-    digital_rate - Override the default digital rate (Hz)</div><div class='del'>-    load_all	- Load the driver even if the card model isn't known</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-    Note: The default index value of this module is -2, i.e. the first</div><div class='del'>-          slot is excluded.</div><div class='del'>-</div><div class='del'>-  Module snd-ca0106</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Creative Audigy LS and SB Live 24bit</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  Module snd-cmi8330</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on C-Media CMI8330 ISA chips.</div><div class='del'>-</div><div class='del'>-    isapnp	- ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following options are available:</div><div class='del'>-</div><div class='del'>-    wssport	- port # for CMI8330 chip (WSS)</div><div class='del'>-    wssirq	- IRQ # for CMI8330 chip (WSS)</div><div class='del'>-    wssdma	- first DMA # for CMI8330 chip (WSS)</div><div class='del'>-    sbport	- port # for CMI8330 chip (SB16)</div><div class='del'>-    sbirq	- IRQ # for CMI8330 chip (SB16)</div><div class='del'>-    sbdma8	- 8bit DMA # for CMI8330 chip (SB16)</div><div class='del'>-    sbdma16	- 16bit DMA # for CMI8330 chip (SB16)</div><div class='del'>-    fmport	- (optional) OPL3 I/O port</div><div class='del'>-    mpuport	- (optional) MPU401 I/O port</div><div class='del'>-    mpuirq	- (optional) MPU401 irq #</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-cmipci</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for C-Media CMI8338/8738/8768/8770 PCI sound cards.</div><div class='del'>-</div><div class='del'>-    mpu_port    - port address of MIDI interface (8338 only):</div><div class='del'>-		  0x300,0x310,0x320,0x330 = legacy port,</div><div class='del'>-		  0 = disable (default)</div><div class='del'>-    fm_port     - port address of OPL-3 FM synthesizer (8x38 only):</div><div class='del'>-		  0x388 = legacy port,</div><div class='del'>-		  1 = integrated PCI port (default on 8738),</div><div class='del'>-		  0 = disable</div><div class='del'>-    soft_ac3    - Software-conversion of raw SPDIF packets (model 033 only)</div><div class='del'>-                  (default = 1)</div><div class='del'>-    joystick_port - Joystick port address (0 = disable, 1 = auto-detect)</div><div class='del'>-</div><div class='del'>-    This module supports autoprobe and multiple cards.</div><div class='del'>-    </div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-cs4231</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on CS4231 ISA chips.</div><div class='del'>-</div><div class='del'>-    port	- port # for CS4231 chip</div><div class='del'>-    mpu_port	- port # for MPU-401 UART (optional), -1 = disable</div><div class='del'>-    irq		- IRQ # for CS4231 chip</div><div class='del'>-    mpu_irq	- IRQ # for MPU-401 UART</div><div class='del'>-    dma1	- first DMA # for CS4231 chip</div><div class='del'>-    dma2	- second DMA # for CS4231 chip</div><div class='del'>-    </div><div class='del'>-    This module supports multiple cards. This module does not support autoprobe</div><div class='del'>-    thus main port must be specified!!! Other ports are optional.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-    </div><div class='del'>-  Module snd-cs4236</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on CS4232/CS4232A,</div><div class='del'>-    	       	     	   	   CS4235/CS4236/CS4236B/CS4237B/</div><div class='del'>-                                   CS4238B/CS4239 ISA chips.</div><div class='del'>-</div><div class='del'>-    isapnp	- ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following options are available:</div><div class='del'>-</div><div class='del'>-    port	- port # for CS4236 chip (PnP setup - 0x534)</div><div class='del'>-    cport	- control port # for CS4236 chip (PnP setup - 0x120,0x210,0xf00)</div><div class='del'>-    mpu_port	- port # for MPU-401 UART (PnP setup - 0x300), -1 = disable</div><div class='del'>-    fm_port	- FM port # for CS4236 chip (PnP setup - 0x388), -1 = disable</div><div class='del'>-    irq		- IRQ # for CS4236 chip (5,7,9,11,12,15)</div><div class='del'>-    mpu_irq	- IRQ # for MPU-401 UART (9,11,12,15)</div><div class='del'>-    dma1	- first DMA # for CS4236 chip (0,1,3)</div><div class='del'>-    dma2	- second DMA # for CS4236 chip (0,1,3), -1 = disable</div><div class='del'>-    </div><div class='del'>-    This module supports multiple cards. This module does not support autoprobe</div><div class='del'>-    (if ISA PnP is not used) thus main port and control port must be</div><div class='del'>-    specified!!! Other ports are optional.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-    This module is aliased as snd-cs4232 since it provides the old</div><div class='del'>-    snd-cs4232 functionality, too.</div><div class='del'>-</div><div class='del'>-  Module snd-cs4281</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Cirrus Logic CS4281 soundchip.</div><div class='del'>-</div><div class='del'>-    dual_codec	- Secondary codec ID (0 = disable, default)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-cs46xx</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for PCI sound cards based on CS4610/CS4612/CS4614/CS4615/CS4622/</div><div class='del'>-				       CS4624/CS4630/CS4280 PCI chips.</div><div class='del'>-</div><div class='del'>-    external_amp     - Force to enable external amplifier.</div><div class='del'>-    thinkpad         - Force to enable Thinkpad's CLKRUN control.</div><div class='del'>-    mmap_valid       - Support OSS mmap mode (default = 0).</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-    Usually external amp and CLKRUN controls are detected automatically</div><div class='del'>-    from PCI sub vendor/device ids.  If they don't work, give the options</div><div class='del'>-    above explicitly.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-cs5530</div><div class='del'>-  _________________</div><div class='del'>-</div><div class='del'>-    Module for Cyrix/NatSemi Geode 5530 chip. </div><div class='del'>-  </div><div class='del'>-  Module snd-cs5535audio</div><div class='del'>-  ----------------------</div><div class='del'>-</div><div class='del'>-    Module for multifunction CS5535 companion PCI device</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-ctxfi</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for Creative Sound Blaster X-Fi boards (20k1 / 20k2 chips)</div><div class='del'>-	* Creative Sound Blaster X-Fi Titanium Fatal1ty Champion Series</div><div class='del'>-	* Creative Sound Blaster X-Fi Titanium Fatal1ty Professional Series</div><div class='del'>-	* Creative Sound Blaster X-Fi Titanium Professional Audio</div><div class='del'>-	* Creative Sound Blaster X-Fi Titanium</div><div class='del'>-	* Creative Sound Blaster X-Fi Elite Pro</div><div class='del'>-	* Creative Sound Blaster X-Fi Platinum</div><div class='del'>-	* Creative Sound Blaster X-Fi Fatal1ty</div><div class='del'>-	* Creative Sound Blaster X-Fi XtremeGamer</div><div class='del'>-	* Creative Sound Blaster X-Fi XtremeMusic</div><div class='del'>-</div><div class='del'>-    reference_rate	- reference sample rate, 44100 or 48000 (default)</div><div class='del'>-    multiple		- multiple to ref. sample rate, 1 or 2 (default)</div><div class='del'>-    subsystem		- override the PCI SSID for probing; the value</div><div class='del'>-			  consists of SSVID &lt;&lt; 16 | SSDID.  The default is</div><div class='del'>-			  zero, which means no override.</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-darla20</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio Darla20</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-darla24</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio Darla24</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-dt019x</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Diamond Technologies DT-019X / Avance Logic ALS-007 (PnP</div><div class='del'>-    only)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.  This module is enabled only with</div><div class='del'>-    ISA PnP support.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-dummy</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for the dummy sound card. This "card" doesn't do any output</div><div class='del'>-    or input, but you may use this module for any application which</div><div class='del'>-    requires a sound card (like RealPlayer).</div><div class='del'>-</div><div class='del'>-    pcm_devs       - Number of PCM devices assigned to each card</div><div class='del'>-                     (default = 1, up to 4)</div><div class='del'>-    pcm_substreams - Number of PCM substreams assigned to each PCM</div><div class='del'>-                     (default = 8, up to 128)</div><div class='del'>-    hrtimer        - Use hrtimer (=1, default) or system timer (=0)</div><div class='del'>-    fake_buffer    - Fake buffer allocations (default = 1)</div><div class='del'>-</div><div class='del'>-    When multiple PCM devices are created, snd-dummy gives different</div><div class='del'>-    behavior to each PCM device:</div><div class='del'>-      0 = interleaved with mmap support</div><div class='del'>-      1 = non-interleaved with mmap support</div><div class='del'>-      2 = interleaved without mmap </div><div class='del'>-      3 = non-interleaved without mmap</div><div class='del'>-</div><div class='del'>-    As default, snd-dummy drivers doesn't allocate the real buffers</div><div class='del'>-    but either ignores read/write or mmap a single dummy page to all</div><div class='del'>-    buffer pages, in order to save the resources.  If your apps need</div><div class='del'>-    the read/ written buffer data to be consistent, pass fake_buffer=0</div><div class='del'>-    option.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-echo3g</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio 3G cards (Gina3G/Layla3G)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-emu10k1</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for EMU10K1/EMU10k2 based PCI sound cards.</div><div class='del'>-			* Sound Blaster Live!</div><div class='del'>-			* Sound Blaster PCI 512</div><div class='del'>-			* Emu APS (partially supported)</div><div class='del'>-			* Sound Blaster Audigy</div><div class='del'>-</div><div class='del'>-    extin   - bitmap of available external inputs for FX8010 (see bellow)</div><div class='del'>-    extout  - bitmap of available external outputs for FX8010 (see bellow)</div><div class='del'>-    seq_ports - allocated sequencer ports (4 by default)</div><div class='del'>-    max_synth_voices - limit of voices used for wavetable (64 by default)</div><div class='del'>-    max_buffer_size  - specifies the maximum size of wavetable/pcm buffers</div><div class='del'>-                       given in MB unit.  Default value is 128.</div><div class='del'>-    enable_ir - enable IR</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-</div><div class='del'>-    Input &amp; Output configurations 			[extin/extout]</div><div class='del'>-	* Creative Card wo/Digital out			[0x0003/0x1f03]</div><div class='del'>-	* Creative Card w/Digital out			[0x0003/0x1f0f]</div><div class='del'>-	* Creative Card w/Digital CD in			[0x000f/0x1f0f]</div><div class='del'>-	* Creative Card wo/Digital out + LiveDrive	[0x3fc3/0x1fc3]</div><div class='del'>-	* Creative Card w/Digital out + LiveDrive	[0x3fc3/0x1fcf]</div><div class='del'>-	* Creative Card w/Digital CD in + LiveDrive	[0x3fcf/0x1fcf]</div><div class='del'>-	* Creative Card wo/Digital out + Digital I/O 2  [0x0fc3/0x1f0f]</div><div class='del'>-	* Creative Card w/Digital out + Digital I/O 2	[0x0fc3/0x1f0f]</div><div class='del'>-	* Creative Card w/Digital CD in + Digital I/O 2	[0x0fcf/0x1f0f]</div><div class='del'>-        * Creative Card 5.1/w Digital out + LiveDrive	[0x3fc3/0x1fff]</div><div class='del'>-	* Creative Card 5.1 (c) 2003			[0x3fc3/0x7cff]</div><div class='del'>-        * Creative Card all ins and outs		[0x3fff/0x7fff]</div><div class='del'>-    </div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-emu10k1x</div><div class='del'>-  -------------------</div><div class='del'>-</div><div class='del'>-    Module for Creative Emu10k1X (SB Live Dell OEM version)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-ens1370</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Ensoniq AudioPCI ES1370 PCI sound cards.</div><div class='del'>-			* SoundBlaster PCI 64</div><div class='del'>-			* SoundBlaster PCI 128</div><div class='del'>-</div><div class='del'>-    joystick		- Enable joystick (default off)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-    </div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-ens1371</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Ensoniq AudioPCI ES1371 PCI sound cards.</div><div class='del'>-			* SoundBlaster PCI 64</div><div class='del'>-			* SoundBlaster PCI 128</div><div class='del'>-			* SoundBlaster Vibra PCI</div><div class='del'>-</div><div class='del'>-    joystick_port	- port # for joystick (0x200,0x208,0x210,0x218),</div><div class='del'>-			  0 = disable (default), 1 = auto-detect</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-    </div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-es1688</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for ESS AudioDrive ES-1688 and ES-688 sound cards.</div><div class='del'>-</div><div class='del'>-    isapnp	- ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-    mpu_port	- port # for MPU-401 port (0x300,0x310,0x320,0x330), -1 = disable (default)</div><div class='del'>-    mpu_irq	- IRQ # for MPU-401 port (5,7,9,10)</div><div class='del'>-    fm_port	- port # for OPL3 (option; share the same port as default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following additional options are available:</div><div class='del'>-    port	- port # for ES-1688 chip (0x220,0x240,0x260)</div><div class='del'>-    irq		- IRQ # for ES-1688 chip (5,7,9,10)</div><div class='del'>-    dma8	- DMA # for ES-1688 chip (0,1,3)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe (without MPU-401 port)</div><div class='del'>-    and PnP with the ES968 chip.</div><div class='del'>-</div><div class='del'>-  Module snd-es18xx</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for ESS AudioDrive ES-18xx sound cards.</div><div class='del'>-</div><div class='del'>-    isapnp	- ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following options are available:</div><div class='del'>-</div><div class='del'>-    port	- port # for ES-18xx chip (0x220,0x240,0x260)</div><div class='del'>-    mpu_port	- port # for MPU-401 port (0x300,0x310,0x320,0x330), -1 = disable (default)</div><div class='del'>-    fm_port	- port # for FM (optional, not used)</div><div class='del'>-    irq		- IRQ # for ES-18xx chip (5,7,9,10)</div><div class='del'>-    dma1	- first DMA # for ES-18xx chip (0,1,3)</div><div class='del'>-    dma2	- first DMA # for ES-18xx chip (0,1,3)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards, ISA PnP and autoprobe (without MPU-401</div><div class='del'>-    port if native ISA PnP routines are not used).</div><div class='del'>-    When dma2 is equal with dma1, the driver works as half-duplex.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-es1938</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on ESS Solo-1 (ES1938,ES1946) chips.</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-es1968</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on ESS Maestro-1/2/2E (ES1968/ES1978) chips.</div><div class='del'>-</div><div class='del'>-    total_bufsize	- total buffer size in kB (1-4096kB)</div><div class='del'>-    pcm_substreams_p	- playback channels (1-8, default=2)</div><div class='del'>-    pcm_substreams_c	- capture channels (1-8, default=0)</div><div class='del'>-    clock		- clock (0 = auto-detection)</div><div class='del'>-    use_pm		- support the power-management (0 = off, 1 = on,</div><div class='del'>-			  2 = auto (default))</div><div class='del'>-    enable_mpu		- enable MPU401 (0 = off, 1 = on, 2 = auto (default))</div><div class='del'>-    joystick		- enable joystick (default off)       </div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-fm801</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for ForteMedia FM801 based PCI sound cards.</div><div class='del'>-</div><div class='del'>-    tea575x_tuner       - Enable TEA575x tuner</div><div class='del'>-                          - 1 = MediaForte 256-PCS</div><div class='del'>-                          - 2 = MediaForte 256-PCPR</div><div class='del'>-                          - 3 = MediaForte 64-PCR  </div><div class='del'>-                          - High 16-bits are video (radio) device number + 1</div><div class='del'>-                          - example: 0x10002 (MediaForte 256-PCPR, device 1)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-    </div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-gina20</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio Gina20</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-gina24</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio Gina24</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-gusclassic</div><div class='del'>-  ---------------------</div><div class='del'>-</div><div class='del'>-    Module for Gravis UltraSound Classic sound card.</div><div class='del'>-</div><div class='del'>-    port	- port # for GF1 chip (0x220,0x230,0x240,0x250,0x260)</div><div class='del'>-    irq		- IRQ # for GF1 chip (3,5,9,11,12,15)</div><div class='del'>-    dma1	- DMA # for GF1 chip (1,3,5,6,7)</div><div class='del'>-    dma2	- DMA # for GF1 chip (1,3,5,6,7,-1=disable)</div><div class='del'>-    joystick_dac - 0 to 31, (0.59V-4.52V or 0.389V-2.98V)</div><div class='del'>-    voices	- GF1 voices limit (14-32)</div><div class='del'>-    pcm_voices	- reserved PCM voices</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-</div><div class='del'>-  Module snd-gusextreme</div><div class='del'>-  ---------------------</div><div class='del'>-</div><div class='del'>-    Module for Gravis UltraSound Extreme (Synergy ViperMax) sound card.</div><div class='del'>-</div><div class='del'>-    port	- port # for ES-1688 chip (0x220,0x230,0x240,0x250,0x260)</div><div class='del'>-    gf1_port	- port # for GF1 chip (0x210,0x220,0x230,0x240,0x250,0x260,0x270)</div><div class='del'>-    mpu_port	- port # for MPU-401 port (0x300,0x310,0x320,0x330), -1 = disable</div><div class='del'>-    irq		- IRQ # for ES-1688 chip (5,7,9,10)</div><div class='del'>-    gf1_irq	- IRQ # for GF1 chip (3,5,9,11,12,15)</div><div class='del'>-    mpu_irq	- IRQ # for MPU-401 port (5,7,9,10)</div><div class='del'>-    dma8	- DMA # for ES-1688 chip (0,1,3)</div><div class='del'>-    dma1	- DMA # for GF1 chip (1,3,5,6,7)</div><div class='del'>-    joystick_dac - 0 to 31, (0.59V-4.52V or 0.389V-2.98V)</div><div class='del'>-    voices	- GF1 voices limit (14-32)</div><div class='del'>-    pcm_voices	- reserved PCM voices</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe (without MPU-401 port).</div><div class='del'>-</div><div class='del'>-  Module snd-gusmax</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Gravis UltraSound MAX sound card.</div><div class='del'>-</div><div class='del'>-    port	- port # for GF1 chip (0x220,0x230,0x240,0x250,0x260)</div><div class='del'>-    irq		- IRQ # for GF1 chip (3,5,9,11,12,15)</div><div class='del'>-    dma1	- DMA # for GF1 chip (1,3,5,6,7)</div><div class='del'>-    dma2	- DMA # for GF1 chip (1,3,5,6,7,-1=disable)</div><div class='del'>-    joystick_dac - 0 to 31, (0.59V-4.52V or 0.389V-2.98V)</div><div class='del'>-    voices	- GF1 voices limit (14-32)</div><div class='del'>-    pcm_voices	- reserved PCM voices</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-    </div><div class='del'>-  Module snd-hda-intel</div><div class='del'>-  --------------------</div><div class='del'>-</div><div class='del'>-    Module for Intel HD Audio (ICH6, ICH6M, ESB2, ICH7, ICH8, ICH9, ICH10,</div><div class='del'>-			PCH, SCH),</div><div class='del'>-		ATI SB450, SB600, R600, RS600, RS690, RS780, RV610, RV620,</div><div class='del'>-			RV630, RV635, RV670, RV770,</div><div class='del'>-		VIA VT8251/VT8237A,</div><div class='del'>-		SIS966, ULI M5461</div><div class='del'>-</div><div class='del'>-    [Multiple options for each card instance]</div><div class='del'>-    model	- force the model name</div><div class='del'>-    position_fix - Fix DMA pointer</div><div class='del'>-		  -1 = system default: choose appropriate one per controller</div><div class='del'>-			hardware</div><div class='del'>-		  0 = auto: falls back to LPIB when POSBUF doesn't work</div><div class='del'>-		  1 = use LPIB</div><div class='del'>-		  2 = POSBUF: use position buffer</div><div class='del'>-		  3 = VIACOMBO: VIA-specific workaround for capture</div><div class='del'>-		  4 = COMBO: use LPIB for playback, auto for capture stream</div><div class='del'>-    probe_mask  - Bitmask to probe codecs (default = -1, meaning all slots)</div><div class='del'>-    		  When the bit 8 (0x100) is set, the lower 8 bits are used</div><div class='del'>-		  as the "fixed" codec slots; i.e. the driver probes the</div><div class='del'>-		  slots regardless what hardware reports back</div><div class='del'>-    probe_only	- Only probing and no codec initialization (default=off);</div><div class='del'>-		  Useful to check the initial codec status for debugging</div><div class='del'>-    bdl_pos_adj	- Specifies the DMA IRQ timing delay in samples.</div><div class='del'>-		Passing -1 will make the driver to choose the appropriate</div><div class='del'>-		value based on the controller chip.</div><div class='del'>-    patch	- Specifies the early "patch" files to modify the HD-audio</div><div class='del'>-    		setup before initializing the codecs.  This option is</div><div class='del'>-		available only when CONFIG_SND_HDA_PATCH_LOADER=y is set.</div><div class='del'>-		See HD-Audio.txt for details.</div><div class='del'>-    beep_mode	- Selects the beep registration mode (0=off, 1=on); default</div><div class='del'>-		value is set via CONFIG_SND_HDA_INPUT_BEEP_MODE kconfig.</div><div class='del'>-    </div><div class='del'>-    [Single (global) options]</div><div class='del'>-    single_cmd  - Use single immediate commands to communicate with</div><div class='del'>-		codecs (for debugging only)</div><div class='del'>-    enable_msi	- Enable Message Signaled Interrupt (MSI) (default = off)</div><div class='del'>-    power_save	- Automatic power-saving timeout (in second, 0 =</div><div class='del'>-		disable)</div><div class='del'>-    power_save_controller - Reset HD-audio controller in power-saving mode</div><div class='del'>-		(default = on)</div><div class='del'>-    align_buffer_size - Force rounding of buffer/period sizes to multiples</div><div class='del'>-    		      of 128 bytes. This is more efficient in terms of memory</div><div class='del'>-		      access but isn't required by the HDA spec and prevents</div><div class='del'>-		      users from specifying exact period/buffer sizes.</div><div class='del'>-		      (default = on)</div><div class='del'>-    snoop	- Enable/disable snooping (default = on)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-    </div><div class='del'>-    See Documentation/sound/alsa/HD-Audio.txt for more details about</div><div class='del'>-    HD-audio driver.</div><div class='del'>-</div><div class='del'>-    Each codec may have a model table for different configurations.</div><div class='del'>-    If your machine isn't listed there, the default (usually minimal)</div><div class='del'>-    configuration is set up.  You can pass "model=&lt;name&gt;" option to</div><div class='del'>-    specify a certain model in such a case.  There are different</div><div class='del'>-    models depending on the codec chip.  The list of available models</div><div class='del'>-    is found in HD-Audio-Models.txt</div><div class='del'>-</div><div class='del'>-    The model name "generic" is treated as a special case.  When this</div><div class='del'>-    model is given, the driver uses the generic codec parser without</div><div class='del'>-    "codec-patch".  It's sometimes good for testing and debugging.</div><div class='del'>-</div><div class='del'>-    If the default configuration doesn't work and one of the above</div><div class='del'>-    matches with your device, report it together with alsa-info.sh</div><div class='del'>-    output (with --no-upload option) to kernel bugzilla or alsa-devel</div><div class='del'>-    ML (see the section "Links and Addresses").</div><div class='del'>-</div><div class='del'>-    power_save and power_save_controller options are for power-saving</div><div class='del'>-    mode.  See powersave.txt for details.</div><div class='del'>-</div><div class='del'>-    Note 2: If you get click noises on output, try the module option</div><div class='del'>-	    position_fix=1 or 2.  position_fix=1 will use the SD_LPIB</div><div class='del'>-	    register value without FIFO size correction as the current</div><div class='del'>-	    DMA pointer.  position_fix=2 will make the driver to use</div><div class='del'>-	    the position buffer instead of reading SD_LPIB register.</div><div class='del'>-	    (Usually SD_LPIB register is more accurate than the</div><div class='del'>-	    position buffer.)</div><div class='del'>-</div><div class='del'>-	    position_fix=3 is specific to VIA devices.  The position</div><div class='del'>-	    of the capture stream is checked from both LPIB and POSBUF</div><div class='del'>-	    values.  position_fix=4 is a combination mode, using LPIB</div><div class='del'>-	    for playback and POSBUF for capture.</div><div class='del'>-</div><div class='del'>-    NB: If you get many "azx_get_response timeout" messages at</div><div class='del'>-    loading, it's likely a problem of interrupts (e.g. ACPI irq</div><div class='del'>-    routing).  Try to boot with options like "pci=noacpi".  Also, you</div><div class='del'>-    can try "single_cmd=1" module option.  This will switch the</div><div class='del'>-    communication method between HDA controller and codecs to the</div><div class='del'>-    single immediate commands instead of CORB/RIRB.  Basically, the</div><div class='del'>-    single command mode is provided only for BIOS, and you won't get</div><div class='del'>-    unsolicited events, too.  But, at least, this works independently</div><div class='del'>-    from the irq.  Remember this is a last resort, and should be</div><div class='del'>-    avoided as much as possible...</div><div class='del'>-    </div><div class='del'>-    MORE NOTES ON "azx_get_response timeout" PROBLEMS:</div><div class='del'>-    On some hardware, you may need to add a proper probe_mask option</div><div class='del'>-    to avoid the "azx_get_response timeout" problem above, instead.</div><div class='del'>-    This occurs when the access to non-existing or non-working codec slot</div><div class='del'>-    (likely a modem one) causes a stall of the communication via HD-audio</div><div class='del'>-    bus.  You can see which codec slots are probed by enabling</div><div class='del'>-    CONFIG_SND_DEBUG_VERBOSE, or simply from the file name of the codec</div><div class='del'>-    proc files.  Then limit the slots to probe by probe_mask option.</div><div class='del'>-    For example, probe_mask=1 means to probe only the first slot, and</div><div class='del'>-    probe_mask=4 means only the third slot.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-hdsp</div><div class='del'>-  ---------------</div><div class='del'>-</div><div class='del'>-    Module for RME Hammerfall DSP audio interface(s)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-    Note: The firmware data can be automatically loaded via hotplug</div><div class='del'>-          when CONFIG_FW_LOADER is set.  Otherwise, you need to load</div><div class='del'>-          the firmware via hdsploader utility included in alsa-tools</div><div class='del'>-          package.</div><div class='del'>-          The firmware data is found in alsa-firmware package.</div><div class='del'>-</div><div class='del'>-    Note: snd-page-alloc module does the job which snd-hammerfall-mem</div><div class='del'>-          module did formerly.  It will allocate the buffers in advance</div><div class='del'>-          when any HDSP cards are found.  To make the buffer</div><div class='del'>-          allocation sure, load snd-page-alloc module in the early</div><div class='del'>-          stage of boot sequence.  See "Early Buffer Allocation"</div><div class='del'>-	  section.</div><div class='del'>-</div><div class='del'>-  Module snd-hdspm</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for RME HDSP MADI board.</div><div class='del'>-</div><div class='del'>-    precise_ptr		- Enable precise pointer, or disable.</div><div class='del'>-    line_outs_monitor	- Send playback streams to analog outs by default.</div><div class='del'>-    enable_monitor	- Enable Analog Out on Channel 63/64 by default.</div><div class='del'>-</div><div class='del'>-    See hdspm.txt for details.</div><div class='del'>-</div><div class='del'>-  Module snd-ice1712</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Envy24 (ICE1712) based PCI sound cards.</div><div class='del'>-			* MidiMan M Audio Delta 1010</div><div class='del'>-			* MidiMan M Audio Delta 1010LT</div><div class='del'>-			* MidiMan M Audio Delta DiO 2496</div><div class='del'>-			* MidiMan M Audio Delta 66</div><div class='del'>-			* MidiMan M Audio Delta 44</div><div class='del'>-			* MidiMan M Audio Delta 410</div><div class='del'>-			* MidiMan M Audio Audiophile 2496</div><div class='del'>-                        * TerraTec EWS 88MT</div><div class='del'>-                        * TerraTec EWS 88D</div><div class='del'>-                        * TerraTec EWX 24/96</div><div class='del'>-                        * TerraTec DMX 6Fire</div><div class='del'>-			* TerraTec Phase 88</div><div class='del'>-                        * Hoontech SoundTrack DSP 24</div><div class='del'>-                        * Hoontech SoundTrack DSP 24 Value</div><div class='del'>-                        * Hoontech SoundTrack DSP 24 Media 7.1</div><div class='del'>-			* Event Electronics, EZ8</div><div class='del'>-                        * Digigram VX442</div><div class='del'>-			* Lionstracs, Mediastaton</div><div class='del'>-			* Terrasoniq TS 88</div><div class='del'>-</div><div class='del'>-    model       - Use the given board model, one of the following:</div><div class='del'>-		  delta1010, dio2496, delta66, delta44, audiophile, delta410,</div><div class='del'>-		  delta1010lt, vx442, ewx2496, ews88mt, ews88mt_new, ews88d,</div><div class='del'>-		  dmx6fire, dsp24, dsp24_value, dsp24_71, ez8,</div><div class='del'>-		  phase88, mediastation</div><div class='del'>-    omni	- Omni I/O support for MidiMan M-Audio Delta44/66</div><div class='del'>-    cs8427_timeout - reset timeout for the CS8427 chip (S/PDIF transceiver)</div><div class='del'>-                     in msec resolution, default value is 500 (0.5 sec)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe. Note: The consumer part</div><div class='del'>-    is not used with all Envy24 based cards (for example in the MidiMan Delta</div><div class='del'>-    serie).</div><div class='del'>-</div><div class='del'>-    Note: The supported board is detected by reading EEPROM or PCI</div><div class='del'>-	  SSID (if EEPROM isn't available).  You can override the</div><div class='del'>-	  model by passing "model" module option in case that the</div><div class='del'>-	  driver isn't configured properly or you want to try another</div><div class='del'>-	  type for testing.</div><div class='del'>-</div><div class='del'>-  Module snd-ice1724</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Envy24HT (VT/ICE1724), Envy24PT (VT1720) based PCI sound cards.</div><div class='del'>-			* MidiMan M Audio Revolution 5.1</div><div class='del'>-			* MidiMan M Audio Revolution 7.1</div><div class='del'>-			* MidiMan M Audio Audiophile 192</div><div class='del'>-			* AMP Ltd AUDIO2000</div><div class='del'>-			* TerraTec Aureon 5.1 Sky</div><div class='del'>-			* TerraTec Aureon 7.1 Space</div><div class='del'>-			* TerraTec Aureon 7.1 Universe</div><div class='del'>-			* TerraTec Phase 22</div><div class='del'>-			* TerraTec Phase 28</div><div class='del'>-			* AudioTrak Prodigy 7.1</div><div class='del'>-			* AudioTrak Prodigy 7.1 LT</div><div class='del'>-			* AudioTrak Prodigy 7.1 XT</div><div class='del'>-			* AudioTrak Prodigy 7.1 HIFI</div><div class='del'>-			* AudioTrak Prodigy 7.1 HD2</div><div class='del'>-			* AudioTrak Prodigy 192</div><div class='del'>-			* Pontis MS300</div><div class='del'>-			* Albatron K8X800 Pro II </div><div class='del'>-			* Chaintech ZNF3-150</div><div class='del'>-			* Chaintech ZNF3-250</div><div class='del'>-			* Chaintech 9CJS</div><div class='del'>-			* Chaintech AV-710</div><div class='del'>-			* Shuttle SN25P</div><div class='del'>-			* Onkyo SE-90PCI</div><div class='del'>-			* Onkyo SE-200PCI</div><div class='del'>-			* ESI Juli@</div><div class='del'>-			* ESI Maya44</div><div class='del'>-			* Hercules Fortissimo IV</div><div class='del'>-			* EGO-SYS WaveTerminal 192M</div><div class='del'>-</div><div class='del'>-    model       - Use the given board model, one of the following:</div><div class='del'>-		  revo51, revo71, amp2000, prodigy71, prodigy71lt,</div><div class='del'>-		  prodigy71xt, prodigy71hifi, prodigyhd2, prodigy192,</div><div class='del'>-		  juli, aureon51, aureon71, universe, ap192, k8x800,</div><div class='del'>-		  phase22, phase28, ms300, av710, se200pci, se90pci,</div><div class='del'>-		  fortissimo4, sn25p, WT192M, maya44</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-</div><div class='del'>-    Note: The supported board is detected by reading EEPROM or PCI</div><div class='del'>-	  SSID (if EEPROM isn't available).  You can override the</div><div class='del'>-	  model by passing "model" module option in case that the</div><div class='del'>-	  driver isn't configured properly or you want to try another</div><div class='del'>-	  type for testing.</div><div class='del'>-</div><div class='del'>-  Module snd-indigo</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio Indigo</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-indigodj</div><div class='del'>-  -------------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio Indigo DJ</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-indigoio</div><div class='del'>-  -------------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio Indigo IO</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-intel8x0</div><div class='del'>-  -------------------</div><div class='del'>-</div><div class='del'>-    Module for AC'97 motherboards from Intel and compatibles.</div><div class='del'>-			* Intel i810/810E, i815, i820, i830, i84x, MX440</div><div class='del'>-				ICH5, ICH6, ICH7, 6300ESB, ESB2</div><div class='del'>-			* SiS 7012 (SiS 735)</div><div class='del'>-			* NVidia NForce, NForce2, NForce3, MCP04, CK804</div><div class='del'>-				 CK8, CK8S, MCP501</div><div class='del'>-			* AMD AMD768, AMD8111</div><div class='del'>-			* ALi m5455</div><div class='del'>-</div><div class='del'>-    ac97_clock	  - AC'97 codec clock base (0 = auto-detect)</div><div class='del'>-    ac97_quirk    - AC'97 workaround for strange hardware</div><div class='del'>-		    See "AC97 Quirk Option" section below.</div><div class='del'>-    buggy_irq     - Enable workaround for buggy interrupts on some</div><div class='del'>-                    motherboards (default yes on nForce chips,</div><div class='del'>-		    otherwise off)</div><div class='del'>-    buggy_semaphore - Enable workaround for hardware with buggy</div><div class='del'>-		    semaphores (e.g. on some ASUS laptops)</div><div class='del'>-		    (default off)</div><div class='del'>-    spdif_aclink  - Use S/PDIF over AC-link instead of direct connection</div><div class='del'>-		    from the controller chip</div><div class='del'>-		    (0 = off, 1 = on, -1 = default)</div><div class='del'>-</div><div class='del'>-    This module supports one chip and autoprobe.</div><div class='del'>-</div><div class='del'>-    Note: the latest driver supports auto-detection of chip clock.</div><div class='del'>-    if you still encounter too fast playback, specify the clock</div><div class='del'>-    explicitly via the module option "ac97_clock=41194".</div><div class='del'>-</div><div class='del'>-    Joystick/MIDI ports are not supported by this driver.  If your</div><div class='del'>-    motherboard has these devices, use the ns558 or snd-mpu401</div><div class='del'>-    modules, respectively.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-    </div><div class='del'>-  Module snd-intel8x0m</div><div class='del'>-  --------------------</div><div class='del'>-</div><div class='del'>-    Module for Intel ICH (i8x0) chipset MC97 modems.</div><div class='del'>-			* Intel i810/810E, i815, i820, i830, i84x, MX440</div><div class='del'>-				ICH5, ICH6, ICH7</div><div class='del'>-			* SiS 7013 (SiS 735)</div><div class='del'>-			* NVidia NForce, NForce2, NForce2s, NForce3</div><div class='del'>-			* AMD AMD8111</div><div class='del'>-			* ALi m5455</div><div class='del'>-</div><div class='del'>-    ac97_clock	  - AC'97 codec clock base (0 = auto-detect)</div><div class='del'>-</div><div class='del'>-    This module supports one card and autoprobe.</div><div class='del'>-</div><div class='del'>-    Note: The default index value of this module is -2, i.e. the first</div><div class='del'>-          slot is excluded.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-interwave</div><div class='del'>-  --------------------</div><div class='del'>-</div><div class='del'>-    Module for Gravis UltraSound PnP, Dynasonic 3-D/Pro, STB Sound Rage 32</div><div class='del'>-    and other sound cards based on AMD InterWave (tm) chip.</div><div class='del'>-  </div><div class='del'>-    joystick_dac - 0 to 31, (0.59V-4.52V or 0.389V-2.98V)</div><div class='del'>-    midi	- 1 = MIDI UART enable, 0 = MIDI UART disable (default)</div><div class='del'>-    pcm_voices	- reserved PCM voices for the synthesizer (default 2)</div><div class='del'>-    effect	- 1 = InterWave effects enable (default 0);</div><div class='del'>-                  requires 8 voices</div><div class='del'>-    isapnp	- ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following options are available:</div><div class='del'>-</div><div class='del'>-    port	- port # for InterWave chip (0x210,0x220,0x230,0x240,0x250,0x260)</div><div class='del'>-    irq		- IRQ # for InterWave chip (3,5,9,11,12,15)</div><div class='del'>-    dma1	- DMA # for InterWave chip (0,1,3,5,6,7)</div><div class='del'>-    dma2	- DMA # for InterWave chip (0,1,3,5,6,7,-1=disable)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards, autoprobe and ISA PnP.</div><div class='del'>-</div><div class='del'>-  Module snd-interwave-stb</div><div class='del'>-  ------------------------</div><div class='del'>-</div><div class='del'>-    Module for UltraSound 32-Pro (sound card from STB used by Compaq)</div><div class='del'>-    and other sound cards based on AMD InterWave (tm) chip with TEA6330T</div><div class='del'>-    circuit for extended control of bass, treble and master volume.</div><div class='del'>-  </div><div class='del'>-    joystick_dac - 0 to 31, (0.59V-4.52V or 0.389V-2.98V)</div><div class='del'>-    midi	- 1 = MIDI UART enable, 0 = MIDI UART disable (default)</div><div class='del'>-    pcm_voices	- reserved PCM voices for the synthesizer (default 2)</div><div class='del'>-    effect	- 1 = InterWave effects enable (default 0);</div><div class='del'>-                  requires 8 voices</div><div class='del'>-    isapnp	- ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following options are available:</div><div class='del'>-</div><div class='del'>-    port	- port # for InterWave chip (0x210,0x220,0x230,0x240,0x250,0x260)</div><div class='del'>-    port_tc	- tone control (i2c bus) port # for TEA6330T chip (0x350,0x360,0x370,0x380)</div><div class='del'>-    irq		- IRQ # for InterWave chip (3,5,9,11,12,15)</div><div class='del'>-    dma1	- DMA # for InterWave chip (0,1,3,5,6,7)</div><div class='del'>-    dma2	- DMA # for InterWave chip (0,1,3,5,6,7,-1=disable)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards, autoprobe and ISA PnP.</div><div class='del'>-</div><div class='del'>-  Module snd-jazz16</div><div class='del'>-  -------------------</div><div class='del'>-</div><div class='del'>-    Module for Media Vision Jazz16 chipset. The chipset consists of 3 chips:</div><div class='del'>-    MVD1216 + MVA416 + MVA514.</div><div class='del'>-</div><div class='del'>-    port	- port # for SB DSP chip (0x210,0x220,0x230,0x240,0x250,0x260)</div><div class='del'>-    irq		- IRQ # for SB DSP chip (3,5,7,9,10,15)</div><div class='del'>-    dma8	- DMA # for SB DSP chip (1,3)</div><div class='del'>-    dma16	- DMA # for SB DSP chip (5,7)</div><div class='del'>-    mpu_port	- MPU-401 port # (0x300,0x310,0x320,0x330)</div><div class='del'>-    mpu_irq	- MPU-401 irq # (2,3,5,7)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-korg1212</div><div class='del'>-  -------------------</div><div class='del'>-</div><div class='del'>-    Module for Korg 1212 IO PCI card</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-layla20</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio Layla20</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-layla24</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio Layla24</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-lola</div><div class='del'>-  ---------------</div><div class='del'>-</div><div class='del'>-    Module for Digigram Lola PCI-e boards</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-lx6464es</div><div class='del'>-  -------------------</div><div class='del'>-</div><div class='del'>-    Module for Digigram LX6464ES boards</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-maestro3</div><div class='del'>-  -------------------</div><div class='del'>-</div><div class='del'>-    Module for Allegro/Maestro3 chips</div><div class='del'>-</div><div class='del'>-    external_amp     - enable external amp (enabled by default)</div><div class='del'>-    amp_gpio         - GPIO pin number for external amp (0-15) or</div><div class='del'>-                       -1 for default pin (8 for allegro, 1 for</div><div class='del'>-                       others) </div><div class='del'>-</div><div class='del'>-    This module supports autoprobe and multiple chips.</div><div class='del'>-</div><div class='del'>-    Note: the binding of amplifier is dependent on hardware.</div><div class='del'>-    If there is no sound even though all channels are unmuted, try to</div><div class='del'>-    specify other gpio connection via amp_gpio option. </div><div class='del'>-    For example, a Panasonic notebook might need "amp_gpio=0x0d"</div><div class='del'>-    option.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-mia</div><div class='del'>-  ---------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio Mia</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-miro</div><div class='del'>-  ---------------</div><div class='del'>-</div><div class='del'>-    Module for Miro soundcards: miroSOUND PCM 1 pro, </div><div class='del'>-				miroSOUND PCM 12,</div><div class='del'>-				miroSOUND PCM 20 Radio.</div><div class='del'>-</div><div class='del'>-    port	- Port # (0x530,0x604,0xe80,0xf40)</div><div class='del'>-    irq		- IRQ # (5,7,9,10,11)</div><div class='del'>-    dma1	- 1st dma # (0,1,3)</div><div class='del'>-    dma2	- 2nd dma # (0,1)</div><div class='del'>-    mpu_port	- MPU-401 port # (0x300,0x310,0x320,0x330)</div><div class='del'>-    mpu_irq	- MPU-401 irq # (5,7,9,10)</div><div class='del'>-    fm_port	- FM Port # (0x388)</div><div class='del'>-    wss		- enable WSS mode</div><div class='del'>-    ide		- enable onboard ide support</div><div class='del'>-</div><div class='del'>-  Module snd-mixart</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Digigram miXart8 sound cards.</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    Note: One miXart8 board will be represented as 4 alsa cards.</div><div class='del'>-          See MIXART.txt for details.</div><div class='del'>-</div><div class='del'>-    When the driver is compiled as a module and the hotplug firmware</div><div class='del'>-    is supported, the firmware data is loaded via hotplug automatically.</div><div class='del'>-    Install the necessary firmware files in alsa-firmware package.</div><div class='del'>-    When no hotplug fw loader is available, you need to load the</div><div class='del'>-    firmware via mixartloader utility in alsa-tools package.</div><div class='del'>-</div><div class='del'>-  Module snd-mona</div><div class='del'>-  ---------------</div><div class='del'>-</div><div class='del'>-    Module for Echoaudio Mona</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-mpu401</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for MPU-401 UART devices.</div><div class='del'>-</div><div class='del'>-    port	- port number or -1 (disable)</div><div class='del'>-    irq		- IRQ number or -1 (disable)</div><div class='del'>-    pnp		- PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    This module supports multiple devices and PnP.</div><div class='del'>-    </div><div class='del'>-  Module snd-msnd-classic</div><div class='del'>-  -----------------------</div><div class='del'>-</div><div class='del'>-    Module for Turtle Beach MultiSound Classic, Tahiti or Monterey</div><div class='del'>-    soundcards.</div><div class='del'>-</div><div class='del'>-    io		- Port # for msnd-classic card</div><div class='del'>-    irq		- IRQ # for msnd-classic card</div><div class='del'>-    mem		- Memory address (0xb0000, 0xc8000, 0xd0000, 0xd8000,</div><div class='del'>-		  0xe0000 or 0xe8000)</div><div class='del'>-    write_ndelay - enable write ndelay (default = 1)</div><div class='del'>-    calibrate_signal - calibrate signal (default = 0)</div><div class='del'>-    isapnp	- ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-    digital	- Digital daughterboard present (default = 0)</div><div class='del'>-    cfg		- Config port (0x250, 0x260 or 0x270) default = PnP</div><div class='del'>-    reset	- Reset all devices</div><div class='del'>-    mpu_io	- MPU401 I/O port</div><div class='del'>-    mpu_irq	- MPU401 irq#</div><div class='del'>-    ide_io0	- IDE port #0</div><div class='del'>-    ide_io1	- IDE port #1</div><div class='del'>-    ide_irq	- IDE irq#</div><div class='del'>-    joystick_io	- Joystick I/O port</div><div class='del'>-</div><div class='del'>-    The driver requires firmware files "turtlebeach/msndinit.bin" and</div><div class='del'>-    "turtlebeach/msndperm.bin" in the proper firmware directory.</div><div class='del'>-</div><div class='del'>-    See Documentation/sound/oss/MultiSound for important information</div><div class='del'>-    about this driver.  Note that it has been discontinued, but the </div><div class='del'>-    Voyetra Turtle Beach knowledge base entry for it is still available</div><div class='del'>-    at</div><div class='del'>-	http://www.turtlebeach.com</div><div class='del'>-</div><div class='del'>-  Module snd-msnd-pinnacle</div><div class='del'>-  ------------------------</div><div class='del'>-</div><div class='del'>-    Module for Turtle Beach MultiSound Pinnacle/Fiji soundcards.</div><div class='del'>-</div><div class='del'>-    io		- Port # for pinnacle/fiji card</div><div class='del'>-    irq		- IRQ # for pinnalce/fiji card</div><div class='del'>-    mem		- Memory address (0xb0000, 0xc8000, 0xd0000, 0xd8000,</div><div class='del'>-		  0xe0000 or 0xe8000)</div><div class='del'>-    write_ndelay - enable write ndelay (default = 1)</div><div class='del'>-    calibrate_signal - calibrate signal (default = 0)</div><div class='del'>-    isapnp	- ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    The driver requires firmware files "turtlebeach/pndspini.bin" and</div><div class='del'>-    "turtlebeach/pndsperm.bin" in the proper firmware directory.</div><div class='del'>-</div><div class='del'>-  Module snd-mtpav</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for MOTU MidiTimePiece AV multiport MIDI (on the parallel</div><div class='del'>-    port).</div><div class='del'>-</div><div class='del'>-    port	- I/O port # for MTPAV (0x378,0x278, default=0x378)</div><div class='del'>-    irq		- IRQ # for MTPAV (7,5, default=7)</div><div class='del'>-    hwports	- number of supported hardware ports, default=8.</div><div class='del'>-    </div><div class='del'>-    Module supports only 1 card.  This module has no enable option.</div><div class='del'>-</div><div class='del'>-  Module snd-mts64</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for Ego Systems (ESI) Miditerminal 4140</div><div class='del'>-</div><div class='del'>-    This module supports multiple devices.</div><div class='del'>-    Requires parport (CONFIG_PARPORT).</div><div class='del'>-</div><div class='del'>-  Module snd-nm256</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for NeoMagic NM256AV/ZX chips</div><div class='del'>-</div><div class='del'>-    playback_bufsize - max playback frame size in kB (4-128kB)</div><div class='del'>-    capture_bufsize  - max capture frame size in kB (4-128kB)</div><div class='del'>-    force_ac97       - 0 or 1 (disabled by default)</div><div class='del'>-    buffer_top       - specify buffer top address</div><div class='del'>-    use_cache        - 0 or 1 (disabled by default)</div><div class='del'>-    vaio_hack        - alias buffer_top=0x25a800</div><div class='del'>-    reset_workaround - enable AC97 RESET workaround for some laptops</div><div class='del'>-    reset_workaround2 - enable extended AC97 RESET workaround for some</div><div class='del'>-		      other laptops</div><div class='del'>-</div><div class='del'>-    This module supports one chip and autoprobe.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-    Note: on some notebooks the buffer address cannot be detected</div><div class='del'>-    automatically, or causes hang-up during initialization.</div><div class='del'>-    In such a case, specify the buffer top address explicitly via</div><div class='del'>-    the buffer_top option.</div><div class='del'>-    For example,</div><div class='del'>-      Sony F250: buffer_top=0x25a800</div><div class='del'>-      Sony F270: buffer_top=0x272800</div><div class='del'>-    The driver supports only ac97 codec.  It's possible to force</div><div class='del'>-    to initialize/use ac97 although it's not detected.  In such a</div><div class='del'>-    case, use force_ac97=1 option - but *NO* guarantee whether it</div><div class='del'>-    works!</div><div class='del'>-</div><div class='del'>-    Note: The NM256 chip can be linked internally with non-AC97</div><div class='del'>-    codecs.  This driver supports only the AC97 codec, and won't work</div><div class='del'>-    with machines with other (most likely CS423x or OPL3SAx) chips,</div><div class='del'>-    even though the device is detected in lspci.  In such a case, try</div><div class='del'>-    other drivers, e.g. snd-cs4232 or snd-opl3sa2.  Some has ISA-PnP</div><div class='del'>-    but some doesn't have ISA PnP.  You'll need to specify isapnp=0</div><div class='del'>-    and proper hardware parameters in the case without ISA PnP.</div><div class='del'>-</div><div class='del'>-    Note: some laptops need a workaround for AC97 RESET.  For the</div><div class='del'>-    known hardware like Dell Latitude LS and Sony PCG-F305, this</div><div class='del'>-    workaround is enabled automatically.  For other laptops with a</div><div class='del'>-    hard freeze, you can try reset_workaround=1 option.</div><div class='del'>-</div><div class='del'>-    Note: Dell Latitude CSx laptops have another problem regarding</div><div class='del'>-    AC97 RESET.  On these laptops, reset_workaround2 option is</div><div class='del'>-    turned on as default.  This option is worth to try if the</div><div class='del'>-    previous reset_workaround option doesn't help.</div><div class='del'>-</div><div class='del'>-    Note: This driver is really crappy.  It's a porting from the</div><div class='del'>-    OSS driver, which is a result of black-magic reverse engineering.</div><div class='del'>-    The detection of codec will fail if the driver is loaded *after*</div><div class='del'>-    X-server as described above.  You might be able to force to load</div><div class='del'>-    the module, but it may result in hang-up.   Hence, make sure that</div><div class='del'>-    you load this module *before* X if you encounter this kind of</div><div class='del'>-    problem.</div><div class='del'>-</div><div class='del'>-  Module snd-opl3sa2</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Yamaha OPL3-SA2/SA3 sound cards.</div><div class='del'>-</div><div class='del'>-    isapnp	- ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following options are available:</div><div class='del'>-</div><div class='del'>-    port	- control port # for OPL3-SA chip (0x370)</div><div class='del'>-    sb_port	- SB port # for OPL3-SA chip (0x220,0x240)</div><div class='del'>-    wss_port	- WSS port # for OPL3-SA chip (0x530,0xe80,0xf40,0x604)</div><div class='del'>-    midi_port	- port # for MPU-401 UART (0x300,0x330), -1 = disable</div><div class='del'>-    fm_port	- FM port # for OPL3-SA chip (0x388), -1 = disable</div><div class='del'>-    irq		- IRQ # for OPL3-SA chip (5,7,9,10)</div><div class='del'>-    dma1	- first DMA # for Yamaha OPL3-SA chip (0,1,3)</div><div class='del'>-    dma2	- second DMA # for Yamaha OPL3-SA chip (0,1,3), -1 = disable</div><div class='del'>-    </div><div class='del'>-    This module supports multiple cards and ISA PnP.  It does not support</div><div class='del'>-    autoprobe (if ISA PnP is not used) thus all ports must be specified!!!</div><div class='del'>-    </div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-opti92x-ad1848</div><div class='del'>-  -------------------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on OPTi 82c92x and Analog Devices AD1848 chips.</div><div class='del'>-    Module works with OAK Mozart cards as well.</div><div class='del'>-    </div><div class='del'>-    isapnp    - ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following options are available:</div><div class='del'>-</div><div class='del'>-    port      - port # for WSS chip (0x530,0xe80,0xf40,0x604)</div><div class='del'>-    mpu_port  - port # for MPU-401 UART (0x300,0x310,0x320,0x330)</div><div class='del'>-    fm_port   - port # for OPL3 device (0x388)</div><div class='del'>-    irq       - IRQ # for WSS chip (5,7,9,10,11)</div><div class='del'>-    mpu_irq   - IRQ # for MPU-401 UART (5,7,9,10)</div><div class='del'>-    dma1      - first DMA # for WSS chip (0,1,3)</div><div class='del'>-</div><div class='del'>-    This module supports only one card, autoprobe and PnP.</div><div class='del'>-</div><div class='del'>-  Module snd-opti92x-cs4231</div><div class='del'>-  -------------------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on OPTi 82c92x and Crystal CS4231 chips.</div><div class='del'>-    </div><div class='del'>-    isapnp    - ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following options are available:</div><div class='del'>-</div><div class='del'>-    port      - port # for WSS chip (0x530,0xe80,0xf40,0x604)</div><div class='del'>-    mpu_port  - port # for MPU-401 UART (0x300,0x310,0x320,0x330)</div><div class='del'>-    fm_port   - port # for OPL3 device (0x388)</div><div class='del'>-    irq       - IRQ # for WSS chip (5,7,9,10,11)</div><div class='del'>-    mpu_irq   - IRQ # for MPU-401 UART (5,7,9,10)</div><div class='del'>-    dma1      - first DMA # for WSS chip (0,1,3)</div><div class='del'>-    dma2      - second DMA # for WSS chip (0,1,3)</div><div class='del'>-</div><div class='del'>-    This module supports only one card, autoprobe and PnP.</div><div class='del'>-</div><div class='del'>-  Module snd-opti93x</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on OPTi 82c93x chips.</div><div class='del'>-    </div><div class='del'>-    isapnp    - ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following options are available:</div><div class='del'>-</div><div class='del'>-    port      - port # for WSS chip (0x530,0xe80,0xf40,0x604)</div><div class='del'>-    mpu_port  - port # for MPU-401 UART (0x300,0x310,0x320,0x330)</div><div class='del'>-    fm_port   - port # for OPL3 device (0x388)</div><div class='del'>-    irq       - IRQ # for WSS chip (5,7,9,10,11)</div><div class='del'>-    mpu_irq   - IRQ # for MPU-401 UART (5,7,9,10)</div><div class='del'>-    dma1      - first DMA # for WSS chip (0,1,3)</div><div class='del'>-    dma2      - second DMA # for WSS chip (0,1,3)</div><div class='del'>-</div><div class='del'>-    This module supports only one card, autoprobe and PnP.</div><div class='del'>-</div><div class='del'>-  Module snd-oxygen</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on the C-Media CMI8786/8787/8788 chip:</div><div class='del'>-    * Asound A-8788</div><div class='del'>-    * Asus Xonar DG/DGX</div><div class='del'>-    * AuzenTech X-Meridian</div><div class='del'>-    * AuzenTech X-Meridian 2G</div><div class='del'>-    * Bgears b-Enspirer</div><div class='del'>-    * Club3D Theatron DTS</div><div class='del'>-    * HT-Omega Claro (plus)</div><div class='del'>-    * HT-Omega Claro halo (XT)</div><div class='del'>-    * Kuroutoshikou CMI8787-HG2PCI</div><div class='del'>-    * Razer Barracuda AC-1</div><div class='del'>-    * Sondigo Inferno</div><div class='del'>-    * TempoTec HiFier Fantasia</div><div class='del'>-    * TempoTec HiFier Serenade</div><div class='del'>-</div><div class='del'>-    This module supports autoprobe and multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-pcsp</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for internal PC-Speaker.</div><div class='del'>-</div><div class='del'>-    nopcm	- Disable PC-Speaker PCM sound. Only beeps remain.</div><div class='del'>-    nforce_wa	- enable NForce chipset workaround. Expect bad sound.</div><div class='del'>-</div><div class='del'>-    This module supports system beeps, some kind of PCM playback and</div><div class='del'>-    even a few mixer controls.</div><div class='del'>-</div><div class='del'>-  Module snd-pcxhr</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for Digigram PCXHR boards</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-portman2x4</div><div class='del'>-  ---------------------</div><div class='del'>-</div><div class='del'>-    Module for Midiman Portman 2x4 parallel port MIDI interface</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-powermac (on ppc only)</div><div class='del'>-  ---------------------------------</div><div class='del'>-</div><div class='del'>-    Module for PowerMac, iMac and iBook on-board soundchips</div><div class='del'>-</div><div class='del'>-    enable_beep     - enable beep using PCM (enabled as default)</div><div class='del'>-</div><div class='del'>-    Module supports autoprobe a chip.</div><div class='del'>-</div><div class='del'>-    Note: the driver may have problems regarding endianness.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-pxa2xx-ac97 (on arm only)</div><div class='del'>-  ------------------------------------</div><div class='del'>-</div><div class='del'>-    Module for AC97 driver for the Intel PXA2xx chip</div><div class='del'>-</div><div class='del'>-    For ARM architecture only.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-riptide</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Conexant Riptide chip</div><div class='del'>-</div><div class='del'>-      joystick_port	- Joystick port # (default: 0x200)</div><div class='del'>-      mpu_port		- MPU401 port # (default: 0x330)</div><div class='del'>-      opl3_port		- OPL3 port # (default: 0x388)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-    You need to install the firmware file "riptide.hex" to the standard</div><div class='del'>-    firmware path (e.g. /lib/firmware).</div><div class='del'>-</div><div class='del'>-  Module snd-rme32</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for RME Digi32, Digi32 Pro and Digi32/8 (Sek'd Prodif32, </div><div class='del'>-    Prodif96 and Prodif Gold) sound cards.</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-rme96</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for RME Digi96, Digi96/8 and Digi96/8 PRO/PAD/PST sound cards.</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-rme9652</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for RME Digi9652 (Hammerfall, Hammerfall-Light) sound cards.</div><div class='del'>-</div><div class='del'>-    precise_ptr	- Enable precise pointer (doesn't work reliably).</div><div class='del'>-		  (default = 0)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-    Note: snd-page-alloc module does the job which snd-hammerfall-mem</div><div class='del'>-          module did formerly.  It will allocate the buffers in advance</div><div class='del'>-          when any RME9652 cards are found.  To make the buffer</div><div class='del'>-          allocation sure, load snd-page-alloc module in the early</div><div class='del'>-          stage of boot sequence.  See "Early Buffer Allocation"</div><div class='del'>-	  section.</div><div class='del'>-</div><div class='del'>-  Module snd-sa11xx-uda1341 (on arm only)</div><div class='del'>-  ---------------------------------------</div><div class='del'>-</div><div class='del'>-    Module for Philips UDA1341TS on Compaq iPAQ H3600 sound card.</div><div class='del'>-</div><div class='del'>-    Module supports only one card.</div><div class='del'>-    Module has no enable and index options.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-sb8</div><div class='del'>-  --------------</div><div class='del'>-</div><div class='del'>-    Module for 8-bit SoundBlaster cards: SoundBlaster 1.0,</div><div class='del'>-					 SoundBlaster 2.0,</div><div class='del'>-					 SoundBlaster Pro</div><div class='del'>-</div><div class='del'>-    port	- port # for SB DSP chip (0x220,0x240,0x260)</div><div class='del'>-    irq		- IRQ # for SB DSP chip (5,7,9,10)</div><div class='del'>-    dma8	- DMA # for SB DSP chip (1,3)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-    </div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-sb16 and snd-sbawe</div><div class='del'>-  -----------------------------</div><div class='del'>-</div><div class='del'>-    Module for 16-bit SoundBlaster cards: SoundBlaster 16 (PnP),</div><div class='del'>-					  SoundBlaster AWE 32 (PnP),</div><div class='del'>-					  SoundBlaster AWE 64 PnP</div><div class='del'>-</div><div class='del'>-    mic_agc	- Mic Auto-Gain-Control - 0 = disable, 1 = enable (default)</div><div class='del'>-    csp		- ASP/CSP chip support - 0 = disable (default), 1 = enable</div><div class='del'>-    isapnp	- ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following options are available:</div><div class='del'>-</div><div class='del'>-    port	- port # for SB DSP 4.x chip (0x220,0x240,0x260)</div><div class='del'>-    mpu_port	- port # for MPU-401 UART (0x300,0x330), -1 = disable</div><div class='del'>-    awe_port	- base port # for EMU8000 synthesizer (0x620,0x640,0x660)</div><div class='del'>-                   (snd-sbawe module only)</div><div class='del'>-    irq		- IRQ # for SB DSP 4.x chip (5,7,9,10)</div><div class='del'>-    dma8	- 8-bit DMA # for SB DSP 4.x chip (0,1,3)</div><div class='del'>-    dma16	- 16-bit DMA # for SB DSP 4.x chip (5,6,7)</div><div class='del'>-    </div><div class='del'>-    This module supports multiple cards, autoprobe and ISA PnP.</div><div class='del'>-</div><div class='del'>-    Note: To use Vibra16X cards in 16-bit half duplex mode, you must</div><div class='del'>-          disable 16bit DMA with dma16 = -1 module parameter.</div><div class='del'>-          Also, all Sound Blaster 16 type cards can operate in 16-bit</div><div class='del'>-          half duplex mode through 8-bit DMA channel by disabling their</div><div class='del'>-          16-bit DMA channel.</div><div class='del'>-    </div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-sc6000</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Gallant SC-6000 soundcard and later models: SC-6600</div><div class='del'>-    and SC-7000.</div><div class='del'>-</div><div class='del'>-    port	- Port # (0x220 or 0x240)</div><div class='del'>-    mss_port	- MSS Port # (0x530 or 0xe80)</div><div class='del'>-    irq		- IRQ # (5,7,9,10,11)</div><div class='del'>-    mpu_irq	- MPU-401 IRQ # (5,7,9,10) ,0 - no MPU-401 irq</div><div class='del'>-    dma		- DMA # (1,3,0)</div><div class='del'>-    joystick	- Enable gameport - 0 = disable (default), 1 = enable</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-    This card is also known as Audio Excel DSP 16 or Zoltrix AV302.</div><div class='del'>-</div><div class='del'>-  Module snd-sscape</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for ENSONIQ SoundScape cards.</div><div class='del'>-</div><div class='del'>-    port	- Port # (PnP setup)</div><div class='del'>-    wss_port	- WSS Port # (PnP setup)</div><div class='del'>-    irq		- IRQ # (PnP setup)</div><div class='del'>-    mpu_irq	- MPU-401 IRQ # (PnP setup)</div><div class='del'>-    dma		- DMA # (PnP setup)</div><div class='del'>-    dma2	- 2nd DMA # (PnP setup, -1 to disable)</div><div class='del'>-    joystick	- Enable gameport - 0 = disable (default), 1 = enable</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-    The driver requires the firmware loader support on kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-sun-amd7930 (on sparc only)</div><div class='del'>-  --------------------------------------</div><div class='del'>-</div><div class='del'>-    Module for AMD7930 sound chips found on Sparcs.</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-sun-cs4231 (on sparc only)</div><div class='del'>-  -------------------------------------</div><div class='del'>-</div><div class='del'>-    Module for CS4231 sound chips found on Sparcs.</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-sun-dbri (on sparc only)</div><div class='del'>-  -----------------------------------</div><div class='del'>-</div><div class='del'>-    Module for DBRI sound chips found on Sparcs.</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-wavefront</div><div class='del'>-  --------------------</div><div class='del'>-</div><div class='del'>-    Module for Turtle Beach Maui, Tropez and Tropez+ sound cards.</div><div class='del'>-</div><div class='del'>-    use_cs4232_midi - Use CS4232 MPU-401 interface</div><div class='del'>-                      (inaccessibly located inside your computer)</div><div class='del'>-    isapnp          - ISA PnP detection - 0 = disable, 1 = enable (default)</div><div class='del'>-</div><div class='del'>-    with isapnp=0, the following options are available:</div><div class='del'>-</div><div class='del'>-    cs4232_pcm_port - Port # for CS4232 PCM interface.</div><div class='del'>-    cs4232_pcm_irq  - IRQ # for CS4232 PCM interface (5,7,9,11,12,15).</div><div class='del'>-    cs4232_mpu_port - Port # for CS4232 MPU-401 interface.</div><div class='del'>-    cs4232_mpu_irq  - IRQ # for CS4232 MPU-401 interface (9,11,12,15).</div><div class='del'>-    ics2115_port    - Port # for ICS2115</div><div class='del'>-    ics2115_irq     - IRQ # for ICS2115</div><div class='del'>-    fm_port         - FM OPL-3 Port #</div><div class='del'>-    dma1            - DMA1 # for CS4232 PCM interface.</div><div class='del'>-    dma2            - DMA2 # for CS4232 PCM interface.</div><div class='del'>-</div><div class='del'>-    The below are options for wavefront_synth features:</div><div class='del'>-    wf_raw	    - Assume that we need to boot the OS (default:no)</div><div class='del'>-	If yes, then during driver loading, the state of the board is</div><div class='del'>-	ignored, and we reset the board and load the firmware anyway.</div><div class='del'>-    fx_raw	    - Assume that the FX process needs help (default:yes)</div><div class='del'>-	If false, we'll leave the FX processor in whatever state it is</div><div class='del'>-	when the driver is loaded.  The default is to download the</div><div class='del'>-	microprogram and associated coefficients to set it up for</div><div class='del'>-	"default" operation, whatever that means.</div><div class='del'>-    debug_default   - Debug parameters for card initialization</div><div class='del'>-    wait_usecs	    - How long to wait without sleeping, usecs</div><div class='del'>-		      (default:150)</div><div class='del'>-	This magic number seems to give pretty optimal throughput</div><div class='del'>-	based on my limited experimentation. </div><div class='del'>-	If you want to play around with it and find a better value, be</div><div class='del'>-	my guest. Remember, the idea is to get a number that causes us</div><div class='del'>-	to just busy wait for as many WaveFront commands as possible,</div><div class='del'>-	without coming up with a number so large that we hog the whole</div><div class='del'>-	CPU. </div><div class='del'>-	Specifically, with this number, out of about 134,000 status</div><div class='del'>-	waits, only about 250 result in a sleep. </div><div class='del'>-    sleep_interval  - How long to sleep when waiting for reply</div><div class='del'>-		      (default: 100)</div><div class='del'>-    sleep_tries	    - How many times to try sleeping during a wait</div><div class='del'>-		      (default: 50)</div><div class='del'>-    ospath	    - Pathname to processed ICS2115 OS firmware</div><div class='del'>-		      (default:wavefront.os)</div><div class='del'>-	The path name of the ISC2115 OS firmware.  In the recent</div><div class='del'>-	version, it's handled via firmware loader framework, so it</div><div class='del'>-	must be installed in the proper path, typically,</div><div class='del'>-	/lib/firmware.</div><div class='del'>-    reset_time	    - How long to wait for a reset to take effect</div><div class='del'>-		      (default:2)</div><div class='del'>-    ramcheck_time   - How many seconds to wait for the RAM test</div><div class='del'>-		      (default:20)</div><div class='del'>-    osrun_time	    - How many seconds to wait for the ICS2115 OS</div><div class='del'>-		      (default:10)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and ISA PnP.</div><div class='del'>-</div><div class='del'>-    Note: the firmware file "wavefront.os" was located in the earlier</div><div class='del'>-          version in /etc.  Now it's loaded via firmware loader, and</div><div class='del'>-	  must be in the proper firmware path, such as /lib/firmware.</div><div class='del'>-	  Copy (or symlink) the file appropriately if you get an error</div><div class='del'>-	  regarding firmware downloading after upgrading the kernel.</div><div class='del'>-</div><div class='del'>-  Module snd-sonicvibes</div><div class='del'>-  ---------------------</div><div class='del'>-</div><div class='del'>-    Module for S3 SonicVibes PCI sound cards.</div><div class='del'>-			* PINE Schubert 32 PCI</div><div class='del'>-</div><div class='del'>-    reverb    - Reverb Enable - 1 = enable, 0 = disable (default)</div><div class='del'>-                  - SoundCard must have onboard SRAM for this.</div><div class='del'>-    mge       - Mic Gain Enable - 1 = enable, 0 = disable (default)</div><div class='del'>-    </div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-</div><div class='del'>-  Module snd-serial-u16550</div><div class='del'>-  ------------------------</div><div class='del'>-</div><div class='del'>-    Module for UART16550A serial MIDI ports.</div><div class='del'>-</div><div class='del'>-    port	- port # for UART16550A chip</div><div class='del'>-    irq		- IRQ # for UART16550A chip, -1 = poll mode</div><div class='del'>-    speed	- speed in bauds (9600,19200,38400,57600,115200)</div><div class='del'>-		  38400 = default</div><div class='del'>-    base	- base for divisor in bauds (57600,115200,230400,460800)</div><div class='del'>-		  115200 = default</div><div class='del'>-    outs	- number of MIDI ports in a serial port (1-4)</div><div class='del'>-		  1 = default</div><div class='del'>-    adaptor	- Type of adaptor.</div><div class='del'>-                  0 = Soundcanvas, 1 = MS-124T, 2 = MS-124W S/A,</div><div class='del'>-		  3 = MS-124W M/B, 4 = Generic</div><div class='del'>-    </div><div class='del'>-    This module supports multiple cards. This module does not support autoprobe</div><div class='del'>-    thus the main port must be specified!!! Other options are optional.</div><div class='del'>-</div><div class='del'>-  Module snd-trident</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for Trident 4DWave DX/NX sound cards.</div><div class='del'>-			* Best Union  Miss Melody 4DWave PCI</div><div class='del'>-			* HIS  4DWave PCI</div><div class='del'>-			* Warpspeed  ONSpeed 4DWave PCI</div><div class='del'>-			* AzTech  PCI 64-Q3D</div><div class='del'>-			* Addonics  SV 750</div><div class='del'>-			* CHIC  True Sound 4Dwave</div><div class='del'>-			* Shark  Predator4D-PCI</div><div class='del'>-			* Jaton  SonicWave 4D</div><div class='del'>-			* SiS SI7018 PCI Audio</div><div class='del'>-			* Hoontech SoundTrack Digital 4DWave NX</div><div class='del'>-</div><div class='del'>-    pcm_channels   - max channels (voices) reserved for PCM</div><div class='del'>-    wavetable_size - max wavetable size in kB (4-?kb)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards and autoprobe.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-ua101</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for the Edirol UA-101/UA-1000 audio/MIDI interfaces.</div><div class='del'>-</div><div class='del'>-    This module supports multiple devices, autoprobe and hotplugging.</div><div class='del'>-</div><div class='del'>-  Module snd-usb-audio</div><div class='del'>-  --------------------</div><div class='del'>-</div><div class='del'>-    Module for USB audio and USB MIDI devices.</div><div class='del'>-</div><div class='del'>-    vid             - Vendor ID for the device (optional)</div><div class='del'>-    pid             - Product ID for the device (optional)</div><div class='del'>-    nrpacks	    - Max. number of packets per URB (default: 8)</div><div class='del'>-    device_setup    - Device specific magic number (optional)</div><div class='del'>-                    - Influence depends on the device</div><div class='del'>-                    - Default: 0x0000 </div><div class='del'>-    ignore_ctl_error - Ignore any USB-controller regarding mixer</div><div class='del'>-    		       interface (default: no)</div><div class='del'>-    autoclock	    - Enable auto-clock selection for UAC2 devices</div><div class='del'>-		      (default: yes)</div><div class='del'>-    quirk_alias	    - Quirk alias list, pass strings like</div><div class='del'>-		      "0123abcd:5678beef", which applies the existing</div><div class='del'>-		      quirk for the device 5678:beef to a new device</div><div class='del'>-		      0123:abcd.</div><div class='del'>-</div><div class='del'>-    This module supports multiple devices, autoprobe and hotplugging.</div><div class='del'>-</div><div class='del'>-    NB: nrpacks parameter can be modified dynamically via sysfs.</div><div class='del'>-        Don't put the value over 20.  Changing via sysfs has no sanity</div><div class='del'>-	check.</div><div class='del'>-    NB: ignore_ctl_error=1 may help when you get an error at accessing</div><div class='del'>-        the mixer element such as URB error -22.  This happens on some</div><div class='del'>-        buggy USB device or the controller.</div><div class='del'>-    NB: quirk_alias option is provided only for testing / development.</div><div class='del'>-        If you want to have a proper support, contact to upstream for</div><div class='del'>-	adding the matching quirk in the driver code statically.</div><div class='del'>-</div><div class='del'>-  Module snd-usb-caiaq</div><div class='del'>-  --------------------</div><div class='del'>-</div><div class='del'>-    Module for caiaq UB audio interfaces,</div><div class='del'>-	    * Native Instruments RigKontrol2</div><div class='del'>-	    * Native Instruments Kore Controller</div><div class='del'>-	    * Native Instruments Audio Kontrol 1</div><div class='del'>-	    * Native Instruments Audio 8 DJ</div><div class='del'>-</div><div class='del'>-    This module supports multiple devices, autoprobe and hotplugging.</div><div class='del'>-</div><div class='del'>-  Module snd-usb-usx2y</div><div class='del'>-  --------------------</div><div class='del'>-</div><div class='del'>-    Module for Tascam USB US-122, US-224 and US-428 devices.</div><div class='del'>-</div><div class='del'>-    This module supports multiple devices, autoprobe and hotplugging.</div><div class='del'>-</div><div class='del'>-    Note: you need to load the firmware via usx2yloader utility included</div><div class='del'>-          in alsa-tools and alsa-firmware packages.</div><div class='del'>-</div><div class='del'>-  Module snd-via82xx</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for AC'97 motherboards based on VIA 82C686A/686B, 8233,</div><div class='del'>-    8233A, 8233C, 8235, 8237 (south) bridge.</div><div class='del'>-</div><div class='del'>-    mpu_port	- 0x300,0x310,0x320,0x330, otherwise obtain BIOS setup</div><div class='del'>-		  [VIA686A/686B only]</div><div class='del'>-    joystick	- Enable joystick (default off) [VIA686A/686B only]</div><div class='del'>-    ac97_clock	- AC'97 codec clock base (default 48000Hz)</div><div class='del'>-    dxs_support	- support DXS channels,</div><div class='del'>-		  0 = auto (default), 1 = enable, 2 = disable,</div><div class='del'>-		  3 = 48k only, 4 = no VRA, 5 = enable any sample</div><div class='del'>-		  rate and different sample rates on different</div><div class='del'>-		  channels</div><div class='del'>-		  [VIA8233/C, 8235, 8237 only]</div><div class='del'>-    ac97_quirk  - AC'97 workaround for strange hardware</div><div class='del'>-		  See "AC97 Quirk Option" section below.</div><div class='del'>-</div><div class='del'>-    This module supports one chip and autoprobe.</div><div class='del'>-</div><div class='del'>-    Note: on some SMP motherboards like MSI 694D the interrupts might</div><div class='del'>-          not be generated properly.  In such a case, please try to</div><div class='del'>-          set the SMP (or MPS) version on BIOS to 1.1 instead of</div><div class='del'>-          default value 1.4.  Then the interrupt number will be</div><div class='del'>-          assigned under 15. You might also upgrade your BIOS.</div><div class='del'>-    </div><div class='del'>-    Note: VIA8233/5/7 (not VIA8233A) can support DXS (direct sound)</div><div class='del'>-	  channels as the first PCM.  On these channels, up to 4</div><div class='del'>-	  streams can be played at the same time, and the controller</div><div class='del'>-	  can perform sample rate conversion with separate rates for</div><div class='del'>-	  each channel.</div><div class='del'>-	  As default (dxs_support = 0), 48k fixed rate is chosen</div><div class='del'>-	  except for the known devices since the output is often</div><div class='del'>-	  noisy except for 48k on some mother boards due to the</div><div class='del'>-	  bug of BIOS.</div><div class='del'>-	  Please try once dxs_support=5 and if it works on other</div><div class='del'>-	  sample rates (e.g. 44.1kHz of mp3 playback), please let us</div><div class='del'>-	  know the PCI subsystem vendor/device id's (output of</div><div class='del'>-	  "lspci -nv").</div><div class='del'>-	  If dxs_support=5 does not work, try dxs_support=4; if it</div><div class='del'>-	  doesn't work too, try dxs_support=1.  (dxs_support=1 is</div><div class='del'>-	  usually for old motherboards.  The correct implemented</div><div class='del'>-	  board should work with 4 or 5.)  If it still doesn't</div><div class='del'>-	  work and the default setting is ok, dxs_support=3 is the</div><div class='del'>-	  right choice.  If the default setting doesn't work at all,</div><div class='del'>-	  try dxs_support=2 to disable the DXS channels.</div><div class='del'>-	  In any cases, please let us know the result and the</div><div class='del'>-	  subsystem vendor/device ids.  See "Links and Addresses"</div><div class='del'>-	  below.</div><div class='del'>-</div><div class='del'>-    Note: for the MPU401 on VIA823x, use snd-mpu401 driver</div><div class='del'>-	  additionally.  The mpu_port option is for VIA686 chips only.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-via82xx-modem</div><div class='del'>-  ------------------------</div><div class='del'>-</div><div class='del'>-    Module for VIA82xx AC97 modem</div><div class='del'>-</div><div class='del'>-    ac97_clock	- AC'97 codec clock base (default 48000Hz)</div><div class='del'>-</div><div class='del'>-    This module supports one card and autoprobe.</div><div class='del'>-</div><div class='del'>-    Note: The default index value of this module is -2, i.e. the first</div><div class='del'>-          slot is excluded.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-virmidi</div><div class='del'>-  ------------------</div><div class='del'>-</div><div class='del'>-    Module for virtual rawmidi devices.</div><div class='del'>-    This module creates virtual rawmidi devices which communicate</div><div class='del'>-    to the corresponding ALSA sequencer ports.</div><div class='del'>-</div><div class='del'>-    midi_devs	- MIDI devices # (1-4, default=4)</div><div class='del'>-    </div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-virtuoso</div><div class='del'>-  -------------------</div><div class='del'>-</div><div class='del'>-    Module for sound cards based on the Asus AV66/AV100/AV200 chips,</div><div class='del'>-    i.e., Xonar D1, DX, D2, D2X, DS, DSX, Essence ST (Deluxe),</div><div class='del'>-    Essence STX (II), HDAV1.3 (Deluxe), and HDAV1.3 Slim.</div><div class='del'>-</div><div class='del'>-    This module supports autoprobe and multiple cards.</div><div class='del'>-</div><div class='del'>-  Module snd-vx222</div><div class='del'>-  ----------------</div><div class='del'>-</div><div class='del'>-    Module for Digigram VX-Pocket VX222, V222 v2 and Mic cards.</div><div class='del'>-</div><div class='del'>-    mic		- Enable Microphone on V222 Mic (NYI)</div><div class='del'>-    ibl		- Capture IBL size. (default = 0, minimum size)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.</div><div class='del'>-</div><div class='del'>-    When the driver is compiled as a module and the hotplug firmware</div><div class='del'>-    is supported, the firmware data is loaded via hotplug automatically.</div><div class='del'>-    Install the necessary firmware files in alsa-firmware package.</div><div class='del'>-    When no hotplug fw loader is available, you need to load the</div><div class='del'>-    firmware via vxloader utility in alsa-tools package.  To invoke</div><div class='del'>-    vxloader automatically, add the following to /etc/modprobe.d/alsa.conf</div><div class='del'>-</div><div class='del'>-	install snd-vx222 /sbin/modprobe --first-time -i snd-vx222 &amp;&amp; /usr/bin/vxloader</div><div class='del'>-</div><div class='del'>-    (for 2.2/2.4 kernels, add "post-install /usr/bin/vxloader" to</div><div class='del'>-     /etc/modules.conf, instead.)</div><div class='del'>-    IBL size defines the interrupts period for PCM.  The smaller size</div><div class='del'>-    gives smaller latency but leads to more CPU consumption, too.</div><div class='del'>-    The size is usually aligned to 126.  As default (=0), the smallest</div><div class='del'>-    size is chosen.  The possible IBL values can be found in</div><div class='del'>-    /proc/asound/cardX/vx-status proc file.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-vxpocket</div><div class='del'>-  -------------------</div><div class='del'>-</div><div class='del'>-    Module for Digigram VX-Pocket VX2 and 440 PCMCIA cards.</div><div class='del'>-</div><div class='del'>-    ibl      - Capture IBL size. (default = 0, minimum size)</div><div class='del'>-</div><div class='del'>-    This module supports multiple cards.  The module is compiled only when</div><div class='del'>-    PCMCIA is supported on kernel.</div><div class='del'>-</div><div class='del'>-    With the older 2.6.x kernel, to activate the driver via the card</div><div class='del'>-    manager, you'll need to set up /etc/pcmcia/vxpocket.conf.  See the</div><div class='del'>-    sound/pcmcia/vx/vxpocket.c.  2.6.13 or later kernel requires no</div><div class='del'>-    longer require a config file.</div><div class='del'>-</div><div class='del'>-    When the driver is compiled as a module and the hotplug firmware</div><div class='del'>-    is supported, the firmware data is loaded via hotplug automatically.</div><div class='del'>-    Install the necessary firmware files in alsa-firmware package.</div><div class='del'>-    When no hotplug fw loader is available, you need to load the</div><div class='del'>-    firmware via vxloader utility in alsa-tools package.</div><div class='del'>-</div><div class='del'>-    About capture IBL, see the description of snd-vx222 module.</div><div class='del'>-</div><div class='del'>-    Note: snd-vxp440 driver is merged to snd-vxpocket driver since</div><div class='del'>-           ALSA 1.0.10.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-ymfpci</div><div class='del'>-  -----------------</div><div class='del'>-</div><div class='del'>-    Module for Yamaha PCI chips (YMF72x, YMF74x &amp; YMF75x).</div><div class='del'>-</div><div class='del'>-    mpu_port      - 0x300,0x330,0x332,0x334, 0 (disable) by default,</div><div class='del'>-                    1 (auto-detect for YMF744/754 only)</div><div class='del'>-    fm_port       - 0x388,0x398,0x3a0,0x3a8, 0 (disable) by default</div><div class='del'>-                    1 (auto-detect for YMF744/754 only)</div><div class='del'>-    joystick_port - 0x201,0x202,0x204,0x205, 0 (disable) by default,</div><div class='del'>-                    1 (auto-detect)</div><div class='del'>-    rear_switch   - enable shared rear/line-in switch (bool)</div><div class='del'>-</div><div class='del'>-    This module supports autoprobe and multiple chips.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-  Module snd-pdaudiocf</div><div class='del'>-  --------------------</div><div class='del'>-</div><div class='del'>-    Module for Sound Core PDAudioCF sound card.</div><div class='del'>-</div><div class='del'>-    The power-management is supported.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-AC97 Quirk Option</div><div class='del'>-=================</div><div class='del'>-</div><div class='del'>-The ac97_quirk option is used to enable/override the workaround for</div><div class='del'>-specific devices on drivers for on-board AC'97 controllers like</div><div class='del'>-snd-intel8x0.  Some hardware have swapped output pins between Master</div><div class='del'>-and Headphone, or Surround (thanks to confusion of AC'97</div><div class='del'>-specifications from version to version :-)</div><div class='del'>-</div><div class='del'>-The driver provides the auto-detection of known problematic devices,</div><div class='del'>-but some might be unknown or wrongly detected.  In such a case, pass</div><div class='del'>-the proper value with this option.</div><div class='del'>-</div><div class='del'>-The following strings are accepted:</div><div class='del'>-    - default	Don't override the default setting</div><div class='del'>-    - none	Disable the quirk</div><div class='del'>-    - hp_only	Bind Master and Headphone controls as a single control</div><div class='del'>-    - swap_hp	Swap headphone and master controls</div><div class='del'>-    - swap_surround  Swap master and surround controls</div><div class='del'>-    - ad_sharing  For AD1985, turn on OMS bit and use headphone</div><div class='del'>-    - alc_jack	For ALC65x, turn on the jack sense mode</div><div class='del'>-    - inv_eapd	Inverted EAPD implementation</div><div class='del'>-    - mute_led	Bind EAPD bit for turning on/off mute LED</div><div class='del'>-</div><div class='del'>-For backward compatibility, the corresponding integer value -1, 0,</div><div class='del'>-... are  accepted, too.</div><div class='del'>-</div><div class='del'>-For example, if "Master" volume control has no effect on your device</div><div class='del'>-but only "Headphone" does, pass ac97_quirk=hp_only module option.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Configuring Non-ISAPNP Cards</div><div class='del'>-============================</div><div class='del'>-</div><div class='del'>-When the kernel is configured with ISA-PnP support, the modules</div><div class='del'>-supporting the isapnp cards will have module options "isapnp".</div><div class='del'>-If this option is set, *only* the ISA-PnP devices will be probed.</div><div class='del'>-For probing the non ISA-PnP cards, you have to pass "isapnp=0" option</div><div class='del'>-together with the proper i/o and irq configuration.</div><div class='del'>-</div><div class='del'>-When the kernel is configured without ISA-PnP support, isapnp option</div><div class='del'>-will be not built in.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Module Autoloading Support</div><div class='del'>-==========================</div><div class='del'>-</div><div class='del'>-The ALSA drivers can be loaded automatically on demand by defining</div><div class='del'>-module aliases.  The string 'snd-card-%1' is requested for ALSA native</div><div class='del'>-devices where %i is sound card number from zero to seven.</div><div class='del'>-</div><div class='del'>-To auto-load an ALSA driver for OSS services, define the string</div><div class='del'>-'sound-slot-%i' where %i means the slot number for OSS, which</div><div class='del'>-corresponds to the card index of ALSA.  Usually, define this</div><div class='del'>-as the same card module.</div><div class='del'>-</div><div class='del'>-An example configuration for a single emu10k1 card is like below:</div><div class='del'>------ /etc/modprobe.d/alsa.conf</div><div class='del'>-alias snd-card-0 snd-emu10k1</div><div class='del'>-alias sound-slot-0 snd-emu10k1</div><div class='del'>------ /etc/modprobe.d/alsa.conf</div><div class='del'>-</div><div class='del'>-The available number of auto-loaded sound cards depends on the module</div><div class='del'>-option "cards_limit" of snd module.  As default it's set to 1.</div><div class='del'>-To enable the auto-loading of multiple cards, specify the number of</div><div class='del'>-sound cards in that option.</div><div class='del'>-</div><div class='del'>-When multiple cards are available, it'd better to specify the index</div><div class='del'>-number for each card via module option, too, so that the order of</div><div class='del'>-cards is kept consistent.</div><div class='del'>-</div><div class='del'>-An example configuration for two sound cards is like below:</div><div class='del'>-</div><div class='del'>------ /etc/modprobe.d/alsa.conf</div><div class='del'>-# ALSA portion</div><div class='del'>-options snd cards_limit=2</div><div class='del'>-alias snd-card-0 snd-interwave</div><div class='del'>-alias snd-card-1 snd-ens1371</div><div class='del'>-options snd-interwave index=0</div><div class='del'>-options snd-ens1371 index=1</div><div class='del'>-# OSS/Free portion</div><div class='del'>-alias sound-slot-0 snd-interwave</div><div class='del'>-alias sound-slot-1 snd-ens1371</div><div class='del'>------ /etc/modprobe.d/alsa.conf</div><div class='del'>-</div><div class='del'>-In this example, the interwave card is always loaded as the first card</div><div class='del'>-(index 0) and ens1371 as the second (index 1).</div><div class='del'>-</div><div class='del'>-Alternative (and new) way to fixate the slot assignment is to use</div><div class='del'>-"slots" option of snd module.  In the case above, specify like the</div><div class='del'>-following: </div><div class='del'>-</div><div class='del'>-options snd slots=snd-interwave,snd-ens1371</div><div class='del'>-</div><div class='del'>-Then, the first slot (#0) is reserved for snd-interwave driver, and</div><div class='del'>-the second (#1) for snd-ens1371.  You can omit index option in each</div><div class='del'>-driver if slots option is used (although you can still have them at</div><div class='del'>-the same time as long as they don't conflict).</div><div class='del'>-</div><div class='del'>-The slots option is especially useful for avoiding the possible</div><div class='del'>-hot-plugging and the resultant slot conflict.  For example, in the</div><div class='del'>-case above again, the first two slots are already reserved.  If any</div><div class='del'>-other driver (e.g. snd-usb-audio) is loaded before snd-interwave or</div><div class='del'>-snd-ens1371, it will be assigned to the third or later slot.</div><div class='del'>-</div><div class='del'>-When a module name is given with '!', the slot will be given for any</div><div class='del'>-modules but that name.  For example, "slots=!snd-pcsp" will reserve</div><div class='del'>-the first slot for any modules but snd-pcsp. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ALSA PCM devices to OSS devices mapping</div><div class='del'>-=======================================</div><div class='del'>-</div><div class='del'>-/dev/snd/pcmC0D0[c|p]  -&gt; /dev/audio0 (/dev/audio) -&gt; minor 4</div><div class='del'>-/dev/snd/pcmC0D0[c|p]  -&gt; /dev/dsp0 (/dev/dsp)     -&gt; minor 3</div><div class='del'>-/dev/snd/pcmC0D1[c|p]  -&gt; /dev/adsp0 (/dev/adsp)   -&gt; minor 12</div><div class='del'>-/dev/snd/pcmC1D0[c|p]  -&gt; /dev/audio1              -&gt; minor 4+16 = 20</div><div class='del'>-/dev/snd/pcmC1D0[c|p]  -&gt; /dev/dsp1                -&gt; minor 3+16 = 19</div><div class='del'>-/dev/snd/pcmC1D1[c|p]  -&gt; /dev/adsp1               -&gt; minor 12+16 = 28</div><div class='del'>-/dev/snd/pcmC2D0[c|p]  -&gt; /dev/audio2              -&gt; minor 4+32 = 36</div><div class='del'>-/dev/snd/pcmC2D0[c|p]  -&gt; /dev/dsp2                -&gt; minor 3+32 = 39</div><div class='del'>-/dev/snd/pcmC2D1[c|p]  -&gt; /dev/adsp2               -&gt; minor 12+32 = 44</div><div class='del'>-</div><div class='del'>-The first number from /dev/snd/pcmC{X}D{Y}[c|p] expression means</div><div class='del'>-sound card number and second means device number.  The ALSA devices</div><div class='del'>-have either 'c' or 'p' suffix indicating the direction, capture and</div><div class='del'>-playback, respectively.</div><div class='del'>-</div><div class='del'>-Please note that the device mapping above may be varied via the module</div><div class='del'>-options of snd-pcm-oss module.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Proc interfaces (/proc/asound)</div><div class='del'>-==============================</div><div class='del'>-</div><div class='del'>-/proc/asound/card#/pcm#[cp]/oss</div><div class='del'>--------------------------------</div><div class='del'>-  String "erase" - erase all additional information about OSS applications</div><div class='del'>-  String "&lt;app_name&gt; &lt;fragments&gt; &lt;fragment_size&gt; [&lt;options&gt;]"</div><div class='del'>-</div><div class='del'>-   &lt;app_name&gt; - name of application with (higher priority) or without path</div><div class='del'>-   &lt;fragments&gt; - number of fragments or zero if auto</div><div class='del'>-   &lt;fragment_size&gt; - size of fragment in bytes or zero if auto</div><div class='del'>-   &lt;options&gt; - optional parameters</div><div class='del'>-	  - disable   the application tries to open a pcm device for</div><div class='del'>-		      this channel but does not want to use it.</div><div class='del'>-		      (Cause a bug or mmap needs)</div><div class='del'>-		      It's good for Quake etc...</div><div class='del'>-	  - direct    don't use plugins</div><div class='del'>-	  - block     force block mode (rvplayer)</div><div class='del'>-	  - non-block force non-block mode</div><div class='del'>-	  - whole-frag  write only whole fragments (optimization affecting</div><div class='del'>-			playback only)</div><div class='del'>-	  - no-silence  do not fill silence ahead to avoid clicks</div><div class='del'>-	  - buggy-ptr	Returns the whitespace blocks in GETOPTR ioctl</div><div class='del'>-			instead of filled blocks</div><div class='del'>-</div><div class='del'>-  Example: echo "x11amp 128 16384" &gt; /proc/asound/card0/pcm0p/oss</div><div class='del'>-           echo "squake 0 0 disable" &gt; /proc/asound/card0/pcm0c/oss</div><div class='del'>-	   echo "rvplayer 0 0 block" &gt; /proc/asound/card0/pcm0p/oss</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Early Buffer Allocation</div><div class='del'>-=======================</div><div class='del'>-</div><div class='del'>-Some drivers (e.g. hdsp) require the large contiguous buffers, and</div><div class='del'>-sometimes it's too late to find such spaces when the driver module is</div><div class='del'>-actually loaded due to memory fragmentation.  You can pre-allocate the</div><div class='del'>-PCM buffers by loading snd-page-alloc module and write commands to its</div><div class='del'>-proc file in prior, for example, in the early boot stage like</div><div class='del'>-/etc/init.d/*.local scripts.</div><div class='del'>-</div><div class='del'>-Reading the proc file /proc/drivers/snd-page-alloc shows the current</div><div class='del'>-usage of page allocation.  In writing, you can send the following</div><div class='del'>-commands to the snd-page-alloc driver:</div><div class='del'>-</div><div class='del'>-  - add VENDOR DEVICE MASK SIZE BUFFERS</div><div class='del'>-</div><div class='del'>-    VENDOR and DEVICE are PCI vendor and device IDs.  They take</div><div class='del'>-    integer numbers (0x prefix is needed for the hex).</div><div class='del'>-    MASK is the PCI DMA mask.  Pass 0 if not restricted.</div><div class='del'>-    SIZE is the size of each buffer to allocate.  You can pass</div><div class='del'>-    k and m suffix for KB and MB.  The max number is 16MB.</div><div class='del'>-    BUFFERS is the number of buffers to allocate.  It must be greater</div><div class='del'>-    than 0.  The max number is 4.</div><div class='del'>-</div><div class='del'>-  - erase</div><div class='del'>-</div><div class='del'>-    This will erase the all pre-allocated buffers which are not in</div><div class='del'>-    use.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Links and Addresses</div><div class='del'>-===================</div><div class='del'>-</div><div class='del'>-  ALSA project homepage</div><div class='del'>-       http://www.alsa-project.org</div><div class='del'>-</div><div class='del'>-  Kernel Bugzilla</div><div class='del'>-       http://bugzilla.kernel.org/</div><div class='del'>-</div><div class='del'>-  ALSA Developers ML</div><div class='del'>-       mailto:alsa-devel@alsa-project.org</div><div class='del'>-</div><div class='del'>-  alsa-info.sh script</div><div class='del'>-       http://www.alsa-project.org/alsa-info.sh</div><div class='head'>diff --git a/Documentation/sound/alsa/Audigy-mixer.txt b/Documentation/sound/alsa/Audigy-mixer.txt<br/>deleted file mode 100644<br/>index 7f10dc6ff28c..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/Audigy-mixer.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/Audigy-mixer.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,345 +0,0 @@</div><div class='del'>-</div><div class='del'>-		Sound Blaster Audigy mixer / default DSP code</div><div class='del'>-		===========================================</div><div class='del'>-</div><div class='del'>-This is based on SB-Live-mixer.txt.</div><div class='del'>-</div><div class='del'>-The EMU10K2 chips have a DSP part which can be programmed to support </div><div class='del'>-various ways of sample processing, which is described here.</div><div class='del'>-(This article does not deal with the overall functionality of the </div><div class='del'>-EMU10K2 chips. See the manuals section for further details.)</div><div class='del'>-</div><div class='del'>-The ALSA driver programs this portion of chip by default code</div><div class='del'>-(can be altered later) which offers the following functionality:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1) Digital mixer controls</div><div class='del'>--------------------------</div><div class='del'>-</div><div class='del'>-These controls are built using the DSP instructions. They offer extended</div><div class='del'>-functionality. Only the default build-in code in the ALSA driver is described</div><div class='del'>-here. Note that the controls work as attenuators: the maximum value is the </div><div class='del'>-neutral position leaving the signal unchanged. Note that if the  same destination </div><div class='del'>-is mentioned in multiple controls, the signal is accumulated and can be wrapped </div><div class='del'>-(set to maximal or minimal value without checking of overflow).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Explanation of used abbreviations:</div><div class='del'>-</div><div class='del'>-DAC    - digital to analog converter</div><div class='del'>-ADC    - analog to digital converter</div><div class='del'>-I2S    - one-way three wire serial bus for digital sound by Philips Semiconductors</div><div class='del'>-         (this standard is used for connecting standalone DAC and ADC converters)</div><div class='del'>-LFE    - low frequency effects (subwoofer signal)</div><div class='del'>-AC97   - a chip containing an analog mixer, DAC and ADC converters</div><div class='del'>-IEC958 - S/PDIF</div><div class='del'>-FX-bus - the EMU10K2 chip has an effect bus containing 64 accumulators.</div><div class='del'>-         Each of the synthesizer voices can feed its output to these accumulators</div><div class='del'>-         and the DSP microcontroller can operate with the resulting sum.</div><div class='del'>-</div><div class='del'>-name='PCM Front Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right front PCM FX-bus</div><div class='del'>-accumulators. ALSA uses accumulators 8 and 9 for left and right front PCM </div><div class='del'>-samples for 5.1 playback. The result samples are forwarded to the front DAC PCM </div><div class='del'>-slots of the Philips DAC.</div><div class='del'>-</div><div class='del'>-name='PCM Surround Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right surround PCM FX-bus</div><div class='del'>-accumulators. ALSA uses accumulators 2 and 3 for left and right surround PCM </div><div class='del'>-samples for 5.1 playback. The result samples are forwarded to the surround DAC PCM </div><div class='del'>-slots of the Philips DAC.</div><div class='del'>-</div><div class='del'>-name='PCM Center Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for center PCM FX-bus accumulator.</div><div class='del'>-ALSA uses accumulator 6 for center PCM sample for 5.1 playback. The result sample</div><div class='del'>-is forwarded to the center DAC PCM slot of the Philips DAC.</div><div class='del'>-</div><div class='del'>-name='PCM LFE Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate sample for LFE PCM FX-bus accumulator. </div><div class='del'>-ALSA uses accumulator 7 for LFE PCM sample for 5.1 playback. The result sample </div><div class='del'>-is forwarded to the LFE DAC PCM slot of the Philips DAC.</div><div class='del'>-</div><div class='del'>-name='PCM Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right PCM FX-bus</div><div class='del'>-accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples for</div><div class='del'>-stereo playback. The result samples are forwarded to the front DAC PCM slots </div><div class='del'>-of the Philips DAC.</div><div class='del'>-</div><div class='del'>-name='PCM Capture Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right PCM FX-bus</div><div class='del'>-accumulator. ALSA uses accumulators 0 and 1 for left and right PCM.</div><div class='del'>-The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='del'>-PCM device).</div><div class='del'>-</div><div class='del'>-name='Music Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right MIDI FX-bus</div><div class='del'>-accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples.</div><div class='del'>-The result samples are forwarded to the front DAC PCM slots of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='Music Capture Volume',index=0</div><div class='del'>-</div><div class='del'>-These controls are used to attenuate samples for left and right MIDI FX-bus</div><div class='del'>-accumulator. ALSA uses accumulators 4 and 5 for left and right PCM.</div><div class='del'>-The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='del'>-PCM device).</div><div class='del'>-</div><div class='del'>-name='Mic Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right Mic input.</div><div class='del'>-For Mic input is used AC97 codec. The result samples are forwarded to </div><div class='del'>-the front DAC PCM slots of the Philips DAC. Samples are forwarded to Mic</div><div class='del'>-capture FIFO (device 1 - 16bit/8KHz mono) too without volume control.</div><div class='del'>-</div><div class='del'>-name='Mic Capture Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right Mic input.</div><div class='del'>-The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='del'>-PCM device).</div><div class='del'>-</div><div class='del'>-name='Audigy CD Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right IEC958 TTL</div><div class='del'>-digital inputs (usually used by a CDROM drive). The result samples are</div><div class='del'>-forwarded to the front DAC PCM slots of the Philips DAC.</div><div class='del'>-</div><div class='del'>-name='Audigy CD Capture Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right IEC958 TTL</div><div class='del'>-digital inputs (usually used by a CDROM drive). The result samples are</div><div class='del'>-forwarded to the ADC capture FIFO (thus to the standard capture PCM device).</div><div class='del'>-</div><div class='del'>-name='IEC958 Optical Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right IEC958 optical</div><div class='del'>-digital input. The result samples are forwarded to the front DAC PCM slots</div><div class='del'>-of the Philips DAC.</div><div class='del'>-</div><div class='del'>-name='IEC958 Optical Capture Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right IEC958 optical</div><div class='del'>-digital inputs. The result samples are forwarded to the ADC capture FIFO</div><div class='del'>-(thus to the standard capture PCM device).</div><div class='del'>-</div><div class='del'>-name='Line2 Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right I2S ADC</div><div class='del'>-inputs (on the AudigyDrive). The result samples are forwarded to the front</div><div class='del'>-DAC PCM slots of the Philips DAC.</div><div class='del'>-</div><div class='del'>-name='Line2 Capture Volume',index=1</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right I2S ADC</div><div class='del'>-inputs (on the AudigyDrive). The result samples are forwarded to the ADC</div><div class='del'>-capture FIFO (thus to the standard capture PCM device).</div><div class='del'>-</div><div class='del'>-name='Analog Mix Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right I2S ADC</div><div class='del'>-inputs from Philips ADC. The result samples are forwarded to the front</div><div class='del'>-DAC PCM slots of the Philips DAC. This contains mix from analog sources</div><div class='del'>-like CD, Line In, Aux, ....</div><div class='del'>-</div><div class='del'>-name='Analog Mix Capture Volume',index=1</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right I2S ADC</div><div class='del'>-inputs Philips ADC. The result samples are forwarded to the ADC</div><div class='del'>-capture FIFO (thus to the standard capture PCM device).</div><div class='del'>-</div><div class='del'>-name='Aux2 Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right I2S ADC</div><div class='del'>-inputs (on the AudigyDrive). The result samples are forwarded to the front</div><div class='del'>-DAC PCM slots of the Philips DAC.</div><div class='del'>-</div><div class='del'>-name='Aux2 Capture Volume',index=1</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right I2S ADC</div><div class='del'>-inputs (on the AudigyDrive). The result samples are forwarded to the ADC</div><div class='del'>-capture FIFO (thus to the standard capture PCM device).</div><div class='del'>-</div><div class='del'>-name='Front Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-All stereo signals are mixed together and mirrored to surround, center and LFE.</div><div class='del'>-This control is used to attenuate samples for left and right front speakers of</div><div class='del'>-this mix.</div><div class='del'>-</div><div class='del'>-name='Surround Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-All stereo signals are mixed together and mirrored to surround, center and LFE.</div><div class='del'>-This control is used to attenuate samples for left and right surround speakers of</div><div class='del'>-this mix.</div><div class='del'>-</div><div class='del'>-name='Center Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-All stereo signals are mixed together and mirrored to surround, center and LFE.</div><div class='del'>-This control is used to attenuate sample for center speaker of this mix.</div><div class='del'>-</div><div class='del'>-name='LFE Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-All stereo signals are mixed together and mirrored to surround, center and LFE.</div><div class='del'>-This control is used to attenuate sample for LFE speaker of this mix.</div><div class='del'>-</div><div class='del'>-name='Tone Control - Switch',index=0</div><div class='del'>-</div><div class='del'>-This control turns the tone control on or off. The samples for front, rear</div><div class='del'>-and center / LFE outputs are affected.</div><div class='del'>-</div><div class='del'>-name='Tone Control - Bass',index=0</div><div class='del'>-</div><div class='del'>-This control sets the bass intensity. There is no neutral value!!</div><div class='del'>-When the tone control code is activated, the samples are always modified.</div><div class='del'>-The closest value to pure signal is 20.</div><div class='del'>-</div><div class='del'>-name='Tone Control - Treble',index=0</div><div class='del'>-</div><div class='del'>-This control sets the treble intensity. There is no neutral value!!</div><div class='del'>-When the tone control code is activated, the samples are always modified.</div><div class='del'>-The closest value to pure signal is 20.</div><div class='del'>-</div><div class='del'>-name='Master Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for front, surround, center and </div><div class='del'>-LFE outputs.</div><div class='del'>-</div><div class='del'>-name='IEC958 Optical Raw Playback Switch',index=0</div><div class='del'>-</div><div class='del'>-If this switch is on, then the samples for the IEC958 (S/PDIF) digital</div><div class='del'>-output are taken only from the raw FX8010 PCM, otherwise standard front</div><div class='del'>-PCM samples are taken.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2) PCM stream related controls</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-name='EMU10K1 PCM Volume',index 0-31</div><div class='del'>-</div><div class='del'>-Channel volume attenuation in range 0-0xffff. The maximum value (no</div><div class='del'>-attenuation) is default. The channel mapping for three values is</div><div class='del'>-as follows:</div><div class='del'>-</div><div class='del'>-	0 - mono, default 0xffff (no attenuation)</div><div class='del'>-	1 - left, default 0xffff (no attenuation)</div><div class='del'>-	2 - right, default 0xffff (no attenuation)</div><div class='del'>-</div><div class='del'>-name='EMU10K1 PCM Send Routing',index 0-31</div><div class='del'>-</div><div class='del'>-This control specifies the destination - FX-bus accumulators. There 24</div><div class='del'>-values with this mapping:</div><div class='del'>-</div><div class='del'>-	 0 -  mono, A destination (FX-bus 0-63), default 0</div><div class='del'>-	 1 -  mono, B destination (FX-bus 0-63), default 1</div><div class='del'>-	 2 -  mono, C destination (FX-bus 0-63), default 2</div><div class='del'>-	 3 -  mono, D destination (FX-bus 0-63), default 3</div><div class='del'>-	 4 -  mono, E destination (FX-bus 0-63), default 0</div><div class='del'>-	 5 -  mono, F destination (FX-bus 0-63), default 0</div><div class='del'>-	 6 -  mono, G destination (FX-bus 0-63), default 0</div><div class='del'>-	 7 -  mono, H destination (FX-bus 0-63), default 0</div><div class='del'>-	 8 -  left, A destination (FX-bus 0-63), default 0</div><div class='del'>-	 9 -  left, B destination (FX-bus 0-63), default 1</div><div class='del'>-	10 -  left, C destination (FX-bus 0-63), default 2</div><div class='del'>-	11 -  left, D destination (FX-bus 0-63), default 3</div><div class='del'>-	12 -  left, E destination (FX-bus 0-63), default 0</div><div class='del'>-	13 -  left, F destination (FX-bus 0-63), default 0</div><div class='del'>-	14 -  left, G destination (FX-bus 0-63), default 0</div><div class='del'>-	15 -  left, H destination (FX-bus 0-63), default 0</div><div class='del'>-	16 - right, A destination (FX-bus 0-63), default 0</div><div class='del'>-	17 - right, B destination (FX-bus 0-63), default 1</div><div class='del'>-	18 - right, C destination (FX-bus 0-63), default 2</div><div class='del'>-	19 - right, D destination (FX-bus 0-63), default 3</div><div class='del'>-	20 - right, E destination (FX-bus 0-63), default 0</div><div class='del'>-	21 - right, F destination (FX-bus 0-63), default 0</div><div class='del'>-	22 - right, G destination (FX-bus 0-63), default 0</div><div class='del'>-	23 - right, H destination (FX-bus 0-63), default 0</div><div class='del'>-</div><div class='del'>-Don't forget that it's illegal to assign a channel to the same FX-bus accumulator </div><div class='del'>-more than once (it means 0=0 &amp;&amp; 1=0 is an invalid combination).</div><div class='del'>- </div><div class='del'>-name='EMU10K1 PCM Send Volume',index 0-31</div><div class='del'>-</div><div class='del'>-It specifies the attenuation (amount) for given destination in range 0-255.</div><div class='del'>-The channel mapping is following:</div><div class='del'>-</div><div class='del'>-	 0 -  mono, A destination attn, default 255 (no attenuation)</div><div class='del'>-	 1 -  mono, B destination attn, default 255 (no attenuation)</div><div class='del'>-	 2 -  mono, C destination attn, default 0 (mute)</div><div class='del'>-	 3 -  mono, D destination attn, default 0 (mute)</div><div class='del'>-	 4 -  mono, E destination attn, default 0 (mute)</div><div class='del'>-	 5 -  mono, F destination attn, default 0 (mute)</div><div class='del'>-	 6 -  mono, G destination attn, default 0 (mute)</div><div class='del'>-	 7 -  mono, H destination attn, default 0 (mute)</div><div class='del'>-	 8 -  left, A destination attn, default 255 (no attenuation)</div><div class='del'>-	 9 -  left, B destination attn, default 0 (mute)</div><div class='del'>-	10 -  left, C destination attn, default 0 (mute)</div><div class='del'>-	11 -  left, D destination attn, default 0 (mute)</div><div class='del'>-	12 -  left, E destination attn, default 0 (mute)</div><div class='del'>-	13 -  left, F destination attn, default 0 (mute)</div><div class='del'>-	14 -  left, G destination attn, default 0 (mute)</div><div class='del'>-	15 -  left, H destination attn, default 0 (mute)</div><div class='del'>-	16 - right, A destination attn, default 0 (mute)</div><div class='del'>-	17 - right, B destination attn, default 255 (no attenuation)</div><div class='del'>-	18 - right, C destination attn, default 0 (mute)</div><div class='del'>-	19 - right, D destination attn, default 0 (mute)</div><div class='del'>-	20 - right, E destination attn, default 0 (mute)</div><div class='del'>-	21 - right, F destination attn, default 0 (mute)</div><div class='del'>-	22 - right, G destination attn, default 0 (mute)</div><div class='del'>-	23 - right, H destination attn, default 0 (mute)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4) MANUALS/PATENTS:</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-ftp://opensource.creative.com/pub/doc</div><div class='del'>--------------------------------------</div><div class='del'>-</div><div class='del'>-        Files:</div><div class='del'>-        LM4545.pdf      AC97 Codec</div><div class='del'>-</div><div class='del'>-        m2049.pdf       The EMU10K1 Digital Audio Processor</div><div class='del'>-</div><div class='del'>-        hog63.ps        FX8010 - A DSP Chip Architecture for Audio Effects</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-WIPO Patents</div><div class='del'>-------------</div><div class='del'>-        Patent numbers:</div><div class='del'>-        WO 9901813 (A1) Audio Effects Processor with multiple asynchronous (Jan. 14, 1999)</div><div class='del'>-                        streams</div><div class='del'>-</div><div class='del'>-        WO 9901814 (A1) Processor with Instruction Set for Audio Effects (Jan. 14, 1999)</div><div class='del'>-</div><div class='del'>-        WO 9901953 (A1) Audio Effects Processor having Decoupled Instruction</div><div class='del'>-                        Execution and Audio Data Sequencing (Jan. 14, 1999)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-US Patents (http://www.uspto.gov/)</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-        US 5925841      Digital Sampling Instrument employing cache memory (Jul. 20, 1999)</div><div class='del'>-</div><div class='del'>-        US 5928342      Audio Effects Processor integrated on a single chip (Jul. 27, 1999)</div><div class='del'>-                        with a multiport memory onto which multiple asynchronous</div><div class='del'>-                        digital sound samples can be concurrently loaded</div><div class='del'>-</div><div class='del'>-        US 5930158      Processor with Instruction Set for Audio Effects (Jul. 27, 1999)</div><div class='del'>-</div><div class='del'>-        US 6032235      Memory initialization circuit (Tram) (Feb. 29, 2000)</div><div class='del'>-</div><div class='del'>-        US 6138207      Interpolation looping of audio samples in cache connected to    (Oct. 24, 2000)</div><div class='del'>-                        system bus with prioritization and modification of bus transfers</div><div class='del'>-                        in accordance with loop ends and minimum block sizes</div><div class='del'>-</div><div class='del'>-        US 6151670      Method for conserving memory storage using a (Nov. 21, 2000)</div><div class='del'>-                        pool of  short term memory registers</div><div class='del'>-</div><div class='del'>-        US 6195715      Interrupt control for multiple programs communicating with      (Feb. 27, 2001)</div><div class='del'>-                        a common interrupt by associating programs to GP registers,</div><div class='del'>-                        defining interrupt register, polling GP registers, and invoking</div><div class='del'>-                        callback routine associated with defined interrupt register</div><div class='head'>diff --git a/Documentation/sound/alsa/Audiophile-Usb.txt b/Documentation/sound/alsa/Audiophile-Usb.txt<br/>deleted file mode 100644<br/>index e7a5ed4dcae8..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/Audiophile-Usb.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/Audiophile-Usb.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,442 +0,0 @@</div><div class='del'>-	Guide to using M-Audio Audiophile USB with ALSA and Jack	v1.5</div><div class='del'>-	========================================================</div><div class='del'>-</div><div class='del'>-	    Thibault Le Meur &lt;Thibault.LeMeur@supelec.fr&gt;</div><div class='del'>-</div><div class='del'>-This document is a guide to using the M-Audio Audiophile USB (tm) device with </div><div class='del'>-ALSA and JACK.</div><div class='del'>-</div><div class='del'>-History</div><div class='del'>-=======</div><div class='del'>-* v1.4 - Thibault Le Meur (2007-07-11)</div><div class='del'>- - Added Low Endianness nature of 16bits-modes</div><div class='del'>-   found by Hakan Lennestal &lt;Hakan.Lennestal@brfsodrahamn.se&gt;</div><div class='del'>- - Modifying document structure</div><div class='del'>-* v1.5 - Thibault Le Meur (2007-07-12)</div><div class='del'>- - Added AC3/DTS passthru info</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1 - Audiophile USB Specs and correct usage</div><div class='del'>-==========================================</div><div class='del'>-</div><div class='del'>-This part is a reminder of important facts about the functions and limitations </div><div class='del'>-of the device.</div><div class='del'>-</div><div class='del'>-The device has 4 audio interfaces, and 2 MIDI ports:</div><div class='del'>- * Analog Stereo Input (Ai)</div><div class='del'>-   - This port supports 2 pairs of line-level audio inputs (1/4" TS and RCA) </div><div class='del'>-   - When the 1/4" TS (jack) connectors are connected, the RCA connectors</div><div class='del'>-     are disabled</div><div class='del'>- * Analog Stereo Output (Ao)</div><div class='del'>- * Digital Stereo Input (Di)</div><div class='del'>- * Digital Stereo Output (Do)</div><div class='del'>- * Midi In (Mi)</div><div class='del'>- * Midi Out (Mo)</div><div class='del'>-</div><div class='del'>-The internal DAC/ADC has the following characteristics:</div><div class='del'>-* sample depth of 16 or 24 bits</div><div class='del'>-* sample rate from 8kHz to 96kHz</div><div class='del'>-* Two interfaces can't use different sample depths at the same time.</div><div class='del'>-Moreover, the Audiophile USB documentation gives the following Warning:</div><div class='del'>-"Please exit any audio application running before switching between bit depths"</div><div class='del'>-</div><div class='del'>-Due to the USB 1.1 bandwidth limitation, a limited number of interfaces can be </div><div class='del'>-activated at the same time depending on the audio mode selected:</div><div class='del'>- * 16-bit/48kHz ==&gt; 4 channels in + 4 channels out</div><div class='del'>-   - Ai+Ao+Di+Do</div><div class='del'>- * 24-bit/48kHz ==&gt; 4 channels in + 2 channels out, </div><div class='del'>-                    or 2 channels in + 4 channels out</div><div class='del'>-   - Ai+Ao+Do or Ai+Di+Ao or Ai+Di+Do or Di+Ao+Do</div><div class='del'>- * 24-bit/96kHz ==&gt; 2 channels in _or_ 2 channels out (half duplex only)</div><div class='del'>-   - Ai or Ao or Di or Do</div><div class='del'>-</div><div class='del'>-Important facts about the Digital interface:</div><div class='del'>---------------------------------------------</div><div class='del'>- * The Do port additionally supports surround-encoded AC-3 and DTS passthrough, </div><div class='del'>-though I haven't tested it under Linux</div><div class='del'>-   - Note that in this setup only the Do interface can be enabled</div><div class='del'>- * Apart from recording an audio digital stream, enabling the Di port is a way </div><div class='del'>-to synchronize the device to an external sample clock</div><div class='del'>-   - As a consequence, the Di port must be enable only if an active Digital </div><div class='del'>-source is connected</div><div class='del'>-   - Enabling Di when no digital source is connected can result in a </div><div class='del'>-synchronization error (for instance sound played at an odd sample rate)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2 - Audiophile USB MIDI support in ALSA</div><div class='del'>-=======================================</div><div class='del'>-</div><div class='del'>-The Audiophile USB MIDI ports will be automatically supported once the</div><div class='del'>-following modules have been loaded:</div><div class='del'>- * snd-usb-audio</div><div class='del'>- * snd-seq-midi</div><div class='del'>-</div><div class='del'>-No additional setting is required.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3 - Audiophile USB Audio support in ALSA</div><div class='del'>-========================================</div><div class='del'>-</div><div class='del'>-Audio functions of the Audiophile USB device are handled by the snd-usb-audio </div><div class='del'>-module. This module can work in a default mode (without any device-specific </div><div class='del'>-parameter), or in an "advanced" mode with the device-specific parameter called </div><div class='del'>-"device_setup".</div><div class='del'>-</div><div class='del'>-3.1 - Default Alsa driver mode</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-The default behavior of the snd-usb-audio driver is to list the device </div><div class='del'>-capabilities at startup and activate the required mode when required </div><div class='del'>-by the applications: for instance if the user is recording in a </div><div class='del'>-24bit-depth-mode and immediately after wants to switch to a 16bit-depth mode,</div><div class='del'>-the snd-usb-audio module will reconfigure the device on the fly.</div><div class='del'>-</div><div class='del'>-This approach has the advantage to let the driver automatically switch from sample </div><div class='del'>-rates/depths automatically according to the user's needs. However, those who </div><div class='del'>-are using the device under windows know that this is not how the device is meant to</div><div class='del'>-work: under windows applications must be closed before using the m-audio control</div><div class='del'>-panel to switch the device working mode. Thus as we'll see in next section, this </div><div class='del'>-Default Alsa driver mode can lead to device misconfigurations.</div><div class='del'>-</div><div class='del'>-Let's get back to the Default Alsa driver mode for now.  In this case the </div><div class='del'>-Audiophile interfaces are mapped to alsa pcm devices in the following </div><div class='del'>-way (I suppose the device's index is 1):</div><div class='del'>- * hw:1,0 is Ao in playback and Di in capture</div><div class='del'>- * hw:1,1 is Do in playback and Ai in capture</div><div class='del'>- * hw:1,2 is Do in AC3/DTS passthrough mode</div><div class='del'>-</div><div class='del'>-In this mode, the device uses Big Endian byte-encoding so that </div><div class='del'>-supported audio format are S16_BE for 16-bit depth modes and S24_3BE for </div><div class='del'>-24-bits depth mode.</div><div class='del'>-</div><div class='del'>-One exception is the hw:1,2 port which was reported to be Little Endian </div><div class='del'>-compliant (supposedly supporting S16_LE) but processes in fact only S16_BE streams.</div><div class='del'>-This has been fixed in kernel 2.6.23 and above and now the hw:1,2 interface </div><div class='del'>-is reported to be big endian in this default driver mode.</div><div class='del'>-</div><div class='del'>-Examples:</div><div class='del'>- * playing a S24_3BE encoded raw file to the Ao port</div><div class='del'>-   % aplay -D hw:1,0 -c2 -t raw -r48000 -fS24_3BE test.raw</div><div class='del'>- * recording a  S24_3BE encoded raw file from the Ai port</div><div class='del'>-   % arecord -D hw:1,1 -c2  -t raw -r48000 -fS24_3BE test.raw</div><div class='del'>- * playing a S16_BE encoded raw file to the Do port</div><div class='del'>-   % aplay -D hw:1,1 -c2 -t raw -r48000 -fS16_BE test.raw</div><div class='del'>- * playing an ac3 sample file to the Do port</div><div class='del'>-   % aplay -D hw:1,2 --channels=6 ac3_S16_BE_encoded_file.raw</div><div class='del'>-</div><div class='del'>-If you're happy with the default Alsa driver mode and don't experience any </div><div class='del'>-issue with this mode, then you can skip the following chapter.</div><div class='del'>-</div><div class='del'>-3.2 - Advanced module setup</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='del'>-Due to the hardware constraints described above, the device initialization made </div><div class='del'>-by the Alsa driver in default mode may result in a corrupted state of the </div><div class='del'>-device. For instance, a particularly annoying issue is that the sound captured </div><div class='del'>-from the Ai interface sounds distorted (as if boosted with an excessive high</div><div class='del'>-volume gain).</div><div class='del'>-</div><div class='del'>-For people having this problem, the snd-usb-audio module has a new module </div><div class='del'>-parameter called "device_setup" (this parameter was introduced in kernel</div><div class='del'>-release 2.6.17)</div><div class='del'>-</div><div class='del'>-3.2.1 - Initializing the working mode of the Audiophile USB</div><div class='del'>-</div><div class='del'>-As far as the Audiophile USB device is concerned, this value let the user </div><div class='del'>-specify:</div><div class='del'>- * the sample depth</div><div class='del'>- * the sample rate</div><div class='del'>- * whether the Di port is used or not </div><div class='del'>-</div><div class='del'>-When initialized with "device_setup=0x00", the snd-usb-audio module has</div><div class='del'>-the same behaviour as when the parameter is omitted (see paragraph "Default </div><div class='del'>-Alsa driver mode" above)</div><div class='del'>-</div><div class='del'>-Others modes are described in the following subsections.</div><div class='del'>-</div><div class='del'>-3.2.1.1 - 16-bit modes</div><div class='del'>-</div><div class='del'>-The two supported modes are:</div><div class='del'>-</div><div class='del'>- * device_setup=0x01</div><div class='del'>-   - 16bits 48kHz mode with Di disabled</div><div class='del'>-   - Ai,Ao,Do can be used at the same time</div><div class='del'>-   - hw:1,0 is not available in capture mode</div><div class='del'>-   - hw:1,2 is not available</div><div class='del'>-</div><div class='del'>- * device_setup=0x11</div><div class='del'>-   - 16bits 48kHz mode with Di enabled</div><div class='del'>-   - Ai,Ao,Di,Do can be used at the same time</div><div class='del'>-   - hw:1,0 is available in capture mode</div><div class='del'>-   - hw:1,2 is not available</div><div class='del'>-</div><div class='del'>-In this modes the device operates only at 16bits-modes. Before kernel 2.6.23,</div><div class='del'>-the devices where reported to be Big-Endian when in fact they were Little-Endian</div><div class='del'>-so that playing a file was a matter of using:</div><div class='del'>-   % aplay -D hw:1,1 -c2 -t raw -r48000 -fS16_BE test_S16_LE.raw</div><div class='del'>-where "test_S16_LE.raw" was in fact a little-endian sample file.</div><div class='del'>-</div><div class='del'>-Thanks to Hakan Lennestal (who discovered the Little-Endiannes of the device in</div><div class='del'>-these modes) a fix has been committed (expected in kernel 2.6.23) and</div><div class='del'>-Alsa now reports Little-Endian interfaces. Thus playing a file now is as simple as</div><div class='del'>-using:</div><div class='del'>-   % aplay -D hw:1,1 -c2 -t raw -r48000 -fS16_LE test_S16_LE.raw</div><div class='del'>-</div><div class='del'>-3.2.1.2 - 24-bit modes</div><div class='del'>-</div><div class='del'>-The three supported modes are:</div><div class='del'>-</div><div class='del'>- * device_setup=0x09</div><div class='del'>-   - 24bits 48kHz mode with Di disabled</div><div class='del'>-   - Ai,Ao,Do can be used at the same time</div><div class='del'>-   - hw:1,0 is not available in capture mode</div><div class='del'>-   - hw:1,2 is not available</div><div class='del'>-</div><div class='del'>- * device_setup=0x19</div><div class='del'>-   - 24bits 48kHz mode with Di enabled</div><div class='del'>-   - 3 ports from {Ai,Ao,Di,Do} can be used at the same time</div><div class='del'>-   - hw:1,0 is available in capture mode and an active digital source must be </div><div class='del'>-     connected to Di</div><div class='del'>-   - hw:1,2 is not available</div><div class='del'>-</div><div class='del'>- * device_setup=0x0D or 0x10</div><div class='del'>-   - 24bits 96kHz mode</div><div class='del'>-   - Di is enabled by default for this mode but does not need to be connected </div><div class='del'>-     to an active source</div><div class='del'>-   - Only 1 port from {Ai,Ao,Di,Do} can be used at the same time</div><div class='del'>-   - hw:1,0 is available in captured mode</div><div class='del'>-   - hw:1,2 is not available</div><div class='del'>-</div><div class='del'>-In these modes the device is only Big-Endian compliant (see "Default Alsa driver </div><div class='del'>-mode" above for an aplay command example)</div><div class='del'>-</div><div class='del'>-3.2.1.3 - AC3 w/ DTS passthru mode</div><div class='del'>-</div><div class='del'>-Thanks to Hakan Lennestal, I now have a report saying that this mode works.</div><div class='del'>-</div><div class='del'>- * device_setup=0x03</div><div class='del'>-   - 16bits 48kHz mode with only the Do port enabled </div><div class='del'>-   - AC3 with DTS passthru</div><div class='del'>-   - Caution with this setup the Do port is mapped to the pcm device hw:1,0</div><div class='del'>-</div><div class='del'>-The command line used to playback the AC3/DTS encoded .wav-files in this mode:</div><div class='del'>-   % aplay -D hw:1,0 --channels=6 ac3_S16_LE_encoded_file.raw</div><div class='del'>-</div><div class='del'>-3.2.2 - How to use the device_setup parameter</div><div class='del'>-----------------------------------------------</div><div class='del'>-</div><div class='del'>-The parameter can be given:</div><div class='del'>-</div><div class='del'>- * By manually probing the device (as root):</div><div class='del'>-   # modprobe -r snd-usb-audio</div><div class='del'>-   # modprobe snd-usb-audio index=1 device_setup=0x09</div><div class='del'>-</div><div class='del'>- * Or while configuring the modules options in your modules configuration file</div><div class='del'>-   (typically a .conf file in /etc/modprobe.d/ directory:</div><div class='del'>-       alias snd-card-1 snd-usb-audio</div><div class='del'>-       options snd-usb-audio index=1 device_setup=0x09</div><div class='del'>-</div><div class='del'>-CAUTION when initializing the device</div><div class='del'>--------------------------------------</div><div class='del'>-</div><div class='del'>- * Correct initialization on the device requires that device_setup is given to</div><div class='del'>-   the module BEFORE the device is turned on. So, if you use the "manual probing"</div><div class='del'>-   method described above, take care to power-on the device AFTER this initialization.</div><div class='del'>-</div><div class='del'>- * Failing to respect this will lead to a misconfiguration of the device. In this case</div><div class='del'>-   turn off the device, unprobe the snd-usb-audio module, then probe it again with</div><div class='del'>-   correct device_setup parameter and then (and only then) turn on the device again.</div><div class='del'>-</div><div class='del'>- * If you've correctly initialized the device in a valid mode and then want to switch</div><div class='del'>-   to  another mode (possibly with another sample-depth), please use also the following </div><div class='del'>-   procedure:</div><div class='del'>-   - first turn off the device</div><div class='del'>-   - de-register the snd-usb-audio module (modprobe -r)</div><div class='del'>-   - change the device_setup parameter by changing the device_setup</div><div class='del'>-     option in /etc/modprobe.d/*.conf</div><div class='del'>-   - turn on the device</div><div class='del'>- * A workaround for this last issue has been applied to kernel 2.6.23, but it may not</div><div class='del'>-   be enough to ensure the 'stability' of the device initialization.</div><div class='del'>-</div><div class='del'>-3.2.3 - Technical details for hackers</div><div class='del'>--------------------------------------</div><div class='del'>-This section is for hackers, wanting to understand details about the device</div><div class='del'>-internals and how Alsa supports it.</div><div class='del'>-</div><div class='del'>-3.2.3.1 - Audiophile USB's device_setup structure</div><div class='del'>-</div><div class='del'>-If you want to understand the device_setup magic numbers for the Audiophile </div><div class='del'>-USB, you need some very basic understanding of binary computation. However, </div><div class='del'>-this is not required to use the parameter and you may skip this section.</div><div class='del'>-</div><div class='del'>-The device_setup is one byte long and its structure is the following:</div><div class='del'>-</div><div class='del'>-       +---+---+---+---+---+---+---+---+</div><div class='del'>-       | b7| b6| b5| b4| b3| b2| b1| b0|</div><div class='del'>-       +---+---+---+---+---+---+---+---+</div><div class='del'>-       | 0 | 0 | 0 | Di|24B|96K|DTS|SET|</div><div class='del'>-       +---+---+---+---+---+---+---+---+</div><div class='del'>-</div><div class='del'>-Where:</div><div class='del'>- * b0 is the "SET" bit</div><div class='del'>-   - it MUST be set if device_setup is initialized </div><div class='del'>- * b1 is the "DTS" bit</div><div class='del'>-   - it is set only for Digital output with DTS/AC3</div><div class='del'>-   - this setup is not tested</div><div class='del'>- * b2 is the Rate selection flag</div><div class='del'>-   - When set to "1" the rate range is 48.1-96kHz</div><div class='del'>-   - Otherwise the sample rate range is 8-48kHz</div><div class='del'>- * b3 is the bit depth selection flag</div><div class='del'>-   - When set to "1" samples are 24bits long</div><div class='del'>-   - Otherwise they are 16bits long</div><div class='del'>-   - Note that b2 implies b3 as the 96kHz mode is only supported for 24 bits </div><div class='del'>-     samples</div><div class='del'>- * b4 is the Digital input flag</div><div class='del'>-   - When set to "1" the device assumes that an active digital source is </div><div class='del'>-     connected </div><div class='del'>-   - You shouldn't enable Di if no source is seen on the port (this leads to </div><div class='del'>-     synchronization issues)</div><div class='del'>-   - b4 is implied by b2 (since only one port is enabled at a time no synch </div><div class='del'>-     error can occur) </div><div class='del'>- * b5 to b7 are reserved for future uses, and must be set to "0"</div><div class='del'>-   - might become Ao, Do, Ai, for b7, b6, b4 respectively</div><div class='del'>-</div><div class='del'>-Caution:</div><div class='del'>- * there is no check on the value you will give to device_setup</div><div class='del'>-   - for instance choosing 0x05 (16bits 96kHz) will fail back to 0x09 since </div><div class='del'>-     b2 implies b3. But _there_will_be_no_warning_ in /var/log/messages</div><div class='del'>- * Hardware constraints due to the USB bus limitation aren't checked</div><div class='del'>-   - choosing b2 will prepare all interfaces for 24bits/96kHz but you'll</div><div class='del'>-     only be able to use one at the same time</div><div class='del'>-</div><div class='del'>-3.2.3.2 -  USB implementation details for this device</div><div class='del'>-</div><div class='del'>-You may safely skip this section if you're not interested in driver </div><div class='del'>-hacking.</div><div class='del'>-</div><div class='del'>-This section describes some internal aspects of the device and summarizes the </div><div class='del'>-data I got by usb-snooping the windows and Linux drivers.</div><div class='del'>-</div><div class='del'>-The M-Audio Audiophile USB has 7 USB Interfaces:</div><div class='del'>-a "USB interface":</div><div class='del'>- * USB Interface nb.0</div><div class='del'>- * USB Interface nb.1</div><div class='del'>-   - Audio Control function</div><div class='del'>- * USB Interface nb.2</div><div class='del'>-   - Analog Output</div><div class='del'>- * USB Interface nb.3</div><div class='del'>-   - Digital Output</div><div class='del'>- * USB Interface nb.4</div><div class='del'>-   - Analog Input</div><div class='del'>- * USB Interface nb.5</div><div class='del'>-   - Digital Input</div><div class='del'>- * USB Interface nb.6</div><div class='del'>-   - MIDI interface compliant with the MIDIMAN quirk </div><div class='del'>-</div><div class='del'>-Each interface has 5 altsettings (AltSet 1,2,3,4,5) except:</div><div class='del'>- * Interface 3 (Digital Out) has an extra Alset nb.6 </div><div class='del'>- * Interface 5 (Digital In) does not have Alset nb.3 and 5 </div><div class='del'>-</div><div class='del'>-Here is a short description of the AltSettings capabilities:</div><div class='del'>- * AltSettings 1 corresponds to</div><div class='del'>-  - 24-bit depth, 48.1-96kHz sample mode</div><div class='del'>-  - Adaptive playback (Ao and Do), Synch capture (Ai), or Asynch capture (Di)</div><div class='del'>- * AltSettings 2 corresponds to</div><div class='del'>-  - 24-bit depth, 8-48kHz sample mode</div><div class='del'>-  - Asynch capture and playback  (Ao,Ai,Do,Di)</div><div class='del'>- * AltSettings 3 corresponds to</div><div class='del'>-  - 24-bit depth, 8-48kHz sample mode</div><div class='del'>-  - Synch capture (Ai) and Adaptive playback (Ao,Do)</div><div class='del'>- * AltSettings 4 corresponds to</div><div class='del'>-  - 16-bit depth, 8-48kHz sample mode</div><div class='del'>-  - Asynch capture and playback  (Ao,Ai,Do,Di)</div><div class='del'>- * AltSettings 5 corresponds to</div><div class='del'>-  - 16-bit depth, 8-48kHz sample mode</div><div class='del'>-  - Synch capture (Ai) and Adaptive playback (Ao,Do)</div><div class='del'>- * AltSettings 6 corresponds to</div><div class='del'>-  - 16-bit depth, 8-48kHz sample mode</div><div class='del'>-  - Synch playback (Do), audio format type III IEC1937_AC-3</div><div class='del'>-</div><div class='del'>-In order to ensure a correct initialization of the device, the driver </div><div class='del'>-_must_know_ how the device will be used:</div><div class='del'>- * if DTS is chosen, only Interface 2 with AltSet nb.6 must be</div><div class='del'>-   registered</div><div class='del'>- * if 96KHz only AltSets nb.1 of each interface must be selected</div><div class='del'>- * if samples are using 24bits/48KHz then AltSet 2 must me used if</div><div class='del'>-   Digital input is connected, and only AltSet nb.3 if Digital input</div><div class='del'>-   is not connected</div><div class='del'>- * if samples are using 16bits/48KHz then AltSet 4 must me used if</div><div class='del'>-   Digital input is connected, and only AltSet nb.5 if Digital input</div><div class='del'>-   is not connected</div><div class='del'>-</div><div class='del'>-When device_setup is given as a parameter to the snd-usb-audio module, the </div><div class='del'>-parse_audio_endpoints function uses a quirk called </div><div class='del'>-"audiophile_skip_setting_quirk" in order to prevent AltSettings not </div><div class='del'>-corresponding to device_setup from being registered in the driver.</div><div class='del'>-</div><div class='del'>-4 - Audiophile USB and Jack support</div><div class='del'>-===================================</div><div class='del'>-</div><div class='del'>-This section deals with support of the Audiophile USB device in Jack.</div><div class='del'>-</div><div class='del'>-There are 2 main potential issues when using Jackd with the device:</div><div class='del'>-* support for Big-Endian devices in 24-bit modes</div><div class='del'>-* support for 4-in / 4-out channels</div><div class='del'>-</div><div class='del'>-4.1 - Direct support in Jackd</div><div class='del'>------------------------------</div><div class='del'>-</div><div class='del'>-Jack supports big endian devices only in recent versions (thanks to</div><div class='del'>-Andreas Steinmetz for his first big-endian patch). I can't remember </div><div class='del'>-exactly when this support was released into jackd, let's just say that</div><div class='del'>-with jackd version 0.103.0 it's almost ok (just a small bug is affecting </div><div class='del'>-16bits Big-Endian devices, but since you've read carefully the above</div><div class='del'>-paragraphs, you're now using kernel &gt;= 2.6.23 and your 16bits devices </div><div class='del'>-are now Little Endians ;-) ).</div><div class='del'>-</div><div class='del'>-You can run jackd with the following command for playback with Ao and</div><div class='del'>-record with Ai:</div><div class='del'>-  % jackd -R -dalsa -Phw:1,0 -r48000 -p128 -n2 -D -Chw:1,1</div><div class='del'>-</div><div class='del'>-4.2 - Using Alsa plughw</div><div class='del'>------------------------</div><div class='del'>-If you don't have a recent Jackd installed, you can downgrade to using</div><div class='del'>-the Alsa "plug" converter.</div><div class='del'>-</div><div class='del'>-For instance here is one way to run Jack with 2 playback channels on Ao and 2 </div><div class='del'>-capture channels from Ai:</div><div class='del'>-  % jackd -R -dalsa -dplughw:1 -r48000 -p256 -n2 -D -Cplughw:1,1</div><div class='del'>-</div><div class='del'>-However you may see the following warning message:</div><div class='del'>-"You appear to be using the ALSA software "plug" layer, probably a result of </div><div class='del'>-using the "default" ALSA device. This is less efficient than it could be. </div><div class='del'>-Consider using a hardware device instead rather than using the plug layer."</div><div class='del'>-</div><div class='del'>-4.3 - Getting 2 input and/or output interfaces in Jack</div><div class='del'>-------------------------------------------------------</div><div class='del'>-</div><div class='del'>-As you can see, starting the Jack server this way will only enable 1 stereo</div><div class='del'>-input (Di or Ai) and 1 stereo output (Ao or Do).</div><div class='del'>-</div><div class='del'>-This is due to the following restrictions:</div><div class='del'>-* Jack can only open one capture device and one playback device at a time</div><div class='del'>-* The Audiophile USB is seen as 2 (or three) Alsa devices: hw:1,0, hw:1,1</div><div class='del'>-  (and optionally hw:1,2)</div><div class='del'>-</div><div class='del'>-If you want to get Ai+Di and/or Ao+Do support with Jack, you would need to</div><div class='del'>-combine the Alsa devices into one logical "complex" device.</div><div class='del'>-</div><div class='del'>-If you want to give it a try, I recommend reading the information from</div><div class='del'>-this page: http://www.sound-man.co.uk/linuxaudio/ice1712multi.html</div><div class='del'>-It is related to another device (ice1712) but can be adapted to suit</div><div class='del'>-the Audiophile USB.</div><div class='del'>-</div><div class='del'>-Enabling multiple Audiophile USB interfaces for Jackd will certainly require:</div><div class='del'>-* Making sure your Jackd version has the MMAP_COMPLEX patch (see the ice1712 page)</div><div class='del'>-* (maybe) patching the alsa-lib/src/pcm/pcm_multi.c file (see the ice1712 page)</div><div class='del'>-* define a multi device (combination of hw:1,0 and hw:1,1) in your .asoundrc</div><div class='del'>-  file </div><div class='del'>-* start jackd with this device</div><div class='del'>-</div><div class='del'>-I had no success in testing this for now, if you have any success with this kind </div><div class='del'>-of setup, please drop me an email.</div><div class='head'>diff --git a/Documentation/sound/alsa/Bt87x.txt b/Documentation/sound/alsa/Bt87x.txt<br/>deleted file mode 100644<br/>index f158cde8b065..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/Bt87x.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/Bt87x.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-Intro</div><div class='del'>-=====</div><div class='del'>-</div><div class='del'>-You might have noticed that the bt878 grabber cards have actually</div><div class='del'>-_two_ PCI functions:</div><div class='del'>-</div><div class='del'>-$ lspci</div><div class='del'>-[ ... ]</div><div class='del'>-00:0a.0 Multimedia video controller: Brooktree Corporation Bt878 (rev 02)</div><div class='del'>-00:0a.1 Multimedia controller: Brooktree Corporation Bt878 (rev 02)</div><div class='del'>-[ ... ]</div><div class='del'>-</div><div class='del'>-The first does video, it is backward compatible to the bt848.  The second</div><div class='del'>-does audio.  snd-bt87x is a driver for the second function.  It's a sound</div><div class='del'>-driver which can be used for recording sound (and _only_ recording, no</div><div class='del'>-playback).  As most TV cards come with a short cable which can be plugged</div><div class='del'>-into your sound card's line-in you probably don't need this driver if all</div><div class='del'>-you want to do is just watching TV...</div><div class='del'>-</div><div class='del'>-Some cards do not bother to connect anything to the audio input pins of</div><div class='del'>-the chip, and some other cards use the audio function to transport MPEG</div><div class='del'>-video data, so it's quite possible that audio recording may not work</div><div class='del'>-with your card.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Driver Status</div><div class='del'>-=============</div><div class='del'>-</div><div class='del'>-The driver is now stable.  However, it doesn't know about many TV cards,</div><div class='del'>-and it refuses to load for cards it doesn't know.</div><div class='del'>-</div><div class='del'>-If the driver complains ("Unknown TV card found, the audio driver will</div><div class='del'>-not load"), you can specify the load_all=1 option to force the driver to</div><div class='del'>-try to use the audio capture function of your card.  If the frequency of</div><div class='del'>-recorded data is not right, try to specify the digital_rate option with</div><div class='del'>-other values than the default 32000 (often it's 44100 or 64000).</div><div class='del'>-</div><div class='del'>-If you have an unknown card, please mail the ID and board name to</div><div class='del'>-&lt;alsa-devel@alsa-project.org&gt;, regardless of whether audio capture works</div><div class='del'>-or not, so that future versions of this driver know about your card.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Audio modes</div><div class='del'>-===========</div><div class='del'>-</div><div class='del'>-The chip knows two different modes (digital/analog).  snd-bt87x</div><div class='del'>-registers two PCM devices, one for each mode.  They cannot be used at</div><div class='del'>-the same time.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Digital audio mode</div><div class='del'>-==================</div><div class='del'>-</div><div class='del'>-The first device (hw:X,0) gives you 16 bit stereo sound.  The sample</div><div class='del'>-rate depends on the external source which feeds the Bt87x with digital</div><div class='del'>-sound via I2S interface.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Analog audio mode (A/D)</div><div class='del'>-=======================</div><div class='del'>-</div><div class='del'>-The second device (hw:X,1) gives you 8 or 16 bit mono sound.  Supported</div><div class='del'>-sample rates are between 119466 and 448000 Hz (yes, these numbers are</div><div class='del'>-that high).  If you've set the CONFIG_SND_BT87X_OVERCLOCK option, the</div><div class='del'>-maximum sample rate is 1792000 Hz, but audio data becomes unusable</div><div class='del'>-beyond 896000 Hz on my card.</div><div class='del'>-</div><div class='del'>-The chip has three analog inputs.  Consequently you'll get a mixer</div><div class='del'>-device to control these.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Have fun,</div><div class='del'>-</div><div class='del'>-  Clemens</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Written by Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='del'>-big parts copied from btaudio.txt by Gerd Knorr &lt;kraxel@bytesex.org&gt;</div><div class='head'>diff --git a/Documentation/sound/alsa/CMIPCI.txt b/Documentation/sound/alsa/CMIPCI.txt<br/>deleted file mode 100644<br/>index 4e36e6e809ca..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/CMIPCI.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/CMIPCI.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,254 +0,0 @@</div><div class='del'>-         Brief Notes on C-Media 8338/8738/8768/8770 Driver</div><div class='del'>-         =================================================</div><div class='del'>-</div><div class='del'>-                   Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Front/Rear Multi-channel Playback</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-CM8x38 chip can use ADC as the second DAC so that two different stereo</div><div class='del'>-channels can be used for front/rear playbacks.  Since there are two</div><div class='del'>-DACs, both streams are handled independently unlike the 4/6ch multi-</div><div class='del'>-channel playbacks in the section below.</div><div class='del'>-</div><div class='del'>-As default, ALSA driver assigns the first PCM device (i.e. hw:0,0 for</div><div class='del'>-card#0) for front and 4/6ch playbacks, while the second PCM device</div><div class='del'>-(hw:0,1) is assigned to the second DAC for rear playback.</div><div class='del'>-</div><div class='del'>-There are slight differences between the two DACs:</div><div class='del'>-</div><div class='del'>-- The first DAC supports U8 and S16LE formats, while the second DAC</div><div class='del'>-  supports only S16LE.</div><div class='del'>-- The second DAC supports only two channel stereo.</div><div class='del'>-</div><div class='del'>-Please note that the CM8x38 DAC doesn't support continuous playback</div><div class='del'>-rate but only fixed rates: 5512, 8000, 11025, 16000, 22050, 32000,</div><div class='del'>-44100 and 48000 Hz.</div><div class='del'>-</div><div class='del'>-The rear output can be heard only when "Four Channel Mode" switch is</div><div class='del'>-disabled.  Otherwise no signal will be routed to the rear speakers.</div><div class='del'>-As default it's turned on.</div><div class='del'>-</div><div class='del'>-*** WARNING ***</div><div class='del'>-When "Four Channel Mode" switch is off, the output from rear speakers</div><div class='del'>-will be FULL VOLUME regardless of Master and PCM volumes.</div><div class='del'>-This might damage your audio equipment.  Please disconnect speakers</div><div class='del'>-before your turn off this switch.</div><div class='del'>-*** WARNING ***</div><div class='del'>-</div><div class='del'>-[ Well.. I once got the output with correct volume (i.e. same with the</div><div class='del'>-  front one) and was so excited.  It was even with "Four Channel" bit</div><div class='del'>-  on and "double DAC" mode.  Actually I could hear separate 4 channels</div><div class='del'>-  from front and rear speakers!  But.. after reboot, all was gone.</div><div class='del'>-  It's a very pity that I didn't save the register dump at that</div><div class='del'>-  time..  Maybe there is an unknown register to achieve this... ]</div><div class='del'>-</div><div class='del'>-If your card has an extra output jack for the rear output, the rear</div><div class='del'>-playback should be routed there as default.  If not, there is a</div><div class='del'>-control switch in the driver "Line-In As Rear", which you can change</div><div class='del'>-via alsamixer or somewhat else.  When this switch is on, line-in jack</div><div class='del'>-is used as rear output.</div><div class='del'>-</div><div class='del'>-There are two more controls regarding to the rear output.</div><div class='del'>-The "Exchange DAC" switch is used to exchange front and rear playback</div><div class='del'>-routes, i.e. the 2nd DAC is output from front output.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4/6 Multi-Channel Playback</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-The recent CM8738 chips support for the 4/6 multi-channel playback</div><div class='del'>-function.  This is useful especially for AC3 decoding.</div><div class='del'>-</div><div class='del'>-When the multi-channel is supported, the driver name has a suffix</div><div class='del'>-"-MC" such like "CMI8738-MC6".  You can check this name from</div><div class='del'>-/proc/asound/cards.</div><div class='del'>-</div><div class='del'>-When the 4/6-ch output is enabled, the second DAC accepts up to 6 (or</div><div class='del'>-4) channels.  While the dual DAC supports two different rates or</div><div class='del'>-formats, the 4/6-ch playback supports only the same condition for all</div><div class='del'>-channels.  Since the multi-channel playback mode uses both DACs, you</div><div class='del'>-cannot operate with full-duplex.</div><div class='del'>-</div><div class='del'>-The 4.0 and 5.1 modes are defined as the pcm "surround40" and "surround51"</div><div class='del'>-in alsa-lib.  For example, you can play a WAV file with 6 channels like</div><div class='del'>-</div><div class='del'>-	% aplay -Dsurround51 sixchannels.wav</div><div class='del'>-</div><div class='del'>-For programming the 4/6 channel playback, you need to specify the PCM</div><div class='del'>-channels as you like and set the format S16LE.  For example, for playback</div><div class='del'>-with 4 channels,</div><div class='del'>-</div><div class='del'>-	snd_pcm_hw_params_set_access(pcm, hw, SND_PCM_ACCESS_RW_INTERLEAVED);</div><div class='del'>-	    // or mmap if you like</div><div class='del'>-	snd_pcm_hw_params_set_format(pcm, hw, SND_PCM_FORMAT_S16_LE);</div><div class='del'>-	snd_pcm_hw_params_set_channels(pcm, hw, 4);</div><div class='del'>-</div><div class='del'>-and use the interleaved 4 channel data.</div><div class='del'>-</div><div class='del'>-There are some control switches affecting to the speaker connections:</div><div class='del'>-</div><div class='del'>-"Line-In Mode"	- an enum control to change the behavior of line-in</div><div class='del'>-	jack.  Either "Line-In", "Rear Output" or "Bass Output" can</div><div class='del'>-	be selected.  The last item is available only with model 039</div><div class='del'>-	or newer. </div><div class='del'>-	When "Rear Output" is chosen, the surround channels 3 and 4</div><div class='del'>-	are output to line-in jack.</div><div class='del'>-"Mic-In Mode"	- an enum control to change the behavior of mic-in</div><div class='del'>-	jack.  Either "Mic-In" or "Center/LFE Output" can be</div><div class='del'>-	selected. </div><div class='del'>-	When "Center/LFE Output" is chosen, the center and bass</div><div class='del'>-	channels (channels 5 and 6) are output to mic-in jack. </div><div class='del'>-</div><div class='del'>-Digital I/O</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-The CM8x38 provides the excellent SPDIF capability with very cheap</div><div class='del'>-price (yes, that's the reason I bought the card :)</div><div class='del'>-</div><div class='del'>-The SPDIF playback and capture are done via the third PCM device</div><div class='del'>-(hw:0,2).  Usually this is assigned to the PCM device "spdif".</div><div class='del'>-The available rates are 44100 and 48000 Hz.</div><div class='del'>-For playback with aplay, you can run like below:</div><div class='del'>-</div><div class='del'>-	% aplay -Dhw:0,2 foo.wav</div><div class='del'>-</div><div class='del'>-or</div><div class='del'>-</div><div class='del'>-	% aplay -Dspdif foo.wav</div><div class='del'>-</div><div class='del'>-24bit format is also supported experimentally.</div><div class='del'>-</div><div class='del'>-The playback and capture over SPDIF use normal DAC and ADC,</div><div class='del'>-respectively, so you cannot playback both analog and digital streams</div><div class='del'>-simultaneously.</div><div class='del'>-</div><div class='del'>-To enable SPDIF output, you need to turn on "IEC958 Output Switch"</div><div class='del'>-control via mixer or alsactl ("IEC958" is the official name of</div><div class='del'>-so-called S/PDIF).  Then you'll see the red light on from the card so</div><div class='del'>-you know that's working obviously :)</div><div class='del'>-The SPDIF input is always enabled, so you can hear SPDIF input data</div><div class='del'>-from line-out with "IEC958 In Monitor" switch at any time (see</div><div class='del'>-below).</div><div class='del'>-</div><div class='del'>-You can play via SPDIF even with the first device (hw:0,0),</div><div class='del'>-but SPDIF is enabled only when the proper format (S16LE), sample rate</div><div class='del'>-(441100 or 48000) and channels (2) are used.  Otherwise it's turned</div><div class='del'>-off.  (Also don't forget to turn on "IEC958 Output Switch", too.)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Additionally there are relevant control switches:</div><div class='del'>-</div><div class='del'>-"IEC958 Mix Analog" - Mix analog PCM playback and FM-OPL/3 streams and</div><div class='del'>-	output through SPDIF.  This switch appears only on old chip</div><div class='del'>-	models (CM8738 033 and 037).</div><div class='del'>-	Note: without this control you can output PCM to SPDIF.</div><div class='del'>-	This is "mixing" of streams, so e.g. it's not for AC3 output</div><div class='del'>-	(see the next section).</div><div class='del'>-</div><div class='del'>-"IEC958 In Select"  - Select SPDIF input, the internal CD-in (false)</div><div class='del'>-	and the external input (true).</div><div class='del'>-</div><div class='del'>-"IEC958 Loop"       - SPDIF input data is loop back into SPDIF</div><div class='del'>-	output (aka bypass)</div><div class='del'>-</div><div class='del'>-"IEC958 Copyright"  - Set the copyright bit.</div><div class='del'>-</div><div class='del'>-"IEC958 5V"         - Select 0.5V (coax) or 5V (optical) interface.</div><div class='del'>-	On some cards this doesn't work and you need to change the</div><div class='del'>-	configuration with hardware dip-switch.</div><div class='del'>-</div><div class='del'>-"IEC958 In Monitor" - SPDIF input is routed to DAC.</div><div class='del'>-</div><div class='del'>-"IEC958 In Phase Inverse" - Set SPDIF input format as inverse.</div><div class='del'>-	[FIXME: this doesn't work on all chips..]</div><div class='del'>-</div><div class='del'>-"IEC958 In Valid"   - Set input validity flag detection.</div><div class='del'>-</div><div class='del'>-Note: When "PCM Playback Switch" is on, you'll hear the digital output</div><div class='del'>-stream through analog line-out.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The AC3 (RAW DIGITAL) OUTPUT</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-The driver supports raw digital (typically AC3) i/o over SPDIF.  This</div><div class='del'>-can be toggled via IEC958 playback control, but usually you need to</div><div class='del'>-access it via alsa-lib.  See alsa-lib documents for more details.</div><div class='del'>-</div><div class='del'>-On the raw digital mode, the "PCM Playback Switch" is automatically</div><div class='del'>-turned off so that non-audio data is heard from the analog line-out.</div><div class='del'>-Similarly the following switches are off: "IEC958 Mix Analog" and</div><div class='del'>-"IEC958 Loop".  The switches are resumed after closing the SPDIF PCM</div><div class='del'>-device automatically to the previous state.</div><div class='del'>-</div><div class='del'>-On the model 033, AC3 is implemented by the software conversion in</div><div class='del'>-the alsa-lib.  If you need to bypass the software conversion of IEC958</div><div class='del'>-subframes, pass the "soft_ac3=0" module option.  This doesn't matter</div><div class='del'>-on the newer models.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ANALOG MIXER INTERFACE</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-The mixer interface on CM8x38 is similar to SB16.</div><div class='del'>-There are Master, PCM, Synth, CD, Line, Mic and PC Speaker playback</div><div class='del'>-volumes.  Synth, CD, Line and Mic have playback and capture switches,</div><div class='del'>-too, as well as SB16.</div><div class='del'>-</div><div class='del'>-In addition to the standard SB mixer, CM8x38 provides more functions.</div><div class='del'>-- PCM playback switch</div><div class='del'>-- PCM capture switch (to capture the data sent to DAC)</div><div class='del'>-- Mic Boost switch</div><div class='del'>-- Mic capture volume</div><div class='del'>-- Aux playback volume/switch and capture switch</div><div class='del'>-- 3D control switch</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MIDI CONTROLLER</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-With CMI8338 chips, the MPU401-UART interface is disabled as default.</div><div class='del'>-You need to set the module option "mpu_port" to a valid I/O port address</div><div class='del'>-to enable MIDI support.  Valid I/O ports are 0x300, 0x310, 0x320 and</div><div class='del'>-0x330.  Choose a value that doesn't conflict with other cards.</div><div class='del'>-</div><div class='del'>-With CMI8738 and newer chips, the MIDI interface is enabled by default</div><div class='del'>-and the driver automatically chooses a port address.</div><div class='del'>-</div><div class='del'>-There is _no_ hardware wavetable function on this chip (except for</div><div class='del'>-OPL3 synth below).</div><div class='del'>-What's said as MIDI synth on Windows is a software synthesizer</div><div class='del'>-emulation.  On Linux use TiMidity or other softsynth program for</div><div class='del'>-playing MIDI music.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-FM OPL/3 Synth</div><div class='del'>---------------</div><div class='del'>-</div><div class='del'>-The FM OPL/3 is also enabled as default only for the first card.</div><div class='del'>-Set "fm_port" module option for more cards.</div><div class='del'>-</div><div class='del'>-The output quality of FM OPL/3 is, however, very weird.</div><div class='del'>-I don't know why..</div><div class='del'>-</div><div class='del'>-CMI8768 and newer chips do not have the FM synth.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Joystick and Modem</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-The legacy joystick is supported.  To enable the joystick support, pass</div><div class='del'>-joystick_port=1 module option.  The value 1 means the auto-detection.</div><div class='del'>-If the auto-detection fails, try to pass the exact I/O address.</div><div class='del'>-</div><div class='del'>-The modem is enabled dynamically via a card control switch "Modem".</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Debugging Information</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-The registers are shown in /proc/asound/cardX/cmipci.  If you have any</div><div class='del'>-problem (especially unexpected behavior of mixer), please attach the</div><div class='del'>-output of this proc file together with the bug report.</div><div class='head'>diff --git a/Documentation/sound/alsa/Channel-Mapping-API.txt b/Documentation/sound/alsa/Channel-Mapping-API.txt<br/>deleted file mode 100644<br/>index 3c43d1a4ca0e..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/Channel-Mapping-API.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/Channel-Mapping-API.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,153 +0,0 @@</div><div class='del'>-ALSA PCM channel-mapping API</div><div class='del'>-============================</div><div class='del'>-					Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>-</div><div class='del'>-GENERAL</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-The channel mapping API allows user to query the possible channel maps</div><div class='del'>-and the current channel map, also optionally to modify the channel map</div><div class='del'>-of the current stream.</div><div class='del'>-</div><div class='del'>-A channel map is an array of position for each PCM channel.</div><div class='del'>-Typically, a stereo PCM stream has a channel map of</div><div class='del'>-  { front_left, front_right }</div><div class='del'>-while a 4.0 surround PCM stream has a channel map of</div><div class='del'>-  { front left, front right, rear left, rear right }.</div><div class='del'>-</div><div class='del'>-The problem, so far, was that we had no standard channel map</div><div class='del'>-explicitly, and applications had no way to know which channel</div><div class='del'>-corresponds to which (speaker) position.  Thus, applications applied</div><div class='del'>-wrong channels for 5.1 outputs, and you hear suddenly strange sound</div><div class='del'>-from rear.  Or, some devices secretly assume that center/LFE is the</div><div class='del'>-third/fourth channels while others that C/LFE as 5th/6th channels.</div><div class='del'>-</div><div class='del'>-Also, some devices such as HDMI are configurable for different speaker</div><div class='del'>-positions even with the same number of total channels.  However, there</div><div class='del'>-was no way to specify this because of lack of channel map</div><div class='del'>-specification.  These are the main motivations for the new channel</div><div class='del'>-mapping API.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-DESIGN</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-Actually, "the channel mapping API" doesn't introduce anything new in</div><div class='del'>-the kernel/user-space ABI perspective.  It uses only the existing</div><div class='del'>-control element features.</div><div class='del'>-</div><div class='del'>-As a ground design, each PCM substream may contain a control element</div><div class='del'>-providing the channel mapping information and configuration.  This</div><div class='del'>-element is specified by:</div><div class='del'>-	iface = SNDRV_CTL_ELEM_IFACE_PCM</div><div class='del'>-	name = "Playback Channel Map" or "Capture Channel Map"</div><div class='del'>-	device = the same device number for the assigned PCM substream</div><div class='del'>-	index = the same index number for the assigned PCM substream</div><div class='del'>-</div><div class='del'>-Note the name is different depending on the PCM substream direction.</div><div class='del'>-</div><div class='del'>-Each control element provides at least the TLV read operation and the</div><div class='del'>-read operation.  Optionally, the write operation can be provided to</div><div class='del'>-allow user to change the channel map dynamically.</div><div class='del'>-</div><div class='del'>-* TLV</div><div class='del'>-</div><div class='del'>-The TLV operation gives the list of available channel</div><div class='del'>-maps.  A list item of a channel map is usually a TLV of</div><div class='del'>-	type data-bytes ch0 ch1 ch2...</div><div class='del'>-where type is the TLV type value, the second argument is the total</div><div class='del'>-bytes (not the numbers) of channel values, and the rest are the</div><div class='del'>-position value for each channel.</div><div class='del'>-</div><div class='del'>-As a TLV type, either SNDRV_CTL_TLVT_CHMAP_FIXED,</div><div class='del'>-SNDRV_CTL_TLV_CHMAP_VAR or SNDRV_CTL_TLVT_CHMAP_PAIRED can be used.</div><div class='del'>-The _FIXED type is for a channel map with the fixed channel position</div><div class='del'>-while the latter two are for flexible channel positions.  _VAR type is</div><div class='del'>-for a channel map where all channels are freely swappable and _PAIRED</div><div class='del'>-type is where pair-wise channels are swappable.  For example, when you</div><div class='del'>-have {FL/FR/RL/RR} channel map, _PAIRED type would allow you to swap</div><div class='del'>-only {RL/RR/FL/FR} while _VAR type would allow even swapping FL and</div><div class='del'>-RR.</div><div class='del'>-</div><div class='del'>-These new TLV types are defined in sound/tlv.h.</div><div class='del'>-</div><div class='del'>-The available channel position values are defined in sound/asound.h,</div><div class='del'>-here is a cut:</div><div class='del'>-</div><div class='del'>-/* channel positions */</div><div class='del'>-enum {</div><div class='del'>-	SNDRV_CHMAP_UNKNOWN = 0,</div><div class='del'>-	SNDRV_CHMAP_NA,		/* N/A, silent */</div><div class='del'>-	SNDRV_CHMAP_MONO,	/* mono stream */</div><div class='del'>-	/* this follows the alsa-lib mixer channel value + 3 */</div><div class='del'>-	SNDRV_CHMAP_FL,		/* front left */</div><div class='del'>-	SNDRV_CHMAP_FR,		/* front right */</div><div class='del'>-	SNDRV_CHMAP_RL,		/* rear left */</div><div class='del'>-	SNDRV_CHMAP_RR,		/* rear right */</div><div class='del'>-	SNDRV_CHMAP_FC,		/* front center */</div><div class='del'>-	SNDRV_CHMAP_LFE,	/* LFE */</div><div class='del'>-	SNDRV_CHMAP_SL,		/* side left */</div><div class='del'>-	SNDRV_CHMAP_SR,		/* side right */</div><div class='del'>-	SNDRV_CHMAP_RC,		/* rear center */</div><div class='del'>-	/* new definitions */</div><div class='del'>-	SNDRV_CHMAP_FLC,	/* front left center */</div><div class='del'>-	SNDRV_CHMAP_FRC,	/* front right center */</div><div class='del'>-	SNDRV_CHMAP_RLC,	/* rear left center */</div><div class='del'>-	SNDRV_CHMAP_RRC,	/* rear right center */</div><div class='del'>-	SNDRV_CHMAP_FLW,	/* front left wide */</div><div class='del'>-	SNDRV_CHMAP_FRW,	/* front right wide */</div><div class='del'>-	SNDRV_CHMAP_FLH,	/* front left high */</div><div class='del'>-	SNDRV_CHMAP_FCH,	/* front center high */</div><div class='del'>-	SNDRV_CHMAP_FRH,	/* front right high */</div><div class='del'>-	SNDRV_CHMAP_TC,		/* top center */</div><div class='del'>-	SNDRV_CHMAP_TFL,	/* top front left */</div><div class='del'>-	SNDRV_CHMAP_TFR,	/* top front right */</div><div class='del'>-	SNDRV_CHMAP_TFC,	/* top front center */</div><div class='del'>-	SNDRV_CHMAP_TRL,	/* top rear left */</div><div class='del'>-	SNDRV_CHMAP_TRR,	/* top rear right */</div><div class='del'>-	SNDRV_CHMAP_TRC,	/* top rear center */</div><div class='del'>-	SNDRV_CHMAP_LAST = SNDRV_CHMAP_TRC,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-When a PCM stream can provide more than one channel map, you can</div><div class='del'>-provide multiple channel maps in a TLV container type.  The TLV data</div><div class='del'>-to be returned will contain such as:</div><div class='del'>-	SNDRV_CTL_TLVT_CONTAINER 96</div><div class='del'>-	    SNDRV_CTL_TLVT_CHMAP_FIXED 4 SNDRV_CHMAP_FC</div><div class='del'>-	    SNDRV_CTL_TLVT_CHMAP_FIXED 8 SNDRV_CHMAP_FL SNDRV_CHMAP_FR</div><div class='del'>-	    SNDRV_CTL_TLVT_CHMAP_FIXED 16 NDRV_CHMAP_FL SNDRV_CHMAP_FR \</div><div class='del'>-		SNDRV_CHMAP_RL SNDRV_CHMAP_RR</div><div class='del'>-</div><div class='del'>-The channel position is provided in LSB 16bits.  The upper bits are</div><div class='del'>-used for bit flags.</div><div class='del'>-</div><div class='del'>-#define SNDRV_CHMAP_POSITION_MASK	0xffff</div><div class='del'>-#define SNDRV_CHMAP_PHASE_INVERSE	(0x01 &lt;&lt; 16)</div><div class='del'>-#define SNDRV_CHMAP_DRIVER_SPEC		(0x02 &lt;&lt; 16)</div><div class='del'>-</div><div class='del'>-SNDRV_CHMAP_PHASE_INVERSE indicates the channel is phase inverted,</div><div class='del'>-(thus summing left and right channels would result in almost silence).</div><div class='del'>-Some digital mic devices have this.</div><div class='del'>-</div><div class='del'>-When SNDRV_CHMAP_DRIVER_SPEC is set, all the channel position values</div><div class='del'>-don't follow the standard definition above but driver-specific.</div><div class='del'>-</div><div class='del'>-* READ OPERATION</div><div class='del'>-</div><div class='del'>-The control read operation is for providing the current channel map of</div><div class='del'>-the given stream.  The control element returns an integer array</div><div class='del'>-containing the position of each channel.</div><div class='del'>-</div><div class='del'>-When this is performed before the number of the channel is specified</div><div class='del'>-(i.e. hw_params is set), it should return all channels set to</div><div class='del'>-UNKNOWN.</div><div class='del'>-</div><div class='del'>-* WRITE OPERATION</div><div class='del'>-</div><div class='del'>-The control write operation is optional, and only for devices that can</div><div class='del'>-change the channel configuration on the fly, such as HDMI.  User needs</div><div class='del'>-to pass an integer value containing the valid channel positions for</div><div class='del'>-all channels of the assigned PCM substream.</div><div class='del'>-</div><div class='del'>-This operation is allowed only at PCM PREPARED state.  When called in</div><div class='del'>-other states, it shall return an error.</div><div class='head'>diff --git a/Documentation/sound/alsa/ControlNames.txt b/Documentation/sound/alsa/ControlNames.txt<br/>deleted file mode 100644<br/>index 3fc1cf50d28e..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/ControlNames.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/ControlNames.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,107 +0,0 @@</div><div class='del'>-This document describes standard names of mixer controls.</div><div class='del'>-</div><div class='del'>-Syntax: [LOCATION] SOURCE [CHANNEL] [DIRECTION] FUNCTION</div><div class='del'>-</div><div class='del'>-DIRECTION:</div><div class='del'>-  &lt;nothing&gt;	(both directions)</div><div class='del'>-  Playback</div><div class='del'>-  Capture</div><div class='del'>-  Bypass Playback</div><div class='del'>-  Bypass Capture</div><div class='del'>-</div><div class='del'>-FUNCTION:</div><div class='del'>-  Switch	(on/off switch)</div><div class='del'>-  Volume</div><div class='del'>-  Route		(route control, hardware specific)</div><div class='del'>-</div><div class='del'>-CHANNEL:</div><div class='del'>-  &lt;nothing&gt;     (channel independent, or applies to all channels)</div><div class='del'>-  Front</div><div class='del'>-  Surround      (rear left/right in 4.0/5.1 surround)</div><div class='del'>-  CLFE</div><div class='del'>-  Center</div><div class='del'>-  LFE</div><div class='del'>-  Side          (side left/right for 7.1 surround)</div><div class='del'>-</div><div class='del'>-LOCATION:       (physical location of source)</div><div class='del'>-  Front</div><div class='del'>-  Rear</div><div class='del'>-  Dock          (docking station)</div><div class='del'>-  Internal</div><div class='del'>-</div><div class='del'>-SOURCE:</div><div class='del'>-  Master</div><div class='del'>-  Master Mono</div><div class='del'>-  Hardware Master</div><div class='del'>-  Speaker	(internal speaker)</div><div class='del'>-  Bass Speaker	(internal LFE speaker)</div><div class='del'>-  Headphone</div><div class='del'>-  Line Out</div><div class='del'>-  Beep		(beep generator)</div><div class='del'>-  Phone</div><div class='del'>-  Phone Input</div><div class='del'>-  Phone Output</div><div class='del'>-  Synth</div><div class='del'>-  FM</div><div class='del'>-  Mic</div><div class='del'>-  Headset Mic	(mic part of combined headset jack - 4-pin headphone + mic)</div><div class='del'>-  Headphone Mic	(mic part of either/or - 3-pin headphone or mic)</div><div class='del'>-  Line		(input only, use "Line Out" for output)</div><div class='del'>-  CD</div><div class='del'>-  Video</div><div class='del'>-  Zoom Video</div><div class='del'>-  Aux</div><div class='del'>-  PCM</div><div class='del'>-  PCM Pan</div><div class='del'>-  Loopback</div><div class='del'>-  Analog Loopback	(D/A -&gt; A/D loopback)</div><div class='del'>-  Digital Loopback	(playback -&gt; capture loopback - without analog path)</div><div class='del'>-  Mono</div><div class='del'>-  Mono Output</div><div class='del'>-  Multi</div><div class='del'>-  ADC</div><div class='del'>-  Wave</div><div class='del'>-  Music</div><div class='del'>-  I2S</div><div class='del'>-  IEC958</div><div class='del'>-  HDMI</div><div class='del'>-  SPDIF		(output only)</div><div class='del'>-  SPDIF In</div><div class='del'>-  Digital In</div><div class='del'>-  HDMI/DP	(either HDMI or DisplayPort)</div><div class='del'>-</div><div class='del'>-Exceptions (deprecated):</div><div class='del'>-  [Analogue|Digital] Capture Source</div><div class='del'>-  [Analogue|Digital] Capture Switch	(aka input gain switch)</div><div class='del'>-  [Analogue|Digital] Capture Volume	(aka input gain volume)</div><div class='del'>-  [Analogue|Digital] Playback Switch	(aka output gain switch)</div><div class='del'>-  [Analogue|Digital] Playback Volume	(aka output gain volume)</div><div class='del'>-  Tone Control - Switch</div><div class='del'>-  Tone Control - Bass</div><div class='del'>-  Tone Control - Treble</div><div class='del'>-  3D Control - Switch</div><div class='del'>-  3D Control - Center</div><div class='del'>-  3D Control - Depth</div><div class='del'>-  3D Control - Wide</div><div class='del'>-  3D Control - Space</div><div class='del'>-  3D Control - Level</div><div class='del'>-  Mic Boost [(?dB)]</div><div class='del'>-</div><div class='del'>-PCM interface:</div><div class='del'>-</div><div class='del'>-  Sample Clock Source	{ "Word", "Internal", "AutoSync" }</div><div class='del'>-  Clock Sync Status	{ "Lock", "Sync", "No Lock" }</div><div class='del'>-  External Rate		/* external capture rate */</div><div class='del'>-  Capture Rate		/* capture rate taken from external source */</div><div class='del'>-</div><div class='del'>-IEC958 (S/PDIF) interface:</div><div class='del'>-</div><div class='del'>-  IEC958 [...] [Playback|Capture] Switch	/* turn on/off the IEC958 interface */</div><div class='del'>-  IEC958 [...] [Playback|Capture] Volume	/* digital volume control */</div><div class='del'>-  IEC958 [...] [Playback|Capture] Default	/* default or global value - read/write */</div><div class='del'>-  IEC958 [...] [Playback|Capture] Mask		/* consumer and professional mask */</div><div class='del'>-  IEC958 [...] [Playback|Capture] Con Mask	/* consumer mask */</div><div class='del'>-  IEC958 [...] [Playback|Capture] Pro Mask	/* professional mask */</div><div class='del'>-  IEC958 [...] [Playback|Capture] PCM Stream	/* the settings assigned to a PCM stream */</div><div class='del'>-  IEC958 Q-subcode [Playback|Capture] Default	/* Q-subcode bits */</div><div class='del'>-  IEC958 Preamble [Playback|Capture] Default	/* burst preamble words (4*16bits) */</div><div class='head'>diff --git a/Documentation/sound/alsa/HD-Audio-Controls.txt b/Documentation/sound/alsa/HD-Audio-Controls.txt<br/>deleted file mode 100644<br/>index e9621e349e17..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/HD-Audio-Controls.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/HD-Audio-Controls.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,116 +0,0 @@</div><div class='del'>-This file explains the codec-specific mixer controls.</div><div class='del'>-</div><div class='del'>-Realtek codecs</div><div class='del'>---------------</div><div class='del'>-</div><div class='del'>-* Channel Mode</div><div class='del'>-  This is an enum control to change the surround-channel setup,</div><div class='del'>-  appears only when the surround channels are available.</div><div class='del'>-  It gives the number of channels to be used, "2ch", "4ch", "6ch",</div><div class='del'>-  and "8ch".  According to the configuration, this also controls the</div><div class='del'>-  jack-retasking of multi-I/O jacks.</div><div class='del'>-</div><div class='del'>-* Auto-Mute Mode</div><div class='del'>-  This is an enum control to change the auto-mute behavior of the</div><div class='del'>-  headphone and line-out jacks.  If built-in speakers and headphone</div><div class='del'>-  and/or line-out jacks are available on a machine, this controls</div><div class='del'>-  appears.</div><div class='del'>-  When there are only either headphones or line-out jacks, it gives</div><div class='del'>-  "Disabled" and "Enabled" state.  When enabled, the speaker is muted</div><div class='del'>-  automatically when a jack is plugged.</div><div class='del'>-</div><div class='del'>-  When both headphone and line-out jacks are present, it gives</div><div class='del'>-  "Disabled", "Speaker Only" and "Line-Out+Speaker".  When</div><div class='del'>-  speaker-only is chosen, plugging into a headphone or a line-out jack</div><div class='del'>-  mutes the speakers, but not line-outs.  When line-out+speaker is</div><div class='del'>-  selected, plugging to a headphone jack mutes both speakers and</div><div class='del'>-  line-outs.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-IDT/Sigmatel codecs</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-* Analog Loopback</div><div class='del'>-  This control enables/disables the analog-loopback circuit.  This</div><div class='del'>-  appears only when "loopback" is set to true in a codec hint</div><div class='del'>-  (see HD-Audio.txt).  Note that on some codecs the analog-loopback</div><div class='del'>-  and the normal PCM playback are exclusive, i.e. when this is on, you</div><div class='del'>-  won't hear any PCM stream.</div><div class='del'>-</div><div class='del'>-* Swap Center/LFE</div><div class='del'>-  Swaps the center and LFE channel order.  Normally, the left</div><div class='del'>-  corresponds to the center and the right to the LFE.  When this is</div><div class='del'>-  ON, the left to the LFE and the right to the center.</div><div class='del'>-</div><div class='del'>-* Headphone as Line Out</div><div class='del'>-  When this control is ON, treat the headphone jacks as line-out</div><div class='del'>-  jacks.  That is, the headphone won't auto-mute the other line-outs,</div><div class='del'>-  and no HP-amp is set to the pins.</div><div class='del'>-</div><div class='del'>-* Mic Jack Mode, Line Jack Mode, etc</div><div class='del'>-  These enum controls the direction and the bias of the input jack</div><div class='del'>-  pins.  Depending on the jack type, it can set as "Mic In" and "Line </div><div class='del'>-  In", for determining the input bias, or it can be set to "Line Out"</div><div class='del'>-  when the pin is a multi-I/O jack for surround channels.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-VIA codecs</div><div class='del'>-----------</div><div class='del'>-</div><div class='del'>-* Smart 5.1</div><div class='del'>-  An enum control to re-task the multi-I/O jacks for surround outputs.</div><div class='del'>-  When it's ON, the corresponding input jacks (usually a line-in and a</div><div class='del'>-  mic-in) are switched as the surround and the CLFE output jacks.</div><div class='del'>-</div><div class='del'>-* Independent HP</div><div class='del'>-  When this enum control is enabled, the headphone output is routed</div><div class='del'>-  from an individual stream (the third PCM such as hw:0,2) instead of</div><div class='del'>-  the primary stream.  In the case the headphone DAC is shared with a</div><div class='del'>-  side or a CLFE-channel DAC, the DAC is switched to the headphone</div><div class='del'>-  automatically.</div><div class='del'>-</div><div class='del'>-* Loopback Mixing</div><div class='del'>-  An enum control to determine whether the analog-loopback route is</div><div class='del'>-  enabled or not.  When it's enabled, the analog-loopback is mixed to</div><div class='del'>-  the front-channel.  Also, the same route is used for the headphone</div><div class='del'>-  and speaker outputs.  As a side-effect, when this mode is set, the</div><div class='del'>-  individual volume controls will be no longer available for</div><div class='del'>-  headphones and speakers because there is only one DAC connected to a</div><div class='del'>-  mixer widget.</div><div class='del'>-</div><div class='del'>-* Dynamic Power-Control</div><div class='del'>-  This control determines whether the dynamic power-control per jack</div><div class='del'>-  detection is enabled or not.  When enabled, the widgets power state</div><div class='del'>-  (D0/D3) are changed dynamically depending on the jack plugging</div><div class='del'>-  state for saving power consumptions.  However, if your system</div><div class='del'>-  doesn't provide a proper jack-detection, this won't work; in such a</div><div class='del'>-  case, turn this control OFF.</div><div class='del'>-</div><div class='del'>-* Jack Detect</div><div class='del'>-  This control is provided only for VT1708 codec which gives no proper</div><div class='del'>-  unsolicited event per jack plug.  When this is on, the driver polls</div><div class='del'>-  the jack detection so that the headphone auto-mute can work, while </div><div class='del'>-  turning this off would reduce the power consumption.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Conexant codecs</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-* Auto-Mute Mode</div><div class='del'>-  See Reatek codecs.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Analog codecs</div><div class='del'>---------------</div><div class='del'>-</div><div class='del'>-* Channel Mode</div><div class='del'>-  This is an enum control to change the surround-channel setup,</div><div class='del'>-  appears only when the surround channels are available.</div><div class='del'>-  It gives the number of channels to be used, "2ch", "4ch" and "6ch".</div><div class='del'>-  According to the configuration, this also controls the</div><div class='del'>-  jack-retasking of multi-I/O jacks.</div><div class='del'>-</div><div class='del'>-* Independent HP</div><div class='del'>-  When this enum control is enabled, the headphone output is routed</div><div class='del'>-  from an individual stream (the third PCM such as hw:0,2) instead of</div><div class='del'>-  the primary stream.</div><div class='head'>diff --git a/Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt b/Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt<br/>deleted file mode 100644<br/>index 82744ac3513d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-To support DP MST audio, HD Audio hdmi codec driver introduces virtual pin</div><div class='del'>-and dynamic pcm assignment.</div><div class='del'>-</div><div class='del'>-Virtual pin is an extension of per_pin. The most difference of DP MST</div><div class='del'>-from legacy is that DP MST introduces device entry. Each pin can contain</div><div class='del'>-several device entries. Each device entry behaves as a pin.</div><div class='del'>-</div><div class='del'>-As each pin may contain several device entries and each codec may contain</div><div class='del'>-several pins, if we use one pcm per per_pin, there will be many PCMs.</div><div class='del'>-The new solution is to create a few PCMs and to dynamically bind pcm to</div><div class='del'>-per_pin. Driver uses spec-&gt;dyn_pcm_assign flag to indicate whether to use</div><div class='del'>-the new solution.</div><div class='del'>-</div><div class='del'>-PCM</div><div class='del'>-===</div><div class='del'>-To be added</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Jack</div><div class='del'>-====</div><div class='del'>-</div><div class='del'>-Presume:</div><div class='del'>- - MST must be dyn_pcm_assign, and it is acomp (for Intel scenario);</div><div class='del'>- - NON-MST may or may not be dyn_pcm_assign, it can be acomp or !acomp;</div><div class='del'>-</div><div class='del'>-So there are the following scenarios:</div><div class='del'>- a. MST (&amp;&amp; dyn_pcm_assign &amp;&amp; acomp)</div><div class='del'>- b. NON-MST &amp;&amp; dyn_pcm_assign &amp;&amp; acomp</div><div class='del'>- c. NON-MST &amp;&amp; !dyn_pcm_assign &amp;&amp; !acomp</div><div class='del'>-</div><div class='del'>-Below discussion will ignore MST and NON-MST difference as it doesn't</div><div class='del'>-impact on jack handling too much.</div><div class='del'>-</div><div class='del'>-Driver uses struct hdmi_pcm pcm[] array in hdmi_spec and snd_jack is</div><div class='del'>-a member of hdmi_pcm. Each pin has one struct hdmi_pcm * pcm pointer.</div><div class='del'>-</div><div class='del'>-For !dyn_pcm_assign, per_pin-&gt;pcm will assigned to spec-&gt;pcm[n] statically.</div><div class='del'>-</div><div class='del'>-For dyn_pcm_assign, per_pin-&gt;pcm will assigned to spec-&gt;pcm[n]</div><div class='del'>-when monitor is hotplugged.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Build Jack</div><div class='del'>-----------</div><div class='del'>-</div><div class='del'>-- dyn_pcm_assign</div><div class='del'>-Will not use hda_jack but use snd_jack in spec-&gt;pcm_rec[pcm_idx].jack directly.</div><div class='del'>-</div><div class='del'>-- !dyn_pcm_assign</div><div class='del'>-Use hda_jack and assign spec-&gt;pcm_rec[pcm_idx].jack = jack-&gt;jack statically.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Unsolicited Event Enabling</div><div class='del'>---------------------------</div><div class='del'>-Enable unsolicited event if !acomp.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Monitor Hotplug Event Handling</div><div class='del'>-------------------------------</div><div class='del'>-- acomp</div><div class='del'>-pin_eld_notify() -&gt; check_presence_and_report() -&gt; hdmi_present_sense() -&gt;</div><div class='del'>-sync_eld_via_acomp().</div><div class='del'>-Use directly snd_jack_report() on spec-&gt;pcm_rec[pcm_idx].jack for</div><div class='del'>-both dyn_pcm_assign and !dyn_pcm_assign</div><div class='del'>-</div><div class='del'>-- !acomp</div><div class='del'>-Hdmi_unsol_event() -&gt; hdmi_intrinsic_event() -&gt; check_presence_and_report() -&gt;</div><div class='del'>-hdmi_present_sense() -&gt; hdmi_prepsent_sense_via_verbs()</div><div class='del'>-Use directly snd_jack_report() on spec-&gt;pcm_rec[pcm_idx].jack for dyn_pcm_assign.</div><div class='del'>-Use hda_jack mechanism to handle jack events.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Others to be added later</div><div class='del'>-========================</div><div class='head'>diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt<br/>deleted file mode 100644<br/>index ec099d4343f2..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/HD-Audio-Models.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/HD-Audio-Models.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,324 +0,0 @@</div><div class='del'>-  Model name	Description</div><div class='del'>-  ----------    -----------</div><div class='del'>-ALC880</div><div class='del'>-======</div><div class='del'>-  3stack	3-jack in back and a headphone out</div><div class='del'>-  3stack-digout	3-jack in back, a HP out and a SPDIF out</div><div class='del'>-  5stack	5-jack in back, 2-jack in front</div><div class='del'>-  5stack-digout	5-jack in back, 2-jack in front, a SPDIF out</div><div class='del'>-  6stack	6-jack in back, 2-jack in front</div><div class='del'>-  6stack-digout	6-jack with a SPDIF out</div><div class='del'>-</div><div class='del'>-ALC260</div><div class='del'>-======</div><div class='del'>-  gpio1		Enable GPIO1</div><div class='del'>-  coef		Enable EAPD via COEF table</div><div class='del'>-  fujitsu	Quirk for FSC S7020</div><div class='del'>-  fujitsu-jwse	Quirk for FSC S7020 with jack modes and HP mic support</div><div class='del'>-</div><div class='del'>-ALC262</div><div class='del'>-======</div><div class='del'>-  inv-dmic	Inverted internal mic workaround</div><div class='del'>-</div><div class='del'>-ALC267/268</div><div class='del'>-==========</div><div class='del'>-  inv-dmic	Inverted internal mic workaround</div><div class='del'>-  hp-eapd	Disable HP EAPD on NID 0x15</div><div class='del'>-</div><div class='del'>-ALC22x/23x/25x/269/27x/28x/29x (and vendor-specific ALC3xxx models)</div><div class='del'>-======</div><div class='del'>-  laptop-amic		Laptops with analog-mic input</div><div class='del'>-  laptop-dmic		Laptops with digital-mic input</div><div class='del'>-  alc269-dmic		Enable ALC269(VA) digital mic workaround</div><div class='del'>-  alc271-dmic		Enable ALC271X digital mic workaround</div><div class='del'>-  inv-dmic		Inverted internal mic workaround</div><div class='del'>-  headset-mic		Indicates a combined headset (headphone+mic) jack</div><div class='del'>-  headset-mode		More comprehensive headset support for ALC269 &amp; co</div><div class='del'>-  headset-mode-no-hp-mic Headset mode support without headphone mic</div><div class='del'>-  lenovo-dock   	Enables docking station I/O for some Lenovos</div><div class='del'>-  hp-gpio-led		GPIO LED support on HP laptops</div><div class='del'>-  dell-headset-multi	Headset jack, which can also be used as mic-in</div><div class='del'>-  dell-headset-dock	Headset jack (without mic-in), and also dock I/O</div><div class='del'>-  alc283-dac-wcaps	Fixups for Chromebook with ALC283</div><div class='del'>-  alc283-sense-combo	Combo jack sensing on ALC283</div><div class='del'>-  tpt440-dock		Pin configs for Lenovo Thinkpad Dock support</div><div class='del'>-</div><div class='del'>-ALC66x/67x/892</div><div class='del'>-==============</div><div class='del'>-  mario			Chromebook mario model fixup</div><div class='del'>-  asus-mode1		ASUS</div><div class='del'>-  asus-mode2		ASUS</div><div class='del'>-  asus-mode3		ASUS</div><div class='del'>-  asus-mode4		ASUS</div><div class='del'>-  asus-mode5		ASUS</div><div class='del'>-  asus-mode6		ASUS</div><div class='del'>-  asus-mode7		ASUS</div><div class='del'>-  asus-mode8		ASUS</div><div class='del'>-  inv-dmic		Inverted internal mic workaround</div><div class='del'>-  dell-headset-multi	Headset jack, which can also be used as mic-in</div><div class='del'>-</div><div class='del'>-ALC680</div><div class='del'>-======</div><div class='del'>-  N/A</div><div class='del'>-</div><div class='del'>-ALC88x/898/1150</div><div class='del'>-======================</div><div class='del'>-  acer-aspire-4930g	Acer Aspire 4930G/5930G/6530G/6930G/7730G</div><div class='del'>-  acer-aspire-8930g	Acer Aspire 8330G/6935G</div><div class='del'>-  acer-aspire		Acer Aspire others</div><div class='del'>-  inv-dmic		Inverted internal mic workaround</div><div class='del'>-  no-primary-hp		VAIO Z/VGC-LN51JGB workaround (for fixed speaker DAC)</div><div class='del'>-</div><div class='del'>-ALC861/660</div><div class='del'>-==========</div><div class='del'>-  N/A</div><div class='del'>-</div><div class='del'>-ALC861VD/660VD</div><div class='del'>-==============</div><div class='del'>-  N/A</div><div class='del'>-</div><div class='del'>-CMI9880</div><div class='del'>-=======</div><div class='del'>-  minimal	3-jack in back</div><div class='del'>-  min_fp	3-jack in back, 2-jack in front</div><div class='del'>-  full		6-jack in back, 2-jack in front</div><div class='del'>-  full_dig	6-jack in back, 2-jack in front, SPDIF I/O</div><div class='del'>-  allout	5-jack in back, 2-jack in front, SPDIF out</div><div class='del'>-  auto		auto-config reading BIOS (default)</div><div class='del'>-</div><div class='del'>-AD1882 / AD1882A</div><div class='del'>-================</div><div class='del'>-  3stack	3-stack mode</div><div class='del'>-  3stack-automute 3-stack with automute front HP (default)</div><div class='del'>-  6stack	6-stack mode</div><div class='del'>-</div><div class='del'>-AD1884A / AD1883 / AD1984A / AD1984B</div><div class='del'>-====================================</div><div class='del'>-  desktop	3-stack desktop (default)</div><div class='del'>-  laptop	laptop with HP jack sensing</div><div class='del'>-  mobile	mobile devices with HP jack sensing</div><div class='del'>-  thinkpad	Lenovo Thinkpad X300</div><div class='del'>-  touchsmart	HP Touchsmart</div><div class='del'>-</div><div class='del'>-AD1884</div><div class='del'>-======</div><div class='del'>-  N/A</div><div class='del'>-</div><div class='del'>-AD1981</div><div class='del'>-======</div><div class='del'>-  basic		3-jack (default)</div><div class='del'>-  hp		HP nx6320</div><div class='del'>-  thinkpad	Lenovo Thinkpad T60/X60/Z60</div><div class='del'>-  toshiba	Toshiba U205</div><div class='del'>-</div><div class='del'>-AD1983</div><div class='del'>-======</div><div class='del'>-  N/A</div><div class='del'>-</div><div class='del'>-AD1984</div><div class='del'>-======</div><div class='del'>-  basic		default configuration</div><div class='del'>-  thinkpad	Lenovo Thinkpad T61/X61</div><div class='del'>-  dell_desktop	Dell T3400</div><div class='del'>-</div><div class='del'>-AD1986A</div><div class='del'>-=======</div><div class='del'>-  3stack	3-stack, shared surrounds</div><div class='del'>-  laptop	2-channel only (FSC V2060, Samsung M50)</div><div class='del'>-  laptop-imic	2-channel with built-in mic</div><div class='del'>-  eapd		Turn on EAPD constantly</div><div class='del'>-</div><div class='del'>-AD1988/AD1988B/AD1989A/AD1989B</div><div class='del'>-==============================</div><div class='del'>-  6stack	6-jack</div><div class='del'>-  6stack-dig	ditto with SPDIF</div><div class='del'>-  3stack	3-jack</div><div class='del'>-  3stack-dig	ditto with SPDIF</div><div class='del'>-  laptop	3-jack with hp-jack automute</div><div class='del'>-  laptop-dig	ditto with SPDIF</div><div class='del'>-  auto		auto-config reading BIOS (default)</div><div class='del'>-</div><div class='del'>-Conexant 5045</div><div class='del'>-=============</div><div class='del'>-  laptop-hpsense    Laptop with HP sense (old model laptop)</div><div class='del'>-  laptop-micsense   Laptop with Mic sense (old model fujitsu)</div><div class='del'>-  laptop-hpmicsense Laptop with HP and Mic senses</div><div class='del'>-  benq		Benq R55E</div><div class='del'>-  laptop-hp530	HP 530 laptop</div><div class='del'>-  test		for testing/debugging purpose, almost all controls</div><div class='del'>-		can be adjusted.  Appearing only when compiled with</div><div class='del'>-		$CONFIG_SND_DEBUG=y</div><div class='del'>-</div><div class='del'>-Conexant 5047</div><div class='del'>-=============</div><div class='del'>-  laptop	Basic Laptop config </div><div class='del'>-  laptop-hp	Laptop config for some HP models (subdevice 30A5)</div><div class='del'>-  laptop-eapd	Laptop config with EAPD support</div><div class='del'>-  test		for testing/debugging purpose, almost all controls</div><div class='del'>-		can be adjusted.  Appearing only when compiled with</div><div class='del'>-		$CONFIG_SND_DEBUG=y</div><div class='del'>-</div><div class='del'>-Conexant 5051</div><div class='del'>-=============</div><div class='del'>-  laptop	Basic Laptop config (default)</div><div class='del'>-  hp		HP Spartan laptop</div><div class='del'>-  hp-dv6736	HP dv6736</div><div class='del'>-  hp-f700	HP Compaq Presario F700</div><div class='del'>-  ideapad	Lenovo IdeaPad laptop</div><div class='del'>-  toshiba	Toshiba Satellite M300</div><div class='del'>-</div><div class='del'>-Conexant 5066</div><div class='del'>-=============</div><div class='del'>-  laptop	Basic Laptop config (default)</div><div class='del'>-  hp-laptop	HP laptops, e g G60</div><div class='del'>-  asus		Asus K52JU, Lenovo G560</div><div class='del'>-  dell-laptop	Dell laptops</div><div class='del'>-  dell-vostro	Dell Vostro</div><div class='del'>-  olpc-xo-1_5	OLPC XO 1.5</div><div class='del'>-  ideapad       Lenovo IdeaPad U150</div><div class='del'>-  thinkpad	Lenovo Thinkpad</div><div class='del'>-</div><div class='del'>-STAC9200</div><div class='del'>-========</div><div class='del'>-  ref		Reference board</div><div class='del'>-  oqo		OQO Model 2</div><div class='del'>-  dell-d21	Dell (unknown)</div><div class='del'>-  dell-d22	Dell (unknown)</div><div class='del'>-  dell-d23	Dell (unknown)</div><div class='del'>-  dell-m21	Dell Inspiron 630m, Dell Inspiron 640m</div><div class='del'>-  dell-m22	Dell Latitude D620, Dell Latitude D820</div><div class='del'>-  dell-m23	Dell XPS M1710, Dell Precision M90</div><div class='del'>-  dell-m24	Dell Latitude 120L</div><div class='del'>-  dell-m25	Dell Inspiron E1505n</div><div class='del'>-  dell-m26	Dell Inspiron 1501</div><div class='del'>-  dell-m27	Dell Inspiron E1705/9400</div><div class='del'>-  gateway-m4	Gateway laptops with EAPD control</div><div class='del'>-  gateway-m4-2	Gateway laptops with EAPD control</div><div class='del'>-  panasonic	Panasonic CF-74</div><div class='del'>-  auto		BIOS setup (default)</div><div class='del'>-</div><div class='del'>-STAC9205/9254</div><div class='del'>-=============</div><div class='del'>-  ref		Reference board</div><div class='del'>-  dell-m42	Dell (unknown)</div><div class='del'>-  dell-m43	Dell Precision</div><div class='del'>-  dell-m44	Dell Inspiron</div><div class='del'>-  eapd		Keep EAPD on (e.g. Gateway T1616)</div><div class='del'>-  auto		BIOS setup (default)</div><div class='del'>-</div><div class='del'>-STAC9220/9221</div><div class='del'>-=============</div><div class='del'>-  ref		Reference board</div><div class='del'>-  3stack	D945 3stack</div><div class='del'>-  5stack	D945 5stack + SPDIF</div><div class='del'>-  intel-mac-v1	Intel Mac Type 1</div><div class='del'>-  intel-mac-v2	Intel Mac Type 2</div><div class='del'>-  intel-mac-v3	Intel Mac Type 3</div><div class='del'>-  intel-mac-v4	Intel Mac Type 4</div><div class='del'>-  intel-mac-v5	Intel Mac Type 5</div><div class='del'>-  intel-mac-auto Intel Mac (detect type according to subsystem id)</div><div class='del'>-  macmini	Intel Mac Mini (equivalent with type 3)</div><div class='del'>-  macbook	Intel Mac Book (eq. type 5)</div><div class='del'>-  macbook-pro-v1 Intel Mac Book Pro 1st generation (eq. type 3)</div><div class='del'>-  macbook-pro	Intel Mac Book Pro 2nd generation (eq. type 3)</div><div class='del'>-  imac-intel	Intel iMac (eq. type 2)</div><div class='del'>-  imac-intel-20	Intel iMac (newer version) (eq. type 3)</div><div class='del'>-  ecs202	ECS/PC chips</div><div class='del'>-  dell-d81	Dell (unknown)</div><div class='del'>-  dell-d82	Dell (unknown)</div><div class='del'>-  dell-m81	Dell (unknown)</div><div class='del'>-  dell-m82	Dell XPS M1210</div><div class='del'>-  auto		BIOS setup (default)</div><div class='del'>-</div><div class='del'>-STAC9202/9250/9251</div><div class='del'>-==================</div><div class='del'>-  ref		Reference board, base config</div><div class='del'>-  m1		Some Gateway MX series laptops (NX560XL)</div><div class='del'>-  m1-2		Some Gateway MX series laptops (MX6453)</div><div class='del'>-  m2		Some Gateway MX series laptops (M255)</div><div class='del'>-  m2-2		Some Gateway MX series laptops</div><div class='del'>-  m3		Some Gateway MX series laptops</div><div class='del'>-  m5		Some Gateway MX series laptops (MP6954)</div><div class='del'>-  m6		Some Gateway NX series laptops</div><div class='del'>-  auto		BIOS setup (default)</div><div class='del'>-</div><div class='del'>-STAC9227/9228/9229/927x</div><div class='del'>-=======================</div><div class='del'>-  ref		Reference board</div><div class='del'>-  ref-no-jd	Reference board without HP/Mic jack detection</div><div class='del'>-  3stack	D965 3stack</div><div class='del'>-  5stack	D965 5stack + SPDIF</div><div class='del'>-  5stack-no-fp	D965 5stack without front panel</div><div class='del'>-  dell-3stack	Dell Dimension E520</div><div class='del'>-  dell-bios	Fixes with Dell BIOS setup</div><div class='del'>-  dell-bios-amic Fixes with Dell BIOS setup including analog mic</div><div class='del'>-  volknob	Fixes with volume-knob widget 0x24</div><div class='del'>-  auto		BIOS setup (default)</div><div class='del'>-</div><div class='del'>-STAC92HD71B*</div><div class='del'>-============</div><div class='del'>-  ref		Reference board</div><div class='del'>-  dell-m4-1	Dell desktops</div><div class='del'>-  dell-m4-2	Dell desktops</div><div class='del'>-  dell-m4-3	Dell desktops</div><div class='del'>-  hp-m4		HP mini 1000</div><div class='del'>-  hp-dv5	HP dv series</div><div class='del'>-  hp-hdx	HP HDX series</div><div class='del'>-  hp-dv4-1222nr	HP dv4-1222nr (with LED support)</div><div class='del'>-  auto		BIOS setup (default)</div><div class='del'>-</div><div class='del'>-STAC92HD73*</div><div class='del'>-===========</div><div class='del'>-  ref		Reference board</div><div class='del'>-  no-jd		BIOS setup but without jack-detection</div><div class='del'>-  intel		Intel DG45* mobos</div><div class='del'>-  dell-m6-amic	Dell desktops/laptops with analog mics</div><div class='del'>-  dell-m6-dmic	Dell desktops/laptops with digital mics</div><div class='del'>-  dell-m6	Dell desktops/laptops with both type of mics</div><div class='del'>-  dell-eq	Dell desktops/laptops</div><div class='del'>-  alienware	Alienware M17x</div><div class='del'>-  auto		BIOS setup (default)</div><div class='del'>-</div><div class='del'>-STAC92HD83*</div><div class='del'>-===========</div><div class='del'>-  ref		Reference board</div><div class='del'>-  mic-ref	Reference board with power management for ports</div><div class='del'>-  dell-s14	Dell laptop</div><div class='del'>-  dell-vostro-3500	Dell Vostro 3500 laptop</div><div class='del'>-  hp-dv7-4000	HP dv-7 4000</div><div class='del'>-  hp_cNB11_intquad HP CNB models with 4 speakers</div><div class='del'>-  hp-zephyr	HP Zephyr</div><div class='del'>-  hp-led	HP with broken BIOS for mute LED</div><div class='del'>-  hp-inv-led	HP with broken BIOS for inverted mute LED</div><div class='del'>-  hp-mic-led	HP with mic-mute LED</div><div class='del'>-  headset-jack	Dell Latitude with a 4-pin headset jack</div><div class='del'>-  hp-envy-bass	Pin fixup for HP Envy bass speaker (NID 0x0f)</div><div class='del'>-  hp-envy-ts-bass Pin fixup for HP Envy TS bass speaker (NID 0x10)</div><div class='del'>-  hp-bnb13-eq	Hardware equalizer setup for HP laptops</div><div class='del'>-  auto		BIOS setup (default)</div><div class='del'>-</div><div class='del'>-STAC92HD95</div><div class='del'>-==========</div><div class='del'>-  hp-led	LED support for HP laptops</div><div class='del'>-  hp-bass	Bass HPF setup for HP Spectre 13</div><div class='del'>-</div><div class='del'>-STAC9872</div><div class='del'>-========</div><div class='del'>-  vaio		VAIO laptop without SPDIF</div><div class='del'>-  auto		BIOS setup (default)</div><div class='del'>-</div><div class='del'>-Cirrus Logic CS4206/4207</div><div class='del'>-========================</div><div class='del'>-  mbp55		MacBook Pro 5,5</div><div class='del'>-  imac27	IMac 27 Inch</div><div class='del'>-  auto		BIOS setup (default)</div><div class='del'>-</div><div class='del'>-Cirrus Logic CS4208</div><div class='del'>-===================</div><div class='del'>-  mba6		MacBook Air 6,1 and 6,2</div><div class='del'>-  gpio0		Enable GPIO 0 amp</div><div class='del'>-  auto		BIOS setup (default)</div><div class='del'>-</div><div class='del'>-VIA VT17xx/VT18xx/VT20xx</div><div class='del'>-========================</div><div class='del'>-  auto		BIOS setup (default)</div><div class='head'>diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt<br/>deleted file mode 100644<br/>index d4510ebf2e8c..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/HD-Audio.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/HD-Audio.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,853 +0,0 @@</div><div class='del'>-MORE NOTES ON HD-AUDIO DRIVER</div><div class='del'>-=============================</div><div class='del'>-					Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GENERAL</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-HD-audio is the new standard on-board audio component on modern PCs</div><div class='del'>-after AC97.  Although Linux has been supporting HD-audio since long</div><div class='del'>-time ago, there are often problems with new machines.  A part of the</div><div class='del'>-problem is broken BIOS, and the rest is the driver implementation.</div><div class='del'>-This document explains the brief trouble-shooting and debugging</div><div class='del'>-methods for the	HD-audio hardware.</div><div class='del'>-</div><div class='del'>-The HD-audio component consists of two parts: the controller chip and </div><div class='del'>-the codec chips on the HD-audio bus.  Linux provides a single driver</div><div class='del'>-for all controllers, snd-hda-intel.  Although the driver name contains</div><div class='del'>-a word of a well-known hardware vendor, it's not specific to it but for</div><div class='del'>-all controller chips by other companies.  Since the HD-audio</div><div class='del'>-controllers are supposed to be compatible, the single snd-hda-driver</div><div class='del'>-should work in most cases.  But, not surprisingly, there are known</div><div class='del'>-bugs and issues specific to each controller type.  The snd-hda-intel</div><div class='del'>-driver has a bunch of workarounds for these as described below.</div><div class='del'>-</div><div class='del'>-A controller may have multiple codecs.  Usually you have one audio</div><div class='del'>-codec and optionally one modem codec.  In theory, there might be</div><div class='del'>-multiple audio codecs, e.g. for analog and digital outputs, and the</div><div class='del'>-driver might not work properly because of conflict of mixer elements.</div><div class='del'>-This should be fixed in future if such hardware really exists.</div><div class='del'>-</div><div class='del'>-The snd-hda-intel driver has several different codec parsers depending</div><div class='del'>-on the codec.  It has a generic parser as a fallback, but this</div><div class='del'>-functionality is fairly limited until now.  Instead of the generic</div><div class='del'>-parser, usually the codec-specific parser (coded in patch_*.c) is used</div><div class='del'>-for the codec-specific implementations.  The details about the</div><div class='del'>-codec-specific problems are explained in the later sections.</div><div class='del'>-</div><div class='del'>-If you are interested in the deep debugging of HD-audio, read the</div><div class='del'>-HD-audio specification at first.  The specification is found on</div><div class='del'>-Intel's web page, for example:</div><div class='del'>-</div><div class='del'>-- http://www.intel.com/standards/hdaudio/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-HD-AUDIO CONTROLLER</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-DMA-Position Problem</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-The most common problem of the controller is the inaccurate DMA</div><div class='del'>-pointer reporting.  The DMA pointer for playback and capture can be</div><div class='del'>-read in two ways, either via a LPIB register or via a position-buffer</div><div class='del'>-map.  As default the driver tries to read from the io-mapped</div><div class='del'>-position-buffer, and falls back to LPIB if the position-buffer appears</div><div class='del'>-dead.  However, this detection isn't perfect on some devices.  In such</div><div class='del'>-a case, you can change the default method via `position_fix` option.</div><div class='del'>-</div><div class='del'>-`position_fix=1` means to use LPIB method explicitly.</div><div class='del'>-`position_fix=2` means to use the position-buffer.</div><div class='del'>-`position_fix=3` means to use a combination of both methods, needed</div><div class='del'>-for some VIA controllers.  The capture stream position is corrected</div><div class='del'>-by comparing both LPIB and position-buffer values.</div><div class='del'>-`position_fix=4` is another combination available for all controllers,</div><div class='del'>-and uses LPIB for the playback and the position-buffer for the capture</div><div class='del'>-streams.</div><div class='del'>-0 is the default value for all other</div><div class='del'>-controllers, the automatic check and fallback to LPIB as described in</div><div class='del'>-the above.  If you get a problem of repeated sounds, this option might</div><div class='del'>-help.</div><div class='del'>-</div><div class='del'>-In addition to that, every controller is known to be broken regarding</div><div class='del'>-the wake-up timing.  It wakes up a few samples before actually</div><div class='del'>-processing the data on the buffer.  This caused a lot of problems, for</div><div class='del'>-example, with ALSA dmix or JACK.  Since 2.6.27 kernel, the driver puts</div><div class='del'>-an artificial delay to the wake up timing.  This delay is controlled</div><div class='del'>-via `bdl_pos_adj` option. </div><div class='del'>-</div><div class='del'>-When `bdl_pos_adj` is a negative value (as default), it's assigned to</div><div class='del'>-an appropriate value depending on the controller chip.  For Intel</div><div class='del'>-chips, it'd be 1 while it'd be 32 for others.  Usually this works.</div><div class='del'>-Only in case it doesn't work and you get warning messages, you should</div><div class='del'>-change this parameter to other values.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Codec-Probing Problem</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-A less often but a more severe problem is the codec probing.  When</div><div class='del'>-BIOS reports the available codec slots wrongly, the driver gets</div><div class='del'>-confused and tries to access the non-existing codec slot.  This often</div><div class='del'>-results in the total screw-up, and destructs the further communication</div><div class='del'>-with the codec chips.  The symptom appears usually as error messages</div><div class='del'>-like:</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-  hda_intel: azx_get_response timeout, switching to polling mode:</div><div class='del'>-        last cmd=0x12345678</div><div class='del'>-  hda_intel: azx_get_response timeout, switching to single_cmd mode:</div><div class='del'>-        last cmd=0x12345678</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-The first line is a warning, and this is usually relatively harmless.</div><div class='del'>-It means that the codec response isn't notified via an IRQ.  The</div><div class='del'>-driver uses explicit polling method to read the response.  It gives</div><div class='del'>-very slight CPU overhead, but you'd unlikely notice it.</div><div class='del'>-</div><div class='del'>-The second line is, however, a fatal error.  If this happens, usually</div><div class='del'>-it means that something is really wrong.  Most likely you are</div><div class='del'>-accessing a non-existing codec slot.</div><div class='del'>-</div><div class='del'>-Thus, if the second error message appears, try to narrow the probed</div><div class='del'>-codec slots via `probe_mask` option.  It's a bitmask, and each bit</div><div class='del'>-corresponds to the codec slot.  For example, to probe only the first</div><div class='del'>-slot, pass `probe_mask=1`.  For the first and the third slots, pass</div><div class='del'>-`probe_mask=5` (where 5 = 1 | 4), and so on.</div><div class='del'>-</div><div class='del'>-Since 2.6.29 kernel, the driver has a more robust probing method, so</div><div class='del'>-this error might happen rarely, though.</div><div class='del'>-</div><div class='del'>-On a machine with a broken BIOS, sometimes you need to force the</div><div class='del'>-driver to probe the codec slots the hardware doesn't report for use.</div><div class='del'>-In such a case, turn the bit 8 (0x100) of `probe_mask` option on.</div><div class='del'>-Then the rest 8 bits are passed as the codec slots to probe</div><div class='del'>-unconditionally.  For example, `probe_mask=0x103` will force to probe</div><div class='del'>-the codec slots 0 and 1 no matter what the hardware reports.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Interrupt Handling</div><div class='del'>-~~~~~~~~~~~~~~~~~~</div><div class='del'>-HD-audio driver uses MSI as default (if available) since 2.6.33</div><div class='del'>-kernel as MSI works better on some machines, and in general, it's</div><div class='del'>-better for performance.  However, Nvidia controllers showed bad</div><div class='del'>-regressions with MSI (especially in a combination with AMD chipset),</div><div class='del'>-thus we disabled MSI for them.</div><div class='del'>-</div><div class='del'>-There seem also still other devices that don't work with MSI.  If you</div><div class='del'>-see a regression wrt the sound quality (stuttering, etc) or a lock-up</div><div class='del'>-in the recent kernel, try to pass `enable_msi=0` option to disable</div><div class='del'>-MSI.  If it works, you can add the known bad device to the blacklist</div><div class='del'>-defined in hda_intel.c.  In such a case, please report and give the</div><div class='del'>-patch back to the upstream developer. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-HD-AUDIO CODEC</div><div class='del'>---------------</div><div class='del'>-</div><div class='del'>-Model Option</div><div class='del'>-~~~~~~~~~~~~</div><div class='del'>-The most common problem regarding the HD-audio driver is the</div><div class='del'>-unsupported codec features or the mismatched device configuration.</div><div class='del'>-Most of codec-specific code has several preset models, either to</div><div class='del'>-override the BIOS setup or to provide more comprehensive features.</div><div class='del'>-</div><div class='del'>-The driver checks PCI SSID and looks through the static configuration</div><div class='del'>-table until any matching entry is found.  If you have a new machine,</div><div class='del'>-you may see a message like below:</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-    hda_codec: ALC880: BIOS auto-probing.</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-Meanwhile, in the earlier versions, you would see a message like:</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-    hda_codec: Unknown model for ALC880, trying auto-probe from BIOS...</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-Even if you see such a message, DON'T PANIC.  Take a deep breath and</div><div class='del'>-keep your towel.  First of all, it's an informational message, no</div><div class='del'>-warning, no error.  This means that the PCI SSID of your device isn't</div><div class='del'>-listed in the known preset model (white-)list.  But, this doesn't mean</div><div class='del'>-that the driver is broken.  Many codec-drivers provide the automatic</div><div class='del'>-configuration mechanism based on the BIOS setup.</div><div class='del'>-</div><div class='del'>-The HD-audio codec has usually "pin" widgets, and BIOS sets the default</div><div class='del'>-configuration of each pin, which indicates the location, the</div><div class='del'>-connection type, the jack color, etc.  The HD-audio driver can guess</div><div class='del'>-the right connection judging from these default configuration values.</div><div class='del'>-However -- some codec-support codes, such as patch_analog.c, don't</div><div class='del'>-support the automatic probing (yet as of 2.6.28).  And, BIOS is often,</div><div class='del'>-yes, pretty often broken.  It sets up wrong values and screws up the</div><div class='del'>-driver.</div><div class='del'>-</div><div class='del'>-The preset model (or recently called as "fix-up") is provided</div><div class='del'>-basically to overcome such a situation.  When the matching preset</div><div class='del'>-model is found in the white-list, the driver assumes the static</div><div class='del'>-configuration of that preset with the correct pin setup, etc.</div><div class='del'>-Thus, if you have a newer machine with a slightly different PCI SSID</div><div class='del'>-(or codec SSID) from the existing one, you may have a good chance to</div><div class='del'>-re-use the same model.  You can pass the `model` option to specify the</div><div class='del'>-preset model instead of PCI (and codec-) SSID look-up.</div><div class='del'>-</div><div class='del'>-What `model` option values are available depends on the codec chip.</div><div class='del'>-Check your codec chip from the codec proc file (see "Codec Proc-File"</div><div class='del'>-section below).  It will show the vendor/product name of your codec</div><div class='del'>-chip.  Then, see Documentation/sound/alsa/HD-Audio-Models.txt file,</div><div class='del'>-the section of HD-audio driver.  You can find a list of codecs</div><div class='del'>-and `model` options belonging to each codec.  For example, for Realtek</div><div class='del'>-ALC262 codec chip, pass `model=ultra` for devices that are compatible</div><div class='del'>-with Samsung Q1 Ultra.</div><div class='del'>-</div><div class='del'>-Thus, the first thing you can do for any brand-new, unsupported and</div><div class='del'>-non-working HD-audio hardware is to check HD-audio codec and several</div><div class='del'>-different `model` option values.  If you have any luck, some of them</div><div class='del'>-might suit with your device well.</div><div class='del'>-</div><div class='del'>-There are a few special model option values:</div><div class='del'>-- when 'nofixup' is passed, the device-specific fixups in the codec</div><div class='del'>-  parser are skipped.</div><div class='del'>-- when `generic` is passed, the codec-specific parser is skipped and</div><div class='del'>-  only the generic parser is used.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Speaker and Headphone Output</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-One of the most frequent (and obvious) bugs with HD-audio is the</div><div class='del'>-silent output from either or both of a built-in speaker and a</div><div class='del'>-headphone jack.  In general, you should try a headphone output at</div><div class='del'>-first.  A speaker output often requires more additional controls like</div><div class='del'>-the external amplifier bits.  Thus a headphone output has a slightly</div><div class='del'>-better chance.</div><div class='del'>-</div><div class='del'>-Before making a bug report, double-check whether the mixer is set up</div><div class='del'>-correctly.  The recent version of snd-hda-intel driver provides mostly</div><div class='del'>-"Master" volume control as well as "Front" volume (where Front</div><div class='del'>-indicates the front-channels).  In addition, there can be individual</div><div class='del'>-"Headphone" and "Speaker" controls.</div><div class='del'>-</div><div class='del'>-Ditto for the speaker output.  There can be "External Amplifier"</div><div class='del'>-switch on some codecs.  Turn on this if present.</div><div class='del'>-</div><div class='del'>-Another related problem is the automatic mute of speaker output by</div><div class='del'>-headphone plugging.  This feature is implemented in most cases, but</div><div class='del'>-not on every preset model or codec-support code.</div><div class='del'>-</div><div class='del'>-In anyway, try a different model option if you have such a problem.</div><div class='del'>-Some other models may match better and give you more matching</div><div class='del'>-functionality.  If none of the available models works, send a bug</div><div class='del'>-report.  See the bug report section for details.</div><div class='del'>-</div><div class='del'>-If you are masochistic enough to debug the driver problem, note the</div><div class='del'>-following:</div><div class='del'>-</div><div class='del'>-- The speaker (and the headphone, too) output often requires the</div><div class='del'>-  external amplifier.  This can be set usually via EAPD verb or a</div><div class='del'>-  certain GPIO.  If the codec pin supports EAPD, you have a better</div><div class='del'>-  chance via SET_EAPD_BTL verb (0x70c).  On others, GPIO pin (mostly</div><div class='del'>-  it's either GPIO0 or GPIO1) may turn on/off EAPD.</div><div class='del'>-- Some Realtek codecs require special vendor-specific coefficients to</div><div class='del'>-  turn on the amplifier.  See patch_realtek.c.</div><div class='del'>-- IDT codecs may have extra power-enable/disable controls on each</div><div class='del'>-  analog pin.  See patch_sigmatel.c.</div><div class='del'>-- Very rare but some devices don't accept the pin-detection verb until</div><div class='del'>-  triggered.  Issuing GET_PIN_SENSE verb (0xf09) may result in the</div><div class='del'>-  codec-communication stall.  Some examples are found in</div><div class='del'>-  patch_realtek.c.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Capture Problems</div><div class='del'>-~~~~~~~~~~~~~~~~</div><div class='del'>-The capture problems are often because of missing setups of mixers.</div><div class='del'>-Thus, before submitting a bug report, make sure that you set up the</div><div class='del'>-mixer correctly.  For example, both "Capture Volume" and "Capture</div><div class='del'>-Switch" have to be set properly in addition to the right "Capture</div><div class='del'>-Source" or "Input Source" selection.  Some devices have "Mic Boost"</div><div class='del'>-volume or switch.</div><div class='del'>-</div><div class='del'>-When the PCM device is opened via "default" PCM (without pulse-audio</div><div class='del'>-plugin), you'll likely have "Digital Capture Volume" control as well.</div><div class='del'>-This is provided for the extra gain/attenuation of the signal in</div><div class='del'>-software, especially for the inputs without the hardware volume</div><div class='del'>-control such as digital microphones.  Unless really needed, this</div><div class='del'>-should be set to exactly 50%, corresponding to 0dB -- neither extra</div><div class='del'>-gain nor attenuation.  When you use "hw" PCM, i.e., a raw access PCM,</div><div class='del'>-this control will have no influence, though.</div><div class='del'>-</div><div class='del'>-It's known that some codecs / devices have fairly bad analog circuits,</div><div class='del'>-and the recorded sound contains a certain DC-offset.  This is no bug</div><div class='del'>-of the driver.</div><div class='del'>-</div><div class='del'>-Most of modern laptops have no analog CD-input connection.  Thus, the</div><div class='del'>-recording from CD input won't work in many cases although the driver</div><div class='del'>-provides it as the capture source.  Use CDDA instead.</div><div class='del'>-</div><div class='del'>-The automatic switching of the built-in and external mic per plugging</div><div class='del'>-is implemented on some codec models but not on every model.  Partly</div><div class='del'>-because of my laziness but mostly lack of testers.  Feel free to</div><div class='del'>-submit the improvement patch to the author.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Direct Debugging</div><div class='del'>-~~~~~~~~~~~~~~~~</div><div class='del'>-If no model option gives you a better result, and you are a tough guy</div><div class='del'>-to fight against evil, try debugging via hitting the raw HD-audio</div><div class='del'>-codec verbs to the device.  Some tools are available: hda-emu and</div><div class='del'>-hda-analyzer.  The detailed description is found in the sections</div><div class='del'>-below.  You'd need to enable hwdep for using these tools.  See "Kernel</div><div class='del'>-Configuration" section.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-OTHER ISSUES</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-Kernel Configuration</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-In general, I recommend you to enable the sound debug option,</div><div class='del'>-`CONFIG_SND_DEBUG=y`, no matter whether you are debugging or not.</div><div class='del'>-This enables snd_printd() macro and others, and you'll get additional</div><div class='del'>-kernel messages at probing.</div><div class='del'>-</div><div class='del'>-In addition, you can enable `CONFIG_SND_DEBUG_VERBOSE=y`.  But this</div><div class='del'>-will give you far more messages.  Thus turn this on only when you are</div><div class='del'>-sure to want it.</div><div class='del'>-</div><div class='del'>-Don't forget to turn on the appropriate `CONFIG_SND_HDA_CODEC_*`</div><div class='del'>-options.  Note that each of them corresponds to the codec chip, not</div><div class='del'>-the controller chip.  Thus, even if lspci shows the Nvidia controller,</div><div class='del'>-you may need to choose the option for other vendors.  If you are</div><div class='del'>-unsure, just select all yes.</div><div class='del'>-</div><div class='del'>-`CONFIG_SND_HDA_HWDEP` is a useful option for debugging the driver.</div><div class='del'>-When this is enabled, the driver creates hardware-dependent devices</div><div class='del'>-(one per each codec), and you have a raw access to the device via</div><div class='del'>-these device files.  For example, `hwC0D2` will be created for the</div><div class='del'>-codec slot #2 of the first card (#0).  For debug-tools such as</div><div class='del'>-hda-verb and hda-analyzer, the hwdep device has to be enabled.</div><div class='del'>-Thus, it'd be better to turn this on always.</div><div class='del'>-</div><div class='del'>-`CONFIG_SND_HDA_RECONFIG` is a new option, and this depends on the</div><div class='del'>-hwdep option above.  When enabled, you'll have some sysfs files under</div><div class='del'>-the corresponding hwdep directory.  See "HD-audio reconfiguration"</div><div class='del'>-section below.</div><div class='del'>-</div><div class='del'>-`CONFIG_SND_HDA_POWER_SAVE` option enables the power-saving feature.</div><div class='del'>-See "Power-saving" section below.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Codec Proc-File</div><div class='del'>-~~~~~~~~~~~~~~~</div><div class='del'>-The codec proc-file is a treasure-chest for debugging HD-audio.</div><div class='del'>-It shows most of useful information of each codec widget.</div><div class='del'>-</div><div class='del'>-The proc file is located in /proc/asound/card*/codec#*, one file per</div><div class='del'>-each codec slot.  You can know the codec vendor, product id and</div><div class='del'>-names, the type of each widget, capabilities and so on.</div><div class='del'>-This file, however, doesn't show the jack sensing state, so far.  This</div><div class='del'>-is because the jack-sensing might be depending on the trigger state.</div><div class='del'>-</div><div class='del'>-This file will be picked up by the debug tools, and also it can be fed</div><div class='del'>-to the emulator as the primary codec information.  See the debug tools</div><div class='del'>-section below.</div><div class='del'>-</div><div class='del'>-This proc file can be also used to check whether the generic parser is</div><div class='del'>-used.  When the generic parser is used, the vendor/product ID name</div><div class='del'>-will appear as "Realtek ID 0262", instead of "Realtek ALC262".</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-HD-Audio Reconfiguration</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-This is an experimental feature to allow you re-configure the HD-audio</div><div class='del'>-codec dynamically without reloading the driver.  The following sysfs</div><div class='del'>-files are available under each codec-hwdep device directory (e.g. </div><div class='del'>-/sys/class/sound/hwC0D0):</div><div class='del'>-</div><div class='del'>-vendor_id::</div><div class='del'>-  Shows the 32bit codec vendor-id hex number.  You can change the</div><div class='del'>-  vendor-id value by writing to this file.</div><div class='del'>-subsystem_id::</div><div class='del'>-  Shows the 32bit codec subsystem-id hex number.  You can change the</div><div class='del'>-  subsystem-id value by writing to this file.</div><div class='del'>-revision_id::</div><div class='del'>-  Shows the 32bit codec revision-id hex number.  You can change the</div><div class='del'>-  revision-id value by writing to this file.</div><div class='del'>-afg::</div><div class='del'>-  Shows the AFG ID.  This is read-only.</div><div class='del'>-mfg::</div><div class='del'>-  Shows the MFG ID.  This is read-only.</div><div class='del'>-name::</div><div class='del'>-  Shows the codec name string.  Can be changed by writing to this</div><div class='del'>-  file.</div><div class='del'>-modelname::</div><div class='del'>-  Shows the currently set `model` option.  Can be changed by writing</div><div class='del'>-  to this file.</div><div class='del'>-init_verbs::</div><div class='del'>-  The extra verbs to execute at initialization.  You can add a verb by</div><div class='del'>-  writing to this file.  Pass three numbers: nid, verb and parameter</div><div class='del'>-  (separated with a space).</div><div class='del'>-hints::</div><div class='del'>-  Shows / stores hint strings for codec parsers for any use.</div><div class='del'>-  Its format is `key = value`.  For example, passing `jack_detect = no`</div><div class='del'>-  will disable the jack detection of the machine completely.</div><div class='del'>-init_pin_configs::</div><div class='del'>-  Shows the initial pin default config values set by BIOS.</div><div class='del'>-driver_pin_configs::</div><div class='del'>-  Shows the pin default values set by the codec parser explicitly.</div><div class='del'>-  This doesn't show all pin values but only the changed values by</div><div class='del'>-  the parser.  That is, if the parser doesn't change the pin default</div><div class='del'>-  config values by itself, this will contain nothing.</div><div class='del'>-user_pin_configs::</div><div class='del'>-  Shows the pin default config values to override the BIOS setup.</div><div class='del'>-  Writing this (with two numbers, NID and value) appends the new</div><div class='del'>-  value.  The given will be used instead of the initial BIOS value at</div><div class='del'>-  the next reconfiguration time.  Note that this config will override</div><div class='del'>-  even the driver pin configs, too.</div><div class='del'>-reconfig::</div><div class='del'>-  Triggers the codec re-configuration.  When any value is written to</div><div class='del'>-  this file, the driver re-initialize and parses the codec tree</div><div class='del'>-  again.  All the changes done by the sysfs entries above are taken</div><div class='del'>-  into account.</div><div class='del'>-clear::</div><div class='del'>-  Resets the codec, removes the mixer elements and PCM stuff of the</div><div class='del'>-  specified codec, and clear all init verbs and hints.</div><div class='del'>-</div><div class='del'>-For example, when you want to change the pin default configuration</div><div class='del'>-value of the pin widget 0x14 to 0x9993013f, and let the driver</div><div class='del'>-re-configure based on that state, run like below:</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-  # echo 0x14 0x9993013f &gt; /sys/class/sound/hwC0D0/user_pin_configs</div><div class='del'>-  # echo 1 &gt; /sys/class/sound/hwC0D0/reconfig  </div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Hint Strings</div><div class='del'>-~~~~~~~~~~~~</div><div class='del'>-The codec parser have several switches and adjustment knobs for</div><div class='del'>-matching better with the actual codec or device behavior.  Many of</div><div class='del'>-them can be adjusted dynamically via "hints" strings as mentioned in</div><div class='del'>-the section above.  For example, by passing `jack_detect = no` string</div><div class='del'>-via sysfs or a patch file, you can disable the jack detection, thus</div><div class='del'>-the codec parser will skip the features like auto-mute or mic</div><div class='del'>-auto-switch.  As a boolean value, either `yes`, `no`, `true`, `false`,</div><div class='del'>-`1` or `0` can be passed.</div><div class='del'>-</div><div class='del'>-The generic parser supports the following hints:</div><div class='del'>-</div><div class='del'>-- jack_detect (bool): specify whether the jack detection is available</div><div class='del'>-  at all on this machine; default true</div><div class='del'>-- inv_jack_detect (bool): indicates that the jack detection logic is</div><div class='del'>-  inverted</div><div class='del'>-- trigger_sense (bool): indicates that the jack detection needs the</div><div class='del'>-  explicit call of AC_VERB_SET_PIN_SENSE verb</div><div class='del'>-- inv_eapd (bool): indicates that the EAPD is implemented in the</div><div class='del'>-  inverted logic</div><div class='del'>-- pcm_format_first (bool): sets the PCM format before the stream tag</div><div class='del'>-  and channel ID</div><div class='del'>-- sticky_stream (bool): keep the PCM format, stream tag and ID as long</div><div class='del'>-  as possible; default true</div><div class='del'>-- spdif_status_reset (bool): reset the SPDIF status bits at each time</div><div class='del'>-  the SPDIF stream is set up</div><div class='del'>--  pin_amp_workaround (bool): the output pin may have multiple amp</div><div class='del'>-  values</div><div class='del'>-- single_adc_amp (bool): ADCs can have only single input amps</div><div class='del'>-- auto_mute (bool): enable/disable the headphone auto-mute feature;</div><div class='del'>-  default true</div><div class='del'>-- auto_mic (bool): enable/disable the mic auto-switch feature; default</div><div class='del'>-  true</div><div class='del'>-- line_in_auto_switch (bool): enable/disable the line-in auto-switch</div><div class='del'>-  feature; default false</div><div class='del'>-- need_dac_fix (bool): limits the DACs depending on the channel count</div><div class='del'>-- primary_hp (bool): probe headphone jacks as the primary outputs;</div><div class='del'>-  default true</div><div class='del'>-- multi_io (bool): try probing multi-I/O config (e.g. shared</div><div class='del'>-  line-in/surround, mic/clfe jacks)</div><div class='del'>-- multi_cap_vol (bool): provide multiple capture volumes</div><div class='del'>-- inv_dmic_split (bool): provide split internal mic volume/switch for</div><div class='del'>-  phase-inverted digital mics</div><div class='del'>-- indep_hp (bool): provide the independent headphone PCM stream and</div><div class='del'>-  the corresponding mixer control, if available</div><div class='del'>-- add_stereo_mix_input (bool): add the stereo mix (analog-loopback</div><div class='del'>-  mix) to the input mux if available</div><div class='del'>-- add_jack_modes (bool): add "xxx Jack Mode" enum controls to each</div><div class='del'>-  I/O jack for allowing to change the headphone amp and mic bias VREF</div><div class='del'>-  capabilities</div><div class='del'>-- power_save_node (bool): advanced power management for each widget,</div><div class='del'>-  controlling the power sate (D0/D3) of each widget node depending on</div><div class='del'>-  the actual pin and stream states</div><div class='del'>-- power_down_unused (bool): power down the unused widgets, a subset of</div><div class='del'>-  power_save_node, and will be dropped in future</div><div class='del'>-- add_hp_mic (bool): add the headphone to capture source if possible</div><div class='del'>-- hp_mic_detect (bool): enable/disable the hp/mic shared input for a</div><div class='del'>-  single built-in mic case; default true</div><div class='del'>-- mixer_nid (int): specifies the widget NID of the analog-loopback</div><div class='del'>-  mixer</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Early Patching</div><div class='del'>-~~~~~~~~~~~~~~</div><div class='del'>-When CONFIG_SND_HDA_PATCH_LOADER=y is set, you can pass a "patch" as a</div><div class='del'>-firmware file for modifying the HD-audio setup before initializing the</div><div class='del'>-codec.  This can work basically like the reconfiguration via sysfs in</div><div class='del'>-the above, but it does it before the first codec configuration.</div><div class='del'>-</div><div class='del'>-A patch file is a plain text file which looks like below:</div><div class='del'>-</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-  [codec]</div><div class='del'>-  0x12345678 0xabcd1234 2</div><div class='del'>-</div><div class='del'>-  [model]</div><div class='del'>-  auto</div><div class='del'>-</div><div class='del'>-  [pincfg]</div><div class='del'>-  0x12 0x411111f0</div><div class='del'>-</div><div class='del'>-  [verb]</div><div class='del'>-  0x20 0x500 0x03</div><div class='del'>-  0x20 0x400 0xff</div><div class='del'>-</div><div class='del'>-  [hint]</div><div class='del'>-  jack_detect = no</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-The file needs to have a line `[codec]`.  The next line should contain</div><div class='del'>-three numbers indicating the codec vendor-id (0x12345678 in the</div><div class='del'>-example), the codec subsystem-id (0xabcd1234) and the address (2) of</div><div class='del'>-the codec.  The rest patch entries are applied to this specified codec</div><div class='del'>-until another codec entry is given.  Passing 0 or a negative number to</div><div class='del'>-the first or the second value will make the check of the corresponding</div><div class='del'>-field be skipped.  It'll be useful for really broken devices that don't</div><div class='del'>-initialize SSID properly.</div><div class='del'>-</div><div class='del'>-The `[model]` line allows to change the model name of the each codec.</div><div class='del'>-In the example above, it will be changed to model=auto.</div><div class='del'>-Note that this overrides the module option.</div><div class='del'>-</div><div class='del'>-After the `[pincfg]` line, the contents are parsed as the initial</div><div class='del'>-default pin-configurations just like `user_pin_configs` sysfs above.</div><div class='del'>-The values can be shown in user_pin_configs sysfs file, too.</div><div class='del'>-</div><div class='del'>-Similarly, the lines after `[verb]` are parsed as `init_verbs`</div><div class='del'>-sysfs entries, and the lines after `[hint]` are parsed as `hints`</div><div class='del'>-sysfs entries, respectively.</div><div class='del'>-</div><div class='del'>-Another example to override the codec vendor id from 0x12345678 to</div><div class='del'>-0xdeadbeef is like below:</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-  [codec]</div><div class='del'>-  0x12345678 0xabcd1234 2</div><div class='del'>-</div><div class='del'>-  [vendor_id]</div><div class='del'>-  0xdeadbeef</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-In the similar way, you can override the codec subsystem_id via</div><div class='del'>-`[subsystem_id]`, the revision id via `[revision_id]` line.</div><div class='del'>-Also, the codec chip name can be rewritten via `[chip_name]` line.</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-  [codec]</div><div class='del'>-  0x12345678 0xabcd1234 2</div><div class='del'>-</div><div class='del'>-  [subsystem_id]</div><div class='del'>-  0xffff1111</div><div class='del'>-</div><div class='del'>-  [revision_id]</div><div class='del'>-  0x10</div><div class='del'>-</div><div class='del'>-  [chip_name]</div><div class='del'>-  My-own NEWS-0002</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-The hd-audio driver reads the file via request_firmware().  Thus,</div><div class='del'>-a patch file has to be located on the appropriate firmware path,</div><div class='del'>-typically, /lib/firmware.  For example, when you pass the option</div><div class='del'>-`patch=hda-init.fw`, the file /lib/firmware/hda-init.fw must be</div><div class='del'>-present.</div><div class='del'>-</div><div class='del'>-The patch module option is specific to each card instance, and you</div><div class='del'>-need to give one file name for each instance, separated by commas.</div><div class='del'>-For example, if you have two cards, one for an on-board analog and one </div><div class='del'>-for an HDMI video board, you may pass patch option like below:</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-    options snd-hda-intel patch=on-board-patch,hdmi-patch</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Power-Saving</div><div class='del'>-~~~~~~~~~~~~</div><div class='del'>-The power-saving is a kind of auto-suspend of the device.  When the</div><div class='del'>-device is inactive for a certain time, the device is automatically</div><div class='del'>-turned off to save the power.  The time to go down is specified via</div><div class='del'>-`power_save` module option, and this option can be changed dynamically</div><div class='del'>-via sysfs.</div><div class='del'>-</div><div class='del'>-The power-saving won't work when the analog loopback is enabled on</div><div class='del'>-some codecs.  Make sure that you mute all unneeded signal routes when</div><div class='del'>-you want the power-saving.</div><div class='del'>-</div><div class='del'>-The power-saving feature might cause audible click noises at each</div><div class='del'>-power-down/up depending on the device.  Some of them might be</div><div class='del'>-solvable, but some are hard, I'm afraid.  Some distros such as</div><div class='del'>-openSUSE enables the power-saving feature automatically when the power</div><div class='del'>-cable is unplugged.  Thus, if you hear noises, suspect first the</div><div class='del'>-power-saving.  See /sys/module/snd_hda_intel/parameters/power_save to</div><div class='del'>-check the current value.  If it's non-zero, the feature is turned on.</div><div class='del'>-</div><div class='del'>-The recent kernel supports the runtime PM for the HD-audio controller</div><div class='del'>-chip, too.  It means that the HD-audio controller is also powered up /</div><div class='del'>-down dynamically.  The feature is enabled only for certain controller</div><div class='del'>-chips like Intel LynxPoint.  You can enable/disable this feature</div><div class='del'>-forcibly by setting `power_save_controller` option, which is also</div><div class='del'>-available at /sys/module/snd_hda_intel/parameters directory.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Tracepoints</div><div class='del'>-~~~~~~~~~~~</div><div class='del'>-The hd-audio driver gives a few basic tracepoints.</div><div class='del'>-`hda:hda_send_cmd` traces each CORB write while `hda:hda_get_response`</div><div class='del'>-traces the response from RIRB (only when read from the codec driver).</div><div class='del'>-`hda:hda_bus_reset` traces the bus-reset due to fatal error, etc,</div><div class='del'>-`hda:hda_unsol_event` traces the unsolicited events, and</div><div class='del'>-`hda:hda_power_down` and `hda:hda_power_up` trace the power down/up</div><div class='del'>-via power-saving behavior.</div><div class='del'>-</div><div class='del'>-Enabling all tracepoints can be done like</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-  # echo 1 &gt; /sys/kernel/debug/tracing/events/hda/enable</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-then after some commands, you can traces from</div><div class='del'>-/sys/kernel/debug/tracing/trace file.  For example, when you want to</div><div class='del'>-trace what codec command is sent, enable the tracepoint like:</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-  # cat /sys/kernel/debug/tracing/trace</div><div class='del'>-  # tracer: nop</div><div class='del'>-  #</div><div class='del'>-  #       TASK-PID    CPU#    TIMESTAMP  FUNCTION</div><div class='del'>-  #          | |       |          |         |</div><div class='del'>-         &lt;...&gt;-7807  [002] 105147.774889: hda_send_cmd: [0:0] val=e3a019</div><div class='del'>-         &lt;...&gt;-7807  [002] 105147.774893: hda_send_cmd: [0:0] val=e39019</div><div class='del'>-         &lt;...&gt;-7807  [002] 105147.999542: hda_send_cmd: [0:0] val=e3a01a</div><div class='del'>-         &lt;...&gt;-7807  [002] 105147.999543: hda_send_cmd: [0:0] val=e3901a</div><div class='del'>-         &lt;...&gt;-26764 [001] 349222.837143: hda_send_cmd: [0:0] val=e3a019</div><div class='del'>-         &lt;...&gt;-26764 [001] 349222.837148: hda_send_cmd: [0:0] val=e39019</div><div class='del'>-         &lt;...&gt;-26764 [001] 349223.058539: hda_send_cmd: [0:0] val=e3a01a</div><div class='del'>-         &lt;...&gt;-26764 [001] 349223.058541: hda_send_cmd: [0:0] val=e3901a</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-Here `[0:0]` indicates the card number and the codec address, and</div><div class='del'>-`val` shows the value sent to the codec, respectively.  The value is</div><div class='del'>-a packed value, and you can decode it via hda-decode-verb program</div><div class='del'>-included in hda-emu package below.  For example, the value e3a019 is</div><div class='del'>-to set the left output-amp value to 25.</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-  % hda-decode-verb 0xe3a019</div><div class='del'>-  raw value = 0x00e3a019</div><div class='del'>-  cid = 0, nid = 0x0e, verb = 0x3a0, parm = 0x19</div><div class='del'>-  raw value: verb = 0x3a0, parm = 0x19</div><div class='del'>-  verbname = set_amp_gain_mute</div><div class='del'>-  amp raw val = 0xa019</div><div class='del'>-  output, left, idx=0, mute=0, val=25</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Development Tree</div><div class='del'>-~~~~~~~~~~~~~~~~</div><div class='del'>-The latest development codes for HD-audio are found on sound git tree:</div><div class='del'>-</div><div class='del'>-- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git</div><div class='del'>-</div><div class='del'>-The master branch or for-next branches can be used as the main</div><div class='del'>-development branches in general while the development for the current</div><div class='del'>-and next kernels are found in for-linus and for-next branches,</div><div class='del'>-respectively.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Sending a Bug Report</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-If any model or module options don't work for your device, it's time</div><div class='del'>-to send a bug report to the developers.  Give the following in your</div><div class='del'>-bug report:</div><div class='del'>-</div><div class='del'>-- Hardware vendor, product and model names</div><div class='del'>-- Kernel version (and ALSA-driver version if you built externally)</div><div class='del'>-- `alsa-info.sh` output; run with `--no-upload` option.  See the</div><div class='del'>-  section below about alsa-info</div><div class='del'>-</div><div class='del'>-If it's a regression, at best, send alsa-info outputs of both working</div><div class='del'>-and non-working kernels.  This is really helpful because we can</div><div class='del'>-compare the codec registers directly.</div><div class='del'>-</div><div class='del'>-Send a bug report either the followings:</div><div class='del'>-</div><div class='del'>-kernel-bugzilla::</div><div class='del'>-  https://bugzilla.kernel.org/</div><div class='del'>-alsa-devel ML::</div><div class='del'>-  alsa-devel@alsa-project.org</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-DEBUG TOOLS</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-This section describes some tools available for debugging HD-audio</div><div class='del'>-problems.</div><div class='del'>-</div><div class='del'>-alsa-info</div><div class='del'>-~~~~~~~~~</div><div class='del'>-The script `alsa-info.sh` is a very useful tool to gather the audio</div><div class='del'>-device information.  It's included in alsa-utils package.  The latest</div><div class='del'>-version can be found on git repository:</div><div class='del'>-</div><div class='del'>-- git://git.alsa-project.org/alsa-utils.git</div><div class='del'>-</div><div class='del'>-The script can be fetched directly from the following URL, too:</div><div class='del'>-</div><div class='del'>-- http://www.alsa-project.org/alsa-info.sh</div><div class='del'>-</div><div class='del'>-Run this script as root, and it will gather the important information</div><div class='del'>-such as the module lists, module parameters, proc file contents</div><div class='del'>-including the codec proc files, mixer outputs and the control</div><div class='del'>-elements.  As default, it will store the information onto a web server</div><div class='del'>-on alsa-project.org.  But, if you send a bug report, it'd be better to</div><div class='del'>-run with `--no-upload` option, and attach the generated file.</div><div class='del'>-</div><div class='del'>-There are some other useful options.  See `--help` option output for</div><div class='del'>-details.</div><div class='del'>-</div><div class='del'>-When a probe error occurs or when the driver obviously assigns a</div><div class='del'>-mismatched model, it'd be helpful to load the driver with</div><div class='del'>-`probe_only=1` option (at best after the cold reboot) and run</div><div class='del'>-alsa-info at this state.  With this option, the driver won't configure</div><div class='del'>-the mixer and PCM but just tries to probe the codec slot.  After</div><div class='del'>-probing, the proc file is available, so you can get the raw codec</div><div class='del'>-information before modified by the driver.  Of course, the driver</div><div class='del'>-isn't usable with `probe_only=1`.  But you can continue the</div><div class='del'>-configuration via hwdep sysfs file if hda-reconfig option is enabled.</div><div class='del'>-Using `probe_only` mask 2 skips the reset of HDA codecs (use</div><div class='del'>-`probe_only=3` as module option). The hwdep interface can be used</div><div class='del'>-to determine the BIOS codec initialization.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-hda-verb</div><div class='del'>-~~~~~~~~</div><div class='del'>-hda-verb is a tiny program that allows you to access the HD-audio</div><div class='del'>-codec directly.  You can execute a raw HD-audio codec verb with this.</div><div class='del'>-This program accesses the hwdep device, thus you need to enable the</div><div class='del'>-kernel config `CONFIG_SND_HDA_HWDEP=y` beforehand.</div><div class='del'>-</div><div class='del'>-The hda-verb program takes four arguments: the hwdep device file, the</div><div class='del'>-widget NID, the verb and the parameter.  When you access to the codec</div><div class='del'>-on the slot 2 of the card 0, pass /dev/snd/hwC0D2 to the first</div><div class='del'>-argument, typically.  (However, the real path name depends on the</div><div class='del'>-system.)</div><div class='del'>-</div><div class='del'>-The second parameter is the widget number-id to access.  The third</div><div class='del'>-parameter can be either a hex/digit number or a string corresponding</div><div class='del'>-to a verb.  Similarly, the last parameter is the value to write, or</div><div class='del'>-can be a string for the parameter type.</div><div class='del'>-</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-  % hda-verb /dev/snd/hwC0D0 0x12 0x701 2</div><div class='del'>-  nid = 0x12, verb = 0x701, param = 0x2</div><div class='del'>-  value = 0x0</div><div class='del'>-</div><div class='del'>-  % hda-verb /dev/snd/hwC0D0 0x0 PARAMETERS VENDOR_ID</div><div class='del'>-  nid = 0x0, verb = 0xf00, param = 0x0</div><div class='del'>-  value = 0x10ec0262</div><div class='del'>-</div><div class='del'>-  % hda-verb /dev/snd/hwC0D0 2 set_a 0xb080</div><div class='del'>-  nid = 0x2, verb = 0x300, param = 0xb080</div><div class='del'>-  value = 0x0</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-Although you can issue any verbs with this program, the driver state</div><div class='del'>-won't be always updated.  For example, the volume values are usually</div><div class='del'>-cached in the driver, and thus changing the widget amp value directly</div><div class='del'>-via hda-verb won't change the mixer value.</div><div class='del'>-</div><div class='del'>-The hda-verb program is included now in alsa-tools:</div><div class='del'>-</div><div class='del'>-- git://git.alsa-project.org/alsa-tools.git</div><div class='del'>-</div><div class='del'>-Also, the old stand-alone package is found in the ftp directory:</div><div class='del'>-</div><div class='del'>-- ftp://ftp.suse.com/pub/people/tiwai/misc/</div><div class='del'>-</div><div class='del'>-Also a git repository is available:</div><div class='del'>-</div><div class='del'>-- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/hda-verb.git</div><div class='del'>-</div><div class='del'>-See README file in the tarball for more details about hda-verb</div><div class='del'>-program.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-hda-analyzer</div><div class='del'>-~~~~~~~~~~~~</div><div class='del'>-hda-analyzer provides a graphical interface to access the raw HD-audio</div><div class='del'>-control, based on pyGTK2 binding.  It's a more powerful version of</div><div class='del'>-hda-verb.  The program gives you an easy-to-use GUI stuff for showing</div><div class='del'>-the widget information and adjusting the amp values, as well as the</div><div class='del'>-proc-compatible output.</div><div class='del'>-</div><div class='del'>-The hda-analyzer:</div><div class='del'>-</div><div class='del'>-- http://git.alsa-project.org/?p=alsa.git;a=tree;f=hda-analyzer</div><div class='del'>-</div><div class='del'>-is a part of alsa.git repository in alsa-project.org:</div><div class='del'>-</div><div class='del'>-- git://git.alsa-project.org/alsa.git</div><div class='del'>-</div><div class='del'>-Codecgraph</div><div class='del'>-~~~~~~~~~~</div><div class='del'>-Codecgraph is a utility program to generate a graph and visualizes the</div><div class='del'>-codec-node connection of a codec chip.  It's especially useful when</div><div class='del'>-you analyze or debug a codec without a proper datasheet.  The program</div><div class='del'>-parses the given codec proc file and converts to SVG via graphiz</div><div class='del'>-program.</div><div class='del'>-</div><div class='del'>-The tarball and GIT trees are found in the web page at:</div><div class='del'>-</div><div class='del'>-- http://helllabs.org/codecgraph/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-hda-emu</div><div class='del'>-~~~~~~~</div><div class='del'>-hda-emu is an HD-audio emulator.  The main purpose of this program is</div><div class='del'>-to debug an HD-audio codec without the real hardware.  Thus, it</div><div class='del'>-doesn't emulate the behavior with the real audio I/O, but it just</div><div class='del'>-dumps the codec register changes and the ALSA-driver internal changes</div><div class='del'>-at probing and operating the HD-audio driver.</div><div class='del'>-</div><div class='del'>-The program requires a codec proc-file to simulate.  Get a proc file</div><div class='del'>-for the target codec beforehand, or pick up an example codec from the</div><div class='del'>-codec proc collections in the tarball.  Then, run the program with the</div><div class='del'>-proc file, and the hda-emu program will start parsing the codec file</div><div class='del'>-and simulates the HD-audio driver:</div><div class='del'>-</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-  % hda-emu codecs/stac9200-dell-d820-laptop</div><div class='del'>-  # Parsing..</div><div class='del'>-  hda_codec: Unknown model for STAC9200, using BIOS defaults</div><div class='del'>-  hda_codec: pin nid 08 bios pin config 40c003fa</div><div class='del'>-  ....</div><div class='del'>-------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-The program gives you only a very dumb command-line interface.  You</div><div class='del'>-can get a proc-file dump at the current state, get a list of control</div><div class='del'>-(mixer) elements, set/get the control element value, simulate the PCM</div><div class='del'>-operation, the jack plugging simulation, etc.</div><div class='del'>-</div><div class='del'>-The program is found in the git repository below:</div><div class='del'>-</div><div class='del'>-- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/hda-emu.git</div><div class='del'>-</div><div class='del'>-See README file in the repository for more details about hda-emu</div><div class='del'>-program.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-hda-jack-retask</div><div class='del'>-~~~~~~~~~~~~~~~</div><div class='del'>-hda-jack-retask is a user-friendly GUI program to manipulate the</div><div class='del'>-HD-audio pin control for jack retasking.  If you have a problem about</div><div class='del'>-the jack assignment, try this program and check whether you can get</div><div class='del'>-useful results.  Once when you figure out the proper pin assignment,</div><div class='del'>-it can be fixed either in the driver code statically or via passing a</div><div class='del'>-firmware patch file (see "Early Patching" section).</div><div class='del'>-</div><div class='del'>-The program is included in alsa-tools now:</div><div class='del'>-</div><div class='del'>-- git://git.alsa-project.org/alsa-tools.git</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/sound/alsa/Jack-Controls.txt b/Documentation/sound/alsa/Jack-Controls.txt<br/>deleted file mode 100644<br/>index fe1c5e0c8555..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/Jack-Controls.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/Jack-Controls.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-Why we need Jack kcontrols</div><div class='del'>-==========================</div><div class='del'>-</div><div class='del'>-ALSA uses kcontrols to export audio controls(switch, volume, Mux, ...)</div><div class='del'>-to user space. This means userspace applications like pulseaudio can</div><div class='del'>-switch off headphones and switch on speakers when no headphones are</div><div class='del'>-pluged in.</div><div class='del'>-</div><div class='del'>-The old ALSA jack code only created input devices for each registered</div><div class='del'>-jack. These jack input devices are not readable by userspace devices</div><div class='del'>-that run as non root.</div><div class='del'>-</div><div class='del'>-The new jack code creates embedded jack kcontrols for each jack that</div><div class='del'>-can be read by any process.</div><div class='del'>-</div><div class='del'>-This can be combined with UCM to allow userspace to route audio more</div><div class='del'>-intelligently based on jack insertion or removal events.</div><div class='del'>-</div><div class='del'>-Jack Kcontrol Internals</div><div class='del'>-=======================</div><div class='del'>-</div><div class='del'>-Each jack will have a kcontrol list, so that we can create a kcontrol</div><div class='del'>-and attach it to the jack, at jack creation stage. We can also add a</div><div class='del'>-kcontrol to an existing jack, at anytime when required.</div><div class='del'>-</div><div class='del'>-Those kcontrols will be freed automatically when the Jack is freed.</div><div class='del'>-</div><div class='del'>-How to use jack kcontrols</div><div class='del'>-=========================</div><div class='del'>-</div><div class='del'>-In order to keep compatibility, snd_jack_new() has been modified by</div><div class='del'>-adding two params :-</div><div class='del'>-</div><div class='del'>- - @initial_kctl: if true, create a kcontrol and add it to the jack</div><div class='del'>-	list.</div><div class='del'>- - @phantom_jack: Don't create a input device for phantom jacks.</div><div class='del'>-</div><div class='del'>-HDA jacks can set phantom_jack to true in order to create a phantom</div><div class='del'>-jack and set initial_kctl to true to create an initial kcontrol with</div><div class='del'>-the correct id.</div><div class='del'>-</div><div class='del'>-ASoC jacks should set initial_kctl as false. The pin name will be</div><div class='del'>-assigned as the jack kcontrol name.</div><div class='head'>diff --git a/Documentation/sound/alsa/Joystick.txt b/Documentation/sound/alsa/Joystick.txt<br/>deleted file mode 100644<br/>index ccda41b10f8a..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/Joystick.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/Joystick.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,86 +0,0 @@</div><div class='del'>-Analog Joystick Support on ALSA Drivers</div><div class='del'>-=======================================</div><div class='del'>-                          Oct. 14, 2003</div><div class='del'>-           Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>-</div><div class='del'>-General</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-First of all, you need to enable GAMEPORT support on Linux kernel for</div><div class='del'>-using a joystick with the ALSA driver.  For the details of gameport</div><div class='del'>-support, refer to Documentation/input/joystick.txt.</div><div class='del'>-</div><div class='del'>-The joystick support of ALSA drivers is different between ISA and PCI</div><div class='del'>-cards.  In the case of ISA (PnP) cards, it's usually handled by the</div><div class='del'>-independent module (ns558).  Meanwhile, the ALSA PCI drivers have the</div><div class='del'>-built-in gameport support.  Hence, when the ALSA PCI driver is built</div><div class='del'>-in the kernel, CONFIG_GAMEPORT must be 'y', too.  Otherwise, the</div><div class='del'>-gameport support on that card will be (silently) disabled.</div><div class='del'>-</div><div class='del'>-Some adapter modules probe the physical connection of the device at</div><div class='del'>-the load time.  It'd be safer to plug in the joystick device before</div><div class='del'>-loading the module.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-PCI Cards</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-For PCI cards, the joystick is enabled when the appropriate module</div><div class='del'>-option is specified.  Some drivers don't need options, and the</div><div class='del'>-joystick support is always enabled.  In the former ALSA version, there</div><div class='del'>-was a dynamic control API for the joystick activation.  It was</div><div class='del'>-changed, however, to the static module options because of the system</div><div class='del'>-stability and the resource management.</div><div class='del'>-</div><div class='del'>-The following PCI drivers support the joystick natively.</div><div class='del'>-</div><div class='del'>-    Driver	Module Option	Available Values</div><div class='del'>-    ---------------------------------------------------------------------------</div><div class='del'>-    als4000	joystick_port	0 = disable (default), 1 = auto-detect,</div><div class='del'>-                                manual: any address (e.g. 0x200)</div><div class='del'>-    au88x0	N/A		N/A</div><div class='del'>-    azf3328	joystick	0 = disable, 1 = enable, -1 = auto (default)</div><div class='del'>-    ens1370	joystick	0 = disable (default), 1 = enable</div><div class='del'>-    ens1371	joystick_port	0 = disable (default), 1 = auto-detect,</div><div class='del'>-                                manual: 0x200, 0x208, 0x210, 0x218</div><div class='del'>-    cmipci	joystick_port	0 = disable (default), 1 = auto-detect,</div><div class='del'>-                                manual: any address (e.g. 0x200)</div><div class='del'>-    cs4281	N/A		N/A</div><div class='del'>-    cs46xx	N/A		N/A</div><div class='del'>-    es1938	N/A		N/A</div><div class='del'>-    es1968	joystick	0 = disable (default), 1 = enable</div><div class='del'>-    sonicvibes	N/A		N/A</div><div class='del'>-    trident	N/A		N/A</div><div class='del'>-    via82xx(*1)	joystick	0 = disable (default), 1 = enable</div><div class='del'>-    ymfpci	joystick_port	0 = disable (default), 1 = auto-detect,</div><div class='del'>-                                manual: 0x201, 0x202, 0x204, 0x205(*2)</div><div class='del'>-    ---------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-    *1)  VIA686A/B only</div><div class='del'>-    *2)  With YMF744/754 chips, the port address can be chosen arbitrarily</div><div class='del'>-</div><div class='del'>-The following drivers don't support gameport natively, but there are</div><div class='del'>-additional modules.  Load the corresponding module to add the gameport</div><div class='del'>-support.</div><div class='del'>-</div><div class='del'>-    Driver	Additional Module</div><div class='del'>-    -----------------------------</div><div class='del'>-    emu10k1	emu10k1-gp</div><div class='del'>-    fm801	fm801-gp</div><div class='del'>-    -----------------------------</div><div class='del'>-</div><div class='del'>-Note: the "pcigame" and "cs461x" modules are for the OSS drivers only.</div><div class='del'>-      These ALSA drivers (cs46xx, trident and au88x0) have the</div><div class='del'>-      built-in gameport support.</div><div class='del'>-</div><div class='del'>-As mentioned above, ALSA PCI drivers have the built-in gameport</div><div class='del'>-support, so you don't have to load ns558 module.  Just load "joydev"</div><div class='del'>-and the appropriate adapter module (e.g. "analog").</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ISA Cards</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-ALSA ISA drivers don't have the built-in gameport support.</div><div class='del'>-Instead, you need to load "ns558" module in addition to "joydev" and</div><div class='del'>-the adapter module (e.g. "analog").</div><div class='head'>diff --git a/Documentation/sound/alsa/MIXART.txt b/Documentation/sound/alsa/MIXART.txt<br/>deleted file mode 100644<br/>index 4ee35b4fbe4a..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/MIXART.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/MIXART.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-    Alsa driver for Digigram miXart8 and miXart8AES/EBU soundcards</div><div class='del'>-	    Digigram &lt;alsa@digigram.com&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GENERAL</div><div class='del'>-=======</div><div class='del'>-</div><div class='del'>-The miXart8 is a multichannel audio processing and mixing soundcard</div><div class='del'>-that has 4 stereo audio inputs and 4 stereo audio outputs.</div><div class='del'>-The miXart8AES/EBU is the same with a add-on card that offers further</div><div class='del'>-4 digital stereo audio inputs and outputs.</div><div class='del'>-Furthermore the add-on card offers external clock synchronisation</div><div class='del'>-(AES/EBU, Word Clock, Time Code and Video Synchro)</div><div class='del'>-</div><div class='del'>-The mainboard has a PowerPC that offers onboard mpeg encoding and</div><div class='del'>-decoding, samplerate conversions and various effects.</div><div class='del'>-</div><div class='del'>-The driver don't work properly at all until the certain firmwares</div><div class='del'>-are loaded, i.e. no PCM nor mixer devices will appear.</div><div class='del'>-Use the mixartloader that can be found in the alsa-tools package.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-VERSION 0.1.0</div><div class='del'>-=============</div><div class='del'>-</div><div class='del'>-One miXart8 board will be represented as 4 alsa cards, each with 1</div><div class='del'>-stereo analog capture 'pcm0c' and 1 stereo analog playback 'pcm0p' device.</div><div class='del'>-With a miXart8AES/EBU there is in addition 1 stereo digital input</div><div class='del'>-'pcm1c' and 1 stereo digital output 'pcm1p' per card.</div><div class='del'>-</div><div class='del'>-Formats</div><div class='del'>--------</div><div class='del'>-U8, S16_LE, S16_BE, S24_3LE, S24_3BE, FLOAT_LE, FLOAT_BE</div><div class='del'>-Sample rates : 8000 - 48000 Hz continuously</div><div class='del'>-</div><div class='del'>-Playback</div><div class='del'>---------</div><div class='del'>-For instance the playback devices are configured to have max. 4</div><div class='del'>-substreams performing hardware mixing. This could be changed to a</div><div class='del'>-maximum of 24 substreams if wished.</div><div class='del'>-Mono files will be played on the left and right channel. Each channel</div><div class='del'>-can be muted for each stream to use 8 analog/digital outputs separately.</div><div class='del'>-</div><div class='del'>-Capture</div><div class='del'>--------</div><div class='del'>-There is one substream per capture device. For instance only stereo</div><div class='del'>-formats are supported.</div><div class='del'>-</div><div class='del'>-Mixer</div><div class='del'>------</div><div class='del'>-&lt;Master&gt; and &lt;Master Capture&gt; : analog volume control of playback and capture PCM.</div><div class='del'>-&lt;PCM 0-3&gt; and &lt;PCM Capture&gt; : digital volume control of each analog substream.</div><div class='del'>-&lt;AES 0-3&gt; and &lt;AES Capture&gt; : digital volume control of each AES/EBU substream.</div><div class='del'>-&lt;Monitoring&gt; : Loopback from 'pcm0c' to 'pcm0p' with digital volume</div><div class='del'>-and mute control.</div><div class='del'>-</div><div class='del'>-Rem : for best audio quality try to keep a 0 attenuation on the PCM</div><div class='del'>-and AES volume controls which is set by 219 in the range from 0 to 255</div><div class='del'>-(about 86% with alsamixer)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-NOT YET IMPLEMENTED</div><div class='del'>-===================</div><div class='del'>-</div><div class='del'>-- external clock support (AES/EBU, Word Clock, Time Code, Video Sync)</div><div class='del'>-- MPEG audio formats</div><div class='del'>-- mono record</div><div class='del'>-- on-board effects and samplerate conversions</div><div class='del'>-- linked streams</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-FIRMWARE</div><div class='del'>-========</div><div class='del'>-</div><div class='del'>-[As of 2.6.11, the firmware can be loaded automatically with hotplug</div><div class='del'>- when CONFIG_FW_LOADER is set.  The mixartloader is necessary only</div><div class='del'>- for older versions or when you build the driver into kernel.]</div><div class='del'>- </div><div class='del'>-For loading the firmware automatically after the module is loaded, use a</div><div class='del'>-install command.  For example, add the following entry to</div><div class='del'>-/etc/modprobe.d/mixart.conf for miXart driver:</div><div class='del'>-</div><div class='del'>-	install snd-mixart /sbin/modprobe --first-time -i snd-mixart &amp;&amp; \</div><div class='del'>-			   /usr/bin/mixartloader</div><div class='del'>-(for 2.2/2.4 kernels, add "post-install snd-mixart /usr/bin/vxloader" to</div><div class='del'>- /etc/modules.conf, instead.)</div><div class='del'>-</div><div class='del'>-The firmware binaries are installed on /usr/share/alsa/firmware</div><div class='del'>-(or /usr/local/share/alsa/firmware, depending to the prefix option of</div><div class='del'>-configure).  There will be a miXart.conf file, which define the dsp image</div><div class='del'>-files.</div><div class='del'>-</div><div class='del'>-The firmware files are copyright by Digigram SA</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-COPYRIGHT</div><div class='del'>-=========</div><div class='del'>-</div><div class='del'>-Copyright (c) 2003 Digigram SA &lt;alsa@digigram.com&gt;</div><div class='del'>-Distributable under GPL.</div><div class='head'>diff --git a/Documentation/sound/alsa/OSS-Emulation.txt b/Documentation/sound/alsa/OSS-Emulation.txt<br/>deleted file mode 100644<br/>index 152ca2a3f1bd..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/OSS-Emulation.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/OSS-Emulation.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,305 +0,0 @@</div><div class='del'>-		NOTES ON KERNEL OSS-EMULATION</div><div class='del'>-		=============================</div><div class='del'>-</div><div class='del'>-		Jan. 22, 2004  Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Modules</div><div class='del'>-=======</div><div class='del'>-</div><div class='del'>-ALSA provides a powerful OSS emulation on the kernel.</div><div class='del'>-The OSS emulation for PCM, mixer and sequencer devices is implemented</div><div class='del'>-as add-on kernel modules, snd-pcm-oss, snd-mixer-oss and snd-seq-oss.</div><div class='del'>-When you need to access the OSS PCM, mixer or sequencer devices, the</div><div class='del'>-corresponding module has to be loaded.</div><div class='del'>-</div><div class='del'>-These modules are loaded automatically when the corresponding service</div><div class='del'>-is called.  The alias is defined sound-service-x-y, where x and y are</div><div class='del'>-the card number and the minor unit number.  Usually you don't have to</div><div class='del'>-define these aliases by yourself.</div><div class='del'>-</div><div class='del'>-Only necessary step for auto-loading of OSS modules is to define the</div><div class='del'>-card alias in /etc/modprobe.d/alsa.conf, such as</div><div class='del'>-</div><div class='del'>-	alias sound-slot-0 snd-emu10k1</div><div class='del'>-</div><div class='del'>-As the second card, define sound-slot-1 as well.</div><div class='del'>-Note that you can't use the aliased name as the target name (i.e.</div><div class='del'>-"alias sound-slot-0 snd-card-0" doesn't work any more like the old</div><div class='del'>-modutils).</div><div class='del'>-</div><div class='del'>-The currently available OSS configuration is shown in</div><div class='del'>-/proc/asound/oss/sndstat.  This shows in the same syntax of</div><div class='del'>-/dev/sndstat, which is available on the commercial OSS driver.</div><div class='del'>-On ALSA, you can symlink /dev/sndstat to this proc file.</div><div class='del'>-</div><div class='del'>-Please note that the devices listed in this proc file appear only</div><div class='del'>-after the corresponding OSS-emulation module is loaded.  Don't worry</div><div class='del'>-even if "NOT ENABLED IN CONFIG" is shown in it.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Device Mapping</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-ALSA supports the following OSS device files:</div><div class='del'>-</div><div class='del'>-	PCM:</div><div class='del'>-		/dev/dspX</div><div class='del'>-		/dev/adspX</div><div class='del'>-</div><div class='del'>-	Mixer:</div><div class='del'>-		/dev/mixerX</div><div class='del'>-</div><div class='del'>-	MIDI:</div><div class='del'>-		/dev/midi0X</div><div class='del'>-		/dev/amidi0X</div><div class='del'>-</div><div class='del'>-	Sequencer:</div><div class='del'>-		/dev/sequencer</div><div class='del'>-		/dev/sequencer2 (aka /dev/music)</div><div class='del'>-</div><div class='del'>-where X is the card number from 0 to 7.</div><div class='del'>-</div><div class='del'>-(NOTE: Some distributions have the device files like /dev/midi0 and</div><div class='del'>-       /dev/midi1.  They are NOT for OSS but for tclmidi, which is</div><div class='del'>-       a totally different thing.)</div><div class='del'>-</div><div class='del'>-Unlike the real OSS, ALSA cannot use the device files more than the</div><div class='del'>-assigned ones.  For example, the first card cannot use /dev/dsp1 or</div><div class='del'>-/dev/dsp2, but only /dev/dsp0 and /dev/adsp0.</div><div class='del'>-</div><div class='del'>-As seen above, PCM and MIDI may have two devices.  Usually, the first</div><div class='del'>-PCM device (hw:0,0 in ALSA) is mapped to /dev/dsp and the secondary</div><div class='del'>-device (hw:0,1) to /dev/adsp (if available).  For MIDI, /dev/midi and</div><div class='del'>-/dev/amidi, respectively.</div><div class='del'>-</div><div class='del'>-You can change this device mapping via the module options of</div><div class='del'>-snd-pcm-oss and snd-rawmidi.  In the case of PCM, the following</div><div class='del'>-options are available for snd-pcm-oss:</div><div class='del'>-</div><div class='del'>-	dsp_map		PCM device number assigned to /dev/dspX</div><div class='del'>-			(default = 0)</div><div class='del'>-	adsp_map	PCM device number assigned to /dev/adspX</div><div class='del'>-			(default = 1)</div><div class='del'>-</div><div class='del'>-For example, to map the third PCM device (hw:0,2) to /dev/adsp0,</div><div class='del'>-define like this:</div><div class='del'>-</div><div class='del'>-	options snd-pcm-oss adsp_map=2</div><div class='del'>-</div><div class='del'>-The options take arrays.  For configuring the second card, specify</div><div class='del'>-two entries separated by comma.  For example, to map the third PCM</div><div class='del'>-device on the second card to /dev/adsp1, define like below:</div><div class='del'>-</div><div class='del'>-	options snd-pcm-oss adsp_map=0,2</div><div class='del'>-</div><div class='del'>-To change the mapping of MIDI devices, the following options are</div><div class='del'>-available for snd-rawmidi:</div><div class='del'>-</div><div class='del'>-	midi_map	MIDI device number assigned to /dev/midi0X</div><div class='del'>-			(default = 0)</div><div class='del'>-	amidi_map	MIDI device number assigned to /dev/amidi0X</div><div class='del'>-			(default = 1)</div><div class='del'>-</div><div class='del'>-For example, to assign the third MIDI device on the first card to</div><div class='del'>-/dev/midi00, define as follows:</div><div class='del'>-</div><div class='del'>-	options snd-rawmidi midi_map=2</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-PCM Mode</div><div class='del'>-========</div><div class='del'>-</div><div class='del'>-As default, ALSA emulates the OSS PCM with so-called plugin layer,</div><div class='del'>-i.e. tries to convert the sample format, rate or channels</div><div class='del'>-automatically when the card doesn't support it natively.</div><div class='del'>-This will lead to some problems for some applications like quake or</div><div class='del'>-wine, especially if they use the card only in the MMAP mode.</div><div class='del'>-</div><div class='del'>-In such a case, you can change the behavior of PCM per application by</div><div class='del'>-writing a command to the proc file.  There is a proc file for each PCM</div><div class='del'>-stream, /proc/asound/cardX/pcmY[cp]/oss, where X is the card number</div><div class='del'>-(zero-based), Y the PCM device number (zero-based), and 'p' is for</div><div class='del'>-playback and 'c' for capture, respectively.  Note that this proc file</div><div class='del'>-exists only after snd-pcm-oss module is loaded.</div><div class='del'>-</div><div class='del'>-The command sequence has the following syntax:</div><div class='del'>-</div><div class='del'>-	app_name fragments fragment_size [options]</div><div class='del'>-</div><div class='del'>-app_name is the name of application with (higher priority) or without</div><div class='del'>-path.</div><div class='del'>-fragments specifies the number of fragments or zero if no specific</div><div class='del'>-number is given.</div><div class='del'>-fragment_size is the size of fragment in bytes or zero if not given.</div><div class='del'>-options is the optional parameters.  The following options are</div><div class='del'>-available:</div><div class='del'>-</div><div class='del'>-	disable		the application tries to open a pcm device for</div><div class='del'>-			this channel but does not want to use it.</div><div class='del'>-	direct		don't use plugins</div><div class='del'>-	block		force block open mode</div><div class='del'>-	non-block	force non-block open mode</div><div class='del'>-	partial-frag	write also partial fragments (affects playback only)</div><div class='del'>-	no-silence	do not fill silence ahead to avoid clicks</div><div class='del'>-</div><div class='del'>-The disable option is useful when one stream direction (playback or</div><div class='del'>-capture) is not handled correctly by the application although the</div><div class='del'>-hardware itself does support both directions.</div><div class='del'>-The direct option is used, as mentioned above, to bypass the automatic</div><div class='del'>-conversion and useful for MMAP-applications.</div><div class='del'>-For example, to playback the first PCM device without plugins for</div><div class='del'>-quake, send a command via echo like the following:</div><div class='del'>-</div><div class='del'>-	% echo "quake 0 0 direct" &gt; /proc/asound/card0/pcm0p/oss</div><div class='del'>-</div><div class='del'>-While quake wants only playback, you may append the second command</div><div class='del'>-to notify driver that only this direction is about to be allocated:</div><div class='del'>-</div><div class='del'>-	% echo "quake 0 0 disable" &gt; /proc/asound/card0/pcm0c/oss</div><div class='del'>-</div><div class='del'>-The permission of proc files depend on the module options of snd.</div><div class='del'>-As default it's set as root, so you'll likely need to be superuser for</div><div class='del'>-sending the command above.</div><div class='del'>-</div><div class='del'>-The block and non-block options are used to change the behavior of</div><div class='del'>-opening the device file.</div><div class='del'>-</div><div class='del'>-As default, ALSA behaves as original OSS drivers, i.e. does not block</div><div class='del'>-the file when it's busy. The -EBUSY error is returned in this case.</div><div class='del'>-</div><div class='del'>-This blocking behavior can be changed globally via nonblock_open</div><div class='del'>-module option of snd-pcm-oss.  For using the blocking mode as default</div><div class='del'>-for OSS devices, define like the following:</div><div class='del'>-</div><div class='del'>-	options snd-pcm-oss nonblock_open=0</div><div class='del'>-</div><div class='del'>-The partial-frag and no-silence commands have been added recently.</div><div class='del'>-Both commands are for optimization use only.  The former command</div><div class='del'>-specifies to invoke the write transfer only when the whole fragment is</div><div class='del'>-filled.  The latter stops writing the silence data ahead</div><div class='del'>-automatically.  Both are disabled as default.</div><div class='del'>-</div><div class='del'>-You can check the currently defined configuration by reading the proc</div><div class='del'>-file.  The read image can be sent to the proc file again, hence you</div><div class='del'>-can save the current configuration</div><div class='del'>-</div><div class='del'>-	% cat /proc/asound/card0/pcm0p/oss &gt; /somewhere/oss-cfg</div><div class='del'>-</div><div class='del'>-and restore it like</div><div class='del'>-</div><div class='del'>-	% cat /somewhere/oss-cfg &gt; /proc/asound/card0/pcm0p/oss</div><div class='del'>-</div><div class='del'>-Also, for clearing all the current configuration, send "erase" command</div><div class='del'>-as below:</div><div class='del'>-</div><div class='del'>-	% echo "erase" &gt; /proc/asound/card0/pcm0p/oss</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Mixer Elements</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-Since ALSA has completely different mixer interface, the emulation of</div><div class='del'>-OSS mixer is relatively complicated.  ALSA builds up a mixer element</div><div class='del'>-from several different ALSA (mixer) controls based on the name</div><div class='del'>-string.  For example, the volume element SOUND_MIXER_PCM is composed</div><div class='del'>-from "PCM Playback Volume" and "PCM Playback Switch" controls for the</div><div class='del'>-playback direction and from "PCM Capture Volume" and "PCM Capture</div><div class='del'>-Switch" for the capture directory (if exists).  When the PCM volume of</div><div class='del'>-OSS is changed, all the volume and switch controls above are adjusted</div><div class='del'>-automatically.</div><div class='del'>-</div><div class='del'>-As default, ALSA uses the following control for OSS volumes:</div><div class='del'>-</div><div class='del'>-	OSS volume		ALSA control		Index</div><div class='del'>-	-----------------------------------------------------</div><div class='del'>-	SOUND_MIXER_VOLUME 	Master			0</div><div class='del'>-	SOUND_MIXER_BASS	Tone Control - Bass	0</div><div class='del'>-	SOUND_MIXER_TREBLE	Tone Control - Treble	0</div><div class='del'>-	SOUND_MIXER_SYNTH	Synth			0</div><div class='del'>-	SOUND_MIXER_PCM		PCM			0</div><div class='del'>-	SOUND_MIXER_SPEAKER	PC Speaker 		0</div><div class='del'>-	SOUND_MIXER_LINE	Line			0</div><div class='del'>-	SOUND_MIXER_MIC		Mic 			0</div><div class='del'>-	SOUND_MIXER_CD		CD 			0</div><div class='del'>-	SOUND_MIXER_IMIX	Monitor Mix 		0</div><div class='del'>-	SOUND_MIXER_ALTPCM	PCM			1</div><div class='del'>-	SOUND_MIXER_RECLEV	(not assigned)</div><div class='del'>-	SOUND_MIXER_IGAIN	Capture			0</div><div class='del'>-	SOUND_MIXER_OGAIN	Playback		0</div><div class='del'>-	SOUND_MIXER_LINE1	Aux			0</div><div class='del'>-	SOUND_MIXER_LINE2	Aux			1</div><div class='del'>-	SOUND_MIXER_LINE3	Aux			2</div><div class='del'>-	SOUND_MIXER_DIGITAL1	Digital			0</div><div class='del'>-	SOUND_MIXER_DIGITAL2	Digital			1</div><div class='del'>-	SOUND_MIXER_DIGITAL3	Digital			2</div><div class='del'>-	SOUND_MIXER_PHONEIN	Phone			0</div><div class='del'>-	SOUND_MIXER_PHONEOUT	Phone			1</div><div class='del'>-	SOUND_MIXER_VIDEO	Video			0</div><div class='del'>-	SOUND_MIXER_RADIO	Radio			0</div><div class='del'>-	SOUND_MIXER_MONITOR	Monitor			0</div><div class='del'>-</div><div class='del'>-The second column is the base-string of the corresponding ALSA</div><div class='del'>-control.  In fact, the controls with "XXX [Playback|Capture]</div><div class='del'>-[Volume|Switch]" will be checked in addition.</div><div class='del'>-</div><div class='del'>-The current assignment of these mixer elements is listed in the proc</div><div class='del'>-file, /proc/asound/cardX/oss_mixer, which will be like the following</div><div class='del'>-</div><div class='del'>-	VOLUME "Master" 0</div><div class='del'>-	BASS "" 0</div><div class='del'>-	TREBLE "" 0</div><div class='del'>-	SYNTH "" 0</div><div class='del'>-	PCM "PCM" 0</div><div class='del'>-	...</div><div class='del'>-</div><div class='del'>-where the first column is the OSS volume element, the second column</div><div class='del'>-the base-string of the corresponding ALSA control, and the third the</div><div class='del'>-control index.  When the string is empty, it means that the</div><div class='del'>-corresponding OSS control is not available.</div><div class='del'>-</div><div class='del'>-For changing the assignment, you can write the configuration to this</div><div class='del'>-proc file.  For example, to map "Wave Playback" to the PCM volume,</div><div class='del'>-send the command like the following:</div><div class='del'>-</div><div class='del'>-	% echo 'VOLUME "Wave Playback" 0' &gt; /proc/asound/card0/oss_mixer</div><div class='del'>-</div><div class='del'>-The command is exactly as same as listed in the proc file.  You can</div><div class='del'>-change one or more elements, one volume per line.  In the last</div><div class='del'>-example, both "Wave Playback Volume" and "Wave Playback Switch" will</div><div class='del'>-be affected when PCM volume is changed.</div><div class='del'>-</div><div class='del'>-Like the case of PCM proc file, the permission of proc files depend on</div><div class='del'>-the module options of snd.  you'll likely need to be superuser for</div><div class='del'>-sending the command above.</div><div class='del'>-</div><div class='del'>-As well as in the case of PCM proc file, you can save and restore the</div><div class='del'>-current mixer configuration by reading and writing the whole file</div><div class='del'>-image.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Duplex Streams</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-Note that when attempting to use a single device file for playback and</div><div class='del'>-capture, the OSS API provides no way to set the format, sample rate or</div><div class='del'>-number of channels different in each direction.  Thus</div><div class='del'>-	io_handle = open("device", O_RDWR)</div><div class='del'>-will only function correctly if the values are the same in each direction.</div><div class='del'>-</div><div class='del'>-To use different values in the two directions, use both</div><div class='del'>-	input_handle = open("device", O_RDONLY)</div><div class='del'>-	output_handle = open("device", O_WRONLY)</div><div class='del'>-and set the values for the corresponding handle.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Unsupported Features</div><div class='del'>-====================</div><div class='del'>-</div><div class='del'>-MMAP on ICE1712 driver</div><div class='del'>-----------------------</div><div class='del'>-ICE1712 supports only the unconventional format, interleaved</div><div class='del'>-10-channels 24bit (packed in 32bit) format.  Therefore you cannot mmap</div><div class='del'>-the buffer as the conventional (mono or 2-channels, 8 or 16bit) format</div><div class='del'>-on OSS.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt<br/>deleted file mode 100644<br/>index 7f8a0d325905..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/Procfile.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/Procfile.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,234 +0,0 @@</div><div class='del'>-		Proc Files of ALSA Drivers</div><div class='del'>-		==========================</div><div class='del'>-		Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>-</div><div class='del'>-General</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-ALSA has its own proc tree, /proc/asound.  Many useful information are</div><div class='del'>-found in this tree.  When you encounter a problem and need debugging,</div><div class='del'>-check the files listed in the following sections.</div><div class='del'>-</div><div class='del'>-Each card has its subtree cardX, where X is from 0 to 7. The</div><div class='del'>-card-specific files are stored in the card* subdirectories.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Global Information</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-cards</div><div class='del'>-	Shows the list of currently configured ALSA drivers,</div><div class='del'>-	index, the id string, short and long descriptions.</div><div class='del'>-</div><div class='del'>-version</div><div class='del'>-	Shows the version string and compile date.</div><div class='del'>-</div><div class='del'>-modules</div><div class='del'>-	Lists the module of each card</div><div class='del'>-</div><div class='del'>-devices</div><div class='del'>-	Lists the ALSA native device mappings.</div><div class='del'>-</div><div class='del'>-meminfo</div><div class='del'>-	Shows the status of allocated pages via ALSA drivers.</div><div class='del'>-	Appears only when CONFIG_SND_DEBUG=y.</div><div class='del'>-</div><div class='del'>-hwdep</div><div class='del'>-	Lists the currently available hwdep devices in format of</div><div class='del'>-	&lt;card&gt;-&lt;device&gt;: &lt;name&gt;</div><div class='del'>-</div><div class='del'>-pcm</div><div class='del'>-	Lists the currently available PCM devices in format of</div><div class='del'>-	&lt;card&gt;-&lt;device&gt;: &lt;id&gt;: &lt;name&gt; : &lt;sub-streams&gt;</div><div class='del'>-</div><div class='del'>-timer</div><div class='del'>-	Lists the currently available timer devices</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-oss/devices</div><div class='del'>-	Lists the OSS device mappings.</div><div class='del'>-</div><div class='del'>-oss/sndstat</div><div class='del'>-	Provides the output compatible with /dev/sndstat.</div><div class='del'>-	You can symlink this to /dev/sndstat.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Card Specific Files</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-The card-specific files are found in /proc/asound/card* directories.</div><div class='del'>-Some drivers (e.g. cmipci) have their own proc entries for the</div><div class='del'>-register dump, etc (e.g. /proc/asound/card*/cmipci shows the register</div><div class='del'>-dump).  These files would be really helpful for debugging.</div><div class='del'>-</div><div class='del'>-When PCM devices are available on this card, you can see directories</div><div class='del'>-like pcm0p or pcm1c.  They hold the PCM information for each PCM</div><div class='del'>-stream.  The number after 'pcm' is the PCM device number from 0, and</div><div class='del'>-the last 'p' or 'c' means playback or capture direction.  The files in</div><div class='del'>-this subtree is described later.</div><div class='del'>-</div><div class='del'>-The status of MIDI I/O is found in midi* files.  It shows the device</div><div class='del'>-name and the received/transmitted bytes through the MIDI device.</div><div class='del'>-</div><div class='del'>-When the card is equipped with AC97 codecs, there are codec97#*</div><div class='del'>-subdirectories (described later).</div><div class='del'>-</div><div class='del'>-When the OSS mixer emulation is enabled (and the module is loaded),</div><div class='del'>-oss_mixer file appears here, too.  This shows the current mapping of</div><div class='del'>-OSS mixer elements to the ALSA control elements.  You can change the</div><div class='del'>-mapping by writing to this device.  Read OSS-Emulation.txt for</div><div class='del'>-details.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-PCM Proc Files</div><div class='del'>---------------</div><div class='del'>-</div><div class='del'>-card*/pcm*/info</div><div class='del'>-	The general information of this PCM device: card #, device #,</div><div class='del'>-	substreams, etc.</div><div class='del'>-</div><div class='del'>-card*/pcm*/xrun_debug</div><div class='del'>-	This file appears when CONFIG_SND_DEBUG=y and</div><div class='del'>-	CONFIG_PCM_XRUN_DEBUG=y.</div><div class='del'>-	This shows the status of xrun (= buffer overrun/xrun) and</div><div class='del'>-	invalid PCM position debug/check of ALSA PCM middle layer.</div><div class='del'>-	It takes an integer value, can be changed by writing to this</div><div class='del'>-	file, such as</div><div class='del'>-</div><div class='del'>-		 # echo 5 &gt; /proc/asound/card0/pcm0p/xrun_debug</div><div class='del'>-</div><div class='del'>-	The value consists of the following bit flags:</div><div class='del'>-	  bit 0 = Enable XRUN/jiffies debug messages</div><div class='del'>-	  bit 1 = Show stack trace at XRUN / jiffies check</div><div class='del'>-	  bit 2 = Enable additional jiffies check</div><div class='del'>-</div><div class='del'>-	When the bit 0 is set, the driver will show the messages to</div><div class='del'>-	kernel log when an xrun is detected.  The debug message is</div><div class='del'>-	shown also when the invalid H/W pointer is detected at the</div><div class='del'>-	update of periods (usually called from the interrupt</div><div class='del'>-	handler).</div><div class='del'>-</div><div class='del'>-	When the bit 1 is set, the driver will show the stack trace</div><div class='del'>-	additionally.  This may help the debugging.</div><div class='del'>-</div><div class='del'>-	Since 2.6.30, this option can enable the hwptr check using</div><div class='del'>-	jiffies.  This detects spontaneous invalid pointer callback</div><div class='del'>-	values, but can be lead to too much corrections for a (mostly</div><div class='del'>-	buggy) hardware that doesn't give smooth pointer updates.</div><div class='del'>-	This feature is enabled via the bit 2.</div><div class='del'>-</div><div class='del'>-card*/pcm*/sub*/info</div><div class='del'>-	The general information of this PCM sub-stream.</div><div class='del'>-</div><div class='del'>-card*/pcm*/sub*/status</div><div class='del'>-	The current status of this PCM sub-stream, elapsed time,</div><div class='del'>-	H/W position, etc.</div><div class='del'>-</div><div class='del'>-card*/pcm*/sub*/hw_params</div><div class='del'>-	The hardware parameters set for this sub-stream.</div><div class='del'>-</div><div class='del'>-card*/pcm*/sub*/sw_params</div><div class='del'>-	The soft parameters set for this sub-stream.</div><div class='del'>-</div><div class='del'>-card*/pcm*/sub*/prealloc</div><div class='del'>-	The buffer pre-allocation information.</div><div class='del'>-</div><div class='del'>-card*/pcm*/sub*/xrun_injection</div><div class='del'>-	Triggers an XRUN to the running stream when any value is</div><div class='del'>-	written to this proc file.  Used for fault injection.</div><div class='del'>-	This entry is write-only.</div><div class='del'>-</div><div class='del'>-AC97 Codec Information</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-card*/codec97#*/ac97#?-?</div><div class='del'>-	Shows the general information of this AC97 codec chip, such as</div><div class='del'>-	name, capabilities, set up.</div><div class='del'>-</div><div class='del'>-card*/codec97#0/ac97#?-?+regs</div><div class='del'>-	Shows the AC97 register dump.  Useful for debugging.</div><div class='del'>-</div><div class='del'>-	When CONFIG_SND_DEBUG is enabled, you can write to this file for</div><div class='del'>-	changing an AC97 register directly.  Pass two hex numbers.</div><div class='del'>-	For example,</div><div class='del'>-</div><div class='del'>-	# echo 02 9f1f &gt; /proc/asound/card0/codec97#0/ac97#0-0+regs</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-USB Audio Streams</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-card*/stream*</div><div class='del'>-	Shows the assignment and the current status of each audio stream</div><div class='del'>-	of the given card.  This information is very useful for debugging.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-HD-Audio Codecs</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-card*/codec#*</div><div class='del'>-	Shows the general codec information and the attribute of each</div><div class='del'>-	widget node.</div><div class='del'>-</div><div class='del'>-card*/eld#*</div><div class='del'>-	Available for HDMI or DisplayPort interfaces.</div><div class='del'>-	Shows ELD(EDID Like Data) info retrieved from the attached HDMI sink,</div><div class='del'>-	and describes its audio capabilities and configurations.</div><div class='del'>-</div><div class='del'>-	Some ELD fields may be modified by doing `echo name hex_value &gt; eld#*`.</div><div class='del'>-	Only do this if you are sure the HDMI sink provided value is wrong.</div><div class='del'>-	And if that makes your HDMI audio work, please report to us so that we</div><div class='del'>-	can fix it in future kernel releases.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Sequencer Information</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-seq/drivers</div><div class='del'>-	Lists the currently available ALSA sequencer drivers.</div><div class='del'>-</div><div class='del'>-seq/clients</div><div class='del'>-	Shows the list of currently available sequencer clients and</div><div class='del'>-	ports.  The connection status and the running status are shown</div><div class='del'>-	in this file, too.</div><div class='del'>-</div><div class='del'>-seq/queues</div><div class='del'>-	Lists the currently allocated/running sequencer queues.</div><div class='del'>-</div><div class='del'>-seq/timer</div><div class='del'>-	Lists the currently allocated/running sequencer timers.</div><div class='del'>-</div><div class='del'>-seq/oss</div><div class='del'>-	Lists the OSS-compatible sequencer stuffs.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Help For Debugging?</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-When the problem is related with PCM, first try to turn on xrun_debug</div><div class='del'>-mode.  This will give you the kernel messages when and where xrun</div><div class='del'>-happened.</div><div class='del'>-</div><div class='del'>-If it's really a bug, report it with the following information:</div><div class='del'>-</div><div class='del'>-  - the name of the driver/card, show in /proc/asound/cards</div><div class='del'>-  - the register dump, if available (e.g. card*/cmipci)</div><div class='del'>-</div><div class='del'>-when it's a PCM problem,</div><div class='del'>-</div><div class='del'>-  - set-up of PCM, shown in hw_parms, sw_params, and status in the PCM</div><div class='del'>-    sub-stream directory</div><div class='del'>-</div><div class='del'>-when it's a mixer problem,</div><div class='del'>-</div><div class='del'>-  - AC97 proc files, codec97#*/* files</div><div class='del'>-</div><div class='del'>-for USB audio/midi,</div><div class='del'>-</div><div class='del'>-  - output of lsusb -v</div><div class='del'>-  - stream* files in card directory</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The ALSA bug-tracking system is found at:</div><div class='del'>-</div><div class='del'>-    https://bugtrack.alsa-project.org/alsa-bug/</div><div class='head'>diff --git a/Documentation/sound/alsa/README.maya44 b/Documentation/sound/alsa/README.maya44<br/>deleted file mode 100644<br/>index 67b2ea1cc31d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/README.maya44?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/README.maya44</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,163 +0,0 @@</div><div class='del'>-NOTE: The following is the original document of Rainer's patch that the</div><div class='del'>-current maya44 code based on.  Some contents might be obsoleted, but I</div><div class='del'>-keep here as reference -- tiwai</div><div class='del'>-</div><div class='del'>-----------------------------------------------------------------</div><div class='del'>- </div><div class='del'>-STATE OF DEVELOPMENT:</div><div class='del'>-</div><div class='del'>-This driver is being developed on the initiative of Piotr Makowski (oponek@gmail.com) and financed by Lars Bergmann.</div><div class='del'>-Development is carried out by Rainer Zimmermann (mail@lightshed.de).</div><div class='del'>-</div><div class='del'>-ESI provided a sample Maya44 card for the development work.</div><div class='del'>-</div><div class='del'>-However, unfortunately it has turned out difficult to get detailed programming information, so I (Rainer Zimmermann) had to find out some card-specific information by experiment and conjecture. Some information (in particular, several GPIO bits) is still missing.</div><div class='del'>-</div><div class='del'>-This is the first testing version of the Maya44 driver released to the alsa-devel mailing list (Feb 5, 2008).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The following functions work, as tested by Rainer Zimmermann and Piotr Makowski:</div><div class='del'>-</div><div class='del'>-- playback and capture at all sampling rates</div><div class='del'>-- input/output level</div><div class='del'>-- crossmixing</div><div class='del'>-- line/mic switch</div><div class='del'>-- phantom power switch</div><div class='del'>-- analogue monitor a.k.a bypass</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The following functions *should* work, but are not fully tested:</div><div class='del'>-</div><div class='del'>-- Channel 3+4 analogue - S/PDIF input switching</div><div class='del'>-- S/PDIF output</div><div class='del'>-- all inputs/outputs on the M/IO/DIO extension card</div><div class='del'>-- internal/external clock selection</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-*In particular, we would appreciate testing of these functions by anyone who has access to an M/IO/DIO extension card.*</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Things that do not seem to work:</div><div class='del'>-</div><div class='del'>-- The level meters ("multi track") in 'alsamixer' do not seem to react to signals in (if this is a bug, it would probably be in the existing ICE1724 code).</div><div class='del'>-</div><div class='del'>-- Ardour 2.1 seems to work only via JACK, not using ALSA directly or via OSS. This still needs to be tracked down.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-DRIVER DETAILS:</div><div class='del'>-</div><div class='del'>-the following files were added:</div><div class='del'>-</div><div class='del'>-pci/ice1724/maya44.c        - Maya44 specific code</div><div class='del'>-pci/ice1724/maya44.h</div><div class='del'>-pci/ice1724/ice1724.patch</div><div class='del'>-pci/ice1724/ice1724.h.patch - PROPOSED patch to ice1724.h (see SAMPLING RATES)</div><div class='del'>-i2c/other/wm8776.c  - low-level access routines for Wolfson WM8776 codecs </div><div class='del'>-include/wm8776.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Note that the wm8776.c code is meant to be card-independent and does not actually register the codec with the ALSA infrastructure.</div><div class='del'>-This is done in maya44.c, mainly because some of the WM8776 controls are used in Maya44-specific ways, and should be named appropriately.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-the following files were created in pci/ice1724, simply #including the corresponding file from the alsa-kernel tree:</div><div class='del'>-</div><div class='del'>-wtm.h</div><div class='del'>-vt1720_mobo.h</div><div class='del'>-revo.h</div><div class='del'>-prodigy192.h</div><div class='del'>-pontis.h</div><div class='del'>-phase.h</div><div class='del'>-maya44.h</div><div class='del'>-juli.h</div><div class='del'>-aureon.h</div><div class='del'>-amp.h</div><div class='del'>-envy24ht.h</div><div class='del'>-se.h</div><div class='del'>-prodigy_hifi.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-*I hope this is the correct way to do things.*</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SAMPLING RATES:</div><div class='del'>-</div><div class='del'>-The Maya44 card (or more exactly, the Wolfson WM8776 codecs) allow a maximum sampling rate of 192 kHz for playback and 92 kHz for capture.</div><div class='del'>-</div><div class='del'>-As the ICE1724 chip only allows one global sampling rate, this is handled as follows:</div><div class='del'>-</div><div class='del'>-* setting the sampling rate on any open PCM device on the maya44 card will always set the *global* sampling rate for all playback and capture channels.</div><div class='del'>-</div><div class='del'>-* In the current state of the driver, setting rates of up to 192 kHz is permitted even for capture devices.</div><div class='del'>-</div><div class='del'>-*AVOID CAPTURING AT RATES ABOVE 96kHz*, even though it may appear to work. The codec cannot actually capture at such rates, meaning poor quality.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-I propose some additional code for limiting the sampling rate when setting on a capture pcm device. However because of the global sampling rate, this logic would be somewhat problematic.</div><div class='del'>-</div><div class='del'>-The proposed code (currently deactivated) is in ice1712.h.patch, ice1724.c and maya44.c (in pci/ice1712).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOUND DEVICES:</div><div class='del'>-</div><div class='del'>-PCM devices correspond to inputs/outputs as follows (assuming Maya44 is card #0):</div><div class='del'>-</div><div class='del'>-hw:0,0 input - stereo, analog input 1+2</div><div class='del'>-hw:0,0 output - stereo, analog output 1+2</div><div class='del'>-hw:0,1 input - stereo, analog input 3+4 OR S/PDIF input</div><div class='del'>-hw:0,1 output - stereo, analog output 3+4 (and SPDIF out)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-NAMING OF MIXER CONTROLS:</div><div class='del'>-</div><div class='del'>-(for more information about the signal flow, please refer to the block diagram on p.24 of the ESI Maya44 manual, or in the ESI windows software).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-PCM: (digital) output level for channel 1+2</div><div class='del'>-PCM 1: same for channel 3+4</div><div class='del'>-</div><div class='del'>-Mic Phantom+48V: switch for +48V phantom power for electrostatic microphones on input 1/2.</div><div class='del'>-    Make sure this is not turned on while any other source is connected to input 1/2.</div><div class='del'>-    It might damage the source and/or the maya44 card.</div><div class='del'>-</div><div class='del'>-Mic/Line input: if switch is on, input jack 1/2 is microphone input (mono), otherwise line input (stereo).</div><div class='del'>-</div><div class='del'>-Bypass: analogue bypass from ADC input to output for channel 1+2. Same as "Monitor" in the windows driver.</div><div class='del'>-Bypass 1: same for channel 3+4.</div><div class='del'>-</div><div class='del'>-Crossmix: cross-mixer from channels 1+2 to channels 3+4</div><div class='del'>-Crossmix 1: cross-mixer from channels 3+4 to channels 1+2</div><div class='del'>-</div><div class='del'>-IEC958 Output: switch for S/PDIF output.</div><div class='del'>-    This is not supported by the ESI windows driver.</div><div class='del'>-    S/PDIF should output the same signal as channel 3+4. [untested!]</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Digitial output selectors:</div><div class='del'>-</div><div class='del'>-    These switches allow a direct digital routing from the ADCs to the DACs.</div><div class='del'>-    Each switch determines where the digital input data to one of the DACs comes from.</div><div class='del'>-    They are not supported by the ESI windows driver.</div><div class='del'>-    For normal operation, they should all be set to "PCM out".</div><div class='del'>-</div><div class='del'>-H/W: Output source channel 1</div><div class='del'>-H/W 1: Output source channel 2</div><div class='del'>-H/W 2: Output source channel 3</div><div class='del'>-H/W 3: Output source channel 4</div><div class='del'>-</div><div class='del'>-H/W 4 ... H/W 9: unknown function, left in to enable testing.</div><div class='del'>-    Possibly some of these control S/PDIF output(s).</div><div class='del'>-    If these turn out to be unused, they will go away in later driver versions.</div><div class='del'>-</div><div class='del'>-Selectable values for each of the digital output selectors are:</div><div class='del'>-   "PCM out" -&gt; DAC output of the corresponding channel (default setting)</div><div class='del'>-   "Input 1"...</div><div class='del'>-   "Input 4" -&gt; direct routing from ADC output of the selected input channel</div><div class='del'>-</div><div class='del'>-</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-Feb 14, 2008</div><div class='del'>-Rainer Zimmermann</div><div class='del'>-mail@lightshed.de</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/sound/alsa/SB-Live-mixer.txt b/Documentation/sound/alsa/SB-Live-mixer.txt<br/>deleted file mode 100644<br/>index f4b5988f450c..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/SB-Live-mixer.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/SB-Live-mixer.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,356 +0,0 @@</div><div class='del'>-</div><div class='del'>-		Sound Blaster Live mixer / default DSP code</div><div class='del'>-		===========================================</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The EMU10K1 chips have a DSP part which can be programmed to support</div><div class='del'>-various ways of sample processing, which is described here.</div><div class='del'>-(This article does not deal with the overall functionality of the </div><div class='del'>-EMU10K1 chips. See the manuals section for further details.)</div><div class='del'>-</div><div class='del'>-The ALSA driver programs this portion of chip by default code</div><div class='del'>-(can be altered later) which offers the following functionality:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1) IEC958 (S/PDIF) raw PCM</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-This PCM device (it's the 4th PCM device (index 3!) and first subdevice</div><div class='del'>-(index 0) for a given card) allows to forward 48kHz, stereo, 16-bit</div><div class='del'>-little endian streams without any modifications to the digital output</div><div class='del'>-(coaxial or optical). The universal interface allows the creation of up</div><div class='del'>-to 8 raw PCM devices operating at 48kHz, 16-bit little endian. It would</div><div class='del'>-be easy to add support for multichannel devices to the current code,</div><div class='del'>-but the conversion routines exist only for stereo (2-channel streams)</div><div class='del'>-at the time. </div><div class='del'>-</div><div class='del'>-Look to tram_poke routines in lowlevel/emu10k1/emufx.c for more details.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2) Digital mixer controls</div><div class='del'>--------------------------</div><div class='del'>-</div><div class='del'>-These controls are built using the DSP instructions. They offer extended</div><div class='del'>-functionality. Only the default build-in code in the ALSA driver is described</div><div class='del'>-here. Note that the controls work as attenuators: the maximum value is the </div><div class='del'>-neutral position leaving the signal unchanged. Note that if the  same destination </div><div class='del'>-is mentioned in multiple controls, the signal is accumulated and can be wrapped </div><div class='del'>-(set to maximal or minimal value without checking of overflow).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Explanation of used abbreviations:</div><div class='del'>-</div><div class='del'>-DAC    - digital to analog converter</div><div class='del'>-ADC    - analog to digital converter</div><div class='del'>-I2S    - one-way three wire serial bus for digital sound by Philips Semiconductors</div><div class='del'>-         (this standard is used for connecting standalone DAC and ADC converters)</div><div class='del'>-LFE    - low frequency effects (subwoofer signal)</div><div class='del'>-AC97   - a chip containing an analog mixer, DAC and ADC converters</div><div class='del'>-IEC958 - S/PDIF</div><div class='del'>-FX-bus - the EMU10K1 chip has an effect bus containing 16 accumulators.</div><div class='del'>-         Each of the synthesizer voices can feed its output to these accumulators</div><div class='del'>-         and the DSP microcontroller can operate with the resulting sum.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-name='Wave Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right PCM FX-bus</div><div class='del'>-accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples.</div><div class='del'>-The result samples are forwarded to the front DAC PCM slots of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='Wave Surround Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right PCM FX-bus</div><div class='del'>-accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples.</div><div class='del'>-The result samples are forwarded to the rear I2S DACs. These DACs operates</div><div class='del'>-separately (they are not inside the AC97 codec).</div><div class='del'>-</div><div class='del'>-name='Wave Center Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right PCM FX-bus</div><div class='del'>-accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples.</div><div class='del'>-The result is mixed to mono signal (single channel) and forwarded to</div><div class='del'>-the ??rear?? right DAC PCM slot of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='Wave LFE Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right PCM FX-bus</div><div class='del'>-accumulators. ALSA uses accumulators 0 and 1 for left and right PCM.</div><div class='del'>-The result is mixed to mono signal (single channel) and forwarded to</div><div class='del'>-the ??rear?? left DAC PCM slot of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='Wave Capture Volume',index=0</div><div class='del'>-name='Wave Capture Switch',index=0</div><div class='del'>-</div><div class='del'>-These controls are used to attenuate samples for left and right PCM FX-bus</div><div class='del'>-accumulator. ALSA uses accumulators 0 and 1 for left and right PCM.</div><div class='del'>-The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='del'>-PCM device).</div><div class='del'>-</div><div class='del'>-name='Synth Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right MIDI FX-bus</div><div class='del'>-accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples.</div><div class='del'>-The result samples are forwarded to the front DAC PCM slots of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='Synth Capture Volume',index=0</div><div class='del'>-name='Synth Capture Switch',index=0</div><div class='del'>-</div><div class='del'>-These controls are used to attenuate samples for left and right MIDI FX-bus</div><div class='del'>-accumulator. ALSA uses accumulators 4 and 5 for left and right PCM.</div><div class='del'>-The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='del'>-PCM device).</div><div class='del'>-</div><div class='del'>-name='Surround Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right rear PCM FX-bus</div><div class='del'>-accumulators. ALSA uses accumulators 2 and 3 for left and right rear PCM samples.</div><div class='del'>-The result samples are forwarded to the rear I2S DACs. These DACs operate</div><div class='del'>-separately (they are not inside the AC97 codec).</div><div class='del'>-</div><div class='del'>-name='Surround Capture Volume',index=0</div><div class='del'>-name='Surround Capture Switch',index=0</div><div class='del'>-</div><div class='del'>-These controls are used to attenuate samples for left and right rear PCM FX-bus</div><div class='del'>-accumulators. ALSA uses accumulators 2 and 3 for left and right rear PCM samples.</div><div class='del'>-The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='del'>-PCM device).</div><div class='del'>-</div><div class='del'>-name='Center Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate sample for center PCM FX-bus accumulator.</div><div class='del'>-ALSA uses accumulator 6 for center PCM sample. The result sample is forwarded</div><div class='del'>-to the ??rear?? right DAC PCM slot of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='LFE Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate sample for center PCM FX-bus accumulator.</div><div class='del'>-ALSA uses accumulator 6 for center PCM sample. The result sample is forwarded</div><div class='del'>-to the ??rear?? left DAC PCM slot of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='AC97 Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right front ADC PCM slots</div><div class='del'>-of the AC97 codec. The result samples are forwarded to the front DAC PCM</div><div class='del'>-slots of the AC97 codec.</div><div class='del'>-********************************************************************************</div><div class='del'>-*** Note: This control should be zero for the standard operations, otherwise ***</div><div class='del'>-*** a digital loopback is activated.                                         ***</div><div class='del'>-********************************************************************************</div><div class='del'>-</div><div class='del'>-name='AC97 Capture Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples for left and right front ADC PCM slots</div><div class='del'>-of the AC97 codec. The result is forwarded to the ADC capture FIFO (thus to</div><div class='del'>-the standard capture PCM device).</div><div class='del'>-********************************************************************************</div><div class='del'>-*** Note: This control should be 100 (maximal value), otherwise no analog    ***</div><div class='del'>-*** inputs of the AC97 codec can be captured (recorded).                     ***</div><div class='del'>-********************************************************************************</div><div class='del'>-</div><div class='del'>-name='IEC958 TTL Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right IEC958 TTL</div><div class='del'>-digital inputs (usually used by a CDROM drive). The result samples are</div><div class='del'>-forwarded to the front DAC PCM slots of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='IEC958 TTL Capture Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right IEC958 TTL</div><div class='del'>-digital inputs (usually used by a CDROM drive). The result samples are</div><div class='del'>-forwarded to the ADC capture FIFO (thus to the standard capture PCM device).</div><div class='del'>-</div><div class='del'>-name='Zoom Video Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right zoom video</div><div class='del'>-digital inputs (usually used by a CDROM drive). The result samples are</div><div class='del'>-forwarded to the front DAC PCM slots of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='Zoom Video Capture Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right zoom video</div><div class='del'>-digital inputs (usually used by a CDROM drive). The result samples are</div><div class='del'>-forwarded to the ADC capture FIFO (thus to the standard capture PCM device).</div><div class='del'>-</div><div class='del'>-name='IEC958 LiveDrive Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right IEC958 optical</div><div class='del'>-digital input. The result samples are forwarded to the front DAC PCM slots</div><div class='del'>-of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='IEC958 LiveDrive Capture Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right IEC958 optical</div><div class='del'>-digital inputs. The result samples are forwarded to the ADC capture FIFO</div><div class='del'>-(thus to the standard capture PCM device).</div><div class='del'>-</div><div class='del'>-name='IEC958 Coaxial Playback Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right IEC958 coaxial</div><div class='del'>-digital inputs. The result samples are forwarded to the front DAC PCM slots</div><div class='del'>-of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='IEC958 Coaxial Capture Volume',index=0</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right IEC958 coaxial</div><div class='del'>-digital inputs. The result samples are forwarded to the ADC capture FIFO</div><div class='del'>-(thus to the standard capture PCM device).</div><div class='del'>-</div><div class='del'>-name='Line LiveDrive Playback Volume',index=0</div><div class='del'>-name='Line LiveDrive Playback Volume',index=1</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right I2S ADC</div><div class='del'>-inputs (on the LiveDrive). The result samples are forwarded to the front</div><div class='del'>-DAC PCM slots of the AC97 codec.</div><div class='del'>-</div><div class='del'>-name='Line LiveDrive Capture Volume',index=1</div><div class='del'>-name='Line LiveDrive Capture Volume',index=1</div><div class='del'>-</div><div class='del'>-This control is used to attenuate samples from left and right I2S ADC</div><div class='del'>-inputs (on the LiveDrive). The result samples are forwarded to the ADC</div><div class='del'>-capture FIFO (thus to the standard capture PCM device).</div><div class='del'>-</div><div class='del'>-name='Tone Control - Switch',index=0</div><div class='del'>-</div><div class='del'>-This control turns the tone control on or off. The samples for front, rear</div><div class='del'>-and center / LFE outputs are affected.</div><div class='del'>-</div><div class='del'>-name='Tone Control - Bass',index=0</div><div class='del'>-</div><div class='del'>-This control sets the bass intensity. There is no neutral value!!</div><div class='del'>-When the tone control code is activated, the samples are always modified.</div><div class='del'>-The closest value to pure signal is 20.</div><div class='del'>-</div><div class='del'>-name='Tone Control - Treble',index=0</div><div class='del'>-</div><div class='del'>-This control sets the treble intensity. There is no neutral value!!</div><div class='del'>-When the tone control code is activated, the samples are always modified.</div><div class='del'>-The closest value to pure signal is 20.</div><div class='del'>-</div><div class='del'>-name='IEC958 Optical Raw Playback Switch',index=0</div><div class='del'>-</div><div class='del'>-If this switch is on, then the samples for the IEC958 (S/PDIF) digital</div><div class='del'>-output are taken only from the raw FX8010 PCM, otherwise standard front</div><div class='del'>-PCM samples are taken.</div><div class='del'>-</div><div class='del'>-name='Headphone Playback Volume',index=1</div><div class='del'>-</div><div class='del'>-This control attenuates the samples for the headphone output.</div><div class='del'>-</div><div class='del'>-name='Headphone Center Playback Switch',index=1</div><div class='del'>-</div><div class='del'>-If this switch is on, then the sample for the center PCM is put to the</div><div class='del'>-left headphone output (useful for SB Live cards without separate center/LFE</div><div class='del'>-output).</div><div class='del'>-</div><div class='del'>-name='Headphone LFE Playback Switch',index=1</div><div class='del'>-</div><div class='del'>-If this switch is on, then the sample for the center PCM is put to the</div><div class='del'>-right headphone output (useful for SB Live cards without separate center/LFE</div><div class='del'>-output).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3) PCM stream related controls</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-name='EMU10K1 PCM Volume',index 0-31</div><div class='del'>-</div><div class='del'>-Channel volume attenuation in range 0-0xffff. The maximum value (no</div><div class='del'>-attenuation) is default. The channel mapping for three values is</div><div class='del'>-as follows:</div><div class='del'>-</div><div class='del'>-	0 - mono, default 0xffff (no attenuation)</div><div class='del'>-	1 - left, default 0xffff (no attenuation)</div><div class='del'>-	2 - right, default 0xffff (no attenuation)</div><div class='del'>-</div><div class='del'>-name='EMU10K1 PCM Send Routing',index 0-31</div><div class='del'>-</div><div class='del'>-This control specifies the destination - FX-bus accumulators. There are</div><div class='del'>-twelve values with this mapping:</div><div class='del'>-</div><div class='del'>-	 0 -  mono, A destination (FX-bus 0-15), default 0</div><div class='del'>-	 1 -  mono, B destination (FX-bus 0-15), default 1</div><div class='del'>-	 2 -  mono, C destination (FX-bus 0-15), default 2</div><div class='del'>-	 3 -  mono, D destination (FX-bus 0-15), default 3</div><div class='del'>-	 4 -  left, A destination (FX-bus 0-15), default 0</div><div class='del'>-	 5 -  left, B destination (FX-bus 0-15), default 1</div><div class='del'>-	 6 -  left, C destination (FX-bus 0-15), default 2</div><div class='del'>-	 7 -  left, D destination (FX-bus 0-15), default 3</div><div class='del'>-	 8 - right, A destination (FX-bus 0-15), default 0</div><div class='del'>-	 9 - right, B destination (FX-bus 0-15), default 1</div><div class='del'>-	10 - right, C destination (FX-bus 0-15), default 2</div><div class='del'>-	11 - right, D destination (FX-bus 0-15), default 3</div><div class='del'>-</div><div class='del'>-Don't forget that it's illegal to assign a channel to the same FX-bus accumulator </div><div class='del'>-more than once (it means 0=0 &amp;&amp; 1=0 is an invalid combination).</div><div class='del'>- </div><div class='del'>-name='EMU10K1 PCM Send Volume',index 0-31</div><div class='del'>-</div><div class='del'>-It specifies the attenuation (amount) for given destination in range 0-255.</div><div class='del'>-The channel mapping is following:</div><div class='del'>-</div><div class='del'>-	 0 -  mono, A destination attn, default 255 (no attenuation)</div><div class='del'>-	 1 -  mono, B destination attn, default 255 (no attenuation)</div><div class='del'>-	 2 -  mono, C destination attn, default 0 (mute)</div><div class='del'>-	 3 -  mono, D destination attn, default 0 (mute)</div><div class='del'>-	 4 -  left, A destination attn, default 255 (no attenuation)</div><div class='del'>-	 5 -  left, B destination attn, default 0 (mute)</div><div class='del'>-	 6 -  left, C destination attn, default 0 (mute)</div><div class='del'>-	 7 -  left, D destination attn, default 0 (mute)</div><div class='del'>-	 8 - right, A destination attn, default 0 (mute)</div><div class='del'>-	 9 - right, B destination attn, default 255 (no attenuation)</div><div class='del'>-	10 - right, C destination attn, default 0 (mute)</div><div class='del'>-	11 - right, D destination attn, default 0 (mute)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4) MANUALS/PATENTS:</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-ftp://opensource.creative.com/pub/doc</div><div class='del'>--------------------------------------</div><div class='del'>-</div><div class='del'>-        Files:</div><div class='del'>-        LM4545.pdf      AC97 Codec</div><div class='del'>-</div><div class='del'>-        m2049.pdf       The EMU10K1 Digital Audio Processor</div><div class='del'>-</div><div class='del'>-        hog63.ps        FX8010 - A DSP Chip Architecture for Audio Effects</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-WIPO Patents</div><div class='del'>-------------</div><div class='del'>-        Patent numbers:</div><div class='del'>-        WO 9901813 (A1) Audio Effects Processor with multiple asynchronous (Jan. 14, 1999)</div><div class='del'>-                        streams</div><div class='del'>-</div><div class='del'>-        WO 9901814 (A1) Processor with Instruction Set for Audio Effects (Jan. 14, 1999)</div><div class='del'>-</div><div class='del'>-        WO 9901953 (A1) Audio Effects Processor having Decoupled Instruction</div><div class='del'>-                        Execution and Audio Data Sequencing (Jan. 14, 1999)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-US Patents (http://www.uspto.gov/)</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-        US 5925841      Digital Sampling Instrument employing cache memory (Jul. 20, 1999)</div><div class='del'>-</div><div class='del'>-        US 5928342      Audio Effects Processor integrated on a single chip (Jul. 27, 1999)</div><div class='del'>-                        with a multiport memory onto which multiple asynchronous</div><div class='del'>-                        digital sound samples can be concurrently loaded</div><div class='del'>-</div><div class='del'>-        US 5930158      Processor with Instruction Set for Audio Effects (Jul. 27, 1999)</div><div class='del'>-</div><div class='del'>-        US 6032235      Memory initialization circuit (Tram) (Feb. 29, 2000)</div><div class='del'>-</div><div class='del'>-        US 6138207      Interpolation looping of audio samples in cache connected to    (Oct. 24, 2000)</div><div class='del'>-                        system bus with prioritization and modification of bus transfers</div><div class='del'>-                        in accordance with loop ends and minimum block sizes</div><div class='del'>-</div><div class='del'>-        US 6151670      Method for conserving memory storage using a (Nov. 21, 2000)</div><div class='del'>-                        pool of  short term memory registers</div><div class='del'>-</div><div class='del'>-        US 6195715      Interrupt control for multiple programs communicating with      (Feb. 27, 2001)</div><div class='del'>-                        a common interrupt by associating programs to GP registers,</div><div class='del'>-                        defining interrupt register, polling GP registers, and invoking</div><div class='del'>-                        callback routine associated with defined interrupt register</div><div class='head'>diff --git a/Documentation/sound/alsa/VIA82xx-mixer.txt b/Documentation/sound/alsa/VIA82xx-mixer.txt<br/>deleted file mode 100644<br/>index 1b0ac06ba95d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/VIA82xx-mixer.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/VIA82xx-mixer.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-</div><div class='del'>-				VIA82xx mixer</div><div class='del'>-				=============</div><div class='del'>-</div><div class='del'>-On many VIA82xx boards, the 'Input Source Select' mixer control does not work.</div><div class='del'>-Setting it to 'Input2' on such boards will cause recording to hang, or fail</div><div class='del'>-with EIO (input/output error) via OSS emulation.  This control should be left</div><div class='del'>-at 'Input1' for such cards.</div><div class='head'>diff --git a/Documentation/sound/alsa/alsa-parameters.txt b/Documentation/sound/alsa/alsa-parameters.txt<br/>deleted file mode 100644<br/>index 0fa40679b080..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/alsa-parameters.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/alsa-parameters.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,135 +0,0 @@</div><div class='del'>-                          ALSA Kernel Parameters</div><div class='del'>-                          ~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-</div><div class='del'>-See Documentation/kernel-parameters.txt for general information on</div><div class='del'>-specifying module parameters.</div><div class='del'>-</div><div class='del'>-This document may not be entirely up to date and comprehensive. The command</div><div class='del'>-"modinfo -p ${modulename}" shows a current list of all parameters of a loadable</div><div class='del'>-module. Loadable modules, after being loaded into the running kernel, also</div><div class='del'>-reveal their parameters in /sys/module/${modulename}/parameters/. Some of these</div><div class='del'>-parameters may be changed at runtime by the command</div><div class='del'>-"echo -n ${value} &gt; /sys/module/${modulename}/parameters/${parm}".</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	snd-ad1816a=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-ad1848=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-ali5451=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-als100=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-als4000=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-azt2320=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-cmi8330=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-cmipci=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-cs4231=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-cs4232=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-cs4236=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-cs4281=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-cs46xx=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-dt019x=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-dummy=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-emu10k1=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-ens1370=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-ens1371=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-es968=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-es1688=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-es18xx=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-es1938=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-es1968=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-fm801=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-gusclassic=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-gusextreme=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-gusmax=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-hdsp=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-ice1712=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-intel8x0=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-interwave=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-interwave-stb=</div><div class='del'>-			[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-korg1212=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-maestro3=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-mpu401=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-mtpav=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-nm256=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-opl3sa2=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-opti92x-ad1848=</div><div class='del'>-			[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-opti92x-cs4231=</div><div class='del'>-			[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-opti93x=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-pmac=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-rme32=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-rme96=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-rme9652=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-sb8=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-sb16=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-sbawe=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-serial=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-sgalaxy=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-sonicvibes=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-sun-amd7930=</div><div class='del'>-			[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-sun-cs4231=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-trident=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-usb-audio=	[HW,ALSA,USB]</div><div class='del'>-</div><div class='del'>-	snd-via82xx=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-virmidi=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-wavefront=	[HW,ALSA]</div><div class='del'>-</div><div class='del'>-	snd-ymfpci=	[HW,ALSA]</div><div class='head'>diff --git a/Documentation/sound/alsa/compress_offload.txt b/Documentation/sound/alsa/compress_offload.txt<br/>deleted file mode 100644<br/>index 8ba556a131c3..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/compress_offload.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/compress_offload.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,234 +0,0 @@</div><div class='del'>-		compress_offload.txt</div><div class='del'>-		=====================</div><div class='del'>-	Pierre-Louis.Bossart &lt;pierre-louis.bossart@linux.intel.com&gt;</div><div class='del'>-		Vinod Koul &lt;vinod.koul@linux.intel.com&gt;</div><div class='del'>-</div><div class='del'>-Overview</div><div class='del'>-</div><div class='del'>-Since its early days, the ALSA API was defined with PCM support or</div><div class='del'>-constant bitrates payloads such as IEC61937 in mind. Arguments and</div><div class='del'>-returned values in frames are the norm, making it a challenge to</div><div class='del'>-extend the existing API to compressed data streams.</div><div class='del'>-</div><div class='del'>-In recent years, audio digital signal processors (DSP) were integrated</div><div class='del'>-in system-on-chip designs, and DSPs are also integrated in audio</div><div class='del'>-codecs. Processing compressed data on such DSPs results in a dramatic</div><div class='del'>-reduction of power consumption compared to host-based</div><div class='del'>-processing. Support for such hardware has not been very good in Linux,</div><div class='del'>-mostly because of a lack of a generic API available in the mainline</div><div class='del'>-kernel.</div><div class='del'>-</div><div class='del'>-Rather than requiring a compatibility break with an API change of the</div><div class='del'>-ALSA PCM interface, a new 'Compressed Data' API is introduced to</div><div class='del'>-provide a control and data-streaming interface for audio DSPs.</div><div class='del'>-</div><div class='del'>-The design of this API was inspired by the 2-year experience with the</div><div class='del'>-Intel Moorestown SOC, with many corrections required to upstream the</div><div class='del'>-API in the mainline kernel instead of the staging tree and make it</div><div class='del'>-usable by others.</div><div class='del'>-</div><div class='del'>-Requirements</div><div class='del'>-</div><div class='del'>-The main requirements are:</div><div class='del'>-</div><div class='del'>-- separation between byte counts and time. Compressed formats may have</div><div class='del'>-  a header per file, per frame, or no header at all. The payload size</div><div class='del'>-  may vary from frame-to-frame. As a result, it is not possible to</div><div class='del'>-  estimate reliably the duration of audio buffers when handling</div><div class='del'>-  compressed data. Dedicated mechanisms are required to allow for</div><div class='del'>-  reliable audio-video synchronization, which requires precise</div><div class='del'>-  reporting of the number of samples rendered at any given time.</div><div class='del'>-</div><div class='del'>-- Handling of multiple formats. PCM data only requires a specification</div><div class='del'>-  of the sampling rate, number of channels and bits per sample. In</div><div class='del'>-  contrast, compressed data comes in a variety of formats. Audio DSPs</div><div class='del'>-  may also provide support for a limited number of audio encoders and</div><div class='del'>-  decoders embedded in firmware, or may support more choices through</div><div class='del'>-  dynamic download of libraries.</div><div class='del'>-</div><div class='del'>-- Focus on main formats. This API provides support for the most</div><div class='del'>-  popular formats used for audio and video capture and playback. It is</div><div class='del'>-  likely that as audio compression technology advances, new formats</div><div class='del'>-  will be added.</div><div class='del'>-</div><div class='del'>-- Handling of multiple configurations. Even for a given format like</div><div class='del'>-  AAC, some implementations may support AAC multichannel but HE-AAC</div><div class='del'>-  stereo. Likewise WMA10 level M3 may require too much memory and cpu</div><div class='del'>-  cycles. The new API needs to provide a generic way of listing these</div><div class='del'>-  formats.</div><div class='del'>-</div><div class='del'>-- Rendering/Grabbing only. This API does not provide any means of</div><div class='del'>-  hardware acceleration, where PCM samples are provided back to</div><div class='del'>-  user-space for additional processing. This API focuses instead on</div><div class='del'>-  streaming compressed data to a DSP, with the assumption that the</div><div class='del'>-  decoded samples are routed to a physical output or logical back-end.</div><div class='del'>-</div><div class='del'>- - Complexity hiding. Existing user-space multimedia frameworks all</div><div class='del'>-  have existing enums/structures for each compressed format. This new</div><div class='del'>-  API assumes the existence of a platform-specific compatibility layer</div><div class='del'>-  to expose, translate and make use of the capabilities of the audio</div><div class='del'>-  DSP, eg. Android HAL or PulseAudio sinks. By construction, regular</div><div class='del'>-  applications are not supposed to make use of this API.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Design</div><div class='del'>-</div><div class='del'>-The new API shares a number of concepts with the PCM API for flow</div><div class='del'>-control. Start, pause, resume, drain and stop commands have the same</div><div class='del'>-semantics no matter what the content is.</div><div class='del'>-</div><div class='del'>-The concept of memory ring buffer divided in a set of fragments is</div><div class='del'>-borrowed from the ALSA PCM API. However, only sizes in bytes can be</div><div class='del'>-specified.</div><div class='del'>-</div><div class='del'>-Seeks/trick modes are assumed to be handled by the host.</div><div class='del'>-</div><div class='del'>-The notion of rewinds/forwards is not supported. Data committed to the</div><div class='del'>-ring buffer cannot be invalidated, except when dropping all buffers.</div><div class='del'>-</div><div class='del'>-The Compressed Data API does not make any assumptions on how the data</div><div class='del'>-is transmitted to the audio DSP. DMA transfers from main memory to an</div><div class='del'>-embedded audio cluster or to a SPI interface for external DSPs are</div><div class='del'>-possible. As in the ALSA PCM case, a core set of routines is exposed;</div><div class='del'>-each driver implementer will have to write support for a set of</div><div class='del'>-mandatory routines and possibly make use of optional ones.</div><div class='del'>-</div><div class='del'>-The main additions are</div><div class='del'>-</div><div class='del'>-- get_caps</div><div class='del'>-This routine returns the list of audio formats supported. Querying the</div><div class='del'>-codecs on a capture stream will return encoders, decoders will be</div><div class='del'>-listed for playback streams.</div><div class='del'>-</div><div class='del'>-- get_codec_caps For each codec, this routine returns a list of</div><div class='del'>-capabilities. The intent is to make sure all the capabilities</div><div class='del'>-correspond to valid settings, and to minimize the risks of</div><div class='del'>-configuration failures. For example, for a complex codec such as AAC,</div><div class='del'>-the number of channels supported may depend on a specific profile. If</div><div class='del'>-the capabilities were exposed with a single descriptor, it may happen</div><div class='del'>-that a specific combination of profiles/channels/formats may not be</div><div class='del'>-supported. Likewise, embedded DSPs have limited memory and cpu cycles,</div><div class='del'>-it is likely that some implementations make the list of capabilities</div><div class='del'>-dynamic and dependent on existing workloads. In addition to codec</div><div class='del'>-settings, this routine returns the minimum buffer size handled by the</div><div class='del'>-implementation. This information can be a function of the DMA buffer</div><div class='del'>-sizes, the number of bytes required to synchronize, etc, and can be</div><div class='del'>-used by userspace to define how much needs to be written in the ring</div><div class='del'>-buffer before playback can start.</div><div class='del'>-</div><div class='del'>-- set_params</div><div class='del'>-This routine sets the configuration chosen for a specific codec. The</div><div class='del'>-most important field in the parameters is the codec type; in most</div><div class='del'>-cases decoders will ignore other fields, while encoders will strictly</div><div class='del'>-comply to the settings</div><div class='del'>-</div><div class='del'>-- get_params</div><div class='del'>-This routines returns the actual settings used by the DSP. Changes to</div><div class='del'>-the settings should remain the exception.</div><div class='del'>-</div><div class='del'>-- get_timestamp</div><div class='del'>-The timestamp becomes a multiple field structure. It lists the number</div><div class='del'>-of bytes transferred, the number of samples processed and the number</div><div class='del'>-of samples rendered/grabbed. All these values can be used to determine</div><div class='del'>-the average bitrate, figure out if the ring buffer needs to be</div><div class='del'>-refilled or the delay due to decoding/encoding/io on the DSP.</div><div class='del'>-</div><div class='del'>-Note that the list of codecs/profiles/modes was derived from the</div><div class='del'>-OpenMAX AL specification instead of reinventing the wheel.</div><div class='del'>-Modifications include:</div><div class='del'>-- Addition of FLAC and IEC formats</div><div class='del'>-- Merge of encoder/decoder capabilities</div><div class='del'>-- Profiles/modes listed as bitmasks to make descriptors more compact</div><div class='del'>-- Addition of set_params for decoders (missing in OpenMAX AL)</div><div class='del'>-- Addition of AMR/AMR-WB encoding modes (missing in OpenMAX AL)</div><div class='del'>-- Addition of format information for WMA</div><div class='del'>-- Addition of encoding options when required (derived from OpenMAX IL)</div><div class='del'>-- Addition of rateControlSupported (missing in OpenMAX AL)</div><div class='del'>-</div><div class='del'>-Gapless Playback</div><div class='del'>-================</div><div class='del'>-When playing thru an album, the decoders have the ability to skip the encoder</div><div class='del'>-delay and padding and directly move from one track content to another. The end</div><div class='del'>-user can perceive this as gapless playback as we don't have silence while</div><div class='del'>-switching from one track to another</div><div class='del'>-</div><div class='del'>-Also, there might be low-intensity noises due to encoding. Perfect gapless is</div><div class='del'>-difficult to reach with all types of compressed data, but works fine with most</div><div class='del'>-music content. The decoder needs to know the encoder delay and encoder padding.</div><div class='del'>-So we need to pass this to DSP. This metadata is extracted from ID3/MP4 headers</div><div class='del'>-and are not present by default in the bitstream, hence the need for a new</div><div class='del'>-interface to pass this information to the DSP. Also DSP and userspace needs to</div><div class='del'>-switch from one track to another and start using data for second track.</div><div class='del'>-</div><div class='del'>-The main additions are:</div><div class='del'>-</div><div class='del'>-- set_metadata</div><div class='del'>-This routine sets the encoder delay and encoder padding. This can be used by</div><div class='del'>-decoder to strip the silence. This needs to be set before the data in the track</div><div class='del'>-is written.</div><div class='del'>-</div><div class='del'>-- set_next_track</div><div class='del'>-This routine tells DSP that metadata and write operation sent after this would</div><div class='del'>-correspond to subsequent track</div><div class='del'>-</div><div class='del'>-- partial drain</div><div class='del'>-This is called when end of file is reached. The userspace can inform DSP that</div><div class='del'>-EOF is reached and now DSP can start skipping padding delay. Also next write</div><div class='del'>-data would belong to next track</div><div class='del'>-</div><div class='del'>-Sequence flow for gapless would be:</div><div class='del'>-- Open</div><div class='del'>-- Get caps / codec caps</div><div class='del'>-- Set params</div><div class='del'>-- Set metadata of the first track</div><div class='del'>-- Fill data of the first track</div><div class='del'>-- Trigger start</div><div class='del'>-- User-space finished sending all,</div><div class='del'>-- Indicate next track data by sending set_next_track</div><div class='del'>-- Set metadata of the next track</div><div class='del'>-- then call partial_drain to flush most of buffer in DSP</div><div class='del'>-- Fill data of the next track</div><div class='del'>-- DSP switches to second track</div><div class='del'>-(note: order for partial_drain and write for next track can be reversed as well)</div><div class='del'>-</div><div class='del'>-Not supported:</div><div class='del'>-</div><div class='del'>-- Support for VoIP/circuit-switched calls is not the target of this</div><div class='del'>-  API. Support for dynamic bit-rate changes would require a tight</div><div class='del'>-  coupling between the DSP and the host stack, limiting power savings.</div><div class='del'>-</div><div class='del'>-- Packet-loss concealment is not supported. This would require an</div><div class='del'>-  additional interface to let the decoder synthesize data when frames</div><div class='del'>-  are lost during transmission. This may be added in the future.</div><div class='del'>-</div><div class='del'>-- Volume control/routing is not handled by this API. Devices exposing a</div><div class='del'>-  compressed data interface will be considered as regular ALSA devices;</div><div class='del'>-  volume changes and routing information will be provided with regular</div><div class='del'>-  ALSA kcontrols.</div><div class='del'>-</div><div class='del'>-- Embedded audio effects. Such effects should be enabled in the same</div><div class='del'>-  manner, no matter if the input was PCM or compressed.</div><div class='del'>-</div><div class='del'>-- multichannel IEC encoding. Unclear if this is required.</div><div class='del'>-</div><div class='del'>-- Encoding/decoding acceleration is not supported as mentioned</div><div class='del'>-  above. It is possible to route the output of a decoder to a capture</div><div class='del'>-  stream, or even implement transcoding capabilities. This routing</div><div class='del'>-  would be enabled with ALSA kcontrols.</div><div class='del'>-</div><div class='del'>-- Audio policy/resource management. This API does not provide any</div><div class='del'>-  hooks to query the utilization of the audio DSP, nor any preemption</div><div class='del'>-  mechanisms.</div><div class='del'>-</div><div class='del'>-- No notion of underrun/overrun. Since the bytes written are compressed</div><div class='del'>-  in nature and data written/read doesn't translate directly to</div><div class='del'>-  rendered output in time, this does not deal with underrun/overrun and</div><div class='del'>-  maybe dealt in user-library</div><div class='del'>-</div><div class='del'>-Credits:</div><div class='del'>-- Mark Brown and Liam Girdwood for discussions on the need for this API</div><div class='del'>-- Harsha Priya for her work on intel_sst compressed API</div><div class='del'>-- Rakesh Ughreja for valuable feedback</div><div class='del'>-- Sing Nallasellan, Sikkandar Madar and Prasanna Samaga for</div><div class='del'>-  demonstrating and quantifying the benefits of audio offload on a</div><div class='del'>-  real platform.</div><div class='head'>diff --git a/Documentation/sound/alsa/emu10k1-jack.txt b/Documentation/sound/alsa/emu10k1-jack.txt<br/>deleted file mode 100644<br/>index 751d45036a05..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/emu10k1-jack.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/emu10k1-jack.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-This document is a guide to using the emu10k1 based devices with JACK for low</div><div class='del'>-latency, multichannel recording functionality.  All of my recent work to allow</div><div class='del'>-Linux users to use the full capabilities of their hardware has been inspired </div><div class='del'>-by the kX Project.  Without their work I never would have discovered the true</div><div class='del'>-power of this hardware.</div><div class='del'>-</div><div class='del'>-	http://www.kxproject.com</div><div class='del'>-						- Lee Revell, 2005.03.30</div><div class='del'>-</div><div class='del'>-Low latency, multichannel audio with JACK and the emu10k1/emu10k2</div><div class='del'>------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-Until recently, emu10k1 users on Linux did not have access to the same low</div><div class='del'>-latency, multichannel features offered by the "kX ASIO" feature of their</div><div class='del'>-Windows driver.  As of ALSA 1.0.9 this is no more!</div><div class='del'>-</div><div class='del'>-For those unfamiliar with kX ASIO, this consists of 16 capture and 16 playback</div><div class='del'>-channels.  With a post 2.6.9 Linux kernel, latencies down to 64 (1.33 ms) or</div><div class='del'>-even 32 (0.66ms) frames should work well.</div><div class='del'>-</div><div class='del'>-The configuration is slightly more involved than on Windows, as you have to</div><div class='del'>-select the correct device for JACK to use.  Actually, for qjackctl users it's</div><div class='del'>-fairly self explanatory - select Duplex, then for capture and playback select</div><div class='del'>-the multichannel devices, set the in and out channels to 16, and the sample</div><div class='del'>-rate to 48000Hz.  The command line looks like this:</div><div class='del'>-</div><div class='del'>-/usr/local/bin/jackd -R -dalsa -r48000 -p64 -n2 -D -Chw:0,2 -Phw:0,3 -S</div><div class='del'>-</div><div class='del'>-This will give you 16 input ports and 16 output ports.</div><div class='del'>-</div><div class='del'>-The 16 output ports map onto the 16 FX buses (or the first 16 of 64, for the</div><div class='del'>-Audigy).  The mapping from FX bus to physical output is described in</div><div class='del'>-SB-Live-mixer.txt (or Audigy-mixer.txt).</div><div class='del'>-</div><div class='del'>-The 16 input ports are connected to the 16 physical inputs.  Contrary to</div><div class='del'>-popular belief, all emu10k1 cards are multichannel cards.  Which of these</div><div class='del'>-input channels have physical inputs connected to them depends on the card</div><div class='del'>-model.  Trial and error is highly recommended; the pinout diagrams</div><div class='del'>-for the card have been reverse engineered by some enterprising kX users and are </div><div class='del'>-available on the internet.  Meterbridge is helpful here, and the kX forums are</div><div class='del'>-packed with useful information.</div><div class='del'>-</div><div class='del'>-Each input port will either correspond to a digital (SPDIF) input, an analog</div><div class='del'>-input, or nothing.  The one exception is the SBLive! 5.1.  On these devices,</div><div class='del'>-the second and third input ports are wired to the center/LFE output.  You will</div><div class='del'>-still see 16 capture channels, but only 14 are available for recording inputs.</div><div class='del'>-</div><div class='del'>-This chart, borrowed from kxfxlib/da_asio51.cpp, describes the mapping of JACK</div><div class='del'>-ports to FXBUS2 (multitrack recording input) and EXTOUT (physical output)</div><div class='del'>-channels.</div><div class='del'>-</div><div class='del'>-/*JACK (&amp; ASIO) mappings on 10k1 5.1 SBLive cards:</div><div class='del'>---------------------------------------------</div><div class='del'>-JACK		Epilog		FXBUS2(nr)</div><div class='del'>---------------------------------------------</div><div class='del'>-capture_1	asio14		FXBUS2(0xe)</div><div class='del'>-capture_2	asio15		FXBUS2(0xf)</div><div class='del'>-capture_3	asio0		FXBUS2(0x0)	</div><div class='del'>-~capture_4	Center		EXTOUT(0x11)	// mapped to by Center</div><div class='del'>-~capture_5	LFE		EXTOUT(0x12)	// mapped to by LFE</div><div class='del'>-capture_6	asio3		FXBUS2(0x3)</div><div class='del'>-capture_7	asio4		FXBUS2(0x4)</div><div class='del'>-capture_8	asio5		FXBUS2(0x5)</div><div class='del'>-capture_9	asio6		FXBUS2(0x6)</div><div class='del'>-capture_10	asio7		FXBUS2(0x7)</div><div class='del'>-capture_11	asio8		FXBUS2(0x8)</div><div class='del'>-capture_12	asio9		FXBUS2(0x9)</div><div class='del'>-capture_13	asio10		FXBUS2(0xa)</div><div class='del'>-capture_14	asio11		FXBUS2(0xb)</div><div class='del'>-capture_15	asio12		FXBUS2(0xc)</div><div class='del'>-capture_16	asio13		FXBUS2(0xd)</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-TODO: describe use of ld10k1/qlo10k1 in conjunction with JACK</div><div class='head'>diff --git a/Documentation/sound/alsa/hdspm.txt b/Documentation/sound/alsa/hdspm.txt<br/>deleted file mode 100644<br/>index 7ba31948dea7..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/hdspm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/hdspm.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,362 +0,0 @@</div><div class='del'>-Software Interface ALSA-DSP MADI Driver </div><div class='del'>-</div><div class='del'>-(translated from German, so no good English ;-), </div><div class='del'>-2004 - winfried ritsch</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- Full functionality has been added to the driver. Since some of</div><div class='del'>- the Controls and startup-options  are ALSA-Standard and only the</div><div class='del'>- special Controls are described and discussed below.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- hardware functionality:</div><div class='del'>-</div><div class='del'>-   </div><div class='del'>-   Audio transmission:</div><div class='del'>-</div><div class='del'>-     number of channels --  depends on transmission mode</div><div class='del'>-</div><div class='del'>-		The number of channels chosen is from 1..Nmax. The reason to</div><div class='del'>-		use for a lower number of channels is only resource allocation,</div><div class='del'>-		since unused DMA channels are disabled and less memory is</div><div class='del'>-		allocated. So also the throughput of the PCI system can be</div><div class='del'>-		scaled. (Only important for low performance boards).</div><div class='del'>-</div><div class='del'>-       Single Speed -- 1..64 channels </div><div class='del'>-</div><div class='del'>-		 (Note: Choosing the 56channel mode for transmission or as</div><div class='del'>-		 receiver, only 56 are transmitted/received over the MADI, but</div><div class='del'>-		 all 64 channels are available for the mixer, so channel count</div><div class='del'>-		 for the driver)</div><div class='del'>-</div><div class='del'>-       Double Speed -- 1..32 channels</div><div class='del'>-</div><div class='del'>-		 Note: Choosing the 56-channel mode for</div><div class='del'>-		 transmission/receive-mode , only 28 are transmitted/received</div><div class='del'>-		 over the MADI, but all 32 channels are available for the mixer,</div><div class='del'>-		 so channel count for the driver</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-       Quad Speed -- 1..16 channels </div><div class='del'>-</div><div class='del'>-		 Note: Choosing the 56-channel mode for</div><div class='del'>-		 transmission/receive-mode , only 14 are transmitted/received</div><div class='del'>-		 over the MADI, but all 16 channels are available for the mixer,</div><div class='del'>-		 so channel count for the driver</div><div class='del'>-</div><div class='del'>-     Format -- signed 32 Bit Little Endian (SNDRV_PCM_FMTBIT_S32_LE)</div><div class='del'>-</div><div class='del'>-     Sample Rates --</div><div class='del'>-</div><div class='del'>-       Single Speed -- 32000, 44100, 48000</div><div class='del'>-</div><div class='del'>-       Double Speed -- 64000, 88200, 96000 (untested)</div><div class='del'>-</div><div class='del'>-       Quad Speed -- 128000, 176400, 192000 (untested)</div><div class='del'>-</div><div class='del'>-     access-mode -- MMAP (memory mapped), Not interleaved</div><div class='del'>-     (PCM_NON-INTERLEAVED)</div><div class='del'>-</div><div class='del'>-     buffer-sizes -- 64,128,256,512,1024,2048,8192 Samples</div><div class='del'>-</div><div class='del'>-     fragments -- 2</div><div class='del'>-</div><div class='del'>-     Hardware-pointer -- 2 Modi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		 The Card supports the readout of the actual Buffer-pointer,</div><div class='del'>-		 where DMA reads/writes. Since of the bulk mode of PCI it is only</div><div class='del'>-		 64 Byte accurate. SO it is not really usable for the</div><div class='del'>-		 ALSA-mid-level functions (here the buffer-ID gives a better</div><div class='del'>-		 result), but if MMAP is used by the application. Therefore it</div><div class='del'>-		 can be configured at load-time with the parameter</div><div class='del'>-		 precise-pointer.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		 (Hint: Experimenting I found that the pointer is maximum 64 to</div><div class='del'>-		 large never to small. So if you subtract 64 you always have a</div><div class='del'>-		 safe pointer for writing, which is used on this mode inside</div><div class='del'>-		 ALSA. In theory now you can get now a latency as low as 16</div><div class='del'>-		 Samples, which is a quarter of the interrupt possibilities.)</div><div class='del'>-</div><div class='del'>-       Precise Pointer -- off</div><div class='del'>-					interrupt used for pointer-calculation</div><div class='del'>-</div><div class='del'>-       Precise Pointer -- on</div><div class='del'>-					hardware pointer used.</div><div class='del'>-</div><div class='del'>-   Controller:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  Since DSP-MADI-Mixer has 8152 Fader, it does not make sense to</div><div class='del'>-	  use the standard mixer-controls, since this would break most of</div><div class='del'>-	  (especially graphic) ALSA-Mixer GUIs. So Mixer control has be</div><div class='del'>-	  provided by a 2-dimensional controller using the</div><div class='del'>-	  hwdep-interface. </div><div class='del'>-</div><div class='del'>-     Also all 128+256 Peak and RMS-Meter can be accessed via the</div><div class='del'>-     hwdep-interface. Since it could be a performance problem always</div><div class='del'>-     copying and converting Peak and RMS-Levels even if you just need</div><div class='del'>-     one, I decided to export the hardware structure, so that of</div><div class='del'>-     needed some driver-guru can implement a memory-mapping of mixer</div><div class='del'>-     or peak-meters over ioctl, or also to do only copying and no</div><div class='del'>-     conversion. A test-application shows the usage of the controller.</div><div class='del'>-</div><div class='del'>-    Latency Controls --- not implemented !!!</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	   Note: Within the windows-driver the latency is accessible of a</div><div class='del'>-	   control-panel, but buffer-sizes are controlled with ALSA from</div><div class='del'>-	   hwparams-calls and should not be changed in run-state, I did not</div><div class='del'>-	   implement it here.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    System Clock -- suspended !!!!</div><div class='del'>-</div><div class='del'>-        Name -- "System Clock Mode"</div><div class='del'>-</div><div class='del'>-        Access -- Read Write</div><div class='del'>-</div><div class='del'>-        Values -- "Master" "Slave"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		  !!!! This is a hardware-function but is in conflict with the</div><div class='del'>-		  Clock-source controller, which is a kind of ALSA-standard. I</div><div class='del'>-		  makes sense to set the card to a special mode (master at some</div><div class='del'>-		  frequency or slave), since even not using an Audio-application</div><div class='del'>-		  a studio should have working synchronisations setup. So use</div><div class='del'>-		  Clock-source-controller instead !!!!</div><div class='del'>-</div><div class='del'>-    Clock Source  </div><div class='del'>-</div><div class='del'>-       Name -- "Sample Clock Source"</div><div class='del'>-</div><div class='del'>-       Access -- Read Write</div><div class='del'>-</div><div class='del'>-       Values -- "AutoSync", "Internal 32.0 kHz", "Internal 44.1 kHz",</div><div class='del'>-       "Internal 48.0 kHz", "Internal 64.0 kHz", "Internal 88.2 kHz",</div><div class='del'>-       "Internal 96.0 kHz"</div><div class='del'>-</div><div class='del'>-		 Choose between Master at a specific Frequency and so also the</div><div class='del'>-		 Speed-mode or Slave (Autosync). Also see  "Preferred Sync Ref"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-       !!!! This is no pure hardware function but was implemented by</div><div class='del'>-       ALSA by some ALSA-drivers before, so I use it also. !!!</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    Preferred Sync Ref</div><div class='del'>-</div><div class='del'>-       Name -- "Preferred Sync Reference"</div><div class='del'>-</div><div class='del'>-       Access -- Read Write</div><div class='del'>-</div><div class='del'>-       Values -- "Word" "MADI"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		 Within the Auto-sync-Mode the preferred Sync Source can be</div><div class='del'>-		 chosen. If it is not available another is used if possible.</div><div class='del'>-</div><div class='del'>-		 Note: Since MADI has a much higher bit-rate than word-clock, the</div><div class='del'>-		 card should synchronise better in MADI Mode. But since the</div><div class='del'>-		 RME-PLL is very good, there are almost no problems with</div><div class='del'>-		 word-clock too. I never found a difference.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    TX 64 channel --- </div><div class='del'>-</div><div class='del'>-       Name -- "TX 64 channels mode"</div><div class='del'>-</div><div class='del'>-       Access -- Read Write</div><div class='del'>-</div><div class='del'>-       Values -- 0 1</div><div class='del'>-</div><div class='del'>-		 Using 64-channel-modus (1) or 56-channel-modus for</div><div class='del'>-		 MADI-transmission (0).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		 Note: This control is for output only. Input-mode is detected</div><div class='del'>-		 automatically from hardware sending MADI.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    Clear TMS ---</div><div class='del'>-</div><div class='del'>-       Name -- "Clear Track Marker"</div><div class='del'>-</div><div class='del'>-       Access -- Read Write</div><div class='del'>-</div><div class='del'>-       Values -- 0 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		 Don't use to lower 5 Audio-bits on AES as additional Bits.</div><div class='del'>-        </div><div class='del'>-</div><div class='del'>-    Safe Mode oder Auto Input --- </div><div class='del'>-</div><div class='del'>-       Name -- "Safe Mode"</div><div class='del'>-</div><div class='del'>-       Access -- Read Write</div><div class='del'>-</div><div class='del'>-       Values -- 0 1</div><div class='del'>-</div><div class='del'>-       (default on)</div><div class='del'>-</div><div class='del'>-		 If on (1), then if either the optical or coaxial connection</div><div class='del'>-		 has a failure, there is a takeover to the working one, with no</div><div class='del'>-		 sample failure. Its only useful if you use the second as a</div><div class='del'>-		 backup connection.</div><div class='del'>-</div><div class='del'>-    Input --- </div><div class='del'>-</div><div class='del'>-       Name -- "Input Select"</div><div class='del'>-</div><div class='del'>-       Access -- Read Write</div><div class='del'>-</div><div class='del'>-       Values -- optical coaxial</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		 Choosing the Input, optical or coaxial. If Safe-mode is active,</div><div class='del'>-		 this is the preferred Input.</div><div class='del'>-</div><div class='del'>--------------- Mixer ----------------------</div><div class='del'>-</div><div class='del'>-    Mixer</div><div class='del'>-</div><div class='del'>-       Name -- "Mixer"</div><div class='del'>-</div><div class='del'>-       Access -- Read Write</div><div class='del'>-</div><div class='del'>-       Values - &lt;channel-number 0-127&gt; &lt;Value 0-65535&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		 Here as a first value the channel-index is taken to get/set the</div><div class='del'>-		 corresponding mixer channel, where 0-63 are the input to output</div><div class='del'>-		 fader and 64-127 the playback to outputs fader. Value 0</div><div class='del'>-		 is channel muted 0 and 32768 an amplification of  1.</div><div class='del'>-</div><div class='del'>-    Chn 1-64</div><div class='del'>-</div><div class='del'>-       fast mixer for the ALSA-mixer utils. The diagonal of the</div><div class='del'>-       mixer-matrix is implemented from playback to output.</div><div class='del'>-       </div><div class='del'>-</div><div class='del'>-    Line Out</div><div class='del'>-</div><div class='del'>-       Name  -- "Line Out"</div><div class='del'>-</div><div class='del'>-       Access -- Read Write</div><div class='del'>-</div><div class='del'>-       Values -- 0 1</div><div class='del'>-</div><div class='del'>-		 Switching on and off the analog out, which has nothing to do</div><div class='del'>-		 with mixing or routing. the analog outs reflects channel 63,64.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>---- information (only read access):</div><div class='del'>- </div><div class='del'>-    Sample Rate</div><div class='del'>-</div><div class='del'>-       Name -- "System Sample Rate"</div><div class='del'>-</div><div class='del'>-       Access -- Read-only</div><div class='del'>-</div><div class='del'>-		 getting the sample rate.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    External Rate measured</div><div class='del'>-</div><div class='del'>-       Name -- "External Rate"</div><div class='del'>-</div><div class='del'>-       Access -- Read only</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		 Should be "Autosync Rate", but Name used is</div><div class='del'>-		 ALSA-Scheme. External Sample frequency liked used on Autosync is</div><div class='del'>-		 reported.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    MADI Sync Status</div><div class='del'>-</div><div class='del'>-       Name -- "MADI Sync Lock Status"</div><div class='del'>-</div><div class='del'>-       Access -- Read</div><div class='del'>-</div><div class='del'>-       Values -- 0,1,2</div><div class='del'>-</div><div class='del'>-       MADI-Input is 0=Unlocked, 1=Locked, or 2=Synced.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    Word Clock Sync Status</div><div class='del'>-</div><div class='del'>-       Name -- "Word Clock Lock Status"</div><div class='del'>-</div><div class='del'>-       Access -- Read</div><div class='del'>-</div><div class='del'>-       Values -- 0,1,2</div><div class='del'>-</div><div class='del'>-       Word Clock Input is 0=Unlocked, 1=Locked, or 2=Synced.</div><div class='del'>-</div><div class='del'>-    AutoSync</div><div class='del'>-</div><div class='del'>-       Name -- "AutoSync Reference"</div><div class='del'>-</div><div class='del'>-       Access -- Read</div><div class='del'>-</div><div class='del'>-       Values -- "WordClock", "MADI", "None"</div><div class='del'>-</div><div class='del'>-		 Sync-Reference is either "WordClock", "MADI" or none.</div><div class='del'>-</div><div class='del'>-   RX 64ch --- noch nicht implementiert</div><div class='del'>-</div><div class='del'>-       MADI-Receiver is in 64 channel mode oder 56 channel mode.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   AB_inp   --- not tested </div><div class='del'>-</div><div class='del'>-		 Used input for Auto-Input.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   actual Buffer Position --- not implemented</div><div class='del'>-</div><div class='del'>-	   !!! this is a ALSA internal function, so no control is used !!!</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Calling Parameter:</div><div class='del'>-</div><div class='del'>-   index int array (min = 1, max = 8), </div><div class='del'>-     "Index value for RME HDSPM interface." card-index within ALSA</div><div class='del'>-</div><div class='del'>-     note: ALSA-standard</div><div class='del'>-</div><div class='del'>-   id string array (min = 1, max = 8), </div><div class='del'>-     "ID string for RME HDSPM interface."</div><div class='del'>-</div><div class='del'>-     note: ALSA-standard</div><div class='del'>-</div><div class='del'>-   enable int array (min = 1, max = 8), </div><div class='del'>-     "Enable/disable specific HDSPM sound-cards."</div><div class='del'>-</div><div class='del'>-     note: ALSA-standard</div><div class='del'>-</div><div class='del'>-   precise_ptr int array (min = 1, max = 8), </div><div class='del'>-     "Enable precise pointer, or disable."</div><div class='del'>-</div><div class='del'>-     note: Use only when the application supports this (which is a special case).</div><div class='del'>-</div><div class='del'>-   line_outs_monitor int array (min = 1, max = 8), </div><div class='del'>-     "Send playback streams to analog outs by default."</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  note: each playback channel is mixed to the same numbered output</div><div class='del'>-	  channel (routed). This is against the ALSA-convention, where all</div><div class='del'>-	  channels have to be muted on after loading the driver, but was</div><div class='del'>-	  used before on other cards, so i historically use it again)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   enable_monitor int array (min = 1, max = 8), </div><div class='del'>-     "Enable Analog Out on Channel 63/64 by default."</div><div class='del'>-</div><div class='del'>-      note: here the analog output is enabled (but not routed).</div><div class='head'>diff --git a/Documentation/sound/alsa/img,spdif-in.txt b/Documentation/sound/alsa/img,spdif-in.txt<br/>deleted file mode 100644<br/>index 8b7505785fa6..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/img,spdif-in.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/img,spdif-in.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +0,0 @@</div><div class='del'>-The Imagination Technologies SPDIF Input controller contains the following</div><div class='del'>-controls:</div><div class='del'>-</div><div class='del'>-name='IEC958 Capture Mask',index=0</div><div class='del'>-</div><div class='del'>-This control returns a mask that shows which of the IEC958 status bits</div><div class='del'>-can be read using the 'IEC958 Capture Default' control.</div><div class='del'>-</div><div class='del'>-name='IEC958 Capture Default',index=0</div><div class='del'>-</div><div class='del'>-This control returns the status bits contained within the SPDIF stream that</div><div class='del'>-is being received. The 'IEC958 Capture Mask' shows which bits can be read</div><div class='del'>-from this control.</div><div class='del'>-</div><div class='del'>-name='SPDIF In Multi Frequency Acquire',index=0</div><div class='del'>-name='SPDIF In Multi Frequency Acquire',index=1</div><div class='del'>-name='SPDIF In Multi Frequency Acquire',index=2</div><div class='del'>-name='SPDIF In Multi Frequency Acquire',index=3</div><div class='del'>-</div><div class='del'>-This control is used to attempt acquisition of up to four different sample</div><div class='del'>-rates. The active rate can be obtained by reading the 'SPDIF In Lock Frequency'</div><div class='del'>-control.</div><div class='del'>-</div><div class='del'>-When the value of this control is set to {0,0,0,0}, the rate given to hw_params</div><div class='del'>-will determine the single rate the block will capture. Else, the rate given to</div><div class='del'>-hw_params will be ignored, and the block will attempt capture for each of the</div><div class='del'>-four sample rates set here.</div><div class='del'>-</div><div class='del'>-If less than four rates are required, the same rate can be specified more than</div><div class='del'>-once</div><div class='del'>-</div><div class='del'>-name='SPDIF In Lock Frequency',index=0</div><div class='del'>-</div><div class='del'>-This control returns the active capture rate, or 0 if a lock has not been</div><div class='del'>-acquired</div><div class='del'>-</div><div class='del'>-name='SPDIF In Lock TRK',index=0</div><div class='del'>-</div><div class='del'>-This control is used to modify the locking/jitter rejection characteristics</div><div class='del'>-of the block. Larger values increase the locking range, but reduce jitter</div><div class='del'>-rejection.</div><div class='del'>-</div><div class='del'>-name='SPDIF In Lock Acquire Threshold',index=0</div><div class='del'>-</div><div class='del'>-This control is used to change the threshold at which a lock is acquired.</div><div class='del'>-</div><div class='del'>-name='SPDIF In Lock Release Threshold',index=0</div><div class='del'>-</div><div class='del'>-This control is used to change the threshold at which a lock is released.</div><div class='head'>diff --git a/Documentation/sound/alsa/powersave.txt b/Documentation/sound/alsa/powersave.txt<br/>deleted file mode 100644<br/>index 9657e8099228..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/powersave.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/powersave.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-Notes on Power-Saving Mode</div><div class='del'>-==========================</div><div class='del'>-</div><div class='del'>-AC97 and HD-audio drivers have the automatic power-saving mode.</div><div class='del'>-This feature is enabled via Kconfig CONFIG_SND_AC97_POWER_SAVE</div><div class='del'>-and CONFIG_SND_HDA_POWER_SAVE options, respectively.</div><div class='del'>-</div><div class='del'>-With the automatic power-saving, the driver turns off the codec power</div><div class='del'>-appropriately when no operation is required.  When no applications use</div><div class='del'>-the device and/or no analog loopback is set, the power disablement is</div><div class='del'>-done fully or partially.  It'll save a certain power consumption, thus</div><div class='del'>-good for laptops (even for desktops).</div><div class='del'>-</div><div class='del'>-The time-out for automatic power-off can be specified via power_save</div><div class='del'>-module option of snd-ac97-codec and snd-hda-intel modules.  Specify</div><div class='del'>-the time-out value in seconds.  0 means to disable the automatic</div><div class='del'>-power-saving.  The default value of timeout is given via</div><div class='del'>-CONFIG_SND_AC97_POWER_SAVE_DEFAULT and</div><div class='del'>-CONFIG_SND_HDA_POWER_SAVE_DEFAULT Kconfig options.  Setting this to 1</div><div class='del'>-(the minimum value) isn't recommended because many applications try to</div><div class='del'>-reopen the device frequently.  10 would be a good choice for normal</div><div class='del'>-operations.</div><div class='del'>-</div><div class='del'>-The power_save option is exported as writable.  This means you can</div><div class='del'>-adjust the value via sysfs on the fly.  For example, to turn on the</div><div class='del'>-automatic power-save mode with 10 seconds, write to</div><div class='del'>-/sys/modules/snd_ac97_codec/parameters/power_save (usually as root):</div><div class='del'>-</div><div class='del'>-	# echo 10 &gt; /sys/modules/snd_ac97_codec/parameters/power_save</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Note that you might hear click noise/pop when changing the power</div><div class='del'>-state.  Also, it often takes certain time to wake up from the</div><div class='del'>-power-down to the active state.  These are often hardly to fix, so</div><div class='del'>-don't report extra bug reports unless you have a fix patch ;-)</div><div class='del'>-</div><div class='del'>-For HD-audio interface, there is another module option,</div><div class='del'>-power_save_controller.  This enables/disables the power-save mode of</div><div class='del'>-the controller side.  Setting this on may reduce a bit more power</div><div class='del'>-consumption, but might result in longer wake-up time and click noise.</div><div class='del'>-Try to turn it off when you experience such a thing too often.</div><div class='head'>diff --git a/Documentation/sound/alsa/seq_oss.html b/Documentation/sound/alsa/seq_oss.html<br/>deleted file mode 100644<br/>index 9663b45f6fde..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/seq_oss.html?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/seq_oss.html</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,409 +0,0 @@</div><div class='del'>-&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"&gt;</div><div class='del'>-&lt;HTML&gt;</div><div class='del'>-&lt;HEAD&gt;</div><div class='del'>-   &lt;TITLE&gt;OSS Sequencer Emulation on ALSA&lt;/TITLE&gt;</div><div class='del'>-&lt;/HEAD&gt;</div><div class='del'>-&lt;BODY&gt;</div><div class='del'>-</div><div class='del'>-&lt;CENTER&gt;</div><div class='del'>-&lt;H1&gt;</div><div class='del'>-</div><div class='del'>-&lt;HR WIDTH="100%"&gt;&lt;/H1&gt;&lt;/CENTER&gt;</div><div class='del'>-</div><div class='del'>-&lt;CENTER&gt;</div><div class='del'>-&lt;H1&gt;</div><div class='del'>-OSS Sequencer Emulation on ALSA&lt;/H1&gt;&lt;/CENTER&gt;</div><div class='del'>-</div><div class='del'>-&lt;HR WIDTH="100%"&gt;</div><div class='del'>-&lt;P&gt;Copyright (c) 1998,1999 by Takashi Iwai</div><div class='del'>-&lt;TT&gt;&lt;A HREF="mailto:iwai@ww.uni-erlangen.de"&gt;&amp;lt;iwai@ww.uni-erlangen.de&gt;&lt;/A&gt;&lt;/TT&gt;</div><div class='del'>-&lt;P&gt;ver.0.1.8; Nov. 16, 1999</div><div class='del'>-&lt;H2&gt;</div><div class='del'>-</div><div class='del'>-&lt;HR WIDTH="100%"&gt;&lt;/H2&gt;</div><div class='del'>-</div><div class='del'>-&lt;H2&gt;</div><div class='del'>-1. Description&lt;/H2&gt;</div><div class='del'>-This directory contains the OSS sequencer emulation driver on ALSA. Note</div><div class='del'>-that this program is still in the development state.</div><div class='del'>-&lt;P&gt;What this does - it provides the emulation of the OSS sequencer, access</div><div class='del'>-via</div><div class='del'>-&lt;TT&gt;/dev/sequencer&lt;/TT&gt; and &lt;TT&gt;/dev/music&lt;/TT&gt; devices.</div><div class='del'>-The most of applications using OSS can run if the appropriate ALSA</div><div class='del'>-sequencer is prepared.</div><div class='del'>-&lt;P&gt;The following features are emulated by this driver:</div><div class='del'>-&lt;UL&gt;</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-Normal sequencer and MIDI events:&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;They are converted to the ALSA sequencer events, and sent to the corresponding</div><div class='del'>-port.</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-Timer events:&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;The timer is not selectable by ioctl. The control rate is fixed to</div><div class='del'>-100 regardless of HZ. That is, even on Alpha system, a tick is always</div><div class='del'>-1/100 second. The base rate and tempo can be changed in &lt;TT&gt;/dev/music&lt;/TT&gt;.</div><div class='del'>-</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-Patch loading:&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;It purely depends on the synth drivers whether it's supported since</div><div class='del'>-the patch loading is realized by callback to the synth driver.</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-I/O controls:&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;Most of controls are accepted. Some controls</div><div class='del'>-are dependent on the synth driver, as well as even on original OSS.&lt;/UL&gt;</div><div class='del'>-Furthermore, you can find the following advanced features:</div><div class='del'>-&lt;UL&gt;</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-Better queue mechanism:&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;The events are queued before processing them.</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-Multiple applications:&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;You can run two or more applications simultaneously (even for OSS sequencer)!</div><div class='del'>-However, each MIDI device is exclusive - that is, if a MIDI device is opened</div><div class='del'>-once by some application, other applications can't use it. No such a restriction</div><div class='del'>-in synth devices.</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-Real-time event processing:&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;The events can be processed in real time without using out of bound</div><div class='del'>-ioctl. To switch to real-time mode, send ABSTIME 0 event. The followed</div><div class='del'>-events will be processed in real-time without queued. To switch off the</div><div class='del'>-real-time mode, send RELTIME 0 event.</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-&lt;TT&gt;/proc&lt;/TT&gt; interface:&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;The status of applications and devices can be shown via &lt;TT&gt;/proc/asound/seq/oss&lt;/TT&gt;</div><div class='del'>-at any time. In the later version, configuration will be changed via &lt;TT&gt;/proc&lt;/TT&gt;</div><div class='del'>-interface, too.&lt;/UL&gt;</div><div class='del'>-</div><div class='del'>-&lt;H2&gt;</div><div class='del'>-2. Installation&lt;/H2&gt;</div><div class='del'>-Run configure script with both sequencer support (&lt;TT&gt;--with-sequencer=yes&lt;/TT&gt;)</div><div class='del'>-and OSS emulation (&lt;TT&gt;--with-oss=yes&lt;/TT&gt;) options. A module &lt;TT&gt;snd-seq-oss.o&lt;/TT&gt;</div><div class='del'>-will be created. If the synth module of your sound card supports for OSS</div><div class='del'>-emulation (so far, only Emu8000 driver), this module will be loaded automatically.</div><div class='del'>-Otherwise, you need to load this module manually.</div><div class='del'>-&lt;P&gt;At beginning, this module probes all the MIDI ports which have been</div><div class='del'>-already connected to the sequencer. Once after that, the creation and deletion</div><div class='del'>-of ports are watched by announcement mechanism of ALSA sequencer.</div><div class='del'>-&lt;P&gt;The available synth and MIDI devices can be found in proc interface.</div><div class='del'>-Run "&lt;TT&gt;cat /proc/asound/seq/oss&lt;/TT&gt;", and check the devices. For example,</div><div class='del'>-if you use an AWE64 card, you'll see like the following:</div><div class='del'>-&lt;PRE&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; OSS sequencer emulation version 0.1.8</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; ALSA client number 63</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; ALSA receiver port 0</div><div class='del'>-</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; Number of applications: 0</div><div class='del'>-</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; Number of synth devices: 1</div><div class='del'>-</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; synth 0: [EMU8000]</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; type 0x1 : subtype 0x20 : voices 32</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; capabilties : ioctl enabled / load_patch enabled</div><div class='del'>-</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; Number of MIDI devices: 3</div><div class='del'>-</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; midi 0: [Emu8000 Port-0] ALSA port 65:0</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; capability write / opened none</div><div class='del'>-</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; midi 1: [Emu8000 Port-1] ALSA port 65:1</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; capability write / opened none</div><div class='del'>-</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; midi 2: [0: MPU-401 (UART)] ALSA port 64:0</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; capability read/write / opened none&lt;/PRE&gt;</div><div class='del'>-Note that the device number may be different from the information of</div><div class='del'>-&lt;TT&gt;/proc/asound/oss-devices&lt;/TT&gt;</div><div class='del'>-or ones of the original OSS driver. Use the device number listed in &lt;TT&gt;/proc/asound/seq/oss&lt;/TT&gt;</div><div class='del'>-to play via OSS sequencer emulation.</div><div class='del'>-&lt;H2&gt;</div><div class='del'>-3. Using Synthesizer Devices&lt;/H2&gt;</div><div class='del'>-Run your favorite program. I've tested playmidi-2.4, awemidi-0.4.3, gmod-3.1</div><div class='del'>-and xmp-1.1.5. You can load samples via &lt;TT&gt;/dev/sequencer&lt;/TT&gt; like sfxload,</div><div class='del'>-too.</div><div class='del'>-&lt;P&gt;If the lowlevel driver supports multiple access to synth devices (like</div><div class='del'>-Emu8000 driver), two or more applications are allowed to run at the same</div><div class='del'>-time.</div><div class='del'>-&lt;H2&gt;</div><div class='del'>-4. Using MIDI Devices&lt;/H2&gt;</div><div class='del'>-So far, only MIDI output was tested. MIDI input was not checked at all,</div><div class='del'>-but hopefully it will work. Use the device number listed in &lt;TT&gt;/proc/asound/seq/oss&lt;/TT&gt;.</div><div class='del'>-Be aware that these numbers are mostly different from the list in</div><div class='del'>-&lt;TT&gt;/proc/asound/oss-devices&lt;/TT&gt;.</div><div class='del'>-&lt;H2&gt;</div><div class='del'>-5. Module Options&lt;/H2&gt;</div><div class='del'>-The following module options are available:</div><div class='del'>-&lt;UL&gt;</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-&lt;TT&gt;maxqlen&lt;/TT&gt;&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;specifies the maximum read/write queue length. This queue is private</div><div class='del'>-for OSS sequencer, so that it is independent from the queue length of ALSA</div><div class='del'>-sequencer. Default value is 1024.</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-&lt;TT&gt;seq_oss_debug&lt;/TT&gt;&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;specifies the debug level and accepts zero (= no debug message) or</div><div class='del'>-positive integer. Default value is 0.&lt;/UL&gt;</div><div class='del'>-</div><div class='del'>-&lt;H2&gt;</div><div class='del'>-6. Queue Mechanism&lt;/H2&gt;</div><div class='del'>-OSS sequencer emulation uses an ALSA priority queue. The</div><div class='del'>-events from &lt;TT&gt;/dev/sequencer&lt;/TT&gt; are processed and put onto the queue</div><div class='del'>-specified by module option.</div><div class='del'>-&lt;P&gt;All the events from &lt;TT&gt;/dev/sequencer&lt;/TT&gt; are parsed at beginning.</div><div class='del'>-The timing events are also parsed at this moment, so that the events may</div><div class='del'>-be processed in real-time. Sending an event ABSTIME 0 switches the operation</div><div class='del'>-mode to real-time mode, and sending an event RELTIME 0 switches it off.</div><div class='del'>-In the real-time mode, all events are dispatched immediately.</div><div class='del'>-&lt;P&gt;The queued events are dispatched to the corresponding ALSA sequencer</div><div class='del'>-ports after scheduled time by ALSA sequencer dispatcher.</div><div class='del'>-&lt;P&gt;If the write-queue is full, the application sleeps until a certain amount</div><div class='del'>-(as default one half) becomes empty in blocking mode. The synchronization</div><div class='del'>-to write timing was implemented, too.</div><div class='del'>-&lt;P&gt;The input from MIDI devices or echo-back events are stored on read FIFO</div><div class='del'>-queue. If application reads &lt;TT&gt;/dev/sequencer&lt;/TT&gt; in blocking mode, the</div><div class='del'>-process will be awaked.</div><div class='del'>-</div><div class='del'>-&lt;H2&gt;</div><div class='del'>-7. Interface to Synthesizer Device&lt;/H2&gt;</div><div class='del'>-</div><div class='del'>-&lt;H3&gt;</div><div class='del'>-7.1. Registration&lt;/H3&gt;</div><div class='del'>-To register an OSS synthesizer device, use &lt;TT&gt;snd_seq_oss_synth_register&lt;/TT&gt;</div><div class='del'>-function.</div><div class='del'>-&lt;PRE&gt;int snd_seq_oss_synth_register(char *name, int type, int subtype, int nvoices,</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; snd_seq_oss_callback_t *oper, void *private_data)&lt;/PRE&gt;</div><div class='del'>-The arguments &lt;TT&gt;name&lt;/TT&gt;, &lt;TT&gt;type&lt;/TT&gt;, &lt;TT&gt;subtype&lt;/TT&gt; and</div><div class='del'>-&lt;TT&gt;nvoices&lt;/TT&gt;</div><div class='del'>-are used for making the appropriate synth_info structure for ioctl. The</div><div class='del'>-return value is an index number of this device. This index must be remembered</div><div class='del'>-for unregister. If registration is failed, -errno will be returned.</div><div class='del'>-&lt;P&gt;To release this device, call &lt;TT&gt;snd_seq_oss_synth_unregister function&lt;/TT&gt;:</div><div class='del'>-&lt;PRE&gt;int snd_seq_oss_synth_unregister(int index),&lt;/PRE&gt;</div><div class='del'>-where the &lt;TT&gt;index&lt;/TT&gt; is the index number returned by register function.</div><div class='del'>-&lt;H3&gt;</div><div class='del'>-7.2. Callbacks&lt;/H3&gt;</div><div class='del'>-OSS synthesizer devices have capability for sample downloading and ioctls</div><div class='del'>-like sample reset. In OSS emulation, these special features are realized</div><div class='del'>-by using callbacks. The registration argument oper is used to specify these</div><div class='del'>-callbacks. The following callback functions must be defined:</div><div class='del'>-&lt;PRE&gt;snd_seq_oss_callback_t:</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; int (*open)(snd_seq_oss_arg_t *p, void *closure);</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; int (*close)(snd_seq_oss_arg_t *p);</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; int (*ioctl)(snd_seq_oss_arg_t *p, unsigned int cmd, unsigned long arg);</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; int (*load_patch)(snd_seq_oss_arg_t *p, int format, const char *buf, int offs, int count);</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; int (*reset)(snd_seq_oss_arg_t *p);</div><div class='del'>-Except for &lt;TT&gt;open&lt;/TT&gt; and &lt;TT&gt;close&lt;/TT&gt; callbacks, they are allowed</div><div class='del'>-to be NULL.</div><div class='del'>-&lt;P&gt;Each callback function takes the argument type snd_seq_oss_arg_t as the</div><div class='del'>-first argument.</div><div class='del'>-&lt;PRE&gt;struct snd_seq_oss_arg_t {</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; int app_index;</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; int file_mode;</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; int seq_mode;</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; snd_seq_addr_t addr;</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; void *private_data;</div><div class='del'>-&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; int event_passing;</div><div class='del'>-};&lt;/PRE&gt;</div><div class='del'>-The first three fields, &lt;TT&gt;app_index&lt;/TT&gt;, &lt;TT&gt;file_mode&lt;/TT&gt; and</div><div class='del'>-&lt;TT&gt;seq_mode&lt;/TT&gt;</div><div class='del'>-are initialized by OSS sequencer. The &lt;TT&gt;app_index&lt;/TT&gt; is the application</div><div class='del'>-index which is unique to each application opening OSS sequencer. The</div><div class='del'>-&lt;TT&gt;file_mode&lt;/TT&gt;</div><div class='del'>-is bit-flags indicating the file operation mode. See</div><div class='del'>-&lt;TT&gt;seq_oss.h&lt;/TT&gt;</div><div class='del'>-for its meaning. The &lt;TT&gt;seq_mode&lt;/TT&gt; is sequencer operation mode. In</div><div class='del'>-the current version, only &lt;TT&gt;SND_OSSSEQ_MODE_SYNTH&lt;/TT&gt; is used.</div><div class='del'>-&lt;P&gt;The next two fields, &lt;TT&gt;addr&lt;/TT&gt; and &lt;TT&gt;private_data&lt;/TT&gt;, must be</div><div class='del'>-filled by the synth driver at open callback. The &lt;TT&gt;addr&lt;/TT&gt; contains</div><div class='del'>-the address of ALSA sequencer port which is assigned to this device. If</div><div class='del'>-the driver allocates memory for &lt;TT&gt;private_data&lt;/TT&gt;, it must be released</div><div class='del'>-in close callback by itself.</div><div class='del'>-&lt;P&gt;The last field, &lt;TT&gt;event_passing&lt;/TT&gt;, indicates how to translate note-on</div><div class='del'>-/ off events. In &lt;TT&gt;PROCESS_EVENTS&lt;/TT&gt; mode, the note 255 is regarded</div><div class='del'>-as velocity change, and key pressure event is passed to the port. In &lt;TT&gt;PASS_EVENTS&lt;/TT&gt;</div><div class='del'>-mode, all note on/off events are passed to the port without modified. &lt;TT&gt;PROCESS_KEYPRESS&lt;/TT&gt;</div><div class='del'>-mode checks the note above 128 and regards it as key pressure event (mainly</div><div class='del'>-for Emu8000 driver).</div><div class='del'>-&lt;H4&gt;</div><div class='del'>-7.2.1. Open Callback&lt;/H4&gt;</div><div class='del'>-The &lt;TT&gt;open&lt;/TT&gt; is called at each time this device is opened by an application</div><div class='del'>-using OSS sequencer. This must not be NULL. Typically, the open callback</div><div class='del'>-does the following procedure:</div><div class='del'>-&lt;OL&gt;</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-Allocate private data record.&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-Create an ALSA sequencer port.&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-Set the new port address on arg-&gt;addr.&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-Set the private data record pointer on arg-&gt;private_data.&lt;/LI&gt;</div><div class='del'>-&lt;/OL&gt;</div><div class='del'>-Note that the type bit-flags in port_info of this synth port must NOT contain</div><div class='del'>-&lt;TT&gt;TYPE_MIDI_GENERIC&lt;/TT&gt;</div><div class='del'>-bit. Instead, &lt;TT&gt;TYPE_SPECIFIC&lt;/TT&gt; should be used. Also, &lt;TT&gt;CAP_SUBSCRIPTION&lt;/TT&gt;</div><div class='del'>-bit should NOT be included, too. This is necessary to tell it from other</div><div class='del'>-normal MIDI devices. If the open procedure succeeded, return zero. Otherwise,</div><div class='del'>-return -errno.</div><div class='del'>-&lt;H4&gt;</div><div class='del'>-7.2.2 Ioctl Callback&lt;/H4&gt;</div><div class='del'>-The &lt;TT&gt;ioctl&lt;/TT&gt; callback is called when the sequencer receives device-specific</div><div class='del'>-ioctls. The following two ioctls should be processed by this callback:</div><div class='del'>-&lt;UL&gt;</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-&lt;TT&gt;IOCTL_SEQ_RESET_SAMPLES&lt;/TT&gt;&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;reset all samples on memory -- return 0</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-&lt;TT&gt;IOCTL_SYNTH_MEMAVL&lt;/TT&gt;&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;return the available memory size</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-&lt;TT&gt;FM_4OP_ENABLE&lt;/TT&gt;&lt;/LI&gt;</div><div class='del'>-</div><div class='del'>-&lt;BR&gt;can be ignored usually&lt;/UL&gt;</div><div class='del'>-The other ioctls are processed inside the sequencer without passing to</div><div class='del'>-the lowlevel driver.</div><div class='del'>-&lt;H4&gt;</div><div class='del'>-7.2.3 Load_Patch Callback&lt;/H4&gt;</div><div class='del'>-The &lt;TT&gt;load_patch&lt;/TT&gt; callback is used for sample-downloading. This callback</div><div class='del'>-must read the data on user-space and transfer to each device. Return 0</div><div class='del'>-if succeeded, and -errno if failed. The format argument is the patch key</div><div class='del'>-in patch_info record. The buf is user-space pointer where patch_info record</div><div class='del'>-is stored. The offs can be ignored. The count is total data size of this</div><div class='del'>-sample data.</div><div class='del'>-&lt;H4&gt;</div><div class='del'>-7.2.4 Close Callback&lt;/H4&gt;</div><div class='del'>-The &lt;TT&gt;close&lt;/TT&gt; callback is called when this device is closed by the</div><div class='del'>-application. If any private data was allocated in open callback, it must</div><div class='del'>-be released in the close callback. The deletion of ALSA port should be</div><div class='del'>-done here, too. This callback must not be NULL.</div><div class='del'>-&lt;H4&gt;</div><div class='del'>-7.2.5 Reset Callback&lt;/H4&gt;</div><div class='del'>-The &lt;TT&gt;reset&lt;/TT&gt; callback is called when sequencer device is reset or</div><div class='del'>-closed by applications. The callback should turn off the sounds on the</div><div class='del'>-relevant port immediately, and initialize the status of the port. If this</div><div class='del'>-callback is undefined, OSS seq sends a &lt;TT&gt;HEARTBEAT&lt;/TT&gt; event to the</div><div class='del'>-port.</div><div class='del'>-&lt;H3&gt;</div><div class='del'>-7.3 Events&lt;/H3&gt;</div><div class='del'>-Most of the events are processed by sequencer and translated to the adequate</div><div class='del'>-ALSA sequencer events, so that each synth device can receive by input_event</div><div class='del'>-callback of ALSA sequencer port. The following ALSA events should be implemented</div><div class='del'>-by the driver:</div><div class='del'>-&lt;BR&gt;&amp;nbsp;</div><div class='del'>-&lt;TABLE BORDER WIDTH="75%" NOSAVE &gt;</div><div class='del'>-&lt;TR NOSAVE&gt;</div><div class='del'>-&lt;TD NOSAVE&gt;&lt;B&gt;ALSA event&lt;/B&gt;&lt;/TD&gt;</div><div class='del'>-</div><div class='del'>-&lt;TD&gt;&lt;B&gt;Original OSS events&lt;/B&gt;&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-</div><div class='del'>-&lt;TR&gt;</div><div class='del'>-&lt;TD&gt;NOTEON&lt;/TD&gt;</div><div class='del'>-</div><div class='del'>-&lt;TD&gt;SEQ_NOTEON</div><div class='del'>-&lt;BR&gt;MIDI_NOTEON&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-</div><div class='del'>-&lt;TR&gt;</div><div class='del'>-&lt;TD&gt;NOTE&lt;/TD&gt;</div><div class='del'>-</div><div class='del'>-&lt;TD&gt;SEQ_NOTEOFF</div><div class='del'>-&lt;BR&gt;MIDI_NOTEOFF&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-</div><div class='del'>-&lt;TR NOSAVE&gt;</div><div class='del'>-&lt;TD NOSAVE&gt;KEYPRESS&lt;/TD&gt;</div><div class='del'>-</div><div class='del'>-&lt;TD&gt;MIDI_KEY_PRESSURE&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-</div><div class='del'>-&lt;TR NOSAVE&gt;</div><div class='del'>-&lt;TD&gt;CHANPRESS&lt;/TD&gt;</div><div class='del'>-</div><div class='del'>-&lt;TD NOSAVE&gt;SEQ_AFTERTOUCH</div><div class='del'>-&lt;BR&gt;MIDI_CHN_PRESSURE&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-</div><div class='del'>-&lt;TR NOSAVE&gt;</div><div class='del'>-&lt;TD NOSAVE&gt;PGMCHANGE&lt;/TD&gt;</div><div class='del'>-</div><div class='del'>-&lt;TD NOSAVE&gt;SEQ_PGMCHANGE</div><div class='del'>-&lt;BR&gt;MIDI_PGM_CHANGE&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-</div><div class='del'>-&lt;TR&gt;</div><div class='del'>-&lt;TD&gt;PITCHBEND&lt;/TD&gt;</div><div class='del'>-</div><div class='del'>-&lt;TD&gt;SEQ_CONTROLLER(CTRL_PITCH_BENDER)</div><div class='del'>-&lt;BR&gt;MIDI_PITCH_BEND&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-</div><div class='del'>-&lt;TR&gt;</div><div class='del'>-&lt;TD&gt;CONTROLLER&lt;/TD&gt;</div><div class='del'>-</div><div class='del'>-&lt;TD&gt;MIDI_CTL_CHANGE</div><div class='del'>-&lt;BR&gt;SEQ_BALANCE (with CTL_PAN)&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-</div><div class='del'>-&lt;TR&gt;</div><div class='del'>-&lt;TD&gt;CONTROL14&lt;/TD&gt;</div><div class='del'>-</div><div class='del'>-&lt;TD&gt;SEQ_CONTROLLER&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-</div><div class='del'>-&lt;TR&gt;</div><div class='del'>-&lt;TD&gt;REGPARAM&lt;/TD&gt;</div><div class='del'>-</div><div class='del'>-&lt;TD&gt;SEQ_CONTROLLER(CTRL_PITCH_BENDER_RANGE)&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-</div><div class='del'>-&lt;TR&gt;</div><div class='del'>-&lt;TD&gt;SYSEX&lt;/TD&gt;</div><div class='del'>-</div><div class='del'>-&lt;TD&gt;SEQ_SYSEX&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-&lt;/TABLE&gt;</div><div class='del'>-</div><div class='del'>-&lt;P&gt;The most of these behavior can be realized by MIDI emulation driver</div><div class='del'>-included in the Emu8000 lowlevel driver. In the future release, this module</div><div class='del'>-will be independent.</div><div class='del'>-&lt;P&gt;Some OSS events (&lt;TT&gt;SEQ_PRIVATE&lt;/TT&gt; and &lt;TT&gt;SEQ_VOLUME&lt;/TT&gt; events) are passed as event</div><div class='del'>-type SND_SEQ_OSS_PRIVATE.  The OSS sequencer passes these event 8 byte</div><div class='del'>-packets without any modification. The lowlevel driver should process these</div><div class='del'>-events appropriately.</div><div class='del'>-&lt;H2&gt;</div><div class='del'>-8. Interface to MIDI Device&lt;/H2&gt;</div><div class='del'>-Since the OSS emulation probes the creation and deletion of ALSA MIDI sequencer</div><div class='del'>-ports automatically by receiving announcement from ALSA sequencer, the</div><div class='del'>-MIDI devices don't need to be registered explicitly like synth devices.</div><div class='del'>-However, the MIDI port_info registered to ALSA sequencer must include a group</div><div class='del'>-name &lt;TT&gt;SND_SEQ_GROUP_DEVICE&lt;/TT&gt; and a capability-bit &lt;TT&gt;CAP_READ&lt;/TT&gt; or</div><div class='del'>-&lt;TT&gt;CAP_WRITE&lt;/TT&gt;. Also, subscription capabilities, &lt;TT&gt;CAP_SUBS_READ&lt;/TT&gt; or &lt;TT&gt;CAP_SUBS_WRITE&lt;/TT&gt;,</div><div class='del'>-must be defined, too. If these conditions are not satisfied, the port is not</div><div class='del'>-registered as OSS sequencer MIDI device.</div><div class='del'>-&lt;P&gt;The events via MIDI devices are parsed in OSS sequencer and converted</div><div class='del'>-to the corresponding ALSA sequencer events. The input from MIDI sequencer</div><div class='del'>-is also converted to MIDI byte events by OSS sequencer. This works just</div><div class='del'>-a reverse way of seq_midi module.</div><div class='del'>-&lt;H2&gt;</div><div class='del'>-9. Known Problems / TODO's&lt;/H2&gt;</div><div class='del'>-</div><div class='del'>-&lt;UL&gt;</div><div class='del'>-&lt;LI&gt;</div><div class='del'>-Patch loading via ALSA instrument layer is not implemented yet.&lt;/LI&gt;</div><div class='del'>-&lt;/UL&gt;</div><div class='del'>-</div><div class='del'>-&lt;/BODY&gt;</div><div class='del'>-&lt;/HTML&gt;</div><div class='head'>diff --git a/Documentation/sound/alsa/serial-u16550.txt b/Documentation/sound/alsa/serial-u16550.txt<br/>deleted file mode 100644<br/>index c1919559d509..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/serial-u16550.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/serial-u16550.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-</div><div class='del'>-			Serial UART 16450/16550 MIDI driver</div><div class='del'>-			===================================</div><div class='del'>-</div><div class='del'>-The adaptor module parameter allows you to select either:</div><div class='del'>-</div><div class='del'>-  0 - Roland Soundcanvas support (default)</div><div class='del'>-  1 - Midiator MS-124T support (1)</div><div class='del'>-  2 - Midiator MS-124W S/A mode (2)</div><div class='del'>-  3 - MS-124W M/B mode support (3)</div><div class='del'>-  4 - Generic device with multiple input support (4)</div><div class='del'>-</div><div class='del'>-For the Midiator MS-124W, you must set the physical M-S and A-B</div><div class='del'>-switches on the Midiator to match the driver mode you select.</div><div class='del'>-</div><div class='del'>-In Roland Soundcanvas mode, multiple ALSA raw MIDI substreams are supported</div><div class='del'>-(midiCnD0-midiCnD15).  Whenever you write to a different substream, the driver</div><div class='del'>-sends the nonstandard MIDI command sequence F5 NN, where NN is the substream</div><div class='del'>-number plus 1.  Roland modules use this command to switch between different</div><div class='del'>-"parts", so this feature lets you treat each part as a distinct raw MIDI</div><div class='del'>-substream. The driver provides no way to send F5 00 (no selection) or to not</div><div class='del'>-send the F5 NN command sequence at all; perhaps it ought to.</div><div class='del'>-</div><div class='del'>-Usage example for simple serial converter:</div><div class='del'>-</div><div class='del'>-	/sbin/setserial /dev/ttyS0 uart none</div><div class='del'>-	/sbin/modprobe snd-serial-u16550 port=0x3f8 irq=4 speed=115200</div><div class='del'>-</div><div class='del'>-Usage example for Roland SoundCanvas with 4 MIDI ports:</div><div class='del'>-</div><div class='del'>-	/sbin/setserial /dev/ttyS0 uart none</div><div class='del'>-	/sbin/modprobe snd-serial-u16550 port=0x3f8 irq=4 outs=4</div><div class='del'>-</div><div class='del'>-In MS-124T mode, one raw MIDI substream is supported (midiCnD0); the outs</div><div class='del'>-module parameter is automatically set to 1. The driver sends the same data to</div><div class='del'>-all four MIDI Out connectors.  Set the A-B switch and the speed module</div><div class='del'>-parameter to match (A=19200, B=9600).</div><div class='del'>-</div><div class='del'>-Usage example for MS-124T, with A-B switch in A position:</div><div class='del'>-</div><div class='del'>-	/sbin/setserial /dev/ttyS0 uart none</div><div class='del'>-	/sbin/modprobe snd-serial-u16550 port=0x3f8 irq=4 adaptor=1 \</div><div class='del'>-			speed=19200</div><div class='del'>-</div><div class='del'>-In MS-124W S/A mode, one raw MIDI substream is supported (midiCnD0);</div><div class='del'>-the outs module parameter is automatically set to 1. The driver sends</div><div class='del'>-the same data to all four MIDI Out connectors at full MIDI speed.</div><div class='del'>-</div><div class='del'>-Usage example for S/A mode:</div><div class='del'>-</div><div class='del'>-	/sbin/setserial /dev/ttyS0 uart none</div><div class='del'>-	/sbin/modprobe snd-serial-u16550 port=0x3f8 irq=4 adaptor=2</div><div class='del'>-</div><div class='del'>-In MS-124W M/B mode, the driver supports 16 ALSA raw MIDI substreams;</div><div class='del'>-the outs module parameter is automatically set to 16.  The substream</div><div class='del'>-number gives a bitmask of which MIDI Out connectors the data should be</div><div class='del'>-sent to, with midiCnD1 sending to Out 1, midiCnD2 to Out 2, midiCnD4 to</div><div class='del'>-Out 3, and midiCnD8 to Out 4.  Thus midiCnD15 sends the data to all 4 ports.</div><div class='del'>-As a special case, midiCnD0 also sends to all ports, since it is not useful</div><div class='del'>-to send the data to no ports.  M/B mode has extra overhead to select the MIDI</div><div class='del'>-Out for each byte, so the aggregate data rate across all four MIDI Outs is</div><div class='del'>-at most one byte every 520 us, as compared with the full MIDI data rate of</div><div class='del'>-one byte every 320 us per port.</div><div class='del'>-</div><div class='del'>-Usage example for M/B mode:</div><div class='del'>-</div><div class='del'>-	/sbin/setserial /dev/ttyS0 uart none</div><div class='del'>-	/sbin/modprobe snd-serial-u16550 port=0x3f8 irq=4 adaptor=3</div><div class='del'>-</div><div class='del'>-The MS-124W hardware's M/A mode is currently not supported. This mode allows</div><div class='del'>-the MIDI Outs to act independently at double the aggregate throughput of M/B,</div><div class='del'>-but does not allow sending the same byte simultaneously to multiple MIDI Outs. </div><div class='del'>-The M/A protocol requires the driver to twiddle the modem control lines under</div><div class='del'>-timing constraints, so it would be a bit more complicated to implement than</div><div class='del'>-the other modes.</div><div class='del'>-</div><div class='del'>-Midiator models other than MS-124W and MS-124T are currently not supported. </div><div class='del'>-Note that the suffix letter is significant; the MS-124 and MS-124B are not</div><div class='del'>-compatible, nor are the other known models MS-101, MS-101B, MS-103, and MS-114.</div><div class='del'>-I do have documentation (tim.mann@compaq.com) that partially covers these models,</div><div class='del'>-but no units to experiment with.  The MS-124W support is tested with a real unit.</div><div class='del'>-The MS-124T support is untested, but should work.</div><div class='del'>-</div><div class='del'>-The Generic driver supports multiple input and output substreams over a single</div><div class='del'>-serial port.  Similar to Roland Soundcanvas mode, F5 NN is used to select the</div><div class='del'>-appropriate input or output stream (depending on the data direction).</div><div class='del'>-Additionally, the CTS signal is used to regulate the data flow.  The number of</div><div class='del'>-inputs is specified by the ins parameter.</div><div class='head'>diff --git a/Documentation/sound/alsa/soc/DAI.txt b/Documentation/sound/alsa/soc/DAI.txt<br/>deleted file mode 100644<br/>index c9679264c559..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/soc/DAI.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/soc/DAI.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-ASoC currently supports the three main Digital Audio Interfaces (DAI) found on</div><div class='del'>-SoC controllers and portable audio CODECs today, namely AC97, I2S and PCM.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-AC97</div><div class='del'>-====</div><div class='del'>-</div><div class='del'>-  AC97 is a five wire interface commonly found on many PC sound cards. It is</div><div class='del'>-now also popular in many portable devices. This DAI has a reset line and time</div><div class='del'>-multiplexes its data on its SDATA_OUT (playback) and SDATA_IN (capture) lines.</div><div class='del'>-The bit clock (BCLK) is always driven by the CODEC (usually 12.288MHz) and the</div><div class='del'>-frame (FRAME) (usually 48kHz) is always driven by the controller. Each AC97</div><div class='del'>-frame is 21uS long and is divided into 13 time slots.</div><div class='del'>-</div><div class='del'>-The AC97 specification can be found at :-</div><div class='del'>-http://www.intel.com/p/en_US/business/design</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-I2S</div><div class='del'>-===</div><div class='del'>-</div><div class='del'>- I2S is a common 4 wire DAI used in HiFi, STB and portable devices. The Tx and</div><div class='del'>-Rx lines are used for audio transmission, whilst the bit clock (BCLK) and</div><div class='del'>-left/right clock (LRC) synchronise the link. I2S is flexible in that either the</div><div class='del'>-controller or CODEC can drive (master) the BCLK and LRC clock lines. Bit clock</div><div class='del'>-usually varies depending on the sample rate and the master system clock</div><div class='del'>-(SYSCLK). LRCLK is the same as the sample rate. A few devices support separate</div><div class='del'>-ADC and DAC LRCLKs, this allows for simultaneous capture and playback at</div><div class='del'>-different sample rates.</div><div class='del'>-</div><div class='del'>-I2S has several different operating modes:-</div><div class='del'>-</div><div class='del'>- o I2S - MSB is transmitted on the falling edge of the first BCLK after LRC</div><div class='del'>-         transition.</div><div class='del'>-</div><div class='del'>- o Left Justified - MSB is transmitted on transition of LRC.</div><div class='del'>-</div><div class='del'>- o Right Justified - MSB is transmitted sample size BCLKs before LRC</div><div class='del'>-                     transition.</div><div class='del'>-</div><div class='del'>-PCM</div><div class='del'>-===</div><div class='del'>-</div><div class='del'>-PCM is another 4 wire interface, very similar to I2S, which can support a more</div><div class='del'>-flexible protocol. It has bit clock (BCLK) and sync (SYNC) lines that are used</div><div class='del'>-to synchronise the link whilst the Tx and Rx lines are used to transmit and</div><div class='del'>-receive the audio data. Bit clock usually varies depending on sample rate</div><div class='del'>-whilst sync runs at the sample rate. PCM also supports Time Division</div><div class='del'>-Multiplexing (TDM) in that several devices can use the bus simultaneously (this</div><div class='del'>-is sometimes referred to as network mode).</div><div class='del'>-</div><div class='del'>-Common PCM operating modes:-</div><div class='del'>-</div><div class='del'>- o Mode A - MSB is transmitted on falling edge of first BCLK after FRAME/SYNC.</div><div class='del'>-</div><div class='del'>- o Mode B - MSB is transmitted on rising edge of FRAME/SYNC.</div><div class='head'>diff --git a/Documentation/sound/alsa/soc/DPCM.txt b/Documentation/sound/alsa/soc/DPCM.txt<br/>deleted file mode 100644<br/>index 0110180b7ac6..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/soc/DPCM.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/soc/DPCM.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,380 +0,0 @@</div><div class='del'>-Dynamic PCM</div><div class='del'>-===========</div><div class='del'>-</div><div class='del'>-1. Description</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-Dynamic PCM allows an ALSA PCM device to digitally route its PCM audio to</div><div class='del'>-various digital endpoints during the PCM stream runtime. e.g. PCM0 can route</div><div class='del'>-digital audio to I2S DAI0, I2S DAI1 or PDM DAI2. This is useful for on SoC DSP</div><div class='del'>-drivers that expose several ALSA PCMs and can route to multiple DAIs.</div><div class='del'>-</div><div class='del'>-The DPCM runtime routing is determined by the ALSA mixer settings in the same</div><div class='del'>-way as the analog signal is routed in an ASoC codec driver. DPCM uses a DAPM</div><div class='del'>-graph representing the DSP internal audio paths and uses the mixer settings to</div><div class='del'>-determine the patch used by each ALSA PCM.</div><div class='del'>-</div><div class='del'>-DPCM re-uses all the existing component codec, platform and DAI drivers without</div><div class='del'>-any modifications.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Phone Audio System with SoC based DSP</div><div class='del'>--------------------------------------</div><div class='del'>-</div><div class='del'>-Consider the following phone audio subsystem. This will be used in this</div><div class='del'>-document for all examples :-</div><div class='del'>-</div><div class='del'>-| Front End PCMs    |  SoC DSP  | Back End DAIs | Audio devices |</div><div class='del'>-</div><div class='del'>-                    *************</div><div class='del'>-PCM0 &lt;------------&gt; *           * &lt;----DAI0-----&gt; Codec Headset</div><div class='del'>-                    *           *</div><div class='del'>-PCM1 &lt;------------&gt; *           * &lt;----DAI1-----&gt; Codec Speakers</div><div class='del'>-                    *   DSP     *</div><div class='del'>-PCM2 &lt;------------&gt; *           * &lt;----DAI2-----&gt; MODEM</div><div class='del'>-                    *           *</div><div class='del'>-PCM3 &lt;------------&gt; *           * &lt;----DAI3-----&gt; BT</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI4-----&gt; DMIC</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI5-----&gt; FM</div><div class='del'>-                    *************</div><div class='del'>-</div><div class='del'>-This diagram shows a simple smart phone audio subsystem. It supports Bluetooth,</div><div class='del'>-FM digital radio, Speakers, Headset Jack, digital microphones and cellular</div><div class='del'>-modem. This sound card exposes 4 DSP front end (FE) ALSA PCM devices and</div><div class='del'>-supports 6 back end (BE) DAIs. Each FE PCM can digitally route audio data to any</div><div class='del'>-of the BE DAIs. The FE PCM devices can also route audio to more than 1 BE DAI.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Example - DPCM Switching playback from DAI0 to DAI1</div><div class='del'>----------------------------------------------------</div><div class='del'>-</div><div class='del'>-Audio is being played to the Headset. After a while the user removes the headset</div><div class='del'>-and audio continues playing on the speakers.</div><div class='del'>-</div><div class='del'>-Playback on PCM0 to Headset would look like :-</div><div class='del'>-</div><div class='del'>-                    *************</div><div class='del'>-PCM0 &lt;============&gt; *           * &lt;====DAI0=====&gt; Codec Headset</div><div class='del'>-                    *           *</div><div class='del'>-PCM1 &lt;------------&gt; *           * &lt;----DAI1-----&gt; Codec Speakers</div><div class='del'>-                    *   DSP     *</div><div class='del'>-PCM2 &lt;------------&gt; *           * &lt;----DAI2-----&gt; MODEM</div><div class='del'>-                    *           *</div><div class='del'>-PCM3 &lt;------------&gt; *           * &lt;----DAI3-----&gt; BT</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI4-----&gt; DMIC</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI5-----&gt; FM</div><div class='del'>-                    *************</div><div class='del'>-</div><div class='del'>-The headset is removed from the jack by user so the speakers must now be used :-</div><div class='del'>-</div><div class='del'>-                    *************</div><div class='del'>-PCM0 &lt;============&gt; *           * &lt;----DAI0-----&gt; Codec Headset</div><div class='del'>-                    *           *</div><div class='del'>-PCM1 &lt;------------&gt; *           * &lt;====DAI1=====&gt; Codec Speakers</div><div class='del'>-                    *   DSP     *</div><div class='del'>-PCM2 &lt;------------&gt; *           * &lt;----DAI2-----&gt; MODEM</div><div class='del'>-                    *           *</div><div class='del'>-PCM3 &lt;------------&gt; *           * &lt;----DAI3-----&gt; BT</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI4-----&gt; DMIC</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI5-----&gt; FM</div><div class='del'>-                    *************</div><div class='del'>-</div><div class='del'>-The audio driver processes this as follows :-</div><div class='del'>-</div><div class='del'>- 1) Machine driver receives Jack removal event.</div><div class='del'>-</div><div class='del'>- 2) Machine driver OR audio HAL disables the Headset path.</div><div class='del'>-</div><div class='del'>- 3) DPCM runs the PCM trigger(stop), hw_free(), shutdown() operations on DAI0</div><div class='del'>-    for headset since the path is now disabled.</div><div class='del'>-</div><div class='del'>- 4) Machine driver or audio HAL enables the speaker path.</div><div class='del'>-</div><div class='del'>- 5) DPCM runs the PCM ops for startup(), hw_params(), prepapre() and</div><div class='del'>-    trigger(start) for DAI1 Speakers since the path is enabled.</div><div class='del'>-</div><div class='del'>-In this example, the machine driver or userspace audio HAL can alter the routing</div><div class='del'>-and then DPCM will take care of managing the DAI PCM operations to either bring</div><div class='del'>-the link up or down. Audio playback does not stop during this transition.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-DPCM machine driver</div><div class='del'>-===================</div><div class='del'>-</div><div class='del'>-The DPCM enabled ASoC machine driver is similar to normal machine drivers</div><div class='del'>-except that we also have to :-</div><div class='del'>-</div><div class='del'>- 1) Define the FE and BE DAI links.</div><div class='del'>-</div><div class='del'>- 2) Define any FE/BE PCM operations.</div><div class='del'>-</div><div class='del'>- 3) Define widget graph connections.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1 FE and BE DAI links</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-| Front End PCMs    |  SoC DSP  | Back End DAIs | Audio devices |</div><div class='del'>-</div><div class='del'>-                    *************</div><div class='del'>-PCM0 &lt;------------&gt; *           * &lt;----DAI0-----&gt; Codec Headset</div><div class='del'>-                    *           *</div><div class='del'>-PCM1 &lt;------------&gt; *           * &lt;----DAI1-----&gt; Codec Speakers</div><div class='del'>-                    *   DSP     *</div><div class='del'>-PCM2 &lt;------------&gt; *           * &lt;----DAI2-----&gt; MODEM</div><div class='del'>-                    *           *</div><div class='del'>-PCM3 &lt;------------&gt; *           * &lt;----DAI3-----&gt; BT</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI4-----&gt; DMIC</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI5-----&gt; FM</div><div class='del'>-                    *************</div><div class='del'>-</div><div class='del'>-For the example above we have to define 4 FE DAI links and 6 BE DAI links. The</div><div class='del'>-FE DAI links are defined as follows :-</div><div class='del'>-</div><div class='del'>-static struct snd_soc_dai_link machine_dais[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "PCM0 System",</div><div class='del'>-		.stream_name = "System Playback",</div><div class='del'>-		.cpu_dai_name = "System Pin",</div><div class='del'>-		.platform_name = "dsp-audio",</div><div class='del'>-		.codec_name = "snd-soc-dummy",</div><div class='del'>-		.codec_dai_name = "snd-soc-dummy-dai",</div><div class='del'>-		.dynamic = 1,</div><div class='del'>-		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},</div><div class='del'>-		.dpcm_playback = 1,</div><div class='del'>-	},</div><div class='del'>-	.....&lt; other FE and BE DAI links here &gt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-This FE DAI link is pretty similar to a regular DAI link except that we also</div><div class='del'>-set the DAI link to a DPCM FE with the "dynamic = 1". The supported FE stream</div><div class='del'>-directions should also be set with the "dpcm_playback" and "dpcm_capture"</div><div class='del'>-flags. There is also an option to specify the ordering of the trigger call for</div><div class='del'>-each FE. This allows the ASoC core to trigger the DSP before or after the other</div><div class='del'>-components (as some DSPs have strong requirements for the ordering DAI/DSP</div><div class='del'>-start and stop sequences).</div><div class='del'>-</div><div class='del'>-The FE DAI above sets the codec and code DAIs to dummy devices since the BE is</div><div class='del'>-dynamic and will change depending on runtime config.</div><div class='del'>-</div><div class='del'>-The BE DAIs are configured as follows :-</div><div class='del'>-</div><div class='del'>-static struct snd_soc_dai_link machine_dais[] = {</div><div class='del'>-	.....&lt; FE DAI links here &gt;</div><div class='del'>-	{</div><div class='del'>-		.name = "Codec Headset",</div><div class='del'>-		.cpu_dai_name = "ssp-dai.0",</div><div class='del'>-		.platform_name = "snd-soc-dummy",</div><div class='del'>-		.no_pcm = 1,</div><div class='del'>-		.codec_name = "rt5640.0-001c",</div><div class='del'>-		.codec_dai_name = "rt5640-aif1",</div><div class='del'>-		.ignore_suspend = 1,</div><div class='del'>-		.ignore_pmdown_time = 1,</div><div class='del'>-		.be_hw_params_fixup = hswult_ssp0_fixup,</div><div class='del'>-		.ops = &amp;haswell_ops,</div><div class='del'>-		.dpcm_playback = 1,</div><div class='del'>-		.dpcm_capture = 1,</div><div class='del'>-	},</div><div class='del'>-	.....&lt; other BE DAI links here &gt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-This BE DAI link connects DAI0 to the codec (in this case RT5460 AIF1). It sets</div><div class='del'>-the "no_pcm" flag to mark it has a BE and sets flags for supported stream</div><div class='del'>-directions using "dpcm_playback" and "dpcm_capture" above.</div><div class='del'>-</div><div class='del'>-The BE has also flags set for ignoring suspend and PM down time. This allows</div><div class='del'>-the BE to work in a hostless mode where the host CPU is not transferring data</div><div class='del'>-like a BT phone call :-</div><div class='del'>-</div><div class='del'>-                    *************</div><div class='del'>-PCM0 &lt;------------&gt; *           * &lt;----DAI0-----&gt; Codec Headset</div><div class='del'>-                    *           *</div><div class='del'>-PCM1 &lt;------------&gt; *           * &lt;----DAI1-----&gt; Codec Speakers</div><div class='del'>-                    *   DSP     *</div><div class='del'>-PCM2 &lt;------------&gt; *           * &lt;====DAI2=====&gt; MODEM</div><div class='del'>-                    *           *</div><div class='del'>-PCM3 &lt;------------&gt; *           * &lt;====DAI3=====&gt; BT</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI4-----&gt; DMIC</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI5-----&gt; FM</div><div class='del'>-                    *************</div><div class='del'>-</div><div class='del'>-This allows the host CPU to sleep whilst the DSP, MODEM DAI and the BT DAI are</div><div class='del'>-still in operation.</div><div class='del'>-</div><div class='del'>-A BE DAI link can also set the codec to a dummy device if the code is a device</div><div class='del'>-that is managed externally.</div><div class='del'>-</div><div class='del'>-Likewise a BE DAI can also set a dummy cpu DAI if the CPU DAI is managed by the</div><div class='del'>-DSP firmware.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2 FE/BE PCM operations</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-The BE above also exports some PCM operations and a "fixup" callback. The fixup</div><div class='del'>-callback is used by the machine driver to (re)configure the DAI based upon the</div><div class='del'>-FE hw params. i.e. the DSP may perform SRC or ASRC from the FE to BE.</div><div class='del'>-</div><div class='del'>-e.g. DSP converts all FE hw params to run at fixed rate of 48k, 16bit, stereo for</div><div class='del'>-DAI0. This means all FE hw_params have to be fixed in the machine driver for</div><div class='del'>-DAI0 so that the DAI is running at desired configuration regardless of the FE</div><div class='del'>-configuration.</div><div class='del'>-</div><div class='del'>-static int dai0_fixup(struct snd_soc_pcm_runtime *rtd,</div><div class='del'>-			struct snd_pcm_hw_params *params)</div><div class='del'>-{</div><div class='del'>-	struct snd_interval *rate = hw_param_interval(params,</div><div class='del'>-			SNDRV_PCM_HW_PARAM_RATE);</div><div class='del'>-	struct snd_interval *channels = hw_param_interval(params,</div><div class='del'>-						SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='del'>-</div><div class='del'>-	/* The DSP will covert the FE rate to 48k, stereo */</div><div class='del'>-	rate-&gt;min = rate-&gt;max = 48000;</div><div class='del'>-	channels-&gt;min = channels-&gt;max = 2;</div><div class='del'>-</div><div class='del'>-	/* set DAI0 to 16 bit */</div><div class='del'>-	snd_mask_set(&amp;params-&gt;masks[SNDRV_PCM_HW_PARAM_FORMAT -</div><div class='del'>-				    SNDRV_PCM_HW_PARAM_FIRST_MASK],</div><div class='del'>-				    SNDRV_PCM_FORMAT_S16_LE);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-The other PCM operation are the same as for regular DAI links. Use as necessary.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3 Widget graph connections</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-The BE DAI links will normally be connected to the graph at initialisation time</div><div class='del'>-by the ASoC DAPM core. However, if the BE codec or BE DAI is a dummy then this</div><div class='del'>-has to be set explicitly in the driver :-</div><div class='del'>-</div><div class='del'>-/* BE for codec Headset -  DAI0 is dummy and managed by DSP FW */</div><div class='del'>-{"DAI0 CODEC IN", NULL, "AIF1 Capture"},</div><div class='del'>-{"AIF1 Playback", NULL, "DAI0 CODEC OUT"},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Writing a DPCM DSP driver</div><div class='del'>-=========================</div><div class='del'>-</div><div class='del'>-The DPCM DSP driver looks much like a standard platform class ASoC driver</div><div class='del'>-combined with elements from a codec class driver. A DSP platform driver must</div><div class='del'>-implement :-</div><div class='del'>-</div><div class='del'>- 1) Front End PCM DAIs - i.e. struct snd_soc_dai_driver.</div><div class='del'>-</div><div class='del'>- 2) DAPM graph showing DSP audio routing from FE DAIs to BEs.</div><div class='del'>-</div><div class='del'>- 3) DAPM widgets from DSP graph.</div><div class='del'>-</div><div class='del'>- 4) Mixers for gains, routing, etc.</div><div class='del'>-</div><div class='del'>- 5) DMA configuration.</div><div class='del'>-</div><div class='del'>- 6) BE AIF widgets.</div><div class='del'>-</div><div class='del'>-Items 6 is important for routing the audio outside of the DSP. AIF need to be</div><div class='del'>-defined for each BE and each stream direction. e.g for BE DAI0 above we would</div><div class='del'>-have :-</div><div class='del'>-</div><div class='del'>-SND_SOC_DAPM_AIF_IN("DAI0 RX", NULL, 0, SND_SOC_NOPM, 0, 0),</div><div class='del'>-SND_SOC_DAPM_AIF_OUT("DAI0 TX", NULL, 0, SND_SOC_NOPM, 0, 0),</div><div class='del'>-</div><div class='del'>-The BE AIF are used to connect the DSP graph to the graphs for the other</div><div class='del'>-component drivers (e.g. codec graph).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Hostless PCM streams</div><div class='del'>-====================</div><div class='del'>-</div><div class='del'>-A hostless PCM stream is a stream that is not routed through the host CPU. An</div><div class='del'>-example of this would be a phone call from handset to modem.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                    *************</div><div class='del'>-PCM0 &lt;------------&gt; *           * &lt;----DAI0-----&gt; Codec Headset</div><div class='del'>-                    *           *</div><div class='del'>-PCM1 &lt;------------&gt; *           * &lt;====DAI1=====&gt; Codec Speakers/Mic</div><div class='del'>-                    *   DSP     *</div><div class='del'>-PCM2 &lt;------------&gt; *           * &lt;====DAI2=====&gt; MODEM</div><div class='del'>-                    *           *</div><div class='del'>-PCM3 &lt;------------&gt; *           * &lt;----DAI3-----&gt; BT</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI4-----&gt; DMIC</div><div class='del'>-                    *           *</div><div class='del'>-                    *           * &lt;----DAI5-----&gt; FM</div><div class='del'>-                    *************</div><div class='del'>-</div><div class='del'>-In this case the PCM data is routed via the DSP. The host CPU in this use case</div><div class='del'>-is only used for control and can sleep during the runtime of the stream.</div><div class='del'>-</div><div class='del'>-The host can control the hostless link either by :-</div><div class='del'>-</div><div class='del'>- 1) Configuring the link as a CODEC &lt;-&gt; CODEC style link. In this case the link</div><div class='del'>-    is enabled or disabled by the state of the DAPM graph. This usually means</div><div class='del'>-    there is a mixer control that can be used to connect or disconnect the path</div><div class='del'>-    between both DAIs.</div><div class='del'>-</div><div class='del'>- 2) Hostless FE. This FE has a virtual connection to the BE DAI links on the DAPM</div><div class='del'>-    graph. Control is then carried out by the FE as regular PCM operations.</div><div class='del'>-    This method gives more control over the DAI links, but requires much more</div><div class='del'>-    userspace code to control the link. Its recommended to use CODEC&lt;-&gt;CODEC</div><div class='del'>-    unless your HW needs more fine grained sequencing of the PCM ops.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CODEC &lt;-&gt; CODEC link</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-This DAI link is enabled when DAPM detects a valid path within the DAPM graph.</div><div class='del'>-The machine driver sets some additional parameters to the DAI link i.e.</div><div class='del'>-</div><div class='del'>-static const struct snd_soc_pcm_stream dai_params = {</div><div class='del'>-	.formats = SNDRV_PCM_FMTBIT_S32_LE,</div><div class='del'>-	.rate_min = 8000,</div><div class='del'>-	.rate_max = 8000,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_soc_dai_link dais[] = {</div><div class='del'>-	&lt; ... more DAI links above ... &gt;</div><div class='del'>-	{</div><div class='del'>-		.name = "MODEM",</div><div class='del'>-		.stream_name = "MODEM",</div><div class='del'>-		.cpu_dai_name = "dai2",</div><div class='del'>-		.codec_dai_name = "modem-aif1",</div><div class='del'>-		.codec_name = "modem",</div><div class='del'>-		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF</div><div class='del'>-				| SND_SOC_DAIFMT_CBM_CFM,</div><div class='del'>-		.params = &amp;dai_params,</div><div class='del'>-	}</div><div class='del'>-	&lt; ... more DAI links here ... &gt;</div><div class='del'>-</div><div class='del'>-These parameters are used to configure the DAI hw_params() when DAPM detects a</div><div class='del'>-valid path and then calls the PCM operations to start the link. DAPM will also</div><div class='del'>-call the appropriate PCM operations to disable the DAI when the path is no</div><div class='del'>-longer valid.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Hostless FE</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-The DAI link(s) are enabled by a FE that does not read or write any PCM data.</div><div class='del'>-This means creating a new FE that is connected with a virtual path to both</div><div class='del'>-DAI links. The DAI links will be started when the FE PCM is started and stopped</div><div class='del'>-when the FE PCM is stopped. Note that the FE PCM cannot read or write data in</div><div class='del'>-this configuration.</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/sound/alsa/soc/clocking.txt b/Documentation/sound/alsa/soc/clocking.txt<br/>deleted file mode 100644<br/>index b1300162e01c..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/soc/clocking.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/soc/clocking.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-Audio Clocking</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-This text describes the audio clocking terms in ASoC and digital audio in</div><div class='del'>-general. Note: Audio clocking can be complex!</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Master Clock</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-Every audio subsystem is driven by a master clock (sometimes referred to as MCLK</div><div class='del'>-or SYSCLK). This audio master clock can be derived from a number of sources</div><div class='del'>-(e.g. crystal, PLL, CPU clock) and is responsible for producing the correct</div><div class='del'>-audio playback and capture sample rates.</div><div class='del'>-</div><div class='del'>-Some master clocks (e.g. PLLs and CPU based clocks) are configurable in that</div><div class='del'>-their speed can be altered by software (depending on the system use and to save</div><div class='del'>-power). Other master clocks are fixed at a set frequency (i.e. crystals).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-DAI Clocks</div><div class='del'>-----------</div><div class='del'>-The Digital Audio Interface is usually driven by a Bit Clock (often referred to</div><div class='del'>-as BCLK). This clock is used to drive the digital audio data across the link</div><div class='del'>-between the codec and CPU.</div><div class='del'>-</div><div class='del'>-The DAI also has a frame clock to signal the start of each audio frame. This</div><div class='del'>-clock is sometimes referred to as LRC (left right clock) or FRAME. This clock</div><div class='del'>-runs at exactly the sample rate (LRC = Rate).</div><div class='del'>-</div><div class='del'>-Bit Clock can be generated as follows:-</div><div class='del'>-</div><div class='del'>-BCLK = MCLK / x</div><div class='del'>-</div><div class='del'>- or</div><div class='del'>-</div><div class='del'>-BCLK = LRC * x</div><div class='del'>-</div><div class='del'>- or</div><div class='del'>-</div><div class='del'>-BCLK = LRC * Channels * Word Size</div><div class='del'>-</div><div class='del'>-This relationship depends on the codec or SoC CPU in particular. In general</div><div class='del'>-it is best to configure BCLK to the lowest possible speed (depending on your</div><div class='del'>-rate, number of channels and word size) to save on power.</div><div class='del'>-</div><div class='del'>-It is also desirable to use the codec (if possible) to drive (or master) the</div><div class='del'>-audio clocks as it usually gives more accurate sample rates than the CPU.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/sound/alsa/soc/codec.txt b/Documentation/sound/alsa/soc/codec.txt<br/>deleted file mode 100644<br/>index db5f9c9ae149..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/soc/codec.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/soc/codec.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,179 +0,0 @@</div><div class='del'>-ASoC Codec Class Driver</div><div class='del'>-=======================</div><div class='del'>-</div><div class='del'>-The codec class driver is generic and hardware independent code that configures</div><div class='del'>-the codec, FM, MODEM, BT or external DSP to provide audio capture and playback.</div><div class='del'>-It should contain no code that is specific to the target platform or machine.</div><div class='del'>-All platform and machine specific code should be added to the platform and</div><div class='del'>-machine drivers respectively.</div><div class='del'>-</div><div class='del'>-Each codec class driver *must* provide the following features:-</div><div class='del'>-</div><div class='del'>- 1) Codec DAI and PCM configuration</div><div class='del'>- 2) Codec control IO - using RegMap API</div><div class='del'>- 3) Mixers and audio controls</div><div class='del'>- 4) Codec audio operations</div><div class='del'>- 5) DAPM description.</div><div class='del'>- 6) DAPM event handler.</div><div class='del'>-</div><div class='del'>-Optionally, codec drivers can also provide:-</div><div class='del'>-</div><div class='del'>- 7) DAC Digital mute control.</div><div class='del'>-</div><div class='del'>-Its probably best to use this guide in conjunction with the existing codec</div><div class='del'>-driver code in sound/soc/codecs/</div><div class='del'>-</div><div class='del'>-ASoC Codec driver breakdown</div><div class='del'>-===========================</div><div class='del'>-</div><div class='del'>-1 - Codec DAI and PCM configuration</div><div class='del'>------------------------------------</div><div class='del'>-Each codec driver must have a struct snd_soc_dai_driver to define its DAI and</div><div class='del'>-PCM capabilities and operations. This struct is exported so that it can be</div><div class='del'>-registered with the core by your machine driver.</div><div class='del'>-</div><div class='del'>-e.g.</div><div class='del'>-</div><div class='del'>-static struct snd_soc_dai_ops wm8731_dai_ops = {</div><div class='del'>-	.prepare	= wm8731_pcm_prepare,</div><div class='del'>-	.hw_params	= wm8731_hw_params,</div><div class='del'>-	.shutdown	= wm8731_shutdown,</div><div class='del'>-	.digital_mute	= wm8731_mute,</div><div class='del'>-	.set_sysclk	= wm8731_set_dai_sysclk,</div><div class='del'>-	.set_fmt	= wm8731_set_dai_fmt,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct snd_soc_dai_driver wm8731_dai = {</div><div class='del'>-	.name = "wm8731-hifi",</div><div class='del'>-	.playback = {</div><div class='del'>-		.stream_name = "Playback",</div><div class='del'>-		.channels_min = 1,</div><div class='del'>-		.channels_max = 2,</div><div class='del'>-		.rates = WM8731_RATES,</div><div class='del'>-		.formats = WM8731_FORMATS,},</div><div class='del'>-	.capture = {</div><div class='del'>-		.stream_name = "Capture",</div><div class='del'>-		.channels_min = 1,</div><div class='del'>-		.channels_max = 2,</div><div class='del'>-		.rates = WM8731_RATES,</div><div class='del'>-		.formats = WM8731_FORMATS,},</div><div class='del'>-	.ops = &amp;wm8731_dai_ops,</div><div class='del'>-	.symmetric_rates = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2 - Codec control IO</div><div class='del'>---------------------</div><div class='del'>-The codec can usually be controlled via an I2C or SPI style interface</div><div class='del'>-(AC97 combines control with data in the DAI). The codec driver should use the</div><div class='del'>-Regmap API for all codec IO. Please see include/linux/regmap.h and existing</div><div class='del'>-codec drivers for example regmap usage.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3 - Mixers and audio controls</div><div class='del'>------------------------------</div><div class='del'>-All the codec mixers and audio controls can be defined using the convenience</div><div class='del'>-macros defined in soc.h.</div><div class='del'>-</div><div class='del'>-    #define SOC_SINGLE(xname, reg, shift, mask, invert)</div><div class='del'>-</div><div class='del'>-Defines a single control as follows:-</div><div class='del'>-</div><div class='del'>-  xname = Control name e.g. "Playback Volume"</div><div class='del'>-  reg = codec register</div><div class='del'>-  shift = control bit(s) offset in register</div><div class='del'>-  mask = control bit size(s) e.g. mask of 7 = 3 bits</div><div class='del'>-  invert = the control is inverted</div><div class='del'>-</div><div class='del'>-Other macros include:-</div><div class='del'>-</div><div class='del'>-    #define SOC_DOUBLE(xname, reg, shift_left, shift_right, mask, invert)</div><div class='del'>-</div><div class='del'>-A stereo control</div><div class='del'>-</div><div class='del'>-    #define SOC_DOUBLE_R(xname, reg_left, reg_right, shift, mask, invert)</div><div class='del'>-</div><div class='del'>-A stereo control spanning 2 registers</div><div class='del'>-</div><div class='del'>-    #define SOC_ENUM_SINGLE(xreg, xshift, xmask, xtexts)</div><div class='del'>-</div><div class='del'>-Defines an single enumerated control as follows:-</div><div class='del'>-</div><div class='del'>-   xreg = register</div><div class='del'>-   xshift = control bit(s) offset in register</div><div class='del'>-   xmask = control bit(s) size</div><div class='del'>-   xtexts = pointer to array of strings that describe each setting</div><div class='del'>-</div><div class='del'>-   #define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xtexts)</div><div class='del'>-</div><div class='del'>-Defines a stereo enumerated control</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4 - Codec Audio Operations</div><div class='del'>---------------------------</div><div class='del'>-The codec driver also supports the following ALSA PCM operations:-</div><div class='del'>-</div><div class='del'>-/* SoC audio ops */</div><div class='del'>-struct snd_soc_ops {</div><div class='del'>-	int (*startup)(struct snd_pcm_substream *);</div><div class='del'>-	void (*shutdown)(struct snd_pcm_substream *);</div><div class='del'>-	int (*hw_params)(struct snd_pcm_substream *, struct snd_pcm_hw_params *);</div><div class='del'>-	int (*hw_free)(struct snd_pcm_substream *);</div><div class='del'>-	int (*prepare)(struct snd_pcm_substream *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-Please refer to the ALSA driver PCM documentation for details.</div><div class='del'>-http://www.alsa-project.org/~iwai/writing-an-alsa-driver/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5 - DAPM description.</div><div class='del'>----------------------</div><div class='del'>-The Dynamic Audio Power Management description describes the codec power</div><div class='del'>-components and their relationships and registers to the ASoC core.</div><div class='del'>-Please read dapm.txt for details of building the description.</div><div class='del'>-</div><div class='del'>-Please also see the examples in other codec drivers.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-6 - DAPM event handler</div><div class='del'>-----------------------</div><div class='del'>-This function is a callback that handles codec domain PM calls and system</div><div class='del'>-domain PM calls (e.g. suspend and resume). It is used to put the codec</div><div class='del'>-to sleep when not in use.</div><div class='del'>-</div><div class='del'>-Power states:-</div><div class='del'>-</div><div class='del'>-	SNDRV_CTL_POWER_D0: /* full On */</div><div class='del'>-	/* vref/mid, clk and osc on, active */</div><div class='del'>-</div><div class='del'>-	SNDRV_CTL_POWER_D1: /* partial On */</div><div class='del'>-	SNDRV_CTL_POWER_D2: /* partial On */</div><div class='del'>-</div><div class='del'>-	SNDRV_CTL_POWER_D3hot: /* Off, with power */</div><div class='del'>-	/* everything off except vref/vmid, inactive */</div><div class='del'>-</div><div class='del'>-	SNDRV_CTL_POWER_D3cold: /* Everything Off, without power */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-7 - Codec DAC digital mute control</div><div class='del'>-----------------------------------</div><div class='del'>-Most codecs have a digital mute before the DACs that can be used to</div><div class='del'>-minimise any system noise.  The mute stops any digital data from</div><div class='del'>-entering the DAC.</div><div class='del'>-</div><div class='del'>-A callback can be created that is called by the core for each codec DAI</div><div class='del'>-when the mute is applied or freed.</div><div class='del'>-</div><div class='del'>-i.e.</div><div class='del'>-</div><div class='del'>-static int wm8974_mute(struct snd_soc_dai *dai, int mute)</div><div class='del'>-{</div><div class='del'>-	struct snd_soc_codec *codec = dai-&gt;codec;</div><div class='del'>-	u16 mute_reg = snd_soc_read(codec, WM8974_DAC) &amp; 0xffbf;</div><div class='del'>-</div><div class='del'>-	if (mute)</div><div class='del'>-		snd_soc_write(codec, WM8974_DAC, mute_reg | 0x40);</div><div class='del'>-	else</div><div class='del'>-		snd_soc_write(codec, WM8974_DAC, mute_reg);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/Documentation/sound/alsa/soc/dapm.txt b/Documentation/sound/alsa/soc/dapm.txt<br/>deleted file mode 100644<br/>index c45bd79f291e..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/soc/dapm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/soc/dapm.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,305 +0,0 @@</div><div class='del'>-Dynamic Audio Power Management for Portable Devices</div><div class='del'>-===================================================</div><div class='del'>-</div><div class='del'>-1. Description</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-Dynamic Audio Power Management (DAPM) is designed to allow portable</div><div class='del'>-Linux devices to use the minimum amount of power within the audio</div><div class='del'>-subsystem at all times. It is independent of other kernel PM and as</div><div class='del'>-such, can easily co-exist with the other PM systems.</div><div class='del'>-</div><div class='del'>-DAPM is also completely transparent to all user space applications as</div><div class='del'>-all power switching is done within the ASoC core. No code changes or</div><div class='del'>-recompiling are required for user space applications. DAPM makes power</div><div class='del'>-switching decisions based upon any audio stream (capture/playback)</div><div class='del'>-activity and audio mixer settings within the device.</div><div class='del'>-</div><div class='del'>-DAPM spans the whole machine. It covers power control within the entire</div><div class='del'>-audio subsystem, this includes internal codec power blocks and machine</div><div class='del'>-level power systems.</div><div class='del'>-</div><div class='del'>-There are 4 power domains within DAPM</div><div class='del'>-</div><div class='del'>-   1. Codec bias domain - VREF, VMID (core codec and audio power)</div><div class='del'>-      Usually controlled at codec probe/remove and suspend/resume, although</div><div class='del'>-      can be set at stream time if power is not needed for sidetone, etc.</div><div class='del'>-</div><div class='del'>-   2. Platform/Machine domain - physically connected inputs and outputs</div><div class='del'>-      Is platform/machine and user action specific, is configured by the</div><div class='del'>-      machine driver and responds to asynchronous events e.g when HP</div><div class='del'>-      are inserted</div><div class='del'>-</div><div class='del'>-   3. Path domain - audio subsystem signal paths</div><div class='del'>-      Automatically set when mixer and mux settings are changed by the user.</div><div class='del'>-      e.g. alsamixer, amixer.</div><div class='del'>-</div><div class='del'>-   4. Stream domain - DACs and ADCs.</div><div class='del'>-      Enabled and disabled when stream playback/capture is started and</div><div class='del'>-      stopped respectively. e.g. aplay, arecord.</div><div class='del'>-</div><div class='del'>-All DAPM power switching decisions are made automatically by consulting an audio</div><div class='del'>-routing map of the whole machine. This map is specific to each machine and</div><div class='del'>-consists of the interconnections between every audio component (including</div><div class='del'>-internal codec components). All audio components that effect power are called</div><div class='del'>-widgets hereafter.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2. DAPM Widgets</div><div class='del'>-===============</div><div class='del'>-</div><div class='del'>-Audio DAPM widgets fall into a number of types:-</div><div class='del'>-</div><div class='del'>- o Mixer      - Mixes several analog signals into a single analog signal.</div><div class='del'>- o Mux        - An analog switch that outputs only one of many inputs.</div><div class='del'>- o PGA        - A programmable gain amplifier or attenuation widget.</div><div class='del'>- o ADC        - Analog to Digital Converter</div><div class='del'>- o DAC        - Digital to Analog Converter</div><div class='del'>- o Switch     - An analog switch</div><div class='del'>- o Input      - A codec input pin</div><div class='del'>- o Output     - A codec output pin</div><div class='del'>- o Headphone  - Headphone (and optional Jack)</div><div class='del'>- o Mic        - Mic (and optional Jack)</div><div class='del'>- o Line       - Line Input/Output (and optional Jack)</div><div class='del'>- o Speaker    - Speaker</div><div class='del'>- o Supply     - Power or clock supply widget used by other widgets.</div><div class='del'>- o Regulator  - External regulator that supplies power to audio components.</div><div class='del'>- o Clock      -	External clock that supplies clock to audio components.</div><div class='del'>- o AIF IN     - Audio Interface Input (with TDM slot mask).</div><div class='del'>- o AIF OUT    - Audio Interface Output (with TDM slot mask).</div><div class='del'>- o Siggen     - Signal Generator.</div><div class='del'>- o DAI IN     - Digital Audio Interface Input.</div><div class='del'>- o DAI OUT    - Digital Audio Interface Output.</div><div class='del'>- o DAI Link   - DAI Link between two DAI structures */</div><div class='del'>- o Pre        - Special PRE widget (exec before all others)</div><div class='del'>- o Post       - Special POST widget (exec after all others)</div><div class='del'>-</div><div class='del'>-(Widgets are defined in include/sound/soc-dapm.h)</div><div class='del'>-</div><div class='del'>-Widgets can be added to the sound card by any of the component driver types.</div><div class='del'>-There are convenience macros defined in soc-dapm.h that can be used to quickly</div><div class='del'>-build a list of widgets of the codecs and machines DAPM widgets.</div><div class='del'>-</div><div class='del'>-Most widgets have a name, register, shift and invert. Some widgets have extra</div><div class='del'>-parameters for stream name and kcontrols.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2.1 Stream Domain Widgets</div><div class='del'>--------------------------</div><div class='del'>-</div><div class='del'>-Stream Widgets relate to the stream power domain and only consist of ADCs</div><div class='del'>-(analog to digital converters), DACs (digital to analog converters),</div><div class='del'>-AIF IN and AIF OUT.</div><div class='del'>-</div><div class='del'>-Stream widgets have the following format:-</div><div class='del'>-</div><div class='del'>-SND_SOC_DAPM_DAC(name, stream name, reg, shift, invert),</div><div class='del'>-SND_SOC_DAPM_AIF_IN(name, stream, slot, reg, shift, invert)</div><div class='del'>-</div><div class='del'>-NOTE: the stream name must match the corresponding stream name in your codec</div><div class='del'>-snd_soc_codec_dai.</div><div class='del'>-</div><div class='del'>-e.g. stream widgets for HiFi playback and capture</div><div class='del'>-</div><div class='del'>-SND_SOC_DAPM_DAC("HiFi DAC", "HiFi Playback", REG, 3, 1),</div><div class='del'>-SND_SOC_DAPM_ADC("HiFi ADC", "HiFi Capture", REG, 2, 1),</div><div class='del'>-</div><div class='del'>-e.g. stream widgets for AIF</div><div class='del'>-</div><div class='del'>-SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),</div><div class='del'>-SND_SOC_DAPM_AIF_OUT("AIF1TX", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0),</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2.2 Path Domain Widgets</div><div class='del'>------------------------</div><div class='del'>-</div><div class='del'>-Path domain widgets have a ability to control or affect the audio signal or</div><div class='del'>-audio paths within the audio subsystem. They have the following form:-</div><div class='del'>-</div><div class='del'>-SND_SOC_DAPM_PGA(name, reg, shift, invert, controls, num_controls)</div><div class='del'>-</div><div class='del'>-Any widget kcontrols can be set using the controls and num_controls members.</div><div class='del'>-</div><div class='del'>-e.g. Mixer widget (the kcontrols are declared first)</div><div class='del'>-</div><div class='del'>-/* Output Mixer */</div><div class='del'>-static const snd_kcontrol_new_t wm8731_output_mixer_controls[] = {</div><div class='del'>-SOC_DAPM_SINGLE("Line Bypass Switch", WM8731_APANA, 3, 1, 0),</div><div class='del'>-SOC_DAPM_SINGLE("Mic Sidetone Switch", WM8731_APANA, 5, 1, 0),</div><div class='del'>-SOC_DAPM_SINGLE("HiFi Playback Switch", WM8731_APANA, 4, 1, 0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, wm8731_output_mixer_controls,</div><div class='del'>-	ARRAY_SIZE(wm8731_output_mixer_controls)),</div><div class='del'>-</div><div class='del'>-If you don't want the mixer elements prefixed with the name of the mixer widget,</div><div class='del'>-you can use SND_SOC_DAPM_MIXER_NAMED_CTL instead. the parameters are the same</div><div class='del'>-as for SND_SOC_DAPM_MIXER.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2.3 Machine domain Widgets</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-Machine widgets are different from codec widgets in that they don't have a</div><div class='del'>-codec register bit associated with them. A machine widget is assigned to each</div><div class='del'>-machine audio component (non codec or DSP) that can be independently</div><div class='del'>-powered. e.g.</div><div class='del'>-</div><div class='del'>- o Speaker Amp</div><div class='del'>- o Microphone Bias</div><div class='del'>- o Jack connectors</div><div class='del'>-</div><div class='del'>-A machine widget can have an optional call back.</div><div class='del'>-</div><div class='del'>-e.g. Jack connector widget for an external Mic that enables Mic Bias</div><div class='del'>-when the Mic is inserted:-</div><div class='del'>-</div><div class='del'>-static int spitz_mic_bias(struct snd_soc_dapm_widget* w, int event)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(SPITZ_GPIO_MIC_BIAS, SND_SOC_DAPM_EVENT_ON(event));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-SND_SOC_DAPM_MIC("Mic Jack", spitz_mic_bias),</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2.4 Codec (BIAS) Domain</div><div class='del'>------------------------</div><div class='del'>-</div><div class='del'>-The codec bias power domain has no widgets and is handled by the codecs DAPM</div><div class='del'>-event handler. This handler is called when the codec powerstate is changed wrt</div><div class='del'>-to any stream event or by kernel PM events.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2.5 Virtual Widgets</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-Sometimes widgets exist in the codec or machine audio map that don't have any</div><div class='del'>-corresponding soft power control. In this case it is necessary to create</div><div class='del'>-a virtual widget - a widget with no control bits e.g.</div><div class='del'>-</div><div class='del'>-SND_SOC_DAPM_MIXER("AC97 Mixer", SND_SOC_DAPM_NOPM, 0, 0, NULL, 0),</div><div class='del'>-</div><div class='del'>-This can be used to merge to signal paths together in software.</div><div class='del'>-</div><div class='del'>-After all the widgets have been defined, they can then be added to the DAPM</div><div class='del'>-subsystem individually with a call to snd_soc_dapm_new_control().</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3. Codec/DSP Widget Interconnections</div><div class='del'>-====================================</div><div class='del'>-</div><div class='del'>-Widgets are connected to each other within the codec, platform and machine by</div><div class='del'>-audio paths (called interconnections). Each interconnection must be defined in</div><div class='del'>-order to create a map of all audio paths between widgets.</div><div class='del'>-</div><div class='del'>-This is easiest with a diagram of the codec or DSP (and schematic of the machine</div><div class='del'>-audio system), as it requires joining widgets together via their audio signal</div><div class='del'>-paths.</div><div class='del'>-</div><div class='del'>-e.g., from the WM8731 output mixer (wm8731.c)</div><div class='del'>-</div><div class='del'>-The WM8731 output mixer has 3 inputs (sources)</div><div class='del'>-</div><div class='del'>- 1. Line Bypass Input</div><div class='del'>- 2. DAC (HiFi playback)</div><div class='del'>- 3. Mic Sidetone Input</div><div class='del'>-</div><div class='del'>-Each input in this example has a kcontrol associated with it (defined in example</div><div class='del'>-above) and is connected to the output mixer via its kcontrol name. We can now</div><div class='del'>-connect the destination widget (wrt audio signal) with its source widgets.</div><div class='del'>-</div><div class='del'>-	/* output mixer */</div><div class='del'>-	{"Output Mixer", "Line Bypass Switch", "Line Input"},</div><div class='del'>-	{"Output Mixer", "HiFi Playback Switch", "DAC"},</div><div class='del'>-	{"Output Mixer", "Mic Sidetone Switch", "Mic Bias"},</div><div class='del'>-</div><div class='del'>-So we have :-</div><div class='del'>-</div><div class='del'>-	Destination Widget  &lt;=== Path Name &lt;=== Source Widget</div><div class='del'>-</div><div class='del'>-Or:-</div><div class='del'>-</div><div class='del'>-	Sink, Path, Source</div><div class='del'>-</div><div class='del'>-Or :-</div><div class='del'>-</div><div class='del'>-	"Output Mixer" is connected to the "DAC" via the "HiFi Playback Switch".</div><div class='del'>-</div><div class='del'>-When there is no path name connecting widgets (e.g. a direct connection) we</div><div class='del'>-pass NULL for the path name.</div><div class='del'>-</div><div class='del'>-Interconnections are created with a call to:-</div><div class='del'>-</div><div class='del'>-snd_soc_dapm_connect_input(codec, sink, path, source);</div><div class='del'>-</div><div class='del'>-Finally, snd_soc_dapm_new_widgets(codec) must be called after all widgets and</div><div class='del'>-interconnections have been registered with the core. This causes the core to</div><div class='del'>-scan the codec and machine so that the internal DAPM state matches the</div><div class='del'>-physical state of the machine.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3.1 Machine Widget Interconnections</div><div class='del'>------------------------------------</div><div class='del'>-Machine widget interconnections are created in the same way as codec ones and</div><div class='del'>-directly connect the codec pins to machine level widgets.</div><div class='del'>-</div><div class='del'>-e.g. connects the speaker out codec pins to the internal speaker.</div><div class='del'>-</div><div class='del'>-	/* ext speaker connected to codec pins LOUT2, ROUT2  */</div><div class='del'>-	{"Ext Spk", NULL , "ROUT2"},</div><div class='del'>-	{"Ext Spk", NULL , "LOUT2"},</div><div class='del'>-</div><div class='del'>-This allows the DAPM to power on and off pins that are connected (and in use)</div><div class='del'>-and pins that are NC respectively.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4 Endpoint Widgets</div><div class='del'>-===================</div><div class='del'>-An endpoint is a start or end point (widget) of an audio signal within the</div><div class='del'>-machine and includes the codec. e.g.</div><div class='del'>-</div><div class='del'>- o Headphone Jack</div><div class='del'>- o Internal Speaker</div><div class='del'>- o Internal Mic</div><div class='del'>- o Mic Jack</div><div class='del'>- o Codec Pins</div><div class='del'>-</div><div class='del'>-Endpoints are added to the DAPM graph so that their usage can be determined in</div><div class='del'>-order to save power. e.g. NC codecs pins will be switched OFF, unconnected</div><div class='del'>-jacks can also be switched OFF.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5 DAPM Widget Events</div><div class='del'>-====================</div><div class='del'>-</div><div class='del'>-Some widgets can register their interest with the DAPM core in PM events.</div><div class='del'>-e.g. A Speaker with an amplifier registers a widget so the amplifier can be</div><div class='del'>-powered only when the spk is in use.</div><div class='del'>-</div><div class='del'>-/* turn speaker amplifier on/off depending on use */</div><div class='del'>-static int corgi_amp_event(struct snd_soc_dapm_widget *w, int event)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(CORGI_GPIO_APM_ON, SND_SOC_DAPM_EVENT_ON(event));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* corgi machine dapm widgets */</div><div class='del'>-static const struct snd_soc_dapm_widget wm8731_dapm_widgets =</div><div class='del'>-	SND_SOC_DAPM_SPK("Ext Spk", corgi_amp_event);</div><div class='del'>-</div><div class='del'>-Please see soc-dapm.h for all other widgets that support events.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5.1 Event types</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-The following event types are supported by event widgets.</div><div class='del'>-</div><div class='del'>-/* dapm event types */</div><div class='del'>-#define SND_SOC_DAPM_PRE_PMU	0x1 	/* before widget power up */</div><div class='del'>-#define SND_SOC_DAPM_POST_PMU	0x2		/* after widget power up */</div><div class='del'>-#define SND_SOC_DAPM_PRE_PMD	0x4 	/* before widget power down */</div><div class='del'>-#define SND_SOC_DAPM_POST_PMD	0x8		/* after widget power down */</div><div class='del'>-#define SND_SOC_DAPM_PRE_REG	0x10	/* before audio path setup */</div><div class='del'>-#define SND_SOC_DAPM_POST_REG	0x20	/* after audio path setup */</div><div class='head'>diff --git a/Documentation/sound/alsa/soc/jack.txt b/Documentation/sound/alsa/soc/jack.txt<br/>deleted file mode 100644<br/>index fcf82a417293..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/soc/jack.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/soc/jack.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,71 +0,0 @@</div><div class='del'>-ASoC jack detection</div><div class='del'>-===================</div><div class='del'>-</div><div class='del'>-ALSA has a standard API for representing physical jacks to user space,</div><div class='del'>-the kernel side of which can be seen in include/sound/jack.h.  ASoC</div><div class='del'>-provides a version of this API adding two additional features:</div><div class='del'>-</div><div class='del'>- - It allows more than one jack detection method to work together on one</div><div class='del'>-   user visible jack.  In embedded systems it is common for multiple</div><div class='del'>-   to be present on a single jack but handled by separate bits of</div><div class='del'>-   hardware.</div><div class='del'>-</div><div class='del'>- - Integration with DAPM, allowing DAPM endpoints to be updated</div><div class='del'>-   automatically based on the detected jack status (eg, turning off the</div><div class='del'>-   headphone outputs if no headphones are present).</div><div class='del'>-</div><div class='del'>-This is done by splitting the jacks up into three things working</div><div class='del'>-together: the jack itself represented by a struct snd_soc_jack, sets of</div><div class='del'>-snd_soc_jack_pins representing DAPM endpoints to update and blocks of</div><div class='del'>-code providing jack reporting mechanisms.</div><div class='del'>-</div><div class='del'>-For example, a system may have a stereo headset jack with two reporting</div><div class='del'>-mechanisms, one for the headphone and one for the microphone.  Some</div><div class='del'>-systems won't be able to use their speaker output while a headphone is</div><div class='del'>-connected and so will want to make sure to update both speaker and</div><div class='del'>-headphone when the headphone jack status changes.</div><div class='del'>-</div><div class='del'>-The jack - struct snd_soc_jack</div><div class='del'>-==============================</div><div class='del'>-</div><div class='del'>-This represents a physical jack on the system and is what is visible to</div><div class='del'>-user space.  The jack itself is completely passive, it is set up by the</div><div class='del'>-machine driver and updated by jack detection methods.</div><div class='del'>-</div><div class='del'>-Jacks are created by the machine driver calling snd_soc_jack_new().</div><div class='del'>-</div><div class='del'>-snd_soc_jack_pin</div><div class='del'>-================</div><div class='del'>-</div><div class='del'>-These represent a DAPM pin to update depending on some of the status</div><div class='del'>-bits supported by the jack.  Each snd_soc_jack has zero or more of these</div><div class='del'>-which are updated automatically.  They are created by the machine driver</div><div class='del'>-and associated with the jack using snd_soc_jack_add_pins().  The status</div><div class='del'>-of the endpoint may configured to be the opposite of the jack status if</div><div class='del'>-required (eg, enabling a built in microphone if a microphone is not</div><div class='del'>-connected via a jack).</div><div class='del'>-</div><div class='del'>-Jack detection methods</div><div class='del'>-======================</div><div class='del'>-</div><div class='del'>-Actual jack detection is done by code which is able to monitor some</div><div class='del'>-input to the system and update a jack by calling snd_soc_jack_report(),</div><div class='del'>-specifying a subset of bits to update.  The jack detection code should</div><div class='del'>-be set up by the machine driver, taking configuration for the jack to</div><div class='del'>-update and the set of things to report when the jack is connected.</div><div class='del'>-</div><div class='del'>-Often this is done based on the status of a GPIO - a handler for this is</div><div class='del'>-provided by the snd_soc_jack_add_gpio() function.  Other methods are</div><div class='del'>-also available, for example integrated into CODECs.  One example of</div><div class='del'>-CODEC integrated jack detection can be see in the WM8350 driver.</div><div class='del'>-</div><div class='del'>-Each jack may have multiple reporting mechanisms, though it will need at</div><div class='del'>-least one to be useful.</div><div class='del'>-</div><div class='del'>-Machine drivers</div><div class='del'>-===============</div><div class='del'>-</div><div class='del'>-These are all hooked together by the machine driver depending on the</div><div class='del'>-system hardware.  The machine driver will set up the snd_soc_jack and</div><div class='del'>-the list of pins to update then set up one or more jack detection</div><div class='del'>-mechanisms to update that jack based on their current status.</div><div class='head'>diff --git a/Documentation/sound/alsa/soc/machine.txt b/Documentation/sound/alsa/soc/machine.txt<br/>deleted file mode 100644<br/>index 6bf2d2063b52..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/soc/machine.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/soc/machine.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,93 +0,0 @@</div><div class='del'>-ASoC Machine Driver</div><div class='del'>-===================</div><div class='del'>-</div><div class='del'>-The ASoC machine (or board) driver is the code that glues together all the</div><div class='del'>-component drivers (e.g. codecs, platforms and DAIs). It also describes the</div><div class='del'>-relationships between each component which include audio paths, GPIOs,</div><div class='del'>-interrupts, clocking, jacks and voltage regulators.</div><div class='del'>-</div><div class='del'>-The machine driver can contain codec and platform specific code. It registers</div><div class='del'>-the audio subsystem with the kernel as a platform device and is represented by</div><div class='del'>-the following struct:-</div><div class='del'>-</div><div class='del'>-/* SoC machine */</div><div class='del'>-struct snd_soc_card {</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	...</div><div class='del'>-</div><div class='del'>-	int (*probe)(struct platform_device *pdev);</div><div class='del'>-	int (*remove)(struct platform_device *pdev);</div><div class='del'>-</div><div class='del'>-	/* the pre and post PM functions are used to do any PM work before and</div><div class='del'>-	 * after the codec and DAIs do any PM work. */</div><div class='del'>-	int (*suspend_pre)(struct platform_device *pdev, pm_message_t state);</div><div class='del'>-	int (*suspend_post)(struct platform_device *pdev, pm_message_t state);</div><div class='del'>-	int (*resume_pre)(struct platform_device *pdev);</div><div class='del'>-	int (*resume_post)(struct platform_device *pdev);</div><div class='del'>-</div><div class='del'>-	...</div><div class='del'>-</div><div class='del'>-	/* CPU &lt;--&gt; Codec DAI links  */</div><div class='del'>-	struct snd_soc_dai_link *dai_link;</div><div class='del'>-	int num_links;</div><div class='del'>-</div><div class='del'>-	...</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-probe()/remove()</div><div class='del'>-----------------</div><div class='del'>-probe/remove are optional. Do any machine specific probe here.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-suspend()/resume()</div><div class='del'>-------------------</div><div class='del'>-The machine driver has pre and post versions of suspend and resume to take care</div><div class='del'>-of any machine audio tasks that have to be done before or after the codec, DAIs</div><div class='del'>-and DMA is suspended and resumed. Optional.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Machine DAI Configuration</div><div class='del'>--------------------------</div><div class='del'>-The machine DAI configuration glues all the codec and CPU DAIs together. It can</div><div class='del'>-also be used to set up the DAI system clock and for any machine related DAI</div><div class='del'>-initialisation e.g. the machine audio map can be connected to the codec audio</div><div class='del'>-map, unconnected codec pins can be set as such.</div><div class='del'>-</div><div class='del'>-struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.</div><div class='del'>-</div><div class='del'>-/* corgi digital audio interface glue - connects codec &lt;--&gt; CPU */</div><div class='del'>-static struct snd_soc_dai_link corgi_dai = {</div><div class='del'>-	.name = "WM8731",</div><div class='del'>-	.stream_name = "WM8731",</div><div class='del'>-	.cpu_dai_name = "pxa-is2-dai",</div><div class='del'>-	.codec_dai_name = "wm8731-hifi",</div><div class='del'>-	.platform_name = "pxa-pcm-audio",</div><div class='del'>-	.codec_name = "wm8713-codec.0-001a",</div><div class='del'>-	.init = corgi_wm8731_init,</div><div class='del'>-	.ops = &amp;corgi_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct snd_soc_card then sets up the machine with its DAIs. e.g.</div><div class='del'>-</div><div class='del'>-/* corgi audio machine driver */</div><div class='del'>-static struct snd_soc_card snd_soc_corgi = {</div><div class='del'>-	.name = "Corgi",</div><div class='del'>-	.dai_link = &amp;corgi_dai,</div><div class='del'>-	.num_links = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Machine Power Map</div><div class='del'>------------------</div><div class='del'>-</div><div class='del'>-The machine driver can optionally extend the codec power map and to become an</div><div class='del'>-audio power map of the audio subsystem. This allows for automatic power up/down</div><div class='del'>-of speaker/HP amplifiers, etc. Codec pins can be connected to the machines jack</div><div class='del'>-sockets in the machine init function.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Machine Controls</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-Machine specific audio mixer controls can be added in the DAI init function.</div><div class='head'>diff --git a/Documentation/sound/alsa/soc/overview.txt b/Documentation/sound/alsa/soc/overview.txt<br/>deleted file mode 100644<br/>index f3f28b7ae242..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/soc/overview.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/soc/overview.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-ALSA SoC Layer</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-The overall project goal of the ALSA System on Chip (ASoC) layer is to</div><div class='del'>-provide better ALSA support for embedded system-on-chip processors (e.g.</div><div class='del'>-pxa2xx, au1x00, iMX, etc) and portable audio codecs.  Prior to the ASoC</div><div class='del'>-subsystem there was some support in the kernel for SoC audio, however it</div><div class='del'>-had some limitations:-</div><div class='del'>-</div><div class='del'>-  * Codec drivers were often tightly coupled to the underlying SoC</div><div class='del'>-    CPU. This is not ideal and leads to code duplication - for example,</div><div class='del'>-    Linux had different wm8731 drivers for 4 different SoC platforms.</div><div class='del'>-</div><div class='del'>-  * There was no standard method to signal user initiated audio events (e.g.</div><div class='del'>-    Headphone/Mic insertion, Headphone/Mic detection after an insertion</div><div class='del'>-    event). These are quite common events on portable devices and often require</div><div class='del'>-    machine specific code to re-route audio, enable amps, etc., after such an</div><div class='del'>-    event.</div><div class='del'>-</div><div class='del'>-  * Drivers tended to power up the entire codec when playing (or</div><div class='del'>-    recording) audio. This is fine for a PC, but tends to waste a lot of</div><div class='del'>-    power on portable devices. There was also no support for saving</div><div class='del'>-    power via changing codec oversampling rates, bias currents, etc.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ASoC Design</div><div class='del'>-===========</div><div class='del'>-</div><div class='del'>-The ASoC layer is designed to address these issues and provide the following</div><div class='del'>-features :-</div><div class='del'>-</div><div class='del'>-  * Codec independence. Allows reuse of codec drivers on other platforms</div><div class='del'>-    and machines.</div><div class='del'>-</div><div class='del'>-  * Easy I2S/PCM audio interface setup between codec and SoC. Each SoC</div><div class='del'>-    interface and codec registers its audio interface capabilities with the</div><div class='del'>-    core and are subsequently matched and configured when the application</div><div class='del'>-    hardware parameters are known.</div><div class='del'>-</div><div class='del'>-  * Dynamic Audio Power Management (DAPM). DAPM automatically sets the codec to</div><div class='del'>-    its minimum power state at all times. This includes powering up/down</div><div class='del'>-    internal power blocks depending on the internal codec audio routing and any</div><div class='del'>-    active streams.</div><div class='del'>-</div><div class='del'>-  * Pop and click reduction. Pops and clicks can be reduced by powering the</div><div class='del'>-    codec up/down in the correct sequence (including using digital mute). ASoC</div><div class='del'>-    signals the codec when to change power states.</div><div class='del'>-</div><div class='del'>-  * Machine specific controls: Allow machines to add controls to the sound card</div><div class='del'>-    (e.g. volume control for speaker amplifier).</div><div class='del'>-</div><div class='del'>-To achieve all this, ASoC basically splits an embedded audio system into</div><div class='del'>-multiple re-usable component drivers :-</div><div class='del'>-</div><div class='del'>-  * Codec class drivers: The codec class driver is platform independent and</div><div class='del'>-    contains audio controls, audio interface capabilities, codec DAPM</div><div class='del'>-    definition and codec IO functions. This class extends to BT, FM and MODEM</div><div class='del'>-    ICs if required. Codec class drivers should be generic code that can run</div><div class='del'>-    on any architecture and machine.</div><div class='del'>-</div><div class='del'>-  * Platform class drivers: The platform class driver includes the audio DMA</div><div class='del'>-    engine driver, digital audio interface (DAI) drivers (e.g. I2S, AC97, PCM)</div><div class='del'>-    and any audio DSP drivers for that platform.</div><div class='del'>-</div><div class='del'>-  * Machine class driver: The machine driver class acts as the glue that</div><div class='del'>-    describes and binds the other component drivers together to form an ALSA</div><div class='del'>-    "sound card device". It handles any machine specific controls and</div><div class='del'>-    machine level audio events (e.g. turning on an amp at start of playback).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Documentation</div><div class='del'>-=============</div><div class='del'>-</div><div class='del'>-The documentation is spilt into the following sections:-</div><div class='del'>-</div><div class='del'>-overview.txt: This file.</div><div class='del'>-</div><div class='del'>-codec.txt: Codec driver internals.</div><div class='del'>-</div><div class='del'>-DAI.txt: Description of Digital Audio Interface standards and how to configure</div><div class='del'>-a DAI within your codec and CPU DAI drivers.</div><div class='del'>-</div><div class='del'>-dapm.txt: Dynamic Audio Power Management</div><div class='del'>-</div><div class='del'>-platform.txt: Platform audio DMA and DAI.</div><div class='del'>-</div><div class='del'>-machine.txt: Machine driver internals.</div><div class='del'>-</div><div class='del'>-pop_clicks.txt: How to minimise audio artifacts.</div><div class='del'>-</div><div class='del'>-clocking.txt: ASoC clocking for best power performance.</div><div class='del'>-</div><div class='del'>-jack.txt: ASoC jack detection.</div><div class='del'>-</div><div class='del'>-DPCM.txt: Dynamic PCM - Describes DPCM with DSP examples.</div><div class='head'>diff --git a/Documentation/sound/alsa/soc/platform.txt b/Documentation/sound/alsa/soc/platform.txt<br/>deleted file mode 100644<br/>index 3a08a2c9150c..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/soc/platform.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/soc/platform.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-ASoC Platform Driver</div><div class='del'>-====================</div><div class='del'>-</div><div class='del'>-An ASoC platform driver class can be divided into audio DMA drivers, SoC DAI</div><div class='del'>-drivers and DSP drivers. The platform drivers only target the SoC CPU and must</div><div class='del'>-have no board specific code.</div><div class='del'>-</div><div class='del'>-Audio DMA</div><div class='del'>-=========</div><div class='del'>-</div><div class='del'>-The platform DMA driver optionally supports the following ALSA operations:-</div><div class='del'>-</div><div class='del'>-/* SoC audio ops */</div><div class='del'>-struct snd_soc_ops {</div><div class='del'>-	int (*startup)(struct snd_pcm_substream *);</div><div class='del'>-	void (*shutdown)(struct snd_pcm_substream *);</div><div class='del'>-	int (*hw_params)(struct snd_pcm_substream *, struct snd_pcm_hw_params *);</div><div class='del'>-	int (*hw_free)(struct snd_pcm_substream *);</div><div class='del'>-	int (*prepare)(struct snd_pcm_substream *);</div><div class='del'>-	int (*trigger)(struct snd_pcm_substream *, int);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-The platform driver exports its DMA functionality via struct</div><div class='del'>-snd_soc_platform_driver:-</div><div class='del'>-</div><div class='del'>-struct snd_soc_platform_driver {</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	int (*probe)(struct platform_device *pdev);</div><div class='del'>-	int (*remove)(struct platform_device *pdev);</div><div class='del'>-	int (*suspend)(struct platform_device *pdev, struct snd_soc_cpu_dai *cpu_dai);</div><div class='del'>-	int (*resume)(struct platform_device *pdev, struct snd_soc_cpu_dai *cpu_dai);</div><div class='del'>-</div><div class='del'>-	/* pcm creation and destruction */</div><div class='del'>-	int (*pcm_new)(struct snd_card *, struct snd_soc_codec_dai *, struct snd_pcm *);</div><div class='del'>-	void (*pcm_free)(struct snd_pcm *);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For platform caused delay reporting.</div><div class='del'>-	 * Optional.</div><div class='del'>-	 */</div><div class='del'>-	snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,</div><div class='del'>-		struct snd_soc_dai *);</div><div class='del'>-</div><div class='del'>-	/* platform stream ops */</div><div class='del'>-	struct snd_pcm_ops *pcm_ops;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-Please refer to the ALSA driver documentation for details of audio DMA.</div><div class='del'>-http://www.alsa-project.org/~iwai/writing-an-alsa-driver/</div><div class='del'>-</div><div class='del'>-An example DMA driver is soc/pxa/pxa2xx-pcm.c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SoC DAI Drivers</div><div class='del'>-===============</div><div class='del'>-</div><div class='del'>-Each SoC DAI driver must provide the following features:-</div><div class='del'>-</div><div class='del'>- 1) Digital audio interface (DAI) description</div><div class='del'>- 2) Digital audio interface configuration</div><div class='del'>- 3) PCM's description</div><div class='del'>- 4) SYSCLK configuration</div><div class='del'>- 5) Suspend and resume (optional)</div><div class='del'>-</div><div class='del'>-Please see codec.txt for a description of items 1 - 4.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SoC DSP Drivers</div><div class='del'>-===============</div><div class='del'>-</div><div class='del'>-Each SoC DSP driver usually supplies the following features :-</div><div class='del'>-</div><div class='del'>- 1) DAPM graph</div><div class='del'>- 2) Mixer controls</div><div class='del'>- 3) DMA IO to/from DSP buffers (if applicable)</div><div class='del'>- 4) Definition of DSP front end (FE) PCM devices.</div><div class='del'>-</div><div class='del'>-Please see DPCM.txt for a description of item 4.</div><div class='head'>diff --git a/Documentation/sound/alsa/soc/pops_clicks.txt b/Documentation/sound/alsa/soc/pops_clicks.txt<br/>deleted file mode 100644<br/>index e1e74daa4497..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/soc/pops_clicks.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/soc/pops_clicks.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-Audio Pops and Clicks</div><div class='del'>-=====================</div><div class='del'>-</div><div class='del'>-Pops and clicks are unwanted audio artifacts caused by the powering up and down</div><div class='del'>-of components within the audio subsystem. This is noticeable on PCs when an</div><div class='del'>-audio module is either loaded or unloaded (at module load time the sound card is</div><div class='del'>-powered up and causes a popping noise on the speakers).</div><div class='del'>-</div><div class='del'>-Pops and clicks can be more frequent on portable systems with DAPM. This is</div><div class='del'>-because the components within the subsystem are being dynamically powered</div><div class='del'>-depending on the audio usage and this can subsequently cause a small pop or</div><div class='del'>-click every time a component power state is changed.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Minimising Playback Pops and Clicks</div><div class='del'>-===================================</div><div class='del'>-</div><div class='del'>-Playback pops in portable audio subsystems cannot be completely eliminated</div><div class='del'>-currently, however future audio codec hardware will have better pop and click</div><div class='del'>-suppression.  Pops can be reduced within playback by powering the audio</div><div class='del'>-components in a specific order. This order is different for startup and</div><div class='del'>-shutdown and follows some basic rules:-</div><div class='del'>-</div><div class='del'>- Startup Order :- DAC --&gt; Mixers --&gt; Output PGA --&gt; Digital Unmute</div><div class='del'>-</div><div class='del'>- Shutdown Order :- Digital Mute --&gt; Output PGA --&gt; Mixers --&gt; DAC</div><div class='del'>-</div><div class='del'>-This assumes that the codec PCM output path from the DAC is via a mixer and then</div><div class='del'>-a PGA (programmable gain amplifier) before being output to the speakers.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Minimising Capture Pops and Clicks</div><div class='del'>-==================================</div><div class='del'>-</div><div class='del'>-Capture artifacts are somewhat easier to get rid as we can delay activating the</div><div class='del'>-ADC until all the pops have occurred. This follows similar power rules to</div><div class='del'>-playback in that components are powered in a sequence depending upon stream</div><div class='del'>-startup or shutdown.</div><div class='del'>-</div><div class='del'>- Startup Order - Input PGA --&gt; Mixers --&gt; ADC</div><div class='del'>-</div><div class='del'>- Shutdown Order - ADC --&gt; Mixers --&gt; Input PGA</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Zipper Noise</div><div class='del'>-============</div><div class='del'>-An unwanted zipper noise can occur within the audio playback or capture stream</div><div class='del'>-when a volume control is changed near its maximum gain value. The zipper noise</div><div class='del'>-is heard when the gain increase or decrease changes the mean audio signal</div><div class='del'>-amplitude too quickly. It can be minimised by enabling the zero cross setting</div><div class='del'>-for each volume control. The ZC forces the gain change to occur when the signal</div><div class='del'>-crosses the zero amplitude line.</div><div class='head'>diff --git a/Documentation/sound/alsa/timestamping.txt b/Documentation/sound/alsa/timestamping.txt<br/>deleted file mode 100644<br/>index 9d579aefbffd..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/alsa/timestamping.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/alsa/timestamping.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,200 +0,0 @@</div><div class='del'>-The ALSA API can provide two different system timestamps:</div><div class='del'>-</div><div class='del'>-- Trigger_tstamp is the system time snapshot taken when the .trigger</div><div class='del'>-callback is invoked. This snapshot is taken by the ALSA core in the</div><div class='del'>-general case, but specific hardware may have synchronization</div><div class='del'>-capabilities or conversely may only be able to provide a correct</div><div class='del'>-estimate with a delay. In the latter two cases, the low-level driver</div><div class='del'>-is responsible for updating the trigger_tstamp at the most appropriate</div><div class='del'>-and precise moment. Applications should not rely solely on the first</div><div class='del'>-trigger_tstamp but update their internal calculations if the driver</div><div class='del'>-provides a refined estimate with a delay.</div><div class='del'>-</div><div class='del'>-- tstamp is the current system timestamp updated during the last</div><div class='del'>-event or application query.</div><div class='del'>-The difference (tstamp - trigger_tstamp) defines the elapsed time.</div><div class='del'>-</div><div class='del'>-The ALSA API provides two basic pieces of information, avail</div><div class='del'>-and delay, which combined with the trigger and current system</div><div class='del'>-timestamps allow for applications to keep track of the 'fullness' of</div><div class='del'>-the ring buffer and the amount of queued samples.</div><div class='del'>-</div><div class='del'>-The use of these different pointers and time information depends on</div><div class='del'>-the application needs:</div><div class='del'>-</div><div class='del'>-- 'avail' reports how much can be written in the ring buffer</div><div class='del'>-- 'delay' reports the time it will take to hear a new sample after all</div><div class='del'>-queued samples have been played out.</div><div class='del'>-</div><div class='del'>-When timestamps are enabled, the avail/delay information is reported</div><div class='del'>-along with a snapshot of system time. Applications can select from</div><div class='del'>-CLOCK_REALTIME (NTP corrections including going backwards),</div><div class='del'>-CLOCK_MONOTONIC (NTP corrections but never going backwards),</div><div class='del'>-CLOCK_MONOTIC_RAW (without NTP corrections) and change the mode</div><div class='del'>-dynamically with sw_params</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The ALSA API also provide an audio_tstamp which reflects the passage</div><div class='del'>-of time as measured by different components of audio hardware.  In</div><div class='del'>-ascii-art, this could be represented as follows (for the playback</div><div class='del'>-case):</div><div class='del'>-</div><div class='del'>-</div><div class='del'>---------------------------------------------------------------&gt; time</div><div class='del'>-  ^               ^              ^                ^           ^</div><div class='del'>-  |               |              |                |           |</div><div class='del'>- analog         link            dma              app       FullBuffer</div><div class='del'>- time           time           time              time        time</div><div class='del'>-  |               |              |                |           |</div><div class='del'>-  |&lt; codec delay &gt;|&lt;--hw delay--&gt;|&lt;queued samples&gt;|&lt;---avail-&gt;|</div><div class='del'>-  |&lt;----------------- delay----------------------&gt;|           |</div><div class='del'>-			         |&lt;----ring buffer length----&gt;|</div><div class='del'>-</div><div class='del'>-The analog time is taken at the last stage of the playback, as close</div><div class='del'>-as possible to the actual transducer</div><div class='del'>-</div><div class='del'>-The link time is taken at the output of the SoC/chipset as the samples</div><div class='del'>-are pushed on a link. The link time can be directly measured if</div><div class='del'>-supported in hardware by sample counters or wallclocks (e.g. with</div><div class='del'>-HDAudio 24MHz or PTP clock for networked solutions) or indirectly</div><div class='del'>-estimated (e.g. with the frame counter in USB).</div><div class='del'>-</div><div class='del'>-The DMA time is measured using counters - typically the least reliable</div><div class='del'>-of all measurements due to the bursty nature of DMA transfers.</div><div class='del'>-</div><div class='del'>-The app time corresponds to the time tracked by an application after</div><div class='del'>-writing in the ring buffer.</div><div class='del'>-</div><div class='del'>-The application can query the hardware capabilities, define which</div><div class='del'>-audio time it wants reported by selecting the relevant settings in</div><div class='del'>-audio_tstamp_config fields, thus get an estimate of the timestamp</div><div class='del'>-accuracy. It can also request the delay-to-analog be included in the</div><div class='del'>-measurement. Direct access to the link time is very interesting on</div><div class='del'>-platforms that provide an embedded DSP; measuring directly the link</div><div class='del'>-time with dedicated hardware, possibly synchronized with system time,</div><div class='del'>-removes the need to keep track of internal DSP processing times and</div><div class='del'>-latency.</div><div class='del'>-</div><div class='del'>-In case the application requests an audio tstamp that is not supported</div><div class='del'>-in hardware/low-level driver, the type is overridden as DEFAULT and the</div><div class='del'>-timestamp will report the DMA time based on the hw_pointer value.</div><div class='del'>-</div><div class='del'>-For backwards compatibility with previous implementations that did not</div><div class='del'>-provide timestamp selection, with a zero-valued COMPAT timestamp type</div><div class='del'>-the results will default to the HDAudio wall clock for playback</div><div class='del'>-streams and to the DMA time (hw_ptr) in all other cases.</div><div class='del'>-</div><div class='del'>-The audio timestamp accuracy can be returned to user-space, so that</div><div class='del'>-appropriate decisions are made:</div><div class='del'>-</div><div class='del'>-- for dma time (default), the granularity of the transfers can be</div><div class='del'>-  inferred from the steps between updates and in turn provide</div><div class='del'>-  information on how much the application pointer can be rewound</div><div class='del'>-  safely.</div><div class='del'>-</div><div class='del'>-- the link time can be used to track long-term drifts between audio</div><div class='del'>-  and system time using the (tstamp-trigger_tstamp)/audio_tstamp</div><div class='del'>-  ratio, the precision helps define how much smoothing/low-pass</div><div class='del'>-  filtering is required. The link time can be either reset on startup</div><div class='del'>-  or reported as is (the latter being useful to compare progress of</div><div class='del'>-  different streams - but may require the wallclock to be always</div><div class='del'>-  running and not wrap-around during idle periods). If supported in</div><div class='del'>-  hardware, the absolute link time could also be used to define a</div><div class='del'>-  precise start time (patches WIP)</div><div class='del'>-</div><div class='del'>-- including the delay in the audio timestamp may</div><div class='del'>-  counter-intuitively not increase the precision of timestamps, e.g. if a</div><div class='del'>-  codec includes variable-latency DSP processing or a chain of</div><div class='del'>-  hardware components the delay is typically not known with precision.</div><div class='del'>-</div><div class='del'>-The accuracy is reported in nanosecond units (using an unsigned 32-bit</div><div class='del'>-word), which gives a max precision of 4.29s, more than enough for</div><div class='del'>-audio applications...</div><div class='del'>-</div><div class='del'>-Due to the varied nature of timestamping needs, even for a single</div><div class='del'>-application, the audio_tstamp_config can be changed dynamically. In</div><div class='del'>-the STATUS ioctl, the parameters are read-only and do not allow for</div><div class='del'>-any application selection. To work around this limitation without</div><div class='del'>-impacting legacy applications, a new STATUS_EXT ioctl is introduced</div><div class='del'>-with read/write parameters. ALSA-lib will be modified to make use of</div><div class='del'>-STATUS_EXT and effectively deprecate STATUS.</div><div class='del'>-</div><div class='del'>-The ALSA API only allows for a single audio timestamp to be reported</div><div class='del'>-at a time. This is a conscious design decision, reading the audio</div><div class='del'>-timestamps from hardware registers or from IPC takes time, the more</div><div class='del'>-timestamps are read the more imprecise the combined measurements</div><div class='del'>-are. To avoid any interpretation issues, a single (system, audio)</div><div class='del'>-timestamp is reported. Applications that need different timestamps</div><div class='del'>-will be required to issue multiple queries and perform an</div><div class='del'>-interpolation of the results</div><div class='del'>-</div><div class='del'>-In some hardware-specific configuration, the system timestamp is</div><div class='del'>-latched by a low-level audio subsystem, and the information provided</div><div class='del'>-back to the driver. Due to potential delays in the communication with</div><div class='del'>-the hardware, there is a risk of misalignment with the avail and delay</div><div class='del'>-information. To make sure applications are not confused, a</div><div class='del'>-driver_timestamp field is added in the snd_pcm_status structure; this</div><div class='del'>-timestamp shows when the information is put together by the driver</div><div class='del'>-before returning from the STATUS and STATUS_EXT ioctl. in most cases</div><div class='del'>-this driver_timestamp will be identical to the regular system tstamp.</div><div class='del'>-</div><div class='del'>-Examples of typestamping with HDaudio:</div><div class='del'>-</div><div class='del'>-1. DMA timestamp, no compensation for DMA+analog delay</div><div class='del'>-$ ./audio_time  -p --ts_type=1</div><div class='del'>-playback: systime: 341121338 nsec, audio time 342000000 nsec, 	systime delta -878662</div><div class='del'>-playback: systime: 426236663 nsec, audio time 427187500 nsec, 	systime delta -950837</div><div class='del'>-playback: systime: 597080580 nsec, audio time 598000000 nsec, 	systime delta -919420</div><div class='del'>-playback: systime: 682059782 nsec, audio time 683020833 nsec, 	systime delta -961051</div><div class='del'>-playback: systime: 852896415 nsec, audio time 853854166 nsec, 	systime delta -957751</div><div class='del'>-playback: systime: 937903344 nsec, audio time 938854166 nsec, 	systime delta -950822</div><div class='del'>-</div><div class='del'>-2. DMA timestamp, compensation for DMA+analog delay</div><div class='del'>-$ ./audio_time  -p --ts_type=1 -d</div><div class='del'>-playback: systime: 341053347 nsec, audio time 341062500 nsec, 	systime delta -9153</div><div class='del'>-playback: systime: 426072447 nsec, audio time 426062500 nsec, 	systime delta 9947</div><div class='del'>-playback: systime: 596899518 nsec, audio time 596895833 nsec, 	systime delta 3685</div><div class='del'>-playback: systime: 681915317 nsec, audio time 681916666 nsec, 	systime delta -1349</div><div class='del'>-playback: systime: 852741306 nsec, audio time 852750000 nsec, 	systime delta -8694</div><div class='del'>-</div><div class='del'>-3. link timestamp, compensation for DMA+analog delay</div><div class='del'>-$ ./audio_time  -p --ts_type=2 -d</div><div class='del'>-playback: systime: 341060004 nsec, audio time 341062791 nsec, 	systime delta -2787</div><div class='del'>-playback: systime: 426242074 nsec, audio time 426244875 nsec, 	systime delta -2801</div><div class='del'>-playback: systime: 597080992 nsec, audio time 597084583 nsec, 	systime delta -3591</div><div class='del'>-playback: systime: 682084512 nsec, audio time 682088291 nsec, 	systime delta -3779</div><div class='del'>-playback: systime: 852936229 nsec, audio time 852940916 nsec, 	systime delta -4687</div><div class='del'>-playback: systime: 938107562 nsec, audio time 938112708 nsec, 	systime delta -5146</div><div class='del'>-</div><div class='del'>-Example 1 shows that the timestamp at the DMA level is close to 1ms</div><div class='del'>-ahead of the actual playback time (as a side time this sort of</div><div class='del'>-measurement can help define rewind safeguards). Compensating for the</div><div class='del'>-DMA-link delay in example 2 helps remove the hardware buffering but</div><div class='del'>-the information is still very jittery, with up to one sample of</div><div class='del'>-error. In example 3 where the timestamps are measured with the link</div><div class='del'>-wallclock, the timestamps show a monotonic behavior and a lower</div><div class='del'>-dispersion.</div><div class='del'>-</div><div class='del'>-Example 3 and 4 are with USB audio class. Example 3 shows a high</div><div class='del'>-offset between audio time and system time due to buffering. Example 4</div><div class='del'>-shows how compensating for the delay exposes a 1ms accuracy (due to</div><div class='del'>-the use of the frame counter by the driver)</div><div class='del'>-</div><div class='del'>-Example 3: DMA timestamp, no compensation for delay, delta of ~5ms</div><div class='del'>-$ ./audio_time -p -Dhw:1 -t1</div><div class='del'>-playback: systime: 120174019 nsec, audio time 125000000 nsec, 	systime delta -4825981</div><div class='del'>-playback: systime: 245041136 nsec, audio time 250000000 nsec, 	systime delta -4958864</div><div class='del'>-playback: systime: 370106088 nsec, audio time 375000000 nsec, 	systime delta -4893912</div><div class='del'>-playback: systime: 495040065 nsec, audio time 500000000 nsec, 	systime delta -4959935</div><div class='del'>-playback: systime: 620038179 nsec, audio time 625000000 nsec, 	systime delta -4961821</div><div class='del'>-playback: systime: 745087741 nsec, audio time 750000000 nsec, 	systime delta -4912259</div><div class='del'>-playback: systime: 870037336 nsec, audio time 875000000 nsec, 	systime delta -4962664</div><div class='del'>-</div><div class='del'>-Example 4: DMA timestamp, compensation for delay, delay of ~1ms</div><div class='del'>-$ ./audio_time -p -Dhw:1 -t1 -d</div><div class='del'>-playback: systime: 120190520 nsec, audio time 120000000 nsec, 	systime delta 190520</div><div class='del'>-playback: systime: 245036740 nsec, audio time 244000000 nsec, 	systime delta 1036740</div><div class='del'>-playback: systime: 370034081 nsec, audio time 369000000 nsec, 	systime delta 1034081</div><div class='del'>-playback: systime: 495159907 nsec, audio time 494000000 nsec, 	systime delta 1159907</div><div class='del'>-playback: systime: 620098824 nsec, audio time 619000000 nsec, 	systime delta 1098824</div><div class='del'>-playback: systime: 745031847 nsec, audio time 744000000 nsec, 	systime delta 1031847</div><div class='head'>diff --git a/Documentation/sound/cards/audigy-mixer.rst b/Documentation/sound/cards/audigy-mixer.rst<br/>new file mode 100644<br/>index 000000000000..86213234435f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/audigy-mixer.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/audigy-mixer.rst</a></div><div class='hunk'>@@ -0,0 +1,368 @@</div><div class='add'>+=============================================</div><div class='add'>+Sound Blaster Audigy mixer / default DSP code</div><div class='add'>+=============================================</div><div class='add'>+</div><div class='add'>+This is based on sb-live-mixer.rst.</div><div class='add'>+</div><div class='add'>+The EMU10K2 chips have a DSP part which can be programmed to support </div><div class='add'>+various ways of sample processing, which is described here.</div><div class='add'>+(This article does not deal with the overall functionality of the </div><div class='add'>+EMU10K2 chips. See the manuals section for further details.)</div><div class='add'>+</div><div class='add'>+The ALSA driver programs this portion of chip by default code</div><div class='add'>+(can be altered later) which offers the following functionality:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Digital mixer controls</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+These controls are built using the DSP instructions. They offer extended</div><div class='add'>+functionality. Only the default build-in code in the ALSA driver is described</div><div class='add'>+here. Note that the controls work as attenuators: the maximum value is the </div><div class='add'>+neutral position leaving the signal unchanged. Note that if the  same destination </div><div class='add'>+is mentioned in multiple controls, the signal is accumulated and can be wrapped </div><div class='add'>+(set to maximal or minimal value without checking of overflow).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Explanation of used abbreviations:</div><div class='add'>+</div><div class='add'>+DAC</div><div class='add'>+	digital to analog converter</div><div class='add'>+ADC</div><div class='add'>+	analog to digital converter</div><div class='add'>+I2S</div><div class='add'>+	one-way three wire serial bus for digital sound by Philips Semiconductors</div><div class='add'>+        (this standard is used for connecting standalone DAC and ADC converters)</div><div class='add'>+LFE</div><div class='add'>+	low frequency effects (subwoofer signal)</div><div class='add'>+AC97</div><div class='add'>+	a chip containing an analog mixer, DAC and ADC converters</div><div class='add'>+IEC958</div><div class='add'>+	S/PDIF</div><div class='add'>+FX-bus</div><div class='add'>+	the EMU10K2 chip has an effect bus containing 64 accumulators.</div><div class='add'>+        Each of the synthesizer voices can feed its output to these accumulators</div><div class='add'>+        and the DSP microcontroller can operate with the resulting sum.</div><div class='add'>+</div><div class='add'>+name='PCM Front Playback Volume',index=0</div><div class='add'>+----------------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right front PCM FX-bus</div><div class='add'>+accumulators. ALSA uses accumulators 8 and 9 for left and right front PCM </div><div class='add'>+samples for 5.1 playback. The result samples are forwarded to the front DAC PCM </div><div class='add'>+slots of the Philips DAC.</div><div class='add'>+</div><div class='add'>+name='PCM Surround Playback Volume',index=0</div><div class='add'>+-------------------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right surround PCM FX-bus</div><div class='add'>+accumulators. ALSA uses accumulators 2 and 3 for left and right surround PCM </div><div class='add'>+samples for 5.1 playback. The result samples are forwarded to the surround DAC PCM </div><div class='add'>+slots of the Philips DAC.</div><div class='add'>+</div><div class='add'>+name='PCM Center Playback Volume',index=0</div><div class='add'>+-----------------------------------------</div><div class='add'>+This control is used to attenuate samples for center PCM FX-bus accumulator.</div><div class='add'>+ALSA uses accumulator 6 for center PCM sample for 5.1 playback. The result sample</div><div class='add'>+is forwarded to the center DAC PCM slot of the Philips DAC.</div><div class='add'>+</div><div class='add'>+name='PCM LFE Playback Volume',index=0</div><div class='add'>+--------------------------------------</div><div class='add'>+This control is used to attenuate sample for LFE PCM FX-bus accumulator. </div><div class='add'>+ALSA uses accumulator 7 for LFE PCM sample for 5.1 playback. The result sample </div><div class='add'>+is forwarded to the LFE DAC PCM slot of the Philips DAC.</div><div class='add'>+</div><div class='add'>+name='PCM Playback Volume',index=0</div><div class='add'>+----------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right PCM FX-bus</div><div class='add'>+accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples for</div><div class='add'>+stereo playback. The result samples are forwarded to the front DAC PCM slots </div><div class='add'>+of the Philips DAC.</div><div class='add'>+</div><div class='add'>+name='PCM Capture Volume',index=0</div><div class='add'>+---------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right PCM FX-bus</div><div class='add'>+accumulator. ALSA uses accumulators 0 and 1 for left and right PCM.</div><div class='add'>+The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='add'>+PCM device).</div><div class='add'>+</div><div class='add'>+name='Music Playback Volume',index=0</div><div class='add'>+------------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right MIDI FX-bus</div><div class='add'>+accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples.</div><div class='add'>+The result samples are forwarded to the front DAC PCM slots of the AC97 codec.</div><div class='add'>+</div><div class='add'>+name='Music Capture Volume',index=0</div><div class='add'>+-----------------------------------</div><div class='add'>+These controls are used to attenuate samples for left and right MIDI FX-bus</div><div class='add'>+accumulator. ALSA uses accumulators 4 and 5 for left and right PCM.</div><div class='add'>+The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='add'>+PCM device).</div><div class='add'>+</div><div class='add'>+name='Mic Playback Volume',index=0</div><div class='add'>+----------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right Mic input.</div><div class='add'>+For Mic input is used AC97 codec. The result samples are forwarded to </div><div class='add'>+the front DAC PCM slots of the Philips DAC. Samples are forwarded to Mic</div><div class='add'>+capture FIFO (device 1 - 16bit/8KHz mono) too without volume control.</div><div class='add'>+</div><div class='add'>+name='Mic Capture Volume',index=0</div><div class='add'>+---------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right Mic input.</div><div class='add'>+The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='add'>+PCM device).</div><div class='add'>+</div><div class='add'>+name='Audigy CD Playback Volume',index=0</div><div class='add'>+----------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right IEC958 TTL</div><div class='add'>+digital inputs (usually used by a CDROM drive). The result samples are</div><div class='add'>+forwarded to the front DAC PCM slots of the Philips DAC.</div><div class='add'>+</div><div class='add'>+name='Audigy CD Capture Volume',index=0</div><div class='add'>+---------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right IEC958 TTL</div><div class='add'>+digital inputs (usually used by a CDROM drive). The result samples are</div><div class='add'>+forwarded to the ADC capture FIFO (thus to the standard capture PCM device).</div><div class='add'>+</div><div class='add'>+name='IEC958 Optical Playback Volume',index=0</div><div class='add'>+---------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right IEC958 optical</div><div class='add'>+digital input. The result samples are forwarded to the front DAC PCM slots</div><div class='add'>+of the Philips DAC.</div><div class='add'>+</div><div class='add'>+name='IEC958 Optical Capture Volume',index=0</div><div class='add'>+--------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right IEC958 optical</div><div class='add'>+digital inputs. The result samples are forwarded to the ADC capture FIFO</div><div class='add'>+(thus to the standard capture PCM device).</div><div class='add'>+</div><div class='add'>+name='Line2 Playback Volume',index=0</div><div class='add'>+------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right I2S ADC</div><div class='add'>+inputs (on the AudigyDrive). The result samples are forwarded to the front</div><div class='add'>+DAC PCM slots of the Philips DAC.</div><div class='add'>+</div><div class='add'>+name='Line2 Capture Volume',index=1</div><div class='add'>+-----------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right I2S ADC</div><div class='add'>+inputs (on the AudigyDrive). The result samples are forwarded to the ADC</div><div class='add'>+capture FIFO (thus to the standard capture PCM device).</div><div class='add'>+</div><div class='add'>+name='Analog Mix Playback Volume',index=0</div><div class='add'>+-----------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right I2S ADC</div><div class='add'>+inputs from Philips ADC. The result samples are forwarded to the front</div><div class='add'>+DAC PCM slots of the Philips DAC. This contains mix from analog sources</div><div class='add'>+like CD, Line In, Aux, ....</div><div class='add'>+</div><div class='add'>+name='Analog Mix Capture Volume',index=1</div><div class='add'>+----------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right I2S ADC</div><div class='add'>+inputs Philips ADC. The result samples are forwarded to the ADC</div><div class='add'>+capture FIFO (thus to the standard capture PCM device).</div><div class='add'>+</div><div class='add'>+name='Aux2 Playback Volume',index=0</div><div class='add'>+-----------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right I2S ADC</div><div class='add'>+inputs (on the AudigyDrive). The result samples are forwarded to the front</div><div class='add'>+DAC PCM slots of the Philips DAC.</div><div class='add'>+</div><div class='add'>+name='Aux2 Capture Volume',index=1</div><div class='add'>+----------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right I2S ADC</div><div class='add'>+inputs (on the AudigyDrive). The result samples are forwarded to the ADC</div><div class='add'>+capture FIFO (thus to the standard capture PCM device).</div><div class='add'>+</div><div class='add'>+name='Front Playback Volume',index=0</div><div class='add'>+------------------------------------</div><div class='add'>+All stereo signals are mixed together and mirrored to surround, center and LFE.</div><div class='add'>+This control is used to attenuate samples for left and right front speakers of</div><div class='add'>+this mix.</div><div class='add'>+</div><div class='add'>+name='Surround Playback Volume',index=0</div><div class='add'>+---------------------------------------</div><div class='add'>+All stereo signals are mixed together and mirrored to surround, center and LFE.</div><div class='add'>+This control is used to attenuate samples for left and right surround speakers of</div><div class='add'>+this mix.</div><div class='add'>+</div><div class='add'>+name='Center Playback Volume',index=0</div><div class='add'>+-------------------------------------</div><div class='add'>+All stereo signals are mixed together and mirrored to surround, center and LFE.</div><div class='add'>+This control is used to attenuate sample for center speaker of this mix.</div><div class='add'>+</div><div class='add'>+name='LFE Playback Volume',index=0</div><div class='add'>+----------------------------------</div><div class='add'>+All stereo signals are mixed together and mirrored to surround, center and LFE.</div><div class='add'>+This control is used to attenuate sample for LFE speaker of this mix.</div><div class='add'>+</div><div class='add'>+name='Tone Control - Switch',index=0</div><div class='add'>+------------------------------------</div><div class='add'>+This control turns the tone control on or off. The samples for front, rear</div><div class='add'>+and center / LFE outputs are affected.</div><div class='add'>+</div><div class='add'>+name='Tone Control - Bass',index=0</div><div class='add'>+----------------------------------</div><div class='add'>+This control sets the bass intensity. There is no neutral value!!</div><div class='add'>+When the tone control code is activated, the samples are always modified.</div><div class='add'>+The closest value to pure signal is 20.</div><div class='add'>+</div><div class='add'>+name='Tone Control - Treble',index=0</div><div class='add'>+------------------------------------</div><div class='add'>+This control sets the treble intensity. There is no neutral value!!</div><div class='add'>+When the tone control code is activated, the samples are always modified.</div><div class='add'>+The closest value to pure signal is 20.</div><div class='add'>+</div><div class='add'>+name='Master Playback Volume',index=0</div><div class='add'>+-------------------------------------</div><div class='add'>+This control is used to attenuate samples for front, surround, center and </div><div class='add'>+LFE outputs.</div><div class='add'>+</div><div class='add'>+name='IEC958 Optical Raw Playback Switch',index=0</div><div class='add'>+-------------------------------------------------</div><div class='add'>+If this switch is on, then the samples for the IEC958 (S/PDIF) digital</div><div class='add'>+output are taken only from the raw FX8010 PCM, otherwise standard front</div><div class='add'>+PCM samples are taken.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PCM stream related controls</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+name='EMU10K1 PCM Volume',index 0-31</div><div class='add'>+------------------------------------</div><div class='add'>+Channel volume attenuation in range 0-0xffff. The maximum value (no</div><div class='add'>+attenuation) is default. The channel mapping for three values is</div><div class='add'>+as follows:</div><div class='add'>+</div><div class='add'>+* 0 - mono, default 0xffff (no attenuation)</div><div class='add'>+* 1 - left, default 0xffff (no attenuation)</div><div class='add'>+* 2 - right, default 0xffff (no attenuation)</div><div class='add'>+</div><div class='add'>+name='EMU10K1 PCM Send Routing',index 0-31</div><div class='add'>+------------------------------------------</div><div class='add'>+This control specifies the destination - FX-bus accumulators. There 24</div><div class='add'>+values with this mapping:</div><div class='add'>+</div><div class='add'>+* 0 -  mono, A destination (FX-bus 0-63), default 0</div><div class='add'>+* 1 -  mono, B destination (FX-bus 0-63), default 1</div><div class='add'>+* 2 -  mono, C destination (FX-bus 0-63), default 2</div><div class='add'>+* 3 -  mono, D destination (FX-bus 0-63), default 3</div><div class='add'>+* 4 -  mono, E destination (FX-bus 0-63), default 0</div><div class='add'>+* 5 -  mono, F destination (FX-bus 0-63), default 0</div><div class='add'>+* 6 -  mono, G destination (FX-bus 0-63), default 0</div><div class='add'>+* 7 -  mono, H destination (FX-bus 0-63), default 0</div><div class='add'>+* 8 -  left, A destination (FX-bus 0-63), default 0</div><div class='add'>+* 9 -  left, B destination (FX-bus 0-63), default 1</div><div class='add'>+* 10 -  left, C destination (FX-bus 0-63), default 2</div><div class='add'>+* 11 -  left, D destination (FX-bus 0-63), default 3</div><div class='add'>+* 12 -  left, E destination (FX-bus 0-63), default 0</div><div class='add'>+* 13 -  left, F destination (FX-bus 0-63), default 0</div><div class='add'>+* 14 -  left, G destination (FX-bus 0-63), default 0</div><div class='add'>+* 15 -  left, H destination (FX-bus 0-63), default 0</div><div class='add'>+* 16 - right, A destination (FX-bus 0-63), default 0</div><div class='add'>+* 17 - right, B destination (FX-bus 0-63), default 1</div><div class='add'>+* 18 - right, C destination (FX-bus 0-63), default 2</div><div class='add'>+* 19 - right, D destination (FX-bus 0-63), default 3</div><div class='add'>+* 20 - right, E destination (FX-bus 0-63), default 0</div><div class='add'>+* 21 - right, F destination (FX-bus 0-63), default 0</div><div class='add'>+* 22 - right, G destination (FX-bus 0-63), default 0</div><div class='add'>+* 23 - right, H destination (FX-bus 0-63), default 0</div><div class='add'>+</div><div class='add'>+Don't forget that it's illegal to assign a channel to the same FX-bus accumulator </div><div class='add'>+more than once (it means 0=0 &amp;&amp; 1=0 is an invalid combination).</div><div class='add'>+ </div><div class='add'>+name='EMU10K1 PCM Send Volume',index 0-31</div><div class='add'>+-----------------------------------------</div><div class='add'>+It specifies the attenuation (amount) for given destination in range 0-255.</div><div class='add'>+The channel mapping is following:</div><div class='add'>+</div><div class='add'>+*  0 -  mono, A destination attn, default 255 (no attenuation)</div><div class='add'>+*  1 -  mono, B destination attn, default 255 (no attenuation)</div><div class='add'>+*  2 -  mono, C destination attn, default 0 (mute)</div><div class='add'>+*  3 -  mono, D destination attn, default 0 (mute)</div><div class='add'>+*  4 -  mono, E destination attn, default 0 (mute)</div><div class='add'>+*  5 -  mono, F destination attn, default 0 (mute)</div><div class='add'>+*  6 -  mono, G destination attn, default 0 (mute)</div><div class='add'>+*  7 -  mono, H destination attn, default 0 (mute)</div><div class='add'>+*  8 -  left, A destination attn, default 255 (no attenuation)</div><div class='add'>+*  9 -  left, B destination attn, default 0 (mute)</div><div class='add'>+* 10 -  left, C destination attn, default 0 (mute)</div><div class='add'>+* 11 -  left, D destination attn, default 0 (mute)</div><div class='add'>+* 12 -  left, E destination attn, default 0 (mute)</div><div class='add'>+* 13 -  left, F destination attn, default 0 (mute)</div><div class='add'>+* 14 -  left, G destination attn, default 0 (mute)</div><div class='add'>+* 15 -  left, H destination attn, default 0 (mute)</div><div class='add'>+* 16 - right, A destination attn, default 0 (mute)</div><div class='add'>+* 17 - right, B destination attn, default 255 (no attenuation)</div><div class='add'>+* 18 - right, C destination attn, default 0 (mute)</div><div class='add'>+* 19 - right, D destination attn, default 0 (mute)</div><div class='add'>+* 20 - right, E destination attn, default 0 (mute)</div><div class='add'>+* 21 - right, F destination attn, default 0 (mute)</div><div class='add'>+* 22 - right, G destination attn, default 0 (mute)</div><div class='add'>+* 23 - right, H destination attn, default 0 (mute)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MANUALS/PATENTS</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+ftp://opensource.creative.com/pub/doc</div><div class='add'>+-------------------------------------</div><div class='add'>+</div><div class='add'>+LM4545.pdf</div><div class='add'>+	AC97 Codec</div><div class='add'>+</div><div class='add'>+m2049.pdf</div><div class='add'>+	The EMU10K1 Digital Audio Processor</div><div class='add'>+</div><div class='add'>+hog63.ps</div><div class='add'>+	FX8010 - A DSP Chip Architecture for Audio Effects</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+WIPO Patents</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+WO 9901813 (A1)</div><div class='add'>+	Audio Effects Processor with multiple asynchronous streams</div><div class='add'>+	(Jan. 14, 1999)</div><div class='add'>+</div><div class='add'>+WO 9901814 (A1)</div><div class='add'>+	Processor with Instruction Set for Audio Effects (Jan. 14, 1999)</div><div class='add'>+</div><div class='add'>+WO 9901953 (A1)</div><div class='add'>+	Audio Effects Processor having Decoupled Instruction</div><div class='add'>+        Execution and Audio Data Sequencing (Jan. 14, 1999)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+US Patents (http://www.uspto.gov/)</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+US 5925841</div><div class='add'>+	Digital Sampling Instrument employing cache memory (Jul. 20, 1999)</div><div class='add'>+</div><div class='add'>+US 5928342</div><div class='add'>+	Audio Effects Processor integrated on a single chip</div><div class='add'>+        with a multiport memory onto which multiple asynchronous</div><div class='add'>+        digital sound samples can be concurrently loaded</div><div class='add'>+	(Jul. 27, 1999)</div><div class='add'>+</div><div class='add'>+US 5930158</div><div class='add'>+	Processor with Instruction Set for Audio Effects (Jul. 27, 1999)</div><div class='add'>+</div><div class='add'>+US 6032235</div><div class='add'>+	Memory initialization circuit (Tram) (Feb. 29, 2000)</div><div class='add'>+</div><div class='add'>+US 6138207</div><div class='add'>+	Interpolation looping of audio samples in cache connected to</div><div class='add'>+        system bus with prioritization and modification of bus transfers</div><div class='add'>+        in accordance with loop ends and minimum block sizes</div><div class='add'>+	(Oct. 24, 2000)</div><div class='add'>+</div><div class='add'>+US 6151670</div><div class='add'>+	Method for conserving memory storage using a</div><div class='add'>+        pool of  short term memory registers</div><div class='add'>+	(Nov. 21, 2000)</div><div class='add'>+</div><div class='add'>+US 6195715</div><div class='add'>+	Interrupt control for multiple programs communicating with</div><div class='add'>+        a common interrupt by associating programs to GP registers,</div><div class='add'>+        defining interrupt register, polling GP registers, and invoking</div><div class='add'>+        callback routine associated with defined interrupt register</div><div class='add'>+	(Feb. 27, 2001)</div><div class='head'>diff --git a/Documentation/sound/cards/audiophile-usb.rst b/Documentation/sound/cards/audiophile-usb.rst<br/>new file mode 100644<br/>index 000000000000..a7bb5648331f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/audiophile-usb.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/audiophile-usb.rst</a></div><div class='hunk'>@@ -0,0 +1,550 @@</div><div class='add'>+========================================================</div><div class='add'>+Guide to using M-Audio Audiophile USB with ALSA and Jack</div><div class='add'>+========================================================</div><div class='add'>+</div><div class='add'>+v1.5</div><div class='add'>+</div><div class='add'>+Thibault Le Meur &lt;Thibault.LeMeur@supelec.fr&gt;</div><div class='add'>+</div><div class='add'>+This document is a guide to using the M-Audio Audiophile USB (tm) device with </div><div class='add'>+ALSA and JACK.</div><div class='add'>+</div><div class='add'>+History</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+* v1.4 - Thibault Le Meur (2007-07-11)</div><div class='add'>+</div><div class='add'>+  - Added Low Endianness nature of 16bits-modes</div><div class='add'>+    found by Hakan Lennestal &lt;Hakan.Lennestal@brfsodrahamn.se&gt;</div><div class='add'>+  - Modifying document structure</div><div class='add'>+</div><div class='add'>+* v1.5 - Thibault Le Meur (2007-07-12)</div><div class='add'>+  - Added AC3/DTS passthru info</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Audiophile USB Specs and correct usage</div><div class='add'>+======================================</div><div class='add'>+</div><div class='add'>+This part is a reminder of important facts about the functions and limitations </div><div class='add'>+of the device.</div><div class='add'>+</div><div class='add'>+The device has 4 audio interfaces, and 2 MIDI ports:</div><div class='add'>+</div><div class='add'>+ * Analog Stereo Input (Ai)</div><div class='add'>+</div><div class='add'>+   - This port supports 2 pairs of line-level audio inputs (1/4" TS and RCA) </div><div class='add'>+   - When the 1/4" TS (jack) connectors are connected, the RCA connectors</div><div class='add'>+     are disabled</div><div class='add'>+</div><div class='add'>+ * Analog Stereo Output (Ao)</div><div class='add'>+ * Digital Stereo Input (Di)</div><div class='add'>+ * Digital Stereo Output (Do)</div><div class='add'>+ * Midi In (Mi)</div><div class='add'>+ * Midi Out (Mo)</div><div class='add'>+</div><div class='add'>+The internal DAC/ADC has the following characteristics:</div><div class='add'>+</div><div class='add'>+* sample depth of 16 or 24 bits</div><div class='add'>+* sample rate from 8kHz to 96kHz</div><div class='add'>+* Two interfaces can't use different sample depths at the same time.</div><div class='add'>+</div><div class='add'>+Moreover, the Audiophile USB documentation gives the following Warning:</div><div class='add'>+  Please exit any audio application running before switching between bit depths</div><div class='add'>+</div><div class='add'>+Due to the USB 1.1 bandwidth limitation, a limited number of interfaces can be </div><div class='add'>+activated at the same time depending on the audio mode selected:</div><div class='add'>+</div><div class='add'>+ * 16-bit/48kHz ==&gt; 4 channels in + 4 channels out</div><div class='add'>+</div><div class='add'>+   - Ai+Ao+Di+Do</div><div class='add'>+</div><div class='add'>+ * 24-bit/48kHz ==&gt; 4 channels in + 2 channels out, </div><div class='add'>+   or 2 channels in + 4 channels out</div><div class='add'>+</div><div class='add'>+   - Ai+Ao+Do or Ai+Di+Ao or Ai+Di+Do or Di+Ao+Do</div><div class='add'>+</div><div class='add'>+ * 24-bit/96kHz ==&gt; 2 channels in _or_ 2 channels out (half duplex only)</div><div class='add'>+</div><div class='add'>+   - Ai or Ao or Di or Do</div><div class='add'>+</div><div class='add'>+Important facts about the Digital interface:</div><div class='add'>+--------------------------------------------</div><div class='add'>+</div><div class='add'>+ * The Do port additionally supports surround-encoded AC-3 and DTS passthrough, </div><div class='add'>+   though I haven't tested it under Linux</div><div class='add'>+</div><div class='add'>+   - Note that in this setup only the Do interface can be enabled</div><div class='add'>+</div><div class='add'>+ * Apart from recording an audio digital stream, enabling the Di port is a way </div><div class='add'>+   to synchronize the device to an external sample clock</div><div class='add'>+</div><div class='add'>+   - As a consequence, the Di port must be enable only if an active Digital </div><div class='add'>+     source is connected</div><div class='add'>+   - Enabling Di when no digital source is connected can result in a </div><div class='add'>+     synchronization error (for instance sound played at an odd sample rate)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Audiophile USB MIDI support in ALSA</div><div class='add'>+===================================</div><div class='add'>+</div><div class='add'>+The Audiophile USB MIDI ports will be automatically supported once the</div><div class='add'>+following modules have been loaded:</div><div class='add'>+</div><div class='add'>+ * snd-usb-audio</div><div class='add'>+ * snd-seq-midi</div><div class='add'>+</div><div class='add'>+No additional setting is required.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Audiophile USB Audio support in ALSA</div><div class='add'>+====================================</div><div class='add'>+</div><div class='add'>+Audio functions of the Audiophile USB device are handled by the snd-usb-audio </div><div class='add'>+module. This module can work in a default mode (without any device-specific </div><div class='add'>+parameter), or in an "advanced" mode with the device-specific parameter called </div><div class='add'>+``device_setup``.</div><div class='add'>+</div><div class='add'>+Default Alsa driver mode</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+The default behavior of the snd-usb-audio driver is to list the device </div><div class='add'>+capabilities at startup and activate the required mode when required </div><div class='add'>+by the applications: for instance if the user is recording in a </div><div class='add'>+24bit-depth-mode and immediately after wants to switch to a 16bit-depth mode,</div><div class='add'>+the snd-usb-audio module will reconfigure the device on the fly.</div><div class='add'>+</div><div class='add'>+This approach has the advantage to let the driver automatically switch from sample </div><div class='add'>+rates/depths automatically according to the user's needs. However, those who </div><div class='add'>+are using the device under windows know that this is not how the device is meant to</div><div class='add'>+work: under windows applications must be closed before using the m-audio control</div><div class='add'>+panel to switch the device working mode. Thus as we'll see in next section, this </div><div class='add'>+Default Alsa driver mode can lead to device misconfigurations.</div><div class='add'>+</div><div class='add'>+Let's get back to the Default Alsa driver mode for now.  In this case the </div><div class='add'>+Audiophile interfaces are mapped to alsa pcm devices in the following </div><div class='add'>+way (I suppose the device's index is 1):</div><div class='add'>+</div><div class='add'>+ * hw:1,0 is Ao in playback and Di in capture</div><div class='add'>+ * hw:1,1 is Do in playback and Ai in capture</div><div class='add'>+ * hw:1,2 is Do in AC3/DTS passthrough mode</div><div class='add'>+</div><div class='add'>+In this mode, the device uses Big Endian byte-encoding so that </div><div class='add'>+supported audio format are S16_BE for 16-bit depth modes and S24_3BE for </div><div class='add'>+24-bits depth mode.</div><div class='add'>+</div><div class='add'>+One exception is the hw:1,2 port which was reported to be Little Endian </div><div class='add'>+compliant (supposedly supporting S16_LE) but processes in fact only S16_BE streams.</div><div class='add'>+This has been fixed in kernel 2.6.23 and above and now the hw:1,2 interface </div><div class='add'>+is reported to be big endian in this default driver mode.</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+ * playing a S24_3BE encoded raw file to the Ao port::</div><div class='add'>+</div><div class='add'>+   % aplay -D hw:1,0 -c2 -t raw -r48000 -fS24_3BE test.raw</div><div class='add'>+</div><div class='add'>+ * recording a  S24_3BE encoded raw file from the Ai port::</div><div class='add'>+</div><div class='add'>+   % arecord -D hw:1,1 -c2  -t raw -r48000 -fS24_3BE test.raw</div><div class='add'>+</div><div class='add'>+ * playing a S16_BE encoded raw file to the Do port::</div><div class='add'>+</div><div class='add'>+   % aplay -D hw:1,1 -c2 -t raw -r48000 -fS16_BE test.raw</div><div class='add'>+</div><div class='add'>+ * playing an ac3 sample file to the Do port::</div><div class='add'>+</div><div class='add'>+   % aplay -D hw:1,2 --channels=6 ac3_S16_BE_encoded_file.raw</div><div class='add'>+</div><div class='add'>+If you're happy with the default Alsa driver mode and don't experience any </div><div class='add'>+issue with this mode, then you can skip the following chapter.</div><div class='add'>+</div><div class='add'>+Advanced module setup</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+Due to the hardware constraints described above, the device initialization made </div><div class='add'>+by the Alsa driver in default mode may result in a corrupted state of the </div><div class='add'>+device. For instance, a particularly annoying issue is that the sound captured </div><div class='add'>+from the Ai interface sounds distorted (as if boosted with an excessive high</div><div class='add'>+volume gain).</div><div class='add'>+</div><div class='add'>+For people having this problem, the snd-usb-audio module has a new module </div><div class='add'>+parameter called ``device_setup`` (this parameter was introduced in kernel</div><div class='add'>+release 2.6.17)</div><div class='add'>+</div><div class='add'>+Initializing the working mode of the Audiophile USB</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+As far as the Audiophile USB device is concerned, this value let the user </div><div class='add'>+specify:</div><div class='add'>+</div><div class='add'>+ * the sample depth</div><div class='add'>+ * the sample rate</div><div class='add'>+ * whether the Di port is used or not </div><div class='add'>+</div><div class='add'>+When initialized with ``device_setup=0x00``, the snd-usb-audio module has</div><div class='add'>+the same behaviour as when the parameter is omitted (see paragraph "Default </div><div class='add'>+Alsa driver mode" above)</div><div class='add'>+</div><div class='add'>+Others modes are described in the following subsections.</div><div class='add'>+</div><div class='add'>+16-bit modes</div><div class='add'>+~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The two supported modes are:</div><div class='add'>+</div><div class='add'>+ * ``device_setup=0x01``</div><div class='add'>+</div><div class='add'>+   - 16bits 48kHz mode with Di disabled</div><div class='add'>+   - Ai,Ao,Do can be used at the same time</div><div class='add'>+   - hw:1,0 is not available in capture mode</div><div class='add'>+   - hw:1,2 is not available</div><div class='add'>+</div><div class='add'>+ * ``device_setup=0x11``</div><div class='add'>+</div><div class='add'>+   - 16bits 48kHz mode with Di enabled</div><div class='add'>+   - Ai,Ao,Di,Do can be used at the same time</div><div class='add'>+   - hw:1,0 is available in capture mode</div><div class='add'>+   - hw:1,2 is not available</div><div class='add'>+</div><div class='add'>+In this modes the device operates only at 16bits-modes. Before kernel 2.6.23,</div><div class='add'>+the devices where reported to be Big-Endian when in fact they were Little-Endian</div><div class='add'>+so that playing a file was a matter of using:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+   % aplay -D hw:1,1 -c2 -t raw -r48000 -fS16_BE test_S16_LE.raw</div><div class='add'>+</div><div class='add'>+where "test_S16_LE.raw" was in fact a little-endian sample file.</div><div class='add'>+</div><div class='add'>+Thanks to Hakan Lennestal (who discovered the Little-Endiannes of the device in</div><div class='add'>+these modes) a fix has been committed (expected in kernel 2.6.23) and</div><div class='add'>+Alsa now reports Little-Endian interfaces. Thus playing a file now is as simple as</div><div class='add'>+using:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+   % aplay -D hw:1,1 -c2 -t raw -r48000 -fS16_LE test_S16_LE.raw</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+24-bit modes</div><div class='add'>+~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The three supported modes are:</div><div class='add'>+</div><div class='add'>+ * ``device_setup=0x09``</div><div class='add'>+</div><div class='add'>+   - 24bits 48kHz mode with Di disabled</div><div class='add'>+   - Ai,Ao,Do can be used at the same time</div><div class='add'>+   - hw:1,0 is not available in capture mode</div><div class='add'>+   - hw:1,2 is not available</div><div class='add'>+</div><div class='add'>+ * ``device_setup=0x19``</div><div class='add'>+</div><div class='add'>+   - 24bits 48kHz mode with Di enabled</div><div class='add'>+   - 3 ports from {Ai,Ao,Di,Do} can be used at the same time</div><div class='add'>+   - hw:1,0 is available in capture mode and an active digital source must be </div><div class='add'>+     connected to Di</div><div class='add'>+   - hw:1,2 is not available</div><div class='add'>+</div><div class='add'>+ * ``device_setup=0x0D`` or ``0x10``</div><div class='add'>+</div><div class='add'>+   - 24bits 96kHz mode</div><div class='add'>+   - Di is enabled by default for this mode but does not need to be connected </div><div class='add'>+     to an active source</div><div class='add'>+   - Only 1 port from {Ai,Ao,Di,Do} can be used at the same time</div><div class='add'>+   - hw:1,0 is available in captured mode</div><div class='add'>+   - hw:1,2 is not available</div><div class='add'>+</div><div class='add'>+In these modes the device is only Big-Endian compliant (see "Default Alsa driver </div><div class='add'>+mode" above for an aplay command example)</div><div class='add'>+</div><div class='add'>+AC3 w/ DTS passthru mode</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Thanks to Hakan Lennestal, I now have a report saying that this mode works.</div><div class='add'>+</div><div class='add'>+ * ``device_setup=0x03``</div><div class='add'>+</div><div class='add'>+   - 16bits 48kHz mode with only the Do port enabled </div><div class='add'>+   - AC3 with DTS passthru</div><div class='add'>+   - Caution with this setup the Do port is mapped to the pcm device hw:1,0</div><div class='add'>+</div><div class='add'>+The command line used to playback the AC3/DTS encoded .wav-files in this mode:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+   % aplay -D hw:1,0 --channels=6 ac3_S16_LE_encoded_file.raw</div><div class='add'>+</div><div class='add'>+How to use the ``device_setup`` parameter</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The parameter can be given:</div><div class='add'>+</div><div class='add'>+ * By manually probing the device (as root):::</div><div class='add'>+</div><div class='add'>+   # modprobe -r snd-usb-audio</div><div class='add'>+   # modprobe snd-usb-audio index=1 device_setup=0x09</div><div class='add'>+</div><div class='add'>+ * Or while configuring the modules options in your modules configuration file</div><div class='add'>+   (typically a .conf file in /etc/modprobe.d/ directory:::</div><div class='add'>+</div><div class='add'>+       alias snd-card-1 snd-usb-audio</div><div class='add'>+       options snd-usb-audio index=1 device_setup=0x09</div><div class='add'>+</div><div class='add'>+CAUTION when initializing the device</div><div class='add'>+-------------------------------------</div><div class='add'>+</div><div class='add'>+ * Correct initialization on the device requires that device_setup is given to</div><div class='add'>+   the module BEFORE the device is turned on. So, if you use the "manual probing"</div><div class='add'>+   method described above, take care to power-on the device AFTER this initialization.</div><div class='add'>+</div><div class='add'>+ * Failing to respect this will lead to a misconfiguration of the device. In this case</div><div class='add'>+   turn off the device, unprobe the snd-usb-audio module, then probe it again with</div><div class='add'>+   correct device_setup parameter and then (and only then) turn on the device again.</div><div class='add'>+</div><div class='add'>+ * If you've correctly initialized the device in a valid mode and then want to switch</div><div class='add'>+   to  another mode (possibly with another sample-depth), please use also the following </div><div class='add'>+   procedure:</div><div class='add'>+</div><div class='add'>+   - first turn off the device</div><div class='add'>+   - de-register the snd-usb-audio module (modprobe -r)</div><div class='add'>+   - change the device_setup parameter by changing the device_setup</div><div class='add'>+     option in ``/etc/modprobe.d/*.conf``</div><div class='add'>+   - turn on the device</div><div class='add'>+</div><div class='add'>+ * A workaround for this last issue has been applied to kernel 2.6.23, but it may not</div><div class='add'>+   be enough to ensure the 'stability' of the device initialization.</div><div class='add'>+</div><div class='add'>+Technical details for hackers</div><div class='add'>+-----------------------------</div><div class='add'>+</div><div class='add'>+This section is for hackers, wanting to understand details about the device</div><div class='add'>+internals and how Alsa supports it.</div><div class='add'>+</div><div class='add'>+Audiophile USB's ``device_setup`` structure</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+If you want to understand the device_setup magic numbers for the Audiophile </div><div class='add'>+USB, you need some very basic understanding of binary computation. However, </div><div class='add'>+this is not required to use the parameter and you may skip this section.</div><div class='add'>+</div><div class='add'>+The device_setup is one byte long and its structure is the following:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+       +---+---+---+---+---+---+---+---+</div><div class='add'>+       | b7| b6| b5| b4| b3| b2| b1| b0|</div><div class='add'>+       +---+---+---+---+---+---+---+---+</div><div class='add'>+       | 0 | 0 | 0 | Di|24B|96K|DTS|SET|</div><div class='add'>+       +---+---+---+---+---+---+---+---+</div><div class='add'>+</div><div class='add'>+Where:</div><div class='add'>+</div><div class='add'>+ * b0 is the ``SET`` bit</div><div class='add'>+</div><div class='add'>+   - it MUST be set if device_setup is initialized </div><div class='add'>+</div><div class='add'>+ * b1 is the ``DTS`` bit</div><div class='add'>+</div><div class='add'>+   - it is set only for Digital output with DTS/AC3</div><div class='add'>+   - this setup is not tested</div><div class='add'>+</div><div class='add'>+ * b2 is the Rate selection flag</div><div class='add'>+</div><div class='add'>+   - When set to ``1`` the rate range is 48.1-96kHz</div><div class='add'>+   - Otherwise the sample rate range is 8-48kHz</div><div class='add'>+</div><div class='add'>+ * b3 is the bit depth selection flag</div><div class='add'>+</div><div class='add'>+   - When set to ``1`` samples are 24bits long</div><div class='add'>+   - Otherwise they are 16bits long</div><div class='add'>+   - Note that b2 implies b3 as the 96kHz mode is only supported for 24 bits </div><div class='add'>+     samples</div><div class='add'>+</div><div class='add'>+ * b4 is the Digital input flag</div><div class='add'>+</div><div class='add'>+   - When set to ``1`` the device assumes that an active digital source is </div><div class='add'>+     connected </div><div class='add'>+   - You shouldn't enable Di if no source is seen on the port (this leads to </div><div class='add'>+     synchronization issues)</div><div class='add'>+   - b4 is implied by b2 (since only one port is enabled at a time no synch </div><div class='add'>+     error can occur) </div><div class='add'>+</div><div class='add'>+ * b5 to b7 are reserved for future uses, and must be set to ``0``</div><div class='add'>+</div><div class='add'>+   - might become Ao, Do, Ai, for b7, b6, b4 respectively</div><div class='add'>+</div><div class='add'>+Caution:</div><div class='add'>+</div><div class='add'>+ * there is no check on the value you will give to device_setup</div><div class='add'>+</div><div class='add'>+   - for instance choosing 0x05 (16bits 96kHz) will fail back to 0x09 since </div><div class='add'>+     b2 implies b3. But _there_will_be_no_warning_ in /var/log/messages</div><div class='add'>+</div><div class='add'>+ * Hardware constraints due to the USB bus limitation aren't checked</div><div class='add'>+</div><div class='add'>+   - choosing b2 will prepare all interfaces for 24bits/96kHz but you'll</div><div class='add'>+     only be able to use one at the same time</div><div class='add'>+</div><div class='add'>+USB implementation details for this device</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+You may safely skip this section if you're not interested in driver </div><div class='add'>+hacking.</div><div class='add'>+</div><div class='add'>+This section describes some internal aspects of the device and summarizes the </div><div class='add'>+data I got by usb-snooping the windows and Linux drivers.</div><div class='add'>+</div><div class='add'>+The M-Audio Audiophile USB has 7 USB Interfaces:</div><div class='add'>+a "USB interface":</div><div class='add'>+</div><div class='add'>+ * USB Interface nb.0</div><div class='add'>+ * USB Interface nb.1</div><div class='add'>+</div><div class='add'>+   - Audio Control function</div><div class='add'>+</div><div class='add'>+ * USB Interface nb.2</div><div class='add'>+</div><div class='add'>+   - Analog Output</div><div class='add'>+</div><div class='add'>+ * USB Interface nb.3</div><div class='add'>+</div><div class='add'>+   - Digital Output</div><div class='add'>+</div><div class='add'>+ * USB Interface nb.4</div><div class='add'>+</div><div class='add'>+   - Analog Input</div><div class='add'>+</div><div class='add'>+ * USB Interface nb.5</div><div class='add'>+</div><div class='add'>+   - Digital Input</div><div class='add'>+</div><div class='add'>+ * USB Interface nb.6</div><div class='add'>+</div><div class='add'>+   - MIDI interface compliant with the MIDIMAN quirk </div><div class='add'>+</div><div class='add'>+Each interface has 5 altsettings (AltSet 1,2,3,4,5) except:</div><div class='add'>+</div><div class='add'>+ * Interface 3 (Digital Out) has an extra Alset nb.6 </div><div class='add'>+ * Interface 5 (Digital In) does not have Alset nb.3 and 5 </div><div class='add'>+</div><div class='add'>+Here is a short description of the AltSettings capabilities:</div><div class='add'>+</div><div class='add'>+* AltSettings 1 corresponds to</div><div class='add'>+</div><div class='add'>+  - 24-bit depth, 48.1-96kHz sample mode</div><div class='add'>+  - Adaptive playback (Ao and Do), Synch capture (Ai), or Asynch capture (Di)</div><div class='add'>+</div><div class='add'>+* AltSettings 2 corresponds to</div><div class='add'>+</div><div class='add'>+  - 24-bit depth, 8-48kHz sample mode</div><div class='add'>+  - Asynch capture and playback  (Ao,Ai,Do,Di)</div><div class='add'>+</div><div class='add'>+* AltSettings 3 corresponds to</div><div class='add'>+</div><div class='add'>+  - 24-bit depth, 8-48kHz sample mode</div><div class='add'>+  - Synch capture (Ai) and Adaptive playback (Ao,Do)</div><div class='add'>+</div><div class='add'>+* AltSettings 4 corresponds to</div><div class='add'>+</div><div class='add'>+  - 16-bit depth, 8-48kHz sample mode</div><div class='add'>+  - Asynch capture and playback  (Ao,Ai,Do,Di)</div><div class='add'>+</div><div class='add'>+* AltSettings 5 corresponds to</div><div class='add'>+</div><div class='add'>+  - 16-bit depth, 8-48kHz sample mode</div><div class='add'>+  - Synch capture (Ai) and Adaptive playback (Ao,Do)</div><div class='add'>+</div><div class='add'>+* AltSettings 6 corresponds to</div><div class='add'>+</div><div class='add'>+  - 16-bit depth, 8-48kHz sample mode</div><div class='add'>+  - Synch playback (Do), audio format type III IEC1937_AC-3</div><div class='add'>+</div><div class='add'>+In order to ensure a correct initialization of the device, the driver </div><div class='add'>+*must* *know* how the device will be used:</div><div class='add'>+</div><div class='add'>+ * if DTS is chosen, only Interface 2 with AltSet nb.6 must be</div><div class='add'>+   registered</div><div class='add'>+ * if 96KHz only AltSets nb.1 of each interface must be selected</div><div class='add'>+ * if samples are using 24bits/48KHz then AltSet 2 must me used if</div><div class='add'>+   Digital input is connected, and only AltSet nb.3 if Digital input</div><div class='add'>+   is not connected</div><div class='add'>+ * if samples are using 16bits/48KHz then AltSet 4 must me used if</div><div class='add'>+   Digital input is connected, and only AltSet nb.5 if Digital input</div><div class='add'>+   is not connected</div><div class='add'>+</div><div class='add'>+When device_setup is given as a parameter to the snd-usb-audio module, the </div><div class='add'>+parse_audio_endpoints function uses a quirk called </div><div class='add'>+``audiophile_skip_setting_quirk`` in order to prevent AltSettings not </div><div class='add'>+corresponding to device_setup from being registered in the driver.</div><div class='add'>+</div><div class='add'>+Audiophile USB and Jack support</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+This section deals with support of the Audiophile USB device in Jack.</div><div class='add'>+</div><div class='add'>+There are 2 main potential issues when using Jackd with the device:</div><div class='add'>+</div><div class='add'>+* support for Big-Endian devices in 24-bit modes</div><div class='add'>+* support for 4-in / 4-out channels</div><div class='add'>+</div><div class='add'>+Direct support in Jackd</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Jack supports big endian devices only in recent versions (thanks to</div><div class='add'>+Andreas Steinmetz for his first big-endian patch). I can't remember </div><div class='add'>+exactly when this support was released into jackd, let's just say that</div><div class='add'>+with jackd version 0.103.0 it's almost ok (just a small bug is affecting </div><div class='add'>+16bits Big-Endian devices, but since you've read carefully the above</div><div class='add'>+paragraphs, you're now using kernel &gt;= 2.6.23 and your 16bits devices </div><div class='add'>+are now Little Endians ;-) ).</div><div class='add'>+</div><div class='add'>+You can run jackd with the following command for playback with Ao and</div><div class='add'>+record with Ai:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  % jackd -R -dalsa -Phw:1,0 -r48000 -p128 -n2 -D -Chw:1,1</div><div class='add'>+</div><div class='add'>+Using Alsa plughw</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+If you don't have a recent Jackd installed, you can downgrade to using</div><div class='add'>+the Alsa ``plug`` converter.</div><div class='add'>+</div><div class='add'>+For instance here is one way to run Jack with 2 playback channels on Ao and 2 </div><div class='add'>+capture channels from Ai:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  % jackd -R -dalsa -dplughw:1 -r48000 -p256 -n2 -D -Cplughw:1,1</div><div class='add'>+</div><div class='add'>+However you may see the following warning message:</div><div class='add'>+  You appear to be using the ALSA software "plug" layer, probably a result of </div><div class='add'>+  using the "default" ALSA device. This is less efficient than it could be. </div><div class='add'>+  Consider using a hardware device instead rather than using the plug layer.</div><div class='add'>+</div><div class='add'>+Getting 2 input and/or output interfaces in Jack</div><div class='add'>+------------------------------------------------</div><div class='add'>+</div><div class='add'>+As you can see, starting the Jack server this way will only enable 1 stereo</div><div class='add'>+input (Di or Ai) and 1 stereo output (Ao or Do).</div><div class='add'>+</div><div class='add'>+This is due to the following restrictions:</div><div class='add'>+</div><div class='add'>+* Jack can only open one capture device and one playback device at a time</div><div class='add'>+* The Audiophile USB is seen as 2 (or three) Alsa devices: hw:1,0, hw:1,1</div><div class='add'>+  (and optionally hw:1,2)</div><div class='add'>+</div><div class='add'>+If you want to get Ai+Di and/or Ao+Do support with Jack, you would need to</div><div class='add'>+combine the Alsa devices into one logical "complex" device.</div><div class='add'>+</div><div class='add'>+If you want to give it a try, I recommend reading the information from</div><div class='add'>+this page: http://www.sound-man.co.uk/linuxaudio/ice1712multi.html</div><div class='add'>+It is related to another device (ice1712) but can be adapted to suit</div><div class='add'>+the Audiophile USB.</div><div class='add'>+</div><div class='add'>+Enabling multiple Audiophile USB interfaces for Jackd will certainly require:</div><div class='add'>+</div><div class='add'>+* Making sure your Jackd version has the MMAP_COMPLEX patch (see the ice1712 page)</div><div class='add'>+* (maybe) patching the alsa-lib/src/pcm/pcm_multi.c file (see the ice1712 page)</div><div class='add'>+* define a multi device (combination of hw:1,0 and hw:1,1) in your .asoundrc</div><div class='add'>+  file </div><div class='add'>+* start jackd with this device</div><div class='add'>+</div><div class='add'>+I had no success in testing this for now, if you have any success with this kind </div><div class='add'>+of setup, please drop me an email.</div><div class='head'>diff --git a/Documentation/sound/cards/bt87x.rst b/Documentation/sound/cards/bt87x.rst<br/>new file mode 100644<br/>index 000000000000..912732d3ef9e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/bt87x.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/bt87x.rst</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+=================</div><div class='add'>+ALSA BT87x Driver</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+Intro</div><div class='add'>+=====</div><div class='add'>+</div><div class='add'>+You might have noticed that the bt878 grabber cards have actually</div><div class='add'>+*two* PCI functions:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  $ lspci</div><div class='add'>+  [ ... ]</div><div class='add'>+  00:0a.0 Multimedia video controller: Brooktree Corporation Bt878 (rev 02)</div><div class='add'>+  00:0a.1 Multimedia controller: Brooktree Corporation Bt878 (rev 02)</div><div class='add'>+  [ ... ]</div><div class='add'>+</div><div class='add'>+The first does video, it is backward compatible to the bt848.  The second</div><div class='add'>+does audio.  snd-bt87x is a driver for the second function.  It's a sound</div><div class='add'>+driver which can be used for recording sound (and *only* recording, no</div><div class='add'>+playback).  As most TV cards come with a short cable which can be plugged</div><div class='add'>+into your sound card's line-in you probably don't need this driver if all</div><div class='add'>+you want to do is just watching TV...</div><div class='add'>+</div><div class='add'>+Some cards do not bother to connect anything to the audio input pins of</div><div class='add'>+the chip, and some other cards use the audio function to transport MPEG</div><div class='add'>+video data, so it's quite possible that audio recording may not work</div><div class='add'>+with your card.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Driver Status</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+The driver is now stable.  However, it doesn't know about many TV cards,</div><div class='add'>+and it refuses to load for cards it doesn't know.</div><div class='add'>+</div><div class='add'>+If the driver complains ("Unknown TV card found, the audio driver will</div><div class='add'>+not load"), you can specify the ``load_all=1`` option to force the driver to</div><div class='add'>+try to use the audio capture function of your card.  If the frequency of</div><div class='add'>+recorded data is not right, try to specify the ``digital_rate`` option with</div><div class='add'>+other values than the default 32000 (often it's 44100 or 64000).</div><div class='add'>+</div><div class='add'>+If you have an unknown card, please mail the ID and board name to</div><div class='add'>+&lt;alsa-devel@alsa-project.org&gt;, regardless of whether audio capture works</div><div class='add'>+or not, so that future versions of this driver know about your card.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Audio modes</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+The chip knows two different modes (digital/analog).  snd-bt87x</div><div class='add'>+registers two PCM devices, one for each mode.  They cannot be used at</div><div class='add'>+the same time.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Digital audio mode</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+The first device (hw:X,0) gives you 16 bit stereo sound.  The sample</div><div class='add'>+rate depends on the external source which feeds the Bt87x with digital</div><div class='add'>+sound via I2S interface.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Analog audio mode (A/D)</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+The second device (hw:X,1) gives you 8 or 16 bit mono sound.  Supported</div><div class='add'>+sample rates are between 119466 and 448000 Hz (yes, these numbers are</div><div class='add'>+that high).  If you've set the CONFIG_SND_BT87X_OVERCLOCK option, the</div><div class='add'>+maximum sample rate is 1792000 Hz, but audio data becomes unusable</div><div class='add'>+beyond 896000 Hz on my card.</div><div class='add'>+</div><div class='add'>+The chip has three analog inputs.  Consequently you'll get a mixer</div><div class='add'>+device to control these.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Have fun,</div><div class='add'>+</div><div class='add'>+  Clemens</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Written by Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+big parts copied from btaudio.txt by Gerd Knorr &lt;kraxel@bytesex.org&gt;</div><div class='head'>diff --git a/Documentation/sound/cards/cmipci.rst b/Documentation/sound/cards/cmipci.rst<br/>new file mode 100644<br/>index 000000000000..9ea1de6ec4ce<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/cmipci.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/cmipci.rst</a></div><div class='hunk'>@@ -0,0 +1,272 @@</div><div class='add'>+=================================================</div><div class='add'>+Brief Notes on C-Media 8338/8738/8768/8770 Driver</div><div class='add'>+=================================================</div><div class='add'>+</div><div class='add'>+Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Front/Rear Multi-channel Playback</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+CM8x38 chip can use ADC as the second DAC so that two different stereo</div><div class='add'>+channels can be used for front/rear playbacks.  Since there are two</div><div class='add'>+DACs, both streams are handled independently unlike the 4/6ch multi-</div><div class='add'>+channel playbacks in the section below.</div><div class='add'>+</div><div class='add'>+As default, ALSA driver assigns the first PCM device (i.e. hw:0,0 for</div><div class='add'>+card#0) for front and 4/6ch playbacks, while the second PCM device</div><div class='add'>+(hw:0,1) is assigned to the second DAC for rear playback.</div><div class='add'>+</div><div class='add'>+There are slight differences between the two DACs:</div><div class='add'>+</div><div class='add'>+- The first DAC supports U8 and S16LE formats, while the second DAC</div><div class='add'>+  supports only S16LE.</div><div class='add'>+- The second DAC supports only two channel stereo.</div><div class='add'>+</div><div class='add'>+Please note that the CM8x38 DAC doesn't support continuous playback</div><div class='add'>+rate but only fixed rates: 5512, 8000, 11025, 16000, 22050, 32000,</div><div class='add'>+44100 and 48000 Hz.</div><div class='add'>+</div><div class='add'>+The rear output can be heard only when "Four Channel Mode" switch is</div><div class='add'>+disabled.  Otherwise no signal will be routed to the rear speakers.</div><div class='add'>+As default it's turned on.</div><div class='add'>+</div><div class='add'>+.. WARNING::</div><div class='add'>+  When "Four Channel Mode" switch is off, the output from rear speakers</div><div class='add'>+  will be FULL VOLUME regardless of Master and PCM volumes [#]_.</div><div class='add'>+  This might damage your audio equipment.  Please disconnect speakers</div><div class='add'>+  before your turn off this switch.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. [#]</div><div class='add'>+  Well.. I once got the output with correct volume (i.e. same with the</div><div class='add'>+  front one) and was so excited.  It was even with "Four Channel" bit</div><div class='add'>+  on and "double DAC" mode.  Actually I could hear separate 4 channels</div><div class='add'>+  from front and rear speakers!  But.. after reboot, all was gone.</div><div class='add'>+  It's a very pity that I didn't save the register dump at that</div><div class='add'>+  time..  Maybe there is an unknown register to achieve this...</div><div class='add'>+</div><div class='add'>+If your card has an extra output jack for the rear output, the rear</div><div class='add'>+playback should be routed there as default.  If not, there is a</div><div class='add'>+control switch in the driver "Line-In As Rear", which you can change</div><div class='add'>+via alsamixer or somewhat else.  When this switch is on, line-in jack</div><div class='add'>+is used as rear output.</div><div class='add'>+</div><div class='add'>+There are two more controls regarding to the rear output.</div><div class='add'>+The "Exchange DAC" switch is used to exchange front and rear playback</div><div class='add'>+routes, i.e. the 2nd DAC is output from front output.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4/6 Multi-Channel Playback</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+The recent CM8738 chips support for the 4/6 multi-channel playback</div><div class='add'>+function.  This is useful especially for AC3 decoding.</div><div class='add'>+</div><div class='add'>+When the multi-channel is supported, the driver name has a suffix</div><div class='add'>+"-MC" such like "CMI8738-MC6".  You can check this name from</div><div class='add'>+/proc/asound/cards.</div><div class='add'>+</div><div class='add'>+When the 4/6-ch output is enabled, the second DAC accepts up to 6 (or</div><div class='add'>+4) channels.  While the dual DAC supports two different rates or</div><div class='add'>+formats, the 4/6-ch playback supports only the same condition for all</div><div class='add'>+channels.  Since the multi-channel playback mode uses both DACs, you</div><div class='add'>+cannot operate with full-duplex.</div><div class='add'>+</div><div class='add'>+The 4.0 and 5.1 modes are defined as the pcm "surround40" and "surround51"</div><div class='add'>+in alsa-lib.  For example, you can play a WAV file with 6 channels like</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	% aplay -Dsurround51 sixchannels.wav</div><div class='add'>+</div><div class='add'>+For programming the 4/6 channel playback, you need to specify the PCM</div><div class='add'>+channels as you like and set the format S16LE.  For example, for playback</div><div class='add'>+with 4 channels,</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	snd_pcm_hw_params_set_access(pcm, hw, SND_PCM_ACCESS_RW_INTERLEAVED);</div><div class='add'>+	    // or mmap if you like</div><div class='add'>+	snd_pcm_hw_params_set_format(pcm, hw, SND_PCM_FORMAT_S16_LE);</div><div class='add'>+	snd_pcm_hw_params_set_channels(pcm, hw, 4);</div><div class='add'>+</div><div class='add'>+and use the interleaved 4 channel data.</div><div class='add'>+</div><div class='add'>+There are some control switches affecting to the speaker connections:</div><div class='add'>+</div><div class='add'>+Line-In Mode</div><div class='add'>+	an enum control to change the behavior of line-in</div><div class='add'>+	jack.  Either "Line-In", "Rear Output" or "Bass Output" can</div><div class='add'>+	be selected.  The last item is available only with model 039</div><div class='add'>+	or newer. </div><div class='add'>+	When "Rear Output" is chosen, the surround channels 3 and 4</div><div class='add'>+	are output to line-in jack.</div><div class='add'>+Mic-In Mode</div><div class='add'>+	an enum control to change the behavior of mic-in</div><div class='add'>+	jack.  Either "Mic-In" or "Center/LFE Output" can be</div><div class='add'>+	selected. </div><div class='add'>+	When "Center/LFE Output" is chosen, the center and bass</div><div class='add'>+	channels (channels 5 and 6) are output to mic-in jack. </div><div class='add'>+</div><div class='add'>+Digital I/O</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The CM8x38 provides the excellent SPDIF capability with very cheap</div><div class='add'>+price (yes, that's the reason I bought the card :)</div><div class='add'>+</div><div class='add'>+The SPDIF playback and capture are done via the third PCM device</div><div class='add'>+(hw:0,2).  Usually this is assigned to the PCM device "spdif".</div><div class='add'>+The available rates are 44100 and 48000 Hz.</div><div class='add'>+For playback with aplay, you can run like below:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	% aplay -Dhw:0,2 foo.wav</div><div class='add'>+</div><div class='add'>+or</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	% aplay -Dspdif foo.wav</div><div class='add'>+</div><div class='add'>+24bit format is also supported experimentally.</div><div class='add'>+</div><div class='add'>+The playback and capture over SPDIF use normal DAC and ADC,</div><div class='add'>+respectively, so you cannot playback both analog and digital streams</div><div class='add'>+simultaneously.</div><div class='add'>+</div><div class='add'>+To enable SPDIF output, you need to turn on "IEC958 Output Switch"</div><div class='add'>+control via mixer or alsactl ("IEC958" is the official name of</div><div class='add'>+so-called S/PDIF).  Then you'll see the red light on from the card so</div><div class='add'>+you know that's working obviously :)</div><div class='add'>+The SPDIF input is always enabled, so you can hear SPDIF input data</div><div class='add'>+from line-out with "IEC958 In Monitor" switch at any time (see</div><div class='add'>+below).</div><div class='add'>+</div><div class='add'>+You can play via SPDIF even with the first device (hw:0,0),</div><div class='add'>+but SPDIF is enabled only when the proper format (S16LE), sample rate</div><div class='add'>+(441100 or 48000) and channels (2) are used.  Otherwise it's turned</div><div class='add'>+off.  (Also don't forget to turn on "IEC958 Output Switch", too.)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Additionally there are relevant control switches:</div><div class='add'>+</div><div class='add'>+IEC958 Mix Analog</div><div class='add'>+	Mix analog PCM playback and FM-OPL/3 streams and</div><div class='add'>+	output through SPDIF.  This switch appears only on old chip</div><div class='add'>+	models (CM8738 033 and 037).</div><div class='add'>+</div><div class='add'>+	Note: without this control you can output PCM to SPDIF.</div><div class='add'>+	This is "mixing" of streams, so e.g. it's not for AC3 output</div><div class='add'>+	(see the next section).</div><div class='add'>+</div><div class='add'>+IEC958 In Select</div><div class='add'>+	Select SPDIF input, the internal CD-in (false)</div><div class='add'>+	and the external input (true).</div><div class='add'>+</div><div class='add'>+IEC958 Loop</div><div class='add'>+	SPDIF input data is loop back into SPDIF</div><div class='add'>+	output (aka bypass)</div><div class='add'>+</div><div class='add'>+IEC958 Copyright</div><div class='add'>+	Set the copyright bit.</div><div class='add'>+</div><div class='add'>+IEC958 5V</div><div class='add'>+	Select 0.5V (coax) or 5V (optical) interface.</div><div class='add'>+	On some cards this doesn't work and you need to change the</div><div class='add'>+	configuration with hardware dip-switch.</div><div class='add'>+</div><div class='add'>+IEC958 In Monitor</div><div class='add'>+	SPDIF input is routed to DAC.</div><div class='add'>+</div><div class='add'>+IEC958 In Phase Inverse</div><div class='add'>+	Set SPDIF input format as inverse.</div><div class='add'>+	[FIXME: this doesn't work on all chips..]</div><div class='add'>+</div><div class='add'>+IEC958 In Valid</div><div class='add'>+	Set input validity flag detection.</div><div class='add'>+</div><div class='add'>+Note: When "PCM Playback Switch" is on, you'll hear the digital output</div><div class='add'>+stream through analog line-out.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The AC3 (RAW DIGITAL) OUTPUT</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+The driver supports raw digital (typically AC3) i/o over SPDIF.  This</div><div class='add'>+can be toggled via IEC958 playback control, but usually you need to</div><div class='add'>+access it via alsa-lib.  See alsa-lib documents for more details.</div><div class='add'>+</div><div class='add'>+On the raw digital mode, the "PCM Playback Switch" is automatically</div><div class='add'>+turned off so that non-audio data is heard from the analog line-out.</div><div class='add'>+Similarly the following switches are off: "IEC958 Mix Analog" and</div><div class='add'>+"IEC958 Loop".  The switches are resumed after closing the SPDIF PCM</div><div class='add'>+device automatically to the previous state.</div><div class='add'>+</div><div class='add'>+On the model 033, AC3 is implemented by the software conversion in</div><div class='add'>+the alsa-lib.  If you need to bypass the software conversion of IEC958</div><div class='add'>+subframes, pass the "soft_ac3=0" module option.  This doesn't matter</div><div class='add'>+on the newer models.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ANALOG MIXER INTERFACE</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+The mixer interface on CM8x38 is similar to SB16.</div><div class='add'>+There are Master, PCM, Synth, CD, Line, Mic and PC Speaker playback</div><div class='add'>+volumes.  Synth, CD, Line and Mic have playback and capture switches,</div><div class='add'>+too, as well as SB16.</div><div class='add'>+</div><div class='add'>+In addition to the standard SB mixer, CM8x38 provides more functions.</div><div class='add'>+- PCM playback switch</div><div class='add'>+- PCM capture switch (to capture the data sent to DAC)</div><div class='add'>+- Mic Boost switch</div><div class='add'>+- Mic capture volume</div><div class='add'>+- Aux playback volume/switch and capture switch</div><div class='add'>+- 3D control switch</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MIDI CONTROLLER</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+With CMI8338 chips, the MPU401-UART interface is disabled as default.</div><div class='add'>+You need to set the module option "mpu_port" to a valid I/O port address</div><div class='add'>+to enable MIDI support.  Valid I/O ports are 0x300, 0x310, 0x320 and</div><div class='add'>+0x330.  Choose a value that doesn't conflict with other cards.</div><div class='add'>+</div><div class='add'>+With CMI8738 and newer chips, the MIDI interface is enabled by default</div><div class='add'>+and the driver automatically chooses a port address.</div><div class='add'>+</div><div class='add'>+There is *no* hardware wavetable function on this chip (except for</div><div class='add'>+OPL3 synth below).</div><div class='add'>+What's said as MIDI synth on Windows is a software synthesizer</div><div class='add'>+emulation.  On Linux use TiMidity or other softsynth program for</div><div class='add'>+playing MIDI music.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+FM OPL/3 Synth</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+The FM OPL/3 is also enabled as default only for the first card.</div><div class='add'>+Set "fm_port" module option for more cards.</div><div class='add'>+</div><div class='add'>+The output quality of FM OPL/3 is, however, very weird.</div><div class='add'>+I don't know why..</div><div class='add'>+</div><div class='add'>+CMI8768 and newer chips do not have the FM synth.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Joystick and Modem</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+The legacy joystick is supported.  To enable the joystick support, pass</div><div class='add'>+joystick_port=1 module option.  The value 1 means the auto-detection.</div><div class='add'>+If the auto-detection fails, try to pass the exact I/O address.</div><div class='add'>+</div><div class='add'>+The modem is enabled dynamically via a card control switch "Modem".</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Debugging Information</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The registers are shown in /proc/asound/cardX/cmipci.  If you have any</div><div class='add'>+problem (especially unexpected behavior of mixer), please attach the</div><div class='add'>+output of this proc file together with the bug report.</div><div class='head'>diff --git a/Documentation/sound/cards/emu10k1-jack.rst b/Documentation/sound/cards/emu10k1-jack.rst<br/>new file mode 100644<br/>index 000000000000..6597f1ea83f0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/emu10k1-jack.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/emu10k1-jack.rst</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+=================================================================</div><div class='add'>+Low latency, multichannel audio with JACK and the emu10k1/emu10k2</div><div class='add'>+=================================================================</div><div class='add'>+</div><div class='add'>+This document is a guide to using the emu10k1 based devices with JACK for low</div><div class='add'>+latency, multichannel recording functionality.  All of my recent work to allow</div><div class='add'>+Linux users to use the full capabilities of their hardware has been inspired </div><div class='add'>+by the kX Project.  Without their work I never would have discovered the true</div><div class='add'>+power of this hardware.</div><div class='add'>+</div><div class='add'>+	http://www.kxproject.com</div><div class='add'>+						- Lee Revell, 2005.03.30</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Until recently, emu10k1 users on Linux did not have access to the same low</div><div class='add'>+latency, multichannel features offered by the "kX ASIO" feature of their</div><div class='add'>+Windows driver.  As of ALSA 1.0.9 this is no more!</div><div class='add'>+</div><div class='add'>+For those unfamiliar with kX ASIO, this consists of 16 capture and 16 playback</div><div class='add'>+channels.  With a post 2.6.9 Linux kernel, latencies down to 64 (1.33 ms) or</div><div class='add'>+even 32 (0.66ms) frames should work well.</div><div class='add'>+</div><div class='add'>+The configuration is slightly more involved than on Windows, as you have to</div><div class='add'>+select the correct device for JACK to use.  Actually, for qjackctl users it's</div><div class='add'>+fairly self explanatory - select Duplex, then for capture and playback select</div><div class='add'>+the multichannel devices, set the in and out channels to 16, and the sample</div><div class='add'>+rate to 48000Hz.  The command line looks like this:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  /usr/local/bin/jackd -R -dalsa -r48000 -p64 -n2 -D -Chw:0,2 -Phw:0,3 -S</div><div class='add'>+</div><div class='add'>+This will give you 16 input ports and 16 output ports.</div><div class='add'>+</div><div class='add'>+The 16 output ports map onto the 16 FX buses (or the first 16 of 64, for the</div><div class='add'>+Audigy).  The mapping from FX bus to physical output is described in</div><div class='add'>+sb-live-mixer.rst (or audigy-mixer.rst).</div><div class='add'>+</div><div class='add'>+The 16 input ports are connected to the 16 physical inputs.  Contrary to</div><div class='add'>+popular belief, all emu10k1 cards are multichannel cards.  Which of these</div><div class='add'>+input channels have physical inputs connected to them depends on the card</div><div class='add'>+model.  Trial and error is highly recommended; the pinout diagrams</div><div class='add'>+for the card have been reverse engineered by some enterprising kX users and are </div><div class='add'>+available on the internet.  Meterbridge is helpful here, and the kX forums are</div><div class='add'>+packed with useful information.</div><div class='add'>+</div><div class='add'>+Each input port will either correspond to a digital (SPDIF) input, an analog</div><div class='add'>+input, or nothing.  The one exception is the SBLive! 5.1.  On these devices,</div><div class='add'>+the second and third input ports are wired to the center/LFE output.  You will</div><div class='add'>+still see 16 capture channels, but only 14 are available for recording inputs.</div><div class='add'>+</div><div class='add'>+This chart, borrowed from kxfxlib/da_asio51.cpp, describes the mapping of JACK</div><div class='add'>+ports to FXBUS2 (multitrack recording input) and EXTOUT (physical output)</div><div class='add'>+channels.</div><div class='add'>+</div><div class='add'>+JACK (&amp; ASIO) mappings on 10k1 5.1 SBLive cards:</div><div class='add'>+</div><div class='add'>+==============  ========        ============</div><div class='add'>+JACK		Epilog		FXBUS2(nr)</div><div class='add'>+==============  ========        ============</div><div class='add'>+capture_1	asio14		FXBUS2(0xe)</div><div class='add'>+capture_2	asio15		FXBUS2(0xf)</div><div class='add'>+capture_3	asio0		FXBUS2(0x0)	</div><div class='add'>+~capture_4	Center		EXTOUT(0x11)	// mapped to by Center</div><div class='add'>+~capture_5	LFE		EXTOUT(0x12)	// mapped to by LFE</div><div class='add'>+capture_6	asio3		FXBUS2(0x3)</div><div class='add'>+capture_7	asio4		FXBUS2(0x4)</div><div class='add'>+capture_8	asio5		FXBUS2(0x5)</div><div class='add'>+capture_9	asio6		FXBUS2(0x6)</div><div class='add'>+capture_10	asio7		FXBUS2(0x7)</div><div class='add'>+capture_11	asio8		FXBUS2(0x8)</div><div class='add'>+capture_12	asio9		FXBUS2(0x9)</div><div class='add'>+capture_13	asio10		FXBUS2(0xa)</div><div class='add'>+capture_14	asio11		FXBUS2(0xb)</div><div class='add'>+capture_15	asio12		FXBUS2(0xc)</div><div class='add'>+capture_16	asio13		FXBUS2(0xd)</div><div class='add'>+==============  ========        ============</div><div class='add'>+</div><div class='add'>+TODO: describe use of ld10k1/qlo10k1 in conjunction with JACK</div><div class='head'>diff --git a/Documentation/sound/cards/hdspm.rst b/Documentation/sound/cards/hdspm.rst<br/>new file mode 100644<br/>index 000000000000..5373e51ed076<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/hdspm.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/hdspm.rst</a></div><div class='hunk'>@@ -0,0 +1,379 @@</div><div class='add'>+=======================================</div><div class='add'>+Software Interface ALSA-DSP MADI Driver </div><div class='add'>+=======================================</div><div class='add'>+</div><div class='add'>+(translated from German, so no good English ;-), </div><div class='add'>+</div><div class='add'>+2004 - winfried ritsch</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Full functionality has been added to the driver. Since some of</div><div class='add'>+the Controls and startup-options  are ALSA-Standard and only the</div><div class='add'>+special Controls are described and discussed below.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Hardware functionality</div><div class='add'>+======================</div><div class='add'>+   </div><div class='add'>+Audio transmission</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+* number of channels --  depends on transmission mode</div><div class='add'>+</div><div class='add'>+		The number of channels chosen is from 1..Nmax. The reason to</div><div class='add'>+		use for a lower number of channels is only resource allocation,</div><div class='add'>+		since unused DMA channels are disabled and less memory is</div><div class='add'>+		allocated. So also the throughput of the PCI system can be</div><div class='add'>+		scaled. (Only important for low performance boards).</div><div class='add'>+</div><div class='add'>+* Single Speed -- 1..64 channels </div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+		 (Note: Choosing the 56channel mode for transmission or as</div><div class='add'>+		 receiver, only 56 are transmitted/received over the MADI, but</div><div class='add'>+		 all 64 channels are available for the mixer, so channel count</div><div class='add'>+		 for the driver)</div><div class='add'>+</div><div class='add'>+* Double Speed -- 1..32 channels</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+		 Note: Choosing the 56-channel mode for</div><div class='add'>+		 transmission/receive-mode , only 28 are transmitted/received</div><div class='add'>+		 over the MADI, but all 32 channels are available for the mixer,</div><div class='add'>+		 so channel count for the driver</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* Quad Speed -- 1..16 channels </div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+		 Choosing the 56-channel mode for</div><div class='add'>+		 transmission/receive-mode , only 14 are transmitted/received</div><div class='add'>+		 over the MADI, but all 16 channels are available for the mixer,</div><div class='add'>+		 so channel count for the driver</div><div class='add'>+</div><div class='add'>+* Format -- signed 32 Bit Little Endian (SNDRV_PCM_FMTBIT_S32_LE)</div><div class='add'>+</div><div class='add'>+* Sample Rates --</div><div class='add'>+</div><div class='add'>+       Single Speed -- 32000, 44100, 48000</div><div class='add'>+</div><div class='add'>+       Double Speed -- 64000, 88200, 96000 (untested)</div><div class='add'>+</div><div class='add'>+       Quad Speed -- 128000, 176400, 192000 (untested)</div><div class='add'>+</div><div class='add'>+* access-mode -- MMAP (memory mapped), Not interleaved (PCM_NON-INTERLEAVED)</div><div class='add'>+</div><div class='add'>+* buffer-sizes -- 64,128,256,512,1024,2048,8192 Samples</div><div class='add'>+</div><div class='add'>+* fragments -- 2</div><div class='add'>+</div><div class='add'>+* Hardware-pointer -- 2 Modi</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		 The Card supports the readout of the actual Buffer-pointer,</div><div class='add'>+		 where DMA reads/writes. Since of the bulk mode of PCI it is only</div><div class='add'>+		 64 Byte accurate. SO it is not really usable for the</div><div class='add'>+		 ALSA-mid-level functions (here the buffer-ID gives a better</div><div class='add'>+		 result), but if MMAP is used by the application. Therefore it</div><div class='add'>+		 can be configured at load-time with the parameter</div><div class='add'>+		 precise-pointer.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. hint::</div><div class='add'>+		 (Hint: Experimenting I found that the pointer is maximum 64 to</div><div class='add'>+		 large never to small. So if you subtract 64 you always have a</div><div class='add'>+		 safe pointer for writing, which is used on this mode inside</div><div class='add'>+		 ALSA. In theory now you can get now a latency as low as 16</div><div class='add'>+		 Samples, which is a quarter of the interrupt possibilities.)</div><div class='add'>+</div><div class='add'>+   * Precise Pointer -- off</div><div class='add'>+					interrupt used for pointer-calculation</div><div class='add'>+				</div><div class='add'>+   * Precise Pointer -- on</div><div class='add'>+					hardware pointer used.</div><div class='add'>+</div><div class='add'>+Controller</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+Since DSP-MADI-Mixer has 8152 Fader, it does not make sense to</div><div class='add'>+use the standard mixer-controls, since this would break most of</div><div class='add'>+(especially graphic) ALSA-Mixer GUIs. So Mixer control has be</div><div class='add'>+provided by a 2-dimensional controller using the</div><div class='add'>+hwdep-interface. </div><div class='add'>+</div><div class='add'>+Also all 128+256 Peak and RMS-Meter can be accessed via the</div><div class='add'>+hwdep-interface. Since it could be a performance problem always</div><div class='add'>+copying and converting Peak and RMS-Levels even if you just need</div><div class='add'>+one, I decided to export the hardware structure, so that of</div><div class='add'>+needed some driver-guru can implement a memory-mapping of mixer</div><div class='add'>+or peak-meters over ioctl, or also to do only copying and no</div><div class='add'>+conversion. A test-application shows the usage of the controller.</div><div class='add'>+</div><div class='add'>+* Latency Controls --- not implemented !!!</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+	   Note: Within the windows-driver the latency is accessible of a</div><div class='add'>+	   control-panel, but buffer-sizes are controlled with ALSA from</div><div class='add'>+	   hwparams-calls and should not be changed in run-state, I did not</div><div class='add'>+	   implement it here.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* System Clock -- suspended !!!!</div><div class='add'>+</div><div class='add'>+  * Name -- "System Clock Mode"</div><div class='add'>+</div><div class='add'>+  * Access -- Read Write</div><div class='add'>+    </div><div class='add'>+  * Values -- "Master" "Slave"</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+		  !!!! This is a hardware-function but is in conflict with the</div><div class='add'>+		  Clock-source controller, which is a kind of ALSA-standard. I</div><div class='add'>+		  makes sense to set the card to a special mode (master at some</div><div class='add'>+		  frequency or slave), since even not using an Audio-application</div><div class='add'>+		  a studio should have working synchronisations setup. So use</div><div class='add'>+		  Clock-source-controller instead !!!!</div><div class='add'>+</div><div class='add'>+* Clock Source  </div><div class='add'>+</div><div class='add'>+  * Name -- "Sample Clock Source"</div><div class='add'>+</div><div class='add'>+  * Access -- Read Write</div><div class='add'>+</div><div class='add'>+  * Values -- "AutoSync", "Internal 32.0 kHz", "Internal 44.1 kHz",</div><div class='add'>+    "Internal 48.0 kHz", "Internal 64.0 kHz", "Internal 88.2 kHz",</div><div class='add'>+    "Internal 96.0 kHz"</div><div class='add'>+</div><div class='add'>+		 Choose between Master at a specific Frequency and so also the</div><div class='add'>+		 Speed-mode or Slave (Autosync). Also see  "Preferred Sync Ref"</div><div class='add'>+</div><div class='add'>+.. warning::</div><div class='add'>+       !!!! This is no pure hardware function but was implemented by</div><div class='add'>+       ALSA by some ALSA-drivers before, so I use it also. !!!</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* Preferred Sync Ref</div><div class='add'>+</div><div class='add'>+  * Name -- "Preferred Sync Reference"</div><div class='add'>+</div><div class='add'>+  * Access -- Read Write</div><div class='add'>+</div><div class='add'>+  * Values -- "Word" "MADI"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		 Within the Auto-sync-Mode the preferred Sync Source can be</div><div class='add'>+		 chosen. If it is not available another is used if possible.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+		 Note: Since MADI has a much higher bit-rate than word-clock, the</div><div class='add'>+		 card should synchronise better in MADI Mode. But since the</div><div class='add'>+		 RME-PLL is very good, there are almost no problems with</div><div class='add'>+		 word-clock too. I never found a difference.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* TX 64 channel</div><div class='add'>+</div><div class='add'>+  * Name -- "TX 64 channels mode"</div><div class='add'>+</div><div class='add'>+  * Access -- Read Write</div><div class='add'>+</div><div class='add'>+  * Values -- 0 1</div><div class='add'>+</div><div class='add'>+		 Using 64-channel-modus (1) or 56-channel-modus for</div><div class='add'>+		 MADI-transmission (0).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+		 Note: This control is for output only. Input-mode is detected</div><div class='add'>+		 automatically from hardware sending MADI.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* Clear TMS</div><div class='add'>+</div><div class='add'>+  * Name -- "Clear Track Marker"</div><div class='add'>+</div><div class='add'>+  * Access -- Read Write</div><div class='add'>+</div><div class='add'>+  * Values -- 0 1</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		 Don't use to lower 5 Audio-bits on AES as additional Bits.</div><div class='add'>+        </div><div class='add'>+</div><div class='add'>+* Safe Mode oder Auto Input</div><div class='add'>+</div><div class='add'>+  * Name -- "Safe Mode"</div><div class='add'>+</div><div class='add'>+  * Access -- Read Write</div><div class='add'>+</div><div class='add'>+  * Values -- 0 1 (default on)</div><div class='add'>+</div><div class='add'>+		 If on (1), then if either the optical or coaxial connection</div><div class='add'>+		 has a failure, there is a takeover to the working one, with no</div><div class='add'>+		 sample failure. Its only useful if you use the second as a</div><div class='add'>+		 backup connection.</div><div class='add'>+</div><div class='add'>+* Input</div><div class='add'>+</div><div class='add'>+  * Name -- "Input Select"</div><div class='add'>+</div><div class='add'>+  * Access -- Read Write</div><div class='add'>+</div><div class='add'>+  * Values -- optical coaxial</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		 Choosing the Input, optical or coaxial. If Safe-mode is active,</div><div class='add'>+		 this is the preferred Input.</div><div class='add'>+</div><div class='add'>+Mixer</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+* Mixer</div><div class='add'>+</div><div class='add'>+  * Name -- "Mixer"</div><div class='add'>+</div><div class='add'>+  * Access -- Read Write</div><div class='add'>+</div><div class='add'>+  * Values - &lt;channel-number 0-127&gt; &lt;Value 0-65535&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		 Here as a first value the channel-index is taken to get/set the</div><div class='add'>+		 corresponding mixer channel, where 0-63 are the input to output</div><div class='add'>+		 fader and 64-127 the playback to outputs fader. Value 0</div><div class='add'>+		 is channel muted 0 and 32768 an amplification of  1.</div><div class='add'>+</div><div class='add'>+* Chn 1-64</div><div class='add'>+</div><div class='add'>+       fast mixer for the ALSA-mixer utils. The diagonal of the</div><div class='add'>+       mixer-matrix is implemented from playback to output.</div><div class='add'>+       </div><div class='add'>+</div><div class='add'>+* Line Out</div><div class='add'>+</div><div class='add'>+  * Name  -- "Line Out"</div><div class='add'>+</div><div class='add'>+  * Access -- Read Write</div><div class='add'>+</div><div class='add'>+  * Values -- 0 1</div><div class='add'>+</div><div class='add'>+		 Switching on and off the analog out, which has nothing to do</div><div class='add'>+		 with mixing or routing. the analog outs reflects channel 63,64.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Information (only read access)</div><div class='add'>+------------------------------</div><div class='add'>+ </div><div class='add'>+* Sample Rate</div><div class='add'>+</div><div class='add'>+  * Name -- "System Sample Rate"</div><div class='add'>+</div><div class='add'>+  * Access -- Read-only</div><div class='add'>+</div><div class='add'>+		 getting the sample rate.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* External Rate measured</div><div class='add'>+</div><div class='add'>+  * Name -- "External Rate"</div><div class='add'>+</div><div class='add'>+  * Access -- Read only</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		 Should be "Autosync Rate", but Name used is</div><div class='add'>+		 ALSA-Scheme. External Sample frequency liked used on Autosync is</div><div class='add'>+		 reported.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* MADI Sync Status</div><div class='add'>+</div><div class='add'>+  * Name -- "MADI Sync Lock Status"</div><div class='add'>+</div><div class='add'>+  * Access -- Read</div><div class='add'>+</div><div class='add'>+  * Values -- 0,1,2</div><div class='add'>+</div><div class='add'>+       MADI-Input is 0=Unlocked, 1=Locked, or 2=Synced.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* Word Clock Sync Status</div><div class='add'>+</div><div class='add'>+  * Name -- "Word Clock Lock Status"</div><div class='add'>+</div><div class='add'>+  * Access -- Read</div><div class='add'>+</div><div class='add'>+  * Values -- 0,1,2</div><div class='add'>+</div><div class='add'>+       Word Clock Input is 0=Unlocked, 1=Locked, or 2=Synced.</div><div class='add'>+</div><div class='add'>+* AutoSync</div><div class='add'>+</div><div class='add'>+  * Name -- "AutoSync Reference"</div><div class='add'>+</div><div class='add'>+  * Access -- Read</div><div class='add'>+</div><div class='add'>+  * Values -- "WordClock", "MADI", "None"</div><div class='add'>+</div><div class='add'>+		 Sync-Reference is either "WordClock", "MADI" or none.</div><div class='add'>+</div><div class='add'>+* RX 64ch --- noch nicht implementiert</div><div class='add'>+</div><div class='add'>+       MADI-Receiver is in 64 channel mode oder 56 channel mode.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* AB_inp   --- not tested </div><div class='add'>+</div><div class='add'>+		 Used input for Auto-Input.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* actual Buffer Position --- not implemented</div><div class='add'>+</div><div class='add'>+	   !!! this is a ALSA internal function, so no control is used !!!</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Calling Parameter</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+* index int array (min = 1, max = 8) </div><div class='add'>+</div><div class='add'>+     Index value for RME HDSPM interface. card-index within ALSA</div><div class='add'>+</div><div class='add'>+     note: ALSA-standard</div><div class='add'>+</div><div class='add'>+* id string array (min = 1, max = 8) </div><div class='add'>+</div><div class='add'>+     ID string for RME HDSPM interface.</div><div class='add'>+</div><div class='add'>+     note: ALSA-standard</div><div class='add'>+</div><div class='add'>+* enable int array (min = 1, max = 8)</div><div class='add'>+</div><div class='add'>+     Enable/disable specific HDSPM sound-cards.</div><div class='add'>+</div><div class='add'>+     note: ALSA-standard</div><div class='add'>+</div><div class='add'>+* precise_ptr int array (min = 1, max = 8)</div><div class='add'>+</div><div class='add'>+     Enable precise pointer, or disable.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+     note: Use only when the application supports this (which is a special case).</div><div class='add'>+</div><div class='add'>+* line_outs_monitor int array (min = 1, max = 8)</div><div class='add'>+</div><div class='add'>+     Send playback streams to analog outs by default.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+	  note: each playback channel is mixed to the same numbered output</div><div class='add'>+	  channel (routed). This is against the ALSA-convention, where all</div><div class='add'>+	  channels have to be muted on after loading the driver, but was</div><div class='add'>+	  used before on other cards, so i historically use it again)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* enable_monitor int array (min = 1, max = 8)</div><div class='add'>+</div><div class='add'>+     Enable Analog Out on Channel 63/64 by default.</div><div class='add'>+</div><div class='add'>+.. note ::</div><div class='add'>+      note: here the analog output is enabled (but not routed).</div><div class='head'>diff --git a/Documentation/sound/cards/img-spdif-in.rst b/Documentation/sound/cards/img-spdif-in.rst<br/>new file mode 100644<br/>index 000000000000..7df9f5ae2609<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/img-spdif-in.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/img-spdif-in.rst</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+================================================</div><div class='add'>+Imagination Technologies SPDIF Input Controllers</div><div class='add'>+================================================</div><div class='add'>+</div><div class='add'>+The Imagination Technologies SPDIF Input controller contains the following</div><div class='add'>+controls:</div><div class='add'>+</div><div class='add'>+* name='IEC958 Capture Mask',index=0</div><div class='add'>+</div><div class='add'>+This control returns a mask that shows which of the IEC958 status bits</div><div class='add'>+can be read using the 'IEC958 Capture Default' control.</div><div class='add'>+</div><div class='add'>+* name='IEC958 Capture Default',index=0</div><div class='add'>+</div><div class='add'>+This control returns the status bits contained within the SPDIF stream that</div><div class='add'>+is being received. The 'IEC958 Capture Mask' shows which bits can be read</div><div class='add'>+from this control.</div><div class='add'>+</div><div class='add'>+* name='SPDIF In Multi Frequency Acquire',index=0</div><div class='add'>+* name='SPDIF In Multi Frequency Acquire',index=1</div><div class='add'>+* name='SPDIF In Multi Frequency Acquire',index=2</div><div class='add'>+* name='SPDIF In Multi Frequency Acquire',index=3</div><div class='add'>+</div><div class='add'>+This control is used to attempt acquisition of up to four different sample</div><div class='add'>+rates. The active rate can be obtained by reading the 'SPDIF In Lock Frequency'</div><div class='add'>+control.</div><div class='add'>+</div><div class='add'>+When the value of this control is set to {0,0,0,0}, the rate given to hw_params</div><div class='add'>+will determine the single rate the block will capture. Else, the rate given to</div><div class='add'>+hw_params will be ignored, and the block will attempt capture for each of the</div><div class='add'>+four sample rates set here.</div><div class='add'>+</div><div class='add'>+If less than four rates are required, the same rate can be specified more than</div><div class='add'>+once</div><div class='add'>+</div><div class='add'>+* name='SPDIF In Lock Frequency',index=0</div><div class='add'>+</div><div class='add'>+This control returns the active capture rate, or 0 if a lock has not been</div><div class='add'>+acquired</div><div class='add'>+</div><div class='add'>+* name='SPDIF In Lock TRK',index=0</div><div class='add'>+</div><div class='add'>+This control is used to modify the locking/jitter rejection characteristics</div><div class='add'>+of the block. Larger values increase the locking range, but reduce jitter</div><div class='add'>+rejection.</div><div class='add'>+</div><div class='add'>+* name='SPDIF In Lock Acquire Threshold',index=0</div><div class='add'>+</div><div class='add'>+This control is used to change the threshold at which a lock is acquired.</div><div class='add'>+</div><div class='add'>+* name='SPDIF In Lock Release Threshold',index=0</div><div class='add'>+</div><div class='add'>+This control is used to change the threshold at which a lock is released.</div><div class='head'>diff --git a/Documentation/sound/cards/index.rst b/Documentation/sound/cards/index.rst<br/>new file mode 100644<br/>index 000000000000..c016f8c3b88b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/index.rst</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+Card-Specific Information</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   joystick</div><div class='add'>+   cmipci</div><div class='add'>+   sb-live-mixer</div><div class='add'>+   audigy-mixer</div><div class='add'>+   emu10k1-jack</div><div class='add'>+   via82xx-mixer</div><div class='add'>+   audiophile-usb</div><div class='add'>+   mixart</div><div class='add'>+   bt87x</div><div class='add'>+   maya44</div><div class='add'>+   hdspm</div><div class='add'>+   serial-u16550</div><div class='add'>+   img-spdif-in</div><div class='head'>diff --git a/Documentation/sound/cards/joystick.rst b/Documentation/sound/cards/joystick.rst<br/>new file mode 100644<br/>index 000000000000..a6e468c81d02<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/joystick.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/joystick.rst</a></div><div class='hunk'>@@ -0,0 +1,91 @@</div><div class='add'>+=======================================</div><div class='add'>+Analog Joystick Support on ALSA Drivers</div><div class='add'>+=======================================</div><div class='add'>+</div><div class='add'>+Oct. 14, 2003</div><div class='add'>+</div><div class='add'>+Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+</div><div class='add'>+General</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+First of all, you need to enable GAMEPORT support on Linux kernel for</div><div class='add'>+using a joystick with the ALSA driver.  For the details of gameport</div><div class='add'>+support, refer to Documentation/input/joystick.txt.</div><div class='add'>+</div><div class='add'>+The joystick support of ALSA drivers is different between ISA and PCI</div><div class='add'>+cards.  In the case of ISA (PnP) cards, it's usually handled by the</div><div class='add'>+independent module (ns558).  Meanwhile, the ALSA PCI drivers have the</div><div class='add'>+built-in gameport support.  Hence, when the ALSA PCI driver is built</div><div class='add'>+in the kernel, CONFIG_GAMEPORT must be 'y', too.  Otherwise, the</div><div class='add'>+gameport support on that card will be (silently) disabled.</div><div class='add'>+</div><div class='add'>+Some adapter modules probe the physical connection of the device at</div><div class='add'>+the load time.  It'd be safer to plug in the joystick device before</div><div class='add'>+loading the module.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PCI Cards</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+For PCI cards, the joystick is enabled when the appropriate module</div><div class='add'>+option is specified.  Some drivers don't need options, and the</div><div class='add'>+joystick support is always enabled.  In the former ALSA version, there</div><div class='add'>+was a dynamic control API for the joystick activation.  It was</div><div class='add'>+changed, however, to the static module options because of the system</div><div class='add'>+stability and the resource management.</div><div class='add'>+</div><div class='add'>+The following PCI drivers support the joystick natively.</div><div class='add'>+</div><div class='add'>+==============	=============	============================================</div><div class='add'>+Driver		Module Option	Available Values</div><div class='add'>+==============	=============	============================================</div><div class='add'>+als4000		joystick_port	0 = disable (default), 1 = auto-detect,</div><div class='add'>+	                        manual: any address (e.g. 0x200)</div><div class='add'>+au88x0		N/A		N/A</div><div class='add'>+azf3328		joystick	0 = disable, 1 = enable, -1 = auto (default)</div><div class='add'>+ens1370		joystick	0 = disable (default), 1 = enable</div><div class='add'>+ens1371		joystick_port	0 = disable (default), 1 = auto-detect,</div><div class='add'>+	                        manual: 0x200, 0x208, 0x210, 0x218</div><div class='add'>+cmipci		joystick_port	0 = disable (default), 1 = auto-detect,</div><div class='add'>+	                        manual: any address (e.g. 0x200)</div><div class='add'>+cs4281		N/A		N/A</div><div class='add'>+cs46xx		N/A		N/A</div><div class='add'>+es1938		N/A		N/A</div><div class='add'>+es1968		joystick	0 = disable (default), 1 = enable</div><div class='add'>+sonicvibes	N/A		N/A</div><div class='add'>+trident		N/A		N/A</div><div class='add'>+via82xx [#f1]_	joystick	0 = disable (default), 1 = enable</div><div class='add'>+ymfpci		joystick_port	0 = disable (default), 1 = auto-detect,</div><div class='add'>+	                        manual: 0x201, 0x202, 0x204, 0x205 [#f2]_</div><div class='add'>+==============	=============	============================================</div><div class='add'>+</div><div class='add'>+.. [#f1] VIA686A/B only</div><div class='add'>+.. [#f2] With YMF744/754 chips, the port address can be chosen arbitrarily</div><div class='add'>+</div><div class='add'>+The following drivers don't support gameport natively, but there are</div><div class='add'>+additional modules.  Load the corresponding module to add the gameport</div><div class='add'>+support.</div><div class='add'>+</div><div class='add'>+=======	=================</div><div class='add'>+Driver	Additional Module</div><div class='add'>+=======	=================</div><div class='add'>+emu10k1	emu10k1-gp</div><div class='add'>+fm801	fm801-gp</div><div class='add'>+=======	=================</div><div class='add'>+</div><div class='add'>+Note: the "pcigame" and "cs461x" modules are for the OSS drivers only.</div><div class='add'>+These ALSA drivers (cs46xx, trident and au88x0) have the</div><div class='add'>+built-in gameport support.</div><div class='add'>+</div><div class='add'>+As mentioned above, ALSA PCI drivers have the built-in gameport</div><div class='add'>+support, so you don't have to load ns558 module.  Just load "joydev"</div><div class='add'>+and the appropriate adapter module (e.g. "analog").</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ISA Cards</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+ALSA ISA drivers don't have the built-in gameport support.</div><div class='add'>+Instead, you need to load "ns558" module in addition to "joydev" and</div><div class='add'>+the adapter module (e.g. "analog").</div><div class='head'>diff --git a/Documentation/sound/cards/maya44.rst b/Documentation/sound/cards/maya44.rst<br/>new file mode 100644<br/>index 000000000000..bf09a584b443<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/maya44.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/maya44.rst</a></div><div class='hunk'>@@ -0,0 +1,186 @@</div><div class='add'>+=================================</div><div class='add'>+Notes on Maya44 USB Audio Support</div><div class='add'>+=================================</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+   The following is the original document of Rainer's patch that the</div><div class='add'>+   current maya44 code based on.  Some contents might be obsoleted, but I</div><div class='add'>+   keep here as reference -- tiwai</div><div class='add'>+</div><div class='add'>+Feb 14, 2008</div><div class='add'>+</div><div class='add'>+Rainer Zimmermann &lt;mail@lightshed.de&gt;</div><div class='add'>+ </div><div class='add'>+STATE OF DEVELOPMENT</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+This driver is being developed on the initiative of Piotr Makowski (oponek@gmail.com) and financed by Lars Bergmann.</div><div class='add'>+Development is carried out by Rainer Zimmermann (mail@lightshed.de).</div><div class='add'>+</div><div class='add'>+ESI provided a sample Maya44 card for the development work.</div><div class='add'>+</div><div class='add'>+However, unfortunately it has turned out difficult to get detailed programming information, so I (Rainer Zimmermann) had to find out some card-specific information by experiment and conjecture. Some information (in particular, several GPIO bits) is still missing.</div><div class='add'>+</div><div class='add'>+This is the first testing version of the Maya44 driver released to the alsa-devel mailing list (Feb 5, 2008).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The following functions work, as tested by Rainer Zimmermann and Piotr Makowski:</div><div class='add'>+</div><div class='add'>+- playback and capture at all sampling rates</div><div class='add'>+- input/output level</div><div class='add'>+- crossmixing</div><div class='add'>+- line/mic switch</div><div class='add'>+- phantom power switch</div><div class='add'>+- analogue monitor a.k.a bypass</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The following functions *should* work, but are not fully tested:</div><div class='add'>+</div><div class='add'>+- Channel 3+4 analogue - S/PDIF input switching</div><div class='add'>+- S/PDIF output</div><div class='add'>+- all inputs/outputs on the M/IO/DIO extension card</div><div class='add'>+- internal/external clock selection</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+*In particular, we would appreciate testing of these functions by anyone who has access to an M/IO/DIO extension card.*</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Things that do not seem to work:</div><div class='add'>+</div><div class='add'>+- The level meters ("multi track") in 'alsamixer' do not seem to react to signals in (if this is a bug, it would probably be in the existing ICE1724 code).</div><div class='add'>+</div><div class='add'>+- Ardour 2.1 seems to work only via JACK, not using ALSA directly or via OSS. This still needs to be tracked down.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DRIVER DETAILS</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+the following files were added:</div><div class='add'>+</div><div class='add'>+* pci/ice1724/maya44.c - Maya44 specific code</div><div class='add'>+* pci/ice1724/maya44.h</div><div class='add'>+* pci/ice1724/ice1724.patch</div><div class='add'>+* pci/ice1724/ice1724.h.patch - PROPOSED patch to ice1724.h (see SAMPLING RATES)</div><div class='add'>+* i2c/other/wm8776.c - low-level access routines for Wolfson WM8776 codecs </div><div class='add'>+* include/wm8776.h</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Note that the wm8776.c code is meant to be card-independent and does not actually register the codec with the ALSA infrastructure.</div><div class='add'>+This is done in maya44.c, mainly because some of the WM8776 controls are used in Maya44-specific ways, and should be named appropriately.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+the following files were created in pci/ice1724, simply #including the corresponding file from the alsa-kernel tree:</div><div class='add'>+</div><div class='add'>+* wtm.h</div><div class='add'>+* vt1720_mobo.h</div><div class='add'>+* revo.h</div><div class='add'>+* prodigy192.h</div><div class='add'>+* pontis.h</div><div class='add'>+* phase.h</div><div class='add'>+* maya44.h</div><div class='add'>+* juli.h</div><div class='add'>+* aureon.h</div><div class='add'>+* amp.h</div><div class='add'>+* envy24ht.h</div><div class='add'>+* se.h</div><div class='add'>+* prodigy_hifi.h</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+*I hope this is the correct way to do things.*</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+SAMPLING RATES</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+The Maya44 card (or more exactly, the Wolfson WM8776 codecs) allow a maximum sampling rate of 192 kHz for playback and 92 kHz for capture.</div><div class='add'>+</div><div class='add'>+As the ICE1724 chip only allows one global sampling rate, this is handled as follows:</div><div class='add'>+</div><div class='add'>+* setting the sampling rate on any open PCM device on the maya44 card will always set the *global* sampling rate for all playback and capture channels.</div><div class='add'>+</div><div class='add'>+* In the current state of the driver, setting rates of up to 192 kHz is permitted even for capture devices.</div><div class='add'>+</div><div class='add'>+*AVOID CAPTURING AT RATES ABOVE 96kHz*, even though it may appear to work. The codec cannot actually capture at such rates, meaning poor quality.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+I propose some additional code for limiting the sampling rate when setting on a capture pcm device. However because of the global sampling rate, this logic would be somewhat problematic.</div><div class='add'>+</div><div class='add'>+The proposed code (currently deactivated) is in ice1712.h.patch, ice1724.c and maya44.c (in pci/ice1712).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+SOUND DEVICES</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+PCM devices correspond to inputs/outputs as follows (assuming Maya44 is card #0):</div><div class='add'>+</div><div class='add'>+* hw:0,0 input - stereo, analog input 1+2</div><div class='add'>+* hw:0,0 output - stereo, analog output 1+2</div><div class='add'>+* hw:0,1 input - stereo, analog input 3+4 OR S/PDIF input</div><div class='add'>+* hw:0,1 output - stereo, analog output 3+4 (and SPDIF out)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+NAMING OF MIXER CONTROLS</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+(for more information about the signal flow, please refer to the block diagram on p.24 of the ESI Maya44 manual, or in the ESI windows software).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PCM</div><div class='add'>+    (digital) output level for channel 1+2</div><div class='add'>+PCM 1</div><div class='add'>+    same for channel 3+4</div><div class='add'>+</div><div class='add'>+Mic Phantom+48V</div><div class='add'>+    switch for +48V phantom power for electrostatic microphones on input 1/2.</div><div class='add'>+</div><div class='add'>+    Make sure this is not turned on while any other source is connected to input 1/2.</div><div class='add'>+    It might damage the source and/or the maya44 card.</div><div class='add'>+</div><div class='add'>+Mic/Line input</div><div class='add'>+    if switch is on, input jack 1/2 is microphone input (mono), otherwise line input (stereo).</div><div class='add'>+</div><div class='add'>+Bypass</div><div class='add'>+    analogue bypass from ADC input to output for channel 1+2. Same as "Monitor" in the windows driver.</div><div class='add'>+Bypass 1</div><div class='add'>+    same for channel 3+4.</div><div class='add'>+</div><div class='add'>+Crossmix</div><div class='add'>+    cross-mixer from channels 1+2 to channels 3+4</div><div class='add'>+Crossmix 1</div><div class='add'>+    cross-mixer from channels 3+4 to channels 1+2</div><div class='add'>+</div><div class='add'>+IEC958 Output</div><div class='add'>+    switch for S/PDIF output.</div><div class='add'>+</div><div class='add'>+    This is not supported by the ESI windows driver.</div><div class='add'>+    S/PDIF should output the same signal as channel 3+4. [untested!]</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Digitial output selectors</div><div class='add'>+    These switches allow a direct digital routing from the ADCs to the DACs.</div><div class='add'>+    Each switch determines where the digital input data to one of the DACs comes from.</div><div class='add'>+    They are not supported by the ESI windows driver.</div><div class='add'>+    For normal operation, they should all be set to "PCM out".</div><div class='add'>+</div><div class='add'>+H/W</div><div class='add'>+    Output source channel 1</div><div class='add'>+H/W 1</div><div class='add'>+    Output source channel 2</div><div class='add'>+H/W 2</div><div class='add'>+    Output source channel 3</div><div class='add'>+H/W 3</div><div class='add'>+    Output source channel 4</div><div class='add'>+</div><div class='add'>+H/W 4 ... H/W 9</div><div class='add'>+    unknown function, left in to enable testing.</div><div class='add'>+</div><div class='add'>+    Possibly some of these control S/PDIF output(s).</div><div class='add'>+    If these turn out to be unused, they will go away in later driver versions.</div><div class='add'>+</div><div class='add'>+Selectable values for each of the digital output selectors are:</div><div class='add'>+</div><div class='add'>+PCM out</div><div class='add'>+	DAC output of the corresponding channel (default setting)</div><div class='add'>+Input 1 ... Input 4</div><div class='add'>+	direct routing from ADC output of the selected input channel</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/sound/cards/mixart.rst b/Documentation/sound/cards/mixart.rst<br/>new file mode 100644<br/>index 000000000000..48aba98b088f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/mixart.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/mixart.rst</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+==============================================================</div><div class='add'>+Alsa driver for Digigram miXart8 and miXart8AES/EBU soundcards</div><div class='add'>+==============================================================</div><div class='add'>+</div><div class='add'>+Digigram &lt;alsa@digigram.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+GENERAL</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+The miXart8 is a multichannel audio processing and mixing soundcard</div><div class='add'>+that has 4 stereo audio inputs and 4 stereo audio outputs.</div><div class='add'>+The miXart8AES/EBU is the same with a add-on card that offers further</div><div class='add'>+4 digital stereo audio inputs and outputs.</div><div class='add'>+Furthermore the add-on card offers external clock synchronisation</div><div class='add'>+(AES/EBU, Word Clock, Time Code and Video Synchro)</div><div class='add'>+</div><div class='add'>+The mainboard has a PowerPC that offers onboard mpeg encoding and</div><div class='add'>+decoding, samplerate conversions and various effects.</div><div class='add'>+</div><div class='add'>+The driver don't work properly at all until the certain firmwares</div><div class='add'>+are loaded, i.e. no PCM nor mixer devices will appear.</div><div class='add'>+Use the mixartloader that can be found in the alsa-tools package.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+VERSION 0.1.0</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+One miXart8 board will be represented as 4 alsa cards, each with 1</div><div class='add'>+stereo analog capture 'pcm0c' and 1 stereo analog playback 'pcm0p' device.</div><div class='add'>+With a miXart8AES/EBU there is in addition 1 stereo digital input</div><div class='add'>+'pcm1c' and 1 stereo digital output 'pcm1p' per card.</div><div class='add'>+</div><div class='add'>+Formats</div><div class='add'>+-------</div><div class='add'>+U8, S16_LE, S16_BE, S24_3LE, S24_3BE, FLOAT_LE, FLOAT_BE</div><div class='add'>+Sample rates : 8000 - 48000 Hz continuously</div><div class='add'>+</div><div class='add'>+Playback</div><div class='add'>+--------</div><div class='add'>+For instance the playback devices are configured to have max. 4</div><div class='add'>+substreams performing hardware mixing. This could be changed to a</div><div class='add'>+maximum of 24 substreams if wished.</div><div class='add'>+Mono files will be played on the left and right channel. Each channel</div><div class='add'>+can be muted for each stream to use 8 analog/digital outputs separately.</div><div class='add'>+</div><div class='add'>+Capture</div><div class='add'>+-------</div><div class='add'>+There is one substream per capture device. For instance only stereo</div><div class='add'>+formats are supported.</div><div class='add'>+</div><div class='add'>+Mixer</div><div class='add'>+-----</div><div class='add'>+&lt;Master&gt; and &lt;Master Capture&gt;</div><div class='add'>+	analog volume control of playback and capture PCM.</div><div class='add'>+&lt;PCM 0-3&gt; and &lt;PCM Capture&gt;</div><div class='add'>+	digital volume control of each analog substream.</div><div class='add'>+&lt;AES 0-3&gt; and &lt;AES Capture&gt;</div><div class='add'>+	digital volume control of each AES/EBU substream.</div><div class='add'>+&lt;Monitoring&gt;</div><div class='add'>+	Loopback from 'pcm0c' to 'pcm0p' with digital volume</div><div class='add'>+	and mute control.</div><div class='add'>+</div><div class='add'>+Rem : for best audio quality try to keep a 0 attenuation on the PCM</div><div class='add'>+and AES volume controls which is set by 219 in the range from 0 to 255</div><div class='add'>+(about 86% with alsamixer)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+NOT YET IMPLEMENTED</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+- external clock support (AES/EBU, Word Clock, Time Code, Video Sync)</div><div class='add'>+- MPEG audio formats</div><div class='add'>+- mono record</div><div class='add'>+- on-board effects and samplerate conversions</div><div class='add'>+- linked streams</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+FIRMWARE</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+[As of 2.6.11, the firmware can be loaded automatically with hotplug</div><div class='add'>+ when CONFIG_FW_LOADER is set.  The mixartloader is necessary only</div><div class='add'>+ for older versions or when you build the driver into kernel.]</div><div class='add'>+ </div><div class='add'>+For loading the firmware automatically after the module is loaded, use a</div><div class='add'>+install command.  For example, add the following entry to</div><div class='add'>+/etc/modprobe.d/mixart.conf for miXart driver:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	install snd-mixart /sbin/modprobe --first-time -i snd-mixart &amp;&amp; \</div><div class='add'>+			   /usr/bin/mixartloader</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+(for 2.2/2.4 kernels, add "post-install snd-mixart /usr/bin/vxloader" to</div><div class='add'>+/etc/modules.conf, instead.)</div><div class='add'>+</div><div class='add'>+The firmware binaries are installed on /usr/share/alsa/firmware</div><div class='add'>+(or /usr/local/share/alsa/firmware, depending to the prefix option of</div><div class='add'>+configure).  There will be a miXart.conf file, which define the dsp image</div><div class='add'>+files.</div><div class='add'>+</div><div class='add'>+The firmware files are copyright by Digigram SA</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+COPYRIGHT</div><div class='add'>+=========</div><div class='add'>+</div><div class='add'>+Copyright (c) 2003 Digigram SA &lt;alsa@digigram.com&gt;</div><div class='add'>+Distributable under GPL.</div><div class='head'>diff --git a/Documentation/sound/cards/sb-live-mixer.rst b/Documentation/sound/cards/sb-live-mixer.rst<br/>new file mode 100644<br/>index 000000000000..bcb62fc99bbb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/sb-live-mixer.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/sb-live-mixer.rst</a></div><div class='hunk'>@@ -0,0 +1,373 @@</div><div class='add'>+===========================================</div><div class='add'>+Sound Blaster Live mixer / default DSP code</div><div class='add'>+===========================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The EMU10K1 chips have a DSP part which can be programmed to support</div><div class='add'>+various ways of sample processing, which is described here.</div><div class='add'>+(This article does not deal with the overall functionality of the </div><div class='add'>+EMU10K1 chips. See the manuals section for further details.)</div><div class='add'>+</div><div class='add'>+The ALSA driver programs this portion of chip by default code</div><div class='add'>+(can be altered later) which offers the following functionality:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+IEC958 (S/PDIF) raw PCM</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+This PCM device (it's the 4th PCM device (index 3!) and first subdevice</div><div class='add'>+(index 0) for a given card) allows to forward 48kHz, stereo, 16-bit</div><div class='add'>+little endian streams without any modifications to the digital output</div><div class='add'>+(coaxial or optical). The universal interface allows the creation of up</div><div class='add'>+to 8 raw PCM devices operating at 48kHz, 16-bit little endian. It would</div><div class='add'>+be easy to add support for multichannel devices to the current code,</div><div class='add'>+but the conversion routines exist only for stereo (2-channel streams)</div><div class='add'>+at the time. </div><div class='add'>+</div><div class='add'>+Look to tram_poke routines in lowlevel/emu10k1/emufx.c for more details.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Digital mixer controls</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+These controls are built using the DSP instructions. They offer extended</div><div class='add'>+functionality. Only the default build-in code in the ALSA driver is described</div><div class='add'>+here. Note that the controls work as attenuators: the maximum value is the </div><div class='add'>+neutral position leaving the signal unchanged. Note that if the  same destination </div><div class='add'>+is mentioned in multiple controls, the signal is accumulated and can be wrapped </div><div class='add'>+(set to maximal or minimal value without checking of overflow).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Explanation of used abbreviations:</div><div class='add'>+</div><div class='add'>+DAC</div><div class='add'>+	digital to analog converter</div><div class='add'>+ADC</div><div class='add'>+	analog to digital converter</div><div class='add'>+I2S</div><div class='add'>+	one-way three wire serial bus for digital sound by Philips Semiconductors</div><div class='add'>+        (this standard is used for connecting standalone DAC and ADC converters)</div><div class='add'>+LFE</div><div class='add'>+	low frequency effects (subwoofer signal)</div><div class='add'>+AC97</div><div class='add'>+	a chip containing an analog mixer, DAC and ADC converters</div><div class='add'>+IEC958</div><div class='add'>+	S/PDIF</div><div class='add'>+FX-bus</div><div class='add'>+	the EMU10K1 chip has an effect bus containing 16 accumulators.</div><div class='add'>+	Each of the synthesizer voices can feed its output to these accumulators</div><div class='add'>+	and the DSP microcontroller can operate with the resulting sum.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+``name='Wave Playback Volume',index=0``</div><div class='add'>+---------------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right PCM FX-bus</div><div class='add'>+accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples.</div><div class='add'>+The result samples are forwarded to the front DAC PCM slots of the AC97 codec.</div><div class='add'>+</div><div class='add'>+``name='Wave Surround Playback Volume',index=0``</div><div class='add'>+------------------------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right PCM FX-bus</div><div class='add'>+accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples.</div><div class='add'>+The result samples are forwarded to the rear I2S DACs. These DACs operates</div><div class='add'>+separately (they are not inside the AC97 codec).</div><div class='add'>+</div><div class='add'>+``name='Wave Center Playback Volume',index=0``</div><div class='add'>+----------------------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right PCM FX-bus</div><div class='add'>+accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples.</div><div class='add'>+The result is mixed to mono signal (single channel) and forwarded to</div><div class='add'>+the ??rear?? right DAC PCM slot of the AC97 codec.</div><div class='add'>+</div><div class='add'>+``name='Wave LFE Playback Volume',index=0``</div><div class='add'>+-------------------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right PCM FX-bus</div><div class='add'>+accumulators. ALSA uses accumulators 0 and 1 for left and right PCM.</div><div class='add'>+The result is mixed to mono signal (single channel) and forwarded to</div><div class='add'>+the ??rear?? left DAC PCM slot of the AC97 codec.</div><div class='add'>+</div><div class='add'>+``name='Wave Capture Volume',index=0``, ``name='Wave Capture Switch',index=0``</div><div class='add'>+------------------------------------------------------------------------------</div><div class='add'>+These controls are used to attenuate samples for left and right PCM FX-bus</div><div class='add'>+accumulator. ALSA uses accumulators 0 and 1 for left and right PCM.</div><div class='add'>+The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='add'>+PCM device).</div><div class='add'>+</div><div class='add'>+``name='Synth Playback Volume',index=0``</div><div class='add'>+----------------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right MIDI FX-bus</div><div class='add'>+accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples.</div><div class='add'>+The result samples are forwarded to the front DAC PCM slots of the AC97 codec.</div><div class='add'>+</div><div class='add'>+``name='Synth Capture Volume',index=0``, ``name='Synth Capture Switch',index=0``</div><div class='add'>+--------------------------------------------------------------------------------</div><div class='add'>+These controls are used to attenuate samples for left and right MIDI FX-bus</div><div class='add'>+accumulator. ALSA uses accumulators 4 and 5 for left and right PCM.</div><div class='add'>+The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='add'>+PCM device).</div><div class='add'>+</div><div class='add'>+``name='Surround Playback Volume',index=0``</div><div class='add'>+-------------------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right rear PCM FX-bus</div><div class='add'>+accumulators. ALSA uses accumulators 2 and 3 for left and right rear PCM samples.</div><div class='add'>+The result samples are forwarded to the rear I2S DACs. These DACs operate</div><div class='add'>+separately (they are not inside the AC97 codec).</div><div class='add'>+</div><div class='add'>+``name='Surround Capture Volume',index=0``, ``name='Surround Capture Switch',index=0``</div><div class='add'>+--------------------------------------------------------------------------------------</div><div class='add'>+These controls are used to attenuate samples for left and right rear PCM FX-bus</div><div class='add'>+accumulators. ALSA uses accumulators 2 and 3 for left and right rear PCM samples.</div><div class='add'>+The result is forwarded to the ADC capture FIFO (thus to the standard capture</div><div class='add'>+PCM device).</div><div class='add'>+</div><div class='add'>+``name='Center Playback Volume',index=0``</div><div class='add'>+-----------------------------------------</div><div class='add'>+This control is used to attenuate sample for center PCM FX-bus accumulator.</div><div class='add'>+ALSA uses accumulator 6 for center PCM sample. The result sample is forwarded</div><div class='add'>+to the ??rear?? right DAC PCM slot of the AC97 codec.</div><div class='add'>+</div><div class='add'>+``name='LFE Playback Volume',index=0``</div><div class='add'>+--------------------------------------</div><div class='add'>+This control is used to attenuate sample for center PCM FX-bus accumulator.</div><div class='add'>+ALSA uses accumulator 6 for center PCM sample. The result sample is forwarded</div><div class='add'>+to the ??rear?? left DAC PCM slot of the AC97 codec.</div><div class='add'>+</div><div class='add'>+``name='AC97 Playback Volume',index=0``</div><div class='add'>+---------------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right front ADC PCM slots</div><div class='add'>+of the AC97 codec. The result samples are forwarded to the front DAC PCM</div><div class='add'>+slots of the AC97 codec.</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+  This control should be zero for the standard operations, otherwise</div><div class='add'>+  a digital loopback is activated.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+``name='AC97 Capture Volume',index=0``</div><div class='add'>+--------------------------------------</div><div class='add'>+This control is used to attenuate samples for left and right front ADC PCM slots</div><div class='add'>+of the AC97 codec. The result is forwarded to the ADC capture FIFO (thus to</div><div class='add'>+the standard capture PCM device).</div><div class='add'>+</div><div class='add'>+.. note::</div><div class='add'>+   This control should be 100 (maximal value), otherwise no analog</div><div class='add'>+   inputs of the AC97 codec can be captured (recorded).</div><div class='add'>+</div><div class='add'>+``name='IEC958 TTL Playback Volume',index=0``</div><div class='add'>+---------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right IEC958 TTL</div><div class='add'>+digital inputs (usually used by a CDROM drive). The result samples are</div><div class='add'>+forwarded to the front DAC PCM slots of the AC97 codec.</div><div class='add'>+</div><div class='add'>+``name='IEC958 TTL Capture Volume',index=0``</div><div class='add'>+--------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right IEC958 TTL</div><div class='add'>+digital inputs (usually used by a CDROM drive). The result samples are</div><div class='add'>+forwarded to the ADC capture FIFO (thus to the standard capture PCM device).</div><div class='add'>+</div><div class='add'>+``name='Zoom Video Playback Volume',index=0``</div><div class='add'>+---------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right zoom video</div><div class='add'>+digital inputs (usually used by a CDROM drive). The result samples are</div><div class='add'>+forwarded to the front DAC PCM slots of the AC97 codec.</div><div class='add'>+</div><div class='add'>+``name='Zoom Video Capture Volume',index=0``</div><div class='add'>+--------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right zoom video</div><div class='add'>+digital inputs (usually used by a CDROM drive). The result samples are</div><div class='add'>+forwarded to the ADC capture FIFO (thus to the standard capture PCM device).</div><div class='add'>+</div><div class='add'>+``name='IEC958 LiveDrive Playback Volume',index=0``</div><div class='add'>+---------------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right IEC958 optical</div><div class='add'>+digital input. The result samples are forwarded to the front DAC PCM slots</div><div class='add'>+of the AC97 codec.</div><div class='add'>+</div><div class='add'>+``name='IEC958 LiveDrive Capture Volume',index=0``</div><div class='add'>+--------------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right IEC958 optical</div><div class='add'>+digital inputs. The result samples are forwarded to the ADC capture FIFO</div><div class='add'>+(thus to the standard capture PCM device).</div><div class='add'>+</div><div class='add'>+``name='IEC958 Coaxial Playback Volume',index=0``</div><div class='add'>+-------------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right IEC958 coaxial</div><div class='add'>+digital inputs. The result samples are forwarded to the front DAC PCM slots</div><div class='add'>+of the AC97 codec.</div><div class='add'>+</div><div class='add'>+``name='IEC958 Coaxial Capture Volume',index=0``</div><div class='add'>+------------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right IEC958 coaxial</div><div class='add'>+digital inputs. The result samples are forwarded to the ADC capture FIFO</div><div class='add'>+(thus to the standard capture PCM device).</div><div class='add'>+</div><div class='add'>+``name='Line LiveDrive Playback Volume',index=0``, ``name='Line LiveDrive Playback Volume',index=1``</div><div class='add'>+----------------------------------------------------------------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right I2S ADC</div><div class='add'>+inputs (on the LiveDrive). The result samples are forwarded to the front</div><div class='add'>+DAC PCM slots of the AC97 codec.</div><div class='add'>+</div><div class='add'>+``name='Line LiveDrive Capture Volume',index=1``, ``name='Line LiveDrive Capture Volume',index=1``</div><div class='add'>+--------------------------------------------------------------------------------------------------</div><div class='add'>+This control is used to attenuate samples from left and right I2S ADC</div><div class='add'>+inputs (on the LiveDrive). The result samples are forwarded to the ADC</div><div class='add'>+capture FIFO (thus to the standard capture PCM device).</div><div class='add'>+</div><div class='add'>+``name='Tone Control - Switch',index=0``</div><div class='add'>+----------------------------------------</div><div class='add'>+This control turns the tone control on or off. The samples for front, rear</div><div class='add'>+and center / LFE outputs are affected.</div><div class='add'>+</div><div class='add'>+``name='Tone Control - Bass',index=0``</div><div class='add'>+--------------------------------------</div><div class='add'>+This control sets the bass intensity. There is no neutral value!!</div><div class='add'>+When the tone control code is activated, the samples are always modified.</div><div class='add'>+The closest value to pure signal is 20.</div><div class='add'>+</div><div class='add'>+``name='Tone Control - Treble',index=0``</div><div class='add'>+----------------------------------------</div><div class='add'>+This control sets the treble intensity. There is no neutral value!!</div><div class='add'>+When the tone control code is activated, the samples are always modified.</div><div class='add'>+The closest value to pure signal is 20.</div><div class='add'>+</div><div class='add'>+``name='IEC958 Optical Raw Playback Switch',index=0``</div><div class='add'>+-----------------------------------------------------</div><div class='add'>+If this switch is on, then the samples for the IEC958 (S/PDIF) digital</div><div class='add'>+output are taken only from the raw FX8010 PCM, otherwise standard front</div><div class='add'>+PCM samples are taken.</div><div class='add'>+</div><div class='add'>+``name='Headphone Playback Volume',index=1``</div><div class='add'>+--------------------------------------------</div><div class='add'>+This control attenuates the samples for the headphone output.</div><div class='add'>+</div><div class='add'>+``name='Headphone Center Playback Switch',index=1``</div><div class='add'>+---------------------------------------------------</div><div class='add'>+If this switch is on, then the sample for the center PCM is put to the</div><div class='add'>+left headphone output (useful for SB Live cards without separate center/LFE</div><div class='add'>+output).</div><div class='add'>+</div><div class='add'>+``name='Headphone LFE Playback Switch',index=1``</div><div class='add'>+------------------------------------------------</div><div class='add'>+If this switch is on, then the sample for the center PCM is put to the</div><div class='add'>+right headphone output (useful for SB Live cards without separate center/LFE</div><div class='add'>+output).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PCM stream related controls</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+``name='EMU10K1 PCM Volume',index 0-31``</div><div class='add'>+----------------------------------------</div><div class='add'>+Channel volume attenuation in range 0-0xffff. The maximum value (no</div><div class='add'>+attenuation) is default. The channel mapping for three values is</div><div class='add'>+as follows:</div><div class='add'>+</div><div class='add'>+* 0 - mono, default 0xffff (no attenuation)</div><div class='add'>+* 1 - left, default 0xffff (no attenuation)</div><div class='add'>+* 2 - right, default 0xffff (no attenuation)</div><div class='add'>+</div><div class='add'>+``name='EMU10K1 PCM Send Routing',index 0-31``</div><div class='add'>+----------------------------------------------</div><div class='add'>+This control specifies the destination - FX-bus accumulators. There are</div><div class='add'>+twelve values with this mapping:</div><div class='add'>+</div><div class='add'>+*  0 -  mono, A destination (FX-bus 0-15), default 0</div><div class='add'>+*  1 -  mono, B destination (FX-bus 0-15), default 1</div><div class='add'>+*  2 -  mono, C destination (FX-bus 0-15), default 2</div><div class='add'>+*  3 -  mono, D destination (FX-bus 0-15), default 3</div><div class='add'>+*  4 -  left, A destination (FX-bus 0-15), default 0</div><div class='add'>+*  5 -  left, B destination (FX-bus 0-15), default 1</div><div class='add'>+*  6 -  left, C destination (FX-bus 0-15), default 2</div><div class='add'>+*  7 -  left, D destination (FX-bus 0-15), default 3</div><div class='add'>+*  8 - right, A destination (FX-bus 0-15), default 0</div><div class='add'>+*  9 - right, B destination (FX-bus 0-15), default 1</div><div class='add'>+* 10 - right, C destination (FX-bus 0-15), default 2</div><div class='add'>+* 11 - right, D destination (FX-bus 0-15), default 3</div><div class='add'>+</div><div class='add'>+Don't forget that it's illegal to assign a channel to the same FX-bus accumulator </div><div class='add'>+more than once (it means 0=0 &amp;&amp; 1=0 is an invalid combination).</div><div class='add'>+ </div><div class='add'>+``name='EMU10K1 PCM Send Volume',index 0-31``</div><div class='add'>+---------------------------------------------</div><div class='add'>+It specifies the attenuation (amount) for given destination in range 0-255.</div><div class='add'>+The channel mapping is following:</div><div class='add'>+</div><div class='add'>+*  0 -  mono, A destination attn, default 255 (no attenuation)</div><div class='add'>+*  1 -  mono, B destination attn, default 255 (no attenuation)</div><div class='add'>+*  2 -  mono, C destination attn, default 0 (mute)</div><div class='add'>+*  3 -  mono, D destination attn, default 0 (mute)</div><div class='add'>+*  4 -  left, A destination attn, default 255 (no attenuation)</div><div class='add'>+*  5 -  left, B destination attn, default 0 (mute)</div><div class='add'>+*  6 -  left, C destination attn, default 0 (mute)</div><div class='add'>+*  7 -  left, D destination attn, default 0 (mute)</div><div class='add'>+*  8 - right, A destination attn, default 0 (mute)</div><div class='add'>+*  9 - right, B destination attn, default 255 (no attenuation)</div><div class='add'>+* 10 - right, C destination attn, default 0 (mute)</div><div class='add'>+* 11 - right, D destination attn, default 0 (mute)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MANUALS/PATENTS</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+ftp://opensource.creative.com/pub/doc</div><div class='add'>+-------------------------------------</div><div class='add'>+</div><div class='add'>+LM4545.pdf</div><div class='add'>+	AC97 Codec</div><div class='add'>+m2049.pdf</div><div class='add'>+	The EMU10K1 Digital Audio Processor</div><div class='add'>+hog63.ps</div><div class='add'>+	FX8010 - A DSP Chip Architecture for Audio Effects</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+WIPO Patents</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+WO 9901813 (A1)</div><div class='add'>+	Audio Effects Processor with multiple asynchronous streams</div><div class='add'>+	(Jan. 14, 1999)</div><div class='add'>+</div><div class='add'>+WO 9901814 (A1)</div><div class='add'>+	Processor with Instruction Set for Audio Effects (Jan. 14, 1999)</div><div class='add'>+</div><div class='add'>+WO 9901953 (A1)</div><div class='add'>+	Audio Effects Processor having Decoupled Instruction</div><div class='add'>+        Execution and Audio Data Sequencing (Jan. 14, 1999)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+US Patents (http://www.uspto.gov/)</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+US 5925841</div><div class='add'>+	Digital Sampling Instrument employing cache memory (Jul. 20, 1999)</div><div class='add'>+</div><div class='add'>+US 5928342</div><div class='add'>+	Audio Effects Processor integrated on a single chip</div><div class='add'>+        with a multiport memory onto which multiple asynchronous</div><div class='add'>+        digital sound samples can be concurrently loaded</div><div class='add'>+	(Jul. 27, 1999)</div><div class='add'>+</div><div class='add'>+US 5930158</div><div class='add'>+	Processor with Instruction Set for Audio Effects (Jul. 27, 1999)</div><div class='add'>+</div><div class='add'>+US 6032235</div><div class='add'>+	Memory initialization circuit (Tram) (Feb. 29, 2000)</div><div class='add'>+</div><div class='add'>+US 6138207</div><div class='add'>+	Interpolation looping of audio samples in cache connected to</div><div class='add'>+        system bus with prioritization and modification of bus transfers</div><div class='add'>+        in accordance with loop ends and minimum block sizes</div><div class='add'>+	(Oct. 24, 2000)</div><div class='add'>+</div><div class='add'>+US 6151670</div><div class='add'>+	Method for conserving memory storage using a</div><div class='add'>+        pool of  short term memory registers</div><div class='add'>+	(Nov. 21, 2000)</div><div class='add'>+</div><div class='add'>+US 6195715</div><div class='add'>+	Interrupt control for multiple programs communicating with</div><div class='add'>+        a common interrupt by associating programs to GP registers,</div><div class='add'>+        defining interrupt register, polling GP registers, and invoking</div><div class='add'>+        callback routine associated with defined interrupt register</div><div class='add'>+	(Feb. 27, 2001)</div><div class='head'>diff --git a/Documentation/sound/cards/serial-u16550.rst b/Documentation/sound/cards/serial-u16550.rst<br/>new file mode 100644<br/>index 000000000000..197aeacea3da<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/serial-u16550.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/serial-u16550.rst</a></div><div class='hunk'>@@ -0,0 +1,93 @@</div><div class='add'>+===================================</div><div class='add'>+Serial UART 16450/16550 MIDI driver</div><div class='add'>+===================================</div><div class='add'>+</div><div class='add'>+The adaptor module parameter allows you to select either:</div><div class='add'>+</div><div class='add'>+* 0 - Roland Soundcanvas support (default)</div><div class='add'>+* 1 - Midiator MS-124T support (1)</div><div class='add'>+* 2 - Midiator MS-124W S/A mode (2)</div><div class='add'>+* 3 - MS-124W M/B mode support (3)</div><div class='add'>+* 4 - Generic device with multiple input support (4)</div><div class='add'>+</div><div class='add'>+For the Midiator MS-124W, you must set the physical M-S and A-B</div><div class='add'>+switches on the Midiator to match the driver mode you select.</div><div class='add'>+</div><div class='add'>+In Roland Soundcanvas mode, multiple ALSA raw MIDI substreams are supported</div><div class='add'>+(midiCnD0-midiCnD15).  Whenever you write to a different substream, the driver</div><div class='add'>+sends the nonstandard MIDI command sequence F5 NN, where NN is the substream</div><div class='add'>+number plus 1.  Roland modules use this command to switch between different</div><div class='add'>+"parts", so this feature lets you treat each part as a distinct raw MIDI</div><div class='add'>+substream. The driver provides no way to send F5 00 (no selection) or to not</div><div class='add'>+send the F5 NN command sequence at all; perhaps it ought to.</div><div class='add'>+</div><div class='add'>+Usage example for simple serial converter:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	/sbin/setserial /dev/ttyS0 uart none</div><div class='add'>+	/sbin/modprobe snd-serial-u16550 port=0x3f8 irq=4 speed=115200</div><div class='add'>+</div><div class='add'>+Usage example for Roland SoundCanvas with 4 MIDI ports:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	/sbin/setserial /dev/ttyS0 uart none</div><div class='add'>+	/sbin/modprobe snd-serial-u16550 port=0x3f8 irq=4 outs=4</div><div class='add'>+</div><div class='add'>+In MS-124T mode, one raw MIDI substream is supported (midiCnD0); the outs</div><div class='add'>+module parameter is automatically set to 1. The driver sends the same data to</div><div class='add'>+all four MIDI Out connectors.  Set the A-B switch and the speed module</div><div class='add'>+parameter to match (A=19200, B=9600).</div><div class='add'>+</div><div class='add'>+Usage example for MS-124T, with A-B switch in A position:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	/sbin/setserial /dev/ttyS0 uart none</div><div class='add'>+	/sbin/modprobe snd-serial-u16550 port=0x3f8 irq=4 adaptor=1 \</div><div class='add'>+			speed=19200</div><div class='add'>+</div><div class='add'>+In MS-124W S/A mode, one raw MIDI substream is supported (midiCnD0);</div><div class='add'>+the outs module parameter is automatically set to 1. The driver sends</div><div class='add'>+the same data to all four MIDI Out connectors at full MIDI speed.</div><div class='add'>+</div><div class='add'>+Usage example for S/A mode:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	/sbin/setserial /dev/ttyS0 uart none</div><div class='add'>+	/sbin/modprobe snd-serial-u16550 port=0x3f8 irq=4 adaptor=2</div><div class='add'>+</div><div class='add'>+In MS-124W M/B mode, the driver supports 16 ALSA raw MIDI substreams;</div><div class='add'>+the outs module parameter is automatically set to 16.  The substream</div><div class='add'>+number gives a bitmask of which MIDI Out connectors the data should be</div><div class='add'>+sent to, with midiCnD1 sending to Out 1, midiCnD2 to Out 2, midiCnD4 to</div><div class='add'>+Out 3, and midiCnD8 to Out 4.  Thus midiCnD15 sends the data to all 4 ports.</div><div class='add'>+As a special case, midiCnD0 also sends to all ports, since it is not useful</div><div class='add'>+to send the data to no ports.  M/B mode has extra overhead to select the MIDI</div><div class='add'>+Out for each byte, so the aggregate data rate across all four MIDI Outs is</div><div class='add'>+at most one byte every 520 us, as compared with the full MIDI data rate of</div><div class='add'>+one byte every 320 us per port.</div><div class='add'>+</div><div class='add'>+Usage example for M/B mode:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	/sbin/setserial /dev/ttyS0 uart none</div><div class='add'>+	/sbin/modprobe snd-serial-u16550 port=0x3f8 irq=4 adaptor=3</div><div class='add'>+</div><div class='add'>+The MS-124W hardware's M/A mode is currently not supported. This mode allows</div><div class='add'>+the MIDI Outs to act independently at double the aggregate throughput of M/B,</div><div class='add'>+but does not allow sending the same byte simultaneously to multiple MIDI Outs. </div><div class='add'>+The M/A protocol requires the driver to twiddle the modem control lines under</div><div class='add'>+timing constraints, so it would be a bit more complicated to implement than</div><div class='add'>+the other modes.</div><div class='add'>+</div><div class='add'>+Midiator models other than MS-124W and MS-124T are currently not supported. </div><div class='add'>+Note that the suffix letter is significant; the MS-124 and MS-124B are not</div><div class='add'>+compatible, nor are the other known models MS-101, MS-101B, MS-103, and MS-114.</div><div class='add'>+I do have documentation (tim.mann@compaq.com) that partially covers these models,</div><div class='add'>+but no units to experiment with.  The MS-124W support is tested with a real unit.</div><div class='add'>+The MS-124T support is untested, but should work.</div><div class='add'>+</div><div class='add'>+The Generic driver supports multiple input and output substreams over a single</div><div class='add'>+serial port.  Similar to Roland Soundcanvas mode, F5 NN is used to select the</div><div class='add'>+appropriate input or output stream (depending on the data direction).</div><div class='add'>+Additionally, the CTS signal is used to regulate the data flow.  The number of</div><div class='add'>+inputs is specified by the ins parameter.</div><div class='head'>diff --git a/Documentation/sound/cards/via82xx-mixer.rst b/Documentation/sound/cards/via82xx-mixer.rst<br/>new file mode 100644<br/>index 000000000000..6ee993d4535b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/cards/via82xx-mixer.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/cards/via82xx-mixer.rst</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+=============</div><div class='add'>+VIA82xx mixer</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+On many VIA82xx boards, the ``Input Source Select`` mixer control does not work.</div><div class='add'>+Setting it to ``Input2`` on such boards will cause recording to hang, or fail</div><div class='add'>+with EIO (input/output error) via OSS emulation.  This control should be left</div><div class='add'>+at ``Input1`` for such cards.</div><div class='head'>diff --git a/Documentation/sound/designs/channel-mapping-api.rst b/Documentation/sound/designs/channel-mapping-api.rst<br/>new file mode 100644<br/>index 000000000000..58e6312a43c0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/designs/channel-mapping-api.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/channel-mapping-api.rst</a></div><div class='hunk'>@@ -0,0 +1,164 @@</div><div class='add'>+============================</div><div class='add'>+ALSA PCM channel-mapping API</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+</div><div class='add'>+General</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+The channel mapping API allows user to query the possible channel maps</div><div class='add'>+and the current channel map, also optionally to modify the channel map</div><div class='add'>+of the current stream.</div><div class='add'>+</div><div class='add'>+A channel map is an array of position for each PCM channel.</div><div class='add'>+Typically, a stereo PCM stream has a channel map of</div><div class='add'>+``{ front_left, front_right }``</div><div class='add'>+while a 4.0 surround PCM stream has a channel map of</div><div class='add'>+``{ front left, front right, rear left, rear right }.``</div><div class='add'>+</div><div class='add'>+The problem, so far, was that we had no standard channel map</div><div class='add'>+explicitly, and applications had no way to know which channel</div><div class='add'>+corresponds to which (speaker) position.  Thus, applications applied</div><div class='add'>+wrong channels for 5.1 outputs, and you hear suddenly strange sound</div><div class='add'>+from rear.  Or, some devices secretly assume that center/LFE is the</div><div class='add'>+third/fourth channels while others that C/LFE as 5th/6th channels.</div><div class='add'>+</div><div class='add'>+Also, some devices such as HDMI are configurable for different speaker</div><div class='add'>+positions even with the same number of total channels.  However, there</div><div class='add'>+was no way to specify this because of lack of channel map</div><div class='add'>+specification.  These are the main motivations for the new channel</div><div class='add'>+mapping API.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Design</div><div class='add'>+======</div><div class='add'>+</div><div class='add'>+Actually, "the channel mapping API" doesn't introduce anything new in</div><div class='add'>+the kernel/user-space ABI perspective.  It uses only the existing</div><div class='add'>+control element features.</div><div class='add'>+</div><div class='add'>+As a ground design, each PCM substream may contain a control element</div><div class='add'>+providing the channel mapping information and configuration.  This</div><div class='add'>+element is specified by:</div><div class='add'>+</div><div class='add'>+* iface = SNDRV_CTL_ELEM_IFACE_PCM</div><div class='add'>+* name = "Playback Channel Map" or "Capture Channel Map"</div><div class='add'>+* device = the same device number for the assigned PCM substream</div><div class='add'>+* index = the same index number for the assigned PCM substream</div><div class='add'>+</div><div class='add'>+Note the name is different depending on the PCM substream direction.</div><div class='add'>+</div><div class='add'>+Each control element provides at least the TLV read operation and the</div><div class='add'>+read operation.  Optionally, the write operation can be provided to</div><div class='add'>+allow user to change the channel map dynamically.</div><div class='add'>+</div><div class='add'>+TLV</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+The TLV operation gives the list of available channel</div><div class='add'>+maps.  A list item of a channel map is usually a TLV of</div><div class='add'>+``type data-bytes ch0 ch1 ch2...``</div><div class='add'>+where type is the TLV type value, the second argument is the total</div><div class='add'>+bytes (not the numbers) of channel values, and the rest are the</div><div class='add'>+position value for each channel.</div><div class='add'>+</div><div class='add'>+As a TLV type, either ``SNDRV_CTL_TLVT_CHMAP_FIXED``,</div><div class='add'>+``SNDRV_CTL_TLV_CHMAP_VAR`` or ``SNDRV_CTL_TLVT_CHMAP_PAIRED`` can be used.</div><div class='add'>+The ``_FIXED`` type is for a channel map with the fixed channel position</div><div class='add'>+while the latter two are for flexible channel positions. ``_VAR`` type is</div><div class='add'>+for a channel map where all channels are freely swappable and ``_PAIRED``</div><div class='add'>+type is where pair-wise channels are swappable.  For example, when you</div><div class='add'>+have {FL/FR/RL/RR} channel map, ``_PAIRED`` type would allow you to swap</div><div class='add'>+only {RL/RR/FL/FR} while ``_VAR`` type would allow even swapping FL and</div><div class='add'>+RR.</div><div class='add'>+</div><div class='add'>+These new TLV types are defined in ``sound/tlv.h``.</div><div class='add'>+</div><div class='add'>+The available channel position values are defined in ``sound/asound.h``,</div><div class='add'>+here is a cut:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  /* channel positions */</div><div class='add'>+  enum {</div><div class='add'>+	SNDRV_CHMAP_UNKNOWN = 0,</div><div class='add'>+	SNDRV_CHMAP_NA,		/* N/A, silent */</div><div class='add'>+	SNDRV_CHMAP_MONO,	/* mono stream */</div><div class='add'>+	/* this follows the alsa-lib mixer channel value + 3 */</div><div class='add'>+	SNDRV_CHMAP_FL,		/* front left */</div><div class='add'>+	SNDRV_CHMAP_FR,		/* front right */</div><div class='add'>+	SNDRV_CHMAP_RL,		/* rear left */</div><div class='add'>+	SNDRV_CHMAP_RR,		/* rear right */</div><div class='add'>+	SNDRV_CHMAP_FC,		/* front center */</div><div class='add'>+	SNDRV_CHMAP_LFE,	/* LFE */</div><div class='add'>+	SNDRV_CHMAP_SL,		/* side left */</div><div class='add'>+	SNDRV_CHMAP_SR,		/* side right */</div><div class='add'>+	SNDRV_CHMAP_RC,		/* rear center */</div><div class='add'>+	/* new definitions */</div><div class='add'>+	SNDRV_CHMAP_FLC,	/* front left center */</div><div class='add'>+	SNDRV_CHMAP_FRC,	/* front right center */</div><div class='add'>+	SNDRV_CHMAP_RLC,	/* rear left center */</div><div class='add'>+	SNDRV_CHMAP_RRC,	/* rear right center */</div><div class='add'>+	SNDRV_CHMAP_FLW,	/* front left wide */</div><div class='add'>+	SNDRV_CHMAP_FRW,	/* front right wide */</div><div class='add'>+	SNDRV_CHMAP_FLH,	/* front left high */</div><div class='add'>+	SNDRV_CHMAP_FCH,	/* front center high */</div><div class='add'>+	SNDRV_CHMAP_FRH,	/* front right high */</div><div class='add'>+	SNDRV_CHMAP_TC,		/* top center */</div><div class='add'>+	SNDRV_CHMAP_TFL,	/* top front left */</div><div class='add'>+	SNDRV_CHMAP_TFR,	/* top front right */</div><div class='add'>+	SNDRV_CHMAP_TFC,	/* top front center */</div><div class='add'>+	SNDRV_CHMAP_TRL,	/* top rear left */</div><div class='add'>+	SNDRV_CHMAP_TRR,	/* top rear right */</div><div class='add'>+	SNDRV_CHMAP_TRC,	/* top rear center */</div><div class='add'>+	SNDRV_CHMAP_LAST = SNDRV_CHMAP_TRC,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+When a PCM stream can provide more than one channel map, you can</div><div class='add'>+provide multiple channel maps in a TLV container type.  The TLV data</div><div class='add'>+to be returned will contain such as:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	SNDRV_CTL_TLVT_CONTAINER 96</div><div class='add'>+	    SNDRV_CTL_TLVT_CHMAP_FIXED 4 SNDRV_CHMAP_FC</div><div class='add'>+	    SNDRV_CTL_TLVT_CHMAP_FIXED 8 SNDRV_CHMAP_FL SNDRV_CHMAP_FR</div><div class='add'>+	    SNDRV_CTL_TLVT_CHMAP_FIXED 16 NDRV_CHMAP_FL SNDRV_CHMAP_FR \</div><div class='add'>+		SNDRV_CHMAP_RL SNDRV_CHMAP_RR</div><div class='add'>+</div><div class='add'>+The channel position is provided in LSB 16bits.  The upper bits are</div><div class='add'>+used for bit flags.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	#define SNDRV_CHMAP_POSITION_MASK	0xffff</div><div class='add'>+	#define SNDRV_CHMAP_PHASE_INVERSE	(0x01 &lt;&lt; 16)</div><div class='add'>+	#define SNDRV_CHMAP_DRIVER_SPEC		(0x02 &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+``SNDRV_CHMAP_PHASE_INVERSE`` indicates the channel is phase inverted,</div><div class='add'>+(thus summing left and right channels would result in almost silence).</div><div class='add'>+Some digital mic devices have this.</div><div class='add'>+</div><div class='add'>+When ``SNDRV_CHMAP_DRIVER_SPEC`` is set, all the channel position values</div><div class='add'>+don't follow the standard definition above but driver-specific.</div><div class='add'>+</div><div class='add'>+Read Operation</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+The control read operation is for providing the current channel map of</div><div class='add'>+the given stream.  The control element returns an integer array</div><div class='add'>+containing the position of each channel.</div><div class='add'>+</div><div class='add'>+When this is performed before the number of the channel is specified</div><div class='add'>+(i.e. hw_params is set), it should return all channels set to</div><div class='add'>+``UNKNOWN``.</div><div class='add'>+</div><div class='add'>+Write Operation</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+The control write operation is optional, and only for devices that can</div><div class='add'>+change the channel configuration on the fly, such as HDMI.  User needs</div><div class='add'>+to pass an integer value containing the valid channel positions for</div><div class='add'>+all channels of the assigned PCM substream.</div><div class='add'>+</div><div class='add'>+This operation is allowed only at PCM PREPARED state.  When called in</div><div class='add'>+other states, it shall return an error.</div><div class='head'>diff --git a/Documentation/sound/designs/compress-offload.rst b/Documentation/sound/designs/compress-offload.rst<br/>new file mode 100644<br/>index 000000000000..ad4bfbdacc83<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/designs/compress-offload.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/compress-offload.rst</a></div><div class='hunk'>@@ -0,0 +1,245 @@</div><div class='add'>+=========================</div><div class='add'>+ALSA Compress-Offload API</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+Pierre-Louis.Bossart &lt;pierre-louis.bossart@linux.intel.com&gt;</div><div class='add'>+</div><div class='add'>+Vinod Koul &lt;vinod.koul@linux.intel.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Overview</div><div class='add'>+========</div><div class='add'>+Since its early days, the ALSA API was defined with PCM support or</div><div class='add'>+constant bitrates payloads such as IEC61937 in mind. Arguments and</div><div class='add'>+returned values in frames are the norm, making it a challenge to</div><div class='add'>+extend the existing API to compressed data streams.</div><div class='add'>+</div><div class='add'>+In recent years, audio digital signal processors (DSP) were integrated</div><div class='add'>+in system-on-chip designs, and DSPs are also integrated in audio</div><div class='add'>+codecs. Processing compressed data on such DSPs results in a dramatic</div><div class='add'>+reduction of power consumption compared to host-based</div><div class='add'>+processing. Support for such hardware has not been very good in Linux,</div><div class='add'>+mostly because of a lack of a generic API available in the mainline</div><div class='add'>+kernel.</div><div class='add'>+</div><div class='add'>+Rather than requiring a compatibility break with an API change of the</div><div class='add'>+ALSA PCM interface, a new 'Compressed Data' API is introduced to</div><div class='add'>+provide a control and data-streaming interface for audio DSPs.</div><div class='add'>+</div><div class='add'>+The design of this API was inspired by the 2-year experience with the</div><div class='add'>+Intel Moorestown SOC, with many corrections required to upstream the</div><div class='add'>+API in the mainline kernel instead of the staging tree and make it</div><div class='add'>+usable by others.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Requirements</div><div class='add'>+============</div><div class='add'>+The main requirements are:</div><div class='add'>+</div><div class='add'>+- separation between byte counts and time. Compressed formats may have</div><div class='add'>+  a header per file, per frame, or no header at all. The payload size</div><div class='add'>+  may vary from frame-to-frame. As a result, it is not possible to</div><div class='add'>+  estimate reliably the duration of audio buffers when handling</div><div class='add'>+  compressed data. Dedicated mechanisms are required to allow for</div><div class='add'>+  reliable audio-video synchronization, which requires precise</div><div class='add'>+  reporting of the number of samples rendered at any given time.</div><div class='add'>+</div><div class='add'>+- Handling of multiple formats. PCM data only requires a specification</div><div class='add'>+  of the sampling rate, number of channels and bits per sample. In</div><div class='add'>+  contrast, compressed data comes in a variety of formats. Audio DSPs</div><div class='add'>+  may also provide support for a limited number of audio encoders and</div><div class='add'>+  decoders embedded in firmware, or may support more choices through</div><div class='add'>+  dynamic download of libraries.</div><div class='add'>+</div><div class='add'>+- Focus on main formats. This API provides support for the most</div><div class='add'>+  popular formats used for audio and video capture and playback. It is</div><div class='add'>+  likely that as audio compression technology advances, new formats</div><div class='add'>+  will be added.</div><div class='add'>+</div><div class='add'>+- Handling of multiple configurations. Even for a given format like</div><div class='add'>+  AAC, some implementations may support AAC multichannel but HE-AAC</div><div class='add'>+  stereo. Likewise WMA10 level M3 may require too much memory and cpu</div><div class='add'>+  cycles. The new API needs to provide a generic way of listing these</div><div class='add'>+  formats.</div><div class='add'>+</div><div class='add'>+- Rendering/Grabbing only. This API does not provide any means of</div><div class='add'>+  hardware acceleration, where PCM samples are provided back to</div><div class='add'>+  user-space for additional processing. This API focuses instead on</div><div class='add'>+  streaming compressed data to a DSP, with the assumption that the</div><div class='add'>+  decoded samples are routed to a physical output or logical back-end.</div><div class='add'>+</div><div class='add'>+- Complexity hiding. Existing user-space multimedia frameworks all</div><div class='add'>+  have existing enums/structures for each compressed format. This new</div><div class='add'>+  API assumes the existence of a platform-specific compatibility layer</div><div class='add'>+  to expose, translate and make use of the capabilities of the audio</div><div class='add'>+  DSP, eg. Android HAL or PulseAudio sinks. By construction, regular</div><div class='add'>+  applications are not supposed to make use of this API.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Design</div><div class='add'>+======</div><div class='add'>+The new API shares a number of concepts with the PCM API for flow</div><div class='add'>+control. Start, pause, resume, drain and stop commands have the same</div><div class='add'>+semantics no matter what the content is.</div><div class='add'>+</div><div class='add'>+The concept of memory ring buffer divided in a set of fragments is</div><div class='add'>+borrowed from the ALSA PCM API. However, only sizes in bytes can be</div><div class='add'>+specified.</div><div class='add'>+</div><div class='add'>+Seeks/trick modes are assumed to be handled by the host.</div><div class='add'>+</div><div class='add'>+The notion of rewinds/forwards is not supported. Data committed to the</div><div class='add'>+ring buffer cannot be invalidated, except when dropping all buffers.</div><div class='add'>+</div><div class='add'>+The Compressed Data API does not make any assumptions on how the data</div><div class='add'>+is transmitted to the audio DSP. DMA transfers from main memory to an</div><div class='add'>+embedded audio cluster or to a SPI interface for external DSPs are</div><div class='add'>+possible. As in the ALSA PCM case, a core set of routines is exposed;</div><div class='add'>+each driver implementer will have to write support for a set of</div><div class='add'>+mandatory routines and possibly make use of optional ones.</div><div class='add'>+</div><div class='add'>+The main additions are</div><div class='add'>+</div><div class='add'>+get_caps</div><div class='add'>+  This routine returns the list of audio formats supported. Querying the</div><div class='add'>+  codecs on a capture stream will return encoders, decoders will be</div><div class='add'>+  listed for playback streams.</div><div class='add'>+</div><div class='add'>+get_codec_caps</div><div class='add'>+  For each codec, this routine returns a list of</div><div class='add'>+  capabilities. The intent is to make sure all the capabilities</div><div class='add'>+  correspond to valid settings, and to minimize the risks of</div><div class='add'>+  configuration failures. For example, for a complex codec such as AAC,</div><div class='add'>+  the number of channels supported may depend on a specific profile. If</div><div class='add'>+  the capabilities were exposed with a single descriptor, it may happen</div><div class='add'>+  that a specific combination of profiles/channels/formats may not be</div><div class='add'>+  supported. Likewise, embedded DSPs have limited memory and cpu cycles,</div><div class='add'>+  it is likely that some implementations make the list of capabilities</div><div class='add'>+  dynamic and dependent on existing workloads. In addition to codec</div><div class='add'>+  settings, this routine returns the minimum buffer size handled by the</div><div class='add'>+  implementation. This information can be a function of the DMA buffer</div><div class='add'>+  sizes, the number of bytes required to synchronize, etc, and can be</div><div class='add'>+  used by userspace to define how much needs to be written in the ring</div><div class='add'>+  buffer before playback can start.</div><div class='add'>+</div><div class='add'>+set_params</div><div class='add'>+  This routine sets the configuration chosen for a specific codec. The</div><div class='add'>+  most important field in the parameters is the codec type; in most</div><div class='add'>+  cases decoders will ignore other fields, while encoders will strictly</div><div class='add'>+  comply to the settings</div><div class='add'>+</div><div class='add'>+get_params</div><div class='add'>+  This routines returns the actual settings used by the DSP. Changes to</div><div class='add'>+  the settings should remain the exception.</div><div class='add'>+</div><div class='add'>+get_timestamp</div><div class='add'>+  The timestamp becomes a multiple field structure. It lists the number</div><div class='add'>+  of bytes transferred, the number of samples processed and the number</div><div class='add'>+  of samples rendered/grabbed. All these values can be used to determine</div><div class='add'>+  the average bitrate, figure out if the ring buffer needs to be</div><div class='add'>+  refilled or the delay due to decoding/encoding/io on the DSP.</div><div class='add'>+</div><div class='add'>+Note that the list of codecs/profiles/modes was derived from the</div><div class='add'>+OpenMAX AL specification instead of reinventing the wheel.</div><div class='add'>+Modifications include:</div><div class='add'>+- Addition of FLAC and IEC formats</div><div class='add'>+- Merge of encoder/decoder capabilities</div><div class='add'>+- Profiles/modes listed as bitmasks to make descriptors more compact</div><div class='add'>+- Addition of set_params for decoders (missing in OpenMAX AL)</div><div class='add'>+- Addition of AMR/AMR-WB encoding modes (missing in OpenMAX AL)</div><div class='add'>+- Addition of format information for WMA</div><div class='add'>+- Addition of encoding options when required (derived from OpenMAX IL)</div><div class='add'>+- Addition of rateControlSupported (missing in OpenMAX AL)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Gapless Playback</div><div class='add'>+================</div><div class='add'>+When playing thru an album, the decoders have the ability to skip the encoder</div><div class='add'>+delay and padding and directly move from one track content to another. The end</div><div class='add'>+user can perceive this as gapless playback as we don't have silence while</div><div class='add'>+switching from one track to another</div><div class='add'>+</div><div class='add'>+Also, there might be low-intensity noises due to encoding. Perfect gapless is</div><div class='add'>+difficult to reach with all types of compressed data, but works fine with most</div><div class='add'>+music content. The decoder needs to know the encoder delay and encoder padding.</div><div class='add'>+So we need to pass this to DSP. This metadata is extracted from ID3/MP4 headers</div><div class='add'>+and are not present by default in the bitstream, hence the need for a new</div><div class='add'>+interface to pass this information to the DSP. Also DSP and userspace needs to</div><div class='add'>+switch from one track to another and start using data for second track.</div><div class='add'>+</div><div class='add'>+The main additions are:</div><div class='add'>+</div><div class='add'>+set_metadata</div><div class='add'>+  This routine sets the encoder delay and encoder padding. This can be used by</div><div class='add'>+  decoder to strip the silence. This needs to be set before the data in the track</div><div class='add'>+  is written.</div><div class='add'>+</div><div class='add'>+set_next_track</div><div class='add'>+  This routine tells DSP that metadata and write operation sent after this would</div><div class='add'>+  correspond to subsequent track</div><div class='add'>+</div><div class='add'>+partial drain</div><div class='add'>+  This is called when end of file is reached. The userspace can inform DSP that</div><div class='add'>+  EOF is reached and now DSP can start skipping padding delay. Also next write</div><div class='add'>+  data would belong to next track</div><div class='add'>+</div><div class='add'>+Sequence flow for gapless would be:</div><div class='add'>+- Open</div><div class='add'>+- Get caps / codec caps</div><div class='add'>+- Set params</div><div class='add'>+- Set metadata of the first track</div><div class='add'>+- Fill data of the first track</div><div class='add'>+- Trigger start</div><div class='add'>+- User-space finished sending all,</div><div class='add'>+- Indicate next track data by sending set_next_track</div><div class='add'>+- Set metadata of the next track</div><div class='add'>+- then call partial_drain to flush most of buffer in DSP</div><div class='add'>+- Fill data of the next track</div><div class='add'>+- DSP switches to second track</div><div class='add'>+</div><div class='add'>+(note: order for partial_drain and write for next track can be reversed as well)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Not supported</div><div class='add'>+=============</div><div class='add'>+- Support for VoIP/circuit-switched calls is not the target of this</div><div class='add'>+  API. Support for dynamic bit-rate changes would require a tight</div><div class='add'>+  coupling between the DSP and the host stack, limiting power savings.</div><div class='add'>+</div><div class='add'>+- Packet-loss concealment is not supported. This would require an</div><div class='add'>+  additional interface to let the decoder synthesize data when frames</div><div class='add'>+  are lost during transmission. This may be added in the future.</div><div class='add'>+</div><div class='add'>+- Volume control/routing is not handled by this API. Devices exposing a</div><div class='add'>+  compressed data interface will be considered as regular ALSA devices;</div><div class='add'>+  volume changes and routing information will be provided with regular</div><div class='add'>+  ALSA kcontrols.</div><div class='add'>+</div><div class='add'>+- Embedded audio effects. Such effects should be enabled in the same</div><div class='add'>+  manner, no matter if the input was PCM or compressed.</div><div class='add'>+</div><div class='add'>+- multichannel IEC encoding. Unclear if this is required.</div><div class='add'>+</div><div class='add'>+- Encoding/decoding acceleration is not supported as mentioned</div><div class='add'>+  above. It is possible to route the output of a decoder to a capture</div><div class='add'>+  stream, or even implement transcoding capabilities. This routing</div><div class='add'>+  would be enabled with ALSA kcontrols.</div><div class='add'>+</div><div class='add'>+- Audio policy/resource management. This API does not provide any</div><div class='add'>+  hooks to query the utilization of the audio DSP, nor any preemption</div><div class='add'>+  mechanisms.</div><div class='add'>+</div><div class='add'>+- No notion of underrun/overrun. Since the bytes written are compressed</div><div class='add'>+  in nature and data written/read doesn't translate directly to</div><div class='add'>+  rendered output in time, this does not deal with underrun/overrun and</div><div class='add'>+  maybe dealt in user-library</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Credits</div><div class='add'>+=======</div><div class='add'>+- Mark Brown and Liam Girdwood for discussions on the need for this API</div><div class='add'>+- Harsha Priya for her work on intel_sst compressed API</div><div class='add'>+- Rakesh Ughreja for valuable feedback</div><div class='add'>+- Sing Nallasellan, Sikkandar Madar and Prasanna Samaga for</div><div class='add'>+  demonstrating and quantifying the benefits of audio offload on a</div><div class='add'>+  real platform.</div><div class='head'>diff --git a/Documentation/sound/designs/control-names.rst b/Documentation/sound/designs/control-names.rst<br/>new file mode 100644<br/>index 000000000000..7fedd0f33cd9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/designs/control-names.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/control-names.rst</a></div><div class='hunk'>@@ -0,0 +1,142 @@</div><div class='add'>+===========================</div><div class='add'>+Standard ALSA Control Names</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+This document describes standard names of mixer controls.</div><div class='add'>+</div><div class='add'>+Standard Syntax</div><div class='add'>+---------------</div><div class='add'>+Syntax: [LOCATION] SOURCE [CHANNEL] [DIRECTION] FUNCTION</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DIRECTION</div><div class='add'>+~~~~~~~~~</div><div class='add'>+================	===============</div><div class='add'>+&lt;nothing&gt;		both directions</div><div class='add'>+Playback		one direction</div><div class='add'>+Capture			one direction</div><div class='add'>+Bypass Playback		one direction</div><div class='add'>+Bypass Capture		one direction</div><div class='add'>+================	===============</div><div class='add'>+</div><div class='add'>+FUNCTION</div><div class='add'>+~~~~~~~~</div><div class='add'>+========	=================================</div><div class='add'>+Switch		on/off switch</div><div class='add'>+Volume		amplifier</div><div class='add'>+Route		route control, hardware specific</div><div class='add'>+========	=================================</div><div class='add'>+</div><div class='add'>+CHANNEL</div><div class='add'>+~~~~~~~</div><div class='add'>+============	==================================================</div><div class='add'>+&lt;nothing&gt;	channel independent, or applies to all channels</div><div class='add'>+Front		front left/right channels</div><div class='add'>+Surround	rear left/right in 4.0/5.1 surround</div><div class='add'>+CLFE		C/LFE channels</div><div class='add'>+Center		center cannel</div><div class='add'>+LFE		LFE channel</div><div class='add'>+Side		side left/right for 7.1 surround</div><div class='add'>+============	==================================================</div><div class='add'>+</div><div class='add'>+LOCATION (Physical location of source)</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+============	=====================</div><div class='add'>+Front		front position</div><div class='add'>+Rear		rear position</div><div class='add'>+Dock		on docking station</div><div class='add'>+Internal	internal</div><div class='add'>+============	=====================</div><div class='add'>+</div><div class='add'>+SOURCE</div><div class='add'>+~~~~~~</div><div class='add'>+===================	=================================================</div><div class='add'>+Master</div><div class='add'>+Master Mono</div><div class='add'>+Hardware Master</div><div class='add'>+Speaker			internal speaker</div><div class='add'>+Bass Speaker		internal LFE speaker</div><div class='add'>+Headphone</div><div class='add'>+Line Out</div><div class='add'>+Beep			beep generator</div><div class='add'>+Phone</div><div class='add'>+Phone Input</div><div class='add'>+Phone Output</div><div class='add'>+Synth</div><div class='add'>+FM</div><div class='add'>+Mic</div><div class='add'>+Headset Mic		mic part of combined headset jack - 4-pin</div><div class='add'>+			headphone + mic</div><div class='add'>+Headphone Mic		mic part of either/or - 3-pin headphone or mic</div><div class='add'>+Line			input only, use "Line Out" for output</div><div class='add'>+CD</div><div class='add'>+Video</div><div class='add'>+Zoom Video</div><div class='add'>+Aux</div><div class='add'>+PCM</div><div class='add'>+PCM Pan</div><div class='add'>+Loopback</div><div class='add'>+Analog Loopback		D/A -&gt; A/D loopback</div><div class='add'>+Digital Loopback	playback -&gt; capture loopback -</div><div class='add'>+			without analog path</div><div class='add'>+Mono</div><div class='add'>+Mono Output</div><div class='add'>+Multi</div><div class='add'>+ADC</div><div class='add'>+Wave</div><div class='add'>+Music</div><div class='add'>+I2S</div><div class='add'>+IEC958</div><div class='add'>+HDMI</div><div class='add'>+SPDIF			output only</div><div class='add'>+SPDIF In</div><div class='add'>+Digital In</div><div class='add'>+HDMI/DP			either HDMI or DisplayPort</div><div class='add'>+===================	=================================================</div><div class='add'>+</div><div class='add'>+Exceptions (deprecated)</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+=====================================	=======================</div><div class='add'>+[Analogue|Digital] Capture Source</div><div class='add'>+[Analogue|Digital] Capture Switch	aka input gain switch</div><div class='add'>+[Analogue|Digital] Capture Volume	aka input gain volume</div><div class='add'>+[Analogue|Digital] Playback Switch	aka output gain switch</div><div class='add'>+[Analogue|Digital] Playback Volume	aka output gain volume</div><div class='add'>+Tone Control - Switch</div><div class='add'>+Tone Control - Bass</div><div class='add'>+Tone Control - Treble</div><div class='add'>+3D Control - Switch</div><div class='add'>+3D Control - Center</div><div class='add'>+3D Control - Depth</div><div class='add'>+3D Control - Wide</div><div class='add'>+3D Control - Space</div><div class='add'>+3D Control - Level</div><div class='add'>+Mic Boost [(?dB)]</div><div class='add'>+=====================================	=======================</div><div class='add'>+</div><div class='add'>+PCM interface</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+===================	========================================</div><div class='add'>+Sample Clock Source	{ "Word", "Internal", "AutoSync" }</div><div class='add'>+Clock Sync Status	{ "Lock", "Sync", "No Lock" }</div><div class='add'>+External Rate		external capture rate</div><div class='add'>+Capture Rate		capture rate taken from external source</div><div class='add'>+===================	========================================</div><div class='add'>+</div><div class='add'>+IEC958 (S/PDIF) interface</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+============================================	======================================</div><div class='add'>+IEC958 [...] [Playback|Capture] Switch		turn on/off the IEC958 interface</div><div class='add'>+IEC958 [...] [Playback|Capture] Volume		digital volume control</div><div class='add'>+IEC958 [...] [Playback|Capture] Default		default or global value - read/write</div><div class='add'>+IEC958 [...] [Playback|Capture] Mask		consumer and professional mask</div><div class='add'>+IEC958 [...] [Playback|Capture] Con Mask	consumer mask</div><div class='add'>+IEC958 [...] [Playback|Capture] Pro Mask	professional mask</div><div class='add'>+IEC958 [...] [Playback|Capture] PCM Stream	the settings assigned to a PCM stream</div><div class='add'>+IEC958 Q-subcode [Playback|Capture] Default	Q-subcode bits</div><div class='add'>+</div><div class='add'>+IEC958 Preamble [Playback|Capture] Default	burst preamble words (4*16bits)</div><div class='add'>+============================================	======================================</div><div class='head'>diff --git a/Documentation/sound/designs/index.rst b/Documentation/sound/designs/index.rst<br/>new file mode 100644<br/>index 000000000000..04dcdae3e4f2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/designs/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/index.rst</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+Designs and Implementations</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   control-names</div><div class='add'>+   channel-mapping-api</div><div class='add'>+   compress-offload</div><div class='add'>+   timestamping</div><div class='add'>+   jack-controls</div><div class='add'>+   procfile</div><div class='add'>+   powersave</div><div class='add'>+   oss-emulation</div><div class='add'>+   seq-oss</div><div class='head'>diff --git a/Documentation/sound/designs/jack-controls.rst b/Documentation/sound/designs/jack-controls.rst<br/>new file mode 100644<br/>index 000000000000..ae25b1531bb0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/designs/jack-controls.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/jack-controls.rst</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+==================</div><div class='add'>+ALSA Jack Controls</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+Why we need Jack kcontrols</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+ALSA uses kcontrols to export audio controls(switch, volume, Mux, ...)</div><div class='add'>+to user space. This means userspace applications like pulseaudio can</div><div class='add'>+switch off headphones and switch on speakers when no headphones are</div><div class='add'>+pluged in.</div><div class='add'>+</div><div class='add'>+The old ALSA jack code only created input devices for each registered</div><div class='add'>+jack. These jack input devices are not readable by userspace devices</div><div class='add'>+that run as non root.</div><div class='add'>+</div><div class='add'>+The new jack code creates embedded jack kcontrols for each jack that</div><div class='add'>+can be read by any process.</div><div class='add'>+</div><div class='add'>+This can be combined with UCM to allow userspace to route audio more</div><div class='add'>+intelligently based on jack insertion or removal events.</div><div class='add'>+</div><div class='add'>+Jack Kcontrol Internals</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+Each jack will have a kcontrol list, so that we can create a kcontrol</div><div class='add'>+and attach it to the jack, at jack creation stage. We can also add a</div><div class='add'>+kcontrol to an existing jack, at anytime when required.</div><div class='add'>+</div><div class='add'>+Those kcontrols will be freed automatically when the Jack is freed.</div><div class='add'>+</div><div class='add'>+How to use jack kcontrols</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+In order to keep compatibility, snd_jack_new() has been modified by</div><div class='add'>+adding two params:</div><div class='add'>+</div><div class='add'>+initial_kctl</div><div class='add'>+  if true, create a kcontrol and add it to the jack list.</div><div class='add'>+phantom_jack</div><div class='add'>+  Don't create a input device for phantom jacks.</div><div class='add'>+</div><div class='add'>+HDA jacks can set phantom_jack to true in order to create a phantom</div><div class='add'>+jack and set initial_kctl to true to create an initial kcontrol with</div><div class='add'>+the correct id.</div><div class='add'>+</div><div class='add'>+ASoC jacks should set initial_kctl as false. The pin name will be</div><div class='add'>+assigned as the jack kcontrol name.</div><div class='head'>diff --git a/Documentation/sound/designs/oss-emulation.rst b/Documentation/sound/designs/oss-emulation.rst<br/>new file mode 100644<br/>index 000000000000..e8dcb9633e7b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/designs/oss-emulation.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/oss-emulation.rst</a></div><div class='hunk'>@@ -0,0 +1,336 @@</div><div class='add'>+=============================</div><div class='add'>+Notes on Kernel OSS-Emulation</div><div class='add'>+=============================</div><div class='add'>+</div><div class='add'>+Jan. 22, 2004  Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Modules</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+ALSA provides a powerful OSS emulation on the kernel.</div><div class='add'>+The OSS emulation for PCM, mixer and sequencer devices is implemented</div><div class='add'>+as add-on kernel modules, snd-pcm-oss, snd-mixer-oss and snd-seq-oss.</div><div class='add'>+When you need to access the OSS PCM, mixer or sequencer devices, the</div><div class='add'>+corresponding module has to be loaded.</div><div class='add'>+</div><div class='add'>+These modules are loaded automatically when the corresponding service</div><div class='add'>+is called.  The alias is defined ``sound-service-x-y``, where x and y are</div><div class='add'>+the card number and the minor unit number.  Usually you don't have to</div><div class='add'>+define these aliases by yourself.</div><div class='add'>+</div><div class='add'>+Only necessary step for auto-loading of OSS modules is to define the</div><div class='add'>+card alias in ``/etc/modprobe.d/alsa.conf``, such as::</div><div class='add'>+</div><div class='add'>+	alias sound-slot-0 snd-emu10k1</div><div class='add'>+</div><div class='add'>+As the second card, define ``sound-slot-1`` as well.</div><div class='add'>+Note that you can't use the aliased name as the target name (i.e.</div><div class='add'>+``alias sound-slot-0 snd-card-0`` doesn't work any more like the old</div><div class='add'>+modutils).</div><div class='add'>+</div><div class='add'>+The currently available OSS configuration is shown in</div><div class='add'>+/proc/asound/oss/sndstat.  This shows in the same syntax of</div><div class='add'>+/dev/sndstat, which is available on the commercial OSS driver.</div><div class='add'>+On ALSA, you can symlink /dev/sndstat to this proc file.</div><div class='add'>+</div><div class='add'>+Please note that the devices listed in this proc file appear only</div><div class='add'>+after the corresponding OSS-emulation module is loaded.  Don't worry</div><div class='add'>+even if "NOT ENABLED IN CONFIG" is shown in it.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Device Mapping</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+ALSA supports the following OSS device files:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	PCM:</div><div class='add'>+		/dev/dspX</div><div class='add'>+		/dev/adspX</div><div class='add'>+</div><div class='add'>+	Mixer:</div><div class='add'>+		/dev/mixerX</div><div class='add'>+</div><div class='add'>+	MIDI:</div><div class='add'>+		/dev/midi0X</div><div class='add'>+		/dev/amidi0X</div><div class='add'>+</div><div class='add'>+	Sequencer:</div><div class='add'>+		/dev/sequencer</div><div class='add'>+		/dev/sequencer2 (aka /dev/music)</div><div class='add'>+</div><div class='add'>+where X is the card number from 0 to 7.</div><div class='add'>+</div><div class='add'>+(NOTE: Some distributions have the device files like /dev/midi0 and</div><div class='add'>+/dev/midi1.  They are NOT for OSS but for tclmidi, which is</div><div class='add'>+a totally different thing.)</div><div class='add'>+</div><div class='add'>+Unlike the real OSS, ALSA cannot use the device files more than the</div><div class='add'>+assigned ones.  For example, the first card cannot use /dev/dsp1 or</div><div class='add'>+/dev/dsp2, but only /dev/dsp0 and /dev/adsp0.</div><div class='add'>+</div><div class='add'>+As seen above, PCM and MIDI may have two devices.  Usually, the first</div><div class='add'>+PCM device (``hw:0,0`` in ALSA) is mapped to /dev/dsp and the secondary</div><div class='add'>+device (``hw:0,1``) to /dev/adsp (if available).  For MIDI, /dev/midi and</div><div class='add'>+/dev/amidi, respectively.</div><div class='add'>+</div><div class='add'>+You can change this device mapping via the module options of</div><div class='add'>+snd-pcm-oss and snd-rawmidi.  In the case of PCM, the following</div><div class='add'>+options are available for snd-pcm-oss:</div><div class='add'>+</div><div class='add'>+dsp_map</div><div class='add'>+	PCM device number assigned to /dev/dspX</div><div class='add'>+	(default = 0)</div><div class='add'>+adsp_map</div><div class='add'>+	PCM device number assigned to /dev/adspX</div><div class='add'>+	(default = 1)</div><div class='add'>+</div><div class='add'>+For example, to map the third PCM device (``hw:0,2``) to /dev/adsp0,</div><div class='add'>+define like this:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	options snd-pcm-oss adsp_map=2</div><div class='add'>+</div><div class='add'>+The options take arrays.  For configuring the second card, specify</div><div class='add'>+two entries separated by comma.  For example, to map the third PCM</div><div class='add'>+device on the second card to /dev/adsp1, define like below:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	options snd-pcm-oss adsp_map=0,2</div><div class='add'>+</div><div class='add'>+To change the mapping of MIDI devices, the following options are</div><div class='add'>+available for snd-rawmidi:</div><div class='add'>+</div><div class='add'>+midi_map</div><div class='add'>+	MIDI device number assigned to /dev/midi0X</div><div class='add'>+	(default = 0)</div><div class='add'>+amidi_map</div><div class='add'>+	MIDI device number assigned to /dev/amidi0X</div><div class='add'>+	(default = 1)</div><div class='add'>+</div><div class='add'>+For example, to assign the third MIDI device on the first card to</div><div class='add'>+/dev/midi00, define as follows:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	options snd-rawmidi midi_map=2</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PCM Mode</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+As default, ALSA emulates the OSS PCM with so-called plugin layer,</div><div class='add'>+i.e. tries to convert the sample format, rate or channels</div><div class='add'>+automatically when the card doesn't support it natively.</div><div class='add'>+This will lead to some problems for some applications like quake or</div><div class='add'>+wine, especially if they use the card only in the MMAP mode.</div><div class='add'>+</div><div class='add'>+In such a case, you can change the behavior of PCM per application by</div><div class='add'>+writing a command to the proc file.  There is a proc file for each PCM</div><div class='add'>+stream, ``/proc/asound/cardX/pcmY[cp]/oss``, where X is the card number</div><div class='add'>+(zero-based), Y the PCM device number (zero-based), and ``p`` is for</div><div class='add'>+playback and ``c`` for capture, respectively.  Note that this proc file</div><div class='add'>+exists only after snd-pcm-oss module is loaded.</div><div class='add'>+</div><div class='add'>+The command sequence has the following syntax:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	app_name fragments fragment_size [options]</div><div class='add'>+</div><div class='add'>+``app_name`` is the name of application with (higher priority) or without</div><div class='add'>+path.</div><div class='add'>+``fragments`` specifies the number of fragments or zero if no specific</div><div class='add'>+number is given.</div><div class='add'>+``fragment_size`` is the size of fragment in bytes or zero if not given.</div><div class='add'>+``options`` is the optional parameters.  The following options are</div><div class='add'>+available:</div><div class='add'>+</div><div class='add'>+disable</div><div class='add'>+	the application tries to open a pcm device for</div><div class='add'>+	this channel but does not want to use it.</div><div class='add'>+direct</div><div class='add'>+	don't use plugins</div><div class='add'>+block</div><div class='add'>+	force block open mode</div><div class='add'>+non-block</div><div class='add'>+	force non-block open mode</div><div class='add'>+partial-frag</div><div class='add'>+	write also partial fragments (affects playback only)</div><div class='add'>+no-silence</div><div class='add'>+	do not fill silence ahead to avoid clicks</div><div class='add'>+</div><div class='add'>+The ``disable`` option is useful when one stream direction (playback or</div><div class='add'>+capture) is not handled correctly by the application although the</div><div class='add'>+hardware itself does support both directions.</div><div class='add'>+The ``direct`` option is used, as mentioned above, to bypass the automatic</div><div class='add'>+conversion and useful for MMAP-applications.</div><div class='add'>+For example, to playback the first PCM device without plugins for</div><div class='add'>+quake, send a command via echo like the following:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	% echo "quake 0 0 direct" &gt; /proc/asound/card0/pcm0p/oss</div><div class='add'>+</div><div class='add'>+While quake wants only playback, you may append the second command</div><div class='add'>+to notify driver that only this direction is about to be allocated:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	% echo "quake 0 0 disable" &gt; /proc/asound/card0/pcm0c/oss</div><div class='add'>+</div><div class='add'>+The permission of proc files depend on the module options of snd.</div><div class='add'>+As default it's set as root, so you'll likely need to be superuser for</div><div class='add'>+sending the command above.</div><div class='add'>+</div><div class='add'>+The block and non-block options are used to change the behavior of</div><div class='add'>+opening the device file.</div><div class='add'>+</div><div class='add'>+As default, ALSA behaves as original OSS drivers, i.e. does not block</div><div class='add'>+the file when it's busy. The -EBUSY error is returned in this case.</div><div class='add'>+</div><div class='add'>+This blocking behavior can be changed globally via nonblock_open</div><div class='add'>+module option of snd-pcm-oss.  For using the blocking mode as default</div><div class='add'>+for OSS devices, define like the following:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	options snd-pcm-oss nonblock_open=0</div><div class='add'>+</div><div class='add'>+The ``partial-frag`` and ``no-silence`` commands have been added recently.</div><div class='add'>+Both commands are for optimization use only.  The former command</div><div class='add'>+specifies to invoke the write transfer only when the whole fragment is</div><div class='add'>+filled.  The latter stops writing the silence data ahead</div><div class='add'>+automatically.  Both are disabled as default.</div><div class='add'>+</div><div class='add'>+You can check the currently defined configuration by reading the proc</div><div class='add'>+file.  The read image can be sent to the proc file again, hence you</div><div class='add'>+can save the current configuration</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	% cat /proc/asound/card0/pcm0p/oss &gt; /somewhere/oss-cfg</div><div class='add'>+</div><div class='add'>+and restore it like</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	% cat /somewhere/oss-cfg &gt; /proc/asound/card0/pcm0p/oss</div><div class='add'>+</div><div class='add'>+Also, for clearing all the current configuration, send ``erase`` command</div><div class='add'>+as below:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	% echo "erase" &gt; /proc/asound/card0/pcm0p/oss</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Mixer Elements</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+Since ALSA has completely different mixer interface, the emulation of</div><div class='add'>+OSS mixer is relatively complicated.  ALSA builds up a mixer element</div><div class='add'>+from several different ALSA (mixer) controls based on the name</div><div class='add'>+string.  For example, the volume element SOUND_MIXER_PCM is composed</div><div class='add'>+from "PCM Playback Volume" and "PCM Playback Switch" controls for the</div><div class='add'>+playback direction and from "PCM Capture Volume" and "PCM Capture</div><div class='add'>+Switch" for the capture directory (if exists).  When the PCM volume of</div><div class='add'>+OSS is changed, all the volume and switch controls above are adjusted</div><div class='add'>+automatically.</div><div class='add'>+</div><div class='add'>+As default, ALSA uses the following control for OSS volumes:</div><div class='add'>+</div><div class='add'>+====================	=====================	=====</div><div class='add'>+OSS volume		ALSA control		Index</div><div class='add'>+====================	=====================	=====</div><div class='add'>+SOUND_MIXER_VOLUME 	Master			0</div><div class='add'>+SOUND_MIXER_BASS	Tone Control - Bass	0</div><div class='add'>+SOUND_MIXER_TREBLE	Tone Control - Treble	0</div><div class='add'>+SOUND_MIXER_SYNTH	Synth			0</div><div class='add'>+SOUND_MIXER_PCM		PCM			0</div><div class='add'>+SOUND_MIXER_SPEAKER	PC Speaker 		0</div><div class='add'>+SOUND_MIXER_LINE	Line			0</div><div class='add'>+SOUND_MIXER_MIC		Mic 			0</div><div class='add'>+SOUND_MIXER_CD		CD 			0</div><div class='add'>+SOUND_MIXER_IMIX	Monitor Mix 		0</div><div class='add'>+SOUND_MIXER_ALTPCM	PCM			1</div><div class='add'>+SOUND_MIXER_RECLEV	(not assigned)</div><div class='add'>+SOUND_MIXER_IGAIN	Capture			0</div><div class='add'>+SOUND_MIXER_OGAIN	Playback		0</div><div class='add'>+SOUND_MIXER_LINE1	Aux			0</div><div class='add'>+SOUND_MIXER_LINE2	Aux			1</div><div class='add'>+SOUND_MIXER_LINE3	Aux			2</div><div class='add'>+SOUND_MIXER_DIGITAL1	Digital			0</div><div class='add'>+SOUND_MIXER_DIGITAL2	Digital			1</div><div class='add'>+SOUND_MIXER_DIGITAL3	Digital			2</div><div class='add'>+SOUND_MIXER_PHONEIN	Phone			0</div><div class='add'>+SOUND_MIXER_PHONEOUT	Phone			1</div><div class='add'>+SOUND_MIXER_VIDEO	Video			0</div><div class='add'>+SOUND_MIXER_RADIO	Radio			0</div><div class='add'>+SOUND_MIXER_MONITOR	Monitor			0</div><div class='add'>+====================	=====================	=====</div><div class='add'>+</div><div class='add'>+The second column is the base-string of the corresponding ALSA</div><div class='add'>+control.  In fact, the controls with ``XXX [Playback|Capture]</div><div class='add'>+[Volume|Switch]`` will be checked in addition.</div><div class='add'>+</div><div class='add'>+The current assignment of these mixer elements is listed in the proc</div><div class='add'>+file, /proc/asound/cardX/oss_mixer, which will be like the following</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	VOLUME "Master" 0</div><div class='add'>+	BASS "" 0</div><div class='add'>+	TREBLE "" 0</div><div class='add'>+	SYNTH "" 0</div><div class='add'>+	PCM "PCM" 0</div><div class='add'>+	...</div><div class='add'>+</div><div class='add'>+where the first column is the OSS volume element, the second column</div><div class='add'>+the base-string of the corresponding ALSA control, and the third the</div><div class='add'>+control index.  When the string is empty, it means that the</div><div class='add'>+corresponding OSS control is not available.</div><div class='add'>+</div><div class='add'>+For changing the assignment, you can write the configuration to this</div><div class='add'>+proc file.  For example, to map "Wave Playback" to the PCM volume,</div><div class='add'>+send the command like the following:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	% echo 'VOLUME "Wave Playback" 0' &gt; /proc/asound/card0/oss_mixer</div><div class='add'>+</div><div class='add'>+The command is exactly as same as listed in the proc file.  You can</div><div class='add'>+change one or more elements, one volume per line.  In the last</div><div class='add'>+example, both "Wave Playback Volume" and "Wave Playback Switch" will</div><div class='add'>+be affected when PCM volume is changed.</div><div class='add'>+</div><div class='add'>+Like the case of PCM proc file, the permission of proc files depend on</div><div class='add'>+the module options of snd.  you'll likely need to be superuser for</div><div class='add'>+sending the command above.</div><div class='add'>+</div><div class='add'>+As well as in the case of PCM proc file, you can save and restore the</div><div class='add'>+current mixer configuration by reading and writing the whole file</div><div class='add'>+image.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Duplex Streams</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+Note that when attempting to use a single device file for playback and</div><div class='add'>+capture, the OSS API provides no way to set the format, sample rate or</div><div class='add'>+number of channels different in each direction.  Thus</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	io_handle = open("device", O_RDWR)</div><div class='add'>+</div><div class='add'>+will only function correctly if the values are the same in each direction.</div><div class='add'>+</div><div class='add'>+To use different values in the two directions, use both</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	input_handle = open("device", O_RDONLY)</div><div class='add'>+	output_handle = open("device", O_WRONLY)</div><div class='add'>+</div><div class='add'>+and set the values for the corresponding handle.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Unsupported Features</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+MMAP on ICE1712 driver</div><div class='add'>+----------------------</div><div class='add'>+ICE1712 supports only the unconventional format, interleaved</div><div class='add'>+10-channels 24bit (packed in 32bit) format.  Therefore you cannot mmap</div><div class='add'>+the buffer as the conventional (mono or 2-channels, 8 or 16bit) format</div><div class='add'>+on OSS.</div><div class='head'>diff --git a/Documentation/sound/designs/powersave.rst b/Documentation/sound/designs/powersave.rst<br/>new file mode 100644<br/>index 000000000000..138157452eb9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/designs/powersave.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/powersave.rst</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+==========================</div><div class='add'>+Notes on Power-Saving Mode</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+AC97 and HD-audio drivers have the automatic power-saving mode.</div><div class='add'>+This feature is enabled via Kconfig ``CONFIG_SND_AC97_POWER_SAVE``</div><div class='add'>+and ``CONFIG_SND_HDA_POWER_SAVE`` options, respectively.</div><div class='add'>+</div><div class='add'>+With the automatic power-saving, the driver turns off the codec power</div><div class='add'>+appropriately when no operation is required.  When no applications use</div><div class='add'>+the device and/or no analog loopback is set, the power disablement is</div><div class='add'>+done fully or partially.  It'll save a certain power consumption, thus</div><div class='add'>+good for laptops (even for desktops).</div><div class='add'>+</div><div class='add'>+The time-out for automatic power-off can be specified via ``power_save``</div><div class='add'>+module option of snd-ac97-codec and snd-hda-intel modules.  Specify</div><div class='add'>+the time-out value in seconds.  0 means to disable the automatic</div><div class='add'>+power-saving.  The default value of timeout is given via</div><div class='add'>+``CONFIG_SND_AC97_POWER_SAVE_DEFAULT`` and</div><div class='add'>+``CONFIG_SND_HDA_POWER_SAVE_DEFAULT`` Kconfig options.  Setting this to 1</div><div class='add'>+(the minimum value) isn't recommended because many applications try to</div><div class='add'>+reopen the device frequently.  10 would be a good choice for normal</div><div class='add'>+operations.</div><div class='add'>+</div><div class='add'>+The ``power_save`` option is exported as writable.  This means you can</div><div class='add'>+adjust the value via sysfs on the fly.  For example, to turn on the</div><div class='add'>+automatic power-save mode with 10 seconds, write to</div><div class='add'>+``/sys/modules/snd_ac97_codec/parameters/power_save`` (usually as root):</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	# echo 10 &gt; /sys/modules/snd_ac97_codec/parameters/power_save</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Note that you might hear click noise/pop when changing the power</div><div class='add'>+state.  Also, it often takes certain time to wake up from the</div><div class='add'>+power-down to the active state.  These are often hardly to fix, so</div><div class='add'>+don't report extra bug reports unless you have a fix patch ;-)</div><div class='add'>+</div><div class='add'>+For HD-audio interface, there is another module option,</div><div class='add'>+power_save_controller.  This enables/disables the power-save mode of</div><div class='add'>+the controller side.  Setting this on may reduce a bit more power</div><div class='add'>+consumption, but might result in longer wake-up time and click noise.</div><div class='add'>+Try to turn it off when you experience such a thing too often.</div><div class='head'>diff --git a/Documentation/sound/designs/procfile.rst b/Documentation/sound/designs/procfile.rst<br/>new file mode 100644<br/>index 000000000000..29a466851fd2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/designs/procfile.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/procfile.rst</a></div><div class='hunk'>@@ -0,0 +1,238 @@</div><div class='add'>+==========================</div><div class='add'>+Proc Files of ALSA Drivers</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+</div><div class='add'>+General</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+ALSA has its own proc tree, /proc/asound.  Many useful information are</div><div class='add'>+found in this tree.  When you encounter a problem and need debugging,</div><div class='add'>+check the files listed in the following sections.</div><div class='add'>+</div><div class='add'>+Each card has its subtree cardX, where X is from 0 to 7. The</div><div class='add'>+card-specific files are stored in the ``card*`` subdirectories.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Global Information</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+cards</div><div class='add'>+	Shows the list of currently configured ALSA drivers,</div><div class='add'>+	index, the id string, short and long descriptions.</div><div class='add'>+</div><div class='add'>+version</div><div class='add'>+	Shows the version string and compile date.</div><div class='add'>+</div><div class='add'>+modules</div><div class='add'>+	Lists the module of each card</div><div class='add'>+</div><div class='add'>+devices</div><div class='add'>+	Lists the ALSA native device mappings.</div><div class='add'>+</div><div class='add'>+meminfo</div><div class='add'>+	Shows the status of allocated pages via ALSA drivers.</div><div class='add'>+	Appears only when ``CONFIG_SND_DEBUG=y``.</div><div class='add'>+</div><div class='add'>+hwdep</div><div class='add'>+	Lists the currently available hwdep devices in format of</div><div class='add'>+	``&lt;card&gt;-&lt;device&gt;: &lt;name&gt;``</div><div class='add'>+</div><div class='add'>+pcm</div><div class='add'>+	Lists the currently available PCM devices in format of</div><div class='add'>+	``&lt;card&gt;-&lt;device&gt;: &lt;id&gt;: &lt;name&gt; : &lt;sub-streams&gt;``</div><div class='add'>+</div><div class='add'>+timer</div><div class='add'>+	Lists the currently available timer devices</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+oss/devices</div><div class='add'>+	Lists the OSS device mappings.</div><div class='add'>+</div><div class='add'>+oss/sndstat</div><div class='add'>+	Provides the output compatible with /dev/sndstat.</div><div class='add'>+	You can symlink this to /dev/sndstat.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Card Specific Files</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+The card-specific files are found in ``/proc/asound/card*`` directories.</div><div class='add'>+Some drivers (e.g. cmipci) have their own proc entries for the</div><div class='add'>+register dump, etc (e.g. ``/proc/asound/card*/cmipci`` shows the register</div><div class='add'>+dump).  These files would be really helpful for debugging.</div><div class='add'>+</div><div class='add'>+When PCM devices are available on this card, you can see directories</div><div class='add'>+like pcm0p or pcm1c.  They hold the PCM information for each PCM</div><div class='add'>+stream.  The number after ``pcm`` is the PCM device number from 0, and</div><div class='add'>+the last ``p`` or ``c`` means playback or capture direction.  The files in</div><div class='add'>+this subtree is described later.</div><div class='add'>+</div><div class='add'>+The status of MIDI I/O is found in ``midi*`` files.  It shows the device</div><div class='add'>+name and the received/transmitted bytes through the MIDI device.</div><div class='add'>+</div><div class='add'>+When the card is equipped with AC97 codecs, there are ``codec97#*``</div><div class='add'>+subdirectories (described later).</div><div class='add'>+</div><div class='add'>+When the OSS mixer emulation is enabled (and the module is loaded),</div><div class='add'>+oss_mixer file appears here, too.  This shows the current mapping of</div><div class='add'>+OSS mixer elements to the ALSA control elements.  You can change the</div><div class='add'>+mapping by writing to this device.  Read OSS-Emulation.txt for</div><div class='add'>+details.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PCM Proc Files</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+``card*/pcm*/info``</div><div class='add'>+	The general information of this PCM device: card #, device #,</div><div class='add'>+	substreams, etc.</div><div class='add'>+</div><div class='add'>+``card*/pcm*/xrun_debug``</div><div class='add'>+	This file appears when ``CONFIG_SND_DEBUG=y`` and</div><div class='add'>+	``CONFIG_PCM_XRUN_DEBUG=y``.</div><div class='add'>+	This shows the status of xrun (= buffer overrun/xrun) and</div><div class='add'>+	invalid PCM position debug/check of ALSA PCM middle layer.</div><div class='add'>+	It takes an integer value, can be changed by writing to this</div><div class='add'>+	file, such as::</div><div class='add'>+</div><div class='add'>+		 # echo 5 &gt; /proc/asound/card0/pcm0p/xrun_debug</div><div class='add'>+</div><div class='add'>+	The value consists of the following bit flags:</div><div class='add'>+</div><div class='add'>+	* bit 0 = Enable XRUN/jiffies debug messages</div><div class='add'>+	* bit 1 = Show stack trace at XRUN / jiffies check</div><div class='add'>+	* bit 2 = Enable additional jiffies check</div><div class='add'>+</div><div class='add'>+	When the bit 0 is set, the driver will show the messages to</div><div class='add'>+	kernel log when an xrun is detected.  The debug message is</div><div class='add'>+	shown also when the invalid H/W pointer is detected at the</div><div class='add'>+	update of periods (usually called from the interrupt</div><div class='add'>+	handler).</div><div class='add'>+</div><div class='add'>+	When the bit 1 is set, the driver will show the stack trace</div><div class='add'>+	additionally.  This may help the debugging.</div><div class='add'>+</div><div class='add'>+	Since 2.6.30, this option can enable the hwptr check using</div><div class='add'>+	jiffies.  This detects spontaneous invalid pointer callback</div><div class='add'>+	values, but can be lead to too much corrections for a (mostly</div><div class='add'>+	buggy) hardware that doesn't give smooth pointer updates.</div><div class='add'>+	This feature is enabled via the bit 2.</div><div class='add'>+</div><div class='add'>+``card*/pcm*/sub*/info``</div><div class='add'>+	The general information of this PCM sub-stream.</div><div class='add'>+</div><div class='add'>+``card*/pcm*/sub*/status``</div><div class='add'>+	The current status of this PCM sub-stream, elapsed time,</div><div class='add'>+	H/W position, etc.</div><div class='add'>+</div><div class='add'>+``card*/pcm*/sub*/hw_params``</div><div class='add'>+	The hardware parameters set for this sub-stream.</div><div class='add'>+</div><div class='add'>+``card*/pcm*/sub*/sw_params``</div><div class='add'>+	The soft parameters set for this sub-stream.</div><div class='add'>+</div><div class='add'>+``card*/pcm*/sub*/prealloc``</div><div class='add'>+	The buffer pre-allocation information.</div><div class='add'>+</div><div class='add'>+``card*/pcm*/sub*/xrun_injection``</div><div class='add'>+	Triggers an XRUN to the running stream when any value is</div><div class='add'>+	written to this proc file.  Used for fault injection.</div><div class='add'>+	This entry is write-only.</div><div class='add'>+</div><div class='add'>+AC97 Codec Information</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+``card*/codec97#*/ac97#?-?``</div><div class='add'>+	Shows the general information of this AC97 codec chip, such as</div><div class='add'>+	name, capabilities, set up.</div><div class='add'>+</div><div class='add'>+``card*/codec97#0/ac97#?-?+regs``</div><div class='add'>+	Shows the AC97 register dump.  Useful for debugging.</div><div class='add'>+</div><div class='add'>+	When CONFIG_SND_DEBUG is enabled, you can write to this file for</div><div class='add'>+	changing an AC97 register directly.  Pass two hex numbers.</div><div class='add'>+	For example,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	# echo 02 9f1f &gt; /proc/asound/card0/codec97#0/ac97#0-0+regs</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+USB Audio Streams</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+``card*/stream*``</div><div class='add'>+	Shows the assignment and the current status of each audio stream</div><div class='add'>+	of the given card.  This information is very useful for debugging.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+HD-Audio Codecs</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+``card*/codec#*``</div><div class='add'>+	Shows the general codec information and the attribute of each</div><div class='add'>+	widget node.</div><div class='add'>+</div><div class='add'>+``card*/eld#*``</div><div class='add'>+	Available for HDMI or DisplayPort interfaces.</div><div class='add'>+	Shows ELD(EDID Like Data) info retrieved from the attached HDMI sink,</div><div class='add'>+	and describes its audio capabilities and configurations.</div><div class='add'>+</div><div class='add'>+	Some ELD fields may be modified by doing ``echo name hex_value &gt; eld#*``.</div><div class='add'>+	Only do this if you are sure the HDMI sink provided value is wrong.</div><div class='add'>+	And if that makes your HDMI audio work, please report to us so that we</div><div class='add'>+	can fix it in future kernel releases.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Sequencer Information</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+seq/drivers</div><div class='add'>+	Lists the currently available ALSA sequencer drivers.</div><div class='add'>+</div><div class='add'>+seq/clients</div><div class='add'>+	Shows the list of currently available sequencer clients and</div><div class='add'>+	ports.  The connection status and the running status are shown</div><div class='add'>+	in this file, too.</div><div class='add'>+</div><div class='add'>+seq/queues</div><div class='add'>+	Lists the currently allocated/running sequencer queues.</div><div class='add'>+</div><div class='add'>+seq/timer</div><div class='add'>+	Lists the currently allocated/running sequencer timers.</div><div class='add'>+</div><div class='add'>+seq/oss</div><div class='add'>+	Lists the OSS-compatible sequencer stuffs.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Help For Debugging?</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+When the problem is related with PCM, first try to turn on xrun_debug</div><div class='add'>+mode.  This will give you the kernel messages when and where xrun</div><div class='add'>+happened.</div><div class='add'>+</div><div class='add'>+If it's really a bug, report it with the following information:</div><div class='add'>+</div><div class='add'>+- the name of the driver/card, show in ``/proc/asound/cards``</div><div class='add'>+- the register dump, if available (e.g. ``card*/cmipci``)</div><div class='add'>+</div><div class='add'>+when it's a PCM problem,</div><div class='add'>+</div><div class='add'>+- set-up of PCM, shown in hw_parms, sw_params, and status in the PCM</div><div class='add'>+  sub-stream directory</div><div class='add'>+</div><div class='add'>+when it's a mixer problem,</div><div class='add'>+</div><div class='add'>+- AC97 proc files, ``codec97#*/*`` files</div><div class='add'>+</div><div class='add'>+for USB audio/midi,</div><div class='add'>+</div><div class='add'>+- output of ``lsusb -v``</div><div class='add'>+- ``stream*`` files in card directory</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The ALSA bug-tracking system is found at:</div><div class='add'>+https://bugtrack.alsa-project.org/alsa-bug/</div><div class='head'>diff --git a/Documentation/sound/designs/seq-oss.rst b/Documentation/sound/designs/seq-oss.rst<br/>new file mode 100644<br/>index 000000000000..e82ffe0e7f43<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/designs/seq-oss.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/seq-oss.rst</a></div><div class='hunk'>@@ -0,0 +1,371 @@</div><div class='add'>+===============================</div><div class='add'>+OSS Sequencer Emulation on ALSA</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+Copyright (c) 1998,1999 by Takashi Iwai</div><div class='add'>+</div><div class='add'>+ver.0.1.8; Nov. 16, 1999</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+This directory contains the OSS sequencer emulation driver on ALSA. Note</div><div class='add'>+that this program is still in the development state.</div><div class='add'>+</div><div class='add'>+What this does - it provides the emulation of the OSS sequencer, access</div><div class='add'>+via ``/dev/sequencer`` and ``/dev/music`` devices.</div><div class='add'>+The most of applications using OSS can run if the appropriate ALSA</div><div class='add'>+sequencer is prepared.</div><div class='add'>+</div><div class='add'>+The following features are emulated by this driver:</div><div class='add'>+</div><div class='add'>+* Normal sequencer and MIDI events:</div><div class='add'>+</div><div class='add'>+    They are converted to the ALSA sequencer events, and sent to the</div><div class='add'>+    corresponding port.</div><div class='add'>+</div><div class='add'>+* Timer events:</div><div class='add'>+</div><div class='add'>+    The timer is not selectable by ioctl. The control rate is fixed to</div><div class='add'>+    100 regardless of HZ. That is, even on Alpha system, a tick is always</div><div class='add'>+    1/100 second. The base rate and tempo can be changed in ``/dev/music``.</div><div class='add'>+</div><div class='add'>+* Patch loading:</div><div class='add'>+</div><div class='add'>+    It purely depends on the synth drivers whether it's supported since</div><div class='add'>+    the patch loading is realized by callback to the synth driver.</div><div class='add'>+</div><div class='add'>+* I/O controls:</div><div class='add'>+</div><div class='add'>+    Most of controls are accepted. Some controls</div><div class='add'>+    are dependent on the synth driver, as well as even on original OSS.</div><div class='add'>+</div><div class='add'>+Furthermore, you can find the following advanced features:</div><div class='add'>+</div><div class='add'>+* Better queue mechanism:</div><div class='add'>+</div><div class='add'>+    The events are queued before processing them.</div><div class='add'>+</div><div class='add'>+* Multiple applications:</div><div class='add'>+</div><div class='add'>+    You can run two or more applications simultaneously (even for OSS</div><div class='add'>+    sequencer)!</div><div class='add'>+    However, each MIDI device is exclusive - that is, if a MIDI device</div><div class='add'>+    is opened once by some application, other applications can't use</div><div class='add'>+    it. No such a restriction in synth devices.</div><div class='add'>+</div><div class='add'>+* Real-time event processing:</div><div class='add'>+</div><div class='add'>+    The events can be processed in real time without using out of bound</div><div class='add'>+    ioctl. To switch to real-time mode, send ABSTIME 0 event. The followed</div><div class='add'>+    events will be processed in real-time without queued. To switch off the</div><div class='add'>+    real-time mode, send RELTIME 0 event.</div><div class='add'>+</div><div class='add'>+* ``/proc`` interface:</div><div class='add'>+</div><div class='add'>+    The status of applications and devices can be shown via</div><div class='add'>+    ``/proc/asound/seq/oss`` at any time. In the later version,</div><div class='add'>+    configuration will be changed via ``/proc`` interface, too.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Installation</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+Run configure script with both sequencer support (``--with-sequencer=yes``)</div><div class='add'>+and OSS emulation (``--with-oss=yes``) options. A module ``snd-seq-oss.o``</div><div class='add'>+will be created. If the synth module of your sound card supports for OSS</div><div class='add'>+emulation (so far, only Emu8000 driver), this module will be loaded</div><div class='add'>+automatically.</div><div class='add'>+Otherwise, you need to load this module manually.</div><div class='add'>+</div><div class='add'>+At beginning, this module probes all the MIDI ports which have been</div><div class='add'>+already connected to the sequencer. Once after that, the creation and deletion</div><div class='add'>+of ports are watched by announcement mechanism of ALSA sequencer.</div><div class='add'>+</div><div class='add'>+The available synth and MIDI devices can be found in proc interface.</div><div class='add'>+Run ``cat /proc/asound/seq/oss``, and check the devices. For example,</div><div class='add'>+if you use an AWE64 card, you'll see like the following:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    OSS sequencer emulation version 0.1.8</div><div class='add'>+    ALSA client number 63</div><div class='add'>+    ALSA receiver port 0</div><div class='add'>+</div><div class='add'>+    Number of applications: 0</div><div class='add'>+</div><div class='add'>+    Number of synth devices: 1</div><div class='add'>+    synth 0: [EMU8000]</div><div class='add'>+      type 0x1 : subtype 0x20 : voices 32</div><div class='add'>+      capabilties : ioctl enabled / load_patch enabled</div><div class='add'>+</div><div class='add'>+    Number of MIDI devices: 3</div><div class='add'>+    midi 0: [Emu8000 Port-0] ALSA port 65:0</div><div class='add'>+      capability write / opened none</div><div class='add'>+</div><div class='add'>+    midi 1: [Emu8000 Port-1] ALSA port 65:1</div><div class='add'>+      capability write / opened none</div><div class='add'>+</div><div class='add'>+    midi 2: [0: MPU-401 (UART)] ALSA port 64:0</div><div class='add'>+      capability read/write / opened none</div><div class='add'>+</div><div class='add'>+Note that the device number may be different from the information of</div><div class='add'>+``/proc/asound/oss-devices`` or ones of the original OSS driver.</div><div class='add'>+Use the device number listed in ``/proc/asound/seq/oss``</div><div class='add'>+to play via OSS sequencer emulation.</div><div class='add'>+</div><div class='add'>+Using Synthesizer Devices</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+Run your favorite program. I've tested playmidi-2.4, awemidi-0.4.3, gmod-3.1</div><div class='add'>+and xmp-1.1.5. You can load samples via ``/dev/sequencer`` like sfxload,</div><div class='add'>+too.</div><div class='add'>+</div><div class='add'>+If the lowlevel driver supports multiple access to synth devices (like</div><div class='add'>+Emu8000 driver), two or more applications are allowed to run at the same</div><div class='add'>+time.</div><div class='add'>+</div><div class='add'>+Using MIDI Devices</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+So far, only MIDI output was tested. MIDI input was not checked at all,</div><div class='add'>+but hopefully it will work. Use the device number listed in</div><div class='add'>+``/proc/asound/seq/oss``.</div><div class='add'>+Be aware that these numbers are mostly different from the list in</div><div class='add'>+``/proc/asound/oss-devices``.</div><div class='add'>+</div><div class='add'>+Module Options</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+The following module options are available:</div><div class='add'>+</div><div class='add'>+maxqlen</div><div class='add'>+  specifies the maximum read/write queue length. This queue is private</div><div class='add'>+  for OSS sequencer, so that it is independent from the queue length of ALSA</div><div class='add'>+  sequencer. Default value is 1024.</div><div class='add'>+</div><div class='add'>+seq_oss_debug</div><div class='add'>+  specifies the debug level and accepts zero (= no debug message) or</div><div class='add'>+  positive integer. Default value is 0.</div><div class='add'>+</div><div class='add'>+Queue Mechanism</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+OSS sequencer emulation uses an ALSA priority queue. The</div><div class='add'>+events from ``/dev/sequencer`` are processed and put onto the queue</div><div class='add'>+specified by module option.</div><div class='add'>+</div><div class='add'>+All the events from ``/dev/sequencer`` are parsed at beginning.</div><div class='add'>+The timing events are also parsed at this moment, so that the events may</div><div class='add'>+be processed in real-time. Sending an event ABSTIME 0 switches the operation</div><div class='add'>+mode to real-time mode, and sending an event RELTIME 0 switches it off.</div><div class='add'>+In the real-time mode, all events are dispatched immediately.</div><div class='add'>+</div><div class='add'>+The queued events are dispatched to the corresponding ALSA sequencer</div><div class='add'>+ports after scheduled time by ALSA sequencer dispatcher.</div><div class='add'>+</div><div class='add'>+If the write-queue is full, the application sleeps until a certain amount</div><div class='add'>+(as default one half) becomes empty in blocking mode. The synchronization</div><div class='add'>+to write timing was implemented, too.</div><div class='add'>+</div><div class='add'>+The input from MIDI devices or echo-back events are stored on read FIFO</div><div class='add'>+queue. If application reads ``/dev/sequencer`` in blocking mode, the</div><div class='add'>+process will be awaked.</div><div class='add'>+</div><div class='add'>+Interface to Synthesizer Device</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+Registration</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+To register an OSS synthesizer device, use snd_seq_oss_synth_register()</div><div class='add'>+function:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  int snd_seq_oss_synth_register(char *name, int type, int subtype, int nvoices,</div><div class='add'>+          snd_seq_oss_callback_t *oper, void *private_data)</div><div class='add'>+</div><div class='add'>+The arguments ``name``, ``type``, ``subtype`` and ``nvoices``</div><div class='add'>+are used for making the appropriate synth_info structure for ioctl. The</div><div class='add'>+return value is an index number of this device. This index must be remembered</div><div class='add'>+for unregister. If registration is failed, -errno will be returned.</div><div class='add'>+</div><div class='add'>+To release this device, call snd_seq_oss_synth_unregister() function:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  int snd_seq_oss_synth_unregister(int index)</div><div class='add'>+</div><div class='add'>+where the ``index`` is the index number returned by register function.</div><div class='add'>+</div><div class='add'>+Callbacks</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+OSS synthesizer devices have capability for sample downloading and ioctls</div><div class='add'>+like sample reset. In OSS emulation, these special features are realized</div><div class='add'>+by using callbacks. The registration argument oper is used to specify these</div><div class='add'>+callbacks. The following callback functions must be defined:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_seq_oss_callback_t:</div><div class='add'>+   int (*open)(snd_seq_oss_arg_t *p, void *closure);</div><div class='add'>+   int (*close)(snd_seq_oss_arg_t *p);</div><div class='add'>+   int (*ioctl)(snd_seq_oss_arg_t *p, unsigned int cmd, unsigned long arg);</div><div class='add'>+   int (*load_patch)(snd_seq_oss_arg_t *p, int format, const char *buf, int offs, int count);</div><div class='add'>+   int (*reset)(snd_seq_oss_arg_t *p);</div><div class='add'>+</div><div class='add'>+Except for ``open`` and ``close`` callbacks, they are allowed to be NULL.</div><div class='add'>+</div><div class='add'>+Each callback function takes the argument type ``snd_seq_oss_arg_t`` as the</div><div class='add'>+first argument.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_seq_oss_arg_t {</div><div class='add'>+      int app_index;</div><div class='add'>+      int file_mode;</div><div class='add'>+      int seq_mode;</div><div class='add'>+      snd_seq_addr_t addr;</div><div class='add'>+      void *private_data;</div><div class='add'>+      int event_passing;</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+The first three fields, ``app_index``, ``file_mode`` and ``seq_mode``</div><div class='add'>+are initialized by OSS sequencer. The ``app_index`` is the application</div><div class='add'>+index which is unique to each application opening OSS sequencer. The</div><div class='add'>+``file_mode`` is bit-flags indicating the file operation mode. See</div><div class='add'>+``seq_oss.h`` for its meaning. The ``seq_mode`` is sequencer operation</div><div class='add'>+mode. In the current version, only ``SND_OSSSEQ_MODE_SYNTH`` is used.</div><div class='add'>+</div><div class='add'>+The next two fields, ``addr`` and ``private_data``, must be</div><div class='add'>+filled by the synth driver at open callback. The ``addr`` contains</div><div class='add'>+the address of ALSA sequencer port which is assigned to this device. If</div><div class='add'>+the driver allocates memory for ``private_data``, it must be released</div><div class='add'>+in close callback by itself.</div><div class='add'>+</div><div class='add'>+The last field, ``event_passing``, indicates how to translate note-on</div><div class='add'>+/ off events. In ``PROCESS_EVENTS`` mode, the note 255 is regarded</div><div class='add'>+as velocity change, and key pressure event is passed to the port. In</div><div class='add'>+``PASS_EVENTS`` mode, all note on/off events are passed to the port</div><div class='add'>+without modified. ``PROCESS_KEYPRESS`` mode checks the note above 128</div><div class='add'>+and regards it as key pressure event (mainly for Emu8000 driver).</div><div class='add'>+</div><div class='add'>+Open Callback</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+The ``open`` is called at each time this device is opened by an application</div><div class='add'>+using OSS sequencer. This must not be NULL. Typically, the open callback</div><div class='add'>+does the following procedure:</div><div class='add'>+</div><div class='add'>+#. Allocate private data record.</div><div class='add'>+#. Create an ALSA sequencer port.</div><div class='add'>+#. Set the new port address on ``arg-&gt;addr``.</div><div class='add'>+#. Set the private data record pointer on ``arg-&gt;private_data``.</div><div class='add'>+</div><div class='add'>+Note that the type bit-flags in port_info of this synth port must NOT contain</div><div class='add'>+``TYPE_MIDI_GENERIC``</div><div class='add'>+bit. Instead, ``TYPE_SPECIFIC`` should be used. Also, ``CAP_SUBSCRIPTION``</div><div class='add'>+bit should NOT be included, too. This is necessary to tell it from other</div><div class='add'>+normal MIDI devices. If the open procedure succeeded, return zero. Otherwise,</div><div class='add'>+return -errno.</div><div class='add'>+</div><div class='add'>+Ioctl Callback</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+The ``ioctl`` callback is called when the sequencer receives device-specific</div><div class='add'>+ioctls. The following two ioctls should be processed by this callback:</div><div class='add'>+</div><div class='add'>+IOCTL_SEQ_RESET_SAMPLES</div><div class='add'>+    reset all samples on memory -- return 0</div><div class='add'>+</div><div class='add'>+IOCTL_SYNTH_MEMAVL</div><div class='add'>+    return the available memory size</div><div class='add'>+</div><div class='add'>+FM_4OP_ENABLE</div><div class='add'>+    can be ignored usually</div><div class='add'>+</div><div class='add'>+The other ioctls are processed inside the sequencer without passing to</div><div class='add'>+the lowlevel driver.</div><div class='add'>+</div><div class='add'>+Load_Patch Callback</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+The ``load_patch`` callback is used for sample-downloading. This callback</div><div class='add'>+must read the data on user-space and transfer to each device. Return 0</div><div class='add'>+if succeeded, and -errno if failed. The format argument is the patch key</div><div class='add'>+in patch_info record. The buf is user-space pointer where patch_info record</div><div class='add'>+is stored. The offs can be ignored. The count is total data size of this</div><div class='add'>+sample data.</div><div class='add'>+</div><div class='add'>+Close Callback</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+The ``close`` callback is called when this device is closed by the</div><div class='add'>+application. If any private data was allocated in open callback, it must</div><div class='add'>+be released in the close callback. The deletion of ALSA port should be</div><div class='add'>+done here, too. This callback must not be NULL.</div><div class='add'>+</div><div class='add'>+Reset Callback</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+The ``reset`` callback is called when sequencer device is reset or</div><div class='add'>+closed by applications. The callback should turn off the sounds on the</div><div class='add'>+relevant port immediately, and initialize the status of the port. If this</div><div class='add'>+callback is undefined, OSS seq sends a ``HEARTBEAT`` event to the</div><div class='add'>+port.</div><div class='add'>+</div><div class='add'>+Events</div><div class='add'>+======</div><div class='add'>+</div><div class='add'>+Most of the events are processed by sequencer and translated to the adequate</div><div class='add'>+ALSA sequencer events, so that each synth device can receive by input_event</div><div class='add'>+callback of ALSA sequencer port. The following ALSA events should be</div><div class='add'>+implemented by the driver:</div><div class='add'>+</div><div class='add'>+=============	===================</div><div class='add'>+ALSA event	Original OSS events</div><div class='add'>+=============	===================</div><div class='add'>+NOTEON		SEQ_NOTEON, MIDI_NOTEON</div><div class='add'>+NOTE		SEQ_NOTEOFF, MIDI_NOTEOFF</div><div class='add'>+KEYPRESS	MIDI_KEY_PRESSURE</div><div class='add'>+CHANPRESS	SEQ_AFTERTOUCH, MIDI_CHN_PRESSURE</div><div class='add'>+PGMCHANGE	SEQ_PGMCHANGE, MIDI_PGM_CHANGE</div><div class='add'>+PITCHBEND	SEQ_CONTROLLER(CTRL_PITCH_BENDER),</div><div class='add'>+		MIDI_PITCH_BEND</div><div class='add'>+CONTROLLER	MIDI_CTL_CHANGE,</div><div class='add'>+		SEQ_BALANCE (with CTL_PAN)</div><div class='add'>+CONTROL14	SEQ_CONTROLLER</div><div class='add'>+REGPARAM	SEQ_CONTROLLER(CTRL_PITCH_BENDER_RANGE)</div><div class='add'>+SYSEX		SEQ_SYSEX</div><div class='add'>+=============	===================</div><div class='add'>+</div><div class='add'>+The most of these behavior can be realized by MIDI emulation driver</div><div class='add'>+included in the Emu8000 lowlevel driver. In the future release, this module</div><div class='add'>+will be independent.</div><div class='add'>+</div><div class='add'>+Some OSS events (``SEQ_PRIVATE`` and ``SEQ_VOLUME`` events) are passed as event</div><div class='add'>+type SND_SEQ_OSS_PRIVATE.  The OSS sequencer passes these event 8 byte</div><div class='add'>+packets without any modification. The lowlevel driver should process these</div><div class='add'>+events appropriately.</div><div class='add'>+</div><div class='add'>+Interface to MIDI Device</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+Since the OSS emulation probes the creation and deletion of ALSA MIDI</div><div class='add'>+sequencer ports automatically by receiving announcement from ALSA</div><div class='add'>+sequencer, the MIDI devices don't need to be registered explicitly</div><div class='add'>+like synth devices.</div><div class='add'>+However, the MIDI port_info registered to ALSA sequencer must include</div><div class='add'>+a group name ``SND_SEQ_GROUP_DEVICE`` and a capability-bit</div><div class='add'>+``CAP_READ`` or ``CAP_WRITE``. Also, subscription capabilities,</div><div class='add'>+``CAP_SUBS_READ`` or ``CAP_SUBS_WRITE``, must be defined, too. If</div><div class='add'>+these conditions are not satisfied, the port is not registered as OSS</div><div class='add'>+sequencer MIDI device.</div><div class='add'>+</div><div class='add'>+The events via MIDI devices are parsed in OSS sequencer and converted</div><div class='add'>+to the corresponding ALSA sequencer events. The input from MIDI sequencer</div><div class='add'>+is also converted to MIDI byte events by OSS sequencer. This works just</div><div class='add'>+a reverse way of seq_midi module.</div><div class='add'>+</div><div class='add'>+Known Problems / TODO's</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+* Patch loading via ALSA instrument layer is not implemented yet.</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/sound/designs/timestamping.rst b/Documentation/sound/designs/timestamping.rst<br/>new file mode 100644<br/>index 000000000000..2b0fff503415<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/designs/timestamping.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/designs/timestamping.rst</a></div><div class='hunk'>@@ -0,0 +1,215 @@</div><div class='add'>+=====================</div><div class='add'>+ALSA PCM Timestamping</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+The ALSA API can provide two different system timestamps:</div><div class='add'>+</div><div class='add'>+- Trigger_tstamp is the system time snapshot taken when the .trigger</div><div class='add'>+  callback is invoked. This snapshot is taken by the ALSA core in the</div><div class='add'>+  general case, but specific hardware may have synchronization</div><div class='add'>+  capabilities or conversely may only be able to provide a correct</div><div class='add'>+  estimate with a delay. In the latter two cases, the low-level driver</div><div class='add'>+  is responsible for updating the trigger_tstamp at the most appropriate</div><div class='add'>+  and precise moment. Applications should not rely solely on the first</div><div class='add'>+  trigger_tstamp but update their internal calculations if the driver</div><div class='add'>+  provides a refined estimate with a delay.</div><div class='add'>+</div><div class='add'>+- tstamp is the current system timestamp updated during the last</div><div class='add'>+  event or application query.</div><div class='add'>+  The difference (tstamp - trigger_tstamp) defines the elapsed time.</div><div class='add'>+</div><div class='add'>+The ALSA API provides two basic pieces of information, avail</div><div class='add'>+and delay, which combined with the trigger and current system</div><div class='add'>+timestamps allow for applications to keep track of the 'fullness' of</div><div class='add'>+the ring buffer and the amount of queued samples.</div><div class='add'>+</div><div class='add'>+The use of these different pointers and time information depends on</div><div class='add'>+the application needs:</div><div class='add'>+</div><div class='add'>+- ``avail`` reports how much can be written in the ring buffer</div><div class='add'>+- ``delay`` reports the time it will take to hear a new sample after all</div><div class='add'>+  queued samples have been played out.</div><div class='add'>+</div><div class='add'>+When timestamps are enabled, the avail/delay information is reported</div><div class='add'>+along with a snapshot of system time. Applications can select from</div><div class='add'>+``CLOCK_REALTIME`` (NTP corrections including going backwards),</div><div class='add'>+``CLOCK_MONOTONIC`` (NTP corrections but never going backwards),</div><div class='add'>+``CLOCK_MONOTIC_RAW`` (without NTP corrections) and change the mode</div><div class='add'>+dynamically with sw_params</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The ALSA API also provide an audio_tstamp which reflects the passage</div><div class='add'>+of time as measured by different components of audio hardware.  In</div><div class='add'>+ascii-art, this could be represented as follows (for the playback</div><div class='add'>+case):</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  --------------------------------------------------------------&gt; time</div><div class='add'>+    ^               ^              ^                ^           ^</div><div class='add'>+    |               |              |                |           |</div><div class='add'>+   analog         link            dma              app       FullBuffer</div><div class='add'>+   time           time           time              time        time</div><div class='add'>+    |               |              |                |           |</div><div class='add'>+    |&lt; codec delay &gt;|&lt;--hw delay--&gt;|&lt;queued samples&gt;|&lt;---avail-&gt;|</div><div class='add'>+    |&lt;----------------- delay----------------------&gt;|           |</div><div class='add'>+                                   |&lt;----ring buffer length----&gt;|</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The analog time is taken at the last stage of the playback, as close</div><div class='add'>+as possible to the actual transducer</div><div class='add'>+</div><div class='add'>+The link time is taken at the output of the SoC/chipset as the samples</div><div class='add'>+are pushed on a link. The link time can be directly measured if</div><div class='add'>+supported in hardware by sample counters or wallclocks (e.g. with</div><div class='add'>+HDAudio 24MHz or PTP clock for networked solutions) or indirectly</div><div class='add'>+estimated (e.g. with the frame counter in USB).</div><div class='add'>+</div><div class='add'>+The DMA time is measured using counters - typically the least reliable</div><div class='add'>+of all measurements due to the bursty nature of DMA transfers.</div><div class='add'>+</div><div class='add'>+The app time corresponds to the time tracked by an application after</div><div class='add'>+writing in the ring buffer.</div><div class='add'>+</div><div class='add'>+The application can query the hardware capabilities, define which</div><div class='add'>+audio time it wants reported by selecting the relevant settings in</div><div class='add'>+audio_tstamp_config fields, thus get an estimate of the timestamp</div><div class='add'>+accuracy. It can also request the delay-to-analog be included in the</div><div class='add'>+measurement. Direct access to the link time is very interesting on</div><div class='add'>+platforms that provide an embedded DSP; measuring directly the link</div><div class='add'>+time with dedicated hardware, possibly synchronized with system time,</div><div class='add'>+removes the need to keep track of internal DSP processing times and</div><div class='add'>+latency.</div><div class='add'>+</div><div class='add'>+In case the application requests an audio tstamp that is not supported</div><div class='add'>+in hardware/low-level driver, the type is overridden as DEFAULT and the</div><div class='add'>+timestamp will report the DMA time based on the hw_pointer value.</div><div class='add'>+</div><div class='add'>+For backwards compatibility with previous implementations that did not</div><div class='add'>+provide timestamp selection, with a zero-valued COMPAT timestamp type</div><div class='add'>+the results will default to the HDAudio wall clock for playback</div><div class='add'>+streams and to the DMA time (hw_ptr) in all other cases.</div><div class='add'>+</div><div class='add'>+The audio timestamp accuracy can be returned to user-space, so that</div><div class='add'>+appropriate decisions are made:</div><div class='add'>+</div><div class='add'>+- for dma time (default), the granularity of the transfers can be</div><div class='add'>+  inferred from the steps between updates and in turn provide</div><div class='add'>+  information on how much the application pointer can be rewound</div><div class='add'>+  safely.</div><div class='add'>+</div><div class='add'>+- the link time can be used to track long-term drifts between audio</div><div class='add'>+  and system time using the (tstamp-trigger_tstamp)/audio_tstamp</div><div class='add'>+  ratio, the precision helps define how much smoothing/low-pass</div><div class='add'>+  filtering is required. The link time can be either reset on startup</div><div class='add'>+  or reported as is (the latter being useful to compare progress of</div><div class='add'>+  different streams - but may require the wallclock to be always</div><div class='add'>+  running and not wrap-around during idle periods). If supported in</div><div class='add'>+  hardware, the absolute link time could also be used to define a</div><div class='add'>+  precise start time (patches WIP)</div><div class='add'>+</div><div class='add'>+- including the delay in the audio timestamp may</div><div class='add'>+  counter-intuitively not increase the precision of timestamps, e.g. if a</div><div class='add'>+  codec includes variable-latency DSP processing or a chain of</div><div class='add'>+  hardware components the delay is typically not known with precision.</div><div class='add'>+</div><div class='add'>+The accuracy is reported in nanosecond units (using an unsigned 32-bit</div><div class='add'>+word), which gives a max precision of 4.29s, more than enough for</div><div class='add'>+audio applications...</div><div class='add'>+</div><div class='add'>+Due to the varied nature of timestamping needs, even for a single</div><div class='add'>+application, the audio_tstamp_config can be changed dynamically. In</div><div class='add'>+the ``STATUS`` ioctl, the parameters are read-only and do not allow for</div><div class='add'>+any application selection. To work around this limitation without</div><div class='add'>+impacting legacy applications, a new ``STATUS_EXT`` ioctl is introduced</div><div class='add'>+with read/write parameters. ALSA-lib will be modified to make use of</div><div class='add'>+``STATUS_EXT`` and effectively deprecate ``STATUS``.</div><div class='add'>+</div><div class='add'>+The ALSA API only allows for a single audio timestamp to be reported</div><div class='add'>+at a time. This is a conscious design decision, reading the audio</div><div class='add'>+timestamps from hardware registers or from IPC takes time, the more</div><div class='add'>+timestamps are read the more imprecise the combined measurements</div><div class='add'>+are. To avoid any interpretation issues, a single (system, audio)</div><div class='add'>+timestamp is reported. Applications that need different timestamps</div><div class='add'>+will be required to issue multiple queries and perform an</div><div class='add'>+interpolation of the results</div><div class='add'>+</div><div class='add'>+In some hardware-specific configuration, the system timestamp is</div><div class='add'>+latched by a low-level audio subsystem, and the information provided</div><div class='add'>+back to the driver. Due to potential delays in the communication with</div><div class='add'>+the hardware, there is a risk of misalignment with the avail and delay</div><div class='add'>+information. To make sure applications are not confused, a</div><div class='add'>+driver_timestamp field is added in the snd_pcm_status structure; this</div><div class='add'>+timestamp shows when the information is put together by the driver</div><div class='add'>+before returning from the ``STATUS`` and ``STATUS_EXT`` ioctl. in most cases</div><div class='add'>+this driver_timestamp will be identical to the regular system tstamp.</div><div class='add'>+</div><div class='add'>+Examples of typestamping with HDaudio:</div><div class='add'>+</div><div class='add'>+1. DMA timestamp, no compensation for DMA+analog delay</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  $ ./audio_time  -p --ts_type=1</div><div class='add'>+  playback: systime: 341121338 nsec, audio time 342000000 nsec, 	systime delta -878662</div><div class='add'>+  playback: systime: 426236663 nsec, audio time 427187500 nsec, 	systime delta -950837</div><div class='add'>+  playback: systime: 597080580 nsec, audio time 598000000 nsec, 	systime delta -919420</div><div class='add'>+  playback: systime: 682059782 nsec, audio time 683020833 nsec, 	systime delta -961051</div><div class='add'>+  playback: systime: 852896415 nsec, audio time 853854166 nsec, 	systime delta -957751</div><div class='add'>+  playback: systime: 937903344 nsec, audio time 938854166 nsec, 	systime delta -950822</div><div class='add'>+</div><div class='add'>+2. DMA timestamp, compensation for DMA+analog delay</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  $ ./audio_time  -p --ts_type=1 -d</div><div class='add'>+  playback: systime: 341053347 nsec, audio time 341062500 nsec, 	systime delta -9153</div><div class='add'>+  playback: systime: 426072447 nsec, audio time 426062500 nsec, 	systime delta 9947</div><div class='add'>+  playback: systime: 596899518 nsec, audio time 596895833 nsec, 	systime delta 3685</div><div class='add'>+  playback: systime: 681915317 nsec, audio time 681916666 nsec, 	systime delta -1349</div><div class='add'>+  playback: systime: 852741306 nsec, audio time 852750000 nsec, 	systime delta -8694</div><div class='add'>+</div><div class='add'>+3. link timestamp, compensation for DMA+analog delay</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  $ ./audio_time  -p --ts_type=2 -d</div><div class='add'>+  playback: systime: 341060004 nsec, audio time 341062791 nsec, 	systime delta -2787</div><div class='add'>+  playback: systime: 426242074 nsec, audio time 426244875 nsec, 	systime delta -2801</div><div class='add'>+  playback: systime: 597080992 nsec, audio time 597084583 nsec, 	systime delta -3591</div><div class='add'>+  playback: systime: 682084512 nsec, audio time 682088291 nsec, 	systime delta -3779</div><div class='add'>+  playback: systime: 852936229 nsec, audio time 852940916 nsec, 	systime delta -4687</div><div class='add'>+  playback: systime: 938107562 nsec, audio time 938112708 nsec, 	systime delta -5146</div><div class='add'>+</div><div class='add'>+Example 1 shows that the timestamp at the DMA level is close to 1ms</div><div class='add'>+ahead of the actual playback time (as a side time this sort of</div><div class='add'>+measurement can help define rewind safeguards). Compensating for the</div><div class='add'>+DMA-link delay in example 2 helps remove the hardware buffering but</div><div class='add'>+the information is still very jittery, with up to one sample of</div><div class='add'>+error. In example 3 where the timestamps are measured with the link</div><div class='add'>+wallclock, the timestamps show a monotonic behavior and a lower</div><div class='add'>+dispersion.</div><div class='add'>+</div><div class='add'>+Example 3 and 4 are with USB audio class. Example 3 shows a high</div><div class='add'>+offset between audio time and system time due to buffering. Example 4</div><div class='add'>+shows how compensating for the delay exposes a 1ms accuracy (due to</div><div class='add'>+the use of the frame counter by the driver)</div><div class='add'>+</div><div class='add'>+Example 3: DMA timestamp, no compensation for delay, delta of ~5ms</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  $ ./audio_time -p -Dhw:1 -t1</div><div class='add'>+  playback: systime: 120174019 nsec, audio time 125000000 nsec, 	systime delta -4825981</div><div class='add'>+  playback: systime: 245041136 nsec, audio time 250000000 nsec, 	systime delta -4958864</div><div class='add'>+  playback: systime: 370106088 nsec, audio time 375000000 nsec, 	systime delta -4893912</div><div class='add'>+  playback: systime: 495040065 nsec, audio time 500000000 nsec, 	systime delta -4959935</div><div class='add'>+  playback: systime: 620038179 nsec, audio time 625000000 nsec, 	systime delta -4961821</div><div class='add'>+  playback: systime: 745087741 nsec, audio time 750000000 nsec, 	systime delta -4912259</div><div class='add'>+  playback: systime: 870037336 nsec, audio time 875000000 nsec, 	systime delta -4962664</div><div class='add'>+</div><div class='add'>+Example 4: DMA timestamp, compensation for delay, delay of ~1ms</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  $ ./audio_time -p -Dhw:1 -t1 -d</div><div class='add'>+  playback: systime: 120190520 nsec, audio time 120000000 nsec, 	systime delta 190520</div><div class='add'>+  playback: systime: 245036740 nsec, audio time 244000000 nsec, 	systime delta 1036740</div><div class='add'>+  playback: systime: 370034081 nsec, audio time 369000000 nsec, 	systime delta 1034081</div><div class='add'>+  playback: systime: 495159907 nsec, audio time 494000000 nsec, 	systime delta 1159907</div><div class='add'>+  playback: systime: 620098824 nsec, audio time 619000000 nsec, 	systime delta 1098824</div><div class='add'>+  playback: systime: 745031847 nsec, audio time 744000000 nsec, 	systime delta 1031847</div><div class='head'>diff --git a/Documentation/sound/hd-audio/controls.rst b/Documentation/sound/hd-audio/controls.rst<br/>new file mode 100644<br/>index 000000000000..f2ebc4f79b44<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/hd-audio/controls.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/hd-audio/controls.rst</a></div><div class='hunk'>@@ -0,0 +1,121 @@</div><div class='add'>+======================================</div><div class='add'>+HD-Audio Codec-Specific Mixer Controls</div><div class='add'>+======================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+This file explains the codec-specific mixer controls.</div><div class='add'>+</div><div class='add'>+Realtek codecs</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Channel Mode</div><div class='add'>+  This is an enum control to change the surround-channel setup,</div><div class='add'>+  appears only when the surround channels are available.</div><div class='add'>+  It gives the number of channels to be used, "2ch", "4ch", "6ch",</div><div class='add'>+  and "8ch".  According to the configuration, this also controls the</div><div class='add'>+  jack-retasking of multi-I/O jacks.</div><div class='add'>+</div><div class='add'>+Auto-Mute Mode</div><div class='add'>+  This is an enum control to change the auto-mute behavior of the</div><div class='add'>+  headphone and line-out jacks.  If built-in speakers and headphone</div><div class='add'>+  and/or line-out jacks are available on a machine, this controls</div><div class='add'>+  appears.</div><div class='add'>+  When there are only either headphones or line-out jacks, it gives</div><div class='add'>+  "Disabled" and "Enabled" state.  When enabled, the speaker is muted</div><div class='add'>+  automatically when a jack is plugged.</div><div class='add'>+</div><div class='add'>+  When both headphone and line-out jacks are present, it gives</div><div class='add'>+  "Disabled", "Speaker Only" and "Line-Out+Speaker".  When</div><div class='add'>+  speaker-only is chosen, plugging into a headphone or a line-out jack</div><div class='add'>+  mutes the speakers, but not line-outs.  When line-out+speaker is</div><div class='add'>+  selected, plugging to a headphone jack mutes both speakers and</div><div class='add'>+  line-outs.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+IDT/Sigmatel codecs</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Analog Loopback</div><div class='add'>+  This control enables/disables the analog-loopback circuit.  This</div><div class='add'>+  appears only when "loopback" is set to true in a codec hint</div><div class='add'>+  (see HD-Audio.txt).  Note that on some codecs the analog-loopback</div><div class='add'>+  and the normal PCM playback are exclusive, i.e. when this is on, you</div><div class='add'>+  won't hear any PCM stream.</div><div class='add'>+</div><div class='add'>+Swap Center/LFE</div><div class='add'>+  Swaps the center and LFE channel order.  Normally, the left</div><div class='add'>+  corresponds to the center and the right to the LFE.  When this is</div><div class='add'>+  ON, the left to the LFE and the right to the center.</div><div class='add'>+</div><div class='add'>+Headphone as Line Out</div><div class='add'>+  When this control is ON, treat the headphone jacks as line-out</div><div class='add'>+  jacks.  That is, the headphone won't auto-mute the other line-outs,</div><div class='add'>+  and no HP-amp is set to the pins.</div><div class='add'>+</div><div class='add'>+Mic Jack Mode, Line Jack Mode, etc</div><div class='add'>+  These enum controls the direction and the bias of the input jack</div><div class='add'>+  pins.  Depending on the jack type, it can set as "Mic In" and "Line </div><div class='add'>+  In", for determining the input bias, or it can be set to "Line Out"</div><div class='add'>+  when the pin is a multi-I/O jack for surround channels.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+VIA codecs</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+Smart 5.1</div><div class='add'>+  An enum control to re-task the multi-I/O jacks for surround outputs.</div><div class='add'>+  When it's ON, the corresponding input jacks (usually a line-in and a</div><div class='add'>+  mic-in) are switched as the surround and the CLFE output jacks.</div><div class='add'>+</div><div class='add'>+Independent HP</div><div class='add'>+  When this enum control is enabled, the headphone output is routed</div><div class='add'>+  from an individual stream (the third PCM such as hw:0,2) instead of</div><div class='add'>+  the primary stream.  In the case the headphone DAC is shared with a</div><div class='add'>+  side or a CLFE-channel DAC, the DAC is switched to the headphone</div><div class='add'>+  automatically.</div><div class='add'>+</div><div class='add'>+Loopback Mixing</div><div class='add'>+  An enum control to determine whether the analog-loopback route is</div><div class='add'>+  enabled or not.  When it's enabled, the analog-loopback is mixed to</div><div class='add'>+  the front-channel.  Also, the same route is used for the headphone</div><div class='add'>+  and speaker outputs.  As a side-effect, when this mode is set, the</div><div class='add'>+  individual volume controls will be no longer available for</div><div class='add'>+  headphones and speakers because there is only one DAC connected to a</div><div class='add'>+  mixer widget.</div><div class='add'>+</div><div class='add'>+Dynamic Power-Control</div><div class='add'>+  This control determines whether the dynamic power-control per jack</div><div class='add'>+  detection is enabled or not.  When enabled, the widgets power state</div><div class='add'>+  (D0/D3) are changed dynamically depending on the jack plugging</div><div class='add'>+  state for saving power consumptions.  However, if your system</div><div class='add'>+  doesn't provide a proper jack-detection, this won't work; in such a</div><div class='add'>+  case, turn this control OFF.</div><div class='add'>+</div><div class='add'>+Jack Detect</div><div class='add'>+  This control is provided only for VT1708 codec which gives no proper</div><div class='add'>+  unsolicited event per jack plug.  When this is on, the driver polls</div><div class='add'>+  the jack detection so that the headphone auto-mute can work, while </div><div class='add'>+  turning this off would reduce the power consumption.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Conexant codecs</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Auto-Mute Mode</div><div class='add'>+  See Reatek codecs.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Analog codecs</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Channel Mode</div><div class='add'>+  This is an enum control to change the surround-channel setup,</div><div class='add'>+  appears only when the surround channels are available.</div><div class='add'>+  It gives the number of channels to be used, "2ch", "4ch" and "6ch".</div><div class='add'>+  According to the configuration, this also controls the</div><div class='add'>+  jack-retasking of multi-I/O jacks.</div><div class='add'>+</div><div class='add'>+Independent HP</div><div class='add'>+  When this enum control is enabled, the headphone output is routed</div><div class='add'>+  from an individual stream (the third PCM such as hw:0,2) instead of</div><div class='add'>+  the primary stream.</div><div class='head'>diff --git a/Documentation/sound/hd-audio/dp-mst.rst b/Documentation/sound/hd-audio/dp-mst.rst<br/>new file mode 100644<br/>index 000000000000..1617459e332f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/hd-audio/dp-mst.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/hd-audio/dp-mst.rst</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+=======================</div><div class='add'>+HD-Audio DP-MST Support</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+To support DP MST audio, HD Audio hdmi codec driver introduces virtual pin</div><div class='add'>+and dynamic pcm assignment.</div><div class='add'>+</div><div class='add'>+Virtual pin is an extension of per_pin. The most difference of DP MST</div><div class='add'>+from legacy is that DP MST introduces device entry. Each pin can contain</div><div class='add'>+several device entries. Each device entry behaves as a pin.</div><div class='add'>+</div><div class='add'>+As each pin may contain several device entries and each codec may contain</div><div class='add'>+several pins, if we use one pcm per per_pin, there will be many PCMs.</div><div class='add'>+The new solution is to create a few PCMs and to dynamically bind pcm to</div><div class='add'>+per_pin. Driver uses spec-&gt;dyn_pcm_assign flag to indicate whether to use</div><div class='add'>+the new solution.</div><div class='add'>+</div><div class='add'>+PCM</div><div class='add'>+===</div><div class='add'>+To be added</div><div class='add'>+</div><div class='add'>+Pin Initialization</div><div class='add'>+==================</div><div class='add'>+Each pin may have several device entries (virtual pins). On Intel platform,</div><div class='add'>+the device entries number is dynamically changed. If DP MST hub is connected,</div><div class='add'>+it is in DP MST mode, and the device entries number is 3. Otherwise, the</div><div class='add'>+device entries number is 1.</div><div class='add'>+</div><div class='add'>+To simplify the implementation, all the device entries will be initialized</div><div class='add'>+when bootup no matter whether it is in DP MST mode or not.</div><div class='add'>+</div><div class='add'>+Connection list</div><div class='add'>+===============</div><div class='add'>+DP MST reuses connection list code. The code can be reused because</div><div class='add'>+device entries on the same pin have the same connection list.</div><div class='add'>+</div><div class='add'>+This means DP MST gets the device entry connection list without the</div><div class='add'>+device entry setting.</div><div class='add'>+</div><div class='add'>+Jack</div><div class='add'>+====</div><div class='add'>+</div><div class='add'>+Presume:</div><div class='add'>+ - MST must be dyn_pcm_assign, and it is acomp (for Intel scenario);</div><div class='add'>+ - NON-MST may or may not be dyn_pcm_assign, it can be acomp or !acomp;</div><div class='add'>+</div><div class='add'>+So there are the following scenarios:</div><div class='add'>+ a. MST (&amp;&amp; dyn_pcm_assign &amp;&amp; acomp)</div><div class='add'>+ b. NON-MST &amp;&amp; dyn_pcm_assign &amp;&amp; acomp</div><div class='add'>+ c. NON-MST &amp;&amp; !dyn_pcm_assign &amp;&amp; !acomp</div><div class='add'>+</div><div class='add'>+Below discussion will ignore MST and NON-MST difference as it doesn't</div><div class='add'>+impact on jack handling too much.</div><div class='add'>+</div><div class='add'>+Driver uses struct hdmi_pcm pcm[] array in hdmi_spec and snd_jack is</div><div class='add'>+a member of hdmi_pcm. Each pin has one struct hdmi_pcm * pcm pointer.</div><div class='add'>+</div><div class='add'>+For !dyn_pcm_assign, per_pin-&gt;pcm will assigned to spec-&gt;pcm[n] statically.</div><div class='add'>+</div><div class='add'>+For dyn_pcm_assign, per_pin-&gt;pcm will assigned to spec-&gt;pcm[n]</div><div class='add'>+when monitor is hotplugged.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Build Jack</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+- dyn_pcm_assign</div><div class='add'>+</div><div class='add'>+  Will not use hda_jack but use snd_jack in spec-&gt;pcm_rec[pcm_idx].jack directly.</div><div class='add'>+</div><div class='add'>+- !dyn_pcm_assign</div><div class='add'>+</div><div class='add'>+  Use hda_jack and assign spec-&gt;pcm_rec[pcm_idx].jack = jack-&gt;jack statically.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Unsolicited Event Enabling</div><div class='add'>+--------------------------</div><div class='add'>+Enable unsolicited event if !acomp.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Monitor Hotplug Event Handling</div><div class='add'>+------------------------------</div><div class='add'>+- acomp</div><div class='add'>+</div><div class='add'>+  pin_eld_notify() -&gt; check_presence_and_report() -&gt; hdmi_present_sense() -&gt;</div><div class='add'>+  sync_eld_via_acomp().</div><div class='add'>+</div><div class='add'>+  Use directly snd_jack_report() on spec-&gt;pcm_rec[pcm_idx].jack for</div><div class='add'>+  both dyn_pcm_assign and !dyn_pcm_assign</div><div class='add'>+</div><div class='add'>+- !acomp</div><div class='add'>+</div><div class='add'>+  hdmi_unsol_event() -&gt; hdmi_intrinsic_event() -&gt; check_presence_and_report() -&gt;</div><div class='add'>+  hdmi_present_sense() -&gt; hdmi_prepsent_sense_via_verbs()</div><div class='add'>+</div><div class='add'>+  Use directly snd_jack_report() on spec-&gt;pcm_rec[pcm_idx].jack for dyn_pcm_assign.</div><div class='add'>+  Use hda_jack mechanism to handle jack events.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Others to be added later</div><div class='add'>+========================</div><div class='head'>diff --git a/Documentation/sound/hd-audio/index.rst b/Documentation/sound/hd-audio/index.rst<br/>new file mode 100644<br/>index 000000000000..f8a72ffffe66<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/hd-audio/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/hd-audio/index.rst</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+HD-Audio</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   notes</div><div class='add'>+   models</div><div class='add'>+   controls</div><div class='add'>+   dp-mst</div><div class='head'>diff --git a/Documentation/sound/hd-audio/models.rst b/Documentation/sound/hd-audio/models.rst<br/>new file mode 100644<br/>index 000000000000..5338673c88d9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/hd-audio/models.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/hd-audio/models.rst</a></div><div class='hunk'>@@ -0,0 +1,518 @@</div><div class='add'>+==============================</div><div class='add'>+HD-Audio Codec-Specific Models</div><div class='add'>+==============================</div><div class='add'>+</div><div class='add'>+ALC880</div><div class='add'>+======</div><div class='add'>+3stack</div><div class='add'>+    3-jack in back and a headphone out</div><div class='add'>+3stack-digout</div><div class='add'>+    3-jack in back, a HP out and a SPDIF out</div><div class='add'>+5stack</div><div class='add'>+    5-jack in back, 2-jack in front</div><div class='add'>+5stack-digout</div><div class='add'>+    5-jack in back, 2-jack in front, a SPDIF out</div><div class='add'>+6stack</div><div class='add'>+    6-jack in back, 2-jack in front</div><div class='add'>+6stack-digout</div><div class='add'>+    6-jack with a SPDIF out</div><div class='add'>+</div><div class='add'>+ALC260</div><div class='add'>+======</div><div class='add'>+gpio1</div><div class='add'>+    Enable GPIO1</div><div class='add'>+coef</div><div class='add'>+    Enable EAPD via COEF table</div><div class='add'>+fujitsu</div><div class='add'>+    Quirk for FSC S7020</div><div class='add'>+fujitsu-jwse</div><div class='add'>+    Quirk for FSC S7020 with jack modes and HP mic support</div><div class='add'>+</div><div class='add'>+ALC262</div><div class='add'>+======</div><div class='add'>+inv-dmic</div><div class='add'>+    Inverted internal mic workaround</div><div class='add'>+</div><div class='add'>+ALC267/268</div><div class='add'>+==========</div><div class='add'>+inv-dmic</div><div class='add'>+    Inverted internal mic workaround</div><div class='add'>+hp-eapd</div><div class='add'>+    Disable HP EAPD on NID 0x15</div><div class='add'>+</div><div class='add'>+ALC22x/23x/25x/269/27x/28x/29x (and vendor-specific ALC3xxx models)</div><div class='add'>+===================================================================</div><div class='add'>+laptop-amic</div><div class='add'>+    Laptops with analog-mic input</div><div class='add'>+laptop-dmic</div><div class='add'>+    Laptops with digital-mic input</div><div class='add'>+alc269-dmic</div><div class='add'>+    Enable ALC269(VA) digital mic workaround</div><div class='add'>+alc271-dmic</div><div class='add'>+    Enable ALC271X digital mic workaround</div><div class='add'>+inv-dmic</div><div class='add'>+    Inverted internal mic workaround</div><div class='add'>+headset-mic</div><div class='add'>+    Indicates a combined headset (headphone+mic) jack</div><div class='add'>+headset-mode</div><div class='add'>+    More comprehensive headset support for ALC269 &amp; co</div><div class='add'>+headset-mode-no-hp-mic</div><div class='add'>+    Headset mode support without headphone mic</div><div class='add'>+lenovo-dock</div><div class='add'>+    Enables docking station I/O for some Lenovos</div><div class='add'>+hp-gpio-led</div><div class='add'>+    GPIO LED support on HP laptops</div><div class='add'>+dell-headset-multi</div><div class='add'>+    Headset jack, which can also be used as mic-in</div><div class='add'>+dell-headset-dock</div><div class='add'>+    Headset jack (without mic-in), and also dock I/O</div><div class='add'>+alc283-dac-wcaps</div><div class='add'>+    Fixups for Chromebook with ALC283</div><div class='add'>+alc283-sense-combo</div><div class='add'>+    Combo jack sensing on ALC283</div><div class='add'>+tpt440-dock</div><div class='add'>+    Pin configs for Lenovo Thinkpad Dock support</div><div class='add'>+</div><div class='add'>+ALC66x/67x/892</div><div class='add'>+==============</div><div class='add'>+mario</div><div class='add'>+    Chromebook mario model fixup</div><div class='add'>+asus-mode1</div><div class='add'>+    ASUS</div><div class='add'>+asus-mode2</div><div class='add'>+    ASUS</div><div class='add'>+asus-mode3</div><div class='add'>+    ASUS</div><div class='add'>+asus-mode4</div><div class='add'>+    ASUS</div><div class='add'>+asus-mode5</div><div class='add'>+    ASUS</div><div class='add'>+asus-mode6</div><div class='add'>+    ASUS</div><div class='add'>+asus-mode7</div><div class='add'>+    ASUS</div><div class='add'>+asus-mode8</div><div class='add'>+    ASUS</div><div class='add'>+inv-dmic</div><div class='add'>+    Inverted internal mic workaround</div><div class='add'>+dell-headset-multi</div><div class='add'>+    Headset jack, which can also be used as mic-in</div><div class='add'>+</div><div class='add'>+ALC680</div><div class='add'>+======</div><div class='add'>+N/A</div><div class='add'>+</div><div class='add'>+ALC88x/898/1150</div><div class='add'>+======================</div><div class='add'>+acer-aspire-4930g</div><div class='add'>+    Acer Aspire 4930G/5930G/6530G/6930G/7730G</div><div class='add'>+acer-aspire-8930g</div><div class='add'>+    Acer Aspire 8330G/6935G</div><div class='add'>+acer-aspire</div><div class='add'>+    Acer Aspire others</div><div class='add'>+inv-dmic</div><div class='add'>+    Inverted internal mic workaround</div><div class='add'>+no-primary-hp</div><div class='add'>+    VAIO Z/VGC-LN51JGB workaround (for fixed speaker DAC)</div><div class='add'>+</div><div class='add'>+ALC861/660</div><div class='add'>+==========</div><div class='add'>+N/A</div><div class='add'>+</div><div class='add'>+ALC861VD/660VD</div><div class='add'>+==============</div><div class='add'>+N/A</div><div class='add'>+</div><div class='add'>+CMI9880</div><div class='add'>+=======</div><div class='add'>+minimal</div><div class='add'>+    3-jack in back</div><div class='add'>+min_fp</div><div class='add'>+    3-jack in back, 2-jack in front</div><div class='add'>+full</div><div class='add'>+    6-jack in back, 2-jack in front</div><div class='add'>+full_dig</div><div class='add'>+    6-jack in back, 2-jack in front, SPDIF I/O</div><div class='add'>+allout</div><div class='add'>+    5-jack in back, 2-jack in front, SPDIF out</div><div class='add'>+auto</div><div class='add'>+    auto-config reading BIOS (default)</div><div class='add'>+</div><div class='add'>+AD1882 / AD1882A</div><div class='add'>+================</div><div class='add'>+3stack</div><div class='add'>+    3-stack mode</div><div class='add'>+3stack-automute</div><div class='add'>+    3-stack with automute front HP (default)</div><div class='add'>+6stack</div><div class='add'>+    6-stack mode</div><div class='add'>+</div><div class='add'>+AD1884A / AD1883 / AD1984A / AD1984B</div><div class='add'>+====================================</div><div class='add'>+desktop	3-stack desktop (default)</div><div class='add'>+laptop	laptop with HP jack sensing</div><div class='add'>+mobile	mobile devices with HP jack sensing</div><div class='add'>+thinkpad	Lenovo Thinkpad X300</div><div class='add'>+touchsmart	HP Touchsmart</div><div class='add'>+</div><div class='add'>+AD1884</div><div class='add'>+======</div><div class='add'>+N/A</div><div class='add'>+</div><div class='add'>+AD1981</div><div class='add'>+======</div><div class='add'>+basic		3-jack (default)</div><div class='add'>+hp		HP nx6320</div><div class='add'>+thinkpad	Lenovo Thinkpad T60/X60/Z60</div><div class='add'>+toshiba	Toshiba U205</div><div class='add'>+</div><div class='add'>+AD1983</div><div class='add'>+======</div><div class='add'>+N/A</div><div class='add'>+</div><div class='add'>+AD1984</div><div class='add'>+======</div><div class='add'>+basic		default configuration</div><div class='add'>+thinkpad	Lenovo Thinkpad T61/X61</div><div class='add'>+dell_desktop	Dell T3400</div><div class='add'>+</div><div class='add'>+AD1986A</div><div class='add'>+=======</div><div class='add'>+3stack</div><div class='add'>+    3-stack, shared surrounds</div><div class='add'>+laptop</div><div class='add'>+    2-channel only (FSC V2060, Samsung M50)</div><div class='add'>+laptop-imic</div><div class='add'>+    2-channel with built-in mic</div><div class='add'>+eapd</div><div class='add'>+    Turn on EAPD constantly</div><div class='add'>+</div><div class='add'>+AD1988/AD1988B/AD1989A/AD1989B</div><div class='add'>+==============================</div><div class='add'>+6stack</div><div class='add'>+    6-jack</div><div class='add'>+6stack-dig</div><div class='add'>+    ditto with SPDIF</div><div class='add'>+3stack</div><div class='add'>+    3-jack</div><div class='add'>+3stack-dig</div><div class='add'>+    ditto with SPDIF</div><div class='add'>+laptop</div><div class='add'>+    3-jack with hp-jack automute</div><div class='add'>+laptop-dig</div><div class='add'>+    ditto with SPDIF</div><div class='add'>+auto</div><div class='add'>+    auto-config reading BIOS (default)</div><div class='add'>+</div><div class='add'>+Conexant 5045</div><div class='add'>+=============</div><div class='add'>+laptop-hpsense</div><div class='add'>+    Laptop with HP sense (old model laptop)</div><div class='add'>+laptop-micsense</div><div class='add'>+    Laptop with Mic sense (old model fujitsu)</div><div class='add'>+laptop-hpmicsense</div><div class='add'>+    Laptop with HP and Mic senses</div><div class='add'>+benq</div><div class='add'>+    Benq R55E</div><div class='add'>+laptop-hp530</div><div class='add'>+    HP 530 laptop</div><div class='add'>+test</div><div class='add'>+    for testing/debugging purpose, almost all controls can be</div><div class='add'>+    adjusted.  Appearing only when compiled with $CONFIG_SND_DEBUG=y</div><div class='add'>+</div><div class='add'>+Conexant 5047</div><div class='add'>+=============</div><div class='add'>+laptop</div><div class='add'>+    Basic Laptop config </div><div class='add'>+laptop-hp</div><div class='add'>+    Laptop config for some HP models (subdevice 30A5)</div><div class='add'>+laptop-eapd</div><div class='add'>+    Laptop config with EAPD support</div><div class='add'>+test</div><div class='add'>+    for testing/debugging purpose, almost all controls can be</div><div class='add'>+    adjusted.  Appearing only when compiled with $CONFIG_SND_DEBUG=y</div><div class='add'>+</div><div class='add'>+Conexant 5051</div><div class='add'>+=============</div><div class='add'>+laptop</div><div class='add'>+    Basic Laptop config (default)</div><div class='add'>+hp</div><div class='add'>+    HP Spartan laptop</div><div class='add'>+hp-dv6736</div><div class='add'>+    HP dv6736</div><div class='add'>+hp-f700</div><div class='add'>+    HP Compaq Presario F700</div><div class='add'>+ideapad</div><div class='add'>+    Lenovo IdeaPad laptop</div><div class='add'>+toshiba</div><div class='add'>+    Toshiba Satellite M300</div><div class='add'>+</div><div class='add'>+Conexant 5066</div><div class='add'>+=============</div><div class='add'>+laptop</div><div class='add'>+    Basic Laptop config (default)</div><div class='add'>+hp-laptop</div><div class='add'>+    HP laptops, e g G60</div><div class='add'>+asus</div><div class='add'>+    Asus K52JU, Lenovo G560</div><div class='add'>+dell-laptop</div><div class='add'>+    Dell laptops</div><div class='add'>+dell-vostro</div><div class='add'>+    Dell Vostro</div><div class='add'>+olpc-xo-1_5</div><div class='add'>+    OLPC XO 1.5</div><div class='add'>+ideapad</div><div class='add'>+    Lenovo IdeaPad U150</div><div class='add'>+thinkpad</div><div class='add'>+    Lenovo Thinkpad</div><div class='add'>+</div><div class='add'>+STAC9200</div><div class='add'>+========</div><div class='add'>+ref</div><div class='add'>+    Reference board</div><div class='add'>+oqo</div><div class='add'>+    OQO Model 2</div><div class='add'>+dell-d21</div><div class='add'>+    Dell (unknown)</div><div class='add'>+dell-d22</div><div class='add'>+    Dell (unknown)</div><div class='add'>+dell-d23</div><div class='add'>+    Dell (unknown)</div><div class='add'>+dell-m21</div><div class='add'>+    Dell Inspiron 630m, Dell Inspiron 640m</div><div class='add'>+dell-m22</div><div class='add'>+    Dell Latitude D620, Dell Latitude D820</div><div class='add'>+dell-m23</div><div class='add'>+    Dell XPS M1710, Dell Precision M90</div><div class='add'>+dell-m24</div><div class='add'>+    Dell Latitude 120L</div><div class='add'>+dell-m25</div><div class='add'>+    Dell Inspiron E1505n</div><div class='add'>+dell-m26</div><div class='add'>+    Dell Inspiron 1501</div><div class='add'>+dell-m27</div><div class='add'>+    Dell Inspiron E1705/9400</div><div class='add'>+gateway-m4</div><div class='add'>+    Gateway laptops with EAPD control</div><div class='add'>+gateway-m4-2</div><div class='add'>+    Gateway laptops with EAPD control</div><div class='add'>+panasonic</div><div class='add'>+    Panasonic CF-74</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='add'>+</div><div class='add'>+STAC9205/9254</div><div class='add'>+=============</div><div class='add'>+ref</div><div class='add'>+    Reference board</div><div class='add'>+dell-m42</div><div class='add'>+    Dell (unknown)</div><div class='add'>+dell-m43</div><div class='add'>+    Dell Precision</div><div class='add'>+dell-m44</div><div class='add'>+    Dell Inspiron</div><div class='add'>+eapd</div><div class='add'>+    Keep EAPD on (e.g. Gateway T1616)</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='add'>+</div><div class='add'>+STAC9220/9221</div><div class='add'>+=============</div><div class='add'>+ref</div><div class='add'>+    Reference board</div><div class='add'>+3stack</div><div class='add'>+    D945 3stack</div><div class='add'>+5stack</div><div class='add'>+    D945 5stack + SPDIF</div><div class='add'>+intel-mac-v1</div><div class='add'>+    Intel Mac Type 1</div><div class='add'>+intel-mac-v2</div><div class='add'>+    Intel Mac Type 2</div><div class='add'>+intel-mac-v3</div><div class='add'>+    Intel Mac Type 3</div><div class='add'>+intel-mac-v4</div><div class='add'>+    Intel Mac Type 4</div><div class='add'>+intel-mac-v5</div><div class='add'>+    Intel Mac Type 5</div><div class='add'>+intel-mac-auto</div><div class='add'>+    Intel Mac (detect type according to subsystem id)</div><div class='add'>+macmini</div><div class='add'>+    Intel Mac Mini (equivalent with type 3)</div><div class='add'>+macbook</div><div class='add'>+    Intel Mac Book (eq. type 5)</div><div class='add'>+macbook-pro-v1</div><div class='add'>+    Intel Mac Book Pro 1st generation (eq. type 3)</div><div class='add'>+macbook-pro</div><div class='add'>+    Intel Mac Book Pro 2nd generation (eq. type 3)</div><div class='add'>+imac-intel</div><div class='add'>+    Intel iMac (eq. type 2)</div><div class='add'>+imac-intel-20</div><div class='add'>+    Intel iMac (newer version) (eq. type 3)</div><div class='add'>+ecs202</div><div class='add'>+    ECS/PC chips</div><div class='add'>+dell-d81</div><div class='add'>+    Dell (unknown)</div><div class='add'>+dell-d82</div><div class='add'>+    Dell (unknown)</div><div class='add'>+dell-m81</div><div class='add'>+    Dell (unknown)</div><div class='add'>+dell-m82</div><div class='add'>+    Dell XPS M1210</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='add'>+</div><div class='add'>+STAC9202/9250/9251</div><div class='add'>+==================</div><div class='add'>+ref</div><div class='add'>+    Reference board, base config</div><div class='add'>+m1</div><div class='add'>+    Some Gateway MX series laptops (NX560XL)</div><div class='add'>+m1-2</div><div class='add'>+    Some Gateway MX series laptops (MX6453)</div><div class='add'>+m2</div><div class='add'>+    Some Gateway MX series laptops (M255)</div><div class='add'>+m2-2</div><div class='add'>+    Some Gateway MX series laptops</div><div class='add'>+m3</div><div class='add'>+    Some Gateway MX series laptops</div><div class='add'>+m5</div><div class='add'>+    Some Gateway MX series laptops (MP6954)</div><div class='add'>+m6</div><div class='add'>+    Some Gateway NX series laptops</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='add'>+</div><div class='add'>+STAC9227/9228/9229/927x</div><div class='add'>+=======================</div><div class='add'>+ref</div><div class='add'>+    Reference board</div><div class='add'>+ref-no-jd</div><div class='add'>+    Reference board without HP/Mic jack detection</div><div class='add'>+3stack</div><div class='add'>+    D965 3stack</div><div class='add'>+5stack</div><div class='add'>+    D965 5stack + SPDIF</div><div class='add'>+5stack-no-fp</div><div class='add'>+    D965 5stack without front panel</div><div class='add'>+dell-3stack</div><div class='add'>+    Dell Dimension E520</div><div class='add'>+dell-bios</div><div class='add'>+    Fixes with Dell BIOS setup</div><div class='add'>+dell-bios-amic</div><div class='add'>+    Fixes with Dell BIOS setup including analog mic</div><div class='add'>+volknob</div><div class='add'>+    Fixes with volume-knob widget 0x24</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='add'>+</div><div class='add'>+STAC92HD71B*</div><div class='add'>+============</div><div class='add'>+ref</div><div class='add'>+    Reference board</div><div class='add'>+dell-m4-1</div><div class='add'>+    Dell desktops</div><div class='add'>+dell-m4-2</div><div class='add'>+    Dell desktops</div><div class='add'>+dell-m4-3</div><div class='add'>+    Dell desktops</div><div class='add'>+hp-m4</div><div class='add'>+    HP mini 1000</div><div class='add'>+hp-dv5</div><div class='add'>+    HP dv series</div><div class='add'>+hp-hdx</div><div class='add'>+    HP HDX series</div><div class='add'>+hp-dv4-1222nr</div><div class='add'>+    HP dv4-1222nr (with LED support)</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='add'>+</div><div class='add'>+STAC92HD73*</div><div class='add'>+===========</div><div class='add'>+ref</div><div class='add'>+    Reference board</div><div class='add'>+no-jd</div><div class='add'>+    BIOS setup but without jack-detection</div><div class='add'>+intel</div><div class='add'>+    Intel DG45* mobos</div><div class='add'>+dell-m6-amic</div><div class='add'>+    Dell desktops/laptops with analog mics</div><div class='add'>+dell-m6-dmic</div><div class='add'>+    Dell desktops/laptops with digital mics</div><div class='add'>+dell-m6</div><div class='add'>+    Dell desktops/laptops with both type of mics</div><div class='add'>+dell-eq</div><div class='add'>+    Dell desktops/laptops</div><div class='add'>+alienware</div><div class='add'>+    Alienware M17x</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='add'>+</div><div class='add'>+STAC92HD83*</div><div class='add'>+===========</div><div class='add'>+ref</div><div class='add'>+    Reference board</div><div class='add'>+mic-ref</div><div class='add'>+    Reference board with power management for ports</div><div class='add'>+dell-s14</div><div class='add'>+    Dell laptop</div><div class='add'>+dell-vostro-3500</div><div class='add'>+    Dell Vostro 3500 laptop</div><div class='add'>+hp-dv7-4000</div><div class='add'>+    HP dv-7 4000</div><div class='add'>+hp_cNB11_intquad</div><div class='add'>+    HP CNB models with 4 speakers</div><div class='add'>+hp-zephyr</div><div class='add'>+    HP Zephyr</div><div class='add'>+hp-led</div><div class='add'>+    HP with broken BIOS for mute LED</div><div class='add'>+hp-inv-led</div><div class='add'>+    HP with broken BIOS for inverted mute LED</div><div class='add'>+hp-mic-led</div><div class='add'>+    HP with mic-mute LED</div><div class='add'>+headset-jack</div><div class='add'>+    Dell Latitude with a 4-pin headset jack</div><div class='add'>+hp-envy-bass</div><div class='add'>+    Pin fixup for HP Envy bass speaker (NID 0x0f)</div><div class='add'>+hp-envy-ts-bass</div><div class='add'>+    Pin fixup for HP Envy TS bass speaker (NID 0x10)</div><div class='add'>+hp-bnb13-eq</div><div class='add'>+    Hardware equalizer setup for HP laptops</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='add'>+</div><div class='add'>+STAC92HD95</div><div class='add'>+==========</div><div class='add'>+hp-led</div><div class='add'>+    LED support for HP laptops</div><div class='add'>+hp-bass</div><div class='add'>+    Bass HPF setup for HP Spectre 13</div><div class='add'>+</div><div class='add'>+STAC9872</div><div class='add'>+========</div><div class='add'>+vaio</div><div class='add'>+    VAIO laptop without SPDIF</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='add'>+</div><div class='add'>+Cirrus Logic CS4206/4207</div><div class='add'>+========================</div><div class='add'>+mbp55</div><div class='add'>+    MacBook Pro 5,5</div><div class='add'>+imac27</div><div class='add'>+    IMac 27 Inch</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='add'>+</div><div class='add'>+Cirrus Logic CS4208</div><div class='add'>+===================</div><div class='add'>+mba6</div><div class='add'>+    MacBook Air 6,1 and 6,2</div><div class='add'>+gpio0</div><div class='add'>+    Enable GPIO 0 amp</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='add'>+</div><div class='add'>+VIA VT17xx/VT18xx/VT20xx</div><div class='add'>+========================</div><div class='add'>+auto</div><div class='add'>+    BIOS setup (default)</div><div class='head'>diff --git a/Documentation/sound/hd-audio/notes.rst b/Documentation/sound/hd-audio/notes.rst<br/>new file mode 100644<br/>index 000000000000..9eeb9b468706<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/hd-audio/notes.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/hd-audio/notes.rst</a></div><div class='hunk'>@@ -0,0 +1,880 @@</div><div class='add'>+=============================</div><div class='add'>+More Notes on HD-Audio Driver</div><div class='add'>+=============================</div><div class='add'>+</div><div class='add'>+Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+General</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+HD-audio is the new standard on-board audio component on modern PCs</div><div class='add'>+after AC97.  Although Linux has been supporting HD-audio since long</div><div class='add'>+time ago, there are often problems with new machines.  A part of the</div><div class='add'>+problem is broken BIOS, and the rest is the driver implementation.</div><div class='add'>+This document explains the brief trouble-shooting and debugging</div><div class='add'>+methods for the	HD-audio hardware.</div><div class='add'>+</div><div class='add'>+The HD-audio component consists of two parts: the controller chip and </div><div class='add'>+the codec chips on the HD-audio bus.  Linux provides a single driver</div><div class='add'>+for all controllers, snd-hda-intel.  Although the driver name contains</div><div class='add'>+a word of a well-known hardware vendor, it's not specific to it but for</div><div class='add'>+all controller chips by other companies.  Since the HD-audio</div><div class='add'>+controllers are supposed to be compatible, the single snd-hda-driver</div><div class='add'>+should work in most cases.  But, not surprisingly, there are known</div><div class='add'>+bugs and issues specific to each controller type.  The snd-hda-intel</div><div class='add'>+driver has a bunch of workarounds for these as described below.</div><div class='add'>+</div><div class='add'>+A controller may have multiple codecs.  Usually you have one audio</div><div class='add'>+codec and optionally one modem codec.  In theory, there might be</div><div class='add'>+multiple audio codecs, e.g. for analog and digital outputs, and the</div><div class='add'>+driver might not work properly because of conflict of mixer elements.</div><div class='add'>+This should be fixed in future if such hardware really exists.</div><div class='add'>+</div><div class='add'>+The snd-hda-intel driver has several different codec parsers depending</div><div class='add'>+on the codec.  It has a generic parser as a fallback, but this</div><div class='add'>+functionality is fairly limited until now.  Instead of the generic</div><div class='add'>+parser, usually the codec-specific parser (coded in patch_*.c) is used</div><div class='add'>+for the codec-specific implementations.  The details about the</div><div class='add'>+codec-specific problems are explained in the later sections.</div><div class='add'>+</div><div class='add'>+If you are interested in the deep debugging of HD-audio, read the</div><div class='add'>+HD-audio specification at first.  The specification is found on</div><div class='add'>+Intel's web page, for example:</div><div class='add'>+</div><div class='add'>+* http://www.intel.com/standards/hdaudio/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+HD-Audio Controller</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+DMA-Position Problem</div><div class='add'>+--------------------</div><div class='add'>+The most common problem of the controller is the inaccurate DMA</div><div class='add'>+pointer reporting.  The DMA pointer for playback and capture can be</div><div class='add'>+read in two ways, either via a LPIB register or via a position-buffer</div><div class='add'>+map.  As default the driver tries to read from the io-mapped</div><div class='add'>+position-buffer, and falls back to LPIB if the position-buffer appears</div><div class='add'>+dead.  However, this detection isn't perfect on some devices.  In such</div><div class='add'>+a case, you can change the default method via ``position_fix`` option.</div><div class='add'>+</div><div class='add'>+``position_fix=1`` means to use LPIB method explicitly.</div><div class='add'>+``position_fix=2`` means to use the position-buffer.</div><div class='add'>+``position_fix=3`` means to use a combination of both methods, needed</div><div class='add'>+for some VIA controllers.  The capture stream position is corrected</div><div class='add'>+by comparing both LPIB and position-buffer values.</div><div class='add'>+``position_fix=4`` is another combination available for all controllers,</div><div class='add'>+and uses LPIB for the playback and the position-buffer for the capture</div><div class='add'>+streams.</div><div class='add'>+0 is the default value for all other</div><div class='add'>+controllers, the automatic check and fallback to LPIB as described in</div><div class='add'>+the above.  If you get a problem of repeated sounds, this option might</div><div class='add'>+help.</div><div class='add'>+</div><div class='add'>+In addition to that, every controller is known to be broken regarding</div><div class='add'>+the wake-up timing.  It wakes up a few samples before actually</div><div class='add'>+processing the data on the buffer.  This caused a lot of problems, for</div><div class='add'>+example, with ALSA dmix or JACK.  Since 2.6.27 kernel, the driver puts</div><div class='add'>+an artificial delay to the wake up timing.  This delay is controlled</div><div class='add'>+via ``bdl_pos_adj`` option. </div><div class='add'>+</div><div class='add'>+When ``bdl_pos_adj`` is a negative value (as default), it's assigned to</div><div class='add'>+an appropriate value depending on the controller chip.  For Intel</div><div class='add'>+chips, it'd be 1 while it'd be 32 for others.  Usually this works.</div><div class='add'>+Only in case it doesn't work and you get warning messages, you should</div><div class='add'>+change this parameter to other values.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Codec-Probing Problem</div><div class='add'>+---------------------</div><div class='add'>+A less often but a more severe problem is the codec probing.  When</div><div class='add'>+BIOS reports the available codec slots wrongly, the driver gets</div><div class='add'>+confused and tries to access the non-existing codec slot.  This often</div><div class='add'>+results in the total screw-up, and destructs the further communication</div><div class='add'>+with the codec chips.  The symptom appears usually as error messages</div><div class='add'>+like:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    hda_intel: azx_get_response timeout, switching to polling mode:</div><div class='add'>+          last cmd=0x12345678</div><div class='add'>+    hda_intel: azx_get_response timeout, switching to single_cmd mode:</div><div class='add'>+          last cmd=0x12345678</div><div class='add'>+</div><div class='add'>+The first line is a warning, and this is usually relatively harmless.</div><div class='add'>+It means that the codec response isn't notified via an IRQ.  The</div><div class='add'>+driver uses explicit polling method to read the response.  It gives</div><div class='add'>+very slight CPU overhead, but you'd unlikely notice it.</div><div class='add'>+</div><div class='add'>+The second line is, however, a fatal error.  If this happens, usually</div><div class='add'>+it means that something is really wrong.  Most likely you are</div><div class='add'>+accessing a non-existing codec slot.</div><div class='add'>+</div><div class='add'>+Thus, if the second error message appears, try to narrow the probed</div><div class='add'>+codec slots via ``probe_mask`` option.  It's a bitmask, and each bit</div><div class='add'>+corresponds to the codec slot.  For example, to probe only the first</div><div class='add'>+slot, pass ``probe_mask=1``.  For the first and the third slots, pass</div><div class='add'>+``probe_mask=5`` (where 5 = 1 | 4), and so on.</div><div class='add'>+</div><div class='add'>+Since 2.6.29 kernel, the driver has a more robust probing method, so</div><div class='add'>+this error might happen rarely, though.</div><div class='add'>+</div><div class='add'>+On a machine with a broken BIOS, sometimes you need to force the</div><div class='add'>+driver to probe the codec slots the hardware doesn't report for use.</div><div class='add'>+In such a case, turn the bit 8 (0x100) of ``probe_mask`` option on.</div><div class='add'>+Then the rest 8 bits are passed as the codec slots to probe</div><div class='add'>+unconditionally.  For example, ``probe_mask=0x103`` will force to probe</div><div class='add'>+the codec slots 0 and 1 no matter what the hardware reports.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Interrupt Handling</div><div class='add'>+------------------</div><div class='add'>+HD-audio driver uses MSI as default (if available) since 2.6.33</div><div class='add'>+kernel as MSI works better on some machines, and in general, it's</div><div class='add'>+better for performance.  However, Nvidia controllers showed bad</div><div class='add'>+regressions with MSI (especially in a combination with AMD chipset),</div><div class='add'>+thus we disabled MSI for them.</div><div class='add'>+</div><div class='add'>+There seem also still other devices that don't work with MSI.  If you</div><div class='add'>+see a regression wrt the sound quality (stuttering, etc) or a lock-up</div><div class='add'>+in the recent kernel, try to pass ``enable_msi=0`` option to disable</div><div class='add'>+MSI.  If it works, you can add the known bad device to the blacklist</div><div class='add'>+defined in hda_intel.c.  In such a case, please report and give the</div><div class='add'>+patch back to the upstream developer. </div><div class='add'>+</div><div class='add'>+</div><div class='add'>+HD-Audio Codec</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+Model Option</div><div class='add'>+------------</div><div class='add'>+The most common problem regarding the HD-audio driver is the</div><div class='add'>+unsupported codec features or the mismatched device configuration.</div><div class='add'>+Most of codec-specific code has several preset models, either to</div><div class='add'>+override the BIOS setup or to provide more comprehensive features.</div><div class='add'>+</div><div class='add'>+The driver checks PCI SSID and looks through the static configuration</div><div class='add'>+table until any matching entry is found.  If you have a new machine,</div><div class='add'>+you may see a message like below:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    hda_codec: ALC880: BIOS auto-probing.</div><div class='add'>+</div><div class='add'>+Meanwhile, in the earlier versions, you would see a message like:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    hda_codec: Unknown model for ALC880, trying auto-probe from BIOS...</div><div class='add'>+</div><div class='add'>+Even if you see such a message, DON'T PANIC.  Take a deep breath and</div><div class='add'>+keep your towel.  First of all, it's an informational message, no</div><div class='add'>+warning, no error.  This means that the PCI SSID of your device isn't</div><div class='add'>+listed in the known preset model (white-)list.  But, this doesn't mean</div><div class='add'>+that the driver is broken.  Many codec-drivers provide the automatic</div><div class='add'>+configuration mechanism based on the BIOS setup.</div><div class='add'>+</div><div class='add'>+The HD-audio codec has usually "pin" widgets, and BIOS sets the default</div><div class='add'>+configuration of each pin, which indicates the location, the</div><div class='add'>+connection type, the jack color, etc.  The HD-audio driver can guess</div><div class='add'>+the right connection judging from these default configuration values.</div><div class='add'>+However -- some codec-support codes, such as patch_analog.c, don't</div><div class='add'>+support the automatic probing (yet as of 2.6.28).  And, BIOS is often,</div><div class='add'>+yes, pretty often broken.  It sets up wrong values and screws up the</div><div class='add'>+driver.</div><div class='add'>+</div><div class='add'>+The preset model (or recently called as "fix-up") is provided</div><div class='add'>+basically to overcome such a situation.  When the matching preset</div><div class='add'>+model is found in the white-list, the driver assumes the static</div><div class='add'>+configuration of that preset with the correct pin setup, etc.</div><div class='add'>+Thus, if you have a newer machine with a slightly different PCI SSID</div><div class='add'>+(or codec SSID) from the existing one, you may have a good chance to</div><div class='add'>+re-use the same model.  You can pass the ``model`` option to specify the</div><div class='add'>+preset model instead of PCI (and codec-) SSID look-up.</div><div class='add'>+</div><div class='add'>+What ``model`` option values are available depends on the codec chip.</div><div class='add'>+Check your codec chip from the codec proc file (see "Codec Proc-File"</div><div class='add'>+section below).  It will show the vendor/product name of your codec</div><div class='add'>+chip.  Then, see Documentation/sound/HD-Audio-Models.rst file,</div><div class='add'>+the section of HD-audio driver.  You can find a list of codecs</div><div class='add'>+and ``model`` options belonging to each codec.  For example, for Realtek</div><div class='add'>+ALC262 codec chip, pass ``model=ultra`` for devices that are compatible</div><div class='add'>+with Samsung Q1 Ultra.</div><div class='add'>+</div><div class='add'>+Thus, the first thing you can do for any brand-new, unsupported and</div><div class='add'>+non-working HD-audio hardware is to check HD-audio codec and several</div><div class='add'>+different ``model`` option values.  If you have any luck, some of them</div><div class='add'>+might suit with your device well.</div><div class='add'>+</div><div class='add'>+There are a few special model option values:</div><div class='add'>+</div><div class='add'>+* when 'nofixup' is passed, the device-specific fixups in the codec</div><div class='add'>+  parser are skipped.</div><div class='add'>+* when ``generic`` is passed, the codec-specific parser is skipped and</div><div class='add'>+  only the generic parser is used.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Speaker and Headphone Output</div><div class='add'>+----------------------------</div><div class='add'>+One of the most frequent (and obvious) bugs with HD-audio is the</div><div class='add'>+silent output from either or both of a built-in speaker and a</div><div class='add'>+headphone jack.  In general, you should try a headphone output at</div><div class='add'>+first.  A speaker output often requires more additional controls like</div><div class='add'>+the external amplifier bits.  Thus a headphone output has a slightly</div><div class='add'>+better chance.</div><div class='add'>+</div><div class='add'>+Before making a bug report, double-check whether the mixer is set up</div><div class='add'>+correctly.  The recent version of snd-hda-intel driver provides mostly</div><div class='add'>+"Master" volume control as well as "Front" volume (where Front</div><div class='add'>+indicates the front-channels).  In addition, there can be individual</div><div class='add'>+"Headphone" and "Speaker" controls.</div><div class='add'>+</div><div class='add'>+Ditto for the speaker output.  There can be "External Amplifier"</div><div class='add'>+switch on some codecs.  Turn on this if present.</div><div class='add'>+</div><div class='add'>+Another related problem is the automatic mute of speaker output by</div><div class='add'>+headphone plugging.  This feature is implemented in most cases, but</div><div class='add'>+not on every preset model or codec-support code.</div><div class='add'>+</div><div class='add'>+In anyway, try a different model option if you have such a problem.</div><div class='add'>+Some other models may match better and give you more matching</div><div class='add'>+functionality.  If none of the available models works, send a bug</div><div class='add'>+report.  See the bug report section for details.</div><div class='add'>+</div><div class='add'>+If you are masochistic enough to debug the driver problem, note the</div><div class='add'>+following:</div><div class='add'>+</div><div class='add'>+* The speaker (and the headphone, too) output often requires the</div><div class='add'>+  external amplifier.  This can be set usually via EAPD verb or a</div><div class='add'>+  certain GPIO.  If the codec pin supports EAPD, you have a better</div><div class='add'>+  chance via SET_EAPD_BTL verb (0x70c).  On others, GPIO pin (mostly</div><div class='add'>+  it's either GPIO0 or GPIO1) may turn on/off EAPD.</div><div class='add'>+* Some Realtek codecs require special vendor-specific coefficients to</div><div class='add'>+  turn on the amplifier.  See patch_realtek.c.</div><div class='add'>+* IDT codecs may have extra power-enable/disable controls on each</div><div class='add'>+  analog pin.  See patch_sigmatel.c.</div><div class='add'>+* Very rare but some devices don't accept the pin-detection verb until</div><div class='add'>+  triggered.  Issuing GET_PIN_SENSE verb (0xf09) may result in the</div><div class='add'>+  codec-communication stall.  Some examples are found in</div><div class='add'>+  patch_realtek.c.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Capture Problems</div><div class='add'>+----------------</div><div class='add'>+The capture problems are often because of missing setups of mixers.</div><div class='add'>+Thus, before submitting a bug report, make sure that you set up the</div><div class='add'>+mixer correctly.  For example, both "Capture Volume" and "Capture</div><div class='add'>+Switch" have to be set properly in addition to the right "Capture</div><div class='add'>+Source" or "Input Source" selection.  Some devices have "Mic Boost"</div><div class='add'>+volume or switch.</div><div class='add'>+</div><div class='add'>+When the PCM device is opened via "default" PCM (without pulse-audio</div><div class='add'>+plugin), you'll likely have "Digital Capture Volume" control as well.</div><div class='add'>+This is provided for the extra gain/attenuation of the signal in</div><div class='add'>+software, especially for the inputs without the hardware volume</div><div class='add'>+control such as digital microphones.  Unless really needed, this</div><div class='add'>+should be set to exactly 50%, corresponding to 0dB -- neither extra</div><div class='add'>+gain nor attenuation.  When you use "hw" PCM, i.e., a raw access PCM,</div><div class='add'>+this control will have no influence, though.</div><div class='add'>+</div><div class='add'>+It's known that some codecs / devices have fairly bad analog circuits,</div><div class='add'>+and the recorded sound contains a certain DC-offset.  This is no bug</div><div class='add'>+of the driver.</div><div class='add'>+</div><div class='add'>+Most of modern laptops have no analog CD-input connection.  Thus, the</div><div class='add'>+recording from CD input won't work in many cases although the driver</div><div class='add'>+provides it as the capture source.  Use CDDA instead.</div><div class='add'>+</div><div class='add'>+The automatic switching of the built-in and external mic per plugging</div><div class='add'>+is implemented on some codec models but not on every model.  Partly</div><div class='add'>+because of my laziness but mostly lack of testers.  Feel free to</div><div class='add'>+submit the improvement patch to the author.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Direct Debugging</div><div class='add'>+----------------</div><div class='add'>+If no model option gives you a better result, and you are a tough guy</div><div class='add'>+to fight against evil, try debugging via hitting the raw HD-audio</div><div class='add'>+codec verbs to the device.  Some tools are available: hda-emu and</div><div class='add'>+hda-analyzer.  The detailed description is found in the sections</div><div class='add'>+below.  You'd need to enable hwdep for using these tools.  See "Kernel</div><div class='add'>+Configuration" section.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Other Issues</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+Kernel Configuration</div><div class='add'>+--------------------</div><div class='add'>+In general, I recommend you to enable the sound debug option,</div><div class='add'>+``CONFIG_SND_DEBUG=y``, no matter whether you are debugging or not.</div><div class='add'>+This enables snd_printd() macro and others, and you'll get additional</div><div class='add'>+kernel messages at probing.</div><div class='add'>+</div><div class='add'>+In addition, you can enable ``CONFIG_SND_DEBUG_VERBOSE=y``.  But this</div><div class='add'>+will give you far more messages.  Thus turn this on only when you are</div><div class='add'>+sure to want it.</div><div class='add'>+</div><div class='add'>+Don't forget to turn on the appropriate ``CONFIG_SND_HDA_CODEC_*``</div><div class='add'>+options.  Note that each of them corresponds to the codec chip, not</div><div class='add'>+the controller chip.  Thus, even if lspci shows the Nvidia controller,</div><div class='add'>+you may need to choose the option for other vendors.  If you are</div><div class='add'>+unsure, just select all yes.</div><div class='add'>+</div><div class='add'>+``CONFIG_SND_HDA_HWDEP`` is a useful option for debugging the driver.</div><div class='add'>+When this is enabled, the driver creates hardware-dependent devices</div><div class='add'>+(one per each codec), and you have a raw access to the device via</div><div class='add'>+these device files.  For example, ``hwC0D2`` will be created for the</div><div class='add'>+codec slot #2 of the first card (#0).  For debug-tools such as</div><div class='add'>+hda-verb and hda-analyzer, the hwdep device has to be enabled.</div><div class='add'>+Thus, it'd be better to turn this on always.</div><div class='add'>+</div><div class='add'>+``CONFIG_SND_HDA_RECONFIG`` is a new option, and this depends on the</div><div class='add'>+hwdep option above.  When enabled, you'll have some sysfs files under</div><div class='add'>+the corresponding hwdep directory.  See "HD-audio reconfiguration"</div><div class='add'>+section below.</div><div class='add'>+</div><div class='add'>+``CONFIG_SND_HDA_POWER_SAVE`` option enables the power-saving feature.</div><div class='add'>+See "Power-saving" section below.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Codec Proc-File</div><div class='add'>+---------------</div><div class='add'>+The codec proc-file is a treasure-chest for debugging HD-audio.</div><div class='add'>+It shows most of useful information of each codec widget.</div><div class='add'>+</div><div class='add'>+The proc file is located in /proc/asound/card*/codec#*, one file per</div><div class='add'>+each codec slot.  You can know the codec vendor, product id and</div><div class='add'>+names, the type of each widget, capabilities and so on.</div><div class='add'>+This file, however, doesn't show the jack sensing state, so far.  This</div><div class='add'>+is because the jack-sensing might be depending on the trigger state.</div><div class='add'>+</div><div class='add'>+This file will be picked up by the debug tools, and also it can be fed</div><div class='add'>+to the emulator as the primary codec information.  See the debug tools</div><div class='add'>+section below.</div><div class='add'>+</div><div class='add'>+This proc file can be also used to check whether the generic parser is</div><div class='add'>+used.  When the generic parser is used, the vendor/product ID name</div><div class='add'>+will appear as "Realtek ID 0262", instead of "Realtek ALC262".</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+HD-Audio Reconfiguration</div><div class='add'>+------------------------</div><div class='add'>+This is an experimental feature to allow you re-configure the HD-audio</div><div class='add'>+codec dynamically without reloading the driver.  The following sysfs</div><div class='add'>+files are available under each codec-hwdep device directory (e.g. </div><div class='add'>+/sys/class/sound/hwC0D0):</div><div class='add'>+</div><div class='add'>+vendor_id</div><div class='add'>+    Shows the 32bit codec vendor-id hex number.  You can change the</div><div class='add'>+    vendor-id value by writing to this file.</div><div class='add'>+subsystem_id</div><div class='add'>+    Shows the 32bit codec subsystem-id hex number.  You can change the</div><div class='add'>+    subsystem-id value by writing to this file.</div><div class='add'>+revision_id</div><div class='add'>+    Shows the 32bit codec revision-id hex number.  You can change the</div><div class='add'>+    revision-id value by writing to this file.</div><div class='add'>+afg</div><div class='add'>+    Shows the AFG ID.  This is read-only.</div><div class='add'>+mfg</div><div class='add'>+    Shows the MFG ID.  This is read-only.</div><div class='add'>+name</div><div class='add'>+    Shows the codec name string.  Can be changed by writing to this</div><div class='add'>+    file.</div><div class='add'>+modelname</div><div class='add'>+    Shows the currently set ``model`` option.  Can be changed by writing</div><div class='add'>+    to this file.</div><div class='add'>+init_verbs</div><div class='add'>+    The extra verbs to execute at initialization.  You can add a verb by</div><div class='add'>+    writing to this file.  Pass three numbers: nid, verb and parameter</div><div class='add'>+    (separated with a space).</div><div class='add'>+hints</div><div class='add'>+    Shows / stores hint strings for codec parsers for any use.</div><div class='add'>+    Its format is ``key = value``.  For example, passing ``jack_detect = no``</div><div class='add'>+    will disable the jack detection of the machine completely.</div><div class='add'>+init_pin_configs</div><div class='add'>+    Shows the initial pin default config values set by BIOS.</div><div class='add'>+driver_pin_configs</div><div class='add'>+    Shows the pin default values set by the codec parser explicitly.</div><div class='add'>+    This doesn't show all pin values but only the changed values by</div><div class='add'>+    the parser.  That is, if the parser doesn't change the pin default</div><div class='add'>+    config values by itself, this will contain nothing.</div><div class='add'>+user_pin_configs</div><div class='add'>+    Shows the pin default config values to override the BIOS setup.</div><div class='add'>+    Writing this (with two numbers, NID and value) appends the new</div><div class='add'>+    value.  The given will be used instead of the initial BIOS value at</div><div class='add'>+    the next reconfiguration time.  Note that this config will override</div><div class='add'>+    even the driver pin configs, too.</div><div class='add'>+reconfig</div><div class='add'>+    Triggers the codec re-configuration.  When any value is written to</div><div class='add'>+    this file, the driver re-initialize and parses the codec tree</div><div class='add'>+    again.  All the changes done by the sysfs entries above are taken</div><div class='add'>+    into account.</div><div class='add'>+clear</div><div class='add'>+    Resets the codec, removes the mixer elements and PCM stuff of the</div><div class='add'>+    specified codec, and clear all init verbs and hints.</div><div class='add'>+</div><div class='add'>+For example, when you want to change the pin default configuration</div><div class='add'>+value of the pin widget 0x14 to 0x9993013f, and let the driver</div><div class='add'>+re-configure based on that state, run like below:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    # echo 0x14 0x9993013f &gt; /sys/class/sound/hwC0D0/user_pin_configs</div><div class='add'>+    # echo 1 &gt; /sys/class/sound/hwC0D0/reconfig  </div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Hint Strings</div><div class='add'>+------------</div><div class='add'>+The codec parser have several switches and adjustment knobs for</div><div class='add'>+matching better with the actual codec or device behavior.  Many of</div><div class='add'>+them can be adjusted dynamically via "hints" strings as mentioned in</div><div class='add'>+the section above.  For example, by passing ``jack_detect = no`` string</div><div class='add'>+via sysfs or a patch file, you can disable the jack detection, thus</div><div class='add'>+the codec parser will skip the features like auto-mute or mic</div><div class='add'>+auto-switch.  As a boolean value, either ``yes``, ``no``, ``true``, ``false``,</div><div class='add'>+``1`` or ``0`` can be passed.</div><div class='add'>+</div><div class='add'>+The generic parser supports the following hints:</div><div class='add'>+</div><div class='add'>+jack_detect (bool)</div><div class='add'>+    specify whether the jack detection is available at all on this</div><div class='add'>+    machine; default true</div><div class='add'>+inv_jack_detect (bool)</div><div class='add'>+    indicates that the jack detection logic is inverted</div><div class='add'>+trigger_sense (bool)</div><div class='add'>+    indicates that the jack detection needs the explicit call of</div><div class='add'>+    AC_VERB_SET_PIN_SENSE verb</div><div class='add'>+inv_eapd (bool)</div><div class='add'>+    indicates that the EAPD is implemented in the inverted logic</div><div class='add'>+pcm_format_first (bool)</div><div class='add'>+    sets the PCM format before the stream tag and channel ID</div><div class='add'>+sticky_stream (bool)</div><div class='add'>+    keep the PCM format, stream tag and ID as long as possible;</div><div class='add'>+    default true</div><div class='add'>+spdif_status_reset (bool)</div><div class='add'>+    reset the SPDIF status bits at each time the SPDIF stream is set</div><div class='add'>+    up</div><div class='add'>+pin_amp_workaround (bool)</div><div class='add'>+    the output pin may have multiple amp values</div><div class='add'>+single_adc_amp (bool)</div><div class='add'>+    ADCs can have only single input amps</div><div class='add'>+auto_mute (bool)</div><div class='add'>+    enable/disable the headphone auto-mute feature; default true</div><div class='add'>+auto_mic (bool)</div><div class='add'>+    enable/disable the mic auto-switch feature; default true</div><div class='add'>+line_in_auto_switch (bool)</div><div class='add'>+    enable/disable the line-in auto-switch feature; default false</div><div class='add'>+need_dac_fix (bool)</div><div class='add'>+    limits the DACs depending on the channel count</div><div class='add'>+primary_hp (bool)</div><div class='add'>+    probe headphone jacks as the primary outputs; default true</div><div class='add'>+multi_io (bool)</div><div class='add'>+    try probing multi-I/O config (e.g. shared line-in/surround,</div><div class='add'>+    mic/clfe jacks)</div><div class='add'>+multi_cap_vol (bool)</div><div class='add'>+    provide multiple capture volumes</div><div class='add'>+inv_dmic_split (bool)</div><div class='add'>+    provide split internal mic volume/switch for phase-inverted</div><div class='add'>+    digital mics</div><div class='add'>+indep_hp (bool)</div><div class='add'>+    provide the independent headphone PCM stream and the corresponding</div><div class='add'>+    mixer control, if available</div><div class='add'>+add_stereo_mix_input (bool)</div><div class='add'>+    add the stereo mix (analog-loopback mix) to the input mux if</div><div class='add'>+    available </div><div class='add'>+add_jack_modes (bool)</div><div class='add'>+    add "xxx Jack Mode" enum controls to each I/O jack for allowing to</div><div class='add'>+    change the headphone amp and mic bias VREF capabilities</div><div class='add'>+power_save_node (bool)</div><div class='add'>+    advanced power management for each widget, controlling the power</div><div class='add'>+    sate (D0/D3) of each widget node depending on the actual pin and</div><div class='add'>+    stream states</div><div class='add'>+power_down_unused (bool)</div><div class='add'>+    power down the unused widgets, a subset of power_save_node, and</div><div class='add'>+    will be dropped in future </div><div class='add'>+add_hp_mic (bool)</div><div class='add'>+    add the headphone to capture source if possible</div><div class='add'>+hp_mic_detect (bool)</div><div class='add'>+    enable/disable the hp/mic shared input for a single built-in mic</div><div class='add'>+    case; default true</div><div class='add'>+mixer_nid (int)</div><div class='add'>+    specifies the widget NID of the analog-loopback mixer</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Early Patching</div><div class='add'>+--------------</div><div class='add'>+When ``CONFIG_SND_HDA_PATCH_LOADER=y`` is set, you can pass a "patch"</div><div class='add'>+as a firmware file for modifying the HD-audio setup before</div><div class='add'>+initializing the codec.  This can work basically like the</div><div class='add'>+reconfiguration via sysfs in the above, but it does it before the</div><div class='add'>+first codec configuration.</div><div class='add'>+</div><div class='add'>+A patch file is a plain text file which looks like below:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    [codec]</div><div class='add'>+    0x12345678 0xabcd1234 2</div><div class='add'>+</div><div class='add'>+    [model]</div><div class='add'>+    auto</div><div class='add'>+</div><div class='add'>+    [pincfg]</div><div class='add'>+    0x12 0x411111f0</div><div class='add'>+</div><div class='add'>+    [verb]</div><div class='add'>+    0x20 0x500 0x03</div><div class='add'>+    0x20 0x400 0xff</div><div class='add'>+</div><div class='add'>+    [hint]</div><div class='add'>+    jack_detect = no</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The file needs to have a line ``[codec]``.  The next line should contain</div><div class='add'>+three numbers indicating the codec vendor-id (0x12345678 in the</div><div class='add'>+example), the codec subsystem-id (0xabcd1234) and the address (2) of</div><div class='add'>+the codec.  The rest patch entries are applied to this specified codec</div><div class='add'>+until another codec entry is given.  Passing 0 or a negative number to</div><div class='add'>+the first or the second value will make the check of the corresponding</div><div class='add'>+field be skipped.  It'll be useful for really broken devices that don't</div><div class='add'>+initialize SSID properly.</div><div class='add'>+</div><div class='add'>+The ``[model]`` line allows to change the model name of the each codec.</div><div class='add'>+In the example above, it will be changed to model=auto.</div><div class='add'>+Note that this overrides the module option.</div><div class='add'>+</div><div class='add'>+After the ``[pincfg]`` line, the contents are parsed as the initial</div><div class='add'>+default pin-configurations just like ``user_pin_configs`` sysfs above.</div><div class='add'>+The values can be shown in user_pin_configs sysfs file, too.</div><div class='add'>+</div><div class='add'>+Similarly, the lines after ``[verb]`` are parsed as ``init_verbs``</div><div class='add'>+sysfs entries, and the lines after ``[hint]`` are parsed as ``hints``</div><div class='add'>+sysfs entries, respectively.</div><div class='add'>+</div><div class='add'>+Another example to override the codec vendor id from 0x12345678 to</div><div class='add'>+0xdeadbeef is like below:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    [codec]</div><div class='add'>+    0x12345678 0xabcd1234 2</div><div class='add'>+</div><div class='add'>+    [vendor_id]</div><div class='add'>+    0xdeadbeef</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+In the similar way, you can override the codec subsystem_id via</div><div class='add'>+``[subsystem_id]``, the revision id via ``[revision_id]`` line.</div><div class='add'>+Also, the codec chip name can be rewritten via ``[chip_name]`` line.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    [codec]</div><div class='add'>+    0x12345678 0xabcd1234 2</div><div class='add'>+</div><div class='add'>+    [subsystem_id]</div><div class='add'>+    0xffff1111</div><div class='add'>+</div><div class='add'>+    [revision_id]</div><div class='add'>+    0x10</div><div class='add'>+</div><div class='add'>+    [chip_name]</div><div class='add'>+    My-own NEWS-0002</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The hd-audio driver reads the file via request_firmware().  Thus,</div><div class='add'>+a patch file has to be located on the appropriate firmware path,</div><div class='add'>+typically, /lib/firmware.  For example, when you pass the option</div><div class='add'>+``patch=hda-init.fw``, the file /lib/firmware/hda-init.fw must be</div><div class='add'>+present.</div><div class='add'>+</div><div class='add'>+The patch module option is specific to each card instance, and you</div><div class='add'>+need to give one file name for each instance, separated by commas.</div><div class='add'>+For example, if you have two cards, one for an on-board analog and one </div><div class='add'>+for an HDMI video board, you may pass patch option like below:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    options snd-hda-intel patch=on-board-patch,hdmi-patch</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Power-Saving</div><div class='add'>+------------</div><div class='add'>+The power-saving is a kind of auto-suspend of the device.  When the</div><div class='add'>+device is inactive for a certain time, the device is automatically</div><div class='add'>+turned off to save the power.  The time to go down is specified via</div><div class='add'>+``power_save`` module option, and this option can be changed dynamically</div><div class='add'>+via sysfs.</div><div class='add'>+</div><div class='add'>+The power-saving won't work when the analog loopback is enabled on</div><div class='add'>+some codecs.  Make sure that you mute all unneeded signal routes when</div><div class='add'>+you want the power-saving.</div><div class='add'>+</div><div class='add'>+The power-saving feature might cause audible click noises at each</div><div class='add'>+power-down/up depending on the device.  Some of them might be</div><div class='add'>+solvable, but some are hard, I'm afraid.  Some distros such as</div><div class='add'>+openSUSE enables the power-saving feature automatically when the power</div><div class='add'>+cable is unplugged.  Thus, if you hear noises, suspect first the</div><div class='add'>+power-saving.  See /sys/module/snd_hda_intel/parameters/power_save to</div><div class='add'>+check the current value.  If it's non-zero, the feature is turned on.</div><div class='add'>+</div><div class='add'>+The recent kernel supports the runtime PM for the HD-audio controller</div><div class='add'>+chip, too.  It means that the HD-audio controller is also powered up /</div><div class='add'>+down dynamically.  The feature is enabled only for certain controller</div><div class='add'>+chips like Intel LynxPoint.  You can enable/disable this feature</div><div class='add'>+forcibly by setting ``power_save_controller`` option, which is also</div><div class='add'>+available at /sys/module/snd_hda_intel/parameters directory.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Tracepoints</div><div class='add'>+-----------</div><div class='add'>+The hd-audio driver gives a few basic tracepoints.</div><div class='add'>+``hda:hda_send_cmd`` traces each CORB write while ``hda:hda_get_response``</div><div class='add'>+traces the response from RIRB (only when read from the codec driver).</div><div class='add'>+``hda:hda_bus_reset`` traces the bus-reset due to fatal error, etc,</div><div class='add'>+``hda:hda_unsol_event`` traces the unsolicited events, and</div><div class='add'>+``hda:hda_power_down`` and ``hda:hda_power_up`` trace the power down/up</div><div class='add'>+via power-saving behavior.</div><div class='add'>+</div><div class='add'>+Enabling all tracepoints can be done like</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    # echo 1 &gt; /sys/kernel/debug/tracing/events/hda/enable</div><div class='add'>+</div><div class='add'>+then after some commands, you can traces from</div><div class='add'>+/sys/kernel/debug/tracing/trace file.  For example, when you want to</div><div class='add'>+trace what codec command is sent, enable the tracepoint like:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    # cat /sys/kernel/debug/tracing/trace</div><div class='add'>+    # tracer: nop</div><div class='add'>+    #</div><div class='add'>+    #       TASK-PID    CPU#    TIMESTAMP  FUNCTION</div><div class='add'>+    #          | |       |          |         |</div><div class='add'>+	   &lt;...&gt;-7807  [002] 105147.774889: hda_send_cmd: [0:0] val=e3a019</div><div class='add'>+	   &lt;...&gt;-7807  [002] 105147.774893: hda_send_cmd: [0:0] val=e39019</div><div class='add'>+	   &lt;...&gt;-7807  [002] 105147.999542: hda_send_cmd: [0:0] val=e3a01a</div><div class='add'>+	   &lt;...&gt;-7807  [002] 105147.999543: hda_send_cmd: [0:0] val=e3901a</div><div class='add'>+	   &lt;...&gt;-26764 [001] 349222.837143: hda_send_cmd: [0:0] val=e3a019</div><div class='add'>+	   &lt;...&gt;-26764 [001] 349222.837148: hda_send_cmd: [0:0] val=e39019</div><div class='add'>+	   &lt;...&gt;-26764 [001] 349223.058539: hda_send_cmd: [0:0] val=e3a01a</div><div class='add'>+	   &lt;...&gt;-26764 [001] 349223.058541: hda_send_cmd: [0:0] val=e3901a</div><div class='add'>+</div><div class='add'>+Here ``[0:0]`` indicates the card number and the codec address, and</div><div class='add'>+``val`` shows the value sent to the codec, respectively.  The value is</div><div class='add'>+a packed value, and you can decode it via hda-decode-verb program</div><div class='add'>+included in hda-emu package below.  For example, the value e3a019 is</div><div class='add'>+to set the left output-amp value to 25.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    % hda-decode-verb 0xe3a019</div><div class='add'>+    raw value = 0x00e3a019</div><div class='add'>+    cid = 0, nid = 0x0e, verb = 0x3a0, parm = 0x19</div><div class='add'>+    raw value: verb = 0x3a0, parm = 0x19</div><div class='add'>+    verbname = set_amp_gain_mute</div><div class='add'>+    amp raw val = 0xa019</div><div class='add'>+    output, left, idx=0, mute=0, val=25</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Development Tree</div><div class='add'>+----------------</div><div class='add'>+The latest development codes for HD-audio are found on sound git tree:</div><div class='add'>+</div><div class='add'>+* git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git</div><div class='add'>+</div><div class='add'>+The master branch or for-next branches can be used as the main</div><div class='add'>+development branches in general while the development for the current</div><div class='add'>+and next kernels are found in for-linus and for-next branches,</div><div class='add'>+respectively.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Sending a Bug Report</div><div class='add'>+--------------------</div><div class='add'>+If any model or module options don't work for your device, it's time</div><div class='add'>+to send a bug report to the developers.  Give the following in your</div><div class='add'>+bug report:</div><div class='add'>+</div><div class='add'>+* Hardware vendor, product and model names</div><div class='add'>+* Kernel version (and ALSA-driver version if you built externally)</div><div class='add'>+* ``alsa-info.sh`` output; run with ``--no-upload`` option.  See the</div><div class='add'>+  section below about alsa-info</div><div class='add'>+</div><div class='add'>+If it's a regression, at best, send alsa-info outputs of both working</div><div class='add'>+and non-working kernels.  This is really helpful because we can</div><div class='add'>+compare the codec registers directly.</div><div class='add'>+</div><div class='add'>+Send a bug report either the following:</div><div class='add'>+</div><div class='add'>+kernel-bugzilla</div><div class='add'>+    https://bugzilla.kernel.org/</div><div class='add'>+alsa-devel ML</div><div class='add'>+    alsa-devel@alsa-project.org</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Debug Tools</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+This section describes some tools available for debugging HD-audio</div><div class='add'>+problems.</div><div class='add'>+</div><div class='add'>+alsa-info</div><div class='add'>+---------</div><div class='add'>+The script ``alsa-info.sh`` is a very useful tool to gather the audio</div><div class='add'>+device information.  It's included in alsa-utils package.  The latest</div><div class='add'>+version can be found on git repository:</div><div class='add'>+</div><div class='add'>+* git://git.alsa-project.org/alsa-utils.git</div><div class='add'>+</div><div class='add'>+The script can be fetched directly from the following URL, too:</div><div class='add'>+</div><div class='add'>+* http://www.alsa-project.org/alsa-info.sh</div><div class='add'>+</div><div class='add'>+Run this script as root, and it will gather the important information</div><div class='add'>+such as the module lists, module parameters, proc file contents</div><div class='add'>+including the codec proc files, mixer outputs and the control</div><div class='add'>+elements.  As default, it will store the information onto a web server</div><div class='add'>+on alsa-project.org.  But, if you send a bug report, it'd be better to</div><div class='add'>+run with ``--no-upload`` option, and attach the generated file.</div><div class='add'>+</div><div class='add'>+There are some other useful options.  See ``--help`` option output for</div><div class='add'>+details.</div><div class='add'>+</div><div class='add'>+When a probe error occurs or when the driver obviously assigns a</div><div class='add'>+mismatched model, it'd be helpful to load the driver with</div><div class='add'>+``probe_only=1`` option (at best after the cold reboot) and run</div><div class='add'>+alsa-info at this state.  With this option, the driver won't configure</div><div class='add'>+the mixer and PCM but just tries to probe the codec slot.  After</div><div class='add'>+probing, the proc file is available, so you can get the raw codec</div><div class='add'>+information before modified by the driver.  Of course, the driver</div><div class='add'>+isn't usable with ``probe_only=1``.  But you can continue the</div><div class='add'>+configuration via hwdep sysfs file if hda-reconfig option is enabled.</div><div class='add'>+Using ``probe_only`` mask 2 skips the reset of HDA codecs (use</div><div class='add'>+``probe_only=3`` as module option). The hwdep interface can be used</div><div class='add'>+to determine the BIOS codec initialization.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+hda-verb</div><div class='add'>+--------</div><div class='add'>+hda-verb is a tiny program that allows you to access the HD-audio</div><div class='add'>+codec directly.  You can execute a raw HD-audio codec verb with this.</div><div class='add'>+This program accesses the hwdep device, thus you need to enable the</div><div class='add'>+kernel config ``CONFIG_SND_HDA_HWDEP=y`` beforehand.</div><div class='add'>+</div><div class='add'>+The hda-verb program takes four arguments: the hwdep device file, the</div><div class='add'>+widget NID, the verb and the parameter.  When you access to the codec</div><div class='add'>+on the slot 2 of the card 0, pass /dev/snd/hwC0D2 to the first</div><div class='add'>+argument, typically.  (However, the real path name depends on the</div><div class='add'>+system.)</div><div class='add'>+</div><div class='add'>+The second parameter is the widget number-id to access.  The third</div><div class='add'>+parameter can be either a hex/digit number or a string corresponding</div><div class='add'>+to a verb.  Similarly, the last parameter is the value to write, or</div><div class='add'>+can be a string for the parameter type.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    % hda-verb /dev/snd/hwC0D0 0x12 0x701 2</div><div class='add'>+    nid = 0x12, verb = 0x701, param = 0x2</div><div class='add'>+    value = 0x0</div><div class='add'>+</div><div class='add'>+    % hda-verb /dev/snd/hwC0D0 0x0 PARAMETERS VENDOR_ID</div><div class='add'>+    nid = 0x0, verb = 0xf00, param = 0x0</div><div class='add'>+    value = 0x10ec0262</div><div class='add'>+</div><div class='add'>+    % hda-verb /dev/snd/hwC0D0 2 set_a 0xb080</div><div class='add'>+    nid = 0x2, verb = 0x300, param = 0xb080</div><div class='add'>+    value = 0x0</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Although you can issue any verbs with this program, the driver state</div><div class='add'>+won't be always updated.  For example, the volume values are usually</div><div class='add'>+cached in the driver, and thus changing the widget amp value directly</div><div class='add'>+via hda-verb won't change the mixer value.</div><div class='add'>+</div><div class='add'>+The hda-verb program is included now in alsa-tools:</div><div class='add'>+</div><div class='add'>+* git://git.alsa-project.org/alsa-tools.git</div><div class='add'>+</div><div class='add'>+Also, the old stand-alone package is found in the ftp directory:</div><div class='add'>+</div><div class='add'>+* ftp://ftp.suse.com/pub/people/tiwai/misc/</div><div class='add'>+</div><div class='add'>+Also a git repository is available:</div><div class='add'>+</div><div class='add'>+* git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/hda-verb.git</div><div class='add'>+</div><div class='add'>+See README file in the tarball for more details about hda-verb</div><div class='add'>+program.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+hda-analyzer</div><div class='add'>+------------</div><div class='add'>+hda-analyzer provides a graphical interface to access the raw HD-audio</div><div class='add'>+control, based on pyGTK2 binding.  It's a more powerful version of</div><div class='add'>+hda-verb.  The program gives you an easy-to-use GUI stuff for showing</div><div class='add'>+the widget information and adjusting the amp values, as well as the</div><div class='add'>+proc-compatible output.</div><div class='add'>+</div><div class='add'>+The hda-analyzer:</div><div class='add'>+</div><div class='add'>+* http://git.alsa-project.org/?p=alsa.git;a=tree;f=hda-analyzer</div><div class='add'>+</div><div class='add'>+is a part of alsa.git repository in alsa-project.org:</div><div class='add'>+</div><div class='add'>+* git://git.alsa-project.org/alsa.git</div><div class='add'>+</div><div class='add'>+Codecgraph</div><div class='add'>+----------</div><div class='add'>+Codecgraph is a utility program to generate a graph and visualizes the</div><div class='add'>+codec-node connection of a codec chip.  It's especially useful when</div><div class='add'>+you analyze or debug a codec without a proper datasheet.  The program</div><div class='add'>+parses the given codec proc file and converts to SVG via graphiz</div><div class='add'>+program.</div><div class='add'>+</div><div class='add'>+The tarball and GIT trees are found in the web page at:</div><div class='add'>+</div><div class='add'>+* http://helllabs.org/codecgraph/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+hda-emu</div><div class='add'>+-------</div><div class='add'>+hda-emu is an HD-audio emulator.  The main purpose of this program is</div><div class='add'>+to debug an HD-audio codec without the real hardware.  Thus, it</div><div class='add'>+doesn't emulate the behavior with the real audio I/O, but it just</div><div class='add'>+dumps the codec register changes and the ALSA-driver internal changes</div><div class='add'>+at probing and operating the HD-audio driver.</div><div class='add'>+</div><div class='add'>+The program requires a codec proc-file to simulate.  Get a proc file</div><div class='add'>+for the target codec beforehand, or pick up an example codec from the</div><div class='add'>+codec proc collections in the tarball.  Then, run the program with the</div><div class='add'>+proc file, and the hda-emu program will start parsing the codec file</div><div class='add'>+and simulates the HD-audio driver:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    % hda-emu codecs/stac9200-dell-d820-laptop</div><div class='add'>+    # Parsing..</div><div class='add'>+    hda_codec: Unknown model for STAC9200, using BIOS defaults</div><div class='add'>+    hda_codec: pin nid 08 bios pin config 40c003fa</div><div class='add'>+    ....</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The program gives you only a very dumb command-line interface.  You</div><div class='add'>+can get a proc-file dump at the current state, get a list of control</div><div class='add'>+(mixer) elements, set/get the control element value, simulate the PCM</div><div class='add'>+operation, the jack plugging simulation, etc.</div><div class='add'>+</div><div class='add'>+The program is found in the git repository below:</div><div class='add'>+</div><div class='add'>+* git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/hda-emu.git</div><div class='add'>+</div><div class='add'>+See README file in the repository for more details about hda-emu</div><div class='add'>+program.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+hda-jack-retask</div><div class='add'>+---------------</div><div class='add'>+hda-jack-retask is a user-friendly GUI program to manipulate the</div><div class='add'>+HD-audio pin control for jack retasking.  If you have a problem about</div><div class='add'>+the jack assignment, try this program and check whether you can get</div><div class='add'>+useful results.  Once when you figure out the proper pin assignment,</div><div class='add'>+it can be fixed either in the driver code statically or via passing a</div><div class='add'>+firmware patch file (see "Early Patching" section).</div><div class='add'>+</div><div class='add'>+The program is included in alsa-tools now:</div><div class='add'>+</div><div class='add'>+* git://git.alsa-project.org/alsa-tools.git</div><div class='head'>diff --git a/Documentation/sound/index.rst b/Documentation/sound/index.rst<br/>new file mode 100644<br/>index 000000000000..47b89f014e69<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/index.rst</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+===================================</div><div class='add'>+Linux Sound Subsystem Documentation</div><div class='add'>+===================================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   kernel-api/index</div><div class='add'>+   designs/index</div><div class='add'>+   soc/index</div><div class='add'>+   alsa-configuration</div><div class='add'>+   hd-audio/index</div><div class='add'>+   cards/index</div><div class='add'>+</div><div class='add'>+.. only::  subproject</div><div class='add'>+</div><div class='add'>+   Indices</div><div class='add'>+   =======</div><div class='add'>+</div><div class='add'>+   * :ref:`genindex`</div><div class='head'>diff --git a/Documentation/sound/kernel-api/alsa-driver-api.rst b/Documentation/sound/kernel-api/alsa-driver-api.rst<br/>new file mode 100644<br/>index 000000000000..14cd138989e3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/kernel-api/alsa-driver-api.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/kernel-api/alsa-driver-api.rst</a></div><div class='hunk'>@@ -0,0 +1,134 @@</div><div class='add'>+===================</div><div class='add'>+The ALSA Driver API</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+Management of Cards and Devices</div><div class='add'>+===============================</div><div class='add'>+</div><div class='add'>+Card Management</div><div class='add'>+---------------</div><div class='add'>+.. kernel-doc:: sound/core/init.c</div><div class='add'>+</div><div class='add'>+Device Components</div><div class='add'>+-----------------</div><div class='add'>+.. kernel-doc:: sound/core/device.c</div><div class='add'>+</div><div class='add'>+Module requests and Device File Entries</div><div class='add'>+---------------------------------------</div><div class='add'>+.. kernel-doc:: sound/core/sound.c</div><div class='add'>+</div><div class='add'>+Memory Management Helpers</div><div class='add'>+-------------------------</div><div class='add'>+.. kernel-doc:: sound/core/memory.c</div><div class='add'>+.. kernel-doc:: sound/core/memalloc.c</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PCM API</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+PCM Core</div><div class='add'>+--------</div><div class='add'>+.. kernel-doc:: sound/core/pcm.c</div><div class='add'>+.. kernel-doc:: sound/core/pcm_lib.c</div><div class='add'>+.. kernel-doc:: sound/core/pcm_native.c</div><div class='add'>+.. kernel-doc:: include/sound/pcm.h</div><div class='add'>+</div><div class='add'>+PCM Format Helpers</div><div class='add'>+------------------</div><div class='add'>+.. kernel-doc:: sound/core/pcm_misc.c</div><div class='add'>+</div><div class='add'>+PCM Memory Management</div><div class='add'>+---------------------</div><div class='add'>+.. kernel-doc:: sound/core/pcm_memory.c</div><div class='add'>+</div><div class='add'>+PCM DMA Engine API</div><div class='add'>+------------------</div><div class='add'>+.. kernel-doc:: sound/core/pcm_dmaengine.c</div><div class='add'>+.. kernel-doc:: include/sound/dmaengine_pcm.h</div><div class='add'>+</div><div class='add'>+Control/Mixer API</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+General Control Interface</div><div class='add'>+-------------------------</div><div class='add'>+.. kernel-doc:: sound/core/control.c</div><div class='add'>+</div><div class='add'>+AC97 Codec API</div><div class='add'>+--------------</div><div class='add'>+.. kernel-doc:: sound/pci/ac97/ac97_codec.c</div><div class='add'>+.. kernel-doc:: sound/pci/ac97/ac97_pcm.c</div><div class='add'>+</div><div class='add'>+Virtual Master Control API</div><div class='add'>+--------------------------</div><div class='add'>+.. kernel-doc:: sound/core/vmaster.c</div><div class='add'>+.. kernel-doc:: include/sound/control.h</div><div class='add'>+</div><div class='add'>+MIDI API</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+Raw MIDI API</div><div class='add'>+------------</div><div class='add'>+.. kernel-doc:: sound/core/rawmidi.c</div><div class='add'>+</div><div class='add'>+MPU401-UART API</div><div class='add'>+---------------</div><div class='add'>+.. kernel-doc:: sound/drivers/mpu401/mpu401_uart.c</div><div class='add'>+</div><div class='add'>+Proc Info API</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+Proc Info Interface</div><div class='add'>+-------------------</div><div class='add'>+.. kernel-doc:: sound/core/info.c</div><div class='add'>+</div><div class='add'>+Compress Offload</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+Compress Offload API</div><div class='add'>+--------------------</div><div class='add'>+.. kernel-doc:: sound/core/compress_offload.c</div><div class='add'>+.. kernel-doc:: include/uapi/sound/compress_offload.h</div><div class='add'>+.. kernel-doc:: include/uapi/sound/compress_params.h</div><div class='add'>+.. kernel-doc:: include/sound/compress_driver.h</div><div class='add'>+</div><div class='add'>+ASoC</div><div class='add'>+====</div><div class='add'>+</div><div class='add'>+ASoC Core API</div><div class='add'>+-------------</div><div class='add'>+.. kernel-doc:: include/sound/soc.h</div><div class='add'>+.. kernel-doc:: sound/soc/soc-core.c</div><div class='add'>+.. kernel-doc:: sound/soc/soc-devres.c</div><div class='add'>+.. kernel-doc:: sound/soc/soc-io.c</div><div class='add'>+.. kernel-doc:: sound/soc/soc-pcm.c</div><div class='add'>+.. kernel-doc:: sound/soc/soc-ops.c</div><div class='add'>+.. kernel-doc:: sound/soc/soc-compress.c</div><div class='add'>+</div><div class='add'>+ASoC DAPM API</div><div class='add'>+-------------</div><div class='add'>+.. kernel-doc:: sound/soc/soc-dapm.c</div><div class='add'>+</div><div class='add'>+ASoC DMA Engine API</div><div class='add'>+-------------------</div><div class='add'>+.. kernel-doc:: sound/soc/soc-generic-dmaengine-pcm.c</div><div class='add'>+</div><div class='add'>+Miscellaneous Functions</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+Hardware-Dependent Devices API</div><div class='add'>+------------------------------</div><div class='add'>+.. kernel-doc:: sound/core/hwdep.c</div><div class='add'>+</div><div class='add'>+Jack Abstraction Layer API</div><div class='add'>+--------------------------</div><div class='add'>+.. kernel-doc:: include/sound/jack.h</div><div class='add'>+.. kernel-doc:: sound/core/jack.c</div><div class='add'>+.. kernel-doc:: sound/soc/soc-jack.c</div><div class='add'>+</div><div class='add'>+ISA DMA Helpers</div><div class='add'>+---------------</div><div class='add'>+.. kernel-doc:: sound/core/isadma.c</div><div class='add'>+</div><div class='add'>+Other Helper Macros</div><div class='add'>+-------------------</div><div class='add'>+.. kernel-doc:: include/sound/core.h</div><div class='head'>diff --git a/Documentation/sound/kernel-api/index.rst b/Documentation/sound/kernel-api/index.rst<br/>new file mode 100644<br/>index 000000000000..d0e6df35b4b4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/kernel-api/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/kernel-api/index.rst</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+ALSA Kernel API Documentation</div><div class='add'>+=============================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   alsa-driver-api</div><div class='add'>+   writing-an-alsa-driver</div><div class='head'>diff --git a/Documentation/sound/kernel-api/writing-an-alsa-driver.rst b/Documentation/sound/kernel-api/writing-an-alsa-driver.rst<br/>new file mode 100644<br/>index 000000000000..95c5443eff38<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/kernel-api/writing-an-alsa-driver.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/kernel-api/writing-an-alsa-driver.rst</a></div><div class='hunk'>@@ -0,0 +1,4219 @@</div><div class='add'>+======================</div><div class='add'>+Writing an ALSA Driver</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+:Author: Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+:Date:   Oct 15, 2007</div><div class='add'>+:Edition: 0.3.7</div><div class='add'>+</div><div class='add'>+Preface</div><div class='add'>+=======</div><div class='add'>+</div><div class='add'>+This document describes how to write an `ALSA (Advanced Linux Sound</div><div class='add'>+Architecture) &lt;http://www.alsa-project.org/&gt;`__ driver. The document</div><div class='add'>+focuses mainly on PCI soundcards. In the case of other device types, the</div><div class='add'>+API might be different, too. However, at least the ALSA kernel API is</div><div class='add'>+consistent, and therefore it would be still a bit help for writing them.</div><div class='add'>+</div><div class='add'>+This document targets people who already have enough C language skills</div><div class='add'>+and have basic linux kernel programming knowledge. This document doesn't</div><div class='add'>+explain the general topic of linux kernel coding and doesn't cover</div><div class='add'>+low-level driver implementation details. It only describes the standard</div><div class='add'>+way to write a PCI sound driver on ALSA.</div><div class='add'>+</div><div class='add'>+If you are already familiar with the older ALSA ver.0.5.x API, you can</div><div class='add'>+check the drivers such as ``sound/pci/es1938.c`` or</div><div class='add'>+``sound/pci/maestro3.c`` which have also almost the same code-base in</div><div class='add'>+the ALSA 0.5.x tree, so you can compare the differences.</div><div class='add'>+</div><div class='add'>+This document is still a draft version. Any feedback and corrections,</div><div class='add'>+please!!</div><div class='add'>+</div><div class='add'>+File Tree Structure</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+General</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+The ALSA drivers are provided in two ways.</div><div class='add'>+</div><div class='add'>+One is the trees provided as a tarball or via cvs from the ALSA's ftp</div><div class='add'>+site, and another is the 2.6 (or later) Linux kernel tree. To</div><div class='add'>+synchronize both, the ALSA driver tree is split into two different</div><div class='add'>+trees: alsa-kernel and alsa-driver. The former contains purely the</div><div class='add'>+source code for the Linux 2.6 (or later) tree. This tree is designed</div><div class='add'>+only for compilation on 2.6 or later environment. The latter,</div><div class='add'>+alsa-driver, contains many subtle files for compiling ALSA drivers</div><div class='add'>+outside of the Linux kernel tree, wrapper functions for older 2.2 and</div><div class='add'>+2.4 kernels, to adapt the latest kernel API, and additional drivers</div><div class='add'>+which are still in development or in tests. The drivers in alsa-driver</div><div class='add'>+tree will be moved to alsa-kernel (and eventually to the 2.6 kernel</div><div class='add'>+tree) when they are finished and confirmed to work fine.</div><div class='add'>+</div><div class='add'>+The file tree structure of ALSA driver is depicted below. Both</div><div class='add'>+alsa-kernel and alsa-driver have almost the same file structure, except</div><div class='add'>+for “core” directory. It's named as “acore” in alsa-driver tree.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+            sound</div><div class='add'>+                    /core</div><div class='add'>+                            /oss</div><div class='add'>+                            /seq</div><div class='add'>+                                    /oss</div><div class='add'>+                                    /instr</div><div class='add'>+                    /ioctl32</div><div class='add'>+                    /include</div><div class='add'>+                    /drivers</div><div class='add'>+                            /mpu401</div><div class='add'>+                            /opl3</div><div class='add'>+                    /i2c</div><div class='add'>+                            /l3</div><div class='add'>+                    /synth</div><div class='add'>+                            /emux</div><div class='add'>+                    /pci</div><div class='add'>+                            /(cards)</div><div class='add'>+                    /isa</div><div class='add'>+                            /(cards)</div><div class='add'>+                    /arm</div><div class='add'>+                    /ppc</div><div class='add'>+                    /sparc</div><div class='add'>+                    /usb</div><div class='add'>+                    /pcmcia /(cards)</div><div class='add'>+                    /oss</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+core directory</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+This directory contains the middle layer which is the heart of ALSA</div><div class='add'>+drivers. In this directory, the native ALSA modules are stored. The</div><div class='add'>+sub-directories contain different modules and are dependent upon the</div><div class='add'>+kernel config.</div><div class='add'>+</div><div class='add'>+core/oss</div><div class='add'>+~~~~~~~~</div><div class='add'>+</div><div class='add'>+The codes for PCM and mixer OSS emulation modules are stored in this</div><div class='add'>+directory. The rawmidi OSS emulation is included in the ALSA rawmidi</div><div class='add'>+code since it's quite small. The sequencer code is stored in</div><div class='add'>+``core/seq/oss`` directory (see `below &lt;#core-seq-oss&gt;`__).</div><div class='add'>+</div><div class='add'>+core/ioctl32</div><div class='add'>+~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+This directory contains the 32bit-ioctl wrappers for 64bit architectures</div><div class='add'>+such like x86-64, ppc64 and sparc64. For 32bit and alpha architectures,</div><div class='add'>+these are not compiled.</div><div class='add'>+</div><div class='add'>+core/seq</div><div class='add'>+~~~~~~~~</div><div class='add'>+</div><div class='add'>+This directory and its sub-directories are for the ALSA sequencer. This</div><div class='add'>+directory contains the sequencer core and primary sequencer modules such</div><div class='add'>+like snd-seq-midi, snd-seq-virmidi, etc. They are compiled only when</div><div class='add'>+``CONFIG_SND_SEQUENCER`` is set in the kernel config.</div><div class='add'>+</div><div class='add'>+core/seq/oss</div><div class='add'>+~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+This contains the OSS sequencer emulation codes.</div><div class='add'>+</div><div class='add'>+core/seq/instr</div><div class='add'>+~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+This directory contains the modules for the sequencer instrument layer.</div><div class='add'>+</div><div class='add'>+include directory</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+This is the place for the public header files of ALSA drivers, which are</div><div class='add'>+to be exported to user-space, or included by several files at different</div><div class='add'>+directories. Basically, the private header files should not be placed in</div><div class='add'>+this directory, but you may still find files there, due to historical</div><div class='add'>+reasons :)</div><div class='add'>+</div><div class='add'>+drivers directory</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+This directory contains code shared among different drivers on different</div><div class='add'>+architectures. They are hence supposed not to be architecture-specific.</div><div class='add'>+For example, the dummy pcm driver and the serial MIDI driver are found</div><div class='add'>+in this directory. In the sub-directories, there is code for components</div><div class='add'>+which are independent from bus and cpu architectures.</div><div class='add'>+</div><div class='add'>+drivers/mpu401</div><div class='add'>+~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The MPU401 and MPU401-UART modules are stored here.</div><div class='add'>+</div><div class='add'>+drivers/opl3 and opl4</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The OPL3 and OPL4 FM-synth stuff is found here.</div><div class='add'>+</div><div class='add'>+i2c directory</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+This contains the ALSA i2c components.</div><div class='add'>+</div><div class='add'>+Although there is a standard i2c layer on Linux, ALSA has its own i2c</div><div class='add'>+code for some cards, because the soundcard needs only a simple operation</div><div class='add'>+and the standard i2c API is too complicated for such a purpose.</div><div class='add'>+</div><div class='add'>+i2c/l3</div><div class='add'>+~~~~~~</div><div class='add'>+</div><div class='add'>+This is a sub-directory for ARM L3 i2c.</div><div class='add'>+</div><div class='add'>+synth directory</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+This contains the synth middle-level modules.</div><div class='add'>+</div><div class='add'>+So far, there is only Emu8000/Emu10k1 synth driver under the</div><div class='add'>+``synth/emux`` sub-directory.</div><div class='add'>+</div><div class='add'>+pci directory</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+This directory and its sub-directories hold the top-level card modules</div><div class='add'>+for PCI soundcards and the code specific to the PCI BUS.</div><div class='add'>+</div><div class='add'>+The drivers compiled from a single file are stored directly in the pci</div><div class='add'>+directory, while the drivers with several source files are stored on</div><div class='add'>+their own sub-directory (e.g. emu10k1, ice1712).</div><div class='add'>+</div><div class='add'>+isa directory</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+This directory and its sub-directories hold the top-level card modules</div><div class='add'>+for ISA soundcards.</div><div class='add'>+</div><div class='add'>+arm, ppc, and sparc directories</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+They are used for top-level card modules which are specific to one of</div><div class='add'>+these architectures.</div><div class='add'>+</div><div class='add'>+usb directory</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+This directory contains the USB-audio driver. In the latest version, the</div><div class='add'>+USB MIDI driver is integrated in the usb-audio driver.</div><div class='add'>+</div><div class='add'>+pcmcia directory</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+The PCMCIA, especially PCCard drivers will go here. CardBus drivers will</div><div class='add'>+be in the pci directory, because their API is identical to that of</div><div class='add'>+standard PCI cards.</div><div class='add'>+</div><div class='add'>+oss directory</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+The OSS/Lite source files are stored here in Linux 2.6 (or later) tree.</div><div class='add'>+In the ALSA driver tarball, this directory is empty, of course :)</div><div class='add'>+</div><div class='add'>+Basic Flow for PCI Drivers</div><div class='add'>+==========================</div><div class='add'>+</div><div class='add'>+Outline</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+The minimum flow for PCI soundcards is as follows:</div><div class='add'>+</div><div class='add'>+-  define the PCI ID table (see the section `PCI Entries`_).</div><div class='add'>+</div><div class='add'>+-  create ``probe`` callback.</div><div class='add'>+</div><div class='add'>+-  create ``remove`` callback.</div><div class='add'>+</div><div class='add'>+-  create a :c:type:`struct pci_driver &lt;pci_driver&gt;` structure</div><div class='add'>+   containing the three pointers above.</div><div class='add'>+</div><div class='add'>+-  create an ``init`` function just calling the</div><div class='add'>+   :c:func:`pci_register_driver()` to register the pci_driver</div><div class='add'>+   table defined above.</div><div class='add'>+</div><div class='add'>+-  create an ``exit`` function to call the</div><div class='add'>+   :c:func:`pci_unregister_driver()` function.</div><div class='add'>+</div><div class='add'>+Full Code Example</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+The code example is shown below. Some parts are kept unimplemented at</div><div class='add'>+this moment but will be filled in the next sections. The numbers in the</div><div class='add'>+comment lines of the :c:func:`snd_mychip_probe()` function refer</div><div class='add'>+to details explained in the following section.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      #include &lt;linux/init.h&gt;</div><div class='add'>+      #include &lt;linux/pci.h&gt;</div><div class='add'>+      #include &lt;linux/slab.h&gt;</div><div class='add'>+      #include &lt;sound/core.h&gt;</div><div class='add'>+      #include &lt;sound/initval.h&gt;</div><div class='add'>+</div><div class='add'>+      /* module parameters (see "Module Parameters") */</div><div class='add'>+      /* SNDRV_CARDS: maximum number of cards supported by this module */</div><div class='add'>+      static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='add'>+      static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='add'>+      static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+</div><div class='add'>+      /* definition of the chip-specific record */</div><div class='add'>+      struct mychip {</div><div class='add'>+              struct snd_card *card;</div><div class='add'>+              /* the rest of the implementation will be in section</div><div class='add'>+               * "PCI Resource Management"</div><div class='add'>+               */</div><div class='add'>+      };</div><div class='add'>+</div><div class='add'>+      /* chip-specific destructor</div><div class='add'>+       * (see "PCI Resource Management")</div><div class='add'>+       */</div><div class='add'>+      static int snd_mychip_free(struct mychip *chip)</div><div class='add'>+      {</div><div class='add'>+              .... /* will be implemented later... */</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* component-destructor</div><div class='add'>+       * (see "Management of Cards and Components")</div><div class='add'>+       */</div><div class='add'>+      static int snd_mychip_dev_free(struct snd_device *device)</div><div class='add'>+      {</div><div class='add'>+              return snd_mychip_free(device-&gt;device_data);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* chip-specific constructor</div><div class='add'>+       * (see "Management of Cards and Components")</div><div class='add'>+       */</div><div class='add'>+      static int snd_mychip_create(struct snd_card *card,</div><div class='add'>+                                   struct pci_dev *pci,</div><div class='add'>+                                   struct mychip **rchip)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip;</div><div class='add'>+              int err;</div><div class='add'>+              static struct snd_device_ops ops = {</div><div class='add'>+                     .dev_free = snd_mychip_dev_free,</div><div class='add'>+              };</div><div class='add'>+</div><div class='add'>+              *rchip = NULL;</div><div class='add'>+</div><div class='add'>+              /* check PCI availability here</div><div class='add'>+               * (see "PCI Resource Management")</div><div class='add'>+               */</div><div class='add'>+              ....</div><div class='add'>+</div><div class='add'>+              /* allocate a chip-specific data with zero filled */</div><div class='add'>+              chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='add'>+              if (chip == NULL)</div><div class='add'>+                      return -ENOMEM;</div><div class='add'>+</div><div class='add'>+              chip-&gt;card = card;</div><div class='add'>+</div><div class='add'>+              /* rest of initialization here; will be implemented</div><div class='add'>+               * later, see "PCI Resource Management"</div><div class='add'>+               */</div><div class='add'>+              ....</div><div class='add'>+</div><div class='add'>+              err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='add'>+              if (err &lt; 0) {</div><div class='add'>+                      snd_mychip_free(chip);</div><div class='add'>+                      return err;</div><div class='add'>+              }</div><div class='add'>+</div><div class='add'>+              *rchip = chip;</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* constructor -- see "Driver Constructor" sub-section */</div><div class='add'>+      static int snd_mychip_probe(struct pci_dev *pci,</div><div class='add'>+                                  const struct pci_device_id *pci_id)</div><div class='add'>+      {</div><div class='add'>+              static int dev;</div><div class='add'>+              struct snd_card *card;</div><div class='add'>+              struct mychip *chip;</div><div class='add'>+              int err;</div><div class='add'>+</div><div class='add'>+              /* (1) */</div><div class='add'>+              if (dev &gt;= SNDRV_CARDS)</div><div class='add'>+                      return -ENODEV;</div><div class='add'>+              if (!enable[dev]) {</div><div class='add'>+                      dev++;</div><div class='add'>+                      return -ENOENT;</div><div class='add'>+              }</div><div class='add'>+</div><div class='add'>+              /* (2) */</div><div class='add'>+              err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+                                 0, &amp;card);</div><div class='add'>+              if (err &lt; 0)</div><div class='add'>+                      return err;</div><div class='add'>+</div><div class='add'>+              /* (3) */</div><div class='add'>+              err = snd_mychip_create(card, pci, &amp;chip);</div><div class='add'>+              if (err &lt; 0) {</div><div class='add'>+                      snd_card_free(card);</div><div class='add'>+                      return err;</div><div class='add'>+              }</div><div class='add'>+</div><div class='add'>+              /* (4) */</div><div class='add'>+              strcpy(card-&gt;driver, "My Chip");</div><div class='add'>+              strcpy(card-&gt;shortname, "My Own Chip 123");</div><div class='add'>+              sprintf(card-&gt;longname, "%s at 0x%lx irq %i",</div><div class='add'>+                      card-&gt;shortname, chip-&gt;ioport, chip-&gt;irq);</div><div class='add'>+</div><div class='add'>+              /* (5) */</div><div class='add'>+              .... /* implemented later */</div><div class='add'>+</div><div class='add'>+              /* (6) */</div><div class='add'>+              err = snd_card_register(card);</div><div class='add'>+              if (err &lt; 0) {</div><div class='add'>+                      snd_card_free(card);</div><div class='add'>+                      return err;</div><div class='add'>+              }</div><div class='add'>+</div><div class='add'>+              /* (7) */</div><div class='add'>+              pci_set_drvdata(pci, card);</div><div class='add'>+              dev++;</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* destructor -- see the "Destructor" sub-section */</div><div class='add'>+      static void snd_mychip_remove(struct pci_dev *pci)</div><div class='add'>+      {</div><div class='add'>+              snd_card_free(pci_get_drvdata(pci));</div><div class='add'>+              pci_set_drvdata(pci, NULL);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Driver Constructor</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+The real constructor of PCI drivers is the ``probe`` callback. The</div><div class='add'>+``probe`` callback and other component-constructors which are called</div><div class='add'>+from the ``probe`` callback cannot be used with the ``__init`` prefix</div><div class='add'>+because any PCI device could be a hotplug device.</div><div class='add'>+</div><div class='add'>+In the ``probe`` callback, the following scheme is often used.</div><div class='add'>+</div><div class='add'>+1) Check and increment the device index.</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int dev;</div><div class='add'>+  ....</div><div class='add'>+  if (dev &gt;= SNDRV_CARDS)</div><div class='add'>+          return -ENODEV;</div><div class='add'>+  if (!enable[dev]) {</div><div class='add'>+          dev++;</div><div class='add'>+          return -ENOENT;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+where ``enable[dev]`` is the module option.</div><div class='add'>+</div><div class='add'>+Each time the ``probe`` callback is called, check the availability of</div><div class='add'>+the device. If not available, simply increment the device index and</div><div class='add'>+returns. dev will be incremented also later (`step 7</div><div class='add'>+&lt;#set-the-pci-driver-data-and-return-zero&gt;`__).</div><div class='add'>+</div><div class='add'>+2) Create a card instance</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_card *card;</div><div class='add'>+  int err;</div><div class='add'>+  ....</div><div class='add'>+  err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+                     0, &amp;card);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The details will be explained in the section `Management of Cards and</div><div class='add'>+Components`_.</div><div class='add'>+</div><div class='add'>+3) Create a main component</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+In this part, the PCI resources are allocated.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct mychip *chip;</div><div class='add'>+  ....</div><div class='add'>+  err = snd_mychip_create(card, pci, &amp;chip);</div><div class='add'>+  if (err &lt; 0) {</div><div class='add'>+          snd_card_free(card);</div><div class='add'>+          return err;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+The details will be explained in the section `PCI Resource</div><div class='add'>+Management`_.</div><div class='add'>+</div><div class='add'>+4) Set the driver ID and name strings.</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  strcpy(card-&gt;driver, "My Chip");</div><div class='add'>+  strcpy(card-&gt;shortname, "My Own Chip 123");</div><div class='add'>+  sprintf(card-&gt;longname, "%s at 0x%lx irq %i",</div><div class='add'>+          card-&gt;shortname, chip-&gt;ioport, chip-&gt;irq);</div><div class='add'>+</div><div class='add'>+The driver field holds the minimal ID string of the chip. This is used</div><div class='add'>+by alsa-lib's configurator, so keep it simple but unique. Even the</div><div class='add'>+same driver can have different driver IDs to distinguish the</div><div class='add'>+functionality of each chip type.</div><div class='add'>+</div><div class='add'>+The shortname field is a string shown as more verbose name. The longname</div><div class='add'>+field contains the information shown in ``/proc/asound/cards``.</div><div class='add'>+</div><div class='add'>+5) Create other components, such as mixer, MIDI, etc.</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Here you define the basic components such as `PCM &lt;#PCM-Interface&gt;`__,</div><div class='add'>+mixer (e.g. `AC97 &lt;#API-for-AC97-Codec&gt;`__), MIDI (e.g.</div><div class='add'>+`MPU-401 &lt;#MIDI-MPU401-UART-Interface&gt;`__), and other interfaces.</div><div class='add'>+Also, if you want a `proc file &lt;#Proc-Interface&gt;`__, define it here,</div><div class='add'>+too.</div><div class='add'>+</div><div class='add'>+6) Register the card instance.</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  err = snd_card_register(card);</div><div class='add'>+  if (err &lt; 0) {</div><div class='add'>+          snd_card_free(card);</div><div class='add'>+          return err;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+Will be explained in the section `Management of Cards and</div><div class='add'>+Components`_, too.</div><div class='add'>+</div><div class='add'>+7) Set the PCI driver data and return zero.</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  pci_set_drvdata(pci, card);</div><div class='add'>+  dev++;</div><div class='add'>+  return 0;</div><div class='add'>+</div><div class='add'>+In the above, the card record is stored. This pointer is used in the</div><div class='add'>+remove callback and power-management callbacks, too.</div><div class='add'>+</div><div class='add'>+Destructor</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+The destructor, remove callback, simply releases the card instance. Then</div><div class='add'>+the ALSA middle layer will release all the attached components</div><div class='add'>+automatically.</div><div class='add'>+</div><div class='add'>+It would be typically like the following:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static void snd_mychip_remove(struct pci_dev *pci)</div><div class='add'>+  {</div><div class='add'>+          snd_card_free(pci_get_drvdata(pci));</div><div class='add'>+          pci_set_drvdata(pci, NULL);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The above code assumes that the card pointer is set to the PCI driver</div><div class='add'>+data.</div><div class='add'>+</div><div class='add'>+Header Files</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+For the above example, at least the following include files are</div><div class='add'>+necessary.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  #include &lt;linux/init.h&gt;</div><div class='add'>+  #include &lt;linux/pci.h&gt;</div><div class='add'>+  #include &lt;linux/slab.h&gt;</div><div class='add'>+  #include &lt;sound/core.h&gt;</div><div class='add'>+  #include &lt;sound/initval.h&gt;</div><div class='add'>+</div><div class='add'>+where the last one is necessary only when module options are defined</div><div class='add'>+in the source file. If the code is split into several files, the files</div><div class='add'>+without module options don't need them.</div><div class='add'>+</div><div class='add'>+In addition to these headers, you'll need ``&lt;linux/interrupt.h&gt;`` for</div><div class='add'>+interrupt handling, and ``&lt;asm/io.h&gt;`` for I/O access. If you use the</div><div class='add'>+:c:func:`mdelay()` or :c:func:`udelay()` functions, you'll need</div><div class='add'>+to include ``&lt;linux/delay.h&gt;`` too.</div><div class='add'>+</div><div class='add'>+The ALSA interfaces like the PCM and control APIs are defined in other</div><div class='add'>+``&lt;sound/xxx.h&gt;`` header files. They have to be included after</div><div class='add'>+``&lt;sound/core.h&gt;``.</div><div class='add'>+</div><div class='add'>+Management of Cards and Components</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+Card Instance</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+For each soundcard, a “card” record must be allocated.</div><div class='add'>+</div><div class='add'>+A card record is the headquarters of the soundcard. It manages the whole</div><div class='add'>+list of devices (components) on the soundcard, such as PCM, mixers,</div><div class='add'>+MIDI, synthesizer, and so on. Also, the card record holds the ID and the</div><div class='add'>+name strings of the card, manages the root of proc files, and controls</div><div class='add'>+the power-management states and hotplug disconnections. The component</div><div class='add'>+list on the card record is used to manage the correct release of</div><div class='add'>+resources at destruction.</div><div class='add'>+</div><div class='add'>+As mentioned above, to create a card instance, call</div><div class='add'>+:c:func:`snd_card_new()`.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_card *card;</div><div class='add'>+  int err;</div><div class='add'>+  err = snd_card_new(&amp;pci-&gt;dev, index, id, module, extra_size, &amp;card);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The function takes six arguments: the parent device pointer, the</div><div class='add'>+card-index number, the id string, the module pointer (usually</div><div class='add'>+``THIS_MODULE``), the size of extra-data space, and the pointer to</div><div class='add'>+return the card instance. The extra_size argument is used to allocate</div><div class='add'>+card-&gt;private_data for the chip-specific data. Note that these data are</div><div class='add'>+allocated by :c:func:`snd_card_new()`.</div><div class='add'>+</div><div class='add'>+The first argument, the pointer of struct :c:type:`struct device</div><div class='add'>+&lt;device&gt;`, specifies the parent device. For PCI devices, typically</div><div class='add'>+``&amp;pci-&gt;`` is passed there.</div><div class='add'>+</div><div class='add'>+Components</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+After the card is created, you can attach the components (devices) to</div><div class='add'>+the card instance. In an ALSA driver, a component is represented as a</div><div class='add'>+:c:type:`struct snd_device &lt;snd_device&gt;` object. A component</div><div class='add'>+can be a PCM instance, a control interface, a raw MIDI interface, etc.</div><div class='add'>+Each such instance has one component entry.</div><div class='add'>+</div><div class='add'>+A component can be created via :c:func:`snd_device_new()`</div><div class='add'>+function.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_device_new(card, SNDRV_DEV_XXX, chip, &amp;ops);</div><div class='add'>+</div><div class='add'>+This takes the card pointer, the device-level (``SNDRV_DEV_XXX``), the</div><div class='add'>+data pointer, and the callback pointers (``&amp;ops``). The device-level</div><div class='add'>+defines the type of components and the order of registration and</div><div class='add'>+de-registration. For most components, the device-level is already</div><div class='add'>+defined. For a user-defined component, you can use</div><div class='add'>+``SNDRV_DEV_LOWLEVEL``.</div><div class='add'>+</div><div class='add'>+This function itself doesn't allocate the data space. The data must be</div><div class='add'>+allocated manually beforehand, and its pointer is passed as the</div><div class='add'>+argument. This pointer (``chip`` in the above example) is used as the</div><div class='add'>+identifier for the instance.</div><div class='add'>+</div><div class='add'>+Each pre-defined ALSA component such as ac97 and pcm calls</div><div class='add'>+:c:func:`snd_device_new()` inside its constructor. The destructor</div><div class='add'>+for each component is defined in the callback pointers. Hence, you don't</div><div class='add'>+need to take care of calling a destructor for such a component.</div><div class='add'>+</div><div class='add'>+If you wish to create your own component, you need to set the destructor</div><div class='add'>+function to the dev_free callback in the ``ops``, so that it can be</div><div class='add'>+released automatically via :c:func:`snd_card_free()`. The next</div><div class='add'>+example will show an implementation of chip-specific data.</div><div class='add'>+</div><div class='add'>+Chip-Specific Data</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Chip-specific information, e.g. the I/O port address, its resource</div><div class='add'>+pointer, or the irq number, is stored in the chip-specific record.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct mychip {</div><div class='add'>+          ....</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+In general, there are two ways of allocating the chip record.</div><div class='add'>+</div><div class='add'>+1. Allocating via :c:func:`snd_card_new()`.</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+As mentioned above, you can pass the extra-data-length to the 5th</div><div class='add'>+argument of :c:func:`snd_card_new()`, i.e.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+                     sizeof(struct mychip), &amp;card);</div><div class='add'>+</div><div class='add'>+:c:type:`struct mychip &lt;mychip&gt;` is the type of the chip record.</div><div class='add'>+</div><div class='add'>+In return, the allocated record can be accessed as</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct mychip *chip = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+With this method, you don't have to allocate twice. The record is</div><div class='add'>+released together with the card instance.</div><div class='add'>+</div><div class='add'>+2. Allocating an extra device.</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+After allocating a card instance via :c:func:`snd_card_new()`</div><div class='add'>+(with ``0`` on the 4th arg), call :c:func:`kzalloc()`.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_card *card;</div><div class='add'>+  struct mychip *chip;</div><div class='add'>+  err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+                     0, &amp;card);</div><div class='add'>+  .....</div><div class='add'>+  chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+The chip record should have the field to hold the card pointer at least,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct mychip {</div><div class='add'>+          struct snd_card *card;</div><div class='add'>+          ....</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Then, set the card pointer in the returned chip instance.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  chip-&gt;card = card;</div><div class='add'>+</div><div class='add'>+Next, initialize the fields, and register this chip record as a</div><div class='add'>+low-level device with a specified ``ops``,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static struct snd_device_ops ops = {</div><div class='add'>+          .dev_free =        snd_mychip_dev_free,</div><div class='add'>+  };</div><div class='add'>+  ....</div><div class='add'>+  snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='add'>+</div><div class='add'>+:c:func:`snd_mychip_dev_free()` is the device-destructor</div><div class='add'>+function, which will call the real destructor.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_mychip_dev_free(struct snd_device *device)</div><div class='add'>+  {</div><div class='add'>+          return snd_mychip_free(device-&gt;device_data);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+where :c:func:`snd_mychip_free()` is the real destructor.</div><div class='add'>+</div><div class='add'>+Registration and Release</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+After all components are assigned, register the card instance by calling</div><div class='add'>+:c:func:`snd_card_register()`. Access to the device files is</div><div class='add'>+enabled at this point. That is, before</div><div class='add'>+:c:func:`snd_card_register()` is called, the components are safely</div><div class='add'>+inaccessible from external side. If this call fails, exit the probe</div><div class='add'>+function after releasing the card via :c:func:`snd_card_free()`.</div><div class='add'>+</div><div class='add'>+For releasing the card instance, you can call simply</div><div class='add'>+:c:func:`snd_card_free()`. As mentioned earlier, all components</div><div class='add'>+are released automatically by this call.</div><div class='add'>+</div><div class='add'>+For a device which allows hotplugging, you can use</div><div class='add'>+:c:func:`snd_card_free_when_closed()`. This one will postpone</div><div class='add'>+the destruction until all devices are closed.</div><div class='add'>+</div><div class='add'>+PCI Resource Management</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+Full Code Example</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+In this section, we'll complete the chip-specific constructor,</div><div class='add'>+destructor and PCI entries. Example code is shown first, below.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      struct mychip {</div><div class='add'>+              struct snd_card *card;</div><div class='add'>+              struct pci_dev *pci;</div><div class='add'>+</div><div class='add'>+              unsigned long port;</div><div class='add'>+              int irq;</div><div class='add'>+      };</div><div class='add'>+</div><div class='add'>+      static int snd_mychip_free(struct mychip *chip)</div><div class='add'>+      {</div><div class='add'>+              /* disable hardware here if any */</div><div class='add'>+              .... /* (not implemented in this document) */</div><div class='add'>+</div><div class='add'>+              /* release the irq */</div><div class='add'>+              if (chip-&gt;irq &gt;= 0)</div><div class='add'>+                      free_irq(chip-&gt;irq, chip);</div><div class='add'>+              /* release the I/O ports &amp; memory */</div><div class='add'>+              pci_release_regions(chip-&gt;pci);</div><div class='add'>+              /* disable the PCI entry */</div><div class='add'>+              pci_disable_device(chip-&gt;pci);</div><div class='add'>+              /* release the data */</div><div class='add'>+              kfree(chip);</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* chip-specific constructor */</div><div class='add'>+      static int snd_mychip_create(struct snd_card *card,</div><div class='add'>+                                   struct pci_dev *pci,</div><div class='add'>+                                   struct mychip **rchip)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip;</div><div class='add'>+              int err;</div><div class='add'>+              static struct snd_device_ops ops = {</div><div class='add'>+                     .dev_free = snd_mychip_dev_free,</div><div class='add'>+              };</div><div class='add'>+</div><div class='add'>+              *rchip = NULL;</div><div class='add'>+</div><div class='add'>+              /* initialize the PCI entry */</div><div class='add'>+              err = pci_enable_device(pci);</div><div class='add'>+              if (err &lt; 0)</div><div class='add'>+                      return err;</div><div class='add'>+              /* check PCI availability (28bit DMA) */</div><div class='add'>+              if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0 ||</div><div class='add'>+                  pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0) {</div><div class='add'>+                      printk(KERN_ERR "error to set 28bit mask DMA\n");</div><div class='add'>+                      pci_disable_device(pci);</div><div class='add'>+                      return -ENXIO;</div><div class='add'>+              }</div><div class='add'>+</div><div class='add'>+              chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='add'>+              if (chip == NULL) {</div><div class='add'>+                      pci_disable_device(pci);</div><div class='add'>+                      return -ENOMEM;</div><div class='add'>+              }</div><div class='add'>+</div><div class='add'>+              /* initialize the stuff */</div><div class='add'>+              chip-&gt;card = card;</div><div class='add'>+              chip-&gt;pci = pci;</div><div class='add'>+              chip-&gt;irq = -1;</div><div class='add'>+</div><div class='add'>+              /* (1) PCI resource allocation */</div><div class='add'>+              err = pci_request_regions(pci, "My Chip");</div><div class='add'>+              if (err &lt; 0) {</div><div class='add'>+                      kfree(chip);</div><div class='add'>+                      pci_disable_device(pci);</div><div class='add'>+                      return err;</div><div class='add'>+              }</div><div class='add'>+              chip-&gt;port = pci_resource_start(pci, 0);</div><div class='add'>+              if (request_irq(pci-&gt;irq, snd_mychip_interrupt,</div><div class='add'>+                              IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+                      printk(KERN_ERR "cannot grab irq %d\n", pci-&gt;irq);</div><div class='add'>+                      snd_mychip_free(chip);</div><div class='add'>+                      return -EBUSY;</div><div class='add'>+              }</div><div class='add'>+              chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+</div><div class='add'>+              /* (2) initialization of the chip hardware */</div><div class='add'>+              .... /*   (not implemented in this document) */</div><div class='add'>+</div><div class='add'>+              err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='add'>+              if (err &lt; 0) {</div><div class='add'>+                      snd_mychip_free(chip);</div><div class='add'>+                      return err;</div><div class='add'>+              }</div><div class='add'>+</div><div class='add'>+              *rchip = chip;</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* PCI IDs */</div><div class='add'>+      static struct pci_device_id snd_mychip_ids[] = {</div><div class='add'>+              { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,</div><div class='add'>+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='add'>+              ....</div><div class='add'>+              { 0, }</div><div class='add'>+      };</div><div class='add'>+      MODULE_DEVICE_TABLE(pci, snd_mychip_ids);</div><div class='add'>+</div><div class='add'>+      /* pci_driver definition */</div><div class='add'>+      static struct pci_driver driver = {</div><div class='add'>+              .name = KBUILD_MODNAME,</div><div class='add'>+              .id_table = snd_mychip_ids,</div><div class='add'>+              .probe = snd_mychip_probe,</div><div class='add'>+              .remove = snd_mychip_remove,</div><div class='add'>+      };</div><div class='add'>+</div><div class='add'>+      /* module initialization */</div><div class='add'>+      static int __init alsa_card_mychip_init(void)</div><div class='add'>+      {</div><div class='add'>+              return pci_register_driver(&amp;driver);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* module clean up */</div><div class='add'>+      static void __exit alsa_card_mychip_exit(void)</div><div class='add'>+      {</div><div class='add'>+              pci_unregister_driver(&amp;driver);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      module_init(alsa_card_mychip_init)</div><div class='add'>+      module_exit(alsa_card_mychip_exit)</div><div class='add'>+</div><div class='add'>+      EXPORT_NO_SYMBOLS; /* for old kernels only */</div><div class='add'>+</div><div class='add'>+Some Hafta's</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+The allocation of PCI resources is done in the ``probe`` function, and</div><div class='add'>+usually an extra :c:func:`xxx_create()` function is written for this</div><div class='add'>+purpose.</div><div class='add'>+</div><div class='add'>+In the case of PCI devices, you first have to call the</div><div class='add'>+:c:func:`pci_enable_device()` function before allocating</div><div class='add'>+resources. Also, you need to set the proper PCI DMA mask to limit the</div><div class='add'>+accessed I/O range. In some cases, you might need to call</div><div class='add'>+:c:func:`pci_set_master()` function, too.</div><div class='add'>+</div><div class='add'>+Suppose the 28bit mask, and the code to be added would be like:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  err = pci_enable_device(pci);</div><div class='add'>+  if (err &lt; 0)</div><div class='add'>+          return err;</div><div class='add'>+  if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0 ||</div><div class='add'>+      pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0) {</div><div class='add'>+          printk(KERN_ERR "error to set 28bit mask DMA\n");</div><div class='add'>+          pci_disable_device(pci);</div><div class='add'>+          return -ENXIO;</div><div class='add'>+  }</div><div class='add'>+  </div><div class='add'>+</div><div class='add'>+Resource Allocation</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+The allocation of I/O ports and irqs is done via standard kernel</div><div class='add'>+functions. Unlike ALSA ver.0.5.x., there are no helpers for that. And</div><div class='add'>+these resources must be released in the destructor function (see below).</div><div class='add'>+Also, on ALSA 0.9.x, you don't need to allocate (pseudo-)DMA for PCI</div><div class='add'>+like in ALSA 0.5.x.</div><div class='add'>+</div><div class='add'>+Now assume that the PCI device has an I/O port with 8 bytes and an</div><div class='add'>+interrupt. Then :c:type:`struct mychip &lt;mychip&gt;` will have the</div><div class='add'>+following fields:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct mychip {</div><div class='add'>+          struct snd_card *card;</div><div class='add'>+</div><div class='add'>+          unsigned long port;</div><div class='add'>+          int irq;</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+For an I/O port (and also a memory region), you need to have the</div><div class='add'>+resource pointer for the standard resource management. For an irq, you</div><div class='add'>+have to keep only the irq number (integer). But you need to initialize</div><div class='add'>+this number as -1 before actual allocation, since irq 0 is valid. The</div><div class='add'>+port address and its resource pointer can be initialized as null by</div><div class='add'>+:c:func:`kzalloc()` automatically, so you don't have to take care of</div><div class='add'>+resetting them.</div><div class='add'>+</div><div class='add'>+The allocation of an I/O port is done like this:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  err = pci_request_regions(pci, "My Chip");</div><div class='add'>+  if (err &lt; 0) { </div><div class='add'>+          kfree(chip);</div><div class='add'>+          pci_disable_device(pci);</div><div class='add'>+          return err;</div><div class='add'>+  }</div><div class='add'>+  chip-&gt;port = pci_resource_start(pci, 0);</div><div class='add'>+</div><div class='add'>+It will reserve the I/O port region of 8 bytes of the given PCI device.</div><div class='add'>+The returned value, ``chip-&gt;res_port``, is allocated via</div><div class='add'>+:c:func:`kmalloc()` by :c:func:`request_region()`. The pointer</div><div class='add'>+must be released via :c:func:`kfree()`, but there is a problem with</div><div class='add'>+this. This issue will be explained later.</div><div class='add'>+</div><div class='add'>+The allocation of an interrupt source is done like this:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  if (request_irq(pci-&gt;irq, snd_mychip_interrupt,</div><div class='add'>+                  IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+          printk(KERN_ERR "cannot grab irq %d\n", pci-&gt;irq);</div><div class='add'>+          snd_mychip_free(chip);</div><div class='add'>+          return -EBUSY;</div><div class='add'>+  }</div><div class='add'>+  chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+</div><div class='add'>+where :c:func:`snd_mychip_interrupt()` is the interrupt handler</div><div class='add'>+defined `later &lt;#pcm-interface-interrupt-handler&gt;`__. Note that</div><div class='add'>+``chip-&gt;irq`` should be defined only when :c:func:`request_irq()`</div><div class='add'>+succeeded.</div><div class='add'>+</div><div class='add'>+On the PCI bus, interrupts can be shared. Thus, ``IRQF_SHARED`` is used</div><div class='add'>+as the interrupt flag of :c:func:`request_irq()`.</div><div class='add'>+</div><div class='add'>+The last argument of :c:func:`request_irq()` is the data pointer</div><div class='add'>+passed to the interrupt handler. Usually, the chip-specific record is</div><div class='add'>+used for that, but you can use what you like, too.</div><div class='add'>+</div><div class='add'>+I won't give details about the interrupt handler at this point, but at</div><div class='add'>+least its appearance can be explained now. The interrupt handler looks</div><div class='add'>+usually like the following:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id)</div><div class='add'>+  {</div><div class='add'>+          struct mychip *chip = dev_id;</div><div class='add'>+          ....</div><div class='add'>+          return IRQ_HANDLED;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Now let's write the corresponding destructor for the resources above.</div><div class='add'>+The role of destructor is simple: disable the hardware (if already</div><div class='add'>+activated) and release the resources. So far, we have no hardware part,</div><div class='add'>+so the disabling code is not written here.</div><div class='add'>+</div><div class='add'>+To release the resources, the “check-and-release” method is a safer way.</div><div class='add'>+For the interrupt, do like this:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  if (chip-&gt;irq &gt;= 0)</div><div class='add'>+          free_irq(chip-&gt;irq, chip);</div><div class='add'>+</div><div class='add'>+Since the irq number can start from 0, you should initialize</div><div class='add'>+``chip-&gt;irq`` with a negative value (e.g. -1), so that you can check</div><div class='add'>+the validity of the irq number as above.</div><div class='add'>+</div><div class='add'>+When you requested I/O ports or memory regions via</div><div class='add'>+:c:func:`pci_request_region()` or</div><div class='add'>+:c:func:`pci_request_regions()` like in this example, release the</div><div class='add'>+resource(s) using the corresponding function,</div><div class='add'>+:c:func:`pci_release_region()` or</div><div class='add'>+:c:func:`pci_release_regions()`.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  pci_release_regions(chip-&gt;pci);</div><div class='add'>+</div><div class='add'>+When you requested manually via :c:func:`request_region()` or</div><div class='add'>+:c:func:`request_mem_region()`, you can release it via</div><div class='add'>+:c:func:`release_resource()`. Suppose that you keep the resource</div><div class='add'>+pointer returned from :c:func:`request_region()` in</div><div class='add'>+chip-&gt;res_port, the release procedure looks like:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  release_and_free_resource(chip-&gt;res_port);</div><div class='add'>+</div><div class='add'>+Don't forget to call :c:func:`pci_disable_device()` before the</div><div class='add'>+end.</div><div class='add'>+</div><div class='add'>+And finally, release the chip-specific record.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  kfree(chip);</div><div class='add'>+</div><div class='add'>+We didn't implement the hardware disabling part in the above. If you</div><div class='add'>+need to do this, please note that the destructor may be called even</div><div class='add'>+before the initialization of the chip is completed. It would be better</div><div class='add'>+to have a flag to skip hardware disabling if the hardware was not</div><div class='add'>+initialized yet.</div><div class='add'>+</div><div class='add'>+When the chip-data is assigned to the card using</div><div class='add'>+:c:func:`snd_device_new()` with ``SNDRV_DEV_LOWLELVEL`` , its</div><div class='add'>+destructor is called at the last. That is, it is assured that all other</div><div class='add'>+components like PCMs and controls have already been released. You don't</div><div class='add'>+have to stop PCMs, etc. explicitly, but just call low-level hardware</div><div class='add'>+stopping.</div><div class='add'>+</div><div class='add'>+The management of a memory-mapped region is almost as same as the</div><div class='add'>+management of an I/O port. You'll need three fields like the</div><div class='add'>+following:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct mychip {</div><div class='add'>+          ....</div><div class='add'>+          unsigned long iobase_phys;</div><div class='add'>+          void __iomem *iobase_virt;</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+and the allocation would be like below:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  if ((err = pci_request_regions(pci, "My Chip")) &lt; 0) {</div><div class='add'>+          kfree(chip);</div><div class='add'>+          return err;</div><div class='add'>+  }</div><div class='add'>+  chip-&gt;iobase_phys = pci_resource_start(pci, 0);</div><div class='add'>+  chip-&gt;iobase_virt = ioremap_nocache(chip-&gt;iobase_phys,</div><div class='add'>+                                      pci_resource_len(pci, 0));</div><div class='add'>+</div><div class='add'>+and the corresponding destructor would be:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_mychip_free(struct mychip *chip)</div><div class='add'>+  {</div><div class='add'>+          ....</div><div class='add'>+          if (chip-&gt;iobase_virt)</div><div class='add'>+                  iounmap(chip-&gt;iobase_virt);</div><div class='add'>+          ....</div><div class='add'>+          pci_release_regions(chip-&gt;pci);</div><div class='add'>+          ....</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+PCI Entries</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+So far, so good. Let's finish the missing PCI stuff. At first, we need a</div><div class='add'>+:c:type:`struct pci_device_id &lt;pci_device_id&gt;` table for</div><div class='add'>+this chipset. It's a table of PCI vendor/device ID number, and some</div><div class='add'>+masks.</div><div class='add'>+</div><div class='add'>+For example,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static struct pci_device_id snd_mychip_ids[] = {</div><div class='add'>+          { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,</div><div class='add'>+            PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='add'>+          ....</div><div class='add'>+          { 0, }</div><div class='add'>+  };</div><div class='add'>+  MODULE_DEVICE_TABLE(pci, snd_mychip_ids);</div><div class='add'>+</div><div class='add'>+The first and second fields of the :c:type:`struct pci_device_id</div><div class='add'>+&lt;pci_device_id&gt;` structure are the vendor and device IDs. If you</div><div class='add'>+have no reason to filter the matching devices, you can leave the</div><div class='add'>+remaining fields as above. The last field of the :c:type:`struct</div><div class='add'>+pci_device_id &lt;pci_device_id&gt;` struct contains private data</div><div class='add'>+for this entry. You can specify any value here, for example, to define</div><div class='add'>+specific operations for supported device IDs. Such an example is found</div><div class='add'>+in the intel8x0 driver.</div><div class='add'>+</div><div class='add'>+The last entry of this list is the terminator. You must specify this</div><div class='add'>+all-zero entry.</div><div class='add'>+</div><div class='add'>+Then, prepare the :c:type:`struct pci_driver &lt;pci_driver&gt;`</div><div class='add'>+record:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static struct pci_driver driver = {</div><div class='add'>+          .name = KBUILD_MODNAME,</div><div class='add'>+          .id_table = snd_mychip_ids,</div><div class='add'>+          .probe = snd_mychip_probe,</div><div class='add'>+          .remove = snd_mychip_remove,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+The ``probe`` and ``remove`` functions have already been defined in</div><div class='add'>+the previous sections. The ``name`` field is the name string of this</div><div class='add'>+device. Note that you must not use a slash “/” in this string.</div><div class='add'>+</div><div class='add'>+And at last, the module entries:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int __init alsa_card_mychip_init(void)</div><div class='add'>+  {</div><div class='add'>+          return pci_register_driver(&amp;driver);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  static void __exit alsa_card_mychip_exit(void)</div><div class='add'>+  {</div><div class='add'>+          pci_unregister_driver(&amp;driver);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  module_init(alsa_card_mychip_init)</div><div class='add'>+  module_exit(alsa_card_mychip_exit)</div><div class='add'>+</div><div class='add'>+Note that these module entries are tagged with ``__init`` and ``__exit``</div><div class='add'>+prefixes.</div><div class='add'>+</div><div class='add'>+Oh, one thing was forgotten. If you have no exported symbols, you need</div><div class='add'>+to declare it in 2.2 or 2.4 kernels (it's not necessary in 2.6 kernels).</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  EXPORT_NO_SYMBOLS;</div><div class='add'>+</div><div class='add'>+That's all!</div><div class='add'>+</div><div class='add'>+PCM Interface</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+General</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+The PCM middle layer of ALSA is quite powerful and it is only necessary</div><div class='add'>+for each driver to implement the low-level functions to access its</div><div class='add'>+hardware.</div><div class='add'>+</div><div class='add'>+For accessing to the PCM layer, you need to include ``&lt;sound/pcm.h&gt;``</div><div class='add'>+first. In addition, ``&lt;sound/pcm_params.h&gt;`` might be needed if you</div><div class='add'>+access to some functions related with hw_param.</div><div class='add'>+</div><div class='add'>+Each card device can have up to four pcm instances. A pcm instance</div><div class='add'>+corresponds to a pcm device file. The limitation of number of instances</div><div class='add'>+comes only from the available bit size of the Linux's device numbers.</div><div class='add'>+Once when 64bit device number is used, we'll have more pcm instances</div><div class='add'>+available.</div><div class='add'>+</div><div class='add'>+A pcm instance consists of pcm playback and capture streams, and each</div><div class='add'>+pcm stream consists of one or more pcm substreams. Some soundcards</div><div class='add'>+support multiple playback functions. For example, emu10k1 has a PCM</div><div class='add'>+playback of 32 stereo substreams. In this case, at each open, a free</div><div class='add'>+substream is (usually) automatically chosen and opened. Meanwhile, when</div><div class='add'>+only one substream exists and it was already opened, the successful open</div><div class='add'>+will either block or error with ``EAGAIN`` according to the file open</div><div class='add'>+mode. But you don't have to care about such details in your driver. The</div><div class='add'>+PCM middle layer will take care of such work.</div><div class='add'>+</div><div class='add'>+Full Code Example</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+The example code below does not include any hardware access routines but</div><div class='add'>+shows only the skeleton, how to build up the PCM interfaces.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      #include &lt;sound/pcm.h&gt;</div><div class='add'>+      ....</div><div class='add'>+</div><div class='add'>+      /* hardware definition */</div><div class='add'>+      static struct snd_pcm_hardware snd_mychip_playback_hw = {</div><div class='add'>+              .info = (SNDRV_PCM_INFO_MMAP |</div><div class='add'>+                       SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+                       SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='add'>+                       SNDRV_PCM_INFO_MMAP_VALID),</div><div class='add'>+              .formats =          SNDRV_PCM_FMTBIT_S16_LE,</div><div class='add'>+              .rates =            SNDRV_PCM_RATE_8000_48000,</div><div class='add'>+              .rate_min =         8000,</div><div class='add'>+              .rate_max =         48000,</div><div class='add'>+              .channels_min =     2,</div><div class='add'>+              .channels_max =     2,</div><div class='add'>+              .buffer_bytes_max = 32768,</div><div class='add'>+              .period_bytes_min = 4096,</div><div class='add'>+              .period_bytes_max = 32768,</div><div class='add'>+              .periods_min =      1,</div><div class='add'>+              .periods_max =      1024,</div><div class='add'>+      };</div><div class='add'>+</div><div class='add'>+      /* hardware definition */</div><div class='add'>+      static struct snd_pcm_hardware snd_mychip_capture_hw = {</div><div class='add'>+              .info = (SNDRV_PCM_INFO_MMAP |</div><div class='add'>+                       SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+                       SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='add'>+                       SNDRV_PCM_INFO_MMAP_VALID),</div><div class='add'>+              .formats =          SNDRV_PCM_FMTBIT_S16_LE,</div><div class='add'>+              .rates =            SNDRV_PCM_RATE_8000_48000,</div><div class='add'>+              .rate_min =         8000,</div><div class='add'>+              .rate_max =         48000,</div><div class='add'>+              .channels_min =     2,</div><div class='add'>+              .channels_max =     2,</div><div class='add'>+              .buffer_bytes_max = 32768,</div><div class='add'>+              .period_bytes_min = 4096,</div><div class='add'>+              .period_bytes_max = 32768,</div><div class='add'>+              .periods_min =      1,</div><div class='add'>+              .periods_max =      1024,</div><div class='add'>+      };</div><div class='add'>+</div><div class='add'>+      /* open callback */</div><div class='add'>+      static int snd_mychip_playback_open(struct snd_pcm_substream *substream)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+              struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+              runtime-&gt;hw = snd_mychip_playback_hw;</div><div class='add'>+              /* more hardware-initialization will be done here */</div><div class='add'>+              ....</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* close callback */</div><div class='add'>+      static int snd_mychip_playback_close(struct snd_pcm_substream *substream)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+              /* the hardware-specific codes will be here */</div><div class='add'>+              ....</div><div class='add'>+              return 0;</div><div class='add'>+</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* open callback */</div><div class='add'>+      static int snd_mychip_capture_open(struct snd_pcm_substream *substream)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+              struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+              runtime-&gt;hw = snd_mychip_capture_hw;</div><div class='add'>+              /* more hardware-initialization will be done here */</div><div class='add'>+              ....</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* close callback */</div><div class='add'>+      static int snd_mychip_capture_close(struct snd_pcm_substream *substream)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+              /* the hardware-specific codes will be here */</div><div class='add'>+              ....</div><div class='add'>+              return 0;</div><div class='add'>+</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* hw_params callback */</div><div class='add'>+      static int snd_mychip_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+                                   struct snd_pcm_hw_params *hw_params)</div><div class='add'>+      {</div><div class='add'>+              return snd_pcm_lib_malloc_pages(substream,</div><div class='add'>+                                         params_buffer_bytes(hw_params));</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* hw_free callback */</div><div class='add'>+      static int snd_mychip_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+      {</div><div class='add'>+              return snd_pcm_lib_free_pages(substream);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* prepare callback */</div><div class='add'>+      static int snd_mychip_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+              struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+              /* set up the hardware with the current configuration</div><div class='add'>+               * for example...</div><div class='add'>+               */</div><div class='add'>+              mychip_set_sample_format(chip, runtime-&gt;format);</div><div class='add'>+              mychip_set_sample_rate(chip, runtime-&gt;rate);</div><div class='add'>+              mychip_set_channels(chip, runtime-&gt;channels);</div><div class='add'>+              mychip_set_dma_setup(chip, runtime-&gt;dma_addr,</div><div class='add'>+                                   chip-&gt;buffer_size,</div><div class='add'>+                                   chip-&gt;period_size);</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* trigger callback */</div><div class='add'>+      static int snd_mychip_pcm_trigger(struct snd_pcm_substream *substream,</div><div class='add'>+                                        int cmd)</div><div class='add'>+      {</div><div class='add'>+              switch (cmd) {</div><div class='add'>+              case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+                      /* do something to start the PCM engine */</div><div class='add'>+                      ....</div><div class='add'>+                      break;</div><div class='add'>+              case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+                      /* do something to stop the PCM engine */</div><div class='add'>+                      ....</div><div class='add'>+                      break;</div><div class='add'>+              default:</div><div class='add'>+                      return -EINVAL;</div><div class='add'>+              }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* pointer callback */</div><div class='add'>+      static snd_pcm_uframes_t</div><div class='add'>+      snd_mychip_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+              unsigned int current_ptr;</div><div class='add'>+</div><div class='add'>+              /* get the current hardware pointer */</div><div class='add'>+              current_ptr = mychip_get_hw_pointer(chip);</div><div class='add'>+              return current_ptr;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* operators */</div><div class='add'>+      static struct snd_pcm_ops snd_mychip_playback_ops = {</div><div class='add'>+              .open =        snd_mychip_playback_open,</div><div class='add'>+              .close =       snd_mychip_playback_close,</div><div class='add'>+              .ioctl =       snd_pcm_lib_ioctl,</div><div class='add'>+              .hw_params =   snd_mychip_pcm_hw_params,</div><div class='add'>+              .hw_free =     snd_mychip_pcm_hw_free,</div><div class='add'>+              .prepare =     snd_mychip_pcm_prepare,</div><div class='add'>+              .trigger =     snd_mychip_pcm_trigger,</div><div class='add'>+              .pointer =     snd_mychip_pcm_pointer,</div><div class='add'>+      };</div><div class='add'>+</div><div class='add'>+      /* operators */</div><div class='add'>+      static struct snd_pcm_ops snd_mychip_capture_ops = {</div><div class='add'>+              .open =        snd_mychip_capture_open,</div><div class='add'>+              .close =       snd_mychip_capture_close,</div><div class='add'>+              .ioctl =       snd_pcm_lib_ioctl,</div><div class='add'>+              .hw_params =   snd_mychip_pcm_hw_params,</div><div class='add'>+              .hw_free =     snd_mychip_pcm_hw_free,</div><div class='add'>+              .prepare =     snd_mychip_pcm_prepare,</div><div class='add'>+              .trigger =     snd_mychip_pcm_trigger,</div><div class='add'>+              .pointer =     snd_mychip_pcm_pointer,</div><div class='add'>+      };</div><div class='add'>+</div><div class='add'>+      /*</div><div class='add'>+       *  definitions of capture are omitted here...</div><div class='add'>+       */</div><div class='add'>+</div><div class='add'>+      /* create a pcm device */</div><div class='add'>+      static int snd_mychip_new_pcm(struct mychip *chip)</div><div class='add'>+      {</div><div class='add'>+              struct snd_pcm *pcm;</div><div class='add'>+              int err;</div><div class='add'>+</div><div class='add'>+              err = snd_pcm_new(chip-&gt;card, "My Chip", 0, 1, 1, &amp;pcm);</div><div class='add'>+              if (err &lt; 0)</div><div class='add'>+                      return err;</div><div class='add'>+              pcm-&gt;private_data = chip;</div><div class='add'>+              strcpy(pcm-&gt;name, "My Chip");</div><div class='add'>+              chip-&gt;pcm = pcm;</div><div class='add'>+              /* set operators */</div><div class='add'>+              snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+                              &amp;snd_mychip_playback_ops);</div><div class='add'>+              snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='add'>+                              &amp;snd_mychip_capture_ops);</div><div class='add'>+              /* pre-allocation of buffers */</div><div class='add'>+              /* NOTE: this may fail */</div><div class='add'>+              snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+                                                    snd_dma_pci_data(chip-&gt;pci),</div><div class='add'>+                                                    64*1024, 64*1024);</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PCM Constructor</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+A pcm instance is allocated by the :c:func:`snd_pcm_new()`</div><div class='add'>+function. It would be better to create a constructor for pcm, namely,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_mychip_new_pcm(struct mychip *chip)</div><div class='add'>+  {</div><div class='add'>+          struct snd_pcm *pcm;</div><div class='add'>+          int err;</div><div class='add'>+</div><div class='add'>+          err = snd_pcm_new(chip-&gt;card, "My Chip", 0, 1, 1, &amp;pcm);</div><div class='add'>+          if (err &lt; 0) </div><div class='add'>+                  return err;</div><div class='add'>+          pcm-&gt;private_data = chip;</div><div class='add'>+          strcpy(pcm-&gt;name, "My Chip");</div><div class='add'>+          chip-&gt;pcm = pcm;</div><div class='add'>+	  ....</div><div class='add'>+          return 0;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+The :c:func:`snd_pcm_new()` function takes four arguments. The</div><div class='add'>+first argument is the card pointer to which this pcm is assigned, and</div><div class='add'>+the second is the ID string.</div><div class='add'>+</div><div class='add'>+The third argument (``index``, 0 in the above) is the index of this new</div><div class='add'>+pcm. It begins from zero. If you create more than one pcm instances,</div><div class='add'>+specify the different numbers in this argument. For example, ``index =</div><div class='add'>+1`` for the second PCM device.</div><div class='add'>+</div><div class='add'>+The fourth and fifth arguments are the number of substreams for playback</div><div class='add'>+and capture, respectively. Here 1 is used for both arguments. When no</div><div class='add'>+playback or capture substreams are available, pass 0 to the</div><div class='add'>+corresponding argument.</div><div class='add'>+</div><div class='add'>+If a chip supports multiple playbacks or captures, you can specify more</div><div class='add'>+numbers, but they must be handled properly in open/close, etc.</div><div class='add'>+callbacks. When you need to know which substream you are referring to,</div><div class='add'>+then it can be obtained from :c:type:`struct snd_pcm_substream</div><div class='add'>+&lt;snd_pcm_substream&gt;` data passed to each callback as follows:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_pcm_substream *substream;</div><div class='add'>+  int index = substream-&gt;number;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+After the pcm is created, you need to set operators for each pcm stream.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+                  &amp;snd_mychip_playback_ops);</div><div class='add'>+  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='add'>+                  &amp;snd_mychip_capture_ops);</div><div class='add'>+</div><div class='add'>+The operators are defined typically like this:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static struct snd_pcm_ops snd_mychip_playback_ops = {</div><div class='add'>+          .open =        snd_mychip_pcm_open,</div><div class='add'>+          .close =       snd_mychip_pcm_close,</div><div class='add'>+          .ioctl =       snd_pcm_lib_ioctl,</div><div class='add'>+          .hw_params =   snd_mychip_pcm_hw_params,</div><div class='add'>+          .hw_free =     snd_mychip_pcm_hw_free,</div><div class='add'>+          .prepare =     snd_mychip_pcm_prepare,</div><div class='add'>+          .trigger =     snd_mychip_pcm_trigger,</div><div class='add'>+          .pointer =     snd_mychip_pcm_pointer,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+All the callbacks are described in the Operators_ subsection.</div><div class='add'>+</div><div class='add'>+After setting the operators, you probably will want to pre-allocate the</div><div class='add'>+buffer. For the pre-allocation, simply call the following:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+                                        snd_dma_pci_data(chip-&gt;pci),</div><div class='add'>+                                        64*1024, 64*1024);</div><div class='add'>+</div><div class='add'>+It will allocate a buffer up to 64kB as default. Buffer management</div><div class='add'>+details will be described in the later section `Buffer and Memory</div><div class='add'>+Management`_.</div><div class='add'>+</div><div class='add'>+Additionally, you can set some extra information for this pcm in</div><div class='add'>+``pcm-&gt;info_flags``. The available values are defined as</div><div class='add'>+``SNDRV_PCM_INFO_XXX`` in ``&lt;sound/asound.h&gt;``, which is used for the</div><div class='add'>+hardware definition (described later). When your soundchip supports only</div><div class='add'>+half-duplex, specify like this:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  pcm-&gt;info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+... And the Destructor?</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+The destructor for a pcm instance is not always necessary. Since the pcm</div><div class='add'>+device will be released by the middle layer code automatically, you</div><div class='add'>+don't have to call the destructor explicitly.</div><div class='add'>+</div><div class='add'>+The destructor would be necessary if you created special records</div><div class='add'>+internally and needed to release them. In such a case, set the</div><div class='add'>+destructor function to ``pcm-&gt;private_free``:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      static void mychip_pcm_free(struct snd_pcm *pcm)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = snd_pcm_chip(pcm);</div><div class='add'>+              /* free your own data */</div><div class='add'>+              kfree(chip-&gt;my_private_pcm_data);</div><div class='add'>+              /* do what you like else */</div><div class='add'>+              ....</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      static int snd_mychip_new_pcm(struct mychip *chip)</div><div class='add'>+      {</div><div class='add'>+              struct snd_pcm *pcm;</div><div class='add'>+              ....</div><div class='add'>+              /* allocate your own data */</div><div class='add'>+              chip-&gt;my_private_pcm_data = kmalloc(...);</div><div class='add'>+              /* set the destructor */</div><div class='add'>+              pcm-&gt;private_data = chip;</div><div class='add'>+              pcm-&gt;private_free = mychip_pcm_free;</div><div class='add'>+              ....</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Runtime Pointer - The Chest of PCM Information</div><div class='add'>+----------------------------------------------</div><div class='add'>+</div><div class='add'>+When the PCM substream is opened, a PCM runtime instance is allocated</div><div class='add'>+and assigned to the substream. This pointer is accessible via</div><div class='add'>+``substream-&gt;runtime``. This runtime pointer holds most information you</div><div class='add'>+need to control the PCM: the copy of hw_params and sw_params</div><div class='add'>+configurations, the buffer pointers, mmap records, spinlocks, etc.</div><div class='add'>+</div><div class='add'>+The definition of runtime instance is found in ``&lt;sound/pcm.h&gt;``. Here</div><div class='add'>+are the contents of this file:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct _snd_pcm_runtime {</div><div class='add'>+          /* -- Status -- */</div><div class='add'>+          struct snd_pcm_substream *trigger_master;</div><div class='add'>+          snd_timestamp_t trigger_tstamp;	/* trigger timestamp */</div><div class='add'>+          int overrange;</div><div class='add'>+          snd_pcm_uframes_t avail_max;</div><div class='add'>+          snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */</div><div class='add'>+          snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time*/</div><div class='add'>+  </div><div class='add'>+          /* -- HW params -- */</div><div class='add'>+          snd_pcm_access_t access;	/* access mode */</div><div class='add'>+          snd_pcm_format_t format;	/* SNDRV_PCM_FORMAT_* */</div><div class='add'>+          snd_pcm_subformat_t subformat;	/* subformat */</div><div class='add'>+          unsigned int rate;		/* rate in Hz */</div><div class='add'>+          unsigned int channels;		/* channels */</div><div class='add'>+          snd_pcm_uframes_t period_size;	/* period size */</div><div class='add'>+          unsigned int periods;		/* periods */</div><div class='add'>+          snd_pcm_uframes_t buffer_size;	/* buffer size */</div><div class='add'>+          unsigned int tick_time;		/* tick time */</div><div class='add'>+          snd_pcm_uframes_t min_align;	/* Min alignment for the format */</div><div class='add'>+          size_t byte_align;</div><div class='add'>+          unsigned int frame_bits;</div><div class='add'>+          unsigned int sample_bits;</div><div class='add'>+          unsigned int info;</div><div class='add'>+          unsigned int rate_num;</div><div class='add'>+          unsigned int rate_den;</div><div class='add'>+  </div><div class='add'>+          /* -- SW params -- */</div><div class='add'>+          struct timespec tstamp_mode;	/* mmap timestamp is updated */</div><div class='add'>+          unsigned int period_step;</div><div class='add'>+          unsigned int sleep_min;		/* min ticks to sleep */</div><div class='add'>+          snd_pcm_uframes_t start_threshold;</div><div class='add'>+          snd_pcm_uframes_t stop_threshold;</div><div class='add'>+          snd_pcm_uframes_t silence_threshold; /* Silence filling happens when</div><div class='add'>+                                                  noise is nearest than this */</div><div class='add'>+          snd_pcm_uframes_t silence_size;	/* Silence filling size */</div><div class='add'>+          snd_pcm_uframes_t boundary;	/* pointers wrap point */</div><div class='add'>+  </div><div class='add'>+          snd_pcm_uframes_t silenced_start;</div><div class='add'>+          snd_pcm_uframes_t silenced_size;</div><div class='add'>+  </div><div class='add'>+          snd_pcm_sync_id_t sync;		/* hardware synchronization ID */</div><div class='add'>+  </div><div class='add'>+          /* -- mmap -- */</div><div class='add'>+          volatile struct snd_pcm_mmap_status *status;</div><div class='add'>+          volatile struct snd_pcm_mmap_control *control;</div><div class='add'>+          atomic_t mmap_count;</div><div class='add'>+  </div><div class='add'>+          /* -- locking / scheduling -- */</div><div class='add'>+          spinlock_t lock;</div><div class='add'>+          wait_queue_head_t sleep;</div><div class='add'>+          struct timer_list tick_timer;</div><div class='add'>+          struct fasync_struct *fasync;</div><div class='add'>+</div><div class='add'>+          /* -- private section -- */</div><div class='add'>+          void *private_data;</div><div class='add'>+          void (*private_free)(struct snd_pcm_runtime *runtime);</div><div class='add'>+  </div><div class='add'>+          /* -- hardware description -- */</div><div class='add'>+          struct snd_pcm_hardware hw;</div><div class='add'>+          struct snd_pcm_hw_constraints hw_constraints;</div><div class='add'>+  </div><div class='add'>+          /* -- timer -- */</div><div class='add'>+          unsigned int timer_resolution;	/* timer resolution */</div><div class='add'>+  </div><div class='add'>+          /* -- DMA -- */           </div><div class='add'>+          unsigned char *dma_area;	/* DMA area */</div><div class='add'>+          dma_addr_t dma_addr;		/* physical bus address (not accessible from main CPU) */</div><div class='add'>+          size_t dma_bytes;		/* size of DMA area */</div><div class='add'>+  </div><div class='add'>+          struct snd_dma_buffer *dma_buffer_p;	/* allocated buffer */</div><div class='add'>+  </div><div class='add'>+  #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)</div><div class='add'>+          /* -- OSS things -- */</div><div class='add'>+          struct snd_pcm_oss_runtime oss;</div><div class='add'>+  #endif</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+For the operators (callbacks) of each sound driver, most of these</div><div class='add'>+records are supposed to be read-only. Only the PCM middle-layer changes</div><div class='add'>+/ updates them. The exceptions are the hardware description (hw) DMA</div><div class='add'>+buffer information and the private data. Besides, if you use the</div><div class='add'>+standard buffer allocation method via</div><div class='add'>+:c:func:`snd_pcm_lib_malloc_pages()`, you don't need to set the</div><div class='add'>+DMA buffer information by yourself.</div><div class='add'>+</div><div class='add'>+In the sections below, important records are explained.</div><div class='add'>+</div><div class='add'>+Hardware Description</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The hardware descriptor (:c:type:`struct snd_pcm_hardware</div><div class='add'>+&lt;snd_pcm_hardware&gt;`) contains the definitions of the fundamental</div><div class='add'>+hardware configuration. Above all, you'll need to define this in the</div><div class='add'>+`PCM open callback`_. Note that the runtime instance holds the copy of</div><div class='add'>+the descriptor, not the pointer to the existing descriptor. That is,</div><div class='add'>+in the open callback, you can modify the copied descriptor</div><div class='add'>+(``runtime-&gt;hw``) as you need. For example, if the maximum number of</div><div class='add'>+channels is 1 only on some chip models, you can still use the same</div><div class='add'>+hardware descriptor and change the channels_max later:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+          struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+          ...</div><div class='add'>+          runtime-&gt;hw = snd_mychip_playback_hw; /* common definition */</div><div class='add'>+          if (chip-&gt;model == VERY_OLD_ONE)</div><div class='add'>+                  runtime-&gt;hw.channels_max = 1;</div><div class='add'>+</div><div class='add'>+Typically, you'll have a hardware descriptor as below:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static struct snd_pcm_hardware snd_mychip_playback_hw = {</div><div class='add'>+          .info = (SNDRV_PCM_INFO_MMAP |</div><div class='add'>+                   SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+                   SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='add'>+                   SNDRV_PCM_INFO_MMAP_VALID),</div><div class='add'>+          .formats =          SNDRV_PCM_FMTBIT_S16_LE,</div><div class='add'>+          .rates =            SNDRV_PCM_RATE_8000_48000,</div><div class='add'>+          .rate_min =         8000,</div><div class='add'>+          .rate_max =         48000,</div><div class='add'>+          .channels_min =     2,</div><div class='add'>+          .channels_max =     2,</div><div class='add'>+          .buffer_bytes_max = 32768,</div><div class='add'>+          .period_bytes_min = 4096,</div><div class='add'>+          .period_bytes_max = 32768,</div><div class='add'>+          .periods_min =      1,</div><div class='add'>+          .periods_max =      1024,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+-  The ``info`` field contains the type and capabilities of this</div><div class='add'>+   pcm. The bit flags are defined in ``&lt;sound/asound.h&gt;`` as</div><div class='add'>+   ``SNDRV_PCM_INFO_XXX``. Here, at least, you have to specify whether</div><div class='add'>+   the mmap is supported and which interleaved format is</div><div class='add'>+   supported. When the hardware supports mmap, add the</div><div class='add'>+   ``SNDRV_PCM_INFO_MMAP`` flag here. When the hardware supports the</div><div class='add'>+   interleaved or the non-interleaved formats,</div><div class='add'>+   ``SNDRV_PCM_INFO_INTERLEAVED`` or ``SNDRV_PCM_INFO_NONINTERLEAVED``</div><div class='add'>+   flag must be set, respectively. If both are supported, you can set</div><div class='add'>+   both, too.</div><div class='add'>+</div><div class='add'>+   In the above example, ``MMAP_VALID`` and ``BLOCK_TRANSFER`` are</div><div class='add'>+   specified for the OSS mmap mode. Usually both are set. Of course,</div><div class='add'>+   ``MMAP_VALID`` is set only if the mmap is really supported.</div><div class='add'>+</div><div class='add'>+   The other possible flags are ``SNDRV_PCM_INFO_PAUSE`` and</div><div class='add'>+   ``SNDRV_PCM_INFO_RESUME``. The ``PAUSE`` bit means that the pcm</div><div class='add'>+   supports the “pause” operation, while the ``RESUME`` bit means that</div><div class='add'>+   the pcm supports the full “suspend/resume” operation. If the</div><div class='add'>+   ``PAUSE`` flag is set, the ``trigger`` callback below must handle</div><div class='add'>+   the corresponding (pause push/release) commands. The suspend/resume</div><div class='add'>+   trigger commands can be defined even without the ``RESUME``</div><div class='add'>+   flag. See `Power Management`_ section for details.</div><div class='add'>+</div><div class='add'>+   When the PCM substreams can be synchronized (typically,</div><div class='add'>+   synchronized start/stop of a playback and a capture streams), you</div><div class='add'>+   can give ``SNDRV_PCM_INFO_SYNC_START``, too. In this case, you'll</div><div class='add'>+   need to check the linked-list of PCM substreams in the trigger</div><div class='add'>+   callback. This will be described in the later section.</div><div class='add'>+</div><div class='add'>+-  ``formats`` field contains the bit-flags of supported formats</div><div class='add'>+   (``SNDRV_PCM_FMTBIT_XXX``). If the hardware supports more than one</div><div class='add'>+   format, give all or'ed bits. In the example above, the signed 16bit</div><div class='add'>+   little-endian format is specified.</div><div class='add'>+</div><div class='add'>+-  ``rates`` field contains the bit-flags of supported rates</div><div class='add'>+   (``SNDRV_PCM_RATE_XXX``). When the chip supports continuous rates,</div><div class='add'>+   pass ``CONTINUOUS`` bit additionally. The pre-defined rate bits are</div><div class='add'>+   provided only for typical rates. If your chip supports</div><div class='add'>+   unconventional rates, you need to add the ``KNOT`` bit and set up</div><div class='add'>+   the hardware constraint manually (explained later).</div><div class='add'>+</div><div class='add'>+-  ``rate_min`` and ``rate_max`` define the minimum and maximum sample</div><div class='add'>+   rate. This should correspond somehow to ``rates`` bits.</div><div class='add'>+</div><div class='add'>+-  ``channel_min`` and ``channel_max`` define, as you might already</div><div class='add'>+   expected, the minimum and maximum number of channels.</div><div class='add'>+</div><div class='add'>+-  ``buffer_bytes_max`` defines the maximum buffer size in</div><div class='add'>+   bytes. There is no ``buffer_bytes_min`` field, since it can be</div><div class='add'>+   calculated from the minimum period size and the minimum number of</div><div class='add'>+   periods. Meanwhile, ``period_bytes_min`` and define the minimum and</div><div class='add'>+   maximum size of the period in bytes. ``periods_max`` and</div><div class='add'>+   ``periods_min`` define the maximum and minimum number of periods in</div><div class='add'>+   the buffer.</div><div class='add'>+</div><div class='add'>+   The “period” is a term that corresponds to a fragment in the OSS</div><div class='add'>+   world. The period defines the size at which a PCM interrupt is</div><div class='add'>+   generated. This size strongly depends on the hardware. Generally,</div><div class='add'>+   the smaller period size will give you more interrupts, that is,</div><div class='add'>+   more controls. In the case of capture, this size defines the input</div><div class='add'>+   latency. On the other hand, the whole buffer size defines the</div><div class='add'>+   output latency for the playback direction.</div><div class='add'>+</div><div class='add'>+-  There is also a field ``fifo_size``. This specifies the size of the</div><div class='add'>+   hardware FIFO, but currently it is neither used in the driver nor</div><div class='add'>+   in the alsa-lib. So, you can ignore this field.</div><div class='add'>+</div><div class='add'>+PCM Configurations</div><div class='add'>+~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Ok, let's go back again to the PCM runtime records. The most</div><div class='add'>+frequently referred records in the runtime instance are the PCM</div><div class='add'>+configurations. The PCM configurations are stored in the runtime</div><div class='add'>+instance after the application sends ``hw_params`` data via</div><div class='add'>+alsa-lib. There are many fields copied from hw_params and sw_params</div><div class='add'>+structs. For example, ``format`` holds the format type chosen by the</div><div class='add'>+application. This field contains the enum value</div><div class='add'>+``SNDRV_PCM_FORMAT_XXX``.</div><div class='add'>+</div><div class='add'>+One thing to be noted is that the configured buffer and period sizes</div><div class='add'>+are stored in “frames” in the runtime. In the ALSA world, ``1 frame =</div><div class='add'>+channels \* samples-size``. For conversion between frames and bytes,</div><div class='add'>+you can use the :c:func:`frames_to_bytes()` and</div><div class='add'>+:c:func:`bytes_to_frames()` helper functions.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  period_bytes = frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='add'>+</div><div class='add'>+Also, many software parameters (sw_params) are stored in frames, too.</div><div class='add'>+Please check the type of the field. ``snd_pcm_uframes_t`` is for the</div><div class='add'>+frames as unsigned integer while ``snd_pcm_sframes_t`` is for the</div><div class='add'>+frames as signed integer.</div><div class='add'>+</div><div class='add'>+DMA Buffer Information</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The DMA buffer is defined by the following four fields, ``dma_area``,</div><div class='add'>+``dma_addr``, ``dma_bytes`` and ``dma_private``. The ``dma_area``</div><div class='add'>+holds the buffer pointer (the logical address). You can call</div><div class='add'>+:c:func:`memcpy()` from/to this pointer. Meanwhile, ``dma_addr`` holds</div><div class='add'>+the physical address of the buffer. This field is specified only when</div><div class='add'>+the buffer is a linear buffer. ``dma_bytes`` holds the size of buffer</div><div class='add'>+in bytes. ``dma_private`` is used for the ALSA DMA allocator.</div><div class='add'>+</div><div class='add'>+If you use a standard ALSA function,</div><div class='add'>+:c:func:`snd_pcm_lib_malloc_pages()`, for allocating the buffer,</div><div class='add'>+these fields are set by the ALSA middle layer, and you should *not*</div><div class='add'>+change them by yourself. You can read them but not write them. On the</div><div class='add'>+other hand, if you want to allocate the buffer by yourself, you'll</div><div class='add'>+need to manage it in hw_params callback. At least, ``dma_bytes`` is</div><div class='add'>+mandatory. ``dma_area`` is necessary when the buffer is mmapped. If</div><div class='add'>+your driver doesn't support mmap, this field is not</div><div class='add'>+necessary. ``dma_addr`` is also optional. You can use dma_private as</div><div class='add'>+you like, too.</div><div class='add'>+</div><div class='add'>+Running Status</div><div class='add'>+~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The running status can be referred via ``runtime-&gt;status``. This is</div><div class='add'>+the pointer to the :c:type:`struct snd_pcm_mmap_status</div><div class='add'>+&lt;snd_pcm_mmap_status&gt;` record. For example, you can get the current</div><div class='add'>+DMA hardware pointer via ``runtime-&gt;status-&gt;hw_ptr``.</div><div class='add'>+</div><div class='add'>+The DMA application pointer can be referred via ``runtime-&gt;control``,</div><div class='add'>+which points to the :c:type:`struct snd_pcm_mmap_control</div><div class='add'>+&lt;snd_pcm_mmap_control&gt;` record. However, accessing directly to</div><div class='add'>+this value is not recommended.</div><div class='add'>+</div><div class='add'>+Private Data</div><div class='add'>+~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+You can allocate a record for the substream and store it in</div><div class='add'>+``runtime-&gt;private_data``. Usually, this is done in the `PCM open</div><div class='add'>+callback`_. Don't mix this with ``pcm-&gt;private_data``. The</div><div class='add'>+``pcm-&gt;private_data`` usually points to the chip instance assigned</div><div class='add'>+statically at the creation of PCM, while the ``runtime-&gt;private_data``</div><div class='add'>+points to a dynamic data structure created at the PCM open</div><div class='add'>+callback.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_xxx_open(struct snd_pcm_substream *substream)</div><div class='add'>+  {</div><div class='add'>+          struct my_pcm_data *data;</div><div class='add'>+          ....</div><div class='add'>+          data = kmalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+          substream-&gt;runtime-&gt;private_data = data;</div><div class='add'>+          ....</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The allocated object must be released in the `close callback`_.</div><div class='add'>+</div><div class='add'>+Operators</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+OK, now let me give details about each pcm callback (``ops``). In</div><div class='add'>+general, every callback must return 0 if successful, or a negative</div><div class='add'>+error number such as ``-EINVAL``. To choose an appropriate error</div><div class='add'>+number, it is advised to check what value other parts of the kernel</div><div class='add'>+return when the same kind of request fails.</div><div class='add'>+</div><div class='add'>+The callback function takes at least the argument with :c:type:`struct</div><div class='add'>+snd_pcm_substream &lt;snd_pcm_substream&gt;` pointer. To retrieve the chip</div><div class='add'>+record from the given substream instance, you can use the following</div><div class='add'>+macro.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  int xxx() {</div><div class='add'>+          struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+          ....</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+The macro reads ``substream-&gt;private_data``, which is a copy of</div><div class='add'>+``pcm-&gt;private_data``. You can override the former if you need to</div><div class='add'>+assign different data records per PCM substream. For example, the</div><div class='add'>+cmi8330 driver assigns different ``private_data`` for playback and</div><div class='add'>+capture directions, because it uses two different codecs (SB- and</div><div class='add'>+AD-compatible) for different directions.</div><div class='add'>+</div><div class='add'>+PCM open callback</div><div class='add'>+~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_xxx_open(struct snd_pcm_substream *substream);</div><div class='add'>+</div><div class='add'>+This is called when a pcm substream is opened.</div><div class='add'>+</div><div class='add'>+At least, here you have to initialize the ``runtime-&gt;hw``</div><div class='add'>+record. Typically, this is done by like this:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_xxx_open(struct snd_pcm_substream *substream)</div><div class='add'>+  {</div><div class='add'>+          struct mychip *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+          struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+          runtime-&gt;hw = snd_mychip_playback_hw;</div><div class='add'>+          return 0;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+where ``snd_mychip_playback_hw`` is the pre-defined hardware</div><div class='add'>+description.</div><div class='add'>+</div><div class='add'>+You can allocate a private data in this callback, as described in</div><div class='add'>+`Private Data`_ section.</div><div class='add'>+</div><div class='add'>+If the hardware configuration needs more constraints, set the hardware</div><div class='add'>+constraints here, too. See Constraints_ for more details.</div><div class='add'>+</div><div class='add'>+close callback</div><div class='add'>+~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_xxx_close(struct snd_pcm_substream *substream);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Obviously, this is called when a pcm substream is closed.</div><div class='add'>+</div><div class='add'>+Any private instance for a pcm substream allocated in the ``open``</div><div class='add'>+callback will be released here.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_xxx_close(struct snd_pcm_substream *substream)</div><div class='add'>+  {</div><div class='add'>+          ....</div><div class='add'>+          kfree(substream-&gt;runtime-&gt;private_data);</div><div class='add'>+          ....</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+ioctl callback</div><div class='add'>+~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+This is used for any special call to pcm ioctls. But usually you can</div><div class='add'>+pass a generic ioctl callback, :c:func:`snd_pcm_lib_ioctl()`.</div><div class='add'>+</div><div class='add'>+hw_params callback</div><div class='add'>+~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_xxx_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+                               struct snd_pcm_hw_params *hw_params);</div><div class='add'>+</div><div class='add'>+This is called when the hardware parameter (``hw_params``) is set up</div><div class='add'>+by the application, that is, once when the buffer size, the period</div><div class='add'>+size, the format, etc. are defined for the pcm substream.</div><div class='add'>+</div><div class='add'>+Many hardware setups should be done in this callback, including the</div><div class='add'>+allocation of buffers.</div><div class='add'>+</div><div class='add'>+Parameters to be initialized are retrieved by</div><div class='add'>+:c:func:`params_xxx()` macros. To allocate buffer, you can call a</div><div class='add'>+helper function,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='add'>+</div><div class='add'>+:c:func:`snd_pcm_lib_malloc_pages()` is available only when the</div><div class='add'>+DMA buffers have been pre-allocated. See the section `Buffer Types`_</div><div class='add'>+for more details.</div><div class='add'>+</div><div class='add'>+Note that this and ``prepare`` callbacks may be called multiple times</div><div class='add'>+per initialization. For example, the OSS emulation may call these</div><div class='add'>+callbacks at each change via its ioctl.</div><div class='add'>+</div><div class='add'>+Thus, you need to be careful not to allocate the same buffers many</div><div class='add'>+times, which will lead to memory leaks! Calling the helper function</div><div class='add'>+above many times is OK. It will release the previous buffer</div><div class='add'>+automatically when it was already allocated.</div><div class='add'>+</div><div class='add'>+Another note is that this callback is non-atomic (schedulable) as</div><div class='add'>+default, i.e. when no ``nonatomic`` flag set. This is important,</div><div class='add'>+because the ``trigger`` callback is atomic (non-schedulable). That is,</div><div class='add'>+mutexes or any schedule-related functions are not available in</div><div class='add'>+``trigger`` callback. Please see the subsection Atomicity_ for</div><div class='add'>+details.</div><div class='add'>+</div><div class='add'>+hw_free callback</div><div class='add'>+~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_xxx_hw_free(struct snd_pcm_substream *substream);</div><div class='add'>+</div><div class='add'>+This is called to release the resources allocated via</div><div class='add'>+``hw_params``. For example, releasing the buffer via</div><div class='add'>+:c:func:`snd_pcm_lib_malloc_pages()` is done by calling the</div><div class='add'>+following:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_pcm_lib_free_pages(substream);</div><div class='add'>+</div><div class='add'>+This function is always called before the close callback is called.</div><div class='add'>+Also, the callback may be called multiple times, too. Keep track</div><div class='add'>+whether the resource was already released.</div><div class='add'>+</div><div class='add'>+prepare callback</div><div class='add'>+~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_xxx_prepare(struct snd_pcm_substream *substream);</div><div class='add'>+</div><div class='add'>+This callback is called when the pcm is “prepared”. You can set the</div><div class='add'>+format type, sample rate, etc. here. The difference from ``hw_params``</div><div class='add'>+is that the ``prepare`` callback will be called each time</div><div class='add'>+:c:func:`snd_pcm_prepare()` is called, i.e. when recovering after</div><div class='add'>+underruns, etc.</div><div class='add'>+</div><div class='add'>+Note that this callback is now non-atomic. You can use</div><div class='add'>+schedule-related functions safely in this callback.</div><div class='add'>+</div><div class='add'>+In this and the following callbacks, you can refer to the values via</div><div class='add'>+the runtime record, ``substream-&gt;runtime``. For example, to get the</div><div class='add'>+current rate, format or channels, access to ``runtime-&gt;rate``,</div><div class='add'>+``runtime-&gt;format`` or ``runtime-&gt;channels``, respectively. The</div><div class='add'>+physical address of the allocated buffer is set to</div><div class='add'>+``runtime-&gt;dma_area``. The buffer and period sizes are in</div><div class='add'>+``runtime-&gt;buffer_size`` and ``runtime-&gt;period_size``, respectively.</div><div class='add'>+</div><div class='add'>+Be careful that this callback will be called many times at each setup,</div><div class='add'>+too.</div><div class='add'>+</div><div class='add'>+trigger callback</div><div class='add'>+~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_xxx_trigger(struct snd_pcm_substream *substream, int cmd);</div><div class='add'>+</div><div class='add'>+This is called when the pcm is started, stopped or paused.</div><div class='add'>+</div><div class='add'>+Which action is specified in the second argument,</div><div class='add'>+``SNDRV_PCM_TRIGGER_XXX`` in ``&lt;sound/pcm.h&gt;``. At least, the ``START``</div><div class='add'>+and ``STOP`` commands must be defined in this callback.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  switch (cmd) {</div><div class='add'>+  case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+          /* do something to start the PCM engine */</div><div class='add'>+          break;</div><div class='add'>+  case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+          /* do something to stop the PCM engine */</div><div class='add'>+          break;</div><div class='add'>+  default:</div><div class='add'>+          return -EINVAL;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+When the pcm supports the pause operation (given in the info field of</div><div class='add'>+the hardware table), the ``PAUSE_PUSH`` and ``PAUSE_RELEASE`` commands</div><div class='add'>+must be handled here, too. The former is the command to pause the pcm,</div><div class='add'>+and the latter to restart the pcm again.</div><div class='add'>+</div><div class='add'>+When the pcm supports the suspend/resume operation, regardless of full</div><div class='add'>+or partial suspend/resume support, the ``SUSPEND`` and ``RESUME``</div><div class='add'>+commands must be handled, too. These commands are issued when the</div><div class='add'>+power-management status is changed. Obviously, the ``SUSPEND`` and</div><div class='add'>+``RESUME`` commands suspend and resume the pcm substream, and usually,</div><div class='add'>+they are identical to the ``STOP`` and ``START`` commands, respectively.</div><div class='add'>+See the `Power Management`_ section for details.</div><div class='add'>+</div><div class='add'>+As mentioned, this callback is atomic as default unless ``nonatomic``</div><div class='add'>+flag set, and you cannot call functions which may sleep. The</div><div class='add'>+``trigger`` callback should be as minimal as possible, just really</div><div class='add'>+triggering the DMA. The other stuff should be initialized</div><div class='add'>+``hw_params`` and ``prepare`` callbacks properly beforehand.</div><div class='add'>+</div><div class='add'>+pointer callback</div><div class='add'>+~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static snd_pcm_uframes_t snd_xxx_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+</div><div class='add'>+This callback is called when the PCM middle layer inquires the current</div><div class='add'>+hardware position on the buffer. The position must be returned in</div><div class='add'>+frames, ranging from 0 to ``buffer_size - 1``. </div><div class='add'>+</div><div class='add'>+This is called usually from the buffer-update routine in the pcm</div><div class='add'>+middle layer, which is invoked when :c:func:`snd_pcm_period_elapsed()`</div><div class='add'>+is called in the interrupt routine. Then the pcm middle layer updates</div><div class='add'>+the position and calculates the available space, and wakes up the</div><div class='add'>+sleeping poll threads, etc.</div><div class='add'>+</div><div class='add'>+This callback is also atomic as default.</div><div class='add'>+</div><div class='add'>+copy and silence callbacks</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+These callbacks are not mandatory, and can be omitted in most cases.</div><div class='add'>+These callbacks are used when the hardware buffer cannot be in the</div><div class='add'>+normal memory space. Some chips have their own buffer on the hardware</div><div class='add'>+which is not mappable. In such a case, you have to transfer the data</div><div class='add'>+manually from the memory buffer to the hardware buffer. Or, if the</div><div class='add'>+buffer is non-contiguous on both physical and virtual memory spaces,</div><div class='add'>+these callbacks must be defined, too.</div><div class='add'>+</div><div class='add'>+If these two callbacks are defined, copy and set-silence operations</div><div class='add'>+are done by them. The detailed will be described in the later section</div><div class='add'>+`Buffer and Memory Management`_.</div><div class='add'>+</div><div class='add'>+ack callback</div><div class='add'>+~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+This callback is also not mandatory. This callback is called when the</div><div class='add'>+``appl_ptr`` is updated in read or write operations. Some drivers like</div><div class='add'>+emu10k1-fx and cs46xx need to track the current ``appl_ptr`` for the</div><div class='add'>+internal buffer, and this callback is useful only for such a purpose.</div><div class='add'>+</div><div class='add'>+This callback is atomic as default.</div><div class='add'>+</div><div class='add'>+page callback</div><div class='add'>+~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+This callback is optional too. This callback is used mainly for</div><div class='add'>+non-contiguous buffers. The mmap calls this callback to get the page</div><div class='add'>+address. Some examples will be explained in the later section `Buffer</div><div class='add'>+and Memory Management`_, too.</div><div class='add'>+</div><div class='add'>+PCM Interrupt Handler</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The rest of pcm stuff is the PCM interrupt handler. The role of PCM</div><div class='add'>+interrupt handler in the sound driver is to update the buffer position</div><div class='add'>+and to tell the PCM middle layer when the buffer position goes across</div><div class='add'>+the prescribed period size. To inform this, call the</div><div class='add'>+:c:func:`snd_pcm_period_elapsed()` function.</div><div class='add'>+</div><div class='add'>+There are several types of sound chips to generate the interrupts.</div><div class='add'>+</div><div class='add'>+Interrupts at the period (fragment) boundary</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+This is the most frequently found type: the hardware generates an</div><div class='add'>+interrupt at each period boundary. In this case, you can call</div><div class='add'>+:c:func:`snd_pcm_period_elapsed()` at each interrupt.</div><div class='add'>+</div><div class='add'>+:c:func:`snd_pcm_period_elapsed()` takes the substream pointer as</div><div class='add'>+its argument. Thus, you need to keep the substream pointer accessible</div><div class='add'>+from the chip instance. For example, define ``substream`` field in the</div><div class='add'>+chip record to hold the current running substream pointer, and set the</div><div class='add'>+pointer value at ``open`` callback (and reset at ``close`` callback).</div><div class='add'>+</div><div class='add'>+If you acquire a spinlock in the interrupt handler, and the lock is used</div><div class='add'>+in other pcm callbacks, too, then you have to release the lock before</div><div class='add'>+calling :c:func:`snd_pcm_period_elapsed()`, because</div><div class='add'>+:c:func:`snd_pcm_period_elapsed()` calls other pcm callbacks</div><div class='add'>+inside.</div><div class='add'>+</div><div class='add'>+Typical code would be like:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = dev_id;</div><div class='add'>+              spin_lock(&amp;chip-&gt;lock);</div><div class='add'>+              ....</div><div class='add'>+              if (pcm_irq_invoked(chip)) {</div><div class='add'>+                      /* call updater, unlock before it */</div><div class='add'>+                      spin_unlock(&amp;chip-&gt;lock);</div><div class='add'>+                      snd_pcm_period_elapsed(chip-&gt;substream);</div><div class='add'>+                      spin_lock(&amp;chip-&gt;lock);</div><div class='add'>+                      /* acknowledge the interrupt if necessary */</div><div class='add'>+              }</div><div class='add'>+              ....</div><div class='add'>+              spin_unlock(&amp;chip-&gt;lock);</div><div class='add'>+              return IRQ_HANDLED;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+High frequency timer interrupts</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+This happens when the hardware doesn't generate interrupts at the period</div><div class='add'>+boundary but issues timer interrupts at a fixed timer rate (e.g. es1968</div><div class='add'>+or ymfpci drivers). In this case, you need to check the current hardware</div><div class='add'>+position and accumulate the processed sample length at each interrupt.</div><div class='add'>+When the accumulated size exceeds the period size, call</div><div class='add'>+:c:func:`snd_pcm_period_elapsed()` and reset the accumulator.</div><div class='add'>+</div><div class='add'>+Typical code would be like the following.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = dev_id;</div><div class='add'>+              spin_lock(&amp;chip-&gt;lock);</div><div class='add'>+              ....</div><div class='add'>+              if (pcm_irq_invoked(chip)) {</div><div class='add'>+                      unsigned int last_ptr, size;</div><div class='add'>+                      /* get the current hardware pointer (in frames) */</div><div class='add'>+                      last_ptr = get_hw_ptr(chip);</div><div class='add'>+                      /* calculate the processed frames since the</div><div class='add'>+                       * last update</div><div class='add'>+                       */</div><div class='add'>+                      if (last_ptr &lt; chip-&gt;last_ptr)</div><div class='add'>+                              size = runtime-&gt;buffer_size + last_ptr</div><div class='add'>+                                       - chip-&gt;last_ptr;</div><div class='add'>+                      else</div><div class='add'>+                              size = last_ptr - chip-&gt;last_ptr;</div><div class='add'>+                      /* remember the last updated point */</div><div class='add'>+                      chip-&gt;last_ptr = last_ptr;</div><div class='add'>+                      /* accumulate the size */</div><div class='add'>+                      chip-&gt;size += size;</div><div class='add'>+                      /* over the period boundary? */</div><div class='add'>+                      if (chip-&gt;size &gt;= runtime-&gt;period_size) {</div><div class='add'>+                              /* reset the accumulator */</div><div class='add'>+                              chip-&gt;size %= runtime-&gt;period_size;</div><div class='add'>+                              /* call updater */</div><div class='add'>+                              spin_unlock(&amp;chip-&gt;lock);</div><div class='add'>+                              snd_pcm_period_elapsed(substream);</div><div class='add'>+                              spin_lock(&amp;chip-&gt;lock);</div><div class='add'>+                      }</div><div class='add'>+                      /* acknowledge the interrupt if necessary */</div><div class='add'>+              }</div><div class='add'>+              ....</div><div class='add'>+              spin_unlock(&amp;chip-&gt;lock);</div><div class='add'>+              return IRQ_HANDLED;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+On calling :c:func:`snd_pcm_period_elapsed()`</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+In both cases, even if more than one period are elapsed, you don't have</div><div class='add'>+to call :c:func:`snd_pcm_period_elapsed()` many times. Call only</div><div class='add'>+once. And the pcm layer will check the current hardware pointer and</div><div class='add'>+update to the latest status.</div><div class='add'>+</div><div class='add'>+Atomicity</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+One of the most important (and thus difficult to debug) problems in</div><div class='add'>+kernel programming are race conditions. In the Linux kernel, they are</div><div class='add'>+usually avoided via spin-locks, mutexes or semaphores. In general, if a</div><div class='add'>+race condition can happen in an interrupt handler, it has to be managed</div><div class='add'>+atomically, and you have to use a spinlock to protect the critical</div><div class='add'>+session. If the critical section is not in interrupt handler code and if</div><div class='add'>+taking a relatively long time to execute is acceptable, you should use</div><div class='add'>+mutexes or semaphores instead.</div><div class='add'>+</div><div class='add'>+As already seen, some pcm callbacks are atomic and some are not. For</div><div class='add'>+example, the ``hw_params`` callback is non-atomic, while ``trigger``</div><div class='add'>+callback is atomic. This means, the latter is called already in a</div><div class='add'>+spinlock held by the PCM middle layer. Please take this atomicity into</div><div class='add'>+account when you choose a locking scheme in the callbacks.</div><div class='add'>+</div><div class='add'>+In the atomic callbacks, you cannot use functions which may call</div><div class='add'>+:c:func:`schedule()` or go to :c:func:`sleep()`. Semaphores and</div><div class='add'>+mutexes can sleep, and hence they cannot be used inside the atomic</div><div class='add'>+callbacks (e.g. ``trigger`` callback). To implement some delay in such a</div><div class='add'>+callback, please use :c:func:`udelay()` or :c:func:`mdelay()`.</div><div class='add'>+</div><div class='add'>+All three atomic callbacks (trigger, pointer, and ack) are called with</div><div class='add'>+local interrupts disabled.</div><div class='add'>+</div><div class='add'>+The recent changes in PCM core code, however, allow all PCM operations</div><div class='add'>+to be non-atomic. This assumes that the all caller sides are in</div><div class='add'>+non-atomic contexts. For example, the function</div><div class='add'>+:c:func:`snd_pcm_period_elapsed()` is called typically from the</div><div class='add'>+interrupt handler. But, if you set up the driver to use a threaded</div><div class='add'>+interrupt handler, this call can be in non-atomic context, too. In such</div><div class='add'>+a case, you can set ``nonatomic`` filed of :c:type:`struct snd_pcm</div><div class='add'>+&lt;snd_pcm&gt;` object after creating it. When this flag is set, mutex</div><div class='add'>+and rwsem are used internally in the PCM core instead of spin and</div><div class='add'>+rwlocks, so that you can call all PCM functions safely in a non-atomic</div><div class='add'>+context.</div><div class='add'>+</div><div class='add'>+Constraints</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+If your chip supports unconventional sample rates, or only the limited</div><div class='add'>+samples, you need to set a constraint for the condition.</div><div class='add'>+</div><div class='add'>+For example, in order to restrict the sample rates in the some supported</div><div class='add'>+values, use :c:func:`snd_pcm_hw_constraint_list()`. You need to</div><div class='add'>+call this function in the open callback.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      static unsigned int rates[] =</div><div class='add'>+              {4000, 10000, 22050, 44100};</div><div class='add'>+      static struct snd_pcm_hw_constraint_list constraints_rates = {</div><div class='add'>+              .count = ARRAY_SIZE(rates),</div><div class='add'>+              .list = rates,</div><div class='add'>+              .mask = 0,</div><div class='add'>+      };</div><div class='add'>+</div><div class='add'>+      static int snd_mychip_pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+      {</div><div class='add'>+              int err;</div><div class='add'>+              ....</div><div class='add'>+              err = snd_pcm_hw_constraint_list(substream-&gt;runtime, 0,</div><div class='add'>+                                               SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+                                               &amp;constraints_rates);</div><div class='add'>+              if (err &lt; 0)</div><div class='add'>+                      return err;</div><div class='add'>+              ....</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+There are many different constraints. Look at ``sound/pcm.h`` for a</div><div class='add'>+complete list. You can even define your own constraint rules. For</div><div class='add'>+example, let's suppose my_chip can manage a substream of 1 channel if</div><div class='add'>+and only if the format is ``S16_LE``, otherwise it supports any format</div><div class='add'>+specified in the :c:type:`struct snd_pcm_hardware</div><div class='add'>+&lt;snd_pcm_hardware&gt;` structure (or in any other</div><div class='add'>+constraint_list). You can build a rule like this:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      static int hw_rule_channels_by_format(struct snd_pcm_hw_params *params,</div><div class='add'>+                                            struct snd_pcm_hw_rule *rule)</div><div class='add'>+      {</div><div class='add'>+              struct snd_interval *c = hw_param_interval(params,</div><div class='add'>+                            SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+              struct snd_mask *f = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='add'>+              struct snd_interval ch;</div><div class='add'>+</div><div class='add'>+              snd_interval_any(&amp;ch);</div><div class='add'>+              if (f-&gt;bits[0] == SNDRV_PCM_FMTBIT_S16_LE) {</div><div class='add'>+                      ch.min = ch.max = 1;</div><div class='add'>+                      ch.integer = 1;</div><div class='add'>+                      return snd_interval_refine(c, &amp;ch);</div><div class='add'>+              }</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Then you need to call this function to add your rule:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_pcm_hw_rule_add(substream-&gt;runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+                      hw_rule_channels_by_format, NULL,</div><div class='add'>+                      SNDRV_PCM_HW_PARAM_FORMAT, -1);</div><div class='add'>+</div><div class='add'>+The rule function is called when an application sets the PCM format, and</div><div class='add'>+it refines the number of channels accordingly. But an application may</div><div class='add'>+set the number of channels before setting the format. Thus you also need</div><div class='add'>+to define the inverse rule:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      static int hw_rule_format_by_channels(struct snd_pcm_hw_params *params,</div><div class='add'>+                                            struct snd_pcm_hw_rule *rule)</div><div class='add'>+      {</div><div class='add'>+              struct snd_interval *c = hw_param_interval(params,</div><div class='add'>+                    SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+              struct snd_mask *f = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='add'>+              struct snd_mask fmt;</div><div class='add'>+</div><div class='add'>+              snd_mask_any(&amp;fmt);    /* Init the struct */</div><div class='add'>+              if (c-&gt;min &lt; 2) {</div><div class='add'>+                      fmt.bits[0] &amp;= SNDRV_PCM_FMTBIT_S16_LE;</div><div class='add'>+                      return snd_mask_refine(f, &amp;fmt);</div><div class='add'>+              }</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+... and in the open callback:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_pcm_hw_rule_add(substream-&gt;runtime, 0, SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='add'>+                      hw_rule_format_by_channels, NULL,</div><div class='add'>+                      SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+</div><div class='add'>+I won't give more details here, rather I would like to say, “Luke, use</div><div class='add'>+the source.”</div><div class='add'>+</div><div class='add'>+Control Interface</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+General</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+The control interface is used widely for many switches, sliders, etc.</div><div class='add'>+which are accessed from user-space. Its most important use is the mixer</div><div class='add'>+interface. In other words, since ALSA 0.9.x, all the mixer stuff is</div><div class='add'>+implemented on the control kernel API.</div><div class='add'>+</div><div class='add'>+ALSA has a well-defined AC97 control module. If your chip supports only</div><div class='add'>+the AC97 and nothing else, you can skip this section.</div><div class='add'>+</div><div class='add'>+The control API is defined in ``&lt;sound/control.h&gt;``. Include this file</div><div class='add'>+if you want to add your own controls.</div><div class='add'>+</div><div class='add'>+Definition of Controls</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+To create a new control, you need to define the following three</div><div class='add'>+callbacks: ``info``, ``get`` and ``put``. Then, define a</div><div class='add'>+:c:type:`struct snd_kcontrol_new &lt;snd_kcontrol_new&gt;` record, such as:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      static struct snd_kcontrol_new my_control = {</div><div class='add'>+              .iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+              .name = "PCM Playback Switch",</div><div class='add'>+              .index = 0,</div><div class='add'>+              .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+              .private_value = 0xffff,</div><div class='add'>+              .info = my_control_info,</div><div class='add'>+              .get = my_control_get,</div><div class='add'>+              .put = my_control_put</div><div class='add'>+      };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The ``iface`` field specifies the control type,</div><div class='add'>+``SNDRV_CTL_ELEM_IFACE_XXX``, which is usually ``MIXER``. Use ``CARD``</div><div class='add'>+for global controls that are not logically part of the mixer. If the</div><div class='add'>+control is closely associated with some specific device on the sound</div><div class='add'>+card, use ``HWDEP``, ``PCM``, ``RAWMIDI``, ``TIMER``, or ``SEQUENCER``,</div><div class='add'>+and specify the device number with the ``device`` and ``subdevice``</div><div class='add'>+fields.</div><div class='add'>+</div><div class='add'>+The ``name`` is the name identifier string. Since ALSA 0.9.x, the</div><div class='add'>+control name is very important, because its role is classified from</div><div class='add'>+its name. There are pre-defined standard control names. The details</div><div class='add'>+are described in the `Control Names`_ subsection.</div><div class='add'>+</div><div class='add'>+The ``index`` field holds the index number of this control. If there</div><div class='add'>+are several different controls with the same name, they can be</div><div class='add'>+distinguished by the index number. This is the case when several</div><div class='add'>+codecs exist on the card. If the index is zero, you can omit the</div><div class='add'>+definition above. </div><div class='add'>+</div><div class='add'>+The ``access`` field contains the access type of this control. Give</div><div class='add'>+the combination of bit masks, ``SNDRV_CTL_ELEM_ACCESS_XXX``,</div><div class='add'>+there. The details will be explained in the `Access Flags`_</div><div class='add'>+subsection.</div><div class='add'>+</div><div class='add'>+The ``private_value`` field contains an arbitrary long integer value</div><div class='add'>+for this record. When using the generic ``info``, ``get`` and ``put``</div><div class='add'>+callbacks, you can pass a value through this field. If several small</div><div class='add'>+numbers are necessary, you can combine them in bitwise. Or, it's</div><div class='add'>+possible to give a pointer (casted to unsigned long) of some record to</div><div class='add'>+this field, too. </div><div class='add'>+</div><div class='add'>+The ``tlv`` field can be used to provide metadata about the control;</div><div class='add'>+see the `Metadata`_ subsection.</div><div class='add'>+</div><div class='add'>+The other three are `Control Callbacks`_.</div><div class='add'>+</div><div class='add'>+Control Names</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+There are some standards to define the control names. A control is</div><div class='add'>+usually defined from the three parts as “SOURCE DIRECTION FUNCTION”.</div><div class='add'>+</div><div class='add'>+The first, ``SOURCE``, specifies the source of the control, and is a</div><div class='add'>+string such as “Master”, “PCM”, “CD” and “Line”. There are many</div><div class='add'>+pre-defined sources.</div><div class='add'>+</div><div class='add'>+The second, ``DIRECTION``, is one of the following strings according to</div><div class='add'>+the direction of the control: “Playback”, “Capture”, “Bypass Playback”</div><div class='add'>+and “Bypass Capture”. Or, it can be omitted, meaning both playback and</div><div class='add'>+capture directions.</div><div class='add'>+</div><div class='add'>+The third, ``FUNCTION``, is one of the following strings according to</div><div class='add'>+the function of the control: “Switch”, “Volume” and “Route”.</div><div class='add'>+</div><div class='add'>+The example of control names are, thus, “Master Capture Switch” or “PCM</div><div class='add'>+Playback Volume”.</div><div class='add'>+</div><div class='add'>+There are some exceptions:</div><div class='add'>+</div><div class='add'>+Global capture and playback</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+“Capture Source”, “Capture Switch” and “Capture Volume” are used for the</div><div class='add'>+global capture (input) source, switch and volume. Similarly, “Playback</div><div class='add'>+Switch” and “Playback Volume” are used for the global output gain switch</div><div class='add'>+and volume.</div><div class='add'>+</div><div class='add'>+Tone-controls</div><div class='add'>+~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+tone-control switch and volumes are specified like “Tone Control - XXX”,</div><div class='add'>+e.g. “Tone Control - Switch”, “Tone Control - Bass”, “Tone Control -</div><div class='add'>+Center”.</div><div class='add'>+</div><div class='add'>+3D controls</div><div class='add'>+~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+3D-control switches and volumes are specified like “3D Control - XXX”,</div><div class='add'>+e.g. “3D Control - Switch”, “3D Control - Center”, “3D Control - Space”.</div><div class='add'>+</div><div class='add'>+Mic boost</div><div class='add'>+~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Mic-boost switch is set as “Mic Boost” or “Mic Boost (6dB)”.</div><div class='add'>+</div><div class='add'>+More precise information can be found in</div><div class='add'>+``Documentation/sound/alsa/ControlNames.txt``.</div><div class='add'>+</div><div class='add'>+Access Flags</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+The access flag is the bitmask which specifies the access type of the</div><div class='add'>+given control. The default access type is</div><div class='add'>+``SNDRV_CTL_ELEM_ACCESS_READWRITE``, which means both read and write are</div><div class='add'>+allowed to this control. When the access flag is omitted (i.e. = 0), it</div><div class='add'>+is considered as ``READWRITE`` access as default.</div><div class='add'>+</div><div class='add'>+When the control is read-only, pass ``SNDRV_CTL_ELEM_ACCESS_READ``</div><div class='add'>+instead. In this case, you don't have to define the ``put`` callback.</div><div class='add'>+Similarly, when the control is write-only (although it's a rare case),</div><div class='add'>+you can use the ``WRITE`` flag instead, and you don't need the ``get``</div><div class='add'>+callback.</div><div class='add'>+</div><div class='add'>+If the control value changes frequently (e.g. the VU meter),</div><div class='add'>+``VOLATILE`` flag should be given. This means that the control may be</div><div class='add'>+changed without `Change notification`_. Applications should poll such</div><div class='add'>+a control constantly.</div><div class='add'>+</div><div class='add'>+When the control is inactive, set the ``INACTIVE`` flag, too. There are</div><div class='add'>+``LOCK`` and ``OWNER`` flags to change the write permissions.</div><div class='add'>+</div><div class='add'>+Control Callbacks</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+info callback</div><div class='add'>+~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+The ``info`` callback is used to get detailed information on this</div><div class='add'>+control. This must store the values of the given :c:type:`struct</div><div class='add'>+snd_ctl_elem_info &lt;snd_ctl_elem_info&gt;` object. For example,</div><div class='add'>+for a boolean control with a single element:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      static int snd_myctl_mono_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+                              struct snd_ctl_elem_info *uinfo)</div><div class='add'>+      {</div><div class='add'>+              uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;</div><div class='add'>+              uinfo-&gt;count = 1;</div><div class='add'>+              uinfo-&gt;value.integer.min = 0;</div><div class='add'>+              uinfo-&gt;value.integer.max = 1;</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The ``type`` field specifies the type of the control. There are</div><div class='add'>+``BOOLEAN``, ``INTEGER``, ``ENUMERATED``, ``BYTES``, ``IEC958`` and</div><div class='add'>+``INTEGER64``. The ``count`` field specifies the number of elements in</div><div class='add'>+this control. For example, a stereo volume would have count = 2. The</div><div class='add'>+``value`` field is a union, and the values stored are depending on the</div><div class='add'>+type. The boolean and integer types are identical.</div><div class='add'>+</div><div class='add'>+The enumerated type is a bit different from others. You'll need to set</div><div class='add'>+the string for the currently given item index.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_myctl_enum_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+                          struct snd_ctl_elem_info *uinfo)</div><div class='add'>+  {</div><div class='add'>+          static char *texts[4] = {</div><div class='add'>+                  "First", "Second", "Third", "Fourth"</div><div class='add'>+          };</div><div class='add'>+          uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+          uinfo-&gt;count = 1;</div><div class='add'>+          uinfo-&gt;value.enumerated.items = 4;</div><div class='add'>+          if (uinfo-&gt;value.enumerated.item &gt; 3)</div><div class='add'>+                  uinfo-&gt;value.enumerated.item = 3;</div><div class='add'>+          strcpy(uinfo-&gt;value.enumerated.name,</div><div class='add'>+                 texts[uinfo-&gt;value.enumerated.item]);</div><div class='add'>+          return 0;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+The above callback can be simplified with a helper function,</div><div class='add'>+:c:func:`snd_ctl_enum_info()`. The final code looks like below.</div><div class='add'>+(You can pass ``ARRAY_SIZE(texts)`` instead of 4 in the third argument;</div><div class='add'>+it's a matter of taste.)</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_myctl_enum_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+                          struct snd_ctl_elem_info *uinfo)</div><div class='add'>+  {</div><div class='add'>+          static char *texts[4] = {</div><div class='add'>+                  "First", "Second", "Third", "Fourth"</div><div class='add'>+          };</div><div class='add'>+          return snd_ctl_enum_info(uinfo, 1, 4, texts);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Some common info callbacks are available for your convenience:</div><div class='add'>+:c:func:`snd_ctl_boolean_mono_info()` and</div><div class='add'>+:c:func:`snd_ctl_boolean_stereo_info()`. Obviously, the former</div><div class='add'>+is an info callback for a mono channel boolean item, just like</div><div class='add'>+:c:func:`snd_myctl_mono_info()` above, and the latter is for a</div><div class='add'>+stereo channel boolean item.</div><div class='add'>+</div><div class='add'>+get callback</div><div class='add'>+~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+This callback is used to read the current value of the control and to</div><div class='add'>+return to user-space.</div><div class='add'>+</div><div class='add'>+For example,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      static int snd_myctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+                               struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+              ucontrol-&gt;value.integer.value[0] = get_some_value(chip);</div><div class='add'>+              return 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The ``value`` field depends on the type of control as well as on the</div><div class='add'>+info callback. For example, the sb driver uses this field to store the</div><div class='add'>+register offset, the bit-shift and the bit-mask. The ``private_value``</div><div class='add'>+field is set as follows:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  .private_value = reg | (shift &lt;&lt; 16) | (mask &lt;&lt; 24)</div><div class='add'>+</div><div class='add'>+and is retrieved in callbacks like</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_sbmixer_get_single(struct snd_kcontrol *kcontrol,</div><div class='add'>+                                    struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+  {</div><div class='add'>+          int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='add'>+          int shift = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+          int mask = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+          ....</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+In the ``get`` callback, you have to fill all the elements if the</div><div class='add'>+control has more than one elements, i.e. ``count &gt; 1``. In the example</div><div class='add'>+above, we filled only one element (``value.integer.value[0]``) since</div><div class='add'>+it's assumed as ``count = 1``.</div><div class='add'>+</div><div class='add'>+put callback</div><div class='add'>+~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+This callback is used to write a value from user-space.</div><div class='add'>+</div><div class='add'>+For example,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      static int snd_myctl_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+                               struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+              int changed = 0;</div><div class='add'>+              if (chip-&gt;current_value !=</div><div class='add'>+                   ucontrol-&gt;value.integer.value[0]) {</div><div class='add'>+                      change_current_value(chip,</div><div class='add'>+                                  ucontrol-&gt;value.integer.value[0]);</div><div class='add'>+                      changed = 1;</div><div class='add'>+              }</div><div class='add'>+              return changed;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+As seen above, you have to return 1 if the value is changed. If the</div><div class='add'>+value is not changed, return 0 instead. If any fatal error happens,</div><div class='add'>+return a negative error code as usual.</div><div class='add'>+</div><div class='add'>+As in the ``get`` callback, when the control has more than one</div><div class='add'>+elements, all elements must be evaluated in this callback, too.</div><div class='add'>+</div><div class='add'>+Callbacks are not atomic</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+All these three callbacks are basically not atomic.</div><div class='add'>+</div><div class='add'>+Control Constructor</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+When everything is ready, finally we can create a new control. To create</div><div class='add'>+a control, there are two functions to be called,</div><div class='add'>+:c:func:`snd_ctl_new1()` and :c:func:`snd_ctl_add()`.</div><div class='add'>+</div><div class='add'>+In the simplest way, you can do like this:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  err = snd_ctl_add(card, snd_ctl_new1(&amp;my_control, chip));</div><div class='add'>+  if (err &lt; 0)</div><div class='add'>+          return err;</div><div class='add'>+</div><div class='add'>+where ``my_control`` is the :c:type:`struct snd_kcontrol_new</div><div class='add'>+&lt;snd_kcontrol_new&gt;` object defined above, and chip is the object</div><div class='add'>+pointer to be passed to kcontrol-&gt;private_data which can be referred</div><div class='add'>+to in callbacks.</div><div class='add'>+</div><div class='add'>+:c:func:`snd_ctl_new1()` allocates a new :c:type:`struct</div><div class='add'>+snd_kcontrol &lt;snd_kcontrol&gt;` instance, and</div><div class='add'>+:c:func:`snd_ctl_add()` assigns the given control component to the</div><div class='add'>+card.</div><div class='add'>+</div><div class='add'>+Change Notification</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+If you need to change and update a control in the interrupt routine, you</div><div class='add'>+can call :c:func:`snd_ctl_notify()`. For example,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, id_pointer);</div><div class='add'>+</div><div class='add'>+This function takes the card pointer, the event-mask, and the control id</div><div class='add'>+pointer for the notification. The event-mask specifies the types of</div><div class='add'>+notification, for example, in the above example, the change of control</div><div class='add'>+values is notified. The id pointer is the pointer of :c:type:`struct</div><div class='add'>+snd_ctl_elem_id &lt;snd_ctl_elem_id&gt;` to be notified. You can</div><div class='add'>+find some examples in ``es1938.c`` or ``es1968.c`` for hardware volume</div><div class='add'>+interrupts.</div><div class='add'>+</div><div class='add'>+Metadata</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+To provide information about the dB values of a mixer control, use on of</div><div class='add'>+the ``DECLARE_TLV_xxx`` macros from ``&lt;sound/tlv.h&gt;`` to define a</div><div class='add'>+variable containing this information, set the ``tlv.p`` field to point to</div><div class='add'>+this variable, and include the ``SNDRV_CTL_ELEM_ACCESS_TLV_READ`` flag</div><div class='add'>+in the ``access`` field; like this:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static DECLARE_TLV_DB_SCALE(db_scale_my_control, -4050, 150, 0);</div><div class='add'>+</div><div class='add'>+  static struct snd_kcontrol_new my_control = {</div><div class='add'>+          ...</div><div class='add'>+          .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+                    SNDRV_CTL_ELEM_ACCESS_TLV_READ,</div><div class='add'>+          ...</div><div class='add'>+          .tlv.p = db_scale_my_control,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The :c:func:`DECLARE_TLV_DB_SCALE()` macro defines information</div><div class='add'>+about a mixer control where each step in the control's value changes the</div><div class='add'>+dB value by a constant dB amount. The first parameter is the name of the</div><div class='add'>+variable to be defined. The second parameter is the minimum value, in</div><div class='add'>+units of 0.01 dB. The third parameter is the step size, in units of 0.01</div><div class='add'>+dB. Set the fourth parameter to 1 if the minimum value actually mutes</div><div class='add'>+the control.</div><div class='add'>+</div><div class='add'>+The :c:func:`DECLARE_TLV_DB_LINEAR()` macro defines information</div><div class='add'>+about a mixer control where the control's value affects the output</div><div class='add'>+linearly. The first parameter is the name of the variable to be defined.</div><div class='add'>+The second parameter is the minimum value, in units of 0.01 dB. The</div><div class='add'>+third parameter is the maximum value, in units of 0.01 dB. If the</div><div class='add'>+minimum value mutes the control, set the second parameter to</div><div class='add'>+``TLV_DB_GAIN_MUTE``.</div><div class='add'>+</div><div class='add'>+API for AC97 Codec</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+General</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+The ALSA AC97 codec layer is a well-defined one, and you don't have to</div><div class='add'>+write much code to control it. Only low-level control routines are</div><div class='add'>+necessary. The AC97 codec API is defined in ``&lt;sound/ac97_codec.h&gt;``.</div><div class='add'>+</div><div class='add'>+Full Code Example</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      struct mychip {</div><div class='add'>+              ....</div><div class='add'>+              struct snd_ac97 *ac97;</div><div class='add'>+              ....</div><div class='add'>+      };</div><div class='add'>+</div><div class='add'>+      static unsigned short snd_mychip_ac97_read(struct snd_ac97 *ac97,</div><div class='add'>+                                                 unsigned short reg)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = ac97-&gt;private_data;</div><div class='add'>+              ....</div><div class='add'>+              /* read a register value here from the codec */</div><div class='add'>+              return the_register_value;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      static void snd_mychip_ac97_write(struct snd_ac97 *ac97,</div><div class='add'>+                                       unsigned short reg, unsigned short val)</div><div class='add'>+      {</div><div class='add'>+              struct mychip *chip = ac97-&gt;private_data;</div><div class='add'>+              ....</div><div class='add'>+              /* write the given register value to the codec */</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      static int snd_mychip_ac97(struct mychip *chip)</div><div class='add'>+      {</div><div class='add'>+              struct snd_ac97_bus *bus;</div><div class='add'>+              struct snd_ac97_template ac97;</div><div class='add'>+              int err;</div><div class='add'>+              static struct snd_ac97_bus_ops ops = {</div><div class='add'>+                      .write = snd_mychip_ac97_write,</div><div class='add'>+                      .read = snd_mychip_ac97_read,</div><div class='add'>+              };</div><div class='add'>+</div><div class='add'>+              err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, NULL, &amp;bus);</div><div class='add'>+              if (err &lt; 0)</div><div class='add'>+                      return err;</div><div class='add'>+              memset(&amp;ac97, 0, sizeof(ac97));</div><div class='add'>+              ac97.private_data = chip;</div><div class='add'>+              return snd_ac97_mixer(bus, &amp;ac97, &amp;chip-&gt;ac97);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AC97 Constructor</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+To create an ac97 instance, first call :c:func:`snd_ac97_bus()`</div><div class='add'>+with an ``ac97_bus_ops_t`` record with callback functions.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_ac97_bus *bus;</div><div class='add'>+  static struct snd_ac97_bus_ops ops = {</div><div class='add'>+        .write = snd_mychip_ac97_write,</div><div class='add'>+        .read = snd_mychip_ac97_read,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+  snd_ac97_bus(card, 0, &amp;ops, NULL, &amp;pbus);</div><div class='add'>+</div><div class='add'>+The bus record is shared among all belonging ac97 instances.</div><div class='add'>+</div><div class='add'>+And then call :c:func:`snd_ac97_mixer()` with an :c:type:`struct</div><div class='add'>+snd_ac97_template &lt;snd_ac97_template&gt;` record together with</div><div class='add'>+the bus pointer created above.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_ac97_template ac97;</div><div class='add'>+  int err;</div><div class='add'>+</div><div class='add'>+  memset(&amp;ac97, 0, sizeof(ac97));</div><div class='add'>+  ac97.private_data = chip;</div><div class='add'>+  snd_ac97_mixer(bus, &amp;ac97, &amp;chip-&gt;ac97);</div><div class='add'>+</div><div class='add'>+where chip-&gt;ac97 is a pointer to a newly created ``ac97_t``</div><div class='add'>+instance. In this case, the chip pointer is set as the private data,</div><div class='add'>+so that the read/write callback functions can refer to this chip</div><div class='add'>+instance. This instance is not necessarily stored in the chip</div><div class='add'>+record. If you need to change the register values from the driver, or</div><div class='add'>+need the suspend/resume of ac97 codecs, keep this pointer to pass to</div><div class='add'>+the corresponding functions.</div><div class='add'>+</div><div class='add'>+AC97 Callbacks</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+The standard callbacks are ``read`` and ``write``. Obviously they</div><div class='add'>+correspond to the functions for read and write accesses to the</div><div class='add'>+hardware low-level codes.</div><div class='add'>+</div><div class='add'>+The ``read`` callback returns the register value specified in the</div><div class='add'>+argument.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static unsigned short snd_mychip_ac97_read(struct snd_ac97 *ac97,</div><div class='add'>+                                             unsigned short reg)</div><div class='add'>+  {</div><div class='add'>+          struct mychip *chip = ac97-&gt;private_data;</div><div class='add'>+          ....</div><div class='add'>+          return the_register_value;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+Here, the chip can be cast from ``ac97-&gt;private_data``.</div><div class='add'>+</div><div class='add'>+Meanwhile, the ``write`` callback is used to set the register</div><div class='add'>+value</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static void snd_mychip_ac97_write(struct snd_ac97 *ac97,</div><div class='add'>+                       unsigned short reg, unsigned short val)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+These callbacks are non-atomic like the control API callbacks.</div><div class='add'>+</div><div class='add'>+There are also other callbacks: ``reset``, ``wait`` and ``init``.</div><div class='add'>+</div><div class='add'>+The ``reset`` callback is used to reset the codec. If the chip</div><div class='add'>+requires a special kind of reset, you can define this callback.</div><div class='add'>+</div><div class='add'>+The ``wait`` callback is used to add some waiting time in the standard</div><div class='add'>+initialization of the codec. If the chip requires the extra waiting</div><div class='add'>+time, define this callback.</div><div class='add'>+</div><div class='add'>+The ``init`` callback is used for additional initialization of the</div><div class='add'>+codec.</div><div class='add'>+</div><div class='add'>+Updating Registers in The Driver</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+If you need to access to the codec from the driver, you can call the</div><div class='add'>+following functions: :c:func:`snd_ac97_write()`,</div><div class='add'>+:c:func:`snd_ac97_read()`, :c:func:`snd_ac97_update()` and</div><div class='add'>+:c:func:`snd_ac97_update_bits()`.</div><div class='add'>+</div><div class='add'>+Both :c:func:`snd_ac97_write()` and</div><div class='add'>+:c:func:`snd_ac97_update()` functions are used to set a value to</div><div class='add'>+the given register (``AC97_XXX``). The difference between them is that</div><div class='add'>+:c:func:`snd_ac97_update()` doesn't write a value if the given</div><div class='add'>+value has been already set, while :c:func:`snd_ac97_write()`</div><div class='add'>+always rewrites the value.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_ac97_write(ac97, AC97_MASTER, 0x8080);</div><div class='add'>+  snd_ac97_update(ac97, AC97_MASTER, 0x8080);</div><div class='add'>+</div><div class='add'>+:c:func:`snd_ac97_read()` is used to read the value of the given</div><div class='add'>+register. For example,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  value = snd_ac97_read(ac97, AC97_MASTER);</div><div class='add'>+</div><div class='add'>+:c:func:`snd_ac97_update_bits()` is used to update some bits in</div><div class='add'>+the given register.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_ac97_update_bits(ac97, reg, mask, value);</div><div class='add'>+</div><div class='add'>+Also, there is a function to change the sample rate (of a given register</div><div class='add'>+such as ``AC97_PCM_FRONT_DAC_RATE``) when VRA or DRA is supported by the</div><div class='add'>+codec: :c:func:`snd_ac97_set_rate()`.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_ac97_set_rate(ac97, AC97_PCM_FRONT_DAC_RATE, 44100);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The following registers are available to set the rate:</div><div class='add'>+``AC97_PCM_MIC_ADC_RATE``, ``AC97_PCM_FRONT_DAC_RATE``,</div><div class='add'>+``AC97_PCM_LR_ADC_RATE``, ``AC97_SPDIF``. When ``AC97_SPDIF`` is</div><div class='add'>+specified, the register is not really changed but the corresponding</div><div class='add'>+IEC958 status bits will be updated.</div><div class='add'>+</div><div class='add'>+Clock Adjustment</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+In some chips, the clock of the codec isn't 48000 but using a PCI clock</div><div class='add'>+(to save a quartz!). In this case, change the field ``bus-&gt;clock`` to</div><div class='add'>+the corresponding value. For example, intel8x0 and es1968 drivers have</div><div class='add'>+their own function to read from the clock.</div><div class='add'>+</div><div class='add'>+Proc Files</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+The ALSA AC97 interface will create a proc file such as</div><div class='add'>+``/proc/asound/card0/codec97#0/ac97#0-0`` and ``ac97#0-0+regs``. You</div><div class='add'>+can refer to these files to see the current status and registers of</div><div class='add'>+the codec.</div><div class='add'>+</div><div class='add'>+Multiple Codecs</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+When there are several codecs on the same card, you need to call</div><div class='add'>+:c:func:`snd_ac97_mixer()` multiple times with ``ac97.num=1`` or</div><div class='add'>+greater. The ``num`` field specifies the codec number.</div><div class='add'>+</div><div class='add'>+If you set up multiple codecs, you either need to write different</div><div class='add'>+callbacks for each codec or check ``ac97-&gt;num`` in the callback</div><div class='add'>+routines.</div><div class='add'>+</div><div class='add'>+MIDI (MPU401-UART) Interface</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+General</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+Many soundcards have built-in MIDI (MPU401-UART) interfaces. When the</div><div class='add'>+soundcard supports the standard MPU401-UART interface, most likely you</div><div class='add'>+can use the ALSA MPU401-UART API. The MPU401-UART API is defined in</div><div class='add'>+``&lt;sound/mpu401.h&gt;``.</div><div class='add'>+</div><div class='add'>+Some soundchips have a similar but slightly different implementation of</div><div class='add'>+mpu401 stuff. For example, emu10k1 has its own mpu401 routines.</div><div class='add'>+</div><div class='add'>+MIDI Constructor</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+To create a rawmidi object, call :c:func:`snd_mpu401_uart_new()`.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_rawmidi *rmidi;</div><div class='add'>+  snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port, info_flags,</div><div class='add'>+                      irq, &amp;rmidi);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The first argument is the card pointer, and the second is the index of</div><div class='add'>+this component. You can create up to 8 rawmidi devices.</div><div class='add'>+</div><div class='add'>+The third argument is the type of the hardware, ``MPU401_HW_XXX``. If</div><div class='add'>+it's not a special one, you can use ``MPU401_HW_MPU401``.</div><div class='add'>+</div><div class='add'>+The 4th argument is the I/O port address. Many backward-compatible</div><div class='add'>+MPU401 have an I/O port such as 0x330. Or, it might be a part of its own</div><div class='add'>+PCI I/O region. It depends on the chip design.</div><div class='add'>+</div><div class='add'>+The 5th argument is a bitflag for additional information. When the I/O</div><div class='add'>+port address above is part of the PCI I/O region, the MPU401 I/O port</div><div class='add'>+might have been already allocated (reserved) by the driver itself. In</div><div class='add'>+such a case, pass a bit flag ``MPU401_INFO_INTEGRATED``, and the</div><div class='add'>+mpu401-uart layer will allocate the I/O ports by itself.</div><div class='add'>+</div><div class='add'>+When the controller supports only the input or output MIDI stream, pass</div><div class='add'>+the ``MPU401_INFO_INPUT`` or ``MPU401_INFO_OUTPUT`` bitflag,</div><div class='add'>+respectively. Then the rawmidi instance is created as a single stream.</div><div class='add'>+</div><div class='add'>+``MPU401_INFO_MMIO`` bitflag is used to change the access method to MMIO</div><div class='add'>+(via readb and writeb) instead of iob and outb. In this case, you have</div><div class='add'>+to pass the iomapped address to :c:func:`snd_mpu401_uart_new()`.</div><div class='add'>+</div><div class='add'>+When ``MPU401_INFO_TX_IRQ`` is set, the output stream isn't checked in</div><div class='add'>+the default interrupt handler. The driver needs to call</div><div class='add'>+:c:func:`snd_mpu401_uart_interrupt_tx()` by itself to start</div><div class='add'>+processing the output stream in the irq handler.</div><div class='add'>+</div><div class='add'>+If the MPU-401 interface shares its interrupt with the other logical</div><div class='add'>+devices on the card, set ``MPU401_INFO_IRQ_HOOK`` (see</div><div class='add'>+`below &lt;#MIDI-Interrupt-Handler&gt;`__).</div><div class='add'>+</div><div class='add'>+Usually, the port address corresponds to the command port and port + 1</div><div class='add'>+corresponds to the data port. If not, you may change the ``cport``</div><div class='add'>+field of :c:type:`struct snd_mpu401 &lt;snd_mpu401&gt;` manually afterward.</div><div class='add'>+However, :c:type:`struct snd_mpu401 &lt;snd_mpu401&gt;` pointer is</div><div class='add'>+not returned explicitly by :c:func:`snd_mpu401_uart_new()`. You</div><div class='add'>+need to cast ``rmidi-&gt;private_data`` to :c:type:`struct snd_mpu401</div><div class='add'>+&lt;snd_mpu401&gt;` explicitly,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_mpu401 *mpu;</div><div class='add'>+  mpu = rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+and reset the ``cport`` as you like:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  mpu-&gt;cport = my_own_control_port;</div><div class='add'>+</div><div class='add'>+The 6th argument specifies the ISA irq number that will be allocated. If</div><div class='add'>+no interrupt is to be allocated (because your code is already allocating</div><div class='add'>+a shared interrupt, or because the device does not use interrupts), pass</div><div class='add'>+-1 instead. For a MPU-401 device without an interrupt, a polling timer</div><div class='add'>+will be used instead.</div><div class='add'>+</div><div class='add'>+MIDI Interrupt Handler</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+When the interrupt is allocated in</div><div class='add'>+:c:func:`snd_mpu401_uart_new()`, an exclusive ISA interrupt</div><div class='add'>+handler is automatically used, hence you don't have anything else to do</div><div class='add'>+than creating the mpu401 stuff. Otherwise, you have to set</div><div class='add'>+``MPU401_INFO_IRQ_HOOK``, and call</div><div class='add'>+:c:func:`snd_mpu401_uart_interrupt()` explicitly from your own</div><div class='add'>+interrupt handler when it has determined that a UART interrupt has</div><div class='add'>+occurred.</div><div class='add'>+</div><div class='add'>+In this case, you need to pass the private_data of the returned rawmidi</div><div class='add'>+object from :c:func:`snd_mpu401_uart_new()` as the second</div><div class='add'>+argument of :c:func:`snd_mpu401_uart_interrupt()`.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_mpu401_uart_interrupt(irq, rmidi-&gt;private_data, regs);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+RawMIDI Interface</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+Overview</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+The raw MIDI interface is used for hardware MIDI ports that can be</div><div class='add'>+accessed as a byte stream. It is not used for synthesizer chips that do</div><div class='add'>+not directly understand MIDI.</div><div class='add'>+</div><div class='add'>+ALSA handles file and buffer management. All you have to do is to write</div><div class='add'>+some code to move data between the buffer and the hardware.</div><div class='add'>+</div><div class='add'>+The rawmidi API is defined in ``&lt;sound/rawmidi.h&gt;``.</div><div class='add'>+</div><div class='add'>+RawMIDI Constructor</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+To create a rawmidi device, call the :c:func:`snd_rawmidi_new()`</div><div class='add'>+function:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_rawmidi *rmidi;</div><div class='add'>+  err = snd_rawmidi_new(chip-&gt;card, "MyMIDI", 0, outs, ins, &amp;rmidi);</div><div class='add'>+  if (err &lt; 0)</div><div class='add'>+          return err;</div><div class='add'>+  rmidi-&gt;private_data = chip;</div><div class='add'>+  strcpy(rmidi-&gt;name, "My MIDI");</div><div class='add'>+  rmidi-&gt;info_flags = SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='add'>+                      SNDRV_RAWMIDI_INFO_INPUT |</div><div class='add'>+                      SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+</div><div class='add'>+The first argument is the card pointer, the second argument is the ID</div><div class='add'>+string.</div><div class='add'>+</div><div class='add'>+The third argument is the index of this component. You can create up to</div><div class='add'>+8 rawmidi devices.</div><div class='add'>+</div><div class='add'>+The fourth and fifth arguments are the number of output and input</div><div class='add'>+substreams, respectively, of this device (a substream is the equivalent</div><div class='add'>+of a MIDI port).</div><div class='add'>+</div><div class='add'>+Set the ``info_flags`` field to specify the capabilities of the</div><div class='add'>+device. Set ``SNDRV_RAWMIDI_INFO_OUTPUT`` if there is at least one</div><div class='add'>+output port, ``SNDRV_RAWMIDI_INFO_INPUT`` if there is at least one</div><div class='add'>+input port, and ``SNDRV_RAWMIDI_INFO_DUPLEX`` if the device can handle</div><div class='add'>+output and input at the same time.</div><div class='add'>+</div><div class='add'>+After the rawmidi device is created, you need to set the operators</div><div class='add'>+(callbacks) for each substream. There are helper functions to set the</div><div class='add'>+operators for all the substreams of a device:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &amp;snd_mymidi_output_ops);</div><div class='add'>+  snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &amp;snd_mymidi_input_ops);</div><div class='add'>+</div><div class='add'>+The operators are usually defined like this:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static struct snd_rawmidi_ops snd_mymidi_output_ops = {</div><div class='add'>+          .open =    snd_mymidi_output_open,</div><div class='add'>+          .close =   snd_mymidi_output_close,</div><div class='add'>+          .trigger = snd_mymidi_output_trigger,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+These callbacks are explained in the `RawMIDI Callbacks`_ section.</div><div class='add'>+</div><div class='add'>+If there are more than one substream, you should give a unique name to</div><div class='add'>+each of them:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_rawmidi_substream *substream;</div><div class='add'>+  list_for_each_entry(substream,</div><div class='add'>+                      &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams,</div><div class='add'>+                      list {</div><div class='add'>+          sprintf(substream-&gt;name, "My MIDI Port %d", substream-&gt;number + 1);</div><div class='add'>+  }</div><div class='add'>+  /* same for SNDRV_RAWMIDI_STREAM_INPUT */</div><div class='add'>+</div><div class='add'>+RawMIDI Callbacks</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+In all the callbacks, the private data that you've set for the rawmidi</div><div class='add'>+device can be accessed as ``substream-&gt;rmidi-&gt;private_data``.</div><div class='add'>+</div><div class='add'>+If there is more than one port, your callbacks can determine the port</div><div class='add'>+index from the struct snd_rawmidi_substream data passed to each</div><div class='add'>+callback:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_rawmidi_substream *substream;</div><div class='add'>+  int index = substream-&gt;number;</div><div class='add'>+</div><div class='add'>+RawMIDI open callback</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      static int snd_xxx_open(struct snd_rawmidi_substream *substream);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+This is called when a substream is opened. You can initialize the</div><div class='add'>+hardware here, but you shouldn't start transmitting/receiving data yet.</div><div class='add'>+</div><div class='add'>+RawMIDI close callback</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      static int snd_xxx_close(struct snd_rawmidi_substream *substream);</div><div class='add'>+</div><div class='add'>+Guess what.</div><div class='add'>+</div><div class='add'>+The ``open`` and ``close`` callbacks of a rawmidi device are</div><div class='add'>+serialized with a mutex, and can sleep.</div><div class='add'>+</div><div class='add'>+Rawmidi trigger callback for output substreams</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      static void snd_xxx_output_trigger(struct snd_rawmidi_substream *substream, int up);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+This is called with a nonzero ``up`` parameter when there is some data</div><div class='add'>+in the substream buffer that must be transmitted.</div><div class='add'>+</div><div class='add'>+To read data from the buffer, call</div><div class='add'>+:c:func:`snd_rawmidi_transmit_peek()`. It will return the number</div><div class='add'>+of bytes that have been read; this will be less than the number of bytes</div><div class='add'>+requested when there are no more data in the buffer. After the data have</div><div class='add'>+been transmitted successfully, call</div><div class='add'>+:c:func:`snd_rawmidi_transmit_ack()` to remove the data from the</div><div class='add'>+substream buffer:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  unsigned char data;</div><div class='add'>+  while (snd_rawmidi_transmit_peek(substream, &amp;data, 1) == 1) {</div><div class='add'>+          if (snd_mychip_try_to_transmit(data))</div><div class='add'>+                  snd_rawmidi_transmit_ack(substream, 1);</div><div class='add'>+          else</div><div class='add'>+                  break; /* hardware FIFO full */</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+If you know beforehand that the hardware will accept data, you can use</div><div class='add'>+the :c:func:`snd_rawmidi_transmit()` function which reads some</div><div class='add'>+data and removes them from the buffer at once:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  while (snd_mychip_transmit_possible()) {</div><div class='add'>+          unsigned char data;</div><div class='add'>+          if (snd_rawmidi_transmit(substream, &amp;data, 1) != 1)</div><div class='add'>+                  break; /* no more data */</div><div class='add'>+          snd_mychip_transmit(data);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+If you know beforehand how many bytes you can accept, you can use a</div><div class='add'>+buffer size greater than one with the</div><div class='add'>+:c:func:`snd_rawmidi_transmit\*()` functions.</div><div class='add'>+</div><div class='add'>+The ``trigger`` callback must not sleep. If the hardware FIFO is full</div><div class='add'>+before the substream buffer has been emptied, you have to continue</div><div class='add'>+transmitting data later, either in an interrupt handler, or with a</div><div class='add'>+timer if the hardware doesn't have a MIDI transmit interrupt.</div><div class='add'>+</div><div class='add'>+The ``trigger`` callback is called with a zero ``up`` parameter when</div><div class='add'>+the transmission of data should be aborted.</div><div class='add'>+</div><div class='add'>+RawMIDI trigger callback for input substreams</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      static void snd_xxx_input_trigger(struct snd_rawmidi_substream *substream, int up);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+This is called with a nonzero ``up`` parameter to enable receiving data,</div><div class='add'>+or with a zero ``up`` parameter do disable receiving data.</div><div class='add'>+</div><div class='add'>+The ``trigger`` callback must not sleep; the actual reading of data</div><div class='add'>+from the device is usually done in an interrupt handler.</div><div class='add'>+</div><div class='add'>+When data reception is enabled, your interrupt handler should call</div><div class='add'>+:c:func:`snd_rawmidi_receive()` for all received data:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  void snd_mychip_midi_interrupt(...)</div><div class='add'>+  {</div><div class='add'>+          while (mychip_midi_available()) {</div><div class='add'>+                  unsigned char data;</div><div class='add'>+                  data = mychip_midi_read();</div><div class='add'>+                  snd_rawmidi_receive(substream, &amp;data, 1);</div><div class='add'>+          }</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+drain callback</div><div class='add'>+~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+      static void snd_xxx_drain(struct snd_rawmidi_substream *substream);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+This is only used with output substreams. This function should wait</div><div class='add'>+until all data read from the substream buffer have been transmitted.</div><div class='add'>+This ensures that the device can be closed and the driver unloaded</div><div class='add'>+without losing data.</div><div class='add'>+</div><div class='add'>+This callback is optional. If you do not set ``drain`` in the struct</div><div class='add'>+snd_rawmidi_ops structure, ALSA will simply wait for 50 milliseconds</div><div class='add'>+instead.</div><div class='add'>+</div><div class='add'>+Miscellaneous Devices</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+FM OPL3</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+The FM OPL3 is still used in many chips (mainly for backward</div><div class='add'>+compatibility). ALSA has a nice OPL3 FM control layer, too. The OPL3 API</div><div class='add'>+is defined in ``&lt;sound/opl3.h&gt;``.</div><div class='add'>+</div><div class='add'>+FM registers can be directly accessed through the direct-FM API, defined</div><div class='add'>+in ``&lt;sound/asound_fm.h&gt;``. In ALSA native mode, FM registers are</div><div class='add'>+accessed through the Hardware-Dependent Device direct-FM extension API,</div><div class='add'>+whereas in OSS compatible mode, FM registers can be accessed with the</div><div class='add'>+OSS direct-FM compatible API in ``/dev/dmfmX`` device.</div><div class='add'>+</div><div class='add'>+To create the OPL3 component, you have two functions to call. The first</div><div class='add'>+one is a constructor for the ``opl3_t`` instance.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_opl3 *opl3;</div><div class='add'>+  snd_opl3_create(card, lport, rport, OPL3_HW_OPL3_XXX,</div><div class='add'>+                  integrated, &amp;opl3);</div><div class='add'>+</div><div class='add'>+The first argument is the card pointer, the second one is the left port</div><div class='add'>+address, and the third is the right port address. In most cases, the</div><div class='add'>+right port is placed at the left port + 2.</div><div class='add'>+</div><div class='add'>+The fourth argument is the hardware type.</div><div class='add'>+</div><div class='add'>+When the left and right ports have been already allocated by the card</div><div class='add'>+driver, pass non-zero to the fifth argument (``integrated``). Otherwise,</div><div class='add'>+the opl3 module will allocate the specified ports by itself.</div><div class='add'>+</div><div class='add'>+When the accessing the hardware requires special method instead of the</div><div class='add'>+standard I/O access, you can create opl3 instance separately with</div><div class='add'>+:c:func:`snd_opl3_new()`.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_opl3 *opl3;</div><div class='add'>+  snd_opl3_new(card, OPL3_HW_OPL3_XXX, &amp;opl3);</div><div class='add'>+</div><div class='add'>+Then set ``command``, ``private_data`` and ``private_free`` for the</div><div class='add'>+private access function, the private data and the destructor. The</div><div class='add'>+``l_port`` and ``r_port`` are not necessarily set. Only the command</div><div class='add'>+must be set properly. You can retrieve the data from the</div><div class='add'>+``opl3-&gt;private_data`` field. </div><div class='add'>+</div><div class='add'>+After creating the opl3 instance via :c:func:`snd_opl3_new()`,</div><div class='add'>+call :c:func:`snd_opl3_init()` to initialize the chip to the</div><div class='add'>+proper state. Note that :c:func:`snd_opl3_create()` always calls</div><div class='add'>+it internally.</div><div class='add'>+</div><div class='add'>+If the opl3 instance is created successfully, then create a hwdep device</div><div class='add'>+for this opl3.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_hwdep *opl3hwdep;</div><div class='add'>+  snd_opl3_hwdep_new(opl3, 0, 1, &amp;opl3hwdep);</div><div class='add'>+</div><div class='add'>+The first argument is the ``opl3_t`` instance you created, and the</div><div class='add'>+second is the index number, usually 0.</div><div class='add'>+</div><div class='add'>+The third argument is the index-offset for the sequencer client assigned</div><div class='add'>+to the OPL3 port. When there is an MPU401-UART, give 1 for here (UART</div><div class='add'>+always takes 0).</div><div class='add'>+</div><div class='add'>+Hardware-Dependent Devices</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+Some chips need user-space access for special controls or for loading</div><div class='add'>+the micro code. In such a case, you can create a hwdep</div><div class='add'>+(hardware-dependent) device. The hwdep API is defined in</div><div class='add'>+``&lt;sound/hwdep.h&gt;``. You can find examples in opl3 driver or</div><div class='add'>+``isa/sb/sb16_csp.c``.</div><div class='add'>+</div><div class='add'>+The creation of the ``hwdep`` instance is done via</div><div class='add'>+:c:func:`snd_hwdep_new()`.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_hwdep *hw;</div><div class='add'>+  snd_hwdep_new(card, "My HWDEP", 0, &amp;hw);</div><div class='add'>+</div><div class='add'>+where the third argument is the index number.</div><div class='add'>+</div><div class='add'>+You can then pass any pointer value to the ``private_data``. If you</div><div class='add'>+assign a private data, you should define the destructor, too. The</div><div class='add'>+destructor function is set in the ``private_free`` field.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct mydata *p = kmalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+  hw-&gt;private_data = p;</div><div class='add'>+  hw-&gt;private_free = mydata_free;</div><div class='add'>+</div><div class='add'>+and the implementation of the destructor would be:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static void mydata_free(struct snd_hwdep *hw)</div><div class='add'>+  {</div><div class='add'>+          struct mydata *p = hw-&gt;private_data;</div><div class='add'>+          kfree(p);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+The arbitrary file operations can be defined for this instance. The file</div><div class='add'>+operators are defined in the ``ops`` table. For example, assume that</div><div class='add'>+this chip needs an ioctl.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  hw-&gt;ops.open = mydata_open;</div><div class='add'>+  hw-&gt;ops.ioctl = mydata_ioctl;</div><div class='add'>+  hw-&gt;ops.release = mydata_release;</div><div class='add'>+</div><div class='add'>+And implement the callback functions as you like.</div><div class='add'>+</div><div class='add'>+IEC958 (S/PDIF)</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Usually the controls for IEC958 devices are implemented via the control</div><div class='add'>+interface. There is a macro to compose a name string for IEC958</div><div class='add'>+controls, :c:func:`SNDRV_CTL_NAME_IEC958()` defined in</div><div class='add'>+``&lt;include/asound.h&gt;``.</div><div class='add'>+</div><div class='add'>+There are some standard controls for IEC958 status bits. These controls</div><div class='add'>+use the type ``SNDRV_CTL_ELEM_TYPE_IEC958``, and the size of element is</div><div class='add'>+fixed as 4 bytes array (value.iec958.status[x]). For the ``info``</div><div class='add'>+callback, you don't specify the value field for this type (the count</div><div class='add'>+field must be set, though).</div><div class='add'>+</div><div class='add'>+“IEC958 Playback Con Mask” is used to return the bit-mask for the IEC958</div><div class='add'>+status bits of consumer mode. Similarly, “IEC958 Playback Pro Mask”</div><div class='add'>+returns the bitmask for professional mode. They are read-only controls,</div><div class='add'>+and are defined as MIXER controls (iface =</div><div class='add'>+``SNDRV_CTL_ELEM_IFACE_MIXER``).</div><div class='add'>+</div><div class='add'>+Meanwhile, “IEC958 Playback Default” control is defined for getting and</div><div class='add'>+setting the current default IEC958 bits. Note that this one is usually</div><div class='add'>+defined as a PCM control (iface = ``SNDRV_CTL_ELEM_IFACE_PCM``),</div><div class='add'>+although in some places it's defined as a MIXER control.</div><div class='add'>+</div><div class='add'>+In addition, you can define the control switches to enable/disable or to</div><div class='add'>+set the raw bit mode. The implementation will depend on the chip, but</div><div class='add'>+the control should be named as “IEC958 xxx”, preferably using the</div><div class='add'>+:c:func:`SNDRV_CTL_NAME_IEC958()` macro.</div><div class='add'>+</div><div class='add'>+You can find several cases, for example, ``pci/emu10k1``,</div><div class='add'>+``pci/ice1712``, or ``pci/cmipci.c``.</div><div class='add'>+</div><div class='add'>+Buffer and Memory Management</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+Buffer Types</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+ALSA provides several different buffer allocation functions depending on</div><div class='add'>+the bus and the architecture. All these have a consistent API. The</div><div class='add'>+allocation of physically-contiguous pages is done via</div><div class='add'>+:c:func:`snd_malloc_xxx_pages()` function, where xxx is the bus</div><div class='add'>+type.</div><div class='add'>+</div><div class='add'>+The allocation of pages with fallback is</div><div class='add'>+:c:func:`snd_malloc_xxx_pages_fallback()`. This function tries</div><div class='add'>+to allocate the specified pages but if the pages are not available, it</div><div class='add'>+tries to reduce the page sizes until enough space is found.</div><div class='add'>+</div><div class='add'>+The release the pages, call :c:func:`snd_free_xxx_pages()`</div><div class='add'>+function.</div><div class='add'>+</div><div class='add'>+Usually, ALSA drivers try to allocate and reserve a large contiguous</div><div class='add'>+physical space at the time the module is loaded for the later use. This</div><div class='add'>+is called “pre-allocation”. As already written, you can call the</div><div class='add'>+following function at pcm instance construction time (in the case of PCI</div><div class='add'>+bus).</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+                                        snd_dma_pci_data(pci), size, max);</div><div class='add'>+</div><div class='add'>+where ``size`` is the byte size to be pre-allocated and the ``max`` is</div><div class='add'>+the maximum size to be changed via the ``prealloc`` proc file. The</div><div class='add'>+allocator will try to get an area as large as possible within the</div><div class='add'>+given size.</div><div class='add'>+</div><div class='add'>+The second argument (type) and the third argument (device pointer) are</div><div class='add'>+dependent on the bus. In the case of the ISA bus, pass</div><div class='add'>+:c:func:`snd_dma_isa_data()` as the third argument with</div><div class='add'>+``SNDRV_DMA_TYPE_DEV`` type. For the continuous buffer unrelated to the</div><div class='add'>+bus can be pre-allocated with ``SNDRV_DMA_TYPE_CONTINUOUS`` type and the</div><div class='add'>+``snd_dma_continuous_data(GFP_KERNEL)`` device pointer, where</div><div class='add'>+``GFP_KERNEL`` is the kernel allocation flag to use. For the PCI</div><div class='add'>+scatter-gather buffers, use ``SNDRV_DMA_TYPE_DEV_SG`` with</div><div class='add'>+``snd_dma_pci_data(pci)`` (see the `Non-Contiguous Buffers`_</div><div class='add'>+section).</div><div class='add'>+</div><div class='add'>+Once the buffer is pre-allocated, you can use the allocator in the</div><div class='add'>+``hw_params`` callback:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_pcm_lib_malloc_pages(substream, size);</div><div class='add'>+</div><div class='add'>+Note that you have to pre-allocate to use this function.</div><div class='add'>+</div><div class='add'>+External Hardware Buffers</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+Some chips have their own hardware buffers and the DMA transfer from the</div><div class='add'>+host memory is not available. In such a case, you need to either 1)</div><div class='add'>+copy/set the audio data directly to the external hardware buffer, or 2)</div><div class='add'>+make an intermediate buffer and copy/set the data from it to the</div><div class='add'>+external hardware buffer in interrupts (or in tasklets, preferably).</div><div class='add'>+</div><div class='add'>+The first case works fine if the external hardware buffer is large</div><div class='add'>+enough. This method doesn't need any extra buffers and thus is more</div><div class='add'>+effective. You need to define the ``copy`` and ``silence`` callbacks</div><div class='add'>+for the data transfer. However, there is a drawback: it cannot be</div><div class='add'>+mmapped. The examples are GUS's GF1 PCM or emu8000's wavetable PCM.</div><div class='add'>+</div><div class='add'>+The second case allows for mmap on the buffer, although you have to</div><div class='add'>+handle an interrupt or a tasklet to transfer the data from the</div><div class='add'>+intermediate buffer to the hardware buffer. You can find an example in</div><div class='add'>+the vxpocket driver.</div><div class='add'>+</div><div class='add'>+Another case is when the chip uses a PCI memory-map region for the</div><div class='add'>+buffer instead of the host memory. In this case, mmap is available only</div><div class='add'>+on certain architectures like the Intel one. In non-mmap mode, the data</div><div class='add'>+cannot be transferred as in the normal way. Thus you need to define the</div><div class='add'>+``copy`` and ``silence`` callbacks as well, as in the cases above. The</div><div class='add'>+examples are found in ``rme32.c`` and ``rme96.c``.</div><div class='add'>+</div><div class='add'>+The implementation of the ``copy`` and ``silence`` callbacks depends</div><div class='add'>+upon whether the hardware supports interleaved or non-interleaved</div><div class='add'>+samples. The ``copy`` callback is defined like below, a bit</div><div class='add'>+differently depending whether the direction is playback or capture:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int playback_copy(struct snd_pcm_substream *substream, int channel,</div><div class='add'>+               snd_pcm_uframes_t pos, void *src, snd_pcm_uframes_t count);</div><div class='add'>+  static int capture_copy(struct snd_pcm_substream *substream, int channel,</div><div class='add'>+               snd_pcm_uframes_t pos, void *dst, snd_pcm_uframes_t count);</div><div class='add'>+</div><div class='add'>+In the case of interleaved samples, the second argument (``channel``) is</div><div class='add'>+not used. The third argument (``pos``) points the current position</div><div class='add'>+offset in frames.</div><div class='add'>+</div><div class='add'>+The meaning of the fourth argument is different between playback and</div><div class='add'>+capture. For playback, it holds the source data pointer, and for</div><div class='add'>+capture, it's the destination data pointer.</div><div class='add'>+</div><div class='add'>+The last argument is the number of frames to be copied.</div><div class='add'>+</div><div class='add'>+What you have to do in this callback is again different between playback</div><div class='add'>+and capture directions. In the playback case, you copy the given amount</div><div class='add'>+of data (``count``) at the specified pointer (``src``) to the specified</div><div class='add'>+offset (``pos``) on the hardware buffer. When coded like memcpy-like</div><div class='add'>+way, the copy would be like:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  my_memcpy(my_buffer + frames_to_bytes(runtime, pos), src,</div><div class='add'>+            frames_to_bytes(runtime, count));</div><div class='add'>+</div><div class='add'>+For the capture direction, you copy the given amount of data (``count``)</div><div class='add'>+at the specified offset (``pos``) on the hardware buffer to the</div><div class='add'>+specified pointer (``dst``).</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  my_memcpy(dst, my_buffer + frames_to_bytes(runtime, pos),</div><div class='add'>+            frames_to_bytes(runtime, count));</div><div class='add'>+</div><div class='add'>+Note that both the position and the amount of data are given in frames.</div><div class='add'>+</div><div class='add'>+In the case of non-interleaved samples, the implementation will be a bit</div><div class='add'>+more complicated.</div><div class='add'>+</div><div class='add'>+You need to check the channel argument, and if it's -1, copy the whole</div><div class='add'>+channels. Otherwise, you have to copy only the specified channel. Please</div><div class='add'>+check ``isa/gus/gus_pcm.c`` as an example.</div><div class='add'>+</div><div class='add'>+The ``silence`` callback is also implemented in a similar way</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int silence(struct snd_pcm_substream *substream, int channel,</div><div class='add'>+                     snd_pcm_uframes_t pos, snd_pcm_uframes_t count);</div><div class='add'>+</div><div class='add'>+The meanings of arguments are the same as in the ``copy`` callback,</div><div class='add'>+although there is no ``src/dst`` argument. In the case of interleaved</div><div class='add'>+samples, the channel argument has no meaning, as well as on ``copy``</div><div class='add'>+callback.</div><div class='add'>+</div><div class='add'>+The role of ``silence`` callback is to set the given amount</div><div class='add'>+(``count``) of silence data at the specified offset (``pos``) on the</div><div class='add'>+hardware buffer. Suppose that the data format is signed (that is, the</div><div class='add'>+silent-data is 0), and the implementation using a memset-like function</div><div class='add'>+would be like: </div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  my_memcpy(my_buffer + frames_to_bytes(runtime, pos), 0,</div><div class='add'>+            frames_to_bytes(runtime, count));</div><div class='add'>+</div><div class='add'>+In the case of non-interleaved samples, again, the implementation</div><div class='add'>+becomes a bit more complicated. See, for example, ``isa/gus/gus_pcm.c``.</div><div class='add'>+</div><div class='add'>+Non-Contiguous Buffers</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+If your hardware supports the page table as in emu10k1 or the buffer</div><div class='add'>+descriptors as in via82xx, you can use the scatter-gather (SG) DMA. ALSA</div><div class='add'>+provides an interface for handling SG-buffers. The API is provided in</div><div class='add'>+``&lt;sound/pcm.h&gt;``.</div><div class='add'>+</div><div class='add'>+For creating the SG-buffer handler, call</div><div class='add'>+:c:func:`snd_pcm_lib_preallocate_pages()` or</div><div class='add'>+:c:func:`snd_pcm_lib_preallocate_pages_for_all()` with</div><div class='add'>+``SNDRV_DMA_TYPE_DEV_SG`` in the PCM constructor like other PCI</div><div class='add'>+pre-allocator. You need to pass ``snd_dma_pci_data(pci)``, where pci is</div><div class='add'>+the :c:type:`struct pci_dev &lt;pci_dev&gt;` pointer of the chip as</div><div class='add'>+well. The ``struct snd_sg_buf`` instance is created as</div><div class='add'>+``substream-&gt;dma_private``. You can cast the pointer like:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_sg_buf *sgbuf = (struct snd_sg_buf *)substream-&gt;dma_private;</div><div class='add'>+</div><div class='add'>+Then call :c:func:`snd_pcm_lib_malloc_pages()` in the ``hw_params``</div><div class='add'>+callback as well as in the case of normal PCI buffer. The SG-buffer</div><div class='add'>+handler will allocate the non-contiguous kernel pages of the given size</div><div class='add'>+and map them onto the virtually contiguous memory. The virtual pointer</div><div class='add'>+is addressed in runtime-&gt;dma_area. The physical address</div><div class='add'>+(``runtime-&gt;dma_addr``) is set to zero, because the buffer is</div><div class='add'>+physically non-contiguous. The physical address table is set up in</div><div class='add'>+``sgbuf-&gt;table``. You can get the physical address at a certain offset</div><div class='add'>+via :c:func:`snd_pcm_sgbuf_get_addr()`.</div><div class='add'>+</div><div class='add'>+When a SG-handler is used, you need to set</div><div class='add'>+:c:func:`snd_pcm_sgbuf_ops_page()` as the ``page`` callback. (See</div><div class='add'>+`page callback`_ section.)</div><div class='add'>+</div><div class='add'>+To release the data, call :c:func:`snd_pcm_lib_free_pages()` in</div><div class='add'>+the ``hw_free`` callback as usual.</div><div class='add'>+</div><div class='add'>+Vmalloc'ed Buffers</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+It's possible to use a buffer allocated via :c:func:`vmalloc()`, for</div><div class='add'>+example, for an intermediate buffer. Since the allocated pages are not</div><div class='add'>+contiguous, you need to set the ``page`` callback to obtain the physical</div><div class='add'>+address at every offset.</div><div class='add'>+</div><div class='add'>+The implementation of ``page`` callback would be like this:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+</div><div class='add'>+  /* get the physical page pointer on the given offset */</div><div class='add'>+  static struct page *mychip_page(struct snd_pcm_substream *substream,</div><div class='add'>+                                  unsigned long offset)</div><div class='add'>+  {</div><div class='add'>+          void *pageptr = substream-&gt;runtime-&gt;dma_area + offset;</div><div class='add'>+          return vmalloc_to_page(pageptr);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+Proc Interface</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+ALSA provides an easy interface for procfs. The proc files are very</div><div class='add'>+useful for debugging. I recommend you set up proc files if you write a</div><div class='add'>+driver and want to get a running status or register dumps. The API is</div><div class='add'>+found in ``&lt;sound/info.h&gt;``.</div><div class='add'>+</div><div class='add'>+To create a proc file, call :c:func:`snd_card_proc_new()`.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_info_entry *entry;</div><div class='add'>+  int err = snd_card_proc_new(card, "my-file", &amp;entry);</div><div class='add'>+</div><div class='add'>+where the second argument specifies the name of the proc file to be</div><div class='add'>+created. The above example will create a file ``my-file`` under the</div><div class='add'>+card directory, e.g. ``/proc/asound/card0/my-file``.</div><div class='add'>+</div><div class='add'>+Like other components, the proc entry created via</div><div class='add'>+:c:func:`snd_card_proc_new()` will be registered and released</div><div class='add'>+automatically in the card registration and release functions.</div><div class='add'>+</div><div class='add'>+When the creation is successful, the function stores a new instance in</div><div class='add'>+the pointer given in the third argument. It is initialized as a text</div><div class='add'>+proc file for read only. To use this proc file as a read-only text file</div><div class='add'>+as it is, set the read callback with a private data via</div><div class='add'>+:c:func:`snd_info_set_text_ops()`.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_info_set_text_ops(entry, chip, my_proc_read);</div><div class='add'>+</div><div class='add'>+where the second argument (``chip``) is the private data to be used in</div><div class='add'>+the callbacks. The third parameter specifies the read buffer size and</div><div class='add'>+the fourth (``my_proc_read``) is the callback function, which is</div><div class='add'>+defined like</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static void my_proc_read(struct snd_info_entry *entry,</div><div class='add'>+                           struct snd_info_buffer *buffer);</div><div class='add'>+</div><div class='add'>+In the read callback, use :c:func:`snd_iprintf()` for output</div><div class='add'>+strings, which works just like normal :c:func:`printf()`. For</div><div class='add'>+example,</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static void my_proc_read(struct snd_info_entry *entry,</div><div class='add'>+                           struct snd_info_buffer *buffer)</div><div class='add'>+  {</div><div class='add'>+          struct my_chip *chip = entry-&gt;private_data;</div><div class='add'>+</div><div class='add'>+          snd_iprintf(buffer, "This is my chip!\n");</div><div class='add'>+          snd_iprintf(buffer, "Port = %ld\n", chip-&gt;port);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+The file permissions can be changed afterwards. As default, it's set as</div><div class='add'>+read only for all users. If you want to add write permission for the</div><div class='add'>+user (root as default), do as follows:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+ entry-&gt;mode = S_IFREG | S_IRUGO | S_IWUSR;</div><div class='add'>+</div><div class='add'>+and set the write buffer size and the callback</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  entry-&gt;c.text.write = my_proc_write;</div><div class='add'>+</div><div class='add'>+For the write callback, you can use :c:func:`snd_info_get_line()`</div><div class='add'>+to get a text line, and :c:func:`snd_info_get_str()` to retrieve</div><div class='add'>+a string from the line. Some examples are found in</div><div class='add'>+``core/oss/mixer_oss.c``, core/oss/and ``pcm_oss.c``.</div><div class='add'>+</div><div class='add'>+For a raw-data proc-file, set the attributes as follows:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static struct snd_info_entry_ops my_file_io_ops = {</div><div class='add'>+          .read = my_file_io_read,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+  entry-&gt;content = SNDRV_INFO_CONTENT_DATA;</div><div class='add'>+  entry-&gt;private_data = chip;</div><div class='add'>+  entry-&gt;c.ops = &amp;my_file_io_ops;</div><div class='add'>+  entry-&gt;size = 4096;</div><div class='add'>+  entry-&gt;mode = S_IFREG | S_IRUGO;</div><div class='add'>+</div><div class='add'>+For the raw data, ``size`` field must be set properly. This specifies</div><div class='add'>+the maximum size of the proc file access.</div><div class='add'>+</div><div class='add'>+The read/write callbacks of raw mode are more direct than the text mode.</div><div class='add'>+You need to use a low-level I/O functions such as</div><div class='add'>+:c:func:`copy_from/to_user()` to transfer the data.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static ssize_t my_file_io_read(struct snd_info_entry *entry,</div><div class='add'>+                              void *file_private_data,</div><div class='add'>+                              struct file *file,</div><div class='add'>+                              char *buf,</div><div class='add'>+                              size_t count,</div><div class='add'>+                              loff_t pos)</div><div class='add'>+  {</div><div class='add'>+          if (copy_to_user(buf, local_data + pos, count))</div><div class='add'>+                  return -EFAULT;</div><div class='add'>+          return count;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+If the size of the info entry has been set up properly, ``count`` and</div><div class='add'>+``pos`` are guaranteed to fit within 0 and the given size. You don't</div><div class='add'>+have to check the range in the callbacks unless any other condition is</div><div class='add'>+required.</div><div class='add'>+</div><div class='add'>+Power Management</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+If the chip is supposed to work with suspend/resume functions, you need</div><div class='add'>+to add power-management code to the driver. The additional code for</div><div class='add'>+power-management should be ifdef-ed with ``CONFIG_PM``.</div><div class='add'>+</div><div class='add'>+If the driver *fully* supports suspend/resume that is, the device can be</div><div class='add'>+properly resumed to its state when suspend was called, you can set the</div><div class='add'>+``SNDRV_PCM_INFO_RESUME`` flag in the pcm info field. Usually, this is</div><div class='add'>+possible when the registers of the chip can be safely saved and restored</div><div class='add'>+to RAM. If this is set, the trigger callback is called with</div><div class='add'>+``SNDRV_PCM_TRIGGER_RESUME`` after the resume callback completes.</div><div class='add'>+</div><div class='add'>+Even if the driver doesn't support PM fully but partial suspend/resume</div><div class='add'>+is still possible, it's still worthy to implement suspend/resume</div><div class='add'>+callbacks. In such a case, applications would reset the status by</div><div class='add'>+calling :c:func:`snd_pcm_prepare()` and restart the stream</div><div class='add'>+appropriately. Hence, you can define suspend/resume callbacks below but</div><div class='add'>+don't set ``SNDRV_PCM_INFO_RESUME`` info flag to the PCM.</div><div class='add'>+</div><div class='add'>+Note that the trigger with SUSPEND can always be called when</div><div class='add'>+:c:func:`snd_pcm_suspend_all()` is called, regardless of the</div><div class='add'>+``SNDRV_PCM_INFO_RESUME`` flag. The ``RESUME`` flag affects only the</div><div class='add'>+behavior of :c:func:`snd_pcm_resume()`. (Thus, in theory,</div><div class='add'>+``SNDRV_PCM_TRIGGER_RESUME`` isn't needed to be handled in the trigger</div><div class='add'>+callback when no ``SNDRV_PCM_INFO_RESUME`` flag is set. But, it's better</div><div class='add'>+to keep it for compatibility reasons.)</div><div class='add'>+</div><div class='add'>+In the earlier version of ALSA drivers, a common power-management layer</div><div class='add'>+was provided, but it has been removed. The driver needs to define the</div><div class='add'>+suspend/resume hooks according to the bus the device is connected to. In</div><div class='add'>+the case of PCI drivers, the callbacks look like below:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  #ifdef CONFIG_PM</div><div class='add'>+  static int snd_my_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+  {</div><div class='add'>+          .... /* do things for suspend */</div><div class='add'>+          return 0;</div><div class='add'>+  }</div><div class='add'>+  static int snd_my_resume(struct pci_dev *pci)</div><div class='add'>+  {</div><div class='add'>+          .... /* do things for suspend */</div><div class='add'>+          return 0;</div><div class='add'>+  }</div><div class='add'>+  #endif</div><div class='add'>+</div><div class='add'>+The scheme of the real suspend job is as follows.</div><div class='add'>+</div><div class='add'>+1. Retrieve the card and the chip data.</div><div class='add'>+</div><div class='add'>+2. Call :c:func:`snd_power_change_state()` with</div><div class='add'>+   ``SNDRV_CTL_POWER_D3hot`` to change the power status.</div><div class='add'>+</div><div class='add'>+3. Call :c:func:`snd_pcm_suspend_all()` to suspend the running</div><div class='add'>+   PCM streams.</div><div class='add'>+</div><div class='add'>+4. If AC97 codecs are used, call :c:func:`snd_ac97_suspend()` for</div><div class='add'>+   each codec.</div><div class='add'>+</div><div class='add'>+5. Save the register values if necessary.</div><div class='add'>+</div><div class='add'>+6. Stop the hardware if necessary.</div><div class='add'>+</div><div class='add'>+7. Disable the PCI device by calling</div><div class='add'>+   :c:func:`pci_disable_device()`. Then, call</div><div class='add'>+   :c:func:`pci_save_state()` at last.</div><div class='add'>+</div><div class='add'>+A typical code would be like:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int mychip_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+  {</div><div class='add'>+          /* (1) */</div><div class='add'>+          struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+          struct mychip *chip = card-&gt;private_data;</div><div class='add'>+          /* (2) */</div><div class='add'>+          snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='add'>+          /* (3) */</div><div class='add'>+          snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='add'>+          /* (4) */</div><div class='add'>+          snd_ac97_suspend(chip-&gt;ac97);</div><div class='add'>+          /* (5) */</div><div class='add'>+          snd_mychip_save_registers(chip);</div><div class='add'>+          /* (6) */</div><div class='add'>+          snd_mychip_stop_hardware(chip);</div><div class='add'>+          /* (7) */</div><div class='add'>+          pci_disable_device(pci);</div><div class='add'>+          pci_save_state(pci);</div><div class='add'>+          return 0;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The scheme of the real resume job is as follows.</div><div class='add'>+</div><div class='add'>+1. Retrieve the card and the chip data.</div><div class='add'>+</div><div class='add'>+2. Set up PCI. First, call :c:func:`pci_restore_state()`. Then</div><div class='add'>+   enable the pci device again by calling</div><div class='add'>+   :c:func:`pci_enable_device()`. Call</div><div class='add'>+   :c:func:`pci_set_master()` if necessary, too.</div><div class='add'>+</div><div class='add'>+3. Re-initialize the chip.</div><div class='add'>+</div><div class='add'>+4. Restore the saved registers if necessary.</div><div class='add'>+</div><div class='add'>+5. Resume the mixer, e.g. calling :c:func:`snd_ac97_resume()`.</div><div class='add'>+</div><div class='add'>+6. Restart the hardware (if any).</div><div class='add'>+</div><div class='add'>+7. Call :c:func:`snd_power_change_state()` with</div><div class='add'>+   ``SNDRV_CTL_POWER_D0`` to notify the processes.</div><div class='add'>+</div><div class='add'>+A typical code would be like:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int mychip_resume(struct pci_dev *pci)</div><div class='add'>+  {</div><div class='add'>+          /* (1) */</div><div class='add'>+          struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+          struct mychip *chip = card-&gt;private_data;</div><div class='add'>+          /* (2) */</div><div class='add'>+          pci_restore_state(pci);</div><div class='add'>+          pci_enable_device(pci);</div><div class='add'>+          pci_set_master(pci);</div><div class='add'>+          /* (3) */</div><div class='add'>+          snd_mychip_reinit_chip(chip);</div><div class='add'>+          /* (4) */</div><div class='add'>+          snd_mychip_restore_registers(chip);</div><div class='add'>+          /* (5) */</div><div class='add'>+          snd_ac97_resume(chip-&gt;ac97);</div><div class='add'>+          /* (6) */</div><div class='add'>+          snd_mychip_restart_chip(chip);</div><div class='add'>+          /* (7) */</div><div class='add'>+          snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='add'>+          return 0;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+As shown in the above, it's better to save registers after suspending</div><div class='add'>+the PCM operations via :c:func:`snd_pcm_suspend_all()` or</div><div class='add'>+:c:func:`snd_pcm_suspend()`. It means that the PCM streams are</div><div class='add'>+already stopped when the register snapshot is taken. But, remember that</div><div class='add'>+you don't have to restart the PCM stream in the resume callback. It'll</div><div class='add'>+be restarted via trigger call with ``SNDRV_PCM_TRIGGER_RESUME`` when</div><div class='add'>+necessary.</div><div class='add'>+</div><div class='add'>+OK, we have all callbacks now. Let's set them up. In the initialization</div><div class='add'>+of the card, make sure that you can get the chip data from the card</div><div class='add'>+instance, typically via ``private_data`` field, in case you created the</div><div class='add'>+chip data individually.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_mychip_probe(struct pci_dev *pci,</div><div class='add'>+                              const struct pci_device_id *pci_id)</div><div class='add'>+  {</div><div class='add'>+          ....</div><div class='add'>+          struct snd_card *card;</div><div class='add'>+          struct mychip *chip;</div><div class='add'>+          int err;</div><div class='add'>+          ....</div><div class='add'>+          err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+                             0, &amp;card);</div><div class='add'>+          ....</div><div class='add'>+          chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='add'>+          ....</div><div class='add'>+          card-&gt;private_data = chip;</div><div class='add'>+          ....</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+When you created the chip data with :c:func:`snd_card_new()`, it's</div><div class='add'>+anyway accessible via ``private_data`` field.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int snd_mychip_probe(struct pci_dev *pci,</div><div class='add'>+                              const struct pci_device_id *pci_id)</div><div class='add'>+  {</div><div class='add'>+          ....</div><div class='add'>+          struct snd_card *card;</div><div class='add'>+          struct mychip *chip;</div><div class='add'>+          int err;</div><div class='add'>+          ....</div><div class='add'>+          err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+                             sizeof(struct mychip), &amp;card);</div><div class='add'>+          ....</div><div class='add'>+          chip = card-&gt;private_data;</div><div class='add'>+          ....</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+If you need a space to save the registers, allocate the buffer for it</div><div class='add'>+here, too, since it would be fatal if you cannot allocate a memory in</div><div class='add'>+the suspend phase. The allocated buffer should be released in the</div><div class='add'>+corresponding destructor.</div><div class='add'>+</div><div class='add'>+And next, set suspend/resume callbacks to the pci_driver.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static struct pci_driver driver = {</div><div class='add'>+          .name = KBUILD_MODNAME,</div><div class='add'>+          .id_table = snd_my_ids,</div><div class='add'>+          .probe = snd_my_probe,</div><div class='add'>+          .remove = snd_my_remove,</div><div class='add'>+  #ifdef CONFIG_PM</div><div class='add'>+          .suspend = snd_my_suspend,</div><div class='add'>+          .resume = snd_my_resume,</div><div class='add'>+  #endif</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+Module Parameters</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+There are standard module options for ALSA. At least, each module should</div><div class='add'>+have the ``index``, ``id`` and ``enable`` options.</div><div class='add'>+</div><div class='add'>+If the module supports multiple cards (usually up to 8 = ``SNDRV_CARDS``</div><div class='add'>+cards), they should be arrays. The default initial values are defined</div><div class='add'>+already as constants for easier programming:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='add'>+  static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='add'>+  static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+</div><div class='add'>+If the module supports only a single card, they could be single</div><div class='add'>+variables, instead. ``enable`` option is not always necessary in this</div><div class='add'>+case, but it would be better to have a dummy option for compatibility.</div><div class='add'>+</div><div class='add'>+The module parameters must be declared with the standard</div><div class='add'>+``module_param()()``, ``module_param_array()()`` and</div><div class='add'>+:c:func:`MODULE_PARM_DESC()` macros.</div><div class='add'>+</div><div class='add'>+The typical coding would be like below:</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  #define CARD_NAME "My Chip"</div><div class='add'>+</div><div class='add'>+  module_param_array(index, int, NULL, 0444);</div><div class='add'>+  MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");</div><div class='add'>+  module_param_array(id, charp, NULL, 0444);</div><div class='add'>+  MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard.");</div><div class='add'>+  module_param_array(enable, bool, NULL, 0444);</div><div class='add'>+  MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard.");</div><div class='add'>+</div><div class='add'>+Also, don't forget to define the module description, classes, license</div><div class='add'>+and devices. Especially, the recent modprobe requires to define the</div><div class='add'>+module license as GPL, etc., otherwise the system is shown as “tainted”.</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  MODULE_DESCRIPTION("My Chip");</div><div class='add'>+  MODULE_LICENSE("GPL");</div><div class='add'>+  MODULE_SUPPORTED_DEVICE("{{Vendor,My Chip Name}}");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+How To Put Your Driver Into ALSA Tree</div><div class='add'>+=====================================</div><div class='add'>+</div><div class='add'>+General</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+So far, you've learned how to write the driver codes. And you might have</div><div class='add'>+a question now: how to put my own driver into the ALSA driver tree? Here</div><div class='add'>+(finally :) the standard procedure is described briefly.</div><div class='add'>+</div><div class='add'>+Suppose that you create a new PCI driver for the card “xyz”. The card</div><div class='add'>+module name would be snd-xyz. The new driver is usually put into the</div><div class='add'>+alsa-driver tree, ``alsa-driver/pci`` directory in the case of PCI</div><div class='add'>+cards. Then the driver is evaluated, audited and tested by developers</div><div class='add'>+and users. After a certain time, the driver will go to the alsa-kernel</div><div class='add'>+tree (to the corresponding directory, such as ``alsa-kernel/pci``) and</div><div class='add'>+eventually will be integrated into the Linux 2.6 tree (the directory</div><div class='add'>+would be ``linux/sound/pci``).</div><div class='add'>+</div><div class='add'>+In the following sections, the driver code is supposed to be put into</div><div class='add'>+alsa-driver tree. The two cases are covered: a driver consisting of a</div><div class='add'>+single source file and one consisting of several source files.</div><div class='add'>+</div><div class='add'>+Driver with A Single Source File</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+1. Modify alsa-driver/pci/Makefile</div><div class='add'>+</div><div class='add'>+   Suppose you have a file xyz.c. Add the following two lines</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd-xyz-objs := xyz.o</div><div class='add'>+  obj-$(CONFIG_SND_XYZ) += snd-xyz.o</div><div class='add'>+</div><div class='add'>+2. Create the Kconfig entry</div><div class='add'>+</div><div class='add'>+   Add the new entry of Kconfig for your xyz driver. config SND_XYZ</div><div class='add'>+   tristate "Foobar XYZ" depends on SND select SND_PCM help Say Y here</div><div class='add'>+   to include support for Foobar XYZ soundcard. To compile this driver</div><div class='add'>+   as a module, choose M here: the module will be called snd-xyz. the</div><div class='add'>+   line, select SND_PCM, specifies that the driver xyz supports PCM. In</div><div class='add'>+   addition to SND_PCM, the following components are supported for</div><div class='add'>+   select command: SND_RAWMIDI, SND_TIMER, SND_HWDEP,</div><div class='add'>+   SND_MPU401_UART, SND_OPL3_LIB, SND_OPL4_LIB, SND_VX_LIB,</div><div class='add'>+   SND_AC97_CODEC. Add the select command for each supported</div><div class='add'>+   component.</div><div class='add'>+</div><div class='add'>+   Note that some selections imply the lowlevel selections. For example,</div><div class='add'>+   PCM includes TIMER, MPU401_UART includes RAWMIDI, AC97_CODEC</div><div class='add'>+   includes PCM, and OPL3_LIB includes HWDEP. You don't need to give</div><div class='add'>+   the lowlevel selections again.</div><div class='add'>+</div><div class='add'>+   For the details of Kconfig script, refer to the kbuild documentation.</div><div class='add'>+</div><div class='add'>+3. Run cvscompile script to re-generate the configure script and build</div><div class='add'>+   the whole stuff again.</div><div class='add'>+</div><div class='add'>+Drivers with Several Source Files</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+Suppose that the driver snd-xyz have several source files. They are</div><div class='add'>+located in the new subdirectory, pci/xyz.</div><div class='add'>+</div><div class='add'>+1. Add a new directory (``xyz``) in ``alsa-driver/pci/Makefile`` as</div><div class='add'>+   below</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  obj-$(CONFIG_SND) += xyz/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. Under the directory ``xyz``, create a Makefile</div><div class='add'>+</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+         ifndef SND_TOPDIR</div><div class='add'>+         SND_TOPDIR=../..</div><div class='add'>+         endif</div><div class='add'>+</div><div class='add'>+         include $(SND_TOPDIR)/toplevel.config</div><div class='add'>+         include $(SND_TOPDIR)/Makefile.conf</div><div class='add'>+</div><div class='add'>+         snd-xyz-objs := xyz.o abc.o def.o</div><div class='add'>+</div><div class='add'>+         obj-$(CONFIG_SND_XYZ) += snd-xyz.o</div><div class='add'>+</div><div class='add'>+         include $(SND_TOPDIR)/Rules.make</div><div class='add'>+</div><div class='add'>+3. Create the Kconfig entry</div><div class='add'>+</div><div class='add'>+   This procedure is as same as in the last section.</div><div class='add'>+</div><div class='add'>+4. Run cvscompile script to re-generate the configure script and build</div><div class='add'>+   the whole stuff again.</div><div class='add'>+</div><div class='add'>+Useful Functions</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+:c:func:`snd_printk()` and friends</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+ALSA provides a verbose version of the :c:func:`printk()` function.</div><div class='add'>+If a kernel config ``CONFIG_SND_VERBOSE_PRINTK`` is set, this function</div><div class='add'>+prints the given message together with the file name and the line of the</div><div class='add'>+caller. The ``KERN_XXX`` prefix is processed as well as the original</div><div class='add'>+:c:func:`printk()` does, so it's recommended to add this prefix,</div><div class='add'>+e.g. snd_printk(KERN_ERR "Oh my, sorry, it's extremely bad!\\n");</div><div class='add'>+</div><div class='add'>+There are also :c:func:`printk()`'s for debugging.</div><div class='add'>+:c:func:`snd_printd()` can be used for general debugging purposes.</div><div class='add'>+If ``CONFIG_SND_DEBUG`` is set, this function is compiled, and works</div><div class='add'>+just like :c:func:`snd_printk()`. If the ALSA is compiled without</div><div class='add'>+the debugging flag, it's ignored.</div><div class='add'>+</div><div class='add'>+:c:func:`snd_printdd()` is compiled in only when</div><div class='add'>+``CONFIG_SND_DEBUG_VERBOSE`` is set. Please note that</div><div class='add'>+``CONFIG_SND_DEBUG_VERBOSE`` is not set as default even if you configure</div><div class='add'>+the alsa-driver with ``--with-debug=full`` option. You need to give</div><div class='add'>+explicitly ``--with-debug=detect`` option instead.</div><div class='add'>+</div><div class='add'>+:c:func:`snd_BUG()`</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+It shows the ``BUG?`` message and stack trace as well as</div><div class='add'>+:c:func:`snd_BUG_ON()` at the point. It's useful to show that a</div><div class='add'>+fatal error happens there.</div><div class='add'>+</div><div class='add'>+When no debug flag is set, this macro is ignored.</div><div class='add'>+</div><div class='add'>+:c:func:`snd_BUG_ON()`</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+:c:func:`snd_BUG_ON()` macro is similar with</div><div class='add'>+:c:func:`WARN_ON()` macro. For example, snd_BUG_ON(!pointer); or</div><div class='add'>+it can be used as the condition, if (snd_BUG_ON(non_zero_is_bug))</div><div class='add'>+return -EINVAL;</div><div class='add'>+</div><div class='add'>+The macro takes an conditional expression to evaluate. When</div><div class='add'>+``CONFIG_SND_DEBUG``, is set, if the expression is non-zero, it shows</div><div class='add'>+the warning message such as ``BUG? (xxx)`` normally followed by stack</div><div class='add'>+trace. In both cases it returns the evaluated value.</div><div class='add'>+</div><div class='add'>+Acknowledgments</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+I would like to thank Phil Kerr for his help for improvement and</div><div class='add'>+corrections of this document.</div><div class='add'>+</div><div class='add'>+Kevin Conder reformatted the original plain-text to the DocBook format.</div><div class='add'>+</div><div class='add'>+Giuliano Pochini corrected typos and contributed the example codes in</div><div class='add'>+the hardware constraints section.</div><div class='head'>diff --git a/Documentation/sound/oss/oss-parameters.txt b/Documentation/sound/oss/oss-parameters.txt<br/>index 3ab391e7c295..cc675f25eee4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/sound/oss/oss-parameters.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sound/oss/oss-parameters.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/oss/oss-parameters.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/oss/oss-parameters.txt</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'>                           OSS Kernel Parameters</div><div class='ctx'>                           ~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='del'>-See Documentation/kernel-parameters.txt for general information on</div><div class='add'>+See Documentation/admin-guide/kernel-parameters.rst for general information on</div><div class='ctx'> specifying module parameters.</div><div class='ctx'> </div><div class='ctx'> This document may not be entirely up to date and comprehensive. The command</div><div class='head'>diff --git a/Documentation/sound/soc/clocking.rst b/Documentation/sound/soc/clocking.rst<br/>new file mode 100644<br/>index 000000000000..32122d6877a3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/clocking.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/clocking.rst</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+==============</div><div class='add'>+Audio Clocking</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+This text describes the audio clocking terms in ASoC and digital audio in</div><div class='add'>+general. Note: Audio clocking can be complex!</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Master Clock</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+Every audio subsystem is driven by a master clock (sometimes referred to as MCLK</div><div class='add'>+or SYSCLK). This audio master clock can be derived from a number of sources</div><div class='add'>+(e.g. crystal, PLL, CPU clock) and is responsible for producing the correct</div><div class='add'>+audio playback and capture sample rates.</div><div class='add'>+</div><div class='add'>+Some master clocks (e.g. PLLs and CPU based clocks) are configurable in that</div><div class='add'>+their speed can be altered by software (depending on the system use and to save</div><div class='add'>+power). Other master clocks are fixed at a set frequency (i.e. crystals).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DAI Clocks</div><div class='add'>+----------</div><div class='add'>+The Digital Audio Interface is usually driven by a Bit Clock (often referred to</div><div class='add'>+as BCLK). This clock is used to drive the digital audio data across the link</div><div class='add'>+between the codec and CPU.</div><div class='add'>+</div><div class='add'>+The DAI also has a frame clock to signal the start of each audio frame. This</div><div class='add'>+clock is sometimes referred to as LRC (left right clock) or FRAME. This clock</div><div class='add'>+runs at exactly the sample rate (LRC = Rate).</div><div class='add'>+</div><div class='add'>+Bit Clock can be generated as follows:-</div><div class='add'>+</div><div class='add'>+- BCLK = MCLK / x, or</div><div class='add'>+- BCLK = LRC * x, or</div><div class='add'>+- BCLK = LRC * Channels * Word Size</div><div class='add'>+</div><div class='add'>+This relationship depends on the codec or SoC CPU in particular. In general</div><div class='add'>+it is best to configure BCLK to the lowest possible speed (depending on your</div><div class='add'>+rate, number of channels and word size) to save on power.</div><div class='add'>+</div><div class='add'>+It is also desirable to use the codec (if possible) to drive (or master) the</div><div class='add'>+audio clocks as it usually gives more accurate sample rates than the CPU.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/sound/soc/codec-to-codec.rst b/Documentation/sound/soc/codec-to-codec.rst<br/>new file mode 100644<br/>index 000000000000..810109d7500d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/codec-to-codec.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/codec-to-codec.rst</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+==============================================</div><div class='add'>+Creating codec to codec dai link for ALSA dapm</div><div class='add'>+==============================================</div><div class='add'>+</div><div class='add'>+Mostly the flow of audio is always from CPU to codec so your system</div><div class='add'>+will look as below:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+   ---------          ---------</div><div class='add'>+  |         |  dai   |         |</div><div class='add'>+      CPU    -------&gt;    codec</div><div class='add'>+  |         |        |         |</div><div class='add'>+   ---------          ---------</div><div class='add'>+</div><div class='add'>+In case your system looks as below:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+                       ---------</div><div class='add'>+                      |         |</div><div class='add'>+                        codec-2</div><div class='add'>+                      |         |</div><div class='add'>+                      ---------</div><div class='add'>+                           |</div><div class='add'>+                         dai-2</div><div class='add'>+                           |</div><div class='add'>+   ----------          ---------</div><div class='add'>+  |          |  dai-1 |         |</div><div class='add'>+      CPU     -------&gt;  codec-1</div><div class='add'>+  |          |        |         |</div><div class='add'>+   ----------          ---------</div><div class='add'>+                           |</div><div class='add'>+                         dai-3</div><div class='add'>+                           |</div><div class='add'>+                       ---------</div><div class='add'>+                      |         |</div><div class='add'>+                        codec-3</div><div class='add'>+                      |         |</div><div class='add'>+                       ---------</div><div class='add'>+</div><div class='add'>+Suppose codec-2 is a bluetooth chip and codec-3 is connected to</div><div class='add'>+a speaker and you have a below scenario:</div><div class='add'>+codec-2 will receive the audio data and the user wants to play that</div><div class='add'>+audio through codec-3 without involving the CPU.This</div><div class='add'>+aforementioned case is the ideal case when codec to codec</div><div class='add'>+connection should be used.</div><div class='add'>+</div><div class='add'>+Your dai_link should appear as below in your machine</div><div class='add'>+file:</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+ /*</div><div class='add'>+  * this pcm stream only supports 24 bit, 2 channel and</div><div class='add'>+  * 48k sampling rate.</div><div class='add'>+  */</div><div class='add'>+ static const struct snd_soc_pcm_stream dsp_codec_params = {</div><div class='add'>+        .formats = SNDRV_PCM_FMTBIT_S24_LE,</div><div class='add'>+        .rate_min = 48000,</div><div class='add'>+        .rate_max = 48000,</div><div class='add'>+        .channels_min = 2,</div><div class='add'>+        .channels_max = 2,</div><div class='add'>+ };</div><div class='add'>+</div><div class='add'>+ {</div><div class='add'>+    .name = "CPU-DSP",</div><div class='add'>+    .stream_name = "CPU-DSP",</div><div class='add'>+    .cpu_dai_name = "samsung-i2s.0",</div><div class='add'>+    .codec_name = "codec-2,</div><div class='add'>+    .codec_dai_name = "codec-2-dai_name",</div><div class='add'>+    .platform_name = "samsung-i2s.0",</div><div class='add'>+    .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF</div><div class='add'>+            | SND_SOC_DAIFMT_CBM_CFM,</div><div class='add'>+    .ignore_suspend = 1,</div><div class='add'>+    .params = &amp;dsp_codec_params,</div><div class='add'>+ },</div><div class='add'>+ {</div><div class='add'>+    .name = "DSP-CODEC",</div><div class='add'>+    .stream_name = "DSP-CODEC",</div><div class='add'>+    .cpu_dai_name = "wm0010-sdi2",</div><div class='add'>+    .codec_name = "codec-3,</div><div class='add'>+    .codec_dai_name = "codec-3-dai_name",</div><div class='add'>+    .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF</div><div class='add'>+            | SND_SOC_DAIFMT_CBM_CFM,</div><div class='add'>+    .ignore_suspend = 1,</div><div class='add'>+    .params = &amp;dsp_codec_params,</div><div class='add'>+ },</div><div class='add'>+</div><div class='add'>+Above code snippet is motivated from sound/soc/samsung/speyside.c.</div><div class='add'>+</div><div class='add'>+Note the "params" callback which lets the dapm know that this</div><div class='add'>+dai_link is a codec to codec connection.</div><div class='add'>+</div><div class='add'>+In dapm core a route is created between cpu_dai playback widget</div><div class='add'>+and codec_dai capture widget for playback path and vice-versa is</div><div class='add'>+true for capture path. In order for this aforementioned route to get</div><div class='add'>+triggered, DAPM needs to find a valid endpoint which could be either</div><div class='add'>+a sink or source widget corresponding to playback and capture path</div><div class='add'>+respectively.</div><div class='add'>+</div><div class='add'>+In order to trigger this dai_link widget, a thin codec driver for</div><div class='add'>+the speaker amp can be created as demonstrated in wm8727.c file, it</div><div class='add'>+sets appropriate constraints for the device even if it needs no control.</div><div class='add'>+</div><div class='add'>+Make sure to name your corresponding cpu and codec playback and capture</div><div class='add'>+dai names ending with "Playback" and "Capture" respectively as dapm core</div><div class='add'>+will link and power those dais based on the name.</div><div class='add'>+</div><div class='add'>+Note that in current device tree there is no way to mark a dai_link</div><div class='add'>+as codec to codec. However, it may change in future.</div><div class='head'>diff --git a/Documentation/sound/soc/codec.rst b/Documentation/sound/soc/codec.rst<br/>new file mode 100644<br/>index 000000000000..f87612b94812<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/codec.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/codec.rst</a></div><div class='hunk'>@@ -0,0 +1,190 @@</div><div class='add'>+=======================</div><div class='add'>+ASoC Codec Class Driver</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+The codec class driver is generic and hardware independent code that configures</div><div class='add'>+the codec, FM, MODEM, BT or external DSP to provide audio capture and playback.</div><div class='add'>+It should contain no code that is specific to the target platform or machine.</div><div class='add'>+All platform and machine specific code should be added to the platform and</div><div class='add'>+machine drivers respectively.</div><div class='add'>+</div><div class='add'>+Each codec class driver *must* provide the following features:-</div><div class='add'>+</div><div class='add'>+1. Codec DAI and PCM configuration</div><div class='add'>+2. Codec control IO - using RegMap API</div><div class='add'>+3. Mixers and audio controls</div><div class='add'>+4. Codec audio operations</div><div class='add'>+5. DAPM description.</div><div class='add'>+6. DAPM event handler.</div><div class='add'>+</div><div class='add'>+Optionally, codec drivers can also provide:-</div><div class='add'>+</div><div class='add'>+7. DAC Digital mute control.</div><div class='add'>+</div><div class='add'>+Its probably best to use this guide in conjunction with the existing codec</div><div class='add'>+driver code in sound/soc/codecs/</div><div class='add'>+</div><div class='add'>+ASoC Codec driver breakdown</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+Codec DAI and PCM configuration</div><div class='add'>+-------------------------------</div><div class='add'>+Each codec driver must have a struct snd_soc_dai_driver to define its DAI and</div><div class='add'>+PCM capabilities and operations. This struct is exported so that it can be</div><div class='add'>+registered with the core by your machine driver.</div><div class='add'>+</div><div class='add'>+e.g.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static struct snd_soc_dai_ops wm8731_dai_ops = {</div><div class='add'>+	.prepare	= wm8731_pcm_prepare,</div><div class='add'>+	.hw_params	= wm8731_hw_params,</div><div class='add'>+	.shutdown	= wm8731_shutdown,</div><div class='add'>+	.digital_mute	= wm8731_mute,</div><div class='add'>+	.set_sysclk	= wm8731_set_dai_sysclk,</div><div class='add'>+	.set_fmt	= wm8731_set_dai_fmt,</div><div class='add'>+  };</div><div class='add'>+  </div><div class='add'>+  struct snd_soc_dai_driver wm8731_dai = {</div><div class='add'>+	.name = "wm8731-hifi",</div><div class='add'>+	.playback = {</div><div class='add'>+		.stream_name = "Playback",</div><div class='add'>+		.channels_min = 1,</div><div class='add'>+		.channels_max = 2,</div><div class='add'>+		.rates = WM8731_RATES,</div><div class='add'>+		.formats = WM8731_FORMATS,},</div><div class='add'>+	.capture = {</div><div class='add'>+		.stream_name = "Capture",</div><div class='add'>+		.channels_min = 1,</div><div class='add'>+		.channels_max = 2,</div><div class='add'>+		.rates = WM8731_RATES,</div><div class='add'>+		.formats = WM8731_FORMATS,},</div><div class='add'>+	.ops = &amp;wm8731_dai_ops,</div><div class='add'>+	.symmetric_rates = 1,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Codec control IO</div><div class='add'>+----------------</div><div class='add'>+The codec can usually be controlled via an I2C or SPI style interface</div><div class='add'>+(AC97 combines control with data in the DAI). The codec driver should use the</div><div class='add'>+Regmap API for all codec IO. Please see include/linux/regmap.h and existing</div><div class='add'>+codec drivers for example regmap usage.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Mixers and audio controls</div><div class='add'>+-------------------------</div><div class='add'>+All the codec mixers and audio controls can be defined using the convenience</div><div class='add'>+macros defined in soc.h.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    #define SOC_SINGLE(xname, reg, shift, mask, invert)</div><div class='add'>+</div><div class='add'>+Defines a single control as follows:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  xname = Control name e.g. "Playback Volume"</div><div class='add'>+  reg = codec register</div><div class='add'>+  shift = control bit(s) offset in register</div><div class='add'>+  mask = control bit size(s) e.g. mask of 7 = 3 bits</div><div class='add'>+  invert = the control is inverted</div><div class='add'>+</div><div class='add'>+Other macros include:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    #define SOC_DOUBLE(xname, reg, shift_left, shift_right, mask, invert)</div><div class='add'>+</div><div class='add'>+A stereo control</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    #define SOC_DOUBLE_R(xname, reg_left, reg_right, shift, mask, invert)</div><div class='add'>+</div><div class='add'>+A stereo control spanning 2 registers</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+    #define SOC_ENUM_SINGLE(xreg, xshift, xmask, xtexts)</div><div class='add'>+</div><div class='add'>+Defines an single enumerated control as follows:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+   xreg = register</div><div class='add'>+   xshift = control bit(s) offset in register</div><div class='add'>+   xmask = control bit(s) size</div><div class='add'>+   xtexts = pointer to array of strings that describe each setting</div><div class='add'>+</div><div class='add'>+   #define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xtexts)</div><div class='add'>+</div><div class='add'>+Defines a stereo enumerated control</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Codec Audio Operations</div><div class='add'>+----------------------</div><div class='add'>+The codec driver also supports the following ALSA PCM operations:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  /* SoC audio ops */</div><div class='add'>+  struct snd_soc_ops {</div><div class='add'>+	int (*startup)(struct snd_pcm_substream *);</div><div class='add'>+	void (*shutdown)(struct snd_pcm_substream *);</div><div class='add'>+	int (*hw_params)(struct snd_pcm_substream *, struct snd_pcm_hw_params *);</div><div class='add'>+	int (*hw_free)(struct snd_pcm_substream *);</div><div class='add'>+	int (*prepare)(struct snd_pcm_substream *);</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+Please refer to the ALSA driver PCM documentation for details.</div><div class='add'>+http://www.alsa-project.org/~iwai/writing-an-alsa-driver/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DAPM description</div><div class='add'>+----------------</div><div class='add'>+The Dynamic Audio Power Management description describes the codec power</div><div class='add'>+components and their relationships and registers to the ASoC core.</div><div class='add'>+Please read dapm.txt for details of building the description.</div><div class='add'>+</div><div class='add'>+Please also see the examples in other codec drivers.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DAPM event handler</div><div class='add'>+------------------</div><div class='add'>+This function is a callback that handles codec domain PM calls and system</div><div class='add'>+domain PM calls (e.g. suspend and resume). It is used to put the codec</div><div class='add'>+to sleep when not in use.</div><div class='add'>+</div><div class='add'>+Power states:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	SNDRV_CTL_POWER_D0: /* full On */</div><div class='add'>+	/* vref/mid, clk and osc on, active */</div><div class='add'>+</div><div class='add'>+	SNDRV_CTL_POWER_D1: /* partial On */</div><div class='add'>+	SNDRV_CTL_POWER_D2: /* partial On */</div><div class='add'>+</div><div class='add'>+	SNDRV_CTL_POWER_D3hot: /* Off, with power */</div><div class='add'>+	/* everything off except vref/vmid, inactive */</div><div class='add'>+</div><div class='add'>+	SNDRV_CTL_POWER_D3cold: /* Everything Off, without power */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Codec DAC digital mute control</div><div class='add'>+------------------------------</div><div class='add'>+Most codecs have a digital mute before the DACs that can be used to</div><div class='add'>+minimise any system noise.  The mute stops any digital data from</div><div class='add'>+entering the DAC.</div><div class='add'>+</div><div class='add'>+A callback can be created that is called by the core for each codec DAI</div><div class='add'>+when the mute is applied or freed.</div><div class='add'>+</div><div class='add'>+i.e.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int wm8974_mute(struct snd_soc_dai *dai, int mute)</div><div class='add'>+  {</div><div class='add'>+	struct snd_soc_codec *codec = dai-&gt;codec;</div><div class='add'>+	u16 mute_reg = snd_soc_read(codec, WM8974_DAC) &amp; 0xffbf;</div><div class='add'>+</div><div class='add'>+	if (mute)</div><div class='add'>+		snd_soc_write(codec, WM8974_DAC, mute_reg | 0x40);</div><div class='add'>+	else</div><div class='add'>+		snd_soc_write(codec, WM8974_DAC, mute_reg);</div><div class='add'>+	return 0;</div><div class='add'>+  }</div><div class='head'>diff --git a/Documentation/sound/soc/dai.rst b/Documentation/sound/soc/dai.rst<br/>new file mode 100644<br/>index 000000000000..55820e51708f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/dai.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/dai.rst</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+==================================</div><div class='add'>+ASoC Digital Audio Interface (DAI)</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+ASoC currently supports the three main Digital Audio Interfaces (DAI) found on</div><div class='add'>+SoC controllers and portable audio CODECs today, namely AC97, I2S and PCM.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AC97</div><div class='add'>+====</div><div class='add'>+</div><div class='add'>+AC97 is a five wire interface commonly found on many PC sound cards. It is</div><div class='add'>+now also popular in many portable devices. This DAI has a reset line and time</div><div class='add'>+multiplexes its data on its SDATA_OUT (playback) and SDATA_IN (capture) lines.</div><div class='add'>+The bit clock (BCLK) is always driven by the CODEC (usually 12.288MHz) and the</div><div class='add'>+frame (FRAME) (usually 48kHz) is always driven by the controller. Each AC97</div><div class='add'>+frame is 21uS long and is divided into 13 time slots.</div><div class='add'>+</div><div class='add'>+The AC97 specification can be found at :</div><div class='add'>+http://www.intel.com/p/en_US/business/design</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+I2S</div><div class='add'>+===</div><div class='add'>+</div><div class='add'>+I2S is a common 4 wire DAI used in HiFi, STB and portable devices. The Tx and</div><div class='add'>+Rx lines are used for audio transmission, whilst the bit clock (BCLK) and</div><div class='add'>+left/right clock (LRC) synchronise the link. I2S is flexible in that either the</div><div class='add'>+controller or CODEC can drive (master) the BCLK and LRC clock lines. Bit clock</div><div class='add'>+usually varies depending on the sample rate and the master system clock</div><div class='add'>+(SYSCLK). LRCLK is the same as the sample rate. A few devices support separate</div><div class='add'>+ADC and DAC LRCLKs, this allows for simultaneous capture and playback at</div><div class='add'>+different sample rates.</div><div class='add'>+</div><div class='add'>+I2S has several different operating modes:-</div><div class='add'>+</div><div class='add'>+I2S</div><div class='add'>+  MSB is transmitted on the falling edge of the first BCLK after LRC</div><div class='add'>+  transition.</div><div class='add'>+</div><div class='add'>+Left Justified</div><div class='add'>+  MSB is transmitted on transition of LRC.</div><div class='add'>+</div><div class='add'>+Right Justified</div><div class='add'>+  MSB is transmitted sample size BCLKs before LRC transition.</div><div class='add'>+</div><div class='add'>+PCM</div><div class='add'>+===</div><div class='add'>+</div><div class='add'>+PCM is another 4 wire interface, very similar to I2S, which can support a more</div><div class='add'>+flexible protocol. It has bit clock (BCLK) and sync (SYNC) lines that are used</div><div class='add'>+to synchronise the link whilst the Tx and Rx lines are used to transmit and</div><div class='add'>+receive the audio data. Bit clock usually varies depending on sample rate</div><div class='add'>+whilst sync runs at the sample rate. PCM also supports Time Division</div><div class='add'>+Multiplexing (TDM) in that several devices can use the bus simultaneously (this</div><div class='add'>+is sometimes referred to as network mode).</div><div class='add'>+</div><div class='add'>+Common PCM operating modes:-</div><div class='add'>+</div><div class='add'>+Mode A</div><div class='add'>+  MSB is transmitted on falling edge of first BCLK after FRAME/SYNC.</div><div class='add'>+</div><div class='add'>+Mode B</div><div class='add'>+  MSB is transmitted on rising edge of FRAME/SYNC.</div><div class='head'>diff --git a/Documentation/sound/soc/dapm.rst b/Documentation/sound/soc/dapm.rst<br/>new file mode 100644<br/>index 000000000000..a27f42befa4d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/dapm.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/dapm.rst</a></div><div class='hunk'>@@ -0,0 +1,342 @@</div><div class='add'>+===================================================</div><div class='add'>+Dynamic Audio Power Management for Portable Devices</div><div class='add'>+===================================================</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+Dynamic Audio Power Management (DAPM) is designed to allow portable</div><div class='add'>+Linux devices to use the minimum amount of power within the audio</div><div class='add'>+subsystem at all times. It is independent of other kernel PM and as</div><div class='add'>+such, can easily co-exist with the other PM systems.</div><div class='add'>+</div><div class='add'>+DAPM is also completely transparent to all user space applications as</div><div class='add'>+all power switching is done within the ASoC core. No code changes or</div><div class='add'>+recompiling are required for user space applications. DAPM makes power</div><div class='add'>+switching decisions based upon any audio stream (capture/playback)</div><div class='add'>+activity and audio mixer settings within the device.</div><div class='add'>+</div><div class='add'>+DAPM spans the whole machine. It covers power control within the entire</div><div class='add'>+audio subsystem, this includes internal codec power blocks and machine</div><div class='add'>+level power systems.</div><div class='add'>+</div><div class='add'>+There are 4 power domains within DAPM</div><div class='add'>+</div><div class='add'>+Codec bias domain</div><div class='add'>+      VREF, VMID (core codec and audio power)</div><div class='add'>+</div><div class='add'>+      Usually controlled at codec probe/remove and suspend/resume, although</div><div class='add'>+      can be set at stream time if power is not needed for sidetone, etc.</div><div class='add'>+</div><div class='add'>+Platform/Machine domain</div><div class='add'>+      physically connected inputs and outputs</div><div class='add'>+</div><div class='add'>+      Is platform/machine and user action specific, is configured by the</div><div class='add'>+      machine driver and responds to asynchronous events e.g when HP</div><div class='add'>+      are inserted</div><div class='add'>+</div><div class='add'>+Path domain</div><div class='add'>+      audio subsystem signal paths</div><div class='add'>+</div><div class='add'>+      Automatically set when mixer and mux settings are changed by the user.</div><div class='add'>+      e.g. alsamixer, amixer.</div><div class='add'>+</div><div class='add'>+Stream domain</div><div class='add'>+      DACs and ADCs.</div><div class='add'>+</div><div class='add'>+      Enabled and disabled when stream playback/capture is started and</div><div class='add'>+      stopped respectively. e.g. aplay, arecord.</div><div class='add'>+</div><div class='add'>+All DAPM power switching decisions are made automatically by consulting an audio</div><div class='add'>+routing map of the whole machine. This map is specific to each machine and</div><div class='add'>+consists of the interconnections between every audio component (including</div><div class='add'>+internal codec components). All audio components that effect power are called</div><div class='add'>+widgets hereafter.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DAPM Widgets</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+Audio DAPM widgets fall into a number of types:-</div><div class='add'>+</div><div class='add'>+Mixer</div><div class='add'>+	Mixes several analog signals into a single analog signal.</div><div class='add'>+Mux</div><div class='add'>+	An analog switch that outputs only one of many inputs.</div><div class='add'>+PGA</div><div class='add'>+	A programmable gain amplifier or attenuation widget.</div><div class='add'>+ADC</div><div class='add'>+	Analog to Digital Converter</div><div class='add'>+DAC</div><div class='add'>+	Digital to Analog Converter</div><div class='add'>+Switch</div><div class='add'>+	An analog switch</div><div class='add'>+Input</div><div class='add'>+	A codec input pin</div><div class='add'>+Output</div><div class='add'>+	A codec output pin</div><div class='add'>+Headphone</div><div class='add'>+	Headphone (and optional Jack)</div><div class='add'>+Mic</div><div class='add'>+	Mic (and optional Jack)</div><div class='add'>+Line</div><div class='add'>+	Line Input/Output (and optional Jack)</div><div class='add'>+Speaker</div><div class='add'>+	Speaker</div><div class='add'>+Supply</div><div class='add'>+	Power or clock supply widget used by other widgets.</div><div class='add'>+Regulator</div><div class='add'>+	External regulator that supplies power to audio components.</div><div class='add'>+Clock</div><div class='add'>+	External clock that supplies clock to audio components.</div><div class='add'>+AIF IN</div><div class='add'>+	Audio Interface Input (with TDM slot mask).</div><div class='add'>+AIF OUT</div><div class='add'>+	Audio Interface Output (with TDM slot mask).</div><div class='add'>+Siggen</div><div class='add'>+	Signal Generator.</div><div class='add'>+DAI IN</div><div class='add'>+	Digital Audio Interface Input.</div><div class='add'>+DAI OUT</div><div class='add'>+	Digital Audio Interface Output.</div><div class='add'>+DAI Link</div><div class='add'>+	DAI Link between two DAI structures</div><div class='add'>+Pre</div><div class='add'>+	Special PRE widget (exec before all others)</div><div class='add'>+Post</div><div class='add'>+	Special POST widget (exec after all others)</div><div class='add'>+</div><div class='add'>+(Widgets are defined in include/sound/soc-dapm.h)</div><div class='add'>+</div><div class='add'>+Widgets can be added to the sound card by any of the component driver types.</div><div class='add'>+There are convenience macros defined in soc-dapm.h that can be used to quickly</div><div class='add'>+build a list of widgets of the codecs and machines DAPM widgets.</div><div class='add'>+</div><div class='add'>+Most widgets have a name, register, shift and invert. Some widgets have extra</div><div class='add'>+parameters for stream name and kcontrols.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Stream Domain Widgets</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+Stream Widgets relate to the stream power domain and only consist of ADCs</div><div class='add'>+(analog to digital converters), DACs (digital to analog converters),</div><div class='add'>+AIF IN and AIF OUT.</div><div class='add'>+</div><div class='add'>+Stream widgets have the following format:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  SND_SOC_DAPM_DAC(name, stream name, reg, shift, invert),</div><div class='add'>+  SND_SOC_DAPM_AIF_IN(name, stream, slot, reg, shift, invert)</div><div class='add'>+</div><div class='add'>+NOTE: the stream name must match the corresponding stream name in your codec</div><div class='add'>+snd_soc_codec_dai.</div><div class='add'>+</div><div class='add'>+e.g. stream widgets for HiFi playback and capture</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  SND_SOC_DAPM_DAC("HiFi DAC", "HiFi Playback", REG, 3, 1),</div><div class='add'>+  SND_SOC_DAPM_ADC("HiFi ADC", "HiFi Capture", REG, 2, 1),</div><div class='add'>+</div><div class='add'>+e.g. stream widgets for AIF</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),</div><div class='add'>+  SND_SOC_DAPM_AIF_OUT("AIF1TX", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0),</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Path Domain Widgets</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+Path domain widgets have a ability to control or affect the audio signal or</div><div class='add'>+audio paths within the audio subsystem. They have the following form:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  SND_SOC_DAPM_PGA(name, reg, shift, invert, controls, num_controls)</div><div class='add'>+</div><div class='add'>+Any widget kcontrols can be set using the controls and num_controls members.</div><div class='add'>+</div><div class='add'>+e.g. Mixer widget (the kcontrols are declared first)</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  /* Output Mixer */</div><div class='add'>+  static const snd_kcontrol_new_t wm8731_output_mixer_controls[] = {</div><div class='add'>+  SOC_DAPM_SINGLE("Line Bypass Switch", WM8731_APANA, 3, 1, 0),</div><div class='add'>+  SOC_DAPM_SINGLE("Mic Sidetone Switch", WM8731_APANA, 5, 1, 0),</div><div class='add'>+  SOC_DAPM_SINGLE("HiFi Playback Switch", WM8731_APANA, 4, 1, 0),</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+  SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, wm8731_output_mixer_controls,</div><div class='add'>+	ARRAY_SIZE(wm8731_output_mixer_controls)),</div><div class='add'>+</div><div class='add'>+If you don't want the mixer elements prefixed with the name of the mixer widget,</div><div class='add'>+you can use SND_SOC_DAPM_MIXER_NAMED_CTL instead. the parameters are the same</div><div class='add'>+as for SND_SOC_DAPM_MIXER.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Machine domain Widgets</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+Machine widgets are different from codec widgets in that they don't have a</div><div class='add'>+codec register bit associated with them. A machine widget is assigned to each</div><div class='add'>+machine audio component (non codec or DSP) that can be independently</div><div class='add'>+powered. e.g.</div><div class='add'>+</div><div class='add'>+* Speaker Amp</div><div class='add'>+* Microphone Bias</div><div class='add'>+* Jack connectors</div><div class='add'>+</div><div class='add'>+A machine widget can have an optional call back.</div><div class='add'>+</div><div class='add'>+e.g. Jack connector widget for an external Mic that enables Mic Bias</div><div class='add'>+when the Mic is inserted:-::</div><div class='add'>+</div><div class='add'>+  static int spitz_mic_bias(struct snd_soc_dapm_widget* w, int event)</div><div class='add'>+  {</div><div class='add'>+	gpio_set_value(SPITZ_GPIO_MIC_BIAS, SND_SOC_DAPM_EVENT_ON(event));</div><div class='add'>+	return 0;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  SND_SOC_DAPM_MIC("Mic Jack", spitz_mic_bias),</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Codec (BIAS) Domain</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+The codec bias power domain has no widgets and is handled by the codecs DAPM</div><div class='add'>+event handler. This handler is called when the codec powerstate is changed wrt</div><div class='add'>+to any stream event or by kernel PM events.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Virtual Widgets</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Sometimes widgets exist in the codec or machine audio map that don't have any</div><div class='add'>+corresponding soft power control. In this case it is necessary to create</div><div class='add'>+a virtual widget - a widget with no control bits e.g.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  SND_SOC_DAPM_MIXER("AC97 Mixer", SND_SOC_DAPM_NOPM, 0, 0, NULL, 0),</div><div class='add'>+</div><div class='add'>+This can be used to merge to signal paths together in software.</div><div class='add'>+</div><div class='add'>+After all the widgets have been defined, they can then be added to the DAPM</div><div class='add'>+subsystem individually with a call to snd_soc_dapm_new_control().</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Codec/DSP Widget Interconnections</div><div class='add'>+=================================</div><div class='add'>+</div><div class='add'>+Widgets are connected to each other within the codec, platform and machine by</div><div class='add'>+audio paths (called interconnections). Each interconnection must be defined in</div><div class='add'>+order to create a map of all audio paths between widgets.</div><div class='add'>+</div><div class='add'>+This is easiest with a diagram of the codec or DSP (and schematic of the machine</div><div class='add'>+audio system), as it requires joining widgets together via their audio signal</div><div class='add'>+paths.</div><div class='add'>+</div><div class='add'>+e.g., from the WM8731 output mixer (wm8731.c)</div><div class='add'>+</div><div class='add'>+The WM8731 output mixer has 3 inputs (sources)</div><div class='add'>+</div><div class='add'>+1. Line Bypass Input</div><div class='add'>+2. DAC (HiFi playback)</div><div class='add'>+3. Mic Sidetone Input</div><div class='add'>+</div><div class='add'>+Each input in this example has a kcontrol associated with it (defined in example</div><div class='add'>+above) and is connected to the output mixer via its kcontrol name. We can now</div><div class='add'>+connect the destination widget (wrt audio signal) with its source widgets.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	/* output mixer */</div><div class='add'>+	{"Output Mixer", "Line Bypass Switch", "Line Input"},</div><div class='add'>+	{"Output Mixer", "HiFi Playback Switch", "DAC"},</div><div class='add'>+	{"Output Mixer", "Mic Sidetone Switch", "Mic Bias"},</div><div class='add'>+</div><div class='add'>+So we have :-</div><div class='add'>+</div><div class='add'>+* Destination Widget  &lt;=== Path Name &lt;=== Source Widget, or</div><div class='add'>+* Sink, Path, Source, or</div><div class='add'>+* ``Output Mixer`` is connected to the ``DAC`` via the ``HiFi Playback Switch``.</div><div class='add'>+</div><div class='add'>+When there is no path name connecting widgets (e.g. a direct connection) we</div><div class='add'>+pass NULL for the path name.</div><div class='add'>+</div><div class='add'>+Interconnections are created with a call to:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  snd_soc_dapm_connect_input(codec, sink, path, source);</div><div class='add'>+</div><div class='add'>+Finally, snd_soc_dapm_new_widgets(codec) must be called after all widgets and</div><div class='add'>+interconnections have been registered with the core. This causes the core to</div><div class='add'>+scan the codec and machine so that the internal DAPM state matches the</div><div class='add'>+physical state of the machine.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Machine Widget Interconnections</div><div class='add'>+-------------------------------</div><div class='add'>+Machine widget interconnections are created in the same way as codec ones and</div><div class='add'>+directly connect the codec pins to machine level widgets.</div><div class='add'>+</div><div class='add'>+e.g. connects the speaker out codec pins to the internal speaker.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+	/* ext speaker connected to codec pins LOUT2, ROUT2  */</div><div class='add'>+	{"Ext Spk", NULL , "ROUT2"},</div><div class='add'>+	{"Ext Spk", NULL , "LOUT2"},</div><div class='add'>+</div><div class='add'>+This allows the DAPM to power on and off pins that are connected (and in use)</div><div class='add'>+and pins that are NC respectively.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Endpoint Widgets</div><div class='add'>+================</div><div class='add'>+An endpoint is a start or end point (widget) of an audio signal within the</div><div class='add'>+machine and includes the codec. e.g.</div><div class='add'>+</div><div class='add'>+* Headphone Jack</div><div class='add'>+* Internal Speaker</div><div class='add'>+* Internal Mic</div><div class='add'>+* Mic Jack</div><div class='add'>+* Codec Pins</div><div class='add'>+</div><div class='add'>+Endpoints are added to the DAPM graph so that their usage can be determined in</div><div class='add'>+order to save power. e.g. NC codecs pins will be switched OFF, unconnected</div><div class='add'>+jacks can also be switched OFF.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DAPM Widget Events</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+Some widgets can register their interest with the DAPM core in PM events.</div><div class='add'>+e.g. A Speaker with an amplifier registers a widget so the amplifier can be</div><div class='add'>+powered only when the spk is in use.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  /* turn speaker amplifier on/off depending on use */</div><div class='add'>+  static int corgi_amp_event(struct snd_soc_dapm_widget *w, int event)</div><div class='add'>+  {</div><div class='add'>+	gpio_set_value(CORGI_GPIO_APM_ON, SND_SOC_DAPM_EVENT_ON(event));</div><div class='add'>+	return 0;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  /* corgi machine dapm widgets */</div><div class='add'>+  static const struct snd_soc_dapm_widget wm8731_dapm_widgets =</div><div class='add'>+	SND_SOC_DAPM_SPK("Ext Spk", corgi_amp_event);</div><div class='add'>+</div><div class='add'>+Please see soc-dapm.h for all other widgets that support events.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Event types</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The following event types are supported by event widgets.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  /* dapm event types */</div><div class='add'>+  #define SND_SOC_DAPM_PRE_PMU	0x1 	/* before widget power up */</div><div class='add'>+  #define SND_SOC_DAPM_POST_PMU	0x2		/* after widget power up */</div><div class='add'>+  #define SND_SOC_DAPM_PRE_PMD	0x4 	/* before widget power down */</div><div class='add'>+  #define SND_SOC_DAPM_POST_PMD	0x8		/* after widget power down */</div><div class='add'>+  #define SND_SOC_DAPM_PRE_REG	0x10	/* before audio path setup */</div><div class='add'>+  #define SND_SOC_DAPM_POST_REG	0x20	/* after audio path setup */</div><div class='head'>diff --git a/Documentation/sound/soc/dpcm.rst b/Documentation/sound/soc/dpcm.rst<br/>new file mode 100644<br/>index 000000000000..395e5a516282<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/dpcm.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/dpcm.rst</a></div><div class='hunk'>@@ -0,0 +1,392 @@</div><div class='add'>+===========</div><div class='add'>+Dynamic PCM</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+Dynamic PCM allows an ALSA PCM device to digitally route its PCM audio to</div><div class='add'>+various digital endpoints during the PCM stream runtime. e.g. PCM0 can route</div><div class='add'>+digital audio to I2S DAI0, I2S DAI1 or PDM DAI2. This is useful for on SoC DSP</div><div class='add'>+drivers that expose several ALSA PCMs and can route to multiple DAIs.</div><div class='add'>+</div><div class='add'>+The DPCM runtime routing is determined by the ALSA mixer settings in the same</div><div class='add'>+way as the analog signal is routed in an ASoC codec driver. DPCM uses a DAPM</div><div class='add'>+graph representing the DSP internal audio paths and uses the mixer settings to</div><div class='add'>+determine the patch used by each ALSA PCM.</div><div class='add'>+</div><div class='add'>+DPCM re-uses all the existing component codec, platform and DAI drivers without</div><div class='add'>+any modifications.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Phone Audio System with SoC based DSP</div><div class='add'>+-------------------------------------</div><div class='add'>+</div><div class='add'>+Consider the following phone audio subsystem. This will be used in this</div><div class='add'>+document for all examples :-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  | Front End PCMs    |  SoC DSP  | Back End DAIs | Audio devices |</div><div class='add'>+  </div><div class='add'>+                      *************</div><div class='add'>+  PCM0 &lt;------------&gt; *           * &lt;----DAI0-----&gt; Codec Headset</div><div class='add'>+                      *           *</div><div class='add'>+  PCM1 &lt;------------&gt; *           * &lt;----DAI1-----&gt; Codec Speakers</div><div class='add'>+                      *   DSP     *</div><div class='add'>+  PCM2 &lt;------------&gt; *           * &lt;----DAI2-----&gt; MODEM</div><div class='add'>+                      *           *</div><div class='add'>+  PCM3 &lt;------------&gt; *           * &lt;----DAI3-----&gt; BT</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI4-----&gt; DMIC</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI5-----&gt; FM</div><div class='add'>+                      *************</div><div class='add'>+</div><div class='add'>+This diagram shows a simple smart phone audio subsystem. It supports Bluetooth,</div><div class='add'>+FM digital radio, Speakers, Headset Jack, digital microphones and cellular</div><div class='add'>+modem. This sound card exposes 4 DSP front end (FE) ALSA PCM devices and</div><div class='add'>+supports 6 back end (BE) DAIs. Each FE PCM can digitally route audio data to any</div><div class='add'>+of the BE DAIs. The FE PCM devices can also route audio to more than 1 BE DAI.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example - DPCM Switching playback from DAI0 to DAI1</div><div class='add'>+---------------------------------------------------</div><div class='add'>+</div><div class='add'>+Audio is being played to the Headset. After a while the user removes the headset</div><div class='add'>+and audio continues playing on the speakers.</div><div class='add'>+</div><div class='add'>+Playback on PCM0 to Headset would look like :-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+                      *************</div><div class='add'>+  PCM0 &lt;============&gt; *           * &lt;====DAI0=====&gt; Codec Headset</div><div class='add'>+                      *           *</div><div class='add'>+  PCM1 &lt;------------&gt; *           * &lt;----DAI1-----&gt; Codec Speakers</div><div class='add'>+                      *   DSP     *</div><div class='add'>+  PCM2 &lt;------------&gt; *           * &lt;----DAI2-----&gt; MODEM</div><div class='add'>+                      *           *</div><div class='add'>+  PCM3 &lt;------------&gt; *           * &lt;----DAI3-----&gt; BT</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI4-----&gt; DMIC</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI5-----&gt; FM</div><div class='add'>+                      *************</div><div class='add'>+</div><div class='add'>+The headset is removed from the jack by user so the speakers must now be used :-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+                      *************</div><div class='add'>+  PCM0 &lt;============&gt; *           * &lt;----DAI0-----&gt; Codec Headset</div><div class='add'>+                      *           *</div><div class='add'>+  PCM1 &lt;------------&gt; *           * &lt;====DAI1=====&gt; Codec Speakers</div><div class='add'>+                      *   DSP     *</div><div class='add'>+  PCM2 &lt;------------&gt; *           * &lt;----DAI2-----&gt; MODEM</div><div class='add'>+                      *           *</div><div class='add'>+  PCM3 &lt;------------&gt; *           * &lt;----DAI3-----&gt; BT</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI4-----&gt; DMIC</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI5-----&gt; FM</div><div class='add'>+                      *************</div><div class='add'>+</div><div class='add'>+The audio driver processes this as follows :-</div><div class='add'>+</div><div class='add'>+1. Machine driver receives Jack removal event.</div><div class='add'>+</div><div class='add'>+2. Machine driver OR audio HAL disables the Headset path.</div><div class='add'>+</div><div class='add'>+3. DPCM runs the PCM trigger(stop), hw_free(), shutdown() operations on DAI0</div><div class='add'>+   for headset since the path is now disabled.</div><div class='add'>+</div><div class='add'>+4. Machine driver or audio HAL enables the speaker path.</div><div class='add'>+</div><div class='add'>+5. DPCM runs the PCM ops for startup(), hw_params(), prepapre() and</div><div class='add'>+   trigger(start) for DAI1 Speakers since the path is enabled.</div><div class='add'>+</div><div class='add'>+In this example, the machine driver or userspace audio HAL can alter the routing</div><div class='add'>+and then DPCM will take care of managing the DAI PCM operations to either bring</div><div class='add'>+the link up or down. Audio playback does not stop during this transition.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DPCM machine driver</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+The DPCM enabled ASoC machine driver is similar to normal machine drivers</div><div class='add'>+except that we also have to :-</div><div class='add'>+</div><div class='add'>+1. Define the FE and BE DAI links.</div><div class='add'>+</div><div class='add'>+2. Define any FE/BE PCM operations.</div><div class='add'>+</div><div class='add'>+3. Define widget graph connections.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+FE and BE DAI links</div><div class='add'>+-------------------</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  | Front End PCMs    |  SoC DSP  | Back End DAIs | Audio devices |</div><div class='add'>+  </div><div class='add'>+                      *************</div><div class='add'>+  PCM0 &lt;------------&gt; *           * &lt;----DAI0-----&gt; Codec Headset</div><div class='add'>+                      *           *</div><div class='add'>+  PCM1 &lt;------------&gt; *           * &lt;----DAI1-----&gt; Codec Speakers</div><div class='add'>+                      *   DSP     *</div><div class='add'>+  PCM2 &lt;------------&gt; *           * &lt;----DAI2-----&gt; MODEM</div><div class='add'>+                      *           *</div><div class='add'>+  PCM3 &lt;------------&gt; *           * &lt;----DAI3-----&gt; BT</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI4-----&gt; DMIC</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI5-----&gt; FM</div><div class='add'>+                      *************</div><div class='add'>+</div><div class='add'>+For the example above we have to define 4 FE DAI links and 6 BE DAI links. The</div><div class='add'>+FE DAI links are defined as follows :-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static struct snd_soc_dai_link machine_dais[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "PCM0 System",</div><div class='add'>+		.stream_name = "System Playback",</div><div class='add'>+		.cpu_dai_name = "System Pin",</div><div class='add'>+		.platform_name = "dsp-audio",</div><div class='add'>+		.codec_name = "snd-soc-dummy",</div><div class='add'>+		.codec_dai_name = "snd-soc-dummy-dai",</div><div class='add'>+		.dynamic = 1,</div><div class='add'>+		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},</div><div class='add'>+		.dpcm_playback = 1,</div><div class='add'>+	},</div><div class='add'>+	.....&lt; other FE and BE DAI links here &gt;</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+This FE DAI link is pretty similar to a regular DAI link except that we also</div><div class='add'>+set the DAI link to a DPCM FE with the ``dynamic = 1``. The supported FE stream</div><div class='add'>+directions should also be set with the ``dpcm_playback`` and ``dpcm_capture``</div><div class='add'>+flags. There is also an option to specify the ordering of the trigger call for</div><div class='add'>+each FE. This allows the ASoC core to trigger the DSP before or after the other</div><div class='add'>+components (as some DSPs have strong requirements for the ordering DAI/DSP</div><div class='add'>+start and stop sequences).</div><div class='add'>+</div><div class='add'>+The FE DAI above sets the codec and code DAIs to dummy devices since the BE is</div><div class='add'>+dynamic and will change depending on runtime config.</div><div class='add'>+</div><div class='add'>+The BE DAIs are configured as follows :-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static struct snd_soc_dai_link machine_dais[] = {</div><div class='add'>+	.....&lt; FE DAI links here &gt;</div><div class='add'>+	{</div><div class='add'>+		.name = "Codec Headset",</div><div class='add'>+		.cpu_dai_name = "ssp-dai.0",</div><div class='add'>+		.platform_name = "snd-soc-dummy",</div><div class='add'>+		.no_pcm = 1,</div><div class='add'>+		.codec_name = "rt5640.0-001c",</div><div class='add'>+		.codec_dai_name = "rt5640-aif1",</div><div class='add'>+		.ignore_suspend = 1,</div><div class='add'>+		.ignore_pmdown_time = 1,</div><div class='add'>+		.be_hw_params_fixup = hswult_ssp0_fixup,</div><div class='add'>+		.ops = &amp;haswell_ops,</div><div class='add'>+		.dpcm_playback = 1,</div><div class='add'>+		.dpcm_capture = 1,</div><div class='add'>+	},</div><div class='add'>+	.....&lt; other BE DAI links here &gt;</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+This BE DAI link connects DAI0 to the codec (in this case RT5460 AIF1). It sets</div><div class='add'>+the ``no_pcm`` flag to mark it has a BE and sets flags for supported stream</div><div class='add'>+directions using ``dpcm_playback`` and ``dpcm_capture`` above.</div><div class='add'>+</div><div class='add'>+The BE has also flags set for ignoring suspend and PM down time. This allows</div><div class='add'>+the BE to work in a hostless mode where the host CPU is not transferring data</div><div class='add'>+like a BT phone call :-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+                      *************</div><div class='add'>+  PCM0 &lt;------------&gt; *           * &lt;----DAI0-----&gt; Codec Headset</div><div class='add'>+                      *           *</div><div class='add'>+  PCM1 &lt;------------&gt; *           * &lt;----DAI1-----&gt; Codec Speakers</div><div class='add'>+                      *   DSP     *</div><div class='add'>+  PCM2 &lt;------------&gt; *           * &lt;====DAI2=====&gt; MODEM</div><div class='add'>+                      *           *</div><div class='add'>+  PCM3 &lt;------------&gt; *           * &lt;====DAI3=====&gt; BT</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI4-----&gt; DMIC</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI5-----&gt; FM</div><div class='add'>+                      *************</div><div class='add'>+</div><div class='add'>+This allows the host CPU to sleep whilst the DSP, MODEM DAI and the BT DAI are</div><div class='add'>+still in operation.</div><div class='add'>+</div><div class='add'>+A BE DAI link can also set the codec to a dummy device if the code is a device</div><div class='add'>+that is managed externally.</div><div class='add'>+</div><div class='add'>+Likewise a BE DAI can also set a dummy cpu DAI if the CPU DAI is managed by the</div><div class='add'>+DSP firmware.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+FE/BE PCM operations</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+The BE above also exports some PCM operations and a ``fixup`` callback. The fixup</div><div class='add'>+callback is used by the machine driver to (re)configure the DAI based upon the</div><div class='add'>+FE hw params. i.e. the DSP may perform SRC or ASRC from the FE to BE.</div><div class='add'>+</div><div class='add'>+e.g. DSP converts all FE hw params to run at fixed rate of 48k, 16bit, stereo for</div><div class='add'>+DAI0. This means all FE hw_params have to be fixed in the machine driver for</div><div class='add'>+DAI0 so that the DAI is running at desired configuration regardless of the FE</div><div class='add'>+configuration.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static int dai0_fixup(struct snd_soc_pcm_runtime *rtd,</div><div class='add'>+			struct snd_pcm_hw_params *params)</div><div class='add'>+  {</div><div class='add'>+	struct snd_interval *rate = hw_param_interval(params,</div><div class='add'>+			SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	struct snd_interval *channels = hw_param_interval(params,</div><div class='add'>+						SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+</div><div class='add'>+	/* The DSP will covert the FE rate to 48k, stereo */</div><div class='add'>+	rate-&gt;min = rate-&gt;max = 48000;</div><div class='add'>+	channels-&gt;min = channels-&gt;max = 2;</div><div class='add'>+</div><div class='add'>+	/* set DAI0 to 16 bit */</div><div class='add'>+	snd_mask_set(&amp;params-&gt;masks[SNDRV_PCM_HW_PARAM_FORMAT -</div><div class='add'>+				    SNDRV_PCM_HW_PARAM_FIRST_MASK],</div><div class='add'>+				    SNDRV_PCM_FORMAT_S16_LE);</div><div class='add'>+	return 0;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+The other PCM operation are the same as for regular DAI links. Use as necessary.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Widget graph connections</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+The BE DAI links will normally be connected to the graph at initialisation time</div><div class='add'>+by the ASoC DAPM core. However, if the BE codec or BE DAI is a dummy then this</div><div class='add'>+has to be set explicitly in the driver :-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  /* BE for codec Headset -  DAI0 is dummy and managed by DSP FW */</div><div class='add'>+  {"DAI0 CODEC IN", NULL, "AIF1 Capture"},</div><div class='add'>+  {"AIF1 Playback", NULL, "DAI0 CODEC OUT"},</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Writing a DPCM DSP driver</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+The DPCM DSP driver looks much like a standard platform class ASoC driver</div><div class='add'>+combined with elements from a codec class driver. A DSP platform driver must</div><div class='add'>+implement :-</div><div class='add'>+</div><div class='add'>+1. Front End PCM DAIs - i.e. struct snd_soc_dai_driver.</div><div class='add'>+</div><div class='add'>+2. DAPM graph showing DSP audio routing from FE DAIs to BEs.</div><div class='add'>+</div><div class='add'>+3. DAPM widgets from DSP graph.</div><div class='add'>+</div><div class='add'>+4. Mixers for gains, routing, etc.</div><div class='add'>+</div><div class='add'>+5. DMA configuration.</div><div class='add'>+</div><div class='add'>+6. BE AIF widgets.</div><div class='add'>+</div><div class='add'>+Items 6 is important for routing the audio outside of the DSP. AIF need to be</div><div class='add'>+defined for each BE and each stream direction. e.g for BE DAI0 above we would</div><div class='add'>+have :-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  SND_SOC_DAPM_AIF_IN("DAI0 RX", NULL, 0, SND_SOC_NOPM, 0, 0),</div><div class='add'>+  SND_SOC_DAPM_AIF_OUT("DAI0 TX", NULL, 0, SND_SOC_NOPM, 0, 0),</div><div class='add'>+</div><div class='add'>+The BE AIF are used to connect the DSP graph to the graphs for the other</div><div class='add'>+component drivers (e.g. codec graph).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Hostless PCM streams</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+A hostless PCM stream is a stream that is not routed through the host CPU. An</div><div class='add'>+example of this would be a phone call from handset to modem.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+                      *************</div><div class='add'>+  PCM0 &lt;------------&gt; *           * &lt;----DAI0-----&gt; Codec Headset</div><div class='add'>+                      *           *</div><div class='add'>+  PCM1 &lt;------------&gt; *           * &lt;====DAI1=====&gt; Codec Speakers/Mic</div><div class='add'>+                      *   DSP     *</div><div class='add'>+  PCM2 &lt;------------&gt; *           * &lt;====DAI2=====&gt; MODEM</div><div class='add'>+                      *           *</div><div class='add'>+  PCM3 &lt;------------&gt; *           * &lt;----DAI3-----&gt; BT</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI4-----&gt; DMIC</div><div class='add'>+                      *           *</div><div class='add'>+                      *           * &lt;----DAI5-----&gt; FM</div><div class='add'>+                      *************</div><div class='add'>+</div><div class='add'>+In this case the PCM data is routed via the DSP. The host CPU in this use case</div><div class='add'>+is only used for control and can sleep during the runtime of the stream.</div><div class='add'>+</div><div class='add'>+The host can control the hostless link either by :-</div><div class='add'>+</div><div class='add'>+ 1. Configuring the link as a CODEC &lt;-&gt; CODEC style link. In this case the link</div><div class='add'>+    is enabled or disabled by the state of the DAPM graph. This usually means</div><div class='add'>+    there is a mixer control that can be used to connect or disconnect the path</div><div class='add'>+    between both DAIs.</div><div class='add'>+</div><div class='add'>+ 2. Hostless FE. This FE has a virtual connection to the BE DAI links on the DAPM</div><div class='add'>+    graph. Control is then carried out by the FE as regular PCM operations.</div><div class='add'>+    This method gives more control over the DAI links, but requires much more</div><div class='add'>+    userspace code to control the link. Its recommended to use CODEC&lt;-&gt;CODEC</div><div class='add'>+    unless your HW needs more fine grained sequencing of the PCM ops.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+CODEC &lt;-&gt; CODEC link</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+This DAI link is enabled when DAPM detects a valid path within the DAPM graph.</div><div class='add'>+The machine driver sets some additional parameters to the DAI link i.e.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  static const struct snd_soc_pcm_stream dai_params = {</div><div class='add'>+	.formats = SNDRV_PCM_FMTBIT_S32_LE,</div><div class='add'>+	.rate_min = 8000,</div><div class='add'>+	.rate_max = 8000,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 2,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+  static struct snd_soc_dai_link dais[] = {</div><div class='add'>+	&lt; ... more DAI links above ... &gt;</div><div class='add'>+	{</div><div class='add'>+		.name = "MODEM",</div><div class='add'>+		.stream_name = "MODEM",</div><div class='add'>+		.cpu_dai_name = "dai2",</div><div class='add'>+		.codec_dai_name = "modem-aif1",</div><div class='add'>+		.codec_name = "modem",</div><div class='add'>+		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF</div><div class='add'>+				| SND_SOC_DAIFMT_CBM_CFM,</div><div class='add'>+		.params = &amp;dai_params,</div><div class='add'>+	}</div><div class='add'>+	&lt; ... more DAI links here ... &gt;</div><div class='add'>+</div><div class='add'>+These parameters are used to configure the DAI hw_params() when DAPM detects a</div><div class='add'>+valid path and then calls the PCM operations to start the link. DAPM will also</div><div class='add'>+call the appropriate PCM operations to disable the DAI when the path is no</div><div class='add'>+longer valid.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Hostless FE</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The DAI link(s) are enabled by a FE that does not read or write any PCM data.</div><div class='add'>+This means creating a new FE that is connected with a virtual path to both</div><div class='add'>+DAI links. The DAI links will be started when the FE PCM is started and stopped</div><div class='add'>+when the FE PCM is stopped. Note that the FE PCM cannot read or write data in</div><div class='add'>+this configuration.</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/sound/soc/index.rst b/Documentation/sound/soc/index.rst<br/>new file mode 100644<br/>index 000000000000..e57df2dab2fd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/index.rst</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+==============</div><div class='add'>+ALSA SoC Layer</div><div class='add'>+==============</div><div class='add'>+</div><div class='add'>+The documentation is spilt into the following sections:-</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 2</div><div class='add'>+</div><div class='add'>+   overview</div><div class='add'>+   codec</div><div class='add'>+   dai</div><div class='add'>+   dapm</div><div class='add'>+   platform</div><div class='add'>+   machine</div><div class='add'>+   pops-clicks</div><div class='add'>+   clocking</div><div class='add'>+   jack</div><div class='add'>+   dpcm</div><div class='add'>+   codec-to-codec</div><div class='head'>diff --git a/Documentation/sound/soc/jack.rst b/Documentation/sound/soc/jack.rst<br/>new file mode 100644<br/>index 000000000000..644b99ecba35<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/jack.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/jack.rst</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+===================</div><div class='add'>+ASoC jack detection</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+ALSA has a standard API for representing physical jacks to user space,</div><div class='add'>+the kernel side of which can be seen in include/sound/jack.h.  ASoC</div><div class='add'>+provides a version of this API adding two additional features:</div><div class='add'>+</div><div class='add'>+ - It allows more than one jack detection method to work together on one</div><div class='add'>+   user visible jack.  In embedded systems it is common for multiple</div><div class='add'>+   to be present on a single jack but handled by separate bits of</div><div class='add'>+   hardware.</div><div class='add'>+</div><div class='add'>+ - Integration with DAPM, allowing DAPM endpoints to be updated</div><div class='add'>+   automatically based on the detected jack status (eg, turning off the</div><div class='add'>+   headphone outputs if no headphones are present).</div><div class='add'>+</div><div class='add'>+This is done by splitting the jacks up into three things working</div><div class='add'>+together: the jack itself represented by a struct snd_soc_jack, sets of</div><div class='add'>+snd_soc_jack_pins representing DAPM endpoints to update and blocks of</div><div class='add'>+code providing jack reporting mechanisms.</div><div class='add'>+</div><div class='add'>+For example, a system may have a stereo headset jack with two reporting</div><div class='add'>+mechanisms, one for the headphone and one for the microphone.  Some</div><div class='add'>+systems won't be able to use their speaker output while a headphone is</div><div class='add'>+connected and so will want to make sure to update both speaker and</div><div class='add'>+headphone when the headphone jack status changes.</div><div class='add'>+</div><div class='add'>+The jack - struct snd_soc_jack</div><div class='add'>+==============================</div><div class='add'>+</div><div class='add'>+This represents a physical jack on the system and is what is visible to</div><div class='add'>+user space.  The jack itself is completely passive, it is set up by the</div><div class='add'>+machine driver and updated by jack detection methods.</div><div class='add'>+</div><div class='add'>+Jacks are created by the machine driver calling snd_soc_jack_new().</div><div class='add'>+</div><div class='add'>+snd_soc_jack_pin</div><div class='add'>+================</div><div class='add'>+</div><div class='add'>+These represent a DAPM pin to update depending on some of the status</div><div class='add'>+bits supported by the jack.  Each snd_soc_jack has zero or more of these</div><div class='add'>+which are updated automatically.  They are created by the machine driver</div><div class='add'>+and associated with the jack using snd_soc_jack_add_pins().  The status</div><div class='add'>+of the endpoint may configured to be the opposite of the jack status if</div><div class='add'>+required (eg, enabling a built in microphone if a microphone is not</div><div class='add'>+connected via a jack).</div><div class='add'>+</div><div class='add'>+Jack detection methods</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+Actual jack detection is done by code which is able to monitor some</div><div class='add'>+input to the system and update a jack by calling snd_soc_jack_report(),</div><div class='add'>+specifying a subset of bits to update.  The jack detection code should</div><div class='add'>+be set up by the machine driver, taking configuration for the jack to</div><div class='add'>+update and the set of things to report when the jack is connected.</div><div class='add'>+</div><div class='add'>+Often this is done based on the status of a GPIO - a handler for this is</div><div class='add'>+provided by the snd_soc_jack_add_gpio() function.  Other methods are</div><div class='add'>+also available, for example integrated into CODECs.  One example of</div><div class='add'>+CODEC integrated jack detection can be see in the WM8350 driver.</div><div class='add'>+</div><div class='add'>+Each jack may have multiple reporting mechanisms, though it will need at</div><div class='add'>+least one to be useful.</div><div class='add'>+</div><div class='add'>+Machine drivers</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+These are all hooked together by the machine driver depending on the</div><div class='add'>+system hardware.  The machine driver will set up the snd_soc_jack and</div><div class='add'>+the list of pins to update then set up one or more jack detection</div><div class='add'>+mechanisms to update that jack based on their current status.</div><div class='head'>diff --git a/Documentation/sound/soc/machine.rst b/Documentation/sound/soc/machine.rst<br/>new file mode 100644<br/>index 000000000000..515c9444deaf<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/machine.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/machine.rst</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+===================</div><div class='add'>+ASoC Machine Driver</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+The ASoC machine (or board) driver is the code that glues together all the</div><div class='add'>+component drivers (e.g. codecs, platforms and DAIs). It also describes the</div><div class='add'>+relationships between each component which include audio paths, GPIOs,</div><div class='add'>+interrupts, clocking, jacks and voltage regulators.</div><div class='add'>+</div><div class='add'>+The machine driver can contain codec and platform specific code. It registers</div><div class='add'>+the audio subsystem with the kernel as a platform device and is represented by</div><div class='add'>+the following struct:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  /* SoC machine */</div><div class='add'>+  struct snd_soc_card {</div><div class='add'>+	char *name;</div><div class='add'>+</div><div class='add'>+	...</div><div class='add'>+</div><div class='add'>+	int (*probe)(struct platform_device *pdev);</div><div class='add'>+	int (*remove)(struct platform_device *pdev);</div><div class='add'>+</div><div class='add'>+	/* the pre and post PM functions are used to do any PM work before and</div><div class='add'>+	 * after the codec and DAIs do any PM work. */</div><div class='add'>+	int (*suspend_pre)(struct platform_device *pdev, pm_message_t state);</div><div class='add'>+	int (*suspend_post)(struct platform_device *pdev, pm_message_t state);</div><div class='add'>+	int (*resume_pre)(struct platform_device *pdev);</div><div class='add'>+	int (*resume_post)(struct platform_device *pdev);</div><div class='add'>+</div><div class='add'>+	...</div><div class='add'>+</div><div class='add'>+	/* CPU &lt;--&gt; Codec DAI links  */</div><div class='add'>+	struct snd_soc_dai_link *dai_link;</div><div class='add'>+	int num_links;</div><div class='add'>+</div><div class='add'>+	...</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+probe()/remove()</div><div class='add'>+----------------</div><div class='add'>+probe/remove are optional. Do any machine specific probe here.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+suspend()/resume()</div><div class='add'>+------------------</div><div class='add'>+The machine driver has pre and post versions of suspend and resume to take care</div><div class='add'>+of any machine audio tasks that have to be done before or after the codec, DAIs</div><div class='add'>+and DMA is suspended and resumed. Optional.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Machine DAI Configuration</div><div class='add'>+-------------------------</div><div class='add'>+The machine DAI configuration glues all the codec and CPU DAIs together. It can</div><div class='add'>+also be used to set up the DAI system clock and for any machine related DAI</div><div class='add'>+initialisation e.g. the machine audio map can be connected to the codec audio</div><div class='add'>+map, unconnected codec pins can be set as such.</div><div class='add'>+</div><div class='add'>+struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  /* corgi digital audio interface glue - connects codec &lt;--&gt; CPU */</div><div class='add'>+  static struct snd_soc_dai_link corgi_dai = {</div><div class='add'>+	.name = "WM8731",</div><div class='add'>+	.stream_name = "WM8731",</div><div class='add'>+	.cpu_dai_name = "pxa-is2-dai",</div><div class='add'>+	.codec_dai_name = "wm8731-hifi",</div><div class='add'>+	.platform_name = "pxa-pcm-audio",</div><div class='add'>+	.codec_name = "wm8713-codec.0-001a",</div><div class='add'>+	.init = corgi_wm8731_init,</div><div class='add'>+	.ops = &amp;corgi_ops,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+struct snd_soc_card then sets up the machine with its DAIs. e.g.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  /* corgi audio machine driver */</div><div class='add'>+  static struct snd_soc_card snd_soc_corgi = {</div><div class='add'>+	.name = "Corgi",</div><div class='add'>+	.dai_link = &amp;corgi_dai,</div><div class='add'>+	.num_links = 1,</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Machine Power Map</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+The machine driver can optionally extend the codec power map and to become an</div><div class='add'>+audio power map of the audio subsystem. This allows for automatic power up/down</div><div class='add'>+of speaker/HP amplifiers, etc. Codec pins can be connected to the machines jack</div><div class='add'>+sockets in the machine init function.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Machine Controls</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Machine specific audio mixer controls can be added in the DAI init function.</div><div class='head'>diff --git a/Documentation/sound/soc/overview.rst b/Documentation/sound/soc/overview.rst<br/>new file mode 100644<br/>index 000000000000..dc8370bbfff6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/overview.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/overview.rst</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+=======================</div><div class='add'>+ALSA SoC Layer Overview</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+The overall project goal of the ALSA System on Chip (ASoC) layer is to</div><div class='add'>+provide better ALSA support for embedded system-on-chip processors (e.g.</div><div class='add'>+pxa2xx, au1x00, iMX, etc) and portable audio codecs.  Prior to the ASoC</div><div class='add'>+subsystem there was some support in the kernel for SoC audio, however it</div><div class='add'>+had some limitations:-</div><div class='add'>+</div><div class='add'>+  * Codec drivers were often tightly coupled to the underlying SoC</div><div class='add'>+    CPU. This is not ideal and leads to code duplication - for example,</div><div class='add'>+    Linux had different wm8731 drivers for 4 different SoC platforms.</div><div class='add'>+</div><div class='add'>+  * There was no standard method to signal user initiated audio events (e.g.</div><div class='add'>+    Headphone/Mic insertion, Headphone/Mic detection after an insertion</div><div class='add'>+    event). These are quite common events on portable devices and often require</div><div class='add'>+    machine specific code to re-route audio, enable amps, etc., after such an</div><div class='add'>+    event.</div><div class='add'>+</div><div class='add'>+  * Drivers tended to power up the entire codec when playing (or</div><div class='add'>+    recording) audio. This is fine for a PC, but tends to waste a lot of</div><div class='add'>+    power on portable devices. There was also no support for saving</div><div class='add'>+    power via changing codec oversampling rates, bias currents, etc.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ASoC Design</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+The ASoC layer is designed to address these issues and provide the following</div><div class='add'>+features :-</div><div class='add'>+</div><div class='add'>+  * Codec independence. Allows reuse of codec drivers on other platforms</div><div class='add'>+    and machines.</div><div class='add'>+</div><div class='add'>+  * Easy I2S/PCM audio interface setup between codec and SoC. Each SoC</div><div class='add'>+    interface and codec registers its audio interface capabilities with the</div><div class='add'>+    core and are subsequently matched and configured when the application</div><div class='add'>+    hardware parameters are known.</div><div class='add'>+</div><div class='add'>+  * Dynamic Audio Power Management (DAPM). DAPM automatically sets the codec to</div><div class='add'>+    its minimum power state at all times. This includes powering up/down</div><div class='add'>+    internal power blocks depending on the internal codec audio routing and any</div><div class='add'>+    active streams.</div><div class='add'>+</div><div class='add'>+  * Pop and click reduction. Pops and clicks can be reduced by powering the</div><div class='add'>+    codec up/down in the correct sequence (including using digital mute). ASoC</div><div class='add'>+    signals the codec when to change power states.</div><div class='add'>+</div><div class='add'>+  * Machine specific controls: Allow machines to add controls to the sound card</div><div class='add'>+    (e.g. volume control for speaker amplifier).</div><div class='add'>+</div><div class='add'>+To achieve all this, ASoC basically splits an embedded audio system into</div><div class='add'>+multiple re-usable component drivers :-</div><div class='add'>+</div><div class='add'>+  * Codec class drivers: The codec class driver is platform independent and</div><div class='add'>+    contains audio controls, audio interface capabilities, codec DAPM</div><div class='add'>+    definition and codec IO functions. This class extends to BT, FM and MODEM</div><div class='add'>+    ICs if required. Codec class drivers should be generic code that can run</div><div class='add'>+    on any architecture and machine.</div><div class='add'>+</div><div class='add'>+  * Platform class drivers: The platform class driver includes the audio DMA</div><div class='add'>+    engine driver, digital audio interface (DAI) drivers (e.g. I2S, AC97, PCM)</div><div class='add'>+    and any audio DSP drivers for that platform.</div><div class='add'>+</div><div class='add'>+  * Machine class driver: The machine driver class acts as the glue that</div><div class='add'>+    describes and binds the other component drivers together to form an ALSA</div><div class='add'>+    "sound card device". It handles any machine specific controls and</div><div class='add'>+    machine level audio events (e.g. turning on an amp at start of playback).</div><div class='head'>diff --git a/Documentation/sound/soc/platform.rst b/Documentation/sound/soc/platform.rst<br/>new file mode 100644<br/>index 000000000000..d5574904d981<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/platform.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/platform.rst</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+====================</div><div class='add'>+ASoC Platform Driver</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+An ASoC platform driver class can be divided into audio DMA drivers, SoC DAI</div><div class='add'>+drivers and DSP drivers. The platform drivers only target the SoC CPU and must</div><div class='add'>+have no board specific code.</div><div class='add'>+</div><div class='add'>+Audio DMA</div><div class='add'>+=========</div><div class='add'>+</div><div class='add'>+The platform DMA driver optionally supports the following ALSA operations:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  /* SoC audio ops */</div><div class='add'>+  struct snd_soc_ops {</div><div class='add'>+	int (*startup)(struct snd_pcm_substream *);</div><div class='add'>+	void (*shutdown)(struct snd_pcm_substream *);</div><div class='add'>+	int (*hw_params)(struct snd_pcm_substream *, struct snd_pcm_hw_params *);</div><div class='add'>+	int (*hw_free)(struct snd_pcm_substream *);</div><div class='add'>+	int (*prepare)(struct snd_pcm_substream *);</div><div class='add'>+	int (*trigger)(struct snd_pcm_substream *, int);</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+The platform driver exports its DMA functionality via struct</div><div class='add'>+snd_soc_platform_driver:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+  struct snd_soc_platform_driver {</div><div class='add'>+	char *name;</div><div class='add'>+</div><div class='add'>+	int (*probe)(struct platform_device *pdev);</div><div class='add'>+	int (*remove)(struct platform_device *pdev);</div><div class='add'>+	int (*suspend)(struct platform_device *pdev, struct snd_soc_cpu_dai *cpu_dai);</div><div class='add'>+	int (*resume)(struct platform_device *pdev, struct snd_soc_cpu_dai *cpu_dai);</div><div class='add'>+</div><div class='add'>+	/* pcm creation and destruction */</div><div class='add'>+	int (*pcm_new)(struct snd_card *, struct snd_soc_codec_dai *, struct snd_pcm *);</div><div class='add'>+	void (*pcm_free)(struct snd_pcm *);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For platform caused delay reporting.</div><div class='add'>+	 * Optional.</div><div class='add'>+	 */</div><div class='add'>+	snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,</div><div class='add'>+		struct snd_soc_dai *);</div><div class='add'>+</div><div class='add'>+	/* platform stream ops */</div><div class='add'>+	struct snd_pcm_ops *pcm_ops;</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+Please refer to the ALSA driver documentation for details of audio DMA.</div><div class='add'>+http://www.alsa-project.org/~iwai/writing-an-alsa-driver/</div><div class='add'>+</div><div class='add'>+An example DMA driver is soc/pxa/pxa2xx-pcm.c</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+SoC DAI Drivers</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+Each SoC DAI driver must provide the following features:-</div><div class='add'>+</div><div class='add'>+1. Digital audio interface (DAI) description</div><div class='add'>+2. Digital audio interface configuration</div><div class='add'>+3. PCM's description</div><div class='add'>+4. SYSCLK configuration</div><div class='add'>+5. Suspend and resume (optional)</div><div class='add'>+</div><div class='add'>+Please see codec.txt for a description of items 1 - 4.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+SoC DSP Drivers</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+Each SoC DSP driver usually supplies the following features :-</div><div class='add'>+</div><div class='add'>+1. DAPM graph</div><div class='add'>+2. Mixer controls</div><div class='add'>+3. DMA IO to/from DSP buffers (if applicable)</div><div class='add'>+4. Definition of DSP front end (FE) PCM devices.</div><div class='add'>+</div><div class='add'>+Please see DPCM.txt for a description of item 4.</div><div class='head'>diff --git a/Documentation/sound/soc/pops-clicks.rst b/Documentation/sound/soc/pops-clicks.rst<br/>new file mode 100644<br/>index 000000000000..de7eb2a6604a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sound/soc/pops-clicks.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sound/soc/pops-clicks.rst</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+=====================</div><div class='add'>+Audio Pops and Clicks</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+Pops and clicks are unwanted audio artifacts caused by the powering up and down</div><div class='add'>+of components within the audio subsystem. This is noticeable on PCs when an</div><div class='add'>+audio module is either loaded or unloaded (at module load time the sound card is</div><div class='add'>+powered up and causes a popping noise on the speakers).</div><div class='add'>+</div><div class='add'>+Pops and clicks can be more frequent on portable systems with DAPM. This is</div><div class='add'>+because the components within the subsystem are being dynamically powered</div><div class='add'>+depending on the audio usage and this can subsequently cause a small pop or</div><div class='add'>+click every time a component power state is changed.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Minimising Playback Pops and Clicks</div><div class='add'>+===================================</div><div class='add'>+</div><div class='add'>+Playback pops in portable audio subsystems cannot be completely eliminated</div><div class='add'>+currently, however future audio codec hardware will have better pop and click</div><div class='add'>+suppression.  Pops can be reduced within playback by powering the audio</div><div class='add'>+components in a specific order. This order is different for startup and</div><div class='add'>+shutdown and follows some basic rules:-</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+   Startup Order :- DAC --&gt; Mixers --&gt; Output PGA --&gt; Digital Unmute</div><div class='add'>+  </div><div class='add'>+   Shutdown Order :- Digital Mute --&gt; Output PGA --&gt; Mixers --&gt; DAC</div><div class='add'>+</div><div class='add'>+This assumes that the codec PCM output path from the DAC is via a mixer and then</div><div class='add'>+a PGA (programmable gain amplifier) before being output to the speakers.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Minimising Capture Pops and Clicks</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+Capture artifacts are somewhat easier to get rid as we can delay activating the</div><div class='add'>+ADC until all the pops have occurred. This follows similar power rules to</div><div class='add'>+playback in that components are powered in a sequence depending upon stream</div><div class='add'>+startup or shutdown.</div><div class='add'>+::</div><div class='add'>+</div><div class='add'>+   Startup Order - Input PGA --&gt; Mixers --&gt; ADC</div><div class='add'>+  </div><div class='add'>+   Shutdown Order - ADC --&gt; Mixers --&gt; Input PGA</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Zipper Noise</div><div class='add'>+============</div><div class='add'>+An unwanted zipper noise can occur within the audio playback or capture stream</div><div class='add'>+when a volume control is changed near its maximum gain value. The zipper noise</div><div class='add'>+is heard when the gain increase or decrease changes the mean audio signal</div><div class='add'>+amplitude too quickly. It can be minimised by enabling the zero cross setting</div><div class='add'>+for each volume control. The ZC forces the gain change to occur when the signal</div><div class='add'>+crosses the zero amplitude line.</div><div class='head'>diff --git a/Documentation/sparc/console.txt b/Documentation/sparc/console.txt<br/>new file mode 100644<br/>index 000000000000..5aa735a44e02<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/sparc/console.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sparc/console.txt</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+Steps for sending 'break' on sunhv console:</div><div class='add'>+===========================================</div><div class='add'>+</div><div class='add'>+On Baremetal:</div><div class='add'>+   1. press   Esc + 'B'</div><div class='add'>+</div><div class='add'>+On LDOM:</div><div class='add'>+   1. press    Ctrl + ']'</div><div class='add'>+   2. telnet&gt; send  break</div><div class='head'>diff --git a/Documentation/sphinx/kernel-doc.py b/Documentation/sphinx/kerneldoc.py<br/>index d15e07f36881..d15e07f36881 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/sphinx/kernel-doc.py?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sphinx/kernel-doc.py</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/sphinx/kerneldoc.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sphinx/kerneldoc.py</a></div><div class='head'>diff --git a/Documentation/sphinx/parse-headers.pl b/Documentation/sphinx/parse-headers.pl<br/>index db0186a7618f..a958d8b5e99d 100755<br/>--- a/<a href='/drm-misc/tree/Documentation/sphinx/parse-headers.pl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sphinx/parse-headers.pl</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/sphinx/parse-headers.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sphinx/parse-headers.pl</a></div><div class='hunk'>@@ -1,22 +1,22 @@</div><div class='ctx'> #!/usr/bin/perl</div><div class='ctx'> use strict;</div><div class='ctx'> use Text::Tabs;</div><div class='add'>+use Getopt::Long;</div><div class='add'>+use Pod::Usage;</div><div class='ctx'> </div><div class='del'>-my $debug = 0;</div><div class='add'>+my $debug;</div><div class='add'>+my $help;</div><div class='add'>+my $man;</div><div class='ctx'> </div><div class='del'>-while ($ARGV[0] =~ m/^-(.*)/) {</div><div class='del'>-	my $cmd = shift @ARGV;</div><div class='del'>-	if ($cmd eq "--debug") {</div><div class='del'>-		require Data::Dumper;</div><div class='del'>-		$debug = 1;</div><div class='del'>-		next;</div><div class='del'>-	}</div><div class='del'>-	die "argument $cmd unknown";</div><div class='del'>-}</div><div class='add'>+GetOptions(</div><div class='add'>+	"debug" =&gt; \$debug,</div><div class='add'>+	'usage|?' =&gt; \$help,</div><div class='add'>+	'help' =&gt; \$man</div><div class='add'>+) or pod2usage(2);</div><div class='ctx'> </div><div class='del'>-if (scalar @ARGV &lt; 2 || scalar @ARGV &gt; 3) {</div><div class='del'>-	die "Usage:\n\t$0 &lt;file in&gt; &lt;file out&gt; [&lt;exceptions file&gt;]\n";</div><div class='del'>-}</div><div class='add'>+pod2usage(1) if $help;</div><div class='add'>+pod2usage(-exitstatus =&gt; 0, -verbose =&gt; 2) if $man;</div><div class='add'>+pod2usage(2) if (scalar @ARGV &lt; 2 || scalar @ARGV &gt; 3);</div><div class='ctx'> </div><div class='ctx'> my ($file_in, $file_out, $file_exceptions) = @ARGV;</div><div class='ctx'> </div><div class='hunk'>@@ -28,6 +28,8 @@ my %enums;</div><div class='ctx'> my %enum_symbols;</div><div class='ctx'> my %structs;</div><div class='ctx'> </div><div class='add'>+require Data::Dumper if ($debug);</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # read the file and get identifiers</div><div class='ctx'> #</div><div class='hunk'>@@ -330,3 +332,70 @@ print OUT "=" x length($title);</div><div class='ctx'> print OUT "\n\n.. parsed-literal::\n\n";</div><div class='ctx'> print OUT $data;</div><div class='ctx'> close OUT;</div><div class='add'>+</div><div class='add'>+__END__</div><div class='add'>+</div><div class='add'>+=head1 NAME</div><div class='add'>+</div><div class='add'>+parse_headers.pl - parse a C file, in order to identify functions, structs,</div><div class='add'>+enums and defines and create cross-references to a Sphinx book.</div><div class='add'>+</div><div class='add'>+=head1 SYNOPSIS</div><div class='add'>+</div><div class='add'>+B&lt;parse_headers.pl&gt; [&lt;options&gt;] &lt;C_FILE&gt; &lt;OUT_FILE&gt; [&lt;EXCEPTIONS_FILE&gt;]</div><div class='add'>+</div><div class='add'>+Where &lt;options&gt; can be: --debug, --help or --man.</div><div class='add'>+</div><div class='add'>+=head1 OPTIONS</div><div class='add'>+</div><div class='add'>+=over 8</div><div class='add'>+</div><div class='add'>+=item B&lt;--debug&gt;</div><div class='add'>+</div><div class='add'>+Put the script in verbose mode, useful for debugging.</div><div class='add'>+</div><div class='add'>+=item B&lt;--usage&gt;</div><div class='add'>+</div><div class='add'>+Prints a brief help message and exits.</div><div class='add'>+</div><div class='add'>+=item B&lt;--help&gt;</div><div class='add'>+</div><div class='add'>+Prints a more detailed help message and exits.</div><div class='add'>+</div><div class='add'>+=back</div><div class='add'>+</div><div class='add'>+=head1 DESCRIPTION</div><div class='add'>+</div><div class='add'>+Convert a C header or source file (C_FILE), into a ReStructured Text</div><div class='add'>+included via ..parsed-literal block with cross-references for the</div><div class='add'>+documentation files that describe the API. It accepts an optional</div><div class='add'>+EXCEPTIONS_FILE with describes what elements will be either ignored or</div><div class='add'>+be pointed to a non-default reference.</div><div class='add'>+</div><div class='add'>+The output is written at the (OUT_FILE).</div><div class='add'>+</div><div class='add'>+It is capable of identifying defines, functions, structs, typedefs,</div><div class='add'>+enums and enum symbols and create cross-references for all of them.</div><div class='add'>+It is also capable of distinguish #define used for specifying a Linux</div><div class='add'>+ioctl.</div><div class='add'>+</div><div class='add'>+The EXCEPTIONS_FILE contain two rules to allow ignoring a symbol or</div><div class='add'>+to replace the default references by a custom one.</div><div class='add'>+</div><div class='add'>+Please read Documentation/doc-guide/parse-headers.rst at the Kernel's</div><div class='add'>+tree for more details.</div><div class='add'>+</div><div class='add'>+=head1 BUGS</div><div class='add'>+</div><div class='add'>+Report bugs to Mauro Carvalho Chehab &lt;mchehab@s-opensource.com&gt;</div><div class='add'>+</div><div class='add'>+=head1 COPYRIGHT</div><div class='add'>+</div><div class='add'>+Copyright (c) 2016 by Mauro Carvalho Chehab &lt;mchehab@s-opensource.com&gt;.</div><div class='add'>+</div><div class='add'>+License GPLv2: GNU GPL version 2 &lt;http://gnu.org/licenses/gpl.html&gt;.</div><div class='add'>+</div><div class='add'>+This is free software: you are free to change and redistribute it.</div><div class='add'>+There is NO WARRANTY, to the extent permitted by law.</div><div class='add'>+</div><div class='add'>+=cut</div><div class='head'>diff --git a/Documentation/sphinx/rstFlatTable.py b/Documentation/sphinx/rstFlatTable.py<br/>index 55f275793028..25feb0d35e7a 100755<br/>--- a/<a href='/drm-misc/tree/Documentation/sphinx/rstFlatTable.py?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sphinx/rstFlatTable.py</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/sphinx/rstFlatTable.py?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sphinx/rstFlatTable.py</a></div><div class='hunk'>@@ -157,6 +157,11 @@ class ListTableBuilder(object):</div><div class='ctx'>     def buildTableNode(self):</div><div class='ctx'> </div><div class='ctx'>         colwidths    = self.directive.get_column_widths(self.max_cols)</div><div class='add'>+        if isinstance(colwidths, tuple):</div><div class='add'>+            # Since docutils 0.13, get_column_widths returns a (widths,</div><div class='add'>+            # colwidths) tuple, where widths is a string (i.e. 'auto').</div><div class='add'>+            # See https://sourceforge.net/p/docutils/patches/120/.</div><div class='add'>+            colwidths = colwidths[1]</div><div class='ctx'>         stub_columns = self.directive.options.get('stub-columns', 0)</div><div class='ctx'>         header_rows  = self.directive.options.get('header-rows', 0)</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/spi/ep93xx_spi b/Documentation/spi/ep93xx_spi<br/>deleted file mode 100644<br/>index 832ddce6e5fb..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/spi/ep93xx_spi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/spi/ep93xx_spi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,105 +0,0 @@</div><div class='del'>-Cirrus EP93xx SPI controller driver HOWTO</div><div class='del'>-=========================================</div><div class='del'>-</div><div class='del'>-ep93xx_spi driver brings SPI master support for EP93xx SPI controller.  Chip</div><div class='del'>-selects are implemented with GPIO lines.</div><div class='del'>-</div><div class='del'>-NOTE: If possible, don't use SFRMOUT (SFRM1) signal as a chip select. It will</div><div class='del'>-not work correctly (it cannot be controlled by software). Use GPIO lines</div><div class='del'>-instead.</div><div class='del'>-</div><div class='del'>-Sample configuration</div><div class='del'>-====================</div><div class='del'>-</div><div class='del'>-Typically driver configuration is done in platform board files (the files under</div><div class='del'>-arch/arm/mach-ep93xx/*.c). In this example we configure MMC over SPI through</div><div class='del'>-this driver on TS-7260 board. You can adapt the code to suit your needs.</div><div class='del'>-</div><div class='del'>-This example uses EGPIO9 as SD/MMC card chip select (this is wired in DIO1</div><div class='del'>-header on the board).</div><div class='del'>-</div><div class='del'>-You need to select CONFIG_MMC_SPI to use mmc_spi driver.</div><div class='del'>-</div><div class='del'>-arch/arm/mach-ep93xx/ts72xx.c:</div><div class='del'>-</div><div class='del'>-...</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/spi/spi.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_data/spi-ep93xx.h&gt;</div><div class='del'>-</div><div class='del'>-/* this is our GPIO line used for chip select */</div><div class='del'>-#define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9</div><div class='del'>-</div><div class='del'>-static int ts72xx_mmc_spi_setup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = gpio_request(MMC_CHIP_SELECT_GPIO, spi-&gt;modalias);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	gpio_direction_output(MMC_CHIP_SELECT_GPIO, 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ts72xx_mmc_spi_cleanup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(MMC_CHIP_SELECT_GPIO, 1);</div><div class='del'>-	gpio_direction_input(MMC_CHIP_SELECT_GPIO);</div><div class='del'>-	gpio_free(MMC_CHIP_SELECT_GPIO);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ts72xx_mmc_spi_cs_control(struct spi_device *spi, int value)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(MMC_CHIP_SELECT_GPIO, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ep93xx_spi_chip_ops ts72xx_mmc_spi_ops = {</div><div class='del'>-	.setup		= ts72xx_mmc_spi_setup,</div><div class='del'>-	.cleanup	= ts72xx_mmc_spi_cleanup,</div><div class='del'>-	.cs_control	= ts72xx_mmc_spi_cs_control,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct spi_board_info ts72xx_spi_devices[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.modalias		= "mmc_spi",</div><div class='del'>-		.controller_data	= &amp;ts72xx_mmc_spi_ops,</div><div class='del'>-		/*</div><div class='del'>-		 * We use 10 MHz even though the maximum is 7.4 MHz. The driver</div><div class='del'>-		 * will limit it automatically to max. frequency.</div><div class='del'>-		 */</div><div class='del'>-		.max_speed_hz		= 10 * 1000 * 1000,</div><div class='del'>-		.bus_num		= 0,</div><div class='del'>-		.chip_select		= 0,</div><div class='del'>-		.mode			= SPI_MODE_0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ep93xx_spi_info ts72xx_spi_info = {</div><div class='del'>-	.num_chipselect	= ARRAY_SIZE(ts72xx_spi_devices),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init ts72xx_init_machine(void)</div><div class='del'>-{</div><div class='del'>-	...</div><div class='del'>-	ep93xx_register_spi(&amp;ts72xx_spi_info, ts72xx_spi_devices,</div><div class='del'>-			    ARRAY_SIZE(ts72xx_spi_devices));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-The driver can use DMA for the transfers also. In this case ts72xx_spi_info</div><div class='del'>-becomes:</div><div class='del'>-</div><div class='del'>-static struct ep93xx_spi_info ts72xx_spi_info = {</div><div class='del'>-	.num_chipselect	= ARRAY_SIZE(ts72xx_spi_devices),</div><div class='del'>-	.use_dma	= true;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-Note that CONFIG_EP93XX_DMA should be enabled as well.</div><div class='del'>-</div><div class='del'>-Thanks to</div><div class='del'>-=========</div><div class='del'>-Martin Guy, H. Hartley Sweeten and others who helped me during development of</div><div class='del'>-the driver. Simplemachines.it donated me a Sim.One board which I used testing</div><div class='del'>-the driver on EP9307.</div><div class='head'>diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt<br/>deleted file mode 100644<br/>index 4d82e31b7958..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/stable_kernel_rules.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/stable_kernel_rules.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,181 +0,0 @@</div><div class='del'>-.. _stable_kernel_rules:</div><div class='del'>-</div><div class='del'>-Everything you ever wanted to know about Linux -stable releases</div><div class='del'>-===============================================================</div><div class='del'>-</div><div class='del'>-Rules on what kind of patches are accepted, and which ones are not, into the</div><div class='del'>-"-stable" tree:</div><div class='del'>-</div><div class='del'>- - It must be obviously correct and tested.</div><div class='del'>- - It cannot be bigger than 100 lines, with context.</div><div class='del'>- - It must fix only one thing.</div><div class='del'>- - It must fix a real bug that bothers people (not a, "This could be a</div><div class='del'>-   problem..." type thing).</div><div class='del'>- - It must fix a problem that causes a build error (but not for things</div><div class='del'>-   marked CONFIG_BROKEN), an oops, a hang, data corruption, a real</div><div class='del'>-   security issue, or some "oh, that's not good" issue.  In short, something</div><div class='del'>-   critical.</div><div class='del'>- - Serious issues as reported by a user of a distribution kernel may also</div><div class='del'>-   be considered if they fix a notable performance or interactivity issue.</div><div class='del'>-   As these fixes are not as obvious and have a higher risk of a subtle</div><div class='del'>-   regression they should only be submitted by a distribution kernel</div><div class='del'>-   maintainer and include an addendum linking to a bugzilla entry if it</div><div class='del'>-   exists and additional information on the user-visible impact.</div><div class='del'>- - New device IDs and quirks are also accepted.</div><div class='del'>- - No "theoretical race condition" issues, unless an explanation of how the</div><div class='del'>-   race can be exploited is also provided.</div><div class='del'>- - It cannot contain any "trivial" fixes in it (spelling changes,</div><div class='del'>-   whitespace cleanups, etc).</div><div class='del'>- - It must follow the</div><div class='del'>-   :ref:`Documentation/SubmittingPatches &lt;submittingpatches&gt;`</div><div class='del'>-   rules.</div><div class='del'>- - It or an equivalent fix must already exist in Linus' tree (upstream).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Procedure for submitting patches to the -stable tree</div><div class='del'>-----------------------------------------------------</div><div class='del'>-</div><div class='del'>- - If the patch covers files in net/ or drivers/net please follow netdev stable</div><div class='del'>-   submission guidelines as described in</div><div class='del'>-   Documentation/networking/netdev-FAQ.txt</div><div class='del'>- - Security patches should not be handled (solely) by the -stable review</div><div class='del'>-   process but should follow the procedures in</div><div class='del'>-   :ref:`Documentation/SecurityBugs &lt;securitybugs&gt;`.</div><div class='del'>-</div><div class='del'>-For all other submissions, choose one of the following procedures</div><div class='del'>------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-.. _option_1:</div><div class='del'>-</div><div class='del'>-Option 1</div><div class='del'>-********</div><div class='del'>-</div><div class='del'>-To have the patch automatically included in the stable tree, add the tag</div><div class='del'>-</div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-     Cc: stable@vger.kernel.org</div><div class='del'>-</div><div class='del'>-in the sign-off area. Once the patch is merged it will be applied to</div><div class='del'>-the stable tree without anything else needing to be done by the author</div><div class='del'>-or subsystem maintainer.</div><div class='del'>-</div><div class='del'>-.. _option_2:</div><div class='del'>-</div><div class='del'>-Option 2</div><div class='del'>-********</div><div class='del'>-</div><div class='del'>-After the patch has been merged to Linus' tree, send an email to</div><div class='del'>-stable@vger.kernel.org containing the subject of the patch, the commit ID,</div><div class='del'>-why you think it should be applied, and what kernel version you wish it to</div><div class='del'>-be applied to.</div><div class='del'>-</div><div class='del'>-.. _option_3:</div><div class='del'>-</div><div class='del'>-Option 3</div><div class='del'>-********</div><div class='del'>-</div><div class='del'>-Send the patch, after verifying that it follows the above rules, to</div><div class='del'>-stable@vger.kernel.org.  You must note the upstream commit ID in the</div><div class='del'>-changelog of your submission, as well as the kernel version you wish</div><div class='del'>-it to be applied to.</div><div class='del'>-</div><div class='del'>-:ref:`option_1` is **strongly** preferred, is the easiest and most common.</div><div class='del'>-:ref:`option_2` and :ref:`option_3` are more useful if the patch isn't deemed</div><div class='del'>-worthy at the time it is applied to a public git tree (for instance, because</div><div class='del'>-it deserves more regression testing first).  :ref:`option_3` is especially</div><div class='del'>-useful if the patch needs some special handling to apply to an older kernel</div><div class='del'>-(e.g., if API's have changed in the meantime).</div><div class='del'>-</div><div class='del'>-Note that for :ref:`option_3`, if the patch deviates from the original</div><div class='del'>-upstream patch (for example because it had to be backported) this must be very</div><div class='del'>-clearly documented and justified in the patch description.</div><div class='del'>-</div><div class='del'>-The upstream commit ID must be specified with a separate line above the commit</div><div class='del'>-text, like this:</div><div class='del'>-</div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-    commit &lt;sha1&gt; upstream.</div><div class='del'>-</div><div class='del'>-Additionally, some patches submitted via Option 1 may have additional patch</div><div class='del'>-prerequisites which can be cherry-picked. This can be specified in the following</div><div class='del'>-format in the sign-off area:</div><div class='del'>-</div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x: a1f84a3: sched: Check for idle</div><div class='del'>-     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x: 1b9508f: sched: Rate-limit newidle</div><div class='del'>-     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x: fd21073: sched: Fix affinity logic</div><div class='del'>-     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x</div><div class='del'>-     Signed-off-by: Ingo Molnar &lt;mingo@elte.hu&gt;</div><div class='del'>-</div><div class='del'>-The tag sequence has the meaning of:</div><div class='del'>-</div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-     git cherry-pick a1f84a3</div><div class='del'>-     git cherry-pick 1b9508f</div><div class='del'>-     git cherry-pick fd21073</div><div class='del'>-     git cherry-pick &lt;this commit&gt;</div><div class='del'>-</div><div class='del'>-Also, some patches may have kernel version prerequisites.  This can be</div><div class='del'>-specified in the following format in the sign-off area:</div><div class='del'>-</div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-     Cc: &lt;stable@vger.kernel.org&gt; # 3.3.x-</div><div class='del'>-</div><div class='del'>-The tag has the meaning of:</div><div class='del'>-</div><div class='del'>-.. code-block:: none</div><div class='del'>-</div><div class='del'>-     git cherry-pick &lt;this commit&gt;</div><div class='del'>-</div><div class='del'>-For each "-stable" tree starting with the specified version.</div><div class='del'>-</div><div class='del'>-Following the submission:</div><div class='del'>-</div><div class='del'>- - The sender will receive an ACK when the patch has been accepted into the</div><div class='del'>-   queue, or a NAK if the patch is rejected.  This response might take a few</div><div class='del'>-   days, according to the developer's schedules.</div><div class='del'>- - If accepted, the patch will be added to the -stable queue, for review by</div><div class='del'>-   other developers and by the relevant subsystem maintainer.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Review cycle</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>- - When the -stable maintainers decide for a review cycle, the patches will be</div><div class='del'>-   sent to the review committee, and the maintainer of the affected area of</div><div class='del'>-   the patch (unless the submitter is the maintainer of the area) and CC: to</div><div class='del'>-   the linux-kernel mailing list.</div><div class='del'>- - The review committee has 48 hours in which to ACK or NAK the patch.</div><div class='del'>- - If the patch is rejected by a member of the committee, or linux-kernel</div><div class='del'>-   members object to the patch, bringing up issues that the maintainers and</div><div class='del'>-   members did not realize, the patch will be dropped from the queue.</div><div class='del'>- - At the end of the review cycle, the ACKed patches will be added to the</div><div class='del'>-   latest -stable release, and a new -stable release will happen.</div><div class='del'>- - Security patches will be accepted into the -stable tree directly from the</div><div class='del'>-   security kernel team, and not go through the normal review cycle.</div><div class='del'>-   Contact the kernel security team for more details on this procedure.</div><div class='del'>-</div><div class='del'>-Trees</div><div class='del'>------</div><div class='del'>-</div><div class='del'>- - The queues of patches, for both completed versions and in progress</div><div class='del'>-   versions can be found at:</div><div class='del'>-</div><div class='del'>-	http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git</div><div class='del'>-</div><div class='del'>- - The finalized and tagged releases of all stable kernels can be found</div><div class='del'>-   in separate branches per version at:</div><div class='del'>-</div><div class='del'>-	http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Review committee</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>- - This is made up of a number of kernel developers who have volunteered for</div><div class='del'>-   this task, and a few that haven't.</div><div class='head'>diff --git a/Documentation/static-keys.txt b/Documentation/static-keys.txt<br/>index ea8d7b4e53f0..32a25fad0c1b 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/static-keys.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/static-keys.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/static-keys.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/static-keys.txt</a></div><div class='hunk'>@@ -155,7 +155,9 @@ or:</div><div class='ctx'> </div><div class='ctx'> There are a few functions and macros that architectures must implement in order</div><div class='ctx'> to take advantage of this optimization. If there is no architecture support, we</div><div class='del'>-simply fall back to a traditional, load, test, and jump sequence.</div><div class='add'>+simply fall back to a traditional, load, test, and jump sequence. Also, the</div><div class='add'>+struct jump_entry table must be at least 4-byte aligned because the</div><div class='add'>+static_key-&gt;entry field makes use of the two least significant bits.</div><div class='ctx'> </div><div class='ctx'> * select HAVE_ARCH_JUMP_LABEL, see: arch/x86/Kconfig</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/sync_file.txt b/Documentation/sync_file.txt<br/>index b63a68531afd..269681a6faec 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/sync_file.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sync_file.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/sync_file.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sync_file.txt</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> This document serves as a guide for device drivers writers on what the</div><div class='ctx'> sync_file API is, and how drivers can support it. Sync file is the carrier of</div><div class='del'>-the fences(struct fence) that are needed to synchronize between drivers or</div><div class='add'>+the fences(struct dma_fence) that are needed to synchronize between drivers or</div><div class='ctx'> across process boundaries.</div><div class='ctx'> </div><div class='ctx'> The sync_file API is meant to be used to send and receive fence information</div><div class='hunk'>@@ -32,9 +32,9 @@ in-fences and out-fences</div><div class='ctx'> Sync files can go either to or from userspace. When a sync_file is sent from</div><div class='ctx'> the driver to userspace we call the fences it contains 'out-fences'. They are</div><div class='ctx'> related to a buffer that the driver is processing or is going to process, so</div><div class='del'>-the driver creates an out-fence to be able to notify, through fence_signal(),</div><div class='del'>-when it has finished using (or processing) that buffer. Out-fences are fences</div><div class='del'>-that the driver creates.</div><div class='add'>+the driver creates an out-fence to be able to notify, through</div><div class='add'>+dma_fence_signal(), when it has finished using (or processing) that buffer.</div><div class='add'>+Out-fences are fences that the driver creates.</div><div class='ctx'> </div><div class='ctx'> On the other hand if the driver receives fence(s) through a sync_file from</div><div class='ctx'> userspace we call these fence(s) 'in-fences'. Receiveing in-fences means that</div><div class='hunk'>@@ -47,7 +47,7 @@ Creating Sync Files</div><div class='ctx'> When a driver needs to send an out-fence userspace it creates a sync_file.</div><div class='ctx'> </div><div class='ctx'> Interface:</div><div class='del'>-	struct sync_file *sync_file_create(struct fence *fence);</div><div class='add'>+	struct sync_file *sync_file_create(struct dma_fence *fence);</div><div class='ctx'> </div><div class='ctx'> The caller pass the out-fence and gets back the sync_file. That is just the</div><div class='ctx'> first step, next it needs to install an fd on sync_file-&gt;file. So it gets an</div><div class='hunk'>@@ -72,11 +72,11 @@ of the Sync File to the kernel. The kernel can then retrieve the fences</div><div class='ctx'> from it.</div><div class='ctx'> </div><div class='ctx'> Interface:</div><div class='del'>-	struct fence *sync_file_get_fence(int fd);</div><div class='add'>+	struct dma_fence *sync_file_get_fence(int fd);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> The returned reference is owned by the caller and must be disposed of</div><div class='del'>-afterwards using fence_put(). In case of error, a NULL is returned instead.</div><div class='add'>+afterwards using dma_fence_put(). In case of error, a NULL is returned instead.</div><div class='ctx'> </div><div class='ctx'> References:</div><div class='ctx'> [1] struct sync_file in include/linux/sync_file.h</div><div class='head'>diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt<br/>index ffab8b5caa60..bac23c198360 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/sysctl/kernel.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sysctl/kernel.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/sysctl/kernel.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sysctl/kernel.txt</a></div><div class='hunk'>@@ -40,7 +40,6 @@ show up in /proc/sys/kernel:</div><div class='ctx'> - hung_task_warnings</div><div class='ctx'> - kexec_load_disabled</div><div class='ctx'> - kptr_restrict</div><div class='del'>-- kstack_depth_to_print       [ X86 only ]</div><div class='ctx'> - l2cr                        [ PPC only ]</div><div class='ctx'> - modprobe                    ==&gt; Documentation/debugging-modules.txt</div><div class='ctx'> - modules_disabled</div><div class='hunk'>@@ -71,7 +70,7 @@ show up in /proc/sys/kernel:</div><div class='ctx'> - printk_ratelimit_burst</div><div class='ctx'> - pty                         ==&gt; Documentation/filesystems/devpts.txt</div><div class='ctx'> - randomize_va_space</div><div class='del'>-- real-root-dev               ==&gt; Documentation/initrd.txt</div><div class='add'>+- real-root-dev               ==&gt; Documentation/admin-guide/initrd.rst</div><div class='ctx'> - reboot-cmd                  [ SPARC only ]</div><div class='ctx'> - rtsig-max</div><div class='ctx'> - rtsig-nr</div><div class='hunk'>@@ -86,7 +85,7 @@ show up in /proc/sys/kernel:</div><div class='ctx'> - softlockup_all_cpu_backtrace</div><div class='ctx'> - soft_watchdog</div><div class='ctx'> - stop-a                      [ SPARC only ]</div><div class='del'>-- sysrq                       ==&gt; Documentation/sysrq.txt</div><div class='add'>+- sysrq                       ==&gt; Documentation/admin-guide/sysrq.rst</div><div class='ctx'> - sysctl_writes_strict</div><div class='ctx'> - tainted</div><div class='ctx'> - threads-max</div><div class='hunk'>@@ -395,13 +394,6 @@ When kptr_restrict is set to (2), kernel pointers printed using</div><div class='ctx'> </div><div class='ctx'> ==============================================================</div><div class='ctx'> </div><div class='del'>-kstack_depth_to_print: (X86 only)</div><div class='del'>-</div><div class='del'>-Controls the number of words to print when dumping the raw</div><div class='del'>-kernel stack.</div><div class='del'>-</div><div class='del'>-==============================================================</div><div class='del'>-</div><div class='ctx'> l2cr: (PPC only)</div><div class='ctx'> </div><div class='ctx'> This flag controls the L2 cache of G3 processor boards. If</div><div class='hunk'>@@ -453,7 +445,7 @@ in a KVM virtual machine. This default can be overridden by adding</div><div class='ctx'> </div><div class='ctx'>    nmi_watchdog=1</div><div class='ctx'> </div><div class='del'>-to the guest kernel command line (see Documentation/kernel-parameters.txt).</div><div class='add'>+to the guest kernel command line (see Documentation/admin-guide/kernel-parameters.rst).</div><div class='ctx'> </div><div class='ctx'> ==============================================================</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/sysctl/net.txt b/Documentation/sysctl/net.txt<br/>index f0480f7ea740..2ebabc93014a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/sysctl/net.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sysctl/net.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/sysctl/net.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sysctl/net.txt</a></div><div class='hunk'>@@ -54,6 +54,18 @@ Values :</div><div class='ctx'> 	1 - enable JIT hardening for unprivileged users only</div><div class='ctx'> 	2 - enable JIT hardening for all users</div><div class='ctx'> </div><div class='add'>+bpf_jit_kallsyms</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+When Berkeley Packet Filter Just in Time compiler is enabled, then compiled</div><div class='add'>+images are unknown addresses to the kernel, meaning they neither show up in</div><div class='add'>+traces nor in /proc/kallsyms. This enables export of these addresses, which</div><div class='add'>+can be used for debugging/tracing. If bpf_jit_harden is enabled, this feature</div><div class='add'>+is disabled.</div><div class='add'>+Values :</div><div class='add'>+	0 - disable JIT kallsyms export (default value)</div><div class='add'>+	1 - enable JIT kallsyms export for privileged users only</div><div class='add'>+</div><div class='ctx'> dev_weight</div><div class='ctx'> --------------</div><div class='ctx'> </div><div class='hunk'>@@ -61,6 +73,27 @@ The maximum number of packets that kernel can handle on a NAPI interrupt,</div><div class='ctx'> it's a Per-CPU variable.</div><div class='ctx'> Default: 64</div><div class='ctx'> </div><div class='add'>+dev_weight_rx_bias</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+RPS (e.g. RFS, aRFS) processing is competing with the registered NAPI poll function</div><div class='add'>+of the driver for the per softirq cycle netdev_budget. This parameter influences</div><div class='add'>+the proportion of the configured netdev_budget that is spent on RPS based packet</div><div class='add'>+processing during RX softirq cycles. It is further meant for making current</div><div class='add'>+dev_weight adaptable for asymmetric CPU needs on RX/TX side of the network stack.</div><div class='add'>+(see dev_weight_tx_bias) It is effective on a per CPU basis. Determination is based</div><div class='add'>+on dev_weight and is calculated multiplicative (dev_weight * dev_weight_rx_bias).</div><div class='add'>+Default: 1</div><div class='add'>+</div><div class='add'>+dev_weight_tx_bias</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Scales the maximum number of packets that can be processed during a TX softirq cycle.</div><div class='add'>+Effective on a per CPU basis. Allows scaling of current dev_weight for asymmetric</div><div class='add'>+net stack processing needs. Be careful to avoid making TX softirq processing a CPU hog.</div><div class='add'>+Calculation is based on dev_weight (dev_weight * dev_weight_tx_bias).</div><div class='add'>+Default: 1</div><div class='add'>+</div><div class='ctx'> default_qdisc</div><div class='ctx'> --------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt<br/>index 95ccbe6d79ce..b4ad97f10b8e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/sysctl/vm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sysctl/vm.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/sysctl/vm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/sysctl/vm.txt</a></div><div class='hunk'>@@ -376,8 +376,8 @@ max_map_count:</div><div class='ctx'> </div><div class='ctx'> This file contains the maximum number of memory map areas a process</div><div class='ctx'> may have. Memory map areas are used as a side-effect of calling</div><div class='del'>-malloc, directly by mmap and mprotect, and also when loading shared</div><div class='del'>-libraries.</div><div class='add'>+malloc, directly by mmap, mprotect, and madvise, and also when loading</div><div class='add'>+shared libraries.</div><div class='ctx'> </div><div class='ctx'> While most applications need less than a thousand maps, certain</div><div class='ctx'> programs, particularly malloc debuggers, may consume lots of them,</div><div class='head'>diff --git a/Documentation/sysfs-rules.txt b/Documentation/sysfs-rules.txt<br/>deleted file mode 100644<br/>index ce60ffa94d2d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sysfs-rules.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sysfs-rules.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,184 +0,0 @@</div><div class='del'>-Rules on how to access information in the Linux kernel sysfs</div><div class='del'>-</div><div class='del'>-The kernel-exported sysfs exports internal kernel implementation details</div><div class='del'>-and depends on internal kernel structures and layout. It is agreed upon</div><div class='del'>-by the kernel developers that the Linux kernel does not provide a stable</div><div class='del'>-internal API. Therefore, there are aspects of the sysfs interface that</div><div class='del'>-may not be stable across kernel releases.</div><div class='del'>-</div><div class='del'>-To minimize the risk of breaking users of sysfs, which are in most cases</div><div class='del'>-low-level userspace applications, with a new kernel release, the users</div><div class='del'>-of sysfs must follow some rules to use an as-abstract-as-possible way to</div><div class='del'>-access this filesystem. The current udev and HAL programs already</div><div class='del'>-implement this and users are encouraged to plug, if possible, into the</div><div class='del'>-abstractions these programs provide instead of accessing sysfs directly.</div><div class='del'>-</div><div class='del'>-But if you really do want or need to access sysfs directly, please follow</div><div class='del'>-the following rules and then your programs should work with future</div><div class='del'>-versions of the sysfs interface.</div><div class='del'>-</div><div class='del'>-- Do not use libsysfs</div><div class='del'>-  It makes assumptions about sysfs which are not true. Its API does not</div><div class='del'>-  offer any abstraction, it exposes all the kernel driver-core</div><div class='del'>-  implementation details in its own API. Therefore it is not better than</div><div class='del'>-  reading directories and opening the files yourself.</div><div class='del'>-  Also, it is not actively maintained, in the sense of reflecting the</div><div class='del'>-  current kernel development. The goal of providing a stable interface</div><div class='del'>-  to sysfs has failed; it causes more problems than it solves. It</div><div class='del'>-  violates many of the rules in this document.</div><div class='del'>-</div><div class='del'>-- sysfs is always at /sys</div><div class='del'>-  Parsing /proc/mounts is a waste of time. Other mount points are a</div><div class='del'>-  system configuration bug you should not try to solve. For test cases,</div><div class='del'>-  possibly support a SYSFS_PATH environment variable to overwrite the</div><div class='del'>-  application's behavior, but never try to search for sysfs. Never try</div><div class='del'>-  to mount it, if you are not an early boot script.</div><div class='del'>-</div><div class='del'>-- devices are only "devices"</div><div class='del'>-  There is no such thing like class-, bus-, physical devices,</div><div class='del'>-  interfaces, and such that you can rely on in userspace. Everything is</div><div class='del'>-  just simply a "device". Class-, bus-, physical, ... types are just</div><div class='del'>-  kernel implementation details which should not be expected by</div><div class='del'>-  applications that look for devices in sysfs.</div><div class='del'>-</div><div class='del'>-  The properties of a device are:</div><div class='del'>-    o devpath (/devices/pci0000:00/0000:00:1d.1/usb2/2-2/2-2:1.0)</div><div class='del'>-      - identical to the DEVPATH value in the event sent from the kernel</div><div class='del'>-        at device creation and removal</div><div class='del'>-      - the unique key to the device at that point in time</div><div class='del'>-      - the kernel's path to the device directory without the leading</div><div class='del'>-        /sys, and always starting with a slash</div><div class='del'>-      - all elements of a devpath must be real directories. Symlinks</div><div class='del'>-        pointing to /sys/devices must always be resolved to their real</div><div class='del'>-        target and the target path must be used to access the device.</div><div class='del'>-        That way the devpath to the device matches the devpath of the</div><div class='del'>-        kernel used at event time.</div><div class='del'>-      - using or exposing symlink values as elements in a devpath string</div><div class='del'>-        is a bug in the application</div><div class='del'>-</div><div class='del'>-    o kernel name (sda, tty, 0000:00:1f.2, ...)</div><div class='del'>-      - a directory name, identical to the last element of the devpath</div><div class='del'>-      - applications need to handle spaces and characters like '!' in</div><div class='del'>-        the name</div><div class='del'>-</div><div class='del'>-    o subsystem (block, tty, pci, ...)</div><div class='del'>-      - simple string, never a path or a link</div><div class='del'>-      - retrieved by reading the "subsystem"-link and using only the</div><div class='del'>-        last element of the target path</div><div class='del'>-</div><div class='del'>-    o driver (tg3, ata_piix, uhci_hcd)</div><div class='del'>-      - a simple string, which may contain spaces, never a path or a</div><div class='del'>-        link</div><div class='del'>-      - it is retrieved by reading the "driver"-link and using only the</div><div class='del'>-        last element of the target path</div><div class='del'>-      - devices which do not have "driver"-link just do not have a</div><div class='del'>-        driver; copying the driver value in a child device context is a</div><div class='del'>-        bug in the application</div><div class='del'>-</div><div class='del'>-    o attributes</div><div class='del'>-      - the files in the device directory or files below subdirectories</div><div class='del'>-        of the same device directory</div><div class='del'>-      - accessing attributes reached by a symlink pointing to another device,</div><div class='del'>-        like the "device"-link, is a bug in the application</div><div class='del'>-</div><div class='del'>-  Everything else is just a kernel driver-core implementation detail</div><div class='del'>-  that should not be assumed to be stable across kernel releases.</div><div class='del'>-</div><div class='del'>-- Properties of parent devices never belong into a child device.</div><div class='del'>-  Always look at the parent devices themselves for determining device</div><div class='del'>-  context properties. If the device 'eth0' or 'sda' does not have a</div><div class='del'>-  "driver"-link, then this device does not have a driver. Its value is empty.</div><div class='del'>-  Never copy any property of the parent-device into a child-device. Parent</div><div class='del'>-  device properties may change dynamically without any notice to the</div><div class='del'>-  child device.</div><div class='del'>-</div><div class='del'>-- Hierarchy in a single device tree</div><div class='del'>-  There is only one valid place in sysfs where hierarchy can be examined</div><div class='del'>-  and this is below: /sys/devices.</div><div class='del'>-  It is planned that all device directories will end up in the tree</div><div class='del'>-  below this directory.</div><div class='del'>-</div><div class='del'>-- Classification by subsystem</div><div class='del'>-  There are currently three places for classification of devices:</div><div class='del'>-  /sys/block, /sys/class and /sys/bus. It is planned that these will</div><div class='del'>-  not contain any device directories themselves, but only flat lists of</div><div class='del'>-  symlinks pointing to the unified /sys/devices tree.</div><div class='del'>-  All three places have completely different rules on how to access</div><div class='del'>-  device information. It is planned to merge all three</div><div class='del'>-  classification directories into one place at /sys/subsystem,</div><div class='del'>-  following the layout of the bus directories. All buses and</div><div class='del'>-  classes, including the converted block subsystem, will show up</div><div class='del'>-  there.</div><div class='del'>-  The devices belonging to a subsystem will create a symlink in the</div><div class='del'>-  "devices" directory at /sys/subsystem/&lt;name&gt;/devices.</div><div class='del'>-</div><div class='del'>-  If /sys/subsystem exists, /sys/bus, /sys/class and /sys/block can be</div><div class='del'>-  ignored. If it does not exist, you always have to scan all three</div><div class='del'>-  places, as the kernel is free to move a subsystem from one place to</div><div class='del'>-  the other, as long as the devices are still reachable by the same</div><div class='del'>-  subsystem name.</div><div class='del'>-</div><div class='del'>-  Assuming /sys/class/&lt;subsystem&gt; and /sys/bus/&lt;subsystem&gt;, or</div><div class='del'>-  /sys/block and /sys/class/block are not interchangeable is a bug in</div><div class='del'>-  the application.</div><div class='del'>-</div><div class='del'>-- Block</div><div class='del'>-  The converted block subsystem at /sys/class/block or</div><div class='del'>-  /sys/subsystem/block will contain the links for disks and partitions</div><div class='del'>-  at the same level, never in a hierarchy. Assuming the block subsystem to</div><div class='del'>-  contain only disks and not partition devices in the same flat list is</div><div class='del'>-  a bug in the application.</div><div class='del'>-</div><div class='del'>-- "device"-link and &lt;subsystem&gt;:&lt;kernel name&gt;-links</div><div class='del'>-  Never depend on the "device"-link. The "device"-link is a workaround</div><div class='del'>-  for the old layout, where class devices are not created in</div><div class='del'>-  /sys/devices/ like the bus devices. If the link-resolving of a</div><div class='del'>-  device directory does not end in /sys/devices/, you can use the</div><div class='del'>-  "device"-link to find the parent devices in /sys/devices/. That is the</div><div class='del'>-  single valid use of the "device"-link; it must never appear in any</div><div class='del'>-  path as an element. Assuming the existence of the "device"-link for</div><div class='del'>-  a device in /sys/devices/ is a bug in the application.</div><div class='del'>-  Accessing /sys/class/net/eth0/device is a bug in the application.</div><div class='del'>-</div><div class='del'>-  Never depend on the class-specific links back to the /sys/class</div><div class='del'>-  directory.  These links are also a workaround for the design mistake</div><div class='del'>-  that class devices are not created in /sys/devices. If a device</div><div class='del'>-  directory does not contain directories for child devices, these links</div><div class='del'>-  may be used to find the child devices in /sys/class. That is the single</div><div class='del'>-  valid use of these links; they must never appear in any path as an</div><div class='del'>-  element. Assuming the existence of these links for devices which are</div><div class='del'>-  real child device directories in the /sys/devices tree is a bug in</div><div class='del'>-  the application.</div><div class='del'>-</div><div class='del'>-  It is planned to remove all these links when all class device</div><div class='del'>-  directories live in /sys/devices.</div><div class='del'>-</div><div class='del'>-- Position of devices along device chain can change.</div><div class='del'>-  Never depend on a specific parent device position in the devpath,</div><div class='del'>-  or the chain of parent devices. The kernel is free to insert devices into</div><div class='del'>-  the chain. You must always request the parent device you are looking for</div><div class='del'>-  by its subsystem value. You need to walk up the chain until you find</div><div class='del'>-  the device that matches the expected subsystem. Depending on a specific</div><div class='del'>-  position of a parent device or exposing relative paths using "../" to</div><div class='del'>-  access the chain of parents is a bug in the application.</div><div class='del'>-</div><div class='del'>-- When reading and writing sysfs device attribute files, avoid dependency</div><div class='del'>-  on specific error codes wherever possible. This minimizes coupling to</div><div class='del'>-  the error handling implementation within the kernel.</div><div class='del'>-</div><div class='del'>-  In general, failures to read or write sysfs device attributes shall</div><div class='del'>-  propagate errors wherever possible. Common errors include, but are not</div><div class='del'>-  limited to:</div><div class='del'>-</div><div class='del'>-  -EIO: The read or store operation is not supported, typically returned by</div><div class='del'>-        the sysfs system itself if the read or store pointer is NULL.</div><div class='del'>-</div><div class='del'>-  -ENXIO: The read or store operation failed</div><div class='del'>-</div><div class='del'>-  Error codes will not be changed without good reason, and should a change</div><div class='del'>-  to error codes result in user-space breakage, it will be fixed, or the</div><div class='del'>-  the offending change will be reverted.</div><div class='del'>-</div><div class='del'>-  Userspace applications can, however, expect the format and contents of</div><div class='del'>-  the attribute files to remain consistent in the absence of a version</div><div class='del'>-  attribute change in the context of a given attribute.</div><div class='head'>diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt<br/>deleted file mode 100644<br/>index 3a3b30ac2a75..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/sysrq.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/sysrq.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,257 +0,0 @@</div><div class='del'>-Linux Magic System Request Key Hacks</div><div class='del'>-Documentation for sysrq.c</div><div class='del'>-</div><div class='del'>-*  What is the magic SysRq key?</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-It is a 'magical' key combo you can hit which the kernel will respond to</div><div class='del'>-regardless of whatever else it is doing, unless it is completely locked up.</div><div class='del'>-</div><div class='del'>-*  How do I enable the magic SysRq key?</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-You need to say "yes" to 'Magic SysRq key (CONFIG_MAGIC_SYSRQ)' when</div><div class='del'>-configuring the kernel. When running a kernel with SysRq compiled in,</div><div class='del'>-/proc/sys/kernel/sysrq controls the functions allowed to be invoked via</div><div class='del'>-the SysRq key. The default value in this file is set by the</div><div class='del'>-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE config symbol, which itself defaults</div><div class='del'>-to 1. Here is the list of possible values in /proc/sys/kernel/sysrq:</div><div class='del'>-   0 - disable sysrq completely</div><div class='del'>-   1 - enable all functions of sysrq</div><div class='del'>-  &gt;1 - bitmask of allowed sysrq functions (see below for detailed function</div><div class='del'>-       description):</div><div class='del'>-          2 =   0x2 - enable control of console logging level</div><div class='del'>-          4 =   0x4 - enable control of keyboard (SAK, unraw)</div><div class='del'>-          8 =   0x8 - enable debugging dumps of processes etc.</div><div class='del'>-         16 =  0x10 - enable sync command</div><div class='del'>-         32 =  0x20 - enable remount read-only</div><div class='del'>-         64 =  0x40 - enable signalling of processes (term, kill, oom-kill)</div><div class='del'>-        128 =  0x80 - allow reboot/poweroff</div><div class='del'>-        256 = 0x100 - allow nicing of all RT tasks</div><div class='del'>-</div><div class='del'>-You can set the value in the file by the following command:</div><div class='del'>-    echo "number" &gt;/proc/sys/kernel/sysrq</div><div class='del'>-</div><div class='del'>-The number may be written here either as decimal or as hexadecimal</div><div class='del'>-with the 0x prefix. CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE must always be</div><div class='del'>-written in hexadecimal.</div><div class='del'>-</div><div class='del'>-Note that the value of /proc/sys/kernel/sysrq influences only the invocation</div><div class='del'>-via a keyboard. Invocation of any operation via /proc/sysrq-trigger is always</div><div class='del'>-allowed (by a user with admin privileges).</div><div class='del'>-</div><div class='del'>-*  How do I use the magic SysRq key?</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-On x86   - You press the key combo 'ALT-SysRq-&lt;command key&gt;'. Note - Some</div><div class='del'>-           keyboards may not have a key labeled 'SysRq'. The 'SysRq' key is</div><div class='del'>-           also known as the 'Print Screen' key. Also some keyboards cannot</div><div class='del'>-	   handle so many keys being pressed at the same time, so you might</div><div class='del'>-	   have better luck with "press Alt", "press SysRq", "release SysRq",</div><div class='del'>-	   "press &lt;command key&gt;", release everything.</div><div class='del'>-</div><div class='del'>-On SPARC - You press 'ALT-STOP-&lt;command key&gt;', I believe.</div><div class='del'>-</div><div class='del'>-On the serial console (PC style standard serial ports only) -</div><div class='del'>-           You send a BREAK, then within 5 seconds a command key. Sending</div><div class='del'>-           BREAK twice is interpreted as a normal BREAK.</div><div class='del'>-</div><div class='del'>-On PowerPC - Press 'ALT - Print Screen (or F13) - &lt;command key&gt;,  </div><div class='del'>-             Print Screen (or F13) - &lt;command key&gt; may suffice.</div><div class='del'>-</div><div class='del'>-On other - If you know of the key combos for other architectures, please</div><div class='del'>-           let me know so I can add them to this section.</div><div class='del'>-</div><div class='del'>-On all -  write a character to /proc/sysrq-trigger.  e.g.:</div><div class='del'>-</div><div class='del'>-		echo t &gt; /proc/sysrq-trigger</div><div class='del'>-</div><div class='del'>-*  What are the 'command' keys?</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-'b'     - Will immediately reboot the system without syncing or unmounting</div><div class='del'>-          your disks.</div><div class='del'>-</div><div class='del'>-'c'	- Will perform a system crash by a NULL pointer dereference.</div><div class='del'>-          A crashdump will be taken if configured.</div><div class='del'>-</div><div class='del'>-'d'	- Shows all locks that are held.</div><div class='del'>-</div><div class='del'>-'e'     - Send a SIGTERM to all processes, except for init.</div><div class='del'>-</div><div class='del'>-'f'	- Will call the oom killer to kill a memory hog process, but do not</div><div class='del'>-	  panic if nothing can be killed.</div><div class='del'>-</div><div class='del'>-'g'	- Used by kgdb (kernel debugger)</div><div class='del'>-</div><div class='del'>-'h'     - Will display help (actually any other key than those listed</div><div class='del'>-          here will display help. but 'h' is easy to remember :-)</div><div class='del'>-</div><div class='del'>-'i'     - Send a SIGKILL to all processes, except for init.</div><div class='del'>-</div><div class='del'>-'j'     - Forcibly "Just thaw it" - filesystems frozen by the FIFREEZE ioctl.</div><div class='del'>-</div><div class='del'>-'k'     - Secure Access Key (SAK) Kills all programs on the current virtual</div><div class='del'>-          console. NOTE: See important comments below in SAK section.</div><div class='del'>-</div><div class='del'>-'l'     - Shows a stack backtrace for all active CPUs.</div><div class='del'>-</div><div class='del'>-'m'     - Will dump current memory info to your console.</div><div class='del'>-</div><div class='del'>-'n'	- Used to make RT tasks nice-able</div><div class='del'>-</div><div class='del'>-'o'     - Will shut your system off (if configured and supported).</div><div class='del'>-</div><div class='del'>-'p'     - Will dump the current registers and flags to your console.</div><div class='del'>-</div><div class='del'>-'q'     - Will dump per CPU lists of all armed hrtimers (but NOT regular</div><div class='del'>-          timer_list timers) and detailed information about all</div><div class='del'>-          clockevent devices.</div><div class='del'>-</div><div class='del'>-'r'     - Turns off keyboard raw mode and sets it to XLATE.</div><div class='del'>-</div><div class='del'>-'s'     - Will attempt to sync all mounted filesystems.</div><div class='del'>-</div><div class='del'>-'t'     - Will dump a list of current tasks and their information to your</div><div class='del'>-          console.</div><div class='del'>-</div><div class='del'>-'u'     - Will attempt to remount all mounted filesystems read-only.</div><div class='del'>-</div><div class='del'>-'v'	- Forcefully restores framebuffer console</div><div class='del'>-'v'	- Causes ETM buffer dump [ARM-specific]</div><div class='del'>-</div><div class='del'>-'w'	- Dumps tasks that are in uninterruptable (blocked) state.</div><div class='del'>-</div><div class='del'>-'x'	- Used by xmon interface on ppc/powerpc platforms.</div><div class='del'>-          Show global PMU Registers on sparc64.</div><div class='del'>-          Dump all TLB entries on MIPS.</div><div class='del'>-</div><div class='del'>-'y'	- Show global CPU Registers [SPARC-64 specific]</div><div class='del'>-</div><div class='del'>-'z'	- Dump the ftrace buffer</div><div class='del'>-</div><div class='del'>-'0'-'9' - Sets the console log level, controlling which kernel messages</div><div class='del'>-          will be printed to your console. ('0', for example would make</div><div class='del'>-          it so that only emergency messages like PANICs or OOPSes would</div><div class='del'>-          make it to your console.)</div><div class='del'>-</div><div class='del'>-*  Okay, so what can I use them for?</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-Well, unraw(r) is very handy when your X server or a svgalib program crashes.</div><div class='del'>-</div><div class='del'>-sak(k) (Secure Access Key) is useful when you want to be sure there is no</div><div class='del'>-trojan program running at console which could grab your password</div><div class='del'>-when you would try to login. It will kill all programs on given console,</div><div class='del'>-thus letting you make sure that the login prompt you see is actually</div><div class='del'>-the one from init, not some trojan program.</div><div class='del'>-IMPORTANT: In its true form it is not a true SAK like the one in a :IMPORTANT</div><div class='del'>-IMPORTANT: c2 compliant system, and it should not be mistaken as   :IMPORTANT</div><div class='del'>-IMPORTANT: such.                                                   :IMPORTANT</div><div class='del'>-       It seems others find it useful as (System Attention Key) which is</div><div class='del'>-useful when you want to exit a program that will not let you switch consoles.</div><div class='del'>-(For example, X or a svgalib program.)</div><div class='del'>-</div><div class='del'>-reboot(b) is good when you're unable to shut down. But you should also</div><div class='del'>-sync(s) and umount(u) first.</div><div class='del'>-</div><div class='del'>-crash(c) can be used to manually trigger a crashdump when the system is hung.</div><div class='del'>-Note that this just triggers a crash if there is no dump mechanism available.</div><div class='del'>-</div><div class='del'>-sync(s) is great when your system is locked up, it allows you to sync your</div><div class='del'>-disks and will certainly lessen the chance of data loss and fscking. Note</div><div class='del'>-that the sync hasn't taken place until you see the "OK" and "Done" appear</div><div class='del'>-on the screen. (If the kernel is really in strife, you may not ever get the</div><div class='del'>-OK or Done message...)</div><div class='del'>-</div><div class='del'>-umount(u) is basically useful in the same ways as sync(s). I generally sync(s),</div><div class='del'>-umount(u), then reboot(b) when my system locks. It's saved me many a fsck.</div><div class='del'>-Again, the unmount (remount read-only) hasn't taken place until you see the</div><div class='del'>-"OK" and "Done" message appear on the screen.</div><div class='del'>-</div><div class='del'>-The loglevels '0'-'9' are useful when your console is being flooded with</div><div class='del'>-kernel messages you do not want to see. Selecting '0' will prevent all but</div><div class='del'>-the most urgent kernel messages from reaching your console. (They will</div><div class='del'>-still be logged if syslogd/klogd are alive, though.)</div><div class='del'>-</div><div class='del'>-term(e) and kill(i) are useful if you have some sort of runaway process you</div><div class='del'>-are unable to kill any other way, especially if it's spawning other</div><div class='del'>-processes.</div><div class='del'>-</div><div class='del'>-"just thaw it(j)" is useful if your system becomes unresponsive due to a frozen</div><div class='del'>-(probably root) filesystem via the FIFREEZE ioctl.</div><div class='del'>-</div><div class='del'>-*  Sometimes SysRq seems to get 'stuck' after using it, what can I do?</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-That happens to me, also. I've found that tapping shift, alt, and control</div><div class='del'>-on both sides of the keyboard, and hitting an invalid sysrq sequence again</div><div class='del'>-will fix the problem. (i.e., something like alt-sysrq-z). Switching to another</div><div class='del'>-virtual console (ALT+Fn) and then back again should also help.</div><div class='del'>-</div><div class='del'>-*  I hit SysRq, but nothing seems to happen, what's wrong?</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-There are some keyboards that produce a different keycode for SysRq than the</div><div class='del'>-pre-defined value of 99 (see KEY_SYSRQ in include/linux/input.h), or which</div><div class='del'>-don't have a SysRq key at all. In these cases, run 'showkey -s' to find an</div><div class='del'>-appropriate scancode sequence, and use 'setkeycodes &lt;sequence&gt; 99' to map</div><div class='del'>-this sequence to the usual SysRq code (e.g., 'setkeycodes e05b 99'). It's</div><div class='del'>-probably best to put this command in a boot script. Oh, and by the way, you</div><div class='del'>-exit 'showkey' by not typing anything for ten seconds.</div><div class='del'>-</div><div class='del'>-*  I want to add SysRQ key events to a module, how does it work?</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-In order to register a basic function with the table, you must first include</div><div class='del'>-the header 'include/linux/sysrq.h', this will define everything else you need.</div><div class='del'>-Next, you must create a sysrq_key_op struct, and populate it with A) the key</div><div class='del'>-handler function you will use, B) a help_msg string, that will print when SysRQ</div><div class='del'>-prints help, and C) an action_msg string, that will print right before your</div><div class='del'>-handler is called. Your handler must conform to the prototype in 'sysrq.h'.</div><div class='del'>-</div><div class='del'>-After the sysrq_key_op is created, you can call the kernel function</div><div class='del'>-register_sysrq_key(int key, struct sysrq_key_op *op_p); this will</div><div class='del'>-register the operation pointed to by 'op_p' at table key 'key',</div><div class='del'>-if that slot in the table is blank. At module unload time, you must call</div><div class='del'>-the function unregister_sysrq_key(int key, struct sysrq_key_op *op_p), which</div><div class='del'>-will remove the key op pointed to by 'op_p' from the key 'key', if and only if</div><div class='del'>-it is currently registered in that slot. This is in case the slot has been</div><div class='del'>-overwritten since you registered it.</div><div class='del'>-</div><div class='del'>-The Magic SysRQ system works by registering key operations against a key op</div><div class='del'>-lookup table, which is defined in 'drivers/tty/sysrq.c'. This key table has</div><div class='del'>-a number of operations registered into it at compile time, but is mutable,</div><div class='del'>-and 2 functions are exported for interface to it:</div><div class='del'>-	register_sysrq_key and unregister_sysrq_key.</div><div class='del'>-Of course, never ever leave an invalid pointer in the table. I.e., when</div><div class='del'>-your module that called register_sysrq_key() exits, it must call</div><div class='del'>-unregister_sysrq_key() to clean up the sysrq key table entry that it used.</div><div class='del'>-Null pointers in the table are always safe. :)</div><div class='del'>-</div><div class='del'>-If for some reason you feel the need to call the handle_sysrq function from</div><div class='del'>-within a function called by handle_sysrq, you must be aware that you are in</div><div class='del'>-a lock (you are also in an interrupt handler, which means don't sleep!), so</div><div class='del'>-you must call __handle_sysrq_nolock instead.</div><div class='del'>-</div><div class='del'>-*  When I hit a SysRq key combination only the header appears on the console?</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-Sysrq output is subject to the same console loglevel control as all</div><div class='del'>-other console output.  This means that if the kernel was booted 'quiet'</div><div class='del'>-as is common on distro kernels the output may not appear on the actual</div><div class='del'>-console, even though it will appear in the dmesg buffer, and be accessible</div><div class='del'>-via the dmesg command and to the consumers of /proc/kmsg.  As a specific</div><div class='del'>-exception the header line from the sysrq command is passed to all console</div><div class='del'>-consumers as if the current loglevel was maximum.  If only the header</div><div class='del'>-is emitted it is almost certain that the kernel loglevel is too low.</div><div class='del'>-Should you require the output on the console channel then you will need</div><div class='del'>-to temporarily up the console loglevel using alt-sysrq-8 or:</div><div class='del'>-</div><div class='del'>-    echo 8 &gt; /proc/sysrq-trigger</div><div class='del'>-</div><div class='del'>-Remember to return the loglevel to normal after triggering the sysrq</div><div class='del'>-command you are interested in.</div><div class='del'>-</div><div class='del'>-*  I have more questions, who can I ask?</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-Just ask them on the linux-kernel mailing list:</div><div class='del'>-	linux-kernel@vger.kernel.org</div><div class='del'>-</div><div class='del'>-*  Credits</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='del'>-Written by Mydraal &lt;vulpyne@vulpyne.net&gt;</div><div class='del'>-Updated by Adam Sulmicki &lt;adam@cfar.umd.edu&gt;</div><div class='del'>-Updated by Jeremy M. Dolan &lt;jmd@turbogeek.org&gt; 2001/01/28 10:15:59</div><div class='del'>-Added to by Crutcher Dunnavant &lt;crutcher+kernel@datastacks.com&gt;</div><div class='head'>diff --git a/Documentation/thermal/nouveau_thermal b/Documentation/thermal/nouveau_thermal<br/>index 60bc29357ac3..6e17a11efcb0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/thermal/nouveau_thermal?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/thermal/nouveau_thermal</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/thermal/nouveau_thermal?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/thermal/nouveau_thermal</a></div><div class='hunk'>@@ -42,7 +42,7 @@ thresholds can be configured thanks to the following HWMON attributes:</div><div class='ctx'>  * Critical: temp1_crit and temp1_crit_hyst;</div><div class='ctx'>  * Shutdown: temp1_emergency and temp1_emergency_hyst.</div><div class='ctx'> </div><div class='del'>-NOTE: Remember that the values are stored as milli degrees Celcius. Don't forget</div><div class='add'>+NOTE: Remember that the values are stored as milli degrees Celsius. Don't forget</div><div class='ctx'> to multiply!</div><div class='ctx'> </div><div class='ctx'> Fan management</div><div class='head'>diff --git a/Documentation/timers/timer_stats.txt b/Documentation/timers/timer_stats.txt<br/>deleted file mode 100644<br/>index de835ee97455..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/timers/timer_stats.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/timers/timer_stats.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-timer_stats - timer usage statistics</div><div class='del'>-------------------------------------</div><div class='del'>-</div><div class='del'>-timer_stats is a debugging facility to make the timer (ab)usage in a Linux</div><div class='del'>-system visible to kernel and userspace developers. If enabled in the config</div><div class='del'>-but not used it has almost zero runtime overhead, and a relatively small</div><div class='del'>-data structure overhead. Even if collection is enabled runtime all the</div><div class='del'>-locking is per-CPU and lookup is hashed.</div><div class='del'>-</div><div class='del'>-timer_stats should be used by kernel and userspace developers to verify that</div><div class='del'>-their code does not make unduly use of timers. This helps to avoid unnecessary</div><div class='del'>-wakeups, which should be avoided to optimize power consumption.</div><div class='del'>-</div><div class='del'>-It can be enabled by CONFIG_TIMER_STATS in the "Kernel hacking" configuration</div><div class='del'>-section.</div><div class='del'>-</div><div class='del'>-timer_stats collects information about the timer events which are fired in a</div><div class='del'>-Linux system over a sample period:</div><div class='del'>-</div><div class='del'>-- the pid of the task(process) which initialized the timer</div><div class='del'>-- the name of the process which initialized the timer</div><div class='del'>-- the function where the timer was initialized</div><div class='del'>-- the callback function which is associated to the timer</div><div class='del'>-- the number of events (callbacks)</div><div class='del'>-</div><div class='del'>-timer_stats adds an entry to /proc: /proc/timer_stats</div><div class='del'>-</div><div class='del'>-This entry is used to control the statistics functionality and to read out the</div><div class='del'>-sampled information.</div><div class='del'>-</div><div class='del'>-The timer_stats functionality is inactive on bootup.</div><div class='del'>-</div><div class='del'>-To activate a sample period issue:</div><div class='del'>-# echo 1 &gt;/proc/timer_stats</div><div class='del'>-</div><div class='del'>-To stop a sample period issue:</div><div class='del'>-# echo 0 &gt;/proc/timer_stats</div><div class='del'>-</div><div class='del'>-The statistics can be retrieved by:</div><div class='del'>-# cat /proc/timer_stats</div><div class='del'>-</div><div class='del'>-While sampling is enabled, each readout from /proc/timer_stats will see</div><div class='del'>-newly updated statistics. Once sampling is disabled, the sampled information</div><div class='del'>-is kept until a new sample period is started. This allows multiple readouts.</div><div class='del'>-</div><div class='del'>-Sample output of /proc/timer_stats:</div><div class='del'>-</div><div class='del'>-Timerstats sample period: 3.888770 s</div><div class='del'>-  12,     0 swapper          hrtimer_stop_sched_tick (hrtimer_sched_tick)</div><div class='del'>-  15,     1 swapper          hcd_submit_urb (rh_timer_func)</div><div class='del'>-   4,   959 kedac            schedule_timeout (process_timeout)</div><div class='del'>-   1,     0 swapper          page_writeback_init (wb_timer_fn)</div><div class='del'>-  28,     0 swapper          hrtimer_stop_sched_tick (hrtimer_sched_tick)</div><div class='del'>-  22,  2948 IRQ 4            tty_flip_buffer_push (delayed_work_timer_fn)</div><div class='del'>-   3,  3100 bash             schedule_timeout (process_timeout)</div><div class='del'>-   1,     1 swapper          queue_delayed_work_on (delayed_work_timer_fn)</div><div class='del'>-   1,     1 swapper          queue_delayed_work_on (delayed_work_timer_fn)</div><div class='del'>-   1,     1 swapper          neigh_table_init_no_netlink (neigh_periodic_timer)</div><div class='del'>-   1,  2292 ip               __netdev_watchdog_up (dev_watchdog)</div><div class='del'>-   1,    23 events/1         do_cache_clean (delayed_work_timer_fn)</div><div class='del'>-90 total events, 30.0 events/sec</div><div class='del'>-</div><div class='del'>-The first column is the number of events, the second column the pid, the third</div><div class='del'>-column is the name of the process. The forth column shows the function which</div><div class='del'>-initialized the timer and in parenthesis the callback function which was</div><div class='del'>-executed on expiry.</div><div class='del'>-</div><div class='del'>-    Thomas, Ingo</div><div class='del'>-</div><div class='del'>-Added flag to indicate 'deferrable timer' in /proc/timer_stats. A deferrable</div><div class='del'>-timer will appear as follows</div><div class='del'>-  10D,     1 swapper          queue_delayed_work_on (delayed_work_timer_fn)</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/tpm/tpm_vtpm_proxy.txt b/Documentation/tpm/tpm_vtpm_proxy.txt<br/>deleted file mode 100644<br/>index 30d19022f869..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/tpm/tpm_vtpm_proxy.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/tpm/tpm_vtpm_proxy.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,71 +0,0 @@</div><div class='del'>-Virtual TPM Proxy Driver for Linux Containers</div><div class='del'>-</div><div class='del'>-Authors: Stefan Berger (IBM)</div><div class='del'>-</div><div class='del'>-This document describes the virtual Trusted Platform Module (vTPM)</div><div class='del'>-proxy device driver for Linux containers.</div><div class='del'>-</div><div class='del'>-INTRODUCTION</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-The goal of this work is to provide TPM functionality to each Linux</div><div class='del'>-container. This allows programs to interact with a TPM in a container</div><div class='del'>-the same way they interact with a TPM on the physical system. Each</div><div class='del'>-container gets its own unique, emulated, software TPM.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-DESIGN</div><div class='del'>-------</div><div class='del'>-</div><div class='del'>-To make an emulated software TPM available to each container, the container</div><div class='del'>-management stack needs to create a device pair consisting of a client TPM</div><div class='del'>-character device /dev/tpmX (with X=0,1,2...) and a 'server side' file</div><div class='del'>-descriptor. The former is moved into the container by creating a character</div><div class='del'>-device with the appropriate major and minor numbers while the file descriptor</div><div class='del'>-is passed to the TPM emulator. Software inside the container can then send</div><div class='del'>-TPM commands using the character device and the emulator will receive the</div><div class='del'>-commands via the file descriptor and use it for sending back responses.</div><div class='del'>-</div><div class='del'>-To support this, the virtual TPM proxy driver provides a device /dev/vtpmx</div><div class='del'>-that is used to create device pairs using an ioctl. The ioctl takes as</div><div class='del'>-an input flags for configuring the device. The flags  for example indicate</div><div class='del'>-whether TPM 1.2 or TPM 2 functionality is supported by the TPM emulator.</div><div class='del'>-The result of the ioctl are the file descriptor for the 'server side'</div><div class='del'>-as well as the major and minor numbers of the character device that was created.</div><div class='del'>-Besides that the number of the TPM character device is return. If for</div><div class='del'>-example /dev/tpm10 was created, the number (dev_num) 10 is returned.</div><div class='del'>-</div><div class='del'>-The following is the data structure of the TPM_PROXY_IOC_NEW_DEV ioctl:</div><div class='del'>-</div><div class='del'>-struct vtpm_proxy_new_dev {</div><div class='del'>-	__u32 flags;         /* input */</div><div class='del'>-	__u32 tpm_num;       /* output */</div><div class='del'>-	__u32 fd;            /* output */</div><div class='del'>-	__u32 major;         /* output */</div><div class='del'>-	__u32 minor;         /* output */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-Note that if unsupported flags are passed to the device driver, the ioctl will</div><div class='del'>-fail and errno will be set to EOPNOTSUPP. Similarly, if an unsupported ioctl is</div><div class='del'>-called on the device driver, the ioctl will fail and errno will be set to</div><div class='del'>-ENOTTY.</div><div class='del'>-</div><div class='del'>-See /usr/include/linux/vtpm_proxy.h for definitions related to the public interface</div><div class='del'>-of this vTPM device driver.</div><div class='del'>-</div><div class='del'>-Once the device has been created, the driver will immediately try to talk</div><div class='del'>-to the TPM. All commands from the driver can be read from the file descriptor</div><div class='del'>-returned by the ioctl. The commands should be responded to immediately.</div><div class='del'>-</div><div class='del'>-Depending on the version of TPM the following commands will be sent by the</div><div class='del'>-driver:</div><div class='del'>-</div><div class='del'>-- TPM 1.2:</div><div class='del'>-  - the driver will send a TPM_Startup command to the TPM emulator</div><div class='del'>-  - the driver will send commands to read the command durations and</div><div class='del'>-    interface timeouts from the TPM emulator</div><div class='del'>-- TPM 2:</div><div class='del'>-  - the driver will send a TPM2_Startup command to the TPM emulator</div><div class='del'>-</div><div class='del'>-The TPM device /dev/tpmX will only appear if all of the relevant commands</div><div class='del'>-were responded to properly.</div><div class='head'>diff --git a/Documentation/trace/events.txt b/Documentation/trace/events.txt<br/>index 08d74d75150d..2cc08d4a326e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/trace/events.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/trace/events.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/trace/events.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/events.txt</a></div><div class='hunk'>@@ -189,16 +189,13 @@ And for string fields they are:</div><div class='ctx'> </div><div class='ctx'> ==, !=, ~</div><div class='ctx'> </div><div class='del'>-The glob (~) only accepts a wild card character (*) at the start and or</div><div class='del'>-end of the string. For example:</div><div class='add'>+The glob (~) accepts a wild card character (*,?) and character classes</div><div class='add'>+([). For example:</div><div class='ctx'> </div><div class='ctx'>   prev_comm ~ "*sh"</div><div class='ctx'>   prev_comm ~ "sh*"</div><div class='ctx'>   prev_comm ~ "*sh*"</div><div class='del'>-</div><div class='del'>-But does not allow for it to be within the string:</div><div class='del'>-</div><div class='del'>-  prev_comm ~ "ba*sh"   &lt;-- is invalid</div><div class='add'>+  prev_comm ~ "ba*sh"</div><div class='ctx'> </div><div class='ctx'> 5.2 Setting filters</div><div class='ctx'> -------------------</div><div class='head'>diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt<br/>index 185c39fea2a0..006f47c7d913 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/trace/ftrace.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/trace/ftrace.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/trace/ftrace.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/ftrace.txt</a></div><div class='hunk'>@@ -362,6 +362,26 @@ of ftrace. Here is a list of some of the key files:</div><div class='ctx'> 		  to correlate events across hypervisor/guest if</div><div class='ctx'> 		  tb_offset is known.</div><div class='ctx'> </div><div class='add'>+	  mono: This uses the fast monotonic clock (CLOCK_MONOTONIC)</div><div class='add'>+		which is monotonic and is subject to NTP rate adjustments.</div><div class='add'>+</div><div class='add'>+	  mono_raw:</div><div class='add'>+		This is the raw monotonic clock (CLOCK_MONOTONIC_RAW)</div><div class='add'>+		which is montonic but is not subject to any rate adjustments</div><div class='add'>+		and ticks at the same rate as the hardware clocksource.</div><div class='add'>+</div><div class='add'>+	  boot: This is the boot clock (CLOCK_BOOTTIME) and is based on the</div><div class='add'>+		fast monotonic clock, but also accounts for time spent in</div><div class='add'>+		suspend. Since the clock access is designed for use in</div><div class='add'>+		tracing in the suspend path, some side effects are possible</div><div class='add'>+		if clock is accessed after the suspend time is accounted before</div><div class='add'>+		the fast mono clock is updated. In this case, the clock update</div><div class='add'>+		appears to happen slightly sooner than it normally would have.</div><div class='add'>+		Also on 32-bit systems, it's possible that the 64-bit boot offset</div><div class='add'>+		sees a partial update. These effects are rare and post</div><div class='add'>+		processing should be able to handle them. See comments in the</div><div class='add'>+		ktime_get_boot_fast_ns() function for more information.</div><div class='add'>+</div><div class='ctx'> 	To set a clock, simply echo the clock name into this file.</div><div class='ctx'> </div><div class='ctx'> 	  echo global &gt; trace_clock</div><div class='hunk'>@@ -396,6 +416,12 @@ of ftrace. Here is a list of some of the key files:</div><div class='ctx'> </div><div class='ctx'> 		trace_fd = open("trace_marker", WR_ONLY);</div><div class='ctx'> </div><div class='add'>+  trace_marker_raw:</div><div class='add'>+</div><div class='add'>+	This is similar to trace_marker above, but is meant for for binary data</div><div class='add'>+	to be written to it, where a tool can be used to parse the data</div><div class='add'>+	from trace_pipe_raw.</div><div class='add'>+</div><div class='ctx'>   uprobe_events:</div><div class='ctx'>  </div><div class='ctx'> 	Add dynamic tracepoints in programs.</div><div class='hunk'>@@ -2218,16 +2244,13 @@ hrtimer_interrupt</div><div class='ctx'> sys_nanosleep</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Perhaps this is not enough. The filters also allow simple wild</div><div class='del'>-cards. Only the following are currently available</div><div class='add'>+Perhaps this is not enough. The filters also allow glob(7) matching.</div><div class='ctx'> </div><div class='ctx'>   &lt;match&gt;*  - will match functions that begin with &lt;match&gt;</div><div class='ctx'>   *&lt;match&gt;  - will match functions that end with &lt;match&gt;</div><div class='ctx'>   *&lt;match&gt;* - will match functions that have &lt;match&gt; in it</div><div class='del'>-</div><div class='del'>-These are the only wild cards which are supported.</div><div class='del'>-</div><div class='del'>-  &lt;match&gt;*&lt;match&gt; will not work.</div><div class='add'>+  &lt;match1&gt;*&lt;match2&gt; - will match functions that begin with</div><div class='add'>+                      &lt;match1&gt; and end with &lt;match2&gt;</div><div class='ctx'> </div><div class='ctx'> Note: It is better to use quotes to enclose the wild cards,</div><div class='ctx'>       otherwise the shell may expand the parameters into names</div><div class='head'>diff --git a/Documentation/trace/intel_th.txt b/Documentation/trace/intel_th.txt<br/>index f7fc5ba5df8d..f92070e7dde0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/trace/intel_th.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/trace/intel_th.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/trace/intel_th.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/intel_th.txt</a></div><div class='hunk'>@@ -97,3 +97,25 @@ $ echo 0 &gt; /sys/bus/intel_th/devices/0-msc0/active</div><div class='ctx'> # and now you can collect the trace from the device node:</div><div class='ctx'> </div><div class='ctx'> $ cat /dev/intel_th0/msc0 &gt; my_stp_trace</div><div class='add'>+</div><div class='add'>+Host Debugger Mode</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+It is possible to configure the Trace Hub and control its trace</div><div class='add'>+capture from a remote debug host, which should be connected via one of</div><div class='add'>+the hardware debugging interfaces, which will then be used to both</div><div class='add'>+control Intel Trace Hub and transfer its trace data to the debug host.</div><div class='add'>+</div><div class='add'>+The driver needs to be told that such an arrangement is taking place</div><div class='add'>+so that it does not touch any capture/port configuration and avoids</div><div class='add'>+conflicting with the debug host's configuration accesses. The only</div><div class='add'>+activity that the driver will perform in this mode is collecting</div><div class='add'>+software traces to the Software Trace Hub (an stm class device). The</div><div class='add'>+user is still responsible for setting up adequate master/channel</div><div class='add'>+mappings that the decoder on the receiving end would recognize.</div><div class='add'>+</div><div class='add'>+In order to enable the host mode, set the 'host_mode' parameter of the</div><div class='add'>+'intel_th' kernel module to 'y'. None of the virtual output devices</div><div class='add'>+will show up on the intel_th bus. Also, trace configuration and</div><div class='add'>+capture controlling attribute groups of the 'gth' device will not be</div><div class='add'>+exposed. The 'sth' device will operate as usual.</div><div class='head'>diff --git a/Documentation/trace/postprocess/trace-vmscan-postprocess.pl b/Documentation/trace/postprocess/trace-vmscan-postprocess.pl<br/>index 8f961ef2b457..ba976805853a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/trace/postprocess/trace-vmscan-postprocess.pl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/trace/postprocess/trace-vmscan-postprocess.pl</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/trace/postprocess/trace-vmscan-postprocess.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/postprocess/trace-vmscan-postprocess.pl</a></div><div class='hunk'>@@ -112,8 +112,8 @@ my $regex_direct_end_default = 'nr_reclaimed=([0-9]*)';</div><div class='ctx'> my $regex_kswapd_wake_default = 'nid=([0-9]*) order=([0-9]*)';</div><div class='ctx'> my $regex_kswapd_sleep_default = 'nid=([0-9]*)';</div><div class='ctx'> my $regex_wakeup_kswapd_default = 'nid=([0-9]*) zid=([0-9]*) order=([0-9]*)';</div><div class='del'>-my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_taken=([0-9]*) file=([0-9]*)';</div><div class='del'>-my $regex_lru_shrink_inactive_default = 'nid=([0-9]*) zid=([0-9]*) nr_scanned=([0-9]*) nr_reclaimed=([0-9]*) priority=([0-9]*) flags=([A-Z_|]*)';</div><div class='add'>+my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) classzone_idx=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_skipped=([0-9]*) nr_taken=([0-9]*) lru=([a-z_]*)';</div><div class='add'>+my $regex_lru_shrink_inactive_default = 'nid=([0-9]*) nr_scanned=([0-9]*) nr_reclaimed=([0-9]*) nr_dirty=([0-9]*) nr_writeback=([0-9]*) nr_congested=([0-9]*) nr_immediate=([0-9]*) nr_activate=([0-9]*) nr_ref_keep=([0-9]*) nr_unmap_fail=([0-9]*) priority=([0-9]*) flags=([A-Z_|]*)';</div><div class='ctx'> my $regex_lru_shrink_active_default = 'lru=([A-Z_]*) nr_scanned=([0-9]*) nr_rotated=([0-9]*) priority=([0-9]*)';</div><div class='ctx'> my $regex_writepage_default = 'page=([0-9a-f]*) pfn=([0-9]*) flags=([A-Z_|]*)';</div><div class='ctx'> </div><div class='hunk'>@@ -205,15 +205,15 @@ $regex_wakeup_kswapd = generate_traceevent_regex(</div><div class='ctx'> $regex_lru_isolate = generate_traceevent_regex(</div><div class='ctx'> 			"vmscan/mm_vmscan_lru_isolate",</div><div class='ctx'> 			$regex_lru_isolate_default,</div><div class='del'>-			"isolate_mode", "order",</div><div class='del'>-			"nr_requested", "nr_scanned", "nr_taken",</div><div class='del'>-			"file");</div><div class='add'>+			"isolate_mode", "classzone_idx", "order",</div><div class='add'>+			"nr_requested", "nr_scanned", "nr_skipped", "nr_taken",</div><div class='add'>+			"lru");</div><div class='ctx'> $regex_lru_shrink_inactive = generate_traceevent_regex(</div><div class='ctx'> 			"vmscan/mm_vmscan_lru_shrink_inactive",</div><div class='ctx'> 			$regex_lru_shrink_inactive_default,</div><div class='del'>-			"nid", "zid",</div><div class='del'>-			"nr_scanned", "nr_reclaimed", "priority",</div><div class='del'>-			"flags");</div><div class='add'>+			"nid", "nr_scanned", "nr_reclaimed", "nr_dirty", "nr_writeback",</div><div class='add'>+			"nr_congested", "nr_immediate", "nr_activate", "nr_ref_keep",</div><div class='add'>+			"nr_unmap_fail", "priority", "flags");</div><div class='ctx'> $regex_lru_shrink_active = generate_traceevent_regex(</div><div class='ctx'> 			"vmscan/mm_vmscan_lru_shrink_active",</div><div class='ctx'> 			$regex_lru_shrink_active_default,</div><div class='hunk'>@@ -381,8 +381,8 @@ EVENT_PROCESS:</div><div class='ctx'> 				next;</div><div class='ctx'> 			}</div><div class='ctx'> 			my $isolate_mode = $1;</div><div class='del'>-			my $nr_scanned = $4;</div><div class='del'>-			my $file = $6;</div><div class='add'>+			my $nr_scanned = $5;</div><div class='add'>+			my $file = $8;</div><div class='ctx'> </div><div class='ctx'> 			# To closer match vmstat scanning statistics, only count isolate_both</div><div class='ctx'> 			# and isolate_inactive as scanning. isolate_active is rotation</div><div class='hunk'>@@ -391,7 +391,7 @@ EVENT_PROCESS:</div><div class='ctx'> 			# isolate_both     == 3</div><div class='ctx'> 			if ($isolate_mode != 2) {</div><div class='ctx'> 				$perprocesspid{$process_pid}-&gt;{HIGH_NR_SCANNED} += $nr_scanned;</div><div class='del'>-				if ($file == 1) {</div><div class='add'>+				if ($file =~ /_file/) {</div><div class='ctx'> 					$perprocesspid{$process_pid}-&gt;{HIGH_NR_FILE_SCANNED} += $nr_scanned;</div><div class='ctx'> 				} else {</div><div class='ctx'> 					$perprocesspid{$process_pid}-&gt;{HIGH_NR_ANON_SCANNED} += $nr_scanned;</div><div class='hunk'>@@ -406,8 +406,8 @@ EVENT_PROCESS:</div><div class='ctx'> 				next;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			my $nr_reclaimed = $4;</div><div class='del'>-			my $flags = $6;</div><div class='add'>+			my $nr_reclaimed = $3;</div><div class='add'>+			my $flags = $12;</div><div class='ctx'> 			my $file = 0;</div><div class='ctx'> 			if ($flags =~ /RECLAIM_WB_FILE/) {</div><div class='ctx'> 				$file = 1;</div><div class='head'>diff --git a/Documentation/trace/stm.txt b/Documentation/trace/stm.txt<br/>index ea035f9dbfd7..11cff47eecce 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/trace/stm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/trace/stm.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/trace/stm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/stm.txt</a></div><div class='hunk'>@@ -69,12 +69,43 @@ stm device's channel mmio region is 64 bytes and hardware page size is</div><div class='ctx'> width==64, you should be able to mmap() one page on this file</div><div class='ctx'> descriptor and obtain direct access to an mmio region for 64 channels.</div><div class='ctx'> </div><div class='add'>+Examples of STM devices are Intel(R) Trace Hub [1] and Coresight STM</div><div class='add'>+[2].</div><div class='add'>+</div><div class='add'>+stm_source</div><div class='add'>+==========</div><div class='add'>+</div><div class='ctx'> For kernel-based trace sources, there is "stm_source" device</div><div class='ctx'> class. Devices of this class can be connected and disconnected to/from</div><div class='del'>-stm devices at runtime via a sysfs attribute.</div><div class='add'>+stm devices at runtime via a sysfs attribute called "stm_source_link"</div><div class='add'>+by writing the name of the desired stm device there, for example:</div><div class='ctx'> </div><div class='del'>-Examples of STM devices are Intel(R) Trace Hub [1] and Coresight STM</div><div class='del'>-[2].</div><div class='add'>+$ echo dummy_stm.0 &gt; /sys/class/stm_source/console/stm_source_link</div><div class='add'>+</div><div class='add'>+For examples on how to use stm_source interface in the kernel, refer</div><div class='add'>+to stm_console or stm_heartbeat drivers.</div><div class='add'>+</div><div class='add'>+Each stm_source device will need to assume a master and a range of</div><div class='add'>+channels, depending on how many channels it requires. These are</div><div class='add'>+allocated for the device according to the policy configuration. If</div><div class='add'>+there's a node in the root of the policy directory that matches the</div><div class='add'>+stm_source device's name (for example, "console"), this node will be</div><div class='add'>+used to allocate master and channel numbers. If there's no such policy</div><div class='add'>+node, the stm core will pick the first contiguous chunk of channels</div><div class='add'>+within the first available master. Note that the node must exist</div><div class='add'>+before the stm_source device is connected to its stm device.</div><div class='add'>+</div><div class='add'>+stm_console</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+One implementation of this interface also used in the example above is</div><div class='add'>+the "stm_console" driver, which basically provides a one-way console</div><div class='add'>+for kernel messages over an stm device.</div><div class='add'>+</div><div class='add'>+To configure the master/channel pair that will be assigned to this</div><div class='add'>+console in the STP stream, create a "console" policy entry (see the</div><div class='add'>+beginning of this text on how to do that). When initialized, it will</div><div class='add'>+consume one channel.</div><div class='ctx'> </div><div class='ctx'> [1] https://software.intel.com/sites/default/files/managed/d3/3c/intel-th-developer-manual.pdf</div><div class='ctx'> [2] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0444b/index.html</div><div class='head'>diff --git a/Documentation/trace/uprobetracer.txt b/Documentation/trace/uprobetracer.txt<br/>index 94b6b4581763..fa7b680ee8a0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/trace/uprobetracer.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/trace/uprobetracer.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/trace/uprobetracer.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/trace/uprobetracer.txt</a></div><div class='hunk'>@@ -76,15 +76,15 @@ Usage examples</div><div class='ctx'>  * Add a probe as a new uprobe event, write a new definition to uprobe_events</div><div class='ctx'> as below: (sets a uprobe at an offset of 0x4245c0 in the executable /bin/bash)</div><div class='ctx'> </div><div class='del'>-    echo 'p: /bin/bash:0x4245c0' &gt; /sys/kernel/debug/tracing/uprobe_events</div><div class='add'>+    echo 'p /bin/bash:0x4245c0' &gt; /sys/kernel/debug/tracing/uprobe_events</div><div class='ctx'> </div><div class='ctx'>  * Add a probe as a new uretprobe event:</div><div class='ctx'> </div><div class='del'>-    echo 'r: /bin/bash:0x4245c0' &gt; /sys/kernel/debug/tracing/uprobe_events</div><div class='add'>+    echo 'r /bin/bash:0x4245c0' &gt; /sys/kernel/debug/tracing/uprobe_events</div><div class='ctx'> </div><div class='ctx'>  * Unset registered event:</div><div class='ctx'> </div><div class='del'>-    echo '-:bash_0x4245c0' &gt;&gt; /sys/kernel/debug/tracing/uprobe_events</div><div class='add'>+    echo '-:p_bash_0x4245c0' &gt;&gt; /sys/kernel/debug/tracing/uprobe_events</div><div class='ctx'> </div><div class='ctx'>  * Print out the events that are registered:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/translations/ja_JP/HOWTO b/Documentation/translations/ja_JP/HOWTO<br/>new file mode 100644<br/>index 000000000000..4ebd20750ef1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/ja_JP/HOWTO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ja_JP/HOWTO</a></div><div class='hunk'>@@ -0,0 +1,637 @@</div><div class='add'>+NOTE:</div><div class='add'>+This is a version of Documentation/HOWTO translated into Japanese.</div><div class='add'>+This document is maintained by Tsugikazu Shibata &lt;tshibata@ab.jp.nec.com&gt;</div><div class='add'>+and the JF Project team &lt;www.linux.or.jp/JF&gt;.</div><div class='add'>+If you find any difference between this document and the original file</div><div class='add'>+or a problem with the translation,</div><div class='add'>+please contact the maintainer of this file or JF project.</div><div class='add'>+</div><div class='add'>+Please also note that the purpose of this file is to be easier to read</div><div class='add'>+for non English (read: Japanese) speakers and is not intended as a</div><div class='add'>+fork. So if you have any comments or updates for this file, please try</div><div class='add'>+to update the original English file first.</div><div class='add'>+</div><div class='add'>+Last Updated: 2013/07/19</div><div class='add'>+==================================</div><div class='add'>+これは、</div><div class='add'>+linux-3.10/Documentation/HOWTO</div><div class='add'>+の和訳です。</div><div class='add'>+</div><div class='add'>+翻訳団体： JF プロジェクト &lt; http://linuxjf.sourceforge.jp/ &gt;</div><div class='add'>+翻訳日： 2013/7/19</div><div class='add'>+翻訳者： Tsugikazu Shibata &lt;tshibata at ab dot jp dot nec dot com&gt;</div><div class='add'>+校正者： 松倉さん &lt;nbh--mats at nifty dot com&gt;</div><div class='add'>+         小林 雅典さん (Masanori Kobayasi) &lt;zap03216 at nifty dot ne dot jp&gt;</div><div class='add'>+         武井伸光さん、&lt;takei at webmasters dot gr dot jp&gt;</div><div class='add'>+         かねこさん (Seiji Kaneko) &lt;skaneko at a2 dot mbn dot or dot jp&gt;</div><div class='add'>+         野口さん (Kenji Noguchi) &lt;tokyo246 at gmail dot com&gt;</div><div class='add'>+         河内さん (Takayoshi Kochi) &lt;t-kochi at bq dot jp dot nec dot com&gt;</div><div class='add'>+         岩本さん (iwamoto) &lt;iwamoto.kn at ncos dot nec dot co dot jp&gt;</div><div class='add'>+         内田さん (Satoshi Uchida) &lt;s-uchida at ap dot jp dot nec dot com&gt;</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+Linux カーネル開発のやり方</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+これは上のトピック( Linux カーネル開発のやり方)の重要な事柄を網羅した</div><div class='add'>+ドキュメントです。ここには Linux カーネル開発者になるための方法と</div><div class='add'>+Linux カーネル開発コミュニティと共に活動するやり方を学ぶ方法が含まれて</div><div class='add'>+います。カーネルプログラミングに関する技術的な項目に関することは何も含</div><div class='add'>+めないようにしていますが、カーネル開発者となるための正しい方向に向かう</div><div class='add'>+手助けになります。</div><div class='add'>+</div><div class='add'>+もし、このドキュメントのどこかが古くなっていた場合には、このドキュメン</div><div class='add'>+トの最後にリストしたメンテナにパッチを送ってください。</div><div class='add'>+</div><div class='add'>+はじめに</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+あなたは　Linux カーネルの開発者になる方法を学びたいのでしょうか？　そ</div><div class='add'>+れともあなたは上司から「このデバイスの Linux ドライバを書くように」と</div><div class='add'>+言われているのでしょうか？　</div><div class='add'>+この文書の目的は、あなたが踏むべき手順と、コミュニティと一緒にうまく働</div><div class='add'>+くヒントを書き下すことで、あなたが知るべき全てのことを教えることです。</div><div class='add'>+また、このコミュニティがなぜ今うまくまわっているのかという理由の一部も</div><div class='add'>+説明しようと試みています。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+カーネルは 少量のアーキテクチャ依存部分がアセンブリ言語で書かれている</div><div class='add'>+以外は大部分は C 言語で書かれています。C言語をよく理解していることはカー</div><div class='add'>+ネル開発者には必要です。アーキテクチャ向けの低レベル部分の開発をするの</div><div class='add'>+でなければ、(どんなアーキテクチャでも)アセンブリ(訳注: 言語)は必要あり</div><div class='add'>+ません。以下の本は、C 言語の十分な知識や何年もの経験に取って代わるもの</div><div class='add'>+ではありませんが、少なくともリファレンスとしては良い本です。</div><div class='add'>+ - "The C Programming Language" by Kernighan and Ritchie [Prentice Hall]</div><div class='add'>+ -『プログラミング言語Ｃ第2版』(B.W. カーニハン/D.M. リッチー著 石田晴久訳) [共立出版]</div><div class='add'>+ - "Practical C Programming" by Steve Oualline [O'Reilly]</div><div class='add'>+ - 『C実践プログラミング第3版』(Steve Oualline著 望月康司監訳 谷口功訳) [オライリージャパン]</div><div class='add'>+ - "C:  A Reference Manual" by Harbison and Steele [Prentice Hall]</div><div class='add'>+ - 『新・詳説 C 言語 H&amp;S リファレンス』</div><div class='add'>+       (サミュエル P ハービソン/ガイ L スティール共著 斉藤 信男監訳)[ソフトバンク]</div><div class='add'>+</div><div class='add'>+カーネルは GNU C と GNU ツールチェインを使って書かれています。カーネル</div><div class='add'>+は ISO C89 仕様に準拠して書く一方で、標準には無い言語拡張を多く使って</div><div class='add'>+います。カーネルは標準 C ライブラリとは関係がないといった、C 言語フリー</div><div class='add'>+スタンディング環境です。そのため、C の標準で使えないものもあります。任</div><div class='add'>+意の long long の除算や浮動小数点は使えません。</div><div class='add'>+ときどき、カーネルがツールチェインや C 言語拡張に置いている前提がどう</div><div class='add'>+なっているのかわかりにくいことがあり、また、残念なことに決定的なリファ</div><div class='add'>+レンスは存在しません。情報を得るには、gcc の info ページ( info gcc )を</div><div class='add'>+見てください。</div><div class='add'>+</div><div class='add'>+あなたは既存の開発コミュニティと一緒に作業する方法を学ぼうとしているこ</div><div class='add'>+とに留意してください。そのコミュニティは、コーディング、スタイル、</div><div class='add'>+開発手順について高度な標準を持つ、多様な人の集まりです。</div><div class='add'>+地理的に分散した大規模なチームに対してもっともうまくいくとわかったこと</div><div class='add'>+をベースにしながら、これらの標準は長い時間をかけて築かれてきました。</div><div class='add'>+これらはきちんと文書化されていますから、事前にこれらの標準についてでき</div><div class='add'>+るだけたくさん学んでください。また皆があなたやあなたの会社のやり方に合わ</div><div class='add'>+せてくれると思わないでください。</div><div class='add'>+</div><div class='add'>+法的問題</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+Linux カーネルのソースコードは GPL ライセンスの下でリリースされていま</div><div class='add'>+す。ライセンスの詳細については、ソースツリーのメインディレクトリに存在</div><div class='add'>+する、COPYING のファイルを見てください。もしライセンスについてさらに質</div><div class='add'>+問があれば、Linux Kernel メーリングリストに質問するのではなく、どうぞ</div><div class='add'>+法律家に相談してください。メーリングリストの人達は法律家ではなく、法的</div><div class='add'>+問題については彼らの声明はあてにするべきではありません。</div><div class='add'>+</div><div class='add'>+GPL に関する共通の質問や回答については、以下を参照してください。</div><div class='add'>+	http://www.gnu.org/licenses/gpl-faq.html</div><div class='add'>+</div><div class='add'>+ドキュメント</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+Linux カーネルソースツリーは幅広い範囲のドキュメントを含んでおり、それ</div><div class='add'>+らはカーネルコミュニティと会話する方法を学ぶのに非常に貴重なものです。</div><div class='add'>+新しい機能がカーネルに追加される場合、その機能の使い方について説明した</div><div class='add'>+新しいドキュメントファイルも追加することを勧めます。</div><div class='add'>+カーネルの変更が、カーネルがユーザ空間に公開しているインターフェイスの</div><div class='add'>+変更を引き起こす場合、その変更を説明するマニュアルページのパッチや情報</div><div class='add'>+をマニュアルページのメンテナ mtk.manpages@gmail.com に送り、CC を</div><div class='add'>+linux-api@vger.kernel.org に送ることを勧めます。</div><div class='add'>+</div><div class='add'>+以下はカーネルソースツリーに含まれている読んでおくべきファイルの一覧で</div><div class='add'>+す-</div><div class='add'>+</div><div class='add'>+  README</div><div class='add'>+    このファイルは Linuxカーネルの簡単な背景とカーネルを設定(訳注</div><div class='add'>+    configure )し、生成(訳注 build )するために必要なことは何かが書かれ</div><div class='add'>+    ています。カーネルに関して初めての人はここからスタートすると良いで</div><div class='add'>+    しょう。</div><div class='add'>+</div><div class='add'>+  Documentation/Changes</div><div class='add'>+     このファイルはカーネルをうまく生成(訳注 build )し、走らせるのに最</div><div class='add'>+     小限のレベルで必要な数々のソフトウェアパッケージの一覧を示してい</div><div class='add'>+     ます。</div><div class='add'>+</div><div class='add'>+  Documentation/process/coding-style.rst</div><div class='add'>+    これは Linux カーネルのコーディングスタイルと背景にある理由を記述</div><div class='add'>+    しています。全ての新しいコードはこのドキュメントにあるガイドライン</div><div class='add'>+    に従っていることを期待されています。大部分のメンテナはこれらのルー</div><div class='add'>+    ルに従っているものだけを受け付け、多くの人は正しいスタイルのコード</div><div class='add'>+    だけをレビューします。</div><div class='add'>+</div><div class='add'>+  Documentation/process/submitting-patches.rst</div><div class='add'>+  Documentation/process/submitting-drivers.rst</div><div class='add'>+     これらのファイルには、どうやってうまくパッチを作って投稿するかに</div><div class='add'>+     ついて非常に詳しく書かれており、以下を含みます(これだけに限らない</div><div class='add'>+     けれども)</div><div class='add'>+        - Email に含むこと</div><div class='add'>+        - Email の形式</div><div class='add'>+        - だれに送るか</div><div class='add'>+     これらのルールに従えばうまくいくことを保証することではありません</div><div class='add'>+     が (すべてのパッチは内容とスタイルについて精査を受けるので)、</div><div class='add'>+     ルールに従わなければ間違いなくうまくいかないでしょう。</div><div class='add'>+</div><div class='add'>+     この他にパッチを作る方法についてのよくできた記述は-</div><div class='add'>+</div><div class='add'>+	"The Perfect Patch"</div><div class='add'>+		http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='add'>+	"Linux kernel patch submission format"</div><div class='add'>+		http://linux.yyz.us/patch-format.html</div><div class='add'>+</div><div class='add'>+  Documentation/process/stable-api-nonsense.rst</div><div class='add'>+     このファイルはカーネルの中に不変のAPIを持たないことにした意識的な</div><div class='add'>+     決断の背景にある理由について書かれています。以下のようなことを含</div><div class='add'>+     んでいます-</div><div class='add'>+       - サブシステムとの間に層を作ること(コンパチビリティのため?)</div><div class='add'>+       - オペレーティングシステム間のドライバの移植性</div><div class='add'>+       - カーネルソースツリーの素早い変更を遅らせる(もしくは素早い変更</div><div class='add'>+         を妨げる)</div><div class='add'>+     このドキュメントは Linux 開発の思想を理解するのに非常に重要です。</div><div class='add'>+     そして、他のOSでの開発者が Linux に移る時にとても重要です。</div><div class='add'>+</div><div class='add'>+  Documentation/admin-guide/security-bugs.rst</div><div class='add'>+    もし Linux カーネルでセキュリティ問題を発見したように思ったら、こ</div><div class='add'>+    のドキュメントのステップに従ってカーネル開発者に連絡し、問題解決を</div><div class='add'>+    支援してください。</div><div class='add'>+</div><div class='add'>+  Documentation/process/management-style.rst</div><div class='add'>+    このドキュメントは Linux カーネルのメンテナ達がどう行動するか、</div><div class='add'>+    彼らの手法の背景にある共有されている精神について記述しています。こ</div><div class='add'>+    れはカーネル開発の初心者なら（もしくは、単に興味があるだけの人でも）</div><div class='add'>+    重要です。なぜならこのドキュメントは、カーネルメンテナ達の独特な</div><div class='add'>+    行動についての多くの誤解や混乱を解消するからです。</div><div class='add'>+</div><div class='add'>+  Documentation/process/stable-kernel-rules.rst</div><div class='add'>+    このファイルはどのように stable カーネルのリリースが行われるかのルー</div><div class='add'>+    ルが記述されています。そしてこれらのリリースの中のどこかで変更を取</div><div class='add'>+    り入れてもらいたい場合に何をすれば良いかが示されています。</div><div class='add'>+</div><div class='add'>+  Documentation/process/kernel-docs.rst</div><div class='add'>+　　カーネル開発に付随する外部ドキュメントのリストです。もしあなたが</div><div class='add'>+    探しているものがカーネル内のドキュメントでみつからなかった場合、</div><div class='add'>+    このリストをあたってみてください。</div><div class='add'>+</div><div class='add'>+  Documentation/process/applying-patches.rst</div><div class='add'>+    パッチとはなにか、パッチをどうやって様々なカーネルの開発ブランチに</div><div class='add'>+    適用するのかについて正確に記述した良い入門書です。</div><div class='add'>+</div><div class='add'>+カーネルはソースコードから自動的に生成可能な多数のドキュメントを自分自</div><div class='add'>+身でもっています。これにはカーネル内 API のすべての記述や、どう正しく</div><div class='add'>+ロックをかけるかの規則が含まれます。このドキュメントは</div><div class='add'>+Documentation/DocBook/ ディレクトリに作られ、以下のように</div><div class='add'>+	make pdfdocs</div><div class='add'>+	make psdocs</div><div class='add'>+	make htmldocs</div><div class='add'>+	make mandocs</div><div class='add'>+コマンドを実行するとメインカーネルのソースディレクトリから</div><div class='add'>+それぞれ、PDF, Postscript, HTML, man page の形式で生成されます。</div><div class='add'>+</div><div class='add'>+カーネル開発者になるには</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+もしあなたが、Linux カーネル開発について何も知らないならば、</div><div class='add'>+KernelNewbies プロジェクトを見るべきです</div><div class='add'>+	http://kernelnewbies.org</div><div class='add'>+</div><div class='add'>+このサイトには役に立つメーリングリストがあり、基本的なカーネル開発に関</div><div class='add'>+するほとんどどんな種類の質問もできます (既に回答されているようなことを</div><div class='add'>+聞く前にまずはアーカイブを調べてください)。</div><div class='add'>+またここには、リアルタイムで質問を聞くことができる IRC チャネルや、Linux</div><div class='add'>+カーネルの開発に関して学ぶのに便利なたくさんの役に立つドキュメントがあ</div><div class='add'>+ります。</div><div class='add'>+</div><div class='add'>+web サイトには、コードの構成、サブシステム、現在存在するプロジェクト(ツ</div><div class='add'>+リーにあるもの無いものの両方)の基本的な管理情報があります。</div><div class='add'>+ここには、また、カーネルのコンパイルのやり方やパッチの当て方などの間接</div><div class='add'>+的な基本情報も記述されています。</div><div class='add'>+</div><div class='add'>+あなたがどこからスタートして良いかわからないが、Linux カーネル開発コミュ</div><div class='add'>+ニティに参加して何かすることをさがしている場合には、Linux kernel</div><div class='add'>+Janitor's プロジェクトにいけば良いでしょう -</div><div class='add'>+	http://kernelnewbies.org/KernelJanitors</div><div class='add'>+ここはそのようなスタートをするのにうってつけの場所です。ここには、</div><div class='add'>+Linux カーネルソースツリーの中に含まれる、きれいにし、修正しなければな</div><div class='add'>+らない、単純な問題のリストが記述されています。このプロジェクトに関わる</div><div class='add'>+開発者と一緒に作業することで、あなたのパッチを Linuxカーネルツリーに入</div><div class='add'>+れるための基礎を学ぶことができ、そしてもしあなたがまだアイディアを持っ</div><div class='add'>+ていない場合には、次にやる仕事の方向性が見えてくるかもしれません。</div><div class='add'>+</div><div class='add'>+もしあなたが、すでにひとまとまりコードを書いていて、カーネルツリーに入</div><div class='add'>+れたいと思っていたり、それに関する適切な支援を求めたい場合、カーネル</div><div class='add'>+メンターズプロジェクトはそのような皆さんを助けるためにできました。</div><div class='add'>+ここにはメーリングリストがあり、以下から参照できます</div><div class='add'>+	http://selenic.com/mailman/listinfo/kernel-mentors</div><div class='add'>+</div><div class='add'>+実際に Linux カーネルのコードについて修正を加える前に、どうやってその</div><div class='add'>+コードが動作するのかを理解することが必要です。そのためには、特別なツー</div><div class='add'>+ルの助けを借りてでも、それを直接よく読むことが最良の方法です(ほとんど</div><div class='add'>+のトリッキーな部分は十分にコメントしてありますから)。そういうツールで</div><div class='add'>+特におすすめなのは、Linux クロスリファレンスプロジェクトです。これは、</div><div class='add'>+自己参照方式で、索引がついた web 形式で、ソースコードを参照することが</div><div class='add'>+できます。この最新の素晴しいカーネルコードのリポジトリは以下で見つかり</div><div class='add'>+ます-</div><div class='add'>+	http://lxr.free-electrons.com/</div><div class='add'>+</div><div class='add'>+開発プロセス</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Linux カーネルの開発プロセスは現在幾つかの異なるメインカーネル「ブラン</div><div class='add'>+チ」と多数のサブシステム毎のカーネルブランチから構成されます。</div><div class='add'>+これらのブランチとは-</div><div class='add'>+  - メインの 3.x カーネルツリー</div><div class='add'>+  - 3.x.y -stable カーネルツリー</div><div class='add'>+  - 3.x -git カーネルパッチ</div><div class='add'>+  - サブシステム毎のカーネルツリーとパッチ</div><div class='add'>+  - 統合テストのための 3.x -next カーネルツリー</div><div class='add'>+</div><div class='add'>+3.x カーネルツリー</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+3.x カーネルは Linus Torvalds によってメンテナンスされ、kernel.org</div><div class='add'>+の pub/linux/kernel/v3.x/ ディレクトリに存在します。この開発プロセスは</div><div class='add'>+以下のとおり-</div><div class='add'>+</div><div class='add'>+  - 新しいカーネルがリリースされた直後に、2週間の特別期間が設けられ、</div><div class='add'>+    この期間中に、メンテナ達は Linus に大きな差分を送ることができます。</div><div class='add'>+    このような差分は通常 -next カーネルに数週間含まれてきたパッチです。</div><div class='add'>+    大きな変更は git(カーネルのソース管理ツール、詳細は</div><div class='add'>+    http://git-scm.com/ 参照) を使って送るのが好ましいやり方ですが、パッ</div><div class='add'>+    チファイルの形式のまま送るのでも十分です。</div><div class='add'>+</div><div class='add'>+  - 2週間後、-rc1 カーネルがリリースされ、この後にはカーネル全体の安定</div><div class='add'>+    性に影響をあたえるような新機能は含まない類のパッチしか取り込むこと</div><div class='add'>+    はできません。新しいドライバ(もしくはファイルシステム)のパッチは</div><div class='add'>+    -rc1 の後で受け付けられることもあることを覚えておいてください。な</div><div class='add'>+    ぜなら、変更が独立していて、追加されたコードの外の領域に影響を与え</div><div class='add'>+    ない限り、退行のリスクは無いからです。-rc1 がリリースされた後、</div><div class='add'>+    Linus へパッチを送付するのに git を使うこともできますが、パッチは</div><div class='add'>+    レビューのために、パブリックなメーリングリストへも同時に送る必要が</div><div class='add'>+    あります。</div><div class='add'>+</div><div class='add'>+  - 新しい -rc は Linus が、最新の git ツリーがテスト目的であれば十分</div><div class='add'>+    に安定した状態にあると判断したときにリリースされます。目標は毎週新</div><div class='add'>+    しい -rc カーネルをリリースすることです。</div><div class='add'>+</div><div class='add'>+  - このプロセスはカーネルが 「準備ができた」と考えられるまで継続しま</div><div class='add'>+    す。このプロセスはだいたい 6週間継続します。</div><div class='add'>+</div><div class='add'>+Andrew Morton が Linux-kernel メーリングリストにカーネルリリースについ</div><div class='add'>+て書いたことをここで言っておくことは価値があります-</div><div class='add'>+  「カーネルがいつリリースされるかは誰も知りません。なぜなら、これは現</div><div class='add'>+  実に認識されたバグの状況によりリリースされるのであり、前もって決めら</div><div class='add'>+  れた計画によってリリースされるものではないからです。」</div><div class='add'>+</div><div class='add'>+3.x.y -stable カーネルツリー</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+バージョン番号が3つの数字に分かれているカーネルは -stable カーネルです。</div><div class='add'>+これには、3.x カーネルで見つかったセキュリティ問題や重大な後戻りに対</div><div class='add'>+する比較的小さい重要な修正が含まれます。</div><div class='add'>+</div><div class='add'>+これは、開発/実験的バージョンのテストに協力することに興味が無く、</div><div class='add'>+最新の安定したカーネルを使いたいユーザに推奨するブランチです。</div><div class='add'>+</div><div class='add'>+もし、3.x.y カーネルが存在しない場合には、番号が一番大きい 3.x が</div><div class='add'>+最新の安定版カーネルです。</div><div class='add'>+</div><div class='add'>+3.x.y は "stable" チーム &lt;stable@vger.kernel.org&gt; でメンテされており、必</div><div class='add'>+要に応じてリリースされます。通常のリリース期間は 2週間毎ですが、差し迫っ</div><div class='add'>+た問題がなければもう少し長くなることもあります。セキュリティ関連の問題</div><div class='add'>+の場合はこれに対してだいたいの場合、すぐにリリースがされます。</div><div class='add'>+</div><div class='add'>+カーネルツリーに入っている、Documentation/process/stable-kernel-rules.rst ファ</div><div class='add'>+イルにはどのような種類の変更が -stable ツリーに受け入れ可能か、またリ</div><div class='add'>+リースプロセスがどう動くかが記述されています。</div><div class='add'>+</div><div class='add'>+3.x -git パッチ</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+git リポジトリで管理されているLinus のカーネルツリーの毎日のスナップ</div><div class='add'>+ショットがあります。(だから -git という名前がついています)。これらのパッ</div><div class='add'>+チはおおむね毎日リリースされており、Linus のツリーの現状を表します。こ</div><div class='add'>+れは -rc カーネルと比べて、パッチが大丈夫かどうかも確認しないで自動的</div><div class='add'>+に生成されるので、より実験的です。</div><div class='add'>+</div><div class='add'>+サブシステム毎のカーネルツリーとパッチ</div><div class='add'>+-------------------------------------------</div><div class='add'>+</div><div class='add'>+それぞれのカーネルサブシステムのメンテナ達は --- そして多くのカーネル</div><div class='add'>+サブシステムの開発者達も --- 各自の最新の開発状況をソースリポジトリに</div><div class='add'>+公開しています。そのため、自分とは異なる領域のカーネルで何が起きている</div><div class='add'>+かを他の人が見られるようになっています。開発が早く進んでいる領域では、</div><div class='add'>+開発者は自身の投稿がどのサブシステムカーネルツリーを元にしているか質問</div><div class='add'>+されるので、その投稿とすでに進行中の他の作業との衝突が避けられます。</div><div class='add'>+</div><div class='add'>+大部分のこれらのリポジトリは git ツリーです。しかしその他の SCM や</div><div class='add'>+quilt シリーズとして公開されているパッチキューも使われています。これら</div><div class='add'>+のサブシステムリポジトリのアドレスは MAINTAINERS ファイルにリストされ</div><div class='add'>+ています。これらの多くは http://git.kernel.org/ で参照することができま</div><div class='add'>+す。</div><div class='add'>+</div><div class='add'>+提案されたパッチがこのようなサブシステムツリーにコミットされる前に、メー</div><div class='add'>+リングリストで事前にレビューにかけられます（以下の対応するセクションを</div><div class='add'>+参照）。いくつかのカーネルサブシステムでは、このレビューは patchwork</div><div class='add'>+というツールによって追跡されます。Patchwork は web インターフェイスに</div><div class='add'>+よってパッチ投稿の表示、パッチへのコメント付けや改訂などができ、そして</div><div class='add'>+メンテナはパッチに対して、レビュー中、受付済み、拒否というようなマーク</div><div class='add'>+をつけることができます。大部分のこれらの patchwork のサイトは</div><div class='add'>+http://patchwork.kernel.org/ でリストされています。</div><div class='add'>+</div><div class='add'>+統合テストのための 3.x -next カーネルツリー</div><div class='add'>+---------------------------------------------</div><div class='add'>+</div><div class='add'>+サブシステムツリーの更新内容がメインラインの 3.x ツリーにマージされ</div><div class='add'>+る前に、それらは統合テストされる必要があります。この目的のため、実質的</div><div class='add'>+に全サブシステムツリーからほぼ毎日プルされてできる特別なテスト用のリ</div><div class='add'>+ポジトリが存在します-</div><div class='add'>+       http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git</div><div class='add'>+</div><div class='add'>+このやり方によって、-next カーネルは次のマージ機会でどんなものがメイン</div><div class='add'>+ラインカーネルにマージされるか、おおまかなの展望を提供します。-next </div><div class='add'>+カーネルの実行テストを行う冒険好きなテスターは大いに歓迎されます</div><div class='add'>+</div><div class='add'>+バグレポート</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+bugzilla.kernel.org は Linux カーネル開発者がカーネルのバグを追跡する</div><div class='add'>+場所です。ユーザは見つけたバグの全てをこのツールで報告すべきです。</div><div class='add'>+どう kernel bugzilla を使うかの詳細は、以下を参照してください-</div><div class='add'>+	http://bugzilla.kernel.org/page.cgi?id=faq.html</div><div class='add'>+メインカーネルソースディレクトリにあるファイル admin-guide/reporting-bugs.rst はカーネ</div><div class='add'>+ルバグらしいものについてどうレポートするかの良いテンプレートであり、問</div><div class='add'>+題の追跡を助けるためにカーネル開発者にとってどんな情報が必要なのかの詳</div><div class='add'>+細が書かれています。</div><div class='add'>+</div><div class='add'>+バグレポートの管理</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+あなたのハッキングのスキルを訓練する最高の方法のひとつに、他人がレポー</div><div class='add'>+トしたバグを修正することがあります。あなたがカーネルをより安定化させる</div><div class='add'>+こに寄与するということだけでなく、あなたは 現実の問題を修正することを</div><div class='add'>+学び、自分のスキルも強化でき、また他の開発者があなたの存在に気がつき</div><div class='add'>+ます。バグを修正することは、多くの開発者の中から自分が功績をあげる最善</div><div class='add'>+の道です、なぜなら多くの人は他人のバグの修正に時間を浪費することを好ま</div><div class='add'>+ないからです。</div><div class='add'>+</div><div class='add'>+すでにレポートされたバグのために仕事をするためには、</div><div class='add'>+http://bugzilla.kernel.org に行ってください。もし今後のバグレポートに</div><div class='add'>+ついてアドバイスを受けたいのであれば、bugme-new メーリングリスト(新し</div><div class='add'>+いバグレポートだけがここにメールされる) または bugme-janitor メーリン</div><div class='add'>+グリスト(bugzilla の変更毎にここにメールされる)を購読できます。</div><div class='add'>+</div><div class='add'>+	http://lists.linux-foundation.org/mailman/listinfo/bugme-new</div><div class='add'>+	http://lists.linux-foundation.org/mailman/listinfo/bugme-janitors</div><div class='add'>+</div><div class='add'>+メーリングリスト</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+上のいくつかのドキュメントで述べていますが、コアカーネル開発者の大部分</div><div class='add'>+は Linux kernel メーリングリストに参加しています。このリストの登録/脱</div><div class='add'>+退の方法については以下を参照してください-</div><div class='add'>+	http://vger.kernel.org/vger-lists.html#linux-kernel</div><div class='add'>+</div><div class='add'>+このメーリングリストのアーカイブは web 上の多数の場所に存在します。こ</div><div class='add'>+れらのアーカイブを探すにはサーチエンジンを使いましょう。例えば-</div><div class='add'>+	http://dir.gmane.org/gmane.linux.kernel</div><div class='add'>+</div><div class='add'>+リストに投稿する前にすでにその話題がアーカイブに存在するかどうかを検索</div><div class='add'>+することを是非やってください。多数の事がすでに詳細に渡って議論されて</div><div class='add'>+おり、アーカイブにのみ記録されています。</div><div class='add'>+</div><div class='add'>+大部分のカーネルサブシステムも自分の個別の開発を実施するメーリングリス</div><div class='add'>+トを持っています。個々のグループがどんなリストを持っているかは、</div><div class='add'>+MAINTAINERS ファイルにリストがありますので参照してください。</div><div class='add'>+</div><div class='add'>+多くのリストは kernel.org でホストされています。これらの情報は以下にあ</div><div class='add'>+ります-</div><div class='add'>+	http://vger.kernel.org/vger-lists.html</div><div class='add'>+</div><div class='add'>+メーリングリストを使う場合、良い行動習慣に従うようにしましょう。</div><div class='add'>+少し安っぽいが、以下の URL は上のリスト(や他のリスト)で会話する場合の</div><div class='add'>+シンプルなガイドラインを示しています-</div><div class='add'>+	http://www.albion.com/netiquette/</div><div class='add'>+</div><div class='add'>+もし複数の人があなたのメールに返事をした場合、CC: で受ける人のリストは</div><div class='add'>+だいぶ多くなるでしょう。良い理由がない場合、CC: リストから誰かを削除を</div><div class='add'>+しないように、また、メーリングリストのアドレスだけにリプライすることの</div><div class='add'>+ないようにしましょう。1つは送信者から、もう1つはリストからのように、メー</div><div class='add'>+ルを2回受けることになってもそれに慣れ、しゃれたメールヘッダーを追加し</div><div class='add'>+てこの状態を変えようとしないように。人々はそのようなことは好みません。</div><div class='add'>+</div><div class='add'>+今までのメールでのやりとりとその間のあなたの発言はそのまま残し、</div><div class='add'>+"John Kernelhacker wrote ...:" の行をあなたのリプライの先頭行にして、</div><div class='add'>+メールの先頭でなく、各引用行の間にあなたの言いたいことを追加するべきで</div><div class='add'>+す。</div><div class='add'>+</div><div class='add'>+もしパッチをメールに付ける場合は、Documentation/process/submitting-patches.rst に提</div><div class='add'>+示されているように、それは プレーンな可読テキストにすることを忘れない</div><div class='add'>+ようにしましょう。カーネル開発者は 添付や圧縮したパッチを扱いたがりま</div><div class='add'>+せん-</div><div class='add'>+彼らはあなたのパッチの行毎にコメントを入れたいので、そのためにはそうす</div><div class='add'>+るしかありません。あなたのメールプログラムが空白やタブを圧縮しないよう</div><div class='add'>+に確認した方が良いです。最初の良いテストとしては、自分にメールを送って</div><div class='add'>+みて、そのパッチを自分で当ててみることです。もしそれがうまく行かないな</div><div class='add'>+ら、あなたのメールプログラムを直してもらうか、正しく動くように変えるべ</div><div class='add'>+きです。</div><div class='add'>+</div><div class='add'>+とりわけ、他の登録者に対する尊敬を表すようにすることを覚えておいてくだ</div><div class='add'>+さい。</div><div class='add'>+</div><div class='add'>+コミュニティと共に働くこと</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+カーネルコミュニティのゴールは可能なかぎり最高のカーネルを提供すること</div><div class='add'>+です。あなたがパッチを受け入れてもらうために投稿した場合、それは、技術</div><div class='add'>+的メリットだけがレビューされます。その際、あなたは何を予想すべきでしょ</div><div class='add'>+うか?</div><div class='add'>+  - 批判</div><div class='add'>+  - コメント</div><div class='add'>+  - 変更の要求</div><div class='add'>+  - パッチの正当性の証明要求</div><div class='add'>+  - 沈黙</div><div class='add'>+</div><div class='add'>+思い出してください、ここはあなたのパッチをカーネルに入れる話です。あ</div><div class='add'>+なたは、あなたのパッチに対する批判とコメントを受け入れるべきで、それら</div><div class='add'>+を技術的レベルで評価して、パッチを再作成するか、なぜそれらの変更をすべ</div><div class='add'>+きでないかを明確で簡潔な理由の説明を提供してください。</div><div class='add'>+もし、あなたのパッチに何も反応がない場合、たまにはメールの山に埋もれて</div><div class='add'>+見逃され、あなたの投稿が忘れられてしまうこともあるので、数日待って再度</div><div class='add'>+投稿してください。</div><div class='add'>+</div><div class='add'>+あなたがやるべきでないものは?</div><div class='add'>+  - 質問なしにあなたのパッチが受け入れられると想像すること</div><div class='add'>+  - 守りに入ること</div><div class='add'>+  - コメントを無視すること</div><div class='add'>+  - 要求された変更を何もしないでパッチを出し直すこと</div><div class='add'>+</div><div class='add'>+可能な限り最高の技術的解決を求めているコミュニティでは、パッチがどのく</div><div class='add'>+らい有益なのかについては常に異なる意見があります。あなたは協調的である</div><div class='add'>+べきですし、また、あなたのアイディアをカーネルに対してうまく合わせるよ</div><div class='add'>+うにすることが望まれています。もしくは、最低限あなたのアイディアがそれ</div><div class='add'>+だけの価値があるとすすんで証明するようにしなければなりません。</div><div class='add'>+正しい解決に向かって進もうという意志がある限り、間違うことがあっても許</div><div class='add'>+容されることを忘れないでください。</div><div class='add'>+</div><div class='add'>+あなたの最初のパッチに単に 1ダースもの修正を求めるリストの返答になるこ</div><div class='add'>+とも普通のことです。これはあなたのパッチが受け入れられないということで</div><div class='add'>+は *ありません*、そしてあなた自身に反対することを意味するのでも *ありま</div><div class='add'>+せん*。単に自分のパッチに対して指摘された問題を全て修正して再送すれば</div><div class='add'>+良いのです。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+カーネルコミュニティと企業組織のちがい</div><div class='add'>+-----------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+カーネルコミュニティは大部分の伝統的な会社の開発環境とは異ったやり方で</div><div class='add'>+動いています。以下は問題を避けるためにできると良いことのリストです-</div><div class='add'>+</div><div class='add'>+  あなたの提案する変更について言うときのうまい言い方：</div><div class='add'>+</div><div class='add'>+    - "これは複数の問題を解決します"</div><div class='add'>+    - "これは2000行のコードを削除します"</div><div class='add'>+    - "以下のパッチは、私が言おうとしていることを説明するものです"</div><div class='add'>+    - "私はこれを5つの異なるアーキテクチャでテストしたのですが..."</div><div class='add'>+    - "以下は一連の小さなパッチ群ですが..."</div><div class='add'>+    - "これは典型的なマシンでの性能を向上させます.."</div><div class='add'>+</div><div class='add'>+  やめた方が良い悪い言い方：</div><div class='add'>+</div><div class='add'>+    - このやり方で AIX/ptx/Solaris ではできたので、できるはずだ</div><div class='add'>+    - 私はこれを20年もの間やってきた、だから</div><div class='add'>+    - これは、私の会社が金儲けをするために必要だ</div><div class='add'>+    - これは我々のエンタープライズ向け商品ラインのためである</div><div class='add'>+    - これは 私が自分のアイディアを記述した、1000ページの設計資料である</div><div class='add'>+    - 私はこれについて、6ケ月作業している。</div><div class='add'>+    - 以下は ... に関する5000行のパッチです</div><div class='add'>+    - 私は現在のぐちゃぐちゃを全部書き直した、それが以下です...</div><div class='add'>+    - 私は〆切がある、そのためこのパッチは今すぐ適用される必要がある</div><div class='add'>+</div><div class='add'>+カーネルコミュニティが大部分の伝統的なソフトウェアエンジニアリングの労</div><div class='add'>+働環境と異なるもう一つの点は、やりとりに顔を合わせないということです。</div><div class='add'>+email と irc を第一のコミュニケーションの形とする一つの利点は、性別や</div><div class='add'>+民族の差別がないことです。Linux カーネルの職場環境は女性や少数民族を受</div><div class='add'>+容します。なぜなら、email アドレスによってのみあなたが認識されるからで</div><div class='add'>+す。</div><div class='add'>+国際的な側面からも活動領域を均等にするようにします。なぜならば、あなた</div><div class='add'>+は人の名前で性別を想像できないからです。ある男性が アンドレアという名</div><div class='add'>+前で、女性の名前は パット かもしれません (訳注 Andrea は米国では女性、</div><div class='add'>+それ以外(欧州など)では男性名として使われることが多い。同様に、Pat は</div><div class='add'>+Patricia (主に女性名)や Patrick (主に男性名)の略称)。</div><div class='add'>+Linux カーネルの活動をして、意見を表明したことがある大部分の女性は、前</div><div class='add'>+向きな経験をもっています。</div><div class='add'>+</div><div class='add'>+言葉の壁は英語が得意でない一部の人には問題になります。</div><div class='add'>+メーリングリストの中できちんとアイディアを交換するには、相当うまく英語</div><div class='add'>+を操れる必要があることもあります。そのため、あなたは自分のメール</div><div class='add'>+を送る前に英語で意味が通じているかをチェックすることをお薦めします。</div><div class='add'>+</div><div class='add'>+変更を分割する</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+Linux カーネルコミュニティは、一度に大量のコードの塊を喜んで受容するこ</div><div class='add'>+とはありません。変更は正確に説明される必要があり、議論され、小さい、個</div><div class='add'>+別の部分に分割する必要があります。これはこれまで多くの会社がやり慣れて</div><div class='add'>+きたことと全く正反対のことです。あなたのプロポーザルは、開発プロセスのと</div><div class='add'>+ても早い段階から紹介されるべきです。そうすれば あなたは自分のやってい</div><div class='add'>+ることにフィードバックを得られます。これは、コミュニティからみれば、あ</div><div class='add'>+なたが彼らと一緒にやっているように感じられ、単にあなたの提案する機能の</div><div class='add'>+ゴミ捨て場として使っているのではない、と感じられるでしょう。</div><div class='add'>+しかし、一度に 50 もの email をメーリングリストに送りつけるようなことは</div><div class='add'>+やってはいけません、あなたのパッチ群はいつもどんな時でもそれよりは小さ</div><div class='add'>+くなければなりません。</div><div class='add'>+</div><div class='add'>+パッチを分割する理由は以下です-</div><div class='add'>+</div><div class='add'>+1) 小さいパッチはあなたのパッチが適用される見込みを大きくします、カー</div><div class='add'>+   ネルの人達はパッチが正しいかどうかを確認する時間や労力をかけないか</div><div class='add'>+   らです。5行のパッチはメンテナがたった1秒見るだけで適用できます。</div><div class='add'>+   しかし、500行のパッチは、正しいことをレビューするのに数時間かかるか</div><div class='add'>+   もしれません(時間はパッチのサイズなどにより指数関数に比例してかかり</div><div class='add'>+   ます)</div><div class='add'>+</div><div class='add'>+   小さいパッチは何かあったときにデバッグもとても簡単になります。パッ</div><div class='add'>+   チを1個1個取り除くのは、とても大きなパッチを当てた後に(かつ、何かお</div><div class='add'>+   かしくなった後で)解剖するのに比べればとても簡単です。</div><div class='add'>+</div><div class='add'>+2) 小さいパッチを送るだけでなく、送るまえに、書き直して、シンプルにす</div><div class='add'>+   る(もしくは、単に順番を変えるだけでも)ことも、とても重要です。</div><div class='add'>+</div><div class='add'>+以下はカーネル開発者の Al Viro のたとえ話です：</div><div class='add'>+</div><div class='add'>+        "生徒の数学の宿題を採点する先生のことを考えてみてください、先</div><div class='add'>+        生は生徒が解に到達するまでの試行錯誤を見たいとは思わないでしょ</div><div class='add'>+        う。先生は簡潔な最高の解を見たいのです。良い生徒はこれを知って</div><div class='add'>+        おり、そして最終解の前の中間作業を提出することは決してないので</div><div class='add'>+        す"</div><div class='add'>+</div><div class='add'>+        カーネル開発でもこれは同じです。メンテナ達とレビューア達は、</div><div class='add'>+        問題を解決する解の背後になる思考プロセスを見たいとは思いません。</div><div class='add'>+        彼らは単純であざやかな解決方法を見たいのです。</div><div class='add'>+</div><div class='add'>+あざやかな解を説明するのと、コミュニティと共に仕事をし、未解決の仕事を</div><div class='add'>+議論することのバランスをキープするのは難しいかもしれません。</div><div class='add'>+ですから、開発プロセスの早期段階で改善のためのフィードバックをもらうよ</div><div class='add'>+うにするのも良いですが、変更点を小さい部分に分割して全体ではまだ完成し</div><div class='add'>+ていない仕事を(部分的に)取り込んでもらえるようにすることも良いことです。</div><div class='add'>+</div><div class='add'>+また、でき上がっていないものや、"将来直す" ようなパッチを、本流に含め</div><div class='add'>+てもらうように送っても、それは受け付けられないことを理解してください。</div><div class='add'>+</div><div class='add'>+あなたの変更を正当化する</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+あなたのパッチを分割するのと同時に、なぜその変更を追加しなければならな</div><div class='add'>+いかを Linux コミュニティに知らせることはとても重要です。新機能は必要</div><div class='add'>+性と有用性で正当化されなければなりません。</div><div class='add'>+</div><div class='add'>+あなたの変更の説明</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+あなたのパッチを送付する場合には、メールの中のテキストで何を言うかにつ</div><div class='add'>+いて、特別に注意を払ってください。この情報はパッチの ChangeLog に使わ</div><div class='add'>+れ、いつも皆がみられるように保管されます。これは次のような項目を含め、</div><div class='add'>+パッチを完全に記述するべきです-</div><div class='add'>+</div><div class='add'>+  - なぜ変更が必要か</div><div class='add'>+  - パッチ全体の設計アプローチ</div><div class='add'>+  - 実装の詳細</div><div class='add'>+  - テスト結果</div><div class='add'>+</div><div class='add'>+これについて全てがどのようにあるべきかについての詳細は、以下のドキュメ</div><div class='add'>+ントの ChangeLog セクションを見てください-</div><div class='add'>+  "The Perfect Patch"</div><div class='add'>+      http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='add'>+</div><div class='add'>+これらのどれもが、時にはとても困難です。これらの慣例を完璧に実施するに</div><div class='add'>+は数年かかるかもしれません。これは継続的な改善のプロセスであり、そのた</div><div class='add'>+めには多数の忍耐と決意を必要とするものです。でも、諦めないで、これは可</div><div class='add'>+能なことです。多数の人がすでにできていますし、彼らも皆最初はあなたと同</div><div class='add'>+じところからスタートしたのですから。</div><div class='add'>+</div><div class='add'>+Paolo Ciarrocchi に感謝、彼は彼の書いた "Development Process"</div><div class='add'>+(http://lwn.net/Articles/94386/) セクションをこのテキストの原型にする</div><div class='add'>+ことを許可してくれました。Rundy Dunlap と Gerrit Huizenga はメーリング</div><div class='add'>+リストでやるべきこととやってはいけないことのリストを提供してくれました。</div><div class='add'>+以下の人々のレビュー、コメント、貢献に感謝。</div><div class='add'>+Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,</div><div class='add'>+Vojtech Pavlik, Jan Kara, Josh Boyer, Kees Cook, Andrew Morton, Andi</div><div class='add'>+Kleen, Vadim Lobanov, Jesper Juhl, Adrian Bunk, Keri Harris, Frans Pop,</div><div class='add'>+David A. Wheeler, Junio Hamano, Michael Kerrisk, と Alex Shepard</div><div class='add'>+彼らの支援なしでは、このドキュメントはできなかったでしょう。</div><div class='add'>+</div><div class='add'>+Maintainer: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/Documentation/translations/ja_JP/SubmitChecklist b/Documentation/translations/ja_JP/SubmitChecklist<br/>new file mode 100644<br/>index 000000000000..60c7c35ac517<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/ja_JP/SubmitChecklist?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ja_JP/SubmitChecklist</a></div><div class='hunk'>@@ -0,0 +1,111 @@</div><div class='add'>+NOTE:</div><div class='add'>+This is a version of Documentation/process/submit-checklist.rst into Japanese.</div><div class='add'>+This document is maintained by Takenori Nagano &lt;t-nagano@ah.jp.nec.com&gt;</div><div class='add'>+and the JF Project team &lt;http://www.linux.or.jp/JF/&gt;.</div><div class='add'>+If you find any difference between this document and the original file</div><div class='add'>+or a problem with the translation,</div><div class='add'>+please contact the maintainer of this file or JF project.</div><div class='add'>+</div><div class='add'>+Please also note that the purpose of this file is to be easier to read</div><div class='add'>+for non English (read: Japanese) speakers and is not intended as a</div><div class='add'>+fork. So if you have any comments or updates of this file, please try</div><div class='add'>+to update the original English file first.</div><div class='add'>+</div><div class='add'>+Last Updated: 2008/07/14</div><div class='add'>+==================================</div><div class='add'>+これは、</div><div class='add'>+linux-2.6.26/Documentation/process/submit-checklist.rst の和訳です。</div><div class='add'>+</div><div class='add'>+翻訳団体： JF プロジェクト &lt; http://www.linux.or.jp/JF/ &gt;</div><div class='add'>+翻訳日： 2008/07/14</div><div class='add'>+翻訳者： Takenori Nagano &lt;t-nagano at ah dot jp dot nec dot com&gt;</div><div class='add'>+校正者： Masanori Kobayashi さん &lt;zap03216 at nifty dot ne dot jp&gt;</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Linux カーネルパッチ投稿者向けチェックリスト</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+本書では、パッチをより素早く取り込んでもらいたい開発者が実践すべき基本的な事柄</div><div class='add'>+をいくつか紹介します。ここにある全ての事柄は、Documentation/process/submitting-patches.rst</div><div class='add'>+などのLinuxカーネルパッチ投稿に際しての心得を補足するものです。</div><div class='add'>+</div><div class='add'>+ 1: 妥当なCONFIGオプションや変更されたCONFIGオプション、つまり =y, =m, =n</div><div class='add'>+    全てで正しくビルドできることを確認してください。その際、gcc及びリンカが</div><div class='add'>+    warningやerrorを出していないことも確認してください。</div><div class='add'>+</div><div class='add'>+ 2: allnoconfig, allmodconfig オプションを用いて正しくビルドできることを</div><div class='add'>+    確認してください。</div><div class='add'>+</div><div class='add'>+ 3: 手許のクロスコンパイルツールやOSDLのPLMのようなものを用いて、複数の</div><div class='add'>+    アーキテクチャにおいても正しくビルドできることを確認してください。</div><div class='add'>+</div><div class='add'>+ 4: 64bit長の'unsigned long'を使用しているppc64は、クロスコンパイルでの</div><div class='add'>+    チェックに適当なアーキテクチャです。</div><div class='add'>+</div><div class='add'>+ 5: カーネルコーディングスタイルに準拠しているかどうか確認してください(!)</div><div class='add'>+</div><div class='add'>+ 6: CONFIGオプションの追加・変更をした場合には、CONFIGメニューが壊れていない</div><div class='add'>+    ことを確認してください。</div><div class='add'>+</div><div class='add'>+ 7: 新しくKconfigのオプションを追加する際には、必ずそのhelpも記述してください。</div><div class='add'>+</div><div class='add'>+ 8: 適切なKconfigの依存関係を考えながら慎重にチェックしてください。</div><div class='add'>+    ただし、この作業はマシンを使ったテストできちんと行うのがとても困難です。</div><div class='add'>+    うまくやるには、自分の頭で考えることです。</div><div class='add'>+</div><div class='add'>+ 9: sparseを利用してちゃんとしたコードチェックをしてください。</div><div class='add'>+</div><div class='add'>+10: 'make checkstack' と 'make namespacecheck' を利用し、問題が発見されたら</div><div class='add'>+    修正してください。'make checkstack' は明示的に問題を示しませんが、どれか</div><div class='add'>+    １つの関数が512バイトより大きいスタックを使っていれば、修正すべき候補と</div><div class='add'>+    なります。</div><div class='add'>+</div><div class='add'>+11: グローバルなkernel API を説明する kernel-doc をソースの中に含めてください。</div><div class='add'>+    ( staticな関数においては必須ではありませんが、含めてもらっても結構です )</div><div class='add'>+    そして、'make htmldocs' もしくは 'make mandocs' を利用して追記した</div><div class='add'>+    ドキュメントのチェックを行い、問題が見つかった場合には修正を行ってください。</div><div class='add'>+</div><div class='add'>+12: CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT, CONFIG_DEBUG_SLAB,</div><div class='add'>+    CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES, CONFIG_DEBUG_SPINLOCK,</div><div class='add'>+    CONFIG_DEBUG_ATOMIC_SLEEP これら全てを同時に有効にして動作確認を</div><div class='add'>+    行ってください。</div><div class='add'>+</div><div class='add'>+13: CONFIG_SMP, CONFIG_PREEMPT を有効にした場合と無効にした場合の両方で</div><div class='add'>+    ビルドした上、動作確認を行ってください。</div><div class='add'>+</div><div class='add'>+14: もしパッチがディスクのI/O性能などに影響を与えるようであれば、</div><div class='add'>+    'CONFIG_LBDAF'オプションを有効にした場合と無効にした場合の両方で</div><div class='add'>+    テストを実施してみてください。</div><div class='add'>+</div><div class='add'>+15: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。</div><div class='add'>+</div><div class='add'>+16: /proc に新しいエントリを追加した場合には、Documentation/ 配下に</div><div class='add'>+    必ずドキュメントを追加してください。</div><div class='add'>+</div><div class='add'>+17: 新しいブートパラメータを追加した場合には、</div><div class='add'>+    必ずDocumentation/admin-guide/kernel-parameters.rst に説明を追加してください。</div><div class='add'>+</div><div class='add'>+18: 新しくmoduleにパラメータを追加した場合には、MODULE_PARM_DESC()を</div><div class='add'>+    利用して必ずその説明を記述してください。</div><div class='add'>+</div><div class='add'>+19: 新しいuserspaceインタフェースを作成した場合には、Documentation/ABI/ に</div><div class='add'>+    Documentation/ABI/README を参考にして必ずドキュメントを追加してください。</div><div class='add'>+</div><div class='add'>+20: 'make headers_check'を実行して全く問題がないことを確認してください。</div><div class='add'>+</div><div class='add'>+21: 少なくともslabアロケーションとpageアロケーションに失敗した場合の</div><div class='add'>+    挙動について、fault-injectionを利用して確認してください。</div><div class='add'>+    Documentation/fault-injection/ を参照してください。</div><div class='add'>+</div><div class='add'>+    追加したコードがかなりの量であったならば、サブシステム特有の</div><div class='add'>+    fault-injectionを追加したほうが良いかもしれません。</div><div class='add'>+</div><div class='add'>+22: 新たに追加したコードは、`gcc -W'でコンパイルしてください。</div><div class='add'>+    このオプションは大量の不要なメッセージを出力しますが、</div><div class='add'>+    "warning: comparison between signed and unsigned" のようなメッセージは、</div><div class='add'>+    バグを見つけるのに役に立ちます。</div><div class='add'>+</div><div class='add'>+23: 投稿したパッチが -mm パッチセットにマージされた後、全ての既存のパッチや</div><div class='add'>+    VM, VFS およびその他のサブシステムに関する様々な変更と、現時点でも共存</div><div class='add'>+    できることを確認するテストを行ってください。</div><div class='head'>diff --git a/Documentation/translations/ja_JP/SubmittingPatches b/Documentation/translations/ja_JP/SubmittingPatches<br/>new file mode 100644<br/>index 000000000000..02139656463e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/ja_JP/SubmittingPatches?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ja_JP/SubmittingPatches</a></div><div class='hunk'>@@ -0,0 +1,719 @@</div><div class='add'>+NOTE:</div><div class='add'>+This is a version of Documentation/process/submitting-patches.rst into Japanese.</div><div class='add'>+This document is maintained by Keiichi KII &lt;k-keiichi@bx.jp.nec.com&gt;</div><div class='add'>+and the JF Project team &lt;http://www.linux.or.jp/JF/&gt;.</div><div class='add'>+If you find any difference between this document and the original file</div><div class='add'>+or a problem with the translation,</div><div class='add'>+please contact the maintainer of this file or JF project.</div><div class='add'>+</div><div class='add'>+Please also note that the purpose of this file is to be easier to read</div><div class='add'>+for non English (read: Japanese) speakers and is not intended as a</div><div class='add'>+fork. So if you have any comments or updates of this file, please try</div><div class='add'>+to update the original English file first.</div><div class='add'>+</div><div class='add'>+Last Updated: 2011/06/09</div><div class='add'>+</div><div class='add'>+==================================</div><div class='add'>+これは、</div><div class='add'>+linux-2.6.39/Documentation/process/submitting-patches.rst の和訳</div><div class='add'>+です。</div><div class='add'>+翻訳団体： JF プロジェクト &lt; http://www.linux.or.jp/JF/ &gt;</div><div class='add'>+翻訳日： 2011/06/09</div><div class='add'>+翻訳者： Keiichi Kii &lt;k-keiichi at bx dot jp dot nec dot com&gt;</div><div class='add'>+校正者： Masanari Kobayashi さん &lt;zap03216 at nifty dot ne dot jp&gt;</div><div class='add'>+         Matsukura さん &lt;nbh--mats at nifty dot com&gt;</div><div class='add'>+         Takeshi Hamasaki さん &lt;hmatrjp at users dot sourceforge dot jp&gt;</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+        Linux カーネルに変更を加えるための Howto</div><div class='add'>+        又は</div><div class='add'>+        かの Linus Torvalds の取り扱い説明書</div><div class='add'>+</div><div class='add'>+Linux カーネルに変更を加えたいと思っている個人又は会社にとって、パッ</div><div class='add'>+チの投稿に関連した仕組みに慣れていなければ、その過程は時々みなさんを</div><div class='add'>+おじけづかせることもあります。この文章はあなたの変更を大いに受け入れ</div><div class='add'>+てもらえやすくする提案を集めたものです。</div><div class='add'>+</div><div class='add'>+コードを投稿する前に、Documentation/process/submit-checklist.rst の項目リストに目</div><div class='add'>+を通してチェックしてください。もしあなたがドライバーを投稿しようとし</div><div class='add'>+ているなら、Documentation/process/submitting-drivers.rst にも目を通してください。</div><div class='add'>+</div><div class='add'>+--------------------------------------------</div><div class='add'>+セクション1 パッチの作り方と送り方</div><div class='add'>+--------------------------------------------</div><div class='add'>+</div><div class='add'>+1) 「 diff -up 」</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+パッチの作成には「 diff -up 」又は「 diff -uprN 」を使ってください。</div><div class='add'>+</div><div class='add'>+Linux カーネルに対する全ての変更は diff(1) コマンドによるパッチの形式で</div><div class='add'>+生成してください。パッチを作成するときには、diff(1) コマンドに「 -u 」引</div><div class='add'>+数を指定して、unified 形式のパッチを作成することを確認してください。また、</div><div class='add'>+変更がどの C 関数で行われたのかを表示する「 -p 」引数を使ってください。</div><div class='add'>+この引数は生成した差分をずっと読みやすくしてくれます。パッチは Linux</div><div class='add'>+カーネルソースの中のサブディレクトリではなく Linux カーネルソースのルート</div><div class='add'>+ディレクトリを基準にしないといけません。</div><div class='add'>+</div><div class='add'>+1個のファイルについてのパッチを作成するためには、ほとんどの場合、</div><div class='add'>+以下の作業を行えば十分です。</div><div class='add'>+</div><div class='add'>+	SRCTREE= linux-2.6</div><div class='add'>+	MYFILE=  drivers/net/mydriver.c</div><div class='add'>+</div><div class='add'>+	cd $SRCTREE</div><div class='add'>+	cp $MYFILE $MYFILE.orig</div><div class='add'>+	vi $MYFILE	# make your change</div><div class='add'>+	cd ..</div><div class='add'>+	diff -up $SRCTREE/$MYFILE{.orig,} &gt; /tmp/patch</div><div class='add'>+</div><div class='add'>+複数のファイルについてのパッチを作成するためには、素の( vanilla )、す</div><div class='add'>+なわち変更を加えてない Linux カーネルを展開し、自分の Linux カーネル</div><div class='add'>+ソースとの差分を生成しないといけません。例えば、</div><div class='add'>+</div><div class='add'>+	MYSRC= /devel/linux-2.6</div><div class='add'>+</div><div class='add'>+	tar xvfz linux-2.6.12.tar.gz</div><div class='add'>+	mv linux-2.6.12 linux-2.6.12-vanilla</div><div class='add'>+	diff -uprN -X linux-2.6.12-vanilla/Documentation/dontdiff \</div><div class='add'>+		linux-2.6.12-vanilla $MYSRC &gt; /tmp/patch</div><div class='add'>+</div><div class='add'>+dontdiff ファイルには Linux カーネルのビルドプロセスの過程で生成された</div><div class='add'>+ファイルの一覧がのっています。そして、それらはパッチを生成する diff(1)</div><div class='add'>+コマンドで無視されるべきです。dontdiff ファイルは 2.6.12 以後のバージョ</div><div class='add'>+ンの Linux カーネルソースツリーに含まれています。それより前のバージョン</div><div class='add'>+の Linux カーネルソースツリーに対する dontdiff ファイルは、</div><div class='add'>+&lt;http://www.xenotime.net/linux/doc/dontdiff&gt;から取得することができます。</div><div class='add'>+</div><div class='add'>+投稿するパッチの中に関係のない余分なファイルが含まれていないことを確</div><div class='add'>+認してください。diff(1) コマンドで生成したパッチがあなたの意図したとお</div><div class='add'>+りのものであることを確認してください。</div><div class='add'>+</div><div class='add'>+もしあなたのパッチが多くの差分を生み出すのであれば、あなたはパッチ</div><div class='add'>+を意味のあるひとまとまりごとに分けたいと思うかもしれません。</div><div class='add'>+これは他のカーネル開発者にとってレビューしやすくなるので、あなたの</div><div class='add'>+パッチを受け入れてもらうためにはとても重要なことです。これを補助でき</div><div class='add'>+る多くのスクリプトがあります。</div><div class='add'>+</div><div class='add'>+Quilt:</div><div class='add'>+http://savannah.nongnu.org/projects/quilt</div><div class='add'>+</div><div class='add'>+2) パッチに対する説明</div><div class='add'>+</div><div class='add'>+パッチの中の変更点に対する技術的な詳細について説明してください。</div><div class='add'>+</div><div class='add'>+説明はできる限り具体的に。もっとも悪い説明は「ドライバー X を更新」、</div><div class='add'>+「ドライバー X に対するバグフィックス」あるいは「このパッチはサブシス</div><div class='add'>+テム X に対する更新を含んでいます。どうか取り入れてください。」などです。</div><div class='add'>+</div><div class='add'>+パッチの説明を Linux カーネルのソースコードマネジメントシステム「 git 」の</div><div class='add'>+コミットログとして簡単に引用できる形で書けば、メンテナから感謝されるでしょう。</div><div class='add'>+以下の #15 を見てください。</div><div class='add'>+</div><div class='add'>+説明が長くなりだしたのであれば、おそらくそれはパッチを分ける必要がある</div><div class='add'>+という兆候です。次の #3 を見てください。</div><div class='add'>+</div><div class='add'>+パッチ(シリーズ)を(再)投稿する時、十分なパッチの説明とそのパッチが必要な理由を</div><div class='add'>+パッチに含めてください。ただ「これはパッチ(シリーズ)のバージョン N」とだけ</div><div class='add'>+書かないでください。そして、パッチをマージする人にパッチの説明を探させそれを</div><div class='add'>+パッチに追記させるため、過去のバージョンのパッチやそのパッチの URL を参照する</div><div class='add'>+手間をかけさせないでください。</div><div class='add'>+つまり、パッチシリーズとその説明は一緒にあるべきです。これはパッチをマージする</div><div class='add'>+人、レビューする人、どちらのためにもなります。レビューする人の中には、おそらく</div><div class='add'>+過去のバージョンのパッチを受け取ってもいない人がいます。</div><div class='add'>+</div><div class='add'>+登録済みのバグエントリを修正するパッチであれば、そのバグエントリを示すバグ ID</div><div class='add'>+や URL を明記してください。</div><div class='add'>+</div><div class='add'>+3) パッチの分割</div><div class='add'>+</div><div class='add'>+意味のあるひとまとまりごとに変更を個々のパッチファイルに分けてください。</div><div class='add'>+</div><div class='add'>+例えば、もし1つのドライバーに対するバグフィックスとパフォーマンス強</div><div class='add'>+化の両方の変更を含んでいるのであれば、その変更を2つ以上のパッチに分</div><div class='add'>+けてください。もし変更箇所に API の更新と、その新しい API を使う新たな</div><div class='add'>+ドライバーが含まれているなら、2つのパッチに分けてください。</div><div class='add'>+</div><div class='add'>+一方で、もしあなたが多数のファイルに対して意味的に同じ1つの変更を加え</div><div class='add'>+るのであれば、その変更を1つのパッチにまとめてください。言いかえると、</div><div class='add'>+意味的に同じ1つの変更は1つのパッチの中に含まれます。</div><div class='add'>+</div><div class='add'>+あるパッチが変更を完結させるために他のパッチに依存していたとしても、</div><div class='add'>+それは問題ありません。パッチの説明の中で「このパッチはパッチ X に依存</div><div class='add'>+している」と簡単に注意書きをつけてください。</div><div class='add'>+</div><div class='add'>+もしパッチをより小さなパッチの集合に凝縮することができないなら、まずは</div><div class='add'>+15かそこらのパッチを送り、そのレビューと統合を待って下さい。</div><div class='add'>+</div><div class='add'>+4) パッチのスタイルチェック</div><div class='add'>+</div><div class='add'>+あなたのパッチが基本的な( Linux カーネルの)コーディングスタイルに違反し</div><div class='add'>+ていないかをチェックして下さい。その詳細を Documentation/process/coding-style.rst で</div><div class='add'>+見つけることができます。コーディングスタイルの違反はレビューする人の</div><div class='add'>+時間を無駄にするだけなので、恐らくあなたのパッチは読まれることすらなく</div><div class='add'>+拒否されるでしょう。</div><div class='add'>+</div><div class='add'>+あなたはパッチを投稿する前に最低限パッチスタイルチェッカー</div><div class='add'>+( scripts/checkpatch.pl )を利用してパッチをチェックすべきです。</div><div class='add'>+もしパッチに違反がのこっているならば、それらの全てについてあなたは正当な</div><div class='add'>+理由を示せるようにしておく必要があります。</div><div class='add'>+</div><div class='add'>+5) 電子メールの宛先の選び方</div><div class='add'>+</div><div class='add'>+MAINTAINERS ファイルとソースコードに目を通してください。そして、その変</div><div class='add'>+更がメンテナのいる特定のサブシステムに加えられるものであることが分か</div><div class='add'>+れば、その人に電子メールを送ってください。</div><div class='add'>+</div><div class='add'>+もし、メンテナが載っていなかったり、メンテナからの応答がないなら、</div><div class='add'>+LKML ( linux-kernel@vger.kernel.org )へパッチを送ってください。ほとんど</div><div class='add'>+のカーネル開発者はこのメーリングリストに目を通しており、変更に対して</div><div class='add'>+コメントを得ることができます。</div><div class='add'>+</div><div class='add'>+15個より多くのパッチを同時に vger.kernel.org のメーリングリストへ送らな</div><div class='add'>+いでください!!!</div><div class='add'>+</div><div class='add'>+Linus Torvalds は Linux カーネルに入る全ての変更に対する最終的な意思決定者</div><div class='add'>+です。電子メールアドレスは torvalds@linux-foundation.org になります。彼は</div><div class='add'>+多くの電子メールを受け取っているため、できる限り彼に電子メールを送るのは</div><div class='add'>+避けるべきです。</div><div class='add'>+</div><div class='add'>+バグフィックスであったり、自明な変更であったり、話し合いをほとんど</div><div class='add'>+必要としないパッチは Linus へ電子メールを送るか CC しなければなりません。</div><div class='add'>+話し合いを必要としたり、明確なアドバンテージがないパッチは、通常まず</div><div class='add'>+は LKML へ送られるべきです。パッチが議論された後にだけ、そのパッチを</div><div class='add'>+Linus へ送るべきです。</div><div class='add'>+</div><div class='add'>+6) CC (カーボンコピー)先の選び方</div><div class='add'>+</div><div class='add'>+特に理由がないなら、LKML にも CC してください。</div><div class='add'>+</div><div class='add'>+Linus 以外のカーネル開発者は変更に気づく必要があり、その結果、彼らはそ</div><div class='add'>+の変更に対してコメントをくれたり、コードに対してレビューや提案をくれ</div><div class='add'>+るかもしれません。LKML とは Linux カーネル開発者にとって一番中心的なメー</div><div class='add'>+リングリストです。USB やフレームバッファデバイスや VFS や SCSI サブシステ</div><div class='add'>+ムなどの特定のサブシステムに関するメーリングリストもあります。あなた</div><div class='add'>+の変更に、はっきりと関連のあるメーリングリストについて知りたければ</div><div class='add'>+MAINTAINERS ファイルを参照してください。</div><div class='add'>+</div><div class='add'>+VGER.KERNEL.ORG でホスティングされているメーリングリストの一覧が下記の</div><div class='add'>+サイトに載っています。</div><div class='add'>+&lt;http://vger.kernel.org/vger-lists.html&gt;</div><div class='add'>+</div><div class='add'>+もし、変更がユーザランドのカーネルインタフェースに影響を与え</div><div class='add'>+るのであれば、MAN-PAGES のメンテナ( MAINTAINERS ファイルに一覧</div><div class='add'>+があります)に man ページのパッチを送ってください。少なくとも</div><div class='add'>+情報がマニュアルページの中に入ってくるように、変更が起きたという</div><div class='add'>+通知を送ってください。</div><div class='add'>+</div><div class='add'>+たとえ、メンテナが #5 で反応がなかったとしても、メンテナのコードに変更を</div><div class='add'>+加えたときには、いつもメンテナに CC するのを忘れないようにしてください。</div><div class='add'>+</div><div class='add'>+小さなパッチであれば、Trivial Patch Monkey(ちょっとしたパッチを集めている)</div><div class='add'>+&lt;trivial@kernel.org&gt;に CC してもいいです。その現管理者については MAINTAINERS</div><div class='add'>+ファイルを見てください。ちょっとしたパッチとは以下のルールのどれか1つを満たして</div><div class='add'>+いなければなりません。</div><div class='add'>+ ・ドキュメントのスペルミスの修正</div><div class='add'>+ ・grep(1) コマンドによる検索を困難にしているスペルの修正</div><div class='add'>+ ・コンパイル時の警告の修正(無駄な警告が散乱することは好ましくないた</div><div class='add'>+   めです)</div><div class='add'>+ ・コンパイル問題の修正(それらの修正が本当に正しい場合に限る)</div><div class='add'>+ ・実行時の問題の修正(それらの修正が本当に問題を修正している場合に限る)</div><div class='add'>+ ・廃止予定の関数やマクロを使用しているコードの除去(例 check_region )</div><div class='add'>+ ・問い合わせ先やドキュメントの修正</div><div class='add'>+ ・移植性のないコードから移植性のあるコードへの置き換え(小さい範囲で</div><div class='add'>+   あればアーキテクチャ特有のことでも他の人がコピーできます)</div><div class='add'>+ ・作者やメンテナによる修正(すなわち patch monkey の再転送モード)</div><div class='add'>+</div><div class='add'>+7) MIME やリンクや圧縮ファイルや添付ファイルではなくプレインテキストのみ</div><div class='add'>+</div><div class='add'>+Linus や他のカーネル開発者はあなたが投稿した変更を読んで、コメントでき</div><div class='add'>+る必要があります。カーネル開発者にとって、あなたが書いたコードの特定の</div><div class='add'>+部分にコメントをするために、標準的な電子メールクライアントで変更が引用</div><div class='add'>+できることは重要です。</div><div class='add'>+</div><div class='add'>+上記の理由で、すべてのパッチは文中に含める形式の電子メールで投稿さ</div><div class='add'>+れるべきです。警告：あなたがパッチをコピー&amp;ペーストする際には、パッ</div><div class='add'>+チを改悪するエディターの折り返し機能に注意してください。</div><div class='add'>+</div><div class='add'>+パッチを圧縮の有無に関わらず MIME 形式で添付しないでください。多くのポ</div><div class='add'>+ピュラーな電子メールクライアントは MIME 形式の添付ファイルをプレーンテ</div><div class='add'>+キストとして送信するとは限らないでしょう。そうなると、電子メールクラ</div><div class='add'>+イアントがコードに対するコメントを付けることをできなくします。また、</div><div class='add'>+MIME 形式の添付ファイルは Linus に手間を取らせることになり、その変更を</div><div class='add'>+受け入れてもらう可能性が低くなってしまいます。</div><div class='add'>+</div><div class='add'>+例外：お使いの電子メールクライアントがパッチをめちゃくちゃにするので</div><div class='add'>+あれば、誰かが MIME 形式のパッチを再送するよう求めるかもしれません。</div><div class='add'>+</div><div class='add'>+余計な変更を加えずにあなたのパッチを送信するための電子メールクライアントの設定</div><div class='add'>+のヒントについては Documentation/process/email-clients.rst を参照してください。</div><div class='add'>+</div><div class='add'>+8) 電子メールのサイズ</div><div class='add'>+</div><div class='add'>+パッチを Linus へ送るときは常に #7 の手順に従ってください。</div><div class='add'>+</div><div class='add'>+大きなパッチはメーリングリストやメンテナにとって不親切です。パッチが</div><div class='add'>+未圧縮で 300KB を超えるようであるなら、インターネット上のアクセス可能な</div><div class='add'>+サーバに保存し、保存場所を示す URL を伝えるほうが適切です。</div><div class='add'>+</div><div class='add'>+9) カーネルバージョンの明記</div><div class='add'>+</div><div class='add'>+パッチが対象とするカーネルのバージョンをパッチの概要か電子メールの</div><div class='add'>+サブジェクトに付けることが重要です。</div><div class='add'>+</div><div class='add'>+パッチが最新バージョンのカーネルに正しく適用できなければ、Linus は</div><div class='add'>+そのパッチを採用しないでしょう。</div><div class='add'>+</div><div class='add'>+10) がっかりせず再投稿</div><div class='add'>+</div><div class='add'>+パッチを投稿した後は、辛抱強く待っていてください。Linus があなたのパッ</div><div class='add'>+チを気に入って採用すれば、Linus がリリースする次のバージョンのカーネル</div><div class='add'>+の中で姿を見せるでしょう。</div><div class='add'>+</div><div class='add'>+しかし、パッチが次のバージョンのカーネルに入っていないなら、いくつもの</div><div class='add'>+理由があるのでしょう。その原因を絞り込み、間違っているものを正し、更新</div><div class='add'>+したパッチを投稿するのはあなたの仕事です。</div><div class='add'>+</div><div class='add'>+Linus があなたのパッチに対して何のコメントもなく不採用にすることは極め</div><div class='add'>+て普通のことです。それは自然な姿です。もし、Linus があなたのパッチを受</div><div class='add'>+け取っていないのであれば、以下の理由が考えられます。</div><div class='add'>+* パッチが最新バージョンの Linux カーネルにきちんと適用できなかった</div><div class='add'>+* パッチが LKML で十分に議論されていなかった</div><div class='add'>+* スタイルの問題(セクション2を参照)</div><div class='add'>+* 電子メールフォーマットの問題(このセクションを参照)</div><div class='add'>+* パッチに対する技術的な問題</div><div class='add'>+* Linus はたくさんの電子メールを受け取っているので、どさくさに紛れて見</div><div class='add'>+  失った</div><div class='add'>+* 不愉快にさせている</div><div class='add'>+</div><div class='add'>+判断できない場合は、LKML にコメントを頼んでください。</div><div class='add'>+</div><div class='add'>+11) サブジェクトに「 PATCH 」</div><div class='add'>+</div><div class='add'>+Linus や LKML への大量の電子メールのために、サブジェクトのプレフィックスに</div><div class='add'>+「 [PATCH] 」を付けることが慣習となっています。これによって Linus や他の</div><div class='add'>+カーネル開発者がパッチであるのか、又は、他の議論に関する電子メールであるの</div><div class='add'>+かをより簡単に識別できます。</div><div class='add'>+</div><div class='add'>+12) パッチへの署名</div><div class='add'>+</div><div class='add'>+誰が何をしたのかを追いかけやすくするために (特に、パッチが何人かの</div><div class='add'>+メンテナを経て最終的に Linux カーネルに取り込まれる場合のために)、電子</div><div class='add'>+メールでやり取りされるパッチに対して「 sign-off 」という手続きを導入し</div><div class='add'>+ました。</div><div class='add'>+</div><div class='add'>+「 sign-off 」とは、パッチがあなたの書いたものであるか、あるいは、</div><div class='add'>+あなたがそのパッチをオープンソースとして提供する権利を保持している、</div><div class='add'>+という証明をパッチの説明の末尾に一行記載するというものです。</div><div class='add'>+ルールはとても単純です。以下の項目を確認して下さい。</div><div class='add'>+</div><div class='add'>+        原作者の証明書( DCO ) 1.1</div><div class='add'>+</div><div class='add'>+        このプロジェクトに寄与するものとして、以下のことを証明する。</div><div class='add'>+</div><div class='add'>+        (a) 本寄与は私が全体又は一部作成したものであり、私がそのファイ</div><div class='add'>+            ル中に明示されたオープンソースライセンスの下で公開する権利</div><div class='add'>+            を持っている。もしくは、</div><div class='add'>+</div><div class='add'>+        (b) 本寄与は、私が知る限り、適切なオープンソースライセンスでカバ</div><div class='add'>+            ーされている既存の作品を元にしている。同時に、私はそのライセ</div><div class='add'>+            ンスの下で、私が全体又は一部作成した修正物を、ファイル中で示</div><div class='add'>+            される同一のオープンソースライセンスで(異なるライセンスの下で</div><div class='add'>+            投稿することが許可されている場合を除いて)投稿する権利を持って</div><div class='add'>+            いる。もしくは、</div><div class='add'>+</div><div class='add'>+        (c) 本寄与は(a)、(b)、(c)を証明する第3者から私へ直接提供された</div><div class='add'>+            ものであり、私はそれに変更を加えていない。</div><div class='add'>+</div><div class='add'>+        (d) 私はこのプロジェクトと本寄与が公のものであることに理解及び同意す</div><div class='add'>+            る。同時に、関与した記録(投稿の際の全ての個人情報と sign-off を</div><div class='add'>+            含む)が無期限に保全されることと、当該プロジェクト又は関連する</div><div class='add'>+            オープンソースライセンスに沿った形で再配布されることに理解及び</div><div class='add'>+            同意する。</div><div class='add'>+</div><div class='add'>+もしこれに同意できるなら、以下のような1行を追加してください。</div><div class='add'>+</div><div class='add'>+	Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='add'>+</div><div class='add'>+実名を使ってください。(残念ですが、偽名や匿名による寄与はできません。)</div><div class='add'>+</div><div class='add'>+人によっては sign-off の近くに追加のタグを付加しています。それらは今のところ</div><div class='add'>+無視されますが、あなたはそのタグを社内の手続きに利用したり、sign-off に特別</div><div class='add'>+な情報を示したりすることができます。</div><div class='add'>+</div><div class='add'>+あなたがサブシステムまたはブランチのメンテナであれば、受け取ったパッチを自身の</div><div class='add'>+ツリーにマージするために、わずかに変更が必要となる場合があります。なぜなら</div><div class='add'>+あなたのツリーの中のコードと投稿者のツリーの中のコードは同一ではないためです。</div><div class='add'>+もし、あなたが厳密に上記ルール(c)にこだわるのであれば、投稿者に再度差分を</div><div class='add'>+とるよう依頼すべきです。しかし、これは時間とエネルギーを非生産的に浪費する</div><div class='add'>+ことになります。ルール(b)はあなたにコードを修正する権利を与えてくれます。</div><div class='add'>+しかし、投稿者のコードを修正し、その修正によるバグを投稿者に押し付けてしまう</div><div class='add'>+ことはとても失礼なことです。この問題を解決するために、末尾の投稿者の</div><div class='add'>+Signed-off-by とあなたがその末尾に追加する Signed-off-by の間に、修正を</div><div class='add'>+加えたことを示す1行を追加することが推奨されています。</div><div class='add'>+(その1行の書き方に)決まりはありませんが、大括弧の中に電子メールアドレスや氏名</div><div class='add'>+と修正内容を記載するやり方は目につきやすく、最終段階での変更の責任があなたに</div><div class='add'>+あることを明確にするのに十分な方法のようです。例えば、</div><div class='add'>+</div><div class='add'>+	Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='add'>+	[lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]</div><div class='add'>+	Signed-off-by: Lucky K Maintainer &lt;lucky@maintainer.example.org&gt;</div><div class='add'>+</div><div class='add'>+あなたが安定版のブランチを管理しており、作成者のクレジット、変更の追跡、</div><div class='add'>+修正のマージ、と同時に苦情からの投稿者の保護を行いたい場合、この慣習は特に</div><div class='add'>+有用となります。いかなる事情があってもチェンジログに出てくる作成者の</div><div class='add'>+アイデンティティ情報(From ヘッダ)は変更できないことに注意してください。</div><div class='add'>+</div><div class='add'>+バックポートする人のための特別な注意事項。追跡を容易に行うために、コミット</div><div class='add'>+メッセージのトップ(サブジェクト行のすぐ後)にパッチの起源を示す情報を記述する</div><div class='add'>+ことは一般的で有用な慣習です。例えば、これは 2.6-stable ツリーでの一例です。    </div><div class='add'>+</div><div class='add'>+    Date:   Tue May 13 19:10:30 2008 +0000</div><div class='add'>+</div><div class='add'>+        SCSI: libiscsi regression in 2.6.25: fix nop timer handling</div><div class='add'>+</div><div class='add'>+        commit 4cf1043593db6a337f10e006c23c69e5fc93e722 upstream</div><div class='add'>+</div><div class='add'>+そして、これは 2.4 ツリーでの一例です。</div><div class='add'>+</div><div class='add'>+    Date:   Tue May 13 22:12:27 2008 +0200</div><div class='add'>+</div><div class='add'>+        wireless, airo: waitbusy() won't delay</div><div class='add'>+</div><div class='add'>+        [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]</div><div class='add'>+</div><div class='add'>+どんな形式であれ、この情報はあなたのツリーを追跡する人やあなたのツリーのバグを</div><div class='add'>+解決しようとしている人にとって価値のある支援となります。</div><div class='add'>+</div><div class='add'>+13) いつ Acked-by: と Cc: を使うのか</div><div class='add'>+</div><div class='add'>+「 Signed-off-by: 」タグはその署名者がパッチの開発に関わっていたことやパッチ</div><div class='add'>+の伝播パスにいたことを示しています。</div><div class='add'>+</div><div class='add'>+ある人が直接パッチの準備や作成に関わっていないけれど、その人のパッチに対す</div><div class='add'>+る承認を記録し、示したいとします。その場合、その人を示すのに Acked-by: が使</div><div class='add'>+えます。Acked-by: はパッチのチェンジログにも追加されます。</div><div class='add'>+</div><div class='add'>+パッチの影響を受けるコードのメンテナがパッチに関わっていなかったり、パッチ</div><div class='add'>+の伝播パスにいなかった時にも、メンテナは Acked-by: をしばしば利用します。</div><div class='add'>+</div><div class='add'>+Acked-by: は Signed-off-by: のように公式なタグではありません。それはメンテナが</div><div class='add'>+少なくともパッチをレビューし、同意を示しているという記録です。そのような</div><div class='add'>+ことからパッチをマージする人がメンテナの「うん、良いと思うよ」という発言を</div><div class='add'>+Acked-by: へ置き換えることがあります。</div><div class='add'>+</div><div class='add'>+Acked-by: が必ずしもパッチ全体の承認を示しているわけではありません。例えば、</div><div class='add'>+あるパッチが複数のサブシステムへ影響を与えており、その中の1つのサブシステム</div><div class='add'>+のメンテナからの Acked-by: を持っているとします。その場合、Acked-by: は通常</div><div class='add'>+そのメンテナのコードに影響を与える一部分だけに対する承認を示しています。</div><div class='add'>+この点は、ご自分で判断してください。(その Acked-by: が)疑わしい場合は、</div><div class='add'>+メーリングリストアーカイブの中の大元の議論を参照すべきです。</div><div class='add'>+</div><div class='add'>+パッチにコメントする機会を持っていたが、その時にコメントしなかった人がいれば、</div><div class='add'>+その人を指す「Cc:」タグを任意で追加してもかまいません。これは指定された人からの</div><div class='add'>+明確なアクションなしに付与できる唯一のタグです。</div><div class='add'>+このタグはパッチに関心があると思われる人達がそのパッチの議論に含まれていたこと</div><div class='add'>+を明文化します。</div><div class='add'>+</div><div class='add'>+14) Reported-by と Tested-by: と Reviewed-by: の利用</div><div class='add'>+</div><div class='add'>+他の誰かによって報告された問題を修正するパッチであれば、問題報告者という寄与を</div><div class='add'>+クレジットするために、Reported-by: タグを追加することを検討してください。</div><div class='add'>+こまめにバグ報告者をクレジットしていくことで、うまくいけばその人たちが将来再び</div><div class='add'>+コミュニティの力となってくれるでしょう。</div><div class='add'>+ただし、報告者の許可無くこのタグを追加しないように注意してください。特に、</div><div class='add'>+問題が公の場で報告されていなかったのであれば。</div><div class='add'>+</div><div class='add'>+Tested-by: タグはタグで指定された人によって(ある環境下で)パッチのテストに成功</div><div class='add'>+していることを示します。このタグはメンテナにテストが実施済みであることを</div><div class='add'>+知らせ、将来の関連パッチのテスト協力者を見つける方法を提供し、テスト実施者に</div><div class='add'>+対するクレジットを保証します。</div><div class='add'>+</div><div class='add'>+Reviewed-by: タグは、それとは異なり、下記のレビューア宣言の下にレビューされ、</div><div class='add'>+受け入れ可能とみなされたパッチであることを示します。</div><div class='add'>+</div><div class='add'>+        レビューアによる監督宣言</div><div class='add'>+</div><div class='add'>+        私は Reviewed-by: タグを提示することによって、以下のことを明言する。</div><div class='add'>+</div><div class='add'>+        (a) 私はメインラインカーネルへの統合に向け、その妥当性及び「即応性</div><div class='add'>+            (訳注)」を検証し、技術的側面からパッチをレビュー済みである。</div><div class='add'>+</div><div class='add'>+        訳注:</div><div class='add'>+        「即応性」の原文は "readiness"。</div><div class='add'>+        パッチが十分な品質を持っており、メインラインカーネルへの統合を即座に</div><div class='add'>+        行うことができる状態であるかどうかを "readiness" という単語で表現</div><div class='add'>+        している。</div><div class='add'>+</div><div class='add'>+        (b) パッチに関するあらゆる問題、懸念、あるいは、疑問は投稿者へ伝達済み</div><div class='add'>+            である。私はそれらのコメントに対する投稿者の返答に満足している。</div><div class='add'>+</div><div class='add'>+        (c) 投稿に伴い改良されるコードがある一方で、現時点で、私は(1)それが</div><div class='add'>+            カーネルにとって価値のある変更であること、そして、(2)統合に際して</div><div class='add'>+            議論になり得るような問題はないものと確信している。</div><div class='add'>+</div><div class='add'>+        (d) 私はパッチをレビューし適切であると確信している一方で、あらゆる</div><div class='add'>+            状況においてその宣言した目的や機能が正しく実現することに関して、</div><div class='add'>+            いかなる保証もしない(特にどこかで明示しない限り)。</div><div class='add'>+</div><div class='add'>+Reviewd-by タグはそのパッチがカーネルに対して適切な修正であって、深刻な技術的</div><div class='add'>+問題を残していないという意見の宣言です。興味のあるレビューアは誰でも(レビュー</div><div class='add'>+作業を終えたら)パッチに対して Reviewed-by タグを提示できます。このタグは</div><div class='add'>+レビューアの寄与をクレジットする働き、レビューの進捗の度合いをメンテナに</div><div class='add'>+知らせる働きを持ちます。そのパッチの領域に詳しく、そして、しっかりとした</div><div class='add'>+レビューを実施したレビューアによって提供される時、Reviewed-by: タグがあなたの</div><div class='add'>+パッチをカーネルにマージする可能性を高めるでしょう。</div><div class='add'>+</div><div class='add'>+15) 標準的なパッチのフォーマット</div><div class='add'>+</div><div class='add'>+標準的なパッチのサブジェクトは以下のとおりです。</div><div class='add'>+</div><div class='add'>+    Subject: [PATCH 001/123] subsystem: summary phrase</div><div class='add'>+</div><div class='add'>+標準的なパッチの、電子メールのボディは以下の項目を含んでいます。</div><div class='add'>+</div><div class='add'>+  - パッチの作成者を明記する「 from 」行</div><div class='add'>+</div><div class='add'>+  - 空行</div><div class='add'>+</div><div class='add'>+  - 説明本体。これはこのパッチを説明するために無期限のチェンジログ</div><div class='add'>+    (変更履歴)にコピーされます。</div><div class='add'>+</div><div class='add'>+  - 上述した「 Signed-off-by: 」行。これも説明本体と同じくチェン</div><div class='add'>+    ジログ内にコピーされます。</div><div class='add'>+</div><div class='add'>+  - マーカー行は単純に「 --- 」です。</div><div class='add'>+</div><div class='add'>+  - 余計なコメントは、チェンジログには不適切です。</div><div class='add'>+</div><div class='add'>+  - 実際のパッチ(差分出力)</div><div class='add'>+</div><div class='add'>+サブジェクト行のフォーマットは、アルファベット順で電子メールをとても</div><div class='add'>+ソートしやすいものになっています。(ほとんどの電子メールクライアント</div><div class='add'>+はソートをサポートしています)パッチのサブジェクトの連番は0詰めであ</div><div class='add'>+るため、数字でのソートとアルファベットでのソートは同じ結果になります。</div><div class='add'>+</div><div class='add'>+電子メールのサブジェクト内のサブシステム表記は、パッチが適用される</div><div class='add'>+分野またはサブシステムを識別できるようにすべきです。</div><div class='add'>+</div><div class='add'>+電子メールのサブジェクトの「summary phrase」はそのパッチの概要を正確</div><div class='add'>+に表現しなければなりません。「summary phrase」をファイル名にしてはい</div><div class='add'>+けません。パッチシリーズ中でそれぞれのパッチは同じ「summary phrase」を</div><div class='add'>+使ってはいけません(「パッチシリーズ」とは順序付けられた関連のある複数の</div><div class='add'>+パッチ群です)。</div><div class='add'>+</div><div class='add'>+あなたの電子メールの「summary phrase」がそのパッチにとって世界で唯一の識別子に</div><div class='add'>+なるように心がけてください。「summary phrase」は git のチェンジログの中へ</div><div class='add'>+ずっと伝播していきます。「summary phrase」は、開発者が後でパッチを参照する</div><div class='add'>+ために議論の中で利用するかもしれません。</div><div class='add'>+人々はそのパッチに関連した議論を読むために「summary phrase」を使って google で</div><div class='add'>+検索したがるでしょう。それはまた2、3ヶ月あとで、人々が「gitk」や</div><div class='add'>+「git log --oneline」のようなツールを使用して何千ものパッチに目を通す時、</div><div class='add'>+唯一目にとまる情報となるでしょう。</div><div class='add'>+</div><div class='add'>+これらの理由のため、「summary phrase」はなぜパッチが必要であるか、パッチが何を</div><div class='add'>+変更するかの2つの情報をせいぜい70〜75文字で表現していなければなりません。</div><div class='add'>+「summary phrase」は簡潔であり説明的である表現を目指しつつ、うまく</div><div class='add'>+まとめられている概要となるべきです。</div><div class='add'>+</div><div class='add'>+「summary phrase」は「Subject: [PATCH tag] &lt;summary phrase&gt;」のように、</div><div class='add'>+大括弧で閉じられたタグを接頭辞として付加してもかまいません。このタグは</div><div class='add'>+「summary phrase」の一部とは考えませんが、パッチをどのように取り扱うべきかを</div><div class='add'>+表現します。</div><div class='add'>+一般的には「v1, v2, v3」のようなバージョン情報を表すタグ(過去のパッチに対する</div><div class='add'>+コメントを反映するために複数のバージョンのパッチが投稿されているのであれば)、</div><div class='add'>+「RFC」のようなコメントを要求するタグが挙げられます。パッチシリーズとして4つの</div><div class='add'>+パッチがあれば、個々のパッチに「1/4, 2/4, 3/4, 4/4」のように番号を付けても</div><div class='add'>+かまいません。これは開発者がパッチを適用する順番を確実に把握するためです。</div><div class='add'>+そして、開発者がパッチシリーズの中のすべてのパッチをもらさずレビュー或いは</div><div class='add'>+適用するのを保証するためです。</div><div class='add'>+</div><div class='add'>+サブジェクトの例を二つ</div><div class='add'>+</div><div class='add'>+    Subject: [patch 2/5] ext2: improve scalability of bitmap searching</div><div class='add'>+    Subject: [PATCHv2 001/207] x86: fix eflags tracking</div><div class='add'>+</div><div class='add'>+「 from 」行は電子メールのボディの一番最初の行でなければなりません。</div><div class='add'>+その形式は以下のとおりです。</div><div class='add'>+</div><div class='add'>+        From: Original Author &lt;author@example.com&gt;</div><div class='add'>+</div><div class='add'>+「 from 」行はチェンジログの中で、そのパッチの作成者としてクレジットされ</div><div class='add'>+ている人を特定するものです。「 from 」行がかけていると、電子メールのヘッ</div><div class='add'>+ダーの「 From: 」が、チェンジログの中でパッチの作成者を決定するために使わ</div><div class='add'>+れるでしょう。</div><div class='add'>+</div><div class='add'>+説明本体は無期限のソースのチェンジログにコミットされます。なので、説明</div><div class='add'>+本体はそのパッチに至った議論の詳細を忘れているある程度の技量を持っている人</div><div class='add'>+がその詳細を思い出すことができるものでなければなりません。パッチが対処する</div><div class='add'>+障害の症状(カーネルログメッセージや oops メッセージ等)を記載することは問題に</div><div class='add'>+対処可能なパッチを求めてコミットログを検索する人々にとって特に有用です。</div><div class='add'>+パッチがコンパイル問題を解決するのであれば、そのパッチを探している人が見つける</div><div class='add'>+ことができる情報だけで十分であり、コンパイル時の全てのエラーを含める必要は</div><div class='add'>+ありません。「summary phrase」と同様に、簡潔であり説明的であることが重要です。</div><div class='add'>+</div><div class='add'>+「 --- 」マーカー行はパッチ処理ツールに対して、チェンジログメッセージの終端</div><div class='add'>+部分を認識させるという重要な役目を果たします。</div><div class='add'>+</div><div class='add'>+「 --- 」マーカー行の後の追加コメントの良い使用方法の1つに diffstat コマンド</div><div class='add'>+があります。diffstat コマンドとは何のファイルが変更され、1ファイル当たり何行</div><div class='add'>+追加され何行消されたかを示すものです。diffstat コマンドは特に大きなパッチに</div><div class='add'>+おいて役立ちます。その時点でだけ又はメンテナにとってのみ関係のあるコメント</div><div class='add'>+は無期限に保存されるチェンジログにとって適切ではありません。そのため、この</div><div class='add'>+ようなコメントもマーカー行の後に書かれるべきです。</div><div class='add'>+このようなコメントの良い例として、v1 と v2 のバージョン間で何が変更されたかを</div><div class='add'>+表す「パッチの変更履歴」が挙げられます。</div><div class='add'>+</div><div class='add'>+「 --- 」マーカー行の後に diffstat コマンドの結果を含めるのであれば、ファイル</div><div class='add'>+名はカーネルソースツリーのトップディレクトリからの表記で列記されるため、横方向</div><div class='add'>+のスペースをとり過ぎないように、diffstat コマンドにオプション「 -p 1 -w 70 」</div><div class='add'>+を指定してください(インデントを含めてちょうど80列に合うでしょう)。</div><div class='add'>+</div><div class='add'>+適切なパッチのフォーマットの詳細についてはセクション3の参考文献を参照して</div><div class='add'>+ください。</div><div class='add'>+</div><div class='add'>+16) 「git pull」要求の送り方(Linus の電子メールから)</div><div class='add'>+</div><div class='add'>+間違ったブランチから引っ張るのを防ぐために、git リポジトリのアドレスと</div><div class='add'>+ブランチ名を同じ行に1行で記載してください。そうすることで、3回の連続クリック</div><div class='add'>+で全て選択できます。</div><div class='add'>+</div><div class='add'>+正しい形式は下記の通りです。</div><div class='add'>+</div><div class='add'>+	"Please pull from</div><div class='add'>+</div><div class='add'>+		git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus</div><div class='add'>+</div><div class='add'>+	 to get these changes:"</div><div class='add'>+</div><div class='add'>+その結果、アドレスを自分自身でタイピングして間違えることはなくなります(実際に、</div><div class='add'>+何度か間違ったブランチから引っ張ってきてしまい、その時に diffstat の結果を</div><div class='add'>+検証して間違っていることに気づいたことがあります。どこから何を引っ張るべきかを</div><div class='add'>+「探したり」、正しいブランチ名かどうかを重ねてチェックしたりする必要が</div><div class='add'>+なくなればより快適になるでしょう)。</div><div class='add'>+</div><div class='add'>+diffstat の結果を生成するために「 git diff -M --stat --summary 」を使って</div><div class='add'>+ください。-M オプションはファイル名の変更を検知でき、--summary オプションは</div><div class='add'>+新規ファイル、削除されたファイル、名前が変更されたファイルの概要を生成します。</div><div class='add'>+</div><div class='add'>+-M オプション(ファイル名の変更検知)を指定すると、diffstat の結果はかなり</div><div class='add'>+異なってきます。git は大規模な変更(追加と削除のペア)をファイル名の変更と</div><div class='add'>+判断するためです。</div><div class='add'>+</div><div class='add'>+------------------------------------</div><div class='add'>+セクション2 - ヒントとTIPSと小技</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+このセクションは Linux カーネルに変更を適用することに関係のある一般的な</div><div class='add'>+「お約束」の多くを載せています。物事には例外というものがあります。しか</div><div class='add'>+し例外を適用するには、本当に妥当な理由が不可欠です。あなたは恐らくこの</div><div class='add'>+セクションを Linus のコンピュータ・サイエンス101と呼ぶでしょう。</div><div class='add'>+</div><div class='add'>+1) Documentation/process/coding-style.rstを参照</div><div class='add'>+</div><div class='add'>+言うまでもなく、あなたのコードがこのコーディングスタイルからあまりに</div><div class='add'>+も逸脱していると、レビューやコメントなしに受け取ってもらえないかもし</div><div class='add'>+れません。</div><div class='add'>+</div><div class='add'>+特筆すべき例外は、コードをあるファイルから別のファイルに移動</div><div class='add'>+するときです。この場合、コードを移動するパッチでは、移動されるコード</div><div class='add'>+に関して移動以外の変更を一切加えるべきではありません。これにより、</div><div class='add'>+コードの移動とあなたが行ったコードの修正を明確に区別できるようにな</div><div class='add'>+ります。これは実際に何が変更されたかをレビューする際の大きな助けに</div><div class='add'>+なるとともに、ツールにコードの履歴を追跡させることも容易になります。</div><div class='add'>+</div><div class='add'>+投稿するより前にパッチのスタイルチェッカー( scripts/checkpatch.pl )で</div><div class='add'>+あなたのパッチをチェックしてください。このスタイルチェッカーは最終結</div><div class='add'>+論としてではなく、指標としてみるべきです。もし、あなたのコードが違反</div><div class='add'>+はしているが修正するより良く見えるのであれば、おそらくそのままにする</div><div class='add'>+のがベストです。</div><div class='add'>+</div><div class='add'>+スタイルチェッカーによる3段階のレポート:</div><div class='add'>+ - エラー: 間違っている可能性が高い</div><div class='add'>+ - 警告：注意してレビューする必要がある</div><div class='add'>+ - チェック：考慮する必要がある</div><div class='add'>+</div><div class='add'>+あなたはパッチに残っている全ての違反について、それがなぜ必要なのか正当な</div><div class='add'>+理由を示せるようにしておく必要があります。</div><div class='add'>+</div><div class='add'>+2) #ifdefは見苦しい</div><div class='add'>+</div><div class='add'>+ifdef が散乱したコードは、読むのもメンテナンスするのも面倒です。コードの中</div><div class='add'>+で ifdef を使わないでください。代わりに、ヘッダファイルの中に ifdef を入れて、</div><div class='add'>+条件付きで、コードの中で使われる関数を「 static inline 」関数かマクロで定義し</div><div class='add'>+てください。後はコンパイラが、何もしない箇所を最適化して取り去ってくれるで</div><div class='add'>+しょう。</div><div class='add'>+</div><div class='add'>+まずいコードの簡単な例</div><div class='add'>+</div><div class='add'>+	dev = alloc_etherdev (sizeof(struct funky_private));</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	#ifdef CONFIG_NET_FUNKINESS</div><div class='add'>+	init_funky_net(dev);</div><div class='add'>+	#endif</div><div class='add'>+</div><div class='add'>+クリーンアップしたコードの例</div><div class='add'>+</div><div class='add'>+(in header)</div><div class='add'>+	#ifndef CONFIG_NET_FUNKINESS</div><div class='add'>+	static inline void init_funky_net (struct net_device *d) {}</div><div class='add'>+	#endif</div><div class='add'>+</div><div class='add'>+(in the code itself)</div><div class='add'>+	dev = alloc_etherdev (sizeof(struct funky_private));</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	init_funky_net(dev);</div><div class='add'>+</div><div class='add'>+3) マクロより「 static inline 」を推奨</div><div class='add'>+</div><div class='add'>+「 static inline 」関数はマクロよりもずっと推奨されています。それらは、</div><div class='add'>+型安全性があり、長さにも制限が無く、フォーマットの制限もありません。</div><div class='add'>+gcc においては、マクロと同じくらい軽いです。</div><div class='add'>+</div><div class='add'>+マクロは「 static inline 」が明らかに不適切であると分かる場所(高速化パスの</div><div class='add'>+いくつかの特定のケース)や「 static inline 」関数を使うことができないような</div><div class='add'>+場所(マクロの引数の文字列連結のような)にだけ使われるべきです。</div><div class='add'>+</div><div class='add'>+「 static inline 」は「 static __inline__ 」や「 extern inline 」や</div><div class='add'>+「 extern __inline__ 」よりも適切です。</div><div class='add'>+</div><div class='add'>+4) 設計に凝りすぎるな</div><div class='add'>+</div><div class='add'>+それが有用になるかどうか分からないような不明瞭な将来を見越した設計</div><div class='add'>+をしないでください。「できる限り簡単に、そして、それ以上簡単になら</div><div class='add'>+ないような設計をしてください。」</div><div class='add'>+</div><div class='add'>+----------------------</div><div class='add'>+セクション3 参考文献</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+Andrew Morton, "The perfect patch" (tpp).</div><div class='add'>+  &lt;http://www.ozlabs.org/~akpm/stuff/tpp.txt&gt;</div><div class='add'>+</div><div class='add'>+Jeff Garzik, "Linux kernel patch submission format".</div><div class='add'>+  &lt;http://linux.yyz.us/patch-format.html&gt;</div><div class='add'>+</div><div class='add'>+Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".</div><div class='add'>+  &lt;http://www.kroah.com/log/2005/03/31/&gt;</div><div class='add'>+  &lt;http://www.kroah.com/log/2005/07/08/&gt;</div><div class='add'>+  &lt;http://www.kroah.com/log/2005/10/19/&gt;</div><div class='add'>+  &lt;http://www.kroah.com/log/2006/01/11/&gt;</div><div class='add'>+</div><div class='add'>+NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!</div><div class='add'>+  &lt;https://lkml.org/lkml/2005/7/11/336&gt;</div><div class='add'>+</div><div class='add'>+Kernel Documentation/process/coding-style.rst:</div><div class='add'>+  &lt;http://users.sosdg.org/~qiyong/lxr/source/Documentation/process/coding-style.rst&gt;</div><div class='add'>+</div><div class='add'>+Linus Torvalds's mail on the canonical patch format:</div><div class='add'>+  &lt;http://lkml.org/lkml/2005/4/7/183&gt;</div><div class='add'>+</div><div class='add'>+Andi Kleen, "On submitting kernel patches"</div><div class='add'>+  Some strategies to get difficult or controversial changes in.</div><div class='add'>+  http://halobates.de/on-submitting-patches.pdf</div><div class='add'>+</div><div class='add'>+--</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/translations/ja_JP/stable_api_nonsense.txt b/Documentation/translations/ja_JP/stable_api_nonsense.txt<br/>new file mode 100644<br/>index 000000000000..a3b40a4bdcfd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/ja_JP/stable_api_nonsense.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ja_JP/stable_api_nonsense.txt</a></div><div class='hunk'>@@ -0,0 +1,263 @@</div><div class='add'>+NOTE:</div><div class='add'>+This is a version of Documentation/process/stable-api-nonsense.rst into Japanese.</div><div class='add'>+This document is maintained by IKEDA, Munehiro &lt;m-ikeda@ds.jp.nec.com&gt;</div><div class='add'>+and the JF Project team &lt;http://www.linux.or.jp/JF/&gt;.</div><div class='add'>+If you find any difference between this document and the original file</div><div class='add'>+or a problem with the translation,</div><div class='add'>+please contact the maintainer of this file or JF project.</div><div class='add'>+</div><div class='add'>+Please also note that the purpose of this file is to be easier to read</div><div class='add'>+for non English (read: Japanese) speakers and is not intended as a</div><div class='add'>+fork. So if you have any comments or updates of this file, please try</div><div class='add'>+to update the original English file first.</div><div class='add'>+</div><div class='add'>+Last Updated: 2007/07/18</div><div class='add'>+==================================</div><div class='add'>+これは、</div><div class='add'>+linux-2.6.22-rc4/Documentation/process/stable-api-nonsense.rst の和訳</div><div class='add'>+です。</div><div class='add'>+翻訳団体： JF プロジェクト &lt; http://www.linux.or.jp/JF/ &gt;</div><div class='add'>+翻訳日 ： 2007/06/11</div><div class='add'>+原著作者: Greg Kroah-Hartman &lt; greg at kroah dot com &gt;</div><div class='add'>+翻訳者 ： 池田 宗広 &lt; m-ikeda at ds dot jp dot nec dot com &gt;</div><div class='add'>+校正者 ： Masanori Kobayashi さん &lt; zap03216 at nifty dot ne dot jp &gt;</div><div class='add'>+          Seiji Kaneko さん &lt; skaneko at a2 dot mbn dot or dot jp &gt;</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Linux カーネルのドライバインターフェース</div><div class='add'>+（あなたの質問すべてに対する回答とその他諸々）</div><div class='add'>+</div><div class='add'>+Greg Kroah-Hartman &lt;greg at kroah dot com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+この文書は、なぜ Linux ではバイナリカーネルインターフェースが定義</div><div class='add'>+されていないのか、またはなぜ不変のカーネルインターフェースを持たな</div><div class='add'>+いのか、ということを説明するために書かれた。ここでの話題は「カーネ</div><div class='add'>+ル内部の」インターフェースについてであり、ユーザー空間とのインター</div><div class='add'>+フェースではないことを理解してほしい。カーネルとユーザー空間とのイ</div><div class='add'>+ンターフェースとはアプリケーションプログラムが使用するものであり、</div><div class='add'>+つまりシステムコールのインターフェースがこれに当たる。これは今まで</div><div class='add'>+長きに渡り、かつ今後も「まさしく」不変である。私は確か 0.9 か何か</div><div class='add'>+より前のカーネルを使ってビルドした古いプログラムを持っているが、そ</div><div class='add'>+れは最新の 2.6 カーネルでもきちんと動作する。ユーザー空間とのイン</div><div class='add'>+ターフェースは、ユーザーとアプリケーションプログラマが不変性を信頼</div><div class='add'>+してよいものの一つである。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+要旨</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+あなたは不変のカーネルインターフェースが必要だと考えているかもしれ</div><div class='add'>+ないが、実際のところはそうではない。あなたは必要としているものが分</div><div class='add'>+かっていない。あなたが必要としているものは安定して動作するドライバ</div><div class='add'>+であり、それはドライバがメインのカーネルツリーに含まれる場合のみ得</div><div class='add'>+ることができる。ドライバがメインのカーネルツリーに含まれていると、</div><div class='add'>+他にも多くの良いことがある。それは、Linux をより強固で、安定な、成</div><div class='add'>+熟したオペレーティングシステムにすることができるということだ。これ</div><div class='add'>+こそ、そもそもあなたが Linux を使う理由のはずだ。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+はじめに</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+カーネル内部のインターフェース変更を心配しなければならないドライバ</div><div class='add'>+を書きたいなどというのは、変わり者だけだ。この世界のほとんどの人は、</div><div class='add'>+そのようなドライバがどんなインターフェースを使っているかなど知らな</div><div class='add'>+いし、そんなドライバのことなど全く気にもかけていない。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+まず初めに、クローズソースとか、ソースコードの隠蔽とか、バイナリの</div><div class='add'>+みが配布される使い物にならない代物[訳注(1)]とか、実体はバイナリ</div><div class='add'>+コードでそれを読み込むためのラッパー部分のみソースコードが公開され</div><div class='add'>+ているとか、その他用語は何であれ GPL の下にソースコードがリリース</div><div class='add'>+されていないカーネルドライバに関する法的な問題について、私は「いか</div><div class='add'>+なる議論も」行うつもりがない。法的な疑問があるのならば、プログラマ</div><div class='add'>+である私ではなく、弁護士に相談して欲しい。ここでは単に、技術的な問</div><div class='add'>+題について述べることにする。（法的な問題を軽視しているわけではない。</div><div class='add'>+それらは実際に存在するし、あなたはそれをいつも気にかけておく必要が</div><div class='add'>+ある）</div><div class='add'>+</div><div class='add'>+訳注(1)</div><div class='add'>+「使い物にならない代物」の原文は "blob"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+さてここでは、バイナリカーネルインターフェースについてと、ソースレ</div><div class='add'>+ベルでのインターフェースの不変性について、という二つの話題を取り上</div><div class='add'>+げる。この二つは互いに依存する関係にあるが、まずはバイナリインター</div><div class='add'>+フェースについて議論を行いやっつけてしまおう。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+バイナリカーネルインターフェース</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+もしソースレベルでのインターフェースが不変ならば、バイナリインター</div><div class='add'>+フェースも当然のように不変である、というのは正しいだろうか？正しく</div><div class='add'>+ない。Linux カーネルに関する以下の事実を考えてみてほしい。</div><div class='add'>+  - あなたが使用するＣコンパイラのバージョンによって、カーネル内部</div><div class='add'>+    の構造体の配置構造は異なったものになる。また、関数は異なった方</div><div class='add'>+    法でカーネルに含まれることになるかもしれない（例えばインライン</div><div class='add'>+    関数として扱われたり、扱われなかったりする）。個々の関数がどの</div><div class='add'>+    ようにコンパイルされるかはそれほど重要ではないが、構造体のパデ</div><div class='add'>+    ィングが異なるというのは非常に重要である。</div><div class='add'>+  - あなたがカーネルのビルドオプションをどのように設定するかによっ</div><div class='add'>+    て、カーネルには広い範囲で異なった事態が起こり得る。</div><div class='add'>+      - データ構造は異なるデータフィールドを持つかもしれない</div><div class='add'>+      - いくつかの関数は全く実装されていない状態になり得る</div><div class='add'>+        （例：SMP向けではないビルドでは、いくつかのロックは中身が</div><div class='add'>+          カラにコンパイルされる）</div><div class='add'>+      - カーネル内のメモリは、異なった方法で配置され得る。これはビ</div><div class='add'>+        ルドオプションに依存している。</div><div class='add'>+  - Linux は様々な異なるプロセッサアーキテクチャ上で動作する。</div><div class='add'>+    あるアーキテクチャ用のバイナリドライバを、他のアーキテクチャで</div><div class='add'>+    正常に動作させる方法はない。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ある特定のカーネル設定を使用し、カーネルをビルドしたのと正確に同じ</div><div class='add'>+Ｃコンパイラを使用して単にカーネルモジュールをコンパイルするだけで</div><div class='add'>+も、あなたはこれらいくつもの問題に直面することになる。ある特定の</div><div class='add'>+Linux ディストリビューションの、ある特定のリリースバージョン用にモ</div><div class='add'>+ジュールを提供しようと思っただけでも、これらの問題を引き起こすには</div><div class='add'>+十分である。にも関わらず Linux ディストリビューションの数と、サ</div><div class='add'>+ポートするディストリビューションのリリース数を掛け算し、それら一つ</div><div class='add'>+一つについてビルドを行ったとしたら、今度はリリースごとのビルドオプ</div><div class='add'>+ションの違いという悪夢にすぐさま悩まされることになる。また、ディス</div><div class='add'>+トリビューションの各リリースバージョンには、異なるハードウェア（プ</div><div class='add'>+ロセッサタイプや種々のオプション）に対応するため、何種類かのカーネ</div><div class='add'>+ルが含まれているということも理解して欲しい。従って、ある一つのリ</div><div class='add'>+リースバージョンだけのためにモジュールを作成する場合でも、あなたは</div><div class='add'>+何バージョンものモジュールを用意しなければならない。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+信じて欲しい。このような方法でサポートを続けようとするなら、あなた</div><div class='add'>+はいずれ正気を失うだろう。遠い昔、私はそれがいかに困難なことか、身</div><div class='add'>+をもって学んだのだ・・・</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+不変のカーネルソースレベルインターフェース</div><div class='add'>+------------------------------------------</div><div class='add'>+</div><div class='add'>+メインカーネルツリーに含まれていない Linux カーネルドライバを継続</div><div class='add'>+してサポートしていこうとしている人たちとの議論においては、これは極</div><div class='add'>+めて「引火性の高い」話題である。[訳注(2)]</div><div class='add'>+</div><div class='add'>+訳注(2)</div><div class='add'>+「引火性の高い」の原文は "volatile"。</div><div class='add'>+volatile には「揮発性の」「爆発しやすい」という意味の他、「変わり</div><div class='add'>+やすい」「移り気な」という意味がある。</div><div class='add'>+「（この話題は）爆発的に激しい論争を巻き起こしかねない」ということ</div><div class='add'>+を、「（カーネルのソースレベルインターフェースは）移ろい行くもので</div><div class='add'>+ある」ということを連想させる "volatile" という単語で表現している。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Linux カーネルの開発は継続的に速いペースで行われ、決して歩みを緩め</div><div class='add'>+ることがない。その中でカーネル開発者達は、現状のインターフェースに</div><div class='add'>+あるバグを見つけ、より良い方法を考え出す。彼らはやがて、現状のイン</div><div class='add'>+ターフェースがより正しく動作するように修正を行う。その過程で関数の</div><div class='add'>+名前は変更されるかもしれず、構造体は大きく、または小さくなるかもし</div><div class='add'>+れず、関数の引数は検討しなおされるかもしれない。そのような場合、引</div><div class='add'>+き続き全てが正常に動作するよう、カーネル内でこれらのインターフェー</div><div class='add'>+スを使用している個所も全て同時に修正される。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+具体的な例として、カーネル内の USB インターフェースを挙げる。USB</div><div class='add'>+サブシステムはこれまでに少なくとも３回の書き直しが行われ、その結果</div><div class='add'>+インターフェースが変更された。これらの書き直しはいくつかの異なった</div><div class='add'>+問題を修正するために行われた。</div><div class='add'>+  - 同期的データストリームが非同期に変更された。これにより多数のド</div><div class='add'>+    ライバを単純化でき、全てのドライバのスループットが向上した。今</div><div class='add'>+    やほとんど全ての USB デバイスは、考えられる最高の速度で動作し</div><div class='add'>+    ている。</div><div class='add'>+  - USB ドライバが USB サブシステムのコアから行う、データパケット</div><div class='add'>+    用のメモリ確保方法が変更された。これに伴い、いくつもの文書化さ</div><div class='add'>+    れたデッドロック条件を回避するため、全ての USB ドライバはより</div><div class='add'>+    多くの情報を USB コアに提供しなければならないようになっている。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+このできごとは、数多く存在するクローズソースのオペレーティングシス</div><div class='add'>+テムとは全く対照的だ。それらは長期に渡り古い USB インターフェース</div><div class='add'>+をメンテナンスしなければならない。古いインターフェースが残ることで、</div><div class='add'>+新たな開発者が偶然古いインターフェースを使い、正しくない方法で開発</div><div class='add'>+を行ってしまう可能性が生じる。これによりシステムの安定性は危険にさ</div><div class='add'>+らされることになる。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+上に挙げたどちらの例においても、開発者達はその変更が重要かつ必要で</div><div class='add'>+あることに合意し、比較的楽にそれを実行した。もし Linux がソースレ</div><div class='add'>+ベルでインターフェースの不変性を保証しなければならないとしたら、新</div><div class='add'>+しいインターフェースを作ると同時に、古い、問題のある方を今後ともメ</div><div class='add'>+ンテナンスするという余計な仕事を USB の開発者にさせなければならな</div><div class='add'>+い。Linux の USB 開発者は、自分の時間を使って仕事をしている。よっ</div><div class='add'>+て、価値のない余計な仕事を報酬もなしに実行しろと言うことはできない。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+セキュリティ問題も、Linux にとっては非常に重要である。ひとたびセキ</div><div class='add'>+ュリティに関する問題が発見されれば、それは極めて短期間のうちに修正</div><div class='add'>+される。セキュリティ問題の発生を防ぐための修正は、カーネルの内部イ</div><div class='add'>+ンターフェースの変更を何度も引き起こしてきた。その際同時に、変更さ</div><div class='add'>+れたインターフェースを使用する全てのドライバもまた変更された。これ</div><div class='add'>+により問題が解消し、将来偶然に問題が再発してしまわないことが保証さ</div><div class='add'>+れる。もし内部インターフェースの変更が許されないとしたら、このよう</div><div class='add'>+にセキュリティ問題を修正し、将来再発しないことを保証することなど不</div><div class='add'>+可能なのだ。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+カーネルのインターフェースは時が経つにつれクリーンナップを受ける。</div><div class='add'>+誰も使っていないインターフェースは削除される。これにより、可能な限</div><div class='add'>+りカーネルが小さく保たれ、現役の全てのインターフェースが可能な限り</div><div class='add'>+テストされることを保証しているのだ。（使われていないインターフェー</div><div class='add'>+スの妥当性をテストすることは不可能と言っていいだろう）</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+これから何をすべきか</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+では、もしメインのカーネルツリーに含まれない Linux カーネルドライ</div><div class='add'>+バがあったとして、あなたは、つまり開発者は何をするべきだろうか？全</div><div class='add'>+てのディストリビューションの全てのカーネルバージョン向けにバイナリ</div><div class='add'>+のドライバを供給することは悪夢であり、カーネルインターフェースの変</div><div class='add'>+更を追いかけ続けることもまた過酷な仕事だ。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+答えは簡単。そのドライバをメインのカーネルツリーに入れてしまえばよ</div><div class='add'>+い。（ここで言及しているのは、GPL に従って公開されるドライバのこと</div><div class='add'>+だということに注意してほしい。あなたのコードがそれに該当しないなら</div><div class='add'>+ば、さよなら。幸運を祈ります。ご自分で何とかしてください。Andrew</div><div class='add'>+と Linus からのコメント＜Andrew と Linus のコメントへのリンクをこ</div><div class='add'>+こに置く＞をどうぞ）ドライバがメインツリーに入れば、カーネルのイン</div><div class='add'>+ターフェースが変更された場合、変更を行った開発者によってドライバも</div><div class='add'>+修正されることになるだろう。あなたはほとんど労力を払うことなしに、</div><div class='add'>+常にビルド可能できちんと動作するドライバを手に入れることができる。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ドライバをメインのカーネルツリーに入れると、非常に好ましい以下の効</div><div class='add'>+果がある。</div><div class='add'>+  - ドライバの品質が向上する一方で、（元の開発者にとっての）メンテ</div><div class='add'>+    ナンスコストは下がる。</div><div class='add'>+  - あなたのドライバに他の開発者が機能を追加してくれる。</div><div class='add'>+  - 誰かがあなたのドライバにあるバグを見つけ、修正してくれる。</div><div class='add'>+  - 誰かがあなたのドライバにある改善点を見つけてくれる。</div><div class='add'>+  - 外部インターフェースが変更されドライバの更新が必要になった場合、</div><div class='add'>+    誰かがあなたの代わりに更新してくれる。</div><div class='add'>+  - ドライバを入れてくれとディストロに頼まなくても、そのドライバは</div><div class='add'>+    全ての Linux ディストリビューションに自動的に含まれてリリース</div><div class='add'>+    される。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Linux では、他のどのオペレーティングシステムよりも数多くのデバイス</div><div class='add'>+が「そのまま」使用できるようになった。また Linux は、どのオペレー</div><div class='add'>+ティングシステムよりも数多くのプロセッサアーキテクチャ上でそれらの</div><div class='add'>+デバイスを使用することができるようにもなった。このように、Linux の</div><div class='add'>+開発モデルは実証されており、今後も間違いなく正しい方向へと進んでい</div><div class='add'>+くだろう。:)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+------</div><div class='add'>+</div><div class='add'>+この文書の初期の草稿に対し、Randy Dunlap, Andrew Morton, David</div><div class='add'>+Brownell, Hanna Linder, Robert Love, Nishanth Aravamudan から査読</div><div class='add'>+と助言を頂きました。感謝申し上げます。</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/translations/ja_JP/stable_kernel_rules.txt b/Documentation/translations/ja_JP/stable_kernel_rules.txt<br/>new file mode 100644<br/>index 000000000000..f9249aecba64<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/ja_JP/stable_kernel_rules.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ja_JP/stable_kernel_rules.txt</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+NOTE:</div><div class='add'>+This is Japanese translated version of "Documentation/process/stable-kernel-rules.rst".</div><div class='add'>+This one is maintained by Tsugikazu Shibata &lt;tshibata@ab.jp.nec.com&gt;</div><div class='add'>+and JF Project team &lt;www.linux.or.jp/JF&gt;.</div><div class='add'>+If you find difference with original file or problem in translation,</div><div class='add'>+please contact maintainer of this file or JF project.</div><div class='add'>+</div><div class='add'>+Please also note that purpose of this file is easier to read for non</div><div class='add'>+English natives and do no intended to fork. So, if you have any</div><div class='add'>+comment or update of this file, please try to update Original(English)</div><div class='add'>+file at first.</div><div class='add'>+</div><div class='add'>+==================================</div><div class='add'>+これは、</div><div class='add'>+linux-2.6.29/Documentation/process/stable-kernel-rules.rst</div><div class='add'>+の和訳です。</div><div class='add'>+</div><div class='add'>+翻訳団体： JF プロジェクト &lt; http://www.linux.or.jp/JF/ &gt;</div><div class='add'>+翻訳日： 2009/1/14</div><div class='add'>+翻訳者： Tsugikazu Shibata &lt;tshibata at ab dot jp dot nec dot com&gt;</div><div class='add'>+校正者： 武井伸光さん、&lt;takei at webmasters dot gr dot jp&gt;</div><div class='add'>+         かねこさん (Seiji Kaneko) &lt;skaneko at a2 dot mbn dot or dot jp&gt;</div><div class='add'>+         小林 雅典さん (Masanori Kobayasi) &lt;zap03216 at nifty dot ne dot jp&gt;</div><div class='add'>+         野口さん (Kenji Noguchi) &lt;tokyo246 at gmail dot com&gt;</div><div class='add'>+         神宮信太郎さん &lt;jin at libjingu dot jp&gt;</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+ずっと知りたかった Linux 2.6 -stable リリースの全て</div><div class='add'>+</div><div class='add'>+"-stable" ツリーにどのような種類のパッチが受け入れられるか、どのような</div><div class='add'>+ものが受け入れられないか、についての規則-</div><div class='add'>+</div><div class='add'>+ - 明らかに正しく、テストされているものでなければならない。</div><div class='add'>+ - 文脈(変更行の前後)を含めて 100 行より大きくてはいけない。</div><div class='add'>+ - ただ一個のことだけを修正しているべき。</div><div class='add'>+ - 皆を悩ませている本物のバグを修正しなければならない。("これはバグで</div><div class='add'>+   あるかもしれないが..." のようなものではない)</div><div class='add'>+ - ビルドエラー(CONFIG_BROKENになっているものを除く), oops, ハング、デー</div><div class='add'>+   タ破壊、現実のセキュリティ問題、その他 "ああ、これはダメだね"という</div><div class='add'>+   ようなものを修正しなければならない。短く言えば、重大な問題。</div><div class='add'>+ - 新しい device ID とクオークも受け入れられる。</div><div class='add'>+ - どのように競合状態が発生するかの説明も一緒に書かれていない限り、</div><div class='add'>+   "理論的には競合状態になる"ようなものは不可。</div><div class='add'>+ - いかなる些細な修正も含めることはできない。(スペルの修正、空白のクリー</div><div class='add'>+   ンアップなど)</div><div class='add'>+ - Documentation/process/submitting-patches.rst の規則に従ったものでなければならない。</div><div class='add'>+ - パッチ自体か同等の修正が Linus のツリーに既に存在しなければならない。</div><div class='add'>+　 Linus のツリーでのコミットID を -stable へのパッチ投稿の際に引用す</div><div class='add'>+   ること。</div><div class='add'>+</div><div class='add'>+-stable ツリーにパッチを送付する手続き-</div><div class='add'>+</div><div class='add'>+ - 上記の規則に従っているかを確認した後に、stable@vger.kernel.org にパッチ</div><div class='add'>+   を送る。</div><div class='add'>+ - 送信者はパッチがキューに受け付けられた際には ACK を、却下された場合</div><div class='add'>+   には NAK を受け取る。この反応は開発者たちのスケジュールによって、数</div><div class='add'>+   日かかる場合がある。</div><div class='add'>+ - もし受け取られたら、パッチは他の開発者たちと関連するサブシステムの</div><div class='add'>+   メンテナーによるレビューのために -stable キューに追加される。</div><div class='add'>+ - パッチに stable@vger.kernel.org のアドレスが付加されているときには、それ</div><div class='add'>+   が Linus のツリーに入る時に自動的に stable チームに email される。</div><div class='add'>+ - セキュリティパッチはこのエイリアス (stable@vger.kernel.org) に送られるべ</div><div class='add'>+   きではなく、代わりに security@kernel.org のアドレスに送られる。</div><div class='add'>+</div><div class='add'>+レビューサイクル-</div><div class='add'>+</div><div class='add'>+ - -stable メンテナがレビューサイクルを決めるとき、パッチはレビュー委</div><div class='add'>+   員会とパッチが影響する領域のメンテナ(提供者がその領域のメンテナで無</div><div class='add'>+   い限り)に送られ、linux-kernel メーリングリストにCCされる。</div><div class='add'>+ - レビュー委員会は 48時間の間に ACK か NAK を出す。</div><div class='add'>+ - もしパッチが委員会のメンバから却下されるか、メンテナ達やメンバが気付</div><div class='add'>+   かなかった問題が持ちあがり、linux-kernel メンバがパッチに異議を唱え</div><div class='add'>+   た場合には、パッチはキューから削除される。</div><div class='add'>+ - レビューサイクルの最後に、ACK を受けたパッチは最新の -stable リリー</div><div class='add'>+   スに追加され、その後に新しい -stable リリースが行われる。</div><div class='add'>+ - セキュリティパッチは、通常のレビューサイクルを通らず、セキュリティ</div><div class='add'>+   カーネルチームから直接 -stable ツリーに受け付けられる。</div><div class='add'>+   この手続きの詳細については kernel security チームに問い合わせること。</div><div class='add'>+</div><div class='add'>+レビュー委員会-</div><div class='add'>+</div><div class='add'>+ - この委員会は、このタスクについて活動する多くのボランティアと、少数の</div><div class='add'>+   非ボランティアのカーネル開発者達で構成されている。</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/translations/ko_KR/howto.rst b/Documentation/translations/ko_KR/howto.rst<br/>new file mode 100644<br/>index 000000000000..2333697251dd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/ko_KR/howto.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ko_KR/howto.rst</a></div><div class='hunk'>@@ -0,0 +1,637 @@</div><div class='add'>+NOTE:</div><div class='add'>+This is a version of Documentation/process/howto.rst translated into korean</div><div class='add'>+This document is maintained by Minchan Kim &lt;minchan@kernel.org&gt;</div><div class='add'>+If you find any difference between this document and the original file or</div><div class='add'>+a problem with the translation, please contact the maintainer of this file.</div><div class='add'>+</div><div class='add'>+Please also note that the purpose of this file is to be easier to</div><div class='add'>+read for non English (read: korean) speakers and is not intended as</div><div class='add'>+a fork. So if you have any comments or updates for this file please</div><div class='add'>+try to update the original English file first.</div><div class='add'>+</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+이 문서는</div><div class='add'>+Documentation/process/howto.rst</div><div class='add'>+의 한글 번역입니다.</div><div class='add'>+</div><div class='add'>+역자： 김민찬 &lt;minchan@kernel.org&gt;</div><div class='add'>+감수： 이제이미 &lt;jamee.lee@samsung.com&gt;</div><div class='add'>+</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+어떻게 리눅스 커널 개발을 하는가</div><div class='add'>+================================</div><div class='add'>+</div><div class='add'>+이 문서는 커널 개발에 있어 가장 중요한 문서이다. 이 문서는</div><div class='add'>+리눅스 커널 개발자가 되는 법과 리눅스 커널 개발 커뮤니티와 일하는</div><div class='add'>+법을 담고있다. 커널 프로그래밍의 기술적인 측면과 관련된 내용들은</div><div class='add'>+포함하지 않으려고 하였지만 올바른 길로 여러분을 안내하는 데는 도움이</div><div class='add'>+될 것이다.</div><div class='add'>+</div><div class='add'>+이 문서에서 오래된 것을 발견하면 문서의 아래쪽에 나열된 메인테이너에게</div><div class='add'>+패치를 보내달라.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+소개</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+자, 여러분은 리눅스 커널 개발자가 되는 법을 배우고 싶은가? 아니면</div><div class='add'>+상사로부터"이 장치를 위한 리눅스 드라이버를 작성하시오"라는 말을</div><div class='add'>+들었는가? 이 문서의 목적은 여러분이 겪게 될 과정과 커뮤니티와 협력하는</div><div class='add'>+법을 조언하여 여러분의 목적을 달성하기 위해 필요한 것 모두를 알려주기</div><div class='add'>+위함이다.</div><div class='add'>+</div><div class='add'>+커널은 대부분은 C로 작성되어 있고 몇몇 아키텍쳐의 의존적인 부분은</div><div class='add'>+어셈블리로 작성되어 있다. 커널 개발을 위해 C를 잘 이해하고 있어야 한다.</div><div class='add'>+여러분이 특정 아키텍쳐의 low-level 개발을 할 것이 아니라면</div><div class='add'>+어셈블리(특정 아키텍쳐)는 잘 알아야 할 필요는 없다.</div><div class='add'>+다음의 참고서적들은 기본에 충실한 C 교육이나 수년간의 경험에 견주지는</div><div class='add'>+못하지만 적어도 참고 용도로는 좋을 것이다</div><div class='add'>+</div><div class='add'>+ - "The C Programming Language" by Kernighan and Ritchie [Prentice Hall]</div><div class='add'>+ - "Practical C Programming" by Steve Oualline [O'Reilly]</div><div class='add'>+ - "C:  A Reference Manual" by Harbison and Steele [Prentice Hall]</div><div class='add'>+</div><div class='add'>+커널은 GNU C와 GNU 툴체인을 사용하여 작성되었다. 이 툴들은 ISO C89 표준을</div><div class='add'>+따르는 반면 표준에 있지 않은 많은 확장기능도 가지고 있다. 커널은 표준 C</div><div class='add'>+라이브러리와는 관계없이 freestanding C 환경이어서 C 표준의 일부는</div><div class='add'>+지원되지 않는다. 임의의 long long 나누기나 floating point는 지원되지 않는다.</div><div class='add'>+때론 이런 이유로 커널이 그런 확장 기능을 가진 툴체인을 가지고 만들어졌다는</div><div class='add'>+것이 이해하기 어려울 수도 있고 게다가 불행하게도 그런 것을 정확하게 설명하는</div><div class='add'>+어떤 참고문서도 있지 않다. 정보를 얻기 위해서는 gcc info (`info gcc`)페이지를</div><div class='add'>+살펴보라.</div><div class='add'>+</div><div class='add'>+여러분은 기존의 개발 커뮤니티와 협력하는 법을 배우려고 하고 있다는 것을</div><div class='add'>+기억하라. 코딩, 스타일, 함수에 관한 훌륭한 표준을 가진 사람들이 모인</div><div class='add'>+다양한 그룹이 있다. 이 표준들은 오랜동안 크고 지역적으로 분산된 팀들에</div><div class='add'>+의해 가장 좋은 방법으로 일하기 위하여 찾은 것을 기초로 만들어져 왔다.</div><div class='add'>+그 표준들은 문서화가 잘 되어있기 때문에 가능한한 미리 많은 표준들에</div><div class='add'>+관하여 배우려고 시도하라. 다른 사람들은 여러분이나 여러분의 회사가</div><div class='add'>+일하는 방식에 적응하는 것을 원하지는 않는다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+법적 문제</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+리눅스 커널 소스 코드는 GPL로 배포(release)되었다. 소스트리의 메인</div><div class='add'>+디렉토리에 있는 라이센스에 관하여 상세하게 쓰여 있는 COPYING이라는</div><div class='add'>+파일을 봐라. 여러분이 라이센스에 관한 더 깊은 문제를 가지고 있다면</div><div class='add'>+리눅스 커널 메일링 리스트에 묻지말고 변호사와 연락하라. 메일링</div><div class='add'>+리스트들에 있는 사람들은 변호사가 아니기 때문에 법적 문제에 관하여</div><div class='add'>+그들의 말에 의지해서는 안된다.</div><div class='add'>+</div><div class='add'>+GPL에 관한 잦은 질문들과 답변들은 다음을 참조하라.</div><div class='add'>+</div><div class='add'>+    https://www.gnu.org/licenses/gpl-faq.html</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+문서</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+리눅스 커널 소스 트리는 커널 커뮤니티와 협력하는 법을 배우기위해 훌륭한</div><div class='add'>+다양한 문서들을 가지고 있다. 새로운 기능들이 커널에 들어가게 될 때,</div><div class='add'>+그 기능을 어떻게 사용하는지에 관한 설명을 위하여 새로운 문서 파일을</div><div class='add'>+추가하는 것을 권장한다. 커널이 유저스페이스로 노출하는 인터페이스를</div><div class='add'>+변경하게 되면 변경을 설명하는 메뉴얼 페이지들에 대한 패치나 정보를</div><div class='add'>+mtk.manpages@gmail.com의 메인테이너에게 보낼 것을 권장한다.</div><div class='add'>+</div><div class='add'>+다음은 커널 소스 트리에 있는 읽어야 할 파일들의 리스트이다.</div><div class='add'>+</div><div class='add'>+  README</div><div class='add'>+    이 파일은 리눅스 커널에 관하여 간단한 배경 설명과 커널을 설정하고</div><div class='add'>+    빌드하기 위해 필요한 것을 설명한다. 커널에 입문하는 사람들은 여기서</div><div class='add'>+    시작해야 한다.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/changes.rst &lt;changes&gt;`</div><div class='add'>+    이 파일은 커널을 성공적으로 빌드하고 실행시키기 위해 필요한 다양한</div><div class='add'>+    소프트웨어 패키지들의 최소 버젼을 나열한다.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/coding-style.rst &lt;codingstyle&gt;`</div><div class='add'>+    이 문서는 리눅스 커널 코딩 스타일과 그렇게 한 몇몇 이유를 설명한다.</div><div class='add'>+    모든 새로운 코드는 이 문서에 가이드라인들을 따라야 한다. 대부분의</div><div class='add'>+    메인테이너들은 이 규칙을 따르는 패치들만을 받아들일 것이고 많은 사람들이</div><div class='add'>+    그 패치가 올바른 스타일일 경우만 코드를 검토할 것이다.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/submitting-patches.rst &lt;submittingpatches&gt;` 와 :ref:`Documentation/process/submitting-drivers.rst &lt;submittingdrivers&gt;`</div><div class='add'>+    이 파일들은 성공적으로 패치를 만들고 보내는 법을 다음의 내용들로</div><div class='add'>+    굉장히 상세히 설명하고 있다(그러나 다음으로 한정되진 않는다).</div><div class='add'>+</div><div class='add'>+       - Email 내용들</div><div class='add'>+       - Email 양식</div><div class='add'>+       - 그것을 누구에게 보낼지</div><div class='add'>+</div><div class='add'>+    이러한 규칙들을 따르는 것이 성공(역자주: 패치가 받아들여 지는 것)을</div><div class='add'>+    보장하진 않는다(왜냐하면 모든 패치들은 내용과 스타일에 관하여</div><div class='add'>+    면밀히 검토되기 때문이다). 그러나 규칙을 따르지 않는다면 거의</div><div class='add'>+    성공하지도 못할 것이다.</div><div class='add'>+</div><div class='add'>+    올바른 패치들을 만드는 법에 관한 훌륭한 다른 문서들이 있다.</div><div class='add'>+</div><div class='add'>+    "The Perfect Patch"</div><div class='add'>+        https://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='add'>+</div><div class='add'>+    "Linux kernel patch submission format"</div><div class='add'>+        http://linux.yyz.us/patch-format.html</div><div class='add'>+</div><div class='add'>+   :ref:`Documentation/process/stable-api-nonsense.rst &lt;stable_api_nonsense&gt;`</div><div class='add'>+    이 문서는 의도적으로 커널이 불변하는 API를 갖지 않도록 결정한</div><div class='add'>+    이유를 설명하며 다음과 같은 것들을 포함한다.</div><div class='add'>+</div><div class='add'>+       - 서브시스템 shim-layer(호환성을 위해?)</div><div class='add'>+       - 운영체제들간의 드라이버 이식성</div><div class='add'>+       - 커널 소스 트리내에 빠른 변화를 늦추는 것(또는 빠른 변화를 막는 것)</div><div class='add'>+</div><div class='add'>+    이 문서는 리눅스 개발 철학을 이해하는데 필수적이며 다른 운영체제에서</div><div class='add'>+    리눅스로 전향하는 사람들에게는 매우 중요하다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/admin-guide/security-bugs.rst &lt;securitybugs&gt;`</div><div class='add'>+    여러분들이 리눅스 커널의 보안 문제를 발견했다고 생각한다면 이 문서에</div><div class='add'>+    나온 단계에 따라서 커널 개발자들에게 알리고 그 문제를 해결할 수 있도록</div><div class='add'>+    도와 달라.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/management-style.rst &lt;managementstyle&gt;`</div><div class='add'>+    이 문서는 리눅스 커널 메인테이너들이 그들의 방법론에 녹아 있는</div><div class='add'>+    정신을 어떻게 공유하고 운영하는지를 설명한다. 이것은 커널 개발에 입문하는</div><div class='add'>+    모든 사람들(또는 커널 개발에 작은 호기심이라도 있는 사람들)이</div><div class='add'>+    읽어야 할 중요한 문서이다. 왜냐하면 이 문서는 커널 메인테이너들의</div><div class='add'>+    독특한 행동에 관하여 흔히 있는 오해들과 혼란들을 해소하고 있기</div><div class='add'>+    때문이다.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/stable_kernel_rules.rst &lt;stable_kernel_rules&gt;`</div><div class='add'>+    이 문서는 안정적인 커널 배포가 이루어지는 규칙을 설명하고 있으며</div><div class='add'>+    여러분들이 이러한 배포들 중 하나에 변경을 하길 원한다면</div><div class='add'>+    무엇을 해야 하는지를 설명한다.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/kernel-docs.rst &lt;kernel_docs&gt;`</div><div class='add'>+    커널 개발에 관계된 외부 문서의 리스트이다. 커널 내의 포함된 문서들</div><div class='add'>+    중에 여러분이 찾고 싶은 문서를 발견하지 못할 경우 이 리스트를</div><div class='add'>+    살펴보라.</div><div class='add'>+</div><div class='add'>+  :ref:`Documentation/process/applying-patches.rst &lt;applying_patches&gt;`</div><div class='add'>+    패치가 무엇이며 그것을 커널의 다른 개발 브랜치들에 어떻게</div><div class='add'>+    적용하는지에 관하여 자세히 설명하고 있는 좋은 입문서이다.</div><div class='add'>+</div><div class='add'>+커널은 소스 코드 그 자체에서 또는 이것과 같은 ReStructuredText 마크업 (ReST) 을</div><div class='add'>+통해 자동적으로 만들어질 수 있는 많은 문서들을 가지고 있다. 이것은 커널 내의</div><div class='add'>+API에 대한 모든 설명, 그리고 락킹을 올바르게 처리하는 법에 관한 규칙을 포함하고</div><div class='add'>+있다.</div><div class='add'>+</div><div class='add'>+모든 그런 문서들은 커널 소스 디렉토리에서 다음 커맨드를 실행하는 것을 통해 PDF</div><div class='add'>+나 HTML 의 형태로 만들어질 수 있다::</div><div class='add'>+</div><div class='add'>+         make pdfdocs</div><div class='add'>+         make htmldocs</div><div class='add'>+</div><div class='add'>+ReST 마크업을 사용하는 문서들은 Documentation/output 에 생성된다.  해당</div><div class='add'>+문서들은 다음의 커맨드를 사용하면 LaTeX 이나 ePub 로도 만들어질 수 있다::</div><div class='add'>+</div><div class='add'>+         make latexdocs</div><div class='add'>+         make epubdocs</div><div class='add'>+</div><div class='add'>+현재, ReST 로의 변환이 진행중인, DocBook 으로 쓰인 문서들이 존재한다. 그런</div><div class='add'>+문서들은 Documentation/DocBook/ 디렉토리 안에 생성될 것이고 다음 커맨드를 통해</div><div class='add'>+Postscript 나 man page 로도 만들어질 수 있다::</div><div class='add'>+</div><div class='add'>+         make psdocs</div><div class='add'>+         make mandocs</div><div class='add'>+</div><div class='add'>+커널 개발자가 되는 것</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+여러분이 리눅스 커널 개발에 관하여 아무것도 모른다면 Linux KernelNewbies</div><div class='add'>+프로젝트를 봐야 한다.</div><div class='add'>+</div><div class='add'>+    https://kernelnewbies.org</div><div class='add'>+</div><div class='add'>+그곳은 거의 모든 종류의 기본적인 커널 개발 질문들(질문하기 전에 먼저</div><div class='add'>+아카이브를 찾아봐라. 과거에 이미 답변되었을 수도 있다)을 할 수 있는 도움이</div><div class='add'>+될만한 메일링 리스트가 있다. 또한 실시간으로 질문 할 수 있는 IRC 채널도</div><div class='add'>+가지고 있으며 리눅스 커널 개발을 배우는 데 유용한 문서들을 보유하고 있다.</div><div class='add'>+</div><div class='add'>+웹사이트는 코드구성, 서브시스템들, 그리고 현재 프로젝트들</div><div class='add'>+(트리 내, 외부에 존재하는)에 관한 기본적인 정보들을 가지고 있다. 또한</div><div class='add'>+그곳은 커널 컴파일이나 패치를 하는 법과 같은 기본적인 것들을  설명한다.</div><div class='add'>+</div><div class='add'>+여러분이 어디서 시작해야 할진 모르지만 커널 개발 커뮤니티에 참여할 수</div><div class='add'>+있는 일들을 찾길 원한다면 리눅스 커널 Janitor 프로젝트를 살펴봐라.</div><div class='add'>+</div><div class='add'>+	https://kernelnewbies.org/KernelJanitors</div><div class='add'>+</div><div class='add'>+그곳은 시작하기에 훌륭한 장소이다. 그곳은 리눅스 커널 소스 트리내에</div><div class='add'>+간단히 정리되고 수정될 수 있는 문제들에 관하여 설명한다. 여러분은 이</div><div class='add'>+프로젝트를 대표하는 개발자들과 일하면서 자신의 패치를 리눅스 커널 트리에</div><div class='add'>+반영하기 위한 기본적인 것들을 배우게 될것이며 여러분이 아직 아이디어를</div><div class='add'>+가지고 있지 않다면 다음에 무엇을 해야할지에 관한 방향을 배울 수 있을</div><div class='add'>+것이다.</div><div class='add'>+</div><div class='add'>+여러분들이 이미 커널 트리에 반영하길 원하는 코드 묶음을 가지고 있지만</div><div class='add'>+올바른 포맷으로 포장하는데 도움이 필요하다면 그러한 문제를 돕기 위해</div><div class='add'>+만들어진 kernel-mentors 프로젝트가 있다. 그곳은 메일링 리스트이며</div><div class='add'>+다음에서 참조할 수 있다.</div><div class='add'>+</div><div class='add'>+         https://selenic.com/mailman/listinfo/kernel-mentors</div><div class='add'>+</div><div class='add'>+리눅스 커널 코드에 실제 변경을 하기 전에 반드시 그 코드가 어떻게</div><div class='add'>+동작하는지 이해하고 있어야 한다. 코드를 분석하기 위하여 특정한 툴의</div><div class='add'>+도움을 빌려서라도 코드를 직접 읽는 것보다 좋은 것은 없다(대부분의</div><div class='add'>+자잘한 부분들은 잘 코멘트되어 있다). 그런 툴들 중에 특히 추천할만한</div><div class='add'>+것은 Linux Cross-Reference project이며 그것은 자기 참조 방식이며</div><div class='add'>+소스코드를 인덱스된 웹 페이지들의 형태로 보여준다. 최신의 멋진 커널</div><div class='add'>+코드 저장소는 다음을 통하여 참조할 수 있다.</div><div class='add'>+</div><div class='add'>+      http://lxr.free-electrons.com/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+개발 프로세스</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+리눅스 커널 개발 프로세스는 현재 몇몇 다른 메인 커널 "브랜치들"과</div><div class='add'>+서브시스템에 특화된 커널 브랜치들로 구성된다. 몇몇 다른 메인</div><div class='add'>+브랜치들은 다음과 같다.</div><div class='add'>+</div><div class='add'>+  - main 4.x 커널 트리</div><div class='add'>+  - 4.x.y - 안정된 커널 트리</div><div class='add'>+  - 4.x -git 커널 패치들</div><div class='add'>+  - 서브시스템을 위한 커널 트리들과 패치들</div><div class='add'>+  - 4.x - 통합 테스트를 위한 next 커널 트리</div><div class='add'>+</div><div class='add'>+4.x 커널 트리</div><div class='add'>+~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+4.x 커널들은 Linus Torvalds가 관리하며 https://kernel.org 의</div><div class='add'>+pub/linux/kernel/v4.x/ 디렉토리에서 참조될 수 있다.개발 프로세스는 다음과 같다.</div><div class='add'>+</div><div class='add'>+  - 새로운 커널이 배포되자마자 2주의 시간이 주어진다. 이 기간동은</div><div class='add'>+    메인테이너들은 큰 diff들을 Linus에게 제출할 수 있다. 대개 이 패치들은</div><div class='add'>+    몇 주 동안 -next 커널내에 이미 있었던 것들이다. 큰 변경들을 제출하는 데</div><div class='add'>+    선호되는 방법은  git(커널의 소스 관리 툴, 더 많은 정보들은</div><div class='add'>+    https://git-scm.com/ 에서 참조할 수 있다)를 사용하는 것이지만 순수한</div><div class='add'>+    패치파일의 형식으로 보내는 것도 무관하다.</div><div class='add'>+  - 2주 후에 -rc1 커널이 배포되며 지금부터는 전체 커널의 안정성에 영향을</div><div class='add'>+    미칠수 있는 새로운 기능들을 포함하지 않는 패치들만이 추가될 수 있다.</div><div class='add'>+    완전히 새로운 드라이버(혹은 파일시스템)는 -rc1 이후에만 받아들여진다는</div><div class='add'>+    것을 기억해라. 왜냐하면 변경이 자체내에서만 발생하고 추가된 코드가</div><div class='add'>+    드라이버 외부의 다른 부분에는 영향을 주지 않으므로 그런 변경은</div><div class='add'>+    회귀(역자주: 이전에는 존재하지 않았지만 새로운 기능추가나 변경으로 인해</div><div class='add'>+    생겨난 버그)를 일으킬 만한 위험을 가지고 있지 않기 때문이다. -rc1이</div><div class='add'>+    배포된 이후에 git를 사용하여 패치들을 Linus에게 보낼수 있지만 패치들은</div><div class='add'>+    공식적인 메일링 리스트로 보내서 검토를 받을 필요가 있다.</div><div class='add'>+  - 새로운 -rc는 Linus가 현재 git tree가 테스트 하기에 충분히 안정된 상태에</div><div class='add'>+    있다고 판단될 때마다 배포된다. 목표는 새로운 -rc 커널을 매주 배포하는</div><div class='add'>+    것이다.</div><div class='add'>+  - 이러한 프로세스는 커널이 "준비(ready)"되었다고 여겨질때까지 계속된다.</div><div class='add'>+    프로세스는 대체로 6주간 지속된다.</div><div class='add'>+</div><div class='add'>+커널 배포에 있어서 언급할만한 가치가 있는 리눅스 커널 메일링 리스트의</div><div class='add'>+Andrew Morton의 글이 있다.</div><div class='add'>+</div><div class='add'>+        *"커널이 언제 배포될지는 아무도 모른다. 왜냐하면 배포는 알려진</div><div class='add'>+        버그의 상황에 따라 배포되는 것이지 미리정해 놓은 시간에 따라</div><div class='add'>+        배포되는 것은 아니기 때문이다."*</div><div class='add'>+</div><div class='add'>+4.x.y - 안정 커널 트리</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+3 자리 숫자로 이루어진 버젼의 커널들은 -stable 커널들이다. 그것들은 4.x</div><div class='add'>+커널에서 발견된 큰 회귀들이나 보안 문제들 중 비교적 작고 중요한 수정들을</div><div class='add'>+포함한다.</div><div class='add'>+</div><div class='add'>+이것은 가장 최근의 안정적인 커널을 원하는 사용자에게 추천되는 브랜치이며,</div><div class='add'>+개발/실험적 버젼을 테스트하는 것을 돕고자 하는 사용자들과는 별로 관련이 없다.</div><div class='add'>+</div><div class='add'>+어떤 4.x.y 커널도 사용할 수 없다면 그때는 가장 높은 숫자의 4.x</div><div class='add'>+커널이 현재의 안정 커널이다.</div><div class='add'>+</div><div class='add'>+4.x.y는 "stable" 팀&lt;stable@vger.kernel.org&gt;에 의해 관리되며 거의 매번 격주로</div><div class='add'>+배포된다.</div><div class='add'>+</div><div class='add'>+커널 트리 문서들 내에 Documentation/process/stable-kernel-rules.rst 파일은 어떤</div><div class='add'>+종류의 변경들이 -stable 트리로 들어왔는지와 배포 프로세스가 어떻게</div><div class='add'>+진행되는지를 설명한다.</div><div class='add'>+</div><div class='add'>+4.x -git 패치들</div><div class='add'>+~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+git 저장소(그러므로 -git이라는 이름이 붙음)에는 날마다 관리되는 Linus의</div><div class='add'>+커널 트리의 snapshot 들이 있다. 이 패치들은 일반적으로 날마다 배포되며</div><div class='add'>+Linus의 트리의 현재 상태를 나타낸다. 이 패치들은 정상적인지 조금도</div><div class='add'>+살펴보지 않고 자동적으로 생성된 것이므로 -rc 커널들 보다도 더 실험적이다.</div><div class='add'>+</div><div class='add'>+서브시스템 커널 트리들과 패치들</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+다양한 커널 서브시스템의 메인테이너들 --- 그리고 많은 커널 서브시스템 개발자들</div><div class='add'>+--- 은 그들의 현재 개발 상태를 소스 저장소로 노출한다. 이를 통해 다른 사람들도</div><div class='add'>+커널의 다른 영역에 어떤 변화가 이루어지고 있는지 알 수 있다. 급속히 개발이</div><div class='add'>+진행되는 영역이 있고 그렇지 않은 영역이 있으므로, 개발자는 다른 개발자가 제출한</div><div class='add'>+수정 사항과 자신의 수정사항의 충돌이나 동일한 일을 동시에 두사람이 따로</div><div class='add'>+진행하는 사태를 방지하기 위해 급속히 개발이 진행되고 있는 영역에 작업의</div><div class='add'>+베이스를 맞춰줄 것이 요구된다.</div><div class='add'>+</div><div class='add'>+대부분의 이러한 저장소는 git 트리지만, git이 아닌 SCM으로 관리되거나, quilt</div><div class='add'>+시리즈로 제공되는 패치들도 존재한다. 이러한 서브시스템 저장소들은 MAINTAINERS</div><div class='add'>+파일에 나열되어 있다. 대부분은 https://git.kernel.org 에서 볼 수 있다.</div><div class='add'>+</div><div class='add'>+제안된 패치는 서브시스템 트리에 커밋되기 전에 메일링 리스트를 통해</div><div class='add'>+리뷰된다(아래의 관련 섹션을 참고하기 바란다). 일부 커널 서브시스템의 경우, 이</div><div class='add'>+리뷰 프로세스는 patchwork라는 도구를 통해 추적된다. patchwork은 등록된 패치와</div><div class='add'>+패치에 대한 코멘트, 패치의 버전을 볼 수 있는 웹 인터페이스를 제공하고,</div><div class='add'>+메인테이너는 패치를 리뷰 중, 리뷰 통과, 또는 반려됨으로 표시할 수 있다.</div><div class='add'>+대부분의 이러한 patchwork 사이트는 https://patchwork.kernel.org/ 또는</div><div class='add'>+http://patchwork.ozlabs.org/ 에 나열되어 있다.</div><div class='add'>+</div><div class='add'>+4.x - 통합 테스트를 위한 next 커널 트리</div><div class='add'>+---------------------------------------</div><div class='add'>+서브시스템 트리들의 변경사항들은 mainline 4.x 트리로 들어오기 전에 통합</div><div class='add'>+테스트를 거쳐야 한다. 이런 목적으로, 모든 서브시스템 트리의 변경사항을 거의</div><div class='add'>+매일 받아가는 특수한 테스트 저장소가 존재한다:</div><div class='add'>+</div><div class='add'>+       https://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git</div><div class='add'>+</div><div class='add'>+이런 식으로, -next 커널을 통해 다음 머지 기간에 메인라인 커널에 어떤 변경이</div><div class='add'>+가해질 것인지 간략히 알 수 있다. 모험심 강한 테스터라면 -next 커널에서 테스트를</div><div class='add'>+수행하는 것도 좋을 것이다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+버그 보고</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+https://bugzilla.kernel.org는 리눅스 커널 개발자들이 커널의 버그를 추적하는</div><div class='add'>+곳이다. 사용자들은 발견한 모든 버그들을 보고하기 위하여 이 툴을 사용할 것을</div><div class='add'>+권장한다.  kernel bugzilla를 사용하는 자세한 방법은 다음을 참조하라.</div><div class='add'>+</div><div class='add'>+    https://bugzilla.kernel.org/page.cgi?id=faq.html</div><div class='add'>+</div><div class='add'>+메인 커널 소스 디렉토리에 있는 admin-guide/reporting-bugs.rst 파일은 커널 버그라고 생각되는</div><div class='add'>+것을 보고하는 방법에 관한 좋은 템플릿이며 문제를 추적하기 위해서 커널</div><div class='add'>+개발자들이 필요로 하는 정보가 무엇들인지를 상세히 설명하고 있다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+버그 리포트들의 관리</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+여러분의 해킹 기술을 연습하는 가장 좋은 방법 중의 하는 다른 사람들이</div><div class='add'>+보고한 버그들을 수정하는 것이다. 여러분은 커널을 더욱 안정화시키는데</div><div class='add'>+도움을 줄 뿐만이 아니라 실제있는 문제들을 수정하는 법을 배우게 되고</div><div class='add'>+그와 함께 여러분들의 기술은 향상될 것이며 다른 개발자들이 여러분의</div><div class='add'>+존재에 대해 알게 될 것이다. 버그를 수정하는 것은 개발자들  사이에서</div><div class='add'>+점수를 얻을 수 있는 가장 좋은 방법중의 하나이다. 왜냐하면 많은 사람들은</div><div class='add'>+다른 사람들의 버그들을 수정하기 위하여 시간을 낭비하지 않기 때문이다.</div><div class='add'>+</div><div class='add'>+이미 보고된 버그 리포트들을 가지고 작업하기 위해서 https://bugzilla.kernel.org</div><div class='add'>+를 참조하라. 여러분이 앞으로 생겨날 버그 리포트들의 조언자가 되길 원한다면</div><div class='add'>+bugme-new 메일링 리스트나(새로운 버그 리포트들만이 이곳에서 메일로 전해진다)</div><div class='add'>+bugme-janitor 메일링 리스트(bugzilla에 모든 변화들이 여기서 메일로 전해진다)</div><div class='add'>+에 등록하면 된다.</div><div class='add'>+</div><div class='add'>+      https://lists.linux-foundation.org/mailman/listinfo/bugme-new</div><div class='add'>+</div><div class='add'>+      https://lists.linux-foundation.org/mailman/listinfo/bugme-janitors</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+메일링 리스트들</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+위의 몇몇 문서들이 설명하였지만 핵심 커널 개발자들의 대다수는</div><div class='add'>+리눅스 커널 메일링 리스트에 참여하고 있다. 리스트에 등록하고 해지하는</div><div class='add'>+방법에 관한 자세한 사항은 다음에서 참조할 수 있다.</div><div class='add'>+</div><div class='add'>+    http://vger.kernel.org/vger-lists.html#linux-kernel</div><div class='add'>+</div><div class='add'>+웹상의 많은 다른 곳에도 메일링 리스트의 아카이브들이 있다.</div><div class='add'>+이러한 아카이브들을 찾으려면 검색 엔진을 사용하라. 예를 들어:</div><div class='add'>+</div><div class='add'>+      http://dir.gmane.org/gmane.linux.kernel</div><div class='add'>+</div><div class='add'>+여러분이 새로운 문제에 관해 리스트에 올리기 전에 말하고 싶은 주제에 관한</div><div class='add'>+것을 아카이브에서 먼저 찾아보기를 강력히 권장한다. 이미 상세하게 토론된 많은</div><div class='add'>+것들이 메일링 리스트의 아카이브에 기록되어 있다.</div><div class='add'>+</div><div class='add'>+각각의 커널 서브시스템들의 대부분은 자신들의 개발에 관한 노력들로 이루어진</div><div class='add'>+분리된 메일링 리스트를 따로 가지고 있다. 다른 그룹들이 무슨 리스트를 가지고</div><div class='add'>+있는지는 MAINTAINERS 파일을 참조하라.</div><div class='add'>+</div><div class='add'>+많은 리스트들은 kernel.org에서 호스트되고 있다. 그 정보들은 다음에서 참조될 수 있다.</div><div class='add'>+</div><div class='add'>+         http://vger.kernel.org/vger-lists.html</div><div class='add'>+</div><div class='add'>+리스트들을 사용할 때는 올바른 예절을 따를 것을 유념해라.</div><div class='add'>+대단하진 않지만 다음 URL은 리스트(혹은 모든 리스트)와 대화하는 몇몇 간단한</div><div class='add'>+가이드라인을 가지고 있다.</div><div class='add'>+</div><div class='add'>+         http://www.albion.com/netiquette/</div><div class='add'>+</div><div class='add'>+여러 사람들이 여러분의 메일에 응답한다면 CC: 즉 수신 리스트는 꽤 커지게</div><div class='add'>+될 것이다. 아무 이유없이 CC에서 어떤 사람도 제거하거나 리스트 주소로만</div><div class='add'>+회신하지 마라. 메일을 보낸 사람으로서 하나를 받고 리스트로부터 또</div><div class='add'>+하나를 받아 두번 받는 것에 익숙하여 있으니 mail-header를 조작하려고 하지</div><div class='add'>+말아라. 사람들은 그런 것을 좋아하지 않을 것이다.</div><div class='add'>+</div><div class='add'>+여러분의 회신의 문맥을 원래대로 유지해야 한다. 여러분들의 회신의 윗부분에</div><div class='add'>+"John 커널해커는 작성했다...."를 유지하며 여러분들의 의견을 그 메일의 윗부분에</div><div class='add'>+작성하지 말고 각 인용한 단락들 사이에 넣어라.</div><div class='add'>+</div><div class='add'>+여러분들이 패치들을 메일에 넣는다면 그것들은 Documentation/process/submitting-patches.rst에</div><div class='add'>+나와있는데로 명백히(plain) 읽을 수 있는 텍스트여야 한다. 커널 개발자들은</div><div class='add'>+첨부파일이나 압축된 패치들을 원하지 않는다. 그들은 여러분들의 패치의</div><div class='add'>+각 라인 단위로 코멘트를 하길 원하며 압축하거나 첨부하지 않고 보내는 것이</div><div class='add'>+그렇게 할 수 있는 유일한 방법이다. 여러분들이 사용하는 메일 프로그램이</div><div class='add'>+스페이스나 탭 문자들을 조작하지 않는지 확인하라. 가장 좋은 첫 테스트는</div><div class='add'>+메일을 자신에게 보내보고 스스로 그 패치를 적용해보라. 그것이 동작하지</div><div class='add'>+않는다면 여러분의 메일 프로그램을 고치던가 제대로 동작하는 프로그램으로</div><div class='add'>+바꾸어라.</div><div class='add'>+</div><div class='add'>+무엇보다도 메일링 리스트의 다른 구독자들에게 보여주려 한다는 것을 기억하라.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+커뮤니티와 협력하는 법</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+커널 커뮤니티의 목적은 가능한한 가장 좋은 커널을 제공하는 것이다. 여러분이</div><div class='add'>+받아들여질 패치를 제출하게 되면 그 패치의 기술적인 이점으로 검토될 것이다.</div><div class='add'>+그럼 여러분들은 무엇을 기대하고 있어야 하는가?</div><div class='add'>+</div><div class='add'>+ - 비판</div><div class='add'>+ - 의견</div><div class='add'>+ - 변경을 위한 요구</div><div class='add'>+ - 당위성을 위한 요구</div><div class='add'>+ - 침묵</div><div class='add'>+</div><div class='add'>+기억하라. 이것들은 여러분의 패치가 커널로 들어가기 위한 과정이다. 여러분의</div><div class='add'>+패치들은 비판과 다른 의견을 받을 수 있고 그것들을 기술적인 레벨로 평가하고</div><div class='add'>+재작업하거나 또는 왜 수정하면 안되는지에 관하여 명료하고 간결한 이유를</div><div class='add'>+말할 수 있어야 한다. 여러분이 제출한 것에 어떤 응답도 있지 않다면 몇 일을</div><div class='add'>+기다려보고 다시 시도해라. 때론 너무 많은 메일들 속에 묻혀버리기도 한다.</div><div class='add'>+</div><div class='add'>+여러분은 무엇을 해서는 안되는가?</div><div class='add'>+</div><div class='add'>+ - 여러분의 패치가 아무 질문 없이 받아들여지기를 기대하는 것</div><div class='add'>+ - 방어적이 되는 것</div><div class='add'>+ - 의견을 무시하는 것</div><div class='add'>+ - 요청된 변경을 하지 않고 패치를 다시 제출하는 것</div><div class='add'>+</div><div class='add'>+가능한한 가장 좋은 기술적인 해답을 찾고 있는 커뮤니티에서는 항상</div><div class='add'>+어떤 패치가 얼마나 좋은지에 관하여 다른 의견들이 있을 수 있다. 여러분은</div><div class='add'>+협조적이어야 하고 기꺼이 여러분의 생각을 커널 내에 맞추어야 한다. 아니면</div><div class='add'>+적어도 여러분의 것이 가치있다는 것을 증명하여야 한다. 잘못된 것도 여러분이</div><div class='add'>+올바른 방향의 해결책으로 이끌어갈 의지가 있다면 받아들여질 것이라는 점을</div><div class='add'>+기억하라.</div><div class='add'>+</div><div class='add'>+여러분의 첫 패치에 여러분이 수정해야하는 십여개 정도의 회신이 오는</div><div class='add'>+경우도 흔하다. 이것은 여러분의 패치가 받아들여지지 않을 것이라는 것을</div><div class='add'>+의미하는 것이 아니고 개인적으로 여러분에게 감정이 있어서 그러는 것도</div><div class='add'>+아니다. 간단히 여러분의 패치에 제기된 문제들을 수정하고 그것을 다시</div><div class='add'>+보내라.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+커널 커뮤니티와 기업 조직간의 차이점</div><div class='add'>+------------------------------------</div><div class='add'>+커널 커뮤니티는 가장 전통적인 회사의 개발 환경과는 다르다. 여기에 여러분들의</div><div class='add'>+문제를 피하기 위한 목록이 있다.</div><div class='add'>+</div><div class='add'>+  여러분들이 제안한 변경들에 관하여 말할 때 좋은 것들 :</div><div class='add'>+</div><div class='add'>+    - "이것은 여러 문제들을 해결합니다."</div><div class='add'>+    - "이것은 2000 라인의 코드를 줄입니다."</div><div class='add'>+    - "이것은 내가 말하려는 것에 관해 설명하는 패치입니다."</div><div class='add'>+    - "나는 5개의 다른 아키텍쳐에서 그것을 테스트 했으므로..."</div><div class='add'>+    - "여기에 일련의 작은 패치들이 있으므로..."</div><div class='add'>+    - "이것은 일반적인 머신에서 성능을 향상함으로..."</div><div class='add'>+</div><div class='add'>+  여러분들이 말할 때 피해야 할 좋지 않은 것들 :</div><div class='add'>+</div><div class='add'>+    - "우리는 그것을 AIX/ptx/Solaris에서 이러한 방법으로 했다. 그러므로 그것은 좋은 것임에 틀림없다..."</div><div class='add'>+    - "나는 20년동안 이것을 해왔다. 그러므로..."</div><div class='add'>+    - "이것은 돈을 벌기위해 나의 회사가 필요로 하는 것이다."</div><div class='add'>+    - "이것은 우리의 엔터프라이즈 상품 라인을 위한 것이다."</div><div class='add'>+    - "여기에 나의 생각을 말하고 있는 1000 페이지 설계 문서가 있다."</div><div class='add'>+    - "나는 6달동안 이것을 했으니..."</div><div class='add'>+    - "여기에 5000 라인 짜리 패치가 있으니..."</div><div class='add'>+    - "나는 현재 뒤죽박죽인 것을 재작성했다. 그리고 여기에..."</div><div class='add'>+    - "나는 마감시한을 가지고 있으므로 이 패치는 지금 적용될 필요가 있다."</div><div class='add'>+</div><div class='add'>+커널 커뮤니티가 전통적인 소프트웨어 엔지니어링 개발 환경들과</div><div class='add'>+또 다른 점은 얼굴을 보지 않고 일한다는 점이다. 이메일과 irc를 대화의</div><div class='add'>+주요수단으로 사용하는 것의 한가지 장점은 성별이나 인종의 차별이</div><div class='add'>+없다는 것이다. 리눅스 커널의 작업 환경에서는 단지 이메일 주소만</div><div class='add'>+알수 있기 때문에 여성과 소수 민족들도 모두 받아들여진다. 국제적으로</div><div class='add'>+일하게 되는 측면은 사람의 이름에 근거하여 성별을 추측할 수 없게</div><div class='add'>+하기때문에 차별을 없애는 데 도움을 준다. Andrea라는 이름을 가진 남자와</div><div class='add'>+Pat이라는 이름을 가진 여자가 있을 수도 있는 것이다. 리눅스 커널에서</div><div class='add'>+작업하며 생각을 표현해왔던 대부분의 여성들은 긍정적인 경험을 가지고</div><div class='add'>+있다.</div><div class='add'>+</div><div class='add'>+언어 장벽은 영어에 익숙하지 않은 몇몇 사람들에게 문제가 될 수도 있다.</div><div class='add'>+언어의 훌륭한 구사는 메일링 리스트에서 올바르게 자신의 생각을</div><div class='add'>+표현하기 위하여 필요하다. 그래서 여러분은 이메일을 보내기 전에</div><div class='add'>+영어를 올바르게 사용하고 있는지를 체크하는 것이 바람직하다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+여러분의 변경을 나누어라</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+리눅스 커널 커뮤니티는 한꺼번에 굉장히 큰 코드의 묶음(chunk)을 쉽게</div><div class='add'>+받아들이지 않는다. 변경은 적절하게 소개되고, 검토되고, 각각의</div><div class='add'>+부분으로 작게 나누어져야 한다. 이것은 회사에서 하는 것과는 정확히</div><div class='add'>+반대되는 것이다. 여러분들의 제안은 개발 초기에 일찍이 소개되야 한다.</div><div class='add'>+그래서 여러분들은 자신이 하고 있는 것에 관하여 피드백을 받을 수 있게</div><div class='add'>+된다. 커뮤니티가 여러분들이 커뮤니티와 함께 일하고 있다는 것을</div><div class='add'>+느끼도록 만들고 커뮤니티가 여러분의 기능을 위한 쓰레기 장으로써</div><div class='add'>+사용되지 않고 있다는 것을 느끼게 하자. 그러나 메일링 리스트에 한번에</div><div class='add'>+50개의 이메일을 보내지는 말아라. 여러분들의 일련의 패치들은 항상</div><div class='add'>+더 작아야 한다.</div><div class='add'>+</div><div class='add'>+패치를 나누는 이유는 다음과 같다.</div><div class='add'>+</div><div class='add'>+1) 작은 패치들은 여러분의 패치들이 적용될 수 있는 확률을 높여준다.</div><div class='add'>+   왜냐하면 다른 사람들은 정확성을 검증하기 위하여 많은 시간과 노력을</div><div class='add'>+   들이기를 원하지 않는다. 5줄의 패치는 메인테이너가 거의 몇 초간 힐끗</div><div class='add'>+   보면 적용될 수 있다. 그러나 500 줄의 패치는 정확성을 검토하기 위하여</div><div class='add'>+   몇시간이 걸릴 수도 있다(걸리는 시간은 패치의 크기 혹은 다른 것에</div><div class='add'>+   비례하여 기하급수적으로 늘어난다).</div><div class='add'>+</div><div class='add'>+   패치를 작게 만드는 것은 무엇인가 잘못되었을 때 디버그하는 것을</div><div class='add'>+   쉽게 만든다. 즉, 그렇게 만드는 것은 매우 큰 패치를 적용한 후에</div><div class='add'>+   조사하는 것 보다 작은 패치를 적용한 후에 (그리고 몇몇의 것이</div><div class='add'>+   깨졌을 때) 하나씩 패치들을 제거해가며 디버그 하기 쉽도록 만들어 준다.</div><div class='add'>+</div><div class='add'>+2) 작은 패치들을 보내는 것뿐만 아니라 패치들을 제출하기전에 재작성하고</div><div class='add'>+   간단하게(혹은 간단한게 재배치하여) 하는 것도 중요하다.</div><div class='add'>+</div><div class='add'>+여기에 커널 개발자 Al Viro의 이야기가 있다.</div><div class='add'>+</div><div class='add'>+    *"학생의 수학 숙제를 채점하는 선생님을 생각해보라. 선생님은 학생들이</div><div class='add'>+    답을 얻을때까지 겪은 시행착오를 보길 원하지 않는다. 선생님들은</div><div class='add'>+    간결하고 가장 뛰어난 답을 보길 원한다. 훌륭한 학생은 이것을 알고</div><div class='add'>+    마지막으로 답을 얻기 전 중간 과정들을 제출하진 않는다.*</div><div class='add'>+</div><div class='add'>+    *커널 개발도 마찬가지이다. 메인테이너들과 검토하는 사람들은 문제를</div><div class='add'>+    풀어나가는 과정속에 숨겨진 과정을 보길 원하진 않는다. 그들은</div><div class='add'>+    간결하고 멋진 답을 보길 원한다."*</div><div class='add'>+</div><div class='add'>+커뮤니티와 협력하며 뛰어난 답을 찾는 것과 여러분들의 끝마치지 못한 작업들</div><div class='add'>+사이에 균형을 유지해야 하는 것은 어려울지도 모른다. 그러므로 프로세스의</div><div class='add'>+초반에 여러분의 작업을 향상시키기위한 피드백을 얻는 것 뿐만 아니라</div><div class='add'>+여러분들의 변경들을 작은 묶음으로 유지해서 심지어는 여러분의 작업의</div><div class='add'>+모든 부분이 지금은 포함될 준비가 되어있지 않지만 작은 부분은 벌써</div><div class='add'>+받아들여질 수 있도록 유지하는 것이 바람직하다.</div><div class='add'>+</div><div class='add'>+또한 완성되지 않았고 "나중에 수정될 것이다." 와 같은 것들을 포함하는</div><div class='add'>+패치들은 받아들여지지 않을 것이라는 점을 유념하라.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+변경을 정당화해라</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+여러분들의 나누어진 패치들을 리눅스 커뮤니티가 왜 반영해야 하는지를</div><div class='add'>+알도록 하는 것은 매우 중요하다. 새로운 기능들이 필요하고 유용하다는</div><div class='add'>+것은 반드시 그에 합당한 이유가 있어야 한다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+변경을 문서화해라</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+여러분이 패치를 보내려 할때는 여러분이 무엇을 말하려고 하는지를 충분히</div><div class='add'>+생각하여 이메일을 작성해야 한다. 이 정보는 패치를 위한 ChangeLog가 될</div><div class='add'>+것이다. 그리고 항상 그 내용을 보길 원하는 모든 사람들을 위해 보존될</div><div class='add'>+것이다. 패치는 완벽하게 다음과 같은 내용들을 포함하여 설명해야 한다.</div><div class='add'>+</div><div class='add'>+  - 변경이 왜 필요한지</div><div class='add'>+  - 패치에 관한 전체 설계 접근(approach)</div><div class='add'>+  - 구현 상세들</div><div class='add'>+  - 테스트 결과들</div><div class='add'>+</div><div class='add'>+이것이 무엇인지 더 자세한 것을 알고 싶다면 다음 문서의 ChageLog 항을 봐라.</div><div class='add'>+</div><div class='add'>+   "The Perfect Patch"</div><div class='add'>+</div><div class='add'>+    http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+이 모든 것을 하는 것은 매우 어려운 일이다. 완벽히 소화하는 데는 적어도 몇년이</div><div class='add'>+걸릴 수도 있다. 많은 인내와 결심이 필요한 계속되는 개선의 과정이다. 그러나</div><div class='add'>+가능한한 포기하지 말라. 많은 사람들은 이전부터 해왔던 것이고 그 사람들도</div><div class='add'>+정확하게 여러분들이 지금 서 있는 그 곳부터  시작했었다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+"개발 프로세스"(https://lwn.net/Articles/94386/) 섹션을</div><div class='add'>+작성하는데 있어 참고할 문서를 사용하도록 허락해준 Paolo Ciarrocchi에게</div><div class='add'>+감사한다. 여러분들이 말해야 할 것과 말해서는 안되는 것의 목록 중 일부를 제공해준</div><div class='add'>+Randy Dunlap과 Gerrit Huizenga에게 감사한다. 또한 검토와 의견 그리고</div><div class='add'>+공헌을 아끼지 않은 Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,</div><div class='add'>+Vojtech Pavlik, Jan Kara, Josh Boyer, Kees Cook, Andrew Morton, Andi Kleen,</div><div class='add'>+Vadim Lobanov, Jesper Juhl, Adrian Bunk, Keri Harris, Frans Pop,</div><div class='add'>+David A. Wheeler, Junio Hamano, Michael Kerrisk, and Alex Shepard에게도 감사를 전한다.</div><div class='add'>+그들의 도움이 없었다면 이 문서는 존재하지 않았을 것이다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+메인테이너: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/Documentation/translations/ko_KR/index.rst b/Documentation/translations/ko_KR/index.rst<br/>new file mode 100644<br/>index 000000000000..0b695345abc7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/ko_KR/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ko_KR/index.rst</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+        \renewcommand\thesection*</div><div class='add'>+        \renewcommand\thesubsection*</div><div class='add'>+</div><div class='add'>+Korean translations</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   howto</div><div class='head'>diff --git a/Documentation/ko_KR/memory-barriers.txt b/Documentation/translations/ko_KR/memory-barriers.txt<br/>index 34d3d380893d..ce0b48d69eaa 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/ko_KR/memory-barriers.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/ko_KR/memory-barriers.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/ko_KR/memory-barriers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ko_KR/memory-barriers.txt</a></div><div class='hunk'>@@ -662,6 +662,10 @@ include/linux/rcupdate.h 의 rcu_assign_pointer() 와 rcu_dereference() 를</div><div class='ctx'> 컨트롤 의존성</div><div class='ctx'> -------------</div><div class='ctx'> </div><div class='add'>+현재의 컴파일러들은 컨트롤 의존성을 이해하고 있지 않기 때문에 컨트롤 의존성은</div><div class='add'>+약간 다루기 어려울 수 있습니다.  이 섹션의 목적은 여러분이 컴파일러의 무시로</div><div class='add'>+인해 여러분의 코드가 망가지는 걸 막을 수 있도록 돕는겁니다.</div><div class='add'>+</div><div class='ctx'> 로드-로드 컨트롤 의존성은 데이터 의존성 배리어만으로는 정확히 동작할 수가</div><div class='ctx'> 없어서 읽기 메모리 배리어를 필요로 합니다.  아래의 코드를 봅시다:</div><div class='ctx'> </div><div class='hunk'>@@ -689,20 +693,21 @@ CPU 는 b 로부터의 로드 오퍼레이션이 a 로부터의 로드 오퍼레</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	if (q) {</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 컨트롤 의존성은 보통 다른 타입의 배리어들과 짝을 맞춰 사용됩니다.  그렇다곤</div><div class='del'>-하나, READ_ONCE() 는 반드시 사용해야 함을 부디 명심하세요!  READ_ONCE() 가</div><div class='del'>-없다면, 컴파일러가 'a' 로부터의 로드를 'a' 로부터의 또다른 로드와, 'b' 로의</div><div class='del'>-스토어를 'b' 로의 또다른 스토어와 조합해 버려 매우 비직관적인 결과를 초래할 수</div><div class='del'>-있습니다.</div><div class='add'>+하나, READ_ONCE() 도 WRITE_ONCE() 도 선택사항이 아니라 필수사항임을 부디</div><div class='add'>+명심하세요!  READ_ONCE() 가 없다면, 컴파일러는 'a' 로부터의 로드를 'a' 로부터의</div><div class='add'>+또다른 로드와 조합할 수 있습니다.  WRITE_ONCE() 가 없다면, 컴파일러는 'b' 로의</div><div class='add'>+스토어를 'b' 로의 또라느 스토어들과 조합할 수 있습니다.  두 경우 모두 순서에</div><div class='add'>+있어 상당히 비직관적인 결과를 초래할 수 있습니다.</div><div class='ctx'> </div><div class='ctx'> 이걸로 끝이 아닌게, 컴파일러가 변수 'a' 의 값이 항상 0이 아니라고 증명할 수</div><div class='ctx'> 있다면, 앞의 예에서 "if" 문을 없애서 다음과 같이 최적화 할 수도 있습니다:</div><div class='ctx'> </div><div class='ctx'> 	q = a;</div><div class='del'>-	b = p;  /* BUG: Compiler and CPU can both reorder!!! */</div><div class='add'>+	b = 1;  /* BUG: Compiler and CPU can both reorder!!! */</div><div class='ctx'> </div><div class='ctx'> 그러니 READ_ONCE() 를 반드시 사용하세요.</div><div class='ctx'> </div><div class='hunk'>@@ -712,11 +717,11 @@ CPU 는 b 로부터의 로드 오퍼레이션이 a 로부터의 로드 오퍼레</div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	if (q) {</div><div class='ctx'> 		barrier();</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='ctx'> 		barrier();</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -725,12 +730,12 @@ CPU 는 b 로부터의 로드 오퍼레이션이 a 로부터의 로드 오퍼레</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	barrier();</div><div class='del'>-	WRITE_ONCE(b, p);  /* BUG: No ordering vs. load from a!!! */</div><div class='add'>+	WRITE_ONCE(b, 1);  /* BUG: No ordering vs. load from a!!! */</div><div class='ctx'> 	if (q) {</div><div class='del'>-		/* WRITE_ONCE(b, p); -- moved up, BUG!!! */</div><div class='add'>+		/* WRITE_ONCE(b, 1); -- moved up, BUG!!! */</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='del'>-		/* WRITE_ONCE(b, p); -- moved up, BUG!!! */</div><div class='add'>+		/* WRITE_ONCE(b, 1); -- moved up, BUG!!! */</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -742,10 +747,10 @@ CPU 는 b 로부터의 로드 오퍼레이션이 a 로부터의 로드 오퍼레</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	if (q) {</div><div class='del'>-		smp_store_release(&amp;b, p);</div><div class='add'>+		smp_store_release(&amp;b, 1);</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='del'>-		smp_store_release(&amp;b, p);</div><div class='add'>+		smp_store_release(&amp;b, 1);</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -754,10 +759,10 @@ CPU 는 b 로부터의 로드 오퍼레이션이 a 로부터의 로드 오퍼레</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	if (q) {</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='del'>-		WRITE_ONCE(b, r);</div><div class='add'>+		WRITE_ONCE(b, 2);</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -770,10 +775,10 @@ CPU 는 b 로부터의 로드 오퍼레이션이 a 로부터의 로드 오퍼레</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	if (q % MAX) {</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='del'>-		WRITE_ONCE(b, r);</div><div class='add'>+		WRITE_ONCE(b, 2);</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -781,7 +786,7 @@ CPU 는 b 로부터의 로드 오퍼레이션이 a 로부터의 로드 오퍼레</div><div class='ctx'> 위의 코드를 아래와 같이 바꿔버릴 수 있습니다:</div><div class='ctx'> </div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='del'>-	WRITE_ONCE(b, p);</div><div class='add'>+	WRITE_ONCE(b, 1);</div><div class='ctx'> 	do_something_else();</div><div class='ctx'> </div><div class='ctx'> 이렇게 되면, CPU 는 변수 'a' 로부터의 로드와 변수 'b' 로의 스토어 사이의 순서를</div><div class='hunk'>@@ -793,10 +798,10 @@ CPU 는 b 로부터의 로드 오퍼레이션이 a 로부터의 로드 오퍼레</div><div class='ctx'> 	q = READ_ONCE(a);</div><div class='ctx'> 	BUILD_BUG_ON(MAX &lt;= 1); /* Order load from a with store to b. */</div><div class='ctx'> 	if (q % MAX) {</div><div class='del'>-		WRITE_ONCE(b, p);</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='ctx'> 		do_something();</div><div class='ctx'> 	} else {</div><div class='del'>-		WRITE_ONCE(b, r);</div><div class='add'>+		WRITE_ONCE(b, 2);</div><div class='ctx'> 		do_something_else();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -823,8 +828,38 @@ CPU 는 b 로부터의 로드 오퍼레이션이 a 로부터의 로드 오퍼레</div><div class='ctx'> 오퍼레이션을 위한 코드를 정말로 만들도록 하지만, 컴파일러가 그렇게 만들어진</div><div class='ctx'> 코드의 수행 결과를 사용하도록 강제하지는 않습니다.</div><div class='ctx'> </div><div class='add'>+또한, 컨트롤 의존성은 if 문의 then 절과 else 절에 대해서만 적용됩니다.  상세히</div><div class='add'>+말해서, 컨트롤 의존성은 if 문을 뒤따르는 코드에는 적용되지 않습니다:</div><div class='add'>+</div><div class='add'>+	q = READ_ONCE(a);</div><div class='add'>+	if (q) {</div><div class='add'>+		WRITE_ONCE(b, 1);</div><div class='add'>+	} else {</div><div class='add'>+		WRITE_ONCE(b, 2);</div><div class='add'>+	}</div><div class='add'>+	WRITE_ONCE(c, 1);  /* BUG: No ordering against the read from 'a'. */</div><div class='add'>+</div><div class='add'>+컴파일러는 volatile 타입에 대한 액세스를 재배치 할 수 없고 이 조건 하의 'b'</div><div class='add'>+로의 쓰기를 재배치 할 수 없기 때문에 여기에 순서 규칙이 존재한다고 주장하고</div><div class='add'>+싶을 겁니다.  불행히도 이 경우에, 컴파일러는 다음의 가상의 pseudo-assembly 언어</div><div class='add'>+코드처럼 'b' 로의 두개의 쓰기 오퍼레이션을 conditional-move 인스트럭션으로</div><div class='add'>+번역할 수 있습니다:</div><div class='add'>+</div><div class='add'>+	ld r1,a</div><div class='add'>+	cmp r1,$0</div><div class='add'>+	cmov,ne r4,$1</div><div class='add'>+	cmov,eq r4,$2</div><div class='add'>+	st r4,b</div><div class='add'>+	st $1,c</div><div class='add'>+</div><div class='add'>+완화된 순서 규칙의 CPU 는 'a' 로부터의 로드와 'c' 로의 스토어 사이에 어떤</div><div class='add'>+종류의 의존성도 갖지 않을 겁니다.  이 컨트롤 의존성은 두개의 cmov 인스트럭션과</div><div class='add'>+거기에 의존하는 스토어 에게만 적용될 겁니다.  짧게 말하자면, 컨트롤 의존성은</div><div class='add'>+주어진 if 문의 then 절과 else 절에게만 (그리고 이 두 절 내에서 호출되는</div><div class='add'>+함수들에게까지) 적용되지, 이 if 문을 뒤따르는 코드에는 적용되지 않습니다.</div><div class='add'>+</div><div class='ctx'> 마지막으로, 컨트롤 의존성은 이행성 (transitivity) 을 제공하지 -않습니다-.  이건</div><div class='del'>-x 와 y 가 둘 다 0 이라는 초기값을 가졌다는 가정 하의 두개의 예제로</div><div class='add'>+'x' 와 'y' 가 둘 다 0 이라는 초기값을 가졌다는 가정 하의 두개의 예제로</div><div class='ctx'> 보이겠습니다:</div><div class='ctx'> </div><div class='ctx'> 	CPU 0                     CPU 1</div><div class='hunk'>@@ -883,11 +918,18 @@ http://www.cl.cam.ac.uk/users/pes20/ppc-supplemental/test6.pdf 와</div><div class='ctx'>       의존성이 사라지지 않게 하는데 도움을 줄 수 있습니다.  더 많은 정보를</div><div class='ctx'>       위해선 "컴파일러 배리어" 섹션을 참고하시기 바랍니다.</div><div class='ctx'> </div><div class='add'>+  (*) 컨트롤 의존성은 컨트롤 의존성을 갖는 if 문의 then 절과 else 절과 이 두 절</div><div class='add'>+      내에서 호출되는 함수들에만 적용됩니다.  컨트롤 의존성은 컨트롤 의존성을</div><div class='add'>+      갖는 if 문을 뒤따르는 코드에는 적용되지 -않습니다-.</div><div class='add'>+</div><div class='ctx'>   (*) 컨트롤 의존성은 보통 다른 타입의 배리어들과 짝을 맞춰 사용됩니다.</div><div class='ctx'> </div><div class='ctx'>   (*) 컨트롤 의존성은 이행성을 제공하지 -않습니다-.  이행성이 필요하다면,</div><div class='ctx'>       smp_mb() 를 사용하세요.</div><div class='ctx'> </div><div class='add'>+  (*) 컴파일러는 컨트롤 의존성을 이해하고 있지 않습니다.  따라서 컴파일러가</div><div class='add'>+      여러분의 코드를 망가뜨리지 않도록 하는건 여러분이 해야 하는 일입니다.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> SMP 배리어 짝맞추기</div><div class='ctx'> --------------------</div><div class='head'>diff --git a/Documentation/translations/ko_KR/stable_api_nonsense.txt b/Documentation/translations/ko_KR/stable_api_nonsense.txt<br/>new file mode 100644<br/>index 000000000000..4d93af1efd61<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/ko_KR/stable_api_nonsense.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/ko_KR/stable_api_nonsense.txt</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+NOTE:</div><div class='add'>+This is a version of Documentation/process/stable-api-nonsense.rst translated</div><div class='add'>+into korean</div><div class='add'>+This document is maintained by Minchan Kim &lt;minchan@kernel.org&gt;</div><div class='add'>+If you find any difference between this document and the original file or</div><div class='add'>+a problem with the translation, please contact the maintainer of this file.</div><div class='add'>+</div><div class='add'>+Please also note that the purpose of this file is to be easier to</div><div class='add'>+read for non English (read: korean) speakers and is not intended as</div><div class='add'>+a fork. So if you have any comments or updates for this file please</div><div class='add'>+try to update the original English file first.</div><div class='add'>+</div><div class='add'>+==================================</div><div class='add'>+이 문서는</div><div class='add'>+Documentation/process/stable-api-nonsense.rst</div><div class='add'>+의 한글 번역입니다.</div><div class='add'>+</div><div class='add'>+역자： 김민찬 &lt;minchan@kernel.org&gt;</div><div class='add'>+감수： 이제이미 &lt;jamee.lee@samsung.com&gt;</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+리눅스 커널 드라이버 인터페이스</div><div class='add'>+(여러분들의 모든 질문에 대한 답 그리고 다른 몇가지)</div><div class='add'>+</div><div class='add'>+Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='add'>+</div><div class='add'>+이 문서는 리눅스가 왜 바이너리 커널 인터페이스를 갖지 않는지, 왜 변하지</div><div class='add'>+않는(stable) 커널 인터페이스를 갖지 않는지를 설명하기 위해 쓰여졌다.</div><div class='add'>+이 문서는 커널과 유저공간 사이의 인터페이스가 아니라 커널 내부의</div><div class='add'>+인터페이스들을 설명하고 있다는 것을 유념하라. 커널과 유저공간 사이의</div><div class='add'>+인터페이스는 응용프로그램이 사용하는 syscall 인터페이스이다. 그 인터페이스는</div><div class='add'>+오랫동안 거의 변하지 않았고 앞으로도 변하지 않을 것이다. 나는 pre 0.9에서</div><div class='add'>+만들어졌지만 최신의 2.6 커널 배포에서도 잘 동작하는 프로그램을 가지고</div><div class='add'>+있다. 이 인터페이스는 사용자와 응용프로그램 개발자들이 변하지 않을 것이라고</div><div class='add'>+여길수 있는 것이다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+초록</div><div class='add'>+----</div><div class='add'>+여러분은 변하지 않는 커널 인터페이스를 원한다고 생각하지만 실제로는</div><div class='add'>+그렇지 않으며 심지어는 그것을 알아채지 못한다. 여러분이 원하는 것은</div><div class='add'>+안정되게 실행되는 드라이버이며 드라이버가 메인 커널 트리에 있을 때</div><div class='add'>+그런 안정적인 드라이버를 얻을 수 있게 된다. 또한 여러분의 드라이버가</div><div class='add'>+메인 커널 트리에 있다면 다른 많은 좋은 이점들을 얻게 된다. 그러한 것들이</div><div class='add'>+리눅스를 강건하고, 안정적이며, 성숙한 운영체제로 만들어 놓음으로써</div><div class='add'>+여러분들로 하여금 바로 리눅스를 사용하게 만드는 이유이다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+소개</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+커널 내부의 인터페이스가 바뀌는 것을 걱정하며 커널 드라이버를 작성하고</div><div class='add'>+싶어하는 사람은 정말 이상한 사람이다. 세상의 대다수의 사람들은 이 인터페이스를</div><div class='add'>+보지못할 것이며 전혀 걱정하지도 않는다.</div><div class='add'>+</div><div class='add'>+먼저, 나는 closed 소스, hidden 소스, binary blobs, 소스 wrappers, 또는 GPL로</div><div class='add'>+배포되었지만 소스 코드를 갖고 있지 않은 커널 드라이버들을 설명하는 어떤 다른</div><div class='add'>+용어들에 관한 어떤 법적인 문제에 관해서는 언급하지 않을 것이다. 어떤 법적인</div><div class='add'>+질문들을 가지고 있다면 변호사와 연락하라. 나는 프로그래머이므로 여기서 기술적인</div><div class='add'>+문제들만을 설명하려고 한다. (법적인 문제를 경시하는 것은 아니다. 그런 문제들은</div><div class='add'>+엄연히 현실에 있고 여러분들은 항상 그 문제들을 인식하고 있을 필요는 있다.)</div><div class='add'>+</div><div class='add'>+자, 두가지의 주요 주제가 있다. 바이너리 커널 인터페이스들과 변하지 않는</div><div class='add'>+커널 소스 인터페이들. 그것들은 서로 의존성을 가지고 있지만 바이너리</div><div class='add'>+문제를 먼저 풀고 넘어갈 것이다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+바이너리 커널 인터페이스</div><div class='add'>+------------------------</div><div class='add'>+우리가 변하지 않는 커널 소스 인터페이스를 가지고 있다고 가정하자. 그러면</div><div class='add'>+바이너리 인터페이스 또한 자연적으로 변하지 않을까? 틀렸다. 리눅스 커널에</div><div class='add'>+관한 다음 사실들을 생각해보라.</div><div class='add'>+   - 여러분들이 사용하는 C 컴파일러의 버젼에 따라 다른 커널 자료 구조들은</div><div class='add'>+     다른 alignmnet들을 갖게 될것이고 다른 방법으로(함수들을 inline으로</div><div class='add'>+     했느냐, 아니냐) 다른 함수들을 포함하는 것도 가능한다. 중요한 것은</div><div class='add'>+     개별적인 함수 구성이 아니라 자료 구조 패딩이 달라진다는 점이다.</div><div class='add'>+   - 여러분이 선택한 커널 빌드 옵션에 따라서 커널은 다양한 것들을 가정할</div><div class='add'>+     수 있다.</div><div class='add'>+      - 다른 구조체들은 다른 필드들을 포함할 수 있다.</div><div class='add'>+      - 몇몇 함수들은 전혀 구현되지 않을 수도 있다(즉, 몇몇 lock들은</div><div class='add'>+        non-SMP 빌드에서는 사라져 버릴수도 있다).</div><div class='add'>+      - 커널내에 메모리는 build optoin들에 따라 다른 방법으로 align될수</div><div class='add'>+        있다.</div><div class='add'>+      - 리눅스는 많은 다양한 프로세서 아키텍쳐에서 실행된다. 한 아키텍쳐의</div><div class='add'>+        바이너리 드라이버를 다른 아키텍쳐에서 정상적으로 실행시킬 방법은</div><div class='add'>+        없다.</div><div class='add'>+</div><div class='add'>+커널을 빌드했던 C 컴파일러와 정확하게 같은 것을 사용하고 정확하게 같은</div><div class='add'>+커널 구성(configuration)을 사용하여 여러분들의 모듈을 빌드하면 간단히</div><div class='add'>+많은 문제들을 해결할 수 있다. 이렇게 하는 것은 여러분들이 하나의 리눅스</div><div class='add'>+배포판의 하나의 배포 버젼을 위한 모듈만을 제공한다면 별일 아닐 것이다.</div><div class='add'>+그러나 각기 다른 리눅스 배포판마다 한번씩 빌드하는 수를 각 리눅스 배포판마다</div><div class='add'>+제공하는 다른 릴리즈의 수와 곱하게 되면 이번에는 각 릴리즈들의 다른 빌드</div><div class='add'>+옵션의 악몽과 마주하게  것이다. 또한 각 리눅스 배포판들은 다른 하드웨어</div><div class='add'>+종류에(다른 프로세서 타입과 다른 옵션들) 맞춰져 있는 많은 다른 커널들을</div><div class='add'>+배포한다. 그러므로 한번의 배포에서조차 여러분들의 모듈은 여러 버젼을</div><div class='add'>+만들 필요가 있다.</div><div class='add'>+</div><div class='add'>+나를 믿어라. 여러분들은 이러한 종류의 배포를 지원하려고 시도한다면 시간이</div><div class='add'>+지나면 미칠지경이 될 것이다. 난 이러한 것을 오래전에 아주 어렵게 배웠다...</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+변하지않는 커널 소스 인터페이스들</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+리눅스 커널 드라이버를 계속해서 메인 커널 트리에 반영하지 않고</div><div class='add'>+유지보수하려고 하는 사람들과 이 문제를 논의하게 되면 훨씬 더</div><div class='add'>+"논란의 여지가 많은" 주제가 될 것이다.</div><div class='add'>+</div><div class='add'>+리눅스 커널 개발은 끊임없이 빠른 속도로 이루어지고 있으며 결코</div><div class='add'>+느슨해진 적이 없다. 커널 개발자들이 현재 인터페이스들에서 버그를</div><div class='add'>+발견하거나 무엇인가 할 수 있는 더 좋은 방법을 찾게 되었다고 하자.</div><div class='add'>+그들이 발견한 것을 실행한다면 아마도 더 잘 동작하도록 현재 인터페이스들을</div><div class='add'>+수정하게 될 것이다. 그들이 그런 일을 하게되면 함수 이름들은 변하게 되고,</div><div class='add'>+구조체들은 늘어나거나 줄어들게 되고, 함수 파라미터들은 재작업될 것이다.</div><div class='add'>+이러한 일이 발생되면 커널 내에 이 인터페이스를 사용했던 인스턴스들이 동시에</div><div class='add'>+수정될 것이며 이러한 과정은 모든 것이 계속해서 올바르게 동작할 것이라는</div><div class='add'>+것을 보장한다.</div><div class='add'>+</div><div class='add'>+이러한 것의 한 예로써, 커널 내부의 USB 인터페이스들은 이 서브시스템이</div><div class='add'>+생긴 이후로 적어도 3번의 다른 재작업을 겪었다. 이 재작업들은 많은 다른</div><div class='add'>+문제들을 풀었다.</div><div class='add'>+   - 데이터 스트림들의 동기적인 모델에서 비동기적인 모델로의 변화. 이것은</div><div class='add'>+     많은 드라이버들의 복잡성을 줄이고 처리량을 향상시켜 현재는 거의 모든</div><div class='add'>+     USB 장치들의 거의 최대 속도로 실행되고 있다.</div><div class='add'>+   - USB 드라이버가 USB 코어로부터 데이터 패킷들을 할당받로록 한 변경으로</div><div class='add'>+     인해서 지금의 모든 드라이버들은 많은 문서화된 데드락을 수정하기 위하여</div><div class='add'>+     USB 코어에게 더 많은 정보를 제공해야만 한다.</div><div class='add'>+</div><div class='add'>+이것은 오랫동안 자신의 오래된 USB 인터페이스들을 유지해야 하는 closed 운영체제들과는</div><div class='add'>+완전히 반대되는 것이다. closed된 운영체제들은 새로운 개발자들에게 우연히 낡은</div><div class='add'>+인터페이스를 사용하게 할 기회를 주게되며, 적절하지 못한 방법으로 처리하게 되어</div><div class='add'>+운영체제의 안정성을 해치는 문제를 야기하게 된다.</div><div class='add'>+</div><div class='add'>+이 두가지의 예들 모두, 모든 개발자들은 꼭 이루어져야 하는 중요한 변화들이라고</div><div class='add'>+동의를 하였고 비교적 적은 고통으로 변경되어졌다. 리눅스가 변하지 않는 소스</div><div class='add'>+인터페이스를 고집한다면, 새로운 인터페이스가 만들어지게 되며 반면 기존의 오래된</div><div class='add'>+것들, 그리고 깨진 것들은 계속해서 유지되어야 하며 이러한 일들은 USB 개발자들에게</div><div class='add'>+또 다른 일거리를 주게 된다. 모든 리눅스 USB 개발자들에게 자신의 그들의 업무를</div><div class='add'>+마친 후 시간을 투자하여 아무 득도 없는 무료 봉사를 해달라고 하는 것은 가능성이</div><div class='add'>+희박한 일이다.</div><div class='add'>+</div><div class='add'>+보안 문제 역시 리눅스에게는 매우 중요하다. 보안 문제가 발견되면 그것은</div><div class='add'>+매우 짧은 시간 안에 수정된다. 보안 문제는 그 문제를 해결하기 위하여</div><div class='add'>+여러번 내부 커널 인터페이스들을 재작업하게 만들었다. 이러한 문제가</div><div class='add'>+발생하였을 때 그 인터페이스들을 사용하는 모든 드라이버들도 동시에</div><div class='add'>+수정되어 보안 문제가 앞으로 갑작스럽게 생기지는 않을 것이라는 것을</div><div class='add'>+보장한다. 내부 인터페이스들의 변경이 허락되지 않으면 이러한 종류의 보안</div><div class='add'>+문제를 수정하고 그것이 다시 발생하지 않을 것이라고 보장하는 것은 가능하지</div><div class='add'>+않을 것이다.</div><div class='add'>+</div><div class='add'>+커널 인터페이스들은 계속해서 정리되고 있다. 현재 인터페이스를 사용하는</div><div class='add'>+사람이 한명도 없다면 그것은 삭제된다. 이것은 커널이 가능한한 가장 작게</div><div class='add'>+유지되며 존재하는 모든 가능성이 있는 인터페이스들이 테스트된다는 것을</div><div class='add'>+보장한다(사용되지 않는 인터페이스들은 유효성 검증을 하기가 거의 불가능하다).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+무엇을 해야 하나</div><div class='add'>+---------------</div><div class='add'>+자, 여러분이 메인 커널 트리에 있지 않은 리눅스 커널 드라이버를 가지고</div><div class='add'>+있다면 여러분은 즉, 개발자는 무엇을 해야 하나? 모든 배포판마다 다른</div><div class='add'>+커널 버젼을 위한 바이너리 드라이버를 배포하는 것은 악몽이며 계속해서</div><div class='add'>+변하고 있는 커널 인터페이스들의 맞처 유지보수하려고 시도하는 것은 힘든</div><div class='add'>+일이다.</div><div class='add'>+</div><div class='add'>+간단하다. 여러분의 커널 드라이버를 메인 커널 트리에 반영하라(우리는 여기서</div><div class='add'>+GPL을 따르는 배포 드라이버에 관해 얘기하고 있다는 것을 상기하라. 여러분의</div><div class='add'>+코드가 이러한 분류에 해당되지 않는다면 행운을 빈다. 여러분 스스로 어떻게든</div><div class='add'>+해야만 한다). 여러분의 드라이버가 트리에 있게되면 커널 인터페이스가</div><div class='add'>+변경되더라도 가장 먼저 커널에 변경을 가했던 사람에 의해서 수정될 것이다.</div><div class='add'>+이것은 여러분의 드라이버가 여러분의 별다른 노력없이 항상 빌드가 가능하며</div><div class='add'>+동작하는 것을 보장한다.</div><div class='add'>+</div><div class='add'>+메인 커널 트리에 여러분의 드라이버를 반영하면 얻게 되는 장점들은 다음과 같다.</div><div class='add'>+   - 관리에 드는 비용(원래 개발자의)은 줄어줄면서 드라이버의 질은 향상될 것이다.</div><div class='add'>+   - 다른 개발자들이 여러분의 드라이버에 기능들을 추가 할 것이다.</div><div class='add'>+   - 다른 사람들은 여러분의 드라이버에 버그를 발견하고 수정할 것이다.</div><div class='add'>+   - 다른 사람들은 여러분의 드라이버의 개선점을 찾을 줄 것이다.</div><div class='add'>+   - 외부 인터페이스 변경으로 인해 여러분의 드라이버의 수정이 필요하다면 다른</div><div class='add'>+     사람들이 드라이버를 업데이트할 것이다.</div><div class='add'>+   - 여러분의 드라이버는 별다른 노력 없이 모든 리눅스 배포판에  자동적으로</div><div class='add'>+     추가될 것이다.</div><div class='add'>+</div><div class='add'>+리눅스는 다른 운영 체제보다 "쉽게 쓸수 있는(out of the box)" 많은 다른 장치들을</div><div class='add'>+지원하고 어떤 다른 운영 체제보다 다양한 아키텍쳐위에서 이러한 장치들을 지원하기 때문에</div><div class='add'>+이러한 증명된 개발 모델은 틀림없이 바로 가고 있는 것이다.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+------</div><div class='add'>+</div><div class='add'>+이 문서의 초안을 검토해주고 코멘트 해준 Randy Dunlap, Andrew Morton, David Brownell,</div><div class='add'>+Hanna Linder, Robert Love, 그리고 Nishanth Aravamudan에게 감사한다.</div><div class='head'>diff --git a/Documentation/translations/zh_CN/HOWTO b/Documentation/translations/zh_CN/HOWTO<br/>new file mode 100644<br/>index 000000000000..11be075ba5fa<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/HOWTO?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/HOWTO</a></div><div class='hunk'>@@ -0,0 +1,536 @@</div><div class='add'>+Chinese translated version of Documentation/process/howto.rst</div><div class='add'>+</div><div class='add'>+If you have any comment or update to the content, please contact the</div><div class='add'>+original document maintainer directly.  However, if you have a problem</div><div class='add'>+communicating in English you can also ask the Chinese maintainer for</div><div class='add'>+help.  Contact the Chinese maintainer if this translation is outdated</div><div class='add'>+or if there is a problem with the translation.</div><div class='add'>+</div><div class='add'>+Maintainer: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='add'>+Chinese maintainer: Li Yang &lt;leoli@freescale.com&gt;</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+Documentation/process/howto.rst 的中文翻译</div><div class='add'>+</div><div class='add'>+如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='add'>+交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='add'>+译存在问题，请联系中文版维护者。</div><div class='add'>+</div><div class='add'>+英文版维护者： Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='add'>+中文版维护者： 李阳  Li Yang &lt;leoli@freescale.com&gt;</div><div class='add'>+中文版翻译者： 李阳  Li Yang &lt;leoli@freescale.com&gt;</div><div class='add'>+中文版校译者： 钟宇  TripleX Chung &lt;xxx.phy@gmail.com&gt;</div><div class='add'>+               陈琦  Maggie Chen &lt;chenqi@beyondsoft.com&gt;</div><div class='add'>+               王聪  Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+以下为正文</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+如何参与Linux内核开发</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+这是一篇将如何参与Linux内核开发的相关问题一网打尽的终极秘笈。它将指导你</div><div class='add'>+成为一名Linux内核开发者，并且学会如何同Linux内核开发社区合作。它尽可能不</div><div class='add'>+包括任何关于内核编程的技术细节，但会给你指引一条获得这些知识的正确途径。</div><div class='add'>+</div><div class='add'>+如果这篇文章中的任何内容不再适用，请给文末列出的文件维护者发送补丁。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+入门</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+你想了解如何成为一名Linux内核开发者？或者老板吩咐你“给这个设备写个Linux</div><div class='add'>+驱动程序”？这篇文章的目的就是教会你达成这些目标的全部诀窍，它将描述你需</div><div class='add'>+要经过的流程以及给出如何同内核社区合作的一些提示。它还将试图解释内核社区</div><div class='add'>+为何这样运作。</div><div class='add'>+</div><div class='add'>+Linux内核大部分是由C语言写成的，一些体系结构相关的代码用到了汇编语言。要</div><div class='add'>+参与内核开发，你必须精通C语言。除非你想为某个架构开发底层代码，否则你并</div><div class='add'>+不需要了解（任何体系结构的）汇编语言。下面列举的书籍虽然不能替代扎实的C</div><div class='add'>+语言教育和多年的开发经验，但如果需要的话，做为参考还是不错的：</div><div class='add'>+ - "The C Programming Language" by Kernighan and Ritchie [Prentice Hall]</div><div class='add'>+   《C程序设计语言（第2版·新版）》（徐宝文 李志 译）[机械工业出版社]</div><div class='add'>+ - "Practical C Programming" by Steve Oualline [O'Reilly]</div><div class='add'>+   《实用C语言编程（第三版）》（郭大海 译）[中国电力出版社]</div><div class='add'>+ - "C:  A Reference Manual" by Harbison and Steele [Prentice Hall]</div><div class='add'>+   《C语言参考手册（原书第5版）》（邱仲潘 等译）[机械工业出版社]</div><div class='add'>+</div><div class='add'>+Linux内核使用GNU C和GNU工具链开发。虽然它遵循ISO C89标准，但也用到了一些</div><div class='add'>+标准中没有定义的扩展。内核是自给自足的C环境，不依赖于标准C库的支持，所以</div><div class='add'>+并不支持C标准中的部分定义。比如long long类型的大数除法和浮点运算就不允许</div><div class='add'>+使用。有时候确实很难弄清楚内核对工具链的要求和它所使用的扩展，不幸的是目</div><div class='add'>+前还没有明确的参考资料可以解释它们。请查阅gcc信息页（使用“info gcc”命令</div><div class='add'>+显示）获得一些这方面信息。</div><div class='add'>+</div><div class='add'>+请记住你是在学习怎么和已经存在的开发社区打交道。它由一群形形色色的人组成，</div><div class='add'>+他们对代码、风格和过程有着很高的标准。这些标准是在长期实践中总结出来的，</div><div class='add'>+适应于地理上分散的大型开发团队。它们已经被很好得整理成档，建议你在开发</div><div class='add'>+之前尽可能多的学习这些标准，而不要期望别人来适应你或者你公司的行为方式。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+法律问题</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+Linux内核源代码都是在GPL（通用公共许可证）的保护下发布的。要了解这种许可</div><div class='add'>+的细节请查看源代码主目录下的COPYING文件。如果你对它还有更深入问题请联系</div><div class='add'>+律师，而不要在Linux内核邮件组上提问。因为邮件组里的人并不是律师，不要期</div><div class='add'>+望他们的话有法律效力。</div><div class='add'>+</div><div class='add'>+对于GPL的常见问题和解答，请访问以下链接：</div><div class='add'>+	http://www.gnu.org/licenses/gpl-faq.html</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+文档</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+Linux内核代码中包含有大量的文档。这些文档对于学习如何与内核社区互动有着</div><div class='add'>+不可估量的价值。当一个新的功能被加入内核，最好把解释如何使用这个功能的文</div><div class='add'>+档也放进内核。当内核的改动导致面向用户空间的接口发生变化时，最好将相关信</div><div class='add'>+息或手册页(manpages)的补丁发到mtk.manpages@gmail.com，以向手册页(manpages)</div><div class='add'>+的维护者解释这些变化。</div><div class='add'>+</div><div class='add'>+以下是内核代码中需要阅读的文档：</div><div class='add'>+  README</div><div class='add'>+    文件简要介绍了Linux内核的背景，并且描述了如何配置和编译内核。内核的</div><div class='add'>+    新用户应该从这里开始。</div><div class='add'>+</div><div class='add'>+  Documentation/process/changes.rst</div><div class='add'>+    文件给出了用来编译和使用内核所需要的最小软件包列表。</div><div class='add'>+</div><div class='add'>+  Documentation/process/coding-style.rst</div><div class='add'>+    描述Linux内核的代码风格和理由。所有新代码需要遵守这篇文档中定义的规</div><div class='add'>+    范。大多数维护者只会接收符合规定的补丁，很多人也只会帮忙检查符合风格</div><div class='add'>+    的代码。</div><div class='add'>+</div><div class='add'>+  Documentation/process/submitting-patches.rst</div><div class='add'>+  Documentation/process/submitting-drivers.rst</div><div class='add'>+    这两份文档明确描述如何创建和发送补丁，其中包括（但不仅限于)：</div><div class='add'>+       - 邮件内容</div><div class='add'>+       - 邮件格式</div><div class='add'>+       - 选择收件人</div><div class='add'>+    遵守这些规定并不能保证提交成功（因为所有补丁需要通过严格的内容和风格</div><div class='add'>+    审查），但是忽视他们几乎就意味着失败。</div><div class='add'>+</div><div class='add'>+    其他关于如何正确地生成补丁的优秀文档包括：</div><div class='add'>+    "The Perfect Patch"</div><div class='add'>+        http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='add'>+    "Linux kernel patch submission format"</div><div class='add'>+        http://linux.yyz.us/patch-format.html</div><div class='add'>+</div><div class='add'>+  Documentation/process/stable-api-nonsense.rst</div><div class='add'>+    论证内核为什么特意不包括稳定的内核内部API，也就是说不包括像这样的特</div><div class='add'>+    性：</div><div class='add'>+       - 子系统中间层（为了兼容性？）</div><div class='add'>+       - 在不同操作系统间易于移植的驱动程序</div><div class='add'>+       - 减缓（甚至阻止）内核代码的快速变化</div><div class='add'>+    这篇文档对于理解Linux的开发哲学至关重要。对于将开发平台从其他操作系</div><div class='add'>+    统转移到Linux的人来说也很重要。</div><div class='add'>+</div><div class='add'>+  Documentation/admin-guide/security-bugs.rst</div><div class='add'>+    如果你认为自己发现了Linux内核的安全性问题，请根据这篇文档中的步骤来</div><div class='add'>+    提醒其他内核开发者并帮助解决这个问题。</div><div class='add'>+</div><div class='add'>+  Documentation/process/management-style.rst</div><div class='add'>+    描述内核维护者的工作方法及其共有特点。这对于刚刚接触内核开发（或者对</div><div class='add'>+    它感到好奇）的人来说很重要，因为它解释了很多对于内核维护者独特行为的</div><div class='add'>+    普遍误解与迷惑。</div><div class='add'>+</div><div class='add'>+  Documentation/process/stable-kernel-rules.rst</div><div class='add'>+    解释了稳定版内核发布的规则，以及如何将改动放入这些版本的步骤。</div><div class='add'>+</div><div class='add'>+  Documentation/process/kernel-docs.rst</div><div class='add'>+    有助于内核开发的外部文档列表。如果你在内核自带的文档中没有找到你想找</div><div class='add'>+    的内容，可以查看这些文档。</div><div class='add'>+</div><div class='add'>+  Documentation/process/applying-patches.rst</div><div class='add'>+    关于补丁是什么以及如何将它打在不同内核开发分支上的好介绍</div><div class='add'>+</div><div class='add'>+内核还拥有大量从代码自动生成的文档。它包含内核内部API的全面介绍以及如何</div><div class='add'>+妥善处理加锁的规则。生成的文档会放在 Documentation/DocBook/目录下。在内</div><div class='add'>+核源码的主目录中使用以下不同命令将会分别生成PDF、Postscript、HTML和手册</div><div class='add'>+页等不同格式的文档：</div><div class='add'>+    make pdfdocs</div><div class='add'>+    make psdocs</div><div class='add'>+    make htmldocs</div><div class='add'>+    make mandocs</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+如何成为内核开发者</div><div class='add'>+------------------</div><div class='add'>+如果你对Linux内核开发一无所知，你应该访问“Linux内核新手”计划：</div><div class='add'>+	http://kernelnewbies.org</div><div class='add'>+它拥有一个可以问各种最基本的内核开发问题的邮件列表（在提问之前一定要记得</div><div class='add'>+查找已往的邮件，确认是否有人已经回答过相同的问题）。它还拥有一个可以获得</div><div class='add'>+实时反馈的IRC聊天频道，以及大量对于学习Linux内核开发相当有帮助的文档。</div><div class='add'>+</div><div class='add'>+网站简要介绍了源代码组织结构、子系统划分以及目前正在进行的项目（包括内核</div><div class='add'>+中的和单独维护的）。它还提供了一些基本的帮助信息，比如如何编译内核和打补</div><div class='add'>+丁。</div><div class='add'>+</div><div class='add'>+如果你想加入内核开发社区并协助完成一些任务，却找不到从哪里开始，可以访问</div><div class='add'>+“Linux内核房管员”计划：</div><div class='add'>+	http://kernelnewbies.org/KernelJanitors</div><div class='add'>+这是极佳的起点。它提供一个相对简单的任务列表，列出内核代码中需要被重新</div><div class='add'>+整理或者改正的地方。通过和负责这个计划的开发者们一同工作，你会学到将补丁</div><div class='add'>+集成进内核的基本原理。如果还没有决定下一步要做什么的话，你还可能会得到方</div><div class='add'>+向性的指点。</div><div class='add'>+</div><div class='add'>+如果你已经有一些现成的代码想要放到内核中，但是需要一些帮助来使它们拥有正</div><div class='add'>+确的格式。请访问“内核导师”计划。这个计划就是用来帮助你完成这个目标的。它</div><div class='add'>+是一个邮件列表，地址如下：</div><div class='add'>+	http://selenic.com/mailman/listinfo/kernel-mentors</div><div class='add'>+</div><div class='add'>+在真正动手修改内核代码之前，理解要修改的代码如何运作是必需的。要达到这个</div><div class='add'>+目的，没什么办法比直接读代码更有效了（大多数花招都会有相应的注释），而且</div><div class='add'>+一些特制的工具还可以提供帮助。例如，“Linux代码交叉引用”项目就是一个值得</div><div class='add'>+特别推荐的帮助工具，它将源代码显示在有编目和索引的网页上。其中一个更新及</div><div class='add'>+时的内核源码库，可以通过以下地址访问：</div><div class='add'>+	http://sosdg.org/~coywolf/lxr/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+开发流程</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+目前Linux内核开发流程包括几个“主内核分支”和很多子系统相关的内核分支。这</div><div class='add'>+些分支包括：</div><div class='add'>+  - 2.6.x主内核源码树</div><div class='add'>+  - 2.6.x.y -stable内核源码树</div><div class='add'>+  - 2.6.x -git内核补丁集</div><div class='add'>+  - 2.6.x -mm内核补丁集</div><div class='add'>+  - 子系统相关的内核源码树和补丁集</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.6.x内核主源码树</div><div class='add'>+-----------------</div><div class='add'>+2.6.x内核是由Linus Torvalds（Linux的创造者）亲自维护的。你可以在</div><div class='add'>+kernel.org网站的pub/linux/kernel/v2.6/目录下找到它。它的开发遵循以下步</div><div class='add'>+骤：</div><div class='add'>+  - 每当一个新版本的内核被发布，为期两周的集成窗口将被打开。在这段时间里</div><div class='add'>+    维护者可以向Linus提交大段的修改，通常这些修改已经被放到-mm内核中几个</div><div class='add'>+    星期了。提交大量修改的首选方式是使用git工具（内核的代码版本管理工具</div><div class='add'>+    ，更多的信息可以在http://git-scm.com/获取），不过使用普通补丁也是可以</div><div class='add'>+    的。</div><div class='add'>+  - 两个星期以后-rc1版本内核发布。之后只有不包含可能影响整个内核稳定性的</div><div class='add'>+    新功能的补丁才可能被接受。请注意一个全新的驱动程序（或者文件系统）有</div><div class='add'>+    可能在-rc1后被接受是因为这样的修改完全独立，不会影响其他的代码，所以</div><div class='add'>+    没有造成内核退步的风险。在-rc1以后也可以用git向Linus提交补丁，不过所</div><div class='add'>+    有的补丁需要同时被发送到相应的公众邮件列表以征询意见。</div><div class='add'>+  - 当Linus认为当前的git源码树已经达到一个合理健全的状态足以发布供人测试</div><div class='add'>+    时，一个新的-rc版本就会被发布。计划是每周都发布新的-rc版本。</div><div class='add'>+  - 这个过程一直持续下去直到内核被认为达到足够稳定的状态，持续时间大概是</div><div class='add'>+    6个星期。</div><div class='add'>+</div><div class='add'>+关于内核发布，值得一提的是Andrew Morton在linux-kernel邮件列表中如是说：</div><div class='add'>+	“没有人知道新内核何时会被发布，因为发布是根据已知bug的情况来决定</div><div class='add'>+	的，而不是根据一个事先制定好的时间表。”</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.6.x.y -stable（稳定版）内核源码树</div><div class='add'>+-----------------------------------</div><div class='add'>+由4个数字组成的内核版本号说明此内核是-stable版本。它们包含基于2.6.x版本</div><div class='add'>+内核的相对较小且至关重要的修补，这些修补针对安全性问题或者严重的内核退步。</div><div class='add'>+</div><div class='add'>+这种版本的内核适用于那些期望获得最新的稳定版内核并且不想参与测试开发版或</div><div class='add'>+者实验版的用户。</div><div class='add'>+</div><div class='add'>+如果没有2.6.x.y版本内核存在，那么最新的2.6.x版本内核就相当于是当前的稳定</div><div class='add'>+版内核。</div><div class='add'>+</div><div class='add'>+2.6.x.y版本由“稳定版”小组（邮件地址&lt;stable@vger.kernel.org&gt;）维护，一般隔周发</div><div class='add'>+布新版本。</div><div class='add'>+</div><div class='add'>+内核源码中的Documentation/process/stable-kernel-rules.rst文件具体描述了可被稳定</div><div class='add'>+版内核接受的修改类型以及发布的流程。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.6.x -git补丁集</div><div class='add'>+----------------</div><div class='add'>+Linus的内核源码树的每日快照，这个源码树是由git工具管理的（由此得名）。这</div><div class='add'>+些补丁通常每天更新以反映Linus的源码树的最新状态。它们比-rc版本的内核源码</div><div class='add'>+树更具试验性质，因为这个补丁集是全自动生成的，没有任何人来确认其是否真正</div><div class='add'>+健全。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.6.x -mm补丁集</div><div class='add'>+---------------</div><div class='add'>+这是由Andrew Morton维护的试验性内核补丁集。Andrew将所有子系统的内核源码</div><div class='add'>+和补丁拼凑到一起，并且加入了大量从linux-kernel邮件列表中采集的补丁。这个</div><div class='add'>+源码树是新功能和补丁的试炼场。当补丁在-mm补丁集里证明了其价值以后Andrew</div><div class='add'>+或者相应子系统的维护者会将补丁发给Linus以便集成进主内核源码树。</div><div class='add'>+</div><div class='add'>+在将所有新补丁发给Linus以集成到主内核源码树之前，我们非常鼓励先把这些补</div><div class='add'>+丁放在-mm版内核源码树中进行测试。</div><div class='add'>+</div><div class='add'>+这些内核版本不适合在需要稳定运行的系统上运行，因为运行它们比运行任何其他</div><div class='add'>+内核分支都更具有风险。</div><div class='add'>+</div><div class='add'>+如果你想为内核开发进程提供帮助，请尝试并使用这些内核版本，并在</div><div class='add'>+linux-kernel邮件列表中提供反馈，告诉大家你遇到了问题还是一切正常。</div><div class='add'>+</div><div class='add'>+通常-mm版补丁集不光包括这些额外的试验性补丁，还包括发布时-git版主源码树</div><div class='add'>+中的改动。</div><div class='add'>+</div><div class='add'>+-mm版内核没有固定的发布周期，但是通常在每两个-rc版内核发布之间都会有若干</div><div class='add'>+个-mm版内核发布（一般是1至3个）。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+子系统相关内核源码树和补丁集</div><div class='add'>+----------------------------</div><div class='add'>+相当一部分内核子系统开发者会公开他们自己的开发源码树，以便其他人能了解内</div><div class='add'>+核的不同领域正在发生的事情。如上所述，这些源码树会被集成到-mm版本内核中。</div><div class='add'>+</div><div class='add'>+下面是目前可用的一些内核源码树的列表：</div><div class='add'>+  通过git管理的源码树：</div><div class='add'>+    - Kbuild开发源码树， Sam Ravnborg &lt;sam@ravnborg.org&gt;</div><div class='add'>+	git.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git</div><div class='add'>+</div><div class='add'>+    - ACPI开发源码树, Len Brown &lt;len.brown@intel.com&gt;</div><div class='add'>+	git.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git</div><div class='add'>+</div><div class='add'>+    - 块设备开发源码树, Jens Axboe &lt;axboe@suse.de&gt;</div><div class='add'>+	git.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git</div><div class='add'>+</div><div class='add'>+    - DRM开发源码树, Dave Airlie &lt;airlied@linux.ie&gt;</div><div class='add'>+	git.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git</div><div class='add'>+</div><div class='add'>+    - ia64开发源码树, Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='add'>+	git.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git</div><div class='add'>+</div><div class='add'>+    - ieee1394开发源码树, Jody McIntyre &lt;scjody@modernduck.com&gt;</div><div class='add'>+	git.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394.git</div><div class='add'>+</div><div class='add'>+    - infiniband开发源码树, Roland Dreier &lt;rolandd@cisco.com&gt;</div><div class='add'>+	git.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git</div><div class='add'>+</div><div class='add'>+    - libata开发源码树, Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='add'>+	git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git</div><div class='add'>+</div><div class='add'>+    - 网络驱动程序开发源码树, Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='add'>+	git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git</div><div class='add'>+</div><div class='add'>+    - pcmcia开发源码树, Dominik Brodowski &lt;linux@dominikbrodowski.net&gt;</div><div class='add'>+	git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git</div><div class='add'>+</div><div class='add'>+    - SCSI开发源码树, James Bottomley &lt;James.Bottomley@SteelEye.com&gt;</div><div class='add'>+	git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git</div><div class='add'>+</div><div class='add'>+  使用quilt管理的补丁集：</div><div class='add'>+    - USB, PCI, 驱动程序核心和I2C, Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='add'>+	kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/</div><div class='add'>+    - x86-64, 部分i386, Andi Kleen &lt;ak@suse.de&gt;</div><div class='add'>+	ftp.firstfloor.org:/pub/ak/x86_64/quilt/</div><div class='add'>+</div><div class='add'>+  其他内核源码树可以在http://git.kernel.org的列表中和MAINTAINERS文件里</div><div class='add'>+  找到。</div><div class='add'>+</div><div class='add'>+报告bug</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+bugzilla.kernel.org是Linux内核开发者们用来跟踪内核Bug的网站。我们鼓励用</div><div class='add'>+户在这个工具中报告找到的所有bug。如何使用内核bugzilla的细节请访问：</div><div class='add'>+	http://test.kernel.org/bugzilla/faq.html</div><div class='add'>+</div><div class='add'>+内核源码主目录中的admin-guide/reporting-bugs.rst文件里有一个很好的模板。它指导用户如何报</div><div class='add'>+告可能的内核bug以及需要提供哪些信息来帮助内核开发者们找到问题的根源。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+利用bug报告</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+练习内核开发技能的最好办法就是修改其他人报告的bug。你不光可以帮助内核变</div><div class='add'>+得更加稳定，还可以学会如何解决实际问题从而提高自己的技能，并且让其他开发</div><div class='add'>+者感受到你的存在。修改bug是赢得其他开发者赞誉的最好办法，因为并不是很多</div><div class='add'>+人都喜欢浪费时间去修改别人报告的bug。</div><div class='add'>+</div><div class='add'>+要尝试修改已知的bug，请访问http://bugzilla.kernel.org网址。如果你想获得</div><div class='add'>+最新bug的通知，可以订阅bugme-new邮件列表（只有新的bug报告会被寄到这里）</div><div class='add'>+或者订阅bugme-janitor邮件列表（所有bugzilla的变动都会被寄到这里）。</div><div class='add'>+</div><div class='add'>+	https://lists.linux-foundation.org/mailman/listinfo/bugme-new</div><div class='add'>+	https://lists.linux-foundation.org/mailman/listinfo/bugme-janitors</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+邮件列表</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+正如上面的文档所描述，大多数的骨干内核开发者都加入了Linux Kernel邮件列</div><div class='add'>+表。如何订阅和退订列表的细节可以在这里找到：</div><div class='add'>+	http://vger.kernel.org/vger-lists.html#linux-kernel</div><div class='add'>+网上很多地方都有这个邮件列表的存档(archive)。可以使用搜索引擎来找到这些</div><div class='add'>+存档。比如：</div><div class='add'>+	http://dir.gmane.org/gmane.linux.kernel</div><div class='add'>+在发信之前，我们强烈建议你先在存档中搜索你想要讨论的问题。很多已经被详细</div><div class='add'>+讨论过的问题只在邮件列表的存档中可以找到。</div><div class='add'>+</div><div class='add'>+大多数内核子系统也有自己独立的邮件列表来协调各自的开发工作。从</div><div class='add'>+MAINTAINERS文件中可以找到不同话题对应的邮件列表。</div><div class='add'>+</div><div class='add'>+很多邮件列表架设在kernel.org服务器上。这些列表的信息可以在这里找到：</div><div class='add'>+	http://vger.kernel.org/vger-lists.html</div><div class='add'>+</div><div class='add'>+在使用这些邮件列表时，请记住保持良好的行为习惯。下面的链接提供了与这些列</div><div class='add'>+表（或任何其它邮件列表）交流的一些简单规则，虽然内容有点滥竽充数。</div><div class='add'>+	http://www.albion.com/netiquette/</div><div class='add'>+</div><div class='add'>+当有很多人回复你的邮件时，邮件的抄送列表会变得很长。请不要将任何人从抄送</div><div class='add'>+列表中删除，除非你有足够的理由这么做。也不要只回复到邮件列表。请习惯于同</div><div class='add'>+一封邮件接收两次（一封来自发送者一封来自邮件列表），而不要试图通过添加一</div><div class='add'>+些奇特的邮件头来解决这个问题，人们不会喜欢的。</div><div class='add'>+</div><div class='add'>+记住保留你所回复内容的上下文和源头。在你回复邮件的顶部保留“某某某说到……”</div><div class='add'>+这几行。将你的评论加在被引用的段落之间而不要放在邮件的顶部。</div><div class='add'>+</div><div class='add'>+如果你在邮件中附带补丁，请确认它们是可以直接阅读的纯文本（如</div><div class='add'>+Documentation/process/submitting-patches.rst文档中所述）。内核开发者们不希望遇到附件</div><div class='add'>+或者被压缩了的补丁。只有这样才能保证他们可以直接评论你的每行代码。请确保</div><div class='add'>+你使用的邮件发送程序不会修改空格和制表符。一个防范性的测试方法是先将邮件</div><div class='add'>+发送给自己，然后自己尝试是否可以顺利地打上收到的补丁。如果测试不成功，请</div><div class='add'>+调整或者更换你的邮件发送程序直到它正确工作为止。</div><div class='add'>+</div><div class='add'>+总而言之，请尊重其他的邮件列表订阅者。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+同内核社区合作</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+内核社区的目标就是提供尽善尽美的内核。所以当你提交补丁期望被接受进内核的</div><div class='add'>+时候，它的技术价值以及其他方面都将被评审。那么你可能会得到什么呢？</div><div class='add'>+  - 批评</div><div class='add'>+  - 评论</div><div class='add'>+  - 要求修改</div><div class='add'>+  - 要求证明修改的必要性</div><div class='add'>+  - 沉默</div><div class='add'>+</div><div class='add'>+要记住，这些是把补丁放进内核的正常情况。你必须学会听取对补丁的批评和评论，</div><div class='add'>+从技术层面评估它们，然后要么重写你的补丁要么简明扼要地论证修改是不必要</div><div class='add'>+的。如果你发的邮件没有得到任何回应，请过几天后再试一次，因为有时信件会湮</div><div class='add'>+没在茫茫信海中。</div><div class='add'>+</div><div class='add'>+你不应该做的事情：</div><div class='add'>+  - 期望自己的补丁不受任何质疑就直接被接受</div><div class='add'>+  - 翻脸</div><div class='add'>+  - 忽略别人的评论</div><div class='add'>+  - 没有按照别人的要求做任何修改就重新提交</div><div class='add'>+</div><div class='add'>+在一个努力追寻最好技术方案的社区里，对于一个补丁有多少好处总会有不同的见</div><div class='add'>+解。你必须要抱着合作的态度，愿意改变自己的观点来适应内核的风格。或者至少</div><div class='add'>+愿意去证明你的想法是有价值的。记住，犯错误是允许的，只要你愿意朝着正确的</div><div class='add'>+方案去努力。</div><div class='add'>+</div><div class='add'>+如果你的第一个补丁换来的是一堆修改建议，这是很正常的。这并不代表你的补丁</div><div class='add'>+不会被接受，也不意味着有人和你作对。你只需要改正所有提出的问题然后重新发</div><div class='add'>+送你的补丁。</div><div class='add'>+</div><div class='add'>+内核社区和公司文化的差异</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+内核社区的工作模式同大多数传统公司开发队伍的工作模式并不相同。下面这些例</div><div class='add'>+子，可以帮助你避免某些可能发生问题：</div><div class='add'>+  用这些话介绍你的修改提案会有好处：</div><div class='add'>+    - 它同时解决了多个问题</div><div class='add'>+    - 它删除了2000行代码</div><div class='add'>+    - 这是补丁，它已经解释了我想要说明的</div><div class='add'>+    - 我在5种不同的体系结构上测试过它……</div><div class='add'>+    - 这是一系列小补丁用来……</div><div class='add'>+    - 这个修改提高了普通机器的性能……</div><div class='add'>+</div><div class='add'>+  应该避免如下的说法：</div><div class='add'>+    - 我们在AIX/ptx/Solaris就是这么做的，所以这么做肯定是好的……</div><div class='add'>+    - 我做这行已经20年了，所以……</div><div class='add'>+    - 为了我们公司赚钱考虑必须这么做</div><div class='add'>+    - 这是我们的企业产品线所需要的</div><div class='add'>+    - 这里是描述我观点的1000页设计文档</div><div class='add'>+    - 这是一个5000行的补丁用来……</div><div class='add'>+    - 我重写了现在乱七八糟的代码，这就是……</div><div class='add'>+    - 我被规定了最后期限，所以这个补丁需要立刻被接受</div><div class='add'>+</div><div class='add'>+另外一个内核社区与大部分传统公司的软件开发队伍不同的地方是无法面对面地交</div><div class='add'>+流。使用电子邮件和IRC聊天工具做为主要沟通工具的一个好处是性别和种族歧视</div><div class='add'>+将会更少。Linux内核的工作环境更能接受妇女和少数族群，因为每个人在别人眼</div><div class='add'>+里只是一个邮件地址。国际化也帮助了公平的实现，因为你无法通过姓名来判断人</div><div class='add'>+的性别。男人有可能叫李丽，女人也有可能叫王刚。大多数在Linux内核上工作过</div><div class='add'>+并表达过看法的女性对在linux上工作的经历都给出了正面的评价。</div><div class='add'>+</div><div class='add'>+对于一些不习惯使用英语的人来说，语言可能是一个引起问题的障碍。在邮件列表</div><div class='add'>+中要正确地表达想法必需良好地掌握语言，所以建议你在发送邮件之前最好检查一</div><div class='add'>+下英文写得是否正确。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+拆分修改</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+Linux内核社区并不喜欢一下接收大段的代码。修改需要被恰当地介绍、讨论并且</div><div class='add'>+拆分成独立的小段。这几乎完全和公司中的习惯背道而驰。你的想法应该在开发最</div><div class='add'>+开始的阶段就让大家知道，这样你就可以及时获得对你正在进行的开发的反馈。这</div><div class='add'>+样也会让社区觉得你是在和他们协作，而不是仅仅把他们当作倾销新功能的对象。</div><div class='add'>+无论如何，你不要一次性地向邮件列表发送50封信，你的补丁序列应该永远用不到</div><div class='add'>+这么多。</div><div class='add'>+</div><div class='add'>+将补丁拆开的原因如下：</div><div class='add'>+</div><div class='add'>+1) 小的补丁更有可能被接受，因为它们不需要太多的时间和精力去验证其正确性。</div><div class='add'>+   一个5行的补丁，可能在维护者看了一眼以后就会被接受。而500行的补丁则</div><div class='add'>+   需要数个小时来审查其正确性（所需时间随补丁大小增加大约呈指数级增长）。</div><div class='add'>+</div><div class='add'>+   当出了问题的时候，小的补丁也会让调试变得非常容易。一个一个补丁地回溯</div><div class='add'>+   将会比仔细剖析一个被打上的大补丁（这个补丁破坏了其他东西）容易得多。</div><div class='add'>+</div><div class='add'>+2）不光发送小的补丁很重要，在提交之前重新编排、化简（或者仅仅重新排列）</div><div class='add'>+   补丁也是很重要的。</div><div class='add'>+</div><div class='add'>+这里有内核开发者Al Viro打的一个比方：</div><div class='add'>+	“想象一个老师正在给学生批改数学作业。老师并不希望看到学生为了得</div><div class='add'>+	到正确解法所进行的尝试和产生的错误。他希望看到的是最干净最优雅的</div><div class='add'>+	解答。好学生了解这点，绝不会把最终解决之前的中间方案提交上去。”</div><div class='add'>+</div><div class='add'>+	内核开发也是这样。维护者和评审者不希望看到一个人在解决问题时的思</div><div class='add'>+	考过程。他们只希望看到简单和优雅的解决方案。</div><div class='add'>+</div><div class='add'>+直接给出一流的解决方案，和社区一起协作讨论尚未完成的工作，这两者之间似乎</div><div class='add'>+很难找到一个平衡点。所以最好尽早开始收集有利于你进行改进的反馈；同时也要</div><div class='add'>+保证修改分成很多小块，这样在整个项目都准备好被包含进内核之前，其中的一部</div><div class='add'>+分可能会先被接收。</div><div class='add'>+</div><div class='add'>+必须了解这样做是不可接受的：试图将未完成的工作提交进内核，然后再找时间修</div><div class='add'>+复。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+证明修改的必要性</div><div class='add'>+----------------</div><div class='add'>+除了将补丁拆成小块，很重要的一点是让Linux社区了解他们为什么需要这样修改。</div><div class='add'>+你必须证明新功能是有人需要的并且是有用的。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+记录修改</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+当你发送补丁的时候，需要特别留意邮件正文的内容。因为这里的信息将会做为补</div><div class='add'>+丁的修改记录(ChangeLog)，会被一直保留以备大家查阅。它需要完全地描述补丁，</div><div class='add'>+包括：</div><div class='add'>+  - 为什么需要这个修改</div><div class='add'>+  - 补丁的总体设计</div><div class='add'>+  - 实现细节</div><div class='add'>+  - 测试结果</div><div class='add'>+</div><div class='add'>+想了解它具体应该看起来像什么，请查阅以下文档中的“ChangeLog”章节：</div><div class='add'>+  “The Perfect Patch”</div><div class='add'>+  	 http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+这些事情有时候做起来很难。要在任何方面都做到完美可能需要好几年时间。这是</div><div class='add'>+一个持续提高的过程，它需要大量的耐心和决心。只要不放弃，你一定可以做到。</div><div class='add'>+很多人已经做到了，而他们都曾经和现在的你站在同样的起点上。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+---------------</div><div class='add'>+感谢Paolo Ciarrocchi允许“开发流程”部分基于他所写的文章</div><div class='add'>+(http://www.kerneltravel.net/newbie/2.6-development_process)，感谢Randy</div><div class='add'>+Dunlap和Gerrit Huizenga完善了应该说和不该说的列表。感谢Pat Mochel, Hanna</div><div class='add'>+Linder, Randy Dunlap, Kay Sievers, Vojtech Pavlik, Jan Kara, Josh Boyer,</div><div class='add'>+Kees Cook, Andrew Morton, Andi Kleen, Vadim Lobanov, Jesper Juhl, Adrian</div><div class='add'>+Bunk, Keri Harris, Frans Pop, David A. Wheeler, Junio Hamano, Michael</div><div class='add'>+Kerrisk和Alex Shepard的评审、建议和贡献。没有他们的帮助，这篇文档是不可</div><div class='add'>+能完成的。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+英文版维护者： Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/Documentation/zh_CN/IRQ.txt b/Documentation/translations/zh_CN/IRQ.txt<br/>index 956026d5cf82..956026d5cf82 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/IRQ.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/IRQ.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/IRQ.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/IRQ.txt</a></div><div class='head'>diff --git a/Documentation/translations/zh_CN/SecurityBugs b/Documentation/translations/zh_CN/SecurityBugs<br/>new file mode 100644<br/>index 000000000000..2d0fffd122ce<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/SecurityBugs?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/SecurityBugs</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+Chinese translated version of Documentation/admin-guide/security-bugs.rst</div><div class='add'>+</div><div class='add'>+If you have any comment or update to the content, please contact the</div><div class='add'>+original document maintainer directly.  However, if you have a problem</div><div class='add'>+communicating in English you can also ask the Chinese maintainer for</div><div class='add'>+help.  Contact the Chinese maintainer if this translation is outdated</div><div class='add'>+or if there is a problem with the translation.</div><div class='add'>+</div><div class='add'>+Chinese maintainer: Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+Documentation/admin-guide/security-bugs.rst 的中文翻译</div><div class='add'>+</div><div class='add'>+如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='add'>+交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='add'>+译存在问题，请联系中文版维护者。</div><div class='add'>+</div><div class='add'>+中文版维护者： 贾威威 Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='add'>+中文版翻译者： 贾威威 Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='add'>+中文版校译者： 贾威威 Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+以下为正文</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+Linux内核开发者认为安全非常重要。因此，我们想要知道当一个有关于</div><div class='add'>+安全的漏洞被发现的时候，并且它可能会被尽快的修复或者公开。请把这个安全</div><div class='add'>+漏洞报告给Linux内核安全团队。</div><div class='add'>+</div><div class='add'>+1) 联系</div><div class='add'>+</div><div class='add'>+linux内核安全团队可以通过email&lt;security@kernel.org&gt;来联系。这是</div><div class='add'>+一组独立的安全工作人员，可以帮助改善漏洞报告并且公布和取消一个修复。安</div><div class='add'>+全团队有可能会从部分的维护者那里引进额外的帮助来了解并且修复安全漏洞。</div><div class='add'>+当遇到任何漏洞，所能提供的信息越多就越能诊断和修复。如果你不清楚什么</div><div class='add'>+是有帮助的信息，那就请重温一下admin-guide/reporting-bugs.rst文件中的概述过程。任</div><div class='add'>+何攻击性的代码都是非常有用的，未经报告者的同意不会被取消，除非它已经</div><div class='add'>+被公布于众。</div><div class='add'>+</div><div class='add'>+2) 公开</div><div class='add'>+</div><div class='add'>+Linux内核安全团队的宗旨就是和漏洞提交者一起处理漏洞的解决方案直</div><div class='add'>+到公开。我们喜欢尽快地完全公开漏洞。当一个漏洞或者修复还没有被完全地理</div><div class='add'>+解，解决方案没有通过测试或者供应商协调，可以合理地延迟公开。然而，我们</div><div class='add'>+期望这些延迟尽可能的短些，是可数的几天，而不是几个星期或者几个月。公开</div><div class='add'>+日期是通过安全团队和漏洞提供者以及供应商洽谈后的结果。公开时间表是从很</div><div class='add'>+短（特殊的，它已经被公众所知道）到几个星期。作为一个基本的默认政策，我</div><div class='add'>+们所期望通知公众的日期是7天的安排。</div><div class='add'>+</div><div class='add'>+3) 保密协议</div><div class='add'>+</div><div class='add'>+Linux内核安全团队不是一个正式的团体，因此不能加入任何的保密协议。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/SubmittingDrivers b/Documentation/translations/zh_CN/SubmittingDrivers<br/>new file mode 100644<br/>index 000000000000..929385e4b194<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/SubmittingDrivers?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/SubmittingDrivers</a></div><div class='hunk'>@@ -0,0 +1,164 @@</div><div class='add'>+Chinese translated version of Documentation/process/submitting-drivers.rst</div><div class='add'>+</div><div class='add'>+If you have any comment or update to the content, please contact the</div><div class='add'>+original document maintainer directly.  However, if you have a problem</div><div class='add'>+communicating in English you can also ask the Chinese maintainer for</div><div class='add'>+help.  Contact the Chinese maintainer if this translation is outdated</div><div class='add'>+or if there is a problem with the translation.</div><div class='add'>+</div><div class='add'>+Chinese maintainer: Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+Documentation/process/submitting-drivers.rst 的中文翻译</div><div class='add'>+</div><div class='add'>+如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='add'>+交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='add'>+译存在问题，请联系中文版维护者。</div><div class='add'>+</div><div class='add'>+中文版维护者： 李阳  Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='add'>+中文版翻译者： 李阳  Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='add'>+中文版校译者： 陈琦 Maggie Chen &lt;chenqi@beyondsoft.com&gt;</div><div class='add'>+               王聪 Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='add'>+               张巍 Zhang Wei &lt;Wei.Zhang@freescale.com&gt;</div><div class='add'>+</div><div class='add'>+以下为正文</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+如何向 Linux 内核提交驱动程序</div><div class='add'>+-----------------------------</div><div class='add'>+</div><div class='add'>+这篇文档将会解释如何向不同的内核源码树提交设备驱动程序。请注意，如果你感</div><div class='add'>+兴趣的是显卡驱动程序，你也许应该访问 XFree86 项目(http://www.xfree86.org/)</div><div class='add'>+和／或 X.org 项目 (http://x.org)。</div><div class='add'>+</div><div class='add'>+另请参阅 Documentation/process/submitting-patches.rst 文档。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+分配设备号</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+块设备和字符设备的主设备号与从设备号是由 Linux 命名编号分配权威 LANANA（</div><div class='add'>+现在是 Torben Mathiasen）负责分配。申请的网址是 http://www.lanana.org/。</div><div class='add'>+即使不准备提交到主流内核的设备驱动也需要在这里分配设备号。有关详细信息，</div><div class='add'>+请参阅 Documentation/admin-guide/devices.rst。</div><div class='add'>+</div><div class='add'>+如果你使用的不是已经分配的设备号，那么当你提交设备驱动的时候，它将会被强</div><div class='add'>+制分配一个新的设备号，即便这个设备号和你之前发给客户的截然不同。</div><div class='add'>+</div><div class='add'>+设备驱动的提交对象</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Linux 2.0:</div><div class='add'>+	此内核源码树不接受新的驱动程序。</div><div class='add'>+</div><div class='add'>+Linux 2.2:</div><div class='add'>+	此内核源码树不接受新的驱动程序。</div><div class='add'>+</div><div class='add'>+Linux 2.4:</div><div class='add'>+	如果所属的代码领域在内核的 MAINTAINERS 文件中列有一个总维护者，</div><div class='add'>+	那么请将驱动程序提交给他。如果此维护者没有回应或者你找不到恰当的</div><div class='add'>+	维护者，那么请联系 Willy Tarreau &lt;w@1wt.eu&gt;。</div><div class='add'>+</div><div class='add'>+Linux 2.6:</div><div class='add'>+	除了遵循和 2.4 版内核同样的规则外，你还需要在 linux-kernel 邮件</div><div class='add'>+	列表上跟踪最新的 API 变化。向 Linux 2.6 内核提交驱动的顶级联系人</div><div class='add'>+	是 Andrew Morton &lt;akpm@linux-foundation.org&gt;。</div><div class='add'>+</div><div class='add'>+决定设备驱动能否被接受的条件</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+许可：		代码必须使用 GNU 通用公开许可证 (GPL) 提交给 Linux，但是</div><div class='add'>+		我们并不要求 GPL 是唯一的许可。你或许会希望同时使用多种</div><div class='add'>+		许可证发布，如果希望驱动程序可以被其他开源社区（比如BSD）</div><div class='add'>+		使用。请参考 include/linux/module.h 文件中所列出的可被</div><div class='add'>+		接受共存的许可。</div><div class='add'>+</div><div class='add'>+版权：		版权所有者必须同意使用 GPL 许可。最好提交者和版权所有者</div><div class='add'>+		是相同个人或实体。否则，必需列出授权使用 GPL 的版权所有</div><div class='add'>+		人或实体，以备验证之需。</div><div class='add'>+</div><div class='add'>+接口：		如果你的驱动程序使用现成的接口并且和其他同类的驱动程序行</div><div class='add'>+		为相似，而不是去发明无谓的新接口，那么它将会更容易被接受。</div><div class='add'>+		如果你需要一个 Linux 和 NT 的通用驱动接口，那么请在用</div><div class='add'>+		户空间实现它。</div><div class='add'>+</div><div class='add'>+代码：		请使用 Documentation/process/coding-style.rst 中所描述的 Linux 代码风</div><div class='add'>+		格。如果你的某些代码段（例如那些与 Windows 驱动程序包共</div><div class='add'>+		享的代码段）需要使用其他格式，而你却只希望维护一份代码，</div><div class='add'>+		那么请将它们很好地区分出来，并且注明原因。</div><div class='add'>+</div><div class='add'>+可移植性：	请注意，指针并不永远是 32 位的，不是所有的计算机都使用小</div><div class='add'>+		尾模式 (little endian) 存储数据，不是所有的人都拥有浮点</div><div class='add'>+		单元，不要随便在你的驱动程序里嵌入 x86 汇编指令。只能在</div><div class='add'>+		x86 上运行的驱动程序一般是不受欢迎的。虽然你可能只有 x86</div><div class='add'>+		硬件，很难测试驱动程序在其他平台上是否可用，但是确保代码</div><div class='add'>+		可以被轻松地移植却是很简单的。</div><div class='add'>+</div><div class='add'>+清晰度：	做到所有人都能修补这个驱动程序将会很有好处，因为这样你将</div><div class='add'>+		会直接收到修复的补丁而不是 bug 报告。如果你提交一个试图</div><div class='add'>+		隐藏硬件工作机理的驱动程序，那么它将会被扔进废纸篓。</div><div class='add'>+</div><div class='add'>+电源管理：	因为 Linux 正在被很多移动设备和桌面系统使用，所以你的驱</div><div class='add'>+		动程序也很有可能被使用在这些设备上。它应该支持最基本的电</div><div class='add'>+		源管理，即在需要的情况下实现系统级休眠和唤醒要用到的</div><div class='add'>+		.suspend 和 .resume 函数。你应该检查你的驱动程序是否能正</div><div class='add'>+		确地处理休眠与唤醒，如果实在无法确认，请至少把 .suspend</div><div class='add'>+		函数定义成返回 -ENOSYS（功能未实现）错误。你还应该尝试确</div><div class='add'>+		保你的驱动在什么都不干的情况下将耗电降到最低。要获得驱动</div><div class='add'>+		程序测试的指导，请参阅</div><div class='add'>+		Documentation/power/drivers-testing.txt。有关驱动程序电</div><div class='add'>+		源管理问题相对全面的概述，请参阅</div><div class='add'>+		Documentation/power/admin-guide/devices.rst。</div><div class='add'>+</div><div class='add'>+管理：		如果一个驱动程序的作者还在进行有效的维护，那么通常除了那</div><div class='add'>+		些明显正确且不需要任何检查的补丁以外，其他所有的补丁都会</div><div class='add'>+		被转发给作者。如果你希望成为驱动程序的联系人和更新者，最</div><div class='add'>+		好在代码注释中写明并且在 MAINTAINERS 文件中加入这个驱动</div><div class='add'>+		程序的条目。</div><div class='add'>+</div><div class='add'>+不影响设备驱动能否被接受的条件</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+供应商：	由硬件供应商来维护驱动程序通常是一件好事。不过，如果源码</div><div class='add'>+		树里已经有其他人提供了可稳定工作的驱动程序，那么请不要期</div><div class='add'>+		望“我是供应商”会成为内核改用你的驱动程序的理由。理想的情</div><div class='add'>+		况是：供应商与现有驱动程序的作者合作，构建一个统一完美的</div><div class='add'>+		驱动程序。</div><div class='add'>+</div><div class='add'>+作者：		驱动程序是由大的 Linux 公司研发还是由你个人编写，并不影</div><div class='add'>+		响其是否能被内核接受。没有人对内核源码树享有特权。只要你</div><div class='add'>+		充分了解内核社区，你就会发现这一点。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+资源列表</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+Linux 内核主源码树：</div><div class='add'>+	ftp.??.kernel.org:/pub/linux/kernel/...</div><div class='add'>+	?? == 你的国家代码，例如 "cn"、"us"、"uk"、"fr" 等等</div><div class='add'>+</div><div class='add'>+Linux 内核邮件列表：</div><div class='add'>+	linux-kernel@vger.kernel.org</div><div class='add'>+	[可通过向majordomo@vger.kernel.org发邮件来订阅]</div><div class='add'>+</div><div class='add'>+Linux 设备驱动程序，第三版（探讨 2.6.10 版内核）：</div><div class='add'>+	http://lwn.net/Kernel/LDD3/ （免费版）</div><div class='add'>+</div><div class='add'>+LWN.net:</div><div class='add'>+	每周内核开发活动摘要 - http://lwn.net/</div><div class='add'>+	2.6 版中 API 的变更：</div><div class='add'>+		http://lwn.net/Articles/2.6-kernel-api/</div><div class='add'>+	将旧版内核的驱动程序移植到 2.6 版：</div><div class='add'>+		http://lwn.net/Articles/driver-porting/</div><div class='add'>+</div><div class='add'>+内核新手(KernelNewbies):</div><div class='add'>+	为新的内核开发者提供文档和帮助</div><div class='add'>+	http://kernelnewbies.org/</div><div class='add'>+</div><div class='add'>+Linux USB项目：</div><div class='add'>+	http://www.linux-usb.org/</div><div class='add'>+</div><div class='add'>+写内核驱动的“不要”（Arjan van de Ven著）:</div><div class='add'>+	http://www.fenrus.org/how-to-not-write-a-device-driver-paper.pdf</div><div class='add'>+</div><div class='add'>+内核清洁工 (Kernel Janitor):</div><div class='add'>+	http://kernelnewbies.org/KernelJanitors</div><div class='head'>diff --git a/Documentation/translations/zh_CN/SubmittingPatches b/Documentation/translations/zh_CN/SubmittingPatches<br/>new file mode 100644<br/>index 000000000000..e9098da8f1a4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/SubmittingPatches?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/SubmittingPatches</a></div><div class='hunk'>@@ -0,0 +1,412 @@</div><div class='add'>+Chinese translated version of Documentation/process/submitting-patches.rst</div><div class='add'>+</div><div class='add'>+If you have any comment or update to the content, please contact the</div><div class='add'>+original document maintainer directly.  However, if you have a problem</div><div class='add'>+communicating in English you can also ask the Chinese maintainer for</div><div class='add'>+help.  Contact the Chinese maintainer if this translation is outdated</div><div class='add'>+or if there is a problem with the translation.</div><div class='add'>+</div><div class='add'>+Chinese maintainer: TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+Documentation/process/submitting-patches.rst 的中文翻译</div><div class='add'>+</div><div class='add'>+如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='add'>+交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='add'>+译存在问题，请联系中文版维护者。</div><div class='add'>+</div><div class='add'>+中文版维护者： 钟宇 TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='add'>+中文版翻译者： 钟宇 TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='add'>+中文版校译者： 李阳 Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='add'>+               王聪 Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+以下为正文</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+   如何让你的改动进入内核</div><div class='add'>+     或者</div><div class='add'>+  获得亲爱的 Linus Torvalds 的关注和处理</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+对于想要将改动提交到 Linux 内核的个人或者公司来说，如果不熟悉“规矩”，</div><div class='add'>+提交的流程会让人畏惧。本文档收集了一系列建议，这些建议可以大大的提高你</div><div class='add'>+的改动被接受的机会。</div><div class='add'>+阅读 Documentation/process/submit-checklist.rst 来获得在提交代码前需要检查的项目的列</div><div class='add'>+表。如果你在提交一个驱动程序，那么同时阅读一下</div><div class='add'>+Documentation/process/submitting-drivers.rst 。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+--------------------------</div><div class='add'>+第一节 - 创建并发送你的改动</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+1) "diff -up"</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+使用 "diff -up" 或者 "diff -uprN" 来创建补丁。</div><div class='add'>+</div><div class='add'>+所有内核的改动，都是以补丁的形式呈现的，补丁由 diff(1) 生成。创建补丁的</div><div class='add'>+时候，要确认它是以 "unified diff" 格式创建的，这种格式由 diff(1) 的 '-u'</div><div class='add'>+参数生成。而且，请使用 '-p' 参数，那样会显示每个改动所在的C函数，使得</div><div class='add'>+产生的补丁容易读得多。补丁应该基于内核源代码树的根目录，而不是里边的任</div><div class='add'>+何子目录。</div><div class='add'>+为一个单独的文件创建补丁，一般来说这样做就够了：</div><div class='add'>+</div><div class='add'>+        SRCTREE= linux-2.6</div><div class='add'>+        MYFILE=  drivers/net/mydriver.c</div><div class='add'>+</div><div class='add'>+        cd $SRCTREE</div><div class='add'>+        cp $MYFILE $MYFILE.orig</div><div class='add'>+        vi $MYFILE      # make your change</div><div class='add'>+        cd ..</div><div class='add'>+        diff -up $SRCTREE/$MYFILE{.orig,} &gt; /tmp/patch</div><div class='add'>+</div><div class='add'>+为多个文件创建补丁，你可以解开一个没有修改过的内核源代码树，然后和你自</div><div class='add'>+己的代码树之间做 diff 。例如：</div><div class='add'>+</div><div class='add'>+        MYSRC= /devel/linux-2.6</div><div class='add'>+</div><div class='add'>+        tar xvfz linux-2.6.12.tar.gz</div><div class='add'>+        mv linux-2.6.12 linux-2.6.12-vanilla</div><div class='add'>+        diff -uprN -X linux-2.6.12-vanilla/Documentation/dontdiff \</div><div class='add'>+                linux-2.6.12-vanilla $MYSRC &gt; /tmp/patch</div><div class='add'>+</div><div class='add'>+"dontdiff" 是内核在编译的时候产生的文件的列表，列表中的文件在 diff(1)</div><div class='add'>+产生的补丁里会被跳过。"dontdiff" 文件被包含在2.6.12和之后版本的内核源代</div><div class='add'>+码树中。对于更早的内核版本，你可以从</div><div class='add'>+&lt;http://www.xenotime.net/linux/doc/dontdiff&gt; 获取它。</div><div class='add'>+确定你的补丁里没有包含任何不属于这次补丁提交的额外文件。记得在用diff(1)</div><div class='add'>+生成补丁之后，审阅一次补丁，以确保准确。</div><div class='add'>+如果你的改动很散乱，你应该研究一下如何将补丁分割成独立的部分，将改动分</div><div class='add'>+割成一系列合乎逻辑的步骤。这样更容易让其他内核开发者审核，如果你想你的</div><div class='add'>+补丁被接受，这是很重要的。下面这些脚本能够帮助你做这件事情：</div><div class='add'>+Quilt:</div><div class='add'>+http://savannah.nongnu.org/projects/quilt</div><div class='add'>+</div><div class='add'>+2)描述你的改动。</div><div class='add'>+描述你的改动包含的技术细节。</div><div class='add'>+</div><div class='add'>+要多具体就写多具体。最糟糕的描述可能是像下面这些语句：“更新了某驱动程</div><div class='add'>+序”，“修正了某驱动程序的bug”，或者“这个补丁包含了某子系统的修改，请</div><div class='add'>+使用。”</div><div class='add'>+</div><div class='add'>+如果你的描述开始变长，这表示你也许需要拆分你的补丁了，请看第3小节，</div><div class='add'>+继续。</div><div class='add'>+</div><div class='add'>+3)拆分你的改动</div><div class='add'>+</div><div class='add'>+将改动拆分，逻辑类似的放到同一个补丁文件里。</div><div class='add'>+</div><div class='add'>+例如，如果你的改动里同时有bug修正和性能优化，那么把这些改动拆分到两个或</div><div class='add'>+者更多的补丁文件中。如果你的改动包含对API的修改，并且修改了驱动程序来适</div><div class='add'>+应这些新的API，那么把这些修改分成两个补丁。</div><div class='add'>+</div><div class='add'>+另一方面，如果你将一个单独的改动做成多个补丁文件，那么将它们合并成一个</div><div class='add'>+单独的补丁文件。这样一个逻辑上单独的改动只被包含在一个补丁文件里。</div><div class='add'>+</div><div class='add'>+如果有一个补丁依赖另外一个补丁来完成它的改动，那没问题。简单的在你的补</div><div class='add'>+丁描述里指出“这个补丁依赖某补丁”就好了。</div><div class='add'>+</div><div class='add'>+如果你不能将补丁浓缩成更少的文件，那么每次大约发送出15个，然后等待审查</div><div class='add'>+和整合。</div><div class='add'>+</div><div class='add'>+4)选择 e-mail 的收件人</div><div class='add'>+</div><div class='add'>+看一遍 MAINTAINERS 文件和源代码，看看你所的改动所在的内核子系统有没有指</div><div class='add'>+定的维护者。如果有，给他们发e-mail。</div><div class='add'>+</div><div class='add'>+如果没有找到维护者，或者维护者没有反馈，将你的补丁发送到内核开发者主邮</div><div class='add'>+件列表 linux-kernel@vger.kernel.org。大部分的内核开发者都跟踪这个邮件列</div><div class='add'>+表，可以评价你的改动。</div><div class='add'>+</div><div class='add'>+每次不要发送超过15个补丁到 vger 邮件列表！！！</div><div class='add'>+</div><div class='add'>+Linus Torvalds 是决定改动能否进入 Linux 内核的最终裁决者。他的 e-mail</div><div class='add'>+地址是 &lt;torvalds@linux-foundation.org&gt; 。他收到的 e-mail 很多，所以一般</div><div class='add'>+的说，最好别给他发 e-mail。</div><div class='add'>+</div><div class='add'>+那些修正bug，“显而易见”的修改或者是类似的只需要很少讨论的补丁可以直接</div><div class='add'>+发送或者CC给Linus。那些需要讨论或者没有很清楚的好处的补丁，一般先发送到</div><div class='add'>+linux-kernel邮件列表。只有当补丁被讨论得差不多了，才提交给Linus。</div><div class='add'>+</div><div class='add'>+5)选择CC( e-mail 抄送)列表</div><div class='add'>+</div><div class='add'>+除非你有理由不这样做，否则CC linux-kernel@vger.kernel.org。</div><div class='add'>+</div><div class='add'>+除了 Linus 之外，其他内核开发者也需要注意到你的改动，这样他们才能评论你</div><div class='add'>+的改动并提供代码审查和建议。linux-kernel 是 Linux 内核开发者主邮件列表</div><div class='add'>+。其它的邮件列表为特定的子系统提供服务，比如 USB，framebuffer 设备，虚</div><div class='add'>+拟文件系统，SCSI 子系统，等等。查看 MAINTAINERS 文件来获得和你的改动有</div><div class='add'>+关的邮件列表。</div><div class='add'>+</div><div class='add'>+Majordomo lists of VGER.KERNEL.ORG at:</div><div class='add'>+        &lt;http://vger.kernel.org/vger-lists.html&gt;</div><div class='add'>+</div><div class='add'>+如果改动影响了用户空间和内核之间的接口，请给 MAN-PAGES 的维护者（列在</div><div class='add'>+MAINTAINERS 文件里的）发送一个手册页（man-pages）补丁，或者至少通知一下改</div><div class='add'>+变，让一些信息有途径进入手册页。</div><div class='add'>+</div><div class='add'>+即使在第四步的时候，维护者没有作出回应，也要确认在修改他们的代码的时候</div><div class='add'>+，一直将维护者拷贝到CC列表中。</div><div class='add'>+</div><div class='add'>+对于小的补丁，你也许会CC到 Adrian Bunk 管理的搜集琐碎补丁的邮件列表</div><div class='add'>+(Trivial Patch Monkey)trivial@kernel.org，那里专门收集琐碎的补丁。下面这样</div><div class='add'>+的补丁会被看作“琐碎的”补丁：</div><div class='add'>+  文档的拼写修正。</div><div class='add'>+  修正会影响到 grep(1) 的拼写。</div><div class='add'>+  警告信息修正(频繁的打印无用的警告是不好的。)</div><div class='add'>+  编译错误修正（代码逻辑的确是对的，只是编译有问题。）</div><div class='add'>+  运行时修正（只要真的修正了错误。）</div><div class='add'>+  移除使用了被废弃的函数/宏的代码(例如 check_region。)</div><div class='add'>+  联系方式和文档修正。</div><div class='add'>+  用可移植的代码替换不可移植的代码（即使在体系结构相关的代码中，既然有</div><div class='add'>+  人拷贝，只要它是琐碎的）</div><div class='add'>+  任何文件的作者/维护者对该文件的改动（例如 patch monkey 在重传模式下）</div><div class='add'>+</div><div class='add'>+EMAIL: trivial@kernel.org</div><div class='add'>+</div><div class='add'>+(译注，关于“琐碎补丁”的一些说明：因为原文的这一部分写得比较简单，所以不得不</div><div class='add'>+违例写一下译注。"trivial"这个英文单词的本意是“琐碎的，不重要的。”但是在这里</div><div class='add'>+有稍微有一些变化，例如对一些明显的NULL指针的修正，属于运行时修正，会被归类</div><div class='add'>+到琐碎补丁里。虽然NULL指针的修正很重要，但是这样的修正往往很小而且很容易得到</div><div class='add'>+检验，所以也被归入琐碎补丁。琐碎补丁更精确的归类应该是</div><div class='add'>+“simple, localized &amp; easy to verify”，也就是说简单的，局部的和易于检验的。</div><div class='add'>+trivial@kernel.org邮件列表的目的是针对这样的补丁，为提交者提供一个中心，来</div><div class='add'>+降低提交的门槛。)</div><div class='add'>+</div><div class='add'>+6)没有 MIME 编码，没有链接，没有压缩，没有附件，只有纯文本。</div><div class='add'>+</div><div class='add'>+Linus 和其他的内核开发者需要阅读和评论你提交的改动。对于内核开发者来说</div><div class='add'>+，可以“引用”你的改动很重要，使用一般的 e-mail 工具，他们就可以在你的</div><div class='add'>+代码的任何位置添加评论。</div><div class='add'>+</div><div class='add'>+因为这个原因，所有的提交的补丁都是 e-mail 中“内嵌”的。</div><div class='add'>+警告：如果你使用剪切-粘贴你的补丁，小心你的编辑器的自动换行功能破坏你的</div><div class='add'>+补丁。</div><div class='add'>+</div><div class='add'>+不要将补丁作为 MIME 编码的附件，不管是否压缩。很多流行的 e-mail 软件不</div><div class='add'>+是任何时候都将 MIME 编码的附件当作纯文本发送的，这会使得别人无法在你的</div><div class='add'>+代码中加评论。另外，MIME 编码的附件会让 Linus 多花一点时间来处理，这就</div><div class='add'>+降低了你的改动被接受的可能性。</div><div class='add'>+</div><div class='add'>+警告：一些邮件软件，比如 Mozilla 会将你的信息以如下格式发送：</div><div class='add'>+---- 邮件头 ----</div><div class='add'>+Content-Type: text/plain; charset=us-ascii; format=flowed</div><div class='add'>+---- 邮件头 ----</div><div class='add'>+问题在于 “format=flowed” 会让接收端的某些邮件软件将邮件中的制表符替换</div><div class='add'>+成空格以及做一些类似的替换。这样，你发送的时候看起来没问题的补丁就被破</div><div class='add'>+坏了。</div><div class='add'>+</div><div class='add'>+要修正这个问题，只需要将你的 mozilla 的 defaults/pref/mailnews.js 文件</div><div class='add'>+里的</div><div class='add'>+pref("mailnews.send_plaintext_flowed", false); // RFC 2646=======</div><div class='add'>+修改成</div><div class='add'>+pref("mailnews.display.disable_format_flowed_support", true);</div><div class='add'>+就可以了。</div><div class='add'>+</div><div class='add'>+7) e-mail 的大小</div><div class='add'>+</div><div class='add'>+给 Linus 发送补丁的时候，永远按照第6小节说的做。</div><div class='add'>+</div><div class='add'>+大的改动对邮件列表不合适，对某些维护者也不合适。如果你的补丁，在不压缩</div><div class='add'>+的情况下，超过了40kB，那么你最好将补丁放在一个能通过 internet 访问的服</div><div class='add'>+务器上，然后用指向你的补丁的 URL 替代。</div><div class='add'>+</div><div class='add'>+8) 指出你的内核版本</div><div class='add'>+</div><div class='add'>+在标题和在补丁的描述中，指出补丁对应的内核的版本，是很重要的。</div><div class='add'>+</div><div class='add'>+如果补丁不能干净的在最新版本的内核上打上，Linus 是不会接受它的。</div><div class='add'>+</div><div class='add'>+9) 不要气馁，继续提交。</div><div class='add'>+</div><div class='add'>+当你提交了改动以后，耐心地等待。如果 Linus 喜欢你的改动并且同意它，那么</div><div class='add'>+它将在下一个内核发布版本中出现。</div><div class='add'>+</div><div class='add'>+然而，如果你的改动没有出现在下一个版本的内核中，可能有若干原因。减少那</div><div class='add'>+些原因，修正错误，重新提交更新后的改动，是你自己的工作。</div><div class='add'>+</div><div class='add'>+Linus不给出任何评论就“丢弃”你的补丁是常见的事情。在系统中这样的事情很</div><div class='add'>+平常。如果他没有接受你的补丁，也许是由于以下原因：</div><div class='add'>+* 你的补丁不能在最新版本的内核上干净的打上。</div><div class='add'>+* 你的补丁在 linux-kernel 邮件列表中没有得到充分的讨论。</div><div class='add'>+* 风格问题（参照第2小节）</div><div class='add'>+* 邮件格式问题（重读本节）</div><div class='add'>+* 你的改动有技术问题。</div><div class='add'>+* 他收到了成吨的 e-mail，而你的在混乱中丢失了。</div><div class='add'>+* 你让人为难。</div><div class='add'>+</div><div class='add'>+有疑问的时候，在 linux-kernel 邮件列表上请求评论。</div><div class='add'>+</div><div class='add'>+10) 在标题上加上 PATCH 的字样</div><div class='add'>+</div><div class='add'>+Linus 和 linux-kernel 邮件列表的 e-mail 流量都很高，一个通常的约定是标</div><div class='add'>+题行以 [PATCH] 开头。这样可以让 Linus 和其他内核开发人员可以从 e-mail</div><div class='add'>+的讨论中很轻易的将补丁分辨出来。</div><div class='add'>+</div><div class='add'>+11）为你的工作签名</div><div class='add'>+</div><div class='add'>+为了加强对谁做了何事的追踪，尤其是对那些透过好几层的维护者的补丁，我们</div><div class='add'>+建议在发送出去的补丁上加一个 “sign-off” 的过程。</div><div class='add'>+</div><div class='add'>+"sign-off" 是在补丁的注释的最后的简单的一行文字，认证你编写了它或者其他</div><div class='add'>+人有权力将它作为开放源代码的补丁传递。规则很简单：如果你能认证如下信息</div><div class='add'>+：</div><div class='add'>+      开发者来源证书 1.1</div><div class='add'>+      对于本项目的贡献，我认证如下信息：</div><div class='add'>+      （a）这些贡献是完全或者部分的由我创建，我有权利以文件中指出</div><div class='add'>+       的开放源代码许可证提交它；或者</div><div class='add'>+      （b）这些贡献基于以前的工作，据我所知，这些以前的工作受恰当的开放</div><div class='add'>+       源代码许可证保护，而且，根据许可证，我有权提交修改后的贡献，</div><div class='add'>+       无论是完全还是部分由我创造，这些贡献都使用同一个开放源代码许可证</div><div class='add'>+       （除非我被允许用其它的许可证），正如文件中指出的；或者</div><div class='add'>+      （c）这些贡献由认证（a），（b）或者（c）的人直接提供给我，而</div><div class='add'>+       且我没有修改它。</div><div class='add'>+      （d）我理解并同意这个项目和贡献是公开的，贡献的记录（包括我</div><div class='add'>+       一起提交的个人记录，包括 sign-off ）被永久维护并且可以和这个项目</div><div class='add'>+       或者开放源代码的许可证同步地再发行。</div><div class='add'>+       那么加入这样一行：</div><div class='add'>+       Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='add'>+</div><div class='add'>+使用你的真名（抱歉，不能使用假名或者匿名。）</div><div class='add'>+</div><div class='add'>+有人在最后加上标签。现在这些东西会被忽略，但是你可以这样做，来标记公司</div><div class='add'>+内部的过程，或者只是指出关于 sign-off 的一些特殊细节。</div><div class='add'>+</div><div class='add'>+12）标准补丁格式</div><div class='add'>+</div><div class='add'>+标准的补丁，标题行是：</div><div class='add'>+    Subject: [PATCH 001/123] 子系统:一句话概述</div><div class='add'>+</div><div class='add'>+标准补丁的信体存在如下部分：</div><div class='add'>+</div><div class='add'>+  - 一个 "from" 行指出补丁作者。</div><div class='add'>+</div><div class='add'>+  - 一个空行</div><div class='add'>+</div><div class='add'>+  - 说明的主体，这些说明文字会被拷贝到描述该补丁的永久改动记录里。</div><div class='add'>+</div><div class='add'>+  - 一个由"---"构成的标记行</div><div class='add'>+</div><div class='add'>+  - 不合适放到改动记录里的额外的注解。</div><div class='add'>+</div><div class='add'>+  - 补丁本身（diff 输出）</div><div class='add'>+</div><div class='add'>+标题行的格式，使得对标题行按字母序排序非常的容易 - 很多 e-mail 客户端都</div><div class='add'>+可以支持 - 因为序列号是用零填充的，所以按数字排序和按字母排序是一样的。</div><div class='add'>+</div><div class='add'>+e-mail 标题中的“子系统”标识哪个内核子系统将被打补丁。</div><div class='add'>+</div><div class='add'>+e-mail 标题中的“一句话概述”扼要的描述 e-mail 中的补丁。“一句话概述”</div><div class='add'>+不应该是一个文件名。对于一个补丁系列（“补丁系列”指一系列的多个相关补</div><div class='add'>+丁），不要对每个补丁都使用同样的“一句话概述”。</div><div class='add'>+</div><div class='add'>+记住 e-mail 的“一句话概述”会成为该补丁的全局唯一标识。它会蔓延到 git</div><div class='add'>+的改动记录里。然后“一句话概述”会被用在开发者的讨论里，用来指代这个补</div><div class='add'>+丁。用户将希望通过 google 来搜索"一句话概述"来找到那些讨论这个补丁的文</div><div class='add'>+章。</div><div class='add'>+</div><div class='add'>+一些标题的例子：</div><div class='add'>+</div><div class='add'>+    Subject: [patch 2/5] ext2: improve scalability of bitmap searching</div><div class='add'>+    Subject: [PATCHv2 001/207] x86: fix eflags tracking</div><div class='add'>+</div><div class='add'>+"from" 行是信体里的最上面一行，具有如下格式：</div><div class='add'>+        From: Original Author &lt;author@example.com&gt;</div><div class='add'>+</div><div class='add'>+"from" 行指明在永久改动日志里，谁会被确认为作者。如果没有 "from" 行，那</div><div class='add'>+么邮件头里的 "From: " 行会被用来决定改动日志中的作者。</div><div class='add'>+</div><div class='add'>+说明的主题将会被提交到永久的源代码改动日志里，因此对那些早已经不记得和</div><div class='add'>+这个补丁相关的讨论细节的有能力的读者来说，是有意义的。</div><div class='add'>+</div><div class='add'>+"---" 标记行对于补丁处理工具要找到哪里是改动日志信息的结束，是不可缺少</div><div class='add'>+的。</div><div class='add'>+</div><div class='add'>+对于 "---" 标记之后的额外注解，一个好的用途就是用来写 diffstat，用来显</div><div class='add'>+示修改了什么文件和每个文件都增加和删除了多少行。diffstat 对于比较大的补</div><div class='add'>+丁特别有用。其余那些只是和时刻或者开发者相关的注解，不合适放到永久的改</div><div class='add'>+动日志里的，也应该放这里。</div><div class='add'>+使用 diffstat的选项 "-p 1 -w 70" 这样文件名就会从内核源代码树的目录开始</div><div class='add'>+，不会占用太宽的空间（很容易适合80列的宽度，也许会有一些缩进。）</div><div class='add'>+</div><div class='add'>+在后面的参考资料中能看到适当的补丁格式的更多细节。</div><div class='add'>+</div><div class='add'>+-------------------------------</div><div class='add'>+第二节 提示，建议和诀窍</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+本节包含很多和提交到内核的代码有关的通常的"规则"。事情永远有例外...但是</div><div class='add'>+你必须真的有好的理由这样做。你可以把本节叫做Linus的计算机科学入门课。</div><div class='add'>+</div><div class='add'>+1) 读 Document/process/coding-style.rst</div><div class='add'>+</div><div class='add'>+Nuff 说过，如果你的代码和这个偏离太多，那么它有可能会被拒绝，没有更多的</div><div class='add'>+审查，没有更多的评价。</div><div class='add'>+</div><div class='add'>+2) #ifdef 是丑陋的</div><div class='add'>+混杂了 ifdef 的代码难以阅读和维护。别这样做。作为替代，将你的 ifdef 放</div><div class='add'>+在头文件里，有条件地定义 "static inline" 函数，或者宏，在代码里用这些东</div><div class='add'>+西。让编译器把那些"空操作"优化掉。</div><div class='add'>+</div><div class='add'>+一个简单的例子，不好的代码：</div><div class='add'>+</div><div class='add'>+    dev = alloc_etherdev (sizeof(struct funky_private));</div><div class='add'>+    if (!dev)</div><div class='add'>+        return -ENODEV;</div><div class='add'>+    #ifdef CONFIG_NET_FUNKINESS</div><div class='add'>+    init_funky_net(dev);</div><div class='add'>+    #endif</div><div class='add'>+</div><div class='add'>+清理后的例子:</div><div class='add'>+</div><div class='add'>+(头文件里)</div><div class='add'>+    #ifndef CONFIG_NET_FUNKINESS</div><div class='add'>+    static inline void init_funky_net (struct net_device *d) {}</div><div class='add'>+    #endif</div><div class='add'>+</div><div class='add'>+(代码文件里)</div><div class='add'>+    dev = alloc_etherdev (sizeof(struct funky_private));</div><div class='add'>+    if (!dev)</div><div class='add'>+        return -ENODEV;</div><div class='add'>+    init_funky_net(dev);</div><div class='add'>+</div><div class='add'>+3) 'static inline' 比宏好</div><div class='add'>+</div><div class='add'>+Static inline 函数相比宏来说，是好得多的选择。Static inline 函数提供了</div><div class='add'>+类型安全，没有长度限制，没有格式限制，在 gcc 下开销和宏一样小。</div><div class='add'>+</div><div class='add'>+宏只在 static inline 函数不是最优的时候[在 fast paths 里有很少的独立的</div><div class='add'>+案例]，或者不可能用 static inline 函数的时候[例如字符串分配]。</div><div class='add'>+应该用 'static inline' 而不是 'static __inline__', 'extern inline' 和</div><div class='add'>+'extern __inline__' 。</div><div class='add'>+</div><div class='add'>+4) 不要过度设计</div><div class='add'>+</div><div class='add'>+不要试图预计模糊的未来事情，这些事情也许有用也许没有用："让事情尽可能的</div><div class='add'>+简单，而不是更简单"。</div><div class='add'>+</div><div class='add'>+----------------</div><div class='add'>+第三节 参考文献</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Andrew Morton, "The perfect patch" (tpp).</div><div class='add'>+  &lt;http://www.ozlabs.org/~akpm/stuff/tpp.txt&gt;</div><div class='add'>+</div><div class='add'>+Jeff Garzik, "Linux kernel patch submission format".</div><div class='add'>+  &lt;http://linux.yyz.us/patch-format.html&gt;</div><div class='add'>+</div><div class='add'>+Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".</div><div class='add'>+  &lt;http://www.kroah.com/log/2005/03/31/&gt;</div><div class='add'>+  &lt;http://www.kroah.com/log/2005/07/08/&gt;</div><div class='add'>+  &lt;http://www.kroah.com/log/2005/10/19/&gt;</div><div class='add'>+  &lt;http://www.kroah.com/log/2006/01/11/&gt;</div><div class='add'>+</div><div class='add'>+NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!</div><div class='add'>+  &lt;https://lkml.org/lkml/2005/7/11/336&gt;</div><div class='add'>+</div><div class='add'>+Kernel Documentation/process/coding-style.rst:</div><div class='add'>+  &lt;http://sosdg.org/~coywolf/lxr/source/Documentation/process/coding-style.rst&gt;</div><div class='add'>+</div><div class='add'>+Linus Torvalds's mail on the canonical patch format:</div><div class='add'>+  &lt;http://lkml.org/lkml/2005/4/7/183&gt;</div><div class='add'>+--</div><div class='head'>diff --git a/Documentation/zh_CN/arm/Booting b/Documentation/translations/zh_CN/arm/Booting<br/>index 6158a64df80c..1fe866f8218f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/arm/Booting?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/arm/Booting</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/arm/Booting?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm/Booting</a></div><div class='hunk'>@@ -68,7 +68,7 @@ RAM，或可能使用对这个设备已知的 RAM 信息，还可能使用任何</div><div class='ctx'> 作为替代方案，引导加载程序也可以通过标签列表传递相关的'console='</div><div class='ctx'> 选项给内核以指定某个串口，而串口数据格式的选项在以下文档中描述：</div><div class='ctx'> </div><div class='del'>-       Documentation/kernel-parameters.txt。</div><div class='add'>+       Documentation/admin-guide/kernel-parameters.rst。</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 3、检测机器类型</div><div class='head'>diff --git a/Documentation/zh_CN/arm/kernel_user_helpers.txt b/Documentation/translations/zh_CN/arm/kernel_user_helpers.txt<br/>index cd7fc8f34cf9..cd7fc8f34cf9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/arm/kernel_user_helpers.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/arm/kernel_user_helpers.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/arm/kernel_user_helpers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm/kernel_user_helpers.txt</a></div><div class='head'>diff --git a/Documentation/zh_CN/arm64/booting.txt b/Documentation/translations/zh_CN/arm64/booting.txt<br/>index c1dd968c5ee9..c1dd968c5ee9 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/arm64/booting.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/arm64/booting.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/arm64/booting.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm64/booting.txt</a></div><div class='head'>diff --git a/Documentation/zh_CN/arm64/legacy_instructions.txt b/Documentation/translations/zh_CN/arm64/legacy_instructions.txt<br/>index 68362a1ab717..68362a1ab717 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/arm64/legacy_instructions.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/arm64/legacy_instructions.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/arm64/legacy_instructions.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm64/legacy_instructions.txt</a></div><div class='head'>diff --git a/Documentation/zh_CN/arm64/memory.txt b/Documentation/translations/zh_CN/arm64/memory.txt<br/>index 19b3a52d5d94..19b3a52d5d94 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/arm64/memory.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/arm64/memory.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/arm64/memory.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm64/memory.txt</a></div><div class='head'>diff --git a/Documentation/zh_CN/arm64/silicon-errata.txt b/Documentation/translations/zh_CN/arm64/silicon-errata.txt<br/>index 39477c75c4a4..39477c75c4a4 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/arm64/silicon-errata.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/arm64/silicon-errata.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/arm64/silicon-errata.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm64/silicon-errata.txt</a></div><div class='head'>diff --git a/Documentation/zh_CN/arm64/tagged-pointers.txt b/Documentation/translations/zh_CN/arm64/tagged-pointers.txt<br/>index 2664d1bd5a1c..2664d1bd5a1c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/arm64/tagged-pointers.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/arm64/tagged-pointers.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/arm64/tagged-pointers.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/arm64/tagged-pointers.txt</a></div><div class='head'>diff --git a/Documentation/zh_CN/basic_profiling.txt b/Documentation/translations/zh_CN/basic_profiling.txt<br/>index 1e6bf0bdf8f5..1e6bf0bdf8f5 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/basic_profiling.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/basic_profiling.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/basic_profiling.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/basic_profiling.txt</a></div><div class='head'>diff --git a/Documentation/translations/zh_CN/coding-style.rst b/Documentation/translations/zh_CN/coding-style.rst<br/>new file mode 100644<br/>index 000000000000..1466aa64b8b4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/coding-style.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/coding-style.rst</a></div><div class='hunk'>@@ -0,0 +1,950 @@</div><div class='add'>+Chinese translated version of Documentation/process/coding-style.rst</div><div class='add'>+</div><div class='add'>+If you have any comment or update to the content, please post to LKML directly.</div><div class='add'>+However, if you have problem communicating in English you can also ask the</div><div class='add'>+Chinese maintainer for help.  Contact the Chinese maintainer, if this</div><div class='add'>+translation is outdated or there is problem with translation.</div><div class='add'>+</div><div class='add'>+Chinese maintainer: Zhang Le &lt;r0bertz@gentoo.org&gt;</div><div class='add'>+</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Documentation/process/coding-style.rst 的中文翻译</div><div class='add'>+</div><div class='add'>+如果想评论或更新本文的内容，请直接发信到LKML。如果你使用英文交流有困难的话，</div><div class='add'>+也可以向中文版维护者求助。如果本翻译更新不及时或者翻译存在问题，请联系中文版</div><div class='add'>+维护者::</div><div class='add'>+</div><div class='add'>+  中文版维护者： 张乐 Zhang Le &lt;r0bertz@gentoo.org&gt;</div><div class='add'>+  中文版翻译者： 张乐 Zhang Le &lt;r0bertz@gentoo.org&gt;</div><div class='add'>+  中文版校译者： 王聪 Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='add'>+                 wheelz &lt;kernel.zeng@gmail.com&gt;</div><div class='add'>+                 管旭东 Xudong Guan &lt;xudong.guan@gmail.com&gt;</div><div class='add'>+                 Li Zefan &lt;lizf@cn.fujitsu.com&gt;</div><div class='add'>+                 Wang Chen &lt;wangchen@cn.fujitsu.com&gt;</div><div class='add'>+</div><div class='add'>+以下为正文</div><div class='add'>+</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Linux 内核代码风格</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+这是一个简短的文档，描述了 linux 内核的首选代码风格。代码风格是因人而异的，</div><div class='add'>+而且我不愿意把自己的观点强加给任何人，但这就像我去做任何事情都必须遵循的原则</div><div class='add'>+那样，我也希望在绝大多数事上保持这种的态度。请 (在写代码时) 至少考虑一下这里</div><div class='add'>+的代码风格。</div><div class='add'>+</div><div class='add'>+首先，我建议你打印一份 GNU 代码规范，然后不要读。烧了它，这是一个具有重大象征</div><div class='add'>+性意义的动作。</div><div class='add'>+</div><div class='add'>+不管怎样，现在我们开始：</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1) 缩进</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+制表符是 8 个字符，所以缩进也是 8 个字符。有些异端运动试图将缩进变为 4 (甚至</div><div class='add'>+2！) 字符深，这几乎相当于尝试将圆周率的值定义为 3。</div><div class='add'>+</div><div class='add'>+理由：缩进的全部意义就在于清楚的定义一个控制块起止于何处。尤其是当你盯着你的</div><div class='add'>+屏幕连续看了 20 小时之后，你将会发现大一点的缩进会使你更容易分辨缩进。</div><div class='add'>+</div><div class='add'>+现在，有些人会抱怨 8 个字符的缩进会使代码向右边移动的太远，在 80 个字符的终端</div><div class='add'>+屏幕上就很难读这样的代码。这个问题的答案是，如果你需要 3 级以上的缩进，不管用</div><div class='add'>+何种方式你的代码已经有问题了，应该修正你的程序。</div><div class='add'>+</div><div class='add'>+简而言之，8 个字符的缩进可以让代码更容易阅读，还有一个好处是当你的函数嵌套太</div><div class='add'>+深的时候可以给你警告。留心这个警告。</div><div class='add'>+</div><div class='add'>+在 switch 语句中消除多级缩进的首选的方式是让 ``switch`` 和从属于它的 ``case``</div><div class='add'>+标签对齐于同一列，而不要 ``两次缩进`` ``case`` 标签。比如：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	switch (suffix) {</div><div class='add'>+	case 'G':</div><div class='add'>+	case 'g':</div><div class='add'>+		mem &lt;&lt;= 30;</div><div class='add'>+		break;</div><div class='add'>+	case 'M':</div><div class='add'>+	case 'm':</div><div class='add'>+		mem &lt;&lt;= 20;</div><div class='add'>+		break;</div><div class='add'>+	case 'K':</div><div class='add'>+	case 'k':</div><div class='add'>+		mem &lt;&lt;= 10;</div><div class='add'>+		/* fall through */</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+不要把多个语句放在一行里，除非你有什么东西要隐藏：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (condition) do_this;</div><div class='add'>+	  do_something_everytime;</div><div class='add'>+</div><div class='add'>+也不要在一行里放多个赋值语句。内核代码风格超级简单。就是避免可能导致别人误读</div><div class='add'>+的表达式。</div><div class='add'>+</div><div class='add'>+除了注释、文档和 Kconfig 之外，不要使用空格来缩进，前面的例子是例外，是有意为</div><div class='add'>+之。</div><div class='add'>+</div><div class='add'>+选用一个好的编辑器，不要在行尾留空格。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2) 把长的行和字符串打散</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+代码风格的意义就在于使用平常使用的工具来维持代码的可读性和可维护性。</div><div class='add'>+</div><div class='add'>+每一行的长度的限制是 80 列，我们强烈建议您遵守这个惯例。</div><div class='add'>+</div><div class='add'>+长于 80 列的语句要打散成有意义的片段。除非超过 80 列能显著增加可读性，并且不</div><div class='add'>+会隐藏信息。子片段要明显短于母片段，并明显靠右。这同样适用于有着很长参数列表</div><div class='add'>+的函数头。然而，绝对不要打散对用户可见的字符串，例如 printk 信息，因为这样就</div><div class='add'>+很难对它们 grep。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3) 大括号和空格的放置</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+C 语言风格中另外一个常见问题是大括号的放置。和缩进大小不同，选择或弃用某种放</div><div class='add'>+置策略并没有多少技术上的原因，不过首选的方式，就像 Kernighan 和 Ritchie 展示</div><div class='add'>+给我们的，是把起始大括号放在行尾，而把结束大括号放在行首，所以：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (x is true) {</div><div class='add'>+		we do y</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+这适用于所有的非函数语句块 (if, switch, for, while, do)。比如：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case KOBJ_ADD:</div><div class='add'>+		return "add";</div><div class='add'>+	case KOBJ_REMOVE:</div><div class='add'>+		return "remove";</div><div class='add'>+	case KOBJ_CHANGE:</div><div class='add'>+		return "change";</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+不过，有一个例外，那就是函数：函数的起始大括号放置于下一行的开头，所以：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int function(int x)</div><div class='add'>+	{</div><div class='add'>+		body of function</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+全世界的异端可能会抱怨这个不一致性是... 呃... 不一致的，不过所有思维健全的人</div><div class='add'>+都知道 (a) K&amp;R 是 **正确的** 并且 (b) K&amp;R 是正确的。此外，不管怎样函数都是特</div><div class='add'>+殊的 (C 函数是不能嵌套的)。</div><div class='add'>+</div><div class='add'>+注意结束大括号独自占据一行，除非它后面跟着同一个语句的剩余部分，也就是 do 语</div><div class='add'>+句中的 "while" 或者 if 语句中的 "else"，像这样：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		body of do-loop</div><div class='add'>+	} while (condition);</div><div class='add'>+</div><div class='add'>+和</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (x == y) {</div><div class='add'>+		..</div><div class='add'>+	} else if (x &gt; y) {</div><div class='add'>+		...</div><div class='add'>+	} else {</div><div class='add'>+		....</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+理由：K&amp;R。</div><div class='add'>+</div><div class='add'>+也请注意这种大括号的放置方式也能使空 (或者差不多空的) 行的数量最小化，同时不</div><div class='add'>+失可读性。因此，由于你的屏幕上的新行是不可再生资源 (想想 25 行的终端屏幕)，你</div><div class='add'>+将会有更多的空行来放置注释。</div><div class='add'>+</div><div class='add'>+当只有一个单独的语句的时候，不用加不必要的大括号。</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (condition)</div><div class='add'>+		action();</div><div class='add'>+</div><div class='add'>+和</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (condition)</div><div class='add'>+		do_this();</div><div class='add'>+	else</div><div class='add'>+		do_that();</div><div class='add'>+</div><div class='add'>+这并不适用于只有一个条件分支是单语句的情况；这时所有分支都要使用大括号：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (condition) {</div><div class='add'>+		do_this();</div><div class='add'>+		do_that();</div><div class='add'>+	} else {</div><div class='add'>+		otherwise();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+3.1) 空格</div><div class='add'>+********************</div><div class='add'>+</div><div class='add'>+Linux 内核的空格使用方式 (主要) 取决于它是用于函数还是关键字。(大多数) 关键字</div><div class='add'>+后要加一个空格。值得注意的例外是 sizeof, typeof, alignof 和 __attribute__，这</div><div class='add'>+些关键字某些程度上看起来更像函数 (它们在 Linux 里也常常伴随小括号而使用，尽管</div><div class='add'>+在 C 里这样的小括号不是必需的，就像 ``struct fileinfo info;`` 声明过后的</div><div class='add'>+``sizeof info``)。</div><div class='add'>+</div><div class='add'>+所以在这些关键字之后放一个空格::</div><div class='add'>+</div><div class='add'>+	if, switch, case, for, do, while</div><div class='add'>+</div><div class='add'>+但是不要在 sizeof, typeof, alignof 或者 __attribute__ 这些关键字之后放空格。</div><div class='add'>+例如，</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	s = sizeof(struct file);</div><div class='add'>+</div><div class='add'>+不要在小括号里的表达式两侧加空格。这是一个 **反例** ：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	s = sizeof( struct file );</div><div class='add'>+</div><div class='add'>+当声明指针类型或者返回指针类型的函数时， ``*`` 的首选使用方式是使之靠近变量名</div><div class='add'>+或者函数名，而不是靠近类型名。例子：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	char *linux_banner;</div><div class='add'>+	unsigned long long memparse(char *ptr, char **retptr);</div><div class='add'>+	char *match_strdup(substring_t *s);</div><div class='add'>+</div><div class='add'>+在大多数二元和三元操作符两侧使用一个空格，例如下面所有这些操作符::</div><div class='add'>+</div><div class='add'>+	=  +  -  &lt;  &gt;  *  /  %  |  &amp;  ^  &lt;=  &gt;=  ==  !=  ?  :</div><div class='add'>+</div><div class='add'>+但是一元操作符后不要加空格::</div><div class='add'>+</div><div class='add'>+	&amp;  *  +  -  ~  !  sizeof  typeof  alignof  __attribute__  defined</div><div class='add'>+</div><div class='add'>+后缀自加和自减一元操作符前不加空格::</div><div class='add'>+</div><div class='add'>+	++  --</div><div class='add'>+</div><div class='add'>+前缀自加和自减一元操作符后不加空格::</div><div class='add'>+</div><div class='add'>+	++  --</div><div class='add'>+</div><div class='add'>+``.`` 和 ``-&gt;`` 结构体成员操作符前后不加空格。</div><div class='add'>+</div><div class='add'>+不要在行尾留空白。有些可以自动缩进的编辑器会在新行的行首加入适量的空白，然后</div><div class='add'>+你就可以直接在那一行输入代码。不过假如你最后没有在那一行输入代码，有些编辑器</div><div class='add'>+就不会移除已经加入的空白，就像你故意留下一个只有空白的行。包含行尾空白的行就</div><div class='add'>+这样产生了。</div><div class='add'>+</div><div class='add'>+当 git 发现补丁包含了行尾空白的时候会警告你，并且可以应你的要求去掉行尾空白；</div><div class='add'>+不过如果你是正在打一系列补丁，这样做会导致后面的补丁失败，因为你改变了补丁的</div><div class='add'>+上下文。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4) 命名</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+C 是一个简朴的语言，你的命名也应该这样。和 Modula-2 和 Pascal 程序员不同，</div><div class='add'>+C 程序员不使用类似 ThisVariableIsATemporaryCounter 这样华丽的名字。C 程序员会</div><div class='add'>+称那个变量为 ``tmp`` ，这样写起来会更容易，而且至少不会令其难于理解。</div><div class='add'>+</div><div class='add'>+不过，虽然混用大小写的名字是不提倡使用的，但是全局变量还是需要一个具描述性的</div><div class='add'>+名字。称一个全局函数为 ``foo`` 是一个难以饶恕的错误。</div><div class='add'>+</div><div class='add'>+全局变量 (只有当你 **真正** 需要它们的时候再用它) 需要有一个具描述性的名字，就</div><div class='add'>+像全局函数。如果你有一个可以计算活动用户数量的函数，你应该叫它</div><div class='add'>+``count_active_users()`` 或者类似的名字，你不应该叫它 ``cntuser()`` 。</div><div class='add'>+</div><div class='add'>+在函数名中包含函数类型 (所谓的匈牙利命名法) 是脑子出了问题——编译器知道那些类</div><div class='add'>+型而且能够检查那些类型，这样做只能把程序员弄糊涂了。难怪微软总是制造出有问题</div><div class='add'>+的程序。</div><div class='add'>+</div><div class='add'>+本地变量名应该简短，而且能够表达相关的含义。如果你有一些随机的整数型的循环计</div><div class='add'>+数器，它应该被称为 ``i`` 。叫它 ``loop_counter`` 并无益处，如果它没有被误解的</div><div class='add'>+可能的话。类似的， ``tmp`` 可以用来称呼任意类型的临时变量。</div><div class='add'>+</div><div class='add'>+如果你怕混淆了你的本地变量名，你就遇到另一个问题了，叫做函数增长荷尔蒙失衡综</div><div class='add'>+合症。请看第六章 (函数)。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5) Typedef</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+不要使用类似 ``vps_t`` 之类的东西。</div><div class='add'>+</div><div class='add'>+对结构体和指针使用 typedef 是一个 **错误** 。当你在代码里看到：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	vps_t a;</div><div class='add'>+</div><div class='add'>+这代表什么意思呢？</div><div class='add'>+</div><div class='add'>+相反，如果是这样</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	struct virtual_container *a;</div><div class='add'>+</div><div class='add'>+你就知道 ``a`` 是什么了。</div><div class='add'>+</div><div class='add'>+很多人认为 typedef ``能提高可读性`` 。实际不是这样的。它们只在下列情况下有用：</div><div class='add'>+</div><div class='add'>+ (a) 完全不透明的对象 (这种情况下要主动使用 typedef 来 **隐藏** 这个对象实际上</div><div class='add'>+     是什么)。</div><div class='add'>+</div><div class='add'>+     例如： ``pte_t`` 等不透明对象，你只能用合适的访问函数来访问它们。</div><div class='add'>+</div><div class='add'>+     .. note::</div><div class='add'>+</div><div class='add'>+       不透明性和 "访问函数" 本身是不好的。我们使用 pte_t 等类型的原因在于真</div><div class='add'>+       的是完全没有任何共用的可访问信息。</div><div class='add'>+</div><div class='add'>+ (b) 清楚的整数类型，如此，这层抽象就可以 **帮助** 消除到底是 ``int`` 还是</div><div class='add'>+     ``long`` 的混淆。</div><div class='add'>+</div><div class='add'>+     u8/u16/u32 是完全没有问题的 typedef，不过它们更符合类别 (d) 而不是这里。</div><div class='add'>+</div><div class='add'>+     .. note::</div><div class='add'>+</div><div class='add'>+       要这样做，必须事出有因。如果某个变量是 ``unsigned long`` ，那么没有必要</div><div class='add'>+</div><div class='add'>+	typedef unsigned long myflags_t;</div><div class='add'>+</div><div class='add'>+     不过如果有一个明确的原因，比如它在某种情况下可能会是一个 ``unsigned int``</div><div class='add'>+     而在其他情况下可能为 ``unsigned long`` ，那么就不要犹豫，请务必使用</div><div class='add'>+     typedef。</div><div class='add'>+</div><div class='add'>+ (c) 当你使用 sparse 按字面的创建一个 **新** 类型来做类型检查的时候。</div><div class='add'>+</div><div class='add'>+ (d) 和标准 C99 类型相同的类型，在某些例外的情况下。</div><div class='add'>+</div><div class='add'>+     虽然让眼睛和脑筋来适应新的标准类型比如 ``uint32_t`` 不需要花很多时间，可</div><div class='add'>+     是有些人仍然拒绝使用它们。</div><div class='add'>+</div><div class='add'>+     因此，Linux 特有的等同于标准类型的 ``u8/u16/u32/u64`` 类型和它们的有符号</div><div class='add'>+     类型是被允许的——尽管在你自己的新代码中，它们不是强制要求要使用的。</div><div class='add'>+</div><div class='add'>+     当编辑已经使用了某个类型集的已有代码时，你应该遵循那些代码中已经做出的选</div><div class='add'>+     择。</div><div class='add'>+</div><div class='add'>+ (e) 可以在用户空间安全使用的类型。</div><div class='add'>+</div><div class='add'>+     在某些用户空间可见的结构体里，我们不能要求 C99 类型而且不能用上面提到的</div><div class='add'>+     ``u32`` 类型。因此，我们在与用户空间共享的所有结构体中使用 __u32 和类似</div><div class='add'>+     的类型。</div><div class='add'>+</div><div class='add'>+可能还有其他的情况，不过基本的规则是 **永远不要** 使用 typedef，除非你可以明</div><div class='add'>+确的应用上述某个规则中的一个。</div><div class='add'>+</div><div class='add'>+总的来说，如果一个指针或者一个结构体里的元素可以合理的被直接访问到，那么它们</div><div class='add'>+就不应该是一个 typedef。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6) 函数</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+函数应该简短而漂亮，并且只完成一件事情。函数应该可以一屏或者两屏显示完 (我们</div><div class='add'>+都知道 ISO/ANSI 屏幕大小是 80x24)，只做一件事情，而且把它做好。</div><div class='add'>+</div><div class='add'>+一个函数的最大长度是和该函数的复杂度和缩进级数成反比的。所以，如果你有一个理</div><div class='add'>+论上很简单的只有一个很长 (但是简单) 的 case 语句的函数，而且你需要在每个 case</div><div class='add'>+里做很多很小的事情，这样的函数尽管很长，但也是可以的。</div><div class='add'>+</div><div class='add'>+不过，如果你有一个复杂的函数，而且你怀疑一个天分不是很高的高中一年级学生可能</div><div class='add'>+甚至搞不清楚这个函数的目的，你应该严格遵守前面提到的长度限制。使用辅助函数，</div><div class='add'>+并为之取个具描述性的名字 (如果你觉得它们的性能很重要的话，可以让编译器内联它</div><div class='add'>+们，这样的效果往往会比你写一个复杂函数的效果要好。)</div><div class='add'>+</div><div class='add'>+函数的另外一个衡量标准是本地变量的数量。此数量不应超过 5－10 个，否则你的函数</div><div class='add'>+就有问题了。重新考虑一下你的函数，把它分拆成更小的函数。人的大脑一般可以轻松</div><div class='add'>+的同时跟踪 7 个不同的事物，如果再增多的话，就会糊涂了。即便你聪颖过人，你也可</div><div class='add'>+能会记不清你 2 个星期前做过的事情。</div><div class='add'>+</div><div class='add'>+在源文件里，使用空行隔开不同的函数。如果该函数需要被导出，它的 **EXPORT** 宏</div><div class='add'>+应该紧贴在它的结束大括号之下。比如：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int system_is_up(void)</div><div class='add'>+	{</div><div class='add'>+		return system_state == SYSTEM_RUNNING;</div><div class='add'>+	}</div><div class='add'>+	EXPORT_SYMBOL(system_is_up);</div><div class='add'>+</div><div class='add'>+在函数原型中，包含函数名和它们的数据类型。虽然 C 语言里没有这样的要求，在</div><div class='add'>+Linux 里这是提倡的做法，因为这样可以很简单的给读者提供更多的有价值的信息。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+7) 集中的函数退出途径</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+虽然被某些人声称已经过时，但是 goto 语句的等价物还是经常被编译器所使用，具体</div><div class='add'>+形式是无条件跳转指令。</div><div class='add'>+</div><div class='add'>+当一个函数从多个位置退出，并且需要做一些类似清理的常见操作时，goto 语句就很方</div><div class='add'>+便了。如果并不需要清理操作，那么直接 return 即可。</div><div class='add'>+</div><div class='add'>+选择一个能够说明 goto 行为或它为何存在的标签名。如果 goto 要释放 ``buffer``,</div><div class='add'>+一个不错的名字可以是 ``out_free_buffer:`` 。别去使用像 ``err1:`` 和 ``err2:``</div><div class='add'>+这样的GW_BASIC 名称，因为一旦你添加或删除了 (函数的) 退出路径，你就必须对它们</div><div class='add'>+重新编号，这样会难以去检验正确性。</div><div class='add'>+</div><div class='add'>+使用 goto 的理由是：</div><div class='add'>+</div><div class='add'>+- 无条件语句容易理解和跟踪</div><div class='add'>+- 嵌套程度减小</div><div class='add'>+- 可以避免由于修改时忘记更新个别的退出点而导致错误</div><div class='add'>+- 让编译器省去删除冗余代码的工作 ;)</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	int fun(int a)</div><div class='add'>+	{</div><div class='add'>+		int result = 0;</div><div class='add'>+		char *buffer;</div><div class='add'>+</div><div class='add'>+		buffer = kmalloc(SIZE, GFP_KERNEL);</div><div class='add'>+		if (!buffer)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (condition1) {</div><div class='add'>+			while (loop1) {</div><div class='add'>+				...</div><div class='add'>+			}</div><div class='add'>+			result = 1;</div><div class='add'>+			goto out_free_buffer;</div><div class='add'>+		}</div><div class='add'>+		...</div><div class='add'>+	out_free_buffer:</div><div class='add'>+		kfree(buffer);</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+一个需要注意的常见错误是 ``一个 err 错误`` ，就像这样：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	err:</div><div class='add'>+		kfree(foo-&gt;bar);</div><div class='add'>+		kfree(foo);</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+这段代码的错误是，在某些退出路径上 ``foo`` 是 NULL。通常情况下，通过把它分离</div><div class='add'>+成两个错误标签 ``err_free_bar:`` 和 ``err_free_foo:`` 来修复这个错误：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	 err_free_bar:</div><div class='add'>+		kfree(foo-&gt;bar);</div><div class='add'>+	 err_free_foo:</div><div class='add'>+		kfree(foo);</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+理想情况下，你应该模拟错误来测试所有退出路径。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+8) 注释</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+注释是好的，不过有过度注释的危险。永远不要在注释里解释你的代码是如何运作的：</div><div class='add'>+更好的做法是让别人一看你的代码就可以明白，解释写的很差的代码是浪费时间。</div><div class='add'>+</div><div class='add'>+一般的，你想要你的注释告诉别人你的代码做了什么，而不是怎么做的。也请你不要把</div><div class='add'>+注释放在一个函数体内部：如果函数复杂到你需要独立的注释其中的一部分，你很可能</div><div class='add'>+需要回到第六章看一看。你可以做一些小注释来注明或警告某些很聪明 (或者槽糕) 的</div><div class='add'>+做法，但不要加太多。你应该做的，是把注释放在函数的头部，告诉人们它做了什么，</div><div class='add'>+也可以加上它做这些事情的原因。</div><div class='add'>+</div><div class='add'>+当注释内核 API 函数时，请使用 kernel-doc 格式。请看</div><div class='add'>+Documentation/doc-guide/ 和 scripts/kernel-doc 以获得详细信息。</div><div class='add'>+</div><div class='add'>+长 (多行) 注释的首选风格是：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is the preferred style for multi-line</div><div class='add'>+	 * comments in the Linux kernel source code.</div><div class='add'>+	 * Please use it consistently.</div><div class='add'>+	 *</div><div class='add'>+	 * Description:  A column of asterisks on the left side,</div><div class='add'>+	 * with beginning and ending almost-blank lines.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+对于在 net/ 和 drivers/net/ 的文件，首选的长 (多行) 注释风格有些不同。</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	/* The preferred comment style for files in net/ and drivers/net</div><div class='add'>+	 * looks like this.</div><div class='add'>+	 *</div><div class='add'>+	 * It is nearly the same as the generally preferred comment style,</div><div class='add'>+	 * but there is no initial almost-blank line.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+注释数据也是很重要的，不管是基本类型还是衍生类型。为了方便实现这一点，每一行</div><div class='add'>+应只声明一个数据 (不要使用逗号来一次声明多个数据)。这样你就有空间来为每个数据</div><div class='add'>+写一段小注释来解释它们的用途了。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+9) 你已经把事情弄糟了</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+这没什么，我们都是这样。可能你的使用了很长时间 Unix 的朋友已经告诉你</div><div class='add'>+``GNU emacs`` 能自动帮你格式化 C 源代码，而且你也注意到了，确实是这样，不过它</div><div class='add'>+所使用的默认值和我们想要的相去甚远 (实际上，甚至比随机打的还要差——无数个猴子</div><div class='add'>+在 GNU emacs 里打字永远不会创造出一个好程序) (译注：Infinite Monkey Theorem)</div><div class='add'>+</div><div class='add'>+所以你要么放弃 GNU emacs，要么改变它让它使用更合理的设定。要采用后一个方案，</div><div class='add'>+你可以把下面这段粘贴到你的 .emacs 文件里。</div><div class='add'>+</div><div class='add'>+.. code-block:: none</div><div class='add'>+</div><div class='add'>+  (defun c-lineup-arglist-tabs-only (ignored)</div><div class='add'>+    "Line up argument lists by tabs, not spaces"</div><div class='add'>+    (let* ((anchor (c-langelem-pos c-syntactic-element))</div><div class='add'>+           (column (c-langelem-2nd-pos c-syntactic-element))</div><div class='add'>+           (offset (- (1+ column) anchor))</div><div class='add'>+           (steps (floor offset c-basic-offset)))</div><div class='add'>+      (* (max steps 1)</div><div class='add'>+         c-basic-offset)))</div><div class='add'>+</div><div class='add'>+  (add-hook 'c-mode-common-hook</div><div class='add'>+            (lambda ()</div><div class='add'>+              ;; Add kernel style</div><div class='add'>+              (c-add-style</div><div class='add'>+               "linux-tabs-only"</div><div class='add'>+               '("linux" (c-offsets-alist</div><div class='add'>+                          (arglist-cont-nonempty</div><div class='add'>+                           c-lineup-gcc-asm-reg</div><div class='add'>+                           c-lineup-arglist-tabs-only))))))</div><div class='add'>+</div><div class='add'>+  (add-hook 'c-mode-hook</div><div class='add'>+            (lambda ()</div><div class='add'>+              (let ((filename (buffer-file-name)))</div><div class='add'>+                ;; Enable kernel mode for the appropriate files</div><div class='add'>+                (when (and filename</div><div class='add'>+                           (string-match (expand-file-name "~/src/linux-trees")</div><div class='add'>+                                         filename))</div><div class='add'>+                  (setq indent-tabs-mode t)</div><div class='add'>+                  (setq show-trailing-whitespace t)</div><div class='add'>+                  (c-set-style "linux-tabs-only")))))</div><div class='add'>+</div><div class='add'>+这会让 emacs 在 ``~/src/linux-trees`` 下的 C 源文件获得更好的内核代码风格。</div><div class='add'>+</div><div class='add'>+不过就算你尝试让 emacs 正确的格式化代码失败了，也并不意味着你失去了一切：还可</div><div class='add'>+以用 ``indent`` 。</div><div class='add'>+</div><div class='add'>+不过，GNU indent 也有和 GNU emacs 一样有问题的设定，所以你需要给它一些命令选</div><div class='add'>+项。不过，这还不算太糟糕，因为就算是 GNU indent 的作者也认同 K&amp;R 的权威性</div><div class='add'>+(GNU 的人并不是坏人，他们只是在这个问题上被严重的误导了)，所以你只要给 indent</div><div class='add'>+指定选项 ``-kr -i8`` (代表 ``K&amp;R，8 字符缩进``)，或使用 ``scripts/Lindent``</div><div class='add'>+这样就可以以最时髦的方式缩进源代码。</div><div class='add'>+</div><div class='add'>+``indent`` 有很多选项，特别是重新格式化注释的时候，你可能需要看一下它的手册。</div><div class='add'>+不过记住： ``indent`` 不能修正坏的编程习惯。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+10) Kconfig 配置文件</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+对于遍布源码树的所有 Kconfig* 配置文件来说，它们缩进方式有所不同。紧挨着</div><div class='add'>+``config`` 定义的行，用一个制表符缩进，然而 help 信息的缩进则额外增加 2 个空</div><div class='add'>+格。举个例子::</div><div class='add'>+</div><div class='add'>+  config AUDIT</div><div class='add'>+	bool "Auditing support"</div><div class='add'>+	depends on NET</div><div class='add'>+	help</div><div class='add'>+	  Enable auditing infrastructure that can be used with another</div><div class='add'>+	  kernel subsystem, such as SELinux (which requires this for</div><div class='add'>+	  logging of avc messages output).  Does not do system-call</div><div class='add'>+	  auditing without CONFIG_AUDITSYSCALL.</div><div class='add'>+</div><div class='add'>+而那些危险的功能 (比如某些文件系统的写支持) 应该在它们的提示字符串里显著的声</div><div class='add'>+明这一点::</div><div class='add'>+</div><div class='add'>+  config ADFS_FS_RW</div><div class='add'>+	bool "ADFS write support (DANGEROUS)"</div><div class='add'>+	depends on ADFS_FS</div><div class='add'>+	...</div><div class='add'>+</div><div class='add'>+要查看配置文件的完整文档，请看 Documentation/kbuild/kconfig-language.txt。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+11) 数据结构</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+如果一个数据结构，在创建和销毁它的单线执行环境之外可见，那么它必须要有一个引</div><div class='add'>+用计数器。内核里没有垃圾收集 (并且内核之外的垃圾收集慢且效率低下)，这意味着你</div><div class='add'>+绝对需要记录你对这种数据结构的使用情况。</div><div class='add'>+</div><div class='add'>+引用计数意味着你能够避免上锁，并且允许多个用户并行访问这个数据结构——而不需要</div><div class='add'>+担心这个数据结构仅仅因为暂时不被使用就消失了，那些用户可能不过是沉睡了一阵或</div><div class='add'>+者做了一些其他事情而已。</div><div class='add'>+</div><div class='add'>+注意上锁 **不能** 取代引用计数。上锁是为了保持数据结构的一致性，而引用计数是一</div><div class='add'>+个内存管理技巧。通常二者都需要，不要把两个搞混了。</div><div class='add'>+</div><div class='add'>+很多数据结构实际上有 2 级引用计数，它们通常有不同 ``类`` 的用户。子类计数器统</div><div class='add'>+计子类用户的数量，每当子类计数器减至零时，全局计数器减一。</div><div class='add'>+</div><div class='add'>+这种 ``多级引用计数`` 的例子可以在内存管理 (``struct mm_struct``: mm_users 和</div><div class='add'>+mm_count)，和文件系统 (``struct super_block``: s_count 和 s_active) 中找到。</div><div class='add'>+</div><div class='add'>+记住：如果另一个执行线索可以找到你的数据结构，但这个数据结构没有引用计数器，</div><div class='add'>+这里几乎肯定是一个 bug。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+12) 宏，枚举和RTL</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+用于定义常量的宏的名字及枚举里的标签需要大写。</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define CONSTANT 0x12345</div><div class='add'>+</div><div class='add'>+在定义几个相关的常量时，最好用枚举。</div><div class='add'>+</div><div class='add'>+宏的名字请用大写字母，不过形如函数的宏的名字可以用小写字母。</div><div class='add'>+</div><div class='add'>+一般的，如果能写成内联函数就不要写成像函数的宏。</div><div class='add'>+</div><div class='add'>+含有多个语句的宏应该被包含在一个 do-while 代码块里：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define macrofun(a, b, c)			\</div><div class='add'>+		do {					\</div><div class='add'>+			if (a == 5)			\</div><div class='add'>+				do_this(b, c);		\</div><div class='add'>+		} while (0)</div><div class='add'>+</div><div class='add'>+使用宏的时候应避免的事情：</div><div class='add'>+</div><div class='add'>+1) 影响控制流程的宏：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define FOO(x)					\</div><div class='add'>+		do {					\</div><div class='add'>+			if (blah(x) &lt; 0)		\</div><div class='add'>+				return -EBUGGERED;	\</div><div class='add'>+		} while (0)</div><div class='add'>+</div><div class='add'>+**非常** 不好。它看起来像一个函数，不过却能导致 ``调用`` 它的函数退出；不要打</div><div class='add'>+乱读者大脑里的语法分析器。</div><div class='add'>+</div><div class='add'>+2) 依赖于一个固定名字的本地变量的宏：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define FOO(val) bar(index, val)</div><div class='add'>+</div><div class='add'>+可能看起来像是个不错的东西，不过它非常容易把读代码的人搞糊涂，而且容易导致看起</div><div class='add'>+来不相关的改动带来错误。</div><div class='add'>+</div><div class='add'>+3) 作为左值的带参数的宏： FOO(x) = y；如果有人把 FOO 变成一个内联函数的话，这</div><div class='add'>+   种用法就会出错了。</div><div class='add'>+</div><div class='add'>+4) 忘记了优先级：使用表达式定义常量的宏必须将表达式置于一对小括号之内。带参数</div><div class='add'>+   的宏也要注意此类问题。</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define CONSTANT 0x4000</div><div class='add'>+	#define CONSTEXP (CONSTANT | 3)</div><div class='add'>+</div><div class='add'>+5) 在宏里定义类似函数的本地变量时命名冲突：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define FOO(x)				\</div><div class='add'>+	({					\</div><div class='add'>+		typeof(x) ret;			\</div><div class='add'>+		ret = calc_ret(x);		\</div><div class='add'>+		(ret);				\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+ret 是本地变量的通用名字 - __foo_ret 更不容易与一个已存在的变量冲突。</div><div class='add'>+</div><div class='add'>+cpp 手册对宏的讲解很详细。gcc internals 手册也详细讲解了 RTL，内核里的汇编语</div><div class='add'>+言经常用到它。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+13) 打印内核消息</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+内核开发者应该是受过良好教育的。请一定注意内核信息的拼写，以给人以好的印象。</div><div class='add'>+不要用不规范的单词比如 ``dont``，而要用 ``do not`` 或者 ``don't`` 。保证这些信</div><div class='add'>+息简单明了,无歧义。</div><div class='add'>+</div><div class='add'>+内核信息不必以英文句号结束。</div><div class='add'>+</div><div class='add'>+在小括号里打印数字 (%d) 没有任何价值，应该避免这样做。</div><div class='add'>+</div><div class='add'>+&lt;linux/device.h&gt; 里有一些驱动模型诊断宏，你应该使用它们，以确保信息对应于正确</div><div class='add'>+的设备和驱动，并且被标记了正确的消息级别。这些宏有：dev_err(), dev_warn(),</div><div class='add'>+dev_info() 等等。对于那些不和某个特定设备相关连的信息，&lt;linux/printk.h&gt; 定义</div><div class='add'>+了 pr_notice(), pr_info(), pr_warn(), pr_err() 和其他。</div><div class='add'>+</div><div class='add'>+写出好的调试信息可以是一个很大的挑战；一旦你写出后，这些信息在远程除错时能提</div><div class='add'>+供极大的帮助。然而打印调试信息的处理方式同打印非调试信息不同。其他 pr_XXX()</div><div class='add'>+函数能无条件地打印，pr_debug() 却不；默认情况下它不会被编译，除非定义了 DEBUG</div><div class='add'>+或设定了 CONFIG_DYNAMIC_DEBUG。实际这同样是为了 dev_dbg()，一个相关约定是在一</div><div class='add'>+个已经开启了 DEBUG 时，使用 VERBOSE_DEBUG 来添加 dev_vdbg()。</div><div class='add'>+</div><div class='add'>+许多子系统拥有 Kconfig 调试选项来开启 -DDEBUG 在对应的 Makefile 里面；在其他</div><div class='add'>+情况下，特殊文件使用 #define DEBUG。当一条调试信息需要被无条件打印时，例如，</div><div class='add'>+如果已经包含一个调试相关的 #ifdef 条件，printk(KERN_DEBUG ...) 就可被使用。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+14) 分配内存</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+内核提供了下面的一般用途的内存分配函数：</div><div class='add'>+kmalloc(), kzalloc(), kmalloc_array(), kcalloc(), vmalloc() 和 vzalloc()。</div><div class='add'>+请参考 API 文档以获取有关它们的详细信息。</div><div class='add'>+</div><div class='add'>+传递结构体大小的首选形式是这样的：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	p = kmalloc(sizeof(*p), ...);</div><div class='add'>+</div><div class='add'>+另外一种传递方式中，sizeof 的操作数是结构体的名字，这样会降低可读性，并且可能</div><div class='add'>+会引入 bug。有可能指针变量类型被改变时，而对应的传递给内存分配函数的 sizeof</div><div class='add'>+的结果不变。</div><div class='add'>+</div><div class='add'>+强制转换一个 void 指针返回值是多余的。C 语言本身保证了从 void 指针到其他任何</div><div class='add'>+指针类型的转换是没有问题的。</div><div class='add'>+</div><div class='add'>+分配一个数组的首选形式是这样的：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	p = kmalloc_array(n, sizeof(...), ...);</div><div class='add'>+</div><div class='add'>+分配一个零长数组的首选形式是这样的：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	p = kcalloc(n, sizeof(...), ...);</div><div class='add'>+</div><div class='add'>+两种形式检查分配大小 n * sizeof(...) 的溢出，如果溢出返回 NULL。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+15) 内联弊病</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+有一个常见的误解是 ``内联`` 是 gcc 提供的可以让代码运行更快的一个选项。虽然使</div><div class='add'>+用内联函数有时候是恰当的 (比如作为一种替代宏的方式，请看第十二章)，不过很多情</div><div class='add'>+况下不是这样。inline 的过度使用会使内核变大，从而使整个系统运行速度变慢。</div><div class='add'>+因为体积大内核会占用更多的指令高速缓存，而且会导致 pagecache 的可用内存减少。</div><div class='add'>+想象一下，一次 pagecache 未命中就会导致一次磁盘寻址，将耗时 5 毫秒。5 毫秒的</div><div class='add'>+时间内 CPU 能执行很多很多指令。</div><div class='add'>+</div><div class='add'>+一个基本的原则是如果一个函数有 3 行以上，就不要把它变成内联函数。这个原则的一</div><div class='add'>+个例外是，如果你知道某个参数是一个编译时常量，而且因为这个常量你确定编译器在</div><div class='add'>+编译时能优化掉你的函数的大部分代码，那仍然可以给它加上 inline 关键字。</div><div class='add'>+kmalloc() 内联函数就是一个很好的例子。</div><div class='add'>+</div><div class='add'>+人们经常主张给 static 的而且只用了一次的函数加上 inline，如此不会有任何损失，</div><div class='add'>+因为没有什么好权衡的。虽然从技术上说这是正确的，但是实际上这种情况下即使不加</div><div class='add'>+inline gcc 也可以自动使其内联。而且其他用户可能会要求移除 inline，由此而来的</div><div class='add'>+争论会抵消 inline 自身的潜在价值，得不偿失。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+16) 函数返回值及命名</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+函数可以返回多种不同类型的值，最常见的一种是表明函数执行成功或者失败的值。这样</div><div class='add'>+的一个值可以表示为一个错误代码整数 (-Exxx＝失败，0＝成功) 或者一个 ``成功``</div><div class='add'>+布尔值 (0＝失败，非0＝成功)。</div><div class='add'>+</div><div class='add'>+混合使用这两种表达方式是难于发现的 bug 的来源。如果 C 语言本身严格区分整形和</div><div class='add'>+布尔型变量，那么编译器就能够帮我们发现这些错误... 不过 C 语言不区分。为了避免</div><div class='add'>+产生这种 bug，请遵循下面的惯例::</div><div class='add'>+</div><div class='add'>+	如果函数的名字是一个动作或者强制性的命令，那么这个函数应该返回错误代</div><div class='add'>+	码整数。如果是一个判断，那么函数应该返回一个 "成功" 布尔值。</div><div class='add'>+</div><div class='add'>+比如， ``add work`` 是一个命令，所以 add_work() 在成功时返回 0，在失败时返回</div><div class='add'>+-EBUSY。类似的，因为 ``PCI device present`` 是一个判断，所以 pci_dev_present()</div><div class='add'>+在成功找到一个匹配的设备时应该返回 1，如果找不到时应该返回 0。</div><div class='add'>+</div><div class='add'>+所有 EXPORTed 函数都必须遵守这个惯例，所有的公共函数也都应该如此。私有</div><div class='add'>+(static) 函数不需要如此，但是我们也推荐这样做。</div><div class='add'>+</div><div class='add'>+返回值是实际计算结果而不是计算是否成功的标志的函数不受此惯例的限制。一般的，</div><div class='add'>+他们通过返回一些正常值范围之外的结果来表示出错。典型的例子是返回指针的函数，</div><div class='add'>+他们使用 NULL 或者 ERR_PTR 机制来报告错误。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+17) 不要重新发明内核宏</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+头文件 include/linux/kernel.h 包含了一些宏，你应该使用它们，而不要自己写一些</div><div class='add'>+它们的变种。比如，如果你需要计算一个数组的长度，使用这个宏</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))</div><div class='add'>+</div><div class='add'>+类似的，如果你要计算某结构体成员的大小，使用</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)-&gt;f))</div><div class='add'>+</div><div class='add'>+还有可以做严格的类型检查的 min() 和 max() 宏，如果你需要可以使用它们。你可以</div><div class='add'>+自己看看那个头文件里还定义了什么你可以拿来用的东西，如果有定义的话，你就不应</div><div class='add'>+在你的代码里自己重新定义。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+18) 编辑器模式行和其他需要罗嗦的事情</div><div class='add'>+--------------------------------------------------</div><div class='add'>+</div><div class='add'>+有一些编辑器可以解释嵌入在源文件里的由一些特殊标记标明的配置信息。比如，emacs</div><div class='add'>+能够解释被标记成这样的行：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	-*- mode: c -*-</div><div class='add'>+</div><div class='add'>+或者这样的：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	Local Variables:</div><div class='add'>+	compile-command: "gcc -DMAGIC_DEBUG_FLAG foo.c"</div><div class='add'>+	End:</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+Vim 能够解释这样的标记：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	/* vim:set sw=8 noet */</div><div class='add'>+</div><div class='add'>+不要在源代码中包含任何这样的内容。每个人都有他自己的编辑器配置，你的源文件不</div><div class='add'>+应该覆盖别人的配置。这包括有关缩进和模式配置的标记。人们可以使用他们自己定制</div><div class='add'>+的模式，或者使用其他可以产生正确的缩进的巧妙方法。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+19) 内联汇编</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+在特定架构的代码中，你可能需要内联汇编与 CPU 和平台相关功能连接。需要这么做时</div><div class='add'>+就不要犹豫。然而，当 C 可以完成工作时，不要平白无故地使用内联汇编。在可能的情</div><div class='add'>+况下，你可以并且应该用 C 和硬件沟通。</div><div class='add'>+</div><div class='add'>+请考虑去写捆绑通用位元 (wrap common bits) 的内联汇编的简单辅助函数，别去重复</div><div class='add'>+地写下只有细微差异内联汇编。记住内联汇编可以使用 C 参数。</div><div class='add'>+</div><div class='add'>+大型，有一定复杂度的汇编函数应该放在 .S 文件内，用相应的 C 原型定义在 C 头文</div><div class='add'>+件中。汇编函数的 C 原型应该使用 ``asmlinkage`` 。</div><div class='add'>+</div><div class='add'>+你可能需要把汇编语句标记为 volatile，用来阻止 GCC 在没发现任何副作用后就把它</div><div class='add'>+移除了。你不必总是这样做，尽管，这不必要的举动会限制优化。</div><div class='add'>+</div><div class='add'>+在写一个包含多条指令的单个内联汇编语句时，把每条指令用引号分割而且各占一行，</div><div class='add'>+除了最后一条指令外，在每个指令结尾加上 \n\t，让汇编输出时可以正确地缩进下一条</div><div class='add'>+指令：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	asm ("magic %reg1, #42\n\t"</div><div class='add'>+	     "more_magic %reg2, %reg3"</div><div class='add'>+	     : /* outputs */ : /* inputs */ : /* clobbers */);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+20) 条件编译</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+只要可能，就不要在 .c 文件里面使用预处理条件 (#if, #ifdef)；这样做让代码更难</div><div class='add'>+阅读并且更难去跟踪逻辑。替代方案是，在头文件中用预处理条件提供给那些 .c 文件</div><div class='add'>+使用，再给 #else 提供一个空桩 (no-op stub) 版本，然后在 .c 文件内无条件地调用</div><div class='add'>+那些 (定义在头文件内的) 函数。这样做，编译器会避免为桩函数 (stub) 的调用生成</div><div class='add'>+任何代码，产生的结果是相同的，但逻辑将更加清晰。</div><div class='add'>+</div><div class='add'>+最好倾向于编译整个函数，而不是函数的一部分或表达式的一部分。与其放一个 ifdef</div><div class='add'>+在表达式内，不如分解出部分或全部表达式，放进一个单独的辅助函数，并应用预处理</div><div class='add'>+条件到这个辅助函数内。</div><div class='add'>+</div><div class='add'>+如果你有一个在特定配置中，可能变成未使用的函数或变量，编译器会警告它定义了但</div><div class='add'>+未使用，把它标记为 __maybe_unused 而不是将它包含在一个预处理条件中。(然而，如</div><div class='add'>+果一个函数或变量总是未使用，就直接删除它。)</div><div class='add'>+</div><div class='add'>+在代码中，尽可能地使用 IS_ENABLED 宏来转化某个 Kconfig 标记为 C 的布尔</div><div class='add'>+表达式，并在一般的 C 条件中使用它：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_SOMETHING)) {</div><div class='add'>+		...</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+编译器会做常量折叠，然后就像使用 #ifdef 那样去包含或排除代码块，所以这不会带</div><div class='add'>+来任何运行时开销。然而，这种方法依旧允许 C 编译器查看块内的代码，并检查它的正</div><div class='add'>+确性 (语法，类型，符号引用，等等)。因此，如果条件不满足，代码块内的引用符号就</div><div class='add'>+不存在时，你还是必须去用 #ifdef。</div><div class='add'>+</div><div class='add'>+在任何有意义的 #if 或 #ifdef 块的末尾 (超过几行的)，在 #endif 同一行的后面写下</div><div class='add'>+注解，注释这个条件表达式。例如：</div><div class='add'>+</div><div class='add'>+.. code-block:: c</div><div class='add'>+</div><div class='add'>+	#ifdef CONFIG_SOMETHING</div><div class='add'>+	...</div><div class='add'>+	#endif /* CONFIG_SOMETHING */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+附录 I) 参考</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+The C Programming Language, 第二版</div><div class='add'>+作者：Brian W. Kernighan 和 Denni M. Ritchie.</div><div class='add'>+Prentice Hall, Inc., 1988.</div><div class='add'>+ISBN 0-13-110362-8 (软皮), 0-13-110370-9 (硬皮).</div><div class='add'>+</div><div class='add'>+The Practice of Programming</div><div class='add'>+作者：Brian W. Kernighan 和 Rob Pike.</div><div class='add'>+Addison-Wesley, Inc., 1999.</div><div class='add'>+ISBN 0-201-61586-X.</div><div class='add'>+</div><div class='add'>+GNU 手册 - 遵循 K&amp;R 标准和此文本 - cpp, gcc, gcc internals and indent,</div><div class='add'>+都可以从 http://www.gnu.org/manual/ 找到</div><div class='add'>+</div><div class='add'>+WG14 是 C 语言的国际标准化工作组，URL: http://www.open-std.org/JTC1/SC22/WG14/</div><div class='add'>+</div><div class='add'>+Kernel process/coding-style.rst，作者 greg@kroah.com 发表于 OLS 2002：</div><div class='add'>+http://www.kroah.com/linux/talks/ols_2002_kernel_codingstyle_talk/html/</div><div class='head'>diff --git a/Documentation/zh_CN/email-clients.txt b/Documentation/translations/zh_CN/email-clients.txt<br/>index b9a1a3e6c78d..ec31d97e8d0e 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/email-clients.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/email-clients.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/email-clients.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/email-clients.txt</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-Chinese translated version of Documentation/email-clients.txt</div><div class='add'>+Chinese translated version of Documentation/process/email-clients.rst</div><div class='ctx'> </div><div class='ctx'> If you have any comment or update to the content, please contact the</div><div class='ctx'> original document maintainer directly.  However, if you have a problem</div><div class='hunk'>@@ -8,7 +8,7 @@ or if there is a problem with the translation.</div><div class='ctx'> </div><div class='ctx'> Chinese maintainer: Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='ctx'> ---------------------------------------------------------------------</div><div class='del'>-Documentation/email-clients.txt 的中文翻译</div><div class='add'>+Documentation/process/email-clients.rst 的中文翻译</div><div class='ctx'> </div><div class='ctx'> 如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='ctx'> 交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='head'>diff --git a/Documentation/zh_CN/filesystems/sysfs.txt b/Documentation/translations/zh_CN/filesystems/sysfs.txt<br/>index 7d3b05edb8ce..7d3b05edb8ce 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/filesystems/sysfs.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/filesystems/sysfs.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/filesystems/sysfs.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/filesystems/sysfs.txt</a></div><div class='head'>diff --git a/Documentation/zh_CN/gpio.txt b/Documentation/translations/zh_CN/gpio.txt<br/>index bce972521065..bce972521065 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/gpio.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/gpio.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/gpio.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/gpio.txt</a></div><div class='head'>diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst<br/>new file mode 100644<br/>index 000000000000..75956d669962<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/index.rst?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/index.rst</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+.. raw:: latex</div><div class='add'>+</div><div class='add'>+	\renewcommand\thesection*</div><div class='add'>+	\renewcommand\thesubsection*</div><div class='add'>+</div><div class='add'>+Chinese translations</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+.. toctree::</div><div class='add'>+   :maxdepth: 1</div><div class='add'>+</div><div class='add'>+   coding-style</div><div class='head'>diff --git a/Documentation/zh_CN/io_ordering.txt b/Documentation/translations/zh_CN/io_ordering.txt<br/>index e592daf4e014..e592daf4e014 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/io_ordering.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/io_ordering.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/io_ordering.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/io_ordering.txt</a></div><div class='head'>diff --git a/Documentation/zh_CN/magic-number.txt b/Documentation/translations/zh_CN/magic-number.txt<br/>index e9db693c0a23..e9db693c0a23 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/magic-number.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/magic-number.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/magic-number.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/magic-number.txt</a></div><div class='head'>diff --git a/Documentation/translations/zh_CN/oops-tracing.txt b/Documentation/translations/zh_CN/oops-tracing.txt<br/>new file mode 100644<br/>index 000000000000..41ab53cc0e83<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/oops-tracing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/oops-tracing.txt</a></div><div class='hunk'>@@ -0,0 +1,212 @@</div><div class='add'>+Chinese translated version of Documentation/admin-guide/oops-tracing.rst</div><div class='add'>+</div><div class='add'>+If you have any comment or update to the content, please contact the</div><div class='add'>+original document maintainer directly.  However, if you have a problem</div><div class='add'>+communicating in English you can also ask the Chinese maintainer for</div><div class='add'>+help.  Contact the Chinese maintainer if this translation is outdated</div><div class='add'>+or if there is a problem with the translation.</div><div class='add'>+</div><div class='add'>+Chinese maintainer: Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+Documentation/admin-guide/oops-tracing.rst 的中文翻译</div><div class='add'>+</div><div class='add'>+如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='add'>+交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='add'>+译存在问题，请联系中文版维护者。</div><div class='add'>+</div><div class='add'>+中文版维护者： 杨瑞 Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='add'>+中文版翻译者： 杨瑞 Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='add'>+中文版校译者： 李阳 Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='add'>+               王聪 Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+以下为正文</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+注意： ksymoops 在2.6中是没有用的。 请以原有格式使用Oops(来自dmesg，等等)。</div><div class='add'>+忽略任何这样那样关于“解码Oops”或者“通过ksymoops运行”的文档。 如果你贴出运行过</div><div class='add'>+ksymoops的来自2.6的Oops，人们只会让你重贴一次。</div><div class='add'>+</div><div class='add'>+快速总结</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+发现Oops并发送给看似相关的内核领域的维护者。别太担心对不上号。如果你不确定就发给</div><div class='add'>+和你所做的事情相关的代码的负责人。 如果可重现试着描述怎样重构。 那甚至比oops更有</div><div class='add'>+价值。</div><div class='add'>+</div><div class='add'>+如果你对于发送给谁一无所知， 发给linux-kernel@vger.kernel.org。感谢你帮助Linux</div><div class='add'>+尽可能地稳定。</div><div class='add'>+</div><div class='add'>+Oops在哪里?</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+通常Oops文本由klogd从内核缓冲区里读取并传给syslogd，由syslogd写到syslog文件中，</div><div class='add'>+典型地是/var/log/messages(依赖于/etc/syslog.conf)。有时klogd崩溃了,这种情况下你</div><div class='add'>+能够运行dmesg &gt; file来从内核缓冲区中读取数据并保存下来。 否则你可以</div><div class='add'>+cat /proc/kmsg &gt; file， 然而你必须介入中止传输， kmsg是一个“永不结束的文件”。如</div><div class='add'>+果机器崩溃坏到你不能输入命令或者磁盘不可用那么你有三种选择:-</div><div class='add'>+</div><div class='add'>+（1） 手抄屏幕上的文本待机器重启后再输入计算机。 麻烦但如果没有针对崩溃的准备，</div><div class='add'>+这是仅有的选择。 另外，你可以用数码相机把屏幕拍下来-不太好，但比没有强。 如果信</div><div class='add'>+息滚动到了终端的上面，你会发现以高分辩率启动（比如，vga=791）会让你读到更多的文</div><div class='add'>+本。（注意：这需要vesafb，所以对‘早期’的oops没有帮助）</div><div class='add'>+</div><div class='add'>+（2）用串口终端启动（请参看Documentation/admin-guide/serial-console.rst），运行一个null</div><div class='add'>+modem到另一台机器并用你喜欢的通讯工具获取输出。Minicom工作地很好。</div><div class='add'>+</div><div class='add'>+（3）使用Kdump（请参看Documentation/kdump/kdump.txt），</div><div class='add'>+使用在Documentation/kdump/gdbmacros.txt中定义的dmesg gdb宏，从旧的内存中提取内核</div><div class='add'>+环形缓冲区。</div><div class='add'>+</div><div class='add'>+完整信息</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+注意：以下来自于Linus的邮件适用于2.4内核。 我因为历史原因保留了它，并且因为其中</div><div class='add'>+一些信息仍然适用。 特别注意的是，请忽略任何ksymoops的引用。</div><div class='add'>+</div><div class='add'>+From: Linus Torvalds &lt;torvalds@osdl.org&gt;</div><div class='add'>+</div><div class='add'>+怎样跟踪Oops.. [原发到linux-kernel的一封邮件]</div><div class='add'>+</div><div class='add'>+主要的窍门是有五年和这些烦人的oops消息打交道的经验;-)</div><div class='add'>+</div><div class='add'>+实际上，你有办法使它更简单。我有两个不同的方法：</div><div class='add'>+</div><div class='add'>+	gdb /usr/src/linux/vmlinux</div><div class='add'>+	gdb&gt; disassemble &lt;offending_function&gt;</div><div class='add'>+</div><div class='add'>+那是发现问题的简单办法，至少如果bug报告做的好的情况下（象这个一样-运行ksymoops</div><div class='add'>+得到oops发生的函数及函数内的偏移）。</div><div class='add'>+</div><div class='add'>+哦，如果报告发生的内核以相同的编译器和相似的配置编译它会有帮助的。</div><div class='add'>+</div><div class='add'>+另一件要做的事是反汇编bug报告的“Code”部分：ksymoops也会用正确的工具来做这件事，</div><div class='add'>+但如果没有那些工具你可以写一个傻程序：</div><div class='add'>+</div><div class='add'>+	char str[] = "\xXX\xXX\xXX...";</div><div class='add'>+	main(){}</div><div class='add'>+</div><div class='add'>+并用gcc -g编译它然后执行“disassemble str”（XX部分是由Oops报告的值-你可以仅剪切</div><div class='add'>+粘贴并用“\x”替换空格-我就是这么做的，因为我懒得写程序自动做这一切）。</div><div class='add'>+</div><div class='add'>+另外，你可以用scripts/decodecode这个shell脚本。它的使用方法是：</div><div class='add'>+decodecode &lt; oops.txt</div><div class='add'>+</div><div class='add'>+“Code”之后的十六进制字节可能（在某些架构上）有一些当前指令之前的指令字节以及</div><div class='add'>+当前和之后的指令字节</div><div class='add'>+</div><div class='add'>+Code: f9 0f 8d f9 00 00 00 8d 42 0c e8 dd 26 11 c7 a1 60 ea 2b f9 8b 50 08 a1</div><div class='add'>+64 ea 2b f9 8d 34 82 8b 1e 85 db 74 6d 8b 15 60 ea 2b f9 &lt;8b&gt; 43 04 39 42 54</div><div class='add'>+7e 04 40 89 42 54 8b 43 04 3b 05 00 f6 52 c0</div><div class='add'>+</div><div class='add'>+最后，如果你想知道代码来自哪里，你可以：</div><div class='add'>+</div><div class='add'>+	cd /usr/src/linux</div><div class='add'>+	make fs/buffer.s 	# 或任何产生BUG的文件</div><div class='add'>+</div><div class='add'>+然后你会比gdb反汇编更清楚的知道发生了什么。</div><div class='add'>+</div><div class='add'>+现在，问题是把你所拥有的所有数据结合起来：C源码（关于它应该怎样的一般知识），</div><div class='add'>+汇编代码及其反汇编得到的代码（另外还有从“oops”消息得到的寄存器状态-对了解毁坏的</div><div class='add'>+指针有用，而且当你有了汇编代码你也能拿其它的寄存器和任何它们对应的C表达式做匹配</div><div class='add'>+）。</div><div class='add'>+</div><div class='add'>+实际上，你仅需看看哪里不匹配（这个例子是“Code”反汇编和编译器生成的代码不匹配）。</div><div class='add'>+然后你须要找出为什么不匹配。通常很简单-你看到代码使用了空指针然后你看代码想知道</div><div class='add'>+空指针是怎么出现的，还有检查它是否合法..</div><div class='add'>+</div><div class='add'>+现在，如果明白这是一项耗时的工作而且需要一丁点儿的专心，没错。这就是我为什么大多</div><div class='add'>+只是忽略那些没有符号表信息的崩溃报告的原因：简单的说太难查找了（我有一些</div><div class='add'>+程序用于在内核代码段中搜索特定的模式，而且有时我也已经能找出那些崩溃的地方，但是</div><div class='add'>+仅仅是找出正确的序列也确实需要相当扎实的内核知识）</div><div class='add'>+</div><div class='add'>+_有时_会发生这种情况，我仅看到崩溃中的反汇编代码序列， 然后我马上就明白问题出在</div><div class='add'>+哪里。这时我才意识到自己干这个工作已经太长时间了;-)</div><div class='add'>+</div><div class='add'>+		Linus</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+---------------------------------------------------------------------------</div><div class='add'>+关于Oops跟踪的注解：</div><div class='add'>+</div><div class='add'>+为了帮助Linus和其它内核开发者，klogd纳入了大量的支持来处理保护错误。为了拥有对</div><div class='add'>+地址解析的完整支持至少应该使用1.3-pl3的sysklogd包。</div><div class='add'>+</div><div class='add'>+当保护错误发生时，klogd守护进程自动把内核日志信息中的重要地址翻译成它们相应的符</div><div class='add'>+号。</div><div class='add'>+</div><div class='add'>+klogd执行两种类型的地址解析。首先是静态翻译其次是动态翻译。静态翻译和ksymoops</div><div class='add'>+一样使用System.map文件。为了做静态翻译klogd守护进程必须在初始化时能找到system</div><div class='add'>+map文件。关于klogd怎样搜索map文件请参看klogd手册页。</div><div class='add'>+</div><div class='add'>+动态地址翻译在使用内核可装载模块时很重要。 因为内核模块的内存是从内核动态内存池</div><div class='add'>+里分配的，所以不管是模块开始位置还是模块中函数和符号的位置都不是固定的。</div><div class='add'>+</div><div class='add'>+内核支持允许程序决定装载哪些模块和它们在内存中位置的系统调用。使用这些系统调用</div><div class='add'>+klogd守护进程生成一张符号表用于调试发生在可装载模块中的保护错误。</div><div class='add'>+</div><div class='add'>+至少klogd会提供产生保护错误的模块名。还可有额外的符号信息供可装载模块开发者选择</div><div class='add'>+以从模块中输出符号信息。</div><div class='add'>+</div><div class='add'>+因为内核模块环境可能是动态的，所以必须有一种机制当模块环境发生改变时来通知klogd</div><div class='add'>+守护进程。 有一些可用的命令行选项允许klogd向当前执行中的守护进程发送信号，告知符</div><div class='add'>+号信息应该被刷新了。 更多信息请参看klogd手册页。</div><div class='add'>+</div><div class='add'>+sysklogd发布时包含一个补丁修改了modules-2.0.0包，无论何时一个模块装载或者卸载都</div><div class='add'>+会自动向klogd发送信号。打上这个补丁提供了必要的对调试发生于内核可装载模块的保护</div><div class='add'>+错误的无缝支持。</div><div class='add'>+</div><div class='add'>+以下是被klogd处理过的发生在可装载模块中的一个保护错误例子：</div><div class='add'>+---------------------------------------------------------------------------</div><div class='add'>+Aug 29 09:51:01 blizard kernel: Unable to handle kernel paging request at virtual address f15e97cc</div><div class='add'>+Aug 29 09:51:01 blizard kernel: current-&gt;tss.cr3 = 0062d000, %cr3 = 0062d000</div><div class='add'>+Aug 29 09:51:01 blizard kernel: *pde = 00000000</div><div class='add'>+Aug 29 09:51:01 blizard kernel: Oops: 0002</div><div class='add'>+Aug 29 09:51:01 blizard kernel: CPU:    0</div><div class='add'>+Aug 29 09:51:01 blizard kernel: EIP:    0010:[oops:_oops+16/3868]</div><div class='add'>+Aug 29 09:51:01 blizard kernel: EFLAGS: 00010212</div><div class='add'>+Aug 29 09:51:01 blizard kernel: eax: 315e97cc   ebx: 003a6f80   ecx: 001be77b   edx: 00237c0c</div><div class='add'>+Aug 29 09:51:01 blizard kernel: esi: 00000000   edi: bffffdb3   ebp: 00589f90   esp: 00589f8c</div><div class='add'>+Aug 29 09:51:01 blizard kernel: ds: 0018   es: 0018   fs: 002b   gs: 002b   ss: 0018</div><div class='add'>+Aug 29 09:51:01 blizard kernel: Process oops_test (pid: 3374, process nr: 21, stackpage=00589000)</div><div class='add'>+Aug 29 09:51:01 blizard kernel: Stack: 315e97cc 00589f98 0100b0b4 bffffed4 0012e38e 00240c64 003a6f80 00000001</div><div class='add'>+Aug 29 09:51:01 blizard kernel:        00000000 00237810 bfffff00 0010a7fa 00000003 00000001 00000000 bfffff00</div><div class='add'>+Aug 29 09:51:01 blizard kernel:        bffffdb3 bffffed4 ffffffda 0000002b 0007002b 0000002b 0000002b 00000036</div><div class='add'>+Aug 29 09:51:01 blizard kernel: Call Trace: [oops:_oops_ioctl+48/80] [_sys_ioctl+254/272] [_system_call+82/128]</div><div class='add'>+Aug 29 09:51:01 blizard kernel: Code: c7 00 05 00 00 00 eb 08 90 90 90 90 90 90 90 90 89 ec 5d c3</div><div class='add'>+---------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Dr. G.W. Wettstein           Oncology Research Div. Computing Facility</div><div class='add'>+Roger Maris Cancer Center    INTERNET: greg@wind.rmcc.com</div><div class='add'>+820 4th St. N.</div><div class='add'>+Fargo, ND  58122</div><div class='add'>+Phone: 701-234-7556</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+---------------------------------------------------------------------------</div><div class='add'>+受污染的内核</div><div class='add'>+</div><div class='add'>+一些oops报告在程序记数器之后包含字符串'Tainted: '。这表明内核已经被一些东西给污</div><div class='add'>+染了。 该字符串之后紧跟着一系列的位置敏感的字符，每个代表一个特定的污染值。</div><div class='add'>+</div><div class='add'>+  1：'G'如果所有装载的模块都有GPL或相容的许可证，'P'如果装载了任何的专有模块。</div><div class='add'>+没有模块MODULE_LICENSE或者带有insmod认为是与GPL不相容的的MODULE_LICENSE的模块被</div><div class='add'>+认定是专有的。</div><div class='add'>+</div><div class='add'>+  2：'F'如果有任何通过“insmod -f”被强制装载的模块，' '如果所有模块都被正常装载。</div><div class='add'>+</div><div class='add'>+  3：'S'如果oops发生在SMP内核中，运行于没有证明安全运行多处理器的硬件。 当前这种</div><div class='add'>+情况仅限于几种不支持SMP的速龙处理器。</div><div class='add'>+</div><div class='add'>+  4：'R'如果模块通过“insmod -f”被强制装载，' '如果所有模块都被正常装载。</div><div class='add'>+</div><div class='add'>+  5：'M'如果任何处理器报告了机器检查异常，' '如果没有发生机器检查异常。</div><div class='add'>+</div><div class='add'>+  6：'B'如果页释放函数发现了一个错误的页引用或者一些非预期的页标志。</div><div class='add'>+</div><div class='add'>+  7：'U'如果用户或者用户应用程序特别请求设置污染标志，否则' '。</div><div class='add'>+</div><div class='add'>+  8：'D'如果内核刚刚死掉，比如有OOPS或者BUG。</div><div class='add'>+</div><div class='add'>+使用'Tainted: '字符串的主要原因是要告诉内核调试者，这是否是一个干净的内核亦或发</div><div class='add'>+生了任何的不正常的事。污染是永久的：即使出错的模块已经被卸载了，污染值仍然存在，</div><div class='add'>+以表明内核不再值得信任。</div><div class='head'>diff --git a/Documentation/zh_CN/sparse.txt b/Documentation/translations/zh_CN/sparse.txt<br/>index cc144e581515..e41dc940e162 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/sparse.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/sparse.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/sparse.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/sparse.txt</a></div><div class='hunk'>@@ -92,9 +92,4 @@ DaveJ 把每小时自动生成的 git 源码树 tar 包放在以下地址：</div><div class='ctx'> 如果你已经编译了内核，用后一种方式可以很快地检查整个源码树。</div><div class='ctx'> </div><div class='ctx'> make 的可选变量 CHECKFLAGS 可以用来向 sparse 工具传递参数。编译系统会自</div><div class='del'>-动向 sparse 工具传递 -Wbitwise 参数。你可以定义 __CHECK_ENDIAN__ 来进行</div><div class='del'>-大小尾检查。</div><div class='del'>-</div><div class='del'>-	make C=2 CHECKFLAGS="-D__CHECK_ENDIAN__"</div><div class='del'>-</div><div class='del'>-这些检查默认都是被关闭的，因为他们通常会产生大量的警告。</div><div class='add'>+动向 sparse 工具传递 -Wbitwise 参数。</div><div class='head'>diff --git a/Documentation/translations/zh_CN/stable_api_nonsense.txt b/Documentation/translations/zh_CN/stable_api_nonsense.txt<br/>new file mode 100644<br/>index 000000000000..a2b27fab382c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/stable_api_nonsense.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/stable_api_nonsense.txt</a></div><div class='hunk'>@@ -0,0 +1,157 @@</div><div class='add'>+Chinese translated version of Documentation/process/stable-api-nonsense.rst</div><div class='add'>+</div><div class='add'>+If you have any comment or update to the content, please contact the</div><div class='add'>+original document maintainer directly.  However, if you have problem</div><div class='add'>+communicating in English you can also ask the Chinese maintainer for help.</div><div class='add'>+Contact the Chinese maintainer, if this translation is outdated or there</div><div class='add'>+is problem with translation.</div><div class='add'>+</div><div class='add'>+Maintainer: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='add'>+Chinese maintainer: TripleX Chung &lt;zhongyu@18mail.cn&gt;</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+Documentation/process/stable-api-nonsense.rst 的中文翻译</div><div class='add'>+</div><div class='add'>+如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='add'>+交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='add'>+译存在问题，请联系中文版维护者。</div><div class='add'>+</div><div class='add'>+英文版维护者： Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='add'>+中文版维护者： 钟宇  TripleX Chung &lt;zhongyu@18mail.cn&gt;</div><div class='add'>+中文版翻译者： 钟宇  TripleX Chung &lt;zhongyu@18mail.cn&gt;</div><div class='add'>+中文版校译者： 李阳  Li Yang &lt;leoli@freescale.com&gt;</div><div class='add'>+以下为正文</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+写作本文档的目的，是为了解释为什么Linux既没有二进制内核接口，也没有稳定</div><div class='add'>+的内核接口。这里所说的内核接口，是指内核里的接口，而不是内核和用户空间</div><div class='add'>+的接口。内核到用户空间的接口，是提供给应用程序使用的系统调用，系统调用</div><div class='add'>+在历史上几乎没有过变化，将来也不会有变化。我有一些老应用程序是在0.9版本</div><div class='add'>+或者更早版本的内核上编译的，在使用2.6版本内核的Linux发布上依然用得很好</div><div class='add'>+。用户和应用程序作者可以将这个接口看成是稳定的。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+执行纲要</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+你也许以为自己想要稳定的内核接口，但是你不清楚你要的实际上不是它。你需</div><div class='add'>+要的其实是稳定的驱动程序，而你只有将驱动程序放到公版内核的源代码树里，</div><div class='add'>+才有可能达到这个目的。而且这样做还有很多其它好处，正是因为这些好处使得</div><div class='add'>+Linux能成为强壮，稳定，成熟的操作系统，这也是你最开始选择Linux的原因。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+入门</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+只有那些写驱动程序的“怪人”才会担心内核接口的改变，对广大用户来说，既</div><div class='add'>+看不到内核接口，也不需要去关心它。</div><div class='add'>+</div><div class='add'>+首先，我不打算讨论关于任何非GPL许可的内核驱动的法律问题，这些非GPL许可</div><div class='add'>+的驱动程序包括不公开源代码，隐藏源代码，二进制或者是用源代码包装，或者</div><div class='add'>+是其它任何形式的不能以GPL许可公开源代码的驱动程序。如果有法律问题，请咨</div><div class='add'>+询律师，我只是一个程序员，所以我只打算探讨技术问题（不是小看法律问题，</div><div class='add'>+法律问题很实际，并且需要一直关注）。</div><div class='add'>+</div><div class='add'>+既然只谈技术问题，我们就有了下面两个主题：二进制内核接口和稳定的内核源</div><div class='add'>+代码接口。这两个问题是互相关联的，让我们先解决掉二进制接口的问题。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+二进制内核接口</div><div class='add'>+--------------</div><div class='add'>+假如我们有一个稳定的内核源代码接口，那么自然而然的，我们就拥有了稳定的</div><div class='add'>+二进制接口，是这样的吗？错。让我们看看关于Linux内核的几点事实：</div><div class='add'>+    - 取决于所用的C编译器的版本，不同的内核数据结构里的结构体的对齐方</div><div class='add'>+式会有差别，代码中不同函数的表现形式也不一样（函数是不是被inline编译取</div><div class='add'>+决于编译器行为）。不同的函数的表现形式并不重要，但是数据结构内部的对齐</div><div class='add'>+方式很关键。</div><div class='add'>+    - 取决于内核的配置选项，不同的选项会让内核的很多东西发生改变：</div><div class='add'>+      - 同一个结构体可能包含不同的成员变量</div><div class='add'>+      - 有的函数可能根本不会被实现（比如编译的时候没有选择SMP支持</div><div class='add'>+，一些锁函数就会被定义成空函数）。</div><div class='add'>+      - 内核使用的内存会以不同的方式对齐，这取决于不同的内核配置选</div><div class='add'>+项。</div><div class='add'>+    - Linux可以在很多的不同体系结构的处理器上运行。在某个体系结构上编</div><div class='add'>+译好的二进制驱动程序，不可能在另外一个体系结构上正确的运行。</div><div class='add'>+</div><div class='add'>+对于一个特定的内核，满足这些条件并不难，使用同一个C编译器和同样的内核配</div><div class='add'>+置选项来编译驱动程序模块就可以了。这对于给一个特定Linux发布的特定版本提</div><div class='add'>+供驱动程序，是完全可以满足需求的。但是如果你要给不同发布的不同版本都发</div><div class='add'>+布一个驱动程序，就需要在每个发布上用不同的内核设置参数都编译一次内核，</div><div class='add'>+这简直跟噩梦一样。而且还要注意到，每个Linux发布还提供不同的Linux内核，</div><div class='add'>+这些内核都针对不同的硬件类型进行了优化（有很多种不同的处理器，还有不同</div><div class='add'>+的内核设置选项）。所以每发布一次驱动程序，都需要提供很多不同版本的内核</div><div class='add'>+模块。</div><div class='add'>+</div><div class='add'>+相信我，如果你真的要采取这种发布方式，一定会慢慢疯掉，我很久以前就有过</div><div class='add'>+深刻的教训...</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+稳定的内核源代码接口</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+如果有人不将他的内核驱动程序，放入公版内核的源代码树，而又想让驱动程序</div><div class='add'>+一直保持在最新的内核中可用，那么这个话题将会变得没完没了。</div><div class='add'>+ 内核开发是持续而且快节奏的，从来都不会慢下来。内核开发人员在当前接口中</div><div class='add'>+找到bug，或者找到更好的实现方式。一旦发现这些，他们就很快会去修改当前的</div><div class='add'>+接口。修改接口意味着，函数名可能会改变，结构体可能被扩充或者删减，函数</div><div class='add'>+的参数也可能发生改变。一旦接口被修改，内核中使用这些接口的地方需要同时</div><div class='add'>+修正，这样才能保证所有的东西继续工作。</div><div class='add'>+</div><div class='add'>+举一个例子，内核的USB驱动程序接口在USB子系统的整个生命周期中，至少经历</div><div class='add'>+了三次重写。这些重写解决以下问题：</div><div class='add'>+    - 把数据流从同步模式改成非同步模式，这个改动减少了一些驱动程序的</div><div class='add'>+复杂度，提高了所有USB驱动程序的吞吐率，这样几乎所有的USB设备都能以最大</div><div class='add'>+速率工作了。</div><div class='add'>+    - 修改了USB核心代码中为USB驱动分配数据包内存的方式，所有的驱动都</div><div class='add'>+需要提供更多的参数给USB核心，以修正了很多已经被记录在案的死锁。</div><div class='add'>+</div><div class='add'>+这和一些封闭源代码的操作系统形成鲜明的对比，在那些操作系统上，不得不额</div><div class='add'>+外的维护旧的USB接口。这导致了一个可能性，新的开发者依然会不小心使用旧的</div><div class='add'>+接口，以不恰当的方式编写代码，进而影响到操作系统的稳定性。</div><div class='add'>+ 在上面的例子中，所有的开发者都同意这些重要的改动，在这样的情况下修改代</div><div class='add'>+价很低。如果Linux保持一个稳定的内核源代码接口，那么就得创建一个新的接口</div><div class='add'>+；旧的，有问题的接口必须一直维护，给Linux USB开发者带来额外的工作。既然</div><div class='add'>+所有的Linux USB驱动的作者都是利用自己的时间工作，那么要求他们去做毫无意</div><div class='add'>+义的免费额外工作，是不可能的。</div><div class='add'>+ 安全问题对Linux来说十分重要。一个安全问题被发现，就会在短时间内得到修</div><div class='add'>+正。在很多情况下，这将导致Linux内核中的一些接口被重写，以从根本上避免安</div><div class='add'>+全问题。一旦接口被重写，所有使用这些接口的驱动程序，必须同时得到修正，</div><div class='add'>+以确定安全问题已经得到修复并且不可能在未来还有同样的安全问题。如果内核</div><div class='add'>+内部接口不允许改变，那么就不可能修复这样的安全问题，也不可能确认这样的</div><div class='add'>+安全问题以后不会发生。</div><div class='add'>+开发者一直在清理内核接口。如果一个接口没有人在使用了，它就会被删除。这</div><div class='add'>+样可以确保内核尽可能的小，而且所有潜在的接口都会得到尽可能完整的测试</div><div class='add'>+（没有人使用的接口是不可能得到良好的测试的）。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+要做什么</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+如果你写了一个Linux内核驱动，但是它还不在Linux源代码树里，作为一个开发</div><div class='add'>+者，你应该怎么做？为每个发布的每个版本提供一个二进制驱动，那简直是一个</div><div class='add'>+噩梦，要跟上永远处于变化之中的内核接口，也是一件辛苦活。</div><div class='add'>+很简单，让你的驱动进入内核源代码树（要记得我们在谈论的是以GPL许可发行</div><div class='add'>+的驱动，如果你的代码不符合GPL，那么祝你好运，你只能自己解决这个问题了，</div><div class='add'>+你这个吸血鬼&lt;把Andrew和Linus对吸血鬼的定义链接到这里&gt;）。当你的代码加入</div><div class='add'>+公版内核源代码树之后，如果一个内核接口改变，你的驱动会直接被修改接口的</div><div class='add'>+那个人修改。保证你的驱动永远都可以编译通过，并且一直工作，你几乎不需要</div><div class='add'>+做什么事情。</div><div class='add'>+</div><div class='add'>+把驱动放到内核源代码树里会有很多的好处：</div><div class='add'>+    - 驱动的质量会提升，而维护成本（对原始作者来说）会下降。</div><div class='add'>+    - 其他人会给驱动添加新特性。</div><div class='add'>+    - 其他人会找到驱动中的bug并修复。</div><div class='add'>+    - 其他人会在驱动中找到性能优化的机会。</div><div class='add'>+    - 当外部的接口的改变需要修改驱动程序的时候，其他人会修改驱动程序</div><div class='add'>+。</div><div class='add'>+    - 不需要联系任何发行商，这个驱动会自动的随着所有的Linux发布一起发</div><div class='add'>+布。</div><div class='add'>+</div><div class='add'>+和别的操作系统相比，Linux为更多不同的设备提供现成的驱动，而且能在更多不</div><div class='add'>+同体系结构的处理器上支持这些设备。这个经过考验的开发模式，必然是错不了</div><div class='add'>+的 :)</div><div class='add'>+</div><div class='add'>+-------------</div><div class='add'>+感谢 Randy Dunlap, Andrew Morton, David Brownell, Hanna Linder,</div><div class='add'>+Robert Love, and Nishanth Aravamudan 对于本文档早期版本的评审和建议。</div><div class='add'>+</div><div class='add'>+英文版维护者： Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/Documentation/translations/zh_CN/stable_kernel_rules.txt b/Documentation/translations/zh_CN/stable_kernel_rules.txt<br/>new file mode 100644<br/>index 000000000000..db4ba5a0c39a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/stable_kernel_rules.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/stable_kernel_rules.txt</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+Chinese translated version of Documentation/process/stable-kernel-rules.rst</div><div class='add'>+</div><div class='add'>+If you have any comment or update to the content, please contact the</div><div class='add'>+original document maintainer directly.  However, if you have a problem</div><div class='add'>+communicating in English you can also ask the Chinese maintainer for</div><div class='add'>+help.  Contact the Chinese maintainer if this translation is outdated</div><div class='add'>+or if there is a problem with the translation.</div><div class='add'>+</div><div class='add'>+Chinese maintainer: TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+Documentation/process/stable-kernel-rules.rst 的中文翻译</div><div class='add'>+</div><div class='add'>+如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='add'>+交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='add'>+译存在问题，请联系中文版维护者。</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+中文版维护者： 钟宇  TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='add'>+中文版翻译者： 钟宇  TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='add'>+中文版校译者： 李阳  Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='add'>+               Kangkai Yin &lt;e12051@motorola.com&gt;</div><div class='add'>+</div><div class='add'>+以下为正文</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+关于Linux 2.6稳定版发布，所有你想知道的事情。</div><div class='add'>+</div><div class='add'>+关于哪些类型的补丁可以被接收进入稳定版代码树，哪些不可以的规则：</div><div class='add'>+</div><div class='add'>+  - 必须是显而易见的正确，并且经过测试的。</div><div class='add'>+  - 连同上下文，不能大于100行。</div><div class='add'>+  - 必须只修正一件事情。</div><div class='add'>+  - 必须修正了一个给大家带来麻烦的真正的bug（不是“这也许是一个问题...”</div><div class='add'>+    那样的东西）。</div><div class='add'>+  - 必须修正带来如下后果的问题：编译错误（对被标记为CONFIG_BROKEN的例外），</div><div class='add'>+    内核崩溃，挂起，数据损坏，真正的安全问题，或者一些类似“哦，这不</div><div class='add'>+    好”的问题。简短的说，就是一些致命的问题。</div><div class='add'>+  - 没有“理论上的竞争条件”，除非能给出竞争条件如何被利用的解释。</div><div class='add'>+  - 不能存在任何的“琐碎的”修正（拼写修正，去掉多余空格之类的）。</div><div class='add'>+  - 必须被相关子系统的维护者接受。</div><div class='add'>+  - 必须遵循Documentation/process/submitting-patches.rst里的规则。</div><div class='add'>+</div><div class='add'>+向稳定版代码树提交补丁的过程：</div><div class='add'>+</div><div class='add'>+  - 在确认了补丁符合以上的规则后，将补丁发送到stable@vger.kernel.org。</div><div class='add'>+  - 如果补丁被接受到队列里，发送者会收到一个ACK回复，如果没有被接受，收</div><div class='add'>+    到的是NAK回复。回复需要几天的时间，这取决于开发者的时间安排。</div><div class='add'>+  - 被接受的补丁会被加到稳定版本队列里，等待其他开发者的审查。</div><div class='add'>+  - 安全方面的补丁不要发到这个列表，应该发送到security@kernel.org。</div><div class='add'>+</div><div class='add'>+审查周期：</div><div class='add'>+</div><div class='add'>+  - 当稳定版的维护者决定开始一个审查周期，补丁将被发送到审查委员会，以</div><div class='add'>+    及被补丁影响的领域的维护者（除非提交者就是该领域的维护者）并且抄送</div><div class='add'>+    到linux-kernel邮件列表。</div><div class='add'>+  - 审查委员会有48小时的时间，用来决定给该补丁回复ACK还是NAK。</div><div class='add'>+  - 如果委员会中有成员拒绝这个补丁，或者linux-kernel列表上有人反对这个</div><div class='add'>+    补丁，并提出维护者和审查委员会之前没有意识到的问题，补丁会从队列中</div><div class='add'>+    丢弃。</div><div class='add'>+  - 在审查周期结束的时候，那些得到ACK回应的补丁将会被加入到最新的稳定版</div><div class='add'>+    发布中，一个新的稳定版发布就此产生。</div><div class='add'>+  - 安全性补丁将从内核安全小组那里直接接收到稳定版代码树中，而不是通过</div><div class='add'>+    通常的审查周期。请联系内核安全小组以获得关于这个过程的更多细节。</div><div class='add'>+</div><div class='add'>+审查委员会：</div><div class='add'>+  - 由一些自愿承担这项任务的内核开发者，和几个非志愿的组成。</div><div class='head'>diff --git a/Documentation/zh_CN/video4linux/omap3isp.txt b/Documentation/translations/zh_CN/video4linux/omap3isp.txt<br/>index 67ffbf352ae0..67ffbf352ae0 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/video4linux/omap3isp.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/video4linux/omap3isp.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/video4linux/omap3isp.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/video4linux/omap3isp.txt</a></div><div class='head'>diff --git a/Documentation/zh_CN/video4linux/v4l2-framework.txt b/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt<br/>index 698660b7f21f..698660b7f21f 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/video4linux/v4l2-framework.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/video4linux/v4l2-framework.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/video4linux/v4l2-framework.txt</a></div><div class='head'>diff --git a/Documentation/translations/zh_CN/volatile-considered-harmful.txt b/Documentation/translations/zh_CN/volatile-considered-harmful.txt<br/>new file mode 100644<br/>index 000000000000..475125967197<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/translations/zh_CN/volatile-considered-harmful.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/translations/zh_CN/volatile-considered-harmful.txt</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+Chinese translated version of Documentation/process/volatile-considered-harmful.rst</div><div class='add'>+</div><div class='add'>+If you have any comment or update to the content, please contact the</div><div class='add'>+original document maintainer directly.  However, if you have a problem</div><div class='add'>+communicating in English you can also ask the Chinese maintainer for</div><div class='add'>+help.  Contact the Chinese maintainer if this translation is outdated</div><div class='add'>+or if there is a problem with the translation.</div><div class='add'>+</div><div class='add'>+Maintainer: Jonathan Corbet &lt;corbet@lwn.net&gt;</div><div class='add'>+Chinese maintainer: Bryan Wu &lt;bryan.wu@analog.com&gt;</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+Documentation/process/volatile-considered-harmful.rst 的中文翻译</div><div class='add'>+</div><div class='add'>+如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='add'>+交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='add'>+译存在问题，请联系中文版维护者。</div><div class='add'>+</div><div class='add'>+英文版维护者： Jonathan Corbet &lt;corbet@lwn.net&gt;</div><div class='add'>+中文版维护者： 伍鹏  Bryan Wu &lt;bryan.wu@analog.com&gt;</div><div class='add'>+中文版翻译者： 伍鹏  Bryan Wu &lt;bryan.wu@analog.com&gt;</div><div class='add'>+中文版校译者： 张汉辉  Eugene Teo &lt;eugeneteo@kernel.sg&gt;</div><div class='add'>+               杨瑞  Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='add'>+以下为正文</div><div class='add'>+---------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+为什么不应该使用“volatile”类型</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+C程序员通常认为volatile表示某个变量可以在当前执行的线程之外被改变；因此，在内核</div><div class='add'>+中用到共享数据结构时，常常会有C程序员喜欢使用volatile这类变量。换句话说，他们经</div><div class='add'>+常会把volatile类型看成某种简易的原子变量，当然它们不是。在内核中使用volatile几</div><div class='add'>+乎总是错误的；本文档将解释为什么这样。</div><div class='add'>+</div><div class='add'>+理解volatile的关键是知道它的目的是用来消除优化，实际上很少有人真正需要这样的应</div><div class='add'>+用。在内核中，程序员必须防止意外的并发访问破坏共享的数据结构，这其实是一个完全</div><div class='add'>+不同的任务。用来防止意外并发访问的保护措施，可以更加高效的避免大多数优化相关的</div><div class='add'>+问题。</div><div class='add'>+</div><div class='add'>+像volatile一样，内核提供了很多原语来保证并发访问时的数据安全（自旋锁, 互斥量,内</div><div class='add'>+存屏障等等），同样可以防止意外的优化。如果可以正确使用这些内核原语，那么就没有</div><div class='add'>+必要再使用volatile。如果仍然必须使用volatile，那么几乎可以肯定在代码的某处有一</div><div class='add'>+个bug。在正确设计的内核代码中，volatile能带来的仅仅是使事情变慢。</div><div class='add'>+</div><div class='add'>+思考一下这段典型的内核代码：</div><div class='add'>+</div><div class='add'>+    spin_lock(&amp;the_lock);</div><div class='add'>+    do_something_on(&amp;shared_data);</div><div class='add'>+    do_something_else_with(&amp;shared_data);</div><div class='add'>+    spin_unlock(&amp;the_lock);</div><div class='add'>+</div><div class='add'>+如果所有的代码都遵循加锁规则，当持有the_lock的时候，不可能意外的改变shared_data的</div><div class='add'>+值。任何可能访问该数据的其他代码都会在这个锁上等待。自旋锁原语跟内存屏障一样—— 它</div><div class='add'>+们显式的用来书写成这样 —— 意味着数据访问不会跨越它们而被优化。所以本来编译器认为</div><div class='add'>+它知道在shared_data里面将有什么，但是因为spin_lock()调用跟内存屏障一样，会强制编</div><div class='add'>+译器忘记它所知道的一切。那么在访问这些数据时不会有优化的问题。</div><div class='add'>+</div><div class='add'>+如果shared_data被声名为volatile，锁操作将仍然是必须的。就算我们知道没有其他人正在</div><div class='add'>+使用它，编译器也将被阻止优化对临界区内shared_data的访问。在锁有效的同时，</div><div class='add'>+shared_data不是volatile的。在处理共享数据的时候，适当的锁操作可以不再需要</div><div class='add'>+volatile —— 并且是有潜在危害的。</div><div class='add'>+</div><div class='add'>+volatile的存储类型最初是为那些内存映射的I/O寄存器而定义。在内核里，寄存器访问也应</div><div class='add'>+该被锁保护，但是人们也不希望编译器“优化”临界区内的寄存器访问。内核里I/O的内存访问</div><div class='add'>+是通过访问函数完成的；不赞成通过指针对I/O内存的直接访问，并且不是在所有体系架构上</div><div class='add'>+都能工作。那些访问函数正是为了防止意外优化而写的，因此，再说一次，volatile类型不</div><div class='add'>+是必需的。</div><div class='add'>+</div><div class='add'>+另一种引起用户可能使用volatile的情况是当处理器正忙着等待一个变量的值。正确执行一</div><div class='add'>+个忙等待的方法是：</div><div class='add'>+</div><div class='add'>+    while (my_variable != what_i_want)</div><div class='add'>+        cpu_relax();</div><div class='add'>+</div><div class='add'>+cpu_relax()调用会降低CPU的能量消耗或者让位于超线程双处理器；它也作为内存屏障一样出</div><div class='add'>+现，所以，再一次，volatile不是必需的。当然，忙等待一开始就是一种反常规的做法。</div><div class='add'>+</div><div class='add'>+在内核中，一些稀少的情况下volatile仍然是有意义的：</div><div class='add'>+</div><div class='add'>+  - 在一些体系架构的系统上，允许直接的I/0内存访问，那么前面提到的访问函数可以使用</div><div class='add'>+    volatile。基本上，每一个访问函数调用它自己都是一个小的临界区域并且保证了按照</div><div class='add'>+    程序员期望的那样发生访问操作。</div><div class='add'>+</div><div class='add'>+  - 某些会改变内存的内联汇编代码虽然没有什么其他明显的附作用，但是有被GCC删除的可</div><div class='add'>+    能性。在汇编声明中加上volatile关键字可以防止这种删除操作。</div><div class='add'>+</div><div class='add'>+  - Jiffies变量是一种特殊情况，虽然每次引用它的时候都可以有不同的值，但读jiffies</div><div class='add'>+    变量时不需要任何特殊的加锁保护。所以jiffies变量可以使用volatile，但是不赞成</div><div class='add'>+    其他跟jiffies相同类型变量使用volatile。Jiffies被认为是一种“愚蠢的遗留物"</div><div class='add'>+    （Linus的话）因为解决这个问题比保持现状要麻烦的多。</div><div class='add'>+</div><div class='add'>+  - 由于某些I/0设备可能会修改连续一致的内存,所以有时,指向连续一致内存的数据结构</div><div class='add'>+    的指针需要正确的使用volatile。网络适配器使用的环状缓存区正是这类情形的一个例</div><div class='add'>+    子，其中适配器用改变指针来表示哪些描述符已经处理过了。</div><div class='add'>+</div><div class='add'>+对于大多代码，上述几种可以使用volatile的情况都不适用。所以，使用volatile是一种</div><div class='add'>+bug并且需要对这样的代码额外仔细检查。那些试图使用volatile的开发人员需要退一步想想</div><div class='add'>+他们真正想实现的是什么。</div><div class='add'>+</div><div class='add'>+非常欢迎删除volatile变量的补丁 － 只要证明这些补丁完整的考虑了并发问题。</div><div class='add'>+</div><div class='add'>+注释</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+[1] http://lwn.net/Articles/233481/</div><div class='add'>+[2] http://lwn.net/Articles/233482/</div><div class='add'>+</div><div class='add'>+致谢</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+最初由Randy Dunlap推动并作初步研究</div><div class='add'>+由Jonathan Corbet撰写</div><div class='add'>+参考Satyam Sharma，Johannes Stezenbach，Jesper Juhl，Heikki Orsila，</div><div class='add'>+H. Peter Anvin，Philipp Hahn和Stefan Richter的意见改善了本档。</div><div class='head'>diff --git a/Documentation/unaligned-memory-access.txt b/Documentation/unaligned-memory-access.txt<br/>index a445da098bc6..3f76c0c37920 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/unaligned-memory-access.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/unaligned-memory-access.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/unaligned-memory-access.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/unaligned-memory-access.txt</a></div><div class='hunk'>@@ -151,7 +151,7 @@ bool ether_addr_equal(const u8 *addr1, const u8 *addr2)</div><div class='ctx'> #else</div><div class='ctx'> 	const u16 *a = (const u16 *)addr1;</div><div class='ctx'> 	const u16 *b = (const u16 *)addr2;</div><div class='del'>-	return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0;</div><div class='add'>+	return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/unicode.txt b/Documentation/unicode.txt<br/>deleted file mode 100644<br/>index 4a33f81cadb1..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/unicode.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/unicode.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,175 +0,0 @@</div><div class='del'>-		 Last update: 2005-01-17, version 1.4</div><div class='del'>-</div><div class='del'>-This file is maintained by H. Peter Anvin &lt;unicode@lanana.org&gt; as part</div><div class='del'>-of the Linux Assigned Names And Numbers Authority (LANANA) project.</div><div class='del'>-The current version can be found at:</div><div class='del'>-</div><div class='del'>-	    http://www.lanana.org/docs/unicode/unicode.txt</div><div class='del'>-</div><div class='del'>-		       ------------------------</div><div class='del'>-</div><div class='del'>-The Linux kernel code has been rewritten to use Unicode to map</div><div class='del'>-characters to fonts.  By downloading a single Unicode-to-font table,</div><div class='del'>-both the eight-bit character sets and UTF-8 mode are changed to use</div><div class='del'>-the font as indicated.</div><div class='del'>-</div><div class='del'>-This changes the semantics of the eight-bit character tables subtly.</div><div class='del'>-The four character tables are now:</div><div class='del'>-</div><div class='del'>-Map symbol	Map name			Escape code (G0)</div><div class='del'>-</div><div class='del'>-LAT1_MAP	Latin-1 (ISO 8859-1)		ESC ( B</div><div class='del'>-GRAF_MAP	DEC VT100 pseudographics	ESC ( 0</div><div class='del'>-IBMPC_MAP	IBM code page 437		ESC ( U</div><div class='del'>-USER_MAP	User defined			ESC ( K</div><div class='del'>-</div><div class='del'>-In particular, ESC ( U is no longer "straight to font", since the font</div><div class='del'>-might be completely different than the IBM character set.  This</div><div class='del'>-permits for example the use of block graphics even with a Latin-1 font</div><div class='del'>-loaded.</div><div class='del'>-</div><div class='del'>-Note that although these codes are similar to ISO 2022, neither the</div><div class='del'>-codes nor their uses match ISO 2022; Linux has two 8-bit codes (G0 and</div><div class='del'>-G1), whereas ISO 2022 has four 7-bit codes (G0-G3).</div><div class='del'>-</div><div class='del'>-In accordance with the Unicode standard/ISO 10646 the range U+F000 to</div><div class='del'>-U+F8FF has been reserved for OS-wide allocation (the Unicode Standard</div><div class='del'>-refers to this as a "Corporate Zone", since this is inaccurate for</div><div class='del'>-Linux we call it the "Linux Zone").  U+F000 was picked as the starting</div><div class='del'>-point since it lets the direct-mapping area start on a large power of</div><div class='del'>-two (in case 1024- or 2048-character fonts ever become necessary).</div><div class='del'>-This leaves U+E000 to U+EFFF as End User Zone.</div><div class='del'>-</div><div class='del'>-[v1.2]: The Unicodes range from U+F000 and up to U+F7FF have been</div><div class='del'>-hard-coded to map directly to the loaded font, bypassing the</div><div class='del'>-translation table.  The user-defined map now defaults to U+F000 to</div><div class='del'>-U+F0FF, emulating the previous behaviour.  In practice, this range</div><div class='del'>-might be shorter; for example, vgacon can only handle 256-character</div><div class='del'>-(U+F000..U+F0FF) or 512-character (U+F000..U+F1FF) fonts.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Actual characters assigned in the Linux Zone</div><div class='del'>---------------------------------------------</div><div class='del'>-</div><div class='del'>-In addition, the following characters not present in Unicode 1.1.4</div><div class='del'>-have been defined; these are used by the DEC VT graphics map.  [v1.2]</div><div class='del'>-THIS USE IS OBSOLETE AND SHOULD NO LONGER BE USED; PLEASE SEE BELOW.</div><div class='del'>-</div><div class='del'>-U+F800 DEC VT GRAPHICS HORIZONTAL LINE SCAN 1</div><div class='del'>-U+F801 DEC VT GRAPHICS HORIZONTAL LINE SCAN 3</div><div class='del'>-U+F803 DEC VT GRAPHICS HORIZONTAL LINE SCAN 7</div><div class='del'>-U+F804 DEC VT GRAPHICS HORIZONTAL LINE SCAN 9</div><div class='del'>-</div><div class='del'>-The DEC VT220 uses a 6x10 character matrix, and these characters form</div><div class='del'>-a smooth progression in the DEC VT graphics character set.  I have</div><div class='del'>-omitted the scan 5 line, since it is also used as a block-graphics</div><div class='del'>-character, and hence has been coded as U+2500 FORMS LIGHT HORIZONTAL.</div><div class='del'>-</div><div class='del'>-[v1.3]: These characters have been officially added to Unicode 3.2.0;</div><div class='del'>-they are added at U+23BA, U+23BB, U+23BC, U+23BD.  Linux now uses the</div><div class='del'>-new values.</div><div class='del'>-</div><div class='del'>-[v1.2]: The following characters have been added to represent common</div><div class='del'>-keyboard symbols that are unlikely to ever be added to Unicode proper</div><div class='del'>-since they are horribly vendor-specific.  This, of course, is an</div><div class='del'>-excellent example of horrible design.</div><div class='del'>-</div><div class='del'>-U+F810 KEYBOARD SYMBOL FLYING FLAG</div><div class='del'>-U+F811 KEYBOARD SYMBOL PULLDOWN MENU</div><div class='del'>-U+F812 KEYBOARD SYMBOL OPEN APPLE</div><div class='del'>-U+F813 KEYBOARD SYMBOL SOLID APPLE</div><div class='del'>-</div><div class='del'>-Klingon language support</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-In 1996, Linux was the first operating system in the world to add</div><div class='del'>-support for the artificial language Klingon, created by Marc Okrand</div><div class='del'>-for the "Star Trek" television series.	This encoding was later</div><div class='del'>-adopted by the ConScript Unicode Registry and proposed (but ultimately</div><div class='del'>-rejected) for inclusion in Unicode Plane 1.  Thus, it remains as a</div><div class='del'>-Linux/CSUR private assignment in the Linux Zone.</div><div class='del'>-</div><div class='del'>-This encoding has been endorsed by the Klingon Language Institute.</div><div class='del'>-For more information, contact them at:</div><div class='del'>-</div><div class='del'>-	http://www.kli.org/</div><div class='del'>-</div><div class='del'>-Since the characters in the beginning of the Linux CZ have been more</div><div class='del'>-of the dingbats/symbols/forms type and this is a language, I have</div><div class='del'>-located it at the end, on a 16-cell boundary in keeping with standard</div><div class='del'>-Unicode practice.</div><div class='del'>-</div><div class='del'>-NOTE: This range is now officially managed by the ConScript Unicode</div><div class='del'>-Registry.  The normative reference is at:</div><div class='del'>-</div><div class='del'>-	http://www.evertype.com/standards/csur/klingon.html</div><div class='del'>-</div><div class='del'>-Klingon has an alphabet of 26 characters, a positional numeric writing</div><div class='del'>-system with 10 digits, and is written left-to-right, top-to-bottom.</div><div class='del'>-</div><div class='del'>-Several glyph forms for the Klingon alphabet have been proposed.</div><div class='del'>-However, since the set of symbols appear to be consistent throughout,</div><div class='del'>-with only the actual shapes being different, in keeping with standard</div><div class='del'>-Unicode practice these differences are considered font variants.</div><div class='del'>-</div><div class='del'>-U+F8D0	KLINGON LETTER A</div><div class='del'>-U+F8D1	KLINGON LETTER B</div><div class='del'>-U+F8D2	KLINGON LETTER CH</div><div class='del'>-U+F8D3	KLINGON LETTER D</div><div class='del'>-U+F8D4	KLINGON LETTER E</div><div class='del'>-U+F8D5	KLINGON LETTER GH</div><div class='del'>-U+F8D6	KLINGON LETTER H</div><div class='del'>-U+F8D7	KLINGON LETTER I</div><div class='del'>-U+F8D8	KLINGON LETTER J</div><div class='del'>-U+F8D9	KLINGON LETTER L</div><div class='del'>-U+F8DA	KLINGON LETTER M</div><div class='del'>-U+F8DB	KLINGON LETTER N</div><div class='del'>-U+F8DC	KLINGON LETTER NG</div><div class='del'>-U+F8DD	KLINGON LETTER O</div><div class='del'>-U+F8DE	KLINGON LETTER P</div><div class='del'>-U+F8DF	KLINGON LETTER Q</div><div class='del'>-	- Written &lt;q&gt; in standard Okrand Latin transliteration</div><div class='del'>-U+F8E0	KLINGON LETTER QH</div><div class='del'>-	- Written &lt;Q&gt; in standard Okrand Latin transliteration</div><div class='del'>-U+F8E1	KLINGON LETTER R</div><div class='del'>-U+F8E2	KLINGON LETTER S</div><div class='del'>-U+F8E3	KLINGON LETTER T</div><div class='del'>-U+F8E4	KLINGON LETTER TLH</div><div class='del'>-U+F8E5	KLINGON LETTER U</div><div class='del'>-U+F8E6	KLINGON LETTER V</div><div class='del'>-U+F8E7	KLINGON LETTER W</div><div class='del'>-U+F8E8	KLINGON LETTER Y</div><div class='del'>-U+F8E9	KLINGON LETTER GLOTTAL STOP</div><div class='del'>-</div><div class='del'>-U+F8F0	KLINGON DIGIT ZERO</div><div class='del'>-U+F8F1	KLINGON DIGIT ONE</div><div class='del'>-U+F8F2	KLINGON DIGIT TWO</div><div class='del'>-U+F8F3	KLINGON DIGIT THREE</div><div class='del'>-U+F8F4	KLINGON DIGIT FOUR</div><div class='del'>-U+F8F5	KLINGON DIGIT FIVE</div><div class='del'>-U+F8F6	KLINGON DIGIT SIX</div><div class='del'>-U+F8F7	KLINGON DIGIT SEVEN</div><div class='del'>-U+F8F8	KLINGON DIGIT EIGHT</div><div class='del'>-U+F8F9	KLINGON DIGIT NINE</div><div class='del'>-</div><div class='del'>-U+F8FD	KLINGON COMMA</div><div class='del'>-U+F8FE	KLINGON FULL STOP</div><div class='del'>-U+F8FF	KLINGON SYMBOL FOR EMPIRE</div><div class='del'>-</div><div class='del'>-Other Fictional and Artificial Scripts</div><div class='del'>---------------------------------------</div><div class='del'>-</div><div class='del'>-Since the assignment of the Klingon Linux Unicode block, a registry of</div><div class='del'>-fictional and artificial scripts has been established by John Cowan</div><div class='del'>-&lt;jcowan@reutershealth.com&gt; and Michael Everson &lt;everson@evertype.com&gt;.</div><div class='del'>-The ConScript Unicode Registry is accessible at:</div><div class='del'>-</div><div class='del'>-	  http://www.evertype.com/standards/csur/</div><div class='del'>-</div><div class='del'>-The ranges used fall at the low end of the End User Zone and can hence</div><div class='del'>-not be normatively assigned, but it is recommended that people who</div><div class='del'>-wish to encode fictional scripts use these codes, in the interest of</div><div class='del'>-interoperability.  For Klingon, CSUR has adopted the Linux encoding.</div><div class='del'>-The CSUR people are driving adding Tengwar and Cirth into Unicode</div><div class='del'>-Plane 1; the addition of Klingon to Unicode Plane 1 has been rejected</div><div class='del'>-and so the above encoding remains official.</div><div class='head'>diff --git a/Documentation/usb/gadget-testing.txt b/Documentation/usb/gadget-testing.txt<br/>index 581960574889..fb0cc4df1765 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/usb/gadget-testing.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/usb/gadget-testing.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/usb/gadget-testing.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/usb/gadget-testing.txt</a></div><div class='hunk'>@@ -632,6 +632,8 @@ The uac2 function provides these attributes in its function directory:</div><div class='ctx'> 	p_chmask - playback channel mask</div><div class='ctx'> 	p_srate - playback sampling rate</div><div class='ctx'> 	p_ssize - playback sample size (bytes)</div><div class='add'>+	req_number - the number of pre-allocated request for both capture</div><div class='add'>+		     and playback</div><div class='ctx'> </div><div class='ctx'> The attributes have sane default values.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt<br/>index 0a94ffe17ab6..00e706997130 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/usb/power-management.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/usb/power-management.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/usb/power-management.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/usb/power-management.txt</a></div><div class='hunk'>@@ -543,7 +543,7 @@ relevant attribute files are usb2_hardware_lpm and usb3_hardware_lpm.</div><div class='ctx'> 		When a USB 3.0 lpm-capable device is plugged in to a</div><div class='ctx'> 		xHCI host which supports link PM, it will check if U1</div><div class='ctx'> 		and U2 exit latencies have been set in the BOS</div><div class='del'>-		descriptor; if the check is is passed and the host</div><div class='add'>+		descriptor; if the check is passed and the host</div><div class='ctx'> 		supports USB3 hardware LPM, USB3 hardware LPM will be</div><div class='ctx'> 		enabled for the device and these files will be created.</div><div class='ctx'> 		The files hold a string value (enable or disable)</div><div class='head'>diff --git a/Documentation/vfio-mediated-device.txt b/Documentation/vfio-mediated-device.txt<br/>new file mode 100644<br/>index 000000000000..d226c7a5ba8b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/vfio-mediated-device.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vfio-mediated-device.txt</a></div><div class='hunk'>@@ -0,0 +1,401 @@</div><div class='add'>+/*</div><div class='add'>+ * VFIO Mediated devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.</div><div class='add'>+ *     Author: Neo Jia &lt;cjia@nvidia.com&gt;</div><div class='add'>+ *             Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+Virtual Function I/O (VFIO) Mediated devices[1]</div><div class='add'>+===============================================</div><div class='add'>+</div><div class='add'>+The number of use cases for virtualizing DMA devices that do not have built-in</div><div class='add'>+SR_IOV capability is increasing. Previously, to virtualize such devices,</div><div class='add'>+developers had to create their own management interfaces and APIs, and then</div><div class='add'>+integrate them with user space software. To simplify integration with user space</div><div class='add'>+software, we have identified common requirements and a unified management</div><div class='add'>+interface for such devices.</div><div class='add'>+</div><div class='add'>+The VFIO driver framework provides unified APIs for direct device access. It is</div><div class='add'>+an IOMMU/device-agnostic framework for exposing direct device access to user</div><div class='add'>+space in a secure, IOMMU-protected environment. This framework is used for</div><div class='add'>+multiple devices, such as GPUs, network adapters, and compute accelerators. With</div><div class='add'>+direct device access, virtual machines or user space applications have direct</div><div class='add'>+access to the physical device. This framework is reused for mediated devices.</div><div class='add'>+</div><div class='add'>+The mediated core driver provides a common interface for mediated device</div><div class='add'>+management that can be used by drivers of different devices. This module</div><div class='add'>+provides a generic interface to perform these operations:</div><div class='add'>+</div><div class='add'>+* Create and destroy a mediated device</div><div class='add'>+* Add a mediated device to and remove it from a mediated bus driver</div><div class='add'>+* Add a mediated device to and remove it from an IOMMU group</div><div class='add'>+</div><div class='add'>+The mediated core driver also provides an interface to register a bus driver.</div><div class='add'>+For example, the mediated VFIO mdev driver is designed for mediated devices and</div><div class='add'>+supports VFIO APIs. The mediated bus driver adds a mediated device to and</div><div class='add'>+removes it from a VFIO group.</div><div class='add'>+</div><div class='add'>+The following high-level block diagram shows the main components and interfaces</div><div class='add'>+in the VFIO mediated driver framework. The diagram shows NVIDIA, Intel, and IBM</div><div class='add'>+devices as examples, as these devices are the first devices to use this module.</div><div class='add'>+</div><div class='add'>+     +---------------+</div><div class='add'>+     |               |</div><div class='add'>+     | +-----------+ |  mdev_register_driver() +--------------+</div><div class='add'>+     | |           | +&lt;------------------------+              |</div><div class='add'>+     | |  mdev     | |                         |              |</div><div class='add'>+     | |  bus      | +------------------------&gt;+ vfio_mdev.ko |&lt;-&gt; VFIO user</div><div class='add'>+     | |  driver   | |     probe()/remove()    |              |    APIs</div><div class='add'>+     | |           | |                         +--------------+</div><div class='add'>+     | +-----------+ |</div><div class='add'>+     |               |</div><div class='add'>+     |  MDEV CORE    |</div><div class='add'>+     |   MODULE      |</div><div class='add'>+     |   mdev.ko     |</div><div class='add'>+     | +-----------+ |  mdev_register_device() +--------------+</div><div class='add'>+     | |           | +&lt;------------------------+              |</div><div class='add'>+     | |           | |                         |  nvidia.ko   |&lt;-&gt; physical</div><div class='add'>+     | |           | +------------------------&gt;+              |    device</div><div class='add'>+     | |           | |        callbacks        +--------------+</div><div class='add'>+     | | Physical  | |</div><div class='add'>+     | |  device   | |  mdev_register_device() +--------------+</div><div class='add'>+     | | interface | |&lt;------------------------+              |</div><div class='add'>+     | |           | |                         |  i915.ko     |&lt;-&gt; physical</div><div class='add'>+     | |           | +------------------------&gt;+              |    device</div><div class='add'>+     | |           | |        callbacks        +--------------+</div><div class='add'>+     | |           | |</div><div class='add'>+     | |           | |  mdev_register_device() +--------------+</div><div class='add'>+     | |           | +&lt;------------------------+              |</div><div class='add'>+     | |           | |                         | ccw_device.ko|&lt;-&gt; physical</div><div class='add'>+     | |           | +------------------------&gt;+              |    device</div><div class='add'>+     | |           | |        callbacks        +--------------+</div><div class='add'>+     | +-----------+ |</div><div class='add'>+     +---------------+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Registration Interfaces</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+The mediated core driver provides the following types of registration</div><div class='add'>+interfaces:</div><div class='add'>+</div><div class='add'>+* Registration interface for a mediated bus driver</div><div class='add'>+* Physical device driver interface</div><div class='add'>+</div><div class='add'>+Registration Interface for a Mediated Bus Driver</div><div class='add'>+------------------------------------------------</div><div class='add'>+</div><div class='add'>+The registration interface for a mediated bus driver provides the following</div><div class='add'>+structure to represent a mediated device's driver:</div><div class='add'>+</div><div class='add'>+     /*</div><div class='add'>+      * struct mdev_driver [2] - Mediated device's driver</div><div class='add'>+      * @name: driver name</div><div class='add'>+      * @probe: called when new device created</div><div class='add'>+      * @remove: called when device removed</div><div class='add'>+      * @driver: device driver structure</div><div class='add'>+      */</div><div class='add'>+     struct mdev_driver {</div><div class='add'>+	     const char *name;</div><div class='add'>+	     int  (*probe)  (struct device *dev);</div><div class='add'>+	     void (*remove) (struct device *dev);</div><div class='add'>+	     struct device_driver    driver;</div><div class='add'>+     };</div><div class='add'>+</div><div class='add'>+A mediated bus driver for mdev should use this structure in the function calls</div><div class='add'>+to register and unregister itself with the core driver:</div><div class='add'>+</div><div class='add'>+* Register:</div><div class='add'>+</div><div class='add'>+  extern int  mdev_register_driver(struct mdev_driver *drv,</div><div class='add'>+				   struct module *owner);</div><div class='add'>+</div><div class='add'>+* Unregister:</div><div class='add'>+</div><div class='add'>+  extern void mdev_unregister_driver(struct mdev_driver *drv);</div><div class='add'>+</div><div class='add'>+The mediated bus driver is responsible for adding mediated devices to the VFIO</div><div class='add'>+group when devices are bound to the driver and removing mediated devices from</div><div class='add'>+the VFIO when devices are unbound from the driver.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Physical Device Driver Interface</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+The physical device driver interface provides the mdev_parent_ops[3] structure</div><div class='add'>+to define the APIs to manage work in the mediated core driver that is related</div><div class='add'>+to the physical device.</div><div class='add'>+</div><div class='add'>+The structures in the mdev_parent_ops structure are as follows:</div><div class='add'>+</div><div class='add'>+* dev_attr_groups: attributes of the parent device</div><div class='add'>+* mdev_attr_groups: attributes of the mediated device</div><div class='add'>+* supported_config: attributes to define supported configurations</div><div class='add'>+</div><div class='add'>+The functions in the mdev_parent_ops structure are as follows:</div><div class='add'>+</div><div class='add'>+* create: allocate basic resources in a driver for a mediated device</div><div class='add'>+* remove: free resources in a driver when a mediated device is destroyed</div><div class='add'>+</div><div class='add'>+The callbacks in the mdev_parent_ops structure are as follows:</div><div class='add'>+</div><div class='add'>+* open: open callback of mediated device</div><div class='add'>+* close: close callback of mediated device</div><div class='add'>+* ioctl: ioctl callback of mediated device</div><div class='add'>+* read : read emulation callback</div><div class='add'>+* write: write emulation callback</div><div class='add'>+* mmap: mmap emulation callback</div><div class='add'>+</div><div class='add'>+A driver should use the mdev_parent_ops structure in the function call to</div><div class='add'>+register itself with the mdev core driver:</div><div class='add'>+</div><div class='add'>+extern int  mdev_register_device(struct device *dev,</div><div class='add'>+                                 const struct mdev_parent_ops *ops);</div><div class='add'>+</div><div class='add'>+However, the mdev_parent_ops structure is not required in the function call</div><div class='add'>+that a driver should use to unregister itself with the mdev core driver:</div><div class='add'>+</div><div class='add'>+extern void mdev_unregister_device(struct device *dev);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Mediated Device Management Interface Through sysfs</div><div class='add'>+==================================================</div><div class='add'>+</div><div class='add'>+The management interface through sysfs enables user space software, such as</div><div class='add'>+libvirt, to query and configure mediated devices in a hardware-agnostic fashion.</div><div class='add'>+This management interface provides flexibility to the underlying physical</div><div class='add'>+device's driver to support features such as:</div><div class='add'>+</div><div class='add'>+* Mediated device hot plug</div><div class='add'>+* Multiple mediated devices in a single virtual machine</div><div class='add'>+* Multiple mediated devices from different physical devices</div><div class='add'>+</div><div class='add'>+Links in the mdev_bus Class Directory</div><div class='add'>+-------------------------------------</div><div class='add'>+The /sys/class/mdev_bus/ directory contains links to devices that are registered</div><div class='add'>+with the mdev core driver.</div><div class='add'>+</div><div class='add'>+Directories and files under the sysfs for Each Physical Device</div><div class='add'>+--------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+|- [parent physical device]</div><div class='add'>+|--- Vendor-specific-attributes [optional]</div><div class='add'>+|--- [mdev_supported_types]</div><div class='add'>+|     |--- [&lt;type-id&gt;]</div><div class='add'>+|     |   |--- create</div><div class='add'>+|     |   |--- name</div><div class='add'>+|     |   |--- available_instances</div><div class='add'>+|     |   |--- device_api</div><div class='add'>+|     |   |--- description</div><div class='add'>+|     |   |--- [devices]</div><div class='add'>+|     |--- [&lt;type-id&gt;]</div><div class='add'>+|     |   |--- create</div><div class='add'>+|     |   |--- name</div><div class='add'>+|     |   |--- available_instances</div><div class='add'>+|     |   |--- device_api</div><div class='add'>+|     |   |--- description</div><div class='add'>+|     |   |--- [devices]</div><div class='add'>+|     |--- [&lt;type-id&gt;]</div><div class='add'>+|          |--- create</div><div class='add'>+|          |--- name</div><div class='add'>+|          |--- available_instances</div><div class='add'>+|          |--- device_api</div><div class='add'>+|          |--- description</div><div class='add'>+|          |--- [devices]</div><div class='add'>+</div><div class='add'>+* [mdev_supported_types]</div><div class='add'>+</div><div class='add'>+  The list of currently supported mediated device types and their details.</div><div class='add'>+</div><div class='add'>+  [&lt;type-id&gt;], device_api, and available_instances are mandatory attributes</div><div class='add'>+  that should be provided by vendor driver.</div><div class='add'>+</div><div class='add'>+* [&lt;type-id&gt;]</div><div class='add'>+</div><div class='add'>+  The [&lt;type-id&gt;] name is created by adding the the device driver string as a</div><div class='add'>+  prefix to the string provided by the vendor driver. This format of this name</div><div class='add'>+  is as follows:</div><div class='add'>+</div><div class='add'>+	sprintf(buf, "%s-%s", dev_driver_string(parent-&gt;dev), group-&gt;name);</div><div class='add'>+</div><div class='add'>+  (or using mdev_parent_dev(mdev) to arrive at the parent device outside</div><div class='add'>+   of the core mdev code)</div><div class='add'>+</div><div class='add'>+* device_api</div><div class='add'>+</div><div class='add'>+  This attribute should show which device API is being created, for example,</div><div class='add'>+  "vfio-pci" for a PCI device.</div><div class='add'>+</div><div class='add'>+* available_instances</div><div class='add'>+</div><div class='add'>+  This attribute should show the number of devices of type &lt;type-id&gt; that can be</div><div class='add'>+  created.</div><div class='add'>+</div><div class='add'>+* [device]</div><div class='add'>+</div><div class='add'>+  This directory contains links to the devices of type &lt;type-id&gt; that have been</div><div class='add'>+created.</div><div class='add'>+</div><div class='add'>+* name</div><div class='add'>+</div><div class='add'>+  This attribute should show human readable name. This is optional attribute.</div><div class='add'>+</div><div class='add'>+* description</div><div class='add'>+</div><div class='add'>+  This attribute should show brief features/description of the type. This is</div><div class='add'>+  optional attribute.</div><div class='add'>+</div><div class='add'>+Directories and Files Under the sysfs for Each mdev Device</div><div class='add'>+----------------------------------------------------------</div><div class='add'>+</div><div class='add'>+|- [parent phy device]</div><div class='add'>+|--- [$MDEV_UUID]</div><div class='add'>+         |--- remove</div><div class='add'>+         |--- mdev_type {link to its type}</div><div class='add'>+         |--- vendor-specific-attributes [optional]</div><div class='add'>+</div><div class='add'>+* remove (write only)</div><div class='add'>+Writing '1' to the 'remove' file destroys the mdev device. The vendor driver can</div><div class='add'>+fail the remove() callback if that device is active and the vendor driver</div><div class='add'>+doesn't support hot unplug.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	# echo 1 &gt; /sys/bus/mdev/devices/$mdev_UUID/remove</div><div class='add'>+</div><div class='add'>+Mediated device Hot plug:</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+Mediated devices can be created and assigned at runtime. The procedure to hot</div><div class='add'>+plug a mediated device is the same as the procedure to hot plug a PCI device.</div><div class='add'>+</div><div class='add'>+Translation APIs for Mediated Devices</div><div class='add'>+=====================================</div><div class='add'>+</div><div class='add'>+The following APIs are provided for translating user pfn to host pfn in a VFIO</div><div class='add'>+driver:</div><div class='add'>+</div><div class='add'>+extern int vfio_pin_pages(struct device *dev, unsigned long *user_pfn,</div><div class='add'>+                          int npage, int prot, unsigned long *phys_pfn);</div><div class='add'>+</div><div class='add'>+extern int vfio_unpin_pages(struct device *dev, unsigned long *user_pfn,</div><div class='add'>+                            int npage);</div><div class='add'>+</div><div class='add'>+These functions call back into the back-end IOMMU module by using the pin_pages</div><div class='add'>+and unpin_pages callbacks of the struct vfio_iommu_driver_ops[4]. Currently</div><div class='add'>+these callbacks are supported in the TYPE1 IOMMU module. To enable them for</div><div class='add'>+other IOMMU backend modules, such as PPC64 sPAPR module, they need to provide</div><div class='add'>+these two callback functions.</div><div class='add'>+</div><div class='add'>+Using the Sample Code</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+mtty.c in samples/vfio-mdev/ directory is a sample driver program to</div><div class='add'>+demonstrate how to use the mediated device framework.</div><div class='add'>+</div><div class='add'>+The sample driver creates an mdev device that simulates a serial port over a PCI</div><div class='add'>+card.</div><div class='add'>+</div><div class='add'>+1. Build and load the mtty.ko module.</div><div class='add'>+</div><div class='add'>+   This step creates a dummy device, /sys/devices/virtual/mtty/mtty/</div><div class='add'>+</div><div class='add'>+   Files in this device directory in sysfs are similar to the following:</div><div class='add'>+</div><div class='add'>+   # tree /sys/devices/virtual/mtty/mtty/</div><div class='add'>+      /sys/devices/virtual/mtty/mtty/</div><div class='add'>+      |-- mdev_supported_types</div><div class='add'>+      |   |-- mtty-1</div><div class='add'>+      |   |   |-- available_instances</div><div class='add'>+      |   |   |-- create</div><div class='add'>+      |   |   |-- device_api</div><div class='add'>+      |   |   |-- devices</div><div class='add'>+      |   |   `-- name</div><div class='add'>+      |   `-- mtty-2</div><div class='add'>+      |       |-- available_instances</div><div class='add'>+      |       |-- create</div><div class='add'>+      |       |-- device_api</div><div class='add'>+      |       |-- devices</div><div class='add'>+      |       `-- name</div><div class='add'>+      |-- mtty_dev</div><div class='add'>+      |   `-- sample_mtty_dev</div><div class='add'>+      |-- power</div><div class='add'>+      |   |-- autosuspend_delay_ms</div><div class='add'>+      |   |-- control</div><div class='add'>+      |   |-- runtime_active_time</div><div class='add'>+      |   |-- runtime_status</div><div class='add'>+      |   `-- runtime_suspended_time</div><div class='add'>+      |-- subsystem -&gt; ../../../../class/mtty</div><div class='add'>+      `-- uevent</div><div class='add'>+</div><div class='add'>+2. Create a mediated device by using the dummy device that you created in the</div><div class='add'>+   previous step.</div><div class='add'>+</div><div class='add'>+   # echo "83b8f4f2-509f-382f-3c1e-e6bfe0fa1001" &gt;	\</div><div class='add'>+              /sys/devices/virtual/mtty/mtty/mdev_supported_types/mtty-2/create</div><div class='add'>+</div><div class='add'>+3. Add parameters to qemu-kvm.</div><div class='add'>+</div><div class='add'>+   -device vfio-pci,\</div><div class='add'>+    sysfsdev=/sys/bus/mdev/devices/83b8f4f2-509f-382f-3c1e-e6bfe0fa1001</div><div class='add'>+</div><div class='add'>+4. Boot the VM.</div><div class='add'>+</div><div class='add'>+   In the Linux guest VM, with no hardware on the host, the device appears</div><div class='add'>+   as  follows:</div><div class='add'>+</div><div class='add'>+   # lspci -s 00:05.0 -xxvv</div><div class='add'>+   00:05.0 Serial controller: Device 4348:3253 (rev 10) (prog-if 02 [16550])</div><div class='add'>+           Subsystem: Device 4348:3253</div><div class='add'>+           Physical Slot: 5</div><div class='add'>+           Control: I/O+ Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr-</div><div class='add'>+   Stepping- SERR- FastB2B- DisINTx-</div><div class='add'>+           Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=medium &gt;TAbort-</div><div class='add'>+   &lt;TAbort- &lt;MAbort- &gt;SERR- &lt;PERR- INTx-</div><div class='add'>+           Interrupt: pin A routed to IRQ 10</div><div class='add'>+           Region 0: I/O ports at c150 [size=8]</div><div class='add'>+           Region 1: I/O ports at c158 [size=8]</div><div class='add'>+           Kernel driver in use: serial</div><div class='add'>+   00: 48 43 53 32 01 00 00 02 10 02 00 07 00 00 00 00</div><div class='add'>+   10: 51 c1 00 00 59 c1 00 00 00 00 00 00 00 00 00 00</div><div class='add'>+   20: 00 00 00 00 00 00 00 00 00 00 00 00 48 43 53 32</div><div class='add'>+   30: 00 00 00 00 00 00 00 00 00 00 00 00 0a 01 00 00</div><div class='add'>+</div><div class='add'>+   In the Linux guest VM, dmesg output for the device is as follows:</div><div class='add'>+</div><div class='add'>+   serial 0000:00:05.0: PCI INT A -&gt; Link[LNKA] -&gt; GSI 10 (level, high) -&gt; IRQ</div><div class='add'>+10</div><div class='add'>+   0000:00:05.0: ttyS1 at I/O 0xc150 (irq = 10) is a 16550A</div><div class='add'>+   0000:00:05.0: ttyS2 at I/O 0xc158 (irq = 10) is a 16550A</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5. In the Linux guest VM, check the serial ports.</div><div class='add'>+</div><div class='add'>+   # setserial -g /dev/ttyS*</div><div class='add'>+   /dev/ttyS0, UART: 16550A, Port: 0x03f8, IRQ: 4</div><div class='add'>+   /dev/ttyS1, UART: 16550A, Port: 0xc150, IRQ: 10</div><div class='add'>+   /dev/ttyS2, UART: 16550A, Port: 0xc158, IRQ: 10</div><div class='add'>+</div><div class='add'>+6. Using a minicom or any terminal enulation program, open port /dev/ttyS1 or</div><div class='add'>+   /dev/ttyS2 with hardware flow control disabled.</div><div class='add'>+</div><div class='add'>+7. Type data on the minicom terminal or send data to the terminal emulation</div><div class='add'>+   program and read the data.</div><div class='add'>+</div><div class='add'>+   Data is loop backed from hosts mtty driver.</div><div class='add'>+</div><div class='add'>+8. Destroy the mediated device that you created.</div><div class='add'>+</div><div class='add'>+   # echo 1 &gt; /sys/bus/mdev/devices/83b8f4f2-509f-382f-3c1e-e6bfe0fa1001/remove</div><div class='add'>+</div><div class='add'>+References</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+[1] See Documentation/vfio.txt for more information on VFIO.</div><div class='add'>+[2] struct mdev_driver in include/linux/mdev.h</div><div class='add'>+[3] struct mdev_parent_ops in include/linux/mdev.h</div><div class='add'>+[4] struct vfio_iommu_driver_ops in include/linux/vfio.h</div><div class='head'>diff --git a/Documentation/virtual/kvm/00-INDEX b/Documentation/virtual/kvm/00-INDEX<br/>index fee9f2bf9c64..69fe1a8b7ad1 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/virtual/kvm/00-INDEX?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/virtual/kvm/00-INDEX</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/virtual/kvm/00-INDEX?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/00-INDEX</a></div><div class='hunk'>@@ -6,6 +6,8 @@ cpuid.txt</div><div class='ctx'> 	- KVM-specific cpuid leaves (x86).</div><div class='ctx'> devices/</div><div class='ctx'> 	- KVM_CAP_DEVICE_CTRL userspace API.</div><div class='add'>+halt-polling.txt</div><div class='add'>+	- notes on halt-polling</div><div class='ctx'> hypercalls.txt</div><div class='ctx'> 	- KVM hypercalls.</div><div class='ctx'> locking.txt</div><div class='head'>diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt<br/>index 6bbceb9a3a19..069450938b79 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/virtual/kvm/api.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/virtual/kvm/api.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/virtual/kvm/api.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/api.txt</a></div><div class='hunk'>@@ -2034,6 +2034,8 @@ registers, find a list below:</div><div class='ctx'>   PPC   | KVM_REG_PPC_WORT              | 64</div><div class='ctx'>   PPC	| KVM_REG_PPC_SPRG9             | 64</div><div class='ctx'>   PPC	| KVM_REG_PPC_DBSR              | 32</div><div class='add'>+  PPC   | KVM_REG_PPC_TIDR              | 64</div><div class='add'>+  PPC   | KVM_REG_PPC_PSSCR             | 64</div><div class='ctx'>   PPC   | KVM_REG_PPC_TM_GPR0           | 64</div><div class='ctx'>           ...</div><div class='ctx'>   PPC   | KVM_REG_PPC_TM_GPR31          | 64</div><div class='hunk'>@@ -2050,6 +2052,7 @@ registers, find a list below:</div><div class='ctx'>   PPC   | KVM_REG_PPC_TM_VSCR           | 32</div><div class='ctx'>   PPC   | KVM_REG_PPC_TM_DSCR           | 64</div><div class='ctx'>   PPC   | KVM_REG_PPC_TM_TAR            | 64</div><div class='add'>+  PPC   | KVM_REG_PPC_TM_XER            | 64</div><div class='ctx'>         |                               |</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_R0               | 64</div><div class='ctx'>           ...</div><div class='hunk'>@@ -2058,6 +2061,8 @@ registers, find a list below:</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_LO               | 64</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_PC               | 64</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_INDEX        | 32</div><div class='add'>+  MIPS  | KVM_REG_MIPS_CP0_ENTRYLO0     | 64</div><div class='add'>+  MIPS  | KVM_REG_MIPS_CP0_ENTRYLO1     | 64</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_CONTEXT      | 64</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_USERLOCAL    | 64</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_PAGEMASK     | 32</div><div class='hunk'>@@ -2068,9 +2073,11 @@ registers, find a list below:</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_ENTRYHI      | 64</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_COMPARE      | 32</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_STATUS       | 32</div><div class='add'>+  MIPS  | KVM_REG_MIPS_CP0_INTCTL       | 32</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_CAUSE        | 32</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_EPC          | 64</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_PRID         | 32</div><div class='add'>+  MIPS  | KVM_REG_MIPS_CP0_EBASE        | 64</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_CONFIG       | 32</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_CONFIG1      | 32</div><div class='ctx'>   MIPS  | KVM_REG_MIPS_CP0_CONFIG2      | 32</div><div class='hunk'>@@ -2145,6 +2152,12 @@ patterns depending on whether they're 32-bit or 64-bit registers:</div><div class='ctx'>   0x7020 0000 0001 00 &lt;reg:5&gt; &lt;sel:3&gt;   (32-bit)</div><div class='ctx'>   0x7030 0000 0001 00 &lt;reg:5&gt; &lt;sel:3&gt;   (64-bit)</div><div class='ctx'> </div><div class='add'>+Note: KVM_REG_MIPS_CP0_ENTRYLO0 and KVM_REG_MIPS_CP0_ENTRYLO1 are the MIPS64</div><div class='add'>+versions of the EntryLo registers regardless of the word size of the host</div><div class='add'>+hardware, host kernel, guest, and whether XPA is present in the guest, i.e.</div><div class='add'>+with the RI and XI bits (if they exist) in bits 63 and 62 respectively, and</div><div class='add'>+the PFNX field starting at bit 30.</div><div class='add'>+</div><div class='ctx'> MIPS KVM control registers (see above) have the following id bit patterns:</div><div class='ctx'>   0x7030 0000 0002 &lt;reg:16&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -2209,7 +2222,7 @@ after pausing the vcpu, but before it is resumed.</div><div class='ctx'> 4.71 KVM_SIGNAL_MSI</div><div class='ctx'> </div><div class='ctx'> Capability: KVM_CAP_SIGNAL_MSI</div><div class='del'>-Architectures: x86 arm64</div><div class='add'>+Architectures: x86 arm arm64</div><div class='ctx'> Type: vm ioctl</div><div class='ctx'> Parameters: struct kvm_msi (in)</div><div class='ctx'> Returns: &gt;0 on delivery, 0 if guest blocked the MSI, and -1 on error</div><div class='hunk'>@@ -2440,18 +2453,20 @@ are, it will do nothing and return an EBUSY error.</div><div class='ctx'> The parameter is a pointer to a 32-bit unsigned integer variable</div><div class='ctx'> containing the order (log base 2) of the desired size of the hash</div><div class='ctx'> table, which must be between 18 and 46.  On successful return from the</div><div class='del'>-ioctl, it will have been updated with the order of the hash table that</div><div class='del'>-was allocated.</div><div class='add'>+ioctl, the value will not be changed by the kernel.</div><div class='ctx'> </div><div class='ctx'> If no hash table has been allocated when any vcpu is asked to run</div><div class='ctx'> (with the KVM_RUN ioctl), the host kernel will allocate a</div><div class='ctx'> default-sized hash table (16 MB).</div><div class='ctx'> </div><div class='ctx'> If this ioctl is called when a hash table has already been allocated,</div><div class='del'>-the kernel will clear out the existing hash table (zero all HPTEs) and</div><div class='del'>-return the hash table order in the parameter.  (If the guest is using</div><div class='del'>-the virtualized real-mode area (VRMA) facility, the kernel will</div><div class='del'>-re-create the VMRA HPTEs on the next KVM_RUN of any vcpu.)</div><div class='add'>+with a different order from the existing hash table, the existing hash</div><div class='add'>+table will be freed and a new one allocated.  If this is ioctl is</div><div class='add'>+called when a hash table has already been allocated of the same order</div><div class='add'>+as specified, the kernel will clear out the existing hash table (zero</div><div class='add'>+all HPTEs).  In either case, if the guest is using the virtualized</div><div class='add'>+real-mode area (VRMA) facility, the kernel will re-create the VMRA</div><div class='add'>+HPTEs on the next KVM_RUN of any vcpu.</div><div class='ctx'> </div><div class='ctx'> 4.77 KVM_S390_INTERRUPT</div><div class='ctx'> </div><div class='hunk'>@@ -3174,7 +3189,7 @@ of IOMMU pages.</div><div class='ctx'> </div><div class='ctx'> The rest of functionality is identical to KVM_CREATE_SPAPR_TCE.</div><div class='ctx'> </div><div class='del'>-4.98 KVM_REINJECT_CONTROL</div><div class='add'>+4.99 KVM_REINJECT_CONTROL</div><div class='ctx'> </div><div class='ctx'> Capability: KVM_CAP_REINJECT_CONTROL</div><div class='ctx'> Architectures: x86</div><div class='hunk'>@@ -3198,6 +3213,166 @@ struct kvm_reinject_control {</div><div class='ctx'> pit_reinject = 0 (!reinject mode) is recommended, unless running an old</div><div class='ctx'> operating system that uses the PIT for timing (e.g. Linux 2.4.x).</div><div class='ctx'> </div><div class='add'>+4.100 KVM_PPC_CONFIGURE_V3_MMU</div><div class='add'>+</div><div class='add'>+Capability: KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3</div><div class='add'>+Architectures: ppc</div><div class='add'>+Type: vm ioctl</div><div class='add'>+Parameters: struct kvm_ppc_mmuv3_cfg (in)</div><div class='add'>+Returns: 0 on success,</div><div class='add'>+         -EFAULT if struct kvm_ppc_mmuv3_cfg cannot be read,</div><div class='add'>+         -EINVAL if the configuration is invalid</div><div class='add'>+</div><div class='add'>+This ioctl controls whether the guest will use radix or HPT (hashed</div><div class='add'>+page table) translation, and sets the pointer to the process table for</div><div class='add'>+the guest.</div><div class='add'>+</div><div class='add'>+struct kvm_ppc_mmuv3_cfg {</div><div class='add'>+	__u64	flags;</div><div class='add'>+	__u64	process_table;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+There are two bits that can be set in flags; KVM_PPC_MMUV3_RADIX and</div><div class='add'>+KVM_PPC_MMUV3_GTSE.  KVM_PPC_MMUV3_RADIX, if set, configures the guest</div><div class='add'>+to use radix tree translation, and if clear, to use HPT translation.</div><div class='add'>+KVM_PPC_MMUV3_GTSE, if set and if KVM permits it, configures the guest</div><div class='add'>+to be able to use the global TLB and SLB invalidation instructions;</div><div class='add'>+if clear, the guest may not use these instructions.</div><div class='add'>+</div><div class='add'>+The process_table field specifies the address and size of the guest</div><div class='add'>+process table, which is in the guest's space.  This field is formatted</div><div class='add'>+as the second doubleword of the partition table entry, as defined in</div><div class='add'>+the Power ISA V3.00, Book III section 5.7.6.1.</div><div class='add'>+</div><div class='add'>+4.101 KVM_PPC_GET_RMMU_INFO</div><div class='add'>+</div><div class='add'>+Capability: KVM_CAP_PPC_RADIX_MMU</div><div class='add'>+Architectures: ppc</div><div class='add'>+Type: vm ioctl</div><div class='add'>+Parameters: struct kvm_ppc_rmmu_info (out)</div><div class='add'>+Returns: 0 on success,</div><div class='add'>+	 -EFAULT if struct kvm_ppc_rmmu_info cannot be written,</div><div class='add'>+	 -EINVAL if no useful information can be returned</div><div class='add'>+</div><div class='add'>+This ioctl returns a structure containing two things: (a) a list</div><div class='add'>+containing supported radix tree geometries, and (b) a list that maps</div><div class='add'>+page sizes to put in the "AP" (actual page size) field for the tlbie</div><div class='add'>+(TLB invalidate entry) instruction.</div><div class='add'>+</div><div class='add'>+struct kvm_ppc_rmmu_info {</div><div class='add'>+	struct kvm_ppc_radix_geom {</div><div class='add'>+		__u8	page_shift;</div><div class='add'>+		__u8	level_bits[4];</div><div class='add'>+		__u8	pad[3];</div><div class='add'>+	}	geometries[8];</div><div class='add'>+	__u32	ap_encodings[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+The geometries[] field gives up to 8 supported geometries for the</div><div class='add'>+radix page table, in terms of the log base 2 of the smallest page</div><div class='add'>+size, and the number of bits indexed at each level of the tree, from</div><div class='add'>+the PTE level up to the PGD level in that order.  Any unused entries</div><div class='add'>+will have 0 in the page_shift field.</div><div class='add'>+</div><div class='add'>+The ap_encodings gives the supported page sizes and their AP field</div><div class='add'>+encodings, encoded with the AP value in the top 3 bits and the log</div><div class='add'>+base 2 of the page size in the bottom 6 bits.</div><div class='add'>+</div><div class='add'>+4.102 KVM_PPC_RESIZE_HPT_PREPARE</div><div class='add'>+</div><div class='add'>+Capability: KVM_CAP_SPAPR_RESIZE_HPT</div><div class='add'>+Architectures: powerpc</div><div class='add'>+Type: vm ioctl</div><div class='add'>+Parameters: struct kvm_ppc_resize_hpt (in)</div><div class='add'>+Returns: 0 on successful completion,</div><div class='add'>+	 &gt;0 if a new HPT is being prepared, the value is an estimated</div><div class='add'>+             number of milliseconds until preparation is complete</div><div class='add'>+         -EFAULT if struct kvm_reinject_control cannot be read,</div><div class='add'>+	 -EINVAL if the supplied shift or flags are invalid</div><div class='add'>+	 -ENOMEM if unable to allocate the new HPT</div><div class='add'>+	 -ENOSPC if there was a hash collision when moving existing</div><div class='add'>+                  HPT entries to the new HPT</div><div class='add'>+	 -EIO on other error conditions</div><div class='add'>+</div><div class='add'>+Used to implement the PAPR extension for runtime resizing of a guest's</div><div class='add'>+Hashed Page Table (HPT).  Specifically this starts, stops or monitors</div><div class='add'>+the preparation of a new potential HPT for the guest, essentially</div><div class='add'>+implementing the H_RESIZE_HPT_PREPARE hypercall.</div><div class='add'>+</div><div class='add'>+If called with shift &gt; 0 when there is no pending HPT for the guest,</div><div class='add'>+this begins preparation of a new pending HPT of size 2^(shift) bytes.</div><div class='add'>+It then returns a positive integer with the estimated number of</div><div class='add'>+milliseconds until preparation is complete.</div><div class='add'>+</div><div class='add'>+If called when there is a pending HPT whose size does not match that</div><div class='add'>+requested in the parameters, discards the existing pending HPT and</div><div class='add'>+creates a new one as above.</div><div class='add'>+</div><div class='add'>+If called when there is a pending HPT of the size requested, will:</div><div class='add'>+  * If preparation of the pending HPT is already complete, return 0</div><div class='add'>+  * If preparation of the pending HPT has failed, return an error</div><div class='add'>+    code, then discard the pending HPT.</div><div class='add'>+  * If preparation of the pending HPT is still in progress, return an</div><div class='add'>+    estimated number of milliseconds until preparation is complete.</div><div class='add'>+</div><div class='add'>+If called with shift == 0, discards any currently pending HPT and</div><div class='add'>+returns 0 (i.e. cancels any in-progress preparation).</div><div class='add'>+</div><div class='add'>+flags is reserved for future expansion, currently setting any bits in</div><div class='add'>+flags will result in an -EINVAL.</div><div class='add'>+</div><div class='add'>+Normally this will be called repeatedly with the same parameters until</div><div class='add'>+it returns &lt;= 0.  The first call will initiate preparation, subsequent</div><div class='add'>+ones will monitor preparation until it completes or fails.</div><div class='add'>+</div><div class='add'>+struct kvm_ppc_resize_hpt {</div><div class='add'>+	__u64 flags;</div><div class='add'>+	__u32 shift;</div><div class='add'>+	__u32 pad;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+4.103 KVM_PPC_RESIZE_HPT_COMMIT</div><div class='add'>+</div><div class='add'>+Capability: KVM_CAP_SPAPR_RESIZE_HPT</div><div class='add'>+Architectures: powerpc</div><div class='add'>+Type: vm ioctl</div><div class='add'>+Parameters: struct kvm_ppc_resize_hpt (in)</div><div class='add'>+Returns: 0 on successful completion,</div><div class='add'>+         -EFAULT if struct kvm_reinject_control cannot be read,</div><div class='add'>+	 -EINVAL if the supplied shift or flags are invalid</div><div class='add'>+	 -ENXIO is there is no pending HPT, or the pending HPT doesn't</div><div class='add'>+                 have the requested size</div><div class='add'>+	 -EBUSY if the pending HPT is not fully prepared</div><div class='add'>+	 -ENOSPC if there was a hash collision when moving existing</div><div class='add'>+                  HPT entries to the new HPT</div><div class='add'>+	 -EIO on other error conditions</div><div class='add'>+</div><div class='add'>+Used to implement the PAPR extension for runtime resizing of a guest's</div><div class='add'>+Hashed Page Table (HPT).  Specifically this requests that the guest be</div><div class='add'>+transferred to working with the new HPT, essentially implementing the</div><div class='add'>+H_RESIZE_HPT_COMMIT hypercall.</div><div class='add'>+</div><div class='add'>+This should only be called after KVM_PPC_RESIZE_HPT_PREPARE has</div><div class='add'>+returned 0 with the same parameters.  In other cases</div><div class='add'>+KVM_PPC_RESIZE_HPT_COMMIT will return an error (usually -ENXIO or</div><div class='add'>+-EBUSY, though others may be possible if the preparation was started,</div><div class='add'>+but failed).</div><div class='add'>+</div><div class='add'>+This will have undefined effects on the guest if it has not already</div><div class='add'>+placed itself in a quiescent state where no vcpu will make MMU enabled</div><div class='add'>+memory accesses.</div><div class='add'>+</div><div class='add'>+On succsful completion, the pending HPT will become the guest's active</div><div class='add'>+HPT and the previous HPT will be discarded.</div><div class='add'>+</div><div class='add'>+On failure, the guest will still be operating on its previous HPT.</div><div class='add'>+</div><div class='add'>+struct kvm_ppc_resize_hpt {</div><div class='add'>+	__u64 flags;</div><div class='add'>+	__u32 shift;</div><div class='add'>+	__u32 pad;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> 5. The kvm_run structure</div><div class='ctx'> ------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -3214,7 +3389,18 @@ struct kvm_run {</div><div class='ctx'> Request that KVM_RUN return when it becomes possible to inject external</div><div class='ctx'> interrupts into the guest.  Useful in conjunction with KVM_INTERRUPT.</div><div class='ctx'> </div><div class='del'>-	__u8 padding1[7];</div><div class='add'>+	__u8 immediate_exit;</div><div class='add'>+</div><div class='add'>+This field is polled once when KVM_RUN starts; if non-zero, KVM_RUN</div><div class='add'>+exits immediately, returning -EINTR.  In the common scenario where a</div><div class='add'>+signal is used to "kick" a VCPU out of KVM_RUN, this field can be used</div><div class='add'>+to avoid usage of KVM_SET_SIGNAL_MASK, which has worse scalability.</div><div class='add'>+Rather than blocking the signal outside KVM_RUN, userspace can set up</div><div class='add'>+a signal handler that sets run-&gt;immediate_exit to a non-zero value.</div><div class='add'>+</div><div class='add'>+This field is ignored if KVM_CAP_IMMEDIATE_EXIT is not available.</div><div class='add'>+</div><div class='add'>+	__u8 padding1[6];</div><div class='ctx'> </div><div class='ctx'> 	/* out */</div><div class='ctx'> 	__u32 exit_reason;</div><div class='hunk'>@@ -3939,3 +4125,21 @@ In order to use SynIC, it has to be activated by setting this</div><div class='ctx'> capability via KVM_ENABLE_CAP ioctl on the vcpu fd. Note that this</div><div class='ctx'> will disable the use of APIC hardware virtualization even if supported</div><div class='ctx'> by the CPU, as it's incompatible with SynIC auto-EOI behavior.</div><div class='add'>+</div><div class='add'>+8.3 KVM_CAP_PPC_RADIX_MMU</div><div class='add'>+</div><div class='add'>+Architectures: ppc</div><div class='add'>+</div><div class='add'>+This capability, if KVM_CHECK_EXTENSION indicates that it is</div><div class='add'>+available, means that that the kernel can support guests using the</div><div class='add'>+radix MMU defined in Power ISA V3.00 (as implemented in the POWER9</div><div class='add'>+processor).</div><div class='add'>+</div><div class='add'>+8.4 KVM_CAP_PPC_HASH_MMU_V3</div><div class='add'>+</div><div class='add'>+Architectures: ppc</div><div class='add'>+</div><div class='add'>+This capability, if KVM_CHECK_EXTENSION indicates that it is</div><div class='add'>+available, means that that the kernel can support guests using the</div><div class='add'>+hashed page table MMU defined in Power ISA V3.00 (as implemented in</div><div class='add'>+the POWER9 processor), including in-memory segment tables.</div><div class='head'>diff --git a/Documentation/virtual/kvm/devices/arm-vgic-v3.txt b/Documentation/virtual/kvm/devices/arm-vgic-v3.txt<br/>index 9348b3caccd7..c1a24612c198 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/virtual/kvm/devices/arm-vgic-v3.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/virtual/kvm/devices/arm-vgic-v3.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/virtual/kvm/devices/arm-vgic-v3.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/devices/arm-vgic-v3.txt</a></div><div class='hunk'>@@ -118,7 +118,7 @@ Groups:</div><div class='ctx'>     -EBUSY: One or more VCPUs are running</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-  KVM_DEV_ARM_VGIC_CPU_SYSREGS</div><div class='add'>+  KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS</div><div class='ctx'>   Attributes:</div><div class='ctx'>     The attr field of kvm_device_attr encodes two values:</div><div class='ctx'>     bits:     | 63      ....       32 | 31  ....  16 | 15  ....  0 |</div><div class='hunk'>@@ -139,13 +139,15 @@ Groups:</div><div class='ctx'>     All system regs accessed through this API are (rw, 64-bit) and</div><div class='ctx'>     kvm_device_attr.addr points to a __u64 value.</div><div class='ctx'> </div><div class='del'>-    KVM_DEV_ARM_VGIC_CPU_SYSREGS accesses the CPU interface registers for the</div><div class='add'>+    KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS accesses the CPU interface registers for the</div><div class='ctx'>     CPU specified by the mpidr field.</div><div class='ctx'> </div><div class='add'>+    CPU interface registers access is not implemented for AArch32 mode.</div><div class='add'>+    Error -ENXIO is returned when accessed in AArch32 mode.</div><div class='ctx'>   Errors:</div><div class='ctx'>     -ENXIO: Getting or setting this register is not yet supported</div><div class='ctx'>     -EBUSY: VCPU is running</div><div class='del'>-    -EINVAL: Invalid mpidr supplied</div><div class='add'>+    -EINVAL: Invalid mpidr or register value supplied</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>   KVM_DEV_ARM_VGIC_GRP_NR_IRQS</div><div class='hunk'>@@ -204,3 +206,6 @@ Groups:</div><div class='ctx'>     architecture defined MPIDR, and the field is encoded as follows:</div><div class='ctx'>       | 63 .... 56 | 55 .... 48 | 47 .... 40 | 39 .... 32 |</div><div class='ctx'>       |    Aff3    |    Aff2    |    Aff1    |    Aff0    |</div><div class='add'>+  Errors:</div><div class='add'>+    -EINVAL: vINTID is not multiple of 32 or</div><div class='add'>+     info field is not VGIC_LEVEL_INFO_LINE_LEVEL</div><div class='head'>diff --git a/Documentation/virtual/kvm/halt-polling.txt b/Documentation/virtual/kvm/halt-polling.txt<br/>new file mode 100644<br/>index 000000000000..4a8418318769<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/virtual/kvm/halt-polling.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/halt-polling.txt</a></div><div class='hunk'>@@ -0,0 +1,127 @@</div><div class='add'>+The KVM halt polling system</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+The KVM halt polling system provides a feature within KVM whereby the latency</div><div class='add'>+of a guest can, under some circumstances, be reduced by polling in the host</div><div class='add'>+for some time period after the guest has elected to no longer run by cedeing.</div><div class='add'>+That is, when a guest vcpu has ceded, or in the case of powerpc when all of the</div><div class='add'>+vcpus of a single vcore have ceded, the host kernel polls for wakeup conditions</div><div class='add'>+before giving up the cpu to the scheduler in order to let something else run.</div><div class='add'>+</div><div class='add'>+Polling provides a latency advantage in cases where the guest can be run again</div><div class='add'>+very quickly by at least saving us a trip through the scheduler, normally on</div><div class='add'>+the order of a few micro-seconds, although performance benefits are workload</div><div class='add'>+dependant. In the event that no wakeup source arrives during the polling</div><div class='add'>+interval or some other task on the runqueue is runnable the scheduler is</div><div class='add'>+invoked. Thus halt polling is especially useful on workloads with very short</div><div class='add'>+wakeup periods where the time spent halt polling is minimised and the time</div><div class='add'>+savings of not invoking the scheduler are distinguishable.</div><div class='add'>+</div><div class='add'>+The generic halt polling code is implemented in:</div><div class='add'>+</div><div class='add'>+	virt/kvm/kvm_main.c: kvm_vcpu_block()</div><div class='add'>+</div><div class='add'>+The powerpc kvm-hv specific case is implemented in:</div><div class='add'>+</div><div class='add'>+	arch/powerpc/kvm/book3s_hv.c: kvmppc_vcore_blocked()</div><div class='add'>+</div><div class='add'>+Halt Polling Interval</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+The maximum time for which to poll before invoking the scheduler, referred to</div><div class='add'>+as the halt polling interval, is increased and decreased based on the perceived</div><div class='add'>+effectiveness of the polling in an attempt to limit pointless polling.</div><div class='add'>+This value is stored in either the vcpu struct:</div><div class='add'>+</div><div class='add'>+	kvm_vcpu-&gt;halt_poll_ns</div><div class='add'>+</div><div class='add'>+or in the case of powerpc kvm-hv, in the vcore struct:</div><div class='add'>+</div><div class='add'>+	kvmppc_vcore-&gt;halt_poll_ns</div><div class='add'>+</div><div class='add'>+Thus this is a per vcpu (or vcore) value.</div><div class='add'>+</div><div class='add'>+During polling if a wakeup source is received within the halt polling interval,</div><div class='add'>+the interval is left unchanged. In the event that a wakeup source isn't</div><div class='add'>+received during the polling interval (and thus schedule is invoked) there are</div><div class='add'>+two options, either the polling interval and total block time[0] were less than</div><div class='add'>+the global max polling interval (see module params below), or the total block</div><div class='add'>+time was greater than the global max polling interval.</div><div class='add'>+</div><div class='add'>+In the event that both the polling interval and total block time were less than</div><div class='add'>+the global max polling interval then the polling interval can be increased in</div><div class='add'>+the hope that next time during the longer polling interval the wake up source</div><div class='add'>+will be received while the host is polling and the latency benefits will be</div><div class='add'>+received. The polling interval is grown in the function grow_halt_poll_ns() and</div><div class='add'>+is multiplied by the module parameter halt_poll_ns_grow.</div><div class='add'>+</div><div class='add'>+In the event that the total block time was greater than the global max polling</div><div class='add'>+interval then the host will never poll for long enough (limited by the global</div><div class='add'>+max) to wakeup during the polling interval so it may as well be shrunk in order</div><div class='add'>+to avoid pointless polling. The polling interval is shrunk in the function</div><div class='add'>+shrink_halt_poll_ns() and is divided by the module parameter</div><div class='add'>+halt_poll_ns_shrink, or set to 0 iff halt_poll_ns_shrink == 0.</div><div class='add'>+</div><div class='add'>+It is worth noting that this adjustment process attempts to hone in on some</div><div class='add'>+steady state polling interval but will only really do a good job for wakeups</div><div class='add'>+which come at an approximately constant rate, otherwise there will be constant</div><div class='add'>+adjustment of the polling interval.</div><div class='add'>+</div><div class='add'>+[0] total block time: the time between when the halt polling function is</div><div class='add'>+		      invoked and a wakeup source received (irrespective of</div><div class='add'>+		      whether the scheduler is invoked within that function).</div><div class='add'>+</div><div class='add'>+Module Parameters</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+The kvm module has 3 tuneable module parameters to adjust the global max</div><div class='add'>+polling interval as well as the rate at which the polling interval is grown and</div><div class='add'>+shrunk. These variables are defined in include/linux/kvm_host.h and as module</div><div class='add'>+parameters in virt/kvm/kvm_main.c, or arch/powerpc/kvm/book3s_hv.c in the</div><div class='add'>+powerpc kvm-hv case.</div><div class='add'>+</div><div class='add'>+Module Parameter    |	     Description	      |	     Default Value</div><div class='add'>+--------------------------------------------------------------------------------</div><div class='add'>+halt_poll_ns	    | The global max polling interval | KVM_HALT_POLL_NS_DEFAULT</div><div class='add'>+		    | which defines the ceiling value |</div><div class='add'>+		    | of the polling interval for     | (per arch value)</div><div class='add'>+		    | each vcpu. 		      |</div><div class='add'>+--------------------------------------------------------------------------------</div><div class='add'>+halt_poll_ns_grow   | The value by which the halt     |	2</div><div class='add'>+		    | polling interval is multiplied  |</div><div class='add'>+		    | in the grow_halt_poll_ns()      |</div><div class='add'>+		    | function.			      |</div><div class='add'>+--------------------------------------------------------------------------------</div><div class='add'>+halt_poll_ns_shrink | The value by which the halt     |	0</div><div class='add'>+		    | polling interval is divided in  |</div><div class='add'>+		    | the shrink_halt_poll_ns()	      |</div><div class='add'>+		    | function.			      |</div><div class='add'>+--------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+These module parameters can be set from the debugfs files in:</div><div class='add'>+</div><div class='add'>+	/sys/module/kvm/parameters/</div><div class='add'>+</div><div class='add'>+Note: that these module parameters are system wide values and are not able to</div><div class='add'>+      be tuned on a per vm basis.</div><div class='add'>+</div><div class='add'>+Further Notes</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+- Care should be taken when setting the halt_poll_ns module parameter as a</div><div class='add'>+large value has the potential to drive the cpu usage to 100% on a machine which</div><div class='add'>+would be almost entirely idle otherwise. This is because even if a guest has</div><div class='add'>+wakeups during which very little work is done and which are quite far apart, if</div><div class='add'>+the period is shorter than the global max polling interval (halt_poll_ns) then</div><div class='add'>+the host will always poll for the entire block time and thus cpu utilisation</div><div class='add'>+will go to 100%.</div><div class='add'>+</div><div class='add'>+- Halt polling essentially presents a trade off between power usage and latency</div><div class='add'>+and the module parameters should be used to tune the affinity for this. Idle</div><div class='add'>+cpu time is essentially converted to host kernel time with the aim of decreasing</div><div class='add'>+latency when entering the guest.</div><div class='add'>+</div><div class='add'>+- Halt polling will only be conducted by the host when no other tasks are</div><div class='add'>+runnable on that cpu, otherwise the polling will cease immediately and</div><div class='add'>+schedule will be invoked to allow that other task to run. Thus this doesn't</div><div class='add'>+allow a guest to denial of service the cpu.</div><div class='head'>diff --git a/Documentation/virtual/kvm/hypercalls.txt b/Documentation/virtual/kvm/hypercalls.txt<br/>index c8d040e27046..feaaa634f154 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/virtual/kvm/hypercalls.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/virtual/kvm/hypercalls.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/virtual/kvm/hypercalls.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/hypercalls.txt</a></div><div class='hunk'>@@ -81,3 +81,38 @@ the vcpu to sleep until occurrence of an appropriate event. Another vcpu of the</div><div class='ctx'> same guest can wakeup the sleeping vcpu by issuing KVM_HC_KICK_CPU hypercall,</div><div class='ctx'> specifying APIC ID (a1) of the vcpu to be woken up. An additional argument (a0)</div><div class='ctx'> is used in the hypercall for future use.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6. KVM_HC_CLOCK_PAIRING</div><div class='add'>+------------------------</div><div class='add'>+Architecture: x86</div><div class='add'>+Status: active</div><div class='add'>+Purpose: Hypercall used to synchronize host and guest clocks.</div><div class='add'>+Usage:</div><div class='add'>+</div><div class='add'>+a0: guest physical address where host copies</div><div class='add'>+"struct kvm_clock_offset" structure.</div><div class='add'>+</div><div class='add'>+a1: clock_type, ATM only KVM_CLOCK_PAIRING_WALLCLOCK (0)</div><div class='add'>+is supported (corresponding to the host's CLOCK_REALTIME clock).</div><div class='add'>+</div><div class='add'>+		struct kvm_clock_pairing {</div><div class='add'>+			__s64 sec;</div><div class='add'>+			__s64 nsec;</div><div class='add'>+			__u64 tsc;</div><div class='add'>+			__u32 flags;</div><div class='add'>+			__u32 pad[9];</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+       Where:</div><div class='add'>+               * sec: seconds from clock_type clock.</div><div class='add'>+               * nsec: nanoseconds from clock_type clock.</div><div class='add'>+               * tsc: guest TSC value used to calculate sec/nsec pair</div><div class='add'>+               * flags: flags, unused (0) at the moment.</div><div class='add'>+</div><div class='add'>+The hypercall lets a guest compute a precise timestamp across</div><div class='add'>+host and guest.  The guest can use the returned TSC value to</div><div class='add'>+compute the CLOCK_REALTIME for its clock, at the same instant.</div><div class='add'>+</div><div class='add'>+Returns KVM_EOPNOTSUPP if the host does not use TSC clocksource,</div><div class='add'>+or if clock type is different than KVM_CLOCK_PAIRING_WALLCLOCK.</div><div class='head'>diff --git a/Documentation/virtual/kvm/locking.txt b/Documentation/virtual/kvm/locking.txt<br/>index e5dd9f4d6100..1bb8bcaf8497 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/virtual/kvm/locking.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/virtual/kvm/locking.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/virtual/kvm/locking.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/locking.txt</a></div><div class='hunk'>@@ -13,8 +13,12 @@ The acquisition orders for mutexes are as follows:</div><div class='ctx'> - kvm-&gt;slots_lock is taken outside kvm-&gt;irq_lock, though acquiring</div><div class='ctx'>   them together is quite rare.</div><div class='ctx'> </div><div class='del'>-For spinlocks, kvm_lock is taken outside kvm-&gt;mmu_lock.  Everything</div><div class='del'>-else is a leaf: no other lock is taken inside the critical sections.</div><div class='add'>+On x86, vcpu-&gt;mutex is taken outside kvm-&gt;arch.hyperv.hv_lock.</div><div class='add'>+</div><div class='add'>+For spinlocks, kvm_lock is taken outside kvm-&gt;mmu_lock.</div><div class='add'>+</div><div class='add'>+Everything else is a leaf: no other lock is taken inside the critical</div><div class='add'>+sections.</div><div class='ctx'> </div><div class='ctx'> 2: Exception</div><div class='ctx'> ------------</div><div class='hunk'>@@ -22,9 +26,16 @@ else is a leaf: no other lock is taken inside the critical sections.</div><div class='ctx'> Fast page fault:</div><div class='ctx'> </div><div class='ctx'> Fast page fault is the fast path which fixes the guest page fault out of</div><div class='del'>-the mmu-lock on x86. Currently, the page fault can be fast only if the</div><div class='del'>-shadow page table is present and it is caused by write-protect, that means</div><div class='del'>-we just need change the W bit of the spte.</div><div class='add'>+the mmu-lock on x86. Currently, the page fault can be fast in one of the</div><div class='add'>+following two cases:</div><div class='add'>+</div><div class='add'>+1. Access Tracking: The SPTE is not present, but it is marked for access</div><div class='add'>+tracking i.e. the SPTE_SPECIAL_MASK is set. That means we need to</div><div class='add'>+restore the saved R/X bits. This is described in more detail later below.</div><div class='add'>+</div><div class='add'>+2. Write-Protection: The SPTE is present and the fault is</div><div class='add'>+caused by write-protect. That means we just need to change the W bit of the </div><div class='add'>+spte.</div><div class='ctx'> </div><div class='ctx'> What we use to avoid all the race is the SPTE_HOST_WRITEABLE bit and</div><div class='ctx'> SPTE_MMU_WRITEABLE bit on the spte:</div><div class='hunk'>@@ -34,7 +45,8 @@ SPTE_MMU_WRITEABLE bit on the spte:</div><div class='ctx'>   page write-protection.</div><div class='ctx'> </div><div class='ctx'> On fast page fault path, we will use cmpxchg to atomically set the spte W</div><div class='del'>-bit if spte.SPTE_HOST_WRITEABLE = 1 and spte.SPTE_WRITE_PROTECT = 1, this</div><div class='add'>+bit if spte.SPTE_HOST_WRITEABLE = 1 and spte.SPTE_WRITE_PROTECT = 1, or </div><div class='add'>+restore the saved R/X bits if VMX_EPT_TRACK_ACCESS mask is set, or both. This</div><div class='ctx'> is safe because whenever changing these bits can be detected by cmpxchg.</div><div class='ctx'> </div><div class='ctx'> But we need carefully check these cases:</div><div class='hunk'>@@ -138,6 +150,21 @@ Since the spte is "volatile" if it can be updated out of mmu-lock, we always</div><div class='ctx'> atomically update the spte, the race caused by fast page fault can be avoided,</div><div class='ctx'> See the comments in spte_has_volatile_bits() and mmu_spte_update().</div><div class='ctx'> </div><div class='add'>+Lockless Access Tracking:</div><div class='add'>+</div><div class='add'>+This is used for Intel CPUs that are using EPT but do not support the EPT A/D</div><div class='add'>+bits. In this case, when the KVM MMU notifier is called to track accesses to a</div><div class='add'>+page (via kvm_mmu_notifier_clear_flush_young), it marks the PTE as not-present</div><div class='add'>+by clearing the RWX bits in the PTE and storing the original R &amp; X bits in</div><div class='add'>+some unused/ignored bits. In addition, the SPTE_SPECIAL_MASK is also set on the</div><div class='add'>+PTE (using the ignored bit 62). When the VM tries to access the page later on,</div><div class='add'>+a fault is generated and the fast page fault mechanism described above is used</div><div class='add'>+to atomically restore the PTE to a Present state. The W bit is not saved when</div><div class='add'>+the PTE is marked for access tracking and during restoration to the Present</div><div class='add'>+state, the W bit is set depending on whether or not it was a write access. If</div><div class='add'>+it wasn't, then the W bit will remain clear until a write access happens, at </div><div class='add'>+which time it will be set using the Dirty tracking mechanism described above.</div><div class='add'>+</div><div class='ctx'> 3. Reference</div><div class='ctx'> ------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/virtual/kvm/msr.txt b/Documentation/virtual/kvm/msr.txt<br/>index 2a71c8f29f68..0a9ea515512a 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/virtual/kvm/msr.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/virtual/kvm/msr.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/virtual/kvm/msr.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/msr.txt</a></div><div class='hunk'>@@ -208,7 +208,9 @@ MSR_KVM_STEAL_TIME: 0x4b564d03</div><div class='ctx'> 		__u64 steal;</div><div class='ctx'> 		__u32 version;</div><div class='ctx'> 		__u32 flags;</div><div class='del'>-		__u32 pad[12];</div><div class='add'>+		__u8  preempted;</div><div class='add'>+		__u8  u8_pad[3];</div><div class='add'>+		__u32 pad[11];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	whose data will be filled in by the hypervisor periodically. Only one</div><div class='hunk'>@@ -232,6 +234,11 @@ MSR_KVM_STEAL_TIME: 0x4b564d03</div><div class='ctx'> 		nanoseconds. Time during which the vcpu is idle, will not be</div><div class='ctx'> 		reported as steal time.</div><div class='ctx'> </div><div class='add'>+		preempted: indicate the vCPU who owns this struct is running or</div><div class='add'>+		not. Non-zero values mean the vCPU has been preempted. Zero</div><div class='add'>+		means the vCPU is not preempted. NOTE, it is always zero if the</div><div class='add'>+		the hypervisor doesn't support this field.</div><div class='add'>+</div><div class='ctx'> MSR_KVM_EOI_EN: 0x4b564d04</div><div class='ctx'> 	data: Bit 0 is 1 when PV end of interrupt is enabled on the vcpu; 0</div><div class='ctx'> 	when disabled.  Bit 1 is reserved and must be zero.  When PV end of</div><div class='head'>diff --git a/Documentation/virtual/kvm/review-checklist.txt b/Documentation/virtual/kvm/review-checklist.txt<br/>index a850986ed684..a83b27635fdd 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/virtual/kvm/review-checklist.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/virtual/kvm/review-checklist.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/virtual/kvm/review-checklist.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/kvm/review-checklist.txt</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> Review checklist for kvm patches</div><div class='ctx'> ================================</div><div class='ctx'> </div><div class='del'>-1.  The patch must follow Documentation/CodingStyle and</div><div class='del'>-    Documentation/SubmittingPatches.</div><div class='add'>+1.  The patch must follow Documentation/process/coding-style.rst and</div><div class='add'>+    Documentation/process/submitting-patches.rst.</div><div class='ctx'> </div><div class='ctx'> 2.  Patches should be against kvm.git master branch.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/virtual/uml/UserModeLinux-HOWTO.txt b/Documentation/virtual/uml/UserModeLinux-HOWTO.txt<br/>index f4099ca6b483..87b80f589e1c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/virtual/uml/UserModeLinux-HOWTO.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/virtual/uml/UserModeLinux-HOWTO.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/virtual/uml/UserModeLinux-HOWTO.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/virtual/uml/UserModeLinux-HOWTO.txt</a></div><div class='hunk'>@@ -2401,9 +2401,9 @@</div><div class='ctx'> </div><div class='ctx'>   This takes one argument, which is a single letter.  It calls the</div><div class='ctx'>   generic kernel's SysRq driver, which does whatever is called for by</div><div class='del'>-  that argument.  See the SysRq documentation in Documentation/sysrq.txt</div><div class='del'>-  in your favorite kernel tree to see what letters are valid and what</div><div class='del'>-  they do.</div><div class='add'>+  that argument.  See the SysRq documentation in</div><div class='add'>+  Documentation/admin-guide/sysrq.rst in your favorite kernel tree to</div><div class='add'>+  see what letters are valid and what they do.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/vm/ksm.txt b/Documentation/vm/ksm.txt<br/>index f34a8ee6f860..6b0ca7feb135 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/vm/ksm.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/vm/ksm.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/vm/ksm.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vm/ksm.txt</a></div><div class='hunk'>@@ -38,6 +38,10 @@ the range for whenever the KSM daemon is started; even if the range</div><div class='ctx'> cannot contain any pages which KSM could actually merge; even if</div><div class='ctx'> MADV_UNMERGEABLE is applied to a range which was never MADV_MERGEABLE.</div><div class='ctx'> </div><div class='add'>+If a region of memory must be split into at least one new MADV_MERGEABLE</div><div class='add'>+or MADV_UNMERGEABLE region, the madvise may return ENOMEM if the process</div><div class='add'>+will exceed vm.max_map_count (see Documentation/sysctl/vm.txt).</div><div class='add'>+</div><div class='ctx'> Like other madvise calls, they are intended for use on mapped areas of</div><div class='ctx'> the user address space: they will report ENOMEM if the specified range</div><div class='ctx'> includes unmapped gaps (though working on the intervening mapped areas),</div><div class='hunk'>@@ -80,6 +84,20 @@ run              - set 0 to stop ksmd from running but keep merged pages,</div><div class='ctx'>                    Default: 0 (must be changed to 1 to activate KSM,</div><div class='ctx'>                                except if CONFIG_SYSFS is disabled)</div><div class='ctx'> </div><div class='add'>+use_zero_pages   - specifies whether empty pages (i.e. allocated pages</div><div class='add'>+                   that only contain zeroes) should be treated specially.</div><div class='add'>+                   When set to 1, empty pages are merged with the kernel</div><div class='add'>+                   zero page(s) instead of with each other as it would</div><div class='add'>+                   happen normally. This can improve the performance on</div><div class='add'>+                   architectures with coloured zero pages, depending on</div><div class='add'>+                   the workload. Care should be taken when enabling this</div><div class='add'>+                   setting, as it can potentially degrade the performance</div><div class='add'>+                   of KSM for some workloads, for example if the checksums</div><div class='add'>+                   of pages candidate for merging match the checksum of</div><div class='add'>+                   an empty page. This setting can be changed at any time,</div><div class='add'>+                   it is only effective for pages merged after the change.</div><div class='add'>+                   Default: 0 (normal KSM behaviour as in earlier releases)</div><div class='add'>+</div><div class='ctx'> The effectiveness of KSM and MADV_MERGEABLE is shown in /sys/kernel/mm/ksm/:</div><div class='ctx'> </div><div class='ctx'> pages_shared     - how many shared pages are being used</div><div class='head'>diff --git a/Documentation/vm/numa b/Documentation/vm/numa<br/>index e0b58c0e6b49..a08f71647714 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/vm/numa?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/vm/numa</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/vm/numa?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vm/numa</a></div><div class='hunk'>@@ -82,7 +82,7 @@ such as DMA or DMA32, represent relatively scarce resources.  Linux chooses</div><div class='ctx'> a default zonelist order based on the sizes of the various zone types relative</div><div class='ctx'> to the total memory of the node and the total memory of the system.  The</div><div class='ctx'> default zonelist order may be overridden using the numa_zonelist_order kernel</div><div class='del'>-boot parameter or sysctl.  [see Documentation/kernel-parameters.txt and</div><div class='add'>+boot parameter or sysctl.  [see Documentation/admin-guide/kernel-parameters.rst and</div><div class='ctx'> Documentation/sysctl/vm.txt]</div><div class='ctx'> </div><div class='ctx'> By default, Linux will attempt to satisfy memory allocation requests from the</div><div class='head'>diff --git a/Documentation/vm/page_frags b/Documentation/vm/page_frags<br/>new file mode 100644<br/>index 000000000000..a6714565dbf9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/vm/page_frags?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vm/page_frags</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+Page fragments</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+A page fragment is an arbitrary-length arbitrary-offset area of memory</div><div class='add'>+which resides within a 0 or higher order compound page.  Multiple</div><div class='add'>+fragments within that page are individually refcounted, in the page's</div><div class='add'>+reference counter.</div><div class='add'>+</div><div class='add'>+The page_frag functions, page_frag_alloc and page_frag_free, provide a</div><div class='add'>+simple allocation framework for page fragments.  This is used by the</div><div class='add'>+network stack and network device drivers to provide a backing region of</div><div class='add'>+memory for use as either an sk_buff-&gt;head, or to be used in the "frags"</div><div class='add'>+portion of skb_shared_info.</div><div class='add'>+</div><div class='add'>+In order to make use of the page fragment APIs a backing page fragment</div><div class='add'>+cache is needed.  This provides a central point for the fragment allocation</div><div class='add'>+and tracks allows multiple calls to make use of a cached page.  The</div><div class='add'>+advantage to doing this is that multiple calls to get_page can be avoided</div><div class='add'>+which can be expensive at allocation time.  However due to the nature of</div><div class='add'>+this caching it is required that any calls to the cache be protected by</div><div class='add'>+either a per-cpu limitation, or a per-cpu limitation and forcing interrupts</div><div class='add'>+to be disabled when executing the fragment allocation.</div><div class='add'>+</div><div class='add'>+The network stack uses two separate caches per CPU to handle fragment</div><div class='add'>+allocation.  The netdev_alloc_cache is used by callers making use of the</div><div class='add'>+__netdev_alloc_frag and __netdev_alloc_skb calls.  The napi_alloc_cache is</div><div class='add'>+used by callers of the __napi_alloc_frag and __napi_alloc_skb calls.  The</div><div class='add'>+main difference between these two calls is the context in which they may be</div><div class='add'>+called.  The "netdev" prefixed functions are usable in any context as these</div><div class='add'>+functions will disable interrupts, while the "napi" prefixed functions are</div><div class='add'>+only usable within the softirq context.</div><div class='add'>+</div><div class='add'>+Many network device drivers use a similar methodology for allocating page</div><div class='add'>+fragments, but the page fragments are cached at the ring or descriptor</div><div class='add'>+level.  In order to enable these cases it is necessary to provide a generic</div><div class='add'>+way of tearing down a page cache.  For this reason __page_frag_cache_drain</div><div class='add'>+was implemented.  It allows for freeing multiple references from a single</div><div class='add'>+page via a single call.  The advantage to doing this is that it allows for</div><div class='add'>+cleaning up the multiple references that were added to a page in order to</div><div class='add'>+avoid calling get_page per allocation.</div><div class='add'>+</div><div class='add'>+Alexander Duyck, Nov 29, 2016.</div><div class='head'>diff --git a/Documentation/vm/transhuge.txt b/Documentation/vm/transhuge.txt<br/>index 2ec6adb5a4ce..cd28d5ee5273 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/vm/transhuge.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/vm/transhuge.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/vm/transhuge.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vm/transhuge.txt</a></div><div class='hunk'>@@ -110,6 +110,7 @@ MADV_HUGEPAGE region.</div><div class='ctx'> </div><div class='ctx'> echo always &gt;/sys/kernel/mm/transparent_hugepage/defrag</div><div class='ctx'> echo defer &gt;/sys/kernel/mm/transparent_hugepage/defrag</div><div class='add'>+echo defer+madvise &gt;/sys/kernel/mm/transparent_hugepage/defrag</div><div class='ctx'> echo madvise &gt;/sys/kernel/mm/transparent_hugepage/defrag</div><div class='ctx'> echo never &gt;/sys/kernel/mm/transparent_hugepage/defrag</div><div class='ctx'> </div><div class='hunk'>@@ -120,10 +121,15 @@ that benefit heavily from THP use and are willing to delay the VM start</div><div class='ctx'> to utilise them.</div><div class='ctx'> </div><div class='ctx'> "defer" means that an application will wake kswapd in the background</div><div class='del'>-to reclaim pages and wake kcompact to compact memory so that THP is</div><div class='add'>+to reclaim pages and wake kcompactd to compact memory so that THP is</div><div class='ctx'> available in the near future. It's the responsibility of khugepaged</div><div class='ctx'> to then install the THP pages later.</div><div class='ctx'> </div><div class='add'>+"defer+madvise" will enter direct reclaim and compaction like "always", but</div><div class='add'>+only for regions that have used madvise(MADV_HUGEPAGE); all other regions</div><div class='add'>+will wake kswapd in the background to reclaim pages and wake kcompactd to</div><div class='add'>+compact memory so that THP is available in the near future.</div><div class='add'>+</div><div class='ctx'> "madvise" will enter direct reclaim like "always" but only for regions</div><div class='ctx'> that are have used madvise(MADV_HUGEPAGE). This is the default behaviour.</div><div class='ctx'> </div><div class='hunk'>@@ -136,6 +142,11 @@ or enable it back by writing 1:</div><div class='ctx'> echo 0 &gt;/sys/kernel/mm/transparent_hugepage/use_zero_page</div><div class='ctx'> echo 1 &gt;/sys/kernel/mm/transparent_hugepage/use_zero_page</div><div class='ctx'> </div><div class='add'>+Some userspace (such as a test program, or an optimized memory allocation</div><div class='add'>+library) may want to know the size (in bytes) of a transparent hugepage:</div><div class='add'>+</div><div class='add'>+cat /sys/kernel/mm/transparent_hugepage/hpage_pmd_size</div><div class='add'>+</div><div class='ctx'> khugepaged will be automatically started when</div><div class='ctx'> transparent_hugepage/enabled is set to "always" or "madvise, and it'll</div><div class='ctx'> be automatically shutdown if it's set to "never".</div><div class='hunk'>@@ -291,7 +302,7 @@ thp_split_page is incremented every time a huge page is split into base</div><div class='ctx'> 	reason is that a huge page is old and is being reclaimed.</div><div class='ctx'> 	This action implies splitting all PMD the page mapped with.</div><div class='ctx'> </div><div class='del'>-thp_split_page_failed is is incremented if kernel fails to split huge</div><div class='add'>+thp_split_page_failed is incremented if kernel fails to split huge</div><div class='ctx'> 	page. This can happen if the page was pinned by somebody.</div><div class='ctx'> </div><div class='ctx'> thp_deferred_split_page is incremented when a huge page is put onto split</div><div class='head'>diff --git a/Documentation/vm/userfaultfd.txt b/Documentation/vm/userfaultfd.txt<br/>index 70a3c94d1941..0e5543a920e5 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/vm/userfaultfd.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/vm/userfaultfd.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/vm/userfaultfd.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/vm/userfaultfd.txt</a></div><div class='hunk'>@@ -54,6 +54,26 @@ uffdio_api.features and uffdio_api.ioctls two 64bit bitmasks of</div><div class='ctx'> respectively all the available features of the read(2) protocol and</div><div class='ctx'> the generic ioctl available.</div><div class='ctx'> </div><div class='add'>+The uffdio_api.features bitmask returned by the UFFDIO_API ioctl</div><div class='add'>+defines what memory types are supported by the userfaultfd and what</div><div class='add'>+events, except page fault notifications, may be generated.</div><div class='add'>+</div><div class='add'>+If the kernel supports registering userfaultfd ranges on hugetlbfs</div><div class='add'>+virtual memory areas, UFFD_FEATURE_MISSING_HUGETLBFS will be set in</div><div class='add'>+uffdio_api.features. Similarly, UFFD_FEATURE_MISSING_SHMEM will be</div><div class='add'>+set if the kernel supports registering userfaultfd ranges on shared</div><div class='add'>+memory (covering all shmem APIs, i.e. tmpfs, IPCSHM, /dev/zero</div><div class='add'>+MAP_SHARED, memfd_create, etc).</div><div class='add'>+</div><div class='add'>+The userland application that wants to use userfaultfd with hugetlbfs</div><div class='add'>+or shared memory need to set the corresponding flag in</div><div class='add'>+uffdio_api.features to enable those features.</div><div class='add'>+</div><div class='add'>+If the userland desires to receive notifications for events other than</div><div class='add'>+page faults, it has to verify that uffdio_api.features has appropriate</div><div class='add'>+UFFD_FEATURE_EVENT_* bits set. These events are described in more</div><div class='add'>+detail below in "Non-cooperative userfaultfd" section.</div><div class='add'>+</div><div class='ctx'> Once the userfaultfd has been enabled the UFFDIO_REGISTER ioctl should</div><div class='ctx'> be invoked (if present in the returned uffdio_api.ioctls bitmask) to</div><div class='ctx'> register a memory range in the userfaultfd by setting the</div><div class='hunk'>@@ -129,7 +149,7 @@ migration thread in the QEMU running in the destination node will</div><div class='ctx'> receive the page that triggered the userfault and it'll map it as</div><div class='ctx'> usual with the UFFDIO_COPY|ZEROPAGE (without actually knowing if it</div><div class='ctx'> was spontaneously sent by the source or if it was an urgent page</div><div class='del'>-requested through an userfault).</div><div class='add'>+requested through a userfault).</div><div class='ctx'> </div><div class='ctx'> By the time the userfaults start, the QEMU in the destination node</div><div class='ctx'> doesn't need to keep any per-page state bitmap relative to the live</div><div class='hunk'>@@ -142,3 +162,72 @@ course the bitmap is updated accordingly. It's also useful to avoid</div><div class='ctx'> sending the same page twice (in case the userfault is read by the</div><div class='ctx'> postcopy thread just before UFFDIO_COPY|ZEROPAGE runs in the migration</div><div class='ctx'> thread).</div><div class='add'>+</div><div class='add'>+== Non-cooperative userfaultfd ==</div><div class='add'>+</div><div class='add'>+When the userfaultfd is monitored by an external manager, the manager</div><div class='add'>+must be able to track changes in the process virtual memory</div><div class='add'>+layout. Userfaultfd can notify the manager about such changes using</div><div class='add'>+the same read(2) protocol as for the page fault notifications. The</div><div class='add'>+manager has to explicitly enable these events by setting appropriate</div><div class='add'>+bits in uffdio_api.features passed to UFFDIO_API ioctl:</div><div class='add'>+</div><div class='add'>+UFFD_FEATURE_EVENT_EXIT - enable notification about exit() of the</div><div class='add'>+non-cooperative process. When the monitored process exits, the uffd</div><div class='add'>+manager will get UFFD_EVENT_EXIT.</div><div class='add'>+</div><div class='add'>+UFFD_FEATURE_EVENT_FORK - enable userfaultfd hooks for fork(). When</div><div class='add'>+this feature is enabled, the userfaultfd context of the parent process</div><div class='add'>+is duplicated into the newly created process. The manager receives</div><div class='add'>+UFFD_EVENT_FORK with file descriptor of the new userfaultfd context in</div><div class='add'>+the uffd_msg.fork.</div><div class='add'>+</div><div class='add'>+UFFD_FEATURE_EVENT_REMAP - enable notifications about mremap()</div><div class='add'>+calls. When the non-cooperative process moves a virtual memory area to</div><div class='add'>+a different location, the manager will receive UFFD_EVENT_REMAP. The</div><div class='add'>+uffd_msg.remap will contain the old and new addresses of the area and</div><div class='add'>+its original length.</div><div class='add'>+</div><div class='add'>+UFFD_FEATURE_EVENT_REMOVE - enable notifications about</div><div class='add'>+madvise(MADV_REMOVE) and madvise(MADV_DONTNEED) calls. The event</div><div class='add'>+UFFD_EVENT_REMOVE will be generated upon these calls to madvise. The</div><div class='add'>+uffd_msg.remove will contain start and end addresses of the removed</div><div class='add'>+area.</div><div class='add'>+</div><div class='add'>+UFFD_FEATURE_EVENT_UNMAP - enable notifications about memory</div><div class='add'>+unmapping. The manager will get UFFD_EVENT_UNMAP with uffd_msg.remove</div><div class='add'>+containing start and end addresses of the unmapped area.</div><div class='add'>+</div><div class='add'>+Although the UFFD_FEATURE_EVENT_REMOVE and UFFD_FEATURE_EVENT_UNMAP</div><div class='add'>+are pretty similar, they quite differ in the action expected from the</div><div class='add'>+userfaultfd manager. In the former case, the virtual memory is</div><div class='add'>+removed, but the area is not, the area remains monitored by the</div><div class='add'>+userfaultfd, and if a page fault occurs in that area it will be</div><div class='add'>+delivered to the manager. The proper resolution for such page fault is</div><div class='add'>+to zeromap the faulting address. However, in the latter case, when an</div><div class='add'>+area is unmapped, either explicitly (with munmap() system call), or</div><div class='add'>+implicitly (e.g. during mremap()), the area is removed and in turn the</div><div class='add'>+userfaultfd context for such area disappears too and the manager will</div><div class='add'>+not get further userland page faults from the removed area. Still, the</div><div class='add'>+notification is required in order to prevent manager from using</div><div class='add'>+UFFDIO_COPY on the unmapped area.</div><div class='add'>+</div><div class='add'>+Unlike userland page faults which have to be synchronous and require</div><div class='add'>+explicit or implicit wakeup, all the events are delivered</div><div class='add'>+asynchronously and the non-cooperative process resumes execution as</div><div class='add'>+soon as manager executes read(). The userfaultfd manager should</div><div class='add'>+carefully synchronize calls to UFFDIO_COPY with the events</div><div class='add'>+processing. To aid the synchronization, the UFFDIO_COPY ioctl will</div><div class='add'>+return -ENOSPC when the monitored process exits at the time of</div><div class='add'>+UFFDIO_COPY, and -ENOENT, when the non-cooperative process has changed</div><div class='add'>+its virtual memory layout simultaneously with outstanding UFFDIO_COPY</div><div class='add'>+operation.</div><div class='add'>+</div><div class='add'>+The current asynchronous model of the event delivery is optimal for</div><div class='add'>+single threaded non-cooperative userfaultfd manager implementations. A</div><div class='add'>+synchronous event delivery model can be added later as a new</div><div class='add'>+userfaultfd feature to facilitate multithreading enhancements of the</div><div class='add'>+non cooperative manager, for example to allow UFFDIO_COPY ioctls to</div><div class='add'>+run in parallel to the event reception. Single threaded</div><div class='add'>+implementations should continue to use the current async event</div><div class='add'>+delivery model instead.</div><div class='head'>diff --git a/Documentation/vme_api.txt b/Documentation/vme_api.txt<br/>deleted file mode 100644<br/>index 90006550f485..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/vme_api.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/vme_api.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,413 +0,0 @@</div><div class='del'>-			VME Device Driver API</div><div class='del'>-			=====================</div><div class='del'>-</div><div class='del'>-Driver registration</div><div class='del'>-===================</div><div class='del'>-</div><div class='del'>-As with other subsystems within the Linux kernel, VME device drivers register</div><div class='del'>-with the VME subsystem, typically called from the devices init routine.  This is</div><div class='del'>-achieved via a call to the following function:</div><div class='del'>-</div><div class='del'>-	int vme_register_driver (struct vme_driver *driver, unsigned int ndevs);</div><div class='del'>-</div><div class='del'>-If driver registration is successful this function returns zero, if an error</div><div class='del'>-occurred a negative error code will be returned.</div><div class='del'>-</div><div class='del'>-A pointer to a structure of type 'vme_driver' must be provided to the</div><div class='del'>-registration function. Along with ndevs, which is the number of devices your</div><div class='del'>-driver is able to support. The structure is as follows:</div><div class='del'>-</div><div class='del'>-	struct vme_driver {</div><div class='del'>-		struct list_head node;</div><div class='del'>-		const char *name;</div><div class='del'>-		int (*match)(struct vme_dev *);</div><div class='del'>-		int (*probe)(struct vme_dev *);</div><div class='del'>-		int (*remove)(struct vme_dev *);</div><div class='del'>-		void (*shutdown)(void);</div><div class='del'>-		struct device_driver driver;</div><div class='del'>-		struct list_head devices;</div><div class='del'>-		unsigned int ndev;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-At the minimum, the '.name', '.match' and '.probe' elements of this structure</div><div class='del'>-should be correctly set. The '.name' element is a pointer to a string holding</div><div class='del'>-the device driver's name.</div><div class='del'>-</div><div class='del'>-The '.match' function allows control over which VME devices should be registered</div><div class='del'>-with the driver. The match function should return 1 if a device should be</div><div class='del'>-probed and 0 otherwise. This example match function (from vme_user.c) limits</div><div class='del'>-the number of devices probed to one:</div><div class='del'>-</div><div class='del'>-	#define USER_BUS_MAX	1</div><div class='del'>-	...</div><div class='del'>-	static int vme_user_match(struct vme_dev *vdev)</div><div class='del'>-	{</div><div class='del'>-		if (vdev-&gt;id.num &gt;= USER_BUS_MAX)</div><div class='del'>-			return 0;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-The '.probe' element should contain a pointer to the probe routine. The</div><div class='del'>-probe routine is passed a 'struct vme_dev' pointer as an argument. The</div><div class='del'>-'struct vme_dev' structure looks like the following:</div><div class='del'>-</div><div class='del'>-	struct vme_dev {</div><div class='del'>-		int num;</div><div class='del'>-		struct vme_bridge *bridge;</div><div class='del'>-		struct device dev;</div><div class='del'>-		struct list_head drv_list;</div><div class='del'>-		struct list_head bridge_list;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-Here, the 'num' field refers to the sequential device ID for this specific</div><div class='del'>-driver. The bridge number (or bus number) can be accessed using</div><div class='del'>-dev-&gt;bridge-&gt;num.</div><div class='del'>-</div><div class='del'>-A function is also provided to unregister the driver from the VME core and is</div><div class='del'>-usually called from the device driver's exit routine:</div><div class='del'>-</div><div class='del'>-	void vme_unregister_driver (struct vme_driver *driver);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Resource management</div><div class='del'>-===================</div><div class='del'>-</div><div class='del'>-Once a driver has registered with the VME core the provided match routine will</div><div class='del'>-be called the number of times specified during the registration. If a match</div><div class='del'>-succeeds, a non-zero value should be returned. A zero return value indicates</div><div class='del'>-failure. For all successful matches, the probe routine of the corresponding</div><div class='del'>-driver is called. The probe routine is passed a pointer to the devices</div><div class='del'>-device structure. This pointer should be saved, it will be required for</div><div class='del'>-requesting VME resources.</div><div class='del'>-</div><div class='del'>-The driver can request ownership of one or more master windows, slave windows</div><div class='del'>-and/or dma channels. Rather than allowing the device driver to request a</div><div class='del'>-specific window or DMA channel (which may be used by a different driver) this</div><div class='del'>-driver allows a resource to be assigned based on the required attributes of the</div><div class='del'>-driver in question:</div><div class='del'>-</div><div class='del'>-	struct vme_resource * vme_master_request(struct vme_dev *dev,</div><div class='del'>-		u32 aspace, u32 cycle, u32 width);</div><div class='del'>-</div><div class='del'>-	struct vme_resource * vme_slave_request(struct vme_dev *dev, u32 aspace,</div><div class='del'>-		u32 cycle);</div><div class='del'>-</div><div class='del'>-	struct vme_resource *vme_dma_request(struct vme_dev *dev, u32 route);</div><div class='del'>-</div><div class='del'>-For slave windows these attributes are split into the VME address spaces that</div><div class='del'>-need to be accessed in 'aspace' and VME bus cycle types required in 'cycle'.</div><div class='del'>-Master windows add a further set of attributes in 'width' specifying the</div><div class='del'>-required data transfer widths. These attributes are defined as bitmasks and as</div><div class='del'>-such any combination of the attributes can be requested for a single window,</div><div class='del'>-the core will assign a window that meets the requirements, returning a pointer</div><div class='del'>-of type vme_resource that should be used to identify the allocated resource</div><div class='del'>-when it is used. For DMA controllers, the request function requires the</div><div class='del'>-potential direction of any transfers to be provided in the route attributes.</div><div class='del'>-This is typically VME-to-MEM and/or MEM-to-VME, though some hardware can</div><div class='del'>-support VME-to-VME and MEM-to-MEM transfers as well as test pattern generation.</div><div class='del'>-If an unallocated window fitting the requirements can not be found a NULL</div><div class='del'>-pointer will be returned.</div><div class='del'>-</div><div class='del'>-Functions are also provided to free window allocations once they are no longer</div><div class='del'>-required. These functions should be passed the pointer to the resource provided</div><div class='del'>-during resource allocation:</div><div class='del'>-</div><div class='del'>-	void vme_master_free(struct vme_resource *res);</div><div class='del'>-</div><div class='del'>-	void vme_slave_free(struct vme_resource *res);</div><div class='del'>-</div><div class='del'>-	void vme_dma_free(struct vme_resource *res);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Master windows</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-Master windows provide access from the local processor[s] out onto the VME bus.</div><div class='del'>-The number of windows available and the available access modes is dependent on</div><div class='del'>-the underlying chipset. A window must be configured before it can be used.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Master window configuration</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='del'>-Once a master window has been assigned the following functions can be used to</div><div class='del'>-configure it and retrieve the current settings:</div><div class='del'>-</div><div class='del'>-	int vme_master_set (struct vme_resource *res, int enabled,</div><div class='del'>-		unsigned long long base, unsigned long long size, u32 aspace,</div><div class='del'>-		u32 cycle, u32 width);</div><div class='del'>-</div><div class='del'>-	int vme_master_get (struct vme_resource *res, int *enabled,</div><div class='del'>-		unsigned long long *base, unsigned long long *size, u32 *aspace,</div><div class='del'>-		u32 *cycle, u32 *width);</div><div class='del'>-</div><div class='del'>-The address spaces, transfer widths and cycle types are the same as described</div><div class='del'>-under resource management, however some of the options are mutually exclusive.</div><div class='del'>-For example, only one address space may be specified.</div><div class='del'>-</div><div class='del'>-These functions return 0 on success or an error code should the call fail.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Master window access</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-The following functions can be used to read from and write to configured master</div><div class='del'>-windows. These functions return the number of bytes copied:</div><div class='del'>-</div><div class='del'>-	ssize_t vme_master_read(struct vme_resource *res, void *buf,</div><div class='del'>-		size_t count, loff_t offset);</div><div class='del'>-</div><div class='del'>-	ssize_t vme_master_write(struct vme_resource *res, void *buf,</div><div class='del'>-		size_t count, loff_t offset);</div><div class='del'>-</div><div class='del'>-In addition to simple reads and writes, a function is provided to do a</div><div class='del'>-read-modify-write transaction. This function returns the original value of the</div><div class='del'>-VME bus location :</div><div class='del'>-</div><div class='del'>-	unsigned int vme_master_rmw (struct vme_resource *res,</div><div class='del'>-		unsigned int mask, unsigned int compare, unsigned int swap,</div><div class='del'>-		loff_t offset);</div><div class='del'>-</div><div class='del'>-This functions by reading the offset, applying the mask. If the bits selected in</div><div class='del'>-the mask match with the values of the corresponding bits in the compare field,</div><div class='del'>-the value of swap is written the specified offset.</div><div class='del'>-</div><div class='del'>-Parts of a VME window can be mapped into user space memory using the following</div><div class='del'>-function:</div><div class='del'>-</div><div class='del'>-	int vme_master_mmap(struct vme_resource *resource,</div><div class='del'>-		struct vm_area_struct *vma)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Slave windows</div><div class='del'>-=============</div><div class='del'>-</div><div class='del'>-Slave windows provide devices on the VME bus access into mapped portions of the</div><div class='del'>-local memory. The number of windows available and the access modes that can be</div><div class='del'>-used is dependent on the underlying chipset. A window must be configured before</div><div class='del'>-it can be used.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Slave window configuration</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-Once a slave window has been assigned the following functions can be used to</div><div class='del'>-configure it and retrieve the current settings:</div><div class='del'>-</div><div class='del'>-	int vme_slave_set (struct vme_resource *res, int enabled,</div><div class='del'>-		unsigned long long base, unsigned long long size,</div><div class='del'>-		dma_addr_t mem, u32 aspace, u32 cycle);</div><div class='del'>-</div><div class='del'>-	int vme_slave_get (struct vme_resource *res, int *enabled,</div><div class='del'>-		unsigned long long *base, unsigned long long *size,</div><div class='del'>-		dma_addr_t *mem, u32 *aspace, u32 *cycle);</div><div class='del'>-</div><div class='del'>-The address spaces, transfer widths and cycle types are the same as described</div><div class='del'>-under resource management, however some of the options are mutually exclusive.</div><div class='del'>-For example, only one address space may be specified.</div><div class='del'>-</div><div class='del'>-These functions return 0 on success or an error code should the call fail.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Slave window buffer allocation</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-Functions are provided to allow the user to allocate and free a contiguous</div><div class='del'>-buffers which will be accessible by the VME bridge. These functions do not have</div><div class='del'>-to be used, other methods can be used to allocate a buffer, though care must be</div><div class='del'>-taken to ensure that they are contiguous and accessible by the VME bridge:</div><div class='del'>-</div><div class='del'>-	void * vme_alloc_consistent(struct vme_resource *res, size_t size,</div><div class='del'>-		dma_addr_t *mem);</div><div class='del'>-</div><div class='del'>-	void vme_free_consistent(struct vme_resource *res, size_t size,</div><div class='del'>-		void *virt,	dma_addr_t mem);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Slave window access</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-Slave windows map local memory onto the VME bus, the standard methods for</div><div class='del'>-accessing memory should be used.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-DMA channels</div><div class='del'>-============</div><div class='del'>-</div><div class='del'>-The VME DMA transfer provides the ability to run link-list DMA transfers. The</div><div class='del'>-API introduces the concept of DMA lists. Each DMA list is a link-list which can</div><div class='del'>-be passed to a DMA controller. Multiple lists can be created, extended,</div><div class='del'>-executed, reused and destroyed.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-List Management</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-The following functions are provided to create and destroy DMA lists. Execution</div><div class='del'>-of a list will not automatically destroy the list, thus enabling a list to be</div><div class='del'>-reused for repetitive tasks:</div><div class='del'>-</div><div class='del'>-	struct vme_dma_list *vme_new_dma_list(struct vme_resource *res);</div><div class='del'>-</div><div class='del'>-	int vme_dma_list_free(struct vme_dma_list *list);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-List Population</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-An item can be added to a list using the following function ( the source and</div><div class='del'>-destination attributes need to be created before calling this function, this is</div><div class='del'>-covered under "Transfer Attributes"):</div><div class='del'>-</div><div class='del'>-	int vme_dma_list_add(struct vme_dma_list *list,</div><div class='del'>-		struct vme_dma_attr *src, struct vme_dma_attr *dest,</div><div class='del'>-		size_t count);</div><div class='del'>-</div><div class='del'>-NOTE:	The detailed attributes of the transfers source and destination</div><div class='del'>-	are not checked until an entry is added to a DMA list, the request</div><div class='del'>-	for a DMA channel purely checks the directions in which the</div><div class='del'>-	controller is expected to transfer data. As a result it is</div><div class='del'>-	possible for this call to return an error, for example if the</div><div class='del'>-	source or destination is in an unsupported VME address space.</div><div class='del'>-</div><div class='del'>-Transfer Attributes</div><div class='del'>--------------------</div><div class='del'>-</div><div class='del'>-The attributes for the source and destination are handled separately from adding</div><div class='del'>-an item to a list. This is due to the diverse attributes required for each type</div><div class='del'>-of source and destination. There are functions to create attributes for PCI, VME</div><div class='del'>-and pattern sources and destinations (where appropriate):</div><div class='del'>-</div><div class='del'>-Pattern source:</div><div class='del'>-</div><div class='del'>-	struct vme_dma_attr *vme_dma_pattern_attribute(u32 pattern, u32 type);</div><div class='del'>-</div><div class='del'>-PCI source or destination:</div><div class='del'>-</div><div class='del'>-	struct vme_dma_attr *vme_dma_pci_attribute(dma_addr_t mem);</div><div class='del'>-</div><div class='del'>-VME source or destination:</div><div class='del'>-</div><div class='del'>-	struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long base,</div><div class='del'>-		u32 aspace, u32 cycle, u32 width);</div><div class='del'>-</div><div class='del'>-The following function should be used to free an attribute:</div><div class='del'>-</div><div class='del'>-	void vme_dma_free_attribute(struct vme_dma_attr *attr);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-List Execution</div><div class='del'>---------------</div><div class='del'>-</div><div class='del'>-The following function queues a list for execution. The function will return</div><div class='del'>-once the list has been executed:</div><div class='del'>-</div><div class='del'>-	int vme_dma_list_exec(struct vme_dma_list *list);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Interrupts</div><div class='del'>-==========</div><div class='del'>-</div><div class='del'>-The VME API provides functions to attach and detach callbacks to specific VME</div><div class='del'>-level and status ID combinations and for the generation of VME interrupts with</div><div class='del'>-specific VME level and status IDs.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Attaching Interrupt Handlers</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-The following functions can be used to attach and free a specific VME level and</div><div class='del'>-status ID combination. Any given combination can only be assigned a single</div><div class='del'>-callback function. A void pointer parameter is provided, the value of which is</div><div class='del'>-passed to the callback function, the use of this pointer is user undefined:</div><div class='del'>-</div><div class='del'>-	int vme_irq_request(struct vme_dev *dev, int level, int statid,</div><div class='del'>-		void (*callback)(int, int, void *), void *priv);</div><div class='del'>-</div><div class='del'>-	void vme_irq_free(struct vme_dev *dev, int level, int statid);</div><div class='del'>-</div><div class='del'>-The callback parameters are as follows. Care must be taken in writing a callback</div><div class='del'>-function, callback functions run in interrupt context:</div><div class='del'>-</div><div class='del'>-	void callback(int level, int statid, void *priv);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Interrupt Generation</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-The following function can be used to generate a VME interrupt at a given VME</div><div class='del'>-level and VME status ID:</div><div class='del'>-</div><div class='del'>-	int vme_irq_generate(struct vme_dev *dev, int level, int statid);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Location monitors</div><div class='del'>-=================</div><div class='del'>-</div><div class='del'>-The VME API provides the following functionality to configure the location</div><div class='del'>-monitor.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Location Monitor Management</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='del'>-The following functions are provided to request the use of a block of location</div><div class='del'>-monitors and to free them after they are no longer required:</div><div class='del'>-</div><div class='del'>-	struct vme_resource * vme_lm_request(struct vme_dev *dev);</div><div class='del'>-</div><div class='del'>-	void vme_lm_free(struct vme_resource * res);</div><div class='del'>-</div><div class='del'>-Each block may provide a number of location monitors, monitoring adjacent</div><div class='del'>-locations. The following function can be used to determine how many locations</div><div class='del'>-are provided:</div><div class='del'>-</div><div class='del'>-	int vme_lm_count(struct vme_resource * res);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Location Monitor Configuration</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-Once a bank of location monitors has been allocated, the following functions</div><div class='del'>-are provided to configure the location and mode of the location monitor:</div><div class='del'>-</div><div class='del'>-	int vme_lm_set(struct vme_resource *res, unsigned long long base,</div><div class='del'>-		u32 aspace, u32 cycle);</div><div class='del'>-</div><div class='del'>-	int vme_lm_get(struct vme_resource *res, unsigned long long *base,</div><div class='del'>-		u32 *aspace, u32 *cycle);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Location Monitor Use</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-The following functions allow a callback to be attached and detached from each</div><div class='del'>-location monitor location. Each location monitor can monitor a number of</div><div class='del'>-adjacent locations:</div><div class='del'>-</div><div class='del'>-	int vme_lm_attach(struct vme_resource *res, int num,</div><div class='del'>-		void (*callback)(void *));</div><div class='del'>-</div><div class='del'>-	int vme_lm_detach(struct vme_resource *res, int num);</div><div class='del'>-</div><div class='del'>-The callback function is declared as follows.</div><div class='del'>-</div><div class='del'>-	void callback(void *data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Slot Detection</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-This function returns the slot ID of the provided bridge.</div><div class='del'>-</div><div class='del'>-	int vme_slot_num(struct vme_dev *dev);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Bus Detection</div><div class='del'>-=============</div><div class='del'>-</div><div class='del'>-This function returns the bus ID of the provided bridge.</div><div class='del'>-</div><div class='del'>-	int vme_bus_num(struct vme_dev *dev);</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/volatile-considered-harmful.txt b/Documentation/volatile-considered-harmful.txt<br/>deleted file mode 100644<br/>index db0cb228d64a..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/volatile-considered-harmful.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/volatile-considered-harmful.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,119 +0,0 @@</div><div class='del'>-Why the "volatile" type class should not be used</div><div class='del'>-------------------------------------------------</div><div class='del'>-</div><div class='del'>-C programmers have often taken volatile to mean that the variable could be</div><div class='del'>-changed outside of the current thread of execution; as a result, they are</div><div class='del'>-sometimes tempted to use it in kernel code when shared data structures are</div><div class='del'>-being used.  In other words, they have been known to treat volatile types</div><div class='del'>-as a sort of easy atomic variable, which they are not.  The use of volatile in</div><div class='del'>-kernel code is almost never correct; this document describes why.</div><div class='del'>-</div><div class='del'>-The key point to understand with regard to volatile is that its purpose is</div><div class='del'>-to suppress optimization, which is almost never what one really wants to</div><div class='del'>-do.  In the kernel, one must protect shared data structures against</div><div class='del'>-unwanted concurrent access, which is very much a different task.  The</div><div class='del'>-process of protecting against unwanted concurrency will also avoid almost</div><div class='del'>-all optimization-related problems in a more efficient way.</div><div class='del'>-</div><div class='del'>-Like volatile, the kernel primitives which make concurrent access to data</div><div class='del'>-safe (spinlocks, mutexes, memory barriers, etc.) are designed to prevent</div><div class='del'>-unwanted optimization.  If they are being used properly, there will be no</div><div class='del'>-need to use volatile as well.  If volatile is still necessary, there is</div><div class='del'>-almost certainly a bug in the code somewhere.  In properly-written kernel</div><div class='del'>-code, volatile can only serve to slow things down.</div><div class='del'>-</div><div class='del'>-Consider a typical block of kernel code:</div><div class='del'>-</div><div class='del'>-    spin_lock(&amp;the_lock);</div><div class='del'>-    do_something_on(&amp;shared_data);</div><div class='del'>-    do_something_else_with(&amp;shared_data);</div><div class='del'>-    spin_unlock(&amp;the_lock);</div><div class='del'>-</div><div class='del'>-If all the code follows the locking rules, the value of shared_data cannot</div><div class='del'>-change unexpectedly while the_lock is held.  Any other code which might</div><div class='del'>-want to play with that data will be waiting on the lock.  The spinlock</div><div class='del'>-primitives act as memory barriers - they are explicitly written to do so -</div><div class='del'>-meaning that data accesses will not be optimized across them.  So the</div><div class='del'>-compiler might think it knows what will be in shared_data, but the</div><div class='del'>-spin_lock() call, since it acts as a memory barrier, will force it to</div><div class='del'>-forget anything it knows.  There will be no optimization problems with</div><div class='del'>-accesses to that data.</div><div class='del'>-</div><div class='del'>-If shared_data were declared volatile, the locking would still be</div><div class='del'>-necessary.  But the compiler would also be prevented from optimizing access</div><div class='del'>-to shared_data _within_ the critical section, when we know that nobody else</div><div class='del'>-can be working with it.  While the lock is held, shared_data is not</div><div class='del'>-volatile.  When dealing with shared data, proper locking makes volatile</div><div class='del'>-unnecessary - and potentially harmful.</div><div class='del'>-</div><div class='del'>-The volatile storage class was originally meant for memory-mapped I/O</div><div class='del'>-registers.  Within the kernel, register accesses, too, should be protected</div><div class='del'>-by locks, but one also does not want the compiler "optimizing" register</div><div class='del'>-accesses within a critical section.  But, within the kernel, I/O memory</div><div class='del'>-accesses are always done through accessor functions; accessing I/O memory</div><div class='del'>-directly through pointers is frowned upon and does not work on all</div><div class='del'>-architectures.  Those accessors are written to prevent unwanted</div><div class='del'>-optimization, so, once again, volatile is unnecessary.</div><div class='del'>-</div><div class='del'>-Another situation where one might be tempted to use volatile is</div><div class='del'>-when the processor is busy-waiting on the value of a variable.  The right</div><div class='del'>-way to perform a busy wait is:</div><div class='del'>-</div><div class='del'>-    while (my_variable != what_i_want)</div><div class='del'>-        cpu_relax();</div><div class='del'>-</div><div class='del'>-The cpu_relax() call can lower CPU power consumption or yield to a</div><div class='del'>-hyperthreaded twin processor; it also happens to serve as a compiler</div><div class='del'>-barrier, so, once again, volatile is unnecessary.  Of course, busy-</div><div class='del'>-waiting is generally an anti-social act to begin with.</div><div class='del'>-</div><div class='del'>-There are still a few rare situations where volatile makes sense in the</div><div class='del'>-kernel:</div><div class='del'>-</div><div class='del'>-  - The above-mentioned accessor functions might use volatile on</div><div class='del'>-    architectures where direct I/O memory access does work.  Essentially,</div><div class='del'>-    each accessor call becomes a little critical section on its own and</div><div class='del'>-    ensures that the access happens as expected by the programmer.</div><div class='del'>-</div><div class='del'>-  - Inline assembly code which changes memory, but which has no other</div><div class='del'>-    visible side effects, risks being deleted by GCC.  Adding the volatile</div><div class='del'>-    keyword to asm statements will prevent this removal.</div><div class='del'>-</div><div class='del'>-  - The jiffies variable is special in that it can have a different value</div><div class='del'>-    every time it is referenced, but it can be read without any special</div><div class='del'>-    locking.  So jiffies can be volatile, but the addition of other</div><div class='del'>-    variables of this type is strongly frowned upon.  Jiffies is considered</div><div class='del'>-    to be a "stupid legacy" issue (Linus's words) in this regard; fixing it</div><div class='del'>-    would be more trouble than it is worth.</div><div class='del'>-</div><div class='del'>-  - Pointers to data structures in coherent memory which might be modified</div><div class='del'>-    by I/O devices can, sometimes, legitimately be volatile.  A ring buffer</div><div class='del'>-    used by a network adapter, where that adapter changes pointers to</div><div class='del'>-    indicate which descriptors have been processed, is an example of this</div><div class='del'>-    type of situation.</div><div class='del'>-</div><div class='del'>-For most code, none of the above justifications for volatile apply.  As a</div><div class='del'>-result, the use of volatile is likely to be seen as a bug and will bring</div><div class='del'>-additional scrutiny to the code.  Developers who are tempted to use</div><div class='del'>-volatile should take a step back and think about what they are truly trying</div><div class='del'>-to accomplish.</div><div class='del'>-</div><div class='del'>-Patches to remove volatile variables are generally welcome - as long as</div><div class='del'>-they come with a justification which shows that the concurrency issues have</div><div class='del'>-been properly thought through.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-NOTES</div><div class='del'>------</div><div class='del'>-</div><div class='del'>-[1] http://lwn.net/Articles/233481/</div><div class='del'>-[2] http://lwn.net/Articles/233482/</div><div class='del'>-</div><div class='del'>-CREDITS</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-Original impetus and research by Randy Dunlap</div><div class='del'>-Written by Jonathan Corbet</div><div class='del'>-Improvements via comments from Satyam Sharma, Johannes Stezenbach, Jesper</div><div class='del'>-	Juhl, Heikki Orsila, H. Peter Anvin, Philipp Hahn, and Stefan</div><div class='del'>-	Richter.</div><div class='head'>diff --git a/Documentation/watchdog/convert_drivers_to_kernel_api.txt b/Documentation/watchdog/convert_drivers_to_kernel_api.txt<br/>index 271b8850dde7..9fffb2958d13 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/watchdog/convert_drivers_to_kernel_api.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/watchdog/convert_drivers_to_kernel_api.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/watchdog/convert_drivers_to_kernel_api.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/watchdog/convert_drivers_to_kernel_api.txt</a></div><div class='hunk'>@@ -213,6 +213,6 @@ The entry for the driver now needs to select WATCHDOG_CORE:</div><div class='ctx'> Create a patch and send it to upstream</div><div class='ctx'> --------------------------------------</div><div class='ctx'> </div><div class='del'>-Make sure you understood Documentation/SubmittingPatches and send your patch to</div><div class='add'>+Make sure you understood Documentation/process/submitting-patches.rst and send your patch to</div><div class='ctx'> linux-watchdog@vger.kernel.org. We are looking forward to it :)</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/watchdog/watchdog-kernel-api.txt b/Documentation/watchdog/watchdog-kernel-api.txt<br/>index ea277478982f..9b93953f69cf 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/watchdog/watchdog-kernel-api.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/watchdog/watchdog-kernel-api.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/watchdog/watchdog-kernel-api.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/watchdog/watchdog-kernel-api.txt</a></div><div class='hunk'>@@ -280,6 +280,12 @@ To disable the watchdog on reboot, the user must call the following helper:</div><div class='ctx'> </div><div class='ctx'> static inline void watchdog_stop_on_reboot(struct watchdog_device *wdd);</div><div class='ctx'> </div><div class='add'>+To disable the watchdog when unregistering the watchdog, the user must call</div><div class='add'>+the following helper. Note that this will only stop the watchdog if the</div><div class='add'>+nowayout flag is not set.</div><div class='add'>+</div><div class='add'>+static inline void watchdog_stop_on_unregister(struct watchdog_device *wdd);</div><div class='add'>+</div><div class='ctx'> To change the priority of the restart handler the following helper should be</div><div class='ctx'> used:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt<br/>index a8d364227a77..4f7d86dd0a5d 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/watchdog/watchdog-parameters.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/watchdog/watchdog-parameters.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/watchdog/watchdog-parameters.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/watchdog/watchdog-parameters.txt</a></div><div class='hunk'>@@ -4,7 +4,7 @@ be listed here unless the driver has its own driver-specific information</div><div class='ctx'> file.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-See Documentation/kernel-parameters.txt for information on</div><div class='add'>+See Documentation/admin-guide/kernel-parameters.rst for information on</div><div class='ctx'> providing kernel parameters for builtin drivers versus loadable</div><div class='ctx'> modules.</div><div class='ctx'> </div><div class='hunk'>@@ -209,6 +209,11 @@ timeout: Initial watchdog timeout in seconds (0&lt;timeout&lt;516, default=60)</div><div class='ctx'> nowayout: Watchdog cannot be stopped once started</div><div class='ctx'> 	(default=kernel config parameter)</div><div class='ctx'> -------------------------------------------------</div><div class='add'>+nic7018_wdt:</div><div class='add'>+timeout: Initial watchdog timeout in seconds (0&lt;timeout&lt;464, default=80)</div><div class='add'>+nowayout: Watchdog cannot be stopped once started</div><div class='add'>+	(default=kernel config parameter)</div><div class='add'>+-------------------------------------------------</div><div class='ctx'> nuc900_wdt:</div><div class='ctx'> heartbeat: Watchdog heartbeats in seconds.</div><div class='ctx'> 	(default = 15)</div><div class='head'>diff --git a/Documentation/workqueue.txt b/Documentation/workqueue.txt<br/>deleted file mode 100644<br/>index c49e3178178d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/workqueue.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/workqueue.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,388 +0,0 @@</div><div class='del'>-</div><div class='del'>-Concurrency Managed Workqueue (cmwq)</div><div class='del'>-</div><div class='del'>-September, 2010		Tejun Heo &lt;tj@kernel.org&gt;</div><div class='del'>-			Florian Mickler &lt;florian@mickler.org&gt;</div><div class='del'>-</div><div class='del'>-CONTENTS</div><div class='del'>-</div><div class='del'>-1. Introduction</div><div class='del'>-2. Why cmwq?</div><div class='del'>-3. The Design</div><div class='del'>-4. Application Programming Interface (API)</div><div class='del'>-5. Example Execution Scenarios</div><div class='del'>-6. Guidelines</div><div class='del'>-7. Debugging</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1. Introduction</div><div class='del'>-</div><div class='del'>-There are many cases where an asynchronous process execution context</div><div class='del'>-is needed and the workqueue (wq) API is the most commonly used</div><div class='del'>-mechanism for such cases.</div><div class='del'>-</div><div class='del'>-When such an asynchronous execution context is needed, a work item</div><div class='del'>-describing which function to execute is put on a queue.  An</div><div class='del'>-independent thread serves as the asynchronous execution context.  The</div><div class='del'>-queue is called workqueue and the thread is called worker.</div><div class='del'>-</div><div class='del'>-While there are work items on the workqueue the worker executes the</div><div class='del'>-functions associated with the work items one after the other.  When</div><div class='del'>-there is no work item left on the workqueue the worker becomes idle.</div><div class='del'>-When a new work item gets queued, the worker begins executing again.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2. Why cmwq?</div><div class='del'>-</div><div class='del'>-In the original wq implementation, a multi threaded (MT) wq had one</div><div class='del'>-worker thread per CPU and a single threaded (ST) wq had one worker</div><div class='del'>-thread system-wide.  A single MT wq needed to keep around the same</div><div class='del'>-number of workers as the number of CPUs.  The kernel grew a lot of MT</div><div class='del'>-wq users over the years and with the number of CPU cores continuously</div><div class='del'>-rising, some systems saturated the default 32k PID space just booting</div><div class='del'>-up.</div><div class='del'>-</div><div class='del'>-Although MT wq wasted a lot of resource, the level of concurrency</div><div class='del'>-provided was unsatisfactory.  The limitation was common to both ST and</div><div class='del'>-MT wq albeit less severe on MT.  Each wq maintained its own separate</div><div class='del'>-worker pool.  A MT wq could provide only one execution context per CPU</div><div class='del'>-while a ST wq one for the whole system.  Work items had to compete for</div><div class='del'>-those very limited execution contexts leading to various problems</div><div class='del'>-including proneness to deadlocks around the single execution context.</div><div class='del'>-</div><div class='del'>-The tension between the provided level of concurrency and resource</div><div class='del'>-usage also forced its users to make unnecessary tradeoffs like libata</div><div class='del'>-choosing to use ST wq for polling PIOs and accepting an unnecessary</div><div class='del'>-limitation that no two polling PIOs can progress at the same time.  As</div><div class='del'>-MT wq don't provide much better concurrency, users which require</div><div class='del'>-higher level of concurrency, like async or fscache, had to implement</div><div class='del'>-their own thread pool.</div><div class='del'>-</div><div class='del'>-Concurrency Managed Workqueue (cmwq) is a reimplementation of wq with</div><div class='del'>-focus on the following goals.</div><div class='del'>-</div><div class='del'>-* Maintain compatibility with the original workqueue API.</div><div class='del'>-</div><div class='del'>-* Use per-CPU unified worker pools shared by all wq to provide</div><div class='del'>-  flexible level of concurrency on demand without wasting a lot of</div><div class='del'>-  resource.</div><div class='del'>-</div><div class='del'>-* Automatically regulate worker pool and level of concurrency so that</div><div class='del'>-  the API users don't need to worry about such details.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3. The Design</div><div class='del'>-</div><div class='del'>-In order to ease the asynchronous execution of functions a new</div><div class='del'>-abstraction, the work item, is introduced.</div><div class='del'>-</div><div class='del'>-A work item is a simple struct that holds a pointer to the function</div><div class='del'>-that is to be executed asynchronously.  Whenever a driver or subsystem</div><div class='del'>-wants a function to be executed asynchronously it has to set up a work</div><div class='del'>-item pointing to that function and queue that work item on a</div><div class='del'>-workqueue.</div><div class='del'>-</div><div class='del'>-Special purpose threads, called worker threads, execute the functions</div><div class='del'>-off of the queue, one after the other.  If no work is queued, the</div><div class='del'>-worker threads become idle.  These worker threads are managed in so</div><div class='del'>-called worker-pools.</div><div class='del'>-</div><div class='del'>-The cmwq design differentiates between the user-facing workqueues that</div><div class='del'>-subsystems and drivers queue work items on and the backend mechanism</div><div class='del'>-which manages worker-pools and processes the queued work items.</div><div class='del'>-</div><div class='del'>-There are two worker-pools, one for normal work items and the other</div><div class='del'>-for high priority ones, for each possible CPU and some extra</div><div class='del'>-worker-pools to serve work items queued on unbound workqueues - the</div><div class='del'>-number of these backing pools is dynamic.</div><div class='del'>-</div><div class='del'>-Subsystems and drivers can create and queue work items through special</div><div class='del'>-workqueue API functions as they see fit. They can influence some</div><div class='del'>-aspects of the way the work items are executed by setting flags on the</div><div class='del'>-workqueue they are putting the work item on. These flags include</div><div class='del'>-things like CPU locality, concurrency limits, priority and more.  To</div><div class='del'>-get a detailed overview refer to the API description of</div><div class='del'>-alloc_workqueue() below.</div><div class='del'>-</div><div class='del'>-When a work item is queued to a workqueue, the target worker-pool is</div><div class='del'>-determined according to the queue parameters and workqueue attributes</div><div class='del'>-and appended on the shared worklist of the worker-pool.  For example,</div><div class='del'>-unless specifically overridden, a work item of a bound workqueue will</div><div class='del'>-be queued on the worklist of either normal or highpri worker-pool that</div><div class='del'>-is associated to the CPU the issuer is running on.</div><div class='del'>-</div><div class='del'>-For any worker pool implementation, managing the concurrency level</div><div class='del'>-(how many execution contexts are active) is an important issue.  cmwq</div><div class='del'>-tries to keep the concurrency at a minimal but sufficient level.</div><div class='del'>-Minimal to save resources and sufficient in that the system is used at</div><div class='del'>-its full capacity.</div><div class='del'>-</div><div class='del'>-Each worker-pool bound to an actual CPU implements concurrency</div><div class='del'>-management by hooking into the scheduler.  The worker-pool is notified</div><div class='del'>-whenever an active worker wakes up or sleeps and keeps track of the</div><div class='del'>-number of the currently runnable workers.  Generally, work items are</div><div class='del'>-not expected to hog a CPU and consume many cycles.  That means</div><div class='del'>-maintaining just enough concurrency to prevent work processing from</div><div class='del'>-stalling should be optimal.  As long as there are one or more runnable</div><div class='del'>-workers on the CPU, the worker-pool doesn't start execution of a new</div><div class='del'>-work, but, when the last running worker goes to sleep, it immediately</div><div class='del'>-schedules a new worker so that the CPU doesn't sit idle while there</div><div class='del'>-are pending work items.  This allows using a minimal number of workers</div><div class='del'>-without losing execution bandwidth.</div><div class='del'>-</div><div class='del'>-Keeping idle workers around doesn't cost other than the memory space</div><div class='del'>-for kthreads, so cmwq holds onto idle ones for a while before killing</div><div class='del'>-them.</div><div class='del'>-</div><div class='del'>-For unbound workqueues, the number of backing pools is dynamic.</div><div class='del'>-Unbound workqueue can be assigned custom attributes using</div><div class='del'>-apply_workqueue_attrs() and workqueue will automatically create</div><div class='del'>-backing worker pools matching the attributes.  The responsibility of</div><div class='del'>-regulating concurrency level is on the users.  There is also a flag to</div><div class='del'>-mark a bound wq to ignore the concurrency management.  Please refer to</div><div class='del'>-the API section for details.</div><div class='del'>-</div><div class='del'>-Forward progress guarantee relies on that workers can be created when</div><div class='del'>-more execution contexts are necessary, which in turn is guaranteed</div><div class='del'>-through the use of rescue workers.  All work items which might be used</div><div class='del'>-on code paths that handle memory reclaim are required to be queued on</div><div class='del'>-wq's that have a rescue-worker reserved for execution under memory</div><div class='del'>-pressure.  Else it is possible that the worker-pool deadlocks waiting</div><div class='del'>-for execution contexts to free up.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4. Application Programming Interface (API)</div><div class='del'>-</div><div class='del'>-alloc_workqueue() allocates a wq.  The original create_*workqueue()</div><div class='del'>-functions are deprecated and scheduled for removal.  alloc_workqueue()</div><div class='del'>-takes three arguments - @name, @flags and @max_active.  @name is the</div><div class='del'>-name of the wq and also used as the name of the rescuer thread if</div><div class='del'>-there is one.</div><div class='del'>-</div><div class='del'>-A wq no longer manages execution resources but serves as a domain for</div><div class='del'>-forward progress guarantee, flush and work item attributes.  @flags</div><div class='del'>-and @max_active control how work items are assigned execution</div><div class='del'>-resources, scheduled and executed.</div><div class='del'>-</div><div class='del'>-@flags:</div><div class='del'>-</div><div class='del'>-  WQ_UNBOUND</div><div class='del'>-</div><div class='del'>-	Work items queued to an unbound wq are served by the special</div><div class='del'>-	worker-pools which host workers which are not bound to any</div><div class='del'>-	specific CPU.  This makes the wq behave as a simple execution</div><div class='del'>-	context provider without concurrency management.  The unbound</div><div class='del'>-	worker-pools try to start execution of work items as soon as</div><div class='del'>-	possible.  Unbound wq sacrifices locality but is useful for</div><div class='del'>-	the following cases.</div><div class='del'>-</div><div class='del'>-	* Wide fluctuation in the concurrency level requirement is</div><div class='del'>-	  expected and using bound wq may end up creating large number</div><div class='del'>-	  of mostly unused workers across different CPUs as the issuer</div><div class='del'>-	  hops through different CPUs.</div><div class='del'>-</div><div class='del'>-	* Long running CPU intensive workloads which can be better</div><div class='del'>-	  managed by the system scheduler.</div><div class='del'>-</div><div class='del'>-  WQ_FREEZABLE</div><div class='del'>-</div><div class='del'>-	A freezable wq participates in the freeze phase of the system</div><div class='del'>-	suspend operations.  Work items on the wq are drained and no</div><div class='del'>-	new work item starts execution until thawed.</div><div class='del'>-</div><div class='del'>-  WQ_MEM_RECLAIM</div><div class='del'>-</div><div class='del'>-	All wq which might be used in the memory reclaim paths _MUST_</div><div class='del'>-	have this flag set.  The wq is guaranteed to have at least one</div><div class='del'>-	execution context regardless of memory pressure.</div><div class='del'>-</div><div class='del'>-  WQ_HIGHPRI</div><div class='del'>-</div><div class='del'>-	Work items of a highpri wq are queued to the highpri</div><div class='del'>-	worker-pool of the target cpu.  Highpri worker-pools are</div><div class='del'>-	served by worker threads with elevated nice level.</div><div class='del'>-</div><div class='del'>-	Note that normal and highpri worker-pools don't interact with</div><div class='del'>-	each other.  Each maintain its separate pool of workers and</div><div class='del'>-	implements concurrency management among its workers.</div><div class='del'>-</div><div class='del'>-  WQ_CPU_INTENSIVE</div><div class='del'>-</div><div class='del'>-	Work items of a CPU intensive wq do not contribute to the</div><div class='del'>-	concurrency level.  In other words, runnable CPU intensive</div><div class='del'>-	work items will not prevent other work items in the same</div><div class='del'>-	worker-pool from starting execution.  This is useful for bound</div><div class='del'>-	work items which are expected to hog CPU cycles so that their</div><div class='del'>-	execution is regulated by the system scheduler.</div><div class='del'>-</div><div class='del'>-	Although CPU intensive work items don't contribute to the</div><div class='del'>-	concurrency level, start of their executions is still</div><div class='del'>-	regulated by the concurrency management and runnable</div><div class='del'>-	non-CPU-intensive work items can delay execution of CPU</div><div class='del'>-	intensive work items.</div><div class='del'>-</div><div class='del'>-	This flag is meaningless for unbound wq.</div><div class='del'>-</div><div class='del'>-Note that the flag WQ_NON_REENTRANT no longer exists as all workqueues</div><div class='del'>-are now non-reentrant - any work item is guaranteed to be executed by</div><div class='del'>-at most one worker system-wide at any given time.</div><div class='del'>-</div><div class='del'>-@max_active:</div><div class='del'>-</div><div class='del'>-@max_active determines the maximum number of execution contexts per</div><div class='del'>-CPU which can be assigned to the work items of a wq.  For example,</div><div class='del'>-with @max_active of 16, at most 16 work items of the wq can be</div><div class='del'>-executing at the same time per CPU.</div><div class='del'>-</div><div class='del'>-Currently, for a bound wq, the maximum limit for @max_active is 512</div><div class='del'>-and the default value used when 0 is specified is 256.  For an unbound</div><div class='del'>-wq, the limit is higher of 512 and 4 * num_possible_cpus().  These</div><div class='del'>-values are chosen sufficiently high such that they are not the</div><div class='del'>-limiting factor while providing protection in runaway cases.</div><div class='del'>-</div><div class='del'>-The number of active work items of a wq is usually regulated by the</div><div class='del'>-users of the wq, more specifically, by how many work items the users</div><div class='del'>-may queue at the same time.  Unless there is a specific need for</div><div class='del'>-throttling the number of active work items, specifying '0' is</div><div class='del'>-recommended.</div><div class='del'>-</div><div class='del'>-Some users depend on the strict execution ordering of ST wq.  The</div><div class='del'>-combination of @max_active of 1 and WQ_UNBOUND is used to achieve this</div><div class='del'>-behavior.  Work items on such wq are always queued to the unbound</div><div class='del'>-worker-pools and only one work item can be active at any given time thus</div><div class='del'>-achieving the same ordering property as ST wq.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5. Example Execution Scenarios</div><div class='del'>-</div><div class='del'>-The following example execution scenarios try to illustrate how cmwq</div><div class='del'>-behave under different configurations.</div><div class='del'>-</div><div class='del'>- Work items w0, w1, w2 are queued to a bound wq q0 on the same CPU.</div><div class='del'>- w0 burns CPU for 5ms then sleeps for 10ms then burns CPU for 5ms</div><div class='del'>- again before finishing.  w1 and w2 burn CPU for 5ms then sleep for</div><div class='del'>- 10ms.</div><div class='del'>-</div><div class='del'>-Ignoring all other tasks, works and processing overhead, and assuming</div><div class='del'>-simple FIFO scheduling, the following is one highly simplified version</div><div class='del'>-of possible sequences of events with the original wq.</div><div class='del'>-</div><div class='del'>- TIME IN MSECS	EVENT</div><div class='del'>- 0		w0 starts and burns CPU</div><div class='del'>- 5		w0 sleeps</div><div class='del'>- 15		w0 wakes up and burns CPU</div><div class='del'>- 20		w0 finishes</div><div class='del'>- 20		w1 starts and burns CPU</div><div class='del'>- 25		w1 sleeps</div><div class='del'>- 35		w1 wakes up and finishes</div><div class='del'>- 35		w2 starts and burns CPU</div><div class='del'>- 40		w2 sleeps</div><div class='del'>- 50		w2 wakes up and finishes</div><div class='del'>-</div><div class='del'>-And with cmwq with @max_active &gt;= 3,</div><div class='del'>-</div><div class='del'>- TIME IN MSECS	EVENT</div><div class='del'>- 0		w0 starts and burns CPU</div><div class='del'>- 5		w0 sleeps</div><div class='del'>- 5		w1 starts and burns CPU</div><div class='del'>- 10		w1 sleeps</div><div class='del'>- 10		w2 starts and burns CPU</div><div class='del'>- 15		w2 sleeps</div><div class='del'>- 15		w0 wakes up and burns CPU</div><div class='del'>- 20		w0 finishes</div><div class='del'>- 20		w1 wakes up and finishes</div><div class='del'>- 25		w2 wakes up and finishes</div><div class='del'>-</div><div class='del'>-If @max_active == 2,</div><div class='del'>-</div><div class='del'>- TIME IN MSECS	EVENT</div><div class='del'>- 0		w0 starts and burns CPU</div><div class='del'>- 5		w0 sleeps</div><div class='del'>- 5		w1 starts and burns CPU</div><div class='del'>- 10		w1 sleeps</div><div class='del'>- 15		w0 wakes up and burns CPU</div><div class='del'>- 20		w0 finishes</div><div class='del'>- 20		w1 wakes up and finishes</div><div class='del'>- 20		w2 starts and burns CPU</div><div class='del'>- 25		w2 sleeps</div><div class='del'>- 35		w2 wakes up and finishes</div><div class='del'>-</div><div class='del'>-Now, let's assume w1 and w2 are queued to a different wq q1 which has</div><div class='del'>-WQ_CPU_INTENSIVE set,</div><div class='del'>-</div><div class='del'>- TIME IN MSECS	EVENT</div><div class='del'>- 0		w0 starts and burns CPU</div><div class='del'>- 5		w0 sleeps</div><div class='del'>- 5		w1 and w2 start and burn CPU</div><div class='del'>- 10		w1 sleeps</div><div class='del'>- 15		w2 sleeps</div><div class='del'>- 15		w0 wakes up and burns CPU</div><div class='del'>- 20		w0 finishes</div><div class='del'>- 20		w1 wakes up and finishes</div><div class='del'>- 25		w2 wakes up and finishes</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-6. Guidelines</div><div class='del'>-</div><div class='del'>-* Do not forget to use WQ_MEM_RECLAIM if a wq may process work items</div><div class='del'>-  which are used during memory reclaim.  Each wq with WQ_MEM_RECLAIM</div><div class='del'>-  set has an execution context reserved for it.  If there is</div><div class='del'>-  dependency among multiple work items used during memory reclaim,</div><div class='del'>-  they should be queued to separate wq each with WQ_MEM_RECLAIM.</div><div class='del'>-</div><div class='del'>-* Unless strict ordering is required, there is no need to use ST wq.</div><div class='del'>-</div><div class='del'>-* Unless there is a specific need, using 0 for @max_active is</div><div class='del'>-  recommended.  In most use cases, concurrency level usually stays</div><div class='del'>-  well under the default limit.</div><div class='del'>-</div><div class='del'>-* A wq serves as a domain for forward progress guarantee</div><div class='del'>-  (WQ_MEM_RECLAIM, flush and work item attributes.  Work items which</div><div class='del'>-  are not involved in memory reclaim and don't need to be flushed as a</div><div class='del'>-  part of a group of work items, and don't require any special</div><div class='del'>-  attribute, can use one of the system wq.  There is no difference in</div><div class='del'>-  execution characteristics between using a dedicated wq and a system</div><div class='del'>-  wq.</div><div class='del'>-</div><div class='del'>-* Unless work items are expected to consume a huge amount of CPU</div><div class='del'>-  cycles, using a bound wq is usually beneficial due to the increased</div><div class='del'>-  level of locality in wq operations and work item execution.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-7. Debugging</div><div class='del'>-</div><div class='del'>-Because the work functions are executed by generic worker threads</div><div class='del'>-there are a few tricks needed to shed some light on misbehaving</div><div class='del'>-workqueue users.</div><div class='del'>-</div><div class='del'>-Worker threads show up in the process list as:</div><div class='del'>-</div><div class='del'>-root      5671  0.0  0.0      0     0 ?        S    12:07   0:00 [kworker/0:1]</div><div class='del'>-root      5672  0.0  0.0      0     0 ?        S    12:07   0:00 [kworker/1:2]</div><div class='del'>-root      5673  0.0  0.0      0     0 ?        S    12:12   0:00 [kworker/0:0]</div><div class='del'>-root      5674  0.0  0.0      0     0 ?        S    12:13   0:00 [kworker/1:0]</div><div class='del'>-</div><div class='del'>-If kworkers are going crazy (using too much cpu), there are two types</div><div class='del'>-of possible problems:</div><div class='del'>-</div><div class='del'>-	1. Something being scheduled in rapid succession</div><div class='del'>-	2. A single work item that consumes lots of cpu cycles</div><div class='del'>-</div><div class='del'>-The first one can be tracked using tracing:</div><div class='del'>-</div><div class='del'>-	$ echo workqueue:workqueue_queue_work &gt; /sys/kernel/debug/tracing/set_event</div><div class='del'>-	$ cat /sys/kernel/debug/tracing/trace_pipe &gt; out.txt</div><div class='del'>-	(wait a few secs)</div><div class='del'>-	^C</div><div class='del'>-</div><div class='del'>-If something is busy looping on work queueing, it would be dominating</div><div class='del'>-the output and the offender can be determined with the work item</div><div class='del'>-function.</div><div class='del'>-</div><div class='del'>-For the second type of problems it should be possible to just check</div><div class='del'>-the stack trace of the offending worker thread.</div><div class='del'>-</div><div class='del'>-	$ cat /proc/THE_OFFENDING_KWORKER/stack</div><div class='del'>-</div><div class='del'>-The work item's function should be trivially visible in the stack</div><div class='del'>-trace.</div><div class='head'>diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt<br/>index 9da6f3512249..5e9b826b5f62 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/x86/boot.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/x86/boot.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/x86/boot.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/x86/boot.txt</a></div><div class='hunk'>@@ -921,7 +921,7 @@ They should normally not be deleted from the kernel command line even</div><div class='ctx'> though not all of them are actually meaningful to the kernel.  Boot</div><div class='ctx'> loader authors who need additional command line options for the boot</div><div class='ctx'> loader itself should get them registered in</div><div class='del'>-Documentation/kernel-parameters.txt to make sure they will not</div><div class='add'>+Documentation/admin-guide/kernel-parameters.rst to make sure they will not</div><div class='ctx'> conflict with actual kernel options now or in the future.</div><div class='ctx'> </div><div class='ctx'>   vga=&lt;mode&gt;</div><div class='head'>diff --git a/Documentation/x86/intel_rdt_ui.txt b/Documentation/x86/intel_rdt_ui.txt<br/>new file mode 100644<br/>index 000000000000..51cf6fa5591f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/Documentation/x86/intel_rdt_ui.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/x86/intel_rdt_ui.txt</a></div><div class='hunk'>@@ -0,0 +1,328 @@</div><div class='add'>+User Interface for Resource Allocation in Intel Resource Director Technology</div><div class='add'>+</div><div class='add'>+Copyright (C) 2016 Intel Corporation</div><div class='add'>+</div><div class='add'>+Fenghua Yu &lt;fenghua.yu@intel.com&gt;</div><div class='add'>+Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='add'>+</div><div class='add'>+This feature is enabled by the CONFIG_INTEL_RDT_A Kconfig and the</div><div class='add'>+X86 /proc/cpuinfo flag bits "rdt", "cat_l3" and "cdp_l3".</div><div class='add'>+</div><div class='add'>+To use the feature mount the file system:</div><div class='add'>+</div><div class='add'>+ # mount -t resctrl resctrl [-o cdp] /sys/fs/resctrl</div><div class='add'>+</div><div class='add'>+mount options are:</div><div class='add'>+</div><div class='add'>+"cdp": Enable code/data prioritization in L3 cache allocations.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Info directory</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+The 'info' directory contains information about the enabled</div><div class='add'>+resources. Each resource has its own subdirectory. The subdirectory</div><div class='add'>+names reflect the resource names. Each subdirectory contains the</div><div class='add'>+following files:</div><div class='add'>+</div><div class='add'>+"num_closids":  The number of CLOSIDs which are valid for this</div><div class='add'>+	        resource. The kernel uses the smallest number of</div><div class='add'>+		CLOSIDs of all enabled resources as limit.</div><div class='add'>+</div><div class='add'>+"cbm_mask":     The bitmask which is valid for this resource. This</div><div class='add'>+		mask is equivalent to 100%.</div><div class='add'>+</div><div class='add'>+"min_cbm_bits": The minimum number of consecutive bits which must be</div><div class='add'>+		set when writing a mask.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Resource groups</div><div class='add'>+---------------</div><div class='add'>+Resource groups are represented as directories in the resctrl file</div><div class='add'>+system. The default group is the root directory. Other groups may be</div><div class='add'>+created as desired by the system administrator using the "mkdir(1)"</div><div class='add'>+command, and removed using "rmdir(1)".</div><div class='add'>+</div><div class='add'>+There are three files associated with each group:</div><div class='add'>+</div><div class='add'>+"tasks": A list of tasks that belongs to this group. Tasks can be</div><div class='add'>+	added to a group by writing the task ID to the "tasks" file</div><div class='add'>+	(which will automatically remove them from the previous</div><div class='add'>+	group to which they belonged). New tasks created by fork(2)</div><div class='add'>+	and clone(2) are added to the same group as their parent.</div><div class='add'>+	If a pid is not in any sub partition, it is in root partition</div><div class='add'>+	(i.e. default partition).</div><div class='add'>+</div><div class='add'>+"cpus": A bitmask of logical CPUs assigned to this group. Writing</div><div class='add'>+	a new mask can add/remove CPUs from this group. Added CPUs</div><div class='add'>+	are removed from their previous group. Removed ones are</div><div class='add'>+	given to the default (root) group. You cannot remove CPUs</div><div class='add'>+	from the default group.</div><div class='add'>+</div><div class='add'>+"schemata": A list of all the resources available to this group.</div><div class='add'>+	Each resource has its own line and format - see below for</div><div class='add'>+	details.</div><div class='add'>+</div><div class='add'>+When a task is running the following rules define which resources</div><div class='add'>+are available to it:</div><div class='add'>+</div><div class='add'>+1) If the task is a member of a non-default group, then the schemata</div><div class='add'>+for that group is used.</div><div class='add'>+</div><div class='add'>+2) Else if the task belongs to the default group, but is running on a</div><div class='add'>+CPU that is assigned to some specific group, then the schemata for</div><div class='add'>+the CPU's group is used.</div><div class='add'>+</div><div class='add'>+3) Otherwise the schemata for the default group is used.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Schemata files - general concepts</div><div class='add'>+---------------------------------</div><div class='add'>+Each line in the file describes one resource. The line starts with</div><div class='add'>+the name of the resource, followed by specific values to be applied</div><div class='add'>+in each of the instances of that resource on the system.</div><div class='add'>+</div><div class='add'>+Cache IDs</div><div class='add'>+---------</div><div class='add'>+On current generation systems there is one L3 cache per socket and L2</div><div class='add'>+caches are generally just shared by the hyperthreads on a core, but this</div><div class='add'>+isn't an architectural requirement. We could have multiple separate L3</div><div class='add'>+caches on a socket, multiple cores could share an L2 cache. So instead</div><div class='add'>+of using "socket" or "core" to define the set of logical cpus sharing</div><div class='add'>+a resource we use a "Cache ID". At a given cache level this will be a</div><div class='add'>+unique number across the whole system (but it isn't guaranteed to be a</div><div class='add'>+contiguous sequence, there may be gaps).  To find the ID for each logical</div><div class='add'>+CPU look in /sys/devices/system/cpu/cpu*/cache/index*/id</div><div class='add'>+</div><div class='add'>+Cache Bit Masks (CBM)</div><div class='add'>+---------------------</div><div class='add'>+For cache resources we describe the portion of the cache that is available</div><div class='add'>+for allocation using a bitmask. The maximum value of the mask is defined</div><div class='add'>+by each cpu model (and may be different for different cache levels). It</div><div class='add'>+is found using CPUID, but is also provided in the "info" directory of</div><div class='add'>+the resctrl file system in "info/{resource}/cbm_mask". X86 hardware</div><div class='add'>+requires that these masks have all the '1' bits in a contiguous block. So</div><div class='add'>+0x3, 0x6 and 0xC are legal 4-bit masks with two bits set, but 0x5, 0x9</div><div class='add'>+and 0xA are not.  On a system with a 20-bit mask each bit represents 5%</div><div class='add'>+of the capacity of the cache. You could partition the cache into four</div><div class='add'>+equal parts with masks: 0x1f, 0x3e0, 0x7c00, 0xf8000.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+L3 details (code and data prioritization disabled)</div><div class='add'>+--------------------------------------------------</div><div class='add'>+With CDP disabled the L3 schemata format is:</div><div class='add'>+</div><div class='add'>+	L3:&lt;cache_id0&gt;=&lt;cbm&gt;;&lt;cache_id1&gt;=&lt;cbm&gt;;...</div><div class='add'>+</div><div class='add'>+L3 details (CDP enabled via mount option to resctrl)</div><div class='add'>+----------------------------------------------------</div><div class='add'>+When CDP is enabled L3 control is split into two separate resources</div><div class='add'>+so you can specify independent masks for code and data like this:</div><div class='add'>+</div><div class='add'>+	L3data:&lt;cache_id0&gt;=&lt;cbm&gt;;&lt;cache_id1&gt;=&lt;cbm&gt;;...</div><div class='add'>+	L3code:&lt;cache_id0&gt;=&lt;cbm&gt;;&lt;cache_id1&gt;=&lt;cbm&gt;;...</div><div class='add'>+</div><div class='add'>+L2 details</div><div class='add'>+----------</div><div class='add'>+L2 cache does not support code and data prioritization, so the</div><div class='add'>+schemata format is always:</div><div class='add'>+</div><div class='add'>+	L2:&lt;cache_id0&gt;=&lt;cbm&gt;;&lt;cache_id1&gt;=&lt;cbm&gt;;...</div><div class='add'>+</div><div class='add'>+Example 1</div><div class='add'>+---------</div><div class='add'>+On a two socket machine (one L3 cache per socket) with just four bits</div><div class='add'>+for cache bit masks</div><div class='add'>+</div><div class='add'>+# mount -t resctrl resctrl /sys/fs/resctrl</div><div class='add'>+# cd /sys/fs/resctrl</div><div class='add'>+# mkdir p0 p1</div><div class='add'>+# echo "L3:0=3;1=c" &gt; /sys/fs/resctrl/p0/schemata</div><div class='add'>+# echo "L3:0=3;1=3" &gt; /sys/fs/resctrl/p1/schemata</div><div class='add'>+</div><div class='add'>+The default resource group is unmodified, so we have access to all parts</div><div class='add'>+of all caches (its schemata file reads "L3:0=f;1=f").</div><div class='add'>+</div><div class='add'>+Tasks that are under the control of group "p0" may only allocate from the</div><div class='add'>+"lower" 50% on cache ID 0, and the "upper" 50% of cache ID 1.</div><div class='add'>+Tasks in group "p1" use the "lower" 50% of cache on both sockets.</div><div class='add'>+</div><div class='add'>+Example 2</div><div class='add'>+---------</div><div class='add'>+Again two sockets, but this time with a more realistic 20-bit mask.</div><div class='add'>+</div><div class='add'>+Two real time tasks pid=1234 running on processor 0 and pid=5678 running on</div><div class='add'>+processor 1 on socket 0 on a 2-socket and dual core machine. To avoid noisy</div><div class='add'>+neighbors, each of the two real-time tasks exclusively occupies one quarter</div><div class='add'>+of L3 cache on socket 0.</div><div class='add'>+</div><div class='add'>+# mount -t resctrl resctrl /sys/fs/resctrl</div><div class='add'>+# cd /sys/fs/resctrl</div><div class='add'>+</div><div class='add'>+First we reset the schemata for the default group so that the "upper"</div><div class='add'>+50% of the L3 cache on socket 0 cannot be used by ordinary tasks:</div><div class='add'>+</div><div class='add'>+# echo "L3:0=3ff;1=fffff" &gt; schemata</div><div class='add'>+</div><div class='add'>+Next we make a resource group for our first real time task and give</div><div class='add'>+it access to the "top" 25% of the cache on socket 0.</div><div class='add'>+</div><div class='add'>+# mkdir p0</div><div class='add'>+# echo "L3:0=f8000;1=fffff" &gt; p0/schemata</div><div class='add'>+</div><div class='add'>+Finally we move our first real time task into this resource group. We</div><div class='add'>+also use taskset(1) to ensure the task always runs on a dedicated CPU</div><div class='add'>+on socket 0. Most uses of resource groups will also constrain which</div><div class='add'>+processors tasks run on.</div><div class='add'>+</div><div class='add'>+# echo 1234 &gt; p0/tasks</div><div class='add'>+# taskset -cp 1 1234</div><div class='add'>+</div><div class='add'>+Ditto for the second real time task (with the remaining 25% of cache):</div><div class='add'>+</div><div class='add'>+# mkdir p1</div><div class='add'>+# echo "L3:0=7c00;1=fffff" &gt; p1/schemata</div><div class='add'>+# echo 5678 &gt; p1/tasks</div><div class='add'>+# taskset -cp 2 5678</div><div class='add'>+</div><div class='add'>+Example 3</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+A single socket system which has real-time tasks running on core 4-7 and</div><div class='add'>+non real-time workload assigned to core 0-3. The real-time tasks share text</div><div class='add'>+and data, so a per task association is not required and due to interaction</div><div class='add'>+with the kernel it's desired that the kernel on these cores shares L3 with</div><div class='add'>+the tasks.</div><div class='add'>+</div><div class='add'>+# mount -t resctrl resctrl /sys/fs/resctrl</div><div class='add'>+# cd /sys/fs/resctrl</div><div class='add'>+</div><div class='add'>+First we reset the schemata for the default group so that the "upper"</div><div class='add'>+50% of the L3 cache on socket 0 cannot be used by ordinary tasks:</div><div class='add'>+</div><div class='add'>+# echo "L3:0=3ff" &gt; schemata</div><div class='add'>+</div><div class='add'>+Next we make a resource group for our real time cores and give</div><div class='add'>+it access to the "top" 50% of the cache on socket 0.</div><div class='add'>+</div><div class='add'>+# mkdir p0</div><div class='add'>+# echo "L3:0=ffc00;" &gt; p0/schemata</div><div class='add'>+</div><div class='add'>+Finally we move core 4-7 over to the new group and make sure that the</div><div class='add'>+kernel and the tasks running there get 50% of the cache.</div><div class='add'>+</div><div class='add'>+# echo C0 &gt; p0/cpus</div><div class='add'>+</div><div class='add'>+4) Locking between applications</div><div class='add'>+</div><div class='add'>+Certain operations on the resctrl filesystem, composed of read/writes</div><div class='add'>+to/from multiple files, must be atomic.</div><div class='add'>+</div><div class='add'>+As an example, the allocation of an exclusive reservation of L3 cache</div><div class='add'>+involves:</div><div class='add'>+</div><div class='add'>+  1. Read the cbmmasks from each directory</div><div class='add'>+  2. Find a contiguous set of bits in the global CBM bitmask that is clear</div><div class='add'>+     in any of the directory cbmmasks</div><div class='add'>+  3. Create a new directory</div><div class='add'>+  4. Set the bits found in step 2 to the new directory "schemata" file</div><div class='add'>+</div><div class='add'>+If two applications attempt to allocate space concurrently then they can</div><div class='add'>+end up allocating the same bits so the reservations are shared instead of</div><div class='add'>+exclusive.</div><div class='add'>+</div><div class='add'>+To coordinate atomic operations on the resctrlfs and to avoid the problem</div><div class='add'>+above, the following locking procedure is recommended:</div><div class='add'>+</div><div class='add'>+Locking is based on flock, which is available in libc and also as a shell</div><div class='add'>+script command</div><div class='add'>+</div><div class='add'>+Write lock:</div><div class='add'>+</div><div class='add'>+ A) Take flock(LOCK_EX) on /sys/fs/resctrl</div><div class='add'>+ B) Read/write the directory structure.</div><div class='add'>+ C) funlock</div><div class='add'>+</div><div class='add'>+Read lock:</div><div class='add'>+</div><div class='add'>+ A) Take flock(LOCK_SH) on /sys/fs/resctrl</div><div class='add'>+ B) If success read the directory structure.</div><div class='add'>+ C) funlock</div><div class='add'>+</div><div class='add'>+Example with bash:</div><div class='add'>+</div><div class='add'>+# Atomically read directory structure</div><div class='add'>+$ flock -s /sys/fs/resctrl/ find /sys/fs/resctrl</div><div class='add'>+</div><div class='add'>+# Read directory contents and create new subdirectory</div><div class='add'>+</div><div class='add'>+$ cat create-dir.sh</div><div class='add'>+find /sys/fs/resctrl/ &gt; output.txt</div><div class='add'>+mask = function-of(output.txt)</div><div class='add'>+mkdir /sys/fs/resctrl/newres/</div><div class='add'>+echo mask &gt; /sys/fs/resctrl/newres/schemata</div><div class='add'>+</div><div class='add'>+$ flock /sys/fs/resctrl/ ./create-dir.sh</div><div class='add'>+</div><div class='add'>+Example with C:</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Example code do take advisory locks</div><div class='add'>+ * before accessing resctrl filesystem</div><div class='add'>+ */</div><div class='add'>+#include &lt;sys/file.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+</div><div class='add'>+void resctrl_take_shared_lock(int fd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* take shared lock on resctrl filesystem */</div><div class='add'>+	ret = flock(fd, LOCK_SH);</div><div class='add'>+	if (ret) {</div><div class='add'>+		perror("flock");</div><div class='add'>+		exit(-1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void resctrl_take_exclusive_lock(int fd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* release lock on resctrl filesystem */</div><div class='add'>+	ret = flock(fd, LOCK_EX);</div><div class='add'>+	if (ret) {</div><div class='add'>+		perror("flock");</div><div class='add'>+		exit(-1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void resctrl_release_lock(int fd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* take shared lock on resctrl filesystem */</div><div class='add'>+	ret = flock(fd, LOCK_UN);</div><div class='add'>+	if (ret) {</div><div class='add'>+		perror("flock");</div><div class='add'>+		exit(-1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void main(void)</div><div class='add'>+{</div><div class='add'>+	int fd, ret;</div><div class='add'>+</div><div class='add'>+	fd = open("/sys/fs/resctrl", O_DIRECTORY);</div><div class='add'>+	if (fd == -1) {</div><div class='add'>+		perror("open");</div><div class='add'>+		exit(-1);</div><div class='add'>+	}</div><div class='add'>+	resctrl_take_shared_lock(fd);</div><div class='add'>+	/* code to read directory contents */</div><div class='add'>+	resctrl_release_lock(fd);</div><div class='add'>+</div><div class='add'>+	resctrl_take_exclusive_lock(fd);</div><div class='add'>+	/* code to read and write directory contents */</div><div class='add'>+	resctrl_release_lock(fd);</div><div class='add'>+}</div><div class='head'>diff --git a/Documentation/x86/topology.txt b/Documentation/x86/topology.txt<br/>index 06afac252f5b..f3e9d7e9ed6c 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/x86/topology.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/x86/topology.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/x86/topology.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/x86/topology.txt</a></div><div class='hunk'>@@ -63,6 +63,15 @@ The topology of a system is described in the units of:</div><div class='ctx'>     The maximum possible number of packages in the system. Helpful for per</div><div class='ctx'>     package facilities to preallocate per package information.</div><div class='ctx'> </div><div class='add'>+  - cpu_llc_id:</div><div class='add'>+</div><div class='add'>+    A per-CPU variable containing:</div><div class='add'>+    - On Intel, the first APIC ID of the list of CPUs sharing the Last Level</div><div class='add'>+    Cache</div><div class='add'>+</div><div class='add'>+    - On AMD, the Node ID or Core Complex ID containing the Last Level</div><div class='add'>+    Cache. In general, it is a number identifying an LLC uniquely on the</div><div class='add'>+    system.</div><div class='ctx'> </div><div class='ctx'> * Cores:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt<br/>index 0965a71f9942..61b611e9eeaf 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/x86/x86_64/boot-options.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/x86/x86_64/boot-options.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/x86/x86_64/boot-options.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/x86/x86_64/boot-options.txt</a></div><div class='hunk'>@@ -277,10 +277,6 @@ IOMMU (input/output memory management unit)</div><div class='ctx'>     space might stop working. Use this option if you have devices that</div><div class='ctx'>     are accessed from userspace directly on some PCI host bridge.</div><div class='ctx'> </div><div class='del'>-Debugging</div><div class='del'>-</div><div class='del'>-  kstack=N	Print N words from the kernel stack in oops dumps.</div><div class='del'>-</div><div class='ctx'> Miscellaneous</div><div class='ctx'> </div><div class='ctx'> 	nogbpages</div><div class='head'>diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt<br/>index 95a4d34af3fd..b8527c6b7646 100644<br/>--- a/<a href='/drm-misc/tree/Documentation/x86/zero-page.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/x86/zero-page.txt</a><br/>+++ b/<a href='/drm-misc/tree/Documentation/x86/zero-page.txt?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Documentation/x86/zero-page.txt</a></div><div class='hunk'>@@ -31,6 +31,8 @@ Offset	Proto	Name		Meaning</div><div class='ctx'> 1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)</div><div class='ctx'> 1EA/001	ALL	edd_mbr_sig_buf_entries	Number of entries in edd_mbr_sig_buffer</div><div class='ctx'> 				(below)</div><div class='add'>+1EB/001	ALL     kbd_status      Numlock is enabled</div><div class='add'>+1EC/001	ALL     secure_boot	Secure boot is enabled in the firmware</div><div class='ctx'> 1EF/001	ALL	sentinel	Used to detect broken bootloaders</div><div class='ctx'> 290/040	ALL	edd_mbr_sig_buffer EDD MBR signatures</div><div class='ctx'> 2D0/A00	ALL	e820_map	E820 memory map table</div><div class='head'>diff --git a/Documentation/zh_CN/CodingStyle b/Documentation/zh_CN/CodingStyle<br/>deleted file mode 100644<br/>index 12717791baac..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/CodingStyle?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/CodingStyle</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,813 +0,0 @@</div><div class='del'>-Chinese translated version of Documentation/CodingStyle</div><div class='del'>-</div><div class='del'>-If you have any comment or update to the content, please post to LKML directly.</div><div class='del'>-However, if you have problem communicating in English you can also ask the</div><div class='del'>-Chinese maintainer for help.  Contact the Chinese maintainer, if this</div><div class='del'>-translation is outdated or there is problem with translation.</div><div class='del'>-</div><div class='del'>-Chinese maintainer: Zhang Le &lt;r0bertz@gentoo.org&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/CodingStyle的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接发信到LKML。如果你使用英文交流有困难的话，也可</div><div class='del'>-以向中文版维护者求助。如果本翻译更新不及时或者翻译存在问题，请联系中文版维护者。</div><div class='del'>-</div><div class='del'>-中文版维护者： 张乐 Zhang Le &lt;r0bertz@gentoo.org&gt;</div><div class='del'>-中文版翻译者： 张乐 Zhang Le &lt;r0bertz@gentoo.org&gt;</div><div class='del'>-中文版校译者： 王聪 Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='del'>-               wheelz &lt;kernel.zeng@gmail.com&gt;</div><div class='del'>-               管旭东 Xudong Guan &lt;xudong.guan@gmail.com&gt;</div><div class='del'>-               Li Zefan &lt;lizf@cn.fujitsu.com&gt;</div><div class='del'>-               Wang Chen &lt;wangchen@cn.fujitsu.com&gt;</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-		Linux内核代码风格</div><div class='del'>-</div><div class='del'>-这是一个简短的文档，描述了 linux 内核的首选代码风格。代码风格是因人而异的，而且我</div><div class='del'>-不愿意把自己的观点强加给任何人，但这就像我去做任何事情都必须遵循的原则那样，我也</div><div class='del'>-希望在绝大多数事上保持这种的态度。请（在写代码时）至少考虑一下这里的代码风格。</div><div class='del'>-</div><div class='del'>-首先，我建议你打印一份 GNU 代码规范，然后不要读。烧了它，这是一个具有重大象征性意义</div><div class='del'>-的动作。</div><div class='del'>-</div><div class='del'>-不管怎样，现在我们开始：</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第一章：缩进</div><div class='del'>-</div><div class='del'>-制表符是 8 个字符，所以缩进也是 8 个字符。有些异端运动试图将缩进变为 4（甚至 2！）</div><div class='del'>-个字符深，这几乎相当于尝试将圆周率的值定义为 3。</div><div class='del'>-</div><div class='del'>-理由：缩进的全部意义就在于清楚的定义一个控制块起止于何处。尤其是当你盯着你的屏幕</div><div class='del'>-连续看了 20 小时之后，你将会发现大一点的缩进会使你更容易分辨缩进。</div><div class='del'>-</div><div class='del'>-现在，有些人会抱怨 8 个字符的缩进会使代码向右边移动的太远，在 80 个字符的终端屏幕上</div><div class='del'>-就很难读这样的代码。这个问题的答案是，如果你需要 3 级以上的缩进，不管用何种方式你</div><div class='del'>-的代码已经有问题了，应该修正你的程序。</div><div class='del'>-</div><div class='del'>-简而言之，8 个字符的缩进可以让代码更容易阅读，还有一个好处是当你的函数嵌套太深的</div><div class='del'>-时候可以给你警告。留心这个警告。</div><div class='del'>-</div><div class='del'>-在 switch 语句中消除多级缩进的首选的方式是让 “switch” 和从属于它的 “case” 标签</div><div class='del'>-对齐于同一列，而不要 “两次缩进” “case” 标签。比如：</div><div class='del'>-</div><div class='del'>-	switch (suffix) {</div><div class='del'>-	case 'G':</div><div class='del'>-	case 'g':</div><div class='del'>-		mem &lt;&lt;= 30;</div><div class='del'>-		break;</div><div class='del'>-	case 'M':</div><div class='del'>-	case 'm':</div><div class='del'>-		mem &lt;&lt;= 20;</div><div class='del'>-		break;</div><div class='del'>-	case 'K':</div><div class='del'>-	case 'k':</div><div class='del'>-		mem &lt;&lt;= 10;</div><div class='del'>-		/* fall through */</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-不要把多个语句放在一行里，除非你有什么东西要隐藏：</div><div class='del'>-</div><div class='del'>-	if (condition) do_this;</div><div class='del'>-	  do_something_everytime;</div><div class='del'>-</div><div class='del'>-也不要在一行里放多个赋值语句。内核代码风格超级简单。就是避免可能导致别人误读的表</div><div class='del'>-达式。</div><div class='del'>-</div><div class='del'>-除了注释、文档和 Kconfig 之外，不要使用空格来缩进，前面的例子是例外，是有意为之。</div><div class='del'>-</div><div class='del'>-选用一个好的编辑器，不要在行尾留空格。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第二章：把长的行和字符串打散</div><div class='del'>-</div><div class='del'>-代码风格的意义就在于使用平常使用的工具来维持代码的可读性和可维护性。</div><div class='del'>-</div><div class='del'>-每一行的长度的限制是 80 列，我们强烈建议您遵守这个惯例。</div><div class='del'>-</div><div class='del'>-长于 80 列的语句要打散成有意义的片段。除非超过 80 列能显著增加可读性，并且不会隐藏</div><div class='del'>-信息。子片段要明显短于母片段，并明显靠右。这同样适用于有着很长参数列表的函数头。</div><div class='del'>-然而，绝对不要打散对用户可见的字符串，例如 printk 信息，因为这将导致无法 grep 这些</div><div class='del'>-信息。</div><div class='del'>-</div><div class='del'>-		第三章：大括号和空格的放置</div><div class='del'>-</div><div class='del'>-C语言风格中另外一个常见问题是大括号的放置。和缩进大小不同，选择或弃用某种放置策</div><div class='del'>-略并没有多少技术上的原因，不过首选的方式，就像 Kernighan 和 Ritchie 展示给我们的，</div><div class='del'>-是把起始大括号放在行尾，而把结束大括号放在行首，所以：</div><div class='del'>-</div><div class='del'>-	if (x is true) {</div><div class='del'>-		we do y</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-这适用于所有的非函数语句块（if、switch、for、while、do）。比如：</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case KOBJ_ADD:</div><div class='del'>-		return "add";</div><div class='del'>-	case KOBJ_REMOVE:</div><div class='del'>-		return "remove";</div><div class='del'>-	case KOBJ_CHANGE:</div><div class='del'>-		return "change";</div><div class='del'>-	default:</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-不过，有一个例外，那就是函数：函数的起始大括号放置于下一行的开头，所以：</div><div class='del'>-</div><div class='del'>-	int function(int x)</div><div class='del'>-	{</div><div class='del'>-		body of function</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-全世界的异端可能会抱怨这个不一致性是……呃……不一致的，不过所有思维健全的人都知道</div><div class='del'>-(a) K&amp;R 是 _正确的_，并且 (b) K&amp;R 是正确的。此外，不管怎样函数都是特殊的（C</div><div class='del'>-函数是不能嵌套的）。</div><div class='del'>-</div><div class='del'>-注意结束大括号独自占据一行，除非它后面跟着同一个语句的剩余部分，也就是 do 语句中的</div><div class='del'>-“while” 或者 if 语句中的 “else”，像这样：</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		body of do-loop</div><div class='del'>-	} while (condition);</div><div class='del'>-</div><div class='del'>-和</div><div class='del'>-</div><div class='del'>-	if (x == y) {</div><div class='del'>-		..</div><div class='del'>-	} else if (x &gt; y) {</div><div class='del'>-		...</div><div class='del'>-	} else {</div><div class='del'>-		....</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-理由：K&amp;R。</div><div class='del'>-</div><div class='del'>-也请注意这种大括号的放置方式也能使空（或者差不多空的）行的数量最小化，同时不失可</div><div class='del'>-读性。因此，由于你的屏幕上的新行是不可再生资源（想想 25 行的终端屏幕），你将会有更</div><div class='del'>-多的空行来放置注释。</div><div class='del'>-</div><div class='del'>-当只有一个单独的语句的时候，不用加不必要的大括号。</div><div class='del'>-</div><div class='del'>-	if (condition)</div><div class='del'>-		action();</div><div class='del'>-</div><div class='del'>-和</div><div class='del'>-</div><div class='del'>-	if (condition)</div><div class='del'>-		do_this();</div><div class='del'>-	else</div><div class='del'>-		do_that();</div><div class='del'>-</div><div class='del'>-这并不适用于只有一个条件分支是单语句的情况；这时所有分支都要使用大括号：</div><div class='del'>-</div><div class='del'>-	if (condition) {</div><div class='del'>-		do_this();</div><div class='del'>-		do_that();</div><div class='del'>-	} else {</div><div class='del'>-		otherwise();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-		3.1：空格</div><div class='del'>-</div><div class='del'>-Linux 内核的空格使用方式（主要）取决于它是用于函数还是关键字。（大多数）关键字后</div><div class='del'>-要加一个空格。值得注意的例外是 sizeof、typeof、alignof 和 __attribute__，这些</div><div class='del'>-关键字某些程度上看起来更像函数（它们在 Linux 里也常常伴随小括号而使用，尽管在 C 里</div><div class='del'>-这样的小括号不是必需的，就像 “struct fileinfo info” 声明过后的 “sizeof info”）。</div><div class='del'>-</div><div class='del'>-所以在这些关键字之后放一个空格：</div><div class='del'>-</div><div class='del'>-	if, switch, case, for, do, while</div><div class='del'>-</div><div class='del'>-但是不要在 sizeof、typeof、alignof 或者 __attribute__ 这些关键字之后放空格。例如，</div><div class='del'>-</div><div class='del'>-	s = sizeof(struct file);</div><div class='del'>-</div><div class='del'>-不要在小括号里的表达式两侧加空格。这是一个反例：</div><div class='del'>-</div><div class='del'>-	s = sizeof( struct file );</div><div class='del'>-</div><div class='del'>-当声明指针类型或者返回指针类型的函数时，“*” 的首选使用方式是使之靠近变量名或者函</div><div class='del'>-数名，而不是靠近类型名。例子：</div><div class='del'>-</div><div class='del'>-	char *linux_banner;</div><div class='del'>-	unsigned long long memparse(char *ptr, char **retptr);</div><div class='del'>-	char *match_strdup(substring_t *s);</div><div class='del'>-</div><div class='del'>-在大多数二元和三元操作符两侧使用一个空格，例如下面所有这些操作符：</div><div class='del'>-</div><div class='del'>-	=  +  -  &lt;  &gt;  *  /  %  |  &amp;  ^  &lt;=  &gt;=  ==  !=  ?  :</div><div class='del'>-</div><div class='del'>-但是一元操作符后不要加空格：</div><div class='del'>-</div><div class='del'>-	&amp;  *  +  -  ~  !  sizeof  typeof  alignof  __attribute__  defined</div><div class='del'>-</div><div class='del'>-后缀自加和自减一元操作符前不加空格：</div><div class='del'>-</div><div class='del'>-	++  --</div><div class='del'>-</div><div class='del'>-前缀自加和自减一元操作符后不加空格：</div><div class='del'>-</div><div class='del'>-	++  --</div><div class='del'>-</div><div class='del'>-‘.’ 和 “-&gt;” 结构体成员操作符前后不加空格。</div><div class='del'>-</div><div class='del'>-不要在行尾留空白。有些可以自动缩进的编辑器会在新行的行首加入适量的空白，然后你</div><div class='del'>-就可以直接在那一行输入代码。不过假如你最后没有在那一行输入代码，有些编辑器就不</div><div class='del'>-会移除已经加入的空白，就像你故意留下一个只有空白的行。包含行尾空白的行就这样产</div><div class='del'>-生了。</div><div class='del'>-</div><div class='del'>-当git发现补丁包含了行尾空白的时候会警告你，并且可以应你的要求去掉行尾空白；不过</div><div class='del'>-如果你是正在打一系列补丁，这样做会导致后面的补丁失败，因为你改变了补丁的上下文。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第四章：命名</div><div class='del'>-</div><div class='del'>-C是一个简朴的语言，你的命名也应该这样。和 Modula-2 和 Pascal 程序员不同，C 程序员</div><div class='del'>-不使用类似 ThisVariableIsATemporaryCounter 这样华丽的名字。C 程序员会称那个变量</div><div class='del'>-为 “tmp”，这样写起来会更容易，而且至少不会令其难于理解。</div><div class='del'>-</div><div class='del'>-不过，虽然混用大小写的名字是不提倡使用的，但是全局变量还是需要一个具描述性的名字</div><div class='del'>-。称一个全局函数为 “foo” 是一个难以饶恕的错误。</div><div class='del'>-</div><div class='del'>-全局变量（只有当你真正需要它们的时候再用它）需要有一个具描述性的名字，就像全局函</div><div class='del'>-数。如果你有一个可以计算活动用户数量的函数，你应该叫它 “count_active_users()”</div><div class='del'>-或者类似的名字，你不应该叫它 “cntuser()”。</div><div class='del'>-</div><div class='del'>-在函数名中包含函数类型（所谓的匈牙利命名法）是脑子出了问题——编译器知道那些类型而</div><div class='del'>-且能够检查那些类型，这样做只能把程序员弄糊涂了。难怪微软总是制造出有问题的程序。</div><div class='del'>-</div><div class='del'>-本地变量名应该简短，而且能够表达相关的含义。如果你有一些随机的整数型的循环计数器</div><div class='del'>-，它应该被称为 “i”。叫它 “loop_counter” 并无益处，如果它没有被误解的可能的话。</div><div class='del'>-类似的，“tmp” 可以用来称呼任意类型的临时变量。</div><div class='del'>-</div><div class='del'>-如果你怕混淆了你的本地变量名，你就遇到另一个问题了，叫做函数增长荷尔蒙失衡综合症</div><div class='del'>-。请看第六章（函数）。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第五章：Typedef</div><div class='del'>-</div><div class='del'>-不要使用类似 “vps_t” 之类的东西。</div><div class='del'>-</div><div class='del'>-对结构体和指针使用 typedef 是一个错误。当你在代码里看到：</div><div class='del'>-</div><div class='del'>-	vps_t a;</div><div class='del'>-</div><div class='del'>-这代表什么意思呢？</div><div class='del'>-</div><div class='del'>-相反，如果是这样</div><div class='del'>-</div><div class='del'>-	struct virtual_container *a;</div><div class='del'>-</div><div class='del'>-你就知道 “a” 是什么了。</div><div class='del'>-</div><div class='del'>-很多人认为 typedef “能提高可读性”。实际不是这样的。它们只在下列情况下有用：</div><div class='del'>-</div><div class='del'>- (a) 完全不透明的对象（这种情况下要主动使用 typedef 来隐藏这个对象实际上是什么）。</div><div class='del'>-</div><div class='del'>-     例如：“pte_t” 等不透明对象，你只能用合适的访问函数来访问它们。</div><div class='del'>-</div><div class='del'>-     注意！不透明性和“访问函数”本身是不好的。我们使用 pte_t 等类型的原因在于真的是</div><div class='del'>-     完全没有任何共用的可访问信息。</div><div class='del'>-</div><div class='del'>- (b) 清楚的整数类型，如此，这层抽象就可以帮助消除到底是 “int” 还是 “long” 的混淆。</div><div class='del'>-</div><div class='del'>-     u8/u16/u32 是完全没有问题的 typedef，不过它们更符合类别 (d) 而不是这里。</div><div class='del'>-</div><div class='del'>-     再次注意！要这样做，必须事出有因。如果某个变量是 “unsigned long“，那么没有必要</div><div class='del'>-</div><div class='del'>-	typedef unsigned long myflags_t;</div><div class='del'>-</div><div class='del'>-     不过如果有一个明确的原因，比如它在某种情况下可能会是一个 “unsigned int” 而在</div><div class='del'>-     其他情况下可能为 “unsigned long”，那么就不要犹豫，请务必使用 typedef。</div><div class='del'>-</div><div class='del'>- (c) 当你使用sparse按字面的创建一个新类型来做类型检查的时候。</div><div class='del'>-</div><div class='del'>- (d) 和标准C99类型相同的类型，在某些例外的情况下。</div><div class='del'>-</div><div class='del'>-     虽然让眼睛和脑筋来适应新的标准类型比如 “uint32_t” 不需要花很多时间，可是有些</div><div class='del'>-     人仍然拒绝使用它们。</div><div class='del'>-</div><div class='del'>-     因此，Linux 特有的等同于标准类型的 “u8/u16/u32/u64” 类型和它们的有符号类型是被</div><div class='del'>-     允许的——尽管在你自己的新代码中，它们不是强制要求要使用的。</div><div class='del'>-</div><div class='del'>-     当编辑已经使用了某个类型集的已有代码时，你应该遵循那些代码中已经做出的选择。</div><div class='del'>-</div><div class='del'>- (e) 可以在用户空间安全使用的类型。</div><div class='del'>-</div><div class='del'>-     在某些用户空间可见的结构体里，我们不能要求C99类型而且不能用上面提到的 “u32”</div><div class='del'>-     类型。因此，我们在与用户空间共享的所有结构体中使用 __u32 和类似的类型。</div><div class='del'>-</div><div class='del'>-可能还有其他的情况，不过基本的规则是永远不要使用 typedef，除非你可以明确的应用上</div><div class='del'>-述某个规则中的一个。</div><div class='del'>-</div><div class='del'>-总的来说，如果一个指针或者一个结构体里的元素可以合理的被直接访问到，那么它们就不</div><div class='del'>-应该是一个 typedef。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第六章：函数</div><div class='del'>-</div><div class='del'>-函数应该简短而漂亮，并且只完成一件事情。函数应该可以一屏或者两屏显示完（我们都知</div><div class='del'>-道 ISO/ANSI 屏幕大小是 80x24），只做一件事情，而且把它做好。</div><div class='del'>-</div><div class='del'>-一个函数的最大长度是和该函数的复杂度和缩进级数成反比的。所以，如果你有一个理论上</div><div class='del'>-很简单的只有一个很长（但是简单）的 case 语句的函数，而且你需要在每个 case 里做</div><div class='del'>-很多很小的事情，这样的函数尽管很长，但也是可以的。</div><div class='del'>-</div><div class='del'>-不过，如果你有一个复杂的函数，而且你怀疑一个天分不是很高的高中一年级学生可能甚至</div><div class='del'>-搞不清楚这个函数的目的，你应该严格的遵守前面提到的长度限制。使用辅助函数，并为之</div><div class='del'>-取个具描述性的名字（如果你觉得它们的性能很重要的话，可以让编译器内联它们，这样的</div><div class='del'>-效果往往会比你写一个复杂函数的效果要好。）</div><div class='del'>-</div><div class='del'>-函数的另外一个衡量标准是本地变量的数量。此数量不应超过 5－10 个，否则你的函数就有</div><div class='del'>-问题了。重新考虑一下你的函数，把它分拆成更小的函数。人的大脑一般可以轻松的同时跟</div><div class='del'>-踪 7 个不同的事物，如果再增多的话，就会糊涂了。即便你聪颖过人，你也可能会记不清你</div><div class='del'>-2 个星期前做过的事情。</div><div class='del'>-</div><div class='del'>-在源文件里，使用空行隔开不同的函数。如果该函数需要被导出，它的 EXPORT* 宏应该紧贴</div><div class='del'>-在它的结束大括号之下。比如：</div><div class='del'>-</div><div class='del'>-	int system_is_up(void)</div><div class='del'>-	{</div><div class='del'>-		return system_state == SYSTEM_RUNNING;</div><div class='del'>-	}</div><div class='del'>-	EXPORT_SYMBOL(system_is_up);</div><div class='del'>-</div><div class='del'>-在函数原型中，包含函数名和它们的数据类型。虽然C语言里没有这样的要求，在 Linux 里这</div><div class='del'>-是提倡的做法，因为这样可以很简单的给读者提供更多的有价值的信息。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第七章：集中的函数退出途径</div><div class='del'>-</div><div class='del'>-虽然被某些人声称已经过时，但是 goto 语句的等价物还是经常被编译器所使用，具体形式是</div><div class='del'>-无条件跳转指令。</div><div class='del'>-</div><div class='del'>-当一个函数从多个位置退出，并且需要做一些类似清理的常见操作时，goto 语句就很方便了。</div><div class='del'>-如果并不需要清理操作，那么直接 return 即可。</div><div class='del'>-</div><div class='del'>-理由是：</div><div class='del'>-</div><div class='del'>-- 无条件语句容易理解和跟踪</div><div class='del'>-- 嵌套程度减小</div><div class='del'>-- 可以避免由于修改时忘记更新某个单独的退出点而导致的错误</div><div class='del'>-- 减轻了编译器的工作，无需删除冗余代码;)</div><div class='del'>-</div><div class='del'>-	int fun(int a)</div><div class='del'>-	{</div><div class='del'>-		int result = 0;</div><div class='del'>-		char *buffer;</div><div class='del'>-</div><div class='del'>-		buffer = kmalloc(SIZE, GFP_KERNEL);</div><div class='del'>-		if (!buffer)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		if (condition1) {</div><div class='del'>-			while (loop1) {</div><div class='del'>-				...</div><div class='del'>-			}</div><div class='del'>-			result = 1;</div><div class='del'>-			goto out_buffer;</div><div class='del'>-		}</div><div class='del'>-		...</div><div class='del'>-	out_buffer:</div><div class='del'>-		kfree(buffer);</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-一个需要注意的常见错误是“一个 err 错误”，就像这样：</div><div class='del'>-</div><div class='del'>-	err:</div><div class='del'>-		kfree(foo-&gt;bar);</div><div class='del'>-		kfree(foo);</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-这段代码的错误是，在某些退出路径上 “foo” 是 NULL。通常情况下，通过把它分离成两个</div><div class='del'>-错误标签 “err_bar:” 和 “err_foo:” 来修复这个错误。</div><div class='del'>-</div><div class='del'>-		第八章：注释</div><div class='del'>-</div><div class='del'>-注释是好的，不过有过度注释的危险。永远不要在注释里解释你的代码是如何运作的：更好</div><div class='del'>-的做法是让别人一看你的代码就可以明白，解释写的很差的代码是浪费时间。</div><div class='del'>-</div><div class='del'>-一般的，你想要你的注释告诉别人你的代码做了什么，而不是怎么做的。也请你不要把注释</div><div class='del'>-放在一个函数体内部：如果函数复杂到你需要独立的注释其中的一部分，你很可能需要回到</div><div class='del'>-第六章看一看。你可以做一些小注释来注明或警告某些很聪明（或者槽糕）的做法，但不要</div><div class='del'>-加太多。你应该做的，是把注释放在函数的头部，告诉人们它做了什么，也可以加上它做这</div><div class='del'>-些事情的原因。</div><div class='del'>-</div><div class='del'>-当注释内核API函数时，请使用 kernel-doc 格式。请看</div><div class='del'>-Documentation/kernel-documentation.rst和scripts/kernel-doc 以获得详细信息。</div><div class='del'>-</div><div class='del'>-Linux的注释风格是 C89 “/* ... */” 风格。不要使用 C99 风格 “// ...” 注释。</div><div class='del'>-</div><div class='del'>-长（多行）的首选注释风格是：</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This is the preferred style for multi-line</div><div class='del'>-	 * comments in the Linux kernel source code.</div><div class='del'>-	 * Please use it consistently.</div><div class='del'>-	 *</div><div class='del'>-	 * Description:  A column of asterisks on the left side,</div><div class='del'>-	 * with beginning and ending almost-blank lines.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-对于在 net/ 和 drivers/net/ 的文件，首选的长（多行）注释风格有些不同。</div><div class='del'>-</div><div class='del'>-	/* The preferred comment style for files in net/ and drivers/net</div><div class='del'>-	 * looks like this.</div><div class='del'>-	 *</div><div class='del'>-	 * It is nearly the same as the generally preferred comment style,</div><div class='del'>-	 * but there is no initial almost-blank line.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-注释数据也是很重要的，不管是基本类型还是衍生类型。为了方便实现这一点，每一行应只</div><div class='del'>-声明一个数据（不要使用逗号来一次声明多个数据）。这样你就有空间来为每个数据写一段</div><div class='del'>-小注释来解释它们的用途了。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第九章：你已经把事情弄糟了</div><div class='del'>-</div><div class='del'>-这没什么，我们都是这样。可能你的使用了很长时间 Unix 的朋友已经告诉你 “GNU emacs” 能</div><div class='del'>-自动帮你格式化 C 源代码，而且你也注意到了，确实是这样，不过它所使用的默认值和我们</div><div class='del'>-想要的相去甚远（实际上，甚至比随机打的还要差——无数个猴子在 GNU emacs 里打字永远不</div><div class='del'>-会创造出一个好程序）（译注：请参考 Infinite Monkey Theorem）</div><div class='del'>-</div><div class='del'>-所以你要么放弃 GNU emacs，要么改变它让它使用更合理的设定。要采用后一个方案，你可</div><div class='del'>-以把下面这段粘贴到你的 .emacs 文件里。</div><div class='del'>-</div><div class='del'>-(defun c-lineup-arglist-tabs-only (ignored)</div><div class='del'>-  "Line up argument lists by tabs, not spaces"</div><div class='del'>-  (let* ((anchor (c-langelem-pos c-syntactic-element))</div><div class='del'>-         (column (c-langelem-2nd-pos c-syntactic-element))</div><div class='del'>-         (offset (- (1+ column) anchor))</div><div class='del'>-         (steps (floor offset c-basic-offset)))</div><div class='del'>-    (* (max steps 1)</div><div class='del'>-       c-basic-offset)))</div><div class='del'>-</div><div class='del'>-(add-hook 'c-mode-common-hook</div><div class='del'>-          (lambda ()</div><div class='del'>-            ;; Add kernel style</div><div class='del'>-            (c-add-style</div><div class='del'>-             "linux-tabs-only"</div><div class='del'>-             '("linux" (c-offsets-alist</div><div class='del'>-                        (arglist-cont-nonempty</div><div class='del'>-                         c-lineup-gcc-asm-reg</div><div class='del'>-                         c-lineup-arglist-tabs-only))))))</div><div class='del'>-</div><div class='del'>-(add-hook 'c-mode-hook</div><div class='del'>-          (lambda ()</div><div class='del'>-            (let ((filename (buffer-file-name)))</div><div class='del'>-              ;; Enable kernel mode for the appropriate files</div><div class='del'>-              (when (and filename</div><div class='del'>-                         (string-match (expand-file-name "~/src/linux-trees")</div><div class='del'>-                                       filename))</div><div class='del'>-                (setq indent-tabs-mode t)</div><div class='del'>-                (setq show-trailing-whitespace t)</div><div class='del'>-                (c-set-style "linux-tabs-only")))))</div><div class='del'>-</div><div class='del'>-这会让 emacs 在 ~/src/linux-trees 目录下的 C 源文件获得更好的内核代码风格。</div><div class='del'>-</div><div class='del'>-不过就算你尝试让 emacs 正确的格式化代码失败了，也并不意味着你失去了一切：还可以用</div><div class='del'>-“indent”。</div><div class='del'>-</div><div class='del'>-不过，GNU indent 也有和 GNU emacs 一样有问题的设定，所以你需要给它一些命令选项。不</div><div class='del'>-过，这还不算太糟糕，因为就算是 GNU indent 的作者也认同 K&amp;R 的权威性（GNU 的人并不是</div><div class='del'>-坏人，他们只是在这个问题上被严重的误导了），所以你只要给 indent 指定选项 “-kr -i8”</div><div class='del'>-（代表 “K&amp;R，8 个字符缩进”），或者使用 “scripts/Lindent”，这样就可以以最时髦的方式</div><div class='del'>-缩进源代码。</div><div class='del'>-</div><div class='del'>-“indent” 有很多选项，特别是重新格式化注释的时候，你可能需要看一下它的手册页。不过</div><div class='del'>-记住：“indent” 不能修正坏的编程习惯。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第十章：Kconfig 配置文件</div><div class='del'>-</div><div class='del'>-对于遍布源码树的所有 Kconfig* 配置文件来说，它们缩进方式与 C 代码相比有所不同。紧挨</div><div class='del'>-在 “config” 定义下面的行缩进一个制表符，帮助信息则再多缩进 2 个空格。比如：</div><div class='del'>-</div><div class='del'>-config AUDIT</div><div class='del'>-	bool "Auditing support"</div><div class='del'>-	depends on NET</div><div class='del'>-	help</div><div class='del'>-	  Enable auditing infrastructure that can be used with another</div><div class='del'>-	  kernel subsystem, such as SELinux (which requires this for</div><div class='del'>-	  logging of avc messages output).  Does not do system-call</div><div class='del'>-	  auditing without CONFIG_AUDITSYSCALL.</div><div class='del'>-</div><div class='del'>-而那些危险的功能（比如某些文件系统的写支持）应该在它们的提示字符串里显著的声明这</div><div class='del'>-一点：</div><div class='del'>-</div><div class='del'>-config ADFS_FS_RW</div><div class='del'>-	bool "ADFS write support (DANGEROUS)"</div><div class='del'>-	depends on ADFS_FS</div><div class='del'>-	...</div><div class='del'>-</div><div class='del'>-要查看配置文件的完整文档，请看 Documentation/kbuild/kconfig-language.txt。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第十一章：数据结构</div><div class='del'>-</div><div class='del'>-如果一个数据结构，在创建和销毁它的单线执行环境之外可见，那么它必须要有一个引用计</div><div class='del'>-数器。内核里没有垃圾收集（并且内核之外的垃圾收集慢且效率低下），这意味着你绝对需</div><div class='del'>-要记录你对这种数据结构的使用情况。</div><div class='del'>-</div><div class='del'>-引用计数意味着你能够避免上锁，并且允许多个用户并行访问这个数据结构——而不需要担心</div><div class='del'>-这个数据结构仅仅因为暂时不被使用就消失了，那些用户可能不过是沉睡了一阵或者做了一</div><div class='del'>-些其他事情而已。</div><div class='del'>-</div><div class='del'>-注意上锁不能取代引用计数。上锁是为了保持数据结构的一致性，而引用计数是一个内存管</div><div class='del'>-理技巧。通常二者都需要，不要把两个搞混了。</div><div class='del'>-</div><div class='del'>-很多数据结构实际上有2级引用计数，它们通常有不同“类”的用户。子类计数器统计子类用</div><div class='del'>-户的数量，每当子类计数器减至零时，全局计数器减一。</div><div class='del'>-</div><div class='del'>-这种“多级引用计数”的例子可以在内存管理（“struct mm_struct”：mm_users 和 mm_count）</div><div class='del'>-和文件系统（“struct super_block”：s_count和s_active）中找到。</div><div class='del'>-</div><div class='del'>-记住：如果另一个执行线索可以找到你的数据结构，但是这个数据结构没有引用计数器，这</div><div class='del'>-里几乎肯定是一个 bug。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第十二章：宏，枚举和RTL</div><div class='del'>-</div><div class='del'>-用于定义常量的宏的名字及枚举里的标签需要大写。</div><div class='del'>-</div><div class='del'>-#define CONSTANT 0x12345</div><div class='del'>-</div><div class='del'>-在定义几个相关的常量时，最好用枚举。</div><div class='del'>-</div><div class='del'>-宏的名字请用大写字母，不过形如函数的宏的名字可以用小写字母。</div><div class='del'>-</div><div class='del'>-一般的，如果能写成内联函数就不要写成像函数的宏。</div><div class='del'>-</div><div class='del'>-含有多个语句的宏应该被包含在一个 do-while 代码块里：</div><div class='del'>-</div><div class='del'>-	#define macrofun(a, b, c)			\</div><div class='del'>-		do {					\</div><div class='del'>-			if (a == 5)			\</div><div class='del'>-				do_this(b, c);		\</div><div class='del'>-		} while (0)</div><div class='del'>-</div><div class='del'>-使用宏的时候应避免的事情：</div><div class='del'>-</div><div class='del'>-1) 影响控制流程的宏：</div><div class='del'>-</div><div class='del'>-	#define FOO(x)					\</div><div class='del'>-		do {					\</div><div class='del'>-			if (blah(x) &lt; 0)		\</div><div class='del'>-				return -EBUGGERED;	\</div><div class='del'>-		} while (0)</div><div class='del'>-</div><div class='del'>-非常不好。它看起来像一个函数，不过却能导致“调用”它的函数退出；不要打乱读者大脑里</div><div class='del'>-的语法分析器。</div><div class='del'>-</div><div class='del'>-2) 依赖于一个固定名字的本地变量的宏：</div><div class='del'>-</div><div class='del'>-	#define FOO(val) bar(index, val)</div><div class='del'>-</div><div class='del'>-可能看起来像是个不错的东西，不过它非常容易把读代码的人搞糊涂，而且容易导致看起来</div><div class='del'>-不相关的改动带来错误。</div><div class='del'>-</div><div class='del'>-3) 作为左值的带参数的宏： FOO(x) = y；如果有人把 FOO 变成一个内联函数的话，这种用</div><div class='del'>-法就会出错了。</div><div class='del'>-</div><div class='del'>-4) 忘记了优先级：使用表达式定义常量的宏必须将表达式置于一对小括号之内。带参数的</div><div class='del'>-宏也要注意此类问题。</div><div class='del'>-</div><div class='del'>-	#define CONSTANT 0x4000</div><div class='del'>-	#define CONSTEXP (CONSTANT | 3)</div><div class='del'>-</div><div class='del'>-5) 在宏里定义类似函数的本地变量时命名冲突：</div><div class='del'>-</div><div class='del'>-	#define FOO(x)				\</div><div class='del'>-	({					\</div><div class='del'>-		typeof(x) ret;			\</div><div class='del'>-		ret = calc_ret(x);		\</div><div class='del'>-		(ret);				\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-ret 是本地变量的通用名字 - __foo_ret 更不容易与一个已存在的变量冲突。</div><div class='del'>-</div><div class='del'>-cpp 手册对宏的讲解很详细。gcc internals 手册也详细讲解了 RTL（译注：register</div><div class='del'>-transfer language），内核里的汇编语言经常用到它。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第十三章：打印内核消息</div><div class='del'>-</div><div class='del'>-内核开发者应该是受过良好教育的。请一定注意内核信息的拼写，以给人以好的印象。不要</div><div class='del'>-用不规范的单词比如 “dont”，而要用 “do not”或者 “don't”。保证这些信息简单、明了、</div><div class='del'>-无歧义。</div><div class='del'>-</div><div class='del'>-内核信息不必以句号（译注：英文句号，即点）结束。</div><div class='del'>-</div><div class='del'>-在小括号里打印数字 (%d) 没有任何价值，应该避免这样做。</div><div class='del'>-</div><div class='del'>-&lt;linux/device.h&gt; 里有一些驱动模型诊断宏，你应该使用它们，以确保信息对应于正确的</div><div class='del'>-设备和驱动，并且被标记了正确的消息级别。这些宏有：dev_err()，dev_warn()，</div><div class='del'>-dev_info() 等等。对于那些不和某个特定设备相关连的信息，&lt;linux/printk.h&gt; 定义了</div><div class='del'>-pr_notice()，pr_info()，pr_warn()，pr_err() 和其他。</div><div class='del'>-</div><div class='del'>-写出好的调试信息可以是一个很大的挑战；一旦你写出后，这些信息在远程除错时能提供极大</div><div class='del'>-的帮助。然而打印调试信息的处理方式同打印非调试信息不同。其他 pr_XXX() 函数能无条件地</div><div class='del'>-打印，pr_debug() 却不；默认情况下它不会被编译，除非定义了 DEBUG 或设定了</div><div class='del'>-CONFIG_DYNAMIC_DEBUG。实际这同样是为了 dev_dbg()，一个相关约定是在一个已经开启了</div><div class='del'>-DEBUG 时，使用 VERBOSE_DEBUG 来添加 dev_vdbg()。</div><div class='del'>-</div><div class='del'>-许多子系统拥有 Kconfig 调试选项来开启 -DDEBUG 在对应的 Makefile 里面；在其他</div><div class='del'>-情况下，特殊文件使用 #define DEBUG。当一条调试信息需要被无条件打印时，例如，如果</div><div class='del'>-已经包含一个调试相关的 #ifdef 条件，printk(KERN_DEBUG ...) 就可被使用。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第十四章：分配内存</div><div class='del'>-</div><div class='del'>-内核提供了下面的一般用途的内存分配函数：</div><div class='del'>-kmalloc()，kzalloc()，kmalloc_array()，kcalloc()，vmalloc() 和 vzalloc()。</div><div class='del'>-请参考 API 文档以获取有关它们的详细信息。</div><div class='del'>-</div><div class='del'>-传递结构体大小的首选形式是这样的：</div><div class='del'>-</div><div class='del'>-	p = kmalloc(sizeof(*p), ...);</div><div class='del'>-</div><div class='del'>-另外一种传递方式中，sizeof 的操作数是结构体的名字，这样会降低可读性，并且可能会引</div><div class='del'>-入 bug。有可能指针变量类型被改变时，而对应的传递给内存分配函数的 sizeof 的结果不变。</div><div class='del'>-</div><div class='del'>-强制转换一个 void 指针返回值是多余的。C 语言本身保证了从 void 指针到其他任何指针类型</div><div class='del'>-的转换是没有问题的。</div><div class='del'>-</div><div class='del'>-分配一个数组的首选形式是这样的：</div><div class='del'>-</div><div class='del'>-	p = kmalloc_array(n, sizeof(...), ...);</div><div class='del'>-</div><div class='del'>-分配一个零长数组的首选形式是这样的：</div><div class='del'>-</div><div class='del'>-	p = kcalloc(n, sizeof(...), ...);</div><div class='del'>-</div><div class='del'>-两种形式检查分配大小 n * sizeof(...) 的溢出，如果溢出返回 NULL。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第十五章：内联弊病</div><div class='del'>-</div><div class='del'>-有一个常见的误解是内联函数是 gcc 提供的可以让代码运行更快的一个选项。虽然使用内联</div><div class='del'>-函数有时候是恰当的（比如作为一种替代宏的方式，请看第十二章），不过很多情况下不是</div><div class='del'>-这样。inline 关键字的过度使用会使内核变大，从而使整个系统运行速度变慢。因为大内核</div><div class='del'>-会占用更多的指令高速缓存（译注：一级缓存通常是指令缓存和数据缓存分开的）而且会导</div><div class='del'>-致 pagecache 的可用内存减少。想象一下，一次pagecache未命中就会导致一次磁盘寻址，</div><div class='del'>-将耗时 5 毫秒。5 毫秒的时间内 CPU 能执行很多很多指令。</div><div class='del'>-</div><div class='del'>-一个基本的原则是如果一个函数有 3 行以上，就不要把它变成内联函数。这个原则的一个例</div><div class='del'>-外是，如果你知道某个参数是一个编译时常量，而且因为这个常量你确定编译器在编译时能</div><div class='del'>-优化掉你的函数的大部分代码，那仍然可以给它加上 inline 关键字。kmalloc() 内联函数就</div><div class='del'>-是一个很好的例子。</div><div class='del'>-</div><div class='del'>-人们经常主张给 static 的而且只用了一次的函数加上 inline，如此不会有任何损失，因为没</div><div class='del'>-有什么好权衡的。虽然从技术上说这是正确的，但是实际上这种情况下即使不加 inline gcc</div><div class='del'>-也可以自动使其内联。而且其他用户可能会要求移除 inline，由此而来的争论会抵消 inline</div><div class='del'>-自身的潜在价值，得不偿失。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第十六章：函数返回值及命名</div><div class='del'>-</div><div class='del'>-函数可以返回很多种不同类型的值，最常见的一种是表明函数执行成功或者失败的值。这样</div><div class='del'>-的一个值可以表示为一个错误代码整数（-Exxx＝失败，0＝成功）或者一个“成功”布尔值（</div><div class='del'>-0＝失败，非0＝成功）。</div><div class='del'>-</div><div class='del'>-混合使用这两种表达方式是难于发现的 bug 的来源。如果 C 语言本身严格区分整形和布尔型变</div><div class='del'>-量，那么编译器就能够帮我们发现这些错误……不过 C 语言不区分。为了避免产生这种 bug，请</div><div class='del'>-遵循下面的惯例：</div><div class='del'>-</div><div class='del'>-	如果函数的名字是一个动作或者强制性的命令，那么这个函数应该返回错误代码整</div><div class='del'>-	数。如果是一个判断，那么函数应该返回一个“成功”布尔值。</div><div class='del'>-</div><div class='del'>-比如，“add work” 是一个命令，所以 add_work() 函数在成功时返回 0，在失败时返回 -EBUSY。</div><div class='del'>-类似的，因为 “PCI device present” 是一个判断，所以 pci_dev_present() 函数在成功找到</div><div class='del'>-一个匹配的设备时应该返回 1，如果找不到时应该返回 0。</div><div class='del'>-</div><div class='del'>-所有导出（译注：EXPORT）的函数都必须遵守这个惯例，所有的公共函数也都应该如此。私</div><div class='del'>-有（static）函数不需要如此，但是我们也推荐这样做。</div><div class='del'>-</div><div class='del'>-返回值是实际计算结果而不是计算是否成功的标志的函数不受此惯例的限制。一般的，他们</div><div class='del'>-通过返回一些正常值范围之外的结果来表示出错。典型的例子是返回指针的函数，他们使用</div><div class='del'>-NULL 或者 ERR_PTR 机制来报告错误。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第十七章：不要重新发明内核宏</div><div class='del'>-</div><div class='del'>-头文件 include/linux/kernel.h 包含了一些宏，你应该使用它们，而不要自己写一些它们的</div><div class='del'>-变种。比如，如果你需要计算一个数组的长度，使用这个宏</div><div class='del'>-</div><div class='del'>-	#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))</div><div class='del'>-</div><div class='del'>-类似的，如果你要计算某结构体成员的大小，使用</div><div class='del'>-</div><div class='del'>-	#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)-&gt;f))</div><div class='del'>-</div><div class='del'>-还有可以做严格的类型检查的 min() 和 max() 宏，如果你需要可以使用它们。你可以自己看看</div><div class='del'>-那个头文件里还定义了什么你可以拿来用的东西，如果有定义的话，你就不应在你的代码里</div><div class='del'>-自己重新定义。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第十八章：编辑器模式行和其他需要罗嗦的事情</div><div class='del'>-</div><div class='del'>-有一些编辑器可以解释嵌入在源文件里的由一些特殊标记标明的配置信息。比如，emacs</div><div class='del'>-能够解释被标记成这样的行：</div><div class='del'>-</div><div class='del'>-	-*- mode: c -*-</div><div class='del'>-</div><div class='del'>-或者这样的：</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	Local Variables:</div><div class='del'>-	compile-command: "gcc -DMAGIC_DEBUG_FLAG foo.c"</div><div class='del'>-	End:</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-Vim 能够解释这样的标记：</div><div class='del'>-</div><div class='del'>-	/* vim:set sw=8 noet */</div><div class='del'>-</div><div class='del'>-不要在源代码中包含任何这样的内容。每个人都有他自己的编辑器配置，你的源文件不应</div><div class='del'>-该覆盖别人的配置。这包括有关缩进和模式配置的标记。人们可以使用他们自己定制的模</div><div class='del'>-式，或者使用其他可以产生正确的缩进的巧妙方法。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第十九章：内联汇编</div><div class='del'>-</div><div class='del'>-在特定架构的代码中，你也许需要内联汇编来使用 CPU 接口和平台相关功能。在需要</div><div class='del'>-这么做时，不要犹豫。然而，当 C 可以完成工作时，不要无端地使用内联汇编。如果</div><div class='del'>-可能，你可以并且应该用 C 和硬件交互。</div><div class='del'>-</div><div class='del'>-考虑去写通用一点的内联汇编作为简明的辅助函数，而不是重复写下它们的细节。记住</div><div class='del'>-内联汇编可以使用 C 参数。</div><div class='del'>-</div><div class='del'>-大而特殊的汇编函数应该放在 .S 文件中，对应 C 的原型定义在 C 头文件中。汇编</div><div class='del'>-函数的 C 原型应该使用 “asmlinkage”。</div><div class='del'>-</div><div class='del'>-你可能需要将你的汇编语句标记为 volatile，来阻止 GCC 在没发现任何副作用后就</div><div class='del'>-移除了它。你不必总是这样做，虽然，这样可以限制不必要的优化。</div><div class='del'>-</div><div class='del'>-在写一个包含多条指令的单个内联汇编语句时，把每条指令用引号字符串分离，并写在</div><div class='del'>-单独一行，在每个字符串结尾，除了 \n\t 结尾之外，在汇编输出中适当地缩进下</div><div class='del'>-一条指令：</div><div class='del'>-</div><div class='del'>-	asm ("magic %reg1, #42\n\t"</div><div class='del'>-	     "more_magic %reg2, %reg3"</div><div class='del'>-	     : /* outputs */ : /* inputs */ : /* clobbers */);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		第二十章：条件编译</div><div class='del'>-</div><div class='del'>-只要可能，就不要在 .c 文件里面使用预处理条件；这样做让代码更难阅读并且逻辑难以</div><div class='del'>-跟踪。替代方案是，在头文件定义函数在这些 .c 文件中使用这类的条件表达式，提供空</div><div class='del'>-操作的桩版本（译注：桩程序，是指用来替换一部分功能的程序段）在 #else 情况下，</div><div class='del'>-再从 .c 文件中无条件地调用这些函数。编译器会避免生成任何桩调用的代码，产生一致</div><div class='del'>-的结果，但逻辑将更加清晰。</div><div class='del'>-</div><div class='del'>-宁可编译整个函数，而不是部分函数或部分表达式。而不是在一个表达式添加 ifdef，</div><div class='del'>-解析部分或全部表达式到一个单独的辅助函数，并应用条件到该函数内。</div><div class='del'>-</div><div class='del'>-如果你有一个在特定配置中可能是未使用的函数或变量，编译器将警告它定义了但未使用，</div><div class='del'>-标记这个定义为 __maybe_unused 而不是将它包含在一个预处理条件中。（然而，如果</div><div class='del'>-一个函数或变量总是未使用的，就直接删除它。）</div><div class='del'>-</div><div class='del'>-在代码中，可能的情况下，使用 IS_ENABLED 宏来转化某个 Kconfig 标记为 C 的布尔</div><div class='del'>-表达式，并在正常的 C 条件中使用它：</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_SOMETHING)) {</div><div class='del'>-		...</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-编译器会无条件地做常数合并，就像使用 #ifdef 那样，包含或排除代码块，所以这不会</div><div class='del'>-带来任何运行时开销。然而，这种方法依旧允许 C 编译器查看块内的代码，并检查它的正确</div><div class='del'>-性（语法，类型，符号引用，等等）。因此，如果条件不满足，代码块内的引用符号将不存在，</div><div class='del'>-你必须继续使用 #ifdef。</div><div class='del'>-</div><div class='del'>-在任何有意义的 #if 或 #ifdef 块的末尾（超过几行），在 #endif 同一行的后面写下</div><div class='del'>-注释，指出该条件表达式被使用。例如：</div><div class='del'>-</div><div class='del'>-	#ifdef CONFIG_SOMETHING</div><div class='del'>-	...</div><div class='del'>-	#endif /* CONFIG_SOMETHING */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		附录 I：参考</div><div class='del'>-</div><div class='del'>-The C Programming Language, 第二版</div><div class='del'>-作者：Brian W. Kernighan 和 Denni M. Ritchie.</div><div class='del'>-Prentice Hall, Inc., 1988.</div><div class='del'>-ISBN 0-13-110362-8 (软皮), 0-13-110370-9 (硬皮).</div><div class='del'>-</div><div class='del'>-The Practice of Programming</div><div class='del'>-作者：Brian W. Kernighan 和 Rob Pike.</div><div class='del'>-Addison-Wesley, Inc., 1999.</div><div class='del'>-ISBN 0-201-61586-X.</div><div class='del'>-</div><div class='del'>-GNU 手册 - 遵循 K&amp;R 标准和此文本 - cpp, gcc, gcc internals and indent,</div><div class='del'>-都可以从 http://www.gnu.org/manual/ 找到</div><div class='del'>-</div><div class='del'>-WG14是C语言的国际标准化工作组，URL: http://www.open-std.org/JTC1/SC22/WG14/</div><div class='del'>-</div><div class='del'>-Kernel CodingStyle，作者 greg@kroah.com 发表于OLS 2002：</div><div class='del'>-http://www.kroah.com/linux/talks/ols_2002_kernel_codingstyle_talk/html/</div><div class='head'>diff --git a/Documentation/zh_CN/HOWTO b/Documentation/zh_CN/HOWTO<br/>deleted file mode 100644<br/>index f0613b92e0be..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/HOWTO?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/HOWTO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,536 +0,0 @@</div><div class='del'>-Chinese translated version of Documentation/HOWTO</div><div class='del'>-</div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='del'>-</div><div class='del'>-Maintainer: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='del'>-Chinese maintainer: Li Yang &lt;leoli@freescale.com&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/HOWTO 的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='del'>-交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='del'>-译存在问题，请联系中文版维护者。</div><div class='del'>-</div><div class='del'>-英文版维护者： Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='del'>-中文版维护者： 李阳  Li Yang &lt;leoli@freescale.com&gt;</div><div class='del'>-中文版翻译者： 李阳  Li Yang &lt;leoli@freescale.com&gt;</div><div class='del'>-中文版校译者： 钟宇  TripleX Chung &lt;xxx.phy@gmail.com&gt;</div><div class='del'>-               陈琦  Maggie Chen &lt;chenqi@beyondsoft.com&gt;</div><div class='del'>-               王聪  Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='del'>-</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-如何参与Linux内核开发</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-这是一篇将如何参与Linux内核开发的相关问题一网打尽的终极秘笈。它将指导你</div><div class='del'>-成为一名Linux内核开发者，并且学会如何同Linux内核开发社区合作。它尽可能不</div><div class='del'>-包括任何关于内核编程的技术细节，但会给你指引一条获得这些知识的正确途径。</div><div class='del'>-</div><div class='del'>-如果这篇文章中的任何内容不再适用，请给文末列出的文件维护者发送补丁。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-入门</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-你想了解如何成为一名Linux内核开发者？或者老板吩咐你“给这个设备写个Linux</div><div class='del'>-驱动程序”？这篇文章的目的就是教会你达成这些目标的全部诀窍，它将描述你需</div><div class='del'>-要经过的流程以及给出如何同内核社区合作的一些提示。它还将试图解释内核社区</div><div class='del'>-为何这样运作。</div><div class='del'>-</div><div class='del'>-Linux内核大部分是由C语言写成的，一些体系结构相关的代码用到了汇编语言。要</div><div class='del'>-参与内核开发，你必须精通C语言。除非你想为某个架构开发底层代码，否则你并</div><div class='del'>-不需要了解（任何体系结构的）汇编语言。下面列举的书籍虽然不能替代扎实的C</div><div class='del'>-语言教育和多年的开发经验，但如果需要的话，做为参考还是不错的：</div><div class='del'>- - "The C Programming Language" by Kernighan and Ritchie [Prentice Hall]</div><div class='del'>-   《C程序设计语言（第2版·新版）》（徐宝文 李志 译）[机械工业出版社]</div><div class='del'>- - "Practical C Programming" by Steve Oualline [O'Reilly]</div><div class='del'>-   《实用C语言编程（第三版）》（郭大海 译）[中国电力出版社]</div><div class='del'>- - "C:  A Reference Manual" by Harbison and Steele [Prentice Hall]</div><div class='del'>-   《C语言参考手册（原书第5版）》（邱仲潘 等译）[机械工业出版社]</div><div class='del'>-</div><div class='del'>-Linux内核使用GNU C和GNU工具链开发。虽然它遵循ISO C89标准，但也用到了一些</div><div class='del'>-标准中没有定义的扩展。内核是自给自足的C环境，不依赖于标准C库的支持，所以</div><div class='del'>-并不支持C标准中的部分定义。比如long long类型的大数除法和浮点运算就不允许</div><div class='del'>-使用。有时候确实很难弄清楚内核对工具链的要求和它所使用的扩展，不幸的是目</div><div class='del'>-前还没有明确的参考资料可以解释它们。请查阅gcc信息页（使用“info gcc”命令</div><div class='del'>-显示）获得一些这方面信息。</div><div class='del'>-</div><div class='del'>-请记住你是在学习怎么和已经存在的开发社区打交道。它由一群形形色色的人组成，</div><div class='del'>-他们对代码、风格和过程有着很高的标准。这些标准是在长期实践中总结出来的，</div><div class='del'>-适应于地理上分散的大型开发团队。它们已经被很好得整理成档，建议你在开发</div><div class='del'>-之前尽可能多的学习这些标准，而不要期望别人来适应你或者你公司的行为方式。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-法律问题</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-Linux内核源代码都是在GPL（通用公共许可证）的保护下发布的。要了解这种许可</div><div class='del'>-的细节请查看源代码主目录下的COPYING文件。如果你对它还有更深入问题请联系</div><div class='del'>-律师，而不要在Linux内核邮件组上提问。因为邮件组里的人并不是律师，不要期</div><div class='del'>-望他们的话有法律效力。</div><div class='del'>-</div><div class='del'>-对于GPL的常见问题和解答，请访问以下链接：</div><div class='del'>-	http://www.gnu.org/licenses/gpl-faq.html</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-文档</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-Linux内核代码中包含有大量的文档。这些文档对于学习如何与内核社区互动有着</div><div class='del'>-不可估量的价值。当一个新的功能被加入内核，最好把解释如何使用这个功能的文</div><div class='del'>-档也放进内核。当内核的改动导致面向用户空间的接口发生变化时，最好将相关信</div><div class='del'>-息或手册页(manpages)的补丁发到mtk.manpages@gmail.com，以向手册页(manpages)</div><div class='del'>-的维护者解释这些变化。</div><div class='del'>-</div><div class='del'>-以下是内核代码中需要阅读的文档：</div><div class='del'>-  README</div><div class='del'>-    文件简要介绍了Linux内核的背景，并且描述了如何配置和编译内核。内核的</div><div class='del'>-    新用户应该从这里开始。</div><div class='del'>-</div><div class='del'>-  Documentation/Changes</div><div class='del'>-    文件给出了用来编译和使用内核所需要的最小软件包列表。</div><div class='del'>-</div><div class='del'>-  Documentation/CodingStyle</div><div class='del'>-    描述Linux内核的代码风格和理由。所有新代码需要遵守这篇文档中定义的规</div><div class='del'>-    范。大多数维护者只会接收符合规定的补丁，很多人也只会帮忙检查符合风格</div><div class='del'>-    的代码。</div><div class='del'>-</div><div class='del'>-  Documentation/SubmittingPatches</div><div class='del'>-  Documentation/SubmittingDrivers</div><div class='del'>-    这两份文档明确描述如何创建和发送补丁，其中包括（但不仅限于)：</div><div class='del'>-       - 邮件内容</div><div class='del'>-       - 邮件格式</div><div class='del'>-       - 选择收件人</div><div class='del'>-    遵守这些规定并不能保证提交成功（因为所有补丁需要通过严格的内容和风格</div><div class='del'>-    审查），但是忽视他们几乎就意味着失败。</div><div class='del'>-</div><div class='del'>-    其他关于如何正确地生成补丁的优秀文档包括：</div><div class='del'>-    "The Perfect Patch"</div><div class='del'>-        http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='del'>-    "Linux kernel patch submission format"</div><div class='del'>-        http://linux.yyz.us/patch-format.html</div><div class='del'>-</div><div class='del'>-  Documentation/stable_api_nonsense.txt</div><div class='del'>-    论证内核为什么特意不包括稳定的内核内部API，也就是说不包括像这样的特</div><div class='del'>-    性：</div><div class='del'>-       - 子系统中间层（为了兼容性？）</div><div class='del'>-       - 在不同操作系统间易于移植的驱动程序</div><div class='del'>-       - 减缓（甚至阻止）内核代码的快速变化</div><div class='del'>-    这篇文档对于理解Linux的开发哲学至关重要。对于将开发平台从其他操作系</div><div class='del'>-    统转移到Linux的人来说也很重要。</div><div class='del'>-</div><div class='del'>-  Documentation/SecurityBugs</div><div class='del'>-    如果你认为自己发现了Linux内核的安全性问题，请根据这篇文档中的步骤来</div><div class='del'>-    提醒其他内核开发者并帮助解决这个问题。</div><div class='del'>-</div><div class='del'>-  Documentation/ManagementStyle</div><div class='del'>-    描述内核维护者的工作方法及其共有特点。这对于刚刚接触内核开发（或者对</div><div class='del'>-    它感到好奇）的人来说很重要，因为它解释了很多对于内核维护者独特行为的</div><div class='del'>-    普遍误解与迷惑。</div><div class='del'>-</div><div class='del'>-  Documentation/stable_kernel_rules.txt</div><div class='del'>-    解释了稳定版内核发布的规则，以及如何将改动放入这些版本的步骤。</div><div class='del'>-</div><div class='del'>-  Documentation/kernel-docs.txt</div><div class='del'>-    有助于内核开发的外部文档列表。如果你在内核自带的文档中没有找到你想找</div><div class='del'>-    的内容，可以查看这些文档。</div><div class='del'>-</div><div class='del'>-  Documentation/applying-patches.txt</div><div class='del'>-    关于补丁是什么以及如何将它打在不同内核开发分支上的好介绍</div><div class='del'>-</div><div class='del'>-内核还拥有大量从代码自动生成的文档。它包含内核内部API的全面介绍以及如何</div><div class='del'>-妥善处理加锁的规则。生成的文档会放在 Documentation/DocBook/目录下。在内</div><div class='del'>-核源码的主目录中使用以下不同命令将会分别生成PDF、Postscript、HTML和手册</div><div class='del'>-页等不同格式的文档：</div><div class='del'>-    make pdfdocs</div><div class='del'>-    make psdocs</div><div class='del'>-    make htmldocs</div><div class='del'>-    make mandocs</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-如何成为内核开发者</div><div class='del'>-------------------</div><div class='del'>-如果你对Linux内核开发一无所知，你应该访问“Linux内核新手”计划：</div><div class='del'>-	http://kernelnewbies.org</div><div class='del'>-它拥有一个可以问各种最基本的内核开发问题的邮件列表（在提问之前一定要记得</div><div class='del'>-查找已往的邮件，确认是否有人已经回答过相同的问题）。它还拥有一个可以获得</div><div class='del'>-实时反馈的IRC聊天频道，以及大量对于学习Linux内核开发相当有帮助的文档。</div><div class='del'>-</div><div class='del'>-网站简要介绍了源代码组织结构、子系统划分以及目前正在进行的项目（包括内核</div><div class='del'>-中的和单独维护的）。它还提供了一些基本的帮助信息，比如如何编译内核和打补</div><div class='del'>-丁。</div><div class='del'>-</div><div class='del'>-如果你想加入内核开发社区并协助完成一些任务，却找不到从哪里开始，可以访问</div><div class='del'>-“Linux内核房管员”计划：</div><div class='del'>-	http://kernelnewbies.org/KernelJanitors</div><div class='del'>-这是极佳的起点。它提供一个相对简单的任务列表，列出内核代码中需要被重新</div><div class='del'>-整理或者改正的地方。通过和负责这个计划的开发者们一同工作，你会学到将补丁</div><div class='del'>-集成进内核的基本原理。如果还没有决定下一步要做什么的话，你还可能会得到方</div><div class='del'>-向性的指点。</div><div class='del'>-</div><div class='del'>-如果你已经有一些现成的代码想要放到内核中，但是需要一些帮助来使它们拥有正</div><div class='del'>-确的格式。请访问“内核导师”计划。这个计划就是用来帮助你完成这个目标的。它</div><div class='del'>-是一个邮件列表，地址如下：</div><div class='del'>-	http://selenic.com/mailman/listinfo/kernel-mentors</div><div class='del'>-</div><div class='del'>-在真正动手修改内核代码之前，理解要修改的代码如何运作是必需的。要达到这个</div><div class='del'>-目的，没什么办法比直接读代码更有效了（大多数花招都会有相应的注释），而且</div><div class='del'>-一些特制的工具还可以提供帮助。例如，“Linux代码交叉引用”项目就是一个值得</div><div class='del'>-特别推荐的帮助工具，它将源代码显示在有编目和索引的网页上。其中一个更新及</div><div class='del'>-时的内核源码库，可以通过以下地址访问：</div><div class='del'>-	http://sosdg.org/~coywolf/lxr/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-开发流程</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-目前Linux内核开发流程包括几个“主内核分支”和很多子系统相关的内核分支。这</div><div class='del'>-些分支包括：</div><div class='del'>-  - 2.6.x主内核源码树</div><div class='del'>-  - 2.6.x.y -stable内核源码树</div><div class='del'>-  - 2.6.x -git内核补丁集</div><div class='del'>-  - 2.6.x -mm内核补丁集</div><div class='del'>-  - 子系统相关的内核源码树和补丁集</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2.6.x内核主源码树</div><div class='del'>------------------</div><div class='del'>-2.6.x内核是由Linus Torvalds（Linux的创造者）亲自维护的。你可以在</div><div class='del'>-kernel.org网站的pub/linux/kernel/v2.6/目录下找到它。它的开发遵循以下步</div><div class='del'>-骤：</div><div class='del'>-  - 每当一个新版本的内核被发布，为期两周的集成窗口将被打开。在这段时间里</div><div class='del'>-    维护者可以向Linus提交大段的修改，通常这些修改已经被放到-mm内核中几个</div><div class='del'>-    星期了。提交大量修改的首选方式是使用git工具（内核的代码版本管理工具</div><div class='del'>-    ，更多的信息可以在http://git-scm.com/获取），不过使用普通补丁也是可以</div><div class='del'>-    的。</div><div class='del'>-  - 两个星期以后-rc1版本内核发布。之后只有不包含可能影响整个内核稳定性的</div><div class='del'>-    新功能的补丁才可能被接受。请注意一个全新的驱动程序（或者文件系统）有</div><div class='del'>-    可能在-rc1后被接受是因为这样的修改完全独立，不会影响其他的代码，所以</div><div class='del'>-    没有造成内核退步的风险。在-rc1以后也可以用git向Linus提交补丁，不过所</div><div class='del'>-    有的补丁需要同时被发送到相应的公众邮件列表以征询意见。</div><div class='del'>-  - 当Linus认为当前的git源码树已经达到一个合理健全的状态足以发布供人测试</div><div class='del'>-    时，一个新的-rc版本就会被发布。计划是每周都发布新的-rc版本。</div><div class='del'>-  - 这个过程一直持续下去直到内核被认为达到足够稳定的状态，持续时间大概是</div><div class='del'>-    6个星期。</div><div class='del'>-</div><div class='del'>-关于内核发布，值得一提的是Andrew Morton在linux-kernel邮件列表中如是说：</div><div class='del'>-	“没有人知道新内核何时会被发布，因为发布是根据已知bug的情况来决定</div><div class='del'>-	的，而不是根据一个事先制定好的时间表。”</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2.6.x.y -stable（稳定版）内核源码树</div><div class='del'>------------------------------------</div><div class='del'>-由4个数字组成的内核版本号说明此内核是-stable版本。它们包含基于2.6.x版本</div><div class='del'>-内核的相对较小且至关重要的修补，这些修补针对安全性问题或者严重的内核退步。</div><div class='del'>-</div><div class='del'>-这种版本的内核适用于那些期望获得最新的稳定版内核并且不想参与测试开发版或</div><div class='del'>-者实验版的用户。</div><div class='del'>-</div><div class='del'>-如果没有2.6.x.y版本内核存在，那么最新的2.6.x版本内核就相当于是当前的稳定</div><div class='del'>-版内核。</div><div class='del'>-</div><div class='del'>-2.6.x.y版本由“稳定版”小组（邮件地址&lt;stable@vger.kernel.org&gt;）维护，一般隔周发</div><div class='del'>-布新版本。</div><div class='del'>-</div><div class='del'>-内核源码中的Documentation/stable_kernel_rules.txt文件具体描述了可被稳定</div><div class='del'>-版内核接受的修改类型以及发布的流程。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2.6.x -git补丁集</div><div class='del'>-----------------</div><div class='del'>-Linus的内核源码树的每日快照，这个源码树是由git工具管理的（由此得名）。这</div><div class='del'>-些补丁通常每天更新以反映Linus的源码树的最新状态。它们比-rc版本的内核源码</div><div class='del'>-树更具试验性质，因为这个补丁集是全自动生成的，没有任何人来确认其是否真正</div><div class='del'>-健全。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2.6.x -mm补丁集</div><div class='del'>----------------</div><div class='del'>-这是由Andrew Morton维护的试验性内核补丁集。Andrew将所有子系统的内核源码</div><div class='del'>-和补丁拼凑到一起，并且加入了大量从linux-kernel邮件列表中采集的补丁。这个</div><div class='del'>-源码树是新功能和补丁的试炼场。当补丁在-mm补丁集里证明了其价值以后Andrew</div><div class='del'>-或者相应子系统的维护者会将补丁发给Linus以便集成进主内核源码树。</div><div class='del'>-</div><div class='del'>-在将所有新补丁发给Linus以集成到主内核源码树之前，我们非常鼓励先把这些补</div><div class='del'>-丁放在-mm版内核源码树中进行测试。</div><div class='del'>-</div><div class='del'>-这些内核版本不适合在需要稳定运行的系统上运行，因为运行它们比运行任何其他</div><div class='del'>-内核分支都更具有风险。</div><div class='del'>-</div><div class='del'>-如果你想为内核开发进程提供帮助，请尝试并使用这些内核版本，并在</div><div class='del'>-linux-kernel邮件列表中提供反馈，告诉大家你遇到了问题还是一切正常。</div><div class='del'>-</div><div class='del'>-通常-mm版补丁集不光包括这些额外的试验性补丁，还包括发布时-git版主源码树</div><div class='del'>-中的改动。</div><div class='del'>-</div><div class='del'>--mm版内核没有固定的发布周期，但是通常在每两个-rc版内核发布之间都会有若干</div><div class='del'>-个-mm版内核发布（一般是1至3个）。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-子系统相关内核源码树和补丁集</div><div class='del'>-----------------------------</div><div class='del'>-相当一部分内核子系统开发者会公开他们自己的开发源码树，以便其他人能了解内</div><div class='del'>-核的不同领域正在发生的事情。如上所述，这些源码树会被集成到-mm版本内核中。</div><div class='del'>-</div><div class='del'>-下面是目前可用的一些内核源码树的列表：</div><div class='del'>-  通过git管理的源码树：</div><div class='del'>-    - Kbuild开发源码树， Sam Ravnborg &lt;sam@ravnborg.org&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git</div><div class='del'>-</div><div class='del'>-    - ACPI开发源码树, Len Brown &lt;len.brown@intel.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git</div><div class='del'>-</div><div class='del'>-    - 块设备开发源码树, Jens Axboe &lt;axboe@suse.de&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git</div><div class='del'>-</div><div class='del'>-    - DRM开发源码树, Dave Airlie &lt;airlied@linux.ie&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git</div><div class='del'>-</div><div class='del'>-    - ia64开发源码树, Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git</div><div class='del'>-</div><div class='del'>-    - ieee1394开发源码树, Jody McIntyre &lt;scjody@modernduck.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394.git</div><div class='del'>-</div><div class='del'>-    - infiniband开发源码树, Roland Dreier &lt;rolandd@cisco.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git</div><div class='del'>-</div><div class='del'>-    - libata开发源码树, Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git</div><div class='del'>-</div><div class='del'>-    - 网络驱动程序开发源码树, Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git</div><div class='del'>-</div><div class='del'>-    - pcmcia开发源码树, Dominik Brodowski &lt;linux@dominikbrodowski.net&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git</div><div class='del'>-</div><div class='del'>-    - SCSI开发源码树, James Bottomley &lt;James.Bottomley@SteelEye.com&gt;</div><div class='del'>-	git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git</div><div class='del'>-</div><div class='del'>-  使用quilt管理的补丁集：</div><div class='del'>-    - USB, PCI, 驱动程序核心和I2C, Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='del'>-	kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/</div><div class='del'>-    - x86-64, 部分i386, Andi Kleen &lt;ak@suse.de&gt;</div><div class='del'>-	ftp.firstfloor.org:/pub/ak/x86_64/quilt/</div><div class='del'>-</div><div class='del'>-  其他内核源码树可以在http://git.kernel.org的列表中和MAINTAINERS文件里</div><div class='del'>-  找到。</div><div class='del'>-</div><div class='del'>-报告bug</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-bugzilla.kernel.org是Linux内核开发者们用来跟踪内核Bug的网站。我们鼓励用</div><div class='del'>-户在这个工具中报告找到的所有bug。如何使用内核bugzilla的细节请访问：</div><div class='del'>-	http://test.kernel.org/bugzilla/faq.html</div><div class='del'>-</div><div class='del'>-内核源码主目录中的REPORTING-BUGS文件里有一个很好的模板。它指导用户如何报</div><div class='del'>-告可能的内核bug以及需要提供哪些信息来帮助内核开发者们找到问题的根源。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-利用bug报告</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-练习内核开发技能的最好办法就是修改其他人报告的bug。你不光可以帮助内核变</div><div class='del'>-得更加稳定，还可以学会如何解决实际问题从而提高自己的技能，并且让其他开发</div><div class='del'>-者感受到你的存在。修改bug是赢得其他开发者赞誉的最好办法，因为并不是很多</div><div class='del'>-人都喜欢浪费时间去修改别人报告的bug。</div><div class='del'>-</div><div class='del'>-要尝试修改已知的bug，请访问http://bugzilla.kernel.org网址。如果你想获得</div><div class='del'>-最新bug的通知，可以订阅bugme-new邮件列表（只有新的bug报告会被寄到这里）</div><div class='del'>-或者订阅bugme-janitor邮件列表（所有bugzilla的变动都会被寄到这里）。</div><div class='del'>-</div><div class='del'>-	https://lists.linux-foundation.org/mailman/listinfo/bugme-new</div><div class='del'>-	https://lists.linux-foundation.org/mailman/listinfo/bugme-janitors</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-邮件列表</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-正如上面的文档所描述，大多数的骨干内核开发者都加入了Linux Kernel邮件列</div><div class='del'>-表。如何订阅和退订列表的细节可以在这里找到：</div><div class='del'>-	http://vger.kernel.org/vger-lists.html#linux-kernel</div><div class='del'>-网上很多地方都有这个邮件列表的存档(archive)。可以使用搜索引擎来找到这些</div><div class='del'>-存档。比如：</div><div class='del'>-	http://dir.gmane.org/gmane.linux.kernel</div><div class='del'>-在发信之前，我们强烈建议你先在存档中搜索你想要讨论的问题。很多已经被详细</div><div class='del'>-讨论过的问题只在邮件列表的存档中可以找到。</div><div class='del'>-</div><div class='del'>-大多数内核子系统也有自己独立的邮件列表来协调各自的开发工作。从</div><div class='del'>-MAINTAINERS文件中可以找到不同话题对应的邮件列表。</div><div class='del'>-</div><div class='del'>-很多邮件列表架设在kernel.org服务器上。这些列表的信息可以在这里找到：</div><div class='del'>-	http://vger.kernel.org/vger-lists.html</div><div class='del'>-</div><div class='del'>-在使用这些邮件列表时，请记住保持良好的行为习惯。下面的链接提供了与这些列</div><div class='del'>-表（或任何其它邮件列表）交流的一些简单规则，虽然内容有点滥竽充数。</div><div class='del'>-	http://www.albion.com/netiquette/</div><div class='del'>-</div><div class='del'>-当有很多人回复你的邮件时，邮件的抄送列表会变得很长。请不要将任何人从抄送</div><div class='del'>-列表中删除，除非你有足够的理由这么做。也不要只回复到邮件列表。请习惯于同</div><div class='del'>-一封邮件接收两次（一封来自发送者一封来自邮件列表），而不要试图通过添加一</div><div class='del'>-些奇特的邮件头来解决这个问题，人们不会喜欢的。</div><div class='del'>-</div><div class='del'>-记住保留你所回复内容的上下文和源头。在你回复邮件的顶部保留“某某某说到……”</div><div class='del'>-这几行。将你的评论加在被引用的段落之间而不要放在邮件的顶部。</div><div class='del'>-</div><div class='del'>-如果你在邮件中附带补丁，请确认它们是可以直接阅读的纯文本（如</div><div class='del'>-Documentation/SubmittingPatches文档中所述）。内核开发者们不希望遇到附件</div><div class='del'>-或者被压缩了的补丁。只有这样才能保证他们可以直接评论你的每行代码。请确保</div><div class='del'>-你使用的邮件发送程序不会修改空格和制表符。一个防范性的测试方法是先将邮件</div><div class='del'>-发送给自己，然后自己尝试是否可以顺利地打上收到的补丁。如果测试不成功，请</div><div class='del'>-调整或者更换你的邮件发送程序直到它正确工作为止。</div><div class='del'>-</div><div class='del'>-总而言之，请尊重其他的邮件列表订阅者。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-同内核社区合作</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-内核社区的目标就是提供尽善尽美的内核。所以当你提交补丁期望被接受进内核的</div><div class='del'>-时候，它的技术价值以及其他方面都将被评审。那么你可能会得到什么呢？</div><div class='del'>-  - 批评</div><div class='del'>-  - 评论</div><div class='del'>-  - 要求修改</div><div class='del'>-  - 要求证明修改的必要性</div><div class='del'>-  - 沉默</div><div class='del'>-</div><div class='del'>-要记住，这些是把补丁放进内核的正常情况。你必须学会听取对补丁的批评和评论，</div><div class='del'>-从技术层面评估它们，然后要么重写你的补丁要么简明扼要地论证修改是不必要</div><div class='del'>-的。如果你发的邮件没有得到任何回应，请过几天后再试一次，因为有时信件会湮</div><div class='del'>-没在茫茫信海中。</div><div class='del'>-</div><div class='del'>-你不应该做的事情：</div><div class='del'>-  - 期望自己的补丁不受任何质疑就直接被接受</div><div class='del'>-  - 翻脸</div><div class='del'>-  - 忽略别人的评论</div><div class='del'>-  - 没有按照别人的要求做任何修改就重新提交</div><div class='del'>-</div><div class='del'>-在一个努力追寻最好技术方案的社区里，对于一个补丁有多少好处总会有不同的见</div><div class='del'>-解。你必须要抱着合作的态度，愿意改变自己的观点来适应内核的风格。或者至少</div><div class='del'>-愿意去证明你的想法是有价值的。记住，犯错误是允许的，只要你愿意朝着正确的</div><div class='del'>-方案去努力。</div><div class='del'>-</div><div class='del'>-如果你的第一个补丁换来的是一堆修改建议，这是很正常的。这并不代表你的补丁</div><div class='del'>-不会被接受，也不意味着有人和你作对。你只需要改正所有提出的问题然后重新发</div><div class='del'>-送你的补丁。</div><div class='del'>-</div><div class='del'>-内核社区和公司文化的差异</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-内核社区的工作模式同大多数传统公司开发队伍的工作模式并不相同。下面这些例</div><div class='del'>-子，可以帮助你避免某些可能发生问题：</div><div class='del'>-  用这些话介绍你的修改提案会有好处：</div><div class='del'>-    - 它同时解决了多个问题</div><div class='del'>-    - 它删除了2000行代码</div><div class='del'>-    - 这是补丁，它已经解释了我想要说明的</div><div class='del'>-    - 我在5种不同的体系结构上测试过它……</div><div class='del'>-    - 这是一系列小补丁用来……</div><div class='del'>-    - 这个修改提高了普通机器的性能……</div><div class='del'>-</div><div class='del'>-  应该避免如下的说法：</div><div class='del'>-    - 我们在AIX/ptx/Solaris就是这么做的，所以这么做肯定是好的……</div><div class='del'>-    - 我做这行已经20年了，所以……</div><div class='del'>-    - 为了我们公司赚钱考虑必须这么做</div><div class='del'>-    - 这是我们的企业产品线所需要的</div><div class='del'>-    - 这里是描述我观点的1000页设计文档</div><div class='del'>-    - 这是一个5000行的补丁用来……</div><div class='del'>-    - 我重写了现在乱七八糟的代码，这就是……</div><div class='del'>-    - 我被规定了最后期限，所以这个补丁需要立刻被接受</div><div class='del'>-</div><div class='del'>-另外一个内核社区与大部分传统公司的软件开发队伍不同的地方是无法面对面地交</div><div class='del'>-流。使用电子邮件和IRC聊天工具做为主要沟通工具的一个好处是性别和种族歧视</div><div class='del'>-将会更少。Linux内核的工作环境更能接受妇女和少数族群，因为每个人在别人眼</div><div class='del'>-里只是一个邮件地址。国际化也帮助了公平的实现，因为你无法通过姓名来判断人</div><div class='del'>-的性别。男人有可能叫李丽，女人也有可能叫王刚。大多数在Linux内核上工作过</div><div class='del'>-并表达过看法的女性对在linux上工作的经历都给出了正面的评价。</div><div class='del'>-</div><div class='del'>-对于一些不习惯使用英语的人来说，语言可能是一个引起问题的障碍。在邮件列表</div><div class='del'>-中要正确地表达想法必需良好地掌握语言，所以建议你在发送邮件之前最好检查一</div><div class='del'>-下英文写得是否正确。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-拆分修改</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-Linux内核社区并不喜欢一下接收大段的代码。修改需要被恰当地介绍、讨论并且</div><div class='del'>-拆分成独立的小段。这几乎完全和公司中的习惯背道而驰。你的想法应该在开发最</div><div class='del'>-开始的阶段就让大家知道，这样你就可以及时获得对你正在进行的开发的反馈。这</div><div class='del'>-样也会让社区觉得你是在和他们协作，而不是仅仅把他们当作倾销新功能的对象。</div><div class='del'>-无论如何，你不要一次性地向邮件列表发送50封信，你的补丁序列应该永远用不到</div><div class='del'>-这么多。</div><div class='del'>-</div><div class='del'>-将补丁拆开的原因如下：</div><div class='del'>-</div><div class='del'>-1) 小的补丁更有可能被接受，因为它们不需要太多的时间和精力去验证其正确性。</div><div class='del'>-   一个5行的补丁，可能在维护者看了一眼以后就会被接受。而500行的补丁则</div><div class='del'>-   需要数个小时来审查其正确性（所需时间随补丁大小增加大约呈指数级增长）。</div><div class='del'>-</div><div class='del'>-   当出了问题的时候，小的补丁也会让调试变得非常容易。一个一个补丁地回溯</div><div class='del'>-   将会比仔细剖析一个被打上的大补丁（这个补丁破坏了其他东西）容易得多。</div><div class='del'>-</div><div class='del'>-2）不光发送小的补丁很重要，在提交之前重新编排、化简（或者仅仅重新排列）</div><div class='del'>-   补丁也是很重要的。</div><div class='del'>-</div><div class='del'>-这里有内核开发者Al Viro打的一个比方：</div><div class='del'>-	“想象一个老师正在给学生批改数学作业。老师并不希望看到学生为了得</div><div class='del'>-	到正确解法所进行的尝试和产生的错误。他希望看到的是最干净最优雅的</div><div class='del'>-	解答。好学生了解这点，绝不会把最终解决之前的中间方案提交上去。”</div><div class='del'>-</div><div class='del'>-	内核开发也是这样。维护者和评审者不希望看到一个人在解决问题时的思</div><div class='del'>-	考过程。他们只希望看到简单和优雅的解决方案。</div><div class='del'>-</div><div class='del'>-直接给出一流的解决方案，和社区一起协作讨论尚未完成的工作，这两者之间似乎</div><div class='del'>-很难找到一个平衡点。所以最好尽早开始收集有利于你进行改进的反馈；同时也要</div><div class='del'>-保证修改分成很多小块，这样在整个项目都准备好被包含进内核之前，其中的一部</div><div class='del'>-分可能会先被接收。</div><div class='del'>-</div><div class='del'>-必须了解这样做是不可接受的：试图将未完成的工作提交进内核，然后再找时间修</div><div class='del'>-复。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-证明修改的必要性</div><div class='del'>-----------------</div><div class='del'>-除了将补丁拆成小块，很重要的一点是让Linux社区了解他们为什么需要这样修改。</div><div class='del'>-你必须证明新功能是有人需要的并且是有用的。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-记录修改</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-当你发送补丁的时候，需要特别留意邮件正文的内容。因为这里的信息将会做为补</div><div class='del'>-丁的修改记录(ChangeLog)，会被一直保留以备大家查阅。它需要完全地描述补丁，</div><div class='del'>-包括：</div><div class='del'>-  - 为什么需要这个修改</div><div class='del'>-  - 补丁的总体设计</div><div class='del'>-  - 实现细节</div><div class='del'>-  - 测试结果</div><div class='del'>-</div><div class='del'>-想了解它具体应该看起来像什么，请查阅以下文档中的“ChangeLog”章节：</div><div class='del'>-  “The Perfect Patch”</div><div class='del'>-  	 http://www.ozlabs.org/~akpm/stuff/tpp.txt</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-这些事情有时候做起来很难。要在任何方面都做到完美可能需要好几年时间。这是</div><div class='del'>-一个持续提高的过程，它需要大量的耐心和决心。只要不放弃，你一定可以做到。</div><div class='del'>-很多人已经做到了，而他们都曾经和现在的你站在同样的起点上。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>----------------</div><div class='del'>-感谢Paolo Ciarrocchi允许“开发流程”部分基于他所写的文章</div><div class='del'>-(http://www.kerneltravel.net/newbie/2.6-development_process)，感谢Randy</div><div class='del'>-Dunlap和Gerrit Huizenga完善了应该说和不该说的列表。感谢Pat Mochel, Hanna</div><div class='del'>-Linder, Randy Dunlap, Kay Sievers, Vojtech Pavlik, Jan Kara, Josh Boyer,</div><div class='del'>-Kees Cook, Andrew Morton, Andi Kleen, Vadim Lobanov, Jesper Juhl, Adrian</div><div class='del'>-Bunk, Keri Harris, Frans Pop, David A. Wheeler, Junio Hamano, Michael</div><div class='del'>-Kerrisk和Alex Shepard的评审、建议和贡献。没有他们的帮助，这篇文档是不可</div><div class='del'>-能完成的。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-英文版维护者： Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/Documentation/zh_CN/SecurityBugs b/Documentation/zh_CN/SecurityBugs<br/>deleted file mode 100644<br/>index d21eb07fe943..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/SecurityBugs?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/SecurityBugs</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-Chinese translated version of Documentation/SecurityBugs</div><div class='del'>-</div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='del'>-</div><div class='del'>-Chinese maintainer: Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/SecurityBugs 的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='del'>-交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='del'>-译存在问题，请联系中文版维护者。</div><div class='del'>-</div><div class='del'>-中文版维护者： 贾威威 Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='del'>-中文版翻译者： 贾威威 Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='del'>-中文版校译者： 贾威威 Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Linux内核开发者认为安全非常重要。因此，我们想要知道当一个有关于</div><div class='del'>-安全的漏洞被发现的时候，并且它可能会被尽快的修复或者公开。请把这个安全</div><div class='del'>-漏洞报告给Linux内核安全团队。</div><div class='del'>-</div><div class='del'>-1) 联系</div><div class='del'>-</div><div class='del'>-linux内核安全团队可以通过email&lt;security@kernel.org&gt;来联系。这是</div><div class='del'>-一组独立的安全工作人员，可以帮助改善漏洞报告并且公布和取消一个修复。安</div><div class='del'>-全团队有可能会从部分的维护者那里引进额外的帮助来了解并且修复安全漏洞。</div><div class='del'>-当遇到任何漏洞，所能提供的信息越多就越能诊断和修复。如果你不清楚什么</div><div class='del'>-是有帮助的信息，那就请重温一下REPORTING-BUGS文件中的概述过程。任</div><div class='del'>-何攻击性的代码都是非常有用的，未经报告者的同意不会被取消，除非它已经</div><div class='del'>-被公布于众。</div><div class='del'>-</div><div class='del'>-2) 公开</div><div class='del'>-</div><div class='del'>-Linux内核安全团队的宗旨就是和漏洞提交者一起处理漏洞的解决方案直</div><div class='del'>-到公开。我们喜欢尽快地完全公开漏洞。当一个漏洞或者修复还没有被完全地理</div><div class='del'>-解，解决方案没有通过测试或者供应商协调，可以合理地延迟公开。然而，我们</div><div class='del'>-期望这些延迟尽可能的短些，是可数的几天，而不是几个星期或者几个月。公开</div><div class='del'>-日期是通过安全团队和漏洞提供者以及供应商洽谈后的结果。公开时间表是从很</div><div class='del'>-短（特殊的，它已经被公众所知道）到几个星期。作为一个基本的默认政策，我</div><div class='del'>-们所期望通知公众的日期是7天的安排。</div><div class='del'>-</div><div class='del'>-3) 保密协议</div><div class='del'>-</div><div class='del'>-Linux内核安全团队不是一个正式的团体，因此不能加入任何的保密协议。</div><div class='head'>diff --git a/Documentation/zh_CN/SubmittingDrivers b/Documentation/zh_CN/SubmittingDrivers<br/>deleted file mode 100644<br/>index d313f5d8448d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/SubmittingDrivers?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/SubmittingDrivers</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,164 +0,0 @@</div><div class='del'>-Chinese translated version of Documentation/SubmittingDrivers</div><div class='del'>-</div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='del'>-</div><div class='del'>-Chinese maintainer: Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/SubmittingDrivers 的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='del'>-交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='del'>-译存在问题，请联系中文版维护者。</div><div class='del'>-</div><div class='del'>-中文版维护者： 李阳  Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>-中文版翻译者： 李阳  Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>-中文版校译者： 陈琦 Maggie Chen &lt;chenqi@beyondsoft.com&gt;</div><div class='del'>-               王聪 Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='del'>-               张巍 Zhang Wei &lt;Wei.Zhang@freescale.com&gt;</div><div class='del'>-</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-如何向 Linux 内核提交驱动程序</div><div class='del'>------------------------------</div><div class='del'>-</div><div class='del'>-这篇文档将会解释如何向不同的内核源码树提交设备驱动程序。请注意，如果你感</div><div class='del'>-兴趣的是显卡驱动程序，你也许应该访问 XFree86 项目(http://www.xfree86.org/)</div><div class='del'>-和／或 X.org 项目 (http://x.org)。</div><div class='del'>-</div><div class='del'>-另请参阅 Documentation/SubmittingPatches 文档。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-分配设备号</div><div class='del'>-----------</div><div class='del'>-</div><div class='del'>-块设备和字符设备的主设备号与从设备号是由 Linux 命名编号分配权威 LANANA（</div><div class='del'>-现在是 Torben Mathiasen）负责分配。申请的网址是 http://www.lanana.org/。</div><div class='del'>-即使不准备提交到主流内核的设备驱动也需要在这里分配设备号。有关详细信息，</div><div class='del'>-请参阅 Documentation/devices.txt。</div><div class='del'>-</div><div class='del'>-如果你使用的不是已经分配的设备号，那么当你提交设备驱动的时候，它将会被强</div><div class='del'>-制分配一个新的设备号，即便这个设备号和你之前发给客户的截然不同。</div><div class='del'>-</div><div class='del'>-设备驱动的提交对象</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-Linux 2.0:</div><div class='del'>-	此内核源码树不接受新的驱动程序。</div><div class='del'>-</div><div class='del'>-Linux 2.2:</div><div class='del'>-	此内核源码树不接受新的驱动程序。</div><div class='del'>-</div><div class='del'>-Linux 2.4:</div><div class='del'>-	如果所属的代码领域在内核的 MAINTAINERS 文件中列有一个总维护者，</div><div class='del'>-	那么请将驱动程序提交给他。如果此维护者没有回应或者你找不到恰当的</div><div class='del'>-	维护者，那么请联系 Willy Tarreau &lt;w@1wt.eu&gt;。</div><div class='del'>-</div><div class='del'>-Linux 2.6:</div><div class='del'>-	除了遵循和 2.4 版内核同样的规则外，你还需要在 linux-kernel 邮件</div><div class='del'>-	列表上跟踪最新的 API 变化。向 Linux 2.6 内核提交驱动的顶级联系人</div><div class='del'>-	是 Andrew Morton &lt;akpm@linux-foundation.org&gt;。</div><div class='del'>-</div><div class='del'>-决定设备驱动能否被接受的条件</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-许可：		代码必须使用 GNU 通用公开许可证 (GPL) 提交给 Linux，但是</div><div class='del'>-		我们并不要求 GPL 是唯一的许可。你或许会希望同时使用多种</div><div class='del'>-		许可证发布，如果希望驱动程序可以被其他开源社区（比如BSD）</div><div class='del'>-		使用。请参考 include/linux/module.h 文件中所列出的可被</div><div class='del'>-		接受共存的许可。</div><div class='del'>-</div><div class='del'>-版权：		版权所有者必须同意使用 GPL 许可。最好提交者和版权所有者</div><div class='del'>-		是相同个人或实体。否则，必需列出授权使用 GPL 的版权所有</div><div class='del'>-		人或实体，以备验证之需。</div><div class='del'>-</div><div class='del'>-接口：		如果你的驱动程序使用现成的接口并且和其他同类的驱动程序行</div><div class='del'>-		为相似，而不是去发明无谓的新接口，那么它将会更容易被接受。</div><div class='del'>-		如果你需要一个 Linux 和 NT 的通用驱动接口，那么请在用</div><div class='del'>-		户空间实现它。</div><div class='del'>-</div><div class='del'>-代码：		请使用 Documentation/CodingStyle 中所描述的 Linux 代码风</div><div class='del'>-		格。如果你的某些代码段（例如那些与 Windows 驱动程序包共</div><div class='del'>-		享的代码段）需要使用其他格式，而你却只希望维护一份代码，</div><div class='del'>-		那么请将它们很好地区分出来，并且注明原因。</div><div class='del'>-</div><div class='del'>-可移植性：	请注意，指针并不永远是 32 位的，不是所有的计算机都使用小</div><div class='del'>-		尾模式 (little endian) 存储数据，不是所有的人都拥有浮点</div><div class='del'>-		单元，不要随便在你的驱动程序里嵌入 x86 汇编指令。只能在</div><div class='del'>-		x86 上运行的驱动程序一般是不受欢迎的。虽然你可能只有 x86</div><div class='del'>-		硬件，很难测试驱动程序在其他平台上是否可用，但是确保代码</div><div class='del'>-		可以被轻松地移植却是很简单的。</div><div class='del'>-</div><div class='del'>-清晰度：	做到所有人都能修补这个驱动程序将会很有好处，因为这样你将</div><div class='del'>-		会直接收到修复的补丁而不是 bug 报告。如果你提交一个试图</div><div class='del'>-		隐藏硬件工作机理的驱动程序，那么它将会被扔进废纸篓。</div><div class='del'>-</div><div class='del'>-电源管理：	因为 Linux 正在被很多移动设备和桌面系统使用，所以你的驱</div><div class='del'>-		动程序也很有可能被使用在这些设备上。它应该支持最基本的电</div><div class='del'>-		源管理，即在需要的情况下实现系统级休眠和唤醒要用到的</div><div class='del'>-		.suspend 和 .resume 函数。你应该检查你的驱动程序是否能正</div><div class='del'>-		确地处理休眠与唤醒，如果实在无法确认，请至少把 .suspend</div><div class='del'>-		函数定义成返回 -ENOSYS（功能未实现）错误。你还应该尝试确</div><div class='del'>-		保你的驱动在什么都不干的情况下将耗电降到最低。要获得驱动</div><div class='del'>-		程序测试的指导，请参阅</div><div class='del'>-		Documentation/power/drivers-testing.txt。有关驱动程序电</div><div class='del'>-		源管理问题相对全面的概述，请参阅</div><div class='del'>-		Documentation/power/devices.txt。</div><div class='del'>-</div><div class='del'>-管理：		如果一个驱动程序的作者还在进行有效的维护，那么通常除了那</div><div class='del'>-		些明显正确且不需要任何检查的补丁以外，其他所有的补丁都会</div><div class='del'>-		被转发给作者。如果你希望成为驱动程序的联系人和更新者，最</div><div class='del'>-		好在代码注释中写明并且在 MAINTAINERS 文件中加入这个驱动</div><div class='del'>-		程序的条目。</div><div class='del'>-</div><div class='del'>-不影响设备驱动能否被接受的条件</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-供应商：	由硬件供应商来维护驱动程序通常是一件好事。不过，如果源码</div><div class='del'>-		树里已经有其他人提供了可稳定工作的驱动程序，那么请不要期</div><div class='del'>-		望“我是供应商”会成为内核改用你的驱动程序的理由。理想的情</div><div class='del'>-		况是：供应商与现有驱动程序的作者合作，构建一个统一完美的</div><div class='del'>-		驱动程序。</div><div class='del'>-</div><div class='del'>-作者：		驱动程序是由大的 Linux 公司研发还是由你个人编写，并不影</div><div class='del'>-		响其是否能被内核接受。没有人对内核源码树享有特权。只要你</div><div class='del'>-		充分了解内核社区，你就会发现这一点。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-资源列表</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-Linux 内核主源码树：</div><div class='del'>-	ftp.??.kernel.org:/pub/linux/kernel/...</div><div class='del'>-	?? == 你的国家代码，例如 "cn"、"us"、"uk"、"fr" 等等</div><div class='del'>-</div><div class='del'>-Linux 内核邮件列表：</div><div class='del'>-	linux-kernel@vger.kernel.org</div><div class='del'>-	[可通过向majordomo@vger.kernel.org发邮件来订阅]</div><div class='del'>-</div><div class='del'>-Linux 设备驱动程序，第三版（探讨 2.6.10 版内核）：</div><div class='del'>-	http://lwn.net/Kernel/LDD3/ （免费版）</div><div class='del'>-</div><div class='del'>-LWN.net:</div><div class='del'>-	每周内核开发活动摘要 - http://lwn.net/</div><div class='del'>-	2.6 版中 API 的变更：</div><div class='del'>-		http://lwn.net/Articles/2.6-kernel-api/</div><div class='del'>-	将旧版内核的驱动程序移植到 2.6 版：</div><div class='del'>-		http://lwn.net/Articles/driver-porting/</div><div class='del'>-</div><div class='del'>-内核新手(KernelNewbies):</div><div class='del'>-	为新的内核开发者提供文档和帮助</div><div class='del'>-	http://kernelnewbies.org/</div><div class='del'>-</div><div class='del'>-Linux USB项目：</div><div class='del'>-	http://www.linux-usb.org/</div><div class='del'>-</div><div class='del'>-写内核驱动的“不要”（Arjan van de Ven著）:</div><div class='del'>-	http://www.fenrus.org/how-to-not-write-a-device-driver-paper.pdf</div><div class='del'>-</div><div class='del'>-内核清洁工 (Kernel Janitor):</div><div class='del'>-	http://kernelnewbies.org/KernelJanitors</div><div class='head'>diff --git a/Documentation/zh_CN/SubmittingPatches b/Documentation/zh_CN/SubmittingPatches<br/>deleted file mode 100644<br/>index 1d3a10f8746b..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/SubmittingPatches?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/SubmittingPatches</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,412 +0,0 @@</div><div class='del'>-Chinese translated version of Documentation/SubmittingPatches</div><div class='del'>-</div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='del'>-</div><div class='del'>-Chinese maintainer: TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/SubmittingPatches 的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='del'>-交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='del'>-译存在问题，请联系中文版维护者。</div><div class='del'>-</div><div class='del'>-中文版维护者： 钟宇 TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>-中文版翻译者： 钟宇 TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>-中文版校译者： 李阳 Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>-               王聪 Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='del'>-</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-   如何让你的改动进入内核</div><div class='del'>-     或者</div><div class='del'>-  获得亲爱的 Linus Torvalds 的关注和处理</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-对于想要将改动提交到 Linux 内核的个人或者公司来说，如果不熟悉“规矩”，</div><div class='del'>-提交的流程会让人畏惧。本文档收集了一系列建议，这些建议可以大大的提高你</div><div class='del'>-的改动被接受的机会。</div><div class='del'>-阅读 Documentation/SubmitChecklist 来获得在提交代码前需要检查的项目的列</div><div class='del'>-表。如果你在提交一个驱动程序，那么同时阅读一下</div><div class='del'>-Documentation/SubmittingDrivers 。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>---------------------------</div><div class='del'>-第一节 - 创建并发送你的改动</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-1) "diff -up"</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-使用 "diff -up" 或者 "diff -uprN" 来创建补丁。</div><div class='del'>-</div><div class='del'>-所有内核的改动，都是以补丁的形式呈现的，补丁由 diff(1) 生成。创建补丁的</div><div class='del'>-时候，要确认它是以 "unified diff" 格式创建的，这种格式由 diff(1) 的 '-u'</div><div class='del'>-参数生成。而且，请使用 '-p' 参数，那样会显示每个改动所在的C函数，使得</div><div class='del'>-产生的补丁容易读得多。补丁应该基于内核源代码树的根目录，而不是里边的任</div><div class='del'>-何子目录。</div><div class='del'>-为一个单独的文件创建补丁，一般来说这样做就够了：</div><div class='del'>-</div><div class='del'>-        SRCTREE= linux-2.6</div><div class='del'>-        MYFILE=  drivers/net/mydriver.c</div><div class='del'>-</div><div class='del'>-        cd $SRCTREE</div><div class='del'>-        cp $MYFILE $MYFILE.orig</div><div class='del'>-        vi $MYFILE      # make your change</div><div class='del'>-        cd ..</div><div class='del'>-        diff -up $SRCTREE/$MYFILE{.orig,} &gt; /tmp/patch</div><div class='del'>-</div><div class='del'>-为多个文件创建补丁，你可以解开一个没有修改过的内核源代码树，然后和你自</div><div class='del'>-己的代码树之间做 diff 。例如：</div><div class='del'>-</div><div class='del'>-        MYSRC= /devel/linux-2.6</div><div class='del'>-</div><div class='del'>-        tar xvfz linux-2.6.12.tar.gz</div><div class='del'>-        mv linux-2.6.12 linux-2.6.12-vanilla</div><div class='del'>-        diff -uprN -X linux-2.6.12-vanilla/Documentation/dontdiff \</div><div class='del'>-                linux-2.6.12-vanilla $MYSRC &gt; /tmp/patch</div><div class='del'>-</div><div class='del'>-"dontdiff" 是内核在编译的时候产生的文件的列表，列表中的文件在 diff(1)</div><div class='del'>-产生的补丁里会被跳过。"dontdiff" 文件被包含在2.6.12和之后版本的内核源代</div><div class='del'>-码树中。对于更早的内核版本，你可以从</div><div class='del'>-&lt;http://www.xenotime.net/linux/doc/dontdiff&gt; 获取它。</div><div class='del'>-确定你的补丁里没有包含任何不属于这次补丁提交的额外文件。记得在用diff(1)</div><div class='del'>-生成补丁之后，审阅一次补丁，以确保准确。</div><div class='del'>-如果你的改动很散乱，你应该研究一下如何将补丁分割成独立的部分，将改动分</div><div class='del'>-割成一系列合乎逻辑的步骤。这样更容易让其他内核开发者审核，如果你想你的</div><div class='del'>-补丁被接受，这是很重要的。下面这些脚本能够帮助你做这件事情：</div><div class='del'>-Quilt:</div><div class='del'>-http://savannah.nongnu.org/projects/quilt</div><div class='del'>-</div><div class='del'>-2)描述你的改动。</div><div class='del'>-描述你的改动包含的技术细节。</div><div class='del'>-</div><div class='del'>-要多具体就写多具体。最糟糕的描述可能是像下面这些语句：“更新了某驱动程</div><div class='del'>-序”，“修正了某驱动程序的bug”，或者“这个补丁包含了某子系统的修改，请</div><div class='del'>-使用。”</div><div class='del'>-</div><div class='del'>-如果你的描述开始变长，这表示你也许需要拆分你的补丁了，请看第3小节，</div><div class='del'>-继续。</div><div class='del'>-</div><div class='del'>-3)拆分你的改动</div><div class='del'>-</div><div class='del'>-将改动拆分，逻辑类似的放到同一个补丁文件里。</div><div class='del'>-</div><div class='del'>-例如，如果你的改动里同时有bug修正和性能优化，那么把这些改动拆分到两个或</div><div class='del'>-者更多的补丁文件中。如果你的改动包含对API的修改，并且修改了驱动程序来适</div><div class='del'>-应这些新的API，那么把这些修改分成两个补丁。</div><div class='del'>-</div><div class='del'>-另一方面，如果你将一个单独的改动做成多个补丁文件，那么将它们合并成一个</div><div class='del'>-单独的补丁文件。这样一个逻辑上单独的改动只被包含在一个补丁文件里。</div><div class='del'>-</div><div class='del'>-如果有一个补丁依赖另外一个补丁来完成它的改动，那没问题。简单的在你的补</div><div class='del'>-丁描述里指出“这个补丁依赖某补丁”就好了。</div><div class='del'>-</div><div class='del'>-如果你不能将补丁浓缩成更少的文件，那么每次大约发送出15个，然后等待审查</div><div class='del'>-和整合。</div><div class='del'>-</div><div class='del'>-4)选择 e-mail 的收件人</div><div class='del'>-</div><div class='del'>-看一遍 MAINTAINERS 文件和源代码，看看你所的改动所在的内核子系统有没有指</div><div class='del'>-定的维护者。如果有，给他们发e-mail。</div><div class='del'>-</div><div class='del'>-如果没有找到维护者，或者维护者没有反馈，将你的补丁发送到内核开发者主邮</div><div class='del'>-件列表 linux-kernel@vger.kernel.org。大部分的内核开发者都跟踪这个邮件列</div><div class='del'>-表，可以评价你的改动。</div><div class='del'>-</div><div class='del'>-每次不要发送超过15个补丁到 vger 邮件列表！！！</div><div class='del'>-</div><div class='del'>-Linus Torvalds 是决定改动能否进入 Linux 内核的最终裁决者。他的 e-mail</div><div class='del'>-地址是 &lt;torvalds@linux-foundation.org&gt; 。他收到的 e-mail 很多，所以一般</div><div class='del'>-的说，最好别给他发 e-mail。</div><div class='del'>-</div><div class='del'>-那些修正bug，“显而易见”的修改或者是类似的只需要很少讨论的补丁可以直接</div><div class='del'>-发送或者CC给Linus。那些需要讨论或者没有很清楚的好处的补丁，一般先发送到</div><div class='del'>-linux-kernel邮件列表。只有当补丁被讨论得差不多了，才提交给Linus。</div><div class='del'>-</div><div class='del'>-5)选择CC( e-mail 抄送)列表</div><div class='del'>-</div><div class='del'>-除非你有理由不这样做，否则CC linux-kernel@vger.kernel.org。</div><div class='del'>-</div><div class='del'>-除了 Linus 之外，其他内核开发者也需要注意到你的改动，这样他们才能评论你</div><div class='del'>-的改动并提供代码审查和建议。linux-kernel 是 Linux 内核开发者主邮件列表</div><div class='del'>-。其它的邮件列表为特定的子系统提供服务，比如 USB，framebuffer 设备，虚</div><div class='del'>-拟文件系统，SCSI 子系统，等等。查看 MAINTAINERS 文件来获得和你的改动有</div><div class='del'>-关的邮件列表。</div><div class='del'>-</div><div class='del'>-Majordomo lists of VGER.KERNEL.ORG at:</div><div class='del'>-        &lt;http://vger.kernel.org/vger-lists.html&gt;</div><div class='del'>-</div><div class='del'>-如果改动影响了用户空间和内核之间的接口，请给 MAN-PAGES 的维护者（列在</div><div class='del'>-MAINTAINERS 文件里的）发送一个手册页（man-pages）补丁，或者至少通知一下改</div><div class='del'>-变，让一些信息有途径进入手册页。</div><div class='del'>-</div><div class='del'>-即使在第四步的时候，维护者没有作出回应，也要确认在修改他们的代码的时候</div><div class='del'>-，一直将维护者拷贝到CC列表中。</div><div class='del'>-</div><div class='del'>-对于小的补丁，你也许会CC到 Adrian Bunk 管理的搜集琐碎补丁的邮件列表</div><div class='del'>-(Trivial Patch Monkey)trivial@kernel.org，那里专门收集琐碎的补丁。下面这样</div><div class='del'>-的补丁会被看作“琐碎的”补丁：</div><div class='del'>-  文档的拼写修正。</div><div class='del'>-  修正会影响到 grep(1) 的拼写。</div><div class='del'>-  警告信息修正(频繁的打印无用的警告是不好的。)</div><div class='del'>-  编译错误修正（代码逻辑的确是对的，只是编译有问题。）</div><div class='del'>-  运行时修正（只要真的修正了错误。）</div><div class='del'>-  移除使用了被废弃的函数/宏的代码(例如 check_region。)</div><div class='del'>-  联系方式和文档修正。</div><div class='del'>-  用可移植的代码替换不可移植的代码（即使在体系结构相关的代码中，既然有</div><div class='del'>-  人拷贝，只要它是琐碎的）</div><div class='del'>-  任何文件的作者/维护者对该文件的改动（例如 patch monkey 在重传模式下）</div><div class='del'>-</div><div class='del'>-EMAIL: trivial@kernel.org</div><div class='del'>-</div><div class='del'>-(译注，关于“琐碎补丁”的一些说明：因为原文的这一部分写得比较简单，所以不得不</div><div class='del'>-违例写一下译注。"trivial"这个英文单词的本意是“琐碎的，不重要的。”但是在这里</div><div class='del'>-有稍微有一些变化，例如对一些明显的NULL指针的修正，属于运行时修正，会被归类</div><div class='del'>-到琐碎补丁里。虽然NULL指针的修正很重要，但是这样的修正往往很小而且很容易得到</div><div class='del'>-检验，所以也被归入琐碎补丁。琐碎补丁更精确的归类应该是</div><div class='del'>-“simple, localized &amp; easy to verify”，也就是说简单的，局部的和易于检验的。</div><div class='del'>-trivial@kernel.org邮件列表的目的是针对这样的补丁，为提交者提供一个中心，来</div><div class='del'>-降低提交的门槛。)</div><div class='del'>-</div><div class='del'>-6)没有 MIME 编码，没有链接，没有压缩，没有附件，只有纯文本。</div><div class='del'>-</div><div class='del'>-Linus 和其他的内核开发者需要阅读和评论你提交的改动。对于内核开发者来说</div><div class='del'>-，可以“引用”你的改动很重要，使用一般的 e-mail 工具，他们就可以在你的</div><div class='del'>-代码的任何位置添加评论。</div><div class='del'>-</div><div class='del'>-因为这个原因，所有的提交的补丁都是 e-mail 中“内嵌”的。</div><div class='del'>-警告：如果你使用剪切-粘贴你的补丁，小心你的编辑器的自动换行功能破坏你的</div><div class='del'>-补丁。</div><div class='del'>-</div><div class='del'>-不要将补丁作为 MIME 编码的附件，不管是否压缩。很多流行的 e-mail 软件不</div><div class='del'>-是任何时候都将 MIME 编码的附件当作纯文本发送的，这会使得别人无法在你的</div><div class='del'>-代码中加评论。另外，MIME 编码的附件会让 Linus 多花一点时间来处理，这就</div><div class='del'>-降低了你的改动被接受的可能性。</div><div class='del'>-</div><div class='del'>-警告：一些邮件软件，比如 Mozilla 会将你的信息以如下格式发送：</div><div class='del'>----- 邮件头 ----</div><div class='del'>-Content-Type: text/plain; charset=us-ascii; format=flowed</div><div class='del'>----- 邮件头 ----</div><div class='del'>-问题在于 “format=flowed” 会让接收端的某些邮件软件将邮件中的制表符替换</div><div class='del'>-成空格以及做一些类似的替换。这样，你发送的时候看起来没问题的补丁就被破</div><div class='del'>-坏了。</div><div class='del'>-</div><div class='del'>-要修正这个问题，只需要将你的 mozilla 的 defaults/pref/mailnews.js 文件</div><div class='del'>-里的</div><div class='del'>-pref("mailnews.send_plaintext_flowed", false); // RFC 2646=======</div><div class='del'>-修改成</div><div class='del'>-pref("mailnews.display.disable_format_flowed_support", true);</div><div class='del'>-就可以了。</div><div class='del'>-</div><div class='del'>-7) e-mail 的大小</div><div class='del'>-</div><div class='del'>-给 Linus 发送补丁的时候，永远按照第6小节说的做。</div><div class='del'>-</div><div class='del'>-大的改动对邮件列表不合适，对某些维护者也不合适。如果你的补丁，在不压缩</div><div class='del'>-的情况下，超过了40kB，那么你最好将补丁放在一个能通过 internet 访问的服</div><div class='del'>-务器上，然后用指向你的补丁的 URL 替代。</div><div class='del'>-</div><div class='del'>-8) 指出你的内核版本</div><div class='del'>-</div><div class='del'>-在标题和在补丁的描述中，指出补丁对应的内核的版本，是很重要的。</div><div class='del'>-</div><div class='del'>-如果补丁不能干净的在最新版本的内核上打上，Linus 是不会接受它的。</div><div class='del'>-</div><div class='del'>-9) 不要气馁，继续提交。</div><div class='del'>-</div><div class='del'>-当你提交了改动以后，耐心地等待。如果 Linus 喜欢你的改动并且同意它，那么</div><div class='del'>-它将在下一个内核发布版本中出现。</div><div class='del'>-</div><div class='del'>-然而，如果你的改动没有出现在下一个版本的内核中，可能有若干原因。减少那</div><div class='del'>-些原因，修正错误，重新提交更新后的改动，是你自己的工作。</div><div class='del'>-</div><div class='del'>-Linus不给出任何评论就“丢弃”你的补丁是常见的事情。在系统中这样的事情很</div><div class='del'>-平常。如果他没有接受你的补丁，也许是由于以下原因：</div><div class='del'>-* 你的补丁不能在最新版本的内核上干净的打上。</div><div class='del'>-* 你的补丁在 linux-kernel 邮件列表中没有得到充分的讨论。</div><div class='del'>-* 风格问题（参照第2小节）</div><div class='del'>-* 邮件格式问题（重读本节）</div><div class='del'>-* 你的改动有技术问题。</div><div class='del'>-* 他收到了成吨的 e-mail，而你的在混乱中丢失了。</div><div class='del'>-* 你让人为难。</div><div class='del'>-</div><div class='del'>-有疑问的时候，在 linux-kernel 邮件列表上请求评论。</div><div class='del'>-</div><div class='del'>-10) 在标题上加上 PATCH 的字样</div><div class='del'>-</div><div class='del'>-Linus 和 linux-kernel 邮件列表的 e-mail 流量都很高，一个通常的约定是标</div><div class='del'>-题行以 [PATCH] 开头。这样可以让 Linus 和其他内核开发人员可以从 e-mail</div><div class='del'>-的讨论中很轻易的将补丁分辨出来。</div><div class='del'>-</div><div class='del'>-11）为你的工作签名</div><div class='del'>-</div><div class='del'>-为了加强对谁做了何事的追踪，尤其是对那些透过好几层的维护者的补丁，我们</div><div class='del'>-建议在发送出去的补丁上加一个 “sign-off” 的过程。</div><div class='del'>-</div><div class='del'>-"sign-off" 是在补丁的注释的最后的简单的一行文字，认证你编写了它或者其他</div><div class='del'>-人有权力将它作为开放源代码的补丁传递。规则很简单：如果你能认证如下信息</div><div class='del'>-：</div><div class='del'>-      开发者来源证书 1.1</div><div class='del'>-      对于本项目的贡献，我认证如下信息：</div><div class='del'>-      （a）这些贡献是完全或者部分的由我创建，我有权利以文件中指出</div><div class='del'>-       的开放源代码许可证提交它；或者</div><div class='del'>-      （b）这些贡献基于以前的工作，据我所知，这些以前的工作受恰当的开放</div><div class='del'>-       源代码许可证保护，而且，根据许可证，我有权提交修改后的贡献，</div><div class='del'>-       无论是完全还是部分由我创造，这些贡献都使用同一个开放源代码许可证</div><div class='del'>-       （除非我被允许用其它的许可证），正如文件中指出的；或者</div><div class='del'>-      （c）这些贡献由认证（a），（b）或者（c）的人直接提供给我，而</div><div class='del'>-       且我没有修改它。</div><div class='del'>-      （d）我理解并同意这个项目和贡献是公开的，贡献的记录（包括我</div><div class='del'>-       一起提交的个人记录，包括 sign-off ）被永久维护并且可以和这个项目</div><div class='del'>-       或者开放源代码的许可证同步地再发行。</div><div class='del'>-       那么加入这样一行：</div><div class='del'>-       Signed-off-by: Random J Developer &lt;random@developer.example.org&gt;</div><div class='del'>-</div><div class='del'>-使用你的真名（抱歉，不能使用假名或者匿名。）</div><div class='del'>-</div><div class='del'>-有人在最后加上标签。现在这些东西会被忽略，但是你可以这样做，来标记公司</div><div class='del'>-内部的过程，或者只是指出关于 sign-off 的一些特殊细节。</div><div class='del'>-</div><div class='del'>-12）标准补丁格式</div><div class='del'>-</div><div class='del'>-标准的补丁，标题行是：</div><div class='del'>-    Subject: [PATCH 001/123] 子系统:一句话概述</div><div class='del'>-</div><div class='del'>-标准补丁的信体存在如下部分：</div><div class='del'>-</div><div class='del'>-  - 一个 "from" 行指出补丁作者。</div><div class='del'>-</div><div class='del'>-  - 一个空行</div><div class='del'>-</div><div class='del'>-  - 说明的主体，这些说明文字会被拷贝到描述该补丁的永久改动记录里。</div><div class='del'>-</div><div class='del'>-  - 一个由"---"构成的标记行</div><div class='del'>-</div><div class='del'>-  - 不合适放到改动记录里的额外的注解。</div><div class='del'>-</div><div class='del'>-  - 补丁本身（diff 输出）</div><div class='del'>-</div><div class='del'>-标题行的格式，使得对标题行按字母序排序非常的容易 - 很多 e-mail 客户端都</div><div class='del'>-可以支持 - 因为序列号是用零填充的，所以按数字排序和按字母排序是一样的。</div><div class='del'>-</div><div class='del'>-e-mail 标题中的“子系统”标识哪个内核子系统将被打补丁。</div><div class='del'>-</div><div class='del'>-e-mail 标题中的“一句话概述”扼要的描述 e-mail 中的补丁。“一句话概述”</div><div class='del'>-不应该是一个文件名。对于一个补丁系列（“补丁系列”指一系列的多个相关补</div><div class='del'>-丁），不要对每个补丁都使用同样的“一句话概述”。</div><div class='del'>-</div><div class='del'>-记住 e-mail 的“一句话概述”会成为该补丁的全局唯一标识。它会蔓延到 git</div><div class='del'>-的改动记录里。然后“一句话概述”会被用在开发者的讨论里，用来指代这个补</div><div class='del'>-丁。用户将希望通过 google 来搜索"一句话概述"来找到那些讨论这个补丁的文</div><div class='del'>-章。</div><div class='del'>-</div><div class='del'>-一些标题的例子：</div><div class='del'>-</div><div class='del'>-    Subject: [patch 2/5] ext2: improve scalability of bitmap searching</div><div class='del'>-    Subject: [PATCHv2 001/207] x86: fix eflags tracking</div><div class='del'>-</div><div class='del'>-"from" 行是信体里的最上面一行，具有如下格式：</div><div class='del'>-        From: Original Author &lt;author@example.com&gt;</div><div class='del'>-</div><div class='del'>-"from" 行指明在永久改动日志里，谁会被确认为作者。如果没有 "from" 行，那</div><div class='del'>-么邮件头里的 "From: " 行会被用来决定改动日志中的作者。</div><div class='del'>-</div><div class='del'>-说明的主题将会被提交到永久的源代码改动日志里，因此对那些早已经不记得和</div><div class='del'>-这个补丁相关的讨论细节的有能力的读者来说，是有意义的。</div><div class='del'>-</div><div class='del'>-"---" 标记行对于补丁处理工具要找到哪里是改动日志信息的结束，是不可缺少</div><div class='del'>-的。</div><div class='del'>-</div><div class='del'>-对于 "---" 标记之后的额外注解，一个好的用途就是用来写 diffstat，用来显</div><div class='del'>-示修改了什么文件和每个文件都增加和删除了多少行。diffstat 对于比较大的补</div><div class='del'>-丁特别有用。其余那些只是和时刻或者开发者相关的注解，不合适放到永久的改</div><div class='del'>-动日志里的，也应该放这里。</div><div class='del'>-使用 diffstat的选项 "-p 1 -w 70" 这样文件名就会从内核源代码树的目录开始</div><div class='del'>-，不会占用太宽的空间（很容易适合80列的宽度，也许会有一些缩进。）</div><div class='del'>-</div><div class='del'>-在后面的参考资料中能看到适当的补丁格式的更多细节。</div><div class='del'>-</div><div class='del'>--------------------------------</div><div class='del'>-第二节 提示，建议和诀窍</div><div class='del'>--------------------------------</div><div class='del'>-</div><div class='del'>-本节包含很多和提交到内核的代码有关的通常的"规则"。事情永远有例外...但是</div><div class='del'>-你必须真的有好的理由这样做。你可以把本节叫做Linus的计算机科学入门课。</div><div class='del'>-</div><div class='del'>-1) 读 Document/CodingStyle</div><div class='del'>-</div><div class='del'>-Nuff 说过，如果你的代码和这个偏离太多，那么它有可能会被拒绝，没有更多的</div><div class='del'>-审查，没有更多的评价。</div><div class='del'>-</div><div class='del'>-2) #ifdef 是丑陋的</div><div class='del'>-混杂了 ifdef 的代码难以阅读和维护。别这样做。作为替代，将你的 ifdef 放</div><div class='del'>-在头文件里，有条件地定义 "static inline" 函数，或者宏，在代码里用这些东</div><div class='del'>-西。让编译器把那些"空操作"优化掉。</div><div class='del'>-</div><div class='del'>-一个简单的例子，不好的代码：</div><div class='del'>-</div><div class='del'>-    dev = alloc_etherdev (sizeof(struct funky_private));</div><div class='del'>-    if (!dev)</div><div class='del'>-        return -ENODEV;</div><div class='del'>-    #ifdef CONFIG_NET_FUNKINESS</div><div class='del'>-    init_funky_net(dev);</div><div class='del'>-    #endif</div><div class='del'>-</div><div class='del'>-清理后的例子:</div><div class='del'>-</div><div class='del'>-(头文件里)</div><div class='del'>-    #ifndef CONFIG_NET_FUNKINESS</div><div class='del'>-    static inline void init_funky_net (struct net_device *d) {}</div><div class='del'>-    #endif</div><div class='del'>-</div><div class='del'>-(代码文件里)</div><div class='del'>-    dev = alloc_etherdev (sizeof(struct funky_private));</div><div class='del'>-    if (!dev)</div><div class='del'>-        return -ENODEV;</div><div class='del'>-    init_funky_net(dev);</div><div class='del'>-</div><div class='del'>-3) 'static inline' 比宏好</div><div class='del'>-</div><div class='del'>-Static inline 函数相比宏来说，是好得多的选择。Static inline 函数提供了</div><div class='del'>-类型安全，没有长度限制，没有格式限制，在 gcc 下开销和宏一样小。</div><div class='del'>-</div><div class='del'>-宏只在 static inline 函数不是最优的时候[在 fast paths 里有很少的独立的</div><div class='del'>-案例]，或者不可能用 static inline 函数的时候[例如字符串分配]。</div><div class='del'>-应该用 'static inline' 而不是 'static __inline__', 'extern inline' 和</div><div class='del'>-'extern __inline__' 。</div><div class='del'>-</div><div class='del'>-4) 不要过度设计</div><div class='del'>-</div><div class='del'>-不要试图预计模糊的未来事情，这些事情也许有用也许没有用："让事情尽可能的</div><div class='del'>-简单，而不是更简单"。</div><div class='del'>-</div><div class='del'>-----------------</div><div class='del'>-第三节 参考文献</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-Andrew Morton, "The perfect patch" (tpp).</div><div class='del'>-  &lt;http://www.ozlabs.org/~akpm/stuff/tpp.txt&gt;</div><div class='del'>-</div><div class='del'>-Jeff Garzik, "Linux kernel patch submission format".</div><div class='del'>-  &lt;http://linux.yyz.us/patch-format.html&gt;</div><div class='del'>-</div><div class='del'>-Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".</div><div class='del'>-  &lt;http://www.kroah.com/log/2005/03/31/&gt;</div><div class='del'>-  &lt;http://www.kroah.com/log/2005/07/08/&gt;</div><div class='del'>-  &lt;http://www.kroah.com/log/2005/10/19/&gt;</div><div class='del'>-  &lt;http://www.kroah.com/log/2006/01/11/&gt;</div><div class='del'>-</div><div class='del'>-NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!</div><div class='del'>-  &lt;https://lkml.org/lkml/2005/7/11/336&gt;</div><div class='del'>-</div><div class='del'>-Kernel Documentation/CodingStyle:</div><div class='del'>-  &lt;http://sosdg.org/~coywolf/lxr/source/Documentation/CodingStyle&gt;</div><div class='del'>-</div><div class='del'>-Linus Torvalds's mail on the canonical patch format:</div><div class='del'>-  &lt;http://lkml.org/lkml/2005/4/7/183&gt;</div><div class='del'>---</div><div class='head'>diff --git a/Documentation/zh_CN/oops-tracing.txt b/Documentation/zh_CN/oops-tracing.txt<br/>deleted file mode 100644<br/>index 9312608ffb8d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/oops-tracing.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/oops-tracing.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,212 +0,0 @@</div><div class='del'>-Chinese translated version of Documentation/oops-tracing.txt</div><div class='del'>-</div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='del'>-</div><div class='del'>-Chinese maintainer: Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/oops-tracing.txt 的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='del'>-交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='del'>-译存在问题，请联系中文版维护者。</div><div class='del'>-</div><div class='del'>-中文版维护者： 杨瑞 Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='del'>-中文版翻译者： 杨瑞 Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='del'>-中文版校译者： 李阳 Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>-               王聪 Wang Cong &lt;xiyou.wangcong@gmail.com&gt;</div><div class='del'>-</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-注意： ksymoops 在2.6中是没有用的。 请以原有格式使用Oops(来自dmesg，等等)。</div><div class='del'>-忽略任何这样那样关于“解码Oops”或者“通过ksymoops运行”的文档。 如果你贴出运行过</div><div class='del'>-ksymoops的来自2.6的Oops，人们只会让你重贴一次。</div><div class='del'>-</div><div class='del'>-快速总结</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-发现Oops并发送给看似相关的内核领域的维护者。别太担心对不上号。如果你不确定就发给</div><div class='del'>-和你所做的事情相关的代码的负责人。 如果可重现试着描述怎样重构。 那甚至比oops更有</div><div class='del'>-价值。</div><div class='del'>-</div><div class='del'>-如果你对于发送给谁一无所知， 发给linux-kernel@vger.kernel.org。感谢你帮助Linux</div><div class='del'>-尽可能地稳定。</div><div class='del'>-</div><div class='del'>-Oops在哪里?</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-通常Oops文本由klogd从内核缓冲区里读取并传给syslogd，由syslogd写到syslog文件中，</div><div class='del'>-典型地是/var/log/messages(依赖于/etc/syslog.conf)。有时klogd崩溃了,这种情况下你</div><div class='del'>-能够运行dmesg &gt; file来从内核缓冲区中读取数据并保存下来。 否则你可以</div><div class='del'>-cat /proc/kmsg &gt; file， 然而你必须介入中止传输， kmsg是一个“永不结束的文件”。如</div><div class='del'>-果机器崩溃坏到你不能输入命令或者磁盘不可用那么你有三种选择:-</div><div class='del'>-</div><div class='del'>-（1） 手抄屏幕上的文本待机器重启后再输入计算机。 麻烦但如果没有针对崩溃的准备，</div><div class='del'>-这是仅有的选择。 另外，你可以用数码相机把屏幕拍下来-不太好，但比没有强。 如果信</div><div class='del'>-息滚动到了终端的上面，你会发现以高分辩率启动（比如，vga=791）会让你读到更多的文</div><div class='del'>-本。（注意：这需要vesafb，所以对‘早期’的oops没有帮助）</div><div class='del'>-</div><div class='del'>-（2）用串口终端启动（请参看Documentation/serial-console.txt），运行一个null</div><div class='del'>-modem到另一台机器并用你喜欢的通讯工具获取输出。Minicom工作地很好。</div><div class='del'>-</div><div class='del'>-（3）使用Kdump（请参看Documentation/kdump/kdump.txt），</div><div class='del'>-使用在Documentation/kdump/gdbmacros.txt中定义的dmesg gdb宏，从旧的内存中提取内核</div><div class='del'>-环形缓冲区。</div><div class='del'>-</div><div class='del'>-完整信息</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-注意：以下来自于Linus的邮件适用于2.4内核。 我因为历史原因保留了它，并且因为其中</div><div class='del'>-一些信息仍然适用。 特别注意的是，请忽略任何ksymoops的引用。</div><div class='del'>-</div><div class='del'>-From: Linus Torvalds &lt;torvalds@osdl.org&gt;</div><div class='del'>-</div><div class='del'>-怎样跟踪Oops.. [原发到linux-kernel的一封邮件]</div><div class='del'>-</div><div class='del'>-主要的窍门是有五年和这些烦人的oops消息打交道的经验;-)</div><div class='del'>-</div><div class='del'>-实际上，你有办法使它更简单。我有两个不同的方法：</div><div class='del'>-</div><div class='del'>-	gdb /usr/src/linux/vmlinux</div><div class='del'>-	gdb&gt; disassemble &lt;offending_function&gt;</div><div class='del'>-</div><div class='del'>-那是发现问题的简单办法，至少如果bug报告做的好的情况下（象这个一样-运行ksymoops</div><div class='del'>-得到oops发生的函数及函数内的偏移）。</div><div class='del'>-</div><div class='del'>-哦，如果报告发生的内核以相同的编译器和相似的配置编译它会有帮助的。</div><div class='del'>-</div><div class='del'>-另一件要做的事是反汇编bug报告的“Code”部分：ksymoops也会用正确的工具来做这件事，</div><div class='del'>-但如果没有那些工具你可以写一个傻程序：</div><div class='del'>-</div><div class='del'>-	char str[] = "\xXX\xXX\xXX...";</div><div class='del'>-	main(){}</div><div class='del'>-</div><div class='del'>-并用gcc -g编译它然后执行“disassemble str”（XX部分是由Oops报告的值-你可以仅剪切</div><div class='del'>-粘贴并用“\x”替换空格-我就是这么做的，因为我懒得写程序自动做这一切）。</div><div class='del'>-</div><div class='del'>-另外，你可以用scripts/decodecode这个shell脚本。它的使用方法是：</div><div class='del'>-decodecode &lt; oops.txt</div><div class='del'>-</div><div class='del'>-“Code”之后的十六进制字节可能（在某些架构上）有一些当前指令之前的指令字节以及</div><div class='del'>-当前和之后的指令字节</div><div class='del'>-</div><div class='del'>-Code: f9 0f 8d f9 00 00 00 8d 42 0c e8 dd 26 11 c7 a1 60 ea 2b f9 8b 50 08 a1</div><div class='del'>-64 ea 2b f9 8d 34 82 8b 1e 85 db 74 6d 8b 15 60 ea 2b f9 &lt;8b&gt; 43 04 39 42 54</div><div class='del'>-7e 04 40 89 42 54 8b 43 04 3b 05 00 f6 52 c0</div><div class='del'>-</div><div class='del'>-最后，如果你想知道代码来自哪里，你可以：</div><div class='del'>-</div><div class='del'>-	cd /usr/src/linux</div><div class='del'>-	make fs/buffer.s 	# 或任何产生BUG的文件</div><div class='del'>-</div><div class='del'>-然后你会比gdb反汇编更清楚的知道发生了什么。</div><div class='del'>-</div><div class='del'>-现在，问题是把你所拥有的所有数据结合起来：C源码（关于它应该怎样的一般知识），</div><div class='del'>-汇编代码及其反汇编得到的代码（另外还有从“oops”消息得到的寄存器状态-对了解毁坏的</div><div class='del'>-指针有用，而且当你有了汇编代码你也能拿其它的寄存器和任何它们对应的C表达式做匹配</div><div class='del'>-）。</div><div class='del'>-</div><div class='del'>-实际上，你仅需看看哪里不匹配（这个例子是“Code”反汇编和编译器生成的代码不匹配）。</div><div class='del'>-然后你须要找出为什么不匹配。通常很简单-你看到代码使用了空指针然后你看代码想知道</div><div class='del'>-空指针是怎么出现的，还有检查它是否合法..</div><div class='del'>-</div><div class='del'>-现在，如果明白这是一项耗时的工作而且需要一丁点儿的专心，没错。这就是我为什么大多</div><div class='del'>-只是忽略那些没有符号表信息的崩溃报告的原因：简单的说太难查找了（我有一些</div><div class='del'>-程序用于在内核代码段中搜索特定的模式，而且有时我也已经能找出那些崩溃的地方，但是</div><div class='del'>-仅仅是找出正确的序列也确实需要相当扎实的内核知识）</div><div class='del'>-</div><div class='del'>-_有时_会发生这种情况，我仅看到崩溃中的反汇编代码序列， 然后我马上就明白问题出在</div><div class='del'>-哪里。这时我才意识到自己干这个工作已经太长时间了;-)</div><div class='del'>-</div><div class='del'>-		Linus</div><div class='del'>-</div><div class='del'>-</div><div class='del'>----------------------------------------------------------------------------</div><div class='del'>-关于Oops跟踪的注解：</div><div class='del'>-</div><div class='del'>-为了帮助Linus和其它内核开发者，klogd纳入了大量的支持来处理保护错误。为了拥有对</div><div class='del'>-地址解析的完整支持至少应该使用1.3-pl3的sysklogd包。</div><div class='del'>-</div><div class='del'>-当保护错误发生时，klogd守护进程自动把内核日志信息中的重要地址翻译成它们相应的符</div><div class='del'>-号。</div><div class='del'>-</div><div class='del'>-klogd执行两种类型的地址解析。首先是静态翻译其次是动态翻译。静态翻译和ksymoops</div><div class='del'>-一样使用System.map文件。为了做静态翻译klogd守护进程必须在初始化时能找到system</div><div class='del'>-map文件。关于klogd怎样搜索map文件请参看klogd手册页。</div><div class='del'>-</div><div class='del'>-动态地址翻译在使用内核可装载模块时很重要。 因为内核模块的内存是从内核动态内存池</div><div class='del'>-里分配的，所以不管是模块开始位置还是模块中函数和符号的位置都不是固定的。</div><div class='del'>-</div><div class='del'>-内核支持允许程序决定装载哪些模块和它们在内存中位置的系统调用。使用这些系统调用</div><div class='del'>-klogd守护进程生成一张符号表用于调试发生在可装载模块中的保护错误。</div><div class='del'>-</div><div class='del'>-至少klogd会提供产生保护错误的模块名。还可有额外的符号信息供可装载模块开发者选择</div><div class='del'>-以从模块中输出符号信息。</div><div class='del'>-</div><div class='del'>-因为内核模块环境可能是动态的，所以必须有一种机制当模块环境发生改变时来通知klogd</div><div class='del'>-守护进程。 有一些可用的命令行选项允许klogd向当前执行中的守护进程发送信号，告知符</div><div class='del'>-号信息应该被刷新了。 更多信息请参看klogd手册页。</div><div class='del'>-</div><div class='del'>-sysklogd发布时包含一个补丁修改了modules-2.0.0包，无论何时一个模块装载或者卸载都</div><div class='del'>-会自动向klogd发送信号。打上这个补丁提供了必要的对调试发生于内核可装载模块的保护</div><div class='del'>-错误的无缝支持。</div><div class='del'>-</div><div class='del'>-以下是被klogd处理过的发生在可装载模块中的一个保护错误例子：</div><div class='del'>----------------------------------------------------------------------------</div><div class='del'>-Aug 29 09:51:01 blizard kernel: Unable to handle kernel paging request at virtual address f15e97cc</div><div class='del'>-Aug 29 09:51:01 blizard kernel: current-&gt;tss.cr3 = 0062d000, %cr3 = 0062d000</div><div class='del'>-Aug 29 09:51:01 blizard kernel: *pde = 00000000</div><div class='del'>-Aug 29 09:51:01 blizard kernel: Oops: 0002</div><div class='del'>-Aug 29 09:51:01 blizard kernel: CPU:    0</div><div class='del'>-Aug 29 09:51:01 blizard kernel: EIP:    0010:[oops:_oops+16/3868]</div><div class='del'>-Aug 29 09:51:01 blizard kernel: EFLAGS: 00010212</div><div class='del'>-Aug 29 09:51:01 blizard kernel: eax: 315e97cc   ebx: 003a6f80   ecx: 001be77b   edx: 00237c0c</div><div class='del'>-Aug 29 09:51:01 blizard kernel: esi: 00000000   edi: bffffdb3   ebp: 00589f90   esp: 00589f8c</div><div class='del'>-Aug 29 09:51:01 blizard kernel: ds: 0018   es: 0018   fs: 002b   gs: 002b   ss: 0018</div><div class='del'>-Aug 29 09:51:01 blizard kernel: Process oops_test (pid: 3374, process nr: 21, stackpage=00589000)</div><div class='del'>-Aug 29 09:51:01 blizard kernel: Stack: 315e97cc 00589f98 0100b0b4 bffffed4 0012e38e 00240c64 003a6f80 00000001</div><div class='del'>-Aug 29 09:51:01 blizard kernel:        00000000 00237810 bfffff00 0010a7fa 00000003 00000001 00000000 bfffff00</div><div class='del'>-Aug 29 09:51:01 blizard kernel:        bffffdb3 bffffed4 ffffffda 0000002b 0007002b 0000002b 0000002b 00000036</div><div class='del'>-Aug 29 09:51:01 blizard kernel: Call Trace: [oops:_oops_ioctl+48/80] [_sys_ioctl+254/272] [_system_call+82/128]</div><div class='del'>-Aug 29 09:51:01 blizard kernel: Code: c7 00 05 00 00 00 eb 08 90 90 90 90 90 90 90 90 89 ec 5d c3</div><div class='del'>----------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-Dr. G.W. Wettstein           Oncology Research Div. Computing Facility</div><div class='del'>-Roger Maris Cancer Center    INTERNET: greg@wind.rmcc.com</div><div class='del'>-820 4th St. N.</div><div class='del'>-Fargo, ND  58122</div><div class='del'>-Phone: 701-234-7556</div><div class='del'>-</div><div class='del'>-</div><div class='del'>----------------------------------------------------------------------------</div><div class='del'>-受污染的内核</div><div class='del'>-</div><div class='del'>-一些oops报告在程序记数器之后包含字符串'Tainted: '。这表明内核已经被一些东西给污</div><div class='del'>-染了。 该字符串之后紧跟着一系列的位置敏感的字符，每个代表一个特定的污染值。</div><div class='del'>-</div><div class='del'>-  1：'G'如果所有装载的模块都有GPL或相容的许可证，'P'如果装载了任何的专有模块。</div><div class='del'>-没有模块MODULE_LICENSE或者带有insmod认为是与GPL不相容的的MODULE_LICENSE的模块被</div><div class='del'>-认定是专有的。</div><div class='del'>-</div><div class='del'>-  2：'F'如果有任何通过“insmod -f”被强制装载的模块，' '如果所有模块都被正常装载。</div><div class='del'>-</div><div class='del'>-  3：'S'如果oops发生在SMP内核中，运行于没有证明安全运行多处理器的硬件。 当前这种</div><div class='del'>-情况仅限于几种不支持SMP的速龙处理器。</div><div class='del'>-</div><div class='del'>-  4：'R'如果模块通过“insmod -f”被强制装载，' '如果所有模块都被正常装载。</div><div class='del'>-</div><div class='del'>-  5：'M'如果任何处理器报告了机器检查异常，' '如果没有发生机器检查异常。</div><div class='del'>-</div><div class='del'>-  6：'B'如果页释放函数发现了一个错误的页引用或者一些非预期的页标志。</div><div class='del'>-</div><div class='del'>-  7：'U'如果用户或者用户应用程序特别请求设置污染标志，否则' '。</div><div class='del'>-</div><div class='del'>-  8：'D'如果内核刚刚死掉，比如有OOPS或者BUG。</div><div class='del'>-</div><div class='del'>-使用'Tainted: '字符串的主要原因是要告诉内核调试者，这是否是一个干净的内核亦或发</div><div class='del'>-生了任何的不正常的事。污染是永久的：即使出错的模块已经被卸载了，污染值仍然存在，</div><div class='del'>-以表明内核不再值得信任。</div><div class='head'>diff --git a/Documentation/zh_CN/stable_api_nonsense.txt b/Documentation/zh_CN/stable_api_nonsense.txt<br/>deleted file mode 100644<br/>index c26a27d1ee7d..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/stable_api_nonsense.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/stable_api_nonsense.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,157 +0,0 @@</div><div class='del'>-Chinese translated version of Documentation/stable_api_nonsense.txt</div><div class='del'>-</div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for help.</div><div class='del'>-Contact the Chinese maintainer, if this translation is outdated or there</div><div class='del'>-is problem with translation.</div><div class='del'>-</div><div class='del'>-Maintainer: Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='del'>-Chinese maintainer: TripleX Chung &lt;zhongyu@18mail.cn&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/stable_api_nonsense.txt 的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='del'>-交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='del'>-译存在问题，请联系中文版维护者。</div><div class='del'>-</div><div class='del'>-英文版维护者： Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='del'>-中文版维护者： 钟宇  TripleX Chung &lt;zhongyu@18mail.cn&gt;</div><div class='del'>-中文版翻译者： 钟宇  TripleX Chung &lt;zhongyu@18mail.cn&gt;</div><div class='del'>-中文版校译者： 李阳  Li Yang &lt;leoli@freescale.com&gt;</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-写作本文档的目的，是为了解释为什么Linux既没有二进制内核接口，也没有稳定</div><div class='del'>-的内核接口。这里所说的内核接口，是指内核里的接口，而不是内核和用户空间</div><div class='del'>-的接口。内核到用户空间的接口，是提供给应用程序使用的系统调用，系统调用</div><div class='del'>-在历史上几乎没有过变化，将来也不会有变化。我有一些老应用程序是在0.9版本</div><div class='del'>-或者更早版本的内核上编译的，在使用2.6版本内核的Linux发布上依然用得很好</div><div class='del'>-。用户和应用程序作者可以将这个接口看成是稳定的。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-执行纲要</div><div class='del'>---------</div><div class='del'>-</div><div class='del'>-你也许以为自己想要稳定的内核接口，但是你不清楚你要的实际上不是它。你需</div><div class='del'>-要的其实是稳定的驱动程序，而你只有将驱动程序放到公版内核的源代码树里，</div><div class='del'>-才有可能达到这个目的。而且这样做还有很多其它好处，正是因为这些好处使得</div><div class='del'>-Linux能成为强壮，稳定，成熟的操作系统，这也是你最开始选择Linux的原因。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-入门</div><div class='del'>------</div><div class='del'>-</div><div class='del'>-只有那些写驱动程序的“怪人”才会担心内核接口的改变，对广大用户来说，既</div><div class='del'>-看不到内核接口，也不需要去关心它。</div><div class='del'>-</div><div class='del'>-首先，我不打算讨论关于任何非GPL许可的内核驱动的法律问题，这些非GPL许可</div><div class='del'>-的驱动程序包括不公开源代码，隐藏源代码，二进制或者是用源代码包装，或者</div><div class='del'>-是其它任何形式的不能以GPL许可公开源代码的驱动程序。如果有法律问题，请咨</div><div class='del'>-询律师，我只是一个程序员，所以我只打算探讨技术问题（不是小看法律问题，</div><div class='del'>-法律问题很实际，并且需要一直关注）。</div><div class='del'>-</div><div class='del'>-既然只谈技术问题，我们就有了下面两个主题：二进制内核接口和稳定的内核源</div><div class='del'>-代码接口。这两个问题是互相关联的，让我们先解决掉二进制接口的问题。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-二进制内核接口</div><div class='del'>---------------</div><div class='del'>-假如我们有一个稳定的内核源代码接口，那么自然而然的，我们就拥有了稳定的</div><div class='del'>-二进制接口，是这样的吗？错。让我们看看关于Linux内核的几点事实：</div><div class='del'>-    - 取决于所用的C编译器的版本，不同的内核数据结构里的结构体的对齐方</div><div class='del'>-式会有差别，代码中不同函数的表现形式也不一样（函数是不是被inline编译取</div><div class='del'>-决于编译器行为）。不同的函数的表现形式并不重要，但是数据结构内部的对齐</div><div class='del'>-方式很关键。</div><div class='del'>-    - 取决于内核的配置选项，不同的选项会让内核的很多东西发生改变：</div><div class='del'>-      - 同一个结构体可能包含不同的成员变量</div><div class='del'>-      - 有的函数可能根本不会被实现（比如编译的时候没有选择SMP支持</div><div class='del'>-，一些锁函数就会被定义成空函数）。</div><div class='del'>-      - 内核使用的内存会以不同的方式对齐，这取决于不同的内核配置选</div><div class='del'>-项。</div><div class='del'>-    - Linux可以在很多的不同体系结构的处理器上运行。在某个体系结构上编</div><div class='del'>-译好的二进制驱动程序，不可能在另外一个体系结构上正确的运行。</div><div class='del'>-</div><div class='del'>-对于一个特定的内核，满足这些条件并不难，使用同一个C编译器和同样的内核配</div><div class='del'>-置选项来编译驱动程序模块就可以了。这对于给一个特定Linux发布的特定版本提</div><div class='del'>-供驱动程序，是完全可以满足需求的。但是如果你要给不同发布的不同版本都发</div><div class='del'>-布一个驱动程序，就需要在每个发布上用不同的内核设置参数都编译一次内核，</div><div class='del'>-这简直跟噩梦一样。而且还要注意到，每个Linux发布还提供不同的Linux内核，</div><div class='del'>-这些内核都针对不同的硬件类型进行了优化（有很多种不同的处理器，还有不同</div><div class='del'>-的内核设置选项）。所以每发布一次驱动程序，都需要提供很多不同版本的内核</div><div class='del'>-模块。</div><div class='del'>-</div><div class='del'>-相信我，如果你真的要采取这种发布方式，一定会慢慢疯掉，我很久以前就有过</div><div class='del'>-深刻的教训...</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-稳定的内核源代码接口</div><div class='del'>---------------------</div><div class='del'>-</div><div class='del'>-如果有人不将他的内核驱动程序，放入公版内核的源代码树，而又想让驱动程序</div><div class='del'>-一直保持在最新的内核中可用，那么这个话题将会变得没完没了。</div><div class='del'>- 内核开发是持续而且快节奏的，从来都不会慢下来。内核开发人员在当前接口中</div><div class='del'>-找到bug，或者找到更好的实现方式。一旦发现这些，他们就很快会去修改当前的</div><div class='del'>-接口。修改接口意味着，函数名可能会改变，结构体可能被扩充或者删减，函数</div><div class='del'>-的参数也可能发生改变。一旦接口被修改，内核中使用这些接口的地方需要同时</div><div class='del'>-修正，这样才能保证所有的东西继续工作。</div><div class='del'>-</div><div class='del'>-举一个例子，内核的USB驱动程序接口在USB子系统的整个生命周期中，至少经历</div><div class='del'>-了三次重写。这些重写解决以下问题：</div><div class='del'>-    - 把数据流从同步模式改成非同步模式，这个改动减少了一些驱动程序的</div><div class='del'>-复杂度，提高了所有USB驱动程序的吞吐率，这样几乎所有的USB设备都能以最大</div><div class='del'>-速率工作了。</div><div class='del'>-    - 修改了USB核心代码中为USB驱动分配数据包内存的方式，所有的驱动都</div><div class='del'>-需要提供更多的参数给USB核心，以修正了很多已经被记录在案的死锁。</div><div class='del'>-</div><div class='del'>-这和一些封闭源代码的操作系统形成鲜明的对比，在那些操作系统上，不得不额</div><div class='del'>-外的维护旧的USB接口。这导致了一个可能性，新的开发者依然会不小心使用旧的</div><div class='del'>-接口，以不恰当的方式编写代码，进而影响到操作系统的稳定性。</div><div class='del'>- 在上面的例子中，所有的开发者都同意这些重要的改动，在这样的情况下修改代</div><div class='del'>-价很低。如果Linux保持一个稳定的内核源代码接口，那么就得创建一个新的接口</div><div class='del'>-；旧的，有问题的接口必须一直维护，给Linux USB开发者带来额外的工作。既然</div><div class='del'>-所有的Linux USB驱动的作者都是利用自己的时间工作，那么要求他们去做毫无意</div><div class='del'>-义的免费额外工作，是不可能的。</div><div class='del'>- 安全问题对Linux来说十分重要。一个安全问题被发现，就会在短时间内得到修</div><div class='del'>-正。在很多情况下，这将导致Linux内核中的一些接口被重写，以从根本上避免安</div><div class='del'>-全问题。一旦接口被重写，所有使用这些接口的驱动程序，必须同时得到修正，</div><div class='del'>-以确定安全问题已经得到修复并且不可能在未来还有同样的安全问题。如果内核</div><div class='del'>-内部接口不允许改变，那么就不可能修复这样的安全问题，也不可能确认这样的</div><div class='del'>-安全问题以后不会发生。</div><div class='del'>-开发者一直在清理内核接口。如果一个接口没有人在使用了，它就会被删除。这</div><div class='del'>-样可以确保内核尽可能的小，而且所有潜在的接口都会得到尽可能完整的测试</div><div class='del'>-（没有人使用的接口是不可能得到良好的测试的）。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-要做什么</div><div class='del'>--------</div><div class='del'>-</div><div class='del'>-如果你写了一个Linux内核驱动，但是它还不在Linux源代码树里，作为一个开发</div><div class='del'>-者，你应该怎么做？为每个发布的每个版本提供一个二进制驱动，那简直是一个</div><div class='del'>-噩梦，要跟上永远处于变化之中的内核接口，也是一件辛苦活。</div><div class='del'>-很简单，让你的驱动进入内核源代码树（要记得我们在谈论的是以GPL许可发行</div><div class='del'>-的驱动，如果你的代码不符合GPL，那么祝你好运，你只能自己解决这个问题了，</div><div class='del'>-你这个吸血鬼&lt;把Andrew和Linus对吸血鬼的定义链接到这里&gt;）。当你的代码加入</div><div class='del'>-公版内核源代码树之后，如果一个内核接口改变，你的驱动会直接被修改接口的</div><div class='del'>-那个人修改。保证你的驱动永远都可以编译通过，并且一直工作，你几乎不需要</div><div class='del'>-做什么事情。</div><div class='del'>-</div><div class='del'>-把驱动放到内核源代码树里会有很多的好处：</div><div class='del'>-    - 驱动的质量会提升，而维护成本（对原始作者来说）会下降。</div><div class='del'>-    - 其他人会给驱动添加新特性。</div><div class='del'>-    - 其他人会找到驱动中的bug并修复。</div><div class='del'>-    - 其他人会在驱动中找到性能优化的机会。</div><div class='del'>-    - 当外部的接口的改变需要修改驱动程序的时候，其他人会修改驱动程序</div><div class='del'>-。</div><div class='del'>-    - 不需要联系任何发行商，这个驱动会自动的随着所有的Linux发布一起发</div><div class='del'>-布。</div><div class='del'>-</div><div class='del'>-和别的操作系统相比，Linux为更多不同的设备提供现成的驱动，而且能在更多不</div><div class='del'>-同体系结构的处理器上支持这些设备。这个经过考验的开发模式，必然是错不了</div><div class='del'>-的 :)</div><div class='del'>-</div><div class='del'>--------------</div><div class='del'>-感谢 Randy Dunlap, Andrew Morton, David Brownell, Hanna Linder,</div><div class='del'>-Robert Love, and Nishanth Aravamudan 对于本文档早期版本的评审和建议。</div><div class='del'>-</div><div class='del'>-英文版维护者： Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='head'>diff --git a/Documentation/zh_CN/stable_kernel_rules.txt b/Documentation/zh_CN/stable_kernel_rules.txt<br/>deleted file mode 100644<br/>index 26ea5ed7cd9c..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/stable_kernel_rules.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/stable_kernel_rules.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-Chinese translated version of Documentation/stable_kernel_rules.txt</div><div class='del'>-</div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='del'>-</div><div class='del'>-Chinese maintainer: TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/stable_kernel_rules.txt 的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='del'>-交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='del'>-译存在问题，请联系中文版维护者。</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-中文版维护者： 钟宇  TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>-中文版翻译者： 钟宇  TripleX Chung &lt;triplex@zh-kernel.org&gt;</div><div class='del'>-中文版校译者： 李阳  Li Yang &lt;leo@zh-kernel.org&gt;</div><div class='del'>-               Kangkai Yin &lt;e12051@motorola.com&gt;</div><div class='del'>-</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-关于Linux 2.6稳定版发布，所有你想知道的事情。</div><div class='del'>-</div><div class='del'>-关于哪些类型的补丁可以被接收进入稳定版代码树，哪些不可以的规则：</div><div class='del'>-</div><div class='del'>-  - 必须是显而易见的正确，并且经过测试的。</div><div class='del'>-  - 连同上下文，不能大于100行。</div><div class='del'>-  - 必须只修正一件事情。</div><div class='del'>-  - 必须修正了一个给大家带来麻烦的真正的bug（不是“这也许是一个问题...”</div><div class='del'>-    那样的东西）。</div><div class='del'>-  - 必须修正带来如下后果的问题：编译错误（对被标记为CONFIG_BROKEN的例外），</div><div class='del'>-    内核崩溃，挂起，数据损坏，真正的安全问题，或者一些类似“哦，这不</div><div class='del'>-    好”的问题。简短的说，就是一些致命的问题。</div><div class='del'>-  - 没有“理论上的竞争条件”，除非能给出竞争条件如何被利用的解释。</div><div class='del'>-  - 不能存在任何的“琐碎的”修正（拼写修正，去掉多余空格之类的）。</div><div class='del'>-  - 必须被相关子系统的维护者接受。</div><div class='del'>-  - 必须遵循Documentation/SubmittingPatches里的规则。</div><div class='del'>-</div><div class='del'>-向稳定版代码树提交补丁的过程：</div><div class='del'>-</div><div class='del'>-  - 在确认了补丁符合以上的规则后，将补丁发送到stable@vger.kernel.org。</div><div class='del'>-  - 如果补丁被接受到队列里，发送者会收到一个ACK回复，如果没有被接受，收</div><div class='del'>-    到的是NAK回复。回复需要几天的时间，这取决于开发者的时间安排。</div><div class='del'>-  - 被接受的补丁会被加到稳定版本队列里，等待其他开发者的审查。</div><div class='del'>-  - 安全方面的补丁不要发到这个列表，应该发送到security@kernel.org。</div><div class='del'>-</div><div class='del'>-审查周期：</div><div class='del'>-</div><div class='del'>-  - 当稳定版的维护者决定开始一个审查周期，补丁将被发送到审查委员会，以</div><div class='del'>-    及被补丁影响的领域的维护者（除非提交者就是该领域的维护者）并且抄送</div><div class='del'>-    到linux-kernel邮件列表。</div><div class='del'>-  - 审查委员会有48小时的时间，用来决定给该补丁回复ACK还是NAK。</div><div class='del'>-  - 如果委员会中有成员拒绝这个补丁，或者linux-kernel列表上有人反对这个</div><div class='del'>-    补丁，并提出维护者和审查委员会之前没有意识到的问题，补丁会从队列中</div><div class='del'>-    丢弃。</div><div class='del'>-  - 在审查周期结束的时候，那些得到ACK回应的补丁将会被加入到最新的稳定版</div><div class='del'>-    发布中，一个新的稳定版发布就此产生。</div><div class='del'>-  - 安全性补丁将从内核安全小组那里直接接收到稳定版代码树中，而不是通过</div><div class='del'>-    通常的审查周期。请联系内核安全小组以获得关于这个过程的更多细节。</div><div class='del'>-</div><div class='del'>-审查委员会：</div><div class='del'>-  - 由一些自愿承担这项任务的内核开发者，和几个非志愿的组成。</div><div class='head'>diff --git a/Documentation/zh_CN/volatile-considered-harmful.txt b/Documentation/zh_CN/volatile-considered-harmful.txt<br/>deleted file mode 100644<br/>index ba8149d2233a..000000000000<br/>--- a/<a href='/drm-misc/tree/Documentation/zh_CN/volatile-considered-harmful.txt?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Documentation/zh_CN/volatile-considered-harmful.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,113 +0,0 @@</div><div class='del'>-Chinese translated version of Documentation/volatile-considered-harmful.txt</div><div class='del'>-</div><div class='del'>-If you have any comment or update to the content, please contact the</div><div class='del'>-original document maintainer directly.  However, if you have a problem</div><div class='del'>-communicating in English you can also ask the Chinese maintainer for</div><div class='del'>-help.  Contact the Chinese maintainer if this translation is outdated</div><div class='del'>-or if there is a problem with the translation.</div><div class='del'>-</div><div class='del'>-Maintainer: Jonathan Corbet &lt;corbet@lwn.net&gt;</div><div class='del'>-Chinese maintainer: Bryan Wu &lt;bryan.wu@analog.com&gt;</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-Documentation/volatile-considered-harmful.txt 的中文翻译</div><div class='del'>-</div><div class='del'>-如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文</div><div class='del'>-交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻</div><div class='del'>-译存在问题，请联系中文版维护者。</div><div class='del'>-</div><div class='del'>-英文版维护者： Jonathan Corbet &lt;corbet@lwn.net&gt;</div><div class='del'>-中文版维护者： 伍鹏  Bryan Wu &lt;bryan.wu@analog.com&gt;</div><div class='del'>-中文版翻译者： 伍鹏  Bryan Wu &lt;bryan.wu@analog.com&gt;</div><div class='del'>-中文版校译者： 张汉辉  Eugene Teo &lt;eugeneteo@kernel.sg&gt;</div><div class='del'>-               杨瑞  Dave Young &lt;hidave.darkstar@gmail.com&gt;</div><div class='del'>-以下为正文</div><div class='del'>----------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-为什么不应该使用“volatile”类型</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-C程序员通常认为volatile表示某个变量可以在当前执行的线程之外被改变；因此，在内核</div><div class='del'>-中用到共享数据结构时，常常会有C程序员喜欢使用volatile这类变量。换句话说，他们经</div><div class='del'>-常会把volatile类型看成某种简易的原子变量，当然它们不是。在内核中使用volatile几</div><div class='del'>-乎总是错误的；本文档将解释为什么这样。</div><div class='del'>-</div><div class='del'>-理解volatile的关键是知道它的目的是用来消除优化，实际上很少有人真正需要这样的应</div><div class='del'>-用。在内核中，程序员必须防止意外的并发访问破坏共享的数据结构，这其实是一个完全</div><div class='del'>-不同的任务。用来防止意外并发访问的保护措施，可以更加高效的避免大多数优化相关的</div><div class='del'>-问题。</div><div class='del'>-</div><div class='del'>-像volatile一样，内核提供了很多原语来保证并发访问时的数据安全（自旋锁, 互斥量,内</div><div class='del'>-存屏障等等），同样可以防止意外的优化。如果可以正确使用这些内核原语，那么就没有</div><div class='del'>-必要再使用volatile。如果仍然必须使用volatile，那么几乎可以肯定在代码的某处有一</div><div class='del'>-个bug。在正确设计的内核代码中，volatile能带来的仅仅是使事情变慢。</div><div class='del'>-</div><div class='del'>-思考一下这段典型的内核代码：</div><div class='del'>-</div><div class='del'>-    spin_lock(&amp;the_lock);</div><div class='del'>-    do_something_on(&amp;shared_data);</div><div class='del'>-    do_something_else_with(&amp;shared_data);</div><div class='del'>-    spin_unlock(&amp;the_lock);</div><div class='del'>-</div><div class='del'>-如果所有的代码都遵循加锁规则，当持有the_lock的时候，不可能意外的改变shared_data的</div><div class='del'>-值。任何可能访问该数据的其他代码都会在这个锁上等待。自旋锁原语跟内存屏障一样—— 它</div><div class='del'>-们显式的用来书写成这样 —— 意味着数据访问不会跨越它们而被优化。所以本来编译器认为</div><div class='del'>-它知道在shared_data里面将有什么，但是因为spin_lock()调用跟内存屏障一样，会强制编</div><div class='del'>-译器忘记它所知道的一切。那么在访问这些数据时不会有优化的问题。</div><div class='del'>-</div><div class='del'>-如果shared_data被声名为volatile，锁操作将仍然是必须的。就算我们知道没有其他人正在</div><div class='del'>-使用它，编译器也将被阻止优化对临界区内shared_data的访问。在锁有效的同时，</div><div class='del'>-shared_data不是volatile的。在处理共享数据的时候，适当的锁操作可以不再需要</div><div class='del'>-volatile —— 并且是有潜在危害的。</div><div class='del'>-</div><div class='del'>-volatile的存储类型最初是为那些内存映射的I/O寄存器而定义。在内核里，寄存器访问也应</div><div class='del'>-该被锁保护，但是人们也不希望编译器“优化”临界区内的寄存器访问。内核里I/O的内存访问</div><div class='del'>-是通过访问函数完成的；不赞成通过指针对I/O内存的直接访问，并且不是在所有体系架构上</div><div class='del'>-都能工作。那些访问函数正是为了防止意外优化而写的，因此，再说一次，volatile类型不</div><div class='del'>-是必需的。</div><div class='del'>-</div><div class='del'>-另一种引起用户可能使用volatile的情况是当处理器正忙着等待一个变量的值。正确执行一</div><div class='del'>-个忙等待的方法是：</div><div class='del'>-</div><div class='del'>-    while (my_variable != what_i_want)</div><div class='del'>-        cpu_relax();</div><div class='del'>-</div><div class='del'>-cpu_relax()调用会降低CPU的能量消耗或者让位于超线程双处理器；它也作为内存屏障一样出</div><div class='del'>-现，所以，再一次，volatile不是必需的。当然，忙等待一开始就是一种反常规的做法。</div><div class='del'>-</div><div class='del'>-在内核中，一些稀少的情况下volatile仍然是有意义的：</div><div class='del'>-</div><div class='del'>-  - 在一些体系架构的系统上，允许直接的I/0内存访问，那么前面提到的访问函数可以使用</div><div class='del'>-    volatile。基本上，每一个访问函数调用它自己都是一个小的临界区域并且保证了按照</div><div class='del'>-    程序员期望的那样发生访问操作。</div><div class='del'>-</div><div class='del'>-  - 某些会改变内存的内联汇编代码虽然没有什么其他明显的附作用，但是有被GCC删除的可</div><div class='del'>-    能性。在汇编声明中加上volatile关键字可以防止这种删除操作。</div><div class='del'>-</div><div class='del'>-  - Jiffies变量是一种特殊情况，虽然每次引用它的时候都可以有不同的值，但读jiffies</div><div class='del'>-    变量时不需要任何特殊的加锁保护。所以jiffies变量可以使用volatile，但是不赞成</div><div class='del'>-    其他跟jiffies相同类型变量使用volatile。Jiffies被认为是一种“愚蠢的遗留物"</div><div class='del'>-    （Linus的话）因为解决这个问题比保持现状要麻烦的多。</div><div class='del'>-</div><div class='del'>-  - 由于某些I/0设备可能会修改连续一致的内存,所以有时,指向连续一致内存的数据结构</div><div class='del'>-    的指针需要正确的使用volatile。网络适配器使用的环状缓存区正是这类情形的一个例</div><div class='del'>-    子，其中适配器用改变指针来表示哪些描述符已经处理过了。</div><div class='del'>-</div><div class='del'>-对于大多代码，上述几种可以使用volatile的情况都不适用。所以，使用volatile是一种</div><div class='del'>-bug并且需要对这样的代码额外仔细检查。那些试图使用volatile的开发人员需要退一步想想</div><div class='del'>-他们真正想实现的是什么。</div><div class='del'>-</div><div class='del'>-非常欢迎删除volatile变量的补丁 － 只要证明这些补丁完整的考虑了并发问题。</div><div class='del'>-</div><div class='del'>-注释</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-[1] http://lwn.net/Articles/233481/</div><div class='del'>-[2] http://lwn.net/Articles/233482/</div><div class='del'>-</div><div class='del'>-致谢</div><div class='del'>-----</div><div class='del'>-</div><div class='del'>-最初由Randy Dunlap推动并作初步研究</div><div class='del'>-由Jonathan Corbet撰写</div><div class='del'>-参考Satyam Sharma，Johannes Stezenbach，Jesper Juhl，Heikki Orsila，</div><div class='del'>-H. Peter Anvin，Philipp Hahn和Stefan Richter的意见改善了本档。</div><div class='head'>diff --git a/MAINTAINERS b/MAINTAINERS<br/>index ef0c801aff45..c35e0cea7831 100644<br/>--- a/<a href='/drm-misc/tree/MAINTAINERS?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>MAINTAINERS</a><br/>+++ b/<a href='/drm-misc/tree/MAINTAINERS?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>MAINTAINERS</a></div><div class='hunk'>@@ -35,13 +35,13 @@ trivial patch so apply some common sense.</div><div class='ctx'> </div><div class='ctx'> 	PLEASE check your patch with the automated style checker</div><div class='ctx'> 	(scripts/checkpatch.pl) to catch trivial style violations.</div><div class='del'>-	See Documentation/CodingStyle for guidance here.</div><div class='add'>+	See Documentation/process/coding-style.rst for guidance here.</div><div class='ctx'> </div><div class='ctx'> 	PLEASE CC: the maintainers and mailing lists that are generated</div><div class='ctx'> 	by scripts/get_maintainer.pl.  The results returned by the</div><div class='ctx'> 	script will be best if you have git installed and are making</div><div class='ctx'> 	your changes in a branch derived from Linus' latest git tree.</div><div class='del'>-	See Documentation/SubmittingPatches for details.</div><div class='add'>+	See Documentation/process/submitting-patches.rst for details.</div><div class='ctx'> </div><div class='ctx'> 	PLEASE try to include any credit lines you want added with the</div><div class='ctx'> 	patch. It avoids people being missed off by mistake and makes</div><div class='hunk'>@@ -54,7 +54,7 @@ trivial patch so apply some common sense.</div><div class='ctx'> 	of the Linux Foundation certificate of contribution and should</div><div class='ctx'> 	include a Signed-off-by: line.  The current version of this</div><div class='ctx'> 	"Developer's Certificate of Origin" (DCO) is listed in the file</div><div class='del'>-	Documentation/SubmittingPatches.</div><div class='add'>+	Documentation/process/submitting-patches.rst.</div><div class='ctx'> </div><div class='ctx'> 6.	Make sure you have the right to send any changes you make. If you</div><div class='ctx'> 	do changes at work you may find your employer owns the patch</div><div class='hunk'>@@ -74,10 +74,13 @@ Descriptions of section entries:</div><div class='ctx'> 	   These reviewers should be CCed on patches.</div><div class='ctx'> 	L: Mailing list that is relevant to this area</div><div class='ctx'> 	W: Web-page with status/info</div><div class='add'>+	B: URI for where to file bugs. A web-page with detailed bug</div><div class='add'>+	   filing info, a direct bug tracker link, or a mailto: URI.</div><div class='add'>+	C: URI for chat protocol, server and channel where developers</div><div class='add'>+	   usually hang out, for example irc://server/channel.</div><div class='ctx'> 	Q: Patchwork web based patch tracking system site</div><div class='ctx'> 	T: SCM tree type and location.</div><div class='ctx'> 	   Type is one of: git, hg, quilt, stgit, topgit</div><div class='del'>-	B: Bug tracking system location.</div><div class='ctx'> 	S: Status, one of the following:</div><div class='ctx'> 	   Supported:	Someone is actually paid to look after this.</div><div class='ctx'> 	   Maintained:	Someone actually looks after it.</div><div class='hunk'>@@ -139,7 +142,7 @@ S:	Maintained</div><div class='ctx'> F:	drivers/net/ethernet/3com/typhoon*</div><div class='ctx'> </div><div class='ctx'> 3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS)</div><div class='del'>-M:	Adam Radford &lt;linuxraid@lsi.com&gt;</div><div class='add'>+M:	Adam Radford &lt;aradford@gmail.com&gt;</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='ctx'> W:	http://www.lsi.com</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -256,6 +259,18 @@ L:	linux-gpio@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/gpio/gpio-104-idio-16.c</div><div class='ctx'> </div><div class='add'>+ACCES 104-QUAD-8 IIO DRIVER</div><div class='add'>+M:	William Breathitt Gray &lt;vilhelm.gray@gmail.com&gt;</div><div class='add'>+L:	linux-iio@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/iio/counter/104-quad-8.c</div><div class='add'>+</div><div class='add'>+ACCES PCI-IDIO-16 GPIO DRIVER</div><div class='add'>+M:	William Breathitt Gray &lt;vilhelm.gray@gmail.com&gt;</div><div class='add'>+L:	linux-gpio@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/gpio/gpio-pci-idio-16.c</div><div class='add'>+</div><div class='ctx'> ACENIC DRIVER</div><div class='ctx'> M:	Jes Sorensen &lt;jes@trained-monkey.org&gt;</div><div class='ctx'> L:	linux-acenic@sunsite.dk</div><div class='hunk'>@@ -530,6 +545,7 @@ S:	Supported</div><div class='ctx'> F:	fs/afs/</div><div class='ctx'> F:	include/net/af_rxrpc.h</div><div class='ctx'> F:	net/rxrpc/af_rxrpc.c</div><div class='add'>+W:	https://www.infradead.org/~dhowells/kafs/</div><div class='ctx'> </div><div class='ctx'> AGPGART DRIVER</div><div class='ctx'> M:	David Airlie &lt;airlied@linux.ie&gt;</div><div class='hunk'>@@ -577,6 +593,11 @@ T:	git git://linuxtv.org/anttip/media_tree.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/media/usb/airspy/</div><div class='ctx'> </div><div class='add'>+ALACRITECH GIGABIT ETHERNET DRIVER</div><div class='add'>+M:	Lino Sanfilippo &lt;LinoSanfilippo@gmx.de&gt;</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/net/ethernet/alacritech/*</div><div class='add'>+</div><div class='ctx'> ALCATEL SPEEDTOUCH USB DRIVER</div><div class='ctx'> M:	Duncan Sands &lt;duncan.sands@free.fr&gt;</div><div class='ctx'> L:	linux-usb@vger.kernel.org</div><div class='hunk'>@@ -628,7 +649,7 @@ S:	Maintained</div><div class='ctx'> F:	drivers/gpio/gpio-altera.c</div><div class='ctx'> </div><div class='ctx'> ALTERA SYSTEM RESOURCE DRIVER FOR ARRIA10 DEVKIT</div><div class='del'>-M:	Thor Thayer &lt;tthayer@opensource.altera.com&gt;</div><div class='add'>+M:	Thor Thayer &lt;thor.thayer@linux.intel.com&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/gpio/gpio-altera-a10sr.c</div><div class='ctx'> F:	drivers/mfd/altera-a10sr.c</div><div class='hunk'>@@ -794,7 +815,7 @@ S:	Supported</div><div class='ctx'> F:	drivers/iio/*/ad*</div><div class='ctx'> X:	drivers/iio/*/adjd*</div><div class='ctx'> F:	drivers/staging/iio/*/ad*</div><div class='del'>-F:	staging/iio/trigger/iio-trig-bfin-timer.c</div><div class='add'>+F:	drivers/staging/iio/trigger/iio-trig-bfin-timer.c</div><div class='ctx'> </div><div class='ctx'> ANALOG DEVICES INC DMA DRIVERS</div><div class='ctx'> M:	Lars-Peter Clausen &lt;lars@metafoo.de&gt;</div><div class='hunk'>@@ -862,8 +883,8 @@ S:	Odd fixes</div><div class='ctx'> F:	drivers/hwmon/applesmc.c</div><div class='ctx'> </div><div class='ctx'> APPLETALK NETWORK LAYER</div><div class='del'>-M:	Arnaldo Carvalho de Melo &lt;acme@ghostprotocols.net&gt;</div><div class='del'>-S:	Maintained</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Odd fixes</div><div class='ctx'> F:	drivers/net/appletalk/</div><div class='ctx'> F:	net/appletalk/</div><div class='ctx'> </div><div class='hunk'>@@ -961,6 +982,7 @@ M:	Russell King &lt;linux@armlinux.org.uk&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> W:	http://www.armlinux.org.uk/</div><div class='ctx'> S:	Maintained</div><div class='add'>+T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git</div><div class='ctx'> F:	arch/arm/</div><div class='ctx'> </div><div class='ctx'> ARM SUB-ARCHITECTURES</div><div class='hunk'>@@ -1026,6 +1048,7 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> N:	sun[x456789]i</div><div class='ctx'> F:	arch/arm/boot/dts/ntc-gr8*</div><div class='add'>+F:	arch/arm64/boot/dts/allwinner/</div><div class='ctx'> </div><div class='ctx'> ARM/Allwinner SoC Clock Support</div><div class='ctx'> M:	Emilio López &lt;emilio@elopez.com.ar&gt;</div><div class='hunk'>@@ -1043,6 +1066,7 @@ F:	arch/arm/mach-meson/</div><div class='ctx'> F:	arch/arm/boot/dts/meson*</div><div class='ctx'> F:	arch/arm64/boot/dts/amlogic/</div><div class='ctx'> F: 	drivers/pinctrl/meson/</div><div class='add'>+F:	drivers/mmc/host/meson*</div><div class='ctx'> N:	meson</div><div class='ctx'> </div><div class='ctx'> ARM/Annapurna Labs ALPINE ARCHITECTURE</div><div class='hunk'>@@ -1073,7 +1097,7 @@ F:	arch/arm/boot/dts/aspeed-*</div><div class='ctx'> F:	drivers/*/*aspeed*</div><div class='ctx'> </div><div class='ctx'> ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT</div><div class='del'>-M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='add'>+M:	Nicolas Ferre &lt;nicolas.ferre@microchip.com&gt;</div><div class='ctx'> M:	Alexandre Belloni &lt;alexandre.belloni@free-electrons.com&gt;</div><div class='ctx'> M:	Jean-Christophe Plagniol-Villard &lt;plagnioj@jcrosoft.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='hunk'>@@ -1136,6 +1160,7 @@ ARM/CLKDEV SUPPORT</div><div class='ctx'> M:	Russell King &lt;linux@armlinux.org.uk&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='add'>+T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev</div><div class='ctx'> F:	arch/arm/include/asm/clkdev.h</div><div class='ctx'> F:	drivers/clk/clkdev.c</div><div class='ctx'> </div><div class='hunk'>@@ -1209,13 +1234,9 @@ S:	Maintained</div><div class='ctx'> N:	efm32</div><div class='ctx'> </div><div class='ctx'> ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)</div><div class='del'>-M:	Daniel Ribeiro &lt;drwyrm@gmail.com&gt;</div><div class='del'>-M:	Stefan Schmidt &lt;stefan@openezx.org&gt;</div><div class='del'>-M:	Harald Welte &lt;laforge@openezx.org&gt;</div><div class='del'>-L:	openezx-devel@lists.openezx.org (moderated for non-subscribers)</div><div class='del'>-W:	http://www.openezx.org/</div><div class='add'>+M:	Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;</div><div class='add'>+L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='del'>-T:	topgit git://git.openezx.org/openezx.git</div><div class='ctx'> F:	arch/arm/mach-pxa/ezx.c</div><div class='ctx'> </div><div class='ctx'> ARM/FARADAY FA526 PORT</div><div class='hunk'>@@ -1486,8 +1507,9 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> L:	linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm/mach-oxnas/</div><div class='del'>-F:	arch/arm/boot/dts/oxnas*</div><div class='add'>+F:	arch/arm/boot/dts/ox8*.dtsi</div><div class='ctx'> F:	arch/arm/boot/dts/wd-mbwe.dts</div><div class='add'>+F:	arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts</div><div class='ctx'> N:	oxnas</div><div class='ctx'> </div><div class='ctx'> ARM/Mediatek RTC DRIVER</div><div class='hunk'>@@ -1503,8 +1525,10 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm/boot/dts/mt6*</div><div class='add'>+F:	arch/arm/boot/dts/mt7*</div><div class='ctx'> F:	arch/arm/boot/dts/mt8*</div><div class='ctx'> F:	arch/arm/mach-mediatek/</div><div class='add'>+F:	arch/arm64/boot/dts/mediatek/</div><div class='ctx'> N:	mtk</div><div class='ctx'> K:	mediatek</div><div class='ctx'> </div><div class='hunk'>@@ -1608,6 +1632,8 @@ F:	arch/arm/mach-qcom/</div><div class='ctx'> F:	arch/arm64/boot/dts/qcom/*</div><div class='ctx'> F:	drivers/i2c/busses/i2c-qup.c</div><div class='ctx'> F:	drivers/clk/qcom/</div><div class='add'>+F:	drivers/pinctrl/qcom/</div><div class='add'>+F:	drivers/dma/qcom/</div><div class='ctx'> F:	drivers/soc/qcom/</div><div class='ctx'> F:	drivers/spi/spi-qup.c</div><div class='ctx'> F:	drivers/tty/serial/msm_serial.h</div><div class='hunk'>@@ -1669,6 +1695,7 @@ M:	Krzysztof Kozlowski &lt;krzk@kernel.org&gt;</div><div class='ctx'> R:	Javier Martinez Canillas &lt;javier@osg.samsung.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)</div><div class='add'>+Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm/boot/dts/s3c*</div><div class='ctx'> F:	arch/arm/boot/dts/s5p*</div><div class='hunk'>@@ -1727,7 +1754,7 @@ F:	drivers/staging/media/platform/s5p-cec/</div><div class='ctx'> </div><div class='ctx'> ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT</div><div class='ctx'> M:	Andrzej Pietrasiewicz &lt;andrzej.p@samsung.com&gt;</div><div class='del'>-M:	Jacek Anaszewski &lt;j.anaszewski@samsung.com&gt;</div><div class='add'>+M:	Jacek Anaszewski &lt;jacek.anaszewski@gmail.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -1751,7 +1778,7 @@ F:	drivers/soc/renesas/</div><div class='ctx'> F:	include/linux/soc/renesas/</div><div class='ctx'> </div><div class='ctx'> ARM/SOCFPGA ARCHITECTURE</div><div class='del'>-M:	Dinh Nguyen &lt;dinguyen@opensource.altera.com&gt;</div><div class='add'>+M:	Dinh Nguyen &lt;dinguyen@kernel.org&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm/mach-socfpga/</div><div class='ctx'> F:	arch/arm/boot/dts/socfpga*</div><div class='hunk'>@@ -1761,12 +1788,12 @@ W:	http://www.rocketboards.org</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git</div><div class='ctx'> </div><div class='ctx'> ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT</div><div class='del'>-M:	Dinh Nguyen &lt;dinguyen@opensource.altera.com&gt;</div><div class='add'>+M:	Dinh Nguyen &lt;dinguyen@kernel.org&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/clk/socfpga/</div><div class='ctx'> </div><div class='ctx'> ARM/SOCFPGA EDAC SUPPORT</div><div class='del'>-M:	Thor Thayer &lt;tthayer@opensource.altera.com&gt;</div><div class='add'>+M:	Thor Thayer &lt;thor.thayer@linux.intel.com&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/edac/altera_edac.</div><div class='ctx'> </div><div class='hunk'>@@ -1782,16 +1809,16 @@ F:	drivers/char/hw_random/st-rng.c</div><div class='ctx'> F:	drivers/clocksource/arm_global_timer.c</div><div class='ctx'> F:	drivers/clocksource/clksrc_st_lpc.c</div><div class='ctx'> F:	drivers/cpufreq/sti-cpufreq.c</div><div class='add'>+F:	drivers/dma/st_fdma*</div><div class='ctx'> F:	drivers/i2c/busses/i2c-st.c</div><div class='ctx'> F:	drivers/media/rc/st_rc.c</div><div class='ctx'> F:	drivers/media/platform/sti/c8sectpfe/</div><div class='ctx'> F:	drivers/mmc/host/sdhci-st.c</div><div class='ctx'> F:	drivers/phy/phy-miphy28lp.c</div><div class='del'>-F:	drivers/phy/phy-miphy365x.c</div><div class='ctx'> F:	drivers/phy/phy-stih407-usb.c</div><div class='del'>-F:	drivers/phy/phy-stih41x-usb.c</div><div class='ctx'> F:	drivers/pinctrl/pinctrl-st.c</div><div class='ctx'> F:	drivers/remoteproc/st_remoteproc.c</div><div class='add'>+F:	drivers/remoteproc/st_slim_rproc.c</div><div class='ctx'> F:	drivers/reset/sti/</div><div class='ctx'> F:	drivers/rtc/rtc-st-lpc.c</div><div class='ctx'> F:	drivers/tty/serial/st-asc.c</div><div class='hunk'>@@ -1800,6 +1827,7 @@ F:	drivers/usb/host/ehci-st.c</div><div class='ctx'> F:	drivers/usb/host/ohci-st.c</div><div class='ctx'> F:	drivers/watchdog/st_lpc_wdt.c</div><div class='ctx'> F:	drivers/ata/ahci_st.c</div><div class='add'>+F:	include/linux/remoteproc/st_slim_rproc.h</div><div class='ctx'> </div><div class='ctx'> ARM/STM32 ARCHITECTURE</div><div class='ctx'> M:	Maxime Coquelin &lt;mcoquelin.stm32@gmail.com&gt;</div><div class='hunk'>@@ -1960,12 +1988,18 @@ F:	arch/arm/mach-pxa/include/mach/z2.h</div><div class='ctx'> </div><div class='ctx'> ARM/ZTE ARCHITECTURE</div><div class='ctx'> M:	Jun Nie &lt;jun.nie@linaro.org&gt;</div><div class='add'>+M:	Baoyou Xie &lt;baoyou.xie@linaro.org&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm/mach-zx/</div><div class='ctx'> F:	drivers/clk/zte/</div><div class='add'>+F:	drivers/reset/reset-zx2967.c</div><div class='add'>+F:	drivers/soc/zte/</div><div class='ctx'> F:	Documentation/devicetree/bindings/arm/zte.txt</div><div class='ctx'> F:	Documentation/devicetree/bindings/clock/zx296702-clk.txt</div><div class='add'>+F:	Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt</div><div class='add'>+F:	Documentation/devicetree/bindings/soc/zte/</div><div class='add'>+F:	include/dt-bindings/soc/zx*.h</div><div class='ctx'> </div><div class='ctx'> ARM/ZYNQ ARCHITECTURE</div><div class='ctx'> M:	Michal Simek &lt;michal.simek@xilinx.com&gt;</div><div class='hunk'>@@ -2152,64 +2186,56 @@ F:	include/linux/atm*</div><div class='ctx'> F:	include/uapi/linux/atm*</div><div class='ctx'> </div><div class='ctx'> ATMEL AT91 / AT32 MCI DRIVER</div><div class='del'>-M:	Ludovic Desroches &lt;ludovic.desroches@atmel.com&gt;</div><div class='add'>+M:	Ludovic Desroches &lt;ludovic.desroches@microchip.com&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/mmc/host/atmel-mci.c</div><div class='ctx'> </div><div class='ctx'> ATMEL AT91 SAMA5D2-Compatible Shutdown Controller</div><div class='del'>-M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='add'>+M:	Nicolas Ferre &lt;nicolas.ferre@microchip.com&gt;</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/power/reset/at91-sama5d2_shdwc.c</div><div class='ctx'> </div><div class='ctx'> ATMEL SAMA5D2 ADC DRIVER</div><div class='del'>-M:	Ludovic Desroches &lt;ludovic.desroches@atmel.com&gt;</div><div class='add'>+M:	Ludovic Desroches &lt;ludovic.desroches@microchip.com&gt;</div><div class='ctx'> L:	linux-iio@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/iio/adc/at91-sama5d2_adc.c</div><div class='ctx'> </div><div class='ctx'> ATMEL Audio ALSA driver</div><div class='del'>-M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='add'>+M:	Nicolas Ferre &lt;nicolas.ferre@microchip.com&gt;</div><div class='ctx'> L:	alsa-devel@alsa-project.org (moderated for non-subscribers)</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	sound/soc/atmel</div><div class='ctx'> </div><div class='del'>-ATMEL DMA DRIVER</div><div class='del'>-M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='del'>-L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='del'>-S:	Supported</div><div class='del'>-F:	drivers/dma/at_hdmac.c</div><div class='del'>-F:	drivers/dma/at_hdmac_regs.h</div><div class='del'>-F:	include/linux/platform_data/dma-atmel.h</div><div class='del'>-</div><div class='ctx'> ATMEL XDMA DRIVER</div><div class='del'>-M:	Ludovic Desroches &lt;ludovic.desroches@atmel.com&gt;</div><div class='add'>+M:	Ludovic Desroches &lt;ludovic.desroches@microchip.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org</div><div class='ctx'> L:	dmaengine@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/dma/at_xdmac.c</div><div class='ctx'> </div><div class='ctx'> ATMEL I2C DRIVER</div><div class='del'>-M:	Ludovic Desroches &lt;ludovic.desroches@atmel.com&gt;</div><div class='add'>+M:	Ludovic Desroches &lt;ludovic.desroches@microchip.com&gt;</div><div class='ctx'> L:	linux-i2c@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/i2c/busses/i2c-at91.c</div><div class='ctx'> </div><div class='ctx'> ATMEL ISI DRIVER</div><div class='del'>-M:	Ludovic Desroches &lt;ludovic.desroches@atmel.com&gt;</div><div class='add'>+M:	Ludovic Desroches &lt;ludovic.desroches@microchip.com&gt;</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/media/platform/soc_camera/atmel-isi.c</div><div class='ctx'> F:	include/media/atmel-isi.h</div><div class='ctx'> </div><div class='ctx'> ATMEL LCDFB DRIVER</div><div class='del'>-M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='add'>+M:	Nicolas Ferre &lt;nicolas.ferre@microchip.com&gt;</div><div class='ctx'> L:	linux-fbdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/video/fbdev/atmel_lcdfb.c</div><div class='ctx'> F:	include/video/atmel_lcdc.h</div><div class='ctx'> </div><div class='ctx'> ATMEL MACB ETHERNET DRIVER</div><div class='del'>-M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='add'>+M:	Nicolas Ferre &lt;nicolas.ferre@microchip.com&gt;</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/net/ethernet/cadence/</div><div class='ctx'> </div><div class='hunk'>@@ -2221,32 +2247,32 @@ S:	Supported</div><div class='ctx'> F:	drivers/mtd/nand/atmel_nand*</div><div class='ctx'> </div><div class='ctx'> ATMEL SDMMC DRIVER</div><div class='del'>-M:	Ludovic Desroches &lt;ludovic.desroches@atmel.com&gt;</div><div class='add'>+M:	Ludovic Desroches &lt;ludovic.desroches@microchip.com&gt;</div><div class='ctx'> L:	linux-mmc@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/mmc/host/sdhci-of-at91.c</div><div class='ctx'> </div><div class='ctx'> ATMEL SPI DRIVER</div><div class='del'>-M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='add'>+M:	Nicolas Ferre &lt;nicolas.ferre@microchip.com&gt;</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/spi/spi-atmel.*</div><div class='ctx'> </div><div class='ctx'> ATMEL SSC DRIVER</div><div class='del'>-M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='add'>+M:	Nicolas Ferre &lt;nicolas.ferre@microchip.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/misc/atmel-ssc.c</div><div class='ctx'> F:	include/linux/atmel-ssc.h</div><div class='ctx'> </div><div class='ctx'> ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS</div><div class='del'>-M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='add'>+M:	Nicolas Ferre &lt;nicolas.ferre@microchip.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/misc/atmel_tclib.c</div><div class='ctx'> F:	drivers/clocksource/tcb_clksrc.c</div><div class='ctx'> </div><div class='ctx'> ATMEL USBA UDC DRIVER</div><div class='del'>-M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='add'>+M:	Nicolas Ferre &lt;nicolas.ferre@microchip.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/usb/gadget/udc/atmel_usba_udc.*</div><div class='hunk'>@@ -2325,6 +2351,21 @@ F:	include/uapi/linux/ax25.h</div><div class='ctx'> F:	include/net/ax25.h</div><div class='ctx'> F:	net/ax25/</div><div class='ctx'> </div><div class='add'>+AXENTIA ASOC DRIVERS</div><div class='add'>+M:	Peter Rosin &lt;peda@axentia.se&gt;</div><div class='add'>+L:	alsa-devel@alsa-project.org (moderated for non-subscribers)</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/devicetree/bindings/sound/axentia,*</div><div class='add'>+F:	sound/soc/atmel/tse850-pcm5142.c</div><div class='add'>+</div><div class='add'>+AXENTIA ARM DEVICES</div><div class='add'>+M:	Peter Rosin &lt;peda@axentia.se&gt;</div><div class='add'>+L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/devicetree/bindings/arm/axentia.txt</div><div class='add'>+F:	arch/arm/boot/dts/at91-linea.dtsi</div><div class='add'>+F:	arch/arm/boot/dts/at91-tse850-3.dts</div><div class='add'>+</div><div class='ctx'> AZ6007 DVB DRIVER</div><div class='ctx'> M:	Mauro Carvalho Chehab &lt;mchehab@s-opensource.com&gt;</div><div class='ctx'> M:	Mauro Carvalho Chehab &lt;mchehab@kernel.org&gt;</div><div class='hunk'>@@ -2358,12 +2399,15 @@ S:	Maintained</div><div class='ctx'> F:	drivers/net/wireless/broadcom/b43legacy/</div><div class='ctx'> </div><div class='ctx'> BACKLIGHT CLASS/SUBSYSTEM</div><div class='del'>-M:	Jingoo Han &lt;jingoohan1@gmail.com&gt;</div><div class='ctx'> M:	Lee Jones &lt;lee.jones@linaro.org&gt;</div><div class='add'>+M:	Daniel Thompson &lt;daniel.thompson@linaro.org&gt;</div><div class='add'>+M:	Jingoo Han &lt;jingoohan1@gmail.com&gt;</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/video/backlight/</div><div class='ctx'> F:	include/linux/backlight.h</div><div class='add'>+F:	include/linux/pwm_backlight.h</div><div class='add'>+F:	Documentation/devicetree/bindings/leds/backlight</div><div class='ctx'> </div><div class='ctx'> BATMAN ADVANCED</div><div class='ctx'> M:	Marek Lindner &lt;mareklindner@neomailbox.ch&gt;</div><div class='hunk'>@@ -2401,6 +2445,14 @@ W:	https://linuxtv.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/media/platform/sti/bdisp</div><div class='ctx'> </div><div class='add'>+DELTA ST MEDIA DRIVER</div><div class='add'>+M:	Hugues Fruchet &lt;hugues.fruchet@st.com&gt;</div><div class='add'>+L:	linux-media@vger.kernel.org</div><div class='add'>+T:	git git://linuxtv.org/media_tree.git</div><div class='add'>+W:	https://linuxtv.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/media/platform/sti/delta</div><div class='add'>+</div><div class='ctx'> BEFS FILE SYSTEM</div><div class='ctx'> M:	Luis de Bethencourt &lt;luisbg@osg.samsung.com&gt;</div><div class='ctx'> M:	Salah Triki &lt;salah.triki@gmail.com&gt;</div><div class='hunk'>@@ -2537,6 +2589,8 @@ L:	netdev@vger.kernel.org</div><div class='ctx'> L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	kernel/bpf/</div><div class='add'>+F:	tools/testing/selftests/bpf/</div><div class='add'>+F:	lib/test_bpf.c</div><div class='ctx'> </div><div class='ctx'> BROADCOM B44 10/100 ETHERNET DRIVER</div><div class='ctx'> M:	Michael Chan &lt;michael.chan@broadcom.com&gt;</div><div class='hunk'>@@ -2575,6 +2629,12 @@ L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/net/ethernet/broadcom/bnx2x/</div><div class='ctx'> </div><div class='add'>+BROADCOM BNXT_EN 50 GIGABIT ETHERNET DRIVER</div><div class='add'>+M:	Michael Chan &lt;michael.chan@broadcom.com&gt;</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/net/ethernet/broadcom/bnxt/</div><div class='add'>+</div><div class='ctx'> BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE</div><div class='ctx'> M:	Florian Fainelli &lt;f.fainelli@gmail.com&gt;</div><div class='ctx'> M:	Ray Jui &lt;rjui@broadcom.com&gt;</div><div class='hunk'>@@ -2594,9 +2654,10 @@ M:	Lee Jones &lt;lee@kernel.org&gt;</div><div class='ctx'> M:	Eric Anholt &lt;eric@anholt.net&gt;</div><div class='ctx'> L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git</div><div class='add'>+T:	git git://github.com/anholt/linux</div><div class='ctx'> S:	Maintained</div><div class='ctx'> N:	bcm2835</div><div class='add'>+F:	drivers/staging/vc04_services</div><div class='ctx'> </div><div class='ctx'> BROADCOM BCM47XX MIPS ARCHITECTURE</div><div class='ctx'> M:	Hauke Mehrtens &lt;hauke@hauke-m.de&gt;</div><div class='hunk'>@@ -2667,6 +2728,13 @@ F:	drivers/irqchip/irq-brcmstb*</div><div class='ctx'> F:	include/linux/bcm963xx_nvram.h</div><div class='ctx'> F:	include/linux/bcm963xx_tag.h</div><div class='ctx'> </div><div class='add'>+BROADCOM BMIPS CPUFREQ DRIVER</div><div class='add'>+M:	Markus Mayer &lt;mmayer@broadcom.com&gt;</div><div class='add'>+M:	bcm-kernel-feedback-list@broadcom.com</div><div class='add'>+L:	linux-pm@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/cpufreq/bmips-cpufreq.c</div><div class='add'>+</div><div class='ctx'> BROADCOM TG3 GIGABIT ETHERNET DRIVER</div><div class='ctx'> M:	Siva Reddy Kallam &lt;siva.kallam@broadcom.com&gt;</div><div class='ctx'> M:	Prashant Sreedharan &lt;prashant@broadcom.com&gt;</div><div class='hunk'>@@ -2749,6 +2817,14 @@ L:	bcm-kernel-feedback-list@broadcom.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/mtd/nand/brcmnand/</div><div class='ctx'> </div><div class='add'>+BROADCOM STB AVS CPUFREQ DRIVER</div><div class='add'>+M:	Markus Mayer &lt;mmayer@broadcom.com&gt;</div><div class='add'>+M:	bcm-kernel-feedback-list@broadcom.com</div><div class='add'>+L:	linux-pm@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt</div><div class='add'>+F:	drivers/cpufreq/brcmstb*</div><div class='add'>+</div><div class='ctx'> BROADCOM SPECIFIC AMBA DRIVER (BCMA)</div><div class='ctx'> M:	Rafał Miłecki &lt;zajec5@gmail.com&gt;</div><div class='ctx'> L:	linux-wireless@vger.kernel.org</div><div class='hunk'>@@ -2763,12 +2839,23 @@ S:	Supported</div><div class='ctx'> F:	drivers/net/ethernet/broadcom/bcmsysport.*</div><div class='ctx'> </div><div class='ctx'> BROADCOM VULCAN ARM64 SOC</div><div class='del'>-M:	Jayachandran C. &lt;jchandra@broadcom.com&gt;</div><div class='add'>+M:	Jayachandran C. &lt;c.jayachandran@gmail.com&gt;</div><div class='ctx'> M:	bcm-kernel-feedback-list@broadcom.com</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm64/boot/dts/broadcom/vulcan*</div><div class='ctx'> </div><div class='add'>+BROADCOM NETXTREME-E ROCE DRIVER</div><div class='add'>+M:	Selvin Xavier &lt;selvin.xavier@broadcom.com&gt;</div><div class='add'>+M:	Devesh Sharma &lt;devesh.sharma@broadcom.com&gt;</div><div class='add'>+M:	Somnath Kotur &lt;somnath.kotur@broadcom.com&gt;</div><div class='add'>+M:	Sriharsha Basavapatna &lt;sriharsha.basavapatna@broadcom.com&gt;</div><div class='add'>+L:	linux-rdma@vger.kernel.org</div><div class='add'>+W:	http://www.broadcom.com</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/infiniband/hw/bnxt_re/</div><div class='add'>+F:	include/uapi/rdma/bnxt_re-abi.h</div><div class='add'>+</div><div class='ctx'> BROCADE BFA FC SCSI DRIVER</div><div class='ctx'> M:	Anil Gurumurthy &lt;anil.gurumurthy@qlogic.com&gt;</div><div class='ctx'> M:	Sudarsana Kalluru &lt;sudarsana.kalluru@qlogic.com&gt;</div><div class='hunk'>@@ -2937,7 +3024,14 @@ CAPELLA MICROSYSTEMS LIGHT SENSOR DRIVER</div><div class='ctx'> M:	Kevin Tsai &lt;ktsai@capellamicro.com&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/iio/light/cm*</div><div class='del'>-F:	Documentation/devicetree/bindings/i2c/trivial-devices.txt</div><div class='add'>+F:	Documentation/devicetree/bindings/i2c/trivial-admin-guide/devices.rst</div><div class='add'>+</div><div class='add'>+CAVIUM THUNDERX2 ARM64 SOC</div><div class='add'>+M:	Jayachandran C &lt;jnair@caviumnetworks.com&gt;</div><div class='add'>+L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	arch/arm64/boot/dts/cavium/thunder-99xx*</div><div class='add'>+F:	Documentation/devicetree/bindings/arm/cavium-thunder2.txt</div><div class='ctx'> </div><div class='ctx'> CAVIUM I2C DRIVER</div><div class='ctx'> M:	Jan Glauber &lt;jglauber@cavium.com&gt;</div><div class='hunk'>@@ -2957,6 +3051,13 @@ W:     http://www.cavium.com</div><div class='ctx'> S:     Supported</div><div class='ctx'> F:     drivers/net/ethernet/cavium/liquidio/</div><div class='ctx'> </div><div class='add'>+CAVIUM OCTEON-TX CRYPTO DRIVER</div><div class='add'>+M:	George Cherian &lt;george.cherian@cavium.com&gt;</div><div class='add'>+L:	linux-crypto@vger.kernel.org</div><div class='add'>+W:	http://www.cavium.com</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/crypto/cavium/cpt/</div><div class='add'>+</div><div class='ctx'> CC2520 IEEE-802.15.4 RADIO DRIVER</div><div class='ctx'> M:	Varka Bhadram &lt;varkabhadram@gmail.com&gt;</div><div class='ctx'> L:	linux-wpan@vger.kernel.org</div><div class='hunk'>@@ -2971,15 +3072,15 @@ L:	linux-media@vger.kernel.org</div><div class='ctx'> T:	git git://linuxtv.org/media_tree.git</div><div class='ctx'> W:	http://linuxtv.org</div><div class='ctx'> S:	Supported</div><div class='del'>-F:	Documentation/cec.txt</div><div class='add'>+F:	Documentation/media/kapi/cec-core.rst</div><div class='ctx'> F:	Documentation/media/uapi/cec</div><div class='del'>-F:	drivers/staging/media/cec/</div><div class='add'>+F:	drivers/media/cec/</div><div class='ctx'> F:	drivers/media/cec-edid.c</div><div class='ctx'> F:	drivers/media/rc/keymaps/rc-cec.c</div><div class='ctx'> F:	include/media/cec.h</div><div class='ctx'> F:	include/media/cec-edid.h</div><div class='del'>-F:	include/linux/cec.h</div><div class='del'>-F:	include/linux/cec-funcs.h</div><div class='add'>+F:	include/uapi/linux/cec.h</div><div class='add'>+F:	include/uapi/linux/cec-funcs.h</div><div class='ctx'> </div><div class='ctx'> CELL BROADBAND ENGINE ARCHITECTURE</div><div class='ctx'> M:	Arnd Bergmann &lt;arnd@arndb.de&gt;</div><div class='hunk'>@@ -3037,6 +3138,12 @@ F:	drivers/usb/host/whci/</div><div class='ctx'> F:	drivers/usb/wusbcore/</div><div class='ctx'> F:	include/linux/usb/wusb*</div><div class='ctx'> </div><div class='add'>+HT16K33 LED CONTROLLER DRIVER</div><div class='add'>+M:	Robin van der Gracht &lt;robin@protonic.nl&gt;</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/auxdisplay/ht16k33.c</div><div class='add'>+F:	Documentation/devicetree/bindings/display/ht16k33.txt</div><div class='add'>+</div><div class='ctx'> CFAG12864B LCD DRIVER</div><div class='ctx'> M:	Miguel Ojeda Sandonis &lt;miguel.ojeda.sandonis@gmail.com&gt;</div><div class='ctx'> W:	http://miguelojeda.es/auxdisplay.htm</div><div class='hunk'>@@ -3085,7 +3192,7 @@ M:	Harry Wei &lt;harryxiyou@gmail.com&gt;</div><div class='ctx'> L:	xiyoulinuxkernelgroup@googlegroups.com (subscribers-only)</div><div class='ctx'> L:	linux-kernel@zh-kernel.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	Documentation/zh_CN/</div><div class='add'>+F:	Documentation/translations/zh_CN/</div><div class='ctx'> </div><div class='ctx'> CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER</div><div class='ctx'> M:	Peter Chen &lt;Peter.Chen@nxp.com&gt;</div><div class='hunk'>@@ -3156,15 +3263,15 @@ S:	Supported</div><div class='ctx'> F:	drivers/clocksource</div><div class='ctx'> </div><div class='ctx'> CISCO FCOE HBA DRIVER</div><div class='del'>-M:	Hiral Patel &lt;hiralpat@cisco.com&gt;</div><div class='del'>-M:	Suma Ramars &lt;sramars@cisco.com&gt;</div><div class='del'>-M:	Brian Uchino &lt;buchino@cisco.com&gt;</div><div class='add'>+M:	Satish Kharat &lt;satishkh@cisco.com&gt;</div><div class='add'>+M:	Sesidhar Baddela &lt;sebaddel@cisco.com&gt;</div><div class='add'>+M:	Karan Tilak Kumar &lt;kartilak@cisco.com&gt;</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/scsi/fnic/</div><div class='ctx'> </div><div class='ctx'> CISCO SCSI HBA DRIVER</div><div class='del'>-M:	Narsimhulu Musini &lt;nmusini@cisco.com&gt;</div><div class='add'>+M:	Karan Tilak Kumar &lt;kartilak@cisco.com&gt;</div><div class='ctx'> M:	Sesidhar Baddela &lt;sebaddel@cisco.com&gt;</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -3341,9 +3448,11 @@ L:	linux-pm@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git</div><div class='ctx'> T:	git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)</div><div class='add'>+B:	https://bugzilla.kernel.org</div><div class='ctx'> F:	Documentation/cpu-freq/</div><div class='ctx'> F:	drivers/cpufreq/</div><div class='ctx'> F:	include/linux/cpufreq.h</div><div class='add'>+F:	tools/testing/selftests/cpufreq/</div><div class='ctx'> </div><div class='ctx'> CPU FREQUENCY DRIVERS - ARM BIG LITTLE</div><div class='ctx'> M:	Viresh Kumar &lt;viresh.kumar@linaro.org&gt;</div><div class='hunk'>@@ -3380,6 +3489,7 @@ M:	Daniel Lezcano &lt;daniel.lezcano@linaro.org&gt;</div><div class='ctx'> L:	linux-pm@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git</div><div class='add'>+B:	https://bugzilla.kernel.org</div><div class='ctx'> F:	drivers/cpuidle/*</div><div class='ctx'> F:	include/linux/cpuidle.h</div><div class='ctx'> </div><div class='hunk'>@@ -3425,6 +3535,7 @@ F:	arch/*/crypto/</div><div class='ctx'> F:	crypto/</div><div class='ctx'> F:	drivers/crypto/</div><div class='ctx'> F:	include/crypto/</div><div class='add'>+F:	include/linux/crypto*</div><div class='ctx'> </div><div class='ctx'> CRYPTOGRAPHIC RANDOM NUMBER GENERATOR</div><div class='ctx'> M:	Neil Horman &lt;nhorman@tuxdriver.com&gt;</div><div class='hunk'>@@ -3525,7 +3636,7 @@ F:	drivers/infiniband/hw/cxgb3/</div><div class='ctx'> F:	include/uapi/rdma/cxgb3-abi.h</div><div class='ctx'> </div><div class='ctx'> CXGB4 ETHERNET DRIVER (CXGB4)</div><div class='del'>-M:	Hariprasad S &lt;hariprasad@chelsio.com&gt;</div><div class='add'>+M:	Ganesh Goudar &lt;ganeshgr@chelsio.com&gt;</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> W:	http://www.chelsio.com</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -3752,6 +3863,7 @@ F:	include/linux/devcoredump.h</div><div class='ctx'> DEVICE FREQUENCY (DEVFREQ)</div><div class='ctx'> M:	MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;</div><div class='ctx'> M:	Kyungmin Park &lt;kyungmin.park@samsung.com&gt;</div><div class='add'>+R:	Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='ctx'> L:	linux-pm@vger.kernel.org</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -3862,10 +3974,13 @@ S:	Maintained</div><div class='ctx'> F:	drivers/i2c/busses/i2c-diolan-u2c.c</div><div class='ctx'> </div><div class='ctx'> DIRECT ACCESS (DAX)</div><div class='del'>-M:	Matthew Wilcox &lt;willy@linux.intel.com&gt;</div><div class='add'>+M:	Matthew Wilcox &lt;mawilcox@microsoft.com&gt;</div><div class='add'>+M:	Ross Zwisler &lt;ross.zwisler@linux.intel.com&gt;</div><div class='ctx'> L:	linux-fsdevel@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	fs/dax.c</div><div class='add'>+F:	include/linux/dax.h</div><div class='add'>+F:	include/trace/events/fs_dax.h</div><div class='ctx'> </div><div class='ctx'> DIRECTORY NOTIFICATION (DNOTIFY)</div><div class='ctx'> M:	Eric Paris &lt;eparis@parisplace.org&gt;</div><div class='hunk'>@@ -3917,8 +4032,8 @@ F:	drivers/dma-buf/</div><div class='ctx'> F:	include/linux/dma-buf*</div><div class='ctx'> F:	include/linux/reservation.h</div><div class='ctx'> F:	include/linux/*fence.h</div><div class='del'>-F:	Documentation/dma-buf-sharing.txt</div><div class='del'>-T:	git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git</div><div class='add'>+F:	Documentation/driver-api/dma-buf.rst</div><div class='add'>+T:	git git://anongit.freedesktop.org/drm/drm-misc</div><div class='ctx'> </div><div class='ctx'> SYNC FILE FRAMEWORK</div><div class='ctx'> M:	Sumit Semwal &lt;sumit.semwal@linaro.org&gt;</div><div class='hunk'>@@ -3926,10 +4041,13 @@ R:	Gustavo Padovan &lt;gustavo@padovan.org&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='ctx'> L:	dri-devel@lists.freedesktop.org</div><div class='del'>-F:	drivers/dma-buf/sync_file.c</div><div class='add'>+F:	drivers/dma-buf/sync_*</div><div class='add'>+F:	drivers/dma-buf/dma-fence*</div><div class='add'>+F:	drivers/dma-buf/sw_sync.c</div><div class='ctx'> F:	include/linux/sync_file.h</div><div class='add'>+F:	include/uapi/linux/sync_file.h</div><div class='ctx'> F:	Documentation/sync_file.txt</div><div class='del'>-T:	git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git</div><div class='add'>+T:	git git://anongit.freedesktop.org/drm/drm-misc</div><div class='ctx'> </div><div class='ctx'> DMA GENERIC OFFLOAD ENGINE SUBSYSTEM</div><div class='ctx'> M:	Vinod Koul &lt;vinod.koul@intel.com&gt;</div><div class='hunk'>@@ -4017,6 +4135,8 @@ DRM DRIVERS</div><div class='ctx'> M:	David Airlie &lt;airlied@linux.ie&gt;</div><div class='ctx'> L:	dri-devel@lists.freedesktop.org</div><div class='ctx'> T:	git git://people.freedesktop.org/~airlied/linux</div><div class='add'>+B:	https://bugs.freedesktop.org/</div><div class='add'>+C:	irc://chat.freenode.net/dri-devel</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/gpu/drm/</div><div class='ctx'> F:	drivers/gpu/vga/</div><div class='hunk'>@@ -4027,25 +4147,50 @@ F:	Documentation/gpu/</div><div class='ctx'> F:	include/drm/</div><div class='ctx'> F:	include/uapi/drm/</div><div class='ctx'> </div><div class='add'>+DRM DRIVERS AND MISC GPU PATCHES</div><div class='add'>+M:	Daniel Vetter &lt;daniel.vetter@intel.com&gt;</div><div class='add'>+M:	Jani Nikula &lt;jani.nikula@linux.intel.com&gt;</div><div class='add'>+M:	Sean Paul &lt;seanpaul@chromium.org&gt;</div><div class='add'>+W:	https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html</div><div class='add'>+S:	Maintained</div><div class='add'>+T:	git git://anongit.freedesktop.org/drm/drm-misc</div><div class='add'>+F:	Documentation/gpu/</div><div class='add'>+F:	drivers/gpu/vga/</div><div class='add'>+F:	drivers/gpu/drm/*</div><div class='add'>+F:	include/drm/drm*</div><div class='add'>+F:	include/uapi/drm/drm*</div><div class='add'>+</div><div class='ctx'> DRM DRIVER FOR AST SERVER GRAPHICS CHIPS</div><div class='ctx'> M:	Dave Airlie &lt;airlied@redhat.com&gt;</div><div class='ctx'> S:	Odd Fixes</div><div class='ctx'> F:	drivers/gpu/drm/ast/</div><div class='ctx'> </div><div class='add'>+DRM DRIVERS FOR BRIDGE CHIPS</div><div class='add'>+M:	Archit Taneja &lt;architt@codeaurora.org&gt;</div><div class='add'>+S:	Maintained</div><div class='add'>+T:	git git://anongit.freedesktop.org/drm/drm-misc</div><div class='add'>+F:	drivers/gpu/drm/bridge/</div><div class='add'>+</div><div class='ctx'> DRM DRIVER FOR BOCHS VIRTUAL GPU</div><div class='ctx'> M:	Gerd Hoffmann &lt;kraxel@redhat.com&gt;</div><div class='del'>-S:	Odd Fixes</div><div class='add'>+L:	virtualization@lists.linux-foundation.org</div><div class='add'>+T:	git git://git.kraxel.org/linux drm-qemu</div><div class='add'>+S:	Maintained</div><div class='ctx'> F:	drivers/gpu/drm/bochs/</div><div class='ctx'> </div><div class='ctx'> DRM DRIVER FOR QEMU'S CIRRUS DEVICE</div><div class='ctx'> M:	Dave Airlie &lt;airlied@redhat.com&gt;</div><div class='del'>-S:	Odd Fixes</div><div class='add'>+M:	Gerd Hoffmann &lt;kraxel@redhat.com&gt;</div><div class='add'>+L:	virtualization@lists.linux-foundation.org</div><div class='add'>+T:	git git://git.kraxel.org/linux drm-qemu</div><div class='add'>+S:	Obsolete</div><div class='add'>+W:	https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/</div><div class='ctx'> F:	drivers/gpu/drm/cirrus/</div><div class='ctx'> </div><div class='ctx'> RADEON and AMDGPU DRM DRIVERS</div><div class='ctx'> M:	Alex Deucher &lt;alexander.deucher@amd.com&gt;</div><div class='ctx'> M:	Christian König &lt;christian.koenig@amd.com&gt;</div><div class='del'>-L:	dri-devel@lists.freedesktop.org</div><div class='add'>+L:	amd-gfx@lists.freedesktop.org</div><div class='ctx'> T:	git git://people.freedesktop.org/~agd5f/linux</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/gpu/drm/radeon/</div><div class='hunk'>@@ -4067,8 +4212,9 @@ INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)</div><div class='ctx'> M:	Daniel Vetter &lt;daniel.vetter@intel.com&gt;</div><div class='ctx'> M:	Jani Nikula &lt;jani.nikula@linux.intel.com&gt;</div><div class='ctx'> L:	intel-gfx@lists.freedesktop.org</div><div class='del'>-L:	dri-devel@lists.freedesktop.org</div><div class='ctx'> W:	https://01.org/linuxgraphics/</div><div class='add'>+B:	https://01.org/linuxgraphics/documentation/how-report-bugs</div><div class='add'>+C:	irc://chat.freenode.net/intel-gfx</div><div class='ctx'> Q:	http://patchwork.freedesktop.org/project/intel-gfx/</div><div class='ctx'> T:	git git://anongit.freedesktop.org/drm-intel</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -4077,6 +4223,16 @@ F:	include/drm/i915*</div><div class='ctx'> F:	include/uapi/drm/i915_drm.h</div><div class='ctx'> F:	Documentation/gpu/i915.rst</div><div class='ctx'> </div><div class='add'>+INTEL GVT-g DRIVERS (Intel GPU Virtualization)</div><div class='add'>+M:      Zhenyu Wang &lt;zhenyuw@linux.intel.com&gt;</div><div class='add'>+M:      Zhi Wang &lt;zhi.a.wang@intel.com&gt;</div><div class='add'>+L:      intel-gvt-dev@lists.freedesktop.org</div><div class='add'>+L:      intel-gfx@lists.freedesktop.org</div><div class='add'>+W:      https://01.org/igvt-g</div><div class='add'>+T:      git https://github.com/01org/gvt-linux.git</div><div class='add'>+S:      Supported</div><div class='add'>+F:      drivers/gpu/drm/i915/gvt/</div><div class='add'>+</div><div class='ctx'> DRM DRIVERS FOR ATMEL HLCDC</div><div class='ctx'> M:	Boris Brezillon &lt;boris.brezillon@free-electrons.com&gt;</div><div class='ctx'> L:	dri-devel@lists.freedesktop.org</div><div class='hunk'>@@ -4091,6 +4247,15 @@ S:	Supported</div><div class='ctx'> F:	drivers/gpu/drm/sun4i/</div><div class='ctx'> F:	Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt</div><div class='ctx'> </div><div class='add'>+DRM DRIVERS FOR AMLOGIC SOCS</div><div class='add'>+M:	Neil Armstrong &lt;narmstrong@baylibre.com&gt;</div><div class='add'>+L:	dri-devel@lists.freedesktop.org</div><div class='add'>+L:	linux-amlogic@lists.infradead.org</div><div class='add'>+W:	http://linux-meson.com/</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/gpu/drm/meson/</div><div class='add'>+F:	Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt</div><div class='add'>+</div><div class='ctx'> DRM DRIVERS FOR EXYNOS</div><div class='ctx'> M:	Inki Dae &lt;inki.dae@samsung.com&gt;</div><div class='ctx'> M:	Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;</div><div class='hunk'>@@ -4130,6 +4295,7 @@ F:	drivers/gpu/drm/gma500/</div><div class='ctx'> </div><div class='ctx'> DRM DRIVERS FOR HISILICON</div><div class='ctx'> M:	Xinliang Liu &lt;z.liuxinliang@hisilicon.com&gt;</div><div class='add'>+M:	Rongrong Zou &lt;zourongrong@gmail.com&gt;</div><div class='ctx'> R:	Xinwei Kong &lt;kong.kongxinwei@hisilicon.com&gt;</div><div class='ctx'> R:	Chen Feng &lt;puck.chen@hisilicon.com&gt;</div><div class='ctx'> L:	dri-devel@lists.freedesktop.org</div><div class='hunk'>@@ -4151,6 +4317,12 @@ S:	Supported</div><div class='ctx'> F:	drivers/gpu/drm/mediatek/</div><div class='ctx'> F:	Documentation/devicetree/bindings/display/mediatek/</div><div class='ctx'> </div><div class='add'>+DRM DRIVER FOR MI0283QT</div><div class='add'>+M:	Noralf Trønnes &lt;noralf@tronnes.org&gt;</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/gpu/drm/tinydrm/mi0283qt.c</div><div class='add'>+F:	Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt</div><div class='add'>+</div><div class='ctx'> DRM DRIVER FOR MSM ADRENO GPU</div><div class='ctx'> M:	Rob Clark &lt;robdclark@gmail.com&gt;</div><div class='ctx'> L:	linux-arm-msm@vger.kernel.org</div><div class='hunk'>@@ -4211,7 +4383,10 @@ F:	Documentation/devicetree/bindings/display/renesas,du.txt</div><div class='ctx'> </div><div class='ctx'> DRM DRIVER FOR QXL VIRTUAL GPU</div><div class='ctx'> M:	Dave Airlie &lt;airlied@redhat.com&gt;</div><div class='del'>-S:	Odd Fixes</div><div class='add'>+M:	Gerd Hoffmann &lt;kraxel@redhat.com&gt;</div><div class='add'>+L:	virtualization@lists.linux-foundation.org</div><div class='add'>+T:	git git://git.kraxel.org/linux drm-qemu</div><div class='add'>+S:	Maintained</div><div class='ctx'> F:	drivers/gpu/drm/qxl/</div><div class='ctx'> F:	include/uapi/drm/qxl_drm.h</div><div class='ctx'> </div><div class='hunk'>@@ -4254,6 +4429,7 @@ DRM DRIVERS FOR VIVANTE GPU IP</div><div class='ctx'> M:	Lucas Stach &lt;l.stach@pengutronix.de&gt;</div><div class='ctx'> R:	Russell King &lt;linux+etnaviv@armlinux.org.uk&gt;</div><div class='ctx'> R:	Christian Gmeiner &lt;christian.gmeiner@gmail.com&gt;</div><div class='add'>+L:	etnaviv@lists.freedesktop.org</div><div class='ctx'> L:	dri-devel@lists.freedesktop.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/gpu/drm/etnaviv/</div><div class='hunk'>@@ -4294,6 +4470,13 @@ S:	Maintained</div><div class='ctx'> F:	drivers/gpu/drm/tilcdc/</div><div class='ctx'> F:	Documentation/devicetree/bindings/display/tilcdc/</div><div class='ctx'> </div><div class='add'>+DRM DRIVERS FOR ZTE ZX</div><div class='add'>+M:	Shawn Guo &lt;shawnguo@kernel.org&gt;</div><div class='add'>+L:	dri-devel@lists.freedesktop.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/gpu/drm/zte/</div><div class='add'>+F:	Documentation/devicetree/bindings/display/zte,vou.txt</div><div class='add'>+</div><div class='ctx'> DSBR100 USB FM RADIO DRIVER</div><div class='ctx'> M:	Alexey Klimov &lt;klimov.linux@gmail.com&gt;</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='hunk'>@@ -4488,7 +4671,8 @@ L:	linux-edac@vger.kernel.org</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next</div><div class='ctx'> S:	Supported</div><div class='del'>-F:	Documentation/edac.txt</div><div class='add'>+F:	Documentation/admin-guide/ras.rst</div><div class='add'>+F:	Documentation/driver-api/edac.rst</div><div class='ctx'> F:	drivers/edac/</div><div class='ctx'> F:	include/linux/edac.h</div><div class='ctx'> </div><div class='hunk'>@@ -4638,12 +4822,14 @@ L:	linux-efi@vger.kernel.org</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/efi-stub.txt</div><div class='del'>-F:	arch/ia64/kernel/efi.c</div><div class='add'>+F:	arch/*/kernel/efi.c</div><div class='ctx'> F:	arch/x86/boot/compressed/eboot.[ch]</div><div class='del'>-F:	arch/x86/include/asm/efi.h</div><div class='add'>+F:	arch/*/include/asm/efi.h</div><div class='ctx'> F:	arch/x86/platform/efi/</div><div class='ctx'> F:	drivers/firmware/efi/</div><div class='ctx'> F:	include/linux/efi*.h</div><div class='add'>+F:	arch/arm/boot/compressed/efi-header.S</div><div class='add'>+F:	arch/arm64/kernel/efi-entry.S</div><div class='ctx'> </div><div class='ctx'> EFI VARIABLE FILESYSTEM</div><div class='ctx'> M:	Matthew Garrett &lt;matthew.garrett@nebula.com&gt;</div><div class='hunk'>@@ -4695,11 +4881,11 @@ M:	David Woodhouse &lt;dwmw2@infradead.org&gt;</div><div class='ctx'> L:	linux-embedded@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER</div><div class='del'>-M:	James Smart &lt;james.smart@avagotech.com&gt;</div><div class='del'>-M:	Dick Kennedy &lt;dick.kennedy@avagotech.com&gt;</div><div class='add'>+EMULEX/BROADCOM LPFC FC/FCOE SCSI DRIVER</div><div class='add'>+M:	James Smart &lt;james.smart@broadcom.com&gt;</div><div class='add'>+M:	Dick Kennedy &lt;dick.kennedy@broadcom.com&gt;</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='del'>-W:	http://www.avagotech.com</div><div class='add'>+W:	http://www.broadcom.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/scsi/lpfc/</div><div class='ctx'> </div><div class='hunk'>@@ -4848,7 +5034,6 @@ F:	lib/fault-inject.c</div><div class='ctx'> </div><div class='ctx'> FBTFT Framebuffer drivers</div><div class='ctx'> M:	Thomas Petazzoni &lt;thomas.petazzoni@free-electrons.com&gt;</div><div class='del'>-M:	Noralf Trønnes &lt;noralf@tronnes.org&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/staging/fbtft/</div><div class='ctx'> </div><div class='hunk'>@@ -4957,7 +5142,9 @@ K:	fmc_d.*register</div><div class='ctx'> FPGA MANAGER FRAMEWORK</div><div class='ctx'> M:	Alan Tull &lt;atull@opensource.altera.com&gt;</div><div class='ctx'> R:	Moritz Fischer &lt;moritz.fischer@ettus.com&gt;</div><div class='add'>+L:	linux-fpga@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git</div><div class='ctx'> F:	drivers/fpga/</div><div class='ctx'> F:	include/linux/fpga/fpga-mgr.h</div><div class='ctx'> W:	http://www.rocketboards.org</div><div class='hunk'>@@ -4975,8 +5162,9 @@ F:	drivers/net/wan/dlci.c</div><div class='ctx'> F:	drivers/net/wan/sdla.c</div><div class='ctx'> </div><div class='ctx'> FRAMEBUFFER LAYER</div><div class='del'>-M:	Tomi Valkeinen &lt;tomi.valkeinen@ti.com&gt;</div><div class='add'>+M:	Bartlomiej Zolnierkiewicz &lt;b.zolnierkie@samsung.com&gt;</div><div class='ctx'> L:	linux-fbdev@vger.kernel.org</div><div class='add'>+T:	git git://github.com/bzolnier/linux.git</div><div class='ctx'> Q:	http://patchwork.kernel.org/project/linux-fbdev/list/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/fb/</div><div class='hunk'>@@ -4986,6 +5174,14 @@ F:	include/linux/fb.h</div><div class='ctx'> F:	include/uapi/video/</div><div class='ctx'> F:	include/uapi/linux/fb.h</div><div class='ctx'> </div><div class='add'>+FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER</div><div class='add'>+M:	Horia Geantă &lt;horia.geanta@nxp.com&gt;</div><div class='add'>+M:	Dan Douglass &lt;dan.douglass@nxp.com&gt;</div><div class='add'>+L:	linux-crypto@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/crypto/caam/</div><div class='add'>+F:	Documentation/devicetree/bindings/crypto/fsl-sec4.txt</div><div class='add'>+</div><div class='ctx'> FREESCALE DIU FRAMEBUFFER DRIVER</div><div class='ctx'> M:	Timur Tabi &lt;timur@tabi.org&gt;</div><div class='ctx'> L:	linux-fbdev@vger.kernel.org</div><div class='hunk'>@@ -5051,9 +5247,24 @@ S:	Maintained</div><div class='ctx'> F:	drivers/net/ethernet/freescale/fman</div><div class='ctx'> F:	Documentation/devicetree/bindings/powerpc/fsl/fman.txt</div><div class='ctx'> </div><div class='add'>+FREESCALE QORIQ DPAA ETHERNET DRIVER</div><div class='add'>+M:	Madalin Bucur &lt;madalin.bucur@nxp.com&gt;</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/net/ethernet/freescale/dpaa</div><div class='add'>+</div><div class='add'>+FREESCALE SOC DRIVERS</div><div class='add'>+M:	Scott Wood &lt;oss@buserror.net&gt;</div><div class='add'>+L:	linuxppc-dev@lists.ozlabs.org</div><div class='add'>+L:	linux-arm-kernel@lists.infradead.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/soc/fsl/</div><div class='add'>+F:	include/linux/fsl/</div><div class='add'>+</div><div class='ctx'> FREESCALE QUICC ENGINE LIBRARY</div><div class='add'>+M:	Qiang Zhao &lt;qiang.zhao@nxp.com&gt;</div><div class='ctx'> L:	linuxppc-dev@lists.ozlabs.org</div><div class='del'>-S:	Orphan</div><div class='add'>+S:	Maintained</div><div class='ctx'> F:	drivers/soc/fsl/qe/</div><div class='ctx'> F:	include/soc/fsl/*qe*.h</div><div class='ctx'> F:	include/soc/fsl/*ucc*.h</div><div class='hunk'>@@ -5105,13 +5316,6 @@ F:	sound/soc/fsl/fsl*</div><div class='ctx'> F:	sound/soc/fsl/imx*</div><div class='ctx'> F:	sound/soc/fsl/mpc8610_hpcd.c</div><div class='ctx'> </div><div class='del'>-FREESCALE QORIQ MANAGEMENT COMPLEX DRIVER</div><div class='del'>-M:	"J. German Rivera" &lt;German.Rivera@freescale.com&gt;</div><div class='del'>-M:	Stuart Yoder &lt;stuart.yoder@nxp.com&gt;</div><div class='del'>-L:	linux-kernel@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-F:	drivers/staging/fsl-mc/</div><div class='del'>-</div><div class='ctx'> FREEVXFS FILESYSTEM</div><div class='ctx'> M:	Christoph Hellwig &lt;hch@infradead.org&gt;</div><div class='ctx'> W:	ftp://ftp.openlinux.org/pub/people/hch/vxfs</div><div class='hunk'>@@ -5145,9 +5349,10 @@ F:	include/linux/fscache*.h</div><div class='ctx'> FS-CRYPTO: FILE SYSTEM LEVEL ENCRYPTION SUPPORT</div><div class='ctx'> M:	Theodore Y. Ts'o &lt;tytso@mit.edu&gt;</div><div class='ctx'> M:	Jaegeuk Kim &lt;jaegeuk@kernel.org&gt;</div><div class='add'>+L:	linux-fsdevel@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	fs/crypto/</div><div class='del'>-F:	include/linux/fscrypto.h</div><div class='add'>+F:	include/linux/fscrypt*.h</div><div class='ctx'> </div><div class='ctx'> F2FS FILE SYSTEM</div><div class='ctx'> M:	Jaegeuk Kim &lt;jaegeuk@kernel.org&gt;</div><div class='hunk'>@@ -5209,6 +5414,7 @@ L:	kernel-hardening@lists.openwall.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	scripts/gcc-plugins/</div><div class='ctx'> F:	scripts/gcc-plugin.sh</div><div class='add'>+F:	scripts/Makefile.gcc-plugins</div><div class='ctx'> F:	Documentation/gcc-plugins.txt</div><div class='ctx'> </div><div class='ctx'> GCOV BASED KERNEL PROFILING</div><div class='hunk'>@@ -5382,6 +5588,7 @@ M:	Alex Elder &lt;elder@kernel.org&gt;</div><div class='ctx'> M:	Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/staging/greybus/</div><div class='add'>+L:	greybus-dev@lists.linaro.org</div><div class='ctx'> </div><div class='ctx'> GREYBUS AUDIO PROTOCOLS DRIVERS</div><div class='ctx'> M:	Vaibhav Agarwal &lt;vaibhav.sr@gmail.com&gt;</div><div class='hunk'>@@ -5503,6 +5710,14 @@ T:	git git://linuxtv.org/media_tree.git</div><div class='ctx'> S:	Odd Fixes</div><div class='ctx'> F:	drivers/media/usb/gspca/</div><div class='ctx'> </div><div class='add'>+GTP (GPRS Tunneling Protocol)</div><div class='add'>+M:	Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;</div><div class='add'>+M:	Harald Welte &lt;laforge@gnumonks.org&gt;</div><div class='add'>+L:	osmocom-net-gprs@lists.osmocom.org</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/net/gtp.c</div><div class='add'>+</div><div class='ctx'> GUID PARTITION TABLE (GPT)</div><div class='ctx'> M:	Davidlohr Bueso &lt;dave@stgolabs.net&gt;</div><div class='ctx'> L:	linux-efi@vger.kernel.org</div><div class='hunk'>@@ -5602,25 +5817,14 @@ L:	linux-parisc@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	sound/parisc/harmony.*</div><div class='ctx'> </div><div class='del'>-HD29L2 MEDIA DRIVER</div><div class='del'>-M:	Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='del'>-L:	linux-media@vger.kernel.org</div><div class='del'>-W:	https://linuxtv.org</div><div class='del'>-W:	http://palosaari.fi/linux/</div><div class='del'>-Q:	http://patchwork.linuxtv.org/project/linux-media/list/</div><div class='del'>-T:	git git://linuxtv.org/anttip/media_tree.git</div><div class='del'>-S:	Maintained</div><div class='del'>-F:	drivers/media/dvb-frontends/hd29l2*</div><div class='del'>-</div><div class='ctx'> HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER</div><div class='del'>-M:	Brian Boylston &lt;brian.boylston@hpe.com&gt;</div><div class='add'>+M:	Jimmy Vance &lt;jimmy.vance@hpe.com&gt;</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	Documentation/watchdog/hpwdt.txt</div><div class='ctx'> F:	drivers/watchdog/hpwdt.c</div><div class='ctx'> </div><div class='ctx'> HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)</div><div class='ctx'> M:	Don Brace &lt;don.brace@microsemi.com&gt;</div><div class='del'>-L:	iss_storagedev@hp.com</div><div class='ctx'> L:	esc.storagedev@microsemi.com</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -5631,7 +5835,6 @@ F:	include/uapi/linux/cciss*.h</div><div class='ctx'> </div><div class='ctx'> HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)</div><div class='ctx'> M:	Don Brace &lt;don.brace@microsemi.com&gt;</div><div class='del'>-L:	iss_storagedev@hp.com</div><div class='ctx'> L:	esc.storagedev@microsemi.com</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -5808,9 +6011,8 @@ F:	include/linux/hsi/</div><div class='ctx'> F:	include/uapi/linux/hsi/</div><div class='ctx'> </div><div class='ctx'> HSO 3G MODEM DRIVER</div><div class='del'>-M:	Jan Dumon &lt;j.dumon@option.com&gt;</div><div class='del'>-W:	http://www.pharscape.org</div><div class='del'>-S:	Maintained</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='add'>+S:	Orphan</div><div class='ctx'> F:	drivers/net/usb/hso.c</div><div class='ctx'> </div><div class='ctx'> HSR NETWORK PROTOCOL</div><div class='hunk'>@@ -5841,17 +6043,20 @@ F:	drivers/media/platform/sti/hva</div><div class='ctx'> Hyper-V CORE AND DRIVERS</div><div class='ctx'> M:	"K. Y. Srinivasan" &lt;kys@microsoft.com&gt;</div><div class='ctx'> M:	Haiyang Zhang &lt;haiyangz@microsoft.com&gt;</div><div class='add'>+M:	Stephen Hemminger &lt;sthemmin@microsoft.com&gt;</div><div class='ctx'> L:	devel@linuxdriverproject.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/x86/include/asm/mshyperv.h</div><div class='ctx'> F:	arch/x86/include/uapi/asm/hyperv.h</div><div class='ctx'> F:	arch/x86/kernel/cpu/mshyperv.c</div><div class='add'>+F:	arch/x86/hyperv</div><div class='ctx'> F:	drivers/hid/hid-hyperv.c</div><div class='ctx'> F:	drivers/hv/</div><div class='ctx'> F:	drivers/input/serio/hyperv-keyboard.c</div><div class='ctx'> F:	drivers/pci/host/pci-hyperv.c</div><div class='ctx'> F:	drivers/net/hyperv/</div><div class='ctx'> F:	drivers/scsi/storvsc_drv.c</div><div class='add'>+F:	drivers/uio/uio_hv_generic.c</div><div class='ctx'> F:	drivers/video/fbdev/hyperv_fb.c</div><div class='ctx'> F:	include/linux/hyperv.h</div><div class='ctx'> F:	tools/hv/</div><div class='hunk'>@@ -6064,6 +6269,11 @@ S:	Maintained</div><div class='ctx'> F:	drivers/mfd/lpc_ich.c</div><div class='ctx'> F:	drivers/gpio/gpio-ich.c</div><div class='ctx'> </div><div class='add'>+IDT VersaClock 5 CLOCK DRIVER</div><div class='add'>+M:	Marek Vasut &lt;marek.vasut@gmail.com&gt;</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/clk/clk-versaclock5.c</div><div class='add'>+</div><div class='ctx'> IDE SUBSYSTEM</div><div class='ctx'> M:	"David S. Miller" &lt;davem@davemloft.net&gt;</div><div class='ctx'> L:	linux-ide@vger.kernel.org</div><div class='hunk'>@@ -6095,14 +6305,9 @@ S:	Maintained</div><div class='ctx'> F:	Documentation/cdrom/ide-cd</div><div class='ctx'> F:	drivers/ide/ide-cd*</div><div class='ctx'> </div><div class='del'>-IDLE-I7300</div><div class='del'>-M:	Andy Henroid &lt;andrew.d.henroid@intel.com&gt;</div><div class='del'>-L:	linux-pm@vger.kernel.org</div><div class='del'>-S:	Supported</div><div class='del'>-F:	drivers/idle/i7300_idle.c</div><div class='del'>-</div><div class='ctx'> IEEE 802.15.4 SUBSYSTEM</div><div class='ctx'> M:	Alexander Aring &lt;aar@pengutronix.de&gt;</div><div class='add'>+M:	Stefan Schmidt &lt;stefan@osg.samsung.com&gt;</div><div class='ctx'> L:	linux-wpan@vger.kernel.org</div><div class='ctx'> W:	http://wpan.cakelab.org/</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git</div><div class='hunk'>@@ -6120,6 +6325,13 @@ F:	include/net/cfg802154.h</div><div class='ctx'> F:	include/net/ieee802154_netdev.h</div><div class='ctx'> F:	Documentation/networking/ieee802154.txt</div><div class='ctx'> </div><div class='add'>+IFE PROTOCOL</div><div class='add'>+M:	Yotam Gigi &lt;yotamg@mellanox.com&gt;</div><div class='add'>+M:	Jamal Hadi Salim &lt;jhs@mojatatu.com&gt;</div><div class='add'>+F:	net/ife</div><div class='add'>+F:	include/net/ife.h</div><div class='add'>+F:	include/uapi/linux/ife.h</div><div class='add'>+</div><div class='ctx'> IGORPLUG-USB IR RECEIVER</div><div class='ctx'> M:	Sean Young &lt;sean@mess.org&gt;</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='hunk'>@@ -6132,6 +6344,22 @@ L:	linux-media@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/media/rc/iguanair.c</div><div class='ctx'> </div><div class='add'>+IIO DIGITAL POTENTIOMETER DAC</div><div class='add'>+M:	Peter Rosin &lt;peda@axentia.se&gt;</div><div class='add'>+L:	linux-iio@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac</div><div class='add'>+F:	Documentation/devicetree/bindings/iio/dac/dpot-dac.txt</div><div class='add'>+F:	drivers/iio/dac/dpot-dac.c</div><div class='add'>+</div><div class='add'>+IIO ENVELOPE DETECTOR</div><div class='add'>+M:	Peter Rosin &lt;peda@axentia.se&gt;</div><div class='add'>+L:	linux-iio@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector</div><div class='add'>+F:	Documentation/devicetree/bindings/iio/adc/envelope-detector.txt</div><div class='add'>+F:	drivers/iio/adc/envelope-detector.c</div><div class='add'>+</div><div class='ctx'> IIO SUBSYSTEM AND DRIVERS</div><div class='ctx'> M:	Jonathan Cameron &lt;jic23@kernel.org&gt;</div><div class='ctx'> R:	Hartmut Knaack &lt;knaack.h@gmx.de&gt;</div><div class='hunk'>@@ -6289,9 +6517,11 @@ S:	Maintained</div><div class='ctx'> F:	drivers/platform/x86/intel-vbtn.c</div><div class='ctx'> </div><div class='ctx'> INTEL IDLE DRIVER</div><div class='add'>+M:	Jacob Pan &lt;jacob.jun.pan@linux.intel.com&gt;</div><div class='ctx'> M:	Len Brown &lt;lenb@kernel.org&gt;</div><div class='ctx'> L:	linux-pm@vger.kernel.org</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git</div><div class='add'>+B:	https://bugzilla.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/idle/intel_idle.c</div><div class='ctx'> </div><div class='hunk'>@@ -6389,10 +6619,7 @@ F:	drivers/net/ethernet/intel/*/</div><div class='ctx'> </div><div class='ctx'> INTEL RDMA RNIC DRIVER</div><div class='ctx'> M:     Faisal Latif &lt;faisal.latif@intel.com&gt;</div><div class='del'>-R:     Chien Tin Tung &lt;chien.tin.tung@intel.com&gt;</div><div class='del'>-R:     Mustafa Ismail &lt;mustafa.ismail@intel.com&gt;</div><div class='del'>-R:     Shiraz Saleem &lt;shiraz.saleem@intel.com&gt;</div><div class='del'>-R:     Tatyana Nikolova &lt;tatyana.e.nikolova@intel.com&gt;</div><div class='add'>+M:     Shiraz Saleem &lt;shiraz.saleem@intel.com&gt;</div><div class='ctx'> L:     linux-rdma@vger.kernel.org</div><div class='ctx'> S:     Supported</div><div class='ctx'> F:     drivers/infiniband/hw/i40iw/</div><div class='hunk'>@@ -6511,6 +6738,13 @@ S:	Maintained</div><div class='ctx'> F:	arch/x86/include/asm/pmc_core.h</div><div class='ctx'> F:	drivers/platform/x86/intel_pmc_core*</div><div class='ctx'> </div><div class='add'>+INVENSENSE MPU-3050 GYROSCOPE DRIVER</div><div class='add'>+M:	Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+L:	linux-iio@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/iio/gyro/mpu3050*</div><div class='add'>+F:	Documentation/devicetree/bindings/iio/gyroscope/inv,mpu3050.txt</div><div class='add'>+</div><div class='ctx'> IOC3 ETHERNET DRIVER</div><div class='ctx'> M:	Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='ctx'> L:	linux-mips@linux-mips.org</div><div class='hunk'>@@ -6581,9 +6815,8 @@ S:	Odd Fixes</div><div class='ctx'> F:	drivers/tty/ipwireless/</div><div class='ctx'> </div><div class='ctx'> IPX NETWORK LAYER</div><div class='del'>-M:	Arnaldo Carvalho de Melo &lt;acme@ghostprotocols.net&gt;</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='add'>+S:	Odd fixes</div><div class='ctx'> F:	include/net/ipx.h</div><div class='ctx'> F:	include/uapi/linux/ipx.h</div><div class='ctx'> F:	net/ipx/</div><div class='hunk'>@@ -7051,6 +7284,7 @@ M:	Masami Hiramatsu &lt;mhiramat@kernel.org&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/kprobes.txt</div><div class='ctx'> F:	include/linux/kprobes.h</div><div class='add'>+F:	include/asm-generic/kprobes.h</div><div class='ctx'> F:	kernel/kprobes.c</div><div class='ctx'> </div><div class='ctx'> KS0108 LCD CONTROLLER DRIVER</div><div class='hunk'>@@ -7091,7 +7325,7 @@ F:	drivers/scsi/53c700*</div><div class='ctx'> </div><div class='ctx'> LED SUBSYSTEM</div><div class='ctx'> M:	Richard Purdie &lt;rpurdie@rpsys.net&gt;</div><div class='del'>-M:	Jacek Anaszewski &lt;j.anaszewski@samsung.com&gt;</div><div class='add'>+M:	Jacek Anaszewski &lt;jacek.anaszewski@gmail.com&gt;</div><div class='ctx'> M:	Pavel Machek &lt;pavel@ucw.cz&gt;</div><div class='ctx'> L:	linux-leds@vger.kernel.org</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git</div><div class='hunk'>@@ -7247,18 +7481,24 @@ L:	linuxppc-dev@lists.ozlabs.org</div><div class='ctx'> Q:	http://patchwork.ozlabs.org/project/linuxppc-dev/list/</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git</div><div class='ctx'> S:	Supported</div><div class='add'>+F:	Documentation/ABI/stable/sysfs-firmware-opal-*</div><div class='add'>+F:	Documentation/devicetree/bindings/powerpc/opal/</div><div class='add'>+F:	Documentation/devicetree/bindings/rtc/rtc-opal.txt</div><div class='add'>+F:	Documentation/devicetree/bindings/i2c/i2c-opal.txt</div><div class='ctx'> F:	Documentation/powerpc/</div><div class='ctx'> F:	arch/powerpc/</div><div class='ctx'> F:	drivers/char/tpm/tpm_ibmvtpm*</div><div class='ctx'> F:	drivers/crypto/nx/</div><div class='ctx'> F:	drivers/crypto/vmx/</div><div class='add'>+F:	drivers/i2c/busses/i2c-opal.c</div><div class='ctx'> F:	drivers/net/ethernet/ibm/ibmveth.*</div><div class='ctx'> F:	drivers/net/ethernet/ibm/ibmvnic.*</div><div class='ctx'> F:	drivers/pci/hotplug/pnv_php.c</div><div class='ctx'> F:	drivers/pci/hotplug/rpa*</div><div class='add'>+F:	drivers/rtc/rtc-opal.c</div><div class='ctx'> F:	drivers/scsi/ibmvscsi/</div><div class='add'>+F:	drivers/tty/hvc/hvc_opal.c</div><div class='ctx'> F:	tools/testing/selftests/powerpc</div><div class='del'>-N:	opal</div><div class='ctx'> N:	/pmac</div><div class='ctx'> N:	powermac</div><div class='ctx'> N:	powernv</div><div class='hunk'>@@ -7355,8 +7595,8 @@ S:	Maintained</div><div class='ctx'> F:	drivers/misc/lkdtm*</div><div class='ctx'> </div><div class='ctx'> LLC (802.2)</div><div class='del'>-M:	Arnaldo Carvalho de Melo &lt;acme@ghostprotocols.net&gt;</div><div class='del'>-S:	Maintained</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Odd fixes</div><div class='ctx'> F:	include/linux/llc.h</div><div class='ctx'> F:	include/uapi/linux/llc.h</div><div class='ctx'> F:	include/net/llc*</div><div class='hunk'>@@ -7389,6 +7629,7 @@ S:	Maintained</div><div class='ctx'> F:	Documentation/hwmon/lm90</div><div class='ctx'> F:	Documentation/devicetree/bindings/hwmon/lm90.txt</div><div class='ctx'> F:	drivers/hwmon/lm90.c</div><div class='add'>+F:	include/dt-bindings/thermal/lm90.h</div><div class='ctx'> </div><div class='ctx'> LM95234 HARDWARE MONITOR DRIVER</div><div class='ctx'> M:	Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='hunk'>@@ -7432,14 +7673,6 @@ S:	Maintained</div><div class='ctx'> F:	Documentation/ldm.txt</div><div class='ctx'> F:	block/partitions/ldm.*</div><div class='ctx'> </div><div class='del'>-LogFS</div><div class='del'>-M:	Joern Engel &lt;joern@logfs.org&gt;</div><div class='del'>-M:	Prasad Joshi &lt;prasadjoshi.linux@gmail.com&gt;</div><div class='del'>-L:	logfs@logfs.org</div><div class='del'>-W:	logfs.org</div><div class='del'>-S:	Maintained</div><div class='del'>-F:	fs/logfs/</div><div class='del'>-</div><div class='ctx'> LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)</div><div class='ctx'> M:	Sathya Prakash &lt;sathya.prakash@broadcom.com&gt;</div><div class='ctx'> M:	Chaitra P B &lt;chaitra.basappa@broadcom.com&gt;</div><div class='hunk'>@@ -7562,15 +7795,25 @@ W:	http://www.kernel.org/doc/man-pages</div><div class='ctx'> L:	linux-man@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+MARDUK (CREATOR CI40) DEVICE TREE SUPPORT</div><div class='add'>+M:	Rahul Bedarkar &lt;rahul.bedarkar@imgtec.com&gt;</div><div class='add'>+L:	linux-mips@linux-mips.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	arch/mips/boot/dts/img/pistachio_marduk.dts</div><div class='add'>+</div><div class='ctx'> MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER</div><div class='ctx'> M:	Andrew Lunn &lt;andrew@lunn.ch&gt;</div><div class='ctx'> M:	Vivien Didelot &lt;vivien.didelot@savoirfairelinux.com&gt;</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/net/dsa/mv88e6xxx/</div><div class='add'>+F:	Documentation/devicetree/bindings/net/dsa/marvell.txt</div><div class='ctx'> </div><div class='ctx'> MARVELL ARMADA DRM SUPPORT</div><div class='del'>-M:	Russell King &lt;rmk+kernel@armlinux.org.uk&gt;</div><div class='add'>+M:	Russell King &lt;linux@armlinux.org.uk&gt;</div><div class='ctx'> S:	Maintained</div><div class='add'>+T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-devel</div><div class='add'>+T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-fixes</div><div class='ctx'> F:	drivers/gpu/drm/armada/</div><div class='ctx'> F:	include/uapi/drm/armada_drm.h</div><div class='ctx'> F:	Documentation/devicetree/bindings/display/armada/</div><div class='hunk'>@@ -7716,6 +7959,7 @@ MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVER</div><div class='ctx'> M:	Peter Rosin &lt;peda@axentia.se&gt;</div><div class='ctx'> L:	linux-iio@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='add'>+F:	Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531</div><div class='ctx'> F:	drivers/iio/potentiometer/mcp4531.c</div><div class='ctx'> </div><div class='ctx'> MEASUREMENT COMPUTING CIO-DAC IIO DRIVER</div><div class='hunk'>@@ -7734,6 +7978,15 @@ F:	Documentation/devicetree/bindings/media/renesas,fcp.txt</div><div class='ctx'> F:	drivers/media/platform/rcar-fcp.c</div><div class='ctx'> F:	include/media/rcar-fcp.h</div><div class='ctx'> </div><div class='add'>+MEDIA DRIVERS FOR RENESAS - FDP1</div><div class='add'>+M:	Kieran Bingham &lt;kieran@bingham.xyz&gt;</div><div class='add'>+L:	linux-media@vger.kernel.org</div><div class='add'>+L:	linux-renesas-soc@vger.kernel.org</div><div class='add'>+T:	git git://linuxtv.org/media_tree.git</div><div class='add'>+S:	Supported</div><div class='add'>+F:	Documentation/devicetree/bindings/media/renesas,fdp1.txt</div><div class='add'>+F:	drivers/media/platform/rcar_fdp1.c</div><div class='add'>+</div><div class='ctx'> MEDIA DRIVERS FOR RENESAS - VIN</div><div class='ctx'> M:	Niklas Söderlund &lt;niklas.soderlund@ragnatech.se&gt;</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='hunk'>@@ -7840,6 +8093,24 @@ L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/net/ethernet/mediatek/</div><div class='ctx'> </div><div class='add'>+MEDIATEK MEDIA DRIVER</div><div class='add'>+M:	Tiffany Lin &lt;tiffany.lin@mediatek.com&gt;</div><div class='add'>+M:	Andrew-CT Chen &lt;andrew-ct.chen@mediatek.com&gt;</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/media/platform/mtk-vcodec/</div><div class='add'>+F:	drivers/media/platform/mtk-vpu/</div><div class='add'>+F:	Documentation/devicetree/bindings/media/mediatek-vcodec.txt</div><div class='add'>+F:	Documentation/devicetree/bindings/media/mediatek-vpu.txt</div><div class='add'>+</div><div class='add'>+MEDIATEK MDP DRIVER</div><div class='add'>+M:	Minghsiu Tsai &lt;minghsiu.tsai@mediatek.com&gt;</div><div class='add'>+M:	Houlong Wei &lt;houlong.wei@mediatek.com&gt;</div><div class='add'>+M:	Andrew-CT Chen &lt;andrew-ct.chen@mediatek.com&gt;</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/media/platform/mtk-mdp/</div><div class='add'>+F:	drivers/media/platform/mtk-vpu/</div><div class='add'>+F:	Documentation/devicetree/bindings/media/mediatek-mdp.txt</div><div class='add'>+</div><div class='ctx'> MEDIATEK MT7601U WIRELESS LAN DRIVER</div><div class='ctx'> M:	Jakub Kicinski &lt;kubakici@wp.pl&gt;</div><div class='ctx'> L:	linux-wireless@vger.kernel.org</div><div class='hunk'>@@ -7847,12 +8118,12 @@ S:	Maintained</div><div class='ctx'> F:	drivers/net/wireless/mediatek/mt7601u/</div><div class='ctx'> </div><div class='ctx'> MEGARAID SCSI/SAS DRIVERS</div><div class='del'>-M:	Kashyap Desai &lt;kashyap.desai@avagotech.com&gt;</div><div class='del'>-M:	Sumit Saxena &lt;sumit.saxena@avagotech.com&gt;</div><div class='del'>-M:	Uday Lingala &lt;uday.lingala@avagotech.com&gt;</div><div class='del'>-L:	megaraidlinux.pdl@avagotech.com</div><div class='add'>+M:	Kashyap Desai &lt;kashyap.desai@broadcom.com&gt;</div><div class='add'>+M:	Sumit Saxena &lt;sumit.saxena@broadcom.com&gt;</div><div class='add'>+M:	Shivasharan S &lt;shivasharan.srikanteshwara@broadcom.com&gt;</div><div class='add'>+L:	megaraidlinux.pdl@broadcom.com</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='del'>-W:	http://www.lsi.com</div><div class='add'>+W:	http://www.avagotech.com/support/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/scsi/megaraid.txt</div><div class='ctx'> F:	drivers/scsi/megaraid.*</div><div class='hunk'>@@ -7890,6 +8161,15 @@ W:	http://www.mellanox.com</div><div class='ctx'> Q:	http://patchwork.ozlabs.org/project/netdev/list/</div><div class='ctx'> F:	drivers/net/ethernet/mellanox/mlxsw/</div><div class='ctx'> </div><div class='add'>+MELLANOX MLXCPLD I2C AND MUX DRIVER</div><div class='add'>+M:	Vadim Pasternak &lt;vadimp@mellanox.com&gt;</div><div class='add'>+M:	Michael Shych &lt;michaelsh@mellanox.com&gt;</div><div class='add'>+L:	linux-i2c@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/i2c/busses/i2c-mlxcpld.c</div><div class='add'>+F:	drivers/i2c/muxes/i2c-mux-mlxcpld.c</div><div class='add'>+F:	Documentation/i2c/busses/i2c-mlxcpld</div><div class='add'>+</div><div class='ctx'> MELLANOX MLXCPLD LED DRIVER</div><div class='ctx'> M:	Vadim Pasternak &lt;vadimp@mellanox.com&gt;</div><div class='ctx'> L:	linux-leds@vger.kernel.org</div><div class='hunk'>@@ -7901,7 +8181,14 @@ MELLANOX PLATFORM DRIVER</div><div class='ctx'> M:      Vadim Pasternak &lt;vadimp@mellanox.com&gt;</div><div class='ctx'> L:      platform-driver-x86@vger.kernel.org</div><div class='ctx'> S:      Supported</div><div class='del'>-F:      arch/x86/platform/mellanox/mlx-platform.c</div><div class='add'>+F:      drivers/platform/x86/mlx-platform.c</div><div class='add'>+</div><div class='add'>+MELLANOX MLX CPLD HOTPLUG DRIVER</div><div class='add'>+M:	Vadim Pasternak &lt;vadimp@mellanox.com&gt;</div><div class='add'>+L:	platform-driver-x86@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/platform/x86/mlxcpld-hotplug.c</div><div class='add'>+F:	include/linux/platform_data/mlxcpld-hotplug.h</div><div class='ctx'> </div><div class='ctx'> SOFT-ROCE DRIVER (rxe)</div><div class='ctx'> M:	Moni Shoua &lt;monis@mellanox.com&gt;</div><div class='hunk'>@@ -7998,6 +8285,15 @@ S:	Maintained</div><div class='ctx'> F:	drivers/tty/serial/atmel_serial.c</div><div class='ctx'> F:	include/linux/atmel_serial.h</div><div class='ctx'> </div><div class='add'>+MICROCHIP / ATMEL DMA DRIVER</div><div class='add'>+M:	Ludovic Desroches &lt;ludovic.desroches@microchip.com&gt;</div><div class='add'>+L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='add'>+L:	dmaengine@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/dma/at_hdmac.c</div><div class='add'>+F:	drivers/dma/at_hdmac_regs.h</div><div class='add'>+F:	include/linux/platform_data/dma-atmel.h</div><div class='add'>+</div><div class='ctx'> MICROCHIP / ATMEL ISC DRIVER</div><div class='ctx'> M:	Songjun Wu &lt;songjun.wu@microchip.com&gt;</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='hunk'>@@ -8006,6 +8302,14 @@ F:	drivers/media/platform/atmel/atmel-isc.c</div><div class='ctx'> F:	drivers/media/platform/atmel/atmel-isc-regs.h</div><div class='ctx'> F:	devicetree/bindings/media/atmel-isc.txt</div><div class='ctx'> </div><div class='add'>+MICROCHIP USB251XB DRIVER</div><div class='add'>+M:	Richard Leitner &lt;richard.leitner@skidata.com&gt;</div><div class='add'>+L:	linux-usb@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/usb/misc/usb251xb.c</div><div class='add'>+F:	include/linux/platform_data/usb251xb.h</div><div class='add'>+F:	Documentation/devicetree/bindings/usb/usb251xb.txt</div><div class='add'>+</div><div class='ctx'> MICROSOFT SURFACE PRO 3 BUTTON DRIVER</div><div class='ctx'> M:	Chen Yu &lt;yu.c.chen@intel.com&gt;</div><div class='ctx'> L:	platform-driver-x86@vger.kernel.org</div><div class='hunk'>@@ -8128,6 +8432,7 @@ F:	drivers/media/dvb-frontends/mn88473*</div><div class='ctx'> MODULE SUPPORT</div><div class='ctx'> M:	Jessica Yu &lt;jeyu@redhat.com&gt;</div><div class='ctx'> M:	Rusty Russell &lt;rusty@rustcorp.com.au&gt;</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	include/linux/module.h</div><div class='ctx'> F:	kernel/module.c</div><div class='hunk'>@@ -8236,6 +8541,7 @@ S:	Supported</div><div class='ctx'> F:	Documentation/devicetree/bindings/mfd/</div><div class='ctx'> F:	drivers/mfd/</div><div class='ctx'> F:	include/linux/mfd/</div><div class='add'>+F:	include/dt-bindings/mfd/</div><div class='ctx'> </div><div class='ctx'> MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM</div><div class='ctx'> M:	Ulf Hansson &lt;ulf.hansson@linaro.org&gt;</div><div class='hunk'>@@ -8280,6 +8586,12 @@ T:	git git://linuxtv.org/mkrufky/tuners.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/media/tuners/mxl5007t.*</div><div class='ctx'> </div><div class='add'>+MXSFB DRM DRIVER</div><div class='add'>+M:	Marek Vasut &lt;marex@denx.de&gt;</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/gpu/drm/mxsfb/</div><div class='add'>+F:	Documentation/devicetree/bindings/display/mxsfb-drm.txt</div><div class='add'>+</div><div class='ctx'> MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)</div><div class='ctx'> M:	Hyong-Youb Kim &lt;hykim@myri.com&gt;</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='hunk'>@@ -8326,7 +8638,6 @@ F:	drivers/scsi/arm/oak.c</div><div class='ctx'> F:	drivers/scsi/atari_scsi.*</div><div class='ctx'> F:	drivers/scsi/dmx3191d.c</div><div class='ctx'> F:	drivers/scsi/g_NCR5380.*</div><div class='del'>-F:	drivers/scsi/g_NCR5380_mmio.c</div><div class='ctx'> F:	drivers/scsi/mac_scsi.*</div><div class='ctx'> F:	drivers/scsi/sun3_scsi.*</div><div class='ctx'> F:	drivers/scsi/sun3_scsi_vme.c</div><div class='hunk'>@@ -8366,9 +8677,8 @@ F:	Documentation/networking/s2io.txt</div><div class='ctx'> F:	Documentation/networking/vxge.txt</div><div class='ctx'> F:	drivers/net/ethernet/neterion/</div><div class='ctx'> </div><div class='del'>-NETFILTER ({IP,IP6,ARP,EB,NF}TABLES)</div><div class='add'>+NETFILTER</div><div class='ctx'> M:	Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;</div><div class='del'>-M:	Patrick McHardy &lt;kaber@trash.net&gt;</div><div class='ctx'> M:	Jozsef Kadlecsik &lt;kadlec@blackhole.kfki.hu&gt;</div><div class='ctx'> L:	netfilter-devel@vger.kernel.org</div><div class='ctx'> L:	coreteam@netfilter.org</div><div class='hunk'>@@ -8413,10 +8723,10 @@ S:	Maintained</div><div class='ctx'> F:	drivers/net/ethernet/netronome/</div><div class='ctx'> </div><div class='ctx'> NETWORK BLOCK DEVICE (NBD)</div><div class='del'>-M:	Markus Pargmann &lt;mpa@pengutronix.de&gt;</div><div class='add'>+M:	Josef Bacik &lt;jbacik@fb.com&gt;</div><div class='ctx'> S:	Maintained</div><div class='add'>+L:	linux-block@vger.kernel.org</div><div class='ctx'> L:	nbd-general@lists.sourceforge.net</div><div class='del'>-T:	git git://git.pengutronix.de/git/mpa/linux-nbd.git</div><div class='ctx'> F:	Documentation/blockdev/nbd.txt</div><div class='ctx'> F:	drivers/block/nbd.c</div><div class='ctx'> F:	include/uapi/linux/nbd.h</div><div class='hunk'>@@ -8457,7 +8767,6 @@ F:	include/uapi/linux/net_namespace.h</div><div class='ctx'> F:	tools/net/</div><div class='ctx'> F:	tools/testing/selftests/net/</div><div class='ctx'> F:	lib/random32.c</div><div class='del'>-F:	lib/test_bpf.c</div><div class='ctx'> </div><div class='ctx'> NETWORKING [IPv4/IPv6]</div><div class='ctx'> M:	"David S. Miller" &lt;davem@davemloft.net&gt;</div><div class='hunk'>@@ -8613,6 +8922,22 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/nios2/</div><div class='ctx'> </div><div class='add'>+NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)</div><div class='add'>+M:	Pavel Machek &lt;pavel@ucw.cz&gt;</div><div class='add'>+M:	Sakari Ailus &lt;sakari.ailus@iki.fi&gt;</div><div class='add'>+L:	linux-media@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/media/i2c/et8ek8</div><div class='add'>+F:	drivers/media/i2c/ad5820.c</div><div class='add'>+</div><div class='add'>+NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)</div><div class='add'>+M:	Pavel Machek &lt;pavel@ucw.cz&gt;</div><div class='add'>+M:	Sakari Ailus &lt;sakari.ailus@iki.fi&gt;</div><div class='add'>+L:	linux-media@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/media/i2c/et8ek8</div><div class='add'>+F:	drivers/media/i2c/ad5820.c</div><div class='add'>+</div><div class='ctx'> NOKIA N900 POWER SUPPLY DRIVERS</div><div class='ctx'> R:	Pali Rohár &lt;pali.rohar@gmail.com&gt;</div><div class='ctx'> F:	include/linux/power/bq2415x_charger.h</div><div class='hunk'>@@ -8648,7 +8973,7 @@ T:	git git://github.com/jonmason/ntb.git</div><div class='ctx'> F:	drivers/ntb/hw/intel/</div><div class='ctx'> </div><div class='ctx'> NTB AMD DRIVER</div><div class='del'>-M:	Xiangliang Yu &lt;Xiangliang.Yu@amd.com&gt;</div><div class='add'>+M:	Shyam Sundar S K &lt;Shyam-sundar.S-k@amd.com&gt;</div><div class='ctx'> L:	linux-ntb@googlegroups.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/ntb/hw/amd/</div><div class='hunk'>@@ -8672,20 +8997,35 @@ F:	drivers/video/fbdev/nvidia/</div><div class='ctx'> NVM EXPRESS DRIVER</div><div class='ctx'> M:	Keith Busch &lt;keith.busch@intel.com&gt;</div><div class='ctx'> M:	Jens Axboe &lt;axboe@fb.com&gt;</div><div class='add'>+M:	Christoph Hellwig &lt;hch@lst.de&gt;</div><div class='add'>+M:	Sagi Grimberg &lt;sagi@grimberg.me&gt;</div><div class='ctx'> L:	linux-nvme@lists.infradead.org</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git</div><div class='del'>-W:	https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/</div><div class='add'>+T:	git://git.infradead.org/nvme.git</div><div class='add'>+W:	http://git.infradead.org/nvme.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/nvme/host/</div><div class='ctx'> F:	include/linux/nvme.h</div><div class='add'>+F:	include/uapi/linux/nvme_ioctl.h</div><div class='ctx'> </div><div class='ctx'> NVM EXPRESS TARGET DRIVER</div><div class='ctx'> M:	Christoph Hellwig &lt;hch@lst.de&gt;</div><div class='ctx'> M:	Sagi Grimberg &lt;sagi@grimberg.me&gt;</div><div class='ctx'> L:	linux-nvme@lists.infradead.org</div><div class='add'>+T:	git://git.infradead.org/nvme.git</div><div class='add'>+W:	http://git.infradead.org/nvme.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/nvme/target/</div><div class='ctx'> </div><div class='add'>+NVM EXPRESS FC TRANSPORT DRIVERS</div><div class='add'>+M:	James Smart &lt;james.smart@broadcom.com&gt;</div><div class='add'>+L:	linux-nvme@lists.infradead.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	include/linux/nvme-fc.h</div><div class='add'>+F:	include/linux/nvme-fc-driver.h</div><div class='add'>+F:	drivers/nvme/host/fc.c</div><div class='add'>+F:	drivers/nvme/target/fc.c</div><div class='add'>+F:	drivers/nvme/target/fcloop.c</div><div class='add'>+</div><div class='ctx'> NVMEM FRAMEWORK</div><div class='ctx'> M:	Srinivas Kandagatla &lt;srinivas.kandagatla@linaro.org&gt;</div><div class='ctx'> M:	Maxime Ripard &lt;maxime.ripard@free-electrons.com&gt;</div><div class='hunk'>@@ -8703,8 +9043,10 @@ S:	Supported</div><div class='ctx'> F:	drivers/nfc/nxp-nci</div><div class='ctx'> </div><div class='ctx'> NXP TDA998X DRM DRIVER</div><div class='del'>-M:	Russell King &lt;rmk+kernel@armlinux.org.uk&gt;</div><div class='add'>+M:	Russell King &lt;linux@armlinux.org.uk&gt;</div><div class='ctx'> S:	Supported</div><div class='add'>+T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel</div><div class='add'>+T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes</div><div class='ctx'> F:	drivers/gpu/drm/i2c/tda998x_drv.c</div><div class='ctx'> F:	include/drm/i2c/tda998x.h</div><div class='ctx'> </div><div class='hunk'>@@ -8719,7 +9061,20 @@ M:	Josh Poimboeuf &lt;jpoimboe@redhat.com&gt;</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	tools/objtool/</div><div class='ctx'> </div><div class='del'>-OMAP SUPPORT</div><div class='add'>+OMAP1 SUPPORT</div><div class='add'>+M:	Aaro Koskinen &lt;aaro.koskinen@iki.fi&gt;</div><div class='add'>+M:	Tony Lindgren &lt;tony@atomide.com&gt;</div><div class='add'>+L:	linux-omap@vger.kernel.org</div><div class='add'>+Q:	http://patchwork.kernel.org/project/linux-omap/list/</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	arch/arm/mach-omap1/</div><div class='add'>+F:	arch/arm/plat-omap/</div><div class='add'>+F:	arch/arm/configs/omap1_defconfig</div><div class='add'>+F:	drivers/i2c/busses/i2c-omap.c</div><div class='add'>+F:	include/linux/i2c-omap.h</div><div class='add'>+</div><div class='add'>+OMAP2+ SUPPORT</div><div class='ctx'> M:	Tony Lindgren &lt;tony@atomide.com&gt;</div><div class='ctx'> L:	linux-omap@vger.kernel.org</div><div class='ctx'> W:	http://www.muru.com/linux/omap/</div><div class='hunk'>@@ -8727,8 +9082,8 @@ W:	http://linux.omap.com/</div><div class='ctx'> Q:	http://patchwork.kernel.org/project/linux-omap/list/</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	arch/arm/*omap*/</div><div class='del'>-F:	arch/arm/configs/omap1_defconfig</div><div class='add'>+F:	arch/arm/mach-omap2/</div><div class='add'>+F:	arch/arm/plat-omap/</div><div class='ctx'> F:	arch/arm/configs/omap2plus_defconfig</div><div class='ctx'> F:	drivers/i2c/busses/i2c-omap.c</div><div class='ctx'> F:	drivers/irqchip/irq-omap-intc.c</div><div class='hunk'>@@ -8969,9 +9324,12 @@ F:	drivers/of/resolver.c</div><div class='ctx'> </div><div class='ctx'> OPENRISC ARCHITECTURE</div><div class='ctx'> M:	Jonas Bonn &lt;jonas@southpole.se&gt;</div><div class='del'>-W:	http://openrisc.net</div><div class='add'>+M:	Stefan Kristiansson &lt;stefan.kristiansson@saunalahti.fi&gt;</div><div class='add'>+M:	Stafford Horne &lt;shorne@gmail.com&gt;</div><div class='add'>+T:	git git://github.com/openrisc/linux.git</div><div class='add'>+L:	openrisc@lists.librecores.org</div><div class='add'>+W:	http://openrisc.io</div><div class='ctx'> S:	Maintained</div><div class='del'>-T:	git git://openrisc.net/~jonas/linux</div><div class='ctx'> F:	arch/openrisc/</div><div class='ctx'> </div><div class='ctx'> OPENVSWITCH</div><div class='hunk'>@@ -9103,7 +9461,7 @@ F:      drivers/misc/panel.c</div><div class='ctx'> </div><div class='ctx'> PARALLEL PORT SUBSYSTEM</div><div class='ctx'> M:	Sudip Mukherjee &lt;sudipm.mukherjee@gmail.com&gt;</div><div class='del'>-M:	Sudip Mukherjee &lt;sudip@vectorindia.org&gt;</div><div class='add'>+M:	Sudip Mukherjee &lt;sudip.mukherjee@codethink.co.uk&gt;</div><div class='ctx'> L:	linux-parport@lists.infradead.org (subscribers-only)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/parport/</div><div class='hunk'>@@ -9151,6 +9509,14 @@ F:	drivers/video/fbdev/sti*</div><div class='ctx'> F:	drivers/video/console/sti*</div><div class='ctx'> F:	drivers/video/logo/logo_parisc*</div><div class='ctx'> </div><div class='add'>+PARMAN</div><div class='add'>+M:	Jiri Pirko &lt;jiri@mellanox.com&gt;</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	lib/parman.c</div><div class='add'>+F:	lib/test_parman.c</div><div class='add'>+F:	include/linux/parman.h</div><div class='add'>+</div><div class='ctx'> PC87360 HARDWARE MONITORING DRIVER</div><div class='ctx'> M:	Jim Cromie &lt;jim.cromie@gmail.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='hunk'>@@ -9237,7 +9603,7 @@ L:	linux-pci@vger.kernel.org</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/devicetree/bindings/pci/pci-armada8k.txt</div><div class='del'>-F:	drivers/pci/host/pcie-armada8k.c</div><div class='add'>+F:	drivers/pci/dwc/pcie-armada8k.c</div><div class='ctx'> </div><div class='ctx'> PCI DRIVER FOR APPLIEDMICRO XGENE</div><div class='ctx'> M:	Tanmay Inamdar &lt;tinamdar@apm.com&gt;</div><div class='hunk'>@@ -9255,7 +9621,7 @@ L:	linuxppc-dev@lists.ozlabs.org</div><div class='ctx'> L:	linux-pci@vger.kernel.org</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/pci/host/*layerscape*</div><div class='add'>+F:	drivers/pci/dwc/*layerscape*</div><div class='ctx'> </div><div class='ctx'> PCI DRIVER FOR IMX6</div><div class='ctx'> M:	Richard Zhu &lt;hongxing.zhu@nxp.com&gt;</div><div class='hunk'>@@ -9264,14 +9630,14 @@ L:	linux-pci@vger.kernel.org</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt</div><div class='del'>-F:	drivers/pci/host/*imx6*</div><div class='add'>+F:	drivers/pci/dwc/*imx6*</div><div class='ctx'> </div><div class='ctx'> PCI DRIVER FOR TI KEYSTONE</div><div class='ctx'> M:	Murali Karicheri &lt;m-karicheri2@ti.com&gt;</div><div class='ctx'> L:	linux-pci@vger.kernel.org</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/pci/host/*keystone*</div><div class='add'>+F:	drivers/pci/dwc/*keystone*</div><div class='ctx'> </div><div class='ctx'> PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)</div><div class='ctx'> M:	Thomas Petazzoni &lt;thomas.petazzoni@free-electrons.com&gt;</div><div class='hunk'>@@ -9303,7 +9669,7 @@ L:	linux-omap@vger.kernel.org</div><div class='ctx'> L:	linux-pci@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	Documentation/devicetree/bindings/pci/ti-pci.txt</div><div class='del'>-F:	drivers/pci/host/pci-dra7xx.c</div><div class='add'>+F:	drivers/pci/dwc/pci-dra7xx.c</div><div class='ctx'> </div><div class='ctx'> PCI DRIVER FOR RENESAS R-CAR</div><div class='ctx'> M:	Simon Horman &lt;horms@verge.net.au&gt;</div><div class='hunk'>@@ -9318,7 +9684,7 @@ L:	linux-pci@vger.kernel.org</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/pci/host/pci-exynos.c</div><div class='add'>+F:	drivers/pci/dwc/pci-exynos.c</div><div class='ctx'> </div><div class='ctx'> PCI DRIVER FOR SYNOPSIS DESIGNWARE</div><div class='ctx'> M:	Jingoo Han &lt;jingoohan1@gmail.com&gt;</div><div class='hunk'>@@ -9326,7 +9692,7 @@ M:	Joao Pinto &lt;Joao.Pinto@synopsys.com&gt;</div><div class='ctx'> L:	linux-pci@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/devicetree/bindings/pci/designware-pcie.txt</div><div class='del'>-F:	drivers/pci/host/*designware*</div><div class='add'>+F:	drivers/pci/dwc/*designware*</div><div class='ctx'> </div><div class='ctx'> PCI DRIVER FOR GENERIC OF HOSTS</div><div class='ctx'> M:	Will Deacon &lt;will.deacon@arm.com&gt;</div><div class='hunk'>@@ -9347,7 +9713,7 @@ PCIE DRIVER FOR ST SPEAR13XX</div><div class='ctx'> M:	Pratyush Anand &lt;pratyush.anand@gmail.com&gt;</div><div class='ctx'> L:	linux-pci@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/pci/host/*spear*</div><div class='add'>+F:	drivers/pci/dwc/*spear*</div><div class='ctx'> </div><div class='ctx'> PCI MSI DRIVER FOR ALTERA MSI IP</div><div class='ctx'> M:	Ley Foon Tan &lt;lftan@altera.com&gt;</div><div class='hunk'>@@ -9372,7 +9738,7 @@ L:	linux-arm-kernel@axis.com</div><div class='ctx'> L:	linux-pci@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/devicetree/bindings/pci/axis,artpec*</div><div class='del'>-F:	drivers/pci/host/*artpec*</div><div class='add'>+F:	drivers/pci/dwc/*artpec*</div><div class='ctx'> </div><div class='ctx'> PCIE DRIVER FOR HISILICON</div><div class='ctx'> M:	Zhou Wang &lt;wangzhou1@hisilicon.com&gt;</div><div class='hunk'>@@ -9380,7 +9746,7 @@ M:	Gabriele Paoloni &lt;gabriele.paoloni@huawei.com&gt;</div><div class='ctx'> L:	linux-pci@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/devicetree/bindings/pci/hisilicon-pcie.txt</div><div class='del'>-F:	drivers/pci/host/pcie-hisi.c</div><div class='add'>+F:	drivers/pci/dwc/pcie-hisi.c</div><div class='ctx'> </div><div class='ctx'> PCIE DRIVER FOR ROCKCHIP</div><div class='ctx'> M:	Shawn Lin &lt;shawn.lin@rock-chips.com&gt;</div><div class='hunk'>@@ -9396,7 +9762,7 @@ M:     Stanimir Varbanov &lt;svarbanov@mm-sol.com&gt;</div><div class='ctx'> L:     linux-pci@vger.kernel.org</div><div class='ctx'> L:     linux-arm-msm@vger.kernel.org</div><div class='ctx'> S:     Maintained</div><div class='del'>-F:     drivers/pci/host/*qcom*</div><div class='add'>+F:     drivers/pci/dwc/*qcom*</div><div class='ctx'> </div><div class='ctx'> PCIE DRIVER FOR CAVIUM THUNDERX</div><div class='ctx'> M:	David Daney &lt;david.daney@cavium.com&gt;</div><div class='hunk'>@@ -9518,7 +9884,7 @@ S:	Maintained</div><div class='ctx'> F:	drivers/pinctrl/pinctrl-at91.*</div><div class='ctx'> </div><div class='ctx'> PIN CONTROLLER - ATMEL AT91 PIO4</div><div class='del'>-M:	Ludovic Desroches &lt;ludovic.desroches@atmel.com&gt;</div><div class='add'>+M:	Ludovic Desroches &lt;ludovic.desroches@microchip.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> L:	linux-gpio@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -9570,12 +9936,12 @@ L:      linux-mips@linux-mips.org</div><div class='ctx'> S:      Maintained</div><div class='ctx'> F:      arch/mips/pistachio/</div><div class='ctx'> F:      arch/mips/include/asm/mach-pistachio/</div><div class='del'>-F:      arch/mips/boot/dts/pistachio/</div><div class='add'>+F:      arch/mips/boot/dts/img/pistachio*</div><div class='ctx'> F:      arch/mips/configs/pistachio*_defconfig</div><div class='ctx'> </div><div class='ctx'> PKTCDVD DRIVER</div><div class='del'>-M:	Jiri Kosina &lt;jikos@kernel.org&gt;</div><div class='del'>-S:	Maintained</div><div class='add'>+S:	Orphan</div><div class='add'>+M:	linux-block@vger.kernel.org</div><div class='ctx'> F:	drivers/block/pktcdvd.c</div><div class='ctx'> F:	include/linux/pktcdvd.h</div><div class='ctx'> F:	include/uapi/linux/pktcdvd.h</div><div class='hunk'>@@ -9650,7 +10016,7 @@ M:	Mark Rutland &lt;mark.rutland@arm.com&gt;</div><div class='ctx'> M:	Lorenzo Pieralisi &lt;lorenzo.pieralisi@arm.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/firmware/psci.c</div><div class='add'>+F:	drivers/firmware/psci*.c</div><div class='ctx'> F:	include/linux/psci.h</div><div class='ctx'> F:	include/uapi/linux/psci.h</div><div class='ctx'> </div><div class='hunk'>@@ -9714,6 +10080,14 @@ S:	Supported</div><div class='ctx'> F:	Documentation/preempt-locking.txt</div><div class='ctx'> F:	include/linux/preempt.h</div><div class='ctx'> </div><div class='add'>+PRINTK</div><div class='add'>+M:	Petr Mladek &lt;pmladek@suse.com&gt;</div><div class='add'>+M:	Sergey Senozhatsky &lt;sergey.senozhatsky@gmail.com&gt;</div><div class='add'>+R:	Steven Rostedt &lt;rostedt@goodmis.org&gt;</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	kernel/printk/</div><div class='add'>+F:	include/linux/printk.h</div><div class='add'>+</div><div class='ctx'> PRISM54 WIRELESS DRIVER</div><div class='ctx'> M:	"Luis R. Rodriguez" &lt;mcgrof@gmail.com&gt;</div><div class='ctx'> L:	linux-wireless@vger.kernel.org</div><div class='hunk'>@@ -9749,17 +10123,27 @@ L:	linuxppc-dev@lists.ozlabs.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/block/ps3vram.c</div><div class='ctx'> </div><div class='add'>+PSAMPLE PACKET SAMPLING SUPPORT:</div><div class='add'>+M:	Yotam Gigi &lt;yotamg@mellanox.com&gt;</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	net/psample</div><div class='add'>+F:	include/net/psample.h</div><div class='add'>+F:	include/uapi/linux/psample.h</div><div class='add'>+</div><div class='ctx'> PSTORE FILESYSTEM</div><div class='add'>+M:	Kees Cook &lt;keescook@chromium.org&gt;</div><div class='ctx'> M:	Anton Vorontsov &lt;anton@enomsg.org&gt;</div><div class='ctx'> M:	Colin Cross &lt;ccross@android.com&gt;</div><div class='del'>-M:	Kees Cook &lt;keescook@chromium.org&gt;</div><div class='ctx'> M:	Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='ctx'> S:	Maintained</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore</div><div class='ctx'> F:	fs/pstore/</div><div class='ctx'> F:	include/linux/pstore*</div><div class='ctx'> F:	drivers/firmware/efi/efi-pstore.c</div><div class='ctx'> F:	drivers/acpi/apei/erst.c</div><div class='add'>+F:	Documentation/admin-guide/ramoops.rst</div><div class='add'>+F:	Documentation/devicetree/bindings/reserved-memory/ramoops.txt</div><div class='add'>+K:	\b(pstore|ramoops)</div><div class='ctx'> </div><div class='ctx'> PTP HARDWARE CLOCK SUPPORT</div><div class='ctx'> M:	Richard Cochran &lt;richardcochran@gmail.com&gt;</div><div class='hunk'>@@ -9789,7 +10173,7 @@ M:	Hans Verkuil &lt;hverkuil@xs4all.nl&gt;</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='ctx'> T:	git git://linuxtv.org/media_tree.git</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/staging/media/pulse8-cec</div><div class='add'>+F:	drivers/media/usb/pulse8-cec/*</div><div class='ctx'> </div><div class='ctx'> PVRUSB2 VIDEO4LINUX DRIVER</div><div class='ctx'> M:	Mike Isely &lt;isely@pobox.com&gt;</div><div class='hunk'>@@ -9810,7 +10194,7 @@ F:	drivers/media/usb/pwc/*</div><div class='ctx'> </div><div class='ctx'> PWM FAN DRIVER</div><div class='ctx'> M:	Kamil Debski &lt;kamil@wypas.org&gt;</div><div class='del'>-M:	Lukasz Majewski &lt;l.majewski@samsung.com&gt;</div><div class='add'>+M:	Bartlomiej Zolnierkiewicz &lt;b.zolnierkie@samsung.com&gt;</div><div class='ctx'> L:	linux-hwmon@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	Documentation/devicetree/bindings/hwmon/pwm-fan.txt</div><div class='hunk'>@@ -9944,6 +10328,18 @@ F:	drivers/net/ethernet/qlogic/qed/</div><div class='ctx'> F:	include/linux/qed/</div><div class='ctx'> F:	drivers/net/ethernet/qlogic/qede/</div><div class='ctx'> </div><div class='add'>+QLOGIC QL41xxx ISCSI DRIVER</div><div class='add'>+M:	QLogic-Storage-Upstream@cavium.com</div><div class='add'>+L:	linux-scsi@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/scsi/qedi/</div><div class='add'>+</div><div class='add'>+QLOGIC QL41xxx FCOE DRIVER</div><div class='add'>+M:	QLogic-Storage-Upstream@cavium.com</div><div class='add'>+L:	linux-scsi@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/scsi/qedf/</div><div class='add'>+</div><div class='ctx'> QNX4 FILESYSTEM</div><div class='ctx'> M:	Anders Larsen &lt;al@alarsen.net&gt;</div><div class='ctx'> W:	http://www.alarsen.net/linux/qnx4fs/</div><div class='hunk'>@@ -9952,6 +10348,13 @@ F:	fs/qnx4/</div><div class='ctx'> F:	include/uapi/linux/qnx4_fs.h</div><div class='ctx'> F:	include/uapi/linux/qnxtypes.h</div><div class='ctx'> </div><div class='add'>+QORIQ DPAA2 FSL-MC BUS DRIVER</div><div class='add'>+M:	Stuart Yoder &lt;stuyoder@gmail.com&gt;</div><div class='add'>+M:	Laurentiu Tudor &lt;laurentiu.tudor@nxp.com&gt;</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/staging/fsl-mc/</div><div class='add'>+</div><div class='ctx'> QT1010 MEDIA DRIVER</div><div class='ctx'> M:	Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='hunk'>@@ -9965,7 +10368,6 @@ F:	drivers/media/tuners/qt1010*</div><div class='ctx'> QUALCOMM ATHEROS ATH9K WIRELESS DRIVER</div><div class='ctx'> M:	QCA ath9k Development &lt;ath9k-devel@qca.qualcomm.com&gt;</div><div class='ctx'> L:	linux-wireless@vger.kernel.org</div><div class='del'>-L:	ath9k-devel@lists.ath9k.org</div><div class='ctx'> W:	http://wireless.kernel.org/en/users/Drivers/ath9k</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/net/wireless/ath/ath9k/</div><div class='hunk'>@@ -10129,6 +10531,14 @@ L:	linux-rdma@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/infiniband/sw/rdmavt</div><div class='ctx'> </div><div class='add'>+RDT - RESOURCE ALLOCATION</div><div class='add'>+M:	Fenghua Yu &lt;fenghua.yu@intel.com&gt;</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	arch/x86/kernel/cpu/intel_rdt*</div><div class='add'>+F:	arch/x86/include/asm/intel_rdt*</div><div class='add'>+F:	Documentation/x86/intel_rdt*</div><div class='add'>+</div><div class='ctx'> READ-COPY UPDATE (RCU)</div><div class='ctx'> M:	"Paul E. McKenney" &lt;paulmck@linux.vnet.ibm.com&gt;</div><div class='ctx'> M:	Josh Triplett &lt;josh@joshtriplett.org&gt;</div><div class='hunk'>@@ -10203,6 +10613,7 @@ S:	Maintained</div><div class='ctx'> F:	drivers/rpmsg/</div><div class='ctx'> F:	Documentation/rpmsg.txt</div><div class='ctx'> F:	include/linux/rpmsg.h</div><div class='add'>+F:	include/linux/rpmsg/</div><div class='ctx'> </div><div class='ctx'> RENESAS CLOCK DRIVERS</div><div class='ctx'> M:	Geert Uytterhoeven &lt;geert+renesas@glider.be&gt;</div><div class='hunk'>@@ -10217,6 +10628,12 @@ L:	linux-renesas-soc@vger.kernel.org</div><div class='ctx'> F:	drivers/net/ethernet/renesas/</div><div class='ctx'> F:	include/linux/sh_eth.h</div><div class='ctx'> </div><div class='add'>+RENESAS R-CAR GYROADC DRIVER</div><div class='add'>+M:	Marek Vasut &lt;marek.vasut@gmail.com&gt;</div><div class='add'>+L:	linux-iio@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/iio/adc/rcar_gyro_adc.c</div><div class='add'>+</div><div class='ctx'> RENESAS USB2 PHY DRIVER</div><div class='ctx'> M:	Yoshihiro Shimoda &lt;yoshihiro.shimoda.uh@renesas.com&gt;</div><div class='ctx'> L:	linux-renesas-soc@vger.kernel.org</div><div class='hunk'>@@ -10356,7 +10773,7 @@ F:	drivers/net/wireless/realtek/rtlwifi/</div><div class='ctx'> F:	drivers/net/wireless/realtek/rtlwifi/rtl8192ce/</div><div class='ctx'> </div><div class='ctx'> RTL8XXXU WIRELESS DRIVER (rtl8xxxu)</div><div class='del'>-M:	Jes Sorensen &lt;Jes.Sorensen@redhat.com&gt;</div><div class='add'>+M:	Jes Sorensen &lt;Jes.Sorensen@gmail.com&gt;</div><div class='ctx'> L:	linux-wireless@vger.kernel.org</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -10414,7 +10831,7 @@ F:	arch/s390/pci/</div><div class='ctx'> F:	drivers/pci/hotplug/s390_pci_hpc.c</div><div class='ctx'> </div><div class='ctx'> S390 ZCRYPT DRIVER</div><div class='del'>-M:	Ingo Tuchscherer &lt;ingo.tuchscherer@de.ibm.com&gt;</div><div class='add'>+M:	Harald Freudenberger &lt;freude@de.ibm.com&gt;</div><div class='ctx'> L:	linux-s390@vger.kernel.org</div><div class='ctx'> W:	http://www.ibm.com/developerworks/linux/linux390/</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -10581,7 +10998,7 @@ L:	netdev@vger.kernel.org</div><div class='ctx'> F:	drivers/net/ethernet/samsung/sxgbe/</div><div class='ctx'> </div><div class='ctx'> SAMSUNG THERMAL DRIVER</div><div class='del'>-M:	Lukasz Majewski &lt;l.majewski@samsung.com&gt;</div><div class='add'>+M:	Bartlomiej Zolnierkiewicz &lt;b.zolnierkie@samsung.com&gt;</div><div class='ctx'> L:	linux-pm@vger.kernel.org</div><div class='ctx'> L:	linux-samsung-soc@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -10609,6 +11026,20 @@ S:	Maintained</div><div class='ctx'> F:	Documentation/devicetree/bindings/serial/</div><div class='ctx'> F:	drivers/tty/serial/</div><div class='ctx'> </div><div class='add'>+SERIAL DEVICE BUS</div><div class='add'>+M:	Rob Herring &lt;robh@kernel.org&gt;</div><div class='add'>+L:	linux-serial@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/devicetree/bindings/serial/slave-device.txt</div><div class='add'>+F:	drivers/tty/serdev/</div><div class='add'>+F:	include/linux/serdev.h</div><div class='add'>+</div><div class='add'>+SERIAL IR RECEIVER</div><div class='add'>+M:	Sean Young &lt;sean@mess.org&gt;</div><div class='add'>+L:	linux-media@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/media/rc/serial_ir.c</div><div class='add'>+</div><div class='ctx'> STI CEC DRIVER</div><div class='ctx'> M:	Benjamin Gaignard &lt;benjamin.gaignard@linaro.org&gt;</div><div class='ctx'> L:	kernel@stlinux.com</div><div class='hunk'>@@ -10616,6 +11047,13 @@ S:	Maintained</div><div class='ctx'> F:	drivers/staging/media/st-cec/</div><div class='ctx'> F:	Documentation/devicetree/bindings/media/stih-cec.txt</div><div class='ctx'> </div><div class='add'>+SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS</div><div class='add'>+M:	Ursula Braun &lt;ubraun@linux.vnet.ibm.com&gt;</div><div class='add'>+L:	linux-s390@vger.kernel.org</div><div class='add'>+W:	http://www.ibm.com/developerworks/linux/linux390/</div><div class='add'>+S:	Supported</div><div class='add'>+F:	net/smc/</div><div class='add'>+</div><div class='ctx'> SYNOPSYS DESIGNWARE DMAC DRIVER</div><div class='ctx'> M:	Viresh Kumar &lt;vireshk@kernel.org&gt;</div><div class='ctx'> M:	Andy Shevchenko &lt;andriy.shevchenko@linux.intel.com&gt;</div><div class='hunk'>@@ -10624,13 +11062,6 @@ F:	include/linux/dma/dw.h</div><div class='ctx'> F:	include/linux/platform_data/dma-dw.h</div><div class='ctx'> F:	drivers/dma/dw/</div><div class='ctx'> </div><div class='del'>-SYNOPSYS DESIGNWARE ETHERNET QOS 4.10a driver</div><div class='del'>-M: Lars Persson &lt;lars.persson@axis.com&gt;</div><div class='del'>-L: netdev@vger.kernel.org</div><div class='del'>-S: Supported</div><div class='del'>-F: Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt</div><div class='del'>-F: drivers/net/ethernet/synopsys/dwc_eth_qos.c</div><div class='del'>-</div><div class='ctx'> SYNOPSYS DESIGNWARE I2C DRIVER</div><div class='ctx'> M:	Jarkko Nikula &lt;jarkko.nikula@linux.intel.com&gt;</div><div class='ctx'> R:	Andy Shevchenko &lt;andriy.shevchenko@linux.intel.com&gt;</div><div class='hunk'>@@ -10644,7 +11075,6 @@ SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER</div><div class='ctx'> M:	Jaehoon Chung &lt;jh80.chung@samsung.com&gt;</div><div class='ctx'> L:	linux-mmc@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	include/linux/mmc/dw_mmc.h</div><div class='ctx'> F:	drivers/mmc/host/dw_mmc*</div><div class='ctx'> </div><div class='ctx'> SYSTEM TRACE MODULE CLASS</div><div class='hunk'>@@ -10707,6 +11137,11 @@ W:	http://www.sunplus.com</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	arch/score/</div><div class='ctx'> </div><div class='add'>+SCR24X CHIP CARD INTERFACE DRIVER</div><div class='add'>+M:	Lubomir Rintel &lt;lkundrak@v3.sk&gt;</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/char/pcmcia/scr24x_cs.c</div><div class='add'>+</div><div class='ctx'> SYSTEM CONTROL &amp; POWER INTERFACE (SCPI) Message Protocol drivers</div><div class='ctx'> M:	Sudeep Holla &lt;sudeep.holla@arm.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org</div><div class='hunk'>@@ -10842,6 +11277,17 @@ L:	linux-mmc@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/mmc/host/sdhci-spear.c</div><div class='ctx'> </div><div class='add'>+SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER</div><div class='add'>+M:	Scott Bauer &lt;scott.bauer@intel.com&gt;</div><div class='add'>+M:	Jonathan Derrick &lt;jonathan.derrick@intel.com&gt;</div><div class='add'>+M:	Rafael Antognolli &lt;rafael.antognolli@intel.com&gt;</div><div class='add'>+L:	linux-block@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	block/sed*</div><div class='add'>+F:	block/opal_proto.h</div><div class='add'>+F:	include/linux/sed*</div><div class='add'>+F:	include/uapi/linux/sed*</div><div class='add'>+</div><div class='ctx'> SECURITY SUBSYSTEM</div><div class='ctx'> M:	James Morris &lt;james.l.morris@oracle.com&gt;</div><div class='ctx'> M:	"Serge E. Hallyn" &lt;serge@hallyn.com&gt;</div><div class='hunk'>@@ -10915,7 +11361,6 @@ F:	drivers/net/ethernet/emulex/benet/</div><div class='ctx'> EMULEX ONECONNECT ROCE DRIVER</div><div class='ctx'> M:	Selvin Xavier &lt;selvin.xavier@avagotech.com&gt;</div><div class='ctx'> M:	Devesh Sharma &lt;devesh.sharma@avagotech.com&gt;</div><div class='del'>-M:	Mitesh Ahuja &lt;mitesh.ahuja@avagotech.com&gt;</div><div class='ctx'> L:	linux-rdma@vger.kernel.org</div><div class='ctx'> W:	http://www.emulex.com</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -11023,6 +11468,14 @@ F:	drivers/media/usb/siano/</div><div class='ctx'> F:	drivers/media/usb/siano/</div><div class='ctx'> F:	drivers/media/mmc/siano/</div><div class='ctx'> </div><div class='add'>+SILEAD TOUCHSCREEN DRIVER</div><div class='add'>+M:	Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='add'>+L:	linux-input@vger.kernel.org</div><div class='add'>+L:	platform-driver-x86@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/input/touchscreen/silead.c</div><div class='add'>+F:	drivers/platform/x86/silead_dmi.c</div><div class='add'>+</div><div class='ctx'> SIMPLEFB FB DRIVER</div><div class='ctx'> M:	Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='ctx'> L:	linux-fbdev@vger.kernel.org</div><div class='hunk'>@@ -11069,6 +11522,13 @@ F:	arch/arm/mach-s3c24xx/mach-bast.c</div><div class='ctx'> F:	arch/arm/mach-s3c24xx/bast-ide.c</div><div class='ctx'> F:	arch/arm/mach-s3c24xx/bast-irq.c</div><div class='ctx'> </div><div class='add'>+SIPHASH PRF ROUTINES</div><div class='add'>+M:	Jason A. Donenfeld &lt;Jason@zx2c4.com&gt;</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	lib/siphash.c</div><div class='add'>+F:	lib/test_siphash.c</div><div class='add'>+F:	include/linux/siphash.h</div><div class='add'>+</div><div class='ctx'> TI DAVINCI MACHINE SUPPORT</div><div class='ctx'> M:	Sekhar Nori &lt;nsekhar@ti.com&gt;</div><div class='ctx'> M:	Kevin Hilman &lt;khilman@kernel.org&gt;</div><div class='hunk'>@@ -11110,7 +11570,7 @@ F:	include/media/i2c/ov2659.h</div><div class='ctx'> SILICON MOTION SM712 FRAME BUFFER DRIVER</div><div class='ctx'> M:	Sudip Mukherjee &lt;sudipm.mukherjee@gmail.com&gt;</div><div class='ctx'> M:	Teddy Wang &lt;teddy.wang@siliconmotion.com&gt;</div><div class='del'>-M:	Sudip Mukherjee &lt;sudip@vectorindia.org&gt;</div><div class='add'>+M:	Sudip Mukherjee &lt;sudip.mukherjee@codethink.co.uk&gt;</div><div class='ctx'> L:	linux-fbdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/video/fbdev/sm712*</div><div class='hunk'>@@ -11472,7 +11932,7 @@ STABLE BRANCH</div><div class='ctx'> M:	Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='ctx'> L:	stable@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='del'>-F:	Documentation/stable_kernel_rules.txt</div><div class='add'>+F:	Documentation/process/stable-kernel-rules.rst</div><div class='ctx'> </div><div class='ctx'> STAGING SUBSYSTEM</div><div class='ctx'> M:	Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='hunk'>@@ -11538,17 +11998,11 @@ F:	drivers/staging/rtl8712/</div><div class='ctx'> STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER</div><div class='ctx'> M:	Sudip Mukherjee &lt;sudipm.mukherjee@gmail.com&gt;</div><div class='ctx'> M:	Teddy Wang &lt;teddy.wang@siliconmotion.com&gt;</div><div class='del'>-M:	Sudip Mukherjee &lt;sudip@vectorindia.org&gt;</div><div class='add'>+M:	Sudip Mukherjee &lt;sudip.mukherjee@codethink.co.uk&gt;</div><div class='ctx'> L:	linux-fbdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/staging/sm750fb/</div><div class='ctx'> </div><div class='del'>-STAGING - SLICOSS</div><div class='del'>-M:	Lior Dotan &lt;liodot@gmail.com&gt;</div><div class='del'>-M:	Christopher Harrer &lt;charrer@alacritech.com&gt;</div><div class='del'>-S:	Odd Fixes</div><div class='del'>-F:	drivers/staging/slicoss/</div><div class='del'>-</div><div class='ctx'> STAGING - SPEAKUP CONSOLE SPEECH DRIVER</div><div class='ctx'> M:	William Hubbs &lt;w.d.hubbs@gmail.com&gt;</div><div class='ctx'> M:	Chris Brannon &lt;chris@the-brannons.com&gt;</div><div class='hunk'>@@ -11646,6 +12100,7 @@ F:	include/linux/swiotlb.h</div><div class='ctx'> </div><div class='ctx'> SWITCHDEV</div><div class='ctx'> M:	Jiri Pirko &lt;jiri@resnulli.us&gt;</div><div class='add'>+M:	Ivan Vecera &lt;ivecera@redhat.com&gt;</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	net/switchdev/</div><div class='hunk'>@@ -11658,6 +12113,7 @@ S:	Supported</div><div class='ctx'> F:	arch/arc/</div><div class='ctx'> F:	Documentation/devicetree/bindings/arc/*</div><div class='ctx'> F:	Documentation/devicetree/bindings/interrupt-controller/snps,arc*</div><div class='add'>+F:	drivers/clocksource/arc_timer.c</div><div class='ctx'> F:	drivers/tty/serial/arc_uart.c</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git</div><div class='ctx'> </div><div class='hunk'>@@ -11918,6 +12374,16 @@ S:	Maintained</div><div class='ctx'> F:	arch/xtensa/</div><div class='ctx'> F:	drivers/irqchip/irq-xtensa-*</div><div class='ctx'> </div><div class='add'>+Texas Instruments' System Control Interface (TISCI) Protocol Driver</div><div class='add'>+M:	Nishanth Menon &lt;nm@ti.com&gt;</div><div class='add'>+M:	Tero Kristo &lt;t-kristo@ti.com&gt;</div><div class='add'>+M:	Santosh Shilimkar &lt;ssantosh@kernel.org&gt;</div><div class='add'>+L:	linux-arm-kernel@lists.infradead.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/devicetree/bindings/arm/keystone/ti,sci.txt</div><div class='add'>+F:	drivers/firmware/ti_sci*</div><div class='add'>+F:	include/linux/soc/ti/ti_sci_protocol.h</div><div class='add'>+</div><div class='ctx'> THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER</div><div class='ctx'> M:	Hans Verkuil &lt;hverkuil@xs4all.nl&gt;</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='hunk'>@@ -12348,6 +12814,12 @@ S:	Maintained</div><div class='ctx'> F:	Documentation/filesystems/udf.txt</div><div class='ctx'> F:	fs/udf/</div><div class='ctx'> </div><div class='add'>+UDRAW TABLET</div><div class='add'>+M:	Bastien Nocera &lt;hadess@hadess.net&gt;</div><div class='add'>+L:	linux-input@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/hid/hid-udraw.c</div><div class='add'>+</div><div class='ctx'> UFS FILESYSTEM</div><div class='ctx'> M:	Evgeniy Dushistov &lt;dushistov@mail.ru&gt;</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -12404,7 +12876,8 @@ F:	Documentation/scsi/ufs.txt</div><div class='ctx'> F:	drivers/scsi/ufs/</div><div class='ctx'> </div><div class='ctx'> UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS</div><div class='del'>-M:	Joao Pinto &lt;Joao.Pinto@synopsys.com&gt;</div><div class='add'>+M:	Manjunath M Bettegowda &lt;manjumb@synopsys.com&gt;</div><div class='add'>+M:	Prabu Thangamuthu &lt;prabut@synopsys.com&gt;</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/scsi/ufs/*dwc*</div><div class='hunk'>@@ -12721,7 +13194,7 @@ USERSPACE I/O (UIO)</div><div class='ctx'> M:	Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git</div><div class='del'>-F:	Documentation/DocBook/uio-howto.tmpl</div><div class='add'>+F:	Documentation/driver-api/uio-howto.rst</div><div class='ctx'> F:	drivers/uio/</div><div class='ctx'> F:	include/linux/uio*.h</div><div class='ctx'> </div><div class='hunk'>@@ -12762,6 +13235,15 @@ F:	drivers/vfio/</div><div class='ctx'> F:	include/linux/vfio.h</div><div class='ctx'> F:	include/uapi/linux/vfio.h</div><div class='ctx'> </div><div class='add'>+VFIO MEDIATED DEVICE DRIVERS</div><div class='add'>+M:	Kirti Wankhede &lt;kwankhede@nvidia.com&gt;</div><div class='add'>+L:	kvm@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	Documentation/vfio-mediated-device.txt</div><div class='add'>+F:	drivers/vfio/mdev/</div><div class='add'>+F:	include/linux/mdev.h</div><div class='add'>+F:	samples/vfio-mdev/</div><div class='add'>+</div><div class='ctx'> VFIO PLATFORM DRIVER</div><div class='ctx'> M:	Baptiste Reynal &lt;b.reynal@virtualopensystems.com&gt;</div><div class='ctx'> L:	kvm@vger.kernel.org</div><div class='hunk'>@@ -12797,7 +13279,7 @@ F:	drivers/input/serio/userio.c</div><div class='ctx'> F:	include/uapi/linux/userio.h</div><div class='ctx'> </div><div class='ctx'> VIRTIO CONSOLE DRIVER</div><div class='del'>-M:	Amit Shah &lt;amit.shah@redhat.com&gt;</div><div class='add'>+M:	Amit Shah &lt;amit@kernel.org&gt;</div><div class='ctx'> L:	virtualization@lists.linux-foundation.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/char/virtio_console.c</div><div class='hunk'>@@ -12816,6 +13298,7 @@ F:	drivers/net/virtio_net.c</div><div class='ctx'> F:	drivers/block/virtio_blk.c</div><div class='ctx'> F:	include/linux/virtio_*.h</div><div class='ctx'> F:	include/uapi/linux/virtio_*.h</div><div class='add'>+F:	drivers/crypto/virtio/</div><div class='ctx'> </div><div class='ctx'> VIRTIO DRIVERS FOR S390</div><div class='ctx'> M:	Christian Borntraeger &lt;borntraeger@de.ibm.com&gt;</div><div class='hunk'>@@ -12831,6 +13314,7 @@ M:	David Airlie &lt;airlied@linux.ie&gt;</div><div class='ctx'> M:	Gerd Hoffmann &lt;kraxel@redhat.com&gt;</div><div class='ctx'> L:	dri-devel@lists.freedesktop.org</div><div class='ctx'> L:	virtualization@lists.linux-foundation.org</div><div class='add'>+T:	git git://git.kraxel.org/linux drm-qemu</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/gpu/drm/virtio/</div><div class='ctx'> F:	include/uapi/linux/virtio_gpu.h</div><div class='hunk'>@@ -12852,6 +13336,14 @@ S:	Maintained</div><div class='ctx'> F:	drivers/virtio/virtio_input.c</div><div class='ctx'> F:	include/uapi/linux/virtio_input.h</div><div class='ctx'> </div><div class='add'>+VIRTIO CRYPTO DRIVER</div><div class='add'>+M:  Gonglei &lt;arei.gonglei@huawei.com&gt;</div><div class='add'>+L:  virtualization@lists.linux-foundation.org</div><div class='add'>+L:  linux-crypto@vger.kernel.org</div><div class='add'>+S:  Maintained</div><div class='add'>+F:  drivers/crypto/virtio/</div><div class='add'>+F:  include/uapi/linux/virtio_crypto.h</div><div class='add'>+</div><div class='ctx'> VIA RHINE NETWORK DRIVER</div><div class='ctx'> S:	Orphan</div><div class='ctx'> F:	drivers/net/ethernet/via/via-rhine.c</div><div class='hunk'>@@ -12914,7 +13406,7 @@ M:	Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='ctx'> L:	devel@driverdev.osuosl.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git</div><div class='del'>-F:	Documentation/vme_api.txt</div><div class='add'>+F:	Documentation/driver-api/vme.rst</div><div class='ctx'> F:	drivers/staging/vme/</div><div class='ctx'> F:	drivers/vme/</div><div class='ctx'> F:	include/linux/vme*</div><div class='hunk'>@@ -12956,6 +13448,13 @@ S:	Maintained</div><div class='ctx'> F:	drivers/scsi/vmw_pvscsi.c</div><div class='ctx'> F:	drivers/scsi/vmw_pvscsi.h</div><div class='ctx'> </div><div class='add'>+VMWARE PVRDMA DRIVER</div><div class='add'>+M:	Adit Ranadive &lt;aditr@vmware.com&gt;</div><div class='add'>+M:	VMware PV-Drivers &lt;pv-drivers@vmware.com&gt;</div><div class='add'>+L:	linux-rdma@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/infiniband/hw/vmw_pvrdma/</div><div class='add'>+</div><div class='ctx'> VOLTAGE AND CURRENT REGULATOR FRAMEWORK</div><div class='ctx'> M:	Liam Girdwood &lt;lgirdwood@gmail.com&gt;</div><div class='ctx'> M:	Mark Brown &lt;broonie@kernel.org&gt;</div><div class='hunk'>@@ -13088,10 +13587,8 @@ S:	Maintained</div><div class='ctx'> F:	drivers/input/misc/wistron_btns.c</div><div class='ctx'> </div><div class='ctx'> WL3501 WIRELESS PCMCIA CARD DRIVER</div><div class='del'>-M:	Arnaldo Carvalho de Melo &lt;acme@ghostprotocols.net&gt;</div><div class='ctx'> L:	linux-wireless@vger.kernel.org</div><div class='del'>-W:	http://oops.ghostprotocols.net:81/blog</div><div class='del'>-S:	Maintained</div><div class='add'>+S:	Odd fixes</div><div class='ctx'> F:	drivers/net/wireless/wl3501*</div><div class='ctx'> </div><div class='ctx'> WOLFSON MICROELECTRONICS DRIVERS</div><div class='hunk'>@@ -13139,7 +13636,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	include/linux/workqueue.h</div><div class='ctx'> F:	kernel/workqueue.c</div><div class='del'>-F:	Documentation/workqueue.txt</div><div class='add'>+F:	Documentation/core-api/workqueue.rst</div><div class='ctx'> </div><div class='ctx'> X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS</div><div class='ctx'> M:	Chen-Yu Tsai &lt;wens@csie.org&gt;</div><div class='hunk'>@@ -13168,6 +13665,7 @@ F:	arch/x86/</div><div class='ctx'> </div><div class='ctx'> X86 PLATFORM DRIVERS</div><div class='ctx'> M:	Darren Hart &lt;dvhart@infradead.org&gt;</div><div class='add'>+M:	Andy Shevchenko &lt;andy@infradead.org&gt;</div><div class='ctx'> L:	platform-driver-x86@vger.kernel.org</div><div class='ctx'> T:	git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -13204,7 +13702,6 @@ F:	drivers/media/tuners/tuner-xc2028.*</div><div class='ctx'> </div><div class='ctx'> XEN HYPERVISOR INTERFACE</div><div class='ctx'> M:	Boris Ostrovsky &lt;boris.ostrovsky@oracle.com&gt;</div><div class='del'>-M:	David Vrabel &lt;david.vrabel@citrix.com&gt;</div><div class='ctx'> M:	Juergen Gross &lt;jgross@suse.com&gt;</div><div class='ctx'> L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git</div><div class='hunk'>@@ -13270,11 +13767,11 @@ F:	arch/x86/xen/*swiotlb*</div><div class='ctx'> F:	drivers/xen/*swiotlb*</div><div class='ctx'> </div><div class='ctx'> XFS FILESYSTEM</div><div class='del'>-M:	Dave Chinner &lt;david@fromorbit.com&gt;</div><div class='add'>+M:	Darrick J. Wong &lt;darrick.wong@oracle.com&gt;</div><div class='ctx'> M:	linux-xfs@vger.kernel.org</div><div class='ctx'> L:	linux-xfs@vger.kernel.org</div><div class='ctx'> W:	http://xfs.org/</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	Documentation/filesystems/xfs.txt</div><div class='ctx'> F:	fs/xfs/</div><div class='hunk'>@@ -13340,6 +13837,7 @@ F:	drivers/net/hamradio/z8530.h</div><div class='ctx'> </div><div class='ctx'> ZBUD COMPRESSED PAGE ALLOCATOR</div><div class='ctx'> M:	Seth Jennings &lt;sjenning@redhat.com&gt;</div><div class='add'>+M:	Dan Streetman &lt;ddstreet@ieee.org&gt;</div><div class='ctx'> L:	linux-mm@kvack.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	mm/zbud.c</div><div class='hunk'>@@ -13354,6 +13852,24 @@ L:	zd1211-devs@lists.sourceforge.net (subscribers-only)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/net/wireless/zydas/zd1211rw/</div><div class='ctx'> </div><div class='add'>+ZD1301_DEMOD MEDIA DRIVER</div><div class='add'>+M:	Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='add'>+L:	linux-media@vger.kernel.org</div><div class='add'>+W:	https://linuxtv.org/</div><div class='add'>+W:	http://palosaari.fi/linux/</div><div class='add'>+Q:	https://patchwork.linuxtv.org/project/linux-media/list/</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/media/dvb-frontends/zd1301_demod*</div><div class='add'>+</div><div class='add'>+ZD1301 MEDIA DRIVER</div><div class='add'>+M:	Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='add'>+L:	linux-media@vger.kernel.org</div><div class='add'>+W:	https://linuxtv.org/</div><div class='add'>+W:	http://palosaari.fi/linux/</div><div class='add'>+Q:	https://patchwork.linuxtv.org/project/linux-media/list/</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/media/usb/dvb-usb-v2/zd1301*</div><div class='add'>+</div><div class='ctx'> ZPOOL COMPRESSED PAGE STORAGE API</div><div class='ctx'> M:	Dan Streetman &lt;ddstreet@ieee.org&gt;</div><div class='ctx'> L:	linux-mm@kvack.org</div><div class='hunk'>@@ -13395,6 +13911,7 @@ F:	Documentation/vm/zsmalloc.txt</div><div class='ctx'> </div><div class='ctx'> ZSWAP COMPRESSED SWAP CACHING</div><div class='ctx'> M:	Seth Jennings &lt;sjenning@redhat.com&gt;</div><div class='add'>+M:	Dan Streetman &lt;ddstreet@ieee.org&gt;</div><div class='ctx'> L:	linux-mm@kvack.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	mm/zswap.c</div><div class='head'>diff --git a/Makefile b/Makefile<br/>index b1037774e8e8..165cf9783a5d 100644<br/>--- a/<a href='/drm-misc/tree/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>Makefile</a><br/>+++ b/<a href='/drm-misc/tree/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>Makefile</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> VERSION = 4</div><div class='del'>-PATCHLEVEL = 9</div><div class='add'>+PATCHLEVEL = 11</div><div class='ctx'> SUBLEVEL = 0</div><div class='del'>-EXTRAVERSION =</div><div class='del'>-NAME = Roaring Lionus</div><div class='add'>+EXTRAVERSION = -rc1</div><div class='add'>+NAME = Fearless Coyote</div><div class='ctx'> </div><div class='ctx'> # *DOCUMENTATION*</div><div class='ctx'> # To see a list of typical targets execute "make help"</div><div class='hunk'>@@ -87,10 +87,12 @@ endif</div><div class='ctx'> ifneq ($(filter 4.%,$(MAKE_VERSION)),)	# make-4</div><div class='ctx'> ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)</div><div class='ctx'>   quiet=silent_</div><div class='add'>+  tools_silent=s</div><div class='ctx'> endif</div><div class='ctx'> else					# make-3.8x</div><div class='ctx'> ifneq ($(filter s% -s%,$(MAKEFLAGS)),)</div><div class='ctx'>   quiet=silent_</div><div class='add'>+  tools_silent=-s</div><div class='ctx'> endif</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='hunk'>@@ -797,7 +799,7 @@ KBUILD_CFLAGS   += $(call cc-option,-Werror=incompatible-pointer-types)</div><div class='ctx'> KBUILD_ARFLAGS := $(call ar-option,D)</div><div class='ctx'> </div><div class='ctx'> # check for 'asm goto'</div><div class='del'>-ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)</div><div class='add'>+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)</div><div class='ctx'> 	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO</div><div class='ctx'> 	KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO</div><div class='ctx'> endif</div><div class='hunk'>@@ -908,6 +910,18 @@ mod_sign_cmd = true</div><div class='ctx'> endif</div><div class='ctx'> export mod_sign_cmd</div><div class='ctx'> </div><div class='add'>+ifdef CONFIG_STACK_VALIDATION</div><div class='add'>+  has_libelf := $(call try-run,\</div><div class='add'>+		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)</div><div class='add'>+  ifeq ($(has_libelf),1)</div><div class='add'>+    objtool_target := tools/objtool FORCE</div><div class='add'>+  else</div><div class='add'>+    $(warning "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev, libelf-devel or elfutils-libelf-devel")</div><div class='add'>+    SKIP_STACK_VALIDATION := 1</div><div class='add'>+    export SKIP_STACK_VALIDATION</div><div class='add'>+  endif</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> ifeq ($(KBUILD_EXTMOD),)</div><div class='ctx'> core-y		+= kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/</div><div class='hunk'>@@ -1035,18 +1049,6 @@ prepare0: archprepare gcc-plugins</div><div class='ctx'> # All the preparing..</div><div class='ctx'> prepare: prepare0 prepare-objtool</div><div class='ctx'> </div><div class='del'>-ifdef CONFIG_STACK_VALIDATION</div><div class='del'>-  has_libelf := $(call try-run,\</div><div class='del'>-		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)</div><div class='del'>-  ifeq ($(has_libelf),1)</div><div class='del'>-    objtool_target := tools/objtool FORCE</div><div class='del'>-  else</div><div class='del'>-    $(warning "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev, libelf-devel or elfutils-libelf-devel")</div><div class='del'>-    SKIP_STACK_VALIDATION := 1</div><div class='del'>-    export SKIP_STACK_VALIDATION</div><div class='del'>-  endif</div><div class='del'>-endif</div><div class='del'>-</div><div class='ctx'> PHONY += prepare-objtool</div><div class='ctx'> prepare-objtool: $(objtool_target)</div><div class='ctx'> </div><div class='hunk'>@@ -1444,7 +1446,7 @@ $(help-board-dirs): help-%:</div><div class='ctx'> </div><div class='ctx'> # Documentation targets</div><div class='ctx'> # ---------------------------------------------------------------------------</div><div class='del'>-DOC_TARGETS := xmldocs sgmldocs psdocs latexdocs pdfdocs htmldocs mandocs installmandocs epubdocs cleandocs</div><div class='add'>+DOC_TARGETS := xmldocs sgmldocs psdocs latexdocs pdfdocs htmldocs mandocs installmandocs epubdocs cleandocs linkcheckdocs</div><div class='ctx'> PHONY += $(DOC_TARGETS)</div><div class='ctx'> $(DOC_TARGETS): scripts_basic FORCE</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=scripts build_docproc build_check-lc_ctype</div><div class='hunk'>@@ -1607,11 +1609,11 @@ image_name:</div><div class='ctx'> # Clear a bunch of variables before executing the submake</div><div class='ctx'> tools/: FORCE</div><div class='ctx'> 	$(Q)mkdir -p $(objtree)/tools</div><div class='del'>-	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) &amp;&amp; /bin/pwd) subdir=tools -C $(src)/tools/</div><div class='add'>+	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) &amp;&amp; /bin/pwd) subdir=tools -C $(src)/tools/</div><div class='ctx'> </div><div class='ctx'> tools/%: FORCE</div><div class='ctx'> 	$(Q)mkdir -p $(objtree)/tools</div><div class='del'>-	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) &amp;&amp; /bin/pwd) subdir=tools -C $(src)/tools/ $*</div><div class='add'>+	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) &amp;&amp; /bin/pwd) subdir=tools -C $(src)/tools/ $*</div><div class='ctx'> </div><div class='ctx'> # Single targets</div><div class='ctx'> # ---------------------------------------------------------------------------</div><div class='head'>diff --git a/README b/README<br/>index 09f34f78f2bb..b2ba4aaa3a71 100644<br/>--- a/<a href='/drm-misc/tree/README?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>README</a><br/>+++ b/<a href='/drm-misc/tree/README?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>README</a></div><div class='hunk'>@@ -1,400 +1,18 @@</div><div class='del'>-        Linux kernel release 4.x &lt;http://kernel.org/&gt;</div><div class='add'>+Linux kernel</div><div class='add'>+============</div><div class='ctx'> </div><div class='del'>-These are the release notes for Linux version 4.  Read them carefully,</div><div class='del'>-as they tell you what this is all about, explain how to install the</div><div class='del'>-kernel, and what to do if something goes wrong.</div><div class='add'>+This file was moved to Documentation/admin-guide/README.rst</div><div class='ctx'> </div><div class='del'>-WHAT IS LINUX?</div><div class='add'>+Please notice that there are several guides for kernel developers and users.</div><div class='add'>+These guides can be rendered in a number of formats, like HTML and PDF.</div><div class='ctx'> </div><div class='del'>-  Linux is a clone of the operating system Unix, written from scratch by</div><div class='del'>-  Linus Torvalds with assistance from a loosely-knit team of hackers across</div><div class='del'>-  the Net. It aims towards POSIX and Single UNIX Specification compliance.</div><div class='add'>+In order to build the documentation, use ``make htmldocs`` or</div><div class='add'>+``make pdfdocs``.</div><div class='ctx'> </div><div class='del'>-  It has all the features you would expect in a modern fully-fledged Unix,</div><div class='del'>-  including true multitasking, virtual memory, shared libraries, demand</div><div class='del'>-  loading, shared copy-on-write executables, proper memory management,</div><div class='del'>-  and multistack networking including IPv4 and IPv6.</div><div class='del'>-</div><div class='del'>-  It is distributed under the GNU General Public License - see the</div><div class='del'>-  accompanying COPYING file for more details.</div><div class='del'>-</div><div class='del'>-ON WHAT HARDWARE DOES IT RUN?</div><div class='del'>-</div><div class='del'>-  Although originally developed first for 32-bit x86-based PCs (386 or higher),</div><div class='del'>-  today Linux also runs on (at least) the Compaq Alpha AXP, Sun SPARC and</div><div class='del'>-  UltraSPARC, Motorola 68000, PowerPC, PowerPC64, ARM, Hitachi SuperH, Cell,</div><div class='del'>-  IBM S/390, MIPS, HP PA-RISC, Intel IA-64, DEC VAX, AMD x86-64, AXIS CRIS,</div><div class='del'>-  Xtensa, Tilera TILE, AVR32, ARC and Renesas M32R architectures.</div><div class='del'>-</div><div class='del'>-  Linux is easily portable to most general-purpose 32- or 64-bit architectures</div><div class='del'>-  as long as they have a paged memory management unit (PMMU) and a port of the</div><div class='del'>-  GNU C compiler (gcc) (part of The GNU Compiler Collection, GCC). Linux has</div><div class='del'>-  also been ported to a number of architectures without a PMMU, although</div><div class='del'>-  functionality is then obviously somewhat limited.</div><div class='del'>-  Linux has also been ported to itself. You can now run the kernel as a</div><div class='del'>-  userspace application - this is called UserMode Linux (UML).</div><div class='del'>-</div><div class='del'>-DOCUMENTATION:</div><div class='del'>-</div><div class='del'>- - There is a lot of documentation available both in electronic form on</div><div class='del'>-   the Internet and in books, both Linux-specific and pertaining to</div><div class='del'>-   general UNIX questions.  I'd recommend looking into the documentation</div><div class='del'>-   subdirectories on any Linux FTP site for the LDP (Linux Documentation</div><div class='del'>-   Project) books.  This README is not meant to be documentation on the</div><div class='del'>-   system: there are much better sources available.</div><div class='del'>-</div><div class='del'>- - There are various README files in the Documentation/ subdirectory:</div><div class='del'>-   these typically contain kernel-specific installation notes for some</div><div class='del'>-   drivers for example. See Documentation/00-INDEX for a list of what</div><div class='del'>-   is contained in each file.  Please read the Changes file, as it</div><div class='del'>-   contains information about the problems, which may result by upgrading</div><div class='del'>-   your kernel.</div><div class='del'>-</div><div class='del'>- - The Documentation/DocBook/ subdirectory contains several guides for</div><div class='del'>-   kernel developers and users.  These guides can be rendered in a</div><div class='del'>-   number of formats:  PostScript (.ps), PDF, HTML, &amp; man-pages, among others.</div><div class='del'>-   After installation, "make psdocs", "make pdfdocs", "make htmldocs",</div><div class='del'>-   or "make mandocs" will render the documentation in the requested format.</div><div class='del'>-</div><div class='del'>-INSTALLING the kernel source:</div><div class='del'>-</div><div class='del'>- - If you install the full sources, put the kernel tarball in a</div><div class='del'>-   directory where you have permissions (e.g. your home directory) and</div><div class='del'>-   unpack it:</div><div class='del'>-</div><div class='del'>-     xz -cd linux-4.X.tar.xz | tar xvf -</div><div class='del'>-</div><div class='del'>-   Replace "X" with the version number of the latest kernel.</div><div class='del'>-</div><div class='del'>-   Do NOT use the /usr/src/linux area! This area has a (usually</div><div class='del'>-   incomplete) set of kernel headers that are used by the library header</div><div class='del'>-   files.  They should match the library, and not get messed up by</div><div class='del'>-   whatever the kernel-du-jour happens to be.</div><div class='del'>-</div><div class='del'>- - You can also upgrade between 4.x releases by patching.  Patches are</div><div class='del'>-   distributed in the xz format.  To install by patching, get all the</div><div class='del'>-   newer patch files, enter the top level directory of the kernel source</div><div class='del'>-   (linux-4.X) and execute:</div><div class='del'>-</div><div class='del'>-     xz -cd ../patch-4.x.xz | patch -p1</div><div class='del'>-</div><div class='del'>-   Replace "x" for all versions bigger than the version "X" of your current</div><div class='del'>-   source tree, _in_order_, and you should be ok.  You may want to remove</div><div class='del'>-   the backup files (some-file-name~ or some-file-name.orig), and make sure</div><div class='del'>-   that there are no failed patches (some-file-name# or some-file-name.rej).</div><div class='del'>-   If there are, either you or I have made a mistake.</div><div class='del'>-</div><div class='del'>-   Unlike patches for the 4.x kernels, patches for the 4.x.y kernels</div><div class='del'>-   (also known as the -stable kernels) are not incremental but instead apply</div><div class='del'>-   directly to the base 4.x kernel.  For example, if your base kernel is 4.0</div><div class='del'>-   and you want to apply the 4.0.3 patch, you must not first apply the 4.0.1</div><div class='del'>-   and 4.0.2 patches. Similarly, if you are running kernel version 4.0.2 and</div><div class='del'>-   want to jump to 4.0.3, you must first reverse the 4.0.2 patch (that is,</div><div class='del'>-   patch -R) _before_ applying the 4.0.3 patch. You can read more on this in</div><div class='del'>-   Documentation/applying-patches.txt</div><div class='del'>-</div><div class='del'>-   Alternatively, the script patch-kernel can be used to automate this</div><div class='del'>-   process.  It determines the current kernel version and applies any</div><div class='del'>-   patches found.</div><div class='del'>-</div><div class='del'>-     linux/scripts/patch-kernel linux</div><div class='del'>-</div><div class='del'>-   The first argument in the command above is the location of the</div><div class='del'>-   kernel source.  Patches are applied from the current directory, but</div><div class='del'>-   an alternative directory can be specified as the second argument.</div><div class='del'>-</div><div class='del'>- - Make sure you have no stale .o files and dependencies lying around:</div><div class='del'>-</div><div class='del'>-     cd linux</div><div class='del'>-     make mrproper</div><div class='del'>-</div><div class='del'>-   You should now have the sources correctly installed.</div><div class='del'>-</div><div class='del'>-SOFTWARE REQUIREMENTS</div><div class='del'>-</div><div class='del'>-   Compiling and running the 4.x kernels requires up-to-date</div><div class='del'>-   versions of various software packages.  Consult</div><div class='del'>-   Documentation/Changes for the minimum version numbers required</div><div class='del'>-   and how to get updates for these packages.  Beware that using</div><div class='del'>-   excessively old versions of these packages can cause indirect</div><div class='del'>-   errors that are very difficult to track down, so don't assume that</div><div class='del'>-   you can just update packages when obvious problems arise during</div><div class='del'>-   build or operation.</div><div class='del'>-</div><div class='del'>-BUILD directory for the kernel:</div><div class='del'>-</div><div class='del'>-   When compiling the kernel, all output files will per default be</div><div class='del'>-   stored together with the kernel source code.</div><div class='del'>-   Using the option "make O=output/dir" allows you to specify an alternate</div><div class='del'>-   place for the output files (including .config).</div><div class='del'>-   Example:</div><div class='del'>-</div><div class='del'>-     kernel source code: /usr/src/linux-4.X</div><div class='del'>-     build directory:    /home/name/build/kernel</div><div class='del'>-</div><div class='del'>-   To configure and build the kernel, use:</div><div class='del'>-</div><div class='del'>-     cd /usr/src/linux-4.X</div><div class='del'>-     make O=/home/name/build/kernel menuconfig</div><div class='del'>-     make O=/home/name/build/kernel</div><div class='del'>-     sudo make O=/home/name/build/kernel modules_install install</div><div class='del'>-</div><div class='del'>-   Please note: If the 'O=output/dir' option is used, then it must be</div><div class='del'>-   used for all invocations of make.</div><div class='del'>-</div><div class='del'>-CONFIGURING the kernel:</div><div class='del'>-</div><div class='del'>-   Do not skip this step even if you are only upgrading one minor</div><div class='del'>-   version.  New configuration options are added in each release, and</div><div class='del'>-   odd problems will turn up if the configuration files are not set up</div><div class='del'>-   as expected.  If you want to carry your existing configuration to a</div><div class='del'>-   new version with minimal work, use "make oldconfig", which will</div><div class='del'>-   only ask you for the answers to new questions.</div><div class='del'>-</div><div class='del'>- - Alternative configuration commands are:</div><div class='del'>-</div><div class='del'>-     "make config"      Plain text interface.</div><div class='del'>-</div><div class='del'>-     "make menuconfig"  Text based color menus, radiolists &amp; dialogs.</div><div class='del'>-</div><div class='del'>-     "make nconfig"     Enhanced text based color menus.</div><div class='del'>-</div><div class='del'>-     "make xconfig"     Qt based configuration tool.</div><div class='del'>-</div><div class='del'>-     "make gconfig"     GTK+ based configuration tool.</div><div class='del'>-</div><div class='del'>-     "make oldconfig"   Default all questions based on the contents of</div><div class='del'>-                        your existing ./.config file and asking about</div><div class='del'>-                        new config symbols.</div><div class='del'>-</div><div class='del'>-     "make silentoldconfig"</div><div class='del'>-                        Like above, but avoids cluttering the screen</div><div class='del'>-                        with questions already answered.</div><div class='del'>-                        Additionally updates the dependencies.</div><div class='del'>-</div><div class='del'>-     "make olddefconfig"</div><div class='del'>-                        Like above, but sets new symbols to their default</div><div class='del'>-                        values without prompting.</div><div class='del'>-</div><div class='del'>-     "make defconfig"   Create a ./.config file by using the default</div><div class='del'>-                        symbol values from either arch/$ARCH/defconfig</div><div class='del'>-                        or arch/$ARCH/configs/${PLATFORM}_defconfig,</div><div class='del'>-                        depending on the architecture.</div><div class='del'>-</div><div class='del'>-     "make ${PLATFORM}_defconfig"</div><div class='del'>-                        Create a ./.config file by using the default</div><div class='del'>-                        symbol values from</div><div class='del'>-                        arch/$ARCH/configs/${PLATFORM}_defconfig.</div><div class='del'>-                        Use "make help" to get a list of all available</div><div class='del'>-                        platforms of your architecture.</div><div class='del'>-</div><div class='del'>-     "make allyesconfig"</div><div class='del'>-                        Create a ./.config file by setting symbol</div><div class='del'>-                        values to 'y' as much as possible.</div><div class='del'>-</div><div class='del'>-     "make allmodconfig"</div><div class='del'>-                        Create a ./.config file by setting symbol</div><div class='del'>-                        values to 'm' as much as possible.</div><div class='del'>-</div><div class='del'>-     "make allnoconfig" Create a ./.config file by setting symbol</div><div class='del'>-                        values to 'n' as much as possible.</div><div class='del'>-</div><div class='del'>-     "make randconfig"  Create a ./.config file by setting symbol</div><div class='del'>-                        values to random values.</div><div class='del'>-</div><div class='del'>-     "make localmodconfig" Create a config based on current config and</div><div class='del'>-                           loaded modules (lsmod). Disables any module</div><div class='del'>-                           option that is not needed for the loaded modules.</div><div class='del'>-</div><div class='del'>-                           To create a localmodconfig for another machine,</div><div class='del'>-                           store the lsmod of that machine into a file</div><div class='del'>-                           and pass it in as a LSMOD parameter.</div><div class='del'>-</div><div class='del'>-                   target$ lsmod &gt; /tmp/mylsmod</div><div class='del'>-                   target$ scp /tmp/mylsmod host:/tmp</div><div class='del'>-</div><div class='del'>-                   host$ make LSMOD=/tmp/mylsmod localmodconfig</div><div class='del'>-</div><div class='del'>-                           The above also works when cross compiling.</div><div class='del'>-</div><div class='del'>-     "make localyesconfig" Similar to localmodconfig, except it will convert</div><div class='del'>-                           all module options to built in (=y) options.</div><div class='del'>-</div><div class='del'>-   You can find more information on using the Linux kernel config tools</div><div class='del'>-   in Documentation/kbuild/kconfig.txt.</div><div class='del'>-</div><div class='del'>- - NOTES on "make config":</div><div class='del'>-</div><div class='del'>-    - Having unnecessary drivers will make the kernel bigger, and can</div><div class='del'>-      under some circumstances lead to problems: probing for a</div><div class='del'>-      nonexistent controller card may confuse your other controllers</div><div class='del'>-</div><div class='del'>-    - A kernel with math-emulation compiled in will still use the</div><div class='del'>-      coprocessor if one is present: the math emulation will just</div><div class='del'>-      never get used in that case.  The kernel will be slightly larger,</div><div class='del'>-      but will work on different machines regardless of whether they</div><div class='del'>-      have a math coprocessor or not.</div><div class='del'>-</div><div class='del'>-    - The "kernel hacking" configuration details usually result in a</div><div class='del'>-      bigger or slower kernel (or both), and can even make the kernel</div><div class='del'>-      less stable by configuring some routines to actively try to</div><div class='del'>-      break bad code to find kernel problems (kmalloc()).  Thus you</div><div class='del'>-      should probably answer 'n' to the questions for "development",</div><div class='del'>-      "experimental", or "debugging" features.</div><div class='del'>-</div><div class='del'>-COMPILING the kernel:</div><div class='del'>-</div><div class='del'>- - Make sure you have at least gcc 3.2 available.</div><div class='del'>-   For more information, refer to Documentation/Changes.</div><div class='del'>-</div><div class='del'>-   Please note that you can still run a.out user programs with this kernel.</div><div class='del'>-</div><div class='del'>- - Do a "make" to create a compressed kernel image. It is also</div><div class='del'>-   possible to do "make install" if you have lilo installed to suit the</div><div class='del'>-   kernel makefiles, but you may want to check your particular lilo setup first.</div><div class='del'>-</div><div class='del'>-   To do the actual install, you have to be root, but none of the normal</div><div class='del'>-   build should require that. Don't take the name of root in vain.</div><div class='del'>-</div><div class='del'>- - If you configured any of the parts of the kernel as `modules', you</div><div class='del'>-   will also have to do "make modules_install".</div><div class='del'>-</div><div class='del'>- - Verbose kernel compile/build output:</div><div class='del'>-</div><div class='del'>-   Normally, the kernel build system runs in a fairly quiet mode (but not</div><div class='del'>-   totally silent).  However, sometimes you or other kernel developers need</div><div class='del'>-   to see compile, link, or other commands exactly as they are executed.</div><div class='del'>-   For this, use "verbose" build mode.  This is done by passing</div><div class='del'>-   "V=1" to the "make" command, e.g.</div><div class='del'>-</div><div class='del'>-     make V=1 all</div><div class='del'>-</div><div class='del'>-   To have the build system also tell the reason for the rebuild of each</div><div class='del'>-   target, use "V=2".  The default is "V=0".</div><div class='del'>-</div><div class='del'>- - Keep a backup kernel handy in case something goes wrong.  This is</div><div class='del'>-   especially true for the development releases, since each new release</div><div class='del'>-   contains new code which has not been debugged.  Make sure you keep a</div><div class='del'>-   backup of the modules corresponding to that kernel, as well.  If you</div><div class='del'>-   are installing a new kernel with the same version number as your</div><div class='del'>-   working kernel, make a backup of your modules directory before you</div><div class='del'>-   do a "make modules_install".</div><div class='del'>-</div><div class='del'>-   Alternatively, before compiling, use the kernel config option</div><div class='del'>-   "LOCALVERSION" to append a unique suffix to the regular kernel version.</div><div class='del'>-   LOCALVERSION can be set in the "General Setup" menu.</div><div class='del'>-</div><div class='del'>- - In order to boot your new kernel, you'll need to copy the kernel</div><div class='del'>-   image (e.g. .../linux/arch/x86/boot/bzImage after compilation)</div><div class='del'>-   to the place where your regular bootable kernel is found.</div><div class='del'>-</div><div class='del'>- - Booting a kernel directly from a floppy without the assistance of a</div><div class='del'>-   bootloader such as LILO, is no longer supported.</div><div class='del'>-</div><div class='del'>-   If you boot Linux from the hard drive, chances are you use LILO, which</div><div class='del'>-   uses the kernel image as specified in the file /etc/lilo.conf.  The</div><div class='del'>-   kernel image file is usually /vmlinuz, /boot/vmlinuz, /bzImage or</div><div class='del'>-   /boot/bzImage.  To use the new kernel, save a copy of the old image</div><div class='del'>-   and copy the new image over the old one.  Then, you MUST RERUN LILO</div><div class='del'>-   to update the loading map! If you don't, you won't be able to boot</div><div class='del'>-   the new kernel image.</div><div class='del'>-</div><div class='del'>-   Reinstalling LILO is usually a matter of running /sbin/lilo.</div><div class='del'>-   You may wish to edit /etc/lilo.conf to specify an entry for your</div><div class='del'>-   old kernel image (say, /vmlinux.old) in case the new one does not</div><div class='del'>-   work.  See the LILO docs for more information.</div><div class='del'>-</div><div class='del'>-   After reinstalling LILO, you should be all set.  Shutdown the system,</div><div class='del'>-   reboot, and enjoy!</div><div class='del'>-</div><div class='del'>-   If you ever need to change the default root device, video mode,</div><div class='del'>-   ramdisk size, etc.  in the kernel image, use the 'rdev' program (or</div><div class='del'>-   alternatively the LILO boot options when appropriate).  No need to</div><div class='del'>-   recompile the kernel to change these parameters.</div><div class='del'>-</div><div class='del'>- - Reboot with the new kernel and enjoy.</div><div class='del'>-</div><div class='del'>-IF SOMETHING GOES WRONG:</div><div class='del'>-</div><div class='del'>- - If you have problems that seem to be due to kernel bugs, please check</div><div class='del'>-   the file MAINTAINERS to see if there is a particular person associated</div><div class='del'>-   with the part of the kernel that you are having trouble with. If there</div><div class='del'>-   isn't anyone listed there, then the second best thing is to mail</div><div class='del'>-   them to me (torvalds@linux-foundation.org), and possibly to any other</div><div class='del'>-   relevant mailing-list or to the newsgroup.</div><div class='del'>-</div><div class='del'>- - In all bug-reports, *please* tell what kernel you are talking about,</div><div class='del'>-   how to duplicate the problem, and what your setup is (use your common</div><div class='del'>-   sense).  If the problem is new, tell me so, and if the problem is</div><div class='del'>-   old, please try to tell me when you first noticed it.</div><div class='del'>-</div><div class='del'>- - If the bug results in a message like</div><div class='del'>-</div><div class='del'>-     unable to handle kernel paging request at address C0000010</div><div class='del'>-     Oops: 0002</div><div class='del'>-     EIP:   0010:XXXXXXXX</div><div class='del'>-     eax: xxxxxxxx   ebx: xxxxxxxx   ecx: xxxxxxxx   edx: xxxxxxxx</div><div class='del'>-     esi: xxxxxxxx   edi: xxxxxxxx   ebp: xxxxxxxx</div><div class='del'>-     ds: xxxx  es: xxxx  fs: xxxx  gs: xxxx</div><div class='del'>-     Pid: xx, process nr: xx</div><div class='del'>-     xx xx xx xx xx xx xx xx xx xx</div><div class='del'>-</div><div class='del'>-   or similar kernel debugging information on your screen or in your</div><div class='del'>-   system log, please duplicate it *exactly*.  The dump may look</div><div class='del'>-   incomprehensible to you, but it does contain information that may</div><div class='del'>-   help debugging the problem.  The text above the dump is also</div><div class='del'>-   important: it tells something about why the kernel dumped code (in</div><div class='del'>-   the above example, it's due to a bad kernel pointer). More information</div><div class='del'>-   on making sense of the dump is in Documentation/oops-tracing.txt</div><div class='del'>-</div><div class='del'>- - If you compiled the kernel with CONFIG_KALLSYMS you can send the dump</div><div class='del'>-   as is, otherwise you will have to use the "ksymoops" program to make</div><div class='del'>-   sense of the dump (but compiling with CONFIG_KALLSYMS is usually preferred).</div><div class='del'>-   This utility can be downloaded from</div><div class='del'>-   ftp://ftp.&lt;country&gt;.kernel.org/pub/linux/utils/kernel/ksymoops/ .</div><div class='del'>-   Alternatively, you can do the dump lookup by hand:</div><div class='del'>-</div><div class='del'>- - In debugging dumps like the above, it helps enormously if you can</div><div class='del'>-   look up what the EIP value means.  The hex value as such doesn't help</div><div class='del'>-   me or anybody else very much: it will depend on your particular</div><div class='del'>-   kernel setup.  What you should do is take the hex value from the EIP</div><div class='del'>-   line (ignore the "0010:"), and look it up in the kernel namelist to</div><div class='del'>-   see which kernel function contains the offending address.</div><div class='del'>-</div><div class='del'>-   To find out the kernel function name, you'll need to find the system</div><div class='del'>-   binary associated with the kernel that exhibited the symptom.  This is</div><div class='del'>-   the file 'linux/vmlinux'.  To extract the namelist and match it against</div><div class='del'>-   the EIP from the kernel crash, do:</div><div class='del'>-</div><div class='del'>-     nm vmlinux | sort | less</div><div class='del'>-</div><div class='del'>-   This will give you a list of kernel addresses sorted in ascending</div><div class='del'>-   order, from which it is simple to find the function that contains the</div><div class='del'>-   offending address.  Note that the address given by the kernel</div><div class='del'>-   debugging messages will not necessarily match exactly with the</div><div class='del'>-   function addresses (in fact, that is very unlikely), so you can't</div><div class='del'>-   just 'grep' the list: the list will, however, give you the starting</div><div class='del'>-   point of each kernel function, so by looking for the function that</div><div class='del'>-   has a starting address lower than the one you are searching for but</div><div class='del'>-   is followed by a function with a higher address you will find the one</div><div class='del'>-   you want.  In fact, it may be a good idea to include a bit of</div><div class='del'>-   "context" in your problem report, giving a few lines around the</div><div class='del'>-   interesting one.</div><div class='del'>-</div><div class='del'>-   If you for some reason cannot do the above (you have a pre-compiled</div><div class='del'>-   kernel image or similar), telling me as much about your setup as</div><div class='del'>-   possible will help.  Please read the REPORTING-BUGS document for details.</div><div class='del'>-</div><div class='del'>- - Alternatively, you can use gdb on a running kernel. (read-only; i.e. you</div><div class='del'>-   cannot change values or set break points.) To do this, first compile the</div><div class='del'>-   kernel with -g; edit arch/x86/Makefile appropriately, then do a "make</div><div class='del'>-   clean". You'll also need to enable CONFIG_PROC_FS (via "make config").</div><div class='del'>-</div><div class='del'>-   After you've rebooted with the new kernel, do "gdb vmlinux /proc/kcore".</div><div class='del'>-   You can now use all the usual gdb commands. The command to look up the</div><div class='del'>-   point where your system crashed is "l *0xXXXXXXXX". (Replace the XXXes</div><div class='del'>-   with the EIP value.)</div><div class='del'>-</div><div class='del'>-   gdb'ing a non-running kernel currently fails because gdb (wrongly)</div><div class='del'>-   disregards the starting offset for which the kernel is compiled.</div><div class='add'>+There are various text files in the Documentation/ subdirectory,</div><div class='add'>+several of them using the Restructured Text markup notation.</div><div class='add'>+See Documentation/00-INDEX for a list of what is contained in each file.</div><div class='ctx'> </div><div class='add'>+Please read the Documentation/process/changes.rst file, as it contains the</div><div class='add'>+requirements for building and running the kernel, and information about</div><div class='add'>+the problems which may result by upgrading your kernel.</div><div class='head'>diff --git a/REPORTING-BUGS b/REPORTING-BUGS<br/>deleted file mode 100644<br/>index 914baf9cf5fa..000000000000<br/>--- a/<a href='/drm-misc/tree/REPORTING-BUGS?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>REPORTING-BUGS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,174 +0,0 @@</div><div class='del'>-Background</div><div class='del'>-==========</div><div class='del'>-</div><div class='del'>-The upstream Linux kernel maintainers only fix bugs for specific kernel</div><div class='del'>-versions.  Those versions include the current "release candidate" (or -rc)</div><div class='del'>-kernel, any "stable" kernel versions, and any "long term" kernels.</div><div class='del'>-</div><div class='del'>-Please see https://www.kernel.org/ for a list of supported kernels.  Any</div><div class='del'>-kernel marked with [EOL] is "end of life" and will not have any fixes</div><div class='del'>-backported to it.</div><div class='del'>-</div><div class='del'>-If you've found a bug on a kernel version that isn't listed on kernel.org,</div><div class='del'>-contact your Linux distribution or embedded vendor for support.</div><div class='del'>-Alternatively, you can attempt to run one of the supported stable or -rc</div><div class='del'>-kernels, and see if you can reproduce the bug on that.  It's preferable</div><div class='del'>-to reproduce the bug on the latest -rc kernel.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-How to report Linux kernel bugs</div><div class='del'>-===============================</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Identify the problematic subsystem</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-Identifying which part of the Linux kernel might be causing your issue</div><div class='del'>-increases your chances of getting your bug fixed. Simply posting to the</div><div class='del'>-generic linux-kernel mailing list (LKML) may cause your bug report to be</div><div class='del'>-lost in the noise of a mailing list that gets 1000+ emails a day.</div><div class='del'>-</div><div class='del'>-Instead, try to figure out which kernel subsystem is causing the issue,</div><div class='del'>-and email that subsystem's maintainer and mailing list.  If the subsystem</div><div class='del'>-maintainer doesn't answer, then expand your scope to mailing lists like</div><div class='del'>-LKML.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Identify who to notify</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-Once you know the subsystem that is causing the issue, you should send a</div><div class='del'>-bug report.  Some maintainers prefer bugs to be reported via bugzilla</div><div class='del'>-(https://bugzilla.kernel.org), while others prefer that bugs be reported</div><div class='del'>-via the subsystem mailing list.</div><div class='del'>-</div><div class='del'>-To find out where to send an emailed bug report, find your subsystem or</div><div class='del'>-device driver in the MAINTAINERS file.  Search in the file for relevant</div><div class='del'>-entries, and send your bug report to the person(s) listed in the "M:"</div><div class='del'>-lines, making sure to Cc the mailing list(s) in the "L:" lines.  When the</div><div class='del'>-maintainer replies to you, make sure to 'Reply-all' in order to keep the</div><div class='del'>-public mailing list(s) in the email thread.</div><div class='del'>-</div><div class='del'>-If you know which driver is causing issues, you can pass one of the driver</div><div class='del'>-files to the get_maintainer.pl script:</div><div class='del'>-     perl scripts/get_maintainer.pl -f &lt;filename&gt;</div><div class='del'>-</div><div class='del'>-If it is a security bug, please copy the Security Contact listed in the</div><div class='del'>-MAINTAINERS file.  They can help coordinate bugfix and disclosure.  See</div><div class='del'>-Documentation/SecurityBugs for more information.</div><div class='del'>-</div><div class='del'>-If you can't figure out which subsystem caused the issue, you should file</div><div class='del'>-a bug in kernel.org bugzilla and send email to</div><div class='del'>-linux-kernel@vger.kernel.org, referencing the bugzilla URL.  (For more</div><div class='del'>-information on the linux-kernel mailing list see</div><div class='del'>-http://www.tux.org/lkml/).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Tips for reporting bugs</div><div class='del'>------------------------</div><div class='del'>-</div><div class='del'>-If you haven't reported a bug before, please read:</div><div class='del'>-</div><div class='del'>-http://www.chiark.greenend.org.uk/~sgtatham/bugs.html</div><div class='del'>-http://www.catb.org/esr/faqs/smart-questions.html</div><div class='del'>-</div><div class='del'>-It's REALLY important to report bugs that seem unrelated as separate email</div><div class='del'>-threads or separate bugzilla entries.  If you report several unrelated</div><div class='del'>-bugs at once, it's difficult for maintainers to tease apart the relevant</div><div class='del'>-data.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Gather information</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-The most important information in a bug report is how to reproduce the</div><div class='del'>-bug.  This includes system information, and (most importantly)</div><div class='del'>-step-by-step instructions for how a user can trigger the bug.</div><div class='del'>-</div><div class='del'>-If the failure includes an "OOPS:", take a picture of the screen, capture</div><div class='del'>-a netconsole trace, or type the message from your screen into the bug</div><div class='del'>-report.  Please read "Documentation/oops-tracing.txt" before posting your</div><div class='del'>-bug report. This explains what you should do with the "Oops" information</div><div class='del'>-to make it useful to the recipient.</div><div class='del'>-</div><div class='del'>-This is a suggested format for a bug report sent via email or bugzilla.</div><div class='del'>-Having a standardized bug report form makes it easier for you not to</div><div class='del'>-overlook things, and easier for the developers to find the pieces of</div><div class='del'>-information they're really interested in.  If some information is not</div><div class='del'>-relevant to your bug, feel free to exclude it.</div><div class='del'>-</div><div class='del'>-First run the ver_linux script included as scripts/ver_linux, which</div><div class='del'>-reports the version of some important subsystems.  Run this script with</div><div class='del'>-the command "sh scripts/ver_linux".</div><div class='del'>-</div><div class='del'>-Use that information to fill in all fields of the bug report form, and</div><div class='del'>-post it to the mailing list with a subject of "PROBLEM: &lt;one line</div><div class='del'>-summary from [1.]&gt;" for easy identification by the developers.</div><div class='del'>-</div><div class='del'>-[1.] One line summary of the problem:</div><div class='del'>-[2.] Full description of the problem/report:</div><div class='del'>-[3.] Keywords (i.e., modules, networking, kernel):</div><div class='del'>-[4.] Kernel information</div><div class='del'>-[4.1.] Kernel version (from /proc/version):</div><div class='del'>-[4.2.] Kernel .config file:</div><div class='del'>-[5.] Most recent kernel version which did not have the bug:</div><div class='del'>-[6.] Output of Oops.. message (if applicable) with symbolic information</div><div class='del'>-     resolved (see Documentation/oops-tracing.txt)</div><div class='del'>-[7.] A small shell script or example program which triggers the</div><div class='del'>-     problem (if possible)</div><div class='del'>-[8.] Environment</div><div class='del'>-[8.1.] Software (add the output of the ver_linux script here)</div><div class='del'>-[8.2.] Processor information (from /proc/cpuinfo):</div><div class='del'>-[8.3.] Module information (from /proc/modules):</div><div class='del'>-[8.4.] Loaded driver and hardware information (/proc/ioports, /proc/iomem)</div><div class='del'>-[8.5.] PCI information ('lspci -vvv' as root)</div><div class='del'>-[8.6.] SCSI information (from /proc/scsi/scsi)</div><div class='del'>-[8.7.] Other information that might be relevant to the problem</div><div class='del'>-       (please look in /proc and include all information that you</div><div class='del'>-       think to be relevant):</div><div class='del'>-[X.] Other notes, patches, fixes, workarounds:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Follow up</div><div class='del'>-=========</div><div class='del'>-</div><div class='del'>-Expectations for bug reporters</div><div class='del'>-------------------------------</div><div class='del'>-</div><div class='del'>-Linux kernel maintainers expect bug reporters to be able to follow up on</div><div class='del'>-bug reports.  That may include running new tests, applying patches,</div><div class='del'>-recompiling your kernel, and/or re-triggering your bug.  The most</div><div class='del'>-frustrating thing for maintainers is for someone to report a bug, and then</div><div class='del'>-never follow up on a request to try out a fix.</div><div class='del'>-</div><div class='del'>-That said, it's still useful for a kernel maintainer to know a bug exists</div><div class='del'>-on a supported kernel, even if you can't follow up with retests.  Follow</div><div class='del'>-up reports, such as replying to the email thread with "I tried the latest</div><div class='del'>-kernel and I can't reproduce my bug anymore" are also helpful, because</div><div class='del'>-maintainers have to assume silence means things are still broken.</div><div class='del'>-</div><div class='del'>-Expectations for kernel maintainers</div><div class='del'>------------------------------------</div><div class='del'>-</div><div class='del'>-Linux kernel maintainers are busy, overworked human beings.  Some times</div><div class='del'>-they may not be able to address your bug in a day, a week, or two weeks.</div><div class='del'>-If they don't answer your email, they may be on vacation, or at a Linux</div><div class='del'>-conference.  Check the conference schedule at LWN.net for more info:</div><div class='del'>-	https://lwn.net/Calendar/</div><div class='del'>-</div><div class='del'>-In general, kernel maintainers take 1 to 5 business days to respond to</div><div class='del'>-bugs.  The majority of kernel maintainers are employed to work on the</div><div class='del'>-kernel, and they may not work on the weekends.  Maintainers are scattered</div><div class='del'>-around the world, and they may not work in your time zone.  Unless you</div><div class='del'>-have a high priority bug, please wait at least a week after the first bug</div><div class='del'>-report before sending the maintainer a reminder email.</div><div class='del'>-</div><div class='del'>-The exceptions to this rule are regressions, kernel crashes, security holes,</div><div class='del'>-or userspace breakage caused by new kernel behavior.  Those bugs should be</div><div class='del'>-addressed by the maintainers ASAP.  If you suspect a maintainer is not</div><div class='del'>-responding to these types of bugs in a timely manner (especially during a</div><div class='del'>-merge window), escalate the bug to LKML and Linus Torvalds.</div><div class='del'>-</div><div class='del'>-Thank you!</div><div class='del'>-</div><div class='del'>-[Some of this is taken from Frohwalt Egerer's original linux-kernel FAQ]</div><div class='head'>diff --git a/arch/Kconfig b/arch/Kconfig<br/>index 659bdd079277..cd211a14a88f 100644<br/>--- a/<a href='/drm-misc/tree/arch/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/Kconfig</a></div><div class='hunk'>@@ -5,6 +5,9 @@</div><div class='ctx'> config KEXEC_CORE</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config HAVE_IMA_KEXEC</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config OPROFILE</div><div class='ctx'> 	tristate "OProfile system profiling"</div><div class='ctx'> 	depends on PROFILING</div><div class='hunk'>@@ -26,7 +29,7 @@ config OPROFILE_EVENT_MULTIPLEX</div><div class='ctx'> 	  The number of hardware counters is limited. The multiplexing</div><div class='ctx'> 	  feature enables OProfile to gather more events than counters</div><div class='ctx'> 	  are provided by the hardware. This is realized by switching</div><div class='del'>-	  between events at an user specified time interval.</div><div class='add'>+	  between events at a user specified time interval.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='hunk'>@@ -96,6 +99,7 @@ config KPROBES_ON_FTRACE</div><div class='ctx'> </div><div class='ctx'> config UPROBES</div><div class='ctx'> 	def_bool n</div><div class='add'>+	depends on ARCH_SUPPORTS_UPROBES</div><div class='ctx'> 	help</div><div class='ctx'> 	  Uprobes is the user-space counterpart to kprobes: they</div><div class='ctx'> 	  enable instrumentation applications (such as 'perf probe')</div><div class='hunk'>@@ -218,6 +222,10 @@ config GENERIC_SMP_IDLE_THREAD</div><div class='ctx'> config GENERIC_IDLE_POLL_SETUP</div><div class='ctx'>        bool</div><div class='ctx'> </div><div class='add'>+# Select if arch has all set_memory_ro/rw/x/nx() functions in asm/cacheflush.h</div><div class='add'>+config ARCH_HAS_SET_MEMORY</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> # Select if arch init_task initializer is different to init/init_task.c</div><div class='ctx'> config ARCH_INIT_TASK</div><div class='ctx'>        bool</div><div class='hunk'>@@ -363,8 +371,9 @@ menuconfig GCC_PLUGINS</div><div class='ctx'> 	  See Documentation/gcc-plugins.txt for details.</div><div class='ctx'> </div><div class='ctx'> config GCC_PLUGIN_CYC_COMPLEXITY</div><div class='del'>-	bool "Compute the cyclomatic complexity of a function"</div><div class='add'>+	bool "Compute the cyclomatic complexity of a function" if EXPERT</div><div class='ctx'> 	depends on GCC_PLUGINS</div><div class='add'>+	depends on !COMPILE_TEST</div><div class='ctx'> 	help</div><div class='ctx'> 	  The complexity M of a function's control flow graph is defined as:</div><div class='ctx'> 	   M = E - N + 2P</div><div class='hunk'>@@ -374,6 +383,10 @@ config GCC_PLUGIN_CYC_COMPLEXITY</div><div class='ctx'> 	  N = the number of nodes</div><div class='ctx'> 	  P = the number of connected components (exit nodes).</div><div class='ctx'> </div><div class='add'>+	  Enabling this plugin reports the complexity to stderr during the</div><div class='add'>+	  build. It mainly serves as a simple example of how to create a</div><div class='add'>+	  gcc plugin for the kernel.</div><div class='add'>+</div><div class='ctx'> config GCC_PLUGIN_SANCOV</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on GCC_PLUGINS</div><div class='hunk'>@@ -401,6 +414,28 @@ config GCC_PLUGIN_LATENT_ENTROPY</div><div class='ctx'> 	   * https://grsecurity.net/</div><div class='ctx'> 	   * https://pax.grsecurity.net/</div><div class='ctx'> </div><div class='add'>+config GCC_PLUGIN_STRUCTLEAK</div><div class='add'>+	bool "Force initialization of variables containing userspace addresses"</div><div class='add'>+	depends on GCC_PLUGINS</div><div class='add'>+	help</div><div class='add'>+	  This plugin zero-initializes any structures that containing a</div><div class='add'>+	  __user attribute. This can prevent some classes of information</div><div class='add'>+	  exposures.</div><div class='add'>+</div><div class='add'>+	  This plugin was ported from grsecurity/PaX. More information at:</div><div class='add'>+	   * https://grsecurity.net/</div><div class='add'>+	   * https://pax.grsecurity.net/</div><div class='add'>+</div><div class='add'>+config GCC_PLUGIN_STRUCTLEAK_VERBOSE</div><div class='add'>+	bool "Report forcefully initialized variables"</div><div class='add'>+	depends on GCC_PLUGIN_STRUCTLEAK</div><div class='add'>+	depends on !COMPILE_TEST</div><div class='add'>+	help</div><div class='add'>+	  This option will cause a warning to be printed each time the</div><div class='add'>+	  structleak plugin finds a variable it thinks needs to be</div><div class='add'>+	  initialized. Since not all existing initializers are detected</div><div class='add'>+	  by the plugin, this can produce false positive warnings.</div><div class='add'>+</div><div class='ctx'> config HAVE_CC_STACKPROTECTOR</div><div class='ctx'> 	bool</div><div class='ctx'> 	help</div><div class='hunk'>@@ -512,6 +547,9 @@ config HAVE_CONTEXT_TRACKING</div><div class='ctx'> config HAVE_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config ARCH_HAS_SCALED_CPUTIME</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config HAVE_VIRT_CPU_ACCOUNTING_GEN</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y if 64BIT</div><div class='hunk'>@@ -533,6 +571,9 @@ config HAVE_IRQ_TIME_ACCOUNTING</div><div class='ctx'> config HAVE_ARCH_TRANSPARENT_HUGEPAGE</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config HAVE_ARCH_HUGE_VMAP</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -769,4 +810,41 @@ config VMAP_STACK</div><div class='ctx'> 	  the stack to map directly to the KASAN shadow map using a formula</div><div class='ctx'> 	  that is incorrect if the stack is in vmalloc space.</div><div class='ctx'> </div><div class='add'>+config ARCH_OPTIONAL_KERNEL_RWX</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='add'>+config ARCH_OPTIONAL_KERNEL_RWX_DEFAULT</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='add'>+config ARCH_HAS_STRICT_KERNEL_RWX</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='add'>+config STRICT_KERNEL_RWX</div><div class='add'>+	bool "Make kernel text and rodata read-only" if ARCH_OPTIONAL_KERNEL_RWX</div><div class='add'>+	depends on ARCH_HAS_STRICT_KERNEL_RWX</div><div class='add'>+	default !ARCH_OPTIONAL_KERNEL_RWX || ARCH_OPTIONAL_KERNEL_RWX_DEFAULT</div><div class='add'>+	help</div><div class='add'>+	  If this is set, kernel text and rodata memory will be made read-only,</div><div class='add'>+	  and non-text memory will be made non-executable. This provides</div><div class='add'>+	  protection against certain security exploits (e.g. executing the heap</div><div class='add'>+	  or modifying text)</div><div class='add'>+</div><div class='add'>+	  These features are considered standard security practice these days.</div><div class='add'>+	  You should say Y here in almost all cases.</div><div class='add'>+</div><div class='add'>+config ARCH_HAS_STRICT_MODULE_RWX</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='add'>+config STRICT_MODULE_RWX</div><div class='add'>+	bool "Set loadable kernel module data as NX and text as RO" if ARCH_OPTIONAL_KERNEL_RWX</div><div class='add'>+	depends on ARCH_HAS_STRICT_MODULE_RWX &amp;&amp; MODULES</div><div class='add'>+	default !ARCH_OPTIONAL_KERNEL_RWX || ARCH_OPTIONAL_KERNEL_RWX_DEFAULT</div><div class='add'>+	help</div><div class='add'>+	  If this is set, module text and rodata memory will be made read-only,</div><div class='add'>+	  and non-text memory will be made non-executable. This provides</div><div class='add'>+	  protection against certain security exploits (e.g. writing to text)</div><div class='add'>+</div><div class='add'>+config ARCH_WANT_RELAX_ORDER</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> source "kernel/gcov/Kconfig"</div><div class='head'>diff --git a/arch/alpha/boot/misc.c b/arch/alpha/boot/misc.c<br/>index 3ff9a957a25c..1b568ed74f95 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/boot/misc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/boot/misc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/boot/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/boot/misc.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define memzero(s,n)	memset ((s),0,(n))</div><div class='ctx'> #define puts		srm_printk</div><div class='head'>diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild<br/>index bf8475ce85ee..d103db5af5ff 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += exec.h</div><div class='ctx'> generic-y += export.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='hunk'>@@ -10,3 +9,5 @@ generic-y += mm-arch-hooks.h</div><div class='ctx'> generic-y += preempt.h</div><div class='ctx'> generic-y += sections.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='add'>+generic-y += current.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/alpha/include/asm/a.out-core.h b/arch/alpha/include/asm/a.out-core.h<br/>index 9e33e92e524c..1610d078b064 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/include/asm/a.out-core.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/include/asm/a.out-core.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/include/asm/a.out-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/a.out-core.h</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Fill in the user structure for an ECOFF core dump.</div><div class='head'>diff --git a/arch/alpha/include/asm/current.h b/arch/alpha/include/asm/current.h<br/>deleted file mode 100644<br/>index 094d285a1b34..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/alpha/include/asm/current.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/include/asm/current.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-#ifndef _ALPHA_CURRENT_H</div><div class='del'>-#define _ALPHA_CURRENT_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/thread_info.h&gt;</div><div class='del'>-</div><div class='del'>-#define get_current()	(current_thread_info()-&gt;task)</div><div class='del'>-#define current		get_current()</div><div class='del'>-</div><div class='del'>-#endif /* _ALPHA_CURRENT_H */</div><div class='head'>diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h<br/>index c63b6ac19ee5..5d53666935e6 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> #ifndef _ALPHA_DMA_MAPPING_H</div><div class='ctx'> #define _ALPHA_DMA_MAPPING_H</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops *dma_ops;</div><div class='add'>+extern const struct dma_map_ops *dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/alpha/include/asm/mmu_context.h b/arch/alpha/include/asm/mmu_context.h<br/>index 4c51c05333c6..384bd47b5187 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -7,6 +7,8 @@</div><div class='ctx'>  * Copyright (C) 1996, Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/compiler.h&gt;</div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='head'>diff --git a/arch/alpha/include/asm/mutex.h b/arch/alpha/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 458c1f7fbc18..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/alpha/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pull in the generic implementation for the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='head'>diff --git a/arch/alpha/include/asm/processor.h b/arch/alpha/include/asm/processor.h<br/>index 43a7559c448b..2fec2dee3020 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/asm/processor.h</a></div><div class='hunk'>@@ -58,7 +58,6 @@ unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'>   ((tsk) == current ? rdusp() : task_thread_info(tsk)-&gt;pcb.usp)</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()	barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> #define ARCH_HAS_PREFETCH</div><div class='ctx'> #define ARCH_HAS_PREFETCHW</div><div class='head'>diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h<br/>index 9e46d6e656d9..afc901b7a6f6 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -97,4 +97,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		53</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	54</div><div class='add'>+</div><div class='ctx'> #endif /* _UAPI_ASM_SOCKET_H */</div><div class='head'>diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c<br/>index 2d6efcff3bf3..2f26ae74b61a 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/irq.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> volatile unsigned long irq_err_count;</div><div class='ctx'> DEFINE_PER_CPU(unsigned long, irq_pmi_count);</div><div class='head'>diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c<br/>index ffb93f499c83..0b961093ca5c 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/osf_sys.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/osf_sys.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/osf_sys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/osf_sys.c</a></div><div class='hunk'>@@ -11,7 +11,10 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+#include &lt;linux/sched/cputime.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -39,7 +42,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/sysinfo.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/hwrpb.h&gt;</div><div class='hunk'>@@ -1029,11 +1032,16 @@ SYSCALL_DEFINE2(osf_settimeofday, struct timeval32 __user *, tv,</div><div class='ctx'> 	return do_sys_settimeofday(tv ? &amp;kts : NULL, tz ? &amp;ktz : NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+asmlinkage long sys_ni_posix_timers(void);</div><div class='add'>+</div><div class='ctx'> SYSCALL_DEFINE2(osf_getitimer, int, which, struct itimerval32 __user *, it)</div><div class='ctx'> {</div><div class='ctx'> 	struct itimerval kit;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	if (!IS_ENABLED(CONFIG_POSIX_TIMERS))</div><div class='add'>+		return sys_ni_posix_timers();</div><div class='add'>+</div><div class='ctx'> 	error = do_getitimer(which, &amp;kit);</div><div class='ctx'> 	if (!error &amp;&amp; put_it32(it, &amp;kit))</div><div class='ctx'> 		error = -EFAULT;</div><div class='hunk'>@@ -1047,6 +1055,9 @@ SYSCALL_DEFINE3(osf_setitimer, int, which, struct itimerval32 __user *, in,</div><div class='ctx'> 	struct itimerval kin, kout;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	if (!IS_ENABLED(CONFIG_POSIX_TIMERS))</div><div class='add'>+		return sys_ni_posix_timers();</div><div class='add'>+</div><div class='ctx'> 	if (in) {</div><div class='ctx'> 		if (get_it32(&amp;kin, in))</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -1137,7 +1148,7 @@ struct rusage32 {</div><div class='ctx'> SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru)</div><div class='ctx'> {</div><div class='ctx'> 	struct rusage32 r;</div><div class='del'>-	cputime_t utime, stime;</div><div class='add'>+	u64 utime, stime;</div><div class='ctx'> 	unsigned long utime_jiffies, stime_jiffies;</div><div class='ctx'> </div><div class='ctx'> 	if (who != RUSAGE_SELF &amp;&amp; who != RUSAGE_CHILDREN)</div><div class='hunk'>@@ -1147,16 +1158,16 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru)</div><div class='ctx'> 	switch (who) {</div><div class='ctx'> 	case RUSAGE_SELF:</div><div class='ctx'> 		task_cputime(current, &amp;utime, &amp;stime);</div><div class='del'>-		utime_jiffies = cputime_to_jiffies(utime);</div><div class='del'>-		stime_jiffies = cputime_to_jiffies(stime);</div><div class='add'>+		utime_jiffies = nsecs_to_jiffies(utime);</div><div class='add'>+		stime_jiffies = nsecs_to_jiffies(stime);</div><div class='ctx'> 		jiffies_to_timeval32(utime_jiffies, &amp;r.ru_utime);</div><div class='ctx'> 		jiffies_to_timeval32(stime_jiffies, &amp;r.ru_stime);</div><div class='ctx'> 		r.ru_minflt = current-&gt;min_flt;</div><div class='ctx'> 		r.ru_majflt = current-&gt;maj_flt;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RUSAGE_CHILDREN:</div><div class='del'>-		utime_jiffies = cputime_to_jiffies(current-&gt;signal-&gt;cutime);</div><div class='del'>-		stime_jiffies = cputime_to_jiffies(current-&gt;signal-&gt;cstime);</div><div class='add'>+		utime_jiffies = nsecs_to_jiffies(current-&gt;signal-&gt;cutime);</div><div class='add'>+		stime_jiffies = nsecs_to_jiffies(current-&gt;signal-&gt;cstime);</div><div class='ctx'> 		jiffies_to_timeval32(utime_jiffies, &amp;r.ru_utime);</div><div class='ctx'> 		jiffies_to_timeval32(stime_jiffies, &amp;r.ru_stime);</div><div class='ctx'> 		r.ru_minflt = current-&gt;signal-&gt;cmin_flt;</div><div class='head'>diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c<br/>index bb152e21e5ae..ffbdb3fb672f 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/pci-noop.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/pci-noop.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/pci-noop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/pci-noop.c</a></div><div class='hunk'>@@ -128,7 +128,7 @@ static int alpha_noop_supported(struct device *dev, u64 mask)</div><div class='ctx'> 	return mask &lt; 0x00ffffffUL ? 0 : 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops alpha_noop_ops = {</div><div class='add'>+const struct dma_map_ops alpha_noop_ops = {</div><div class='ctx'> 	.alloc			= alpha_noop_alloc_coherent,</div><div class='ctx'> 	.free			= dma_noop_free_coherent,</div><div class='ctx'> 	.map_page		= dma_noop_map_page,</div><div class='hunk'>@@ -137,5 +137,5 @@ struct dma_map_ops alpha_noop_ops = {</div><div class='ctx'> 	.dma_supported		= alpha_noop_supported,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *dma_ops = &amp;alpha_noop_ops;</div><div class='add'>+const struct dma_map_ops *dma_ops = &amp;alpha_noop_ops;</div><div class='ctx'> EXPORT_SYMBOL(dma_ops);</div><div class='head'>diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c<br/>index 451fc9cdd323..7fd2329038a3 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/pci_iommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/pci_iommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/pci_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/pci_iommu.c</a></div><div class='hunk'>@@ -939,7 +939,7 @@ static int alpha_pci_mapping_error(struct device *dev, dma_addr_t dma_addr)</div><div class='ctx'> 	return dma_addr == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops alpha_pci_ops = {</div><div class='add'>+const struct dma_map_ops alpha_pci_ops = {</div><div class='ctx'> 	.alloc			= alpha_pci_alloc_coherent,</div><div class='ctx'> 	.free			= alpha_pci_free_coherent,</div><div class='ctx'> 	.map_page		= alpha_pci_map_page,</div><div class='hunk'>@@ -950,5 +950,5 @@ struct dma_map_ops alpha_pci_ops = {</div><div class='ctx'> 	.dma_supported		= alpha_pci_supported,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *dma_ops = &amp;alpha_pci_ops;</div><div class='add'>+const struct dma_map_ops *dma_ops = &amp;alpha_pci_ops;</div><div class='ctx'> EXPORT_SYMBOL(dma_ops);</div><div class='head'>diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c<br/>index b483156698d5..0b9635040721 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/process.c</a></div><div class='hunk'>@@ -11,6 +11,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -31,7 +34,7 @@</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/hwrpb.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c<br/>index 940dfb406591..285a82d491ef 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/ptrace.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -16,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;linux/audit.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -283,7 +284,7 @@ long arch_ptrace(struct task_struct *child, long request,</div><div class='ctx'> 	/* When I and D space are separate, these will need to be fixed.  */</div><div class='ctx'> 	case PTRACE_PEEKTEXT: /* read word at location addr. */</div><div class='ctx'> 	case PTRACE_PEEKDATA:</div><div class='del'>-		copied = access_process_vm(child, addr, &amp;tmp, sizeof(tmp),</div><div class='add'>+		copied = ptrace_access_vm(child, addr, &amp;tmp, sizeof(tmp),</div><div class='ctx'> 				FOLL_FORCE);</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		if (copied != sizeof(tmp))</div><div class='head'>diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c<br/>index 4811e54069fc..491e6a604e82 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/setup.c</a></div><div class='hunk'>@@ -53,7 +53,7 @@ static struct notifier_block alpha_panic_block = {</div><div class='ctx'>         INT_MAX /* try to do it first */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/hwrpb.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c<br/>index 8dbfb15f1745..8129dd92cadc 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/signal.c</a></div><div class='hunk'>@@ -6,7 +6,8 @@</div><div class='ctx'>  *  1997-11-02  Modified for POSIX.1b signals by Richard Henderson</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -22,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c<br/>index 46bf263c3153..9fc560459ebd 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/smp.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='hunk'>@@ -144,7 +144,7 @@ smp_callin(void)</div><div class='ctx'> 		alpha_mv.smp_callin();</div><div class='ctx'> </div><div class='ctx'> 	/* All kernel threads share the same mm context.  */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> </div><div class='ctx'> 	/* inform the notifiers about the new cpu */</div><div class='head'>diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c<br/>index ffe996a54fad..705ae12acd15 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/srm_env.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/srm_env.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/srm_env.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/srm_env.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;asm/console.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define BASE_DIR	"srm_environment"	/* Subdir in /proc/		*/</div><div class='head'>diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c<br/>index 72b59511e59a..e9c45b65a905 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/srmcons.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/srmcons.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/srmcons.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/srmcons.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/tty_flip.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/console.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(srmcons_callback_lock);</div><div class='head'>diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c<br/>index 5b6202a825ff..3bfe058d75d9 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/time.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/irq_work.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hwrpb.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -133,7 +133,7 @@ init_rtc_clockevent(void)</div><div class='ctx'>  * The QEMU clock as a clocksource primitive.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static cycle_t</div><div class='add'>+static u64</div><div class='ctx'> qemu_cs_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return qemu_get_vmtime();</div><div class='hunk'>@@ -260,7 +260,7 @@ common_init_rtc(void)</div><div class='ctx'>  * use this method when WTINT is in use.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static cycle_t read_rpcc(struct clocksource *cs)</div><div class='add'>+static u64 read_rpcc(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return rpcc();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c<br/>index 74aceead06e9..b137390e87e7 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/kernel/traps.c</a></div><div class='hunk'>@@ -10,15 +10,16 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/gentrap.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;asm/sysinfo.h&gt;</div><div class='ctx'> #include &lt;asm/hwrpb.h&gt;</div><div class='head'>diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c<br/>index b4ff3b683bcd..5dfb7975895f 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/lib/csum_partial_copy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/lib/csum_partial_copy.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/lib/csum_partial_copy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/lib/csum_partial_copy.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define ldq_u(x,y) \</div><div class='head'>diff --git a/arch/alpha/math-emu/math.c b/arch/alpha/math-emu/math.c<br/>index 58c2669a1dd4..d17d705f6545 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/math-emu/math.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/math-emu/math.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/math-emu/math.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/math-emu/math.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sfp-util.h"</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c<br/>index 83e9eee57a55..c25e8827e7cd 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/mm/fault.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  *  Copyright (C) 1995  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void die_if_kernel(char *,struct pt_regs *,long, unsigned long *);</div><div class='head'>diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c<br/>index a1bea91df56a..0542e973c73d 100644<br/>--- a/<a href='/drm-misc/tree/arch/alpha/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/alpha/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/alpha/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/alpha/mm/init.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/hwrpb.h&gt;</div><div class='head'>diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig<br/>index bd204bfa29ed..c9f30f4763ab 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/Kconfig</a></div><div class='hunk'>@@ -8,9 +8,10 @@</div><div class='ctx'> </div><div class='ctx'> config ARC</div><div class='ctx'> 	def_bool y</div><div class='add'>+	select ARC_TIMERS</div><div class='add'>+	select ARCH_HAS_SG_CHAIN</div><div class='ctx'> 	select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC</div><div class='ctx'> 	select BUILDTIME_EXTABLE_SORT</div><div class='del'>-	select CLKSRC_OF</div><div class='ctx'> 	select CLONE_BACKWARDS</div><div class='ctx'> 	select COMMON_CLK</div><div class='ctx'> 	select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 &amp;&amp; ARC_HAS_LLSC)</div><div class='hunk'>@@ -28,7 +29,7 @@ config ARC</div><div class='ctx'> 	select HAVE_KPROBES</div><div class='ctx'> 	select HAVE_KRETPROBES</div><div class='ctx'> 	select HAVE_MEMBLOCK</div><div class='del'>-	select HAVE_MOD_ARCH_SPECIFIC if ARC_DW2_UNWIND</div><div class='add'>+	select HAVE_MOD_ARCH_SPECIFIC</div><div class='ctx'> 	select HAVE_OPROFILE</div><div class='ctx'> 	select HAVE_PERF_EVENTS</div><div class='ctx'> 	select HANDLE_DOMAIN_IRQ</div><div class='hunk'>@@ -115,6 +116,7 @@ config ISA_ARCOMPACT</div><div class='ctx'> </div><div class='ctx'> config ISA_ARCV2</div><div class='ctx'> 	bool "ARC ISA v2"</div><div class='add'>+	select ARC_TIMERS_64BIT</div><div class='ctx'> 	help</div><div class='ctx'> 	  ISA for the Next Generation ARC-HS cores</div><div class='ctx'> </div><div class='hunk'>@@ -178,16 +180,12 @@ config CPU_BIG_ENDIAN</div><div class='ctx'> config SMP</div><div class='ctx'> 	bool "Symmetric Multi-Processing"</div><div class='ctx'> 	default n</div><div class='del'>-	select ARC_HAS_COH_CACHES if ISA_ARCV2</div><div class='ctx'> 	select ARC_MCIP if ISA_ARCV2</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for systems with more than one CPU.</div><div class='ctx'> </div><div class='ctx'> if SMP</div><div class='ctx'> </div><div class='del'>-config ARC_HAS_COH_CACHES</div><div class='del'>-	def_bool n</div><div class='del'>-</div><div class='ctx'> config NR_CPUS</div><div class='ctx'> 	int "Maximum number of CPUs (2-4096)"</div><div class='ctx'> 	range 2 4096</div><div class='hunk'>@@ -217,8 +215,6 @@ config ARC_MCIP</div><div class='ctx'> menuconfig ARC_CACHE</div><div class='ctx'> 	bool "Enable Cache Support"</div><div class='ctx'> 	default y</div><div class='del'>-	# if SMP, cache enabled ONLY if ARC implementation has cache coherency</div><div class='del'>-	depends on !SMP || ARC_HAS_COH_CACHES</div><div class='ctx'> </div><div class='ctx'> if ARC_CACHE</div><div class='ctx'> </div><div class='hunk'>@@ -410,27 +406,6 @@ config ARC_HAS_DIV_REM</div><div class='ctx'> 	bool "Insn: div, divu, rem, remu"</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config ARC_HAS_RTC</div><div class='del'>-	bool "Local 64-bit r/o cycle counter"</div><div class='del'>-	default n</div><div class='del'>-	depends on !SMP</div><div class='del'>-</div><div class='del'>-config ARC_HAS_GFRC</div><div class='del'>-	bool "SMP synchronized 64-bit cycle counter"</div><div class='del'>-	default y</div><div class='del'>-	depends on SMP</div><div class='del'>-</div><div class='del'>-config ARC_NUMBER_OF_INTERRUPTS</div><div class='del'>-	int "Number of interrupts"</div><div class='del'>-	range 8 240</div><div class='del'>-	default 32</div><div class='del'>-	help</div><div class='del'>-	  This defines the number of interrupts on the ARCv2HS core.</div><div class='del'>-	  It affects the size of vector table.</div><div class='del'>-	  The initial 8 IRQs are fixed (Timer, ICI etc) and although configurable</div><div class='del'>-	  in hardware, it keep things simple for Linux to assume they are always</div><div class='del'>-	  present.</div><div class='del'>-</div><div class='ctx'> endif	# ISA_ARCV2</div><div class='ctx'> </div><div class='ctx'> endmenu   # "ARC CPU Configuration"</div><div class='head'>diff --git a/arch/arc/boot/dts/abilis_tb10x.dtsi b/arch/arc/boot/dts/abilis_tb10x.dtsi<br/>index de53f5c3251c..3121536b25a3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/boot/dts/abilis_tb10x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/boot/dts/abilis_tb10x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/boot/dts/abilis_tb10x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/abilis_tb10x.dtsi</a></div><div class='hunk'>@@ -129,6 +129,7 @@</div><div class='ctx'> 			data-width = &lt;4&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;ahb_clk&gt;;</div><div class='ctx'> 			clock-names = "hclk";</div><div class='add'>+			multi-block = &lt;1 1 1 1 1 1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c0: i2c@FF120000 {</div><div class='head'>diff --git a/arch/arc/boot/dts/axc003_idu.dtsi b/arch/arc/boot/dts/axc003_idu.dtsi<br/>index 3d6cfa32bf51..695f9fa1996b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/boot/dts/axc003_idu.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/boot/dts/axc003_idu.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/boot/dts/axc003_idu.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/axc003_idu.dtsi</a></div><div class='hunk'>@@ -40,18 +40,7 @@</div><div class='ctx'> 			compatible = "snps,archs-idu-intc";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;core_intc&gt;;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * &lt;hwirq  distribution&gt;</div><div class='del'>-			 * distribution: 0=RR; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3</div><div class='del'>-			 */</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * upstream irqs to core intc - downstream these are</div><div class='del'>-			 * "COMMON" irq 0,1..</div><div class='del'>-			 */</div><div class='del'>-			interrupts = &lt;24 25&gt;;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -73,12 +62,7 @@</div><div class='ctx'> 				interrupt-controller;</div><div class='ctx'> 				#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> 				interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * cmn irq 1 -&gt; cpu irq 25</div><div class='del'>-				 * Distribute to cpu0 only</div><div class='del'>-				 */</div><div class='del'>-				interrupts = &lt;1 1&gt;;</div><div class='add'>+				interrupts = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -119,8 +103,7 @@</div><div class='ctx'> 		reg = &lt; 0xe0012000 0x200 &gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='del'>-		interrupts = &lt;0 1&gt;;	/* cmn irq 0 -&gt; cpu irq 24</div><div class='del'>-					   distribute to cpu0 only */</div><div class='add'>+		interrupts = &lt;0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='head'>diff --git a/arch/arc/boot/dts/axs101.dts b/arch/arc/boot/dts/axs101.dts<br/>index d9b9b9dcfc4c..70aec7d6ca60 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/boot/dts/axs101.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/boot/dts/axs101.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/boot/dts/axs101.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/axs101.dts</a></div><div class='hunk'>@@ -17,6 +17,6 @@</div><div class='ctx'> 	compatible = "snps,axs101", "snps,arc-sdp";</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='del'>-		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0";</div><div class='add'>+		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 video=1280x720@60";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arc/boot/dts/axs103_idu.dts b/arch/arc/boot/dts/axs103_idu.dts<br/>index 070c29782216..5c843d9b4ac8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/boot/dts/axs103_idu.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/boot/dts/axs103_idu.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/boot/dts/axs103_idu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/axs103_idu.dts</a></div><div class='hunk'>@@ -20,6 +20,6 @@</div><div class='ctx'> 	compatible = "snps,axs103", "snps,arc-sdp";</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='del'>-		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=ttyS3,115200n8 debug print-fatal-signals=1";</div><div class='add'>+		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 print-fatal-signals=1 consoleblank=0 video=1280x720@60";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arc/boot/dts/zebu_hs.dts b/arch/arc/boot/dts/haps_hs.dts<br/>index 1c1324e84965..1c1324e84965 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/boot/dts/zebu_hs.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/boot/dts/zebu_hs.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/boot/dts/haps_hs.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/haps_hs.dts</a></div><div class='head'>diff --git a/arch/arc/boot/dts/haps_hs_idu.dts b/arch/arc/boot/dts/haps_hs_idu.dts<br/>new file mode 100644<br/>index 000000000000..215cddd0b63b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arc/boot/dts/haps_hs_idu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/haps_hs_idu.dts</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016-2014 Synopsys, Inc. (www.synopsys.com)</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/include/ "skeleton_hs_idu.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "snps,zebu_hs-smp";</div><div class='add'>+	compatible = "snps,zebu_hs";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;core_intc&gt;;</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x80000000 0x20000000&gt;;	/* 512 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=ttyS0,115200n8 debug";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fpga {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		/* child and parent address space 1:1 mapped */</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		core_clk: core_clk {</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-frequency = &lt;50000000&gt;;	/* 50 MHZ */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		core_intc: interrupt-controller {</div><div class='add'>+			compatible = "snps,archs-intc";</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		idu_intc: idu-interrupt-controller {</div><div class='add'>+			compatible = "snps,archs-idu-intc";</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			interrupt-parent = &lt;&amp;core_intc&gt;;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart0: serial@f0000000 {</div><div class='add'>+			/* compatible = "ns8250"; Doesn't use FIFOs */</div><div class='add'>+			compatible = "ns16550a";</div><div class='add'>+			reg = &lt;0xf0000000 0x2000&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='add'>+			interrupts = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;50000000&gt;;</div><div class='add'>+			baud = &lt;115200&gt;;</div><div class='add'>+			reg-shift = &lt;2&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+			no-loopback-test = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		arcpct0: pct {</div><div class='add'>+			compatible = "snps,archs-pct";</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupts = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arc/boot/dts/nsim_hs_idu.dts b/arch/arc/boot/dts/nsim_hs_idu.dts<br/>index 48434d7c4498..4f98ebf71fd8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/boot/dts/nsim_hs_idu.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/boot/dts/nsim_hs_idu.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/boot/dts/nsim_hs_idu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/nsim_hs_idu.dts</a></div><div class='hunk'>@@ -46,25 +46,14 @@</div><div class='ctx'> 			compatible = "snps,archs-idu-intc";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;core_intc&gt;;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * &lt;hwirq  distribution&gt;</div><div class='del'>-			 * distribution: 0=RR; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3</div><div class='del'>-			 */</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * upstream irqs to core intc - downstream these are</div><div class='del'>-			 * "COMMON" irq 0,1..</div><div class='del'>-			 */</div><div class='del'>-			interrupts = &lt;24 25 26 27 28 29 30 31&gt;;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		arcuart0: serial@c0fc1000 {</div><div class='ctx'> 			compatible = "snps,arc-uart";</div><div class='ctx'> 			reg = &lt;0xc0fc1000 0x100&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='del'>-			interrupts = &lt;0 0&gt;;</div><div class='add'>+			interrupts = &lt;0&gt;;</div><div class='ctx'> 			clock-frequency = &lt;80000000&gt;;</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='ctx'> 			status = "okay";</div><div class='head'>diff --git a/arch/arc/boot/dts/nsimosci_hs_idu.dts b/arch/arc/boot/dts/nsimosci_hs_idu.dts<br/>index cbf65b6cc7c6..5052917d4a99 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/boot/dts/nsimosci_hs_idu.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/boot/dts/nsimosci_hs_idu.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/boot/dts/nsimosci_hs_idu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/nsimosci_hs_idu.dts</a></div><div class='hunk'>@@ -43,33 +43,20 @@</div><div class='ctx'> 			compatible = "snps,archs-intc";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-/*			interrupts = &lt;16 17 18 19 20 21 22 23 24 25&gt;; */</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		idu_intc: idu-interrupt-controller {</div><div class='ctx'> 			compatible = "snps,archs-idu-intc";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;core_intc&gt;;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * &lt;hwirq  distribution&gt;</div><div class='del'>-			 * distribution: 0=RR; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3</div><div class='del'>-			 */</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * upstream irqs to core intc - downstream these are</div><div class='del'>-			 * "COMMON" irq 0,1..</div><div class='del'>-			 */</div><div class='del'>-			interrupts = &lt;24 25 26 27 28 29 30 31&gt;;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		uart0: serial@f0000000 {</div><div class='ctx'> 			compatible = "ns8250";</div><div class='ctx'> 			reg = &lt;0xf0000000 0x2000&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='del'>-			interrupts = &lt;0 0&gt;; /* cmn irq 0 -&gt; cpu irq 24</div><div class='del'>-						RR distribute to all cpus */</div><div class='add'>+			interrupts = &lt;0&gt;;</div><div class='ctx'> 			clock-frequency = &lt;3686400&gt;;</div><div class='ctx'> 			baud = &lt;115200&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='hunk'>@@ -93,7 +80,7 @@</div><div class='ctx'> 		ps2: ps2@f9001000 {</div><div class='ctx'> 			compatible = "snps,arc_ps2";</div><div class='ctx'> 			reg = &lt;0xf9000400 0x14&gt;;</div><div class='del'>-			interrupts = &lt;3 0&gt;;</div><div class='add'>+			interrupts = &lt;3&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='ctx'> 			interrupt-names = "arc_ps2_irq";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -102,7 +89,7 @@</div><div class='ctx'> 			compatible = "ezchip,nps-mgt-enet";</div><div class='ctx'> 			reg = &lt;0xf0003000 0x44&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='del'>-			interrupts = &lt;1 2&gt;;</div><div class='add'>+			interrupts = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		arcpct0: pct {</div><div class='head'>diff --git a/arch/arc/boot/dts/vdk_axc003_idu.dtsi b/arch/arc/boot/dts/vdk_axc003_idu.dtsi<br/>index 82214cd7ba0c..28956f9a9f3d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/boot/dts/vdk_axc003_idu.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/boot/dts/vdk_axc003_idu.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/boot/dts/vdk_axc003_idu.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/vdk_axc003_idu.dtsi</a></div><div class='hunk'>@@ -41,14 +41,7 @@</div><div class='ctx'> 			compatible = "snps,archs-idu-intc";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;core_intc&gt;;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * &lt;hwirq  distribution&gt;</div><div class='del'>-			 * distribution: 0=RR; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3</div><div class='del'>-			 */</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupts = &lt;24 25 26 27&gt;;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		debug_uart: dw-apb-uart@0x5000 {</div><div class='hunk'>@@ -56,7 +49,7 @@</div><div class='ctx'> 			reg = &lt;0x5000 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;2403200&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='del'>-			interrupts = &lt;2 0&gt;;</div><div class='add'>+			interrupts = &lt;2&gt;;</div><div class='ctx'> 			baud = &lt;115200&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='hunk'>@@ -70,7 +63,7 @@</div><div class='ctx'> 		reg = &lt; 0xe0012000 0x200 &gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='del'>-		interrupts = &lt; 0 0 &gt;;</div><div class='add'>+		interrupts = &lt;0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='head'>diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi<br/>index 99498a4b4216..f0df59b23e21 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/boot/dts/vdk_axs10x_mb.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/boot/dts/vdk_axs10x_mb.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/boot/dts/vdk_axs10x_mb.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/boot/dts/vdk_axs10x_mb.dtsi</a></div><div class='hunk'>@@ -23,6 +23,12 @@</div><div class='ctx'> 				#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			mmcclk: mmcclk {</div><div class='add'>+				compatible = "fixed-clock";</div><div class='add'>+				clock-frequency = &lt;50000000&gt;;</div><div class='add'>+				#clock-cells = &lt;0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			pguclk: pguclk {</div><div class='ctx'> 				#clock-cells = &lt;0&gt;;</div><div class='ctx'> 				compatible = "fixed-clock";</div><div class='hunk'>@@ -94,5 +100,25 @@</div><div class='ctx'> 			interrupts = &lt;5&gt;;</div><div class='ctx'> 			interrupt-names = "arc_ps2_irq";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		mmc@0x15000 {</div><div class='add'>+			compatible = "snps,dw-mshc";</div><div class='add'>+			reg = &lt;0x15000 0x400&gt;;</div><div class='add'>+			num-slots = &lt;1&gt;;</div><div class='add'>+			fifo-depth = &lt;1024&gt;;</div><div class='add'>+			card-detect-delay = &lt;200&gt;;</div><div class='add'>+			clocks = &lt;&amp;apbclk&gt;, &lt;&amp;mmcclk&gt;;</div><div class='add'>+			clock-names = "biu", "ciu";</div><div class='add'>+			interrupts = &lt;7&gt;;</div><div class='add'>+			bus-width = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/* Embedded Vision subsystem UIO mappings; only relevant for EV VDK */</div><div class='add'>+		uio_ev: uio@0xD0000000 {</div><div class='add'>+			compatible = "generic-uio";</div><div class='add'>+			reg = &lt;0xD0000000 0x2000 0xD1000000 0x2000 0x90000000 0x10000000 0xC0000000 0x10000000&gt;;</div><div class='add'>+			reg-names = "ev_gsa", "ev_ctrl", "ev_shared_mem", "ev_code_mem";</div><div class='add'>+			interrupts = &lt;23&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arc/boot/dts/zebu_hs_idu.dts b/arch/arc/boot/dts/zebu_hs_idu.dts<br/>deleted file mode 100644<br/>index 65204b4c0f13..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arc/boot/dts/zebu_hs_idu.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/boot/dts/zebu_hs_idu.dts</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2016-2014 Synopsys, Inc. (www.synopsys.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-/dts-v1/;</div><div class='del'>-</div><div class='del'>-/include/ "skeleton_hs_idu.dtsi"</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	model = "snps,zebu_hs-smp";</div><div class='del'>-	compatible = "snps,zebu_hs";</div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='del'>-	interrupt-parent = &lt;&amp;core_intc&gt;;</div><div class='del'>-</div><div class='del'>-	memory {</div><div class='del'>-		device_type = "memory";</div><div class='del'>-		reg = &lt;0x80000000 0x20000000&gt;;	/* 512 */</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	chosen {</div><div class='del'>-		bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=ttyS0,115200n8 debug";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		serial0 = &amp;uart0;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	fpga {</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-		/* child and parent address space 1:1 mapped */</div><div class='del'>-		ranges;</div><div class='del'>-</div><div class='del'>-		core_clk: core_clk {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-clock";</div><div class='del'>-			clock-frequency = &lt;50000000&gt;;	/* 50 MHZ */</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		core_intc: interrupt-controller {</div><div class='del'>-			compatible = "snps,archs-intc";</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-/*			interrupts = &lt;16 17 18 19 20 21 22 23 24 25&gt;; */</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		idu_intc: idu-interrupt-controller {</div><div class='del'>-			compatible = "snps,archs-idu-intc";</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			interrupt-parent = &lt;&amp;core_intc&gt;;</div><div class='del'>-			/* &lt;hwirq  distribution&gt;</div><div class='del'>-			distribution: 0=RR; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3 */</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			interrupts = &lt;24 25 26 27 28 29 30 31&gt;;</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		uart0: serial@f0000000 {</div><div class='del'>-			/* compatible = "ns8250"; Doesn't use FIFOs */</div><div class='del'>-			compatible = "ns16550a";</div><div class='del'>-			reg = &lt;0xf0000000 0x2000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;idu_intc&gt;;</div><div class='del'>-			/* interrupts = &lt;0 1&gt;;  DEST=1*/</div><div class='del'>-			/* interrupts = &lt;0 2&gt;;  DEST=2*/</div><div class='del'>-			interrupts = &lt;0 0&gt;;  /* RR*/</div><div class='del'>-			clock-frequency = &lt;50000000&gt;;</div><div class='del'>-			baud = &lt;115200&gt;;</div><div class='del'>-			reg-shift = &lt;2&gt;;</div><div class='del'>-			reg-io-width = &lt;4&gt;;</div><div class='del'>-			no-loopback-test = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		arcpct0: pct {</div><div class='del'>-			compatible = "snps,archs-pct";</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			interrupts = &lt;20&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arc/configs/axs101_defconfig b/arch/arc/configs/axs101_defconfig<br/>index 0a0eaf09aac7..6980b966a364 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/configs/axs101_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/configs/axs101_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/configs/axs101_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/axs101_defconfig</a></div><div class='hunk'>@@ -75,9 +75,11 @@ CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_DESIGNWARE_PLATFORM=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+CONFIG_DRM=m</div><div class='add'>+CONFIG_DRM_I2C_ADV7511=m</div><div class='add'>+CONFIG_DRM_ARCPGU=m</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='del'>-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y</div><div class='ctx'> CONFIG_LOGO=y</div><div class='ctx'> # CONFIG_LOGO_LINUX_MONO is not set</div><div class='ctx'> # CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='head'>diff --git a/arch/arc/configs/axs103_smp_defconfig b/arch/arc/configs/axs103_smp_defconfig<br/>index 110874705085..30a3d4cf53d2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/configs/axs103_smp_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/configs/axs103_smp_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/configs/axs103_smp_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/axs103_smp_defconfig</a></div><div class='hunk'>@@ -77,9 +77,11 @@ CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_DESIGNWARE_PLATFORM=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+CONFIG_DRM=m</div><div class='add'>+CONFIG_DRM_I2C_ADV7511=m</div><div class='add'>+CONFIG_DRM_ARCPGU=m</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='del'>-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y</div><div class='ctx'> CONFIG_LOGO=y</div><div class='ctx'> # CONFIG_LOGO_LINUX_MONO is not set</div><div class='ctx'> # CONFIG_LOGO_LINUX_VGA16 is not set</div><div class='head'>diff --git a/arch/arc/configs/haps_hs_defconfig b/arch/arc/configs/haps_hs_defconfig<br/>new file mode 100644<br/>index 000000000000..57b3e599322f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arc/configs/haps_hs_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/haps_hs_defconfig</a></div><div class='hunk'>@@ -0,0 +1,86 @@</div><div class='add'>+CONFIG_DEFAULT_HOSTNAME="ARCLinux"</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+# CONFIG_CROSS_MEMORY_ATTACH is not set</div><div class='add'>+CONFIG_NO_HZ_IDLE=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"</div><div class='add'>+CONFIG_EXPERT=y</div><div class='add'>+CONFIG_PERF_EVENTS=y</div><div class='add'>+# CONFIG_COMPAT_BRK is not set</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_LBDAF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_ARC_PLAT_SIM=y</div><div class='add'>+CONFIG_ISA_ARCV2=y</div><div class='add'>+CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs"</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+# CONFIG_COMPACTION is not set</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_PACKET_DIAG=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_UNIX_DIAG=y</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_WIRELESS is not set</div><div class='add'>+CONFIG_DEVTMPFS=y</div><div class='add'>+# CONFIG_STANDALONE is not set</div><div class='add'>+# CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+# CONFIG_BLK_DEV is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NET_VENDOR_ARC is not set</div><div class='add'>+# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_INTEL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MARVELL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MICREL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='add'>+# CONFIG_NET_VENDOR_VIA is not set</div><div class='add'>+# CONFIG_NET_VENDOR_WIZNET is not set</div><div class='add'>+# CONFIG_WLAN is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+CONFIG_MOUSE_PS2_TOUCHKIT=y</div><div class='add'>+# CONFIG_SERIO_SERPORT is not set</div><div class='add'>+CONFIG_SERIO_ARC_PS2=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_DEVKMEM is not set</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=1</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=1</div><div class='add'>+CONFIG_SERIAL_8250_DW=y</div><div class='add'>+CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+# CONFIG_HID is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_IOMMU_SUPPORT is not set</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_MISC_FILESYSTEMS is not set</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+# CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='add'>+# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+# CONFIG_DEBUG_PREEMPT is not set</div><div class='head'>diff --git a/arch/arc/configs/haps_hs_smp_defconfig b/arch/arc/configs/haps_hs_smp_defconfig<br/>new file mode 100644<br/>index 000000000000..f85985adebb2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arc/configs/haps_hs_smp_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/haps_hs_smp_defconfig</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+CONFIG_DEFAULT_HOSTNAME="ARCLinux"</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+# CONFIG_CROSS_MEMORY_ATTACH is not set</div><div class='add'>+CONFIG_NO_HZ_IDLE=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_PERF_EVENTS=y</div><div class='add'>+# CONFIG_VM_EVENT_COUNTERS is not set</div><div class='add'>+# CONFIG_COMPAT_BRK is not set</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_KPROBES=y</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_LBDAF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_ARC_PLAT_SIM=y</div><div class='add'>+CONFIG_ISA_ARCV2=y</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs_idu"</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+# CONFIG_COMPACTION is not set</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_PACKET_DIAG=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_UNIX_DIAG=y</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_WIRELESS is not set</div><div class='add'>+CONFIG_DEVTMPFS=y</div><div class='add'>+# CONFIG_STANDALONE is not set</div><div class='add'>+# CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+# CONFIG_BLK_DEV is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NET_VENDOR_ARC is not set</div><div class='add'>+# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_INTEL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MARVELL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MICREL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='add'>+# CONFIG_NET_VENDOR_VIA is not set</div><div class='add'>+# CONFIG_NET_VENDOR_WIZNET is not set</div><div class='add'>+# CONFIG_WLAN is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+CONFIG_MOUSE_PS2_TOUCHKIT=y</div><div class='add'>+# CONFIG_SERIO_SERPORT is not set</div><div class='add'>+CONFIG_SERIO_ARC_PS2=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_DEVKMEM is not set</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=1</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=1</div><div class='add'>+CONFIG_SERIAL_8250_DW=y</div><div class='add'>+CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+# CONFIG_HID is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_IOMMU_SUPPORT is not set</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_MISC_FILESYSTEMS is not set</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+# CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='add'>+# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+CONFIG_LOCKUP_DETECTOR=y</div><div class='add'>+# CONFIG_DEBUG_PREEMPT is not set</div><div class='head'>diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig<br/>index 6da71ba253a9..155add7761ed 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/configs/nsimosci_hs_smp_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/configs/nsimosci_hs_smp_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/configs/nsimosci_hs_smp_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/nsimosci_hs_smp_defconfig</a></div><div class='hunk'>@@ -21,7 +21,7 @@ CONFIG_MODULES=y</div><div class='ctx'> CONFIG_ARC_PLAT_SIM=y</div><div class='ctx'> CONFIG_ISA_ARCV2=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='del'>-# CONFIG_ARC_HAS_GFRC is not set</div><div class='add'>+# CONFIG_ARC_TIMERS_64BIT is not set</div><div class='ctx'> CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci_hs_idu"</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='ctx'> # CONFIG_COMPACTION is not set</div><div class='head'>diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig<br/>index 969b206d6c67..5c0971787acf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/configs/vdk_hs38_smp_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/configs/vdk_hs38_smp_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/configs/vdk_hs38_smp_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/configs/vdk_hs38_smp_defconfig</a></div><div class='hunk'>@@ -15,7 +15,8 @@ CONFIG_ARC_PLAT_AXS10X=y</div><div class='ctx'> CONFIG_AXS103=y</div><div class='ctx'> CONFIG_ISA_ARCV2=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='del'>-# CONFIG_ARC_HAS_GFRC is not set</div><div class='add'>+# CONFIG_ARC_TIMERS_64BIT is not set</div><div class='add'>+# CONFIG_ARC_SMP_HALT_ON_RESET is not set</div><div class='ctx'> CONFIG_ARC_UBOOT_SUPPORT=y</div><div class='ctx'> CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38_smp"</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='hunk'>@@ -56,7 +57,6 @@ CONFIG_NATIONAL_PHY=y</div><div class='ctx'> CONFIG_MOUSE_PS2_TOUCHKIT=y</div><div class='ctx'> CONFIG_SERIO_ARC_PS2=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_8250_DW=y</div><div class='hunk'>@@ -78,9 +78,14 @@ CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD_PLATFORM=y</div><div class='ctx'> CONFIG_USB_STORAGE=y</div><div class='ctx'> CONFIG_USB_SERIAL=y</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+CONFIG_MMC_SDHCI=y</div><div class='add'>+CONFIG_MMC_SDHCI_PLTFM=y</div><div class='add'>+CONFIG_MMC_DW=y</div><div class='add'>+CONFIG_UIO=y</div><div class='add'>+CONFIG_UIO_PDRV_GENIRQ=y</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='del'>-CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_MSDOS_FS=y</div><div class='ctx'> CONFIG_VFAT_FS=y</div><div class='ctx'> CONFIG_NTFS_FS=y</div><div class='head'>diff --git a/arch/arc/configs/zebu_hs_defconfig b/arch/arc/configs/zebu_hs_defconfig<br/>deleted file mode 100644<br/>index 9f6166be7145..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arc/configs/zebu_hs_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/configs/zebu_hs_defconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,86 +0,0 @@</div><div class='del'>-CONFIG_DEFAULT_HOSTNAME="ARCLinux"</div><div class='del'>-# CONFIG_SWAP is not set</div><div class='del'>-CONFIG_SYSVIPC=y</div><div class='del'>-CONFIG_POSIX_MQUEUE=y</div><div class='del'>-# CONFIG_CROSS_MEMORY_ATTACH is not set</div><div class='del'>-CONFIG_NO_HZ_IDLE=y</div><div class='del'>-CONFIG_HIGH_RES_TIMERS=y</div><div class='del'>-CONFIG_IKCONFIG=y</div><div class='del'>-CONFIG_IKCONFIG_PROC=y</div><div class='del'>-CONFIG_NAMESPACES=y</div><div class='del'>-# CONFIG_UTS_NS is not set</div><div class='del'>-# CONFIG_PID_NS is not set</div><div class='del'>-CONFIG_BLK_DEV_INITRD=y</div><div class='del'>-CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"</div><div class='del'>-CONFIG_EXPERT=y</div><div class='del'>-CONFIG_PERF_EVENTS=y</div><div class='del'>-# CONFIG_COMPAT_BRK is not set</div><div class='del'>-CONFIG_SLAB=y</div><div class='del'>-CONFIG_MODULES=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='del'>-# CONFIG_BLK_DEV_BSG is not set</div><div class='del'>-# CONFIG_IOSCHED_DEADLINE is not set</div><div class='del'>-# CONFIG_IOSCHED_CFQ is not set</div><div class='del'>-CONFIG_ARC_PLAT_SIM=y</div><div class='del'>-CONFIG_ISA_ARCV2=y</div><div class='del'>-CONFIG_ARC_BUILTIN_DTB_NAME="zebu_hs"</div><div class='del'>-CONFIG_PREEMPT=y</div><div class='del'>-# CONFIG_COMPACTION is not set</div><div class='del'>-CONFIG_NET=y</div><div class='del'>-CONFIG_PACKET=y</div><div class='del'>-CONFIG_PACKET_DIAG=y</div><div class='del'>-CONFIG_UNIX=y</div><div class='del'>-CONFIG_UNIX_DIAG=y</div><div class='del'>-CONFIG_NET_KEY=y</div><div class='del'>-CONFIG_INET=y</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='del'>-# CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_WIRELESS is not set</div><div class='del'>-CONFIG_DEVTMPFS=y</div><div class='del'>-# CONFIG_STANDALONE is not set</div><div class='del'>-# CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='del'>-# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='del'>-# CONFIG_BLK_DEV is not set</div><div class='del'>-CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NET_VENDOR_ARC is not set</div><div class='del'>-# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='del'>-# CONFIG_NET_VENDOR_INTEL is not set</div><div class='del'>-# CONFIG_NET_VENDOR_MARVELL is not set</div><div class='del'>-# CONFIG_NET_VENDOR_MICREL is not set</div><div class='del'>-# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='del'>-# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='del'>-# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='del'>-# CONFIG_NET_VENDOR_VIA is not set</div><div class='del'>-# CONFIG_NET_VENDOR_WIZNET is not set</div><div class='del'>-# CONFIG_WLAN is not set</div><div class='del'>-CONFIG_INPUT_EVDEV=y</div><div class='del'>-CONFIG_MOUSE_PS2_TOUCHKIT=y</div><div class='del'>-# CONFIG_SERIO_SERPORT is not set</div><div class='del'>-CONFIG_SERIO_ARC_PS2=y</div><div class='del'>-# CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='del'>-CONFIG_SERIAL_8250=y</div><div class='del'>-CONFIG_SERIAL_8250_CONSOLE=y</div><div class='del'>-CONFIG_SERIAL_8250_NR_UARTS=1</div><div class='del'>-CONFIG_SERIAL_8250_RUNTIME_UARTS=1</div><div class='del'>-CONFIG_SERIAL_8250_DW=y</div><div class='del'>-CONFIG_SERIAL_OF_PLATFORM=y</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='del'>-CONFIG_FB=y</div><div class='del'>-CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='del'>-CONFIG_LOGO=y</div><div class='del'>-# CONFIG_HID is not set</div><div class='del'>-# CONFIG_USB_SUPPORT is not set</div><div class='del'>-# CONFIG_IOMMU_SUPPORT is not set</div><div class='del'>-CONFIG_EXT2_FS=y</div><div class='del'>-CONFIG_EXT2_FS_XATTR=y</div><div class='del'>-CONFIG_TMPFS=y</div><div class='del'>-# CONFIG_MISC_FILESYSTEMS is not set</div><div class='del'>-CONFIG_NFS_FS=y</div><div class='del'>-# CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='del'>-# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='del'>-CONFIG_DEBUG_MEMORY_INIT=y</div><div class='del'>-# CONFIG_DEBUG_PREEMPT is not set</div><div class='head'>diff --git a/arch/arc/configs/zebu_hs_smp_defconfig b/arch/arc/configs/zebu_hs_smp_defconfig<br/>deleted file mode 100644<br/>index 44e9693f4257..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arc/configs/zebu_hs_smp_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/configs/zebu_hs_smp_defconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +0,0 @@</div><div class='del'>-CONFIG_DEFAULT_HOSTNAME="ARCLinux"</div><div class='del'>-# CONFIG_SWAP is not set</div><div class='del'>-CONFIG_SYSVIPC=y</div><div class='del'>-CONFIG_POSIX_MQUEUE=y</div><div class='del'>-# CONFIG_CROSS_MEMORY_ATTACH is not set</div><div class='del'>-CONFIG_NO_HZ_IDLE=y</div><div class='del'>-CONFIG_HIGH_RES_TIMERS=y</div><div class='del'>-CONFIG_IKCONFIG=y</div><div class='del'>-CONFIG_IKCONFIG_PROC=y</div><div class='del'>-CONFIG_NAMESPACES=y</div><div class='del'>-# CONFIG_UTS_NS is not set</div><div class='del'>-# CONFIG_PID_NS is not set</div><div class='del'>-CONFIG_BLK_DEV_INITRD=y</div><div class='del'>-CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"</div><div class='del'>-CONFIG_EMBEDDED=y</div><div class='del'>-CONFIG_PERF_EVENTS=y</div><div class='del'>-# CONFIG_VM_EVENT_COUNTERS is not set</div><div class='del'>-# CONFIG_COMPAT_BRK is not set</div><div class='del'>-CONFIG_SLAB=y</div><div class='del'>-CONFIG_KPROBES=y</div><div class='del'>-CONFIG_MODULES=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='del'>-# CONFIG_BLK_DEV_BSG is not set</div><div class='del'>-# CONFIG_IOSCHED_DEADLINE is not set</div><div class='del'>-# CONFIG_IOSCHED_CFQ is not set</div><div class='del'>-CONFIG_ARC_PLAT_SIM=y</div><div class='del'>-CONFIG_ISA_ARCV2=y</div><div class='del'>-CONFIG_SMP=y</div><div class='del'>-CONFIG_ARC_BUILTIN_DTB_NAME="zebu_hs_idu"</div><div class='del'>-CONFIG_PREEMPT=y</div><div class='del'>-# CONFIG_COMPACTION is not set</div><div class='del'>-CONFIG_NET=y</div><div class='del'>-CONFIG_PACKET=y</div><div class='del'>-CONFIG_PACKET_DIAG=y</div><div class='del'>-CONFIG_UNIX=y</div><div class='del'>-CONFIG_UNIX_DIAG=y</div><div class='del'>-CONFIG_NET_KEY=y</div><div class='del'>-CONFIG_INET=y</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='del'>-# CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_WIRELESS is not set</div><div class='del'>-CONFIG_DEVTMPFS=y</div><div class='del'>-# CONFIG_STANDALONE is not set</div><div class='del'>-# CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='del'>-# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='del'>-# CONFIG_BLK_DEV is not set</div><div class='del'>-CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NET_VENDOR_ARC is not set</div><div class='del'>-# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='del'>-# CONFIG_NET_VENDOR_INTEL is not set</div><div class='del'>-# CONFIG_NET_VENDOR_MARVELL is not set</div><div class='del'>-# CONFIG_NET_VENDOR_MICREL is not set</div><div class='del'>-# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='del'>-# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='del'>-# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='del'>-# CONFIG_NET_VENDOR_VIA is not set</div><div class='del'>-# CONFIG_NET_VENDOR_WIZNET is not set</div><div class='del'>-# CONFIG_WLAN is not set</div><div class='del'>-CONFIG_INPUT_EVDEV=y</div><div class='del'>-CONFIG_MOUSE_PS2_TOUCHKIT=y</div><div class='del'>-# CONFIG_SERIO_SERPORT is not set</div><div class='del'>-CONFIG_SERIO_ARC_PS2=y</div><div class='del'>-# CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='del'>-CONFIG_SERIAL_8250=y</div><div class='del'>-CONFIG_SERIAL_8250_CONSOLE=y</div><div class='del'>-CONFIG_SERIAL_8250_NR_UARTS=1</div><div class='del'>-CONFIG_SERIAL_8250_RUNTIME_UARTS=1</div><div class='del'>-CONFIG_SERIAL_8250_DW=y</div><div class='del'>-CONFIG_SERIAL_OF_PLATFORM=y</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='del'>-CONFIG_FB=y</div><div class='del'>-CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='del'>-CONFIG_LOGO=y</div><div class='del'>-# CONFIG_HID is not set</div><div class='del'>-# CONFIG_USB_SUPPORT is not set</div><div class='del'>-# CONFIG_IOMMU_SUPPORT is not set</div><div class='del'>-CONFIG_EXT2_FS=y</div><div class='del'>-CONFIG_EXT2_FS_XATTR=y</div><div class='del'>-CONFIG_TMPFS=y</div><div class='del'>-# CONFIG_MISC_FILESYSTEMS is not set</div><div class='del'>-CONFIG_NFS_FS=y</div><div class='del'>-# CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='del'>-# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='del'>-CONFIG_LOCKUP_DETECTOR=y</div><div class='del'>-# CONFIG_DEBUG_PREEMPT is not set</div><div class='head'>diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild<br/>index c332604606dd..63a04013d05a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/Kbuild</a></div><div class='hunk'>@@ -2,7 +2,6 @@ generic-y += auxvec.h</div><div class='ctx'> generic-y += bitsperlong.h</div><div class='ctx'> generic-y += bugs.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += div64.h</div><div class='ctx'> generic-y += emergency-restart.h</div><div class='head'>diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h<br/>index 1bd24ec3e350..ba8e802dba80 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/arcregs.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/arcregs.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/arcregs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/arcregs.h</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #define ARC_REG_FP_V2_BCR	0xc8	/* ARCv2 FPU */</div><div class='ctx'> #define ARC_REG_SLC_BCR		0xce</div><div class='ctx'> #define ARC_REG_DCCM_BUILD	0x74	/* DCCM size (common) */</div><div class='del'>-#define ARC_REG_TIMERS_BCR	0x75</div><div class='ctx'> #define ARC_REG_AP_BCR		0x76</div><div class='ctx'> #define ARC_REG_ICCM_BUILD	0x78	/* ICCM size (common) */</div><div class='ctx'> #define ARC_REG_XY_MEM_BCR	0x79</div><div class='hunk'>@@ -39,6 +38,9 @@</div><div class='ctx'> #define ARC_REG_CLUSTER_BCR	0xcf</div><div class='ctx'> #define ARC_REG_AUX_ICCM	0x208	/* ICCM Base Addr (ARCv2) */</div><div class='ctx'> </div><div class='add'>+/* Common for ARCompact and ARCv2 status register */</div><div class='add'>+#define ARC_REG_STATUS32	0x0A</div><div class='add'>+</div><div class='ctx'> /* status32 Bits Positions */</div><div class='ctx'> #define STATUS_AE_BIT		5	/* Exception active */</div><div class='ctx'> #define STATUS_DE_BIT		6	/* PC is in delay slot */</div><div class='hunk'>@@ -112,90 +114,7 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- ******************************************************************</div><div class='del'>- *      Inline ASM macros to read/write AUX Regs</div><div class='del'>- *      Essentially invocation of lr/sr insns from "C"</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if 1</div><div class='del'>-</div><div class='del'>-#define read_aux_reg(reg)	__builtin_arc_lr(reg)</div><div class='del'>-</div><div class='del'>-/* gcc builtin sr needs reg param to be long immediate */</div><div class='del'>-#define write_aux_reg(reg_immed, val)		\</div><div class='del'>-		__builtin_arc_sr((unsigned int)(val), reg_immed)</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#define read_aux_reg(reg)		\</div><div class='del'>-({					\</div><div class='del'>-	unsigned int __ret;		\</div><div class='del'>-	__asm__ __volatile__(		\</div><div class='del'>-	"	lr    %0, [%1]"		\</div><div class='del'>-	: "=r"(__ret)			\</div><div class='del'>-	: "i"(reg));			\</div><div class='del'>-	__ret;				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Aux Reg address is specified as long immediate by caller</div><div class='del'>- * e.g.</div><div class='del'>- *    write_aux_reg(0x69, some_val);</div><div class='del'>- * This generates tightest code.</div><div class='del'>- */</div><div class='del'>-#define write_aux_reg(reg_imm, val)	\</div><div class='del'>-({					\</div><div class='del'>-	__asm__ __volatile__(		\</div><div class='del'>-	"	sr   %0, [%1]	\n"	\</div><div class='del'>-	:				\</div><div class='del'>-	: "ir"(val), "i"(reg_imm));	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Aux Reg address is specified in a variable</div><div class='del'>- *  * e.g.</div><div class='del'>- *      reg_num = 0x69</div><div class='del'>- *      write_aux_reg2(reg_num, some_val);</div><div class='del'>- * This has to generate glue code to load the reg num from</div><div class='del'>- *  memory to a reg hence not recommended.</div><div class='del'>- */</div><div class='del'>-#define write_aux_reg2(reg_in_var, val)		\</div><div class='del'>-({						\</div><div class='del'>-	unsigned int tmp;			\</div><div class='del'>-						\</div><div class='del'>-	__asm__ __volatile__(			\</div><div class='del'>-	"	ld   %0, [%2]	\n\t"		\</div><div class='del'>-	"	sr   %1, [%0]	\n\t"		\</div><div class='del'>-	: "=&amp;r"(tmp)				\</div><div class='del'>-	: "r"(val), "memory"(&amp;reg_in_var));	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define READ_BCR(reg, into)				\</div><div class='del'>-{							\</div><div class='del'>-	unsigned int tmp;				\</div><div class='del'>-	tmp = read_aux_reg(reg);			\</div><div class='del'>-	if (sizeof(tmp) == sizeof(into)) {		\</div><div class='del'>-		into = *((typeof(into) *)&amp;tmp);		\</div><div class='del'>-	} else {					\</div><div class='del'>-		extern void bogus_undefined(void);	\</div><div class='del'>-		bogus_undefined();			\</div><div class='del'>-	}						\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define WRITE_AUX(reg, into)				\</div><div class='del'>-{							\</div><div class='del'>-	unsigned int tmp;				\</div><div class='del'>-	if (sizeof(tmp) == sizeof(into)) {		\</div><div class='del'>-		tmp = (*(unsigned int *)&amp;(into));	\</div><div class='del'>-		write_aux_reg(reg, tmp);		\</div><div class='del'>-	} else  {					\</div><div class='del'>-		extern void bogus_undefined(void);	\</div><div class='del'>-		bogus_undefined();			\</div><div class='del'>-	}						\</div><div class='del'>-}</div><div class='add'>+#include &lt;soc/arc/aux.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Helpers */</div><div class='ctx'> #define TO_KB(bytes)		((bytes) &gt;&gt; 10)</div><div class='hunk'>@@ -291,13 +210,7 @@ struct bcr_fp_arcv2 {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct bcr_timer {</div><div class='del'>-#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='del'>-	unsigned int pad2:15, rtsc:1, pad1:5, rtc:1, t1:1, t0:1, ver:8;</div><div class='del'>-#else</div><div class='del'>-	unsigned int ver:8, t0:1, t1:1, rtc:1, pad1:5, rtsc:1, pad2:15;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='add'>+#include &lt;soc/arc/timers.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct bcr_bpu_arcompact {</div><div class='ctx'> #ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='hunk'>@@ -334,7 +247,7 @@ struct cpuinfo_arc_mmu {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cpuinfo_arc_cache {</div><div class='del'>-	unsigned int sz_k:14, line_len:8, assoc:4, ver:4, alias:1, vipt:1;</div><div class='add'>+	unsigned int sz_k:14, line_len:8, assoc:4, alias:1, vipt:1, pad:4;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cpuinfo_arc_bpu {</div><div class='head'>diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h<br/>index b3410ff6a62d..5008021fba98 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/cache.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/cache.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/cache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/cache.h</a></div><div class='hunk'>@@ -67,7 +67,7 @@ extern unsigned long perip_base, perip_end;</div><div class='ctx'> #define ARC_REG_IC_PTAG_HI	0x1F</div><div class='ctx'> </div><div class='ctx'> /* Bit val in IC_CTRL */</div><div class='del'>-#define IC_CTRL_CACHE_DISABLE   0x1</div><div class='add'>+#define IC_CTRL_DIS		0x1</div><div class='ctx'> </div><div class='ctx'> /* Data cache related Auxiliary registers */</div><div class='ctx'> #define ARC_REG_DC_BCR		0x72	/* Build Config reg */</div><div class='hunk'>@@ -80,8 +80,9 @@ extern unsigned long perip_base, perip_end;</div><div class='ctx'> #define ARC_REG_DC_PTAG_HI	0x5F</div><div class='ctx'> </div><div class='ctx'> /* Bit val in DC_CTRL */</div><div class='del'>-#define DC_CTRL_INV_MODE_FLUSH  0x40</div><div class='del'>-#define DC_CTRL_FLUSH_STATUS    0x100</div><div class='add'>+#define DC_CTRL_DIS		0x001</div><div class='add'>+#define DC_CTRL_INV_MODE_FLUSH	0x040</div><div class='add'>+#define DC_CTRL_FLUSH_STATUS	0x100</div><div class='ctx'> </div><div class='ctx'> /*System-level cache (L2 cache) related Auxiliary registers */</div><div class='ctx'> #define ARC_REG_SLC_CFG		0x901</div><div class='hunk'>@@ -92,8 +93,8 @@ extern unsigned long perip_base, perip_end;</div><div class='ctx'> #define ARC_REG_SLC_RGN_END	0x916</div><div class='ctx'> </div><div class='ctx'> /* Bit val in SLC_CONTROL */</div><div class='add'>+#define SLC_CTRL_DIS		0x001</div><div class='ctx'> #define SLC_CTRL_IM		0x040</div><div class='del'>-#define SLC_CTRL_DISABLE	0x001</div><div class='ctx'> #define SLC_CTRL_BUSY		0x100</div><div class='ctx'> #define SLC_CTRL_RGN_OP_INV	0x200</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/include/asm/cacheflush.h b/arch/arc/include/asm/cacheflush.h<br/>index a093adbdb017..fc662f49c55a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/cacheflush.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/cacheflush.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/cacheflush.h</a></div><div class='hunk'>@@ -85,6 +85,10 @@ void flush_anon_page(struct vm_area_struct *vma,</div><div class='ctx'>  */</div><div class='ctx'> #define PG_dc_clean	PG_arch_1</div><div class='ctx'> </div><div class='add'>+#define CACHE_COLORS_NUM	4</div><div class='add'>+#define CACHE_COLORS_MSK	(CACHE_COLORS_NUM - 1)</div><div class='add'>+#define CACHE_COLOR(addr)	(((unsigned long)(addr) &gt;&gt; (PAGE_SHIFT)) &amp; CACHE_COLORS_MSK)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Simple wrapper over config option</div><div class='ctx'>  * Bootup code ensures that hardware matches kernel configuration</div><div class='hunk'>@@ -94,8 +98,6 @@ static inline int cache_is_vipt_aliasing(void)</div><div class='ctx'> 	return IS_ENABLED(CONFIG_ARC_CACHE_VIPT_ALIASING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define CACHE_COLOR(addr)	(((unsigned long)(addr) &gt;&gt; (PAGE_SHIFT)) &amp; 1)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * checks if two addresses (after page aligning) index into same cache set</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/arc/include/asm/delay.h b/arch/arc/include/asm/delay.h<br/>index a36e8601114d..d5da2115d78a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/delay.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/delay.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/delay.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/delay.h</a></div><div class='hunk'>@@ -26,7 +26,9 @@ static inline void __delay(unsigned long loops)</div><div class='ctx'> 	"	lp  1f			\n"</div><div class='ctx'> 	"	nop			\n"</div><div class='ctx'> 	"1:				\n"</div><div class='del'>-	: : "r"(loops));</div><div class='add'>+	:</div><div class='add'>+        : "r"(loops)</div><div class='add'>+        : "lp_count");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void __bad_udelay(void);</div><div class='head'>diff --git a/arch/arc/include/asm/dma-mapping.h b/arch/arc/include/asm/dma-mapping.h<br/>index 266f11c9bd59..94285031c4fb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -18,9 +18,9 @@</div><div class='ctx'> #include &lt;plat/dma.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops arc_dma_ops;</div><div class='add'>+extern const struct dma_map_ops arc_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;arc_dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arc/include/asm/entry-arcv2.h b/arch/arc/include/asm/entry-arcv2.h<br/>index b5ff87e6f4b7..aee1a77934cf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/entry-arcv2.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/entry-arcv2.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/entry-arcv2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/entry-arcv2.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> 	;</div><div class='ctx'> 	; Now manually save: r12, sp, fp, gp, r25</div><div class='ctx'> </div><div class='add'>+	PUSH	r30</div><div class='ctx'> 	PUSH	r12</div><div class='ctx'> </div><div class='ctx'> 	; Saving pt_regs-&gt;sp correctly requires some extra work due to the way</div><div class='hunk'>@@ -72,6 +73,7 @@</div><div class='ctx'> 	POPAX	AUX_USER_SP</div><div class='ctx'> 1:</div><div class='ctx'> 	POP	r12</div><div class='add'>+	POP	r30</div><div class='ctx'> </div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/include/asm/irq.h b/arch/arc/include/asm/irq.h<br/>index c0fa0d2de400..0618b1ce707c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/irq.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/irq.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/irq.h</a></div><div class='hunk'>@@ -9,13 +9,19 @@</div><div class='ctx'> #ifndef __ASM_ARC_IRQ_H</div><div class='ctx'> #define __ASM_ARC_IRQ_H</div><div class='ctx'> </div><div class='del'>-#define NR_CPU_IRQS	32  /* number of interrupt lines of ARC770 CPU */</div><div class='del'>-#define NR_IRQS		128 /* allow some CPU external IRQ handling */</div><div class='add'>+/*</div><div class='add'>+ * ARCv2 can support 240 interrupts in the core interrupts controllers and</div><div class='add'>+ * 128 interrupts in IDU. Thus 512 virtual IRQs must be enough for most</div><div class='add'>+ * configurations of boards.</div><div class='add'>+ * This doesnt affect ARCompact, but we change it to same value</div><div class='add'>+ */</div><div class='add'>+#define NR_IRQS		512</div><div class='ctx'> </div><div class='ctx'> /* Platform Independent IRQs */</div><div class='ctx'> #ifdef CONFIG_ISA_ARCV2</div><div class='ctx'> #define IPI_IRQ		19</div><div class='ctx'> #define SOFTIRQ_IRQ	21</div><div class='add'>+#define FIRST_EXT_IRQ	24</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/arch/arc/include/asm/irqflags-arcv2.h b/arch/arc/include/asm/irqflags-arcv2.h<br/>index e880dfa3fcd3..a64c447b0337 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/irqflags-arcv2.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/irqflags-arcv2.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/irqflags-arcv2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/irqflags-arcv2.h</a></div><div class='hunk'>@@ -38,10 +38,10 @@</div><div class='ctx'> #define AUX_IRQ_ACT_BIT_U	31</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * User space should be interruptable even by lowest prio interrupt</div><div class='del'>- * Safe even if actual interrupt priorities is fewer or even one</div><div class='add'>+ * Hardware supports 16 priorities (0 highest, 15 lowest)</div><div class='add'>+ * Linux by default runs at 1, priority 0 reserved for NMI style interrupts</div><div class='ctx'>  */</div><div class='del'>-#define ARCV2_IRQ_DEF_PRIO	15</div><div class='add'>+#define ARCV2_IRQ_DEF_PRIO	1</div><div class='ctx'> </div><div class='ctx'> /* seed value for status register */</div><div class='ctx'> #define ISA_INIT_STATUS_BITS	(STATUS_IE_MASK | STATUS_AD_MASK | \</div><div class='head'>diff --git a/arch/arc/include/asm/kprobes.h b/arch/arc/include/asm/kprobes.h<br/>index 944dbedb38b5..00bdbe167615 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/kprobes.h</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> #ifndef _ARC_KPROBES_H</div><div class='ctx'> #define _ARC_KPROBES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_KPROBES</div><div class='ctx'> </div><div class='ctx'> typedef u16 kprobe_opcode_t;</div><div class='hunk'>@@ -55,6 +57,6 @@ void trap_is_kprobe(unsigned long address, struct pt_regs *regs);</div><div class='ctx'> static void trap_is_kprobe(unsigned long address, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#endif /* _ARC_KPROBES_H */</div><div class='head'>diff --git a/arch/arc/include/asm/mcip.h b/arch/arc/include/asm/mcip.h<br/>deleted file mode 100644<br/>index c8fbe4114bad..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/mcip.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/mcip.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,107 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * ARConnect IP Support (Multi core enabler: Cross core IPI, RTC ...)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2014-15 Synopsys, Inc. (www.synopsys.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_MCIP_H</div><div class='del'>-#define __ASM_MCIP_H</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ISA_ARCV2</div><div class='del'>-</div><div class='del'>-#include &lt;asm/arcregs.h&gt;</div><div class='del'>-</div><div class='del'>-#define ARC_REG_MCIP_BCR	0x0d0</div><div class='del'>-#define ARC_REG_MCIP_CMD	0x600</div><div class='del'>-#define ARC_REG_MCIP_WDATA	0x601</div><div class='del'>-#define ARC_REG_MCIP_READBACK	0x602</div><div class='del'>-</div><div class='del'>-struct mcip_cmd {</div><div class='del'>-#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='del'>-	unsigned int pad:8, param:16, cmd:8;</div><div class='del'>-#else</div><div class='del'>-	unsigned int cmd:8, param:16, pad:8;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CMD_INTRPT_GENERATE_IRQ		0x01</div><div class='del'>-#define CMD_INTRPT_GENERATE_ACK		0x02</div><div class='del'>-#define CMD_INTRPT_READ_STATUS		0x03</div><div class='del'>-#define CMD_INTRPT_CHECK_SOURCE		0x04</div><div class='del'>-</div><div class='del'>-/* Semaphore Commands */</div><div class='del'>-#define CMD_SEMA_CLAIM_AND_READ		0x11</div><div class='del'>-#define CMD_SEMA_RELEASE		0x12</div><div class='del'>-</div><div class='del'>-#define CMD_DEBUG_SET_MASK		0x34</div><div class='del'>-#define CMD_DEBUG_SET_SELECT		0x36</div><div class='del'>-</div><div class='del'>-#define CMD_GFRC_READ_LO		0x42</div><div class='del'>-#define CMD_GFRC_READ_HI		0x43</div><div class='del'>-</div><div class='del'>-#define CMD_IDU_ENABLE			0x71</div><div class='del'>-#define CMD_IDU_DISABLE			0x72</div><div class='del'>-#define CMD_IDU_SET_MODE		0x74</div><div class='del'>-#define CMD_IDU_SET_DEST		0x76</div><div class='del'>-#define CMD_IDU_SET_MASK		0x7C</div><div class='del'>-</div><div class='del'>-#define IDU_M_TRIG_LEVEL		0x0</div><div class='del'>-#define IDU_M_TRIG_EDGE			0x1</div><div class='del'>-</div><div class='del'>-#define IDU_M_DISTRI_RR			0x0</div><div class='del'>-#define IDU_M_DISTRI_DEST		0x2</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mcip_bcr {</div><div class='del'>-#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='del'>-		unsigned int pad3:8,</div><div class='del'>-			     idu:1, llm:1, num_cores:6,</div><div class='del'>-			     iocoh:1,  gfrc:1, dbg:1, pad2:1,</div><div class='del'>-			     msg:1, sem:1, ipi:1, pad:1,</div><div class='del'>-			     ver:8;</div><div class='del'>-#else</div><div class='del'>-		unsigned int ver:8,</div><div class='del'>-			     pad:1, ipi:1, sem:1, msg:1,</div><div class='del'>-			     pad2:1, dbg:1, gfrc:1, iocoh:1,</div><div class='del'>-			     num_cores:6, llm:1, idu:1,</div><div class='del'>-			     pad3:8;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * MCIP programming model</div><div class='del'>- *</div><div class='del'>- * - Simple commands write {cmd:8,param:16} to MCIP_CMD aux reg</div><div class='del'>- *   (param could be irq, common_irq, core_id ...)</div><div class='del'>- * - More involved commands setup MCIP_WDATA with cmd specific data</div><div class='del'>- *   before invoking the simple command</div><div class='del'>- */</div><div class='del'>-static inline void __mcip_cmd(unsigned int cmd, unsigned int param)</div><div class='del'>-{</div><div class='del'>-	struct mcip_cmd buf;</div><div class='del'>-</div><div class='del'>-	buf.pad = 0;</div><div class='del'>-	buf.cmd = cmd;</div><div class='del'>-	buf.param = param;</div><div class='del'>-</div><div class='del'>-	WRITE_AUX(ARC_REG_MCIP_CMD, buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Setup additional data for a cmd</div><div class='del'>- * Callers need to lock to ensure atomicity</div><div class='del'>- */</div><div class='del'>-static inline void __mcip_cmd_data(unsigned int cmd, unsigned int param,</div><div class='del'>-				   unsigned int data)</div><div class='del'>-{</div><div class='del'>-	write_aux_reg(ARC_REG_MCIP_WDATA, data);</div><div class='del'>-</div><div class='del'>-	__mcip_cmd(cmd, param);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arc/include/asm/mmu_context.h b/arch/arc/include/asm/mmu_context.h<br/>index b0b87f2447f5..64b5ebae1ae8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/arcregs.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/include/asm/module.h b/arch/arc/include/asm/module.h<br/>index 6e91d8b339c3..567590ea8f6c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/module.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/module.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/module.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/module.h</a></div><div class='hunk'>@@ -14,13 +14,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/module.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARC_DW2_UNWIND</div><div class='ctx'> struct mod_arch_specific {</div><div class='add'>+#ifdef CONFIG_ARC_DW2_UNWIND</div><div class='ctx'> 	void *unw_info;</div><div class='ctx'> 	int unw_sec_idx;</div><div class='add'>+#endif</div><div class='ctx'> 	const char *secstr;</div><div class='ctx'> };</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #define MODULE_PROC_FAMILY "ARC700"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/include/asm/mutex.h b/arch/arc/include/asm/mutex.h<br/>deleted file mode 100644<br/>index a2f88ff9f506..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * xchg() based mutex fast path maintains a state of 0 or 1, as opposed to</div><div class='del'>- * atomic dec based which can "count" any number of lock contenders.</div><div class='del'>- * This ideally needs to be fixed in core, but for now switching to dec ver.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_SMP) &amp;&amp; (CONFIG_NR_CPUS &gt; 2)</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;asm-generic/mutex-xchg.h&gt;</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h<br/>index 16b630fbeb6a..6e1242da0159 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/processor.h</a></div><div class='hunk'>@@ -60,15 +60,12 @@ struct task_struct;</div><div class='ctx'> #ifndef CONFIG_EZNPS_MTM_EXT</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()		barrier()</div><div class='del'>-#define cpu_relax_lowlatency()	cpu_relax()</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()     \</div><div class='ctx'> 	__asm__ __volatile__ (".word %0" : : "i"(CTOP_INST_SCHD_RW) : "memory")</div><div class='ctx'> </div><div class='del'>-#define cpu_relax_lowlatency()	barrier()</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define copy_segments(tsk, mm)      do { } while (0)</div><div class='head'>diff --git a/arch/arc/include/asm/ptrace.h b/arch/arc/include/asm/ptrace.h<br/>index 69095da1fcfd..47111d565a95 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/ptrace.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/ptrace.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/ptrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/ptrace.h</a></div><div class='hunk'>@@ -84,7 +84,7 @@ struct pt_regs {</div><div class='ctx'> 	unsigned long fp;</div><div class='ctx'> 	unsigned long sp;	/* user/kernel sp depending on where we came from  */</div><div class='ctx'> </div><div class='del'>-	unsigned long r12;</div><div class='add'>+	unsigned long r12, r30;</div><div class='ctx'> </div><div class='ctx'> 	/*------- Below list auto saved by h/w -----------*/</div><div class='ctx'> 	unsigned long r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11;</div><div class='head'>diff --git a/arch/arc/include/asm/setup.h b/arch/arc/include/asm/setup.h<br/>index cb954cdab070..c568a9df82b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/include/asm/setup.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/include/asm/setup.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/include/asm/setup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/include/asm/setup.h</a></div><div class='hunk'>@@ -31,6 +31,7 @@ extern int root_mountflags, end_mem;</div><div class='ctx'> </div><div class='ctx'> void setup_processor(void);</div><div class='ctx'> void __init setup_arch_memory(void);</div><div class='add'>+long __init arc_get_mem_sz(void);</div><div class='ctx'> </div><div class='ctx'> /* Helpers used in arc_*_mumbojumbo routines */</div><div class='ctx'> #define IS_AVAIL1(v, s)		((v) ? s : "")</div><div class='head'>diff --git a/arch/arc/kernel/Makefile b/arch/arc/kernel/Makefile<br/>index cfcdedf52ff8..8942c5c3b4c5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/Makefile</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> # Pass UTS_MACHINE for user_regset definition</div><div class='ctx'> CFLAGS_ptrace.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'</div><div class='ctx'> </div><div class='del'>-obj-y	:= arcksyms.o setup.o irq.o time.o reset.o ptrace.o process.o devtree.o</div><div class='add'>+obj-y	:= arcksyms.o setup.o irq.o reset.o ptrace.o process.o devtree.o</div><div class='ctx'> obj-y	+= signal.o traps.o sys.o troubleshoot.o stacktrace.o disasm.o</div><div class='ctx'> obj-$(CONFIG_ISA_ARCOMPACT)		+= entry-compact.o intc-compact.o</div><div class='ctx'> obj-$(CONFIG_ISA_ARCV2)			+= entry-arcv2.o intc-arcv2.o</div><div class='head'>diff --git a/arch/arc/kernel/ctx_sw.c b/arch/arc/kernel/ctx_sw.c<br/>index 6f4cb0dab1b9..9e1ae9d41925 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/ctx_sw.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/ctx_sw.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/ctx_sw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/ctx_sw.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #ifdef CONFIG_ARC_PLAT_EZNPS</div><div class='ctx'> #include &lt;plat/ctop.h&gt;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arc/kernel/entry-arcv2.S b/arch/arc/kernel/entry-arcv2.S<br/>index 7a1c124ff021..2585632eaa68 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/entry-arcv2.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/entry-arcv2.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/entry-arcv2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/entry-arcv2.S</a></div><div class='hunk'>@@ -14,6 +14,11 @@</div><div class='ctx'> #include &lt;asm/arcregs.h&gt;</div><div class='ctx'> #include &lt;asm/irqflags.h&gt;</div><div class='ctx'> </div><div class='add'>+; A maximum number of supported interrupts in the core interrupt controller.</div><div class='add'>+; This number is not equal to the maximum interrupt number (256) because</div><div class='add'>+; first 16 lines are reserved for exceptions and are not configurable.</div><div class='add'>+#define NR_CPU_IRQS	240</div><div class='add'>+</div><div class='ctx'> 	.cpu HS</div><div class='ctx'> </div><div class='ctx'> #define VECTOR	.word</div><div class='hunk'>@@ -52,7 +57,7 @@ VECTOR	handle_interrupt	; unused</div><div class='ctx'> VECTOR	handle_interrupt	; (23) unused</div><div class='ctx'> # End of fixed IRQs</div><div class='ctx'> </div><div class='del'>-.rept CONFIG_ARC_NUMBER_OF_INTERRUPTS - 8</div><div class='add'>+.rept NR_CPU_IRQS - 8</div><div class='ctx'> 	VECTOR	handle_interrupt</div><div class='ctx'> .endr</div><div class='ctx'> </div><div class='hunk'>@@ -67,12 +72,23 @@ ENTRY(handle_interrupt)</div><div class='ctx'> </div><div class='ctx'> 	INTERRUPT_PROLOGUE  irq</div><div class='ctx'> </div><div class='del'>-	clri		; To make status32.IE agree with CPU internal state</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='del'>-	TRACE_ASM_IRQ_DISABLE</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+	# irq control APIs local_irq_save/restore/disable/enable fiddle with</div><div class='add'>+	# global interrupt enable bits in STATUS32 (.IE for 1 prio, .E[] for 2 prio)</div><div class='add'>+	# However a taken interrupt doesn't clear these bits. Thus irqs_disabled()</div><div class='add'>+	# query in hard ISR path would return false (since .IE is set) which would</div><div class='add'>+	# trips genirq interrupt handling asserts.</div><div class='add'>+	#</div><div class='add'>+	# So do a "soft" disable of interrutps here.</div><div class='add'>+	#</div><div class='add'>+	# Note this disable is only for consistent book-keeping as further interrupts</div><div class='add'>+	# will be disabled anyways even w/o this. Hardware tracks active interrupts</div><div class='add'>+	# seperately in AUX_IRQ_ACTIVE.active and will not take new interrupts</div><div class='add'>+	# unless this one returns (or higher prio becomes pending in 2-prio scheme)</div><div class='add'>+</div><div class='add'>+	IRQ_DISABLE</div><div class='add'>+</div><div class='add'>+	; icause is banked: one per priority level</div><div class='add'>+	; so a higher prio interrupt taken here won't clobber prev prio icause</div><div class='ctx'> 	lr  r0, [ICAUSE]</div><div class='ctx'> 	mov   blink, ret_from_exception</div><div class='ctx'> </div><div class='hunk'>@@ -171,6 +187,7 @@ END(EV_TLBProtV)</div><div class='ctx'> ; All 2 entry points to here already disable interrupts</div><div class='ctx'> </div><div class='ctx'> .Lrestore_regs:</div><div class='add'>+restore_regs:</div><div class='ctx'> </div><div class='ctx'> 	# Interrpts are actually disabled from this point on, but will get</div><div class='ctx'> 	# reenabled after we return from interrupt/exception.</div><div class='head'>diff --git a/arch/arc/kernel/entry-compact.S b/arch/arc/kernel/entry-compact.S<br/>index 98812c1248df..9211707634dc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/entry-compact.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/entry-compact.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/entry-compact.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/entry-compact.S</a></div><div class='hunk'>@@ -259,7 +259,7 @@ ENTRY(EV_TLBProtV)</div><div class='ctx'> </div><div class='ctx'> 	EXCEPTION_PROLOGUE</div><div class='ctx'> </div><div class='del'>-	lr  r2, [ecr]</div><div class='add'>+	mov r2, r9	; ECR set into r9 already</div><div class='ctx'> 	lr  r0, [efa]	; Faulting Data address (not part of pt_regs saved above)</div><div class='ctx'> </div><div class='ctx'> 	; Exception auto-disables further Intr/exceptions.</div><div class='head'>diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S<br/>index 689dd867fdff..8b90d25a15cc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/head.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/head.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/head.S</a></div><div class='hunk'>@@ -71,14 +71,14 @@ ENTRY(stext)</div><div class='ctx'> 	GET_CPU_ID  r5</div><div class='ctx'> 	cmp	r5, 0</div><div class='ctx'> 	mov.nz	r0, r5</div><div class='del'>-#ifdef CONFIG_ARC_SMP_HALT_ON_RESET</div><div class='del'>-	; Non-Master can proceed as system would be booted sufficiently</div><div class='del'>-	jnz	first_lines_of_secondary</div><div class='del'>-#else</div><div class='add'>+	bz	.Lmaster_proceed</div><div class='add'>+</div><div class='ctx'> 	; Non-Masters wait for Master to boot enough and bring them up</div><div class='del'>-	jnz	arc_platform_smp_wait_to_boot</div><div class='del'>-#endif</div><div class='del'>-	; Master falls thru</div><div class='add'>+	; when they resume, tail-call to entry point</div><div class='add'>+	mov	blink, @first_lines_of_secondary</div><div class='add'>+	j	arc_platform_smp_wait_to_boot</div><div class='add'>+</div><div class='add'>+.Lmaster_proceed:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	; Clear BSS before updating any globals</div><div class='head'>diff --git a/arch/arc/kernel/intc-arcv2.c b/arch/arc/kernel/intc-arcv2.c<br/>index 62b59409a5d9..f928795fd07a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/intc-arcv2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/intc-arcv2.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/intc-arcv2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/intc-arcv2.c</a></div><div class='hunk'>@@ -14,7 +14,15 @@</div><div class='ctx'> #include &lt;linux/irqchip.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-static int irq_prio;</div><div class='add'>+#define NR_EXCEPTIONS	16</div><div class='add'>+</div><div class='add'>+struct bcr_irq_arcv2 {</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+	unsigned int pad:3, firq:1, prio:4, exts:8, irqs:8, ver:8;</div><div class='add'>+#else</div><div class='add'>+	unsigned int ver:8, irqs:8, exts:8, prio:4, firq:1, pad:3;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Early Hardware specific Interrupt setup</div><div class='hunk'>@@ -24,15 +32,8 @@ static int irq_prio;</div><div class='ctx'>  */</div><div class='ctx'> void arc_init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int tmp;</div><div class='del'>-</div><div class='del'>-	struct irq_build {</div><div class='del'>-#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='del'>-		unsigned int pad:3, firq:1, prio:4, exts:8, irqs:8, ver:8;</div><div class='del'>-#else</div><div class='del'>-		unsigned int ver:8, irqs:8, exts:8, prio:4, firq:1, pad:3;</div><div class='del'>-#endif</div><div class='del'>-	} irq_bcr;</div><div class='add'>+	unsigned int tmp, irq_prio, i;</div><div class='add'>+	struct bcr_irq_arcv2 irq_bcr;</div><div class='ctx'> </div><div class='ctx'> 	struct aux_irq_ctrl {</div><div class='ctx'> #ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='hunk'>@@ -67,33 +68,43 @@ void arc_init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	irq_prio = irq_bcr.prio;	/* Encoded as N-1 for N levels */</div><div class='ctx'> 	pr_info("archs-intc\t: %d priority levels (default %d)%s\n",</div><div class='del'>-		irq_prio + 1, irq_prio,</div><div class='add'>+		irq_prio + 1, ARCV2_IRQ_DEF_PRIO,</div><div class='ctx'> 		irq_bcr.firq ? " FIRQ (not used)":"");</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Set a default priority for all available interrupts to prevent</div><div class='add'>+	 * switching of register banks if Fast IRQ and multiple register banks</div><div class='add'>+	 * are supported by CPU.</div><div class='add'>+	 */</div><div class='add'>+	for (i = NR_EXCEPTIONS; i &lt; irq_bcr.irqs + NR_EXCEPTIONS; i++) {</div><div class='add'>+		write_aux_reg(AUX_IRQ_SELECT, i);</div><div class='add'>+		write_aux_reg(AUX_IRQ_PRIORITY, ARCV2_IRQ_DEF_PRIO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* setup status32, don't enable intr yet as kernel doesn't want */</div><div class='del'>-	tmp = read_aux_reg(0xa);</div><div class='del'>-	tmp |= STATUS_AD_MASK | (irq_prio &lt;&lt; 1);</div><div class='add'>+	tmp = read_aux_reg(ARC_REG_STATUS32);</div><div class='add'>+	tmp |= STATUS_AD_MASK | (ARCV2_IRQ_DEF_PRIO &lt;&lt; 1);</div><div class='ctx'> 	tmp &amp;= ~STATUS_IE_MASK;</div><div class='ctx'> 	asm volatile("kflag %0	\n"::"r"(tmp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void arcv2_irq_mask(struct irq_data *data)</div><div class='ctx'> {</div><div class='del'>-	write_aux_reg(AUX_IRQ_SELECT, data-&gt;irq);</div><div class='add'>+	write_aux_reg(AUX_IRQ_SELECT, data-&gt;hwirq);</div><div class='ctx'> 	write_aux_reg(AUX_IRQ_ENABLE, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void arcv2_irq_unmask(struct irq_data *data)</div><div class='ctx'> {</div><div class='del'>-	write_aux_reg(AUX_IRQ_SELECT, data-&gt;irq);</div><div class='add'>+	write_aux_reg(AUX_IRQ_SELECT, data-&gt;hwirq);</div><div class='ctx'> 	write_aux_reg(AUX_IRQ_ENABLE, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void arcv2_irq_enable(struct irq_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	/* set default priority */</div><div class='del'>-	write_aux_reg(AUX_IRQ_SELECT, data-&gt;irq);</div><div class='del'>-	write_aux_reg(AUX_IRQ_PRIORITY, irq_prio);</div><div class='add'>+	write_aux_reg(AUX_IRQ_SELECT, data-&gt;hwirq);</div><div class='add'>+	write_aux_reg(AUX_IRQ_PRIORITY, ARCV2_IRQ_DEF_PRIO);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * hw auto enables (linux unmask) all by default</div><div class='hunk'>@@ -117,7 +128,7 @@ static int arcv2_irq_map(struct irq_domain *d, unsigned int irq,</div><div class='ctx'> 	 * core intc IRQs [16, 23]:</div><div class='ctx'> 	 * Statically assigned always private-per-core (Timers, WDT, IPI, PCT)</div><div class='ctx'> 	 */</div><div class='del'>-	if (hw &lt; 24) {</div><div class='add'>+	if (hw &lt; FIRST_EXT_IRQ) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * A subsequent request_percpu_irq() fails if percpu_devid is</div><div class='ctx'> 		 * not set. That in turns sets NOAUTOEN, meaning each core needs</div><div class='hunk'>@@ -142,11 +153,16 @@ static int __init</div><div class='ctx'> init_onchip_IRQ(struct device_node *intc, struct device_node *parent)</div><div class='ctx'> {</div><div class='ctx'> 	struct irq_domain *root_domain;</div><div class='add'>+	struct bcr_irq_arcv2 irq_bcr;</div><div class='add'>+	unsigned int nr_cpu_irqs;</div><div class='add'>+</div><div class='add'>+	READ_BCR(ARC_REG_IRQ_BCR, irq_bcr);</div><div class='add'>+	nr_cpu_irqs = irq_bcr.irqs + NR_EXCEPTIONS;</div><div class='ctx'> </div><div class='ctx'> 	if (parent)</div><div class='ctx'> 		panic("DeviceTree incore intc not a root irq controller\n");</div><div class='ctx'> </div><div class='del'>-	root_domain = irq_domain_add_linear(intc, NR_CPU_IRQS, &amp;arcv2_irq_ops, NULL);</div><div class='add'>+	root_domain = irq_domain_add_linear(intc, nr_cpu_irqs, &amp;arcv2_irq_ops, NULL);</div><div class='ctx'> 	if (!root_domain)</div><div class='ctx'> 		panic("root irq domain not avail\n");</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/kernel/intc-compact.c b/arch/arc/kernel/intc-compact.c<br/>index ce9deb953ca9..7e608c6b0a01 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/intc-compact.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/intc-compact.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/intc-compact.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/intc-compact.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/irqchip.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#define NR_CPU_IRQS	32	/* number of irq lines coming in */</div><div class='ctx'> #define TIMER0_IRQ	3	/* Fixed by ISA */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -57,7 +58,7 @@ static void arc_irq_mask(struct irq_data *data)</div><div class='ctx'> 	unsigned int ienb;</div><div class='ctx'> </div><div class='ctx'> 	ienb = read_aux_reg(AUX_IENABLE);</div><div class='del'>-	ienb &amp;= ~(1 &lt;&lt; data-&gt;irq);</div><div class='add'>+	ienb &amp;= ~(1 &lt;&lt; data-&gt;hwirq);</div><div class='ctx'> 	write_aux_reg(AUX_IENABLE, ienb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -66,7 +67,7 @@ static void arc_irq_unmask(struct irq_data *data)</div><div class='ctx'> 	unsigned int ienb;</div><div class='ctx'> </div><div class='ctx'> 	ienb = read_aux_reg(AUX_IENABLE);</div><div class='del'>-	ienb |= (1 &lt;&lt; data-&gt;irq);</div><div class='add'>+	ienb |= (1 &lt;&lt; data-&gt;hwirq);</div><div class='ctx'> 	write_aux_reg(AUX_IENABLE, ienb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/kernel/kgdb.c b/arch/arc/kernel/kgdb.c<br/>index ecf6a7869375..9a3c34af2ae8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/kgdb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/kgdb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/kgdb.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kgdb.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;asm/disasm.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c<br/>index f39142acc89e..f61a52b01625 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/mcip.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/mcip.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/mcip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/mcip.c</a></div><div class='hunk'>@@ -10,9 +10,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/irqchip/chained_irq.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;soc/arc/mcip.h&gt;</div><div class='ctx'> #include &lt;asm/irqflags-arcv2.h&gt;</div><div class='del'>-#include &lt;asm/mcip.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_RAW_SPINLOCK(mcip_lock);</div><div class='hunk'>@@ -92,11 +93,10 @@ static void mcip_probe_n_setup(void)</div><div class='ctx'> 	READ_BCR(ARC_REG_MCIP_BCR, mp);</div><div class='ctx'> </div><div class='ctx'> 	sprintf(smp_cpuinfo_buf,</div><div class='del'>-		"Extn [SMP]\t: ARConnect (v%d): %d cores with %s%s%s%s%s\n",</div><div class='add'>+		"Extn [SMP]\t: ARConnect (v%d): %d cores with %s%s%s%s\n",</div><div class='ctx'> 		mp.ver, mp.num_cores,</div><div class='ctx'> 		IS_AVAIL1(mp.ipi, "IPI "),</div><div class='ctx'> 		IS_AVAIL1(mp.idu, "IDU "),</div><div class='del'>-		IS_AVAIL1(mp.llm, "LLM "),</div><div class='ctx'> 		IS_AVAIL1(mp.dbg, "DEBUG "),</div><div class='ctx'> 		IS_AVAIL1(mp.gfrc, "GFRC"));</div><div class='ctx'> </div><div class='hunk'>@@ -156,15 +156,20 @@ static void idu_set_mode(unsigned int cmn_irq, unsigned int lvl,</div><div class='ctx'> 	__mcip_cmd_data(CMD_IDU_SET_MODE, cmn_irq, data.word);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void idu_irq_mask(struct irq_data *data)</div><div class='add'>+static void idu_irq_mask_raw(irq_hw_number_t hwirq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	raw_spin_lock_irqsave(&amp;mcip_lock, flags);</div><div class='del'>-	__mcip_cmd_data(CMD_IDU_SET_MASK, data-&gt;hwirq, 1);</div><div class='add'>+	__mcip_cmd_data(CMD_IDU_SET_MASK, hwirq, 1);</div><div class='ctx'> 	raw_spin_unlock_irqrestore(&amp;mcip_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void idu_irq_mask(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	idu_irq_mask_raw(data-&gt;hwirq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void idu_irq_unmask(struct irq_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -174,7 +179,6 @@ static void idu_irq_unmask(struct irq_data *data)</div><div class='ctx'> 	raw_spin_unlock_irqrestore(&amp;mcip_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> static int</div><div class='ctx'> idu_irq_set_affinity(struct irq_data *data, const struct cpumask *cpumask,</div><div class='ctx'> 		     bool force)</div><div class='hunk'>@@ -204,27 +208,43 @@ idu_irq_set_affinity(struct irq_data *data, const struct cpumask *cpumask,</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_SET_MASK_OK;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+static void idu_irq_enable(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * By default send all common interrupts to all available online CPUs.</div><div class='add'>+	 * The affinity of common interrupts in IDU must be set manually since</div><div class='add'>+	 * in some cases the kernel will not call irq_set_affinity() by itself:</div><div class='add'>+	 *   1. When the kernel is not configured with support of SMP.</div><div class='add'>+	 *   2. When the kernel is configured with support of SMP but upper</div><div class='add'>+	 *      interrupt controllers does not support setting of the affinity</div><div class='add'>+	 *      and cannot propagate it to IDU.</div><div class='add'>+	 */</div><div class='add'>+	idu_irq_set_affinity(data, cpu_online_mask, false);</div><div class='add'>+	idu_irq_unmask(data);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static struct irq_chip idu_irq_chip = {</div><div class='ctx'> 	.name			= "MCIP IDU Intc",</div><div class='ctx'> 	.irq_mask		= idu_irq_mask,</div><div class='ctx'> 	.irq_unmask		= idu_irq_unmask,</div><div class='add'>+	.irq_enable		= idu_irq_enable,</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	.irq_set_affinity       = idu_irq_set_affinity,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static irq_hw_number_t idu_first_hwirq;</div><div class='del'>-</div><div class='ctx'> static void idu_cascade_isr(struct irq_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct irq_domain *idu_domain = irq_desc_get_handler_data(desc);</div><div class='add'>+	struct irq_chip *core_chip = irq_desc_get_chip(desc);</div><div class='ctx'> 	irq_hw_number_t core_hwirq = irqd_to_hwirq(irq_desc_get_irq_data(desc));</div><div class='del'>-	irq_hw_number_t idu_hwirq = core_hwirq - idu_first_hwirq;</div><div class='add'>+	irq_hw_number_t idu_hwirq = core_hwirq - FIRST_EXT_IRQ;</div><div class='ctx'> </div><div class='add'>+	chained_irq_enter(core_chip, desc);</div><div class='ctx'> 	generic_handle_irq(irq_find_mapping(idu_domain, idu_hwirq));</div><div class='add'>+	chained_irq_exit(core_chip, desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int idu_irq_map(struct irq_domain *d, unsigned int virq, irq_hw_number_t hwirq)</div><div class='hunk'>@@ -235,45 +255,8 @@ static int idu_irq_map(struct irq_domain *d, unsigned int virq, irq_hw_number_t</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int idu_irq_xlate(struct irq_domain *d, struct device_node *n,</div><div class='del'>-			 const u32 *intspec, unsigned int intsize,</div><div class='del'>-			 irq_hw_number_t *out_hwirq, unsigned int *out_type)</div><div class='del'>-{</div><div class='del'>-	irq_hw_number_t hwirq = *out_hwirq = intspec[0];</div><div class='del'>-	int distri = intspec[1];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	*out_type = IRQ_TYPE_NONE;</div><div class='del'>-</div><div class='del'>-	/* XXX: validate distribution scheme again online cpu mask */</div><div class='del'>-	if (distri == 0) {</div><div class='del'>-		/* 0 - Round Robin to all cpus, otherwise 1 bit per core */</div><div class='del'>-		raw_spin_lock_irqsave(&amp;mcip_lock, flags);</div><div class='del'>-		idu_set_dest(hwirq, BIT(num_online_cpus()) - 1);</div><div class='del'>-		idu_set_mode(hwirq, IDU_M_TRIG_LEVEL, IDU_M_DISTRI_RR);</div><div class='del'>-		raw_spin_unlock_irqrestore(&amp;mcip_lock, flags);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * DEST based distribution for Level Triggered intr can only</div><div class='del'>-		 * have 1 CPU, so generalize it to always contain 1 cpu</div><div class='del'>-		 */</div><div class='del'>-		int cpu = ffs(distri);</div><div class='del'>-</div><div class='del'>-		if (cpu != fls(distri))</div><div class='del'>-			pr_warn("IDU irq %lx distri mode set to cpu %x\n",</div><div class='del'>-				hwirq, cpu);</div><div class='del'>-</div><div class='del'>-		raw_spin_lock_irqsave(&amp;mcip_lock, flags);</div><div class='del'>-		idu_set_dest(hwirq, cpu);</div><div class='del'>-		idu_set_mode(hwirq, IDU_M_TRIG_LEVEL, IDU_M_DISTRI_DEST);</div><div class='del'>-		raw_spin_unlock_irqrestore(&amp;mcip_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct irq_domain_ops idu_irq_ops = {</div><div class='del'>-	.xlate	= idu_irq_xlate,</div><div class='add'>+	.xlate	= irq_domain_xlate_onecell,</div><div class='ctx'> 	.map	= idu_irq_map,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -288,33 +271,37 @@ static int __init</div><div class='ctx'> idu_of_init(struct device_node *intc, struct device_node *parent)</div><div class='ctx'> {</div><div class='ctx'> 	struct irq_domain *domain;</div><div class='del'>-	/* Read IDU BCR to confirm nr_irqs */</div><div class='del'>-	int nr_irqs = of_irq_count(intc);</div><div class='add'>+	int nr_irqs;</div><div class='ctx'> 	int i, virq;</div><div class='ctx'> 	struct mcip_bcr mp;</div><div class='add'>+	struct mcip_idu_bcr idu_bcr;</div><div class='ctx'> </div><div class='ctx'> 	READ_BCR(ARC_REG_MCIP_BCR, mp);</div><div class='ctx'> </div><div class='ctx'> 	if (!mp.idu)</div><div class='ctx'> 		panic("IDU not detected, but DeviceTree using it");</div><div class='ctx'> </div><div class='del'>-	pr_info("MCIP: IDU referenced from Devicetree %d irqs\n", nr_irqs);</div><div class='add'>+	READ_BCR(ARC_REG_MCIP_IDU_BCR, idu_bcr);</div><div class='add'>+	nr_irqs = mcip_idu_bcr_to_nr_irqs(idu_bcr);</div><div class='add'>+</div><div class='add'>+	pr_info("MCIP: IDU supports %u common irqs\n", nr_irqs);</div><div class='ctx'> </div><div class='ctx'> 	domain = irq_domain_add_linear(intc, nr_irqs, &amp;idu_irq_ops, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Parent interrupts (core-intc) are already mapped */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_irqs; i++) {</div><div class='add'>+		/* Mask all common interrupts by default */</div><div class='add'>+		idu_irq_mask_raw(i);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Return parent uplink IRQs (towards core intc) 24,25,.....</div><div class='ctx'> 		 * this step has been done before already</div><div class='ctx'> 		 * however we need it to get the parent virq and set IDU handler</div><div class='ctx'> 		 * as first level isr</div><div class='ctx'> 		 */</div><div class='del'>-		virq = irq_of_parse_and_map(intc, i);</div><div class='del'>-		if (!i)</div><div class='del'>-			idu_first_hwirq = irqd_to_hwirq(irq_get_irq_data(virq));</div><div class='del'>-</div><div class='add'>+		virq = irq_create_mapping(NULL, i + FIRST_EXT_IRQ);</div><div class='add'>+		BUG_ON(!virq);</div><div class='ctx'> 		irq_set_chained_handler_and_data(virq, idu_cascade_isr, domain);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/kernel/module.c b/arch/arc/kernel/module.c<br/>index 42e964db2967..3d99a6091332 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/module.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/module.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/module.c</a></div><div class='hunk'>@@ -32,8 +32,8 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,</div><div class='ctx'> #ifdef CONFIG_ARC_DW2_UNWIND</div><div class='ctx'> 	mod-&gt;arch.unw_sec_idx = 0;</div><div class='ctx'> 	mod-&gt;arch.unw_info = NULL;</div><div class='del'>-	mod-&gt;arch.secstr = secstr;</div><div class='ctx'> #endif</div><div class='add'>+	mod-&gt;arch.secstr = secstr;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -113,8 +113,10 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARC_DW2_UNWIND</div><div class='ctx'> 	if (strcmp(module-&gt;arch.secstr+sechdrs[tgtsec].sh_name, ".eh_frame") == 0)</div><div class='ctx'> 		module-&gt;arch.unw_sec_idx = tgtsec;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/kernel/process.c b/arch/arc/kernel/process.c<br/>index a41a79a4f4fe..2a018de6d6cd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/process.c</a></div><div class='hunk'>@@ -11,6 +11,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='head'>diff --git a/arch/arc/kernel/ptrace.c b/arch/arc/kernel/ptrace.c<br/>index 4442204fe238..31150060d38b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/ptrace.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/regset.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='head'>diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c<br/>index 0385df77a697..3093fa898a23 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/setup.c</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/root_dev.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='hunk'>@@ -234,11 +236,11 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)</div><div class='ctx'> 		       is_isa_arcompact() ? "ARCompact" : "ARCv2",</div><div class='ctx'> 		       IS_AVAIL1(cpu-&gt;isa.be, "[Big-Endian]"));</div><div class='ctx'> </div><div class='del'>-	n += scnprintf(buf + n, len - n, "Timers\t\t: %s%s%s%s\nISA Extn\t: ",</div><div class='add'>+	n += scnprintf(buf + n, len - n, "Timers\t\t: %s%s%s%s%s%s\nISA Extn\t: ",</div><div class='ctx'> 		       IS_AVAIL1(cpu-&gt;extn.timer0, "Timer0 "),</div><div class='ctx'> 		       IS_AVAIL1(cpu-&gt;extn.timer1, "Timer1 "),</div><div class='del'>-		       IS_AVAIL2(cpu-&gt;extn.rtc, "Local-64-bit-Ctr ",</div><div class='del'>-				 CONFIG_ARC_HAS_RTC));</div><div class='add'>+		       IS_AVAIL2(cpu-&gt;extn.rtc, "RTC [UP 64-bit] ", CONFIG_ARC_TIMERS_64BIT),</div><div class='add'>+		       IS_AVAIL2(cpu-&gt;extn.gfrc, "GFRC [SMP 64-bit] ", CONFIG_ARC_TIMERS_64BIT));</div><div class='ctx'> </div><div class='ctx'> 	n += i = scnprintf(buf + n, len - n, "%s%s%s%s%s",</div><div class='ctx'> 			   IS_AVAIL2(cpu-&gt;isa.atomic, "atomic ", CONFIG_ARC_HAS_LLSC),</div><div class='hunk'>@@ -449,6 +451,15 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	arc_unwind_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Called from start_kernel() - boot CPU only</div><div class='add'>+ */</div><div class='add'>+void __init time_init(void)</div><div class='add'>+{</div><div class='add'>+	of_clk_init(NULL);</div><div class='add'>+	clocksource_probe();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init customize_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (machine_desc-&gt;init_machine)</div><div class='head'>diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c<br/>index d347bbc086fe..48685445002e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/signal.c</a></div><div class='hunk'>@@ -53,6 +53,8 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct rt_sigframe {</div><div class='head'>diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c<br/>index 88674d972c9d..f46267153ec2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/smp.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -90,22 +90,37 @@ void __init smp_cpus_done(unsigned int max_cpus)</div><div class='ctx'>  */</div><div class='ctx'> static volatile int wake_flag;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ISA_ARCOMPACT</div><div class='add'>+</div><div class='add'>+#define __boot_read(f)		f</div><div class='add'>+#define __boot_write(f, v)	f = v</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define __boot_read(f)		arc_read_uncached_32(&amp;f)</div><div class='add'>+#define __boot_write(f, v)	arc_write_uncached_32(&amp;f, v)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void arc_default_smp_cpu_kick(int cpu, unsigned long pc)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(cpu == 0);</div><div class='del'>-	wake_flag = cpu;</div><div class='add'>+</div><div class='add'>+	__boot_write(wake_flag, cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void arc_platform_smp_wait_to_boot(int cpu)</div><div class='ctx'> {</div><div class='del'>-	while (wake_flag != cpu)</div><div class='add'>+	/* for halt-on-reset, we've waited already */</div><div class='add'>+	if (IS_ENABLED(CONFIG_ARC_SMP_HALT_ON_RESET))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while (__boot_read(wake_flag) != cpu)</div><div class='ctx'> 		;</div><div class='ctx'> </div><div class='del'>-	wake_flag = 0;</div><div class='del'>-	__asm__ __volatile__("j @first_lines_of_secondary	\n");</div><div class='add'>+	__boot_write(wake_flag, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> const char *arc_platform_smp_cpuinfo(void)</div><div class='ctx'> {</div><div class='ctx'> 	return plat_smp_ops.info ? : "";</div><div class='hunk'>@@ -124,8 +139,8 @@ void start_kernel_secondary(void)</div><div class='ctx'> 	/* MMU, Caches, Vector Table, Interrupts etc */</div><div class='ctx'> 	setup_processor();</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_users);</div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_count);</div><div class='add'>+	mmget(mm);</div><div class='add'>+	mmgrab(mm);</div><div class='ctx'> 	current-&gt;active_mm = mm;</div><div class='ctx'> 	cpumask_set_cpu(cpu, mm_cpumask(mm));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/kernel/stacktrace.c b/arch/arc/kernel/stacktrace.c<br/>index b9192a653b7e..74315f302971 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/stacktrace.c</a></div><div class='hunk'>@@ -28,6 +28,8 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/arcregs.h&gt;</div><div class='ctx'> #include &lt;asm/unwind.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='head'>diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c<br/>deleted file mode 100644<br/>index c10390d1ddb6..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/time.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,382 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * vineetg: Jan 1011</div><div class='del'>- *  -sched_clock( ) no longer jiffies based. Uses the same clocksource</div><div class='del'>- *   as gtod</div><div class='del'>- *</div><div class='del'>- * Rajeshwarr/Vineetg: Mar 2008</div><div class='del'>- *  -Implemented CONFIG_GENERIC_TIME (rather deleted arch specific code)</div><div class='del'>- *   for arch independent gettimeofday()</div><div class='del'>- *  -Implemented CONFIG_GENERIC_CLOCKEVENTS as base for hrtimers</div><div class='del'>- *</div><div class='del'>- * Vineetg: Mar 2008: Forked off from time.c which now is time-jiff.c</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* ARC700 has two 32bit independent prog Timers: TIMER0 and TIMER1</div><div class='del'>- * Each can programmed to go from @count to @limit and optionally</div><div class='del'>- * interrupt when that happens.</div><div class='del'>- * A write to Control Register clears the Interrupt</div><div class='del'>- *</div><div class='del'>- * We've designated TIMER0 for events (clockevents)</div><div class='del'>- * while TIMER1 for free running (clocksource)</div><div class='del'>- *</div><div class='del'>- * Newer ARC700 cores have 64bit clk fetching RTSC insn, preferred over TIMER1</div><div class='del'>- * which however is currently broken</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/clk-provider.h&gt;</div><div class='del'>-#include &lt;linux/clocksource.h&gt;</div><div class='del'>-#include &lt;linux/clockchips.h&gt;</div><div class='del'>-#include &lt;linux/cpu.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_irq.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/arcregs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mcip.h&gt;</div><div class='del'>-</div><div class='del'>-/* Timer related Aux registers */</div><div class='del'>-#define ARC_REG_TIMER0_LIMIT	0x23	/* timer 0 limit */</div><div class='del'>-#define ARC_REG_TIMER0_CTRL	0x22	/* timer 0 control */</div><div class='del'>-#define ARC_REG_TIMER0_CNT	0x21	/* timer 0 count */</div><div class='del'>-#define ARC_REG_TIMER1_LIMIT	0x102	/* timer 1 limit */</div><div class='del'>-#define ARC_REG_TIMER1_CTRL	0x101	/* timer 1 control */</div><div class='del'>-#define ARC_REG_TIMER1_CNT	0x100	/* timer 1 count */</div><div class='del'>-</div><div class='del'>-#define TIMER_CTRL_IE	(1 &lt;&lt; 0) /* Interrupt when Count reaches limit */</div><div class='del'>-#define TIMER_CTRL_NH	(1 &lt;&lt; 1) /* Count only when CPU NOT halted */</div><div class='del'>-</div><div class='del'>-#define ARC_TIMER_MAX	0xFFFFFFFF</div><div class='del'>-</div><div class='del'>-static unsigned long arc_timer_freq;</div><div class='del'>-</div><div class='del'>-static int noinline arc_get_timer_clk(struct device_node *node)</div><div class='del'>-{</div><div class='del'>-	struct clk *clk;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	clk = of_clk_get(node, 0);</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		pr_err("timer missing clk");</div><div class='del'>-		return PTR_ERR(clk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = clk_prepare_enable(clk);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("Couldn't enable parent clk\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	arc_timer_freq = clk_get_rate(clk);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********** Clock Source Device *********/</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARC_HAS_GFRC</div><div class='del'>-</div><div class='del'>-static cycle_t arc_read_gfrc(struct clocksource *cs)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	union {</div><div class='del'>-#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='del'>-		struct { u32 h, l; };</div><div class='del'>-#else</div><div class='del'>-		struct { u32 l, h; };</div><div class='del'>-#endif</div><div class='del'>-		cycle_t  full;</div><div class='del'>-	} stamp;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	__mcip_cmd(CMD_GFRC_READ_LO, 0);</div><div class='del'>-	stamp.l = read_aux_reg(ARC_REG_MCIP_READBACK);</div><div class='del'>-</div><div class='del'>-	__mcip_cmd(CMD_GFRC_READ_HI, 0);</div><div class='del'>-	stamp.h = read_aux_reg(ARC_REG_MCIP_READBACK);</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	return stamp.full;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct clocksource arc_counter_gfrc = {</div><div class='del'>-	.name   = "ARConnect GFRC",</div><div class='del'>-	.rating = 400,</div><div class='del'>-	.read   = arc_read_gfrc,</div><div class='del'>-	.mask   = CLOCKSOURCE_MASK(64),</div><div class='del'>-	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init arc_cs_setup_gfrc(struct device_node *node)</div><div class='del'>-{</div><div class='del'>-	int exists = cpuinfo_arc700[0].extn.gfrc;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (WARN(!exists, "Global-64-bit-Ctr clocksource not detected"))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	ret = arc_get_timer_clk(node);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return clocksource_register_hz(&amp;arc_counter_gfrc, arc_timer_freq);</div><div class='del'>-}</div><div class='del'>-CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARC_HAS_RTC</div><div class='del'>-</div><div class='del'>-#define AUX_RTC_CTRL	0x103</div><div class='del'>-#define AUX_RTC_LOW	0x104</div><div class='del'>-#define AUX_RTC_HIGH	0x105</div><div class='del'>-</div><div class='del'>-static cycle_t arc_read_rtc(struct clocksource *cs)</div><div class='del'>-{</div><div class='del'>-	unsigned long status;</div><div class='del'>-	union {</div><div class='del'>-#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='del'>-		struct { u32 high, low; };</div><div class='del'>-#else</div><div class='del'>-		struct { u32 low, high; };</div><div class='del'>-#endif</div><div class='del'>-		cycle_t  full;</div><div class='del'>-	} stamp;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * hardware has an internal state machine which tracks readout of</div><div class='del'>-	 * low/high and updates the CTRL.status if</div><div class='del'>-	 *  - interrupt/exception taken between the two reads</div><div class='del'>-	 *  - high increments after low has been read</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		stamp.low = read_aux_reg(AUX_RTC_LOW);</div><div class='del'>-		stamp.high = read_aux_reg(AUX_RTC_HIGH);</div><div class='del'>-		status = read_aux_reg(AUX_RTC_CTRL);</div><div class='del'>-	} while (!(status &amp; _BITUL(31)));</div><div class='del'>-</div><div class='del'>-	return stamp.full;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct clocksource arc_counter_rtc = {</div><div class='del'>-	.name   = "ARCv2 RTC",</div><div class='del'>-	.rating = 350,</div><div class='del'>-	.read   = arc_read_rtc,</div><div class='del'>-	.mask   = CLOCKSOURCE_MASK(64),</div><div class='del'>-	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init arc_cs_setup_rtc(struct device_node *node)</div><div class='del'>-{</div><div class='del'>-	int exists = cpuinfo_arc700[smp_processor_id()].extn.rtc;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (WARN(!exists, "Local-64-bit-Ctr clocksource not detected"))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	/* Local to CPU hence not usable in SMP */</div><div class='del'>-	if (WARN(IS_ENABLED(CONFIG_SMP), "Local-64-bit-Ctr not usable in SMP"))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ret = arc_get_timer_clk(node);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	write_aux_reg(AUX_RTC_CTRL, 1);</div><div class='del'>-</div><div class='del'>-	return clocksource_register_hz(&amp;arc_counter_rtc, arc_timer_freq);</div><div class='del'>-}</div><div class='del'>-CLOCKSOURCE_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 32bit TIMER1 to keep counting monotonically and wraparound</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static cycle_t arc_read_timer1(struct clocksource *cs)</div><div class='del'>-{</div><div class='del'>-	return (cycle_t) read_aux_reg(ARC_REG_TIMER1_CNT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct clocksource arc_counter_timer1 = {</div><div class='del'>-	.name   = "ARC Timer1",</div><div class='del'>-	.rating = 300,</div><div class='del'>-	.read   = arc_read_timer1,</div><div class='del'>-	.mask   = CLOCKSOURCE_MASK(32),</div><div class='del'>-	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init arc_cs_setup_timer1(struct device_node *node)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Local to CPU hence not usable in SMP */</div><div class='del'>-	if (IS_ENABLED(CONFIG_SMP))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ret = arc_get_timer_clk(node);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	write_aux_reg(ARC_REG_TIMER1_LIMIT, ARC_TIMER_MAX);</div><div class='del'>-	write_aux_reg(ARC_REG_TIMER1_CNT, 0);</div><div class='del'>-	write_aux_reg(ARC_REG_TIMER1_CTRL, TIMER_CTRL_NH);</div><div class='del'>-</div><div class='del'>-	return clocksource_register_hz(&amp;arc_counter_timer1, arc_timer_freq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********** Clock Event Device *********/</div><div class='del'>-</div><div class='del'>-static int arc_timer_irq;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Arm the timer to interrupt after @cycles</div><div class='del'>- * The distinction for oneshot/periodic is done in arc_event_timer_ack() below</div><div class='del'>- */</div><div class='del'>-static void arc_timer_event_setup(unsigned int cycles)</div><div class='del'>-{</div><div class='del'>-	write_aux_reg(ARC_REG_TIMER0_LIMIT, cycles);</div><div class='del'>-	write_aux_reg(ARC_REG_TIMER0_CNT, 0);	/* start from 0 */</div><div class='del'>-</div><div class='del'>-	write_aux_reg(ARC_REG_TIMER0_CTRL, TIMER_CTRL_IE | TIMER_CTRL_NH);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int arc_clkevent_set_next_event(unsigned long delta,</div><div class='del'>-				       struct clock_event_device *dev)</div><div class='del'>-{</div><div class='del'>-	arc_timer_event_setup(delta);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int arc_clkevent_set_periodic(struct clock_event_device *dev)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * At X Hz, 1 sec = 1000ms -&gt; X cycles;</div><div class='del'>-	 *		      10ms -&gt; X / 100 cycles</div><div class='del'>-	 */</div><div class='del'>-	arc_timer_event_setup(arc_timer_freq / HZ);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEFINE_PER_CPU(struct clock_event_device, arc_clockevent_device) = {</div><div class='del'>-	.name			= "ARC Timer0",</div><div class='del'>-	.features		= CLOCK_EVT_FEAT_ONESHOT |</div><div class='del'>-				  CLOCK_EVT_FEAT_PERIODIC,</div><div class='del'>-	.rating			= 300,</div><div class='del'>-	.set_next_event		= arc_clkevent_set_next_event,</div><div class='del'>-	.set_state_periodic	= arc_clkevent_set_periodic,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static irqreturn_t timer_irq_handler(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Note that generic IRQ core could have passed @evt for @dev_id if</div><div class='del'>-	 * irq_set_chip_and_handler() asked for handle_percpu_devid_irq()</div><div class='del'>-	 */</div><div class='del'>-	struct clock_event_device *evt = this_cpu_ptr(&amp;arc_clockevent_device);</div><div class='del'>-	int irq_reenable = clockevent_state_periodic(evt);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Any write to CTRL reg ACks the interrupt, we rewrite the</div><div class='del'>-	 * Count when [N]ot [H]alted bit.</div><div class='del'>-	 * And re-arm it if perioid by [I]nterrupt [E]nable bit</div><div class='del'>-	 */</div><div class='del'>-	write_aux_reg(ARC_REG_TIMER0_CTRL, irq_reenable | TIMER_CTRL_NH);</div><div class='del'>-</div><div class='del'>-	evt-&gt;event_handler(evt);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int arc_timer_starting_cpu(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	struct clock_event_device *evt = this_cpu_ptr(&amp;arc_clockevent_device);</div><div class='del'>-</div><div class='del'>-	evt-&gt;cpumask = cpumask_of(smp_processor_id());</div><div class='del'>-</div><div class='del'>-	clockevents_config_and_register(evt, arc_timer_freq, 0, ARC_TIMER_MAX);</div><div class='del'>-	enable_percpu_irq(arc_timer_irq, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int arc_timer_dying_cpu(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	disable_percpu_irq(arc_timer_irq);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * clockevent setup for boot CPU</div><div class='del'>- */</div><div class='del'>-static int __init arc_clockevent_setup(struct device_node *node)</div><div class='del'>-{</div><div class='del'>-	struct clock_event_device *evt = this_cpu_ptr(&amp;arc_clockevent_device);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	arc_timer_irq = irq_of_parse_and_map(node, 0);</div><div class='del'>-	if (arc_timer_irq &lt;= 0) {</div><div class='del'>-		pr_err("clockevent: missing irq");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = arc_get_timer_clk(node);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("clockevent: missing clk");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Needs apriori irq_set_percpu_devid() done in intc map function */</div><div class='del'>-	ret = request_percpu_irq(arc_timer_irq, timer_irq_handler,</div><div class='del'>-				 "Timer0 (per-cpu-tick)", evt);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("clockevent: unable to request irq\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = cpuhp_setup_state(CPUHP_AP_ARC_TIMER_STARTING,</div><div class='del'>-				"AP_ARC_TIMER_STARTING",</div><div class='del'>-				arc_timer_starting_cpu,</div><div class='del'>-				arc_timer_dying_cpu);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("Failed to setup hotplug state");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init arc_of_timer_init(struct device_node *np)</div><div class='del'>-{</div><div class='del'>-	static int init_count = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!init_count) {</div><div class='del'>-		init_count = 1;</div><div class='del'>-		ret = arc_clockevent_setup(np);</div><div class='del'>-	} else {</div><div class='del'>-		ret = arc_cs_setup_timer1(np);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-CLOCKSOURCE_OF_DECLARE(arc_clkevt, "snps,arc-timer", arc_of_timer_init);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called from start_kernel() - boot CPU only</div><div class='del'>- */</div><div class='del'>-void __init time_init(void)</div><div class='del'>-{</div><div class='del'>-	of_clk_init(NULL);</div><div class='del'>-	clocksource_probe();</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arc/kernel/traps.c b/arch/arc/kernel/traps.c<br/>index c927aa84e652..ff83e78d0cfb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/traps.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  * Rahul Trivedi: Codito Technologies 2004</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='head'>diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c<br/>index 82f9bc819f4a..f9caf79186d4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/troubleshoot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/troubleshoot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/troubleshoot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/troubleshoot.c</a></div><div class='hunk'>@@ -13,6 +13,9 @@</div><div class='ctx'> #include &lt;linux/fs_struct.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/arcregs.h&gt;</div><div class='ctx'> #include &lt;asm/irqflags.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arc/kernel/unaligned.c b/arch/arc/kernel/unaligned.c<br/>index abd961f3e763..5f69c3bd59bb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/unaligned.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/unaligned.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/unaligned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/unaligned.c</a></div><div class='hunk'>@@ -241,8 +241,9 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs,</div><div class='ctx'> 	if (state.fault)</div><div class='ctx'> 		goto fault;</div><div class='ctx'> </div><div class='add'>+	/* clear any remanants of delay slot */</div><div class='ctx'> 	if (delay_mode(regs)) {</div><div class='del'>-		regs-&gt;ret = regs-&gt;bta;</div><div class='add'>+		regs-&gt;ret = regs-&gt;bta &amp; ~1U;</div><div class='ctx'> 		regs-&gt;status32 &amp;= ~STATUS_DE_MASK;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		regs-&gt;ret += state.instr_len;</div><div class='head'>diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c<br/>index 61fd1ce63c56..b6e4f7a7419b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/kernel/unwind.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/kernel/unwind.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/kernel/unwind.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/kernel/unwind.c</a></div><div class='hunk'>@@ -1051,9 +1051,9 @@ int arc_unwind(struct unwind_frame_info *frame)</div><div class='ctx'> 		++ptr;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (cie != NULL) {</div><div class='del'>-		/* get code aligment factor */</div><div class='add'>+		/* get code alignment factor */</div><div class='ctx'> 		state.codeAlign = get_uleb128(&amp;ptr, end);</div><div class='del'>-		/* get data aligment factor */</div><div class='add'>+		/* get data alignment factor */</div><div class='ctx'> 		state.dataAlign = get_sleb128(&amp;ptr, end);</div><div class='ctx'> 		if (state.codeAlign == 0 || state.dataAlign == 0 || ptr &gt;= end)</div><div class='ctx'> 			cie = NULL;</div><div class='head'>diff --git a/arch/arc/mm/cache.c b/arch/arc/mm/cache.c<br/>index 50d71695cd4e..d408fa21a07c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/mm/cache.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/mm/cache.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/mm/cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/cache.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> </div><div class='ctx'> static int l2_line_sz;</div><div class='ctx'> static int ioc_exists;</div><div class='del'>-int slc_enable = 1, ioc_enable = 0;</div><div class='add'>+int slc_enable = 1, ioc_enable = 1;</div><div class='ctx'> unsigned long perip_base = ARC_UNCACHED_ADDR_SPACE; /* legacy value for boot */</div><div class='ctx'> unsigned long perip_end = 0xFFFFFFFF; /* legacy value */</div><div class='ctx'> </div><div class='hunk'>@@ -40,7 +40,7 @@ char *arc_cache_mumbojumbo(int c, char *buf, int len)</div><div class='ctx'> 	struct cpuinfo_arc_cache *p;</div><div class='ctx'> </div><div class='ctx'> #define PR_CACHE(p, cfg, str)						\</div><div class='del'>-	if (!(p)-&gt;ver)							\</div><div class='add'>+	if (!(p)-&gt;line_len)						\</div><div class='ctx'> 		n += scnprintf(buf + n, len - n, str"\t\t: N/A\n");	\</div><div class='ctx'> 	else								\</div><div class='ctx'> 		n += scnprintf(buf + n, len - n,			\</div><div class='hunk'>@@ -54,7 +54,7 @@ char *arc_cache_mumbojumbo(int c, char *buf, int len)</div><div class='ctx'> 	PR_CACHE(&amp;cpuinfo_arc700[c].dcache, CONFIG_ARC_HAS_DCACHE, "D-Cache");</div><div class='ctx'> </div><div class='ctx'> 	p = &amp;cpuinfo_arc700[c].slc;</div><div class='del'>-	if (p-&gt;ver)</div><div class='add'>+	if (p-&gt;line_len)</div><div class='ctx'> 		n += scnprintf(buf + n, len - n,</div><div class='ctx'> 			       "SLC\t\t: %uK, %uB Line%s\n",</div><div class='ctx'> 			       p-&gt;sz_k, p-&gt;line_len, IS_USED_RUN(slc_enable));</div><div class='hunk'>@@ -104,7 +104,6 @@ static void read_decode_cache_bcr_arcv2(int cpu)</div><div class='ctx'> 	READ_BCR(ARC_REG_SLC_BCR, sbcr);</div><div class='ctx'> 	if (sbcr.ver) {</div><div class='ctx'> 		READ_BCR(ARC_REG_SLC_CFG, slc_cfg);</div><div class='del'>-		p_slc-&gt;ver = sbcr.ver;</div><div class='ctx'> 		p_slc-&gt;sz_k = 128 &lt;&lt; slc_cfg.sz;</div><div class='ctx'> 		l2_line_sz = p_slc-&gt;line_len = (slc_cfg.lsz == 0) ? 128 : 64;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -152,7 +151,6 @@ void read_decode_cache_bcr(void)</div><div class='ctx'> </div><div class='ctx'> 	p_ic-&gt;line_len = 8 &lt;&lt; ibcr.line_len;</div><div class='ctx'> 	p_ic-&gt;sz_k = 1 &lt;&lt; (ibcr.sz - 1);</div><div class='del'>-	p_ic-&gt;ver = ibcr.ver;</div><div class='ctx'> 	p_ic-&gt;vipt = 1;</div><div class='ctx'> 	p_ic-&gt;alias = p_ic-&gt;sz_k/p_ic-&gt;assoc/TO_KB(PAGE_SIZE) &gt; 1;</div><div class='ctx'> </div><div class='hunk'>@@ -176,7 +174,6 @@ dc_chk:</div><div class='ctx'> </div><div class='ctx'> 	p_dc-&gt;line_len = 16 &lt;&lt; dbcr.line_len;</div><div class='ctx'> 	p_dc-&gt;sz_k = 1 &lt;&lt; (dbcr.sz - 1);</div><div class='del'>-	p_dc-&gt;ver = dbcr.ver;</div><div class='ctx'> </div><div class='ctx'> slc_chk:</div><div class='ctx'> 	if (is_isa_arcv2())</div><div class='hunk'>@@ -274,7 +271,11 @@ void __cache_line_loop_v2(phys_addr_t paddr, unsigned long vaddr,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * For ARC700 MMUv3 I-cache and D-cache flushes</div><div class='del'>- * Also reused for HS38 aliasing I-cache configuration</div><div class='add'>+ *  - ARC700 programming model requires paddr and vaddr be passed in seperate</div><div class='add'>+ *    AUX registers (*_IV*L and *_PTAG respectively) irrespective of whether the</div><div class='add'>+ *    caches actually alias or not.</div><div class='add'>+ * -  For HS38, only the aliasing I-cache configuration uses the PTAG reg</div><div class='add'>+ *    (non aliasing I-cache version doesn't; while D-cache can't possibly alias)</div><div class='ctx'>  */</div><div class='ctx'> static inline</div><div class='ctx'> void __cache_line_loop_v3(phys_addr_t paddr, unsigned long vaddr,</div><div class='hunk'>@@ -461,6 +462,21 @@ static inline void __dc_entire_op(const int op)</div><div class='ctx'> 	__after_dc_op(op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void __dc_disable(void)</div><div class='add'>+{</div><div class='add'>+	const int r = ARC_REG_DC_CTRL;</div><div class='add'>+</div><div class='add'>+	__dc_entire_op(OP_FLUSH_N_INV);</div><div class='add'>+	write_aux_reg(r, read_aux_reg(r) | DC_CTRL_DIS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __dc_enable(void)</div><div class='add'>+{</div><div class='add'>+	const int r = ARC_REG_DC_CTRL;</div><div class='add'>+</div><div class='add'>+	write_aux_reg(r, read_aux_reg(r) &amp; ~DC_CTRL_DIS);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* For kernel mappings cache operation: index is same as paddr */</div><div class='ctx'> #define __dc_line_op_k(p, sz, op)	__dc_line_op(p, p, sz, op)</div><div class='ctx'> </div><div class='hunk'>@@ -486,6 +502,8 @@ static inline void __dc_line_op(phys_addr_t paddr, unsigned long vaddr,</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #define __dc_entire_op(op)</div><div class='add'>+#define __dc_disable()</div><div class='add'>+#define __dc_enable()</div><div class='ctx'> #define __dc_line_op(paddr, vaddr, sz, op)</div><div class='ctx'> #define __dc_line_op_k(paddr, sz, op)</div><div class='ctx'> </div><div class='hunk'>@@ -600,6 +618,40 @@ noinline void slc_op(phys_addr_t paddr, unsigned long sz, const int op)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+noinline static void slc_entire_op(const int op)</div><div class='add'>+{</div><div class='add'>+	unsigned int ctrl, r = ARC_REG_SLC_CTRL;</div><div class='add'>+</div><div class='add'>+	ctrl = read_aux_reg(r);</div><div class='add'>+</div><div class='add'>+	if (!(op &amp; OP_FLUSH))		/* i.e. OP_INV */</div><div class='add'>+		ctrl &amp;= ~SLC_CTRL_IM;	/* clear IM: Disable flush before Inv */</div><div class='add'>+	else</div><div class='add'>+		ctrl |= SLC_CTRL_IM;</div><div class='add'>+</div><div class='add'>+	write_aux_reg(r, ctrl);</div><div class='add'>+</div><div class='add'>+	write_aux_reg(ARC_REG_SLC_INVALIDATE, 1);</div><div class='add'>+</div><div class='add'>+	/* Important to wait for flush to complete */</div><div class='add'>+	while (read_aux_reg(r) &amp; SLC_CTRL_BUSY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void arc_slc_disable(void)</div><div class='add'>+{</div><div class='add'>+	const int r = ARC_REG_SLC_CTRL;</div><div class='add'>+</div><div class='add'>+	slc_entire_op(OP_FLUSH_N_INV);</div><div class='add'>+	write_aux_reg(r, read_aux_reg(r) | SLC_CTRL_DIS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void arc_slc_enable(void)</div><div class='add'>+{</div><div class='add'>+	const int r = ARC_REG_SLC_CTRL;</div><div class='add'>+</div><div class='add'>+	write_aux_reg(r, read_aux_reg(r) &amp; ~SLC_CTRL_DIS);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /***********************************************************</div><div class='ctx'>  * Exported APIs</div><div class='ctx'>  */</div><div class='hunk'>@@ -926,36 +978,65 @@ SYSCALL_DEFINE3(cacheflush, uint32_t, start, uint32_t, sz, uint32_t, flags)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void arc_cache_init(void)</div><div class='add'>+/*</div><div class='add'>+ * IO-Coherency (IOC) setup rules:</div><div class='add'>+ *</div><div class='add'>+ * 1. Needs to be at system level, so only once by Master core</div><div class='add'>+ *    Non-Masters need not be accessing caches at that time</div><div class='add'>+ *    - They are either HALT_ON_RESET and kick started much later or</div><div class='add'>+ *    - if run on reset, need to ensure that arc_platform_smp_wait_to_boot()</div><div class='add'>+ *      doesn't perturb caches or coherency unit</div><div class='add'>+ *</div><div class='add'>+ * 2. caches (L1 and SLC) need to be purged (flush+inv) before setting up IOC,</div><div class='add'>+ *    otherwise any straggler data might behave strangely post IOC enabling</div><div class='add'>+ *</div><div class='add'>+ * 3. All Caches need to be disabled when setting up IOC to elide any in-flight</div><div class='add'>+ *    Coherency transactions</div><div class='add'>+ */</div><div class='add'>+noinline void __init arc_ioc_setup(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int __maybe_unused cpu = smp_processor_id();</div><div class='del'>-	char str[256];</div><div class='add'>+	unsigned int ap_sz;</div><div class='ctx'> </div><div class='del'>-	printk(arc_cache_mumbojumbo(0, str, sizeof(str)));</div><div class='add'>+	/* Flush + invalidate + disable L1 dcache */</div><div class='add'>+	__dc_disable();</div><div class='add'>+</div><div class='add'>+	/* Flush + invalidate SLC */</div><div class='add'>+	if (read_aux_reg(ARC_REG_SLC_BCR))</div><div class='add'>+		slc_entire_op(OP_FLUSH_N_INV);</div><div class='add'>+</div><div class='add'>+	/* IOC Aperture start: TDB: handle non default CONFIG_LINUX_LINK_BASE */</div><div class='add'>+	write_aux_reg(ARC_REG_IO_COH_AP0_BASE, 0x80000);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Only master CPU needs to execute rest of function:</div><div class='del'>-	 *  - Assume SMP so all cores will have same cache config so</div><div class='del'>-	 *    any geomtry checks will be same for all</div><div class='del'>-	 *  - IOC setup / dma callbacks only need to be setup once</div><div class='add'>+	 * IOC Aperture size:</div><div class='add'>+	 *   decoded as 2 ^ (SIZE + 2) KB: so setting 0x11 implies 512M</div><div class='add'>+	 * TBD: fix for PGU + 1GB of low mem</div><div class='add'>+	 * TBD: fix for PAE</div><div class='ctx'> 	 */</div><div class='del'>-	if (cpu)</div><div class='del'>-		return;</div><div class='add'>+	ap_sz = order_base_2(arc_get_mem_sz()/1024) - 2;</div><div class='add'>+	write_aux_reg(ARC_REG_IO_COH_AP0_SIZE, ap_sz);</div><div class='add'>+</div><div class='add'>+	write_aux_reg(ARC_REG_IO_COH_PARTIAL, 1);</div><div class='add'>+	write_aux_reg(ARC_REG_IO_COH_ENABLE, 1);</div><div class='add'>+</div><div class='add'>+	/* Re-enable L1 dcache */</div><div class='add'>+	__dc_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init arc_cache_init_master(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int __maybe_unused cpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ENABLED(CONFIG_ARC_HAS_ICACHE)) {</div><div class='ctx'> 		struct cpuinfo_arc_cache *ic = &amp;cpuinfo_arc700[cpu].icache;</div><div class='ctx'> </div><div class='del'>-		if (!ic-&gt;ver)</div><div class='add'>+		if (!ic-&gt;line_len)</div><div class='ctx'> 			panic("cache support enabled but non-existent cache\n");</div><div class='ctx'> </div><div class='ctx'> 		if (ic-&gt;line_len != L1_CACHE_BYTES)</div><div class='ctx'> 			panic("ICache line [%d] != kernel Config [%d]",</div><div class='ctx'> 			      ic-&gt;line_len, L1_CACHE_BYTES);</div><div class='ctx'> </div><div class='del'>-		if (ic-&gt;ver != CONFIG_ARC_MMU_VER)</div><div class='del'>-			panic("Cache ver [%d] doesn't match MMU ver [%d]\n",</div><div class='del'>-			      ic-&gt;ver, CONFIG_ARC_MMU_VER);</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * In MMU v4 (HS38x) the aliasing icache config uses IVIL/PTAG</div><div class='ctx'> 		 * pair to provide vaddr/paddr respectively, just as in MMU v3</div><div class='hunk'>@@ -969,7 +1050,7 @@ void arc_cache_init(void)</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_ARC_HAS_DCACHE)) {</div><div class='ctx'> 		struct cpuinfo_arc_cache *dc = &amp;cpuinfo_arc700[cpu].dcache;</div><div class='ctx'> </div><div class='del'>-		if (!dc-&gt;ver)</div><div class='add'>+		if (!dc-&gt;line_len)</div><div class='ctx'> 			panic("cache support enabled but non-existent cache\n");</div><div class='ctx'> </div><div class='ctx'> 		if (dc-&gt;line_len != L1_CACHE_BYTES)</div><div class='hunk'>@@ -979,38 +1060,27 @@ void arc_cache_init(void)</div><div class='ctx'> 		/* check for D-Cache aliasing on ARCompact: ARCv2 has PIPT */</div><div class='ctx'> 		if (is_isa_arcompact()) {</div><div class='ctx'> 			int handled = IS_ENABLED(CONFIG_ARC_CACHE_VIPT_ALIASING);</div><div class='del'>-</div><div class='del'>-			if (dc-&gt;alias &amp;&amp; !handled)</div><div class='del'>-				panic("Enable CONFIG_ARC_CACHE_VIPT_ALIASING\n");</div><div class='del'>-			else if (!dc-&gt;alias &amp;&amp; handled)</div><div class='add'>+			int num_colors = dc-&gt;sz_k/dc-&gt;assoc/TO_KB(PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+			if (dc-&gt;alias) {</div><div class='add'>+				if (!handled)</div><div class='add'>+					panic("Enable CONFIG_ARC_CACHE_VIPT_ALIASING\n");</div><div class='add'>+				if (CACHE_COLORS_NUM != num_colors)</div><div class='add'>+					panic("CACHE_COLORS_NUM not optimized for config\n");</div><div class='add'>+			} else if (!dc-&gt;alias &amp;&amp; handled) {</div><div class='ctx'> 				panic("Disable CONFIG_ARC_CACHE_VIPT_ALIASING\n");</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_isa_arcv2() &amp;&amp; l2_line_sz &amp;&amp; !slc_enable) {</div><div class='del'>-</div><div class='del'>-		/* IM set : flush before invalidate */</div><div class='del'>-		write_aux_reg(ARC_REG_SLC_CTRL,</div><div class='del'>-			read_aux_reg(ARC_REG_SLC_CTRL) | SLC_CTRL_IM);</div><div class='add'>+	/* Note that SLC disable not formally supported till HS 3.0 */</div><div class='add'>+	if (is_isa_arcv2() &amp;&amp; l2_line_sz &amp;&amp; !slc_enable)</div><div class='add'>+		arc_slc_disable();</div><div class='ctx'> </div><div class='del'>-		write_aux_reg(ARC_REG_SLC_INVALIDATE, 1);</div><div class='del'>-</div><div class='del'>-		/* Important to wait for flush to complete */</div><div class='del'>-		while (read_aux_reg(ARC_REG_SLC_CTRL) &amp; SLC_CTRL_BUSY);</div><div class='del'>-		write_aux_reg(ARC_REG_SLC_CTRL,</div><div class='del'>-			read_aux_reg(ARC_REG_SLC_CTRL) | SLC_CTRL_DISABLE);</div><div class='del'>-	}</div><div class='add'>+	if (is_isa_arcv2() &amp;&amp; ioc_enable)</div><div class='add'>+		arc_ioc_setup();</div><div class='ctx'> </div><div class='ctx'> 	if (is_isa_arcv2() &amp;&amp; ioc_enable) {</div><div class='del'>-		/* IO coherency base - 0x8z */</div><div class='del'>-		write_aux_reg(ARC_REG_IO_COH_AP0_BASE, 0x80000);</div><div class='del'>-		/* IO coherency aperture size - 512Mb: 0x8z-0xAz */</div><div class='del'>-		write_aux_reg(ARC_REG_IO_COH_AP0_SIZE, 0x11);</div><div class='del'>-		/* Enable partial writes */</div><div class='del'>-		write_aux_reg(ARC_REG_IO_COH_PARTIAL, 1);</div><div class='del'>-		/* Enable IO coherency */</div><div class='del'>-		write_aux_reg(ARC_REG_IO_COH_ENABLE, 1);</div><div class='del'>-</div><div class='ctx'> 		__dma_cache_wback_inv = __dma_cache_wback_inv_ioc;</div><div class='ctx'> 		__dma_cache_inv = __dma_cache_inv_ioc;</div><div class='ctx'> 		__dma_cache_wback = __dma_cache_wback_ioc;</div><div class='hunk'>@@ -1024,3 +1094,20 @@ void arc_cache_init(void)</div><div class='ctx'> 		__dma_cache_wback = __dma_cache_wback_l1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __ref arc_cache_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int __maybe_unused cpu = smp_processor_id();</div><div class='add'>+	char str[256];</div><div class='add'>+</div><div class='add'>+	printk(arc_cache_mumbojumbo(0, str, sizeof(str)));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only master CPU needs to execute rest of function:</div><div class='add'>+	 *  - Assume SMP so all cores will have same cache config so</div><div class='add'>+	 *    any geomtry checks will be same for all</div><div class='add'>+	 *  - IOC setup / dma callbacks only need to be setup once</div><div class='add'>+	 */</div><div class='add'>+	if (!cpu)</div><div class='add'>+		arc_cache_init_master();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c<br/>index cd8aad8226dd..2a07e6ecafbd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/mm/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/mm/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/mm/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/dma.c</a></div><div class='hunk'>@@ -158,7 +158,10 @@ static dma_addr_t arc_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 		unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t paddr = page_to_phys(page) + offset;</div><div class='del'>-	_dma_cache_sync(paddr, size, dir);</div><div class='add'>+</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		_dma_cache_sync(paddr, size, dir);</div><div class='add'>+</div><div class='ctx'> 	return plat_phys_to_dma(dev, paddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -215,7 +218,7 @@ static int arc_dma_supported(struct device *dev, u64 dma_mask)</div><div class='ctx'> 	return dma_mask == DMA_BIT_MASK(32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops arc_dma_ops = {</div><div class='add'>+const struct dma_map_ops arc_dma_ops = {</div><div class='ctx'> 	.alloc			= arc_dma_alloc,</div><div class='ctx'> 	.free			= arc_dma_free,</div><div class='ctx'> 	.mmap			= arc_dma_mmap,</div><div class='head'>diff --git a/arch/arc/mm/extable.c b/arch/arc/mm/extable.c<br/>index aa652e281324..c86906b41bfe 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/extable.c</a></div><div class='hunk'>@@ -8,7 +8,8 @@</div><div class='ctx'>  * Borrowed heavily from MIPS</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs)</div><div class='head'>diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c<br/>index e94e5aa33985..162c97528872 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/fault.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='head'>diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c<br/>index 399e2f223d25..8c9415ed6280 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/init.c</a></div><div class='hunk'>@@ -40,6 +40,11 @@ struct pglist_data node_data[MAX_NUMNODES] __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(node_data);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+long __init arc_get_mem_sz(void)</div><div class='add'>+{</div><div class='add'>+	return low_mem_sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* User can over-ride above with "mem=nnn[KkMm]" in cmdline */</div><div class='ctx'> static int __init setup_mem_sz(char *str)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arc/mm/mmap.c b/arch/arc/mm/mmap.c<br/>index 2e06d56e987b..3e25e8d6486b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/mm/mmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/mm/mmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/mmap.c</a></div><div class='hunk'>@@ -13,7 +13,8 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define COLOUR_ALIGN(addr, pgoff)			\</div><div class='head'>diff --git a/arch/arc/mm/tlb.c b/arch/arc/mm/tlb.c<br/>index bdb295e09160..d0126fdfe2d8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/mm/tlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/mm/tlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/mm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/mm/tlb.c</a></div><div class='hunk'>@@ -53,6 +53,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/arcregs.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='head'>diff --git a/arch/arc/plat-axs10x/axs10x.c b/arch/arc/plat-axs10x/axs10x.c<br/>index 86548701023c..38ff349d7f2a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/plat-axs10x/axs10x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/plat-axs10x/axs10x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/plat-axs10x/axs10x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/plat-axs10x/axs10x.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach_desc.h&gt;</div><div class='del'>-#include &lt;asm/mcip.h&gt;</div><div class='add'>+#include &lt;soc/arc/mcip.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define AXS_MB_CGU		0xE0010000</div><div class='ctx'> #define AXS_MB_CREG		0xE0011000</div><div class='head'>diff --git a/arch/arc/plat-eznps/Kconfig b/arch/arc/plat-eznps/Kconfig<br/>index 1d175cc6ad6d..1595a38e50cd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/plat-eznps/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/plat-eznps/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/plat-eznps/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/plat-eznps/Kconfig</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> </div><div class='ctx'> menuconfig ARC_PLAT_EZNPS</div><div class='ctx'> 	bool "\"EZchip\" ARC dev platform"</div><div class='del'>-	select ARC_HAS_COH_CACHES if SMP</div><div class='ctx'> 	select CPU_BIG_ENDIAN</div><div class='ctx'> 	select CLKSRC_NPS</div><div class='ctx'> 	select EZNPS_GIC</div><div class='head'>diff --git a/arch/arc/plat-eznps/include/plat/ctop.h b/arch/arc/plat-eznps/include/plat/ctop.h<br/>index 9d6718c1a199..ee2e32df5e90 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/plat-eznps/include/plat/ctop.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/plat-eznps/include/plat/ctop.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/plat-eznps/include/plat/ctop.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/plat-eznps/include/plat/ctop.h</a></div><div class='hunk'>@@ -46,9 +46,7 @@</div><div class='ctx'> #define CTOP_AUX_UDMC				(CTOP_AUX_BASE + 0x300)</div><div class='ctx'> </div><div class='ctx'> /* EZchip core instructions */</div><div class='del'>-#define CTOP_INST_HWSCHD_OFF_R3			0x3B6F00BF</div><div class='ctx'> #define CTOP_INST_HWSCHD_OFF_R4			0x3C6F00BF</div><div class='del'>-#define CTOP_INST_HWSCHD_RESTORE_R3		0x3E6F70C3</div><div class='ctx'> #define CTOP_INST_HWSCHD_RESTORE_R4		0x3E6F7103</div><div class='ctx'> #define CTOP_INST_SCHD_RW			0x3E6F7004</div><div class='ctx'> #define CTOP_INST_SCHD_RD			0x3E6F7084</div><div class='head'>diff --git a/arch/arc/plat-sim/Kconfig b/arch/arc/plat-sim/Kconfig<br/>index 18e39fcc488a..ac6af96a82f3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arc/plat-sim/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arc/plat-sim/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arc/plat-sim/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arc/plat-sim/Kconfig</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> </div><div class='ctx'> menuconfig ARC_PLAT_SIM</div><div class='ctx'> 	bool "ARC nSIM based simulation virtual platforms"</div><div class='del'>-	select ARC_HAS_COH_CACHES if SMP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for nSIM based ARC simulation platforms</div><div class='ctx'> 	  This includes the standalone nSIM (uart only) vs. System C OSCI VP</div><div class='head'>diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig<br/>index b5d529fdffab..0d4e71b42c77 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/Kconfig</a></div><div class='hunk'>@@ -2,12 +2,18 @@ config ARM</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> 	select ARCH_CLOCKSOURCE_DATA</div><div class='add'>+	select ARCH_HAS_DEBUG_VIRTUAL</div><div class='ctx'> 	select ARCH_HAS_DEVMEM_IS_ALLOWED</div><div class='ctx'> 	select ARCH_HAS_ELF_RANDOMIZE</div><div class='add'>+	select ARCH_HAS_SET_MEMORY</div><div class='add'>+	select ARCH_HAS_STRICT_KERNEL_RWX if MMU &amp;&amp; !XIP_KERNEL</div><div class='add'>+	select ARCH_HAS_STRICT_MODULE_RWX if MMU</div><div class='ctx'> 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST</div><div class='ctx'> 	select ARCH_HAVE_CUSTOM_GPIO_H</div><div class='ctx'> 	select ARCH_HAS_GCOV_PROFILE_ALL</div><div class='ctx'> 	select ARCH_MIGHT_HAVE_PC_PARPORT</div><div class='add'>+	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX</div><div class='add'>+	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7</div><div class='ctx'> 	select ARCH_SUPPORTS_ATOMIC_RMW</div><div class='ctx'> 	select ARCH_USE_BUILTIN_BSWAP</div><div class='ctx'> 	select ARCH_USE_CMPXCHG_LOCKREF</div><div class='hunk'>@@ -703,6 +709,7 @@ config ARCH_VIRT</div><div class='ctx'> 	select ARM_GIC</div><div class='ctx'> 	select ARM_GIC_V2M if PCI</div><div class='ctx'> 	select ARM_GIC_V3</div><div class='add'>+	select ARM_GIC_V3_ITS if PCI</div><div class='ctx'> 	select ARM_PSCI</div><div class='ctx'> 	select HAVE_ARM_ARCH_TIMER</div><div class='ctx'> </div><div class='hunk'>@@ -887,6 +894,11 @@ config MACH_STM32F429</div><div class='ctx'> 	depends on ARCH_STM32</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config MACH_STM32F746</div><div class='add'>+	bool "STMicrolectronics STM32F746"</div><div class='add'>+	depends on ARCH_STM32</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config ARCH_MPS2</div><div class='ctx'> 	bool "ARM MPS2 platform"</div><div class='ctx'> 	depends on ARM_SINGLE_ARMV7M</div><div class='hunk'>@@ -1496,8 +1508,7 @@ source kernel/Kconfig.preempt</div><div class='ctx'> </div><div class='ctx'> config HZ_FIXED</div><div class='ctx'> 	int</div><div class='del'>-	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || \</div><div class='del'>-		ARCH_S5PV210 || ARCH_EXYNOS4</div><div class='add'>+	default 200 if ARCH_EBSA110</div><div class='ctx'> 	default 128 if SOC_AT91RM9200</div><div class='ctx'> 	default 0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/Kconfig-nommu b/arch/arm/Kconfig-nommu<br/>index aed66d5df7f1..b7576349528c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/Kconfig-nommu?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/Kconfig-nommu</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/Kconfig-nommu?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/Kconfig-nommu</a></div><div class='hunk'>@@ -34,8 +34,7 @@ config PROCESSOR_ID</div><div class='ctx'> 	  used instead of the auto-probing which utilizes the register.</div><div class='ctx'> </div><div class='ctx'> config REMAP_VECTORS_TO_RAM</div><div class='del'>-	bool 'Install vectors to the beginning of RAM' if DRAM_BASE</div><div class='del'>-	depends on DRAM_BASE</div><div class='add'>+	bool 'Install vectors to the beginning of RAM'</div><div class='ctx'> 	help</div><div class='ctx'> 	  The kernel needs to change the hardware exception vectors.</div><div class='ctx'> 	  In nommu mode, the hardware exception vectors are normally</div><div class='head'>diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug<br/>index d83f7c369e51..426d2716f55d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/Kconfig.debug?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/Kconfig.debug</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/Kconfig.debug</a></div><div class='hunk'>@@ -1738,17 +1738,6 @@ config PID_IN_CONTEXTIDR</div><div class='ctx'> 	  additional instructions during context switch. Say Y here only if you</div><div class='ctx'> 	  are planning to use hardware trace tools with this kernel.</div><div class='ctx'> </div><div class='del'>-config DEBUG_SET_MODULE_RONX</div><div class='del'>-	bool "Set loadable kernel module data as NX and text as RO"</div><div class='del'>-	depends on MODULES &amp;&amp; MMU</div><div class='del'>-	---help---</div><div class='del'>-	  This option helps catch unintended modifications to loadable</div><div class='del'>-	  kernel module's text and read-only data. It also prevents execution</div><div class='del'>-	  of module data. Such protection may interfere with run-time code</div><div class='del'>-	  patching and dynamic kernel tracing - and they might also protect</div><div class='del'>-	  against certain classes of kernel exploits.</div><div class='del'>-	  If in doubt, say "N".</div><div class='del'>-</div><div class='ctx'> source "drivers/hwtracing/coresight/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/arm/Makefile b/arch/arm/Makefile<br/>index 6be9ee148b78..ab30cc634d02 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/Makefile</a></div><div class='hunk'>@@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_MXS)		+= mxs</div><div class='ctx'> machine-$(CONFIG_ARCH_NETX)		+= netx</div><div class='ctx'> machine-$(CONFIG_ARCH_NOMADIK)		+= nomadik</div><div class='ctx'> machine-$(CONFIG_ARCH_NSPIRE)		+= nspire</div><div class='add'>+machine-$(CONFIG_ARCH_OXNAS)		+= oxnas</div><div class='ctx'> machine-$(CONFIG_ARCH_OMAP1)		+= omap1</div><div class='ctx'> machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2</div><div class='ctx'> machine-$(CONFIG_ARCH_ORION5X)		+= orion5x</div><div class='hunk'>@@ -311,8 +312,11 @@ all:	$(KBUILD_IMAGE) $(KBUILD_DTBS)</div><div class='ctx'> </div><div class='ctx'> boot := arch/arm/boot</div><div class='ctx'> </div><div class='add'>+archheaders:</div><div class='add'>+	$(Q)$(MAKE) $(build)=arch/arm/tools uapi</div><div class='add'>+</div><div class='ctx'> archprepare:</div><div class='del'>-	$(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h</div><div class='add'>+	$(Q)$(MAKE) $(build)=arch/arm/tools kapi</div><div class='ctx'> </div><div class='ctx'> # Convert bzImage to zImage</div><div class='ctx'> bzImage: zImage</div><div class='head'>diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c<br/>index a0765e7ed6c7..ea7832702a8f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/compressed/decompress.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/compressed/decompress.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/compressed/decompress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/compressed/decompress.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@ extern void error(char *);</div><div class='ctx'> </div><div class='ctx'> /* Not needed, but used in some headers pulled in by decompressors */</div><div class='ctx'> extern char * strstr(const char * s1, const char *s2);</div><div class='add'>+extern size_t strlen(const char *s);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KERNEL_GZIP</div><div class='ctx'> #include "../../../../lib/decompress_inflate.c"</div><div class='head'>diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S<br/>index fc6d541549a2..9150f9732785 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/compressed/head.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/compressed/head.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/compressed/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/compressed/head.S</a></div><div class='hunk'>@@ -1196,7 +1196,7 @@ skip:</div><div class='ctx'> 		bgt	loop1</div><div class='ctx'> finished:</div><div class='ctx'> 		ldmfd	sp!, {r0-r7, r9-r11}</div><div class='del'>-		mov	r10, #0			@ swith back to cache level 0</div><div class='add'>+		mov	r10, #0			@ switch back to cache level 0</div><div class='ctx'> 		mcr	p15, 2, r10, c0, c0, 0	@ select current cache level in cssr</div><div class='ctx'> iflush:</div><div class='ctx'> 		mcr	p15, 0, r10, c7, c10, 4	@ DSB</div><div class='head'>diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile<br/>index c558ba75cbcc..011808490fed 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/Makefile</a></div><div class='hunk'>@@ -48,11 +48,13 @@ dtb-$(CONFIG_SOC_SAM_V7) += \</div><div class='ctx'> 	at91-kizbox2.dtb \</div><div class='ctx'> 	at91-sama5d2_xplained.dtb \</div><div class='ctx'> 	at91-sama5d3_xplained.dtb \</div><div class='add'>+	at91-tse850-3.dtb \</div><div class='ctx'> 	sama5d31ek.dtb \</div><div class='ctx'> 	sama5d33ek.dtb \</div><div class='ctx'> 	sama5d34ek.dtb \</div><div class='ctx'> 	sama5d35ek.dtb \</div><div class='ctx'> 	sama5d36ek.dtb \</div><div class='add'>+	sama5d36ek_cmp.dtb \</div><div class='ctx'> 	at91-sama5d4_ma5d4evk.dtb \</div><div class='ctx'> 	at91-sama5d4_xplained.dtb \</div><div class='ctx'> 	at91-sama5d4ek.dtb \</div><div class='hunk'>@@ -75,6 +77,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \</div><div class='ctx'> 	bcm4708-asus-rt-ac56u.dtb \</div><div class='ctx'> 	bcm4708-asus-rt-ac68u.dtb \</div><div class='ctx'> 	bcm4708-buffalo-wzr-1750dhp.dtb \</div><div class='add'>+	bcm4708-luxul-xap-1510.dtb \</div><div class='ctx'> 	bcm4708-luxul-xwc-1000.dtb \</div><div class='ctx'> 	bcm4708-netgear-r6250.dtb \</div><div class='ctx'> 	bcm4708-netgear-r6300-v2.dtb \</div><div class='hunk'>@@ -82,15 +85,22 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \</div><div class='ctx'> 	bcm47081-asus-rt-n18u.dtb \</div><div class='ctx'> 	bcm47081-buffalo-wzr-600dhp2.dtb \</div><div class='ctx'> 	bcm47081-buffalo-wzr-900dhp.dtb \</div><div class='add'>+	bcm47081-luxul-xap-1410.dtb \</div><div class='add'>+	bcm47081-luxul-xwr-1200.dtb \</div><div class='ctx'> 	bcm4709-asus-rt-ac87u.dtb \</div><div class='ctx'> 	bcm4709-buffalo-wxr-1900dhp.dtb \</div><div class='ctx'> 	bcm4709-netgear-r7000.dtb \</div><div class='ctx'> 	bcm4709-netgear-r8000.dtb \</div><div class='add'>+	bcm4709-tplink-archer-c9-v1.dtb \</div><div class='ctx'> 	bcm47094-dlink-dir-885l.dtb \</div><div class='add'>+	bcm47094-luxul-xwr-3100.dtb \</div><div class='add'>+	bcm47094-netgear-r8500.dtb \</div><div class='ctx'> 	bcm94708.dtb \</div><div class='ctx'> 	bcm94709.dtb \</div><div class='ctx'> 	bcm953012er.dtb \</div><div class='ctx'> 	bcm953012k.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_BCM_53573) += \</div><div class='add'>+	bcm47189-tenda-ac9.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_BCM_63XX) += \</div><div class='ctx'> 	bcm963138dvt.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \</div><div class='hunk'>@@ -122,7 +132,8 @@ dtb-$(CONFIG_ARCH_CLPS711X) += \</div><div class='ctx'> dtb-$(CONFIG_ARCH_DAVINCI) += \</div><div class='ctx'> 	da850-lcdk.dtb \</div><div class='ctx'> 	da850-enbw-cmc.dtb \</div><div class='del'>-	da850-evm.dtb</div><div class='add'>+	da850-evm.dtb \</div><div class='add'>+	da850-lego-ev3.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_DIGICOLOR) += \</div><div class='ctx'> 	cx92755_equinox.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_EFM32) += \</div><div class='hunk'>@@ -136,6 +147,7 @@ dtb-$(CONFIG_ARCH_EXYNOS4) += \</div><div class='ctx'> 	exynos4210-smdkv310.dtb \</div><div class='ctx'> 	exynos4210-trats.dtb \</div><div class='ctx'> 	exynos4210-universal_c210.dtb \</div><div class='add'>+	exynos4412-itop-elite.dtb \</div><div class='ctx'> 	exynos4412-odroidu3.dtb \</div><div class='ctx'> 	exynos4412-odroidx.dtb \</div><div class='ctx'> 	exynos4412-odroidx2.dtb \</div><div class='hunk'>@@ -330,6 +342,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \</div><div class='ctx'> 	imx6dl-aristainetos_7.dtb \</div><div class='ctx'> 	imx6dl-aristainetos2_4.dtb \</div><div class='ctx'> 	imx6dl-aristainetos2_7.dtb \</div><div class='add'>+	imx6dl-colibri-eval-v3.dtb \</div><div class='ctx'> 	imx6dl-cubox-i.dtb \</div><div class='ctx'> 	imx6dl-dfi-fs700-m60.dtb \</div><div class='ctx'> 	imx6dl-gw51xx.dtb \</div><div class='hunk'>@@ -340,6 +353,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \</div><div class='ctx'> 	imx6dl-gw552x.dtb \</div><div class='ctx'> 	imx6dl-gw553x.dtb \</div><div class='ctx'> 	imx6dl-hummingboard.dtb \</div><div class='add'>+	imx6dl-icore.dtb \</div><div class='add'>+	imx6dl-icore-rqs.dtb \</div><div class='ctx'> 	imx6dl-nit6xlite.dtb \</div><div class='ctx'> 	imx6dl-nitrogen6x.dtb \</div><div class='ctx'> 	imx6dl-phytec-pbab01.dtb \</div><div class='hunk'>@@ -348,6 +363,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \</div><div class='ctx'> 	imx6dl-sabreauto.dtb \</div><div class='ctx'> 	imx6dl-sabrelite.dtb \</div><div class='ctx'> 	imx6dl-sabresd.dtb \</div><div class='add'>+	imx6dl-savageboard.dtb \</div><div class='ctx'> 	imx6dl-ts4900.dtb \</div><div class='ctx'> 	imx6dl-tx6dl-comtft.dtb \</div><div class='ctx'> 	imx6dl-tx6s-8034.dtb \</div><div class='hunk'>@@ -381,16 +397,20 @@ dtb-$(CONFIG_SOC_IMX6Q) += \</div><div class='ctx'> 	imx6q-gw553x.dtb \</div><div class='ctx'> 	imx6q-h100.dtb \</div><div class='ctx'> 	imx6q-hummingboard.dtb \</div><div class='add'>+	imx6q-icore.dtb \</div><div class='ctx'> 	imx6q-icore-rqs.dtb \</div><div class='ctx'> 	imx6q-marsboard.dtb \</div><div class='add'>+	imx6q-mccmon6.dtb \</div><div class='ctx'> 	imx6q-nitrogen6x.dtb \</div><div class='ctx'> 	imx6q-nitrogen6_max.dtb \</div><div class='add'>+	imx6q-nitrogen6_som2.dtb \</div><div class='ctx'> 	imx6q-novena.dtb \</div><div class='ctx'> 	imx6q-phytec-pbab01.dtb \</div><div class='ctx'> 	imx6q-rex-pro.dtb \</div><div class='ctx'> 	imx6q-sabreauto.dtb \</div><div class='ctx'> 	imx6q-sabrelite.dtb \</div><div class='ctx'> 	imx6q-sabresd.dtb \</div><div class='add'>+	imx6q-savageboard.dtb \</div><div class='ctx'> 	imx6q-sbc6x.dtb \</div><div class='ctx'> 	imx6q-tbs2910.dtb \</div><div class='ctx'> 	imx6q-ts4900.dtb \</div><div class='hunk'>@@ -416,14 +436,22 @@ dtb-$(CONFIG_SOC_IMX6SX) += \</div><div class='ctx'> 	imx6sx-sabreauto.dtb \</div><div class='ctx'> 	imx6sx-sdb-reva.dtb \</div><div class='ctx'> 	imx6sx-sdb-sai.dtb \</div><div class='del'>-	imx6sx-sdb.dtb</div><div class='add'>+	imx6sx-sdb.dtb \</div><div class='add'>+	imx6sx-udoo-neo-basic.dtb \</div><div class='add'>+	imx6sx-udoo-neo-extended.dtb \</div><div class='add'>+	imx6sx-udoo-neo-full.dtb</div><div class='ctx'> dtb-$(CONFIG_SOC_IMX6UL) += \</div><div class='ctx'> 	imx6ul-14x14-evk.dtb \</div><div class='ctx'> 	imx6ul-geam-kit.dtb \</div><div class='add'>+	imx6ul-isiot-emmc.dtb \</div><div class='add'>+	imx6ul-isiot-nand.dtb \</div><div class='add'>+	imx6ul-liteboard.dtb \</div><div class='add'>+	imx6ul-opos6uldev.dtb \</div><div class='ctx'> 	imx6ul-pico-hobbit.dtb \</div><div class='ctx'> 	imx6ul-tx6ul-0010.dtb \</div><div class='ctx'> 	imx6ul-tx6ul-0011.dtb \</div><div class='del'>-	imx6ul-tx6ul-mainboard.dtb</div><div class='add'>+	imx6ul-tx6ul-mainboard.dtb \</div><div class='add'>+	imx6ull-14x14-evk.dtb</div><div class='ctx'> dtb-$(CONFIG_SOC_IMX7D) += \</div><div class='ctx'> 	imx7d-cl-som-imx7.dtb \</div><div class='ctx'> 	imx7d-colibri-eval-v3.dtb \</div><div class='hunk'>@@ -442,7 +470,8 @@ dtb-$(CONFIG_SOC_VF610) += \</div><div class='ctx'> 	vf610-cosmic.dtb \</div><div class='ctx'> 	vf610m4-cosmic.dtb \</div><div class='ctx'> 	vf610-twr.dtb \</div><div class='del'>-	vf610-zii-dev-rev-b.dtb</div><div class='add'>+	vf610-zii-dev-rev-b.dtb \</div><div class='add'>+	vf610-zii-dev-rev-c.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_MXS) += \</div><div class='ctx'> 	imx23-evk.dtb \</div><div class='ctx'> 	imx23-olinuxino.dtb \</div><div class='hunk'>@@ -485,6 +514,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += \</div><div class='ctx'> 	am3517-evm.dtb \</div><div class='ctx'> 	am3517_mt_ventoux.dtb \</div><div class='ctx'> 	logicpd-torpedo-37xx-devkit.dtb \</div><div class='add'>+	logicpd-som-lv-37xx-devkit.dtb \</div><div class='ctx'> 	omap3430-sdp.dtb \</div><div class='ctx'> 	omap3-beagle.dtb \</div><div class='ctx'> 	omap3-beagle-xm.dtb \</div><div class='hunk'>@@ -547,7 +577,9 @@ dtb-$(CONFIG_SOC_AM33XX) += \</div><div class='ctx'> 	am335x-base0033.dtb \</div><div class='ctx'> 	am335x-bone.dtb \</div><div class='ctx'> 	am335x-boneblack.dtb \</div><div class='add'>+	am335x-boneblack-wireless.dtb \</div><div class='ctx'> 	am335x-bonegreen.dtb \</div><div class='add'>+	am335x-bonegreen-wireless.dtb \</div><div class='ctx'> 	am335x-chiliboard.dtb \</div><div class='ctx'> 	am335x-cm-t335.dtb \</div><div class='ctx'> 	am335x-evm.dtb \</div><div class='hunk'>@@ -556,11 +588,13 @@ dtb-$(CONFIG_SOC_AM33XX) += \</div><div class='ctx'> 	am335x-lxm.dtb \</div><div class='ctx'> 	am335x-nano.dtb \</div><div class='ctx'> 	am335x-pepper.dtb \</div><div class='add'>+	am335x-phycore-rdk.dtb \</div><div class='ctx'> 	am335x-shc.dtb \</div><div class='ctx'> 	am335x-sbc-t335.dtb \</div><div class='ctx'> 	am335x-sl50.dtb \</div><div class='ctx'> 	am335x-wega-rdk.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_OMAP4) += \</div><div class='add'>+	omap4-droid4-xt894.dtb \</div><div class='ctx'> 	omap4-duovero-parlor.dtb \</div><div class='ctx'> 	omap4-kc1.dtb \</div><div class='ctx'> 	omap4-panda.dtb \</div><div class='hunk'>@@ -588,15 +622,18 @@ dtb-$(CONFIG_SOC_DRA7XX) += \</div><div class='ctx'> 	am57xx-cl-som-am57x.dtb \</div><div class='ctx'> 	am57xx-sbc-am57x.dtb \</div><div class='ctx'> 	am572x-idk.dtb \</div><div class='add'>+	am571x-idk.dtb \</div><div class='ctx'> 	dra7-evm.dtb \</div><div class='ctx'> 	dra72-evm.dtb \</div><div class='del'>-	dra72-evm-revc.dtb</div><div class='add'>+	dra72-evm-revc.dtb \</div><div class='add'>+	dra71-evm.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_ORION5X) += \</div><div class='ctx'> 	orion5x-kuroboxpro.dtb \</div><div class='ctx'> 	orion5x-lacie-d2-network.dtb \</div><div class='ctx'> 	orion5x-lacie-ethernet-disk-mini-v2.dtb \</div><div class='ctx'> 	orion5x-linkstation-lsgl.dtb \</div><div class='ctx'> 	orion5x-linkstation-lswtgl.dtb \</div><div class='add'>+	orion5x-linkstation-lschl.dtb \</div><div class='ctx'> 	orion5x-lswsgl.dtb \</div><div class='ctx'> 	orion5x-maxtor-shared-storage-2.dtb \</div><div class='ctx'> 	orion5x-netgear-wnr854t.dtb \</div><div class='hunk'>@@ -604,7 +641,8 @@ dtb-$(CONFIG_ARCH_ORION5X) += \</div><div class='ctx'> dtb-$(CONFIG_ARCH_PRIMA2) += \</div><div class='ctx'> 	prima2-evb.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_OXNAS) += \</div><div class='del'>-	wd-mbwe.dtb</div><div class='add'>+	wd-mbwe.dtb \</div><div class='add'>+	cloudengines-pogoplug-series-3.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_QCOM) += \</div><div class='ctx'> 	qcom-apq8060-dragonboard.dtb \</div><div class='ctx'> 	qcom-apq8064-arrow-sd-600eval.dtb \</div><div class='hunk'>@@ -620,7 +658,8 @@ dtb-$(CONFIG_ARCH_QCOM) += \</div><div class='ctx'> 	qcom-msm8660-surf.dtb \</div><div class='ctx'> 	qcom-msm8960-cdp.dtb \</div><div class='ctx'> 	qcom-msm8974-lge-nexus5-hammerhead.dtb \</div><div class='del'>-	qcom-msm8974-sony-xperia-honami.dtb</div><div class='add'>+	qcom-msm8974-sony-xperia-honami.dtb \</div><div class='add'>+	qcom-mdm9615-wp8548-mangoh-green.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_REALVIEW) += \</div><div class='ctx'> 	arm-realview-pb1176.dtb \</div><div class='ctx'> 	arm-realview-pb11mp.dtb \</div><div class='hunk'>@@ -635,11 +674,14 @@ dtb-$(CONFIG_ARCH_REALVIEW) += \</div><div class='ctx'> 	arm-realview-pba8.dtb \</div><div class='ctx'> 	arm-realview-pbx-a9.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_ROCKCHIP) += \</div><div class='add'>+	rk1108-evb.dtb \</div><div class='ctx'> 	rk3036-evb.dtb \</div><div class='ctx'> 	rk3036-kylin.dtb \</div><div class='ctx'> 	rk3066a-bqcurie2.dtb \</div><div class='ctx'> 	rk3066a-marsboard.dtb \</div><div class='add'>+	rk3066a-mk808.dtb \</div><div class='ctx'> 	rk3066a-rayeager.dtb \</div><div class='add'>+	rk3188-px3-evb.dtb \</div><div class='ctx'> 	rk3188-radxarock.dtb \</div><div class='ctx'> 	rk3228-evb.dtb \</div><div class='ctx'> 	rk3229-evb.dtb \</div><div class='hunk'>@@ -677,6 +719,8 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \</div><div class='ctx'> 	r7s72100-rskrza1.dtb \</div><div class='ctx'> 	r8a73a4-ape6evm.dtb \</div><div class='ctx'> 	r8a7740-armadillo800eva.dtb \</div><div class='add'>+	r8a7743-sk-rzg1m.dtb \</div><div class='add'>+	r8a7745-sk-rzg1e.dtb \</div><div class='ctx'> 	r8a7778-bockw.dtb \</div><div class='ctx'> 	r8a7779-marzen.dtb \</div><div class='ctx'> 	r8a7790-lager.dtb \</div><div class='hunk'>@@ -690,12 +734,15 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \</div><div class='ctx'> 	sh73a0-kzm9g.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_SOCFPGA) += \</div><div class='ctx'> 	socfpga_arria5_socdk.dtb \</div><div class='add'>+	socfpga_arria10_socdk_nand.dtb \</div><div class='add'>+	socfpga_arria10_socdk_qspi.dtb \</div><div class='ctx'> 	socfpga_arria10_socdk_sdmmc.dtb \</div><div class='ctx'> 	socfpga_cyclone5_mcvevk.dtb \</div><div class='ctx'> 	socfpga_cyclone5_socdk.dtb \</div><div class='ctx'> 	socfpga_cyclone5_de0_sockit.dtb \</div><div class='ctx'> 	socfpga_cyclone5_sockit.dtb \</div><div class='ctx'> 	socfpga_cyclone5_socrates.dtb \</div><div class='add'>+	socfpga_cyclone5_sodia.dtb \</div><div class='ctx'> 	socfpga_cyclone5_vining_fpga.dtb \</div><div class='ctx'> 	socfpga_vt.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_SPEAR13XX) += \</div><div class='hunk'>@@ -712,16 +759,12 @@ dtb-$(CONFIG_ARCH_STI) += \</div><div class='ctx'> 	stih407-b2120.dtb \</div><div class='ctx'> 	stih410-b2120.dtb \</div><div class='ctx'> 	stih410-b2260.dtb \</div><div class='del'>-	stih415-b2000.dtb \</div><div class='del'>-	stih415-b2020.dtb \</div><div class='del'>-	stih416-b2000.dtb \</div><div class='del'>-	stih416-b2020.dtb \</div><div class='del'>-	stih416-b2020e.dtb \</div><div class='ctx'> 	stih418-b2199.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_STM32)+= \</div><div class='ctx'> 	stm32f429-disco.dtb \</div><div class='ctx'> 	stm32f469-disco.dtb \</div><div class='del'>-	stm32429i-eval.dtb</div><div class='add'>+	stm32429i-eval.dtb \</div><div class='add'>+	stm32746g-eval.dtb</div><div class='ctx'> dtb-$(CONFIG_MACH_SUN4I) += \</div><div class='ctx'> 	sun4i-a10-a1000.dtb \</div><div class='ctx'> 	sun4i-a10-ba10-tvbox.dtb \</div><div class='hunk'>@@ -756,10 +799,12 @@ dtb-$(CONFIG_MACH_SUN5I) += \</div><div class='ctx'> 	sun5i-a13-empire-electronix-m712.dtb \</div><div class='ctx'> 	sun5i-a13-hsg-h702.dtb \</div><div class='ctx'> 	sun5i-a13-inet-98v-rev2.dtb \</div><div class='add'>+	sun5i-a13-licheepi-one.dtb \</div><div class='ctx'> 	sun5i-a13-olinuxino.dtb \</div><div class='ctx'> 	sun5i-a13-olinuxino-micro.dtb \</div><div class='ctx'> 	sun5i-a13-q8-tablet.dtb \</div><div class='ctx'> 	sun5i-a13-utoo-p66.dtb \</div><div class='add'>+	sun5i-gr8-chip-pro.dtb \</div><div class='ctx'> 	sun5i-gr8-evb.dtb \</div><div class='ctx'> 	sun5i-r8-chip.dtb</div><div class='ctx'> dtb-$(CONFIG_MACH_SUN6I) += \</div><div class='hunk'>@@ -818,7 +863,10 @@ dtb-$(CONFIG_MACH_SUN8I) += \</div><div class='ctx'> 	sun8i-a33-sinlinx-sina33.dtb \</div><div class='ctx'> 	sun8i-a83t-allwinner-h8homlet-v2.dtb \</div><div class='ctx'> 	sun8i-a83t-cubietruck-plus.dtb \</div><div class='add'>+	sun8i-h2-plus-orangepi-zero.dtb \</div><div class='ctx'> 	sun8i-h3-bananapi-m2-plus.dtb \</div><div class='add'>+	sun8i-h3-beelink-x2.dtb \</div><div class='add'>+	sun8i-h3-nanopi-m1.dtb	\</div><div class='ctx'> 	sun8i-h3-nanopi-neo.dtb \</div><div class='ctx'> 	sun8i-h3-orangepi-2.dtb \</div><div class='ctx'> 	sun8i-h3-orangepi-lite.dtb \</div><div class='hunk'>@@ -827,7 +875,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \</div><div class='ctx'> 	sun8i-h3-orangepi-pc-plus.dtb \</div><div class='ctx'> 	sun8i-h3-orangepi-plus.dtb \</div><div class='ctx'> 	sun8i-h3-orangepi-plus2e.dtb \</div><div class='del'>-	sun8i-r16-parrot.dtb</div><div class='add'>+	sun8i-r16-parrot.dtb \</div><div class='add'>+	sun8i-v3s-licheepi-zero.dtb</div><div class='ctx'> dtb-$(CONFIG_MACH_SUN9I) += \</div><div class='ctx'> 	sun9i-a80-optimus.dtb \</div><div class='ctx'> 	sun9i-a80-cubieboard4.dtb</div><div class='hunk'>@@ -897,6 +946,7 @@ dtb-$(CONFIG_ARCH_VT8500) += \</div><div class='ctx'> 	wm8750-apc8750.dtb \</div><div class='ctx'> 	wm8850-w70v2.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_ZYNQ) += \</div><div class='add'>+	zynq-microzed.dtb \</div><div class='ctx'> 	zynq-parallella.dtb \</div><div class='ctx'> 	zynq-zc702.dtb \</div><div class='ctx'> 	zynq-zc706.dtb \</div><div class='hunk'>@@ -920,7 +970,10 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \</div><div class='ctx'> 	armada-385-db-ap.dtb \</div><div class='ctx'> 	armada-385-linksys-caiman.dtb \</div><div class='ctx'> 	armada-385-linksys-cobra.dtb \</div><div class='add'>+	armada-385-turris-omnia.dtb \</div><div class='ctx'> 	armada-388-clearfog.dtb \</div><div class='add'>+	armada-388-clearfog-base.dtb \</div><div class='add'>+	armada-388-clearfog-pro.dtb \</div><div class='ctx'> 	armada-388-db.dtb \</div><div class='ctx'> 	armada-388-gp.dtb \</div><div class='ctx'> 	armada-388-rd.dtb</div><div class='hunk'>@@ -929,6 +982,8 @@ dtb-$(CONFIG_MACH_ARMADA_39X) += \</div><div class='ctx'> dtb-$(CONFIG_MACH_ARMADA_XP) += \</div><div class='ctx'> 	armada-xp-axpwifiap.dtb \</div><div class='ctx'> 	armada-xp-db.dtb \</div><div class='add'>+	armada-xp-db-dxbc2.dtb \</div><div class='add'>+	armada-xp-db-xc3-24g4xg.dtb \</div><div class='ctx'> 	armada-xp-gp.dtb \</div><div class='ctx'> 	armada-xp-lenovo-ix4-300d.dtb \</div><div class='ctx'> 	armada-xp-linksys-mamba.dtb \</div><div class='hunk'>@@ -953,6 +1008,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \</div><div class='ctx'> 	mt8135-evbp1.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \</div><div class='add'>+	aspeed-bmc-opp-romulus.dtb \</div><div class='ctx'> 	aspeed-ast2500-evb.dtb</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/alpine.dtsi b/arch/arm/boot/dts/alpine.dtsi<br/>index db8752fc480e..d0eefc3b886c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/alpine.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/alpine.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/alpine.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/alpine.dtsi</a></div><div class='hunk'>@@ -93,7 +93,7 @@</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			reg = &lt;0x0 0xfb001000 0x0 0x1000&gt;,</div><div class='ctx'> 			      &lt;0x0 0xfb002000 0x0 0x2000&gt;,</div><div class='del'>-			      &lt;0x0 0xfb004000 0x0 0x1000&gt;,</div><div class='add'>+			      &lt;0x0 0xfb004000 0x0 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x0 0xfb006000 0x0 0x2000&gt;;</div><div class='ctx'> 			interrupts =</div><div class='ctx'> 				&lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-baltos-ir2110.dts b/arch/arm/boot/dts/am335x-baltos-ir2110.dts<br/>index a9a97307d66c..501c7527121b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-baltos-ir2110.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-baltos-ir2110.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-baltos-ir2110.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-baltos-ir2110.dts</a></div><div class='hunk'>@@ -54,16 +54,22 @@</div><div class='ctx'> 	dr_mode = "host";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;davinci_mdio {</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;cpsw_emac0 {</div><div class='del'>-	phy_id = &lt;&amp;davinci_mdio&gt;, &lt;1&gt;;</div><div class='ctx'> 	phy-mode = "rmii";</div><div class='ctx'> 	dual_emac_res_vlan = &lt;1&gt;;</div><div class='add'>+	phy-handle = &lt;&amp;phy0&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cpsw_emac1 {</div><div class='del'>-	phy_id = &lt;&amp;davinci_mdio&gt;, &lt;7&gt;;</div><div class='ctx'> 	phy-mode = "rgmii-txid";</div><div class='ctx'> 	dual_emac_res_vlan = &lt;2&gt;;</div><div class='add'>+	phy-handle = &lt;&amp;phy1&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;phy_sel {</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-baltos-ir3220.dts b/arch/arm/boot/dts/am335x-baltos-ir3220.dts<br/>index fe002a17c04b..19f53b8569e1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-baltos-ir3220.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-baltos-ir3220.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-baltos-ir3220.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-baltos-ir3220.dts</a></div><div class='hunk'>@@ -109,9 +109,9 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cpsw_emac1 {</div><div class='del'>-	phy_id = &lt;&amp;davinci_mdio&gt;, &lt;7&gt;;</div><div class='ctx'> 	phy-mode = "rgmii-txid";</div><div class='ctx'> 	dual_emac_res_vlan = &lt;2&gt;;</div><div class='add'>+	phy-handle = &lt;&amp;phy1&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;phy_sel {</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-baltos-ir5221.dts b/arch/arm/boot/dts/am335x-baltos-ir5221.dts<br/>index d0faa7b8c5da..2b9d7f4db23f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-baltos-ir5221.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-baltos-ir5221.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-baltos-ir5221.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-baltos-ir5221.dts</a></div><div class='hunk'>@@ -114,7 +114,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;usb1 {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	dr_mode = "otg";</div><div class='add'>+	dr_mode = "host";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cpsw_emac0 {</div><div class='hunk'>@@ -127,9 +127,9 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cpsw_emac1 {</div><div class='del'>-	phy_id = &lt;&amp;davinci_mdio&gt;, &lt;7&gt;;</div><div class='ctx'> 	phy-mode = "rgmii-txid";</div><div class='ctx'> 	dual_emac_res_vlan = &lt;2&gt;;</div><div class='add'>+	phy-handle = &lt;&amp;phy1&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;phy_sel {</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-baltos.dtsi b/arch/arm/boot/dts/am335x-baltos.dtsi<br/>index dd45d172a892..efb5eae290a8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-baltos.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-baltos.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-baltos.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-baltos.dtsi</a></div><div class='hunk'>@@ -364,11 +364,14 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;davinci_mdio {</div><div class='add'>+	status = "okay";</div><div class='ctx'> 	pinctrl-names = "default", "sleep";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;davinci_mdio_default&gt;;</div><div class='ctx'> 	pinctrl-1 = &lt;&amp;davinci_mdio_sleep&gt;;</div><div class='ctx'> </div><div class='del'>-	status = "okay";</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;7&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc1 {</div><div class='hunk'>@@ -406,3 +409,7 @@</div><div class='ctx'> &amp;gpio0 {</div><div class='ctx'> 	ti,no-reset-on-init;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;gpio3 {</div><div class='add'>+	ti,no-reset-on-init;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi<br/>index 007b5e5a51a9..bf6b26abe35b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-bone-common.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-bone-common.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-bone-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-bone-common.dtsi</a></div><div class='hunk'>@@ -207,6 +207,8 @@</div><div class='ctx'> &amp;usb0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	dr_mode = "peripheral";</div><div class='add'>+	interrupts-extended = &lt;&amp;intc 18 &amp;tps 0&gt;;</div><div class='add'>+	interrupt-names = "mc", "vbus";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb1 {</div><div class='hunk'>@@ -310,8 +312,23 @@</div><div class='ctx'> 	 * by the hardware problems. (Tip: double-check by performing a current</div><div class='ctx'> 	 * measurement after shutdown: it should be less than 1 mA.)</div><div class='ctx'> 	 */</div><div class='add'>+</div><div class='add'>+	interrupts = &lt;7&gt;; /* NMI */</div><div class='add'>+	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+</div><div class='ctx'> 	ti,pmic-shutdown-controller;</div><div class='ctx'> </div><div class='add'>+	charger {</div><div class='add'>+		interrupts = &lt;0&gt;, &lt;1&gt;;</div><div class='add'>+		interrupt-names = "USB", "AC";</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pwrbutton {</div><div class='add'>+		interrupts = &lt;2&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	regulators {</div><div class='ctx'> 		dcdc1_reg: regulator@0 {</div><div class='ctx'> 			regulator-name = "vdds_dpr";</div><div class='hunk'>@@ -393,3 +410,8 @@</div><div class='ctx'> &amp;sham {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;rtc {</div><div class='add'>+	clocks = &lt;&amp;clk_32768_ck&gt;, &lt;&amp;clkdiv32k_ick&gt;;</div><div class='add'>+	clock-names = "ext-clk", "int-clk";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-common.dtsi<br/>new file mode 100644<br/>index 000000000000..325daae40278<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-boneblack-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-boneblack-common.dtsi</a></div><div class='hunk'>@@ -0,0 +1,163 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/display/tda998x.h&gt;</div><div class='add'>+</div><div class='add'>+&amp;ldo3_reg {</div><div class='add'>+	regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	regulator-always-on;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	vmmc-supply = &lt;&amp;vmmcsd_fixed&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc2 {</div><div class='add'>+	vmmc-supply = &lt;&amp;vmmcsd_fixed&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;am33xx_pinmux {</div><div class='add'>+	nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr0 */</div><div class='add'>+			AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data0.lcd_data0 */</div><div class='add'>+			AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data1.lcd_data1 */</div><div class='add'>+			AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data2.lcd_data2 */</div><div class='add'>+			AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0)		/* lcd_data3.lcd_data3 */</div><div class='add'>+			AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data4.lcd_data4 */</div><div class='add'>+			AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data5.lcd_data5 */</div><div class='add'>+			AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data6.lcd_data6 */</div><div class='add'>+			AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data7.lcd_data7 */</div><div class='add'>+			AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data8.lcd_data8 */</div><div class='add'>+			AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data9.lcd_data9 */</div><div class='add'>+			AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data10.lcd_data10 */</div><div class='add'>+			AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data11.lcd_data11 */</div><div class='add'>+			AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data12.lcd_data12 */</div><div class='add'>+			AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data13.lcd_data13 */</div><div class='add'>+			AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data14.lcd_data14 */</div><div class='add'>+			AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data15.lcd_data15 */</div><div class='add'>+			AM33XX_IOPAD(0x8e0, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_vsync.lcd_vsync */</div><div class='add'>+			AM33XX_IOPAD(0x8e4, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_hsync.lcd_hsync */</div><div class='add'>+			AM33XX_IOPAD(0x8e8, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_pclk.lcd_pclk */</div><div class='add'>+			AM33XX_IOPAD(0x8ec, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_ac_bias_en.lcd_ac_bias_en */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr0 */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mcasp0_pins: mcasp0_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */</div><div class='add'>+			AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/</div><div class='add'>+			AM33XX_IOPAD(0x994, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */</div><div class='add'>+			AM33XX_IOPAD(0x990, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */</div><div class='add'>+			AM33XX_IOPAD(0x86c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;lcdc {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* If you want to get 24 bit RGB and 16 BGR mode instead of</div><div class='add'>+	 * current 16 bit RGB and 24 BGR modes, set the propety</div><div class='add'>+	 * below to "crossed" and uncomment the video-ports -property</div><div class='add'>+	 * in tda19988 node.</div><div class='add'>+	 */</div><div class='add'>+	blue-and-red-wiring = "straight";</div><div class='add'>+</div><div class='add'>+	port {</div><div class='add'>+		lcdc_0: endpoint@0 {</div><div class='add'>+			remote-endpoint = &lt;&amp;hdmi_0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	tda19988: tda19988 {</div><div class='add'>+		compatible = "nxp,tda998x";</div><div class='add'>+		reg = &lt;0x70&gt;;</div><div class='add'>+</div><div class='add'>+		pinctrl-names = "default", "off";</div><div class='add'>+		pinctrl-0 = &lt;&amp;nxp_hdmi_bonelt_pins&gt;;</div><div class='add'>+		pinctrl-1 = &lt;&amp;nxp_hdmi_bonelt_off_pins&gt;;</div><div class='add'>+</div><div class='add'>+		/* Convert 24bit BGR to RGB, e.g. cross red and blue wiring */</div><div class='add'>+		/* video-ports = &lt;0x234501&gt;; */</div><div class='add'>+</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+		audio-ports = &lt;	TDA998x_I2S	0x03&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			port@0 {</div><div class='add'>+				hdmi_0: endpoint@0 {</div><div class='add'>+					remote-endpoint = &lt;&amp;lcdc_0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rtc {</div><div class='add'>+	system-power-controller;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mcasp0	{</div><div class='add'>+	#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mcasp0_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+	op-mode = &lt;0&gt;;	/* MCASP_IIS_MODE */</div><div class='add'>+	tdm-slots = &lt;2&gt;;</div><div class='add'>+	serial-dir = &lt;	/* 0: INACTIVE, 1: TX, 2: RX */</div><div class='add'>+			0 0 1 0</div><div class='add'>+		&gt;;</div><div class='add'>+	tx-num-evt = &lt;32&gt;;</div><div class='add'>+	rx-num-evt = &lt;32&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	clk_mcasp0_fixed: clk_mcasp0_fixed {</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		clock-frequency = &lt;24576000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clk_mcasp0: clk_mcasp0 {</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "gpio-gate-clock";</div><div class='add'>+		clocks = &lt;&amp;clk_mcasp0_fixed&gt;;</div><div class='add'>+		enable-gpios = &lt;&amp;gpio1 27 0&gt;; /* BeagleBone Black Clk enable on GPIO1_27 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "simple-audio-card";</div><div class='add'>+		simple-audio-card,name = "TI BeagleBone Black";</div><div class='add'>+		simple-audio-card,format = "i2s";</div><div class='add'>+		simple-audio-card,bitclock-master = &lt;&amp;dailink0_master&gt;;</div><div class='add'>+		simple-audio-card,frame-master = &lt;&amp;dailink0_master&gt;;</div><div class='add'>+</div><div class='add'>+		dailink0_master: simple-audio-card,cpu {</div><div class='add'>+			sound-dai = &lt;&amp;mcasp0&gt;;</div><div class='add'>+			clocks = &lt;&amp;clk_mcasp0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		simple-audio-card,codec {</div><div class='add'>+			sound-dai = &lt;&amp;tda19988&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts<br/>new file mode 100644<br/>index 000000000000..105bd10655f7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-boneblack-wireless.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-boneblack-wireless.dts</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "am33xx.dtsi"</div><div class='add'>+#include "am335x-bone-common.dtsi"</div><div class='add'>+#include "am335x-boneblack-common.dtsi"</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "TI AM335x BeagleBone Black Wireless";</div><div class='add'>+	compatible = "ti,am335x-bone-black-wireless", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";</div><div class='add'>+</div><div class='add'>+	wlan_en_reg: fixedregulator@2 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "wlan-en-regulator";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		startup-delay-us= &lt;70000&gt;;</div><div class='add'>+</div><div class='add'>+		/* WL_EN */</div><div class='add'>+		gpio = &lt;&amp;gpio3 9 0&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;am33xx_pinmux {</div><div class='add'>+	bt_pins: pinmux_bt_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gmii1_txd0.gpio0_28 - BT_EN */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mmc3_pins: pinmux_mmc3_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x93c, PIN_INPUT_PULLUP | MUX_MODE6 ) /* (L15) gmii1_rxd1.mmc2_clk */</div><div class='add'>+			AM33XX_IOPAD(0x914, PIN_INPUT_PULLUP | MUX_MODE6 ) /* (J16) gmii1_txen.mmc2_cmd */</div><div class='add'>+			AM33XX_IOPAD(0x918, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (J17) gmii1_rxdv.mmc2_dat0 */</div><div class='add'>+			AM33XX_IOPAD(0x91c, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (J18) gmii1_txd3.mmc2_dat1 */</div><div class='add'>+			AM33XX_IOPAD(0x920, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (K15) gmii1_txd2.mmc2_dat2 */</div><div class='add'>+			AM33XX_IOPAD(0x908, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (H16) gmii1_col.mmc2_dat3 */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart3_pins: pinmux_uart3_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x934, PIN_INPUT_PULLUP | MUX_MODE1)	/* gmii1_rxd3.uart3_rxd */</div><div class='add'>+			AM33XX_IOPAD(0x938, PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* gmii1_rxd2.uart3_txd */</div><div class='add'>+			AM33XX_IOPAD(0x948, PIN_INPUT | MUX_MODE3)		/* mdio_data.uart3_ctsn */</div><div class='add'>+			AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* mdio_clk.uart3_rtsn */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wl18xx_pins: pinmux_wl18xx_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x92c, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gmii1_txclk.gpio3_9 WL_EN */</div><div class='add'>+			AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_refclk.gpio0_29 WL_IRQ */</div><div class='add'>+			AM33XX_IOPAD(0x930, PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gmii1_rxclk.gpio3_10 LS_BUF_EN */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mac {</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc3 {</div><div class='add'>+	dmas = &lt;&amp;edma_xbar 12 0 1</div><div class='add'>+		&amp;edma_xbar 13 0 2&gt;;</div><div class='add'>+	dma-names = "tx", "rx";</div><div class='add'>+	status = "okay";</div><div class='add'>+	vmmc-supply = &lt;&amp;wlan_en_reg&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	cap-power-off-card;</div><div class='add'>+	ti,needs-special-hs-handling;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc3_pins &amp;wl18xx_pins&gt;;</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	wlcore: wlcore@2 {</div><div class='add'>+		compatible = "ti,wl1835";</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+		interrupts = &lt;29 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart3_pins &amp;bt_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gpio3 {</div><div class='add'>+	ls_buf_en {</div><div class='add'>+		gpio-hog;</div><div class='add'>+		gpios = &lt;10 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		output-high;</div><div class='add'>+		line-name = "LS_BUF_EN";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts<br/>index 6bbb1fee0868..77273df1a028 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-boneblack.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-boneblack.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-boneblack.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-boneblack.dts</a></div><div class='hunk'>@@ -9,151 +9,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "am33xx.dtsi"</div><div class='ctx'> #include "am335x-bone-common.dtsi"</div><div class='del'>-#include &lt;dt-bindings/display/tda998x.h&gt;</div><div class='add'>+#include "am335x-boneblack-common.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "TI AM335x BeagleBone Black";</div><div class='ctx'> 	compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-&amp;ldo3_reg {</div><div class='del'>-	regulator-min-microvolt = &lt;1800000&gt;;</div><div class='del'>-	regulator-max-microvolt = &lt;1800000&gt;;</div><div class='del'>-	regulator-always-on;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;mmc1 {</div><div class='del'>-	vmmc-supply = &lt;&amp;vmmcsd_fixed&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;mmc2 {</div><div class='del'>-	vmmc-supply = &lt;&amp;vmmcsd_fixed&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='del'>-	bus-width = &lt;8&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;am33xx_pinmux {</div><div class='del'>-	nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr0 */</div><div class='del'>-			AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data0.lcd_data0 */</div><div class='del'>-			AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data1.lcd_data1 */</div><div class='del'>-			AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data2.lcd_data2 */</div><div class='del'>-			AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0)		/* lcd_data3.lcd_data3 */</div><div class='del'>-			AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data4.lcd_data4 */</div><div class='del'>-			AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data5.lcd_data5 */</div><div class='del'>-			AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data6.lcd_data6 */</div><div class='del'>-			AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data7.lcd_data7 */</div><div class='del'>-			AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data8.lcd_data8 */</div><div class='del'>-			AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data9.lcd_data9 */</div><div class='del'>-			AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data10.lcd_data10 */</div><div class='del'>-			AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data11.lcd_data11 */</div><div class='del'>-			AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0)		/* lcd_data12.lcd_data12 */</div><div class='del'>-			AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0)		/* lcd_data13.lcd_data13 */</div><div class='del'>-			AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0)		/* lcd_data14.lcd_data14 */</div><div class='del'>-			AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0)		/* lcd_data15.lcd_data15 */</div><div class='del'>-			AM33XX_IOPAD(0x8e0, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_vsync.lcd_vsync */</div><div class='del'>-			AM33XX_IOPAD(0x8e4, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_hsync.lcd_hsync */</div><div class='del'>-			AM33XX_IOPAD(0x8e8, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_pclk.lcd_pclk */</div><div class='del'>-			AM33XX_IOPAD(0x8ec, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* lcd_ac_bias_en.lcd_ac_bias_en */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-	nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr0 */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mcasp0_pins: mcasp0_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */</div><div class='del'>-			AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/</div><div class='del'>-			AM33XX_IOPAD(0x994, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */</div><div class='del'>-			AM33XX_IOPAD(0x990, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */</div><div class='del'>-			AM33XX_IOPAD(0x86c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;lcdc {</div><div class='del'>-	status = "okay";</div><div class='del'>-	port {</div><div class='del'>-		lcdc_0: endpoint@0 {</div><div class='del'>-			remote-endpoint = &lt;&amp;hdmi_0&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;i2c0 {</div><div class='del'>-	tda19988: tda19988 {</div><div class='del'>-		compatible = "nxp,tda998x";</div><div class='del'>-		reg = &lt;0x70&gt;;</div><div class='del'>-</div><div class='del'>-		pinctrl-names = "default", "off";</div><div class='del'>-		pinctrl-0 = &lt;&amp;nxp_hdmi_bonelt_pins&gt;;</div><div class='del'>-		pinctrl-1 = &lt;&amp;nxp_hdmi_bonelt_off_pins&gt;;</div><div class='del'>-</div><div class='del'>-		#sound-dai-cells = &lt;0&gt;;</div><div class='del'>-		audio-ports = &lt;	TDA998x_I2S	0x03&gt;;</div><div class='del'>-</div><div class='del'>-		ports {</div><div class='del'>-			port@0 {</div><div class='del'>-				hdmi_0: endpoint@0 {</div><div class='del'>-					remote-endpoint = &lt;&amp;lcdc_0&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;rtc {</div><div class='del'>-	system-power-controller;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;mcasp0	{</div><div class='del'>-	#sound-dai-cells = &lt;0&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;mcasp0_pins&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-	op-mode = &lt;0&gt;;	/* MCASP_IIS_MODE */</div><div class='del'>-	tdm-slots = &lt;2&gt;;</div><div class='del'>-	serial-dir = &lt;	/* 0: INACTIVE, 1: TX, 2: RX */</div><div class='del'>-			0 0 1 0</div><div class='del'>-		&gt;;</div><div class='del'>-	tx-num-evt = &lt;32&gt;;</div><div class='del'>-	rx-num-evt = &lt;32&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	clk_mcasp0_fixed: clk_mcasp0_fixed {</div><div class='del'>-		#clock-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "fixed-clock";</div><div class='del'>-		clock-frequency = &lt;24576000&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	clk_mcasp0: clk_mcasp0 {</div><div class='del'>-		#clock-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "gpio-gate-clock";</div><div class='del'>-		clocks = &lt;&amp;clk_mcasp0_fixed&gt;;</div><div class='del'>-		enable-gpios = &lt;&amp;gpio1 27 0&gt;; /* BeagleBone Black Clk enable on GPIO1_27 */</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sound {</div><div class='del'>-		compatible = "simple-audio-card";</div><div class='del'>-		simple-audio-card,name = "TI BeagleBone Black";</div><div class='del'>-		simple-audio-card,format = "i2s";</div><div class='del'>-		simple-audio-card,bitclock-master = &lt;&amp;dailink0_master&gt;;</div><div class='del'>-		simple-audio-card,frame-master = &lt;&amp;dailink0_master&gt;;</div><div class='del'>-</div><div class='del'>-		dailink0_master: simple-audio-card,cpu {</div><div class='del'>-			sound-dai = &lt;&amp;mcasp0&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_mcasp0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		simple-audio-card,codec {</div><div class='del'>-			sound-dai = &lt;&amp;tda19988&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-bonegreen-common.dtsi b/arch/arm/boot/dts/am335x-bonegreen-common.dtsi<br/>new file mode 100644<br/>index 000000000000..853e6d3a028d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-bonegreen-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-bonegreen-common.dtsi</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;ldo3_reg {</div><div class='add'>+	regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	regulator-always-on;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	vmmc-supply = &lt;&amp;vmmcsd_fixed&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc2 {</div><div class='add'>+	vmmc-supply = &lt;&amp;vmmcsd_fixed&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;am33xx_pinmux {</div><div class='add'>+	uart2_pins: uart2_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x950, PIN_INPUT | MUX_MODE1)	/* spi0_sclk.uart2_rxd */</div><div class='add'>+			AM33XX_IOPAD(0x954, PIN_OUTPUT | MUX_MODE1)	/* spi0_d0.uart2_txd */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart2_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rtc {</div><div class='add'>+	system-power-controller;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts<br/>new file mode 100644<br/>index 000000000000..9d1a0fd555f3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-bonegreen-wireless.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-bonegreen-wireless.dts</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "am33xx.dtsi"</div><div class='add'>+#include "am335x-bone-common.dtsi"</div><div class='add'>+#include "am335x-bonegreen-common.dtsi"</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "TI AM335x BeagleBone Green Wireless";</div><div class='add'>+	compatible = "ti,am335x-bone-green-wireless", "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";</div><div class='add'>+</div><div class='add'>+	wlan_en_reg: fixedregulator@2 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "wlan-en-regulator";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		startup-delay-us= &lt;70000&gt;;</div><div class='add'>+</div><div class='add'>+		/* WL_EN */</div><div class='add'>+		gpio = &lt;&amp;gpio0 26 0&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;am33xx_pinmux {</div><div class='add'>+	bt_pins: pinmux_bt_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x878, PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_ad12.gpio1_28 BT_EN */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mmc3_pins: pinmux_mmc3_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x830, PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_ad12.mmc2_dat0 */</div><div class='add'>+			AM33XX_IOPAD(0x834, PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_ad13.mmc2_dat1 */</div><div class='add'>+			AM33XX_IOPAD(0x838, PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_ad14.mmc2_dat2 */</div><div class='add'>+			AM33XX_IOPAD(0x83c, PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_ad15.mmc2_dat3 */</div><div class='add'>+			AM33XX_IOPAD(0x888, PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_csn3.mmc2_cmd */</div><div class='add'>+			AM33XX_IOPAD(0x88c, PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_clk.mmc2_clk */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart3_pins: pinmux_uart3_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x934, PIN_INPUT_PULLUP | MUX_MODE1)	/* gmii1_rxd3.uart3_rxd */</div><div class='add'>+			AM33XX_IOPAD(0x938, PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* gmii1_rxd2.uart3_txd */</div><div class='add'>+			AM33XX_IOPAD(0x948, PIN_INPUT | MUX_MODE3)		/* mdio_data.uart3_ctsn */</div><div class='add'>+			AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* mdio_clk.uart3_rtsn */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wl18xx_pins: pinmux_wl18xx_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x828, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_ad10.gpio0_26 WL_EN */</div><div class='add'>+			AM33XX_IOPAD(0x82C, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_ad11.gpio0_27 WL_IRQ */</div><div class='add'>+			AM33XX_IOPAD(0x87C, PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_csn0.gpio1_29 LS_BUF_EN */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mac {</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc3 {</div><div class='add'>+	dmas = &lt;&amp;edma_xbar 12 0 1</div><div class='add'>+		&amp;edma_xbar 13 0 2&gt;;</div><div class='add'>+	dma-names = "tx", "rx";</div><div class='add'>+	status = "okay";</div><div class='add'>+	vmmc-supply = &lt;&amp;wlan_en_reg&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	cap-power-off-card;</div><div class='add'>+	ti,needs-special-hs-handling;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc3_pins &amp;wl18xx_pins&gt;;</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	wlcore: wlcore@2 {</div><div class='add'>+		compatible = "ti,wl1835";</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+		interrupts = &lt;27 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart3_pins &amp;bt_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gpio1 {</div><div class='add'>+	ls_buf_en {</div><div class='add'>+		gpio-hog;</div><div class='add'>+		gpios = &lt;29 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		output-high;</div><div class='add'>+		line-name = "LS_BUF_EN";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* BT_AUD_OUT from wl1835 has to be pulled low when WL_EN is activated.*/</div><div class='add'>+/* in case it isn't, wilink8 ends up in one of the test modes that     */</div><div class='add'>+/* intruces various issues (elp wkaeup timeouts etc.)                  */</div><div class='add'>+/* On the BBGW this pin is routed through the level shifter (U21) that */</div><div class='add'>+/* introduces a pullup on the line and wilink8 ends up in a bad state. */</div><div class='add'>+/* use a gpio hog to force this pin low. An alternative may be adding  */</div><div class='add'>+/* an external pulldown on U21 pin 4.                                  */</div><div class='add'>+</div><div class='add'>+&amp;gpio3 {</div><div class='add'>+	bt_aud_in {</div><div class='add'>+		gpio-hog;</div><div class='add'>+		gpios = &lt;16 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		output-low;</div><div class='add'>+		line-name = "MCASP0_AHCLKR";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-bonegreen.dts b/arch/arm/boot/dts/am335x-bonegreen.dts<br/>index dce3c8657e04..a8b4d969ce2a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-bonegreen.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-bonegreen.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-bonegreen.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-bonegreen.dts</a></div><div class='hunk'>@@ -9,45 +9,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "am33xx.dtsi"</div><div class='ctx'> #include "am335x-bone-common.dtsi"</div><div class='add'>+#include "am335x-bonegreen-common.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "TI AM335x BeagleBone Green";</div><div class='ctx'> 	compatible = "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-&amp;ldo3_reg {</div><div class='del'>-	regulator-min-microvolt = &lt;1800000&gt;;</div><div class='del'>-	regulator-max-microvolt = &lt;1800000&gt;;</div><div class='del'>-	regulator-always-on;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;mmc1 {</div><div class='del'>-	vmmc-supply = &lt;&amp;vmmcsd_fixed&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;mmc2 {</div><div class='del'>-	vmmc-supply = &lt;&amp;vmmcsd_fixed&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='del'>-	bus-width = &lt;8&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;am33xx_pinmux {</div><div class='del'>-	uart2_pins: uart2_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			AM33XX_IOPAD(0x950, PIN_INPUT | MUX_MODE1)	/* spi0_sclk.uart2_rxd */</div><div class='del'>-			AM33XX_IOPAD(0x954, PIN_OUTPUT | MUX_MODE1)	/* spi0_d0.uart2_txd */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;uart2 {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;uart2_pins&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;rtc {</div><div class='del'>-	system-power-controller;</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-chiliboard.dts b/arch/arm/boot/dts/am335x-chiliboard.dts<br/>index 2a624b3c9258..d8769799772e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-chiliboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-chiliboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-chiliboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-chiliboard.dts</a></div><div class='hunk'>@@ -185,3 +185,19 @@</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio0 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;tps {</div><div class='add'>+	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+	interrupts = &lt;7&gt;; /* NNMI */</div><div class='add'>+</div><div class='add'>+	charger {</div><div class='add'>+		interrupts = &lt;0&gt;, &lt;1&gt;;</div><div class='add'>+		interrupt-names = "USB", "AC";</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pwrbutton {</div><div class='add'>+		interrupts = &lt;2&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-chilisom.dtsi b/arch/arm/boot/dts/am335x-chilisom.dtsi<br/>index f9ee5859c154..1b43ebd08b38 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-chilisom.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-chilisom.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-chilisom.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-chilisom.dtsi</a></div><div class='hunk'>@@ -124,6 +124,14 @@</div><div class='ctx'> </div><div class='ctx'> &amp;rtc {</div><div class='ctx'> 	system-power-controller;</div><div class='add'>+</div><div class='add'>+	pinctrl-0 = &lt;&amp;ext_wakeup&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	ext_wakeup: ext-wakeup {</div><div class='add'>+		pins = "ext_wakeup0";</div><div class='add'>+		input-enable;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NAND Flash */</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts<br/>index e82432c79f85..1c37a7c1ea17 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-evm.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-evm.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-evm.dts</a></div><div class='hunk'>@@ -25,6 +25,10 @@</div><div class='ctx'> 		reg = &lt;0x80000000 0x10000000&gt;; /* 256 MB */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	vbat: fixedregulator0 {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "vbat";</div><div class='hunk'>@@ -783,3 +787,8 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;dcan1_pins_default&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;rtc {</div><div class='add'>+	clocks = &lt;&amp;clk_32768_ck&gt;, &lt;&amp;clkdiv32k_ick&gt;;</div><div class='add'>+	clock-names = "ext-clk", "int-clk";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts<br/>index 975c36e332a2..9e43c443738a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-evmsk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-evmsk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-evmsk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-evmsk.dts</a></div><div class='hunk'>@@ -32,6 +32,10 @@</div><div class='ctx'> 		reg = &lt;0x80000000 0x10000000&gt;; /* 256 MB */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	vbat: fixedregulator0 {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "vbat";</div><div class='hunk'>@@ -715,3 +719,8 @@</div><div class='ctx'> </div><div class='ctx'> 	blue-and-red-wiring = "crossed";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;rtc {</div><div class='add'>+	clocks = &lt;&amp;clk_32768_ck&gt;, &lt;&amp;clkdiv32k_ick&gt;;</div><div class='add'>+	clock-names = "ext-clk", "int-clk";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts<br/>index 85e04c205542..a2ad076822db 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-icev2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-icev2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-icev2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-icev2.dts</a></div><div class='hunk'>@@ -24,6 +24,10 @@</div><div class='ctx'> 		reg = &lt;0x80000000 0x10000000&gt;; /* 256 MB */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	vbat: fixedregulator0 {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "vbat";</div><div class='hunk'>@@ -43,52 +47,52 @@</div><div class='ctx'> 		enable-active-high;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	leds0 {</div><div class='add'>+	leds-iio {</div><div class='add'>+		status = "disabled";</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='del'>-</div><div class='del'>-		led0 {</div><div class='add'>+		led-out0 {</div><div class='ctx'> 			label = "out0";</div><div class='ctx'> 			gpios = &lt;&amp;tpic2810 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		led1 {</div><div class='add'>+		led-out1 {</div><div class='ctx'> 			label = "out1";</div><div class='ctx'> 			gpios = &lt;&amp;tpic2810 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		led2 {</div><div class='add'>+		led-out2 {</div><div class='ctx'> 			label = "out2";</div><div class='ctx'> 			gpios = &lt;&amp;tpic2810 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		led3 {</div><div class='add'>+		led-out3 {</div><div class='ctx'> 			label = "out3";</div><div class='ctx'> 			gpios = &lt;&amp;tpic2810 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		led4 {</div><div class='add'>+		led-out4 {</div><div class='ctx'> 			label = "out4";</div><div class='ctx'> 			gpios = &lt;&amp;tpic2810 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		led5 {</div><div class='add'>+		led-out5 {</div><div class='ctx'> 			label = "out5";</div><div class='ctx'> 			gpios = &lt;&amp;tpic2810 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		led6 {</div><div class='add'>+		led-out6 {</div><div class='ctx'> 			label = "out6";</div><div class='ctx'> 			gpios = &lt;&amp;tpic2810 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		led7 {</div><div class='add'>+		led-out7 {</div><div class='ctx'> 			label = "out7";</div><div class='ctx'> 			gpios = &lt;&amp;tpic2810 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			default-state = "off";</div><div class='hunk'>@@ -170,7 +174,6 @@</div><div class='ctx'> 			AM33XX_IOPAD(0x8fc, PIN_INPUT_PULLUP | MUX_MODE0) /* (G16) mmc0_dat0.mmc0_dat0 */</div><div class='ctx'> 			AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0) /* (G17) mmc0_clk.mmc0_clk */</div><div class='ctx'> 			AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0) /* (G18) mmc0_cmd.mmc0_cmd */</div><div class='del'>-			AM33XX_IOPAD(0x960, PIN_INPUT_PULLUP | MUX_MODE5) /* (C15) spi0_cs1.mmc0_sdcd */</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -187,6 +190,8 @@</div><div class='ctx'> 			AM33XX_IOPAD(0x954, PIN_INPUT_PULLUP | MUX_MODE0) /* (B17) spi0_d0.spi0_d0 */</div><div class='ctx'> 			AM33XX_IOPAD(0x958, PIN_INPUT_PULLUP | MUX_MODE0) /* (B16) spi0_d1.spi0_d1 */</div><div class='ctx'> 			AM33XX_IOPAD(0x95c, PIN_INPUT_PULLUP | MUX_MODE0) /* (A16) spi0_cs0.spi0_cs0 */</div><div class='add'>+			AM33XX_IOPAD(0x960, PIN_INPUT_PULLUP | MUX_MODE0) /* (C15) spi0_cs1.spi0_cs1 */</div><div class='add'>+			AM33XX_IOPAD(0x9a0, PIN_INPUT_PULLUP | MUX_MODE7) /* (B12) mcasp0_aclkr.gpio3[18] */</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -224,6 +229,31 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;spi0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi0_pins_default&gt;;</div><div class='add'>+</div><div class='add'>+	sn65hvs882@1 {</div><div class='add'>+		compatible = "pisosr-gpio";</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		load-gpios = &lt;&amp;gpio3 18 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		spi-max-frequency = &lt;1000000&gt;;</div><div class='add'>+		spi-cpol;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tscadc {</div><div class='add'>+	status = "okay";</div><div class='add'>+	adc {</div><div class='add'>+		ti,adc-channels = &lt;1 2 3 4 5 6 7&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #include "tps65910.dtsi"</div><div class='ctx'> </div><div class='ctx'> &amp;tps {</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts<br/>index 483d585c8908..807494bc722b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-nano.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-nano.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-nano.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-nano.dts</a></div><div class='hunk'>@@ -249,7 +249,8 @@</div><div class='ctx'> </div><div class='ctx'> 	#address-cells = &lt;2&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='del'>-	ranges = &lt;0 0 0x08000000 0x08000000&gt;;	/* CS0: NOR 128M */</div><div class='add'>+	ranges = &lt;0 0 0x08000000 0x08000000&gt;,	/* CS0: NOR 128M */</div><div class='add'>+		 &lt;1 0 0x1c000000 0x01000000&gt;;	/* CS1: FRAM 16M */</div><div class='ctx'> </div><div class='ctx'> 	nor@0,0 {</div><div class='ctx'> 		reg = &lt;0 0x00000000 0x08000000&gt;;</div><div class='hunk'>@@ -342,6 +343,34 @@</div><div class='ctx'> 			reg = &lt;0x04000000 0x04000000&gt;; /* 64MB */</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	fram@1,0 {</div><div class='add'>+		reg = &lt;1 0x00000000 0x01000000&gt;;</div><div class='add'>+		bank-width = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		gpmc,mux-add-data = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		gpmc,sync-clk-ps = &lt;0&gt;;</div><div class='add'>+		gpmc,cs-on-ns = &lt;0&gt;;</div><div class='add'>+		gpmc,cs-rd-off-ns = &lt;160&gt;;</div><div class='add'>+		gpmc,cs-wr-off-ns = &lt;160&gt;;</div><div class='add'>+		gpmc,adv-on-ns = &lt;10&gt;;</div><div class='add'>+		gpmc,adv-rd-off-ns = &lt;20&gt;;</div><div class='add'>+		gpmc,adv-wr-off-ns = &lt;20&gt;;</div><div class='add'>+		gpmc,oe-on-ns = &lt;30&gt;;</div><div class='add'>+		gpmc,oe-off-ns = &lt;150&gt;;</div><div class='add'>+		gpmc,we-on-ns = &lt;30&gt;;</div><div class='add'>+		gpmc,we-off-ns = &lt;150&gt;;</div><div class='add'>+		gpmc,rd-cycle-ns = &lt;160&gt;;</div><div class='add'>+		gpmc,wr-cycle-ns = &lt;160&gt;;</div><div class='add'>+		gpmc,access-ns = &lt;130&gt;;</div><div class='add'>+		gpmc,page-burst-access-ns = &lt;10&gt;;</div><div class='add'>+		gpmc,cycle2cycle-samecsen;</div><div class='add'>+		gpmc,cycle2cycle-diffcsen;</div><div class='add'>+		gpmc,cycle2cycle-delay-ns = &lt;10&gt;;</div><div class='add'>+		gpmc,wr-data-mux-bus-ns = &lt;30&gt;;</div><div class='add'>+		gpmc,wr-access-ns = &lt;0&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mac {</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-pcm-953.dtsi b/arch/arm/boot/dts/am335x-pcm-953.dtsi<br/>new file mode 100644<br/>index 000000000000..02981eae96b9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-pcm-953.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-pcm-953.dtsi</a></div><div class='hunk'>@@ -0,0 +1,288 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2014-2017 Phytec Messtechnik GmbH</div><div class='add'>+ * Author: Wadim Egorov &lt;w.egorov@phytec.de&gt;</div><div class='add'>+ *	   Teresa Remmet &lt;t.remmet@phytec.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Phytec AM335x PCM-953";</div><div class='add'>+	compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx";</div><div class='add'>+</div><div class='add'>+	/* Power */</div><div class='add'>+	regulators {</div><div class='add'>+		vcc3v3: fixedregulator@1 {</div><div class='add'>+			compatible = "regulator-fixed";</div><div class='add'>+			regulator-name = "vcc3v3";</div><div class='add'>+			regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+			regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+			regulator-boot-on;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		vcc1v8: fixedregulator@2 {</div><div class='add'>+			compatible = "regulator-fixed";</div><div class='add'>+			regulator-name = "vcc1v8";</div><div class='add'>+			regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+			regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+			regulator-boot-on;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* User IO */</div><div class='add'>+	user_leds: user_leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;user_leds_pins&gt;;</div><div class='add'>+</div><div class='add'>+		green {</div><div class='add'>+			label = "green:user";</div><div class='add'>+			gpios = &lt;&amp;gpio1 30 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "gpio";</div><div class='add'>+			default-state = "on";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		yellow {</div><div class='add'>+			label = "yellow:user";</div><div class='add'>+			gpios = &lt;&amp;gpio1 31 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "gpio";</div><div class='add'>+			default-state = "on";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	user_buttons: user_buttons {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;user_buttons_pins&gt;;</div><div class='add'>+</div><div class='add'>+		button@0 {</div><div class='add'>+			label = "home";</div><div class='add'>+			linux,code = &lt;KEY_HOME&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio3 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			gpio-key,wakeup;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		button@1 {</div><div class='add'>+			label = "menu";</div><div class='add'>+			linux,code = &lt;KEY_MENU&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio3 8 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			gpio-key,wakeup;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;am33xx_pinmux {</div><div class='add'>+	user_buttons_pins: pinmux_user_buttons {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x9e4, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* emu0.gpio3_7 */</div><div class='add'>+			AM33XX_IOPAD(0x9e8, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* emu1.gpio3_8 */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	user_leds_pins: pinmux_user_leds {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x880, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_csn1.gpio1_30 */</div><div class='add'>+			AM33XX_IOPAD(0x884, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_csn2.gpio1_31 */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CAN */</div><div class='add'>+&amp;am33xx_pinmux {</div><div class='add'>+	dcan1_pins: pinmux_dcan1 {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x980, PIN_OUTPUT_PULLUP | MUX_MODE2)	/* uart1_rxd.dcan1_tx_mux2 */</div><div class='add'>+			AM33XX_IOPAD(0x984, PIN_INPUT_PULLUP | MUX_MODE2)	/* uart1_txd.dcan1_rx_mux2 */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dcan1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;dcan1_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Ethernet */</div><div class='add'>+&amp;am33xx_pinmux {</div><div class='add'>+	ethernet1_pins: pinmux_ethernet1 {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x840, PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a0.rgmii2_tctl */</div><div class='add'>+			AM33XX_IOPAD(0x844, PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a1.rgmii2_rctl */</div><div class='add'>+			AM33XX_IOPAD(0x848, PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a2.rgmii2_td3 */</div><div class='add'>+			AM33XX_IOPAD(0x84c, PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a3.rgmii2_td2 */</div><div class='add'>+			AM33XX_IOPAD(0x850, PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a4.rgmii2_td1 */</div><div class='add'>+			AM33XX_IOPAD(0x854, PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a5.rgmii2_td0 */</div><div class='add'>+			AM33XX_IOPAD(0x858, PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a6.rgmii2_tclk */</div><div class='add'>+			AM33XX_IOPAD(0x85c, PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a7.rgmii2_rclk */</div><div class='add'>+			AM33XX_IOPAD(0x860, PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a8.rgmii2_rd3 */</div><div class='add'>+			AM33XX_IOPAD(0x864, PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a9.rgmii2_rd2 */</div><div class='add'>+			AM33XX_IOPAD(0x868, PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a10.rgmii2_rd1 */</div><div class='add'>+			AM33XX_IOPAD(0x86c, PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a11.rgmii2_rd0 */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpsw_emac1 {</div><div class='add'>+	phy-handle = &lt;&amp;phy1&gt;;</div><div class='add'>+	phy-mode = "rgmii-id";</div><div class='add'>+	dual_emac_res_vlan = &lt;2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;davinci_mdio {</div><div class='add'>+	phy1: ethernet-phy@2 {</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		/* Register 260 (104h) – RGMII Clock and Control Pad Skew */</div><div class='add'>+		rxc-skew-ps = &lt;1400&gt;;</div><div class='add'>+		rxdv-skew-ps = &lt;0&gt;;</div><div class='add'>+		txc-skew-ps = &lt;1400&gt;;</div><div class='add'>+		txen-skew-ps = &lt;0&gt;;</div><div class='add'>+		/* Register 261 (105h) – RGMII RX Data Pad Skew */</div><div class='add'>+		rxd3-skew-ps = &lt;0&gt;;</div><div class='add'>+		rxd2-skew-ps = &lt;0&gt;;</div><div class='add'>+		rxd1-skew-ps = &lt;0&gt;;</div><div class='add'>+		rxd0-skew-ps = &lt;0&gt;;</div><div class='add'>+		/* Register 262 (106h) – RGMII TX Data Pad Skew */</div><div class='add'>+		txd3-skew-ps = &lt;0&gt;;</div><div class='add'>+		txd2-skew-ps = &lt;0&gt;;</div><div class='add'>+		txd1-skew-ps = &lt;0&gt;;</div><div class='add'>+		txd0-skew-ps = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mac {</div><div class='add'>+	slaves = &lt;2&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;ethernet0_pins &amp;ethernet1_pins&gt;;</div><div class='add'>+	dual_emac;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Misc */</div><div class='add'>+&amp;am33xx_pinmux {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;cb_gpio_pins&gt;;</div><div class='add'>+</div><div class='add'>+	cb_gpio_pins: pinmux_cb_gpio {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x968, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* uart0_ctsn.gpio1_8 */</div><div class='add'>+			AM33XX_IOPAD(0x96c, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* uart0_rtsn.gpio1_9 */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MMC */</div><div class='add'>+&amp;am33xx_pinmux {</div><div class='add'>+	mmc1_pins: pinmux_mmc1_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat3.mmc0_dat3 */</div><div class='add'>+			AM33XX_IOPAD(0x8f4, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat2.mmc0_dat2 */</div><div class='add'>+			AM33XX_IOPAD(0x8f8, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat1.mmc0_dat1 */</div><div class='add'>+			AM33XX_IOPAD(0x8fc, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat0.mmc0_dat0 */</div><div class='add'>+			AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_clk.mmc0_clk */</div><div class='add'>+			AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_cmd.mmc0_cmd */</div><div class='add'>+			AM33XX_IOPAD(0x960, PIN_INPUT_PULLUP | MUX_MODE7)	/* spi0_cs1.mmc0_sdcd */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc3v3&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc1_pins&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio0 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* UARTs */</div><div class='add'>+&amp;am33xx_pinmux {</div><div class='add'>+	uart0_pins: pinmux_uart0 {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */</div><div class='add'>+			AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart1_pins: pinmux_uart1 {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x980, PIN_INPUT_PULLUP | MUX_MODE0)	/* uart1_rxd.uart1_rxd */</div><div class='add'>+			AM33XX_IOPAD(0x984, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_txd.uart1_txd */</div><div class='add'>+			AM33XX_IOPAD(0x978, PIN_INPUT | MUX_MODE0)		/* uart1_ctsn.uart1_ctsn */</div><div class='add'>+			AM33XX_IOPAD(0x97c, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_rtsn.uart1_rtsn */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart2_pins: pinmux_uart2 {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x92c, PIN_INPUT_PULLUP | MUX_MODE1)	/* mii1_tx_clk.uart2_rxd */</div><div class='add'>+			AM33XX_IOPAD(0x930, PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* mii1_rx_clk.uart2_txd */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart3_pins: pinmux_uart3 {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x934, PIN_INPUT_PULLUP | MUX_MODE1)	/* mii1_rxd3.uart3_rxd */</div><div class='add'>+			AM33XX_IOPAD(0x938, PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* mii1_rxd2.uart3_txd */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart0_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart1_pins&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart2_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart3_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* USB */</div><div class='add'>+&amp;cppi41dma {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_ctrl_mod {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb0_phy {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	dr_mode = "host";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb1_phy {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-phycore-rdk.dts b/arch/arm/boot/dts/am335x-phycore-rdk.dts<br/>new file mode 100644<br/>index 000000000000..305f0b35d6ea<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-phycore-rdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-phycore-rdk.dts</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2014 PHYTEC Messtechnik GmbH</div><div class='add'>+ * Author: Wadim Egorov &lt;w.egorov@phytec.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "am335x-phycore-som.dtsi"</div><div class='add'>+#include "am335x-pcm-953.dtsi"</div><div class='add'>+</div><div class='add'>+/* SoM */</div><div class='add'>+&amp;i2c_eeprom {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c_rtc {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;serial_flash {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi<br/>index 75e24add3f13..14533ff6d0ad 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-phycore-som.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-phycore-som.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-phycore-som.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-phycore-som.dtsi</a></div><div class='hunk'>@@ -78,7 +78,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cpsw_emac0 {</div><div class='del'>-	phy_id = &lt;&amp;davinci_mdio&gt;, &lt;0&gt;;</div><div class='add'>+	phy-handle = &lt;&amp;phy0&gt;;</div><div class='ctx'> 	phy-mode = "rmii";</div><div class='ctx'> 	dual_emac_res_vlan = &lt;1&gt;;</div><div class='ctx'> };</div><div class='hunk'>@@ -87,6 +87,10 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mac {</div><div class='hunk'>@@ -120,6 +124,12 @@</div><div class='ctx'> 		reg = &lt;0x2d&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	i2c_tmp102: temp@4b {</div><div class='add'>+		compatible = "ti,tmp102";</div><div class='add'>+		reg = &lt;0x4b&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	i2c_eeprom: eeprom@52 {</div><div class='ctx'> 		compatible = "atmel,24c32";</div><div class='ctx'> 		pagesize = &lt;32&gt;;</div><div class='hunk'>@@ -201,43 +211,6 @@</div><div class='ctx'> </div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-		partition@0 {</div><div class='del'>-			label = "xload";</div><div class='del'>-			reg = &lt;0x0 0x20000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@1 {</div><div class='del'>-			label = "xload_backup1";</div><div class='del'>-			reg = &lt;0x20000 0x20000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@2 {</div><div class='del'>-			label = "xload_backup2";</div><div class='del'>-			reg = &lt;0x40000 0x20000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@3 {</div><div class='del'>-			label = "xload_backup3";</div><div class='del'>-			reg = &lt;0x60000 0x20000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@4 {</div><div class='del'>-			label = "barebox";</div><div class='del'>-			reg = &lt;0x80000 0x80000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@5 {</div><div class='del'>-			label = "bareboxenv";</div><div class='del'>-			reg = &lt;0x100000 0x40000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@6 {</div><div class='del'>-			label = "oftree";</div><div class='del'>-			reg = &lt;0x140000 0x40000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@7 {</div><div class='del'>-			label = "kernel";</div><div class='del'>-			reg = &lt;0x180000 0x800000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@8 {</div><div class='del'>-			label = "root";</div><div class='del'>-			reg = &lt;0x980000 0x0&gt;;</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -341,33 +314,12 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='ctx'> 	serial_flash: m25p80@0 {</div><div class='del'>-		compatible = "m25p80";</div><div class='add'>+		compatible = "jedec,spi-nor";</div><div class='ctx'> 		spi-max-frequency = &lt;48000000&gt;;</div><div class='ctx'> 		reg = &lt;0x0&gt;;</div><div class='ctx'> 		m25p,fast-read;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-		partition@0 {</div><div class='del'>-			label = "xload";</div><div class='del'>-			reg = &lt;0x0 0x20000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@1 {</div><div class='del'>-			label = "barebox";</div><div class='del'>-			reg = &lt;0x20000 0x80000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@2 {</div><div class='del'>-			label = "bareboxenv";</div><div class='del'>-			reg = &lt;0xa0000 0x20000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@3 {</div><div class='del'>-			label = "oftree";</div><div class='del'>-			reg = &lt;0xc0000 0x20000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@4 {</div><div class='del'>-			label = "kernel";</div><div class='del'>-			reg = &lt;0xe0000 0x0&gt;;</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts<br/>index b0dfa6f14cd5..c5d2589c55fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-sl50.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-sl50.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-sl50.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-sl50.dts</a></div><div class='hunk'>@@ -136,6 +136,13 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	uart1_pins: pinmux_uart1_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x980, PIN_INPUT_PULLUP | MUX_MODE0)	/* uart1_rxd.uart1_rxd */</div><div class='add'>+			AM33XX_IOPAD(0x984, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_txd.uart1_txd */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	uart4_pins: pinmux_uart4_pins {</div><div class='ctx'> 		pinctrl-single,pins = &lt;</div><div class='ctx'> 			AM33XX_IOPAD(0x870, PIN_INPUT_PULLUP | MUX_MODE6)	/* gpmc_wait0.uart4_rxd */</div><div class='hunk'>@@ -150,13 +157,6 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	i2c1_pins: pinmux_i2c1_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			AM33XX_IOPAD(0x980, PIN_INPUT_PULLUP | MUX_MODE3)	/* uart1_rxd.i2c1_sda */</div><div class='del'>-			AM33XX_IOPAD(0x984, PIN_INPUT_PULLUP | MUX_MODE3)	/* uart1_txdi2c1_scl */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	i2c2_pins: pinmux_i2c2_pins {</div><div class='ctx'> 		pinctrl-single,pins = &lt;</div><div class='ctx'> 			AM33XX_IOPAD(0x978, PIN_INPUT_PULLUP | MUX_MODE3)	/* uart1_ctsn.i2c2_sda */</div><div class='hunk'>@@ -262,6 +262,16 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	spi0_pins: pinmux_spi0_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM33XX_IOPAD(0x954, PIN_INPUT_PULLUP | MUX_MODE0)	/* SPI0_MOSI - spi0_d0.spi0_d0 */</div><div class='add'>+			AM33XX_IOPAD(0x958, PIN_INPUT_PULLUP | MUX_MODE0)	/* SPI0_MISO - spi0_d1.spi0_d1 */</div><div class='add'>+			AM33XX_IOPAD(0x950, PIN_INPUT_PULLUP | MUX_MODE0)	/* SPI0_CLK  - spi0_clk.spi0_clk */</div><div class='add'>+			AM33XX_IOPAD(0x95c, PIN_INPUT_PULLUP | MUX_MODE0)	/* SPI0_CS0 (NBATTSS) - spi0_cs0.spi0_cs0 */</div><div class='add'>+			AM33XX_IOPAD(0x960, PIN_INPUT_PULLUP | MUX_MODE0)	/* SPI0_CS1 (FPGA_FLASH_NCS) - spi0_cs1.spi0_cs1 */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	lwb_pins: pinmux_lwb_pins {</div><div class='ctx'> 		pinctrl-single,pins = &lt;</div><div class='ctx'> 			AM33XX_IOPAD(0x9a4, PIN_OUTPUT | MUX_MODE7)	/* SoundPA_en - mcasp0_fsr.gpio3_19 */</div><div class='hunk'>@@ -292,16 +302,22 @@</div><div class='ctx'> 		reg = &lt;0x24&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	bq32000: rtc@68 {</div><div class='add'>+		compatible = "ti,bq32000";</div><div class='add'>+		trickle-resistor-ohms = &lt;1120&gt;;</div><div class='add'>+		reg = &lt;0x68&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	eeprom: eeprom@50 {</div><div class='ctx'> 		compatible = "at,24c256";</div><div class='ctx'> 		reg = &lt;0x50&gt;;</div><div class='ctx'> 	};</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-&amp;i2c1 {</div><div class='del'>-	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;i2c1_pins&gt;;</div><div class='add'>+	gpio_exp: mcp23017@20 {</div><div class='add'>+		compatible = "microchip,mcp23017";</div><div class='add'>+		reg = &lt;0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c2 {</div><div class='hunk'>@@ -321,6 +337,16 @@</div><div class='ctx'> 		DRVDD-supply = &lt;&amp;ldo4_reg&gt;;</div><div class='ctx'> 		DVDD-supply = &lt;&amp;ldo3_reg&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	/* Ambient Light Sensor */</div><div class='add'>+	als: isl29023@44 {</div><div class='add'>+		compatible = "isil,isl29023";</div><div class='add'>+		reg = &lt;0x44&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rtc {</div><div class='add'>+	status = "disabled";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb {</div><div class='hunk'>@@ -394,12 +420,32 @@</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart0_pins&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;uart1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart1_pins&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart4 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart4_pins&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;spi0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi0_pins&gt;;</div><div class='add'>+</div><div class='add'>+	flash: n25q032@1 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "micron,n25q032";</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		spi-max-frequency = &lt;5000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #include "tps65217.dtsi"</div><div class='ctx'> </div><div class='ctx'> &amp;tps {</div><div class='head'>diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi<br/>index 02c67365c4e1..8ce541739b24 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-wega.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am335x-wega.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am335x-wega.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am335x-wega.dtsi</a></div><div class='hunk'>@@ -119,11 +119,17 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cpsw_emac1 {</div><div class='del'>-	phy_id = &lt;&amp;davinci_mdio&gt;, &lt;1&gt;;</div><div class='add'>+	phy-handle = &lt;&amp;phy1&gt;;</div><div class='ctx'> 	phy-mode = "mii";</div><div class='ctx'> 	dual_emac_res_vlan = &lt;2&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;davinci_mdio {</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;mac {</div><div class='ctx'> 	slaves = &lt;2&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='hunk'>@@ -206,7 +212,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb0 {</div><div class='del'>-	dr_mode = "peripheral";</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi<br/>index 194d884c9de1..9e96d60976b7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am33xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am33xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am33xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am33xx.dtsi</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> 	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> 	#address-cells = &lt;1&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='add'>+	chosen { };</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		i2c0 = &amp;i2c0;</div><div class='hunk'>@@ -130,6 +131,7 @@</div><div class='ctx'> 				reg = &lt;0x210000 0x2000&gt;;</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;1&gt;;</div><div class='add'>+				#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 				ranges = &lt;0 0x210000 0x2000&gt;;</div><div class='ctx'> </div><div class='ctx'> 				am33xx_pinmux: pinmux@800 {</div><div class='hunk'>@@ -137,15 +139,17 @@</div><div class='ctx'> 					reg = &lt;0x800 0x238&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+					#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 					pinctrl-single,register-width = &lt;32&gt;;</div><div class='ctx'> 					pinctrl-single,function-mask = &lt;0x7f&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				scm_conf: scm_conf@0 {</div><div class='del'>-					compatible = "syscon";</div><div class='add'>+					compatible = "syscon", "simple-bus";</div><div class='ctx'> 					reg = &lt;0x0 0x800&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;1&gt;;</div><div class='add'>+					ranges = &lt;0 0 0x800&gt;;</div><div class='ctx'> </div><div class='ctx'> 					scm_clocks: clocks {</div><div class='ctx'> 						#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -505,6 +509,8 @@</div><div class='ctx'> 			interrupts = &lt;75</div><div class='ctx'> 				      76&gt;;</div><div class='ctx'> 			ti,hwmods = "rtc";</div><div class='add'>+			clocks = &lt;&amp;clkdiv32k_ick&gt;;</div><div class='add'>+			clock-names = "int-clk";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		spi0: spi@48030000 {</div><div class='hunk'>@@ -777,7 +783,6 @@</div><div class='ctx'> 			cpdma_channels = &lt;8&gt;;</div><div class='ctx'> 			ale_entries = &lt;1024&gt;;</div><div class='ctx'> 			bd_ram_size = &lt;0x2000&gt;;</div><div class='del'>-			no_bd_ram = &lt;0&gt;;</div><div class='ctx'> 			mac_control = &lt;0x20&gt;;</div><div class='ctx'> 			slaves = &lt;2&gt;;</div><div class='ctx'> 			active_slave = &lt;0&gt;;</div><div class='hunk'>@@ -855,6 +860,8 @@</div><div class='ctx'> 			interrupts = &lt;16&gt;;</div><div class='ctx'> 			ti,hwmods = "adc_tsc";</div><div class='ctx'> 			status = "disabled";</div><div class='add'>+			dmas = &lt;&amp;edma 53 0&gt;, &lt;&amp;edma 57 0&gt;;</div><div class='add'>+			dma-names = "fifo0", "fifo1";</div><div class='ctx'> </div><div class='ctx'> 			tsc {</div><div class='ctx'> 				compatible = "ti,am3359-tsc";</div><div class='head'>diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi<br/>index 0db19d39d24c..9fe545dbfa89 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am3517.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am3517.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am3517.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am3517.dtsi</a></div><div class='hunk'>@@ -66,6 +66,7 @@</div><div class='ctx'> 			reg = &lt;0x480025d8 0x24&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			pinctrl-single,register-width = &lt;16&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi<br/>index a275fa956813..97fcaf415de1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am4372.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am4372.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am4372.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am4372.dtsi</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> 	interrupt-parent = &lt;&amp;wakeupgen&gt;;</div><div class='ctx'> 	#address-cells = &lt;1&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='add'>+	chosen { };</div><div class='ctx'> </div><div class='ctx'> 	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='hunk'>@@ -189,6 +190,7 @@</div><div class='ctx'> 					reg = &lt;0x800 0x31c&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+					#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 					#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 					interrupt-controller;</div><div class='ctx'> 					pinctrl-single,register-width = &lt;32&gt;;</div><div class='hunk'>@@ -668,7 +670,6 @@</div><div class='ctx'> 			cpdma_channels = &lt;8&gt;;</div><div class='ctx'> 			ale_entries = &lt;1024&gt;;</div><div class='ctx'> 			bd_ram_size = &lt;0x2000&gt;;</div><div class='del'>-			no_bd_ram = &lt;0&gt;;</div><div class='ctx'> 			mac_control = &lt;0x20&gt;;</div><div class='ctx'> 			slaves = &lt;2&gt;;</div><div class='ctx'> 			active_slave = &lt;0&gt;;</div><div class='hunk'>@@ -871,6 +872,8 @@</div><div class='ctx'> 			clocks = &lt;&amp;adc_tsc_fck&gt;;</div><div class='ctx'> 			clock-names = "fck";</div><div class='ctx'> 			status = "disabled";</div><div class='add'>+			dmas = &lt;&amp;edma 53 0&gt;, &lt;&amp;edma 57 0&gt;;</div><div class='add'>+			dma-names = "fifo0", "fifo1";</div><div class='ctx'> </div><div class='ctx'> 			tsc {</div><div class='ctx'> 				compatible = "ti,am3359-tsc";</div><div class='head'>diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts<br/>index 957840cc7b78..a4f31739057f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am437x-gp-evm.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am437x-gp-evm.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am437x-gp-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am437x-gp-evm.dts</a></div><div class='hunk'>@@ -23,6 +23,10 @@</div><div class='ctx'> 		display0 = &amp;lcd0;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	evm_v3_3d: fixedregulator-v3_3d {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "evm_v3_3d";</div><div class='head'>diff --git a/arch/arm/boot/dts/am437x-idk-evm.dts b/arch/arm/boot/dts/am437x-idk-evm.dts<br/>index 25ce611c6568..c1f7f9336e64 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am437x-idk-evm.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am437x-idk-evm.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am437x-idk-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am437x-idk-evm.dts</a></div><div class='hunk'>@@ -18,6 +18,10 @@</div><div class='ctx'> 	model = "TI AM437x Industrial Development Kit";</div><div class='ctx'> 	compatible = "ti,am437x-idk-evm","ti,am4372","ti,am43";</div><div class='ctx'> </div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	v24_0d: fixed-regulator-v24_0d {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "V24_0D";</div><div class='hunk'>@@ -117,6 +121,58 @@</div><div class='ctx'> 		compatible = "fixed-clock";</div><div class='ctx'> 		clock-frequency = &lt;32768&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	leds-iio {</div><div class='add'>+		status = "disabled";</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+		led-out0 {</div><div class='add'>+			label = "out0";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out1 {</div><div class='add'>+			label = "out1";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out2 {</div><div class='add'>+			label = "out2";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out3 {</div><div class='add'>+			label = "out3";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out4 {</div><div class='add'>+			label = "out4";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out5 {</div><div class='add'>+			label = "out5";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out6 {</div><div class='add'>+			label = "out6";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out7 {</div><div class='add'>+			label = "out7";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;am43xx_pinmux {</div><div class='hunk'>@@ -178,6 +234,24 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	spi1_pins_default: spi1_pins_default {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM4372_IOPAD(0x908, PIN_INPUT | MUX_MODE2)	/* mii1_col.spi1_sclk */</div><div class='add'>+			AM4372_IOPAD(0x910, PIN_INPUT | MUX_MODE2)	/* mii1_rx_er.spi1_d1 */</div><div class='add'>+			AM4372_IOPAD(0x944, PIN_OUTPUT | MUX_MODE2)	/* rmii1_ref_clk.spi1_cs0 */</div><div class='add'>+			AM4372_IOPAD(0x90c, PIN_OUTPUT | MUX_MODE7)	/* mii1_crs.gpio3_1 */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi1_pins_sleep: spi1_pins_sleep {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			AM4372_IOPAD(0x908, PIN_INPUT_PULLDOWN | MUX_MODE7)</div><div class='add'>+			AM4372_IOPAD(0x910, PIN_INPUT_PULLDOWN | MUX_MODE7)</div><div class='add'>+			AM4372_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE7)</div><div class='add'>+			AM4372_IOPAD(0x90c, PIN_INPUT_PULLDOWN | MUX_MODE7)</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	ecap0_pins_default: backlight_pins_default {</div><div class='ctx'> 		pinctrl-single,pins = &lt;</div><div class='ctx'> 			AM4372_IOPAD(0x964, PIN_OUTPUT | MUX_MODE0) /* ecap0_in_pwm0_out.ecap0_in_pwm0_out */</div><div class='hunk'>@@ -290,6 +364,33 @@</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;i2c2_pins_default&gt;;</div><div class='ctx'> 	pinctrl-1 = &lt;&amp;i2c2_pins_sleep&gt;;</div><div class='ctx'> 	clock-frequency = &lt;100000&gt;;</div><div class='add'>+</div><div class='add'>+	tpic2810: tpic2810@60 {</div><div class='add'>+		compatible = "ti,tpic2810";</div><div class='add'>+		reg = &lt;0x60&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-names = "default", "sleep";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi1_pins_default&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;spi1_pins_sleep&gt;;</div><div class='add'>+	ti,pindir-d0-out-d1-in;</div><div class='add'>+</div><div class='add'>+	sn65hvs882: sn65hvs882@0 {</div><div class='add'>+		compatible = "pisosr-gpio";</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		load-gpios = &lt;&amp;gpio3 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;1000000&gt;;</div><div class='add'>+		spi-cpol;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;epwmss0 {</div><div class='hunk'>@@ -310,6 +411,10 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;gpio3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;gpio4 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts<br/>index 319d94205350..4dc54bee2f36 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am437x-sk-evm.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am437x-sk-evm.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am437x-sk-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am437x-sk-evm.dts</a></div><div class='hunk'>@@ -24,6 +24,10 @@</div><div class='ctx'> 		display0 = &amp;lcd0;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	/* fixed 32k external oscillator clock */</div><div class='ctx'> 	clk_32k_rtc: clk_32k_rtc {</div><div class='ctx'> 		#clock-cells = &lt;0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts<br/>index 9d35c3f07cad..9acd4ccdec4e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am43x-epos-evm.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am43x-epos-evm.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am43x-epos-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am43x-epos-evm.dts</a></div><div class='hunk'>@@ -24,6 +24,10 @@</div><div class='ctx'> 		display0 = &amp;lcd0;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	vmmcsd_fixed: fixedregulator-sd {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "vmmcsd_fixed";</div><div class='head'>diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts<br/>new file mode 100644<br/>index 000000000000..ad68d1eb3bc3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am571x-idk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am571x-idk.dts</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015-2016 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "dra72x.dtsi"</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+#include "am57xx-idk-common.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "TI AM5718 IDK";</div><div class='add'>+	compatible = "ti,am5718-idk", "ti,am5718", "ti,dra7";</div><div class='add'>+</div><div class='add'>+	memory@80000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x80000000 0x0 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+		cpu0-led {</div><div class='add'>+			label = "status0:red:cpu0";</div><div class='add'>+			gpios = &lt;&amp;gpio2 25 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+			linux,default-trigger = "cpu0";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usr0-led {</div><div class='add'>+			label = "status0:green:usr";</div><div class='add'>+			gpios = &lt;&amp;gpio2 26 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		heartbeat-led {</div><div class='add'>+			label = "status0:blue:heartbeat";</div><div class='add'>+			gpios = &lt;&amp;gpio2 27 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usr1-led {</div><div class='add'>+			label = "status1:red:usr";</div><div class='add'>+			gpios = &lt;&amp;gpio2 28 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usr2-led {</div><div class='add'>+			label = "status1:green:usr";</div><div class='add'>+			gpios = &lt;&amp;gpio2 21 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mmc0-led {</div><div class='add'>+			label = "status1:blue:mmc0";</div><div class='add'>+			gpios = &lt;&amp;gpio2 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+			linux,default-trigger = "mmc0";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	vmmc-supply = &lt;&amp;ldo1_reg&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio6 27 0&gt;; /* gpio 219 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;omap_dwc3_2 {</div><div class='add'>+	extcon = &lt;&amp;extcon_usb2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;extcon_usb2 {</div><div class='add'>+	id-gpio = &lt;&amp;gpio5 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	vbus-gpio = &lt;&amp;gpio7 22 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts<br/>index 87bbc66f0f21..8350b4b34b08 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am572x-idk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am572x-idk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am572x-idk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am572x-idk.dts</a></div><div class='hunk'>@@ -23,11 +23,6 @@</div><div class='ctx'> 		reg = &lt;0x0 0x80000000 0x0 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	extcon_usb2: extcon_usb2 {</div><div class='del'>-		compatible = "linux,extcon-usb-gpio";</div><div class='del'>-		id-gpio = &lt;&amp;gpio3 16 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	status-leds {</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> 		cpu0-led {</div><div class='hunk'>@@ -76,6 +71,11 @@</div><div class='ctx'> 	extcon = &lt;&amp;extcon_usb2&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;extcon_usb2 {</div><div class='add'>+	id-gpio = &lt;&amp;gpio3 16 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	vbus-gpio = &lt;&amp;gpio3 26 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;mmc1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	vmmc-supply = &lt;&amp;v3_3d&gt;;</div><div class='hunk'>@@ -83,3 +83,11 @@</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio6 27 0&gt;; /* gpio 219 */</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;sn65hvs882 {</div><div class='add'>+	load-gpios = &lt;&amp;gpio3 19 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pcie1 {</div><div class='add'>+	gpios = &lt;&amp;gpio3 23 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi<br/>index 6df7829a2c15..585d792a8fdd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi</a></div><div class='hunk'>@@ -22,6 +22,10 @@</div><div class='ctx'> 		display0 = &amp;hdmi0;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x0 0x80000000 0x0 0x80000000&gt;;</div><div class='hunk'>@@ -204,6 +208,7 @@</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> </div><div class='ctx'> 		ti,system-power-controller;</div><div class='add'>+		ti,palmas-override-powerhold;</div><div class='ctx'> </div><div class='ctx'> 		tps659038_pmic {</div><div class='ctx'> 			compatible = "ti,tps659038-pmic";</div><div class='hunk'>@@ -420,19 +425,29 @@</div><div class='ctx'> 			      &lt;&amp;dra7_pmx_core 0x3f8&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;davinci_mdio {</div><div class='add'>+	phy0: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@2 {</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;mac {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	dual_emac;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cpsw_emac0 {</div><div class='del'>-	phy_id = &lt;&amp;davinci_mdio&gt;, &lt;1&gt;;</div><div class='add'>+	phy-handle = &lt;&amp;phy0&gt;;</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	dual_emac_res_vlan = &lt;1&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cpsw_emac1 {</div><div class='del'>-	phy_id = &lt;&amp;davinci_mdio&gt;, &lt;2&gt;;</div><div class='add'>+	phy-handle = &lt;&amp;phy1&gt;;</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	dual_emac_res_vlan = &lt;2&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts<br/>index ca85570629fd..39a92aff0a0d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts</a></div><div class='hunk'>@@ -22,3 +22,8 @@</div><div class='ctx'> 	vmmc-supply = &lt;&amp;vdd_3v3&gt;;</div><div class='ctx'> 	vmmc-aux-supply = &lt;&amp;ldo1_reg&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */</div><div class='add'>+&amp;phy1 {</div><div class='add'>+	max-speed = &lt;100&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts<br/>index 8c66f2efd283..19a60a11c198 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am57xx-beagle-x15.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am57xx-beagle-x15.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am57xx-beagle-x15.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am57xx-beagle-x15.dts</a></div><div class='hunk'>@@ -22,3 +22,8 @@</div><div class='ctx'> &amp;mmc1 {</div><div class='ctx'> 	vmmc-supply = &lt;&amp;ldo1_reg&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */</div><div class='add'>+&amp;phy1 {</div><div class='add'>+	max-speed = &lt;100&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi<br/>index 03cec62260e1..0d341c545b01 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/am57xx-idk-common.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/am57xx-idk-common.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/am57xx-idk-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/am57xx-idk-common.dtsi</a></div><div class='hunk'>@@ -14,6 +14,10 @@</div><div class='ctx'> 		rtc1 = &amp;rtc;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	vmain: fixedregulator-vmain {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "VMAIN";</div><div class='hunk'>@@ -43,6 +47,58 @@</div><div class='ctx'> 		regulator-always-on;</div><div class='ctx'> 		regulator-boot-on;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	leds-iio {</div><div class='add'>+		status = "disabled";</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+		led-out0 {</div><div class='add'>+			label = "out0";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out1 {</div><div class='add'>+			label = "out1";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out2 {</div><div class='add'>+			label = "out2";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out3 {</div><div class='add'>+			label = "out3";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out4 {</div><div class='add'>+			label = "out4";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out5 {</div><div class='add'>+			label = "out5";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out6 {</div><div class='add'>+			label = "out6";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led-out7 {</div><div class='add'>+			label = "out7";</div><div class='add'>+			gpios = &lt;&amp;tpic2810 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c1 {</div><div class='hunk'>@@ -57,6 +113,7 @@</div><div class='ctx'> 		#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		ti,system-power-controller;</div><div class='add'>+		ti,palmas-override-powerhold;</div><div class='ctx'> </div><div class='ctx'> 		tps659038_pmic {</div><div class='ctx'> 			compatible = "ti,tps659038-pmic";</div><div class='hunk'>@@ -250,6 +307,35 @@</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		extcon_usb2: tps659038_usb {</div><div class='add'>+			compatible = "ti,palmas-usb-vid";</div><div class='add'>+			ti,enable-vbus-detection;</div><div class='add'>+			ti,enable-id-detection;</div><div class='add'>+			/* ID &amp; VBUS GPIOs provided in board dts */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mcspi3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	ti,pindir-d0-out-d1-in;</div><div class='add'>+</div><div class='add'>+	sn65hvs882: sn65hvs882@0 {</div><div class='add'>+		compatible = "pisosr-gpio";</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;1000000&gt;;</div><div class='add'>+		spi-cpol;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	tpic2810: tpic2810@60 {</div><div class='add'>+		compatible = "ti,tpic2810";</div><div class='add'>+		reg = &lt;0x60&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -294,7 +380,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb2 {</div><div class='del'>-	dr_mode = "otg";</div><div class='add'>+	dr_mode = "peripheral";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc2 {</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts<br/>index 033fa63544f7..c4eef7323367 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-db.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370-db.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-db.dts</a></div><div class='hunk'>@@ -18,17 +18,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -37,11 +37,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -67,7 +67,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x40000000&gt;; /* 1 GB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -86,18 +86,6 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;ge0_rgmii_pins&gt;;</div><div class='ctx'> 				pinctrl-names = "default";</div><div class='hunk'>@@ -182,24 +170,6 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-			/*</div><div class='del'>-			 * The two PCIe units are accessible through</div><div class='del'>-			 * both standard PCIe slots and mini-PCIe</div><div class='del'>-			 * slots on the board.</div><div class='del'>-			 */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 1, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sound {</div><div class='hunk'>@@ -261,6 +231,37 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+	/*</div><div class='add'>+	 * The two PCIe units are accessible through</div><div class='add'>+	 * both standard PCIe slots and mini-PCIe</div><div class='add'>+	 * slots on the board.</div><div class='add'>+	 */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pcie@2,0 {</div><div class='add'>+		/* Port 1, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> &amp;spi0 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;spi0_pins2&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts<br/>index e2a363b1dd8a..db7f3aa38670 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-dlink-dns327l.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370-dlink-dns327l.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-dlink-dns327l.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-dlink-dns327l.dts</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -62,7 +62,7 @@</div><div class='ctx'> 		stdout-path = &amp;uart0;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x20000000&gt;; /* 512 MiB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -72,20 +72,6 @@</div><div class='ctx'> 			MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000</div><div class='ctx'> 			MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 1, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> 			sata@a0000 {</div><div class='ctx'> 				nr-ports = &lt;2&gt;;</div><div class='hunk'>@@ -262,6 +248,20 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pcie@2,0 {</div><div class='add'>+		/* Port 1, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	sata_l_white_pin: sata-l-white-pin {</div><div class='ctx'> 		marvell,pins = "mpp57";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts<br/>index d5e19cd4d256..702f58c9642d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-mirabox.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370-mirabox.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-mirabox.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-mirabox.dts</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -54,7 +54,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x20000000&gt;; /* 512 MB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -64,22 +64,6 @@</div><div class='ctx'> 			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000</div><div class='ctx'> 			  MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/* Internal mini-PCIe connector */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* Connected on the PCB to a USB 3.0 XHCI controller */</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 1, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> 			serial@12000 {</div><div class='ctx'> 				status = "okay";</div><div class='hunk'>@@ -113,17 +97,6 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;ge0_rgmii_pins&gt;;</div><div class='ctx'> 				pinctrl-names = "default";</div><div class='hunk'>@@ -197,6 +170,34 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* Internal mini-PCIe connector */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Connected on the PCB to a USB 3.0 XHCI controller */</div><div class='add'>+	pcie@2,0 {</div><div class='add'>+		/* Port 1, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	pwr_led_pin: pwr-led-pin {</div><div class='ctx'> 		marvell,pins = "mpp63";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts<br/>index 39181b3fa90d..b1a96e95e921 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-netgear-rn102.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370-netgear-rn102.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-netgear-rn102.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-netgear-rn102.dts</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -56,7 +56,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x20000000&gt;; /* 512 MB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -66,22 +66,6 @@</div><div class='ctx'> 			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000</div><div class='ctx'> 			  MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/* Connected to Marvell 88SE9170 SATA controller */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* Connected to FL1009 USB 3.0 controller */</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 1, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> </div><div class='ctx'> 			/* RTC is provided by Intersil ISL12057 I2C RTC chip */</div><div class='hunk'>@@ -99,14 +83,6 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				phy0: ethernet-phy@0 { /* Marvell 88E1318 */</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@74000 {</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;ge1_rgmii_pins&gt;;</div><div class='ctx'> 				pinctrl-names = "default";</div><div class='hunk'>@@ -120,8 +96,11 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c@11000 {</div><div class='del'>-				compatible = "marvell,mv64xxx-i2c";</div><div class='ctx'> 				clock-frequency = &lt;100000&gt;;</div><div class='add'>+</div><div class='add'>+				pinctrl-0 = &lt;&amp;i2c0_pins&gt;;</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> </div><div class='ctx'> 				isl12057: isl12057@68 {</div><div class='hunk'>@@ -257,6 +236,30 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* Connected to Marvell 88SE9170 SATA controller */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Connected to FL1009 USB 3.0 controller */</div><div class='add'>+	pcie@2,0 {</div><div class='add'>+		/* Port 1, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	phy0: ethernet-phy@0 { /* Marvell 88E1318 */</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	power_led_pin: power-led-pin {</div><div class='ctx'> 		marvell,pins = "mpp57";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts<br/>index 11565752b9f6..d67e7aa42b54 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-netgear-rn104.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370-netgear-rn104.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-netgear-rn104.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-netgear-rn104.dts</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -56,7 +56,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x20000000&gt;; /* 512 MB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -66,22 +66,6 @@</div><div class='ctx'> 			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000</div><div class='ctx'> 			  MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/* Connected to FL1009 USB 3.0 controller */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* Connected to Marvell 88SE9215 SATA controller */</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 1, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> </div><div class='ctx'> 			/* RTC is provided by Intersil ISL12057 I2C RTC chip */</div><div class='hunk'>@@ -93,18 +77,6 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				phy0: ethernet-phy@0 { /* Marvell 88E1318 */</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy1: ethernet-phy@1 { /* Marvell 88E1318 */</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;ge0_rgmii_pins&gt;;</div><div class='ctx'> 				pinctrl-names = "default";</div><div class='hunk'>@@ -126,8 +98,11 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c@11000 {</div><div class='del'>-				compatible = "marvell,mv64xxx-i2c";</div><div class='ctx'> 				clock-frequency = &lt;100000&gt;;</div><div class='add'>+</div><div class='add'>+				pinctrl-0 = &lt;&amp;i2c0_pins&gt;;</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> </div><div class='ctx'> 				isl12057: isl12057@68 {</div><div class='hunk'>@@ -279,6 +254,34 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* Connected to FL1009 USB 3.0 controller */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Connected to Marvell 88SE9215 SATA controller */</div><div class='add'>+	pcie@2,0 {</div><div class='add'>+		/* Port 1, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	phy0: ethernet-phy@0 { /* Marvell 88E1318 */</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 { /* Marvell 88E1318 */</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	poweroff: poweroff {</div><div class='ctx'> 		marvell,pins = "mpp60";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts<br/>index fbef730e8d37..8b2fa9a49967 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-rd.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370-rd.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-rd.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-rd.dts</a></div><div class='hunk'>@@ -16,17 +16,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -35,11 +35,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -67,7 +67,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x20000000&gt;; /* 512 MB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -77,22 +77,6 @@</div><div class='ctx'> 			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000</div><div class='ctx'> 			  MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/* Internal mini-PCIe connector */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* Internal mini-PCIe connector */</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 1, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> 			serial@12000 {</div><div class='ctx'> 				status = "okay";</div><div class='hunk'>@@ -102,14 +86,6 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 				phy = &lt;&amp;phy0&gt;;</div><div class='hunk'>@@ -146,7 +122,7 @@</div><div class='ctx'> 				compatible = "gpio-keys";</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='del'>-				button@1 {</div><div class='add'>+				button {</div><div class='ctx'> 					label = "Software Button";</div><div class='ctx'> 					linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 					gpios = &lt;&amp;gpio0 6 GPIO_ACTIVE_LOW&gt;;</div><div class='hunk'>@@ -196,7 +172,9 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	dsa@0 {</div><div class='add'>+	dsa {</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='ctx'> 		compatible = "marvell,dsa";</div><div class='ctx'> 		#address-cells = &lt;2&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -235,7 +213,74 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> 	 };</div><div class='del'>- };</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* Internal mini-PCIe connector */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Internal mini-PCIe connector */</div><div class='add'>+	pcie@2,0 {</div><div class='add'>+		/* Port 1, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch: switch@10 {</div><div class='add'>+		compatible = "marvell,mv88e6085";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0x10&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				label = "lan0";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+			       reg = &lt;1&gt;;</div><div class='add'>+			       label = "lan1";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@2 {</div><div class='add'>+			       reg = &lt;2&gt;;</div><div class='add'>+			       label = "lan2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@3 {</div><div class='add'>+			       reg = &lt;3&gt;;</div><div class='add'>+			       label = "lan3";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@5 {</div><div class='add'>+				reg = &lt;5&gt;;</div><div class='add'>+				label = "cpu";</div><div class='add'>+				ethernet = &lt;&amp;eth1&gt;;</div><div class='add'>+				fixed-link {</div><div class='add'>+					speed = &lt;1000&gt;;</div><div class='add'>+					full-duplex;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	fan_pins: fan-pins {</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts<br/>index ae2e1fe50ef6..eb6af53b4954 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts</a></div><div class='hunk'>@@ -28,20 +28,7 @@</div><div class='ctx'> 	compatible = "seagate,dart-4", "marvell,armada370", "marvell,armada-370-xp";</div><div class='ctx'> </div><div class='ctx'> 	soc {</div><div class='del'>-		pcie-controller {</div><div class='del'>-			/* SATA AHCI controller 88SE9170 */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='del'>-			mdio {</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@74000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;ge1_rgmii_pins&gt;;</div><div class='hunk'>@@ -131,3 +118,17 @@</div><div class='ctx'> 			  1300 0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;pciec {</div><div class='add'>+	/* SATA AHCI controller 88SE9170 */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi<br/>index 3036e25c5992..e9a5b952afc0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x20000000&gt;; /* 512 MB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -32,15 +32,6 @@</div><div class='ctx'> 		ranges = &lt;MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000</div><div class='ctx'> 			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/* USB 3.0 bridge ASM1042A */</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> 			serial@12000 {</div><div class='ctx'> 				status = "okay";</div><div class='hunk'>@@ -51,15 +42,6 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;ge0_rgmii_pins&gt;;</div><div class='hunk'>@@ -159,19 +141,19 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		button@1 {</div><div class='add'>+		power {</div><div class='ctx'> 			label = "Power button";</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			gpios = &lt;&amp;gpio1 19 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			debounce-interval = &lt;100&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		button@2 {</div><div class='add'>+		backup {</div><div class='ctx'> 			label = "Backup button";</div><div class='ctx'> 			linux,code = &lt;KEY_OPTION&gt;;</div><div class='ctx'> 			gpios = &lt;&amp;gpio0 31 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			debounce-interval = &lt;100&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		button@3 {</div><div class='add'>+		reset {</div><div class='ctx'> 			label = "Reset Button";</div><div class='ctx'> 			linux,code = &lt;KEY_RESTART&gt;;</div><div class='ctx'> 			gpios = &lt;&amp;gpio1 23 GPIO_ACTIVE_LOW&gt;;</div><div class='hunk'>@@ -208,6 +190,25 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* USB 3.0 bridge ASM1042A */</div><div class='add'>+	pcie@2,0 {</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;hdd0_led_sata_pin&gt;, &lt;&amp;hdd1_led_sata_pin&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi<br/>index 01cded310cbc..d079a89ee5a2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x20000000&gt;; /* 512 MB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -33,15 +33,6 @@</div><div class='ctx'> 		ranges = &lt;MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000</div><div class='ctx'> 			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/* USB 3.0 Bridge ASM1042A */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> 			coherency-fabric@20200 {</div><div class='ctx'> 				broken-idle;</div><div class='hunk'>@@ -51,15 +42,6 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@74000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;ge1_rgmii_pins&gt;;</div><div class='hunk'>@@ -107,19 +89,19 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		button@1 {</div><div class='add'>+		power {</div><div class='ctx'> 			label = "Power button";</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			gpios = &lt;&amp;gpio1 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			debounce-interval = &lt;100&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		button@2 {</div><div class='add'>+		reset {</div><div class='ctx'> 			label = "Reset Button";</div><div class='ctx'> 			linux,code = &lt;KEY_RESTART&gt;;</div><div class='ctx'> 			gpios = &lt;&amp;gpio1 23 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			debounce-interval = &lt;100&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		button@3 {</div><div class='add'>+		button {</div><div class='ctx'> 			label = "USB VBUS error";</div><div class='ctx'> 			linux,code = &lt;KEY_UNKNOWN&gt;;</div><div class='ctx'> 			gpios = &lt;&amp;gpio1 21 GPIO_ACTIVE_LOW&gt;;</div><div class='hunk'>@@ -143,6 +125,24 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* USB 3.0 Bridge ASM1042A */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sata_led_pin&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370-synology-ds213j.dts b/arch/arm/boot/dts/armada-370-synology-ds213j.dts<br/>index a9cc42776874..4978011df5bd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-synology-ds213j.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370-synology-ds213j.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-synology-ds213j.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-synology-ds213j.dts</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -70,7 +70,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x20000000&gt;; /* 512 MB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -127,12 +127,6 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				phy1: ethernet-phy@1 { /* Marvell 88E1512 */</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 			       status = "okay";</div><div class='ctx'> 			       phy = &lt;&amp;phy1&gt;;</div><div class='hunk'>@@ -192,7 +186,7 @@</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;sata1_pwr_pin &amp;sata2_pwr_pin&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> </div><div class='del'>-		sata1_regulator: sata1-regulator {</div><div class='add'>+		sata1_regulator: sata1-regulator@1 {</div><div class='ctx'> 			compatible = "regulator-fixed";</div><div class='ctx'> 			reg = &lt;1&gt;;</div><div class='ctx'> 			regulator-name = "SATA1 Power";</div><div class='hunk'>@@ -205,7 +199,7 @@</div><div class='ctx'> 			gpio = &lt;&amp;gpio1 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		sata2_regulator: sata2-regulator {</div><div class='add'>+		sata2_regulator: sata2-regulator@2 {</div><div class='ctx'> 			compatible = "regulator-fixed";</div><div class='ctx'> 			reg = &lt;2&gt;;</div><div class='ctx'> 			regulator-name = "SATA2 Power";</div><div class='hunk'>@@ -220,6 +214,12 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;mdio {</div><div class='add'>+	phy1: ethernet-phy@1 { /* Marvell 88E1512 */</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	disk1_led_pin: disk1-led-pin {</div><div class='ctx'> 		marvell,pins = "mpp31";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi<br/>index 3ccedc9dffb2..09495e87b038 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-xp.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370-xp.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370-xp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370-xp.dtsi</a></div><div class='hunk'>@@ -18,17 +18,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -37,11 +37,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -50,8 +50,6 @@</div><div class='ctx'>  * 370 and Armada XP SoC.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "skeleton64.dtsi"</div><div class='del'>-</div><div class='ctx'> #define MBUS_ID(target,attributes) (((target) &lt;&lt; 24) | ((attributes) &lt;&lt; 16))</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -86,7 +84,7 @@</div><div class='ctx'> 		pcie-mem-aperture = &lt;0xf8000000 0x7e00000&gt;;</div><div class='ctx'> 		pcie-io-aperture  = &lt;0xffe00000 0x100000&gt;;</div><div class='ctx'> </div><div class='del'>-		devbus-bootcs {</div><div class='add'>+		devbus_bootcs: devbus-bootcs {</div><div class='ctx'> 			compatible = "marvell,mvebu-devbus";</div><div class='ctx'> 			reg = &lt;MBUS_ID(0xf0, 0x01) 0x10400 0x8&gt;;</div><div class='ctx'> 			ranges = &lt;0 MBUS_ID(0x01, 0x2f) 0 0xffffffff&gt;;</div><div class='hunk'>@@ -96,7 +94,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		devbus-cs0 {</div><div class='add'>+		devbus_cs0: devbus-cs0 {</div><div class='ctx'> 			compatible = "marvell,mvebu-devbus";</div><div class='ctx'> 			reg = &lt;MBUS_ID(0xf0, 0x01) 0x10408 0x8&gt;;</div><div class='ctx'> 			ranges = &lt;0 MBUS_ID(0x01, 0x3e) 0 0xffffffff&gt;;</div><div class='hunk'>@@ -106,7 +104,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		devbus-cs1 {</div><div class='add'>+		devbus_cs1: devbus-cs1 {</div><div class='ctx'> 			compatible = "marvell,mvebu-devbus";</div><div class='ctx'> 			reg = &lt;MBUS_ID(0xf0, 0x01) 0x10410 0x8&gt;;</div><div class='ctx'> 			ranges = &lt;0 MBUS_ID(0x01, 0x3d) 0 0xffffffff&gt;;</div><div class='hunk'>@@ -116,7 +114,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		devbus-cs2 {</div><div class='add'>+		devbus_cs2: devbus-cs2 {</div><div class='ctx'> 			compatible = "marvell,mvebu-devbus";</div><div class='ctx'> 			reg = &lt;MBUS_ID(0xf0, 0x01) 0x10418 0x8&gt;;</div><div class='ctx'> 			ranges = &lt;0 MBUS_ID(0x01, 0x3b) 0 0xffffffff&gt;;</div><div class='hunk'>@@ -126,7 +124,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		devbus-cs3 {</div><div class='add'>+		devbus_cs3: devbus-cs3 {</div><div class='ctx'> 			compatible = "marvell,mvebu-devbus";</div><div class='ctx'> 			reg = &lt;MBUS_ID(0xf0, 0x01) 0x10420 0x8&gt;;</div><div class='ctx'> 			ranges = &lt;0 MBUS_ID(0x01, 0x37) 0 0xffffffff&gt;;</div><div class='hunk'>@@ -142,7 +140,7 @@</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='ctx'> 			ranges = &lt;0 MBUS_ID(0xf0, 0x01) 0 0x100000&gt;;</div><div class='ctx'> </div><div class='del'>-			rtc@10300 {</div><div class='add'>+			rtc: rtc@10300 {</div><div class='ctx'> 				compatible = "marvell,orion-rtc";</div><div class='ctx'> 				reg = &lt;0x10300 0x20&gt;;</div><div class='ctx'> 				interrupts = &lt;50&gt;;</div><div class='hunk'>@@ -214,33 +212,38 @@</div><div class='ctx'> 				msi-controller;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			coherency-fabric@20200 {</div><div class='add'>+			coherencyfab: coherency-fabric@20200 {</div><div class='ctx'> 				compatible = "marvell,coherency-fabric";</div><div class='ctx'> 				reg = &lt;0x20200 0xb0&gt;, &lt;0x21010 0x1c&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			timer@20300 {</div><div class='add'>+			timer: timer@20300 {</div><div class='ctx'> 				reg = &lt;0x20300 0x30&gt;, &lt;0x21040 0x30&gt;;</div><div class='ctx'> 				interrupts = &lt;37&gt;, &lt;38&gt;, &lt;39&gt;, &lt;40&gt;, &lt;5&gt;, &lt;6&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			watchdog@20300 {</div><div class='add'>+			watchdog: watchdog@20300 {</div><div class='ctx'> 				reg = &lt;0x20300 0x34&gt;, &lt;0x20704 0x4&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pmsu@22000 {</div><div class='add'>+			cpurst: cpurst@20800 {</div><div class='add'>+				compatible = "marvell,armada-370-cpu-reset";</div><div class='add'>+				reg = &lt;0x20800 0x8&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pmsu: pmsu@22000 {</div><div class='ctx'> 				compatible = "marvell,armada-370-pmsu";</div><div class='ctx'> 				reg = &lt;0x22000 0x1000&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			usb@50000 {</div><div class='add'>+			usb0: usb@50000 {</div><div class='ctx'> 				compatible = "marvell,orion-ehci";</div><div class='ctx'> 				reg = &lt;0x50000 0x500&gt;;</div><div class='ctx'> 				interrupts = &lt;45&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			usb@51000 {</div><div class='add'>+			usb1: usb@51000 {</div><div class='ctx'> 				compatible = "marvell,orion-ehci";</div><div class='ctx'> 				reg = &lt;0x51000 0x500&gt;;</div><div class='ctx'> 				interrupts = &lt;46&gt;;</div><div class='hunk'>@@ -254,7 +257,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio: mdio {</div><div class='add'>+			mdio: mdio@72004 {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='ctx'> 				compatible = "marvell,orion-mdio";</div><div class='hunk'>@@ -269,7 +272,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			sata@a0000 {</div><div class='add'>+			sata: sata@a0000 {</div><div class='ctx'> 				compatible = "marvell,armada-370-sata";</div><div class='ctx'> 				reg = &lt;0xa0000 0x5000&gt;;</div><div class='ctx'> 				interrupts = &lt;55&gt;;</div><div class='hunk'>@@ -278,7 +281,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			nand@d0000 {</div><div class='add'>+			nand: nand@d0000 {</div><div class='ctx'> 				compatible = "marvell,armada370-nand";</div><div class='ctx'> 				reg = &lt;0xd0000 0x54&gt;;</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -288,7 +291,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mvsdio@d4000 {</div><div class='add'>+			sdio: mvsdio@d4000 {</div><div class='ctx'> 				compatible = "marvell,orion-sdio";</div><div class='ctx'> 				reg = &lt;0xd4000 0x200&gt;;</div><div class='ctx'> 				interrupts = &lt;54&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi<br/>index b4258105e91f..cc011c8bc36b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-370.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-370.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-370.dtsi</a></div><div class='hunk'>@@ -17,17 +17,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -36,11 +36,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -50,9 +50,11 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "armada-370-xp.dtsi"</div><div class='del'>-/include/ "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='ctx'> 	model = "Marvell Armada 370 family SoC";</div><div class='ctx'> 	compatible = "marvell,armada370", "marvell,armada-370-xp";</div><div class='ctx'> </div><div class='hunk'>@@ -70,7 +72,7 @@</div><div class='ctx'> 			reg = &lt;MBUS_ID(0x01, 0xe0) 0 0x100000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='add'>+		pciec: pcie-controller@82000000 {</div><div class='ctx'> 			compatible = "marvell,armada-370-pcie";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			device_type = "pci";</div><div class='hunk'>@@ -89,7 +91,7 @@</div><div class='ctx'> 				0x82000000 0x2 0     MBUS_ID(0x08, 0xe8) 0       1 0 /* Port 1.0 MEM */</div><div class='ctx'> 				0x81000000 0x2 0     MBUS_ID(0x08, 0xe0) 0       1 0 /* Port 1.0 IO  */&gt;;</div><div class='ctx'> </div><div class='del'>-			pcie@1,0 {</div><div class='add'>+			pcie0: pcie@1,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x40000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x0800 0 0 0 0&gt;;</div><div class='hunk'>@@ -106,7 +108,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@2,0 {</div><div class='add'>+			pcie2: pcie@2,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82002800 0 0x80000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x1000 0 0 0 0&gt;;</div><div class='hunk'>@@ -125,7 +127,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		internal-regs {</div><div class='del'>-			L2: l2-cache {</div><div class='add'>+			L2: l2-cache@8000 {</div><div class='ctx'> 				compatible = "marvell,aurora-outer-cache";</div><div class='ctx'> 				reg = &lt;0x08000 0x1000&gt;;</div><div class='ctx'> 				cache-id-part = &lt;0x100&gt;;</div><div class='hunk'>@@ -134,14 +136,6 @@</div><div class='ctx'> 				wt-override;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			i2c0: i2c@11000 {</div><div class='del'>-				reg = &lt;0x11000 0x20&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c1: i2c@11100 {</div><div class='del'>-				reg = &lt;0x11100 0x20&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			gpio0: gpio@18100 {</div><div class='ctx'> 				compatible = "marvell,orion-gpio";</div><div class='ctx'> 				reg = &lt;0x18100 0x40&gt;;</div><div class='hunk'>@@ -175,22 +169,8 @@</div><div class='ctx'> 				interrupts = &lt;91&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * Default UART pinctrl setting without RTS/CTS, can</div><div class='del'>-			 * be overwritten on board level if a different</div><div class='del'>-			 * configuration is used.</div><div class='del'>-			 */</div><div class='del'>-			uart0: serial@12000 {</div><div class='del'>-				pinctrl-0 = &lt;&amp;uart0_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			uart1: serial@12100 {</div><div class='del'>-				pinctrl-0 = &lt;&amp;uart1_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-			};</div><div class='ctx'> </div><div class='del'>-			system-controller@18200 {</div><div class='add'>+			systemc: system-controller@18200 {</div><div class='ctx'> 				compatible = "marvell,armada-370-xp-system-controller";</div><div class='ctx'> 				reg = &lt;0x18200 0x100&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -208,37 +188,18 @@</div><div class='ctx'> 				#clock-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			thermal@18300 {</div><div class='add'>+			thermal: thermal@18300 {</div><div class='ctx'> 				compatible = "marvell,armada370-thermal";</div><div class='ctx'> 				reg = &lt;0x18300 0x4</div><div class='ctx'> 					0x18304 0x4&gt;;</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			sscg@18330 {</div><div class='add'>+			sscg: sscg@18330 {</div><div class='ctx'> 				reg = &lt;0x18330 0x4&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			interrupt-controller@20a00 {</div><div class='del'>-				reg = &lt;0x20a00 0x1d0&gt;, &lt;0x21870 0x58&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			timer@20300 {</div><div class='del'>-				compatible = "marvell,armada-370-timer";</div><div class='del'>-				clocks = &lt;&amp;coreclk 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			watchdog@20300 {</div><div class='del'>-				compatible = "marvell,armada-370-wdt";</div><div class='del'>-				clocks = &lt;&amp;coreclk 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			cpurst@20800 {</div><div class='del'>-				compatible = "marvell,armada-370-cpu-reset";</div><div class='del'>-				reg = &lt;0x20800 0x8&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			cpu-config@21000 {</div><div class='add'>+			cpuconf: cpu-config@21000 {</div><div class='ctx'> 				compatible = "marvell,armada-370-cpu-config";</div><div class='ctx'> 				reg = &lt;0x21000 0x8&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -253,15 +214,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			usb@50000 {</div><div class='del'>-				clocks = &lt;&amp;coreclk 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			usb@51000 {</div><div class='del'>-				clocks = &lt;&amp;coreclk 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			xor@60800 {</div><div class='add'>+			xor0: xor@60800 {</div><div class='ctx'> 				compatible = "marvell,orion-xor";</div><div class='ctx'> 				reg = &lt;0x60800 0x100</div><div class='ctx'> 				       0x60A00 0x100&gt;;</div><div class='hunk'>@@ -280,7 +233,7 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			xor@60900 {</div><div class='add'>+			xor1: xor@60900 {</div><div class='ctx'> 				compatible = "marvell,orion-xor";</div><div class='ctx'> 				reg = &lt;0x60900 0x100</div><div class='ctx'> 				       0x60b00 0x100&gt;;</div><div class='hunk'>@@ -299,15 +252,7 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			ethernet@70000 {</div><div class='del'>-				compatible = "marvell,armada-370-neta";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			ethernet@74000 {</div><div class='del'>-				compatible = "marvell,armada-370-neta";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			crypto@90000 {</div><div class='add'>+			cesa: crypto@90000 {</div><div class='ctx'> 				compatible = "marvell,armada-370-crypto";</div><div class='ctx'> 				reg = &lt;0x90000 0x10000&gt;;</div><div class='ctx'> 				reg-names = "regs";</div><div class='hunk'>@@ -342,6 +287,59 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Default UART pinctrl setting without RTS/CTS, can be overwritten on</div><div class='add'>+ * board level if a different configuration is used.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart0_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart1_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	reg = &lt;0x11000 0x20&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	reg = &lt;0x11100 0x20&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mpic {</div><div class='add'>+	reg = &lt;0x20a00 0x1d0&gt;, &lt;0x21870 0x58&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;timer {</div><div class='add'>+	compatible = "marvell,armada-370-timer";</div><div class='add'>+	clocks = &lt;&amp;coreclk 2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;watchdog {</div><div class='add'>+	compatible = "marvell,armada-370-wdt";</div><div class='add'>+	clocks = &lt;&amp;coreclk 2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb0 {</div><div class='add'>+	clocks = &lt;&amp;coreclk 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb1 {</div><div class='add'>+	clocks = &lt;&amp;coreclk 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;eth0 {</div><div class='add'>+	compatible = "marvell,armada-370-neta";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;eth1 {</div><div class='add'>+	compatible = "marvell,armada-370-neta";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	compatible = "marvell,mv88f6710-pinctrl";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts<br/>index cded5f0a262d..bcdbb8ba1d65 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-375-db.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-375-db.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-375-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-375-db.dts</a></div><div class='hunk'>@@ -17,17 +17,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -36,11 +36,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -58,7 +58,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x40000000&gt;; /* 1 GB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -69,138 +69,141 @@</div><div class='ctx'> 			  MBUS_ID(0x09, 0x09) 0 0xf1100000 0x10000</div><div class='ctx'> 			  MBUS_ID(0x09, 0x05) 0 0xf1110000 0x10000&gt;;</div><div class='ctx'> </div><div class='del'>-		internal-regs {</div><div class='del'>-			spi@10600 {</div><div class='del'>-				pinctrl-0 = &lt;&amp;spi0_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				/*</div><div class='del'>-				 * SPI conflicts with NAND, so we disable it</div><div class='del'>-				 * here, and select NAND as the enabled device</div><div class='del'>-				 * by default.</div><div class='del'>-				 */</div><div class='del'>-				status = "disabled";</div><div class='del'>-</div><div class='del'>-				spi-flash@0 {</div><div class='del'>-					#address-cells = &lt;1&gt;;</div><div class='del'>-					#size-cells = &lt;1&gt;;</div><div class='del'>-					compatible = "n25q128a13", "jedec,spi-nor";</div><div class='del'>-					reg = &lt;0&gt;; /* Chip select 0 */</div><div class='del'>-					spi-max-frequency = &lt;108000000&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c@11000 {</div><div class='del'>-				status = "okay";</div><div class='del'>-				clock-frequency = &lt;100000&gt;;</div><div class='del'>-				pinctrl-0 = &lt;&amp;i2c0_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c@11100 {</div><div class='del'>-				status = "okay";</div><div class='del'>-				clock-frequency = &lt;100000&gt;;</div><div class='del'>-				pinctrl-0 = &lt;&amp;i2c1_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			serial@12000 {</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pinctrl {</div><div class='del'>-				sdio_st_pins: sdio-st-pins {</div><div class='del'>-					marvell,pins = "mpp44", "mpp45";</div><div class='del'>-					marvell,function = "gpio";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sata@a0000 {</div><div class='del'>-				status = "okay";</div><div class='del'>-				nr-ports = &lt;2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			nand: nand@d0000 {</div><div class='del'>-				pinctrl-0 = &lt;&amp;nand_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				status = "okay";</div><div class='del'>-				num-cs = &lt;1&gt;;</div><div class='del'>-				marvell,nand-keep-config;</div><div class='del'>-				marvell,nand-enable-arbiter;</div><div class='del'>-				nand-on-flash-bbt;</div><div class='del'>-				nand-ecc-strength = &lt;4&gt;;</div><div class='del'>-				nand-ecc-step-size = &lt;512&gt;;</div><div class='del'>-</div><div class='del'>-				partition@0 {</div><div class='del'>-					label = "U-Boot";</div><div class='del'>-					reg = &lt;0 0x800000&gt;;</div><div class='del'>-				};</div><div class='del'>-				partition@800000 {</div><div class='del'>-					label = "Linux";</div><div class='del'>-					reg = &lt;0x800000 0x800000&gt;;</div><div class='del'>-				};</div><div class='del'>-				partition@1000000 {</div><div class='del'>-					label = "Filesystem";</div><div class='del'>-					reg = &lt;0x1000000 0x3f000000&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			usb@54000 {</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			usb3@58000 {</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			mvsdio@d4000 {</div><div class='del'>-				pinctrl-0 = &lt;&amp;sdio_pins &amp;sdio_st_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				status = "okay";</div><div class='del'>-				cd-gpios = &lt;&amp;gpio1 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-				wp-gpios = &lt;&amp;gpio1 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			mdio {</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy3: ethernet-phy@3 {</div><div class='del'>-					reg = &lt;3&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			ethernet@f0000 {</div><div class='del'>-				status = "okay";</div><div class='del'>-</div><div class='del'>-				eth0@c4000 {</div><div class='del'>-					status = "okay";</div><div class='del'>-					phy = &lt;&amp;phy0&gt;;</div><div class='del'>-					phy-mode = "rgmii-id";</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				eth1@c5000 {</div><div class='del'>-					status = "okay";</div><div class='del'>-					phy = &lt;&amp;phy3&gt;;</div><div class='del'>-					phy-mode = "gmii";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-			/*</div><div class='del'>-			 * The two PCIe units are accessible through</div><div class='del'>-			 * standard PCIe slots on the board.</div><div class='del'>-			 */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 1, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The two PCIe units are accessible through</div><div class='add'>+ * standard PCIe slots on the board.</div><div class='add'>+ */</div><div class='add'>+&amp;pcie0 {</div><div class='add'>+	/* Port 0, Lane 0 */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pcie1 {</div><div class='add'>+	/* Port 1, Lane 0 */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+&amp;spi0 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi0_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SPI conflicts with NAND, so we disable it here, and</div><div class='add'>+	 * select NAND as the enabled device by default.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	status = "disabled";</div><div class='add'>+</div><div class='add'>+	spi-flash@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "n25q128a13", "jedec,spi-nor";</div><div class='add'>+		reg = &lt;0&gt;; /* Chip select 0 */</div><div class='add'>+		spi-max-frequency = &lt;108000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c0_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	sdio_st_pins: sdio-st-pins {</div><div class='add'>+		marvell,pins = "mpp44", "mpp45";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata {</div><div class='add'>+	status = "okay";</div><div class='add'>+	nr-ports = &lt;2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;nand {</div><div class='add'>+	pinctrl-0 = &lt;&amp;nand_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+	num-cs = &lt;1&gt;;</div><div class='add'>+	marvell,nand-keep-config;</div><div class='add'>+	marvell,nand-enable-arbiter;</div><div class='add'>+	nand-on-flash-bbt;</div><div class='add'>+	nand-ecc-strength = &lt;4&gt;;</div><div class='add'>+	nand-ecc-step-size = &lt;512&gt;;</div><div class='add'>+</div><div class='add'>+	partition@0 {</div><div class='add'>+		label = "U-Boot";</div><div class='add'>+		reg = &lt;0 0x800000&gt;;</div><div class='add'>+	};</div><div class='add'>+	partition@800000 {</div><div class='add'>+		label = "Linux";</div><div class='add'>+		reg = &lt;0x800000 0x800000&gt;;</div><div class='add'>+	};</div><div class='add'>+	partition@1000000 {</div><div class='add'>+		label = "Filesystem";</div><div class='add'>+		reg = &lt;0x1000000 0x3f000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdio {</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdio_pins &amp;sdio_st_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+	cd-gpios = &lt;&amp;gpio1 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	wp-gpios = &lt;&amp;gpio1 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy3: ethernet-phy@3 {</div><div class='add'>+		reg = &lt;3&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ethernet {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+&amp;eth0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	phy = &lt;&amp;phy0&gt;;</div><div class='add'>+	phy-mode = "rgmii-id";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;eth1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	phy = &lt;&amp;phy3&gt;;</div><div class='add'>+	phy-mode = "gmii";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi<br/>index cc952cf8ec30..50c5e8417802 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-375.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-375.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-375.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-375.dtsi</a></div><div class='hunk'>@@ -16,17 +16,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -35,17 +35,16 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/phy/phy.h&gt;</div><div class='hunk'>@@ -53,6 +52,9 @@</div><div class='ctx'> #define MBUS_ID(target,attributes) (((target) &lt;&lt; 24) | ((attributes) &lt;&lt; 16))</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='ctx'> 	model = "Marvell Armada 375 family SoC";</div><div class='ctx'> 	compatible = "marvell,armada375";</div><div class='ctx'> </div><div class='hunk'>@@ -65,7 +67,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	clocks {</div><div class='del'>-		/* 2 GHz fixed main PLL */</div><div class='add'>+		/* 1 GHz fixed main PLL */</div><div class='ctx'> 		mainpll: mainpll {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='hunk'>@@ -84,12 +86,12 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		enable-method = "marvell,armada-375-smp";</div><div class='ctx'> </div><div class='del'>-		cpu@0 {</div><div class='add'>+		cpu0: cpu@0 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a9";</div><div class='ctx'> 			reg = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		cpu@1 {</div><div class='add'>+		cpu1: cpu@1 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a9";</div><div class='ctx'> 			reg = &lt;1&gt;;</div><div class='hunk'>@@ -115,7 +117,7 @@</div><div class='ctx'> 			reg = &lt;MBUS_ID(0x01, 0x1d) 0 0x100000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		devbus-bootcs {</div><div class='add'>+		devbus_bootcs: devbus-bootcs {</div><div class='ctx'> 			compatible = "marvell,mvebu-devbus";</div><div class='ctx'> 			reg = &lt;MBUS_ID(0xf0, 0x01) 0x10400 0x8&gt;;</div><div class='ctx'> 			ranges = &lt;0 MBUS_ID(0x01, 0x2f) 0 0xffffffff&gt;;</div><div class='hunk'>@@ -125,7 +127,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		devbus-cs0 {</div><div class='add'>+		devbus_cs0: devbus-cs0 {</div><div class='ctx'> 			compatible = "marvell,mvebu-devbus";</div><div class='ctx'> 			reg = &lt;MBUS_ID(0xf0, 0x01) 0x10408 0x8&gt;;</div><div class='ctx'> 			ranges = &lt;0 MBUS_ID(0x01, 0x3e) 0 0xffffffff&gt;;</div><div class='hunk'>@@ -135,7 +137,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		devbus-cs1 {</div><div class='add'>+		devbus_cs1: devbus-cs1 {</div><div class='ctx'> 			compatible = "marvell,mvebu-devbus";</div><div class='ctx'> 			reg = &lt;MBUS_ID(0xf0, 0x01) 0x10410 0x8&gt;;</div><div class='ctx'> 			ranges = &lt;0 MBUS_ID(0x01, 0x3d) 0 0xffffffff&gt;;</div><div class='hunk'>@@ -145,7 +147,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		devbus-cs2 {</div><div class='add'>+		devbus_cs2: devbus-cs2 {</div><div class='ctx'> 			compatible = "marvell,mvebu-devbus";</div><div class='ctx'> 			reg = &lt;MBUS_ID(0xf0, 0x01) 0x10418 0x8&gt;;</div><div class='ctx'> 			ranges = &lt;0 MBUS_ID(0x01, 0x3b) 0 0xffffffff&gt;;</div><div class='hunk'>@@ -155,7 +157,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		devbus-cs3 {</div><div class='add'>+		devbus_cs3: devbus-cs3 {</div><div class='ctx'> 			compatible = "marvell,mvebu-devbus";</div><div class='ctx'> 			reg = &lt;MBUS_ID(0xf0, 0x01) 0x10420 0x8&gt;;</div><div class='ctx'> 			ranges = &lt;0 MBUS_ID(0x01, 0x37) 0 0xffffffff&gt;;</div><div class='hunk'>@@ -182,12 +184,12 @@</div><div class='ctx'> 				prefetch-data = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			scu@c000 {</div><div class='add'>+			scu: scu@c000 {</div><div class='ctx'> 				compatible = "arm,cortex-a9-scu";</div><div class='ctx'> 				reg = &lt;0xc000 0x58&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			timer@c600 {</div><div class='add'>+			timer0: timer@c600 {</div><div class='ctx'> 				compatible = "arm,cortex-a9-twd-timer";</div><div class='ctx'> 				reg = &lt;0xc600 0x20&gt;;</div><div class='ctx'> 				interrupts = &lt;GIC_PPI 13 (IRQ_TYPE_EDGE_RISING | GIC_CPU_MASK_SIMPLE(2))&gt;;</div><div class='hunk'>@@ -203,7 +205,7 @@</div><div class='ctx'> 				      &lt;0xc100 0x100&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='add'>+			mdio: mdio@c0054 {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='ctx'> 				compatible = "marvell,orion-mdio";</div><div class='hunk'>@@ -212,7 +214,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			/* Network controller */</div><div class='del'>-			ethernet@f0000 {</div><div class='add'>+			ethernet: ethernet@f0000 {</div><div class='ctx'> 				compatible = "marvell,armada-375-pp2";</div><div class='ctx'> 				reg = &lt;0xf0000 0xa000&gt;, /* Packet Processor regs */</div><div class='ctx'> 				      &lt;0xc0000 0x3060&gt;, /* LMS regs */</div><div class='hunk'>@@ -222,20 +224,20 @@</div><div class='ctx'> 				clock-names = "pp_clk", "gop_clk";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> </div><div class='del'>-				eth0: eth0@c4000 {</div><div class='add'>+				eth0: eth0 {</div><div class='ctx'> 					interrupts = &lt;GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 					port-id = &lt;0&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='del'>-				eth1: eth1@c5000 {</div><div class='add'>+				eth1: eth1 {</div><div class='ctx'> 					interrupts = &lt;GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 					port-id = &lt;1&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			rtc@10300 {</div><div class='add'>+			rtc: rtc@10300 {</div><div class='ctx'> 				compatible = "marvell,orion-rtc";</div><div class='ctx'> 				reg = &lt;0x10300 0x20&gt;;</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='hunk'>@@ -307,7 +309,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pinctrl {</div><div class='add'>+			pinctrl: pinctrl@18000 {</div><div class='ctx'> 				compatible = "marvell,mv88f6720-pinctrl";</div><div class='ctx'> 				reg = &lt;0x18000 0x24&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -382,7 +384,7 @@</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			system-controller@18200 {</div><div class='add'>+			systemc: system-controller@18200 {</div><div class='ctx'> 				compatible = "marvell,armada-375-system-controller";</div><div class='ctx'> 				reg = &lt;0x18200 0x100&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -415,7 +417,7 @@</div><div class='ctx'> 				interrupts = &lt;GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			timer@20300 {</div><div class='add'>+			timer1: timer@20300 {</div><div class='ctx'> 				compatible = "marvell,armada-375-timer", "marvell,armada-370-timer";</div><div class='ctx'> 				reg = &lt;0x20300 0x30&gt;, &lt;0x21040 0x30&gt;;</div><div class='ctx'> 				interrupts-extended = &lt;&amp;gic  GIC_SPI  8 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='hunk'>@@ -428,24 +430,24 @@</div><div class='ctx'> 				clock-names = "nbclk", "fixed";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			watchdog@20300 {</div><div class='add'>+			watchdog: watchdog@20300 {</div><div class='ctx'> 				compatible = "marvell,armada-375-wdt";</div><div class='ctx'> 				reg = &lt;0x20300 0x34&gt;, &lt;0x20704 0x4&gt;, &lt;0x18254 0x4&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;coreclk 0&gt;, &lt;&amp;refclk&gt;;</div><div class='ctx'> 				clock-names = "nbclk", "fixed";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			cpurst@20800 {</div><div class='add'>+			cpurst: cpurst@20800 {</div><div class='ctx'> 				compatible = "marvell,armada-370-cpu-reset";</div><div class='ctx'> 				reg = &lt;0x20800 0x10&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			coherency-fabric@21010 {</div><div class='add'>+			coherencyfab: coherency-fabric@21010 {</div><div class='ctx'> 				compatible = "marvell,armada-375-coherency-fabric";</div><div class='ctx'> 				reg = &lt;0x21010 0x1c&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			usb@50000 {</div><div class='add'>+			usb0: usb@50000 {</div><div class='ctx'> 				compatible = "marvell,orion-ehci";</div><div class='ctx'> 				reg = &lt;0x50000 0x500&gt;;</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='hunk'>@@ -455,7 +457,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			usb@54000 {</div><div class='add'>+			usb1: usb@54000 {</div><div class='ctx'> 				compatible = "marvell,orion-ehci";</div><div class='ctx'> 				reg = &lt;0x54000 0x500&gt;;</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='hunk'>@@ -463,7 +465,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			usb3@58000 {</div><div class='add'>+			usb2: usb3@58000 {</div><div class='ctx'> 				compatible = "marvell,armada-375-xhci";</div><div class='ctx'> 				reg = &lt;0x58000 0x20000&gt;,&lt;0x5b880 0x80&gt;;</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='hunk'>@@ -473,7 +475,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			xor@60800 {</div><div class='add'>+			xor0: xor@60800 {</div><div class='ctx'> 				compatible = "marvell,orion-xor";</div><div class='ctx'> 				reg = &lt;0x60800 0x100</div><div class='ctx'> 				       0x60A00 0x100&gt;;</div><div class='hunk'>@@ -493,7 +495,7 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			xor@60900 {</div><div class='add'>+			xor1: xor@60900 {</div><div class='ctx'> 				compatible = "marvell,orion-xor";</div><div class='ctx'> 				reg = &lt;0x60900 0x100</div><div class='ctx'> 				       0x60b00 0x100&gt;;</div><div class='hunk'>@@ -513,7 +515,7 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			crypto@90000 {</div><div class='add'>+			cesa: crypto@90000 {</div><div class='ctx'> 				compatible = "marvell,armada-375-crypto";</div><div class='ctx'> 				reg = &lt;0x90000 0x10000&gt;;</div><div class='ctx'> 				reg-names = "regs";</div><div class='hunk'>@@ -528,7 +530,7 @@</div><div class='ctx'> 				marvell,crypto-sram-size = &lt;0x800&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			sata@a0000 {</div><div class='add'>+			sata: sata@a0000 {</div><div class='ctx'> 				compatible = "marvell,armada-370-sata";</div><div class='ctx'> 				reg = &lt;0xa0000 0x5000&gt;;</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='hunk'>@@ -537,7 +539,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			nand@d0000 {</div><div class='add'>+			nand: nand@d0000 {</div><div class='ctx'> 				compatible = "marvell,armada370-nand";</div><div class='ctx'> 				reg = &lt;0xd0000 0x54&gt;;</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -547,7 +549,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mvsdio@d4000 {</div><div class='add'>+			sdio: mvsdio@d4000 {</div><div class='ctx'> 				compatible = "marvell,orion-sdio";</div><div class='ctx'> 				reg = &lt;0xd4000 0x200&gt;;</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='hunk'>@@ -559,7 +561,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			thermal@e8078 {</div><div class='add'>+			thermal: thermal@e8078 {</div><div class='ctx'> 				compatible = "marvell,armada375-thermal";</div><div class='ctx'> 				reg = &lt;0xe8078 0x4&gt;, &lt;0xe807c 0x8&gt;;</div><div class='ctx'> 				status = "okay";</div><div class='hunk'>@@ -580,7 +582,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='add'>+		pciec: pcie-controller@82000000 {</div><div class='ctx'> 			compatible = "marvell,armada-370-pcie";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			device_type = "pci";</div><div class='hunk'>@@ -599,7 +601,7 @@</div><div class='ctx'> 				0x82000000 0x2 0       MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 1 MEM */</div><div class='ctx'> 				0x81000000 0x2 0       MBUS_ID(0x04, 0xd0) 0 1 0 /* Port 1 IO  */&gt;;</div><div class='ctx'> </div><div class='del'>-			pcie@1,0 {</div><div class='add'>+			pcie0: pcie@1,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x40000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x0800 0 0 0 0&gt;;</div><div class='hunk'>@@ -616,7 +618,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@2,0 {</div><div class='add'>+			pcie1: pcie@2,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x44000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x1000 0 0 0 0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi<br/>index 5102d19cc8f4..e392f6036f39 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-380.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-380.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-380.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-380.dtsi</a></div><div class='hunk'>@@ -17,17 +17,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -36,11 +36,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi<br/>index 8f0e508f64ae..df47bf1ea5eb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-385-linksys.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-385-linksys.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-385-linksys.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-385-linksys.dtsi</a></div><div class='hunk'>@@ -103,8 +103,56 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='add'>+			mdio@72004 {</div><div class='ctx'> 				status = "okay";</div><div class='add'>+</div><div class='add'>+				switch@0 {</div><div class='add'>+					compatible = "marvell,mv88e6085";</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+					ports {</div><div class='add'>+						#address-cells = &lt;1&gt;;</div><div class='add'>+						#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+						port@0 {</div><div class='add'>+							reg = &lt;0&gt;;</div><div class='add'>+							label = "lan4";</div><div class='add'>+						};</div><div class='add'>+</div><div class='add'>+						port@1 {</div><div class='add'>+							reg = &lt;1&gt;;</div><div class='add'>+							label = "lan3";</div><div class='add'>+						};</div><div class='add'>+</div><div class='add'>+						port@2 {</div><div class='add'>+							reg = &lt;2&gt;;</div><div class='add'>+							label = "lan2";</div><div class='add'>+						};</div><div class='add'>+</div><div class='add'>+						port@3 {</div><div class='add'>+							reg = &lt;3&gt;;</div><div class='add'>+							label = "lan1";</div><div class='add'>+						};</div><div class='add'>+</div><div class='add'>+						port@4 {</div><div class='add'>+							reg = &lt;4&gt;;</div><div class='add'>+							label = "wan";</div><div class='add'>+						};</div><div class='add'>+</div><div class='add'>+						port@5 {</div><div class='add'>+							reg = &lt;5&gt;;</div><div class='add'>+							label = "cpu";</div><div class='add'>+							ethernet = &lt;&amp;eth2&gt;;</div><div class='add'>+</div><div class='add'>+							fixed-link {</div><div class='add'>+								speed = &lt;1000&gt;;</div><div class='add'>+								full-duplex;</div><div class='add'>+							};</div><div class='add'>+						};</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			sata@a8000 {</div><div class='hunk'>@@ -261,6 +309,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dsa@0 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='ctx'> 		compatible = "marvell,dsa";</div><div class='ctx'> 		#address-cells = &lt;2&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts<br/>new file mode 100644<br/>index 000000000000..28eede180e4f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-385-turris-omnia.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-385-turris-omnia.dts</a></div><div class='hunk'>@@ -0,0 +1,392 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree file for the Turris Omnia</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Uwe Kleine-König &lt;uwe@kleine-koenig.org&gt;</div><div class='add'>+ * Copyright (C) 2016 Tomas Hlavacek &lt;tmshlvkc@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is licensed under the terms of the GNU General Public</div><div class='add'>+ *     License version 2.  This program is licensed "as is" without</div><div class='add'>+ *     any warranty of any kind, whether express or implied.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Schematic available at https://www.turris.cz/doc/_media/rtrom01-schema.pdf</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include "armada-385.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Turris Omnia";</div><div class='add'>+	compatible = "cznic,turris-omnia", "marvell,armada385", "marvell,armada380";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x00000000 0x40000000&gt;; /* 1024 MB */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		ranges = &lt;MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000</div><div class='add'>+			  MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000</div><div class='add'>+			  MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000</div><div class='add'>+			  MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+		internal-regs {</div><div class='add'>+</div><div class='add'>+			/* USB part of the PCIe2/USB 2.0 port */</div><div class='add'>+			usb@58000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sata@a8000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sdhci@d8000 {</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+				pinctrl-0 = &lt;&amp;sdhci_pins&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+</div><div class='add'>+				bus-width = &lt;8&gt;;</div><div class='add'>+				no-1-8-v;</div><div class='add'>+				non-removable;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			usb3@f0000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			usb3@f8000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcie-controller {</div><div class='add'>+			status = "okay";</div><div class='add'>+</div><div class='add'>+			pcie@1,0 {</div><div class='add'>+				/* Port 0, Lane 0 */</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pcie@2,0 {</div><div class='add'>+				/* Port 1, Lane 0 */</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pcie@3,0 {</div><div class='add'>+				/* Port 2, Lane 0 */</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Connected to 88E6176 switch, port 6 */</div><div class='add'>+&amp;eth0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;ge0_rgmii_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+	phy-mode = "rgmii";</div><div class='add'>+</div><div class='add'>+	fixed-link {</div><div class='add'>+		speed = &lt;1000&gt;;</div><div class='add'>+		full-duplex;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Connected to 88E6176 switch, port 5 */</div><div class='add'>+&amp;eth1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;ge1_rgmii_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+	phy-mode = "rgmii";</div><div class='add'>+</div><div class='add'>+	fixed-link {</div><div class='add'>+		speed = &lt;1000&gt;;</div><div class='add'>+		full-duplex;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* WAN port */</div><div class='add'>+&amp;eth2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	phy-mode = "sgmii";</div><div class='add'>+	phy = &lt;&amp;phy1&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c0_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	i2cmux@70 {</div><div class='add'>+		compatible = "nxp,pca9547";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0x70&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		i2c@0 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			/* STM32F0 command interface at address 0x2a */</div><div class='add'>+			/* leds device (in STM32F0) at address 0x2b */</div><div class='add'>+</div><div class='add'>+			eeprom@54 {</div><div class='add'>+				compatible = "at,24c64";</div><div class='add'>+				reg = &lt;0x54&gt;;</div><div class='add'>+</div><div class='add'>+				/* The EEPROM contains data for bootloader.</div><div class='add'>+				 * Contents:</div><div class='add'>+				 * 	struct omnia_eeprom {</div><div class='add'>+				 * 		u32 magic; (=0x0341a034 in LE)</div><div class='add'>+				 *		u32 ramsize; (in GiB)</div><div class='add'>+				 * 		char regdomain[4];</div><div class='add'>+				 * 		u32 crc32;</div><div class='add'>+				 * 	};</div><div class='add'>+				 */</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@1 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			/* routed to PCIe0/mSATA connector (CN7A) */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@2 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			/* routed to PCIe1/USB2 connector (CN61A) */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@3 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;3&gt;;</div><div class='add'>+</div><div class='add'>+			/* routed to PCIe2 connector (CN62A) */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@4 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+			/* routed to SFP+ */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@5 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;5&gt;;</div><div class='add'>+</div><div class='add'>+			/* ATSHA204A at address 0x64 */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@6 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;6&gt;;</div><div class='add'>+</div><div class='add'>+			/* exposed on pin header */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@7 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;7&gt;;</div><div class='add'>+</div><div class='add'>+			pcawan: gpio@71 {</div><div class='add'>+				/*</div><div class='add'>+				 * GPIO expander for SFP+ signals and</div><div class='add'>+				 * and phy irq</div><div class='add'>+				 */</div><div class='add'>+				compatible = "nxp,pca9538";</div><div class='add'>+				reg = &lt;0x71&gt;;</div><div class='add'>+</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+				pinctrl-0 = &lt;&amp;pcawan_pins&gt;;</div><div class='add'>+</div><div class='add'>+				interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+				interrupts = &lt;14 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	phy1: phy@1 {</div><div class='add'>+		status = "okay";</div><div class='add'>+		compatible = "ethernet-phy-id0141.0DD1", "ethernet-phy-ieee802.3-c22";</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		/* irq is connected to &amp;pcawan pin 7 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Switch MV88E6176 at address 0x10 */</div><div class='add'>+	switch@10 {</div><div class='add'>+		compatible = "marvell,mv88e6085";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		dsa,member = &lt;0 0&gt;;</div><div class='add'>+</div><div class='add'>+		reg = &lt;0x10&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			ports@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				label = "lan0";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ports@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				label = "lan1";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ports@2 {</div><div class='add'>+				reg = &lt;2&gt;;</div><div class='add'>+				label = "lan2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ports@3 {</div><div class='add'>+				reg = &lt;3&gt;;</div><div class='add'>+				label = "lan3";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ports@4 {</div><div class='add'>+				reg = &lt;4&gt;;</div><div class='add'>+				label = "lan4";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ports@5 {</div><div class='add'>+				reg = &lt;5&gt;;</div><div class='add'>+				label = "cpu";</div><div class='add'>+				ethernet = &lt;&amp;eth1&gt;;</div><div class='add'>+				phy-mode = "rgmii-id";</div><div class='add'>+</div><div class='add'>+				fixed-link {</div><div class='add'>+					speed = &lt;1000&gt;;</div><div class='add'>+					full-duplex;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* port 6 is connected to eth0 */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	pcawan_pins: pcawan-pins {</div><div class='add'>+		marvell,pins = "mpp46";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi0cs0_pins: spi0cs0-pins {</div><div class='add'>+		marvell,pins = "mpp25";</div><div class='add'>+		marvell,function = "spi0";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi0cs1_pins: spi0cs1-pins {</div><div class='add'>+		marvell,pins = "mpp26";</div><div class='add'>+		marvell,function = "spi0";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi0_pins &amp;spi0cs0_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	spi-nor@0 {</div><div class='add'>+		compatible = "spansion,s25fl164k", "jedec,spi-nor";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;40000000&gt;;</div><div class='add'>+</div><div class='add'>+		partitions {</div><div class='add'>+			compatible = "fixed-partitions";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			partition@0 {</div><div class='add'>+				reg = &lt;0x0 0x00100000&gt;;</div><div class='add'>+				label = "U-Boot";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@100000 {</div><div class='add'>+				reg = &lt;0x00100000 0x00700000&gt;;</div><div class='add'>+				label = "Rescue system";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* MISO, MOSI, SCLK and CS1 are routed to pin header CN11 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	/* Pin header CN10 */</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart0_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	/* Pin header CN11 */</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart1_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi<br/>index 8e67d2c083dd..8e63be33472e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-385.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-385.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-385.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-385.dtsi</a></div><div class='hunk'>@@ -17,17 +17,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -36,11 +36,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-388-clearfog-base.dts b/arch/arm/boot/dts/armada-388-clearfog-base.dts<br/>new file mode 100644<br/>index 000000000000..22ed07fc2979<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-388-clearfog-base.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-clearfog-base.dts</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree file for SolidRun Clearfog Base revision A1 rev 2.0 (88F6828)</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2015 Russell King</div><div class='add'>+ *</div><div class='add'>+ * This board is in development; the contents of this file work with</div><div class='add'>+ * the A1 rev 2.0 of the board, which does not represent final</div><div class='add'>+ * production board.  Things will change, don't expect this file to</div><div class='add'>+ * remain compatible info the future.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "armada-388-clearfog.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "SolidRun Clearfog Base A1";</div><div class='add'>+	compatible = "solidrun,clearfog-base-a1",</div><div class='add'>+		"solidrun,clearfog-a1", "marvell,armada388",</div><div class='add'>+		"marvell,armada385", "marvell,armada380";</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		pinctrl-0 = &lt;&amp;rear_button_pins&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+		button_0 {</div><div class='add'>+			/* The rear SW3 button */</div><div class='add'>+			label = "Rear Button";</div><div class='add'>+			gpios = &lt;&amp;gpio1 12 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,can-disable;</div><div class='add'>+			linux,code = &lt;BTN_0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;eth1 {</div><div class='add'>+	phy = &lt;&amp;phy1&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gpio0 {</div><div class='add'>+	phy1_reset {</div><div class='add'>+		gpio-hog;</div><div class='add'>+		gpios = &lt;19 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		output-low;</div><div class='add'>+		line-name = "phy1-reset";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	pinctrl-0 = &lt;&amp;mdio_pins &amp;microsom_phy_clk_pins &amp;clearfog_phy_pins&gt;;</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		/*</div><div class='add'>+		 * Annoyingly, the marvell phy driver configures the LED</div><div class='add'>+		 * register, rather than preserving reset-loaded setting.</div><div class='add'>+		 * We undo that rubbish here.</div><div class='add'>+		 */</div><div class='add'>+		marvell,reg-init = &lt;3 16 0 0x101e&gt;;</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	/* phy1 reset */</div><div class='add'>+	clearfog_phy_pins: clearfog-phy-pins {</div><div class='add'>+		marvell,pins = "mpp19";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+	rear_button_pins: rear-button-pins {</div><div class='add'>+		marvell,pins = "mpp44";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-388-clearfog-pro.dts b/arch/arm/boot/dts/armada-388-clearfog-pro.dts<br/>new file mode 100644<br/>index 000000000000..bd85870bbdbb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-388-clearfog-pro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-clearfog-pro.dts</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree file for SolidRun Clearfog Pro revision A1 rev 2.0 (88F6828)</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2015 Russell King</div><div class='add'>+ *</div><div class='add'>+ * This board is in development; the contents of this file work with</div><div class='add'>+ * the A1 rev 2.0 of the board, which does not represent final</div><div class='add'>+ * production board.  Things will change, don't expect this file to</div><div class='add'>+ * remain compatible info the future.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+#include "armada-388-clearfog.dts"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "SolidRun Clearfog Pro A1";</div><div class='add'>+	compatible = "solidrun,clearfog-pro-a1",</div><div class='add'>+		"solidrun,clearfog-a1", "marvell,armada388",</div><div class='add'>+		"marvell,armada385", "marvell,armada380";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts<br/>index 71ce201c903e..2745b7416313 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-388-clearfog.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-388-clearfog.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-388-clearfog.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-clearfog.dts</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Device Tree file for SolidRun Clearfog revision A1 rev 2.0 (88F6828)</div><div class='add'>+ * Device Tree file for SolidRun Clearfog Pro revision A1 rev 2.0 (88F6828)</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2015 Russell King</div><div class='ctx'>  *</div><div class='hunk'>@@ -17,17 +17,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -36,312 +36,33 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='del'>-#include "armada-388.dtsi"</div><div class='del'>-#include "armada-38x-solidrun-microsom.dtsi"</div><div class='add'>+#include "armada-388-clearfog.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "SolidRun Clearfog A1";</div><div class='ctx'> 	compatible = "solidrun,clearfog-a1", "marvell,armada388",</div><div class='ctx'> 		"marvell,armada385", "marvell,armada380";</div><div class='ctx'> </div><div class='del'>-	aliases {</div><div class='del'>-		/* So that mvebu u-boot can update the MAC addresses */</div><div class='del'>-		ethernet1 = &amp;eth0;</div><div class='del'>-		ethernet2 = &amp;eth1;</div><div class='del'>-		ethernet3 = &amp;eth2;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	chosen {</div><div class='del'>-		stdout-path = "serial0:115200n8";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	reg_3p3v: regulator-3p3v {</div><div class='del'>-		compatible = "regulator-fixed";</div><div class='del'>-		regulator-name = "3P3V";</div><div class='del'>-		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='del'>-		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-		regulator-always-on;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	soc {</div><div class='ctx'> 		internal-regs {</div><div class='del'>-			ethernet@30000 {</div><div class='del'>-				phy-mode = "sgmii";</div><div class='del'>-				buffer-manager = &lt;&amp;bm&gt;;</div><div class='del'>-				bm,pool-long = &lt;2&gt;;</div><div class='del'>-				bm,pool-short = &lt;1&gt;;</div><div class='del'>-				status = "okay";</div><div class='del'>-</div><div class='del'>-				fixed-link {</div><div class='del'>-					speed = &lt;1000&gt;;</div><div class='del'>-					full-duplex;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			ethernet@34000 {</div><div class='del'>-				phy-mode = "sgmii";</div><div class='del'>-				buffer-manager = &lt;&amp;bm&gt;;</div><div class='del'>-				bm,pool-long = &lt;3&gt;;</div><div class='del'>-				bm,pool-short = &lt;1&gt;;</div><div class='del'>-				status = "okay";</div><div class='del'>-</div><div class='del'>-				fixed-link {</div><div class='del'>-					speed = &lt;1000&gt;;</div><div class='del'>-					full-duplex;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c@11000 {</div><div class='del'>-				/* Is there anything on this? */</div><div class='del'>-				clock-frequency = &lt;100000&gt;;</div><div class='del'>-				pinctrl-0 = &lt;&amp;i2c0_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				status = "okay";</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * PCA9655 GPIO expander, up to 1MHz clock.</div><div class='del'>-				 *  0-CON3 CLKREQ#</div><div class='del'>-				 *  1-CON3 PERST#</div><div class='del'>-				 *  2-CON2 PERST#</div><div class='del'>-				 *  3-CON3 W_DISABLE</div><div class='del'>-				 *  4-CON2 CLKREQ#</div><div class='del'>-				 *  5-USB3 overcurrent</div><div class='del'>-				 *  6-USB3 power</div><div class='del'>-				 *  7-CON2 W_DISABLE</div><div class='del'>-				 *  8-JP4 P1</div><div class='del'>-				 *  9-JP4 P4</div><div class='del'>-				 * 10-JP4 P5</div><div class='del'>-				 * 11-m.2 DEVSLP</div><div class='del'>-				 * 12-SFP_LOS</div><div class='del'>-				 * 13-SFP_TX_FAULT</div><div class='del'>-				 * 14-SFP_TX_DISABLE</div><div class='del'>-				 * 15-SFP_MOD_DEF0</div><div class='del'>-				 */</div><div class='del'>-				expander0: gpio-expander@20 {</div><div class='del'>-					/*</div><div class='del'>-					 * This is how it should be:</div><div class='del'>-					 * compatible = "onnn,pca9655",</div><div class='del'>-					 *	 "nxp,pca9555";</div><div class='del'>-					 * but you can't do this because of</div><div class='del'>-					 * the way I2C works.</div><div class='del'>-					 */</div><div class='del'>-					compatible = "nxp,pca9555";</div><div class='del'>-					gpio-controller;</div><div class='del'>-					#gpio-cells = &lt;2&gt;;</div><div class='del'>-					reg = &lt;0x20&gt;;</div><div class='del'>-</div><div class='del'>-					pcie1_0_clkreq {</div><div class='del'>-						gpio-hog;</div><div class='del'>-						gpios = &lt;0 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-						input;</div><div class='del'>-						line-name = "pcie1.0-clkreq";</div><div class='del'>-					};</div><div class='del'>-					pcie1_0_w_disable {</div><div class='del'>-						gpio-hog;</div><div class='del'>-						gpios = &lt;3 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-						output-low;</div><div class='del'>-						line-name = "pcie1.0-w-disable";</div><div class='del'>-					};</div><div class='del'>-					pcie2_0_clkreq {</div><div class='del'>-						gpio-hog;</div><div class='del'>-						gpios = &lt;4 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-						input;</div><div class='del'>-						line-name = "pcie2.0-clkreq";</div><div class='del'>-					};</div><div class='del'>-					pcie2_0_w_disable {</div><div class='del'>-						gpio-hog;</div><div class='del'>-						gpios = &lt;7 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-						output-low;</div><div class='del'>-						line-name = "pcie2.0-w-disable";</div><div class='del'>-					};</div><div class='del'>-					usb3_ilimit {</div><div class='del'>-						gpio-hog;</div><div class='del'>-						gpios = &lt;5 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-						input;</div><div class='del'>-						line-name = "usb3-current-limit";</div><div class='del'>-					};</div><div class='del'>-					usb3_power {</div><div class='del'>-						gpio-hog;</div><div class='del'>-						gpios = &lt;6 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-						output-high;</div><div class='del'>-						line-name = "usb3-power";</div><div class='del'>-					};</div><div class='del'>-					m2_devslp {</div><div class='del'>-						gpio-hog;</div><div class='del'>-						gpios = &lt;11 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-						output-low;</div><div class='del'>-						line-name = "m.2 devslp";</div><div class='del'>-					};</div><div class='del'>-					sfp_los {</div><div class='del'>-						/* SFP loss of signal */</div><div class='del'>-						gpio-hog;</div><div class='del'>-						gpios = &lt;12 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-						input;</div><div class='del'>-						line-name = "sfp-los";</div><div class='del'>-					};</div><div class='del'>-					sfp_tx_fault {</div><div class='del'>-						/* SFP laser fault */</div><div class='del'>-						gpio-hog;</div><div class='del'>-						gpios = &lt;13 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-						input;</div><div class='del'>-						line-name = "sfp-tx-fault";</div><div class='del'>-					};</div><div class='del'>-					sfp_tx_disable {</div><div class='del'>-						/* SFP transmit disable */</div><div class='del'>-						gpio-hog;</div><div class='del'>-						gpios = &lt;14 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-						output-low;</div><div class='del'>-						line-name = "sfp-tx-disable";</div><div class='del'>-					};</div><div class='del'>-					sfp_mod_def0 {</div><div class='del'>-						/* SFP module present */</div><div class='del'>-						gpio-hog;</div><div class='del'>-						gpios = &lt;15 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-						input;</div><div class='del'>-						line-name = "sfp-mod-def0";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				/* The MCP3021 is 100kHz clock only */</div><div class='del'>-				mikrobus_adc: mcp3021@4c {</div><div class='del'>-					compatible = "microchip,mcp3021";</div><div class='del'>-					reg = &lt;0x4c&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				/* Also something at 0x64 */</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c@11100 {</div><div class='del'>-				/*</div><div class='del'>-				 * Routed to SFP, mikrobus, and PCIe.</div><div class='del'>-				 * SFP limits this to 100kHz, and requires</div><div class='del'>-				 *  an AT24C01A/02/04 with address pins tied</div><div class='del'>-				 *  low, which takes addresses 0x50 and 0x51.</div><div class='del'>-				 * Mikrobus doesn't specify beyond an I2C</div><div class='del'>-				 *  bus being present.</div><div class='del'>-				 * PCIe uses ARP to assign addresses, or</div><div class='del'>-				 *  0x63-0x64.</div><div class='del'>-				 */</div><div class='del'>-				clock-frequency = &lt;100000&gt;;</div><div class='del'>-				pinctrl-0 = &lt;&amp;clearfog_i2c1_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pinctrl@18000 {</div><div class='del'>-				clearfog_dsa0_clk_pins: clearfog-dsa0-clk-pins {</div><div class='del'>-					marvell,pins = "mpp46";</div><div class='del'>-					marvell,function = "ref";</div><div class='del'>-				};</div><div class='del'>-				clearfog_dsa0_pins: clearfog-dsa0-pins {</div><div class='del'>-					marvell,pins = "mpp23", "mpp41";</div><div class='del'>-					marvell,function = "gpio";</div><div class='del'>-				};</div><div class='del'>-				clearfog_i2c1_pins: i2c1-pins {</div><div class='del'>-					/* SFP, PCIe, mSATA, mikrobus */</div><div class='del'>-					marvell,pins = "mpp26", "mpp27";</div><div class='del'>-					marvell,function = "i2c1";</div><div class='del'>-				};</div><div class='del'>-				clearfog_sdhci_cd_pins: clearfog-sdhci-cd-pins {</div><div class='del'>-					marvell,pins = "mpp20";</div><div class='del'>-					marvell,function = "gpio";</div><div class='del'>-				};</div><div class='del'>-				clearfog_sdhci_pins: clearfog-sdhci-pins {</div><div class='del'>-					marvell,pins = "mpp21", "mpp28",</div><div class='del'>-						       "mpp37", "mpp38",</div><div class='del'>-						       "mpp39", "mpp40";</div><div class='del'>-					marvell,function = "sd0";</div><div class='del'>-				};</div><div class='del'>-				clearfog_spi1_cs_pins: spi1-cs-pins {</div><div class='del'>-					marvell,pins = "mpp55";</div><div class='del'>-					marvell,function = "spi1";</div><div class='del'>-				};</div><div class='del'>-				mikro_pins: mikro-pins {</div><div class='del'>-					/* int: mpp22 rst: mpp29 */</div><div class='del'>-					marvell,pins = "mpp22", "mpp29";</div><div class='del'>-					marvell,function = "gpio";</div><div class='del'>-				};</div><div class='del'>-				mikro_spi_pins: mikro-spi-pins {</div><div class='del'>-					marvell,pins = "mpp43";</div><div class='del'>-					marvell,function = "spi1";</div><div class='del'>-				};</div><div class='del'>-				mikro_uart_pins: mikro-uart-pins {</div><div class='del'>-					marvell,pins = "mpp24", "mpp25";</div><div class='del'>-					marvell,function = "ua1";</div><div class='del'>-				};</div><div class='del'>-				rear_button_pins: rear-button-pins {</div><div class='del'>-					marvell,pins = "mpp34";</div><div class='del'>-					marvell,function = "gpio";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sata@a8000 {</div><div class='del'>-				/* pinctrl? */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sata@e0000 {</div><div class='del'>-				/* pinctrl? */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sdhci@d8000 {</div><div class='del'>-				bus-width = &lt;4&gt;;</div><div class='del'>-				cd-gpios = &lt;&amp;gpio0 20 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-				no-1-8-v;</div><div class='del'>-				pinctrl-0 = &lt;&amp;clearfog_sdhci_pins</div><div class='del'>-					     &amp;clearfog_sdhci_cd_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				status = "okay";</div><div class='del'>-				vmmc = &lt;&amp;reg_3p3v&gt;;</div><div class='del'>-				wp-inverted;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			serial@12100 {</div><div class='del'>-				/* mikrobus uart */</div><div class='del'>-				pinctrl-0 = &lt;&amp;mikro_uart_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			usb@58000 {</div><div class='del'>-				/* CON3, nearest  power. */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			usb3@f0000 {</div><div class='ctx'> 				/* CON2, nearest CPU, USB2 only. */</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='del'>-</div><div class='del'>-			usb3@f8000 {</div><div class='del'>-				/* CON7 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-			/*</div><div class='del'>-			 * The two PCIe units are accessible through</div><div class='del'>-			 * the mini-PCIe connectors on the board.</div><div class='del'>-			 */</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 1, Lane 0. CON3, nearest power. */</div><div class='del'>-				reset-gpios = &lt;&amp;expander0 1 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='ctx'> 			pcie@3,0 {</div><div class='ctx'> 				/* Port 2, Lane 0. CON2, nearest CPU. */</div><div class='ctx'> 				reset-gpios = &lt;&amp;expander0 2 GPIO_ACTIVE_LOW&gt;;</div><div class='hunk'>@@ -351,6 +72,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dsa@0 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='ctx'> 		compatible = "marvell,dsa";</div><div class='ctx'> 		dsa,ethernet = &lt;&amp;eth1&gt;;</div><div class='ctx'> 		dsa,mii-bus = &lt;&amp;mdio&gt;;</div><div class='hunk'>@@ -421,26 +144,136 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;spi1 {</div><div class='add'>+&amp;eth1 {</div><div class='add'>+	/* ethernet@30000 */</div><div class='add'>+	fixed-link {</div><div class='add'>+		speed = &lt;1000&gt;;</div><div class='add'>+		full-duplex;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;expander0 {</div><div class='ctx'> 	/*</div><div class='del'>-	 * We don't seem to have the W25Q32 on the</div><div class='del'>-	 * A1 Rev 2.0 boards, so disable SPI.</div><div class='del'>-	 * CS0: W25Q32 (doesn't appear to be present)</div><div class='del'>-	 * CS1:</div><div class='del'>-	 * CS2: mikrobus</div><div class='add'>+	 * PCA9655 GPIO expander:</div><div class='add'>+	 *  0-CON3 CLKREQ#</div><div class='add'>+	 *  1-CON3 PERST#</div><div class='add'>+	 *  2-CON2 PERST#</div><div class='add'>+	 *  3-CON3 W_DISABLE</div><div class='add'>+	 *  4-CON2 CLKREQ#</div><div class='add'>+	 *  5-USB3 overcurrent</div><div class='add'>+	 *  6-USB3 power</div><div class='add'>+	 *  7-CON2 W_DISABLE</div><div class='add'>+	 *  8-JP4 P1</div><div class='add'>+	 *  9-JP4 P4</div><div class='add'>+	 * 10-JP4 P5</div><div class='add'>+	 * 11-m.2 DEVSLP</div><div class='add'>+	 * 12-SFP_LOS</div><div class='add'>+	 * 13-SFP_TX_FAULT</div><div class='add'>+	 * 14-SFP_TX_DISABLE</div><div class='add'>+	 * 15-SFP_MOD_DEF0</div><div class='ctx'> 	 */</div><div class='del'>-	pinctrl-0 = &lt;&amp;spi1_pins</div><div class='del'>-		     &amp;clearfog_spi1_cs_pins</div><div class='del'>-		     &amp;mikro_spi_pins&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='add'>+	pcie2_0_clkreq {</div><div class='add'>+		gpio-hog;</div><div class='add'>+		gpios = &lt;4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		input;</div><div class='add'>+		line-name = "pcie2.0-clkreq";</div><div class='add'>+	};</div><div class='add'>+	pcie2_0_w_disable {</div><div class='add'>+		gpio-hog;</div><div class='add'>+		gpios = &lt;7 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		output-low;</div><div class='add'>+		line-name = "pcie2.0-w-disable";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	clearfog_dsa0_clk_pins: clearfog-dsa0-clk-pins {</div><div class='add'>+		marvell,pins = "mpp46";</div><div class='add'>+		marvell,function = "ref";</div><div class='add'>+	};</div><div class='add'>+	clearfog_dsa0_pins: clearfog-dsa0-pins {</div><div class='add'>+		marvell,pins = "mpp23", "mpp41";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+	clearfog_spi1_cs_pins: spi1-cs-pins {</div><div class='add'>+		marvell,pins = "mpp55";</div><div class='add'>+		marvell,function = "spi1";</div><div class='add'>+	};</div><div class='add'>+	rear_button_pins: rear-button-pins {</div><div class='add'>+		marvell,pins = "mpp34";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='del'>-	spi-flash@0 {</div><div class='add'>+	switch@4 {</div><div class='add'>+		compatible = "marvell,mv88e6085";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "w25q32", "jedec,spi-nor";</div><div class='del'>-		reg = &lt;0&gt;; /* Chip select 0 */</div><div class='del'>-		spi-max-frequency = &lt;3000000&gt;;</div><div class='del'>-		status = "disabled";</div><div class='add'>+		reg = &lt;4&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;clearfog_dsa0_clk_pins &amp;clearfog_dsa0_pins&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				label = "lan5";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				label = "lan4";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@2 {</div><div class='add'>+				reg = &lt;2&gt;;</div><div class='add'>+				label = "lan3";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@3 {</div><div class='add'>+				reg = &lt;3&gt;;</div><div class='add'>+				label = "lan2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@4 {</div><div class='add'>+				reg = &lt;4&gt;;</div><div class='add'>+				label = "lan1";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@5 {</div><div class='add'>+				reg = &lt;5&gt;;</div><div class='add'>+				label = "cpu";</div><div class='add'>+				ethernet = &lt;&amp;eth1&gt;;</div><div class='add'>+				fixed-link {</div><div class='add'>+					speed = &lt;1000&gt;;</div><div class='add'>+					full-duplex;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@6 {</div><div class='add'>+				/* 88E1512 external phy */</div><div class='add'>+				reg = &lt;6&gt;;</div><div class='add'>+				label = "lan6";</div><div class='add'>+				fixed-link {</div><div class='add'>+					speed = &lt;1000&gt;;</div><div class='add'>+					full-duplex;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;spi1 {</div><div class='add'>+	/*</div><div class='add'>+	 * Add SPI CS pins for clearfog:</div><div class='add'>+	 * CS0: W25Q32 (not populated on uSOM)</div><div class='add'>+	 * CS1:</div><div class='add'>+	 * CS2: mikrobus</div><div class='add'>+	 */</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi1_pins &amp;clearfog_spi1_cs_pins &amp;mikro_spi_pins&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi<br/>new file mode 100644<br/>index 000000000000..0f5938bede53<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-388-clearfog.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-clearfog.dtsi</a></div><div class='hunk'>@@ -0,0 +1,307 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree include file for SolidRun Clearfog 88F6828 based boards</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2015 Russell King</div><div class='add'>+ *</div><div class='add'>+ * This board is in development; the contents of this file work with</div><div class='add'>+ * the A1 rev 2.0 of the board, which does not represent final</div><div class='add'>+ * production board.  Things will change, don't expect this file to</div><div class='add'>+ * remain compatible info the future.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "armada-388.dtsi"</div><div class='add'>+#include "armada-38x-solidrun-microsom.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	aliases {</div><div class='add'>+		/* So that mvebu u-boot can update the MAC addresses */</div><div class='add'>+		ethernet1 = &amp;eth0;</div><div class='add'>+		ethernet2 = &amp;eth1;</div><div class='add'>+		ethernet3 = &amp;eth2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3p3v: regulator-3p3v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3P3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		internal-regs {</div><div class='add'>+			sata@a8000 {</div><div class='add'>+				/* pinctrl? */</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sata@e0000 {</div><div class='add'>+				/* pinctrl? */</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sdhci@d8000 {</div><div class='add'>+				bus-width = &lt;4&gt;;</div><div class='add'>+				cd-gpios = &lt;&amp;gpio0 20 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+				no-1-8-v;</div><div class='add'>+				pinctrl-0 = &lt;&amp;microsom_sdhci_pins</div><div class='add'>+					     &amp;clearfog_sdhci_cd_pins&gt;;</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+				status = "okay";</div><div class='add'>+				vmmc = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+				wp-inverted;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			usb@58000 {</div><div class='add'>+				/* CON3, nearest  power. */</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			usb3@f8000 {</div><div class='add'>+				/* CON7 */</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcie-controller {</div><div class='add'>+			status = "okay";</div><div class='add'>+			/*</div><div class='add'>+			 * The two PCIe units are accessible through</div><div class='add'>+			 * the mini-PCIe connectors on the board.</div><div class='add'>+			 */</div><div class='add'>+			pcie@2,0 {</div><div class='add'>+				/* Port 1, Lane 0. CON3, nearest power. */</div><div class='add'>+				reset-gpios = &lt;&amp;expander0 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;eth1 {</div><div class='add'>+	/* ethernet@30000 */</div><div class='add'>+	bm,pool-long = &lt;2&gt;;</div><div class='add'>+	bm,pool-short = &lt;1&gt;;</div><div class='add'>+	buffer-manager = &lt;&amp;bm&gt;;</div><div class='add'>+	phy-mode = "sgmii";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;eth2 {</div><div class='add'>+	/* ethernet@34000 */</div><div class='add'>+	bm,pool-long = &lt;3&gt;;</div><div class='add'>+	bm,pool-short = &lt;1&gt;;</div><div class='add'>+	buffer-manager = &lt;&amp;bm&gt;;</div><div class='add'>+	phy-mode = "sgmii";</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	fixed-link {</div><div class='add'>+		speed = &lt;1000&gt;;</div><div class='add'>+		full-duplex;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	/* Is there anything on this? */</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c0_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * PCA9655 GPIO expander, up to 1MHz clock.</div><div class='add'>+	 *  0-CON3 CLKREQ#</div><div class='add'>+	 *  1-CON3 PERST#</div><div class='add'>+	 *  2-</div><div class='add'>+	 *  3-CON3 W_DISABLE</div><div class='add'>+	 *  4-</div><div class='add'>+	 *  5-USB3 overcurrent</div><div class='add'>+	 *  6-USB3 power</div><div class='add'>+	 *  7-</div><div class='add'>+	 *  8-JP4 P1</div><div class='add'>+	 *  9-JP4 P4</div><div class='add'>+	 * 10-JP4 P5</div><div class='add'>+	 * 11-m.2 DEVSLP</div><div class='add'>+	 * 12-SFP_LOS</div><div class='add'>+	 * 13-SFP_TX_FAULT</div><div class='add'>+	 * 14-SFP_TX_DISABLE</div><div class='add'>+	 * 15-SFP_MOD_DEF0</div><div class='add'>+	 */</div><div class='add'>+	expander0: gpio-expander@20 {</div><div class='add'>+		/*</div><div class='add'>+		 * This is how it should be:</div><div class='add'>+		 * compatible = "onnn,pca9655", "nxp,pca9555";</div><div class='add'>+		 * but you can't do this because of the way I2C works.</div><div class='add'>+		 */</div><div class='add'>+		compatible = "nxp,pca9555";</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+		reg = &lt;0x20&gt;;</div><div class='add'>+</div><div class='add'>+		pcie1_0_clkreq {</div><div class='add'>+			gpio-hog;</div><div class='add'>+			gpios = &lt;0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			input;</div><div class='add'>+			line-name = "pcie1.0-clkreq";</div><div class='add'>+		};</div><div class='add'>+		pcie1_0_w_disable {</div><div class='add'>+			gpio-hog;</div><div class='add'>+			gpios = &lt;3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			output-low;</div><div class='add'>+			line-name = "pcie1.0-w-disable";</div><div class='add'>+		};</div><div class='add'>+		usb3_ilimit {</div><div class='add'>+			gpio-hog;</div><div class='add'>+			gpios = &lt;5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			input;</div><div class='add'>+			line-name = "usb3-current-limit";</div><div class='add'>+		};</div><div class='add'>+		usb3_power {</div><div class='add'>+			gpio-hog;</div><div class='add'>+			gpios = &lt;6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			output-high;</div><div class='add'>+			line-name = "usb3-power";</div><div class='add'>+		};</div><div class='add'>+		m2_devslp {</div><div class='add'>+			gpio-hog;</div><div class='add'>+			gpios = &lt;11 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			output-low;</div><div class='add'>+			line-name = "m.2 devslp";</div><div class='add'>+		};</div><div class='add'>+		sfp_los {</div><div class='add'>+			/* SFP loss of signal */</div><div class='add'>+			gpio-hog;</div><div class='add'>+			gpios = &lt;12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			input;</div><div class='add'>+			line-name = "sfp-los";</div><div class='add'>+		};</div><div class='add'>+		sfp_tx_fault {</div><div class='add'>+			/* SFP laser fault */</div><div class='add'>+			gpio-hog;</div><div class='add'>+			gpios = &lt;13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			input;</div><div class='add'>+			line-name = "sfp-tx-fault";</div><div class='add'>+		};</div><div class='add'>+		sfp_tx_disable {</div><div class='add'>+			/* SFP transmit disable */</div><div class='add'>+			gpio-hog;</div><div class='add'>+			gpios = &lt;14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			output-low;</div><div class='add'>+			line-name = "sfp-tx-disable";</div><div class='add'>+		};</div><div class='add'>+		sfp_mod_def0 {</div><div class='add'>+			/* SFP module present */</div><div class='add'>+			gpio-hog;</div><div class='add'>+			gpios = &lt;15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			input;</div><div class='add'>+			line-name = "sfp-mod-def0";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* The MCP3021 is 100kHz clock only */</div><div class='add'>+	mikrobus_adc: mcp3021@4c {</div><div class='add'>+		compatible = "microchip,mcp3021";</div><div class='add'>+		reg = &lt;0x4c&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Also something at 0x64 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	/*</div><div class='add'>+	 * Routed to SFP, mikrobus, and PCIe.</div><div class='add'>+	 * SFP limits this to 100kHz, and requires an AT24C01A/02/04 with</div><div class='add'>+	 *  address pins tied low, which takes addresses 0x50 and 0x51.</div><div class='add'>+	 * Mikrobus doesn't specify beyond an I2C bus being present.</div><div class='add'>+	 * PCIe uses ARP to assign addresses, or 0x63-0x64.</div><div class='add'>+	 */</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;clearfog_i2c1_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	clearfog_i2c1_pins: i2c1-pins {</div><div class='add'>+		/* SFP, PCIe, mSATA, mikrobus */</div><div class='add'>+		marvell,pins = "mpp26", "mpp27";</div><div class='add'>+		marvell,function = "i2c1";</div><div class='add'>+	};</div><div class='add'>+	clearfog_sdhci_cd_pins: clearfog-sdhci-cd-pins {</div><div class='add'>+		marvell,pins = "mpp20";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+	mikro_pins: mikro-pins {</div><div class='add'>+		/* int: mpp22 rst: mpp29 */</div><div class='add'>+		marvell,pins = "mpp22", "mpp29";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+	mikro_spi_pins: mikro-spi-pins {</div><div class='add'>+		marvell,pins = "mpp43";</div><div class='add'>+		marvell,function = "spi1";</div><div class='add'>+	};</div><div class='add'>+	mikro_uart_pins: mikro-uart-pins {</div><div class='add'>+		marvell,pins = "mpp24", "mpp25";</div><div class='add'>+		marvell,function = "ua1";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi1 {</div><div class='add'>+	/*</div><div class='add'>+	 * Add SPI CS pins for clearfog:</div><div class='add'>+	 * CS0: W25Q32 (not populated on uSOM)</div><div class='add'>+	 * CS1: PIC microcontroller (Pro models)</div><div class='add'>+	 * CS2: mikrobus</div><div class='add'>+	 */</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi1_pins &amp;mikro_spi_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	/* mikrobus uart */</div><div class='add'>+	pinctrl-0 = &lt;&amp;mikro_uart_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-388-db.dts b/arch/arm/boot/dts/armada-388-db.dts<br/>index de26c762239c..1ac923826445 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-388-db.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-388-db.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-388-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-db.dts</a></div><div class='hunk'>@@ -16,17 +16,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -35,11 +35,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-388-rd.dts b/arch/arm/boot/dts/armada-388-rd.dts<br/>index dd3462ddb6b9..af82f275eac2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-388-rd.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-388-rd.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-388-rd.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-388-rd.dts</a></div><div class='hunk'>@@ -17,17 +17,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -36,11 +36,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi<br/>index 8c9842237b60..9b508a8161f5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi</a></div><div class='hunk'>@@ -17,17 +17,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -36,11 +36,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -62,45 +62,6 @@</div><div class='ctx'> 			  MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		internal-regs {</div><div class='del'>-			ethernet@70000 {</div><div class='del'>-				pinctrl-0 = &lt;&amp;ge0_rgmii_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				phy = &lt;&amp;phy_dedicated&gt;;</div><div class='del'>-				phy-mode = "rgmii-id";</div><div class='del'>-				buffer-manager = &lt;&amp;bm&gt;;</div><div class='del'>-				bm,pool-long = &lt;0&gt;;</div><div class='del'>-				bm,pool-short = &lt;1&gt;;</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			mdio@72004 {</div><div class='del'>-				/*</div><div class='del'>-				 * Add the phy clock here, so the phy can be</div><div class='del'>-				 * accessed to read its IDs prior to binding</div><div class='del'>-				 * with the driver.</div><div class='del'>-				 */</div><div class='del'>-				pinctrl-0 = &lt;&amp;mdio_pins &amp;microsom_phy_clk_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-</div><div class='del'>-				phy_dedicated: ethernet-phy@0 {</div><div class='del'>-					/*</div><div class='del'>-					 * Annoyingly, the marvell phy driver</div><div class='del'>-					 * configures the LED register, rather</div><div class='del'>-					 * than preserving reset-loaded setting.</div><div class='del'>-					 * We undo that rubbish here.</div><div class='del'>-					 */</div><div class='del'>-					marvell,reg-init = &lt;3 16 0 0x101e&gt;;</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pinctrl@18000 {</div><div class='del'>-				microsom_phy_clk_pins: microsom-phy-clk-pins {</div><div class='del'>-					marvell,pins = "mpp45";</div><div class='del'>-					marvell,function = "ref";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			rtc@a3800 {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * If the rtc doesn't work, run "date reset"</div><div class='hunk'>@@ -108,21 +69,78 @@</div><div class='ctx'> 				 */</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-			serial@12000 {</div><div class='del'>-				pinctrl-0 = &lt;&amp;uart0_pins&gt;;</div><div class='del'>-				pinctrl-names = "default";</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='add'>+&amp;bm {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-			bm@c8000 {</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='add'>+&amp;bm_bppi {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		bm-bppi {</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='add'>+&amp;eth0 {</div><div class='add'>+	/* ethernet@70000 */</div><div class='add'>+	pinctrl-0 = &lt;&amp;ge0_rgmii_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	phy = &lt;&amp;phy_dedicated&gt;;</div><div class='add'>+	phy-mode = "rgmii-id";</div><div class='add'>+	buffer-manager = &lt;&amp;bm&gt;;</div><div class='add'>+	bm,pool-long = &lt;0&gt;;</div><div class='add'>+	bm,pool-short = &lt;1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	/*</div><div class='add'>+	 * Add the phy clock here, so the phy can be accessed to read its</div><div class='add'>+	 * IDs prior to binding with the driver.</div><div class='add'>+	 */</div><div class='add'>+	pinctrl-0 = &lt;&amp;mdio_pins &amp;microsom_phy_clk_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	phy_dedicated: ethernet-phy@0 {</div><div class='add'>+		/*</div><div class='add'>+		 * Annoyingly, the marvell phy driver configures the LED</div><div class='add'>+		 * register, rather than preserving reset-loaded setting.</div><div class='add'>+		 * We undo that rubbish here.</div><div class='add'>+		 */</div><div class='add'>+		marvell,reg-init = &lt;3 16 0 0x101e&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	microsom_phy_clk_pins: microsom-phy-clk-pins {</div><div class='add'>+		marvell,pins = "mpp45";</div><div class='add'>+		marvell,function = "ref";</div><div class='add'>+	};</div><div class='add'>+	/* Optional eMMC */</div><div class='add'>+	microsom_sdhci_pins: microsom-sdhci-pins {</div><div class='add'>+		marvell,pins = "mpp21", "mpp28", "mpp37",</div><div class='add'>+			       "mpp38", "mpp39", "mpp40";</div><div class='add'>+		marvell,function = "sd0";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi1 {</div><div class='add'>+	/* The microsom has an optional W25Q32 on board, connected to CS0 */</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi1_pins&gt;;</div><div class='ctx'> </div><div class='add'>+	w25q32: spi-flash@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "w25q32", "jedec,spi-nor";</div><div class='add'>+		reg = &lt;0&gt;; /* Chip select 0 */</div><div class='add'>+		spi-max-frequency = &lt;3000000&gt;;</div><div class='add'>+		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart0_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi<br/>index 2d7668848c5a..79b767507eab 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-38x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-38x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-38x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-38x.dtsi</a></div><div class='hunk'>@@ -17,17 +17,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -36,11 +36,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -661,7 +661,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	clocks {</div><div class='del'>-		/* 2 GHz fixed main PLL */</div><div class='add'>+		/* 1 GHz fixed main PLL */</div><div class='ctx'> 		mainpll: mainpll {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-390-db.dts b/arch/arm/boot/dts/armada-390-db.dts<br/>index 34e279d973c8..2afed2ce4741 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-390-db.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-390-db.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-390-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-390-db.dts</a></div><div class='hunk'>@@ -16,17 +16,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -35,11 +35,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-390.dtsi b/arch/arm/boot/dts/armada-390.dtsi<br/>index 6cd18d8aaac7..0d8a54ad007c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-390.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-390.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-390.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-390.dtsi</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-395.dtsi b/arch/arm/boot/dts/armada-395.dtsi<br/>index ab5dc49f2bff..bf7e4335e36a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-395.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-395.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-395.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-395.dtsi</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-398-db.dts b/arch/arm/boot/dts/armada-398-db.dts<br/>index 268c8349c884..e8604281c3c9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-398-db.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-398-db.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-398-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-398-db.dts</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-398.dtsi b/arch/arm/boot/dts/armada-398.dtsi<br/>index 234a99891a29..1f4e113fc821 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-398.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-398.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-398.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-398.dtsi</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi<br/>index 34cba87f9200..60fbfd5907c7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-39x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-39x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-39x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-39x.dtsi</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -573,7 +573,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	clocks {</div><div class='del'>-		/* 2 GHz fixed main PLL */</div><div class='add'>+		/* 1 GHz fixed main PLL */</div><div class='ctx'> 		mainpll: mainpll {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi<br/>new file mode 100644<br/>index 000000000000..f6a03dcee5ef<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-98dx3236.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-98dx3236.dtsi</a></div><div class='hunk'>@@ -0,0 +1,254 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Include file for Marvell 98dx3236 family SoC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Allied Telesis Labs</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Contains definitions specific to the 98dx3236 SoC that are not</div><div class='add'>+ * common to all Armada XP SoCs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "armada-xp.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Marvell 98DX3236 SoC";</div><div class='add'>+	compatible = "marvell,armadaxp-98dx3236", "marvell,armadaxp", "marvell,armada-370-xp";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		gpio0 = &amp;gpio0;</div><div class='add'>+		gpio1 = &amp;gpio1;</div><div class='add'>+		gpio2 = &amp;gpio2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		enable-method = "marvell,98dx3236-smp";</div><div class='add'>+</div><div class='add'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "marvell,sheeva-v7";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpuclk 0&gt;;</div><div class='add'>+			clock-latency = &lt;1000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		ranges = &lt;MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000</div><div class='add'>+			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000</div><div class='add'>+			  MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000</div><div class='add'>+			  MBUS_ID(0x03, 0x00) 0 0 0xa8000000 0x4000000</div><div class='add'>+			  MBUS_ID(0x08, 0x00) 0 0 0xac000000 0x100000&gt;;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * 98DX3236 has 1 x1 PCIe unit Gen2.0</div><div class='add'>+		 */</div><div class='add'>+		pciec: pcie-controller@82000000 {</div><div class='add'>+			compatible = "marvell,armada-xp-pcie";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			device_type = "pci";</div><div class='add'>+</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			msi-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			bus-range = &lt;0x00 0xff&gt;;</div><div class='add'>+</div><div class='add'>+			ranges =</div><div class='add'>+			       &lt;0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000   /* Port 0.0 registers */</div><div class='add'>+				0x82000000 0x1 0       MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */</div><div class='add'>+				0x81000000 0x1 0       MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO  */</div><div class='add'>+				0x82000000 0x2 0       MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 0.1 MEM */&gt;;</div><div class='add'>+</div><div class='add'>+			pcie1: pcie@1,0 {</div><div class='add'>+				device_type = "pci";</div><div class='add'>+				assigned-addresses = &lt;0x82000800 0 0x40000 0 0x2000&gt;;</div><div class='add'>+				reg = &lt;0x0800 0 0 0 0&gt;;</div><div class='add'>+				#address-cells = &lt;3&gt;;</div><div class='add'>+				#size-cells = &lt;2&gt;;</div><div class='add'>+				#interrupt-cells = &lt;1&gt;;</div><div class='add'>+				ranges = &lt;0x82000000 0 0 0x82000000 0x1 0 1 0</div><div class='add'>+					  0x81000000 0 0 0x81000000 0x1 0 1 0&gt;;</div><div class='add'>+				interrupt-map-mask = &lt;0 0 0 0&gt;;</div><div class='add'>+				interrupt-map = &lt;0 0 0 0 &amp;mpic 58&gt;;</div><div class='add'>+				marvell,pcie-port = &lt;0&gt;;</div><div class='add'>+				marvell,pcie-lane = &lt;0&gt;;</div><div class='add'>+				clocks = &lt;&amp;gateclk 5&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		internal-regs {</div><div class='add'>+			coreclk: mvebu-sar@18230 {</div><div class='add'>+				compatible = "marvell,mv98dx3236-core-clock";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cpuclk: clock-complex@18700 {</div><div class='add'>+				compatible = "marvell,mv98dx3236-cpu-clock";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			corediv-clock@18740 {</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			xor@60900 {</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			crypto@90000 {</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			xor@f0900 {</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			xor@f0800 {</div><div class='add'>+				compatible = "marvell,orion-xor";</div><div class='add'>+				reg = &lt;0xf0800 0x100</div><div class='add'>+				       0xf0a00 0x100&gt;;</div><div class='add'>+				clocks = &lt;&amp;gateclk 22&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+</div><div class='add'>+				xor10 {</div><div class='add'>+					interrupts = &lt;51&gt;;</div><div class='add'>+					dmacap,memcpy;</div><div class='add'>+					dmacap,xor;</div><div class='add'>+				};</div><div class='add'>+				xor11 {</div><div class='add'>+					interrupts = &lt;52&gt;;</div><div class='add'>+					dmacap,memcpy;</div><div class='add'>+					dmacap,xor;</div><div class='add'>+					dmacap,memset;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpio0: gpio@18100 {</div><div class='add'>+				compatible = "marvell,orion-gpio";</div><div class='add'>+				reg = &lt;0x18100 0x40&gt;;</div><div class='add'>+				ngpios = &lt;32&gt;;</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				interrupts = &lt;82&gt;, &lt;83&gt;, &lt;84&gt;, &lt;85&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* does not exist */</div><div class='add'>+			gpio1: gpio@18140 {</div><div class='add'>+				compatible = "marvell,orion-gpio";</div><div class='add'>+				reg = &lt;0x18140 0x40&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpio2: gpio@18180 { /* rework some properties */</div><div class='add'>+				compatible = "marvell,orion-gpio";</div><div class='add'>+				reg = &lt;0x18180 0x40&gt;;</div><div class='add'>+				ngpios = &lt;1&gt;; /* only gpio #32 */</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				interrupts = &lt;87&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			nand: nand@d0000 {</div><div class='add'>+				clocks = &lt;&amp;dfx_coredivclk 0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dfxr: dfx-registers@ac000000 {</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges = &lt;0 MBUS_ID(0x08, 0x00) 0 0x100000&gt;;</div><div class='add'>+</div><div class='add'>+			dfx_coredivclk: corediv-clock@f8268 {</div><div class='add'>+				compatible = "marvell,mv98dx3236-corediv-clock";</div><div class='add'>+				reg = &lt;0xf8268 0xc&gt;;</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+				clocks = &lt;&amp;mainpll&gt;;</div><div class='add'>+				clock-output-names = "nand";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			dfx: dfx@0 {</div><div class='add'>+				compatible = "marvell,dfx-server";</div><div class='add'>+				reg = &lt;0 0x100000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		switch: switch@a8000000 {</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges = &lt;0 MBUS_ID(0x03, 0x00) 0 0x100000&gt;;</div><div class='add'>+</div><div class='add'>+			pp0: packet-processor@0 {</div><div class='add'>+				compatible = "marvell,prestera-98dx3236";</div><div class='add'>+				reg = &lt;0 0x4000000&gt;;</div><div class='add'>+				interrupts = &lt;33&gt;, &lt;34&gt;, &lt;35&gt;;</div><div class='add'>+				dfx = &lt;&amp;dfx&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	compatible = "marvell,98dx3236-pinctrl";</div><div class='add'>+</div><div class='add'>+	spi0_pins: spi0-pins {</div><div class='add'>+		marvell,pins = "mpp0", "mpp1",</div><div class='add'>+			       "mpp2", "mpp3";</div><div class='add'>+		marvell,function = "spi0";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdio {</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;crypto_sram0 {</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;crypto_sram1 {</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-98dx3336.dtsi b/arch/arm/boot/dts/armada-xp-98dx3336.dtsi<br/>new file mode 100644<br/>index 000000000000..e1580afdc260<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-98dx3336.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-98dx3336.dtsi</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Include file for Marvell 98dx3336 family SoC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Allied Telesis Labs</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Contains definitions specific to the 98dx3236 SoC that are not</div><div class='add'>+ * common to all Armada XP SoCs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "armada-xp-98dx3236.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Marvell 98DX3336 SoC";</div><div class='add'>+	compatible = "marvell,armadaxp-98dx3336", "marvell,armadaxp-98dx3236", "marvell,armadaxp", "marvell,armada-370-xp";</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		cpu@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "marvell,sheeva-v7";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpuclk 1&gt;;</div><div class='add'>+			clock-latency = &lt;1000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		internal-regs {</div><div class='add'>+			resume@20980 {</div><div class='add'>+				compatible = "marvell,98dx3336-resume-ctrl";</div><div class='add'>+				reg = &lt;0x20980 0x10&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pp0 {</div><div class='add'>+	compatible = "marvell,prestera-98dx3336";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-98dx4251.dtsi b/arch/arm/boot/dts/armada-xp-98dx4251.dtsi<br/>new file mode 100644<br/>index 000000000000..b9d9b269efb4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-98dx4251.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-98dx4251.dtsi</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Include file for Marvell 98dx4521 family SoC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Allied Telesis Labs</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Contains definitions specific to the 98dx4521 SoC that are not</div><div class='add'>+ * common to all Armada XP SoCs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "armada-xp-98dx3236.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Marvell 98DX4251 SoC";</div><div class='add'>+	compatible = "marvell,armadaxp-98dx4251", "marvell,armadaxp-98dx3236", "marvell,armadaxp", "marvell,armada-370-xp";</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		cpu@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "marvell,sheeva-v7";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpuclk 1&gt;;</div><div class='add'>+			clock-latency = &lt;1000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		internal-regs {</div><div class='add'>+			resume@20980 {</div><div class='add'>+				compatible = "marvell,98dx3336-resume-ctrl";</div><div class='add'>+				reg = &lt;0x20980 0x10&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdio {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	compatible = "marvell,98dx4251-pinctrl";</div><div class='add'>+</div><div class='add'>+	sdio_pins: sdio-pins {</div><div class='add'>+		marvell,pins = "mpp5", "mpp6", "mpp7",</div><div class='add'>+			       "mpp8", "mpp9", "mpp10";</div><div class='add'>+		marvell,function = "sd0";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pp0 {</div><div class='add'>+	compatible = "marvell,prestera-98dx4251";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts<br/>index ce152719bc28..d0c6a01f48a6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-axpwifiap.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-axpwifiap.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-axpwifiap.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-axpwifiap.dts</a></div><div class='hunk'>@@ -20,17 +20,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -39,11 +39,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -62,7 +62,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x00000000 0x00000000 0x40000000&gt;; /* 1GB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -73,28 +73,6 @@</div><div class='ctx'> 			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000</div><div class='ctx'> 			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/* First mini-PCIe port */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* Second mini-PCIe port */</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 0, Lane 1 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* Renesas uPD720202 USB 3.0 controller */</div><div class='del'>-			pcie@3,0 {</div><div class='del'>-				/* Port 0, Lane 3 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> 			/* UART0 */</div><div class='ctx'> 			serial@12000 {</div><div class='hunk'>@@ -111,16 +89,6 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;ge0_rgmii_pins&gt;;</div><div class='ctx'> 				pinctrl-names = "default";</div><div class='hunk'>@@ -145,7 +113,7 @@</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;keys_pin&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> </div><div class='del'>-		button@1 {</div><div class='add'>+		reset {</div><div class='ctx'> 			label = "Factory Reset Button";</div><div class='ctx'> 			linux,code = &lt;KEY_SETUP&gt;;</div><div class='ctx'> 			gpios = &lt;&amp;gpio1 1 GPIO_ACTIVE_LOW&gt;;</div><div class='hunk'>@@ -153,6 +121,38 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;mdio {</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* First mini-PCIe port */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Second mini-PCIe port */</div><div class='add'>+	pcie@2,0 {</div><div class='add'>+		/* Port 0, Lane 1 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Renesas uPD720202 USB 3.0 controller */</div><div class='add'>+	pcie@3,0 {</div><div class='add'>+		/* Port 0, Lane 3 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;phy_int_pin&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-db-dxbc2.dts b/arch/arm/boot/dts/armada-xp-db-dxbc2.dts<br/>new file mode 100644<br/>index 000000000000..a8130805074e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-db-dxbc2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-db-dxbc2.dts</a></div><div class='hunk'>@@ -0,0 +1,151 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree file for DB-DXBC2 board</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Allied Telesis Labs</div><div class='add'>+ *</div><div class='add'>+ * Based on armada-xp-db.dts</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Note: this Device Tree assumes that the bootloader has remapped the</div><div class='add'>+ * internal registers to 0xf1000000 (instead of the default</div><div class='add'>+ * 0xd0000000). The 0xf1000000 is the default used by the recent,</div><div class='add'>+ * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier</div><div class='add'>+ * boards were delivered with an older version of the bootloader that</div><div class='add'>+ * left internal registers mapped at 0xd0000000. If you are in this</div><div class='add'>+ * situation, you should either update your bootloader (preferred</div><div class='add'>+ * solution) or the below Device Tree should be adjusted.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "armada-xp-98dx4251.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Marvell Bobcat2 Evaluation Board";</div><div class='add'>+	compatible = "marvell,db-dxbc2", "marvell,armadaxp-98dx4251", "marvell,armadaxp", "marvell,armada-370-xp";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=ttyS0,115200 earlyprintk";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0 0x00000000 0 0x20000000&gt;; /* 512 MB */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;devbus_bootcs {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* Device Bus parameters are required */</div><div class='add'>+</div><div class='add'>+	/* Read parameters */</div><div class='add'>+	devbus,bus-width    = &lt;16&gt;;</div><div class='add'>+	devbus,turn-off-ps  = &lt;60000&gt;;</div><div class='add'>+	devbus,badr-skew-ps = &lt;0&gt;;</div><div class='add'>+	devbus,acc-first-ps = &lt;124000&gt;;</div><div class='add'>+	devbus,acc-next-ps  = &lt;248000&gt;;</div><div class='add'>+	devbus,rd-setup-ps  = &lt;0&gt;;</div><div class='add'>+	devbus,rd-hold-ps   = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	/* Write parameters */</div><div class='add'>+	devbus,sync-enable = &lt;0&gt;;</div><div class='add'>+	devbus,wr-high-ps  = &lt;60000&gt;;</div><div class='add'>+	devbus,wr-low-ps   = &lt;60000&gt;;</div><div class='add'>+	devbus,ale-wr-ps   = &lt;60000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;nand {</div><div class='add'>+	status = "okay";</div><div class='add'>+	num-cs = &lt;1&gt;;</div><div class='add'>+	marvell,nand-keep-config;</div><div class='add'>+	marvell,nand-enable-arbiter;</div><div class='add'>+	nand-on-flash-bbt;</div><div class='add'>+	nand-ecc-strength = &lt;4&gt;;</div><div class='add'>+	nand-ecc-step-size = &lt;512&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdio {</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+	/* No CD or WP GPIOs */</div><div class='add'>+	broken-cd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	spi-flash@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p64";</div><div class='add'>+		reg = &lt;0&gt;; /* Chip select 0 */</div><div class='add'>+		spi-max-frequency = &lt;20000000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+</div><div class='add'>+		partition@u-boot {</div><div class='add'>+			reg = &lt;0x00000000 0x00100000&gt;;</div><div class='add'>+			label = "u-boot";</div><div class='add'>+		};</div><div class='add'>+		partition@u-boot-env {</div><div class='add'>+			reg = &lt;0x00100000 0x00040000&gt;;</div><div class='add'>+			label = "u-boot-env";</div><div class='add'>+		};</div><div class='add'>+		partition@unused {</div><div class='add'>+			reg = &lt;0x00140000 0x00ec0000&gt;;</div><div class='add'>+			label = "unused";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts<br/>new file mode 100644<br/>index 000000000000..4e07cb6ed800<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts</a></div><div class='hunk'>@@ -0,0 +1,142 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree file for DB-XC3-24G4XG board</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Allied Telesis Labs</div><div class='add'>+ *</div><div class='add'>+ * Based on armada-xp-db.dts</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Note: this Device Tree assumes that the bootloader has remapped the</div><div class='add'>+ * internal registers to 0xf1000000 (instead of the default</div><div class='add'>+ * 0xd0000000). The 0xf1000000 is the default used by the recent,</div><div class='add'>+ * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier</div><div class='add'>+ * boards were delivered with an older version of the bootloader that</div><div class='add'>+ * left internal registers mapped at 0xd0000000. If you are in this</div><div class='add'>+ * situation, you should either update your bootloader (preferred</div><div class='add'>+ * solution) or the below Device Tree should be adjusted.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "armada-xp-98dx3336.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "DB-XC3-24G4XG";</div><div class='add'>+	compatible = "marvell,db-xc3-24g4xg", "marvell,armadaxp-98dx3336", "marvell,armadaxp", "marvell,armada-370-xp";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=ttyS0,115200 earlyprintk";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0 0x00000000 0 0x40000000&gt;; /* 1 GB */</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;devbus_bootcs {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* Device Bus parameters are required */</div><div class='add'>+</div><div class='add'>+	/* Read parameters */</div><div class='add'>+	devbus,bus-width    = &lt;16&gt;;</div><div class='add'>+	devbus,turn-off-ps  = &lt;60000&gt;;</div><div class='add'>+	devbus,badr-skew-ps = &lt;0&gt;;</div><div class='add'>+	devbus,acc-first-ps = &lt;124000&gt;;</div><div class='add'>+	devbus,acc-next-ps  = &lt;248000&gt;;</div><div class='add'>+	devbus,rd-setup-ps  = &lt;0&gt;;</div><div class='add'>+	devbus,rd-hold-ps   = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	/* Write parameters */</div><div class='add'>+	devbus,sync-enable = &lt;0&gt;;</div><div class='add'>+	devbus,wr-high-ps  = &lt;60000&gt;;</div><div class='add'>+	devbus,wr-low-ps   = &lt;60000&gt;;</div><div class='add'>+	devbus,ale-wr-ps   = &lt;60000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;nand {</div><div class='add'>+	status = "okay";</div><div class='add'>+	num-cs = &lt;1&gt;;</div><div class='add'>+	marvell,nand-keep-config;</div><div class='add'>+	marvell,nand-enable-arbiter;</div><div class='add'>+	nand-on-flash-bbt;</div><div class='add'>+	nand-ecc-strength = &lt;4&gt;;</div><div class='add'>+	nand-ecc-step-size = &lt;512&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	spi-flash@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p64";</div><div class='add'>+		reg = &lt;0&gt;; /* Chip select 0 */</div><div class='add'>+		spi-max-frequency = &lt;20000000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+</div><div class='add'>+		partition@u-boot {</div><div class='add'>+			reg = &lt;0x00000000 0x00100000&gt;;</div><div class='add'>+			label = "u-boot";</div><div class='add'>+		};</div><div class='add'>+		partition@u-boot-env {</div><div class='add'>+			reg = &lt;0x00100000 0x00040000&gt;;</div><div class='add'>+			label = "u-boot-env";</div><div class='add'>+		};</div><div class='add'>+		partition@unused {</div><div class='add'>+			reg = &lt;0x00140000 0x00ec0000&gt;;</div><div class='add'>+			label = "unused";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts<br/>index 075120bc3ec4..a33974254d8c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-db.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-db.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-db.dts</a></div><div class='hunk'>@@ -18,17 +18,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -37,11 +37,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -67,7 +67,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0 0x00000000 0 0x80000000&gt;; /* 2 GB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -108,39 +108,6 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * All 6 slots are physically present as</div><div class='del'>-			 * standard PCIe slots on the board.</div><div class='del'>-			 */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 0, Lane 1 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-			pcie@3,0 {</div><div class='del'>-				/* Port 0, Lane 2 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-			pcie@4,0 {</div><div class='del'>-				/* Port 0, Lane 3 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-			pcie@9,0 {</div><div class='del'>-				/* Port 2, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-			pcie@10,0 {</div><div class='del'>-				/* Port 3, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> 			serial@12000 {</div><div class='ctx'> 				status = "okay";</div><div class='hunk'>@@ -160,24 +127,6 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy2: ethernet-phy@2 {</div><div class='del'>-					reg = &lt;25&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy3: ethernet-phy@3 {</div><div class='del'>-					reg = &lt;27&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 				phy = &lt;&amp;phy0&gt;;</div><div class='hunk'>@@ -266,6 +215,57 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All 6 slots are physically present as</div><div class='add'>+	 * standard PCIe slots on the board.</div><div class='add'>+	 */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+	pcie@2,0 {</div><div class='add'>+		/* Port 0, Lane 1 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+	pcie@3,0 {</div><div class='add'>+		/* Port 0, Lane 2 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+	pcie@4,0 {</div><div class='add'>+		/* Port 0, Lane 3 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+	pcie@9,0 {</div><div class='add'>+		/* Port 2, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+	pcie@10,0 {</div><div class='add'>+		/* Port 3, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy2: ethernet-phy@2 {</div><div class='add'>+		reg = &lt;25&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy3: ethernet-phy@3 {</div><div class='add'>+		reg = &lt;27&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;spi0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts<br/>index 190e4eccb180..d62bf7bea1df 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-gp.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-gp.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-gp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-gp.dts</a></div><div class='hunk'>@@ -18,17 +18,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -37,11 +37,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -68,7 +68,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		/*</div><div class='ctx'>                  * 8 GB of plug-in RAM modules by default.The amount</div><div class='hunk'>@@ -127,27 +127,6 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * The 3 slots are physically present as</div><div class='del'>-			 * standard PCIe slots on the board.</div><div class='del'>-			 */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-			pcie@9,0 {</div><div class='del'>-				/* Port 2, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-			pcie@10,0 {</div><div class='del'>-				/* Port 3, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> 			serial@12000 {</div><div class='ctx'> 				status = "okay";</div><div class='hunk'>@@ -175,24 +154,6 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					reg = &lt;16&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					reg = &lt;17&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy2: ethernet-phy@2 {</div><div class='del'>-					reg = &lt;18&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy3: ethernet-phy@3 {</div><div class='del'>-					reg = &lt;19&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 				phy = &lt;&amp;phy0&gt;;</div><div class='hunk'>@@ -251,6 +212,45 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The 3 slots are physically present as</div><div class='add'>+	 * standard PCIe slots on the board.</div><div class='add'>+	 */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+	pcie@9,0 {</div><div class='add'>+		/* Port 2, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+	pcie@10,0 {</div><div class='add'>+		/* Port 3, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;16&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;17&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy2: ethernet-phy@2 {</div><div class='add'>+		reg = &lt;18&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy3: ethernet-phy@3 {</div><div class='add'>+		reg = &lt;19&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;spi0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts<br/>index 8af463f26ea1..ce0afba1ce58 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -57,7 +57,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0 0x00000000 0 0x20000000&gt;; /* 512MB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -68,37 +68,11 @@</div><div class='ctx'> 			MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000</div><div class='ctx'> 			MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/* Quad port sata: Marvell 88SX7042 */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* USB 3.0 xHCI controller: NEC D720200F1 */</div><div class='del'>-			pcie@5,0 {</div><div class='del'>-				/* Port 1, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> 			serial@12000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				phy0: ethernet-phy@0 { /* Marvell 88E1318 */</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy1: ethernet-phy@1 { /* Marvell 88E1318 */</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;ge0_rgmii_pins&gt;;</div><div class='ctx'> 				pinctrl-names = "default";</div><div class='hunk'>@@ -295,6 +269,31 @@</div><div class='ctx'> 		gpios = &lt;&amp;gpio0 24 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* Quad port sata: Marvell 88SX7042 */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* USB 3.0 xHCI controller: NEC D720200F1 */</div><div class='add'>+	pcie@5,0 {</div><div class='add'>+		/* Port 1, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	phy0: ethernet-phy@0 { /* Marvell 88E1318 */</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 { /* Marvell 88E1318 */</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	poweroff_pin: poweroff-pin {</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts<br/>index 076f27f22c3b..42ea8764814c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-linksys-mamba.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-linksys-mamba.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-linksys-mamba.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-linksys-mamba.dts</a></div><div class='hunk'>@@ -62,7 +62,7 @@</div><div class='ctx'> 		stdout-path = &amp;uart0;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x00000000 0x00000000 0x10000000&gt;; /* 256MB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -73,28 +73,6 @@</div><div class='ctx'> 			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000</div><div class='ctx'> 			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/* Etron EJ168 USB 3.0 controller */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* First mini-PCIe port */</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 0, Lane 1 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* Second mini-PCIe port */</div><div class='del'>-			pcie@3,0 {</div><div class='del'>-				/* Port 0, Lane 3 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> </div><div class='ctx'> 			rtc@10300 {</div><div class='hunk'>@@ -289,13 +267,13 @@</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;keys_pin&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> </div><div class='del'>-		button@1 {</div><div class='add'>+		wps {</div><div class='ctx'> 			label = "WPS";</div><div class='ctx'> 			linux,code = &lt;KEY_WPS_BUTTON&gt;;</div><div class='ctx'> 			gpios = &lt;&amp;gpio1 0 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		button@2 {</div><div class='add'>+		reset {</div><div class='ctx'> 			label = "Factory Reset Button";</div><div class='ctx'> 			linux,code = &lt;KEY_RESTART&gt;;</div><div class='ctx'> 			gpios = &lt;&amp;gpio1 1 GPIO_ACTIVE_LOW&gt;;</div><div class='hunk'>@@ -323,7 +301,9 @@</div><div class='ctx'> 				      4500 1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	dsa@0 {</div><div class='add'>+	dsa {</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='ctx'> 		compatible = "marvell,dsa";</div><div class='ctx'> 		#address-cells = &lt;2&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -369,6 +349,28 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* Etron EJ168 USB 3.0 controller */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* First mini-PCIe port */</div><div class='add'>+	pcie@2,0 {</div><div class='add'>+		/* Port 0, Lane 1 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Second mini-PCIe port */</div><div class='add'>+	pcie@3,0 {</div><div class='add'>+		/* Port 0, Lane 3 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> </div><div class='ctx'> 	keys_pin: keys-pin {</div><div class='hunk'>@@ -398,3 +400,54 @@</div><div class='ctx'> 		spi-max-frequency = &lt;40000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	switch@0 {</div><div class='add'>+		compatible = "marvell,mv88e6085";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				label = "lan4";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				label = "lan3";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@2 {</div><div class='add'>+				reg = &lt;2&gt;;</div><div class='add'>+				label = "lan2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@3 {</div><div class='add'>+				reg = &lt;3&gt;;</div><div class='add'>+				label = "lan1";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@4 {</div><div class='add'>+				reg = &lt;4&gt;;</div><div class='add'>+				label = "internet";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@5 {</div><div class='add'>+				reg = &lt;5&gt;;</div><div class='add'>+				label = "cpu";</div><div class='add'>+				ethernet = &lt;&amp;eth0&gt;;</div><div class='add'>+				fixed-link {</div><div class='add'>+					speed = &lt;1000&gt;;</div><div class='add'>+					full-duplex;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts<br/>index 6522b04f4a8e..977f6b3fc1f8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-matrix.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-matrix.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-matrix.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-matrix.dts</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This board has 4 GB of RAM, but the last 256 MB of</div><div class='hunk'>@@ -99,18 +99,18 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie-controller {</div><div class='del'>-				status = "okay";</div><div class='del'>-</div><div class='del'>-				pcie@1,0 {</div><div class='del'>-					/* Port 0, Lane 0 */</div><div class='del'>-					status = "okay";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			usb@50000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi<br/>index 6e6d0f04bf2b..07c5090ecd29 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-mv78230.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-mv78230.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-mv78230.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-mv78230.dtsi</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -86,7 +86,7 @@</div><div class='ctx'> 		 * configured as x4 or quad x1 lanes. One unit is</div><div class='ctx'> 		 * x1 only.</div><div class='ctx'> 		 */</div><div class='del'>-		pcie-controller {</div><div class='add'>+		pciec: pcie-controller@82000000 {</div><div class='ctx'> 			compatible = "marvell,armada-xp-pcie";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			device_type = "pci";</div><div class='hunk'>@@ -114,7 +114,7 @@</div><div class='ctx'> 				0x82000000 0x5 0       MBUS_ID(0x08, 0xe8) 0 1 0 /* Port 1.0 MEM */</div><div class='ctx'> 				0x81000000 0x5 0       MBUS_ID(0x08, 0xe0) 0 1 0 /* Port 1.0 IO  */&gt;;</div><div class='ctx'> </div><div class='del'>-			pcie@1,0 {</div><div class='add'>+			pcie1: pcie@1,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x40000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x0800 0 0 0 0&gt;;</div><div class='hunk'>@@ -131,7 +131,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@2,0 {</div><div class='add'>+			pcie2: pcie@2,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x44000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x1000 0 0 0 0&gt;;</div><div class='hunk'>@@ -148,7 +148,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@3,0 {</div><div class='add'>+			pcie3: pcie@3,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x48000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x1800 0 0 0 0&gt;;</div><div class='hunk'>@@ -165,7 +165,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@4,0 {</div><div class='add'>+			pcie4: pcie@4,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x4c000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x2000 0 0 0 0&gt;;</div><div class='hunk'>@@ -182,7 +182,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@5,0 {</div><div class='add'>+			pcie5: pcie@5,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x80000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x2800 0 0 0 0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi<br/>index c5fdc99f0dbe..64e936ae7b22 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-mv78260.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-mv78260.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-mv78260.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-mv78260.dtsi</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -87,7 +87,7 @@</div><div class='ctx'> 		 * configured as x4 or quad x1 lanes. One unit is</div><div class='ctx'> 		 * x4 only.</div><div class='ctx'> 		 */</div><div class='del'>-		pcie-controller {</div><div class='add'>+		pciec: pcie-controller@82000000 {</div><div class='ctx'> 			compatible = "marvell,armada-xp-pcie";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			device_type = "pci";</div><div class='hunk'>@@ -129,7 +129,7 @@</div><div class='ctx'> 				0x82000000 0x9 0     MBUS_ID(0x04, 0xf8) 0 1 0 /* Port 2.0 MEM */</div><div class='ctx'> 				0x81000000 0x9 0     MBUS_ID(0x04, 0xf0) 0 1 0 /* Port 2.0 IO  */&gt;;</div><div class='ctx'> </div><div class='del'>-			pcie@1,0 {</div><div class='add'>+			pcie1: pcie@1,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x40000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x0800 0 0 0 0&gt;;</div><div class='hunk'>@@ -146,7 +146,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@2,0 {</div><div class='add'>+			pcie2: pcie@2,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x44000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x1000 0 0 0 0&gt;;</div><div class='hunk'>@@ -163,7 +163,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@3,0 {</div><div class='add'>+			pcie3: pcie@3,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x48000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x1800 0 0 0 0&gt;;</div><div class='hunk'>@@ -180,7 +180,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@4,0 {</div><div class='add'>+			pcie4: pcie@4,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x4c000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x2000 0 0 0 0&gt;;</div><div class='hunk'>@@ -197,7 +197,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@5,0 {</div><div class='add'>+			pcie5: pcie@5,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x80000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x2800 0 0 0 0&gt;;</div><div class='hunk'>@@ -214,7 +214,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@6,0 {</div><div class='add'>+			pcie6: pcie@6,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x84000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x3000 0 0 0 0&gt;;</div><div class='hunk'>@@ -231,7 +231,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@7,0 {</div><div class='add'>+			pcie7: pcie@7,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x88000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x3800 0 0 0 0&gt;;</div><div class='hunk'>@@ -248,7 +248,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@8,0 {</div><div class='add'>+			pcie8: pcie@8,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x8c000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x4000 0 0 0 0&gt;;</div><div class='hunk'>@@ -265,7 +265,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@9,0 {</div><div class='add'>+			pcie9: pcie@9,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x42000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x4800 0 0 0 0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi<br/>index 0e24f1a38540..d1383dde43eb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-mv78460.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-mv78460.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-mv78460.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-mv78460.dtsi</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -104,7 +104,7 @@</div><div class='ctx'> 		 * configured as x4 or quad x1 lanes. Two units are</div><div class='ctx'> 		 * x4/x1.</div><div class='ctx'> 		 */</div><div class='del'>-		pcie-controller {</div><div class='add'>+		pciec: pcie-controller@82000000 {</div><div class='ctx'> 			compatible = "marvell,armada-xp-pcie";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			device_type = "pci";</div><div class='hunk'>@@ -150,7 +150,7 @@</div><div class='ctx'> 				0x82000000 0xa 0     MBUS_ID(0x08, 0xf8) 0 1 0 /* Port 3.0 MEM */</div><div class='ctx'> 				0x81000000 0xa 0     MBUS_ID(0x08, 0xf0) 0 1 0 /* Port 3.0 IO  */&gt;;</div><div class='ctx'> </div><div class='del'>-			pcie@1,0 {</div><div class='add'>+			pcie1: pcie@1,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82000800 0 0x40000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x0800 0 0 0 0&gt;;</div><div class='hunk'>@@ -167,7 +167,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@2,0 {</div><div class='add'>+			pcie2: pcie@2,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82001000 0 0x44000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x1000 0 0 0 0&gt;;</div><div class='hunk'>@@ -184,7 +184,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@3,0 {</div><div class='add'>+			pcie3: pcie@3,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82001800 0 0x48000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x1800 0 0 0 0&gt;;</div><div class='hunk'>@@ -201,7 +201,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@4,0 {</div><div class='add'>+			pcie4: pcie@4,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82002000 0 0x4c000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x2000 0 0 0 0&gt;;</div><div class='hunk'>@@ -218,7 +218,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@5,0 {</div><div class='add'>+			pcie5: pcie@5,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82002800 0 0x80000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x2800 0 0 0 0&gt;;</div><div class='hunk'>@@ -235,7 +235,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@6,0 {</div><div class='add'>+			pcie6: pcie@6,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82003000 0 0x84000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x3000 0 0 0 0&gt;;</div><div class='hunk'>@@ -252,7 +252,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@7,0 {</div><div class='add'>+			pcie7: pcie@7,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82003800 0 0x88000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x3800 0 0 0 0&gt;;</div><div class='hunk'>@@ -269,7 +269,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@8,0 {</div><div class='add'>+			pcie8: pcie@8,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82004000 0 0x8c000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x4000 0 0 0 0&gt;;</div><div class='hunk'>@@ -286,7 +286,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@9,0 {</div><div class='add'>+			pcie9: pcie@9,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82004800 0 0x42000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x4800 0 0 0 0&gt;;</div><div class='hunk'>@@ -303,7 +303,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			pcie@10,0 {</div><div class='add'>+			pcie10: pcie@10,0 {</div><div class='ctx'> 				device_type = "pci";</div><div class='ctx'> 				assigned-addresses = &lt;0x82005000 0 0x82000 0 0x2000&gt;;</div><div class='ctx'> 				reg = &lt;0x5000 0 0 0 0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts<br/>index d19f44c70925..40c6fe21e720 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-netgear-rn2120.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-netgear-rn2120.dts</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -56,7 +56,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0 0x00000000 0 0x80000000&gt;; /* 2GB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -67,28 +67,6 @@</div><div class='ctx'> 			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000</div><div class='ctx'> 			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/* Connected to first Marvell 88SE9170 SATA controller */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* Connected to second Marvell 88SE9170 SATA controller */</div><div class='del'>-			pcie@2,0 {</div><div class='del'>-				/* Port 0, Lane 1 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/* Connected to Fresco Logic FL1009 USB 3.0 controller */</div><div class='del'>-			pcie@5,0 {</div><div class='del'>-				/* Port 1, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> </div><div class='ctx'> 			/* RTC is provided by Intersil ISL12057 I2C RTC chip */</div><div class='hunk'>@@ -97,7 +75,6 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c@11000 {</div><div class='del'>-				compatible = "marvell,mv64xxx-i2c";</div><div class='ctx'> 				clock-frequency = &lt;400000&gt;;</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> </div><div class='hunk'>@@ -154,23 +131,19 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				phy0: ethernet-phy@0 { /* Marvell 88E1318 */</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy1: ethernet-phy@1 { /* Marvell 88E1318 */</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='add'>+				pinctrl-0 = &lt;&amp;ge0_rgmii_pins&gt;;</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 				phy = &lt;&amp;phy0&gt;;</div><div class='ctx'> 				phy-mode = "rgmii-id";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ethernet@74000 {</div><div class='add'>+				pinctrl-0 = &lt;&amp;ge1_rgmii_pins&gt;;</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 				phy = &lt;&amp;phy1&gt;;</div><div class='ctx'> 				phy-mode = "rgmii-id";</div><div class='hunk'>@@ -295,6 +268,39 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* Connected to first Marvell 88SE9170 SATA controller */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Connected to second Marvell 88SE9170 SATA controller */</div><div class='add'>+	pcie@2,0 {</div><div class='add'>+		/* Port 0, Lane 1 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Connected to Fresco Logic FL1009 USB 3.0 controller */</div><div class='add'>+	pcie@5,0 {</div><div class='add'>+		/* Port 1, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	phy0: ethernet-phy@0 { /* Marvell 88E1318 */</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 { /* Marvell 88E1318 */</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	poweroff: poweroff {</div><div class='ctx'> 		marvell,pins = "mpp42";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts<br/>index ed3b889d16ce..66b78131a038 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -57,7 +57,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0 0x00000000 0 0x40000000&gt;; /* 1 GB soldered on */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -98,15 +98,6 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-			/* Internal mini-PCIe connector */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> 			rtc@10300 {</div><div class='ctx'> 				/* No crystal connected to the internal RTC */</div><div class='hunk'>@@ -148,31 +139,13 @@</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-				button@1 {</div><div class='add'>+				init {</div><div class='ctx'> 					label = "Init Button";</div><div class='ctx'> 					linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 					gpios = &lt;&amp;gpio1 28 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy2: ethernet-phy@2 {</div><div class='del'>-					reg = &lt;2&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy3: ethernet-phy@3 {</div><div class='del'>-					reg = &lt;3&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 				phy = &lt;&amp;phy0&gt;;</div><div class='hunk'>@@ -240,6 +213,33 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+	/* Internal mini-PCIe connector */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy2: ethernet-phy@2 {</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy3: ethernet-phy@3 {</div><div class='add'>+		reg = &lt;3&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	led_pins: led-pins-0 {</div><div class='ctx'> 		marvell,pins = "mpp49", "mpp51", "mpp53";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts<br/>index ae286736b90a..d8e05bab0cee 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-synology-ds414.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp-synology-ds414.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp-synology-ds414.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp-synology-ds414.dts</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -70,7 +70,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0 0x00000000 0 0x40000000&gt;; /* 1GB */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -81,28 +81,6 @@</div><div class='ctx'> 			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000</div><div class='ctx'> 			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000&gt;;</div><div class='ctx'> </div><div class='del'>-		pcie-controller {</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Connected to Marvell 88SX7042 SATA-II controller</div><div class='del'>-			 * handling the four disks.</div><div class='del'>-			 */</div><div class='del'>-			pcie@1,0 {</div><div class='del'>-				/* Port 0, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Connected to EtronTech EJ168A XHCI controller</div><div class='del'>-			 * providing the two rear USB 3.0 ports.</div><div class='del'>-			 */</div><div class='del'>-			pcie@5,0 {</div><div class='del'>-				/* Port 1, Lane 0 */</div><div class='del'>-				status = "okay";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		internal-regs {</div><div class='ctx'> </div><div class='ctx'> 			/* RTC is provided by Seiko S-35390A below */</div><div class='hunk'>@@ -150,16 +128,6 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			mdio {</div><div class='del'>-				phy0: ethernet-phy@0 { /* Marvell 88E1512 */</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				phy1: ethernet-phy@1 { /* Marvell 88E1512 */</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			ethernet@70000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;ge0_rgmii_pins&gt;;</div><div class='hunk'>@@ -186,7 +154,7 @@</div><div class='ctx'> 			     &amp;sata3_pwr_pin &amp;sata4_pwr_pin&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> </div><div class='del'>-		sata1_regulator: sata1-regulator {</div><div class='add'>+		sata1_regulator: sata1-regulator@1 {</div><div class='ctx'> 			compatible = "regulator-fixed";</div><div class='ctx'> 			reg = &lt;1&gt;;</div><div class='ctx'> 			regulator-name = "SATA1 Power";</div><div class='hunk'>@@ -199,7 +167,7 @@</div><div class='ctx'> 			gpio = &lt;&amp;gpio1 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		sata2_regulator: sata2-regulator {</div><div class='add'>+		sata2_regulator: sata2-regulator@2 {</div><div class='ctx'> 			compatible = "regulator-fixed";</div><div class='ctx'> 			reg = &lt;2&gt;;</div><div class='ctx'> 			regulator-name = "SATA2 Power";</div><div class='hunk'>@@ -212,7 +180,7 @@</div><div class='ctx'> 			gpio = &lt;&amp;gpio1 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		sata3_regulator: sata3-regulator {</div><div class='add'>+		sata3_regulator: sata3-regulator@3 {</div><div class='ctx'> 			compatible = "regulator-fixed";</div><div class='ctx'> 			reg = &lt;3&gt;;</div><div class='ctx'> 			regulator-name = "SATA3 Power";</div><div class='hunk'>@@ -225,7 +193,7 @@</div><div class='ctx'> 			gpio = &lt;&amp;gpio1 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		sata4_regulator: sata4-regulator {</div><div class='add'>+		sata4_regulator: sata4-regulator@4 {</div><div class='ctx'> 			compatible = "regulator-fixed";</div><div class='ctx'> 			reg = &lt;4&gt;;</div><div class='ctx'> 			regulator-name = "SATA4 Power";</div><div class='hunk'>@@ -240,6 +208,39 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pciec {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Connected to Marvell 88SX7042 SATA-II controller</div><div class='add'>+	 * handling the four disks.</div><div class='add'>+	 */</div><div class='add'>+	pcie@1,0 {</div><div class='add'>+		/* Port 0, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Connected to EtronTech EJ168A XHCI controller</div><div class='add'>+	 * providing the two rear USB 3.0 ports.</div><div class='add'>+	 */</div><div class='add'>+	pcie@5,0 {</div><div class='add'>+		/* Port 1, Lane 0 */</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	phy0: ethernet-phy@0 { /* Marvell 88E1512 */</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 { /* Marvell 88E1512 */</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	sata1_pwr_pin: sata1-pwr-pin {</div><div class='ctx'> 		marvell,pins = "mpp42";</div><div class='head'>diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi<br/>index 4a5f99e65b51..fa1e881266ac 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/armada-xp.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/armada-xp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/armada-xp.dtsi</a></div><div class='hunk'>@@ -18,17 +18,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -37,11 +37,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -53,6 +53,9 @@</div><div class='ctx'> #include "armada-370-xp.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='ctx'> 	model = "Marvell Armada XP family SoC";</div><div class='ctx'> 	compatible = "marvell,armadaxp", "marvell,armada-370-xp";</div><div class='ctx'> </div><div class='hunk'>@@ -75,7 +78,7 @@</div><div class='ctx'> 				reg = &lt;0x1400 0x500&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			L2: l2-cache {</div><div class='add'>+			L2: l2-cache@8000 {</div><div class='ctx'> 				compatible = "marvell,aurora-system-cache";</div><div class='ctx'> 				reg = &lt;0x08000 0x1000&gt;;</div><div class='ctx'> 				cache-id-part = &lt;0x100&gt;;</div><div class='hunk'>@@ -84,16 +87,6 @@</div><div class='ctx'> 				wt-override;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			i2c0: i2c@11000 {</div><div class='del'>-				compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";</div><div class='del'>-				reg = &lt;0x11000 0x100&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c1: i2c@11100 {</div><div class='del'>-				compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";</div><div class='del'>-				reg = &lt;0x11100 0x100&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			uart2: serial@12200 {</div><div class='ctx'> 				compatible = "snps,dw-apb-uart";</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;uart2_pins&gt;;</div><div class='hunk'>@@ -118,7 +111,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			system-controller@18200 {</div><div class='add'>+			systemc: system-controller@18200 {</div><div class='ctx'> 				compatible = "marvell,armada-370-xp-system-controller";</div><div class='ctx'> 				reg = &lt;0x18200 0x500&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -136,7 +129,7 @@</div><div class='ctx'> 				#clock-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			thermal@182b0 {</div><div class='add'>+			thermal: thermal@182b0 {</div><div class='ctx'> 				compatible = "marvell,armadaxp-thermal";</div><div class='ctx'> 				reg = &lt;0x182b0 0x4</div><div class='ctx'> 					0x184d0 0x4&gt;;</div><div class='hunk'>@@ -150,27 +143,6 @@</div><div class='ctx'> 				clocks = &lt;&amp;coreclk 1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			interrupt-controller@20a00 {</div><div class='del'>-			      reg = &lt;0x20a00 0x2d0&gt;, &lt;0x21070 0x58&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			timer@20300 {</div><div class='del'>-				compatible = "marvell,armada-xp-timer";</div><div class='del'>-				clocks = &lt;&amp;coreclk 2&gt;, &lt;&amp;refclk&gt;;</div><div class='del'>-				clock-names = "nbclk", "fixed";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			watchdog@20300 {</div><div class='del'>-				compatible = "marvell,armada-xp-wdt";</div><div class='del'>-				clocks = &lt;&amp;coreclk 2&gt;, &lt;&amp;refclk&gt;;</div><div class='del'>-				clock-names = "nbclk", "fixed";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			cpurst@20800 {</div><div class='del'>-				compatible = "marvell,armada-370-cpu-reset";</div><div class='del'>-				reg = &lt;0x20800 0x20&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			cpu-config@21000 {</div><div class='ctx'> 				compatible = "marvell,armada-xp-cpu-config";</div><div class='ctx'> 				reg = &lt;0x21000 0x8&gt;;</div><div class='hunk'>@@ -184,15 +156,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			usb@50000 {</div><div class='del'>-				clocks = &lt;&amp;gateclk 18&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			usb@51000 {</div><div class='del'>-				clocks = &lt;&amp;gateclk 19&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			usb@52000 {</div><div class='add'>+			usb2: usb@52000 {</div><div class='ctx'> 				compatible = "marvell,orion-ehci";</div><div class='ctx'> 				reg = &lt;0x52000 0x500&gt;;</div><div class='ctx'> 				interrupts = &lt;47&gt;;</div><div class='hunk'>@@ -200,7 +164,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			xor@60900 {</div><div class='add'>+			xor1: xor@60900 {</div><div class='ctx'> 				compatible = "marvell,orion-xor";</div><div class='ctx'> 				reg = &lt;0x60900 0x100</div><div class='ctx'> 				       0x60b00 0x100&gt;;</div><div class='hunk'>@@ -228,7 +192,7 @@</div><div class='ctx'> 				compatible = "marvell,armada-xp-neta";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			crypto@90000 {</div><div class='add'>+			cesa: crypto@90000 {</div><div class='ctx'> 				compatible = "marvell,armada-xp-crypto";</div><div class='ctx'> 				reg = &lt;0x90000 0x10000&gt;;</div><div class='ctx'> 				reg-names = "regs";</div><div class='hunk'>@@ -248,7 +212,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			xor@f0900 {</div><div class='add'>+			xor0: xor@f0900 {</div><div class='ctx'> 				compatible = "marvell,orion-xor";</div><div class='ctx'> 				reg = &lt;0xF0900 0x100</div><div class='ctx'> 				       0xF0B00 0x100&gt;;</div><div class='hunk'>@@ -309,6 +273,44 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";</div><div class='add'>+	reg = &lt;0x11000 0x100&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";</div><div class='add'>+	reg = &lt;0x11100 0x100&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mpic {</div><div class='add'>+	reg = &lt;0x20a00 0x2d0&gt;, &lt;0x21070 0x58&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;timer {</div><div class='add'>+	compatible = "marvell,armada-xp-timer";</div><div class='add'>+	clocks = &lt;&amp;coreclk 2&gt;, &lt;&amp;refclk&gt;;</div><div class='add'>+	clock-names = "nbclk", "fixed";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;watchdog {</div><div class='add'>+	compatible = "marvell,armada-xp-wdt";</div><div class='add'>+	clocks = &lt;&amp;coreclk 2&gt;, &lt;&amp;refclk&gt;;</div><div class='add'>+	clock-names = "nbclk", "fixed";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpurst {</div><div class='add'>+	reg = &lt;0x20800 0x20&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb0 {</div><div class='add'>+	clocks = &lt;&amp;gateclk 18&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb1 {</div><div class='add'>+	clocks = &lt;&amp;gateclk 19&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	ge0_gmii_pins: ge0-gmii-pins {</div><div class='ctx'> 		marvell,pins =</div><div class='head'>diff --git a/arch/arm/boot/dts/artpec6-devboard.dts b/arch/arm/boot/dts/artpec6-devboard.dts<br/>index f823ed382ac7..9dfe845694cf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/artpec6-devboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/artpec6-devboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/artpec6-devboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/artpec6-devboard.dts</a></div><div class='hunk'>@@ -46,6 +46,10 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pcie {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;ethernet {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/artpec6.dtsi b/arch/arm/boot/dts/artpec6.dtsi<br/>index 3489019cc0dc..767cbe8d8557 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/artpec6.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/artpec6.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/artpec6.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/artpec6.dtsi</a></div><div class='hunk'>@@ -67,7 +67,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	syscon {</div><div class='add'>+	syscon: syscon@f8000000 {</div><div class='ctx'> 		compatible = "axis,artpec6-syscon", "syscon";</div><div class='ctx'> 		reg = &lt;0xf8000000 0x48&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -154,6 +154,33 @@</div><div class='ctx'> 		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	pcie: pcie@f8050000 {</div><div class='add'>+		compatible = "axis,artpec6-pcie", "snps,dw-pcie";</div><div class='add'>+		reg = &lt;0xf8050000 0x2000</div><div class='add'>+		       0xf8040000 0x1000</div><div class='add'>+		       0xc0000000 0x2000&gt;;</div><div class='add'>+		reg-names = "dbi", "phy", "config";</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+			  /* downstream I/O */</div><div class='add'>+		ranges = &lt;0x81000000 0 0 0xc0002000 0 0x00010000</div><div class='add'>+			  /* non-prefetchable memory */</div><div class='add'>+			  0x82000000 0 0xc0012000 0xc0012000 0 0x1ffee000&gt;;</div><div class='add'>+		num-lanes = &lt;2&gt;;</div><div class='add'>+		bus-range = &lt;0x00 0xff&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		interrupt-names = "msi";</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0 0 0 0x7&gt;;</div><div class='add'>+		interrupt-map = &lt;0 0 0 1 &amp;intc GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;0 0 0 2 &amp;intc GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;0 0 0 3 &amp;intc GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;0 0 0 4 &amp;intc GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		axis,syscon-pcie = &lt;&amp;syscon&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	amba@0 {</div><div class='ctx'> 		compatible = "simple-bus";</div><div class='ctx'> 		#address-cells = &lt;0x1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts<br/>index 1b7a5ff0e533..d967603dade8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/aspeed-ast2500-evb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/aspeed-ast2500-evb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/aspeed-ast2500-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/aspeed-ast2500-evb.dts</a></div><div class='hunk'>@@ -23,3 +23,17 @@</div><div class='ctx'> &amp;uart5 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;mac0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_rgmii1_default &amp;pinctrl_mdio1_default&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mac1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_rgmii2_default &amp;pinctrl_mdio2_default&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts<br/>index cc5fcf2940bf..1d2fc1e1dc29 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts</a></div><div class='hunk'>@@ -12,14 +12,34 @@</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='ctx'> 		stdout-path = &amp;uart5;</div><div class='del'>-		bootargs = "console=ttyS4,38400 earlyprintk";</div><div class='add'>+		bootargs = "console=ttyS4,115200 earlyprintk";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x40000000 0x10000000&gt;;</div><div class='add'>+		reg = &lt;0x40000000 0x20000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		vga_memory: framebuffer@5f000000 {</div><div class='add'>+			no-map;</div><div class='add'>+			reg = &lt;0x5f000000 0x01000000&gt;; /* 16M */</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart5 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;mac0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	use-ncsi;</div><div class='add'>+</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_rmii1_default&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts<br/>new file mode 100644<br/>index 000000000000..7a3b2b50c884<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "aspeed-g5.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Romulus BMC";</div><div class='add'>+	compatible = "ibm,romulus-bmc", "aspeed,ast2500";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial4 = &amp;uart5;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart5;</div><div class='add'>+		bootargs = "console=ttyS4,115200 earlyprintk";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x80000000 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		vga_memory: framebuffer@bf000000 {</div><div class='add'>+			no-map;</div><div class='add'>+			reg = &lt;0xbf000000 0x01000000&gt;; /* 16M */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart5 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mac0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	use-ncsi;</div><div class='add'>+</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_rmii1_default&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi<br/>index 22dee5937d5c..0b4932cc02a8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/aspeed-g4.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/aspeed-g4.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/aspeed-g4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/aspeed-g4.dtsi</a></div><div class='hunk'>@@ -41,6 +41,22 @@</div><div class='ctx'> 			reg = &lt;0x1e6c0080 0x80&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		mac0: ethernet@1e660000 {</div><div class='add'>+			compatible = "faraday,ftgmac100";</div><div class='add'>+			reg = &lt;0x1e660000 0x180&gt;;</div><div class='add'>+			interrupts = &lt;2&gt;;</div><div class='add'>+			no-hw-checksum;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mac1: ethernet@1e680000 {</div><div class='add'>+			compatible = "faraday,ftgmac100";</div><div class='add'>+			reg = &lt;0x1e680000 0x180&gt;;</div><div class='add'>+			interrupts = &lt;3&gt;;</div><div class='add'>+			no-hw-checksum;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		apb {</div><div class='ctx'> 			compatible = "simple-bus";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -54,6 +70,756 @@</div><div class='ctx'> 				clocks = &lt;&amp;clk_clkin&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			syscon: syscon@1e6e2000 {</div><div class='add'>+				compatible = "aspeed,g4-scu", "syscon", "simple-mfd";</div><div class='add'>+				reg = &lt;0x1e6e2000 0x1a8&gt;;</div><div class='add'>+</div><div class='add'>+				pinctrl: pinctrl {</div><div class='add'>+					compatible = "aspeed,g4-pinctrl";</div><div class='add'>+</div><div class='add'>+					pinctrl_acpi_default: acpi_default {</div><div class='add'>+						function = "ACPI";</div><div class='add'>+						groups = "ACPI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc0_default: adc0_default {</div><div class='add'>+						function = "ADC0";</div><div class='add'>+						groups = "ADC0";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc1_default: adc1_default {</div><div class='add'>+						function = "ADC1";</div><div class='add'>+						groups = "ADC1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc10_default: adc10_default {</div><div class='add'>+						function = "ADC10";</div><div class='add'>+						groups = "ADC10";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc11_default: adc11_default {</div><div class='add'>+						function = "ADC11";</div><div class='add'>+						groups = "ADC11";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc12_default: adc12_default {</div><div class='add'>+						function = "ADC12";</div><div class='add'>+						groups = "ADC12";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc13_default: adc13_default {</div><div class='add'>+						function = "ADC13";</div><div class='add'>+						groups = "ADC13";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc14_default: adc14_default {</div><div class='add'>+						function = "ADC14";</div><div class='add'>+						groups = "ADC14";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc15_default: adc15_default {</div><div class='add'>+						function = "ADC15";</div><div class='add'>+						groups = "ADC15";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc2_default: adc2_default {</div><div class='add'>+						function = "ADC2";</div><div class='add'>+						groups = "ADC2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc3_default: adc3_default {</div><div class='add'>+						function = "ADC3";</div><div class='add'>+						groups = "ADC3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc4_default: adc4_default {</div><div class='add'>+						function = "ADC4";</div><div class='add'>+						groups = "ADC4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc5_default: adc5_default {</div><div class='add'>+						function = "ADC5";</div><div class='add'>+						groups = "ADC5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc6_default: adc6_default {</div><div class='add'>+						function = "ADC6";</div><div class='add'>+						groups = "ADC6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc7_default: adc7_default {</div><div class='add'>+						function = "ADC7";</div><div class='add'>+						groups = "ADC7";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc8_default: adc8_default {</div><div class='add'>+						function = "ADC8";</div><div class='add'>+						groups = "ADC8";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc9_default: adc9_default {</div><div class='add'>+						function = "ADC9";</div><div class='add'>+						groups = "ADC9";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_bmcint_default: bmcint_default {</div><div class='add'>+						function = "BMCINT";</div><div class='add'>+						groups = "BMCINT";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ddcclk_default: ddcclk_default {</div><div class='add'>+						function = "DDCCLK";</div><div class='add'>+						groups = "DDCCLK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ddcdat_default: ddcdat_default {</div><div class='add'>+						function = "DDCDAT";</div><div class='add'>+						groups = "DDCDAT";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_extrst_default: extrst_default {</div><div class='add'>+						function = "EXTRST";</div><div class='add'>+						groups = "EXTRST";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_flack_default: flack_default {</div><div class='add'>+						function = "FLACK";</div><div class='add'>+						groups = "FLACK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_flbusy_default: flbusy_default {</div><div class='add'>+						function = "FLBUSY";</div><div class='add'>+						groups = "FLBUSY";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_flwp_default: flwp_default {</div><div class='add'>+						function = "FLWP";</div><div class='add'>+						groups = "FLWP";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpid_default: gpid_default {</div><div class='add'>+						function = "GPID";</div><div class='add'>+						groups = "GPID";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpid0_default: gpid0_default {</div><div class='add'>+						function = "GPID0";</div><div class='add'>+						groups = "GPID0";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpid2_default: gpid2_default {</div><div class='add'>+						function = "GPID2";</div><div class='add'>+						groups = "GPID2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpid4_default: gpid4_default {</div><div class='add'>+						function = "GPID4";</div><div class='add'>+						groups = "GPID4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpid6_default: gpid6_default {</div><div class='add'>+						function = "GPID6";</div><div class='add'>+						groups = "GPID6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpie0_default: gpie0_default {</div><div class='add'>+						function = "GPIE0";</div><div class='add'>+						groups = "GPIE0";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpie2_default: gpie2_default {</div><div class='add'>+						function = "GPIE2";</div><div class='add'>+						groups = "GPIE2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpie4_default: gpie4_default {</div><div class='add'>+						function = "GPIE4";</div><div class='add'>+						groups = "GPIE4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpie6_default: gpie6_default {</div><div class='add'>+						function = "GPIE6";</div><div class='add'>+						groups = "GPIE6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c10_default: i2c10_default {</div><div class='add'>+						function = "I2C10";</div><div class='add'>+						groups = "I2C10";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c11_default: i2c11_default {</div><div class='add'>+						function = "I2C11";</div><div class='add'>+						groups = "I2C11";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c12_default: i2c12_default {</div><div class='add'>+						function = "I2C12";</div><div class='add'>+						groups = "I2C12";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c13_default: i2c13_default {</div><div class='add'>+						function = "I2C13";</div><div class='add'>+						groups = "I2C13";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c14_default: i2c14_default {</div><div class='add'>+						function = "I2C14";</div><div class='add'>+						groups = "I2C14";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c3_default: i2c3_default {</div><div class='add'>+						function = "I2C3";</div><div class='add'>+						groups = "I2C3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c4_default: i2c4_default {</div><div class='add'>+						function = "I2C4";</div><div class='add'>+						groups = "I2C4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c5_default: i2c5_default {</div><div class='add'>+						function = "I2C5";</div><div class='add'>+						groups = "I2C5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c6_default: i2c6_default {</div><div class='add'>+						function = "I2C6";</div><div class='add'>+						groups = "I2C6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c7_default: i2c7_default {</div><div class='add'>+						function = "I2C7";</div><div class='add'>+						groups = "I2C7";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c8_default: i2c8_default {</div><div class='add'>+						function = "I2C8";</div><div class='add'>+						groups = "I2C8";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c9_default: i2c9_default {</div><div class='add'>+						function = "I2C9";</div><div class='add'>+						groups = "I2C9";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lpcpd_default: lpcpd_default {</div><div class='add'>+						function = "LPCPD";</div><div class='add'>+						groups = "LPCPD";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lpcpme_default: lpcpme_default {</div><div class='add'>+						function = "LPCPME";</div><div class='add'>+						groups = "LPCPME";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lpcrst_default: lpcrst_default {</div><div class='add'>+						function = "LPCRST";</div><div class='add'>+						groups = "LPCRST";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lpcsmi_default: lpcsmi_default {</div><div class='add'>+						function = "LPCSMI";</div><div class='add'>+						groups = "LPCSMI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_mac1link_default: mac1link_default {</div><div class='add'>+						function = "MAC1LINK";</div><div class='add'>+						groups = "MAC1LINK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_mac2link_default: mac2link_default {</div><div class='add'>+						function = "MAC2LINK";</div><div class='add'>+						groups = "MAC2LINK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_mdio1_default: mdio1_default {</div><div class='add'>+						function = "MDIO1";</div><div class='add'>+						groups = "MDIO1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_mdio2_default: mdio2_default {</div><div class='add'>+						function = "MDIO2";</div><div class='add'>+						groups = "MDIO2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ncts1_default: ncts1_default {</div><div class='add'>+						function = "NCTS1";</div><div class='add'>+						groups = "NCTS1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ncts2_default: ncts2_default {</div><div class='add'>+						function = "NCTS2";</div><div class='add'>+						groups = "NCTS2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ncts3_default: ncts3_default {</div><div class='add'>+						function = "NCTS3";</div><div class='add'>+						groups = "NCTS3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ncts4_default: ncts4_default {</div><div class='add'>+						function = "NCTS4";</div><div class='add'>+						groups = "NCTS4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndcd1_default: ndcd1_default {</div><div class='add'>+						function = "NDCD1";</div><div class='add'>+						groups = "NDCD1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndcd2_default: ndcd2_default {</div><div class='add'>+						function = "NDCD2";</div><div class='add'>+						groups = "NDCD2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndcd3_default: ndcd3_default {</div><div class='add'>+						function = "NDCD3";</div><div class='add'>+						groups = "NDCD3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndcd4_default: ndcd4_default {</div><div class='add'>+						function = "NDCD4";</div><div class='add'>+						groups = "NDCD4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndsr1_default: ndsr1_default {</div><div class='add'>+						function = "NDSR1";</div><div class='add'>+						groups = "NDSR1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndsr2_default: ndsr2_default {</div><div class='add'>+						function = "NDSR2";</div><div class='add'>+						groups = "NDSR2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndsr3_default: ndsr3_default {</div><div class='add'>+						function = "NDSR3";</div><div class='add'>+						groups = "NDSR3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndsr4_default: ndsr4_default {</div><div class='add'>+						function = "NDSR4";</div><div class='add'>+						groups = "NDSR4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndtr1_default: ndtr1_default {</div><div class='add'>+						function = "NDTR1";</div><div class='add'>+						groups = "NDTR1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndtr2_default: ndtr2_default {</div><div class='add'>+						function = "NDTR2";</div><div class='add'>+						groups = "NDTR2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndtr3_default: ndtr3_default {</div><div class='add'>+						function = "NDTR3";</div><div class='add'>+						groups = "NDTR3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndtr4_default: ndtr4_default {</div><div class='add'>+						function = "NDTR4";</div><div class='add'>+						groups = "NDTR4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndts4_default: ndts4_default {</div><div class='add'>+						function = "NDTS4";</div><div class='add'>+						groups = "NDTS4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nri1_default: nri1_default {</div><div class='add'>+						function = "NRI1";</div><div class='add'>+						groups = "NRI1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nri2_default: nri2_default {</div><div class='add'>+						function = "NRI2";</div><div class='add'>+						groups = "NRI2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nri3_default: nri3_default {</div><div class='add'>+						function = "NRI3";</div><div class='add'>+						groups = "NRI3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nri4_default: nri4_default {</div><div class='add'>+						function = "NRI4";</div><div class='add'>+						groups = "NRI4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nrts1_default: nrts1_default {</div><div class='add'>+						function = "NRTS1";</div><div class='add'>+						groups = "NRTS1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nrts2_default: nrts2_default {</div><div class='add'>+						function = "NRTS2";</div><div class='add'>+						groups = "NRTS2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nrts3_default: nrts3_default {</div><div class='add'>+						function = "NRTS3";</div><div class='add'>+						groups = "NRTS3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_oscclk_default: oscclk_default {</div><div class='add'>+						function = "OSCCLK";</div><div class='add'>+						groups = "OSCCLK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm0_default: pwm0_default {</div><div class='add'>+						function = "PWM0";</div><div class='add'>+						groups = "PWM0";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm1_default: pwm1_default {</div><div class='add'>+						function = "PWM1";</div><div class='add'>+						groups = "PWM1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm2_default: pwm2_default {</div><div class='add'>+						function = "PWM2";</div><div class='add'>+						groups = "PWM2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm3_default: pwm3_default {</div><div class='add'>+						function = "PWM3";</div><div class='add'>+						groups = "PWM3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm4_default: pwm4_default {</div><div class='add'>+						function = "PWM4";</div><div class='add'>+						groups = "PWM4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm5_default: pwm5_default {</div><div class='add'>+						function = "PWM5";</div><div class='add'>+						groups = "PWM5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm6_default: pwm6_default {</div><div class='add'>+						function = "PWM6";</div><div class='add'>+						groups = "PWM6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm7_default: pwm7_default {</div><div class='add'>+						function = "PWM7";</div><div class='add'>+						groups = "PWM7";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rgmii1_default: rgmii1_default {</div><div class='add'>+						function = "RGMII1";</div><div class='add'>+						groups = "RGMII1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rgmii2_default: rgmii2_default {</div><div class='add'>+						function = "RGMII2";</div><div class='add'>+						groups = "RGMII2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rmii1_default: rmii1_default {</div><div class='add'>+						function = "RMII1";</div><div class='add'>+						groups = "RMII1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rmii2_default: rmii2_default {</div><div class='add'>+						function = "RMII2";</div><div class='add'>+						groups = "RMII2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rom16_default: rom16_default {</div><div class='add'>+						function = "ROM16";</div><div class='add'>+						groups = "ROM16";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rom8_default: rom8_default {</div><div class='add'>+						function = "ROM8";</div><div class='add'>+						groups = "ROM8";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_romcs1_default: romcs1_default {</div><div class='add'>+						function = "ROMCS1";</div><div class='add'>+						groups = "ROMCS1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_romcs2_default: romcs2_default {</div><div class='add'>+						function = "ROMCS2";</div><div class='add'>+						groups = "ROMCS2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_romcs3_default: romcs3_default {</div><div class='add'>+						function = "ROMCS3";</div><div class='add'>+						groups = "ROMCS3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_romcs4_default: romcs4_default {</div><div class='add'>+						function = "ROMCS4";</div><div class='add'>+						groups = "ROMCS4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rxd1_default: rxd1_default {</div><div class='add'>+						function = "RXD1";</div><div class='add'>+						groups = "RXD1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rxd2_default: rxd2_default {</div><div class='add'>+						function = "RXD2";</div><div class='add'>+						groups = "RXD2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rxd3_default: rxd3_default {</div><div class='add'>+						function = "RXD3";</div><div class='add'>+						groups = "RXD3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rxd4_default: rxd4_default {</div><div class='add'>+						function = "RXD4";</div><div class='add'>+						groups = "RXD4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt1_default: salt1_default {</div><div class='add'>+						function = "SALT1";</div><div class='add'>+						groups = "SALT1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt2_default: salt2_default {</div><div class='add'>+						function = "SALT2";</div><div class='add'>+						groups = "SALT2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt3_default: salt3_default {</div><div class='add'>+						function = "SALT3";</div><div class='add'>+						groups = "SALT3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt4_default: salt4_default {</div><div class='add'>+						function = "SALT4";</div><div class='add'>+						groups = "SALT4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sd1_default: sd1_default {</div><div class='add'>+						function = "SD1";</div><div class='add'>+						groups = "SD1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sd2_default: sd2_default {</div><div class='add'>+						function = "SD2";</div><div class='add'>+						groups = "SD2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sgpmck_default: sgpmck_default {</div><div class='add'>+						function = "SGPMCK";</div><div class='add'>+						groups = "SGPMCK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sgpmi_default: sgpmi_default {</div><div class='add'>+						function = "SGPMI";</div><div class='add'>+						groups = "SGPMI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sgpmld_default: sgpmld_default {</div><div class='add'>+						function = "SGPMLD";</div><div class='add'>+						groups = "SGPMLD";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sgpmo_default: sgpmo_default {</div><div class='add'>+						function = "SGPMO";</div><div class='add'>+						groups = "SGPMO";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sgpsck_default: sgpsck_default {</div><div class='add'>+						function = "SGPSCK";</div><div class='add'>+						groups = "SGPSCK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sgpsi0_default: sgpsi0_default {</div><div class='add'>+						function = "SGPSI0";</div><div class='add'>+						groups = "SGPSI0";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sgpsi1_default: sgpsi1_default {</div><div class='add'>+						function = "SGPSI1";</div><div class='add'>+						groups = "SGPSI1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sgpsld_default: sgpsld_default {</div><div class='add'>+						function = "SGPSLD";</div><div class='add'>+						groups = "SGPSLD";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sioonctrl_default: sioonctrl_default {</div><div class='add'>+						function = "SIOONCTRL";</div><div class='add'>+						groups = "SIOONCTRL";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_siopbi_default: siopbi_default {</div><div class='add'>+						function = "SIOPBI";</div><div class='add'>+						groups = "SIOPBI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_siopbo_default: siopbo_default {</div><div class='add'>+						function = "SIOPBO";</div><div class='add'>+						groups = "SIOPBO";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_siopwreq_default: siopwreq_default {</div><div class='add'>+						function = "SIOPWREQ";</div><div class='add'>+						groups = "SIOPWREQ";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_siopwrgd_default: siopwrgd_default {</div><div class='add'>+						function = "SIOPWRGD";</div><div class='add'>+						groups = "SIOPWRGD";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sios3_default: sios3_default {</div><div class='add'>+						function = "SIOS3";</div><div class='add'>+						groups = "SIOS3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sios5_default: sios5_default {</div><div class='add'>+						function = "SIOS5";</div><div class='add'>+						groups = "SIOS5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_siosci_default: siosci_default {</div><div class='add'>+						function = "SIOSCI";</div><div class='add'>+						groups = "SIOSCI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi1_default: spi1_default {</div><div class='add'>+						function = "SPI1";</div><div class='add'>+						groups = "SPI1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi1debug_default: spi1debug_default {</div><div class='add'>+						function = "SPI1DEBUG";</div><div class='add'>+						groups = "SPI1DEBUG";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi1passthru_default: spi1passthru_default {</div><div class='add'>+						function = "SPI1PASSTHRU";</div><div class='add'>+						groups = "SPI1PASSTHRU";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spics1_default: spics1_default {</div><div class='add'>+						function = "SPICS1";</div><div class='add'>+						groups = "SPICS1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer3_default: timer3_default {</div><div class='add'>+						function = "TIMER3";</div><div class='add'>+						groups = "TIMER3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer4_default: timer4_default {</div><div class='add'>+						function = "TIMER4";</div><div class='add'>+						groups = "TIMER4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer5_default: timer5_default {</div><div class='add'>+						function = "TIMER5";</div><div class='add'>+						groups = "TIMER5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer6_default: timer6_default {</div><div class='add'>+						function = "TIMER6";</div><div class='add'>+						groups = "TIMER6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer7_default: timer7_default {</div><div class='add'>+						function = "TIMER7";</div><div class='add'>+						groups = "TIMER7";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer8_default: timer8_default {</div><div class='add'>+						function = "TIMER8";</div><div class='add'>+						groups = "TIMER8";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_txd1_default: txd1_default {</div><div class='add'>+						function = "TXD1";</div><div class='add'>+						groups = "TXD1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_txd2_default: txd2_default {</div><div class='add'>+						function = "TXD2";</div><div class='add'>+						groups = "TXD2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_txd3_default: txd3_default {</div><div class='add'>+						function = "TXD3";</div><div class='add'>+						groups = "TXD3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_txd4_default: txd4_default {</div><div class='add'>+						function = "TXD4";</div><div class='add'>+						groups = "TXD4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_uart6_default: uart6_default {</div><div class='add'>+						function = "UART6";</div><div class='add'>+						groups = "UART6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_usbcki_default: usbcki_default {</div><div class='add'>+						function = "USBCKI";</div><div class='add'>+						groups = "USBCKI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vgabios_rom_default: vgabios_rom_default {</div><div class='add'>+						function = "VGABIOS_ROM";</div><div class='add'>+						groups = "VGABIOS_ROM";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vgahs_default: vgahs_default {</div><div class='add'>+						function = "VGAHS";</div><div class='add'>+						groups = "VGAHS";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vgavs_default: vgavs_default {</div><div class='add'>+						function = "VGAVS";</div><div class='add'>+						groups = "VGAVS";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vpi18_default: vpi18_default {</div><div class='add'>+						function = "VPI18";</div><div class='add'>+						groups = "VPI18";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vpi24_default: vpi24_default {</div><div class='add'>+						function = "VPI24";</div><div class='add'>+						groups = "VPI24";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vpi30_default: vpi30_default {</div><div class='add'>+						function = "VPI30";</div><div class='add'>+						groups = "VPI30";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vpo12_default: vpo12_default {</div><div class='add'>+						function = "VPO12";</div><div class='add'>+						groups = "VPO12";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vpo24_default: vpo24_default {</div><div class='add'>+						function = "VPO24";</div><div class='add'>+						groups = "VPO24";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_wdtrst1_default: wdtrst1_default {</div><div class='add'>+						function = "WDTRST1";</div><div class='add'>+						groups = "WDTRST1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_wdtrst2_default: wdtrst2_default {</div><div class='add'>+						function = "WDTRST2";</div><div class='add'>+						groups = "WDTRST2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			clk_apb: clk_apb@1e6e2008 {</div><div class='ctx'> 				#clock-cells = &lt;0&gt;;</div><div class='ctx'> 				compatible = "aspeed,g4-apb-clock";</div><div class='hunk'>@@ -72,6 +838,16 @@</div><div class='ctx'> 				reg = &lt;0x1e720000 0x8000&gt;;	// 32K</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			gpio: gpio@1e780000 {</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				gpio-controller;</div><div class='add'>+				compatible = "aspeed,ast2400-gpio";</div><div class='add'>+				reg = &lt;0x1e780000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;20&gt;;</div><div class='add'>+				gpio-ranges = &lt;&amp;pinctrl 0 0 220&gt;;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			timer: timer@1e782000 {</div><div class='ctx'> 				compatible = "aspeed,ast2400-timer";</div><div class='ctx'> 				reg = &lt;0x1e782000 0x90&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi<br/>index dd94d9361fda..b664fe380936 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/aspeed-g5.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/aspeed-g5.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/aspeed-g5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/aspeed-g5.dtsi</a></div><div class='hunk'>@@ -32,6 +32,22 @@</div><div class='ctx'> 			reg = &lt;0x1e6c0080 0x80&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		mac0: ethernet@1e660000 {</div><div class='add'>+			compatible = "faraday,ftgmac100";</div><div class='add'>+			reg = &lt;0x1e660000 0x180&gt;;</div><div class='add'>+			interrupts = &lt;2&gt;;</div><div class='add'>+			no-hw-checksum;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mac1: ethernet@1e680000 {</div><div class='add'>+			compatible = "faraday,ftgmac100";</div><div class='add'>+			reg = &lt;0x1e680000 0x180&gt;;</div><div class='add'>+			interrupts = &lt;3&gt;;</div><div class='add'>+			no-hw-checksum;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		apb {</div><div class='ctx'> 			compatible = "simple-bus";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -44,6 +60,822 @@</div><div class='ctx'> 				reg = &lt;0x1e6e2070 0x04&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			syscon: syscon@1e6e2000 {</div><div class='add'>+				compatible = "aspeed,g5-scu", "syscon", "simple-mfd";</div><div class='add'>+				reg = &lt;0x1e6e2000 0x1a8&gt;;</div><div class='add'>+</div><div class='add'>+				pinctrl: pinctrl {</div><div class='add'>+					compatible = "aspeed,g5-pinctrl";</div><div class='add'>+					aspeed,external-nodes = &lt;&amp;gfx &amp;lhc&gt;;</div><div class='add'>+</div><div class='add'>+					pinctrl_acpi_default: acpi_default {</div><div class='add'>+						function = "ACPI";</div><div class='add'>+						groups = "ACPI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc0_default: adc0_default {</div><div class='add'>+						function = "ADC0";</div><div class='add'>+						groups = "ADC0";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc1_default: adc1_default {</div><div class='add'>+						function = "ADC1";</div><div class='add'>+						groups = "ADC1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc10_default: adc10_default {</div><div class='add'>+						function = "ADC10";</div><div class='add'>+						groups = "ADC10";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc11_default: adc11_default {</div><div class='add'>+						function = "ADC11";</div><div class='add'>+						groups = "ADC11";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc12_default: adc12_default {</div><div class='add'>+						function = "ADC12";</div><div class='add'>+						groups = "ADC12";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc13_default: adc13_default {</div><div class='add'>+						function = "ADC13";</div><div class='add'>+						groups = "ADC13";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc14_default: adc14_default {</div><div class='add'>+						function = "ADC14";</div><div class='add'>+						groups = "ADC14";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc15_default: adc15_default {</div><div class='add'>+						function = "ADC15";</div><div class='add'>+						groups = "ADC15";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc2_default: adc2_default {</div><div class='add'>+						function = "ADC2";</div><div class='add'>+						groups = "ADC2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc3_default: adc3_default {</div><div class='add'>+						function = "ADC3";</div><div class='add'>+						groups = "ADC3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc4_default: adc4_default {</div><div class='add'>+						function = "ADC4";</div><div class='add'>+						groups = "ADC4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc5_default: adc5_default {</div><div class='add'>+						function = "ADC5";</div><div class='add'>+						groups = "ADC5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc6_default: adc6_default {</div><div class='add'>+						function = "ADC6";</div><div class='add'>+						groups = "ADC6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc7_default: adc7_default {</div><div class='add'>+						function = "ADC7";</div><div class='add'>+						groups = "ADC7";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc8_default: adc8_default {</div><div class='add'>+						function = "ADC8";</div><div class='add'>+						groups = "ADC8";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_adc9_default: adc9_default {</div><div class='add'>+						function = "ADC9";</div><div class='add'>+						groups = "ADC9";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_bmcint_default: bmcint_default {</div><div class='add'>+						function = "BMCINT";</div><div class='add'>+						groups = "BMCINT";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ddcclk_default: ddcclk_default {</div><div class='add'>+						function = "DDCCLK";</div><div class='add'>+						groups = "DDCCLK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ddcdat_default: ddcdat_default {</div><div class='add'>+						function = "DDCDAT";</div><div class='add'>+						groups = "DDCDAT";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_espi_default: espi_default {</div><div class='add'>+						function = "ESPI";</div><div class='add'>+						groups = "ESPI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_fwspics1_default: fwspics1_default {</div><div class='add'>+						function = "FWSPICS1";</div><div class='add'>+						groups = "FWSPICS1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_fwspics2_default: fwspics2_default {</div><div class='add'>+						function = "FWSPICS2";</div><div class='add'>+						groups = "FWSPICS2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpid0_default: gpid0_default {</div><div class='add'>+						function = "GPID0";</div><div class='add'>+						groups = "GPID0";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpid2_default: gpid2_default {</div><div class='add'>+						function = "GPID2";</div><div class='add'>+						groups = "GPID2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpid4_default: gpid4_default {</div><div class='add'>+						function = "GPID4";</div><div class='add'>+						groups = "GPID4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpid6_default: gpid6_default {</div><div class='add'>+						function = "GPID6";</div><div class='add'>+						groups = "GPID6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpie0_default: gpie0_default {</div><div class='add'>+						function = "GPIE0";</div><div class='add'>+						groups = "GPIE0";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpie2_default: gpie2_default {</div><div class='add'>+						function = "GPIE2";</div><div class='add'>+						groups = "GPIE2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpie4_default: gpie4_default {</div><div class='add'>+						function = "GPIE4";</div><div class='add'>+						groups = "GPIE4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_gpie6_default: gpie6_default {</div><div class='add'>+						function = "GPIE6";</div><div class='add'>+						groups = "GPIE6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c10_default: i2c10_default {</div><div class='add'>+						function = "I2C10";</div><div class='add'>+						groups = "I2C10";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c11_default: i2c11_default {</div><div class='add'>+						function = "I2C11";</div><div class='add'>+						groups = "I2C11";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c12_default: i2c12_default {</div><div class='add'>+						function = "I2C12";</div><div class='add'>+						groups = "I2C12";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c13_default: i2c13_default {</div><div class='add'>+						function = "I2C13";</div><div class='add'>+						groups = "I2C13";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c14_default: i2c14_default {</div><div class='add'>+						function = "I2C14";</div><div class='add'>+						groups = "I2C14";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c3_default: i2c3_default {</div><div class='add'>+						function = "I2C3";</div><div class='add'>+						groups = "I2C3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c4_default: i2c4_default {</div><div class='add'>+						function = "I2C4";</div><div class='add'>+						groups = "I2C4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c5_default: i2c5_default {</div><div class='add'>+						function = "I2C5";</div><div class='add'>+						groups = "I2C5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c6_default: i2c6_default {</div><div class='add'>+						function = "I2C6";</div><div class='add'>+						groups = "I2C6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c7_default: i2c7_default {</div><div class='add'>+						function = "I2C7";</div><div class='add'>+						groups = "I2C7";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c8_default: i2c8_default {</div><div class='add'>+						function = "I2C8";</div><div class='add'>+						groups = "I2C8";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_i2c9_default: i2c9_default {</div><div class='add'>+						function = "I2C9";</div><div class='add'>+						groups = "I2C9";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lad0_default: lad0_default {</div><div class='add'>+						function = "LAD0";</div><div class='add'>+						groups = "LAD0";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lad1_default: lad1_default {</div><div class='add'>+						function = "LAD1";</div><div class='add'>+						groups = "LAD1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lad2_default: lad2_default {</div><div class='add'>+						function = "LAD2";</div><div class='add'>+						groups = "LAD2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lad3_default: lad3_default {</div><div class='add'>+						function = "LAD3";</div><div class='add'>+						groups = "LAD3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lclk_default: lclk_default {</div><div class='add'>+						function = "LCLK";</div><div class='add'>+						groups = "LCLK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lframe_default: lframe_default {</div><div class='add'>+						function = "LFRAME";</div><div class='add'>+						groups = "LFRAME";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lpchc_default: lpchc_default {</div><div class='add'>+						function = "LPCHC";</div><div class='add'>+						groups = "LPCHC";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lpcpd_default: lpcpd_default {</div><div class='add'>+						function = "LPCPD";</div><div class='add'>+						groups = "LPCPD";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lpcplus_default: lpcplus_default {</div><div class='add'>+						function = "LPCPLUS";</div><div class='add'>+						groups = "LPCPLUS";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lpcpme_default: lpcpme_default {</div><div class='add'>+						function = "LPCPME";</div><div class='add'>+						groups = "LPCPME";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lpcrst_default: lpcrst_default {</div><div class='add'>+						function = "LPCRST";</div><div class='add'>+						groups = "LPCRST";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lpcsmi_default: lpcsmi_default {</div><div class='add'>+						function = "LPCSMI";</div><div class='add'>+						groups = "LPCSMI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_lsirq_default: lsirq_default {</div><div class='add'>+						function = "LSIRQ";</div><div class='add'>+						groups = "LSIRQ";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_mac1link_default: mac1link_default {</div><div class='add'>+						function = "MAC1LINK";</div><div class='add'>+						groups = "MAC1LINK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_mac2link_default: mac2link_default {</div><div class='add'>+						function = "MAC2LINK";</div><div class='add'>+						groups = "MAC2LINK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_mdio1_default: mdio1_default {</div><div class='add'>+						function = "MDIO1";</div><div class='add'>+						groups = "MDIO1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_mdio2_default: mdio2_default {</div><div class='add'>+						function = "MDIO2";</div><div class='add'>+						groups = "MDIO2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ncts1_default: ncts1_default {</div><div class='add'>+						function = "NCTS1";</div><div class='add'>+						groups = "NCTS1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ncts2_default: ncts2_default {</div><div class='add'>+						function = "NCTS2";</div><div class='add'>+						groups = "NCTS2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ncts3_default: ncts3_default {</div><div class='add'>+						function = "NCTS3";</div><div class='add'>+						groups = "NCTS3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ncts4_default: ncts4_default {</div><div class='add'>+						function = "NCTS4";</div><div class='add'>+						groups = "NCTS4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndcd1_default: ndcd1_default {</div><div class='add'>+						function = "NDCD1";</div><div class='add'>+						groups = "NDCD1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndcd2_default: ndcd2_default {</div><div class='add'>+						function = "NDCD2";</div><div class='add'>+						groups = "NDCD2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndcd3_default: ndcd3_default {</div><div class='add'>+						function = "NDCD3";</div><div class='add'>+						groups = "NDCD3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndcd4_default: ndcd4_default {</div><div class='add'>+						function = "NDCD4";</div><div class='add'>+						groups = "NDCD4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndsr1_default: ndsr1_default {</div><div class='add'>+						function = "NDSR1";</div><div class='add'>+						groups = "NDSR1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndsr2_default: ndsr2_default {</div><div class='add'>+						function = "NDSR2";</div><div class='add'>+						groups = "NDSR2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndsr3_default: ndsr3_default {</div><div class='add'>+						function = "NDSR3";</div><div class='add'>+						groups = "NDSR3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndsr4_default: ndsr4_default {</div><div class='add'>+						function = "NDSR4";</div><div class='add'>+						groups = "NDSR4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndtr1_default: ndtr1_default {</div><div class='add'>+						function = "NDTR1";</div><div class='add'>+						groups = "NDTR1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndtr2_default: ndtr2_default {</div><div class='add'>+						function = "NDTR2";</div><div class='add'>+						groups = "NDTR2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndtr3_default: ndtr3_default {</div><div class='add'>+						function = "NDTR3";</div><div class='add'>+						groups = "NDTR3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_ndtr4_default: ndtr4_default {</div><div class='add'>+						function = "NDTR4";</div><div class='add'>+						groups = "NDTR4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nri1_default: nri1_default {</div><div class='add'>+						function = "NRI1";</div><div class='add'>+						groups = "NRI1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nri2_default: nri2_default {</div><div class='add'>+						function = "NRI2";</div><div class='add'>+						groups = "NRI2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nri3_default: nri3_default {</div><div class='add'>+						function = "NRI3";</div><div class='add'>+						groups = "NRI3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nri4_default: nri4_default {</div><div class='add'>+						function = "NRI4";</div><div class='add'>+						groups = "NRI4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nrts1_default: nrts1_default {</div><div class='add'>+						function = "NRTS1";</div><div class='add'>+						groups = "NRTS1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nrts2_default: nrts2_default {</div><div class='add'>+						function = "NRTS2";</div><div class='add'>+						groups = "NRTS2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nrts3_default: nrts3_default {</div><div class='add'>+						function = "NRTS3";</div><div class='add'>+						groups = "NRTS3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_nrts4_default: nrts4_default {</div><div class='add'>+						function = "NRTS4";</div><div class='add'>+						groups = "NRTS4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_oscclk_default: oscclk_default {</div><div class='add'>+						function = "OSCCLK";</div><div class='add'>+						groups = "OSCCLK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pewake_default: pewake_default {</div><div class='add'>+						function = "PEWAKE";</div><div class='add'>+						groups = "PEWAKE";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pnor_default: pnor_default {</div><div class='add'>+						function = "PNOR";</div><div class='add'>+						groups = "PNOR";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm0_default: pwm0_default {</div><div class='add'>+						function = "PWM0";</div><div class='add'>+						groups = "PWM0";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm1_default: pwm1_default {</div><div class='add'>+						function = "PWM1";</div><div class='add'>+						groups = "PWM1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm2_default: pwm2_default {</div><div class='add'>+						function = "PWM2";</div><div class='add'>+						groups = "PWM2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm3_default: pwm3_default {</div><div class='add'>+						function = "PWM3";</div><div class='add'>+						groups = "PWM3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm4_default: pwm4_default {</div><div class='add'>+						function = "PWM4";</div><div class='add'>+						groups = "PWM4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm5_default: pwm5_default {</div><div class='add'>+						function = "PWM5";</div><div class='add'>+						groups = "PWM5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm6_default: pwm6_default {</div><div class='add'>+						function = "PWM6";</div><div class='add'>+						groups = "PWM6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pwm7_default: pwm7_default {</div><div class='add'>+						function = "PWM7";</div><div class='add'>+						groups = "PWM7";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rgmii1_default: rgmii1_default {</div><div class='add'>+						function = "RGMII1";</div><div class='add'>+						groups = "RGMII1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rgmii2_default: rgmii2_default {</div><div class='add'>+						function = "RGMII2";</div><div class='add'>+						groups = "RGMII2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rmii1_default: rmii1_default {</div><div class='add'>+						function = "RMII1";</div><div class='add'>+						groups = "RMII1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rmii2_default: rmii2_default {</div><div class='add'>+						function = "RMII2";</div><div class='add'>+						groups = "RMII2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rxd1_default: rxd1_default {</div><div class='add'>+						function = "RXD1";</div><div class='add'>+						groups = "RXD1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rxd2_default: rxd2_default {</div><div class='add'>+						function = "RXD2";</div><div class='add'>+						groups = "RXD2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rxd3_default: rxd3_default {</div><div class='add'>+						function = "RXD3";</div><div class='add'>+						groups = "RXD3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_rxd4_default: rxd4_default {</div><div class='add'>+						function = "RXD4";</div><div class='add'>+						groups = "RXD4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt1_default: salt1_default {</div><div class='add'>+						function = "SALT1";</div><div class='add'>+						groups = "SALT1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt10_default: salt10_default {</div><div class='add'>+						function = "SALT10";</div><div class='add'>+						groups = "SALT10";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt11_default: salt11_default {</div><div class='add'>+						function = "SALT11";</div><div class='add'>+						groups = "SALT11";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt12_default: salt12_default {</div><div class='add'>+						function = "SALT12";</div><div class='add'>+						groups = "SALT12";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt13_default: salt13_default {</div><div class='add'>+						function = "SALT13";</div><div class='add'>+						groups = "SALT13";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt14_default: salt14_default {</div><div class='add'>+						function = "SALT14";</div><div class='add'>+						groups = "SALT14";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt2_default: salt2_default {</div><div class='add'>+						function = "SALT2";</div><div class='add'>+						groups = "SALT2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt3_default: salt3_default {</div><div class='add'>+						function = "SALT3";</div><div class='add'>+						groups = "SALT3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt4_default: salt4_default {</div><div class='add'>+						function = "SALT4";</div><div class='add'>+						groups = "SALT4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt5_default: salt5_default {</div><div class='add'>+						function = "SALT5";</div><div class='add'>+						groups = "SALT5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt6_default: salt6_default {</div><div class='add'>+						function = "SALT6";</div><div class='add'>+						groups = "SALT6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt7_default: salt7_default {</div><div class='add'>+						function = "SALT7";</div><div class='add'>+						groups = "SALT7";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt8_default: salt8_default {</div><div class='add'>+						function = "SALT8";</div><div class='add'>+						groups = "SALT8";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_salt9_default: salt9_default {</div><div class='add'>+						function = "SALT9";</div><div class='add'>+						groups = "SALT9";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_scl1_default: scl1_default {</div><div class='add'>+						function = "SCL1";</div><div class='add'>+						groups = "SCL1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_scl2_default: scl2_default {</div><div class='add'>+						function = "SCL2";</div><div class='add'>+						groups = "SCL2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sd1_default: sd1_default {</div><div class='add'>+						function = "SD1";</div><div class='add'>+						groups = "SD1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sd2_default: sd2_default {</div><div class='add'>+						function = "SD2";</div><div class='add'>+						groups = "SD2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sda1_default: sda1_default {</div><div class='add'>+						function = "SDA1";</div><div class='add'>+						groups = "SDA1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sda2_default: sda2_default {</div><div class='add'>+						function = "SDA2";</div><div class='add'>+						groups = "SDA2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sgps1_default: sgps1_default {</div><div class='add'>+						function = "SGPS1";</div><div class='add'>+						groups = "SGPS1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sgps2_default: sgps2_default {</div><div class='add'>+						function = "SGPS2";</div><div class='add'>+						groups = "SGPS2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sioonctrl_default: sioonctrl_default {</div><div class='add'>+						function = "SIOONCTRL";</div><div class='add'>+						groups = "SIOONCTRL";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_siopbi_default: siopbi_default {</div><div class='add'>+						function = "SIOPBI";</div><div class='add'>+						groups = "SIOPBI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_siopbo_default: siopbo_default {</div><div class='add'>+						function = "SIOPBO";</div><div class='add'>+						groups = "SIOPBO";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_siopwreq_default: siopwreq_default {</div><div class='add'>+						function = "SIOPWREQ";</div><div class='add'>+						groups = "SIOPWREQ";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_siopwrgd_default: siopwrgd_default {</div><div class='add'>+						function = "SIOPWRGD";</div><div class='add'>+						groups = "SIOPWRGD";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sios3_default: sios3_default {</div><div class='add'>+						function = "SIOS3";</div><div class='add'>+						groups = "SIOS3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sios5_default: sios5_default {</div><div class='add'>+						function = "SIOS5";</div><div class='add'>+						groups = "SIOS5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_siosci_default: siosci_default {</div><div class='add'>+						function = "SIOSCI";</div><div class='add'>+						groups = "SIOSCI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi1_default: spi1_default {</div><div class='add'>+						function = "SPI1";</div><div class='add'>+						groups = "SPI1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi1cs1_default: spi1cs1_default {</div><div class='add'>+						function = "SPI1CS1";</div><div class='add'>+						groups = "SPI1CS1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi1debug_default: spi1debug_default {</div><div class='add'>+						function = "SPI1DEBUG";</div><div class='add'>+						groups = "SPI1DEBUG";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi1passthru_default: spi1passthru_default {</div><div class='add'>+						function = "SPI1PASSTHRU";</div><div class='add'>+						groups = "SPI1PASSTHRU";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi2ck_default: spi2ck_default {</div><div class='add'>+						function = "SPI2CK";</div><div class='add'>+						groups = "SPI2CK";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi2cs0_default: spi2cs0_default {</div><div class='add'>+						function = "SPI2CS0";</div><div class='add'>+						groups = "SPI2CS0";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi2cs1_default: spi2cs1_default {</div><div class='add'>+						function = "SPI2CS1";</div><div class='add'>+						groups = "SPI2CS1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi2miso_default: spi2miso_default {</div><div class='add'>+						function = "SPI2MISO";</div><div class='add'>+						groups = "SPI2MISO";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_spi2mosi_default: spi2mosi_default {</div><div class='add'>+						function = "SPI2MOSI";</div><div class='add'>+						groups = "SPI2MOSI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer3_default: timer3_default {</div><div class='add'>+						function = "TIMER3";</div><div class='add'>+						groups = "TIMER3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer4_default: timer4_default {</div><div class='add'>+						function = "TIMER4";</div><div class='add'>+						groups = "TIMER4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer5_default: timer5_default {</div><div class='add'>+						function = "TIMER5";</div><div class='add'>+						groups = "TIMER5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer6_default: timer6_default {</div><div class='add'>+						function = "TIMER6";</div><div class='add'>+						groups = "TIMER6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer7_default: timer7_default {</div><div class='add'>+						function = "TIMER7";</div><div class='add'>+						groups = "TIMER7";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_timer8_default: timer8_default {</div><div class='add'>+						function = "TIMER8";</div><div class='add'>+						groups = "TIMER8";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_txd1_default: txd1_default {</div><div class='add'>+						function = "TXD1";</div><div class='add'>+						groups = "TXD1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_txd2_default: txd2_default {</div><div class='add'>+						function = "TXD2";</div><div class='add'>+						groups = "TXD2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_txd3_default: txd3_default {</div><div class='add'>+						function = "TXD3";</div><div class='add'>+						groups = "TXD3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_txd4_default: txd4_default {</div><div class='add'>+						function = "TXD4";</div><div class='add'>+						groups = "TXD4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_uart6_default: uart6_default {</div><div class='add'>+						function = "UART6";</div><div class='add'>+						groups = "UART6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_usbcki_default: usbcki_default {</div><div class='add'>+						function = "USBCKI";</div><div class='add'>+						groups = "USBCKI";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vgabiosrom_default: vgabiosrom_default {</div><div class='add'>+						function = "VGABIOSROM";</div><div class='add'>+						groups = "VGABIOSROM";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vgahs_default: vgahs_default {</div><div class='add'>+						function = "VGAHS";</div><div class='add'>+						groups = "VGAHS";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vgavs_default: vgavs_default {</div><div class='add'>+						function = "VGAVS";</div><div class='add'>+						groups = "VGAVS";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vpi24_default: vpi24_default {</div><div class='add'>+						function = "VPI24";</div><div class='add'>+						groups = "VPI24";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_vpo_default: vpo_default {</div><div class='add'>+						function = "VPO";</div><div class='add'>+						groups = "VPO";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_wdtrst1_default: wdtrst1_default {</div><div class='add'>+						function = "WDTRST1";</div><div class='add'>+						groups = "WDTRST1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_wdtrst2_default: wdtrst2_default {</div><div class='add'>+						function = "WDTRST2";</div><div class='add'>+						groups = "WDTRST2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			clk_hpll: clk_hpll@1e6e2024 {</div><div class='ctx'> 				#clock-cells = &lt;0&gt;;</div><div class='ctx'> 				compatible = "aspeed,g5-hpll-clock";</div><div class='hunk'>@@ -71,11 +903,27 @@</div><div class='ctx'> 				reg = &lt;0x1e6e202c 0x4&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			gfx: display@1e6e6000 {</div><div class='add'>+				compatible = "aspeed,ast2500-gfx", "syscon";</div><div class='add'>+				reg = &lt;0x1e6e6000 0x1000&gt;;</div><div class='add'>+				reg-io-width = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			sram@1e720000 {</div><div class='ctx'> 				compatible = "mmio-sram";</div><div class='ctx'> 				reg = &lt;0x1e720000 0x9000&gt;;	// 36K</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			gpio: gpio@1e780000 {</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				gpio-controller;</div><div class='add'>+				compatible = "aspeed,ast2500-gpio";</div><div class='add'>+				reg = &lt;0x1e780000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;20&gt;;</div><div class='add'>+				gpio-ranges = &lt;&amp;pinctrl 0 0 220&gt;;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			timer: timer@1e782000 {</div><div class='ctx'> 				compatible = "aspeed,ast2400-timer";</div><div class='ctx'> 				reg = &lt;0x1e782000 0x90&gt;;</div><div class='hunk'>@@ -86,6 +934,7 @@</div><div class='ctx'> 				clocks = &lt;&amp;clk_apb&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 			wdt1: wdt@1e785000 {</div><div class='ctx'> 				compatible = "aspeed,wdt";</div><div class='ctx'> 				reg = &lt;0x1e785000 0x1c&gt;;</div><div class='hunk'>@@ -115,6 +964,36 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			lpc: lpc@1e789000 {</div><div class='add'>+				compatible = "aspeed,ast2500-lpc", "simple-mfd";</div><div class='add'>+				reg = &lt;0x1e789000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='add'>+				ranges = &lt;0 0x1e789000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+				lpc_bmc: lpc-bmc@0 {</div><div class='add'>+					compatible = "aspeed,ast2500-lpc-bmc";</div><div class='add'>+					reg = &lt;0x0 0x80&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				lpc_host: lpc-host@80 {</div><div class='add'>+					compatible = "aspeed,ast2500-lpc-host", "simple-mfd", "syscon";</div><div class='add'>+					reg = &lt;0x80 0x1e0&gt;;</div><div class='add'>+</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;1&gt;;</div><div class='add'>+					ranges = &lt;0 0x80 0x1e0&gt;;</div><div class='add'>+</div><div class='add'>+					reg-io-width = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+					lhc: lhc@20 {</div><div class='add'>+						compatible = "aspeed,ast2500-lhc";</div><div class='add'>+						reg = &lt;0x20 0x24 0x48 0x8&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			uart2: serial@1e78d000 {</div><div class='ctx'> 				compatible = "ns16550a";</div><div class='ctx'> 				reg = &lt;0x1e78d000 0x1000&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/at91-linea.dtsi b/arch/arm/boot/dts/at91-linea.dtsi<br/>new file mode 100644<br/>index 000000000000..0721c8472509<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91-linea.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-linea.dtsi</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+/*</div><div class='add'>+ * at91-linea.dtsi - Device Tree Include file for the Axentia Linea Module.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Axentia Technologies AB</div><div class='add'>+ *</div><div class='add'>+ * Author: Peter Rosin &lt;peda@axentia.se&gt;</div><div class='add'>+ *</div><div class='add'>+ * Licensed under GPLv2 or later.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "sama5d31.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "axentia,linea",</div><div class='add'>+		     "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x20000000 0x4000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;slow_xtal {</div><div class='add'>+	clock-frequency = &lt;32768&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;main_xtal {</div><div class='add'>+	clock-frequency = &lt;12000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	eeprom@51 {</div><div class='add'>+		compatible = "st,24c64";</div><div class='add'>+		reg = &lt;0x51&gt;;</div><div class='add'>+		pagesize = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;nand0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	nand-bus-width = &lt;8&gt;;</div><div class='add'>+	nand-ecc-mode = "hw";</div><div class='add'>+	atmel,has-pmecc;</div><div class='add'>+	atmel,pmecc-cap = &lt;4&gt;;</div><div class='add'>+	atmel,pmecc-sector-size = &lt;512&gt;;</div><div class='add'>+	nand-on-flash-bbt;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts<br/>index 0b9a59d5fdac..9f7f8a7d8ff9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91-sama5d2_xplained.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91-sama5d2_xplained.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91-sama5d2_xplained.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-sama5d2_xplained.dts</a></div><div class='hunk'>@@ -148,6 +148,8 @@</div><div class='ctx'> 			uart1: serial@f8020000 {</div><div class='ctx'> 				pinctrl-names = "default";</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;pinctrl_uart1_default&gt;;</div><div class='add'>+				atmel,use-dma-rx;</div><div class='add'>+				atmel,use-dma-tx;</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -256,6 +258,8 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart3: serial@fc008000 {</div><div class='add'>+				atmel,use-dma-rx;</div><div class='add'>+				atmel,use-dma-tx;</div><div class='ctx'> 				pinctrl-names = "default";</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;pinctrl_uart3_default&gt;;</div><div class='ctx'> 				status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi<br/>index a92c6e0ca854..b5a5a91bc2ef 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi</a></div><div class='hunk'>@@ -12,8 +12,8 @@</div><div class='ctx'> #include "sama5d4.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	model = "DENX MA5D4";</div><div class='del'>-	compatible = "denx,ma5d4", "atmel,sama5d4", "atmel,sama5";</div><div class='add'>+	model = "Aries/DENX MA5D4";</div><div class='add'>+	compatible = "aries,ma5d4", "denx,ma5d4", "atmel,sama5d4", "atmel,sama5";</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='ctx'> 		reg = &lt;0x20000000 0x10000000&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts b/arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts<br/>index eac4ea2744cc..84be29f38dae 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts</a></div><div class='hunk'>@@ -13,8 +13,8 @@</div><div class='ctx'> #include "at91-sama5d4_ma5d4.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	model = "DENX MA5D4EVK";</div><div class='del'>-	compatible = "denx,ma5d4evk", "atmel,sama5d4", "atmel,sama5";</div><div class='add'>+	model = "Aries/DENX MA5D4EVK";</div><div class='add'>+	compatible = "aries,ma5d4evk", "denx,ma5d4evk", "atmel,sama5d4", "atmel,sama5";</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='ctx'> 		stdout-path = "serial3:115200n8";</div><div class='head'>diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts<br/>index ed7fce297738..5ab14cedb1db 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91-sama5d4_xplained.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91-sama5d4_xplained.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91-sama5d4_xplained.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-sama5d4_xplained.dts</a></div><div class='hunk'>@@ -69,6 +69,12 @@</div><div class='ctx'> </div><div class='ctx'> 	ahb {</div><div class='ctx'> 		apb {</div><div class='add'>+			uart0: serial@f8004000 {</div><div class='add'>+				atmel,use-dma-rx;</div><div class='add'>+				atmel,use-dma-tx;</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			spi0: spi@f8010000 {</div><div class='ctx'> 				cs-gpios = &lt;&amp;pioC 3 0&gt;, &lt;0&gt;, &lt;0&gt;, &lt;0&gt;;</div><div class='ctx'> 				status = "okay";</div><div class='hunk'>@@ -110,6 +116,8 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			usart3: serial@fc00c000 {</div><div class='add'>+				atmel,use-dma-rx;</div><div class='add'>+				atmel,use-dma-tx;</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/at91-tse850-3.dts b/arch/arm/boot/dts/at91-tse850-3.dts<br/>new file mode 100644<br/>index 000000000000..669a2c6bdefc<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91-tse850-3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91-tse850-3.dts</a></div><div class='hunk'>@@ -0,0 +1,274 @@</div><div class='add'>+/*</div><div class='add'>+ * at91-tse850-3.dts - Device Tree file for the Axentia TSE-850 3.0 board</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Axentia Technologies AB</div><div class='add'>+ *</div><div class='add'>+ * Author: Peter Rosin &lt;peda@axentia.se&gt;</div><div class='add'>+ *</div><div class='add'>+ * Licensed under GPLv2 or later.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include &lt;dt-bindings/pwm/pwm.h&gt;</div><div class='add'>+#include "at91-linea.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Axentia TSE-850 3.0";</div><div class='add'>+	compatible = "axentia,tse850v3", "axentia,linea",</div><div class='add'>+		     "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";</div><div class='add'>+</div><div class='add'>+	ahb {</div><div class='add'>+		apb {</div><div class='add'>+			pinctrl@fffff200 {</div><div class='add'>+				tse850 {</div><div class='add'>+					pinctrl_usba_vbus: usba-vbus {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOC 31</div><div class='add'>+							 AT91_PERIPH_GPIO</div><div class='add'>+							 AT91_PINCTRL_DEGLITCH&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			watchdog@fffffe40 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sck: oscillator {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;16000000&gt;;</div><div class='add'>+		clock-output-names = "sck";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3v3: regulator {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+</div><div class='add'>+		regulator-name = "3v3-supply";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ana: reg-ana {</div><div class='add'>+		compatible = "pwm-regulator";</div><div class='add'>+</div><div class='add'>+		regulator-name = "ANA";</div><div class='add'>+</div><div class='add'>+		pwms = &lt;&amp;pwm0 2 1000 PWM_POLARITY_INVERTED&gt;;</div><div class='add'>+		pwm-dutycycle-unit = &lt;1000&gt;;</div><div class='add'>+		pwm-dutycycle-range = &lt;100 1000&gt;;</div><div class='add'>+</div><div class='add'>+		regulator-min-microvolt = &lt;2000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;20000000&gt;;</div><div class='add'>+		regulator-ramp-delay = &lt;1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "axentia,tse850-pcm5142";</div><div class='add'>+</div><div class='add'>+		axentia,cpu-dai = &lt;&amp;ssc0&gt;;</div><div class='add'>+		axentia,audio-codec = &lt;&amp;pcm5142&gt;;</div><div class='add'>+</div><div class='add'>+		axentia,add-gpios = &lt;&amp;pioA 8 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		axentia,loop1-gpios = &lt;&amp;pioA 10 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		axentia,loop2-gpios = &lt;&amp;pioA 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+</div><div class='add'>+		axentia,ana-supply = &lt;&amp;ana&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dac: dpot-dac {</div><div class='add'>+		compatible = "dpot-dac";</div><div class='add'>+		vref-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+		io-channels = &lt;&amp;dpot 0&gt;;</div><div class='add'>+		io-channel-names = "dpot";</div><div class='add'>+		#io-channel-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	envelope-detector {</div><div class='add'>+		compatible = "axentia,tse850-envelope-detector";</div><div class='add'>+		io-channels = &lt;&amp;dac 0&gt;;</div><div class='add'>+		io-channel-names = "dac";</div><div class='add'>+</div><div class='add'>+		interrupt-parent = &lt;&amp;pioA&gt;;</div><div class='add'>+		interrupts = &lt;3 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		interrupt-names = "comp";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		ch1-red {</div><div class='add'>+			label = "ch-1:red";</div><div class='add'>+			gpios = &lt;&amp;pioA 23 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+		ch1-green {</div><div class='add'>+			label = "ch-1:green";</div><div class='add'>+			gpios = &lt;&amp;pioA 22 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+		ch2-red {</div><div class='add'>+			label = "ch-2:red";</div><div class='add'>+			gpios = &lt;&amp;pioA 21 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+		ch2-green {</div><div class='add'>+			label = "ch-2:green";</div><div class='add'>+			gpios = &lt;&amp;pioA 20 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+		data-red {</div><div class='add'>+			label = "data:red";</div><div class='add'>+			gpios = &lt;&amp;pioA 19 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+		data-green {</div><div class='add'>+			label = "data:green";</div><div class='add'>+			gpios = &lt;&amp;pioA 18 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+		alarm-red {</div><div class='add'>+			label = "alarm:red";</div><div class='add'>+			gpios = &lt;&amp;pioA 17 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+		alarm-green {</div><div class='add'>+			label = "alarm:green";</div><div class='add'>+			gpios = &lt;&amp;pioA 16 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;nand0 {</div><div class='add'>+	at91bootstrap@0 {</div><div class='add'>+		label = "at91bootstrap";</div><div class='add'>+		reg = &lt;0x0 0x40000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	barebox@40000 {</div><div class='add'>+		label = "bootloader";</div><div class='add'>+		reg = &lt;0x40000 0x60000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bareboxenv@c0000 {</div><div class='add'>+		label = "bareboxenv";</div><div class='add'>+		reg = &lt;0xc0000 0x40000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bareboxenv2@100000 {</div><div class='add'>+		label = "bareboxenv2";</div><div class='add'>+		reg = &lt;0x100000 0x40000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	oftree@180000 {</div><div class='add'>+		label = "oftree";</div><div class='add'>+		reg = &lt;0x180000 0x20000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	kernel@200000 {</div><div class='add'>+		label = "kernel";</div><div class='add'>+		reg = &lt;0x200000 0x500000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rootfs@800000 {</div><div class='add'>+		label = "rootfs";</div><div class='add'>+		reg = &lt;0x800000 0x0f800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ovlfs@10000000 {</div><div class='add'>+		label = "ovlfs";</div><div class='add'>+		reg = &lt;0x10000000 0x10000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ssc0 {</div><div class='add'>+	#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	jc42@18 {</div><div class='add'>+		compatible = "nxp,se97b", "jedec,jc-42.4-temp";</div><div class='add'>+		reg = &lt;0x18&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dpot: mcp4651-104@28 {</div><div class='add'>+		compatible = "microchip,mcp4651-104";</div><div class='add'>+		reg = &lt;0x28&gt;;</div><div class='add'>+		#io-channel-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pcm5142: pcm5142@4c {</div><div class='add'>+		compatible = "ti,pcm5142";</div><div class='add'>+</div><div class='add'>+		reg = &lt;0x4c&gt;;</div><div class='add'>+</div><div class='add'>+		AVDD-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+		DVDD-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+		CPVDD-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;sck&gt;;</div><div class='add'>+</div><div class='add'>+		pll-in = &lt;3&gt;;</div><div class='add'>+		pll-out = &lt;6&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	eeprom@50 {</div><div class='add'>+		compatible = "nxp,24c02";</div><div class='add'>+		reg = &lt;0x50&gt;;</div><div class='add'>+		pagesize = &lt;16&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	atmel,use-dma-rx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pwm0_pwml2_1&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;macb1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	phy-mode = "rgmii";</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	phy0: ethernet-phy@3 {</div><div class='add'>+		reg = &lt;3&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-parent = &lt;&amp;pioE&gt;;</div><div class='add'>+		interrupts = &lt;31 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usba_vbus&gt;;</div><div class='add'>+	atmel,vbus-gpio = &lt;&amp;pioC 31 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	num-ports = &lt;1&gt;;</div><div class='add'>+	atmel,vbus-gpio = &lt;&amp;pioD 29 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	atmel,oc-gpio = &lt;&amp;pioC 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dbgu {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	dmas = &lt;0&gt;, &lt;0&gt;;	/*  Do not use DMA for dbgu */</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi<br/>index 4e913c2ccb79..f057e0b15a6f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91rm9200.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91rm9200.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91rm9200.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91rm9200.dtsi</a></div><div class='hunk'>@@ -481,8 +481,8 @@</div><div class='ctx'> 				dbgu {</div><div class='ctx'> 					pinctrl_dbgu: dbgu-0 {</div><div class='ctx'> 						atmel,pins =</div><div class='del'>-							&lt;AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA30 periph A */</div><div class='del'>-							 AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP&gt;;	/* PA31 periph with pullup */</div><div class='add'>+							&lt;AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP</div><div class='add'>+							 AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi<br/>index a3e363d79122..9e035b21e1b6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9260.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91sam9260.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9260.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9260.dtsi</a></div><div class='hunk'>@@ -412,8 +412,8 @@</div><div class='ctx'> 				dbgu {</div><div class='ctx'> 					pinctrl_dbgu: dbgu-0 {</div><div class='ctx'> 						atmel,pins =</div><div class='del'>-							&lt;AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB14 periph A */</div><div class='del'>-							 AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP&gt;;	/* PB15 periph with pullup */</div><div class='add'>+							&lt;AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP</div><div class='add'>+							 AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/at91sam9260ek.dts b/arch/arm/boot/dts/at91sam9260ek.dts<br/>index 2c87f58448e7..b2578feceb08 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9260ek.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91sam9260ek.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9260ek.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9260ek.dts</a></div><div class='hunk'>@@ -174,14 +174,14 @@</div><div class='ctx'> 			label = "Button 3";</div><div class='ctx'> 			gpios = &lt;&amp;pioA 30 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			linux,code = &lt;0x103&gt;;</div><div class='del'>-			gpio-key,wakeup;</div><div class='add'>+			wakeup-source;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		btn4 {</div><div class='ctx'> 			label = "Button 4";</div><div class='ctx'> 			gpios = &lt;&amp;pioA 31 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			linux,code = &lt;0x104&gt;;</div><div class='del'>-			gpio-key,wakeup;</div><div class='add'>+			wakeup-source;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi<br/>index 32752d7883f1..3fe77c38bd0d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9261.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91sam9261.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9261.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9261.dtsi</a></div><div class='hunk'>@@ -302,8 +302,8 @@</div><div class='ctx'> 				dbgu {</div><div class='ctx'> 					pinctrl_dbgu: dbgu-0 {</div><div class='ctx'> 						atmel,pins =</div><div class='del'>-							&lt;AT91_PIOA 9  AT91_PERIPH_A AT91_PINCTRL_NONE&gt;,</div><div class='del'>-							&lt;AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP&gt;;</div><div class='add'>+							&lt;AT91_PIOA 9  AT91_PERIPH_A AT91_PINCTRL_PULL_UP&gt;,</div><div class='add'>+							&lt;AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi<br/>index aeb1a36373f4..a1888f6d892b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9263.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91sam9263.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9263.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9263.dtsi</a></div><div class='hunk'>@@ -412,8 +412,8 @@</div><div class='ctx'> 				dbgu {</div><div class='ctx'> 					pinctrl_dbgu: dbgu-0 {</div><div class='ctx'> 						atmel,pins =</div><div class='del'>-							&lt;AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC30 periph A */</div><div class='del'>-							 AT91_PIOC 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP&gt;;	/* PC31 periph with pullup */</div><div class='add'>+							&lt;AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP</div><div class='add'>+							 AT91_PIOC 31 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi<br/>index b3501ae2a3bd..e567d5fd3f9d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9g45.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91sam9g45.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9g45.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9g45.dtsi</a></div><div class='hunk'>@@ -478,8 +478,8 @@</div><div class='ctx'> 				dbgu {</div><div class='ctx'> 					pinctrl_dbgu: dbgu-0 {</div><div class='ctx'> 						atmel,pins =</div><div class='del'>-							&lt;AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB12 periph A */</div><div class='del'>-							 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;;	/* PB13 periph A */</div><div class='add'>+							&lt;AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP</div><div class='add'>+							 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi<br/>index 3b3eb3edcb47..f43d7695352d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9n12.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91sam9n12.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9n12.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9n12.dtsi</a></div><div class='hunk'>@@ -500,8 +500,8 @@</div><div class='ctx'> 				dbgu {</div><div class='ctx'> 					pinctrl_dbgu: dbgu-0 {</div><div class='ctx'> 						atmel,pins =</div><div class='del'>-							&lt;AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA9 periph A */</div><div class='del'>-							 AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP&gt;;	/* PA10 periph with pullup */</div><div class='add'>+							&lt;AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP</div><div class='add'>+							 AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi<br/>index 70adf940d98c..f4c129a98f17 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9rl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91sam9rl.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9rl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9rl.dtsi</a></div><div class='hunk'>@@ -438,8 +438,8 @@</div><div class='ctx'> 				dbgu {</div><div class='ctx'> 					pinctrl_dbgu: dbgu-0 {</div><div class='ctx'> 						atmel,pins =</div><div class='del'>-							&lt;AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;,</div><div class='del'>-							&lt;AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP&gt;;</div><div class='add'>+							&lt;AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP&gt;,</div><div class='add'>+							&lt;AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi<br/>index ed4e4bd8a8f1..f66bae925705 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9x5.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/at91sam9x5.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/at91sam9x5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/at91sam9x5.dtsi</a></div><div class='hunk'>@@ -460,8 +460,8 @@</div><div class='ctx'> 				dbgu {</div><div class='ctx'> 					pinctrl_dbgu: dbgu-0 {</div><div class='ctx'> 						atmel,pins =</div><div class='del'>-							&lt;AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA9 periph A */</div><div class='del'>-							 AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP&gt;;	/* PA10 periph A with pullup */</div><div class='add'>+							&lt;AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP</div><div class='add'>+							 AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi<br/>index a9d6d593fc8a..47799f59faa5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/axm55xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/axm55xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/axm55xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/axm55xx.dtsi</a></div><div class='hunk'>@@ -62,7 +62,7 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0x20 0x01001000 0 0x1000&gt;,</div><div class='del'>-		      &lt;0x20 0x01002000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0x20 0x01002000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x20 0x01004000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x20 0x01006000 0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |</div><div class='head'>diff --git a/arch/arm/boot/dts/axp223.dtsi b/arch/arm/boot/dts/axp223.dtsi<br/>new file mode 100644<br/>index 000000000000..b91b6c1278c7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/axp223.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/axp223.dtsi</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Free Electrons</div><div class='add'>+ *</div><div class='add'>+ * Quentin Schulz &lt;quentin.schulz@free-electrons.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AXP223 Integrated Power Management Chip</div><div class='add'>+ * http://www.x-powers.com/product/AXP22X.php</div><div class='add'>+ * http://dl.linux-sunxi.org/AXP/AXP223-en.pdf</div><div class='add'>+ *</div><div class='add'>+ * The AXP223 shares most of its logic with the AXP221 but it has some</div><div class='add'>+ * differences, for the VBUS driver for example.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "axp22x.dtsi"</div><div class='add'>+</div><div class='add'>+&amp;usb_power_supply {</div><div class='add'>+	compatible = "x-powers,axp223-usb-power-supply";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi<br/>index fabc9f36c408..8833a4c3cd96 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm-cygnus.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm-cygnus.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm-cygnus.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm-cygnus.dtsi</a></div><div class='hunk'>@@ -91,6 +91,13 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='add'>+		otp: otp@0301c800 {</div><div class='add'>+			compatible = "brcm,ocotp";</div><div class='add'>+			reg = &lt;0x0301c800 0x2c&gt;;</div><div class='add'>+			brcm,ocotp-size = &lt;2048&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pcie_phy: phy@0301d0a0 {</div><div class='ctx'> 			compatible = "brcm,cygnus-pcie-phy";</div><div class='ctx'> 			reg = &lt;0x0301d0a0 0x14&gt;;</div><div class='hunk'>@@ -108,12 +115,21 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pinctrl: pinctrl@0x0301d0c8 {</div><div class='add'>+		pinctrl: pinctrl@0301d0c8 {</div><div class='ctx'> 			compatible = "brcm,cygnus-pinmux";</div><div class='ctx'> 			reg = &lt;0x0301d0c8 0x30&gt;,</div><div class='ctx'> 			      &lt;0x0301d24c 0x2c&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		mailbox: mailbox@03024024 {</div><div class='add'>+			compatible = "brcm,iproc-mailbox";</div><div class='add'>+			reg = &lt;0x03024024 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#mbox-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		gpio_crmu: gpio@03024800 {</div><div class='ctx'> 			compatible = "brcm,cygnus-crmu-gpio";</div><div class='ctx'> 			reg = &lt;0x03024800 0x50&gt;,</div><div class='hunk'>@@ -121,6 +137,9 @@</div><div class='ctx'> 			ngpios = &lt;6&gt;;</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			interrupt-parent = &lt;&amp;mailbox&gt;;</div><div class='add'>+			interrupts = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c0: i2c@18008000 {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi<br/>index 7c9e0fae9bb9..832795b0fd0f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm-nsp.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm-nsp.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm-nsp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm-nsp.dtsi</a></div><div class='hunk'>@@ -160,7 +160,7 @@</div><div class='ctx'> </div><div class='ctx'> 	axi {</div><div class='ctx'> 		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x00000000 0x18000000 0x0011ba08&gt;;</div><div class='add'>+		ranges = &lt;0x00000000 0x18000000 0x0011c40c&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -209,6 +209,15 @@</div><div class='ctx'> 			#dma-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		sdio: sdhci@21000 {</div><div class='add'>+			compatible = "brcm,sdhci-iproc-cygnus";</div><div class='add'>+			reg = &lt;0x21000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			sdhci,auto-cmd12;</div><div class='add'>+			clocks = &lt;&amp;lcpll0 BCM_NSP_LCPLL0_SDIO_CLK&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		amac0: ethernet@22000 {</div><div class='ctx'> 			compatible = "brcm,nsp-amac";</div><div class='ctx'> 			reg = &lt;0x022000 0x1000&gt;,</div><div class='hunk'>@@ -227,6 +236,15 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		amac2: ethernet@24000 {</div><div class='add'>+			compatible = "brcm,nsp-amac";</div><div class='add'>+			reg = &lt;0x024000 0x1000&gt;,</div><div class='add'>+			      &lt;0x112000 0x1000&gt;;</div><div class='add'>+			reg-names = "amac_base", "idm_base";</div><div class='add'>+			interrupts = &lt;GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		nand: nand@26000 {</div><div class='ctx'> 			compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";</div><div class='ctx'> 			reg = &lt;0x026000 0x600&gt;,</div><div class='hunk'>@@ -241,6 +259,45 @@</div><div class='ctx'> 			brcm,nand-has-wp;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		qspi: qspi@27200 {</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";</div><div class='add'>+			reg = &lt;0x027200 0x184&gt;,</div><div class='add'>+			      &lt;0x027000 0x124&gt;,</div><div class='add'>+			      &lt;0x11c408 0x004&gt;,</div><div class='add'>+			      &lt;0x0273a0 0x01c&gt;;</div><div class='add'>+			reg-names = "mspi", "bspi", "intr_regs",</div><div class='add'>+				    "intr_status_reg";</div><div class='add'>+			interrupts = &lt;GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "spi_lr_fullness_reached",</div><div class='add'>+					  "spi_lr_session_aborted",</div><div class='add'>+					  "spi_lr_impatient",</div><div class='add'>+					  "spi_lr_session_done",</div><div class='add'>+					  "spi_lr_overhead",</div><div class='add'>+					  "mspi_done",</div><div class='add'>+					  "mspi_halted";</div><div class='add'>+			clocks = &lt;&amp;iprocmed&gt;;</div><div class='add'>+			clock-names = "iprocmed";</div><div class='add'>+			num-cs = &lt;2&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpiob: gpio@30000 {</div><div class='add'>+			compatible = "brcm,iproc-nsp-gpio", "brcm,iproc-gpio";</div><div class='add'>+			reg = &lt;0x30000 0x50&gt;;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			gpio-controller;</div><div class='add'>+			ngpios = &lt;4&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			interrupts = &lt;GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pwm: pwm@31000 {</div><div class='ctx'> 			compatible = "brcm,iproc-pwm";</div><div class='ctx'> 			reg = &lt;0x31000 0x28&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts<br/>index f7f9db355d98..d0704540db6b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm2835-rpi-a-plus.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-a-plus.dts</a></div><div class='hunk'>@@ -22,7 +22,72 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;gpio {</div><div class='del'>-	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt0 &amp;alt3&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * This is based on the unreleased schematic for the Model A+.</div><div class='add'>+	 *</div><div class='add'>+	 * Legend:</div><div class='add'>+	 * "NC" = not connected (no rail from the SoC)</div><div class='add'>+	 * "FOO" = GPIO line named "FOO" on the schematic</div><div class='add'>+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low</div><div class='add'>+	 */</div><div class='add'>+	gpio-line-names = "SDA0",</div><div class='add'>+			  "SCL0",</div><div class='add'>+			  "SDA1",</div><div class='add'>+			  "SCL1",</div><div class='add'>+			  "GPIO_GCLK",</div><div class='add'>+			  "GPIO5",</div><div class='add'>+			  "GPIO6",</div><div class='add'>+			  "SPI_CE1_N",</div><div class='add'>+			  "SPI_CE0_N",</div><div class='add'>+			  "SPI_MISO",</div><div class='add'>+			  "SPI_MOSI",</div><div class='add'>+			  "SPI_SCLK",</div><div class='add'>+			  "GPIO12",</div><div class='add'>+			  "GPIO13",</div><div class='add'>+			  /* Serial port */</div><div class='add'>+			  "TXD0",</div><div class='add'>+			  "RXD0",</div><div class='add'>+			  "GPIO16",</div><div class='add'>+			  "GPIO17",</div><div class='add'>+			  "GPIO18",</div><div class='add'>+			  "GPIO19",</div><div class='add'>+			  "GPIO20",</div><div class='add'>+			  "GPIO21",</div><div class='add'>+			  "GPIO22",</div><div class='add'>+			  "GPIO23",</div><div class='add'>+			  "GPIO24",</div><div class='add'>+			  "GPIO25",</div><div class='add'>+			  "GPIO26",</div><div class='add'>+			  "GPIO27",</div><div class='add'>+			  "SDA0",</div><div class='add'>+			  "SCL0",</div><div class='add'>+			  "NC", /* GPIO30 */</div><div class='add'>+			  "NC", /* GPIO31 */</div><div class='add'>+			  "CAM_GPIO1", /* GPIO32 */</div><div class='add'>+			  "NC", /* GPIO33 */</div><div class='add'>+			  "NC", /* GPIO34 */</div><div class='add'>+			  "PWR_LOW_N", /* GPIO35 */</div><div class='add'>+			  "NC", /* GPIO36 */</div><div class='add'>+			  "NC", /* GPIO37 */</div><div class='add'>+			  "USB_LIMIT", /* GPIO38 */</div><div class='add'>+			  "NC", /* GPIO39 */</div><div class='add'>+			  "PWM0_OUT", /* GPIO40 */</div><div class='add'>+			  "CAM_GPIO0", /* GPIO41 */</div><div class='add'>+			  "NC", /* GPIO42 */</div><div class='add'>+			  "NC", /* GPIO43 */</div><div class='add'>+			  "NC", /* GPIO44 */</div><div class='add'>+			  "PWM1_OUT", /* GPIO45 */</div><div class='add'>+			  "HDMI_HPD_N",</div><div class='add'>+			  "STATUS_LED",</div><div class='add'>+			  /* Used by SD Card */</div><div class='add'>+			  "SD_CLK_R",</div><div class='add'>+			  "SD_CMD_R",</div><div class='add'>+			  "SD_DATA0_R",</div><div class='add'>+			  "SD_DATA1_R",</div><div class='add'>+			  "SD_DATA2_R",</div><div class='add'>+			  "SD_DATA3_R";</div><div class='add'>+</div><div class='add'>+	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt0&gt;;</div><div class='ctx'> </div><div class='ctx'> 	/* I2S interface */</div><div class='ctx'> 	i2s_alt0: i2s_alt0 {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts<br/>index 8be102f5d826..46d078e29017 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-a.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm2835-rpi-a.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-a.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-a.dts</a></div><div class='hunk'>@@ -15,7 +15,74 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;gpio {</div><div class='del'>-	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt2 &amp;alt3&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * Taken from Raspberry-Pi-Rev-1.0-Model-AB-Schematics.pdf</div><div class='add'>+	 * RPI00021 sheet 02</div><div class='add'>+	 *</div><div class='add'>+	 * Legend:</div><div class='add'>+	 * "NC" = not connected (no rail from the SoC)</div><div class='add'>+	 * "FOO" = GPIO line named "FOO" on the schematic</div><div class='add'>+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low</div><div class='add'>+	 */</div><div class='add'>+	gpio-line-names = "SDA0",</div><div class='add'>+			  "SCL0",</div><div class='add'>+			  "SDA1",</div><div class='add'>+			  "SCL1",</div><div class='add'>+			  "GPIO_GCLK",</div><div class='add'>+			  "CAM_GPIO1",</div><div class='add'>+			  "LAN_RUN",</div><div class='add'>+			  "SPI_CE1_N",</div><div class='add'>+			  "SPI_CE0_N",</div><div class='add'>+			  "SPI_MISO",</div><div class='add'>+			  "SPI_MOSI",</div><div class='add'>+			  "SPI_SCLK",</div><div class='add'>+			  "NC", /* GPIO12 */</div><div class='add'>+			  "NC", /* GPIO13 */</div><div class='add'>+			  /* Serial port */</div><div class='add'>+			  "TXD0",</div><div class='add'>+			  "RXD0",</div><div class='add'>+			  "STATUS_LED_N",</div><div class='add'>+			  "GPIO17",</div><div class='add'>+			  "GPIO18",</div><div class='add'>+			  "NC", /* GPIO19 */</div><div class='add'>+			  "NC", /* GPIO20 */</div><div class='add'>+			  "GPIO21",</div><div class='add'>+			  "GPIO22",</div><div class='add'>+			  "GPIO23",</div><div class='add'>+			  "GPIO24",</div><div class='add'>+			  "GPIO25",</div><div class='add'>+			  "NC", /* GPIO26 */</div><div class='add'>+			  "CAM_GPIO0",</div><div class='add'>+			  /* Binary number representing build/revision */</div><div class='add'>+			  "CONFIG0",</div><div class='add'>+			  "CONFIG1",</div><div class='add'>+			  "CONFIG2",</div><div class='add'>+			  "CONFIG3",</div><div class='add'>+			  "NC", /* GPIO32 */</div><div class='add'>+			  "NC", /* GPIO33 */</div><div class='add'>+			  "NC", /* GPIO34 */</div><div class='add'>+			  "NC", /* GPIO35 */</div><div class='add'>+			  "NC", /* GPIO36 */</div><div class='add'>+			  "NC", /* GPIO37 */</div><div class='add'>+			  "NC", /* GPIO38 */</div><div class='add'>+			  "NC", /* GPIO39 */</div><div class='add'>+			  "PWM0_OUT",</div><div class='add'>+			  "NC", /* GPIO41 */</div><div class='add'>+			  "NC", /* GPIO42 */</div><div class='add'>+			  "NC", /* GPIO43 */</div><div class='add'>+			  "NC", /* GPIO44 */</div><div class='add'>+			  "PWM1_OUT",</div><div class='add'>+			  "HDMI_HPD_P",</div><div class='add'>+			  "SD_CARD_DET",</div><div class='add'>+			  /* Used by SD Card */</div><div class='add'>+			  "SD_CLK_R",</div><div class='add'>+			  "SD_CMD_R",</div><div class='add'>+			  "SD_DATA0_R",</div><div class='add'>+			  "SD_DATA1_R",</div><div class='add'>+			  "SD_DATA2_R",</div><div class='add'>+			  "SD_DATA3_R";</div><div class='add'>+</div><div class='add'>+	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt2&gt;;</div><div class='ctx'> </div><div class='ctx'> 	/* I2S interface */</div><div class='ctx'> 	i2s_alt2: i2s_alt2 {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts<br/>index 35cde65c975e..432088ebb0a1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm2835-rpi-b-plus.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-b-plus.dts</a></div><div class='hunk'>@@ -23,7 +23,73 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;gpio {</div><div class='del'>-	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt0 &amp;alt3&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * Taken from Raspberry-Pi-B-Plus-V1.2-Schematics.pdf</div><div class='add'>+	 * RPI-BPLUS sheet 1</div><div class='add'>+	 *</div><div class='add'>+	 * Legend:</div><div class='add'>+	 * "NC" = not connected (no rail from the SoC)</div><div class='add'>+	 * "FOO" = GPIO line named "FOO" on the schematic</div><div class='add'>+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low</div><div class='add'>+	 */</div><div class='add'>+	gpio-line-names = "SDA0",</div><div class='add'>+			  "SCL0",</div><div class='add'>+			  "SDA1",</div><div class='add'>+			  "SCL1",</div><div class='add'>+			  "GPIO_GCLK",</div><div class='add'>+			  "GPIO5",</div><div class='add'>+			  "GPIO6",</div><div class='add'>+			  "SPI_CE1_N",</div><div class='add'>+			  "SPI_CE0_N",</div><div class='add'>+			  "SPI_MISO",</div><div class='add'>+			  "SPI_MOSI",</div><div class='add'>+			  "SPI_SCLK",</div><div class='add'>+			  "GPIO12",</div><div class='add'>+			  "GPIO13",</div><div class='add'>+			  /* Serial port */</div><div class='add'>+			  "TXD0",</div><div class='add'>+			  "RXD0",</div><div class='add'>+			  "GPIO16",</div><div class='add'>+			  "GPIO17",</div><div class='add'>+			  "GPIO18",</div><div class='add'>+			  "GPIO19",</div><div class='add'>+			  "GPIO20",</div><div class='add'>+			  "GPIO21",</div><div class='add'>+			  "GPIO22",</div><div class='add'>+			  "GPIO23",</div><div class='add'>+			  "GPIO24",</div><div class='add'>+			  "GPIO25",</div><div class='add'>+			  "GPIO26",</div><div class='add'>+			  "GPIO27",</div><div class='add'>+			  "SDA0",</div><div class='add'>+			  "SCL0",</div><div class='add'>+			  "NC", /* GPIO30 */</div><div class='add'>+			  "LAN_RUN", /* GPIO31 */</div><div class='add'>+			  "CAM_GPIO1", /* GPIO32 */</div><div class='add'>+			  "NC", /* GPIO33 */</div><div class='add'>+			  "NC", /* GPIO34 */</div><div class='add'>+			  "PWR_LOW_N", /* GPIO35 */</div><div class='add'>+			  "NC", /* GPIO36 */</div><div class='add'>+			  "NC", /* GPIO37 */</div><div class='add'>+			  "USB_LIMIT", /* GPIO38 */</div><div class='add'>+			  "NC", /* GPIO39 */</div><div class='add'>+			  "PWM0_OUT", /* GPIO40 */</div><div class='add'>+			  "CAM_GPIO0", /* GPIO41 */</div><div class='add'>+			  "NC", /* GPIO42 */</div><div class='add'>+			  "NC", /* GPIO43 */</div><div class='add'>+			  "ETHCLK", /* GPIO44 */</div><div class='add'>+			  "PWM1_OUT", /* GPIO45 */</div><div class='add'>+			  "HDMI_HPD_N",</div><div class='add'>+			  "STATUS_LED",</div><div class='add'>+			  /* Used by SD Card */</div><div class='add'>+			  "SD_CLK_R",</div><div class='add'>+			  "SD_CMD_R",</div><div class='add'>+			  "SD_DATA0_R",</div><div class='add'>+			  "SD_DATA1_R",</div><div class='add'>+			  "SD_DATA2_R",</div><div class='add'>+			  "SD_DATA3_R";</div><div class='add'>+</div><div class='add'>+	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt0&gt;;</div><div class='ctx'> </div><div class='ctx'> 	/* I2S interface */</div><div class='ctx'> 	i2s_alt0: i2s_alt0 {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts<br/>index 84df85ea6296..4133bc2cd9be 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts</a></div><div class='hunk'>@@ -16,7 +16,73 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;gpio {</div><div class='del'>-	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt2 &amp;alt3&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * Taken from Raspberry-Pi-Rev-2.0-Model-AB-Schematics.pdf</div><div class='add'>+	 * RPI00022 sheet 02</div><div class='add'>+	 *</div><div class='add'>+	 * Legend:</div><div class='add'>+	 * "NC" = not connected (no rail from the SoC)</div><div class='add'>+	 * "FOO" = GPIO line named "FOO" on the schematic</div><div class='add'>+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low</div><div class='add'>+	 */</div><div class='add'>+	gpio-line-names = "SDA0",</div><div class='add'>+			  "SCL0",</div><div class='add'>+			  "SDA1",</div><div class='add'>+			  "SCL1",</div><div class='add'>+			  "GPIO_GCLK",</div><div class='add'>+			  "CAM_CLK",</div><div class='add'>+			  "LAN_RUN",</div><div class='add'>+			  "SPI_CE1_N",</div><div class='add'>+			  "SPI_CE0_N",</div><div class='add'>+			  "SPI_MISO",</div><div class='add'>+			  "SPI_MOSI",</div><div class='add'>+			  "SPI_SCLK",</div><div class='add'>+			  "NC", /* GPIO12 */</div><div class='add'>+			  "NC", /* GPIO13 */</div><div class='add'>+			  /* Serial port */</div><div class='add'>+			  "TXD0",</div><div class='add'>+			  "RXD0",</div><div class='add'>+			  "STATUS_LED_N",</div><div class='add'>+			  "GPIO17",</div><div class='add'>+			  "GPIO18",</div><div class='add'>+			  "NC", /* GPIO19 */</div><div class='add'>+			  "NC", /* GPIO20 */</div><div class='add'>+			  "CAM_GPIO",</div><div class='add'>+			  "GPIO22",</div><div class='add'>+			  "GPIO23",</div><div class='add'>+			  "GPIO24",</div><div class='add'>+			  "GPIO25",</div><div class='add'>+			  "NC", /* GPIO26 */</div><div class='add'>+			  "GPIO27",</div><div class='add'>+			  "GPIO28",</div><div class='add'>+			  "GPIO29",</div><div class='add'>+			  "GPIO30",</div><div class='add'>+			  "GPIO31",</div><div class='add'>+			  "NC", /* GPIO32 */</div><div class='add'>+			  "NC", /* GPIO33 */</div><div class='add'>+			  "NC", /* GPIO34 */</div><div class='add'>+			  "NC", /* GPIO35 */</div><div class='add'>+			  "NC", /* GPIO36 */</div><div class='add'>+			  "NC", /* GPIO37 */</div><div class='add'>+			  "NC", /* GPIO38 */</div><div class='add'>+			  "NC", /* GPIO39 */</div><div class='add'>+			  "PWM0_OUT",</div><div class='add'>+			  "NC", /* GPIO41 */</div><div class='add'>+			  "NC", /* GPIO42 */</div><div class='add'>+			  "NC", /* GPIO43 */</div><div class='add'>+			  "NC", /* GPIO44 */</div><div class='add'>+			  "PWM1_OUT",</div><div class='add'>+			  "HDMI_HPD_P",</div><div class='add'>+			  "SD_CARD_DET",</div><div class='add'>+			  /* Used by SD Card */</div><div class='add'>+			  "SD_CLK_R",</div><div class='add'>+			  "SD_CMD_R",</div><div class='add'>+			  "SD_DATA0_R",</div><div class='add'>+			  "SD_DATA1_R",</div><div class='add'>+			  "SD_DATA2_R",</div><div class='add'>+			  "SD_DATA3_R";</div><div class='add'>+</div><div class='add'>+	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt2&gt;;</div><div class='ctx'> </div><div class='ctx'> 	/* I2S interface */</div><div class='ctx'> 	i2s_alt2: i2s_alt2 {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts<br/>index 8e626a80fe24..4d56fe3006b0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-b.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm2835-rpi-b.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-b.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-b.dts</a></div><div class='hunk'>@@ -16,7 +16,74 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;gpio {</div><div class='del'>-	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;alt3&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * Taken from Raspberry-Pi-Rev-1.0-Model-AB-Schematics.pdf</div><div class='add'>+	 * RPI00021 sheet 02</div><div class='add'>+	 *</div><div class='add'>+	 * Legend:</div><div class='add'>+	 * "NC" = not connected (no rail from the SoC)</div><div class='add'>+	 * "FOO" = GPIO line named "FOO" on the schematic</div><div class='add'>+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low</div><div class='add'>+	 */</div><div class='add'>+	gpio-line-names = "SDA0",</div><div class='add'>+			  "SCL0",</div><div class='add'>+			  "SDA1",</div><div class='add'>+			  "SCL1",</div><div class='add'>+			  "GPIO_GCLK",</div><div class='add'>+			  "CAM_GPIO1",</div><div class='add'>+			  "LAN_RUN",</div><div class='add'>+			  "SPI_CE1_N",</div><div class='add'>+			  "SPI_CE0_N",</div><div class='add'>+			  "SPI_MISO",</div><div class='add'>+			  "SPI_MOSI",</div><div class='add'>+			  "SPI_SCLK",</div><div class='add'>+			  "NC", /* GPIO12 */</div><div class='add'>+			  "NC", /* GPIO13 */</div><div class='add'>+			  /* Serial port */</div><div class='add'>+			  "TXD0",</div><div class='add'>+			  "RXD0",</div><div class='add'>+			  "STATUS_LED_N",</div><div class='add'>+			  "GPIO17",</div><div class='add'>+			  "GPIO18",</div><div class='add'>+			  "NC", /* GPIO19 */</div><div class='add'>+			  "NC", /* GPIO20 */</div><div class='add'>+			  "GPIO21",</div><div class='add'>+			  "GPIO22",</div><div class='add'>+			  "GPIO23",</div><div class='add'>+			  "GPIO24",</div><div class='add'>+			  "GPIO25",</div><div class='add'>+			  "NC", /* GPIO26 */</div><div class='add'>+			  "CAM_GPIO0",</div><div class='add'>+			  /* Binary number representing build/revision */</div><div class='add'>+			  "CONFIG0",</div><div class='add'>+			  "CONFIG1",</div><div class='add'>+			  "CONFIG2",</div><div class='add'>+			  "CONFIG3",</div><div class='add'>+			  "NC", /* GPIO32 */</div><div class='add'>+			  "NC", /* GPIO33 */</div><div class='add'>+			  "NC", /* GPIO34 */</div><div class='add'>+			  "NC", /* GPIO35 */</div><div class='add'>+			  "NC", /* GPIO36 */</div><div class='add'>+			  "NC", /* GPIO37 */</div><div class='add'>+			  "NC", /* GPIO38 */</div><div class='add'>+			  "NC", /* GPIO39 */</div><div class='add'>+			  "PWM0_OUT",</div><div class='add'>+			  "NC", /* GPIO41 */</div><div class='add'>+			  "NC", /* GPIO42 */</div><div class='add'>+			  "NC", /* GPIO43 */</div><div class='add'>+			  "NC", /* GPIO44 */</div><div class='add'>+			  "PWM1_OUT",</div><div class='add'>+			  "HDMI_HPD_P",</div><div class='add'>+			  "SD_CARD_DET",</div><div class='add'>+			  /* Used by SD Card */</div><div class='add'>+			  "SD_CLK_R",</div><div class='add'>+			  "SD_CMD_R",</div><div class='add'>+			  "SD_DATA0_R",</div><div class='add'>+			  "SD_DATA1_R",</div><div class='add'>+			  "SD_DATA2_R",</div><div class='add'>+			  "SD_DATA3_R";</div><div class='add'>+</div><div class='add'>+	pinctrl-0 = &lt;&amp;gpioout &amp;alt0&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;hdmi {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts<br/>index 60e359fafc5b..cc8b832c4c78 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-zero.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm2835-rpi-zero.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi-zero.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi-zero.dts</a></div><div class='hunk'>@@ -26,7 +26,72 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;gpio {</div><div class='del'>-	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt0 &amp;alt3&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * This is based on the official GPU firmware DT blob.</div><div class='add'>+	 *</div><div class='add'>+	 * Legend:</div><div class='add'>+	 * "NC" = not connected (no rail from the SoC)</div><div class='add'>+	 * "FOO" = GPIO line named "FOO" on the schematic</div><div class='add'>+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low</div><div class='add'>+	 */</div><div class='add'>+	gpio-line-names = "SDA0",</div><div class='add'>+			  "SCL0",</div><div class='add'>+			  "SDA1",</div><div class='add'>+			  "SCL1",</div><div class='add'>+			  "GPIO_GCLK",</div><div class='add'>+			  "GPIO5",</div><div class='add'>+			  "GPIO6",</div><div class='add'>+			  "SPI_CE1_N",</div><div class='add'>+			  "SPI_CE0_N",</div><div class='add'>+			  "SPI_MISO",</div><div class='add'>+			  "SPI_MOSI",</div><div class='add'>+			  "SPI_SCLK",</div><div class='add'>+			  "GPIO12",</div><div class='add'>+			  "GPIO13",</div><div class='add'>+			  /* Serial port */</div><div class='add'>+			  "TXD0",</div><div class='add'>+			  "RXD0",</div><div class='add'>+			  "GPIO16",</div><div class='add'>+			  "GPIO17",</div><div class='add'>+			  "GPIO18",</div><div class='add'>+			  "GPIO19",</div><div class='add'>+			  "GPIO20",</div><div class='add'>+			  "GPIO21",</div><div class='add'>+			  "GPIO22",</div><div class='add'>+			  "GPIO23",</div><div class='add'>+			  "GPIO24",</div><div class='add'>+			  "GPIO25",</div><div class='add'>+			  "GPIO26",</div><div class='add'>+			  "GPIO27",</div><div class='add'>+			  "SDA0",</div><div class='add'>+			  "SCL0",</div><div class='add'>+			  "NC", /* GPIO30 */</div><div class='add'>+			  "NC", /* GPIO31 */</div><div class='add'>+			  "CAM_GPIO1", /* GPIO32 */</div><div class='add'>+			  "NC", /* GPIO33 */</div><div class='add'>+			  "NC", /* GPIO34 */</div><div class='add'>+			  "NC", /* GPIO35 */</div><div class='add'>+			  "NC", /* GPIO36 */</div><div class='add'>+			  "NC", /* GPIO37 */</div><div class='add'>+			  "NC", /* GPIO38 */</div><div class='add'>+			  "NC", /* GPIO39 */</div><div class='add'>+			  "NC", /* GPIO40 */</div><div class='add'>+			  "CAM_GPIO0", /* GPIO41 */</div><div class='add'>+			  "NC", /* GPIO42 */</div><div class='add'>+			  "NC", /* GPIO43 */</div><div class='add'>+			  "NC", /* GPIO44 */</div><div class='add'>+			  "NC", /* GPIO45 */</div><div class='add'>+			  "HDMI_HPD_N",</div><div class='add'>+			  "STATUS_LED_N",</div><div class='add'>+			  /* Used by SD Card */</div><div class='add'>+			  "SD_CLK_R",</div><div class='add'>+			  "SD_CMD_R",</div><div class='add'>+			  "SD_DATA0_R",</div><div class='add'>+			  "SD_DATA1_R",</div><div class='add'>+			  "SD_DATA2_R",</div><div class='add'>+			  "SD_DATA3_R";</div><div class='add'>+</div><div class='add'>+	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt0&gt;;</div><div class='ctx'> </div><div class='ctx'> 	/* I2S interface */</div><div class='ctx'> 	i2s_alt0: i2s_alt0 {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi<br/>index e9b47b2bbc33..38e6050035bc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm2835-rpi.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835-rpi.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835-rpi.dtsi</a></div><div class='hunk'>@@ -39,22 +39,21 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	alt0: alt0 {</div><div class='del'>-		brcm,pins = &lt;0 1 2 3 4 5 7 8 9 10 11 14 15 40 45&gt;;</div><div class='add'>+		brcm,pins = &lt;4 5 7 8 9 10 11 14 15&gt;;</div><div class='ctx'> 		brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	alt3: alt3 {</div><div class='del'>-		brcm,pins = &lt;48 49 50 51 52 53&gt;;</div><div class='del'>-		brcm,function = &lt;BCM2835_FSEL_ALT3&gt;;</div><div class='del'>-	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c0_gpio0&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	clock-frequency = &lt;100000&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_gpio2&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	clock-frequency = &lt;100000&gt;;</div><div class='ctx'> };</div><div class='hunk'>@@ -64,11 +63,15 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;sdhci {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_gpio48&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;pwm {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pwm0_gpio40 &amp;pwm1_gpio45&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -84,3 +87,8 @@</div><div class='ctx'> 	power-domains = &lt;&amp;power RPI_POWER_DOMAIN_HDMI&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;vec {</div><div class='add'>+	power-domains = &lt;&amp;power RPI_POWER_DOMAIN_VEC&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi<br/>index a78759e73710..0890d97e674d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm2835.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2835.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2835.dtsi</a></div><div class='hunk'>@@ -23,3 +23,9 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* enable thermal sensor with the correct compatible property set */</div><div class='add'>+&amp;thermal {</div><div class='add'>+	compatible = "brcm,bcm2835-thermal";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts<br/>index 39dccf62ac96..bf19e8cfb9e6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2836-rpi-2-b.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm2836-rpi-2-b.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2836-rpi-2-b.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2836-rpi-2-b.dts</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;gpio {</div><div class='del'>-	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt0 &amp;alt3&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;gpioout &amp;alt0 &amp;i2s_alt0&gt;;</div><div class='ctx'> </div><div class='ctx'> 	/* I2S interface */</div><div class='ctx'> 	i2s_alt0: i2s_alt0 {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm2836.dtsi b/arch/arm/boot/dts/bcm2836.dtsi<br/>index 9d0651d8f373..519a44f5d25a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2836.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm2836.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm2836.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm2836.dtsi</a></div><div class='hunk'>@@ -76,3 +76,9 @@</div><div class='ctx'> 	interrupt-parent = &lt;&amp;local_intc&gt;;</div><div class='ctx'> 	interrupts = &lt;8&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* enable thermal sensor with the correct compatible property set */</div><div class='add'>+&amp;thermal {</div><div class='add'>+	compatible = "brcm,bcm2836-thermal";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi<br/>index 46d46d894a44..a3106aa446c6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm283x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm283x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm283x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm283x.dtsi</a></div><div class='hunk'>@@ -104,7 +104,7 @@</div><div class='ctx'> 			reg = &lt;0x7e104000 0x10&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		mailbox: mailbox@7e00b800 {</div><div class='add'>+		mailbox: mailbox@7e00b880 {</div><div class='ctx'> 			compatible = "brcm,bcm2835-mbox";</div><div class='ctx'> 			reg = &lt;0x7e00b880 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;0 1&gt;;</div><div class='hunk'>@@ -132,6 +132,209 @@</div><div class='ctx'> </div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			/* Defines pin muxing groups according to</div><div class='add'>+			 * BCM2835-ARM-Peripherals.pdf page 102.</div><div class='add'>+			 *</div><div class='add'>+			 * While each pin can have its mux selected</div><div class='add'>+			 * for various functions individually, some</div><div class='add'>+			 * groups only make sense to switch to a</div><div class='add'>+			 * particular function together.</div><div class='add'>+			 */</div><div class='add'>+			dpi_gpio0: dpi_gpio0 {</div><div class='add'>+				brcm,pins = &lt;0 1 2 3 4 5 6 7 8 9 10 11</div><div class='add'>+					     12 13 14 15 16 17 18 19</div><div class='add'>+					     20 21 22 23 24 25 26 27&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT2&gt;;</div><div class='add'>+			};</div><div class='add'>+			emmc_gpio22: emmc_gpio22 {</div><div class='add'>+				brcm,pins = &lt;22 23 24 25 26 27&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT3&gt;;</div><div class='add'>+			};</div><div class='add'>+			emmc_gpio34: emmc_gpio34 {</div><div class='add'>+				brcm,pins = &lt;34 35 36 37 38 39&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT3&gt;;</div><div class='add'>+				brcm,pull = &lt;BCM2835_PUD_OFF</div><div class='add'>+					     BCM2835_PUD_UP</div><div class='add'>+					     BCM2835_PUD_UP</div><div class='add'>+					     BCM2835_PUD_UP</div><div class='add'>+					     BCM2835_PUD_UP</div><div class='add'>+					     BCM2835_PUD_UP&gt;;</div><div class='add'>+			};</div><div class='add'>+			emmc_gpio48: emmc_gpio48 {</div><div class='add'>+				brcm,pins = &lt;48 49 50 51 52 53&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT3&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpclk0_gpio4: gpclk0_gpio4 {</div><div class='add'>+				brcm,pins = &lt;4&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			gpclk1_gpio5: gpclk1_gpio5 {</div><div class='add'>+				brcm,pins = &lt;5&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			gpclk1_gpio42: gpclk1_gpio42 {</div><div class='add'>+				brcm,pins = &lt;42&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			gpclk1_gpio44: gpclk1_gpio44 {</div><div class='add'>+				brcm,pins = &lt;44&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			gpclk2_gpio6: gpclk2_gpio6 {</div><div class='add'>+				brcm,pins = &lt;6&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			gpclk2_gpio43: gpclk2_gpio43 {</div><div class='add'>+				brcm,pins = &lt;43&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c0_gpio0: i2c0_gpio0 {</div><div class='add'>+				brcm,pins = &lt;0 1&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			i2c0_gpio32: i2c0_gpio32 {</div><div class='add'>+				brcm,pins = &lt;32 34&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			i2c0_gpio44: i2c0_gpio44 {</div><div class='add'>+				brcm,pins = &lt;44 45&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT1&gt;;</div><div class='add'>+			};</div><div class='add'>+			i2c1_gpio2: i2c1_gpio2 {</div><div class='add'>+				brcm,pins = &lt;2 3&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			i2c1_gpio44: i2c1_gpio44 {</div><div class='add'>+				brcm,pins = &lt;44 45&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT2&gt;;</div><div class='add'>+			};</div><div class='add'>+			i2c_slave_gpio18: i2c_slave_gpio18 {</div><div class='add'>+				brcm,pins = &lt;18 19 20 21&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT3&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			jtag_gpio4: jtag_gpio4 {</div><div class='add'>+				brcm,pins = &lt;4 5 6 12 13&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT4&gt;;</div><div class='add'>+			};</div><div class='add'>+			jtag_gpio22: jtag_gpio22 {</div><div class='add'>+				brcm,pins = &lt;22 23 24 25 26 27&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pcm_gpio18: pcm_gpio18 {</div><div class='add'>+				brcm,pins = &lt;18 19 20 21&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			pcm_gpio28: pcm_gpio28 {</div><div class='add'>+				brcm,pins = &lt;28 29 30 31&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT2&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pwm0_gpio12: pwm0_gpio12 {</div><div class='add'>+				brcm,pins = &lt;12&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			pwm0_gpio18: pwm0_gpio18 {</div><div class='add'>+				brcm,pins = &lt;18&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT5&gt;;</div><div class='add'>+			};</div><div class='add'>+			pwm0_gpio40: pwm0_gpio40 {</div><div class='add'>+				brcm,pins = &lt;40&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			pwm1_gpio13: pwm1_gpio13 {</div><div class='add'>+				brcm,pins = &lt;13&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			pwm1_gpio19: pwm1_gpio19 {</div><div class='add'>+				brcm,pins = &lt;19&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT5&gt;;</div><div class='add'>+			};</div><div class='add'>+			pwm1_gpio41: pwm1_gpio41 {</div><div class='add'>+				brcm,pins = &lt;41&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			pwm1_gpio45: pwm1_gpio45 {</div><div class='add'>+				brcm,pins = &lt;45&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sdhost_gpio48: sdhost_gpio48 {</div><div class='add'>+				brcm,pins = &lt;48 49 50 51 52 53&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			spi0_gpio7: spi0_gpio7 {</div><div class='add'>+				brcm,pins = &lt;7 8 9 10 11&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			spi0_gpio35: spi0_gpio35 {</div><div class='add'>+				brcm,pins = &lt;35 36 37 38 39&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			spi1_gpio16: spi1_gpio16 {</div><div class='add'>+				brcm,pins = &lt;16 17 18 19 20 21&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT4&gt;;</div><div class='add'>+			};</div><div class='add'>+			spi2_gpio40: spi2_gpio40 {</div><div class='add'>+				brcm,pins = &lt;40 41 42 43 44 45&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart0_gpio14: uart0_gpio14 {</div><div class='add'>+				brcm,pins = &lt;14 15&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT0&gt;;</div><div class='add'>+			};</div><div class='add'>+			/* Separate from the uart0_gpio14 group</div><div class='add'>+			 * because it conflicts with spi1_gpio16, and</div><div class='add'>+			 * people often run uart0 on the two pins</div><div class='add'>+			 * without flow contrl.</div><div class='add'>+			 */</div><div class='add'>+			uart0_ctsrts_gpio16: uart0_ctsrts_gpio16 {</div><div class='add'>+				brcm,pins = &lt;16 17&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT3&gt;;</div><div class='add'>+			};</div><div class='add'>+			uart0_gpio30: uart0_gpio30 {</div><div class='add'>+				brcm,pins = &lt;30 31&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT3&gt;;</div><div class='add'>+			};</div><div class='add'>+			uart0_ctsrts_gpio32: uart0_ctsrts_gpio32 {</div><div class='add'>+				brcm,pins = &lt;32 33&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT3&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart1_gpio14: uart1_gpio14 {</div><div class='add'>+				brcm,pins = &lt;14 15&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT5&gt;;</div><div class='add'>+			};</div><div class='add'>+			uart1_ctsrts_gpio16: uart1_ctsrts_gpio16 {</div><div class='add'>+				brcm,pins = &lt;16 17&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT5&gt;;</div><div class='add'>+			};</div><div class='add'>+			uart1_gpio32: uart1_gpio32 {</div><div class='add'>+				brcm,pins = &lt;32 33&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT5&gt;;</div><div class='add'>+			};</div><div class='add'>+			uart1_ctsrts_gpio30: uart1_ctsrts_gpio30 {</div><div class='add'>+				brcm,pins = &lt;30 31&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT5&gt;;</div><div class='add'>+			};</div><div class='add'>+			uart1_gpio36: uart1_gpio36 {</div><div class='add'>+				brcm,pins = &lt;36 37 38 39&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT2&gt;;</div><div class='add'>+			};</div><div class='add'>+			uart1_gpio40: uart1_gpio40 {</div><div class='add'>+				brcm,pins = &lt;40 41&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT5&gt;;</div><div class='add'>+			};</div><div class='add'>+			uart1_ctsrts_gpio42: uart1_ctsrts_gpio42 {</div><div class='add'>+				brcm,pins = &lt;42 43&gt;;</div><div class='add'>+				brcm,function = &lt;BCM2835_FSEL_ALT5&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		uart0: serial@7e201000 {</div><div class='hunk'>@@ -187,6 +390,13 @@</div><div class='ctx'> 			interrupts = &lt;2 14&gt;; /* pwa1 */</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		thermal: thermal@7e212000 {</div><div class='add'>+			compatible = "brcm,bcm2835-thermal";</div><div class='add'>+			reg = &lt;0x7e212000 0x8&gt;;</div><div class='add'>+			clocks = &lt;&amp;clocks BCM2835_CLOCK_TSENS&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		aux: aux@0x7e215000 {</div><div class='ctx'> 			compatible = "brcm,bcm2835-aux";</div><div class='ctx'> 			#clock-cells = &lt;1&gt;;</div><div class='hunk'>@@ -266,6 +476,14 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		vec: vec@7e806000 {</div><div class='add'>+			compatible = "brcm,bcm2835-vec";</div><div class='add'>+			reg = &lt;0x7e806000 0x1000&gt;;</div><div class='add'>+			clocks = &lt;&amp;clocks BCM2835_CLOCK_VEC&gt;;</div><div class='add'>+			interrupts = &lt;2 27&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pixelvalve@7e807000 {</div><div class='ctx'> 			compatible = "brcm,bcm2835-pixelvalve2";</div><div class='ctx'> 			reg = &lt;0x7e807000 0x100&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts<br/>index 112a5a834ddc..d241cee4bfcc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts</a></div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts<br/>index 3600f56f46f4..b0e62042f62f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts</a></div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts<br/>index 9cb186ea2e97..c9ba6b964b38 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts</a></div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x18000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	spi {</div><div class='hunk'>@@ -136,10 +137,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;usb2 {</div><div class='ctx'> 	vcc-gpio = &lt;&amp;chipcommon 9 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts<br/>new file mode 100644<br/>index 000000000000..f591b0f256d8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Luxul Inc.</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the ISC license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "bcm4708.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "luxul,xap-1510v1", "brcm,bcm4708";</div><div class='add'>+	model = "Luxul XAP-1510 V1";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=ttyS0,115200 earlycon";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		5ghz {</div><div class='add'>+			label = "bcm53xx:blue:5ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 13 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		2ghz {</div><div class='add'>+			label = "bcm53xx:blue:2ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 14 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		status {</div><div class='add'>+			label = "bcm53xx:green:status";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "timer";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		restart {</div><div class='add'>+			label = "Reset";</div><div class='add'>+			linux,code = &lt;KEY_RESTART&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi_nor {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts<br/>index 1c7e53d60aa4..50d65d8fbd9a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts</a></div><div class='hunk'>@@ -56,10 +56,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;spi_nor {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts<br/>index 8ce39d58eeb8..b9f66c0fae27 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-netgear-r6250.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4708-netgear-r6250.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-netgear-r6250.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-netgear-r6250.dts</a></div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='hunk'>@@ -83,10 +84,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;usb3 {</div><div class='ctx'> 	vcc-gpio = &lt;&amp;chipcommon 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts<br/>index 6229ef283c41..ae0199f6c7a2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts</a></div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts<br/>index 70f4bb9d864a..36b628b190d7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts</a></div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='hunk'>@@ -119,10 +120,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;spi_nor {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4708.dtsi b/arch/arm/boot/dts/bcm4708.dtsi<br/>index eed4dd159995..d0eec099f1f8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4708.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4708.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4708.dtsi</a></div><div class='hunk'>@@ -34,3 +34,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts<br/>index 71b98cfaf944..db8608be0ee7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts</a></div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts<br/>index a9c8defed4d3..d51586d95b9a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts</a></div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	spi {</div><div class='hunk'>@@ -122,7 +123,3 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts<br/>index 184fd9214110..de041b8c3342 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts</a></div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gpio-keys {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts<br/>new file mode 100644<br/>index 000000000000..9b5759849983<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2017 Luxul Inc.</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the ISC license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "bcm47081.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "luxul,xap-1410v1", "brcm,bcm47081", "brcm,bcm4708";</div><div class='add'>+	model = "Luxul XAP-1410 V1";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=ttyS0,115200";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		5ghz {</div><div class='add'>+			label = "bcm53xx:blue:5ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 13 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		2ghz {</div><div class='add'>+			label = "bcm53xx:blue:2ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 14 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		status {</div><div class='add'>+			label = "bcm53xx:green:status";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "timer";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		restart {</div><div class='add'>+			label = "Reset";</div><div class='add'>+			linux,code = &lt;KEY_RESTART&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi_nor {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts<br/>new file mode 100644<br/>index 000000000000..c544ab302012<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2017 Luxul Inc.</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the ISC license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "bcm47081.dtsi"</div><div class='add'>+#include "bcm5301x-nand-cs0-bch4.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "luxul,xwr-1200v1", "brcm,bcm47081", "brcm,bcm4708";</div><div class='add'>+	model = "Luxul XWR-1200 V1";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=ttyS0,115200";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		power {</div><div class='add'>+			label = "bcm53xx:green:power";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-on";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lan3 {</div><div class='add'>+			label = "bcm53xx:green:lan3";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lan4 {</div><div class='add'>+			label = "bcm53xx:green:lan4";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wan {</div><div class='add'>+			label = "bcm53xx:green:wan";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lan2 {</div><div class='add'>+			label = "bcm53xx:green:lan2";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 6 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb {</div><div class='add'>+			label = "bcm53xx:green:usb";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 8 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		status {</div><div class='add'>+			label = "bcm53xx:green:status";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 10 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "timer";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		2ghz {</div><div class='add'>+			label = "bcm53xx:green:2ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 13 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		5ghz {</div><div class='add'>+			label = "bcm53xx:green:5ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 14 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lan1 {</div><div class='add'>+			label = "bcm53xx:green:lan1";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "none";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		restart {</div><div class='add'>+			label = "Reset";</div><div class='add'>+			linux,code = &lt;KEY_RESTART&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb2 {</div><div class='add'>+	vcc-gpio = &lt;&amp;chipcommon 9 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi_nor {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm47081.dtsi b/arch/arm/boot/dts/bcm47081.dtsi<br/>index f720012ee5ed..c5f7619af4a6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47081.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm47081.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47081.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47081.dtsi</a></div><div class='hunk'>@@ -24,3 +24,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts<br/>index 8ade7def2e8a..eaca6876db0f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='del'>-#include "bcm4708.dtsi"</div><div class='add'>+#include "bcm4709.dtsi"</div><div class='ctx'> #include "bcm5301x-nand-cs0-bch8.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts<br/>index 0653e7ef248c..b32957ca9443 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='del'>-#include "bcm4708.dtsi"</div><div class='add'>+#include "bcm4709.dtsi"</div><div class='ctx'> #include "bcm5301x-nand-cs0-bch8.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x18000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts<br/>index a22ed144040b..f459a98a72c6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4709-netgear-r7000.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4709-netgear-r7000.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4709-netgear-r7000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709-netgear-r7000.dts</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='del'>-#include "bcm4708.dtsi"</div><div class='add'>+#include "bcm4709.dtsi"</div><div class='ctx'> #include "bcm5301x-nand-cs0-bch8.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='hunk'>@@ -101,6 +102,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='add'>+&amp;usb2 {</div><div class='add'>+	vcc-gpio = &lt;&amp;chipcommon 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb3 {</div><div class='add'>+	vcc-gpio = &lt;&amp;chipcommon 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts<br/>index ca181516c28a..8e39a84e5bf9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4709-netgear-r8000.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm4709-netgear-r8000.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4709-netgear-r8000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709-netgear-r8000.dts</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='del'>-#include "bcm4708.dtsi"</div><div class='add'>+#include "bcm4709.dtsi"</div><div class='ctx'> #include "bcm5301x-nand-cs0-bch8.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='hunk'>@@ -107,6 +108,54 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pcie0 {</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	bridge@0,0,0 {</div><div class='add'>+		reg = &lt;0x0000 0 0 0 0&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		wifi@0,1,0 {</div><div class='add'>+			reg = &lt;0x0000 0 0 0 0&gt;;</div><div class='add'>+			ieee80211-freq-limit = &lt;5735000 5835000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pcie1 {</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	bridge@1,0,0 {</div><div class='add'>+		reg = &lt;0x0000 0 0 0 0&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		bridge@1,1,0 {</div><div class='add'>+			reg = &lt;0x0000 0 0 0 0&gt;;</div><div class='add'>+</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			bridge@1,2,2 {</div><div class='add'>+				reg = &lt;0x1000 0 0 0 0&gt;;</div><div class='add'>+</div><div class='add'>+				#address-cells = &lt;3&gt;;</div><div class='add'>+				#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+				wifi@1,4,0 {</div><div class='add'>+					reg = &lt;0x0000 0 0 0 0&gt;;</div><div class='add'>+					ieee80211-freq-limit = &lt;5170000 5730000&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usb2 {</div><div class='ctx'> 	vcc-gpio = &lt;&amp;chipcommon 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts<br/>new file mode 100644<br/>index 000000000000..c67bfaa0c8e8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Rafał Miłecki &lt;rafal@milecki.pl&gt;</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the ISC license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "bcm4709.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "tplink,archer-c9-v1", "brcm,bcm4709", "brcm,bcm4708";</div><div class='add'>+	model = "TP-LINK Archer C9 V1";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=ttyS0,115200 earlycon";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		lan {</div><div class='add'>+			label = "bcm53xx:blue:lan";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wps {</div><div class='add'>+			label = "bcm53xx:blue:wps";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		2ghz {</div><div class='add'>+			label = "bcm53xx:blue:2ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		5ghz {</div><div class='add'>+			label = "bcm53xx:blue:5ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb3 {</div><div class='add'>+			label = "bcm53xx:blue:usb3";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb2 {</div><div class='add'>+			label = "bcm53xx:blue:usb2";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wan-blue {</div><div class='add'>+			label = "bcm53xx:blue:wan";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wan-amber {</div><div class='add'>+			label = "bcm53xx:amber:wan";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 15 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		power {</div><div class='add'>+			label = "bcm53xx:blue:power";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 18 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-on";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		wps {</div><div class='add'>+			label = "WPS";</div><div class='add'>+			linux,code = &lt;KEY_WPS_BUTTON&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		restart {</div><div class='add'>+			label = "Reset";</div><div class='add'>+			linux,code = &lt;KEY_RESTART&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb2 {</div><div class='add'>+	vcc-gpio = &lt;&amp;chipcommon 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb3 {</div><div class='add'>+	vcc-gpio = &lt;&amp;chipcommon 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi_nor {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm4709.dtsi b/arch/arm/boot/dts/bcm4709.dtsi<br/>new file mode 100644<br/>index 000000000000..c645fea2b7f7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm4709.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm4709.dtsi</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Rafał Miłecki &lt;rafal@milecki.pl&gt;</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the ISC license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "bcm4708.dtsi"</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	clock-frequency = &lt;125000000&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts<br/>index c8c0b3616935..64ded7643e9f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='del'>-#include "bcm4708.dtsi"</div><div class='add'>+#include "bcm47094.dtsi"</div><div class='ctx'> #include "bcm5301x-nand-cs0-bch1.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	nand: nand@18028000 {</div><div class='hunk'>@@ -105,11 +106,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-	clock-frequency = &lt;125000000&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;usb3 {</div><div class='ctx'> 	vcc-gpio = &lt;&amp;chipcommon 18 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts<br/>new file mode 100644<br/>index 000000000000..5cf4ab1ebe85<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Luxul Inc.</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the ISC license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "bcm47094.dtsi"</div><div class='add'>+#include "bcm5301x-nand-cs0-bch4.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "luxul,xwr-3100v1", "brcm,bcm47094", "brcm,bcm4708";</div><div class='add'>+	model = "Luxul XWR-3100 V1";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=ttyS0,115200 earlycon";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x08000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		power	{</div><div class='add'>+			label = "bcm53xx:green:power";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-on";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lan3	{</div><div class='add'>+			label = "bcm53xx:green:lan3";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lan4	{</div><div class='add'>+			label = "bcm53xx:green:lan4";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wan	{</div><div class='add'>+			label = "bcm53xx:green:wan";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lan1	{</div><div class='add'>+			label = "bcm53xx:green:lan1";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lan2	{</div><div class='add'>+			label = "bcm53xx:green:lan2";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 6 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb3	{</div><div class='add'>+			label = "bcm53xx:green:usb3";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 8 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		status	{</div><div class='add'>+			label = "bcm53xx:green:status";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 10 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "timer";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		2ghz {</div><div class='add'>+			label = "bcm53xx:green:2ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 13 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		5ghz {</div><div class='add'>+			label = "bcm53xx:green:5ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 14 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		restart {</div><div class='add'>+			label = "Reset";</div><div class='add'>+			linux,code = &lt;KEY_RESTART&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 17 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb3 {</div><div class='add'>+	vcc-gpio = &lt;&amp;chipcommon 18 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi_nor {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts<br/>new file mode 100644<br/>index 000000000000..600795ee1aed<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47094-netgear-r8500.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47094-netgear-r8500.dts</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Rafał Miłecki &lt;rafal@milecki.pl&gt;</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the ISC license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "bcm47094.dtsi"</div><div class='add'>+#include "bcm5301x-nand-cs0-bch8.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "netgear,r8500", "brcm,bcm47094", "brcm,bcm4708";</div><div class='add'>+	model = "Netgear R8500";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=ttyS0,115200";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x00000000 0x08000000</div><div class='add'>+		       0x88000000 0x18000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		power0 {</div><div class='add'>+			label = "bcm53xx:white:power";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-on";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		power1 {</div><div class='add'>+			label = "bcm53xx:amber:power";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		5ghz-1 {</div><div class='add'>+			label = "bcm53xx:white:5ghz-1";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		5ghz-2 {</div><div class='add'>+			label = "bcm53xx:white:5ghz-2";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 12 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		2ghz {</div><div class='add'>+			label = "bcm53xx:white:2ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 13 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb2 {</div><div class='add'>+			label = "bcm53xx:white:usb2";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 17 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb3 {</div><div class='add'>+			label = "bcm53xx:white:usb3";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 18 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		brightness {</div><div class='add'>+			label = "Backlight";</div><div class='add'>+			linux,code = &lt;KEY_BRIGHTNESS_ZERO&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		restart {</div><div class='add'>+			label = "Reset";</div><div class='add'>+			linux,code = &lt;KEY_RESTART&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 10 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wps {</div><div class='add'>+			label = "WPS";</div><div class='add'>+			linux,code = &lt;KEY_WPS_BUTTON&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 14 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rfkill {</div><div class='add'>+			label = "WiFi";</div><div class='add'>+			linux,code = &lt;KEY_RFKILL&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 20 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm47094.dtsi b/arch/arm/boot/dts/bcm47094.dtsi<br/>new file mode 100644<br/>index 000000000000..4840a782fc05<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47094.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47094.dtsi</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Rafał Miłecki &lt;rafal@milecki.pl&gt;</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the ISC license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "bcm4708.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	usb3_phy: usb3-phy {</div><div class='add'>+		compatible = "brcm,ns-bx-usb3-phy";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	clock-frequency = &lt;125000000&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts<br/>new file mode 100644<br/>index 000000000000..4403ae8790c2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm47189-tenda-ac9.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm47189-tenda-ac9.dts</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Rafał Miłecki &lt;rafal@milecki.pl&gt;</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the ISC license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "bcm53573.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "tenda,ac9", "brcm,bcm47189", "brcm,bcm53573";</div><div class='add'>+	model = "Tenda AC9";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=ttyS0,115200 earlycon";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		usb {</div><div class='add'>+			label = "bcm53xx:blue:usb";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wps {</div><div class='add'>+			label = "bcm53xx:blue:wps";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		5ghz {</div><div class='add'>+			label = "bcm53xx:blue:5ghz";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 11 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		system {</div><div class='add'>+			label = "bcm53xx:blue:system";</div><div class='add'>+			gpios = &lt;&amp;chipcommon 15 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "timer";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		rfkill {</div><div class='add'>+			label = "WiFi";</div><div class='add'>+			linux,code = &lt;KEY_RFKILL&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		restart {</div><div class='add'>+			label = "Reset";</div><div class='add'>+			linux,code = &lt;KEY_RESTART&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 7 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wps {</div><div class='add'>+			label = "WPS";</div><div class='add'>+			linux,code = &lt;KEY_WPS_BUTTON&gt;;</div><div class='add'>+			gpios = &lt;&amp;chipcommon 9 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi<br/>new file mode 100644<br/>index 000000000000..b4e875df9528<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Luxul Inc.</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the ISC license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "bcm5301x-nand-cs0.dtsi"</div><div class='add'>+</div><div class='add'>+&amp;nandcs {</div><div class='add'>+	nand-ecc-algo = "bch";</div><div class='add'>+	nand-ecc-strength = &lt;4&gt;;</div><div class='add'>+	nand-ecc-step-size = &lt;512&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi<br/>index ae4b3880616d..4fbb089cf5ad 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm5301x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm5301x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm5301x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm5301x.dtsi</a></div><div class='hunk'>@@ -149,6 +149,13 @@</div><div class='ctx'> 		clock-names = "phy-ref-clk";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	usb3_phy: usb3-phy {</div><div class='add'>+		compatible = "brcm,ns-ax-usb3-phy";</div><div class='add'>+		reg = &lt;0x18105000 0x1000&gt;, &lt;0x18003000 0x1000&gt;;</div><div class='add'>+		reg-names = "dmp", "ccb-mii";</div><div class='add'>+		#phy-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	axi@18000000 {</div><div class='ctx'> 		compatible = "brcm,bus-axi";</div><div class='ctx'> 		reg = &lt;0x18000000 0x1000&gt;;</div><div class='hunk'>@@ -236,13 +243,39 @@</div><div class='ctx'> 			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		pcie0: pcie@12000 {</div><div class='add'>+			reg = &lt;0x00012000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcie1: pcie@13000 {</div><div class='add'>+			reg = &lt;0x00013000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		usb2: usb2@21000 {</div><div class='ctx'> 			reg = &lt;0x00021000 0x1000&gt;;</div><div class='ctx'> </div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+</div><div class='add'>+			ehci: ehci@21000 {</div><div class='add'>+				#usb-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-			phys = &lt;&amp;usb2_phy&gt;;</div><div class='add'>+				compatible = "generic-ehci";</div><div class='add'>+				reg = &lt;0x00021000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				phys = &lt;&amp;usb2_phy&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ohci: ohci@22000 {</div><div class='add'>+				#usb-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				compatible = "generic-ohci";</div><div class='add'>+				reg = &lt;0x00022000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		usb3: usb3@23000 {</div><div class='hunk'>@@ -250,6 +283,19 @@</div><div class='ctx'> </div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+</div><div class='add'>+			xhci: xhci@23000 {</div><div class='add'>+				#usb-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				compatible = "generic-xhci";</div><div class='add'>+				reg = &lt;0x00023000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				phys = &lt;&amp;usb3_phy&gt;;</div><div class='add'>+				phy-names = "usb";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		spi@29000 {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm53573.dtsi b/arch/arm/boot/dts/bcm53573.dtsi<br/>new file mode 100644<br/>index 000000000000..2da04d0a7348<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm53573.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm53573.dtsi</a></div><div class='hunk'>@@ -0,0 +1,181 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Rafał Miłecki &lt;rafal@milecki.pl&gt;</div><div class='add'>+ *</div><div class='add'>+ * Licensed under the ISC license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include "skeleton.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a7";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mpcore {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		ranges = &lt;0x00000000 0x18310000 0x00008000&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		gic: interrupt-controller@1000 {</div><div class='add'>+			compatible = "arm,cortex-a7-gic";</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			#address-cells = &lt;0&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			reg = &lt;0x1000 0x1000&gt;,</div><div class='add'>+			      &lt;0x2000 0x0100&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clocks {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		alp: oscillator {</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-frequency = &lt;40000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	axi@18000000 {</div><div class='add'>+		compatible = "brcm,bus-axi";</div><div class='add'>+		reg = &lt;0x18000000 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x00000000 0x18000000 0x00100000&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0x000fffff 0xffff&gt;;</div><div class='add'>+		interrupt-map =</div><div class='add'>+			/* ChipCommon */</div><div class='add'>+			&lt;0x00000000 0 &amp;gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+</div><div class='add'>+			/* IEEE 802.11 0 */</div><div class='add'>+			&lt;0x00001000 0 &amp;gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+</div><div class='add'>+			/* PCIe Controller 0 */</div><div class='add'>+			&lt;0x00002000 0 &amp;gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			&lt;0x00002000 1 &amp;gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			&lt;0x00002000 2 &amp;gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			&lt;0x00002000 3 &amp;gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			&lt;0x00002000 4 &amp;gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			&lt;0x00002000 5 &amp;gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+</div><div class='add'>+			/* USB 2.0 Controller */</div><div class='add'>+			&lt;0x00004000 0 &amp;gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+</div><div class='add'>+			/* Ethernet Controller 0 */</div><div class='add'>+			&lt;0x00005000 0 &amp;gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+</div><div class='add'>+			/* IEEE 802.11 1 */</div><div class='add'>+			&lt;0x0000a000 0 &amp;gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+</div><div class='add'>+			/* Ethernet Controller 1 */</div><div class='add'>+			&lt;0x0000b000 0 &amp;gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		chipcommon: chipcommon@0 {</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			reg = &lt;0x00000000 0x1000&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			uart0: serial@0300 {</div><div class='add'>+				compatible = "ns16550a";</div><div class='add'>+				reg = &lt;0x0300 0x100&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+				interrupts = &lt;GIC_PPI 16 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;alp&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb2: usb2@4000 {</div><div class='add'>+			reg = &lt;0x4000 0x1000&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			ehci: ehci@4000 {</div><div class='add'>+				compatible = "generic-ehci";</div><div class='add'>+				reg = &lt;0x4000 0x1000&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				ehci_port1: port@1 {</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				ehci_port2: port@2 {</div><div class='add'>+					reg = &lt;2&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ohci: ohci@d000 {</div><div class='add'>+				#usb-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				compatible = "generic-ohci";</div><div class='add'>+				reg = &lt;0xd000 0x1000&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				ohci_port1: port@1 {</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				ohci_port2: port@2 {</div><div class='add'>+					reg = &lt;2&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gmac0: ethernet@5000 {</div><div class='add'>+			reg = &lt;0x5000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gmac1: ethernet@b000 {</div><div class='add'>+			reg = &lt;0xb000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pmu@12000 {</div><div class='add'>+			compatible = "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x00012000 0x00001000&gt;;</div><div class='add'>+</div><div class='add'>+			ilp: ilp {</div><div class='add'>+				compatible = "brcm,bcm53573-ilp";</div><div class='add'>+				clocks = &lt;&amp;alp&gt;;</div><div class='add'>+				#clock-cells = &lt;0&gt;;</div><div class='add'>+				clock-output-names = "ilp";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm94708.dts b/arch/arm/boot/dts/bcm94708.dts<br/>index 251a486f2da6..42855a7c1bfa 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm94708.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm94708.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm94708.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm94708.dts</a></div><div class='hunk'>@@ -50,7 +50,3 @@</div><div class='ctx'> 		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm94709.dts b/arch/arm/boot/dts/bcm94709.dts<br/>index b16cac92904f..95e8be65f2f1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm94709.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm94709.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm94709.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm94709.dts</a></div><div class='hunk'>@@ -50,7 +50,3 @@</div><div class='ctx'> 		reg = &lt;0x00000000 0x08000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm953012er.dts b/arch/arm/boot/dts/bcm953012er.dts<br/>index 0a9abecf9423..decd86bae901 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm953012er.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm953012er.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm953012er.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm953012er.dts</a></div><div class='hunk'>@@ -70,10 +70,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;spi_nor {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm953012k.dts b/arch/arm/boot/dts/bcm953012k.dts<br/>index 05a985a20378..bfd923096a8c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm953012k.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm953012k.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm953012k.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm953012k.dts</a></div><div class='hunk'>@@ -54,7 +54,6 @@</div><div class='ctx'> </div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	clock-frequency = &lt;62499840&gt;;</div><div class='del'>-	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart1 {</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm958522er.dts b/arch/arm/boot/dts/bcm958522er.dts<br/>index a21b0fd21f4e..3f04a40eb90c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958522er.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm958522er.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958522er.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958522er.dts</a></div><div class='hunk'>@@ -65,7 +65,6 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> &amp;amac1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -125,6 +124,40 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;qspi {</div><div class='add'>+	bspi-sel = &lt;0&gt;;</div><div class='add'>+	flash: m25p80@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;12500000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "boot";</div><div class='add'>+			reg = &lt;0x00000000 0x000a0000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@a0000 {</div><div class='add'>+			label = "env";</div><div class='add'>+			reg = &lt;0x000a0000 0x00060000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@100000 {</div><div class='add'>+			label = "system";</div><div class='add'>+			reg = &lt;0x00100000 0x00600000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@700000 {</div><div class='add'>+			label = "rootfs";</div><div class='add'>+			reg = &lt;0x00700000 0x01900000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts<br/>index be7f2f8ecf39..9fd542200d3d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958525er.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm958525er.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958525er.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958525er.dts</a></div><div class='hunk'>@@ -65,7 +65,6 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> &amp;amac1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -125,6 +124,40 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;qspi {</div><div class='add'>+	bspi-sel = &lt;0&gt;;</div><div class='add'>+	flash: m25p80@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;12500000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "boot";</div><div class='add'>+			reg = &lt;0x00000000 0x000a0000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@a0000 {</div><div class='add'>+			label = "env";</div><div class='add'>+			reg = &lt;0x000a0000 0x00060000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@100000 {</div><div class='add'>+			label = "system";</div><div class='add'>+			reg = &lt;0x00100000 0x00600000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@700000 {</div><div class='add'>+			label = "rootfs";</div><div class='add'>+			reg = &lt;0x00700000 0x01900000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;sata_phy0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts<br/>index 959cde911c3c..41e7fd350fcd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958525xmc.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm958525xmc.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958525xmc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958525xmc.dts</a></div><div class='hunk'>@@ -59,6 +59,12 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* XHCI support needed to be complete */</div><div class='add'>+</div><div class='add'>+&amp;amac0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;i2c0 {</div><div class='ctx'> 	temperature-sensor@4c {</div><div class='ctx'> 		compatible = "adi,adt7461a";</div><div class='hunk'>@@ -115,12 +121,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* XHCI, MMC, and Ethernet support needed to be complete */</div><div class='del'>-</div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;pcie0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -129,6 +129,49 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;nand_sel&gt;;</div><div class='add'>+	nand_sel: nand_sel {</div><div class='add'>+		function = "nand";</div><div class='add'>+		groups = "nand_grp";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	bspi-sel = &lt;0&gt;;</div><div class='add'>+	flash: m25p80@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;12500000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "boot";</div><div class='add'>+			reg = &lt;0x00000000 0x000a0000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@a0000 {</div><div class='add'>+			label = "env";</div><div class='add'>+			reg = &lt;0x000a0000 0x00060000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@100000 {</div><div class='add'>+			label = "system";</div><div class='add'>+			reg = &lt;0x00100000 0x00600000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@700000 {</div><div class='add'>+			label = "rootfs";</div><div class='add'>+			reg = &lt;0x00700000 0x01900000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;sata_phy0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -141,11 +184,10 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;pinctrl {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;nand_sel&gt;;</div><div class='del'>-	nand_sel: nand_sel {</div><div class='del'>-		function = "nand";</div><div class='del'>-		groups = "nand_grp";</div><div class='del'>-	};</div><div class='add'>+&amp;sdio {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts<br/>index ad2aa87dd15a..477c4860db52 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958622hr.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm958622hr.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958622hr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958622hr.dts</a></div><div class='hunk'>@@ -65,6 +65,14 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;amac1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;amac2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;nand {</div><div class='ctx'> 	nandcs@0 {</div><div class='ctx'> 		compatible = "brcm,nandcs";</div><div class='hunk'>@@ -120,6 +128,40 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;qspi {</div><div class='add'>+	bspi-sel = &lt;0&gt;;</div><div class='add'>+	flash: m25p80@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;12500000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "boot";</div><div class='add'>+			reg = &lt;0x00000000 0x000a0000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@a0000 {</div><div class='add'>+			label = "env";</div><div class='add'>+			reg = &lt;0x000a0000 0x00060000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@100000 {</div><div class='add'>+			label = "system";</div><div class='add'>+			reg = &lt;0x00100000 0x00600000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@700000 {</div><div class='add'>+			label = "rootfs";</div><div class='add'>+			reg = &lt;0x00700000 0x01900000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;srab {</div><div class='ctx'> 	compatible = "brcm,bcm58622-srab", "brcm,nsp-srab";</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts<br/>index 4ceb8fef8041..c0a499d5ba44 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958623hr.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm958623hr.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958623hr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958623hr.dts</a></div><div class='hunk'>@@ -65,6 +65,14 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;amac1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;amac2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;nand {</div><div class='ctx'> 	nandcs@0 {</div><div class='ctx'> 		compatible = "brcm,nandcs";</div><div class='hunk'>@@ -120,6 +128,48 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;sata_phy0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	bspi-sel = &lt;0&gt;;</div><div class='add'>+	flash: m25p80@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;12500000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "boot";</div><div class='add'>+			reg = &lt;0x00000000 0x000a0000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@a0000 {</div><div class='add'>+			label = "env";</div><div class='add'>+			reg = &lt;0x000a0000 0x00060000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@100000 {</div><div class='add'>+			label = "system";</div><div class='add'>+			reg = &lt;0x00100000 0x00600000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@700000 {</div><div class='add'>+			label = "rootfs";</div><div class='add'>+			reg = &lt;0x00700000 0x01900000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;srab {</div><div class='ctx'> 	compatible = "brcm,bcm58623-srab", "brcm,nsp-srab";</div><div class='ctx'> 	status = "okay";</div><div class='hunk'>@@ -165,14 +215,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;sata_phy0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;sata {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts<br/>index 442002597063..f7eb5854a224 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958625hr.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm958625hr.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958625hr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958625hr.dts</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  BSD LICENSE</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (c) 2016 Broadcom.  All rights reserved.</div><div class='add'>+ *  Copyright(c) 2016 Broadcom.  All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  *  Redistribution and use in source and binary forms, with or without</div><div class='ctx'>  *  modification, are permitted provided that the following conditions</div><div class='hunk'>@@ -59,6 +59,18 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;amac0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;amac1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;amac2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;nand {</div><div class='ctx'> 	nandcs@0 {</div><div class='ctx'> 		compatible = "brcm,nandcs";</div><div class='hunk'>@@ -97,10 +109,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;pcie0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -118,7 +126,49 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;amac0 {</div><div class='add'>+&amp;qspi {</div><div class='add'>+	bspi-sel = &lt;0&gt;;</div><div class='add'>+	flash: m25p80@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;12500000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "boot";</div><div class='add'>+			reg = &lt;0x00000000 0x000a0000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@a0000 {</div><div class='add'>+			label = "env";</div><div class='add'>+			reg = &lt;0x000a0000 0x00060000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@100000 {</div><div class='add'>+			label = "system";</div><div class='add'>+			reg = &lt;0x00100000 0x00600000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@700000 {</div><div class='add'>+			label = "rootfs";</div><div class='add'>+			reg = &lt;0x00700000 0x01900000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata_phy0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata_phy1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -167,14 +217,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;sata_phy0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;sata_phy1 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;sata {</div><div class='add'>+&amp;uart0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts<br/>index 05c5f98c8782..f8d47e517e18 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958625k.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm958625k.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm958625k.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm958625k.dts</a></div><div class='hunk'>@@ -53,14 +53,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;uart0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;uart1 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;amac0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -69,27 +61,7 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;pcie0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;pcie1 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;pcie2 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;sata_phy0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;sata_phy1 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;sata {</div><div class='add'>+&amp;amac2 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -112,30 +84,175 @@</div><div class='ctx'> 			reg = &lt;0x00000000 0x00200000&gt;;</div><div class='ctx'> 			read-only;</div><div class='ctx'> 		};</div><div class='del'>-		partition@1 {</div><div class='add'>+		partition@200000 {</div><div class='ctx'> 			label = "nenv";</div><div class='ctx'> 			reg = &lt;0x00200000 0x00400000&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		partition@2 {</div><div class='add'>+		partition@600000 {</div><div class='ctx'> 			label = "nsystem";</div><div class='ctx'> 			reg = &lt;0x00600000 0x00a00000&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		partition@3 {</div><div class='add'>+		partition@1000000 {</div><div class='ctx'> 			label = "nrootfs";</div><div class='ctx'> 			reg = &lt;0x01000000 0x03000000&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		partition@4 {</div><div class='add'>+		partition@4000000 {</div><div class='ctx'> 			label = "ncustfs";</div><div class='ctx'> 			reg = &lt;0x04000000 0x3c000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pcie0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pcie1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pcie2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;nand_sel&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;nand_sel&gt;, &lt;&amp;gpiobs&gt;, &lt;&amp;pwmc&gt;;</div><div class='add'>+</div><div class='ctx'> 	nand_sel: nand_sel {</div><div class='ctx'> 		function = "nand";</div><div class='ctx'> 		groups = "nand_grp";</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	gpiobs: gpiobs {</div><div class='add'>+		function = "gpio_b";</div><div class='add'>+		groups = "gpio_b_0_grp", "gpio_b_1_grp", "gpio_b_2_grp",</div><div class='add'>+			 "gpio_b_3_grp";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pwmc: pwmc {</div><div class='add'>+		function = "pwm";</div><div class='add'>+		groups = "pwm0_grp", "pwm1_grp", "pwm2_grp", "pwm3_grp";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	emmc_sel: emmc_sel {</div><div class='add'>+		function = "emmc";</div><div class='add'>+		groups = "emmc_grp";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	bspi-sel = &lt;0&gt;;</div><div class='add'>+	flash: m25p80@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;12500000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "boot";</div><div class='add'>+			reg = &lt;0x00000000 0x000a0000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@a0000 {</div><div class='add'>+			label = "env";</div><div class='add'>+			reg = &lt;0x000a0000 0x00060000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@100000 {</div><div class='add'>+			label = "system";</div><div class='add'>+			reg = &lt;0x00100000 0x00600000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@700000 {</div><div class='add'>+			label = "rootfs";</div><div class='add'>+			reg = &lt;0x00700000 0x01900000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata_phy0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata_phy1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * By default the sd slot is functional. For emmc to work add "&lt;&amp;emmc_sel&gt;"</div><div class='add'>+ * and delete "&lt;&amp;nand_sel&gt;" in "pinctrl-0" property of pinctrl node. Remove the</div><div class='add'>+ * bus-width property here and disable the nand node with status = "disabled";.</div><div class='add'>+ *</div><div class='add'>+ * Ex: pinctrl-0 = &lt;&amp;emmc_sel&gt;, &lt;&amp;gpiobs&gt;, &lt;&amp;pwmc&gt;;</div><div class='add'>+ */</div><div class='add'>+&amp;sdio {</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	no-1-8-v;</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;srab {</div><div class='add'>+	compatible = "brcm,bcm58625-srab", "brcm,nsp-srab";</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	ports {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		port@0 {</div><div class='add'>+			label = "port0";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port@1 {</div><div class='add'>+			label = "port1";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port@2 {</div><div class='add'>+			label = "port2";</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port@3 {</div><div class='add'>+			label = "port3";</div><div class='add'>+			reg = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port@4 {</div><div class='add'>+			label = "port4";</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port@5 {</div><div class='add'>+			ethernet = &lt;&amp;amac0&gt;;</div><div class='add'>+			label = "cpu";</div><div class='add'>+			reg = &lt;5&gt;;</div><div class='add'>+			fixed-link {</div><div class='add'>+				speed = &lt;1000&gt;;</div><div class='add'>+				full-duplex;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts<br/>index 104afe98a43b..16666324fda8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm988312hr.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/bcm988312hr.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/bcm988312hr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/bcm988312hr.dts</a></div><div class='hunk'>@@ -65,6 +65,14 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;amac1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;amac2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;nand {</div><div class='ctx'> 	nandcs@0 {</div><div class='ctx'> 		compatible = "brcm,nandcs";</div><div class='hunk'>@@ -120,6 +128,40 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;qspi {</div><div class='add'>+	bspi-sel = &lt;0&gt;;</div><div class='add'>+	flash: m25p80@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;12500000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "boot";</div><div class='add'>+			reg = &lt;0x00000000 0x000a0000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@a0000 {</div><div class='add'>+			label = "env";</div><div class='add'>+			reg = &lt;0x000a0000 0x00060000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@100000 {</div><div class='add'>+			label = "system";</div><div class='add'>+			reg = &lt;0x00100000 0x00600000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@700000 {</div><div class='add'>+			label = "rootfs";</div><div class='add'>+			reg = &lt;0x00700000 0x01900000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;sata_phy0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts<br/>index f485308840ab..57aa5f8a7c77 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/berlin2q-marvell-dmp.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/berlin2q-marvell-dmp.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/berlin2q-marvell-dmp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/berlin2q-marvell-dmp.dts</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> 		reg = &lt;0x00000000 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	choosen {</div><div class='add'>+	chosen {</div><div class='ctx'> 		bootargs = "earlyprintk";</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -58,7 +58,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		reg_usb0_vbus: regulator@0 {</div><div class='add'>+		reg_usb0_vbus: regulator_usb0 {</div><div class='ctx'> 			compatible = "regulator-fixed";</div><div class='ctx'> 			regulator-name = "usb0_vbus";</div><div class='ctx'> 			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='hunk'>@@ -67,7 +67,7 @@</div><div class='ctx'> 			enable-active-high;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		reg_usb1_vbus: regulator@1 {</div><div class='add'>+		reg_usb1_vbus: regulator_usb1 {</div><div class='ctx'> 			compatible = "regulator-fixed";</div><div class='ctx'> 			regulator-name = "usb1_vbus";</div><div class='ctx'> 			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='hunk'>@@ -76,7 +76,7 @@</div><div class='ctx'> 			enable-active-high;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		reg_usb2_vbus: regulator@2 {</div><div class='add'>+		reg_usb2_vbus: regulator_usb2 {</div><div class='ctx'> 			compatible = "regulator-fixed";</div><div class='ctx'> 			regulator-name = "usb2_vbus";</div><div class='ctx'> 			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='hunk'>@@ -85,7 +85,7 @@</div><div class='ctx'> 			enable-active-high;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		reg_sdio1_vmmc: regulator@3 {</div><div class='add'>+		reg_sdio1_vmmc: regulator_sdio1_vmmc {</div><div class='ctx'> 			compatible = "regulator-fixed";</div><div class='ctx'> 			regulator-min-microvolt = &lt;3300000&gt;;</div><div class='ctx'> 			regulator-max-microvolt = &lt;3300000&gt;;</div><div class='hunk'>@@ -95,7 +95,7 @@</div><div class='ctx'> 			gpio = &lt;&amp;portb 21 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		reg_sdio1_vqmmc: regulator@4 {</div><div class='add'>+		reg_sdio1_vqmmc: regulator_sido1_vqmmc {</div><div class='ctx'> 			compatible = "regulator-gpio";</div><div class='ctx'> 			regulator-min-microvolt = &lt;1800000&gt;;</div><div class='ctx'> 			regulator-max-microvolt = &lt;3300000&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts b/arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts<br/>new file mode 100644<br/>index 000000000000..bfde32e37123<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts</a></div><div class='hunk'>@@ -0,0 +1,94 @@</div><div class='add'>+/*</div><div class='add'>+ * cloudengines-pogoplug-series-3.dtsi - Device tree file for Cloud Engines PogoPlug Series 3</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Neil Armstrong &lt;narmstrong@baylibre.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Licensed under GPLv2 or later</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "ox820.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Cloud Engines PogoPlug Series 3";</div><div class='add'>+</div><div class='add'>+	compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "earlyprintk";</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		/* 128Mbytes DDR */</div><div class='add'>+		reg = &lt;0x60000000 0x8000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart0;</div><div class='add'>+		gpio0 = &amp;gpio0;</div><div class='add'>+		gpio1 = &amp;gpio1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		blue {</div><div class='add'>+			label = "pogoplug:blue";</div><div class='add'>+			gpios = &lt;&amp;gpio0 2 0&gt;;</div><div class='add'>+			default-state = "keep";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		orange {</div><div class='add'>+			label = "pogoplug:orange";</div><div class='add'>+			gpios = &lt;&amp;gpio1 16 1&gt;;</div><div class='add'>+			default-state = "keep";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		green {</div><div class='add'>+			label = "pogoplug:green";</div><div class='add'>+			gpios = &lt;&amp;gpio1 17 1&gt;;</div><div class='add'>+			default-state = "keep";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;nandc {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_nand&gt;;</div><div class='add'>+</div><div class='add'>+	nand@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		nand-ecc-mode = "soft";</div><div class='add'>+		nand-ecc-algo = "hamming";</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "boot";</div><div class='add'>+			reg = &lt;0x00000000 0x00e00000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@e00000 {</div><div class='add'>+			label = "ubi";</div><div class='add'>+			reg = &lt;0x00e00000 0x07200000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;etha {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_etha_mdio&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts<br/>index 41de15fe15a2..d15107cba765 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/da850-evm.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/da850-evm.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/da850-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/da850-evm.dts</a></div><div class='hunk'>@@ -99,6 +99,7 @@</div><div class='ctx'> 				#size-cells = &lt;1&gt;;</div><div class='ctx'> 				compatible = "m25p64";</div><div class='ctx'> 				spi-max-frequency = &lt;30000000&gt;;</div><div class='add'>+				m25p,fast-read;</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='ctx'> 				partition@0 {</div><div class='ctx'> 					label = "U-Boot-SPL";</div><div class='hunk'>@@ -289,3 +290,23 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;vpif {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;vpif_capture_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* VPIF capture port */</div><div class='add'>+	port {</div><div class='add'>+		vpif_ch0: endpoint@0 {</div><div class='add'>+			  reg = &lt;0&gt;;</div><div class='add'>+			  bus-width = &lt;8&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		vpif_ch1: endpoint@1 {</div><div class='add'>+			  reg = &lt;1&gt;;</div><div class='add'>+			  bus-width = &lt;8&gt;;</div><div class='add'>+			  data-shift = &lt;8&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts<br/>index 7b8ab21fed6c..b837fec70eec 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/da850-lcdk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/da850-lcdk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/da850-lcdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/da850-lcdk.dts</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> /dts-v1/;</div><div class='ctx'> #include "da850.dtsi"</div><div class='ctx'> #include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "DA850/AM1808/OMAP-L138 LCDK";</div><div class='hunk'>@@ -13,6 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial2 = &amp;serial2;</div><div class='add'>+		ethernet0 = &amp;eth0;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='hunk'>@@ -50,6 +52,62 @@</div><div class='ctx'> 			system-clock-frequency = &lt;24576000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		autorepeat;</div><div class='add'>+</div><div class='add'>+		user1 {</div><div class='add'>+			label = "GPIO Key USER1";</div><div class='add'>+			linux,code = &lt;BTN_0&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio 36 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		user2 {</div><div class='add'>+			label = "GPIO Key USER2";</div><div class='add'>+			linux,code = &lt;BTN_1&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio 37 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vga-bridge {</div><div class='add'>+		compatible = "ti,ths8135";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				vga_bridge_in: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;lcdc_out_vga&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+				vga_bridge_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;vga_con_in&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vga {</div><div class='add'>+		compatible = "vga-connector";</div><div class='add'>+</div><div class='add'>+		ddc-i2c-bus = &lt;&amp;i2c0&gt;;</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			vga_con_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;vga_bridge_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;pmx_core {</div><div class='hunk'>@@ -104,6 +162,10 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;sata {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;mdio {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;mdio_pins&gt;;</div><div class='hunk'>@@ -122,7 +184,7 @@</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;mmc0_pins&gt;;</div><div class='del'>-	cd-gpios = &lt;&amp;gpio 64 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio 64 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -158,6 +220,18 @@</div><div class='ctx'> 	rx-num-evt = &lt;32&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;usb_phy {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;aemif {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;nand_pins&gt;;</div><div class='hunk'>@@ -219,3 +293,36 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;prictrl {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;memctrl {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;lcdc {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;lcd_pins&gt;;</div><div class='add'>+</div><div class='add'>+	port {</div><div class='add'>+		lcdc_out_vga: endpoint {</div><div class='add'>+			remote-endpoint = &lt;&amp;vga_bridge_in&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;vpif {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;vpif_capture_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* VPIF capture port */</div><div class='add'>+	port {</div><div class='add'>+		vpif_ch0: endpoint {</div><div class='add'>+			  bus-width = &lt;8&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts<br/>new file mode 100644<br/>index 000000000000..112ec92064ce<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/da850-lego-ev3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/da850-lego-ev3.dts</a></div><div class='hunk'>@@ -0,0 +1,313 @@</div><div class='add'>+/*</div><div class='add'>+ * Device tree for LEGO MINDSTORMS EV3</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 David Lechner &lt;david@lechnology.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation, version 2.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/linux-event-codes.h&gt;</div><div class='add'>+#include &lt;dt-bindings/pwm/pwm.h&gt;</div><div class='add'>+</div><div class='add'>+#include "da850.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "lego,ev3", "ti,da850";</div><div class='add'>+	model = "LEGO MINDSTORMS EV3";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@c0000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0xc0000000 0x04000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The buttons on the EV3 are mapped to keyboard keys.</div><div class='add'>+	 */</div><div class='add'>+	gpio_keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		label = "EV3 Brick Buttons";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;button_pins&gt;, &lt;&amp;button_bias&gt;;</div><div class='add'>+</div><div class='add'>+		center {</div><div class='add'>+			label = "Center";</div><div class='add'>+			linux,code = &lt;KEY_ENTER&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio 29 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		left {</div><div class='add'>+			label = "Left";</div><div class='add'>+			linux,code = &lt;KEY_LEFT&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio 102 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		back {</div><div class='add'>+			label = "Back";</div><div class='add'>+			linux,code = &lt;KEY_BACKSPACE&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio 106 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		right {</div><div class='add'>+			label = "Right";</div><div class='add'>+			linux,code = &lt;KEY_RIGHT&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio 124 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		down {</div><div class='add'>+			label = "Down";</div><div class='add'>+			linux,code = &lt;KEY_DOWN&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio 126 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		up {</div><div class='add'>+			label = "Up";</div><div class='add'>+			linux,code = &lt;KEY_UP&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio 127 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The EV3 has two built-in bi-color LEDs behind the buttons.</div><div class='add'>+	 */</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;led_pins&gt;;</div><div class='add'>+</div><div class='add'>+		left_green {</div><div class='add'>+			label = "led0:green:brick-status";</div><div class='add'>+			/* GP6[13] */</div><div class='add'>+			gpios = &lt;&amp;gpio 103 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-on";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		right_red {</div><div class='add'>+			label = "led1:red:brick-status";</div><div class='add'>+			/* GP6[7] */</div><div class='add'>+			gpios = &lt;&amp;gpio 108 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-on";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		left_red {</div><div class='add'>+			label = "led0:red:brick-status";</div><div class='add'>+			/* GP6[12] */</div><div class='add'>+			gpios = &lt;&amp;gpio 109 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-on";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		right_green {</div><div class='add'>+			label = "led1:green:brick-status";</div><div class='add'>+			/* GP6[14] */</div><div class='add'>+			gpios = &lt;&amp;gpio 110 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-on";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The EV3 is powered down by turning off the main 5V supply.</div><div class='add'>+	 */</div><div class='add'>+	gpio-poweroff {</div><div class='add'>+		compatible = "gpio-poweroff";</div><div class='add'>+		gpios = &lt;&amp;gpio 107 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;system_power_pin&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is a 5V current limiting regulator that is shared by USB,</div><div class='add'>+	 * the sensor (input) ports, the motor (output) ports and the A/DC.</div><div class='add'>+	 */</div><div class='add'>+	vcc5v: regulator1 {</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;vcc5v_pins&gt;;</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vcc5v";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio 101 0&gt;;</div><div class='add'>+		over-current-gpios = &lt;&amp;gpio 99 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pmx_core {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	spi0_cs3_pin: pinmux_spi0_cs3_pin {</div><div class='add'>+		pinctrl-single,bits = &lt;</div><div class='add'>+			/* CS3 */</div><div class='add'>+			0xc 0x01000000 0x0f000000</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mmc0_cd_pin: pinmux_mmc0_cd {</div><div class='add'>+		pinctrl-single,bits = &lt;</div><div class='add'>+			/* GP5[14] */</div><div class='add'>+			0x2C 0x00000080 0x000000f0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	button_pins: pinmux_button_pins {</div><div class='add'>+		pinctrl-single,bits = &lt;</div><div class='add'>+			/* GP1[13] */</div><div class='add'>+			0x8 0x00000800 0x00000f00</div><div class='add'>+			/* GP6[10] */</div><div class='add'>+			0x34 0x00800000 0x00f00000</div><div class='add'>+			/* GP6[6] */</div><div class='add'>+			0x38 0x00000080 0x000000f0</div><div class='add'>+			/* GP7[12], GP7[14], GP7[15] */</div><div class='add'>+			0x40 0x00808800 0x00f0ff00</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	led_pins: pinmux_led_pins {</div><div class='add'>+		pinctrl-single,bits = &lt;</div><div class='add'>+			/* GP6[12], GP6[13], GP6[14] */</div><div class='add'>+			0x34 0x00008880 0x0000fff0</div><div class='add'>+			/* GP6[7] */</div><div class='add'>+			0x38 0x00000008 0x0000000f</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	system_power_pin: pinmux_system_power {</div><div class='add'>+		pinctrl-single,bits = &lt;</div><div class='add'>+			/* GP6[11] */</div><div class='add'>+			0x34 0x00080000 0x000f0000</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc5v_pins: pinmux_vcc5v {</div><div class='add'>+		pinctrl-single,bits = &lt;</div><div class='add'>+			/* GP6[5] */</div><div class='add'>+			0x40 0x00000080 0x000000f0</div><div class='add'>+			/* GP6[3] */</div><div class='add'>+			0x4c 0x00008000 0x0000f000</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinconf {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* Buttons have external pulldown resistors */</div><div class='add'>+	button_bias: button-bias-groups {</div><div class='add'>+		disable {</div><div class='add'>+			groups = "cp5", "cp24", "cp25", "cp28";</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Input port 1 */</div><div class='add'>+&amp;serial1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;serial1_rxtx_pins&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rtc0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	clock-frequency = &lt;400000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c0_pins&gt;;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * EEPROM contains the first stage bootloader, HW ID and Bluetooth MAC.</div><div class='add'>+	 */</div><div class='add'>+	eeprom@50 {</div><div class='add'>+		compatible = "microchip,24c128";</div><div class='add'>+		pagesize = &lt;64&gt;;</div><div class='add'>+		read-only;</div><div class='add'>+		reg = &lt;0x50&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;wdt {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	max-frequency = &lt;50000000&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio 94 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc0_pins&gt;, &lt;&amp;mmc0_cd_pin&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi0_pins&gt;, &lt;&amp;spi0_cs0_pin&gt;, &lt;&amp;spi0_cs3_pin&gt;;</div><div class='add'>+</div><div class='add'>+	flash@0 {</div><div class='add'>+		compatible = "n25q128a13", "jedec,spi-nor";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;50000000&gt;;</div><div class='add'>+		ti,spi-wdelay = &lt;8&gt;;</div><div class='add'>+</div><div class='add'>+		/* Partitions are based on the official firmware from LEGO */</div><div class='add'>+		partitions {</div><div class='add'>+			compatible = "fixed-partitions";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			partition@0 {</div><div class='add'>+				label = "U-Boot";</div><div class='add'>+				reg = &lt;0 0x40000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@40000 {</div><div class='add'>+				label = "U-Boot Env";</div><div class='add'>+				reg = &lt;0x40000 0x10000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@50000 {</div><div class='add'>+				label = "Kernel";</div><div class='add'>+				reg = &lt;0x50000 0x200000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@250000 {</div><div class='add'>+				label = "Filesystem";</div><div class='add'>+				reg = &lt;0x250000 0xa50000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@cb0000 {</div><div class='add'>+				label = "Storage";</div><div class='add'>+				reg = &lt;0xcb0000 0x2f0000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gpio {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_phy {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	vbus-supply = &lt;&amp;vcc5v&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi<br/>index f79e1b91c680..92d633d1da68 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/da850.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/da850.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/da850.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/da850.dtsi</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> 			reg = &lt;0x14120 0x50&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;2&gt;;</div><div class='ctx'> 			pinctrl-single,bit-per-mux;</div><div class='ctx'> 			pinctrl-single,register-width = &lt;32&gt;;</div><div class='ctx'> 			pinctrl-single,function-mask = &lt;0xf&gt;;</div><div class='hunk'>@@ -186,7 +187,54 @@</div><div class='ctx'> 					0xc 0x88888888 0xffffffff</div><div class='ctx'> 				&gt;;</div><div class='ctx'> 			};</div><div class='add'>+			lcd_pins: pinmux_lcd_pins {</div><div class='add'>+				pinctrl-single,bits = &lt;</div><div class='add'>+					/*</div><div class='add'>+					 * LCD_D[2], LCD_D[3], LCD_D[4], LCD_D[5],</div><div class='add'>+					 * LCD_D[6], LCD_D[7]</div><div class='add'>+					 */</div><div class='add'>+					0x40 0x22222200 0xffffff00</div><div class='add'>+					/*</div><div class='add'>+					 * LCD_D[10], LCD_D[11], LCD_D[12], LCD_D[13],</div><div class='add'>+					 * LCD_D[14], LCD_D[15], LCD_D[0], LCD_D[1]</div><div class='add'>+					 */</div><div class='add'>+					0x44 0x22222222 0xffffffff</div><div class='add'>+					/* LCD_D[8], LCD_D[9] */</div><div class='add'>+					0x48 0x00000022 0x000000ff</div><div class='ctx'> </div><div class='add'>+					/* LCD_PCLK */</div><div class='add'>+					0x48 0x02000000 0x0f000000</div><div class='add'>+					/* LCD_AC_ENB_CS, LCD_VSYNC, LCD_HSYNC */</div><div class='add'>+					0x4c 0x02000022 0x0f0000ff</div><div class='add'>+				&gt;;</div><div class='add'>+			};</div><div class='add'>+			vpif_capture_pins: vpif_capture_pins {</div><div class='add'>+				pinctrl-single,bits = &lt;</div><div class='add'>+					/* VP_DIN[2..7], VP_CLKIN1, VP_CLKIN0 */</div><div class='add'>+					0x38 0x11111111 0xffffffff</div><div class='add'>+					/* VP_DIN[10..15,0..1] */</div><div class='add'>+					0x3c 0x11111111 0xffffffff</div><div class='add'>+					/* VP_DIN[8..9] */</div><div class='add'>+					0x40 0x00000011 0x000000ff</div><div class='add'>+					/* VP_CLKIN3, VP_CLKIN2 */</div><div class='add'>+					0x4c 0x00010100 0x000f0f00</div><div class='add'>+				&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		prictrl: priority-controller@14110 {</div><div class='add'>+			compatible = "ti,da850-mstpri";</div><div class='add'>+			reg = &lt;0x14110 0x0c&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		cfgchip: chip-controller@1417c {</div><div class='add'>+			compatible = "ti,da830-cfgchip", "syscon", "simple-mfd";</div><div class='add'>+			reg = &lt;0x1417c 0x14&gt;;</div><div class='add'>+</div><div class='add'>+			usb_phy: usb-phy {</div><div class='add'>+				compatible = "ti,da830-usb-phy";</div><div class='add'>+				#phy-cells = &lt;1&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> 		edma0: edma@0 {</div><div class='ctx'> 			compatible = "ti,edma3-tpcc";</div><div class='hunk'>@@ -229,22 +277,25 @@</div><div class='ctx'> 			interrupt-names = "edm3_tcerrint";</div><div class='ctx'> 		};</div><div class='ctx'> 		serial0: serial@42000 {</div><div class='del'>-			compatible = "ns16550a";</div><div class='add'>+			compatible = "ti,da830-uart", "ns16550a";</div><div class='ctx'> 			reg = &lt;0x42000 0x100&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			interrupts = &lt;25&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 		serial1: serial@10c000 {</div><div class='del'>-			compatible = "ns16550a";</div><div class='add'>+			compatible = "ti,da830-uart", "ns16550a";</div><div class='ctx'> 			reg = &lt;0x10c000 0x100&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			interrupts = &lt;53&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 		serial2: serial@10d000 {</div><div class='del'>-			compatible = "ns16550a";</div><div class='add'>+			compatible = "ti,da830-uart", "ns16550a";</div><div class='ctx'> 			reg = &lt;0x10d000 0x100&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			interrupts = &lt;61&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -280,14 +331,30 @@</div><div class='ctx'> 		mmc0: mmc@40000 {</div><div class='ctx'> 			compatible = "ti,da830-mmc";</div><div class='ctx'> 			reg = &lt;0x40000 0x1000&gt;;</div><div class='add'>+			cap-sd-highspeed;</div><div class='add'>+			cap-mmc-highspeed;</div><div class='ctx'> 			interrupts = &lt;16&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;edma0 16 0&gt;, &lt;&amp;edma0 17 0&gt;;</div><div class='ctx'> 			dma-names = "rx", "tx";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+		vpif: video@217000 {</div><div class='add'>+			compatible = "ti,da850-vpif";</div><div class='add'>+			reg = &lt;0x217000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;92&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			/* VPIF capture port */</div><div class='add'>+			port {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 		mmc1: mmc@21b000 {</div><div class='ctx'> 			compatible = "ti,da830-mmc";</div><div class='ctx'> 			reg = &lt;0x21b000 0x1000&gt;;</div><div class='add'>+			cap-sd-highspeed;</div><div class='add'>+			cap-mmc-highspeed;</div><div class='ctx'> 			interrupts = &lt;72&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;edma1 28 0&gt;, &lt;&amp;edma1 29 0&gt;;</div><div class='ctx'> 			dma-names = "rx", "tx";</div><div class='hunk'>@@ -336,6 +403,8 @@</div><div class='ctx'> 			num-cs = &lt;6&gt;;</div><div class='ctx'> 			ti,davinci-spi-intr-line = &lt;1&gt;;</div><div class='ctx'> 			interrupts = &lt;20&gt;;</div><div class='add'>+			dmas = &lt;&amp;edma0 14 0&gt;, &lt;&amp;edma0 15 0&gt;;</div><div class='add'>+			dma-names = "rx", "tx";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 		spi1: spi@30e000 {</div><div class='hunk'>@@ -350,6 +419,22 @@</div><div class='ctx'> 			dma-names = "rx", "tx";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+		usb0: usb@200000 {</div><div class='add'>+			compatible = "ti,da830-musb";</div><div class='add'>+			reg = &lt;0x200000 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;58&gt;;</div><div class='add'>+			interrupt-names = "mc";</div><div class='add'>+			dr_mode = "otg";</div><div class='add'>+			phys = &lt;&amp;usb_phy 0&gt;;</div><div class='add'>+			phy-names = "usb-phy";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		sata: sata@218000 {</div><div class='add'>+			compatible = "ti,da850-ahci";</div><div class='add'>+			reg = &lt;0x218000 0x2000&gt;, &lt;0x22c018 0x4&gt;;</div><div class='add'>+			interrupts = &lt;67&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 		mdio: mdio@224000 {</div><div class='ctx'> 			compatible = "ti,davinci_mdio";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -372,6 +457,14 @@</div><div class='ctx'> 					&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+		usb1: usb@225000 {</div><div class='add'>+			compatible = "ti,da830-ohci";</div><div class='add'>+			reg = &lt;0x225000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;59&gt;;</div><div class='add'>+			phys = &lt;&amp;usb_phy 1&gt;;</div><div class='add'>+			phy-names = "usb-phy";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 		gpio: gpio@226000 {</div><div class='ctx'> 			compatible = "ti,dm6441-gpio";</div><div class='ctx'> 			gpio-controller;</div><div class='hunk'>@@ -386,6 +479,11 @@</div><div class='ctx'> 			ti,davinci-gpio-unbanked = &lt;0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+		pinconf: pin-controller@22c00c {</div><div class='add'>+			compatible = "ti,da850-pupd";</div><div class='add'>+			reg = &lt;0x22c00c 0x8&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> </div><div class='ctx'> 		mcasp0: mcasp@100000 {</div><div class='ctx'> 			compatible = "ti,da830-mcasp-audio";</div><div class='hunk'>@@ -399,6 +497,14 @@</div><div class='ctx'> 				&lt;&amp;edma0 0 1&gt;;</div><div class='ctx'> 			dma-names = "tx", "rx";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		lcdc: display@213000 {</div><div class='add'>+			compatible = "ti,da850-tilcdc";</div><div class='add'>+			reg = &lt;0x213000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;52&gt;;</div><div class='add'>+			max-pixelclock = &lt;37500&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> 	aemif: aemif@68000000 {</div><div class='ctx'> 		compatible = "ti,da850-aemif";</div><div class='hunk'>@@ -410,4 +516,9 @@</div><div class='ctx'> 			  1 0 0x68000000 0x00008000&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='add'>+	memctrl: memory-controller@b0000000 {</div><div class='add'>+		compatible = "ti,da850-ddr-controller";</div><div class='add'>+		reg = &lt;0xb0000000 0xe8&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi<br/>index ff90a6ce6bdc..9708157f5daf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/dm814x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/dm814x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/dm814x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dm814x.dtsi</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> 	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> 	#address-cells = &lt;1&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='add'>+	chosen { };</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		i2c0 = &amp;i2c1;</div><div class='hunk'>@@ -251,7 +252,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart1: uart@20000 {</div><div class='del'>-				compatible = "ti,omap3-uart";</div><div class='add'>+				compatible = "ti,am3352-uart", "ti,omap3-uart";</div><div class='ctx'> 				ti,hwmods = "uart1";</div><div class='ctx'> 				reg = &lt;0x20000 0x2000&gt;;</div><div class='ctx'> 				clock-frequency = &lt;48000000&gt;;</div><div class='hunk'>@@ -261,7 +262,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart2: uart@22000 {</div><div class='del'>-				compatible = "ti,omap3-uart";</div><div class='add'>+				compatible = "ti,am3352-uart", "ti,omap3-uart";</div><div class='ctx'> 				ti,hwmods = "uart2";</div><div class='ctx'> 				reg = &lt;0x22000 0x2000&gt;;</div><div class='ctx'> 				clock-frequency = &lt;48000000&gt;;</div><div class='hunk'>@@ -271,7 +272,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart3: uart@24000 {</div><div class='del'>-				compatible = "ti,omap3-uart";</div><div class='add'>+				compatible = "ti,am3352-uart", "ti,omap3-uart";</div><div class='ctx'> 				ti,hwmods = "uart3";</div><div class='ctx'> 				reg = &lt;0x24000 0x2000&gt;;</div><div class='ctx'> 				clock-frequency = &lt;48000000&gt;;</div><div class='hunk'>@@ -331,10 +332,11 @@</div><div class='ctx'> 				ranges = &lt;0 0x140000 0x20000&gt;;</div><div class='ctx'> </div><div class='ctx'> 				scm_conf: scm_conf@0 {</div><div class='del'>-					compatible = "syscon";</div><div class='add'>+					compatible = "syscon", "simple-bus";</div><div class='ctx'> 					reg = &lt;0x0 0x800&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;1&gt;;</div><div class='add'>+					ranges = &lt;0 0 0x800&gt;;</div><div class='ctx'> </div><div class='ctx'> 					scm_clocks: clocks {</div><div class='ctx'> 						#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -373,6 +375,7 @@</div><div class='ctx'> 					reg = &lt;0x800 0x438&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+					#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 					pinctrl-single,register-width = &lt;32&gt;;</div><div class='ctx'> 					pinctrl-single,function-mask = &lt;0x307ff&gt;;</div><div class='ctx'> 				};</div><div class='hunk'>@@ -508,7 +511,6 @@</div><div class='ctx'> 			cpdma_channels = &lt;8&gt;;</div><div class='ctx'> 			ale_entries = &lt;1024&gt;;</div><div class='ctx'> 			bd_ram_size = &lt;0x2000&gt;;</div><div class='del'>-			no_bd_ram = &lt;0&gt;;</div><div class='ctx'> 			mac_control = &lt;0x20&gt;;</div><div class='ctx'> 			slaves = &lt;2&gt;;</div><div class='ctx'> 			active_slave = &lt;0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi<br/>index f1e0f771ff29..276211e1ee53 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/dm816x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/dm816x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/dm816x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dm816x.dtsi</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> 	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> 	#address-cells = &lt;1&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='add'>+	chosen { };</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		i2c0 = &amp;i2c1;</div><div class='hunk'>@@ -83,6 +84,7 @@</div><div class='ctx'> 			reg = &lt;0x48140000 0x21000&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 			ranges = &lt;0 0x48140000 0x21000&gt;;</div><div class='ctx'> </div><div class='ctx'> 			dm816x_pinmux: pinmux@800 {</div><div class='hunk'>@@ -90,6 +92,7 @@</div><div class='ctx'> 				reg = &lt;0x800 0x50a&gt;;</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='add'>+				#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 				pinctrl-single,register-width = &lt;16&gt;;</div><div class='ctx'> 				pinctrl-single,function-mask = &lt;0xf&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -370,7 +373,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		uart1: uart@48020000 {</div><div class='del'>-			compatible = "ti,omap3-uart";</div><div class='add'>+			compatible = "ti,am3352-uart", "ti,omap3-uart";</div><div class='ctx'> 			ti,hwmods = "uart1";</div><div class='ctx'> 			reg = &lt;0x48020000 0x2000&gt;;</div><div class='ctx'> 			clock-frequency = &lt;48000000&gt;;</div><div class='hunk'>@@ -380,7 +383,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		uart2: uart@48022000 {</div><div class='del'>-			compatible = "ti,omap3-uart";</div><div class='add'>+			compatible = "ti,am3352-uart", "ti,omap3-uart";</div><div class='ctx'> 			ti,hwmods = "uart2";</div><div class='ctx'> 			reg = &lt;0x48022000 0x2000&gt;;</div><div class='ctx'> 			clock-frequency = &lt;48000000&gt;;</div><div class='hunk'>@@ -390,7 +393,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		uart3: uart@48024000 {</div><div class='del'>-			compatible = "ti,omap3-uart";</div><div class='add'>+			compatible = "ti,am3352-uart", "ti,omap3-uart";</div><div class='ctx'> 			ti,hwmods = "uart3";</div><div class='ctx'> 			reg = &lt;0x48024000 0x2000&gt;;</div><div class='ctx'> 			clock-frequency = &lt;48000000&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/dove-cm-a510.dtsi b/arch/arm/boot/dts/dove-cm-a510.dtsi<br/>index 59b4056b478f..9b9dfbe07be4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/dove-cm-a510.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/dove-cm-a510.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/dove-cm-a510.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dove-cm-a510.dtsi</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; version 2 of the</div><div class='ctx'>  *     License.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/dove-sbc-a510.dts b/arch/arm/boot/dts/dove-sbc-a510.dts<br/>index 288e707dea99..2bb85a9b7614 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/dove-sbc-a510.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/dove-sbc-a510.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/dove-sbc-a510.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dove-sbc-a510.dts</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; version 2 of the</div><div class='ctx'>  *     License.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts<br/>index 132f2be10889..4bc4b575c99b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/dra7-evm.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/dra7-evm.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/dra7-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra7-evm.dts</a></div><div class='hunk'>@@ -21,6 +21,10 @@</div><div class='ctx'> 		reg = &lt;0x0 0x80000000 0x0 0x60000000&gt;; /* 1536 MB */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	evm_3v3_sd: fixedregulator-sd {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "evm_3v3_sd";</div><div class='hunk'>@@ -151,204 +155,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;dra7_pmx_core {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;vtt_pin&gt;;</div><div class='del'>-</div><div class='del'>-	vtt_pin: pinmux_vtt_pin {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37b4, PIN_OUTPUT | MUX_MODE14) /* spi1_cs1.gpio7_11 */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c1_pins: pinmux_i2c1_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3800, PIN_INPUT | MUX_MODE0) /* i2c1_sda */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3804, PIN_INPUT | MUX_MODE0) /* i2c1_scl */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c2_pins: pinmux_i2c2_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3808, PIN_INPUT | MUX_MODE0) /* i2c2_sda */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x380c, PIN_INPUT | MUX_MODE0) /* i2c2_scl */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c3_pins: pinmux_i2c3_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3688, PIN_INPUT | MUX_MODE9) /* gpio6_14.i2c3_sda */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x368c, PIN_INPUT | MUX_MODE9) /* gpio6_15.i2c3_scl */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mcspi1_pins: pinmux_mcspi1_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37a4, PIN_INPUT | MUX_MODE0) /* spi1_sclk */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37a8, PIN_INPUT | MUX_MODE0) /* spi1_d1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37ac, PIN_INPUT | MUX_MODE0) /* spi1_d0 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37b0, PIN_INPUT_SLEW | MUX_MODE0) /* spi1_cs0 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37b8, PIN_INPUT_SLEW | MUX_MODE6) /* spi1_cs2.hdmi1_hpd */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37bc, PIN_INPUT_SLEW | MUX_MODE6) /* spi1_cs3.hdmi1_cec */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mcspi2_pins: pinmux_mcspi2_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37c0, PIN_INPUT | MUX_MODE0) /* spi2_sclk */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37c4, PIN_INPUT_SLEW | MUX_MODE0) /* spi2_d1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37c8, PIN_INPUT_SLEW | MUX_MODE0) /* spi2_d1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37cc, PIN_INPUT_SLEW | MUX_MODE0) /* spi2_cs0 */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	uart1_pins: pinmux_uart1_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37e0, PIN_INPUT_SLEW | MUX_MODE0) /* uart1_rxd */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37e4, PIN_INPUT_SLEW | MUX_MODE0) /* uart1_txd */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37e8, PIN_INPUT | MUX_MODE3) /* uart1_ctsn */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37ec, PIN_INPUT | MUX_MODE3) /* uart1_rtsn */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	uart2_pins: pinmux_uart2_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37f0, PIN_INPUT | MUX_MODE0) /* uart2_rxd */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37f4, PIN_INPUT | MUX_MODE0) /* uart2_txd */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37f8, PIN_INPUT | MUX_MODE0) /* uart2_ctsn */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT | MUX_MODE0) /* uart2_rtsn */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	uart3_pins: pinmux_uart3_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3648, PIN_INPUT_SLEW | MUX_MODE0) /* uart3_rxd */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x364c, PIN_INPUT_SLEW | MUX_MODE0) /* uart3_txd */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	usb1_pins: pinmux_usb1_pins {</div><div class='del'>-                pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3680, PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */</div><div class='del'>-                &gt;;</div><div class='del'>-        };</div><div class='del'>-</div><div class='del'>-	usb2_pins: pinmux_usb2_pins {</div><div class='del'>-                pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3684, PIN_INPUT_SLEW | MUX_MODE0) /* usb2_drvvbus */</div><div class='del'>-                &gt;;</div><div class='del'>-        };</div><div class='del'>-</div><div class='del'>-	nand_flash_x16: nand_flash_x16 {</div><div class='del'>-		/* On DRA7 EVM, GPMC_WPN and NAND_BOOTn comes from DIP switch</div><div class='del'>-		 * So NAND flash requires following switch settings:</div><div class='del'>-		 * SW5.1 (NAND_BOOTn) = ON (LOW)</div><div class='del'>-		 * SW5.9 (GPMC_WPN) = OFF (HIGH)</div><div class='del'>-		 */</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3400, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad0	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3404, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad1	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3408, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad2	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x340c, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad3	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3410, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad4	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3414, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad5	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3418, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad6	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x341c, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad7	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3420, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad8	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3424, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad9	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3428, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad10	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x342c, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad11	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3430, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad12	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3434, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad13	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3438, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad14	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x343c, PIN_INPUT  | MUX_MODE0)	/* gpmc_ad15	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34d8, PIN_INPUT_PULLUP  | MUX_MODE0)	/* gpmc_wait0	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34cc, PIN_OUTPUT | MUX_MODE0)	/* gpmc_wen	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34b4, PIN_OUTPUT_PULLUP | MUX_MODE0)	/* gpmc_csn0	*/</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34c4, PIN_OUTPUT | MUX_MODE0)	/* gpmc_advn_ale */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34c8, PIN_OUTPUT | MUX_MODE0)	/* gpmc_oen_ren	 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34d0, PIN_OUTPUT | MUX_MODE0)	/* gpmc_be0n_cle */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpsw_default: cpsw_default {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			/* Slave 1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3650, PIN_OUTPUT | MUX_MODE0)	/* rgmii0_txc.rgmii0_txc */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3654, PIN_OUTPUT | MUX_MODE0)	/* rgmii0_txctl.rgmii0_txctl */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3658, PIN_OUTPUT | MUX_MODE0)	/* rgmii0_td3.rgmii0_txd3 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x365c, PIN_OUTPUT | MUX_MODE0)	/* rgmii0_txd2.rgmii0_txd2 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3660, PIN_OUTPUT | MUX_MODE0)	/* rgmii0_txd1.rgmii0_txd1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3664, PIN_OUTPUT | MUX_MODE0)	/* rgmii0_txd0.rgmii0_txd0 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3668, PIN_INPUT | MUX_MODE0)	/* rgmii0_rxc.rgmii0_rxc */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x366c, PIN_INPUT | MUX_MODE0)	/* rgmii0_rxctl.rgmii0_rxctl */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3670, PIN_INPUT | MUX_MODE0)	/* rgmii0_rxd3.rgmii0_rxd3 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3674, PIN_INPUT | MUX_MODE0)	/* rgmii0_rxd2.rgmii0_rxd2 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3678, PIN_INPUT | MUX_MODE0)	/* rgmii0_rxd1.rgmii0_rxd1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x367c, PIN_INPUT | MUX_MODE0)	/* rgmii0_rxd0.rgmii0_rxd0 */</div><div class='del'>-</div><div class='del'>-			/* Slave 2 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3598, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d12.rgmii1_txc */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x359c, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d13.rgmii1_tctl */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a0, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d14.rgmii1_td3 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a4, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d15.rgmii1_td2 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a8, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d16.rgmii1_td1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35ac, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d17.rgmii1_td0 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b0, PIN_INPUT | MUX_MODE3)	/* vin2a_d18.rgmii1_rclk */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b4, PIN_INPUT | MUX_MODE3)	/* vin2a_d19.rgmii1_rctl */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b8, PIN_INPUT | MUX_MODE3)	/* vin2a_d20.rgmii1_rd3 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35bc, PIN_INPUT | MUX_MODE3)	/* vin2a_d21.rgmii1_rd2 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35c0, PIN_INPUT | MUX_MODE3)	/* vin2a_d22.rgmii1_rd1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35c4, PIN_INPUT | MUX_MODE3)	/* vin2a_d23.rgmii1_rd0 */</div><div class='del'>-		&gt;;</div><div class='del'>-</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpsw_sleep: cpsw_sleep {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			/* Slave 1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3650, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3654, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3658, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x365c, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3660, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3664, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3668, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x366c, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3670, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3674, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3678, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x367c, MUX_MODE15)</div><div class='del'>-</div><div class='del'>-			/* Slave 2 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3598, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x359c, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a0, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a4, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a8, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35ac, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b0, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b4, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b8, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35bc, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35c0, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35c4, MUX_MODE15)</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	davinci_mdio_default: davinci_mdio_default {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x363c, PIN_OUTPUT_PULLUP | MUX_MODE0)	/* mdio_d.mdio_d */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3640, PIN_INPUT_PULLUP | MUX_MODE0)	/* mdio_clk.mdio_clk */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	davinci_mdio_sleep: davinci_mdio_sleep {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x363c, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3640, MUX_MODE15)</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	dcan1_pins_default: dcan1_pins_default {</div><div class='ctx'> 		pinctrl-single,pins = &lt;</div><div class='ctx'> 			DRA7XX_CORE_IOPAD(0x37d0, PIN_OUTPUT_PULLUP | MUX_MODE0) /* dcan1_tx */</div><div class='hunk'>@@ -363,36 +169,36 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	atl_pins: pinmux_atl_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3698, PIN_OUTPUT | MUX_MODE5)	/* xref_clk1.atl_clk1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x369c, PIN_OUTPUT | MUX_MODE5)	/* xref_clk2.atl_clk2 */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mcasp3_pins: pinmux_mcasp3_pins {</div><div class='add'>+	mmc1_pins_default: mmc1_pins_default {</div><div class='ctx'> 		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3724, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mcasp3_aclkx */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3728, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mcasp3_fsx */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x372c, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mcasp3_axr0 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3730, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mcasp3_axr1 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x376c, PIN_INPUT | MUX_MODE14)	/* mmc1sdcd.gpio219 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	mcasp3_sleep_pins: pinmux_mcasp3_sleep_pins {</div><div class='add'>+	mmc2_pins_default: mmc2_pins_default {</div><div class='ctx'> 		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3724, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3728, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x372c, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3730, MUX_MODE15)</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x34a0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a24.mmc2_dat0 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x34a4, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a25.mmc2_dat1 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x34a8, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a26.mmc2_dat2 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x34ac, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a27.mmc2_dat3 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x348c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a19.mmc2_dat4 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x3490, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a20.mmc2_dat5 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x3494, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a21.mmc2_dat6 */</div><div class='add'>+			DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c1 {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;i2c1_pins&gt;;</div><div class='ctx'> 	clock-frequency = &lt;400000&gt;;</div><div class='ctx'> </div><div class='ctx'> 	tps659038: tps659038@58 {</div><div class='hunk'>@@ -581,8 +387,6 @@</div><div class='ctx'> </div><div class='ctx'> &amp;i2c2 {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;i2c2_pins&gt;;</div><div class='ctx'> 	clock-frequency = &lt;400000&gt;;</div><div class='ctx'> </div><div class='ctx'> 	pcf_hdmi: gpio@26 {</div><div class='hunk'>@@ -602,45 +406,35 @@</div><div class='ctx'> </div><div class='ctx'> &amp;i2c3 {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;i2c3_pins&gt;;</div><div class='ctx'> 	clock-frequency = &lt;400000&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mcspi1 {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;mcspi1_pins&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mcspi2 {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;mcspi2_pins&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart1 {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;uart1_pins&gt;;</div><div class='ctx'> 	interrupts-extended = &lt;&amp;crossbar_mpu GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 			      &lt;&amp;dra7_pmx_core 0x3e0&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart2 {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;uart2_pins&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart3 {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;uart3_pins&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc1 {</div><div class='ctx'> 	status = "okay";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc1_pins_default&gt;;</div><div class='ctx'> 	vmmc-supply = &lt;&amp;evm_3v3_sd&gt;;</div><div class='ctx'> 	vmmc_aux-supply = &lt;&amp;ldo1_reg&gt;;</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='hunk'>@@ -653,6 +447,8 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mmc2 {</div><div class='ctx'> 	status = "okay";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc2_pins_default&gt;;</div><div class='ctx'> 	vmmc-supply = &lt;&amp;evm_3v3_sw&gt;;</div><div class='ctx'> 	bus-width = &lt;8&gt;;</div><div class='ctx'> };</div><div class='hunk'>@@ -732,14 +528,10 @@</div><div class='ctx'> </div><div class='ctx'> &amp;usb1 {</div><div class='ctx'> 	dr_mode = "peripheral";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;usb1_pins&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb2 {</div><div class='ctx'> 	dr_mode = "host";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;usb2_pins&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;elm {</div><div class='hunk'>@@ -747,9 +539,12 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;gpmc {</div><div class='del'>-	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;nand_flash_x16&gt;;</div><div class='add'>+	/*</div><div class='add'>+	* For the existing IOdelay configuration via U-Boot we don't</div><div class='add'>+	* support NAND on dra7-evm. Keep it disabled. Enabling it</div><div class='add'>+	* requires a different configuration by U-Boot.</div><div class='add'>+	*/</div><div class='add'>+	status = "disabled";</div><div class='ctx'> 	ranges = &lt;0 0 0x08000000 0x01000000&gt;;	/* minimum GPMC partition = 16MB */</div><div class='ctx'> 	nand@0,0 {</div><div class='ctx'> 		compatible = "ti,omap2-nand";</div><div class='hunk'>@@ -845,9 +640,6 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mac {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default", "sleep";</div><div class='del'>-	pinctrl-0 = &lt;&amp;cpsw_default&gt;;</div><div class='del'>-	pinctrl-1 = &lt;&amp;cpsw_sleep&gt;;</div><div class='ctx'> 	dual_emac;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -863,12 +655,6 @@</div><div class='ctx'> 	dual_emac_res_vlan = &lt;2&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;davinci_mdio {</div><div class='del'>-	pinctrl-names = "default", "sleep";</div><div class='del'>-	pinctrl-0 = &lt;&amp;davinci_mdio_default&gt;;</div><div class='del'>-	pinctrl-1 = &lt;&amp;davinci_mdio_sleep&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;dcan1 {</div><div class='ctx'> 	status = "ok";</div><div class='ctx'> 	pinctrl-names = "default", "sleep", "active";</div><div class='hunk'>@@ -878,9 +664,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;atl {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;atl_pins&gt;;</div><div class='del'>-</div><div class='ctx'> 	assigned-clocks = &lt;&amp;abe_dpll_sys_clk_mux&gt;,</div><div class='ctx'> 			  &lt;&amp;atl_gfclk_mux&gt;,</div><div class='ctx'> 			  &lt;&amp;dpll_abe_ck&gt;,</div><div class='hunk'>@@ -899,9 +682,6 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mcasp3 {</div><div class='ctx'> 	#sound-dai-cells = &lt;0&gt;;</div><div class='del'>-	pinctrl-names = "default", "sleep";</div><div class='del'>-	pinctrl-0 = &lt;&amp;mcasp3_pins&gt;;</div><div class='del'>-	pinctrl-1 = &lt;&amp;mcasp3_sleep_pins&gt;;</div><div class='ctx'> </div><div class='ctx'> 	assigned-clocks = &lt;&amp;mcasp3_ahclkx_mux&gt;;</div><div class='ctx'> 	assigned-clock-parents = &lt;&amp;atl_clkin2_ck&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi<br/>index d4fcd68f6349..2c9e56f4aac5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/dra7.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/dra7.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/dra7.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra7.dtsi</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> 	compatible = "ti,dra7xx";</div><div class='ctx'> 	interrupt-parent = &lt;&amp;crossbar_mpu&gt;;</div><div class='add'>+	chosen { };</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		i2c0 = &amp;i2c1;</div><div class='hunk'>@@ -56,7 +57,7 @@</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0x0 0x48211000 0x0 0x1000&gt;,</div><div class='del'>-		      &lt;0x0 0x48212000 0x0 0x1000&gt;,</div><div class='add'>+		      &lt;0x0 0x48212000 0x0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x0 0x48214000 0x0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x0 0x48216000 0x0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='hunk'>@@ -171,6 +172,7 @@</div><div class='ctx'> 					reg = &lt;0x1400 0x0468&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+					#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 					#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 					interrupt-controller;</div><div class='ctx'> 					pinctrl-single,register-width = &lt;32&gt;;</div><div class='hunk'>@@ -1376,6 +1378,7 @@</div><div class='ctx'> 			phy-names = "sata-phy";</div><div class='ctx'> 			clocks = &lt;&amp;sata_ref_clk&gt;;</div><div class='ctx'> 			ti,hwmods = "sata";</div><div class='add'>+			ports-implemented = &lt;0x1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		rtc: rtc@48838000 {</div><div class='hunk'>@@ -1706,7 +1709,6 @@</div><div class='ctx'> 			cpdma_channels = &lt;8&gt;;</div><div class='ctx'> 			ale_entries = &lt;1024&gt;;</div><div class='ctx'> 			bd_ram_size = &lt;0x2000&gt;;</div><div class='del'>-			no_bd_ram = &lt;0&gt;;</div><div class='ctx'> 			mac_control = &lt;0x20&gt;;</div><div class='ctx'> 			slaves = &lt;2&gt;;</div><div class='ctx'> 			active_slave = &lt;0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts<br/>new file mode 100644<br/>index 000000000000..4d57a55473af<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/dra71-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra71-evm.dts</a></div><div class='hunk'>@@ -0,0 +1,235 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dra72-evm-common.dtsi"</div><div class='add'>+#include &lt;dt-bindings/net/ti-dp83867.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "ti,dra718-evm", "ti,dra718", "ti,dra722", "ti,dra72", "ti,dra7";</div><div class='add'>+	model = "TI DRA718 EVM";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x80000000 0x0 0x80000000&gt;; /* 2GB */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vpo_sd_1v8_3v3: gpio-regulator-TPS74801 {</div><div class='add'>+		compatible = "regulator-gpio";</div><div class='add'>+</div><div class='add'>+		regulator-name = "vddshv8";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		vin-supply = &lt;&amp;evm_5v0&gt;;</div><div class='add'>+</div><div class='add'>+		gpios = &lt;&amp;gpio7 11 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		states = &lt;1800000 0x0</div><div class='add'>+			  3000000 0x1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	poweroff: gpio-poweroff {</div><div class='add'>+		compatible = "gpio-poweroff";</div><div class='add'>+		gpios = &lt;&amp;gpio7 30 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		input;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	clock-frequency = &lt;400000&gt;;</div><div class='add'>+</div><div class='add'>+	lp8733: lp8733@60 {</div><div class='add'>+		compatible = "ti,lp8733";</div><div class='add'>+		reg = &lt;0x60&gt;;</div><div class='add'>+</div><div class='add'>+		buck0-in-supply =&lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		buck1-in-supply =&lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		ldo0-in-supply =&lt;&amp;evm_5v0&gt;;</div><div class='add'>+		ldo1-in-supply =&lt;&amp;evm_5v0&gt;;</div><div class='add'>+</div><div class='add'>+		lp8733_regulators: regulators {</div><div class='add'>+			lp8733_buck0_reg: buck0 {</div><div class='add'>+				/* FB_B0 -&gt; LP8733-BUCK1 - VPO_S1_AVS - VDD_CORE_AVS (core, mpu, gpu) */</div><div class='add'>+				regulator-name = "lp8733-buck0";</div><div class='add'>+				regulator-min-microvolt = &lt;850000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1250000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			lp8733_buck1_reg: buck1 {</div><div class='add'>+				/* FB_B1 -&gt; LP8733-BUCK2 - VPO_S2_AVS - VDD_DSP_AVS (DSP/eve/iva) */</div><div class='add'>+				regulator-name = "lp8733-buck1";</div><div class='add'>+				regulator-min-microvolt = &lt;850000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1250000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			lp8733_ldo0_reg: ldo0 {</div><div class='add'>+				/* LDO0 -&gt; LP8733-LDO1 - VPO_L1_3V3 - VDDSHV8 (optional) */</div><div class='add'>+				regulator-name = "lp8733-ldo0";</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			lp8733_ldo1_reg: ldo1 {</div><div class='add'>+				/* LDO1 -&gt; LP8733-LDO2 - VPO_L2_3V3 - VDDA_USB3V3 */</div><div class='add'>+				regulator-name = "lp8733-ldo1";</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lp8732: lp8732@61 {</div><div class='add'>+		compatible = "ti,lp8732";</div><div class='add'>+		reg = &lt;0x61&gt;;</div><div class='add'>+</div><div class='add'>+		buck0-in-supply =&lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		buck1-in-supply =&lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		ldo0-in-supply =&lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		ldo1-in-supply =&lt;&amp;vsys_3v3&gt;;</div><div class='add'>+</div><div class='add'>+		lp8732_regulators: regulators {</div><div class='add'>+			lp8732_buck0_reg: buck0 {</div><div class='add'>+				/* FB_B0 -&gt; LP8732-BUCK1 - VPO_S3_1V8 - VDDS_1V8 */</div><div class='add'>+				regulator-name = "lp8732-buck0";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			lp8732_buck1_reg: buck1 {</div><div class='add'>+				/* FB_B1 -&gt; LP8732-BUCK2 - VPO_S4_DDR - VDD_DDR_1V35 */</div><div class='add'>+				regulator-name = "lp8732-buck1";</div><div class='add'>+				regulator-min-microvolt = &lt;1350000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1350000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			lp8732_ldo0_reg: ldo0 {</div><div class='add'>+				/* LDO0 -&gt; LP8732-LDO1 - VPO_L3_1V8 - VDA_1V8_PLL */</div><div class='add'>+				regulator-name = "lp8732-ldo0";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			lp8732_ldo1_reg: ldo1 {</div><div class='add'>+				/* LDO1 -&gt; LP8732-LDO2 - VPO_L4_1V8 - VDA_1V8_PHY */</div><div class='add'>+				regulator-name = "lp8732-ldo1";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pcf_lcd {</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio7&gt;;</div><div class='add'>+	interrupts = &lt;31 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pcf_gpio_21 {</div><div class='add'>+	interrupt-parent = &lt;&amp;gpio7&gt;;</div><div class='add'>+	interrupts = &lt;31 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pcf_hdmi {</div><div class='add'>+	p0 {</div><div class='add'>+		/*</div><div class='add'>+		 * PM_OEn to High: Disable routing I2C3 to PM_I2C</div><div class='add'>+		 * With this PM_SEL(p3) should not matter</div><div class='add'>+		 */</div><div class='add'>+		gpio-hog;</div><div class='add'>+		gpios = &lt;0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		output-high;</div><div class='add'>+		line-name = "pm_oe_n";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	vmmc_aux-supply = &lt;&amp;vpo_sd_1v8_3v3&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mac {</div><div class='add'>+	mode-gpios = &lt;&amp;pcf_gpio_21 4 GPIO_ACTIVE_LOW&gt;,</div><div class='add'>+		     &lt;&amp;pcf_hdmi 9 GPIO_ACTIVE_LOW&gt;,	/* P11 */</div><div class='add'>+		     &lt;&amp;pcf_hdmi 10 GPIO_ACTIVE_LOW&gt;;	/* P12 */</div><div class='add'>+	dual_emac;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpsw_emac0 {</div><div class='add'>+	phy_id = &lt;&amp;davinci_mdio&gt;, &lt;2&gt;;</div><div class='add'>+	phy-mode = "rgmii-id";</div><div class='add'>+	dual_emac_res_vlan = &lt;1&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpsw_emac1 {</div><div class='add'>+	phy_id = &lt;&amp;davinci_mdio&gt;, &lt;3&gt;;</div><div class='add'>+	phy-mode = "rgmii-id";</div><div class='add'>+	dual_emac_res_vlan = &lt;2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;davinci_mdio {</div><div class='add'>+	dp83867_0: ethernet-phy@2 {</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+		ti,rx-internal-delay = &lt;DP83867_RGMIIDCTL_2_25_NS&gt;;</div><div class='add'>+		ti,tx-internal-delay = &lt;DP83867_RGMIIDCTL_250_PS&gt;;</div><div class='add'>+		ti,fifo-depth = &lt;DP83867_PHYCR_FIFO_DEPTH_8_B_NIB&gt;;</div><div class='add'>+		ti,impedance-control = &lt;0x1f&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dp83867_1: ethernet-phy@3 {</div><div class='add'>+		reg = &lt;3&gt;;</div><div class='add'>+		ti,rx-internal-delay = &lt;DP83867_RGMIIDCTL_2_25_NS&gt;;</div><div class='add'>+		ti,tx-internal-delay = &lt;DP83867_RGMIIDCTL_250_PS&gt;;</div><div class='add'>+		ti,fifo-depth = &lt;DP83867_PHYCR_FIFO_DEPTH_8_B_NIB&gt;;</div><div class='add'>+		ti,impedance-control = &lt;0x1f&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* No Sata on this device */</div><div class='add'>+&amp;sata_phy {</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata {</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* No RTC on this device */</div><div class='add'>+&amp;rtc {</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb2_phy1 {</div><div class='add'>+	phy-supply = &lt;&amp;lp8733_ldo1_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb2_phy2 {</div><div class='add'>+	phy-supply = &lt;&amp;lp8733_ldo1_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dss {</div><div class='add'>+	/* Supplied by VDA_1V8_PLL */</div><div class='add'>+	vdda_video-supply = &lt;&amp;lp8732_ldo0_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hdmi {</div><div class='add'>+	/* Supplied by VDA_1V8_PHY */</div><div class='add'>+	vdda_video-supply = &lt;&amp;lp8732_ldo1_reg&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi<br/>index c94d8d64710d..ad24544adf0f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/dra72-evm-common.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/dra72-evm-common.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/dra72-evm-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra72-evm-common.dtsi</a></div><div class='hunk'>@@ -18,11 +18,53 @@</div><div class='ctx'> 		display0 = &amp;hdmi0;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	evm_12v0: fixedregulator-evm12v0 {</div><div class='add'>+		/* main supply */</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "evm_12v0";</div><div class='add'>+		regulator-min-microvolt = &lt;12000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;12000000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	evm_5v0: fixedregulator-evm5v0 {</div><div class='add'>+		/* Output 1 of TPS43351QDAPRQ1 on dra72-evm */</div><div class='add'>+		/* Output 1 of LM5140QRWGTQ1 on dra71-evm */</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "evm_5v0";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		vin-supply = &lt;&amp;evm_12v0&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vsys_3v3: fixedregulator-vsys3v3 {</div><div class='add'>+		/* Output 2 of TPS43351QDAPRQ1 on dra72-evm */</div><div class='add'>+		/* Output 2 of LM5140QRWGTQ1 on dra71-evm */</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vsys_3v3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		vin-supply = &lt;&amp;evm_12v0&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	evm_3v3_sw: fixedregulator-evm_3v3 {</div><div class='add'>+		/* TPS22965DSG */</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "evm_3v3";</div><div class='ctx'> 		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='ctx'> 		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		vin-supply = &lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		regulator-boot-on;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	aic_dvdd: fixedregulator-aic_dvdd {</div><div class='hunk'>@@ -39,6 +81,7 @@</div><div class='ctx'> 		regulator-name = "evm_3v3_sd";</div><div class='ctx'> 		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='ctx'> 		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		vin-supply = &lt;&amp;evm_3v3_sw&gt;;</div><div class='ctx'> 		enable-active-high;</div><div class='ctx'> 		gpio = &lt;&amp;pcf_gpio_21 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -69,9 +112,6 @@</div><div class='ctx'> 	tpd12s015: encoder {</div><div class='ctx'> 		compatible = "ti,tpd12s015";</div><div class='ctx'> </div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;tpd12s015_pins&gt;;</div><div class='del'>-</div><div class='ctx'> 		gpios = &lt;&amp;pcf_hdmi 4 GPIO_ACTIVE_HIGH&gt;,	/* P4, CT CP HPD */</div><div class='ctx'> 			&lt;&amp;pcf_hdmi 5 GPIO_ACTIVE_HIGH&gt;,	/* P5, LS OE */</div><div class='ctx'> 			&lt;&amp;gpio7 12 GPIO_ACTIVE_HIGH&gt;;	/* gpio7_12/sp1_cs2, HPD */</div><div class='hunk'>@@ -134,72 +174,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;dra7_pmx_core {</div><div class='del'>-	i2c1_pins: pinmux_i2c1_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3800, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3804, PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c5_pins: pinmux_i2c5_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x36b4, PIN_INPUT | MUX_MODE10) /* mcasp1_axr0.i2c5_sda */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x36b8, PIN_INPUT | MUX_MODE10) /* mcasp1_axr1.i2c5_scl */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c5_pins: pinmux_i2c5_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x36b4, PIN_INPUT | MUX_MODE10) /* mcasp1_axr0.i2c5_sda */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x36b8, PIN_INPUT | MUX_MODE10) /* mcasp1_axr1.i2c5_scl */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	nand_default: nand_default {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3400, PIN_INPUT  | MUX_MODE0) /* gpmc_ad0 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3404, PIN_INPUT  | MUX_MODE0) /* gpmc_ad1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3408, PIN_INPUT  | MUX_MODE0) /* gpmc_ad2 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x340c, PIN_INPUT  | MUX_MODE0) /* gpmc_ad3 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3410, PIN_INPUT  | MUX_MODE0) /* gpmc_ad4 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3414, PIN_INPUT  | MUX_MODE0) /* gpmc_ad5 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3418, PIN_INPUT  | MUX_MODE0) /* gpmc_ad6 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x341c, PIN_INPUT  | MUX_MODE0) /* gpmc_ad7 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3420, PIN_INPUT  | MUX_MODE0) /* gpmc_ad8 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3424, PIN_INPUT  | MUX_MODE0) /* gpmc_ad9 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3428, PIN_INPUT  | MUX_MODE0) /* gpmc_ad10 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x342c, PIN_INPUT  | MUX_MODE0) /* gpmc_ad11 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3430, PIN_INPUT  | MUX_MODE0) /* gpmc_ad12 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3434, PIN_INPUT  | MUX_MODE0) /* gpmc_ad13 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3438, PIN_INPUT  | MUX_MODE0) /* gpmc_ad14 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x343c, PIN_INPUT  | MUX_MODE0) /* gpmc_ad15 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34b4, PIN_OUTPUT | MUX_MODE0) /* gpmc_cs0 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34c4, PIN_OUTPUT | MUX_MODE0) /* gpmc_advn_ale */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34cc, PIN_OUTPUT | MUX_MODE0) /* gpmc_wen */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34c8, PIN_OUTPUT | MUX_MODE0) /* gpmc_oen_ren */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34d0, PIN_OUTPUT | MUX_MODE0) /* gpmc_ben0 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x34d8, PIN_INPUT  | MUX_MODE0) /* gpmc_wait0 */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	usb1_pins: pinmux_usb1_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3680, PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	usb2_pins: pinmux_usb2_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3684, PIN_INPUT_SLEW | MUX_MODE0) /* usb2_drvvbus */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	tps65917_pins_default: tps65917_pins_default {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3824, PIN_INPUT_PULLUP | MUX_MODE1) /* wakeup3.sys_nirq1 */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	mmc1_pins_default: mmc1_pins_default {</div><div class='ctx'> 		pinctrl-single,pins = &lt;</div><div class='ctx'> 			DRA7XX_CORE_IOPAD(0x376c, PIN_INPUT | MUX_MODE14)	/* mmc1sdcd.gpio219 */</div><div class='hunk'>@@ -240,159 +214,19 @@</div><div class='ctx'> 			DRA7XX_CORE_IOPAD(0x3818, MUX_MODE15 | PULL_UP)	/* wakeup0.off */</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	hdmi_pins: pinmux_hdmi_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3808, PIN_INPUT | MUX_MODE1) /* i2c2_sda.hdmi1_ddc_scl */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x380c, PIN_INPUT | MUX_MODE1) /* i2c2_scl.hdmi1_ddc_sda */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	tpd12s015_pins: pinmux_tpd12s015_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x37b8, PIN_INPUT_PULLDOWN | MUX_MODE14) /* gpio7_12 HPD */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	atl_pins: pinmux_atl_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3698, PIN_OUTPUT | MUX_MODE5)	/* xref_clk1.atl_clk1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x369c, PIN_OUTPUT | MUX_MODE5)	/* xref_clk2.atl_clk2 */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mcasp3_pins: pinmux_mcasp3_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3724, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mcasp3_aclkx */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3728, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mcasp3_fsx */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x372c, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mcasp3_axr0 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3730, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mcasp3_axr1 */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mcasp3_sleep_pins: pinmux_mcasp3_sleep_pins {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3724, PIN_INPUT_PULLDOWN | MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3728, PIN_INPUT_PULLDOWN | MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x372c, PIN_INPUT_PULLDOWN | MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3730, PIN_INPUT_PULLDOWN | MUX_MODE15)</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c1 {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;i2c1_pins&gt;;</div><div class='ctx'> 	clock-frequency = &lt;400000&gt;;</div><div class='ctx'> </div><div class='del'>-	tps65917: tps65917@58 {</div><div class='del'>-		compatible = "ti,tps65917";</div><div class='del'>-		reg = &lt;0x58&gt;;</div><div class='del'>-</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;tps65917_pins_default&gt;;</div><div class='del'>-</div><div class='del'>-		interrupts = &lt;GIC_SPI 2 IRQ_TYPE_NONE&gt;;  /* IRQ_SYS_1N */</div><div class='add'>+	pcf_lcd: gpio@20 {</div><div class='add'>+		compatible = "nxp,pcf8575";</div><div class='add'>+		reg = &lt;0x20&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		ti,system-power-controller;</div><div class='del'>-</div><div class='del'>-		tps65917_pmic {</div><div class='del'>-			compatible = "ti,tps65917-pmic";</div><div class='del'>-</div><div class='del'>-			tps65917_regulators: regulators {</div><div class='del'>-				smps1_reg: smps1 {</div><div class='del'>-					/* VDD_MPU */</div><div class='del'>-					regulator-name = "smps1";</div><div class='del'>-					regulator-min-microvolt = &lt;850000&gt;;</div><div class='del'>-					regulator-max-microvolt = &lt;1250000&gt;;</div><div class='del'>-					regulator-always-on;</div><div class='del'>-					regulator-boot-on;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				smps2_reg: smps2 {</div><div class='del'>-					/* VDD_CORE */</div><div class='del'>-					regulator-name = "smps2";</div><div class='del'>-					regulator-min-microvolt = &lt;850000&gt;;</div><div class='del'>-					regulator-max-microvolt = &lt;1150000&gt;;</div><div class='del'>-					regulator-boot-on;</div><div class='del'>-					regulator-always-on;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				smps3_reg: smps3 {</div><div class='del'>-					/* VDD_GPU IVA DSPEVE */</div><div class='del'>-					regulator-name = "smps3";</div><div class='del'>-					regulator-min-microvolt = &lt;850000&gt;;</div><div class='del'>-					regulator-max-microvolt = &lt;1250000&gt;;</div><div class='del'>-					regulator-boot-on;</div><div class='del'>-					regulator-always-on;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				smps4_reg: smps4 {</div><div class='del'>-					/* VDDS1V8 */</div><div class='del'>-					regulator-name = "smps4";</div><div class='del'>-					regulator-min-microvolt = &lt;1800000&gt;;</div><div class='del'>-					regulator-max-microvolt = &lt;1800000&gt;;</div><div class='del'>-					regulator-always-on;</div><div class='del'>-					regulator-boot-on;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				smps5_reg: smps5 {</div><div class='del'>-					/* VDD_DDR */</div><div class='del'>-					regulator-name = "smps5";</div><div class='del'>-					regulator-min-microvolt = &lt;1350000&gt;;</div><div class='del'>-					regulator-max-microvolt = &lt;1350000&gt;;</div><div class='del'>-					regulator-boot-on;</div><div class='del'>-					regulator-always-on;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				ldo1_reg: ldo1 {</div><div class='del'>-					/* LDO1_OUT --&gt; SDIO  */</div><div class='del'>-					regulator-name = "ldo1";</div><div class='del'>-					regulator-min-microvolt = &lt;1800000&gt;;</div><div class='del'>-					regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-					regulator-always-on;</div><div class='del'>-					regulator-boot-on;</div><div class='del'>-					regulator-allow-bypass;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				ldo3_reg: ldo3 {</div><div class='del'>-					/* VDDA_1V8_PHY */</div><div class='del'>-					regulator-name = "ldo3";</div><div class='del'>-					regulator-min-microvolt = &lt;1800000&gt;;</div><div class='del'>-					regulator-max-microvolt = &lt;1800000&gt;;</div><div class='del'>-					regulator-boot-on;</div><div class='del'>-					regulator-always-on;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				ldo5_reg: ldo5 {</div><div class='del'>-					/* VDDA_1V8_PLL */</div><div class='del'>-					regulator-name = "ldo5";</div><div class='del'>-					regulator-min-microvolt = &lt;1800000&gt;;</div><div class='del'>-					regulator-max-microvolt = &lt;1800000&gt;;</div><div class='del'>-					regulator-always-on;</div><div class='del'>-					regulator-boot-on;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				ldo4_reg: ldo4 {</div><div class='del'>-					/* VDDA_3V_USB: VDDA_USBHS33 */</div><div class='del'>-					regulator-name = "ldo4";</div><div class='del'>-					regulator-min-microvolt = &lt;3300000&gt;;</div><div class='del'>-					regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-					regulator-boot-on;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		tps65917_power_button {</div><div class='del'>-			compatible = "ti,palmas-pwrbutton";</div><div class='del'>-			interrupt-parent = &lt;&amp;tps65917&gt;;</div><div class='del'>-			interrupts = &lt;1 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			wakeup-source;</div><div class='del'>-			ti,palmas-long-press-seconds = &lt;6&gt;;</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pcf_gpio_21: gpio@21 {</div><div class='hunk'>@@ -423,8 +257,6 @@</div><div class='ctx'> </div><div class='ctx'> &amp;i2c5 {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;i2c5_pins&gt;;</div><div class='ctx'> 	clock-frequency = &lt;400000&gt;;</div><div class='ctx'> </div><div class='ctx'> 	pcf_hdmi: pcf8575@26 {</div><div class='hunk'>@@ -461,9 +293,12 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;gpmc {</div><div class='del'>-	status = "okay";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;nand_default&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * For the existing IOdelay configuration via U-Boot we don't</div><div class='add'>+	 * support NAND on dra72-evm. Keep it disabled. Enabling it</div><div class='add'>+	 * requires a different configuration by U-Boot.</div><div class='add'>+	 */</div><div class='add'>+	status = "disabled";</div><div class='ctx'> 	ranges = &lt;0 0 0x08000000 0x01000000&gt;;	/* minimum GPMC partition = 16MB */</div><div class='ctx'> 	nand@0,0 {</div><div class='ctx'> 		/* To use NAND, DIP switch SW5 must be set like so:</div><div class='hunk'>@@ -548,14 +383,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;usb2_phy1 {</div><div class='del'>-	phy-supply = &lt;&amp;ldo4_reg&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;usb2_phy2 {</div><div class='del'>-	phy-supply = &lt;&amp;ldo4_reg&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;omap_dwc3_1 {</div><div class='ctx'> 	extcon = &lt;&amp;extcon_usb1&gt;;</div><div class='ctx'> };</div><div class='hunk'>@@ -566,14 +393,10 @@</div><div class='ctx'> </div><div class='ctx'> &amp;usb1 {</div><div class='ctx'> 	dr_mode = "peripheral";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;usb1_pins&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb2 {</div><div class='ctx'> 	dr_mode = "host";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;usb2_pins&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc1 {</div><div class='hunk'>@@ -581,7 +404,6 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;mmc1_pins_default&gt;;</div><div class='ctx'> 	vmmc-supply = &lt;&amp;evm_3v3_sd&gt;;</div><div class='del'>-	vmmc_aux-supply = &lt;&amp;ldo1_reg&gt;;</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * SDCD signal is not being used here - using the fact that GPIO mode</div><div class='hunk'>@@ -603,71 +425,8 @@</div><div class='ctx'> 	max-frequency = &lt;192000000&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;dra7_pmx_core {</div><div class='del'>-	cpsw_default: cpsw_default {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			/* Slave 2 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3598, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d12.rgmii1_txc */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x359c, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d13.rgmii1_tctl */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a0, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d14.rgmii1_td3 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a4, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d15.rgmii1_td2 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a8, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d16.rgmii1_td1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35ac, PIN_OUTPUT | MUX_MODE3)	/* vin2a_d17.rgmii1_td0 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b0, PIN_INPUT | MUX_MODE3)	/* vin2a_d18.rgmii1_rclk */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b4, PIN_INPUT | MUX_MODE3)	/* vin2a_d19.rgmii1_rctl */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b8, PIN_INPUT | MUX_MODE3)	/* vin2a_d20.rgmii1_rd3 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35bc, PIN_INPUT | MUX_MODE3)	/* vin2a_d21.rgmii1_rd2 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35c0, PIN_INPUT | MUX_MODE3)	/* vin2a_d22.rgmii1_rd1 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35c4, PIN_INPUT | MUX_MODE3)	/* vin2a_d23.rgmii1_rd0 */</div><div class='del'>-		&gt;;</div><div class='del'>-</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpsw_sleep: cpsw_sleep {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			/* Slave 2 */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3598, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x359c, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a0, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a4, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35a8, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35ac, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b0, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b4, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35b8, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35bc, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35c0, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x35c4, MUX_MODE15)</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	davinci_mdio_default: davinci_mdio_default {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			/* MDIO */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x363c, PIN_OUTPUT_PULLUP | MUX_MODE0)	/* mdio_d.mdio_d */</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3640, PIN_INPUT_PULLUP | MUX_MODE0)	/* mdio_clk.mdio_clk */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	davinci_mdio_sleep: davinci_mdio_sleep {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x363c, MUX_MODE15)</div><div class='del'>-			DRA7XX_CORE_IOPAD(0x3640, MUX_MODE15)</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;mac {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-names = "default", "sleep";</div><div class='del'>-	pinctrl-0 = &lt;&amp;cpsw_default&gt;;</div><div class='del'>-	pinctrl-1 = &lt;&amp;cpsw_sleep&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;davinci_mdio {</div><div class='del'>-	pinctrl-names = "default", "sleep";</div><div class='del'>-	pinctrl-0 = &lt;&amp;davinci_mdio_default&gt;;</div><div class='del'>-	pinctrl-1 = &lt;&amp;davinci_mdio_sleep&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;dcan1 {</div><div class='hunk'>@@ -741,16 +500,11 @@</div><div class='ctx'> </div><div class='ctx'> &amp;dss {</div><div class='ctx'> 	status = "ok";</div><div class='del'>-</div><div class='del'>-	vdda_video-supply = &lt;&amp;ldo5_reg&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;hdmi {</div><div class='ctx'> 	status = "ok";</div><div class='ctx'> </div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;hdmi_pins&gt;;</div><div class='del'>-</div><div class='ctx'> 	port {</div><div class='ctx'> 		hdmi_out: endpoint {</div><div class='ctx'> 			remote-endpoint = &lt;&amp;tpd12s015_in&gt;;</div><div class='hunk'>@@ -759,9 +513,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;atl {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;atl_pins&gt;;</div><div class='del'>-</div><div class='ctx'> 	assigned-clocks = &lt;&amp;abe_dpll_sys_clk_mux&gt;,</div><div class='ctx'> 			  &lt;&amp;atl_gfclk_mux&gt;,</div><div class='ctx'> 			  &lt;&amp;dpll_abe_ck&gt;,</div><div class='hunk'>@@ -780,9 +531,6 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mcasp3 {</div><div class='ctx'> 	#sound-dai-cells = &lt;0&gt;;</div><div class='del'>-	pinctrl-names = "default", "sleep";</div><div class='del'>-	pinctrl-0 = &lt;&amp;mcasp3_pins&gt;;</div><div class='del'>-	pinctrl-1 = &lt;&amp;mcasp3_sleep_pins&gt;;</div><div class='ctx'> </div><div class='ctx'> 	assigned-clocks = &lt;&amp;mcasp3_ahclkx_mux&gt;;</div><div class='ctx'> 	assigned-clock-parents = &lt;&amp;atl_clkin2_ck&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/dra72-evm-revc.dts b/arch/arm/boot/dts/dra72-evm-revc.dts<br/>index 064b322a7a04..3ecac56bf504 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/dra72-evm-revc.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/dra72-evm-revc.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/dra72-evm-revc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra72-evm-revc.dts</a></div><div class='hunk'>@@ -17,17 +17,22 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;tps65917_regulators {</div><div class='del'>-	ldo2_reg: ldo2 {</div><div class='del'>-		/* LDO2_OUT --&gt; VDDA_1V8_PHY2 */</div><div class='del'>-		regulator-name = "ldo2";</div><div class='del'>-		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='del'>-		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='del'>-		regulator-always-on;</div><div class='del'>-		regulator-boot-on;</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	tps65917: tps65917@58 {</div><div class='add'>+		reg = &lt;0x58&gt;;</div><div class='add'>+</div><div class='add'>+		interrupts = &lt;GIC_SPI 2 IRQ_TYPE_NONE&gt;;  /* IRQ_SYS_1N */</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#include "dra72-evm-tps65917.dtsi"</div><div class='add'>+</div><div class='add'>+&amp;ldo2_reg {</div><div class='add'>+	/* LDO2_OUT --&gt; VDDA_1V8_PHY2 */</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-boot-on;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;hdmi {</div><div class='ctx'> 	vdda-supply = &lt;&amp;ldo2_reg&gt;;</div><div class='ctx'> };</div><div class='hunk'>@@ -59,15 +64,21 @@</div><div class='ctx'> &amp;davinci_mdio {</div><div class='ctx'> 	dp83867_0: ethernet-phy@2 {</div><div class='ctx'> 		reg = &lt;2&gt;;</div><div class='del'>-		ti,rx-internal-delay = &lt;DP83867_RGMIIDCTL_2_00_NS&gt;;</div><div class='del'>-		ti,tx-internal-delay = &lt;DP83867_RGMIIDCTL_1_NS&gt;;</div><div class='add'>+		ti,rx-internal-delay = &lt;DP83867_RGMIIDCTL_2_25_NS&gt;;</div><div class='add'>+		ti,tx-internal-delay = &lt;DP83867_RGMIIDCTL_250_PS&gt;;</div><div class='ctx'> 		ti,fifo-depth = &lt;DP83867_PHYCR_FIFO_DEPTH_8_B_NIB&gt;;</div><div class='add'>+		ti,min-output-impedance;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio6&gt;;</div><div class='add'>+		interrupts = &lt;16 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dp83867_1: ethernet-phy@3 {</div><div class='ctx'> 		reg = &lt;3&gt;;</div><div class='del'>-		ti,rx-internal-delay = &lt;DP83867_RGMIIDCTL_2_00_NS&gt;;</div><div class='del'>-		ti,tx-internal-delay = &lt;DP83867_RGMIIDCTL_1_NS&gt;;</div><div class='add'>+		ti,rx-internal-delay = &lt;DP83867_RGMIIDCTL_2_25_NS&gt;;</div><div class='add'>+		ti,tx-internal-delay = &lt;DP83867_RGMIIDCTL_250_PS&gt;;</div><div class='ctx'> 		ti,fifo-depth = &lt;DP83867_PHYCR_FIFO_DEPTH_8_B_NIB&gt;;</div><div class='add'>+		ti,min-output-impedance;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio6&gt;;</div><div class='add'>+		interrupts = &lt;16 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi<br/>new file mode 100644<br/>index 000000000000..e6df676886c0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/dra72-evm-tps65917.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra72-evm-tps65917.dtsi</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Integrated Power Management Chip</div><div class='add'>+ * http://www.ti.com/lit/ds/symlink/tps65917-q1.pdf</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;tps65917 {</div><div class='add'>+	compatible = "ti,tps65917";</div><div class='add'>+</div><div class='add'>+	interrupt-controller;</div><div class='add'>+	#interrupt-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	ti,system-power-controller;</div><div class='add'>+</div><div class='add'>+	tps65917_pmic {</div><div class='add'>+		compatible = "ti,tps65917-pmic";</div><div class='add'>+</div><div class='add'>+		smps1-in-supply = &lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		smps2-in-supply = &lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		smps3-in-supply = &lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		smps4-in-supply = &lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		smps5-in-supply = &lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		ldo1-in-supply = &lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		ldo2-in-supply = &lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		ldo3-in-supply = &lt;&amp;vsys_3v3&gt;;</div><div class='add'>+		ldo4-in-supply = &lt;&amp;evm_5v0&gt;;</div><div class='add'>+		ldo5-in-supply = &lt;&amp;vsys_3v3&gt;;</div><div class='add'>+</div><div class='add'>+		tps65917_regulators: regulators {</div><div class='add'>+			smps1_reg: smps1 {</div><div class='add'>+				/* VDD_MPU */</div><div class='add'>+				regulator-name = "smps1";</div><div class='add'>+				regulator-min-microvolt = &lt;850000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1250000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			smps2_reg: smps2 {</div><div class='add'>+				/* VDD_CORE */</div><div class='add'>+				regulator-name = "smps2";</div><div class='add'>+				regulator-min-microvolt = &lt;850000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1150000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			smps3_reg: smps3 {</div><div class='add'>+				/* VDD_GPU IVA DSPEVE */</div><div class='add'>+				regulator-name = "smps3";</div><div class='add'>+				regulator-min-microvolt = &lt;850000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1250000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			smps4_reg: smps4 {</div><div class='add'>+				/* VDDS1V8 */</div><div class='add'>+				regulator-name = "smps4";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			smps5_reg: smps5 {</div><div class='add'>+				/* VDD_DDR */</div><div class='add'>+				regulator-name = "smps5";</div><div class='add'>+				regulator-min-microvolt = &lt;1350000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1350000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo1_reg: ldo1 {</div><div class='add'>+				/* LDO1_OUT --&gt; SDIO  */</div><div class='add'>+				regulator-name = "ldo1";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-allow-bypass;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo2_reg: ldo2 {</div><div class='add'>+				regulator-name = "ldo2";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-allow-bypass;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo3_reg: ldo3 {</div><div class='add'>+				/* VDDA_1V8_PHY */</div><div class='add'>+				regulator-name = "ldo3";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo5_reg: ldo5 {</div><div class='add'>+				/* VDDA_1V8_PLL */</div><div class='add'>+				regulator-name = "ldo5";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo4_reg: ldo4 {</div><div class='add'>+				/* VDDA_3V_USB: VDDA_USBHS33 */</div><div class='add'>+				regulator-name = "ldo4";</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	tps65917_power_button {</div><div class='add'>+		compatible = "ti,palmas-pwrbutton";</div><div class='add'>+		interrupt-parent = &lt;&amp;tps65917&gt;;</div><div class='add'>+		interrupts = &lt;1 IRQ_TYPE_NONE&gt;;</div><div class='add'>+		wakeup-source;</div><div class='add'>+		ti,palmas-long-press-seconds = &lt;6&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb2_phy1 {</div><div class='add'>+	phy-supply = &lt;&amp;ldo4_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb2_phy2 {</div><div class='add'>+	phy-supply = &lt;&amp;ldo4_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dss {</div><div class='add'>+	vdda_video-supply = &lt;&amp;ldo5_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	vmmc_aux-supply = &lt;&amp;ldo1_reg&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts<br/>index e3a9b6985693..cd9c4ff12654 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/dra72-evm.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/dra72-evm.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/dra72-evm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/dra72-evm.dts</a></div><div class='hunk'>@@ -15,16 +15,16 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;tps65917_regulators {</div><div class='del'>-	ldo2_reg: ldo2 {</div><div class='del'>-		/* LDO2_OUT --&gt; TP1017 (UNUSED)  */</div><div class='del'>-		regulator-name = "ldo2";</div><div class='del'>-		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='del'>-		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-		regulator-allow-bypass;</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	tps65917: tps65917@58 {</div><div class='add'>+		reg = &lt;0x58&gt;;</div><div class='add'>+</div><div class='add'>+		interrupts = &lt;GIC_SPI 2 IRQ_TYPE_NONE&gt;;  /* IRQ_SYS_1N */</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#include "dra72-evm-tps65917.dtsi"</div><div class='add'>+</div><div class='ctx'> &amp;hdmi {</div><div class='ctx'> 	vdda-supply = &lt;&amp;ldo3_reg&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/ecx-2000.dts b/arch/arm/boot/dts/ecx-2000.dts<br/>index 2ccbb57fbfa8..c15e7e0c7e08 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/ecx-2000.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/ecx-2000.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/ecx-2000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ecx-2000.dts</a></div><div class='hunk'>@@ -99,7 +99,7 @@</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			interrupts = &lt;1 9 0xf04&gt;;</div><div class='ctx'> 			reg = &lt;0xfff11000 0x1000&gt;,</div><div class='del'>-			      &lt;0xfff12000 0x1000&gt;,</div><div class='add'>+			      &lt;0xfff12000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0xfff14000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0xfff16000 0x2000&gt;;</div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi<br/>index cd119400f440..0124faf175c8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/emev2.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/emev2.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/emev2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/emev2.dtsi</a></div><div class='hunk'>@@ -8,13 +8,14 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "renesas,emev2";</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		gpio0 = &amp;gpio0;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi b/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi<br/>index f78c14c82e17..25186ac4188d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> 		mfc_left: region_mfc_left {</div><div class='ctx'> 			compatible = "shared-dma-pool";</div><div class='ctx'> 			no-map;</div><div class='del'>-			size = &lt;0x1000000&gt;;</div><div class='add'>+			size = &lt;0x2400000&gt;;</div><div class='ctx'> 			alignment = &lt;0x100000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/exynos3250-artik5-eval.dts b/arch/arm/boot/dts/exynos3250-artik5-eval.dts<br/>index be4d6aa379f3..4bd2ee87124e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250-artik5-eval.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos3250-artik5-eval.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250-artik5-eval.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250-artik5-eval.dts</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;ldo3_reg&gt;;</div><div class='ctx'> 	card-detect-delay = &lt;200&gt;;</div><div class='ctx'> 	clock-frequency = &lt;100000000&gt;;</div><div class='del'>-	clock-freq-min-max = &lt;400000 100000000&gt;;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='ctx'> 	samsung,dw-mshc-ciu-div = &lt;1&gt;;</div><div class='ctx'> 	samsung,dw-mshc-sdr-timing = &lt;0 1&gt;;</div><div class='ctx'> 	samsung,dw-mshc-ddr-timing = &lt;1 2&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi b/arch/arm/boot/dts/exynos3250-artik5.dtsi<br/>index a70819b1b739..59c89d7662a8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250-artik5.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos3250-artik5.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250-artik5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250-artik5.dtsi</a></div><div class='hunk'>@@ -310,7 +310,7 @@</div><div class='ctx'> 	card-detect-delay = &lt;200&gt;;</div><div class='ctx'> 	vmmc-supply = &lt;&amp;ldo12_reg&gt;;</div><div class='ctx'> 	clock-frequency = &lt;100000000&gt;;</div><div class='del'>-	clock-freq-min-max = &lt;400000 100000000&gt;;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='ctx'> 	samsung,dw-mshc-ciu-div = &lt;1&gt;;</div><div class='ctx'> 	samsung,dw-mshc-sdr-timing = &lt;0 1&gt;;</div><div class='ctx'> 	samsung,dw-mshc-ddr-timing = &lt;1 2&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts<br/>index 66f04f6ba6bb..cccfe4b791d1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250-monk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos3250-monk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250-monk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250-monk.dts</a></div><div class='hunk'>@@ -435,7 +435,7 @@</div><div class='ctx'> 	card-detect-delay = &lt;200&gt;;</div><div class='ctx'> 	vmmc-supply = &lt;&amp;vemmc_reg&gt;;</div><div class='ctx'> 	clock-frequency = &lt;100000000&gt;;</div><div class='del'>-	clock-freq-min-max = &lt;400000 100000000&gt;;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='ctx'> 	samsung,dw-mshc-ciu-div = &lt;1&gt;;</div><div class='ctx'> 	samsung,dw-mshc-sdr-timing = &lt;0 1&gt;;</div><div class='ctx'> 	samsung,dw-mshc-ddr-timing = &lt;1 2&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi<br/>index ec331169c3d9..a149f148e659 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250-pinctrl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos3250-pinctrl.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250-pinctrl.dtsi</a></div><div class='hunk'>@@ -362,8 +362,14 @@</div><div class='ctx'> </div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-		interrupts = &lt;0 32 0&gt;, &lt;0 33 0&gt;, &lt;0 34 0&gt;, &lt;0 35 0&gt;,</div><div class='del'>-				&lt;0 36 0&gt;, &lt;0 37 0&gt;, &lt;0 38 0&gt;, &lt;0 39 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -373,8 +379,14 @@</div><div class='ctx'> </div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-		interrupts = &lt;0 40 0&gt;, &lt;0 41 0&gt;, &lt;0 42 0&gt;, &lt;0 43 0&gt;,</div><div class='del'>-				&lt;0 44 0&gt;, &lt;0 45 0&gt;, &lt;0 46 0&gt;, &lt;0 47 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts<br/>index 3967ee5f7752..548413e23c47 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250-rinato.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos3250-rinato.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250-rinato.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250-rinato.dts</a></div><div class='hunk'>@@ -649,7 +649,7 @@</div><div class='ctx'> 	card-detect-delay = &lt;200&gt;;</div><div class='ctx'> 	vmmc-supply = &lt;&amp;ldo12_reg&gt;;</div><div class='ctx'> 	clock-frequency = &lt;100000000&gt;;</div><div class='del'>-	clock-freq-min-max = &lt;400000 100000000&gt;;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='ctx'> 	samsung,dw-mshc-ciu-div = &lt;1&gt;;</div><div class='ctx'> 	samsung,dw-mshc-sdr-timing = &lt;0 1&gt;;</div><div class='ctx'> 	samsung,dw-mshc-ddr-timing = &lt;1 2&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi<br/>index e9d2556c0dfd..9c28ef4508e0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos3250.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos3250.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos3250.dtsi</a></div><div class='hunk'>@@ -20,6 +20,8 @@</div><div class='ctx'> #include "exynos4-cpu-thermal.dtsi"</div><div class='ctx'> #include "exynos-syscon-restart.dtsi"</div><div class='ctx'> #include &lt;dt-bindings/clock/exynos3250.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "samsung,exynos3250";</div><div class='hunk'>@@ -211,7 +213,8 @@</div><div class='ctx'> 		rtc: rtc@10070000 {</div><div class='ctx'> 			compatible = "samsung,s3c6410-rtc";</div><div class='ctx'> 			reg = &lt;0x10070000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 73 0&gt;, &lt;0 74 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;pmu_system_controller&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -219,7 +222,7 @@</div><div class='ctx'> 		tmu: tmu@100C0000 {</div><div class='ctx'> 			compatible = "samsung,exynos3250-tmu";</div><div class='ctx'> 			reg = &lt;0x100C0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 216 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_TMU_APBIF&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif";</div><div class='ctx'> 			#include "exynos4412-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -231,17 +234,24 @@</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			reg = &lt;0x10481000 0x1000&gt;,</div><div class='del'>-			      &lt;0x10482000 0x1000&gt;,</div><div class='add'>+			      &lt;0x10482000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x10484000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x10486000 0x2000&gt;;</div><div class='del'>-			interrupts = &lt;1 9 0xf04&gt;;</div><div class='add'>+			interrupts = &lt;GIC_PPI 9</div><div class='add'>+					(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		mct@10050000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-mct";</div><div class='ctx'> 			reg = &lt;0x10050000 0x800&gt;;</div><div class='del'>-			interrupts = &lt;0 218 0&gt;, &lt;0 219 0&gt;, &lt;0 220 0&gt;, &lt;0 221 0&gt;,</div><div class='del'>-				     &lt;0 223 0&gt;, &lt;0 226 0&gt;, &lt;0 227 0&gt;, &lt;0 228 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 227 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 228 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_FIN_PLL&gt;, &lt;&amp;cmu CLK_MCT&gt;;</div><div class='ctx'> 			clock-names = "fin_pll", "mct";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -249,24 +259,24 @@</div><div class='ctx'> 		pinctrl_1: pinctrl@11000000 {</div><div class='ctx'> 			compatible = "samsung,exynos3250-pinctrl";</div><div class='ctx'> 			reg = &lt;0x11000000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 225 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 			wakeup-interrupt-controller {</div><div class='ctx'> 				compatible = "samsung,exynos4210-wakeup-eint";</div><div class='del'>-				interrupts = &lt;0 48 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_0: pinctrl@11400000 {</div><div class='ctx'> 			compatible = "samsung,exynos3250-pinctrl";</div><div class='ctx'> 			reg = &lt;0x11400000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 240 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		jpeg: codec@11830000 {</div><div class='ctx'> 			compatible = "samsung,exynos3250-jpeg";</div><div class='ctx'> 			reg = &lt;0x11830000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 171 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_JPEG&gt;, &lt;&amp;cmu CLK_SCLK_JPEG&gt;;</div><div class='ctx'> 			clock-names = "jpeg", "sclk";</div><div class='ctx'> 			power-domains = &lt;&amp;pd_cam&gt;;</div><div class='hunk'>@@ -280,7 +290,8 @@</div><div class='ctx'> 		sysmmu_jpeg: sysmmu@11A60000 {</div><div class='ctx'> 			compatible = "samsung,exynos-sysmmu";</div><div class='ctx'> 			reg = &lt;0x11a60000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 156 0&gt;, &lt;0 161 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clock-names = "sysmmu", "master";</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_SMMUJPEG&gt;, &lt;&amp;cmu CLK_JPEG&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_cam&gt;;</div><div class='hunk'>@@ -291,7 +302,9 @@</div><div class='ctx'> 			compatible = "samsung,exynos3250-fimd";</div><div class='ctx'> 			reg = &lt;0x11c00000 0x30000&gt;;</div><div class='ctx'> 			interrupt-names = "fifo", "vsync", "lcd_sys";</div><div class='del'>-			interrupts = &lt;0 84 0&gt;, &lt;0 85 0&gt;, &lt;0 86 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_SCLK_FIMD0&gt;, &lt;&amp;cmu CLK_FIMD0&gt;;</div><div class='ctx'> 			clock-names = "sclk_fimd", "fimd";</div><div class='ctx'> 			power-domains = &lt;&amp;pd_lcd0&gt;;</div><div class='hunk'>@@ -303,7 +316,7 @@</div><div class='ctx'> 		dsi_0: dsi@11C80000 {</div><div class='ctx'> 			compatible = "samsung,exynos3250-mipi-dsi";</div><div class='ctx'> 			reg = &lt;0x11C80000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;0 83 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			samsung,phy-type = &lt;0&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_lcd0&gt;;</div><div class='ctx'> 			phys = &lt;&amp;mipi_phy 1&gt;;</div><div class='hunk'>@@ -318,7 +331,8 @@</div><div class='ctx'> 		sysmmu_fimd0: sysmmu@11E20000 {</div><div class='ctx'> 			compatible = "samsung,exynos-sysmmu";</div><div class='ctx'> 			reg = &lt;0x11e20000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 80 0&gt;, &lt;0 81 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clock-names = "sysmmu", "master";</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_SMMUFIMD0&gt;, &lt;&amp;cmu CLK_FIMD0&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_lcd0&gt;;</div><div class='hunk'>@@ -328,7 +342,7 @@</div><div class='ctx'> 		hsotg: hsotg@12480000 {</div><div class='ctx'> 			compatible = "snps,dwc2";</div><div class='ctx'> 			reg = &lt;0x12480000 0x20000&gt;;</div><div class='del'>-			interrupts = &lt;0 141 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_USBOTG&gt;;</div><div class='ctx'> 			clock-names = "otg";</div><div class='ctx'> 			phys = &lt;&amp;exynos_usbphy 0&gt;;</div><div class='hunk'>@@ -339,7 +353,7 @@</div><div class='ctx'> 		mshc_0: mshc@12510000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-dw-mshc";</div><div class='ctx'> 			reg = &lt;0x12510000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 142 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_SDMMC0&gt;, &lt;&amp;cmu CLK_SCLK_MMC0&gt;;</div><div class='ctx'> 			clock-names = "biu", "ciu";</div><div class='ctx'> 			fifo-depth = &lt;0x80&gt;;</div><div class='hunk'>@@ -351,7 +365,7 @@</div><div class='ctx'> 		mshc_1: mshc@12520000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-dw-mshc";</div><div class='ctx'> 			reg = &lt;0x12520000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 143 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_SDMMC1&gt;, &lt;&amp;cmu CLK_SCLK_MMC1&gt;;</div><div class='ctx'> 			clock-names = "biu", "ciu";</div><div class='ctx'> 			fifo-depth = &lt;0x80&gt;;</div><div class='hunk'>@@ -363,7 +377,7 @@</div><div class='ctx'> 		mshc_2: mshc@12530000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-dw-mshc";</div><div class='ctx'> 			reg = &lt;0x12530000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 144 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_SDMMC2&gt;, &lt;&amp;cmu CLK_SCLK_MMC2&gt;;</div><div class='ctx'> 			clock-names = "biu", "ciu";</div><div class='ctx'> 			fifo-depth = &lt;0x80&gt;;</div><div class='hunk'>@@ -391,7 +405,7 @@</div><div class='ctx'> 			pdma0: pdma@12680000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x12680000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 138 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;cmu CLK_PDMA0&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -402,7 +416,7 @@</div><div class='ctx'> 			pdma1: pdma@12690000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x12690000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 139 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;cmu CLK_PDMA1&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -415,7 +429,7 @@</div><div class='ctx'> 			compatible = "samsung,exynos3250-adc",</div><div class='ctx'> 				     "samsung,exynos-adc-v2";</div><div class='ctx'> 			reg = &lt;0x126C0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 137 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clock-names = "adc", "sclk";</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_TSADC&gt;, &lt;&amp;cmu CLK_SCLK_TSADC&gt;;</div><div class='ctx'> 			#io-channel-cells = &lt;1&gt;;</div><div class='hunk'>@@ -427,7 +441,7 @@</div><div class='ctx'> 		mfc: codec@13400000 {</div><div class='ctx'> 			compatible = "samsung,mfc-v7";</div><div class='ctx'> 			reg = &lt;0x13400000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;0 102 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clock-names = "mfc", "sclk_mfc";</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_MFC&gt;, &lt;&amp;cmu CLK_SCLK_MFC&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_mfc&gt;;</div><div class='hunk'>@@ -437,7 +451,8 @@</div><div class='ctx'> 		sysmmu_mfc: sysmmu@13620000 {</div><div class='ctx'> 			compatible = "samsung,exynos-sysmmu";</div><div class='ctx'> 			reg = &lt;0x13620000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 96 0&gt;, &lt;0 98 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clock-names = "sysmmu", "master";</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_SMMUMFC_L&gt;, &lt;&amp;cmu CLK_MFC&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_mfc&gt;;</div><div class='hunk'>@@ -447,7 +462,7 @@</div><div class='ctx'> 		serial_0: serial@13800000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x13800000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 109 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_UART0&gt;, &lt;&amp;cmu CLK_SCLK_UART0&gt;;</div><div class='ctx'> 			clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -458,7 +473,7 @@</div><div class='ctx'> 		serial_1: serial@13810000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x13810000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 110 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_UART1&gt;, &lt;&amp;cmu CLK_SCLK_UART1&gt;;</div><div class='ctx'> 			clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -469,7 +484,7 @@</div><div class='ctx'> 		serial_2: serial@13820000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x13820000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 111 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_UART2&gt;, &lt;&amp;cmu CLK_SCLK_UART2&gt;;</div><div class='ctx'> 			clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -482,7 +497,7 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x13860000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 113 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_I2C0&gt;;</div><div class='ctx'> 			clock-names = "i2c";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -495,7 +510,7 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x13870000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 114 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_I2C1&gt;;</div><div class='ctx'> 			clock-names = "i2c";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -508,7 +523,7 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x13880000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 115 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_I2C2&gt;;</div><div class='ctx'> 			clock-names = "i2c";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -521,7 +536,7 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x13890000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 116 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_I2C3&gt;;</div><div class='ctx'> 			clock-names = "i2c";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -534,7 +549,7 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x138A0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 117 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_I2C4&gt;;</div><div class='ctx'> 			clock-names = "i2c";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -547,7 +562,7 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x138B0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 118 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_I2C5&gt;;</div><div class='ctx'> 			clock-names = "i2c";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -560,7 +575,7 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x138C0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 119 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_I2C6&gt;;</div><div class='ctx'> 			clock-names = "i2c";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -573,7 +588,7 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x138D0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 120 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_I2C7&gt;;</div><div class='ctx'> 			clock-names = "i2c";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -584,7 +599,7 @@</div><div class='ctx'> 		spi_0: spi@13920000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-spi";</div><div class='ctx'> 			reg = &lt;0x13920000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 121 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;pdma0 7&gt;, &lt;&amp;pdma0 6&gt;;</div><div class='ctx'> 			dma-names = "tx", "rx";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -600,7 +615,7 @@</div><div class='ctx'> 		spi_1: spi@13930000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-spi";</div><div class='ctx'> 			reg = &lt;0x13930000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 122 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;pdma1 7&gt;, &lt;&amp;pdma1 6&gt;;</div><div class='ctx'> 			dma-names = "tx", "rx";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -616,7 +631,7 @@</div><div class='ctx'> 		i2s2: i2s@13970000 {</div><div class='ctx'> 			compatible = "samsung,s3c6410-i2s";</div><div class='ctx'> 			reg = &lt;0x13970000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 126 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cmu CLK_I2S&gt;, &lt;&amp;cmu CLK_SCLK_I2S&gt;;</div><div class='ctx'> 			clock-names = "iis", "i2s_opclk0";</div><div class='ctx'> 			dmas = &lt;&amp;pdma0 14&gt;, &lt;&amp;pdma0 13&gt;;</div><div class='hunk'>@@ -629,15 +644,19 @@</div><div class='ctx'> 		pwm: pwm@139D0000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-pwm";</div><div class='ctx'> 			reg = &lt;0x139D0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 104 0&gt;, &lt;0 105 0&gt;, &lt;0 106 0&gt;,</div><div class='del'>-				     &lt;0 107 0&gt;, &lt;0 108 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#pwm-cells = &lt;3&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pmu {</div><div class='ctx'> 			compatible = "arm,cortex-a7-pmu";</div><div class='del'>-			interrupts = &lt;0 18 0&gt;, &lt;0 19 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		ppmu_dmc0: ppmu_dmc0@106a0000 {</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi<br/>index 5f034eb5a5e2..18def1c774d5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4.dtsi</a></div><div class='hunk'>@@ -21,6 +21,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/exynos4.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/clock/exynos-audss-clk.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> #include "exynos-syscon-restart.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -62,8 +64,10 @@</div><div class='ctx'> 	i2s0: i2s@03830000 {</div><div class='ctx'> 		compatible = "samsung,s5pv210-i2s";</div><div class='ctx'> 		reg = &lt;0x03830000 0x100&gt;;</div><div class='del'>-		clocks = &lt;&amp;clock_audss EXYNOS_I2S_BUS&gt;;</div><div class='del'>-		clock-names = "iis";</div><div class='add'>+		clocks = &lt;&amp;clock_audss EXYNOS_I2S_BUS&gt;,</div><div class='add'>+			 &lt;&amp;clock_audss EXYNOS_DOUT_AUD_BUS&gt;,</div><div class='add'>+			 &lt;&amp;clock_audss EXYNOS_SCLK_I2S&gt;;</div><div class='add'>+		clock-names = "iis", "i2s_opclk0", "i2s_opclk1";</div><div class='ctx'> 		#clock-cells = &lt;1&gt;;</div><div class='ctx'> 		clock-output-names = "i2s_cdclk0";</div><div class='ctx'> 		dmas = &lt;&amp;pdma0 12&gt;, &lt;&amp;pdma0 11&gt;, &lt;&amp;pdma0 10&gt;;</div><div class='hunk'>@@ -78,6 +82,11 @@</div><div class='ctx'> 		reg = &lt;0x10000000 0x100&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	scu: snoop-control-unit@10500000 {</div><div class='add'>+		compatible = "arm,cortex-a9-scu";</div><div class='add'>+		reg = &lt;0x10500000 0x2000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	memory-controller@12570000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-srom";</div><div class='ctx'> 		reg = &lt;0x12570000 0x14&gt;;</div><div class='hunk'>@@ -93,18 +102,21 @@</div><div class='ctx'> 		compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 		reg = &lt;0x10023C40 0x20&gt;;</div><div class='ctx'> 		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		label = "MFC";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pd_g3d: g3d-power-domain@10023C60 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 		reg = &lt;0x10023C60 0x20&gt;;</div><div class='ctx'> 		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		label = "G3D";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pd_lcd0: lcd0-power-domain@10023C80 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 		reg = &lt;0x10023C80 0x20&gt;;</div><div class='ctx'> 		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		label = "LCD0";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pd_tv: tv-power-domain@10023C20 {</div><div class='hunk'>@@ -112,24 +124,28 @@</div><div class='ctx'> 		reg = &lt;0x10023C20 0x20&gt;;</div><div class='ctx'> 		#power-domain-cells = &lt;0&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;pd_lcd0&gt;;</div><div class='add'>+		label = "TV";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pd_cam: cam-power-domain@10023C00 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 		reg = &lt;0x10023C00 0x20&gt;;</div><div class='ctx'> 		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		label = "CAM";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pd_gps: gps-power-domain@10023CE0 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 		reg = &lt;0x10023CE0 0x20&gt;;</div><div class='ctx'> 		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		label = "GPS";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pd_gps_alive: gps-alive-power-domain@10023D00 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 		reg = &lt;0x10023D00 0x20&gt;;</div><div class='ctx'> 		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		label = "GPS alive";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gic: interrupt-controller@10490000 {</div><div class='hunk'>@@ -168,7 +184,7 @@</div><div class='ctx'> 	dsi_0: dsi@11C80000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-mipi-dsi";</div><div class='ctx'> 		reg = &lt;0x11C80000 0x10000&gt;;</div><div class='del'>-		interrupts = &lt;0 79 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;pd_lcd0&gt;;</div><div class='ctx'> 		phys = &lt;&amp;mipi_phy 1&gt;;</div><div class='ctx'> 		phy-names = "dsim";</div><div class='hunk'>@@ -191,7 +207,7 @@</div><div class='ctx'> 		fimc_0: fimc@11800000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-fimc";</div><div class='ctx'> 			reg = &lt;0x11800000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 84 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_FIMC0&gt;, &lt;&amp;clock CLK_SCLK_FIMC0&gt;;</div><div class='ctx'> 			clock-names = "fimc", "sclk_fimc";</div><div class='ctx'> 			power-domains = &lt;&amp;pd_cam&gt;;</div><div class='hunk'>@@ -203,7 +219,7 @@</div><div class='ctx'> 		fimc_1: fimc@11810000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-fimc";</div><div class='ctx'> 			reg = &lt;0x11810000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 85 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_FIMC1&gt;, &lt;&amp;clock CLK_SCLK_FIMC1&gt;;</div><div class='ctx'> 			clock-names = "fimc", "sclk_fimc";</div><div class='ctx'> 			power-domains = &lt;&amp;pd_cam&gt;;</div><div class='hunk'>@@ -215,7 +231,7 @@</div><div class='ctx'> 		fimc_2: fimc@11820000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-fimc";</div><div class='ctx'> 			reg = &lt;0x11820000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 86 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_FIMC2&gt;, &lt;&amp;clock CLK_SCLK_FIMC2&gt;;</div><div class='ctx'> 			clock-names = "fimc", "sclk_fimc";</div><div class='ctx'> 			power-domains = &lt;&amp;pd_cam&gt;;</div><div class='hunk'>@@ -227,7 +243,7 @@</div><div class='ctx'> 		fimc_3: fimc@11830000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-fimc";</div><div class='ctx'> 			reg = &lt;0x11830000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 87 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_FIMC3&gt;, &lt;&amp;clock CLK_SCLK_FIMC3&gt;;</div><div class='ctx'> 			clock-names = "fimc", "sclk_fimc";</div><div class='ctx'> 			power-domains = &lt;&amp;pd_cam&gt;;</div><div class='hunk'>@@ -239,7 +255,7 @@</div><div class='ctx'> 		csis_0: csis@11880000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-csis";</div><div class='ctx'> 			reg = &lt;0x11880000 0x4000&gt;;</div><div class='del'>-			interrupts = &lt;0 78 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_CSIS0&gt;, &lt;&amp;clock CLK_SCLK_CSIS0&gt;;</div><div class='ctx'> 			clock-names = "csis", "sclk_csis";</div><div class='ctx'> 			bus-width = &lt;4&gt;;</div><div class='hunk'>@@ -254,7 +270,7 @@</div><div class='ctx'> 		csis_1: csis@11890000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-csis";</div><div class='ctx'> 			reg = &lt;0x11890000 0x4000&gt;;</div><div class='del'>-			interrupts = &lt;0 80 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_CSIS1&gt;, &lt;&amp;clock CLK_SCLK_CSIS1&gt;;</div><div class='ctx'> 			clock-names = "csis", "sclk_csis";</div><div class='ctx'> 			bus-width = &lt;2&gt;;</div><div class='hunk'>@@ -270,7 +286,7 @@</div><div class='ctx'> 	watchdog: watchdog@10060000 {</div><div class='ctx'> 		compatible = "samsung,s3c2410-wdt";</div><div class='ctx'> 		reg = &lt;0x10060000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 43 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_WDT&gt;;</div><div class='ctx'> 		clock-names = "watchdog";</div><div class='ctx'> 		status = "disabled";</div><div class='hunk'>@@ -280,7 +296,8 @@</div><div class='ctx'> 		compatible = "samsung,s3c6410-rtc";</div><div class='ctx'> 		reg = &lt;0x10070000 0x100&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;pmu_system_controller&gt;;</div><div class='del'>-		interrupts = &lt;0 44 0&gt;, &lt;0 45 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_RTC&gt;;</div><div class='ctx'> 		clock-names = "rtc";</div><div class='ctx'> 		status = "disabled";</div><div class='hunk'>@@ -289,7 +306,7 @@</div><div class='ctx'> 	keypad: keypad@100A0000 {</div><div class='ctx'> 		compatible = "samsung,s5pv210-keypad";</div><div class='ctx'> 		reg = &lt;0x100A0000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 109 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_KEYIF&gt;;</div><div class='ctx'> 		clock-names = "keypad";</div><div class='ctx'> 		status = "disabled";</div><div class='hunk'>@@ -298,7 +315,7 @@</div><div class='ctx'> 	sdhci_0: sdhci@12510000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-sdhci";</div><div class='ctx'> 		reg = &lt;0x12510000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 73 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_SDMMC0&gt;, &lt;&amp;clock CLK_SCLK_MMC0&gt;;</div><div class='ctx'> 		clock-names = "hsmmc", "mmc_busclk.2";</div><div class='ctx'> 		status = "disabled";</div><div class='hunk'>@@ -307,7 +324,7 @@</div><div class='ctx'> 	sdhci_1: sdhci@12520000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-sdhci";</div><div class='ctx'> 		reg = &lt;0x12520000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 74 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_SDMMC1&gt;, &lt;&amp;clock CLK_SCLK_MMC1&gt;;</div><div class='ctx'> 		clock-names = "hsmmc", "mmc_busclk.2";</div><div class='ctx'> 		status = "disabled";</div><div class='hunk'>@@ -316,7 +333,7 @@</div><div class='ctx'> 	sdhci_2: sdhci@12530000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-sdhci";</div><div class='ctx'> 		reg = &lt;0x12530000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 75 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_SDMMC2&gt;, &lt;&amp;clock CLK_SCLK_MMC2&gt;;</div><div class='ctx'> 		clock-names = "hsmmc", "mmc_busclk.2";</div><div class='ctx'> 		status = "disabled";</div><div class='hunk'>@@ -325,7 +342,7 @@</div><div class='ctx'> 	sdhci_3: sdhci@12540000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-sdhci";</div><div class='ctx'> 		reg = &lt;0x12540000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 76 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_SDMMC3&gt;, &lt;&amp;clock CLK_SCLK_MMC3&gt;;</div><div class='ctx'> 		clock-names = "hsmmc", "mmc_busclk.2";</div><div class='ctx'> 		status = "disabled";</div><div class='hunk'>@@ -344,7 +361,7 @@</div><div class='ctx'> 	hsotg: hsotg@12480000 {</div><div class='ctx'> 		compatible = "samsung,s3c6400-hsotg";</div><div class='ctx'> 		reg = &lt;0x12480000 0x20000&gt;;</div><div class='del'>-		interrupts = &lt;0 71 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_USB_DEVICE&gt;;</div><div class='ctx'> 		clock-names = "otg";</div><div class='ctx'> 		phys = &lt;&amp;exynos_usbphy 0&gt;;</div><div class='hunk'>@@ -355,42 +372,42 @@</div><div class='ctx'> 	ehci: ehci@12580000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-ehci";</div><div class='ctx'> 		reg = &lt;0x12580000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 70 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_USB_HOST&gt;;</div><div class='ctx'> 		clock-names = "usbhost";</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		port@0 {</div><div class='del'>-		    reg = &lt;0&gt;;</div><div class='del'>-		    phys = &lt;&amp;exynos_usbphy 1&gt;;</div><div class='del'>-		    status = "disabled";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			phys = &lt;&amp;exynos_usbphy 1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 		port@1 {</div><div class='del'>-		    reg = &lt;1&gt;;</div><div class='del'>-		    phys = &lt;&amp;exynos_usbphy 2&gt;;</div><div class='del'>-		    status = "disabled";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			phys = &lt;&amp;exynos_usbphy 2&gt;;</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 		port@2 {</div><div class='del'>-		    reg = &lt;2&gt;;</div><div class='del'>-		    phys = &lt;&amp;exynos_usbphy 3&gt;;</div><div class='del'>-		    status = "disabled";</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+			phys = &lt;&amp;exynos_usbphy 3&gt;;</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ohci: ohci@12590000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-ohci";</div><div class='ctx'> 		reg = &lt;0x12590000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 70 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_USB_HOST&gt;;</div><div class='ctx'> 		clock-names = "usbhost";</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		port@0 {</div><div class='del'>-		    reg = &lt;0&gt;;</div><div class='del'>-		    phys = &lt;&amp;exynos_usbphy 1&gt;;</div><div class='del'>-		    status = "disabled";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			phys = &lt;&amp;exynos_usbphy 1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -423,7 +440,7 @@</div><div class='ctx'> 	mfc: codec@13400000 {</div><div class='ctx'> 		compatible = "samsung,mfc-v5";</div><div class='ctx'> 		reg = &lt;0x13400000 0x10000&gt;;</div><div class='del'>-		interrupts = &lt;0 94 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;pd_mfc&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_MFC&gt;, &lt;&amp;clock CLK_SCLK_MFC&gt;;</div><div class='ctx'> 		clock-names = "mfc", "sclk_mfc";</div><div class='hunk'>@@ -434,7 +451,7 @@</div><div class='ctx'> 	serial_0: serial@13800000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 		reg = &lt;0x13800000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 52 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_UART0&gt;, &lt;&amp;clock CLK_SCLK_UART0&gt;;</div><div class='ctx'> 		clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 		dmas = &lt;&amp;pdma0 15&gt;, &lt;&amp;pdma0 16&gt;;</div><div class='hunk'>@@ -445,7 +462,7 @@</div><div class='ctx'> 	serial_1: serial@13810000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 		reg = &lt;0x13810000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 53 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_UART1&gt;, &lt;&amp;clock CLK_SCLK_UART1&gt;;</div><div class='ctx'> 		clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 		dmas = &lt;&amp;pdma1 15&gt;, &lt;&amp;pdma1 16&gt;;</div><div class='hunk'>@@ -456,7 +473,7 @@</div><div class='ctx'> 	serial_2: serial@13820000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 		reg = &lt;0x13820000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 54 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_UART2&gt;, &lt;&amp;clock CLK_SCLK_UART2&gt;;</div><div class='ctx'> 		clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 		dmas = &lt;&amp;pdma0 17&gt;, &lt;&amp;pdma0 18&gt;;</div><div class='hunk'>@@ -467,7 +484,7 @@</div><div class='ctx'> 	serial_3: serial@13830000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 		reg = &lt;0x13830000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 55 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_UART3&gt;, &lt;&amp;clock CLK_SCLK_UART3&gt;;</div><div class='ctx'> 		clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 		dmas = &lt;&amp;pdma1 17&gt;, &lt;&amp;pdma1 18&gt;;</div><div class='hunk'>@@ -480,7 +497,7 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 		reg = &lt;0x13860000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 58 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_I2C0&gt;;</div><div class='ctx'> 		clock-names = "i2c";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -493,7 +510,7 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 		reg = &lt;0x13870000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 59 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_I2C1&gt;;</div><div class='ctx'> 		clock-names = "i2c";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -506,7 +523,7 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 		reg = &lt;0x13880000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 60 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_I2C2&gt;;</div><div class='ctx'> 		clock-names = "i2c";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -519,7 +536,7 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 		reg = &lt;0x13890000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 61 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_I2C3&gt;;</div><div class='ctx'> 		clock-names = "i2c";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -532,7 +549,7 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 		reg = &lt;0x138A0000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 62 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_I2C4&gt;;</div><div class='ctx'> 		clock-names = "i2c";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -545,7 +562,7 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 		reg = &lt;0x138B0000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 63 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_I2C5&gt;;</div><div class='ctx'> 		clock-names = "i2c";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -558,7 +575,7 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 		reg = &lt;0x138C0000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 64 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_I2C6&gt;;</div><div class='ctx'> 		clock-names = "i2c";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -571,7 +588,7 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 		reg = &lt;0x138D0000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 65 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_I2C7&gt;;</div><div class='ctx'> 		clock-names = "i2c";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -584,7 +601,7 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "samsung,s3c2440-hdmiphy-i2c";</div><div class='ctx'> 		reg = &lt;0x138E0000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 93 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_I2C_HDMI&gt;;</div><div class='ctx'> 		clock-names = "i2c";</div><div class='ctx'> 		status = "disabled";</div><div class='hunk'>@@ -598,7 +615,7 @@</div><div class='ctx'> 	spi_0: spi@13920000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-spi";</div><div class='ctx'> 		reg = &lt;0x13920000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 66 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		dmas = &lt;&amp;pdma0 7&gt;, &lt;&amp;pdma0 6&gt;;</div><div class='ctx'> 		dma-names = "tx", "rx";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -613,7 +630,7 @@</div><div class='ctx'> 	spi_1: spi@13930000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-spi";</div><div class='ctx'> 		reg = &lt;0x13930000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 67 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		dmas = &lt;&amp;pdma1 7&gt;, &lt;&amp;pdma1 6&gt;;</div><div class='ctx'> 		dma-names = "tx", "rx";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -628,7 +645,7 @@</div><div class='ctx'> 	spi_2: spi@13940000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-spi";</div><div class='ctx'> 		reg = &lt;0x13940000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 68 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		dmas = &lt;&amp;pdma0 9&gt;, &lt;&amp;pdma0 8&gt;;</div><div class='ctx'> 		dma-names = "tx", "rx";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -643,7 +660,11 @@</div><div class='ctx'> 	pwm: pwm@139D0000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-pwm";</div><div class='ctx'> 		reg = &lt;0x139D0000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 37 0&gt;, &lt;0 38 0&gt;, &lt;0 39 0&gt;, &lt;0 40 0&gt;, &lt;0 41 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_PWM&gt;;</div><div class='ctx'> 		clock-names = "timers";</div><div class='ctx'> 		#pwm-cells = &lt;3&gt;;</div><div class='hunk'>@@ -660,7 +681,7 @@</div><div class='ctx'> 		pdma0: pdma@12680000 {</div><div class='ctx'> 			compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 			reg = &lt;0x12680000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 35 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_PDMA0&gt;;</div><div class='ctx'> 			clock-names = "apb_pclk";</div><div class='ctx'> 			#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -671,7 +692,7 @@</div><div class='ctx'> 		pdma1: pdma@12690000 {</div><div class='ctx'> 			compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 			reg = &lt;0x12690000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 36 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_PDMA1&gt;;</div><div class='ctx'> 			clock-names = "apb_pclk";</div><div class='ctx'> 			#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -682,7 +703,7 @@</div><div class='ctx'> 		mdma1: mdma@12850000 {</div><div class='ctx'> 			compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 			reg = &lt;0x12850000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 34 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_MDMA&gt;;</div><div class='ctx'> 			clock-names = "apb_pclk";</div><div class='ctx'> 			#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -712,7 +733,7 @@</div><div class='ctx'> 	jpeg_codec: jpeg-codec@11840000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-jpeg";</div><div class='ctx'> 		reg = &lt;0x11840000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 88 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_JPEG&gt;;</div><div class='ctx'> 		clock-names = "jpeg";</div><div class='ctx'> 		power-domains = &lt;&amp;pd_cam&gt;;</div><div class='hunk'>@@ -722,7 +743,7 @@</div><div class='ctx'> 	rotator: rotator@12810000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-rotator";</div><div class='ctx'> 		reg = &lt;0x12810000 0x64&gt;;</div><div class='del'>-		interrupts = &lt;0 83 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_ROTATOR&gt;;</div><div class='ctx'> 		clock-names = "rotator";</div><div class='ctx'> 		iommus = &lt;&amp;sysmmu_rotator&gt;;</div><div class='hunk'>@@ -731,7 +752,7 @@</div><div class='ctx'> 	hdmi: hdmi@12D00000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-hdmi";</div><div class='ctx'> 		reg = &lt;0x12D00000 0x70000&gt;;</div><div class='del'>-		interrupts = &lt;0 92 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clock-names = "hdmi", "sclk_hdmi", "sclk_pixel", "sclk_hdmiphy",</div><div class='ctx'> 			"mout_hdmi";</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_HDMI&gt;, &lt;&amp;clock CLK_SCLK_HDMI&gt;,</div><div class='hunk'>@@ -746,7 +767,7 @@</div><div class='ctx'> 	hdmicec: cec@100B0000 {</div><div class='ctx'> 		compatible = "samsung,s5p-cec";</div><div class='ctx'> 		reg = &lt;0x100B0000 0x200&gt;;</div><div class='del'>-		interrupts = &lt;0 114 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_HDMI_CEC&gt;;</div><div class='ctx'> 		clock-names = "hdmicec";</div><div class='ctx'> 		samsung,syscon-phandle = &lt;&amp;pmu_system_controller&gt;;</div><div class='hunk'>@@ -757,7 +778,7 @@</div><div class='ctx'> </div><div class='ctx'> 	mixer: mixer@12C10000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-mixer";</div><div class='del'>-		interrupts = &lt;0 91 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		reg = &lt;0x12C10000 0x2100&gt;, &lt;0x12c00000 0x300&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;pd_tv&gt;;</div><div class='ctx'> 		iommus = &lt;&amp;sysmmu_tv&gt;;</div><div class='hunk'>@@ -984,7 +1005,7 @@</div><div class='ctx'> 	sss: sss@10830000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-secss";</div><div class='ctx'> 		reg = &lt;0x10830000 0x300&gt;;</div><div class='del'>-		interrupts = &lt;0 112 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_SSS&gt;;</div><div class='ctx'> 		clock-names = "secss";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi<br/>index d9b6d25e4abe..f280954b260a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4210-pinctrl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4210-pinctrl.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4210-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4210-pinctrl.dtsi</a></div><div class='hunk'>@@ -537,8 +537,14 @@</div><div class='ctx'> </div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-			interrupts = &lt;0 16 0&gt;, &lt;0 17 0&gt;, &lt;0 18 0&gt;, &lt;0 19 0&gt;,</div><div class='del'>-				     &lt;0 20 0&gt;, &lt;0 21 0&gt;, &lt;0 22 0&gt;, &lt;0 23 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -548,8 +554,14 @@</div><div class='ctx'> </div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-			interrupts = &lt;0 24 0&gt;, &lt;0 25 0&gt;, &lt;0 26 0&gt;, &lt;0 27 0&gt;,</div><div class='del'>-				     &lt;0 28 0&gt;, &lt;0 29 0&gt;, &lt;0 30 0&gt;, &lt;0 31 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi<br/>index 2d9b02967105..f9408188f97f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4210.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4210.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4210.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4210.dtsi</a></div><div class='hunk'>@@ -86,6 +86,7 @@</div><div class='ctx'> 		compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 		reg = &lt;0x10023CA0 0x20&gt;;</div><div class='ctx'> 		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		label = "LCD1";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	l2c: l2-cache-controller@10502000 {</div><div class='hunk'>@@ -109,12 +110,12 @@</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			#address-cells = &lt;0&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupt-map = &lt;0 &amp;gic 0 57 0&gt;,</div><div class='del'>-					&lt;1 &amp;gic 0 69 0&gt;,</div><div class='add'>+			interrupt-map = &lt;0 &amp;gic 0 57 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+					&lt;1 &amp;gic 0 69 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 					&lt;2 &amp;combiner 12 6&gt;,</div><div class='ctx'> 					&lt;3 &amp;combiner 12 7&gt;,</div><div class='del'>-					&lt;4 &amp;gic 0 42 0&gt;,</div><div class='del'>-					&lt;5 &amp;gic 0 48 0&gt;;</div><div class='add'>+					&lt;4 &amp;gic 0 42 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+					&lt;5 &amp;gic 0 48 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -127,18 +128,18 @@</div><div class='ctx'> 	pinctrl_0: pinctrl@11400000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-pinctrl";</div><div class='ctx'> 		reg = &lt;0x11400000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 47 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_1: pinctrl@11000000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-pinctrl";</div><div class='ctx'> 		reg = &lt;0x11000000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 46 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 		wakup_eint: wakeup-interrupt-controller {</div><div class='ctx'> 			compatible = "samsung,exynos4210-wakeup-eint";</div><div class='ctx'> 			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-			interrupts = &lt;0 32 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +183,7 @@</div><div class='ctx'> 	g2d: g2d@12800000 {</div><div class='ctx'> 		compatible = "samsung,s5pv210-g2d";</div><div class='ctx'> 		reg = &lt;0x12800000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 89 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_SCLK_FIMG2D&gt;, &lt;&amp;clock CLK_G2D&gt;;</div><div class='ctx'> 		clock-names = "sclk_fimg2d", "fimg2d";</div><div class='ctx'> 		power-domains = &lt;&amp;pd_lcd0&gt;;</div><div class='hunk'>@@ -424,10 +425,22 @@</div><div class='ctx'> </div><div class='ctx'> &amp;combiner {</div><div class='ctx'> 	samsung,combiner-nr = &lt;16&gt;;</div><div class='del'>-	interrupts = &lt;0 0 0&gt;, &lt;0 1 0&gt;, &lt;0 2 0&gt;, &lt;0 3 0&gt;,</div><div class='del'>-		     &lt;0 4 0&gt;, &lt;0 5 0&gt;, &lt;0 6 0&gt;, &lt;0 7 0&gt;,</div><div class='del'>-		     &lt;0 8 0&gt;, &lt;0 9 0&gt;, &lt;0 10 0&gt;, &lt;0 11 0&gt;,</div><div class='del'>-		     &lt;0 12 0&gt;, &lt;0 13 0&gt;, &lt;0 14 0&gt;, &lt;0 15 0&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mdma1 {</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi<br/>deleted file mode 100644<br/>index 538901123d37..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4212.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4212.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Samsung's Exynos4212 SoC device tree source</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2012 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * Samsung's Exynos4212 SoC device nodes are listed in this file. Exynos4212</div><div class='del'>- * based board files can include this file and provide values for board specfic</div><div class='del'>- * bindings.</div><div class='del'>- *</div><div class='del'>- * Note: This file does not include device nodes for all the controllers in</div><div class='del'>- * Exynos4212 SoC. As device tree coverage for Exynos4212 increases, additional</div><div class='del'>- * nodes can be added to this file.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include "exynos4x12.dtsi"</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	compatible = "samsung,exynos4212", "samsung,exynos4";</div><div class='del'>-</div><div class='del'>-	cpus {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		cpu0: cpu@A00 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a9";</div><div class='del'>-			reg = &lt;0xA00&gt;;</div><div class='del'>-			clocks = &lt;&amp;clock CLK_ARM_CLK&gt;;</div><div class='del'>-			clock-names = "cpu";</div><div class='del'>-			operating-points-v2 = &lt;&amp;cpu0_opp_table&gt;;</div><div class='del'>-			cooling-min-level = &lt;13&gt;;</div><div class='del'>-			cooling-max-level = &lt;7&gt;;</div><div class='del'>-			#cooling-cells = &lt;2&gt;; /* min followed by max */</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cpu@A01 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a9";</div><div class='del'>-			reg = &lt;0xA01&gt;;</div><div class='del'>-			operating-points-v2 = &lt;&amp;cpu0_opp_table&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpu0_opp_table: opp_table0 {</div><div class='del'>-		compatible = "operating-points-v2";</div><div class='del'>-		opp-shared;</div><div class='del'>-</div><div class='del'>-		opp00 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;900000&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp01 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;300000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;900000&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp02 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;400000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;925000&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp03 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;500000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;950000&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp04 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;600000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;975000&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp05 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;700000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;987500&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp06 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;800000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1000000&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp07 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;900000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1037500&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp08 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1087500&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp09 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;1100000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1137500&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp10 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;1200000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1187500&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp11 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;1300000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1250000&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp12 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;1400000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1287500&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp13 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;1500000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1350000&gt;;</div><div class='del'>-			clock-latency-ns = &lt;200000&gt;;</div><div class='del'>-			turbo-mode;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;combiner {</div><div class='del'>-	samsung,combiner-nr = &lt;18&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;gic {</div><div class='del'>-	cpu-offset = &lt;0x8000&gt;;</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4412-itop-elite.dts b/arch/arm/boot/dts/exynos4412-itop-elite.dts<br/>new file mode 100644<br/>index 000000000000..d66093084dbb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-itop-elite.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-itop-elite.dts</a></div><div class='hunk'>@@ -0,0 +1,235 @@</div><div class='add'>+/*</div><div class='add'>+ * TOPEET's Exynos4412 based itop board device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 SUMOMO Computer Association</div><div class='add'>+ *			https://www.sumomo.mobi</div><div class='add'>+ *			Randy Li &lt;ayaka@soulik.info&gt;</div><div class='add'>+ *</div><div class='add'>+ * Device tree source file for TOPEET iTop Exynos 4412 core board</div><div class='add'>+ * which is based on Samsung's Exynos4412 SoC.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include &lt;dt-bindings/pwm/pwm.h&gt;</div><div class='add'>+#include &lt;dt-bindings/sound/samsung-i2s.h&gt;</div><div class='add'>+#include "exynos4412-itop-scp-core.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "TOPEET iTop 4412 Elite board based on Exynos4412";</div><div class='add'>+	compatible = "topeet,itop4412-elite", "samsung,exynos4412", "samsung,exynos4";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "root=/dev/mmcblk0p2 rw rootfstype=ext4 rootdelay=1 rootwait";</div><div class='add'>+		stdout-path = "serial2:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		led2 {</div><div class='add'>+			label = "red:system";</div><div class='add'>+			gpios = &lt;&amp;gpx1 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led3 {</div><div class='add'>+			label = "red:user";</div><div class='add'>+			gpios = &lt;&amp;gpk1 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+</div><div class='add'>+		home {</div><div class='add'>+			label = "GPIO Key Home";</div><div class='add'>+			linux,code = &lt;KEY_HOME&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpx1 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		back {</div><div class='add'>+			label = "GPIO Key Back";</div><div class='add'>+			linux,code = &lt;KEY_BACK&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpx1 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sleep {</div><div class='add'>+			label = "GPIO Key Sleep";</div><div class='add'>+			linux,code = &lt;KEY_POWER&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpx3 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		vol-up {</div><div class='add'>+			label = "GPIO Key Vol+";</div><div class='add'>+			linux,code = &lt;KEY_UP&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpx2 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		vol-down {</div><div class='add'>+			label = "GPIO Key Vol-";</div><div class='add'>+			linux,code = &lt;KEY_DOWN&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpx2 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "simple-audio-card";</div><div class='add'>+		simple-audio-card,name = "wm-sound";</div><div class='add'>+</div><div class='add'>+		simple-audio-card,format = "i2s";</div><div class='add'>+		simple-audio-card,bitclock-master = &lt;&amp;link0_codec&gt;;</div><div class='add'>+		simple-audio-card,frame-master = &lt;&amp;link0_codec&gt;;</div><div class='add'>+</div><div class='add'>+		simple-audio-card,widgets =</div><div class='add'>+			"Microphone", "Mic Jack",</div><div class='add'>+			"Line", "Line In",</div><div class='add'>+			"Line", "Line Out",</div><div class='add'>+			"Speaker", "Speaker",</div><div class='add'>+			"Headphone", "Headphone Jack";</div><div class='add'>+		simple-audio-card,routing =</div><div class='add'>+			"Headphone Jack", "HP_L",</div><div class='add'>+			"Headphone Jack", "HP_R",</div><div class='add'>+			"Speaker", "SPK_LP",</div><div class='add'>+			"Speaker", "SPK_LN",</div><div class='add'>+			"Speaker", "SPK_RP",</div><div class='add'>+			"Speaker", "SPK_RN",</div><div class='add'>+			"LINPUT1", "Mic Jack",</div><div class='add'>+			"LINPUT3", "Mic Jack",</div><div class='add'>+			"RINPUT1", "Mic Jack",</div><div class='add'>+			"RINPUT2", "Mic Jack";</div><div class='add'>+</div><div class='add'>+		simple-audio-card,cpu {</div><div class='add'>+			sound-dai = &lt;&amp;i2s0 0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		link0_codec: simple-audio-card,codec {</div><div class='add'>+			sound-dai = &lt;&amp;codec&gt;;</div><div class='add'>+			clocks = &lt;&amp;i2s0 CLK_I2S_CDCLK&gt;;</div><div class='add'>+			system-clock-frequency = &lt;11289600&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	beep {</div><div class='add'>+		compatible = "pwm-beeper";</div><div class='add'>+		pwms = &lt;&amp;pwm 0 4000000 PWM_POLARITY_INVERTED&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	camera: camera {</div><div class='add'>+		pinctrl-0 = &lt;&amp;cam_port_a_clk_active&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		status = "okay";</div><div class='add'>+		assigned-clocks = &lt;&amp;clock CLK_MOUT_CAM0&gt;;</div><div class='add'>+		assigned-clock-parents = &lt;&amp;clock CLK_XUSBXTI&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;adc {</div><div class='add'>+	vdd-supply = &lt;&amp;ldo3_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;clock_audss {</div><div class='add'>+	assigned-clocks = &lt;&amp;clock_audss EXYNOS_MOUT_AUDSS&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_MOUT_I2S&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_DOUT_SRP&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_DOUT_AUD_BUS&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;clock CLK_FOUT_EPLL&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_MOUT_AUDSS&gt;;</div><div class='add'>+	assigned-clock-rates = &lt;0&gt;, &lt;0&gt;, &lt;112896000&gt;, &lt;11289600&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ehci {</div><div class='add'>+	status = "okay";</div><div class='add'>+	/* In order to reset USB ethernet */</div><div class='add'>+	samsung,vbus-gpio = &lt;&amp;gpc0 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+	port@0 {</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	port@2 {</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;exynos_usbphy {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fimc_0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	assigned-clocks = &lt;&amp;clock CLK_MOUT_FIMC0&gt;,</div><div class='add'>+			&lt;&amp;clock CLK_SCLK_FIMC0&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;clock CLK_MOUT_MPLL_USER_T&gt;;</div><div class='add'>+	assigned-clock-rates = &lt;0&gt;, &lt;176000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hsotg {</div><div class='add'>+	dr_mode = "peripheral";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c_4 {</div><div class='add'>+	samsung,i2c-sda-delay = &lt;100&gt;;</div><div class='add'>+	samsung,i2c-slave-addr = &lt;0x10&gt;;</div><div class='add'>+	samsung,i2c-max-bus-freq = &lt;100000&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c4_bus&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	codec: wm8960@1a {</div><div class='add'>+		compatible = "wlf,wm8960";</div><div class='add'>+		reg = &lt;0x1a&gt;;</div><div class='add'>+		clocks = &lt;&amp;pmu_system_controller 0&gt;;</div><div class='add'>+		clock-names = "MCLK1";</div><div class='add'>+		wlf,shared-lrclk;</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2s0 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2s0_bus&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_1 {</div><div class='add'>+	ether-reset {</div><div class='add'>+		samsung,pins = "gpc0-1";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_INPUT&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pwm0_out&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	samsung,pwm-outputs = &lt;0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdhci_2 {</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;sd2_clk &amp;sd2_cmd &amp;sd2_bus4&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	cd-gpio = &lt;&amp;gpx0 7 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	vmmc-supply = &lt;&amp;ldo23_reg&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;ldo17_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;serial_1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;serial_2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi<br/>new file mode 100644<br/>index 000000000000..a36cd36a26b8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi</a></div><div class='hunk'>@@ -0,0 +1,501 @@</div><div class='add'>+/*</div><div class='add'>+ * TOPEET's Exynos4412 based itop board device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 SUMOMO Computer Association</div><div class='add'>+ *			https://www.sumomo.mobi</div><div class='add'>+ *			Randy Li &lt;ayaka@soulik.info&gt;</div><div class='add'>+ *</div><div class='add'>+ * Device tree source file for TOPEET iTop Exynos 4412 SCP package core</div><div class='add'>+ * board which is based on Samsung's Exynos4412 SoC.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/samsung,s2mps11.h&gt;</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include "exynos4412.dtsi"</div><div class='add'>+#include "exynos4412-ppmu-common.dtsi"</div><div class='add'>+#include "exynos-mfc-reserved-memory.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	memory@40000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x40000000 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	firmware@0203F000 {</div><div class='add'>+		compatible = "samsung,secure-firmware";</div><div class='add'>+		reg = &lt;0x0203F000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fixed-rate-clocks {</div><div class='add'>+		xxti {</div><div class='add'>+			compatible = "samsung,clock-xxti";</div><div class='add'>+			clock-frequency = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		xusbxti {</div><div class='add'>+			compatible = "samsung,clock-xusbxti";</div><div class='add'>+			clock-frequency = &lt;24000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	thermal-zones {</div><div class='add'>+		cpu_thermal: cpu-thermal {</div><div class='add'>+			cooling-maps {</div><div class='add'>+				map0 {</div><div class='add'>+				     /* Corresponds to 800MHz at freq_table */</div><div class='add'>+				     cooling-device = &lt;&amp;cpu0 7 7&gt;;</div><div class='add'>+				};</div><div class='add'>+				map1 {</div><div class='add'>+				     /* Corresponds to 200MHz at freq_table */</div><div class='add'>+				     cooling-device = &lt;&amp;cpu0 13 13&gt;;</div><div class='add'>+			       };</div><div class='add'>+		       };</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb-hub {</div><div class='add'>+		compatible = "smsc,usb3503a";</div><div class='add'>+		reset-gpios = &lt;&amp;gpm2 4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		connect-gpios = &lt;&amp;gpm3 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		intn-gpios = &lt;&amp;gpx2 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;hsic_reset&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_dmc {</div><div class='add'>+	devfreq-events = &lt;&amp;ppmu_dmc0_3&gt;, &lt;&amp;ppmu_dmc1_3&gt;;</div><div class='add'>+	vdd-supply = &lt;&amp;buck1_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_acp {</div><div class='add'>+	devfreq = &lt;&amp;bus_dmc&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_c2c {</div><div class='add'>+	devfreq = &lt;&amp;bus_dmc&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_leftbus {</div><div class='add'>+	devfreq-events = &lt;&amp;ppmu_leftbus_3&gt;, &lt;&amp;ppmu_rightbus_3&gt;;</div><div class='add'>+	vdd-supply = &lt;&amp;buck3_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_rightbus {</div><div class='add'>+	devfreq = &lt;&amp;bus_leftbus&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_fsys {</div><div class='add'>+	devfreq = &lt;&amp;bus_leftbus&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_peri {</div><div class='add'>+	devfreq = &lt;&amp;bus_leftbus&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_mfc {</div><div class='add'>+	devfreq = &lt;&amp;bus_leftbus&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpu0 {</div><div class='add'>+	cpu0-supply = &lt;&amp;buck2_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hsotg {</div><div class='add'>+	vusb_d-supply = &lt;&amp;ldo15_reg&gt;;</div><div class='add'>+	vusb_a-supply = &lt;&amp;ldo12_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c_1 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	samsung,i2c-sda-delay = &lt;100&gt;;</div><div class='add'>+	samsung,i2c-max-bus-freq = &lt;400000&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_bus&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	s5m8767: s5m8767-pmic@66 {</div><div class='add'>+		compatible = "samsung,s5m8767-pmic";</div><div class='add'>+		reg = &lt;0x66&gt;;</div><div class='add'>+</div><div class='add'>+		s5m8767,pmic-buck-default-dvs-idx = &lt;3&gt;;</div><div class='add'>+</div><div class='add'>+		s5m8767,pmic-buck-dvs-gpios = &lt;&amp;gpb 5 GPIO_ACTIVE_HIGH&gt;,</div><div class='add'>+						 &lt;&amp;gpb 6 GPIO_ACTIVE_HIGH&gt;,</div><div class='add'>+						 &lt;&amp;gpb 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		s5m8767,pmic-buck-ds-gpios = &lt;&amp;gpm3 5 GPIO_ACTIVE_HIGH&gt;,</div><div class='add'>+						&lt;&amp;gpm3 6 GPIO_ACTIVE_HIGH&gt;,</div><div class='add'>+						&lt;&amp;gpm3 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		/* VDD_ARM */</div><div class='add'>+		s5m8767,pmic-buck2-dvs-voltage = &lt;1356250&gt;, &lt;1300000&gt;,</div><div class='add'>+						 &lt;1243750&gt;, &lt;1118750&gt;,</div><div class='add'>+						 &lt;1068750&gt;, &lt;1012500&gt;,</div><div class='add'>+						 &lt;956250&gt;, &lt;900000&gt;;</div><div class='add'>+		/* VDD_INT */</div><div class='add'>+		s5m8767,pmic-buck3-dvs-voltage = &lt;1000000&gt;, &lt;1000000&gt;,</div><div class='add'>+						 &lt;925000&gt;, &lt;925000&gt;,</div><div class='add'>+						 &lt;887500&gt;, &lt;887500&gt;,</div><div class='add'>+						 &lt;850000&gt;, &lt;850000&gt;;</div><div class='add'>+		/* VDD_G3D */</div><div class='add'>+		s5m8767,pmic-buck4-dvs-voltage = &lt;1081250&gt;, &lt;1081250&gt;,</div><div class='add'>+						 &lt;1025000&gt;, &lt;950000&gt;,</div><div class='add'>+						 &lt;918750&gt;, &lt;900000&gt;,</div><div class='add'>+						 &lt;875000&gt;, &lt;831250&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			ldo1_reg: LDO1 {</div><div class='add'>+				regulator-name = "VDD_ALIVE";</div><div class='add'>+				regulator-min-microvolt = &lt;1100000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1100000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* SCP uses 1.5v, POP uses 1.2v */</div><div class='add'>+			ldo2_reg: LDO2 {</div><div class='add'>+				regulator-name = "VDDQ_M12";</div><div class='add'>+				regulator-min-microvolt = &lt;1500000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1500000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo3_reg: LDO3 {</div><div class='add'>+				regulator-name = "VDDIOAP_18";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo4_reg: LDO4 {</div><div class='add'>+				regulator-name = "VDDQ_PRE";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo5_reg: LDO5 {</div><div class='add'>+				regulator-name = "VDD_LDO5";</div><div class='add'>+				op_mode = &lt;0&gt;; /* Always off Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo6_reg: LDO6 {</div><div class='add'>+				regulator-name = "VDD10_MPLL";</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo7_reg: LDO7 {</div><div class='add'>+				regulator-name = "VDD10_XPLL";</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo8_reg: LDO8 {</div><div class='add'>+				regulator-name = "VDD10_MIPI";</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo9_reg: LDO9 {</div><div class='add'>+				regulator-name = "VDD33_LCD";</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo10_reg: LDO10 {</div><div class='add'>+				regulator-name = "VDD18_MIPI";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo11_reg: LDO11 {</div><div class='add'>+				regulator-name = "VDD18_ABB1";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo12_reg: LDO12 {</div><div class='add'>+				regulator-name = "VDD33_UOTG";</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo13_reg: LDO13 {</div><div class='add'>+				regulator-name = "VDDIOPERI_18";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo14_reg: LDO14 {</div><div class='add'>+				regulator-name = "VDD18_ABB02";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo15_reg: LDO15 {</div><div class='add'>+				regulator-name = "VDD10_USH";</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo16_reg: LDO16 {</div><div class='add'>+				regulator-name = "VDD18_HSIC";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo17_reg: LDO17 {</div><div class='add'>+				regulator-name = "VDDIOAP_MMC012_28";</div><div class='add'>+				regulator-min-microvolt = &lt;2800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* Used by HSIC */</div><div class='add'>+			ldo18_reg: LDO18 {</div><div class='add'>+				regulator-name = "VDDIOPERI_28";</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo19_reg: LDO19 {</div><div class='add'>+				regulator-name = "VDD_LDO19";</div><div class='add'>+				op_mode = &lt;0&gt;; /* Always off Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo20_reg: LDO20 {</div><div class='add'>+				regulator-name = "VDD28_CAM";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo21_reg: LDO21 {</div><div class='add'>+				regulator-name = "VDD28_AF";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo22_reg: LDO22 {</div><div class='add'>+				regulator-name = "VDDA28_2M";</div><div class='add'>+				regulator-min-microvolt = &lt;2800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo23_reg: LDO23 {</div><div class='add'>+				regulator-name = "VDD28_TF";</div><div class='add'>+				regulator-min-microvolt = &lt;2800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo24_reg: LDO24 {</div><div class='add'>+				regulator-name = "VDD33_A31";</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo25_reg: LDO25 {</div><div class='add'>+				regulator-name = "VDD18_CAM";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo26_reg: LDO26 {</div><div class='add'>+				regulator-name = "VDD18_A31";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo27_reg: LDO27 {</div><div class='add'>+				regulator-name = "GPS_1V8";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo28_reg: LDO28 {</div><div class='add'>+				regulator-name = "DVDD12";</div><div class='add'>+				regulator-min-microvolt = &lt;1200000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1200000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck1_reg: BUCK1 {</div><div class='add'>+				regulator-name = "vdd_mif";</div><div class='add'>+				regulator-min-microvolt = &lt;850000&gt;;</div><div class='add'>+				regulator-max-microvolt	= &lt;1100000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck2_reg: BUCK2 {</div><div class='add'>+				regulator-name = "vdd_arm";</div><div class='add'>+				regulator-min-microvolt = &lt;850000&gt;;</div><div class='add'>+				regulator-max-microvolt	= &lt;1456250&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck3_reg: BUCK3 {</div><div class='add'>+				regulator-name = "vdd_int";</div><div class='add'>+				regulator-min-microvolt = &lt;875000&gt;;</div><div class='add'>+				regulator-max-microvolt	= &lt;1200000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck4_reg: BUCK4 {</div><div class='add'>+				regulator-name = "vdd_g3d";</div><div class='add'>+				regulator-min-microvolt = &lt;750000&gt;;</div><div class='add'>+				regulator-max-microvolt	= &lt;1500000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck5_reg: BUCK5 {</div><div class='add'>+				regulator-name = "vdd_m12";</div><div class='add'>+				regulator-min-microvolt = &lt;750000&gt;;</div><div class='add'>+				regulator-max-microvolt	= &lt;1500000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck6_reg: BUCK6 {</div><div class='add'>+				regulator-name = "vdd12_5m";</div><div class='add'>+				regulator-min-microvolt = &lt;750000&gt;;</div><div class='add'>+				regulator-max-microvolt	= &lt;1500000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck7_reg: BUCK7 {</div><div class='add'>+				regulator-name = "pvdd_buck7";</div><div class='add'>+				regulator-min-microvolt = &lt;750000&gt;;</div><div class='add'>+				regulator-max-microvolt	= &lt;2000000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck8_reg: BUCK8 {</div><div class='add'>+				regulator-name = "pvdd_buck8";</div><div class='add'>+				regulator-min-microvolt = &lt;750000&gt;;</div><div class='add'>+				regulator-max-microvolt	= &lt;1500000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck9_reg: BUCK9 {</div><div class='add'>+				regulator-name = "vddf28_emmc";</div><div class='add'>+				regulator-min-microvolt = &lt;750000&gt;;</div><div class='add'>+				regulator-max-microvolt	= &lt;3000000&gt;;</div><div class='add'>+				op_mode = &lt;1&gt;; /* Normal Mode */</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		s5m8767_osc: clocks {</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			clock-output-names = "s5m8767_ap",</div><div class='add'>+					"s5m8767_cp", "s5m8767_bt";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mfc {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mshc_0 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;sd4_clk &amp;sd4_cmd &amp;sd4_bus4 &amp;sd4_bus8&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+	vmmc-supply = &lt;&amp;buck9_reg&gt;;</div><div class='add'>+	num-slots = &lt;1&gt;;</div><div class='add'>+	broken-cd;</div><div class='add'>+	card-detect-delay = &lt;200&gt;;</div><div class='add'>+	samsung,dw-mshc-ciu-div = &lt;3&gt;;</div><div class='add'>+	samsung,dw-mshc-sdr-timing = &lt;2 3&gt;;</div><div class='add'>+	samsung,dw-mshc-ddr-timing = &lt;1 2&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_1 {</div><div class='add'>+	hsic_reset: hsic-reset {</div><div class='add'>+		samsung,pins = "gpm2-4";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_INPUT&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rtc {</div><div class='add'>+	status = "okay";</div><div class='add'>+	clocks = &lt;&amp;clock CLK_RTC&gt;, &lt;&amp;s5m8767_osc S2MPS11_CLK_AP&gt;;</div><div class='add'>+	clock-names = "rtc", "rtc_src";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tmu {</div><div class='add'>+	vtmu-supply = &lt;&amp;ldo16_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;watchdog {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi<br/>index 8aa19ba14436..78f118cb73d4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-odroid-common.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4412-odroid-common.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-odroid-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-odroid-common.dtsi</a></div><div class='hunk'>@@ -43,16 +43,6 @@</div><div class='ctx'> </div><div class='ctx'> 	sound: sound {</div><div class='ctx'> 		compatible = "simple-audio-card";</div><div class='del'>-		assigned-clocks = &lt;&amp;clock_audss EXYNOS_MOUT_AUDSS&gt;,</div><div class='del'>-				&lt;&amp;clock_audss EXYNOS_MOUT_I2S&gt;,</div><div class='del'>-				&lt;&amp;clock_audss EXYNOS_DOUT_SRP&gt;,</div><div class='del'>-				&lt;&amp;clock_audss EXYNOS_DOUT_AUD_BUS&gt;;</div><div class='del'>-		assigned-clock-parents = &lt;&amp;clock CLK_FOUT_EPLL&gt;,</div><div class='del'>-				&lt;&amp;clock_audss EXYNOS_MOUT_AUDSS&gt;;</div><div class='del'>-		assigned-clock-rates = &lt;0&gt;,</div><div class='del'>-				&lt;0&gt;,</div><div class='del'>-				&lt;192000000&gt;,</div><div class='del'>-				&lt;19200000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		simple-audio-card,format = "i2s";</div><div class='ctx'> 		simple-audio-card,bitclock-master = &lt;&amp;link0_codec&gt;;</div><div class='hunk'>@@ -97,11 +87,11 @@</div><div class='ctx'> 	thermal-zones {</div><div class='ctx'> 		cpu_thermal: cpu-thermal {</div><div class='ctx'> 			cooling-maps {</div><div class='del'>-				map0 {</div><div class='add'>+				cooling_map0: map0 {</div><div class='ctx'> 				     /* Corresponds to 800MHz at freq_table */</div><div class='ctx'> 				     cooling-device = &lt;&amp;cpu0 7 7&gt;;</div><div class='ctx'> 				};</div><div class='del'>-				map1 {</div><div class='add'>+				cooling_map1: map1 {</div><div class='ctx'> 				     /* Corresponds to 200MHz at freq_table */</div><div class='ctx'> 				     cooling-device = &lt;&amp;cpu0 13 13&gt;;</div><div class='ctx'> 			       };</div><div class='hunk'>@@ -157,6 +147,16 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;clock_audss {</div><div class='add'>+	assigned-clocks = &lt;&amp;clock_audss EXYNOS_MOUT_AUDSS&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_MOUT_I2S&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_DOUT_SRP&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_DOUT_AUD_BUS&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;clock CLK_FOUT_EPLL&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_MOUT_AUDSS&gt;;</div><div class='add'>+	assigned-clock-rates = &lt;0&gt;, &lt;0&gt;, &lt;192000000&gt;, &lt;19200000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;cpu0 {</div><div class='ctx'> 	cpu0-supply = &lt;&amp;buck2_reg&gt;;</div><div class='ctx'> };</div><div class='hunk'>@@ -503,10 +503,6 @@</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;i2s0_bus&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	clocks = &lt;&amp;clock_audss EXYNOS_I2S_BUS&gt;,</div><div class='del'>-		 &lt;&amp;clock_audss EXYNOS_DOUT_AUD_BUS&gt;,</div><div class='del'>-		 &lt;&amp;clock_audss EXYNOS_SCLK_I2S&gt;;</div><div class='del'>-	clock-names = "iis", "i2s_opclk0", "i2s_opclk1";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mixer {</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts<br/>index 99634c54dca9..7504a5aa538e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-odroidu3.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4412-odroidu3.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-odroidu3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-odroidu3.dts</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> #include "exynos4412-odroid-common.dtsi"</div><div class='add'>+#include "exynos4412-prime.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Hardkernel ODROID-U3 board based on Exynos4412";</div><div class='hunk'>@@ -47,11 +48,11 @@</div><div class='ctx'> 			cooling-maps {</div><div class='ctx'> 				map0 {</div><div class='ctx'> 				     trip = &lt;&amp;cpu_alert1&gt;;</div><div class='del'>-				     cooling-device = &lt;&amp;cpu0 7 7&gt;;</div><div class='add'>+				     cooling-device = &lt;&amp;cpu0 9 9&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 				map1 {</div><div class='ctx'> 				     trip = &lt;&amp;cpu_alert2&gt;;</div><div class='del'>-				     cooling-device = &lt;&amp;cpu0 13 13&gt;;</div><div class='add'>+				     cooling-device = &lt;&amp;cpu0 15 15&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 				map2 {</div><div class='ctx'> 				     trip = &lt;&amp;cpu_alert0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts<br/>index 61906b35ea7a..46b931eec228 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-odroidx.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4412-odroidx.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-odroidx.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-odroidx.dts</a></div><div class='hunk'>@@ -64,6 +64,11 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;adc {</div><div class='add'>+	vdd-supply = &lt;&amp;ldo10_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* VDDQ for MSHC (eMMC card) */</div><div class='ctx'> &amp;buck8_reg {</div><div class='ctx'> 	regulator-name = "BUCK8_VDDQ_MMC4_2.8V";</div><div class='hunk'>@@ -95,3 +100,16 @@</div><div class='ctx'> &amp;serial_3 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;sound {</div><div class='add'>+	simple-audio-card,name = "Odroid-X";</div><div class='add'>+	simple-audio-card,widgets =</div><div class='add'>+		"Headphone", "Headphone Jack",</div><div class='add'>+		"Microphone", "Mic Jack",</div><div class='add'>+		"Microphone", "DMIC";</div><div class='add'>+	simple-audio-card,routing =</div><div class='add'>+		"Headphone Jack", "HPL",</div><div class='add'>+		"Headphone Jack", "HPR",</div><div class='add'>+		"IN1", "Mic Jack",</div><div class='add'>+		"Mic Jack", "MICBIAS";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts<br/>index 4d228858f172..d867b2ee95ca 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-odroidx2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4412-odroidx2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-odroidx2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-odroidx2.dts</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include "exynos4412-odroidx.dts"</div><div class='add'>+#include "exynos4412-prime.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Hardkernel ODROID-X2 board based on Exynos4412";</div><div class='hunk'>@@ -22,27 +23,3 @@</div><div class='ctx'> 		reg = &lt;0x40000000 0x7FF00000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-/* VDDQ for MSHC (eMMC card) */</div><div class='del'>-&amp;buck8_reg {</div><div class='del'>-	regulator-name = "BUCK8_VDDQ_MMC4_2.8V";</div><div class='del'>-	regulator-min-microvolt = &lt;2800000&gt;;</div><div class='del'>-	regulator-max-microvolt = &lt;2800000&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;mshc_0 {</div><div class='del'>-	vqmmc-supply = &lt;&amp;buck8_reg&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;sound {</div><div class='del'>-	simple-audio-card,name = "Odroid-X2";</div><div class='del'>-	simple-audio-card,widgets =</div><div class='del'>-		"Headphone", "Headphone Jack",</div><div class='del'>-		"Microphone", "Mic Jack",</div><div class='del'>-		"Microphone", "DMIC";</div><div class='del'>-	simple-audio-card,routing =</div><div class='del'>-		"Headphone Jack", "HPL",</div><div class='del'>-		"Headphone Jack", "HPR",</div><div class='del'>-		"IN1", "Mic Jack",</div><div class='del'>-		"Mic Jack", "MICBIAS";</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4412-pinctrl.dtsi b/arch/arm/boot/dts/exynos4412-pinctrl.dtsi<br/>new file mode 100644<br/>index 000000000000..1d27c28564e4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-pinctrl.dtsi</a></div><div class='hunk'>@@ -0,0 +1,984 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung's Exynos4412 SoCs pin-mux and pin-config device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Samsung's Exynos4412 SoCs pin-mux and pin-config optiosn are listed as device</div><div class='add'>+ * tree nodes are listed in this file.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/pinctrl/samsung.h&gt;</div><div class='add'>+</div><div class='add'>+#define PIN_SLP(_pin, _mode, _pull)					\</div><div class='add'>+	_pin {								\</div><div class='add'>+		samsung,pins = #_pin;					\</div><div class='add'>+		samsung,pin-con-pdn = &lt;EXYNOS_PIN_PDN_ ##_mode&gt;;	\</div><div class='add'>+		samsung,pin-pud-pdn = &lt;EXYNOS_PIN_PULL_ ##_pull&gt;;	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	pinctrl_0: pinctrl@11400000 {</div><div class='add'>+		gpa0: gpa0 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpa1: gpa1 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpb: gpb {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpc0: gpc0 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpc1: gpc1 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpd0: gpd0 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpd1: gpd1 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpf0: gpf0 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpf1: gpf1 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpf2: gpf2 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpf3: gpf3 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpj0: gpj0 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpj1: gpj1 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart0_data: uart0-data {</div><div class='add'>+			samsung,pins = "gpa0-0", "gpa0-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart0_fctl: uart0-fctl {</div><div class='add'>+			samsung,pins = "gpa0-2", "gpa0-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart1_data: uart1-data {</div><div class='add'>+			samsung,pins = "gpa0-4", "gpa0-5";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart1_fctl: uart1-fctl {</div><div class='add'>+			samsung,pins = "gpa0-6", "gpa0-7";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c2_bus: i2c2-bus {</div><div class='add'>+			samsung,pins = "gpa0-6", "gpa0-7";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart2_data: uart2-data {</div><div class='add'>+			samsung,pins = "gpa1-0", "gpa1-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart2_fctl: uart2-fctl {</div><div class='add'>+			samsung,pins = "gpa1-2", "gpa1-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_audio_a: uart-audio-a {</div><div class='add'>+			samsung,pins = "gpa1-0", "gpa1-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c3_bus: i2c3-bus {</div><div class='add'>+			samsung,pins = "gpa1-2", "gpa1-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart3_data: uart3-data {</div><div class='add'>+			samsung,pins = "gpa1-4", "gpa1-5";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_audio_b: uart-audio-b {</div><div class='add'>+			samsung,pins = "gpa1-4", "gpa1-5";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spi0_bus: spi0-bus {</div><div class='add'>+			samsung,pins = "gpb-0", "gpb-2", "gpb-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c4_bus: i2c4-bus {</div><div class='add'>+			samsung,pins = "gpb-0", "gpb-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spi1_bus: spi1-bus {</div><div class='add'>+			samsung,pins = "gpb-4", "gpb-6", "gpb-7";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c5_bus: i2c5-bus {</div><div class='add'>+			samsung,pins = "gpb-2", "gpb-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2s1_bus: i2s1-bus {</div><div class='add'>+			samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",</div><div class='add'>+					"gpc0-4";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcm1_bus: pcm1-bus {</div><div class='add'>+			samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",</div><div class='add'>+					"gpc0-4";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ac97_bus: ac97-bus {</div><div class='add'>+			samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",</div><div class='add'>+					"gpc0-4";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2s2_bus: i2s2-bus {</div><div class='add'>+			samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",</div><div class='add'>+					"gpc1-4";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcm2_bus: pcm2-bus {</div><div class='add'>+			samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",</div><div class='add'>+					"gpc1-4";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spdif_bus: spdif-bus {</div><div class='add'>+			samsung,pins = "gpc1-0", "gpc1-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c6_bus: i2c6-bus {</div><div class='add'>+			samsung,pins = "gpc1-3", "gpc1-4";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spi2_bus: spi2-bus {</div><div class='add'>+			samsung,pins = "gpc1-1", "gpc1-3", "gpc1-4";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_5&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm0_out: pwm0-out {</div><div class='add'>+			samsung,pins = "gpd0-0";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm1_out: pwm1-out {</div><div class='add'>+			samsung,pins = "gpd0-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lcd_ctrl: lcd-ctrl {</div><div class='add'>+			samsung,pins = "gpd0-0", "gpd0-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c7_bus: i2c7-bus {</div><div class='add'>+			samsung,pins = "gpd0-2", "gpd0-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm2_out: pwm2-out {</div><div class='add'>+			samsung,pins = "gpd0-2";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm3_out: pwm3-out {</div><div class='add'>+			samsung,pins = "gpd0-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c0_bus: i2c0-bus {</div><div class='add'>+			samsung,pins = "gpd1-0", "gpd1-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mipi0_clk: mipi0-clk {</div><div class='add'>+			samsung,pins = "gpd1-0", "gpd1-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c1_bus: i2c1-bus {</div><div class='add'>+			samsung,pins = "gpd1-2", "gpd1-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mipi1_clk: mipi1-clk {</div><div class='add'>+			samsung,pins = "gpd1-2", "gpd1-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lcd_clk: lcd-clk {</div><div class='add'>+			samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lcd_data16: lcd-data-width16 {</div><div class='add'>+			samsung,pins = "gpf0-7", "gpf1-0", "gpf1-1", "gpf1-2",</div><div class='add'>+					"gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0",</div><div class='add'>+					"gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7",</div><div class='add'>+					"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lcd_data18: lcd-data-width18 {</div><div class='add'>+			samsung,pins = "gpf0-6", "gpf0-7", "gpf1-0", "gpf1-1",</div><div class='add'>+					"gpf1-2", "gpf1-3", "gpf1-6", "gpf1-7",</div><div class='add'>+					"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",</div><div class='add'>+					"gpf2-6", "gpf2-7", "gpf3-0", "gpf3-1",</div><div class='add'>+					"gpf3-2", "gpf3-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lcd_data24: lcd-data-width24 {</div><div class='add'>+			samsung,pins = "gpf0-4", "gpf0-5", "gpf0-6", "gpf0-7",</div><div class='add'>+					"gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3",</div><div class='add'>+					"gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7",</div><div class='add'>+					"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",</div><div class='add'>+					"gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",</div><div class='add'>+					"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lcd_ldi: lcd-ldi {</div><div class='add'>+			samsung,pins = "gpf3-4";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cam_port_a_io: cam-port-a-io {</div><div class='add'>+			samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",</div><div class='add'>+					"gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",</div><div class='add'>+					"gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cam_port_a_clk_active: cam-port-a-clk-active {</div><div class='add'>+			samsung,pins = "gpj1-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cam_port_a_clk_idle: cam-port-a-clk-idle {</div><div class='add'>+			samsung,pins = "gpj1-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_INPUT&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_DOWN&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_1: pinctrl@11000000 {</div><div class='add'>+		gpk0: gpk0 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpk1: gpk1 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpk2: gpk2 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpk3: gpk3 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpl0: gpl0 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpl1: gpl1 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpl2: gpl2 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpm0: gpm0 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpm1: gpm1 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpm2: gpm2 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpm3: gpm3 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpm4: gpm4 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy0: gpy0 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy1: gpy1 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy2: gpy2 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy3: gpy3 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy4: gpy4 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy5: gpy5 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy6: gpy6 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpx0: gpx0 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpx1: gpx1 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpx2: gpx2 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpx3: gpx3 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd0_clk: sd0-clk {</div><div class='add'>+			samsung,pins = "gpk0-0";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd0_cmd: sd0-cmd {</div><div class='add'>+			samsung,pins = "gpk0-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd0_cd: sd0-cd {</div><div class='add'>+			samsung,pins = "gpk0-2";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd0_bus1: sd0-bus-width1 {</div><div class='add'>+			samsung,pins = "gpk0-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd0_bus4: sd0-bus-width4 {</div><div class='add'>+			samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd0_bus8: sd0-bus-width8 {</div><div class='add'>+			samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd4_clk: sd4-clk {</div><div class='add'>+			samsung,pins = "gpk0-0";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd4_cmd: sd4-cmd {</div><div class='add'>+			samsung,pins = "gpk0-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd4_cd: sd4-cd {</div><div class='add'>+			samsung,pins = "gpk0-2";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd4_bus1: sd4-bus-width1 {</div><div class='add'>+			samsung,pins = "gpk0-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd4_bus4: sd4-bus-width4 {</div><div class='add'>+			samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd4_bus8: sd4-bus-width8 {</div><div class='add'>+			samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd1_clk: sd1-clk {</div><div class='add'>+			samsung,pins = "gpk1-0";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd1_cmd: sd1-cmd {</div><div class='add'>+			samsung,pins = "gpk1-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd1_cd: sd1-cd {</div><div class='add'>+			samsung,pins = "gpk1-2";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd1_bus1: sd1-bus-width1 {</div><div class='add'>+			samsung,pins = "gpk1-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd1_bus4: sd1-bus-width4 {</div><div class='add'>+			samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd2_clk: sd2-clk {</div><div class='add'>+			samsung,pins = "gpk2-0";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd2_cmd: sd2-cmd {</div><div class='add'>+			samsung,pins = "gpk2-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd2_cd: sd2-cd {</div><div class='add'>+			samsung,pins = "gpk2-2";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd2_bus1: sd2-bus-width1 {</div><div class='add'>+			samsung,pins = "gpk2-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd2_bus4: sd2-bus-width4 {</div><div class='add'>+			samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd2_bus8: sd2-bus-width8 {</div><div class='add'>+			samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd3_clk: sd3-clk {</div><div class='add'>+			samsung,pins = "gpk3-0";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd3_cmd: sd3-cmd {</div><div class='add'>+			samsung,pins = "gpk3-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd3_cd: sd3-cd {</div><div class='add'>+			samsung,pins = "gpk3-2";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd3_bus1: sd3-bus-width1 {</div><div class='add'>+			samsung,pins = "gpk3-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sd3_bus4: sd3-bus-width4 {</div><div class='add'>+			samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cam_port_b_io: cam-port-b-io {</div><div class='add'>+			samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",</div><div class='add'>+					"gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",</div><div class='add'>+					"gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cam_port_b_clk_active: cam-port-b-clk-active {</div><div class='add'>+			samsung,pins = "gpm2-2";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cam_port_b_clk_idle: cam-port-b-clk-idle {</div><div class='add'>+			samsung,pins = "gpm2-2";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_INPUT&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_DOWN&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		eint0: ext-int0 {</div><div class='add'>+			samsung,pins = "gpx0-0";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_F&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		eint8: ext-int8 {</div><div class='add'>+			samsung,pins = "gpx1-0";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_F&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		eint15: ext-int15 {</div><div class='add'>+			samsung,pins = "gpx1-7";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_F&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		eint16: ext-int16 {</div><div class='add'>+			samsung,pins = "gpx2-0";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_F&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		eint31: ext-int31 {</div><div class='add'>+			samsung,pins = "gpx3-7";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_F&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		fimc_is_i2c0: fimc-is-i2c0 {</div><div class='add'>+			samsung,pins = "gpm4-0", "gpm4-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		fimc_is_i2c1: fimc-is-i2c1 {</div><div class='add'>+			samsung,pins = "gpm4-2", "gpm4-3";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		fimc_is_uart: fimc-is-uart {</div><div class='add'>+			samsung,pins = "gpm3-5", "gpm3-7";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hdmi_cec: hdmi-cec {</div><div class='add'>+			samsung,pins = "gpx3-6";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_2: pinctrl@03860000 {</div><div class='add'>+		gpz: gpz {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2s0_bus: i2s0-bus {</div><div class='add'>+			samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",</div><div class='add'>+					"gpz-4", "gpz-5", "gpz-6";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcm0_bus: pcm0-bus {</div><div class='add'>+			samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",</div><div class='add'>+					"gpz-4";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_3: pinctrl@106E0000 {</div><div class='add'>+		gpv0: gpv0 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpv1: gpv1 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpv2: gpv2 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpv3: gpv3 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpv4: gpv4 {</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		c2c_bus: c2c-bus {</div><div class='add'>+			samsung,pins = "gpv0-0", "gpv0-1", "gpv0-2", "gpv0-3",</div><div class='add'>+					"gpv0-4", "gpv0-5", "gpv0-6", "gpv0-7",</div><div class='add'>+					"gpv1-0", "gpv1-1", "gpv1-2", "gpv1-3",</div><div class='add'>+					"gpv1-4", "gpv1-5", "gpv1-6", "gpv1-7",</div><div class='add'>+					"gpv2-0", "gpv2-1", "gpv2-2", "gpv2-3",</div><div class='add'>+					"gpv2-4", "gpv2-5", "gpv2-6", "gpv2-7",</div><div class='add'>+					"gpv3-0", "gpv3-1", "gpv3-2", "gpv3-3",</div><div class='add'>+					"gpv3-4", "gpv3-5", "gpv3-6", "gpv3-7",</div><div class='add'>+					"gpv4-0", "gpv4-1";</div><div class='add'>+			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4412-prime.dtsi b/arch/arm/boot/dts/exynos4412-prime.dtsi<br/>new file mode 100644<br/>index 000000000000..e75bc170c89c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412-prime.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412-prime.dtsi</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung's Exynos4412 Prime SoC device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Exynos4412 Prime SoC revision supports higher CPU frequencies than</div><div class='add'>+ * non-Prime version.  Therefore we need to update OPPs table and</div><div class='add'>+ * thermal maps accordingly.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;cpu0_opp_1500 {</div><div class='add'>+	/delete-property/turbo-mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpu0_opp_table {</div><div class='add'>+	opp@1600000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;1600000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;1350000&gt;;</div><div class='add'>+		clock-latency-ns = &lt;200000&gt;;</div><div class='add'>+	};</div><div class='add'>+	opp@1704000000 {</div><div class='add'>+		opp-hz = /bits/ 64 &lt;1704000000&gt;;</div><div class='add'>+		opp-microvolt = &lt;1350000&gt;;</div><div class='add'>+		clock-latency-ns = &lt;200000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cooling_map0 {</div><div class='add'>+	cooling-device = &lt;&amp;cpu0 9 9&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cooling_map1 {</div><div class='add'>+	cooling-device = &lt;&amp;cpu0 15 15&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi<br/>index 40beede46e55..235bbb69ad7c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4412.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4412.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos4412.dtsi</a></div><div class='hunk'>@@ -17,11 +17,23 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include "exynos4x12.dtsi"</div><div class='add'>+#include "exynos4.dtsi"</div><div class='add'>+#include "exynos4412-pinctrl.dtsi"</div><div class='add'>+#include "exynos4-cpu-thermal.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "samsung,exynos4412", "samsung,exynos4";</div><div class='ctx'> </div><div class='add'>+	aliases {</div><div class='add'>+		pinctrl0 = &amp;pinctrl_0;</div><div class='add'>+		pinctrl1 = &amp;pinctrl_1;</div><div class='add'>+		pinctrl2 = &amp;pinctrl_2;</div><div class='add'>+		pinctrl3 = &amp;pinctrl_3;</div><div class='add'>+		fimc-lite0 = &amp;fimc_lite_0;</div><div class='add'>+		fimc-lite1 = &amp;fimc_lite_1;</div><div class='add'>+		mshc0 = &amp;mshc_0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	cpus {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -130,7 +142,7 @@</div><div class='ctx'> 			opp-microvolt = &lt;1287500&gt;;</div><div class='ctx'> 			clock-latency-ns = &lt;200000&gt;;</div><div class='ctx'> 		};</div><div class='del'>-		opp@1500000000 {</div><div class='add'>+		cpu0_opp_1500: opp@1500000000 {</div><div class='ctx'> 			opp-hz = /bits/ 64 &lt;1500000000&gt;;</div><div class='ctx'> 			opp-microvolt = &lt;1350000&gt;;</div><div class='ctx'> 			clock-latency-ns = &lt;200000&gt;;</div><div class='hunk'>@@ -138,19 +150,573 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	sysram@02020000 {</div><div class='add'>+		compatible = "mmio-sram";</div><div class='add'>+		reg = &lt;0x02020000 0x40000&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges = &lt;0 0x02020000 0x40000&gt;;</div><div class='add'>+</div><div class='add'>+		smp-sysram@0 {</div><div class='add'>+			compatible = "samsung,exynos4210-sysram";</div><div class='add'>+			reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		smp-sysram@2f000 {</div><div class='add'>+			compatible = "samsung,exynos4210-sysram-ns";</div><div class='add'>+			reg = &lt;0x2f000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pd_isp: isp-power-domain@10023CA0 {</div><div class='add'>+		compatible = "samsung,exynos4210-pd";</div><div class='add'>+		reg = &lt;0x10023CA0 0x20&gt;;</div><div class='add'>+		#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		label = "ISP";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	l2c: l2-cache-controller@10502000 {</div><div class='add'>+		compatible = "arm,pl310-cache";</div><div class='add'>+		reg = &lt;0x10502000 0x1000&gt;;</div><div class='add'>+		cache-unified;</div><div class='add'>+		cache-level = &lt;2&gt;;</div><div class='add'>+		arm,tag-latency = &lt;2 2 1&gt;;</div><div class='add'>+		arm,data-latency = &lt;3 2 1&gt;;</div><div class='add'>+		arm,double-linefill = &lt;1&gt;;</div><div class='add'>+		arm,double-linefill-incr = &lt;0&gt;;</div><div class='add'>+		arm,double-linefill-wrap = &lt;1&gt;;</div><div class='add'>+		arm,prefetch-drop = &lt;1&gt;;</div><div class='add'>+		arm,prefetch-offset = &lt;7&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clock: clock-controller@10030000 {</div><div class='add'>+		compatible = "samsung,exynos4412-clock";</div><div class='add'>+		reg = &lt;0x10030000 0x20000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mct@10050000 {</div><div class='add'>+		compatible = "samsung,exynos4412-mct";</div><div class='add'>+		reg = &lt;0x10050000 0x800&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;mct_map&gt;;</div><div class='add'>+		interrupts = &lt;0&gt;, &lt;1&gt;, &lt;2&gt;, &lt;3&gt;, &lt;4&gt;;</div><div class='add'>+		clocks = &lt;&amp;clock CLK_FIN_PLL&gt;, &lt;&amp;clock CLK_MCT&gt;;</div><div class='add'>+		clock-names = "fin_pll", "mct";</div><div class='add'>+</div><div class='add'>+		mct_map: mct-map {</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			#address-cells = &lt;0&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupt-map = &lt;0 &amp;gic 0 57 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+					&lt;1 &amp;combiner 12 5&gt;,</div><div class='add'>+					&lt;2 &amp;combiner 12 6&gt;,</div><div class='add'>+					&lt;3 &amp;combiner 12 7&gt;,</div><div class='add'>+					&lt;4 &amp;gic 1 12 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	adc: adc@126C0000 {</div><div class='add'>+		compatible = "samsung,exynos-adc-v1";</div><div class='add'>+		reg = &lt;0x126C0000 0x100&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='add'>+		interrupts = &lt;10 3&gt;;</div><div class='add'>+		clocks = &lt;&amp;clock CLK_TSADC&gt;;</div><div class='add'>+		clock-names = "adc";</div><div class='add'>+		#io-channel-cells = &lt;1&gt;;</div><div class='add'>+		io-channel-ranges;</div><div class='add'>+		samsung,syscon-phandle = &lt;&amp;pmu_system_controller&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	g2d: g2d@10800000 {</div><div class='add'>+		compatible = "samsung,exynos4212-g2d";</div><div class='add'>+		reg = &lt;0x10800000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clock CLK_SCLK_FIMG2D&gt;, &lt;&amp;clock CLK_G2D&gt;;</div><div class='add'>+		clock-names = "sclk_fimg2d", "fimg2d";</div><div class='add'>+		iommus = &lt;&amp;sysmmu_g2d&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	camera {</div><div class='add'>+		clocks = &lt;&amp;clock CLK_SCLK_CAM0&gt;, &lt;&amp;clock CLK_SCLK_CAM1&gt;,</div><div class='add'>+			 &lt;&amp;clock CLK_PIXELASYNCM0&gt;, &lt;&amp;clock CLK_PIXELASYNCM1&gt;;</div><div class='add'>+		clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";</div><div class='add'>+</div><div class='add'>+		/* fimc_[0-3] are configured outside, under phandles */</div><div class='add'>+		fimc_lite_0: fimc-lite@12390000 {</div><div class='add'>+			compatible = "samsung,exynos4212-fimc-lite";</div><div class='add'>+			reg = &lt;0x12390000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			power-domains = &lt;&amp;pd_isp&gt;;</div><div class='add'>+			clocks = &lt;&amp;clock CLK_FIMC_LITE0&gt;;</div><div class='add'>+			clock-names = "flite";</div><div class='add'>+			iommus = &lt;&amp;sysmmu_fimc_lite0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		fimc_lite_1: fimc-lite@123A0000 {</div><div class='add'>+			compatible = "samsung,exynos4212-fimc-lite";</div><div class='add'>+			reg = &lt;0x123A0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			power-domains = &lt;&amp;pd_isp&gt;;</div><div class='add'>+			clocks = &lt;&amp;clock CLK_FIMC_LITE1&gt;;</div><div class='add'>+			clock-names = "flite";</div><div class='add'>+			iommus = &lt;&amp;sysmmu_fimc_lite1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		fimc_is: fimc-is@12000000 {</div><div class='add'>+			compatible = "samsung,exynos4212-fimc-is";</div><div class='add'>+			reg = &lt;0x12000000 0x260000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			power-domains = &lt;&amp;pd_isp&gt;;</div><div class='add'>+			clocks = &lt;&amp;clock CLK_FIMC_LITE0&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_FIMC_LITE1&gt;, &lt;&amp;clock CLK_PPMUISPX&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_PPMUISPMX&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_MOUT_MPLL_USER_T&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_FIMC_ISP&gt;, &lt;&amp;clock CLK_FIMC_DRC&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_FIMC_FD&gt;, &lt;&amp;clock CLK_MCUISP&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_GICISP&gt;, &lt;&amp;clock CLK_MCUCTL_ISP&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_PWM_ISP&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_DIV_ISP0&gt;, &lt;&amp;clock CLK_DIV_ISP1&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_DIV_MCUISP0&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_DIV_MCUISP1&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_UART_ISP_SCLK&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_ACLK200&gt;, &lt;&amp;clock CLK_DIV_ACLK200&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_ACLK400_MCUISP&gt;,</div><div class='add'>+				 &lt;&amp;clock CLK_DIV_ACLK400_MCUISP&gt;;</div><div class='add'>+			clock-names = "lite0", "lite1", "ppmuispx",</div><div class='add'>+				      "ppmuispmx", "mpll", "isp",</div><div class='add'>+				      "drc", "fd", "mcuisp",</div><div class='add'>+				      "gicisp", "mcuctl_isp", "pwm_isp",</div><div class='add'>+				      "ispdiv0", "ispdiv1", "mcuispdiv0",</div><div class='add'>+				      "mcuispdiv1", "uart", "aclk200",</div><div class='add'>+				      "div_aclk200", "aclk400mcuisp",</div><div class='add'>+				      "div_aclk400mcuisp";</div><div class='add'>+			iommus = &lt;&amp;sysmmu_fimc_isp&gt;, &lt;&amp;sysmmu_fimc_drc&gt;,</div><div class='add'>+				 &lt;&amp;sysmmu_fimc_fd&gt;, &lt;&amp;sysmmu_fimc_mcuctl&gt;;</div><div class='add'>+			iommu-names = "isp", "drc", "fd", "mcuctl";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pmu@10020000 {</div><div class='add'>+				reg = &lt;0x10020000 0x3000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c1_isp: i2c-isp@12140000 {</div><div class='add'>+				compatible = "samsung,exynos4212-i2c-isp";</div><div class='add'>+				reg = &lt;0x12140000 0x100&gt;;</div><div class='add'>+				clocks = &lt;&amp;clock CLK_I2C1_ISP&gt;;</div><div class='add'>+				clock-names = "i2c_isp";</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mshc_0: mmc@12550000 {</div><div class='add'>+		compatible = "samsung,exynos4412-dw-mshc";</div><div class='add'>+		reg = &lt;0x12550000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		fifo-depth = &lt;0x80&gt;;</div><div class='add'>+		clocks = &lt;&amp;clock CLK_SDMMC4&gt;, &lt;&amp;clock CLK_SCLK_MMC4&gt;;</div><div class='add'>+		clock-names = "biu", "ciu";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sysmmu_g2d: sysmmu@10A40000{</div><div class='add'>+		compatible = "samsung,exynos-sysmmu";</div><div class='add'>+		reg = &lt;0x10A40000 0x1000&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='add'>+		interrupts = &lt;4 7&gt;;</div><div class='add'>+		clock-names = "sysmmu", "master";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_SMMU_G2D&gt;, &lt;&amp;clock CLK_G2D&gt;;</div><div class='add'>+		#iommu-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sysmmu_fimc_isp: sysmmu@12260000 {</div><div class='add'>+		compatible = "samsung,exynos-sysmmu";</div><div class='add'>+		reg = &lt;0x12260000 0x1000&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='add'>+		interrupts = &lt;16 2&gt;;</div><div class='add'>+		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='add'>+		clock-names = "sysmmu";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_SMMU_ISP&gt;;</div><div class='add'>+		#iommu-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sysmmu_fimc_drc: sysmmu@12270000 {</div><div class='add'>+		compatible = "samsung,exynos-sysmmu";</div><div class='add'>+		reg = &lt;0x12270000 0x1000&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='add'>+		interrupts = &lt;16 3&gt;;</div><div class='add'>+		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='add'>+		clock-names = "sysmmu";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_SMMU_DRC&gt;;</div><div class='add'>+		#iommu-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sysmmu_fimc_fd: sysmmu@122A0000 {</div><div class='add'>+		compatible = "samsung,exynos-sysmmu";</div><div class='add'>+		reg = &lt;0x122A0000 0x1000&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='add'>+		interrupts = &lt;16 4&gt;;</div><div class='add'>+		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='add'>+		clock-names = "sysmmu";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_SMMU_FD&gt;;</div><div class='add'>+		#iommu-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sysmmu_fimc_mcuctl: sysmmu@122B0000 {</div><div class='add'>+		compatible = "samsung,exynos-sysmmu";</div><div class='add'>+		reg = &lt;0x122B0000 0x1000&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='add'>+		interrupts = &lt;16 5&gt;;</div><div class='add'>+		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='add'>+		clock-names = "sysmmu";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_SMMU_ISPCX&gt;;</div><div class='add'>+		#iommu-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sysmmu_fimc_lite0: sysmmu@123B0000 {</div><div class='add'>+		compatible = "samsung,exynos-sysmmu";</div><div class='add'>+		reg = &lt;0x123B0000 0x1000&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='add'>+		interrupts = &lt;16 0&gt;;</div><div class='add'>+		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='add'>+		clock-names = "sysmmu", "master";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_SMMU_LITE0&gt;, &lt;&amp;clock CLK_FIMC_LITE0&gt;;</div><div class='add'>+		#iommu-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sysmmu_fimc_lite1: sysmmu@123C0000 {</div><div class='add'>+		compatible = "samsung,exynos-sysmmu";</div><div class='add'>+		reg = &lt;0x123C0000 0x1000&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='add'>+		interrupts = &lt;16 1&gt;;</div><div class='add'>+		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='add'>+		clock-names = "sysmmu", "master";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_SMMU_LITE1&gt;, &lt;&amp;clock CLK_FIMC_LITE1&gt;;</div><div class='add'>+		#iommu-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_dmc: bus_dmc {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_DIV_DMC&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_dmc_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_acp: bus_acp {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_DIV_ACP&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_acp_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_c2c: bus_c2c {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_DIV_C2C&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_dmc_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_dmc_opp_table: opp_table1 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;900000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@134000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;900000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@160000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;160000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;900000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@267000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;267000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;950000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@400000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;400000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1050000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_acp_opp_table: opp_table2 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@134000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@160000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;160000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@267000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;267000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_leftbus: bus_leftbus {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_DIV_GDL&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_leftbus_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_rightbus: bus_rightbus {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_DIV_GDR&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_leftbus_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_display: bus_display {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_ACLK160&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_display_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_fsys: bus_fsys {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_ACLK133&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_fsys_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_peri: bus_peri {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_ACLK100&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_peri_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_mfc: bus_mfc {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;clock CLK_SCLK_MFC&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_leftbus_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_leftbus_opp_table: opp_table3 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;900000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@134000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;925000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@160000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;160000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;950000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_display_opp_table: opp_table4 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@160000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;160000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_fsys_opp_table: opp_table5 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@134000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_peri_opp_table: opp_table6 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@50000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;50000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pmu {</div><div class='ctx'> 		interrupts = &lt;2 2&gt;, &lt;3 2&gt;, &lt;18 2&gt;, &lt;19 2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;pmu_system_controller {</div><div class='del'>-	compatible = "samsung,exynos4412-pmu", "syscon";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;combiner {</div><div class='ctx'> 	samsung,combiner-nr = &lt;20&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;exynos_usbphy {</div><div class='add'>+	compatible = "samsung,exynos4x12-usb2-phy";</div><div class='add'>+	samsung,sysreg-phandle = &lt;&amp;sys_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fimc_0 {</div><div class='add'>+	compatible = "samsung,exynos4212-fimc";</div><div class='add'>+	samsung,pix-limits = &lt;4224 8192 1920 4224&gt;;</div><div class='add'>+	samsung,mainscaler-ext;</div><div class='add'>+	samsung,isp-wb;</div><div class='add'>+	samsung,cam-if;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fimc_1 {</div><div class='add'>+	compatible = "samsung,exynos4212-fimc";</div><div class='add'>+	samsung,pix-limits = &lt;4224 8192 1920 4224&gt;;</div><div class='add'>+	samsung,mainscaler-ext;</div><div class='add'>+	samsung,isp-wb;</div><div class='add'>+	samsung,cam-if;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fimc_2 {</div><div class='add'>+	compatible = "samsung,exynos4212-fimc";</div><div class='add'>+	samsung,pix-limits = &lt;4224 8192 1920 4224&gt;;</div><div class='add'>+	samsung,mainscaler-ext;</div><div class='add'>+	samsung,isp-wb;</div><div class='add'>+	samsung,lcd-wb;</div><div class='add'>+	samsung,cam-if;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fimc_3 {</div><div class='add'>+	compatible = "samsung,exynos4212-fimc";</div><div class='add'>+	samsung,pix-limits = &lt;1920 8192 1366 1920&gt;;</div><div class='add'>+	samsung,rotators = &lt;0&gt;;</div><div class='add'>+	samsung,mainscaler-ext;</div><div class='add'>+	samsung,isp-wb;</div><div class='add'>+	samsung,lcd-wb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;gic {</div><div class='ctx'> 	cpu-offset = &lt;0x4000&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;hdmi {</div><div class='add'>+	compatible = "samsung,exynos4212-hdmi";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;jpeg_codec {</div><div class='add'>+	compatible = "samsung,exynos4212-jpeg";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rotator {</div><div class='add'>+	compatible = "samsung,exynos4212-rotator";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mixer {</div><div class='add'>+	compatible = "samsung,exynos4212-mixer";</div><div class='add'>+	clock-names = "mixer", "hdmi", "sclk_hdmi", "vp";</div><div class='add'>+	clocks = &lt;&amp;clock CLK_MIXER&gt;, &lt;&amp;clock CLK_HDMI&gt;,</div><div class='add'>+		 &lt;&amp;clock CLK_SCLK_HDMI&gt;, &lt;&amp;clock CLK_VP&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_0 {</div><div class='add'>+	compatible = "samsung,exynos4x12-pinctrl";</div><div class='add'>+	reg = &lt;0x11400000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_1 {</div><div class='add'>+	compatible = "samsung,exynos4x12-pinctrl";</div><div class='add'>+	reg = &lt;0x11000000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+	wakup_eint: wakeup-interrupt-controller {</div><div class='add'>+		compatible = "samsung,exynos4210-wakeup-eint";</div><div class='add'>+		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_2 {</div><div class='add'>+	compatible = "samsung,exynos4x12-pinctrl";</div><div class='add'>+	reg = &lt;0x03860000 0x1000&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='add'>+	interrupts = &lt;10 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_3 {</div><div class='add'>+	compatible = "samsung,exynos4x12-pinctrl";</div><div class='add'>+	reg = &lt;0x106E0000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pmu_system_controller {</div><div class='add'>+	compatible = "samsung,exynos4412-pmu", "syscon";</div><div class='add'>+	clock-names = "clkout0", "clkout1", "clkout2", "clkout3",</div><div class='add'>+			"clkout4", "clkout8", "clkout9";</div><div class='add'>+	clocks = &lt;&amp;clock CLK_OUT_DMC&gt;, &lt;&amp;clock CLK_OUT_TOP&gt;,</div><div class='add'>+		&lt;&amp;clock CLK_OUT_LEFTBUS&gt;, &lt;&amp;clock CLK_OUT_RIGHTBUS&gt;,</div><div class='add'>+		&lt;&amp;clock CLK_OUT_CPU&gt;, &lt;&amp;clock CLK_XXTI&gt;, &lt;&amp;clock CLK_XUSBXTI&gt;;</div><div class='add'>+	#clock-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tmu {</div><div class='add'>+	compatible = "samsung,exynos4412-tmu";</div><div class='add'>+	interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='add'>+	interrupts = &lt;2 4&gt;;</div><div class='add'>+	reg = &lt;0x100C0000 0x100&gt;;</div><div class='add'>+	clocks = &lt;&amp;clock 383&gt;;</div><div class='add'>+	clock-names = "tmu_apbif";</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi<br/>deleted file mode 100644<br/>index 76cfd872ead3..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4415-pinctrl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4415-pinctrl.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,575 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Samsung's Exynos4415 SoCs pin-mux and pin-config device tree source</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014 Samsung Electronics Co., Ltd.</div><div class='del'>- *</div><div class='del'>- * Samsung's Exynos4415 SoCs pin-mux and pin-config optiosn are listed as device</div><div class='del'>- * tree nodes are listed in this file.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;dt-bindings/pinctrl/samsung.h&gt;</div><div class='del'>-</div><div class='del'>-&amp;pinctrl_0 {</div><div class='del'>-	gpa0: gpa0 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpa1: gpa1 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpb: gpb {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpc0: gpc0 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpc1: gpc1 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpd0: gpd0 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpd1: gpd1 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpf0: gpf0 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpf1: gpf1 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpf2: gpf2 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	uart0_data: uart0-data {</div><div class='del'>-		samsung,pins = "gpa0-0", "gpa0-1";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	uart0_fctl: uart0-fctl {</div><div class='del'>-		samsung,pins = "gpa0-2", "gpa0-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	uart1_data: uart1-data {</div><div class='del'>-		samsung,pins = "gpa0-4", "gpa0-5";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	uart1_fctl: uart1-fctl {</div><div class='del'>-		samsung,pins = "gpa0-6", "gpa0-7";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	uart2_data: uart2-data {</div><div class='del'>-		samsung,pins = "gpa1-0", "gpa1-1";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	uart2_fctl: uart2-fctl {</div><div class='del'>-		samsung,pins = "gpa1-2", "gpa1-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	uart3_data: uart3-data {</div><div class='del'>-		samsung,pins = "gpa1-4", "gpa1-5";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c2_bus: i2c2-bus {</div><div class='del'>-		samsung,pins = "gpa0-6", "gpa0-7";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c3_bus: i2c3-bus {</div><div class='del'>-		samsung,pins = "gpa1-2", "gpa1-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	spi0_bus: spi0-bus {</div><div class='del'>-		samsung,pins = "gpb-0", "gpb-2", "gpb-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c4_bus: i2c4-bus {</div><div class='del'>-		samsung,pins = "gpb-0", "gpb-1";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	spi1_bus: spi1-bus {</div><div class='del'>-		samsung,pins = "gpb-4", "gpb-6", "gpb-7";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c5_bus: i2c5-bus {</div><div class='del'>-		samsung,pins = "gpb-2", "gpb-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2s1_bus: i2s1-bus {</div><div class='del'>-		samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",</div><div class='del'>-				"gpc0-4";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2s2_bus: i2s2-bus {</div><div class='del'>-		samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",</div><div class='del'>-				"gpc1-4";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pcm2_bus: pcm2-bus {</div><div class='del'>-		samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",</div><div class='del'>-				"gpc1-4";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c6_bus: i2c6-bus {</div><div class='del'>-		samsung,pins = "gpc1-3", "gpc1-4";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	spi2_bus: spi2-bus {</div><div class='del'>-		samsung,pins = "gpc1-1", "gpc1-3", "gpc1-4";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_5&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pwm0_out: pwm0-out {</div><div class='del'>-		samsung,pins = "gpd0-0";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pwm1_out: pwm1-out {</div><div class='del'>-		samsung,pins = "gpd0-1";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pwm2_out: pwm2-out {</div><div class='del'>-		samsung,pins = "gpd0-2";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pwm3_out: pwm3-out {</div><div class='del'>-		samsung,pins = "gpd0-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c7_bus: i2c7-bus {</div><div class='del'>-		samsung,pins = "gpd0-2", "gpd0-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c0_bus: i2c0-bus {</div><div class='del'>-		samsung,pins = "gpd1-0", "gpd1-1";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c1_bus: i2c1-bus {</div><div class='del'>-		samsung,pins = "gpd1-2", "gpd1-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;pinctrl_1 {</div><div class='del'>-	gpk0: gpk0 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpk1: gpk1 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpk2: gpk2 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpk3: gpk3 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpl0: gpl0 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpm0: gpm0 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpm1: gpm1 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpm2: gpm2 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpm3: gpm3 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpm4: gpm4 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpx0: gpx0 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-		interrupts = &lt;0 32 0&gt;, &lt;0 33 0&gt;, &lt;0 34 0&gt;, &lt;0 35 0&gt;,</div><div class='del'>-				&lt;0 36 0&gt;, &lt;0 37 0&gt;, &lt;0 38 0&gt;, &lt;0 39 0&gt;;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpx1: gpx1 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-		interrupts = &lt;0 40 0&gt;, &lt;0 41 0&gt;, &lt;0 42 0&gt;, &lt;0 43 0&gt;,</div><div class='del'>-				&lt;0 44 0&gt;, &lt;0 45 0&gt;, &lt;0 46 0&gt;, &lt;0 47 0&gt;;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpx2: gpx2 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpx3: gpx3 {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd0_clk: sd0-clk {</div><div class='del'>-		samsung,pins = "gpk0-0";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd0_cmd: sd0-cmd {</div><div class='del'>-		samsung,pins = "gpk0-1";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd0_cd: sd0-cd {</div><div class='del'>-		samsung,pins = "gpk0-2";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd0_rdqs: sd0-rdqs {</div><div class='del'>-		samsung,pins = "gpk0-7";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd0_bus1: sd0-bus-width1 {</div><div class='del'>-		samsung,pins = "gpk0-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd0_bus4: sd0-bus-width4 {</div><div class='del'>-		samsung,pins = "gpk0-4", "gpk0-5", "gpk0-6";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd0_bus8: sd0-bus-width8 {</div><div class='del'>-		samsung,pins = "gpl0-0", "gpl0-1", "gpl0-2", "gpl0-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd1_clk: sd1-clk {</div><div class='del'>-		samsung,pins = "gpk1-0";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd1_cmd: sd1-cmd {</div><div class='del'>-		samsung,pins = "gpk1-1";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd1_cd: sd1-cd {</div><div class='del'>-		samsung,pins = "gpk1-2";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd1_bus1: sd1-bus-width1 {</div><div class='del'>-		samsung,pins = "gpk1-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd1_bus4: sd1-bus-width4 {</div><div class='del'>-		samsung,pins = "gpk1-4", "gpk1-5", "gpk1-6";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd2_clk: sd2-clk {</div><div class='del'>-		samsung,pins = "gpk2-0";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd2_cmd: sd2-cmd {</div><div class='del'>-		samsung,pins = "gpk2-1";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd2_cd: sd2-cd {</div><div class='del'>-		samsung,pins = "gpk2-2";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd2_bus1: sd2-bus-width1 {</div><div class='del'>-		samsung,pins = "gpk2-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sd2_bus4: sd2-bus-width4 {</div><div class='del'>-		samsung,pins = "gpk2-4", "gpk2-5", "gpk2-6";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cam_port_b_io: cam-port-b-io {</div><div class='del'>-		samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",</div><div class='del'>-				"gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",</div><div class='del'>-				"gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cam_port_b_clk_active: cam-port-b-clk-active {</div><div class='del'>-		samsung,pins = "gpm2-2";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cam_port_b_clk_idle: cam-port-b-clk-idle {</div><div class='del'>-		samsung,pins = "gpm2-2";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_INPUT&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	fimc_is_i2c0: fimc-is-i2c0 {</div><div class='del'>-		samsung,pins = "gpm4-0", "gpm4-1";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	fimc_is_i2c1: fimc-is-i2c1 {</div><div class='del'>-		samsung,pins = "gpm4-2", "gpm4-3";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	fimc_is_uart: fimc-is-uart {</div><div class='del'>-		samsung,pins = "gpm3-5", "gpm3-7";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;pinctrl_2 {</div><div class='del'>-	gpz: gpz {</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2s0_bus: i2s0-bus {</div><div class='del'>-		samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",</div><div class='del'>-				"gpz-4", "gpz-5", "gpz-6";</div><div class='del'>-		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4415.dtsi b/arch/arm/boot/dts/exynos4415.dtsi<br/>deleted file mode 100644<br/>index 3c40f8a956dd..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4415.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4415.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,650 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Samsung's Exynos4415 SoC device tree source</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014 Samsung Electronics Co., Ltd.</div><div class='del'>- *</div><div class='del'>- * Samsung's Exynos4415 SoC device nodes are listed in this file. Exynos4415</div><div class='del'>- * based board files can include this file and provide values for board</div><div class='del'>- * specific bindings.</div><div class='del'>- *</div><div class='del'>- * Note: This file does not include device nodes for all the controllers in</div><div class='del'>- * Exynos4415 SoC. As device tree coverage for Exynos4415 increases, additional</div><div class='del'>- * nodes can be added to this file.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;dt-bindings/clock/exynos4415.h&gt;</div><div class='del'>-#include &lt;dt-bindings/clock/exynos-audss-clk.h&gt;</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	compatible = "samsung,exynos4415";</div><div class='del'>-	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		pinctrl0 = &amp;pinctrl_0;</div><div class='del'>-		pinctrl1 = &amp;pinctrl_1;</div><div class='del'>-		pinctrl2 = &amp;pinctrl_2;</div><div class='del'>-		mshc0 = &amp;mshc_0;</div><div class='del'>-		mshc1 = &amp;mshc_1;</div><div class='del'>-		mshc2 = &amp;mshc_2;</div><div class='del'>-		spi0 = &amp;spi_0;</div><div class='del'>-		spi1 = &amp;spi_1;</div><div class='del'>-		spi2 = &amp;spi_2;</div><div class='del'>-		i2c0 = &amp;i2c_0;</div><div class='del'>-		i2c1 = &amp;i2c_1;</div><div class='del'>-		i2c2 = &amp;i2c_2;</div><div class='del'>-		i2c3 = &amp;i2c_3;</div><div class='del'>-		i2c4 = &amp;i2c_4;</div><div class='del'>-		i2c5 = &amp;i2c_5;</div><div class='del'>-		i2c6 = &amp;i2c_6;</div><div class='del'>-		i2c7 = &amp;i2c_7;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		cpu0: cpu@a00 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a9";</div><div class='del'>-			reg = &lt;0xa00&gt;;</div><div class='del'>-			clock-frequency = &lt;1600000000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cpu1: cpu@a01 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a9";</div><div class='del'>-			reg = &lt;0xa01&gt;;</div><div class='del'>-			clock-frequency = &lt;1600000000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cpu2: cpu@a02 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a9";</div><div class='del'>-			reg = &lt;0xa02&gt;;</div><div class='del'>-			clock-frequency = &lt;1600000000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cpu3: cpu@a03 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a9";</div><div class='del'>-			reg = &lt;0xa03&gt;;</div><div class='del'>-			clock-frequency = &lt;1600000000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc: soc {</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		ranges;</div><div class='del'>-</div><div class='del'>-		sysram@02020000 {</div><div class='del'>-			compatible = "mmio-sram";</div><div class='del'>-			reg = &lt;0x02020000 0x50000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			ranges = &lt;0 0x02020000 0x50000&gt;;</div><div class='del'>-</div><div class='del'>-			smp-sysram@0 {</div><div class='del'>-				compatible = "samsung,exynos4210-sysram";</div><div class='del'>-				reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			smp-sysram@4f000 {</div><div class='del'>-				compatible = "samsung,exynos4210-sysram-ns";</div><div class='del'>-				reg = &lt;0x4f000 0x1000&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pinctrl_2: pinctrl@03860000 {</div><div class='del'>-			compatible = "samsung,exynos4415-pinctrl";</div><div class='del'>-			reg = &lt;0x03860000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 242 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		chipid@10000000 {</div><div class='del'>-			compatible = "samsung,exynos4210-chipid";</div><div class='del'>-			reg = &lt;0x10000000 0x100&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sysreg_system_controller: syscon@10010000 {</div><div class='del'>-			compatible = "samsung,exynos4-sysreg", "syscon";</div><div class='del'>-			reg = &lt;0x10010000 0x400&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pmu_system_controller: system-controller@10020000 {</div><div class='del'>-			compatible = "samsung,exynos4415-pmu", "syscon";</div><div class='del'>-			reg = &lt;0x10020000 0x4000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mipi_phy: video-phy@10020710 {</div><div class='del'>-			compatible = "samsung,s5pv210-mipi-video-phy";</div><div class='del'>-			#phy-cells = &lt;1&gt;;</div><div class='del'>-			syscon = &lt;&amp;pmu_system_controller&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pd_cam: cam-power-domain@10024000 {</div><div class='del'>-			compatible = "samsung,exynos4210-pd";</div><div class='del'>-			reg = &lt;0x10024000 0x20&gt;;</div><div class='del'>-			#power-domain-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pd_tv: tv-power-domain@10024020 {</div><div class='del'>-			compatible = "samsung,exynos4210-pd";</div><div class='del'>-			reg = &lt;0x10024020 0x20&gt;;</div><div class='del'>-			#power-domain-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pd_mfc: mfc-power-domain@10024040 {</div><div class='del'>-			compatible = "samsung,exynos4210-pd";</div><div class='del'>-			reg = &lt;0x10024040 0x20&gt;;</div><div class='del'>-			#power-domain-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pd_g3d: g3d-power-domain@10024060 {</div><div class='del'>-			compatible = "samsung,exynos4210-pd";</div><div class='del'>-			reg = &lt;0x10024060 0x20&gt;;</div><div class='del'>-			#power-domain-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pd_lcd0: lcd0-power-domain@10024080 {</div><div class='del'>-			compatible = "samsung,exynos4210-pd";</div><div class='del'>-			reg = &lt;0x10024080 0x20&gt;;</div><div class='del'>-			#power-domain-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pd_isp0: isp0-power-domain@100240A0 {</div><div class='del'>-			compatible = "samsung,exynos4210-pd";</div><div class='del'>-			reg = &lt;0x100240A0 0x20&gt;;</div><div class='del'>-			#power-domain-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pd_isp1: isp1-power-domain@100240E0 {</div><div class='del'>-			compatible = "samsung,exynos4210-pd";</div><div class='del'>-			reg = &lt;0x100240E0 0x20&gt;;</div><div class='del'>-			#power-domain-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cmu: clock-controller@10030000 {</div><div class='del'>-			compatible = "samsung,exynos4415-cmu";</div><div class='del'>-			reg = &lt;0x10030000 0x18000&gt;;</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		rtc: rtc@10070000 {</div><div class='del'>-			compatible = "samsung,s3c6410-rtc";</div><div class='del'>-			reg = &lt;0x10070000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 73 0&gt;, &lt;0 74 0&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mct@10050000 {</div><div class='del'>-			compatible = "samsung,exynos4210-mct";</div><div class='del'>-			reg = &lt;0x10050000 0x800&gt;;</div><div class='del'>-			interrupts = &lt;0 218 0&gt;, &lt;0 219 0&gt;, &lt;0 220 0&gt;, &lt;0 221 0&gt;,</div><div class='del'>-				     &lt;0 223 0&gt;, &lt;0 226 0&gt;, &lt;0 227 0&gt;, &lt;0 228 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_FIN_PLL&gt;, &lt;&amp;cmu CLK_MCT&gt;;</div><div class='del'>-			clock-names = "fin_pll", "mct";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gic: interrupt-controller@10481000 {</div><div class='del'>-			compatible = "arm,cortex-a9-gic";</div><div class='del'>-			#interrupt-cells = &lt;3&gt;;</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			reg = &lt;0x10481000 0x1000&gt;,</div><div class='del'>-			      &lt;0x10482000 0x1000&gt;,</div><div class='del'>-			      &lt;0x10484000 0x2000&gt;,</div><div class='del'>-			      &lt;0x10486000 0x2000&gt;;</div><div class='del'>-			interrupts = &lt;1 9 0xf04&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		l2c: l2-cache-controller@10502000 {</div><div class='del'>-			compatible = "arm,pl310-cache";</div><div class='del'>-			reg = &lt;0x10502000 0x1000&gt;;</div><div class='del'>-			cache-unified;</div><div class='del'>-			cache-level = &lt;2&gt;;</div><div class='del'>-			arm,tag-latency = &lt;2 2 1&gt;;</div><div class='del'>-			arm,data-latency = &lt;3 2 1&gt;;</div><div class='del'>-			arm,double-linefill = &lt;1&gt;;</div><div class='del'>-			arm,double-linefill-incr = &lt;0&gt;;</div><div class='del'>-			arm,double-linefill-wrap = &lt;1&gt;;</div><div class='del'>-			arm,prefetch-drop = &lt;1&gt;;</div><div class='del'>-			arm,prefetch-offset = &lt;7&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cmu_dmc: clock-controller@105C0000 {</div><div class='del'>-			compatible = "samsung,exynos4415-cmu-dmc";</div><div class='del'>-			reg = &lt;0x105C0000 0x3000&gt;;</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pinctrl_1: pinctrl@11000000 {</div><div class='del'>-			compatible = "samsung,exynos4415-pinctrl";</div><div class='del'>-			reg = &lt;0x11000000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 225 0&gt;;</div><div class='del'>-</div><div class='del'>-			wakeup-interrupt-controller {</div><div class='del'>-				compatible = "samsung,exynos4210-wakeup-eint";</div><div class='del'>-				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-				interrupts = &lt;0 48 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pinctrl_0: pinctrl@11400000 {</div><div class='del'>-			compatible = "samsung,exynos4415-pinctrl";</div><div class='del'>-			reg = &lt;0x11400000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 240 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		fimd: fimd@11C00000 {</div><div class='del'>-			compatible = "samsung,exynos4415-fimd";</div><div class='del'>-			reg = &lt;0x11C00000 0x30000&gt;;</div><div class='del'>-			interrupt-names = "fifo", "vsync", "lcd_sys";</div><div class='del'>-			interrupts = &lt;0 84 0&gt;, &lt;0 85 0&gt;, &lt;0 86 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_SCLK_FIMD0&gt;, &lt;&amp;cmu CLK_FIMD0&gt;;</div><div class='del'>-			clock-names = "sclk_fimd", "fimd";</div><div class='del'>-			samsung,power-domain = &lt;&amp;pd_lcd0&gt;;</div><div class='del'>-			iommus = &lt;&amp;sysmmu_fimd0&gt;;</div><div class='del'>-			samsung,sysreg = &lt;&amp;sysreg_system_controller&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dsi_0: dsi@11C80000 {</div><div class='del'>-			compatible = "samsung,exynos4415-mipi-dsi";</div><div class='del'>-			reg = &lt;0x11C80000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;0 83 0&gt;;</div><div class='del'>-			samsung,phy-type = &lt;0&gt;;</div><div class='del'>-			samsung,power-domain = &lt;&amp;pd_lcd0&gt;;</div><div class='del'>-			phys = &lt;&amp;mipi_phy 1&gt;;</div><div class='del'>-			phy-names = "dsim";</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_DSIM0&gt;, &lt;&amp;cmu CLK_SCLK_MIPI0&gt;;</div><div class='del'>-			clock-names = "bus_clk", "pll_clk";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sysmmu_fimd0: sysmmu@11E20000 {</div><div class='del'>-			compatible = "samsung,exynos-sysmmu";</div><div class='del'>-			reg = &lt;0x11e20000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 80 0&gt;, &lt;0 81 0&gt;;</div><div class='del'>-			clock-names = "sysmmu", "master";</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_SMMUFIMD0&gt;, &lt;&amp;cmu CLK_FIMD0&gt;;</div><div class='del'>-			power-domains = &lt;&amp;pd_lcd0&gt;;</div><div class='del'>-			#iommu-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		hsotg: hsotg@12480000 {</div><div class='del'>-			compatible = "samsung,s3c6400-hsotg";</div><div class='del'>-			reg = &lt;0x12480000 0x20000&gt;;</div><div class='del'>-			interrupts = &lt;0 141 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_USBDEVICE&gt;;</div><div class='del'>-			clock-names = "otg";</div><div class='del'>-			phys = &lt;&amp;exynos_usbphy 0&gt;;</div><div class='del'>-			phy-names = "usb2-phy";</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mshc_0: mshc@12510000 {</div><div class='del'>-			compatible = "samsung,exynos5250-dw-mshc";</div><div class='del'>-			reg = &lt;0x12510000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 142 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_SDMMC0&gt;, &lt;&amp;cmu CLK_SCLK_MMC0&gt;;</div><div class='del'>-			clock-names = "biu", "ciu";</div><div class='del'>-			fifo-depth = &lt;0x80&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mshc_1: mshc@12520000 {</div><div class='del'>-			compatible = "samsung,exynos5250-dw-mshc";</div><div class='del'>-			reg = &lt;0x12520000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 143 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_SDMMC1&gt;, &lt;&amp;cmu CLK_SCLK_MMC1&gt;;</div><div class='del'>-			clock-names = "biu", "ciu";</div><div class='del'>-			fifo-depth = &lt;0x80&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mshc_2: mshc@12530000 {</div><div class='del'>-			compatible = "samsung,exynos5250-dw-mshc";</div><div class='del'>-			reg = &lt;0x12530000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 144 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_SDMMC2&gt;, &lt;&amp;cmu CLK_SCLK_MMC2&gt;;</div><div class='del'>-			clock-names = "biu", "ciu";</div><div class='del'>-			fifo-depth = &lt;0x80&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ehci: ehci@12580000 {</div><div class='del'>-			compatible = "samsung,exynos4210-ehci";</div><div class='del'>-			reg = &lt;0x12580000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 140 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_USBHOST&gt;;</div><div class='del'>-			clock-names = "usbhost";</div><div class='del'>-			status = "disabled";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			port@0 {</div><div class='del'>-				reg = &lt;0&gt;;</div><div class='del'>-				phys = &lt;&amp;exynos_usbphy 1&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-			port@1 {</div><div class='del'>-				reg = &lt;1&gt;;</div><div class='del'>-				phys = &lt;&amp;exynos_usbphy 2&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-			port@2 {</div><div class='del'>-				reg = &lt;2&gt;;</div><div class='del'>-				phys = &lt;&amp;exynos_usbphy 3&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ohci: ohci@12590000 {</div><div class='del'>-			compatible = "samsung,exynos4210-ohci";</div><div class='del'>-			reg = &lt;0x12590000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 140 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_USBHOST&gt;;</div><div class='del'>-			clock-names = "usbhost";</div><div class='del'>-			status = "disabled";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			port@0 {</div><div class='del'>-				reg = &lt;0&gt;;</div><div class='del'>-				phys = &lt;&amp;exynos_usbphy 1&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		exynos_usbphy: exynos-usbphy@125B0000 {</div><div class='del'>-			compatible = "samsung,exynos4x12-usb2-phy";</div><div class='del'>-			reg = &lt;0x125B0000 0x100&gt;;</div><div class='del'>-			samsung,pmureg-phandle = &lt;&amp;pmu_system_controller&gt;;</div><div class='del'>-			samsung,sysreg-phandle = &lt;&amp;sysreg_system_controller&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_USBDEVICE&gt;, &lt;&amp;xusbxti&gt;;</div><div class='del'>-			clock-names = "phy", "ref";</div><div class='del'>-			#phy-cells = &lt;1&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		amba {</div><div class='del'>-			compatible = "simple-bus";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-			ranges;</div><div class='del'>-</div><div class='del'>-			pdma0: pdma@12680000 {</div><div class='del'>-				compatible = "arm,pl330", "arm,primecell";</div><div class='del'>-				reg = &lt;0x12680000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 138 0&gt;;</div><div class='del'>-				clocks = &lt;&amp;cmu CLK_PDMA0&gt;;</div><div class='del'>-				clock-names = "apb_pclk";</div><div class='del'>-				#dma-cells = &lt;1&gt;;</div><div class='del'>-				#dma-channels = &lt;8&gt;;</div><div class='del'>-				#dma-requests = &lt;32&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pdma1: pdma@12690000 {</div><div class='del'>-				compatible = "arm,pl330", "arm,primecell";</div><div class='del'>-				reg = &lt;0x12690000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 139 0&gt;;</div><div class='del'>-				clocks = &lt;&amp;cmu CLK_PDMA1&gt;;</div><div class='del'>-				clock-names = "apb_pclk";</div><div class='del'>-				#dma-cells = &lt;1&gt;;</div><div class='del'>-				#dma-channels = &lt;8&gt;;</div><div class='del'>-				#dma-requests = &lt;32&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		adc: adc@126C0000 {</div><div class='del'>-			compatible = "samsung,exynos3250-adc",</div><div class='del'>-				     "samsung,exynos-adc-v2";</div><div class='del'>-			reg = &lt;0x126C0000 0x100&gt;, &lt;0x10020718 0x4&gt;;</div><div class='del'>-			interrupts = &lt;0 137 0&gt;;</div><div class='del'>-			clock-names = "adc", "sclk";</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_TSADC&gt;, &lt;&amp;cmu CLK_SCLK_TSADC&gt;;</div><div class='del'>-			#io-channel-cells = &lt;1&gt;;</div><div class='del'>-			io-channel-ranges;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial_0: serial@13800000 {</div><div class='del'>-			compatible = "samsung,exynos4210-uart";</div><div class='del'>-			reg = &lt;0x13800000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 109 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_UART0&gt;, &lt;&amp;cmu CLK_SCLK_UART0&gt;;</div><div class='del'>-			clock-names = "uart", "clk_uart_baud0";</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial_1: serial@13810000 {</div><div class='del'>-			compatible = "samsung,exynos4210-uart";</div><div class='del'>-			reg = &lt;0x13810000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 110 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_UART1&gt;, &lt;&amp;cmu CLK_SCLK_UART1&gt;;</div><div class='del'>-			clock-names = "uart", "clk_uart_baud0";</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial_2: serial@13820000 {</div><div class='del'>-			compatible = "samsung,exynos4210-uart";</div><div class='del'>-			reg = &lt;0x13820000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 111 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_UART2&gt;, &lt;&amp;cmu CLK_SCLK_UART2&gt;;</div><div class='del'>-			clock-names = "uart", "clk_uart_baud0";</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial_3: serial@13830000 {</div><div class='del'>-			compatible = "samsung,exynos4210-uart";</div><div class='del'>-			reg = &lt;0x13830000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 112 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_UART3&gt;, &lt;&amp;cmu CLK_SCLK_UART3&gt;;</div><div class='del'>-			clock-names = "uart", "clk_uart_baud0";</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c_0: i2c@13860000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "samsung,s3c2440-i2c";</div><div class='del'>-			reg = &lt;0x13860000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 113 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_I2C0&gt;;</div><div class='del'>-			clock-names = "i2c";</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;i2c0_bus&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c_1: i2c@13870000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "samsung,s3c2440-i2c";</div><div class='del'>-			reg = &lt;0x13870000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 114 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_I2C1&gt;;</div><div class='del'>-			clock-names = "i2c";</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;i2c1_bus&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c_2: i2c@13880000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "samsung,s3c2440-i2c";</div><div class='del'>-			reg = &lt;0x13880000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 115 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_I2C2&gt;;</div><div class='del'>-			clock-names = "i2c";</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;i2c2_bus&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c_3: i2c@13890000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "samsung,s3c2440-i2c";</div><div class='del'>-			reg = &lt;0x13890000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 116 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_I2C3&gt;;</div><div class='del'>-			clock-names = "i2c";</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;i2c3_bus&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c_4: i2c@138A0000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "samsung,s3c2440-i2c";</div><div class='del'>-			reg = &lt;0x138A0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 117 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_I2C4&gt;;</div><div class='del'>-			clock-names = "i2c";</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;i2c4_bus&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c_5: i2c@138B0000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "samsung,s3c2440-i2c";</div><div class='del'>-			reg = &lt;0x138B0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 118 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_I2C5&gt;;</div><div class='del'>-			clock-names = "i2c";</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;i2c5_bus&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c_6: i2c@138C0000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "samsung,s3c2440-i2c";</div><div class='del'>-			reg = &lt;0x138C0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 119 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_I2C6&gt;;</div><div class='del'>-			clock-names = "i2c";</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;i2c6_bus&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c_7: i2c@138D0000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "samsung,s3c2440-i2c";</div><div class='del'>-			reg = &lt;0x138D0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 120 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_I2C7&gt;;</div><div class='del'>-			clock-names = "i2c";</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;i2c7_bus&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi_0: spi@13920000 {</div><div class='del'>-			compatible = "samsung,exynos4210-spi";</div><div class='del'>-			reg = &lt;0x13920000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 121 0&gt;;</div><div class='del'>-			dmas = &lt;&amp;pdma0 7&gt;, &lt;&amp;pdma0 6&gt;;</div><div class='del'>-			dma-names = "tx", "rx";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_SPI0&gt;, &lt;&amp;cmu CLK_SCLK_SPI0&gt;;</div><div class='del'>-			clock-names = "spi", "spi_busclk0";</div><div class='del'>-			samsung,spi-src-clk = &lt;0&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;spi0_bus&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi_1: spi@13930000 {</div><div class='del'>-			compatible = "samsung,exynos4210-spi";</div><div class='del'>-			reg = &lt;0x13930000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 122 0&gt;;</div><div class='del'>-			dmas = &lt;&amp;pdma1 7&gt;, &lt;&amp;pdma1 6&gt;;</div><div class='del'>-			dma-names = "tx", "rx";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_SPI1&gt;, &lt;&amp;cmu CLK_SCLK_SPI1&gt;;</div><div class='del'>-			clock-names = "spi", "spi_busclk0";</div><div class='del'>-			samsung,spi-src-clk = &lt;0&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;spi1_bus&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi_2: spi@13940000 {</div><div class='del'>-			compatible = "samsung,exynos4210-spi";</div><div class='del'>-			reg = &lt;0x13940000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 123 0&gt;;</div><div class='del'>-			dmas = &lt;&amp;pdma0 9&gt;, &lt;&amp;pdma0 8&gt;;</div><div class='del'>-			dma-names = "tx", "rx";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cmu CLK_SPI2&gt;, &lt;&amp;cmu CLK_SCLK_SPI2&gt;;</div><div class='del'>-			clock-names = "spi", "spi_busclk0";</div><div class='del'>-			samsung,spi-src-clk = &lt;0&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;spi2_bus&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clock_audss: clock-controller@03810000 {</div><div class='del'>-			compatible = "samsung,exynos4210-audss-clock";</div><div class='del'>-			reg = &lt;0x03810000 0x0C&gt;;</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2s0: i2s@3830000 {</div><div class='del'>-			compatible = "samsung,s5pv210-i2s";</div><div class='del'>-			reg = &lt;0x03830000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 124 0&gt;;</div><div class='del'>-			clocks = &lt;&amp;clock_audss EXYNOS_I2S_BUS&gt;,</div><div class='del'>-				&lt;&amp;clock_audss EXYNOS_SCLK_I2S&gt;;</div><div class='del'>-			clock-names = "iis", "i2s_opclk0";</div><div class='del'>-			dmas = &lt;&amp;pdma1 10&gt;, &lt;&amp;pdma1 9&gt;, &lt;&amp;pdma1 8&gt;;</div><div class='del'>-			dma-names = "tx", "rx", "tx-sec";</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;i2s0_bus&gt;;</div><div class='del'>-			samsung,idma-addr = &lt;0x03000000&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pwm: pwm@139D0000 {</div><div class='del'>-			compatible = "samsung,exynos4210-pwm";</div><div class='del'>-			reg = &lt;0x139D0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 104 0&gt;, &lt;0 105 0&gt;, &lt;0 106 0&gt;,</div><div class='del'>-				     &lt;0 107 0&gt;, &lt;0 108 0&gt;;</div><div class='del'>-			#pwm-cells = &lt;3&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pmu {</div><div class='del'>-			compatible = "arm,cortex-a9-pmu";</div><div class='del'>-			interrupts = &lt;0 18 0&gt;, &lt;0 19 0&gt;, &lt;0 20 0&gt;, &lt;0 21 0&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#include "exynos4415-pinctrl.dtsi"</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi<br/>deleted file mode 100644<br/>index a56bf9b1a412..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4x12-pinctrl.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,972 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Samsung's Exynos4x12 SoCs pin-mux and pin-config device tree source</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2012 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * Samsung's Exynos4x12 SoCs pin-mux and pin-config optiosn are listed as device</div><div class='del'>- * tree nodes are listed in this file.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;dt-bindings/pinctrl/samsung.h&gt;</div><div class='del'>-</div><div class='del'>-#define PIN_SLP(_pin, _mode, _pull)					\</div><div class='del'>-	_pin {								\</div><div class='del'>-		samsung,pins = #_pin;					\</div><div class='del'>-		samsung,pin-con-pdn = &lt;EXYNOS_PIN_PDN_ ##_mode&gt;;	\</div><div class='del'>-		samsung,pin-pud-pdn = &lt;EXYNOS_PIN_PULL_ ##_pull&gt;;	\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	pinctrl_0: pinctrl@11400000 {</div><div class='del'>-		gpa0: gpa0 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpa1: gpa1 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpb: gpb {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpc0: gpc0 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpc1: gpc1 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpd0: gpd0 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpd1: gpd1 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpf0: gpf0 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpf1: gpf1 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpf2: gpf2 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpf3: gpf3 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpj0: gpj0 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpj1: gpj1 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		uart0_data: uart0-data {</div><div class='del'>-			samsung,pins = "gpa0-0", "gpa0-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		uart0_fctl: uart0-fctl {</div><div class='del'>-			samsung,pins = "gpa0-2", "gpa0-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		uart1_data: uart1-data {</div><div class='del'>-			samsung,pins = "gpa0-4", "gpa0-5";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		uart1_fctl: uart1-fctl {</div><div class='del'>-			samsung,pins = "gpa0-6", "gpa0-7";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c2_bus: i2c2-bus {</div><div class='del'>-			samsung,pins = "gpa0-6", "gpa0-7";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		uart2_data: uart2-data {</div><div class='del'>-			samsung,pins = "gpa1-0", "gpa1-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		uart2_fctl: uart2-fctl {</div><div class='del'>-			samsung,pins = "gpa1-2", "gpa1-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		uart_audio_a: uart-audio-a {</div><div class='del'>-			samsung,pins = "gpa1-0", "gpa1-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c3_bus: i2c3-bus {</div><div class='del'>-			samsung,pins = "gpa1-2", "gpa1-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		uart3_data: uart3-data {</div><div class='del'>-			samsung,pins = "gpa1-4", "gpa1-5";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		uart_audio_b: uart-audio-b {</div><div class='del'>-			samsung,pins = "gpa1-4", "gpa1-5";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi0_bus: spi0-bus {</div><div class='del'>-			samsung,pins = "gpb-0", "gpb-2", "gpb-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c4_bus: i2c4-bus {</div><div class='del'>-			samsung,pins = "gpb-0", "gpb-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi1_bus: spi1-bus {</div><div class='del'>-			samsung,pins = "gpb-4", "gpb-6", "gpb-7";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c5_bus: i2c5-bus {</div><div class='del'>-			samsung,pins = "gpb-2", "gpb-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2s1_bus: i2s1-bus {</div><div class='del'>-			samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",</div><div class='del'>-					"gpc0-4";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pcm1_bus: pcm1-bus {</div><div class='del'>-			samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",</div><div class='del'>-					"gpc0-4";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ac97_bus: ac97-bus {</div><div class='del'>-			samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",</div><div class='del'>-					"gpc0-4";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2s2_bus: i2s2-bus {</div><div class='del'>-			samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",</div><div class='del'>-					"gpc1-4";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pcm2_bus: pcm2-bus {</div><div class='del'>-			samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",</div><div class='del'>-					"gpc1-4";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spdif_bus: spdif-bus {</div><div class='del'>-			samsung,pins = "gpc1-0", "gpc1-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c6_bus: i2c6-bus {</div><div class='del'>-			samsung,pins = "gpc1-3", "gpc1-4";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi2_bus: spi2-bus {</div><div class='del'>-			samsung,pins = "gpc1-1", "gpc1-3", "gpc1-4";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_5&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pwm0_out: pwm0-out {</div><div class='del'>-			samsung,pins = "gpd0-0";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pwm1_out: pwm1-out {</div><div class='del'>-			samsung,pins = "gpd0-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		lcd_ctrl: lcd-ctrl {</div><div class='del'>-			samsung,pins = "gpd0-0", "gpd0-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c7_bus: i2c7-bus {</div><div class='del'>-			samsung,pins = "gpd0-2", "gpd0-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pwm2_out: pwm2-out {</div><div class='del'>-			samsung,pins = "gpd0-2";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pwm3_out: pwm3-out {</div><div class='del'>-			samsung,pins = "gpd0-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c0_bus: i2c0-bus {</div><div class='del'>-			samsung,pins = "gpd1-0", "gpd1-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mipi0_clk: mipi0-clk {</div><div class='del'>-			samsung,pins = "gpd1-0", "gpd1-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c1_bus: i2c1-bus {</div><div class='del'>-			samsung,pins = "gpd1-2", "gpd1-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mipi1_clk: mipi1-clk {</div><div class='del'>-			samsung,pins = "gpd1-2", "gpd1-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		lcd_clk: lcd-clk {</div><div class='del'>-			samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		lcd_data16: lcd-data-width16 {</div><div class='del'>-			samsung,pins = "gpf0-7", "gpf1-0", "gpf1-1", "gpf1-2",</div><div class='del'>-					"gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0",</div><div class='del'>-					"gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7",</div><div class='del'>-					"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		lcd_data18: lcd-data-width18 {</div><div class='del'>-			samsung,pins = "gpf0-6", "gpf0-7", "gpf1-0", "gpf1-1",</div><div class='del'>-					"gpf1-2", "gpf1-3", "gpf1-6", "gpf1-7",</div><div class='del'>-					"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",</div><div class='del'>-					"gpf2-6", "gpf2-7", "gpf3-0", "gpf3-1",</div><div class='del'>-					"gpf3-2", "gpf3-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		lcd_data24: lcd-data-width24 {</div><div class='del'>-			samsung,pins = "gpf0-4", "gpf0-5", "gpf0-6", "gpf0-7",</div><div class='del'>-					"gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3",</div><div class='del'>-					"gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7",</div><div class='del'>-					"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",</div><div class='del'>-					"gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",</div><div class='del'>-					"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		lcd_ldi: lcd-ldi {</div><div class='del'>-			samsung,pins = "gpf3-4";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cam_port_a_io: cam-port-a-io {</div><div class='del'>-			samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",</div><div class='del'>-					"gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",</div><div class='del'>-					"gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cam_port_a_clk_active: cam-port-a-clk-active {</div><div class='del'>-			samsung,pins = "gpj1-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cam_port_a_clk_idle: cam-port-a-clk-idle {</div><div class='del'>-			samsung,pins = "gpj1-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_INPUT&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_DOWN&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_1: pinctrl@11000000 {</div><div class='del'>-		gpk0: gpk0 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpk1: gpk1 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpk2: gpk2 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpk3: gpk3 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpl0: gpl0 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpl1: gpl1 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpl2: gpl2 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpm0: gpm0 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpm1: gpm1 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpm2: gpm2 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpm3: gpm3 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpm4: gpm4 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpy0: gpy0 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpy1: gpy1 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpy2: gpy2 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpy3: gpy3 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpy4: gpy4 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpy5: gpy5 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpy6: gpy6 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpx0: gpx0 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-			interrupts = &lt;0 16 0&gt;, &lt;0 17 0&gt;, &lt;0 18 0&gt;, &lt;0 19 0&gt;,</div><div class='del'>-				     &lt;0 20 0&gt;, &lt;0 21 0&gt;, &lt;0 22 0&gt;, &lt;0 23 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpx1: gpx1 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-			interrupts = &lt;0 24 0&gt;, &lt;0 25 0&gt;, &lt;0 26 0&gt;, &lt;0 27 0&gt;,</div><div class='del'>-				     &lt;0 28 0&gt;, &lt;0 29 0&gt;, &lt;0 30 0&gt;, &lt;0 31 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpx2: gpx2 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpx3: gpx3 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd0_clk: sd0-clk {</div><div class='del'>-			samsung,pins = "gpk0-0";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd0_cmd: sd0-cmd {</div><div class='del'>-			samsung,pins = "gpk0-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd0_cd: sd0-cd {</div><div class='del'>-			samsung,pins = "gpk0-2";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd0_bus1: sd0-bus-width1 {</div><div class='del'>-			samsung,pins = "gpk0-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd0_bus4: sd0-bus-width4 {</div><div class='del'>-			samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd0_bus8: sd0-bus-width8 {</div><div class='del'>-			samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd4_clk: sd4-clk {</div><div class='del'>-			samsung,pins = "gpk0-0";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd4_cmd: sd4-cmd {</div><div class='del'>-			samsung,pins = "gpk0-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd4_cd: sd4-cd {</div><div class='del'>-			samsung,pins = "gpk0-2";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd4_bus1: sd4-bus-width1 {</div><div class='del'>-			samsung,pins = "gpk0-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd4_bus4: sd4-bus-width4 {</div><div class='del'>-			samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd4_bus8: sd4-bus-width8 {</div><div class='del'>-			samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd1_clk: sd1-clk {</div><div class='del'>-			samsung,pins = "gpk1-0";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd1_cmd: sd1-cmd {</div><div class='del'>-			samsung,pins = "gpk1-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd1_cd: sd1-cd {</div><div class='del'>-			samsung,pins = "gpk1-2";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd1_bus1: sd1-bus-width1 {</div><div class='del'>-			samsung,pins = "gpk1-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd1_bus4: sd1-bus-width4 {</div><div class='del'>-			samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd2_clk: sd2-clk {</div><div class='del'>-			samsung,pins = "gpk2-0";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd2_cmd: sd2-cmd {</div><div class='del'>-			samsung,pins = "gpk2-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd2_cd: sd2-cd {</div><div class='del'>-			samsung,pins = "gpk2-2";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd2_bus1: sd2-bus-width1 {</div><div class='del'>-			samsung,pins = "gpk2-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd2_bus4: sd2-bus-width4 {</div><div class='del'>-			samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd2_bus8: sd2-bus-width8 {</div><div class='del'>-			samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd3_clk: sd3-clk {</div><div class='del'>-			samsung,pins = "gpk3-0";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd3_cmd: sd3-cmd {</div><div class='del'>-			samsung,pins = "gpk3-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd3_cd: sd3-cd {</div><div class='del'>-			samsung,pins = "gpk3-2";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd3_bus1: sd3-bus-width1 {</div><div class='del'>-			samsung,pins = "gpk3-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sd3_bus4: sd3-bus-width4 {</div><div class='del'>-			samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cam_port_b_io: cam-port-b-io {</div><div class='del'>-			samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",</div><div class='del'>-					"gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",</div><div class='del'>-					"gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cam_port_b_clk_active: cam-port-b-clk-active {</div><div class='del'>-			samsung,pins = "gpm2-2";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cam_port_b_clk_idle: cam-port-b-clk-idle {</div><div class='del'>-			samsung,pins = "gpm2-2";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_INPUT&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_DOWN&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		eint0: ext-int0 {</div><div class='del'>-			samsung,pins = "gpx0-0";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_F&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		eint8: ext-int8 {</div><div class='del'>-			samsung,pins = "gpx1-0";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_F&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		eint15: ext-int15 {</div><div class='del'>-			samsung,pins = "gpx1-7";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_F&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		eint16: ext-int16 {</div><div class='del'>-			samsung,pins = "gpx2-0";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_F&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		eint31: ext-int31 {</div><div class='del'>-			samsung,pins = "gpx3-7";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_F&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		fimc_is_i2c0: fimc-is-i2c0 {</div><div class='del'>-			samsung,pins = "gpm4-0", "gpm4-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		fimc_is_i2c1: fimc-is-i2c1 {</div><div class='del'>-			samsung,pins = "gpm4-2", "gpm4-3";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		fimc_is_uart: fimc-is-uart {</div><div class='del'>-			samsung,pins = "gpm3-5", "gpm3-7";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		hdmi_cec: hdmi-cec {</div><div class='del'>-			samsung,pins = "gpx3-6";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_2: pinctrl@03860000 {</div><div class='del'>-		gpz: gpz {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2s0_bus: i2s0-bus {</div><div class='del'>-			samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",</div><div class='del'>-					"gpz-4", "gpz-5", "gpz-6";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pcm0_bus: pcm0-bus {</div><div class='del'>-			samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",</div><div class='del'>-					"gpz-4";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_3: pinctrl@106E0000 {</div><div class='del'>-		gpv0: gpv0 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpv1: gpv1 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpv2: gpv2 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpv3: gpv3 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpv4: gpv4 {</div><div class='del'>-			gpio-controller;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		c2c_bus: c2c-bus {</div><div class='del'>-			samsung,pins = "gpv0-0", "gpv0-1", "gpv0-2", "gpv0-3",</div><div class='del'>-					"gpv0-4", "gpv0-5", "gpv0-6", "gpv0-7",</div><div class='del'>-					"gpv1-0", "gpv1-1", "gpv1-2", "gpv1-3",</div><div class='del'>-					"gpv1-4", "gpv1-5", "gpv1-6", "gpv1-7",</div><div class='del'>-					"gpv2-0", "gpv2-1", "gpv2-2", "gpv2-3",</div><div class='del'>-					"gpv2-4", "gpv2-5", "gpv2-6", "gpv2-7",</div><div class='del'>-					"gpv3-0", "gpv3-1", "gpv3-2", "gpv3-3",</div><div class='del'>-					"gpv3-4", "gpv3-5", "gpv3-6", "gpv3-7",</div><div class='del'>-					"gpv4-0", "gpv4-1";</div><div class='del'>-			samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='del'>-			samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='del'>-			samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi<br/>deleted file mode 100644<br/>index 3394bdcf10ae..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos4x12.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos4x12.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,578 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Samsung's Exynos4x12 SoCs device tree source</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2012 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * Samsung's Exynos4x12 SoCs device nodes are listed in this file. Exynos4x12</div><div class='del'>- * based board files can include this file and provide values for board specfic</div><div class='del'>- * bindings.</div><div class='del'>- *</div><div class='del'>- * Note: This file does not include device nodes for all the controllers in</div><div class='del'>- * Exynos4x12 SoC. As device tree coverage for Exynos4x12 increases, additional</div><div class='del'>- * nodes can be added to this file.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include "exynos4.dtsi"</div><div class='del'>-#include "exynos4x12-pinctrl.dtsi"</div><div class='del'>-#include "exynos4-cpu-thermal.dtsi"</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	aliases {</div><div class='del'>-		pinctrl0 = &amp;pinctrl_0;</div><div class='del'>-		pinctrl1 = &amp;pinctrl_1;</div><div class='del'>-		pinctrl2 = &amp;pinctrl_2;</div><div class='del'>-		pinctrl3 = &amp;pinctrl_3;</div><div class='del'>-		fimc-lite0 = &amp;fimc_lite_0;</div><div class='del'>-		fimc-lite1 = &amp;fimc_lite_1;</div><div class='del'>-		mshc0 = &amp;mshc_0;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sysram@02020000 {</div><div class='del'>-		compatible = "mmio-sram";</div><div class='del'>-		reg = &lt;0x02020000 0x40000&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		ranges = &lt;0 0x02020000 0x40000&gt;;</div><div class='del'>-</div><div class='del'>-		smp-sysram@0 {</div><div class='del'>-			compatible = "samsung,exynos4210-sysram";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		smp-sysram@2f000 {</div><div class='del'>-			compatible = "samsung,exynos4210-sysram-ns";</div><div class='del'>-			reg = &lt;0x2f000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pd_isp: isp-power-domain@10023CA0 {</div><div class='del'>-		compatible = "samsung,exynos4210-pd";</div><div class='del'>-		reg = &lt;0x10023CA0 0x20&gt;;</div><div class='del'>-		#power-domain-cells = &lt;0&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	l2c: l2-cache-controller@10502000 {</div><div class='del'>-		compatible = "arm,pl310-cache";</div><div class='del'>-		reg = &lt;0x10502000 0x1000&gt;;</div><div class='del'>-		cache-unified;</div><div class='del'>-		cache-level = &lt;2&gt;;</div><div class='del'>-		arm,tag-latency = &lt;2 2 1&gt;;</div><div class='del'>-		arm,data-latency = &lt;3 2 1&gt;;</div><div class='del'>-		arm,double-linefill = &lt;1&gt;;</div><div class='del'>-		arm,double-linefill-incr = &lt;0&gt;;</div><div class='del'>-		arm,double-linefill-wrap = &lt;1&gt;;</div><div class='del'>-		arm,prefetch-drop = &lt;1&gt;;</div><div class='del'>-		arm,prefetch-offset = &lt;7&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	clock: clock-controller@10030000 {</div><div class='del'>-		compatible = "samsung,exynos4412-clock";</div><div class='del'>-		reg = &lt;0x10030000 0x20000&gt;;</div><div class='del'>-		#clock-cells = &lt;1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mct@10050000 {</div><div class='del'>-		compatible = "samsung,exynos4412-mct";</div><div class='del'>-		reg = &lt;0x10050000 0x800&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mct_map&gt;;</div><div class='del'>-		interrupts = &lt;0&gt;, &lt;1&gt;, &lt;2&gt;, &lt;3&gt;, &lt;4&gt;;</div><div class='del'>-		clocks = &lt;&amp;clock CLK_FIN_PLL&gt;, &lt;&amp;clock CLK_MCT&gt;;</div><div class='del'>-		clock-names = "fin_pll", "mct";</div><div class='del'>-</div><div class='del'>-		mct_map: mct-map {</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupt-map = &lt;0 &amp;gic 0 57 0&gt;,</div><div class='del'>-					&lt;1 &amp;combiner 12 5&gt;,</div><div class='del'>-					&lt;2 &amp;combiner 12 6&gt;,</div><div class='del'>-					&lt;3 &amp;combiner 12 7&gt;,</div><div class='del'>-					&lt;4 &amp;gic 1 12 0&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	adc: adc@126C0000 {</div><div class='del'>-		compatible = "samsung,exynos-adc-v1";</div><div class='del'>-		reg = &lt;0x126C0000 0x100&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='del'>-		interrupts = &lt;10 3&gt;;</div><div class='del'>-		clocks = &lt;&amp;clock CLK_TSADC&gt;;</div><div class='del'>-		clock-names = "adc";</div><div class='del'>-		#io-channel-cells = &lt;1&gt;;</div><div class='del'>-		io-channel-ranges;</div><div class='del'>-		samsung,syscon-phandle = &lt;&amp;pmu_system_controller&gt;;</div><div class='del'>-		status = "disabled";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	g2d: g2d@10800000 {</div><div class='del'>-		compatible = "samsung,exynos4212-g2d";</div><div class='del'>-		reg = &lt;0x10800000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 89 0&gt;;</div><div class='del'>-		clocks = &lt;&amp;clock CLK_SCLK_FIMG2D&gt;, &lt;&amp;clock CLK_G2D&gt;;</div><div class='del'>-		clock-names = "sclk_fimg2d", "fimg2d";</div><div class='del'>-		iommus = &lt;&amp;sysmmu_g2d&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	camera {</div><div class='del'>-		clocks = &lt;&amp;clock CLK_SCLK_CAM0&gt;, &lt;&amp;clock CLK_SCLK_CAM1&gt;,</div><div class='del'>-			 &lt;&amp;clock CLK_PIXELASYNCM0&gt;, &lt;&amp;clock CLK_PIXELASYNCM1&gt;;</div><div class='del'>-		clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";</div><div class='del'>-</div><div class='del'>-		/* fimc_[0-3] are configured outside, under phandles */</div><div class='del'>-		fimc_lite_0: fimc-lite@12390000 {</div><div class='del'>-			compatible = "samsung,exynos4212-fimc-lite";</div><div class='del'>-			reg = &lt;0x12390000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 105 0&gt;;</div><div class='del'>-			power-domains = &lt;&amp;pd_isp&gt;;</div><div class='del'>-			clocks = &lt;&amp;clock CLK_FIMC_LITE0&gt;;</div><div class='del'>-			clock-names = "flite";</div><div class='del'>-			iommus = &lt;&amp;sysmmu_fimc_lite0&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		fimc_lite_1: fimc-lite@123A0000 {</div><div class='del'>-			compatible = "samsung,exynos4212-fimc-lite";</div><div class='del'>-			reg = &lt;0x123A0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 106 0&gt;;</div><div class='del'>-			power-domains = &lt;&amp;pd_isp&gt;;</div><div class='del'>-			clocks = &lt;&amp;clock CLK_FIMC_LITE1&gt;;</div><div class='del'>-			clock-names = "flite";</div><div class='del'>-			iommus = &lt;&amp;sysmmu_fimc_lite1&gt;;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		fimc_is: fimc-is@12000000 {</div><div class='del'>-			compatible = "samsung,exynos4212-fimc-is", "simple-bus";</div><div class='del'>-			reg = &lt;0x12000000 0x260000&gt;;</div><div class='del'>-			interrupts = &lt;0 90 0&gt;, &lt;0 95 0&gt;;</div><div class='del'>-			power-domains = &lt;&amp;pd_isp&gt;;</div><div class='del'>-			clocks = &lt;&amp;clock CLK_FIMC_LITE0&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_FIMC_LITE1&gt;, &lt;&amp;clock CLK_PPMUISPX&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_PPMUISPMX&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_MOUT_MPLL_USER_T&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_FIMC_ISP&gt;, &lt;&amp;clock CLK_FIMC_DRC&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_FIMC_FD&gt;, &lt;&amp;clock CLK_MCUISP&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_GICISP&gt;, &lt;&amp;clock CLK_MCUCTL_ISP&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_PWM_ISP&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_DIV_ISP0&gt;, &lt;&amp;clock CLK_DIV_ISP1&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_DIV_MCUISP0&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_DIV_MCUISP1&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_UART_ISP_SCLK&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_ACLK200&gt;, &lt;&amp;clock CLK_DIV_ACLK200&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_ACLK400_MCUISP&gt;,</div><div class='del'>-				 &lt;&amp;clock CLK_DIV_ACLK400_MCUISP&gt;;</div><div class='del'>-			clock-names = "lite0", "lite1", "ppmuispx",</div><div class='del'>-				      "ppmuispmx", "mpll", "isp",</div><div class='del'>-				      "drc", "fd", "mcuisp",</div><div class='del'>-				      "gicisp", "mcuctl_isp", "pwm_isp",</div><div class='del'>-				      "ispdiv0", "ispdiv1", "mcuispdiv0",</div><div class='del'>-				      "mcuispdiv1", "uart", "aclk200",</div><div class='del'>-				      "div_aclk200", "aclk400mcuisp",</div><div class='del'>-				      "div_aclk400mcuisp";</div><div class='del'>-			iommus = &lt;&amp;sysmmu_fimc_isp&gt;, &lt;&amp;sysmmu_fimc_drc&gt;,</div><div class='del'>-				 &lt;&amp;sysmmu_fimc_fd&gt;, &lt;&amp;sysmmu_fimc_mcuctl&gt;;</div><div class='del'>-			iommu-names = "isp", "drc", "fd", "mcuctl";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			ranges;</div><div class='del'>-			status = "disabled";</div><div class='del'>-</div><div class='del'>-			pmu@10020000 {</div><div class='del'>-				reg = &lt;0x10020000 0x3000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c1_isp: i2c-isp@12140000 {</div><div class='del'>-				compatible = "samsung,exynos4212-i2c-isp";</div><div class='del'>-				reg = &lt;0x12140000 0x100&gt;;</div><div class='del'>-				clocks = &lt;&amp;clock CLK_I2C1_ISP&gt;;</div><div class='del'>-				clock-names = "i2c_isp";</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mshc_0: mmc@12550000 {</div><div class='del'>-		compatible = "samsung,exynos4412-dw-mshc";</div><div class='del'>-		reg = &lt;0x12550000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 77 0&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		fifo-depth = &lt;0x80&gt;;</div><div class='del'>-		clocks = &lt;&amp;clock CLK_SDMMC4&gt;, &lt;&amp;clock CLK_SCLK_MMC4&gt;;</div><div class='del'>-		clock-names = "biu", "ciu";</div><div class='del'>-		status = "disabled";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sysmmu_g2d: sysmmu@10A40000{</div><div class='del'>-		compatible = "samsung,exynos-sysmmu";</div><div class='del'>-		reg = &lt;0x10A40000 0x1000&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='del'>-		interrupts = &lt;4 7&gt;;</div><div class='del'>-		clock-names = "sysmmu", "master";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_SMMU_G2D&gt;, &lt;&amp;clock CLK_G2D&gt;;</div><div class='del'>-		#iommu-cells = &lt;0&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sysmmu_fimc_isp: sysmmu@12260000 {</div><div class='del'>-		compatible = "samsung,exynos-sysmmu";</div><div class='del'>-		reg = &lt;0x12260000 0x1000&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='del'>-		interrupts = &lt;16 2&gt;;</div><div class='del'>-		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='del'>-		clock-names = "sysmmu";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_SMMU_ISP&gt;;</div><div class='del'>-		#iommu-cells = &lt;0&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sysmmu_fimc_drc: sysmmu@12270000 {</div><div class='del'>-		compatible = "samsung,exynos-sysmmu";</div><div class='del'>-		reg = &lt;0x12270000 0x1000&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='del'>-		interrupts = &lt;16 3&gt;;</div><div class='del'>-		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='del'>-		clock-names = "sysmmu";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_SMMU_DRC&gt;;</div><div class='del'>-		#iommu-cells = &lt;0&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sysmmu_fimc_fd: sysmmu@122A0000 {</div><div class='del'>-		compatible = "samsung,exynos-sysmmu";</div><div class='del'>-		reg = &lt;0x122A0000 0x1000&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='del'>-		interrupts = &lt;16 4&gt;;</div><div class='del'>-		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='del'>-		clock-names = "sysmmu";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_SMMU_FD&gt;;</div><div class='del'>-		#iommu-cells = &lt;0&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sysmmu_fimc_mcuctl: sysmmu@122B0000 {</div><div class='del'>-		compatible = "samsung,exynos-sysmmu";</div><div class='del'>-		reg = &lt;0x122B0000 0x1000&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='del'>-		interrupts = &lt;16 5&gt;;</div><div class='del'>-		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='del'>-		clock-names = "sysmmu";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_SMMU_ISPCX&gt;;</div><div class='del'>-		#iommu-cells = &lt;0&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sysmmu_fimc_lite0: sysmmu@123B0000 {</div><div class='del'>-		compatible = "samsung,exynos-sysmmu";</div><div class='del'>-		reg = &lt;0x123B0000 0x1000&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='del'>-		interrupts = &lt;16 0&gt;;</div><div class='del'>-		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='del'>-		clock-names = "sysmmu", "master";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_SMMU_LITE0&gt;, &lt;&amp;clock CLK_FIMC_LITE0&gt;;</div><div class='del'>-		#iommu-cells = &lt;0&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sysmmu_fimc_lite1: sysmmu@123C0000 {</div><div class='del'>-		compatible = "samsung,exynos-sysmmu";</div><div class='del'>-		reg = &lt;0x123C0000 0x1000&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='del'>-		interrupts = &lt;16 1&gt;;</div><div class='del'>-		power-domains = &lt;&amp;pd_isp&gt;;</div><div class='del'>-		clock-names = "sysmmu", "master";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_SMMU_LITE1&gt;, &lt;&amp;clock CLK_FIMC_LITE1&gt;;</div><div class='del'>-		#iommu-cells = &lt;0&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_dmc: bus_dmc {</div><div class='del'>-		compatible = "samsung,exynos-bus";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_DIV_DMC&gt;;</div><div class='del'>-		clock-names = "bus";</div><div class='del'>-		operating-points-v2 = &lt;&amp;bus_dmc_opp_table&gt;;</div><div class='del'>-		status = "disabled";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_acp: bus_acp {</div><div class='del'>-		compatible = "samsung,exynos-bus";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_DIV_ACP&gt;;</div><div class='del'>-		clock-names = "bus";</div><div class='del'>-		operating-points-v2 = &lt;&amp;bus_acp_opp_table&gt;;</div><div class='del'>-		status = "disabled";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_c2c: bus_c2c {</div><div class='del'>-		compatible = "samsung,exynos-bus";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_DIV_C2C&gt;;</div><div class='del'>-		clock-names = "bus";</div><div class='del'>-		operating-points-v2 = &lt;&amp;bus_dmc_opp_table&gt;;</div><div class='del'>-		status = "disabled";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_dmc_opp_table: opp_table1 {</div><div class='del'>-		compatible = "operating-points-v2";</div><div class='del'>-		opp-shared;</div><div class='del'>-</div><div class='del'>-		opp@100000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;900000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@134000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;900000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@160000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;160000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;900000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@267000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;267000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;950000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@400000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;400000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1050000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_acp_opp_table: opp_table2 {</div><div class='del'>-		compatible = "operating-points-v2";</div><div class='del'>-		opp-shared;</div><div class='del'>-</div><div class='del'>-		opp@100000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@134000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@160000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;160000000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@267000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;267000000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_leftbus: bus_leftbus {</div><div class='del'>-		compatible = "samsung,exynos-bus";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_DIV_GDL&gt;;</div><div class='del'>-		clock-names = "bus";</div><div class='del'>-		operating-points-v2 = &lt;&amp;bus_leftbus_opp_table&gt;;</div><div class='del'>-		status = "disabled";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_rightbus: bus_rightbus {</div><div class='del'>-		compatible = "samsung,exynos-bus";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_DIV_GDR&gt;;</div><div class='del'>-		clock-names = "bus";</div><div class='del'>-		operating-points-v2 = &lt;&amp;bus_leftbus_opp_table&gt;;</div><div class='del'>-		status = "disabled";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_display: bus_display {</div><div class='del'>-		compatible = "samsung,exynos-bus";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_ACLK160&gt;;</div><div class='del'>-		clock-names = "bus";</div><div class='del'>-		operating-points-v2 = &lt;&amp;bus_display_opp_table&gt;;</div><div class='del'>-		status = "disabled";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_fsys: bus_fsys {</div><div class='del'>-		compatible = "samsung,exynos-bus";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_ACLK133&gt;;</div><div class='del'>-		clock-names = "bus";</div><div class='del'>-		operating-points-v2 = &lt;&amp;bus_fsys_opp_table&gt;;</div><div class='del'>-		status = "disabled";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_peri: bus_peri {</div><div class='del'>-		compatible = "samsung,exynos-bus";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_ACLK100&gt;;</div><div class='del'>-		clock-names = "bus";</div><div class='del'>-		operating-points-v2 = &lt;&amp;bus_peri_opp_table&gt;;</div><div class='del'>-		status = "disabled";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_mfc: bus_mfc {</div><div class='del'>-		compatible = "samsung,exynos-bus";</div><div class='del'>-		clocks = &lt;&amp;clock CLK_SCLK_MFC&gt;;</div><div class='del'>-		clock-names = "bus";</div><div class='del'>-		operating-points-v2 = &lt;&amp;bus_leftbus_opp_table&gt;;</div><div class='del'>-		status = "disabled";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_leftbus_opp_table: opp_table3 {</div><div class='del'>-		compatible = "operating-points-v2";</div><div class='del'>-		opp-shared;</div><div class='del'>-</div><div class='del'>-		opp@100000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;900000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@134000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;925000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@160000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;160000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;950000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@200000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='del'>-			opp-microvolt = &lt;1000000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_display_opp_table: opp_table4 {</div><div class='del'>-		compatible = "operating-points-v2";</div><div class='del'>-		opp-shared;</div><div class='del'>-</div><div class='del'>-		opp@160000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;160000000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@200000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_fsys_opp_table: opp_table5 {</div><div class='del'>-		compatible = "operating-points-v2";</div><div class='del'>-		opp-shared;</div><div class='del'>-</div><div class='del'>-		opp@100000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@134000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	bus_peri_opp_table: opp_table6 {</div><div class='del'>-		compatible = "operating-points-v2";</div><div class='del'>-		opp-shared;</div><div class='del'>-</div><div class='del'>-		opp@50000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;50000000&gt;;</div><div class='del'>-		};</div><div class='del'>-		opp@100000000 {</div><div class='del'>-			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;combiner {</div><div class='del'>-	interrupts = &lt;0 0 0&gt;, &lt;0 1 0&gt;, &lt;0 2 0&gt;, &lt;0 3 0&gt;,</div><div class='del'>-		     &lt;0 4 0&gt;, &lt;0 5 0&gt;, &lt;0 6 0&gt;, &lt;0 7 0&gt;,</div><div class='del'>-		     &lt;0 8 0&gt;, &lt;0 9 0&gt;, &lt;0 10 0&gt;, &lt;0 11 0&gt;,</div><div class='del'>-		     &lt;0 12 0&gt;, &lt;0 13 0&gt;, &lt;0 14 0&gt;, &lt;0 15 0&gt;,</div><div class='del'>-		     &lt;0 107 0&gt;, &lt;0 108 0&gt;, &lt;0 48 0&gt;, &lt;0 42 0&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;exynos_usbphy {</div><div class='del'>-	compatible = "samsung,exynos4x12-usb2-phy";</div><div class='del'>-	samsung,sysreg-phandle = &lt;&amp;sys_reg&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;fimc_0 {</div><div class='del'>-	compatible = "samsung,exynos4212-fimc";</div><div class='del'>-	samsung,pix-limits = &lt;4224 8192 1920 4224&gt;;</div><div class='del'>-	samsung,mainscaler-ext;</div><div class='del'>-	samsung,isp-wb;</div><div class='del'>-	samsung,cam-if;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;fimc_1 {</div><div class='del'>-	compatible = "samsung,exynos4212-fimc";</div><div class='del'>-	samsung,pix-limits = &lt;4224 8192 1920 4224&gt;;</div><div class='del'>-	samsung,mainscaler-ext;</div><div class='del'>-	samsung,isp-wb;</div><div class='del'>-	samsung,cam-if;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;fimc_2 {</div><div class='del'>-	compatible = "samsung,exynos4212-fimc";</div><div class='del'>-	samsung,pix-limits = &lt;4224 8192 1920 4224&gt;;</div><div class='del'>-	samsung,mainscaler-ext;</div><div class='del'>-	samsung,isp-wb;</div><div class='del'>-	samsung,lcd-wb;</div><div class='del'>-	samsung,cam-if;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;fimc_3 {</div><div class='del'>-	compatible = "samsung,exynos4212-fimc";</div><div class='del'>-	samsung,pix-limits = &lt;1920 8192 1366 1920&gt;;</div><div class='del'>-	samsung,rotators = &lt;0&gt;;</div><div class='del'>-	samsung,mainscaler-ext;</div><div class='del'>-	samsung,isp-wb;</div><div class='del'>-	samsung,lcd-wb;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;hdmi {</div><div class='del'>-	compatible = "samsung,exynos4212-hdmi";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;jpeg_codec {</div><div class='del'>-	compatible = "samsung,exynos4212-jpeg";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;rotator {</div><div class='del'>-	compatible = "samsung,exynos4212-rotator";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;mixer {</div><div class='del'>-	compatible = "samsung,exynos4212-mixer";</div><div class='del'>-	clock-names = "mixer", "hdmi", "sclk_hdmi", "vp";</div><div class='del'>-	clocks = &lt;&amp;clock CLK_MIXER&gt;, &lt;&amp;clock CLK_HDMI&gt;,</div><div class='del'>-		 &lt;&amp;clock CLK_SCLK_HDMI&gt;, &lt;&amp;clock CLK_VP&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;pinctrl_0 {</div><div class='del'>-	compatible = "samsung,exynos4x12-pinctrl";</div><div class='del'>-	reg = &lt;0x11400000 0x1000&gt;;</div><div class='del'>-	interrupts = &lt;0 47 0&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;pinctrl_1 {</div><div class='del'>-	compatible = "samsung,exynos4x12-pinctrl";</div><div class='del'>-	reg = &lt;0x11000000 0x1000&gt;;</div><div class='del'>-	interrupts = &lt;0 46 0&gt;;</div><div class='del'>-</div><div class='del'>-	wakup_eint: wakeup-interrupt-controller {</div><div class='del'>-		compatible = "samsung,exynos4210-wakeup-eint";</div><div class='del'>-		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-		interrupts = &lt;0 32 0&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;pinctrl_2 {</div><div class='del'>-	compatible = "samsung,exynos4x12-pinctrl";</div><div class='del'>-	reg = &lt;0x03860000 0x1000&gt;;</div><div class='del'>-	interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='del'>-	interrupts = &lt;10 0&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;pinctrl_3 {</div><div class='del'>-	compatible = "samsung,exynos4x12-pinctrl";</div><div class='del'>-	reg = &lt;0x106E0000 0x1000&gt;;</div><div class='del'>-	interrupts = &lt;0 72 0&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;pmu_system_controller {</div><div class='del'>-	compatible = "samsung,exynos4212-pmu", "syscon";</div><div class='del'>-	clock-names = "clkout0", "clkout1", "clkout2", "clkout3",</div><div class='del'>-			"clkout4", "clkout8", "clkout9";</div><div class='del'>-	clocks = &lt;&amp;clock CLK_OUT_DMC&gt;, &lt;&amp;clock CLK_OUT_TOP&gt;,</div><div class='del'>-		&lt;&amp;clock CLK_OUT_LEFTBUS&gt;, &lt;&amp;clock CLK_OUT_RIGHTBUS&gt;,</div><div class='del'>-		&lt;&amp;clock CLK_OUT_CPU&gt;, &lt;&amp;clock CLK_XXTI&gt;, &lt;&amp;clock CLK_XUSBXTI&gt;;</div><div class='del'>-	#clock-cells = &lt;1&gt;;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;tmu {</div><div class='del'>-	compatible = "samsung,exynos4412-tmu";</div><div class='del'>-	interrupt-parent = &lt;&amp;combiner&gt;;</div><div class='del'>-	interrupts = &lt;2 4&gt;;</div><div class='del'>-	reg = &lt;0x100C0000 0x100&gt;;</div><div class='del'>-	clocks = &lt;&amp;clock 383&gt;;</div><div class='del'>-	clock-names = "tmu_apbif";</div><div class='del'>-	status = "disabled";</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi<br/>index 8f06609879f5..b74c5379ca26 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5.dtsi</a></div><div class='hunk'>@@ -13,6 +13,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> #include "exynos-syscon-restart.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -53,25 +55,50 @@</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			samsung,combiner-nr = &lt;32&gt;;</div><div class='ctx'> 			reg = &lt;0x10440000 0x1000&gt;;</div><div class='del'>-			interrupts =	&lt;0 0 0&gt;, &lt;0 1 0&gt;, &lt;0 2 0&gt;, &lt;0 3 0&gt;,</div><div class='del'>-					&lt;0 4 0&gt;, &lt;0 5 0&gt;, &lt;0 6 0&gt;, &lt;0 7 0&gt;,</div><div class='del'>-					&lt;0 8 0&gt;, &lt;0 9 0&gt;, &lt;0 10 0&gt;, &lt;0 11 0&gt;,</div><div class='del'>-					&lt;0 12 0&gt;, &lt;0 13 0&gt;, &lt;0 14 0&gt;, &lt;0 15 0&gt;,</div><div class='del'>-					&lt;0 16 0&gt;, &lt;0 17 0&gt;, &lt;0 18 0&gt;, &lt;0 19 0&gt;,</div><div class='del'>-					&lt;0 20 0&gt;, &lt;0 21 0&gt;, &lt;0 22 0&gt;, &lt;0 23 0&gt;,</div><div class='del'>-					&lt;0 24 0&gt;, &lt;0 25 0&gt;, &lt;0 26 0&gt;, &lt;0 27 0&gt;,</div><div class='del'>-					&lt;0 28 0&gt;, &lt;0 29 0&gt;, &lt;0 30 0&gt;, &lt;0 31 0&gt;;</div><div class='add'>+			interrupts = &lt;0 0 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 1 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 3 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 4 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 5 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 6 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 7 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 8 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 9 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 10 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 11 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 12 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 13 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 14 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 15 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 16 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 17 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 18 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 19 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 20 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 21 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 22 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 23 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 24 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 25 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 26 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 27 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 28 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 29 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 30 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 31 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		gic: interrupt-controller@10481000 {</div><div class='del'>-			compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";</div><div class='add'>+			compatible = "arm,gic-400", "arm,cortex-a15-gic", "arm,cortex-a9-gic";</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			reg =	&lt;0x10481000 0x1000&gt;,</div><div class='del'>-				&lt;0x10482000 0x1000&gt;,</div><div class='add'>+				&lt;0x10482000 0x2000&gt;,</div><div class='ctx'> 				&lt;0x10484000 0x2000&gt;,</div><div class='ctx'> 				&lt;0x10486000 0x2000&gt;;</div><div class='del'>-			interrupts = &lt;1 9 0xf04&gt;;</div><div class='add'>+			interrupts = &lt;GIC_PPI 9</div><div class='add'>+					(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sysreg_system_controller: syscon@10050000 {</div><div class='hunk'>@@ -82,31 +109,31 @@</div><div class='ctx'> 		serial_0: serial@12C00000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x12C00000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 51 0&gt;;</div><div class='add'>+			interrupts = &lt;0 51 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		serial_1: serial@12C10000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x12C10000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 52 0&gt;;</div><div class='add'>+			interrupts = &lt;0 52 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		serial_2: serial@12C20000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x12C20000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 53 0&gt;;</div><div class='add'>+			interrupts = &lt;0 53 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		serial_3: serial@12C30000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x12C30000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 54 0&gt;;</div><div class='add'>+			interrupts = &lt;0 54 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c_0: i2c@12C60000 {</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x12C60000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 56 0&gt;;</div><div class='add'>+			interrupts = &lt;0 56 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			samsung,sysreg-phandle = &lt;&amp;sysreg_system_controller&gt;;</div><div class='hunk'>@@ -116,7 +143,7 @@</div><div class='ctx'> 		i2c_1: i2c@12C70000 {</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x12C70000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 57 0&gt;;</div><div class='add'>+			interrupts = &lt;0 57 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			samsung,sysreg-phandle = &lt;&amp;sysreg_system_controller&gt;;</div><div class='hunk'>@@ -126,7 +153,7 @@</div><div class='ctx'> 		i2c_2: i2c@12C80000 {</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x12C80000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 58 0&gt;;</div><div class='add'>+			interrupts = &lt;0 58 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			samsung,sysreg-phandle = &lt;&amp;sysreg_system_controller&gt;;</div><div class='hunk'>@@ -136,7 +163,7 @@</div><div class='ctx'> 		i2c_3: i2c@12C90000 {</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x12C90000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 59 0&gt;;</div><div class='add'>+			interrupts = &lt;0 59 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			samsung,sysreg-phandle = &lt;&amp;sysreg_system_controller&gt;;</div><div class='hunk'>@@ -153,7 +180,8 @@</div><div class='ctx'> 		rtc: rtc@101E0000 {</div><div class='ctx'> 			compatible = "samsung,s3c6410-rtc";</div><div class='ctx'> 			reg = &lt;0x101E0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 43 0&gt;, &lt;0 44 0&gt;;</div><div class='add'>+			interrupts = &lt;0 43 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 44 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi<br/>index d5d51916bb74..8f3a80430748 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5250-snow-common.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5250-snow-common.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5250-snow-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5250-snow-common.dtsi</a></div><div class='hunk'>@@ -523,6 +523,7 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* eMMC flash */</div><div class='ctx'> &amp;mmc_0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='hunk'>@@ -536,6 +537,7 @@</div><div class='ctx'> 	cap-mmc-highspeed;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* uSD card */</div><div class='ctx'> &amp;mmc_2 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='hunk'>@@ -553,6 +555,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * On Snow we've got SIP WiFi and so can keep drive strengths low to</div><div class='ctx'>  * reduce EMI.</div><div class='add'>+ *</div><div class='add'>+ * WiFi SDIO module</div><div class='ctx'>  */</div><div class='ctx'> &amp;mmc_3 {</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi<br/>index f7357d99b47c..79c9c885613a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5250.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5250.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5250.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5250.dtsi</a></div><div class='hunk'>@@ -115,18 +115,21 @@</div><div class='ctx'> 			compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 			reg = &lt;0x10044000 0x20&gt;;</div><div class='ctx'> 			#power-domain-cells = &lt;0&gt;;</div><div class='add'>+			label = "GSC";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pd_mfc: mfc-power-domain@10044040 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 			reg = &lt;0x10044040 0x20&gt;;</div><div class='ctx'> 			#power-domain-cells = &lt;0&gt;;</div><div class='add'>+			label = "MFC";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pd_disp1: disp1-power-domain@100440A0 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 			reg = &lt;0x100440A0 0x20&gt;;</div><div class='ctx'> 			#power-domain-cells = &lt;0&gt;;</div><div class='add'>+			label = "DISP1";</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_FIN_PLL&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_MOUT_ACLK200_DISP1_SUB&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_MOUT_ACLK300_DISP1_SUB&gt;;</div><div class='hunk'>@@ -181,8 +184,8 @@</div><div class='ctx'> 						&lt;0x1 0 &amp;combiner 23 4&gt;,</div><div class='ctx'> 						&lt;0x2 0 &amp;combiner 25 2&gt;,</div><div class='ctx'> 						&lt;0x3 0 &amp;combiner 25 3&gt;,</div><div class='del'>-						&lt;0x4 0 &amp;gic 0 120 0&gt;,</div><div class='del'>-						&lt;0x5 0 &amp;gic 0 121 0&gt;;</div><div class='add'>+						&lt;0x4 0 &amp;gic 0 120 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+						&lt;0x5 0 &amp;gic 0 121 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -195,31 +198,31 @@</div><div class='ctx'> 		pinctrl_0: pinctrl@11400000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-pinctrl";</div><div class='ctx'> 			reg = &lt;0x11400000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 46 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 			wakup_eint: wakeup-interrupt-controller {</div><div class='ctx'> 				compatible = "samsung,exynos4210-wakeup-eint";</div><div class='ctx'> 				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-				interrupts = &lt;0 32 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_1: pinctrl@13400000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-pinctrl";</div><div class='ctx'> 			reg = &lt;0x13400000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 45 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_2: pinctrl@10d10000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-pinctrl";</div><div class='ctx'> 			reg = &lt;0x10d10000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 50 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_3: pinctrl@03860000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-pinctrl";</div><div class='ctx'> 			reg = &lt;0x03860000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 47 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pmu_system_controller: system-controller@10040000 {</div><div class='hunk'>@@ -236,7 +239,7 @@</div><div class='ctx'> 		watchdog@101D0000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-wdt";</div><div class='ctx'> 			reg = &lt;0x101D0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 42 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_WDT&gt;;</div><div class='ctx'> 			clock-names = "watchdog";</div><div class='ctx'> 			samsung,syscon-phandle = &lt;&amp;pmu_system_controller&gt;;</div><div class='hunk'>@@ -245,7 +248,7 @@</div><div class='ctx'> 		g2d@10850000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-g2d";</div><div class='ctx'> 			reg = &lt;0x10850000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 91 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_G2D&gt;;</div><div class='ctx'> 			clock-names = "fimg2d";</div><div class='ctx'> 			iommus = &lt;&amp;sysmmu_g2d&gt;;</div><div class='hunk'>@@ -254,7 +257,7 @@</div><div class='ctx'> 		mfc: codec@11000000 {</div><div class='ctx'> 			compatible = "samsung,mfc-v6";</div><div class='ctx'> 			reg = &lt;0x11000000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;0 96 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_mfc&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_MFC&gt;;</div><div class='ctx'> 			clock-names = "mfc";</div><div class='hunk'>@@ -265,7 +268,7 @@</div><div class='ctx'> 		rotator: rotator@11C00000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-rotator";</div><div class='ctx'> 			reg = &lt;0x11C00000 0x64&gt;;</div><div class='del'>-			interrupts = &lt;0 84 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_ROTATOR&gt;;</div><div class='ctx'> 			clock-names = "rotator";</div><div class='ctx'> 			iommus = &lt;&amp;sysmmu_rotator&gt;;</div><div class='hunk'>@@ -274,7 +277,7 @@</div><div class='ctx'> 		tmu: tmu@10060000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-tmu";</div><div class='ctx'> 			reg = &lt;0x10060000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 65 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_TMU&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif";</div><div class='ctx'> 			#include "exynos4412-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -284,7 +287,7 @@</div><div class='ctx'> 			compatible = "snps,dwc-ahci";</div><div class='ctx'> 			samsung,sata-freq = &lt;66&gt;;</div><div class='ctx'> 			reg = &lt;0x122F0000 0x1ff&gt;;</div><div class='del'>-			interrupts = &lt;0 115 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_SATA&gt;, &lt;&amp;clock CLK_SCLK_SATA&gt;;</div><div class='ctx'> 			clock-names = "sata", "sclk_sata";</div><div class='ctx'> 			phys = &lt;&amp;sata_phy&gt;;</div><div class='hunk'>@@ -306,7 +309,7 @@</div><div class='ctx'> 		i2c_4: i2c@12CA0000 {</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x12CA0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 60 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_I2C4&gt;;</div><div class='hunk'>@@ -319,7 +322,7 @@</div><div class='ctx'> 		i2c_5: i2c@12CB0000 {</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x12CB0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 61 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_I2C5&gt;;</div><div class='hunk'>@@ -332,7 +335,7 @@</div><div class='ctx'> 		i2c_6: i2c@12CC0000 {</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x12CC0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 62 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_I2C6&gt;;</div><div class='hunk'>@@ -345,7 +348,7 @@</div><div class='ctx'> 		i2c_7: i2c@12CD0000 {</div><div class='ctx'> 			compatible = "samsung,s3c2440-i2c";</div><div class='ctx'> 			reg = &lt;0x12CD0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 63 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_I2C7&gt;;</div><div class='hunk'>@@ -358,7 +361,7 @@</div><div class='ctx'> 		i2c_8: i2c@12CE0000 {</div><div class='ctx'> 			compatible = "samsung,s3c2440-hdmiphy-i2c";</div><div class='ctx'> 			reg = &lt;0x12CE0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 64 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_I2C_HDMI&gt;;</div><div class='hunk'>@@ -380,7 +383,7 @@</div><div class='ctx'> 			compatible = "samsung,exynos4210-spi";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			reg = &lt;0x12d20000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 66 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;pdma0 5</div><div class='ctx'> 				&amp;pdma0 4&gt;;</div><div class='ctx'> 			dma-names = "tx", "rx";</div><div class='hunk'>@@ -396,7 +399,7 @@</div><div class='ctx'> 			compatible = "samsung,exynos4210-spi";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			reg = &lt;0x12d30000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 67 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;pdma1 5</div><div class='ctx'> 				&amp;pdma1 4&gt;;</div><div class='ctx'> 			dma-names = "tx", "rx";</div><div class='hunk'>@@ -412,7 +415,7 @@</div><div class='ctx'> 			compatible = "samsung,exynos4210-spi";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			reg = &lt;0x12d40000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 68 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;pdma0 7</div><div class='ctx'> 				&amp;pdma0 6&gt;;</div><div class='ctx'> 			dma-names = "tx", "rx";</div><div class='hunk'>@@ -426,7 +429,7 @@</div><div class='ctx'> </div><div class='ctx'> 		mmc_0: mmc@12200000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-dw-mshc";</div><div class='del'>-			interrupts = &lt;0 75 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			reg = &lt;0x12200000 0x1000&gt;;</div><div class='hunk'>@@ -438,7 +441,7 @@</div><div class='ctx'> </div><div class='ctx'> 		mmc_1: mmc@12210000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-dw-mshc";</div><div class='del'>-			interrupts = &lt;0 76 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			reg = &lt;0x12210000 0x1000&gt;;</div><div class='hunk'>@@ -450,7 +453,7 @@</div><div class='ctx'> </div><div class='ctx'> 		mmc_2: mmc@12220000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-dw-mshc";</div><div class='del'>-			interrupts = &lt;0 77 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			reg = &lt;0x12220000 0x1000&gt;;</div><div class='hunk'>@@ -463,7 +466,7 @@</div><div class='ctx'> 		mmc_3: mmc@12230000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-dw-mshc";</div><div class='ctx'> 			reg = &lt;0x12230000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 78 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_SDMMC3&gt;, &lt;&amp;clock CLK_SCLK_MMC3&gt;;</div><div class='hunk'>@@ -526,7 +529,7 @@</div><div class='ctx'> 			usbdrd_dwc3: dwc3@12000000 {</div><div class='ctx'> 				compatible = "synopsys,dwc3";</div><div class='ctx'> 				reg = &lt;0x12000000 0x10000&gt;;</div><div class='del'>-				interrupts = &lt;0 72 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				phys = &lt;&amp;usbdrd_phy 0&gt;, &lt;&amp;usbdrd_phy 1&gt;;</div><div class='ctx'> 				phy-names = "usb2-phy", "usb3-phy";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -544,7 +547,7 @@</div><div class='ctx'> 		ehci: usb@12110000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-ehci";</div><div class='ctx'> 			reg = &lt;0x12110000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 71 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_USB2&gt;;</div><div class='ctx'> 			clock-names = "usbhost";</div><div class='hunk'>@@ -559,7 +562,7 @@</div><div class='ctx'> 		ohci: usb@12120000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-ohci";</div><div class='ctx'> 			reg = &lt;0x12120000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 71 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_USB2&gt;;</div><div class='ctx'> 			clock-names = "usbhost";</div><div class='hunk'>@@ -591,7 +594,7 @@</div><div class='ctx'> 			pdma0: pdma@121A0000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x121A0000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 34 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clock CLK_PDMA0&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -602,7 +605,7 @@</div><div class='ctx'> 			pdma1: pdma@121B0000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x121B0000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 35 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clock CLK_PDMA1&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -613,7 +616,7 @@</div><div class='ctx'> 			mdma0: mdma@10800000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x10800000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 33 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clock CLK_MDMA0&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -624,7 +627,7 @@</div><div class='ctx'> 			mdma1: mdma@11C10000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x11C10000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 124 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clock CLK_MDMA1&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -636,7 +639,7 @@</div><div class='ctx'> 		gsc_0:  gsc@13e00000 {</div><div class='ctx'> 			compatible = "samsung,exynos5-gsc";</div><div class='ctx'> 			reg = &lt;0x13e00000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 85 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_gsc&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_GSCL0&gt;;</div><div class='ctx'> 			clock-names = "gscl";</div><div class='hunk'>@@ -646,7 +649,7 @@</div><div class='ctx'> 		gsc_1:  gsc@13e10000 {</div><div class='ctx'> 			compatible = "samsung,exynos5-gsc";</div><div class='ctx'> 			reg = &lt;0x13e10000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 86 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_gsc&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_GSCL1&gt;;</div><div class='ctx'> 			clock-names = "gscl";</div><div class='hunk'>@@ -656,7 +659,7 @@</div><div class='ctx'> 		gsc_2:  gsc@13e20000 {</div><div class='ctx'> 			compatible = "samsung,exynos5-gsc";</div><div class='ctx'> 			reg = &lt;0x13e20000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 87 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_gsc&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_GSCL2&gt;;</div><div class='ctx'> 			clock-names = "gscl";</div><div class='hunk'>@@ -666,7 +669,7 @@</div><div class='ctx'> 		gsc_3:  gsc@13e30000 {</div><div class='ctx'> 			compatible = "samsung,exynos5-gsc";</div><div class='ctx'> 			reg = &lt;0x13e30000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 88 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_gsc&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_GSCL3&gt;;</div><div class='ctx'> 			clock-names = "gscl";</div><div class='hunk'>@@ -677,7 +680,7 @@</div><div class='ctx'> 			compatible = "samsung,exynos4212-hdmi";</div><div class='ctx'> 			reg = &lt;0x14530000 0x70000&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_disp1&gt;;</div><div class='del'>-			interrupts = &lt;0 95 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_HDMI&gt;, &lt;&amp;clock CLK_SCLK_HDMI&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_SCLK_PIXEL&gt;, &lt;&amp;clock CLK_SCLK_HDMIPHY&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_MOUT_HDMI&gt;;</div><div class='hunk'>@@ -690,7 +693,7 @@</div><div class='ctx'> 			compatible = "samsung,exynos5250-mixer";</div><div class='ctx'> 			reg = &lt;0x14450000 0x10000&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;pd_disp1&gt;;</div><div class='del'>-			interrupts = &lt;0 94 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_MIXER&gt;, &lt;&amp;clock CLK_HDMI&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_SCLK_HDMI&gt;;</div><div class='ctx'> 			clock-names = "mixer", "hdmi", "sclk_hdmi";</div><div class='hunk'>@@ -706,7 +709,7 @@</div><div class='ctx'> 		adc: adc@12D10000 {</div><div class='ctx'> 			compatible = "samsung,exynos-adc-v1";</div><div class='ctx'> 			reg = &lt;0x12D10000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 106 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_ADC&gt;;</div><div class='ctx'> 			clock-names = "adc";</div><div class='ctx'> 			#io-channel-cells = &lt;1&gt;;</div><div class='hunk'>@@ -718,7 +721,7 @@</div><div class='ctx'> 		sss@10830000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-secss";</div><div class='ctx'> 			reg = &lt;0x10830000 0x300&gt;;</div><div class='del'>-			interrupts = &lt;0 112 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_SSS&gt;;</div><div class='ctx'> 			clock-names = "secss";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -1043,21 +1046,29 @@</div><div class='ctx'> &amp;serial_0 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART0&gt;, &lt;&amp;clock CLK_SCLK_UART0&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma0 13&gt;, &lt;&amp;pdma0 14&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;serial_1 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART1&gt;, &lt;&amp;clock CLK_SCLK_UART1&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma1 15&gt;, &lt;&amp;pdma1 16&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;serial_2 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART2&gt;, &lt;&amp;clock CLK_SCLK_UART2&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma0 15&gt;, &lt;&amp;pdma0 16&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;serial_3 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART3&gt;, &lt;&amp;clock CLK_SCLK_UART3&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma1 17&gt;, &lt;&amp;pdma1 18&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #include "exynos5250-pinctrl.dtsi"</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5260.dtsi b/arch/arm/boot/dts/exynos5260.dtsi<br/>index a86a4898d077..5e88c9645975 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5260.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5260.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5260.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5260.dtsi</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/exynos5260-clk.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "samsung,exynos5260", "samsung,exynos5";</div><div class='hunk'>@@ -165,10 +167,11 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			reg = &lt;0x10481000 0x1000&gt;,</div><div class='del'>-				&lt;0x10482000 0x1000&gt;,</div><div class='add'>+				&lt;0x10482000 0x2000&gt;,</div><div class='ctx'> 				&lt;0x10484000 0x2000&gt;,</div><div class='ctx'> 				&lt;0x10486000 0x2000&gt;;</div><div class='del'>-			interrupts = &lt;1 9 0xf04&gt;;</div><div class='add'>+			interrupts = &lt;GIC_PPI 9</div><div class='add'>+					(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		chipid: chipid@10000000 {</div><div class='hunk'>@@ -181,10 +184,18 @@</div><div class='ctx'> 			reg = &lt;0x100B0000 0x1000&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;fin_pll&gt;, &lt;&amp;clock_peri PERI_CLK_MCT&gt;;</div><div class='ctx'> 			clock-names = "fin_pll", "mct";</div><div class='del'>-			interrupts = &lt;0 104 0&gt;, &lt;0 105 0&gt;, &lt;0 106 0&gt;,</div><div class='del'>-					&lt;0 107 0&gt;, &lt;0 122 0&gt;, &lt;0 123 0&gt;,</div><div class='del'>-					&lt;0 124 0&gt;, &lt;0 125 0&gt;, &lt;0 126 0&gt;,</div><div class='del'>-					&lt;0 127 0&gt;, &lt;0 128 0&gt;, &lt;0 129 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cci: cci@10F00000 {</div><div class='hunk'>@@ -210,25 +221,25 @@</div><div class='ctx'> 		pinctrl_0: pinctrl@11600000 {</div><div class='ctx'> 			compatible = "samsung,exynos5260-pinctrl";</div><div class='ctx'> 			reg = &lt;0x11600000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 79 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 			wakeup-interrupt-controller {</div><div class='ctx'> 				compatible = "samsung,exynos4210-wakeup-eint";</div><div class='ctx'> 				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-				interrupts = &lt;0 32 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_1: pinctrl@12290000 {</div><div class='ctx'> 			compatible = "samsung,exynos5260-pinctrl";</div><div class='ctx'> 			reg = &lt;0x12290000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 157 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_2: pinctrl@128B0000 {</div><div class='ctx'> 			compatible = "samsung,exynos5260-pinctrl";</div><div class='ctx'> 			reg = &lt;0x128B0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 243 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 243 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pmu_system_controller: system-controller@10D50000 {</div><div class='hunk'>@@ -239,7 +250,7 @@</div><div class='ctx'> 		uart0: serial@12C00000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x12C00000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 146 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_peri PERI_CLK_UART0&gt;, &lt;&amp;clock_peri PERI_SCLK_UART0&gt;;</div><div class='ctx'> 			clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -248,7 +259,7 @@</div><div class='ctx'> 		uart1: serial@12C10000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x12C10000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 147 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_peri PERI_CLK_UART1&gt;, &lt;&amp;clock_peri PERI_SCLK_UART1&gt;;</div><div class='ctx'> 			clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -257,7 +268,7 @@</div><div class='ctx'> 		uart2: serial@12C20000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x12C20000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 148 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_peri PERI_CLK_UART2&gt;, &lt;&amp;clock_peri PERI_SCLK_UART2&gt;;</div><div class='ctx'> 			clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -266,7 +277,7 @@</div><div class='ctx'> 		uart3: serial@12860000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x12860000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 145 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_aud AUD_CLK_AUD_UART&gt;, &lt;&amp;clock_aud AUD_SCLK_AUD_UART&gt;;</div><div class='ctx'> 			clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -275,7 +286,7 @@</div><div class='ctx'> 		mmc_0: mmc@12140000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-dw-mshc";</div><div class='ctx'> 			reg = &lt;0x12140000 0x2000&gt;;</div><div class='del'>-			interrupts = &lt;0 156 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_fsys FSYS_CLK_MMC0&gt;, &lt;&amp;clock_top TOP_SCLK_MMC0&gt;;</div><div class='hunk'>@@ -287,7 +298,7 @@</div><div class='ctx'> 		mmc_1: mmc@12150000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-dw-mshc";</div><div class='ctx'> 			reg = &lt;0x12150000 0x2000&gt;;</div><div class='del'>-			interrupts = &lt;0 158 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_fsys FSYS_CLK_MMC1&gt;, &lt;&amp;clock_top TOP_SCLK_MMC1&gt;;</div><div class='hunk'>@@ -299,7 +310,7 @@</div><div class='ctx'> 		mmc_2: mmc@12160000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-dw-mshc";</div><div class='ctx'> 			reg = &lt;0x12160000 0x2000&gt;;</div><div class='del'>-			interrupts = &lt;0 159 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_fsys FSYS_CLK_MMC2&gt;, &lt;&amp;clock_top TOP_SCLK_MMC2&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts<br/>index 3c271cb4b2be..c4de1353e5df 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5410-odroidxu.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5410-odroidxu.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5410-odroidxu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5410-odroidxu.dts</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;dt-bindings/clock/maxim,max77802.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+#include &lt;dt-bindings/sound/samsung-i2s.h&gt;</div><div class='ctx'> #include "exynos54xx-odroidxu-leds.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -57,6 +58,61 @@</div><div class='ctx'> 		compatible = "samsung,secure-firmware";</div><div class='ctx'> 		reg = &lt;0x02073000 0x1000&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	sound: sound {</div><div class='add'>+		compatible = "simple-audio-card";</div><div class='add'>+</div><div class='add'>+		simple-audio-card,name = "Odroid-XU";</div><div class='add'>+		simple-audio-card,widgets =</div><div class='add'>+			"Headphone", "Headphone Jack",</div><div class='add'>+			"Speakers", "Speakers";</div><div class='add'>+		simple-audio-card,routing =</div><div class='add'>+			"Headphone Jack", "HPL",</div><div class='add'>+			"Headphone Jack", "HPR",</div><div class='add'>+			"Headphone Jack", "MICBIAS",</div><div class='add'>+			"IN1", "Headphone Jack",</div><div class='add'>+			"Speakers", "SPKL",</div><div class='add'>+			"Speakers", "SPKR";</div><div class='add'>+</div><div class='add'>+		simple-audio-card,format = "i2s";</div><div class='add'>+		simple-audio-card,bitclock-master = &lt;&amp;link0_codec&gt;;</div><div class='add'>+		simple-audio-card,frame-master = &lt;&amp;link0_codec&gt;;</div><div class='add'>+</div><div class='add'>+		simple-audio-card,cpu {</div><div class='add'>+			sound-dai = &lt;&amp;audi2s0 0&gt;;</div><div class='add'>+			system-clock-frequency = &lt;19200000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		link0_codec: simple-audio-card,codec {</div><div class='add'>+			sound-dai = &lt;&amp;max98090&gt;;</div><div class='add'>+			clocks = &lt;&amp;audi2s0 CLK_I2S_CDCLK&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;audi2s0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;clock {</div><div class='add'>+	clocks = &lt;&amp;fin_pll&gt;;</div><div class='add'>+	assigned-clocks = &lt;&amp;clock CLK_FOUT_EPLL&gt;;</div><div class='add'>+	assigned-clock-rates = &lt;192000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;clock_audss {</div><div class='add'>+	assigned-clocks = &lt;&amp;clock_audss EXYNOS_MOUT_AUDSS&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_MOUT_I2S&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_DOUT_SRP&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_DOUT_AUD_BUS&gt;;</div><div class='add'>+</div><div class='add'>+	assigned-clock-parents = &lt;&amp;clock CLK_FOUT_EPLL&gt;,</div><div class='add'>+			&lt;&amp;clock_audss EXYNOS_MOUT_AUDSS&gt;;</div><div class='add'>+</div><div class='add'>+	assigned-clock-rates =  &lt;0&gt;,</div><div class='add'>+				&lt;0&gt;,</div><div class='add'>+				&lt;96000000&gt;,</div><div class='add'>+				&lt;19200000&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cpu0_thermal {</div><div class='hunk'>@@ -440,6 +496,19 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;i2c_1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	max98090: max98090@10 {</div><div class='add'>+		compatible = "maxim,max98090";</div><div class='add'>+		reg = &lt;0x10&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpj3&gt;;</div><div class='add'>+		interrupts = &lt;0 IRQ_TYPE_NONE&gt;;</div><div class='add'>+		clocks = &lt;&amp;audi2s0 CLK_I2S_CDCLK&gt;;</div><div class='add'>+		clock-names = "mclk";</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;mmc_0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	mmc-pwrseq = &lt;&amp;emmc_pwrseq&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi<br/>index a083d23fdee3..ff46a1c27182 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5410-pinctrl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5410-pinctrl.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5410-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5410-pinctrl.dtsi</a></div><div class='hunk'>@@ -615,4 +615,13 @@</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	audi2s0_bus: audi2s0-bus {</div><div class='add'>+		samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",</div><div class='add'>+				"gpz-4";</div><div class='add'>+		samsung,pin-function = &lt;2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;0&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi<br/>index 137f48464f8b..7eab4bc07cec 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5410.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5410.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5410.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5410.dtsi</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include "exynos54xx.dtsi"</div><div class='ctx'> #include "exynos-syscon-restart.dtsi"</div><div class='ctx'> #include &lt;dt-bindings/clock/exynos5410.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/exynos-audss-clk.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -82,10 +83,18 @@</div><div class='ctx'> 			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		clock_audss: audss-clock-controller@3810000 {</div><div class='add'>+			compatible = "samsung,exynos5410-audss-clock";</div><div class='add'>+			reg = &lt;0x03810000 0x0C&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			clocks = &lt;&amp;fin_pll&gt;, &lt;&amp;clock CLK_FOUT_EPLL&gt;;</div><div class='add'>+			clock-names = "pll_ref", "pll_in";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		tmu_cpu0: tmu@10060000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-tmu";</div><div class='ctx'> 			reg = &lt;0x10060000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 65 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_TMU&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif";</div><div class='ctx'> 			#include "exynos4412-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -94,7 +103,7 @@</div><div class='ctx'> 		tmu_cpu1: tmu@10064000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-tmu";</div><div class='ctx'> 			reg = &lt;0x10064000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 183 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_TMU&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif";</div><div class='ctx'> 			#include "exynos4412-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -103,7 +112,7 @@</div><div class='ctx'> 		tmu_cpu2: tmu@10068000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-tmu";</div><div class='ctx'> 			reg = &lt;0x10068000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 184 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_TMU&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif";</div><div class='ctx'> 			#include "exynos4412-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -112,7 +121,7 @@</div><div class='ctx'> 		tmu_cpu3: tmu@1006c000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-tmu";</div><div class='ctx'> 			reg = &lt;0x1006c000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 185 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_TMU&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif";</div><div class='ctx'> 			#include "exynos4412-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -121,7 +130,7 @@</div><div class='ctx'> 		mmc_0: mmc@12200000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-dw-mshc";</div><div class='ctx'> 			reg = &lt;0x12200000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 75 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_MMC0&gt;, &lt;&amp;clock CLK_SCLK_MMC0&gt;;</div><div class='hunk'>@@ -133,7 +142,7 @@</div><div class='ctx'> 		mmc_1: mmc@12210000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-dw-mshc";</div><div class='ctx'> 			reg = &lt;0x12210000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 76 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_MMC1&gt;, &lt;&amp;clock CLK_SCLK_MMC1&gt;;</div><div class='hunk'>@@ -145,7 +154,7 @@</div><div class='ctx'> 		mmc_2: mmc@12220000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-dw-mshc";</div><div class='ctx'> 			reg = &lt;0x12220000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 77 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_MMC2&gt;, &lt;&amp;clock CLK_SCLK_MMC2&gt;;</div><div class='hunk'>@@ -157,31 +166,81 @@</div><div class='ctx'> 		pinctrl_0: pinctrl@13400000 {</div><div class='ctx'> 			compatible = "samsung,exynos5410-pinctrl";</div><div class='ctx'> 			reg = &lt;0x13400000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 45 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 			wakeup-interrupt-controller {</div><div class='ctx'> 				compatible = "samsung,exynos4210-wakeup-eint";</div><div class='ctx'> 				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-				interrupts = &lt;0 32 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_1: pinctrl@14000000 {</div><div class='ctx'> 			compatible = "samsung,exynos5410-pinctrl";</div><div class='ctx'> 			reg = &lt;0x14000000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 46 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_2: pinctrl@10d10000 {</div><div class='ctx'> 			compatible = "samsung,exynos5410-pinctrl";</div><div class='ctx'> 			reg = &lt;0x10d10000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 50 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_3: pinctrl@03860000 {</div><div class='ctx'> 			compatible = "samsung,exynos5410-pinctrl";</div><div class='ctx'> 			reg = &lt;0x03860000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 47 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		amba {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			pdma0: pdma@12680000 {</div><div class='add'>+				compatible = "arm,pl330", "arm,primecell";</div><div class='add'>+				reg = &lt;0x121A0000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;clock CLK_PDMA0&gt;;</div><div class='add'>+				clock-names = "apb_pclk";</div><div class='add'>+				#dma-cells = &lt;1&gt;;</div><div class='add'>+				#dma-channels = &lt;8&gt;;</div><div class='add'>+				#dma-requests = &lt;32&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pdma1: pdma@12690000 {</div><div class='add'>+				compatible = "arm,pl330", "arm,primecell";</div><div class='add'>+				reg = &lt;0x121B0000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;clock CLK_PDMA1&gt;;</div><div class='add'>+				clock-names = "apb_pclk";</div><div class='add'>+				#dma-cells = &lt;1&gt;;</div><div class='add'>+				#dma-channels = &lt;8&gt;;</div><div class='add'>+				#dma-requests = &lt;32&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		audi2s0: i2s@03830000 {</div><div class='add'>+			compatible = "samsung,exynos5420-i2s";</div><div class='add'>+			reg = &lt;0x03830000 0x100&gt;;</div><div class='add'>+			dmas = &lt;&amp;pdma0 10</div><div class='add'>+				&amp;pdma0 9</div><div class='add'>+				&amp;pdma0 8&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx-sec";</div><div class='add'>+			clocks = &lt;&amp;clock_audss EXYNOS_I2S_BUS&gt;,</div><div class='add'>+				&lt;&amp;clock_audss EXYNOS_I2S_BUS&gt;,</div><div class='add'>+				&lt;&amp;clock_audss EXYNOS_SCLK_I2S&gt;;</div><div class='add'>+			clock-names = "iis", "i2s_opclk0", "i2s_opclk1";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			clock-output-names = "i2s_cdclk0";</div><div class='add'>+			#sound-dai-cells = &lt;1&gt;;</div><div class='add'>+			samsung,idma-addr = &lt;0x03000000&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;audi2s0_bus&gt;;</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -281,21 +340,29 @@</div><div class='ctx'> &amp;serial_0 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART0&gt;, &lt;&amp;clock CLK_SCLK_UART0&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma0 13&gt;, &lt;&amp;pdma0 14&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;serial_1 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART1&gt;, &lt;&amp;clock CLK_SCLK_UART1&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma1 15&gt;, &lt;&amp;pdma1 16&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;serial_2 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART2&gt;, &lt;&amp;clock CLK_SCLK_UART2&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma0 15&gt;, &lt;&amp;pdma0 16&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;serial_3 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART3&gt;, &lt;&amp;clock CLK_SCLK_UART3&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma1 17&gt;, &lt;&amp;pdma1 18&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;sss {</div><div class='hunk'>@@ -329,7 +396,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbdrd_dwc3_1 {</div><div class='del'>-	interrupts = &lt;GIC_SPI 200 0&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbdrd_phy1 {</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts<br/>index ec4a00f1ce01..1f964ec35c5e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5420-peach-pit.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5420-peach-pit.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5420-peach-pit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5420-peach-pit.dts</a></div><div class='hunk'>@@ -697,6 +697,7 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* eMMC flash */</div><div class='ctx'> &amp;mmc_0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='hunk'>@@ -714,6 +715,7 @@</div><div class='ctx'> 	bus-width = &lt;8&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* WiFi SDIO module */</div><div class='ctx'> &amp;mmc_1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='hunk'>@@ -733,6 +735,7 @@</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;buck10_reg&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* uSD card */</div><div class='ctx'> &amp;mmc_2 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi<br/>index 00c4cfa54839..7dc9dc82afd8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5420.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5420.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5420.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5420.dtsi</a></div><div class='hunk'>@@ -193,7 +193,7 @@</div><div class='ctx'> 		mfc: codec@11000000 {</div><div class='ctx'> 			compatible = "samsung,mfc-v7";</div><div class='ctx'> 			reg = &lt;0x11000000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;0 96 0&gt;;</div><div class='add'>+			interrupts = &lt;0 96 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_MFC&gt;;</div><div class='ctx'> 			clock-names = "mfc";</div><div class='ctx'> 			power-domains = &lt;&amp;mfc_pd&gt;;</div><div class='hunk'>@@ -203,7 +203,7 @@</div><div class='ctx'> </div><div class='ctx'> 		mmc_0: mmc@12200000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-dw-mshc-smu";</div><div class='del'>-			interrupts = &lt;0 75 0&gt;;</div><div class='add'>+			interrupts = &lt;0 75 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			reg = &lt;0x12200000 0x2000&gt;;</div><div class='hunk'>@@ -215,7 +215,7 @@</div><div class='ctx'> </div><div class='ctx'> 		mmc_1: mmc@12210000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-dw-mshc-smu";</div><div class='del'>-			interrupts = &lt;0 76 0&gt;;</div><div class='add'>+			interrupts = &lt;0 76 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			reg = &lt;0x12210000 0x2000&gt;;</div><div class='hunk'>@@ -227,7 +227,7 @@</div><div class='ctx'> </div><div class='ctx'> 		mmc_2: mmc@12220000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-dw-mshc";</div><div class='del'>-			interrupts = &lt;0 77 0&gt;;</div><div class='add'>+			interrupts = &lt;0 77 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			reg = &lt;0x12220000 0x1000&gt;;</div><div class='hunk'>@@ -277,6 +277,7 @@</div><div class='ctx'> 			compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 			reg = &lt;0x10044000 0x20&gt;;</div><div class='ctx'> 			#power-domain-cells = &lt;0&gt;;</div><div class='add'>+			label = "GSC";</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_FIN_PLL&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_MOUT_USER_ACLK300_GSCL&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_GSCL0&gt;, &lt;&amp;clock CLK_GSCL1&gt;;</div><div class='hunk'>@@ -287,6 +288,7 @@</div><div class='ctx'> 			compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 			reg = &lt;0x10044020 0x20&gt;;</div><div class='ctx'> 			#power-domain-cells = &lt;0&gt;;</div><div class='add'>+			label = "ISP";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		mfc_pd: power-domain@10044060 {</div><div class='hunk'>@@ -297,18 +299,21 @@</div><div class='ctx'> 				 &lt;&amp;clock CLK_ACLK333&gt;;</div><div class='ctx'> 			clock-names = "oscclk", "clk0","asb0";</div><div class='ctx'> 			#power-domain-cells = &lt;0&gt;;</div><div class='add'>+			label = "MFC";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		msc_pd: power-domain@10044120 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 			reg = &lt;0x10044120 0x20&gt;;</div><div class='ctx'> 			#power-domain-cells = &lt;0&gt;;</div><div class='add'>+			label = "MSC";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		disp_pd: power-domain@100440C0 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-pd";</div><div class='ctx'> 			reg = &lt;0x100440C0 0x20&gt;;</div><div class='ctx'> 			#power-domain-cells = &lt;0&gt;;</div><div class='add'>+			label = "DISP";</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_FIN_PLL&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_MOUT_USER_ACLK200_DISP1&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_MOUT_USER_ACLK300_DISP1&gt;,</div><div class='hunk'>@@ -320,37 +325,37 @@</div><div class='ctx'> 		pinctrl_0: pinctrl@13400000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-pinctrl";</div><div class='ctx'> 			reg = &lt;0x13400000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 45 0&gt;;</div><div class='add'>+			interrupts = &lt;0 45 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 			wakeup-interrupt-controller {</div><div class='ctx'> 				compatible = "samsung,exynos4210-wakeup-eint";</div><div class='ctx'> 				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-				interrupts = &lt;0 32 0&gt;;</div><div class='add'>+				interrupts = &lt;0 32 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_1: pinctrl@13410000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-pinctrl";</div><div class='ctx'> 			reg = &lt;0x13410000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 78 0&gt;;</div><div class='add'>+			interrupts = &lt;0 78 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_2: pinctrl@14000000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-pinctrl";</div><div class='ctx'> 			reg = &lt;0x14000000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 46 0&gt;;</div><div class='add'>+			interrupts = &lt;0 46 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_3: pinctrl@14010000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-pinctrl";</div><div class='ctx'> 			reg = &lt;0x14010000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 50 0&gt;;</div><div class='add'>+			interrupts = &lt;0 50 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_4: pinctrl@03860000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-pinctrl";</div><div class='ctx'> 			reg = &lt;0x03860000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 47 0&gt;;</div><div class='add'>+			interrupts = &lt;0 47 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		amba {</div><div class='hunk'>@@ -363,7 +368,7 @@</div><div class='ctx'> 			adma: adma@03880000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x03880000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 110 0&gt;;</div><div class='add'>+				interrupts = &lt;0 110 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clock_audss EXYNOS_ADMA&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -374,7 +379,7 @@</div><div class='ctx'> 			pdma0: pdma@121A0000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x121A0000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 34 0&gt;;</div><div class='add'>+				interrupts = &lt;0 34 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clock CLK_PDMA0&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -385,7 +390,7 @@</div><div class='ctx'> 			pdma1: pdma@121B0000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x121B0000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 35 0&gt;;</div><div class='add'>+				interrupts = &lt;0 35 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clock CLK_PDMA1&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -396,7 +401,7 @@</div><div class='ctx'> 			mdma0: mdma@10800000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x10800000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 33 0&gt;;</div><div class='add'>+				interrupts = &lt;0 33 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clock CLK_MDMA0&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -407,7 +412,7 @@</div><div class='ctx'> 			mdma1: mdma@11C10000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x11C10000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 124 0&gt;;</div><div class='add'>+				interrupts = &lt;0 124 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clock CLK_MDMA1&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -479,7 +484,7 @@</div><div class='ctx'> 		spi_0: spi@12d20000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-spi";</div><div class='ctx'> 			reg = &lt;0x12d20000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 68 0&gt;;</div><div class='add'>+			interrupts = &lt;0 68 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;pdma0 5</div><div class='ctx'> 				&amp;pdma0 4&gt;;</div><div class='ctx'> 			dma-names = "tx", "rx";</div><div class='hunk'>@@ -495,7 +500,7 @@</div><div class='ctx'> 		spi_1: spi@12d30000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-spi";</div><div class='ctx'> 			reg = &lt;0x12d30000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 69 0&gt;;</div><div class='add'>+			interrupts = &lt;0 69 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;pdma1 5</div><div class='ctx'> 				&amp;pdma1 4&gt;;</div><div class='ctx'> 			dma-names = "tx", "rx";</div><div class='hunk'>@@ -511,7 +516,7 @@</div><div class='ctx'> 		spi_2: spi@12d40000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-spi";</div><div class='ctx'> 			reg = &lt;0x12d40000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 70 0&gt;;</div><div class='add'>+			interrupts = &lt;0 70 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;pdma0 7</div><div class='ctx'> 				&amp;pdma0 6&gt;;</div><div class='ctx'> 			dma-names = "tx", "rx";</div><div class='hunk'>@@ -539,7 +544,7 @@</div><div class='ctx'> 		dsi@14500000 {</div><div class='ctx'> 			compatible = "samsung,exynos5410-mipi-dsi";</div><div class='ctx'> 			reg = &lt;0x14500000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;0 82 0&gt;;</div><div class='add'>+			interrupts = &lt;0 82 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			phys = &lt;&amp;mipi_phy 1&gt;;</div><div class='ctx'> 			phy-names = "dsim";</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_DSIM1&gt;, &lt;&amp;clock CLK_SCLK_MIPI1&gt;;</div><div class='hunk'>@@ -552,7 +557,7 @@</div><div class='ctx'> 		adc: adc@12D10000 {</div><div class='ctx'> 			compatible = "samsung,exynos-adc-v2";</div><div class='ctx'> 			reg = &lt;0x12D10000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 106 0&gt;;</div><div class='add'>+			interrupts = &lt;0 106 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_TSADC&gt;;</div><div class='ctx'> 			clock-names = "adc";</div><div class='ctx'> 			#io-channel-cells = &lt;1&gt;;</div><div class='hunk'>@@ -564,7 +569,7 @@</div><div class='ctx'> 		hsi2c_8: i2c@12E00000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-hsi2c";</div><div class='ctx'> 			reg = &lt;0x12E00000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 87 0&gt;;</div><div class='add'>+			interrupts = &lt;0 87 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -577,7 +582,7 @@</div><div class='ctx'> 		hsi2c_9: i2c@12E10000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-hsi2c";</div><div class='ctx'> 			reg = &lt;0x12E10000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 88 0&gt;;</div><div class='add'>+			interrupts = &lt;0 88 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -590,7 +595,7 @@</div><div class='ctx'> 		hsi2c_10: i2c@12E20000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-hsi2c";</div><div class='ctx'> 			reg = &lt;0x12E20000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 203 0&gt;;</div><div class='add'>+			interrupts = &lt;0 203 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -603,7 +608,7 @@</div><div class='ctx'> 		hdmi: hdmi@14530000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-hdmi";</div><div class='ctx'> 			reg = &lt;0x14530000 0x70000&gt;;</div><div class='del'>-			interrupts = &lt;0 95 0&gt;;</div><div class='add'>+			interrupts = &lt;0 95 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_HDMI&gt;, &lt;&amp;clock CLK_SCLK_HDMI&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_DOUT_PIXEL&gt;, &lt;&amp;clock CLK_SCLK_HDMIPHY&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_MOUT_HDMI&gt;;</div><div class='hunk'>@@ -622,7 +627,7 @@</div><div class='ctx'> 		mixer: mixer@14450000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-mixer";</div><div class='ctx'> 			reg = &lt;0x14450000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;0 94 0&gt;;</div><div class='add'>+			interrupts = &lt;0 94 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_MIXER&gt;, &lt;&amp;clock CLK_HDMI&gt;,</div><div class='ctx'> 				 &lt;&amp;clock CLK_SCLK_HDMI&gt;;</div><div class='ctx'> 			clock-names = "mixer", "hdmi", "sclk_hdmi";</div><div class='hunk'>@@ -633,7 +638,7 @@</div><div class='ctx'> 		rotator: rotator@11C00000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-rotator";</div><div class='ctx'> 			reg = &lt;0x11C00000 0x64&gt;;</div><div class='del'>-			interrupts = &lt;0 84 0&gt;;</div><div class='add'>+			interrupts = &lt;0 84 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_ROTATOR&gt;;</div><div class='ctx'> 			clock-names = "rotator";</div><div class='ctx'> 			iommus = &lt;&amp;sysmmu_rotator&gt;;</div><div class='hunk'>@@ -642,7 +647,7 @@</div><div class='ctx'> 		gsc_0: video-scaler@13e00000 {</div><div class='ctx'> 			compatible = "samsung,exynos5-gsc";</div><div class='ctx'> 			reg = &lt;0x13e00000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 85 0&gt;;</div><div class='add'>+			interrupts = &lt;0 85 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_GSCL0&gt;;</div><div class='ctx'> 			clock-names = "gscl";</div><div class='ctx'> 			power-domains = &lt;&amp;gsc_pd&gt;;</div><div class='hunk'>@@ -652,7 +657,7 @@</div><div class='ctx'> 		gsc_1: video-scaler@13e10000 {</div><div class='ctx'> 			compatible = "samsung,exynos5-gsc";</div><div class='ctx'> 			reg = &lt;0x13e10000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 86 0&gt;;</div><div class='add'>+			interrupts = &lt;0 86 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_GSCL1&gt;;</div><div class='ctx'> 			clock-names = "gscl";</div><div class='ctx'> 			power-domains = &lt;&amp;gsc_pd&gt;;</div><div class='hunk'>@@ -662,7 +667,7 @@</div><div class='ctx'> 		jpeg_0: jpeg@11F50000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-jpeg";</div><div class='ctx'> 			reg = &lt;0x11F50000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 89 0&gt;;</div><div class='add'>+			interrupts = &lt;0 89 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clock-names = "jpeg";</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_JPEG&gt;;</div><div class='ctx'> 			iommus = &lt;&amp;sysmmu_jpeg0&gt;;</div><div class='hunk'>@@ -671,7 +676,7 @@</div><div class='ctx'> 		jpeg_1: jpeg@11F60000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-jpeg";</div><div class='ctx'> 			reg = &lt;0x11F60000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 168 0&gt;;</div><div class='add'>+			interrupts = &lt;0 168 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clock-names = "jpeg";</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_JPEG2&gt;;</div><div class='ctx'> 			iommus = &lt;&amp;sysmmu_jpeg1&gt;;</div><div class='hunk'>@@ -691,7 +696,7 @@</div><div class='ctx'> 		tmu_cpu0: tmu@10060000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-tmu";</div><div class='ctx'> 			reg = &lt;0x10060000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 65 0&gt;;</div><div class='add'>+			interrupts = &lt;0 65 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_TMU&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif";</div><div class='ctx'> 			#include "exynos4412-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -700,7 +705,7 @@</div><div class='ctx'> 		tmu_cpu1: tmu@10064000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-tmu";</div><div class='ctx'> 			reg = &lt;0x10064000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 183 0&gt;;</div><div class='add'>+			interrupts = &lt;0 183 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_TMU&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif";</div><div class='ctx'> 			#include "exynos4412-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -709,7 +714,7 @@</div><div class='ctx'> 		tmu_cpu2: tmu@10068000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-tmu-ext-triminfo";</div><div class='ctx'> 			reg = &lt;0x10068000 0x100&gt;, &lt;0x1006c000 0x4&gt;;</div><div class='del'>-			interrupts = &lt;0 184 0&gt;;</div><div class='add'>+			interrupts = &lt;0 184 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_TMU&gt;, &lt;&amp;clock CLK_TMU&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif", "tmu_triminfo_apbif";</div><div class='ctx'> 			#include "exynos4412-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -718,7 +723,7 @@</div><div class='ctx'> 		tmu_cpu3: tmu@1006c000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-tmu-ext-triminfo";</div><div class='ctx'> 			reg = &lt;0x1006c000 0x100&gt;, &lt;0x100a0000 0x4&gt;;</div><div class='del'>-			interrupts = &lt;0 185 0&gt;;</div><div class='add'>+			interrupts = &lt;0 185 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_TMU&gt;, &lt;&amp;clock CLK_TMU_GPU&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif", "tmu_triminfo_apbif";</div><div class='ctx'> 			#include "exynos4412-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -727,7 +732,7 @@</div><div class='ctx'> 		tmu_gpu: tmu@100a0000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-tmu-ext-triminfo";</div><div class='ctx'> 			reg = &lt;0x100a0000 0x100&gt;, &lt;0x10068000 0x4&gt;;</div><div class='del'>-			interrupts = &lt;0 215 0&gt;;</div><div class='add'>+			interrupts = &lt;0 215 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_TMU_GPU&gt;, &lt;&amp;clock CLK_TMU&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif", "tmu_triminfo_apbif";</div><div class='ctx'> 			#include "exynos4412-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -799,7 +804,7 @@</div><div class='ctx'> 		sysmmu_scaler1r: sysmmu@0x12890000 {</div><div class='ctx'> 			compatible = "samsung,exynos-sysmmu";</div><div class='ctx'> 			reg = &lt;0x12890000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 186 0&gt;;</div><div class='add'>+			interrupts = &lt;0 186 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clock-names = "sysmmu", "master";</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_SMMU_MSCL1&gt;, &lt;&amp;clock CLK_MSCL1&gt;;</div><div class='ctx'> 			#iommu-cells = &lt;0&gt;;</div><div class='hunk'>@@ -808,7 +813,7 @@</div><div class='ctx'> 		sysmmu_scaler2r: sysmmu@0x128A0000 {</div><div class='ctx'> 			compatible = "samsung,exynos-sysmmu";</div><div class='ctx'> 			reg = &lt;0x128A0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 188 0&gt;;</div><div class='add'>+			interrupts = &lt;0 188 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clock-names = "sysmmu", "master";</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_SMMU_MSCL2&gt;, &lt;&amp;clock CLK_MSCL2&gt;;</div><div class='ctx'> 			#iommu-cells = &lt;0&gt;;</div><div class='hunk'>@@ -867,7 +872,7 @@</div><div class='ctx'> 		sysmmu_jpeg1: sysmmu@0x11F20000 {</div><div class='ctx'> 			compatible = "samsung,exynos-sysmmu";</div><div class='ctx'> 			reg = &lt;0x11F20000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 169 0&gt;;</div><div class='add'>+			interrupts = &lt;0 169 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clock-names = "sysmmu", "master";</div><div class='ctx'> 			clocks = &lt;&amp;clock CLK_SMMU_JPEG2&gt;, &lt;&amp;clock CLK_JPEG2&gt;;</div><div class='ctx'> 			#iommu-cells = &lt;0&gt;;</div><div class='hunk'>@@ -1406,21 +1411,29 @@</div><div class='ctx'> &amp;serial_0 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART0&gt;, &lt;&amp;clock CLK_SCLK_UART0&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma0 13&gt;, &lt;&amp;pdma0 14&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;serial_1 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART1&gt;, &lt;&amp;clock CLK_SCLK_UART1&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma1 15&gt;, &lt;&amp;pdma1 16&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;serial_2 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART2&gt;, &lt;&amp;clock CLK_SCLK_UART2&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma0 15&gt;, &lt;&amp;pdma0 16&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;serial_3 {</div><div class='ctx'> 	clocks = &lt;&amp;clock CLK_UART3&gt;, &lt;&amp;clock CLK_SCLK_UART3&gt;;</div><div class='ctx'> 	clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+	dmas = &lt;&amp;pdma1 17&gt;, &lt;&amp;pdma1 18&gt;;</div><div class='add'>+	dma-names = "rx", "tx";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;sss {</div><div class='hunk'>@@ -1445,7 +1458,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbdrd_dwc3_1 {</div><div class='del'>-	interrupts = &lt;GIC_SPI 73 0&gt;;</div><div class='add'>+	interrupts = &lt;GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbdrd_phy1 {</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi<br/>index 246d298557f5..05b9afdd6757 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi</a></div><div class='hunk'>@@ -147,6 +147,11 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;adc {</div><div class='add'>+	vdd-supply = &lt;&amp;ldo4_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;bus_wcore {</div><div class='ctx'> 	devfreq-events = &lt;&amp;nocp_mem0_0&gt;, &lt;&amp;nocp_mem0_1&gt;,</div><div class='ctx'> 			&lt;&amp;nocp_mem1_0&gt;, &lt;&amp;nocp_mem1_1&gt;;</div><div class='hunk'>@@ -293,6 +298,12 @@</div><div class='ctx'> 				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			ldo4_reg: LDO4 {</div><div class='add'>+				regulator-name = "vdd_adc";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			ldo5_reg: LDO5 {</div><div class='ctx'> 				regulator-name = "vdd_ldo5";</div><div class='ctx'> 				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='hunk'>@@ -499,7 +510,6 @@</div><div class='ctx'> &amp;mmc_0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	mmc-pwrseq = &lt;&amp;emmc_pwrseq&gt;;</div><div class='del'>-	cd-gpios = &lt;&amp;gpc0 2 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	card-detect-delay = &lt;200&gt;;</div><div class='ctx'> 	samsung,dw-mshc-ciu-div = &lt;3&gt;;</div><div class='ctx'> 	samsung,dw-mshc-sdr-timing = &lt;0 4&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi<br/>index e6bffd13cedd..77d35bb92950 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5440.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5440.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5440.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5440.dtsi</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/exynos5440.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "samsung,exynos5440", "samsung,exynos5";</div><div class='hunk'>@@ -38,10 +40,11 @@</div><div class='ctx'> 		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg =	&lt;0x2E1000 0x1000&gt;,</div><div class='del'>-			&lt;0x2E2000 0x1000&gt;,</div><div class='add'>+			&lt;0x2E2000 0x2000&gt;,</div><div class='ctx'> 			&lt;0x2E4000 0x2000&gt;,</div><div class='ctx'> 			&lt;0x2E6000 0x2000&gt;;</div><div class='del'>-		interrupts = &lt;1 9 0xf04&gt;;</div><div class='add'>+		interrupts = &lt;GIC_PPI 9</div><div class='add'>+				(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='hunk'>@@ -72,26 +75,26 @@</div><div class='ctx'> </div><div class='ctx'> 	arm-pmu {</div><div class='ctx'> 		compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu";</div><div class='del'>-		interrupts = &lt;0 52 4&gt;,</div><div class='del'>-			     &lt;0 53 4&gt;,</div><div class='del'>-			     &lt;0 54 4&gt;,</div><div class='del'>-			     &lt;0 55 4&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	timer {</div><div class='ctx'> 		compatible = "arm,cortex-a15-timer",</div><div class='ctx'> 			     "arm,armv7-timer";</div><div class='del'>-		interrupts = &lt;1 13 0xf08&gt;,</div><div class='del'>-			     &lt;1 14 0xf08&gt;,</div><div class='del'>-			     &lt;1 11 0xf08&gt;,</div><div class='del'>-			     &lt;1 10 0xf08&gt;;</div><div class='add'>+		interrupts = &lt;GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='ctx'> 		clock-frequency = &lt;50000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpufreq@160000 {</div><div class='ctx'> 		compatible = "samsung,exynos5440-cpufreq";</div><div class='ctx'> 		reg = &lt;0x160000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 57 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		operating-points = &lt;</div><div class='ctx'> 				/* KHz	  uV */</div><div class='ctx'> 				1500000 1100000</div><div class='hunk'>@@ -108,7 +111,7 @@</div><div class='ctx'> 	serial_0: serial@B0000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 		reg = &lt;0xB0000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 2 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_B_125&gt;, &lt;&amp;clock CLK_B_125&gt;;</div><div class='ctx'> 		clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -116,7 +119,7 @@</div><div class='ctx'> 	serial_1: serial@C0000 {</div><div class='ctx'> 		compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 		reg = &lt;0xC0000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 3 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_B_125&gt;, &lt;&amp;clock CLK_B_125&gt;;</div><div class='ctx'> 		clock-names = "uart", "clk_uart_baud0";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -124,7 +127,7 @@</div><div class='ctx'> 	spi_0: spi@D0000 {</div><div class='ctx'> 		compatible = "samsung,exynos5440-spi";</div><div class='ctx'> 		reg = &lt;0xD0000 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 4 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		samsung,spi-src-clk = &lt;0&gt;;</div><div class='hunk'>@@ -136,8 +139,14 @@</div><div class='ctx'> 	pin_ctrl: pinctrl@E0000 {</div><div class='ctx'> 		compatible = "samsung,exynos5440-pinctrl";</div><div class='ctx'> 		reg = &lt;0xE0000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 37 0&gt;, &lt;0 38 0&gt;, &lt;0 39 0&gt;, &lt;0 40 0&gt;,</div><div class='del'>-			     &lt;0 41 0&gt;, &lt;0 42 0&gt;, &lt;0 43 0&gt;, &lt;0 44 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> 		#gpio-cells = &lt;2&gt;;</div><div class='hunk'>@@ -162,7 +171,7 @@</div><div class='ctx'> 	i2c@F0000 {</div><div class='ctx'> 		compatible = "samsung,exynos5440-i2c";</div><div class='ctx'> 		reg = &lt;0xF0000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 5 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_B_125&gt;;</div><div class='hunk'>@@ -172,7 +181,7 @@</div><div class='ctx'> 	i2c@100000 {</div><div class='ctx'> 		compatible = "samsung,exynos5440-i2c";</div><div class='ctx'> 		reg = &lt;0x100000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 6 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_B_125&gt;;</div><div class='hunk'>@@ -182,16 +191,16 @@</div><div class='ctx'> 	watchdog@110000 {</div><div class='ctx'> 		compatible = "samsung,s3c2410-wdt";</div><div class='ctx'> 		reg = &lt;0x110000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 1 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_B_125&gt;;</div><div class='ctx'> 		clock-names = "watchdog";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gmac: ethernet@00230000 {</div><div class='del'>-		compatible = "snps,dwmac-3.70a";</div><div class='add'>+		compatible = "snps,dwmac-3.70a", "snps,dwmac";</div><div class='ctx'> 		reg = &lt;0x00230000 0x8000&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-		interrupts = &lt;0 31 4&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 31 4&gt;;</div><div class='ctx'> 		interrupt-names = "macirq";</div><div class='ctx'> 		phy-mode = "sgmii";</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_GMAC0&gt;;</div><div class='hunk'>@@ -209,7 +218,8 @@</div><div class='ctx'> 	rtc@130000 {</div><div class='ctx'> 		compatible = "samsung,s3c6410-rtc";</div><div class='ctx'> 		reg = &lt;0x130000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 17 0&gt;, &lt;0 16 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_B_125&gt;;</div><div class='ctx'> 		clock-names = "rtc";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -217,7 +227,7 @@</div><div class='ctx'> 	tmuctrl_0: tmuctrl@160118 {</div><div class='ctx'> 		compatible = "samsung,exynos5440-tmu";</div><div class='ctx'> 		reg = &lt;0x160118 0x230&gt;, &lt;0x160368 0x10&gt;;</div><div class='del'>-		interrupts = &lt;0 58 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_B_125&gt;;</div><div class='ctx'> 		clock-names = "tmu_apbif";</div><div class='ctx'> 		#include "exynos5440-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -226,7 +236,7 @@</div><div class='ctx'> 	tmuctrl_1: tmuctrl@16011C {</div><div class='ctx'> 		compatible = "samsung,exynos5440-tmu";</div><div class='ctx'> 		reg = &lt;0x16011C 0x230&gt;, &lt;0x160368 0x10&gt;;</div><div class='del'>-		interrupts = &lt;0 58 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_B_125&gt;;</div><div class='ctx'> 		clock-names = "tmu_apbif";</div><div class='ctx'> 		#include "exynos5440-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -235,7 +245,7 @@</div><div class='ctx'> 	tmuctrl_2: tmuctrl@160120 {</div><div class='ctx'> 		compatible = "samsung,exynos5440-tmu";</div><div class='ctx'> 		reg = &lt;0x160120 0x230&gt;, &lt;0x160368 0x10&gt;;</div><div class='del'>-		interrupts = &lt;0 58 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_B_125&gt;;</div><div class='ctx'> 		clock-names = "tmu_apbif";</div><div class='ctx'> 		#include "exynos5440-tmu-sensor-conf.dtsi"</div><div class='hunk'>@@ -259,7 +269,7 @@</div><div class='ctx'> 	sata@210000 {</div><div class='ctx'> 		compatible = "snps,exynos5440-ahci";</div><div class='ctx'> 		reg = &lt;0x210000 0x10000&gt;;</div><div class='del'>-		interrupts = &lt;0 30 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_SATA&gt;;</div><div class='ctx'> 		clock-names = "sata";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -267,7 +277,7 @@</div><div class='ctx'> 	ohci@220000 {</div><div class='ctx'> 		compatible = "samsung,exynos5440-ohci";</div><div class='ctx'> 		reg = &lt;0x220000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 29 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_USB&gt;;</div><div class='ctx'> 		clock-names = "usbhost";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -275,7 +285,7 @@</div><div class='ctx'> 	ehci@221000 {</div><div class='ctx'> 		compatible = "samsung,exynos5440-ehci";</div><div class='ctx'> 		reg = &lt;0x221000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;0 29 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_USB&gt;;</div><div class='ctx'> 		clock-names = "usbhost";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -285,7 +295,9 @@</div><div class='ctx'> 		reg = &lt;0x290000 0x1000</div><div class='ctx'> 			0x270000 0x1000</div><div class='ctx'> 			0x271000 0x40&gt;;</div><div class='del'>-		interrupts = &lt;0 20 0&gt;, &lt;0 21 0&gt;, &lt;0 22 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_PR0_250_O&gt;, &lt;&amp;clock CLK_PB0_250_O&gt;;</div><div class='ctx'> 		clock-names = "pcie", "pcie_bus";</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='hunk'>@@ -306,7 +318,9 @@</div><div class='ctx'> 		reg = &lt;0x2a0000 0x1000</div><div class='ctx'> 			0x272000 0x1000</div><div class='ctx'> 			0x271040 0x40&gt;;</div><div class='del'>-		interrupts = &lt;0 23 0&gt;, &lt;0 24 0&gt;, &lt;0 25 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clock CLK_PR1_250_O&gt;, &lt;&amp;clock CLK_PB0_250_O&gt;;</div><div class='ctx'> 		clock-names = "pcie", "pcie_bus";</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos54xx.dtsi b/arch/arm/boot/dts/exynos54xx.dtsi<br/>index 9d31cdce1959..0389e8a10d0b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos54xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos54xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos54xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos54xx.dtsi</a></div><div class='hunk'>@@ -62,34 +62,34 @@</div><div class='ctx'> 						&lt;1 &amp;combiner 23 4&gt;,</div><div class='ctx'> 						&lt;2 &amp;combiner 25 2&gt;,</div><div class='ctx'> 						&lt;3 &amp;combiner 25 3&gt;,</div><div class='del'>-						&lt;4 &amp;gic 0 120 0&gt;,</div><div class='del'>-						&lt;5 &amp;gic 0 121 0&gt;,</div><div class='del'>-						&lt;6 &amp;gic 0 122 0&gt;,</div><div class='del'>-						&lt;7 &amp;gic 0 123 0&gt;,</div><div class='del'>-						&lt;8 &amp;gic 0 128 0&gt;,</div><div class='del'>-						&lt;9 &amp;gic 0 129 0&gt;,</div><div class='del'>-						&lt;10 &amp;gic 0 130 0&gt;,</div><div class='del'>-						&lt;11 &amp;gic 0 131 0&gt;;</div><div class='add'>+						&lt;4 &amp;gic 0 120 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+						&lt;5 &amp;gic 0 121 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+						&lt;6 &amp;gic 0 122 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+						&lt;7 &amp;gic 0 123 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+						&lt;8 &amp;gic 0 128 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+						&lt;9 &amp;gic 0 129 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+						&lt;10 &amp;gic 0 130 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+						&lt;11 &amp;gic 0 131 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		watchdog: watchdog@101d0000 {</div><div class='ctx'> 			compatible = "samsung,exynos5420-wdt";</div><div class='ctx'> 			reg = &lt;0x101d0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 42 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sss: sss@10830000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-secss";</div><div class='ctx'> 			reg = &lt;0x10830000 0x300&gt;;</div><div class='del'>-			interrupts = &lt;0 112 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* i2c_0-3 are defined in exynos5.dtsi */</div><div class='ctx'> 		hsi2c_4: i2c@12ca0000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-hsi2c";</div><div class='ctx'> 			reg = &lt;0x12ca0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 60 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -98,7 +98,7 @@</div><div class='ctx'> 		hsi2c_5: i2c@12cb0000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-hsi2c";</div><div class='ctx'> 			reg = &lt;0x12cb0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 61 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -107,7 +107,7 @@</div><div class='ctx'> 		hsi2c_6: i2c@12cc0000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-hsi2c";</div><div class='ctx'> 			reg = &lt;0x12cc0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 62 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -116,7 +116,7 @@</div><div class='ctx'> 		hsi2c_7: i2c@12cd0000 {</div><div class='ctx'> 			compatible = "samsung,exynos5250-hsi2c";</div><div class='ctx'> 			reg = &lt;0x12cd0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 63 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -131,7 +131,7 @@</div><div class='ctx'> 			usbdrd_dwc3_0: dwc3@12000000 {</div><div class='ctx'> 				compatible = "snps,dwc3";</div><div class='ctx'> 				reg = &lt;0x12000000 0x10000&gt;;</div><div class='del'>-				interrupts = &lt;0 72 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				phys = &lt;&amp;usbdrd_phy0 0&gt;, &lt;&amp;usbdrd_phy0 1&gt;;</div><div class='ctx'> 				phy-names = "usb2-phy", "usb3-phy";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -166,7 +166,7 @@</div><div class='ctx'> 		usbhost2: usb@12110000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-ehci";</div><div class='ctx'> 			reg = &lt;0x12110000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 71 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -179,7 +179,7 @@</div><div class='ctx'> 		usbhost1: usb@12120000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-ohci";</div><div class='ctx'> 			reg = &lt;0x12120000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 71 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts<br/>index 01f466816fea..f9ff7f07ae0c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5800-peach-pi.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/exynos5800-peach-pi.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/exynos5800-peach-pi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/exynos5800-peach-pi.dts</a></div><div class='hunk'>@@ -665,6 +665,7 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* eMMC flash */</div><div class='ctx'> &amp;mmc_0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='hunk'>@@ -683,6 +684,7 @@</div><div class='ctx'> 	bus-width = &lt;8&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* WiFi SDIO module */</div><div class='ctx'> &amp;mmc_1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='hunk'>@@ -702,6 +704,7 @@</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;buck10_reg&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* uSD card */</div><div class='ctx'> &amp;mmc_2 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi<br/>index c85d07e6db61..541d70094544 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/hi3620.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/hi3620.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/hi3620.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/hi3620.dtsi</a></div><div class='hunk'>@@ -11,10 +11,12 @@</div><div class='ctx'>  * publishhed by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include &lt;dt-bindings/clock/hi3620-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial0 = &amp;uart0;</div><div class='ctx'> 		serial1 = &amp;uart1;</div><div class='hunk'>@@ -537,6 +539,7 @@</div><div class='ctx'> 			reg = &lt;0x803000 0x188&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 			#gpio-range-cells = &lt;3&gt;;</div><div class='ctx'> 			ranges;</div><div class='ctx'> </div><div class='hunk'>@@ -558,6 +561,7 @@</div><div class='ctx'> 			reg = &lt;0x803800 0x2dc&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 			ranges;</div><div class='ctx'> </div><div class='ctx'> 			pinctrl-single,register-width = &lt;32&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/hip01.dtsi b/arch/arm/boot/dts/hip01.dtsi<br/>index 4e9562f806a2..9d5fd5cfefa6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/hip01.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/hip01.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/hip01.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/hip01.dtsi</a></div><div class='hunk'>@@ -11,8 +11,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='del'>-</div><div class='ctx'> / {</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 	#address-cells = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/hisi-x5hd2.dtsi b/arch/arm/boot/dts/hisi-x5hd2.dtsi<br/>index fdcc23d203e5..6c712a97e1fe 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/hisi-x5hd2.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/hisi-x5hd2.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/hisi-x5hd2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/hisi-x5hd2.dtsi</a></div><div class='hunk'>@@ -7,10 +7,12 @@</div><div class='ctx'>  * publishhed by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include &lt;dt-bindings/clock/hix5hd2-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial0 = &amp;uart0;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -436,18 +438,20 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		gmac0: ethernet@1840000 {</div><div class='del'>-			compatible = "hisilicon,hix5hd2-gmac";</div><div class='add'>+			compatible = "hisilicon,hix5hd2-gmac", "hisilicon,hisi-gmac-v1";</div><div class='ctx'> 			reg = &lt;0x1840000 0x1000&gt;,&lt;0x184300c 0x4&gt;;</div><div class='ctx'> 			interrupts = &lt;0 71 4&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock HIX5HD2_MAC0_CLK&gt;;</div><div class='add'>+			clock-names = "mac_core";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		gmac1: ethernet@1841000 {</div><div class='del'>-			compatible = "hisilicon,hix5hd2-gmac";</div><div class='add'>+			compatible = "hisilicon,hix5hd2-gmac", "hisilicon,hisi-gmac-v1";</div><div class='ctx'> 			reg = &lt;0x1841000 0x1000&gt;,&lt;0x1843010 0x4&gt;;</div><div class='ctx'> 			interrupts = &lt;0 72 4&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock HIX5HD2_MAC1_CLK&gt;;</div><div class='add'>+			clock-names = "mac_core";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx1-ads.dts b/arch/arm/boot/dts/imx1-ads.dts<br/>index f50498659cc3..5ea28ee07cf4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx1-ads.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx1-ads.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx1-ads.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx1-ads.dts</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> </div><div class='ctx'> &amp;cspi1 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_cspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 15 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/imx1.dtsi b/arch/arm/boot/dts/imx1.dtsi<br/>index 22f5d1db5b31..38d712be5685 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx1.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx1.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx1.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx1.dtsi</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * http://www.gnu.org/copyleft/gpl.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include "imx1-pinfunc.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/imx1-clock.h&gt;</div><div class='hunk'>@@ -17,6 +16,17 @@</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		gpio0 = &amp;gpio1;</div><div class='ctx'> 		gpio1 = &amp;gpio2;</div><div class='hunk'>@@ -41,8 +51,9 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='del'>-		cpu: cpu@0 {</div><div class='add'>+		cpu@0 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='ctx'> 			compatible = "arm,arm920t";</div><div class='ctx'> 			operating-points = &lt;200000 1900000&gt;;</div><div class='ctx'> 			clock-latency = &lt;62500&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi<br/>index 440ee9a4a158..10d57f9cbb42 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx23.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx23.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx23.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx23.dtsi</a></div><div class='hunk'>@@ -9,11 +9,21 @@</div><div class='ctx'>  * http://www.gnu.org/copyleft/gpl.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include "imx23-pinfunc.h"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='ctx'> 	interrupt-parent = &lt;&amp;icoll&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		gpio0 = &amp;gpio0;</div><div class='hunk'>@@ -27,12 +37,13 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='del'>-		#address-cells = &lt;0&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		cpu {</div><div class='add'>+		cpu@0 {</div><div class='ctx'> 			compatible = "arm,arm926ej-s";</div><div class='ctx'> 			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -464,7 +475,7 @@</div><div class='ctx'> 				reg = &lt;0x80038000 0x2000&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='del'>-                };</div><div class='add'>+		};</div><div class='ctx'> </div><div class='ctx'> 		apbx@80040000 {</div><div class='ctx'> 			compatible = "simple-bus";</div><div class='head'>diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi<br/>index af6af8741fe5..e0ba55016a04 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx25.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx25.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx25.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx25.dtsi</a></div><div class='hunk'>@@ -9,10 +9,20 @@</div><div class='ctx'>  * http://www.gnu.org/copyleft/gpl.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include "imx25-pinfunc.h"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;fec;</div><div class='ctx'> 		gpio0 = &amp;gpio1;</div><div class='hunk'>@@ -41,12 +51,13 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='del'>-		#address-cells = &lt;0&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		cpu {</div><div class='add'>+		cpu@0 {</div><div class='ctx'> 			compatible = "arm,arm926ej-s";</div><div class='ctx'> 			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -558,7 +569,7 @@</div><div class='ctx'> 				reg = &lt;0x53ffc000 0x4000&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks 81&gt;;</div><div class='ctx'> 				clock-names = "ipg";</div><div class='del'>-				interrupts = &lt;25&gt;;</div><div class='add'>+				interrupts = &lt;25 56&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx27-apf27dev.dts b/arch/arm/boot/dts/imx27-apf27dev.dts<br/>index bba3f41b89ef..5f84b598e0d0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-apf27dev.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx27-apf27dev.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-apf27dev.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-apf27dev.dts</a></div><div class='hunk'>@@ -77,7 +77,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 28 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_cspi1 &amp;pinctrl_cspi1_cs&gt;;</div><div class='hunk'>@@ -95,7 +94,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cspi2 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;3&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 21 GPIO_ACTIVE_LOW&gt;,</div><div class='ctx'> 		   &lt;&amp;gpio4 27 GPIO_ACTIVE_LOW&gt;,</div><div class='ctx'> 		   &lt;&amp;gpio2 17 GPIO_ACTIVE_LOW&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts b/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts<br/>index 27846ff9bb0d..f56535768ee8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts</a></div><div class='hunk'>@@ -81,7 +81,6 @@</div><div class='ctx'> </div><div class='ctx'> &amp;cspi1 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_cspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 28 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx27-pdk.dts b/arch/arm/boot/dts/imx27-pdk.dts<br/>index d0ef496a1af8..96f442ba6d22 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-pdk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx27-pdk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-pdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-pdk.dts</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> &amp;cspi2 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_cspi2&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 21 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi<br/>index 1b6248079682..4f3e0f473581 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 28 GPIO_ACTIVE_HIGH&gt;,</div><div class='ctx'> 		   &lt;&amp;gpio4 27 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts<br/>index cf09e72aeb06..2a9198f99a8d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts</a></div><div class='hunk'>@@ -69,7 +69,6 @@</div><div class='ctx'> </div><div class='ctx'> &amp;cspi1 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_cspi1&gt;, &lt;&amp;pinctrl_cspi1cs1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 28 GPIO_ACTIVE_HIGH&gt;,</div><div class='ctx'> 		   &lt;&amp;gpio4 27 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi<br/>index b4e955e3be8d..82fec935ce83 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi</a></div><div class='hunk'>@@ -75,7 +75,6 @@</div><div class='ctx'> &amp;cspi1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_cspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 28 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi<br/>index f818ea483aeb..15d85f1f85fd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx27.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx27.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx27.dtsi</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * http://www.gnu.org/copyleft/gpl.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include "imx27-pinfunc.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/imx27-clock.h&gt;</div><div class='hunk'>@@ -18,6 +17,17 @@</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;fec;</div><div class='ctx'> 		gpio0 = &amp;gpio1;</div><div class='hunk'>@@ -63,6 +73,7 @@</div><div class='ctx'> </div><div class='ctx'> 		cpu: cpu@0 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='ctx'> 			compatible = "arm,arm926ej-s";</div><div class='ctx'> 			operating-points = &lt;</div><div class='ctx'> 				/* kHz uV */</div><div class='head'>diff --git a/arch/arm/boot/dts/imx28-m28.dtsi b/arch/arm/boot/dts/imx28-m28.dtsi<br/>index 214bb1506b53..a69856e41ba4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx28-m28.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx28-m28.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx28-m28.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx28-m28.dtsi</a></div><div class='hunk'>@@ -12,8 +12,8 @@</div><div class='ctx'> #include "imx28.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	model = "DENX M28";</div><div class='del'>-	compatible = "denx,m28", "fsl,imx28";</div><div class='add'>+	model = "Aries/DENX M28";</div><div class='add'>+	compatible = "aries,m28", "denx,m28", "fsl,imx28";</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='ctx'> 		reg = &lt;0x40000000 0x08000000&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts<br/>index 8d04e57039bc..dbfb8aab505f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx28-m28evk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx28-m28evk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx28-m28evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx28-m28evk.dts</a></div><div class='hunk'>@@ -13,8 +13,8 @@</div><div class='ctx'> #include "imx28-m28.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	model = "DENX M28EVK";</div><div class='del'>-	compatible = "denx,m28evk", "fsl,imx28";</div><div class='add'>+	model = "Aries/DENX M28EVK";</div><div class='add'>+	compatible = "aries,m28evk", "denx,m28evk", "fsl,imx28";</div><div class='ctx'> </div><div class='ctx'> 	apb@80000000 {</div><div class='ctx'> 		apbh@80000000 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi<br/>index 0ad893bf5f43..148fcf4d3b98 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx28.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx28.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx28.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx28.dtsi</a></div><div class='hunk'>@@ -10,11 +10,21 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include "imx28-pinfunc.h"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='ctx'> 	interrupt-parent = &lt;&amp;icoll&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;mac0;</div><div class='hunk'>@@ -38,12 +48,13 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='del'>-		#address-cells = &lt;0&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		cpu {</div><div class='add'>+		cpu@0 {</div><div class='ctx'> 			compatible = "arm,arm926ej-s";</div><div class='ctx'> 			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1068,6 +1079,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			saif0: saif@80042000 {</div><div class='add'>+				#sound-dai-cells = &lt;0&gt;;</div><div class='ctx'> 				compatible = "fsl,imx28-saif";</div><div class='ctx'> 				reg = &lt;0x80042000 0x2000&gt;;</div><div class='ctx'> 				interrupts = &lt;59&gt;;</div><div class='hunk'>@@ -1084,6 +1096,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			saif1: saif@80046000 {</div><div class='add'>+				#sound-dai-cells = &lt;0&gt;;</div><div class='ctx'> 				compatible = "fsl,imx28-saif";</div><div class='ctx'> 				reg = &lt;0x80046000 0x2000&gt;;</div><div class='ctx'> 				interrupts = &lt;58&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi<br/>index 1ce7ae94e7ad..a72031407ebd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx31.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx31.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx31.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx31.dtsi</a></div><div class='hunk'>@@ -9,9 +9,18 @@</div><div class='ctx'>  * http://www.gnu.org/copyleft/gpl.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='del'>-</div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial0 = &amp;uart1;</div><div class='ctx'> 		serial1 = &amp;uart2;</div><div class='hunk'>@@ -21,20 +30,21 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='del'>-		#address-cells = &lt;0&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		cpu {</div><div class='add'>+		cpu@0 {</div><div class='ctx'> 			compatible = "arm,arm1136jf-s";</div><div class='ctx'> 			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	avic: avic-interrupt-controller@60000000 {</div><div class='add'>+	avic: interrupt-controller@68000000 {</div><div class='ctx'> 		compatible = "fsl,imx31-avic", "fsl,avic";</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		reg = &lt;0x60000000 0x100000&gt;;</div><div class='add'>+		reg = &lt;0x68000000 0x100000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc {</div><div class='hunk'>@@ -118,13 +128,6 @@</div><div class='ctx'> 				interrupts = &lt;19&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks 25&gt;;</div><div class='ctx'> 			};</div><div class='del'>-</div><div class='del'>-			clks: ccm@53f80000{</div><div class='del'>-				compatible = "fsl,imx31-ccm";</div><div class='del'>-				reg = &lt;0x53f80000 0x4000&gt;;</div><div class='del'>-				interrupts = &lt;0 31 0x04 0 53 0x04&gt;;</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		aips@53f00000 { /* AIPS2 */</div><div class='hunk'>@@ -134,6 +137,13 @@</div><div class='ctx'> 			reg = &lt;0x53f00000 0x100000&gt;;</div><div class='ctx'> 			ranges;</div><div class='ctx'> </div><div class='add'>+			clks: ccm@53f80000{</div><div class='add'>+				compatible = "fsl,imx31-ccm";</div><div class='add'>+				reg = &lt;0x53f80000 0x4000&gt;;</div><div class='add'>+				interrupts = &lt;31&gt;, &lt;53&gt;;</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			gpt: timer@53f90000 {</div><div class='ctx'> 				compatible = "fsl,imx31-gpt";</div><div class='ctx'> 				reg = &lt;0x53f90000 0x4000&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi<br/>index f812d586c5ce..6d5e6a60bee7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx35.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx35.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx35.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx35.dtsi</a></div><div class='hunk'>@@ -8,10 +8,20 @@</div><div class='ctx'>  * Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include "imx35-pinfunc.h"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;fec;</div><div class='ctx'> 		gpio0 = &amp;gpio1;</div><div class='hunk'>@@ -25,12 +35,13 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='del'>-		#address-cells = &lt;0&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		cpu {</div><div class='add'>+		cpu@0 {</div><div class='ctx'> 			compatible = "arm,arm1136jf-s";</div><div class='ctx'> 			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx50-evk.dts b/arch/arm/boot/dts/imx50-evk.dts<br/>index 27d763c7a307..dba2d951aa15 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx50-evk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx50-evk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx50-evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx50-evk.dts</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> &amp;cspi {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_cspi&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 11 0&gt;, &lt;&amp;gpio4 13 0&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi<br/>index 8fe8beeb68a4..ceae909e2201 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx50.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx50.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx50.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx50.dtsi</a></div><div class='hunk'>@@ -11,11 +11,21 @@</div><div class='ctx'>  * http://www.gnu.org/copyleft/gpl.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include "imx50-pinfunc.h"</div><div class='ctx'> #include &lt;dt-bindings/clock/imx5-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;fec;</div><div class='ctx'> 		gpio0 = &amp;gpio1;</div><div class='hunk'>@@ -103,8 +113,8 @@</div><div class='ctx'> 					reg = &lt;0x50004000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;1&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC1_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC1_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC1_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					bus-width = &lt;4&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='hunk'>@@ -115,8 +125,8 @@</div><div class='ctx'> 					reg = &lt;0x50008000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;2&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC2_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC2_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC2_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					bus-width = &lt;4&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='hunk'>@@ -127,7 +137,7 @@</div><div class='ctx'> 					reg = &lt;0x5000c000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;33&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_UART3_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_UART3_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_UART3_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "per";</div><div class='ctx'> 					status = "disabled";</div><div class='ctx'> 				};</div><div class='hunk'>@@ -139,7 +149,7 @@</div><div class='ctx'> 					reg = &lt;0x50010000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;36&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ECSPI1_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ECSPI1_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ECSPI1_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "per";</div><div class='ctx'> 					status = "disabled";</div><div class='ctx'> 				};</div><div class='hunk'>@@ -164,8 +174,8 @@</div><div class='ctx'> 					reg = &lt;0x50020000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;3&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC3_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC3_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC3_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					bus-width = &lt;4&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='hunk'>@@ -176,8 +186,8 @@</div><div class='ctx'> 					reg = &lt;0x50024000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;4&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC4_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC4_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC4_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					bus-width = &lt;4&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='hunk'>@@ -279,7 +289,7 @@</div><div class='ctx'> 				reg = &lt;0x53fa0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;39&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_GPT_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_GPT_HF_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_GPT_HF_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -298,7 +308,7 @@</div><div class='ctx'> 				compatible = "fsl,imx50-pwm", "fsl,imx27-pwm";</div><div class='ctx'> 				reg = &lt;0x53fb4000 0x4000&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_PWM1_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_PWM1_HF_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_PWM1_HF_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				interrupts = &lt;61&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -308,7 +318,7 @@</div><div class='ctx'> 				compatible = "fsl,imx50-pwm", "fsl,imx27-pwm";</div><div class='ctx'> 				reg = &lt;0x53fb8000 0x4000&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_PWM2_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_PWM2_HF_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_PWM2_HF_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				interrupts = &lt;94&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -318,7 +328,7 @@</div><div class='ctx'> 				reg = &lt;0x53fbc000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;31&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_UART1_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_UART1_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_UART1_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -328,7 +338,7 @@</div><div class='ctx'> 				reg = &lt;0x53fc0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;32&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_UART2_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_UART2_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_UART2_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -383,7 +393,7 @@</div><div class='ctx'> 				reg = &lt;0x53ff0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;13&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_UART4_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_UART4_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_UART4_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -401,7 +411,7 @@</div><div class='ctx'> 				reg = &lt;0x63f90000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;86&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_UART5_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_UART5_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_UART5_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -420,7 +430,7 @@</div><div class='ctx'> 				reg = &lt;0x63fac000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;37&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_ECSPI2_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_ECSPI2_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_ECSPI2_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -430,7 +440,7 @@</div><div class='ctx'> 				reg = &lt;0x63fb0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;6&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_SDMA_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_SDMA_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_SDMA_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "ahb";</div><div class='ctx'> 				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx50.bin";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -442,7 +452,7 @@</div><div class='ctx'> 				reg = &lt;0x63fc0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;38&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_CSPI_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_CSPI_IPG_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_CSPI_IPG_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -492,8 +502,8 @@</div><div class='ctx'> 				reg = &lt;0x63fec000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;87&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;,</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "ahb", "ptp";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx51-apf51dev.dts b/arch/arm/boot/dts/imx51-apf51dev.dts<br/>index 0f3fe29b816e..a5e6091c8729 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx51-apf51dev.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx51-apf51dev.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx51-apf51dev.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx51-apf51dev.dts</a></div><div class='hunk'>@@ -80,7 +80,6 @@</div><div class='ctx'> &amp;ecspi1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 24 GPIO_ACTIVE_HIGH&gt;,</div><div class='ctx'> 		   &lt;&amp;gpio4 25 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='hunk'>@@ -89,7 +88,6 @@</div><div class='ctx'> &amp;ecspi2 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi2&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 28 GPIO_ACTIVE_LOW&gt;,</div><div class='ctx'> 		   &lt;&amp;gpio3 27 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts<br/>index f097b4f29ab4..873cf242679c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx51-babbage.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx51-babbage.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx51-babbage.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx51-babbage.dts</a></div><div class='hunk'>@@ -178,7 +178,6 @@</div><div class='ctx'> &amp;ecspi1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 24 GPIO_ACTIVE_HIGH&gt;,</div><div class='ctx'> 		   &lt;&amp;gpio4 25 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi<br/>index 16fc69c69ab2..b821066a0d2a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> &amp;ecspi1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 24 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts<br/>index 728212861ece..1305b05c7ed9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts</a></div><div class='hunk'>@@ -114,7 +114,6 @@</div><div class='ctx'> &amp;ecspi1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 24 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi<br/>index f46fe9bf0bcb..1ee1d542d9ad 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx51.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx51.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx51.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx51.dtsi</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * http://www.gnu.org/copyleft/gpl.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include "imx51-pinfunc.h"</div><div class='ctx'> #include &lt;dt-bindings/clock/imx5-clock.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='hunk'>@@ -18,6 +17,17 @@</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;fec;</div><div class='ctx'> 		gpio0 = &amp;gpio1;</div><div class='hunk'>@@ -130,8 +140,8 @@</div><div class='ctx'> 			reg = &lt;0x40000000 0x20000000&gt;;</div><div class='ctx'> 			interrupts = &lt;11 10&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clks IMX5_CLK_IPU_GATE&gt;,</div><div class='del'>-			         &lt;&amp;clks IMX5_CLK_IPU_DI0_GATE&gt;,</div><div class='del'>-			         &lt;&amp;clks IMX5_CLK_IPU_DI1_GATE&gt;;</div><div class='add'>+				 &lt;&amp;clks IMX5_CLK_IPU_DI0_GATE&gt;,</div><div class='add'>+				 &lt;&amp;clks IMX5_CLK_IPU_DI1_GATE&gt;;</div><div class='ctx'> 			clock-names = "bus", "di0", "di1";</div><div class='ctx'> 			resets = &lt;&amp;src 2&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -169,8 +179,8 @@</div><div class='ctx'> 					reg = &lt;0x70004000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;1&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC1_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC1_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC1_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					status = "disabled";</div><div class='ctx'> 				};</div><div class='hunk'>@@ -180,8 +190,8 @@</div><div class='ctx'> 					reg = &lt;0x70008000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;2&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC2_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC2_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC2_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					bus-width = &lt;4&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='hunk'>@@ -192,7 +202,7 @@</div><div class='ctx'> 					reg = &lt;0x7000c000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;33&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_UART3_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_UART3_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_UART3_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "per";</div><div class='ctx'> 					status = "disabled";</div><div class='ctx'> 				};</div><div class='hunk'>@@ -204,7 +214,7 @@</div><div class='ctx'> 					reg = &lt;0x70010000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;36&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ECSPI1_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ECSPI1_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ECSPI1_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "per";</div><div class='ctx'> 					status = "disabled";</div><div class='ctx'> 				};</div><div class='hunk'>@@ -229,8 +239,8 @@</div><div class='ctx'> 					reg = &lt;0x70020000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;3&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC3_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC3_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC3_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					bus-width = &lt;4&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='hunk'>@@ -241,8 +251,8 @@</div><div class='ctx'> 					reg = &lt;0x70024000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;4&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC4_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC4_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC4_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					bus-width = &lt;4&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='hunk'>@@ -364,7 +374,7 @@</div><div class='ctx'> 				reg = &lt;0x73fa0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;39&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_GPT_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_GPT_HF_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_GPT_HF_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -378,7 +388,7 @@</div><div class='ctx'> 				compatible = "fsl,imx51-pwm", "fsl,imx27-pwm";</div><div class='ctx'> 				reg = &lt;0x73fb4000 0x4000&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_PWM1_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_PWM1_HF_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_PWM1_HF_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				interrupts = &lt;61&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -388,7 +398,7 @@</div><div class='ctx'> 				compatible = "fsl,imx51-pwm", "fsl,imx27-pwm";</div><div class='ctx'> 				reg = &lt;0x73fb8000 0x4000&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_PWM2_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_PWM2_HF_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_PWM2_HF_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				interrupts = &lt;94&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -398,7 +408,7 @@</div><div class='ctx'> 				reg = &lt;0x73fbc000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;31&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_UART1_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_UART1_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_UART1_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -408,7 +418,7 @@</div><div class='ctx'> 				reg = &lt;0x73fc0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;32&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_UART2_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_UART2_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_UART2_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -456,7 +466,7 @@</div><div class='ctx'> 				reg = &lt;0x83fac000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;37&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_ECSPI2_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_ECSPI2_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_ECSPI2_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -466,7 +476,7 @@</div><div class='ctx'> 				reg = &lt;0x83fb0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;6&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_SDMA_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_SDMA_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_SDMA_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "ahb";</div><div class='ctx'> 				#dma-cells = &lt;3&gt;;</div><div class='ctx'> 				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx51.bin";</div><div class='hunk'>@@ -479,7 +489,7 @@</div><div class='ctx'> 				reg = &lt;0x83fc0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;38&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_CSPI_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_CSPI_IPG_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_CSPI_IPG_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -582,8 +592,8 @@</div><div class='ctx'> 				reg = &lt;0x83fec000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;87&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;,</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "ahb", "ptp";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-m53.dtsi b/arch/arm/boot/dts/imx53-m53.dtsi<br/>index d259f57bfd98..ec390aa562c3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-m53.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx53-m53.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-m53.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-m53.dtsi</a></div><div class='hunk'>@@ -12,8 +12,8 @@</div><div class='ctx'> #include "imx53.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	model = "DENX M53";</div><div class='del'>-	compatible = "denx,imx53-m53", "fsl,imx53";</div><div class='add'>+	model = "Aries/DENX M53";</div><div class='add'>+	compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='ctx'> 		reg = &lt;0x70000000 0x20000000&gt;,</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts<br/>index dcee1e0f968f..4347a321c782 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-m53evk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx53-m53evk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-m53evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-m53evk.dts</a></div><div class='hunk'>@@ -13,8 +13,8 @@</div><div class='ctx'> #include "imx53-m53.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	model = "DENX M53EVK";</div><div class='del'>-	compatible = "denx,imx53-m53evk", "fsl,imx53";</div><div class='add'>+	model = "Aries/DENX M53EVK";</div><div class='add'>+	compatible = "aries,imx53-m53evk", "denx,imx53-m53evk", "fsl,imx53";</div><div class='ctx'> </div><div class='ctx'> 	display1: display@di1 {</div><div class='ctx'> 		compatible = "fsl,imx-parallel-display";</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi<br/>index c05e7cfd0cbc..40b3e31935d0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-qsb-common.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx53-qsb-common.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-qsb-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-qsb-common.dtsi</a></div><div class='hunk'>@@ -215,16 +215,16 @@</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_fec: fecgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='del'>-				MX53_PAD_FEC_MDC__FEC_MDC		0x80000000</div><div class='del'>-				MX53_PAD_FEC_MDIO__FEC_MDIO		0x80000000</div><div class='del'>-				MX53_PAD_FEC_REF_CLK__FEC_TX_CLK	0x80000000</div><div class='del'>-				MX53_PAD_FEC_RX_ER__FEC_RX_ER		0x80000000</div><div class='del'>-				MX53_PAD_FEC_CRS_DV__FEC_RX_DV		0x80000000</div><div class='del'>-				MX53_PAD_FEC_RXD1__FEC_RDATA_1		0x80000000</div><div class='del'>-				MX53_PAD_FEC_RXD0__FEC_RDATA_0		0x80000000</div><div class='del'>-				MX53_PAD_FEC_TX_EN__FEC_TX_EN		0x80000000</div><div class='del'>-				MX53_PAD_FEC_TXD1__FEC_TDATA_1		0x80000000</div><div class='del'>-				MX53_PAD_FEC_TXD0__FEC_TDATA_0		0x80000000</div><div class='add'>+				MX53_PAD_FEC_MDC__FEC_MDC		0x4</div><div class='add'>+				MX53_PAD_FEC_MDIO__FEC_MDIO		0x1fc</div><div class='add'>+				MX53_PAD_FEC_REF_CLK__FEC_TX_CLK	0x180</div><div class='add'>+				MX53_PAD_FEC_RX_ER__FEC_RX_ER		0x180</div><div class='add'>+				MX53_PAD_FEC_CRS_DV__FEC_RX_DV		0x180</div><div class='add'>+				MX53_PAD_FEC_RXD1__FEC_RDATA_1		0x180</div><div class='add'>+				MX53_PAD_FEC_RXD0__FEC_RDATA_0		0x180</div><div class='add'>+				MX53_PAD_FEC_TX_EN__FEC_TX_EN		0x4</div><div class='add'>+				MX53_PAD_FEC_TXD1__FEC_TDATA_1		0x4</div><div class='add'>+				MX53_PAD_FEC_TXD0__FEC_TDATA_0		0x4</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts<br/>index 379939699164..f4c158cce908 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-qsb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx53-qsb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-qsb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-qsb.dts</a></div><div class='hunk'>@@ -90,7 +90,6 @@</div><div class='ctx'> 			ldo7_reg: ldo7 {</div><div class='ctx'> 				regulator-min-microvolt = &lt;1200000&gt;;</div><div class='ctx'> 				regulator-max-microvolt = &lt;3600000&gt;;</div><div class='del'>-				regulator-always-on;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ldo8_reg: ldo8 {</div><div class='hunk'>@@ -113,3 +112,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;tve {</div><div class='add'>+	dac-supply = &lt;&amp;ldo7_reg&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-qsrb.dts b/arch/arm/boot/dts/imx53-qsrb.dts<br/>index 96d7eede412e..479ca4c9e384 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-qsrb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx53-qsrb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-qsrb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-qsrb.dts</a></div><div class='hunk'>@@ -130,8 +130,6 @@</div><div class='ctx'> 				regulator-name = "VDAC";</div><div class='ctx'> 				regulator-min-microvolt = &lt;2500000&gt;;</div><div class='ctx'> 				regulator-max-microvolt = &lt;2775000&gt;;</div><div class='del'>-				regulator-boot-on;</div><div class='del'>-				regulator-always-on;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			vgen1_reg: vgen1 {</div><div class='hunk'>@@ -152,3 +150,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;tve {</div><div class='add'>+	dac-supply = &lt;&amp;vdac_reg&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts<br/>index 9f5190040555..472f6f0f55b3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-smd.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx53-smd.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-smd.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-smd.dts</a></div><div class='hunk'>@@ -63,7 +63,6 @@</div><div class='ctx'> &amp;ecspi1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio2 30 0&gt;, &lt;&amp;gpio3 19 0&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-tqma53.dtsi b/arch/arm/boot/dts/imx53-tqma53.dtsi<br/>index 91a6a9ff50d7..85972f2201c2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-tqma53.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx53-tqma53.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-tqma53.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-tqma53.dtsi</a></div><div class='hunk'>@@ -55,7 +55,6 @@</div><div class='ctx'> &amp;ecspi1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;4&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio2 30 0&gt;, &lt;&amp;gpio3 19 0&gt;,</div><div class='ctx'> 		   &lt;&amp;gpio3 24 0&gt;, &lt;&amp;gpio3 25 0&gt;;</div><div class='ctx'> 	status = "disabled";</div><div class='hunk'>@@ -249,7 +248,6 @@</div><div class='ctx'> &amp;cspi {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_cspi&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;3&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio1 18 0&gt;, &lt;&amp;gpio1 19 0&gt;,</div><div class='ctx'> 		   &lt;&amp;gpio1 21 0&gt;;</div><div class='ctx'> 	status = "disabled";</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi<br/>index 57e75f1639e0..3a3220141988 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-tx53.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx53-tx53.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-tx53.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-tx53.dtsi</a></div><div class='hunk'>@@ -161,7 +161,6 @@</div><div class='ctx'> &amp;ecspi1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='ctx'> 	cs-gpios = &lt;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi b/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi<br/>index ba689fbd0e41..524192cf6a0f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi</a></div><div class='hunk'>@@ -129,7 +129,6 @@</div><div class='ctx'> &amp;ecspi1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;4&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio2 30 0&gt;, &lt;&amp;gpio3 19 0&gt;, &lt;&amp;gpio2 16 0&gt;, &lt;&amp;gpio2 17 0&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi<br/>index 0777b41cdfe8..2e516f4985e4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx53.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx53.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx53.dtsi</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * http://www.gnu.org/copyleft/gpl.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include "imx53-pinfunc.h"</div><div class='ctx'> #include &lt;dt-bindings/clock/imx5-clock.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='hunk'>@@ -18,6 +17,17 @@</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;fec;</div><div class='ctx'> 		gpio0 = &amp;gpio1;</div><div class='hunk'>@@ -131,8 +141,8 @@</div><div class='ctx'> 			reg = &lt;0x18000000 0x08000000&gt;;</div><div class='ctx'> 			interrupts = &lt;11 10&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clks IMX5_CLK_IPU_GATE&gt;,</div><div class='del'>-			         &lt;&amp;clks IMX5_CLK_IPU_DI0_GATE&gt;,</div><div class='del'>-			         &lt;&amp;clks IMX5_CLK_IPU_DI1_GATE&gt;;</div><div class='add'>+				 &lt;&amp;clks IMX5_CLK_IPU_DI0_GATE&gt;,</div><div class='add'>+				 &lt;&amp;clks IMX5_CLK_IPU_DI1_GATE&gt;;</div><div class='ctx'> 			clock-names = "bus", "di0", "di1";</div><div class='ctx'> 			resets = &lt;&amp;src 2&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -199,8 +209,8 @@</div><div class='ctx'> 					reg = &lt;0x50004000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;1&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC1_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC1_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC1_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					bus-width = &lt;4&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='hunk'>@@ -211,8 +221,8 @@</div><div class='ctx'> 					reg = &lt;0x50008000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;2&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC2_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC2_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC2_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					bus-width = &lt;4&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='hunk'>@@ -223,7 +233,7 @@</div><div class='ctx'> 					reg = &lt;0x5000c000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;33&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_UART3_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_UART3_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_UART3_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "per";</div><div class='ctx'> 					dmas = &lt;&amp;sdma 42 4 0&gt;, &lt;&amp;sdma 43 4 0&gt;;</div><div class='ctx'> 					dma-names = "rx", "tx";</div><div class='hunk'>@@ -237,7 +247,7 @@</div><div class='ctx'> 					reg = &lt;0x50010000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;36&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ECSPI1_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ECSPI1_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ECSPI1_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "per";</div><div class='ctx'> 					status = "disabled";</div><div class='ctx'> 				};</div><div class='hunk'>@@ -264,8 +274,8 @@</div><div class='ctx'> 					reg = &lt;0x50020000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;3&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC3_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC3_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC3_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					bus-width = &lt;4&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='hunk'>@@ -276,8 +286,8 @@</div><div class='ctx'> 					reg = &lt;0x50024000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;4&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX5_CLK_ESDHC4_IPG_GATE&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='del'>-					         &lt;&amp;clks IMX5_CLK_ESDHC4_PER_GATE&gt;;</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_DUMMY&gt;,</div><div class='add'>+						 &lt;&amp;clks IMX5_CLK_ESDHC4_PER_GATE&gt;;</div><div class='ctx'> 					clock-names = "ipg", "ahb", "per";</div><div class='ctx'> 					bus-width = &lt;4&gt;;</div><div class='ctx'> 					status = "disabled";</div><div class='hunk'>@@ -419,7 +429,7 @@</div><div class='ctx'> 				reg = &lt;0x53fa0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;39&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_GPT_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_GPT_HF_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_GPT_HF_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -440,11 +450,11 @@</div><div class='ctx'> 				reg = &lt;0x53fa8008 0x4&gt;;</div><div class='ctx'> 				gpr = &lt;&amp;gpr&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_LDB_DI0_SEL&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_LDB_DI1_SEL&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_IPU_DI0_SEL&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_IPU_DI1_SEL&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_LDB_DI0_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_LDB_DI1_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_LDB_DI1_SEL&gt;,</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_IPU_DI0_SEL&gt;,</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_IPU_DI1_SEL&gt;,</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_LDB_DI0_GATE&gt;,</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_LDB_DI1_GATE&gt;;</div><div class='ctx'> 				clock-names = "di0_pll", "di1_pll",</div><div class='ctx'> 					      "di0_sel", "di1_sel",</div><div class='ctx'> 					      "di0", "di1";</div><div class='hunk'>@@ -486,7 +496,7 @@</div><div class='ctx'> 				compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";</div><div class='ctx'> 				reg = &lt;0x53fb4000 0x4000&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_PWM1_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_PWM1_HF_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_PWM1_HF_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				interrupts = &lt;61&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -496,7 +506,7 @@</div><div class='ctx'> 				compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";</div><div class='ctx'> 				reg = &lt;0x53fb8000 0x4000&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_PWM2_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_PWM2_HF_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_PWM2_HF_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				interrupts = &lt;94&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -506,7 +516,7 @@</div><div class='ctx'> 				reg = &lt;0x53fbc000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;31&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_UART1_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_UART1_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_UART1_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				dmas = &lt;&amp;sdma 18 4 0&gt;, &lt;&amp;sdma 19 4 0&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx";</div><div class='hunk'>@@ -518,7 +528,7 @@</div><div class='ctx'> 				reg = &lt;0x53fc0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;32&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_UART2_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_UART2_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_UART2_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				dmas = &lt;&amp;sdma 12 4 0&gt;, &lt;&amp;sdma 13 4 0&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx";</div><div class='hunk'>@@ -530,7 +540,7 @@</div><div class='ctx'> 				reg = &lt;0x53fc8000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;82&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_CAN1_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_CAN1_SERIAL_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_CAN1_SERIAL_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -540,7 +550,7 @@</div><div class='ctx'> 				reg = &lt;0x53fcc000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;83&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_CAN2_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_CAN2_SERIAL_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_CAN2_SERIAL_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -603,7 +613,7 @@</div><div class='ctx'> 				reg = &lt;0x53ff0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;13&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_UART4_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_UART4_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_UART4_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				dmas = &lt;&amp;sdma 2 4 0&gt;, &lt;&amp;sdma 3 4 0&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx";</div><div class='hunk'>@@ -635,7 +645,7 @@</div><div class='ctx'> 				reg = &lt;0x63f90000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;86&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_UART5_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_UART5_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_UART5_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				dmas = &lt;&amp;sdma 16 4 0&gt;, &lt;&amp;sdma 17 4 0&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx";</div><div class='hunk'>@@ -656,7 +666,7 @@</div><div class='ctx'> 				reg = &lt;0x63fac000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;37&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_ECSPI2_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_ECSPI2_PER_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_ECSPI2_PER_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -666,7 +676,7 @@</div><div class='ctx'> 				reg = &lt;0x63fb0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;6&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_SDMA_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_SDMA_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_SDMA_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "ahb";</div><div class='ctx'> 				#dma-cells = &lt;3&gt;;</div><div class='ctx'> 				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin";</div><div class='hunk'>@@ -679,7 +689,7 @@</div><div class='ctx'> 				reg = &lt;0x63fc0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;38&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_CSPI_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_CSPI_IPG_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_CSPI_IPG_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "per";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -755,8 +765,8 @@</div><div class='ctx'> 				reg = &lt;0x63fec000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;87&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;,</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_FEC_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "ahb", "ptp";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -766,7 +776,7 @@</div><div class='ctx'> 				reg = &lt;0x63ff0000 0x1000&gt;;</div><div class='ctx'> 				interrupts = &lt;92&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_TVE_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_IPU_DI1_SEL&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_IPU_DI1_SEL&gt;;</div><div class='ctx'> 				clock-names = "tve", "di_sel";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> </div><div class='hunk'>@@ -782,7 +792,7 @@</div><div class='ctx'> 				reg = &lt;0x63ff4000 0x1000&gt;;</div><div class='ctx'> 				interrupts = &lt;9&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_VPU_REFERENCE_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_VPU_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_VPU_GATE&gt;;</div><div class='ctx'> 				clock-names = "per", "ahb";</div><div class='ctx'> 				resets = &lt;&amp;src 1&gt;;</div><div class='ctx'> 				iram = &lt;&amp;ocram&gt;;</div><div class='hunk'>@@ -793,7 +803,7 @@</div><div class='ctx'> 				reg = &lt;0x63ff8000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;19 20&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX5_CLK_SAHARA_IPG_GATE&gt;,</div><div class='del'>-				         &lt;&amp;clks IMX5_CLK_SAHARA_IPG_GATE&gt;;</div><div class='add'>+					 &lt;&amp;clks IMX5_CLK_SAHARA_IPG_GATE&gt;;</div><div class='ctx'> 				clock-names = "ipg", "ahb";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts b/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts<br/>index bb92f309c191..0677625463d6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-aristainetos2_4.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-aristainetos2_4.dts</a></div><div class='hunk'>@@ -12,17 +12,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -31,11 +31,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts b/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts<br/>index 3d5ad2cc7e22..805b1318b7f7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-aristainetos2_7.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-aristainetos2_7.dts</a></div><div class='hunk'>@@ -12,17 +12,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -31,11 +31,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts<br/>index d4c4a22db488..32a812b1839e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-aristainetos_4.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-aristainetos_4.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-aristainetos_4.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-aristainetos_4.dts</a></div><div class='hunk'>@@ -66,7 +66,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi2 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 24 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi2&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts<br/>new file mode 100644<br/>index 000000000000..26541538562c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts</a></div><div class='hunk'>@@ -0,0 +1,253 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2014-2016 Toradex AG</div><div class='add'>+ * Copyright 2012 Freescale Semiconductor, Inc.</div><div class='add'>+ * Copyright 2011 Linaro Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+#include "imx6dl.dtsi"</div><div class='add'>+#include "imx6qdl-colibri.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Toradex Colibri iMX6DL/S on Colibri Evaluation Board V3";</div><div class='add'>+	compatible = "toradex,colibri_imx6dl-eval-v3", "toradex,colibri_imx6dl",</div><div class='add'>+		     "fsl,imx6dl";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		i2c0 = &amp;i2c2;</div><div class='add'>+		i2c1 = &amp;i2c3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		rtc0 = &amp;rtc_i2c;</div><div class='add'>+		rtc1 = &amp;snvs_rtc;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clocks {</div><div class='add'>+		/* Fixed crystal dedicated to mcp251x */</div><div class='add'>+		clk16m: clk@1 {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;16000000&gt;;</div><div class='add'>+			clock-output-names = "clk16m";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_gpio_keys&gt;;</div><div class='add'>+</div><div class='add'>+		wakeup {</div><div class='add'>+			label = "Wake-Up";</div><div class='add'>+			gpios = &lt;&amp;gpio2 22 GPIO_ACTIVE_HIGH&gt;; /* SODIMM 45 */</div><div class='add'>+			linux,code = &lt;KEY_WAKEUP&gt;;</div><div class='add'>+			debounce-interval = &lt;10&gt;;</div><div class='add'>+			wakeup-source;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lcd_display: display@di0 {</div><div class='add'>+		compatible = "fsl,imx-parallel-display";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		interface-pix-fmt = "bgr666";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_ipu1_lcdif&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		port@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			lcd_display_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;ipu1_di0_disp0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port@1 {</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			lcd_display_out: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;lcd_panel_in&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	panel: panel {</div><div class='add'>+		/*</div><div class='add'>+		 * edt,et057090dhu: EDT 5.7" LCD TFT</div><div class='add'>+		 * edt,et070080dh6: EDT 7.0" LCD TFT</div><div class='add'>+		 */</div><div class='add'>+		compatible = "edt,et057090dhu";</div><div class='add'>+		backlight = &lt;&amp;backlight&gt;;</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			lcd_panel_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;lcd_display_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;backlight {</div><div class='add'>+	brightness-levels = &lt;0 127 191 223 239 247 251 255&gt;;</div><div class='add'>+	default-brightness-level = &lt;1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Colibri SSP */</div><div class='add'>+&amp;ecspi4 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	mcp251x0: mcp251x@1 {</div><div class='add'>+		compatible = "microchip,mcp2515";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk16m&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio3&gt;;</div><div class='add'>+		interrupts = &lt;27 0x2&gt;;</div><div class='add'>+		spi-max-frequency = &lt;10000000&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hdmi {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Colibri I2C: I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board)</div><div class='add'>+ */</div><div class='add'>+&amp;i2c3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* M41T0M6 real time clock on carrier board */</div><div class='add'>+	rtc_i2c: rtc@68 {</div><div class='add'>+		compatible = "st,m41t00";</div><div class='add'>+		reg = &lt;0x68&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ipu1_di0_disp0 {</div><div class='add'>+	remote-endpoint = &lt;&amp;lcd_display_in&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm4 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_usb_host_vbus {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbh1 {</div><div class='add'>+	vbus-supply = &lt;&amp;reg_usb_host_vbus&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbotg {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Colibri MMC */</div><div class='add'>+&amp;usdhc1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_mmc_cd&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio2 5 GPIO_ACTIVE_LOW&gt;; /* MMCD */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;weim {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/* weim memory map: 32MB on CS0, 32MB on CS1, 32MB on CS2 */</div><div class='add'>+	ranges = &lt;0 0 0x08000000 0x02000000</div><div class='add'>+		  1 0 0x0a000000 0x02000000</div><div class='add'>+		  2 0 0x0c000000 0x02000000&gt;;</div><div class='add'>+</div><div class='add'>+	/* SRAM on Colibri nEXT_CS0 */</div><div class='add'>+	sram@0,0 {</div><div class='add'>+		compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";</div><div class='add'>+		reg = &lt;0 0 0x00010000&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		bank-width = &lt;2&gt;;</div><div class='add'>+		fsl,weim-cs-timing = &lt;0x00010081 0x00000000 0x04000000</div><div class='add'>+				      0x00000000 0x04000040 0x00000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* SRAM on Colibri nEXT_CS1 */</div><div class='add'>+	sram@1,0 {</div><div class='add'>+		compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";</div><div class='add'>+		reg = &lt;1 0 0x00010000&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		bank-width = &lt;2&gt;;</div><div class='add'>+		fsl,weim-cs-timing = &lt;0x00010081 0x00000000 0x04000000</div><div class='add'>+				      0x00000000 0x04000040 0x00000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-cubox-i.dts b/arch/arm/boot/dts/imx6dl-cubox-i.dts<br/>index 2a43917d048e..f10a36b8647d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-cubox-i.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-cubox-i.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-cubox-i.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-cubox-i.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts<br/>index d5c966031962..39c2602fa87c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-hummingboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-hummingboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-hummingboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-hummingboard.dts</a></div><div class='hunk'>@@ -11,17 +11,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -30,11 +30,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-icore-rqs.dts b/arch/arm/boot/dts/imx6dl-icore-rqs.dts<br/>new file mode 100644<br/>index 000000000000..cf42c2f5cdc7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-icore-rqs.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-icore-rqs.dts</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Amarula Solutions B.V.</div><div class='add'>+ * Copyright (C) 2016 Engicam S.r.l.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6q.dtsi"</div><div class='add'>+#include "imx6qdl-icore-rqs.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Engicam i.CoreM6 DualLite/Solo RQS Starter Kit";</div><div class='add'>+	compatible = "engicam,imx6-icore-rqs", "fsl,imx6dl";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-icore.dts b/arch/arm/boot/dts/imx6dl-icore.dts<br/>new file mode 100644<br/>index 000000000000..6de83c72bd72<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-icore.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-icore.dts</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Amarula Solutions B.V.</div><div class='add'>+ * Copyright (C) 2016 Engicam S.r.l.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6dl.dtsi"</div><div class='add'>+#include "imx6qdl-icore.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Engicam i.CoreM6 DualLite/Solo Starter Kit";</div><div class='add'>+	compatible = "engicam,imx6-icore", "fsl,imx6dl";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;can1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;can2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-nit6xlite.dts b/arch/arm/boot/dts/imx6dl-nit6xlite.dts<br/>index e0161e46195c..30ce2c0cec2b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-nit6xlite.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-nit6xlite.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-nit6xlite.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-nit6xlite.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-nitrogen6x.dts b/arch/arm/boot/dts/imx6dl-nitrogen6x.dts<br/>index 8398f979b912..ec53d7a09572 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-nitrogen6x.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-nitrogen6x.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-nitrogen6x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-nitrogen6x.dts</a></div><div class='hunk'>@@ -12,17 +12,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -31,11 +31,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts<br/>index 75d73437adf7..2cb72824e800 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-riotboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-riotboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-riotboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-riotboard.dts</a></div><div class='hunk'>@@ -390,7 +390,7 @@</div><div class='ctx'> 				MX6QDL_PAD_RGMII_RD3__RGMII_RD3		0x1b030		/* AR8035 pin strapping: MODE#3: pull up */</div><div class='ctx'> 				MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL	0x130b0		/* AR8035 pin strapping: MODE#0: pull down */</div><div class='ctx'> 				MX6QDL_PAD_GPIO_16__ENET_REF_CLK	0x4001b0a8	/* GPIO16 -&gt; AR8035 25MHz */</div><div class='del'>-			        MX6QDL_PAD_EIM_D31__GPIO3_IO31		0x130b0		/* RGMII_nRST */</div><div class='add'>+				MX6QDL_PAD_EIM_D31__GPIO3_IO31		0x130b0		/* RGMII_nRST */</div><div class='ctx'> 				MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28	0x180b0		/* AR8035 interrupt */</div><div class='ctx'> 				MX6QDL_PAD_GPIO_6__ENET_IRQ		0x000b1</div><div class='ctx'> 			&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-sabrelite.dts b/arch/arm/boot/dts/imx6dl-sabrelite.dts<br/>index 0f06ca5c9146..2f904527a097 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-sabrelite.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-sabrelite.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-sabrelite.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-sabrelite.dts</a></div><div class='hunk'>@@ -11,17 +11,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -30,11 +30,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-savageboard.dts b/arch/arm/boot/dts/imx6dl-savageboard.dts<br/>new file mode 100644<br/>index 000000000000..b95469c520a4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-savageboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-savageboard.dts</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2017 Milo Kim &lt;woogyom.kim@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6dl.dtsi"</div><div class='add'>+#include "imx6qdl-savageboard.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Poslab SavageBoard Dual";</div><div class='add'>+	compatible = "poslab,imx6dl-savageboard", "fsl,imx6dl";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-ts4900.dts b/arch/arm/boot/dts/imx6dl-ts4900.dts<br/>index 85eddeb30e21..6ea0b780677d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-ts4900.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-ts4900.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-ts4900.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-ts4900.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts<br/>index 063fe7510da5..aac42ac465b6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts</a></div><div class='hunk'>@@ -105,7 +105,7 @@</div><div class='ctx'> 				pixelclk-active = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='del'>-        };</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;can1 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts b/arch/arm/boot/dts/imx6dl-tx6u-801x.dts<br/>index b7a72840b7f0..d1f1298ec55a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-tx6u-801x.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl-tx6u-801x.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl-tx6u-801x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl-tx6u-801x.dts</a></div><div class='hunk'>@@ -199,7 +199,7 @@</div><div class='ctx'> 				pixelclk-active = &lt;0&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='del'>-        };</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ipu1_di0_disp0 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi<br/>index 1ade1951e620..7aa120fbdc71 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6dl.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6dl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6dl.dtsi</a></div><div class='hunk'>@@ -137,7 +137,7 @@</div><div class='ctx'> &amp;gpio4 {</div><div class='ctx'> 	gpio-ranges = &lt;&amp;iomuxc  5 136 1&gt;, &lt;&amp;iomuxc  6 145 1&gt;, &lt;&amp;iomuxc  7 150 1&gt;,</div><div class='ctx'> 		      &lt;&amp;iomuxc  8 146 1&gt;, &lt;&amp;iomuxc  9 151 1&gt;, &lt;&amp;iomuxc 10 147 1&gt;,</div><div class='del'>-		      &lt;&amp;iomuxc 11 151 1&gt;, &lt;&amp;iomuxc 12 148 1&gt;, &lt;&amp;iomuxc 13 153 1&gt;,</div><div class='add'>+		      &lt;&amp;iomuxc 11 152 1&gt;, &lt;&amp;iomuxc 12 148 1&gt;, &lt;&amp;iomuxc 13 153 1&gt;,</div><div class='ctx'> 		      &lt;&amp;iomuxc 14 149 1&gt;, &lt;&amp;iomuxc 15 154 1&gt;, &lt;&amp;iomuxc 16  39 7&gt;,</div><div class='ctx'> 		      &lt;&amp;iomuxc 23  56 1&gt;, &lt;&amp;iomuxc 24  61 7&gt;, &lt;&amp;iomuxc 31  46 1&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts<br/>index 207b85b91ada..88cc7f51a4e9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-apalis-ixora.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-apalis-ixora.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-apalis-ixora.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-apalis-ixora.dts</a></div><div class='hunk'>@@ -12,17 +12,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -31,11 +31,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -147,28 +147,6 @@</div><div class='ctx'> 			gpios = &lt;&amp;gpio2 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	pwmleds {</div><div class='del'>-		compatible = "pwm-leds";</div><div class='del'>-</div><div class='del'>-		ledpwm1 {</div><div class='del'>-			label = "PWM1";</div><div class='del'>-			pwms = &lt;&amp;pwm1 0 50000&gt;;</div><div class='del'>-			max-brightness = &lt;255&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ledpwm2 {</div><div class='del'>-			label = "PWM2";</div><div class='del'>-			pwms = &lt;&amp;pwm2 0 50000&gt;;</div><div class='del'>-			max-brightness = &lt;255&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ledpwm3 {</div><div class='del'>-			label = "PWM3";</div><div class='del'>-			pwms = &lt;&amp;pwm3 0 50000&gt;;</div><div class='del'>-			max-brightness = &lt;255&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;backlight {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-b450v3.dts b/arch/arm/boot/dts/imx6q-b450v3.dts<br/>index 78bfc1a307d6..116bebb5e435 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-b450v3.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-b450v3.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-b450v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-b450v3.dts</a></div><div class='hunk'>@@ -11,17 +11,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -30,11 +30,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-b650v3.dts b/arch/arm/boot/dts/imx6q-b650v3.dts<br/>index d85388725426..33f5c436c09f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-b650v3.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-b650v3.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-b650v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-b650v3.dts</a></div><div class='hunk'>@@ -11,17 +11,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -30,11 +30,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -98,3 +98,9 @@</div><div class='ctx'> 		line-name = "PCA9539-P05";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;usbphy1 {</div><div class='add'>+	fsl,tx-cal-45-dn-ohms = &lt;55&gt;;</div><div class='add'>+	fsl,tx-cal-45-dp-ohms = &lt;55&gt;;</div><div class='add'>+	fsl,tx-d-cal = &lt;100&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-b850v3.dts b/arch/arm/boot/dts/imx6q-b850v3.dts<br/>index 167f7446722a..d78514c92349 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-b850v3.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-b850v3.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-b850v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-b850v3.dts</a></div><div class='hunk'>@@ -11,17 +11,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -30,11 +30,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-ba16.dtsi b/arch/arm/boot/dts/imx6q-ba16.dtsi<br/>index 308e11cea1db..14fa6b25dc45 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-ba16.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-ba16.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-ba16.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-ba16.dtsi</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -133,7 +133,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio2 30 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-bx50v3.dtsi b/arch/arm/boot/dts/imx6q-bx50v3.dtsi<br/>index e4a415fd899b..36d6bb39593a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-bx50v3.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-bx50v3.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-bx50v3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-bx50v3.dtsi</a></div><div class='hunk'>@@ -11,17 +11,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -30,11 +30,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -95,7 +95,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi5 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio1 17 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi5&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts<br/>index 59bc5a4dce17..d8a5789a4bc8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-cm-fx6.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-cm-fx6.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-cm-fx6.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-cm-fx6.dts</a></div><div class='hunk'>@@ -12,17 +12,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -31,11 +31,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -89,6 +89,14 @@</div><div class='ctx'> 		gpio = &lt;&amp;gpio3 22 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		enable-active-high;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	sound-spdif {</div><div class='add'>+		compatible = "fsl,imx-audio-spdif";</div><div class='add'>+		model = "imx-spdif";</div><div class='add'>+		spdif-controller = &lt;&amp;spdif&gt;;</div><div class='add'>+		spdif-out;</div><div class='add'>+		spdif-in;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cpu0 {</div><div class='hunk'>@@ -114,7 +122,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio2 30 GPIO_ACTIVE_HIGH&gt;, &lt;&amp;gpio3 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='hunk'>@@ -183,7 +190,6 @@</div><div class='ctx'> 			MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK	0x1b0b0</div><div class='ctx'> 			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0</div><div class='ctx'> 			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0</div><div class='del'>-			MX6QDL_PAD_GPIO_16__ENET_REF_CLK	0x4001b0a8</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -223,6 +229,13 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	pinctrl_spdif: spdifgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_16__SPDIF_IN  0x1b0b0</div><div class='add'>+			MX6QDL_PAD_GPIO_19__SPDIF_OUT 0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pinctrl_uart4: uart4grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='ctx'> 			MX6QDL_PAD_KEY_COL0__UART4_TX_DATA	0x1b0b1</div><div class='hunk'>@@ -260,6 +273,12 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;spdif {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_spdif&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart4 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_uart4&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-cubox-i.dts b/arch/arm/boot/dts/imx6q-cubox-i.dts<br/>index 353425edcdf4..b68aa0e57f20 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-cubox-i.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-cubox-i.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-cubox-i.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-cubox-i.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts<br/>index 908dab68bdca..f28883bbe7b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts</a></div><div class='hunk'>@@ -104,7 +104,6 @@</div><div class='ctx'> &amp;ecspi5 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi5&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio1 12 0&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-evi.dts b/arch/arm/boot/dts/imx6q-evi.dts<br/>index 6de21ff47c3a..fd2220aa49e2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-evi.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-evi.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-evi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-evi.dts</a></div><div class='hunk'>@@ -90,7 +90,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 10 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1 &amp;pinctrl_ecspi1cs&gt;;</div><div class='hunk'>@@ -98,7 +97,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi3 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;3&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 24 GPIO_ACTIVE_LOW&gt;,</div><div class='ctx'> 		&lt;&amp;gpio4 25 GPIO_ACTIVE_LOW&gt;,</div><div class='ctx'> 		&lt;&amp;gpio4 26 GPIO_ACTIVE_LOW&gt;;</div><div class='hunk'>@@ -108,7 +106,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi5 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;4&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio1 14 GPIO_ACTIVE_LOW&gt;,</div><div class='ctx'> 		&lt;&amp;gpio1 13 GPIO_ACTIVE_LOW&gt;,</div><div class='ctx'> 		&lt;&amp;gpio1 12 GPIO_ACTIVE_LOW&gt;,</div><div class='hunk'>@@ -232,10 +229,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;weim {</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='ctx'> 	ranges = &lt;0 0 0x08000000 0x08000000&gt;;</div><div class='del'>-	fsl,weim-cs-gpr = &lt;&amp;gpr&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_weimfpga &amp;pinctrl_weimcs&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts<br/>index 747bc104ad00..8e84713f42c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-gw5400-a.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-gw5400-a.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-gw5400-a.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-gw5400-a.dts</a></div><div class='hunk'>@@ -138,7 +138,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-h100.dts b/arch/arm/boot/dts/imx6q-h100.dts<br/>index 65e66f994f88..8f9252889971 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-h100.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-h100.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-h100.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-h100.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-hummingboard.dts b/arch/arm/boot/dts/imx6q-hummingboard.dts<br/>index 1884c16784e2..69a7a0a1cb21 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-hummingboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-hummingboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-hummingboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-hummingboard.dts</a></div><div class='hunk'>@@ -11,17 +11,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -30,11 +30,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-icore-rqs.dts b/arch/arm/boot/dts/imx6q-icore-rqs.dts<br/>index 005318865f66..e451b4ceb4d8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-icore-rqs.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-icore-rqs.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-icore-rqs.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-icore-rqs.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> #include "imx6qdl-icore-rqs.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	model = "Engicam i.CoreM6 Quad SOM";</div><div class='add'>+	model = "Engicam i.CoreM6 Quad/Dual RQS Starter Kit";</div><div class='ctx'> 	compatible = "engicam,imx6-icore-rqs", "fsl,imx6q";</div><div class='ctx'> </div><div class='ctx'> 	sound {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-icore.dts b/arch/arm/boot/dts/imx6q-icore.dts<br/>new file mode 100644<br/>index 000000000000..59eb7adc2472<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-icore.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-icore.dts</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Amarula Solutions B.V.</div><div class='add'>+ * Copyright (C) 2016 Engicam S.r.l.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6q.dtsi"</div><div class='add'>+#include "imx6qdl-icore.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Engicam i.CoreM6 Quad/Dual Starter Kit";</div><div class='add'>+	compatible = "engicam,imx6-icore", "fsl,imx6q";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;can1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;can2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-marsboard.dts b/arch/arm/boot/dts/imx6q-marsboard.dts<br/>index f7995c513b67..432291bedcf1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-marsboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-marsboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-marsboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-marsboard.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -97,7 +97,6 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio2 30 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='ctx'> 	m25p80@0 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-mccmon6.dts b/arch/arm/boot/dts/imx6q-mccmon6.dts<br/>new file mode 100644<br/>index 000000000000..eedbe737420c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-mccmon6.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-mccmon6.dts</a></div><div class='hunk'>@@ -0,0 +1,473 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016-2017</div><div class='add'>+ * Lukasz Majewski, DENX Software Engineering, lukma@denx.de</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6q.dtsi"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/pwm/pwm.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Liebherr (LWN) monitor6 i.MX6 Quad Board";</div><div class='add'>+	compatible = "lwn,mccmon6", "fsl,imx6q";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x10000000 0x80000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	backlight_lvds: backlight {</div><div class='add'>+		compatible = "pwm-backlight";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_backlight&gt;;</div><div class='add'>+		pwms = &lt;&amp;pwm2 0 5000000 PWM_POLARITY_INVERTED&gt;;</div><div class='add'>+		brightness-levels = &lt;  0   1   2   3   4   5   6   7   8   9</div><div class='add'>+				      10  11  12  13  14  15  16  17  18  19</div><div class='add'>+				      20  21  22  23  24  25  26  27  28  29</div><div class='add'>+				      30  31  32  33  34  35  36  37  38  39</div><div class='add'>+				      40  41  42  43  44  45  46  47  48  49</div><div class='add'>+				      50  51  52  53  54  55  56  57  58  59</div><div class='add'>+				      60  61  62  63  64  65  66  67  68  69</div><div class='add'>+				      70  71  72  73  74  75  76  77  78  79</div><div class='add'>+				      80  81  82  83  84  85  86  87  88  89</div><div class='add'>+				      90  91  92  93  94  95  96  97  98  99</div><div class='add'>+				     100 101 102 103 104 105 106 107 108 109</div><div class='add'>+				     110 111 112 113 114 115 116 117 118 119</div><div class='add'>+				     120 121 122 123 124 125 126 127 128 129</div><div class='add'>+				     130 131 132 133 134 135 136 137 138 139</div><div class='add'>+				     140 141 142 143 144 145 146 147 148 149</div><div class='add'>+				     150 151 152 153 154 155 156 157 158 159</div><div class='add'>+				     160 161 162 163 164 165 166 167 168 169</div><div class='add'>+				     170 171 172 173 174 175 176 177 178 179</div><div class='add'>+				     180 181 182 183 184 185 186 187 188 189</div><div class='add'>+				     190 191 192 193 194 195 196 197 198 199</div><div class='add'>+				     200 201 202 203 204 205 206 207 208 209</div><div class='add'>+				     210 211 212 213 214 215 216 217 218 219</div><div class='add'>+				     220 221 222 223 224 225 226 227 228 229</div><div class='add'>+				     230 231 232 233 234 235 236 237 238 239</div><div class='add'>+				     240 241 242 243 244 245 246 247 248 249</div><div class='add'>+				     250 251 252 253 254 255&gt;;</div><div class='add'>+		default-brightness-level = &lt;50&gt;;</div><div class='add'>+		enable-gpios = &lt;&amp;gpio1 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_lvds: regulator-lvds {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "lvds_ppen";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_reg_lvds&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio1 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	panel-lvds0 {</div><div class='add'>+		compatible = "innolux,g121x1-l03";</div><div class='add'>+		backlight = &lt;&amp;backlight_lvds&gt;;</div><div class='add'>+		power-supply = &lt;&amp;reg_lvds&gt;;</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			panel_in_lvds0: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;lvds0_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ecspi3 {</div><div class='add'>+	cs-gpios = &lt;&amp;gpio4 24 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_ecspi3 &amp;pinctrl_ecspi3_cs &amp;pinctrl_ecspi3_flwp&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	s25sl032p: flash@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "jedec,spi-nor";</div><div class='add'>+		spi-max-frequency = &lt;40000000&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_enet&gt;;</div><div class='add'>+	phy-mode = "rgmii";</div><div class='add'>+	phy-reset-gpios = &lt;&amp;gpio1 27 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	interrupts-extended = &lt;&amp;gpio1 6 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			      &lt;&amp;intc 0 119 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pfuze100: pmic@08 {</div><div class='add'>+		compatible = "fsl,pfuze100";</div><div class='add'>+		reg = &lt;0x08&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			sw1a_reg: sw1ab {</div><div class='add'>+				regulator-min-microvolt = &lt;300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1875000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-ramp-delay = &lt;6250&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sw1c_reg: sw1c {</div><div class='add'>+				regulator-min-microvolt = &lt;300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1875000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-ramp-delay = &lt;6250&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sw2_reg: sw2 {</div><div class='add'>+				regulator-min-microvolt = &lt;800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3950000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sw3a_reg: sw3a {</div><div class='add'>+				regulator-min-microvolt = &lt;400000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1975000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sw3b_reg: sw3b {</div><div class='add'>+				regulator-min-microvolt = &lt;400000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1975000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sw4_reg: sw4 {</div><div class='add'>+				regulator-min-microvolt = &lt;800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			swbst_reg: swbst {</div><div class='add'>+				regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;5150000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			snvs_reg: vsnvs {</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vref_reg: vrefddr {</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen1_reg: vgen1 {</div><div class='add'>+				regulator-min-microvolt = &lt;800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1550000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen2_reg: vgen2 {</div><div class='add'>+				regulator-min-microvolt = &lt;800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1550000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen3_reg: vgen3 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen4_reg: vgen4 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen5_reg: vgen5 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen6_reg: vgen6 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ldb {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	lvds0: lvds-channel@0 {</div><div class='add'>+		fsl,data-mapping = "spwg";</div><div class='add'>+		fsl,data-width = &lt;24&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		port@4 {</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+			lvds0_out: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;panel_in_lvds0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm2 {</div><div class='add'>+	#pwm-cells = &lt;3&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pwm2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart4 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart4&gt;;</div><div class='add'>+	uart-has-rtscts;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc2&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio1 4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc3&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;weim {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_weim_nor &amp;pinctrl_weim_cs0&gt;;</div><div class='add'>+	ranges = &lt;0 0 0x08000000 0x08000000&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	nor@0,0 {</div><div class='add'>+		compatible = "cfi-flash";</div><div class='add'>+		reg = &lt;0 0 0x02000000&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		bank-width = &lt;2&gt;;</div><div class='add'>+		use-advanced-sector-protection;</div><div class='add'>+		fsl,weim-cs-timing = &lt;0x00620081 0x00000001 0x1c022000</div><div class='add'>+				0x0000c000 0x1404a38e 0x00000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	pinctrl_backlight: dispgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* BLEN_OUT */</div><div class='add'>+			MX6QDL_PAD_GPIO_2__GPIO1_IO02    0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_ecspi3: ecspi3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO	0x100b1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI	0x100b1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK	0x100b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_ecspi3_cs: ecspi3csgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT3__GPIO4_IO24 0x80000000</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_ecspi3_flwp: ecspi3flwpgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT6__GPIO4_IO27 0x80000000</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_enet: enetgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TXC__RGMII_TXC		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TD0__RGMII_TD0		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TD1__RGMII_TD1		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TD2__RGMII_TD2		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TD3__RGMII_TD3		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RXC__RGMII_RXC		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RD0__RGMII_RD0		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RD1__RGMII_RD1		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RD2__RGMII_RD2		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RD3__RGMII_RD3		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8</div><div class='add'>+			MX6QDL_PAD_GPIO_6__ENET_IRQ		0x000b1</div><div class='add'>+			MX6QDL_PAD_ENET_RXD0__GPIO1_IO27        0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c1: i2c1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT9__I2C1_SCL	0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT8__I2C1_SDA	0x4001b8b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c2: i2c2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_COL3__I2C2_SCL	0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_KEY_ROW3__I2C2_SDA	0x4001b8b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pwm2: pwm2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_1__PWM2_OUT	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_reg_lvds: reqlvdsgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* LVDS_PPEN_OUT */</div><div class='add'>+			MX6QDL_PAD_SD1_DAT2__GPIO1_IO19         0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart1: uart1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart4: uart4grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_COL0__UART4_TX_DATA	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT16__UART4_RTS_B	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT17__UART4_CTS_B	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc2: usdhc2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD2_CMD__SD2_CMD		0x17059</div><div class='add'>+			MX6QDL_PAD_SD2_CLK__SD2_CLK		0x10059</div><div class='add'>+			MX6QDL_PAD_SD2_DAT0__SD2_DATA0		0x17059</div><div class='add'>+			MX6QDL_PAD_SD2_DAT1__SD2_DATA1		0x17059</div><div class='add'>+			MX6QDL_PAD_SD2_DAT2__SD2_DATA2		0x17059</div><div class='add'>+			MX6QDL_PAD_SD2_DAT3__SD2_DATA3		0x17059</div><div class='add'>+			MX6QDL_PAD_GPIO_4__GPIO1_IO04           0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc3: usdhc3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD3_CMD__SD3_CMD		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_CLK__SD3_CLK		0x10059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT0__SD3_DATA0		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT1__SD3_DATA1		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT2__SD3_DATA2		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT3__SD3_DATA3		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT4__SD3_DATA4		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT5__SD3_DATA5		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT6__SD3_DATA6		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT7__SD3_DATA7		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_RST__SD3_RESET		0x17059</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_weim_cs0: weimcs0grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_CS0__EIM_CS0_B		0xb0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_weim_nor: weimnorgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_OE__EIM_OE_B		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_RW__EIM_RW		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B	0xb060</div><div class='add'>+			MX6QDL_PAD_EIM_D16__EIM_DATA16		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D17__EIM_DATA17		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D18__EIM_DATA18		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D19__EIM_DATA19		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D20__EIM_DATA20		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D21__EIM_DATA21		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D22__EIM_DATA22		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D23__EIM_DATA23		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D24__EIM_DATA24		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D25__EIM_DATA25		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D26__EIM_DATA26		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D27__EIM_DATA27		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D28__EIM_DATA28		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D29__EIM_DATA29		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D30__EIM_DATA30		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D31__EIM_DATA31		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_A23__EIM_ADDR23		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A22__EIM_ADDR22		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A21__EIM_ADDR21		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A20__EIM_ADDR20		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A19__EIM_ADDR19		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A18__EIM_ADDR18		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A17__EIM_ADDR17		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A16__EIM_ADDR16		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA15__EIM_AD15		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA14__EIM_AD14		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA13__EIM_AD13		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA12__EIM_AD12		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA11__EIM_AD11		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA10__EIM_AD10		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA9__EIM_AD09		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA8__EIM_AD08		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA7__EIM_AD07		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA6__EIM_AD06		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA5__EIM_AD05		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA4__EIM_AD04		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA3__EIM_AD03		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA2__EIM_AD02		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA1__EIM_AD01		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA0__EIM_AD00		0xb0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-nitrogen6_max.dts b/arch/arm/boot/dts/imx6q-nitrogen6_max.dts<br/>index d417457ca6db..2a3c44f98eed 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-nitrogen6_max.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-nitrogen6_max.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-nitrogen6_max.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-nitrogen6_max.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-nitrogen6_som2.dts b/arch/arm/boot/dts/imx6q-nitrogen6_som2.dts<br/>new file mode 100644<br/>index 000000000000..c5d59baa1a07<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-nitrogen6_som2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-nitrogen6_som2.dts</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Boundary Devices, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6q.dtsi"</div><div class='add'>+#include "imx6qdl-nitrogen6_som2.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Boundary Devices i.MX6 Quad Nitrogen6_SOM2 Board";</div><div class='add'>+	compatible = "boundary,imx6q-nitrogen6_som2", "fsl,imx6q";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-nitrogen6x.dts b/arch/arm/boot/dts/imx6q-nitrogen6x.dts<br/>index d1686339dc48..df8ff397a914 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-nitrogen6x.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-nitrogen6x.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-nitrogen6x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-nitrogen6x.dts</a></div><div class='hunk'>@@ -12,17 +12,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -31,11 +31,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts<br/>index 1723e89e3acc..0fa32b2f3aec 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-novena.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-novena.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-novena.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-novena.dts</a></div><div class='hunk'>@@ -210,7 +210,6 @@</div><div class='ctx'> &amp;ecspi3 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi3_novena&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;3&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -451,6 +450,10 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pwm1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;sata {</div><div class='ctx'> 	target-supply = &lt;&amp;reg_sata&gt;;</div><div class='ctx'> 	fsl,transmit-level-mV = &lt;1025&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-phytec-pbab01.dts b/arch/arm/boot/dts/imx6q-phytec-pbab01.dts<br/>index c139ac0ebe15..1f4771304da8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-phytec-pbab01.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-phytec-pbab01.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-phytec-pbab01.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-phytec-pbab01.dts</a></div><div class='hunk'>@@ -23,5 +23,5 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;sata {</div><div class='del'>-        status = "okay";</div><div class='add'>+	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts<br/>index 66d10d8d534c..02a7cdfd57c9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-sabrelite.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-sabrelite.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-sabrelite.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-sabrelite.dts</a></div><div class='hunk'>@@ -11,17 +11,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -30,11 +30,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-savageboard.dts b/arch/arm/boot/dts/imx6q-savageboard.dts<br/>new file mode 100644<br/>index 000000000000..717ac62fc2cf<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-savageboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-savageboard.dts</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2017 Milo Kim &lt;woogyom.kim@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6q.dtsi"</div><div class='add'>+#include "imx6qdl-savageboard.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Poslab SavageBoard Quad";</div><div class='add'>+	compatible = "poslab,imx6q-savageboard", "fsl,imx6q";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-ts4900.dts b/arch/arm/boot/dts/imx6q-ts4900.dts<br/>index 9b81ebc8b0d4..fab76f8cd076 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-ts4900.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-ts4900.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-ts4900.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-ts4900.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts<br/>index 65e95ae7509a..71746edc2ee9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts</a></div><div class='hunk'>@@ -105,7 +105,7 @@</div><div class='ctx'> 				pixelclk-active = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='del'>-        };</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;can1 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010.dts b/arch/arm/boot/dts/imx6q-tx6q-1010.dts<br/>index 20cd0e7b3e21..f9cd21a41a79 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-tx6q-1010.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-tx6q-1010.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-tx6q-1010.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-tx6q-1010.dts</a></div><div class='hunk'>@@ -199,7 +199,7 @@</div><div class='ctx'> 				pixelclk-active = &lt;0&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='del'>-        };</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ipu1_di0_disp0 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts<br/>index 9ed243b704ff..959ff3fb7304 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts</a></div><div class='hunk'>@@ -105,7 +105,7 @@</div><div class='ctx'> 				pixelclk-active = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='del'>-        };</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;can1 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020.dts b/arch/arm/boot/dts/imx6q-tx6q-1020.dts<br/>index 347b531d3763..b49133d25d80 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-tx6q-1020.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-tx6q-1020.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-tx6q-1020.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-tx6q-1020.dts</a></div><div class='hunk'>@@ -199,7 +199,7 @@</div><div class='ctx'> 				pixelclk-active = &lt;0&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='del'>-        };</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ds1339 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-utilite-pro.dts b/arch/arm/boot/dts/imx6q-utilite-pro.dts<br/>index 61990630a748..69bdd82ce21f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-utilite-pro.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6q-utilite-pro.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6q-utilite-pro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6q-utilite-pro.dts</a></div><div class='hunk'>@@ -59,6 +59,33 @@</div><div class='ctx'> 		rtc1 = &amp;snvs_rtc;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	encoder {</div><div class='add'>+		compatible = "ti,tfp410";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				tfp410_in: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;parallel_display_out&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+				tfp410_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;hdmi_connector_in&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	gpio-keys {</div><div class='ctx'> 		compatible = "gpio-keys";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -68,11 +95,96 @@</div><div class='ctx'> 			label = "Power Button";</div><div class='ctx'> 			gpios = &lt;&amp;gpio1 29 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='del'>-			gpio-key,wakeup;</div><div class='add'>+			wakeup-source;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hdmi-connector {</div><div class='add'>+		compatible = "hdmi-connector";</div><div class='add'>+</div><div class='add'>+		type = "a";</div><div class='add'>+		ddc-i2c-bus = &lt;&amp;i2c_dvi_ddc&gt;;</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			hdmi_connector_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;tfp410_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2cmux {</div><div class='add'>+		compatible = "i2c-mux-gpio";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_i2c1mux&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		mux-gpios = &lt;&amp;gpio1 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		i2c-parent = &lt;&amp;i2c1&gt;;</div><div class='add'>+</div><div class='add'>+		i2c@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			eeprom@50 {</div><div class='add'>+				compatible = "at24,24c02";</div><div class='add'>+				reg = &lt;0x50&gt;;</div><div class='add'>+				pagesize = &lt;16&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			em3027: rtc@56 {</div><div class='add'>+				compatible = "emmicro,em3027";</div><div class='add'>+				reg = &lt;0x56&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c_dvi_ddc: i2c@1 {</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	parallel-display {</div><div class='add'>+		compatible = "fsl,imx-parallel-display";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_ipu1&gt;;</div><div class='add'>+</div><div class='add'>+		interface-pix-fmt = "rgb24";</div><div class='add'>+</div><div class='add'>+		port@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			parallel_display_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;ipu1_di0_disp0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port@1 {</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			parallel_display_out: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;tfp410_in&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * A single IPU is not able to drive both display interfaces available on the</div><div class='add'>+ * Utilite Pro at high resolution due to its bandwidth limitation. Since the</div><div class='add'>+ * tfp410 encoder is wired up to IPU1, sever the link between IPU1 and the</div><div class='add'>+ * SoC-internal Designware HDMI encoder forcing the latter to be connected to</div><div class='add'>+ * IPU2 instead of IPU1.</div><div class='add'>+ */</div><div class='add'>+/delete-node/&amp;ipu1_di0_hdmi;</div><div class='add'>+/delete-node/&amp;hdmi_mux_0;</div><div class='add'>+/delete-node/&amp;ipu1_di1_hdmi;</div><div class='add'>+/delete-node/&amp;hdmi_mux_1;</div><div class='add'>+</div><div class='ctx'> &amp;hdmi {</div><div class='ctx'> 	ddc-i2c-bus = &lt;&amp;i2c2&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='hunk'>@@ -82,17 +194,6 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='del'>-</div><div class='del'>-	eeprom@50 {</div><div class='del'>-		compatible = "at24,24c02";</div><div class='del'>-		reg = &lt;0x50&gt;;</div><div class='del'>-		pagesize = &lt;16&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	em3027: rtc@56 {</div><div class='del'>-		compatible = "emmicro,em3027";</div><div class='del'>-		reg = &lt;0x56&gt;;</div><div class='del'>-	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c2 {</div><div class='hunk'>@@ -115,6 +216,12 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	pinctrl_i2c1mux: i2c1muxgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pinctrl_i2c2: i2c2grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='ctx'> 			MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1</div><div class='hunk'>@@ -122,6 +229,39 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	pinctrl_ipu1: ipu1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x38</div><div class='add'>+			MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15       0x38</div><div class='add'>+			MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02        0x38</div><div class='add'>+			MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03        0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00   0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01   0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02   0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03   0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04   0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05   0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06   0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07   0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08   0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09   0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22  0x38</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23  0x38</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pinctrl_uart2: uart2grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='ctx'> 			MX6QDL_PAD_GPIO_7__UART2_TX_DATA 0x1b0b1</div><div class='hunk'>@@ -165,6 +305,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;ipu1_di0_disp0 {</div><div class='add'>+	remote-endpoint = &lt;&amp;parallel_display_in&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pcie {</div><div class='ctx'> 	pcie@0,0 {</div><div class='ctx'> 		reg = &lt;0x000000 0 0 0 0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi<br/>index 99e323b57261..ba01dd76d887 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-apalis.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-apalis.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-apalis.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-apalis.dtsi</a></div><div class='hunk'>@@ -12,17 +12,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -31,11 +31,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -49,7 +49,10 @@</div><div class='ctx'> </div><div class='ctx'> 	backlight: backlight {</div><div class='ctx'> 		compatible = "pwm-backlight";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_gpio_bl_on&gt;;</div><div class='ctx'> 		pwms = &lt;&amp;pwm4 0 5000000&gt;;</div><div class='add'>+		enable-gpios = &lt;&amp;gpio3 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -172,7 +175,6 @@</div><div class='ctx'> </div><div class='ctx'> /* Apalis SPI1 */</div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio5 25 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='hunk'>@@ -181,7 +183,6 @@</div><div class='ctx'> </div><div class='ctx'> /* Apalis SPI2 */</div><div class='ctx'> &amp;ecspi2 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio2 26 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi2&gt;;</div><div class='hunk'>@@ -620,6 +621,12 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	pinctrl_gpio_bl_on: gpioblon {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pinctrl_gpio_keys: gpio1io04grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='ctx'> 			/* Power button */</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi b/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi<br/>index edbce222c782..550e100e85fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-apf6dev.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-apf6dev.dtsi</a></div><div class='hunk'>@@ -176,7 +176,6 @@</div><div class='ctx'> &amp;ecspi1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;3&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 9 GPIO_ACTIVE_LOW&gt;,</div><div class='ctx'> 		   &lt;&amp;gpio4 10 GPIO_ACTIVE_LOW&gt;,</div><div class='ctx'> 		   &lt;&amp;gpio4 11 GPIO_ACTIVE_LOW&gt;;</div><div class='hunk'>@@ -347,13 +346,13 @@</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_DI0_PIN4__GPIO4_IO20		0x100b1</div><div class='ctx'> 				MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12	0x100b1</div><div class='del'>-				MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 	0x100b1</div><div class='del'>-				MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 	0x100b1</div><div class='del'>-				MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 	0x100b1</div><div class='del'>-				MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16 	0x100b1</div><div class='del'>-				MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 	0x100b1</div><div class='del'>-				MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 	0x100b1</div><div class='del'>-				MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21  	0x100b1</div><div class='add'>+				MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13	0x100b1</div><div class='add'>+				MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14	0x100b1</div><div class='add'>+				MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15	0x100b1</div><div class='add'>+				MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16	0x100b1</div><div class='add'>+				MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17	0x100b1</div><div class='add'>+				MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18	0x100b1</div><div class='add'>+				MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21	0x100b1</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi<br/>index 54f4f0193f2b..b2debc0aa720 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-aristainetos.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-aristainetos.dtsi</a></div><div class='hunk'>@@ -100,7 +100,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi4 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 20 0&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi4&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi b/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi<br/>index 7fff02c406f2..ec68f1cace31 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi</a></div><div class='hunk'>@@ -12,17 +12,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -31,11 +31,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -114,7 +114,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;3&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 9 GPIO_ACTIVE_HIGH</div><div class='ctx'> 		    &amp;gpio4 10 GPIO_ACTIVE_HIGH</div><div class='ctx'> 		    &amp;gpio4 11 GPIO_ACTIVE_HIGH&gt;;</div><div class='hunk'>@@ -124,7 +123,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi2 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio2 26 GPIO_ACTIVE_HIGH &amp;gpio2 27 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi2&gt;;</div><div class='hunk'>@@ -132,7 +130,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi4 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 29 GPIO_ACTIVE_HIGH &amp;gpio5 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi4&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi<br/>new file mode 100644<br/>index 000000000000..e8078758f26c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-colibri.dtsi</a></div><div class='hunk'>@@ -0,0 +1,889 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2014-2016 Toradex AG</div><div class='add'>+ * Copyright 2012 Freescale Semiconductor, Inc.</div><div class='add'>+ * Copyright 2011 Linaro Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Toradex Colibri iMX6DL/S Module";</div><div class='add'>+	compatible = "toradex,colibri_imx6dl", "fsl,imx6dl";</div><div class='add'>+</div><div class='add'>+	backlight: backlight {</div><div class='add'>+		compatible = "pwm-backlight";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_gpio_bl_on&gt;;</div><div class='add'>+		pwms = &lt;&amp;pwm3 0 5000000&gt;;</div><div class='add'>+		enable-gpios = &lt;&amp;gpio3 26 GPIO_ACTIVE_HIGH&gt;; /* Colibri BL_ON */</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_1p8v: regulator-1p8v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "1P8V";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_2p5v: regulator-2p5v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "2P5V";</div><div class='add'>+		regulator-min-microvolt = &lt;2500000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;2500000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3p3v: regulator-3p3v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3P3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_usb_host_vbus: regulator-usb-host-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_regulator_usbh_pwr&gt;;</div><div class='add'>+		regulator-name = "usb_host_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio3 31 GPIO_ACTIVE_HIGH&gt;; /* USBH_PEN */</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "fsl,imx-audio-sgtl5000";</div><div class='add'>+		model = "imx6dl-colibri-sgtl5000";</div><div class='add'>+		ssi-controller = &lt;&amp;ssi1&gt;;</div><div class='add'>+		audio-codec = &lt;&amp;codec&gt;;</div><div class='add'>+		audio-routing =</div><div class='add'>+			"Headphone Jack", "HP_OUT",</div><div class='add'>+			"LINE_IN", "Line In Jack",</div><div class='add'>+			"MIC_IN", "Mic Jack",</div><div class='add'>+			"Mic Jack", "Mic Bias";</div><div class='add'>+		mux-int-port = &lt;1&gt;;</div><div class='add'>+		mux-ext-port = &lt;5&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Optional S/PDIF in on SODIMM 88 and out on SODIMM 90, 137 or 168 */</div><div class='add'>+	sound_spdif: sound-spdif {</div><div class='add'>+		compatible = "fsl,imx-audio-spdif";</div><div class='add'>+		model = "imx-spdif";</div><div class='add'>+		spdif-controller = &lt;&amp;spdif&gt;;</div><div class='add'>+		spdif-in;</div><div class='add'>+		spdif-out;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;audmux {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_audmux &amp;pinctrl_mic_gnd&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Optional on SODIMM 55/63 */</div><div class='add'>+&amp;can1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_flexcan1&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Optional on SODIMM 178/188 */</div><div class='add'>+&amp;can2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_flexcan2&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Colibri SSP */</div><div class='add'>+&amp;ecspi4 {</div><div class='add'>+	cs-gpios = &lt;&amp;gpio5 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_ecspi4&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_enet&gt;;</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hdmi {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_hdmi_ddc&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and</div><div class='add'>+ * touch screen controller</div><div class='add'>+ */</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pmic: pfuze100@08 {</div><div class='add'>+		compatible = "fsl,pfuze100";</div><div class='add'>+		reg = &lt;0x08&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			sw1a_reg: sw1ab {</div><div class='add'>+				regulator-min-microvolt = &lt;300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1875000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-ramp-delay = &lt;6250&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sw1c_reg: sw1c {</div><div class='add'>+				regulator-min-microvolt = &lt;300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1875000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-ramp-delay = &lt;6250&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sw3a_reg: sw3a {</div><div class='add'>+				regulator-min-microvolt = &lt;400000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1975000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			swbst_reg: swbst {</div><div class='add'>+				regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;5150000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			snvs_reg: vsnvs {</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vref_reg: vrefddr {</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* vgen1: unused */</div><div class='add'>+</div><div class='add'>+			vgen2_reg: vgen2 {</div><div class='add'>+				regulator-min-microvolt = &lt;800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1550000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* vgen3: unused */</div><div class='add'>+</div><div class='add'>+			vgen4_reg: vgen4 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen5_reg: vgen5 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen6_reg: vgen6 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	codec: sgtl5000@0a {</div><div class='add'>+		compatible = "fsl,sgtl5000";</div><div class='add'>+		reg = &lt;0x0a&gt;;</div><div class='add'>+		clocks = &lt;&amp;clks IMX6QDL_CLK_CKO&gt;;</div><div class='add'>+		VDDA-supply = &lt;&amp;reg_2p5v&gt;;</div><div class='add'>+		VDDIO-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* STMPE811 touch screen controller */</div><div class='add'>+	stmpe811@41 {</div><div class='add'>+		compatible = "st,stmpe811";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_touch_int&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0x41&gt;;</div><div class='add'>+		interrupts = &lt;20 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio6&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		id = &lt;0&gt;;</div><div class='add'>+		blocks = &lt;0x5&gt;;</div><div class='add'>+		irq-trigger = &lt;0x1&gt;;</div><div class='add'>+</div><div class='add'>+		stmpe_touchscreen {</div><div class='add'>+			compatible = "st,stmpe-ts";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			/* 3.25 MHz ADC clock speed */</div><div class='add'>+			st,adc-freq = &lt;1&gt;;</div><div class='add'>+			/* 8 sample average control */</div><div class='add'>+			st,ave-ctrl = &lt;3&gt;;</div><div class='add'>+			/* 7 length fractional part in z */</div><div class='add'>+			st,fraction-z = &lt;7&gt;;</div><div class='add'>+			/*</div><div class='add'>+			 * 50 mA typical 80 mA max touchscreen drivers</div><div class='add'>+			 * current limit value</div><div class='add'>+			 */</div><div class='add'>+			st,i-drive = &lt;1&gt;;</div><div class='add'>+			/* 12-bit ADC */</div><div class='add'>+			st,mod-12b = &lt;1&gt;;</div><div class='add'>+			/* internal ADC reference */</div><div class='add'>+			st,ref-sel = &lt;0&gt;;</div><div class='add'>+			/* ADC converstion time: 80 clocks */</div><div class='add'>+			st,sample-time = &lt;4&gt;;</div><div class='add'>+			/* 1 ms panel driver settling time */</div><div class='add'>+			st,settling = &lt;3&gt;;</div><div class='add'>+			/* 5 ms touch detect interrupt delay */</div><div class='add'>+			st,touch-det-delay = &lt;5&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board)</div><div class='add'>+ */</div><div class='add'>+&amp;i2c3 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default", "recovery";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;pinctrl_i2c3_recovery&gt;;</div><div class='add'>+	scl-gpios = &lt;&amp;gpio1 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	sda-gpios = &lt;&amp;gpio1 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Colibri PWM&lt;B&gt; */</div><div class='add'>+&amp;pwm1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pwm1&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Colibri PWM&lt;D&gt; */</div><div class='add'>+&amp;pwm2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pwm2&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Colibri PWM&lt;A&gt; */</div><div class='add'>+&amp;pwm3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pwm3&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Colibri PWM&lt;C&gt; */</div><div class='add'>+&amp;pwm4 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pwm4&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Optional S/PDIF out on SODIMM 137 */</div><div class='add'>+&amp;spdif {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_spdif&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ssi1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Colibri UART_A */</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart1_dte &amp;pinctrl_uart1_ctrl&gt;;</div><div class='add'>+	fsl,dte-mode;</div><div class='add'>+	uart-has-rtscts;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Colibri UART_B */</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart2_dte&gt;;</div><div class='add'>+	fsl,dte-mode;</div><div class='add'>+	uart-has-rtscts;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Colibri UART_C */</div><div class='add'>+&amp;uart3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart3_dte&gt;;</div><div class='add'>+	fsl,dte-mode;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbotg {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	disable-over-current;</div><div class='add'>+	dr_mode = "peripheral";</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Colibri MMC */</div><div class='add'>+&amp;usdhc1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc1&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	voltage-ranges = &lt;3300 3300&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* eMMC */</div><div class='add'>+&amp;usdhc3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	voltage-ranges = &lt;3300 3300&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;weim {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_weim_sram  &amp;pinctrl_weim_cs0</div><div class='add'>+		     &amp;pinctrl_weim_cs1   &amp;pinctrl_weim_cs2</div><div class='add'>+		     &amp;pinctrl_weim_rdnwr &amp;pinctrl_weim_npwe&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_audmux: audmuxgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_COL0__AUD5_TXC	0x130b0</div><div class='add'>+			MX6QDL_PAD_KEY_ROW0__AUD5_TXD	0x130b0</div><div class='add'>+			MX6QDL_PAD_KEY_COL1__AUD5_TXFS	0x130b0</div><div class='add'>+			MX6QDL_PAD_KEY_ROW1__AUD5_RXD	0x130b0</div><div class='add'>+			/* SGTL5000 sys_mclk */</div><div class='add'>+			MX6QDL_PAD_GPIO_0__CCM_CLKO1	0x000b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_cam_mclk: cammclkgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* Parallel Camera CAM sys_mclk */</div><div class='add'>+			MX6QDL_PAD_NANDF_CS2__CCM_CLKO2	0x00b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_ecspi4: ecspi4grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_D22__ECSPI4_MISO	0x100b1</div><div class='add'>+			MX6QDL_PAD_EIM_D28__ECSPI4_MOSI	0x100b1</div><div class='add'>+			MX6QDL_PAD_EIM_D21__ECSPI4_SCLK 0x100b1</div><div class='add'>+			/* SPI CS */</div><div class='add'>+			MX6QDL_PAD_EIM_A25__GPIO5_IO02	0x000b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_enet: enetgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_GPIO_16__ENET_REF_CLK     ((1&lt;&lt;30) | 0x1b0b0)</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_flexcan1: flexcan1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_7__FLEXCAN1_TX		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_GPIO_8__FLEXCAN1_RX		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_flexcan2: flexcan2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX	0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_gpio_bl_on: gpioblon {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_D26__GPIO3_IO26		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_gpio_keys: gpiokeys {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* Power button */</div><div class='add'>+			MX6QDL_PAD_EIM_A16__GPIO2_IO22		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_hdmi_ddc: hdmiddcgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_COL3__HDMI_TX_DDC_SCL 0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA 0x4001b8b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c2: i2c2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c3: i2c3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c3_recovery: i2c3recoverygrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_3__GPIO1_IO03 0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x4001b8b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_ipu1_csi0: ipu1csi0grp { /* Parallel Camera */</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_A17__IPU1_CSI1_DATA12	0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A18__IPU1_CSI1_DATA13	0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A19__IPU1_CSI1_DATA14	0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A20__IPU1_CSI1_DATA15	0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A21__IPU1_CSI1_DATA16	0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A22__IPU1_CSI1_DATA17	0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A23__IPU1_CSI1_DATA18	0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A24__IPU1_CSI1_DATA19	0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_D17__IPU1_CSI1_PIXCLK	0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_EB3__IPU1_CSI1_HSYNC	0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_D29__IPU1_CSI1_VSYNC	0xb0b1</div><div class='add'>+			/* Disable PWM pins on camera interface */</div><div class='add'>+			MX6QDL_PAD_SD4_DAT1__GPIO2_IO09		0x40</div><div class='add'>+			MX6QDL_PAD_GPIO_1__GPIO1_IO01		0x40</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_ipu1_lcdif: ipu1lcdifgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK	0xa1</div><div class='add'>+			MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15		0xa1</div><div class='add'>+			MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02		0xa1</div><div class='add'>+			MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03		0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16	0xa1</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17	0xa1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_mic_gnd: gpiomicgnd {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* Controls Mic GND, PU or '1' pull Mic GND to GND */</div><div class='add'>+			MX6QDL_PAD_RGMII_TD1__GPIO6_IO21 0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_mmc_cd: gpiommccd {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_NANDF_D5__GPIO2_IO05	0x80000000</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pwm1: pwm1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_9__PWM1_OUT	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pwm2: pwm2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_1__PWM2_OUT	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A21__GPIO2_IO17	0x00040</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pwm3: pwm3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD4_DAT1__PWM3_OUT	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_EIM_A22__GPIO2_IO16	0x00040</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pwm4: pwm4grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD4_DAT2__PWM4_OUT	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_regulator_usbh_pwr: gpioregusbhpwrgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* USBH_EN */</div><div class='add'>+			MX6QDL_PAD_EIM_D31__GPIO3_IO31	0x0f058</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_spdif: spdifgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_touch_int: gpiotouchintgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* STMPE811 interrupt */</div><div class='add'>+			MX6QDL_PAD_RGMII_TD0__GPIO6_IO20 0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart1_dce: uart1dcegrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* DTE mode */</div><div class='add'>+	pinctrl_uart1_dte: uart1dtegrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT10__UART1_RX_DATA 0x1b0b1</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT11__UART1_TX_DATA 0x1b0b1</div><div class='add'>+			MX6QDL_PAD_EIM_D19__UART1_RTS_B	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_EIM_D20__UART1_CTS_B 0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Additional DTR, DSR, DCD */</div><div class='add'>+	pinctrl_uart1_ctrl: uart1ctrlgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_D23__UART1_DCD_B 0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D24__UART1_DTR_B 0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_D25__UART1_DSR_B 0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart2_dte: uart2dtegrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD4_DAT4__UART2_TX_DATA	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_SD4_DAT7__UART2_RX_DATA	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_SD4_DAT6__UART2_RTS_B	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_SD4_DAT5__UART2_CTS_B	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart3_dte: uart3dtegrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD4_CLK__UART3_TX_DATA	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_SD4_CMD__UART3_RX_DATA	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usbc_det: usbcdetgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* USBC_DET */</div><div class='add'>+			MX6QDL_PAD_GPIO_17__GPIO7_IO12		0x1b0b0</div><div class='add'>+			/* USBC_DET_EN */</div><div class='add'>+			MX6QDL_PAD_RGMII_TX_CTL__GPIO6_IO26	0x0f058</div><div class='add'>+			/* USBC_DET_OVERWRITE */</div><div class='add'>+			MX6QDL_PAD_RGMII_RXC__GPIO6_IO30	0x0f058</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc1: usdhc1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD1_CMD__SD1_CMD	0x17071</div><div class='add'>+			MX6QDL_PAD_SD1_CLK__SD1_CLK	0x10071</div><div class='add'>+			MX6QDL_PAD_SD1_DAT0__SD1_DATA0	0x17071</div><div class='add'>+			MX6QDL_PAD_SD1_DAT1__SD1_DATA1	0x17071</div><div class='add'>+			MX6QDL_PAD_SD1_DAT2__SD1_DATA2	0x17071</div><div class='add'>+			MX6QDL_PAD_SD1_DAT3__SD1_DATA3	0x17071</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc3: usdhc3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD3_CMD__SD3_CMD	0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_CLK__SD3_CLK	0x10059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT0__SD3_DATA0	0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT1__SD3_DATA1	0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT2__SD3_DATA2	0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT3__SD3_DATA3	0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT4__SD3_DATA4	0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT5__SD3_DATA5	0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT6__SD3_DATA6	0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT7__SD3_DATA7	0x17059</div><div class='add'>+			/* eMMC reset */</div><div class='add'>+			MX6QDL_PAD_SD3_RST__SD3_RESET	0x17059</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc3_100mhz: usdhc3100mhzgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD3_CMD__SD3_CMD	0x170b9</div><div class='add'>+			MX6QDL_PAD_SD3_CLK__SD3_CLK	0x100b9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT0__SD3_DATA0	0x170b9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT1__SD3_DATA1	0x170b9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT2__SD3_DATA2	0x170b9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT3__SD3_DATA3	0x170b9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT4__SD3_DATA4	0x170b9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT5__SD3_DATA5	0x170b9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT6__SD3_DATA6	0x170b9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT7__SD3_DATA7	0x170b9</div><div class='add'>+			/* eMMC reset */</div><div class='add'>+			MX6QDL_PAD_SD3_RST__SD3_RESET	0x170b9</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc3_200mhz: usdhc3200mhzgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD3_CMD__SD3_CMD	0x170f9</div><div class='add'>+			MX6QDL_PAD_SD3_CLK__SD3_CLK	0x100f9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT0__SD3_DATA0	0x170f9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT1__SD3_DATA1	0x170f9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT2__SD3_DATA2	0x170f9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT3__SD3_DATA3	0x170f9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT4__SD3_DATA4	0x170f9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT5__SD3_DATA5	0x170f9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT6__SD3_DATA6	0x170f9</div><div class='add'>+			MX6QDL_PAD_SD3_DAT7__SD3_DATA7	0x170f9</div><div class='add'>+			/* eMMC reset */</div><div class='add'>+			MX6QDL_PAD_SD3_RST__SD3_RESET	0x170f9</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_weim_cs0: weimcs0grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* nEXT_CS0 */</div><div class='add'>+			MX6QDL_PAD_EIM_CS0__EIM_CS0_B	0xb0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_weim_cs1: weimcs1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* nEXT_CS1 */</div><div class='add'>+			MX6QDL_PAD_EIM_CS1__EIM_CS1_B	0xb0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_weim_cs2: weimcs2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* nEXT_CS2 */</div><div class='add'>+			MX6QDL_PAD_SD2_DAT1__EIM_CS2_B	0xb0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_weim_sram: weimsramgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_OE__EIM_OE_B		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_RW__EIM_RW		0xb0b1</div><div class='add'>+			/* Data */</div><div class='add'>+			MX6QDL_PAD_CSI0_DATA_EN__EIM_DATA00	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_VSYNC__EIM_DATA01	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT4__EIM_DATA02	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT5__EIM_DATA03	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT6__EIM_DATA04	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT7__EIM_DATA05	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT8__EIM_DATA06	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT9__EIM_DATA07	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT12__EIM_DATA08	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT13__EIM_DATA09	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT14__EIM_DATA10	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT15__EIM_DATA11	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT16__EIM_DATA12	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT17__EIM_DATA13	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT18__EIM_DATA14	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT19__EIM_DATA15	0x1b0b0</div><div class='add'>+			/* Address */</div><div class='add'>+			MX6QDL_PAD_EIM_DA15__EIM_AD15		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA14__EIM_AD14		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA13__EIM_AD13		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA12__EIM_AD12		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA11__EIM_AD11		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA10__EIM_AD10		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA9__EIM_AD09		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA8__EIM_AD08		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA7__EIM_AD07		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA6__EIM_AD06		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA5__EIM_AD05		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA4__EIM_AD04		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA3__EIM_AD03		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA2__EIM_AD02		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA1__EIM_AD01		0xb0b1</div><div class='add'>+			MX6QDL_PAD_EIM_DA0__EIM_AD00		0xb0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_weim_rdnwr: weimrdnwr {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD2_CLK__GPIO1_IO10		0x0040</div><div class='add'>+			MX6QDL_PAD_RGMII_TD3__GPIO6_IO23	0x130b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_weim_npwe: weimnpwe {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD2_DAT3__GPIO1_IO12		0x0040</div><div class='add'>+			MX6QDL_PAD_RGMII_TD2__GPIO6_IO22	0x130b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* ADDRESS[16:18] [25] used as GPIO */</div><div class='add'>+	pinctrl_weim_gpio_1: weimgpio-1 {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_ROW4__GPIO4_IO15		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_KEY_ROW2__GPIO4_IO11		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_KEY_COL2__GPIO4_IO10		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_NANDF_D1__GPIO2_IO01		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* ADDRESS[19:24] used as GPIO */</div><div class='add'>+	pinctrl_weim_gpio_2: weimgpio-2 {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_ROW2__GPIO4_IO11		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_KEY_COL2__GPIO4_IO10		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_NANDF_D1__GPIO2_IO01		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* DATA[16:31] used as GPIO */</div><div class='add'>+	pinctrl_weim_gpio_3: weimgpio-3 {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_LBA__GPIO2_IO27		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_BCLK__GPIO6_IO31		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_NANDF_CS3__GPIO6_IO16	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_NANDF_CS1__GPIO6_IO14	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_NANDF_RB0__GPIO6_IO10	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_NANDF_ALE__GPIO6_IO08	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_NANDF_CS0__GPIO6_IO11	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_NANDF_CLE__GPIO6_IO07	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_GPIO_19__GPIO4_IO05		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_MCLK__GPIO5_IO19	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_GPIO_4__GPIO1_IO04		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_GPIO_5__GPIO1_IO05		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_GPIO_2__GPIO1_IO02		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* DQM[0:3] used as GPIO */</div><div class='add'>+	pinctrl_weim_gpio_4: weimgpio-4 {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_EB0__GPIO2_IO28		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_EIM_EB1__GPIO2_IO29		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_SD2_DAT2__GPIO1_IO13		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_NANDF_D0__GPIO2_IO00		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* RDY used as GPIO */</div><div class='add'>+	pinctrl_weim_gpio_5: weimgpio-5 {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_WAIT__GPIO5_IO00		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* ADDRESS[16] DATA[30] used as GPIO */</div><div class='add'>+	pinctrl_weim_gpio_6: weimgpio-6 {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_ROW4__GPIO4_IO15		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_KEY_COL4__GPIO4_IO14		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi<br/>index ff41f83551de..14fff4ee6516 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-cubox-i.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-cubox-i.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi b/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi<br/>index b2c083d57598..d78312c63672 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi3 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 24 0&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi3&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi<br/>index afec2c7628ef..e8c1edc82e6e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-gw51xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw51xx.dtsi</a></div><div class='hunk'>@@ -56,38 +56,29 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	regulators {</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		reg_3p3v: regulator@0 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			regulator-name = "3P3V";</div><div class='del'>-			regulator-min-microvolt = &lt;3300000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='add'>+	reg_3p3v: regulator-3p3v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3P3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_5p0v: regulator@1 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			regulator-name = "5P0V";</div><div class='del'>-			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='add'>+	reg_5p0v: regulator-5p0v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "5P0V";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_usb_otg_vbus: regulator@2 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;2&gt;;</div><div class='del'>-			regulator-name = "usb_otg_vbus";</div><div class='del'>-			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-			gpio = &lt;&amp;gpio3 22 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-			enable-active-high;</div><div class='del'>-		};</div><div class='add'>+	reg_usb_otg_vbus: regulator-usb-otg-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usb_otg_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio3 22 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -158,6 +149,81 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	ltc3676: pmic@3c {</div><div class='add'>+		compatible = "lltc,ltc3676";</div><div class='add'>+		reg = &lt;0x3c&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_pmic&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;8 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			/* VDD_SOC (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_soc: sw1 {</div><div class='add'>+				regulator-name = "vddsoc";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_1P8 (1+R1/R2 = 2.505): GPS/VideoIn/ENET-PHY */</div><div class='add'>+			reg_1p8v: sw2 {</div><div class='add'>+				regulator-name = "vdd1p8";</div><div class='add'>+				regulator-min-microvolt = &lt;1033310&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2004000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;301000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_ARM (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_arm: sw3 {</div><div class='add'>+				regulator-name = "vddarm";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_DDR (1+R1/R2 = 2.105) */</div><div class='add'>+			reg_vdd_ddr: sw4 {</div><div class='add'>+				regulator-name = "vddddr";</div><div class='add'>+				regulator-min-microvolt = &lt;868310&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1684000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;221000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_2P5 (1+R1/R2 = 3.435): PCIe/ENET-PHY */</div><div class='add'>+			reg_2p5v: ldo2 {</div><div class='add'>+				regulator-name = "vdd2p5";</div><div class='add'>+				regulator-min-microvolt = &lt;2490375&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2490375&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;487000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_HIGH (1+R1/R2 = 4.17) */</div><div class='add'>+			reg_3p0v: ldo4 {</div><div class='add'>+				regulator-name = "vdd3p0";</div><div class='add'>+				regulator-min-microvolt = &lt;3023250&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3023250&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;634000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c3 {</div><div class='hunk'>@@ -312,6 +378,12 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		pinctrl_pmic: pmicgrp {</div><div class='add'>+			fsl,pins = &lt;</div><div class='add'>+				MX6QDL_PAD_GPIO_8__GPIO1_IO08		0x0001b0b0 /* PMIC_IRQ# */</div><div class='add'>+			&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pinctrl_pps: ppsgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_ENET_RXD1__GPIO1_IO26	0x1b0b1</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi<br/>index a7100f99123e..91991d63a69c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-gw52xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw52xx.dtsi</a></div><div class='hunk'>@@ -71,57 +71,37 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	regulators {</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		reg_1p0v: regulator@0 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			regulator-name = "1P0V";</div><div class='del'>-			regulator-min-microvolt = &lt;1000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;1000000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* remove this fixed regulator once ltc3676__sw2 driver available */</div><div class='del'>-		reg_1p8v: regulator@1 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			regulator-name = "1P8V";</div><div class='del'>-			regulator-min-microvolt = &lt;1800000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;1800000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='add'>+	reg_1p0v: regulator-1p0v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "1P0V";</div><div class='add'>+		regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_3p3v: regulator@2 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;2&gt;;</div><div class='del'>-			regulator-name = "3P3V";</div><div class='del'>-			regulator-min-microvolt = &lt;3300000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='add'>+	reg_3p3v: regulator-3p3v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3P3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_5p0v: regulator@3 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;3&gt;;</div><div class='del'>-			regulator-name = "5P0V";</div><div class='del'>-			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='add'>+	reg_5p0v: regulator-5p0v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "5P0V";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_usb_otg_vbus: regulator@4 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;4&gt;;</div><div class='del'>-			regulator-name = "usb_otg_vbus";</div><div class='del'>-			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-			gpio = &lt;&amp;gpio3 22 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-			enable-active-high;</div><div class='del'>-		};</div><div class='add'>+	reg_usb_otg_vbus: regulator-usb-otg-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usb_otg_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio3 22 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sound {</div><div class='hunk'>@@ -153,13 +133,12 @@</div><div class='ctx'> </div><div class='ctx'> &amp;clks {</div><div class='ctx'> 	assigned-clocks = &lt;&amp;clks IMX6QDL_CLK_LDB_DI0_SEL&gt;,</div><div class='del'>-	                  &lt;&amp;clks IMX6QDL_CLK_LDB_DI1_SEL&gt;;</div><div class='add'>+			  &lt;&amp;clks IMX6QDL_CLK_LDB_DI1_SEL&gt;;</div><div class='ctx'> 	assigned-clock-parents = &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;,</div><div class='del'>-	                  &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;;</div><div class='add'>+				 &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi3 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 24 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi3&gt;;</div><div class='hunk'>@@ -233,6 +212,89 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	ltc3676: pmic@3c {</div><div class='add'>+		compatible = "lltc,ltc3676";</div><div class='add'>+		reg = &lt;0x3c&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_pmic&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;8 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			/* VDD_SOC (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_soc: sw1 {</div><div class='add'>+				regulator-name = "vddsoc";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_1P8 (1+R1/R2 = 2.505): GPS/VideoIn/ENET-PHY */</div><div class='add'>+			reg_1p8v: sw2 {</div><div class='add'>+				regulator-name = "vdd1p8";</div><div class='add'>+				regulator-min-microvolt = &lt;1033310&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2004000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;301000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_ARM (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_arm: sw3 {</div><div class='add'>+				regulator-name = "vddarm";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_DDR (1+R1/R2 = 2.105) */</div><div class='add'>+			reg_vdd_ddr: sw4 {</div><div class='add'>+				regulator-name = "vddddr";</div><div class='add'>+				regulator-min-microvolt = &lt;868310&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1684000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;221000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_2P5 (1+R1/R2 = 3.435): PCIe/ENET-PHY */</div><div class='add'>+			reg_2p5v: ldo2 {</div><div class='add'>+				regulator-name = "vdd2p5";</div><div class='add'>+				regulator-min-microvolt = &lt;2490375&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2490375&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;487000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_AUD_1P8: Audio codec */</div><div class='add'>+			reg_aud_1p8v: ldo3 {</div><div class='add'>+				regulator-name = "vdd1p8";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_HIGH (1+R1/R2 = 4.17) */</div><div class='add'>+			reg_3p0v: ldo4 {</div><div class='add'>+				regulator-name = "vdd3p0";</div><div class='add'>+				regulator-min-microvolt = &lt;3023250&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3023250&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;634000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c3 {</div><div class='hunk'>@@ -467,6 +529,12 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		pinctrl_pmic: pmicgrp {</div><div class='add'>+			fsl,pins = &lt;</div><div class='add'>+				MX6QDL_PAD_GPIO_8__GPIO1_IO08		0x0001b0b0 /* PMIC_IRQ# */</div><div class='add'>+			&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pinctrl_pps: ppsgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_ENET_RXD1__GPIO1_IO26	0x1b0b1</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi<br/>index 8953eba0573d..a208e7e0dc6e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-gw53xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw53xx.dtsi</a></div><div class='hunk'>@@ -72,57 +72,37 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	regulators {</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		reg_1p0v: regulator@0 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			regulator-name = "1P0V";</div><div class='del'>-			regulator-min-microvolt = &lt;1000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;1000000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* remove when pmic 1p8 regulator available */</div><div class='del'>-		reg_1p8v: regulator@1 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			regulator-name = "1P8V";</div><div class='del'>-			regulator-min-microvolt = &lt;1800000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;1800000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='add'>+	reg_1p0v: regulator-1p0v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "1P0V";</div><div class='add'>+		regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_3p3v: regulator@2 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;2&gt;;</div><div class='del'>-			regulator-name = "3P3V";</div><div class='del'>-			regulator-min-microvolt = &lt;3300000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='add'>+	reg_3p3v: regulator-3p3v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3P3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_usb_h1_vbus: regulator@3 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;3&gt;;</div><div class='del'>-			regulator-name = "usb_h1_vbus";</div><div class='del'>-			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='add'>+	reg_usb_h1_vbus: regulator-usb-h1-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usb_h1_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_usb_otg_vbus: regulator@4 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;4&gt;;</div><div class='del'>-			regulator-name = "usb_otg_vbus";</div><div class='del'>-			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-			gpio = &lt;&amp;gpio3 22 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-			enable-active-high;</div><div class='del'>-		};</div><div class='add'>+	reg_usb_otg_vbus: regulator-usb-otg-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usb_otg_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio3 22 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sound {</div><div class='hunk'>@@ -154,9 +134,9 @@</div><div class='ctx'> </div><div class='ctx'> &amp;clks {</div><div class='ctx'> 	assigned-clocks = &lt;&amp;clks IMX6QDL_CLK_LDB_DI0_SEL&gt;,</div><div class='del'>-	                  &lt;&amp;clks IMX6QDL_CLK_LDB_DI1_SEL&gt;;</div><div class='add'>+			  &lt;&amp;clks IMX6QDL_CLK_LDB_DI1_SEL&gt;;</div><div class='ctx'> 	assigned-clock-parents = &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;,</div><div class='del'>-	                  &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;;</div><div class='add'>+				 &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;fec {</div><div class='hunk'>@@ -226,6 +206,87 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	ltc3676: pmic@3c {</div><div class='add'>+		compatible = "lltc,ltc3676";</div><div class='add'>+		reg = &lt;0x3c&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;8 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			/* VDD_SOC (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_soc: sw1 {</div><div class='add'>+				regulator-name = "vddsoc";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_1P8 (1+R1/R2 = 2.505): GPS/VideoIn/ENET-PHY */</div><div class='add'>+			reg_1p8v: sw2 {</div><div class='add'>+				regulator-name = "vdd1p8";</div><div class='add'>+				regulator-min-microvolt = &lt;1033310&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2004000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;301000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_ARM (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_arm: sw3 {</div><div class='add'>+				regulator-name = "vddarm";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_DDR (1+R1/R2 = 2.105) */</div><div class='add'>+			reg_vdd_ddr: sw4 {</div><div class='add'>+				regulator-name = "vddddr";</div><div class='add'>+				regulator-min-microvolt = &lt;868310&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1684000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;221000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_2P5 (1+R1/R2 = 3.435): PCIe/ENET-PHY */</div><div class='add'>+			reg_2p5v: ldo2 {</div><div class='add'>+				regulator-name = "vdd2p5";</div><div class='add'>+				regulator-min-microvolt = &lt;2490375&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2490375&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;487000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_AUD_1P8: Audio codec */</div><div class='add'>+			reg_aud_1p8v: ldo3 {</div><div class='add'>+				regulator-name = "vdd1p8a";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_HIGH (1+R1/R2 = 4.17) */</div><div class='add'>+			reg_3p0v: ldo4 {</div><div class='add'>+				regulator-name = "vdd3p0";</div><div class='add'>+				regulator-min-microvolt = &lt;3023250&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3023250&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;634000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c3 {</div><div class='hunk'>@@ -456,6 +517,12 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		pinctrl_pmic: pmicgrp {</div><div class='add'>+			fsl,pins = &lt;</div><div class='add'>+				MX6QDL_PAD_GPIO_8__GPIO1_IO08		0x0001b0b0 /* PMIC_IRQ# */</div><div class='add'>+			&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pinctrl_pps: ppsgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_ENET_RXD1__GPIO1_IO26	0x1b0b1</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi<br/>index 6ac41c7ed32e..968fda94d14b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-gw54xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw54xx.dtsi</a></div><div class='hunk'>@@ -144,9 +144,16 @@</div><div class='ctx'> </div><div class='ctx'> &amp;clks {</div><div class='ctx'> 	assigned-clocks = &lt;&amp;clks IMX6QDL_CLK_LDB_DI0_SEL&gt;,</div><div class='del'>-	                  &lt;&amp;clks IMX6QDL_CLK_LDB_DI1_SEL&gt;;</div><div class='add'>+			  &lt;&amp;clks IMX6QDL_CLK_LDB_DI1_SEL&gt;;</div><div class='ctx'> 	assigned-clock-parents = &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;,</div><div class='del'>-	                  &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;;</div><div class='add'>+				 &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ecspi2 {</div><div class='add'>+	cs-gpios = &lt;&amp;gpio2 26 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_ecspi2&gt;;</div><div class='add'>+	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;fec {</div><div class='hunk'>@@ -499,6 +506,15 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		pinctrl_ecspi2: escpi2grp {</div><div class='add'>+			fsl,pins = &lt;</div><div class='add'>+				MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK	0x100b1</div><div class='add'>+				MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI	0x100b1</div><div class='add'>+				MX6QDL_PAD_EIM_OE__ECSPI2_MISO	0x100b1</div><div class='add'>+				MX6QDL_PAD_EIM_RW__GPIO2_IO26	0x100b1</div><div class='add'>+			&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pinctrl_flexcan1: flexcan1grp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX	0x1b0b1</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi<br/>index 4b9fef834822..405b40310ddf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw551x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-gw551x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw551x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw551x.dtsi</a></div><div class='hunk'>@@ -78,34 +78,25 @@</div><div class='ctx'> 		reg = &lt;0x10000000 0x20000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	regulators {</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		reg_5p0v: regulator@0 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			regulator-name = "5P0V";</div><div class='del'>-			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-		};</div><div class='add'>+	reg_5p0v: regulator-5p0v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "5P0V";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_usb_h1_vbus: regulator@1 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			regulator-name = "usb_h1_vbus";</div><div class='del'>-			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-		};</div><div class='add'>+	reg_usb_h1_vbus: regulator-usb-h1-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usb_h1_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_usb_otg_vbus: regulator@2 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;2&gt;;</div><div class='del'>-			regulator-name = "usb_otg_vbus";</div><div class='del'>-			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-		};</div><div class='add'>+	reg_usb_otg_vbus: regulator-usb-otg-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usb_otg_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -174,6 +165,89 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	ltc3676: pmic@3c {</div><div class='add'>+		compatible = "lltc,ltc3676";</div><div class='add'>+		reg = &lt;0x3c&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_pmic&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;8 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			/* VDD_SOC (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_soc: sw1 {</div><div class='add'>+				regulator-name = "vddsoc";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_DDR (1+R1/R2 = 2.105) */</div><div class='add'>+			reg_vdd_ddr: sw2 {</div><div class='add'>+				regulator-name = "vddddr";</div><div class='add'>+				regulator-min-microvolt = &lt;868310&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1684000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;221000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_ARM (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_arm: sw3 {</div><div class='add'>+				regulator-name = "vddarm";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_3P3 (1+R1/R2 = 1.281) */</div><div class='add'>+			reg_3p3: sw4 {</div><div class='add'>+				regulator-name = "vdd3p3";</div><div class='add'>+				regulator-min-microvolt = &lt;1880000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3647000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;200000 56200&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_1P8a (1+R1/R2 = 2.505): HDMI In core */</div><div class='add'>+			reg_1p8a: ldo2 {</div><div class='add'>+				regulator-name = "vdd1p8a";</div><div class='add'>+				regulator-min-microvolt = &lt;1816125&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1816125&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;301000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_1P8b: HDMI In analog */</div><div class='add'>+			reg_1p8b: ldo3 {</div><div class='add'>+				regulator-name = "vdd1p8b";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_HIGH (1+R1/R2 = 4.17) */</div><div class='add'>+			reg_3p0: ldo4 {</div><div class='add'>+				regulator-name = "vdd3p0";</div><div class='add'>+				regulator-min-microvolt = &lt;3023250&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3023250&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;634000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c3 {</div><div class='hunk'>@@ -308,6 +382,12 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		pinctrl_pmic: pmicgrp {</div><div class='add'>+			fsl,pins = &lt;</div><div class='add'>+				MX6QDL_PAD_GPIO_8__GPIO1_IO08		0x0001b0b0 /* PMIC_IRQ# */</div><div class='add'>+			&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pinctrl_pwm2: pwm2grp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_SD1_DAT2__PWM2_OUT		0x1b0b1</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi<br/>index 805e23674a94..67613dd7cc92 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw552x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-gw552x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw552x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw552x.dtsi</a></div><div class='hunk'>@@ -55,37 +55,28 @@</div><div class='ctx'> 		reg = &lt;0x10000000 0x20000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	regulators {</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		reg_1p0v: regulator@0 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			regulator-name = "1P0V";</div><div class='del'>-			regulator-min-microvolt = &lt;1000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;1000000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='add'>+	reg_1p0v: regulator-1p0v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "1P0V";</div><div class='add'>+		regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_3p3v: regulator@2 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;2&gt;;</div><div class='del'>-			regulator-name = "3P3V";</div><div class='del'>-			regulator-min-microvolt = &lt;3300000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='add'>+	reg_3p3v: regulator-3p3v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3P3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		reg_5p0v: regulator@3 {</div><div class='del'>-			compatible = "regulator-fixed";</div><div class='del'>-			reg = &lt;3&gt;;</div><div class='del'>-			regulator-name = "5P0V";</div><div class='del'>-			regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-			regulator-always-on;</div><div class='del'>-		};</div><div class='add'>+	reg_5p0v: regulator-5p0v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "5P0V";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -148,6 +139,81 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	ltc3676: pmic@3c {</div><div class='add'>+		compatible = "lltc,ltc3676";</div><div class='add'>+		reg = &lt;0x3c&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_pmic&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;8 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			/* VDD_SOC (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_soc: sw1 {</div><div class='add'>+				regulator-name = "vddsoc";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_1P8 (1+R1/R2 = 2.505): ENET-PHY */</div><div class='add'>+			reg_1p8v: sw2 {</div><div class='add'>+				regulator-name = "vdd1p8";</div><div class='add'>+				regulator-min-microvolt = &lt;1033310&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2004000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;301000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_ARM (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_arm: sw3 {</div><div class='add'>+				regulator-name = "vddarm";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_DDR (1+R1/R2 = 2.105) */</div><div class='add'>+			reg_vdd_ddr: sw4 {</div><div class='add'>+				regulator-name = "vddddr";</div><div class='add'>+				regulator-min-microvolt = &lt;868310&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1684000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;221000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_2P5 (1+R1/R2 = 3.435): PCIe/ENET-PHY */</div><div class='add'>+			reg_2p5v: ldo2 {</div><div class='add'>+				regulator-name = "vdd2p5";</div><div class='add'>+				regulator-min-microvolt = &lt;2490375&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2490375&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;487000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_HIGH (1+R1/R2 = 4.17) */</div><div class='add'>+			reg_3p0v: ldo4 {</div><div class='add'>+				regulator-name = "vdd3p0";</div><div class='add'>+				regulator-min-microvolt = &lt;3023250&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3023250&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;634000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c3 {</div><div class='hunk'>@@ -260,6 +326,12 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		pinctrl_pmic: pmicgrp {</div><div class='add'>+			fsl,pins = &lt;</div><div class='add'>+				MX6QDL_PAD_GPIO_8__GPIO1_IO08		0x0001b0b0 /* PMIC_IRQ# */</div><div class='add'>+			&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pinctrl_pwm2: pwm2grp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_SD1_DAT2__PWM2_OUT		0x1b0b1</div><div class='hunk'>@@ -291,7 +363,7 @@</div><div class='ctx'> 				MX6QDL_PAD_KEY_COL1__UART5_TX_DATA	0x1b0b1</div><div class='ctx'> 				MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA	0x1b0b1</div><div class='ctx'> 			&gt;;</div><div class='del'>-                };</div><div class='add'>+		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_wdog: wdoggrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi<br/>index 86cec0527f73..57374dddf98d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw553x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-gw553x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-gw553x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-gw553x.dtsi</a></div><div class='hunk'>@@ -92,14 +92,6 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	reg_3p3v: regulator-3p3v {</div><div class='del'>-		compatible = "regulator-fixed";</div><div class='del'>-		regulator-name = "3P0V";</div><div class='del'>-		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='del'>-		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-		regulator-always-on;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	reg_5p0v: regulator-5p0v {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "5P0V";</div><div class='hunk'>@@ -179,6 +171,89 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	ltc3676: pmic@3c {</div><div class='add'>+		compatible = "lltc,ltc3676";</div><div class='add'>+		reg = &lt;0x3c&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_pmic&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;8 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			/* VDD_SOC (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_soc: sw1 {</div><div class='add'>+				regulator-name = "vddsoc";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_DDR (1+R1/R2 = 2.105) */</div><div class='add'>+			reg_vdd_ddr: sw2 {</div><div class='add'>+				regulator-name = "vddddr";</div><div class='add'>+				regulator-min-microvolt = &lt;868310&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1684000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;221000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_ARM (1+R1/R2 = 1.635) */</div><div class='add'>+			reg_vdd_arm: sw3 {</div><div class='add'>+				regulator-name = "vddarm";</div><div class='add'>+				regulator-min-microvolt = &lt;674400&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1308000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;127000 200000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_3P3 (1+R1/R2 = 1.281) */</div><div class='add'>+			reg_3p3v: sw4 {</div><div class='add'>+				regulator-name = "vdd3p3";</div><div class='add'>+				regulator-min-microvolt = &lt;1880000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3647000&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;200000 56200&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;7000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_1P8a (1+R1/R2 = 2.505): Analog Video Decoder */</div><div class='add'>+			reg_1p8a: ldo2 {</div><div class='add'>+				regulator-name = "vdd1p8a";</div><div class='add'>+				regulator-min-microvolt = &lt;1816125&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1816125&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;301000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_1P8b: microSD VDD_1P8 */</div><div class='add'>+			reg_1p8b: ldo3 {</div><div class='add'>+				regulator-name = "vdd1p8b";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* VDD_HIGH (1+R1/R2 = 4.17) */</div><div class='add'>+			reg_3p0v: ldo4 {</div><div class='add'>+				regulator-name = "vdd3p0";</div><div class='add'>+				regulator-min-microvolt = &lt;3023250&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3023250&gt;;</div><div class='add'>+				lltc,fb-voltage-divider = &lt;634000 200000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c3 {</div><div class='hunk'>@@ -255,7 +330,6 @@</div><div class='ctx'> 	pinctrl-1 = &lt;&amp;pinctrl_usdhc3_100mhz&gt;;</div><div class='ctx'> 	pinctrl-2 = &lt;&amp;pinctrl_usdhc3_200mhz&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio7 0 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-	vmmc-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -327,6 +401,12 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	pinctrl_pmic: pmicgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_8__GPIO1_IO08		0x0001b0b0 /* PMIC_IRQ# */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pinctrl_pps: ppsgrp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='ctx'> 			MX6QDL_PAD_ENET_RXD1__GPIO1_IO26	0x1b0b1</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi<br/>index d6c2358ffad4..988334c889eb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-hummingboard.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-hummingboard.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi<br/>index d5c3aa88adbe..5fab5be414fe 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -223,7 +223,7 @@</div><div class='ctx'> 	pinctrl-2 = &lt;&amp;pinctrl_usdhc3_200mhz&gt;;</div><div class='ctx'> 	vmcc-supply = &lt;&amp;reg_sd3_vmmc&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio1 1 GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-	bus-witdh=&lt;4&gt;;</div><div class='add'>+	bus-witdh = &lt;4&gt;;</div><div class='ctx'> 	no-1-8-v;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -234,7 +234,7 @@</div><div class='ctx'> 	pinctrl-1 = &lt;&amp;pinctrl_usdhc4_100mhz&gt;;</div><div class='ctx'> 	pinctrl-2 = &lt;&amp;pinctrl_usdhc4_200mhz&gt;;</div><div class='ctx'> 	vmcc-supply = &lt;&amp;reg_sd4_vmmc&gt;;</div><div class='del'>-	bus-witdh=&lt;8&gt;;</div><div class='add'>+	bus-witdh = &lt;8&gt;;</div><div class='ctx'> 	no-1-8-v;</div><div class='ctx'> 	non-removable;</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-icore.dtsi b/arch/arm/boot/dts/imx6qdl-icore.dtsi<br/>new file mode 100644<br/>index 000000000000..55bebfc9ad94<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-icore.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-icore.dtsi</a></div><div class='hunk'>@@ -0,0 +1,265 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Amarula Solutions B.V.</div><div class='add'>+ * Copyright (C) 2016 Engicam S.r.l.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x10000000 0x80000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3p3v: regulator-3p3v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3P3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_usb_h1_vbus: regulator-usb-h1-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usb_h1_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_usb_otg_vbus: regulator-usb-otg-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usb_otg_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rmii_clk: clock-rmii-clk {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;25000000&gt;;  /* 25MHz for example */</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;can1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_flexcan1&gt;;</div><div class='add'>+	xceiver-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;can2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_flexcan2&gt;;</div><div class='add'>+	xceiver-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;clks {</div><div class='add'>+	assigned-clocks = &lt;&amp;clks IMX6QDL_CLK_LVDS2_SEL&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;clks IMX6QDL_CLK_OSC&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_enet&gt;;</div><div class='add'>+	phy-reset-gpios = &lt;&amp;gpio7 12 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	clocks = &lt;&amp;clks IMX6QDL_CLK_ENET&gt;, &lt;&amp;clks IMX6QDL_CLK_ENET&gt;, &lt;&amp;rmii_clk&gt;;</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gpmi {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_gpmi_nand&gt;;</div><div class='add'>+	nand-on-flash-bbt;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c3 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart4 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart4&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbh1 {</div><div class='add'>+	vbus-supply = &lt;&amp;reg_usb_h1_vbus&gt;;</div><div class='add'>+	disable-over-current;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbotg {</div><div class='add'>+	vbus-supply = &lt;&amp;reg_usb_otg_vbus&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usbotg&gt;;</div><div class='add'>+	disable-over-current;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc1&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio1 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	no-1-8-v;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_enet: enetgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_GPIO_16__ENET_REF_CLK	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_REF_CLK__GPIO1_IO23	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_GPIO_17__GPIO7_IO12		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_flexcan1: flexcan1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b020</div><div class='add'>+			MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b020</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_flexcan2: flexcan2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b020</div><div class='add'>+			MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b020</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_gpmi_nand: gpmi-nand {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_NANDF_CLE__NAND_CLE     0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_ALE__NAND_ALE     0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_WP_B__NAND_WP_B   0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000</div><div class='add'>+			MX6QDL_PAD_NANDF_CS0__NAND_CE0_B   0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_CS1__NAND_CE1_B   0xb0b1</div><div class='add'>+			MX6QDL_PAD_SD4_CMD__NAND_RE_B      0xb0b1</div><div class='add'>+			MX6QDL_PAD_SD4_CLK__NAND_WE_B      0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D0__NAND_DATA00   0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D1__NAND_DATA01   0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D2__NAND_DATA02   0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D3__NAND_DATA03   0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D4__NAND_DATA04   0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D5__NAND_DATA05   0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D6__NAND_DATA06   0xb0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D7__NAND_DATA07   0xb0b1</div><div class='add'>+			MX6QDL_PAD_SD4_DAT0__NAND_DQS      0x00b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c1: i2c1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c2: i2c2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_EB2__I2C2_SCL  0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c3: i2c3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_5__I2C3_SCL  0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_GPIO_0__CCM_CLKO1	0x130b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart4: uart4grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1</div><div class='add'>+			MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usbotg: usbotggrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc1: usdhc1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD1_CMD__SD1_CMD    0x17070</div><div class='add'>+			MX6QDL_PAD_SD1_CLK__SD1_CLK    0x10070</div><div class='add'>+			MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17070</div><div class='add'>+			MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17070</div><div class='add'>+			MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17070</div><div class='add'>+			MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17070</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi b/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi<br/>index 469ef58ce4bc..a9b207751a02 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi<br/>index 3d62401dbd7f..6a410160c9ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-microsom.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-microsom.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-microsom.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-microsom.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi<br/>index 880bd782a5b7..6b81580623ff 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -97,15 +97,6 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	bt_rfkill {</div><div class='del'>-		compatible = "rfkill-gpio";</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_bt_rfkill&gt;;</div><div class='del'>-		gpios = &lt;&amp;gpio6 8 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-		name = "bt_rfkill";</div><div class='del'>-		type = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	gpio-keys {</div><div class='ctx'> 		compatible = "gpio-keys";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -160,7 +151,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	backlight_lcd {</div><div class='add'>+	backlight-lcd {</div><div class='ctx'> 		compatible = "pwm-backlight";</div><div class='ctx'> 		pwms = &lt;&amp;pwm1 0 5000000&gt;;</div><div class='ctx'> 		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='hunk'>@@ -169,7 +160,7 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	backlight_lvds0: backlight_lvds0 {</div><div class='add'>+	backlight_lvds0: backlight-lvds0 {</div><div class='ctx'> 		compatible = "pwm-backlight";</div><div class='ctx'> 		pwms = &lt;&amp;pwm4 0 5000000&gt;;</div><div class='ctx'> 		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='hunk'>@@ -178,7 +169,7 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	panel_lvds0 {</div><div class='add'>+	panel-lvds0 {</div><div class='ctx'> 		compatible = "hannstar,hsd100pxn1";</div><div class='ctx'> 		backlight = &lt;&amp;backlight_lvds0&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -218,7 +209,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 19 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='hunk'>@@ -328,19 +318,6 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pinctrl_bt_rfkill: bt_rfkillgrp {</div><div class='del'>-			fsl,pins = &lt;</div><div class='del'>-				/* BT wake */</div><div class='del'>-				MX6QDL_PAD_NANDF_D2__GPIO2_IO02		0x1b0b0</div><div class='del'>-				/* BT reset */</div><div class='del'>-				MX6QDL_PAD_NANDF_ALE__GPIO6_IO08	0x0b0b0</div><div class='del'>-				/* BT reg en */</div><div class='del'>-				MX6QDL_PAD_NANDF_CS2__GPIO6_IO15	0x1b0b0</div><div class='del'>-				/* BT host wake irq */</div><div class='del'>-				MX6QDL_PAD_NANDF_CS3__GPIO6_IO16	0x100b0</div><div class='del'>-			&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		pinctrl_ecspi1: ecspi1grp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_EIM_D17__ECSPI1_MISO		0x100b1</div><div class='hunk'>@@ -374,7 +351,7 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pinctrl_gpio_keys: gpio_keysgrp {</div><div class='add'>+		pinctrl_gpio_keys: gpio-keysgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				/* Home Button: J14 pin 5 */</div><div class='ctx'> 				MX6QDL_PAD_GPIO_18__GPIO7_IO13		0x1b0b0</div><div class='hunk'>@@ -457,7 +434,7 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pinctrl_wlan_vmmc: wlan_vmmcgrp {</div><div class='add'>+		pinctrl_wlan_vmmc: wlan-vmmcgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_NANDF_CLE__GPIO6_IO07	0x030b0</div><div class='ctx'> 			&gt;;</div><div class='hunk'>@@ -537,8 +514,6 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='ctx'> 	lvds-channel@0 {</div><div class='del'>-		fsl,data-mapping = "spwg";</div><div class='del'>-		fsl,data-width = &lt;18&gt;;</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> </div><div class='ctx'> 		port@4 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi<br/>index b0b3220a1fd9..bad3c9f9eeac 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -229,7 +229,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	backlight_lcd: backlight_lcd {</div><div class='add'>+	backlight_lcd: backlight-lcd {</div><div class='ctx'> 		compatible = "pwm-backlight";</div><div class='ctx'> 		pwms = &lt;&amp;pwm1 0 5000000&gt;;</div><div class='ctx'> 		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='hunk'>@@ -238,7 +238,7 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	backlight_lvds0: backlight_lvds0 {</div><div class='add'>+	backlight_lvds0: backlight-lvds0 {</div><div class='ctx'> 		compatible = "pwm-backlight";</div><div class='ctx'> 		pwms = &lt;&amp;pwm4 0 5000000&gt;;</div><div class='ctx'> 		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='hunk'>@@ -247,7 +247,7 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	backlight_lvds1: backlight_lvds1 {</div><div class='add'>+	backlight_lvds1: backlight-lvds1 {</div><div class='ctx'> 		compatible = "pwm-backlight";</div><div class='ctx'> 		pwms = &lt;&amp;pwm2 0 5000000&gt;;</div><div class='ctx'> 		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='hunk'>@@ -282,7 +282,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	panel_lcd {</div><div class='add'>+	panel-lcd {</div><div class='ctx'> 		compatible = "okaya,rs800480t-7x0gp";</div><div class='ctx'> 		backlight = &lt;&amp;backlight_lcd&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +293,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	panel_lvds0 {</div><div class='add'>+	panel-lvds0 {</div><div class='ctx'> 		compatible = "hannstar,hsd100pxn1";</div><div class='ctx'> 		backlight = &lt;&amp;backlight_lvds0&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -304,7 +304,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	panel_lvds1 {</div><div class='add'>+	panel-lvds1 {</div><div class='ctx'> 		compatible = "hannstar,hsd100pxn1";</div><div class='ctx'> 		backlight = &lt;&amp;backlight_lvds1&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -319,8 +319,6 @@</div><div class='ctx'> 		compatible = "fsl,imx6q-nitrogen6_max-sgtl5000",</div><div class='ctx'> 			     "fsl,imx-audio-sgtl5000";</div><div class='ctx'> 		model = "imx6q-nitrogen6_max-sgtl5000";</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_sgtl5000&gt;;</div><div class='ctx'> 		ssi-controller = &lt;&amp;ssi1&gt;;</div><div class='ctx'> 		audio-codec = &lt;&amp;codec&gt;;</div><div class='ctx'> 		audio-routing =</div><div class='hunk'>@@ -353,7 +351,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='hunk'>@@ -402,6 +399,8 @@</div><div class='ctx'> </div><div class='ctx'> 	codec: sgtl5000@0a {</div><div class='ctx'> 		compatible = "fsl,sgtl5000";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_sgtl5000&gt;;</div><div class='ctx'> 		reg = &lt;0x0a&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;clks IMX6QDL_CLK_CKO&gt;;</div><div class='ctx'> 		VDDA-supply = &lt;&amp;reg_2p5v&gt;;</div><div class='hunk'>@@ -447,7 +446,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;iomuxc {</div><div class='del'>-	imx6q-nitrogen6_max {</div><div class='add'>+	imx6q-nitrogen6-max {</div><div class='ctx'> 		pinctrl_audmux: audmuxgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_CSI0_DAT7__AUD3_RXD		0x130b0</div><div class='hunk'>@@ -504,7 +503,7 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pinctrl_gpio_keys: gpio_keysgrp {</div><div class='add'>+		pinctrl_gpio_keys: gpio-keysgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				/* Power Button */</div><div class='ctx'> 				MX6QDL_PAD_NANDF_D3__GPIO2_IO03		0x1b0b0</div><div class='hunk'>@@ -720,7 +719,7 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pinctrl_wlan_vmmc: wlan_vmmcgrp {</div><div class='add'>+		pinctrl_wlan_vmmc: wlan-vmmcgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_NANDF_CS0__GPIO6_IO11	0x100b0</div><div class='ctx'> 				MX6QDL_PAD_NANDF_CS2__GPIO6_IO15	0x000b0</div><div class='hunk'>@@ -739,8 +738,6 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='ctx'> 	lvds-channel@0 {</div><div class='del'>-		fsl,data-mapping = "spwg";</div><div class='del'>-		fsl,data-width = &lt;18&gt;;</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> </div><div class='ctx'> 		port@4 {</div><div class='hunk'>@@ -753,8 +750,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	lvds-channel@1 {</div><div class='del'>-		fsl,data-mapping = "spwg";</div><div class='del'>-		fsl,data-width = &lt;18&gt;;</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> </div><div class='ctx'> 		port@4 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi<br/>new file mode 100644<br/>index 000000000000..559da17297ef<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi</a></div><div class='hunk'>@@ -0,0 +1,767 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Boundary Devices, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x10000000 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	backlight_lcd: backlight-lcd {</div><div class='add'>+		compatible = "pwm-backlight";</div><div class='add'>+		pwms = &lt;&amp;pwm1 0 5000000&gt;;</div><div class='add'>+		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='add'>+		default-brightness-level = &lt;7&gt;;</div><div class='add'>+		power-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	backlight_lvds0: backlight-lvds0 {</div><div class='add'>+		compatible = "pwm-backlight";</div><div class='add'>+		pwms = &lt;&amp;pwm4 0 5000000&gt;;</div><div class='add'>+		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='add'>+		default-brightness-level = &lt;7&gt;;</div><div class='add'>+		power-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	backlight_lvds1: backlight-lvds1 {</div><div class='add'>+		compatible = "gpio-backlight";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_backlight_lvds1&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio2 31 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		default-on;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_gpio_keys&gt;;</div><div class='add'>+</div><div class='add'>+		power {</div><div class='add'>+			label = "Power Button";</div><div class='add'>+			gpios = &lt;&amp;gpio2 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;KEY_POWER&gt;;</div><div class='add'>+			wakeup-source;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		menu {</div><div class='add'>+			label = "Menu";</div><div class='add'>+			gpios = &lt;&amp;gpio2 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;KEY_MENU&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		home {</div><div class='add'>+			label = "Home";</div><div class='add'>+			gpios = &lt;&amp;gpio2 4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;KEY_HOME&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		back {</div><div class='add'>+			label = "Back";</div><div class='add'>+			gpios = &lt;&amp;gpio2 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;KEY_BACK&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		volume-up {</div><div class='add'>+			label = "Volume Up";</div><div class='add'>+			gpios = &lt;&amp;gpio7 13 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;KEY_VOLUMEUP&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		volume-down {</div><div class='add'>+			label = "Volume Down";</div><div class='add'>+			gpios = &lt;&amp;gpio7 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;KEY_VOLUMEDOWN&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lcd_display: display@di0 {</div><div class='add'>+		compatible = "fsl,imx-parallel-display";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		interface-pix-fmt = "bgr666";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_j15&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		port@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			lcd_display_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;ipu1_di0_disp0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port@1 {</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			lcd_display_out: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;lcd_panel_in&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	panel-lcd {</div><div class='add'>+		compatible = "okaya,rs800480t-7x0gp";</div><div class='add'>+		backlight = &lt;&amp;backlight_lcd&gt;;</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			lcd_panel_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;lcd_display_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	panel-lvds0 {</div><div class='add'>+		compatible = "hannstar,hsd100pxn1";</div><div class='add'>+		backlight = &lt;&amp;backlight_lvds0&gt;;</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			panel_in_lvds0: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;lvds0_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	panel-lvds1 {</div><div class='add'>+		compatible = "hannstar,hsd100pxn1";</div><div class='add'>+		backlight = &lt;&amp;backlight_lvds1&gt;;</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			panel_in_lvds1: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;lvds1_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_1p8v: regulator-1v8 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "1P8V";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_2p5v: regulator-2v5 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "2P5V";</div><div class='add'>+		regulator-min-microvolt = &lt;2500000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;2500000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3p3v: regulator-3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3P3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_can_xcvr: regulator-can-xcvr {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "CAN XCVR";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_can_xcvr&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio1 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_usb_h1_vbus: regulator-usb-h1-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_usbh1&gt;;</div><div class='add'>+		regulator-name = "usb_h1_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_usb_otg_vbus: regulator-usb-otg-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usb_otg_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio3 22 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_wlan_vmmc: regulator-wlan-vmmc {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_wlan_vmmc&gt;;</div><div class='add'>+		regulator-name = "reg_wlan_vmmc";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio6 15 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		startup-delay-us = &lt;70000&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "fsl,imx6q-nitrogen6_som2-sgtl5000",</div><div class='add'>+			     "fsl,imx-audio-sgtl5000";</div><div class='add'>+		model = "imx6q-nitrogen6_som2-sgtl5000";</div><div class='add'>+		ssi-controller = &lt;&amp;ssi1&gt;;</div><div class='add'>+		audio-codec = &lt;&amp;codec&gt;;</div><div class='add'>+		audio-routing =</div><div class='add'>+			"MIC_IN", "Mic Jack",</div><div class='add'>+			"Mic Jack", "Mic Bias",</div><div class='add'>+			"Headphone Jack", "HP_OUT";</div><div class='add'>+		mux-int-port = &lt;1&gt;;</div><div class='add'>+		mux-ext-port = &lt;3&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;audmux {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_audmux&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;can1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_can1&gt;;</div><div class='add'>+	xceiver-supply = &lt;&amp;reg_can_xcvr&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;clks {</div><div class='add'>+	assigned-clocks = &lt;&amp;clks IMX6QDL_CLK_LDB_DI0_SEL&gt;,</div><div class='add'>+			  &lt;&amp;clks IMX6QDL_CLK_LDB_DI1_SEL&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;,</div><div class='add'>+				 &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ecspi1 {</div><div class='add'>+	cs-gpios = &lt;&amp;gpio3 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	flash: m25p80@0 {</div><div class='add'>+		compatible = "microchip,sst25vf016b";</div><div class='add'>+		spi-max-frequency = &lt;20000000&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_enet&gt;;</div><div class='add'>+	phy-mode = "rgmii";</div><div class='add'>+	interrupts-extended = &lt;&amp;gpio1 6 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			      &lt;&amp;intc 0 119 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	fsl,err006687-workaround-present;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hdmi {</div><div class='add'>+	ddc-i2c-bus = &lt;&amp;i2c2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	codec: sgtl5000@0a {</div><div class='add'>+		compatible = "fsl,sgtl5000";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_sgtl5000&gt;;</div><div class='add'>+		reg = &lt;0x0a&gt;;</div><div class='add'>+		clocks = &lt;&amp;clks IMX6QDL_CLK_CKO&gt;;</div><div class='add'>+		VDDA-supply = &lt;&amp;reg_2p5v&gt;;</div><div class='add'>+		VDDIO-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtc@68 {</div><div class='add'>+		compatible = "st,rv4162";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_rv4162&gt;;</div><div class='add'>+		reg = &lt;0x68&gt;;</div><div class='add'>+		interrupts-extended = &lt;&amp;gpio6 7 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c3 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	touchscreen@04 {</div><div class='add'>+		compatible = "eeti,egalax_ts";</div><div class='add'>+		reg = &lt;0x04&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;9 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		wakeup-gpios = &lt;&amp;gpio1 9 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	touchscreen@38 {</div><div class='add'>+		compatible = "edt,edt-ft5x06";</div><div class='add'>+		reg = &lt;0x38&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;9 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_audmux: audmuxgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT7__AUD3_RXD		0x130b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT4__AUD3_TXC		0x130b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT5__AUD3_TXD		0x110b0</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS		0x130b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_backlight_lvds1: backlight-lvds1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_EB3__GPIO2_IO31		0x0b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_can1: can1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX	0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_can_xcvr: can-xcvrgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* Flexcan XCVR enable */</div><div class='add'>+			MX6QDL_PAD_GPIO_2__GPIO1_IO02		0x0b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_ecspi1: ecspi1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_D17__ECSPI1_MISO		0x100b1</div><div class='add'>+			MX6QDL_PAD_EIM_D18__ECSPI1_MOSI		0x100b1</div><div class='add'>+			MX6QDL_PAD_EIM_D16__ECSPI1_SCLK		0x100b1</div><div class='add'>+			MX6QDL_PAD_EIM_D19__GPIO3_IO19		0x000b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_enet: enetgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TXC__RGMII_TXC		0x100b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TD0__RGMII_TD0		0x100b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TD1__RGMII_TD1		0x100b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TD2__RGMII_TD2		0x100b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TD3__RGMII_TD3		0x100b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL	0x100b0</div><div class='add'>+			MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK	0x100b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RXC__RGMII_RXC		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RD0__RGMII_RD0		0x130b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RD1__RGMII_RD1		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RD2__RGMII_RD2		0x130b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RD3__RGMII_RD3		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL	0x130b0</div><div class='add'>+			MX6QDL_PAD_ENET_RXD0__GPIO1_IO27	0x030b0</div><div class='add'>+			MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_GPIO_6__ENET_IRQ		0x000b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_gpio_keys: gpio-keysgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* Power Button */</div><div class='add'>+			MX6QDL_PAD_NANDF_D3__GPIO2_IO03		0x1b0b0</div><div class='add'>+			/* Menu Button */</div><div class='add'>+			MX6QDL_PAD_NANDF_D1__GPIO2_IO01		0x1b0b0</div><div class='add'>+			/* Home Button */</div><div class='add'>+			MX6QDL_PAD_NANDF_D4__GPIO2_IO04		0x1b0b0</div><div class='add'>+			/* Back Button */</div><div class='add'>+			MX6QDL_PAD_NANDF_D2__GPIO2_IO02		0x1b0b0</div><div class='add'>+			/* Volume Up Button */</div><div class='add'>+			MX6QDL_PAD_GPIO_18__GPIO7_IO13		0x1b0b0</div><div class='add'>+			/* Volume Down Button */</div><div class='add'>+			MX6QDL_PAD_SD3_DAT4__GPIO7_IO01		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c1: i2c1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_D21__I2C1_SCL	0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_EIM_D28__I2C1_SDA	0x4001b8b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c2: i2c2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_COL3__I2C2_SCL	0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_KEY_ROW3__I2C2_SDA	0x4001b8b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c3: i2c3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_5__I2C3_SCL	0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_GPIO_16__I2C3_SDA	0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_GPIO_9__GPIO1_IO09	0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c3mux: i2c3muxgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* PCIe I2C enable */</div><div class='add'>+			MX6QDL_PAD_EIM_OE__GPIO2_IO25	0x000b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_j15: j15grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x10</div><div class='add'>+			MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15       0x10</div><div class='add'>+			MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02        0x10</div><div class='add'>+			MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03        0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00   0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01   0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02   0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03   0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04   0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05   0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06   0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07   0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08   0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09   0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22  0x10</div><div class='add'>+			MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23  0x10</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pcie: pciegrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			/* PCIe reset */</div><div class='add'>+			MX6QDL_PAD_EIM_BCLK__GPIO6_IO31	0x030b0</div><div class='add'>+			MX6QDL_PAD_EIM_DA4__GPIO3_IO04	0x030b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pwm1: pwm1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD1_DAT3__PWM1_OUT	0x030b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pwm3: pwm3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD1_DAT1__PWM3_OUT	0x030b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pwm4: pwm4grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD1_CMD__PWM4_OUT	0x030b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_rv4162: rv4162grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_NANDF_CLE__GPIO6_IO07	0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_sgtl5000: sgtl5000grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_0__CCM_CLKO1		0x000b0</div><div class='add'>+			MX6QDL_PAD_EIM_D29__GPIO3_IO29		0x130b0</div><div class='add'>+			MX6QDL_PAD_EIM_DA2__GPIO3_IO02		0x130b0</div><div class='add'>+			MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24	0x130b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart1: uart1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart2: uart2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_D26__UART2_TX_DATA	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_EIM_D27__UART2_RX_DATA	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart3: uart3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_D24__UART3_TX_DATA	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_EIM_D25__UART3_RX_DATA	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_EIM_D23__UART3_CTS_B		0x1b0b1</div><div class='add'>+			MX6QDL_PAD_EIM_D31__UART3_RTS_B		0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usbh1: usbh1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_17__GPIO7_IO12		0x030b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usbotg: usbotggrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x17059</div><div class='add'>+			MX6QDL_PAD_KEY_COL4__USB_OTG_OC		0x1b0b0</div><div class='add'>+			/* power enable, high active */</div><div class='add'>+			MX6QDL_PAD_EIM_D22__GPIO3_IO22		0x030b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc2: usdhc2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD2_CLK__SD2_CLK		0x10071</div><div class='add'>+			MX6QDL_PAD_SD2_CMD__SD2_CMD		0x17071</div><div class='add'>+			MX6QDL_PAD_SD2_DAT0__SD2_DATA0		0x17071</div><div class='add'>+			MX6QDL_PAD_SD2_DAT1__SD2_DATA1		0x17071</div><div class='add'>+			MX6QDL_PAD_SD2_DAT2__SD2_DATA2		0x17071</div><div class='add'>+			MX6QDL_PAD_SD2_DAT3__SD2_DATA3		0x17071</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc3: usdhc3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD3_CLK__SD3_CLK		0x10071</div><div class='add'>+			MX6QDL_PAD_SD3_CMD__SD3_CMD		0x17071</div><div class='add'>+			MX6QDL_PAD_SD3_DAT0__SD3_DATA0		0x17071</div><div class='add'>+			MX6QDL_PAD_SD3_DAT1__SD3_DATA1		0x17071</div><div class='add'>+			MX6QDL_PAD_SD3_DAT2__SD3_DATA2		0x17071</div><div class='add'>+			MX6QDL_PAD_SD3_DAT3__SD3_DATA3		0x17071</div><div class='add'>+			MX6QDL_PAD_SD3_DAT5__GPIO7_IO00		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc4: usdhc4grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD4_CMD__SD4_CMD		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_CLK__SD4_CLK		0x10059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT0__SD4_DATA0		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT1__SD4_DATA1		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT2__SD4_DATA2		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT3__SD4_DATA3		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT4__SD4_DATA4		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT5__SD4_DATA5		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT6__SD4_DATA6		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT7__SD4_DATA7		0x17059</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_wlan_vmmc: wlan-vmmcgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_NANDF_CS1__GPIO6_IO14	0x100b0</div><div class='add'>+			MX6QDL_PAD_NANDF_CS2__GPIO6_IO15	0x030b0</div><div class='add'>+			MX6QDL_PAD_NANDF_CS3__GPIO6_IO16	0x030b0</div><div class='add'>+			MX6QDL_PAD_SD1_CLK__OSC32K_32K_OUT	0x000b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ipu1_di0_disp0 {</div><div class='add'>+	remote-endpoint = &lt;&amp;lcd_display_in&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ldb {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	lvds-channel@0 {</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		port@4 {</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+			lvds0_out: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;panel_in_lvds0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lvds-channel@1 {</div><div class='add'>+		fsl,data-mapping = "spwg";</div><div class='add'>+		fsl,data-width = &lt;18&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		port@4 {</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+			lvds1_out: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;panel_in_lvds1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pcie {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pcie&gt;;</div><div class='add'>+	reset-gpio = &lt;&amp;gpio6 31 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pwm1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pwm3&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm4 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pwm4&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ssi1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart3&gt;;</div><div class='add'>+	uart-has-rtscts;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbh1 {</div><div class='add'>+	vbus-supply = &lt;&amp;reg_usb_h1_vbus&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbotg {</div><div class='add'>+	vbus-supply = &lt;&amp;reg_usb_otg_vbus&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usbotg&gt;;</div><div class='add'>+	disable-over-current;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc2&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_wlan_vmmc&gt;;</div><div class='add'>+	cap-power-off-card;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	wlcore: wlcore@2 {</div><div class='add'>+		compatible = "ti,wl1271";</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio6&gt;;</div><div class='add'>+		interrupts = &lt;14 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		ref-clock-frequency = &lt;38400000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc3&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio7 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc4 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc4&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_1p8v&gt;;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi<br/>index db868bc42c0f..70772ebadd4d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi</a></div><div class='hunk'>@@ -12,17 +12,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -31,11 +31,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -167,7 +167,7 @@</div><div class='ctx'> 		mux-ext-port = &lt;3&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	backlight_lcd: backlight_lcd {</div><div class='add'>+	backlight_lcd: backlight-lcd {</div><div class='ctx'> 		compatible = "pwm-backlight";</div><div class='ctx'> 		pwms = &lt;&amp;pwm1 0 5000000&gt;;</div><div class='ctx'> 		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='hunk'>@@ -176,7 +176,7 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	backlight_lvds: backlight_lvds {</div><div class='add'>+	backlight_lvds: backlight-lvds {</div><div class='ctx'> 		compatible = "pwm-backlight";</div><div class='ctx'> 		pwms = &lt;&amp;pwm4 0 5000000&gt;;</div><div class='ctx'> 		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='hunk'>@@ -211,7 +211,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	lcd_panel {</div><div class='add'>+	panel-lcd {</div><div class='ctx'> 		compatible = "okaya,rs800480t-7x0gp";</div><div class='ctx'> 		backlight = &lt;&amp;backlight_lcd&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -222,7 +222,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	panel {</div><div class='add'>+	panel-lvds0 {</div><div class='ctx'> 		compatible = "hannstar,hsd100pxn1";</div><div class='ctx'> 		backlight = &lt;&amp;backlight_lvds&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -255,7 +255,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 19 0&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='hunk'>@@ -413,7 +412,7 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pinctrl_gpio_keys: gpio_keysgrp {</div><div class='add'>+		pinctrl_gpio_keys: gpio-keysgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				/* Power Button */</div><div class='ctx'> 				MX6QDL_PAD_NANDF_D3__GPIO2_IO03		0x1b0b0</div><div class='hunk'>@@ -533,7 +532,6 @@</div><div class='ctx'> 				MX6QDL_PAD_SD2_DAT1__SD2_DATA1		0x17071</div><div class='ctx'> 				MX6QDL_PAD_SD2_DAT2__SD2_DATA2		0x17071</div><div class='ctx'> 				MX6QDL_PAD_SD2_DAT3__SD2_DATA3		0x17071</div><div class='del'>-				MX6QDL_PAD_NANDF_CS2__GPIO6_IO15	0x000b0</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -561,7 +559,7 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pinctrl_wlan_vmmc: wlan_vmmcgrp {</div><div class='add'>+		pinctrl_wlan_vmmc: wlan-vmmcgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX6QDL_PAD_NANDF_CS0__GPIO6_IO11	0x100b0</div><div class='ctx'> 				MX6QDL_PAD_NANDF_CS2__GPIO6_IO15	0x000b0</div><div class='hunk'>@@ -580,8 +578,6 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='ctx'> 	lvds-channel@0 {</div><div class='del'>-		fsl,data-mapping = "spwg";</div><div class='del'>-		fsl,data-width = &lt;18&gt;;</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> </div><div class='ctx'> 		port@4 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi<br/>index e0280cac2484..6e5cb6a99550 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi</a></div><div class='hunk'>@@ -76,7 +76,6 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi3&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 24 0&gt;;</div><div class='ctx'> </div><div class='ctx'> 	flash@0 {</div><div class='hunk'>@@ -427,10 +426,10 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usdhc3 {</div><div class='del'>-        pinctrl-names = "default";</div><div class='del'>-        pinctrl-0 = &lt;&amp;pinctrl_usdhc3</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc3</div><div class='ctx'> 		     &amp;pinctrl_usdhc3_cdwp&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio1 27 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	wp-gpios = &lt;&amp;gpio1 29 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-        status = "disabled";</div><div class='add'>+	status = "disabled";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-rex.dtsi b/arch/arm/boot/dts/imx6qdl-rex.dtsi<br/>index 17704a5c1bcb..5cf90c24c707 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-rex.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-rex.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-rex.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-rex.dtsi</a></div><div class='hunk'>@@ -89,7 +89,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi2 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio5 12 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi2&gt;;</div><div class='hunk'>@@ -97,7 +96,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi3 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 26 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi3&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi<br/>index e000e6f12bf5..a2a714d199ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-sabreauto.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-sabreauto.dtsi</a></div><div class='hunk'>@@ -124,7 +124,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 19 0&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1 &amp;pinctrl_ecspi1_cs&gt;;</div><div class='hunk'>@@ -283,7 +282,7 @@</div><div class='ctx'> 		VD-supply = &lt;&amp;reg_audio&gt;;</div><div class='ctx'> 		VLS-supply = &lt;&amp;reg_audio&gt;;</div><div class='ctx'> 		VLC-supply = &lt;&amp;reg_audio&gt;;</div><div class='del'>-        };</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -613,8 +612,6 @@</div><div class='ctx'> &amp;weim {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_weim_nor &amp;pinctrl_weim_cs0&gt;;</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='ctx'> 	ranges = &lt;0 0 0x08000000 0x08000000&gt;;</div><div class='ctx'> 	status = "disabled"; /* pin conflict with SPI NOR */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi<br/>index 81dd6cd1937d..84131794e97b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-sabrelite.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-sabrelite.dtsi</a></div><div class='hunk'>@@ -11,17 +11,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -30,11 +30,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -153,7 +153,7 @@</div><div class='ctx'> 		mux-ext-port = &lt;4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	backlight_lcd: backlight_lcd {</div><div class='add'>+	backlight_lcd: backlight-lcd {</div><div class='ctx'> 		compatible = "pwm-backlight";</div><div class='ctx'> 		pwms = &lt;&amp;pwm1 0 5000000&gt;;</div><div class='ctx'> 		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='hunk'>@@ -162,7 +162,7 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	backlight_lvds: backlight_lvds {</div><div class='add'>+	backlight_lvds: backlight-lvds {</div><div class='ctx'> 		compatible = "pwm-backlight";</div><div class='ctx'> 		pwms = &lt;&amp;pwm4 0 5000000&gt;;</div><div class='ctx'> 		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='hunk'>@@ -197,7 +197,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	lcd_panel {</div><div class='add'>+	panel-lcd {</div><div class='ctx'> 		compatible = "okaya,rs800480t-7x0gp";</div><div class='ctx'> 		backlight = &lt;&amp;backlight_lcd&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -208,7 +208,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	panel {</div><div class='add'>+	panel-lvds0 {</div><div class='ctx'> 		compatible = "hannstar,hsd100pxn1";</div><div class='ctx'> 		backlight = &lt;&amp;backlight_lvds&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +241,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 19 0&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='hunk'>@@ -378,7 +377,7 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pinctrl_gpio_keys: gpio_keysgrp {</div><div class='add'>+		pinctrl_gpio_keys: gpio-keysgrp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				/* Power Button */</div><div class='ctx'> 				MX6QDL_PAD_NANDF_D3__GPIO2_IO03		0x1b0b0</div><div class='hunk'>@@ -525,8 +524,6 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='ctx'> 	lvds-channel@0 {</div><div class='del'>-		fsl,data-mapping = "spwg";</div><div class='del'>-		fsl,data-width = &lt;18&gt;;</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> </div><div class='ctx'> 		port@4 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi<br/>index 8e9e0d98db2f..63bf95ed8c88 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-sabresd.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-sabresd.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-sabresd.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-sabresd.dtsi</a></div><div class='hunk'>@@ -129,8 +129,8 @@</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pinctrl_gpio_leds&gt;;</div><div class='ctx'> </div><div class='ctx'> 		red {</div><div class='del'>-		        gpios = &lt;&amp;gpio1 2 0&gt;;</div><div class='del'>-		        default-state = "on";</div><div class='add'>+			gpios = &lt;&amp;gpio1 2 0&gt;;</div><div class='add'>+			default-state = "on";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -160,7 +160,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 9 0&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-savageboard.dtsi b/arch/arm/boot/dts/imx6qdl-savageboard.dtsi<br/>new file mode 100644<br/>index 000000000000..a616e3c400d3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-savageboard.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-savageboard.dtsi</a></div><div class='hunk'>@@ -0,0 +1,255 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2017 Milo Kim &lt;woogyom.kim@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@10000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x10000000 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_gpio_keys&gt;;</div><div class='add'>+</div><div class='add'>+		power {</div><div class='add'>+			gpios = &lt;&amp;gpio3 7 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			label = "Power Button";</div><div class='add'>+			linux,code = &lt;KEY_POWER&gt;;</div><div class='add'>+			wakeup-source;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	panel {</div><div class='add'>+		compatible = "avic,tm097tdh02", "hannstar,hsd100pxn1";</div><div class='add'>+		backlight = &lt;&amp;panel_bl&gt;;</div><div class='add'>+		power-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			panel_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;lvds0_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	panel_bl: backlight {</div><div class='add'>+		compatible = "pwm-backlight";</div><div class='add'>+		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='add'>+		default-brightness-level = &lt;4&gt;;</div><div class='add'>+		power-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+		pwms = &lt;&amp;pwm1 0 10000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3p3v: regulator-3p3v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3P3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;clks {</div><div class='add'>+	assigned-clocks = &lt;&amp;clks IMX6QDL_CLK_LDB_DI0_SEL&gt;,</div><div class='add'>+			  &lt;&amp;clks IMX6QDL_CLK_LDB_DI1_SEL&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;,</div><div class='add'>+				 &lt;&amp;clks IMX6QDL_CLK_PLL3_USB_OTG&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec {</div><div class='add'>+	phy-mode = "rgmii";</div><div class='add'>+	phy-reset-gpios = &lt;&amp;gpio1 25 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_enet&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hdmi {</div><div class='add'>+	ddc-i2c-bus = &lt;&amp;i2c2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ldb {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	lvds-channel@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		port@4 {</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+			lvds0_out: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;panel_in&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pwm1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbh1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SD card */</div><div class='add'>+&amp;usdhc3 {</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio2 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	no-1-8-v;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_sd&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* eMMC */</div><div class='add'>+&amp;usdhc4 {</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+	no-1-8-v;</div><div class='add'>+	non-removable;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_emmc&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_emmc: emmcgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD4_CMD__SD4_CMD		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_CLK__SD4_CLK		0x10059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT0__SD4_DATA0		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT1__SD4_DATA1		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT2__SD4_DATA2		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT3__SD4_DATA3		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT4__SD4_DATA4		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT5__SD4_DATA5		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT6__SD4_DATA6		0x17059</div><div class='add'>+			MX6QDL_PAD_SD4_DAT7__SD4_DATA7		0x17059</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_enet: enetgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_TXC__RGMII_TXC		0x1b030</div><div class='add'>+			MX6QDL_PAD_RGMII_TD0__RGMII_TD0		0x1b030</div><div class='add'>+			MX6QDL_PAD_RGMII_TD1__RGMII_TD1		0x1b030</div><div class='add'>+			MX6QDL_PAD_RGMII_TD2__RGMII_TD2		0x1b030</div><div class='add'>+			MX6QDL_PAD_RGMII_TD3__RGMII_TD3		0x1b030</div><div class='add'>+			MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL	0x1b030</div><div class='add'>+			MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK	0x1b0b0</div><div class='add'>+			MX6QDL_PAD_RGMII_RXC__RGMII_RXC		0x1b030</div><div class='add'>+			MX6QDL_PAD_RGMII_RD0__RGMII_RD0		0x1b030</div><div class='add'>+			MX6QDL_PAD_RGMII_RD1__RGMII_RD1		0x1b030</div><div class='add'>+			MX6QDL_PAD_RGMII_RD2__RGMII_RD2		0x1b030</div><div class='add'>+			MX6QDL_PAD_RGMII_RD3__RGMII_RD3		0x1b030</div><div class='add'>+			MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL	0x1b030</div><div class='add'>+			/* PHY reset */</div><div class='add'>+			MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25	0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_gpio_keys: gpiokeysgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_EIM_DA7__GPIO3_IO07		0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c2: i2c2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_KEY_COL3__I2C2_SCL		0x4001b8b1</div><div class='add'>+			MX6QDL_PAD_KEY_ROW3__I2C2_SDA		0x4001b8b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pwm1: pwm1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD1_DAT3__PWM1_OUT		0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_sd: sdgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_SD3_CMD__SD3_CMD		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_CLK__SD3_CLK		0x10059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT0__SD3_DATA0		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT1__SD3_DATA1		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT2__SD3_DATA2		0x17059</div><div class='add'>+			MX6QDL_PAD_SD3_DAT3__SD3_DATA3		0x17059</div><div class='add'>+			/* CD pin */</div><div class='add'>+			MX6QDL_PAD_NANDF_D0__GPIO2_IO00		0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart1: uart1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA	0x1b0b1</div><div class='add'>+			MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-ts4900.dtsi b/arch/arm/boot/dts/imx6qdl-ts4900.dtsi<br/>index 5c26b26e851a..267c956d8910 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-ts4900.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-ts4900.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-ts4900.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-ts4900.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -95,7 +95,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio3 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='hunk'>@@ -109,7 +108,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi2 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio6 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi2&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi<br/>index ac9529f85593..1691714f13a2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-tx6.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-tx6.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-tx6.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-tx6.dtsi</a></div><div class='hunk'>@@ -221,7 +221,6 @@</div><div class='ctx'> &amp;ecspi1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;</div><div class='ctx'> 		&amp;gpio2 30 GPIO_ACTIVE_HIGH</div><div class='ctx'> 		&amp;gpio3 19 GPIO_ACTIVE_HIGH</div><div class='hunk'>@@ -429,8 +428,8 @@</div><div class='ctx'> 	pinctrl_edt_ft5x06: edt-ft5x06grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='ctx'> 			MX6QDL_PAD_NANDF_CS2__GPIO6_IO15	0x1b0b0 /* Interrupt */</div><div class='del'>-			MX6QDL_PAD_EIM_A16__GPIO2_IO22  	0x1b0b0 /* Reset */</div><div class='del'>-			MX6QDL_PAD_EIM_A17__GPIO2_IO21  	0x1b0b0 /* Wake */</div><div class='add'>+			MX6QDL_PAD_EIM_A16__GPIO2_IO22		0x1b0b0 /* Reset */</div><div class='add'>+			MX6QDL_PAD_EIM_A17__GPIO2_IO21		0x1b0b0 /* Wake */</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -481,21 +480,21 @@</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_gpmi_nand: gpminandgrp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			MX6QDL_PAD_NANDF_CLE__NAND_CLE    	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_NANDF_ALE__NAND_ALE    	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_NANDF_WP_B__NAND_WP_B  	0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_CLE__NAND_CLE		0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_ALE__NAND_ALE		0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_WP_B__NAND_WP_B	0x0b0b1</div><div class='ctx'> 			MX6QDL_PAD_NANDF_RB0__NAND_READY_B	0x0b000</div><div class='del'>-			MX6QDL_PAD_NANDF_CS0__NAND_CE0_B  	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_SD4_CMD__NAND_RE_B     	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_SD4_CLK__NAND_WE_B     	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_NANDF_D0__NAND_DATA00  	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_NANDF_D1__NAND_DATA01  	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_NANDF_D2__NAND_DATA02  	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_NANDF_D3__NAND_DATA03  	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_NANDF_D4__NAND_DATA04  	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_NANDF_D5__NAND_DATA05  	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_NANDF_D6__NAND_DATA06  	0x0b0b1</div><div class='del'>-			MX6QDL_PAD_NANDF_D7__NAND_DATA07  	0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_CS0__NAND_CE0_B	0x0b0b1</div><div class='add'>+			MX6QDL_PAD_SD4_CMD__NAND_RE_B		0x0b0b1</div><div class='add'>+			MX6QDL_PAD_SD4_CLK__NAND_WE_B		0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D0__NAND_DATA00	0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D1__NAND_DATA01	0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D2__NAND_DATA02	0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D3__NAND_DATA03	0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D4__NAND_DATA04	0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D5__NAND_DATA05	0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D6__NAND_DATA06	0x0b0b1</div><div class='add'>+			MX6QDL_PAD_NANDF_D7__NAND_DATA07	0x0b0b1</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi<br/>index ef7fa62b9898..a32089132263 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> 				MX6QDL_PAD_EIM_D29__GPIO3_IO29		0x80000000	/* RGMII_nRST */</div><div class='ctx'> 				MX6QDL_PAD_EIM_DA13__GPIO3_IO13		0x80000000	/* BT_ON */</div><div class='ctx'> 				MX6QDL_PAD_EIM_DA14__GPIO3_IO14		0x80000000	/* BT_WAKE */</div><div class='del'>-				MX6QDL_PAD_EIM_DA15__GPIO3_IO15		0x80000000	/* BT_HOST_WAKE */				</div><div class='add'>+				MX6QDL_PAD_EIM_DA15__GPIO3_IO15		0x80000000	/* BT_HOST_WAKE */</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi<br/>index 2b9c2be436f9..82dc5744ae19 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-wandboard.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl-wandboard.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl-wandboard.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl-wandboard.dtsi</a></div><div class='hunk'>@@ -129,8 +129,8 @@</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_i2c1: i2c1grp {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='del'>-				MX6QDL_PAD_EIM_D21__I2C1_SCL 		0x4001b8b1</div><div class='del'>-				MX6QDL_PAD_EIM_D28__I2C1_SDA 		0x4001b8b1</div><div class='add'>+				MX6QDL_PAD_EIM_D21__I2C1_SCL		0x4001b8b1</div><div class='add'>+				MX6QDL_PAD_EIM_D28__I2C1_SDA		0x4001b8b1</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi<br/>index b13b0b2db881..6d7bf6496117 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qdl.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qdl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qdl.dtsi</a></div><div class='hunk'>@@ -13,9 +13,18 @@</div><div class='ctx'> #include &lt;dt-bindings/clock/imx6qdl-clock.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='del'>-</div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;fec;</div><div class='ctx'> 		can0 = &amp;can1;</div><div class='hunk'>@@ -204,9 +213,9 @@</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-map-mask = &lt;0 0 0 0x7&gt;;</div><div class='ctx'> 			interrupt-map = &lt;0 0 0 1 &amp;gpc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='del'>-			                &lt;0 0 0 2 &amp;gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='del'>-			                &lt;0 0 0 3 &amp;gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='del'>-			                &lt;0 0 0 4 &amp;gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+					&lt;0 0 0 2 &amp;gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+					&lt;0 0 0 3 &amp;gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+					&lt;0 0 0 4 &amp;gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clks IMX6QDL_CLK_PCIE_AXI&gt;,</div><div class='ctx'> 				 &lt;&amp;clks IMX6QDL_CLK_LVDS1_GATE&gt;,</div><div class='ctx'> 				 &lt;&amp;clks IMX6QDL_CLK_PCIE_REF_125M&gt;;</div><div class='hunk'>@@ -625,8 +634,8 @@</div><div class='ctx'> 				regulator-1p1 {</div><div class='ctx'> 					compatible = "fsl,anatop-regulator";</div><div class='ctx'> 					regulator-name = "vdd1p1";</div><div class='del'>-					regulator-min-microvolt = &lt;800000&gt;;</div><div class='del'>-					regulator-max-microvolt = &lt;1375000&gt;;</div><div class='add'>+					regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1200000&gt;;</div><div class='ctx'> 					regulator-always-on;</div><div class='ctx'> 					anatop-reg-offset = &lt;0x110&gt;;</div><div class='ctx'> 					anatop-vol-bit-shift = &lt;8&gt;;</div><div class='hunk'>@@ -653,15 +662,15 @@</div><div class='ctx'> 				regulator-2p5 {</div><div class='ctx'> 					compatible = "fsl,anatop-regulator";</div><div class='ctx'> 					regulator-name = "vdd2p5";</div><div class='del'>-					regulator-min-microvolt = &lt;2000000&gt;;</div><div class='add'>+					regulator-min-microvolt = &lt;2250000&gt;;</div><div class='ctx'> 					regulator-max-microvolt = &lt;2750000&gt;;</div><div class='ctx'> 					regulator-always-on;</div><div class='ctx'> 					anatop-reg-offset = &lt;0x130&gt;;</div><div class='ctx'> 					anatop-vol-bit-shift = &lt;8&gt;;</div><div class='ctx'> 					anatop-vol-bit-width = &lt;5&gt;;</div><div class='ctx'> 					anatop-min-bit-val = &lt;0&gt;;</div><div class='del'>-					anatop-min-voltage = &lt;2000000&gt;;</div><div class='del'>-					anatop-max-voltage = &lt;2750000&gt;;</div><div class='add'>+					anatop-min-voltage = &lt;2100000&gt;;</div><div class='add'>+					anatop-max-voltage = &lt;2875000&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				reg_arm: regulator-vddcore {</div><div class='hunk'>@@ -807,7 +816,7 @@</div><div class='ctx'> 				reg = &lt;0x020e0000 0x4000&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			ldb: ldb@020e0008 {</div><div class='add'>+			ldb: ldb {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='ctx'> 				compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb";</div><div class='hunk'>@@ -1092,10 +1101,14 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			weim: weim@021b8000 {</div><div class='add'>+				#address-cells = &lt;2&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='ctx'> 				compatible = "fsl,imx6q-weim";</div><div class='ctx'> 				reg = &lt;0x021b8000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 14 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX6QDL_CLK_EIM_SLOW&gt;;</div><div class='add'>+				fsl,weim-cs-gpr = &lt;&amp;gpr&gt;;</div><div class='add'>+				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ocotp: ocotp@021bc000 {</div><div class='hunk'>@@ -1153,8 +1166,10 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			vdoa@021e4000 {</div><div class='add'>+				compatible = "fsl,imx6q-vdoa";</div><div class='ctx'> 				reg = &lt;0x021e4000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 18 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;clks IMX6QDL_CLK_VDOA&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart2: serial@021e8000 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6qp.dtsi b/arch/arm/boot/dts/imx6qp.dtsi<br/>index 886dbf2eca49..24d071f5d9cd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qp.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6qp.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6qp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6qp.dtsi</a></div><div class='hunk'>@@ -85,5 +85,28 @@</div><div class='ctx'> 		pcie: pcie@0x01000000 {</div><div class='ctx'> 			compatible = "fsl,imx6qp-pcie", "snps,dw-pcie";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		aips-bus@02100000 {</div><div class='add'>+			mmdc0: mmdc@021b0000 { /* MMDC0 */</div><div class='add'>+				compatible = "fsl,imx6qp-mmdc", "fsl,imx6q-mmdc";</div><div class='add'>+				reg = &lt;0x021b0000 0x4000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;fec {</div><div class='add'>+	/delete-property/interrupts-extended;</div><div class='add'>+	interrupts = &lt;0 118 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+		     &lt;0 119 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ldb {</div><div class='add'>+	clocks = &lt;&amp;clks IMX6QDL_CLK_LDB_DI0_SEL&gt;, &lt;&amp;clks IMX6QDL_CLK_LDB_DI1_SEL&gt;,</div><div class='add'>+		 &lt;&amp;clks IMX6QDL_CLK_IPU1_DI0_SEL&gt;, &lt;&amp;clks IMX6QDL_CLK_IPU1_DI1_SEL&gt;,</div><div class='add'>+		 &lt;&amp;clks IMX6QDL_CLK_IPU2_DI0_SEL&gt;, &lt;&amp;clks IMX6QDL_CLK_IPU2_DI1_SEL&gt;,</div><div class='add'>+		 &lt;&amp;clks IMX6QDL_CLK_LDB_DI0_PODF&gt;, &lt;&amp;clks IMX6QDL_CLK_LDB_DI1_PODF&gt;;</div><div class='add'>+	clock-names = "di0_pll", "di1_pll",</div><div class='add'>+		      "di0_sel", "di1_sel", "di2_sel", "di3_sel",</div><div class='add'>+		      "di0", "di1";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts<br/>index be118820e9f7..0a90eea17018 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sl-evk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6sl-evk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sl-evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sl-evk.dts</a></div><div class='hunk'>@@ -117,7 +117,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio4 11 0&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi<br/>index 02378db3f5fc..cc9572ea2860 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6sl.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sl.dtsi</a></div><div class='hunk'>@@ -8,11 +8,21 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include "imx6sl-pinfunc.h"</div><div class='ctx'> #include &lt;dt-bindings/clock/imx6sl-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;fec;</div><div class='ctx'> 		gpio0 = &amp;gpio1;</div><div class='hunk'>@@ -893,8 +903,12 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			weim: weim@021b8000 {</div><div class='add'>+				#address-cells = &lt;2&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='ctx'> 				reg = &lt;0x021b8000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 14 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				fsl,weim-cs-gpr = &lt;&amp;gpr&gt;;</div><div class='add'>+				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ocotp: ocotp@021bc000 {</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts<br/>index 9b817f3501a6..802da45aa551 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6sx-nitrogen6sx.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-nitrogen6sx.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -142,7 +142,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi1 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio2 16 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6sx-sdb-sai.dts b/arch/arm/boot/dts/imx6sx-sdb-sai.dts<br/>index 0155450d680e..2ac865b7c364 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx-sdb-sai.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6sx-sdb-sai.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx-sdb-sai.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-sdb-sai.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi<br/>index 9d70cfd40aff..da815527a7f8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx-sdb.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6sx-sdb.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx-sdb.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-sdb.dtsi</a></div><div class='hunk'>@@ -192,10 +192,10 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c4 {</div><div class='del'>-        clock-frequency = &lt;100000&gt;;</div><div class='del'>-        pinctrl-names = "default";</div><div class='del'>-        pinctrl-0 = &lt;&amp;pinctrl_i2c4&gt;;</div><div class='del'>-        status = "okay";</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c4&gt;;</div><div class='add'>+	status = "okay";</div><div class='ctx'> </div><div class='ctx'> 	codec: wm8962@1a {</div><div class='ctx'> 		compatible = "wlf,wm8962";</div><div class='hunk'>@@ -290,6 +290,14 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;usbphy1 {</div><div class='add'>+	fsl,tx-d-cal = &lt;106&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy2 {</div><div class='add'>+	fsl,tx-d-cal = &lt;106&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usdhc2 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_usdhc2&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts<br/>new file mode 100644<br/>index 000000000000..0c1fc1a8f913<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Andreas Färber</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6sx-udoo-neo.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "UDOO Neo Basic";</div><div class='add'>+	compatible = "udoo,neobasic", "fsl,imx6sx";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x80000000 0x20000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec1 {</div><div class='add'>+	phy-handle = &lt;&amp;ethphy1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	mdio {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ethphy1: ethernet-phy@0 {</div><div class='add'>+			compatible = "ethernet-phy-ieee802.3-c22";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts<br/>new file mode 100644<br/>index 000000000000..5d6c2274ee2b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Andreas Färber</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6sx-udoo-neo.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "UDOO Neo Extended";</div><div class='add'>+	compatible = "udoo,neoextended", "fsl,imx6sx";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x80000000 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts<br/>new file mode 100644<br/>index 000000000000..653ceb29e28b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-udoo-neo-full.dts</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Andreas Färber</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6sx-udoo-neo.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "UDOO Neo Full";</div><div class='add'>+	compatible = "udoo,neofull", "fsl,imx6sx";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x80000000 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec1 {</div><div class='add'>+	phy-handle = &lt;&amp;ethphy1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	mdio {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ethphy1: ethernet-phy@0 {</div><div class='add'>+			compatible = "ethernet-phy-ieee802.3-c22";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi<br/>new file mode 100644<br/>index 000000000000..49f466fe0b1d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx-udoo-neo.dtsi</a></div><div class='hunk'>@@ -0,0 +1,430 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Andreas Färber</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "imx6sx.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,imx6sx";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		red {</div><div class='add'>+			label = "udoo-neo:red:mmc";</div><div class='add'>+			gpios = &lt;&amp;gpio6 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+			linux,default-trigger = "mmc0";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		orange {</div><div class='add'>+			label = "udoo-neo:orange:user";</div><div class='add'>+			gpios = &lt;&amp;gpio4 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "keep";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_sdio_pwr: regulator-sdio-pwr {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		gpio = &lt;&amp;gpio6 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+		regulator-name = "SDIO_PWR";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_usb_otg1_vbus: regulator-usb-otg1-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_otg1_reg&gt;;</div><div class='add'>+		regulator-name = "usb_otg1_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio1 9 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_usb_otg2_vbus: regulator-usb-otg2-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_otg2_reg&gt;;</div><div class='add'>+		regulator-name = "usb_otg2_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio4 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_wlan: regulator-wlan {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "wlan-en-regulator";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio2 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		startup-delay-us = &lt;70000&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_bt: regulator-bt {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_bt_reg&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+		gpio = &lt;&amp;gpio2 17 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		regulator-name = "bt_reg";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpu0 {</div><div class='add'>+	arm-supply = &lt;&amp;sw1a_reg&gt;;</div><div class='add'>+	soc-supply = &lt;&amp;sw1c_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_enet1&gt;;</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+	phy-reset-duration = &lt;10&gt;;</div><div class='add'>+	phy-reset-gpios = &lt;&amp;gpio2 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pmic: pmic@08 {</div><div class='add'>+		compatible = "fsl,pfuze3000";</div><div class='add'>+		reg = &lt;0x08&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			sw1a_reg: sw1a {</div><div class='add'>+				regulator-min-microvolt = &lt;700000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1475000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-ramp-delay = &lt;6250&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sw1c_reg: sw1b {</div><div class='add'>+				regulator-min-microvolt = &lt;700000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1475000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-ramp-delay = &lt;6250&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sw2_reg: sw2 {</div><div class='add'>+				regulator-min-microvolt = &lt;1500000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1850000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sw3a_reg: sw3 {</div><div class='add'>+				regulator-min-microvolt = &lt;900000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1650000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			swbst_reg: swbst {</div><div class='add'>+				regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;5150000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			snvs_reg: vsnvs {</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vref_reg: vrefddr {</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen1_reg: vldo1 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen2_reg: vldo2 {</div><div class='add'>+				regulator-min-microvolt = &lt;800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1550000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen3_reg: vccsd {</div><div class='add'>+				regulator-min-microvolt = &lt;2850000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen4_reg: v33 {</div><div class='add'>+				regulator-min-microvolt = &lt;2850000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen5_reg: vldo3 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vgen6_reg: vldo4 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_bt_reg: btreggrp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_KEY_ROW2__GPIO2_IO_17        0x15059&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_enet1: enet1grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_ENET1_CRS__GPIO2_IO_1	0xa0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_ENET1_MDC__ENET1_MDC		0xa0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_ENET1_MDIO__ENET1_MDIO	0xa0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_RGMII1_TD0__ENET1_TX_DATA_0	0xa0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_RGMII1_TD1__ENET1_TX_DATA_1	0xa0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_RGMII1_TX_CTL__ENET1_TX_EN	0xa0b1&gt;,</div><div class='add'>+</div><div class='add'>+			&lt;MX6SX_PAD_ENET1_TX_CLK__ENET1_REF_CLK1	0x3081&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_ENET2_TX_CLK__GPIO2_IO_9	0x3081&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_RGMII1_RD0__ENET1_RX_DATA_0	0x3081&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_RGMII1_RD1__ENET1_RX_DATA_1	0x3081&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN	0x3081&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_RGMII1_RXC__ENET1_RX_ER	0x3081&gt;,</div><div class='add'>+</div><div class='add'>+			&lt;MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M	0x91&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c1: i2c1grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_GPIO1_IO00__I2C1_SCL		0x4001b8b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_GPIO1_IO01__I2C1_SDA		0x4001b8b1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart1: uart1grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_GPIO1_IO04__UART1_TX		0x1b0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_GPIO1_IO05__UART1_RX		0x1b0b1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart2: uart2grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_GPIO1_IO06__UART2_TX		0x1b0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_GPIO1_IO07__UART2_RX		0x1b0b1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart3: uart3grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_SD3_DATA4__UART3_RX          0x13059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD3_DATA5__UART3_TX          0x13059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD3_DATA6__UART3_RTS_B       0x13059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD3_DATA7__UART3_CTS_B       0x13059&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart5: uart5grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_SD4_DATA4__UART5_RX		0x1b0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD4_DATA5__UART5_TX		0x1b0b1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart6: uart6grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_CSI_DATA00__UART6_RI_B	0x1b0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_CSI_DATA01__UART6_DSR_B	0x1b0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_CSI_DATA02__UART6_DTR_B	0x1b0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_CSI_DATA03__UART6_DCD_B	0x1b0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_CSI_DATA04__UART6_RX		0x1b0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_CSI_DATA05__UART6_TX		0x1b0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_CSI_DATA06__UART6_RTS_B	0x1b0b1&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_CSI_DATA07__UART6_CTS_B	0x1b0b1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_otg1_reg: otg1grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_GPIO1_IO09__GPIO1_IO_9        0x10b0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	pinctrl_otg2_reg: otg2grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_NAND_RE_B__GPIO4_IO_12        0x10b0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usb_otg1: usbotg1grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_GPIO1_IO10__ANATOP_OTG1_ID    0x17059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_GPIO1_IO08__USB_OTG1_OC       0x10b0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usb_otg2: usbot2ggrp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_QSPI1A_DATA0__USB_OTG2_OC     0x10b0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc2: usdhc2grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_SD2_CMD__USDHC2_CMD		0x17059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD2_CLK__USDHC2_CLK		0x10059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD2_DATA0__USDHC2_DATA0	0x17059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD2_DATA1__USDHC2_DATA1	0x17059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD2_DATA2__USDHC2_DATA2	0x17059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD2_DATA3__USDHC2_DATA3	0x17059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD1_DATA0__GPIO6_IO_2	0x17059&gt;; /* CD */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc3: usdhc3grp {</div><div class='add'>+		fsl,pins =</div><div class='add'>+			&lt;MX6SX_PAD_KEY_COL2__GPIO2_IO_12	0x15059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_KEY_ROW1__GPIO2_IO_16	0x13059&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD3_DATA0__USDHC3_DATA0	0x17069&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD3_DATA1__USDHC3_DATA1	0x17069&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD3_DATA2__USDHC3_DATA2	0x17069&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD3_DATA3__USDHC3_DATA3	0x17069&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD3_CMD__USDHC3_CMD		0x17069&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_SD3_CLK__USDHC3_CLK		0x10069&gt;,</div><div class='add'>+			&lt;MX6SX_PAD_CSI_MCLK__OSC32K_32K_OUT	0x10059&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Cortex-M4 serial */</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart2&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart3 { /* Bluetooth */</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart3&gt;;</div><div class='add'>+	uart-has-rtscts;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Arduino serial */</div><div class='add'>+&amp;uart5 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart5&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart6 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart6&gt;;</div><div class='add'>+	uart-has-rtscts;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbotg1 { /* J2 micro USB port */</div><div class='add'>+	vbus-supply = &lt;&amp;reg_usb_otg1_vbus&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usb_otg1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbotg2 { /* J3 host USB port */</div><div class='add'>+	vbus-supply = &lt;&amp;reg_usb_otg2_vbus&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usb_otg2&gt;;</div><div class='add'>+	dr_mode = "host";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc2&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_sdio_pwr&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio6 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	no-1-8-v;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+	wakeup-source;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc3 { /* Wi-Fi */</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc3&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_wlan&gt;;</div><div class='add'>+	cap-power-off-card;</div><div class='add'>+	wakeup-source;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	wlcore: wlcore@2 {</div><div class='add'>+		compatible = "ti,wl1831";</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio2&gt;;</div><div class='add'>+		interrupts = &lt;16 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		ref-clock-frequency = &lt;38400000&gt;;</div><div class='add'>+		tcxo-clock-frequency = &lt;26000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi<br/>index 1a473e83efbf..dd4ec85ecbaa 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6sx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6sx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6sx.dtsi</a></div><div class='hunk'>@@ -11,9 +11,19 @@</div><div class='ctx'> #include &lt;dt-bindings/input/input.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include "imx6sx-pinfunc.h"</div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		can0 = &amp;flexcan1;</div><div class='ctx'> 		can1 = &amp;flexcan2;</div><div class='hunk'>@@ -858,7 +868,7 @@</div><div class='ctx'> 				fsl,num-tx-queues=&lt;3&gt;;</div><div class='ctx'> 				fsl,num-rx-queues=&lt;3&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='del'>-                        };</div><div class='add'>+			};</div><div class='ctx'> </div><div class='ctx'> 			mlb: mlb@0218c000 {</div><div class='ctx'> 				reg = &lt;0x0218c000 0x4000&gt;;</div><div class='hunk'>@@ -968,10 +978,14 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			weim: weim@021b8000 {</div><div class='add'>+				#address-cells = &lt;2&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='ctx'> 				compatible = "fsl,imx6sx-weim", "fsl,imx6q-weim";</div><div class='ctx'> 				reg = &lt;0x021b8000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clks IMX6SX_CLK_EIM_SLOW&gt;;</div><div class='add'>+				fsl,weim-cs-gpr = &lt;&amp;gpr&gt;;</div><div class='add'>+				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ocotp: ocotp@021bc000 {</div><div class='hunk'>@@ -1143,7 +1157,7 @@</div><div class='ctx'> 				lcdif1: lcdif@02220000 {</div><div class='ctx'> 					compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";</div><div class='ctx'> 					reg = &lt;0x02220000 0x4000&gt;;</div><div class='del'>-					interrupts = &lt;GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+					interrupts = &lt;GIC_SPI 5 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX6SX_CLK_LCDIF1_PIX&gt;,</div><div class='ctx'> 						 &lt;&amp;clks IMX6SX_CLK_LCDIF_APB&gt;,</div><div class='ctx'> 						 &lt;&amp;clks IMX6SX_CLK_DISPLAY_AXI&gt;;</div><div class='hunk'>@@ -1154,7 +1168,7 @@</div><div class='ctx'> 				lcdif2: lcdif@02224000 {</div><div class='ctx'> 					compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";</div><div class='ctx'> 					reg = &lt;0x02224000 0x4000&gt;;</div><div class='del'>-					interrupts = &lt;GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+					interrupts = &lt;GIC_SPI 6 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> 					clocks = &lt;&amp;clks IMX6SX_CLK_LCDIF2_PIX&gt;,</div><div class='ctx'> 						 &lt;&amp;clks IMX6SX_CLK_LCDIF_APB&gt;,</div><div class='ctx'> 						 &lt;&amp;clks IMX6SX_CLK_DISPLAY_AXI&gt;;</div><div class='hunk'>@@ -1181,7 +1195,7 @@</div><div class='ctx'> 				fsl,adck-max-frequency = &lt;30000000&gt;, &lt;40000000&gt;,</div><div class='ctx'> 							 &lt;20000000&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='del'>-                        };</div><div class='add'>+			};</div><div class='ctx'> </div><div class='ctx'> 			adc2: adc@02284000 {</div><div class='ctx'> 				compatible = "fsl,imx6sx-adc", "fsl,vf610-adc";</div><div class='hunk'>@@ -1192,7 +1206,7 @@</div><div class='ctx'> 				fsl,adck-max-frequency = &lt;30000000&gt;, &lt;40000000&gt;,</div><div class='ctx'> 							 &lt;20000000&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='del'>-                        };</div><div class='add'>+			};</div><div class='ctx'> </div><div class='ctx'> 			wdog3: wdog@02288000 {</div><div class='ctx'> 				compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts<br/>index e281d5087d4a..00f98e5bfcaf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-14x14-evk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6ul-14x14-evk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-14x14-evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-14x14-evk.dts</a></div><div class='hunk'>@@ -225,7 +225,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbotg1 {</div><div class='del'>-	dr_mode = "peripheral";</div><div class='add'>+	dr_mode = "otg";</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -235,6 +235,14 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;usbphy1 {</div><div class='add'>+	fsl,tx-d-cal = &lt;106&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy2 {</div><div class='add'>+	fsl,tx-d-cal = &lt;106&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usdhc1 {</div><div class='ctx'> 	pinctrl-names = "default", "state_100mhz", "state_200mhz";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_usdhc1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-geam-kit.dts b/arch/arm/boot/dts/imx6ul-geam-kit.dts<br/>index 4c4af76143e3..142e60cab65f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-geam-kit.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6ul-geam-kit.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-geam-kit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-geam-kit.dts</a></div><div class='hunk'>@@ -11,17 +11,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -30,11 +30,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-geam.dtsi b/arch/arm/boot/dts/imx6ul-geam.dtsi<br/>index 64eb9ed59b9c..940aef67313b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-geam.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6ul-geam.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-geam.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-geam.dtsi</a></div><div class='hunk'>@@ -11,17 +11,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -30,11 +30,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-isiot-emmc.dts b/arch/arm/boot/dts/imx6ul-isiot-emmc.dts<br/>new file mode 100644<br/>index 000000000000..f5b422898e61<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-isiot-emmc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-isiot-emmc.dts</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Amarula Solutions B.V.</div><div class='add'>+ * Copyright (C) 2016 Engicam S.r.l.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6ul-isiot.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Engicam Is.IoT MX6UL eMMC Starter kit";</div><div class='add'>+	compatible = "engicam,imx6ul-isiot", "fsl,imx6ul";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc2&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio4 5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	no-1-8-v;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_usdhc2: usdhc2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_NAND_RE_B__USDHC2_CLK      0x17070</div><div class='add'>+			MX6UL_PAD_NAND_WE_B__USDHC2_CMD      0x10070</div><div class='add'>+			MX6UL_PAD_NAND_DATA00__USDHC2_DATA0  0x17070</div><div class='add'>+			MX6UL_PAD_NAND_DATA01__USDHC2_DATA1  0x17070</div><div class='add'>+			MX6UL_PAD_NAND_DATA02__USDHC2_DATA2  0x17070</div><div class='add'>+			MX6UL_PAD_NAND_DATA03__USDHC2_DATA3  0x17070</div><div class='add'>+			MX6UL_PAD_NAND_DATA04__USDHC2_DATA4  0x17070</div><div class='add'>+			MX6UL_PAD_NAND_DATA05__USDHC2_DATA5  0x17070</div><div class='add'>+			MX6UL_PAD_NAND_DATA06__USDHC2_DATA6  0x17070</div><div class='add'>+			MX6UL_PAD_NAND_DATA07__USDHC2_DATA7  0x17070</div><div class='add'>+			MX6UL_PAD_NAND_ALE__USDHC2_RESET_B   0x17070</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-isiot-nand.dts b/arch/arm/boot/dts/imx6ul-isiot-nand.dts<br/>new file mode 100644<br/>index 000000000000..de15e1c75dd1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-isiot-nand.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-isiot-nand.dts</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Amarula Solutions B.V.</div><div class='add'>+ * Copyright (C) 2016 Engicam S.r.l.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6ul-isiot.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Engicam Is.IoT MX6UL NAND Starter kit";</div><div class='add'>+	compatible = "engicam,imx6ul-isiot", "fsl,imx6ul";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gpmi {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_gpmi_nand&gt;;</div><div class='add'>+	nand-on-flash-bbt;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_gpmi_nand: gpmi-nand {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_NAND_CLE__RAWNAND_CLE         0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_ALE__RAWNAND_ALE         0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_WP_B__RAWNAND_WP_B       0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B 0xb000</div><div class='add'>+			MX6UL_PAD_NAND_CE0_B__RAWNAND_CE0_B     0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_RE_B__RAWNAND_RE_B       0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_WE_B__RAWNAND_WE_B       0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00   0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01   0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_DATA02__RAWNAND_DATA02   0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_DATA03__RAWNAND_DATA03   0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_DATA04__RAWNAND_DATA04   0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_DATA05__RAWNAND_DATA05   0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_DATA06__RAWNAND_DATA06   0xb0b1</div><div class='add'>+			MX6UL_PAD_NAND_DATA07__RAWNAND_DATA07   0xb0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi<br/>new file mode 100644<br/>index 000000000000..0b43699af3e3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-isiot.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-isiot.dtsi</a></div><div class='hunk'>@@ -0,0 +1,114 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Amarula Solutions B.V.</div><div class='add'>+ * Copyright (C) 2016 Engicam S.r.l.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include "imx6ul.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x80000000 0x20000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart1;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc1 {</div><div class='add'>+	pinctrl-names = "default", "state_100mhz", "state_200mhz";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc1&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;pinctrl_usdhc1_100mhz&gt;;</div><div class='add'>+	pinctrl-2 = &lt;&amp;pinctrl_usdhc1_200mhz&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio1 19 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	no-1-8-v;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_uart1: uart1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1</div><div class='add'>+			MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc1: usdhc1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_SD1_CMD__USDHC1_CMD     0x17059</div><div class='add'>+			MX6UL_PAD_SD1_CLK__USDHC1_CLK     0x10059</div><div class='add'>+			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059</div><div class='add'>+			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059</div><div class='add'>+			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059</div><div class='add'>+			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc1_100mhz: usdhc1grp100mhz {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_SD1_CMD__USDHC1_CMD     0x170b9</div><div class='add'>+			MX6UL_PAD_SD1_CLK__USDHC1_CLK     0x100b9</div><div class='add'>+			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170b9</div><div class='add'>+			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170b9</div><div class='add'>+			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170b9</div><div class='add'>+			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170b9</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc1_200mhz: usdhc1grp200mhz {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_SD1_CMD__USDHC1_CMD     0x170f9</div><div class='add'>+			MX6UL_PAD_SD1_CLK__USDHC1_CLK     0x100f9</div><div class='add'>+			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170f9</div><div class='add'>+			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170f9</div><div class='add'>+			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170f9</div><div class='add'>+			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170f9</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-liteboard.dts b/arch/arm/boot/dts/imx6ul-liteboard.dts<br/>new file mode 100644<br/>index 000000000000..ed1d891d6a89<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-liteboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-liteboard.dts</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Grinn</div><div class='add'>+ *</div><div class='add'>+ * Author: Marcin Niestroj &lt;m.niestroj@grinn-global.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "imx6ul-litesom.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Grinn i.MX6UL liteBoard";</div><div class='add'>+	compatible = "grinn,imx6ul-liteboard", "grinn,imx6ul-litesom",</div><div class='add'>+		     "fsl,imx6ul";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_usb_otg1_vbus: regulator-usb-otg1-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_usb_otg1_vbus&gt;;</div><div class='add'>+		regulator-name = "usb_otg1_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio2 8 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_enet1: enet1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_GPIO1_IO07__ENET1_MDC		0x1b0b0</div><div class='add'>+			MX6UL_PAD_GPIO1_IO06__ENET1_MDIO	0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN	0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER	0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN	0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1	0x4001b031</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart1: uart1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX	0x1b0b1</div><div class='add'>+			MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc1: usdhc1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_UART1_RTS_B__GPIO1_IO19	0x17059</div><div class='add'>+			MX6UL_PAD_SD1_CMD__USDHC1_CMD		0x17059</div><div class='add'>+			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x10071</div><div class='add'>+			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0	0x17059</div><div class='add'>+			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1	0x17059</div><div class='add'>+			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2	0x17059</div><div class='add'>+			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3	0x17059</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usb_otg1_vbus: usb-otg1-vbus {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08	0x79</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_enet1&gt;;</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+	phy-handle = &lt;&amp;ethphy0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	mdio {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ethphy0: ethernet-phy@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbotg1 {</div><div class='add'>+	vbus-supply = &lt;&amp;reg_usb_otg1_vbus&gt;;</div><div class='add'>+	dr_mode = "host";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc1&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio1 19 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	no-1-8-v;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+	wakeup-source;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-litesom.dtsi b/arch/arm/boot/dts/imx6ul-litesom.dtsi<br/>new file mode 100644<br/>index 000000000000..039721d3dcb4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-litesom.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-litesom.dtsi</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Grinn</div><div class='add'>+ *</div><div class='add'>+ * Author: Marcin Niestroj &lt;m.niestroj@grinn-global.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "imx6ul.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Grinn i.MX6UL liteSOM";</div><div class='add'>+	compatible = "grinn,imx6ul-litesom", "fsl,imx6ul";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x80000000 0x20000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_usdhc2: usdhc2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_NAND_RE_B__USDHC2_CLK	    0x10069</div><div class='add'>+			MX6UL_PAD_NAND_WE_B__USDHC2_CMD	    0x17059</div><div class='add'>+			MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059</div><div class='add'>+			MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059</div><div class='add'>+			MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059</div><div class='add'>+			MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059</div><div class='add'>+			MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059</div><div class='add'>+			MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059</div><div class='add'>+			MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059</div><div class='add'>+			MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059</div><div class='add'>+			MX6UL_PAD_NAND_ALE__USDHC2_RESET_B  0x17059</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usdhc2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc2&gt;;</div><div class='add'>+	no-1-8-v;</div><div class='add'>+	non-removable;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+	wakeup-source;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi<br/>new file mode 100644<br/>index 000000000000..51095df33a90<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-opos6ul.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-opos6ul.dtsi</a></div><div class='hunk'>@@ -0,0 +1,192 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2017 Armadeus Systems &lt;support@armadeus.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of</div><div class='add'>+ *     the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *     You should have received a copy of the GNU General Public</div><div class='add'>+ *     License along with this file; if not, write to the Free</div><div class='add'>+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,</div><div class='add'>+ *     MA 02110-1301 USA</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "imx6ul.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x80000000 0&gt;; /* will be filled by U-Boot */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3v3: regulator-3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usdhc3_pwrseq: usdhc3-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio2 9 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_enet1&gt;;</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+	phy-reset-duration = &lt;1&gt;;</div><div class='add'>+	phy-reset-gpios = &lt;&amp;gpio4 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	phy-handle = &lt;&amp;ethphy1&gt;;</div><div class='add'>+	phy-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	mdio: mdio {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ethphy1: ethernet-phy@1 {</div><div class='add'>+			compatible = "ethernet-phy-ieee802.3-c22";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;gpio4&gt;;</div><div class='add'>+			interrupts = &lt;16 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Bluetooth */</div><div class='add'>+&amp;uart8 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart8&gt;;</div><div class='add'>+	uart-has-rtscts;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* eMMC */</div><div class='add'>+&amp;usdhc1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc1&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	no-1-8-v;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* WiFi */</div><div class='add'>+&amp;usdhc2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usdhc2&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	no-1-8-v;</div><div class='add'>+	non-removable;</div><div class='add'>+	mmc-pwrseq = &lt;&amp;usdhc3_pwrseq&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	brcmf: bcrmf@1 {</div><div class='add'>+		compatible = "brcm,bcm4329-fmac";</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio2&gt;;</div><div class='add'>+		interrupts = &lt;8 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupt-names = "host-wake";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_enet1: enet1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_GPIO1_IO06__ENET1_MDIO	0x1b0b0</div><div class='add'>+			MX6UL_PAD_GPIO1_IO07__ENET1_MDC		0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER	0x130b0</div><div class='add'>+			MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN	0x130b0</div><div class='add'>+			MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01	0x130b0</div><div class='add'>+			MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00	0x130b0</div><div class='add'>+			MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00	0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01	0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN	0x1b0b0</div><div class='add'>+			/* INT# */</div><div class='add'>+			MX6UL_PAD_NAND_DQS__GPIO4_IO16		0x1b0b0</div><div class='add'>+			/* RST# */</div><div class='add'>+			MX6UL_PAD_NAND_DATA00__GPIO4_IO02	0x130b0</div><div class='add'>+			MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1	0x4001b031</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart8: uart8grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_ENET2_TX_EN__UART8_DCE_RX	0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET2_TX_DATA1__UART8_DCE_TX	0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET2_RX_ER__UART8_DCE_RTS	0x1b0b0</div><div class='add'>+			MX6UL_PAD_ENET2_TX_CLK__UART8_DCE_CTS	0x1b0b0</div><div class='add'>+			/* BT_REG_ON */</div><div class='add'>+			MX6UL_PAD_ENET2_RX_EN__GPIO2_IO10	0x130b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc1: usdhc1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_SD1_CMD__USDHC1_CMD		0x17059</div><div class='add'>+			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x10059</div><div class='add'>+			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0	0x17059</div><div class='add'>+			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1	0x17059</div><div class='add'>+			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2	0x17059</div><div class='add'>+			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3	0x17059</div><div class='add'>+			MX6UL_PAD_NAND_READY_B__USDHC1_DATA4	0x17059</div><div class='add'>+			MX6UL_PAD_NAND_CE0_B__USDHC1_DATA5	0x17059</div><div class='add'>+			MX6UL_PAD_NAND_CE1_B__USDHC1_DATA6	0x17059</div><div class='add'>+			MX6UL_PAD_NAND_CLE__USDHC1_DATA7	0x17059</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usdhc2: usdhc2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_LCD_DATA18__USDHC2_CMD	0x1b0b0</div><div class='add'>+			MX6UL_PAD_LCD_DATA19__USDHC2_CLK	0x100b0</div><div class='add'>+			MX6UL_PAD_LCD_DATA20__USDHC2_DATA0	0x1b0b0</div><div class='add'>+			MX6UL_PAD_LCD_DATA21__USDHC2_DATA1	0x1b0b0</div><div class='add'>+			MX6UL_PAD_LCD_DATA22__USDHC2_DATA2	0x1b0b0</div><div class='add'>+			MX6UL_PAD_LCD_DATA23__USDHC2_DATA3	0x1b0b0</div><div class='add'>+			/* WL_REG_ON */</div><div class='add'>+			MX6UL_PAD_ENET2_RX_DATA1__GPIO2_IO09	0x130b0</div><div class='add'>+			/* WL_IRQ */</div><div class='add'>+			MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08	0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-opos6uldev.dts b/arch/arm/boot/dts/imx6ul-opos6uldev.dts<br/>new file mode 100644<br/>index 000000000000..0e59ee57fd55<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-opos6uldev.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-opos6uldev.dts</a></div><div class='hunk'>@@ -0,0 +1,412 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2017 Armadeus Systems &lt;support@armadeus.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of</div><div class='add'>+ *     the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *     You should have received a copy of the GNU General Public</div><div class='add'>+ *     License along with this file; if not, write to the Free</div><div class='add'>+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,</div><div class='add'>+ *     MA 02110-1301 USA</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "imx6ul-opos6ul.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Armadeus Systems OPOS6UL SoM on OPOS6ULDev board";</div><div class='add'>+	compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	backlight {</div><div class='add'>+		compatible = "pwm-backlight";</div><div class='add'>+		pwms = &lt;&amp;pwm3 0 191000&gt;;</div><div class='add'>+		brightness-levels = &lt;0 4 8 16 32 64 128 255&gt;;</div><div class='add'>+		default-brightness-level = &lt;7&gt;;</div><div class='add'>+		power-supply = &lt;&amp;reg_5v&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_gpio_keys&gt;;</div><div class='add'>+</div><div class='add'>+		user-button {</div><div class='add'>+			label = "User button";</div><div class='add'>+			gpios = &lt;&amp;gpio2 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;BTN_MISC&gt;;</div><div class='add'>+			wakeup-source;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		user-led {</div><div class='add'>+			label = "User";</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_led&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio3 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	onewire {</div><div class='add'>+		compatible = "w1-gpio";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_w1&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio5 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_5v: regulator-5v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "5V";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_usbotg1_vbus: regulator-usbotg1vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usbotg1vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_usbotg1_vbus&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio1 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_usbotg2_vbus: regulator-usbotg2vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usbotg2vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_usbotg2_vbus&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio5 9 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;adc1 {</div><div class='add'>+	vref-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;can1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_flexcan1&gt;;</div><div class='add'>+	xceiver-supply = &lt;&amp;reg_5v&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;can2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_flexcan2&gt;;</div><div class='add'>+	xceiver-supply = &lt;&amp;reg_5v&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ecspi4 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_ecspi4&gt;;</div><div class='add'>+	cs-gpios = &lt;&amp;gpio4 9 GPIO_ACTIVE_LOW&gt;, &lt;&amp;gpio4 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	spidev0: spi@0 {</div><div class='add'>+		compatible = "spidev";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;5000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spidev1: spi@1 {</div><div class='add'>+		compatible = "spidev";</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		spi-max-frequency = &lt;5000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='add'>+	clock_frequency = &lt;400000&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+	clock_frequency = &lt;400000&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;lcdif {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_lcdif&gt;;</div><div class='add'>+	display = &lt;&amp;display0&gt;;</div><div class='add'>+	lcd-supply = &lt;&amp;reg_3v3&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	display0: display0 {</div><div class='add'>+		bits-per-pixel = &lt;32&gt;;</div><div class='add'>+		bus-width = &lt;18&gt;;</div><div class='add'>+</div><div class='add'>+		display-timings {</div><div class='add'>+			timing0: timing0 {</div><div class='add'>+				clock-frequency = &lt;33000033&gt;;</div><div class='add'>+				hactive = &lt;800&gt;;</div><div class='add'>+				vactive = &lt;480&gt;;</div><div class='add'>+				hback-porch = &lt;96&gt;;</div><div class='add'>+				hfront-porch = &lt;96&gt;;</div><div class='add'>+				vback-porch = &lt;20&gt;;</div><div class='add'>+				vfront-porch = &lt;21&gt;;</div><div class='add'>+				hsync-len = &lt;64&gt;;</div><div class='add'>+				vsync-len = &lt;4&gt;;</div><div class='add'>+				de-active = &lt;1&gt;;</div><div class='add'>+				pixelclk-active = &lt;0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_pwm3&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;snvs_pwrkey {</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tsc {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_tsc&gt;;</div><div class='add'>+	xnur-gpio = &lt;&amp;gpio1 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	measure-delay-time = &lt;0xffff&gt;;</div><div class='add'>+	pre-charge-time = &lt;0xffff&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbotg1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usbotg1_id&gt;;</div><div class='add'>+	vbus-supply = &lt;&amp;reg_usbotg1_vbus&gt;;</div><div class='add'>+	dr_mode = "otg";</div><div class='add'>+	disable-over-current;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbotg2 {</div><div class='add'>+	vbus-supply = &lt;&amp;reg_usbotg2_vbus&gt;;</div><div class='add'>+	dr_mode = "host";</div><div class='add'>+	disable-over-current;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_gpios&gt;;</div><div class='add'>+</div><div class='add'>+	pinctrl_ecspi4: ecspi4grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_NAND_DATA04__ECSPI4_SCLK	0x1b0b0</div><div class='add'>+			MX6UL_PAD_NAND_DATA05__ECSPI4_MOSI	0x1b0b0</div><div class='add'>+			MX6UL_PAD_NAND_DATA06__ECSPI4_MISO	0x1b0b0</div><div class='add'>+			MX6UL_PAD_NAND_DATA01__GPIO4_IO03	0x1b0b0</div><div class='add'>+			MX6UL_PAD_NAND_DATA07__GPIO4_IO09	0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_flexcan1: flexcan1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX	0x0b0b0</div><div class='add'>+			MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX	0x0b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_flexcan2: flexcan2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX	0x0b0b0</div><div class='add'>+			MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX	0x0b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_gpios: gpiosgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_GPIO1_IO09__GPIO1_IO09	0x0b0b0</div><div class='add'>+			MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25	0x0b0b0</div><div class='add'>+			MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24	0x0b0b0</div><div class='add'>+			MX6UL_PAD_NAND_RE_B__GPIO4_IO00		0x0b0b0</div><div class='add'>+			MX6UL_PAD_GPIO1_IO08__GPIO1_IO08	0x0b0b0</div><div class='add'>+			MX6UL_PAD_UART1_CTS_B__GPIO1_IO18	0x0b0b0</div><div class='add'>+			MX6UL_PAD_UART1_RTS_B__GPIO1_IO19	0x0b0b0</div><div class='add'>+			MX6UL_PAD_NAND_WE_B__GPIO4_IO01		0x0b0b0</div><div class='add'>+			MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00	0x0b0b0</div><div class='add'>+			MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02	0x0b0b0</div><div class='add'>+			MX6UL_PAD_SNVS_TAMPER3__GPIO5_IO03	0x0b0b0</div><div class='add'>+			MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04	0x0b0b0</div><div class='add'>+			MX6UL_PAD_SNVS_TAMPER5__GPIO5_IO05	0x0b0b0</div><div class='add'>+			MX6UL_PAD_SNVS_TAMPER6__GPIO5_IO06	0x0b0b0</div><div class='add'>+			MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07	0x0b0b0</div><div class='add'>+			MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08	0x0b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_gpio_keys: gpiokeysgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11	0x0b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c1: i2c1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_UART4_RX_DATA__I2C1_SDA	0x4001b8b0</div><div class='add'>+			MX6UL_PAD_UART4_TX_DATA__I2C1_SCL	0x4001b8b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c2: i2c2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_UART5_RX_DATA__I2C2_SDA	0x4001b8b0</div><div class='add'>+			MX6UL_PAD_UART5_TX_DATA__I2C2_SCL	0x4001b8b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_lcdif: lcdifgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_LCD_CLK__LCDIF_CLK	    0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC    0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC    0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA00__LCDIF_DATA00  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA01__LCDIF_DATA01  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA02__LCDIF_DATA02  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA03__LCDIF_DATA03  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA04__LCDIF_DATA04  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA05__LCDIF_DATA05  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA06__LCDIF_DATA06  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA07__LCDIF_DATA07  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA08__LCDIF_DATA08  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA09__LCDIF_DATA09  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA10__LCDIF_DATA10  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA11__LCDIF_DATA11  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA12__LCDIF_DATA12  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA13__LCDIF_DATA13  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA14__LCDIF_DATA14  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA15__LCDIF_DATA15  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA16__LCDIF_DATA16  0x100b1</div><div class='add'>+			MX6UL_PAD_LCD_DATA17__LCDIF_DATA17  0x100b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_led: ledgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_LCD_RESET__GPIO3_IO04		0x0b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pwm3: pwm3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_NAND_ALE__PWM3_OUT		0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_tsc: tscgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_GPIO1_IO01__GPIO1_IO01       0xb0</div><div class='add'>+			MX6UL_PAD_GPIO1_IO02__GPIO1_IO02       0xb0</div><div class='add'>+			MX6UL_PAD_GPIO1_IO03__GPIO1_IO03       0xb0</div><div class='add'>+			MX6UL_PAD_GPIO1_IO04__GPIO1_IO04       0xb0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart1: uart1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX	0x1b0b1</div><div class='add'>+			MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart2: uart2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX	0x1b0b1</div><div class='add'>+			MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX	0x1b0b1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usbotg1_id: usbotg1idgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID	0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usbotg1_vbus: usbotg1vbusgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_GPIO1_IO05__GPIO1_IO05	0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usbotg2_vbus: usbotg2vbusgrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09	0x1b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_w1: w1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01	0x0b0b0</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts<br/>index 827d9e8fc74e..7d7254b12a75 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-pico-hobbit.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6ul-pico-hobbit.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-pico-hobbit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-pico-hobbit.dts</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi<br/>index 530e9ca13a74..c784a0b75ca0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-tx6ul.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6ul-tx6ul.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul-tx6ul.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul-tx6ul.dtsi</a></div><div class='hunk'>@@ -285,7 +285,6 @@</div><div class='ctx'> &amp;ecspi2 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi2&gt;;</div><div class='del'>-	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='ctx'> 	cs-gpios = &lt;</div><div class='ctx'> 		&amp;gpio1 29 GPIO_ACTIVE_HIGH</div><div class='ctx'> 		&amp;gpio1 10 GPIO_ACTIVE_HIGH</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi<br/>index c5c05fdccc78..b9d7d2d09402 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx6ul.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ul.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ul.dtsi</a></div><div class='hunk'>@@ -11,9 +11,19 @@</div><div class='ctx'> #include &lt;dt-bindings/input/input.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include "imx6ul-pinfunc.h"</div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;fec1;</div><div class='ctx'> 		ethernet1 = &amp;fec2;</div><div class='hunk'>@@ -89,11 +99,11 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	intc: interrupt-controller@00a01000 {</div><div class='del'>-		compatible = "arm,cortex-a7-gic";</div><div class='add'>+		compatible = "arm,gic-400", "arm,cortex-a7-gic";</div><div class='ctx'> 		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0x00a01000 0x1000&gt;,</div><div class='del'>-		      &lt;0x00a02000 0x1000&gt;,</div><div class='add'>+		      &lt;0x00a02000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x00a04000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x00a06000 0x2000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -532,7 +542,6 @@</div><div class='ctx'> 					anatop-min-bit-val = &lt;0&gt;;</div><div class='ctx'> 					anatop-min-voltage = &lt;2625000&gt;;</div><div class='ctx'> 					anatop-max-voltage = &lt;3400000&gt;;</div><div class='del'>-					anatop-enable-bit = &lt;0&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				reg_arm: regulator-vddcore {</div><div class='hunk'>@@ -849,6 +858,12 @@</div><div class='ctx'> 				reg = &lt;0x021b0000 0x4000&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			ocotp: ocotp-ctrl@021bc000 {</div><div class='add'>+				compatible = "fsl,imx6ul-ocotp", "syscon";</div><div class='add'>+				reg = &lt;0x021bc000 0x4000&gt;;</div><div class='add'>+				clocks = &lt;&amp;clks IMX6UL_CLK_OCOTP&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			lcdif: lcdif@021c8000 {</div><div class='ctx'> 				compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif";</div><div class='ctx'> 				reg = &lt;0x021c8000 0x4000&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ull-14x14-evk.dts b/arch/arm/boot/dts/imx6ull-14x14-evk.dts<br/>new file mode 100644<br/>index 000000000000..4741871434dd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ull-14x14-evk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ull-14x14-evk.dts</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Freescale Semiconductor, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "imx6ul-14x14-evk.dts"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Freescale i.MX6 UlltraLite 14x14 EVK Board";</div><div class='add'>+	compatible = "fsl,imx6ull-14x14-evk", "fsl,imx6ull";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;clks {</div><div class='add'>+	assigned-clocks = &lt;&amp;clks IMX6UL_CLK_PLL3_PFD2&gt;;</div><div class='add'>+	assigned-clock-rates = &lt;320000000&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ull-pinfunc.h b/arch/arm/boot/dts/imx6ull-pinfunc.h<br/>new file mode 100644<br/>index 000000000000..118202336691<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ull-pinfunc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ull-pinfunc.h</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Freescale Semiconductor, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DTS_IMX6ULL_PINFUNC_H</div><div class='add'>+#define __DTS_IMX6ULL_PINFUNC_H</div><div class='add'>+</div><div class='add'>+#include "imx6ul-pinfunc.h"</div><div class='add'>+/*</div><div class='add'>+ * The pin function ID is a tuple of</div><div class='add'>+ * &lt;mux_reg conf_reg input_reg mux_mode input_val&gt;</div><div class='add'>+ */</div><div class='add'>+#define MX6ULL_PAD_ENET2_RX_DATA0__EPDC_SDDO08                    0x00E4 0x0370 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_ENET2_RX_DATA1__EPDC_SDDO09                    0x00E8 0x0374 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_ENET2_RX_EN__EPDC_SDDO10                       0x00EC 0x0378 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_ENET2_TX_DATA0__EPDC_SDDO11                    0x00F0 0x037C 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_ENET2_TX_DATA1__EPDC_SDDO12                    0x00F4 0x0380 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_ENET2_TX_EN__EPDC_SDDO13                       0x00F8 0x0384 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_ENET2_TX_CLK__EPDC_SDDO14                      0x00FC 0x0388 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_ENET2_RX_ER__EPDC_SDDO15                       0x0100 0x038C 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_CLK__EPDC_SDCLK                            0x0104 0x0390 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_ENABLE__EPDC_SDLE                          0x0108 0x0394 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_HSYNC__EPDC_SDOE                           0x010C 0x0398 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_VSYNC__EPDC_SDCE0                          0x0110 0x039C 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_RESET__EPDC_GDOE                           0x0114 0x03A0 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA00__EPDC_SDDO00                        0x0118 0x03A4 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA01__EPDC_SDDO01                        0x011C 0x03A8 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA02__EPDC_SDDO02                        0x0120 0x03AC 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA03__EPDC_SDDO03                        0x0124 0x03B0 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA04__EPDC_SDDO04                        0x0128 0x03B4 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA05__EPDC_SDDO05                        0x012C 0x03B8 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA06__EPDC_SDDO06                        0x0130 0x03BC 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA07__EPDC_SDDO07                        0x0134 0x03C0 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA14__EPDC_SDSHR                         0x0150 0x03DC 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA15__EPDC_GDRL                          0x0154 0x03E0 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA16__EPDC_GDCLK                         0x0158 0x03E4 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA17__EPDC_GDSP                          0x015C 0x03E8 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_LCD_DATA21__EPDC_SDCE1                         0x016C 0x03F8 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_MCLK__ESAI_TX3_RX2                         0x01D4 0x0460 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_PIXCLK__ESAI_TX2_RX3                       0x01D8 0x0464 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_VSYNC__ESAI_TX4_RX1                        0x01DC 0x0468 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_HSYNC__ESAI_TX1                            0x01E0 0x046C 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_DATA00__ESAI_TX_HF_CLK                     0x01E4 0x0470 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_DATA01__ESAI_RX_HF_CLK                     0x01E8 0x0474 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_DATA02__ESAI_RX_FS                         0x01EC 0x0478 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_DATA03__ESAI_RX_CLK                        0x01F0 0x047C 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_DATA04__ESAI_TX_FS                         0x01F4 0x0480 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_DATA05__ESAI_TX_CLK                        0x01F8 0x0484 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_DATA06__ESAI_TX5_RX0                       0x01FC 0x0488 0x0000 0x9 0x0</div><div class='add'>+#define MX6ULL_PAD_CSI_DATA07__ESAI_T0                            0x0200 0x048C 0x0000 0x9 0x0</div><div class='add'>+</div><div class='add'>+#endif /* __DTS_IMX6ULL_PINFUNC_H */</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi<br/>new file mode 100644<br/>index 000000000000..0c182917b863<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx6ull.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx6ull.dtsi</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Freescale Semiconductor, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "imx6ul.dtsi"</div><div class='add'>+#include "imx6ull-pinfunc.h"</div><div class='head'>diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi<br/>index a9cc65725f19..a171545478be 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7-colibri.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx7-colibri.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7-colibri.dtsi</a></div><div class='hunk'>@@ -596,29 +596,29 @@</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_gpio_lpsr: gpio1-grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			MX7D_PAD_GPIO1_IO01__GPIO1_IO1	0x59</div><div class='del'>-			MX7D_PAD_GPIO1_IO02__GPIO1_IO2	0x59</div><div class='del'>-			MX7D_PAD_GPIO1_IO03__GPIO1_IO3	0x59</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1	0x59</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2	0x59</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO03__GPIO1_IO3	0x59</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_i2c1: i2c1-grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			MX7D_PAD_GPIO1_IO05__I2C1_SDA	0x4000007f</div><div class='del'>-			MX7D_PAD_GPIO1_IO04__I2C1_SCL	0x4000007f</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO05__I2C1_SDA	0x4000007f</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO04__I2C1_SCL	0x4000007f</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_cd_usdhc1: usdhc1-cd-grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			MX7D_PAD_GPIO1_IO00__GPIO1_IO0	0x59 /* CD */</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0	0x59 /* CD */</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_uart1_ctrl2: uart1-ctrl2-grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			MX7D_PAD_GPIO1_IO07__GPIO1_IO7	0x14 /* DSR */</div><div class='del'>-			MX7D_PAD_GPIO1_IO06__GPIO1_IO6	0x14 /* RI */</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7	0x14 /* DSR */</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO06__GPIO1_IO6	0x14 /* RI */</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts<br/>index 58b09bf1ba2d..ae45af1ad062 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7d-cl-som-imx7.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx7d-cl-som-imx7.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7d-cl-som-imx7.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7d-cl-som-imx7.dts</a></div><div class='hunk'>@@ -261,12 +261,6 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pinctrl_usbotg1: usbotg1grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			MX7D_PAD_GPIO1_IO05__GPIO1_IO5		0x14 /* OTG PWREN */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	pinctrl_usdhc3: usdhc3grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='ctx'> 			MX7D_PAD_SD3_CMD__SD3_CMD		0x59</div><div class='hunk'>@@ -283,3 +277,11 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;iomuxc_lpsr {</div><div class='add'>+	pinctrl_usbotg1: usbotg1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5	0x14 /* OTG PWREN */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};
\ No newline at end of file</div><div class='head'>diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts<br/>index ce08f180f213..5d98e2b5d54b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7d-nitrogen7.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx7d-nitrogen7.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7d-nitrogen7.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7d-nitrogen7.dts</a></div><div class='hunk'>@@ -712,33 +712,33 @@</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_hog_2: hoggrp-2 {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			MX7D_PAD_GPIO1_IO02__GPIO1_IO2		0x7d</div><div class='del'>-			MX7D_PAD_GPIO1_IO03__CCM_CLKO2		0x7d</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2	0x7d</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO03__CCM_CLKO2	0x7d</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_backlight_j9: backlightj9grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			MX7D_PAD_GPIO1_IO07__GPIO1_IO7		0x7d</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7	0x7d</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_pwm1: pwm1grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			MX7D_PAD_GPIO1_IO01__PWM1_OUT		0x7d</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO01__PWM1_OUT	0x7d</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_usbotg1: usbotg1grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			MX7D_PAD_GPIO1_IO04__USB_OTG1_OC	0x7d</div><div class='del'>-			MX7D_PAD_GPIO1_IO05__GPIO1_IO5		0x14</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO04__USB_OTG1_OC	0x7d</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5	0x14</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_wdog1: wdog1grp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B	0x75</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B	0x75</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/imx7d-pinfunc.h b/arch/arm/boot/dts/imx7d-pinfunc.h<br/>index 3f9f0d9c8094..f6f7e78f8820 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7d-pinfunc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx7d-pinfunc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7d-pinfunc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7d-pinfunc.h</a></div><div class='hunk'>@@ -15,57 +15,61 @@</div><div class='ctx'>  * &lt;mux_reg conf_reg input_reg mux_mode input_val&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define MX7D_PAD_GPIO1_IO00__GPIO1_IO0                            0x0000 0x0030 0x0000 0x0 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO00__PWM4_OUT                             0x0000 0x0030 0x0000 0x1 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_ANY                       0x0000 0x0030 0x0000 0x2 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B                         0x0000 0x0030 0x0000 0x3 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO00__WDOD1_WDOG__RST_B_DEB                0x0000 0x0030 0x0000 0x4 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO01__GPIO1_IO1                            0x0004 0x0034 0x0000 0x0 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO01__PWM1_OUT                             0x0004 0x0034 0x0000 0x1 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO01__CCM_ENET_REF_CLK3                    0x0004 0x0034 0x0000 0x2 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO01__SAI1_MCLK                            0x0004 0x0034 0x0000 0x3 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO01__ANATOP_24M_OUT                       0x0004 0x0034 0x0000 0x4 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO01__OBSERVE0_OUT                         0x0004 0x0034 0x0000 0x6 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO02__GPIO1_IO2                            0x0008 0x0038 0x0000 0x0 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO02__PWM2_OUT                             0x0008 0x0038 0x0000 0x1 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO02__CCM_ENET_REF_CLK1                    0x0008 0x0038 0x0564 0x2 0x3</div><div class='del'>-#define MX7D_PAD_GPIO1_IO02__SAI2_MCLK                            0x0008 0x0038 0x0000 0x3 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO02__CCM_CLKO1                            0x0008 0x0038 0x0000 0x5 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO02__OBSERVE1_OUT                         0x0008 0x0038 0x0000 0x6 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO02__USB_OTG1_ID                          0x0008 0x0038 0x0734 0x7 0x3</div><div class='del'>-#define MX7D_PAD_GPIO1_IO03__GPIO1_IO3                            0x000C 0x003C 0x0000 0x0 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO03__PWM3_OUT                             0x000C 0x003C 0x0000 0x1 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO03__CCM_ENET_REF_CLK2                    0x000C 0x003C 0x0570 0x2 0x3</div><div class='del'>-#define MX7D_PAD_GPIO1_IO03__SAI3_MCLK                            0x000C 0x003C 0x0000 0x3 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO03__CCM_CLKO2                            0x000C 0x003C 0x0000 0x5 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO03__OBSERVE2_OUT                         0x000C 0x003C 0x0000 0x6 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO03__USB_OTG2_ID                          0x000C 0x003C 0x0730 0x7 0x3</div><div class='del'>-#define MX7D_PAD_GPIO1_IO04__GPIO1_IO4                            0x0010 0x0040 0x0000 0x0 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO04__USB_OTG1_OC                          0x0010 0x0040 0x072C 0x1 0x1</div><div class='del'>-#define MX7D_PAD_GPIO1_IO04__FLEXTIMER1_CH4                       0x0010 0x0040 0x0594 0x2 0x1</div><div class='del'>-#define MX7D_PAD_GPIO1_IO04__UART5_CTS_B                          0x0010 0x0040 0x0710 0x3 0x4</div><div class='del'>-#define MX7D_PAD_GPIO1_IO04__I2C1_SCL                             0x0010 0x0040 0x05D4 0x4 0x2</div><div class='del'>-#define MX7D_PAD_GPIO1_IO04__OBSERVE3_OUT                         0x0010 0x0040 0x0000 0x6 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO05__GPIO1_IO5                            0x0014 0x0044 0x0000 0x0 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO05__USB_OTG1_PWR                         0x0014 0x0044 0x0000 0x1 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO05__FLEXTIMER1_CH5                       0x0014 0x0044 0x0598 0x2 0x1</div><div class='del'>-#define MX7D_PAD_GPIO1_IO05__UART5_RTS_B                          0x0014 0x0044 0x0710 0x3 0x5</div><div class='del'>-#define MX7D_PAD_GPIO1_IO05__I2C1_SDA                             0x0014 0x0044 0x05D8 0x4 0x2</div><div class='del'>-#define MX7D_PAD_GPIO1_IO05__OBSERVE4_OUT                         0x0014 0x0044 0x0000 0x6 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO06__GPIO1_IO6                            0x0018 0x0048 0x0000 0x0 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO06__USB_OTG2_OC                          0x0018 0x0048 0x0728 0x1 0x1</div><div class='del'>-#define MX7D_PAD_GPIO1_IO06__FLEXTIMER1_CH6                       0x0018 0x0048 0x059C 0x2 0x1</div><div class='del'>-#define MX7D_PAD_GPIO1_IO06__UART5_RX_DATA                        0x0018 0x0048 0x0714 0x3 0x4</div><div class='del'>-#define MX7D_PAD_GPIO1_IO06__I2C2_SCL                             0x0018 0x0048 0x05DC 0x4 0x2</div><div class='del'>-#define MX7D_PAD_GPIO1_IO06__CCM_WAIT                             0x0018 0x0048 0x0000 0x5 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO06__KPP_ROW4                             0x0018 0x0048 0x0624 0x6 0x1</div><div class='del'>-#define MX7D_PAD_GPIO1_IO07__GPIO1_IO7                            0x001C 0x004C 0x0000 0x0 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO07__USB_OTG2_PWR                         0x001C 0x004C 0x0000 0x1 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO07__FLEXTIMER1_CH7                       0x001C 0x004C 0x05A0 0x2 0x1</div><div class='del'>-#define MX7D_PAD_GPIO1_IO07__UART5_TX_DATA                        0x001C 0x004C 0x0714 0x3 0x5</div><div class='del'>-#define MX7D_PAD_GPIO1_IO07__I2C2_SDA                             0x001C 0x004C 0x05E0 0x4 0x2</div><div class='del'>-#define MX7D_PAD_GPIO1_IO07__CCM_STOP                             0x001C 0x004C 0x0000 0x5 0x0</div><div class='del'>-#define MX7D_PAD_GPIO1_IO07__KPP_COL4                             0x001C 0x004C 0x0604 0x6 0x1</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0                       0x0000 0x0030 0x0000 0x0 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO00__PWM4_OUT                        0x0000 0x0030 0x0000 0x1 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_ANY                  0x0000 0x0030 0x0000 0x2 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B                    0x0000 0x0030 0x0000 0x3 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG__RST_B_DEB           0x0000 0x0030 0x0000 0x4 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1                       0x0004 0x0034 0x0000 0x0 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO01__PWM1_OUT                        0x0004 0x0034 0x0000 0x1 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO01__CCM_ENET_REF_CLK3               0x0004 0x0034 0x0000 0x2 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO01__SAI1_MCLK                       0x0004 0x0034 0x0000 0x3 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO01__ANATOP_24M_OUT                  0x0004 0x0034 0x0000 0x4 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO01__OBSERVE0_OUT                    0x0004 0x0034 0x0000 0x6 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2                       0x0008 0x0038 0x0000 0x0 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO02__PWM2_OUT                        0x0008 0x0038 0x0000 0x1 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO02__CCM_ENET_REF_CLK1               0x0008 0x0038 0x0564 0x2 0x3</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO02__SAI2_MCLK                       0x0008 0x0038 0x0000 0x3 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO02__CCM_CLKO1                       0x0008 0x0038 0x0000 0x5 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO02__OBSERVE1_OUT                    0x0008 0x0038 0x0000 0x6 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO02__USB_OTG1_ID                     0x0008 0x0038 0x0734 0x7 0x3</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO03__GPIO1_IO3                       0x000C 0x003C 0x0000 0x0 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO03__PWM3_OUT                        0x000C 0x003C 0x0000 0x1 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO03__CCM_ENET_REF_CLK2               0x000C 0x003C 0x0570 0x2 0x3</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO03__SAI3_MCLK                       0x000C 0x003C 0x0000 0x3 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO03__CCM_CLKO2                       0x000C 0x003C 0x0000 0x5 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO03__OBSERVE2_OUT                    0x000C 0x003C 0x0000 0x6 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO03__USB_OTG2_ID                     0x000C 0x003C 0x0730 0x7 0x3</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO04__GPIO1_IO4                       0x0010 0x0040 0x0000 0x0 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO04__USB_OTG1_OC                     0x0010 0x0040 0x072C 0x1 0x1</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO04__FLEXTIMER1_CH4                  0x0010 0x0040 0x0594 0x2 0x1</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO04__UART5_DCE_CTS                   0x0010 0x0040 0x0000 0x3 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO04__UART5_DTE_RTS                   0x0010 0x0040 0x0710 0x3 0x4</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO04__I2C1_SCL                        0x0010 0x0040 0x05D4 0x4 0x2</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO04__OBSERVE3_OUT                    0x0010 0x0040 0x0000 0x6 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5                       0x0014 0x0044 0x0000 0x0 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO05__USB_OTG1_PWR                    0x0014 0x0044 0x0000 0x1 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO05__FLEXTIMER1_CH5                  0x0014 0x0044 0x0598 0x2 0x1</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO05__UART5_DCE_RTS                   0x0014 0x0044 0x0710 0x3 0x5</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO05__UART5_DTE_CTS                   0x0014 0x0044 0x0000 0x3 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO05__I2C1_SDA                        0x0014 0x0044 0x05D8 0x4 0x2</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO05__OBSERVE4_OUT                    0x0014 0x0044 0x0000 0x6 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO06__GPIO1_IO6                       0x0018 0x0048 0x0000 0x0 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO06__USB_OTG2_OC                     0x0018 0x0048 0x0728 0x1 0x1</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO06__FLEXTIMER1_CH6                  0x0018 0x0048 0x059C 0x2 0x1</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO06__UART5_DCE_RX                    0x0018 0x0048 0x0714 0x3 0x4</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO06__UART5_DTE_TX                    0x0018 0x0048 0x0000 0x3 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO06__I2C2_SCL                        0x0018 0x0048 0x05DC 0x4 0x2</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO06__CCM_WAIT                        0x0018 0x0048 0x0000 0x5 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO06__KPP_ROW4                        0x0018 0x0048 0x0624 0x6 0x1</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7                       0x001C 0x004C 0x0000 0x0 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO07__USB_OTG2_PWR                    0x001C 0x004C 0x0000 0x1 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO07__FLEXTIMER1_CH7                  0x001C 0x004C 0x05A0 0x2 0x1</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO07__UART5_DCE_TX                    0x001C 0x004C 0x0000 0x3 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO07__UART5_DTE_RX                    0x001C 0x004C 0x0714 0x3 0x5</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO07__I2C2_SDA                        0x001C 0x004C 0x05E0 0x4 0x2</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO07__CCM_STOP                        0x001C 0x004C 0x0000 0x5 0x0</div><div class='add'>+#define MX7D_PAD_LPSR_GPIO1_IO07__KPP_COL4                        0x001C 0x004C 0x0604 0x6 0x1</div><div class='ctx'> #define MX7D_PAD_GPIO1_IO08__GPIO1_IO8                            0x0014 0x026C 0x0000 0x0 0x0</div><div class='ctx'> #define MX7D_PAD_GPIO1_IO08__SD1_VSELECT                          0x0014 0x026C 0x0000 0x1 0x0</div><div class='ctx'> #define MX7D_PAD_GPIO1_IO08__WDOG1_WDOG_B                         0x0014 0x026C 0x0000 0x2 0x0</div><div class='head'>diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts<br/>index 2f33c463cbce..5be01a1bf840 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7d-sdb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx7d-sdb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7d-sdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7d-sdb.dts</a></div><div class='hunk'>@@ -111,7 +111,6 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ecspi3 {</div><div class='del'>-	fsl,spi-num-chipselects = &lt;1&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_ecspi3&gt;;</div><div class='ctx'> 	cs-gpios = &lt;&amp;gpio5 9 GPIO_ACTIVE_HIGH&gt;;</div><div class='hunk'>@@ -502,12 +501,6 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		pinctrl_pwm1: pwm1grp {</div><div class='del'>-			fsl,pins = &lt;</div><div class='del'>-				MX7D_PAD_GPIO1_IO01__PWM1_OUT		0x110b0</div><div class='del'>-			&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		pinctrl_tsc2046_pendown: tsc2046_pendown {</div><div class='ctx'> 			fsl,pins = &lt;</div><div class='ctx'> 				MX7D_PAD_EPDC_BDR1__GPIO2_IO29		0x59</div><div class='hunk'>@@ -635,11 +628,19 @@</div><div class='ctx'> 				MX7D_PAD_SD3_STROBE__SD3_STROBE		0x1b</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		pinctrl_wdog: wdoggrp {</div><div class='del'>-			fsl,pins = &lt;</div><div class='del'>-				MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B	0x74</div><div class='del'>-			&gt;;</div><div class='del'>-		};</div><div class='add'>+&amp;iomuxc_lpsr {</div><div class='add'>+	pinctrl_wdog: wdoggrp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B		0x74</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_pwm1: pwm1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO01__PWM1_OUT		0x110b0</div><div class='add'>+		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts<br/>index 0345267f3390..d5237fd0fa65 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7s-warp.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx7s-warp.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7s-warp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7s-warp.dts</a></div><div class='hunk'>@@ -437,10 +437,12 @@</div><div class='ctx'> 			MX7D_PAD_SD3_RESET_B__SD3_RESET_B	0x1b</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+&amp;iomuxc_lpsr {</div><div class='ctx'> 	pinctrl_wdog: wdoggrp {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B	0x74</div><div class='add'>+			MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B	0x74</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi<br/>index 2b6cb05bc01a..5d3a43b8de20 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7s.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/imx7s.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/imx7s.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/imx7s.dtsi</a></div><div class='hunk'>@@ -46,9 +46,19 @@</div><div class='ctx'> #include &lt;dt-bindings/input/input.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include "imx7d-pinfunc.h"</div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressor and also some bootloaders rely on a</div><div class='add'>+	 * pre-existing /chosen node to be available to insert the</div><div class='add'>+	 * command line and merge other ATAGS info.</div><div class='add'>+	 * Also for U-Boot there must be a pre-existing /memory node.</div><div class='add'>+	 */</div><div class='add'>+	chosen {};</div><div class='add'>+	memory { device_type = "memory"; reg = &lt;0 0&gt;; };</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		gpio0 = &amp;gpio1;</div><div class='ctx'> 		gpio1 = &amp;gpio2;</div><div class='hunk'>@@ -507,7 +517,6 @@</div><div class='ctx'> 					anatop-min-bit-val = &lt;8&gt;;</div><div class='ctx'> 					anatop-min-voltage = &lt;800000&gt;;</div><div class='ctx'> 					anatop-max-voltage = &lt;1200000&gt;;</div><div class='del'>-					anatop-enable-bit = &lt;31&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts<br/>index 6f16d09dc5a4..e8b249f92fb3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/integratorap.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/integratorap.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/integratorap.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/integratorap.dts</a></div><div class='hunk'>@@ -10,6 +10,41 @@</div><div class='ctx'> 	compatible = "arm,integrator-ap";</div><div class='ctx'> 	dma-ranges = &lt;0x80000000 0x0 0x80000000&gt;;</div><div class='ctx'> </div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			/*</div><div class='add'>+			 * Since the board has pluggable CPU modules, we</div><div class='add'>+			 * cannot define a proper compatible here. Let the</div><div class='add'>+			 * boot loader fill in the apropriate compatible</div><div class='add'>+			 * string if necessary.</div><div class='add'>+			 */</div><div class='add'>+			/* compatible = "arm,arm926ej-s"; */</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			/*</div><div class='add'>+			 * The documentation in ARM DUI 0138E page 3-12 states</div><div class='add'>+			 * that the maximum frequency for this clock is 200 MHz</div><div class='add'>+			 * but painful trial-and-error has proved to me that it</div><div class='add'>+			 * is actually just hanging the system above 71 MHz.</div><div class='add'>+			 * Sad but true.</div><div class='add'>+			 */</div><div class='add'>+					 /* kHz     uV   */</div><div class='add'>+			operating-points = &lt;71000  0</div><div class='add'>+					    66000  0</div><div class='add'>+					    60000  0</div><div class='add'>+					    48000  0</div><div class='add'>+					    36000  0</div><div class='add'>+					    24000  0</div><div class='add'>+					    12000  0&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmosc&gt;;</div><div class='add'>+			clock-names = "cpu";</div><div class='add'>+			clock-latency = &lt;1000000&gt;; /* 1 ms */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		arm,timer-primary = &amp;timer2;</div><div class='ctx'> 		arm,timer-secondary = &amp;timer1;</div><div class='head'>diff --git a/arch/arm/boot/dts/integratorcp.dts b/arch/arm/boot/dts/integratorcp.dts<br/>index 1b5e4b006b72..97f38b57a702 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/integratorcp.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/integratorcp.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/integratorcp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/integratorcp.dts</a></div><div class='hunk'>@@ -13,6 +13,32 @@</div><div class='ctx'> 		bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			/*</div><div class='add'>+			 * Since the board has pluggable CPU modules, we</div><div class='add'>+			 * cannot define a proper compatible here. Let the</div><div class='add'>+			 * boot loader fill in the apropriate compatible</div><div class='add'>+			 * string if necessary.</div><div class='add'>+			 */</div><div class='add'>+			/* compatible = "arm,arm920t"; */</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			/*</div><div class='add'>+			 * TBD comment.</div><div class='add'>+			 */</div><div class='add'>+					 /* kHz     uV   */</div><div class='add'>+			operating-points = &lt;50000  0</div><div class='add'>+					    48000  0&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmcore&gt;;</div><div class='add'>+			clock-names = "cpu";</div><div class='add'>+			clock-latency = &lt;1000000&gt;; /* 1 ms */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The Integrator/CP overall clocking architecture can be found in</div><div class='ctx'> 	 * ARM DUI 0184B page 7-28 "Integrator/CP922T system clocks" which</div><div class='head'>diff --git a/arch/arm/boot/dts/keystone-k2e-netcp.dtsi b/arch/arm/boot/dts/keystone-k2e-netcp.dtsi<br/>index ac990f679725..ba828cb59587 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2e-netcp.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/keystone-k2e-netcp.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2e-netcp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2e-netcp.dtsi</a></div><div class='hunk'>@@ -138,7 +138,8 @@ netcp: netcp@24000000 {</div><div class='ctx'> 	/* NetCP address range */</div><div class='ctx'> 	ranges = &lt;0 0x24000000 0x1000000&gt;;</div><div class='ctx'> </div><div class='del'>-	clocks = &lt;&amp;papllclk&gt;, &lt;&amp;clkcpgmac&gt;, &lt;&amp;chipclk12&gt;;</div><div class='add'>+	clocks = &lt;&amp;clkpa&gt;, &lt;&amp;clkcpgmac&gt;, &lt;&amp;chipclk12&gt;;</div><div class='add'>+	clock-names = "pa_clk", "ethss_clk", "cpts";</div><div class='ctx'> 	dma-coherent;</div><div class='ctx'> </div><div class='ctx'> 	ti,navigator-dmas = &lt;&amp;dma_gbe 0&gt;,</div><div class='head'>diff --git a/arch/arm/boot/dts/keystone-k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi<br/>index 497c417db5b6..0dd4cdd6d40c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2e.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/keystone-k2e.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2e.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2e.dtsi</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;dt-bindings/reset/ti-syscon.h&gt;</div><div class='add'>+</div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "ti,k2e", "ti,keystone";</div><div class='ctx'> 	model = "Texas Instruments Keystone 2 Edison SoC";</div><div class='hunk'>@@ -82,6 +84,29 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		msm_ram: msmram@0c000000 {</div><div class='add'>+			compatible = "mmio-sram";</div><div class='add'>+			reg = &lt;0x0c000000 0x200000&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x0c000000 0x200000&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			sram-bm@1f0000 {</div><div class='add'>+				reg = &lt;0x001f0000 0x8000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		psc: power-sleep-controller@02350000 {</div><div class='add'>+			pscrst: reset-controller {</div><div class='add'>+				compatible = "ti,k2e-pscrst", "ti,syscon-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+				ti,reset-bits = &lt;</div><div class='add'>+					0xa3c 8 0xa3c 8 0x83c 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 0: dsp0 */</div><div class='add'>+				&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		dspgpio0: keystone_dsp_gpio@02620240 {</div><div class='ctx'> 			compatible = "ti,keystone-dsp-gpio";</div><div class='ctx'> 			gpio-controller;</div><div class='head'>diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi<br/>index 2919c5190653..f59567fe7d91 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2g.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/keystone-k2g.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2g.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2g.dtsi</a></div><div class='hunk'>@@ -40,12 +40,12 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gic: interrupt-controller@02561000 {</div><div class='del'>-		compatible = "arm,cortex-a15-gic";</div><div class='add'>+		compatible = "arm,gic-400", "arm,cortex-a15-gic";</div><div class='ctx'> 		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0x0 0x02561000 0x0 0x1000&gt;,</div><div class='ctx'> 		      &lt;0x0 0x02562000 0x0 0x2000&gt;,</div><div class='del'>-		      &lt;0x0 0x02564000 0x0 0x1000&gt;,</div><div class='add'>+		      &lt;0x0 0x02564000 0x0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x0 0x02566000 0x0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |</div><div class='ctx'> 				IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='hunk'>@@ -72,10 +72,23 @@</div><div class='ctx'> 	soc {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='add'>+		#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 		compatible = "ti,keystone","simple-bus";</div><div class='ctx'> 		ranges = &lt;0x0 0x0 0x0 0xc0000000&gt;;</div><div class='ctx'> 		dma-ranges = &lt;0x80000000 0x8 0x00000000 0x80000000&gt;;</div><div class='ctx'> </div><div class='add'>+		msm_ram: msmram@0c000000 {</div><div class='add'>+			compatible = "mmio-sram";</div><div class='add'>+			reg = &lt;0x0c000000 0x100000&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x0c000000 0x100000&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			sram-bm@f7000 {</div><div class='add'>+				reg = &lt;0x000f7000 0x8000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		k2g_pinctrl: pinmux@02621000 {</div><div class='ctx'> 			compatible = "pinctrl-single";</div><div class='ctx'> 			reg = &lt;0x02621000 0x410&gt;;</div><div class='hunk'>@@ -89,7 +102,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		uart0: serial@02530c00 {</div><div class='del'>-			compatible = "ns16550a";</div><div class='add'>+			compatible = "ti,da830-uart", "ns16550a";</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/keystone-k2hk-netcp.dtsi b/arch/arm/boot/dts/keystone-k2hk-netcp.dtsi<br/>index f86d6ddb832b..a5ac845464bf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2hk-netcp.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/keystone-k2hk-netcp.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2hk-netcp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2hk-netcp.dtsi</a></div><div class='hunk'>@@ -155,7 +155,8 @@ netcp: netcp@2000000 {</div><div class='ctx'> 	/* NetCP address range */</div><div class='ctx'> 	ranges  = &lt;0 0x2000000 0x100000&gt;;</div><div class='ctx'> </div><div class='del'>-	clocks = &lt;&amp;papllclk&gt;, &lt;&amp;clkcpgmac&gt;, &lt;&amp;chipclk12&gt;;</div><div class='add'>+	clocks = &lt;&amp;clkpa&gt;, &lt;&amp;clkcpgmac&gt;, &lt;&amp;chipclk12&gt;;</div><div class='add'>+	clock-names = "pa_clk", "ethss_clk", "cpts";</div><div class='ctx'> 	dma-coherent;</div><div class='ctx'> </div><div class='ctx'> 	ti,navigator-dmas = &lt;&amp;dma_gbe 22&gt;,</div><div class='head'>diff --git a/arch/arm/boot/dts/keystone-k2hk.dtsi b/arch/arm/boot/dts/keystone-k2hk.dtsi<br/>index 8f67fa8df936..69d449430511 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2hk.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/keystone-k2hk.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2hk.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2hk.dtsi</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;dt-bindings/reset/ti-syscon.h&gt;</div><div class='add'>+</div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "ti,k2hk", "ti,keystone";</div><div class='ctx'> 	model = "Texas Instruments Keystone 2 Kepler/Hawking SoC";</div><div class='hunk'>@@ -46,6 +48,36 @@</div><div class='ctx'> 	soc {</div><div class='ctx'> 		/include/ "keystone-k2hk-clocks.dtsi"</div><div class='ctx'> </div><div class='add'>+		msm_ram: msmram@0c000000 {</div><div class='add'>+			compatible = "mmio-sram";</div><div class='add'>+			reg = &lt;0x0c000000 0x600000&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x0c000000 0x600000&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			sram-bm@5f0000 {</div><div class='add'>+				reg = &lt;0x5f0000 0x8000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		psc: power-sleep-controller@02350000 {</div><div class='add'>+			pscrst: reset-controller {</div><div class='add'>+				compatible = "ti,k2hk-pscrst", "ti,syscon-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+				ti,reset-bits = &lt;</div><div class='add'>+					0xa3c 8 0xa3c 8 0x83c 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 0: dsp0 */</div><div class='add'>+					0xa40 8 0xa40 8 0x840 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 1: dsp1 */</div><div class='add'>+					0xa44 8 0xa44 8 0x844 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 2: dsp2 */</div><div class='add'>+					0xa48 8 0xa48 8 0x848 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 3: dsp3 */</div><div class='add'>+					0xa4c 8 0xa4c 8 0x84c 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 4: dsp4 */</div><div class='add'>+					0xa50 8 0xa50 8 0x850 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 5: dsp5 */</div><div class='add'>+					0xa54 8 0xa54 8 0x854 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 6: dsp6 */</div><div class='add'>+					0xa58 8 0xa58 8 0x858 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 7: dsp7 */</div><div class='add'>+				&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		dspgpio0: keystone_dsp_gpio@02620240 {</div><div class='ctx'> 			compatible = "ti,keystone-dsp-gpio";</div><div class='ctx'> 			gpio-controller;</div><div class='head'>diff --git a/arch/arm/boot/dts/keystone-k2l-netcp.dtsi b/arch/arm/boot/dts/keystone-k2l-netcp.dtsi<br/>index 5acbd0dcc2ab..b6f26824e83a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2l-netcp.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/keystone-k2l-netcp.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2l-netcp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2l-netcp.dtsi</a></div><div class='hunk'>@@ -137,7 +137,8 @@ netcp: netcp@26000000 {</div><div class='ctx'> 	/* NetCP address range */</div><div class='ctx'> 	ranges = &lt;0 0x26000000 0x1000000&gt;;</div><div class='ctx'> </div><div class='del'>-	clocks = &lt;&amp;clkosr&gt;, &lt;&amp;papllclk&gt;, &lt;&amp;clkcpgmac&gt;, &lt;&amp;chipclk12&gt;;</div><div class='add'>+	clocks = &lt;&amp;clkpa&gt;, &lt;&amp;clkcpgmac&gt;, &lt;&amp;chipclk12&gt;, &lt;&amp;clkosr&gt;;</div><div class='add'>+	clock-names = "pa_clk", "ethss_clk", "cpts", "osr_clk";</div><div class='ctx'> 	dma-coherent;</div><div class='ctx'> </div><div class='ctx'> 	ti,navigator-dmas = &lt;&amp;dma_gbe 0&gt;,</div><div class='head'>diff --git a/arch/arm/boot/dts/keystone-k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi<br/>index 2ee3d0ac2816..b58e7ebc0919 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2l.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/keystone-k2l.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone-k2l.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone-k2l.dtsi</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;dt-bindings/reset/ti-syscon.h&gt;</div><div class='add'>+</div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "ti,k2l", "ti,keystone";</div><div class='ctx'> 	model = "Texas Instruments Keystone 2 Lamarr SoC";</div><div class='hunk'>@@ -35,7 +37,7 @@</div><div class='ctx'> 		/include/ "keystone-k2l-clocks.dtsi"</div><div class='ctx'> </div><div class='ctx'> 		uart2: serial@02348400 {</div><div class='del'>-			compatible = "ns16550a";</div><div class='add'>+			compatible = "ti,da830-uart", "ns16550a";</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='hunk'>@@ -45,7 +47,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		uart3:	serial@02348800 {</div><div class='del'>-			compatible = "ns16550a";</div><div class='add'>+			compatible = "ti,da830-uart", "ns16550a";</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='hunk'>@@ -59,6 +61,7 @@</div><div class='ctx'> 			reg = &lt;0x02620690 0xc&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;2&gt;;</div><div class='ctx'> 			pinctrl-single,bit-per-mux;</div><div class='ctx'> 			pinctrl-single,register-width = &lt;32&gt;;</div><div class='ctx'> 			pinctrl-single,function-mask = &lt;0x1&gt;;</div><div class='hunk'>@@ -203,6 +206,32 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		msm_ram: msmram@0c000000 {</div><div class='add'>+			compatible = "mmio-sram";</div><div class='add'>+			reg = &lt;0x0c000000 0x200000&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x0c000000 0x200000&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			sram-bm@1f8000 {</div><div class='add'>+				reg = &lt;0x001f8000 0x8000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		psc: power-sleep-controller@02350000 {</div><div class='add'>+			pscrst: reset-controller {</div><div class='add'>+				compatible = "ti,k2l-pscrst", "ti,syscon-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+				ti,reset-bits = &lt;</div><div class='add'>+					0xa3c 8 0xa3c 8 0x83c 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 0: dsp0 */</div><div class='add'>+					0xa40 8 0xa40 8 0x840 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 1: dsp1 */</div><div class='add'>+					0xa44 8 0xa44 8 0x844 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 2: dsp2 */</div><div class='add'>+					0xa48 8 0xa48 8 0x848 8 (ASSERT_CLEAR | DEASSERT_SET | STATUS_CLEAR) /* 3: dsp3 */</div><div class='add'>+				&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		dspgpio0: keystone_dsp_gpio@02620240 {</div><div class='ctx'> 			compatible = "ti,keystone-dsp-gpio";</div><div class='ctx'> 			gpio-controller;</div><div class='head'>diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi<br/>index 02708ba2d4f4..8dd74f48a6d3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/keystone.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/keystone.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/keystone.dtsi</a></div><div class='hunk'>@@ -30,12 +30,12 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gic: interrupt-controller {</div><div class='del'>-		compatible = "arm,cortex-a15-gic";</div><div class='add'>+		compatible = "arm,gic-400", "arm,cortex-a15-gic";</div><div class='ctx'> 		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0x0 0x02561000 0x0 0x1000&gt;,</div><div class='ctx'> 		      &lt;0x0 0x02562000 0x0 0x2000&gt;,</div><div class='del'>-		      &lt;0x0 0x02564000 0x0 0x1000&gt;,</div><div class='add'>+		      &lt;0x0 0x02564000 0x0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x0 0x02566000 0x0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |</div><div class='ctx'> 				IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='hunk'>@@ -83,6 +83,11 @@</div><div class='ctx'> 			reg = &lt;0x02310000 0x200&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		psc: power-sleep-controller@02350000 {</div><div class='add'>+			compatible = "syscon", "simple-mfd";</div><div class='add'>+			reg = &lt;0x02350000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		devctrl: device-state-control@02620000 {</div><div class='ctx'> 			compatible = "ti,keystone-devctrl", "syscon";</div><div class='ctx'> 			reg = &lt;0x02620000 0x1000&gt;;</div><div class='hunk'>@@ -98,7 +103,7 @@</div><div class='ctx'> 		/include/ "keystone-clocks.dtsi"</div><div class='ctx'> </div><div class='ctx'> 		uart0: serial@02530c00 {</div><div class='del'>-			compatible = "ns16550a";</div><div class='add'>+			compatible = "ti,da830-uart", "ns16550a";</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='hunk'>@@ -108,7 +113,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		uart1:	serial@02531000 {</div><div class='del'>-			compatible = "ns16550a";</div><div class='add'>+			compatible = "ti,da830-uart", "ns16550a";</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-dir665.dts b/arch/arm/boot/dts/kirkwood-dir665.dts<br/>index 41acbb6dd6ab..4d2b15d6244a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-dir665.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-dir665.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-dir665.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-dir665.dts</a></div><div class='hunk'>@@ -194,6 +194,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dsa {</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='ctx'> 		compatible = "marvell,dsa";</div><div class='ctx'> 		#address-cells = &lt;2&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -241,6 +243,53 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mdio {</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	switch@0 {</div><div class='add'>+		compatible = "marvell,mv88e6085";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				label = "lan4";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+			       reg = &lt;1&gt;;</div><div class='add'>+			       label = "lan3";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@2 {</div><div class='add'>+			       reg = &lt;2&gt;;</div><div class='add'>+			       label = "lan2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@3 {</div><div class='add'>+			       reg = &lt;3&gt;;</div><div class='add'>+			       label = "lan1";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@4 {</div><div class='add'>+				reg = &lt;4&gt;;</div><div class='add'>+				label = "wan";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@6 {</div><div class='add'>+				reg = &lt;6&gt;;</div><div class='add'>+				label = "cpu";</div><div class='add'>+				ethernet = &lt;&amp;eth0port&gt;;</div><div class='add'>+				fixed-link {</div><div class='add'>+					speed = &lt;1000&gt;;</div><div class='add'>+					full-duplex;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* eth0 is connected to a Marvell 88E6171 switch, without a PHY. So set</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi<br/>index 6548e68a20d0..b9125e5ed076 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi<br/>index cf2e69f0d54f..29d929535453 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts<br/>index 6dc0df2969f0..9cc05203baee 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts</a></div><div class='hunk'>@@ -17,17 +17,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -36,11 +36,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts<br/>index edcba5c44b05..ff37e76ab551 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts<br/>index 4b6450186af5..f602c059c718 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts<br/>index 954ec1d5b6dc..ef8fc1a077f8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts<br/>index ecd5c12a805d..ce41d553b693 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-linkstation.dtsi b/arch/arm/boot/dts/kirkwood-linkstation.dtsi<br/>index 36c54c9dfa30..b459042a904a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-linkstation.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linkstation.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linkstation.dtsi</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-linksys-viper.dts b/arch/arm/boot/dts/kirkwood-linksys-viper.dts<br/>index 345fcac48dc7..df7851820507 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linksys-viper.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-linksys-viper.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-linksys-viper.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-linksys-viper.dts</a></div><div class='hunk'>@@ -70,6 +70,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dsa {</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='ctx'> 		compatible = "marvell,dsa";</div><div class='ctx'> 		#address-cells = &lt;2&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -207,6 +209,53 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mdio {</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	switch@10 {</div><div class='add'>+		compatible = "marvell,mv88e6085";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;16&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				label = "ethernet1";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				label = "ethernet2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@2 {</div><div class='add'>+				reg = &lt;2&gt;;</div><div class='add'>+				label = "ethernet3";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@3 {</div><div class='add'>+				reg = &lt;3&gt;;</div><div class='add'>+				label = "ethernet4";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@4 {</div><div class='add'>+				reg = &lt;4&gt;;</div><div class='add'>+				label = "internet";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@5 {</div><div class='add'>+				reg = &lt;5&gt;;</div><div class='add'>+				label = "cpu";</div><div class='add'>+				ethernet = &lt;&amp;eth0port&gt;;</div><div class='add'>+				fixed-link {</div><div class='add'>+					speed = &lt;1000&gt;;</div><div class='add'>+					full-duplex;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart0 {</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts<br/>index 172a38c0b8a9..327023a477b8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts</a></div><div class='hunk'>@@ -112,6 +112,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dsa {</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='ctx'> 		compatible = "marvell,dsa";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -159,6 +161,53 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mdio {</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	switch@0 {</div><div class='add'>+		compatible = "marvell,mv88e6085";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				label = "lan1";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				label = "lan2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@2 {</div><div class='add'>+				reg = &lt;2&gt;;</div><div class='add'>+				label = "lan3";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@3 {</div><div class='add'>+				reg = &lt;3&gt;;</div><div class='add'>+				label = "lan4";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@4 {</div><div class='add'>+				reg = &lt;4&gt;;</div><div class='add'>+				label = "wan";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@5 {</div><div class='add'>+				reg = &lt;5&gt;;</div><div class='add'>+				label = "cpu";</div><div class='add'>+				ethernet = &lt;&amp;eth0port&gt;;</div><div class='add'>+				fixed-link {</div><div class='add'>+					speed = &lt;1000&gt;;</div><div class='add'>+					full-duplex;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;eth0 {</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts<br/>index 6f771a99cb02..9ec5a65561e9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-rd88f6281-a.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-rd88f6281-a.dts</a></div><div class='hunk'>@@ -19,11 +19,6 @@</div><div class='ctx'> 	model = "Marvell RD88f6281 Reference design, with A0 or higher SoC";</div><div class='ctx'> 	compatible = "marvell,rd88f6281-a", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";</div><div class='ctx'> </div><div class='del'>-	dsa {</div><div class='del'>-		switch@0 {</div><div class='del'>-			reg = &lt;10 0&gt;;	 /* MDIO address 10, switch 0 in tree */</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mdio {</div><div class='hunk'>@@ -34,6 +29,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;switch {</div><div class='add'>+	reg = &lt;10&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;eth1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts<br/>index 1a797381d3d4..6a4a65ec7944 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts</a></div><div class='hunk'>@@ -33,3 +33,14 @@</div><div class='ctx'> &amp;eth1 {</div><div class='ctx'>       status = "disabled";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;switch {</div><div class='add'>+	reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	ports {</div><div class='add'>+		port@4 {</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+			label = "wan";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi<br/>index d5aacf137e40..91f5da5dae5f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-rd88f6281.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-rd88f6281.dtsi</a></div><div class='hunk'>@@ -54,6 +54,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dsa {</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='ctx'> 		compatible = "marvell,dsa";</div><div class='ctx'> 		#address-cells = &lt;2&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -115,6 +117,48 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mdio {</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	switch: switch@0 {</div><div class='add'>+		compatible = "marvell,mv88e6085";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				label = "lan1";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				label = "lan2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@2 {</div><div class='add'>+				reg = &lt;2&gt;;</div><div class='add'>+				label = "lan3";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@3 {</div><div class='add'>+				reg = &lt;3&gt;;</div><div class='add'>+				label = "lan4";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@5 {</div><div class='add'>+				reg = &lt;5&gt;;</div><div class='add'>+				label = "cpu";</div><div class='add'>+				ethernet = &lt;&amp;eth0port&gt;;</div><div class='add'>+				fixed-link {</div><div class='add'>+					speed = &lt;1000&gt;;</div><div class='add'>+					full-duplex;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;eth0 {</div><div class='head'>diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts<br/>index 1e9a72100a45..330aada6d33f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-topkick.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/kirkwood-topkick.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/kirkwood-topkick.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/kirkwood-topkick.dts</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #include "kirkwood-6282.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	model = "Univeral Scientific Industrial Co. Topkick-1281P2";</div><div class='add'>+	model = "Universal Scientific Industrial Co. Topkick-1281P2";</div><div class='ctx'> 	compatible = "usi,topkick-1281P2", "usi,topkick", "marvell,kirkwood-88f6282", "marvell,kirkwood";</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='head'>diff --git a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts<br/>index da8598402ab8..38faa90007d7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts</a></div><div class='hunk'>@@ -158,7 +158,7 @@</div><div class='ctx'> &amp;mmc1 {</div><div class='ctx'> 	interrupts-extended = &lt;&amp;intc 83 &amp;omap3_pmx_core 0x11a&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;mmc1_pins &amp;mmc1_cd&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc1_pins&gt;;</div><div class='ctx'> 	wp-gpios = &lt;&amp;gpio4 30 GPIO_ACTIVE_HIGH&gt;;		/* gpio_126 */</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio4 14 IRQ_TYPE_LEVEL_LOW&gt;;		/* gpio_110 */</div><div class='ctx'> 	vmmc-supply = &lt;&amp;vmmc1&gt;;</div><div class='hunk'>@@ -193,7 +193,8 @@</div><div class='ctx'> 			OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT | MUX_MODE0)	/* sdmmc1_dat1.sdmmc1_dat1 */</div><div class='ctx'> 			OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT | MUX_MODE0)	/* sdmmc1_dat2.sdmmc1_dat2 */</div><div class='ctx'> 			OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT | MUX_MODE0)	/* sdmmc1_dat3.sdmmc1_dat3 */</div><div class='del'>-			OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4)	/* cam_strobe.gpio_126 sdmmc1_wp*/</div><div class='add'>+			OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4)	/* cam_strobe.gpio_126 */</div><div class='add'>+			OMAP3_CORE1_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4)	/* cam_d11.gpio_110 */</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -242,12 +243,6 @@</div><div class='ctx'> 			OMAP3_WKUP_IOPAD(0x2a16, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4)       /* sys_boot6.gpio_8 */</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	mmc1_cd: pinmux_mmc1_cd {</div><div class='del'>-		pinctrl-single,pins = &lt;</div><div class='del'>-			OMAP3_WKUP_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4)	/* cam_d11.gpio_110 */</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi<br/>index b5841fab51c1..d81fe433e3c8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/lpc32xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/lpc32xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/lpc32xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/lpc32xx.dtsi</a></div><div class='hunk'>@@ -479,6 +479,8 @@</div><div class='ctx'> 				compatible = "nxp,lpc3220-pwm";</div><div class='ctx'> 				reg = &lt;0x4005C000 0x4&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clk LPC32XX_CLK_PWM1&gt;;</div><div class='add'>+				assigned-clocks = &lt;&amp;clk LPC32XX_CLK_PWM1&gt;;</div><div class='add'>+				assigned-clock-parents = &lt;&amp;clk LPC32XX_CLK_PERIPH&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -486,6 +488,8 @@</div><div class='ctx'> 				compatible = "nxp,lpc3220-pwm";</div><div class='ctx'> 				reg = &lt;0x4005C004 0x4&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clk LPC32XX_CLK_PWM2&gt;;</div><div class='add'>+				assigned-clocks = &lt;&amp;clk LPC32XX_CLK_PWM2&gt;;</div><div class='add'>+				assigned-clock-parents = &lt;&amp;clk LPC32XX_CLK_PERIPH&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi<br/>index 368e21934285..45ea57fafa18 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/ls1021a.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/ls1021a.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/ls1021a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ls1021a.dtsi</a></div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "skeleton64.dtsi"</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/thermal/thermal.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "fsl,ls1021a";</div><div class='hunk'>@@ -70,14 +71,15 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		cpu@f00 {</div><div class='add'>+		cpu0: cpu@f00 {</div><div class='ctx'> 			compatible = "arm,cortex-a7";</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			reg = &lt;0xf00&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cluster1_clk&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@f01 {</div><div class='add'>+		cpu1: cpu@f01 {</div><div class='ctx'> 			compatible = "arm,cortex-a7";</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			reg = &lt;0xf01&gt;;</div><div class='hunk'>@@ -108,11 +110,11 @@</div><div class='ctx'> 		ranges;</div><div class='ctx'> </div><div class='ctx'> 		gic: interrupt-controller@1400000 {</div><div class='del'>-			compatible = "arm,cortex-a7-gic";</div><div class='add'>+			compatible = "arm,gic-400", "arm,cortex-a7-gic";</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			reg = &lt;0x0 0x1401000 0x0 0x1000&gt;,</div><div class='del'>-			      &lt;0x0 0x1402000 0x0 0x1000&gt;,</div><div class='add'>+			      &lt;0x0 0x1402000 0x0 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x0 0x1404000 0x0 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x0 0x1406000 0x0 0x2000&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='hunk'>@@ -251,6 +253,84 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		tmu: tmu@1f00000 {</div><div class='add'>+			compatible = "fsl,qoriq-tmu";</div><div class='add'>+			reg = &lt;0x0 0x1f00000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			fsl,tmu-range = &lt;0xb0000 0xa0026 0x80048 0x30061&gt;;</div><div class='add'>+			fsl,tmu-calibration = &lt;0x00000000 0x0000000f</div><div class='add'>+					       0x00000001 0x00000017</div><div class='add'>+					       0x00000002 0x0000001e</div><div class='add'>+					       0x00000003 0x00000026</div><div class='add'>+					       0x00000004 0x0000002e</div><div class='add'>+					       0x00000005 0x00000035</div><div class='add'>+					       0x00000006 0x0000003d</div><div class='add'>+					       0x00000007 0x00000044</div><div class='add'>+					       0x00000008 0x0000004c</div><div class='add'>+					       0x00000009 0x00000053</div><div class='add'>+					       0x0000000a 0x0000005b</div><div class='add'>+					       0x0000000b 0x00000064</div><div class='add'>+</div><div class='add'>+					       0x00010000 0x00000011</div><div class='add'>+					       0x00010001 0x0000001c</div><div class='add'>+					       0x00010002 0x00000024</div><div class='add'>+					       0x00010003 0x0000002b</div><div class='add'>+					       0x00010004 0x00000034</div><div class='add'>+					       0x00010005 0x00000039</div><div class='add'>+					       0x00010006 0x00000042</div><div class='add'>+					       0x00010007 0x0000004c</div><div class='add'>+					       0x00010008 0x00000051</div><div class='add'>+					       0x00010009 0x0000005a</div><div class='add'>+					       0x0001000a 0x00000063</div><div class='add'>+</div><div class='add'>+					       0x00020000 0x00000013</div><div class='add'>+					       0x00020001 0x00000019</div><div class='add'>+					       0x00020002 0x00000024</div><div class='add'>+					       0x00020003 0x0000002c</div><div class='add'>+					       0x00020004 0x00000035</div><div class='add'>+					       0x00020005 0x0000003d</div><div class='add'>+					       0x00020006 0x00000046</div><div class='add'>+					       0x00020007 0x00000050</div><div class='add'>+					       0x00020008 0x00000059</div><div class='add'>+</div><div class='add'>+					       0x00030000 0x00000002</div><div class='add'>+					       0x00030001 0x0000000d</div><div class='add'>+					       0x00030002 0x00000019</div><div class='add'>+					       0x00030003 0x00000024&gt;;</div><div class='add'>+			#thermal-sensor-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		thermal-zones {</div><div class='add'>+			cpu_thermal: cpu-thermal {</div><div class='add'>+				polling-delay-passive = &lt;1000&gt;;</div><div class='add'>+				polling-delay = &lt;5000&gt;;</div><div class='add'>+</div><div class='add'>+				thermal-sensors = &lt;&amp;tmu 0&gt;;</div><div class='add'>+</div><div class='add'>+				trips {</div><div class='add'>+					cpu_alert: cpu-alert {</div><div class='add'>+						temperature = &lt;85000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "passive";</div><div class='add'>+					};</div><div class='add'>+					cpu_crit: cpu-crit {</div><div class='add'>+						temperature = &lt;95000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "critical";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				cooling-maps {</div><div class='add'>+					map0 {</div><div class='add'>+						trip = &lt;&amp;cpu_alert&gt;;</div><div class='add'>+						cooling-device =</div><div class='add'>+							&lt;&amp;cpu0 THERMAL_NO_LIMIT</div><div class='add'>+							THERMAL_NO_LIMIT&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		dspi0: dspi@2100000 {</div><div class='ctx'> 			compatible = "fsl,ls1021a-v1.0-dspi";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/mps2-an385.dts b/arch/arm/boot/dts/mps2-an385.dts<br/>index 31c374d72a6f..aebbebfc25d1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mps2-an385.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mps2-an385.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mps2-an385.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mps2-an385.dts</a></div><div class='hunk'>@@ -59,7 +59,7 @@</div><div class='ctx'> 		stdout-path = "serial0:9600n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@21000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x21000000 0x1000000&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/mps2-an399.dts b/arch/arm/boot/dts/mps2-an399.dts<br/>index 5e7e5ca2edbf..349abf70b2a5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mps2-an399.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mps2-an399.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mps2-an399.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mps2-an399.dts</a></div><div class='hunk'>@@ -59,7 +59,7 @@</div><div class='ctx'> 		stdout-path = "serial0:9600n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@60000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x60000000 0x1000000&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/mps2.dtsi b/arch/arm/boot/dts/mps2.dtsi<br/>index efb8a03cb970..23467390558d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mps2.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mps2.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mps2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mps2.dtsi</a></div><div class='hunk'>@@ -42,10 +42,12 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> #include "armv7-m.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='ctx'> 	oscclk0: clk-osc0 {</div><div class='ctx'> 		compatible = "fixed-clock";</div><div class='ctx'> 		#clock-cells = &lt;0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/mt2701-evb.dts b/arch/arm/boot/dts/mt2701-evb.dts<br/>index 082ca8807c62..a4837985b7a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mt2701-evb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mt2701-evb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mt2701-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt2701-evb.dts</a></div><div class='hunk'>@@ -24,6 +24,60 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;auxadc {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pio {</div><div class='add'>+	spi_pins_a: spi0@0 {</div><div class='add'>+		pins_spi {</div><div class='add'>+			pinmux = &lt;MT2701_PIN_53_SPI0_CSN__FUNC_SPI0_CS&gt;,</div><div class='add'>+				 &lt;MT2701_PIN_54_SPI0_CK__FUNC_SPI0_CK&gt;,</div><div class='add'>+				 &lt;MT2701_PIN_55_SPI0_MI__FUNC_SPI0_MI&gt;,</div><div class='add'>+				 &lt;MT2701_PIN_56_SPI0_MO__FUNC_SPI0_MO&gt;;</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi_pins_b: spi1@0 {</div><div class='add'>+		pins_spi {</div><div class='add'>+			pinmux = &lt;MT2701_PIN_7_SPI1_CSN__FUNC_SPI1_CS&gt;,</div><div class='add'>+				 &lt;MT2701_PIN_8_SPI1_MI__FUNC_SPI1_MI&gt;,</div><div class='add'>+				 &lt;MT2701_PIN_9_SPI1_MO__FUNC_SPI1_MO&gt;,</div><div class='add'>+				 &lt;MT2701_PIN_199_SPI1_CLK__FUNC_SPI1_CK&gt;;</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi_pins_c: spi2@0 {</div><div class='add'>+		pins_spi {</div><div class='add'>+			pinmux = &lt;MT2701_PIN_101_SPI2_CSN__FUNC_SPI2_CS&gt;,</div><div class='add'>+				 &lt;MT2701_PIN_102_SPI2_MI__FUNC_SPI2_MI&gt;,</div><div class='add'>+				 &lt;MT2701_PIN_103_SPI2_MO__FUNC_SPI2_MO&gt;,</div><div class='add'>+				 &lt;MT2701_PIN_104_SPI2_CLK__FUNC_SPI2_CK&gt;;</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi_pins_a&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi_pins_b&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi_pins_c&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi<br/>index 18596a2c58a1..803721050116 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mt2701.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mt2701.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mt2701.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt2701.dtsi</a></div><div class='hunk'>@@ -12,8 +12,11 @@</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;dt-bindings/clock/mt2701-clk.h&gt;</div><div class='add'>+#include &lt;dt-bindings/power/mt2701-power.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/mt2701-resets.h&gt;</div><div class='ctx'> #include "skeleton64.dtsi"</div><div class='ctx'> #include "mt2701-pinfunc.h"</div><div class='ctx'> </div><div class='hunk'>@@ -71,10 +74,48 @@</div><div class='ctx'> 		#clock-cells = &lt;0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uart_clk: dummy26m {</div><div class='add'>+	clk26m: oscillator@0 {</div><div class='ctx'> 		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='ctx'> 		clock-frequency = &lt;26000000&gt;;</div><div class='add'>+		clock-output-names = "clk26m";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtc32k: oscillator@1 {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='ctx'> 		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;32000&gt;;</div><div class='add'>+		clock-output-names = "rtc32k";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	thermal-zones {</div><div class='add'>+		cpu_thermal: cpu_thermal {</div><div class='add'>+			polling-delay-passive = &lt;1000&gt;; /* milliseconds */</div><div class='add'>+			polling-delay = &lt;1000&gt;; /* milliseconds */</div><div class='add'>+</div><div class='add'>+			thermal-sensors = &lt;&amp;thermal 0&gt;;</div><div class='add'>+			sustainable-power = &lt;1000&gt;;</div><div class='add'>+</div><div class='add'>+			trips {</div><div class='add'>+				threshold: trip-point@0 {</div><div class='add'>+					temperature = &lt;68000&gt;;</div><div class='add'>+					hysteresis = &lt;2000&gt;;</div><div class='add'>+					type = "passive";</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				target: trip-point@1 {</div><div class='add'>+					temperature = &lt;85000&gt;;</div><div class='add'>+					hysteresis = &lt;2000&gt;;</div><div class='add'>+					type = "passive";</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				cpu_crit: cpu_crit@0 {</div><div class='add'>+					temperature = &lt;115000&gt;;</div><div class='add'>+					hysteresis = &lt;2000&gt;;</div><div class='add'>+					type = "critical";</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	timer {</div><div class='hunk'>@@ -86,17 +127,24 @@</div><div class='ctx'> 			     &lt;GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pio: pinctrl@10005000 {</div><div class='del'>-		compatible = "mediatek,mt2701-pinctrl";</div><div class='del'>-		reg = &lt;0 0x1000b000 0 0x1000&gt;;</div><div class='del'>-		mediatek,pctl-regmap = &lt;&amp;syscfg_pctl_a&gt;;</div><div class='del'>-		pins-are-numbered;</div><div class='del'>-		gpio-controller;</div><div class='del'>-		#gpio-cells = &lt;2&gt;;</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		interrupts = &lt;GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='del'>-			     &lt;GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	topckgen: syscon@10000000 {</div><div class='add'>+		compatible = "mediatek,mt2701-topckgen", "syscon";</div><div class='add'>+		reg = &lt;0 0x10000000 0 0x1000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	infracfg: syscon@10001000 {</div><div class='add'>+		compatible = "mediatek,mt2701-infracfg", "syscon";</div><div class='add'>+		reg = &lt;0 0x10001000 0 0x1000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+		#reset-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pericfg: syscon@10003000 {</div><div class='add'>+		compatible = "mediatek,mt2701-pericfg", "syscon";</div><div class='add'>+		reg = &lt;0 0x10003000 0 0x1000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+		#reset-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	syscfg_pctl_a: syscfg@10005000 {</div><div class='hunk'>@@ -104,6 +152,17 @@</div><div class='ctx'> 		reg = &lt;0 0x10005000 0 0x1000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	scpsys: scpsys@10006000 {</div><div class='add'>+		compatible = "mediatek,mt2701-scpsys", "syscon";</div><div class='add'>+		#power-domain-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0 0x10006000 0 0x1000&gt;;</div><div class='add'>+		infracfg = &lt;&amp;infracfg&gt;;</div><div class='add'>+		clocks = &lt;&amp;topckgen CLK_TOP_MM_SEL&gt;,</div><div class='add'>+			 &lt;&amp;topckgen CLK_TOP_MFG_SEL&gt;,</div><div class='add'>+			 &lt;&amp;topckgen CLK_TOP_ETHIF_SEL&gt;;</div><div class='add'>+		clock-names = "mm", "mfg", "ethif";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	watchdog: watchdog@10007000 {</div><div class='ctx'> 		compatible = "mediatek,mt2701-wdt",</div><div class='ctx'> 			     "mediatek,mt6589-wdt";</div><div class='hunk'>@@ -119,6 +178,29 @@</div><div class='ctx'> 		clock-names = "system-clk", "rtc-clk";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	pio: pinctrl@1000b000 {</div><div class='add'>+		compatible = "mediatek,mt2701-pinctrl";</div><div class='add'>+		reg = &lt;0 0x1000b000 0 0x1000&gt;;</div><div class='add'>+		mediatek,pctl-regmap = &lt;&amp;syscfg_pctl_a&gt;;</div><div class='add'>+		pins-are-numbered;</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	smi_common: smi@1000c000 {</div><div class='add'>+		compatible = "mediatek,mt2701-smi-common";</div><div class='add'>+		reg = &lt;0 0x1000c000 0 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;infracfg CLK_INFRA_SMI&gt;,</div><div class='add'>+			 &lt;&amp;mmsys CLK_MM_SMI_COMMON&gt;,</div><div class='add'>+			 &lt;&amp;infracfg CLK_INFRA_SMI&gt;;</div><div class='add'>+		clock-names = "apb", "smi", "async";</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT2701_POWER_DOMAIN_DISP&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sysirq: interrupt-controller@10200100 {</div><div class='ctx'> 		compatible = "mediatek,mt2701-sysirq",</div><div class='ctx'> 			     "mediatek,mt6577-sysirq";</div><div class='hunk'>@@ -128,23 +210,49 @@</div><div class='ctx'> 		reg = &lt;0 0x10200100 0 0x1c&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	iommu: mmsys_iommu@10205000 {</div><div class='add'>+		compatible = "mediatek,mt2701-m4u";</div><div class='add'>+		reg = &lt;0 0x10205000 0 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 106 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;infracfg CLK_INFRA_M4U&gt;;</div><div class='add'>+		clock-names = "bclk";</div><div class='add'>+		mediatek,larbs = &lt;&amp;larb0 &amp;larb1 &amp;larb2&gt;;</div><div class='add'>+		#iommu-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	apmixedsys: syscon@10209000 {</div><div class='add'>+		compatible = "mediatek,mt2701-apmixedsys", "syscon";</div><div class='add'>+		reg = &lt;0 0x10209000 0 0x1000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	gic: interrupt-controller@10211000 {</div><div class='ctx'> 		compatible = "arm,cortex-a7-gic";</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 		reg = &lt;0 0x10211000 0 0x1000&gt;,</div><div class='del'>-		      &lt;0 0x10212000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x10212000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0 0x10214000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0 0x10216000 0 0x2000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	auxadc: adc@11001000 {</div><div class='add'>+		compatible = "mediatek,mt2701-auxadc";</div><div class='add'>+		reg = &lt;0 0x11001000 0 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;pericfg CLK_PERI_AUXADC&gt;;</div><div class='add'>+		clock-names = "main";</div><div class='add'>+		#io-channel-cells = &lt;1&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	uart0: serial@11002000 {</div><div class='ctx'> 		compatible = "mediatek,mt2701-uart",</div><div class='ctx'> 			     "mediatek,mt6577-uart";</div><div class='ctx'> 		reg = &lt;0 0x11002000 0 0x400&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 51 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='del'>-		clocks = &lt;&amp;uart_clk&gt;;</div><div class='add'>+		clocks = &lt;&amp;pericfg CLK_PERI_UART0_SEL&gt;, &lt;&amp;pericfg CLK_PERI_UART0&gt;;</div><div class='add'>+		clock-names = "baud", "bus";</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -153,7 +261,8 @@</div><div class='ctx'> 			     "mediatek,mt6577-uart";</div><div class='ctx'> 		reg = &lt;0 0x11003000 0 0x400&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 52 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='del'>-		clocks = &lt;&amp;uart_clk&gt;;</div><div class='add'>+		clocks = &lt;&amp;pericfg CLK_PERI_UART1_SEL&gt;, &lt;&amp;pericfg CLK_PERI_UART1&gt;;</div><div class='add'>+		clock-names = "baud", "bus";</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +271,8 @@</div><div class='ctx'> 			     "mediatek,mt6577-uart";</div><div class='ctx'> 		reg = &lt;0 0x11004000 0 0x400&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 53 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='del'>-		clocks = &lt;&amp;uart_clk&gt;;</div><div class='add'>+		clocks = &lt;&amp;pericfg CLK_PERI_UART2_SEL&gt;, &lt;&amp;pericfg CLK_PERI_UART2&gt;;</div><div class='add'>+		clock-names = "baud", "bus";</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -171,7 +281,148 @@</div><div class='ctx'> 			     "mediatek,mt6577-uart";</div><div class='ctx'> 		reg = &lt;0 0x11005000 0 0x400&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 54 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='del'>-		clocks = &lt;&amp;uart_clk&gt;;</div><div class='add'>+		clocks = &lt;&amp;pericfg CLK_PERI_UART3_SEL&gt;, &lt;&amp;pericfg CLK_PERI_UART3&gt;;</div><div class='add'>+		clock-names = "baud", "bus";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi0: spi@1100a000 {</div><div class='add'>+		compatible = "mediatek,mt2701-spi";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0 0x1100a000 0 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 78 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;topckgen CLK_TOP_SYSPLL3_D2&gt;,</div><div class='add'>+			 &lt;&amp;topckgen CLK_TOP_SPI0_SEL&gt;,</div><div class='add'>+			 &lt;&amp;pericfg CLK_PERI_SPI0&gt;;</div><div class='add'>+		clock-names = "parent-clk", "sel-clk", "spi-clk";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	thermal: thermal@1100b000 {</div><div class='add'>+		#thermal-sensor-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "mediatek,mt2701-thermal";</div><div class='add'>+		reg = &lt;0 0x1100b000 0 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 70 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;pericfg CLK_PERI_THERM&gt;, &lt;&amp;pericfg CLK_PERI_AUXADC&gt;;</div><div class='add'>+		clock-names = "therm", "auxadc";</div><div class='add'>+		resets = &lt;&amp;pericfg MT2701_PERI_THERM_SW_RST&gt;;</div><div class='add'>+		reset-names = "therm";</div><div class='add'>+		mediatek,auxadc = &lt;&amp;auxadc&gt;;</div><div class='add'>+		mediatek,apmixedsys = &lt;&amp;apmixedsys&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nandc: nfi@1100d000 {</div><div class='add'>+		compatible = "mediatek,mt2701-nfc";</div><div class='add'>+		reg = &lt;0 0x1100d000 0 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 56 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;pericfg CLK_PERI_NFI&gt;,</div><div class='add'>+			 &lt;&amp;pericfg CLK_PERI_NFI_PAD&gt;;</div><div class='add'>+		clock-names = "nfi_clk", "pad_clk";</div><div class='add'>+		status = "disabled";</div><div class='add'>+		ecc-engine = &lt;&amp;bch&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bch: ecc@1100e000 {</div><div class='add'>+		compatible = "mediatek,mt2701-ecc";</div><div class='add'>+		reg = &lt;0 0x1100e000 0 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 55 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;pericfg CLK_PERI_NFI_ECC&gt;;</div><div class='add'>+		clock-names = "nfiecc_clk";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi1: spi@11016000 {</div><div class='add'>+		compatible = "mediatek,mt2701-spi";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0 0x11016000 0 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 79 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;topckgen CLK_TOP_SYSPLL3_D2&gt;,</div><div class='add'>+			 &lt;&amp;topckgen CLK_TOP_SPI1_SEL&gt;,</div><div class='add'>+			 &lt;&amp;pericfg CLK_PERI_SPI1&gt;;</div><div class='add'>+		clock-names = "parent-clk", "sel-clk", "spi-clk";</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	spi2: spi@11017000 {</div><div class='add'>+		compatible = "mediatek,mt2701-spi";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0 0x11017000 0 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 142 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;topckgen CLK_TOP_SYSPLL3_D2&gt;,</div><div class='add'>+			 &lt;&amp;topckgen CLK_TOP_SPI2_SEL&gt;,</div><div class='add'>+			 &lt;&amp;pericfg CLK_PERI_SPI2&gt;;</div><div class='add'>+		clock-names = "parent-clk", "sel-clk", "spi-clk";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mmsys: syscon@14000000 {</div><div class='add'>+		compatible = "mediatek,mt2701-mmsys", "syscon";</div><div class='add'>+		reg = &lt;0 0x14000000 0 0x1000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	larb0: larb@14010000 {</div><div class='add'>+		compatible = "mediatek,mt2701-smi-larb";</div><div class='add'>+		reg = &lt;0 0x14010000 0 0x1000&gt;;</div><div class='add'>+		mediatek,smi = &lt;&amp;smi_common&gt;;</div><div class='add'>+		clocks = &lt;&amp;mmsys CLK_MM_SMI_LARB0&gt;,</div><div class='add'>+			 &lt;&amp;mmsys CLK_MM_SMI_LARB0&gt;;</div><div class='add'>+		clock-names = "apb", "smi";</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT2701_POWER_DOMAIN_DISP&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	imgsys: syscon@15000000 {</div><div class='add'>+		compatible = "mediatek,mt2701-imgsys", "syscon";</div><div class='add'>+		reg = &lt;0 0x15000000 0 0x1000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	larb2: larb@15001000 {</div><div class='add'>+		compatible = "mediatek,mt2701-smi-larb";</div><div class='add'>+		reg = &lt;0 0x15001000 0 0x1000&gt;;</div><div class='add'>+		mediatek,smi = &lt;&amp;smi_common&gt;;</div><div class='add'>+		clocks = &lt;&amp;imgsys CLK_IMG_SMI_COMM&gt;,</div><div class='add'>+			 &lt;&amp;imgsys CLK_IMG_SMI_COMM&gt;;</div><div class='add'>+		clock-names = "apb", "smi";</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT2701_POWER_DOMAIN_ISP&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vdecsys: syscon@16000000 {</div><div class='add'>+		compatible = "mediatek,mt2701-vdecsys", "syscon";</div><div class='add'>+		reg = &lt;0 0x16000000 0 0x1000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	larb1: larb@16010000 {</div><div class='add'>+		compatible = "mediatek,mt2701-smi-larb";</div><div class='add'>+		reg = &lt;0 0x16010000 0 0x1000&gt;;</div><div class='add'>+		mediatek,smi = &lt;&amp;smi_common&gt;;</div><div class='add'>+		clocks = &lt;&amp;vdecsys CLK_VDEC_CKGEN&gt;,</div><div class='add'>+			 &lt;&amp;vdecsys CLK_VDEC_LARB&gt;;</div><div class='add'>+		clock-names = "apb", "smi";</div><div class='add'>+		power-domains = &lt;&amp;scpsys MT2701_POWER_DOMAIN_VDEC&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hifsys: syscon@1a000000 {</div><div class='add'>+		compatible = "mediatek,mt2701-hifsys", "syscon";</div><div class='add'>+		reg = &lt;0 0x1a000000 0 0x1000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ethsys: syscon@1b000000 {</div><div class='add'>+		compatible = "mediatek,mt2701-ethsys", "syscon";</div><div class='add'>+		reg = &lt;0 0x1b000000 0 0x1000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bdpsys: syscon@1c000000 {</div><div class='add'>+		compatible = "mediatek,mt2701-bdpsys", "syscon";</div><div class='add'>+		reg = &lt;0 0x1c000000 0 0x1000&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/mt6580.dtsi b/arch/arm/boot/dts/mt6580.dtsi<br/>index 06fdf6c2d5fd..a349dba5ff79 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mt6580.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mt6580.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mt6580.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt6580.dtsi</a></div><div class='hunk'>@@ -91,7 +91,7 @@</div><div class='ctx'> 		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 		reg = &lt;0x10211000 0x1000&gt;,</div><div class='del'>-		      &lt;0x10212000 0x1000&gt;,</div><div class='add'>+		      &lt;0x10212000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x10214000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x10216000 0x2000&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/mt6589.dtsi b/arch/arm/boot/dts/mt6589.dtsi<br/>index 88b3cb128698..0d6f60af7640 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mt6589.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mt6589.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mt6589.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt6589.dtsi</a></div><div class='hunk'>@@ -102,7 +102,7 @@</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 			reg = &lt;0x10211000 0x1000&gt;,</div><div class='del'>-			      &lt;0x10212000 0x1000&gt;,</div><div class='add'>+			      &lt;0x10212000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x10214000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x10216000 0x2000&gt;;</div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/arm/boot/dts/mt7623-evb.dts b/arch/arm/boot/dts/mt7623-evb.dts<br/>index a9ee2d64c6f7..b60b41cad592 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mt7623-evb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mt7623-evb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mt7623-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt7623-evb.dts</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2016 MediaTek Inc.</div><div class='del'>- * Author: John Crispin &lt;blogic@openwrt.org&gt;</div><div class='add'>+ * Author: John Crispin &lt;john@phrozen.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='head'>diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi<br/>index fd2b614ae6f3..402579ab70d2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mt7623.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mt7623.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mt7623.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt7623.dtsi</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2016 MediaTek Inc.</div><div class='del'>- * Author: John Crispin &lt;blogic@openwrt.org&gt;</div><div class='add'>+ * Author: John Crispin &lt;john@phrozen.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -104,7 +104,7 @@</div><div class='ctx'> 		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 		reg = &lt;0 0x10211000 0 0x1000&gt;,</div><div class='del'>-		      &lt;0 0x10212000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x10212000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0 0x10214000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0 0x10216000 0 0x2000&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/mt8127.dtsi b/arch/arm/boot/dts/mt8127.dtsi<br/>index 52086c8018e2..916c095d11b9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mt8127.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mt8127.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mt8127.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt8127.dtsi</a></div><div class='hunk'>@@ -129,7 +129,7 @@</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 			reg = &lt;0 0x10211000 0 0x1000&gt;,</div><div class='del'>-			      &lt;0 0x10212000 0 0x1000&gt;,</div><div class='add'>+			      &lt;0 0x10212000 0 0x2000&gt;,</div><div class='ctx'> 			      &lt;0 0x10214000 0 0x2000&gt;,</div><div class='ctx'> 			      &lt;0 0x10216000 0 0x2000&gt;;</div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/arm/boot/dts/mt8135.dtsi b/arch/arm/boot/dts/mt8135.dtsi<br/>index 1d7f92bdcb9c..a97b4ee4ae79 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mt8135.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mt8135.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mt8135.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mt8135.dtsi</a></div><div class='hunk'>@@ -221,7 +221,7 @@</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 			reg = &lt;0 0x10211000 0 0x1000&gt;,</div><div class='del'>-			      &lt;0 0x10212000 0 0x1000&gt;,</div><div class='add'>+			      &lt;0 0x10212000 0 0x2000&gt;,</div><div class='ctx'> 			      &lt;0 0x10214000 0 0x2000&gt;,</div><div class='ctx'> 			      &lt;0 0x10216000 0 0x2000&gt;;</div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/arm/boot/dts/mvebu-linkstation-fan.dtsi b/arch/arm/boot/dts/mvebu-linkstation-fan.dtsi<br/>index e211a3c47a76..e172029a0c4d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mvebu-linkstation-fan.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mvebu-linkstation-fan.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mvebu-linkstation-fan.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mvebu-linkstation-fan.dtsi</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi b/arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi<br/>index 68d75e79a360..c2d87ba6190a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi<br/>index 4f793a025a72..f1d6de8b3c19 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap2.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap2.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap2.dtsi</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> 	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> 	#address-cells = &lt;1&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='add'>+	chosen { };</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial0 = &amp;uart1;</div><div class='head'>diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi<br/>index fb712b9aa874..aba542d63d6d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap2420.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap2420.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap2420.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap2420.dtsi</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> 				reg = &lt;0x0 0x1000&gt;;</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;1&gt;;</div><div class='add'>+				#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 				ranges = &lt;0 0x0 0x1000&gt;;</div><div class='ctx'> </div><div class='ctx'> 				omap2420_pmx: pinmux@30 {</div><div class='hunk'>@@ -46,6 +47,7 @@</div><div class='ctx'> 					reg = &lt;0x30 0x0113&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+					#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 					pinctrl-single,register-width = &lt;8&gt;;</div><div class='ctx'> 					pinctrl-single,function-mask = &lt;0x3f&gt;;</div><div class='ctx'> 				};</div><div class='head'>diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi<br/>index 455aaea407dd..84635eeb99cd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap2430.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap2430.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap2430.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap2430.dtsi</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> 				reg = &lt;0x2000 0x1000&gt;;</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;1&gt;;</div><div class='add'>+				#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 				ranges = &lt;0 0x2000 0x1000&gt;;</div><div class='ctx'> </div><div class='ctx'> 				omap2430_pmx: pinmux@30 {</div><div class='hunk'>@@ -46,6 +47,7 @@</div><div class='ctx'> 					reg = &lt;0x30 0x0154&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+					#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 					pinctrl-single,register-width = &lt;8&gt;;</div><div class='ctx'> 					pinctrl-single,function-mask = &lt;0x3f&gt;;</div><div class='ctx'> 				};</div><div class='head'>diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts<br/>index 85e297ed0ea1..673cee2234b2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap3-beagle-xm.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap3-beagle-xm.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap3-beagle-xm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap3-beagle-xm.dts</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		display0 = &amp;dvi0;</div><div class='ctx'> 		display1 = &amp;tv0;</div><div class='add'>+		ethernet = &amp;ethernet;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='hunk'>@@ -348,6 +349,21 @@</div><div class='ctx'> </div><div class='ctx'> &amp;usbhsehci {</div><div class='ctx'> 	phys = &lt;0 &amp;hsusb2_phy&gt;;</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	hub@2 {</div><div class='add'>+		compatible = "usb424,9514";</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ethernet: usbether@1 {</div><div class='add'>+			compatible = "usb424,ec00";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;vaux2 {</div><div class='head'>diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi<br/>index 54c4c07bbe4a..e268efde6c6d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap3-igep.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap3-igep.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap3-igep.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap3-igep.dtsi</a></div><div class='hunk'>@@ -126,27 +126,6 @@</div><div class='ctx'> </div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-		partition@0 {</div><div class='del'>-			label = "SPL";</div><div class='del'>-			reg = &lt;0 0x100000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@80000 {</div><div class='del'>-			label = "U-Boot";</div><div class='del'>-			reg = &lt;0x100000 0x180000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@1c0000 {</div><div class='del'>-			label = "Environment";</div><div class='del'>-			reg = &lt;0x280000 0x100000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@280000 {</div><div class='del'>-			label = "Kernel";</div><div class='del'>-			reg = &lt;0x380000 0x300000&gt;;</div><div class='del'>-		};</div><div class='del'>-		partition@780000 {</div><div class='del'>-			label = "Filesystem";</div><div class='del'>-			reg = &lt;0x680000 0x1f980000&gt;;</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts<br/>index 87ca50b53002..b64cfda8dbb7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap3-n900.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap3-n900.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap3-n900.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap3-n900.dts</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> 		heartbeat {</div><div class='ctx'> 			label = "debug::sleep";</div><div class='del'>-			gpios = &lt;&amp;gpio6 2 GPIO_ACTIVE_HIGH&gt;;  /* gpio162 */</div><div class='add'>+			gpios = &lt;&amp;gpio6 2 GPIO_ACTIVE_HIGH&gt;;  /* 162 */</div><div class='ctx'> 			linux,default-trigger = "default-on";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='ctx'> 			pinctrl-0 = &lt;&amp;debug_leds&gt;;</div><div class='hunk'>@@ -625,6 +625,7 @@</div><div class='ctx'> 		reg = &lt;0x55&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/* Stereo headphone amplifier */</div><div class='ctx'> 	tpa6130a2: tpa6130a2@60 {</div><div class='ctx'> 		compatible = "ti,tpa6130a2";</div><div class='ctx'> 		reg = &lt;0x60&gt;;</div><div class='hunk'>@@ -734,6 +735,8 @@</div><div class='ctx'> 	vmmc_aux-supply = &lt;&amp;vsim&gt;;</div><div class='ctx'> 	bus-width = &lt;8&gt;;</div><div class='ctx'> 	non-removable;</div><div class='add'>+	no-sdio;</div><div class='add'>+	no-sd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc3 {</div><div class='head'>diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi<br/>index 353d818ce5a6..a3ff4933dbc1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap3.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap3.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap3.dtsi</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> 	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> 	#address-cells = &lt;1&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='add'>+	chosen { };</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		i2c0 = &amp;i2c1;</div><div class='hunk'>@@ -106,6 +107,7 @@</div><div class='ctx'> 					reg = &lt;0x30 0x238&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+					#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 					#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 					interrupt-controller;</div><div class='ctx'> 					pinctrl-single,register-width = &lt;16&gt;;</div><div class='hunk'>@@ -145,6 +147,7 @@</div><div class='ctx'> 					reg = &lt;0xa00 0x5c&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+					#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 					#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 					interrupt-controller;</div><div class='ctx'> 					pinctrl-single,register-width = &lt;16&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi<br/>index e41c52d3b113..834fdf13601f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap34xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap34xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap34xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap34xx.dtsi</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> 			reg = &lt;0x480025d8 0x24&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			pinctrl-single,register-width = &lt;16&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi<br/>index 718fa88407cd..d1a3e56b50ce 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap36xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap36xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap36xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap36xx.dtsi</a></div><div class='hunk'>@@ -66,6 +66,7 @@</div><div class='ctx'> 			reg = &lt;0x480025a0 0x5c&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			pinctrl-single,register-width = &lt;16&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts<br/>new file mode 100644<br/>index 000000000000..f3ccb4ceed9e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap4-droid4-xt894.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap4-droid4-xt894.dts</a></div><div class='hunk'>@@ -0,0 +1,188 @@</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "omap443x.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Motorola Droid 4 XT894";</div><div class='add'>+	compatible = "motorola,droid4", "ti,omap4430", "ti,omap4";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;uart3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We seem to have only 1021 MB accessible, 1021 - 1022 is locked,</div><div class='add'>+	 * then 1023 - 1024 seems to contain mbm. For SRAM, see the notes</div><div class='add'>+	 * below about SRAM and L3_ICLK2 being unused by default,</div><div class='add'>+	 */</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x80000000 0x3fd00000&gt;;	/* 1021 MB */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* CPCAP really supports 1650000 to 3400000 range */</div><div class='add'>+	vmmc: regulator-mmc {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vmmc";</div><div class='add'>+		regulator-min-microvolt = &lt;3000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* CPCAP really supports 3000000 to 3100000 range */</div><div class='add'>+	vemmc: regulator-emmc {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vemmc";</div><div class='add'>+		regulator-min-microvolt = &lt;3000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* CPCAP really supports 1650000 to 1950000 range */</div><div class='add'>+	wl12xx_vmmc: regulator-wl12xx {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vwl1271";</div><div class='add'>+		regulator-min-microvolt = &lt;1650000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1650000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio3 30 GPIO_ACTIVE_HIGH&gt;;	/* gpio94 */</div><div class='add'>+		startup-delay-us = &lt;70000&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* L3_2 interconnect is unused, SRAM, GPMC and L3_ICLK2 disabled */</div><div class='add'>+&amp;gpmc {</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	vmmc-supply = &lt;&amp;vmmc&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio4 10 GPIO_ACTIVE_LOW&gt;;	/* gpio106 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc2 {</div><div class='add'>+	vmmc-supply = &lt;&amp;vemmc&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc3 {</div><div class='add'>+	vmmc-supply = &lt;&amp;wl12xx_vmmc&gt;;</div><div class='add'>+	interrupts-extended = &lt;&amp;wakeupgen GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+			       &amp;omap4_pmx_core 0xde&gt;;</div><div class='add'>+</div><div class='add'>+	non-removable;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-power-off-card;</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	wlcore: wlcore@2 {</div><div class='add'>+		compatible = "ti,wl1283";</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio4&gt;;</div><div class='add'>+		interrupts = &lt;4 IRQ_TYPE_LEVEL_HIGH&gt;; /* gpio100 */</div><div class='add'>+		ref-clock-frequency = &lt;26000000&gt;;</div><div class='add'>+		tcxo-clock-frequency = &lt;26000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* L3_2 interconnect is unused, SRAM, GPMC and L3_ICLK2 disabled */</div><div class='add'>+&amp;ocmcram {</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;omap4_pmx_core {</div><div class='add'>+	usb_gpio_mux_sel1: pinmux_usb_gpio_mux_sel1_pins {</div><div class='add'>+		/* gpio_60 */</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+		OMAP4_IOPAD(0x088, PIN_OUTPUT | MUX_MODE3)</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb_ulpi_pins: pinmux_usb_ulpi_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+		OMAP4_IOPAD(0x196, MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x198, MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1b2, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1b4, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1b6, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1b8, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1ba, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1bc, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1be, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1c0, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1c2, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1c4, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1c6, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP | MUX_MODE0)</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* usb0_otg_dp and usb0_otg_dm */</div><div class='add'>+	usb_utmi_pins: pinmux_usb_utmi_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+		OMAP4_IOPAD(0x196, PIN_INPUT | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x198, PIN_INPUT | MUX_MODE0)</div><div class='add'>+		OMAP4_IOPAD(0x1b2, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1b4, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1b6, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1b8, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1ba, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1bc, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1be, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1c0, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1c2, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1c4, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1c6, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* uart3_tx_irtx and uart3_rx_irrx */</div><div class='add'>+	uart3_pins: pinmux_uart3_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+		OMAP4_IOPAD(0x196, MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x198, MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1b2, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1b4, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1b6, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1b8, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1ba, MUX_MODE2)</div><div class='add'>+		OMAP4_IOPAD(0x1bc, PIN_INPUT | MUX_MODE2)</div><div class='add'>+		OMAP4_IOPAD(0x1be, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1c0, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1c2, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1c4, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1c6, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP | MUX_MODE7)</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;omap4_pmx_wkup {</div><div class='add'>+	usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins {</div><div class='add'>+		/* gpio_wk0 */</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+		OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3)</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart3 {</div><div class='add'>+	interrupts-extended = &lt;&amp;wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+			       &amp;omap4_pmx_core 0x17c&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Internal UTMI+ PHY used for OTG, CPCAP ULPI PHY for detection and charger */</div><div class='add'>+&amp;usb_otg_hs {</div><div class='add'>+	interface-type = &lt;1&gt;;</div><div class='add'>+	mode = &lt;3&gt;;</div><div class='add'>+	power = &lt;50&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi<br/>index 1673689e6705..edbc4090297d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap4-panda-common.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap4-panda-common.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap4-panda-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap4-panda-common.dtsi</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		display0 = &amp;dvi0;</div><div class='ctx'> 		display1 = &amp;hdmi0;</div><div class='add'>+		ethernet = &amp;ethernet;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds: leds {</div><div class='hunk'>@@ -520,6 +521,21 @@</div><div class='ctx'> </div><div class='ctx'> &amp;usbhsehci {</div><div class='ctx'> 	phys = &lt;&amp;hsusb1_phy&gt;;</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	hub@1 {</div><div class='add'>+		compatible = "usb424,9514";</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ethernet: usbether@1 {</div><div class='add'>+			compatible = "usb424,ec00";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;dss {</div><div class='head'>diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi<br/>index 0ced079b7ae3..578c53f08309 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap4.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap4.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap4.dtsi</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> 	interrupt-parent = &lt;&amp;wakeupgen&gt;;</div><div class='ctx'> 	#address-cells = &lt;1&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='add'>+	chosen { };</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		i2c0 = &amp;i2c1;</div><div class='hunk'>@@ -184,6 +185,7 @@</div><div class='ctx'> 					reg = &lt;0x40 0x0196&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+					#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 					#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 					interrupt-controller;</div><div class='ctx'> 					pinctrl-single,register-width = &lt;16&gt;;</div><div class='hunk'>@@ -256,6 +258,7 @@</div><div class='ctx'> 					reg = &lt;0x1e040 0x0038&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+					#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 					#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 					interrupt-controller;</div><div class='ctx'> 					pinctrl-single,register-width = &lt;16&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/omap5-igep0050.dts b/arch/arm/boot/dts/omap5-igep0050.dts<br/>index 8fc19218057e..fef2a446b61c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap5-igep0050.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap5-igep0050.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap5-igep0050.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap5-igep0050.dts</a></div><div class='hunk'>@@ -19,6 +19,10 @@</div><div class='ctx'> 		reg = &lt;0x0 0x80000000 0 0x7f000000&gt;;	/* 2032 MB */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	aliases {</div><div class='add'>+		ethernet = &amp;ethernet;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	gpio_keys {</div><div class='ctx'> 		compatible = "gpio-keys";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;power_button_pin&gt;;</div><div class='hunk'>@@ -116,3 +120,20 @@</div><div class='ctx'> 		OMAP5_IOPAD(0x1ca, PIN_OUTPUT | MUX_MODE6)	/* perslimbus2_clock.gpio5_145 */</div><div class='ctx'> 	&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;usbhsehci {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	hub@2 {</div><div class='add'>+		compatible = "usb424,3503";</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ethernet: usbether@3 {</div><div class='add'>+			compatible = "usb424,7500";</div><div class='add'>+			reg = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts<br/>index 53d31a87b44b..0d42c46f13e7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap5-uevm.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap5-uevm.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap5-uevm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap5-uevm.dts</a></div><div class='hunk'>@@ -18,6 +18,10 @@</div><div class='ctx'> 		reg = &lt;0 0x80000000 0 0x7f000000&gt;; /* 2032 MB */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	aliases {</div><div class='add'>+		ethernet = &amp;ethernet;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	leds {</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> 		led1 {</div><div class='hunk'>@@ -27,12 +31,98 @@</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	evm_keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;evm_keys_pins&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;7&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		btn1 {</div><div class='add'>+			label = "BTN1";</div><div class='add'>+			linux,code = &lt;169&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio3 19 GPIO_ACTIVE_LOW&gt;;	/* gpio3_83 */</div><div class='add'>+			wakeup-source;</div><div class='add'>+			autorepeat;</div><div class='add'>+			debounce_interval = &lt;50&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	evm_leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		led1 {</div><div class='add'>+			label = "omap5:red:led";</div><div class='add'>+			gpios = &lt;&amp;gpio9 17 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "mmc0";</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led2 {</div><div class='add'>+			label = "omap5:green:led";</div><div class='add'>+			gpios = &lt;&amp;gpio9 18 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "mmc1";</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led3 {</div><div class='add'>+			label = "omap5:blue:led";</div><div class='add'>+			gpios = &lt;&amp;gpio9 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "mmc2";</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led4 {</div><div class='add'>+			label = "omap5:green:led1";</div><div class='add'>+			gpios = &lt;&amp;gpio9 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led5 {</div><div class='add'>+			label = "omap5:green:led2";</div><div class='add'>+			gpios = &lt;&amp;gpio9 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-on";</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led6 {</div><div class='add'>+			label = "omap5:green:led3";</div><div class='add'>+			gpios = &lt;&amp;gpio9 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led7 {</div><div class='add'>+			label = "omap5:green:led4";</div><div class='add'>+			gpios = &lt;&amp;gpio9 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "default-on";</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		led8 {</div><div class='add'>+			label = "omap5:green:led5";</div><div class='add'>+			gpios = &lt;&amp;gpio9 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;hdmi {</div><div class='ctx'> 	vdda-supply = &lt;&amp;ldo4_reg&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	eeprom@50 {</div><div class='add'>+		compatible = "atmel,24c02";</div><div class='add'>+		reg = &lt;0x50&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;i2c5 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;i2c5_pins&gt;;</div><div class='hunk'>@@ -48,6 +138,12 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;omap5_pmx_core {</div><div class='add'>+	evm_keys_pins: pinmux_evm_keys_gpio_pins {</div><div class='add'>+		pinctrl-single,pins = &lt;</div><div class='add'>+			OMAP5_IOPAD(0x0b6, PIN_INPUT | MUX_MODE6)	/* gpio3_83 */</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	i2c5_pins: pinmux_i2c5_pins {</div><div class='ctx'> 		pinctrl-single,pins = &lt;</div><div class='ctx'> 			OMAP5_IOPAD(0x1c6, PIN_INPUT | MUX_MODE0)		/* i2c5_scl */</div><div class='hunk'>@@ -72,6 +168,23 @@</div><div class='ctx'> 	&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;usbhsehci {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	hub@2 {</div><div class='add'>+		compatible = "usb424,3503";</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ethernet: usbether@3 {</div><div class='add'>+		compatible = "usb424,9730";</div><div class='add'>+		reg = &lt;3&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;wlcore {</div><div class='ctx'> 	compatible = "ti,wl1837";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi<br/>index 25262118ec3d..222155ca8ad7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/omap5.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/omap5.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/omap5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/omap5.dtsi</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> 	compatible = "ti,omap5";</div><div class='ctx'> 	interrupt-parent = &lt;&amp;wakeupgen&gt;;</div><div class='add'>+	chosen { };</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		i2c0 = &amp;i2c1;</div><div class='hunk'>@@ -91,7 +92,7 @@</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0 0x48211000 0 0x1000&gt;,</div><div class='del'>-		      &lt;0 0x48212000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x48212000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0 0x48214000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0 0x48216000 0 0x2000&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='hunk'>@@ -171,6 +172,7 @@</div><div class='ctx'> 					reg = &lt;0x40 0x01b6&gt;;</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+					#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 					#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 					interrupt-controller;</div><div class='ctx'> 					pinctrl-single,register-width = &lt;16&gt;;</div><div class='hunk'>@@ -270,6 +272,7 @@</div><div class='ctx'> 				reg = &lt;0xc840 0x003c&gt;;</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='add'>+				#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 				interrupt-controller;</div><div class='ctx'> 				pinctrl-single,register-width = &lt;16&gt;;</div><div class='hunk'>@@ -985,6 +988,7 @@</div><div class='ctx'> 			phy-names = "sata-phy";</div><div class='ctx'> 			clocks = &lt;&amp;sata_ref_clk&gt;;</div><div class='ctx'> 			ti,hwmods = "sata";</div><div class='add'>+			ports-implemented = &lt;0x1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		dss: dss@58000000 {</div><div class='head'>diff --git a/arch/arm/boot/dts/orion5x-kuroboxpro.dts b/arch/arm/boot/dts/orion5x-kuroboxpro.dts<br/>index 1a672b098d0b..e28b568e741a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/orion5x-kuroboxpro.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/orion5x-kuroboxpro.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/orion5x-kuroboxpro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-kuroboxpro.dts</a></div><div class='hunk'>@@ -17,17 +17,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -36,11 +36,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/orion5x-linkstation-lschl.dts b/arch/arm/boot/dts/orion5x-linkstation-lschl.dts<br/>new file mode 100644<br/>index 000000000000..ee751995c8d0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/orion5x-linkstation-lschl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-linkstation-lschl.dts</a></div><div class='hunk'>@@ -0,0 +1,171 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree file for Buffalo Linkstation LS-CHLv3</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Ash Hughes &lt;ashley.hughes@blueyonder.co.uk&gt;</div><div class='add'>+ * Copyright (C) 2015-2017</div><div class='add'>+ * Roger Shimizu &lt;rogershimizu@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "orion5x-linkstation.dtsi"</div><div class='add'>+#include "mvebu-linkstation-gpio-simple.dtsi"</div><div class='add'>+#include "mvebu-linkstation-fan.dtsi"</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Buffalo Linkstation LiveV3 (LS-CHL)";</div><div class='add'>+	compatible = "buffalo,lschl", "marvell,orion5x-88f5182", "marvell,orion5x";</div><div class='add'>+</div><div class='add'>+	memory { /* 128 MB */</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x00000000 0x8000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio_keys {</div><div class='add'>+		func {</div><div class='add'>+			label = "Function Button";</div><div class='add'>+			linux,code = &lt;KEY_OPTION&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		power-on-switch {</div><div class='add'>+			gpios = &lt;&amp;gpio0 8 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		power-auto-switch {</div><div class='add'>+			gpios = &lt;&amp;gpio0 10 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio_leds {</div><div class='add'>+		pinctrl-0 = &lt;&amp;pmx_led_power &amp;pmx_led_alarm &amp;pmx_led_info &amp;pmx_led_func&gt;;</div><div class='add'>+		blue-power-led {</div><div class='add'>+			gpios = &lt;&amp;gpio0 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		red-alarm-led {</div><div class='add'>+			gpios = &lt;&amp;gpio0 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		amber-info-led {</div><div class='add'>+			gpios = &lt;&amp;gpio0 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		func {</div><div class='add'>+			label = "lschl:func:blue:top";</div><div class='add'>+			gpios = &lt;&amp;gpio0 17 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio_fan {</div><div class='add'>+		gpios = &lt;&amp;gpio0 14 GPIO_ACTIVE_LOW</div><div class='add'>+			 &amp;gpio0 16 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+</div><div class='add'>+		alarm-gpios = &lt;&amp;gpio0 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	pmx_led_power: pmx-leds {</div><div class='add'>+		marvell,pins = "mpp0";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmx_power_hdd: pmx-power-hdd {</div><div class='add'>+		marvell,pins = "mpp1";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmx_led_alarm: pmx-leds {</div><div class='add'>+		marvell,pins = "mpp2";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmx_led_info: pmx-leds {</div><div class='add'>+		marvell,pins = "mpp3";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmx_fan_lock: pmx-fan-lock {</div><div class='add'>+		marvell,pins = "mpp6";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmx_power_switch: pmx-power-switch {</div><div class='add'>+		marvell,pins = "mpp8", "mpp10", "mpp15";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmx_power_usb: pmx-power-usb {</div><div class='add'>+		marvell,pins = "mpp9";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmx_fan_high: pmx-fan-high {</div><div class='add'>+		marvell,pins = "mpp14";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmx_fan_low: pmx-fan-low {</div><div class='add'>+		marvell,pins = "mpp16";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmx_led_func: pmx-leds {</div><div class='add'>+		marvell,pins = "mpp17";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmx_sw_init: pmx-sw-init {</div><div class='add'>+		marvell,pins = "mpp7";</div><div class='add'>+		marvell,function = "gpio";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hdd_power {</div><div class='add'>+	gpios = &lt;&amp;gpio0 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_power {</div><div class='add'>+	gpios = &lt;&amp;gpio0 9 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts b/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts<br/>index 51dc734cd5b9..9f6fedd39170 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/orion5x-linkstation-lsgl.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-linkstation-lsgl.dts</a></div><div class='hunk'>@@ -18,17 +18,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -37,11 +37,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts b/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts<br/>index 0eead400f427..7f77ce8cc1fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/orion5x-linkstation.dtsi b/arch/arm/boot/dts/orion5x-linkstation.dtsi<br/>index ed456ab35fd8..e9991c83d7b7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/orion5x-linkstation.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/orion5x-linkstation.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/orion5x-linkstation.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-linkstation.dtsi</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/orion5x-lswsgl.dts b/arch/arm/boot/dts/orion5x-lswsgl.dts<br/>index 6b47a52ceb9c..ea966ec03dd0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/orion5x-lswsgl.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/orion5x-lswsgl.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/orion5x-lswsgl.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/orion5x-lswsgl.dts</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/ox810se.dtsi b/arch/arm/boot/dts/ox810se.dtsi<br/>index ce13705c38d4..46aa6db8353a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/ox810se.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/ox810se.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/ox810se.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ox810se.dtsi</a></div><div class='hunk'>@@ -7,6 +7,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /include/ "skeleton.dtsi"</div><div class='add'>+#include &lt;dt-bindings/clock/oxsemi,ox810se.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/oxsemi,ox810se.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "oxsemi,ox810se";</div><div class='hunk'>@@ -242,7 +244,7 @@</div><div class='ctx'> 			       current-speed = &lt;115200&gt;;</div><div class='ctx'> 			       no-loopback-test;</div><div class='ctx'> 			       status = "disabled";</div><div class='del'>-			       resets = &lt;&amp;reset 17&gt;;</div><div class='add'>+			       resets = &lt;&amp;reset RESET_UART1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart1: serial@300000 {</div><div class='hunk'>@@ -256,7 +258,7 @@</div><div class='ctx'> 			       current-speed = &lt;115200&gt;;</div><div class='ctx'> 			       no-loopback-test;</div><div class='ctx'> 			       status = "disabled";</div><div class='del'>-			       resets = &lt;&amp;reset 18&gt;;</div><div class='add'>+			       resets = &lt;&amp;reset RESET_UART2&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart2: serial@900000 {</div><div class='hunk'>@@ -270,7 +272,7 @@</div><div class='ctx'> 			       current-speed = &lt;115200&gt;;</div><div class='ctx'> 			       no-loopback-test;</div><div class='ctx'> 			       status = "disabled";</div><div class='del'>-			       resets = &lt;&amp;reset 22&gt;;</div><div class='add'>+			       resets = &lt;&amp;reset RESET_UART3&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart3: serial@a00000 {</div><div class='hunk'>@@ -284,7 +286,7 @@</div><div class='ctx'> 			       current-speed = &lt;115200&gt;;</div><div class='ctx'> 			       no-loopback-test;</div><div class='ctx'> 			       status = "disabled";</div><div class='del'>-			       resets = &lt;&amp;reset 23&gt;;</div><div class='add'>+			       resets = &lt;&amp;reset RESET_UART4&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/ox820.dtsi b/arch/arm/boot/dts/ox820.dtsi<br/>new file mode 100644<br/>index 000000000000..459207536a46<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/ox820.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ox820.dtsi</a></div><div class='hunk'>@@ -0,0 +1,298 @@</div><div class='add'>+/*</div><div class='add'>+ * ox820.dtsi - Device tree file for Oxford Semiconductor OX820 SoC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Neil Armstrong &lt;narmstrong@baylibre.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Licensed under GPLv2 or later</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/include/ "skeleton.dtsi"</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/oxsemi,ox820.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/oxsemi,ox820.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "oxsemi,ox820";</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		enable-method = "oxsemi,ox820-smp";</div><div class='add'>+</div><div class='add'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,arm11mpcore";</div><div class='add'>+			clocks = &lt;&amp;armclk&gt;;</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,arm11mpcore";</div><div class='add'>+			clocks = &lt;&amp;armclk&gt;;</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		/* Max 512MB @ 0x60000000 */</div><div class='add'>+		reg = &lt;0x60000000 0x20000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clocks {</div><div class='add'>+		osc: oscillator {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;25000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gmacclk: gmacclk {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;125000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysclk: sysclk {</div><div class='add'>+			compatible = "fixed-factor-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-div = &lt;4&gt;;</div><div class='add'>+			clock-mult = &lt;1&gt;;</div><div class='add'>+			clocks = &lt;&amp;osc&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		plla: plla {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;850000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		armclk: armclk {</div><div class='add'>+			compatible = "fixed-factor-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-div = &lt;2&gt;;</div><div class='add'>+			clock-mult = &lt;1&gt;;</div><div class='add'>+			clocks = &lt;&amp;plla&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		ranges;</div><div class='add'>+		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+</div><div class='add'>+		nandc: nand-controller@41000000 {</div><div class='add'>+			compatible = "oxsemi,ox820-nand";</div><div class='add'>+			reg = &lt;0x41000000 0x100000&gt;;</div><div class='add'>+			clocks = &lt;&amp;stdclk CLK_820_NAND&gt;;</div><div class='add'>+			resets = &lt;&amp;reset RESET_NAND&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etha: ethernet@40400000 {</div><div class='add'>+			compatible = "oxsemi,ox820-dwmac", "snps,dwmac";</div><div class='add'>+			reg = &lt;0x40400000 0x2000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "macirq", "eth_wake_irq";</div><div class='add'>+			mac-address = [000000000000]; /* Filled in by U-Boot */</div><div class='add'>+			phy-mode = "rgmii";</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;stdclk CLK_820_ETHA&gt;, &lt;&amp;gmacclk&gt;;</div><div class='add'>+			clock-names = "gmac", "stmmaceth";</div><div class='add'>+			resets = &lt;&amp;reset RESET_MAC&gt;;</div><div class='add'>+</div><div class='add'>+			/* Regmap for sys registers */</div><div class='add'>+			oxsemi,sys-ctrl = &lt;&amp;sys&gt;;</div><div class='add'>+</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		apb-bridge@44000000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			ranges = &lt;0 0x44000000 0x1000000&gt;;</div><div class='add'>+</div><div class='add'>+			pinctrl: pinctrl {</div><div class='add'>+				compatible = "oxsemi,ox820-pinctrl";</div><div class='add'>+</div><div class='add'>+				/* Regmap for sys registers */</div><div class='add'>+				oxsemi,sys-ctrl = &lt;&amp;sys&gt;;</div><div class='add'>+</div><div class='add'>+				pinctrl_uart0: uart0 {</div><div class='add'>+					uart0 {</div><div class='add'>+						pins = "gpio30", "gpio31";</div><div class='add'>+						function = "fct5";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pinctrl_uart0_modem: uart0_modem {</div><div class='add'>+					uart0_modem_a {</div><div class='add'>+						pins = "gpio24", "gpio24", "gpio26", "gpio27";</div><div class='add'>+						function = "fct4";</div><div class='add'>+					};</div><div class='add'>+					uart0_modem_b {</div><div class='add'>+						pins = "gpio28", "gpio29";</div><div class='add'>+						function = "fct5";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pinctrl_uart1: uart1 {</div><div class='add'>+					uart1 {</div><div class='add'>+						pins = "gpio7", "gpio8";</div><div class='add'>+						function = "fct4";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pinctrl_uart1_modem: uart1_modem {</div><div class='add'>+					uart1_modem {</div><div class='add'>+						pins = "gpio5", "gpio6", "gpio40", "gpio41", "gpio42", "gpio43";</div><div class='add'>+						function = "fct4";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pinctrl_etha_mdio: etha_mdio {</div><div class='add'>+					etha_mdio {</div><div class='add'>+						pins = "gpio3", "gpio4";</div><div class='add'>+						function = "fct1";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pinctrl_nand: nand {</div><div class='add'>+					nand {</div><div class='add'>+						pins = "gpio12", "gpio13", "gpio14", "gpio15",</div><div class='add'>+						     "gpio16", "gpio17", "gpio18", "gpio19",</div><div class='add'>+						     "gpio20", "gpio21", "gpio22", "gpio23",</div><div class='add'>+						     "gpio24";</div><div class='add'>+						function = "fct1";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpio0: gpio@000000 {</div><div class='add'>+				compatible = "oxsemi,ox820-gpio";</div><div class='add'>+				reg = &lt;0x000000 0x100000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				gpio-controller;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				ngpios = &lt;32&gt;;</div><div class='add'>+				oxsemi,gpio-bank = &lt;0&gt;;</div><div class='add'>+				gpio-ranges = &lt;&amp;pinctrl 0 0 32&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpio1: gpio@100000 {</div><div class='add'>+				compatible = "oxsemi,ox820-gpio";</div><div class='add'>+				reg = &lt;0x100000 0x100000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				gpio-controller;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				ngpios = &lt;18&gt;;</div><div class='add'>+				oxsemi,gpio-bank = &lt;1&gt;;</div><div class='add'>+				gpio-ranges = &lt;&amp;pinctrl 0 32 18&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart0: serial@200000 {</div><div class='add'>+			       compatible = "ns16550a";</div><div class='add'>+			       reg = &lt;0x200000 0x100000&gt;;</div><div class='add'>+			       interrupts = &lt;GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			       reg-shift = &lt;0&gt;;</div><div class='add'>+			       fifo-size = &lt;16&gt;;</div><div class='add'>+			       reg-io-width = &lt;1&gt;;</div><div class='add'>+			       current-speed = &lt;115200&gt;;</div><div class='add'>+			       no-loopback-test;</div><div class='add'>+			       status = "disabled";</div><div class='add'>+			       clocks = &lt;&amp;sysclk&gt;;</div><div class='add'>+			       resets = &lt;&amp;reset RESET_UART1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart1: serial@300000 {</div><div class='add'>+			       compatible = "ns16550a";</div><div class='add'>+			       reg = &lt;0x200000 0x100000&gt;;</div><div class='add'>+			       interrupts = &lt;GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			       reg-shift = &lt;0&gt;;</div><div class='add'>+			       fifo-size = &lt;16&gt;;</div><div class='add'>+			       reg-io-width = &lt;1&gt;;</div><div class='add'>+			       current-speed = &lt;115200&gt;;</div><div class='add'>+			       no-loopback-test;</div><div class='add'>+			       status = "disabled";</div><div class='add'>+			       clocks = &lt;&amp;sysclk&gt;;</div><div class='add'>+			       resets = &lt;&amp;reset RESET_UART2&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			rps@400000 {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='add'>+				compatible = "simple-bus";</div><div class='add'>+				ranges = &lt;0 0x400000 0x100000&gt;;</div><div class='add'>+</div><div class='add'>+				intc: interrupt-controller@0 {</div><div class='add'>+					compatible = "oxsemi,ox820-rps-irq", "oxsemi,ox810se-rps-irq";</div><div class='add'>+					interrupt-controller;</div><div class='add'>+					reg = &lt;0 0x200&gt;;</div><div class='add'>+					interrupts = &lt;GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+					#interrupt-cells = &lt;1&gt;;</div><div class='add'>+					valid-mask = &lt;0xFFFFFFFF&gt;;</div><div class='add'>+					clear-mask = &lt;0&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				timer0: timer@200 {</div><div class='add'>+					compatible = "oxsemi,ox820-rps-timer";</div><div class='add'>+					reg = &lt;0x200 0x40&gt;;</div><div class='add'>+					clocks = &lt;&amp;sysclk&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+					interrupts = &lt;4&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sys: sys-ctrl@e00000 {</div><div class='add'>+				compatible = "oxsemi,ox820-sys-ctrl", "syscon", "simple-mfd";</div><div class='add'>+				reg = &lt;0xe00000 0x200000&gt;;</div><div class='add'>+</div><div class='add'>+				reset: reset-controller {</div><div class='add'>+					compatible = "oxsemi,ox820-reset", "oxsemi,ox810se-reset";</div><div class='add'>+					#reset-cells = &lt;1&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				stdclk: stdclk {</div><div class='add'>+					compatible = "oxsemi,ox820-stdclk", "oxsemi,ox810se-stdclk";</div><div class='add'>+					#clock-cells = &lt;1&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		apb-bridge@47000000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			ranges = &lt;0 0x47000000 0x1000000&gt;;</div><div class='add'>+</div><div class='add'>+			scu: scu@0 {</div><div class='add'>+				compatible = "arm,arm11mp-scu";</div><div class='add'>+				reg = &lt;0x0 0x100&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			local-timer@600 {</div><div class='add'>+				compatible = "arm,arm11mp-twd-timer";</div><div class='add'>+				reg = &lt;0x600 0x20&gt;;</div><div class='add'>+				interrupts = &lt;GIC_PPI 13 (GIC_CPU_MASK_RAW(3)|IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+				clocks = &lt;&amp;armclk&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gic: gic@1000 {</div><div class='add'>+				compatible = "arm,arm11mp-gic";</div><div class='add'>+				interrupt-controller;</div><div class='add'>+				#interrupt-cells = &lt;3&gt;;</div><div class='add'>+				reg = &lt;0x1000 0x1000&gt;,</div><div class='add'>+				      &lt;0x100 0x500&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/pxa25x.dtsi b/arch/arm/boot/dts/pxa25x.dtsi<br/>new file mode 100644<br/>index 000000000000..f9f4726396a0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/pxa25x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/pxa25x.dtsi</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ * The code contained herein is licensed under the GNU General Public</div><div class='add'>+ * License. You may obtain a copy of the GNU General Public License</div><div class='add'>+ * Version 2 or later at the following locations:</div><div class='add'>+ *</div><div class='add'>+ * http://www.opensource.org/licenses/gpl-license.html</div><div class='add'>+ * http://www.gnu.org/copyleft/gpl.html</div><div class='add'>+ */</div><div class='add'>+#include "pxa2xx.dtsi"</div><div class='add'>+#include "dt-bindings/clock/pxa-clock.h"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Marvell PXA25x family SoC";</div><div class='add'>+	compatible = "marvell,pxa250";</div><div class='add'>+</div><div class='add'>+	clocks {</div><div class='add'>+	       /*</div><div class='add'>+		* The muxing of external clocks/internal dividers for osc* clock</div><div class='add'>+		* sources has been hidden under the carpet by now.</div><div class='add'>+		*/</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		clks: pxa2xx_clks@41300004 {</div><div class='add'>+			compatible = "marvell,pxa250-core-clocks";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/* timer oscillator */</div><div class='add'>+		clktimer: oscillator {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency  = &lt;3686400&gt;;</div><div class='add'>+			clock-output-names = "ostimer";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pxabus {</div><div class='add'>+		pdma: dma-controller@40000000 {</div><div class='add'>+			compatible = "marvell,pdma-1.0";</div><div class='add'>+			reg = &lt;0x40000000 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;25&gt;;</div><div class='add'>+			#dma-channels = &lt;16&gt;;</div><div class='add'>+			#dma-cells = &lt;2&gt;;</div><div class='add'>+			#dma-requests = &lt;40&gt;;</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pxairq: interrupt-controller@40d00000 {</div><div class='add'>+			marvell,intc-priority;</div><div class='add'>+			marvell,intc-nr-irqs = &lt;32&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinctrl: pinctrl@40e00000 {</div><div class='add'>+			reg = &lt;0x40e00054 0x20 0x40e0000c 0xc 0x40e0010c 4</div><div class='add'>+			       0x40f00020 0x10&gt;;</div><div class='add'>+			compatible = "marvell,pxa25x-pinctrl";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio: gpio@40e00000 {</div><div class='add'>+			compatible = "intel,pxa25x-gpio";</div><div class='add'>+			gpio-ranges = &lt;&amp;pinctrl 0 0 84&gt;;</div><div class='add'>+			clocks = &lt;&amp;clks CLK_NONE&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm0: pwm@40b00000 {</div><div class='add'>+			compatible = "marvell,pxa250-pwm";</div><div class='add'>+			reg = &lt;0x40b00000 0x10&gt;;</div><div class='add'>+			#pwm-cells = &lt;1&gt;;</div><div class='add'>+			clocks = &lt;&amp;clks CLK_PWM0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm1: pwm@40b00010 {</div><div class='add'>+			compatible = "marvell,pxa250-pwm";</div><div class='add'>+			reg = &lt;0x40b00010 0x10&gt;;</div><div class='add'>+			#pwm-cells = &lt;1&gt;;</div><div class='add'>+			clocks = &lt;&amp;clks CLK_PWM1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer@40a00000 {</div><div class='add'>+		compatible = "marvell,pxa-timer";</div><div class='add'>+		reg = &lt;0x40a00000 0x20&gt;;</div><div class='add'>+		interrupts = &lt;26&gt;;</div><div class='add'>+		clocks = &lt;&amp;clktimer&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pxa250_opp_table: opp_table0 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+</div><div class='add'>+		opp@99532800 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;99532800&gt;;</div><div class='add'>+			opp-microvolt = &lt;1000000 950000 1650000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@199065600 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;199065600&gt;;</div><div class='add'>+			opp-microvolt = &lt;1000000 950000 1650000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@298598400 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;298598400&gt;;</div><div class='add'>+			opp-microvolt = &lt;1100000 1045000 1650000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@398131200 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;398131200&gt;;</div><div class='add'>+			opp-microvolt = &lt;1300000 1235000 1650000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi<br/>index 9e73dc6b3ed3..e0fab48ba6fa 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/pxa27x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/pxa27x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/pxa27x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/pxa27x.dtsi</a></div><div class='hunk'>@@ -137,4 +137,44 @@</div><div class='ctx'> 		clocks = &lt;&amp;clks CLK_OSTIMER&gt;;</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	pxa270_opp_table: opp_table0 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+</div><div class='add'>+		opp@104000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;104000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;900000 900000 1705000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@156000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;156000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1000000 1000000 1705000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@208000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;208000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1180000 1180000 1705000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@312000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;312000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1250000 1250000 1705000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@416000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;416000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1350000 1350000 1705000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@520000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;520000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1450000 1450000 1705000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@624000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;624000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1550000 1550000 1705000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;20&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi<br/>index 3ff077ca4400..e4ebcde17837 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/pxa2xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/pxa2xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/pxa2xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/pxa2xx.dtsi</a></div><div class='hunk'>@@ -54,8 +54,8 @@</div><div class='ctx'> 			reg = &lt;0x40e00000 0x10000&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;0x2&gt;;</div><div class='del'>-			interrupts = &lt;10&gt;;</div><div class='del'>-			interrupt-names = "gpio_mux";</div><div class='add'>+			interrupts = &lt;8&gt;, &lt;9&gt;, &lt;10&gt;;</div><div class='add'>+			interrupt-names = "gpio0", "gpio1", "gpio_mux";</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;0x2&gt;;</div><div class='ctx'> 			ranges;</div><div class='head'>diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi<br/>index 9d6f3aacedb7..7a0cc4ea819a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/pxa3xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/pxa3xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/pxa3xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/pxa3xx.dtsi</a></div><div class='hunk'>@@ -138,6 +138,7 @@</div><div class='ctx'> 			reg = &lt;0x40e10000 0xffff&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 			pinctrl-single,register-width = &lt;32&gt;;</div><div class='ctx'> 			pinctrl-single,function-mask = &lt;0x7&gt;;</div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts<br/>index 6c0038398ef2..39d9e6ddefed 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-apq8060-dragonboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8060-dragonboard.dts</a></div><div class='hunk'>@@ -51,6 +51,29 @@</div><div class='ctx'> 			regulator-boot-on;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		/* GPIO controlled ethernet power regulator */</div><div class='add'>+		dragon_veth: xc622a331mrg {</div><div class='add'>+			compatible = "regulator-fixed";</div><div class='add'>+			regulator-name = "XC6222A331MR-G";</div><div class='add'>+			regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+			regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+			vin-supply = &lt;&amp;vph&gt;;</div><div class='add'>+			gpio = &lt;&amp;pm8058_gpio 40 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			enable-active-high;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;dragon_veth_gpios&gt;;</div><div class='add'>+			regulator-always-on;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/* VDDvario fixed regulator */</div><div class='add'>+		dragon_vario: nds332p {</div><div class='add'>+			compatible = "regulator-fixed";</div><div class='add'>+			regulator-name = "NDS332P";</div><div class='add'>+			regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+			regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+			vin-supply = &lt;&amp;pm8058_s3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		/* This is a levelshifter for SDCC5 */</div><div class='ctx'> 		dragon_vio_txb: txb0104rgyr {</div><div class='ctx'> 			compatible = "regulator-fixed";</div><div class='hunk'>@@ -167,6 +190,44 @@</div><div class='ctx'> 					bias-pull-up;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			dragon_ebi2_pins: ebi2 {</div><div class='add'>+				/*</div><div class='add'>+				 * Pins used by EBI2 on the Dragonboard, actually only</div><div class='add'>+				 * CS2 is used by a real peripheral. CS0 is just</div><div class='add'>+				 * routed to a test point.</div><div class='add'>+				 */</div><div class='add'>+				mux0 {</div><div class='add'>+					pins =</div><div class='add'>+					    /* "gpio39", CS1A_N this is not good to mux */</div><div class='add'>+					    "gpio40", /* CS2A_N */</div><div class='add'>+					    "gpio134"; /* CS0_N testpoint TP29 */</div><div class='add'>+					function = "ebi2cs";</div><div class='add'>+				};</div><div class='add'>+				mux1 {</div><div class='add'>+					pins =</div><div class='add'>+					    /* EBI2_ADDR_7 downto EBI2_ADDR_0 address bus */</div><div class='add'>+					    "gpio123", "gpio124", "gpio125", "gpio126",</div><div class='add'>+					    "gpio127", "gpio128", "gpio129", "gpio130",</div><div class='add'>+					    /* EBI2_DATA_15 downto EBI2_DATA_0 data bus */</div><div class='add'>+					    "gpio135", "gpio136", "gpio137", "gpio138",</div><div class='add'>+					    "gpio139", "gpio140", "gpio141", "gpio142",</div><div class='add'>+					    "gpio143", "gpio144", "gpio145", "gpio146",</div><div class='add'>+					    "gpio147", "gpio148", "gpio149", "gpio150",</div><div class='add'>+					    "gpio151", /* EBI2_OE_N */</div><div class='add'>+					    "gpio153", /* EBI2_ADV */</div><div class='add'>+					    "gpio157"; /* EBI2_WE_N */</div><div class='add'>+					function = "ebi2";</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* Interrupt line for the KXSD9 accelerometer */</div><div class='add'>+			dragon_kxsd9_gpios: kxsd9 {</div><div class='add'>+				irq {</div><div class='add'>+					pins = "gpio57"; /* IRQ line */</div><div class='add'>+					bias-pull-up;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		qcom,ssbi@500000 {</div><div class='hunk'>@@ -201,6 +262,15 @@</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				gpio@150 {</div><div class='add'>+					dragon_ethernet_gpios: ethernet-gpios {</div><div class='add'>+						pinconf {</div><div class='add'>+							pins = "gpio7";</div><div class='add'>+							function = "normal";</div><div class='add'>+							input-enable;</div><div class='add'>+							bias-disable;</div><div class='add'>+							power-source = &lt;PM8058_GPIO_S3&gt;;</div><div class='add'>+						};</div><div class='add'>+					};</div><div class='ctx'> 					dragon_bmp085_gpios: bmp085-gpios {</div><div class='ctx'> 						pinconf {</div><div class='ctx'> 							pins = "gpio16";</div><div class='hunk'>@@ -210,6 +280,15 @@</div><div class='ctx'> 							power-source = &lt;PM8058_GPIO_S3&gt;;</div><div class='ctx'> 						};</div><div class='ctx'> 					};</div><div class='add'>+					dragon_mpu3050_gpios: mpu3050-gpios {</div><div class='add'>+						pinconf {</div><div class='add'>+							pins = "gpio17";</div><div class='add'>+							function = "normal";</div><div class='add'>+							input-enable;</div><div class='add'>+							bias-disable;</div><div class='add'>+							power-source = &lt;PM8058_GPIO_S3&gt;;</div><div class='add'>+						};</div><div class='add'>+					};</div><div class='ctx'> 					dragon_sdcc3_gpios: sdcc3-gpios {</div><div class='ctx'> 						pinconf {</div><div class='ctx'> 							pins = "gpio22";</div><div class='hunk'>@@ -238,6 +317,14 @@</div><div class='ctx'> 							power-source = &lt;PM8058_GPIO_S3&gt;;</div><div class='ctx'> 						};</div><div class='ctx'> 					};</div><div class='add'>+					dragon_veth_gpios: veth-gpios {</div><div class='add'>+						pinconf {</div><div class='add'>+							pins = "gpio40";</div><div class='add'>+							function = "normal";</div><div class='add'>+							bias-disable;</div><div class='add'>+							drive-push-pull;</div><div class='add'>+						};</div><div class='add'>+					};</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				led@48 {</div><div class='hunk'>@@ -299,8 +386,8 @@</div><div class='ctx'> 				ak8975@0c {</div><div class='ctx'> 					compatible = "asahi-kasei,ak8975";</div><div class='ctx'> 					reg = &lt;0x0c&gt;;</div><div class='del'>-					/* GPIO33 has interrupt 224 on the PM8058 */</div><div class='del'>-					interrupt-parent = &lt;&amp;pm8058_gpio&gt;;</div><div class='add'>+					/* FIXME: GPIO33 has interrupt 224 on the PM8058 */</div><div class='add'>+					interrupt-parent = &lt;&amp;pm8058&gt;;</div><div class='ctx'> 					interrupts = &lt;224 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> 					pinctrl-names = "default";</div><div class='ctx'> 					pinctrl-0 = &lt;&amp;dragon_ak8975_gpios&gt;;</div><div class='hunk'>@@ -310,8 +397,8 @@</div><div class='ctx'> 				bmp085@77 {</div><div class='ctx'> 					compatible = "bosch,bmp085";</div><div class='ctx'> 					reg = &lt;0x77&gt;;</div><div class='del'>-					/* GPIO16 has interrupt 207 on the PM8058 */</div><div class='del'>-					interrupt-parent = &lt;&amp;pm8058_gpio&gt;;</div><div class='add'>+					/* FIXME: GPIO16 has interrupt 207 on the PM8058 */</div><div class='add'>+					interrupt-parent = &lt;&amp;pm8058&gt;;</div><div class='ctx'> 					interrupts = &lt;207 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> 					reset-gpios = &lt;&amp;tlmm 86 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 					pinctrl-names = "default";</div><div class='hunk'>@@ -319,6 +406,90 @@</div><div class='ctx'> 					vddd-supply = &lt;&amp;pm8058_lvs0&gt;; // 1.8V</div><div class='ctx'> 					vdda-supply = &lt;&amp;pm8058_l14&gt;; // 2.85V</div><div class='ctx'> 				};</div><div class='add'>+				mpu3050@68 {</div><div class='add'>+					compatible = "invensense,mpu3050";</div><div class='add'>+					reg = &lt;0x68&gt;;</div><div class='add'>+					/*</div><div class='add'>+					 * GPIO17 has interrupt 208 on the</div><div class='add'>+					 * PM8058, it is pulled high by a 10k</div><div class='add'>+					 * resistor to VLOGIC so needs to be</div><div class='add'>+					 * active low/falling edge.</div><div class='add'>+					 */</div><div class='add'>+					interrupts-extended = &lt;&amp;pm8058 208 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+					pinctrl-names = "default";</div><div class='add'>+					pinctrl-0 = &lt;&amp;dragon_mpu3050_gpios&gt;;</div><div class='add'>+					vlogic-supply = &lt;&amp;pm8058_lvs0&gt;; // 1.8V</div><div class='add'>+					vdd-supply = &lt;&amp;pm8058_l14&gt;; // 2.85V</div><div class='add'>+</div><div class='add'>+					/*</div><div class='add'>+					 * The MPU-3050 acts as a hub for the</div><div class='add'>+					 * accelerometer.</div><div class='add'>+					 */</div><div class='add'>+					i2c-gate {</div><div class='add'>+						#address-cells = &lt;1&gt;;</div><div class='add'>+						#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+						kxsd9@18 {</div><div class='add'>+							compatible = "kionix,kxsd9";</div><div class='add'>+							reg = &lt;0x18&gt;;</div><div class='add'>+							interrupt-parent = &lt;&amp;tlmm&gt;;</div><div class='add'>+							interrupts = &lt;57 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+							pinctrl-names = "default";</div><div class='add'>+							pinctrl-0 = &lt;&amp;dragon_kxsd9_gpios&gt;;</div><div class='add'>+							iovdd-supply = &lt;&amp;pm8058_lvs0&gt;; // 1.8V</div><div class='add'>+							vdd-supply = &lt;&amp;pm8058_l14&gt;; // 2.85V</div><div class='add'>+						};</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		external-bus@1a100000 {</div><div class='add'>+			/* The EBI2 will instantiate first, then populate its children */</div><div class='add'>+			status = "ok";</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;dragon_ebi2_pins&gt;;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * An on-board SMSC LAN9221 chip for "debug ethernet",</div><div class='add'>+			 * which is actually just an ordinary ethernet on the</div><div class='add'>+			 * EBI2. This has a 25MHz chrystal next to it, so no</div><div class='add'>+			 * clocking is needed.</div><div class='add'>+			 */</div><div class='add'>+			ethernet-ebi2@2,0 {</div><div class='add'>+				compatible = "smsc,lan9221", "smsc,lan9115";</div><div class='add'>+				reg = &lt;2 0x0 0x100&gt;;</div><div class='add'>+				/*</div><div class='add'>+				 * GPIO7 has interrupt 198 on the PM8058</div><div class='add'>+				 * The second interrupt is the PME interrupt</div><div class='add'>+				 * for network wakeup, connected to the TLMM.</div><div class='add'>+				 */</div><div class='add'>+				interrupts-extended = &lt;&amp;pm8058 198 IRQ_TYPE_EDGE_FALLING&gt;,</div><div class='add'>+						    &lt;&amp;tlmm 29 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				reset-gpios = &lt;&amp;tlmm 30 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+				vdd33a-supply = &lt;&amp;dragon_veth&gt;;</div><div class='add'>+				vddvario-supply = &lt;&amp;dragon_vario&gt;;</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+				pinctrl-0 = &lt;&amp;dragon_ethernet_gpios&gt;;</div><div class='add'>+				phy-mode = "mii";</div><div class='add'>+				reg-io-width = &lt;2&gt;;</div><div class='add'>+				smsc,force-external-phy;</div><div class='add'>+				/* IRQ on edge falling = active low */</div><div class='add'>+				smsc,irq-active-low;</div><div class='add'>+				smsc,irq-push-pull;</div><div class='add'>+</div><div class='add'>+				/*</div><div class='add'>+				 * SLOW chipselect config</div><div class='add'>+				 * Delay 9 cycles (140ns@64MHz) between SMSC</div><div class='add'>+				 * LAN9221 Ethernet controller reads and writes</div><div class='add'>+				 * on CS2.</div><div class='add'>+				 */</div><div class='add'>+				qcom,xmem-recovery-cycles = &lt;0&gt;;</div><div class='add'>+				qcom,xmem-write-hold-cycles = &lt;3&gt;;</div><div class='add'>+				qcom,xmem-write-delta-cycles = &lt;31&gt;;</div><div class='add'>+				qcom,xmem-read-delta-cycles = &lt;28&gt;;</div><div class='add'>+				qcom,xmem-write-wait-cycles = &lt;9&gt;;</div><div class='add'>+				qcom,xmem-read-wait-cycles = &lt;9&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts b/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts<br/>index 39ae2bc8cb08..8f5de029bca9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts</a></div><div class='hunk'>@@ -39,6 +39,17 @@</div><div class='ctx'> </div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	hdmi-out {</div><div class='add'>+		compatible = "hdmi-connector";</div><div class='add'>+		type = "a";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			hdmi_con: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;hdmi_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	soc {</div><div class='ctx'> 		rpm@108000 {</div><div class='ctx'> 			regulators {</div><div class='hunk'>@@ -74,6 +85,14 @@</div><div class='ctx'> 					bias-pull-down;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='add'>+				s2 {</div><div class='add'>+					regulator-min-microvolt = &lt;1300000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1300000&gt;;</div><div class='add'>+					qcom,switch-mode-frequency = &lt;1600000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+					regulator-always-on;</div><div class='add'>+				};</div><div class='add'>+</div><div class='ctx'> 				s3 {</div><div class='ctx'> 					regulator-min-microvolt = &lt;1000000&gt;;</div><div class='ctx'> 					regulator-max-microvolt = &lt;1400000&gt;;</div><div class='hunk'>@@ -121,6 +140,16 @@</div><div class='ctx'> 					bias-pull-down;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='add'>+				/**</div><div class='add'>+				 * 1.8v required on LS expansion</div><div class='add'>+				 * for mezzanine boards</div><div class='add'>+				 */</div><div class='add'>+				l15 {</div><div class='add'>+					regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+					regulator-always-on;</div><div class='add'>+				};</div><div class='add'>+</div><div class='ctx'> 				l23 {</div><div class='ctx'> 					regulator-min-microvolt = &lt;1700000&gt;;</div><div class='ctx'> 					regulator-max-microvolt = &lt;1900000&gt;;</div><div class='hunk'>@@ -347,5 +376,45 @@</div><div class='ctx'> 				cd-gpios	= &lt;&amp;tlmm_pinmux 26 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		riva-pil@3204000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;riva_wlan_pin_a&gt;, &lt;&amp;riva_bt_pin_a&gt;, &lt;&amp;riva_fm_pin_a&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hdmi-tx@4a00000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+			core-vdda-supply = &lt;&amp;pm8921_hdmi_switch&gt;;</div><div class='add'>+			hdmi-mux-supply = &lt;&amp;vcc3v3&gt;;</div><div class='add'>+</div><div class='add'>+			hpd-gpio = &lt;&amp;tlmm_pinmux 72 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				port@1 {</div><div class='add'>+					endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;hdmi_con&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hdmi-phy@4a00400 {</div><div class='add'>+			status = "okay";</div><div class='add'>+			core-vdda-supply = &lt;&amp;pm8921_hdmi_switch&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mdp@5100000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				port@3 {</div><div class='add'>+					endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;hdmi_in&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts<br/>index b72e09506448..e39440a86739 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts</a></div><div class='hunk'>@@ -15,6 +15,20 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		ramoops@88d00000{</div><div class='add'>+			compatible = "ramoops";</div><div class='add'>+			reg = &lt;0x88d00000 0x100000&gt;;</div><div class='add'>+			record-size     = &lt;0x00020000&gt;;</div><div class='add'>+			console-size    = &lt;0x00020000&gt;;</div><div class='add'>+			ftrace-size     = &lt;0x00020000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	ext_3p3v: regulator-fixed@1 {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='hunk'>@@ -99,6 +113,7 @@</div><div class='ctx'> 				l2 {</div><div class='ctx'> 					regulator-min-microvolt = &lt;1200000&gt;;</div><div class='ctx'> 					regulator-max-microvolt = &lt;1200000&gt;;</div><div class='add'>+					regulator-always-on;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				/* msm_otg-HSUSB_3p3 */</div><div class='hunk'>@@ -133,13 +148,14 @@</div><div class='ctx'> 					regulator-min-microvolt = &lt;3000000&gt;;</div><div class='ctx'> 					regulator-max-microvolt = &lt;3000000&gt;;</div><div class='ctx'> 					bias-pull-down;</div><div class='add'>+					regulator-always-on;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				/* pwm_power for backlight */</div><div class='ctx'> 				l17 {</div><div class='ctx'> 					regulator-min-microvolt = &lt;3000000&gt;;</div><div class='del'>-					regulator-max-microvolt = &lt;3600000&gt;;</div><div class='del'>-					bias-pull-down;</div><div class='add'>+					regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+					regulator-always-on;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				/* camera, qdsp6 */</div><div class='hunk'>@@ -184,6 +200,63 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		mdp@5100000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+			ports {</div><div class='add'>+				port@1 {</div><div class='add'>+					mdp_dsi1_out: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;dsi0_in&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dsi0: mdss_dsi@4700000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+			vdda-supply = &lt;&amp;pm8921_l2&gt;;/*VDD_MIPI1 to 4*/</div><div class='add'>+			vdd-supply = &lt;&amp;pm8921_l8&gt;;</div><div class='add'>+			vddio-supply = &lt;&amp;pm8921_lvs7&gt;;</div><div class='add'>+			avdd-supply = &lt;&amp;pm8921_l11&gt;;</div><div class='add'>+			vcss-supply = &lt;&amp;ext_3p3v&gt;;</div><div class='add'>+</div><div class='add'>+			panel@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				compatible = "jdi,lt070me05000";</div><div class='add'>+</div><div class='add'>+				vddp-supply = &lt;&amp;pm8921_l17&gt;;</div><div class='add'>+				iovcc-supply = &lt;&amp;pm8921_lvs7&gt;;</div><div class='add'>+</div><div class='add'>+				enable-gpios = &lt;&amp;pm8921_gpio 36 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+				reset-gpios = &lt;&amp;tlmm_pinmux 54 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+				dcdc-en-gpios = &lt;&amp;pm8921_gpio 23 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+				port {</div><div class='add'>+					panel_in: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;dsi0_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+			ports {</div><div class='add'>+				port@0 {</div><div class='add'>+					dsi0_in: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;mdp_dsi1_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@1 {</div><div class='add'>+					dsi0_out: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;panel_in&gt;;</div><div class='add'>+						data-lanes = &lt;0 1 2 3&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dsi-phy@4700200 {</div><div class='add'>+			status = "okay";</div><div class='add'>+			vddio-supply = &lt;&amp;pm8921_lvs7&gt;;/*VDD_PLL2_1 to 7*/</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		gsbi@16200000 {</div><div class='ctx'> 			status = "okay";</div><div class='ctx'> 			qcom,mode = &lt;GSBI_PROT_I2C&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts<br/>index 2eeb0904eaa7..881ce707311a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-apq8064-ifc6410.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064-ifc6410.dts</a></div><div class='hunk'>@@ -43,6 +43,17 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	hdmi-out {</div><div class='add'>+		compatible = "hdmi-connector";</div><div class='add'>+		type = "d";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			hdmi_con: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;hdmi_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	soc {</div><div class='ctx'> 		pinctrl@800000 {</div><div class='ctx'> 			card_detect: card_detect {</div><div class='hunk'>@@ -329,5 +340,46 @@</div><div class='ctx'> 				mmc-pwrseq = &lt;&amp;sdcc4_pwrseq&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		hdmi-tx@4a00000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+</div><div class='add'>+			core-vdda-supply = &lt;&amp;pm8921_hdmi_switch&gt;;</div><div class='add'>+			hdmi-mux-supply = &lt;&amp;ext_3p3v&gt;;</div><div class='add'>+</div><div class='add'>+			hpd-gpios = &lt;&amp;tlmm_pinmux 72 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				port@0 {</div><div class='add'>+					endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;mdp_dtv_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@1 {</div><div class='add'>+					endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;hdmi_con&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hdmi-phy@4a00400 {</div><div class='add'>+			status = "okay";</div><div class='add'>+</div><div class='add'>+			core-vdda-supply = &lt;&amp;pm8921_hdmi_switch&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mdp@5100000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				port@3 {</div><div class='add'>+					endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;hdmi_in&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi<br/>index 6b801e7e57a2..173ab7c299ce 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064-pins.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-apq8064-pins.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064-pins.dtsi</a></div><div class='hunk'>@@ -284,4 +284,41 @@</div><div class='ctx'> 			bias-disable = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	riva_fm_pin_a: riva-fm-active {</div><div class='add'>+		pins = "gpio14", "gpio15";</div><div class='add'>+		function = "riva_fm";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	riva_bt_pin_a: riva-bt-active {</div><div class='add'>+		pins = "gpio16", "gpio17";</div><div class='add'>+		function = "riva_bt";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	riva_wlan_pin_a: riva-wlan-active {</div><div class='add'>+		pins = "gpio64", "gpio65", "gpio66", "gpio67", "gpio68";</div><div class='add'>+		function = "riva_wlan";</div><div class='add'>+</div><div class='add'>+		drive-strength = &lt;6&gt;;</div><div class='add'>+		bias-pull-down;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hdmi_pinctrl: hdmi-pinctrl {</div><div class='add'>+		mux {</div><div class='add'>+			pins = "gpio70", "gpio71", "gpio72";</div><div class='add'>+			function = "hdmi";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinconf_ddc {</div><div class='add'>+			pins = "gpio70", "gpio71";</div><div class='add'>+			bias-pull-up;</div><div class='add'>+			drive-strength = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinconf_hpd {</div><div class='add'>+			pins = "gpio72";</div><div class='add'>+			bias-pull-down;</div><div class='add'>+			drive-strength = &lt;16&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts<br/>index ebd675ca94b4..a34ba3555454 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts</a></div><div class='hunk'>@@ -390,5 +390,12 @@</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;sdcc3_pins&gt;, &lt;&amp;sdcc3_cd_pin_a&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		riva-pil@3204000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;riva_wlan_pin_a&gt;, &lt;&amp;riva_bt_pin_a&gt;, &lt;&amp;riva_fm_pin_a&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi<br/>index 1dbe697b2e90..14a6f5ed02de 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-apq8064.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8064.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8064.dtsi</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #include &lt;dt-bindings/clock/qcom,gcc-msm8960.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/reset/qcom,gcc-msm8960.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/clock/qcom,mmcc-msm8960.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/qcom,rpmcc.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/soc/qcom,gsbi.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='hunk'>@@ -21,13 +22,18 @@</div><div class='ctx'> 			reg = &lt;0x80000000 0x200000&gt;;</div><div class='ctx'> 			no-map;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		wcnss_mem: wcnss@8f000000 {</div><div class='add'>+			reg = &lt;0x8f000000 0x700000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		cpu@0 {</div><div class='add'>+		CPU0: cpu@0 {</div><div class='ctx'> 			compatible = "qcom,krait";</div><div class='ctx'> 			enable-method = "qcom,kpss-acc-v1";</div><div class='ctx'> 			device_type = "cpu";</div><div class='hunk'>@@ -38,7 +44,7 @@</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SPC&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@1 {</div><div class='add'>+		CPU1: cpu@1 {</div><div class='ctx'> 			compatible = "qcom,krait";</div><div class='ctx'> 			enable-method = "qcom,kpss-acc-v1";</div><div class='ctx'> 			device_type = "cpu";</div><div class='hunk'>@@ -49,7 +55,7 @@</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SPC&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@2 {</div><div class='add'>+		CPU2: cpu@2 {</div><div class='ctx'> 			compatible = "qcom,krait";</div><div class='ctx'> 			enable-method = "qcom,kpss-acc-v1";</div><div class='ctx'> 			device_type = "cpu";</div><div class='hunk'>@@ -60,7 +66,7 @@</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SPC&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@3 {</div><div class='add'>+		CPU3: cpu@3 {</div><div class='ctx'> 			compatible = "qcom,krait";</div><div class='ctx'> 			enable-method = "qcom,kpss-acc-v1";</div><div class='ctx'> 			device_type = "cpu";</div><div class='hunk'>@@ -179,7 +185,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	clocks {</div><div class='del'>-		cxo_board {</div><div class='add'>+		cxo_board: cxo_board {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			clock-frequency = &lt;19200000&gt;;</div><div class='hunk'>@@ -303,6 +309,9 @@</div><div class='ctx'> 	firmware {</div><div class='ctx'> 		scm {</div><div class='ctx'> 			compatible = "qcom,scm-apq8064";</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_DAYTONA_FABRIC_CLK&gt;;</div><div class='add'>+			clock-names = "core";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -627,6 +636,33 @@</div><div class='ctx'> 			clock-names = "core";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		ssbi@c00000 {</div><div class='add'>+			compatible = "qcom,ssbi";</div><div class='add'>+			reg = &lt;0x00c00000 0x1000&gt;;</div><div class='add'>+			qcom,controller-type = "pmic-arbiter";</div><div class='add'>+</div><div class='add'>+			pm8821: pmic@1 {</div><div class='add'>+				compatible = "qcom,pm8821";</div><div class='add'>+				interrupt-parent = &lt;&amp;tlmm_pinmux&gt;;</div><div class='add'>+				interrupts = &lt;76 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				pm8821_mpps: mpps@50 {</div><div class='add'>+					compatible = "qcom,pm8821-mpp", "qcom,ssbi-mpp";</div><div class='add'>+					reg = &lt;0x50&gt;;</div><div class='add'>+					interrupts = &lt;24 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;25 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;26 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;27 IRQ_TYPE_NONE&gt;;</div><div class='add'>+					gpio-controller;</div><div class='add'>+					#gpio-cells = &lt;2&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		qcom,ssbi@500000 {</div><div class='ctx'> 			compatible = "qcom,ssbi";</div><div class='ctx'> 			reg = &lt;0x00500000 0x1000&gt;;</div><div class='hunk'>@@ -1060,6 +1096,231 @@</div><div class='ctx'> 			reg = &lt;0x1a400000 0x100&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		gpu: adreno-3xx@4300000 {</div><div class='add'>+			compatible = "qcom,adreno-3xx";</div><div class='add'>+			reg = &lt;0x04300000 0x20000&gt;;</div><div class='add'>+			reg-names = "kgsl_3d0_reg_memory";</div><div class='add'>+			interrupts = &lt;GIC_SPI 80 0&gt;;</div><div class='add'>+			interrupt-names = "kgsl_3d0_irq";</div><div class='add'>+			clock-names =</div><div class='add'>+			    "core_clk",</div><div class='add'>+			    "iface_clk",</div><div class='add'>+			    "mem_clk",</div><div class='add'>+			    "mem_iface_clk";</div><div class='add'>+			clocks =</div><div class='add'>+			    &lt;&amp;mmcc GFX3D_CLK&gt;,</div><div class='add'>+			    &lt;&amp;mmcc GFX3D_AHB_CLK&gt;,</div><div class='add'>+			    &lt;&amp;mmcc GFX3D_AXI_CLK&gt;,</div><div class='add'>+			    &lt;&amp;mmcc MMSS_IMEM_AHB_CLK&gt;;</div><div class='add'>+			qcom,chipid = &lt;0x03020002&gt;;</div><div class='add'>+</div><div class='add'>+			iommus = &lt;&amp;gfx3d 0</div><div class='add'>+				  &amp;gfx3d 1</div><div class='add'>+				  &amp;gfx3d 2</div><div class='add'>+				  &amp;gfx3d 3</div><div class='add'>+				  &amp;gfx3d 4</div><div class='add'>+				  &amp;gfx3d 5</div><div class='add'>+				  &amp;gfx3d 6</div><div class='add'>+				  &amp;gfx3d 7</div><div class='add'>+				  &amp;gfx3d 8</div><div class='add'>+				  &amp;gfx3d 9</div><div class='add'>+				  &amp;gfx3d 10</div><div class='add'>+				  &amp;gfx3d 11</div><div class='add'>+				  &amp;gfx3d 12</div><div class='add'>+				  &amp;gfx3d 13</div><div class='add'>+				  &amp;gfx3d 14</div><div class='add'>+				  &amp;gfx3d 15</div><div class='add'>+				  &amp;gfx3d 16</div><div class='add'>+				  &amp;gfx3d 17</div><div class='add'>+				  &amp;gfx3d 18</div><div class='add'>+				  &amp;gfx3d 19</div><div class='add'>+				  &amp;gfx3d 20</div><div class='add'>+				  &amp;gfx3d 21</div><div class='add'>+				  &amp;gfx3d 22</div><div class='add'>+				  &amp;gfx3d 23</div><div class='add'>+				  &amp;gfx3d 24</div><div class='add'>+				  &amp;gfx3d 25</div><div class='add'>+				  &amp;gfx3d 26</div><div class='add'>+				  &amp;gfx3d 27</div><div class='add'>+				  &amp;gfx3d 28</div><div class='add'>+				  &amp;gfx3d 29</div><div class='add'>+				  &amp;gfx3d 30</div><div class='add'>+				  &amp;gfx3d 31</div><div class='add'>+				  &amp;gfx3d1 0</div><div class='add'>+				  &amp;gfx3d1 1</div><div class='add'>+				  &amp;gfx3d1 2</div><div class='add'>+				  &amp;gfx3d1 3</div><div class='add'>+				  &amp;gfx3d1 4</div><div class='add'>+				  &amp;gfx3d1 5</div><div class='add'>+				  &amp;gfx3d1 6</div><div class='add'>+				  &amp;gfx3d1 7</div><div class='add'>+				  &amp;gfx3d1 8</div><div class='add'>+				  &amp;gfx3d1 9</div><div class='add'>+				  &amp;gfx3d1 10</div><div class='add'>+				  &amp;gfx3d1 11</div><div class='add'>+				  &amp;gfx3d1 12</div><div class='add'>+				  &amp;gfx3d1 13</div><div class='add'>+				  &amp;gfx3d1 14</div><div class='add'>+				  &amp;gfx3d1 15</div><div class='add'>+				  &amp;gfx3d1 16</div><div class='add'>+				  &amp;gfx3d1 17</div><div class='add'>+				  &amp;gfx3d1 18</div><div class='add'>+				  &amp;gfx3d1 19</div><div class='add'>+				  &amp;gfx3d1 20</div><div class='add'>+				  &amp;gfx3d1 21</div><div class='add'>+				  &amp;gfx3d1 22</div><div class='add'>+				  &amp;gfx3d1 23</div><div class='add'>+				  &amp;gfx3d1 24</div><div class='add'>+				  &amp;gfx3d1 25</div><div class='add'>+				  &amp;gfx3d1 26</div><div class='add'>+				  &amp;gfx3d1 27</div><div class='add'>+				  &amp;gfx3d1 28</div><div class='add'>+				  &amp;gfx3d1 29</div><div class='add'>+				  &amp;gfx3d1 30</div><div class='add'>+				  &amp;gfx3d1 31&gt;;</div><div class='add'>+</div><div class='add'>+			qcom,gpu-pwrlevels {</div><div class='add'>+				compatible = "qcom,gpu-pwrlevels";</div><div class='add'>+				qcom,gpu-pwrlevel@0 {</div><div class='add'>+					qcom,gpu-freq = &lt;450000000&gt;;</div><div class='add'>+				};</div><div class='add'>+				qcom,gpu-pwrlevel@1 {</div><div class='add'>+					qcom,gpu-freq = &lt;27000000&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mmss_sfpb: syscon@5700000 {</div><div class='add'>+			compatible = "syscon";</div><div class='add'>+			reg = &lt;0x5700000 0x70&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dsi0: mdss_dsi@4700000 {</div><div class='add'>+			compatible = "qcom,mdss-dsi-ctrl";</div><div class='add'>+			label = "MDSS DSI CTRL-&gt;0";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 82 0&gt;;</div><div class='add'>+			reg = &lt;0x04700000 0x200&gt;;</div><div class='add'>+			reg-names = "dsi_ctrl";</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;mmcc DSI_M_AHB_CLK&gt;,</div><div class='add'>+				&lt;&amp;mmcc DSI_S_AHB_CLK&gt;,</div><div class='add'>+				&lt;&amp;mmcc AMP_AHB_CLK&gt;,</div><div class='add'>+				&lt;&amp;mmcc DSI_CLK&gt;,</div><div class='add'>+				&lt;&amp;mmcc DSI1_BYTE_CLK&gt;,</div><div class='add'>+				&lt;&amp;mmcc DSI_PIXEL_CLK&gt;,</div><div class='add'>+				&lt;&amp;mmcc DSI1_ESC_CLK&gt;;</div><div class='add'>+			clock-names = "iface_clk", "bus_clk", "core_mmss_clk",</div><div class='add'>+					"src_clk", "byte_clk", "pixel_clk",</div><div class='add'>+					"core_clk";</div><div class='add'>+</div><div class='add'>+			assigned-clocks = &lt;&amp;mmcc DSI1_BYTE_SRC&gt;,</div><div class='add'>+					&lt;&amp;mmcc DSI1_ESC_SRC&gt;,</div><div class='add'>+					&lt;&amp;mmcc DSI_SRC&gt;,</div><div class='add'>+					&lt;&amp;mmcc DSI_PIXEL_SRC&gt;;</div><div class='add'>+			assigned-clock-parents = &lt;&amp;dsi0_phy 0&gt;,</div><div class='add'>+						&lt;&amp;dsi0_phy 0&gt;,</div><div class='add'>+						&lt;&amp;dsi0_phy 1&gt;,</div><div class='add'>+						&lt;&amp;dsi0_phy 1&gt;;</div><div class='add'>+			syscon-sfpb = &lt;&amp;mmss_sfpb&gt;;</div><div class='add'>+			phys = &lt;&amp;dsi0_phy&gt;;</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					dsi0_in: endpoint {</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@1 {</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+					dsi0_out: endpoint {</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		dsi0_phy: dsi-phy@4700200 {</div><div class='add'>+			compatible = "qcom,dsi-phy-28nm-8960";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			reg = &lt;0x04700200 0x100&gt;,</div><div class='add'>+				&lt;0x04700300 0x200&gt;,</div><div class='add'>+				&lt;0x04700500 0x5c&gt;;</div><div class='add'>+			reg-names = "dsi_pll", "dsi_phy", "dsi_phy_regulator";</div><div class='add'>+			clock-names = "iface_clk";</div><div class='add'>+			clocks = &lt;&amp;mmcc DSI_M_AHB_CLK&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		mdp_port0: iommu@7500000 {</div><div class='add'>+			compatible = "qcom,apq8064-iommu";</div><div class='add'>+			#iommu-cells = &lt;1&gt;;</div><div class='add'>+			clock-names =</div><div class='add'>+			    "smmu_pclk",</div><div class='add'>+			    "iommu_clk";</div><div class='add'>+			clocks =</div><div class='add'>+			    &lt;&amp;mmcc SMMU_AHB_CLK&gt;,</div><div class='add'>+			    &lt;&amp;mmcc MDP_AXI_CLK&gt;;</div><div class='add'>+			reg = &lt;0x07500000 0x100000&gt;;</div><div class='add'>+			interrupts =</div><div class='add'>+			    &lt;GIC_SPI 63 0&gt;,</div><div class='add'>+			    &lt;GIC_SPI 64 0&gt;;</div><div class='add'>+			qcom,ncb = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mdp_port1: iommu@7600000 {</div><div class='add'>+			compatible = "qcom,apq8064-iommu";</div><div class='add'>+			#iommu-cells = &lt;1&gt;;</div><div class='add'>+			clock-names =</div><div class='add'>+			    "smmu_pclk",</div><div class='add'>+			    "iommu_clk";</div><div class='add'>+			clocks =</div><div class='add'>+			    &lt;&amp;mmcc SMMU_AHB_CLK&gt;,</div><div class='add'>+			    &lt;&amp;mmcc MDP_AXI_CLK&gt;;</div><div class='add'>+			reg = &lt;0x07600000 0x100000&gt;;</div><div class='add'>+			interrupts =</div><div class='add'>+			    &lt;GIC_SPI 61 0&gt;,</div><div class='add'>+			    &lt;GIC_SPI 62 0&gt;;</div><div class='add'>+			qcom,ncb = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gfx3d: iommu@7c00000 {</div><div class='add'>+			compatible = "qcom,apq8064-iommu";</div><div class='add'>+			#iommu-cells = &lt;1&gt;;</div><div class='add'>+			clock-names =</div><div class='add'>+			    "smmu_pclk",</div><div class='add'>+			    "iommu_clk";</div><div class='add'>+			clocks =</div><div class='add'>+			    &lt;&amp;mmcc SMMU_AHB_CLK&gt;,</div><div class='add'>+			    &lt;&amp;mmcc GFX3D_AXI_CLK&gt;;</div><div class='add'>+			reg = &lt;0x07c00000 0x100000&gt;;</div><div class='add'>+			interrupts =</div><div class='add'>+			    &lt;GIC_SPI 69 0&gt;,</div><div class='add'>+			    &lt;GIC_SPI 70 0&gt;;</div><div class='add'>+			qcom,ncb = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gfx3d1: iommu@7d00000 {</div><div class='add'>+			compatible = "qcom,apq8064-iommu";</div><div class='add'>+			#iommu-cells = &lt;1&gt;;</div><div class='add'>+			clock-names =</div><div class='add'>+			    "smmu_pclk",</div><div class='add'>+			    "iommu_clk";</div><div class='add'>+			clocks =</div><div class='add'>+			    &lt;&amp;mmcc SMMU_AHB_CLK&gt;,</div><div class='add'>+			    &lt;&amp;mmcc GFX3D_AXI_CLK&gt;;</div><div class='add'>+			reg = &lt;0x07d00000 0x100000&gt;;</div><div class='add'>+			interrupts =</div><div class='add'>+			    &lt;GIC_SPI 210 0&gt;,</div><div class='add'>+			    &lt;GIC_SPI 211 0&gt;;</div><div class='add'>+			qcom,ncb = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pcie: pci@1b500000 {</div><div class='ctx'> 			compatible = "qcom,pcie-apq8064", "snps,dw-pcie";</div><div class='ctx'> 			reg = &lt;0x1b500000 0x1000</div><div class='hunk'>@@ -1095,6 +1356,347 @@</div><div class='ctx'> 			reset-names = "axi", "ahb", "por", "pci", "phy";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		hdmi: hdmi-tx@4a00000 {</div><div class='add'>+			compatible = "qcom,hdmi-tx-8960";</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hdmi_pinctrl&gt;;</div><div class='add'>+			reg = &lt;0x04a00000 0x2f0&gt;;</div><div class='add'>+			reg-names = "core_physical";</div><div class='add'>+			interrupts = &lt;GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;mmcc HDMI_APP_CLK&gt;,</div><div class='add'>+				 &lt;&amp;mmcc HDMI_M_AHB_CLK&gt;,</div><div class='add'>+				 &lt;&amp;mmcc HDMI_S_AHB_CLK&gt;;</div><div class='add'>+			clock-names = "core_clk",</div><div class='add'>+				      "master_iface_clk",</div><div class='add'>+				      "slave_iface_clk";</div><div class='add'>+</div><div class='add'>+			phys = &lt;&amp;hdmi_phy&gt;;</div><div class='add'>+			phy-names = "hdmi-phy";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					hdmi_in: endpoint {</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@1 {</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+					hdmi_out: endpoint {</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hdmi_phy: hdmi-phy@4a00400 {</div><div class='add'>+			compatible = "qcom,hdmi-phy-8960";</div><div class='add'>+			reg = &lt;0x4a00400 0x60&gt;,</div><div class='add'>+			      &lt;0x4a00500 0x100&gt;;</div><div class='add'>+			reg-names = "hdmi_phy",</div><div class='add'>+				    "hdmi_pll";</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;mmcc HDMI_S_AHB_CLK&gt;;</div><div class='add'>+			clock-names = "slave_iface_clk";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mdp: mdp@5100000 {</div><div class='add'>+			compatible = "qcom,mdp4";</div><div class='add'>+			reg = &lt;0x05100000 0xf0000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;mmcc MDP_CLK&gt;,</div><div class='add'>+				 &lt;&amp;mmcc MDP_AHB_CLK&gt;,</div><div class='add'>+				 &lt;&amp;mmcc MDP_AXI_CLK&gt;,</div><div class='add'>+				 &lt;&amp;mmcc MDP_LUT_CLK&gt;,</div><div class='add'>+				 &lt;&amp;mmcc HDMI_TV_CLK&gt;,</div><div class='add'>+				 &lt;&amp;mmcc MDP_TV_CLK&gt;;</div><div class='add'>+			clock-names = "core_clk",</div><div class='add'>+				      "iface_clk",</div><div class='add'>+				      "bus_clk",</div><div class='add'>+				      "lut_clk",</div><div class='add'>+				      "hdmi_clk",</div><div class='add'>+				      "tv_clk";</div><div class='add'>+</div><div class='add'>+			iommus = &lt;&amp;mdp_port0 0</div><div class='add'>+				  &amp;mdp_port0 2</div><div class='add'>+				  &amp;mdp_port1 0</div><div class='add'>+				  &amp;mdp_port1 2&gt;;</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					mdp_lvds_out: endpoint {</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@1 {</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+					mdp_dsi1_out: endpoint {</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@2 {</div><div class='add'>+					reg = &lt;2&gt;;</div><div class='add'>+					mdp_dsi2_out: endpoint {</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@3 {</div><div class='add'>+					reg = &lt;3&gt;;</div><div class='add'>+					mdp_dtv_out: endpoint {</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		riva: riva-pil@3204000 {</div><div class='add'>+			compatible = "qcom,riva-pil";</div><div class='add'>+</div><div class='add'>+			reg = &lt;0x03200800 0x1000&gt;, &lt;0x03202000 0x2000&gt;, &lt;0x03204000 0x100&gt;;</div><div class='add'>+			reg-names = "ccu", "dxe", "pmu";</div><div class='add'>+</div><div class='add'>+			interrupts-extended = &lt;&amp;intc GIC_SPI 199 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+					      &lt;&amp;wcnss_smsm 6 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+			interrupt-names = "wdog", "fatal";</div><div class='add'>+</div><div class='add'>+			memory-region = &lt;&amp;wcnss_mem&gt;;</div><div class='add'>+</div><div class='add'>+			vddcx-supply = &lt;&amp;pm8921_s3&gt;;</div><div class='add'>+			vddmx-supply = &lt;&amp;pm8921_l24&gt;;</div><div class='add'>+			vddpx-supply = &lt;&amp;pm8921_s4&gt;;</div><div class='add'>+</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			iris {</div><div class='add'>+				compatible = "qcom,wcn3660";</div><div class='add'>+</div><div class='add'>+				clocks = &lt;&amp;cxo_board&gt;;</div><div class='add'>+				clock-names = "xo";</div><div class='add'>+</div><div class='add'>+				vddxo-supply = &lt;&amp;pm8921_l4&gt;;</div><div class='add'>+				vddrfa-supply = &lt;&amp;pm8921_s2&gt;;</div><div class='add'>+				vddpa-supply = &lt;&amp;pm8921_l10&gt;;</div><div class='add'>+				vdddig-supply = &lt;&amp;pm8921_lvs2&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			smd-edge {</div><div class='add'>+				interrupts = &lt;GIC_SPI 198 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+</div><div class='add'>+				qcom,ipc = &lt;&amp;l2cc 8 25&gt;;</div><div class='add'>+				qcom,smd-edge = &lt;6&gt;;</div><div class='add'>+</div><div class='add'>+				label = "riva";</div><div class='add'>+</div><div class='add'>+				wcnss {</div><div class='add'>+					compatible = "qcom,wcnss";</div><div class='add'>+					qcom,smd-channels = "WCNSS_CTRL";</div><div class='add'>+</div><div class='add'>+					qcom,mmio = &lt;&amp;riva&gt;;</div><div class='add'>+</div><div class='add'>+					bt {</div><div class='add'>+						compatible = "qcom,wcnss-bt";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					wifi {</div><div class='add'>+						compatible = "qcom,wcnss-wlan";</div><div class='add'>+</div><div class='add'>+						interrupts = &lt;GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+							     &lt;GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+						interrupt-names = "tx", "rx";</div><div class='add'>+</div><div class='add'>+						qcom,smem-states = &lt;&amp;apps_smsm 10&gt;, &lt;&amp;apps_smsm 9&gt;;</div><div class='add'>+						qcom,smem-state-names = "tx-enable", "tx-rings-empty";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etb@1a01000 {</div><div class='add'>+			compatible = "coresight-etb10", "arm,primecell";</div><div class='add'>+			reg = &lt;0x1a01000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk";</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				etb_in: endpoint {</div><div class='add'>+					slave-mode;</div><div class='add'>+					remote-endpoint = &lt;&amp;replicator_out0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tpiu@1a03000 {</div><div class='add'>+			compatible = "arm,coresight-tpiu", "arm,primecell";</div><div class='add'>+			reg = &lt;0x1a03000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk";</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				tpiu_in: endpoint {</div><div class='add'>+					slave-mode;</div><div class='add'>+					remote-endpoint = &lt;&amp;replicator_out1&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		replicator {</div><div class='add'>+			compatible = "arm,coresight-replicator";</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					replicator_out0: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;etb_in&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@1 {</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+					replicator_out1: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;tpiu_in&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@2 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					replicator_in: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;funnel_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		funnel@1a04000 {</div><div class='add'>+			compatible = "arm,coresight-funnel", "arm,primecell";</div><div class='add'>+			reg = &lt;0x1a04000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				/*</div><div class='add'>+				 * Not described input ports:</div><div class='add'>+				 * 2 - connected to STM component</div><div class='add'>+				 * 3 - not-connected</div><div class='add'>+				 * 6 - not-connected</div><div class='add'>+				 * 7 - not-connected</div><div class='add'>+				 */</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					funnel_in0: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;etm0_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@1 {</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+					funnel_in1: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;etm1_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@4 {</div><div class='add'>+					reg = &lt;4&gt;;</div><div class='add'>+					funnel_in4: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;etm2_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@5 {</div><div class='add'>+					reg = &lt;5&gt;;</div><div class='add'>+					funnel_in5: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;etm3_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@8 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					funnel_out: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;replicator_in&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etm@1a1c000 {</div><div class='add'>+			compatible = "arm,coresight-etm3x", "arm,primecell";</div><div class='add'>+			reg = &lt;0x1a1c000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk";</div><div class='add'>+</div><div class='add'>+			cpu = &lt;&amp;CPU0&gt;;</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				etm0_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;funnel_in0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etm@1a1d000 {</div><div class='add'>+			compatible = "arm,coresight-etm3x", "arm,primecell";</div><div class='add'>+			reg = &lt;0x1a1d000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk";</div><div class='add'>+</div><div class='add'>+			cpu = &lt;&amp;CPU1&gt;;</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				etm1_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;funnel_in1&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etm@1a1e000 {</div><div class='add'>+			compatible = "arm,coresight-etm3x", "arm,primecell";</div><div class='add'>+			reg = &lt;0x1a1e000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk";</div><div class='add'>+</div><div class='add'>+			cpu = &lt;&amp;CPU2&gt;;</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				etm2_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;funnel_in4&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etm@1a1f000 {</div><div class='add'>+			compatible = "arm,coresight-etm3x", "arm,primecell";</div><div class='add'>+			reg = &lt;0x1a1f000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk";</div><div class='add'>+</div><div class='add'>+			cpu = &lt;&amp;CPU3&gt;;</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				etm3_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;funnel_in5&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> #include "qcom-apq8064-pins.dtsi"</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi<br/>index 39eb7a4ed16a..80d48867107f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8084.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-apq8084.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-apq8084.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-apq8084.dtsi</a></div><div class='hunk'>@@ -182,13 +182,13 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	clocks {</div><div class='del'>-		xo_board {</div><div class='add'>+		xo_board: xo_board {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			clock-frequency = &lt;19200000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		sleep_clk {</div><div class='add'>+		sleep_clk: sleep_clk {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			clock-frequency = &lt;32768&gt;;</div><div class='hunk'>@@ -416,8 +416,10 @@</div><div class='ctx'> 			reg-names = "hc_mem", "core_mem";</div><div class='ctx'> 			interrupts = &lt;0 123 0&gt;, &lt;0 138 0&gt;;</div><div class='ctx'> 			interrupt-names = "hc_irq", "pwr_irq";</div><div class='del'>-			clocks = &lt;&amp;gcc GCC_SDCC1_APPS_CLK&gt;, &lt;&amp;gcc GCC_SDCC1_AHB_CLK&gt;;</div><div class='del'>-			clock-names = "core", "iface";</div><div class='add'>+			clocks = &lt;&amp;gcc GCC_SDCC1_APPS_CLK&gt;,</div><div class='add'>+				 &lt;&amp;gcc GCC_SDCC1_AHB_CLK&gt;,</div><div class='add'>+				 &lt;&amp;xo_board&gt;;</div><div class='add'>+			clock-names = "core", "iface", "xo";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -427,8 +429,10 @@</div><div class='ctx'> 			reg-names = "hc_mem", "core_mem";</div><div class='ctx'> 			interrupts = &lt;0 125 0&gt;, &lt;0 221 0&gt;;</div><div class='ctx'> 			interrupt-names = "hc_irq", "pwr_irq";</div><div class='del'>-			clocks = &lt;&amp;gcc GCC_SDCC2_APPS_CLK&gt;, &lt;&amp;gcc GCC_SDCC2_AHB_CLK&gt;;</div><div class='del'>-			clock-names = "core", "iface";</div><div class='add'>+			clocks = &lt;&amp;gcc GCC_SDCC2_APPS_CLK&gt;,</div><div class='add'>+				 &lt;&amp;gcc GCC_SDCC2_AHB_CLK&gt;,</div><div class='add'>+				 &lt;&amp;xo_board&gt;;</div><div class='add'>+			clock-names = "core", "iface", "xo";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi<br/>index 2e375576ffd0..76f4e8921d58 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-ipq8064.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-ipq8064.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-ipq8064.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-ipq8064.dtsi</a></div><div class='hunk'>@@ -65,13 +65,13 @@</div><div class='ctx'> 		cxo_board {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='del'>-			clock-frequency = &lt;19200000&gt;;</div><div class='add'>+			clock-frequency = &lt;25000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pxo_board {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='del'>-			clock-frequency = &lt;27000000&gt;;</div><div class='add'>+			clock-frequency = &lt;25000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sleep_clk: sleep_clk {</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts b/arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts<br/>new file mode 100644<br/>index 000000000000..26160c324802<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts</a></div><div class='hunk'>@@ -0,0 +1,281 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for mangOH Green Board with WP8548 Module</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 BayLibre, SAS.</div><div class='add'>+ * Author : Neil Armstrong &lt;narmstrong@baylibre.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+</div><div class='add'>+#include "qcom-mdm9615-wp8548.dtsi"</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "MangOH Green with WP8548 Module";</div><div class='add'>+	compatible = "swir,mangoh-green-wp8548", "swir,wp8548", "qcom,mdm9615";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		spi0 = &amp;gsbi3_spi;</div><div class='add'>+		serial0 = &amp;gsbi4_serial;</div><div class='add'>+		serial1 = &amp;gsbi5_serial;</div><div class='add'>+		i2c0 = &amp;gsbi5_i2c;</div><div class='add'>+		mmc0 = &amp;sdcc1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial1:115200n8";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;msmgpio {</div><div class='add'>+	/* MangOH GPIO Mapping :</div><div class='add'>+	 * - 2 : GPIOEXP_INT2</div><div class='add'>+	 * - 7 : IOT1_GPIO2</div><div class='add'>+	 * - 8 : IOT0_GPIO4</div><div class='add'>+	 * - 13: IOT0_GPIO3</div><div class='add'>+	 * - 21: IOT1_GPIO4</div><div class='add'>+	 * - 22: IOT2_GPIO1</div><div class='add'>+	 * - 23: IOT2_GPIO2</div><div class='add'>+	 * - 24: IOT2_GPIO3</div><div class='add'>+	 * - 25: IOT1_GPIO1</div><div class='add'>+	 * - 32: IOT1_GPIO3</div><div class='add'>+	 * - 33: IOT0_GPIO2</div><div class='add'>+	 * - 42: IOT0_GPIO1 and SD Card Detect</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	gpioext1_pins: gpioext1_pins {</div><div class='add'>+		pins {</div><div class='add'>+			pins = "gpio2";</div><div class='add'>+			function = "gpio";</div><div class='add'>+			input-enable;</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdc_cd_pins: sdc_cd_pins {</div><div class='add'>+		pins {</div><div class='add'>+			pins = "gpio42";</div><div class='add'>+			function = "gpio";</div><div class='add'>+			drive-strength = &lt;2&gt;;</div><div class='add'>+			bias-pull-up;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gsbi3_spi {</div><div class='add'>+	spi@0 {</div><div class='add'>+		compatible = "swir,mangoh-iotport-spi", "spidev";</div><div class='add'>+		spi-max-frequency = &lt;24000000&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gsbi5_i2c {</div><div class='add'>+	mux@71 {</div><div class='add'>+		compatible = "nxp,pca9548";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0x71&gt;;</div><div class='add'>+</div><div class='add'>+		i2c_iot0: i2c@0 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c_iot1: i2c@1 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c_iot2: i2c@2 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@3 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;3&gt;;</div><div class='add'>+</div><div class='add'>+			usbhub: hub@8 {</div><div class='add'>+				compatible = "smsc,usb3503a";</div><div class='add'>+				reg = &lt;0x8&gt;;</div><div class='add'>+				connect-gpios = &lt;&amp;gpioext2 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+				intn-gpios = &lt;&amp;gpioext2 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+				initial-mode = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@4 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+			gpioext0: gpio@3e {</div><div class='add'>+				/* GPIO Expander 0 Mapping :</div><div class='add'>+				 * - 0: ARDUINO_RESET_Level shift</div><div class='add'>+				 * - 1: BattChrgr_PG_N</div><div class='add'>+				 * - 2: BattGauge_GPIO</div><div class='add'>+				 * - 3: LED_ON (out active high)</div><div class='add'>+				 * - 4: ATmega_reset_GPIO</div><div class='add'>+				 * - 5: X</div><div class='add'>+				 * - 6: PCM_ANALOG_SELECT (out active high)</div><div class='add'>+				 * - 7: X</div><div class='add'>+				 * - 8: Board_rev_res1 (in)</div><div class='add'>+				 * - 9: Board_rev_res2 (in)</div><div class='add'>+				 * - 10: UART_EXP1_ENn (out active low / pull-down)</div><div class='add'>+				 * - 11: UART_EXP1_IN (out pull-down)</div><div class='add'>+				 * - 12: UART_EXP2_IN (out pull-down)</div><div class='add'>+				 * - 13: SDIO_SEL (out pull-down)</div><div class='add'>+				 * - 14: SPI_EXP1_ENn (out active low / pull-down)</div><div class='add'>+				 * - 15: SPI_EXP1_IN (out pull-down)</div><div class='add'>+				 */</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				compatible = "semtech,sx1509q";</div><div class='add'>+				reg = &lt;0x3e&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;gpioext1&gt;;</div><div class='add'>+				interrupts = &lt;0 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+</div><div class='add'>+				probe-reset;</div><div class='add'>+</div><div class='add'>+				gpio-controller;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@5 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;5&gt;;</div><div class='add'>+</div><div class='add'>+			gpioext1: gpio@3f {</div><div class='add'>+				/* GPIO Expander 1 Mapping :</div><div class='add'>+				 * - 0: GPIOEXP_INT1</div><div class='add'>+				 * - 1: Battery detect</div><div class='add'>+				 * - 2: GPIO_SCF3_RESET</div><div class='add'>+				 * - 3: LED_CARD_DETECT_IOT0 (in)</div><div class='add'>+				 * - 4: LED_CARD_DETECT_IOT1 (in)</div><div class='add'>+				 * - 5: LED_CARD_DETECT_IOT2 (in)</div><div class='add'>+				 * - 6: UIM2_PWM_SELECT</div><div class='add'>+				 * - 7: UIM2_M2_S_SELECT</div><div class='add'>+				 * - 8: TP900</div><div class='add'>+				 * - 9: SENSOR_INT1 (in)</div><div class='add'>+				 * - 10: SENSOR_INT2 (in)</div><div class='add'>+				 * - 11: CARD_DETECT_IOT0 (in pull-up)</div><div class='add'>+				 * - 12: CARD_DETECT_IOT2 (in pull-up)</div><div class='add'>+				 * - 13: CARD_DETECT_IOT1 (in pull-up)</div><div class='add'>+				 * - 14: GPIOEXP_INT3 (in active low / pull-up)</div><div class='add'>+				 * - 15: BattChrgr_INT_N</div><div class='add'>+				 */</div><div class='add'>+				pinctrl-0 = &lt;&amp;gpioext1_pins&gt;;</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				compatible = "semtech,sx1509q";</div><div class='add'>+				reg = &lt;0x3f&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;msmgpio&gt;;</div><div class='add'>+				interrupts = &lt;0 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+</div><div class='add'>+				probe-reset;</div><div class='add'>+</div><div class='add'>+				gpio-controller;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@6 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;6&gt;;</div><div class='add'>+</div><div class='add'>+			gpioext2: gpio@70 {</div><div class='add'>+				/* GPIO Expander 2 Mapping :</div><div class='add'>+				 * - 0: USB_HUB_INTn</div><div class='add'>+				 * - 1: HUB_CONNECT</div><div class='add'>+				 * - 2: GPIO_IOT2_RESET (out active low / pull-up)</div><div class='add'>+				 * - 3: GPIO_IOT1_RESET (out active low / pull-up)</div><div class='add'>+				 * - 4: GPIO_IOT0_RESET (out active low / pull-up)</div><div class='add'>+				 * - 5: TP901</div><div class='add'>+				 * - 6: TP902</div><div class='add'>+				 * - 7: TP903</div><div class='add'>+				 * - 8: UART_EXP2_ENn (out active low / pull-down)</div><div class='add'>+				 * - 9: PCM_EXP1_ENn (out active low)</div><div class='add'>+				 * - 10: PCM_EXP1_SEL (out)</div><div class='add'>+				 * - 11: ARD_FTDI</div><div class='add'>+				 * - 12: TP904</div><div class='add'>+				 * - 13: TP905</div><div class='add'>+				 * - 14: TP906</div><div class='add'>+				 * - 15: RS232_Enable (out active high / pull-up)</div><div class='add'>+				 */</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				compatible = "semtech,sx1509q";</div><div class='add'>+				reg = &lt;0x70&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;gpioext1&gt;;</div><div class='add'>+				interrupts = &lt;14 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+</div><div class='add'>+				probe-reset;</div><div class='add'>+</div><div class='add'>+				gpio-controller;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@7 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;7&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdcc1 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdc_cd_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	disable-wp;</div><div class='add'>+	cd-gpios = &lt;&amp;msmgpio 42 GPIO_ACTIVE_LOW&gt;; /* Active low CD */</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi<br/>new file mode 100644<br/>index 000000000000..7869898e392d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi</a></div><div class='hunk'>@@ -0,0 +1,170 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for Sierra Wireless WP8548 Module</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 BayLibre, SAS.</div><div class='add'>+ * Author : Neil Armstrong &lt;narmstrong@baylibre.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "qcom-mdm9615.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Sierra Wireless WP8548 Module";</div><div class='add'>+	compatible = "swir,wp8548", "qcom,mdm9615";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x48000000 0x7F00000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;msmgpio {</div><div class='add'>+	pinctrl-0 = &lt;&amp;reset_out_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	gsbi3_pins: gsbi3_pins {</div><div class='add'>+		mux {</div><div class='add'>+			pins = "gpio8", "gpio9", "gpio10", "gpio11";</div><div class='add'>+			function = "gsbi3";</div><div class='add'>+			drive-strength = &lt;8&gt;;</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gsbi4_pins: gsbi4_pins {</div><div class='add'>+		mux {</div><div class='add'>+			pins = "gpio12", "gpio13", "gpio14", "gpio15";</div><div class='add'>+			function = "gsbi4";</div><div class='add'>+			drive-strength = &lt;8&gt;;</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gsbi5_i2c_pins: gsbi5_i2c_pins {</div><div class='add'>+		pin16 {</div><div class='add'>+			pins = "gpio16";</div><div class='add'>+			function = "gsbi5_i2c";</div><div class='add'>+			drive-strength = &lt;8&gt;;</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pin17 {</div><div class='add'>+			pins = "gpio17";</div><div class='add'>+			function = "gsbi5_i2c";</div><div class='add'>+			drive-strength = &lt;2&gt;;</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gsbi5_uart_pins: gsbi5_uart_pins {</div><div class='add'>+		mux {</div><div class='add'>+			pins = "gpio18", "gpio19";</div><div class='add'>+			function = "gsbi5_uart";</div><div class='add'>+			drive-strength = &lt;8&gt;;</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reset_out_pins: reset_out_pins {</div><div class='add'>+		pins {</div><div class='add'>+			pins = "gpio66";</div><div class='add'>+			function = "gpio";</div><div class='add'>+			drive-strength = &lt;2&gt;;</div><div class='add'>+			bias-pull-up;</div><div class='add'>+			output-high;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pmicgpio {</div><div class='add'>+	usb_vbus_5v_pins: usb_vbus_5v_pins {</div><div class='add'>+		pins = "gpio4";</div><div class='add'>+		function = "normal";</div><div class='add'>+		output-high;</div><div class='add'>+		bias-disable;</div><div class='add'>+		qcom,drive-strength = &lt;1&gt;;</div><div class='add'>+		power-source = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gsbi3 {</div><div class='add'>+	status = "ok";</div><div class='add'>+	qcom,mode = &lt;GSBI_PROT_SPI&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gsbi3_spi {</div><div class='add'>+	status = "ok";</div><div class='add'>+	pinctrl-0 = &lt;&amp;gsbi3_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	assigned-clocks = &lt;&amp;gcc GSBI3_QUP_CLK&gt;;</div><div class='add'>+	assigned-clock-rates = &lt;24000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gsbi4 {</div><div class='add'>+	status = "ok";</div><div class='add'>+	qcom,mode = &lt;GSBI_PROT_UART_W_FC&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gsbi4_serial {</div><div class='add'>+	status = "ok";</div><div class='add'>+	pinctrl-0 = &lt;&amp;gsbi4_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gsbi5 {</div><div class='add'>+	status = "ok";</div><div class='add'>+	qcom,mode = &lt;GSBI_PROT_I2C_UART&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gsbi5_i2c {</div><div class='add'>+	status = "ok";</div><div class='add'>+	clock-frequency = &lt;200000&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;gsbi5_i2c_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gsbi5_serial {</div><div class='add'>+	status = "ok";</div><div class='add'>+	pinctrl-0 = &lt;&amp;gsbi5_uart_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdcc1 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi<br/>new file mode 100644<br/>index 000000000000..c852b69229c9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-mdm9615.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-mdm9615.dtsi</a></div><div class='hunk'>@@ -0,0 +1,557 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for Qualcomm MDM9615 SoC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 BayLibre, SAS.</div><div class='add'>+ * Author : Neil Armstrong &lt;narmstrong@baylibre.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/include/ "skeleton.dtsi"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/qcom,gcc-mdm9615.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/qcom,gcc-mdm9615.h&gt;</div><div class='add'>+#include &lt;dt-bindings/mfd/qcom-rpm.h&gt;</div><div class='add'>+#include &lt;dt-bindings/soc/qcom,gsbi.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Qualcomm MDM9615";</div><div class='add'>+	compatible = "qcom,mdm9615";</div><div class='add'>+	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@0 {</div><div class='add'>+			compatible = "arm,cortex-a5";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpu-pmu {</div><div class='add'>+		compatible = "arm,cortex-a5-pmu";</div><div class='add'>+		interrupts = &lt;GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clocks {</div><div class='add'>+		cxo_board {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;19200000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	regulators {</div><div class='add'>+		vsdcc_fixed: vsdcc-regulator {</div><div class='add'>+			compatible = "regulator-fixed";</div><div class='add'>+			regulator-name = "SDCC Power";</div><div class='add'>+			regulator-min-microvolt = &lt;2700000&gt;;</div><div class='add'>+			regulator-max-microvolt = &lt;2700000&gt;;</div><div class='add'>+			regulator-always-on;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc: soc {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+</div><div class='add'>+		L2: l2-cache@2040000 {</div><div class='add'>+			compatible = "arm,pl310-cache";</div><div class='add'>+			reg = &lt;0x02040000 0x1000&gt;;</div><div class='add'>+			arm,data-latency = &lt;2 2 0&gt;;</div><div class='add'>+			cache-unified;</div><div class='add'>+			cache-level = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		intc: interrupt-controller@2000000 {</div><div class='add'>+			compatible = "qcom,msm-qgic2";</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			reg = &lt;0x02000000 0x1000&gt;,</div><div class='add'>+			      &lt;0x02002000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@200a000 {</div><div class='add'>+			compatible = "qcom,kpss-timer", "qcom,msm-timer";</div><div class='add'>+			interrupts = &lt;GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_EDGE_RISING)&gt;,</div><div class='add'>+				     &lt;GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_EDGE_RISING)&gt;,</div><div class='add'>+				     &lt;GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_EDGE_RISING)&gt;;</div><div class='add'>+			reg = &lt;0x0200a000 0x100&gt;;</div><div class='add'>+			clock-frequency = &lt;27000000&gt;,</div><div class='add'>+					  &lt;32768&gt;;</div><div class='add'>+			cpu-offset = &lt;0x80000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		msmgpio: pinctrl@800000 {</div><div class='add'>+			compatible = "qcom,mdm9615-pinctrl";</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+			reg = &lt;0x800000 0x4000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gcc: clock-controller@900000 {</div><div class='add'>+			compatible = "qcom,gcc-mdm9615";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			#reset-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x900000 0x4000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lcc: clock-controller@28000000 {</div><div class='add'>+			compatible = "qcom,lcc-mdm9615";</div><div class='add'>+			reg = &lt;0x28000000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			#reset-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		l2cc: clock-controller@2011000 {</div><div class='add'>+			compatible = "syscon";</div><div class='add'>+			reg = &lt;0x02011000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rng@1a500000 {</div><div class='add'>+			compatible = "qcom,prng";</div><div class='add'>+			reg = &lt;0x1a500000 0x200&gt;;</div><div class='add'>+			clocks = &lt;&amp;gcc PRNG_CLK&gt;;</div><div class='add'>+			clock-names = "core";</div><div class='add'>+			assigned-clocks = &lt;&amp;gcc PRNG_CLK&gt;;</div><div class='add'>+			assigned-clock-rates = &lt;32000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gsbi2: gsbi@16100000 {</div><div class='add'>+			compatible = "qcom,gsbi-v1.0.0";</div><div class='add'>+			cell-index = &lt;2&gt;;</div><div class='add'>+			reg = &lt;0x16100000 0x100&gt;;</div><div class='add'>+			clocks = &lt;&amp;gcc GSBI2_H_CLK&gt;;</div><div class='add'>+			clock-names = "iface";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			gsbi2_i2c: i2c@16180000 {</div><div class='add'>+				compatible = "qcom,i2c-qup-v1.1.1";</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				reg = &lt;0x16180000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+				clocks = &lt;&amp;gcc GSBI2_QUP_CLK&gt;, &lt;&amp;gcc GSBI2_H_CLK&gt;;</div><div class='add'>+				clock-names = "core", "iface";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gsbi3: gsbi@16200000 {</div><div class='add'>+			compatible = "qcom,gsbi-v1.0.0";</div><div class='add'>+			cell-index = &lt;3&gt;;</div><div class='add'>+			reg = &lt;0x16200000 0x100&gt;;</div><div class='add'>+			clocks = &lt;&amp;gcc GSBI3_H_CLK&gt;;</div><div class='add'>+			clock-names = "iface";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			gsbi3_spi: spi@16280000 {</div><div class='add'>+				compatible = "qcom,spi-qup-v1.1.1";</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				reg = &lt;0x16280000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				spi-max-frequency = &lt;24000000&gt;;</div><div class='add'>+</div><div class='add'>+				clocks = &lt;&amp;gcc GSBI3_QUP_CLK&gt;, &lt;&amp;gcc GSBI3_H_CLK&gt;;</div><div class='add'>+				clock-names = "core", "iface";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gsbi4: gsbi@16300000 {</div><div class='add'>+			compatible = "qcom,gsbi-v1.0.0";</div><div class='add'>+			cell-index = &lt;4&gt;;</div><div class='add'>+			reg = &lt;0x16300000 0x100&gt;;</div><div class='add'>+			clocks = &lt;&amp;gcc GSBI4_H_CLK&gt;;</div><div class='add'>+			clock-names = "iface";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			syscon-tcsr = &lt;&amp;tcsr&gt;;</div><div class='add'>+</div><div class='add'>+			gsbi4_serial: serial@16340000 {</div><div class='add'>+				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";</div><div class='add'>+				reg = &lt;0x16340000 0x1000&gt;,</div><div class='add'>+				      &lt;0x16300000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;gcc GSBI4_UART_CLK&gt;, &lt;&amp;gcc GSBI4_H_CLK&gt;;</div><div class='add'>+				clock-names = "core", "iface";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gsbi5: gsbi@16400000 {</div><div class='add'>+			compatible = "qcom,gsbi-v1.0.0";</div><div class='add'>+			cell-index = &lt;5&gt;;</div><div class='add'>+			reg = &lt;0x16400000 0x100&gt;;</div><div class='add'>+			clocks = &lt;&amp;gcc GSBI5_H_CLK&gt;;</div><div class='add'>+			clock-names = "iface";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			syscon-tcsr = &lt;&amp;tcsr&gt;;</div><div class='add'>+</div><div class='add'>+			gsbi5_i2c: i2c@16480000 {</div><div class='add'>+				compatible = "qcom,i2c-qup-v1.1.1";</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				reg = &lt;0x16480000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+				/* QUP clock is not initialized, set rate */</div><div class='add'>+				assigned-clocks = &lt;&amp;gcc GSBI5_QUP_CLK&gt;;</div><div class='add'>+				assigned-clock-rates = &lt;24000000&gt;;</div><div class='add'>+</div><div class='add'>+				clocks = &lt;&amp;gcc GSBI5_QUP_CLK&gt;, &lt;&amp;gcc GSBI5_H_CLK&gt;;</div><div class='add'>+				clock-names = "core", "iface";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gsbi5_serial: serial@16440000 {</div><div class='add'>+				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";</div><div class='add'>+				reg = &lt;0x16440000 0x1000&gt;,</div><div class='add'>+				      &lt;0x16400000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;gcc GSBI5_UART_CLK&gt;, &lt;&amp;gcc GSBI5_H_CLK&gt;;</div><div class='add'>+				clock-names = "core", "iface";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qcom,ssbi@500000 {</div><div class='add'>+			compatible = "qcom,ssbi";</div><div class='add'>+			reg = &lt;0x500000 0x1000&gt;;</div><div class='add'>+			qcom,controller-type = "pmic-arbiter";</div><div class='add'>+</div><div class='add'>+			pmicintc: pmic@0 {</div><div class='add'>+				compatible = "qcom,pm8018", "qcom,pm8921";</div><div class='add'>+				interrupts = &lt;GIC_PPI 226 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				pwrkey@1c {</div><div class='add'>+					compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey";</div><div class='add'>+					reg = &lt;0x1c&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;pmicintc&gt;;</div><div class='add'>+					interrupts = &lt;50 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+						     &lt;51 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+					debounce = &lt;15625&gt;;</div><div class='add'>+					pull-up;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pmicmpp: mpp@50 {</div><div class='add'>+					compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";</div><div class='add'>+					interrupt-parent = &lt;&amp;pmicintc&gt;;</div><div class='add'>+					interrupts = &lt;24 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;25 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;26 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;27 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;28 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;29 IRQ_TYPE_NONE&gt;;</div><div class='add'>+					reg = &lt;0x50&gt;;</div><div class='add'>+					gpio-controller;</div><div class='add'>+					#gpio-cells = &lt;2&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				rtc@11d {</div><div class='add'>+					compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";</div><div class='add'>+					interrupt-parent = &lt;&amp;pmicintc&gt;;</div><div class='add'>+					interrupts = &lt;39 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+					reg = &lt;0x11d&gt;;</div><div class='add'>+					allow-set-time;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pmicgpio: gpio@150 {</div><div class='add'>+					compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio";</div><div class='add'>+					interrupt-parent = &lt;&amp;pmicintc&gt;;</div><div class='add'>+					interrupts = &lt;24 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;25 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;26 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;27 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;28 IRQ_TYPE_NONE&gt;,</div><div class='add'>+						     &lt;29 IRQ_TYPE_NONE&gt;;</div><div class='add'>+					gpio-controller;</div><div class='add'>+					#gpio-cells = &lt;2&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdcc1bam: dma@12182000{</div><div class='add'>+			compatible = "qcom,bam-v1.3.0";</div><div class='add'>+			reg = &lt;0x12182000 0x8000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;gcc SDC1_H_CLK&gt;;</div><div class='add'>+			clock-names = "bam_clk";</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			qcom,ee = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdcc2bam: dma@12142000{</div><div class='add'>+			compatible = "qcom,bam-v1.3.0";</div><div class='add'>+			reg = &lt;0x12142000 0x8000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;gcc SDC2_H_CLK&gt;;</div><div class='add'>+			clock-names = "bam_clk";</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			qcom,ee = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		amba {</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+			sdcc1: sdcc@12180000 {</div><div class='add'>+				status = "disabled";</div><div class='add'>+				compatible = "arm,pl18x", "arm,primecell";</div><div class='add'>+				arm,primecell-periphid = &lt;0x00051180&gt;;</div><div class='add'>+				reg = &lt;0x12180000 0x2000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				interrupt-names	= "cmd_irq";</div><div class='add'>+				clocks = &lt;&amp;gcc SDC1_CLK&gt;, &lt;&amp;gcc SDC1_H_CLK&gt;;</div><div class='add'>+				clock-names = "mclk", "apb_pclk";</div><div class='add'>+				bus-width = &lt;8&gt;;</div><div class='add'>+				max-frequency = &lt;48000000&gt;;</div><div class='add'>+				cap-sd-highspeed;</div><div class='add'>+				cap-mmc-highspeed;</div><div class='add'>+				vmmc-supply = &lt;&amp;vsdcc_fixed&gt;;</div><div class='add'>+				dmas = &lt;&amp;sdcc1bam 2&gt;, &lt;&amp;sdcc1bam 1&gt;;</div><div class='add'>+				dma-names = "tx", "rx";</div><div class='add'>+				assigned-clocks = &lt;&amp;gcc SDC1_CLK&gt;;</div><div class='add'>+				assigned-clock-rates = &lt;400000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sdcc2: sdcc@12140000 {</div><div class='add'>+				compatible = "arm,pl18x", "arm,primecell";</div><div class='add'>+				arm,primecell-periphid = &lt;0x00051180&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+				reg = &lt;0x12140000 0x2000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				interrupt-names	= "cmd_irq";</div><div class='add'>+				clocks = &lt;&amp;gcc SDC2_CLK&gt;, &lt;&amp;gcc SDC2_H_CLK&gt;;</div><div class='add'>+				clock-names = "mclk", "apb_pclk";</div><div class='add'>+				bus-width = &lt;4&gt;;</div><div class='add'>+				cap-sd-highspeed;</div><div class='add'>+				cap-mmc-highspeed;</div><div class='add'>+				max-frequency = &lt;48000000&gt;;</div><div class='add'>+				no-1-8-v;</div><div class='add'>+				vmmc-supply = &lt;&amp;vsdcc_fixed&gt;;</div><div class='add'>+				dmas = &lt;&amp;sdcc2bam 2&gt;, &lt;&amp;sdcc2bam 1&gt;;</div><div class='add'>+				dma-names = "tx", "rx";</div><div class='add'>+				assigned-clocks = &lt;&amp;gcc SDC2_CLK&gt;;</div><div class='add'>+				assigned-clock-rates = &lt;400000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tcsr: syscon@1a400000 {</div><div class='add'>+			compatible = "qcom,tcsr-mdm9615", "syscon";</div><div class='add'>+			reg = &lt;0x1a400000 0x100&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rpm: rpm@108000 {</div><div class='add'>+			compatible = "qcom,rpm-mdm9615";</div><div class='add'>+			reg = &lt;0x108000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			qcom,ipc = &lt;&amp;l2cc 0x8 2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupts = &lt;GIC_SPI 19 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				     &lt;GIC_SPI 21 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				     &lt;GIC_SPI 22 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+			interrupt-names	= "ack", "err", "wakeup";</div><div class='add'>+</div><div class='add'>+			regulators {</div><div class='add'>+				compatible = "qcom,rpm-pm8018-regulators";</div><div class='add'>+</div><div class='add'>+				vin_lvs1-supply = &lt;&amp;pm8018_s3&gt;;</div><div class='add'>+</div><div class='add'>+				vdd_l7-supply = &lt;&amp;pm8018_s4&gt;;</div><div class='add'>+				vdd_l8-supply = &lt;&amp;pm8018_s3&gt;;</div><div class='add'>+				vdd_l9_l10_l11_l12-supply = &lt;&amp;pm8018_s5&gt;;</div><div class='add'>+</div><div class='add'>+				/* Buck SMPS */</div><div class='add'>+				pm8018_s1: s1 {</div><div class='add'>+					regulator-min-microvolt = &lt;500000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1150000&gt;;</div><div class='add'>+					qcom,switch-mode-frequency = &lt;1600000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_s2: s2 {</div><div class='add'>+					regulator-min-microvolt = &lt;1225000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1300000&gt;;</div><div class='add'>+					qcom,switch-mode-frequency = &lt;1600000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_s3: s3 {</div><div class='add'>+					regulator-always-on;</div><div class='add'>+					regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+					qcom,switch-mode-frequency = &lt;1600000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_s4: s4 {</div><div class='add'>+					regulator-min-microvolt = &lt;2100000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;2200000&gt;;</div><div class='add'>+					qcom,switch-mode-frequency = &lt;1600000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_s5: s5 {</div><div class='add'>+					regulator-always-on;</div><div class='add'>+					regulator-min-microvolt = &lt;1350000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1350000&gt;;</div><div class='add'>+					qcom,switch-mode-frequency = &lt;1600000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				/* PMOS LDO */</div><div class='add'>+				pm8018_l2: l2 {</div><div class='add'>+					regulator-always-on;</div><div class='add'>+					regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l3: l3 {</div><div class='add'>+					regulator-always-on;</div><div class='add'>+					regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l4: l4 {</div><div class='add'>+					regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l5: l5 {</div><div class='add'>+					regulator-min-microvolt = &lt;2850000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;2850000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l6: l6 {</div><div class='add'>+					regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;2850000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l7: l7 {</div><div class='add'>+					regulator-min-microvolt = &lt;1850000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1900000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l8: l8 {</div><div class='add'>+					regulator-min-microvolt = &lt;1200000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1200000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l9: l9 {</div><div class='add'>+					regulator-min-microvolt = &lt;750000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1150000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l10: l10 {</div><div class='add'>+					regulator-min-microvolt = &lt;1050000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1050000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l11: l11 {</div><div class='add'>+					regulator-min-microvolt = &lt;1050000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1050000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l12: l12 {</div><div class='add'>+					regulator-min-microvolt = &lt;1050000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;1050000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l13: l13 {</div><div class='add'>+					regulator-min-microvolt = &lt;1850000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;2950000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				pm8018_l14: l14 {</div><div class='add'>+					regulator-min-microvolt = &lt;2850000&gt;;</div><div class='add'>+					regulator-max-microvolt = &lt;2850000&gt;;</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				/* Low Voltage Switch */</div><div class='add'>+				pm8018_lvs1: lvs1 {</div><div class='add'>+					bias-pull-down;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts<br/>index 23de764558ab..1adc04978a47 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-msm8660-surf.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-msm8660-surf.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-msm8660-surf.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-msm8660-surf.dts</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;pmicintc {</div><div class='add'>+&amp;pm8058 {</div><div class='ctx'> 	keypad@148 {</div><div class='ctx'> 		linux,keymap = &lt;</div><div class='ctx'> 			MATRIX_KEY(0, 0, KEY_FN_F1)</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi<br/>index 8c65e0d82559..91c9a62ae725 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-msm8660.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-msm8660.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-msm8660.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-msm8660.dtsi</a></div><div class='hunk'>@@ -141,12 +141,29 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		external-bus@1a100000 {</div><div class='add'>+			compatible = "qcom,msm8660-ebi2";</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges = &lt;0 0x0 0x1a800000 0x00800000&gt;,</div><div class='add'>+				 &lt;1 0x0 0x1b000000 0x00800000&gt;,</div><div class='add'>+				 &lt;2 0x0 0x1b800000 0x00800000&gt;,</div><div class='add'>+				 &lt;3 0x0 0x1d000000 0x08000000&gt;,</div><div class='add'>+				 &lt;4 0x0 0x1c800000 0x00800000&gt;,</div><div class='add'>+				 &lt;5 0x0 0x1c000000 0x00800000&gt;;</div><div class='add'>+			reg = &lt;0x1a100000 0x1000&gt;, &lt;0x1a110000 0x1000&gt;;</div><div class='add'>+			reg-names = "ebi2", "xmem";</div><div class='add'>+			clocks = &lt;&amp;gcc EBI2_2X_CLK&gt;, &lt;&amp;gcc EBI2_CLK&gt;;</div><div class='add'>+			clock-names = "ebi2x", "ebi2";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		qcom,ssbi@500000 {</div><div class='ctx'> 			compatible = "qcom,ssbi";</div><div class='ctx'> 			reg = &lt;0x500000 0x1000&gt;;</div><div class='ctx'> 			qcom,controller-type = "pmic-arbiter";</div><div class='ctx'> </div><div class='del'>-			pmicintc: pmic@0 {</div><div class='add'>+			pm8058: pmic@0 {</div><div class='ctx'> 				compatible = "qcom,pm8058";</div><div class='ctx'> 				interrupt-parent = &lt;&amp;tlmm&gt;;</div><div class='ctx'> 				interrupts = &lt;88 8&gt;;</div><div class='hunk'>@@ -159,7 +176,7 @@</div><div class='ctx'> 					compatible = "qcom,pm8058-gpio",</div><div class='ctx'> 						     "qcom,ssbi-gpio";</div><div class='ctx'> 					reg = &lt;0x150&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;pmicintc&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;pm8058&gt;;</div><div class='ctx'> 					interrupts = &lt;192 IRQ_TYPE_NONE&gt;,</div><div class='ctx'> 						     &lt;193 IRQ_TYPE_NONE&gt;,</div><div class='ctx'> 						     &lt;194 IRQ_TYPE_NONE&gt;,</div><div class='hunk'>@@ -215,7 +232,7 @@</div><div class='ctx'> 					reg = &lt;0x50&gt;;</div><div class='ctx'> 					gpio-controller;</div><div class='ctx'> 					#gpio-cells = &lt;2&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;pmicintc&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;pm8058&gt;;</div><div class='ctx'> 					interrupts =</div><div class='ctx'> 					&lt;128 IRQ_TYPE_NONE&gt;,</div><div class='ctx'> 					&lt;129 IRQ_TYPE_NONE&gt;,</div><div class='hunk'>@@ -234,7 +251,7 @@</div><div class='ctx'> 				pwrkey@1c {</div><div class='ctx'> 					compatible = "qcom,pm8058-pwrkey";</div><div class='ctx'> 					reg = &lt;0x1c&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;pmicintc&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;pm8058&gt;;</div><div class='ctx'> 					interrupts = &lt;50 1&gt;, &lt;51 1&gt;;</div><div class='ctx'> 					debounce = &lt;15625&gt;;</div><div class='ctx'> 					pull-up;</div><div class='hunk'>@@ -243,7 +260,7 @@</div><div class='ctx'> 				keypad@148 {</div><div class='ctx'> 					compatible = "qcom,pm8058-keypad";</div><div class='ctx'> 					reg = &lt;0x148&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;pmicintc&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;pm8058&gt;;</div><div class='ctx'> 					interrupts = &lt;74 1&gt;, &lt;75 1&gt;;</div><div class='ctx'> 					debounce = &lt;15&gt;;</div><div class='ctx'> 					scan-delay = &lt;32&gt;;</div><div class='hunk'>@@ -253,7 +270,7 @@</div><div class='ctx'> 				rtc@1e8 {</div><div class='ctx'> 					compatible = "qcom,pm8058-rtc";</div><div class='ctx'> 					reg = &lt;0x1e8&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;pmicintc&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;pm8058&gt;;</div><div class='ctx'> 					interrupts = &lt;39 1&gt;;</div><div class='ctx'> 					allow-set-time;</div><div class='ctx'> 				};</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts<br/>index c0fb4a698c56..382bcc3231a9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts</a></div><div class='hunk'>@@ -224,6 +224,35 @@</div><div class='ctx'> 		status = "ok";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	pinctrl@fd510000 {</div><div class='add'>+		sdhc1_pin_a: sdhc1-pin-active {</div><div class='add'>+			clk {</div><div class='add'>+				pins = "sdc1_clk";</div><div class='add'>+				drive-strength = &lt;16&gt;;</div><div class='add'>+				bias-disable;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cmd-data {</div><div class='add'>+				pins = "sdc1_cmd", "sdc1_data";</div><div class='add'>+				drive-strength = &lt;10&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@f9824900 {</div><div class='add'>+		status = "ok";</div><div class='add'>+</div><div class='add'>+		vmmc-supply = &lt;&amp;pm8941_l20&gt;;</div><div class='add'>+		vqmmc-supply = &lt;&amp;pm8941_s3&gt;;</div><div class='add'>+</div><div class='add'>+		bus-width = &lt;8&gt;;</div><div class='add'>+		non-removable;</div><div class='add'>+</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;sdhc1_pin_a&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	gpio-keys {</div><div class='ctx'> 		compatible = "gpio-keys";</div><div class='ctx'> 		input-name = "gpio-keys";</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts<br/>index e7c1577d56f4..96c853bab8ba 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts</a></div><div class='hunk'>@@ -413,6 +413,14 @@</div><div class='ctx'> 	dma-controller@f9944000 {</div><div class='ctx'> 		qcom,controlled-remotely;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	usb-phy@f9a55000 {</div><div class='add'>+		status = "ok";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@f9a55000 {</div><div class='add'>+		status = "ok";</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;spmi_bus {</div><div class='head'>diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi<br/>index d2109475bdfd..d3e1a61b8671 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-msm8974.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/qcom-msm8974.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/qcom-msm8974.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/qcom-msm8974.dtsi</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/clock/qcom,gcc-msm8974.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/qcom,gcc-msm8974.h&gt;</div><div class='ctx'> #include "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -30,7 +31,7 @@</div><div class='ctx'> 			no-map;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		adsp@0dc00000 {</div><div class='add'>+		adsp_region: adsp@0dc00000 {</div><div class='ctx'> 			reg = &lt;0x0dc00000 0x1900000&gt;;</div><div class='ctx'> 			no-map;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -59,11 +60,6 @@</div><div class='ctx'> 			reg = &lt;0x0fd80000 0x180000&gt;;</div><div class='ctx'> 			no-map;</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		unused@0ff00000 {</div><div class='del'>-			reg = &lt;0x0ff00000 0x10100000&gt;;</div><div class='del'>-			no-map;</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='hunk'>@@ -220,13 +216,13 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	clocks {</div><div class='del'>-		xo_board {</div><div class='add'>+		xo_board: xo_board {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			clock-frequency = &lt;19200000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		sleep_clk {</div><div class='add'>+		sleep_clk: sleep_clk {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			clock-frequency = &lt;32768&gt;;</div><div class='hunk'>@@ -242,6 +238,24 @@</div><div class='ctx'> 		clock-frequency = &lt;19200000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	adsp-pil {</div><div class='add'>+		compatible = "qcom,msm8974-adsp-pil";</div><div class='add'>+</div><div class='add'>+		interrupts-extended = &lt;&amp;intc 0 162 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+				      &lt;&amp;adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";</div><div class='add'>+</div><div class='add'>+		cx-supply = &lt;&amp;pm8841_s2&gt;;</div><div class='add'>+</div><div class='add'>+		memory-region = &lt;&amp;adsp_region&gt;;</div><div class='add'>+</div><div class='add'>+		qcom,smem-states = &lt;&amp;adsp_smp2p_out 0&gt;;</div><div class='add'>+		qcom,smem-state-names = "stop";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	smem {</div><div class='ctx'> 		compatible = "qcom,smem";</div><div class='ctx'> </div><div class='hunk'>@@ -251,6 +265,31 @@</div><div class='ctx'> 		hwlocks = &lt;&amp;tcsr_mutex 3&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	smp2p-adsp {</div><div class='add'>+		compatible = "qcom,smp2p";</div><div class='add'>+		qcom,smem = &lt;443&gt;, &lt;429&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+		interrupts = &lt;0 158 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+</div><div class='add'>+		qcom,ipc = &lt;&amp;apcs 8 10&gt;;</div><div class='add'>+</div><div class='add'>+		qcom,local-pid = &lt;0&gt;;</div><div class='add'>+		qcom,remote-pid = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		adsp_smp2p_out: master-kernel {</div><div class='add'>+			qcom,entry-name = "master-kernel";</div><div class='add'>+			#qcom,smem-state-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		adsp_smp2p_in: slave-kernel {</div><div class='add'>+			qcom,entry-name = "slave-kernel";</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	smp2p-modem {</div><div class='ctx'> 		compatible = "qcom,smp2p";</div><div class='ctx'> 		qcom,smem = &lt;435&gt;, &lt;428&gt;;</div><div class='hunk'>@@ -558,8 +597,10 @@</div><div class='ctx'> 			reg-names = "hc_mem", "core_mem";</div><div class='ctx'> 			interrupts = &lt;0 123 0&gt;, &lt;0 138 0&gt;;</div><div class='ctx'> 			interrupt-names = "hc_irq", "pwr_irq";</div><div class='del'>-			clocks = &lt;&amp;gcc GCC_SDCC1_APPS_CLK&gt;, &lt;&amp;gcc GCC_SDCC1_AHB_CLK&gt;;</div><div class='del'>-			clock-names = "core", "iface";</div><div class='add'>+			clocks = &lt;&amp;gcc GCC_SDCC1_APPS_CLK&gt;,</div><div class='add'>+				 &lt;&amp;gcc GCC_SDCC1_AHB_CLK&gt;,</div><div class='add'>+				 &lt;&amp;xo_board&gt;;</div><div class='add'>+			clock-names = "core", "iface", "xo";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -569,8 +610,10 @@</div><div class='ctx'> 			reg-names = "hc_mem", "core_mem";</div><div class='ctx'> 			interrupts = &lt;0 125 0&gt;, &lt;0 221 0&gt;;</div><div class='ctx'> 			interrupt-names = "hc_irq", "pwr_irq";</div><div class='del'>-			clocks = &lt;&amp;gcc GCC_SDCC2_APPS_CLK&gt;, &lt;&amp;gcc GCC_SDCC2_AHB_CLK&gt;;</div><div class='del'>-			clock-names = "core", "iface";</div><div class='add'>+			clocks = &lt;&amp;gcc GCC_SDCC2_APPS_CLK&gt;,</div><div class='add'>+				 &lt;&amp;gcc GCC_SDCC2_AHB_CLK&gt;,</div><div class='add'>+				 &lt;&amp;xo_board&gt;;</div><div class='add'>+			clock-names = "core", "iface", "xo";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -651,11 +694,56 @@</div><div class='ctx'> 			#dma-cells = &lt;1&gt;;</div><div class='ctx'> 			qcom,ee = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		usb1_phy: usb-phy@f9a55000 {</div><div class='add'>+			compatible = "qcom,usb-otg-snps";</div><div class='add'>+</div><div class='add'>+			reg = &lt;0xf9a55000 0x400&gt;;</div><div class='add'>+			interrupts-extended = &lt;&amp;intc 0 134 0&gt;, &lt;&amp;intc 0 140 0&gt;,</div><div class='add'>+				&lt;&amp;spmi_bus 0 0x9 0 0&gt;;</div><div class='add'>+			interrupt-names = "core_irq", "async_irq", "pmic_id_irq";</div><div class='add'>+</div><div class='add'>+			vddcx-supply = &lt;&amp;pm8841_s2&gt;;</div><div class='add'>+			v3p3-supply = &lt;&amp;pm8941_l24&gt;;</div><div class='add'>+			v1p8-supply = &lt;&amp;pm8941_l6&gt;;</div><div class='add'>+</div><div class='add'>+			dr_mode = "otg";</div><div class='add'>+			qcom,phy-init-sequence = &lt;0x63 0x81 0xfffffff&gt;;</div><div class='add'>+			qcom,otg-control = &lt;1&gt;;</div><div class='add'>+			qcom,phy-num = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			resets = &lt;&amp;gcc GCC_USB2A_PHY_BCR&gt;, &lt;&amp;gcc GCC_USB_HS_BCR&gt;;</div><div class='add'>+			reset-names = "phy", "link";</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;gcc GCC_XO_CLK&gt;, &lt;&amp;gcc GCC_USB_HS_SYSTEM_CLK&gt;,</div><div class='add'>+				&lt;&amp;gcc GCC_USB_HS_AHB_CLK&gt;;</div><div class='add'>+			clock-names = "phy", "core", "iface";</div><div class='add'>+</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb@f9a55000 {</div><div class='add'>+			compatible = "qcom,ci-hdrc";</div><div class='add'>+			reg = &lt;0xf9a55000 0x400&gt;;</div><div class='add'>+			dr_mode = "otg";</div><div class='add'>+			interrupts = &lt;0 134 0&gt;, &lt;0 140 0&gt;;</div><div class='add'>+			interrupt-names = "core_irq", "async_irq";</div><div class='add'>+			usb-phy = &lt;&amp;usb1_phy&gt;;</div><div class='add'>+</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	smd {</div><div class='ctx'> 		compatible = "qcom,smd";</div><div class='ctx'> </div><div class='add'>+		adsp {</div><div class='add'>+			interrupts = &lt;0 156 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+</div><div class='add'>+			qcom,ipc = &lt;&amp;apcs 8 8&gt;;</div><div class='add'>+			qcom,smd-edge = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		modem {</div><div class='ctx'> 			interrupts = &lt;0 25 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/r7s72100-rskrza1.dts b/arch/arm/boot/dts/r7s72100-rskrza1.dts<br/>index e5dea5bb4032..02b59c5b3c53 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r7s72100-rskrza1.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r7s72100-rskrza1.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r7s72100-rskrza1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r7s72100-rskrza1.dts</a></div><div class='hunk'>@@ -56,6 +56,19 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;sdhi1 {</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ostm0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ostm1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;scif2 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi<br/>index fb9ef9ca120e..b8aa256bd515 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r7s72100.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r7s72100.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r7s72100.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r7s72100.dtsi</a></div><div class='hunk'>@@ -108,6 +108,15 @@</div><div class='ctx'> 			clock-output-names = "scif0", "scif1", "scif2", "scif3", "scif4", "scif5", "scif6", "scif7";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		mstp5_clks: mstp5_clks@fcfe0428 {</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";</div><div class='add'>+			reg = &lt;0xfcfe0428 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;p0_clk&gt;, &lt;&amp;p0_clk&gt;;</div><div class='add'>+			clock-indices = &lt;R7S72100_CLK_OSTM0 R7S72100_CLK_OSTM1&gt;;</div><div class='add'>+			clock-output-names = "ostm0", "ostm1";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		mstp7_clks: mstp7_clks@fcfe0430 {</div><div class='ctx'> 			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";</div><div class='hunk'>@@ -117,6 +126,15 @@</div><div class='ctx'> 			clock-output-names = "ether";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		mstp8_clks: mstp8_clks@fcfe0434 {</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";</div><div class='add'>+			reg = &lt;0xfcfe0434 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;p1_clk&gt;;</div><div class='add'>+			clock-indices = &lt;R7S72100_CLK_MMCIF&gt;;</div><div class='add'>+			clock-output-names = "mmcif";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		mstp9_clks: mstp9_clks@fcfe0438 {</div><div class='ctx'> 			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";</div><div class='hunk'>@@ -140,6 +158,14 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 			clock-output-names = "spi0", "spi1", "spi2", "spi3", "spi4";</div><div class='ctx'> 		};</div><div class='add'>+		mstp12_clks: mstp12_clks@fcfe0444 {</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";</div><div class='add'>+			reg = &lt;0xfcfe0444 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;p1_clk&gt;, &lt;&amp;p1_clk&gt;;</div><div class='add'>+			clock-indices = &lt;R7S72100_CLK_SDHI1 R7S72100_CLK_SDHI0&gt;;</div><div class='add'>+			clock-output-names = "sdhi1", "sdhi0";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='hunk'>@@ -441,4 +467,61 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	mmcif: mmc@e804c800 {</div><div class='add'>+		compatible = "renesas,mmcif-r7s72100", "renesas,sh-mmcif";</div><div class='add'>+		reg = &lt;0xe804c800 0x80&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+			      GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+			      GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;mstp8_clks R7S72100_CLK_MMCIF&gt;;</div><div class='add'>+		power-domains = &lt;&amp;cpg_clocks&gt;;</div><div class='add'>+		reg-io-width = &lt;4&gt;;</div><div class='add'>+		bus-width = &lt;8&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi0: sd@e804e000 {</div><div class='add'>+		compatible = "renesas,sdhi-r7s72100";</div><div class='add'>+		reg = &lt;0xe804e000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 270 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+			      GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+			      GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;mstp12_clks R7S72100_CLK_SDHI0&gt;;</div><div class='add'>+		cap-sd-highspeed;</div><div class='add'>+		cap-sdio-irq;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi1: sd@e804e800 {</div><div class='add'>+		compatible = "renesas,sdhi-r7s72100";</div><div class='add'>+		reg = &lt;0xe804e800 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 273 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+			      GIC_SPI 274 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+			      GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;mstp12_clks R7S72100_CLK_SDHI1&gt;;</div><div class='add'>+		cap-sd-highspeed;</div><div class='add'>+		cap-sdio-irq;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ostm0: timer@fcfec000 {</div><div class='add'>+		compatible = "renesas,r7s72100-ostm", "renesas,ostm";</div><div class='add'>+		reg = &lt;0xfcfec000 0x30&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 102 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		clocks = &lt;&amp;mstp5_clks R7S72100_CLK_OSTM0&gt;;</div><div class='add'>+		power-domains = &lt;&amp;cpg_clocks&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ostm1: timer@fcfec400 {</div><div class='add'>+		compatible = "renesas,r7s72100-ostm", "renesas,ostm";</div><div class='add'>+		reg = &lt;0xfcfec400 0x30&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 103 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		clocks = &lt;&amp;mstp5_clks R7S72100_CLK_OSTM1&gt;;</div><div class='add'>+		power-domains = &lt;&amp;cpg_clocks&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi<br/>index ca8672778fe0..00eb9a7114dc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a73a4.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a73a4.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a73a4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a73a4.dtsi</a></div><div class='hunk'>@@ -440,7 +440,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmcif0: mmc@ee200000 {</div><div class='del'>-		compatible = "renesas,sh-mmcif";</div><div class='add'>+		compatible = "renesas,mmcif-r8a73a4", "renesas,sh-mmcif";</div><div class='ctx'> 		reg = &lt;0 0xee200000 0 0x80&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A73A4_CLK_MMCIF0&gt;;</div><div class='hunk'>@@ -450,7 +450,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmcif1: mmc@ee220000 {</div><div class='del'>-		compatible = "renesas,sh-mmcif";</div><div class='add'>+		compatible = "renesas,mmcif-r8a73a4", "renesas,sh-mmcif";</div><div class='ctx'> 		reg = &lt;0 0xee220000 0 0x80&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A73A4_CLK_MMCIF1&gt;;</div><div class='hunk'>@@ -465,7 +465,7 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0 0xf1001000 0 0x1000&gt;,</div><div class='del'>-			&lt;0 0xf1002000 0 0x1000&gt;,</div><div class='add'>+			&lt;0 0xf1002000 0 0x2000&gt;,</div><div class='ctx'> 			&lt;0 0xf1004000 0 0x2000&gt;,</div><div class='ctx'> 			&lt;0 0xf1006000 0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='hunk'>@@ -751,6 +751,11 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	prr: chipid@ff000044 {</div><div class='add'>+		compatible = "renesas,prr";</div><div class='add'>+		reg = &lt;0 0xff000044 0 4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sysc: system-controller@e6180000 {</div><div class='ctx'> 		compatible = "renesas,sysc-r8a73a4", "renesas,sysc-rmobile";</div><div class='ctx'> 		reg = &lt;0 0xe6180000 0 0x8000&gt;, &lt;0 0xe6188000 0 0x8000&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi<br/>index 159e04eb1b9e..34159a8349de 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7740.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7740.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7740.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7740.dtsi</a></div><div class='hunk'>@@ -8,8 +8,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "skeleton.dtsi"</div><div class='del'>-</div><div class='ctx'> #include &lt;dt-bindings/clock/r8a7740-clock.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='hunk'>@@ -17,6 +15,8 @@</div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "renesas,r8a7740";</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts b/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts<br/>new file mode 100644<br/>index 000000000000..3a22538208f2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7743-sk-rzg1m.dts</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for the SK-RZG1M board</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Cogent Embedded, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2. This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "r8a7743.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "SK-RZG1M";</div><div class='add'>+	compatible = "renesas,sk-rzg1m", "renesas,r8a7743";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;scif0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@40000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0 0x40000000 0 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@200000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;2 0x00000000 0 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;extal_clk {</div><div class='add'>+	clock-frequency = &lt;20000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;scif0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ether {</div><div class='add'>+	phy-handle = &lt;&amp;phy1&gt;;</div><div class='add'>+	renesas,ether-link-active-low;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;irqc&gt;;</div><div class='add'>+		interrupts = &lt;0 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		micrel,led-mode = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi<br/>new file mode 100644<br/>index 000000000000..d8393b97768b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7743.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7743.dtsi</a></div><div class='hunk'>@@ -0,0 +1,484 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for the r8a7743 SoC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Cogent Embedded Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2. This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/r8a7743-cpg-mssr.h&gt;</div><div class='add'>+#include &lt;dt-bindings/power/r8a7743-sysc.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "renesas,r8a7743";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a15";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;1500000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_CORE R8A7743_CLK_Z&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_CA15_CPU0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_CA15&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		L2_CA15: cache-controller@0 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			cache-unified;</div><div class='add'>+			cache-level = &lt;2&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_CA15_SCU&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		gic: interrupt-controller@f1001000 {</div><div class='add'>+			compatible = "arm,gic-400";</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			#address-cells = &lt;0&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			reg = &lt;0 0xf1001000 0 0x1000&gt;,</div><div class='add'>+			      &lt;0 0xf1002000 0 0x2000&gt;,</div><div class='add'>+			      &lt;0 0xf1004000 0 0x2000&gt;,</div><div class='add'>+			      &lt;0 0xf1006000 0 0x2000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |</div><div class='add'>+						 IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 408&gt;;</div><div class='add'>+			clock-names = "clk";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		irqc: interrupt-controller@e61c0000 {</div><div class='add'>+			compatible = "renesas,irqc-r8a7743", "renesas,irqc";</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			reg = &lt;0 0xe61c0000 0 0x200&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 407&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer {</div><div class='add'>+			compatible = "arm,armv7-timer";</div><div class='add'>+			interrupts = &lt;GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |</div><div class='add'>+						  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+				     &lt;GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |</div><div class='add'>+						  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+				     &lt;GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) |</div><div class='add'>+						  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+				     &lt;GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) |</div><div class='add'>+						  IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpg: clock-controller@e6150000 {</div><div class='add'>+			compatible = "renesas,r8a7743-cpg-mssr";</div><div class='add'>+			reg = &lt;0 0xe6150000 0 0x1000&gt;;</div><div class='add'>+			clocks = &lt;&amp;extal_clk&gt;, &lt;&amp;usb_extal_clk&gt;;</div><div class='add'>+			clock-names = "extal", "usb_extal";</div><div class='add'>+			#clock-cells = &lt;2&gt;;</div><div class='add'>+			#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		prr: chipid@ff000044 {</div><div class='add'>+			compatible = "renesas,prr";</div><div class='add'>+			reg = &lt;0 0xff000044 0 4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rst: reset-controller@e6160000 {</div><div class='add'>+			compatible = "renesas,r8a7743-rst";</div><div class='add'>+			reg = &lt;0 0xe6160000 0 0x100&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysc: system-controller@e6180000 {</div><div class='add'>+			compatible = "renesas,r8a7743-sysc";</div><div class='add'>+			reg = &lt;0 0xe6180000 0 0x200&gt;;</div><div class='add'>+			#power-domain-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dmac0: dma-controller@e6700000 {</div><div class='add'>+			compatible = "renesas,dmac-r8a7743",</div><div class='add'>+				     "renesas,rcar-dmac";</div><div class='add'>+			reg = &lt;0 0xe6700000 0 0x20000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "error",</div><div class='add'>+					"ch0", "ch1", "ch2", "ch3",</div><div class='add'>+					"ch4", "ch5", "ch6", "ch7",</div><div class='add'>+					"ch8", "ch9", "ch10", "ch11",</div><div class='add'>+					"ch12", "ch13", "ch14";</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 219&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			dma-channels = &lt;15&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dmac1: dma-controller@e6720000 {</div><div class='add'>+			compatible = "renesas,dmac-r8a7743",</div><div class='add'>+				     "renesas,rcar-dmac";</div><div class='add'>+			reg = &lt;0 0xe6720000 0 0x20000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "error",</div><div class='add'>+					"ch0", "ch1", "ch2", "ch3",</div><div class='add'>+					"ch4", "ch5", "ch6", "ch7",</div><div class='add'>+					"ch8", "ch9", "ch10", "ch11",</div><div class='add'>+					"ch12", "ch13", "ch14";</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 218&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			dma-channels = &lt;15&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa0: serial@e6c40000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c40000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 204&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x21&gt;, &lt;&amp;dmac0 0x22&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x21&gt;, &lt;&amp;dmac1 0x22&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa1: serial@e6c50000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c50000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 203&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x25&gt;, &lt;&amp;dmac0 0x26&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x25&gt;, &lt;&amp;dmac1 0x26&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa2: serial@e6c60000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c60000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 202&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x27&gt;, &lt;&amp;dmac0 0x28&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x27&gt;, &lt;&amp;dmac1 0x28&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa3: serial@e6c70000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c70000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 1106&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x1b&gt;, &lt;&amp;dmac0 0x1c&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x1b&gt;, &lt;&amp;dmac1 0x1c&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa4: serial@e6c78000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c78000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 1107&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x1f&gt;, &lt;&amp;dmac0 0x20&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x1f&gt;, &lt;&amp;dmac1 0x20&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa5: serial@e6c80000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c80000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 1108&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x23&gt;, &lt;&amp;dmac0 0x24&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x23&gt;, &lt;&amp;dmac1 0x24&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifb0: serial@e6c20000 {</div><div class='add'>+			compatible = "renesas,scifb-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='add'>+			reg = &lt;0 0xe6c20000 0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 206&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x3d&gt;, &lt;&amp;dmac0 0x3e&gt;,</div><div class='add'>+		       &lt;&amp;dmac1 0x3d&gt;, &lt;&amp;dmac1 0x3e&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifb1: serial@e6c30000 {</div><div class='add'>+			compatible = "renesas,scifb-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='add'>+			reg = &lt;0 0xe6c30000 0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 207&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x19&gt;, &lt;&amp;dmac0 0x1a&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x19&gt;, &lt;&amp;dmac1 0x1a&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifb2: serial@e6ce0000 {</div><div class='add'>+			compatible = "renesas,scifb-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='add'>+			reg = &lt;0 0xe6ce0000 0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 216&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x1d&gt;, &lt;&amp;dmac0 0x1e&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x1d&gt;, &lt;&amp;dmac1 0x1e&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif0: serial@e6e60000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6e60000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 721&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7743_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x29&gt;, &lt;&amp;dmac0 0x2a&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x29&gt;, &lt;&amp;dmac1 0x2a&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif1: serial@e6e68000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6e68000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 720&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7743_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x2d&gt;, &lt;&amp;dmac0 0x2e&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x2d&gt;, &lt;&amp;dmac1 0x2e&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif2: serial@e6e58000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6e58000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 719&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7743_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x2b&gt;, &lt;&amp;dmac0 0x2c&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x2b&gt;, &lt;&amp;dmac1 0x2c&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif3: serial@e6ea8000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6ea8000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 718&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7743_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x2f&gt;, &lt;&amp;dmac0 0x30&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x2f&gt;, &lt;&amp;dmac1 0x30&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif4: serial@e6ee0000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6ee0000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 715&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7743_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0xfb&gt;, &lt;&amp;dmac0 0xfc&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0xfb&gt;, &lt;&amp;dmac1 0xfc&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif5: serial@e6ee8000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6ee8000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 714&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7743_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0xfd&gt;, &lt;&amp;dmac0 0xfe&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0xfd&gt;, &lt;&amp;dmac1 0xfe&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hscif0: serial@e62c0000 {</div><div class='add'>+			compatible = "renesas,hscif-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-hscif", "renesas,hscif";</div><div class='add'>+			reg = &lt;0 0xe62c0000 0 0x60&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 717&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7743_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x39&gt;, &lt;&amp;dmac0 0x3a&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x39&gt;, &lt;&amp;dmac1 0x3a&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hscif1: serial@e62c8000 {</div><div class='add'>+			compatible = "renesas,hscif-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-hscif", "renesas,hscif";</div><div class='add'>+			reg = &lt;0 0xe62c8000 0 0x60&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 716&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7743_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x4d&gt;, &lt;&amp;dmac0 0x4e&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x4d&gt;, &lt;&amp;dmac1 0x4e&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hscif2: serial@e62d0000 {</div><div class='add'>+			compatible = "renesas,hscif-r8a7743",</div><div class='add'>+				     "renesas,rcar-gen2-hscif", "renesas,hscif";</div><div class='add'>+			reg = &lt;0 0xe62d0000 0 0x60&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 713&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7743_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x3b&gt;, &lt;&amp;dmac0 0x3c&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x3b&gt;, &lt;&amp;dmac1 0x3c&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ether: ethernet@ee700000 {</div><div class='add'>+			compatible = "renesas,ether-r8a7743";</div><div class='add'>+			reg = &lt;0 0xee700000 0 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 813&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7743_PD_ALWAYS_ON&gt;;</div><div class='add'>+			phy-mode = "rmii";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* External root clock */</div><div class='add'>+	extal_clk: extal {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		/* This value must be overridden by the board. */</div><div class='add'>+		clock-frequency = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* External USB clock - can be overridden by the board */</div><div class='add'>+	usb_extal_clk: usb_extal {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;48000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* External SCIF clock */</div><div class='add'>+	scif_clk: scif {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		/* This value must be overridden by the board. */</div><div class='add'>+		clock-frequency = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts b/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts<br/>new file mode 100644<br/>index 000000000000..97840b340197<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7745-sk-rzg1e.dts</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for the SK-RZG1E board</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Cogent Embedded, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2. This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "r8a7745.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "SK-RZG1E";</div><div class='add'>+	compatible = "renesas,sk-rzg1e", "renesas,r8a7745";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;scif2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@40000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0 0x40000000 0 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;extal_clk {</div><div class='add'>+	clock-frequency = &lt;20000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;scif2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ether {</div><div class='add'>+	phy-handle = &lt;&amp;phy1&gt;;</div><div class='add'>+	renesas,ether-link-active-low;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;irqc&gt;;</div><div class='add'>+		interrupts = &lt;8 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		micrel,led-mode = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi<br/>new file mode 100644<br/>index 000000000000..1f65ff68a469<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7745.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7745.dtsi</a></div><div class='hunk'>@@ -0,0 +1,484 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for the r8a7745 SoC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Cogent Embedded Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2. This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/r8a7745-cpg-mssr.h&gt;</div><div class='add'>+#include &lt;dt-bindings/power/r8a7745-sysc.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "renesas,r8a7745";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a7";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;1000000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_CORE R8A7745_CLK_Z2&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_CA7_CPU0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_CA7&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		L2_CA7: cache-controller@0 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			cache-unified;</div><div class='add'>+			cache-level = &lt;2&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_CA7_SCU&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		gic: interrupt-controller@f1001000 {</div><div class='add'>+			compatible = "arm,gic-400";</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			#address-cells = &lt;0&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			reg = &lt;0 0xf1001000 0 0x1000&gt;,</div><div class='add'>+			      &lt;0 0xf1002000 0 0x2000&gt;,</div><div class='add'>+			      &lt;0 0xf1004000 0 0x2000&gt;,</div><div class='add'>+			      &lt;0 0xf1006000 0 0x2000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |</div><div class='add'>+						 IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 408&gt;;</div><div class='add'>+			clock-names = "clk";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		irqc: interrupt-controller@e61c0000 {</div><div class='add'>+			compatible = "renesas,irqc-r8a7745", "renesas,irqc";</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			reg = &lt;0 0xe61c0000 0 0x200&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 407&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer {</div><div class='add'>+			compatible = "arm,armv7-timer";</div><div class='add'>+			interrupts = &lt;GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |</div><div class='add'>+						  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+				     &lt;GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |</div><div class='add'>+						  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+				     &lt;GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) |</div><div class='add'>+						  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+				     &lt;GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) |</div><div class='add'>+						  IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpg: clock-controller@e6150000 {</div><div class='add'>+			compatible = "renesas,r8a7745-cpg-mssr";</div><div class='add'>+			reg = &lt;0 0xe6150000 0 0x1000&gt;;</div><div class='add'>+			clocks = &lt;&amp;extal_clk&gt;, &lt;&amp;usb_extal_clk&gt;;</div><div class='add'>+			clock-names = "extal", "usb_extal";</div><div class='add'>+			#clock-cells = &lt;2&gt;;</div><div class='add'>+			#power-domain-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		prr: chipid@ff000044 {</div><div class='add'>+			compatible = "renesas,prr";</div><div class='add'>+			reg = &lt;0 0xff000044 0 4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rst: reset-controller@e6160000 {</div><div class='add'>+			compatible = "renesas,r8a7745-rst";</div><div class='add'>+			reg = &lt;0 0xe6160000 0 0x100&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysc: system-controller@e6180000 {</div><div class='add'>+			compatible = "renesas,r8a7745-sysc";</div><div class='add'>+			reg = &lt;0 0xe6180000 0 0x200&gt;;</div><div class='add'>+			#power-domain-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dmac0: dma-controller@e6700000 {</div><div class='add'>+			compatible = "renesas,dmac-r8a7745",</div><div class='add'>+				     "renesas,rcar-dmac";</div><div class='add'>+			reg = &lt;0 0xe6700000 0 0x20000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "error",</div><div class='add'>+					"ch0", "ch1", "ch2", "ch3",</div><div class='add'>+					"ch4", "ch5", "ch6", "ch7",</div><div class='add'>+					"ch8", "ch9", "ch10", "ch11",</div><div class='add'>+					"ch12", "ch13", "ch14";</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 219&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			dma-channels = &lt;15&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dmac1: dma-controller@e6720000 {</div><div class='add'>+			compatible = "renesas,dmac-r8a7745",</div><div class='add'>+				     "renesas,rcar-dmac";</div><div class='add'>+			reg = &lt;0 0xe6720000 0 0x20000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "error",</div><div class='add'>+					"ch0", "ch1", "ch2", "ch3",</div><div class='add'>+					"ch4", "ch5", "ch6", "ch7",</div><div class='add'>+					"ch8", "ch9", "ch10", "ch11",</div><div class='add'>+					"ch12", "ch13", "ch14";</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 218&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			dma-channels = &lt;15&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa0: serial@e6c40000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c40000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 204&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x21&gt;, &lt;&amp;dmac0 0x22&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x21&gt;, &lt;&amp;dmac1 0x22&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa1: serial@e6c50000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c50000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 203&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x25&gt;, &lt;&amp;dmac0 0x26&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x25&gt;, &lt;&amp;dmac1 0x26&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa2: serial@e6c60000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c60000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 202&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x27&gt;, &lt;&amp;dmac0 0x28&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x27&gt;, &lt;&amp;dmac1 0x28&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa3: serial@e6c70000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c70000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 1106&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x1b&gt;, &lt;&amp;dmac0 0x1c&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x1b&gt;, &lt;&amp;dmac1 0x1c&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa4: serial@e6c78000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c78000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 1107&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x1f&gt;, &lt;&amp;dmac0 0x20&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x1f&gt;, &lt;&amp;dmac1 0x20&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifa5: serial@e6c80000 {</div><div class='add'>+			compatible = "renesas,scifa-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scifa", "renesas,scifa";</div><div class='add'>+			reg = &lt;0 0xe6c80000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 1108&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x23&gt;, &lt;&amp;dmac0 0x24&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x23&gt;, &lt;&amp;dmac1 0x24&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifb0: serial@e6c20000 {</div><div class='add'>+			compatible = "renesas,scifb-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='add'>+			reg = &lt;0 0xe6c20000 0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 206&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x3d&gt;, &lt;&amp;dmac0 0x3e&gt;,</div><div class='add'>+		       &lt;&amp;dmac1 0x3d&gt;, &lt;&amp;dmac1 0x3e&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifb1: serial@e6c30000 {</div><div class='add'>+			compatible = "renesas,scifb-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='add'>+			reg = &lt;0 0xe6c30000 0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 207&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x19&gt;, &lt;&amp;dmac0 0x1a&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x19&gt;, &lt;&amp;dmac1 0x1a&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scifb2: serial@e6ce0000 {</div><div class='add'>+			compatible = "renesas,scifb-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='add'>+			reg = &lt;0 0xe6ce0000 0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 216&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x1d&gt;, &lt;&amp;dmac0 0x1e&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x1d&gt;, &lt;&amp;dmac1 0x1e&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif0: serial@e6e60000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6e60000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 721&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7745_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x29&gt;, &lt;&amp;dmac0 0x2a&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x29&gt;, &lt;&amp;dmac1 0x2a&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif1: serial@e6e68000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6e68000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 720&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7745_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x2d&gt;, &lt;&amp;dmac0 0x2e&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x2d&gt;, &lt;&amp;dmac1 0x2e&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif2: serial@e6e58000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6e58000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 719&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7745_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x2b&gt;, &lt;&amp;dmac0 0x2c&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x2b&gt;, &lt;&amp;dmac1 0x2c&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif3: serial@e6ea8000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6ea8000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 718&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7745_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x2f&gt;, &lt;&amp;dmac0 0x30&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x2f&gt;, &lt;&amp;dmac1 0x30&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif4: serial@e6ee0000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6ee0000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 715&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7745_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0xfb&gt;, &lt;&amp;dmac0 0xfc&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0xfb&gt;, &lt;&amp;dmac1 0xfc&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scif5: serial@e6ee8000 {</div><div class='add'>+			compatible = "renesas,scif-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-scif", "renesas,scif";</div><div class='add'>+			reg = &lt;0 0xe6ee8000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 714&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7745_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0xfd&gt;, &lt;&amp;dmac0 0xfe&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0xfd&gt;, &lt;&amp;dmac1 0xfe&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hscif0: serial@e62c0000 {</div><div class='add'>+			compatible = "renesas,hscif-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-hscif", "renesas,hscif";</div><div class='add'>+			reg = &lt;0 0xe62c0000 0 0x60&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 717&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7745_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x39&gt;, &lt;&amp;dmac0 0x3a&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x39&gt;, &lt;&amp;dmac1 0x3a&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hscif1: serial@e62c8000 {</div><div class='add'>+			compatible = "renesas,hscif-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-hscif", "renesas,hscif";</div><div class='add'>+			reg = &lt;0 0xe62c8000 0 0x60&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 716&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7745_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x4d&gt;, &lt;&amp;dmac0 0x4e&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x4d&gt;, &lt;&amp;dmac1 0x4e&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hscif2: serial@e62d0000 {</div><div class='add'>+			compatible = "renesas,hscif-r8a7745",</div><div class='add'>+				     "renesas,rcar-gen2-hscif", "renesas,hscif";</div><div class='add'>+			reg = &lt;0 0xe62d0000 0 0x60&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 713&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_CORE R8A7745_CLK_ZS&gt;, &lt;&amp;scif_clk&gt;;</div><div class='add'>+			clock-names = "fck", "brg_int", "scif_clk";</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x3b&gt;, &lt;&amp;dmac0 0x3c&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x3b&gt;, &lt;&amp;dmac1 0x3c&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ether: ethernet@ee700000 {</div><div class='add'>+			compatible = "renesas,ether-r8a7745";</div><div class='add'>+			reg = &lt;0 0xee700000 0 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 813&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7745_PD_ALWAYS_ON&gt;;</div><div class='add'>+			phy-mode = "rmii";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* External root clock */</div><div class='add'>+	extal_clk: extal {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		/* This value must be overridden by the board. */</div><div class='add'>+		clock-frequency = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* External USB clock - can be overridden by the board */</div><div class='add'>+	usb_extal_clk: usb_extal {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;48000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* External SCIF clock */</div><div class='add'>+	scif_clk: scif {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		/* This value must be overridden by the board. */</div><div class='add'>+		clock-frequency = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi<br/>index e571d66ea0fe..1e93c94a9eac 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7778.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7778.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7778.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7778.dtsi</a></div><div class='hunk'>@@ -14,8 +14,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "skeleton.dtsi"</div><div class='del'>-</div><div class='ctx'> #include &lt;dt-bindings/clock/r8a7778-clock.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='hunk'>@@ -23,6 +21,8 @@</div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "renesas,r8a7778";</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -150,7 +150,7 @@</div><div class='ctx'> 	i2c0: i2c@ffc70000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7778";</div><div class='add'>+		compatible = "renesas,i2c-r8a7778", "renesas,rcar-gen1-i2c";</div><div class='ctx'> 		reg = &lt;0xffc70000 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp0_clks R8A7778_CLK_I2C0&gt;;</div><div class='hunk'>@@ -161,7 +161,7 @@</div><div class='ctx'> 	i2c1: i2c@ffc71000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7778";</div><div class='add'>+		compatible = "renesas,i2c-r8a7778", "renesas,rcar-gen1-i2c";</div><div class='ctx'> 		reg = &lt;0xffc71000 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp0_clks R8A7778_CLK_I2C1&gt;;</div><div class='hunk'>@@ -172,7 +172,7 @@</div><div class='ctx'> 	i2c2: i2c@ffc72000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7778";</div><div class='add'>+		compatible = "renesas,i2c-r8a7778", "renesas,rcar-gen1-i2c";</div><div class='ctx'> 		reg = &lt;0xffc72000 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp0_clks R8A7778_CLK_I2C2&gt;;</div><div class='hunk'>@@ -183,7 +183,7 @@</div><div class='ctx'> 	i2c3: i2c@ffc73000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7778";</div><div class='add'>+		compatible = "renesas,i2c-r8a7778", "renesas,rcar-gen1-i2c";</div><div class='ctx'> 		reg = &lt;0xffc73000 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp0_clks R8A7778_CLK_I2C3&gt;;</div><div class='hunk'>@@ -369,7 +369,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmcif: mmc@ffe4e000 {</div><div class='del'>-		compatible = "renesas,sh-mmcif";</div><div class='add'>+		compatible = "renesas,mmcif-r8a7778", "renesas,sh-mmcif";</div><div class='ctx'> 		reg = &lt;0xffe4e000 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A7778_CLK_MMC&gt;;</div><div class='hunk'>@@ -626,4 +626,9 @@</div><div class='ctx'> 				"sru-src6", "sru-src7", "sru-src8";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	rst: reset-controller@ffcc0000 {</div><div class='add'>+		compatible = "renesas,r8a7778-reset-wdt";</div><div class='add'>+		reg = &lt;0xffcc0000 0x40&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts<br/>index 541678df90a9..89c5b24a3d03 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7779-marzen.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7779-marzen.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7779-marzen.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7779-marzen.dts</a></div><div class='hunk'>@@ -170,7 +170,7 @@</div><div class='ctx'> </div><div class='ctx'> 	du_pins: du {</div><div class='ctx'> 		du0 {</div><div class='del'>-			groups = "du0_rgb888", "du0_sync_1", "du0_clk_out_0";</div><div class='add'>+			groups = "du0_rgb888", "du0_sync_1", "du0_clk_out_0", "du0_clk_in";</div><div class='ctx'> 			function = "du0";</div><div class='ctx'> 		};</div><div class='ctx'> 		du1 {</div><div class='hunk'>@@ -216,6 +216,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;sata {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;scif2 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;scif2_pins&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi<br/>index b9bbcce69dfb..ae2d9a9c65af 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7779.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7779.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7779.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7779.dtsi</a></div><div class='hunk'>@@ -9,8 +9,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "skeleton.dtsi"</div><div class='del'>-</div><div class='ctx'> #include &lt;dt-bindings/clock/r8a7779-clock.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='hunk'>@@ -19,6 +17,8 @@</div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "renesas,r8a7779";</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -173,7 +173,7 @@</div><div class='ctx'> 	i2c0: i2c@ffc70000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7779";</div><div class='add'>+		compatible = "renesas,i2c-r8a7779", "renesas,rcar-gen1-i2c";</div><div class='ctx'> 		reg = &lt;0xffc70000 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp0_clks R8A7779_CLK_I2C0&gt;;</div><div class='hunk'>@@ -184,7 +184,7 @@</div><div class='ctx'> 	i2c1: i2c@ffc71000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7779";</div><div class='add'>+		compatible = "renesas,i2c-r8a7779", "renesas,rcar-gen1-i2c";</div><div class='ctx'> 		reg = &lt;0xffc71000 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp0_clks R8A7779_CLK_I2C1&gt;;</div><div class='hunk'>@@ -195,7 +195,7 @@</div><div class='ctx'> 	i2c2: i2c@ffc72000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7779";</div><div class='add'>+		compatible = "renesas,i2c-r8a7779", "renesas,rcar-gen1-i2c";</div><div class='ctx'> 		reg = &lt;0xffc72000 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp0_clks R8A7779_CLK_I2C2&gt;;</div><div class='hunk'>@@ -206,7 +206,7 @@</div><div class='ctx'> 	i2c3: i2c@ffc73000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7779";</div><div class='add'>+		compatible = "renesas,i2c-r8a7779", "renesas,rcar-gen1-i2c";</div><div class='ctx'> 		reg = &lt;0xffc73000 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp0_clks R8A7779_CLK_I2C3&gt;;</div><div class='hunk'>@@ -347,6 +347,7 @@</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp1_clks R8A7779_CLK_SATA&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;sysc R8A7779_PD_ALWAYS_ON&gt;;</div><div class='add'>+		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhi0: sd@ffe4c000 {</div><div class='hunk'>@@ -420,7 +421,7 @@</div><div class='ctx'> </div><div class='ctx'> 	du: display@fff80000 {</div><div class='ctx'> 		compatible = "renesas,du-r8a7779";</div><div class='del'>-		reg = &lt;0 0xfff80000 0 0x40000&gt;;</div><div class='add'>+		reg = &lt;0xfff80000 0x40000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp1_clks R8A7779_CLK_DU&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;sysc R8A7779_PD_ALWAYS_ON&gt;;</div><div class='hunk'>@@ -590,6 +591,16 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	prr: chipid@ff000044 {</div><div class='add'>+		compatible = "renesas,prr";</div><div class='add'>+		reg = &lt;0xff000044 4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rst: reset-controller@ffcc0000 {</div><div class='add'>+		compatible = "renesas,r8a7779-reset-wdt";</div><div class='add'>+		reg = &lt;0xffcc0000 0x48&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sysc: system-controller@ffd85000 {</div><div class='ctx'> 		compatible = "renesas,r8a7779-sysc";</div><div class='ctx'> 		reg = &lt;0xffd85000 0x0200&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts<br/>index 52b56fcaddf2..bd512c86e852 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7790-lager.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7790-lager.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7790-lager.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7790-lager.dts</a></div><div class='hunk'>@@ -50,7 +50,9 @@</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial0 = &amp;scif0;</div><div class='ctx'> 		serial1 = &amp;scifa1;</div><div class='del'>-		i2c8 = "i2cexio";</div><div class='add'>+		i2c8 = &amp;gpioi2c1;</div><div class='add'>+		i2c10 = &amp;i2cexio0;</div><div class='add'>+		i2c11 = &amp;i2cexio1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='hunk'>@@ -231,12 +233,23 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	hdmi-in {</div><div class='add'>+		compatible = "hdmi-connector";</div><div class='add'>+		type = "a";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			hdmi_con_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;adv7612_in&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	hdmi-out {</div><div class='ctx'> 		compatible = "hdmi-connector";</div><div class='ctx'> 		type = "a";</div><div class='ctx'> </div><div class='ctx'> 		port {</div><div class='del'>-			hdmi_con: endpoint {</div><div class='add'>+			hdmi_con_out: endpoint {</div><div class='ctx'> 				remote-endpoint = &lt;&amp;adv7511_out&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -254,6 +267,17 @@</div><div class='ctx'> 		clock-frequency = &lt;148500000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	gpioi2c1: i2c-8 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "i2c-gpio";</div><div class='add'>+		status = "disabled";</div><div class='add'>+		gpios = &lt;&amp;gpio1 17 GPIO_ACTIVE_HIGH /* sda */</div><div class='add'>+			 &amp;gpio1 16 GPIO_ACTIVE_HIGH /* scl */</div><div class='add'>+			&gt;;</div><div class='add'>+		i2c-gpio,delay-us = &lt;5&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * IIC0/I2C0 is routed to EXIO connector A, pins 114 (SCL) + 116 (SDA) only.</div><div class='ctx'> 	 * We use the I2C demuxer, so the desired IP core can be selected at runtime</div><div class='hunk'>@@ -262,11 +286,26 @@</div><div class='ctx'> 	 * bus with IIC3 on pins 110 (SCL) + 112 (SDA), select I2C0 at runtime, and</div><div class='ctx'> 	 * instantiate the slave device at runtime according to the documentation.</div><div class='ctx'> 	 * You can then communicate with the slave via IIC3.</div><div class='add'>+	 *</div><div class='add'>+	 * IIC0/I2C0 does not appear to support fallback to GPIO.</div><div class='ctx'> 	 */</div><div class='del'>-	i2cexio: i2c-8 {</div><div class='add'>+	i2cexio0: i2c-10 {</div><div class='ctx'> 		compatible = "i2c-demux-pinctrl";</div><div class='ctx'> 		i2c-parent = &lt;&amp;iic0&gt;, &lt;&amp;i2c0&gt;;</div><div class='del'>-		i2c-bus-name = "i2c-exio";</div><div class='add'>+		i2c-bus-name = "i2c-exio0";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IIC1/I2C1 is routed to EXIO connector A, pins 78 (SCL) + 80 (SDA).</div><div class='add'>+	 * This is similar to the arangement described for i2cexio0 (above)</div><div class='add'>+	 * with a fallback to GPIO also provided.</div><div class='add'>+	 */</div><div class='add'>+	i2cexio1: i2c-11 {</div><div class='add'>+		compatible = "i2c-demux-pinctrl";</div><div class='add'>+		i2c-parent = &lt;&amp;iic1&gt;, &lt;&amp;i2c1&gt;, &lt;&amp;gpioi2c1&gt;;</div><div class='add'>+		i2c-bus-name = "i2c-exio1";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -392,6 +431,11 @@</div><div class='ctx'> 		function = "iic0";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	i2c1_pins: i2c1 {</div><div class='add'>+		groups = "i2c1";</div><div class='add'>+		function = "i2c1";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	iic1_pins: iic1 {</div><div class='ctx'> 		groups = "iic1";</div><div class='ctx'> 		function = "iic1";</div><div class='hunk'>@@ -427,6 +471,11 @@</div><div class='ctx'> 		function = "usb2";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	vin0_pins: vin0 {</div><div class='add'>+		groups = "vin0_data24", "vin0_sync", "vin0_clkenb", "vin0_clk";</div><div class='add'>+		function = "vin0";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	vin1_pins: vin1 {</div><div class='ctx'> 		groups = "vin1_data8", "vin1_clk";</div><div class='ctx'> 		function = "vin1";</div><div class='hunk'>@@ -559,6 +608,7 @@</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;vccq_sdhi0&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio3 6 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	sd-uhs-sdr50;</div><div class='add'>+	sd-uhs-sdr104;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -580,18 +630,22 @@</div><div class='ctx'> </div><div class='ctx'> &amp;i2c0	{</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;i2c0_pins&gt;;</div><div class='del'>-	pinctrl-names = "i2c-exio";</div><div class='add'>+	pinctrl-names = "i2c-exio0";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;iic0	{</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;iic0_pins&gt;;</div><div class='del'>-	pinctrl-names = "i2c-exio";</div><div class='add'>+	pinctrl-names = "i2c-exio0";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1	{</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_pins&gt;;</div><div class='add'>+	pinctrl-names = "i2c-exio1";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;iic1	{</div><div class='del'>-	status = "okay";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;iic1_pins&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='add'>+	pinctrl-names = "i2c-exio1";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;iic2	{</div><div class='hunk'>@@ -646,7 +700,34 @@</div><div class='ctx'> 			port@1 {</div><div class='ctx'> 				reg = &lt;1&gt;;</div><div class='ctx'> 				adv7511_out: endpoint {</div><div class='del'>-					remote-endpoint = &lt;&amp;hdmi_con&gt;;</div><div class='add'>+					remote-endpoint = &lt;&amp;hdmi_con_out&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hdmi-in@4c {</div><div class='add'>+		compatible = "adi,adv7612";</div><div class='add'>+		reg = &lt;0x4c&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;20 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		default-input = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				adv7612_in: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;hdmi_con_in&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@2 {</div><div class='add'>+				reg = &lt;2&gt;;</div><div class='add'>+				adv7612_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;vin0ep2&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -722,6 +803,25 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* HDMI video input */</div><div class='add'>+&amp;vin0 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;vin0_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	port {</div><div class='add'>+		vin0ep2: endpoint {</div><div class='add'>+			remote-endpoint = &lt;&amp;adv7612_out&gt;;</div><div class='add'>+			bus-width = &lt;24&gt;;</div><div class='add'>+			hsync-active = &lt;0&gt;;</div><div class='add'>+			vsync-active = &lt;0&gt;;</div><div class='add'>+			pclk-sample = &lt;1&gt;;</div><div class='add'>+			data-active = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* composite video input */</div><div class='ctx'> &amp;vin1 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;vin1_pins&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi<br/>index 351fcc2f87df..6d10450de6d7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7790.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7790.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7790.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7790.dtsi</a></div><div class='hunk'>@@ -183,7 +183,7 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0 0xf1001000 0 0x1000&gt;,</div><div class='del'>-			&lt;0 0xf1002000 0 0x1000&gt;,</div><div class='add'>+			&lt;0 0xf1002000 0 0x2000&gt;,</div><div class='ctx'> 			&lt;0 0xf1004000 0 0x2000&gt;,</div><div class='ctx'> 			&lt;0 0xf1006000 0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='hunk'>@@ -480,7 +480,7 @@</div><div class='ctx'> 	i2c0: i2c@e6508000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7790";</div><div class='add'>+		compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6508000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7790_CLK_I2C0&gt;;</div><div class='hunk'>@@ -492,7 +492,7 @@</div><div class='ctx'> 	i2c1: i2c@e6518000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7790";</div><div class='add'>+		compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6518000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7790_CLK_I2C1&gt;;</div><div class='hunk'>@@ -504,7 +504,7 @@</div><div class='ctx'> 	i2c2: i2c@e6530000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7790";</div><div class='add'>+		compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6530000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7790_CLK_I2C2&gt;;</div><div class='hunk'>@@ -516,7 +516,7 @@</div><div class='ctx'> 	i2c3: i2c@e6540000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7790";</div><div class='add'>+		compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6540000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7790_CLK_I2C3&gt;;</div><div class='hunk'>@@ -528,7 +528,8 @@</div><div class='ctx'> 	iic0: i2c@e6500000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,iic-r8a7790", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe6500000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A7790_CLK_IIC0&gt;;</div><div class='hunk'>@@ -542,7 +543,8 @@</div><div class='ctx'> 	iic1: i2c@e6510000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,iic-r8a7790", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe6510000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A7790_CLK_IIC1&gt;;</div><div class='hunk'>@@ -556,7 +558,8 @@</div><div class='ctx'> 	iic2: i2c@e6520000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,iic-r8a7790", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe6520000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A7790_CLK_IIC2&gt;;</div><div class='hunk'>@@ -570,7 +573,8 @@</div><div class='ctx'> 	iic3: i2c@e60b0000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,iic-r8a7790", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe60b0000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7790_CLK_IICDVFS&gt;;</div><div class='hunk'>@@ -711,7 +715,7 @@</div><div class='ctx'> 	scifb0: serial@e6c20000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7790",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6c20000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6c20000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7790_CLK_SCIFB0&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -725,7 +729,7 @@</div><div class='ctx'> 	scifb1: serial@e6c30000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7790",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6c30000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6c30000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7790_CLK_SCIFB1&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -739,7 +743,7 @@</div><div class='ctx'> 	scifb2: serial@e6ce0000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7790",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6ce0000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6ce0000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7790_CLK_SCIFB2&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -883,7 +887,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usbphy: usb-phy@e6590100 {</div><div class='del'>-		compatible = "renesas,usb-phy-r8a7790";</div><div class='add'>+		compatible = "renesas,usb-phy-r8a7790",</div><div class='add'>+			     "renesas,rcar-gen2-usb-phy";</div><div class='ctx'> 		reg = &lt;0 0xe6590100 0 0x100&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -1471,6 +1476,16 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	prr: chipid@ff000044 {</div><div class='add'>+		compatible = "renesas,prr";</div><div class='add'>+		reg = &lt;0 0xff000044 0 4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rst: reset-controller@e6160000 {</div><div class='add'>+		compatible = "renesas,r8a7790-rst";</div><div class='add'>+		reg = &lt;0 0xe6160000 0 0x0100&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sysc: system-controller@e6180000 {</div><div class='ctx'> 		compatible = "renesas,r8a7790-sysc";</div><div class='ctx'> 		reg = &lt;0 0xe6180000 0 0x0200&gt;;</div><div class='hunk'>@@ -1493,7 +1508,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	msiof0: spi@e6e20000 {</div><div class='del'>-		compatible = "renesas,msiof-r8a7790";</div><div class='add'>+		compatible = "renesas,msiof-r8a7790",</div><div class='add'>+			     "renesas,rcar-gen2-msiof";</div><div class='ctx'> 		reg = &lt;0 0xe6e20000 0 0x0064&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp0_clks R8A7790_CLK_MSIOF0&gt;;</div><div class='hunk'>@@ -1507,7 +1523,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	msiof1: spi@e6e10000 {</div><div class='del'>-		compatible = "renesas,msiof-r8a7790";</div><div class='add'>+		compatible = "renesas,msiof-r8a7790",</div><div class='add'>+			     "renesas,rcar-gen2-msiof";</div><div class='ctx'> 		reg = &lt;0 0xe6e10000 0 0x0064&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7790_CLK_MSIOF1&gt;;</div><div class='hunk'>@@ -1521,7 +1538,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	msiof2: spi@e6e00000 {</div><div class='del'>-		compatible = "renesas,msiof-r8a7790";</div><div class='add'>+		compatible = "renesas,msiof-r8a7790",</div><div class='add'>+			     "renesas,rcar-gen2-msiof";</div><div class='ctx'> 		reg = &lt;0 0xe6e00000 0 0x0064&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7790_CLK_MSIOF2&gt;;</div><div class='hunk'>@@ -1535,7 +1553,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	msiof3: spi@e6c90000 {</div><div class='del'>-		compatible = "renesas,msiof-r8a7790";</div><div class='add'>+		compatible = "renesas,msiof-r8a7790",</div><div class='add'>+			     "renesas,rcar-gen2-msiof";</div><div class='ctx'> 		reg = &lt;0 0xe6c90000 0 0x0064&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7790_CLK_MSIOF3&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts<br/>index f8a7d090fd01..5405d337d744 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7791-koelsch.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7791-koelsch.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7791-koelsch.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7791-koelsch.dts</a></div><div class='hunk'>@@ -50,6 +50,8 @@</div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial0 = &amp;scif0;</div><div class='ctx'> 		serial1 = &amp;scif1;</div><div class='add'>+		i2c9 = &amp;gpioi2c1;</div><div class='add'>+		i2c12 = &amp;i2cexio1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='hunk'>@@ -265,12 +267,23 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	hdmi-in {</div><div class='add'>+		compatible = "hdmi-connector";</div><div class='add'>+		type = "a";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			hdmi_con_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;adv7612_in&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	hdmi-out {</div><div class='ctx'> 		compatible = "hdmi-connector";</div><div class='ctx'> 		type = "a";</div><div class='ctx'> </div><div class='ctx'> 		port {</div><div class='del'>-			hdmi_con: endpoint {</div><div class='add'>+			hdmi_con_out: endpoint {</div><div class='ctx'> 				remote-endpoint = &lt;&amp;adv7511_out&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -287,6 +300,29 @@</div><div class='ctx'> 		#clock-cells = &lt;0&gt;;</div><div class='ctx'> 		clock-frequency = &lt;148500000&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	gpioi2c1: i2c-9 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "i2c-gpio";</div><div class='add'>+		status = "disabled";</div><div class='add'>+		gpios = &lt;&amp;gpio7 16 GPIO_ACTIVE_HIGH /* sda */</div><div class='add'>+			 &amp;gpio7 15 GPIO_ACTIVE_HIGH /* scl */</div><div class='add'>+			&gt;;</div><div class='add'>+		i2c-gpio,delay-us = &lt;5&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * I2C1 is routed to EXIO connector B, pins 64 (SCL) + 66 (SDA).</div><div class='add'>+	 * A fallback to GPIO is provided.</div><div class='add'>+	 */</div><div class='add'>+	i2cexio1: i2c-12 {</div><div class='add'>+		compatible = "i2c-demux-pinctrl";</div><div class='add'>+		i2c-parent = &lt;&amp;i2c1&gt;, &lt;&amp;gpioi2c1&gt;;</div><div class='add'>+		i2c-bus-name = "i2c-exio1";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;du {</div><div class='hunk'>@@ -322,6 +358,11 @@</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;scif_clk_pins&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> </div><div class='add'>+	i2c1_pins: i2c1 {</div><div class='add'>+		groups = "i2c1";</div><div class='add'>+		function = "i2c1";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	i2c2_pins: i2c2 {</div><div class='ctx'> 		groups = "i2c2";</div><div class='ctx'> 		function = "i2c2";</div><div class='hunk'>@@ -360,16 +401,37 @@</div><div class='ctx'> 	sdhi0_pins: sd0 {</div><div class='ctx'> 		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='ctx'> 		function = "sdhi0";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi0_pins_uhs: sd0_uhs {</div><div class='add'>+		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='add'>+		function = "sdhi0";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhi1_pins: sd1 {</div><div class='ctx'> 		groups = "sdhi1_data4", "sdhi1_ctrl";</div><div class='ctx'> 		function = "sdhi1";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi1_pins_uhs: sd1_uhs {</div><div class='add'>+		groups = "sdhi1_data4", "sdhi1_ctrl";</div><div class='add'>+		function = "sdhi1";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhi2_pins: sd2 {</div><div class='ctx'> 		groups = "sdhi2_data4", "sdhi2_ctrl";</div><div class='ctx'> 		function = "sdhi2";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi2_pins_uhs: sd2_uhs {</div><div class='add'>+		groups = "sdhi2_data4", "sdhi2_ctrl";</div><div class='add'>+		function = "sdhi2";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	qspi_pins: qspi {</div><div class='hunk'>@@ -393,6 +455,11 @@</div><div class='ctx'> 		function = "usb1";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	vin0_pins: vin0 {</div><div class='add'>+		groups = "vin0_data24", "vin0_sync", "vin0_clkenb", "vin0_clk";</div><div class='add'>+		function = "vin0";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	vin1_pins: vin1 {</div><div class='ctx'> 		groups = "vin1_data8", "vin1_clk";</div><div class='ctx'> 		function = "vin1";</div><div class='hunk'>@@ -454,33 +521,40 @@</div><div class='ctx'> </div><div class='ctx'> &amp;sdhi0 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sdhi0_pins&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi0_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='ctx'> </div><div class='ctx'> 	vmmc-supply = &lt;&amp;vcc_sdhi0&gt;;</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;vccq_sdhi0&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio6 6 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	wp-gpios = &lt;&amp;gpio6 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	sd-uhs-sdr50;</div><div class='add'>+	sd-uhs-sdr104;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;sdhi1 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sdhi1_pins&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi1_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='ctx'> </div><div class='ctx'> 	vmmc-supply = &lt;&amp;vcc_sdhi1&gt;;</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;vccq_sdhi1&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio6 14 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	wp-gpios = &lt;&amp;gpio6 15 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	sd-uhs-sdr50;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;sdhi2 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sdhi2_pins&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi2_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='ctx'> </div><div class='ctx'> 	vmmc-supply = &lt;&amp;vcc_sdhi2&gt;;</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;vccq_sdhi2&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio6 22 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	sd-uhs-sdr50;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -538,6 +612,11 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_pins&gt;;</div><div class='add'>+	pinctrl-names = "i2c-exio1";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;i2c2 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;i2c2_pins&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='hunk'>@@ -590,7 +669,34 @@</div><div class='ctx'> 			port@1 {</div><div class='ctx'> 				reg = &lt;1&gt;;</div><div class='ctx'> 				adv7511_out: endpoint {</div><div class='del'>-					remote-endpoint = &lt;&amp;hdmi_con&gt;;</div><div class='add'>+					remote-endpoint = &lt;&amp;hdmi_con_out&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hdmi-in@4c {</div><div class='add'>+		compatible = "adi,adv7612";</div><div class='add'>+		reg = &lt;0x4c&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio4&gt;;</div><div class='add'>+		interrupts = &lt;2 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		default-input = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				adv7612_in: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;hdmi_con_in&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@2 {</div><div class='add'>+				reg = &lt;2&gt;;</div><div class='add'>+				adv7612_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;vin0ep2&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -672,6 +778,27 @@</div><div class='ctx'> 	cpu0-supply = &lt;&amp;vdd_dvfs&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* HDMI video input */</div><div class='add'>+&amp;vin0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;vin0_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	port {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		vin0ep2: endpoint {</div><div class='add'>+			remote-endpoint = &lt;&amp;adv7612_out&gt;;</div><div class='add'>+			bus-width = &lt;24&gt;;</div><div class='add'>+			hsync-active = &lt;0&gt;;</div><div class='add'>+			vsync-active = &lt;0&gt;;</div><div class='add'>+			pclk-sample = &lt;1&gt;;</div><div class='add'>+			data-active = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* composite video input */</div><div class='ctx'> &amp;vin1 {</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi<br/>index 162b55c665a3..9f9e48511836 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7791.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7791.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7791.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7791.dtsi</a></div><div class='hunk'>@@ -114,7 +114,7 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0 0xf1001000 0 0x1000&gt;,</div><div class='del'>-			&lt;0 0xf1002000 0 0x1000&gt;,</div><div class='add'>+			&lt;0 0xf1002000 0 0x2000&gt;,</div><div class='ctx'> 			&lt;0 0xf1004000 0 0x2000&gt;,</div><div class='ctx'> 			&lt;0 0xf1006000 0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='hunk'>@@ -444,7 +444,7 @@</div><div class='ctx'> 	i2c0: i2c@e6508000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7791";</div><div class='add'>+		compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6508000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7791_CLK_I2C0&gt;;</div><div class='hunk'>@@ -456,7 +456,7 @@</div><div class='ctx'> 	i2c1: i2c@e6518000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7791";</div><div class='add'>+		compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6518000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7791_CLK_I2C1&gt;;</div><div class='hunk'>@@ -468,7 +468,7 @@</div><div class='ctx'> 	i2c2: i2c@e6530000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7791";</div><div class='add'>+		compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6530000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7791_CLK_I2C2&gt;;</div><div class='hunk'>@@ -480,7 +480,7 @@</div><div class='ctx'> 	i2c3: i2c@e6540000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7791";</div><div class='add'>+		compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6540000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7791_CLK_I2C3&gt;;</div><div class='hunk'>@@ -492,7 +492,7 @@</div><div class='ctx'> 	i2c4: i2c@e6520000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7791";</div><div class='add'>+		compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6520000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7791_CLK_I2C4&gt;;</div><div class='hunk'>@@ -505,7 +505,7 @@</div><div class='ctx'> 		/* doesn't need pinmux */</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7791";</div><div class='add'>+		compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6528000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7791_CLK_I2C5&gt;;</div><div class='hunk'>@@ -518,7 +518,8 @@</div><div class='ctx'> 		/* doesn't need pinmux */</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,iic-r8a7791", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7791", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe60b0000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7791_CLK_IICDVFS&gt;;</div><div class='hunk'>@@ -532,7 +533,8 @@</div><div class='ctx'> 	i2c7: i2c@e6500000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,iic-r8a7791", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7791", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe6500000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A7791_CLK_IIC0&gt;;</div><div class='hunk'>@@ -546,7 +548,8 @@</div><div class='ctx'> 	i2c8: i2c@e6510000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,iic-r8a7791", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7791", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe6510000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A7791_CLK_IIC1&gt;;</div><div class='hunk'>@@ -584,6 +587,7 @@</div><div class='ctx'> 		dmas = &lt;&amp;dmac0 0xcd&gt;, &lt;&amp;dmac0 0xce&gt;,</div><div class='ctx'> 		       &lt;&amp;dmac1 0xcd&gt;, &lt;&amp;dmac1 0xce&gt;;</div><div class='ctx'> 		dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+		max-frequency = &lt;195000000&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;sysc R8A7791_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -596,6 +600,7 @@</div><div class='ctx'> 		dmas = &lt;&amp;dmac0 0xc1&gt;, &lt;&amp;dmac0 0xc2&gt;,</div><div class='ctx'> 		       &lt;&amp;dmac1 0xc1&gt;, &lt;&amp;dmac1 0xc2&gt;;</div><div class='ctx'> 		dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+		max-frequency = &lt;97500000&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;sysc R8A7791_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -608,6 +613,7 @@</div><div class='ctx'> 		dmas = &lt;&amp;dmac0 0xd3&gt;, &lt;&amp;dmac0 0xd4&gt;,</div><div class='ctx'> 		       &lt;&amp;dmac1 0xd3&gt;, &lt;&amp;dmac1 0xd4&gt;;</div><div class='ctx'> 		dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+		max-frequency = &lt;97500000&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;sysc R8A7791_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -699,7 +705,7 @@</div><div class='ctx'> 	scifb0: serial@e6c20000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7791",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6c20000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6c20000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7791_CLK_SCIFB0&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -713,7 +719,7 @@</div><div class='ctx'> 	scifb1: serial@e6c30000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7791",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6c30000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6c30000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7791_CLK_SCIFB1&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -727,7 +733,7 @@</div><div class='ctx'> 	scifb2: serial@e6ce0000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7791",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6ce0000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6ce0000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7791_CLK_SCIFB2&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -931,7 +937,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usbphy: usb-phy@e6590100 {</div><div class='del'>-		compatible = "renesas,usb-phy-r8a7791";</div><div class='add'>+		compatible = "renesas,usb-phy-r8a7791",</div><div class='add'>+			     "renesas,rcar-gen2-usb-phy";</div><div class='ctx'> 		reg = &lt;0 0xe6590100 0 0x100&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -1482,6 +1489,16 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	rst: reset-controller@e6160000 {</div><div class='add'>+		compatible = "renesas,r8a7791-rst";</div><div class='add'>+		reg = &lt;0 0xe6160000 0 0x0100&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	prr: chipid@ff000044 {</div><div class='add'>+		compatible = "renesas,prr";</div><div class='add'>+		reg = &lt;0 0xff000044 0 4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sysc: system-controller@e6180000 {</div><div class='ctx'> 		compatible = "renesas,r8a7791-sysc";</div><div class='ctx'> 		reg = &lt;0 0xe6180000 0 0x0200&gt;;</div><div class='hunk'>@@ -1504,7 +1521,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	msiof0: spi@e6e20000 {</div><div class='del'>-		compatible = "renesas,msiof-r8a7791";</div><div class='add'>+		compatible = "renesas,msiof-r8a7791",</div><div class='add'>+			     "renesas,rcar-gen2-msiof";</div><div class='ctx'> 		reg = &lt;0 0xe6e20000 0 0x0064&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp0_clks R8A7791_CLK_MSIOF0&gt;;</div><div class='hunk'>@@ -1518,7 +1536,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	msiof1: spi@e6e10000 {</div><div class='del'>-		compatible = "renesas,msiof-r8a7791";</div><div class='add'>+		compatible = "renesas,msiof-r8a7791",</div><div class='add'>+			     "renesas,rcar-gen2-msiof";</div><div class='ctx'> 		reg = &lt;0 0xe6e10000 0 0x0064&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7791_CLK_MSIOF1&gt;;</div><div class='hunk'>@@ -1532,7 +1551,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	msiof2: spi@e6e00000 {</div><div class='del'>-		compatible = "renesas,msiof-r8a7791";</div><div class='add'>+		compatible = "renesas,msiof-r8a7791",</div><div class='add'>+			     "renesas,rcar-gen2-msiof";</div><div class='ctx'> 		reg = &lt;0 0xe6e00000 0 0x0064&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7791_CLK_MSIOF2&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7792-wheat.dts b/arch/arm/boot/dts/r8a7792-wheat.dts<br/>index 6dbb94114a93..c24f26fdab1f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7792-wheat.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7792-wheat.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7792-wheat.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7792-wheat.dts</a></div><div class='hunk'>@@ -86,6 +86,34 @@</div><div class='ctx'> 		gpio = &lt;&amp;gpio11 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		enable-active-high;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	hdmi-out0 {</div><div class='add'>+		compatible = "hdmi-connector";</div><div class='add'>+		type = "a";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			hdmi_con0: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;adv7513_0_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hdmi-out1 {</div><div class='add'>+		compatible = "hdmi-connector";</div><div class='add'>+		type = "a";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			hdmi_con1: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;adv7513_1_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	osc2_clk: osc2 {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;74250000&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;extal_clk {</div><div class='hunk'>@@ -128,6 +156,16 @@</div><div class='ctx'> 		groups = "qspi_ctrl", "qspi_data4";</div><div class='ctx'> 		function = "qspi";</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	du0_pins: du0 {</div><div class='add'>+		groups = "du0_rgb888", "du0_sync", "du0_disp";</div><div class='add'>+		function = "du0";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	du1_pins: du1 {</div><div class='add'>+		groups = "du1_rgb666", "du1_sync", "du1_disp";</div><div class='add'>+		function = "du1";</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;scif0 {</div><div class='hunk'>@@ -197,3 +235,91 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;i2c4 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	clock-frequency = &lt;400000&gt;;</div><div class='add'>+</div><div class='add'>+	hdmi@3d {</div><div class='add'>+		compatible = "adi,adv7513";</div><div class='add'>+		reg = &lt;0x3d&gt;;</div><div class='add'>+</div><div class='add'>+		adi,input-depth = &lt;8&gt;;</div><div class='add'>+		adi,input-colorspace = "rgb";</div><div class='add'>+		adi,input-clock = "1x";</div><div class='add'>+		adi,input-style = &lt;1&gt;;</div><div class='add'>+		adi,input-justification = "evenly";</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				adv7513_0_in: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;du_out_rgb0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				adv7513_0_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;hdmi_con0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hdmi@39 {</div><div class='add'>+		compatible = "adi,adv7513";</div><div class='add'>+		reg = &lt;0x39&gt;;</div><div class='add'>+</div><div class='add'>+		adi,input-depth = &lt;8&gt;;</div><div class='add'>+		adi,input-colorspace = "rgb";</div><div class='add'>+		adi,input-clock = "1x";</div><div class='add'>+		adi,input-style = &lt;1&gt;;</div><div class='add'>+		adi,input-justification = "evenly";</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				adv7513_1_in: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;du_out_rgb1&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				adv7513_1_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;hdmi_con1&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;du {</div><div class='add'>+	pinctrl-0 = &lt;&amp;du0_pins &amp;du1_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	clocks = &lt;&amp;mstp7_clks R8A7792_CLK_DU0&gt;, &lt;&amp;mstp7_clks R8A7792_CLK_DU1&gt;,</div><div class='add'>+		 &lt;&amp;osc2_clk&gt;;</div><div class='add'>+	clock-names = "du.0", "du.1", "dclkin.0";</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	ports {</div><div class='add'>+		port@0 {</div><div class='add'>+			endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;adv7513_0_in&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		port@1 {</div><div class='add'>+			endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;adv7513_1_in&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi<br/>index 713141d38b3e..8ecfda7a004e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7792.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7792.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7792.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7792.dtsi</a></div><div class='hunk'>@@ -26,6 +26,8 @@</div><div class='ctx'> 		i2c4 = &amp;i2c4;</div><div class='ctx'> 		i2c5 = &amp;i2c5;</div><div class='ctx'> 		spi0 = &amp;qspi;</div><div class='add'>+		spi1 = &amp;msiof0;</div><div class='add'>+		spi2 = &amp;msiof1;</div><div class='ctx'> 		vin0 = &amp;vin0;</div><div class='ctx'> 		vin1 = &amp;vin1;</div><div class='ctx'> 		vin2 = &amp;vin2;</div><div class='hunk'>@@ -86,7 +88,7 @@</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			reg = &lt;0 0xf1001000 0 0x1000&gt;,</div><div class='del'>-			      &lt;0 0xf1002000 0 0x1000&gt;,</div><div class='add'>+			      &lt;0 0xf1002000 0 0x2000&gt;,</div><div class='ctx'> 			      &lt;0 0xf1004000 0 0x2000&gt;,</div><div class='ctx'> 			      &lt;0 0xf1006000 0 0x2000&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |</div><div class='hunk'>@@ -118,6 +120,16 @@</div><div class='ctx'> 				      IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		rst: reset-controller@e6160000 {</div><div class='add'>+			compatible = "renesas,r8a7792-rst";</div><div class='add'>+			reg = &lt;0 0xe6160000 0 0x0100&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		prr: chipid@ff000044 {</div><div class='add'>+			compatible = "renesas,prr";</div><div class='add'>+			reg = &lt;0 0xff000044 0 4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		sysc: system-controller@e6180000 {</div><div class='ctx'> 			compatible = "renesas,r8a7792-sysc";</div><div class='ctx'> 			reg = &lt;0 0xe6180000 0 0x0200&gt;;</div><div class='hunk'>@@ -486,7 +498,8 @@</div><div class='ctx'> </div><div class='ctx'> 		/* I2C doesn't need pinmux */</div><div class='ctx'> 		i2c0: i2c@e6508000 {</div><div class='del'>-			compatible = "renesas,i2c-r8a7792";</div><div class='add'>+			compatible = "renesas,i2c-r8a7792",</div><div class='add'>+				     "renesas,rcar-gen2-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe6508000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;mstp9_clks R8A7792_CLK_I2C0&gt;;</div><div class='hunk'>@@ -498,7 +511,8 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c1: i2c@e6518000 {</div><div class='del'>-			compatible = "renesas,i2c-r8a7792";</div><div class='add'>+			compatible = "renesas,i2c-r8a7792",</div><div class='add'>+				     "renesas,rcar-gen2-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe6518000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;mstp9_clks R8A7792_CLK_I2C1&gt;;</div><div class='hunk'>@@ -510,7 +524,8 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c2: i2c@e6530000 {</div><div class='del'>-			compatible = "renesas,i2c-r8a7792";</div><div class='add'>+			compatible = "renesas,i2c-r8a7792",</div><div class='add'>+				     "renesas,rcar-gen2-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe6530000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;mstp9_clks R8A7792_CLK_I2C2&gt;;</div><div class='hunk'>@@ -522,7 +537,8 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c3: i2c@e6540000 {</div><div class='del'>-			compatible = "renesas,i2c-r8a7792";</div><div class='add'>+			compatible = "renesas,i2c-r8a7792",</div><div class='add'>+				     "renesas,rcar-gen2-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe6540000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;mstp9_clks R8A7792_CLK_I2C3&gt;;</div><div class='hunk'>@@ -534,7 +550,8 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c4: i2c@e6520000 {</div><div class='del'>-			compatible = "renesas,i2c-r8a7792";</div><div class='add'>+			compatible = "renesas,i2c-r8a7792",</div><div class='add'>+				     "renesas,rcar-gen2-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe6520000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;mstp9_clks R8A7792_CLK_I2C4&gt;;</div><div class='hunk'>@@ -546,7 +563,8 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c5: i2c@e6528000 {</div><div class='del'>-			compatible = "renesas,i2c-r8a7792";</div><div class='add'>+			compatible = "renesas,i2c-r8a7792",</div><div class='add'>+				     "renesas,rcar-gen2-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe6528000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;mstp9_clks R8A7792_CLK_I2C5&gt;;</div><div class='hunk'>@@ -572,6 +590,36 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		msiof0: spi@e6e20000 {</div><div class='add'>+			compatible = "renesas,msiof-r8a7792",</div><div class='add'>+				     "renesas,rcar-gen2-msiof";</div><div class='add'>+			reg = &lt;0 0xe6e20000 0 0x0064&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;mstp0_clks R8A7792_CLK_MSIOF0&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x51&gt;, &lt;&amp;dmac0 0x52&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x51&gt;, &lt;&amp;dmac1 0x52&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7792_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		msiof1: spi@e6e10000 {</div><div class='add'>+			compatible = "renesas,msiof-r8a7792",</div><div class='add'>+				     "renesas,rcar-gen2-msiof";</div><div class='add'>+			reg = &lt;0 0xe6e10000 0 0x0064&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;mstp2_clks R8A7792_CLK_MSIOF1&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x55&gt;, &lt;&amp;dmac0 0x56&gt;,</div><div class='add'>+			       &lt;&amp;dmac1 0x55&gt;, &lt;&amp;dmac1 0x56&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7792_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		du: display@feb00000 {</div><div class='ctx'> 			compatible = "renesas,du-r8a7792";</div><div class='ctx'> 			reg = &lt;0 0xfeb00000 0 0x40000&gt;;</div><div class='hunk'>@@ -763,6 +811,13 @@</div><div class='ctx'> 			clock-div = &lt;48&gt;;</div><div class='ctx'> 			clock-mult = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='add'>+		mp_clk: mp {</div><div class='add'>+			compatible = "fixed-factor-clock";</div><div class='add'>+			clocks = &lt;&amp;pll1_div2_clk&gt;;</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-div = &lt;15&gt;;</div><div class='add'>+			clock-mult = &lt;1&gt;;</div><div class='add'>+		};</div><div class='ctx'> 		m2_clk: m2 {</div><div class='ctx'> 			compatible = "fixed-factor-clock";</div><div class='ctx'> 			clocks = &lt;&amp;cpg_clocks R8A7792_CLK_PLL1&gt;;</div><div class='hunk'>@@ -793,6 +848,15 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* Gate clocks */</div><div class='add'>+		mstp0_clks: mstp0_clks@e6150130 {</div><div class='add'>+			compatible = "renesas,r8a7792-mstp-clocks",</div><div class='add'>+				     "renesas,cpg-mstp-clocks";</div><div class='add'>+			reg = &lt;0 0xe6150130 0 4&gt;, &lt;0 0xe6150030 0 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;mp_clk&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			clock-indices = &lt;R8A7792_CLK_MSIOF0&gt;;</div><div class='add'>+			clock-output-names = "msiof0";</div><div class='add'>+		};</div><div class='ctx'> 		mstp1_clks: mstp1_clks@e6150134 {</div><div class='ctx'> 			compatible = "renesas,r8a7792-mstp-clocks",</div><div class='ctx'> 				     "renesas,cpg-mstp-clocks";</div><div class='hunk'>@@ -811,12 +875,13 @@</div><div class='ctx'> 			compatible = "renesas,r8a7792-mstp-clocks",</div><div class='ctx'> 				     "renesas,cpg-mstp-clocks";</div><div class='ctx'> 			reg = &lt;0 0xe6150138 0 4&gt;, &lt;0 0xe6150040 0 4&gt;;</div><div class='del'>-			clocks = &lt;&amp;zs_clk&gt;, &lt;&amp;zs_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;mp_clk&gt;, &lt;&amp;zs_clk&gt;, &lt;&amp;zs_clk&gt;;</div><div class='ctx'> 			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 			clock-indices = &lt;</div><div class='add'>+				R8A7792_CLK_MSIOF1</div><div class='ctx'> 				R8A7792_CLK_SYS_DMAC1 R8A7792_CLK_SYS_DMAC0</div><div class='ctx'> 			&gt;;</div><div class='del'>-			clock-output-names = "sys-dmac1", "sys-dmac0";</div><div class='add'>+			clock-output-names = "msiof1", "sys-dmac1", "sys-dmac0";</div><div class='ctx'> 		};</div><div class='ctx'> 		mstp3_clks: mstp3_clks@e615013c {</div><div class='ctx'> 			compatible = "renesas,r8a7792-mstp-clocks",</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts<br/>index 90af18600124..92fff07c5e2b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7793-gose.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7793-gose.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7793-gose.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7793-gose.dts</a></div><div class='hunk'>@@ -346,18 +346,18 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhi0_pins: sd0 {</div><div class='del'>-		renesas,groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='del'>-		renesas,function = "sdhi0";</div><div class='add'>+		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='add'>+		function = "sdhi0";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhi1_pins: sd1 {</div><div class='del'>-		renesas,groups = "sdhi1_data4", "sdhi1_ctrl";</div><div class='del'>-		renesas,function = "sdhi1";</div><div class='add'>+		groups = "sdhi1_data4", "sdhi1_ctrl";</div><div class='add'>+		function = "sdhi1";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhi2_pins: sd2 {</div><div class='del'>-		renesas,groups = "sdhi2_data4", "sdhi2_ctrl";</div><div class='del'>-		renesas,function = "sdhi2";</div><div class='add'>+		groups = "sdhi2_data4", "sdhi2_ctrl";</div><div class='add'>+		function = "sdhi2";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	qspi_pins: qspi {</div><div class='hunk'>@@ -538,6 +538,27 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;i2c6 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+</div><div class='add'>+	pmic@58 {</div><div class='add'>+		compatible = "dlg,da9063";</div><div class='add'>+		reg = &lt;0x58&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;irqc0&gt;;</div><div class='add'>+		interrupts = &lt;2 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+</div><div class='add'>+		rtc {</div><div class='add'>+			compatible = "dlg,da9063-rtc";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wdt {</div><div class='add'>+			compatible = "dlg,da9063-watchdog";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;rcar_sound {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sound_pins &amp;sound_clk_pins&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi<br/>index 8d02aacf2892..48ce21c5e8db 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7793.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7793.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7793.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7793.dtsi</a></div><div class='hunk'>@@ -105,7 +105,7 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0 0xf1001000 0 0x1000&gt;,</div><div class='del'>-			&lt;0 0xf1002000 0 0x1000&gt;,</div><div class='add'>+			&lt;0 0xf1002000 0 0x2000&gt;,</div><div class='ctx'> 			&lt;0 0xf1004000 0 0x2000&gt;,</div><div class='ctx'> 			&lt;0 0xf1006000 0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='hunk'>@@ -411,7 +411,7 @@</div><div class='ctx'> 	i2c0: i2c@e6508000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7793";</div><div class='add'>+		compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6508000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7793_CLK_I2C0&gt;;</div><div class='hunk'>@@ -423,7 +423,7 @@</div><div class='ctx'> 	i2c1: i2c@e6518000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7793";</div><div class='add'>+		compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6518000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7793_CLK_I2C1&gt;;</div><div class='hunk'>@@ -435,7 +435,7 @@</div><div class='ctx'> 	i2c2: i2c@e6530000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7793";</div><div class='add'>+		compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6530000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7793_CLK_I2C2&gt;;</div><div class='hunk'>@@ -447,7 +447,7 @@</div><div class='ctx'> 	i2c3: i2c@e6540000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7793";</div><div class='add'>+		compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6540000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7793_CLK_I2C3&gt;;</div><div class='hunk'>@@ -459,7 +459,7 @@</div><div class='ctx'> 	i2c4: i2c@e6520000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7793";</div><div class='add'>+		compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6520000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7793_CLK_I2C4&gt;;</div><div class='hunk'>@@ -472,7 +472,7 @@</div><div class='ctx'> 		/* doesn't need pinmux */</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,i2c-r8a7793";</div><div class='add'>+		compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6528000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7793_CLK_I2C5&gt;;</div><div class='hunk'>@@ -485,7 +485,8 @@</div><div class='ctx'> 		/* doesn't need pinmux */</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,iic-r8a7793", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7793", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe60b0000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7793_CLK_IICDVFS&gt;;</div><div class='hunk'>@@ -499,7 +500,8 @@</div><div class='ctx'> 	i2c7: i2c@e6500000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,iic-r8a7793", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7793", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe6500000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A7793_CLK_IIC0&gt;;</div><div class='hunk'>@@ -513,7 +515,8 @@</div><div class='ctx'> 	i2c8: i2c@e6510000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "renesas,iic-r8a7793", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7793", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe6510000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A7793_CLK_IIC1&gt;;</div><div class='hunk'>@@ -666,7 +669,7 @@</div><div class='ctx'> 	scifb0: serial@e6c20000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7793",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6c20000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6c20000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7793_CLK_SCIFB0&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -680,7 +683,7 @@</div><div class='ctx'> 	scifb1: serial@e6c30000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7793",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6c30000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6c30000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7793_CLK_SCIFB1&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -694,7 +697,7 @@</div><div class='ctx'> 	scifb2: serial@e6ce0000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7793",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6ce0000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6ce0000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7793_CLK_SCIFB2&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -852,6 +855,33 @@</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	vin0: video@e6ef0000 {</div><div class='add'>+		compatible = "renesas,vin-r8a7793", "renesas,rcar-gen2-vin";</div><div class='add'>+		reg = &lt;0 0xe6ef0000 0 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;mstp8_clks R8A7793_CLK_VIN0&gt;;</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A7793_PD_ALWAYS_ON&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vin1: video@e6ef1000 {</div><div class='add'>+		compatible = "renesas,vin-r8a7793", "renesas,rcar-gen2-vin";</div><div class='add'>+		reg = &lt;0 0xe6ef1000 0 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;mstp8_clks R8A7793_CLK_VIN1&gt;;</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A7793_PD_ALWAYS_ON&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vin2: video@e6ef2000 {</div><div class='add'>+		compatible = "renesas,vin-r8a7793", "renesas,rcar-gen2-vin";</div><div class='add'>+		reg = &lt;0 0xe6ef2000 0 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;mstp8_clks R8A7793_CLK_VIN2&gt;;</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A7793_PD_ALWAYS_ON&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	qspi: spi@e6b10000 {</div><div class='ctx'> 		compatible = "renesas,qspi-r8a7793", "renesas,qspi";</div><div class='ctx'> 		reg = &lt;0 0xe6b10000 0 0x2c&gt;;</div><div class='hunk'>@@ -1279,6 +1309,16 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	rst: reset-controller@e6160000 {</div><div class='add'>+		compatible = "renesas,r8a7793-rst";</div><div class='add'>+		reg = &lt;0 0xe6160000 0 0x0100&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	prr: chipid@ff000044 {</div><div class='add'>+		compatible = "renesas,prr";</div><div class='add'>+		reg = &lt;0 0xff000044 0 4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sysc: system-controller@e6180000 {</div><div class='ctx'> 		compatible = "renesas,r8a7793-sysc";</div><div class='ctx'> 		reg = &lt;0 0xe6180000 0 0x0200&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts<br/>index 8d1b35afaf82..569e3f0e97a5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7794-alt.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7794-alt.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7794-alt.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7794-alt.dts</a></div><div class='hunk'>@@ -18,6 +18,8 @@</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial0 = &amp;scif2;</div><div class='add'>+		i2c10 = &amp;gpioi2c4;</div><div class='add'>+		i2c12 = &amp;i2cexio4;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='hunk'>@@ -135,6 +137,29 @@</div><div class='ctx'> 		#clock-cells = &lt;0&gt;;</div><div class='ctx'> 		clock-frequency = &lt;148500000&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	gpioi2c4: i2c-10 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "i2c-gpio";</div><div class='add'>+		status = "disabled";</div><div class='add'>+		gpios = &lt;&amp;gpio4 9 GPIO_ACTIVE_HIGH /* sda */</div><div class='add'>+			 &amp;gpio4 8 GPIO_ACTIVE_HIGH /* scl */</div><div class='add'>+			&gt;;</div><div class='add'>+		i2c-gpio,delay-us = &lt;5&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * I2C4 is routed to EXIO connector B, pins 73 (SCL) + 74 (SDA).</div><div class='add'>+	 * A fallback to GPIO is provided.</div><div class='add'>+	 */</div><div class='add'>+	i2cexio4: i2c-14 {</div><div class='add'>+		compatible = "i2c-demux-pinctrl";</div><div class='add'>+		i2c-parent = &lt;&amp;i2c4&gt;, &lt;&amp;gpioi2c4&gt;;</div><div class='add'>+		i2c-bus-name = "i2c-exio4";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;du {</div><div class='hunk'>@@ -165,8 +190,8 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> </div><div class='ctx'> 	du_pins: du {</div><div class='del'>-		groups = "du1_rgb666", "du1_sync", "du1_disp", "du1_dotclkout0";</div><div class='del'>-		function = "du";</div><div class='add'>+		groups = "du1_rgb666", "du1_sync", "du1_disp", "du1_clk0_out";</div><div class='add'>+		function = "du1";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	scif2_pins: scif2 {</div><div class='hunk'>@@ -194,6 +219,11 @@</div><div class='ctx'> 		function = "i2c1";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	i2c4_pins: i2c4 {</div><div class='add'>+		groups = "i2c4";</div><div class='add'>+		function = "i2c4";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	vin0_pins: vin0 {</div><div class='ctx'> 		groups = "vin0_data8", "vin0_clk";</div><div class='ctx'> 		function = "vin0";</div><div class='hunk'>@@ -207,11 +237,25 @@</div><div class='ctx'> 	sdhi0_pins: sd0 {</div><div class='ctx'> 		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='ctx'> 		function = "sdhi0";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi0_pins_uhs: sd0_uhs {</div><div class='add'>+		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='add'>+		function = "sdhi0";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhi1_pins: sd1 {</div><div class='ctx'> 		groups = "sdhi1_data4", "sdhi1_ctrl";</div><div class='ctx'> 		function = "sdhi1";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi1_pins_uhs: sd1_uhs {</div><div class='add'>+		groups = "sdhi1_data4", "sdhi1_ctrl";</div><div class='add'>+		function = "sdhi1";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -255,23 +299,28 @@</div><div class='ctx'> </div><div class='ctx'> &amp;sdhi0 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sdhi0_pins&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi0_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='ctx'> </div><div class='ctx'> 	vmmc-supply = &lt;&amp;vcc_sdhi0&gt;;</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;vccq_sdhi0&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio6 6 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	wp-gpios = &lt;&amp;gpio6 7 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	sd-uhs-sdr50;</div><div class='add'>+	sd-uhs-sdr104;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;sdhi1 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sdhi1_pins&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi1_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='ctx'> </div><div class='ctx'> 	vmmc-supply = &lt;&amp;vcc_sdhi1&gt;;</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;vccq_sdhi1&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio6 14 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	wp-gpios = &lt;&amp;gpio6 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	sd-uhs-sdr50;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -296,6 +345,11 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;i2c4 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c4_pins&gt;;</div><div class='add'>+	pinctrl-names = "i2c-exio4";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;vin0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;vin0_pins&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi<br/>index 9365580a194f..319c1069b7ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7794.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/r8a7794.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/r8a7794.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/r8a7794.dtsi</a></div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0 0xf1001000 0 0x1000&gt;,</div><div class='del'>-			&lt;0 0xf1002000 0 0x1000&gt;,</div><div class='add'>+			&lt;0 0xf1002000 0 0x2000&gt;,</div><div class='ctx'> 			&lt;0 0xf1004000 0 0x2000&gt;,</div><div class='ctx'> 			&lt;0 0xf1006000 0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='hunk'>@@ -319,7 +319,7 @@</div><div class='ctx'> 				  "ch12";</div><div class='ctx'> 		clocks = &lt;&amp;mstp5_clks R8A7794_CLK_AUDIO_DMAC0&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='del'>-		power-domains = &lt;&amp;cpg_clocks&gt;;</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A7794_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 		#dma-cells = &lt;1&gt;;</div><div class='ctx'> 		dma-channels = &lt;13&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -411,7 +411,7 @@</div><div class='ctx'> 	scifb0: serial@e6c20000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7794",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6c20000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6c20000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7794_CLK_SCIFB0&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -425,7 +425,7 @@</div><div class='ctx'> 	scifb1: serial@e6c30000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7794",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6c30000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6c30000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7794_CLK_SCIFB1&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -439,7 +439,7 @@</div><div class='ctx'> 	scifb2: serial@e6ce0000 {</div><div class='ctx'> 		compatible = "renesas,scifb-r8a7794",</div><div class='ctx'> 			     "renesas,rcar-gen2-scifb", "renesas,scifb";</div><div class='del'>-		reg = &lt;0 0xe6ce0000 0 64&gt;;</div><div class='add'>+		reg = &lt;0 0xe6ce0000 0 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp2_clks R8A7794_CLK_SCIFB2&gt;;</div><div class='ctx'> 		clock-names = "fck";</div><div class='hunk'>@@ -611,7 +611,7 @@</div><div class='ctx'> </div><div class='ctx'> 	/* The memory map in the User's Manual maps the cores to bus numbers */</div><div class='ctx'> 	i2c0: i2c@e6508000 {</div><div class='del'>-		compatible = "renesas,i2c-r8a7794";</div><div class='add'>+		compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6508000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7794_CLK_I2C0&gt;;</div><div class='hunk'>@@ -623,7 +623,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2c1: i2c@e6518000 {</div><div class='del'>-		compatible = "renesas,i2c-r8a7794";</div><div class='add'>+		compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6518000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7794_CLK_I2C1&gt;;</div><div class='hunk'>@@ -635,7 +635,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2c2: i2c@e6530000 {</div><div class='del'>-		compatible = "renesas,i2c-r8a7794";</div><div class='add'>+		compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6530000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7794_CLK_I2C2&gt;;</div><div class='hunk'>@@ -647,7 +647,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2c3: i2c@e6540000 {</div><div class='del'>-		compatible = "renesas,i2c-r8a7794";</div><div class='add'>+		compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6540000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7794_CLK_I2C3&gt;;</div><div class='hunk'>@@ -659,7 +659,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2c4: i2c@e6520000 {</div><div class='del'>-		compatible = "renesas,i2c-r8a7794";</div><div class='add'>+		compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6520000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7794_CLK_I2C4&gt;;</div><div class='hunk'>@@ -671,7 +671,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2c5: i2c@e6528000 {</div><div class='del'>-		compatible = "renesas,i2c-r8a7794";</div><div class='add'>+		compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";</div><div class='ctx'> 		reg = &lt;0 0xe6528000 0 0x40&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp9_clks R8A7794_CLK_I2C5&gt;;</div><div class='hunk'>@@ -683,7 +683,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2c6: i2c@e6500000 {</div><div class='del'>-		compatible = "renesas,iic-r8a7794", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7794", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe6500000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A7794_CLK_IIC0&gt;;</div><div class='hunk'>@@ -697,7 +698,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2c7: i2c@e6510000 {</div><div class='del'>-		compatible = "renesas,iic-r8a7794", "renesas,rmobile-iic";</div><div class='add'>+		compatible = "renesas,iic-r8a7794", "renesas,rcar-gen2-iic",</div><div class='add'>+			     "renesas,rmobile-iic";</div><div class='ctx'> 		reg = &lt;0 0xe6510000 0 0x425&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;mstp3_clks R8A7794_CLK_IIC1&gt;;</div><div class='hunk'>@@ -731,6 +733,7 @@</div><div class='ctx'> 		dmas = &lt;&amp;dmac0 0xcd&gt;, &lt;&amp;dmac0 0xce&gt;,</div><div class='ctx'> 		       &lt;&amp;dmac1 0xcd&gt;, &lt;&amp;dmac1 0xce&gt;;</div><div class='ctx'> 		dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+		max-frequency = &lt;195000000&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;sysc R8A7794_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -743,6 +746,7 @@</div><div class='ctx'> 		dmas = &lt;&amp;dmac0 0xc1&gt;, &lt;&amp;dmac0 0xc2&gt;,</div><div class='ctx'> 		       &lt;&amp;dmac1 0xc1&gt;, &lt;&amp;dmac1 0xc2&gt;;</div><div class='ctx'> 		dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+		max-frequency = &lt;97500000&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;sysc R8A7794_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -755,6 +759,7 @@</div><div class='ctx'> 		dmas = &lt;&amp;dmac0 0xd3&gt;, &lt;&amp;dmac0 0xd4&gt;,</div><div class='ctx'> 		       &lt;&amp;dmac1 0xd3&gt;, &lt;&amp;dmac1 0xd4&gt;;</div><div class='ctx'> 		dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+		max-frequency = &lt;97500000&gt;;</div><div class='ctx'> 		power-domains = &lt;&amp;sysc R8A7794_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -875,7 +880,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usbphy: usb-phy@e6590100 {</div><div class='del'>-		compatible = "renesas,usb-phy-r8a7794";</div><div class='add'>+		compatible = "renesas,usb-phy-r8a7794",</div><div class='add'>+			     "renesas,rcar-gen2-usb-phy";</div><div class='ctx'> 		reg = &lt;0 0xe6590100 0 0x100&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -1025,8 +1031,7 @@</div><div class='ctx'> 			clocks = &lt;&amp;extal_clk &amp;usb_extal_clk&gt;;</div><div class='ctx'> 			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 			clock-output-names = "main", "pll0", "pll1", "pll3",</div><div class='del'>-					     "lb", "qspi", "sdh", "sd0", "z",</div><div class='del'>-					     "rcan";</div><div class='add'>+					     "lb", "qspi", "sdh", "sd0", "rcan";</div><div class='ctx'> 			#power-domain-cells = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 		/* Variable factor clocks */</div><div class='hunk'>@@ -1260,7 +1265,7 @@</div><div class='ctx'> 		mstp7_clks: mstp7_clks@e615014c {</div><div class='ctx'> 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";</div><div class='ctx'> 			reg = &lt;0 0xe615014c 0 4&gt;, &lt;0 0xe61501c4 0 4&gt;;</div><div class='del'>-			clocks = &lt;&amp;mp_clk&gt;, &lt;&amp;mp_clk&gt;,</div><div class='add'>+			clocks = &lt;&amp;mp_clk&gt;, &lt;&amp;hp_clk&gt;,</div><div class='ctx'> 				 &lt;&amp;zs_clk&gt;, &lt;&amp;p_clk&gt;, &lt;&amp;p_clk&gt;, &lt;&amp;zs_clk&gt;,</div><div class='ctx'> 				 &lt;&amp;zs_clk&gt;, &lt;&amp;p_clk&gt;, &lt;&amp;p_clk&gt;, &lt;&amp;p_clk&gt;, &lt;&amp;p_clk&gt;,</div><div class='ctx'> 				 &lt;&amp;zx_clk&gt;;</div><div class='hunk'>@@ -1375,6 +1380,16 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	rst: reset-controller@e6160000 {</div><div class='add'>+		compatible = "renesas,r8a7794-rst";</div><div class='add'>+		reg = &lt;0 0xe6160000 0 0x0100&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	prr: chipid@ff000044 {</div><div class='add'>+		compatible = "renesas,prr";</div><div class='add'>+		reg = &lt;0 0xff000044 0 4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sysc: system-controller@e6180000 {</div><div class='ctx'> 		compatible = "renesas,r8a7794-sysc";</div><div class='ctx'> 		reg = &lt;0 0xe6180000 0 0x0200&gt;;</div><div class='hunk'>@@ -1483,67 +1498,67 @@</div><div class='ctx'> 			      "mix.0", "mix.1",</div><div class='ctx'> 			      "dvc.0", "dvc.1",</div><div class='ctx'> 			      "clk_a", "clk_b", "clk_c", "clk_i";</div><div class='del'>-		power-domains = &lt;&amp;cpg_clocks&gt;;</div><div class='add'>+		power-domains = &lt;&amp;sysc R8A7794_PD_ALWAYS_ON&gt;;</div><div class='ctx'> </div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> </div><div class='ctx'> 		rcar_sound,dvc {</div><div class='del'>-			dvc0: dvc@0 {</div><div class='add'>+			dvc0: dvc-0 {</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0xbc&gt;;</div><div class='ctx'> 				dma-names = "tx";</div><div class='ctx'> 			};</div><div class='del'>-			dvc1: dvc@1 {</div><div class='add'>+			dvc1: dvc-1 {</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0xbe&gt;;</div><div class='ctx'> 				dma-names = "tx";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		rcar_sound,mix {</div><div class='del'>-			mix0: mix@0 { };</div><div class='del'>-			mix1: mix@1 { };</div><div class='add'>+			mix0: mix-0 { };</div><div class='add'>+			mix1: mix-1 { };</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		rcar_sound,ctu {</div><div class='del'>-			ctu00: ctu@0 { };</div><div class='del'>-			ctu01: ctu@1 { };</div><div class='del'>-			ctu02: ctu@2 { };</div><div class='del'>-			ctu03: ctu@3 { };</div><div class='del'>-			ctu10: ctu@4 { };</div><div class='del'>-			ctu11: ctu@5 { };</div><div class='del'>-			ctu12: ctu@6 { };</div><div class='del'>-			ctu13: ctu@7 { };</div><div class='add'>+			ctu00: ctu-0 { };</div><div class='add'>+			ctu01: ctu-1 { };</div><div class='add'>+			ctu02: ctu-2 { };</div><div class='add'>+			ctu03: ctu-3 { };</div><div class='add'>+			ctu10: ctu-4 { };</div><div class='add'>+			ctu11: ctu-5 { };</div><div class='add'>+			ctu12: ctu-6 { };</div><div class='add'>+			ctu13: ctu-7 { };</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		rcar_sound,src {</div><div class='del'>-			src@0 {</div><div class='add'>+			src-0 {</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='del'>-			src1: src@1 {</div><div class='add'>+			src1: src-1 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x87&gt;, &lt;&amp;audma0 0x9c&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx";</div><div class='ctx'> 			};</div><div class='del'>-			src2: src@2 {</div><div class='add'>+			src2: src-2 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x89&gt;, &lt;&amp;audma0 0x9e&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx";</div><div class='ctx'> 			};</div><div class='del'>-			src3: src@3 {</div><div class='add'>+			src3: src-3 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x8b&gt;, &lt;&amp;audma0 0xa0&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx";</div><div class='ctx'> 			};</div><div class='del'>-			src4: src@4 {</div><div class='add'>+			src4: src-4 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x8d&gt;, &lt;&amp;audma0 0xb0&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx";</div><div class='ctx'> 			};</div><div class='del'>-			src5: src@5 {</div><div class='add'>+			src5: src-5 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x8f&gt;, &lt;&amp;audma0 0xb2&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx";</div><div class='ctx'> 			};</div><div class='del'>-			src6: src@6 {</div><div class='add'>+			src6: src-6 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x91&gt;, &lt;&amp;audma0 0xb4&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx";</div><div class='hunk'>@@ -1551,61 +1566,61 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		rcar_sound,ssi {</div><div class='del'>-			ssi0: ssi@0 {</div><div class='add'>+			ssi0: ssi-0 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x01&gt;, &lt;&amp;audma0 0x02&gt;,</div><div class='ctx'> 				       &lt;&amp;audma0 0x15&gt;, &lt;&amp;audma0 0x16&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx", "rxu", "txu";</div><div class='ctx'> 			};</div><div class='del'>-			ssi1: ssi@1 {</div><div class='add'>+			ssi1: ssi-1 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x03&gt;, &lt;&amp;audma0 0x04&gt;,</div><div class='ctx'> 				       &lt;&amp;audma0 0x49&gt;, &lt;&amp;audma0 0x4a&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx", "rxu", "txu";</div><div class='ctx'> 			};</div><div class='del'>-			ssi2: ssi@2 {</div><div class='add'>+			ssi2: ssi-2 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x05&gt;, &lt;&amp;audma0 0x06&gt;,</div><div class='ctx'> 				       &lt;&amp;audma0 0x63&gt;, &lt;&amp;audma0 0x64&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx", "rxu", "txu";</div><div class='ctx'> 			};</div><div class='del'>-			ssi3: ssi@3 {</div><div class='add'>+			ssi3: ssi-3 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x07&gt;, &lt;&amp;audma0 0x08&gt;,</div><div class='ctx'> 				       &lt;&amp;audma0 0x6f&gt;, &lt;&amp;audma0 0x70&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx", "rxu", "txu";</div><div class='ctx'> 			};</div><div class='del'>-			ssi4: ssi@4 {</div><div class='add'>+			ssi4: ssi-4 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x09&gt;, &lt;&amp;audma0 0x0a&gt;,</div><div class='ctx'> 				       &lt;&amp;audma0 0x71&gt;, &lt;&amp;audma0 0x72&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx", "rxu", "txu";</div><div class='ctx'> 			};</div><div class='del'>-			ssi5: ssi@5 {</div><div class='add'>+			ssi5: ssi-5 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x0b&gt;, &lt;&amp;audma0 0x0c&gt;,</div><div class='ctx'> 				       &lt;&amp;audma0 0x73&gt;, &lt;&amp;audma0 0x74&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx", "rxu", "txu";</div><div class='ctx'> 			};</div><div class='del'>-			ssi6: ssi@6 {</div><div class='add'>+			ssi6: ssi-6 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x0d&gt;, &lt;&amp;audma0 0x0e&gt;,</div><div class='ctx'> 				       &lt;&amp;audma0 0x75&gt;, &lt;&amp;audma0 0x76&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx", "rxu", "txu";</div><div class='ctx'> 			};</div><div class='del'>-			ssi7: ssi@7 {</div><div class='add'>+			ssi7: ssi-7 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x0f&gt;, &lt;&amp;audma0 0x10&gt;,</div><div class='ctx'> 				       &lt;&amp;audma0 0x79&gt;, &lt;&amp;audma0 0x7a&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx", "rxu", "txu";</div><div class='ctx'> 			};</div><div class='del'>-			ssi8: ssi@8 {</div><div class='add'>+			ssi8: ssi-8 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x11&gt;, &lt;&amp;audma0 0x12&gt;,</div><div class='ctx'> 				       &lt;&amp;audma0 0x7b&gt;, &lt;&amp;audma0 0x7c&gt;;</div><div class='ctx'> 				dma-names = "rx", "tx", "rxu", "txu";</div><div class='ctx'> 			};</div><div class='del'>-			ssi9: ssi@9 {</div><div class='add'>+			ssi9: ssi-9 {</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				dmas = &lt;&amp;audma0 0x13&gt;, &lt;&amp;audma0 0x14&gt;,</div><div class='ctx'> 				       &lt;&amp;audma0 0x7d&gt;, &lt;&amp;audma0 0x7e&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk1108-evb.dts b/arch/arm/boot/dts/rk1108-evb.dts<br/>new file mode 100644<br/>index 000000000000..3956cff4ca79<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk1108-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk1108-evb.dts</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "rk1108.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Rockchip RK1108 Evaluation board";</div><div class='add'>+	compatible = "rockchip,rk1108-evb", "rockchip,rk1108";</div><div class='add'>+</div><div class='add'>+	memory@60000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x60000000 0x08000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial2:1500000n8";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/rk1108.dtsi b/arch/arm/boot/dts/rk1108.dtsi<br/>new file mode 100644<br/>index 000000000000..d6194bff7afe<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk1108.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk1108.dtsi</a></div><div class='hunk'>@@ -0,0 +1,452 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/rk1108-cru.h&gt;</div><div class='add'>+#include &lt;dt-bindings/pinctrl/rockchip.h&gt;</div><div class='add'>+/ {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+	compatible = "rockchip,rk1108";</div><div class='add'>+</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart0;</div><div class='add'>+		serial1 = &amp;uart1;</div><div class='add'>+		serial2 = &amp;uart2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@f00 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a7";</div><div class='add'>+			reg = &lt;0xf00&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	arm-pmu {</div><div class='add'>+		compatible = "arm,cortex-a7-pmu";</div><div class='add'>+		interrupts = &lt;GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "arm,armv7-timer";</div><div class='add'>+		interrupts = &lt;GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+		clock-frequency = &lt;24000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	xin24m: oscillator {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		clock-frequency = &lt;24000000&gt;;</div><div class='add'>+		clock-output-names = "xin24m";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	amba {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		pdma: pdma@102a0000 {</div><div class='add'>+			compatible = "arm,pl330", "arm,primecell";</div><div class='add'>+			reg = &lt;0x102a0000 0x4000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			arm,pl330-broken-no-flushp;</div><div class='add'>+			clocks = &lt;&amp;cru ACLK_DMAC&gt;;</div><div class='add'>+			clock-names = "apb_pclk";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_intmem@10080000 {</div><div class='add'>+		compatible = "mmio-sram";</div><div class='add'>+		reg = &lt;0x10080000 0x2000&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges = &lt;0 0x10080000 0x2000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart2: serial@10210000 {</div><div class='add'>+		compatible = "rockchip,rk1108-uart", "snps,dw-apb-uart";</div><div class='add'>+		reg = &lt;0x10210000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		reg-io-width = &lt;4&gt;;</div><div class='add'>+		clock-frequency = &lt;24000000&gt;;</div><div class='add'>+		clocks = &lt;&amp;cru SCLK_UART2&gt;, &lt;&amp;cru PCLK_UART2&gt;;</div><div class='add'>+		clock-names = "baudclk", "apb_pclk";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;uart2m0_xfer&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart1: serial@10220000 {</div><div class='add'>+		compatible = "rockchip,rk1108-uart", "snps,dw-apb-uart";</div><div class='add'>+		reg = &lt;0x10220000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		reg-io-width = &lt;4&gt;;</div><div class='add'>+		clock-frequency = &lt;24000000&gt;;</div><div class='add'>+		clocks = &lt;&amp;cru SCLK_UART1&gt;, &lt;&amp;cru PCLK_UART1&gt;;</div><div class='add'>+		clock-names = "baudclk", "apb_pclk";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;uart1_xfer&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart0: serial@10230000 {</div><div class='add'>+		compatible = "rockchip,rk1108-uart", "snps,dw-apb-uart";</div><div class='add'>+		reg = &lt;0x10230000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		reg-io-width = &lt;4&gt;;</div><div class='add'>+		clock-frequency = &lt;24000000&gt;;</div><div class='add'>+		clocks = &lt;&amp;cru SCLK_UART0&gt;, &lt;&amp;cru PCLK_UART0&gt;;</div><div class='add'>+		clock-names = "baudclk", "apb_pclk";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;uart0_xfer &amp;uart0_cts &amp;uart0_rts&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	grf: syscon@10300000 {</div><div class='add'>+		compatible = "rockchip,rk1108-grf", "syscon";</div><div class='add'>+		reg = &lt;0x10300000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmugrf: syscon@20060000 {</div><div class='add'>+		compatible = "rockchip,rk1108-pmugrf", "syscon";</div><div class='add'>+		reg = &lt;0x20060000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cru: clock-controller@20200000 {</div><div class='add'>+		compatible = "rockchip,rk1108-cru";</div><div class='add'>+		reg = &lt;0x20200000 0x1000&gt;;</div><div class='add'>+		rockchip,grf = &lt;&amp;grf&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+		#reset-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	emmc: dwmmc@30110000 {</div><div class='add'>+		compatible = "rockchip,rk1108-dw-mshc", "rockchip,rk3288-dw-mshc";</div><div class='add'>+		clock-freq-min-max = &lt;400000 150000000&gt;;</div><div class='add'>+		clocks = &lt;&amp;cru HCLK_EMMC&gt;, &lt;&amp;cru SCLK_EMMC&gt;,</div><div class='add'>+			 &lt;&amp;cru SCLK_EMMC_DRV&gt;, &lt;&amp;cru SCLK_EMMC_SAMPLE&gt;;</div><div class='add'>+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";</div><div class='add'>+		fifo-depth = &lt;0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		reg = &lt;0x30110000 0x4000&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdio: dwmmc@30120000 {</div><div class='add'>+		compatible = "rockchip,rk1108-dw-mshc", "rockchip,rk3288-dw-mshc";</div><div class='add'>+		clock-freq-min-max = &lt;400000 150000000&gt;;</div><div class='add'>+		clocks = &lt;&amp;cru HCLK_SDIO&gt;, &lt;&amp;cru SCLK_SDIO&gt;,</div><div class='add'>+			 &lt;&amp;cru SCLK_SDIO_DRV&gt;, &lt;&amp;cru SCLK_SDIO_SAMPLE&gt;;</div><div class='add'>+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";</div><div class='add'>+		fifo-depth = &lt;0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		reg = &lt;0x30120000 0x4000&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdmmc: dwmmc@30130000 {</div><div class='add'>+		compatible = "rockchip,rk1108-dw-mshc", "rockchip,rk3288-dw-mshc";</div><div class='add'>+		clock-freq-min-max = &lt;400000 100000000&gt;;</div><div class='add'>+		clocks = &lt;&amp;cru HCLK_SDMMC&gt;, &lt;&amp;cru SCLK_SDMMC&gt;,</div><div class='add'>+			 &lt;&amp;cru SCLK_SDMMC_DRV&gt;, &lt;&amp;cru SCLK_SDMMC_SAMPLE&gt;;</div><div class='add'>+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";</div><div class='add'>+		fifo-depth = &lt;0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		reg = &lt;0x30130000 0x4000&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gic: interrupt-controller@32010000 {</div><div class='add'>+		compatible = "arm,gic-400";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;3&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		reg = &lt;0x32011000 0x1000&gt;,</div><div class='add'>+		      &lt;0x32012000 0x2000&gt;,</div><div class='add'>+		      &lt;0x32014000 0x2000&gt;,</div><div class='add'>+		      &lt;0x32016000 0x2000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl: pinctrl {</div><div class='add'>+		compatible = "rockchip,rk1108-pinctrl";</div><div class='add'>+		rockchip,grf = &lt;&amp;grf&gt;;</div><div class='add'>+		rockchip,pmu = &lt;&amp;pmugrf&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		gpio0: gpio0@20030000 {</div><div class='add'>+			compatible = "rockchip,gpio-bank";</div><div class='add'>+			reg = &lt;0x20030000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;xin24m&gt;;</div><div class='add'>+</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio1: gpio1@10310000 {</div><div class='add'>+			compatible = "rockchip,gpio-bank";</div><div class='add'>+			reg = &lt;0x10310000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;xin24m&gt;;</div><div class='add'>+</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio2: gpio2@10320000 {</div><div class='add'>+			compatible = "rockchip,gpio-bank";</div><div class='add'>+			reg = &lt;0x10320000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;xin24m&gt;;</div><div class='add'>+</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio3: gpio3@10330000 {</div><div class='add'>+			compatible = "rockchip,gpio-bank";</div><div class='add'>+			reg = &lt;0x10330000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;xin24m&gt;;</div><div class='add'>+</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcfg_pull_up: pcfg-pull-up {</div><div class='add'>+			bias-pull-up;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcfg_pull_down: pcfg-pull-down {</div><div class='add'>+			bias-pull-down;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcfg_pull_none: pcfg-pull-none {</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {</div><div class='add'>+			drive-strength = &lt;8&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcfg_pull_none_drv_12ma: pcfg-pull-none-drv-12ma {</div><div class='add'>+			drive-strength = &lt;12&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {</div><div class='add'>+			bias-pull-up;</div><div class='add'>+			drive-strength = &lt;8&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcfg_pull_none_drv_4ma: pcfg-pull-none-drv-4ma {</div><div class='add'>+			drive-strength = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcfg_pull_up_drv_4ma: pcfg-pull-up-drv-4ma {</div><div class='add'>+			bias-pull-up;</div><div class='add'>+			drive-strength = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcfg_output_high: pcfg-output-high {</div><div class='add'>+			output-high;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcfg_output_low: pcfg-output-low {</div><div class='add'>+			output-low;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pcfg_input_high: pcfg-input-high {</div><div class='add'>+			bias-pull-up;</div><div class='add'>+			input-enable;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c1 {</div><div class='add'>+			i2c1_xfer: i2c1-xfer {</div><div class='add'>+				rockchip,pins = &lt;2 RK_PD3 RK_FUNC_1 &amp;pcfg_pull_up&gt;,</div><div class='add'>+						&lt;2 RK_PD4 RK_FUNC_1 &amp;pcfg_pull_up&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c2m1 {</div><div class='add'>+			i2c2m1_xfer: i2c2m1-xfer {</div><div class='add'>+				rockchip,pins = &lt;0 RK_PC2 RK_FUNC_2 &amp;pcfg_pull_none&gt;,</div><div class='add'>+						&lt;0 RK_PC6 RK_FUNC_3 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c2m1_gpio: i2c2m1-gpio {</div><div class='add'>+				rockchip,pins = &lt;0 RK_PC2 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;,</div><div class='add'>+						&lt;0 RK_PC6 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c2m05v {</div><div class='add'>+			i2c2m05v_xfer: i2c2m05v-xfer {</div><div class='add'>+				rockchip,pins = &lt;1 RK_PD5 RK_FUNC_2 &amp;pcfg_pull_none&gt;,</div><div class='add'>+						&lt;1 RK_PD4 RK_FUNC_2 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c2m05v_gpio: i2c2m05v-gpio {</div><div class='add'>+				rockchip,pins = &lt;1 RK_PD5 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;,</div><div class='add'>+						&lt;1 RK_PD4 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c3 {</div><div class='add'>+			i2c3_xfer: i2c3-xfer {</div><div class='add'>+				rockchip,pins = &lt;0 RK_PB6 RK_FUNC_1 &amp;pcfg_pull_none&gt;,</div><div class='add'>+						&lt;0 RK_PC4 RK_FUNC_2 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdmmc {</div><div class='add'>+			sdmmc_clk: sdmmc-clk {</div><div class='add'>+				rockchip,pins = &lt;3 RK_PC4 RK_FUNC_1 &amp;pcfg_pull_none_drv_4ma&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sdmmc_cmd: sdmmc-cmd {</div><div class='add'>+				rockchip,pins = &lt;3 RK_PC5 RK_FUNC_1 &amp;pcfg_pull_up_drv_4ma&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sdmmc_cd: sdmmc-cd {</div><div class='add'>+				rockchip,pins = &lt;0 RK_PA1 RK_FUNC_1 &amp;pcfg_pull_up_drv_4ma&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sdmmc_bus1: sdmmc-bus1 {</div><div class='add'>+				rockchip,pins = &lt;3 RK_PC3 RK_FUNC_1 &amp;pcfg_pull_up_drv_4ma&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sdmmc_bus4: sdmmc-bus4 {</div><div class='add'>+				rockchip,pins = &lt;3 RK_PC3 RK_FUNC_1 &amp;pcfg_pull_up_drv_4ma&gt;,</div><div class='add'>+						&lt;3 RK_PC2 RK_FUNC_1 &amp;pcfg_pull_up_drv_4ma&gt;,</div><div class='add'>+						&lt;3 RK_PC1 RK_FUNC_1 &amp;pcfg_pull_up_drv_4ma&gt;,</div><div class='add'>+						&lt;3 RK_PC0 RK_FUNC_1 &amp;pcfg_pull_up_drv_4ma&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart0 {</div><div class='add'>+			uart0_xfer: uart0-xfer {</div><div class='add'>+				rockchip,pins = &lt;3 RK_PA6 RK_FUNC_1 &amp;pcfg_pull_up&gt;,</div><div class='add'>+						&lt;3 RK_PA5 RK_FUNC_1 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart0_cts: uart0-cts {</div><div class='add'>+				rockchip,pins = &lt;3 RK_PA4 RK_FUNC_1 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart0_rts: uart0-rts {</div><div class='add'>+				rockchip,pins = &lt;3 RK_PA3 RK_FUNC_1 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart0_rts_gpio: uart0-rts-gpio {</div><div class='add'>+				rockchip,pins = &lt;3 RK_PA3 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart1 {</div><div class='add'>+			uart1_xfer: uart1-xfer {</div><div class='add'>+				rockchip,pins = &lt;1 RK_PD3 RK_FUNC_1 &amp;pcfg_pull_up&gt;,</div><div class='add'>+						&lt;1 RK_PD2 RK_FUNC_1 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart1_cts: uart1-cts {</div><div class='add'>+				rockchip,pins = &lt;1 RK_PD0 RK_FUNC_1 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart1_rts: uart1-rts {</div><div class='add'>+				rockchip,pins = &lt;1 RK_PD1 RK_FUNC_1 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart2m0 {</div><div class='add'>+			uart2m0_xfer: uart2m0-xfer {</div><div class='add'>+				rockchip,pins = &lt;2 RK_PD2 RK_FUNC_1 &amp;pcfg_pull_up&gt;,</div><div class='add'>+						&lt;2 RK_PD1 RK_FUNC_1 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart2m1 {</div><div class='add'>+			uart2m1_xfer: uart2m1-xfer {</div><div class='add'>+				rockchip,pins = &lt;3 RK_PC3 RK_FUNC_2 &amp;pcfg_pull_up&gt;,</div><div class='add'>+						&lt;3 RK_PC2 RK_FUNC_2 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart2_5v {</div><div class='add'>+			uart2_5v_cts: uart2_5v-cts {</div><div class='add'>+				rockchip,pins = &lt;1 RK_PD4 RK_FUNC_1 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart2_5v_rts: uart2_5v-rts {</div><div class='add'>+				rockchip,pins = &lt;1 RK_PD5 RK_FUNC_1 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3036-evb.dts b/arch/arm/boot/dts/rk3036-evb.dts<br/>index 8db9e9b197a2..c0953410121b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3036-evb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3036-evb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3036-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3036-evb.dts</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> 	model = "Rockchip RK3036 Evaluation board";</div><div class='ctx'> 	compatible = "rockchip,rk3036-evb", "rockchip,rk3036";</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@60000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x60000000 0x40000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -56,7 +56,7 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;emac_xfer&gt;, &lt;&amp;emac_mdio&gt;;</div><div class='ctx'> 	phy = &lt;&amp;phy0&gt;;</div><div class='del'>-	phy-reset-gpios = &lt;&amp;gpio2 22 GPIO_ACTIVE_LOW&gt;; /* PHY_RST */</div><div class='add'>+	phy-reset-gpios = &lt;&amp;gpio2 RK_PC6 GPIO_ACTIVE_LOW&gt;; /* PHY_RST */</div><div class='ctx'> 	phy-reset-duration = &lt;10&gt;; /* millisecond */</div><div class='ctx'> </div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts<br/>index 1df1557a46c3..5726135b7f8a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3036-kylin.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3036-kylin.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3036-kylin.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3036-kylin.dts</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> 	model = "Rockchip RK3036 KylinBoard";</div><div class='ctx'> 	compatible = "rockchip,rk3036-kylin", "rockchip,rk3036";</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@60000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x60000000 0x20000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> </div><div class='ctx'> 		work {</div><div class='del'>-			gpios = &lt;&amp;gpio2 30 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio2 RK_PD6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			label = "kylin:red:led";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='ctx'> 			pinctrl-0 = &lt;&amp;led_ctl&gt;;</div><div class='hunk'>@@ -74,9 +74,9 @@</div><div class='ctx'> 		 * - SDIO_RESET_L_WL_RST</div><div class='ctx'> 		 * - SDIO_RESET_L_BT_EN</div><div class='ctx'> 		 */</div><div class='del'>-		reset-gpios = &lt;&amp;gpio0 26 GPIO_ACTIVE_LOW&gt;, /* WL_REG_ON */</div><div class='del'>-			      &lt;&amp;gpio0 27 GPIO_ACTIVE_LOW&gt;, /* WL_RST */</div><div class='del'>-			      &lt;&amp;gpio2 9  GPIO_ACTIVE_LOW&gt;; /* BT_EN */</div><div class='add'>+		reset-gpios = &lt;&amp;gpio0 RK_PD2 GPIO_ACTIVE_LOW&gt;, /* WL_REG_ON */</div><div class='add'>+			      &lt;&amp;gpio0 RK_PD3 GPIO_ACTIVE_LOW&gt;, /* WL_RST */</div><div class='add'>+			      &lt;&amp;gpio2 RK_PB1 GPIO_ACTIVE_LOW&gt;; /* BT_EN */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sound {</div><div class='hunk'>@@ -121,7 +121,7 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;emac_xfer&gt;, &lt;&amp;emac_mdio&gt;;</div><div class='ctx'> 	phy = &lt;&amp;phy0&gt;;</div><div class='del'>-	phy-reset-gpios = &lt;&amp;gpio2 22 GPIO_ACTIVE_LOW&gt;; /* PHY_RST */</div><div class='add'>+	phy-reset-gpios = &lt;&amp;gpio2 RK_PC6 GPIO_ACTIVE_LOW&gt;; /* PHY_RST */</div><div class='ctx'> 	phy-reset-duration = &lt;10&gt;; /* millisecond */</div><div class='ctx'> </div><div class='ctx'> 	status = "okay";</div><div class='hunk'>@@ -148,7 +148,7 @@</div><div class='ctx'> 		compatible = "rockchip,rk808";</div><div class='ctx'> 		reg = &lt;0x1b&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio2&gt;;</div><div class='del'>-		interrupts = &lt;2 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA2 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pmic_int &amp;global_pwroff&gt;;</div><div class='ctx'> 		rockchip,system-power-controller;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi<br/>index a935523a1eb8..ff9b90bfaefd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3036.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3036.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3036.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3036.dtsi</a></div><div class='hunk'>@@ -44,9 +44,11 @@</div><div class='ctx'> #include &lt;dt-bindings/pinctrl/rockchip.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/clock/rk3036-cru.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/soc/rockchip,boot-mode.h&gt;</div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='ctx'> 	compatible = "rockchip,rk3036";</div><div class='ctx'> </div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='hunk'>@@ -187,7 +189,7 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='ctx'> 		reg = &lt;0x10139000 0x1000&gt;,</div><div class='del'>-		      &lt;0x1013a000 0x1000&gt;,</div><div class='add'>+		      &lt;0x1013a000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x1013c000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x1013e000 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='hunk'>@@ -204,7 +206,6 @@</div><div class='ctx'> 		g-np-tx-fifo-size = &lt;16&gt;;</div><div class='ctx'> 		g-rx-fifo-size = &lt;275&gt;;</div><div class='ctx'> 		g-tx-fifo-size = &lt;256 128 128 64 64 32&gt;;</div><div class='del'>-		g-use-dma;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -244,7 +245,7 @@</div><div class='ctx'> 		compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";</div><div class='ctx'> 		reg = &lt;0x10214000 0x4000&gt;;</div><div class='ctx'> 		clock-frequency = &lt;37500000&gt;;</div><div class='del'>-		clock-freq-min-max = &lt;400000 37500000&gt;;</div><div class='add'>+		max-frequency = &lt;37500000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_SDMMC&gt;, &lt;&amp;cru SCLK_SDMMC&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu";</div><div class='ctx'> 		fifo-depth = &lt;0x100&gt;;</div><div class='hunk'>@@ -255,7 +256,7 @@</div><div class='ctx'> 	sdio: dwmmc@10218000 {</div><div class='ctx'> 		compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";</div><div class='ctx'> 		reg = &lt;0x10218000 0x4000&gt;;</div><div class='del'>-		clock-freq-min-max = &lt;400000 37500000&gt;;</div><div class='add'>+		max-frequency = &lt;37500000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_SDIO&gt;, &lt;&amp;cru SCLK_SDIO&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_SDIO_DRV&gt;, &lt;&amp;cru SCLK_SDIO_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";</div><div class='hunk'>@@ -271,7 +272,7 @@</div><div class='ctx'> 		bus-width = &lt;8&gt;;</div><div class='ctx'> 		cap-mmc-highspeed;</div><div class='ctx'> 		clock-frequency = &lt;37500000&gt;;</div><div class='del'>-		clock-freq-min-max = &lt;400000 37500000&gt;;</div><div class='add'>+		max-frequency = &lt;37500000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_EMMC&gt;, &lt;&amp;cru SCLK_EMMC&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_EMMC_DRV&gt;, &lt;&amp;cru SCLK_EMMC_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts<br/>index bc674ee206ec..e1f5198723b2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3066a-bqcurie2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3066a-bqcurie2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3066a-bqcurie2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3066a-bqcurie2.dts</a></div><div class='hunk'>@@ -49,7 +49,7 @@</div><div class='ctx'> 	model = "bq Curie 2";</div><div class='ctx'> 	compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@60000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x60000000 0x40000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'> 		regulator-name = "sdmmc-supply";</div><div class='ctx'> 		regulator-min-microvolt = &lt;3000000&gt;;</div><div class='ctx'> 		regulator-max-microvolt = &lt;3000000&gt;;</div><div class='del'>-		gpio = &lt;&amp;gpio3 7 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio3 RK_PA7 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		startup-delay-us = &lt;100000&gt;;</div><div class='ctx'> 		vin-supply = &lt;&amp;vcc_io&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -81,7 +81,7 @@</div><div class='ctx'> 		autorepeat;</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='del'>-			gpios = &lt;&amp;gpio6 2 GPIO_ACTIVE_LOW&gt;; /* GPIO6_A2 */</div><div class='add'>+			gpios = &lt;&amp;gpio6 RK_PA2 GPIO_ACTIVE_LOW&gt;; /* GPIO6_A2 */</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			label = "GPIO Key Power";</div><div class='ctx'> 			linux,input-type = &lt;1&gt;;</div><div class='hunk'>@@ -89,7 +89,7 @@</div><div class='ctx'> 			debounce-interval = &lt;100&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 		volume-down {</div><div class='del'>-			gpios = &lt;&amp;gpio4 21 GPIO_ACTIVE_LOW&gt;; /* GPIO4_C5 */</div><div class='add'>+			gpios = &lt;&amp;gpio4 RK_PC5 GPIO_ACTIVE_LOW&gt;; /* GPIO4_C5 */</div><div class='ctx'> 			linux,code = &lt;KEY_VOLUMEDOWN&gt;;</div><div class='ctx'> 			label = "GPIO Key Vol-";</div><div class='ctx'> 			linux,input-type = &lt;1&gt;;</div><div class='hunk'>@@ -111,7 +111,7 @@</div><div class='ctx'> 		reg = &lt;0x2d&gt;;</div><div class='ctx'> </div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio6&gt;;</div><div class='del'>-		interrupts = &lt;6 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA6 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> </div><div class='ctx'> 		vcc5-supply = &lt;&amp;vcc_io&gt;;</div><div class='ctx'> 		vcc6-supply = &lt;&amp;vcc_io&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3066a-marsboard.dts b/arch/arm/boot/dts/rk3066a-marsboard.dts<br/>index a2b763e949b4..c6d92c25df42 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3066a-marsboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3066a-marsboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3066a-marsboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3066a-marsboard.dts</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'> 	model = "MarsBoard RK3066";</div><div class='ctx'> 	compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@60000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x60000000 0x40000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -69,7 +69,7 @@</div><div class='ctx'> 		regulator-name = "sdmmc-supply";</div><div class='ctx'> 		regulator-min-microvolt = &lt;3000000&gt;;</div><div class='ctx'> 		regulator-max-microvolt = &lt;3000000&gt;;</div><div class='del'>-		gpio = &lt;&amp;gpio3 7 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio3 RK_PA7 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		startup-delay-us = &lt;100000&gt;;</div><div class='ctx'> 		vin-supply = &lt;&amp;vcc_io&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -91,7 +91,7 @@</div><div class='ctx'> 		reg = &lt;0x2d&gt;;</div><div class='ctx'> </div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio6&gt;;</div><div class='del'>-		interrupts = &lt;4 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA4 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> </div><div class='ctx'> 		vcc1-supply = &lt;&amp;vsys&gt;;</div><div class='ctx'> 		vcc2-supply = &lt;&amp;vsys&gt;;</div><div class='hunk'>@@ -186,7 +186,7 @@</div><div class='ctx'> 	phy0: ethernet-phy@0 {</div><div class='ctx'> 		reg = &lt;0&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='del'>-		interrupts = &lt;26 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PD2 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/rk3066a-mk808.dts b/arch/arm/boot/dts/rk3066a-mk808.dts<br/>new file mode 100644<br/>index 000000000000..7ca1cf5241e0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3066a-mk808.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3066a-mk808.dts</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Paweł Jarosz &lt;paweljarosz3691@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "rk3066a.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Rikomagic MK808";</div><div class='add'>+	compatible = "rikomagic,mk808", "rockchip,rk3066a";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial2:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@60000000 {</div><div class='add'>+		reg = &lt;0x60000000 0x40000000&gt;;</div><div class='add'>+		device_type = "memory";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		blue {</div><div class='add'>+			label = "mk808:blue:power";</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+			linux,default-trigger = "default-on";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_io: vcc-io {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vcc_io";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_host: usb-host-regulator {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		enable-active-high;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PA6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;host_drv&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		regulator-name = "host-pwr";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		startup-delay-us = &lt;100000&gt;;</div><div class='add'>+		vin-supply = &lt;&amp;vcc_io&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_otg: usb-otg-regulator {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		enable-active-high;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PA5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;otg_drv&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		regulator-name = "vcc_otg";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		startup-delay-us = &lt;100000&gt;;</div><div class='add'>+		vin-supply = &lt;&amp;vcc_io&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_sd: sdmmc-regulator {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		gpio = &lt;&amp;gpio3 RK_PA7 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;sdmmc_pwr&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		regulator-name = "vcc_sd";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		startup-delay-us = &lt;100000&gt;;</div><div class='add'>+		vin-supply = &lt;&amp;vcc_io&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_wifi: sdio-regulator {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		enable-active-high;</div><div class='add'>+		gpio = &lt;&amp;gpio3 RK_PD0 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;wifi_pwr&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		regulator-name = "vcc_wifi";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		startup-delay-us = &lt;100000&gt;;</div><div class='add'>+		vin-supply = &lt;&amp;vcc_io&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	num-slots = &lt;1&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_sd&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	disable-wp;</div><div class='add'>+	non-removable;</div><div class='add'>+	num-slots = &lt;1&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;sd1_clk &amp;sd1_cmd &amp;sd1_bus4&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_wifi&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	usb-host {</div><div class='add'>+		host_drv: host-drv {</div><div class='add'>+			rockchip,pins = &lt;RK_GPIO0 6 RK_FUNC_GPIO &amp;pcfg_pull_default&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb-otg {</div><div class='add'>+		otg_drv: otg-drv {</div><div class='add'>+			rockchip,pins = &lt;RK_GPIO0 5 RK_FUNC_GPIO &amp;pcfg_pull_default&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdmmc {</div><div class='add'>+		sdmmc_pwr: sdmmc-pwr {</div><div class='add'>+			rockchip,pins = &lt;RK_GPIO3 7 RK_FUNC_GPIO &amp;pcfg_pull_default&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdio {</div><div class='add'>+		wifi_pwr: wifi-pwr {</div><div class='add'>+			rockchip,pins = &lt;RK_GPIO3 24 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_host {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_otg {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;wdt {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts<br/>index 6e7f2187a0e3..8907deaab18e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3066a-rayeager.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3066a-rayeager.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3066a-rayeager.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3066a-rayeager.dts</a></div><div class='hunk'>@@ -48,14 +48,14 @@</div><div class='ctx'> 	model = "Rayeager PX2";</div><div class='ctx'> 	compatible = "chipspark,rayeager-px2", "rockchip,rk3066a";</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@60000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x60000000 0x40000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ir: ir-receiver {</div><div class='ctx'> 		compatible = "gpio-ir-receiver";</div><div class='del'>-		gpios = &lt;&amp;gpio6 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio6 RK_PA1 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;ir_int&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -65,7 +65,7 @@</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='ctx'> 			wakeup-source;</div><div class='del'>-			gpios = &lt;&amp;gpio6 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio6 RK_PA2 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "GPIO Power";</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -115,7 +115,7 @@</div><div class='ctx'> 	vcc_sata: sata-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio4 22 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio4 RK_PC6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;sata_pwr&gt;;</div><div class='ctx'> 		regulator-name = "usb_5v";</div><div class='hunk'>@@ -127,7 +127,7 @@</div><div class='ctx'> </div><div class='ctx'> 	vcc_sd: sdmmc-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='del'>-		gpio = &lt;&amp;gpio3 7 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio3 RK_PA7 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;sdmmc_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc_sd";</div><div class='hunk'>@@ -140,7 +140,7 @@</div><div class='ctx'> 	vcc_host: usb-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PA6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host_drv&gt;;</div><div class='ctx'> 		regulator-name = "host-pwr";</div><div class='hunk'>@@ -153,7 +153,7 @@</div><div class='ctx'> 	vcc_otg: usb-otg-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PA5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;otg_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_otg";</div><div class='hunk'>@@ -201,7 +201,7 @@</div><div class='ctx'> 		compatible = "asahi-kasei,ak8975";</div><div class='ctx'> 		reg = &lt;0x0d&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio4&gt;;</div><div class='del'>-		interrupts = &lt;17 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PC1 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;comp_int&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -210,7 +210,7 @@</div><div class='ctx'> 		compatible = "fsl,mma8452";</div><div class='ctx'> 		reg = &lt;0x1d&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio4&gt;;</div><div class='del'>-		interrupts = &lt;16 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PC0 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;gsensor_int&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -223,7 +223,7 @@</div><div class='ctx'> 	tps: tps@2d {</div><div class='ctx'> 		reg = &lt;0x2d&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio6&gt;;</div><div class='del'>-		interrupts = &lt;4 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA4 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pmic_int&gt;, &lt;&amp;pwr_hold&gt;;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi<br/>index 0d0dae3a1694..f50481fd8e5c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3066a.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3066a.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3066a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3066a.dtsi</a></div><div class='hunk'>@@ -151,6 +151,14 @@</div><div class='ctx'> </div><div class='ctx'> 		#clock-cells = &lt;1&gt;;</div><div class='ctx'> 		#reset-cells = &lt;1&gt;;</div><div class='add'>+		assigned-clocks = &lt;&amp;cru PLL_CPLL&gt;, &lt;&amp;cru PLL_GPLL&gt;,</div><div class='add'>+				  &lt;&amp;cru ACLK_CPU&gt;, &lt;&amp;cru HCLK_CPU&gt;,</div><div class='add'>+				  &lt;&amp;cru PCLK_CPU&gt;, &lt;&amp;cru ACLK_PERI&gt;,</div><div class='add'>+				  &lt;&amp;cru HCLK_PERI&gt;, &lt;&amp;cru PCLK_PERI&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;400000000&gt;, &lt;594000000&gt;,</div><div class='add'>+				       &lt;300000000&gt;, &lt;150000000&gt;,</div><div class='add'>+				       &lt;75000000&gt;, &lt;300000000&gt;,</div><div class='add'>+				       &lt;150000000&gt;, &lt;75000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	timer@2000e000 {</div><div class='hunk'>@@ -162,7 +170,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	efuse: efuse@20010000 {</div><div class='del'>-		compatible = "rockchip,rockchip-efuse";</div><div class='add'>+		compatible = "rockchip,rk3066a-efuse";</div><div class='ctx'> 		reg = &lt;0x20010000 0x4000&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='hunk'>@@ -197,7 +205,7 @@</div><div class='ctx'> 		clock-names = "saradc", "apb_pclk";</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		#io-channel-cells = &lt;1&gt;;</div><div class='del'>-		resets = &lt;&amp;cru SRST_SARADC&gt;;</div><div class='add'>+		resets = &lt;&amp;cru SRST_TSADC&gt;;</div><div class='ctx'> 		reset-names = "saradc-apb";</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -628,15 +636,26 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc0 {</div><div class='add'>+	clock-frequency = &lt;50000000&gt;;</div><div class='add'>+	dmas = &lt;&amp;dmac2 1&gt;;</div><div class='add'>+	dma-names = "rx-tx";</div><div class='add'>+	max-frequency = &lt;50000000&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sd0_clk &amp;sd0_cmd &amp;sd0_cd &amp;sd0_bus4&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc1 {</div><div class='add'>+	dmas = &lt;&amp;dmac2 3&gt;;</div><div class='add'>+	dma-names = "rx-tx";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sd1_clk &amp;sd1_cmd &amp;sd1_cd &amp;sd1_bus4&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;emmc {</div><div class='add'>+	dmas = &lt;&amp;dmac2 4&gt;;</div><div class='add'>+	dma-names = "rx-tx";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pwm0 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pwm0_out&gt;;</div><div class='hunk'>@@ -668,21 +687,33 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart0 {</div><div class='add'>+	compatible = "rockchip,rk3066-uart", "snps,dw-apb-uart";</div><div class='add'>+	dmas = &lt;&amp;dmac1_s 0&gt;, &lt;&amp;dmac1_s 1&gt;;</div><div class='add'>+	dma-names = "tx", "rx";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart0_xfer&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart1 {</div><div class='add'>+	compatible = "rockchip,rk3066-uart", "snps,dw-apb-uart";</div><div class='add'>+	dmas = &lt;&amp;dmac1_s 2&gt;, &lt;&amp;dmac1_s 3&gt;;</div><div class='add'>+	dma-names = "tx", "rx";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart1_xfer&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart2 {</div><div class='add'>+	compatible = "rockchip,rk3066-uart", "snps,dw-apb-uart";</div><div class='add'>+	dmas = &lt;&amp;dmac2 6&gt;, &lt;&amp;dmac2 7&gt;;</div><div class='add'>+	dma-names = "tx", "rx";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart2_xfer&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart3 {</div><div class='add'>+	compatible = "rockchip,rk3066-uart", "snps,dw-apb-uart";</div><div class='add'>+	dmas = &lt;&amp;dmac2 8&gt;, &lt;&amp;dmac2 9&gt;;</div><div class='add'>+	dma-names = "tx", "rx";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart3_xfer&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3188-px3-evb.dts b/arch/arm/boot/dts/rk3188-px3-evb.dts<br/>new file mode 100644<br/>index 000000000000..5b2a0b6885cd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3188-px3-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3188-px3-evb.dts</a></div><div class='hunk'>@@ -0,0 +1,328 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Andy Yan &lt;andy.yan@rock-chips.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include "rk3188.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Rockchip PX3-EVB";</div><div class='add'>+	compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial2:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@60000000 {</div><div class='add'>+		reg = &lt;0x60000000 0x80000000&gt;;</div><div class='add'>+		device_type = "memory";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		autorepeat;</div><div class='add'>+</div><div class='add'>+		power {</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;KEY_POWER&gt;;</div><div class='add'>+			label = "GPIO Key Power";</div><div class='add'>+			linux,input-type = &lt;1&gt;;</div><div class='add'>+			wakeup-source;</div><div class='add'>+			debounce-interval = &lt;100&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_sys: vsys-regulator {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vsys";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpu0 {</div><div class='add'>+	cpu0-supply = &lt;&amp;vdd_cpu&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;emmc {</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	disable-wp;</div><div class='add'>+	non-removable;</div><div class='add'>+	num-slots = &lt;1&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_clk&gt;, &lt;&amp;emmc_cmd&gt;, &lt;&amp;emmc_rst&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	accelerometer@18 {</div><div class='add'>+		compatible = "bosch,bma250";</div><div class='add'>+		reg = &lt;0x18&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+		interrupts = &lt;RK_PB7 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	clock-frequency = &lt;400000&gt;;</div><div class='add'>+</div><div class='add'>+	rk808: pmic@1c {</div><div class='add'>+		compatible = "rockchip,rk818";</div><div class='add'>+		reg = &lt;0x1c&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+		interrupts = &lt;RK_PB3 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		rockchip,system-power-controller;</div><div class='add'>+		wakeup-source;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+		clock-output-names = "xin32k", "rk808-clkout2";</div><div class='add'>+</div><div class='add'>+		vcc1-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc2-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc3-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc4-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc6-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc7-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc8-supply = &lt;&amp;vcc_io&gt;;</div><div class='add'>+		vcc9-supply = &lt;&amp;vcc_io&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			vdd_cpu: DCDC_REG1 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;750000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1350000&gt;;</div><div class='add'>+				regulator-name = "vdd_arm";</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vdd_gpu: DCDC_REG2 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;850000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1250000&gt;;</div><div class='add'>+				regulator-name = "vdd_gpu";</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-on-in-suspend;</div><div class='add'>+					regulator-suspend-microvolt = &lt;1000000&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc_ddr: DCDC_REG3 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-name = "vcc_ddr";</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-on-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc_io: DCDC_REG4 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-name = "vcc_io";</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-on-in-suspend;</div><div class='add'>+					regulator-suspend-microvolt = &lt;3300000&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc_cif: LDO_REG1 {</div><div class='add'>+				 regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				 regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				 regulator-name = "vcc_cif";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc_jetta33: LDO_REG2 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-name = "vcc_jetta33";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vdd_10: LDO_REG3 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-name = "vdd_10";</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-on-in-suspend;</div><div class='add'>+					regulator-suspend-microvolt = &lt;1000000&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			lvds_12: LDO_REG4 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-name = "lvds_12";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			lvds_25: LDO_REG5 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-name = "lvds_25";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cif_18: LDO_REG6 {</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-name = "cif_18";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc_sd: LDO_REG7 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-name = "vcc_sd";</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-on-in-suspend;</div><div class='add'>+					regulator-suspend-microvolt = &lt;3300000&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			wl_18: LDO_REG8 {</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-name = "wl_18";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			lcd_33: SWITCH_REG1 {</div><div class='add'>+				regulator-name = "lcd_33";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	gsl1680: touchscreen@40 {</div><div class='add'>+		compatible = "silead,gsl1680";</div><div class='add'>+		reg = &lt;0x40&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+		interrupts = &lt;RK_PB7 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		power-gpios = &lt;&amp;gpio0 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		touchscreen-size-x = &lt;800&gt;;</div><div class='add'>+		touchscreen-size-y = &lt;1280&gt;;</div><div class='add'>+		silead,max-fingers = &lt;5&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	num-slots = &lt;1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sd0_clk&gt;, &lt;&amp;sd0_cmd&gt;, &lt;&amp;sd0_cd&gt;, &lt;&amp;sd0_bus4&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_sd&gt;;</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	disable-wp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	pcfg_output_low: pcfg-output-low {</div><div class='add'>+		output-low;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb {</div><div class='add'>+		host_vbus_drv: host-vbus-drv {</div><div class='add'>+			rockchip,pins = &lt;0 3 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;;</div><div class='add'>+		};</div><div class='add'>+		otg_vbus_drv: otg-vbus-drv {</div><div class='add'>+			rockchip,pins = &lt;2 31 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_host {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_otg {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;wdt {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts<br/>index 1da46d138029..ca0a1c4bc15c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3188-radxarock.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3188-radxarock.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3188-radxarock.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3188-radxarock.dts</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> 	model = "Radxa Rock";</div><div class='ctx'> 	compatible = "radxa,rock", "rockchip,rk3188";</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@60000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x60000000 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -58,7 +58,7 @@</div><div class='ctx'> 		autorepeat;</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='del'>-			gpios = &lt;&amp;gpio0 4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA4 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			label = "GPIO Key Power";</div><div class='ctx'> 			linux,input-type = &lt;1&gt;;</div><div class='hunk'>@@ -72,19 +72,19 @@</div><div class='ctx'> </div><div class='ctx'> 		green {</div><div class='ctx'> 			label = "rock:green:user1";</div><div class='del'>-			gpios = &lt;&amp;gpio0 12 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PB4 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		blue {</div><div class='ctx'> 			label = "rock:blue:user2";</div><div class='del'>-			gpios = &lt;&amp;gpio0 14 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PB6 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sleep {</div><div class='ctx'> 			label = "rock:red:power";</div><div class='del'>-			gpios = &lt;&amp;gpio0 15 0&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PB7 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -106,7 +106,7 @@</div><div class='ctx'> </div><div class='ctx'> 	ir_recv: gpio-ir-receiver {</div><div class='ctx'> 		compatible = "gpio-ir-receiver";</div><div class='del'>-		gpios = &lt;&amp;gpio0 10 1&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio0 RK_PB2 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;ir_recv_pin&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -114,7 +114,7 @@</div><div class='ctx'> 	vcc_otg: usb-otg-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio2 31 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio2 RK_PD7 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;otg_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "otg-vbus";</div><div class='hunk'>@@ -129,7 +129,7 @@</div><div class='ctx'> 		regulator-name = "sdmmc-supply";</div><div class='ctx'> 		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='ctx'> 		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-		gpio = &lt;&amp;gpio3 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio3 RK_PA1 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		startup-delay-us = &lt;100000&gt;;</div><div class='ctx'> 		vin-supply = &lt;&amp;vcc_io&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -137,7 +137,7 @@</div><div class='ctx'> 	vcc_host: usb-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PA3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "host-pwr";</div><div class='hunk'>@@ -168,7 +168,7 @@</div><div class='ctx'> 	phy0: ethernet-phy@0 {</div><div class='ctx'> 		reg = &lt;0&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio3&gt;;</div><div class='del'>-		interrupts = &lt;26 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PD2 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -184,7 +184,7 @@</div><div class='ctx'> 		compatible = "haoyu,hym8563";</div><div class='ctx'> 		reg = &lt;0x51&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='del'>-		interrupts = &lt;13 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PB5 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;rtc_int&gt;;</div><div class='ctx'> 		#clock-cells = &lt;0&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi<br/>index 31f81b265cef..cf91254d0a43 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3188.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3188.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3188.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3188.dtsi</a></div><div class='hunk'>@@ -147,7 +147,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	efuse: efuse@20010000 {</div><div class='del'>-		compatible = "rockchip,rockchip-efuse";</div><div class='add'>+		compatible = "rockchip,rk3188-efuse";</div><div class='ctx'> 		reg = &lt;0x20010000 0x4000&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='hunk'>@@ -599,21 +599,25 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart0 {</div><div class='add'>+	compatible = "rockchip,rk3188-uart", "snps,dw-apb-uart";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart0_xfer&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart1 {</div><div class='add'>+	compatible = "rockchip,rk3188-uart", "snps,dw-apb-uart";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart1_xfer&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart2 {</div><div class='add'>+	compatible = "rockchip,rk3188-uart", "snps,dw-apb-uart";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart2_xfer&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart3 {</div><div class='add'>+	compatible = "rockchip,rk3188-uart", "snps,dw-apb-uart";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart3_xfer&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3228-evb.dts b/arch/arm/boot/dts/rk3228-evb.dts<br/>index 904668e2e666..58834330a5ba 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3228-evb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3228-evb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3228-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3228-evb.dts</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> 	model = "Rockchip RK3228 Evaluation board";</div><div class='ctx'> 	compatible = "rockchip,rk3228-evb", "rockchip,rk3228";</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@60000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x60000000 0x40000000&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3229-evb.dts b/arch/arm/boot/dts/rk3229-evb.dts<br/>index b6a12035a6bb..275092a950ef 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3229-evb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3229-evb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3229-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3229-evb.dts</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> 	model = "Rockchip RK3229 Evaluation board";</div><div class='ctx'> 	compatible = "rockchip,rk3229-evb", "rockchip,rk3229";</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@60000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x60000000 0x40000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -77,7 +77,7 @@</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;rgmii_pins&gt;;</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio2 24 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio2 RK_PD0 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='ctx'> 	tx_delay = &lt;0x30&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi<br/>index 9e6bf0e311bb..9dff8221112c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk322x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk322x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk322x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk322x.dtsi</a></div><div class='hunk'>@@ -44,9 +44,11 @@</div><div class='ctx'> #include &lt;dt-bindings/pinctrl/rockchip.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/clock/rk3228-cru.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/thermal/thermal.h&gt;</div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='hunk'>@@ -402,7 +404,7 @@</div><div class='ctx'> 		reg = &lt;0x30020000 0x4000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		clock-frequency = &lt;37500000&gt;;</div><div class='del'>-		clock-freq-min-max = &lt;400000 37500000&gt;;</div><div class='add'>+		max-frequency = &lt;37500000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_EMMC&gt;, &lt;&amp;cru SCLK_EMMC&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_EMMC_DRV&gt;, &lt;&amp;cru SCLK_EMMC_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";</div><div class='hunk'>@@ -441,7 +443,7 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='ctx'> 		reg = &lt;0x32011000 0x1000&gt;,</div><div class='del'>-		      &lt;0x32012000 0x1000&gt;,</div><div class='add'>+		      &lt;0x32012000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x32014000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x32016000 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-evb-act8846.dts b/arch/arm/boot/dts/rk3288-evb-act8846.dts<br/>index 041dd5d2d18c..b9418d170502 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-evb-act8846.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-evb-act8846.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-evb-act8846.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-evb-act8846.dts</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'> 	vcc_lcd: vcc-lcd {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio7 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PA3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;lcd_en&gt;;</div><div class='ctx'> 		regulator-name = "vcc_lcd";</div><div class='hunk'>@@ -57,7 +57,7 @@</div><div class='ctx'> 	vcc_wl: vcc-wl {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio7 9 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB1 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;wifi_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc_wl";</div><div class='hunk'>@@ -96,7 +96,7 @@</div><div class='ctx'> 		reg = &lt;0x51&gt;;</div><div class='ctx'> </div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='del'>-		interrupts = &lt;4 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA4 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> </div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pmic_int&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-evb-rk808.dts b/arch/arm/boot/dts/rk3288-evb-rk808.dts<br/>index 44ebc6e59b3a..56c266df01c1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-evb-rk808.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-evb-rk808.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-evb-rk808.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-evb-rk808.dts</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> 		compatible = "rockchip,rk808";</div><div class='ctx'> 		reg = &lt;0x1b&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='del'>-		interrupts = &lt;4 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA4 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pmic_int &amp;global_pwroff&gt;;</div><div class='ctx'> 		rockchip,system-power-controller;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi<br/>index d59208b5eb6c..0dec94c3583b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-evb.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-evb.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-evb.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-evb.dtsi</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #include "rk3288.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x0 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -84,7 +84,7 @@</div><div class='ctx'> 			240 241 242 243 244 245 246 247</div><div class='ctx'> 			248 249 250 251 252 253 254 255&gt;;</div><div class='ctx'> 		default-brightness-level = &lt;128&gt;;</div><div class='del'>-		enable-gpios = &lt;&amp;gpio7 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-gpios = &lt;&amp;gpio7 RK_PA2 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;bl_en&gt;;</div><div class='ctx'> 		pwms = &lt;&amp;pwm0 0 1000000 PWM_POLARITY_INVERTED&gt;;</div><div class='hunk'>@@ -100,7 +100,7 @@</div><div class='ctx'> 	panel: panel {</div><div class='ctx'> 		compatible ="lg,lp079qx1-sp0v", "simple-panel";</div><div class='ctx'> 		backlight = &lt;&amp;backlight&gt;;</div><div class='del'>-		enable-gpios = &lt;&amp;gpio7 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-gpios = &lt;&amp;gpio7 RK_PA4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;lcd_cs&gt;;</div><div class='ctx'> </div><div class='ctx'> 		ports {</div><div class='hunk'>@@ -120,7 +120,7 @@</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pwrbtn&gt;;</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='del'>-			gpios = &lt;&amp;gpio0 5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA5 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			label = "GPIO Key Power";</div><div class='ctx'> 			linux,input-type = &lt;1&gt;;</div><div class='hunk'>@@ -133,7 +133,7 @@</div><div class='ctx'> 	vcc_host: vcc-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_host";</div><div class='hunk'>@@ -144,7 +144,7 @@</div><div class='ctx'> 	vcc_phy: vcc-phy-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PA6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;eth_phy_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc_phy";</div><div class='hunk'>@@ -170,7 +170,7 @@</div><div class='ctx'> 	 */</div><div class='ctx'> 	vcc_sd: sdmmc-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='del'>-		gpio = &lt;&amp;gpio7 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;sdmmc_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc_sd";</div><div class='hunk'>@@ -236,7 +236,7 @@</div><div class='ctx'> 	phy-supply = &lt;&amp;vcc_phy&gt;;</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	clock_in_out = "input";</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio4 7 0&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio4 RK_PA7 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='ctx'> 	assigned-clocks = &lt;&amp;cru SCLK_MAC&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-fennec.dts b/arch/arm/boot/dts/rk3288-fennec.dts<br/>index 2e3c34135ed8..61d1c1028317 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-fennec.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-fennec.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-fennec.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-fennec.dts</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> 	model = "Rockchip RK3288 Fennec Board";</div><div class='ctx'> 	compatible = "rockchip,rk3288-fennec", "rockchip,rk3288";</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		reg = &lt;0x0 0x80000000&gt;;</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -93,7 +93,7 @@</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio4 8 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio4 RK_PB0 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	tx_delay = &lt;0x30&gt;;</div><div class='ctx'> 	rx_delay = &lt;0x10&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='hunk'>@@ -111,7 +111,7 @@</div><div class='ctx'> 		compatible = "rockchip,rk808";</div><div class='ctx'> 		reg = &lt;0x1b&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='del'>-		interrupts = &lt;4 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA4 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 		#clock-cells = &lt;1&gt;;</div><div class='ctx'> 		clock-output-names = "xin32k", "rk808-clkout2";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -345,7 +345,7 @@</div><div class='ctx'> &amp;usbphy {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;host_drv&gt;;</div><div class='del'>-	vbus_drv-gpios = &lt;&amp;gpio0 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	vbus_drv-gpios = &lt;&amp;gpio0 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts b/arch/arm/boot/dts/rk3288-firefly-beta.dts<br/>index 75d77e38e0d6..0195d9721660 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-firefly-beta.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-firefly-beta.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-firefly-beta.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-firefly-beta.dts</a></div><div class='hunk'>@@ -49,7 +49,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ir {</div><div class='del'>-	gpios = &lt;&amp;gpio7 5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	gpios = &lt;&amp;gpio7 RK_PA5 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;pinctrl {</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi<br/>index ec418c99de95..813496618d08 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> #include "rk3288.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -96,7 +96,7 @@</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio4 8 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio4 RK_PB0 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	tx_delay = &lt;0x30&gt;;</div><div class='ctx'> 	rx_delay = &lt;0x10&gt;;</div><div class='ctx'> 	status = "ok";</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts<br/>index 751bee81128e..d0b3204a4799 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-firefly-reload.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-firefly-reload.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-firefly-reload.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-firefly-reload.dts</a></div><div class='hunk'>@@ -53,7 +53,7 @@</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='ctx'> 			wakeup-source;</div><div class='del'>-			gpios = &lt;&amp;gpio0 5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA5 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "GPIO Power";</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -63,14 +63,14 @@</div><div class='ctx'> </div><div class='ctx'> 	ir-receiver {</div><div class='ctx'> 		compatible = "gpio-ir-receiver";</div><div class='del'>-		gpios = &lt;&amp;gpio7 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio7 RK_PA0 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='del'>-			gpios = &lt;&amp;gpio8 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio8 RK_PA2 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "firefly:blue:power";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='ctx'> 			pinctrl-0 = &lt;&amp;power_led&gt;;</div><div class='hunk'>@@ -78,7 +78,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		work {</div><div class='del'>-			gpios = &lt;&amp;gpio8 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio8 RK_PA1 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "firefly:blue:user";</div><div class='ctx'> 			linux,default-trigger = "rc-feedback";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -92,7 +92,7 @@</div><div class='ctx'> 		clock-names = "ext_clock";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;wifi_enable&gt;;</div><div class='del'>-		reset-gpios = &lt;&amp;gpio4 28 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio4 RK_PD4 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sound {</div><div class='hunk'>@@ -112,7 +112,7 @@</div><div class='ctx'> 	vcc_host_5v: usb-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_host_5v";</div><div class='hunk'>@@ -133,7 +133,7 @@</div><div class='ctx'> </div><div class='ctx'> 	vcc_sd: sdmmc-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='del'>-		gpio = &lt;&amp;gpio7 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;sdmmc_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc_sd";</div><div class='hunk'>@@ -146,7 +146,7 @@</div><div class='ctx'> 	vcc_otg_5v: usb-otg-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;otg_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_otg_5v";</div><div class='hunk'>@@ -159,7 +159,7 @@</div><div class='ctx'> 	dovdd_1v8: dovdd-1v8-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 11 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;dvp_pwr&gt;;</div><div class='ctx'> 		regulator-name = "dovdd_1v8";</div><div class='hunk'>@@ -171,7 +171,7 @@</div><div class='ctx'> 	vcc28_dvp: vcc28-dvp-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 11 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;dvp_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc28_dvp";</div><div class='hunk'>@@ -183,7 +183,7 @@</div><div class='ctx'> 	af_28: af_28-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 11 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;dvp_pwr&gt;;</div><div class='ctx'> 		regulator-name = "af_28";</div><div class='hunk'>@@ -195,7 +195,7 @@</div><div class='ctx'> 	dvdd_1v2: af_28-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio7 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;cif_pwr&gt;;</div><div class='ctx'> 		regulator-name = "dvdd_1v2";</div><div class='hunk'>@@ -221,7 +221,7 @@</div><div class='ctx'> 		clock-frequency = &lt;32768&gt;;</div><div class='ctx'> 		clock-output-names = "xin32k";</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio7&gt;;</div><div class='del'>-		interrupts = &lt;4 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA4 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;rtc_int&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-firefly.dts b/arch/arm/boot/dts/rk3288-firefly.dts<br/>index c07fe92dc69f..14271be72f30 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-firefly.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-firefly.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-firefly.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-firefly.dts</a></div><div class='hunk'>@@ -49,7 +49,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ir {</div><div class='del'>-	gpios = &lt;&amp;gpio7 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	gpios = &lt;&amp;gpio7 RK_PA0 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;pinctrl {</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi<br/>index 114c90fb65e2..10793ac18599 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-firefly.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-firefly.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-firefly.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-firefly.dtsi</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> #include "rk3288.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -75,7 +75,7 @@</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='ctx'> 			wakeup-source;</div><div class='del'>-			gpios = &lt;&amp;gpio0 5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA5 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "GPIO Power";</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -87,7 +87,7 @@</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> </div><div class='ctx'> 		work {</div><div class='del'>-			gpios = &lt;&amp;gpio8 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio8 RK_PA1 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "firefly:blue:user";</div><div class='ctx'> 			linux,default-trigger = "rc-feedback";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -95,7 +95,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='del'>-			gpios = &lt;&amp;gpio8 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio8 RK_PA2 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "firefly:green:power";</div><div class='ctx'> 			linux,default-trigger = "default-on";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -114,7 +114,7 @@</div><div class='ctx'> </div><div class='ctx'> 	vcc_sd: sdmmc-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='del'>-		gpio = &lt;&amp;gpio7 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;sdmmc_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc_sd";</div><div class='hunk'>@@ -145,7 +145,7 @@</div><div class='ctx'> 	vcc_host_5v: usb-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_host_5v";</div><div class='hunk'>@@ -158,7 +158,7 @@</div><div class='ctx'> 	vcc_otg_5v: usb-otg-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;otg_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_otg_5v";</div><div class='hunk'>@@ -175,7 +175,7 @@</div><div class='ctx'> 	vcc28_dvp: vcc28-dvp-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 11 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;dvp_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc28_dvp";</div><div class='hunk'>@@ -213,7 +213,7 @@</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio4 8 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio4 RK_PB0 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	tx_delay = &lt;0x30&gt;;</div><div class='ctx'> 	rx_delay = &lt;0x10&gt;;</div><div class='ctx'> 	status = "ok";</div><div class='hunk'>@@ -260,7 +260,7 @@</div><div class='ctx'> 		clock-frequency = &lt;32768&gt;;</div><div class='ctx'> 		clock-output-names = "xin32k";</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio7&gt;;</div><div class='del'>-		interrupts = &lt;4 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA4 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;rtc_int&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts<br/>index 24488421f0f0..21326f3e8564 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-miqi.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-miqi.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-miqi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-miqi.dts</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> 		stdout-path = "serial2:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -68,7 +68,7 @@</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> </div><div class='ctx'> 		work {</div><div class='del'>-			gpios = &lt;&amp;gpio7 4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio7 RK_PA4 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "miqi:green:user";</div><div class='ctx'> 			linux,default-trigger = "default-on";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -87,7 +87,7 @@</div><div class='ctx'> 	vcc_host: usb-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_host";</div><div class='hunk'>@@ -99,7 +99,7 @@</div><div class='ctx'> </div><div class='ctx'> 	vcc_sd: sdmmc-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='del'>-		gpio = &lt;&amp;gpio7 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;sdmmc_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc_sd";</div><div class='hunk'>@@ -146,7 +146,7 @@</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio4 8 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio4 RK_PB0 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	tx_delay = &lt;0x30&gt;;</div><div class='ctx'> 	rx_delay = &lt;0x10&gt;;</div><div class='ctx'> 	status = "ok";</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts<br/>index 56dd377d5658..aa1f9ecff231 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-popmetal.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-popmetal.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-popmetal.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-popmetal.dts</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> 	model = "PopMetal-RK3288";</div><div class='ctx'> 	compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288";</div><div class='ctx'> </div><div class='del'>-	memory{</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -68,7 +68,7 @@</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pwrbtn&gt;;</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='del'>-			gpios = &lt;&amp;gpio0 5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA5 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			label = "GPIO Key Power";</div><div class='ctx'> 			linux,input-type = &lt;1&gt;;</div><div class='hunk'>@@ -79,7 +79,7 @@</div><div class='ctx'> </div><div class='ctx'> 	ir: ir-receiver {</div><div class='ctx'> 		compatible = "gpio-ir-receiver";</div><div class='del'>-		gpios = &lt;&amp;gpio0 6 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio0 RK_PA6 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;ir_int&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -94,7 +94,7 @@</div><div class='ctx'> </div><div class='ctx'> 	vcc_sd: sdmmc-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='del'>-		gpio = &lt;&amp;gpio7 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;sdmmc_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc_sd";</div><div class='hunk'>@@ -128,7 +128,7 @@</div><div class='ctx'> 	vcc28_dvp: vcc28-dvp-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 17 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PC1 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;dvp_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc28_dvp";</div><div class='hunk'>@@ -147,6 +147,8 @@</div><div class='ctx'> 	bus-width = &lt;8&gt;;</div><div class='ctx'> 	cap-mmc-highspeed;</div><div class='ctx'> 	disable-wp;</div><div class='add'>+	mmc-ddr-1_8v;</div><div class='add'>+	mmc-hs200-1_8v;</div><div class='ctx'> 	non-removable;</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='hunk'>@@ -165,6 +167,10 @@</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sdmmc_clk &amp;sdmmc_cmd &amp;sdmmc_cd &amp;sdmmc_bus4&gt;;</div><div class='add'>+	sd-uhs-sdr12;</div><div class='add'>+	sd-uhs-sdr25;</div><div class='add'>+	sd-uhs-sdr50;</div><div class='add'>+	sd-uhs-sdr104;</div><div class='ctx'> 	vmmc-supply = &lt;&amp;vcc_sd&gt;;</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;vccio_sd&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='hunk'>@@ -174,7 +180,7 @@</div><div class='ctx'> 	phy-supply = &lt;&amp;vcc_lan&gt;;</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	clock_in_out = "input";</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio4 7 0&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio4 RK_PB0 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='ctx'> 	assigned-clocks = &lt;&amp;cru SCLK_MAC&gt;;</div><div class='hunk'>@@ -199,7 +205,7 @@</div><div class='ctx'> 		compatible = "rockchip,rk808";</div><div class='ctx'> 		reg = &lt;0x1b&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='del'>-		interrupts = &lt;4 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA4 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pmic_int &amp;global_pwroff&gt;;</div><div class='ctx'> 		rockchip,system-power-controller;</div><div class='hunk'>@@ -280,7 +286,7 @@</div><div class='ctx'> 			vccio_sd: LDO_REG2 {</div><div class='ctx'> 				regulator-always-on;</div><div class='ctx'> 				regulator-boot-on;</div><div class='del'>-				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='ctx'> 				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='ctx'> 				regulator-name = "vccio_sd";</div><div class='ctx'> 				regulator-state-mem {</div><div class='hunk'>@@ -384,7 +390,7 @@</div><div class='ctx'> 		compatible = "asahi-kasei,ak8975";</div><div class='ctx'> 		reg = &lt;0x0d&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio8&gt;;</div><div class='del'>-		interrupts = &lt;1 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA1 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;comp_int&gt;;</div><div class='ctx'> 		vdd-supply = &lt;&amp;vcc_io&gt;;</div><div class='hunk'>@@ -403,7 +409,7 @@</div><div class='ctx'> 		compatible = "fsl,mma8452";</div><div class='ctx'> 		reg = &lt;0x1d&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio8&gt;;</div><div class='del'>-		interrupts = &lt;0 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA0 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;gsensor_int&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -443,43 +449,43 @@</div><div class='ctx'> &amp;pinctrl {</div><div class='ctx'> 	ak8963 {</div><div class='ctx'> 		comp_int: comp-int {</div><div class='del'>-			rockchip,pins = &lt;8 1 RK_FUNC_GPIO &amp;pcfg_pull_up&gt;;</div><div class='add'>+			rockchip,pins = &lt;8 RK_PA1 RK_FUNC_GPIO &amp;pcfg_pull_up&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	buttons {</div><div class='ctx'> 		pwrbtn: pwrbtn {</div><div class='del'>-			rockchip,pins = &lt;0 5 RK_FUNC_GPIO &amp;pcfg_pull_up&gt;;</div><div class='add'>+			rockchip,pins = &lt;0 RK_PA5 RK_FUNC_GPIO &amp;pcfg_pull_up&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dvp {</div><div class='ctx'> 		dvp_pwr: dvp-pwr {</div><div class='del'>-			rockchip,pins = &lt;0 17 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;;</div><div class='add'>+			rockchip,pins = &lt;0 RK_PC1 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ir {</div><div class='ctx'> 		ir_int: ir-int {</div><div class='del'>-			rockchip,pins = &lt;0 6 RK_FUNC_GPIO &amp;pcfg_pull_up&gt;;</div><div class='add'>+			rockchip,pins = &lt;0 RK_PA6 RK_FUNC_GPIO &amp;pcfg_pull_up&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mma8452 {</div><div class='ctx'> 		gsensor_int: gsensor-int {</div><div class='del'>-			rockchip,pins = &lt;8 0 RK_FUNC_GPIO &amp;pcfg_pull_up&gt;;</div><div class='add'>+			rockchip,pins = &lt;8 RK_PA0 RK_FUNC_GPIO &amp;pcfg_pull_up&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pmic {</div><div class='ctx'> 		pmic_int: pmic-int {</div><div class='del'>-			rockchip,pins = &lt;RK_GPIO0 4 RK_FUNC_GPIO &amp;pcfg_pull_up&gt;;</div><div class='add'>+			rockchip,pins = &lt;0 RK_PA4 RK_FUNC_GPIO &amp;pcfg_pull_up&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdmmc {</div><div class='ctx'> 		sdmmc_pwr: sdmmc-pwr {</div><div class='del'>-			rockchip,pins = &lt;7 11 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;;</div><div class='add'>+			rockchip,pins = &lt;7 RK_PB3 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts<br/>index 4b8a8adb243c..1145b62edde7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-r89.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-r89.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-r89.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-r89.dts</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "netxeon,r89", "rockchip,rk3288";</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x0 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -68,7 +68,7 @@</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pwrbtn&gt;;</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='del'>-			gpios = &lt;&amp;gpio0 5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA5 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			label = "GPIO Key Power";</div><div class='ctx'> 			linux,input-type = &lt;1&gt;;</div><div class='hunk'>@@ -79,7 +79,7 @@</div><div class='ctx'> </div><div class='ctx'> 	ir: ir-receiver {</div><div class='ctx'> 		compatible = "gpio-ir-receiver";</div><div class='del'>-		gpios = &lt;&amp;gpio7 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio7 RK_PA0 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;ir_int&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -87,7 +87,7 @@</div><div class='ctx'> 	vcc_host: vcc-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_host";</div><div class='hunk'>@@ -98,7 +98,7 @@</div><div class='ctx'> 	vcc_otg: vcc-otg-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;otg_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_otg";</div><div class='hunk'>@@ -111,7 +111,7 @@</div><div class='ctx'> 		regulator-name = "sdmmc-supply";</div><div class='ctx'> 		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='ctx'> 		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-		gpio = &lt;&amp;gpio7 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		startup-delay-us = &lt;100000&gt;;</div><div class='ctx'> 		vin-supply = &lt;&amp;vcc_io&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -134,7 +134,7 @@</div><div class='ctx'> 	phy-supply = &lt;&amp;vcc_lan&gt;;</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	clock_in_out = "input";</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio4 7 0&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio4 RK_PA7 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='ctx'> 	assigned-clocks = &lt;&amp;cru SCLK_MAC&gt;;</div><div class='hunk'>@@ -187,7 +187,7 @@</div><div class='ctx'> 		#clock-cells = &lt;0&gt;;</div><div class='ctx'> 		clock-output-names = "xin32k";</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='del'>-		interrupts = &lt;4 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA4 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pmic_int&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rk3288-rock2-som.dtsi<br/>index bb1f01e037ba..1c0bbc9b928b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-rock2-som.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-rock2-som.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-rock2-som.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-rock2-som.dtsi</a></div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> #include "rk3288.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		reg = &lt;0x0 0x80000000&gt;;</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -51,7 +51,7 @@</div><div class='ctx'> 		compatible = "mmc-pwrseq-emmc";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;emmc_reset&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='del'>-		reset-gpios = &lt;&amp;gpio3 9 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio3 RK_PB1 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ext_gmac: external-gmac-clock {</div><div class='hunk'>@@ -106,7 +106,7 @@</div><div class='ctx'> 	phy-supply = &lt;&amp;vccio_pmu&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;rgmii_pins &amp;phy_rst&gt;;</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio4 8 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio4 RK_PB0 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 30000&gt;;</div><div class='ctx'> 	rx_delay = &lt;0x10&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-rock2-square.dts b/arch/arm/boot/dts/rk3288-rock2-square.dts<br/>index dd3ad2e93a6d..96a2e745bb93 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-rock2-square.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-rock2-square.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-rock2-square.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-rock2-square.dts</a></div><div class='hunk'>@@ -53,13 +53,13 @@</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> </div><div class='ctx'> 		heartbeat {</div><div class='del'>-			gpios = &lt;&amp;gpio7 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio7 RK_PB7 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "rock2:green:state1";</div><div class='ctx'> 			linux,default-trigger = "heartbeat";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		mmc {</div><div class='del'>-			gpios = &lt;&amp;gpio0 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PB3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "rock2:blue:state2";</div><div class='ctx'> 			linux,default-trigger = "mmc0";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -67,7 +67,7 @@</div><div class='ctx'> </div><div class='ctx'> 	ir: ir-receiver {</div><div class='ctx'> 		compatible = "gpio-ir-receiver";</div><div class='del'>-		gpios = &lt;&amp;gpio8 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio8 RK_PA1 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;ir_int&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -92,13 +92,13 @@</div><div class='ctx'> 		clock-names = "ext_clock";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;wifi_enable&gt;;</div><div class='del'>-		reset-gpios = &lt;&amp;gpio4 28 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio4 RK_PD4 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	vcc_usb_host: vcc-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host_vbus_drv&gt;;</div><div class='ctx'> 		/* Always on as the rockchip usb phy doesn't have a vbus-supply</div><div class='hunk'>@@ -110,7 +110,7 @@</div><div class='ctx'> </div><div class='ctx'> 	vcc_sd: sdmmc-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='del'>-		gpio = &lt;&amp;gpio7 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;sdmmc_pwr&gt;;</div><div class='ctx'> 		regulator-name = "vcc_sd";</div><div class='hunk'>@@ -166,7 +166,7 @@</div><div class='ctx'> 		clock-frequency = &lt;32768&gt;;</div><div class='ctx'> 		clock-output-names = "xin32k";</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='del'>-		interrupts = &lt;4 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA4 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pmic_int&gt;;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi b/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi<br/>index 6d105914a4f3..280aceae25d5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> 		rockchip,model = "VEYRON-I2S";</div><div class='ctx'> 		rockchip,i2s-controller = &lt;&amp;i2s&gt;;</div><div class='ctx'> 		rockchip,audio-codec = &lt;&amp;max98090&gt;;</div><div class='del'>-		rockchip,hp-det-gpios = &lt;&amp;gpio6 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-		rockchip,mic-det-gpios = &lt;&amp;gpio6 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		rockchip,hp-det-gpios = &lt;&amp;gpio6 RK_PA5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		rockchip,mic-det-gpios = &lt;&amp;gpio6 RK_PB3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		rockchip,headset-codec = &lt;&amp;headsetcodec&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> 		compatible = "maxim,max98090";</div><div class='ctx'> 		reg = &lt;0x10&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio6&gt;;</div><div class='del'>-		interrupts = &lt;7 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA7 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 		clock-names = "mclk";</div><div class='ctx'> 		clocks = &lt;&amp;cru SCLK_I2S0_OUT&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> 		compatible = "ti,ts3a227e";</div><div class='ctx'> 		reg = &lt;0x3b&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='del'>-		interrupts = &lt;3 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA3 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;ts3a227e_int_l&gt;;</div><div class='ctx'> 		ti,micbias = &lt;7&gt;;		/* MICBIAS = 2.8V */</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron-brain.dts b/arch/arm/boot/dts/rk3288-veyron-brain.dts<br/>index cf5311d2617c..ed4255294ad4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-brain.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-veyron-brain.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-brain.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-brain.dts</a></div><div class='hunk'>@@ -67,7 +67,7 @@</div><div class='ctx'> 	vcc5_host2: vcc5-host2-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;usb2_pwr_en&gt;;</div><div class='ctx'> 		regulator-name = "vcc5_host2";</div><div class='hunk'>@@ -103,8 +103,8 @@</div><div class='ctx'> &amp;rk808 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pmic_int_l &amp;dvs_1 &amp;dvs_2&gt;;</div><div class='del'>-	dvs-gpios = &lt;&amp;gpio7 11 GPIO_ACTIVE_HIGH&gt;,</div><div class='del'>-		    &lt;&amp;gpio7 15 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	dvs-gpios = &lt;&amp;gpio7 RK_PB3 GPIO_ACTIVE_HIGH&gt;,</div><div class='add'>+		    &lt;&amp;gpio7 RK_PB7 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 	/delete-property/ vcc6-supply;</div><div class='ctx'> </div><div class='hunk'>@@ -133,7 +133,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;vcc50_hdmi {</div><div class='ctx'> 	enable-active-high;</div><div class='del'>-	gpio = &lt;&amp;gpio7 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	gpio = &lt;&amp;gpio7 RK_PA2 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;vcc50_hdmi_en&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi<br/>index ce1f87980bcb..d752a315f884 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi</a></div><div class='hunk'>@@ -91,7 +91,7 @@</div><div class='ctx'> 			240 241 242 243 244 245 246 247</div><div class='ctx'> 			248 249 250 251 252 253 254 255&gt;;</div><div class='ctx'> 		default-brightness-level = &lt;128&gt;;</div><div class='del'>-		enable-gpios = &lt;&amp;gpio7 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-gpios = &lt;&amp;gpio7 RK_PA2 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		backlight-boot-off;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;bl_en&gt;;</div><div class='hunk'>@@ -102,7 +102,7 @@</div><div class='ctx'> 	gpio-charger {</div><div class='ctx'> 		compatible = "gpio-charger";</div><div class='ctx'> 		charger-type = "mains";</div><div class='del'>-		gpios = &lt;&amp;gpio0 8 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio0 RK_PB0 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;ac_present_ap&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -142,7 +142,7 @@</div><div class='ctx'> 	vcc5_host1: vcc5-host1-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 11 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host1_pwr_en&gt;;</div><div class='ctx'> 		regulator-name = "vcc5_host1";</div><div class='hunk'>@@ -154,7 +154,7 @@</div><div class='ctx'> 	vcc5v_otg: vcc5v-otg-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;usbotg_pwren_h&gt;;</div><div class='ctx'> 		regulator-name = "vcc5_host2";</div><div class='hunk'>@@ -190,7 +190,7 @@</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pwr_key_l &amp;ap_lid_int_l&gt;;</div><div class='ctx'> 	lid {</div><div class='ctx'> 		label = "Lid";</div><div class='del'>-		gpios = &lt;&amp;gpio0 6 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio0 RK_PA6 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		wakeup-source;</div><div class='ctx'> 		linux,code = &lt;0&gt;; /* SW_LID */</div><div class='ctx'> 		linux,input-type = &lt;5&gt;; /* EV_SW */</div><div class='hunk'>@@ -228,7 +228,7 @@</div><div class='ctx'> 		reg = &lt;0&gt;;</div><div class='ctx'> 		google,cros-ec-spi-pre-delay = &lt;30&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio7&gt;;</div><div class='del'>-		interrupts = &lt;7 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA7 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;ec_int&gt;;</div><div class='ctx'> 		spi-max-frequency = &lt;3000000&gt;;</div><div class='hunk'>@@ -247,7 +247,7 @@</div><div class='ctx'> 		compatible = "elan,ekth3000";</div><div class='ctx'> 		reg = &lt;0x15&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio7&gt;;</div><div class='del'>-		interrupts = &lt;3 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA3 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;trackpad_int&gt;;</div><div class='ctx'> 		vcc-supply = &lt;&amp;vcc33_io&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron-jaq.dts b/arch/arm/boot/dts/rk3288-veyron-jaq.dts<br/>index 3748abf562b1..d33f5763c39c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-jaq.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-veyron-jaq.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-jaq.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-jaq.dts</a></div><div class='hunk'>@@ -57,7 +57,7 @@</div><div class='ctx'> 	panel_regulator: panel-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio7 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;lcd_enable_h&gt;;</div><div class='ctx'> 		regulator-name = "panel_regulator";</div><div class='hunk'>@@ -68,7 +68,7 @@</div><div class='ctx'> 	vcc18_lcd: vcc18-lcd {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio2 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio2 RK_PB5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;avdd_1v8_disp_en&gt;;</div><div class='ctx'> 		regulator-name = "vcc18_lcd";</div><div class='hunk'>@@ -80,7 +80,7 @@</div><div class='ctx'> 	backlight_regulator: backlight-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio2 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio2 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;bl_pwr_en&gt;;</div><div class='ctx'> 		regulator-name = "backlight_regulator";</div><div class='hunk'>@@ -134,8 +134,8 @@</div><div class='ctx'> &amp;rk808 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pmic_int_l &amp;dvs_1 &amp;dvs_2&gt;;</div><div class='del'>-	dvs-gpios = &lt;&amp;gpio7 12 GPIO_ACTIVE_HIGH&gt;,</div><div class='del'>-		    &lt;&amp;gpio7 15 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	dvs-gpios = &lt;&amp;gpio7 RK_PB4 GPIO_ACTIVE_HIGH&gt;,</div><div class='add'>+		    &lt;&amp;gpio7 RK_PB7 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 	regulators {</div><div class='ctx'> 		mic_vcc: LDO_REG2 {</div><div class='hunk'>@@ -160,14 +160,14 @@</div><div class='ctx'> </div><div class='ctx'> &amp;vcc_5v {</div><div class='ctx'> 	enable-active-high;</div><div class='del'>-	gpio = &lt;&amp;gpio7 21 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	gpio = &lt;&amp;gpio7 RK_PC5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;drv_5v&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;vcc50_hdmi {</div><div class='ctx'> 	enable-active-high;</div><div class='del'>-	gpio = &lt;&amp;gpio5 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	gpio = &lt;&amp;gpio5 RK_PC3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;vcc50_hdmi_en&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron-jerry.dts b/arch/arm/boot/dts/rk3288-veyron-jerry.dts<br/>index f6b2eaaebb9a..cdea751f2a8c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-jerry.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-veyron-jerry.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-jerry.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-jerry.dts</a></div><div class='hunk'>@@ -56,7 +56,7 @@</div><div class='ctx'> 	panel_regulator: panel-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio7 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;lcd_enable_h&gt;;</div><div class='ctx'> 		regulator-name = "panel_regulator";</div><div class='hunk'>@@ -67,7 +67,7 @@</div><div class='ctx'> 	vcc18_lcd: vcc18-lcd {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio2 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio2 RK_PB5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;avdd_1v8_disp_en&gt;;</div><div class='ctx'> 		regulator-name = "vcc18_lcd";</div><div class='hunk'>@@ -79,7 +79,7 @@</div><div class='ctx'> 	backlight_regulator: backlight-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio2 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio2 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;bl_pwr_en&gt;;</div><div class='ctx'> 		regulator-name = "backlight_regulator";</div><div class='hunk'>@@ -123,14 +123,14 @@</div><div class='ctx'> </div><div class='ctx'> &amp;vcc_5v {</div><div class='ctx'> 	enable-active-high;</div><div class='del'>-	gpio = &lt;&amp;gpio7 21 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	gpio = &lt;&amp;gpio7 RK_PC5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;drv_5v&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;vcc50_hdmi {</div><div class='ctx'> 	enable-active-high;</div><div class='del'>-	gpio = &lt;&amp;gpio5 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	gpio = &lt;&amp;gpio5 RK_PC3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;vcc50_hdmi_en&gt;;</div><div class='ctx'> };</div><div class='hunk'>@@ -197,7 +197,7 @@</div><div class='ctx'> 	trackpad@2c {</div><div class='ctx'> 		compatible = "hid-over-i2c";</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio7&gt;;</div><div class='del'>-		interrupts = &lt;3 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA3 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 		reg = &lt;0x2c&gt;;</div><div class='ctx'> 		hid-descr-addr = &lt;0x0020&gt;;</div><div class='ctx'> 		vcc-supply = &lt;&amp;vcc33_io&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rk3288-veyron-mickey.dts<br/>index f36f6f459225..f0994f0e5774 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-mickey.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-veyron-mickey.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-mickey.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-mickey.dts</a></div><div class='hunk'>@@ -182,8 +182,8 @@</div><div class='ctx'> &amp;rk808 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pmic_int_l &amp;dvs_1 &amp;dvs_2&gt;;</div><div class='del'>-	dvs-gpios = &lt;&amp;gpio7 12 GPIO_ACTIVE_HIGH&gt;,</div><div class='del'>-		    &lt;&amp;gpio7 15 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	dvs-gpios = &lt;&amp;gpio7 RK_PB4 GPIO_ACTIVE_HIGH&gt;,</div><div class='add'>+		    &lt;&amp;gpio7 RK_PB7 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 	/delete-property/ vcc6-supply;</div><div class='ctx'> 	/delete-property/ vcc12-supply;</div><div class='hunk'>@@ -244,7 +244,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;vcc50_hdmi {</div><div class='ctx'> 	enable-active-high;</div><div class='del'>-	gpio = &lt;&amp;gpio7 11 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	gpio = &lt;&amp;gpio7 RK_PB3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;power_hdmi_on&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts<br/>index f72d616d1bf8..544de6027aaa 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-minnie.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-veyron-minnie.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-minnie.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-minnie.dts</a></div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> 	backlight_regulator: backlight-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio2 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio2 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;bl_pwr_en&gt;;</div><div class='ctx'> 		regulator-name = "backlight_regulator";</div><div class='hunk'>@@ -66,7 +66,7 @@</div><div class='ctx'> 	panel_regulator: panel-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio7 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;lcd_enable_h&gt;;</div><div class='ctx'> 		regulator-name = "panel_regulator";</div><div class='hunk'>@@ -77,7 +77,7 @@</div><div class='ctx'> 	vcc18_lcd: vcc18-lcd {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio2 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio2 RK_PB5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;avdd_1v8_disp_en&gt;;</div><div class='ctx'> 		regulator-name = "vcc18_lcd";</div><div class='hunk'>@@ -134,14 +134,14 @@</div><div class='ctx'> </div><div class='ctx'> 	volum_down {</div><div class='ctx'> 		label = "Volum_down";</div><div class='del'>-		gpios = &lt;&amp;gpio5 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio5 RK_PB3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		linux,code = &lt;KEY_VOLUMEDOWN&gt;;</div><div class='ctx'> 		debounce-interval = &lt;100&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	volum_up {</div><div class='ctx'> 		label = "Volum_up";</div><div class='del'>-		gpios = &lt;&amp;gpio5 10 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio5 RK_PB2 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		linux,code = &lt;KEY_VOLUMEUP&gt;;</div><div class='ctx'> 		debounce-interval = &lt;100&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -165,10 +165,10 @@</div><div class='ctx'> 		compatible = "elan,ekth3500";</div><div class='ctx'> 		reg = &lt;0x10&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio2&gt;;</div><div class='del'>-		interrupts = &lt;14 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		interrupts = &lt;RK_PB6 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;touch_int &amp;touch_rst&gt;;</div><div class='del'>-		reset-gpios = &lt;&amp;gpio2 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio2 RK_PB7 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		vcc33-supply = &lt;&amp;vcc33_touch&gt;;</div><div class='ctx'> 		vccio-supply = &lt;&amp;vcc33_touch&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -211,14 +211,14 @@</div><div class='ctx'> </div><div class='ctx'> &amp;vcc_5v {</div><div class='ctx'> 	enable-active-high;</div><div class='del'>-	gpio = &lt;&amp;gpio7 21 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	gpio = &lt;&amp;gpio7 RK_PC5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;drv_5v&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;vcc50_hdmi {</div><div class='ctx'> 	enable-active-high;</div><div class='del'>-	gpio = &lt;&amp;gpio5 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	gpio = &lt;&amp;gpio5 RK_PC3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;vcc50_hdmi_en&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts<br/>index d44351ec2333..995cff42fa43 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-pinky.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-veyron-pinky.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-pinky.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-pinky.dts</a></div><div class='hunk'>@@ -76,7 +76,7 @@</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pwr_key_h &amp;ap_lid_int_l&gt;;</div><div class='ctx'> </div><div class='ctx'> 	power {</div><div class='del'>-		gpios = &lt;&amp;gpio0 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio0 RK_PA5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -126,7 +126,7 @@</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sdmmc_clk &amp;sdmmc_cmd &amp;sdmmc_cd_disabled &amp;sdmmc_cd_gpio</div><div class='ctx'> 		     &amp;sdmmc_wp_gpio &amp;sdmmc_bus4&gt;;</div><div class='del'>-	wp-gpios = &lt;&amp;gpio7 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	wp-gpios = &lt;&amp;gpio7 RK_PB2 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;tsadc {</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi<br/>index fec076eb7aef..aef07101e9ab 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi</a></div><div class='hunk'>@@ -115,7 +115,7 @@</div><div class='ctx'> 	cap-mmc-highspeed;</div><div class='ctx'> 	cap-sd-highspeed;</div><div class='ctx'> 	card-detect-delay = &lt;200&gt;;</div><div class='del'>-	cd-gpios = &lt;&amp;gpio7 5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio7 RK_PA5 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	rockchip,default-sample-phase = &lt;90&gt;;</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='ctx'> 	sd-uhs-sdr12;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron-speedy.dts b/arch/arm/boot/dts/rk3288-veyron-speedy.dts<br/>index a0d033f6fe52..cc0b78cefe34 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-speedy.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-veyron-speedy.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron-speedy.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron-speedy.dts</a></div><div class='hunk'>@@ -57,7 +57,7 @@</div><div class='ctx'> 	panel_regulator: panel-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio7 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio7 RK_PB6 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;lcd_enable_h&gt;;</div><div class='ctx'> 		regulator-name = "panel_regulator";</div><div class='hunk'>@@ -68,7 +68,7 @@</div><div class='ctx'> 	vcc18_lcd: vcc18-lcd {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio2 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio2 RK_PB5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;avdd_1v8_disp_en&gt;;</div><div class='ctx'> 		regulator-name = "vcc18_lcd";</div><div class='hunk'>@@ -80,7 +80,7 @@</div><div class='ctx'> 	backlight_regulator: backlight-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio2 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio2 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;bl_pwr_en&gt;;</div><div class='ctx'> 		regulator-name = "backlight_regulator";</div><div class='hunk'>@@ -126,14 +126,14 @@</div><div class='ctx'> </div><div class='ctx'> &amp;vcc_5v {</div><div class='ctx'> 	enable-active-high;</div><div class='del'>-	gpio = &lt;&amp;gpio7 21 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	gpio = &lt;&amp;gpio7 RK_PC5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;drv_5v&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;vcc50_hdmi {</div><div class='ctx'> 	enable-active-high;</div><div class='del'>-	gpio = &lt;&amp;gpio5 19 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	gpio = &lt;&amp;gpio5 RK_PC3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;vcc50_hdmi_en&gt;;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi<br/>index 3dd2cca48c11..5d1eb0a25827 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288-veyron.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288-veyron.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288-veyron.dtsi</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'> #include "rk3288.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x0 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -61,7 +61,7 @@</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pwr_key_l&gt;;</div><div class='ctx'> 		power {</div><div class='ctx'> 			label = "Power";</div><div class='del'>-			gpios = &lt;&amp;gpio0 5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA5 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			debounce-interval = &lt;100&gt;;</div><div class='ctx'> 			wakeup-source;</div><div class='hunk'>@@ -70,7 +70,7 @@</div><div class='ctx'> </div><div class='ctx'> 	gpio-restart {</div><div class='ctx'> 		compatible = "gpio-restart";</div><div class='del'>-		gpios = &lt;&amp;gpio0 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio0 RK_PB5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;ap_warm_reset_h&gt;;</div><div class='ctx'> 		priority = &lt;200&gt;;</div><div class='hunk'>@@ -80,7 +80,7 @@</div><div class='ctx'> 		compatible = "mmc-pwrseq-emmc";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;emmc_reset&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='del'>-		reset-gpios = &lt;&amp;gpio2 9 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio2 RK_PB1 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdio_pwrseq: sdio-pwrseq {</div><div class='hunk'>@@ -96,7 +96,7 @@</div><div class='ctx'> 		 * - SDIO_RESET_L_WL_REG_ON</div><div class='ctx'> 		 * - PDN (power down when low)</div><div class='ctx'> 		 */</div><div class='del'>-		reset-gpios = &lt;&amp;gpio4 28 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio4 RK_PD4 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	vcc_5v: vcc-5v {</div><div class='hunk'>@@ -178,7 +178,7 @@</div><div class='ctx'> 		reg = &lt;0x1b&gt;;</div><div class='ctx'> 		clock-output-names = "xin32k", "wifibt_32kin";</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='del'>-		interrupts = &lt;4 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA4 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pmic_int_l&gt;;</div><div class='ctx'> 		rockchip,system-power-controller;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi<br/>index 17ec2e2d7a60..df8a0dbe9d91 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3288.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3288.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3288.dtsi</a></div><div class='hunk'>@@ -46,9 +46,11 @@</div><div class='ctx'> #include &lt;dt-bindings/thermal/thermal.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/power/rk3288-power.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/soc/rockchip,boot-mode.h&gt;</div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='ctx'> 	compatible = "rockchip,rk3288";</div><div class='ctx'> </div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='hunk'>@@ -227,7 +229,7 @@</div><div class='ctx'> </div><div class='ctx'> 	sdmmc: dwmmc@ff0c0000 {</div><div class='ctx'> 		compatible = "rockchip,rk3288-dw-mshc";</div><div class='del'>-		clock-freq-min-max = &lt;400000 150000000&gt;;</div><div class='add'>+		max-frequency = &lt;150000000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_SDMMC&gt;, &lt;&amp;cru SCLK_SDMMC&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_SDMMC_DRV&gt;, &lt;&amp;cru SCLK_SDMMC_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";</div><div class='hunk'>@@ -239,7 +241,7 @@</div><div class='ctx'> </div><div class='ctx'> 	sdio0: dwmmc@ff0d0000 {</div><div class='ctx'> 		compatible = "rockchip,rk3288-dw-mshc";</div><div class='del'>-		clock-freq-min-max = &lt;400000 150000000&gt;;</div><div class='add'>+		max-frequency = &lt;150000000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_SDIO0&gt;, &lt;&amp;cru SCLK_SDIO0&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_SDIO0_DRV&gt;, &lt;&amp;cru SCLK_SDIO0_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";</div><div class='hunk'>@@ -251,7 +253,7 @@</div><div class='ctx'> </div><div class='ctx'> 	sdio1: dwmmc@ff0e0000 {</div><div class='ctx'> 		compatible = "rockchip,rk3288-dw-mshc";</div><div class='del'>-		clock-freq-min-max = &lt;400000 150000000&gt;;</div><div class='add'>+		max-frequency = &lt;150000000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_SDIO1&gt;, &lt;&amp;cru SCLK_SDIO1&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_SDIO1_DRV&gt;, &lt;&amp;cru SCLK_SDIO1_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";</div><div class='hunk'>@@ -263,7 +265,7 @@</div><div class='ctx'> </div><div class='ctx'> 	emmc: dwmmc@ff0f0000 {</div><div class='ctx'> 		compatible = "rockchip,rk3288-dw-mshc";</div><div class='del'>-		clock-freq-min-max = &lt;400000 150000000&gt;;</div><div class='add'>+		max-frequency = &lt;150000000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_EMMC&gt;, &lt;&amp;cru SCLK_EMMC&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_EMMC_DRV&gt;, &lt;&amp;cru SCLK_EMMC_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";</div><div class='hunk'>@@ -596,7 +598,6 @@</div><div class='ctx'> 		g-np-tx-fifo-size = &lt;16&gt;;</div><div class='ctx'> 		g-rx-fifo-size = &lt;275&gt;;</div><div class='ctx'> 		g-tx-fifo-size = &lt;256 128 128 64 64 32&gt;;</div><div class='del'>-		g-use-dma;</div><div class='ctx'> 		phys = &lt;&amp;usbphy0&gt;;</div><div class='ctx'> 		phy-names = "usb2-phy";</div><div class='ctx'> 		status = "disabled";</div><div class='hunk'>@@ -761,6 +762,15 @@</div><div class='ctx'> 					 &lt;&amp;cru SCLK_ISP_JPE&gt;,</div><div class='ctx'> 					 &lt;&amp;cru SCLK_ISP&gt;,</div><div class='ctx'> 					 &lt;&amp;cru SCLK_RGA&gt;;</div><div class='add'>+				pm_qos = &lt;&amp;qos_vio0_iep&gt;,</div><div class='add'>+					 &lt;&amp;qos_vio1_vop&gt;,</div><div class='add'>+					 &lt;&amp;qos_vio1_isp_w0&gt;,</div><div class='add'>+					 &lt;&amp;qos_vio1_isp_w1&gt;,</div><div class='add'>+					 &lt;&amp;qos_vio0_vop&gt;,</div><div class='add'>+					 &lt;&amp;qos_vio0_vip&gt;,</div><div class='add'>+					 &lt;&amp;qos_vio2_rga_r&gt;,</div><div class='add'>+					 &lt;&amp;qos_vio2_rga_w&gt;,</div><div class='add'>+					 &lt;&amp;qos_vio1_isp_r&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -772,6 +782,8 @@</div><div class='ctx'> 				clocks = &lt;&amp;cru ACLK_HEVC&gt;,</div><div class='ctx'> 					 &lt;&amp;cru SCLK_HEVC_CABAC&gt;,</div><div class='ctx'> 					 &lt;&amp;cru SCLK_HEVC_CORE&gt;;</div><div class='add'>+				pm_qos = &lt;&amp;qos_hevc_r&gt;,</div><div class='add'>+					 &lt;&amp;qos_hevc_w&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -783,6 +795,7 @@</div><div class='ctx'> 				reg = &lt;RK3288_PD_VIDEO&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;cru ACLK_VCODEC&gt;,</div><div class='ctx'> 					 &lt;&amp;cru HCLK_VCODEC&gt;;</div><div class='add'>+				pm_qos = &lt;&amp;qos_video&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -792,6 +805,8 @@</div><div class='ctx'> 			pd_gpu@RK3288_PD_GPU {</div><div class='ctx'> 				reg = &lt;RK3288_PD_GPU&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;cru ACLK_GPU&gt;;</div><div class='add'>+				pm_qos = &lt;&amp;qos_gpu_r&gt;,</div><div class='add'>+					 &lt;&amp;qos_gpu_w&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -1102,6 +1117,76 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	qos_gpu_r: qos@ffaa0000 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffaa0000 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_gpu_w: qos@ffaa0080 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffaa0080 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_vio1_vop: qos@ffad0000 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffad0000 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_vio1_isp_w0: qos@ffad0100 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffad0100 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_vio1_isp_w1: qos@ffad0180 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffad0180 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_vio0_vop: qos@ffad0400 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffad0400 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_vio0_vip: qos@ffad0480 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffad0480 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_vio0_iep: qos@ffad0500 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffad0500 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_vio2_rga_r: qos@ffad0800 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffad0800 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_vio2_rga_w: qos@ffad0880 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffad0880 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_vio1_isp_r: qos@ffad0900 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffad0900 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_video: qos@ffae0000 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffae0000 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_hevc_r: qos@ffaf0000 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffaf0000 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_hevc_w: qos@ffaf0080 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0xffaf0080 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	gic: interrupt-controller@ffc01000 {</div><div class='ctx'> 		compatible = "arm,gic-400";</div><div class='ctx'> 		interrupt-controller;</div><div class='hunk'>@@ -1109,14 +1194,14 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='ctx'> 		reg = &lt;0xffc01000 0x1000&gt;,</div><div class='del'>-		      &lt;0xffc02000 0x1000&gt;,</div><div class='add'>+		      &lt;0xffc02000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0xffc04000 0x2000&gt;,</div><div class='ctx'> 		      &lt;0xffc06000 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 0xf04&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	efuse: efuse@ffb40000 {</div><div class='del'>-		compatible = "rockchip,rockchip-efuse";</div><div class='add'>+		compatible = "rockchip,rk3288-efuse";</div><div class='ctx'> 		reg = &lt;0xffb40000 0x20&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi<br/>index e15beb3c671e..0b45811cf28b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3xxx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/rk3xxx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/rk3xxx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/rk3xxx.dtsi</a></div><div class='hunk'>@@ -44,9 +44,11 @@</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/soc/rockchip,boot-mode.h&gt;</div><div class='del'>-#include "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='hunk'>@@ -181,7 +183,6 @@</div><div class='ctx'> 		g-np-tx-fifo-size = &lt;16&gt;;</div><div class='ctx'> 		g-rx-fifo-size = &lt;275&gt;;</div><div class='ctx'> 		g-tx-fifo-size = &lt;256 128 128 64 64 32&gt;;</div><div class='del'>-		g-use-dma;</div><div class='ctx'> 		phys = &lt;&amp;usbphy0&gt;;</div><div class='ctx'> 		phy-names = "usb2-phy";</div><div class='ctx'> 		status = "disabled";</div><div class='head'>diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi<br/>index 7173ec9059a1..22332be72140 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sama5d2.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sama5d2.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sama5d2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d2.dtsi</a></div><div class='hunk'>@@ -395,6 +395,16 @@</div><div class='ctx'> 				clock-names = "dma_clk";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			/* Place dma1 here despite its address */</div><div class='add'>+			dma1: dma-controller@f0004000 {</div><div class='add'>+				compatible = "atmel,sama5d4-dma";</div><div class='add'>+				reg = &lt;0xf0004000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;7 IRQ_TYPE_LEVEL_HIGH 0&gt;;</div><div class='add'>+				#dma-cells = &lt;1&gt;;</div><div class='add'>+				clocks = &lt;&amp;dma1_clk&gt;;</div><div class='add'>+				clock-names = "dma_clk";</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			pmc: pmc@f0014000 {</div><div class='ctx'> 				compatible = "atmel,sama5d2-pmc", "syscon";</div><div class='ctx'> 				reg = &lt;0xf0014000 0x160&gt;;</div><div class='hunk'>@@ -735,6 +745,11 @@</div><div class='ctx'> 						atmel,clk-output-range = &lt;0 83000000&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> </div><div class='add'>+					securam_clk: securam_clk {</div><div class='add'>+						#clock-cells = &lt;0&gt;;</div><div class='add'>+						reg = &lt;51&gt;;</div><div class='add'>+					};</div><div class='add'>+</div><div class='ctx'> 					i2s0_clk: i2s0_clk {</div><div class='ctx'> 						#clock-cells = &lt;0&gt;;</div><div class='ctx'> 						reg = &lt;54&gt;;</div><div class='hunk'>@@ -926,6 +941,22 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			ssc0: ssc@f8004000 {</div><div class='add'>+				compatible = "atmel,at91sam9g45-ssc";</div><div class='add'>+				reg = &lt;0xf8004000 0x4000&gt;;</div><div class='add'>+				interrupts = &lt;43 IRQ_TYPE_LEVEL_HIGH 4&gt;;</div><div class='add'>+				dmas = &lt;&amp;dma0</div><div class='add'>+					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |</div><div class='add'>+					AT91_XDMAC_DT_PERID(21))&gt;,</div><div class='add'>+				       &lt;&amp;dma0</div><div class='add'>+					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |</div><div class='add'>+					AT91_XDMAC_DT_PERID(22))&gt;;</div><div class='add'>+				dma-names = "tx", "rx";</div><div class='add'>+				clocks = &lt;&amp;ssc0_clk&gt;;</div><div class='add'>+				clock-names = "pclk";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			macb0: ethernet@f8008000 {</div><div class='ctx'> 				compatible = "atmel,sama5d2-gem";</div><div class='ctx'> 				reg = &lt;0xf8008000 0x1000&gt;;</div><div class='hunk'>@@ -1030,6 +1061,7 @@</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;twi0_clk&gt;;</div><div class='add'>+				atmel,fifo-size = &lt;16&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -1058,6 +1090,15 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			securam: sram@f8044000 {</div><div class='add'>+				compatible = "atmel,sama5d2-securam", "mmio-sram";</div><div class='add'>+				reg = &lt;0xf8044000 0x1420&gt;;</div><div class='add'>+				clocks = &lt;&amp;securam_clk&gt;;</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='add'>+				ranges = &lt;0 0xf8044000 0x1420&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			rstc@f8048000 {</div><div class='ctx'> 				compatible = "atmel,sama5d3-rstc";</div><div class='ctx'> 				reg = &lt;0xf8048000 0x10&gt;;</div><div class='hunk'>@@ -1088,30 +1129,12 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			sckc@f8048050 {</div><div class='del'>-				compatible = "atmel,at91sam9x5-sckc";</div><div class='add'>+			clk32k: sckc@f8048050 {</div><div class='add'>+				compatible = "atmel,sama5d4-sckc";</div><div class='ctx'> 				reg = &lt;0xf8048050 0x4&gt;;</div><div class='ctx'> </div><div class='del'>-				slow_rc_osc: slow_rc_osc {</div><div class='del'>-					compatible = "atmel,at91sam9x5-clk-slow-rc-osc";</div><div class='del'>-					#clock-cells = &lt;0&gt;;</div><div class='del'>-					clock-frequency = &lt;32768&gt;;</div><div class='del'>-					clock-accuracy = &lt;250000000&gt;;</div><div class='del'>-					atmel,startup-time-usec = &lt;75&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				slow_osc: slow_osc {</div><div class='del'>-					compatible = "atmel,at91sam9x5-clk-slow-osc";</div><div class='del'>-					#clock-cells = &lt;0&gt;;</div><div class='del'>-					clocks = &lt;&amp;slow_xtal&gt;;</div><div class='del'>-					atmel,startup-time-usec = &lt;1200000&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				clk32k: slowck {</div><div class='del'>-					compatible = "atmel,at91sam9x5-clk-slow";</div><div class='del'>-					#clock-cells = &lt;0&gt;;</div><div class='del'>-					clocks = &lt;&amp;slow_rc_osc &amp;slow_osc&gt;;</div><div class='del'>-				};</div><div class='add'>+				clocks = &lt;&amp;slow_xtal&gt;;</div><div class='add'>+				#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			rtc@f80480b0 {</div><div class='hunk'>@@ -1144,10 +1167,10 @@</div><div class='ctx'> 				compatible = "atmel,at91sam9260-usart";</div><div class='ctx'> 				reg = &lt;0xfc008000 0x100&gt;;</div><div class='ctx'> 				interrupts = &lt;27 IRQ_TYPE_LEVEL_HIGH 7&gt;;</div><div class='del'>-				dmas = &lt;&amp;dma0</div><div class='add'>+				dmas = &lt;&amp;dma1</div><div class='ctx'> 					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |</div><div class='ctx'> 					 AT91_XDMAC_DT_PERID(41))&gt;,</div><div class='del'>-				       &lt;&amp;dma0</div><div class='add'>+				       &lt;&amp;dma1</div><div class='ctx'> 					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |</div><div class='ctx'> 					 AT91_XDMAC_DT_PERID(42))&gt;;</div><div class='ctx'> 				dma-names = "tx", "rx";</div><div class='hunk'>@@ -1231,6 +1254,7 @@</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;twi1_clk&gt;;</div><div class='add'>+				atmel,fifo-size = &lt;16&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -1260,6 +1284,11 @@</div><div class='ctx'> 				clocks = &lt;&amp;pioA_clk&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			secumod@fc040000 {</div><div class='add'>+				compatible = "atmel,sama5d2-secumod", "syscon";</div><div class='add'>+				reg = &lt;0xfc040000 0x100&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			tdes@fc044000 {</div><div class='ctx'> 				compatible = "atmel,at91sam9g46-tdes";</div><div class='ctx'> 				reg = &lt;0xfc044000 0x100&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi<br/>index 4c84d333fc7e..b06448ba6649 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sama5d3.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sama5d3.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sama5d3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d3.dtsi</a></div><div class='hunk'>@@ -549,8 +549,8 @@</div><div class='ctx'> 				dbgu {</div><div class='ctx'> 					pinctrl_dbgu: dbgu-0 {</div><div class='ctx'> 						atmel,pins =</div><div class='del'>-							&lt;AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB30 periph A */</div><div class='del'>-							 AT91_PIOB 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP&gt;;	/* PB31 periph A with pullup */</div><div class='add'>+							&lt;AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP</div><div class='add'>+							 AT91_PIOB 31 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sama5d36ek_cmp.dts b/arch/arm/boot/dts/sama5d36ek_cmp.dts<br/>new file mode 100644<br/>index 000000000000..b632143844e5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sama5d36ek_cmp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d36ek_cmp.dts</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+/*</div><div class='add'>+ * sama5d36ek_cmp.dts - Device Tree file for SAMA5D36-EK CMP board</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2016 Atmel,</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "sama5d36.dtsi"</div><div class='add'>+#include "sama5d3xmb_cmp.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Atmel SAMA5D36EK-CMP";</div><div class='add'>+	compatible = "atmel,sama5d36ek-cmp", "atmel,sama5d3xmb-cmp", "atmel,sama5d3xcm-cmp", "atmel,sama5d36", "atmel,sama5d3", "atmel,sama5";</div><div class='add'>+</div><div class='add'>+	ahb {</div><div class='add'>+		apb {</div><div class='add'>+			spi0: spi@f0004000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ssc0: ssc@f0008000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			can0: can@f000c000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c0: i2c@f0014000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c1: i2c@f0018000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			macb0: ethernet@f0028000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			macb1: ethernet@f802c000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sama5d3_uart.dtsi b/arch/arm/boot/dts/sama5d3_uart.dtsi<br/>index 2511d748867b..186377d41c91 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sama5d3_uart.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sama5d3_uart.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sama5d3_uart.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d3_uart.dtsi</a></div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> </div><div class='ctx'> 			uart0: serial@f0024000 {</div><div class='ctx'> 				compatible = "atmel,at91sam9260-usart";</div><div class='del'>-				reg = &lt;0xf0024000 0x200&gt;;</div><div class='add'>+				reg = &lt;0xf0024000 0x100&gt;;</div><div class='ctx'> 				interrupts = &lt;16 IRQ_TYPE_LEVEL_HIGH 5&gt;;</div><div class='ctx'> 				pinctrl-names = "default";</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;pinctrl_uart0&gt;;</div><div class='hunk'>@@ -66,7 +66,7 @@</div><div class='ctx'> </div><div class='ctx'> 			uart1: serial@f8028000 {</div><div class='ctx'> 				compatible = "atmel,at91sam9260-usart";</div><div class='del'>-				reg = &lt;0xf8028000 0x200&gt;;</div><div class='add'>+				reg = &lt;0xf8028000 0x100&gt;;</div><div class='ctx'> 				interrupts = &lt;17 IRQ_TYPE_LEVEL_HIGH 5&gt;;</div><div class='ctx'> 				pinctrl-names = "default";</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/sama5d3xcm_cmp.dtsi b/arch/arm/boot/dts/sama5d3xcm_cmp.dtsi<br/>new file mode 100644<br/>index 000000000000..dc7572bc7ff0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sama5d3xcm_cmp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d3xcm_cmp.dtsi</a></div><div class='hunk'>@@ -0,0 +1,201 @@</div><div class='add'>+/*</div><div class='add'>+ * sama5d3xcm_cmp.dtsi - Device Tree Include file for SAMA5D36 CMP CPU Module</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2016 Atmel,</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "atmel,sama5d3xcm-cmp", "atmel,sama5d3", "atmel,sama5";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x20000000 0x20000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clocks {</div><div class='add'>+		slow_xtal {</div><div class='add'>+			clock-frequency = &lt;32768&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		main_xtal {</div><div class='add'>+			clock-frequency = &lt;12000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ahb {</div><div class='add'>+		apb {</div><div class='add'>+			spi0: spi@f0004000 {</div><div class='add'>+				cs-gpios = &lt;&amp;pioD 13 0&gt;, &lt;0&gt;, &lt;0&gt;, &lt;0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			macb0: ethernet@f0028000 {</div><div class='add'>+				phy-mode = "rgmii";</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				ethernet-phy@1 {</div><div class='add'>+					reg = &lt;0x1&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;pioB&gt;;</div><div class='add'>+					interrupts = &lt;25 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+					txen-skew-ps = &lt;800&gt;;</div><div class='add'>+					txc-skew-ps = &lt;3000&gt;;</div><div class='add'>+					rxdv-skew-ps = &lt;400&gt;;</div><div class='add'>+					rxc-skew-ps = &lt;3000&gt;;</div><div class='add'>+					rxd0-skew-ps = &lt;400&gt;;</div><div class='add'>+					rxd1-skew-ps = &lt;400&gt;;</div><div class='add'>+					rxd2-skew-ps = &lt;400&gt;;</div><div class='add'>+					rxd3-skew-ps = &lt;400&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				ethernet-phy@7 {</div><div class='add'>+					reg = &lt;0x7&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;pioB&gt;;</div><div class='add'>+					interrupts = &lt;25 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+					txen-skew-ps = &lt;800&gt;;</div><div class='add'>+					txc-skew-ps = &lt;3000&gt;;</div><div class='add'>+					rxdv-skew-ps = &lt;400&gt;;</div><div class='add'>+					rxc-skew-ps = &lt;3000&gt;;</div><div class='add'>+					rxd0-skew-ps = &lt;400&gt;;</div><div class='add'>+					rxd1-skew-ps = &lt;400&gt;;</div><div class='add'>+					rxd2-skew-ps = &lt;400&gt;;</div><div class='add'>+					rxd3-skew-ps = &lt;400&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c1: i2c@f0018000 {</div><div class='add'>+				pmic: act8865@5b {</div><div class='add'>+					compatible = "active-semi,act8865";</div><div class='add'>+					reg = &lt;0x5b&gt;;</div><div class='add'>+					status = "disabled";</div><div class='add'>+</div><div class='add'>+					regulators {</div><div class='add'>+						vcc_1v8_reg: DCDC_REG1 {</div><div class='add'>+							regulator-name = "VCC_1V8";</div><div class='add'>+							regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+							regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+							regulator-always-on;</div><div class='add'>+						};</div><div class='add'>+</div><div class='add'>+						vcc_1v2_reg: DCDC_REG2 {</div><div class='add'>+							regulator-name = "VCC_1V2";</div><div class='add'>+							regulator-min-microvolt = &lt;1100000&gt;;</div><div class='add'>+							regulator-max-microvolt = &lt;1300000&gt;;</div><div class='add'>+							regulator-always-on;</div><div class='add'>+						};</div><div class='add'>+</div><div class='add'>+						vcc_3v3_reg: DCDC_REG3 {</div><div class='add'>+							regulator-name = "VCC_3V3";</div><div class='add'>+							regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+							regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+							regulator-always-on;</div><div class='add'>+						};</div><div class='add'>+</div><div class='add'>+						vddana_reg: LDO_REG1 {</div><div class='add'>+							regulator-name = "VDDANA";</div><div class='add'>+							regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+							regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+							regulator-always-on;</div><div class='add'>+						};</div><div class='add'>+</div><div class='add'>+						vddfuse_reg: LDO_REG2 {</div><div class='add'>+							regulator-name = "FUSE_2V5";</div><div class='add'>+							regulator-min-microvolt = &lt;2500000&gt;;</div><div class='add'>+							regulator-max-microvolt = &lt;2500000&gt;;</div><div class='add'>+						};</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		nand0: nand@60000000 {</div><div class='add'>+			nand-bus-width = &lt;8&gt;;</div><div class='add'>+			nand-ecc-mode = "hw";</div><div class='add'>+			atmel,has-pmecc;</div><div class='add'>+			atmel,pmecc-cap = &lt;4&gt;;</div><div class='add'>+			atmel,pmecc-sector-size = &lt;512&gt;;</div><div class='add'>+			nand-on-flash-bbt;</div><div class='add'>+			status = "okay";</div><div class='add'>+</div><div class='add'>+			at91bootstrap@0 {</div><div class='add'>+				label = "at91bootstrap";</div><div class='add'>+				reg = &lt;0x0 0x40000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			bootloader@40000 {</div><div class='add'>+				label = "bootloader";</div><div class='add'>+				reg = &lt;0x40000 0x80000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			bootloaderenv@c0000 {</div><div class='add'>+				label = "bootloader env";</div><div class='add'>+				reg = &lt;0xc0000 0xc0000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			dtb@180000 {</div><div class='add'>+				label = "device tree";</div><div class='add'>+				reg = &lt;0x180000 0x80000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			kernel@200000 {</div><div class='add'>+				label = "kernel";</div><div class='add'>+				reg = &lt;0x200000 0x600000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			rootfs@800000 {</div><div class='add'>+				label = "rootfs";</div><div class='add'>+				reg = &lt;0x800000 0x0f800000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		d2 {</div><div class='add'>+			label = "d2";</div><div class='add'>+			gpios = &lt;&amp;pioE 25 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi b/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi<br/>new file mode 100644<br/>index 000000000000..252e0d35f846<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sama5d3xmb_cmp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d3xmb_cmp.dtsi</a></div><div class='hunk'>@@ -0,0 +1,301 @@</div><div class='add'>+/*</div><div class='add'>+ * sama5d3xmb_cmp.dts - Device Tree file for SAMA5D3x CMP mother board</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2016 Atmel,</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+#include "sama5d3xcm_cmp.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "atmel,sama5d3xmb-cmp", "atmel,sama5d3xcm-cmp", "atmel,sama5d3", "atmel,sama5";</div><div class='add'>+</div><div class='add'>+	ahb {</div><div class='add'>+		apb {</div><div class='add'>+			mmc0: mmc@f0000000 {</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+				pinctrl-0 = &lt;&amp;pinctrl_mmc0_clk_cmd_dat0 &amp;pinctrl_mmc0_dat1_3 &amp;pinctrl_mmc0_cd&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+				slot@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					bus-width = &lt;4&gt;;</div><div class='add'>+					cd-gpios = &lt;&amp;pioD 17 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			spi0: spi@f0004000 {</div><div class='add'>+				dmas = &lt;0&gt;, &lt;0&gt;;	/*  Do not use DMA for spi0 */</div><div class='add'>+</div><div class='add'>+				m25p80@0 {</div><div class='add'>+					compatible = "atmel,at25df321a";</div><div class='add'>+					spi-max-frequency = &lt;50000000&gt;;</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ssc0: ssc@f0008000 {</div><div class='add'>+				atmel,clk-from-rk-pin;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * i2c0 conflicts with ISI:</div><div class='add'>+			 * disable it to allow the use of ISI</div><div class='add'>+			 * can not enable audio when i2c0 disabled</div><div class='add'>+			 */</div><div class='add'>+			i2c0: i2c@f0014000 {</div><div class='add'>+				wm8904: wm8904@1a {</div><div class='add'>+					compatible = "wlf,wm8904";</div><div class='add'>+					reg = &lt;0x1a&gt;;</div><div class='add'>+					clocks = &lt;&amp;pck0&gt;;</div><div class='add'>+					clock-names = "mclk";</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c1: i2c@f0018000 {</div><div class='add'>+				ov2640: camera@0x30 {</div><div class='add'>+					compatible = "ovti,ov2640";</div><div class='add'>+					reg = &lt;0x30&gt;;</div><div class='add'>+					pinctrl-names = "default";</div><div class='add'>+					pinctrl-0 = &lt;&amp;pinctrl_pck1_as_isi_mck &amp;pinctrl_sensor_power &amp;pinctrl_sensor_reset&gt;;</div><div class='add'>+					resetb-gpios = &lt;&amp;pioE 24 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+					pwdn-gpios = &lt;&amp;pioE 29 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+					/* use pck1 for the master clock of ov2640 */</div><div class='add'>+					clocks = &lt;&amp;pck1&gt;;</div><div class='add'>+					clock-names = "xvclk";</div><div class='add'>+					assigned-clocks = &lt;&amp;pck1&gt;;</div><div class='add'>+					assigned-clock-rates = &lt;25000000&gt;;</div><div class='add'>+</div><div class='add'>+					port {</div><div class='add'>+						ov2640_0: endpoint {</div><div class='add'>+							remote-endpoint = &lt;&amp;isi_0&gt;;</div><div class='add'>+							bus-width = &lt;8&gt;;</div><div class='add'>+						};</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			usart1: serial@f0020000 {</div><div class='add'>+				dmas = &lt;0&gt;, &lt;0&gt;;	/*  Do not use DMA for usart1 */</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+				pinctrl-0 = &lt;&amp;pinctrl_usart1 &amp;pinctrl_usart1_rts_cts&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			isi: isi@f0034000 {</div><div class='add'>+				port {</div><div class='add'>+					isi_0: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;ov2640_0&gt;;</div><div class='add'>+						bus-width = &lt;8&gt;;</div><div class='add'>+						vsync-active = &lt;1&gt;;</div><div class='add'>+						hsync-active = &lt;1&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mmc1: mmc@f8000000 {</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+				pinctrl-0 = &lt;&amp;pinctrl_mmc1_clk_cmd_dat0 &amp;pinctrl_mmc1_dat1_3 &amp;pinctrl_mmc1_cd&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+				slot@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					bus-width = &lt;4&gt;;</div><div class='add'>+					cd-gpios = &lt;&amp;pioD 18 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			adc0: adc@f8018000 {</div><div class='add'>+				pinctrl-names = "default", "sleep";</div><div class='add'>+				pinctrl-0 = &lt;</div><div class='add'>+					&amp;pinctrl_adc0_adtrg</div><div class='add'>+					&amp;pinctrl_adc0_ad0</div><div class='add'>+					&amp;pinctrl_adc0_ad1</div><div class='add'>+					&amp;pinctrl_adc0_ad2</div><div class='add'>+					&amp;pinctrl_adc0_ad3</div><div class='add'>+					&amp;pinctrl_adc0_ad4</div><div class='add'>+					&gt;;</div><div class='add'>+				pinctrl-1 = &lt;</div><div class='add'>+					&amp;pinctrl_adc0_adtrg_sleep</div><div class='add'>+					&amp;pinctrl_adc0_ad0_sleep</div><div class='add'>+					&amp;pinctrl_adc0_ad1_sleep</div><div class='add'>+					&amp;pinctrl_adc0_ad2_sleep</div><div class='add'>+					&amp;pinctrl_adc0_ad3_sleep</div><div class='add'>+					&amp;pinctrl_adc0_ad4_sleep</div><div class='add'>+					&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			macb1: ethernet@f802c000 {</div><div class='add'>+				phy-mode = "rmii";</div><div class='add'>+</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				phy0: ethernet-phy@1 {</div><div class='add'>+					/*interrupt-parent = &lt;&amp;pioE&gt;;*/</div><div class='add'>+					/*interrupts = &lt;30 IRQ_TYPE_EDGE_FALLING&gt;;*/</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pinctrl@fffff200 {</div><div class='add'>+				adc0 {</div><div class='add'>+					pinctrl_adc0_adtrg_sleep: adc0_adtrg_1 {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOD 19 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT | AT91_PINCTRL_OUTPUT_VAL(0))&gt;;</div><div class='add'>+					};</div><div class='add'>+					pinctrl_adc0_ad0_sleep: adc0_ad0_1 {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOD 20 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT | AT91_PINCTRL_OUTPUT_VAL(0))&gt;;</div><div class='add'>+					};</div><div class='add'>+					pinctrl_adc0_ad1_sleep: adc0_ad1_1 {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOD 21 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT | AT91_PINCTRL_OUTPUT_VAL(0))&gt;;</div><div class='add'>+					};</div><div class='add'>+					pinctrl_adc0_ad2_sleep: adc0_ad2_1 {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOD 22 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT | AT91_PINCTRL_OUTPUT_VAL(0))&gt;;</div><div class='add'>+					};</div><div class='add'>+					pinctrl_adc0_ad3_sleep: adc0_ad3_1 {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOD 23 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT | AT91_PINCTRL_OUTPUT_VAL(0))&gt;;</div><div class='add'>+					};</div><div class='add'>+					pinctrl_adc0_ad4_sleep: adc0_ad4_1 {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOD 24 AT91_PERIPH_GPIO (AT91_PINCTRL_OUTPUT | AT91_PINCTRL_OUTPUT_VAL(0))&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				board {</div><div class='add'>+					pinctrl_gpio_keys: gpio_keys {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOE 27 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP&gt;;</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_mmc0_cd: mmc0_cd {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOD 17 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH&gt;;</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_mmc1_cd: mmc1_cd {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOD 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH&gt;;</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pck0_as_audio_mck: pck0_as_audio_mck {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOD 30 AT91_PERIPH_B AT91_PINCTRL_NONE&gt;;</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_pck1_as_isi_mck: pck1_as_isi_mck-0 {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE&gt;;</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sensor_reset: sensor_reset-0 {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE&gt;;</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_sensor_power: sensor_power-0 {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOE 29 AT91_PERIPH_GPIO AT91_PINCTRL_NONE&gt;;</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					pinctrl_usba_vbus: usba_vbus {</div><div class='add'>+						atmel,pins =</div><div class='add'>+							&lt;AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			dbgu: serial@ffffee00 {</div><div class='add'>+				dmas = &lt;0&gt;, &lt;0&gt;;	/*  Do not use DMA for dbgu */</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			watchdog@fffffe40 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb0: gadget@00500000 {</div><div class='add'>+			atmel,vbus-gpio = &lt;&amp;pioD 29 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_usba_vbus&gt;;</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "atmel,asoc-wm8904";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_pck0_as_audio_mck&gt;;</div><div class='add'>+</div><div class='add'>+		atmel,model = "wm8904 @ SAMA5D3EK";</div><div class='add'>+		atmel,audio-routing =</div><div class='add'>+			"Headphone Jack", "HPOUTL",</div><div class='add'>+			"Headphone Jack", "HPOUTR",</div><div class='add'>+			"IN2L", "Line In Jack",</div><div class='add'>+			"IN2R", "Line In Jack",</div><div class='add'>+			"Mic", "MICBIAS",</div><div class='add'>+			"IN1L", "Mic";</div><div class='add'>+</div><div class='add'>+		atmel,ssc-controller = &lt;&amp;ssc0&gt;;</div><div class='add'>+		atmel,audio-codec = &lt;&amp;wm8904&gt;;</div><div class='add'>+</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Conflict with LCD pins */</div><div class='add'>+	gpio_keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_gpio_keys&gt;;</div><div class='add'>+</div><div class='add'>+		pb_user1 {</div><div class='add'>+			label = "pb_user1";</div><div class='add'>+			gpios = &lt;&amp;pioE 27 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,code = &lt;0x100&gt;;</div><div class='add'>+			wakeup-source;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi<br/>index 65e725fb5679..d3889c9d25a9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sama5d4.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sama5d4.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sama5d4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sama5d4.dtsi</a></div><div class='hunk'>@@ -854,10 +854,10 @@</div><div class='ctx'> 				compatible = "atmel,at91sam9260-usart";</div><div class='ctx'> 				reg = &lt;0xf8004000 0x100&gt;;</div><div class='ctx'> 				interrupts = &lt;27 IRQ_TYPE_LEVEL_HIGH 5&gt;;</div><div class='del'>-				dmas = &lt;&amp;dma1</div><div class='add'>+				dmas = &lt;&amp;dma0</div><div class='ctx'> 					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)</div><div class='ctx'> 					| AT91_XDMAC_DT_PERID(22))&gt;,</div><div class='del'>-				       &lt;&amp;dma1</div><div class='add'>+				       &lt;&amp;dma0</div><div class='ctx'> 					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)</div><div class='ctx'> 					| AT91_XDMAC_DT_PERID(23))&gt;;</div><div class='ctx'> 				dma-names = "tx", "rx";</div><div class='hunk'>@@ -938,10 +938,10 @@</div><div class='ctx'> 				compatible = "atmel,sama5d4-i2c";</div><div class='ctx'> 				reg = &lt;0xf8018000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;33 IRQ_TYPE_LEVEL_HIGH 6&gt;;</div><div class='del'>-				dmas = &lt;&amp;dma1</div><div class='add'>+				dmas = &lt;&amp;dma0</div><div class='ctx'> 					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)</div><div class='ctx'> 					| AT91_XDMAC_DT_PERID(4))&gt;,</div><div class='del'>-				       &lt;&amp;dma1</div><div class='add'>+				       &lt;&amp;dma0</div><div class='ctx'> 					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)</div><div class='ctx'> 					| AT91_XDMAC_DT_PERID(5))&gt;;</div><div class='ctx'> 				dma-names = "tx", "rx";</div><div class='hunk'>@@ -1055,10 +1055,10 @@</div><div class='ctx'> 				compatible = "atmel,at91sam9260-usart";</div><div class='ctx'> 				reg = &lt;0xfc004000 0x100&gt;;</div><div class='ctx'> 				interrupts = &lt;28 IRQ_TYPE_LEVEL_HIGH 5&gt;;</div><div class='del'>-				dmas = &lt;&amp;dma1</div><div class='add'>+				dmas = &lt;&amp;dma0</div><div class='ctx'> 					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)</div><div class='ctx'> 					| AT91_XDMAC_DT_PERID(24))&gt;,</div><div class='del'>-				       &lt;&amp;dma1</div><div class='add'>+				       &lt;&amp;dma0</div><div class='ctx'> 					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)</div><div class='ctx'> 					| AT91_XDMAC_DT_PERID(25))&gt;;</div><div class='ctx'> 				dma-names = "tx", "rx";</div><div class='hunk'>@@ -1167,10 +1167,10 @@</div><div class='ctx'> 				compatible = "atmel,at91rm9200-spi";</div><div class='ctx'> 				reg = &lt;0xfc01c000 0x100&gt;;</div><div class='ctx'> 				interrupts = &lt;39 IRQ_TYPE_LEVEL_HIGH 3&gt;;</div><div class='del'>-				dmas = &lt;&amp;dma1</div><div class='add'>+				dmas = &lt;&amp;dma0</div><div class='ctx'> 					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)</div><div class='ctx'> 					| AT91_XDMAC_DT_PERID(14))&gt;,</div><div class='del'>-				       &lt;&amp;dma1</div><div class='add'>+				       &lt;&amp;dma0</div><div class='ctx'> 					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)</div><div class='ctx'> 					| AT91_XDMAC_DT_PERID(15))&gt;;</div><div class='ctx'> 				dma-names = "tx", "rx";</div><div class='hunk'>@@ -1314,30 +1314,11 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			sckc@fc068650 {</div><div class='del'>-				compatible = "atmel,at91sam9x5-sckc";</div><div class='add'>+			clk32k: sckc@fc068650 {</div><div class='add'>+				compatible = "atmel,sama5d4-sckc";</div><div class='ctx'> 				reg = &lt;0xfc068650 0x4&gt;;</div><div class='del'>-</div><div class='del'>-				slow_rc_osc: slow_rc_osc {</div><div class='del'>-					compatible = "atmel,at91sam9x5-clk-slow-rc-osc";</div><div class='del'>-					#clock-cells = &lt;0&gt;;</div><div class='del'>-					clock-frequency = &lt;32768&gt;;</div><div class='del'>-					clock-accuracy = &lt;250000000&gt;;</div><div class='del'>-					atmel,startup-time-usec = &lt;75&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				slow_osc: slow_osc {</div><div class='del'>-					compatible = "atmel,at91sam9x5-clk-slow-osc";</div><div class='del'>-					#clock-cells = &lt;0&gt;;</div><div class='del'>-					clocks = &lt;&amp;slow_xtal&gt;;</div><div class='del'>-					atmel,startup-time-usec = &lt;1200000&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				clk32k: slowck {</div><div class='del'>-					compatible = "atmel,at91sam9x5-clk-slow";</div><div class='del'>-					#clock-cells = &lt;0&gt;;</div><div class='del'>-					clocks = &lt;&amp;slow_rc_osc &amp;slow_osc&gt;;</div><div class='del'>-				};</div><div class='add'>+				#clock-cells = &lt;0&gt;;</div><div class='add'>+				clocks = &lt;&amp;slow_xtal&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			rtc@fc0686b0 {</div><div class='hunk'>@@ -1461,8 +1442,8 @@</div><div class='ctx'> 				dbgu {</div><div class='ctx'> 					pinctrl_dbgu: dbgu-0 {</div><div class='ctx'> 						atmel,pins =</div><div class='del'>-							&lt;AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;,     /* conflicts with D14 and TDI */</div><div class='del'>-							&lt;AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_PULL_UP&gt;;  /* conflicts with D15 and TDO */</div><div class='add'>+							&lt;AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP	/* conflicts with D14 and TDI */</div><div class='add'>+							 AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE&gt;;		/* conflicts with D15 and TDO */</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi<br/>index 032fe2f14b16..6b01ab354e88 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sh73a0.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sh73a0.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sh73a0.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sh73a0.dtsi</a></div><div class='hunk'>@@ -8,8 +8,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "skeleton.dtsi"</div><div class='del'>-</div><div class='ctx'> #include &lt;dt-bindings/clock/sh73a0-clock.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='hunk'>@@ -17,6 +15,8 @@</div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "renesas,sh73a0";</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -263,7 +263,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmcif: mmc@e6bd0000 {</div><div class='del'>-		compatible = "renesas,sh-mmcif";</div><div class='add'>+		compatible = "renesas,mmcif-sh73a0", "renesas,sh-mmcif";</div><div class='ctx'> 		reg = &lt;0xe6bd0000 0x100&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH</div><div class='ctx'> 			      GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi<br/>index 9f48141270b8..2c43c4d85dee 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga.dtsi</a></div><div class='hunk'>@@ -93,6 +93,14 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		base_fpga_region {</div><div class='add'>+			compatible = "fpga-region";</div><div class='add'>+			fpga-mgr = &lt;&amp;fpgamgr0&gt;;</div><div class='add'>+</div><div class='add'>+			#address-cells = &lt;0x1&gt;;</div><div class='add'>+			#size-cells = &lt;0x1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		can0: can@ffc00000 {</div><div class='ctx'> 			compatible = "bosch,d_can";</div><div class='ctx'> 			reg = &lt;0xffc00000 0x1000&gt;;</div><div class='hunk'>@@ -513,10 +521,24 @@</div><div class='ctx'> 				};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		fpga_bridge0: fpga_bridge@ff400000 {</div><div class='add'>+			compatible = "altr,socfpga-lwhps2fpga-bridge";</div><div class='add'>+			reg = &lt;0xff400000 0x100000&gt;;</div><div class='add'>+			resets = &lt;&amp;rst LWHPS2FPGA_RESET&gt;;</div><div class='add'>+			clocks = &lt;&amp;l4_main_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		fpga_bridge1: fpga_bridge@ff500000 {</div><div class='add'>+			compatible = "altr,socfpga-hps2fpga-bridge";</div><div class='add'>+			reg = &lt;0xff500000 0x10000&gt;;</div><div class='add'>+			resets = &lt;&amp;rst HPS2FPGA_RESET&gt;;</div><div class='add'>+			clocks = &lt;&amp;l4_main_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		fpgamgr0: fpgamgr@ff706000 {</div><div class='ctx'> 			compatible = "altr,socfpga-fpga-mgr";</div><div class='ctx'> 			reg = &lt;0xff706000 0x1000</div><div class='del'>-			       0xffb90000 0x1000&gt;;</div><div class='add'>+			       0xffb90000 0x4&gt;;</div><div class='ctx'> 			interrupts = &lt;0 175 4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -686,6 +708,17 @@</div><div class='ctx'> 			arm,data-latency = &lt;2 1 1&gt;;</div><div class='ctx'> 			prefetch-data = &lt;1&gt;;</div><div class='ctx'> 			prefetch-instr = &lt;1&gt;;</div><div class='add'>+			arm,shared-override;</div><div class='add'>+			arm,double-linefill = &lt;1&gt;;</div><div class='add'>+			arm,double-linefill-incr = &lt;0&gt;;</div><div class='add'>+			arm,double-linefill-wrap = &lt;1&gt;;</div><div class='add'>+			arm,prefetch-drop = &lt;0&gt;;</div><div class='add'>+			arm,prefetch-offset = &lt;7&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		l3regs@0xff800000 {</div><div class='add'>+			compatible = "altr,l3regs", "syscon";</div><div class='add'>+			reg = &lt;0xff800000 0x1000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		mmc: dwmmc0@ff704000 {</div><div class='hunk'>@@ -700,11 +733,38 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		nand0: nand@ff900000 {</div><div class='add'>+			#address-cells = &lt;0x1&gt;;</div><div class='add'>+			#size-cells = &lt;0x1&gt;;</div><div class='add'>+			compatible = "denali,denali-nand-dt";</div><div class='add'>+			reg = &lt;0xff900000 0x100000&gt;,</div><div class='add'>+			      &lt;0xffb80000 0x10000&gt;;</div><div class='add'>+			reg-names = "nand_data", "denali_reg";</div><div class='add'>+			interrupts = &lt;0x0 0x90 0x4&gt;;</div><div class='add'>+			dma-mask = &lt;0xffffffff&gt;;</div><div class='add'>+			clocks = &lt;&amp;nand_clk&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		ocram: sram@ffff0000 {</div><div class='ctx'> 			compatible = "mmio-sram";</div><div class='ctx'> 			reg = &lt;0xffff0000 0x10000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		qspi: spi@ff705000 {</div><div class='add'>+			compatible = "cdns,qspi-nor";</div><div class='add'>+                        #address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0xff705000 0x1000&gt;,</div><div class='add'>+			      &lt;0xffa00000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;0 151 4&gt;;</div><div class='add'>+			cdns,fifo-depth = &lt;128&gt;;</div><div class='add'>+			cdns,fifo-width = &lt;4&gt;;</div><div class='add'>+			cdns,trigger-address = &lt;0x00000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;qspi_clk&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		rst: rstmgr@ffd05000 {</div><div class='ctx'> 			#reset-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "altr,rst-mgr";</div><div class='hunk'>@@ -718,7 +778,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sdr: sdr@ffc25000 {</div><div class='del'>-			compatible = "syscon";</div><div class='add'>+			compatible = "altr,sdr-ctl", "syscon";</div><div class='ctx'> 			reg = &lt;0xffc25000 0x1000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi<br/>index f520cbff5e1c..6b0b7463f36f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_arria10.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga_arria10.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_arria10.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria10.dtsi</a></div><div class='hunk'>@@ -83,6 +83,14 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		base_fpga_region {</div><div class='add'>+			#address-cells = &lt;0x1&gt;;</div><div class='add'>+			#size-cells = &lt;0x1&gt;;</div><div class='add'>+</div><div class='add'>+			compatible = "fpga-region";</div><div class='add'>+			fpga-mgr = &lt;&amp;fpga_mgr&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		clkmgr@ffd04000 {</div><div class='ctx'> 				compatible = "altr,clk-mgr";</div><div class='ctx'> 				reg = &lt;0xffd04000 0x1000&gt;;</div><div class='hunk'>@@ -400,6 +408,12 @@</div><div class='ctx'> 				};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		socfpga_axi_setup: stmmac-axi-config {</div><div class='add'>+			snps,wr_osr_lmt = &lt;0xf&gt;;</div><div class='add'>+			snps,rd_osr_lmt = &lt;0xf&gt;;</div><div class='add'>+			snps,blen = &lt;0 0 0 0 16 0 0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		gmac0: ethernet@ff800000 {</div><div class='ctx'> 			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac";</div><div class='ctx'> 			altr,sysmgr-syscon = &lt;&amp;sysmgr 0x44 0&gt;;</div><div class='hunk'>@@ -416,6 +430,7 @@</div><div class='ctx'> 			clock-names = "stmmaceth";</div><div class='ctx'> 			resets = &lt;&amp;rst EMAC0_RESET&gt;;</div><div class='ctx'> 			reset-names = "stmmaceth";</div><div class='add'>+			snps,axi-config = &lt;&amp;socfpga_axi_setup&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -435,6 +450,7 @@</div><div class='ctx'> 			clock-names = "stmmaceth";</div><div class='ctx'> 			resets = &lt;&amp;rst EMAC1_RESET&gt;;</div><div class='ctx'> 			reset-names = "stmmaceth";</div><div class='add'>+			snps,axi-config = &lt;&amp;socfpga_axi_setup&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -452,6 +468,7 @@</div><div class='ctx'> 			rx-fifo-depth = &lt;16384&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;l4_mp_clk&gt;;</div><div class='ctx'> 			clock-names = "stmmaceth";</div><div class='add'>+			snps,axi-config = &lt;&amp;socfpga_axi_setup&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -512,6 +529,15 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		fpga_mgr: fpga-mgr@ffd03000 {</div><div class='add'>+			compatible = "altr,socfpga-a10-fpga-mgr";</div><div class='add'>+			reg = &lt;0xffd03000 0x100</div><div class='add'>+			       0xffcfe400 0x20&gt;;</div><div class='add'>+			clocks = &lt;&amp;l4_mp_clk&gt;;</div><div class='add'>+			resets = &lt;&amp;rst FPGAMGR_RESET&gt;;</div><div class='add'>+			reset-names = "fpgamgr";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		i2c0: i2c@ffc02200 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -562,8 +588,23 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		spi1: spi@ffda5000 {</div><div class='add'>+			compatible = "snps,dw-apb-ssi";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0xffda5000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0 102 4&gt;;</div><div class='add'>+			num-chipselect = &lt;4&gt;;</div><div class='add'>+			bus-num = &lt;0&gt;;</div><div class='add'>+			/*32bit_access;*/</div><div class='add'>+			tx-dma-channel = &lt;&amp;pdma 16&gt;;</div><div class='add'>+			rx-dma-channel = &lt;&amp;pdma 17&gt;;</div><div class='add'>+			clocks = &lt;&amp;spi_m_clk&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		sdr: sdr@ffc25000 {</div><div class='del'>-			compatible = "syscon";</div><div class='add'>+			compatible = "altr,sdr-ctl", "syscon";</div><div class='ctx'> 			reg = &lt;0xffcfb100 0x80&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -573,6 +614,9 @@</div><div class='ctx'> 			interrupts = &lt;0 18 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			cache-unified;</div><div class='ctx'> 			cache-level = &lt;2&gt;;</div><div class='add'>+			prefetch-data = &lt;1&gt;;</div><div class='add'>+			prefetch-instr = &lt;1&gt;;</div><div class='add'>+			arm,shared-override;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		mmc: dwmmc0@ff808000 {</div><div class='hunk'>@@ -587,6 +631,19 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		nand: nand@ffb90000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "denali,denali-nand-dt", "altr,socfpga-denali-nand";</div><div class='add'>+			reg = &lt;0xffb90000 0x72000&gt;,</div><div class='add'>+			      &lt;0xffb80000 0x10000&gt;;</div><div class='add'>+			reg-names = "nand_data", "denali_reg";</div><div class='add'>+			interrupts = &lt;0 99 4&gt;;</div><div class='add'>+			dma-mask = &lt;0xffffffff&gt;;</div><div class='add'>+			clocks = &lt;&amp;nand_clk&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		ocram: sram@ffe00000 {</div><div class='ctx'> 			compatible = "mmio-sram";</div><div class='ctx'> 			reg = &lt;0xffe00000 0x40000&gt;;</div><div class='hunk'>@@ -657,6 +714,20 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		qspi: spi@ff809000 {</div><div class='add'>+			compatible = "cdns,qspi-nor";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0xff809000 0x100&gt;,</div><div class='add'>+			      &lt;0xffa00000 0x100000&gt;;</div><div class='add'>+			interrupts = &lt;0 100 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			cdns,fifo-depth = &lt;128&gt;;</div><div class='add'>+			cdns,fifo-width = &lt;4&gt;;</div><div class='add'>+			cdns,trigger-address = &lt;0x00000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;qspi_clk&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		rst: rstmgr@ffd05000 {</div><div class='ctx'> 			#reset-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "altr,rst-mgr";</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi<br/>index 8e3a4adc389f..c57e6cea0d83 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga_arria10_socdk.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria10_socdk.dtsi</a></div><div class='hunk'>@@ -36,6 +36,30 @@</div><div class='ctx'> 		reg = &lt;0x0 0x40000000&gt;; /* 1GB */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	a10leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		a10sr_led0 {</div><div class='add'>+			label = "a10sr-led0";</div><div class='add'>+			gpios = &lt;&amp;a10sr_gpio 0 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		a10sr_led1 {</div><div class='add'>+			label = "a10sr-led1";</div><div class='add'>+			gpios = &lt;&amp;a10sr_gpio 1 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		a10sr_led2 {</div><div class='add'>+			label = "a10sr-led2";</div><div class='add'>+			gpios = &lt;&amp;a10sr_gpio 2 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		a10sr_led3 {</div><div class='add'>+			label = "a10sr-led3";</div><div class='add'>+			gpios = &lt;&amp;a10sr_gpio 3 1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	soc {</div><div class='ctx'> 		clkmgr@ffd04000 {</div><div class='ctx'> 			clocks {</div><div class='hunk'>@@ -75,6 +99,31 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;gpio1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	resource-manager@0 {</div><div class='add'>+		compatible = "altr,a10sr";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;100000&gt;;</div><div class='add'>+		/* low-level active IRQ at GPIO1_5 */</div><div class='add'>+		interrupt-parent = &lt;&amp;portb&gt;;</div><div class='add'>+		interrupts = &lt;5 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		a10sr_gpio: gpio-controller {</div><div class='add'>+			compatible = "altr,a10sr-gpio";</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;i2c1 {</div><div class='ctx'> 	speed-mode = &lt;0&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='hunk'>@@ -96,6 +145,11 @@</div><div class='ctx'> 		compatible = "dallas,ds1339";</div><div class='ctx'> 		reg = &lt;0x68&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	ltc@5c {</div><div class='add'>+		compatible = "ltc2977";</div><div class='add'>+		reg = &lt;0x5c&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart1 {</div><div class='hunk'>@@ -105,3 +159,7 @@</div><div class='ctx'> &amp;usb0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;watchdog1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts b/arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts<br/>new file mode 100644<br/>index 000000000000..d14f9ccb6e10<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015 Altera Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "socfpga_arria10_socdk.dtsi"</div><div class='add'>+</div><div class='add'>+&amp;nand {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	partition@nand-boot {</div><div class='add'>+		label = "Boot and fpga data";</div><div class='add'>+		reg = &lt;0x0 0x1C00000&gt;;</div><div class='add'>+	};</div><div class='add'>+	partition@nand-rootfs {</div><div class='add'>+		label = "Root Filesystem - JFFS2";</div><div class='add'>+		reg = &lt;0x1C00000 0x6400000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts b/arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts<br/>new file mode 100644<br/>index 000000000000..beb2fc6b9eb6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Intel. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "socfpga_arria10_socdk.dtsi"</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	flash0: n25q00@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "n25q00aa";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;100000000&gt;;</div><div class='add'>+</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		cdns,page-size = &lt;256&gt;;</div><div class='add'>+		cdns,block-size = &lt;16&gt;;</div><div class='add'>+		cdns,read-delay = &lt;4&gt;;</div><div class='add'>+		cdns,tshsl-ns = &lt;50&gt;;</div><div class='add'>+		cdns,tsd2d-ns = &lt;50&gt;;</div><div class='add'>+		cdns,tchsh-ns = &lt;4&gt;;</div><div class='add'>+		cdns,tslch-ns = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+		partition@qspi-boot {</div><div class='add'>+			label = "Boot and fpga data";</div><div class='add'>+			reg = &lt;0x0 0x2720000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@qspi-rootfs {</div><div class='add'>+			label = "Root Filesystem - JFFS2";</div><div class='add'>+			reg = &lt;0x2720000 0x58E0000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi<br/>index 1907cc600452..8c037297296c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_arria5.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga_arria5.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_arria5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria5.dtsi</a></div><div class='hunk'>@@ -42,3 +42,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;watchdog0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts<br/>index 3c8867862b0d..8672edf9ba4e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_arria5_socdk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga_arria5_socdk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_arria5_socdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_arria5_socdk.dts</a></div><div class='hunk'>@@ -39,6 +39,29 @@</div><div class='ctx'> 		ethernet0 = &amp;gmac1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+		hps0 {</div><div class='add'>+			label = "hps_led0";</div><div class='add'>+			gpios = &lt;&amp;porta 0 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hps1 {</div><div class='add'>+			label = "hps_led1";</div><div class='add'>+			gpios = &lt;&amp;portb 11 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hps2 {</div><div class='add'>+			label = "hps_led2";</div><div class='add'>+			gpios = &lt;&amp;porta 17 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hps3 {</div><div class='add'>+			label = "hps_led3";</div><div class='add'>+			gpios = &lt;&amp;porta 18 1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	regulator_3_3v: 3-3-v-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "3.3V";</div><div class='hunk'>@@ -61,8 +84,28 @@</div><div class='ctx'> 	rxc-skew-ps = &lt;2000&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;gpio0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gpio1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gpio2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;i2c0 {</div><div class='ctx'> 	status = "okay";</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * adjust the falling times to decrease the i2c frequency to 50Khz</div><div class='add'>+	 * because the LCD module does not work at the standard 100Khz</div><div class='add'>+	 */</div><div class='add'>+	i2c-sda-falling-time-ns = &lt;5000&gt;;</div><div class='add'>+	i2c-scl-falling-time-ns = &lt;5000&gt;;</div><div class='ctx'> </div><div class='ctx'> 	eeprom@51 {</div><div class='ctx'> 		compatible = "atmel,24c32";</div><div class='hunk'>@@ -82,6 +125,39 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;qspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	flash: flash@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "n25q256a";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;100000000&gt;;</div><div class='add'>+</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		cdns,page-size = &lt;256&gt;;</div><div class='add'>+		cdns,block-size = &lt;16&gt;;</div><div class='add'>+		cdns,read-delay = &lt;4&gt;;</div><div class='add'>+		cdns,tshsl-ns = &lt;50&gt;;</div><div class='add'>+		cdns,tsd2d-ns = &lt;50&gt;;</div><div class='add'>+		cdns,tchsh-ns = &lt;4&gt;;</div><div class='add'>+		cdns,tslch-ns = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+		partition@qspi-boot {</div><div class='add'>+			/* 8MB for raw data. */</div><div class='add'>+			label = "Flash 0 Raw Data";</div><div class='add'>+			reg = &lt;0x0 0x800000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@qspi-rootfs {</div><div class='add'>+			/* 120MB for jffs2 data. */</div><div class='add'>+			label = "Flash 0 jffs2 Filesystem";</div><div class='add'>+			reg = &lt;0x800000 0x7800000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usb1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts<br/>index afea3645ada4..5ecd2ef405e3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Terasic DE-0(Atlas)";</div><div class='del'>-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='add'>+	compatible = "terasic,de0-atlas", "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='ctx'> 		bootargs = "earlyprintk";</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi b/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi<br/>index f86f9c060d7a..6ad3b1eb9b86 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include "socfpga_cyclone5.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	model = "DENX MCV";</div><div class='add'>+	model = "Aries/DENX MCV";</div><div class='ctx'> 	compatible = "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts b/arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts<br/>index 7186a29b8b86..e5a98e5696ca 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include "socfpga_cyclone5_mcv.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	model = "DENX MCV EVK";</div><div class='del'>-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='add'>+	model = "Aries/DENX MCV EVK";</div><div class='add'>+	compatible = "denx,mcvevk", "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;gmac0;</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts<br/>index 15e43f43f244..7ea32c81e720 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga_cyclone5_socdk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_socdk.dts</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Altera SOCFPGA Cyclone V SoC Development Kit";</div><div class='del'>-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='add'>+	compatible = "altr,socfpga-cyclone5-socdk", "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='ctx'> 		bootargs = "earlyprintk";</div><div class='hunk'>@@ -39,6 +39,29 @@</div><div class='ctx'> 		ethernet0 = &amp;gmac1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+		hps0 {</div><div class='add'>+			label = "hps_led0";</div><div class='add'>+			gpios = &lt;&amp;portb 15 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hps1 {</div><div class='add'>+			label = "hps_led1";</div><div class='add'>+			gpios = &lt;&amp;portb 14 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hps2 {</div><div class='add'>+			label = "hps_led2";</div><div class='add'>+			gpios = &lt;&amp;portb 13 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hps3 {</div><div class='add'>+			label = "hps_led3";</div><div class='add'>+			gpios = &lt;&amp;portb 12 1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	regulator_3_3v: 3-3-v-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "3.3V";</div><div class='hunk'>@@ -47,6 +70,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;can0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;gmac1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='hunk'>@@ -61,12 +88,28 @@</div><div class='ctx'> 	rxc-skew-ps = &lt;2000&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;gpio0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;gpio1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;gpio2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;i2c0 {</div><div class='ctx'> 	status = "okay";</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * adjust the falling times to decrease the i2c frequency to 50Khz</div><div class='add'>+	 * because the LCD module does not work at the standard 100Khz</div><div class='add'>+	 */</div><div class='add'>+	i2c-sda-falling-time-ns = &lt;5000&gt;;</div><div class='add'>+	i2c-scl-falling-time-ns = &lt;5000&gt;;</div><div class='ctx'> </div><div class='ctx'> 	eeprom@51 {</div><div class='ctx'> 		compatible = "atmel,24c32";</div><div class='hunk'>@@ -87,6 +130,49 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;qspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	flash0: n25q00@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "n25q00";</div><div class='add'>+		reg = &lt;0&gt;;	/* chip select */</div><div class='add'>+		spi-max-frequency = &lt;100000000&gt;;</div><div class='add'>+</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		cdns,page-size = &lt;256&gt;;</div><div class='add'>+		cdns,block-size = &lt;16&gt;;</div><div class='add'>+		cdns,read-delay = &lt;4&gt;;</div><div class='add'>+		cdns,tshsl-ns = &lt;50&gt;;</div><div class='add'>+		cdns,tsd2d-ns = &lt;50&gt;;</div><div class='add'>+		cdns,tchsh-ns = &lt;4&gt;;</div><div class='add'>+		cdns,tslch-ns = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+		partition@qspi-boot {</div><div class='add'>+			/* 8MB for raw data. */</div><div class='add'>+			label = "Flash 0 Raw Data";</div><div class='add'>+			reg = &lt;0x0 0x800000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@qspi-rootfs {</div><div class='add'>+			/* 120MB for jffs2 data. */</div><div class='add'>+			label = "Flash 0 jffs2 Filesystem";</div><div class='add'>+			reg = &lt;0x800000 0x7800000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	spidev@0 {</div><div class='add'>+		compatible = "rohm,dh2228fv";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;1000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usb1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts<br/>index 02e22f554ef0..a0c90b3bdfd1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga_cyclone5_sockit.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_sockit.dts</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Terasic SoCkit";</div><div class='del'>-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='add'>+	compatible = "terasic,socfpga-cyclone5-sockit", "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='ctx'> 		bootargs = "earlyprintk";</div><div class='hunk'>@@ -175,6 +175,27 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;qspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	flash: flash@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "n25q00";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;100000000&gt;;</div><div class='add'>+</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		cdns,page-size = &lt;256&gt;;</div><div class='add'>+		cdns,block-size = &lt;16&gt;;</div><div class='add'>+		cdns,read-delay = &lt;4&gt;;</div><div class='add'>+		cdns,tshsl-ns = &lt;50&gt;;</div><div class='add'>+		cdns,tsd2d-ns = &lt;50&gt;;</div><div class='add'>+		cdns,tchsh-ns = &lt;4&gt;;</div><div class='add'>+		cdns,tslch-ns = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usb1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socrates.dts b/arch/arm/boot/dts/socfpga_cyclone5_socrates.dts<br/>index d79853775061..c3d52f27b21e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_socrates.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga_cyclone5_socrates.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_socrates.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_socrates.dts</a></div><div class='hunk'>@@ -80,3 +80,22 @@</div><div class='ctx'> &amp;mmc {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	flash: flash@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "n25q256a";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;100000000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		cdns,read-delay = &lt;4&gt;;</div><div class='add'>+		cdns,tshsl-ns = &lt;50&gt;;</div><div class='add'>+		cdns,tsd2d-ns = &lt;50&gt;;</div><div class='add'>+		cdns,tchsh-ns = &lt;4&gt;;</div><div class='add'>+		cdns,tslch-ns = &lt;4&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sodia.dts b/arch/arm/boot/dts/socfpga_cyclone5_sodia.dts<br/>new file mode 100644<br/>index 000000000000..5b7e3c27e6e9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_sodia.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_sodia.dts</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2016 Nobuhiro Iwamatsu &lt;iwamatsu@nigauri.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "socfpga_cyclone5.dtsi"</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Altera SOCFPGA Cyclone V SoC Macnica Sodia board";</div><div class='add'>+	compatible = "macnica,sodia", "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "earlyprintk";</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		name = "memory";</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ethernet0 = &amp;gmac1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	regulator_3_3v: 3-3-v-regulator {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3.3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds: gpio-leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		hps_led0 {</div><div class='add'>+			label = "hps:green:led0";</div><div class='add'>+			gpios = &lt;&amp;portb 12 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hps_led1 {</div><div class='add'>+			label = "hps:green:led1";</div><div class='add'>+			gpios = &lt;&amp;portb 13 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hps_led2 {</div><div class='add'>+			label = "hps:green:led2";</div><div class='add'>+			gpios = &lt;&amp;portb 14 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hps_led3 {</div><div class='add'>+			label = "hps:green:led3";</div><div class='add'>+			gpios = &lt;&amp;portb 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gmac1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	phy-mode = "rgmii";</div><div class='add'>+	phy = &lt;&amp;phy0&gt;;</div><div class='add'>+</div><div class='add'>+	mdio0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		phy0: ethernet-phy@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			rxd0-skew-ps = &lt;0&gt;;</div><div class='add'>+			rxd1-skew-ps = &lt;0&gt;;</div><div class='add'>+			rxd2-skew-ps = &lt;0&gt;;</div><div class='add'>+			rxd3-skew-ps = &lt;0&gt;;</div><div class='add'>+			rxdv-skew-ps = &lt;0&gt;;</div><div class='add'>+			rxc-skew-ps = &lt;3000&gt;;</div><div class='add'>+			txen-skew-ps = &lt;0&gt;;</div><div class='add'>+			txc-skew-ps = &lt;3000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gpio1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	eeprom@51 {</div><div class='add'>+		compatible = "atmel,24c32";</div><div class='add'>+		reg = &lt;0x51&gt;;</div><div class='add'>+		pagesize = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtc@68 {</div><div class='add'>+		compatible = "dallas,ds1339";</div><div class='add'>+		reg = &lt;0x68&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	cd-gpios = &lt;&amp;portb 18 0&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;regulator_3_3v&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;regulator_3_3v&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts b/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts<br/>index b844473601d2..363ee62457fe 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts</a></div><div class='hunk'>@@ -51,7 +51,7 @@</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "samtec VIN|ING FPGA";</div><div class='del'>-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='add'>+	compatible = "samtec,vining", "altr,socfpga-cyclone5", "altr,socfpga";</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='ctx'> 		bootargs = "console=ttyS0,115200";</div><div class='head'>diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi<br/>index 449acf0d8272..17ea0abcdbd7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/spear13xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/spear13xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/spear13xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/spear13xx.dtsi</a></div><div class='hunk'>@@ -118,6 +118,7 @@</div><div class='ctx'> 			block_size = &lt;0xfff&gt;;</div><div class='ctx'> 			dma-masters = &lt;2&gt;;</div><div class='ctx'> 			data-width = &lt;8 8&gt;;</div><div class='add'>+			multi-block = &lt;1 1 1 1 1 1 1 1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		dma@eb000000 {</div><div class='hunk'>@@ -134,6 +135,7 @@</div><div class='ctx'> 			chan_priority = &lt;1&gt;;</div><div class='ctx'> 			block_size = &lt;0xfff&gt;;</div><div class='ctx'> 			data-width = &lt;8 8&gt;;</div><div class='add'>+			multi-block = &lt;1 1 1 1 1 1 1 1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fsmc: flash@b0000000 {</div><div class='head'>diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi<br/>index d309314f3a36..82d8c4771293 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/ste-dbx5x0.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/ste-dbx5x0.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/ste-dbx5x0.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ste-dbx5x0.dtsi</a></div><div class='hunk'>@@ -669,6 +669,8 @@</div><div class='ctx'> 					vddulpivio18-supply = &lt;&amp;ab8500_ldo_intcore_reg&gt;;</div><div class='ctx'> 					v-ape-supply = &lt;&amp;db8500_vape_reg&gt;;</div><div class='ctx'> 					musb_1v8-supply = &lt;&amp;db8500_vsmps2_reg&gt;;</div><div class='add'>+					clocks = &lt;&amp;prcmu_clk PRCMU_SYSCLK&gt;;</div><div class='add'>+					clock-names = "sysclk";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				ab8500-ponkey {</div><div class='head'>diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi<br/>index 48dc38482633..f37f9e10713c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/ste-href.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/ste-href.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/ste-href.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ste-href.dtsi</a></div><div class='hunk'>@@ -19,12 +19,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc {</div><div class='del'>-		usb_per5@a03e0000 {</div><div class='del'>-			pinctrl-names = "default", "sleep";</div><div class='del'>-			pinctrl-0 = &lt;&amp;musb_default_mode&gt;;</div><div class='del'>-			pinctrl-1 = &lt;&amp;musb_sleep_mode&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		uart@80120000 {</div><div class='ctx'> 			pinctrl-names = "default", "sleep";</div><div class='ctx'> 			pinctrl-0 = &lt;&amp;uart0_default_mode&gt;;</div><div class='hunk'>@@ -111,6 +105,7 @@</div><div class='ctx'> 			pinctrl-1 = &lt;&amp;i2c3_sleep_mode&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		/* ST6G3244ME level translator for 1.8/2.9 V */</div><div class='ctx'> 		vmmci: regulator-gpio {</div><div class='ctx'> 			compatible = "regulator-gpio";</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +115,6 @@</div><div class='ctx'> 			regulator-type = "voltage";</div><div class='ctx'> </div><div class='ctx'> 			startup-delay-us = &lt;100&gt;;</div><div class='del'>-			enable-active-high;</div><div class='ctx'> </div><div class='ctx'> 			states = &lt;1800000 0x1</div><div class='ctx'> 				  2900000 0x0&gt;;</div><div class='hunk'>@@ -197,6 +191,8 @@</div><div class='ctx'> </div><div class='ctx'> 			stericsson,cpu-dai = &lt;&amp;msp1 &amp;msp3&gt;;</div><div class='ctx'> 			stericsson,audio-codec = &lt;&amp;codec&gt;;</div><div class='add'>+			clocks = &lt;&amp;prcmu_clk PRCMU_SYSCLK&gt;;</div><div class='add'>+			clock-names = "sysclk";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		msp0: msp@80123000 {</div><div class='hunk'>@@ -225,6 +221,12 @@</div><div class='ctx'> 				ab8500-gpio {</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='add'>+				ab8500_usb {</div><div class='add'>+					pinctrl-names = "default", "sleep";</div><div class='add'>+					pinctrl-0 = &lt;&amp;musb_default_mode&gt;;</div><div class='add'>+					pinctrl-1 = &lt;&amp;musb_sleep_mode&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='ctx'> 				ab8500-regulators {</div><div class='ctx'> 					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {</div><div class='ctx'> 						regulator-name = "V-DISPLAY";</div><div class='head'>diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi<br/>index ece222d51717..5882a2606ac3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/ste-hrefprev60.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/ste-hrefprev60.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/ste-hrefprev60.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ste-hrefprev60.dtsi</a></div><div class='hunk'>@@ -74,6 +74,7 @@</div><div class='ctx'> 		vmmci: regulator-gpio {</div><div class='ctx'> 			gpios = &lt;&amp;tc3589x_gpio 18 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			enable-gpio = &lt;&amp;tc3589x_gpio 17 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			enable-active-high;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl {</div><div class='head'>diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi<br/>index 7187676836be..bf259bbd1d0a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/ste-hrefv60plus.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/ste-hrefv60plus.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/ste-hrefv60plus.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ste-hrefv60plus.dtsi</a></div><div class='hunk'>@@ -146,6 +146,7 @@</div><div class='ctx'> 		vmmci: regulator-gpio {</div><div class='ctx'> 			gpios = &lt;&amp;gpio0 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			enable-gpio = &lt;&amp;gpio5 9 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			enable-active-high;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl {</div><div class='head'>diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts<br/>index 386eee6de232..dd5514def604 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/ste-snowball.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/ste-snowball.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/ste-snowball.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/ste-snowball.dts</a></div><div class='hunk'>@@ -159,17 +159,13 @@</div><div class='ctx'> 				     "", "", "", "", "", "", "", "";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		usb_per5@a03e0000 {</div><div class='del'>-			pinctrl-names = "default", "sleep";</div><div class='del'>-			pinctrl-0 = &lt;&amp;musb_default_mode&gt;;</div><div class='del'>-			pinctrl-1 = &lt;&amp;musb_sleep_mode&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		sound {</div><div class='ctx'> 			compatible = "stericsson,snd-soc-mop500";</div><div class='ctx'> </div><div class='ctx'> 			stericsson,cpu-dai = &lt;&amp;msp1 &amp;msp3&gt;;</div><div class='ctx'> 			stericsson,audio-codec = &lt;&amp;codec&gt;;</div><div class='add'>+			clocks = &lt;&amp;prcmu_clk PRCMU_SYSCLK&gt;;</div><div class='add'>+			clock-names = "sysclk";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		msp0: msp@80123000 {</div><div class='hunk'>@@ -216,11 +212,15 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		/* ST6G3244ME level translator for 1.8/2.9 V */</div><div class='ctx'> 		vmmci: regulator-gpio {</div><div class='ctx'> 			compatible = "regulator-gpio";</div><div class='ctx'> </div><div class='add'>+			/* GPIO228 SD_SEL */</div><div class='ctx'> 			gpios = &lt;&amp;gpio7 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			/* GPIO217 MMC_EN */</div><div class='ctx'> 			enable-gpio = &lt;&amp;gpio6 25 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			enable-active-high;</div><div class='ctx'> </div><div class='ctx'> 			regulator-min-microvolt = &lt;1800000&gt;;</div><div class='ctx'> 			regulator-max-microvolt = &lt;2900000&gt;;</div><div class='hunk'>@@ -228,7 +228,6 @@</div><div class='ctx'> 			regulator-type = "voltage";</div><div class='ctx'> </div><div class='ctx'> 			startup-delay-us = &lt;100&gt;;</div><div class='del'>-			enable-active-high;</div><div class='ctx'> </div><div class='ctx'> 			states = &lt;1800000 0x1</div><div class='ctx'> 				  2900000 0x0&gt;;</div><div class='hunk'>@@ -448,6 +447,12 @@</div><div class='ctx'> 						     "PM_GPIO42"; /* AB8500 GPIO42 */</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='add'>+				ab8500_usb {</div><div class='add'>+					pinctrl-names = "default", "sleep";</div><div class='add'>+					pinctrl-0 = &lt;&amp;musb_default_mode&gt;;</div><div class='add'>+					pinctrl-1 = &lt;&amp;musb_sleep_mode&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='ctx'> 				ext_regulators: ab8500-ext-regulators {</div><div class='ctx'> 					ab8500_ext1_reg: ab8500_ext1 {</div><div class='ctx'> 						regulator-name = "ab8500-ext-supply1";</div><div class='hunk'>@@ -546,6 +551,7 @@</div><div class='ctx'> 				sdi0_default_mode: sdi0_default {</div><div class='ctx'> 					snowball_mux {</div><div class='ctx'> 						function = "mc0";</div><div class='add'>+						/* Add the DAT31 pin even if it is not really used */</div><div class='ctx'> 						groups = "mc0dat31dir_a_1";</div><div class='ctx'> 					};</div><div class='ctx'> 					snowball_cfg1 {</div><div class='head'>diff --git a/arch/arm/boot/dts/stih407-clock.dtsi b/arch/arm/boot/dts/stih407-clock.dtsi<br/>index 13029c03d7c6..34c119a66f14 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih407-clock.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih407-clock.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stih407-clock.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih407-clock.dtsi</a></div><div class='hunk'>@@ -101,6 +101,7 @@</div><div class='ctx'> 				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='ctx'> </div><div class='ctx'> 				clock-output-names = "clk-s-a0-pll-ofd-0";</div><div class='add'>+				clock-critical = &lt;0&gt;; /* clk-s-a0-pll-ofd-0 */</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			clk_s_a0_flexgen: clk-s-a0-flexgen {</div><div class='hunk'>@@ -112,6 +113,7 @@</div><div class='ctx'> 					 &lt;&amp;clk_sysin&gt;;</div><div class='ctx'> </div><div class='ctx'> 				clock-output-names = "clk-ic-lmi0";</div><div class='add'>+				clock-critical = &lt;CLK_IC_LMI0&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -126,6 +128,7 @@</div><div class='ctx'> 					     "clk-s-c0-fs0-ch1",</div><div class='ctx'> 					     "clk-s-c0-fs0-ch2",</div><div class='ctx'> 					     "clk-s-c0-fs0-ch3";</div><div class='add'>+			clock-critical = &lt;0&gt;; /* clk-s-c0-fs0-ch0 */</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		clk_s_c0: clockgen-c@09103000 {</div><div class='hunk'>@@ -139,6 +142,7 @@</div><div class='ctx'> 				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='ctx'> </div><div class='ctx'> 				clock-output-names = "clk-s-c0-pll0-odf-0";</div><div class='add'>+				clock-critical = &lt;0&gt;; /* clk-s-c0-pll0-odf-0 */</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			clk_s_c0_pll1: clk-s-c0-pll1 {</div><div class='hunk'>@@ -194,6 +198,12 @@</div><div class='ctx'> 						     "clk-main-disp",</div><div class='ctx'> 						     "clk-aux-disp",</div><div class='ctx'> 						     "clk-compo-dvp";</div><div class='add'>+				clock-critical = &lt;CLK_PROC_STFE&gt;,</div><div class='add'>+						 &lt;CLK_ICN_CPU&gt;,</div><div class='add'>+						 &lt;CLK_TX_ICN_DMU&gt;,</div><div class='add'>+						 &lt;CLK_EXT2F_A9&gt;,</div><div class='add'>+						 &lt;CLK_ICN_LMI&gt;,</div><div class='add'>+						 &lt;CLK_ICN_SBC&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi<br/>index 8f79b4147bba..d753ac36788f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih407-family.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih407-family.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stih407-family.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih407-family.dtsi</a></div><div class='hunk'>@@ -20,30 +20,15 @@</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		ranges;</div><div class='ctx'> </div><div class='del'>-		gp0_reserved: rproc@40000000 {</div><div class='add'>+		gp0_reserved: rproc@45000000 {</div><div class='ctx'> 			compatible = "shared-dma-pool";</div><div class='del'>-			reg = &lt;0x40000000 0x01000000&gt;;</div><div class='add'>+			reg = &lt;0x45000000 0x00400000&gt;;</div><div class='ctx'> 			no-map;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gp1_reserved: rproc@41000000 {</div><div class='del'>-			compatible = "shared-dma-pool";</div><div class='del'>-			reg = &lt;0x41000000 0x01000000&gt;;</div><div class='del'>-			no-map;</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		audio_reserved: rproc@42000000 {</div><div class='del'>-			compatible = "shared-dma-pool";</div><div class='del'>-			reg = &lt;0x42000000 0x01000000&gt;;</div><div class='del'>-			no-map;</div><div class='del'>-			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		dmu_reserved: rproc@43000000 {</div><div class='add'>+		delta_reserved: rproc@44000000 {</div><div class='ctx'> 			compatible = "shared-dma-pool";</div><div class='del'>-			reg = &lt;0x43000000 0x01000000&gt;;</div><div class='add'>+			reg = &lt;0x44000000 0x01000000&gt;;</div><div class='ctx'> 			no-map;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -222,9 +207,8 @@</div><div class='ctx'> 			compatible = "st,asc";</div><div class='ctx'> 			reg = &lt;0x9830000 0x2c&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 122 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_serial0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clk_s_c0_flexgen CLK_EXT2F_A9&gt;;</div><div class='add'>+			/* Pinctrl moved out to a per-board configuration */</div><div class='ctx'> </div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -680,6 +664,7 @@</div><div class='ctx'> 				phy-names	= "usb2-phy", "usb3-phy";</div><div class='ctx'> 				phys		= &lt;&amp;usb2_picophy0&gt;,</div><div class='ctx'> 						  &lt;&amp;phy_port2 PHY_TYPE_USB3&gt;;</div><div class='add'>+				snps,dis_u3_susphy_quirk;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -703,6 +688,7 @@</div><div class='ctx'> 			compatible	= "st,sti-pwm";</div><div class='ctx'> 			#pwm-cells	= &lt;2&gt;;</div><div class='ctx'> 			reg		= &lt;0x9510000 0x68&gt;;</div><div class='add'>+			interrupts      = &lt;GIC_SPI 131 IRQ_TYPE_NONE&gt;;</div><div class='ctx'> 			pinctrl-names	= "default";</div><div class='ctx'> 			pinctrl-0	= &lt;&amp;pinctrl_pwm1_chan0_default</div><div class='ctx'> 					&amp;pinctrl_pwm1_chan1_default</div><div class='hunk'>@@ -823,37 +809,22 @@</div><div class='ctx'> 			clocks		= &lt;&amp;clk_s_c0_flexgen CLK_ST231_GP_0&gt;;</div><div class='ctx'> 			clock-frequency	= &lt;600000000&gt;;</div><div class='ctx'> 			st,syscfg	= &lt;&amp;syscfg_core 0x22c&gt;;</div><div class='add'>+			#mbox-cells = &lt;1&gt;;</div><div class='add'>+			mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";</div><div class='add'>+			mboxes = &lt;&amp;mailbox0 0 2&gt;, &lt;&amp;mailbox2 0 1&gt;, &lt;&amp;mailbox0 0 3&gt;, &lt;&amp;mailbox2 0 0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-		st231_gp1: remote-processor {</div><div class='del'>-			compatible	= "st,st231-rproc";</div><div class='del'>-			memory-region	= &lt;&amp;gp1_reserved&gt;;</div><div class='del'>-			resets		= &lt;&amp;softreset STIH407_ST231_GP1_SOFTRESET&gt;;</div><div class='del'>-			reset-names	= "sw_reset";</div><div class='del'>-			clocks		= &lt;&amp;clk_s_c0_flexgen CLK_ST231_GP_1&gt;;</div><div class='del'>-			clock-frequency = &lt;600000000&gt;;</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_core 0x220&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		st231_audio: remote-processor {</div><div class='del'>-			compatible	= "st,st231-rproc";</div><div class='del'>-			memory-region	= &lt;&amp;audio_reserved&gt;;</div><div class='del'>-			resets		= &lt;&amp;softreset STIH407_ST231_AUD_SOFTRESET&gt;;</div><div class='del'>-			reset-names	= "sw_reset";</div><div class='del'>-			clocks		= &lt;&amp;clk_s_c0_flexgen CLK_ST231_AUD_0&gt;;</div><div class='del'>-			clock-frequency	= &lt;600000000&gt;;</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_core 0x228&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		st231_dmu: remote-processor {</div><div class='add'>+		st231_delta: remote-processor {</div><div class='ctx'> 			compatible	= "st,st231-rproc";</div><div class='del'>-			memory-region	= &lt;&amp;dmu_reserved&gt;;</div><div class='add'>+			memory-region	= &lt;&amp;delta_reserved&gt;;</div><div class='ctx'> 			resets		= &lt;&amp;softreset STIH407_ST231_DMU_SOFTRESET&gt;;</div><div class='ctx'> 			reset-names	= "sw_reset";</div><div class='ctx'> 			clocks		= &lt;&amp;clk_s_c0_flexgen CLK_ST231_DMU&gt;;</div><div class='ctx'> 			clock-frequency	= &lt;600000000&gt;;</div><div class='ctx'> 			st,syscfg	= &lt;&amp;syscfg_core 0x224&gt;;</div><div class='add'>+			#mbox-cells = &lt;1&gt;;</div><div class='add'>+			mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";</div><div class='add'>+			mboxes = &lt;&amp;mailbox0 0 0&gt;, &lt;&amp;mailbox3 0 1&gt;, &lt;&amp;mailbox0 0 1&gt;, &lt;&amp;mailbox3 0 0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* fdma audio */</div><div class='hunk'>@@ -889,6 +860,8 @@</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 7 IRQ_TYPE_NONE&gt;;</div><div class='ctx'> 			dma-channels = &lt;16&gt;;</div><div class='ctx'> 			#dma-cells = &lt;3&gt;;</div><div class='add'>+</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* fdma free running */</div><div class='hunk'>@@ -906,6 +879,8 @@</div><div class='ctx'> 				&lt;&amp;clk_s_c0_flexgen CLK_EXT2F_A9&gt;,</div><div class='ctx'> 				&lt;&amp;clk_s_c0_flexgen CLK_TX_ICN_DISP_0&gt;,</div><div class='ctx'> 				&lt;&amp;clk_s_c0_flexgen CLK_EXT2F_A9&gt;;</div><div class='add'>+</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sti_sasg_codec: sti-sasg-codec {</div><div class='hunk'>@@ -916,7 +891,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sti_uni_player0: sti-uni-player@8d80000 {</div><div class='del'>-			compatible = "st,sti-uni-player";</div><div class='add'>+			compatible = "st,stih407-uni-player-hdmi";</div><div class='ctx'> 			#sound-dai-cells = &lt;0&gt;;</div><div class='ctx'> 			st,syscfg = &lt;&amp;syscfg_core&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clk_s_d0_flexgen CLK_PCM_0&gt;;</div><div class='hunk'>@@ -926,17 +901,13 @@</div><div class='ctx'> 			reg = &lt;0x8d80000 0x158&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 84 IRQ_TYPE_NONE&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;fdma0 2 0 1&gt;;</div><div class='del'>-			dai-name = "Uni Player #0 (HDMI)";</div><div class='ctx'> 			dma-names = "tx";</div><div class='del'>-			st,uniperiph-id = &lt;0&gt;;</div><div class='del'>-			st,version = &lt;5&gt;;</div><div class='del'>-			st,mode = "HDMI";</div><div class='ctx'> </div><div class='ctx'> 			status		= "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sti_uni_player1: sti-uni-player@8d81000 {</div><div class='del'>-			compatible = "st,sti-uni-player";</div><div class='add'>+			compatible = "st,stih407-uni-player-pcm-out";</div><div class='ctx'> 			#sound-dai-cells = &lt;0&gt;;</div><div class='ctx'> 			st,syscfg = &lt;&amp;syscfg_core&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clk_s_d0_flexgen CLK_PCM_1&gt;;</div><div class='hunk'>@@ -946,17 +917,13 @@</div><div class='ctx'> 			reg = &lt;0x8d81000 0x158&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 85 IRQ_TYPE_NONE&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;fdma0 3 0 1&gt;;</div><div class='del'>-			dai-name = "Uni Player #1 (PIO)";</div><div class='ctx'> 			dma-names = "tx";</div><div class='del'>-			st,uniperiph-id = &lt;1&gt;;</div><div class='del'>-			st,version = &lt;5&gt;;</div><div class='del'>-			st,mode = "PCM";</div><div class='ctx'> </div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sti_uni_player2: sti-uni-player@8d82000 {</div><div class='del'>-			compatible = "st,sti-uni-player";</div><div class='add'>+			compatible = "st,stih407-uni-player-dac";</div><div class='ctx'> 			#sound-dai-cells = &lt;0&gt;;</div><div class='ctx'> 			st,syscfg = &lt;&amp;syscfg_core&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clk_s_d0_flexgen CLK_PCM_2&gt;;</div><div class='hunk'>@@ -966,17 +933,13 @@</div><div class='ctx'> 			reg = &lt;0x8d82000 0x158&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 86 IRQ_TYPE_NONE&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;fdma0 4 0 1&gt;;</div><div class='del'>-			dai-name = "Uni Player #1 (DAC)";</div><div class='ctx'> 			dma-names = "tx";</div><div class='del'>-			st,uniperiph-id = &lt;2&gt;;</div><div class='del'>-			st,version = &lt;5&gt;;</div><div class='del'>-			st,mode = "PCM";</div><div class='ctx'> </div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sti_uni_player3: sti-uni-player@8d85000 {</div><div class='del'>-			compatible = "st,sti-uni-player";</div><div class='add'>+			compatible = "st,stih407-uni-player-spdif";</div><div class='ctx'> 			#sound-dai-cells = &lt;0&gt;;</div><div class='ctx'> 			st,syscfg = &lt;&amp;syscfg_core&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clk_s_d0_flexgen CLK_SPDIFF&gt;;</div><div class='hunk'>@@ -987,40 +950,42 @@</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 89 IRQ_TYPE_NONE&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;fdma0 7 0 1&gt;;</div><div class='ctx'> 			dma-names = "tx";</div><div class='del'>-			dai-name = "Uni Player #1 (PIO)";</div><div class='del'>-			st,uniperiph-id = &lt;3&gt;;</div><div class='del'>-			st,version = &lt;5&gt;;</div><div class='del'>-			st,mode = "SPDIF";</div><div class='ctx'> </div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sti_uni_reader0: sti-uni-reader@8d83000 {</div><div class='del'>-			compatible = "st,sti-uni-reader";</div><div class='add'>+			compatible = "st,stih407-uni-reader-pcm_in";</div><div class='ctx'> 			#sound-dai-cells = &lt;0&gt;;</div><div class='ctx'> 			st,syscfg = &lt;&amp;syscfg_core&gt;;</div><div class='ctx'> 			reg = &lt;0x8d83000 0x158&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 87 IRQ_TYPE_NONE&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;fdma0 5 0 1&gt;;</div><div class='ctx'> 			dma-names = "rx";</div><div class='del'>-			dai-name = "Uni Reader #0 (PCM IN)";</div><div class='del'>-			st,version = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sti_uni_reader1: sti-uni-reader@8d84000 {</div><div class='del'>-			compatible = "st,sti-uni-reader";</div><div class='add'>+			compatible = "st,stih407-uni-reader-hdmi";</div><div class='ctx'> 			#sound-dai-cells = &lt;0&gt;;</div><div class='ctx'> 			st,syscfg = &lt;&amp;syscfg_core&gt;;</div><div class='ctx'> 			reg = &lt;0x8d84000 0x158&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 88 IRQ_TYPE_NONE&gt;;</div><div class='ctx'> 			dmas = &lt;&amp;fdma0 6 0 1&gt;;</div><div class='ctx'> 			dma-names = "rx";</div><div class='del'>-			dai-name = "Uni Reader #1 (HDMI RX)";</div><div class='del'>-			st,version = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		delta0 {</div><div class='add'>+			compatible = "st,st-delta";</div><div class='add'>+			clock-names = "delta",</div><div class='add'>+				      "delta-st231",</div><div class='add'>+				      "delta-flash-promip";</div><div class='add'>+			clocks = &lt;&amp;clk_s_c0_flexgen CLK_VID_DMU&gt;,</div><div class='add'>+				 &lt;&amp;clk_s_c0_flexgen CLK_ST231_DMU&gt;,</div><div class='add'>+				 &lt;&amp;clk_s_c0_flexgen CLK_FLASH_PROMIP&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi b/arch/arm/boot/dts/stih407-pinctrl.dtsi<br/>index c325cc059ae4..bd1a82e8fffe 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih407-pinctrl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih407-pinctrl.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stih407-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih407-pinctrl.dtsi</a></div><div class='hunk'>@@ -465,8 +465,16 @@</div><div class='ctx'> 			serial0 {</div><div class='ctx'> 				pinctrl_serial0: serial0-0 {</div><div class='ctx'> 					st,pins {</div><div class='del'>-						tx = &lt;&amp;pio17 0 ALT1 OUT&gt;;</div><div class='del'>-						rx = &lt;&amp;pio17 1 ALT1 IN&gt;;</div><div class='add'>+						tx =  &lt;&amp;pio17 0 ALT1 OUT&gt;;</div><div class='add'>+						rx =  &lt;&amp;pio17 1 ALT1 IN&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				pinctrl_serial0_hw_flowctrl: serial0-0_hw_flowctrl {</div><div class='add'>+					st,pins {</div><div class='add'>+						tx =  &lt;&amp;pio17 0 ALT1 OUT&gt;;</div><div class='add'>+						rx =  &lt;&amp;pio17 1 ALT1 IN&gt;;</div><div class='add'>+						cts = &lt;&amp;pio17 2 ALT1 IN&gt;;</div><div class='add'>+						rts = &lt;&amp;pio17 3 ALT1 OUT&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='hunk'>@@ -1157,7 +1165,7 @@</div><div class='ctx'> 			reg = &lt;0x0923f080 0x4&gt;;</div><div class='ctx'> 			reg-names = "irqmux";</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 192 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			interrupts-names = "irqmux";</div><div class='add'>+			interrupt-names = "irqmux";</div><div class='ctx'> 			ranges = &lt;0 0x09230000 0x3000&gt;;</div><div class='ctx'> </div><div class='ctx'> 			pio40: gpio@09230000 {</div><div class='head'>diff --git a/arch/arm/boot/dts/stih407.dtsi b/arch/arm/boot/dts/stih407.dtsi<br/>index 291ffacbd2e0..fa149837df14 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih407.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih407.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stih407.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih407.dtsi</a></div><div class='hunk'>@@ -102,7 +102,7 @@</div><div class='ctx'> 							 &lt;&amp;clk_s_d2_quadfs 0&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			sti-hdmi@8d04000 {</div><div class='add'>+			sti_hdmi: sti-hdmi@8d04000 {</div><div class='ctx'> 				compatible = "st,stih407-hdmi";</div><div class='ctx'> 				reg = &lt;0x8d04000 0x1000&gt;;</div><div class='ctx'> 				reg-names = "hdmi-reg";</div><div class='head'>diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts<br/>index 118ac284fc4b..83313b51915d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih410-b2120.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih410-b2120.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stih410-b2120.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih410-b2120.dts</a></div><div class='hunk'>@@ -60,5 +60,11 @@</div><div class='ctx'> 		ehci1: usb@9a83e00 {</div><div class='ctx'> 			status = "okay";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		sti-display-subsystem {</div><div class='add'>+			sti-hda@8d02000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts<br/>index 7fb507fcba7e..93c14d183e29 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih410-b2260.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih410-b2260.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stih410-b2260.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih410-b2260.dts</a></div><div class='hunk'>@@ -62,6 +62,11 @@</div><div class='ctx'> 		/* Low speed expansion connector */</div><div class='ctx'> 		uart0: serial@9830000 {</div><div class='ctx'> 			label = "LS-UART0";</div><div class='add'>+			pinctrl-names = "default", "no-hw-flowctrl";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_serial0_hw_flowctrl&gt;;</div><div class='add'>+			pinctrl-1 = &lt;&amp;pinctrl_serial0&gt;;</div><div class='add'>+			rts-gpios = &lt;&amp;pio17 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			uart-has-rtscts;</div><div class='ctx'> 			status = "okay";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -165,6 +170,9 @@</div><div class='ctx'> 			status = "okay";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		sti_uni_player0: sti-uni-player@8d80000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='ctx'> 		/* SSC11 to HDMI */</div><div class='ctx'> 		hdmiddc: i2c@9541000 {</div><div class='ctx'> 			/* HDMI V1.3a supports Standard mode only */</div><div class='hunk'>@@ -174,9 +182,22 @@</div><div class='ctx'> 			status = "okay";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		sti-display-subsystem {</div><div class='del'>-			sti_hdmi: sti-hdmi@8d04000 {</div><div class='del'>-				status = "okay";</div><div class='add'>+		sound {</div><div class='add'>+			compatible = "simple-audio-card";</div><div class='add'>+			simple-audio-card,name = "STI-B2260";</div><div class='add'>+			status = "okay";</div><div class='add'>+</div><div class='add'>+			simple-audio-card,dai-link@0 {</div><div class='add'>+				/* DAC */</div><div class='add'>+				format = "i2s";</div><div class='add'>+				mclk-fs = &lt;128&gt;;</div><div class='add'>+				cpu {</div><div class='add'>+					sound-dai = &lt;&amp;sti_uni_player0&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				codec {</div><div class='add'>+					sound-dai = &lt;&amp;sti_hdmi&gt;;</div><div class='add'>+				};</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/stih410-clock.dtsi b/arch/arm/boot/dts/stih410-clock.dtsi<br/>index 8598effd6c01..07c8ef9d77f6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih410-clock.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih410-clock.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stih410-clock.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih410-clock.dtsi</a></div><div class='hunk'>@@ -208,7 +208,8 @@</div><div class='ctx'> 						     "clk-clust-hades",</div><div class='ctx'> 						     "clk-hwpe-hades",</div><div class='ctx'> 						     "clk-fc-hades";</div><div class='del'>-				clock-critical = &lt;CLK_ICN_CPU&gt;,</div><div class='add'>+				clock-critical = &lt;CLK_PROC_STFE&gt;,</div><div class='add'>+						 &lt;CLK_ICN_CPU&gt;,</div><div class='ctx'> 						 &lt;CLK_TX_ICN_DMU&gt;,</div><div class='ctx'> 						 &lt;CLK_EXT2F_A9&gt;,</div><div class='ctx'> 						 &lt;CLK_ICN_LMI&gt;,</div><div class='head'>diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi<br/>index a3ef7341c051..3c9672c5b09f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih410.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih410.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stih410.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stih410.dtsi</a></div><div class='hunk'>@@ -131,7 +131,7 @@</div><div class='ctx'> 						 &lt;&amp;clk_s_d2_quadfs 0&gt;;</div><div class='ctx'> </div><div class='ctx'> 			assigned-clock-rates = &lt;297000000&gt;,</div><div class='del'>-					       &lt;108000000&gt;,</div><div class='add'>+					       &lt;297000000&gt;,</div><div class='ctx'> 					       &lt;0&gt;,</div><div class='ctx'> 					       &lt;400000000&gt;,</div><div class='ctx'> 					       &lt;400000000&gt;;</div><div class='hunk'>@@ -193,7 +193,7 @@</div><div class='ctx'> 							 &lt;&amp;clk_s_d2_quadfs 0&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			sti-hdmi@8d04000 {</div><div class='add'>+			sti_hdmi: sti-hdmi@8d04000 {</div><div class='ctx'> 				compatible = "st,stih407-hdmi";</div><div class='ctx'> 				reg = &lt;0x8d04000 0x1000&gt;;</div><div class='ctx'> 				reg-names = "hdmi-reg";</div><div class='hunk'>@@ -221,6 +221,7 @@</div><div class='ctx'> </div><div class='ctx'> 			sti-hda@8d02000 {</div><div class='ctx'> 				compatible = "st,stih407-hda";</div><div class='add'>+				status = "disabled";</div><div class='ctx'> 				reg = &lt;0x8d02000 0x400&gt;, &lt;0x92b0120 0x4&gt;;</div><div class='ctx'> 				reg-names = "hda-reg", "video-dacs-ctrl";</div><div class='ctx'> 				clock-names = "pix",</div><div class='hunk'>@@ -232,6 +233,17 @@</div><div class='ctx'> 					 &lt;&amp;clk_s_d2_quadfs 0&gt;,</div><div class='ctx'> 					 &lt;&amp;clk_s_d2_quadfs 1&gt;;</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			sti-hqvdp@9c000000 {</div><div class='add'>+				compatible = "st,stih407-hqvdp";</div><div class='add'>+				reg = &lt;0x9C00000 0x100000&gt;;</div><div class='add'>+				clock-names = "hqvdp", "pix_main";</div><div class='add'>+				clocks = &lt;&amp;clk_s_c0_flexgen CLK_MAIN_DISP&gt;,</div><div class='add'>+					 &lt;&amp;clk_s_d2_flexgen CLK_PIX_MAIN_DISP&gt;;</div><div class='add'>+				reset-names = "hqvdp";</div><div class='add'>+				resets = &lt;&amp;softreset STIH407_HDQVDP_SOFTRESET&gt;;</div><div class='add'>+				st,vtg = &lt;&amp;vtg_main&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		bdisp0:bdisp@9f10000 {</div><div class='hunk'>@@ -259,5 +271,15 @@</div><div class='ctx'> 			clocks = &lt;&amp;clk_sysin&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 205 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		delta0 {</div><div class='add'>+			compatible = "st,st-delta";</div><div class='add'>+			clock-names = "delta",</div><div class='add'>+				      "delta-st231",</div><div class='add'>+				      "delta-flash-promip";</div><div class='add'>+			clocks = &lt;&amp;clk_s_c0_flexgen CLK_VID_DMU&gt;,</div><div class='add'>+				 &lt;&amp;clk_s_c0_flexgen CLK_ST231_DMU&gt;,</div><div class='add'>+				 &lt;&amp;clk_s_c0_flexgen CLK_FLASH_PROMIP&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/stih415-b2000.dts b/arch/arm/boot/dts/stih415-b2000.dts<br/>deleted file mode 100644<br/>index bdfbd3765db2..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih415-b2000.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih415-b2000.dts</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics (R&amp;D) Limited.</div><div class='del'>- * Author: Srinivas Kandagatla &lt;srinivas.kandagatla@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-/dts-v1/;</div><div class='del'>-#include "stih415.dtsi"</div><div class='del'>-#include "stih41x-b2000.dtsi"</div><div class='del'>-/ {</div><div class='del'>-	model = "STiH415 B2000 Board";</div><div class='del'>-	compatible = "st,stih415-b2000", "st,stih415";</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih415-b2020.dts b/arch/arm/boot/dts/stih415-b2020.dts<br/>deleted file mode 100644<br/>index 71903a87bd31..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih415-b2020.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih415-b2020.dts</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics (R&amp;D) Limited.</div><div class='del'>- * Author: Srinivas Kandagatla &lt;srinivas.kandagatla@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-/dts-v1/;</div><div class='del'>-#include "stih415.dtsi"</div><div class='del'>-#include "stih41x-b2020.dtsi"</div><div class='del'>-/ {</div><div class='del'>-	model = "STiH415 B2020 Board";</div><div class='del'>-	compatible = "st,stih415-b2020", "st,stih415";</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih415-clock.dtsi b/arch/arm/boot/dts/stih415-clock.dtsi<br/>deleted file mode 100644<br/>index 3ee34514bc4b..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih415-clock.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih415-clock.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,533 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics (R&amp;D) Limited</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;dt-bindings/clock/stih415-clks.h&gt;</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	clocks {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		ranges;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Fixed 30MHz oscillator input to SoC</div><div class='del'>-		 */</div><div class='del'>-		clk_sysin: clk-sysin {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-clock";</div><div class='del'>-			clock-frequency = &lt;30000000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ClockGenAs on SASG1</div><div class='del'>-		 */</div><div class='del'>-		clockgen-a@fee62000 {</div><div class='del'>-			reg = &lt;0xfee62000 0xb48&gt;;</div><div class='del'>-</div><div class='del'>-			clk_s_a0_pll: clk-s-a0-pll {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-plls-c65";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-a0-pll0-hs",</div><div class='del'>-						     "clk-s-a0-pll0-ls",</div><div class='del'>-						     "clk-s-a0-pll1";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a0_osc_prediv: clk-s-a0-osc-prediv {</div><div class='del'>-				#clock-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "st,clkgena-prediv-c65",</div><div class='del'>-					     "st,clkgena-prediv";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-a0-osc-prediv";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a0_hs: clk-s-a0-hs {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c65-hs",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_s_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_s_a0_pll 0&gt;, /* PLL0 HS */</div><div class='del'>-					 &lt;&amp;clk_s_a0_pll 2&gt;; /* PLL1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-fdma-0",</div><div class='del'>-						     "clk-s-fdma-1",</div><div class='del'>-						     ""; /* clk-s-jit-sense */</div><div class='del'>-						     /* Fourth output unused */</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a0_ls: clk-s-a0-ls {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c65-ls",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_s_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_s_a0_pll 1&gt;, /* PLL0 LS */</div><div class='del'>-					 &lt;&amp;clk_s_a0_pll 2&gt;; /* PLL1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-icn-reg-0",</div><div class='del'>-						     "clk-s-icn-if-0",</div><div class='del'>-						     "clk-s-icn-reg-lp-0",</div><div class='del'>-						     "clk-s-emiss",</div><div class='del'>-						     "clk-s-eth1-phy",</div><div class='del'>-						     "clk-s-mii-ref-out";</div><div class='del'>-						 /* Remaining outputs unused */</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen-a@fee81000 {</div><div class='del'>-			reg = &lt;0xfee81000 0xb48&gt;;</div><div class='del'>-</div><div class='del'>-			clk_s_a1_pll: clk-s-a1-pll {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-plls-c65";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-a1-pll0-hs",</div><div class='del'>-						     "clk-s-a1-pll0-ls",</div><div class='del'>-						     "clk-s-a1-pll1";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a1_osc_prediv: clk-s-a1-osc-prediv {</div><div class='del'>-				#clock-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "st,clkgena-prediv-c65",</div><div class='del'>-					     "st,clkgena-prediv";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-a1-osc-prediv";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a1_hs: clk-s-a1-hs {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c65-hs",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_s_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_s_a1_pll 0&gt;, /* PLL0 HS */</div><div class='del'>-					 &lt;&amp;clk_s_a1_pll 2&gt;; /* PLL1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* Reserved */</div><div class='del'>-						     "", /* Reserved */</div><div class='del'>-						     "clk-s-stac-phy",</div><div class='del'>-						     "clk-s-vtac-tx-phy";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a1_ls: clk-s-a1-ls {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c65-ls",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_s_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_s_a1_pll 1&gt;, /* PLL0 LS */</div><div class='del'>-					 &lt;&amp;clk_s_a1_pll 2&gt;; /* PLL1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-icn-if-2",</div><div class='del'>-						     "clk-s-card-mmc",</div><div class='del'>-						     "clk-s-icn-if-1",</div><div class='del'>-						     "clk-s-gmac0-phy",</div><div class='del'>-						     "clk-s-nand-ctrl",</div><div class='del'>-						     "", /* Reserved */</div><div class='del'>-						     "clk-s-mii0-ref-out",</div><div class='del'>-						     ""; /* clk-s-stac-sys */</div><div class='del'>-						 /* Remaining outputs unused */</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ClockGenAs on MPE41</div><div class='del'>-		 */</div><div class='del'>-		clockgen-a@fde12000 {</div><div class='del'>-			reg = &lt;0xfde12000 0xb50&gt;;</div><div class='del'>-</div><div class='del'>-			clk_m_a0_pll0: clk-m-a0-pll0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-0", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a0-pll0-phi0",</div><div class='del'>-						     "clk-m-a0-pll0-phi1",</div><div class='del'>-						     "clk-m-a0-pll0-phi2",</div><div class='del'>-						     "clk-m-a0-pll0-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_pll1: clk-m-a0-pll1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-1", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a0-pll1-phi0",</div><div class='del'>-						     "clk-m-a0-pll1-phi1",</div><div class='del'>-						     "clk-m-a0-pll1-phi2",</div><div class='del'>-						     "clk-m-a0-pll1-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_osc_prediv: clk-m-a0-osc-prediv {</div><div class='del'>-				#clock-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "st,clkgena-prediv-c32",</div><div class='del'>-					     "st,clkgena-prediv";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a0-osc-prediv";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_div0: clk-m-a0-div0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf0",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll0 0&gt;, /* PLL0 PHI0 */</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll1 0&gt;; /* PLL1 PHI0 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-apb-pm", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-pp-dmu-0",</div><div class='del'>-						     "clk-m-pp-dmu-1",</div><div class='del'>-						     "clk-m-icm-disp",</div><div class='del'>-						     ""; /* Unused */</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_div1: clk-m-a0-div1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf1",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll0 1&gt;, /* PLL0 PHI1 */</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll1 1&gt;; /* PLL1 PHI1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-a9-ext2f",</div><div class='del'>-						     "clk-m-st40rt",</div><div class='del'>-						     "clk-m-st231-dmu-0",</div><div class='del'>-						     "clk-m-st231-dmu-1",</div><div class='del'>-						     "clk-m-st231-aud",</div><div class='del'>-						     "clk-m-st231-gp-0";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_div2: clk-m-a0-div2 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf2",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll0 2&gt;, /* PLL0 PHI2 */</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll1 2&gt;; /* PLL1 PHI2 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-st231-gp-1",</div><div class='del'>-						     "clk-m-icn-cpu",</div><div class='del'>-						     "clk-m-icn-stac",</div><div class='del'>-						     "clk-m-icn-dmu-0",</div><div class='del'>-						     "clk-m-icn-dmu-1",</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     ""; /* Unused */</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_div3: clk-m-a0-div3 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf3",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll0 3&gt;, /* PLL0 PHI3 */</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll1 3&gt;; /* PLL1 PHI3 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-icn-eram",</div><div class='del'>-						     "clk-m-a9-trace";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen-a@fd6db000 {</div><div class='del'>-			reg = &lt;0xfd6db000 0xb50&gt;;</div><div class='del'>-</div><div class='del'>-			clk_m_a1_pll0: clk-m-a1-pll0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-0", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a1-pll0-phi0",</div><div class='del'>-						     "clk-m-a1-pll0-phi1",</div><div class='del'>-						     "clk-m-a1-pll0-phi2",</div><div class='del'>-						     "clk-m-a1-pll0-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_pll1: clk-m-a1-pll1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-1", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a1-pll1-phi0",</div><div class='del'>-						     "clk-m-a1-pll1-phi1",</div><div class='del'>-						     "clk-m-a1-pll1-phi2",</div><div class='del'>-						     "clk-m-a1-pll1-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_osc_prediv: clk-m-a1-osc-prediv {</div><div class='del'>-				#clock-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "st,clkgena-prediv-c32",</div><div class='del'>-					     "st,clkgena-prediv";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a1-osc-prediv";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_div0: clk-m-a1-div0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf0",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll0 0&gt;, /* PLL0 PHI0 */</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll1 0&gt;; /* PLL1 PHI0 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-fdma-12",</div><div class='del'>-						     "clk-m-fdma-10",</div><div class='del'>-						     "clk-m-fdma-11",</div><div class='del'>-						     "clk-m-hva-lmi",</div><div class='del'>-						     "clk-m-proc-sc",</div><div class='del'>-						     "clk-m-tp",</div><div class='del'>-						     "clk-m-icn-gpu",</div><div class='del'>-						     "clk-m-icn-vdp-0";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_div1: clk-m-a1-div1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf1",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll0 1&gt;, /* PLL0 PHI1 */</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll1 1&gt;; /* PLL1 PHI1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-icn-vdp-1",</div><div class='del'>-						     "clk-m-icn-vdp-2",</div><div class='del'>-						     "clk-m-icn-vdp-3",</div><div class='del'>-						     "clk-m-prv-t1-bus",</div><div class='del'>-						     "clk-m-icn-vdp-4",</div><div class='del'>-						     "clk-m-icn-reg-10",</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     ""; /* clk-m-icn-st231 */</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_div2: clk-m-a1-div2 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf2",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll0 2&gt;, /* PLL0 PHI2 */</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll1 2&gt;; /* PLL1 PHI2 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-fvdp-proc-alt",</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     ""; /* Unused */</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_div3: clk-m-a1-div3 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf3",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll0 3&gt;, /* PLL0 PHI3 */</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll1 3&gt;; /* PLL1 PHI3 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     ""; /* Unused */</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clk_m_a9_ext2f_div2: clk-m-a9-ext2f-div2 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-factor-clock";</div><div class='del'>-			clocks = &lt;&amp;clk_m_a0_div1 2&gt;;</div><div class='del'>-			clock-div = &lt;2&gt;;</div><div class='del'>-			clock-mult = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen-a@fd345000 {</div><div class='del'>-			reg = &lt;0xfd345000 0xb50&gt;;</div><div class='del'>-</div><div class='del'>-			clk_m_a2_pll0: clk-m-a2-pll0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-0", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a2-pll0-phi0",</div><div class='del'>-						     "clk-m-a2-pll0-phi1",</div><div class='del'>-						     "clk-m-a2-pll0-phi2",</div><div class='del'>-						     "clk-m-a2-pll0-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_pll1: clk-m-a2-pll1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-1", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a2-pll1-phi0",</div><div class='del'>-						     "clk-m-a2-pll1-phi1",</div><div class='del'>-						     "clk-m-a2-pll1-phi2",</div><div class='del'>-						     "clk-m-a2-pll1-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_osc_prediv: clk-m-a2-osc-prediv {</div><div class='del'>-				#clock-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "st,clkgena-prediv-c32",</div><div class='del'>-					     "st,clkgena-prediv";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a2-osc-prediv";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_div0: clk-m-a2-div0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf0",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a2_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll0 0&gt;, /* PLL0 PHI0 */</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll1 0&gt;; /* PLL1 PHI0 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-vtac-main-phy",</div><div class='del'>-						     "clk-m-vtac-aux-phy",</div><div class='del'>-						     "clk-m-stac-phy",</div><div class='del'>-						     "clk-m-stac-sys",</div><div class='del'>-						     "", /* clk-m-mpestac-pg */</div><div class='del'>-						     "", /* clk-m-mpestac-wc */</div><div class='del'>-						     "", /* clk-m-mpevtacaux-pg*/</div><div class='del'>-						     ""; /* clk-m-mpevtacmain-pg*/</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_div1: clk-m-a2-div1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf1",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a2_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll0 1&gt;, /* PLL0 PHI1 */</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll1 1&gt;; /* PLL1 PHI1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* clk-m-mpevtacrx0-wc */</div><div class='del'>-						     "", /* clk-m-mpevtacrx1-wc */</div><div class='del'>-						     "clk-m-compo-main",</div><div class='del'>-						     "clk-m-compo-aux",</div><div class='del'>-						     "clk-m-bdisp-0",</div><div class='del'>-						     "clk-m-bdisp-1",</div><div class='del'>-						     "clk-m-icn-bdisp-0",</div><div class='del'>-						     "clk-m-icn-bdisp-1";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_div2: clk-m-a2-div2 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf2",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a2_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll0 2&gt;, /* PLL0 PHI2 */</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll1 2&gt;; /* PLL1 PHI2 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* clk-m-icn-hqvdp0 */</div><div class='del'>-						     "", /* clk-m-icn-hqvdp1 */</div><div class='del'>-						     "clk-m-icn-compo",</div><div class='del'>-						     "", /* clk-m-icn-vdpaux */</div><div class='del'>-						     "clk-m-icn-ts",</div><div class='del'>-						     "clk-m-icn-reg-lp-10",</div><div class='del'>-						     "clk-m-dcephy-impctrl",</div><div class='del'>-						     ""; /* Unused */</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_div3: clk-m-a2-div3 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf3",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a2_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll0 3&gt;, /* PLL0 PHI3 */</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll1 3&gt;; /* PLL1 PHI3 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = ""; /* Unused */</div><div class='del'>-						/* Remaining outputs unused */</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * A9 PLL</div><div class='del'>-		 */</div><div class='del'>-		clockgen-a9@fdde00d8 {</div><div class='del'>-			reg = &lt;0xfdde00d8 0x70&gt;;</div><div class='del'>-</div><div class='del'>-			clockgen_a9_pll: clockgen-a9-pll {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,stih415-plls-c32-a9", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-				clock-output-names = "clockgen-a9-pll-odf";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ARM CPU related clocks</div><div class='del'>-		 */</div><div class='del'>-		clk_m_a9: clk-m-a9@fdde00d8 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "st,stih415-clkgen-a9-mux", "st,clkgen-mux";</div><div class='del'>-			reg = &lt;0xfdde00d8 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;clockgen_a9_pll 0&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_a9_pll 0&gt;,</div><div class='del'>-				 &lt;&amp;clk_m_a0_div1 2&gt;,</div><div class='del'>-				 &lt;&amp;clk_m_a9_ext2f_div2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ARM Peripheral clock for timers</div><div class='del'>-		 */</div><div class='del'>-		arm_periph_clk: clk-m-a9-periphs {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-factor-clock";</div><div class='del'>-			clocks = &lt;&amp;clk_m_a9&gt;;</div><div class='del'>-			clock-div = &lt;2&gt;;</div><div class='del'>-			clock-mult = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih415-pinctrl.dtsi b/arch/arm/boot/dts/stih415-pinctrl.dtsi<br/>deleted file mode 100644<br/>index bd028ce98b61..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih415-pinctrl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih415-pinctrl.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,545 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics (R&amp;D) Limited.</div><div class='del'>- * Author: Srinivas Kandagatla &lt;srinivas.kandagatla@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include "st-pincfg.h"</div><div class='del'>-#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='del'>-/ {</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		gpio0	= &amp;pio0;</div><div class='del'>-		gpio1	= &amp;pio1;</div><div class='del'>-		gpio2	= &amp;pio2;</div><div class='del'>-		gpio3	= &amp;pio3;</div><div class='del'>-		gpio4	= &amp;pio4;</div><div class='del'>-		gpio5	= &amp;pio5;</div><div class='del'>-		gpio6	= &amp;pio6;</div><div class='del'>-		gpio7	= &amp;pio7;</div><div class='del'>-		gpio8	= &amp;pio8;</div><div class='del'>-		gpio9	= &amp;pio9;</div><div class='del'>-		gpio10	= &amp;pio10;</div><div class='del'>-		gpio11	= &amp;pio11;</div><div class='del'>-		gpio12	= &amp;pio12;</div><div class='del'>-		gpio13	= &amp;pio13;</div><div class='del'>-		gpio14	= &amp;pio14;</div><div class='del'>-		gpio15	= &amp;pio15;</div><div class='del'>-		gpio16	= &amp;pio16;</div><div class='del'>-		gpio17	= &amp;pio17;</div><div class='del'>-		gpio18	= &amp;pio18;</div><div class='del'>-		gpio19	= &amp;pio100;</div><div class='del'>-		gpio20	= &amp;pio101;</div><div class='del'>-		gpio21	= &amp;pio102;</div><div class='del'>-		gpio22	= &amp;pio103;</div><div class='del'>-		gpio23	= &amp;pio104;</div><div class='del'>-		gpio24	= &amp;pio105;</div><div class='del'>-		gpio25	= &amp;pio106;</div><div class='del'>-		gpio26	= &amp;pio107;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc {</div><div class='del'>-		pin-controller-sbc {</div><div class='del'>-			#address-cells	= &lt;1&gt;;</div><div class='del'>-			#size-cells	= &lt;1&gt;;</div><div class='del'>-			compatible	= "st,stih415-sbc-pinctrl";</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_sbc&gt;;</div><div class='del'>-			reg 		= &lt;0xfe61f080 0x4&gt;;</div><div class='del'>-			reg-names	= "irqmux";</div><div class='del'>-			interrupts 	= &lt;GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names	= "irqmux";</div><div class='del'>-			ranges 		= &lt;0 0xfe610000 0x5000&gt;;</div><div class='del'>-</div><div class='del'>-			pio0: gpio@fe610000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO0";</div><div class='del'>-			};</div><div class='del'>-			pio1: gpio@fe611000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x1000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO1";</div><div class='del'>-			};</div><div class='del'>-			pio2: gpio@fe612000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x2000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO2";</div><div class='del'>-			};</div><div class='del'>-			pio3: gpio@fe613000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x3000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO3";</div><div class='del'>-			};</div><div class='del'>-			pio4: gpio@fe614000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x4000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO4";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sbc_serial1 {</div><div class='del'>-				pinctrl_sbc_serial1:sbc_serial1 {</div><div class='del'>-					st,pins {</div><div class='del'>-						tx	= &lt;&amp;pio2 6 ALT3 OUT&gt;;</div><div class='del'>-						rx	= &lt;&amp;pio2 7 ALT3 IN&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			keyscan {</div><div class='del'>-				pinctrl_keyscan: keyscan {</div><div class='del'>-					st,pins {</div><div class='del'>-						keyin0 = &lt;&amp;pio0 2 ALT2 IN&gt;;</div><div class='del'>-						keyin1 = &lt;&amp;pio0 3 ALT2 IN&gt;;</div><div class='del'>-						keyin2 = &lt;&amp;pio0 4 ALT2 IN&gt;;</div><div class='del'>-						keyin3 = &lt;&amp;pio2 6 ALT2 IN&gt;;</div><div class='del'>-</div><div class='del'>-						keyout0 = &lt;&amp;pio1 6 ALT2 OUT&gt;;</div><div class='del'>-						keyout1 = &lt;&amp;pio1 7 ALT2 OUT&gt;;</div><div class='del'>-						keyout2 = &lt;&amp;pio0 6 ALT2 OUT&gt;;</div><div class='del'>-						keyout3 = &lt;&amp;pio2 7 ALT2 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sbc_i2c0 {</div><div class='del'>-				pinctrl_sbc_i2c0_default: sbc_i2c0-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						sda = &lt;&amp;pio4 6 ALT1 BIDIR&gt;;</div><div class='del'>-						scl = &lt;&amp;pio4 5 ALT1 BIDIR&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sbc_i2c1 {</div><div class='del'>-				pinctrl_sbc_i2c1_default: sbc_i2c1-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						sda = &lt;&amp;pio3 2 ALT2 BIDIR&gt;;</div><div class='del'>-						scl = &lt;&amp;pio3 1 ALT2 BIDIR&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			rc{</div><div class='del'>-				pinctrl_ir: ir0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						ir = &lt;&amp;pio4 0 ALT2 IN&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			gmac1 {</div><div class='del'>-				pinctrl_mii1: mii1 {</div><div class='del'>-						st,pins {</div><div class='del'>-						 txd0   = &lt;&amp;pio0 0 ALT1 OUT  SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 txd1   = &lt;&amp;pio0 1 ALT1 OUT  SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 txd2   = &lt;&amp;pio0 2 ALT1 OUT  SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 txd3   = &lt;&amp;pio0 3 ALT1 OUT  SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 txer   = &lt;&amp;pio0 4 ALT1 OUT  SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 txen   = &lt;&amp;pio0 5 ALT1 OUT  SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 txclk  = &lt;&amp;pio0 6 ALT1 IN   NICLK	0	CLK_A&gt;;</div><div class='del'>-						 col    = &lt;&amp;pio0 7 ALT1 IN   BYPASS	1000&gt;;</div><div class='del'>-						 mdio   = &lt;&amp;pio1 0 ALT1 OUT  BYPASS	0&gt;;</div><div class='del'>-						 mdc    = &lt;&amp;pio1 1 ALT1 OUT  NICLK	0	CLK_A&gt;;</div><div class='del'>-						 crs    = &lt;&amp;pio1 2 ALT1 IN   BYPASS	1000&gt;;</div><div class='del'>-						 mdint  = &lt;&amp;pio1 3 ALT1 IN   BYPASS	0&gt;;</div><div class='del'>-						 rxd0   = &lt;&amp;pio1 4 ALT1 IN   SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 rxd1   = &lt;&amp;pio1 5 ALT1 IN   SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 rxd2   = &lt;&amp;pio1 6 ALT1 IN   SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 rxd3   = &lt;&amp;pio1 7 ALT1 IN   SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 rxdv   = &lt;&amp;pio2 0 ALT1 IN   SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 rx_er  = &lt;&amp;pio2 1 ALT1 IN   SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-						 rxclk  = &lt;&amp;pio2 2 ALT1 IN   NICLK	0	CLK_A&gt;;</div><div class='del'>-						 phyclk = &lt;&amp;pio2 3 ALT1 IN   NICLK	1000	CLK_A&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pinctrl_rgmii1: rgmii1-0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						 txd0 =	 &lt;&amp;pio0 0 ALT1 OUT DE_IO	1000	CLK_A&gt;;</div><div class='del'>-						 txd1 =	 &lt;&amp;pio0 1 ALT1 OUT DE_IO	1000	CLK_A&gt;;</div><div class='del'>-						 txd2 =	 &lt;&amp;pio0 2 ALT1 OUT DE_IO	1000	CLK_A&gt;;</div><div class='del'>-						 txd3 =	 &lt;&amp;pio0 3 ALT1 OUT DE_IO	1000	CLK_A&gt;;</div><div class='del'>-						 txen =	 &lt;&amp;pio0 5 ALT1 OUT DE_IO	0	CLK_A&gt;;</div><div class='del'>-						 txclk = &lt;&amp;pio0 6 ALT1 IN	NICLK	0	CLK_A&gt;;</div><div class='del'>-						 mdio =	 &lt;&amp;pio1 0 ALT1 OUT	BYPASS	0&gt;;</div><div class='del'>-						 mdc =	 &lt;&amp;pio1 1 ALT1 OUT	NICLK	0	CLK_A&gt;;</div><div class='del'>-						 rxd0 =	 &lt;&amp;pio1 4 ALT1 IN DE_IO	0	CLK_A&gt;;</div><div class='del'>-						 rxd1 =	 &lt;&amp;pio1 5 ALT1 IN DE_IO	0	CLK_A&gt;;</div><div class='del'>-						 rxd2 =	 &lt;&amp;pio1 6 ALT1 IN DE_IO	0	CLK_A&gt;;</div><div class='del'>-						 rxd3 =	 &lt;&amp;pio1 7 ALT1 IN DE_IO	0	CLK_A&gt;;</div><div class='del'>-</div><div class='del'>-						 rxdv =	  &lt;&amp;pio2 0 ALT1 IN DE_IO	500	CLK_A&gt;;</div><div class='del'>-						 rxclk =  &lt;&amp;pio2 2 ALT1 IN	NICLK	0	CLK_A&gt;;</div><div class='del'>-						 phyclk = &lt;&amp;pio2 3 ALT4 OUT	NICLK	0	CLK_B&gt;;</div><div class='del'>-</div><div class='del'>-						 clk125= &lt;&amp;pio3 7 ALT4 IN 	NICLK	0	CLK_A&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pin-controller-front {</div><div class='del'>-			#address-cells	= &lt;1&gt;;</div><div class='del'>-			#size-cells	= &lt;1&gt;;</div><div class='del'>-			compatible	= "st,stih415-front-pinctrl";</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_front&gt;;</div><div class='del'>-			reg 		= &lt;0xfee0f080 0x4&gt;;</div><div class='del'>-			reg-names	= "irqmux";</div><div class='del'>-			interrupts 	= &lt;GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names	= "irqmux";</div><div class='del'>-			ranges		= &lt;0 0xfee00000 0x8000&gt;;</div><div class='del'>-</div><div class='del'>-			pio5: gpio@fee00000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO5";</div><div class='del'>-			};</div><div class='del'>-			pio6: gpio@fee01000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x1000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO6";</div><div class='del'>-			};</div><div class='del'>-			pio7: gpio@fee02000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x2000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO7";</div><div class='del'>-			};</div><div class='del'>-			pio8: gpio@fee03000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x3000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO8";</div><div class='del'>-			};</div><div class='del'>-			pio9: gpio@fee04000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x4000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO9";</div><div class='del'>-			};</div><div class='del'>-			pio10: gpio@fee05000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x5000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO10";</div><div class='del'>-			};</div><div class='del'>-			pio11: gpio@fee06000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x6000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO11";</div><div class='del'>-			};</div><div class='del'>-			pio12: gpio@fee07000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x7000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO12";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c0 {</div><div class='del'>-				pinctrl_i2c0_default: i2c0-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						sda = &lt;&amp;pio9 3 ALT1 BIDIR&gt;;</div><div class='del'>-						scl = &lt;&amp;pio9 2 ALT1 BIDIR&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c1 {</div><div class='del'>-				pinctrl_i2c1_default: i2c1-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						sda = &lt;&amp;pio12 1 ALT1 BIDIR&gt;;</div><div class='del'>-						scl = &lt;&amp;pio12 0 ALT1 BIDIR&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pin-controller-rear {</div><div class='del'>-			#address-cells	= &lt;1&gt;;</div><div class='del'>-			#size-cells	= &lt;1&gt;;</div><div class='del'>-			compatible	= "st,stih415-rear-pinctrl";</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_rear&gt;;</div><div class='del'>-			reg 		= &lt;0xfe82f080 0x4&gt;;</div><div class='del'>-			reg-names	= "irqmux";</div><div class='del'>-			interrupts 	= &lt;GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names	= "irqmux";</div><div class='del'>-			ranges		= &lt;0 0xfe820000 0x8000&gt;;</div><div class='del'>-</div><div class='del'>-			pio13: gpio@fe820000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO13";</div><div class='del'>-			};</div><div class='del'>-			pio14: gpio@fe821000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x1000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO14";</div><div class='del'>-			};</div><div class='del'>-			pio15: gpio@fe822000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x2000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO15";</div><div class='del'>-			};</div><div class='del'>-			pio16: gpio@fe823000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x3000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO16";</div><div class='del'>-			};</div><div class='del'>-			pio17: gpio@fe824000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x4000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO17";</div><div class='del'>-			};</div><div class='del'>-			pio18: gpio@fe825000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x5000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO18";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			serial2 {</div><div class='del'>-				pinctrl_serial2: serial2-0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						tx	= &lt;&amp;pio17 4 ALT2 OUT&gt;;</div><div class='del'>-						rx	= &lt;&amp;pio17 5 ALT2 IN&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			gmac0{</div><div class='del'>-				pinctrl_mii0: mii0 {</div><div class='del'>-					st,pins {</div><div class='del'>-					 mdint =	&lt;&amp;pio13 6 ALT2	IN	BYPASS		0&gt;;</div><div class='del'>-					 txen =		&lt;&amp;pio13 7 ALT2	OUT	SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-</div><div class='del'>-					 txd0 =		&lt;&amp;pio14 0 ALT2	OUT	SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-					 txd1 =		&lt;&amp;pio14 1 ALT2	OUT	SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-					 txd2 =		&lt;&amp;pio14 2 ALT2	OUT	SE_NICLK_IO	0	CLK_B&gt;;</div><div class='del'>-					 txd3 =		&lt;&amp;pio14 3 ALT2	OUT	SE_NICLK_IO	0	CLK_B&gt;;</div><div class='del'>-</div><div class='del'>-					 txclk =	&lt;&amp;pio15 0 ALT2	IN	NICLK		0	CLK_A&gt;;</div><div class='del'>-					 txer =		&lt;&amp;pio15 1 ALT2	OUT	SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-					 crs =		&lt;&amp;pio15 2 ALT2	IN	BYPASS		1000&gt;;</div><div class='del'>-					 col =		&lt;&amp;pio15 3 ALT2	IN	BYPASS		1000&gt;;</div><div class='del'>-					 mdio  =        &lt;&amp;pio15 4 ALT2	OUT	BYPASS 	3000&gt;;</div><div class='del'>-					 mdc   =        &lt;&amp;pio15 5 ALT2	OUT     NICLK  	0    	CLK_B&gt;;</div><div class='del'>-</div><div class='del'>-					 rxd0 =		&lt;&amp;pio16 0 ALT2	IN	SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-					 rxd1 =		&lt;&amp;pio16 1 ALT2	IN	SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-					 rxd2 =		&lt;&amp;pio16 2 ALT2	IN	SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-					 rxd3 =		&lt;&amp;pio16 3 ALT2	IN	SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-					 rxdv =		&lt;&amp;pio15 6 ALT2	IN	SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-					 rx_er =	&lt;&amp;pio15 7 ALT2	IN	SE_NICLK_IO	0	CLK_A&gt;;</div><div class='del'>-					 rxclk =	&lt;&amp;pio17 0 ALT2	IN	NICLK		0	CLK_A&gt;;</div><div class='del'>-					 phyclk =	&lt;&amp;pio13 5 ALT2	OUT	NICLK	1000	CLK_A&gt;;</div><div class='del'>-</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-			pinctrl_gmii0: gmii0 {</div><div class='del'>-				st,pins {</div><div class='del'>-					 mdint =	&lt;&amp;pio13 6	ALT2 IN		BYPASS	0&gt;;</div><div class='del'>-					 mdio  =        &lt;&amp;pio15 4 	ALT2 OUT	BYPASS 	3000&gt;;</div><div class='del'>-					 mdc   =        &lt;&amp;pio15 5 	ALT2 OUT    	NICLK  	0    	CLK_B&gt;;</div><div class='del'>-					 txen =		&lt;&amp;pio13 7	ALT2 OUT	SE_NICLK_IO	3000	CLK_A&gt;;</div><div class='del'>-</div><div class='del'>-					 txd0 =		&lt;&amp;pio14 0	ALT2 OUT	SE_NICLK_IO	3000	CLK_A&gt;;</div><div class='del'>-					 txd1 =		&lt;&amp;pio14 1	ALT2 OUT	SE_NICLK_IO	3000	CLK_A&gt;;</div><div class='del'>-					 txd2 =		&lt;&amp;pio14 2	ALT2 OUT	SE_NICLK_IO	3000	CLK_B&gt;;</div><div class='del'>-					 txd3 =		&lt;&amp;pio14 3	ALT2 OUT	SE_NICLK_IO	3000	CLK_B&gt;;</div><div class='del'>-					 txd4 =		&lt;&amp;pio14 4	ALT2 OUT	SE_NICLK_IO	3000	CLK_B&gt;;</div><div class='del'>-					 txd5 =		&lt;&amp;pio14 5	ALT2 OUT	SE_NICLK_IO	3000	CLK_B&gt;;</div><div class='del'>-					 txd6 =		&lt;&amp;pio14 6	ALT2 OUT	SE_NICLK_IO	3000	CLK_B&gt;;</div><div class='del'>-					 txd7 =		&lt;&amp;pio14 7	ALT2 OUT	SE_NICLK_IO	3000	CLK_B&gt;;</div><div class='del'>-</div><div class='del'>-					 txclk =	&lt;&amp;pio15 0	ALT2 IN		NICLK	0	CLK_A&gt;;</div><div class='del'>-					 txer =		&lt;&amp;pio15 1	ALT2 OUT 	SE_NICLK_IO	3000	CLK_A&gt;;</div><div class='del'>-					 crs =		&lt;&amp;pio15 2	ALT2 IN		BYPASS	1000&gt;;</div><div class='del'>-					 col =		&lt;&amp;pio15 3	ALT2 IN		BYPASS	1000&gt;;</div><div class='del'>-					 rxdv =		&lt;&amp;pio15 6	ALT2 IN		SE_NICLK_IO	1500	CLK_A&gt;;</div><div class='del'>-					 rx_er =	&lt;&amp;pio15 7	ALT2 IN		SE_NICLK_IO	1500	CLK_A&gt;;</div><div class='del'>-</div><div class='del'>-					 rxd0 =		&lt;&amp;pio16 0	ALT2 IN		SE_NICLK_IO	1500	CLK_A&gt;;</div><div class='del'>-					 rxd1 =		&lt;&amp;pio16 1	ALT2 IN		SE_NICLK_IO	1500	CLK_A&gt;;</div><div class='del'>-					 rxd2 =		&lt;&amp;pio16 2	ALT2 IN		SE_NICLK_IO	1500	CLK_A&gt;;</div><div class='del'>-					 rxd3 =		&lt;&amp;pio16 3	ALT2 IN		SE_NICLK_IO	1500	CLK_A&gt;;</div><div class='del'>-					 rxd4 =		&lt;&amp;pio16 4	ALT2 IN		SE_NICLK_IO	1500	CLK_A&gt;;</div><div class='del'>-					 rxd5 =		&lt;&amp;pio16 5	ALT2 IN		SE_NICLK_IO	1500	CLK_A&gt;;</div><div class='del'>-					 rxd6 =		&lt;&amp;pio16 6	ALT2 IN		SE_NICLK_IO	1500	CLK_A&gt;;</div><div class='del'>-					 rxd7 =		&lt;&amp;pio16 7	ALT2 IN		SE_NICLK_IO	1500	CLK_A&gt;;</div><div class='del'>-</div><div class='del'>-					 rxclk =	&lt;&amp;pio17 0	ALT2 IN	NICLK	0	CLK_A&gt;;</div><div class='del'>-					 clk125 =	&lt;&amp;pio17 6	ALT1 IN	NICLK	0	CLK_A&gt;;</div><div class='del'>-                                         phyclk =       &lt;&amp;pio13 5       ALT4 OUT NICLK   0       CLK_B&gt;;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			mmc0 {</div><div class='del'>-				pinctrl_mmc0: mmc0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						mmcclk = &lt;&amp;pio13 4 ALT4 BIDIR_PU NICLK 0 CLK_B&gt;;</div><div class='del'>-						data0  = &lt;&amp;pio14 4 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data1  = &lt;&amp;pio14 5 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data2  = &lt;&amp;pio14 6 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data3  = &lt;&amp;pio14 7 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						cmd    = &lt;&amp;pio15 1 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						wp     = &lt;&amp;pio15 3 ALT4 IN&gt;;</div><div class='del'>-						data4  = &lt;&amp;pio16 4 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data5  = &lt;&amp;pio16 5 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data6  = &lt;&amp;pio16 6 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data7  = &lt;&amp;pio16 7 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						pwr    = &lt;&amp;pio17 1 ALT4 OUT&gt;;</div><div class='del'>-						cd     = &lt;&amp;pio17 2 ALT4 IN&gt;;</div><div class='del'>-						led    = &lt;&amp;pio17 3 ALT4 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pin-controller-left {</div><div class='del'>-			#address-cells	= &lt;1&gt;;</div><div class='del'>-			#size-cells	= &lt;1&gt;;</div><div class='del'>-			compatible	= "st,stih415-left-pinctrl";</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_left&gt;;</div><div class='del'>-			reg 		= &lt;0xfd6bf080 0x4&gt;;</div><div class='del'>-			reg-names	= "irqmux";</div><div class='del'>-			interrupts 	= &lt;GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names	= "irqmux";</div><div class='del'>-			ranges		= &lt;0 0xfd6b0000 0x3000&gt;;</div><div class='del'>-</div><div class='del'>-			pio100: gpio@fd6b0000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO100";</div><div class='del'>-			};</div><div class='del'>-			pio101: gpio@fd6b1000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x1000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO101";</div><div class='del'>-			};</div><div class='del'>-			pio102: gpio@fd6b2000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x2000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO102";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pin-controller-right {</div><div class='del'>-			#address-cells	= &lt;1&gt;;</div><div class='del'>-			#size-cells	= &lt;1&gt;;</div><div class='del'>-			compatible	= "st,stih415-right-pinctrl";</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_right&gt;;</div><div class='del'>-			reg 		= &lt;0xfd33f080 0x4&gt;;</div><div class='del'>-			reg-names	= "irqmux";</div><div class='del'>-			interrupts 	= &lt;GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names	= "irqmux";</div><div class='del'>-			ranges		= &lt;0 0xfd330000 0x5000&gt;;</div><div class='del'>-</div><div class='del'>-			pio103: gpio@fd330000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO103";</div><div class='del'>-			};</div><div class='del'>-			pio104: gpio@fd331000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x1000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO104";</div><div class='del'>-			};</div><div class='del'>-			pio105: gpio@fd332000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x2000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO105";</div><div class='del'>-			};</div><div class='del'>-			pio106: gpio@fd333000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x3000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO106";</div><div class='del'>-			};</div><div class='del'>-			pio107: gpio@fd334000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x4000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO107";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi<br/>deleted file mode 100644<br/>index 12427e651e5e..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih415.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih415.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,234 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics (R&amp;D) Limited.</div><div class='del'>- * Author: Srinivas Kandagatla &lt;srinivas.kandagatla@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include "stih41x.dtsi"</div><div class='del'>-#include "stih415-clock.dtsi"</div><div class='del'>-#include "stih415-pinctrl.dtsi"</div><div class='del'>-#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='del'>-#include &lt;dt-bindings/reset/stih415-resets.h&gt;</div><div class='del'>-/ {</div><div class='del'>-</div><div class='del'>-	L2: cache-controller {</div><div class='del'>-		compatible = "arm,pl310-cache";</div><div class='del'>-		reg = &lt;0xfffe2000 0x1000&gt;;</div><div class='del'>-		arm,data-latency = &lt;3 2 2&gt;;</div><div class='del'>-		arm,tag-latency = &lt;1 1 1&gt;;</div><div class='del'>-		cache-unified;</div><div class='del'>-		cache-level = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='del'>-		ranges;</div><div class='del'>-		compatible	= "simple-bus";</div><div class='del'>-</div><div class='del'>-		powerdown: powerdown-controller {</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih415-powerdown";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		softreset: softreset-controller {</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih415-softreset";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_sbc: sbc-syscfg@fe600000{</div><div class='del'>-			compatible      = "st,stih415-sbc-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfe600000 0xb4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_front: front-syscfg@fee10000{</div><div class='del'>-			compatible      = "st,stih415-front-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfee10000 0x194&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_rear: rear-syscfg@fe830000{</div><div class='del'>-			compatible      = "st,stih415-rear-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfe830000 0x190&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* MPE syscfgs */</div><div class='del'>-		syscfg_left: left-syscfg@fd690000{</div><div class='del'>-			compatible      = "st,stih415-left-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfd690000 0x78&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_right: right-syscfg@fd320000{</div><div class='del'>-			compatible      = "st,stih415-right-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfd320000 0x180&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_system: system-syscfg@fdde0000  {</div><div class='del'>-			compatible      = "st,stih415-system-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfdde0000 0x15c&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_lpm: lpm-syscfg@fe4b5100{</div><div class='del'>-			compatible      = "st,stih415-lpm-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfe4b5100 0x08&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial2: serial@fed32000 {</div><div class='del'>-			compatible	= "st,asc";</div><div class='del'>-			status 		= "disabled";</div><div class='del'>-			reg		= &lt;0xfed32000 0x2c&gt;;</div><div class='del'>-			interrupts	= &lt;0 197 0&gt;;</div><div class='del'>-			pinctrl-names 	= "default";</div><div class='del'>-			pinctrl-0 	= &lt;&amp;pinctrl_serial2&gt;;</div><div class='del'>-			clocks		= &lt;&amp;clk_s_a0_ls CLK_ICN_REG&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* SBC comms block ASCs in SASG1 */</div><div class='del'>-		sbc_serial1: serial@fe531000 {</div><div class='del'>-			compatible	= "st,asc";</div><div class='del'>-			status 		= "disabled";</div><div class='del'>-			reg		= &lt;0xfe531000 0x2c&gt;;</div><div class='del'>-			interrupts	= &lt;0 210 0&gt;;</div><div class='del'>-			clocks		= &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			pinctrl-names 	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_sbc_serial1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@fed40000 {</div><div class='del'>-			compatible	= "st,comms-ssc4-i2c";</div><div class='del'>-			reg		= &lt;0xfed40000 0x110&gt;;</div><div class='del'>-			interrupts	= &lt;GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks		= &lt;&amp;clk_s_a0_ls CLK_ICN_REG&gt;;</div><div class='del'>-			clock-names	= "ssc";</div><div class='del'>-			clock-frequency = &lt;400000&gt;;</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_i2c0_default&gt;;</div><div class='del'>-</div><div class='del'>-			status		= "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@fed41000 {</div><div class='del'>-			compatible	= "st,comms-ssc4-i2c";</div><div class='del'>-			reg		= &lt;0xfed41000 0x110&gt;;</div><div class='del'>-			interrupts	= &lt;GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks		= &lt;&amp;clk_s_a0_ls CLK_ICN_REG&gt;;</div><div class='del'>-			clock-names	= "ssc";</div><div class='del'>-			clock-frequency = &lt;400000&gt;;</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_i2c1_default&gt;;</div><div class='del'>-</div><div class='del'>-			status		= "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@fe540000 {</div><div class='del'>-			compatible	= "st,comms-ssc4-i2c";</div><div class='del'>-			reg		= &lt;0xfe540000 0x110&gt;;</div><div class='del'>-			interrupts	= &lt;GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks		= &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			clock-names	= "ssc";</div><div class='del'>-			clock-frequency = &lt;400000&gt;;</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_sbc_i2c0_default&gt;;</div><div class='del'>-</div><div class='del'>-			status		= "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@fe541000 {</div><div class='del'>-			compatible	= "st,comms-ssc4-i2c";</div><div class='del'>-			reg		= &lt;0xfe541000 0x110&gt;;</div><div class='del'>-			interrupts	= &lt;GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks		= &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			clock-names	= "ssc";</div><div class='del'>-			clock-frequency = &lt;400000&gt;;</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_sbc_i2c1_default&gt;;</div><div class='del'>-</div><div class='del'>-			status		= "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ethernet0: dwmac@fe810000 {</div><div class='del'>-			device_type 	= "network";</div><div class='del'>-			compatible	= "st,stih415-dwmac", "snps,dwmac", "snps,dwmac-3.610";</div><div class='del'>-			status 		= "disabled";</div><div class='del'>-</div><div class='del'>-			reg		= &lt;0xfe810000 0x8000&gt;;</div><div class='del'>-			reg-names	= "stmmaceth";</div><div class='del'>-</div><div class='del'>-			interrupts 	= &lt;0 147 0&gt;, &lt;0 148 0&gt;, &lt;0 149 0&gt;;</div><div class='del'>-			interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";</div><div class='del'>-			resets			= &lt;&amp;softreset STIH415_ETH0_SOFTRESET&gt;;</div><div class='del'>-			reset-names		= "stmmaceth";</div><div class='del'>-</div><div class='del'>-			snps,pbl 	= &lt;32&gt;;</div><div class='del'>-			snps,mixed-burst;</div><div class='del'>-			snps,force_sf_dma_mode;</div><div class='del'>-</div><div class='del'>-			st,syscon	= &lt;&amp;syscfg_rear 0x148&gt;;</div><div class='del'>-</div><div class='del'>-			pinctrl-names 	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_mii0&gt;;</div><div class='del'>-			clock-names	= "stmmaceth", "sti-ethclk";</div><div class='del'>-			clocks		= &lt;&amp;clk_s_a1_ls CLK_ICN_IF_2&gt;, &lt;&amp;clk_s_a1_ls CLK_GMAC0_PHY&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ethernet1: dwmac@fef08000 {</div><div class='del'>-			device_type = "network";</div><div class='del'>-			compatible	= "st,stih415-dwmac", "snps,dwmac", "snps,dwmac-3.610";</div><div class='del'>-			status 		= "disabled";</div><div class='del'>-			reg		= &lt;0xfef08000 0x8000&gt;;</div><div class='del'>-			reg-names	= "stmmaceth";</div><div class='del'>-			interrupts 	= &lt;0 150 0&gt;, &lt;0 151 0&gt;, &lt;0 152 0&gt;;</div><div class='del'>-			interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";</div><div class='del'>-</div><div class='del'>-			snps,pbl	= &lt;32&gt;;</div><div class='del'>-			snps,mixed-burst;</div><div class='del'>-			snps,force_sf_dma_mode;</div><div class='del'>-</div><div class='del'>-			st,syscon		= &lt;&amp;syscfg_sbc 0x74&gt;;</div><div class='del'>-</div><div class='del'>-			resets			= &lt;&amp;softreset STIH415_ETH1_SOFTRESET&gt;;</div><div class='del'>-			reset-names		= "stmmaceth";</div><div class='del'>-			pinctrl-names 	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_mii1&gt;;</div><div class='del'>-			clock-names	= "stmmaceth", "sti-ethclk";</div><div class='del'>-			clocks		= &lt;&amp;clk_s_a0_ls CLK_ICN_REG&gt;, &lt;&amp;clk_s_a0_ls CLK_ETH1_PHY&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		rc: rc@fe518000 {</div><div class='del'>-			compatible	= "st,comms-irb";</div><div class='del'>-			reg		= &lt;0xfe518000 0x234&gt;;</div><div class='del'>-			interrupts	=  &lt;0 203 0&gt;;</div><div class='del'>-			clocks		= &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			rx-mode		= "infrared";</div><div class='del'>-			pinctrl-names 	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_ir&gt;;</div><div class='del'>-			resets		= &lt;&amp;softreset STIH415_IRB_SOFTRESET&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		keyscan: keyscan@fe4b0000 {</div><div class='del'>-			compatible = "st,sti-keyscan";</div><div class='del'>-			status = "disabled";</div><div class='del'>-			reg = &lt;0xfe4b0000 0x2000&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 212 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_keyscan&gt;;</div><div class='del'>-			resets	= &lt;&amp;powerdown STIH415_KEYSCAN_POWERDOWN&gt;,</div><div class='del'>-				  &lt;&amp;softreset STIH415_KEYSCAN_SOFTRESET&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc0: sdhci@fe81e000 {</div><div class='del'>-			compatible      = "st,sdhci";</div><div class='del'>-			status          = "disabled";</div><div class='del'>-			reg             = &lt;0xfe81e000 0x1000&gt;;</div><div class='del'>-			interrupts      = &lt;GIC_SPI 145 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			interrupt-names = "mmcirq";</div><div class='del'>-			pinctrl-names   = "default";</div><div class='del'>-			pinctrl-0       = &lt;&amp;pinctrl_mmc0&gt;;</div><div class='del'>-			clock-names     = "mmc";</div><div class='del'>-			clocks          = &lt;&amp;clk_s_a1_ls 1&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih416-b2000.dts b/arch/arm/boot/dts/stih416-b2000.dts<br/>deleted file mode 100644<br/>index 488e80a5d69d..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih416-b2000.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih416-b2000.dts</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics (R&amp;D) Limited.</div><div class='del'>- * Author: Srinivas Kandagatla &lt;srinivas.kandagatla@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-/dts-v1/;</div><div class='del'>-#include "stih416.dtsi"</div><div class='del'>-#include "stih41x-b2000.dtsi"</div><div class='del'>-/ {</div><div class='del'>-	model = "STiH416 B2000";</div><div class='del'>-	compatible = "st,stih416-b2000", "st,stih416";</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih416-b2020.dts b/arch/arm/boot/dts/stih416-b2020.dts<br/>deleted file mode 100644<br/>index 200a81844765..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih416-b2020.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih416-b2020.dts</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics (R&amp;D) Limited.</div><div class='del'>- * Author: Srinivas Kandagatla &lt;srinivas.kandagatla@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-/dts-v1/;</div><div class='del'>-#include "stih416.dtsi"</div><div class='del'>-#include "stih41x-b2020.dtsi"</div><div class='del'>-/ {</div><div class='del'>-	model = "STiH416 B2020";</div><div class='del'>-	compatible = "st,stih416-b2020", "st,stih416";</div><div class='del'>-</div><div class='del'>-	soc {</div><div class='del'>-		mmc1: sdhci@fe81f000 {</div><div class='del'>-			status       = "okay";</div><div class='del'>-			bus-width    = &lt;8&gt;;</div><div class='del'>-			non-removable;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		miphy365x_phy: phy@fe382000 {</div><div class='del'>-			phy_port0: port@fe382000 {</div><div class='del'>-				st,sata-gen = &lt;3&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			phy_port1: port@fe38a000 {</div><div class='del'>-				st,pcie-tx-pol-inv;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata0: sata@fe380000{</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih416-b2020e.dts b/arch/arm/boot/dts/stih416-b2020e.dts<br/>deleted file mode 100644<br/>index de320cd067de..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih416-b2020e.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih416-b2020e.dts</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2014 STMicroelectronics (R&amp;D) Limited.</div><div class='del'>- * Author: Lee Jones &lt;lee.jones@linaro.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-/dts-v1/;</div><div class='del'>-#include "stih416.dtsi"</div><div class='del'>-#include "stih41x-b2020.dtsi"</div><div class='del'>-#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='del'>-/ {</div><div class='del'>-	model = "STiH416 B2020 REV-E";</div><div class='del'>-	compatible = "st,stih416-b2020", "st,stih416";</div><div class='del'>-</div><div class='del'>-	soc {</div><div class='del'>-		leds {</div><div class='del'>-			compatible = "gpio-leds";</div><div class='del'>-			red {</div><div class='del'>-				label			= "Front Panel LED";</div><div class='del'>-				gpios			= &lt;&amp;pio4 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-				linux,default-trigger	= "heartbeat";</div><div class='del'>-			};</div><div class='del'>-			green {</div><div class='del'>-				gpios			= &lt;&amp;pio1 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-				default-state 		= "off";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ethernet1: dwmac@fef08000 {</div><div class='del'>-			snps,reset-gpio = &lt;&amp;pio0 7&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc1: sdhci@fe81f000 {</div><div class='del'>-			status       = "okay";</div><div class='del'>-			bus-width    = &lt;8&gt;;</div><div class='del'>-			non-removable;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		miphy365x_phy: phy@fe382000 {</div><div class='del'>-			phy_port0: port@fe382000 {</div><div class='del'>-				st,sata-gen = &lt;3&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			phy_port1: port@fe38a000 {</div><div class='del'>-				st,pcie-tx-pol-inv;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata0: sata@fe380000{</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* SAS PWM Module */</div><div class='del'>-		pwm0: pwm@fed10000 {</div><div class='del'>-			status		= "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* SBC PWM Module */</div><div class='del'>-		pwm1: pwm@fe510000 {</div><div class='del'>-			status		= "okay";</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih416-clock.dtsi b/arch/arm/boot/dts/stih416-clock.dtsi<br/>deleted file mode 100644<br/>index 5b4fb838cddb..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih416-clock.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih416-clock.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,756 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics R&amp;D Limited</div><div class='del'>- * &lt;stlinux-devel@stlinux.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;dt-bindings/clock/stih416-clks.h&gt;</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	clocks {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		ranges;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Fixed 30MHz oscillator inputs to SoC</div><div class='del'>-		 */</div><div class='del'>-		clk_sysin: clk-sysin {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-clock";</div><div class='del'>-			clock-frequency = &lt;30000000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ClockGenAs on SASG2</div><div class='del'>-		 */</div><div class='del'>-		clockgen-a@fee62000 {</div><div class='del'>-			reg = &lt;0xfee62000 0xb48&gt;;</div><div class='del'>-</div><div class='del'>-			clk_s_a0_pll: clk-s-a0-pll {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-plls-c65";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-a0-pll0-hs",</div><div class='del'>-						     "clk-s-a0-pll0-ls",</div><div class='del'>-						     "clk-s-a0-pll1";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a0_osc_prediv: clk-s-a0-osc-prediv {</div><div class='del'>-				#clock-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "st,clkgena-prediv-c65",</div><div class='del'>-					     "st,clkgena-prediv";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-a0-osc-prediv";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a0_hs: clk-s-a0-hs {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c65-hs",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_s_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_s_a0_pll 0&gt;, /* PLL0 HS */</div><div class='del'>-					 &lt;&amp;clk_s_a0_pll 2&gt;; /* PLL1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-fdma-0",</div><div class='del'>-						     "clk-s-fdma-1",</div><div class='del'>-						     ""; /* clk-s-jit-sense */</div><div class='del'>-						     /* Fourth output unused */</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a0_ls: clk-s-a0-ls {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c65-ls",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_s_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_s_a0_pll 1&gt;, /* PLL0 LS */</div><div class='del'>-					 &lt;&amp;clk_s_a0_pll 2&gt;; /* PLL1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-icn-reg-0",</div><div class='del'>-						     "clk-s-icn-if-0",</div><div class='del'>-						     "clk-s-icn-reg-lp-0",</div><div class='del'>-						     "clk-s-emiss",</div><div class='del'>-						     "clk-s-eth1-phy",</div><div class='del'>-						     "clk-s-mii-ref-out";</div><div class='del'>-						     /* Remaining outputs unused */</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen-a@fee81000 {</div><div class='del'>-			reg = &lt;0xfee81000 0xb48&gt;;</div><div class='del'>-</div><div class='del'>-			clk_s_a1_pll: clk-s-a1-pll {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-plls-c65";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-a1-pll0-hs",</div><div class='del'>-						     "clk-s-a1-pll0-ls",</div><div class='del'>-						     "clk-s-a1-pll1";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a1_osc_prediv: clk-s-a1-osc-prediv {</div><div class='del'>-				#clock-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "st,clkgena-prediv-c65",</div><div class='del'>-					     "st,clkgena-prediv";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-a1-osc-prediv";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a1_hs: clk-s-a1-hs {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c65-hs",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_s_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_s_a1_pll 0&gt;, /* PLL0 HS */</div><div class='del'>-					 &lt;&amp;clk_s_a1_pll 2&gt;; /* PLL1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* Reserved */</div><div class='del'>-						     "", /* Reserved */</div><div class='del'>-						     "clk-s-stac-phy",</div><div class='del'>-						     "clk-s-vtac-tx-phy";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_s_a1_ls: clk-s-a1-ls {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c65-ls",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_s_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_s_a1_pll 1&gt;, /* PLL0 LS */</div><div class='del'>-					 &lt;&amp;clk_s_a1_pll 2&gt;; /* PLL1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-s-icn-if-2",</div><div class='del'>-						     "clk-s-card-mmc-0",</div><div class='del'>-						     "clk-s-icn-if-1",</div><div class='del'>-						     "clk-s-gmac0-phy",</div><div class='del'>-						     "clk-s-nand-ctrl",</div><div class='del'>-						     "", /* Reserved */</div><div class='del'>-						     "clk-s-mii0-ref-out",</div><div class='del'>-						     "clk-s-stac-sys",</div><div class='del'>-						     "clk-s-card-mmc-1";</div><div class='del'>-						     /* Remaining outputs unused */</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ClockGenAs on MPE42</div><div class='del'>-		 */</div><div class='del'>-		clockgen-a@fde12000 {</div><div class='del'>-			reg = &lt;0xfde12000 0xb50&gt;;</div><div class='del'>-</div><div class='del'>-			clk_m_a0_pll0: clk-m-a0-pll0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-0", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a0-pll0-phi0",</div><div class='del'>-						     "clk-m-a0-pll0-phi1",</div><div class='del'>-						     "clk-m-a0-pll0-phi2",</div><div class='del'>-						     "clk-m-a0-pll0-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_pll1: clk-m-a0-pll1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-1", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a0-pll1-phi0",</div><div class='del'>-						     "clk-m-a0-pll1-phi1",</div><div class='del'>-						     "clk-m-a0-pll1-phi2",</div><div class='del'>-						     "clk-m-a0-pll1-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_osc_prediv: clk-m-a0-osc-prediv {</div><div class='del'>-				#clock-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "st,clkgena-prediv-c32",</div><div class='del'>-					     "st,clkgena-prediv";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a0-osc-prediv";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_div0: clk-m-a0-div0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf0",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll0 0&gt;, /* PLL0 PHI0 */</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll1 0&gt;; /* PLL1 PHI0 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-fdma-12",</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-pp-dmu-0",</div><div class='del'>-						     "clk-m-pp-dmu-1",</div><div class='del'>-						     "clk-m-icm-lmi",</div><div class='del'>-						     "clk-m-vid-dmu-0";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_div1: clk-m-a0-div1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf1",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll0 1&gt;, /* PLL0 PHI1 */</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll1 1&gt;; /* PLL1 PHI1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-vid-dmu-1",</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-a9-ext2f",</div><div class='del'>-						     "clk-m-st40rt",</div><div class='del'>-						     "clk-m-st231-dmu-0",</div><div class='del'>-						     "clk-m-st231-dmu-1",</div><div class='del'>-						     "clk-m-st231-aud",</div><div class='del'>-						     "clk-m-st231-gp-0";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_div2: clk-m-a0-div2 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf2",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll0 2&gt;, /* PLL0 PHI2 */</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll1 2&gt;; /* PLL1 PHI2 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-st231-gp-1",</div><div class='del'>-						     "clk-m-icn-cpu",</div><div class='del'>-						     "clk-m-icn-stac",</div><div class='del'>-						     "clk-m-tx-icn-dmu-0",</div><div class='del'>-						     "clk-m-tx-icn-dmu-1",</div><div class='del'>-						     "clk-m-tx-icn-ts",</div><div class='del'>-						     "clk-m-icn-vdp-0",</div><div class='del'>-						     "clk-m-icn-vdp-1";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a0_div3: clk-m-a0-div3 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf3",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a0_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll0 3&gt;, /* PLL0 PHI3 */</div><div class='del'>-					 &lt;&amp;clk_m_a0_pll1 3&gt;; /* PLL1 PHI3 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-icn-vp8",</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-icn-reg-11",</div><div class='del'>-						     "clk-m-a9-trace";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen-a@fd6db000 {</div><div class='del'>-			reg = &lt;0xfd6db000 0xb50&gt;;</div><div class='del'>-</div><div class='del'>-			clk_m_a1_pll0: clk-m-a1-pll0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-0", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a1-pll0-phi0",</div><div class='del'>-						     "clk-m-a1-pll0-phi1",</div><div class='del'>-						     "clk-m-a1-pll0-phi2",</div><div class='del'>-						     "clk-m-a1-pll0-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_pll1: clk-m-a1-pll1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-1", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a1-pll1-phi0",</div><div class='del'>-						     "clk-m-a1-pll1-phi1",</div><div class='del'>-						     "clk-m-a1-pll1-phi2",</div><div class='del'>-						     "clk-m-a1-pll1-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_osc_prediv: clk-m-a1-osc-prediv {</div><div class='del'>-				#clock-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "st,clkgena-prediv-c32",</div><div class='del'>-					     "st,clkgena-prediv";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a1-osc-prediv";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_div0: clk-m-a1-div0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf0",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll0 0&gt;, /* PLL0 PHI0 */</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll1 0&gt;; /* PLL1 PHI0 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* Unused */</div><div class='del'>-						     "clk-m-fdma-10",</div><div class='del'>-						     "clk-m-fdma-11",</div><div class='del'>-						     "clk-m-hva-alt",</div><div class='del'>-						     "clk-m-proc-sc",</div><div class='del'>-						     "clk-m-tp",</div><div class='del'>-						     "clk-m-rx-icn-dmu-0",</div><div class='del'>-						     "clk-m-rx-icn-dmu-1";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_div1: clk-m-a1-div1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf1",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll0 1&gt;, /* PLL0 PHI1 */</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll1 1&gt;; /* PLL1 PHI1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-rx-icn-ts",</div><div class='del'>-						     "clk-m-rx-icn-vdp-0",</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-prv-t1-bus",</div><div class='del'>-						     "clk-m-icn-reg-12",</div><div class='del'>-						     "clk-m-icn-reg-10",</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-icn-st231";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_div2: clk-m-a1-div2 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf2",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll0 2&gt;, /* PLL0 PHI2 */</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll1 2&gt;; /* PLL1 PHI2 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-fvdp-proc-alt",</div><div class='del'>-						     "clk-m-icn-reg-13",</div><div class='del'>-						     "clk-m-tx-icn-gpu",</div><div class='del'>-						     "clk-m-rx-icn-gpu",</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* clk-m-apb-pm-12 */</div><div class='del'>-						     ""; /* Unused */</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a1_div3: clk-m-a1-div3 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf3",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a1_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll0 3&gt;, /* PLL0 PHI3 */</div><div class='del'>-					 &lt;&amp;clk_m_a1_pll1 3&gt;; /* PLL1 PHI3 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     ""; /* clk-m-gpu-alt */</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clk_m_a9_ext2f_div2: clk-m-a9-ext2f-div2 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-factor-clock";</div><div class='del'>-			clocks = &lt;&amp;clk_m_a0_div1 2&gt;;</div><div class='del'>-			clock-div = &lt;2&gt;;</div><div class='del'>-			clock-mult = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen-a@fd345000 {</div><div class='del'>-			reg = &lt;0xfd345000 0xb50&gt;;</div><div class='del'>-</div><div class='del'>-			clk_m_a2_pll0: clk-m-a2-pll0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-0", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a2-pll0-phi0",</div><div class='del'>-						     "clk-m-a2-pll0-phi1",</div><div class='del'>-						     "clk-m-a2-pll0-phi2",</div><div class='del'>-						     "clk-m-a2-pll0-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_pll1: clk-m-a2-pll1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,plls-c32-a1x-1", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a2-pll1-phi0",</div><div class='del'>-						     "clk-m-a2-pll1-phi1",</div><div class='del'>-						     "clk-m-a2-pll1-phi2",</div><div class='del'>-						     "clk-m-a2-pll1-phi3";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_osc_prediv: clk-m-a2-osc-prediv {</div><div class='del'>-				#clock-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "st,clkgena-prediv-c32",</div><div class='del'>-					     "st,clkgena-prediv";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-a2-osc-prediv";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_div0: clk-m-a2-div0 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf0",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a2_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll0 0&gt;, /* PLL0 PHI0 */</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll1 0&gt;; /* PLL1 PHI0 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-vtac-main-phy",</div><div class='del'>-						     "clk-m-vtac-aux-phy",</div><div class='del'>-						     "clk-m-stac-phy",</div><div class='del'>-						     "clk-m-stac-sys",</div><div class='del'>-						     "", /* clk-m-mpestac-pg */</div><div class='del'>-						     "", /* clk-m-mpestac-wc */</div><div class='del'>-						     "", /* clk-m-mpevtacaux-pg*/</div><div class='del'>-						     ""; /* clk-m-mpevtacmain-pg*/</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_div1: clk-m-a2-div1 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf1",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a2_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll0 1&gt;, /* PLL0 PHI1 */</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll1 1&gt;; /* PLL1 PHI1 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* clk-m-mpevtacrx0-wc */</div><div class='del'>-						     "", /* clk-m-mpevtacrx1-wc */</div><div class='del'>-						     "clk-m-compo-main",</div><div class='del'>-						     "clk-m-compo-aux",</div><div class='del'>-						     "clk-m-bdisp-0",</div><div class='del'>-						     "clk-m-bdisp-1",</div><div class='del'>-						     "clk-m-icn-bdisp",</div><div class='del'>-						     "clk-m-icn-compo";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_div2: clk-m-a2-div2 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf2",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a2_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll0 2&gt;, /* PLL0 PHI2 */</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll1 2&gt;; /* PLL1 PHI2 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "clk-m-icn-vdp-2",</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-icn-reg-14",</div><div class='del'>-						     "clk-m-mdtp",</div><div class='del'>-						     "clk-m-jpegdec",</div><div class='del'>-						     "", /* Unused */</div><div class='del'>-						     "clk-m-dcephy-impctrl",</div><div class='del'>-						     ""; /* Unused */</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clk_m_a2_div3: clk-m-a2-div3 {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,clkgena-divmux-c32-odf3",</div><div class='del'>-					     "st,clkgena-divmux";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_m_a2_osc_prediv&gt;,</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll0 3&gt;, /* PLL0 PHI3 */</div><div class='del'>-					 &lt;&amp;clk_m_a2_pll1 3&gt;; /* PLL1 PHI3 */</div><div class='del'>-</div><div class='del'>-				clock-output-names = "", /* Unused */</div><div class='del'>-						     ""; /* clk-m-apb-pm-11 */</div><div class='del'>-						     /* Remaining outputs unused */</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * A9 PLL</div><div class='del'>-		 */</div><div class='del'>-		clockgen-a9@fdde08b0 {</div><div class='del'>-			reg = &lt;0xfdde08b0 0x70&gt;;</div><div class='del'>-</div><div class='del'>-			clockgen_a9_pll: clockgen-a9-pll {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,stih416-plls-c32-a9", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-				clock-output-names = "clockgen-a9-pll-odf";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ARM CPU related clocks</div><div class='del'>-		 */</div><div class='del'>-		clk_m_a9: clk-m-a9@fdde08ac {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "st,stih416-clkgen-a9-mux", "st,clkgen-mux";</div><div class='del'>-			reg = &lt;0xfdde08ac 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;clockgen_a9_pll 0&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_a9_pll 0&gt;,</div><div class='del'>-				 &lt;&amp;clk_m_a0_div1 2&gt;,</div><div class='del'>-				 &lt;&amp;clk_m_a9_ext2f_div2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ARM Peripheral clock for timers</div><div class='del'>-		 */</div><div class='del'>-		arm_periph_clk: clk-m-a9-periphs {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-factor-clock";</div><div class='del'>-			clocks = &lt;&amp;clk_m_a9&gt;;</div><div class='del'>-			clock-div = &lt;2&gt;;</div><div class='del'>-			clock-mult = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Frequency synthesizers on the SASG2</div><div class='del'>-		 */</div><div class='del'>-		clockgen_b0: clockgen-b0@fee108b4 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih416-quadfs216", "st,quadfs";</div><div class='del'>-			reg = &lt;0xfee108b4 0x44&gt;;</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			clock-output-names = "clk-s-usb48",</div><div class='del'>-					     "clk-s-dss",</div><div class='del'>-					     "clk-s-stfe-frc-2",</div><div class='del'>-					     "clk-s-thsens-scard";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen_b1: clockgen-b1@fe8308c4 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih416-quadfs216", "st,quadfs";</div><div class='del'>-			reg = &lt;0xfe8308c4 0x44&gt;;</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			clock-output-names = "clk-s-pcm-0",</div><div class='del'>-					     "clk-s-pcm-1",</div><div class='del'>-					     "clk-s-pcm-2",</div><div class='del'>-					     "clk-s-pcm-3";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen_c: clockgen-c@fe8307d0 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih416-quadfs432", "st,quadfs";</div><div class='del'>-			reg = &lt;0xfe8307d0 0x44&gt;;</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			clock-output-names = "clk-s-c-fs0-ch0",</div><div class='del'>-					     "clk-s-c-vcc-sd",</div><div class='del'>-					     "clk-s-c-fs0-ch2";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clk_s_vcc_hd: clk-s-vcc-hd@fe8308b8 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "st,stih416-clkgenc-vcc-hd", "st,clkgen-mux";</div><div class='del'>-			reg = &lt;0xfe8308b8 0x4&gt;; /* SYSCFG2558 */</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clk_sysin&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_c 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Add a dummy clock for the HDMI PHY for the VCC input mux</div><div class='del'>-		 */</div><div class='del'>-		clk_s_tmds_fromphy: clk-s-tmds-fromphy {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-clock";</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen_c_vcc: clockgen-c-vcc@fe8308ac {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih416-clkgenc", "st,clkgen-vcc";</div><div class='del'>-			reg = &lt;0xfe8308ac 0xc&gt;; /* SYSCFG2555,2556,2557 */</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clk_s_vcc_hd&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_c 1&gt;,</div><div class='del'>-				 &lt;&amp;clk_s_tmds_fromphy&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_c 2&gt;;</div><div class='del'>-</div><div class='del'>-			clock-output-names  = "clk-s-pix-hdmi",</div><div class='del'>-					      "clk-s-pix-dvo",</div><div class='del'>-					      "clk-s-out-dvo",</div><div class='del'>-					      "clk-s-pix-hd",</div><div class='del'>-					      "clk-s-hddac",</div><div class='del'>-					      "clk-s-denc",</div><div class='del'>-					      "clk-s-sddac",</div><div class='del'>-					      "clk-s-pix-main",</div><div class='del'>-					      "clk-s-pix-aux",</div><div class='del'>-					      "clk-s-stfe-frc-0",</div><div class='del'>-					      "clk-s-ref-mcru",</div><div class='del'>-					      "clk-s-slave-mcru",</div><div class='del'>-					      "clk-s-tmds-hdmi",</div><div class='del'>-					      "clk-s-hdmi-reject-pll",</div><div class='del'>-					      "clk-s-thsens";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen_d: clockgen-d@fee107e0 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih416-quadfs216", "st,quadfs";</div><div class='del'>-			reg = &lt;0xfee107e0 0x44&gt;;</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			clock-output-names = "clk-s-ccsc",</div><div class='del'>-					     "clk-s-stfe-frc-1",</div><div class='del'>-					     "clk-s-tsout-1",</div><div class='del'>-					     "clk-s-mchi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Frequency synthesizers on the MPE42</div><div class='del'>-		 */</div><div class='del'>-		clockgen_e: clockgen-e@fd3208bc {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih416-quadfs660-E", "st,quadfs";</div><div class='del'>-			reg = &lt;0xfd3208bc 0xb0&gt;;</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			clock-output-names = "clk-m-pix-mdtp-0",</div><div class='del'>-					     "clk-m-pix-mdtp-1",</div><div class='del'>-					     "clk-m-pix-mdtp-2",</div><div class='del'>-					     "clk-m-mpelpc";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen_f: clockgen-f@fd320878 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih416-quadfs660-F", "st,quadfs";</div><div class='del'>-			reg = &lt;0xfd320878 0xf0&gt;;</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			clock-output-names = "clk-m-main-vidfs",</div><div class='del'>-					     "clk-m-hva-fs",</div><div class='del'>-					     "clk-m-fvdp-vcpu",</div><div class='del'>-					     "clk-m-fvdp-proc-fs";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clk_m_fvdp_proc: clk-m-fvdp-proc@fd320910 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "st,stih416-clkgenf-vcc-fvdp", "st,clkgen-mux";</div><div class='del'>-			reg = &lt;0xfd320910 0x4&gt;; /* SYSCFG8580 */</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clk_m_a1_div2 0&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_f 3&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clk_m_hva: clk-m-hva@fd690868 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "st,stih416-clkgenf-vcc-hva", "st,clkgen-mux";</div><div class='del'>-			reg = &lt;0xfd690868 0x4&gt;; /* SYSCFG9538 */</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clockgen_f 1&gt;,</div><div class='del'>-				 &lt;&amp;clk_m_a1_div0 3&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clk_m_f_vcc_hd: clk-m-f-vcc-hd@fd32086c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "st,stih416-clkgenf-vcc-hd", "st,clkgen-mux";</div><div class='del'>-			reg = &lt;0xfd32086c 0x4&gt;; /* SYSCFG8539 */</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clockgen_c_vcc 7&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_f 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clk_m_f_vcc_sd: clk-m-f-vcc-sd@fd32086c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "st,stih416-clkgenf-vcc-sd", "st,clkgen-mux";</div><div class='del'>-			reg = &lt;0xfd32086c 0x4&gt;; /* SYSCFG8539 */</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clockgen_c_vcc 8&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_f 1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Add a dummy clock for the HDMIRx external signal clock</div><div class='del'>-		 */</div><div class='del'>-		clk_m_pix_hdmirx_sas: clk-m-pix-hdmirx-sas {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-clock";</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen_f_vcc: clockgen-f-vcc@fd32086c {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih416-clkgenf", "st,clkgen-vcc";</div><div class='del'>-			reg = &lt;0xfd32086c 0xc&gt;; /* SYSCFG8539,8540,8541 */</div><div class='del'>-</div><div class='del'>-			clocks = &lt;&amp;clk_m_f_vcc_hd&gt;,</div><div class='del'>-				 &lt;&amp;clk_m_f_vcc_sd&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_f 0&gt;,</div><div class='del'>-				 &lt;&amp;clk_m_pix_hdmirx_sas&gt;;</div><div class='del'>-</div><div class='del'>-			clock-output-names  = "clk-m-pix-main-pipe",</div><div class='del'>-					      "clk-m-pix-aux-pipe",</div><div class='del'>-					      "clk-m-pix-main-cru",</div><div class='del'>-					      "clk-m-pix-aux-cru",</div><div class='del'>-					      "clk-m-xfer-be-compo",</div><div class='del'>-					      "clk-m-xfer-pip-compo",</div><div class='del'>-					      "clk-m-xfer-aux-compo",</div><div class='del'>-					      "clk-m-vsens",</div><div class='del'>-					      "clk-m-pix-hdmirx-0",</div><div class='del'>-					      "clk-m-pix-hdmirx-1";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * DDR PLL</div><div class='del'>-		 */</div><div class='del'>-		clockgen-ddr@0xfdde07d8 {</div><div class='del'>-			reg = &lt;0xfdde07d8 0x110&gt;;</div><div class='del'>-</div><div class='del'>-			clockgen_ddr_pll: clockgen-ddr-pll {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,stih416-plls-c32-ddr", "st,clkgen-plls-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-				clock-output-names = "clockgen-ddr0",</div><div class='del'>-						     "clockgen-ddr1";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * GPU PLL</div><div class='del'>-		 */</div><div class='del'>-		clockgen-gpu@fd68ff00 {</div><div class='del'>-			reg = &lt;0xfd68ff00 0x910&gt;;</div><div class='del'>-</div><div class='del'>-			clockgen_gpu_pll: clockgen-gpu-pll {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "st,stih416-gpu-pll-c32", "st,clkgengpu-pll-c32";</div><div class='del'>-</div><div class='del'>-				clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-				clock-output-names = "clockgen-gpu-pll";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi<br/>deleted file mode 100644<br/>index 9c97f7e651a0..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih416-pinctrl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih416-pinctrl.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,692 +0,0 @@</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics Limited.</div><div class='del'>- * Author: Srinivas Kandagatla &lt;srinivas.kandagatla@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include "st-pincfg.h"</div><div class='del'>-#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='del'>-/ {</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		gpio0	= &amp;pio0;</div><div class='del'>-		gpio1	= &amp;pio1;</div><div class='del'>-		gpio2	= &amp;pio2;</div><div class='del'>-		gpio3	= &amp;pio3;</div><div class='del'>-		gpio4	= &amp;pio4;</div><div class='del'>-		gpio5	= &amp;pio40;</div><div class='del'>-		gpio6	= &amp;pio5;</div><div class='del'>-		gpio7	= &amp;pio6;</div><div class='del'>-		gpio8	= &amp;pio7;</div><div class='del'>-		gpio9	= &amp;pio8;</div><div class='del'>-		gpio10	= &amp;pio9;</div><div class='del'>-		gpio11	= &amp;pio10;</div><div class='del'>-		gpio12	= &amp;pio11;</div><div class='del'>-		gpio13	= &amp;pio12;</div><div class='del'>-		gpio14	= &amp;pio30;</div><div class='del'>-		gpio15	= &amp;pio31;</div><div class='del'>-		gpio16	= &amp;pio13;</div><div class='del'>-		gpio17	= &amp;pio14;</div><div class='del'>-		gpio18	= &amp;pio15;</div><div class='del'>-		gpio19	= &amp;pio16;</div><div class='del'>-		gpio20	= &amp;pio17;</div><div class='del'>-		gpio21	= &amp;pio18;</div><div class='del'>-		gpio22	= &amp;pio100;</div><div class='del'>-		gpio23	= &amp;pio101;</div><div class='del'>-		gpio24	= &amp;pio102;</div><div class='del'>-		gpio25	= &amp;pio103;</div><div class='del'>-		gpio26	= &amp;pio104;</div><div class='del'>-		gpio27	= &amp;pio105;</div><div class='del'>-		gpio28	= &amp;pio106;</div><div class='del'>-		gpio29	= &amp;pio107;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc {</div><div class='del'>-		pin-controller-sbc {</div><div class='del'>-			#address-cells	= &lt;1&gt;;</div><div class='del'>-			#size-cells	= &lt;1&gt;;</div><div class='del'>-			compatible	= "st,stih416-sbc-pinctrl";</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_sbc&gt;;</div><div class='del'>-			reg 		= &lt;0xfe61f080 0x4&gt;;</div><div class='del'>-			reg-names	= "irqmux";</div><div class='del'>-			interrupts 	= &lt;GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names	= "irqmux";</div><div class='del'>-			ranges		= &lt;0 0xfe610000 0x6000&gt;;</div><div class='del'>-</div><div class='del'>-			pio0: gpio@fe610000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO0";</div><div class='del'>-			};</div><div class='del'>-			pio1: gpio@fe611000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x1000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO1";</div><div class='del'>-			};</div><div class='del'>-			pio2: gpio@fe612000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x2000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO2";</div><div class='del'>-			};</div><div class='del'>-			pio3: gpio@fe613000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x3000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO3";</div><div class='del'>-			};</div><div class='del'>-			pio4: gpio@fe614000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x4000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO4";</div><div class='del'>-			};</div><div class='del'>-			pio40: gpio@fe615000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x5000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO40";</div><div class='del'>-				st,retime-pin-mask = &lt;0x7f&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			rc{</div><div class='del'>-				pinctrl_ir: ir0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						ir = &lt;&amp;pio4 0 ALT2 IN&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-			sbc_serial1 {</div><div class='del'>-				pinctrl_sbc_serial1: sbc_serial1 {</div><div class='del'>-					st,pins {</div><div class='del'>-						tx	= &lt;&amp;pio2 6 ALT3 OUT&gt;;</div><div class='del'>-						rx	= &lt;&amp;pio2 7 ALT3 IN&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			keyscan {</div><div class='del'>-				pinctrl_keyscan: keyscan {</div><div class='del'>-					st,pins {</div><div class='del'>-						keyin0 = &lt;&amp;pio0 2 ALT2 IN&gt;;</div><div class='del'>-						keyin1 = &lt;&amp;pio0 3 ALT2 IN&gt;;</div><div class='del'>-						keyin2 = &lt;&amp;pio0 4 ALT2 IN&gt;;</div><div class='del'>-						keyin3 = &lt;&amp;pio2 6 ALT2 IN&gt;;</div><div class='del'>-</div><div class='del'>-						keyout0 = &lt;&amp;pio1 6 ALT2 OUT&gt;;</div><div class='del'>-						keyout1 = &lt;&amp;pio1 7 ALT2 OUT&gt;;</div><div class='del'>-						keyout2 = &lt;&amp;pio0 6 ALT2 OUT&gt;;</div><div class='del'>-						keyout3 = &lt;&amp;pio2 7 ALT2 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sbc_i2c0 {</div><div class='del'>-				pinctrl_sbc_i2c0_default: sbc_i2c0-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						sda = &lt;&amp;pio4 6 ALT1 BIDIR&gt;;</div><div class='del'>-						scl = &lt;&amp;pio4 5 ALT1 BIDIR&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			usb {</div><div class='del'>-				pinctrl_usb3: usb3 {</div><div class='del'>-					st,pins {</div><div class='del'>-						oc-detect = &lt;&amp;pio40 0 ALT1 IN&gt;;</div><div class='del'>-						pwr-enable = &lt;&amp;pio40 1 ALT1 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sbc_i2c1 {</div><div class='del'>-				pinctrl_sbc_i2c1_default: sbc_i2c1-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						sda = &lt;&amp;pio3 2 ALT2 BIDIR&gt;;</div><div class='del'>-						scl = &lt;&amp;pio3 1 ALT2 BIDIR&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			gmac1 {</div><div class='del'>-				pinctrl_mii1: mii1 {</div><div class='del'>-					st,pins {</div><div class='del'>-						txd0 = &lt;&amp;pio0 0 ALT1 OUT SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						txd1 = &lt;&amp;pio0 1 ALT1 OUT SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						txd2 = &lt;&amp;pio0 2 ALT1 OUT SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						txd3 = &lt;&amp;pio0 3 ALT1 OUT SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						txer = &lt;&amp;pio0 4 ALT1 OUT SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						txen = &lt;&amp;pio0 5 ALT1 OUT SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						txclk = &lt;&amp;pio0 6 ALT1 IN NICLK 0 CLK_A&gt;;</div><div class='del'>-						col =   &lt;&amp;pio0 7 ALT1 IN BYPASS 1000&gt;;</div><div class='del'>-</div><div class='del'>-						mdio =  &lt;&amp;pio1 0 ALT1 OUT BYPASS 1500&gt;;</div><div class='del'>-						mdc =   &lt;&amp;pio1 1 ALT1 OUT NICLK 0 CLK_A&gt;;</div><div class='del'>-						crs =   &lt;&amp;pio1 2 ALT1 IN BYPASS 1000&gt;;</div><div class='del'>-						mdint = &lt;&amp;pio1 3 ALT1 IN BYPASS 0&gt;;</div><div class='del'>-						rxd0 =  &lt;&amp;pio1 4 ALT1 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						rxd1 =  &lt;&amp;pio1 5 ALT1 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						rxd2 =  &lt;&amp;pio1 6 ALT1 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						rxd3 =  &lt;&amp;pio1 7 ALT1 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-</div><div class='del'>-						rxdv =  &lt;&amp;pio2 0 ALT1 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						rx_er = &lt;&amp;pio2 1 ALT1 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						rxclk = &lt;&amp;pio2 2 ALT1 IN NICLK 0 CLK_A&gt;;</div><div class='del'>-						phyclk = &lt;&amp;pio2 3 ALT1 OUT NICLK 0 CLK_A&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-				pinctrl_rgmii1: rgmii1-0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						txd0 =  &lt;&amp;pio0 0 ALT1 OUT DE_IO 500 CLK_A&gt;;</div><div class='del'>-						txd1 =  &lt;&amp;pio0 1 ALT1 OUT DE_IO 500 CLK_A&gt;;</div><div class='del'>-						txd2 =  &lt;&amp;pio0 2 ALT1 OUT DE_IO 500 CLK_A&gt;;</div><div class='del'>-						txd3 =  &lt;&amp;pio0 3 ALT1 OUT DE_IO 500 CLK_A&gt;;</div><div class='del'>-						txen =  &lt;&amp;pio0 5 ALT1 OUT DE_IO 0   CLK_A&gt;;</div><div class='del'>-						txclk = &lt;&amp;pio0 6 ALT1 IN  NICLK 0   CLK_A&gt;;</div><div class='del'>-</div><div class='del'>-						mdio = &lt;&amp;pio1 0 ALT1 OUT BYPASS 0&gt;;</div><div class='del'>-						mdc  = &lt;&amp;pio1 1 ALT1 OUT NICLK  0 CLK_A&gt;;</div><div class='del'>-						rxd0 = &lt;&amp;pio1 4 ALT1 IN DE_IO 500 CLK_A&gt;;</div><div class='del'>-						rxd1 = &lt;&amp;pio1 5 ALT1 IN DE_IO 500 CLK_A&gt;;</div><div class='del'>-						rxd2 = &lt;&amp;pio1 6 ALT1 IN DE_IO 500 CLK_A&gt;;</div><div class='del'>-						rxd3 = &lt;&amp;pio1 7 ALT1 IN DE_IO 500 CLK_A&gt;;</div><div class='del'>-</div><div class='del'>-						rxdv   = &lt;&amp;pio2 0 ALT1 IN  DE_IO 500 CLK_A&gt;;</div><div class='del'>-						rxclk  = &lt;&amp;pio2 2 ALT1 IN  NICLK 0   CLK_A&gt;;</div><div class='del'>-						phyclk = &lt;&amp;pio2 3 ALT4 OUT NICLK 0   CLK_B&gt;;</div><div class='del'>-</div><div class='del'>-						clk125= &lt;&amp;pio3 7 ALT4 IN NICLK 0 CLK_A&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pwm1 {</div><div class='del'>-				pinctrl_pwm1_chan0_default: pwm1-0-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						pwm-out    = &lt;&amp;pio3 0 ALT1 OUT&gt;;</div><div class='del'>-						pwm-capturein = &lt;&amp;pio3 2 ALT1 IN&gt;;</div><div class='del'>-</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-				pinctrl_pwm1_chan1_default: pwm1-1-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						pwm-out    = &lt;&amp;pio4 4 ALT1 OUT&gt;;</div><div class='del'>-						pwm-capturein = &lt;&amp;pio4 3 ALT1 IN&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-				pinctrl_pwm1_chan2_default: pwm1-2-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						pwm-out    = &lt;&amp;pio4 6 ALT3 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-				pinctrl_pwm1_chan3_default: pwm1-3-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						pwm-out    = &lt;&amp;pio4 7 ALT3 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pin-controller-front {</div><div class='del'>-			#address-cells	= &lt;1&gt;;</div><div class='del'>-			#size-cells	= &lt;1&gt;;</div><div class='del'>-			compatible	= "st,stih416-front-pinctrl";</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_front&gt;;</div><div class='del'>-			reg 		= &lt;0xfee0f080 0x4&gt;;</div><div class='del'>-			reg-names	= "irqmux";</div><div class='del'>-			interrupts 	= &lt;GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names	= "irqmux";</div><div class='del'>-			ranges		= &lt;0 0xfee00000 0x10000&gt;;</div><div class='del'>-</div><div class='del'>-			pio5: gpio@fee00000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO5";</div><div class='del'>-			};</div><div class='del'>-			pio6: gpio@fee01000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x1000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO6";</div><div class='del'>-			};</div><div class='del'>-			pio7: gpio@fee02000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x2000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO7";</div><div class='del'>-			};</div><div class='del'>-			pio8: gpio@fee03000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x3000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO8";</div><div class='del'>-			};</div><div class='del'>-			pio9: gpio@fee04000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x4000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO9";</div><div class='del'>-			};</div><div class='del'>-			pio10: gpio@fee05000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x5000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO10";</div><div class='del'>-			};</div><div class='del'>-			pio11: gpio@fee06000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x6000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO11";</div><div class='del'>-			};</div><div class='del'>-			pio12: gpio@fee07000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x7000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO12";</div><div class='del'>-			};</div><div class='del'>-			pio30: gpio@fee08000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x8000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO30";</div><div class='del'>-			};</div><div class='del'>-			pio31: gpio@fee09000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x9000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO31";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pwm0 {</div><div class='del'>-				pinctrl_pwm0_chan0_default: pwm0-0-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						pwm-out    = &lt;&amp;pio9 7 ALT2 OUT&gt;;</div><div class='del'>-						pwm-capturein = &lt;&amp;pio9 6 ALT2 IN&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			serial2-oe {</div><div class='del'>-				pinctrl_serial2_oe: serial2-1 {</div><div class='del'>-					st,pins {</div><div class='del'>-						output-enable	= &lt;&amp;pio11 3 ALT2 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c0 {</div><div class='del'>-				pinctrl_i2c0_default: i2c0-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						sda = &lt;&amp;pio9 3 ALT1 BIDIR&gt;;</div><div class='del'>-						scl = &lt;&amp;pio9 2 ALT1 BIDIR&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			usb {</div><div class='del'>-				pinctrl_usb0: usb0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						oc-detect = &lt;&amp;pio9 4 ALT1 IN&gt;;</div><div class='del'>-						pwr-enable = &lt;&amp;pio9 5 ALT1 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-			i2c1 {</div><div class='del'>-				pinctrl_i2c1_default: i2c1-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						sda = &lt;&amp;pio12 1 ALT1 BIDIR&gt;;</div><div class='del'>-						scl = &lt;&amp;pio12 0 ALT1 BIDIR&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			fsm {</div><div class='del'>-				pinctrl_fsm: fsm {</div><div class='del'>-					st,pins {</div><div class='del'>-						spi-fsm-clk  = &lt;&amp;pio12 2 ALT1 OUT&gt;;</div><div class='del'>-						spi-fsm-cs   = &lt;&amp;pio12 3 ALT1 OUT&gt;;</div><div class='del'>-						spi-fsm-mosi = &lt;&amp;pio12 4 ALT1 OUT&gt;;</div><div class='del'>-						spi-fsm-miso = &lt;&amp;pio12 5 ALT1 IN&gt;;</div><div class='del'>-						spi-fsm-hol  = &lt;&amp;pio12 6 ALT1 OUT&gt;;</div><div class='del'>-						spi-fsm-wp   = &lt;&amp;pio12 7 ALT1 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pin-controller-rear {</div><div class='del'>-			#address-cells	= &lt;1&gt;;</div><div class='del'>-			#size-cells	= &lt;1&gt;;</div><div class='del'>-			compatible	= "st,stih416-rear-pinctrl";</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_rear&gt;;</div><div class='del'>-			reg 		= &lt;0xfe82f080 0x4&gt;;</div><div class='del'>-			reg-names	= "irqmux";</div><div class='del'>-			interrupts 	= &lt;GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names	= "irqmux";</div><div class='del'>-			ranges 		= &lt;0 0xfe820000 0x6000&gt;;</div><div class='del'>-</div><div class='del'>-			pio13: gpio@fe820000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO13";</div><div class='del'>-			};</div><div class='del'>-			pio14: gpio@fe821000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x1000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO14";</div><div class='del'>-			};</div><div class='del'>-			pio15: gpio@fe822000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x2000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO15";</div><div class='del'>-			};</div><div class='del'>-			pio16: gpio@fe823000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x3000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO16";</div><div class='del'>-			};</div><div class='del'>-			pio17: gpio@fe824000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x4000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO17";</div><div class='del'>-			};</div><div class='del'>-			pio18: gpio@fe825000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x5000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO18";</div><div class='del'>-				st,retime-pin-mask = &lt;0xf&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			serial2 {</div><div class='del'>-				pinctrl_serial2: serial2-0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						tx	= &lt;&amp;pio17 4 ALT2 OUT&gt;;</div><div class='del'>-						rx	= &lt;&amp;pio17 5 ALT2 IN&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			gmac0 {</div><div class='del'>-				pinctrl_mii0: mii0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						mdint = &lt;&amp;pio13 6 ALT2 IN  BYPASS      0&gt;;</div><div class='del'>-						txen =  &lt;&amp;pio13 7 ALT2 OUT SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						txd0 =  &lt;&amp;pio14 0 ALT2 OUT SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						txd1 =  &lt;&amp;pio14 1 ALT2 OUT SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						txd2 =  &lt;&amp;pio14 2 ALT2 OUT SE_NICLK_IO 0 CLK_B&gt;;</div><div class='del'>-						txd3 =  &lt;&amp;pio14 3 ALT2 OUT SE_NICLK_IO 0 CLK_B&gt;;</div><div class='del'>-</div><div class='del'>-						txclk = &lt;&amp;pio15 0 ALT2 IN  NICLK       0 CLK_A&gt;;</div><div class='del'>-						txer =  &lt;&amp;pio15 1 ALT2 OUT SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						crs = &lt;&amp;pio15 2 ALT2 IN  BYPASS 1000&gt;;</div><div class='del'>-						col = &lt;&amp;pio15 3 ALT2 IN  BYPASS 1000&gt;;</div><div class='del'>-						mdio= &lt;&amp;pio15 4 ALT2 OUT BYPASS 1500&gt;;</div><div class='del'>-						mdc = &lt;&amp;pio15 5 ALT2 OUT NICLK  0    CLK_B&gt;;</div><div class='del'>-</div><div class='del'>-						rxd0 =  &lt;&amp;pio16 0 ALT2 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						rxd1 =  &lt;&amp;pio16 1 ALT2 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						rxd2 =  &lt;&amp;pio16 2 ALT2 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						rxd3 =  &lt;&amp;pio16 3 ALT2 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						rxdv =  &lt;&amp;pio15 6 ALT2 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						rx_er = &lt;&amp;pio15 7 ALT2 IN SE_NICLK_IO 0 CLK_A&gt;;</div><div class='del'>-						rxclk = &lt;&amp;pio17 0 ALT2 IN NICLK 0 CLK_A&gt;;</div><div class='del'>-						phyclk = &lt;&amp;pio13 5 ALT2 OUT NICLK 0 CLK_B&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pinctrl_gmii0: gmii0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						};</div><div class='del'>-				};</div><div class='del'>-				pinctrl_rgmii0: rgmii0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						 phyclk = &lt;&amp;pio13  5 ALT4 OUT NICLK 0 CLK_B&gt;;</div><div class='del'>-						 txen = &lt;&amp;pio13 7 ALT2 OUT DE_IO 0 CLK_A&gt;;</div><div class='del'>-						 txd0  = &lt;&amp;pio14 0 ALT2 OUT DE_IO 500 CLK_A&gt;;</div><div class='del'>-						 txd1  = &lt;&amp;pio14 1 ALT2 OUT DE_IO 500 CLK_A&gt;;</div><div class='del'>-						 txd2  = &lt;&amp;pio14 2 ALT2 OUT DE_IO 500 CLK_B&gt;;</div><div class='del'>-						 txd3  = &lt;&amp;pio14 3 ALT2 OUT DE_IO 500 CLK_B&gt;;</div><div class='del'>-						 txclk = &lt;&amp;pio15 0 ALT2 IN NICLK 0 CLK_A&gt;;</div><div class='del'>-</div><div class='del'>-						 mdio = &lt;&amp;pio15 4 ALT2 OUT BYPASS 0&gt;;</div><div class='del'>-						 mdc = &lt;&amp;pio15 5 ALT2 OUT NICLK 0 CLK_B&gt;;</div><div class='del'>-</div><div class='del'>-						 rxdv = &lt;&amp;pio15 6 ALT2 IN DE_IO 500 CLK_A&gt;;</div><div class='del'>-						 rxd0 =&lt;&amp;pio16 0 ALT2 IN DE_IO	500 CLK_A&gt;;</div><div class='del'>-						 rxd1 =&lt;&amp;pio16 1 ALT2 IN DE_IO	500 CLK_A&gt;;</div><div class='del'>-						 rxd2 =&lt;&amp;pio16 2 ALT2 IN DE_IO	500 CLK_A&gt;;</div><div class='del'>-						 rxd3  =&lt;&amp;pio16 3 ALT2 IN DE_IO 500 CLK_A&gt;;</div><div class='del'>-						 rxclk =&lt;&amp;pio17 0 ALT2 IN NICLK 0 CLK_A&gt;;</div><div class='del'>-</div><div class='del'>-						 clk125=&lt;&amp;pio17 6 ALT1 IN NICLK 0 CLK_A&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			mmc0 {</div><div class='del'>-				pinctrl_mmc0: mmc0 {</div><div class='del'>-					st,pins {</div><div class='del'>-						mmcclk  = &lt;&amp;pio13 4 ALT4 BIDIR_PU NICLK 0 CLK_B&gt;;</div><div class='del'>-						data0   = &lt;&amp;pio14 4 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data1   = &lt;&amp;pio14 5 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data2   = &lt;&amp;pio14 6 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data3   = &lt;&amp;pio14 7 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						cmd     = &lt;&amp;pio15 1 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						wp      = &lt;&amp;pio15 3 ALT4 IN&gt;;</div><div class='del'>-						data4   = &lt;&amp;pio16 4 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data5   = &lt;&amp;pio16 5 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data6   = &lt;&amp;pio16 6 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data7   = &lt;&amp;pio16 7 ALT4 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						pwr     = &lt;&amp;pio17 1 ALT4 OUT&gt;;</div><div class='del'>-						cd      = &lt;&amp;pio17 2 ALT4 IN&gt;;</div><div class='del'>-						led     = &lt;&amp;pio17 3 ALT4 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-			mmc1 {</div><div class='del'>-				pinctrl_mmc1: mmc1 {</div><div class='del'>-					st,pins {</div><div class='del'>-						mmcclk  = &lt;&amp;pio15 0 ALT3 BIDIR_PU NICLK 0 CLK_B&gt;;</div><div class='del'>-						data0   = &lt;&amp;pio13 7 ALT3 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data1   = &lt;&amp;pio14 1 ALT3 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data2   = &lt;&amp;pio14 2 ALT3 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data3   = &lt;&amp;pio14 3 ALT3 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						cmd     = &lt;&amp;pio15 4 ALT3 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data4   = &lt;&amp;pio15 6 ALT3 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data5   = &lt;&amp;pio15 7 ALT3 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data6   = &lt;&amp;pio16 0 ALT3 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						data7   = &lt;&amp;pio16 1 ALT3 BIDIR_PU BYPASS 0&gt;;</div><div class='del'>-						pwr     = &lt;&amp;pio16 2 ALT3 OUT&gt;;</div><div class='del'>-						nreset  = &lt;&amp;pio13 6 ALT3 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			usb {</div><div class='del'>-				pinctrl_usb1: usb1 {</div><div class='del'>-					st,pins {</div><div class='del'>-						oc-detect = &lt;&amp;pio18 0 ALT1 IN&gt;;</div><div class='del'>-						pwr-enable = &lt;&amp;pio18 1 ALT1 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-				pinctrl_usb2: usb2 {</div><div class='del'>-					st,pins {</div><div class='del'>-						oc-detect = &lt;&amp;pio18 2 ALT1 IN&gt;;</div><div class='del'>-						pwr-enable = &lt;&amp;pio18 3 ALT1 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pwm0 {</div><div class='del'>-				pinctrl_pwm0_chan1_default: pwm0-1-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						pwm-out    = &lt;&amp;pio13 2 ALT2 OUT&gt;;</div><div class='del'>-						pwm-capturein = &lt;&amp;pio13 1 ALT2 IN&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-				pinctrl_pwm0_chan2_default: pwm0-2-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						pwm-out    = &lt;&amp;pio15 2 ALT4 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-				pinctrl_pwm0_chan3_default: pwm0-3-default {</div><div class='del'>-					st,pins {</div><div class='del'>-						pwm-out    = &lt;&amp;pio17 4 ALT1 OUT&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pin-controller-fvdp-fe {</div><div class='del'>-			#address-cells	= &lt;1&gt;;</div><div class='del'>-			#size-cells	= &lt;1&gt;;</div><div class='del'>-			compatible	= "st,stih416-fvdp-fe-pinctrl";</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_fvdp_fe&gt;;</div><div class='del'>-			reg 		= &lt;0xfd6bf080 0x4&gt;;</div><div class='del'>-			reg-names	= "irqmux";</div><div class='del'>-			interrupts 	= &lt;GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names	= "irqmux";</div><div class='del'>-			ranges		= &lt;0 0xfd6b0000 0x3000&gt;;</div><div class='del'>-</div><div class='del'>-			pio100: gpio@fd6b0000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO100";</div><div class='del'>-			};</div><div class='del'>-			pio101: gpio@fd6b1000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x1000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO101";</div><div class='del'>-			};</div><div class='del'>-			pio102: gpio@fd6b2000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x2000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO102";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pin-controller-fvdp-lite {</div><div class='del'>-			#address-cells	= &lt;1&gt;;</div><div class='del'>-			#size-cells	= &lt;1&gt;;</div><div class='del'>-			compatible	= "st,stih416-fvdp-lite-pinctrl";</div><div class='del'>-			st,syscfg		= &lt;&amp;syscfg_fvdp_lite&gt;;</div><div class='del'>-			reg 		= &lt;0xfd33f080 0x4&gt;;</div><div class='del'>-			reg-names	= "irqmux";</div><div class='del'>-			interrupts 	= &lt;GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names	= "irqmux";</div><div class='del'>-			ranges			= &lt;0 0xfd330000 0x5000&gt;;</div><div class='del'>-</div><div class='del'>-			pio103: gpio@fd330000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO103";</div><div class='del'>-			};</div><div class='del'>-			pio104: gpio@fd331000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x1000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO104";</div><div class='del'>-			};</div><div class='del'>-			pio105: gpio@fd332000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x2000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO105";</div><div class='del'>-			};</div><div class='del'>-			pio106: gpio@fd333000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x3000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO106";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pio107: gpio@fd334000 {</div><div class='del'>-				gpio-controller;</div><div class='del'>-				#gpio-cells	= &lt;2&gt;;</div><div class='del'>-				interrupt-controller;</div><div class='del'>-				#interrupt-cells = &lt;2&gt;;</div><div class='del'>-				reg		= &lt;0x4000 0x100&gt;;</div><div class='del'>-				st,bank-name	= "PIO107";</div><div class='del'>-				st,retime-pin-mask = &lt;0xf&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi<br/>deleted file mode 100644<br/>index fe1f9cf770e4..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih416.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih416.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,517 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2012 STMicroelectronics Limited.</div><div class='del'>- * Author: Srinivas Kandagatla &lt;srinivas.kandagatla@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include "stih41x.dtsi"</div><div class='del'>-#include "stih416-clock.dtsi"</div><div class='del'>-#include "stih416-pinctrl.dtsi"</div><div class='del'>-</div><div class='del'>-#include &lt;dt-bindings/phy/phy.h&gt;</div><div class='del'>-#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='del'>-#include &lt;dt-bindings/reset/stih416-resets.h&gt;</div><div class='del'>-#include &lt;dt-bindings/interrupt-controller/irq-st.h&gt;</div><div class='del'>-/ {</div><div class='del'>-	L2: cache-controller {</div><div class='del'>-		compatible = "arm,pl310-cache";</div><div class='del'>-		reg = &lt;0xfffe2000 0x1000&gt;;</div><div class='del'>-		arm,data-latency = &lt;3 3 3&gt;;</div><div class='del'>-		arm,tag-latency = &lt;2 2 2&gt;;</div><div class='del'>-		cache-unified;</div><div class='del'>-		cache-level = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	arm-pmu {</div><div class='del'>-		compatible = "arm,cortex-a9-pmu";</div><div class='del'>-		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='del'>-		interrupts = &lt;GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='del'>-		ranges;</div><div class='del'>-		compatible	= "simple-bus";</div><div class='del'>-</div><div class='del'>-		restart {</div><div class='del'>-			compatible = "st,stih416-restart";</div><div class='del'>-			st,syscfg = &lt;&amp;syscfg_sbc&gt;;</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		powerdown: powerdown-controller {</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih416-powerdown";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		softreset: softreset-controller {</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "st,stih416-softreset";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_sbc:sbc-syscfg@fe600000{</div><div class='del'>-			compatible	= "st,stih416-sbc-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfe600000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_front:front-syscfg@fee10000{</div><div class='del'>-			compatible	= "st,stih416-front-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfee10000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_rear:rear-syscfg@fe830000{</div><div class='del'>-			compatible	= "st,stih416-rear-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfe830000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* MPE */</div><div class='del'>-		syscfg_fvdp_fe:fvdp-fe-syscfg@fddf0000{</div><div class='del'>-			compatible	= "st,stih416-fvdp-fe-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfddf0000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_fvdp_lite:fvdp-lite-syscfg@fd6a0000{</div><div class='del'>-			compatible	= "st,stih416-fvdp-lite-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfd6a0000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_cpu:cpu-syscfg@fdde0000{</div><div class='del'>-			compatible	= "st,stih416-cpu-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfdde0000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_compo:compo-syscfg@fd320000{</div><div class='del'>-			compatible	= "st,stih416-compo-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfd320000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_transport:transport-syscfg@fd690000{</div><div class='del'>-			compatible	= "st,stih416-transport-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfd690000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		syscfg_lpm:lpm-syscfg@fe4b5100{</div><div class='del'>-			compatible	= "st,stih416-lpm-syscfg", "syscon";</div><div class='del'>-			reg		= &lt;0xfe4b5100 0x8&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		irq-syscfg {</div><div class='del'>-			compatible    = "st,stih416-irq-syscfg";</div><div class='del'>-			st,syscfg     = &lt;&amp;syscfg_cpu&gt;;</div><div class='del'>-			st,irq-device = &lt;ST_IRQ_SYSCFG_PMU_0&gt;,</div><div class='del'>-					&lt;ST_IRQ_SYSCFG_PMU_1&gt;;</div><div class='del'>-			st,fiq-device = &lt;ST_IRQ_SYSCFG_DISABLED&gt;,</div><div class='del'>-					&lt;ST_IRQ_SYSCFG_DISABLED&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial2: serial@fed32000{</div><div class='del'>-			compatible	= "st,asc";</div><div class='del'>-			status 		= "disabled";</div><div class='del'>-			reg		= &lt;0xfed32000 0x2c&gt;;</div><div class='del'>-			interrupts	= &lt;0 197 0&gt;;</div><div class='del'>-			clocks 		= &lt;&amp;clk_s_a0_ls CLK_ICN_REG&gt;;</div><div class='del'>-			pinctrl-names 	= "default";</div><div class='del'>-			pinctrl-0 	= &lt;&amp;pinctrl_serial2 &amp;pinctrl_serial2_oe&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* SBC_UART1 */</div><div class='del'>-		sbc_serial1: serial@fe531000 {</div><div class='del'>-			compatible	= "st,asc";</div><div class='del'>-			status 		= "disabled";</div><div class='del'>-			reg		= &lt;0xfe531000 0x2c&gt;;</div><div class='del'>-			interrupts	= &lt;0 210 0&gt;;</div><div class='del'>-			pinctrl-names 	= "default";</div><div class='del'>-			pinctrl-0 	= &lt;&amp;pinctrl_sbc_serial1&gt;;</div><div class='del'>-			clocks		= &lt;&amp;clk_sysin&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@fed40000 {</div><div class='del'>-			compatible	= "st,comms-ssc4-i2c";</div><div class='del'>-			reg		= &lt;0xfed40000 0x110&gt;;</div><div class='del'>-			interrupts	= &lt;GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks 		= &lt;&amp;clk_s_a0_ls CLK_ICN_REG&gt;;</div><div class='del'>-			clock-names	= "ssc";</div><div class='del'>-			clock-frequency = &lt;400000&gt;;</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_i2c0_default&gt;;</div><div class='del'>-</div><div class='del'>-			status		= "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@fed41000 {</div><div class='del'>-			compatible	= "st,comms-ssc4-i2c";</div><div class='del'>-			reg		= &lt;0xfed41000 0x110&gt;;</div><div class='del'>-			interrupts	= &lt;GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks 		= &lt;&amp;clk_s_a0_ls CLK_ICN_REG&gt;;</div><div class='del'>-			clock-names	= "ssc";</div><div class='del'>-			clock-frequency = &lt;400000&gt;;</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_i2c1_default&gt;;</div><div class='del'>-</div><div class='del'>-			status		= "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@fe540000 {</div><div class='del'>-			compatible	= "st,comms-ssc4-i2c";</div><div class='del'>-			reg		= &lt;0xfe540000 0x110&gt;;</div><div class='del'>-			interrupts	= &lt;GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks		= &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			clock-names	= "ssc";</div><div class='del'>-			clock-frequency = &lt;400000&gt;;</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_sbc_i2c0_default&gt;;</div><div class='del'>-</div><div class='del'>-			status		= "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@fe541000 {</div><div class='del'>-			compatible	= "st,comms-ssc4-i2c";</div><div class='del'>-			reg		= &lt;0xfe541000 0x110&gt;;</div><div class='del'>-			interrupts	= &lt;GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks		= &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			clock-names	= "ssc";</div><div class='del'>-			clock-frequency = &lt;400000&gt;;</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_sbc_i2c1_default&gt;;</div><div class='del'>-</div><div class='del'>-			status		= "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ethernet0: dwmac@fe810000 {</div><div class='del'>-			device_type 	= "network";</div><div class='del'>-			compatible	= "st,stih416-dwmac", "snps,dwmac", "snps,dwmac-3.710";</div><div class='del'>-			status 		= "disabled";</div><div class='del'>-			reg		= &lt;0xfe810000 0x8000&gt;;</div><div class='del'>-			reg-names	= "stmmaceth";</div><div class='del'>-</div><div class='del'>-			interrupts = &lt;0 133 0&gt;, &lt;0 134 0&gt;, &lt;0 135 0&gt;;</div><div class='del'>-			interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";</div><div class='del'>-</div><div class='del'>-			snps,pbl 	= &lt;32&gt;;</div><div class='del'>-			snps,mixed-burst;</div><div class='del'>-</div><div class='del'>-			st,syscon		= &lt;&amp;syscfg_rear 0x8bc&gt;;</div><div class='del'>-			resets			= &lt;&amp;softreset STIH416_ETH0_SOFTRESET&gt;;</div><div class='del'>-			reset-names		= "stmmaceth";</div><div class='del'>-			pinctrl-names 	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_mii0&gt;;</div><div class='del'>-			clock-names	= "stmmaceth", "sti-ethclk";</div><div class='del'>-			clocks		= &lt;&amp;clk_s_a1_ls CLK_ICN_IF_2&gt;, &lt;&amp;clk_s_a1_ls CLK_GMAC0_PHY&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ethernet1: dwmac@fef08000 {</div><div class='del'>-			device_type = "network";</div><div class='del'>-			compatible		= "st,stih416-dwmac", "snps,dwmac", "snps,dwmac-3.710";</div><div class='del'>-			status 		= "disabled";</div><div class='del'>-			reg		= &lt;0xfef08000 0x8000&gt;;</div><div class='del'>-			reg-names	= "stmmaceth";</div><div class='del'>-			interrupts = &lt;0 136 0&gt;, &lt;0 137 0&gt;, &lt;0 138 0&gt;;</div><div class='del'>-			interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";</div><div class='del'>-</div><div class='del'>-			snps,pbl	= &lt;32&gt;;</div><div class='del'>-			snps,mixed-burst;</div><div class='del'>-</div><div class='del'>-			st,syscon	= &lt;&amp;syscfg_sbc 0x7f0&gt;;</div><div class='del'>-</div><div class='del'>-			resets		= &lt;&amp;softreset STIH416_ETH1_SOFTRESET&gt;;</div><div class='del'>-			reset-names	= "stmmaceth";</div><div class='del'>-			pinctrl-names 	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_mii1&gt;;</div><div class='del'>-			clock-names	= "stmmaceth", "sti-ethclk";</div><div class='del'>-			clocks		= &lt;&amp;clk_s_a0_ls CLK_ICN_REG&gt;, &lt;&amp;clk_s_a0_ls CLK_ETH1_PHY&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		rc: rc@fe518000 {</div><div class='del'>-			compatible	= "st,comms-irb";</div><div class='del'>-			reg		= &lt;0xfe518000 0x234&gt;;</div><div class='del'>-			interrupts	=  &lt;0 203 0&gt;;</div><div class='del'>-			rx-mode         = "infrared";</div><div class='del'>-			clocks		= &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			pinctrl-names 	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_ir&gt;;</div><div class='del'>-			resets		= &lt;&amp;softreset STIH416_IRB_SOFTRESET&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* FSM */</div><div class='del'>-		spifsm: spifsm@fe902000 {</div><div class='del'>-			compatible	   = "st,spi-fsm";</div><div class='del'>-			reg		   = &lt;0xfe902000 0x1000&gt;;</div><div class='del'>-			pinctrl-0	   = &lt;&amp;pinctrl_fsm&gt;;</div><div class='del'>-</div><div class='del'>-			st,syscfg	   = &lt;&amp;syscfg_rear&gt;;</div><div class='del'>-			st,boot-device-reg = &lt;0x958&gt;;</div><div class='del'>-			st,boot-device-spi = &lt;0x1a&gt;;</div><div class='del'>-</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		keyscan: keyscan@fe4b0000 {</div><div class='del'>-			compatible = "st,sti-keyscan";</div><div class='del'>-			status = "disabled";</div><div class='del'>-			reg = &lt;0xfe4b0000 0x2000&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 212 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_keyscan&gt;;</div><div class='del'>-			resets	= &lt;&amp;powerdown STIH416_KEYSCAN_POWERDOWN&gt;,</div><div class='del'>-				  &lt;&amp;softreset STIH416_KEYSCAN_SOFTRESET&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		temp0 {</div><div class='del'>-			compatible = "st,stih416-sas-thermal";</div><div class='del'>-			clock-names = "thermal";</div><div class='del'>-			clocks = &lt;&amp;clockgen_c_vcc 14&gt;;</div><div class='del'>-</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		temp1@fdfe8000 {</div><div class='del'>-			compatible = "st,stih416-mpe-thermal";</div><div class='del'>-			reg = &lt;0xfdfe8000 0x10&gt;;</div><div class='del'>-			clocks = &lt;&amp;clockgen_e 3&gt;;</div><div class='del'>-			clock-names = "thermal";</div><div class='del'>-			interrupts = &lt;GIC_SPI 23 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc0: sdhci@fe81e000 {</div><div class='del'>-			compatible	= "st,sdhci";</div><div class='del'>-			status		= "disabled";</div><div class='del'>-			reg		= &lt;0xfe81e000 0x1000&gt;;</div><div class='del'>-			interrupts	= &lt;GIC_SPI 127 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			interrupt-names	= "mmcirq";</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_mmc0&gt;;</div><div class='del'>-			clock-names	= "mmc";</div><div class='del'>-			clocks		= &lt;&amp;clk_s_a1_ls 1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc1: sdhci@fe81f000 {</div><div class='del'>-			compatible	= "st,sdhci";</div><div class='del'>-			status		= "disabled";</div><div class='del'>-			reg		= &lt;0xfe81f000 0x1000&gt;;</div><div class='del'>-			interrupts	= &lt;GIC_SPI 128 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			interrupt-names	= "mmcirq";</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_mmc1&gt;;</div><div class='del'>-			clock-names	= "mmc";</div><div class='del'>-			clocks		= &lt;&amp;clk_s_a1_ls 8&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		miphy365x_phy: phy@fe382000 {</div><div class='del'>-			compatible      = "st,miphy365x-phy";</div><div class='del'>-			st,syscfg	= &lt;&amp;syscfg_rear 0x824 0x828&gt;;</div><div class='del'>-			#address-cells	= &lt;1&gt;;</div><div class='del'>-			#size-cells	= &lt;1&gt;;</div><div class='del'>-			ranges;</div><div class='del'>-</div><div class='del'>-			phy_port0: port@fe382000 {</div><div class='del'>-				#phy-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xfe382000 0x100&gt;, &lt;0xfe394000 0x100&gt;;</div><div class='del'>-				reg-names = "sata", "pcie";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			phy_port1: port@fe38a000 {</div><div class='del'>-				#phy-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xfe38a000 0x100&gt;, &lt;0xfe804000 0x100&gt;;</div><div class='del'>-				reg-names = "sata", "pcie";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata0: sata@fe380000 {</div><div class='del'>-			compatible      = "st,sti-ahci";</div><div class='del'>-			reg             = &lt;0xfe380000 0x1000&gt;;</div><div class='del'>-			interrupts      = &lt;GIC_SPI 157 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			interrupt-names = "hostc";</div><div class='del'>-			phys	        = &lt;&amp;phy_port0 PHY_TYPE_SATA&gt;;</div><div class='del'>-			phy-names       = "sata-phy";</div><div class='del'>-			resets	        = &lt;&amp;powerdown STIH416_SATA0_POWERDOWN&gt;,</div><div class='del'>-					  &lt;&amp;softreset STIH416_SATA0_SOFTRESET&gt;;</div><div class='del'>-			reset-names     = "pwr-dwn", "sw-rst";</div><div class='del'>-			clock-names     = "ahci_clk";</div><div class='del'>-			clocks	        = &lt;&amp;clk_s_a0_ls CLK_ICN_REG&gt;;</div><div class='del'>-</div><div class='del'>-			status	        = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb2_phy: phy@0 {</div><div class='del'>-			compatible = "st,stih416-usb-phy";</div><div class='del'>-			#phy-cells = &lt;0&gt;;</div><div class='del'>-			st,syscfg = &lt;&amp;syscfg_rear&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			clock-names = "osc_phy";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ehci0: usb@fe1ffe00 {</div><div class='del'>-			compatible = "st,st-ehci-300x";</div><div class='del'>-			reg = &lt;0xfe1ffe00 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 148 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_usb0&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_s_a1_ls 0&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_b0 0&gt;;</div><div class='del'>-			clock-names = "ic", "clk48";</div><div class='del'>-			phys = &lt;&amp;usb2_phy&gt;;</div><div class='del'>-			phy-names = "usb";</div><div class='del'>-			resets = &lt;&amp;powerdown STIH416_USB0_POWERDOWN&gt;,</div><div class='del'>-				 &lt;&amp;softreset STIH416_USB0_SOFTRESET&gt;;</div><div class='del'>-			reset-names = "power", "softreset";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ohci0: usb@fe1ffc00 {</div><div class='del'>-			compatible = "st,st-ohci-300x";</div><div class='del'>-			reg = &lt;0xfe1ffc00 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 149 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_s_a1_ls 0&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_b0 0&gt;;</div><div class='del'>-			clock-names = "ic", "clk48";</div><div class='del'>-			phys = &lt;&amp;usb2_phy&gt;;</div><div class='del'>-			phy-names = "usb";</div><div class='del'>-			status = "okay";</div><div class='del'>-			resets = &lt;&amp;powerdown STIH416_USB0_POWERDOWN&gt;,</div><div class='del'>-				 &lt;&amp;softreset STIH416_USB0_SOFTRESET&gt;;</div><div class='del'>-			reset-names = "power", "softreset";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ehci1: usb@fe203e00 {</div><div class='del'>-			compatible = "st,st-ehci-300x";</div><div class='del'>-			reg = &lt;0xfe203e00 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 150 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_usb1&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_s_a1_ls 0&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_b0 0&gt;;</div><div class='del'>-			clock-names = "ic", "clk48";</div><div class='del'>-			phys = &lt;&amp;usb2_phy&gt;;</div><div class='del'>-			phy-names = "usb";</div><div class='del'>-			resets = &lt;&amp;powerdown STIH416_USB1_POWERDOWN&gt;,</div><div class='del'>-				 &lt;&amp;softreset STIH416_USB1_SOFTRESET&gt;;</div><div class='del'>-			reset-names = "power", "softreset";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ohci1: usb@fe203c00 {</div><div class='del'>-			compatible = "st,st-ohci-300x";</div><div class='del'>-			reg = &lt;0xfe203c00 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 151 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_s_a1_ls 0&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_b0 0&gt;;</div><div class='del'>-			clock-names = "ic", "clk48";</div><div class='del'>-			phys = &lt;&amp;usb2_phy&gt;;</div><div class='del'>-			phy-names = "usb";</div><div class='del'>-			resets = &lt;&amp;powerdown STIH416_USB1_POWERDOWN&gt;,</div><div class='del'>-				 &lt;&amp;softreset STIH416_USB1_SOFTRESET&gt;;</div><div class='del'>-			reset-names = "power", "softreset";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ehci2: usb@fe303e00 {</div><div class='del'>-			compatible = "st,st-ehci-300x";</div><div class='del'>-			reg = &lt;0xfe303e00 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 152 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_usb2&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_s_a1_ls 0&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_b0 0&gt;;</div><div class='del'>-			clock-names = "ic", "clk48";</div><div class='del'>-			phys = &lt;&amp;usb2_phy&gt;;</div><div class='del'>-			phy-names = "usb";</div><div class='del'>-			resets = &lt;&amp;powerdown STIH416_USB2_POWERDOWN&gt;,</div><div class='del'>-				 &lt;&amp;softreset STIH416_USB2_SOFTRESET&gt;;</div><div class='del'>-			reset-names = "power", "softreset";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ohci2: usb@fe303c00 {</div><div class='del'>-			compatible = "st,st-ohci-300x";</div><div class='del'>-			reg = &lt;0xfe303c00 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 153 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_s_a1_ls 0&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_b0 0&gt;;</div><div class='del'>-			clock-names = "ic", "clk48";</div><div class='del'>-			phys = &lt;&amp;usb2_phy&gt;;</div><div class='del'>-			phy-names = "usb";</div><div class='del'>-			resets = &lt;&amp;powerdown STIH416_USB2_POWERDOWN&gt;,</div><div class='del'>-				 &lt;&amp;softreset STIH416_USB2_SOFTRESET&gt;;</div><div class='del'>-			reset-names = "power", "softreset";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ehci3: usb@fe343e00 {</div><div class='del'>-			compatible = "st,st-ehci-300x";</div><div class='del'>-			reg = &lt;0xfe343e00 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 154 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_usb3&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_s_a1_ls 0&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_b0 0&gt;;</div><div class='del'>-			clock-names = "ic", "clk48";</div><div class='del'>-			phys = &lt;&amp;usb2_phy&gt;;</div><div class='del'>-			phy-names = "usb";</div><div class='del'>-			resets = &lt;&amp;powerdown STIH416_USB3_POWERDOWN&gt;,</div><div class='del'>-				 &lt;&amp;softreset STIH416_USB3_SOFTRESET&gt;;</div><div class='del'>-			reset-names = "power", "softreset";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ohci3: usb@fe343c00 {</div><div class='del'>-			compatible = "st,st-ohci-300x";</div><div class='del'>-			reg = &lt;0xfe343c00 0x100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 155 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_s_a1_ls 0&gt;,</div><div class='del'>-				 &lt;&amp;clockgen_b0 0&gt;;</div><div class='del'>-			clock-names = "ic", "clk48";</div><div class='del'>-			phys = &lt;&amp;usb2_phy&gt;;</div><div class='del'>-			phy-names = "usb";</div><div class='del'>-			resets = &lt;&amp;powerdown STIH416_USB3_POWERDOWN&gt;,</div><div class='del'>-				 &lt;&amp;softreset STIH416_USB3_SOFTRESET&gt;;</div><div class='del'>-			reset-names = "power", "softreset";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* SAS PWM Module */</div><div class='del'>-		pwm0: pwm@fed10000 {</div><div class='del'>-			compatible	= "st,sti-pwm";</div><div class='del'>-			status		= "disabled";</div><div class='del'>-			#pwm-cells	= &lt;2&gt;;</div><div class='del'>-			reg		= &lt;0xfed10000 0x68&gt;;</div><div class='del'>-			interrupts      = &lt;GIC_SPI 200 IRQ_TYPE_NONE&gt;;</div><div class='del'>-</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0 = 	&lt;&amp;pinctrl_pwm0_chan0_default</div><div class='del'>-					&amp;pinctrl_pwm0_chan1_default</div><div class='del'>-					&amp;pinctrl_pwm0_chan2_default</div><div class='del'>-					&amp;pinctrl_pwm0_chan3_default&gt;;</div><div class='del'>-</div><div class='del'>-			clock-names	= "pwm", "capture";</div><div class='del'>-			clocks		= &lt;&amp;clk_sysin&gt;, &lt;&amp;clk_s_a0_ls CLK_ICN_REG&gt;;</div><div class='del'>-</div><div class='del'>-			st,pwm-num-chan = &lt;4&gt;;</div><div class='del'>-			st,capture-num-chan = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* SBC PWM Module */</div><div class='del'>-		pwm1: pwm@fe510000 {</div><div class='del'>-			compatible	= "st,sti-pwm";</div><div class='del'>-			status		= "disabled";</div><div class='del'>-			#pwm-cells	= &lt;2&gt;;</div><div class='del'>-			reg		= &lt;0xfe510000 0x68&gt;;</div><div class='del'>-			interrupts      = &lt;GIC_SPI 202 IRQ_TYPE_NONE&gt;;</div><div class='del'>-</div><div class='del'>-			pinctrl-names	= "default";</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_pwm1_chan0_default</div><div class='del'>-					/*</div><div class='del'>-					 * Shared with SBC_OBS_NOTRST.  Don't</div><div class='del'>-					 * enable unless you really know what</div><div class='del'>-					 * you're doing.</div><div class='del'>-					 *</div><div class='del'>-					 * &amp;pinctrl_pwm1_chan1_default</div><div class='del'>-					 */</div><div class='del'>-					&amp;pinctrl_pwm1_chan2_default</div><div class='del'>-					&amp;pinctrl_pwm1_chan3_default&gt;;</div><div class='del'>-</div><div class='del'>-			clock-names	= "pwm";</div><div class='del'>-			clocks		= &lt;&amp;clk_sysin&gt;;</div><div class='del'>-			st,pwm-num-chan = &lt;3&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih41x-b2000.dtsi b/arch/arm/boot/dts/stih41x-b2000.dtsi<br/>deleted file mode 100644<br/>index 9bfa0674b452..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih41x-b2000.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih41x-b2000.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,96 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics (R&amp;D) Limited.</div><div class='del'>- * Author: Srinivas Kandagatla &lt;srinivas.kandagatla@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include &lt;dt-bindings/input/input.h&gt;</div><div class='del'>-#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-</div><div class='del'>-	memory{</div><div class='del'>-		device_type = "memory";</div><div class='del'>-		reg = &lt;0x60000000 0x40000000&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	chosen {</div><div class='del'>-		bootargs = "console=ttyAS0,115200 clk_ignore_unused";</div><div class='del'>-		linux,stdout-path = &amp;serial2;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ttyAS0 = &amp;serial2;</div><div class='del'>-		ethernet0 = &amp;ethernet0;</div><div class='del'>-		ethernet1 = &amp;ethernet1;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc {</div><div class='del'>-		serial2: serial@fed32000 {</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		leds {</div><div class='del'>-			compatible	= "gpio-leds";</div><div class='del'>-			fp_led {</div><div class='del'>-				label	= "Front Panel LED";</div><div class='del'>-				gpios	= &lt;&amp;pio105 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-				linux,default-trigger	= "heartbeat";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* HDMI Tx I2C */</div><div class='del'>-		i2c@fed41000 {</div><div class='del'>-			/* HDMI V1.3a supports Standard mode only */</div><div class='del'>-			clock-frequency = &lt;100000&gt;;</div><div class='del'>-			i2c-min-scl-pulse-width-us = &lt;0&gt;;</div><div class='del'>-			i2c-min-sda-pulse-width-us = &lt;5&gt;;</div><div class='del'>-</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ethernet0: dwmac@fe810000 {</div><div class='del'>-			status			= "okay";</div><div class='del'>-			phy-mode		= "mii";</div><div class='del'>-			pinctrl-0		= &lt;&amp;pinctrl_mii0&gt;;</div><div class='del'>-</div><div class='del'>-			snps,reset-gpio 	= &lt;&amp;pio106 2&gt;;</div><div class='del'>-			snps,reset-active-low;</div><div class='del'>-			snps,reset-delays-us 	= &lt;0 10000 10000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ethernet1: dwmac@fef08000 {</div><div class='del'>-			status			= "disabled";</div><div class='del'>-			phy-mode		= "mii";</div><div class='del'>-			st,tx-retime-src	= "txclk";</div><div class='del'>-</div><div class='del'>-			snps,reset-gpio 	= &lt;&amp;pio4 7&gt;;</div><div class='del'>-			snps,reset-active-low;</div><div class='del'>-			snps,reset-delays-us 	= &lt;0 10000 10000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		keyscan: keyscan@fe4b0000 {</div><div class='del'>-			keypad,num-rows = &lt;4&gt;;</div><div class='del'>-			keypad,num-columns = &lt;4&gt;;</div><div class='del'>-			st,debounce-us = &lt;5000&gt;;</div><div class='del'>-			linux,keymap = &lt; MATRIX_KEY(0x00, 0x00, KEY_F13)</div><div class='del'>-					 MATRIX_KEY(0x00, 0x01, KEY_F9)</div><div class='del'>-					 MATRIX_KEY(0x00, 0x02, KEY_F5)</div><div class='del'>-					 MATRIX_KEY(0x00, 0x03, KEY_F1)</div><div class='del'>-					 MATRIX_KEY(0x01, 0x00, KEY_F14)</div><div class='del'>-					 MATRIX_KEY(0x01, 0x01, KEY_F10)</div><div class='del'>-					 MATRIX_KEY(0x01, 0x02, KEY_F6)</div><div class='del'>-					 MATRIX_KEY(0x01, 0x03, KEY_F2)</div><div class='del'>-					 MATRIX_KEY(0x02, 0x00, KEY_F15)</div><div class='del'>-					 MATRIX_KEY(0x02, 0x01, KEY_F11)</div><div class='del'>-					 MATRIX_KEY(0x02, 0x02, KEY_F7)</div><div class='del'>-					 MATRIX_KEY(0x02, 0x03, KEY_F3)</div><div class='del'>-					 MATRIX_KEY(0x03, 0x00, KEY_F16)</div><div class='del'>-					 MATRIX_KEY(0x03, 0x01, KEY_F12)</div><div class='del'>-					 MATRIX_KEY(0x03, 0x02, KEY_F8)</div><div class='del'>-					 MATRIX_KEY(0x03, 0x03, KEY_F4) &gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih41x-b2020.dtsi b/arch/arm/boot/dts/stih41x-b2020.dtsi<br/>deleted file mode 100644<br/>index 322e0e95176c..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih41x-b2020.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih41x-b2020.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics (R&amp;D) Limited.</div><div class='del'>- * Author: Srinivas Kandagatla &lt;srinivas.kandagatla@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include "stih41x-b2020x.dtsi"</div><div class='del'>-#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='del'>-/ {</div><div class='del'>-	memory{</div><div class='del'>-		device_type = "memory";</div><div class='del'>-		reg = &lt;0x40000000 0x80000000&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	chosen {</div><div class='del'>-		bootargs = "console=ttyAS0,115200 clk_ignore_unused";</div><div class='del'>-		linux,stdout-path = &amp;sbc_serial1;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ttyAS0 = &amp;sbc_serial1;</div><div class='del'>-		ethernet1 = &amp;ethernet1;</div><div class='del'>-	};</div><div class='del'>-	soc {</div><div class='del'>-		sbc_serial1: serial@fe531000 {</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		leds {</div><div class='del'>-			compatible	= "gpio-leds";</div><div class='del'>-			red {</div><div class='del'>-				label	= "Front Panel LED";</div><div class='del'>-				gpios	= &lt;&amp;pio4 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-				linux,default-trigger	= "heartbeat";</div><div class='del'>-			};</div><div class='del'>-			green {</div><div class='del'>-				gpios	= &lt;&amp;pio4 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-				default-state = "off";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@fed40000 {</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* HDMI Tx I2C */</div><div class='del'>-		i2c@fed41000 {</div><div class='del'>-			/* HDMI V1.3a supports Standard mode only */</div><div class='del'>-			clock-frequency = &lt;100000&gt;;</div><div class='del'>-			i2c-min-scl-pulse-width-us = &lt;0&gt;;</div><div class='del'>-			i2c-min-sda-pulse-width-us = &lt;5&gt;;</div><div class='del'>-</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@fe540000 {</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@fe541000 {</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ethernet1: dwmac@fef08000 {</div><div class='del'>-			status			= "okay";</div><div class='del'>-			phy-mode		= "rgmii-id";</div><div class='del'>-			max-speed		= &lt;1000&gt;;</div><div class='del'>-			st,tx-retime-src	= "clk_125";</div><div class='del'>-			snps,reset-gpio 	= &lt;&amp;pio3 0&gt;;</div><div class='del'>-			snps,reset-active-low;</div><div class='del'>-			snps,reset-delays-us 	= &lt;0 10000 10000&gt;;</div><div class='del'>-</div><div class='del'>-			pinctrl-0	= &lt;&amp;pinctrl_rgmii1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc0: sdhci@fe81e000 {</div><div class='del'>-			bus-width = &lt;8&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih41x-b2020x.dtsi b/arch/arm/boot/dts/stih41x-b2020x.dtsi<br/>deleted file mode 100644<br/>index f797a0607382..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih41x-b2020x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih41x-b2020x.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2013 STMicroelectronics (R&amp;D) Limited.</div><div class='del'>- * Author: Lee Jones &lt;lee.jones@linaro.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-/ {</div><div class='del'>-	soc {</div><div class='del'>-		mmc0: sdhci@fe81e000 {</div><div class='del'>-			status = "okay";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spifsm: spifsm@fe902000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells    = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-			status = "okay";</div><div class='del'>-</div><div class='del'>-			partition@0 {</div><div class='del'>-				label = "SerialFlash1";</div><div class='del'>-				reg   = &lt;0x00000000 0x00500000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@500000 {</div><div class='del'>-				label = "SerialFlash2";</div><div class='del'>-				reg   = &lt;0x00500000 0x00b00000&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stih41x.dtsi b/arch/arm/boot/dts/stih41x.dtsi<br/>deleted file mode 100644<br/>index 5cb0e63376b5..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stih41x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stih41x.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2014 STMicroelectronics Limited.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * publishhed by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-/ {</div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-	cpus {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		cpu@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a9";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-		cpu@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a9";</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	intc: interrupt-controller@fffe1000 {</div><div class='del'>-		compatible = "arm,cortex-a9-gic";</div><div class='del'>-		#interrupt-cells = &lt;3&gt;;</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		reg = &lt;0xfffe1000 0x1000&gt;,</div><div class='del'>-		      &lt;0xfffe0100 0x100&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	scu@fffe0000 {</div><div class='del'>-		compatible = "arm,cortex-a9-scu";</div><div class='del'>-		reg = &lt;0xfffe0000 0x1000&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	timer@fffe0200 {</div><div class='del'>-		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='del'>-		compatible = "arm,cortex-a9-global-timer";</div><div class='del'>-		reg = &lt;0xfffe0200 0x100&gt;;</div><div class='del'>-		interrupts = &lt;1 11 0x04&gt;;</div><div class='del'>-		clocks = &lt;&amp;arm_periph_clk&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi<br/>index ed2b7a99ecff..4b8f62f89664 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stihxxx-b2120.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stihxxx-b2120.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stihxxx-b2120.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stihxxx-b2120.dtsi</a></div><div class='hunk'>@@ -135,6 +135,10 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		sti_uni_player0: sti-uni-player@8d80000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		sti_uni_player2: sti-uni-player@8d82000 {</div><div class='ctx'> 			status = "okay";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -151,13 +155,26 @@</div><div class='ctx'> </div><div class='ctx'> 		sound {</div><div class='ctx'> 			compatible = "simple-audio-card";</div><div class='del'>-			simple-audio-card,name = "sti audio card";</div><div class='add'>+			simple-audio-card,name = "STI-B2120";</div><div class='ctx'> 			status = "okay";</div><div class='ctx'> </div><div class='ctx'> 			simple-audio-card,dai-link@0 {</div><div class='add'>+				/* HDMI */</div><div class='add'>+				format = "i2s";</div><div class='add'>+				mclk-fs = &lt;128&gt;;</div><div class='add'>+				cpu {</div><div class='add'>+					sound-dai = &lt;&amp;sti_uni_player0&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				codec {</div><div class='add'>+					sound-dai = &lt;&amp;sti_hdmi&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+			simple-audio-card,dai-link@1 {</div><div class='ctx'> 				/* DAC */</div><div class='ctx'> 				format = "i2s";</div><div class='ctx'> 				mclk-fs = &lt;256&gt;;</div><div class='add'>+				frame-inversion = &lt;1&gt;;</div><div class='ctx'> 				cpu {</div><div class='ctx'> 					sound-dai = &lt;&amp;sti_uni_player2&gt;;</div><div class='ctx'> 				};</div><div class='hunk'>@@ -166,7 +183,7 @@</div><div class='ctx'> 					sound-dai = &lt;&amp;sti_sasg_codec 1&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='del'>-			simple-audio-card,dai-link@1 {</div><div class='add'>+			simple-audio-card,dai-link@2 {</div><div class='ctx'> 				/* SPDIF */</div><div class='ctx'> 				format = "left_j";</div><div class='ctx'> 				mclk-fs = &lt;128&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts<br/>index 6bfc5959dac3..3c99466989b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stm32429i-eval.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stm32429i-eval.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stm32429i-eval.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32429i-eval.dts</a></div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> #include "stm32f429.dtsi"</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "STMicroelectronics STM32429i-EVAL board";</div><div class='hunk'>@@ -65,6 +66,24 @@</div><div class='ctx'> 		serial0 = &amp;usart1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	soc {</div><div class='add'>+		dma-ranges = &lt;0xc0000000 0x0 0x10000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	regulators {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		reg_vref: regulator@0 {</div><div class='add'>+			compatible = "regulator-fixed";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			regulator-name = "vref";</div><div class='add'>+			regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+			regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	leds {</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> 		green {</div><div class='hunk'>@@ -82,23 +101,58 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	gpio_keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		autorepeat;</div><div class='add'>+		button@0 {</div><div class='add'>+			label = "Wake up";</div><div class='add'>+			linux,code = &lt;KEY_WAKEUP&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpioa 0 0&gt;;</div><div class='add'>+		};</div><div class='add'>+		button@1 {</div><div class='add'>+			label = "Tamper";</div><div class='add'>+			linux,code = &lt;KEY_RESTART&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpioc 13 0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	usbotg_hs_phy: usbphy {</div><div class='ctx'> 		#phy-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "usb-nop-xceiv";</div><div class='del'>-		clocks = &lt;&amp;rcc 0 30&gt;;</div><div class='add'>+		clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(OTGHSULPI)&gt;;</div><div class='ctx'> 		clock-names = "main_clk";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;adc {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;adc3_in8_pin&gt;;</div><div class='add'>+	vref-supply = &lt;&amp;reg_vref&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+	adc3: adc@200 {</div><div class='add'>+		st,adc-channels = &lt;8&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;clk_hse {</div><div class='ctx'> 	clock-frequency = &lt;25000000&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;ethernet0 {</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-0	= &lt;&amp;ethernet0_mii&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mac {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0	= &lt;&amp;ethernet_mii&gt;;</div><div class='ctx'> 	pinctrl-names	= "default";</div><div class='del'>-	phy-mode	= "mii-id";</div><div class='add'>+	phy-mode	= "mii";</div><div class='add'>+	phy-handle	= &lt;&amp;phy1&gt;;</div><div class='ctx'> 	mdio0 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -109,6 +163,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;rtc {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usart1 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;usart1_pins_a&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='head'>diff --git a/arch/arm/boot/dts/stm32746g-eval.dts b/arch/arm/boot/dts/stm32746g-eval.dts<br/>new file mode 100644<br/>index 000000000000..aa03fac1ec55<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stm32746g-eval.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32746g-eval.dts</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2015 - Maxime Coquelin &lt;mcoquelin.stm32@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "stm32f746.dtsi"</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "STMicroelectronics STM32746g-EVAL board";</div><div class='add'>+	compatible = "st,stm32746g-eval", "st,stm32f746";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "root=/dev/ram";</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0xc0000000 0x2000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;usart1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+		green {</div><div class='add'>+			gpios = &lt;&amp;gpiof 10 1&gt;;</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+		};</div><div class='add'>+		red {</div><div class='add'>+			gpios = &lt;&amp;gpiob 7 1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio_keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		autorepeat;</div><div class='add'>+		button@0 {</div><div class='add'>+			label = "Wake up";</div><div class='add'>+			linux,code = &lt;KEY_WAKEUP&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpioc 13 0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;clk_hse {</div><div class='add'>+	clock-frequency = &lt;25000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usart1 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;usart1_pins_a&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/stm32f429-disco.dts b/arch/arm/boot/dts/stm32f429-disco.dts<br/>index 01408073dd53..9222b9f37bc0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stm32f429-disco.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stm32f429-disco.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stm32f429-disco.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32f429-disco.dts</a></div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> #include "stm32f429.dtsi"</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "STMicroelectronics STM32F429i-DISCO board";</div><div class='hunk'>@@ -75,12 +76,30 @@</div><div class='ctx'> 			linux,default-trigger = "heartbeat";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	gpio_keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		autorepeat;</div><div class='add'>+		button@0 {</div><div class='add'>+			label = "User";</div><div class='add'>+			linux,code = &lt;KEY_HOME&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpioa 0 0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;clk_hse {</div><div class='ctx'> 	clock-frequency = &lt;8000000&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;rtc {</div><div class='add'>+	assigned-clocks = &lt;&amp;rcc 1 CLK_RTC&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;rcc 1 CLK_LSI&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usart1 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;usart1_pins_a&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='head'>diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi<br/>index 336ee4fb587d..ee0da970e8ad 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stm32f429.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stm32f429.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stm32f429.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32f429.dtsi</a></div><div class='hunk'>@@ -48,6 +48,8 @@</div><div class='ctx'> #include "skeleton.dtsi"</div><div class='ctx'> #include "armv7-m.dtsi"</div><div class='ctx'> #include &lt;dt-bindings/pinctrl/stm32f429-pinfunc.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/stm32fx-clock.h&gt;</div><div class='add'>+#include &lt;dt-bindings/mfd/stm32f4-rcc.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	clocks {</div><div class='hunk'>@@ -56,55 +58,252 @@</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		clk-lse {</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-frequency = &lt;32768&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clk-lsi {</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-frequency = &lt;32000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clk_i2s_ckin: i2s-ckin {</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-frequency = &lt;0&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc {</div><div class='del'>-		dma-ranges = &lt;0xc0000000 0x0 0x10000000&gt;;</div><div class='del'>-</div><div class='ctx'> 		timer2: timer@40000000 {</div><div class='ctx'> 			compatible = "st,stm32-timer";</div><div class='ctx'> 			reg = &lt;0x40000000 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;28&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 128&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM2)&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timers2: timers@40000000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40000000 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM2)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='ctx'> 			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			timer@1 {</div><div class='add'>+				compatible = "st,stm32-timer-trigger";</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		timer3: timer@40000400 {</div><div class='ctx'> 			compatible = "st,stm32-timer";</div><div class='ctx'> 			reg = &lt;0x40000400 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;29&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 129&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM3)&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		timers3: timers@40000400 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40000400 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM3)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			timer@2 {</div><div class='add'>+				compatible = "st,stm32-timer-trigger";</div><div class='add'>+				reg = &lt;2&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		timer4: timer@40000800 {</div><div class='ctx'> 			compatible = "st,stm32-timer";</div><div class='ctx'> 			reg = &lt;0x40000800 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;30&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 130&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM4)&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		timers4: timers@40000800 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40000800 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM4)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			timer@3 {</div><div class='add'>+				compatible = "st,stm32-timer-trigger";</div><div class='add'>+				reg = &lt;3&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		timer5: timer@40000c00 {</div><div class='ctx'> 			compatible = "st,stm32-timer";</div><div class='ctx'> 			reg = &lt;0x40000c00 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;50&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 131&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM5)&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timers5: timers@40000c00 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40000C00 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM5)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			timer@4 {</div><div class='add'>+				compatible = "st,stm32-timer-trigger";</div><div class='add'>+				reg = &lt;4&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		timer6: timer@40001000 {</div><div class='ctx'> 			compatible = "st,stm32-timer";</div><div class='ctx'> 			reg = &lt;0x40001000 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;54&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 132&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM6)&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		timers6: timers@40001000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40001000 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM6)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			timer@5 {</div><div class='add'>+				compatible = "st,stm32-timer-trigger";</div><div class='add'>+				reg = &lt;5&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		timer7: timer@40001400 {</div><div class='ctx'> 			compatible = "st,stm32-timer";</div><div class='ctx'> 			reg = &lt;0x40001400 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;55&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 133&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM7)&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timers7: timers@40001400 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40001400 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM7)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			timer@6 {</div><div class='add'>+				compatible = "st,stm32-timer-trigger";</div><div class='add'>+				reg = &lt;6&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timers12: timers@40001800 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40001800 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM12)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			timer@11 {</div><div class='add'>+				compatible = "st,stm32-timer-trigger";</div><div class='add'>+				reg = &lt;11&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timers13: timers@40001c00 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40001C00 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM13)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timers14: timers@40002000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40002000 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(TIM14)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtc: rtc@40002800 {</div><div class='add'>+			compatible = "st,stm32-rtc";</div><div class='add'>+			reg = &lt;0x40002800 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 1 CLK_RTC&gt;;</div><div class='add'>+			clock-names = "ck_rtc";</div><div class='add'>+			assigned-clocks = &lt;&amp;rcc 1 CLK_RTC&gt;;</div><div class='add'>+			assigned-clock-parents = &lt;&amp;rcc 1 CLK_LSE&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;exti&gt;;</div><div class='add'>+			interrupts = &lt;17 1&gt;;</div><div class='add'>+			interrupt-names = "alarm";</div><div class='add'>+			st,syscfg = &lt;&amp;pwrcfg&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +311,7 @@</div><div class='ctx'> 			compatible = "st,stm32-usart", "st,stm32-uart";</div><div class='ctx'> 			reg = &lt;0x40004400 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;38&gt;;</div><div class='del'>-			clocks =  &lt;&amp;rcc 0 145&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(UART2)&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -120,15 +319,18 @@</div><div class='ctx'> 			compatible = "st,stm32-usart", "st,stm32-uart";</div><div class='ctx'> 			reg = &lt;0x40004800 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;39&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 146&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(UART3)&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='add'>+			dmas = &lt;&amp;dma1 1 4 0x400 0x0&gt;,</div><div class='add'>+			       &lt;&amp;dma1 3 4 0x400 0x0&gt;;</div><div class='add'>+			dma-names = "rx", "tx";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		usart4: serial@40004c00 {</div><div class='ctx'> 			compatible = "st,stm32-uart";</div><div class='ctx'> 			reg = &lt;0x40004c00 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;52&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 147&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(UART4)&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -136,7 +338,19 @@</div><div class='ctx'> 			compatible = "st,stm32-uart";</div><div class='ctx'> 			reg = &lt;0x40005000 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;53&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 148&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(UART5)&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c1: i2c@40005400 {</div><div class='add'>+			compatible = "st,stm32f4-i2c";</div><div class='add'>+			reg = &lt;0x40005400 0x400&gt;;</div><div class='add'>+			interrupts = &lt;31&gt;,</div><div class='add'>+				     &lt;32&gt;;</div><div class='add'>+			resets = &lt;&amp;rcc STM32F4_APB1_RESET(I2C1)&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(I2C1)&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -144,7 +358,7 @@</div><div class='ctx'> 			compatible = "st,stm32-usart", "st,stm32-uart";</div><div class='ctx'> 			reg = &lt;0x40007800 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;82&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 158&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(UART7)&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -152,26 +366,114 @@</div><div class='ctx'> 			compatible = "st,stm32-usart", "st,stm32-uart";</div><div class='ctx'> 			reg = &lt;0x40007c00 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;83&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 159&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB1_CLOCK(UART8)&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		timers1: timers@40010000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40010000 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB2_CLOCK(TIM1)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			timer@0 {</div><div class='add'>+				compatible = "st,stm32-timer-trigger";</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timers8: timers@40010400 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40010400 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB2_CLOCK(TIM8)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			timer@7 {</div><div class='add'>+				compatible = "st,stm32-timer-trigger";</div><div class='add'>+				reg = &lt;7&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		usart1: serial@40011000 {</div><div class='ctx'> 			compatible = "st,stm32-usart", "st,stm32-uart";</div><div class='ctx'> 			reg = &lt;0x40011000 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;37&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 164&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB2_CLOCK(USART1)&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='add'>+			dmas = &lt;&amp;dma2 2 4 0x400 0x0&gt;,</div><div class='add'>+			       &lt;&amp;dma2 7 4 0x400 0x0&gt;;</div><div class='add'>+			dma-names = "rx", "tx";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		usart6: serial@40011400 {</div><div class='ctx'> 			compatible = "st,stm32-usart", "st,stm32-uart";</div><div class='ctx'> 			reg = &lt;0x40011400 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;71&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 165&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB2_CLOCK(USART6)&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		adc: adc@40012000 {</div><div class='add'>+			compatible = "st,stm32f4-adc-core";</div><div class='add'>+			reg = &lt;0x40012000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;18&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB2_CLOCK(ADC1)&gt;;</div><div class='add'>+			clock-names = "adc";</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			adc1: adc@0 {</div><div class='add'>+				compatible = "st,stm32f4-adc";</div><div class='add'>+				#io-channel-cells = &lt;1&gt;;</div><div class='add'>+				reg = &lt;0x0&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_APB2_CLOCK(ADC1)&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;adc&gt;;</div><div class='add'>+				interrupts = &lt;0&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			adc2: adc@100 {</div><div class='add'>+				compatible = "st,stm32f4-adc";</div><div class='add'>+				#io-channel-cells = &lt;1&gt;;</div><div class='add'>+				reg = &lt;0x100&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_APB2_CLOCK(ADC2)&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;adc&gt;;</div><div class='add'>+				interrupts = &lt;1&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			adc3: adc@200 {</div><div class='add'>+				compatible = "st,stm32f4-adc";</div><div class='add'>+				#io-channel-cells = &lt;1&gt;;</div><div class='add'>+				reg = &lt;0x200&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_APB2_CLOCK(ADC3)&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;adc&gt;;</div><div class='add'>+				interrupts = &lt;2&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		syscfg: system-config@40013800 {</div><div class='ctx'> 			compatible = "syscon";</div><div class='ctx'> 			reg = &lt;0x40013800 0x400&gt;;</div><div class='hunk'>@@ -185,18 +487,76 @@</div><div class='ctx'> 			interrupts = &lt;1&gt;, &lt;2&gt;, &lt;3&gt;, &lt;6&gt;, &lt;7&gt;, &lt;8&gt;, &lt;9&gt;, &lt;10&gt;, &lt;23&gt;, &lt;40&gt;, &lt;41&gt;, &lt;42&gt;, &lt;62&gt;, &lt;76&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		timers9: timers@40014000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40014000 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB2_CLOCK(TIM9)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			timer@8 {</div><div class='add'>+				compatible = "st,stm32-timer-trigger";</div><div class='add'>+				reg = &lt;8&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timers10: timers@40014400 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40014400 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB2_CLOCK(TIM10)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timers11: timers@40014800 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "st,stm32-timers";</div><div class='add'>+			reg = &lt;0x40014800 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_APB2_CLOCK(TIM11)&gt;;</div><div class='add'>+			clock-names = "int";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			pwm {</div><div class='add'>+				compatible = "st,stm32-pwm";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwrcfg: power-config@40007000 {</div><div class='add'>+			compatible = "syscon";</div><div class='add'>+			reg = &lt;0x40007000 0x400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pin-controller {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "st,stm32f429-pinctrl";</div><div class='ctx'> 			ranges = &lt;0 0x40020000 0x3000&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;exti&gt;;</div><div class='add'>+			st,syscfg = &lt;&amp;syscfg 0x8&gt;;</div><div class='ctx'> 			pins-are-numbered;</div><div class='ctx'> </div><div class='ctx'> 			gpioa: gpio@40020000 {</div><div class='ctx'> 				gpio-controller;</div><div class='ctx'> 				#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0x0 0x400&gt;;</div><div class='del'>-				clocks = &lt;&amp;rcc 0 0&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(GPIOA)&gt;;</div><div class='ctx'> 				st,bank-name = "GPIOA";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -204,7 +564,7 @@</div><div class='ctx'> 				gpio-controller;</div><div class='ctx'> 				#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0x400 0x400&gt;;</div><div class='del'>-				clocks = &lt;&amp;rcc 0 1&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(GPIOB)&gt;;</div><div class='ctx'> 				st,bank-name = "GPIOB";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -212,7 +572,7 @@</div><div class='ctx'> 				gpio-controller;</div><div class='ctx'> 				#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0x800 0x400&gt;;</div><div class='del'>-				clocks = &lt;&amp;rcc 0 2&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(GPIOC)&gt;;</div><div class='ctx'> 				st,bank-name = "GPIOC";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -220,7 +580,7 @@</div><div class='ctx'> 				gpio-controller;</div><div class='ctx'> 				#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0xc00 0x400&gt;;</div><div class='del'>-				clocks = &lt;&amp;rcc 0 3&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(GPIOD)&gt;;</div><div class='ctx'> 				st,bank-name = "GPIOD";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -228,7 +588,7 @@</div><div class='ctx'> 				gpio-controller;</div><div class='ctx'> 				#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0x1000 0x400&gt;;</div><div class='del'>-				clocks = &lt;&amp;rcc 0 4&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(GPIOE)&gt;;</div><div class='ctx'> 				st,bank-name = "GPIOE";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +596,7 @@</div><div class='ctx'> 				gpio-controller;</div><div class='ctx'> 				#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0x1400 0x400&gt;;</div><div class='del'>-				clocks = &lt;&amp;rcc 0 5&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(GPIOF)&gt;;</div><div class='ctx'> 				st,bank-name = "GPIOF";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -244,7 +604,7 @@</div><div class='ctx'> 				gpio-controller;</div><div class='ctx'> 				#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0x1800 0x400&gt;;</div><div class='del'>-				clocks = &lt;&amp;rcc 0 6&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(GPIOG)&gt;;</div><div class='ctx'> 				st,bank-name = "GPIOG";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -252,7 +612,7 @@</div><div class='ctx'> 				gpio-controller;</div><div class='ctx'> 				#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0x1c00 0x400&gt;;</div><div class='del'>-				clocks = &lt;&amp;rcc 0 7&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(GPIOH)&gt;;</div><div class='ctx'> 				st,bank-name = "GPIOH";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -260,7 +620,7 @@</div><div class='ctx'> 				gpio-controller;</div><div class='ctx'> 				#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0x2000 0x400&gt;;</div><div class='del'>-				clocks = &lt;&amp;rcc 0 8&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(GPIOI)&gt;;</div><div class='ctx'> 				st,bank-name = "GPIOI";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +628,7 @@</div><div class='ctx'> 				gpio-controller;</div><div class='ctx'> 				#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0x2400 0x400&gt;;</div><div class='del'>-				clocks = &lt;&amp;rcc 0 9&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(GPIOJ)&gt;;</div><div class='ctx'> 				st,bank-name = "GPIOJ";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +636,7 @@</div><div class='ctx'> 				gpio-controller;</div><div class='ctx'> 				#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 				reg = &lt;0x2800 0x400&gt;;</div><div class='del'>-				clocks = &lt;&amp;rcc 0 10&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(GPIOK)&gt;;</div><div class='ctx'> 				st,bank-name = "GPIOK";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -293,6 +653,19 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			usart3_pins_a: usart3@0 {</div><div class='add'>+				pins1 {</div><div class='add'>+					pinmux = &lt;STM32F429_PB10_FUNC_USART3_TX&gt;;</div><div class='add'>+					bias-disable;</div><div class='add'>+					drive-push-pull;</div><div class='add'>+					slew-rate = &lt;0&gt;;</div><div class='add'>+				};</div><div class='add'>+				pins2 {</div><div class='add'>+					pinmux = &lt;STM32F429_PB11_FUNC_USART3_RX&gt;;</div><div class='add'>+					bias-disable;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			usbotg_hs_pins_a: usbotg_hs@0 {</div><div class='ctx'> 				pins {</div><div class='ctx'> 					pinmux = &lt;STM32F429_PH4_FUNC_OTG_HS_ULPI_NXT&gt;,</div><div class='hunk'>@@ -313,7 +686,7 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			ethernet0_mii: mii@0 {</div><div class='add'>+			ethernet_mii: mii@0 {</div><div class='ctx'> 				pins {</div><div class='ctx'> 					pinmux = &lt;STM32F429_PG13_FUNC_ETH_MII_TXD0_ETH_RMII_TXD0&gt;,</div><div class='ctx'> 						 &lt;STM32F429_PG14_FUNC_ETH_MII_TXD1_ETH_RMII_TXD1&gt;,</div><div class='hunk'>@@ -332,6 +705,37 @@</div><div class='ctx'> 					slew-rate = &lt;2&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			adc3_in8_pin: adc@200 {</div><div class='add'>+				pins {</div><div class='add'>+					pinmux = &lt;STM32F429_PF10_FUNC_ANALOG&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pwm1_pins: pwm@1 {</div><div class='add'>+				pins {</div><div class='add'>+					pinmux = &lt;STM32F429_PA8_FUNC_TIM1_CH1&gt;,</div><div class='add'>+						 &lt;STM32F429_PB13_FUNC_TIM1_CH1N&gt;,</div><div class='add'>+						 &lt;STM32F429_PB12_FUNC_TIM1_BKIN&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pwm3_pins: pwm@3 {</div><div class='add'>+				pins {</div><div class='add'>+					pinmux = &lt;STM32F429_PB4_FUNC_TIM3_CH1&gt;,</div><div class='add'>+						 &lt;STM32F429_PB5_FUNC_TIM3_CH2&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c1_pins: i2c1@0 {</div><div class='add'>+				pins {</div><div class='add'>+					pinmux = &lt;STM32F429_PB9_FUNC_I2C1_SDA&gt;,</div><div class='add'>+						 &lt;STM32F429_PB6_FUNC_I2C1_SCL&gt;;</div><div class='add'>+					bias-disable;</div><div class='add'>+					drive-open-drain;</div><div class='add'>+					slew-rate = &lt;3&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		rcc: rcc@40023810 {</div><div class='hunk'>@@ -339,7 +743,10 @@</div><div class='ctx'> 			#clock-cells = &lt;2&gt;;</div><div class='ctx'> 			compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";</div><div class='ctx'> 			reg = &lt;0x40023800 0x400&gt;;</div><div class='del'>-			clocks = &lt;&amp;clk_hse&gt;;</div><div class='add'>+			clocks = &lt;&amp;clk_hse&gt;, &lt;&amp;clk_i2s_ckin&gt;;</div><div class='add'>+			st,syscfg = &lt;&amp;pwrcfg&gt;;</div><div class='add'>+			assigned-clocks = &lt;&amp;rcc 1 CLK_HSE_RTC&gt;;</div><div class='add'>+			assigned-clock-rates = &lt;1000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		dma1: dma-controller@40026000 {</div><div class='hunk'>@@ -353,7 +760,7 @@</div><div class='ctx'> 				     &lt;16&gt;,</div><div class='ctx'> 				     &lt;17&gt;,</div><div class='ctx'> 				     &lt;47&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 21&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(DMA1)&gt;;</div><div class='ctx'> 			#dma-cells = &lt;4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -368,32 +775,32 @@</div><div class='ctx'> 				     &lt;68&gt;,</div><div class='ctx'> 				     &lt;69&gt;,</div><div class='ctx'> 				     &lt;70&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 22&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(DMA2)&gt;;</div><div class='ctx'> 			#dma-cells = &lt;4&gt;;</div><div class='ctx'> 			st,mem2mem;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ethernet0: dwmac@40028000 {</div><div class='add'>+		mac: ethernet@40028000 {</div><div class='ctx'> 			compatible = "st,stm32-dwmac", "snps,dwmac-3.50a";</div><div class='ctx'> 			reg = &lt;0x40028000 0x8000&gt;;</div><div class='ctx'> 			reg-names = "stmmaceth";</div><div class='del'>-			interrupts = &lt;61&gt;, &lt;62&gt;;</div><div class='del'>-			interrupt-names = "macirq", "eth_wake_irq";</div><div class='del'>-			clock-names = "stmmaceth", "tx-clk", "rx-clk";</div><div class='del'>-			clocks = &lt;&amp;rcc 0 25&gt;, &lt;&amp;rcc 0 26&gt;, &lt;&amp;rcc 0 27&gt;;</div><div class='add'>+			interrupts = &lt;61&gt;;</div><div class='add'>+			interrupt-names = "macirq";</div><div class='add'>+			clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(ETHMAC)&gt;,</div><div class='add'>+					&lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(ETHMACTX)&gt;,</div><div class='add'>+					&lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(ETHMACRX)&gt;;</div><div class='ctx'> 			st,syscon = &lt;&amp;syscfg 0x4&gt;;</div><div class='ctx'> 			snps,pbl = &lt;8&gt;;</div><div class='ctx'> 			snps,mixed-burst;</div><div class='del'>-			dma-ranges;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		usbotg_hs: usb@40040000 {</div><div class='ctx'> 			compatible = "snps,dwc2";</div><div class='del'>-			dma-ranges;</div><div class='ctx'> 			reg = &lt;0x40040000 0x40000&gt;;</div><div class='ctx'> 			interrupts = &lt;77&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 29&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_AHB1_CLOCK(OTGHS)&gt;;</div><div class='ctx'> 			clock-names = "otg";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -402,12 +809,13 @@</div><div class='ctx'> 			compatible = "st,stm32-rng";</div><div class='ctx'> 			reg = &lt;0x50060800 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;80&gt;;</div><div class='del'>-			clocks = &lt;&amp;rcc 0 38&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 STM32F4_AHB2_CLOCK(RNG)&gt;;</div><div class='add'>+</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;systick {</div><div class='del'>-	clocks = &lt;&amp;rcc 1 0&gt;;</div><div class='add'>+	clocks = &lt;&amp;rcc 1 SYSTICK&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts<br/>index e911af836471..0dd56ef574fa 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/stm32f469-disco.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/stm32f469-disco.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stm32f469-disco.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32f469-disco.dts</a></div><div class='hunk'>@@ -58,18 +58,60 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='del'>-		reg = &lt;0x00000000 0x800000&gt;;</div><div class='add'>+		reg = &lt;0x00000000 0x1000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial0 = &amp;usart3;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		dma-ranges = &lt;0xc0000000 0x0 0x10000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rcc {</div><div class='add'>+	compatible = "st,stm32f469-rcc", "st,stm32f42xx-rcc", "st,stm32-rcc";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;clk_hse {</div><div class='ctx'> 	clock-frequency = &lt;8000000&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;rtc {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;timers1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pwm {</div><div class='add'>+		pinctrl-0 = &lt;&amp;pwm1_pins&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer@0 {</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;timers3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pwm {</div><div class='add'>+		pinctrl-0 = &lt;&amp;pwm3_pins&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer@2 {</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usart3 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;usart3_pins_a&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi<br/>new file mode 100644<br/>index 000000000000..f321ffe87144<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/stm32f746.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/stm32f746.dtsi</a></div><div class='hunk'>@@ -0,0 +1,304 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2015 - Maxime Coquelin &lt;mcoquelin.stm32@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "skeleton.dtsi"</div><div class='add'>+#include "armv7-m.dtsi"</div><div class='add'>+#include &lt;dt-bindings/pinctrl/stm32f746-pinfunc.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	clocks {</div><div class='add'>+		clk_hse: clk-hse {</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-frequency = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		timer2: timer@40000000 {</div><div class='add'>+			compatible = "st,stm32-timer";</div><div class='add'>+			reg = &lt;0x40000000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;28&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 128&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer3: timer@40000400 {</div><div class='add'>+			compatible = "st,stm32-timer";</div><div class='add'>+			reg = &lt;0x40000400 0x400&gt;;</div><div class='add'>+			interrupts = &lt;29&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 129&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer4: timer@40000800 {</div><div class='add'>+			compatible = "st,stm32-timer";</div><div class='add'>+			reg = &lt;0x40000800 0x400&gt;;</div><div class='add'>+			interrupts = &lt;30&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 130&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer5: timer@40000c00 {</div><div class='add'>+			compatible = "st,stm32-timer";</div><div class='add'>+			reg = &lt;0x40000c00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;50&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 131&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer6: timer@40001000 {</div><div class='add'>+			compatible = "st,stm32-timer";</div><div class='add'>+			reg = &lt;0x40001000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;54&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 132&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer7: timer@40001400 {</div><div class='add'>+			compatible = "st,stm32-timer";</div><div class='add'>+			reg = &lt;0x40001400 0x400&gt;;</div><div class='add'>+			interrupts = &lt;55&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 133&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usart2: serial@40004400 {</div><div class='add'>+			compatible = "st,stm32f7-usart", "st,stm32f7-uart";</div><div class='add'>+			reg = &lt;0x40004400 0x400&gt;;</div><div class='add'>+			interrupts = &lt;38&gt;;</div><div class='add'>+			clocks =  &lt;&amp;rcc 0 145&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usart3: serial@40004800 {</div><div class='add'>+			compatible = "st,stm32f7-usart", "st,stm32f7-uart";</div><div class='add'>+			reg = &lt;0x40004800 0x400&gt;;</div><div class='add'>+			interrupts = &lt;39&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 146&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usart4: serial@40004c00 {</div><div class='add'>+			compatible = "st,stm32f7-uart";</div><div class='add'>+			reg = &lt;0x40004c00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;52&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 147&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usart5: serial@40005000 {</div><div class='add'>+			compatible = "st,stm32f7-uart";</div><div class='add'>+			reg = &lt;0x40005000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;53&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 148&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usart7: serial@40007800 {</div><div class='add'>+			compatible = "st,stm32f7-usart", "st,stm32f7-uart";</div><div class='add'>+			reg = &lt;0x40007800 0x400&gt;;</div><div class='add'>+			interrupts = &lt;82&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 158&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usart8: serial@40007c00 {</div><div class='add'>+			compatible = "st,stm32f7-usart", "st,stm32f7-uart";</div><div class='add'>+			reg = &lt;0x40007c00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;83&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 159&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usart1: serial@40011000 {</div><div class='add'>+			compatible = "st,stm32f7-usart", "st,stm32f7-uart";</div><div class='add'>+			reg = &lt;0x40011000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;37&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 164&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usart6: serial@40011400 {</div><div class='add'>+			compatible = "st,stm32f7-usart", "st,stm32f7-uart";</div><div class='add'>+			reg = &lt;0x40011400 0x400&gt;;</div><div class='add'>+			interrupts = &lt;71&gt;;</div><div class='add'>+			clocks = &lt;&amp;rcc 0 165&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		syscfg: system-config@40013800 {</div><div class='add'>+			compatible = "syscon";</div><div class='add'>+			reg = &lt;0x40013800 0x400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		exti: interrupt-controller@40013c00 {</div><div class='add'>+			compatible = "st,stm32-exti";</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+			reg = &lt;0x40013C00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;1&gt;, &lt;2&gt;, &lt;3&gt;, &lt;6&gt;, &lt;7&gt;, &lt;8&gt;, &lt;9&gt;, &lt;10&gt;, &lt;23&gt;, &lt;40&gt;, &lt;41&gt;, &lt;42&gt;, &lt;62&gt;, &lt;76&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pin-controller {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "st,stm32f746-pinctrl";</div><div class='add'>+			ranges = &lt;0 0x40020000 0x3000&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;exti&gt;;</div><div class='add'>+			st,syscfg = &lt;&amp;syscfg 0x8&gt;;</div><div class='add'>+			pins-are-numbered;</div><div class='add'>+</div><div class='add'>+			gpioa: gpio@40020000 {</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0x0 0x400&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 256&gt;;</div><div class='add'>+				st,bank-name = "GPIOA";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpiob: gpio@40020400 {</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0x400 0x400&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 257&gt;;</div><div class='add'>+				st,bank-name = "GPIOB";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpioc: gpio@40020800 {</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0x800 0x400&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 258&gt;;</div><div class='add'>+				st,bank-name = "GPIOC";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpiod: gpio@40020c00 {</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0xc00 0x400&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 259&gt;;</div><div class='add'>+				st,bank-name = "GPIOD";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpioe: gpio@40021000 {</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0x1000 0x400&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 260&gt;;</div><div class='add'>+				st,bank-name = "GPIOE";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpiof: gpio@40021400 {</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0x1400 0x400&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 261&gt;;</div><div class='add'>+				st,bank-name = "GPIOF";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpiog: gpio@40021800 {</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0x1800 0x400&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 262&gt;;</div><div class='add'>+				st,bank-name = "GPIOG";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpioh: gpio@40021c00 {</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0x1c00 0x400&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 263&gt;;</div><div class='add'>+				st,bank-name = "GPIOH";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpioi: gpio@40022000 {</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0x2000 0x400&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 264&gt;;</div><div class='add'>+				st,bank-name = "GPIOI";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpioj: gpio@40022400 {</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0x2400 0x400&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 265&gt;;</div><div class='add'>+				st,bank-name = "GPIOJ";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gpiok: gpio@40022800 {</div><div class='add'>+				gpio-controller;</div><div class='add'>+				#gpio-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0x2800 0x400&gt;;</div><div class='add'>+				clocks = &lt;&amp;rcc 0 266&gt;;</div><div class='add'>+				st,bank-name = "GPIOK";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			usart1_pins_a: usart1@0 {</div><div class='add'>+				pins1 {</div><div class='add'>+					pinmux = &lt;STM32F746_PA9_FUNC_USART1_TX&gt;;</div><div class='add'>+					bias-disable;</div><div class='add'>+					drive-push-pull;</div><div class='add'>+					slew-rate = &lt;0&gt;;</div><div class='add'>+				};</div><div class='add'>+				pins2 {</div><div class='add'>+					pinmux = &lt;STM32F746_PA10_FUNC_USART1_RX&gt;;</div><div class='add'>+					bias-disable;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rcc: rcc@40023800 {</div><div class='add'>+			#clock-cells = &lt;2&gt;;</div><div class='add'>+			compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";</div><div class='add'>+			reg = &lt;0x40023800 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;clk_hse&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;systick {</div><div class='add'>+	clocks = &lt;&amp;rcc 1 0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts<br/>index 39e368ec3428..f3fc27412a67 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-a1000.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-a1000.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-a1000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-a1000.dts</a></div><div class='hunk'>@@ -117,6 +117,10 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;cpu0 {</div><div class='add'>+	cpu-supply = &lt;&amp;reg_dcdc2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;ehci0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -186,20 +190,43 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	emac_power_pin_a1000: emac_power_pin@0 {</div><div class='del'>-		allwinner,pins = "PH15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH15";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_a1000: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH10", "PH20";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH10", "PH20";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#include "axp209.dtsi"</div><div class='add'>+</div><div class='add'>+&amp;reg_dcdc2 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1400000&gt;;</div><div class='add'>+	regulator-name = "vdd-cpu";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_dcdc3 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1250000&gt;;</div><div class='add'>+	regulator-name = "vdd-int-dll";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo1 {</div><div class='add'>+	regulator-name = "vdd-rtc";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo2 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;3000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+	regulator-name = "avcc";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;reg_usb1_vbus {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts<br/>index 5f98582232d6..942d739a4384 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts</a></div><div class='hunk'>@@ -127,7 +127,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb2_vbus_pin_a: usb2_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH12";</div><div class='add'>+		pins = "PH12";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts<br/>index 023b03efa5ff..17f8c5ec011c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts</a></div><div class='hunk'>@@ -142,17 +142,15 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts<br/>index 710e2ef516a8..04e040e6233d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-cubieboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-cubieboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-cubieboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-cubieboard.dts</a></div><div class='hunk'>@@ -165,17 +165,15 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_cubieboard: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH20", "PH21";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH20", "PH21";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts<br/>index 893497e397da..8317fbfeec4a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts</a></div><div class='hunk'>@@ -178,45 +178,35 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	bl_en_pin_dsrv9703c: bl_en_pin@0 {</div><div class='del'>-		allwinner,pins = "PH7";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH7";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	codec_pa_pin: codec_pa_pin@0 {</div><div class='del'>-		allwinner,pins = "PH15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH15";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	motor_pins: motor_pins@0 {</div><div class='del'>-		allwinner,pins = "PB3";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB3";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	touchscreen_pins: touchscreen_pins@0 {</div><div class='del'>-		allwinner,pins = "PB13";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB13";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts<br/>index ac64781a0a9c..9616cdecce93 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-gemei-g9.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-gemei-g9.dts</a></div><div class='hunk'>@@ -156,10 +156,8 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	codec_pa_pin: codec_pa_pin@0 {</div><div class='del'>-		allwinner,pins = "PH15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH15";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts<br/>index 6de83a6187d0..a48b46474417 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-hackberry.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-hackberry.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-hackberry.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-hackberry.dts</a></div><div class='hunk'>@@ -129,17 +129,13 @@</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;hackberry_hogs&gt;;</div><div class='ctx'> </div><div class='ctx'> 	hackberry_hogs: hogs@0 {</div><div class='del'>-		allwinner,pins = "PH19";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH19";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb2_vbus_pin_hackberry: usb2_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH12";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH12";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts<br/>index 9103864fef90..85dcf81ab64e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts</a></div><div class='hunk'>@@ -93,17 +93,15 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -123,7 +121,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb2_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PH6";</div><div class='add'>+	pins = "PH6";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb_otg {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts<br/>index e09053bf5e1f..f3092703a1a6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-inet1.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-inet1.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-inet1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-inet1.dts</a></div><div class='hunk'>@@ -180,31 +180,25 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	bl_en_pin_inet: bl_en_pin@0 {</div><div class='del'>-		allwinner,pins = "PH7";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH7";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	touchscreen_wake_pin: touchscreen_wake_pin@0 {</div><div class='del'>-		allwinner,pins = "PB13";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB13";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts<br/>index 04b0d2d1ae6c..a1a2bbb3f9d3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-inet97fv2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-inet97fv2.dts</a></div><div class='hunk'>@@ -161,17 +161,15 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts<br/>index bba4f9cf9bf5..4ef2a60a8cd4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts</a></div><div class='hunk'>@@ -320,28 +320,25 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	key_pins_inet9f: key_pins@0 {</div><div class='del'>-		allwinner,pins = "PA0", "PA1", "PA3", "PA4",</div><div class='del'>-				 "PA5", "PA6", "PA8", "PA9",</div><div class='del'>-				 "PA11", "PA12", "PA13",</div><div class='del'>-				 "PA14", "PA15", "PA16", "PA17",</div><div class='del'>-				 "PH22", "PH23", "PH24", "PH25", "PH26";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PA0", "PA1", "PA3", "PA4",</div><div class='add'>+		       "PA5", "PA6", "PA8", "PA9",</div><div class='add'>+		       "PA11", "PA12", "PA13",</div><div class='add'>+		       "PA14", "PA15", "PA16", "PA17",</div><div class='add'>+		       "PH22", "PH23", "PH24", "PH25", "PH26";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts<br/>index e28f080b1fd5..fc4d4d49e2e2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts</a></div><div class='hunk'>@@ -163,17 +163,13 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	emac_power_pin_q5: emac_power_pin@0 {</div><div class='del'>-		allwinner,pins = "PH19";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH19";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_q5: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH20";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH20";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts<br/>index 8e50723dbe02..a2885039d5f1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-marsboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-marsboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-marsboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-marsboard.dts</a></div><div class='hunk'>@@ -164,17 +164,14 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_marsboard: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PB5", "PB6", "PB7", "PB8";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB5", "PB6", "PB7", "PB8";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts<br/>index a7dd86d30fa2..af42ebb3a97b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-mini-xplus.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-mini-xplus.dts</a></div><div class='hunk'>@@ -93,7 +93,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;ir0_rx_pins_a {</div><div class='ctx'> 	/* The ir receiver is not always populated */</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc0 {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-mk802.dts b/arch/arm/boot/dts/sun4i-a10-mk802.dts<br/>index ee46ea854832..9c1afd4277d7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-mk802.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-mk802.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-mk802.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-mk802.dts</a></div><div class='hunk'>@@ -91,24 +91,18 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb2_vbus_pin_mk802: usb2_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH12";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH12";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts<br/>index b350448c7217..214a5accfe93 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts</a></div><div class='hunk'>@@ -168,31 +168,26 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {</div><div class='del'>-		allwinner,pins = "PC3";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PC3";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_olinuxinolime: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH2";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts<br/>index 39034aa8e1ae..b0365d63ba70 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-pcduino.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-pcduino.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-pcduino.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-pcduino.dts</a></div><div class='hunk'>@@ -170,24 +170,19 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_pcduino: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH15", "PH16";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH15", "PH16";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	key_pins_pcduino: key_pins@0 {</div><div class='del'>-		allwinner,pins = "PH17", "PH18", "PH19";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH17", "PH18", "PH19";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino2.dts b/arch/arm/boot/dts/sun4i-a10-pcduino2.dts<br/>index de483a1bf36a..811d00ee2ade 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-pcduino2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-pcduino2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-pcduino2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-pcduino2.dts</a></div><div class='hunk'>@@ -57,10 +57,8 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb2_vbus_pin_pcduino2: usb2_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PD2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PD2";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts<br/>index 918f97294b33..bfa6bbdaab27 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts</a></div><div class='hunk'>@@ -164,38 +164,30 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	bl_en_pin_protab: bl_en_pin@0 {</div><div class='del'>-		allwinner,pins = "PH7";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH7";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	codec_pa_pin: codec_pa_pin@0 {</div><div class='del'>-		allwinner,pins = "PH15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH15";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	touchscreen_pins: touchscreen_pins@0 {</div><div class='del'>-		allwinner,pins = "PA5", "PB13";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PA5", "PB13";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi<br/>index 7e7dfc2b43db..ba20b48c0702 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun4i-a10.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun4i-a10.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun4i-a10.dtsi</a></div><div class='hunk'>@@ -967,197 +967,150 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-pinctrl";</div><div class='ctx'> 			reg = &lt;0x01c20800 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;28&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 5&gt;;</div><div class='add'>+			clocks = &lt;&amp;apb0_gates 5&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			emac_pins_a: emac0@0 {</div><div class='del'>-				allwinner,pins = "PA0", "PA1", "PA2",</div><div class='del'>-						"PA3", "PA4", "PA5", "PA6",</div><div class='del'>-						"PA7", "PA8", "PA9", "PA10",</div><div class='del'>-						"PA11", "PA12", "PA13", "PA14",</div><div class='del'>-						"PA15", "PA16";</div><div class='del'>-				allwinner,function = "emac";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PA0", "PA1", "PA2",</div><div class='add'>+				       "PA3", "PA4", "PA5", "PA6",</div><div class='add'>+				       "PA7", "PA8", "PA9", "PA10",</div><div class='add'>+				       "PA11", "PA12", "PA13", "PA14",</div><div class='add'>+				       "PA15", "PA16";</div><div class='add'>+				function = "emac";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c0_pins_a: i2c0@0 {</div><div class='del'>-				allwinner,pins = "PB0", "PB1";</div><div class='del'>-				allwinner,function = "i2c0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB0", "PB1";</div><div class='add'>+				function = "i2c0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c1_pins_a: i2c1@0 {</div><div class='del'>-				allwinner,pins = "PB18", "PB19";</div><div class='del'>-				allwinner,function = "i2c1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB18", "PB19";</div><div class='add'>+				function = "i2c1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c2_pins_a: i2c2@0 {</div><div class='del'>-				allwinner,pins = "PB20", "PB21";</div><div class='del'>-				allwinner,function = "i2c2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB20", "PB21";</div><div class='add'>+				function = "i2c2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ir0_rx_pins_a: ir0@0 {</div><div class='del'>-				allwinner,pins = "PB4";</div><div class='del'>-				allwinner,function = "ir0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB4";</div><div class='add'>+				function = "ir0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ir0_tx_pins_a: ir0@1 {</div><div class='del'>-				allwinner,pins = "PB3";</div><div class='del'>-				allwinner,function = "ir0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB3";</div><div class='add'>+				function = "ir0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ir1_rx_pins_a: ir1@0 {</div><div class='del'>-				allwinner,pins = "PB23";</div><div class='del'>-				allwinner,function = "ir1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB23";</div><div class='add'>+				function = "ir1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ir1_tx_pins_a: ir1@1 {</div><div class='del'>-				allwinner,pins = "PB22";</div><div class='del'>-				allwinner,function = "ir1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB22";</div><div class='add'>+				function = "ir1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc0_pins_a: mmc0@0 {</div><div class='del'>-				allwinner,pins = "PF0", "PF1", "PF2",</div><div class='del'>-						 "PF3", "PF4", "PF5";</div><div class='del'>-				allwinner,function = "mmc0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PF0", "PF1", "PF2",</div><div class='add'>+				       "PF3", "PF4", "PF5";</div><div class='add'>+				function = "mmc0";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {</div><div class='del'>-				allwinner,pins = "PH1";</div><div class='del'>-				allwinner,function = "gpio_in";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+				pins = "PH1";</div><div class='add'>+				function = "gpio_in";</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ps20_pins_a: ps20@0 {</div><div class='del'>-				allwinner,pins = "PI20", "PI21";</div><div class='del'>-				allwinner,function = "ps2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI20", "PI21";</div><div class='add'>+				function = "ps2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ps21_pins_a: ps21@0 {</div><div class='del'>-				allwinner,pins = "PH12", "PH13";</div><div class='del'>-				allwinner,function = "ps2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PH12", "PH13";</div><div class='add'>+				function = "ps2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			pwm0_pins_a: pwm0@0 {</div><div class='del'>-				allwinner,pins = "PB2";</div><div class='del'>-				allwinner,function = "pwm";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB2";</div><div class='add'>+				function = "pwm";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			pwm1_pins_a: pwm1@0 {</div><div class='del'>-				allwinner,pins = "PI3";</div><div class='del'>-				allwinner,function = "pwm";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI3";</div><div class='add'>+				function = "pwm";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spdif_tx_pins_a: spdif@0 {</div><div class='del'>-				allwinner,pins = "PB13";</div><div class='del'>-				allwinner,function = "spdif";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+				pins = "PB13";</div><div class='add'>+				function = "spdif";</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi0_pins_a: spi0@0 {</div><div class='del'>-				allwinner,pins = "PI11", "PI12", "PI13";</div><div class='del'>-				allwinner,function = "spi0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI11", "PI12", "PI13";</div><div class='add'>+				function = "spi0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi0_cs0_pins_a: spi0_cs0@0 {</div><div class='del'>-				allwinner,pins = "PI10";</div><div class='del'>-				allwinner,function = "spi0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI10";</div><div class='add'>+				function = "spi0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi1_pins_a: spi1@0 {</div><div class='del'>-				allwinner,pins = "PI17", "PI18", "PI19";</div><div class='del'>-				allwinner,function = "spi1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI17", "PI18", "PI19";</div><div class='add'>+				function = "spi1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi1_cs0_pins_a: spi1_cs0@0 {</div><div class='del'>-				allwinner,pins = "PI16";</div><div class='del'>-				allwinner,function = "spi1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI16";</div><div class='add'>+				function = "spi1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi2_pins_a: spi2@0 {</div><div class='del'>-				allwinner,pins = "PC20", "PC21", "PC22";</div><div class='del'>-				allwinner,function = "spi2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PC20", "PC21", "PC22";</div><div class='add'>+				function = "spi2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi2_pins_b: spi2@1 {</div><div class='del'>-				allwinner,pins = "PB15", "PB16", "PB17";</div><div class='del'>-				allwinner,function = "spi2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB15", "PB16", "PB17";</div><div class='add'>+				function = "spi2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi2_cs0_pins_a: spi2_cs0@0 {</div><div class='del'>-				allwinner,pins = "PC19";</div><div class='del'>-				allwinner,function = "spi2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PC19";</div><div class='add'>+				function = "spi2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi2_cs0_pins_b: spi2_cs0@1 {</div><div class='del'>-				allwinner,pins = "PB14";</div><div class='del'>-				allwinner,function = "spi2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB14";</div><div class='add'>+				function = "spi2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart0_pins_a: uart0@0 {</div><div class='del'>-				allwinner,pins = "PB22", "PB23";</div><div class='del'>-				allwinner,function = "uart0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB22", "PB23";</div><div class='add'>+				function = "uart0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart0_pins_b: uart0@1 {</div><div class='del'>-				allwinner,pins = "PF2", "PF4";</div><div class='del'>-				allwinner,function = "uart0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PF2", "PF4";</div><div class='add'>+				function = "uart0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart1_pins_a: uart1@0 {</div><div class='del'>-				allwinner,pins = "PA10", "PA11";</div><div class='del'>-				allwinner,function = "uart1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PA10", "PA11";</div><div class='add'>+				function = "uart1";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts<br/>index d4ad02182353..a539b72ce093 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts</a></div><div class='hunk'>@@ -109,17 +109,15 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_t003: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG1";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG1";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_t003: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PB2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB2";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -140,11 +138,11 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb0_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PG13";</div><div class='add'>+	pins = "PG13";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb1_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PB10";</div><div class='add'>+	pins = "PB10";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb_otg {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts<br/>index 2150e15e115a..e1b5e8a446fe 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts</a></div><div class='hunk'>@@ -130,31 +130,26 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG12";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG12";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_t004: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG1";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG1";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc1_vcc_en_pin_t004: mmc1_vcc_en_pin@0 {</div><div class='del'>-		allwinner,pins = "PB18";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB18";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_t004: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PB2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB2";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -175,7 +170,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb1_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PG13";</div><div class='add'>+	pins = "PG13";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbphy {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts<br/>index c84ac005342e..020aa9d6c31d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-mk802.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a10s-mk802.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-mk802.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-mk802.dts</a></div><div class='hunk'>@@ -116,24 +116,19 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_mk802: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PB2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB2";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_mk802: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG1";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG1";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_mk802: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PB10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB10";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts<br/>index aef91476f9ae..d8245c6314a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts</a></div><div class='hunk'>@@ -202,38 +202,32 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG1";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG1";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG13";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG13";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_olinuxino: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PE3";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PE3";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PB10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB10";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG12";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG12";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -250,8 +244,8 @@</div><div class='ctx'> </div><div class='ctx'> &amp;spi2 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;spi2_pins_a&gt;,</div><div class='del'>-		    &lt;&amp;spi2_cs0_pins_a&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi2_pins_b&gt;,</div><div class='add'>+		    &lt;&amp;spi2_cs0_pins_b&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -279,7 +273,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb0_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PG11";</div><div class='add'>+	pins = "PG11";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbphy {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts<br/>index 3b057983c74a..51371f9b1cf0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts</a></div><div class='hunk'>@@ -101,24 +101,20 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_r7: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG1";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG1";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_r7: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PB2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB2";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_r7: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PG13";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG13";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts<br/>index b5de75f4c710..2b8adda0deda 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts</a></div><div class='hunk'>@@ -146,24 +146,19 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_wobo_i5: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PB2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB2";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PB3";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PB3";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	emac_power_pin_wobo: emac_power_pin@0 {</div><div class='del'>-		allwinner,pins = "PA02";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PA02";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +218,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb1_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PG12";</div><div class='add'>+	pins = "PG12";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbphy {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi<br/>index c41a2ba34dde..24b0f5f556f8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a10s.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a10s.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a10s.dtsi</a></div><div class='hunk'>@@ -65,8 +65,9 @@</div><div class='ctx'> 			compatible = "allwinner,simple-framebuffer",</div><div class='ctx'> 				     "simple-framebuffer";</div><div class='ctx'> 			allwinner,pipeline = "de_be0-lcd0-hdmi";</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;, &lt;&amp;pll5 1&gt;, &lt;&amp;ahb_gates 36&gt;,</div><div class='del'>-				 &lt;&amp;ahb_gates 43&gt;, &lt;&amp;ahb_gates 44&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_LCD&gt;, &lt;&amp;ccu CLK_AHB_HDMI&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_AHB_DE_BE&gt;, &lt;&amp;ccu CLK_DRAM_DE_BE&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_DE_BE&gt;, &lt;&amp;ccu CLK_HDMI&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -74,8 +75,8 @@</div><div class='ctx'> 			compatible = "allwinner,simple-framebuffer",</div><div class='ctx'> 				     "simple-framebuffer";</div><div class='ctx'> 			allwinner,pipeline = "de_be0-lcd0";</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;, &lt;&amp;pll5 1&gt;, &lt;&amp;ahb_gates 36&gt;,</div><div class='del'>-				 &lt;&amp;ahb_gates 44&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_LCD&gt;, &lt;&amp;ccu CLK_AHB_DE_BE&gt;, &lt;&amp;ccu CLK_DE_BE&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_TCON_CH0&gt;, &lt;&amp;ccu CLK_DRAM_DE_BE&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -83,77 +84,19 @@</div><div class='ctx'> 			compatible = "allwinner,simple-framebuffer",</div><div class='ctx'> 				     "simple-framebuffer";</div><div class='ctx'> 			allwinner,pipeline = "de_be0-lcd0-tve0";</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;, &lt;&amp;pll5 1&gt;, &lt;&amp;ahb_gates 34&gt;,</div><div class='del'>-				 &lt;&amp;ahb_gates 36&gt;, &lt;&amp;ahb_gates 44&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_TVE&gt;, &lt;&amp;ccu CLK_AHB_LCD&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_AHB_DE_BE&gt;, &lt;&amp;ccu CLK_DE_BE&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_TCON_CH1&gt;, &lt;&amp;ccu CLK_DRAM_DE_BE&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	clocks {</div><div class='del'>-		ahb_gates: clk@01c20060 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a10s-ahb-gates-clk";</div><div class='del'>-			reg = &lt;0x01c20060 0x8&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;1&gt;,</div><div class='del'>-					&lt;2&gt;, &lt;5&gt;, &lt;6&gt;,</div><div class='del'>-					&lt;7&gt;, &lt;8&gt;, &lt;9&gt;,</div><div class='del'>-					&lt;10&gt;, &lt;13&gt;,</div><div class='del'>-					&lt;14&gt;, &lt;17&gt;, &lt;18&gt;,</div><div class='del'>-					&lt;20&gt;, &lt;21&gt;, &lt;22&gt;,</div><div class='del'>-					&lt;26&gt;, &lt;28&gt;, &lt;32&gt;,</div><div class='del'>-					&lt;34&gt;, &lt;36&gt;, &lt;40&gt;,</div><div class='del'>-					&lt;43&gt;, &lt;44&gt;,</div><div class='del'>-					&lt;46&gt;, &lt;51&gt;,</div><div class='del'>-					&lt;52&gt;;</div><div class='del'>-			clock-output-names = "ahb_usbotg", "ahb_ehci",</div><div class='del'>-					     "ahb_ohci", "ahb_ss", "ahb_dma",</div><div class='del'>-					     "ahb_bist", "ahb_mmc0", "ahb_mmc1",</div><div class='del'>-					     "ahb_mmc2", "ahb_nand",</div><div class='del'>-					     "ahb_sdram", "ahb_emac", "ahb_ts",</div><div class='del'>-					     "ahb_spi0", "ahb_spi1", "ahb_spi2",</div><div class='del'>-					     "ahb_gps", "ahb_stimer", "ahb_ve",</div><div class='del'>-					     "ahb_tve", "ahb_lcd", "ahb_csi",</div><div class='del'>-					     "ahb_hdmi", "ahb_de_be",</div><div class='del'>-					     "ahb_de_fe", "ahb_iep",</div><div class='del'>-					     "ahb_mali400";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb0_gates: clk@01c20068 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a10s-apb0-gates-clk";</div><div class='del'>-			reg = &lt;0x01c20068 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;3&gt;,</div><div class='del'>-					&lt;5&gt;, &lt;6&gt;,</div><div class='del'>-					&lt;10&gt;;</div><div class='del'>-			clock-output-names = "apb0_codec", "apb0_iis",</div><div class='del'>-					     "apb0_pio", "apb0_ir",</div><div class='del'>-					     "apb0_keypad";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb1_gates: clk@01c2006c {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a10s-apb1-gates-clk";</div><div class='del'>-			reg = &lt;0x01c2006c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;1&gt;,</div><div class='del'>-					&lt;2&gt;, &lt;16&gt;,</div><div class='del'>-					&lt;17&gt;, &lt;18&gt;,</div><div class='del'>-					&lt;19&gt;;</div><div class='del'>-			clock-output-names = "apb1_i2c0", "apb1_i2c1",</div><div class='del'>-					     "apb1_i2c2", "apb1_uart0",</div><div class='del'>-					     "apb1_uart1", "apb1_uart2",</div><div class='del'>-					     "apb1_uart3";</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	soc@01c00000 {</div><div class='ctx'> 		emac: ethernet@01c0b000 {</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-emac";</div><div class='ctx'> 			reg = &lt;0x01c0b000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;55&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 17&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_EMAC&gt;;</div><div class='ctx'> 			allwinner,sram = &lt;&amp;emac_sram 1&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -169,7 +112,7 @@</div><div class='ctx'> 		pwm: pwm@01c20e00 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a10s-pwm";</div><div class='ctx'> 			reg = &lt;0x01c20e00 0xc&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_HOSC&gt;;</div><div class='ctx'> 			#pwm-cells = &lt;3&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -180,7 +123,7 @@</div><div class='ctx'> 			interrupts = &lt;1&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 16&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_UART0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -190,71 +133,62 @@</div><div class='ctx'> 			interrupts = &lt;3&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 18&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_UART2&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;ccu {</div><div class='add'>+	compatible = "allwinner,sun5i-a10s-ccu";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	compatible = "allwinner,sun5i-a10s-pinctrl";</div><div class='ctx'> </div><div class='ctx'> 	uart0_pins_a: uart0@0 {</div><div class='del'>-		allwinner,pins = "PB19", "PB20";</div><div class='del'>-		allwinner,function = "uart0";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB19", "PB20";</div><div class='add'>+		function = "uart0";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	uart2_pins_a: uart2@0 {</div><div class='del'>-		allwinner,pins = "PC18", "PC19";</div><div class='del'>-		allwinner,function = "uart2";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PC18", "PC19";</div><div class='add'>+		function = "uart2";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	emac_pins_a: emac0@0 {</div><div class='del'>-		allwinner,pins = "PA0", "PA1", "PA2",</div><div class='add'>+		pins = "PA0", "PA1", "PA2",</div><div class='ctx'> 				"PA3", "PA4", "PA5", "PA6",</div><div class='ctx'> 				"PA7", "PA8", "PA9", "PA10",</div><div class='ctx'> 				"PA11", "PA12", "PA13", "PA14",</div><div class='ctx'> 				"PA15", "PA16";</div><div class='del'>-		allwinner,function = "emac";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		function = "emac";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	emac_pins_b: emac0@1 {</div><div class='del'>-		allwinner,pins = "PD6", "PD7", "PD10",</div><div class='add'>+		pins = "PD6", "PD7", "PD10",</div><div class='ctx'> 				"PD11", "PD12", "PD13", "PD14",</div><div class='ctx'> 				"PD15", "PD18", "PD19", "PD20",</div><div class='ctx'> 				"PD21", "PD22", "PD23", "PD24",</div><div class='ctx'> 				"PD25", "PD26", "PD27";</div><div class='del'>-		allwinner,function = "emac";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		function = "emac";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc1_pins_a: mmc1@0 {</div><div class='del'>-		allwinner,pins = "PG3", "PG4", "PG5",</div><div class='add'>+		pins = "PG3", "PG4", "PG5",</div><div class='ctx'> 				 "PG6", "PG7", "PG8";</div><div class='del'>-		allwinner,function = "mmc1";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		function = "mmc1";</div><div class='add'>+		drive-strength = &lt;30&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	spi2_pins_a: spi2@0 {</div><div class='del'>-		allwinner,pins = "PB12", "PB13", "PB14";</div><div class='del'>-		allwinner,function = "spi2";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+	spi2_pins_b: spi2@1 {</div><div class='add'>+		pins = "PB12", "PB13", "PB14";</div><div class='add'>+		function = "spi2";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	spi2_cs0_pins_a: spi2_cs0@0 {</div><div class='del'>-		allwinner,pins = "PB11";</div><div class='del'>-		allwinner,function = "spi2";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+	spi2_cs0_pins_b: spi2_cs0@1 {</div><div class='add'>+		pins = "PB11";</div><div class='add'>+		function = "spi2";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts<br/>index 6efbba6d40a9..42435454acef 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts</a></div><div class='hunk'>@@ -137,24 +137,21 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_d709: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG0";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG0";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG1";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PG1";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG2";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG2";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -212,7 +209,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb0_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PG12";</div><div class='add'>+	pins = "PG12";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbphy {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts<br/>index 3724b988064e..5879a75cf97a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a13-hsg-h702.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-hsg-h702.dts</a></div><div class='hunk'>@@ -136,24 +136,20 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_h702: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG0";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG0";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG2";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG2";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG1";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG1";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -208,7 +204,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb0_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PG12";</div><div class='add'>+	pins = "PG12";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbphy {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts b/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts<br/>new file mode 100644<br/>index 000000000000..566cda91a66b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13-licheepi-one.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-licheepi-one.dts</a></div><div class='hunk'>@@ -0,0 +1,224 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Icenowy Zheng &lt;icenowy@aosc.xyz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on sun5i-a13-olinuxino.dts, which is</div><div class='add'>+ *   Copyright 2012 Maxime Ripard &lt;maxime.ripard@free-electrons.com&gt;</div><div class='add'>+ *   Copyright 2013 Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "sun5i-a13.dtsi"</div><div class='add'>+#include "sunxi-common-regulators.dtsi"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include &lt;dt-bindings/pinctrl/sun4i-a10.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Lichee Pi One";</div><div class='add'>+	compatible = "licheepi,licheepi-one", "allwinner,sun5i-a13";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		red {</div><div class='add'>+			label ="licheepi:red:usr";</div><div class='add'>+			gpios = &lt;&amp;pio 2 5 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		green {</div><div class='add'>+			label ="licheepi:green:usr";</div><div class='add'>+			gpios = &lt;&amp;pio 2 19 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			default-state = "on";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		blue {</div><div class='add'>+			label ="licheepi:blue:usr";</div><div class='add'>+			gpios = &lt;&amp;pio 2 4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpu0 {</div><div class='add'>+	cpu-supply = &lt;&amp;reg_dcdc2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ehci0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c0_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	axp209: pmic@34 {</div><div class='add'>+		compatible = "x-powers,axp209";</div><div class='add'>+		reg = &lt;0x34&gt;;</div><div class='add'>+		interrupts = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_pins_a&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c2_pins_a&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;lradc {</div><div class='add'>+	vref-supply = &lt;&amp;reg_ldo2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	button@984 {</div><div class='add'>+		label = "Home";</div><div class='add'>+		linux,code = &lt;KEY_HOMEPAGE&gt;;</div><div class='add'>+		channel = &lt;0&gt;;</div><div class='add'>+		voltage = &lt;984126&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc0_pins_a&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	broken-cd;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc2_4bit_pins_a&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	broken-cd;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ohci0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;otg_sram {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#include "axp209.dtsi"</div><div class='add'>+</div><div class='add'>+&amp;reg_dcdc2 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1500000&gt;;</div><div class='add'>+	regulator-name = "vdd-cpu";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_dcdc3 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1400000&gt;;</div><div class='add'>+	regulator-name = "vdd-int-dll";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo1 {</div><div class='add'>+	regulator-name = "vdd-rtc";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo2 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;3000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+	regulator-name = "avcc";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo3 {</div><div class='add'>+	regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	regulator-name = "csi-1.8v";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo4 {</div><div class='add'>+	regulator-min-microvolt = &lt;2800000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+	regulator-name = "csi-2.8v";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_usb0_vbus {</div><div class='add'>+	gpio = &lt;&amp;pio 2 12 GPIO_ACTIVE_HIGH&gt;; /* PC12 */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart1_pins_b&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_otg {</div><div class='add'>+	dr_mode = "otg";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	usb0_id_det-gpio = &lt;&amp;pio 6 2 GPIO_ACTIVE_HIGH&gt;; /* PG2 */</div><div class='add'>+	usb0_vbus_det-gpio = &lt;&amp;pio 6 1 GPIO_ACTIVE_HIGH&gt;; /* PG1 */</div><div class='add'>+	usb0_vbus-supply = &lt;&amp;reg_usb0_vbus&gt;;</div><div class='add'>+	usb1_vbus-supply = &lt;&amp;reg_vcc5v0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts<br/>index 081329e2b80b..60e393e28783 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts</a></div><div class='hunk'>@@ -115,45 +115,37 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG0";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG0";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_olinuxinom: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PG9";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG9";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG2";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG2";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG1";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PG1";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_pin_olinuxinom: usb0_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PG12";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG12";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_olinuxinom: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PG11";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG11";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts<br/>index b3c234c65ea1..940d47e88056 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13-olinuxino.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a13-olinuxino.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13-olinuxino.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-olinuxino.dts</a></div><div class='hunk'>@@ -72,6 +72,47 @@</div><div class='ctx'> 			default-state = "on";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	bridge {</div><div class='add'>+		compatible = "dumb-vga-dac";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				vga_bridge_in: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;tcon0_out_vga&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+				vga_bridge_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;vga_con_in&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vga {</div><div class='add'>+		compatible = "vga-connector";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			vga_con_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;vga_bridge_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;be0 {</div><div class='add'>+	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ehci0 {</div><div class='hunk'>@@ -165,38 +206,32 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG0";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG0";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_olinuxino: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PG9";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG9";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG2";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG2";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG1";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PG1";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_olinuxino: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PG11";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG11";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -211,6 +246,19 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;tcon0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;lcd_rgb666_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tcon0_out {</div><div class='add'>+	tcon0_out_vga: endpoint@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		remote-endpoint = &lt;&amp;vga_bridge_in&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart1_pins_b&gt;;</div><div class='hunk'>@@ -223,7 +271,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb0_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PG12";</div><div class='add'>+	pins = "PG12";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbphy {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts<br/>index a8b0bcc04514..bfdd38d6bfcc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a13-utoo-p66.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13-utoo-p66.dts</a></div><div class='hunk'>@@ -80,23 +80,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;codec_pa_pin {</div><div class='del'>-	allwinner,pins = "PG3";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;i2c1 {</div><div class='del'>-	icn8318: touchscreen@40 {</div><div class='del'>-		compatible = "chipone,icn8318";</div><div class='del'>-		reg = &lt;0x40&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;pio&gt;;</div><div class='del'>-		interrupts = &lt;6 9 IRQ_TYPE_EDGE_FALLING&gt;; /* EINT9 (PG9) */</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;ts_wake_pin_p66&gt;;</div><div class='del'>-		wake-gpios = &lt;&amp;pio 1 3 GPIO_ACTIVE_HIGH&gt;; /* PB3 */</div><div class='del'>-		touchscreen-size-x = &lt;800&gt;;</div><div class='del'>-		touchscreen-size-y = &lt;480&gt;;</div><div class='del'>-		touchscreen-inverted-x;</div><div class='del'>-		touchscreen-swapped-x-y;</div><div class='del'>-	};</div><div class='add'>+	pins = "PG3";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc2 {</div><div class='hunk'>@@ -116,30 +100,35 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	i2c_lcd_pins: i2c_lcd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG10", "PG12";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	ts_wake_pin_p66: ts_wake_pin@0 {</div><div class='del'>-		allwinner,pins = "PB3";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG10", "PG12";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;reg_usb0_vbus {</div><div class='ctx'> 	gpio = &lt;&amp;pio 1 4 GPIO_ACTIVE_HIGH&gt;; /* PB4 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;touchscreen {</div><div class='add'>+	compatible = "chipone,icn8318";</div><div class='add'>+	reg = &lt;0x40&gt;;</div><div class='add'>+	/* The P66 uses a different EINT then the reference design */</div><div class='add'>+	interrupts = &lt;6 9 IRQ_TYPE_EDGE_FALLING&gt;; /* EINT9 (PG9) */</div><div class='add'>+	/* The icn8318 binding expects wake-gpios instead of power-gpios */</div><div class='add'>+	wake-gpios = &lt;&amp;pio 1 3 GPIO_ACTIVE_HIGH&gt;; /* PB3 */</div><div class='add'>+	touchscreen-size-x = &lt;800&gt;;</div><div class='add'>+	touchscreen-size-y = &lt;480&gt;;</div><div class='add'>+	touchscreen-inverted-x;</div><div class='add'>+	touchscreen-swapped-x-y;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart1 {</div><div class='ctx'> 	/* The P66 uses the uart pins as gpios */</div><div class='ctx'> 	status = "disabled";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb0_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PB4";</div><div class='add'>+	pins = "PB4";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi<br/>index a17ba0243db3..fb2ddb9a04c9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-a13.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-a13.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-a13.dtsi</a></div><div class='hunk'>@@ -61,8 +61,8 @@</div><div class='ctx'> 			compatible = "allwinner,simple-framebuffer",</div><div class='ctx'> 				     "simple-framebuffer";</div><div class='ctx'> 			allwinner,pipeline = "de_be0-lcd0";</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 36&gt;, &lt;&amp;ahb_gates 44&gt;, &lt;&amp;de_be_clk&gt;,</div><div class='del'>-				 &lt;&amp;tcon_ch0_clk&gt;, &lt;&amp;dram_gates 26&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_LCD&gt;, &lt;&amp;ccu CLK_AHB_DE_BE&gt;, &lt;&amp;ccu CLK_DE_BE&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_TCON_CH0&gt;, &lt;&amp;ccu CLK_DRAM_DE_BE&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -99,114 +99,6 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	clocks {</div><div class='del'>-		ahb_gates: clk@01c20060 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-ahb-gates-clk";</div><div class='del'>-			reg = &lt;0x01c20060 0x8&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;1&gt;,</div><div class='del'>-					&lt;2&gt;, &lt;5&gt;, &lt;6&gt;,</div><div class='del'>-					&lt;7&gt;, &lt;8&gt;, &lt;9&gt;,</div><div class='del'>-					&lt;10&gt;, &lt;13&gt;,</div><div class='del'>-					&lt;14&gt;, &lt;20&gt;,</div><div class='del'>-					&lt;21&gt;, &lt;22&gt;,</div><div class='del'>-					&lt;28&gt;, &lt;32&gt;, &lt;34&gt;,</div><div class='del'>-					&lt;36&gt;, &lt;40&gt;, &lt;44&gt;,</div><div class='del'>-					&lt;46&gt;, &lt;51&gt;,</div><div class='del'>-					&lt;52&gt;;</div><div class='del'>-			clock-output-names = "ahb_usbotg", "ahb_ehci",</div><div class='del'>-					     "ahb_ohci", "ahb_ss", "ahb_dma",</div><div class='del'>-					     "ahb_bist", "ahb_mmc0", "ahb_mmc1",</div><div class='del'>-					     "ahb_mmc2", "ahb_nand",</div><div class='del'>-					     "ahb_sdram", "ahb_spi0",</div><div class='del'>-					     "ahb_spi1", "ahb_spi2",</div><div class='del'>-					     "ahb_stimer", "ahb_ve", "ahb_tve",</div><div class='del'>-					     "ahb_lcd", "ahb_csi", "ahb_de_be",</div><div class='del'>-					     "ahb_de_fe", "ahb_iep",</div><div class='del'>-					     "ahb_mali400";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb0_gates: clk@01c20068 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-apb0-gates-clk";</div><div class='del'>-			reg = &lt;0x01c20068 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;5&gt;,</div><div class='del'>-					&lt;6&gt;;</div><div class='del'>-			clock-output-names = "apb0_codec", "apb0_pio",</div><div class='del'>-					     "apb0_ir";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb1_gates: clk@01c2006c {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-apb1-gates-clk";</div><div class='del'>-			reg = &lt;0x01c2006c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;1&gt;,</div><div class='del'>-					&lt;2&gt;, &lt;17&gt;,</div><div class='del'>-					&lt;19&gt;;</div><div class='del'>-			clock-output-names = "apb1_i2c0", "apb1_i2c1",</div><div class='del'>-					     "apb1_i2c2", "apb1_uart1",</div><div class='del'>-					     "apb1_uart3";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dram_gates: clk@01c20100 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-dram-gates-clk",</div><div class='del'>-				     "allwinner,sun4i-a10-gates-clk";</div><div class='del'>-			reg = &lt;0x01c20100 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll5 0&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;,</div><div class='del'>-					&lt;1&gt;,</div><div class='del'>-					&lt;25&gt;,</div><div class='del'>-					&lt;26&gt;,</div><div class='del'>-					&lt;29&gt;,</div><div class='del'>-					&lt;31&gt;;</div><div class='del'>-			clock-output-names = "dram_ve",</div><div class='del'>-					     "dram_csi",</div><div class='del'>-					     "dram_de_fe",</div><div class='del'>-					     "dram_de_be",</div><div class='del'>-					     "dram_ace",</div><div class='del'>-					     "dram_iep";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		de_be_clk: clk@01c20104 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			#reset-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-display-clk";</div><div class='del'>-			reg = &lt;0x01c20104 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;, &lt;&amp;pll7&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "de-be";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		de_fe_clk: clk@01c2010c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			#reset-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-display-clk";</div><div class='del'>-			reg = &lt;0x01c2010c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;, &lt;&amp;pll7&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "de-fe";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		tcon_ch0_clk: clk@01c20118 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-tcon-ch0-clk";</div><div class='del'>-			reg = &lt;0x01c20118 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;, &lt;&amp;pll7&gt;, &lt;&amp;pll3x2&gt;, &lt;&amp;pll7x2&gt;;</div><div class='del'>-			clock-output-names = "tcon-ch0-sclk";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		tcon_ch1_clk: clk@01c2012c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-tcon-ch1-clk";</div><div class='del'>-			reg = &lt;0x01c2012c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;, &lt;&amp;pll7&gt;, &lt;&amp;pll3x2&gt;, &lt;&amp;pll7x2&gt;;</div><div class='del'>-			clock-output-names = "tcon-ch1-sclk";</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	display-engine {</div><div class='ctx'> 		compatible = "allwinner,sun5i-a13-display-engine";</div><div class='ctx'> 		allwinner,pipelines = &lt;&amp;fe0&gt;;</div><div class='hunk'>@@ -217,11 +109,11 @@</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-tcon";</div><div class='ctx'> 			reg = &lt;0x01c0c000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;44&gt;;</div><div class='del'>-			resets = &lt;&amp;tcon_ch0_clk 1&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_LCD&gt;;</div><div class='ctx'> 			reset-names = "lcd";</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 36&gt;,</div><div class='del'>-				 &lt;&amp;tcon_ch0_clk&gt;,</div><div class='del'>-				 &lt;&amp;tcon_ch1_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_LCD&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_TCON_CH0&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_TCON_CH1&gt;;</div><div class='ctx'> 			clock-names = "ahb",</div><div class='ctx'> 				      "tcon-ch0",</div><div class='ctx'> 				      "tcon-ch1";</div><div class='hunk'>@@ -254,7 +146,7 @@</div><div class='ctx'> 		pwm: pwm@01c20e00 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-pwm";</div><div class='ctx'> 			reg = &lt;0x01c20e00 0xc&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_HOSC&gt;;</div><div class='ctx'> 			#pwm-cells = &lt;3&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -263,11 +155,11 @@</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-display-frontend";</div><div class='ctx'> 			reg = &lt;0x01e00000 0x20000&gt;;</div><div class='ctx'> 			interrupts = &lt;47&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 46&gt;, &lt;&amp;de_fe_clk&gt;,</div><div class='del'>-				 &lt;&amp;dram_gates 25&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_DE_FE&gt;, &lt;&amp;ccu CLK_DE_FE&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_DRAM_DE_FE&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mod",</div><div class='ctx'> 				      "ram";</div><div class='del'>-			resets = &lt;&amp;de_fe_clk&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_DE_FE&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> </div><div class='ctx'> 			ports {</div><div class='hunk'>@@ -290,14 +182,14 @@</div><div class='ctx'> 		be0: display-backend@01e60000 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-display-backend";</div><div class='ctx'> 			reg = &lt;0x01e60000 0x10000&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 44&gt;, &lt;&amp;de_be_clk&gt;,</div><div class='del'>-				 &lt;&amp;dram_gates 26&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_DE_BE&gt;, &lt;&amp;ccu CLK_DE_BE&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_DRAM_DE_BE&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mod",</div><div class='ctx'> 				      "ram";</div><div class='del'>-			resets = &lt;&amp;de_be_clk&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_DE_BE&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> </div><div class='del'>-			assigned-clocks = &lt;&amp;de_be_clk&gt;;</div><div class='add'>+			assigned-clocks = &lt;&amp;ccu CLK_DE_BE&gt;;</div><div class='ctx'> 			assigned-clock-rates = &lt;300000000&gt;;</div><div class='ctx'> </div><div class='ctx'> 			ports {</div><div class='hunk'>@@ -330,6 +222,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;ccu {</div><div class='add'>+	compatible = "allwinner,sun5i-a13-ccu";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;cpu0 {</div><div class='ctx'> 	clock-latency = &lt;244144&gt;; /* 8 32k periods */</div><div class='ctx'> 	operating-points = &lt;</div><div class='hunk'>@@ -350,26 +246,20 @@</div><div class='ctx'> 	compatible = "allwinner,sun5i-a13-pinctrl";</div><div class='ctx'> </div><div class='ctx'> 	lcd_rgb666_pins: lcd_rgb666@0 {</div><div class='del'>-		allwinner,pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",</div><div class='del'>-				 "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",</div><div class='del'>-				 "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",</div><div class='del'>-				 "PD24", "PD25", "PD26", "PD27";</div><div class='del'>-		allwinner,function = "lcd0";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",</div><div class='add'>+		       "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",</div><div class='add'>+		       "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",</div><div class='add'>+		       "PD24", "PD25", "PD26", "PD27";</div><div class='add'>+		function = "lcd0";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	uart1_pins_a: uart1@0 {</div><div class='del'>-		allwinner,pins = "PE10", "PE11";</div><div class='del'>-		allwinner,function = "uart1";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PE10", "PE11";</div><div class='add'>+		function = "uart1";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	uart1_pins_b: uart1@1 {</div><div class='del'>-		allwinner,pins = "PG3", "PG4";</div><div class='del'>-		allwinner,function = "uart1";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG3", "PG4";</div><div class='add'>+		function = "uart1";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts<br/>new file mode 100644<br/>index 000000000000..0cf0813d363a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-gr8-chip-pro.dts</a></div><div class='hunk'>@@ -0,0 +1,262 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Free Electrons</div><div class='add'>+ * Copyright 2016 NextThing Co</div><div class='add'>+ *</div><div class='add'>+ * Maxime Ripard &lt;maxime.ripard@free-electrons.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "sun5i-gr8.dtsi"</div><div class='add'>+#include "sunxi-common-regulators.dtsi"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "NextThing C.H.I.P. Pro";</div><div class='add'>+	compatible = "nextthing,chip-pro", "nextthing,gr8";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		i2c0 = &amp;i2c0;</div><div class='add'>+		i2c1 = &amp;i2c1;</div><div class='add'>+		serial0 = &amp;uart1;</div><div class='add'>+		serial1 = &amp;uart2;</div><div class='add'>+		serial2 = &amp;uart3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		status {</div><div class='add'>+			label = "chip-pro:white:status";</div><div class='add'>+			gpios = &lt;&amp;axp_gpio 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "on";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mmc0_pwrseq: mmc0_pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;wifi_reg_on_pin_chip_pro&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;pio 1 10 GPIO_ACTIVE_LOW&gt;; /* PB10 */</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;codec {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ehci0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c0_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	axp209: pmic@34 {</div><div class='add'>+		reg = &lt;0x34&gt;;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		* The interrupt is routed through the "External Fast</div><div class='add'>+		* Interrupt Request" pin (ball G13 of the module)</div><div class='add'>+		* directly to the main interrupt controller, without</div><div class='add'>+		* any other controller interfering.</div><div class='add'>+		*/</div><div class='add'>+		interrupts = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#include "axp209.dtsi"</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_pins_a&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2s0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2s0_mclk_pins_a&gt;, &lt;&amp;i2s0_data_pins_a&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc0_pins_a&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	mmc-pwrseq = &lt;&amp;mmc0_pwrseq&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;nfc {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;nand_pins_a &amp;nand_cs0_pins_a &amp;nand_rb0_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	nand@0 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		allwinner,rb = &lt;0&gt;;</div><div class='add'>+		nand-ecc-mode = "hw";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ohci0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;otg_sram {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pio {</div><div class='add'>+	usb0_id_pin_chip_pro: usb0-id-pin@0 {</div><div class='add'>+		pins = "PG2";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wifi_reg_on_pin_chip_pro: wifi-reg-on-pin@0 {</div><div class='add'>+		pins = "PB10";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pwm0_pins_a&gt;, &lt;&amp;pwm1_pins&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_dcdc2 {</div><div class='add'>+	regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1400000&gt;;</div><div class='add'>+	regulator-name = "vdd-cpu";</div><div class='add'>+	regulator-always-on;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_dcdc3 {</div><div class='add'>+	regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1300000&gt;;</div><div class='add'>+	regulator-name = "vdd-sys";</div><div class='add'>+	regulator-always-on;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo1 {</div><div class='add'>+	regulator-name = "vdd-rtc";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo2 {</div><div class='add'>+	regulator-min-microvolt = &lt;2700000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-name = "avcc";</div><div class='add'>+	regulator-always-on;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Both LDO3 and LDO4 are used in parallel to power up the</div><div class='add'>+ * WiFi/BT chip.</div><div class='add'>+ */</div><div class='add'>+&amp;reg_ldo3 {</div><div class='add'>+	regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-name = "vcc-wifi-1";</div><div class='add'>+	regulator-always-on;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo4 {</div><div class='add'>+	regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-name = "vcc-wifi-2";</div><div class='add'>+	regulator-always-on;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart1_pins_a&gt;, &lt;&amp;uart1_cts_rts_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart2_pins_a&gt;, &lt;&amp;uart2_cts_rts_pins_a&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart3_pins_a&gt;, &lt;&amp;uart3_cts_rts_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_otg {</div><div class='add'>+	/*</div><div class='add'>+	 * The CHIP Pro doesn't have a controllable VBUS, nor does it</div><div class='add'>+	 * have any 5v rail on the board itself.</div><div class='add'>+	 *</div><div class='add'>+	 * If one wants to use it as a true OTG port, it should be</div><div class='add'>+	 * done in the baseboard, and its DT / overlay will add it.</div><div class='add'>+	 */</div><div class='add'>+	dr_mode = "otg";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_power_supply {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;usb0_id_pin_chip_pro&gt;;</div><div class='add'>+	usb0_id_det-gpio = &lt;&amp;pio 6 2 GPIO_ACTIVE_HIGH&gt;; /* PG2 */</div><div class='add'>+	usb0_vbus_power-supply = &lt;&amp;usb_power_supply&gt;;</div><div class='add'>+	usb1_vbus-supply = &lt;&amp;reg_vcc5v0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts<br/>index 714381fd64d7..1a845af4d4db 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-gr8-evb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-gr8-evb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-gr8-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-gr8-evb.dts</a></div><div class='hunk'>@@ -75,6 +75,39 @@</div><div class='ctx'> 		brightness-levels = &lt;0 10 20 30 40 50 60 70 80 90 100&gt;;</div><div class='ctx'> 		default-brightness-level = &lt;8&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	sound-analog {</div><div class='add'>+		compatible = "simple-audio-card";</div><div class='add'>+		simple-audio-card,name = "gr8-evb-wm8978";</div><div class='add'>+		simple-audio-card,format = "i2s";</div><div class='add'>+		simple-audio-card,mclk-fs = &lt;512&gt;;</div><div class='add'>+</div><div class='add'>+		simple-audio-card,cpu {</div><div class='add'>+			sound-dai = &lt;&amp;i2s0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		simple-audio-card,codec {</div><div class='add'>+			sound-dai = &lt;&amp;wm8978&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound-spdif {</div><div class='add'>+		compatible = "simple-audio-card";</div><div class='add'>+		simple-audio-card,name = "On-board SPDIF";</div><div class='add'>+</div><div class='add'>+		simple-audio-card,cpu {</div><div class='add'>+			sound-dai = &lt;&amp;spdif&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		simple-audio-card,codec {</div><div class='add'>+			sound-dai = &lt;&amp;spdif_out&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spdif_out: spdif-out {</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "linux,spdif-dit";</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;be0 {</div><div class='hunk'>@@ -226,31 +259,23 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_gr8_evb: mmc0-cd-pin@0 {</div><div class='del'>-		allwinner,pins = "PG0";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG0";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_pin_gr8_evb: usb0-id-pin@0 {</div><div class='del'>-		allwinner,pins = "PG2";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG2";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_det_pin_gr8_evb: usb0-vbus-det-pin@0 {</div><div class='del'>-		allwinner,pins = "PG1";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG1";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_gr8_evb: usb1-vbus-pin@0 {</div><div class='del'>-		allwinner,pins = "PG13";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG13";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-gr8.dtsi b/arch/arm/boot/dts/sun5i-gr8.dtsi<br/>index ca54e03ef366..cb9b2aaf7297 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-gr8.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-gr8.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-gr8.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-gr8.dtsi</a></div><div class='hunk'>@@ -42,9 +42,10 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;dt-bindings/clock/sun4i-a10-pll2.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/sun5i-ccu.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/dma/sun4i-a10.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/pinctrl/sun4i-a10.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun5i-ccu.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='hunk'>@@ -59,7 +60,7 @@</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a8";</div><div class='ctx'> 			reg = &lt;0x0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cpu&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_CPU&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -68,419 +69,19 @@</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		ranges;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * This is a dummy clock, to be used as placeholder on</div><div class='del'>-		 * other mux clocks when a specific parent clock is not</div><div class='del'>-		 * yet implemented. It should be dropped when the driver</div><div class='del'>-		 * is complete.</div><div class='del'>-		 */</div><div class='del'>-		dummy: dummy {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-clock";</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		osc24M: clk@01c20050 {</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-osc-clk";</div><div class='del'>-			reg = &lt;0x01c20050 0x4&gt;;</div><div class='add'>+			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;24000000&gt;;</div><div class='ctx'> 			clock-output-names = "osc24M";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		osc3M: osc3M-clk {</div><div class='del'>-			compatible = "fixed-factor-clock";</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			clock-div = &lt;8&gt;;</div><div class='del'>-			clock-mult = &lt;1&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "osc3M";</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		osc32k: clk@0 {</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;32768&gt;;</div><div class='ctx'> 			clock-output-names = "osc32k";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		pll1: clk@01c20000 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll1-clk";</div><div class='del'>-			reg = &lt;0x01c20000 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll1";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll2: clk@01c20008 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-pll2-clk";</div><div class='del'>-			reg = &lt;0x01c20008 0x8&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll2-1x", "pll2-2x",</div><div class='del'>-					     "pll2-4x", "pll2-8x";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll3: clk@01c20010 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll3-clk";</div><div class='del'>-			reg = &lt;0x01c20010 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc3M&gt;;</div><div class='del'>-			clock-output-names = "pll3";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll3x2: pll3x2-clk {</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll3-2x-clk";</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			clock-div = &lt;1&gt;;</div><div class='del'>-			clock-mult = &lt;2&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;;</div><div class='del'>-			clock-output-names = "pll3-2x";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll4: clk@01c20018 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll1-clk";</div><div class='del'>-			reg = &lt;0x01c20018 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll4";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll5: clk@01c20020 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll5-clk";</div><div class='del'>-			reg = &lt;0x01c20020 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll5_ddr", "pll5_other";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll6: clk@01c20028 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll6-clk";</div><div class='del'>-			reg = &lt;0x01c20028 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll6_sata", "pll6_other", "pll6";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll7: clk@01c20030 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll3-clk";</div><div class='del'>-			reg = &lt;0x01c20030 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc3M&gt;;</div><div class='del'>-			clock-output-names = "pll7";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll7x2: pll7x2-clk {</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll3-2x-clk";</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			clock-div = &lt;1&gt;;</div><div class='del'>-			clock-mult = &lt;2&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll7&gt;;</div><div class='del'>-			clock-output-names = "pll7-2x";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* dummy is 200M */</div><div class='del'>-		cpu: cpu@01c20054 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-cpu-clk";</div><div class='del'>-			reg = &lt;0x01c20054 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc32k&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;pll1&gt;, &lt;&amp;dummy&gt;;</div><div class='del'>-			clock-output-names = "cpu";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		axi: axi@01c20054 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-axi-clk";</div><div class='del'>-			reg = &lt;0x01c20054 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;cpu&gt;;</div><div class='del'>-			clock-output-names = "axi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ahb: ahb@01c20054 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-ahb-clk";</div><div class='del'>-			reg = &lt;0x01c20054 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;axi&gt;, &lt;&amp;cpu&gt;, &lt;&amp;pll6 1&gt;;</div><div class='del'>-			clock-output-names = "ahb";</div><div class='del'>-			/*</div><div class='del'>-			 * Use PLL6 as parent, instead of CPU/AXI</div><div class='del'>-			 * which has rate changes due to cpufreq</div><div class='del'>-			 */</div><div class='del'>-			assigned-clocks = &lt;&amp;ahb&gt;;</div><div class='del'>-			assigned-clock-parents = &lt;&amp;pll6 1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb0: apb0@01c20054 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-apb0-clk";</div><div class='del'>-			reg = &lt;0x01c20054 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb&gt;;</div><div class='del'>-			clock-output-names = "apb0";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb1: clk@01c20058 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-apb1-clk";</div><div class='del'>-			reg = &lt;0x01c20058 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;osc32k&gt;;</div><div class='del'>-			clock-output-names = "apb1";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		axi_gates: clk@01c2005c {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-gates-clk";</div><div class='del'>-			reg = &lt;0x01c2005c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;axi&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;;</div><div class='del'>-			clock-output-names = "axi_dram";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ahb_gates: clk@01c20060 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-ahb-gates-clk";</div><div class='del'>-			reg = &lt;0x01c20060 0x8&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;1&gt;,</div><div class='del'>-					&lt;2&gt;, &lt;5&gt;, &lt;6&gt;,</div><div class='del'>-					&lt;7&gt;, &lt;8&gt;, &lt;9&gt;,</div><div class='del'>-					&lt;10&gt;, &lt;13&gt;,</div><div class='del'>-					&lt;14&gt;, &lt;17&gt;, &lt;20&gt;,</div><div class='del'>-					&lt;21&gt;, &lt;22&gt;,</div><div class='del'>-					&lt;28&gt;, &lt;32&gt;, &lt;34&gt;,</div><div class='del'>-					&lt;36&gt;, &lt;40&gt;, &lt;44&gt;,</div><div class='del'>-					&lt;46&gt;, &lt;51&gt;,</div><div class='del'>-					&lt;52&gt;;</div><div class='del'>-			clock-output-names = "ahb_usbotg", "ahb_ehci",</div><div class='del'>-					     "ahb_ohci", "ahb_ss", "ahb_dma",</div><div class='del'>-					     "ahb_bist", "ahb_mmc0", "ahb_mmc1",</div><div class='del'>-					     "ahb_mmc2", "ahb_nand",</div><div class='del'>-					     "ahb_sdram", "ahb_emac", "ahb_spi0",</div><div class='del'>-					     "ahb_spi1", "ahb_spi2",</div><div class='del'>-					     "ahb_hstimer", "ahb_ve", "ahb_tve",</div><div class='del'>-					     "ahb_lcd", "ahb_csi", "ahb_de_be",</div><div class='del'>-					     "ahb_de_fe", "ahb_iep",</div><div class='del'>-					     "ahb_mali400";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb0_gates: clk@01c20068 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-gates-clk";</div><div class='del'>-			reg = &lt;0x01c20068 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;3&gt;,</div><div class='del'>-					&lt;5&gt;, &lt;6&gt;;</div><div class='del'>-			clock-output-names = "apb0_codec", "apb0_i2s0",</div><div class='del'>-					     "apb0_pio", "apb0_ir";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb1_gates: clk@01c2006c {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-gates-clk";</div><div class='del'>-			reg = &lt;0x01c2006c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;1&gt;,</div><div class='del'>-					&lt;2&gt;, &lt;17&gt;,</div><div class='del'>-					&lt;18&gt;, &lt;19&gt;;</div><div class='del'>-			clock-output-names = "apb1_i2c0", "apb1_i2c1",</div><div class='del'>-					     "apb1_i2c2", "apb1_uart1",</div><div class='del'>-					     "apb1_uart2", "apb1_uart3";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand_clk: clk@01c20080 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c20080 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "nand";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ms_clk: clk@01c20084 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c20084 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "ms";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc0_clk: clk@01c20088 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mmc-clk";</div><div class='del'>-			reg = &lt;0x01c20088 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "mmc0",</div><div class='del'>-					     "mmc0_output",</div><div class='del'>-					     "mmc0_sample";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc1_clk: clk@01c2008c {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mmc-clk";</div><div class='del'>-			reg = &lt;0x01c2008c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "mmc1",</div><div class='del'>-					     "mmc1_output",</div><div class='del'>-					     "mmc1_sample";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc2_clk: clk@01c20090 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mmc-clk";</div><div class='del'>-			reg = &lt;0x01c20090 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "mmc2",</div><div class='del'>-					     "mmc2_output",</div><div class='del'>-					     "mmc2_sample";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ts_clk: clk@01c20098 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c20098 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "ts";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ss_clk: clk@01c2009c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c2009c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "ss";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi0_clk: clk@01c200a0 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c200a0 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "spi0";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi1_clk: clk@01c200a4 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c200a4 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "spi1";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi2_clk: clk@01c200a8 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c200a8 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "spi2";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ir0_clk: clk@01c200b0 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c200b0 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "ir0";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2s0_clk: clk@01c200b8 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod1-clk";</div><div class='del'>-			reg = &lt;0x01c200b8 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll2 SUN4I_A10_PLL2_8X&gt;,</div><div class='del'>-				 &lt;&amp;pll2 SUN4I_A10_PLL2_4X&gt;,</div><div class='del'>-				 &lt;&amp;pll2 SUN4I_A10_PLL2_2X&gt;,</div><div class='del'>-				 &lt;&amp;pll2 SUN4I_A10_PLL2_1X&gt;;</div><div class='del'>-			clock-output-names = "i2s0";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spdif_clk: clk@01c200c0 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod1-clk";</div><div class='del'>-			reg = &lt;0x01c200c0 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll2 SUN4I_A10_PLL2_8X&gt;,</div><div class='del'>-				 &lt;&amp;pll2 SUN4I_A10_PLL2_4X&gt;,</div><div class='del'>-				 &lt;&amp;pll2 SUN4I_A10_PLL2_2X&gt;,</div><div class='del'>-				 &lt;&amp;pll2 SUN4I_A10_PLL2_1X&gt;;</div><div class='del'>-			clock-output-names = "spdif";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb_clk: clk@01c200cc {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-usb-clk";</div><div class='del'>-			reg = &lt;0x01c200cc 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll6 1&gt;;</div><div class='del'>-			clock-output-names = "usb_ohci0", "usb_phy";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dram_gates: clk@01c20100 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "nextthing,gr8-dram-gates-clk",</div><div class='del'>-				     "allwinner,sun4i-a10-gates-clk";</div><div class='del'>-			reg = &lt;0x01c20100 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll5 0&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;,</div><div class='del'>-					&lt;1&gt;,</div><div class='del'>-					&lt;25&gt;,</div><div class='del'>-					&lt;26&gt;,</div><div class='del'>-					&lt;29&gt;,</div><div class='del'>-					&lt;31&gt;;</div><div class='del'>-			clock-output-names = "dram_ve",</div><div class='del'>-					     "dram_csi",</div><div class='del'>-					     "dram_de_fe",</div><div class='del'>-					     "dram_de_be",</div><div class='del'>-					     "dram_ace",</div><div class='del'>-					     "dram_iep";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		de_be_clk: clk@01c20104 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			#reset-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-display-clk";</div><div class='del'>-			reg = &lt;0x01c20104 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;, &lt;&amp;pll7&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "de-be";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		de_fe_clk: clk@01c2010c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			#reset-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-display-clk";</div><div class='del'>-			reg = &lt;0x01c2010c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;, &lt;&amp;pll7&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "de-fe";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		tcon_ch0_clk: clk@01c20118 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-tcon-ch0-clk";</div><div class='del'>-			reg = &lt;0x01c20118 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;, &lt;&amp;pll7&gt;, &lt;&amp;pll3x2&gt;, &lt;&amp;pll7x2&gt;;</div><div class='del'>-			clock-output-names = "tcon-ch0-sclk";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		tcon_ch1_clk: clk@01c2012c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-tcon-ch1-clk";</div><div class='del'>-			reg = &lt;0x01c2012c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;, &lt;&amp;pll7&gt;, &lt;&amp;pll3x2&gt;, &lt;&amp;pll7x2&gt;;</div><div class='del'>-			clock-output-names = "tcon-ch1-sclk";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		codec_clk: clk@01c20140 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-codec-clk";</div><div class='del'>-			reg = &lt;0x01c20140 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll2 SUN4I_A10_PLL2_1X&gt;;</div><div class='del'>-			clock-output-names = "codec";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mbus_clk: clk@01c2015c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-mbus-clk";</div><div class='del'>-			reg = &lt;0x01c2015c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "mbus";</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	display-engine {</div><div class='hunk'>@@ -528,7 +129,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-dma";</div><div class='ctx'> 			reg = &lt;0x01c02000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;27&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 6&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_DMA&gt;;</div><div class='ctx'> 			#dma-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -536,7 +137,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-nand";</div><div class='ctx'> 			reg = &lt;0x01c03000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;37&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 13&gt;, &lt;&amp;nand_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_NAND&gt;, &lt;&amp;ccu CLK_NAND&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mod";</div><div class='ctx'> 			dmas = &lt;&amp;dma SUN4I_DMA_DEDICATED 3&gt;;</div><div class='ctx'> 			dma-names = "rxtx";</div><div class='hunk'>@@ -549,7 +150,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-spi";</div><div class='ctx'> 			reg = &lt;0x01c05000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;10&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 20&gt;, &lt;&amp;spi0_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_SPI0&gt;, &lt;&amp;ccu CLK_SPI0&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mod";</div><div class='ctx'> 			dmas = &lt;&amp;dma SUN4I_DMA_DEDICATED 27&gt;,</div><div class='ctx'> 			       &lt;&amp;dma SUN4I_DMA_DEDICATED 26&gt;;</div><div class='hunk'>@@ -563,7 +164,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-spi";</div><div class='ctx'> 			reg = &lt;0x01c06000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;11&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 21&gt;, &lt;&amp;spi1_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_SPI1&gt;, &lt;&amp;ccu CLK_SPI1&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mod";</div><div class='ctx'> 			dmas = &lt;&amp;dma SUN4I_DMA_DEDICATED 9&gt;,</div><div class='ctx'> 			       &lt;&amp;dma SUN4I_DMA_DEDICATED 8&gt;;</div><div class='hunk'>@@ -576,8 +177,8 @@</div><div class='ctx'> 		tve0: tv-encoder@01c0a000 {</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-tv-encoder";</div><div class='ctx'> 			reg = &lt;0x01c0a000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 34&gt;;</div><div class='del'>-			resets = &lt;&amp;tcon_ch0_clk 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_TVE&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_TVE&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> </div><div class='ctx'> 			port {</div><div class='hunk'>@@ -595,11 +196,11 @@</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-tcon";</div><div class='ctx'> 			reg = &lt;0x01c0c000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;44&gt;;</div><div class='del'>-			resets = &lt;&amp;tcon_ch0_clk 1&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_LCD&gt;;</div><div class='ctx'> 			reset-names = "lcd";</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 36&gt;,</div><div class='del'>-				 &lt;&amp;tcon_ch0_clk&gt;,</div><div class='del'>-				 &lt;&amp;tcon_ch1_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_LCD&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_TCON_CH0&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_TCON_CH1&gt;;</div><div class='ctx'> 			clock-names = "ahb",</div><div class='ctx'> 				      "tcon-ch0",</div><div class='ctx'> 				      "tcon-ch1";</div><div class='hunk'>@@ -637,14 +238,8 @@</div><div class='ctx'> 		mmc0: mmc@01c0f000 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-mmc";</div><div class='ctx'> 			reg = &lt;0x01c0f000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 8&gt;,</div><div class='del'>-				 &lt;&amp;mmc0_clk 0&gt;,</div><div class='del'>-				 &lt;&amp;mmc0_clk 1&gt;,</div><div class='del'>-				 &lt;&amp;mmc0_clk 2&gt;;</div><div class='del'>-			clock-names = "ahb",</div><div class='del'>-				      "mmc",</div><div class='del'>-				      "output",</div><div class='del'>-				      "sample";</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_MMC0&gt;, &lt;&amp;ccu CLK_MMC0&gt;;</div><div class='add'>+			clock-names = "ahb", "mmc";</div><div class='ctx'> 			interrupts = &lt;32&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -654,14 +249,8 @@</div><div class='ctx'> 		mmc1: mmc@01c10000 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-mmc";</div><div class='ctx'> 			reg = &lt;0x01c10000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 9&gt;,</div><div class='del'>-				 &lt;&amp;mmc1_clk 0&gt;,</div><div class='del'>-				 &lt;&amp;mmc1_clk 1&gt;,</div><div class='del'>-				 &lt;&amp;mmc1_clk 2&gt;;</div><div class='del'>-			clock-names = "ahb",</div><div class='del'>-				      "mmc",</div><div class='del'>-				      "output",</div><div class='del'>-				      "sample";</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_MMC1&gt;, &lt;&amp;ccu CLK_MMC1&gt;;</div><div class='add'>+			clock-names = "ahb", "mmc";</div><div class='ctx'> 			interrupts = &lt;33&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -671,14 +260,8 @@</div><div class='ctx'> 		mmc2: mmc@01c11000 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-mmc";</div><div class='ctx'> 			reg = &lt;0x01c11000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 10&gt;,</div><div class='del'>-				 &lt;&amp;mmc2_clk 0&gt;,</div><div class='del'>-				 &lt;&amp;mmc2_clk 1&gt;,</div><div class='del'>-				 &lt;&amp;mmc2_clk 2&gt;;</div><div class='del'>-			clock-names = "ahb",</div><div class='del'>-				      "mmc",</div><div class='del'>-				      "output",</div><div class='del'>-				      "sample";</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_MMC2&gt;, &lt;&amp;ccu CLK_MMC2&gt;;</div><div class='add'>+			clock-names = "ahb", "mmc";</div><div class='ctx'> 			interrupts = &lt;34&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -688,7 +271,7 @@</div><div class='ctx'> 		usb_otg: usb@01c13000 {</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-musb";</div><div class='ctx'> 			reg = &lt;0x01c13000 0x0400&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_OTG&gt;;</div><div class='ctx'> 			interrupts = &lt;38&gt;;</div><div class='ctx'> 			interrupt-names = "mc";</div><div class='ctx'> 			phys = &lt;&amp;usbphy 0&gt;;</div><div class='hunk'>@@ -705,9 +288,9 @@</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-usb-phy";</div><div class='ctx'> 			reg = &lt;0x01c13400 0x10 0x01c14800 0x4&gt;;</div><div class='ctx'> 			reg-names = "phy_ctrl", "pmu1";</div><div class='del'>-			clocks = &lt;&amp;usb_clk 8&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_USB_PHY0&gt;;</div><div class='ctx'> 			clock-names = "usb_phy";</div><div class='del'>-			resets = &lt;&amp;usb_clk 0&gt;, &lt;&amp;usb_clk 1&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_USB_PHY0&gt;, &lt;&amp;ccu RST_USB_PHY1&gt;;</div><div class='ctx'> 			reset-names = "usb0_reset", "usb1_reset";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -716,7 +299,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-ehci", "generic-ehci";</div><div class='ctx'> 			reg = &lt;0x01c14000 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;39&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 1&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_EHCI&gt;;</div><div class='ctx'> 			phys = &lt;&amp;usbphy 1&gt;;</div><div class='ctx'> 			phy-names = "usb";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -726,7 +309,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-ohci", "generic-ohci";</div><div class='ctx'> 			reg = &lt;0x01c14400 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;40&gt;;</div><div class='del'>-			clocks = &lt;&amp;usb_clk 6&gt;, &lt;&amp;ahb_gates 2&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_USB_OHCI&gt;, &lt;&amp;ccu CLK_AHB_OHCI&gt;;</div><div class='ctx'> 			phys = &lt;&amp;usbphy 1&gt;;</div><div class='ctx'> 			phy-names = "usb";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -736,7 +319,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-spi";</div><div class='ctx'> 			reg = &lt;0x01c17000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;12&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 22&gt;, &lt;&amp;spi2_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_SPI2&gt;, &lt;&amp;ccu CLK_SPI2&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mod";</div><div class='ctx'> 			dmas = &lt;&amp;dma SUN4I_DMA_DEDICATED 29&gt;,</div><div class='ctx'> 			       &lt;&amp;dma SUN4I_DMA_DEDICATED 28&gt;;</div><div class='hunk'>@@ -746,6 +329,15 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		ccu: clock@01c20000 {</div><div class='add'>+			compatible = "nextthing,gr8-ccu";</div><div class='add'>+			reg = &lt;0x01c20000 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "hosc", "losc";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			#reset-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		intc: interrupt-controller@01c20400 {</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-ic";</div><div class='ctx'> 			reg = &lt;0x01c20400 0x400&gt;;</div><div class='hunk'>@@ -757,129 +349,126 @@</div><div class='ctx'> 			compatible = "nextthing,gr8-pinctrl";</div><div class='ctx'> 			reg = &lt;0x01c20800 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;28&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 5&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB0_PIO&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			i2c0_pins_a: i2c0@0 {</div><div class='del'>-				allwinner,pins = "PB0", "PB1";</div><div class='del'>-				allwinner,function = "i2c0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB0", "PB1";</div><div class='add'>+				function = "i2c0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c1_pins_a: i2c1@0 {</div><div class='del'>-				allwinner,pins = "PB15", "PB16";</div><div class='del'>-				allwinner,function = "i2c1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB15", "PB16";</div><div class='add'>+				function = "i2c1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c2_pins_a: i2c2@0 {</div><div class='del'>-				allwinner,pins = "PB17", "PB18";</div><div class='del'>-				allwinner,function = "i2c2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB17", "PB18";</div><div class='add'>+				function = "i2c2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2s0_data_pins_a: i2s0-data@0 {</div><div class='del'>-				allwinner,pins = "PB6", "PB7", "PB8", "PB9";</div><div class='del'>-				allwinner,function = "i2s0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB6", "PB7", "PB8", "PB9";</div><div class='add'>+				function = "i2s0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2s0_mclk_pins_a: i2s0-mclk@0 {</div><div class='del'>-				allwinner,pins = "PB6", "PB7", "PB8", "PB9";</div><div class='del'>-				allwinner,function = "i2s0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB5";</div><div class='add'>+				function = "i2s0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ir0_rx_pins_a: ir0@0 {</div><div class='del'>-				allwinner,pins = "PB4";</div><div class='del'>-				allwinner,function = "ir0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB4";</div><div class='add'>+				function = "ir0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			lcd_rgb666_pins: lcd-rgb666@0 {</div><div class='del'>-				allwinner,pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",</div><div class='add'>+				pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",</div><div class='ctx'> 						 "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",</div><div class='ctx'> 						 "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",</div><div class='ctx'> 						 "PD24", "PD25", "PD26", "PD27";</div><div class='del'>-				allwinner,function = "lcd0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				function = "lcd0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc0_pins_a: mmc0@0 {</div><div class='del'>-				allwinner,pins = "PF0", "PF1", "PF2", "PF3",</div><div class='add'>+				pins = "PF0", "PF1", "PF2", "PF3",</div><div class='ctx'> 						 "PF4", "PF5";</div><div class='del'>-				allwinner,function = "mmc0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				function = "mmc0";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			nand_pins_a: nand-base0@0 {</div><div class='del'>-				allwinner,pins = "PC0", "PC1", "PC2",</div><div class='add'>+				pins = "PC0", "PC1", "PC2",</div><div class='ctx'> 						"PC5", "PC8", "PC9", "PC10",</div><div class='ctx'> 						"PC11", "PC12", "PC13", "PC14",</div><div class='ctx'> 						"PC15";</div><div class='del'>-				allwinner,function = "nand0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				function = "nand0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			nand_cs0_pins_a: nand-cs@0 {</div><div class='del'>-				allwinner,pins = "PC4";</div><div class='del'>-				allwinner,function = "nand0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PC4";</div><div class='add'>+				function = "nand0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			nand_rb0_pins_a: nand-rb@0 {</div><div class='del'>-				allwinner,pins = "PC6";</div><div class='del'>-				allwinner,function = "nand0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PC6";</div><div class='add'>+				function = "nand0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			pwm0_pins_a: pwm0@0 {</div><div class='del'>-				allwinner,pins = "PB2";</div><div class='del'>-				allwinner,function = "pwm0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB2";</div><div class='add'>+				function = "pwm0";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pwm1_pins: pwm1 {</div><div class='add'>+				pins = "PG13";</div><div class='add'>+				function = "pwm1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spdif_tx_pins_a: spdif@0 {</div><div class='del'>-				allwinner,pins = "PB10";</div><div class='del'>-				allwinner,function = "spdif";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+				pins = "PB10";</div><div class='add'>+				function = "spdif";</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart1_pins_a: uart1@1 {</div><div class='del'>-				allwinner,pins = "PG3", "PG4";</div><div class='del'>-				allwinner,function = "uart1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG3", "PG4";</div><div class='add'>+				function = "uart1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart1_cts_rts_pins_a: uart1-cts-rts@0 {</div><div class='del'>-				allwinner,pins = "PG5", "PG6";</div><div class='del'>-				allwinner,function = "uart1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG5", "PG6";</div><div class='add'>+				function = "uart1";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart2_pins_a: uart2@1 {</div><div class='add'>+				pins = "PD2", "PD3";</div><div class='add'>+				function = "uart2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart2_cts_rts_pins_a: uart2-cts-rts@0 {</div><div class='add'>+				pins = "PD4", "PD5";</div><div class='add'>+				function = "uart2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart3_pins_a: uart3@1 {</div><div class='add'>+				pins = "PG9", "PG10";</div><div class='add'>+				function = "uart3";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart3_cts_rts_pins_a: uart3-cts-rts@0 {</div><div class='add'>+				pins = "PG11", "PG12";</div><div class='add'>+				function = "uart3";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pwm: pwm@01c20e00 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a10s-pwm";</div><div class='ctx'> 			reg = &lt;0x01c20e00 0xc&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_HOSC&gt;;</div><div class='ctx'> 			#pwm-cells = &lt;3&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -888,7 +477,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-timer";</div><div class='ctx'> 			reg = &lt;0x01c20c00 0x90&gt;;</div><div class='ctx'> 			interrupts = &lt;22&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_HOSC&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		wdt: watchdog@01c20c90 {</div><div class='hunk'>@@ -901,7 +490,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-spdif";</div><div class='ctx'> 			reg = &lt;0x01c21000 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;13&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 1&gt;, &lt;&amp;spdif_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB0_SPDIF&gt;, &lt;&amp;ccu CLK_SPDIF&gt;;</div><div class='ctx'> 			clock-names = "apb", "spdif";</div><div class='ctx'> 			dmas = &lt;&amp;dma SUN4I_DMA_NORMAL 2&gt;,</div><div class='ctx'> 			       &lt;&amp;dma SUN4I_DMA_NORMAL 2&gt;;</div><div class='hunk'>@@ -911,7 +500,7 @@</div><div class='ctx'> </div><div class='ctx'> 		ir0: ir@01c21800 {</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-ir";</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 6&gt;, &lt;&amp;ir0_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB0_IR&gt;, &lt;&amp;ccu CLK_IR&gt;;</div><div class='ctx'> 			clock-names = "apb", "ir";</div><div class='ctx'> 			interrupts = &lt;5&gt;;</div><div class='ctx'> 			reg = &lt;0x01c21800 0x40&gt;;</div><div class='hunk'>@@ -923,7 +512,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-i2s";</div><div class='ctx'> 			reg = &lt;0x01c22400 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;16&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 3&gt;, &lt;&amp;i2s0_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB0_I2S&gt;, &lt;&amp;ccu CLK_I2S&gt;;</div><div class='ctx'> 			clock-names = "apb", "mod";</div><div class='ctx'> 			dmas = &lt;&amp;dma SUN4I_DMA_NORMAL 3&gt;,</div><div class='ctx'> 			       &lt;&amp;dma SUN4I_DMA_NORMAL 3&gt;;</div><div class='hunk'>@@ -943,7 +532,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-codec";</div><div class='ctx'> 			reg = &lt;0x01c22c00 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;30&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 0&gt;, &lt;&amp;codec_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB0_CODEC&gt;, &lt;&amp;ccu CLK_CODEC&gt;;</div><div class='ctx'> 			clock-names = "apb", "codec";</div><div class='ctx'> 			dmas = &lt;&amp;dma SUN4I_DMA_NORMAL 19&gt;,</div><div class='ctx'> 			       &lt;&amp;dma SUN4I_DMA_NORMAL 19&gt;;</div><div class='hunk'>@@ -964,7 +553,7 @@</div><div class='ctx'> 			interrupts = &lt;2&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 17&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_UART1&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -974,7 +563,17 @@</div><div class='ctx'> 			interrupts = &lt;3&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 18&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_UART2&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart3: serial@01c28c00 {</div><div class='add'>+			compatible = "snps,dw-apb-uart";</div><div class='add'>+			reg = &lt;0x01c28c00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;4&gt;;</div><div class='add'>+			reg-shift = &lt;2&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_UART3&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -982,7 +581,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-i2c";</div><div class='ctx'> 			reg = &lt;0x01c2ac00 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;7&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_I2C0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -992,7 +591,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-i2c";</div><div class='ctx'> 			reg = &lt;0x01c2b000 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;8&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 1&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_I2C1&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -1002,7 +601,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-i2c";</div><div class='ctx'> 			reg = &lt;0x01c2b400 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;9&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 2&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_I2C2&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -1012,18 +611,18 @@</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-hstimer";</div><div class='ctx'> 			reg = &lt;0x01c60000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;82&gt;, &lt;83&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 28&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_HSTIMER&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fe0: display-frontend@01e00000 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-display-frontend";</div><div class='ctx'> 			reg = &lt;0x01e00000 0x20000&gt;;</div><div class='ctx'> 			interrupts = &lt;47&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 46&gt;, &lt;&amp;de_fe_clk&gt;,</div><div class='del'>-				 &lt;&amp;dram_gates 25&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_DE_FE&gt;, &lt;&amp;ccu CLK_DE_FE&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_DRAM_DE_FE&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mod",</div><div class='ctx'> 				      "ram";</div><div class='del'>-			resets = &lt;&amp;de_fe_clk&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_DE_FE&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> </div><div class='ctx'> 			ports {</div><div class='hunk'>@@ -1046,14 +645,14 @@</div><div class='ctx'> 		be0: display-backend@01e60000 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-display-backend";</div><div class='ctx'> 			reg = &lt;0x01e60000 0x10000&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 44&gt;, &lt;&amp;de_be_clk&gt;,</div><div class='del'>-				 &lt;&amp;dram_gates 26&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_DE_BE&gt;, &lt;&amp;ccu CLK_DE_BE&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_DRAM_DE_BE&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mod",</div><div class='ctx'> 				      "ram";</div><div class='del'>-			resets = &lt;&amp;de_be_clk&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_DE_BE&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> </div><div class='del'>-			assigned-clocks = &lt;&amp;de_be_clk&gt;;</div><div class='add'>+			assigned-clocks = &lt;&amp;ccu CLK_DE_BE&gt;;</div><div class='ctx'> 			assigned-clock-rates = &lt;300000000&gt;;</div><div class='ctx'> </div><div class='ctx'> 			ports {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts<br/>index b68a12374b35..e86fa46fdd45 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-r8-chip.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-r8-chip.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-r8-chip.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-r8-chip.dts</a></div><div class='hunk'>@@ -56,9 +56,11 @@</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		i2c0 = &amp;i2c0;</div><div class='add'>+		i2c1 = &amp;i2c1;</div><div class='ctx'> 		i2c2 = &amp;i2c2;</div><div class='ctx'> 		serial0 = &amp;uart1;</div><div class='ctx'> 		serial1 = &amp;uart3;</div><div class='add'>+		spi0 = &amp;spi2;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='hunk'>@@ -74,6 +76,20 @@</div><div class='ctx'> 			default-state = "on";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	mmc0_pwrseq: mmc0_pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;chip_wifi_reg_on_pin&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;pio 2 19 GPIO_ACTIVE_LOW&gt;; /* PC19 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	onewire {</div><div class='add'>+		compatible = "w1-gpio";</div><div class='add'>+		gpios = &lt;&amp;pio 3 2 GPIO_ACTIVE_HIGH&gt;; /* PD2 */</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;chip_w1_pin&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;be0 {</div><div class='hunk'>@@ -112,6 +128,12 @@</div><div class='ctx'> </div><div class='ctx'> #include "axp209.dtsi"</div><div class='ctx'> </div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_pins_a&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;i2c2 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;i2c2_pins_a&gt;;</div><div class='hunk'>@@ -131,10 +153,15 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;mmc0_pins_a {</div><div class='add'>+	bias-pull-up;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;mmc0 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;mmc0_pins_a&gt;;</div><div class='ctx'> 	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	mmc-pwrseq = &lt;&amp;mmc0_pwrseq&gt;;</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='ctx'> 	non-removable;</div><div class='ctx'> 	status = "okay";</div><div class='hunk'>@@ -150,17 +177,24 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	chip_vbus_pin: chip_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PB10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB10";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chip_wifi_reg_on_pin: chip_wifi_reg_on_pin@0 {</div><div class='add'>+	        pins = "PC19";</div><div class='add'>+	        function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	chip_id_det_pin: chip_id_det_pin@0 {</div><div class='del'>-		allwinner,pins = "PG2";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG2";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chip_w1_pin: chip_w1_pin@0 {</div><div class='add'>+		pins = "PD2";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+	        bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -189,6 +223,28 @@</div><div class='ctx'> 	regulator-always-on;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Both LDO3 and LDO4 are used in parallel to power up the WiFi/BT</div><div class='add'>+ * Chip.</div><div class='add'>+ *</div><div class='add'>+ * If those are not enabled, the SDIO part will not enumerate, and</div><div class='add'>+ * since there's no way currently to pass DT infos to an SDIO device,</div><div class='add'>+ * we cannot really do better than this ugly hack for now.</div><div class='add'>+ */</div><div class='add'>+&amp;reg_ldo3 {</div><div class='add'>+	regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-name = "vcc-wifi-1";</div><div class='add'>+	regulator-always-on;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo4 {</div><div class='add'>+	regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-name = "vcc-wifi-2";</div><div class='add'>+	regulator-always-on;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;reg_ldo5 {</div><div class='ctx'> 	regulator-min-microvolt = &lt;1800000&gt;;</div><div class='ctx'> 	regulator-max-microvolt = &lt;1800000&gt;;</div><div class='hunk'>@@ -202,6 +258,12 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;spi2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi2_pins_a&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;tcon0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-r8.dtsi b/arch/arm/boot/dts/sun5i-r8.dtsi<br/>index 8b058f53b7dc..4c1141396c99 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-r8.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-r8.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-r8.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-r8.dtsi</a></div><div class='hunk'>@@ -51,9 +51,9 @@</div><div class='ctx'> 			compatible = "allwinner,simple-framebuffer",</div><div class='ctx'> 				     "simple-framebuffer";</div><div class='ctx'> 			allwinner,pipeline = "de_be0-lcd0-tve0";</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 34&gt;, &lt;&amp;ahb_gates 36&gt;,</div><div class='del'>-				 &lt;&amp;ahb_gates 44&gt;, &lt;&amp;de_be_clk&gt;,</div><div class='del'>-				 &lt;&amp;tcon_ch1_clk&gt;, &lt;&amp;dram_gates 26&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_TVE&gt;, &lt;&amp;ccu CLK_AHB_LCD&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_AHB_DE_BE&gt;, &lt;&amp;ccu CLK_DE_BE&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_TCON_CH1&gt;, &lt;&amp;ccu CLK_DRAM_DE_BE&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -62,8 +62,8 @@</div><div class='ctx'> 		tve0: tv-encoder@01c0a000 {</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-tv-encoder";</div><div class='ctx'> 			reg = &lt;0x01c0a000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 34&gt;;</div><div class='del'>-			resets = &lt;&amp;tcon_ch0_clk 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_TVE&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_TVE&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> </div><div class='ctx'> 			port {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi<br/>index 20cc940f5f91..8a4d2277826f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi</a></div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include "sunxi-reference-design-tablet.dtsi"</div><div class='ctx'> </div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/pwm/pwm.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='hunk'>@@ -84,6 +85,23 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c1 {</div><div class='add'>+	/*</div><div class='add'>+	 * The gsl1680 is rated at 400KHz and it will not work reliable at</div><div class='add'>+	 * 100KHz, this has been confirmed on multiple different q8 tablets.</div><div class='add'>+	 * All other devices on this bus are also rated for 400KHz.</div><div class='add'>+	 */</div><div class='add'>+	clock-frequency = &lt;400000&gt;;</div><div class='add'>+</div><div class='add'>+	touchscreen: touchscreen {</div><div class='add'>+		interrupt-parent = &lt;&amp;pio&gt;;</div><div class='add'>+		interrupts = &lt;6 11 IRQ_TYPE_EDGE_FALLING&gt;; /* EINT11 (PG11) */</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;ts_power_pin&gt;;</div><div class='add'>+		power-gpios = &lt;&amp;pio 1 3 GPIO_ACTIVE_HIGH&gt;; /* PB3 */</div><div class='add'>+		/* Tablet dts must provide reg and compatible */</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pcf8563: rtc@51 {</div><div class='ctx'> 		compatible = "nxp,pcf8563";</div><div class='ctx'> 		reg = &lt;0x51&gt;;</div><div class='hunk'>@@ -112,38 +130,38 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	codec_pa_pin: codec_pa_pin@0 {</div><div class='del'>-		allwinner,pins = "PG10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG10";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PG0";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG0";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ts_power_pin: ts_power_pin {</div><div class='add'>+		pins = "PB3";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;10&gt;;</div><div class='add'>+		bias-disable;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG1";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PG1";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PG2";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PG2";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_pin_a: usb0_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PG12";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG12";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi<br/>index e374f4fc8073..a9574a6cd95c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun5i.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun5i.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun5i.dtsi</a></div><div class='hunk'>@@ -44,9 +44,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "skeleton.dtsi"</div><div class='ctx'> </div><div class='del'>-#include &lt;dt-bindings/clock/sun4i-a10-pll2.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/sun5i-ccu.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/dma/sun4i-a10.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/pinctrl/sun4i-a10.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun5i-ccu.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='hunk'>@@ -59,7 +60,7 @@</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a8";</div><div class='ctx'> 			reg = &lt;0x0&gt;;</div><div class='del'>-			clocks = &lt;&amp;cpu&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_CPU&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -68,291 +69,19 @@</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		ranges;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * This is a dummy clock, to be used as placeholder on</div><div class='del'>-		 * other mux clocks when a specific parent clock is not</div><div class='del'>-		 * yet implemented. It should be dropped when the driver</div><div class='del'>-		 * is complete.</div><div class='del'>-		 */</div><div class='del'>-		dummy: dummy {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-clock";</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		osc24M: clk@01c20050 {</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-osc-clk";</div><div class='del'>-			reg = &lt;0x01c20050 0x4&gt;;</div><div class='add'>+			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;24000000&gt;;</div><div class='ctx'> 			clock-output-names = "osc24M";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		osc3M: osc3M_clk {</div><div class='del'>-			compatible = "fixed-factor-clock";</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			clock-div = &lt;8&gt;;</div><div class='del'>-			clock-mult = &lt;1&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "osc3M";</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		osc32k: clk@0 {</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;32768&gt;;</div><div class='ctx'> 			clock-output-names = "osc32k";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		pll1: clk@01c20000 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll1-clk";</div><div class='del'>-			reg = &lt;0x01c20000 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll1";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll2: clk@01c20008 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-pll2-clk";</div><div class='del'>-			reg = &lt;0x01c20008 0x8&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll2-1x", "pll2-2x",</div><div class='del'>-					     "pll2-4x", "pll2-8x";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll3: clk@01c20010 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll3-clk";</div><div class='del'>-			reg = &lt;0x01c20010 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc3M&gt;;</div><div class='del'>-			clock-output-names = "pll3";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll3x2: pll3x2_clk {</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll3-2x-clk", "fixed-factor-clock";</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			clock-div = &lt;1&gt;;</div><div class='del'>-			clock-mult = &lt;2&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll3&gt;;</div><div class='del'>-			clock-output-names = "pll3-2x";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll4: clk@01c20018 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll1-clk";</div><div class='del'>-			reg = &lt;0x01c20018 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll4";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll5: clk@01c20020 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll5-clk";</div><div class='del'>-			reg = &lt;0x01c20020 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll5_ddr", "pll5_other";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll6: clk@01c20028 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll6-clk";</div><div class='del'>-			reg = &lt;0x01c20028 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll6_sata", "pll6_other", "pll6";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll7: clk@01c20030 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-pll3-clk";</div><div class='del'>-			reg = &lt;0x01c20030 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc3M&gt;;</div><div class='del'>-			clock-output-names = "pll7";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll7x2: pll7x2_clk {</div><div class='del'>-			compatible = "fixed-factor-clock";</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			clock-div = &lt;1&gt;;</div><div class='del'>-			clock-mult = &lt;2&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll7&gt;;</div><div class='del'>-			clock-output-names = "pll7-2x";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* dummy is 200M */</div><div class='del'>-		cpu: cpu@01c20054 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-cpu-clk";</div><div class='del'>-			reg = &lt;0x01c20054 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc32k&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;pll1&gt;, &lt;&amp;dummy&gt;;</div><div class='del'>-			clock-output-names = "cpu";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		axi: axi@01c20054 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-axi-clk";</div><div class='del'>-			reg = &lt;0x01c20054 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;cpu&gt;;</div><div class='del'>-			clock-output-names = "axi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ahb: ahb@01c20054 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-ahb-clk";</div><div class='del'>-			reg = &lt;0x01c20054 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;axi&gt;, &lt;&amp;cpu&gt;, &lt;&amp;pll6 1&gt;;</div><div class='del'>-			clock-output-names = "ahb";</div><div class='del'>-			/*</div><div class='del'>-			 * Use PLL6 as parent, instead of CPU/AXI</div><div class='del'>-			 * which has rate changes due to cpufreq</div><div class='del'>-			 */</div><div class='del'>-			assigned-clocks = &lt;&amp;ahb&gt;;</div><div class='del'>-			assigned-clock-parents = &lt;&amp;pll6 1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb0: apb0@01c20054 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-apb0-clk";</div><div class='del'>-			reg = &lt;0x01c20054 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb&gt;;</div><div class='del'>-			clock-output-names = "apb0";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb1: clk@01c20058 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-apb1-clk";</div><div class='del'>-			reg = &lt;0x01c20058 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;osc32k&gt;;</div><div class='del'>-			clock-output-names = "apb1";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		axi_gates: clk@01c2005c {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-axi-gates-clk";</div><div class='del'>-			reg = &lt;0x01c2005c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;axi&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;;</div><div class='del'>-			clock-output-names = "axi_dram";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand_clk: clk@01c20080 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c20080 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "nand";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ms_clk: clk@01c20084 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c20084 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "ms";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc0_clk: clk@01c20088 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mmc-clk";</div><div class='del'>-			reg = &lt;0x01c20088 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "mmc0",</div><div class='del'>-					     "mmc0_output",</div><div class='del'>-					     "mmc0_sample";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc1_clk: clk@01c2008c {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mmc-clk";</div><div class='del'>-			reg = &lt;0x01c2008c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "mmc1",</div><div class='del'>-					     "mmc1_output",</div><div class='del'>-					     "mmc1_sample";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc2_clk: clk@01c20090 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mmc-clk";</div><div class='del'>-			reg = &lt;0x01c20090 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "mmc2",</div><div class='del'>-					     "mmc2_output",</div><div class='del'>-					     "mmc2_sample";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ts_clk: clk@01c20098 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c20098 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "ts";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ss_clk: clk@01c2009c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c2009c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "ss";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi0_clk: clk@01c200a0 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c200a0 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "spi0";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi1_clk: clk@01c200a4 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c200a4 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "spi1";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi2_clk: clk@01c200a8 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c200a8 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "spi2";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ir0_clk: clk@01c200b0 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-mod0-clk";</div><div class='del'>-			reg = &lt;0x01c200b0 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "ir0";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb_clk: clk@01c200cc {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-usb-clk";</div><div class='del'>-			reg = &lt;0x01c200cc 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll6 1&gt;;</div><div class='del'>-			clock-output-names = "usb_ohci0", "usb_phy";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		codec_clk: clk@01c20140 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun4i-a10-codec-clk";</div><div class='del'>-			reg = &lt;0x01c20140 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;pll2 SUN4I_A10_PLL2_1X&gt;;</div><div class='del'>-			clock-output-names = "codec";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mbus_clk: clk@01c2015c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun5i-a13-mbus-clk";</div><div class='del'>-			reg = &lt;0x01c2015c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll6 1&gt;, &lt;&amp;pll5 1&gt;;</div><div class='del'>-			clock-output-names = "mbus";</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc@01c00000 {</div><div class='hunk'>@@ -395,7 +124,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-dma";</div><div class='ctx'> 			reg = &lt;0x01c02000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;27&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 6&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_DMA&gt;;</div><div class='ctx'> 			#dma-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -403,7 +132,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-spi";</div><div class='ctx'> 			reg = &lt;0x01c05000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;10&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 20&gt;, &lt;&amp;spi0_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_SPI0&gt;, &lt;&amp;ccu CLK_SPI0&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mod";</div><div class='ctx'> 			dmas = &lt;&amp;dma SUN4I_DMA_DEDICATED 27&gt;,</div><div class='ctx'> 			       &lt;&amp;dma SUN4I_DMA_DEDICATED 26&gt;;</div><div class='hunk'>@@ -417,7 +146,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-spi";</div><div class='ctx'> 			reg = &lt;0x01c06000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;11&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 21&gt;, &lt;&amp;spi1_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_SPI1&gt;, &lt;&amp;ccu CLK_SPI1&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mod";</div><div class='ctx'> 			dmas = &lt;&amp;dma SUN4I_DMA_DEDICATED 9&gt;,</div><div class='ctx'> 			       &lt;&amp;dma SUN4I_DMA_DEDICATED 8&gt;;</div><div class='hunk'>@@ -430,14 +159,8 @@</div><div class='ctx'> 		mmc0: mmc@01c0f000 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-mmc";</div><div class='ctx'> 			reg = &lt;0x01c0f000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 8&gt;,</div><div class='del'>-				 &lt;&amp;mmc0_clk 0&gt;,</div><div class='del'>-				 &lt;&amp;mmc0_clk 1&gt;,</div><div class='del'>-				 &lt;&amp;mmc0_clk 2&gt;;</div><div class='del'>-			clock-names = "ahb",</div><div class='del'>-				      "mmc",</div><div class='del'>-				      "output",</div><div class='del'>-				      "sample";</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_MMC0&gt;, &lt;&amp;ccu CLK_MMC0&gt;;</div><div class='add'>+			clock-names = "ahb", "mmc";</div><div class='ctx'> 			interrupts = &lt;32&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -447,14 +170,8 @@</div><div class='ctx'> 		mmc1: mmc@01c10000 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-mmc";</div><div class='ctx'> 			reg = &lt;0x01c10000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 9&gt;,</div><div class='del'>-				 &lt;&amp;mmc1_clk 0&gt;,</div><div class='del'>-				 &lt;&amp;mmc1_clk 1&gt;,</div><div class='del'>-				 &lt;&amp;mmc1_clk 2&gt;;</div><div class='del'>-			clock-names = "ahb",</div><div class='del'>-				      "mmc",</div><div class='del'>-				      "output",</div><div class='del'>-				      "sample";</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_MMC1&gt;, &lt;&amp;ccu CLK_MMC1&gt;;</div><div class='add'>+			clock-names = "ahb", "mmc";</div><div class='ctx'> 			interrupts = &lt;33&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -464,14 +181,8 @@</div><div class='ctx'> 		mmc2: mmc@01c11000 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-mmc";</div><div class='ctx'> 			reg = &lt;0x01c11000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 10&gt;,</div><div class='del'>-				 &lt;&amp;mmc2_clk 0&gt;,</div><div class='del'>-				 &lt;&amp;mmc2_clk 1&gt;,</div><div class='del'>-				 &lt;&amp;mmc2_clk 2&gt;;</div><div class='del'>-			clock-names = "ahb",</div><div class='del'>-				      "mmc",</div><div class='del'>-				      "output",</div><div class='del'>-				      "sample";</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_MMC2&gt;, &lt;&amp;ccu CLK_MMC2&gt;;</div><div class='add'>+			clock-names = "ahb", "mmc";</div><div class='ctx'> 			interrupts = &lt;34&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -481,7 +192,7 @@</div><div class='ctx'> 		usb_otg: usb@01c13000 {</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-musb";</div><div class='ctx'> 			reg = &lt;0x01c13000 0x0400&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_OTG&gt;;</div><div class='ctx'> 			interrupts = &lt;38&gt;;</div><div class='ctx'> 			interrupt-names = "mc";</div><div class='ctx'> 			phys = &lt;&amp;usbphy 0&gt;;</div><div class='hunk'>@@ -496,9 +207,9 @@</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-usb-phy";</div><div class='ctx'> 			reg = &lt;0x01c13400 0x10 0x01c14800 0x4&gt;;</div><div class='ctx'> 			reg-names = "phy_ctrl", "pmu1";</div><div class='del'>-			clocks = &lt;&amp;usb_clk 8&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_USB_PHY0&gt;;</div><div class='ctx'> 			clock-names = "usb_phy";</div><div class='del'>-			resets = &lt;&amp;usb_clk 0&gt;, &lt;&amp;usb_clk 1&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_USB_PHY0&gt;, &lt;&amp;ccu RST_USB_PHY1&gt;;</div><div class='ctx'> 			reset-names = "usb0_reset", "usb1_reset";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -507,7 +218,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-ehci", "generic-ehci";</div><div class='ctx'> 			reg = &lt;0x01c14000 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;39&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 1&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_EHCI&gt;;</div><div class='ctx'> 			phys = &lt;&amp;usbphy 1&gt;;</div><div class='ctx'> 			phy-names = "usb";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -517,7 +228,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-ohci", "generic-ohci";</div><div class='ctx'> 			reg = &lt;0x01c14400 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;40&gt;;</div><div class='del'>-			clocks = &lt;&amp;usb_clk 6&gt;, &lt;&amp;ahb_gates 2&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_USB_OHCI&gt;, &lt;&amp;ccu CLK_AHB_OHCI&gt;;</div><div class='ctx'> 			phys = &lt;&amp;usbphy 1&gt;;</div><div class='ctx'> 			phy-names = "usb";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -527,7 +238,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-spi";</div><div class='ctx'> 			reg = &lt;0x01c17000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;12&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 22&gt;, &lt;&amp;spi2_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_SPI2&gt;, &lt;&amp;ccu CLK_SPI2&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mod";</div><div class='ctx'> 			dmas = &lt;&amp;dma SUN4I_DMA_DEDICATED 29&gt;,</div><div class='ctx'> 			       &lt;&amp;dma SUN4I_DMA_DEDICATED 28&gt;;</div><div class='hunk'>@@ -537,6 +248,14 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		ccu: clock@01c20000 {</div><div class='add'>+			reg = &lt;0x01c20000 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "hosc", "losc";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			#reset-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		intc: interrupt-controller@01c20400 {</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-ic";</div><div class='ctx'> 			reg = &lt;0x01c20400 0x400&gt;;</div><div class='hunk'>@@ -547,69 +266,84 @@</div><div class='ctx'> 		pio: pinctrl@01c20800 {</div><div class='ctx'> 			reg = &lt;0x01c20800 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;28&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 5&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB0_PIO&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			i2c0_pins_a: i2c0@0 {</div><div class='del'>-				allwinner,pins = "PB0", "PB1";</div><div class='del'>-				allwinner,function = "i2c0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB0", "PB1";</div><div class='add'>+				function = "i2c0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c1_pins_a: i2c1@0 {</div><div class='del'>-				allwinner,pins = "PB15", "PB16";</div><div class='del'>-				allwinner,function = "i2c1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB15", "PB16";</div><div class='add'>+				function = "i2c1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c2_pins_a: i2c2@0 {</div><div class='del'>-				allwinner,pins = "PB17", "PB18";</div><div class='del'>-				allwinner,function = "i2c2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB17", "PB18";</div><div class='add'>+				function = "i2c2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			lcd_rgb565_pins: lcd_rgb565@0 {</div><div class='add'>+				pins = "PD3", "PD4", "PD5", "PD6", "PD7",</div><div class='add'>+						 "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",</div><div class='add'>+						 "PD19", "PD20", "PD21", "PD22", "PD23",</div><div class='add'>+						 "PD24", "PD25", "PD26", "PD27";</div><div class='add'>+				function = "lcd0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc0_pins_a: mmc0@0 {</div><div class='del'>-				allwinner,pins = "PF0", "PF1", "PF2", "PF3",</div><div class='del'>-						 "PF4", "PF5";</div><div class='del'>-				allwinner,function = "mmc0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PF0", "PF1", "PF2", "PF3",</div><div class='add'>+				       "PF4", "PF5";</div><div class='add'>+				function = "mmc0";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc2_pins_a: mmc2@0 {</div><div class='del'>-				allwinner,pins = "PC6", "PC7", "PC8", "PC9",</div><div class='del'>-					"PC10", "PC11", "PC12", "PC13",</div><div class='del'>-					"PC14", "PC15";</div><div class='del'>-				allwinner,function = "mmc2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+				pins = "PC6", "PC7", "PC8", "PC9",</div><div class='add'>+				       "PC10", "PC11", "PC12", "PC13",</div><div class='add'>+				       "PC14", "PC15";</div><div class='add'>+				function = "mmc2";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mmc2_4bit_pins_a: mmc2-4bit@0 {</div><div class='add'>+				pins = "PC6", "PC7", "PC8", "PC9",</div><div class='add'>+				       "PC10", "PC11";</div><div class='add'>+				function = "mmc2";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			spi2_pins_a: spi2@0 {</div><div class='add'>+				pins = "PE1", "PE2", "PE3";</div><div class='add'>+				function = "spi2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			spi2_cs0_pins_a: spi2-cs0@0 {</div><div class='add'>+				pins = "PE0";</div><div class='add'>+				function = "spi2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart3_pins_a: uart3@0 {</div><div class='del'>-				allwinner,pins = "PG9", "PG10";</div><div class='del'>-				allwinner,function = "uart3";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG9", "PG10";</div><div class='add'>+				function = "uart3";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart3_pins_cts_rts_a: uart3-cts-rts@0 {</div><div class='del'>-				allwinner,pins = "PG11", "PG12";</div><div class='del'>-				allwinner,function = "uart3";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG11", "PG12";</div><div class='add'>+				function = "uart3";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			pwm0_pins: pwm0 {</div><div class='del'>-				allwinner,pins = "PB2";</div><div class='del'>-				allwinner,function = "pwm";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB2";</div><div class='add'>+				function = "pwm";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -617,7 +351,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-timer";</div><div class='ctx'> 			reg = &lt;0x01c20c00 0x90&gt;;</div><div class='ctx'> 			interrupts = &lt;22&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_HOSC&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		wdt: watchdog@01c20c90 {</div><div class='hunk'>@@ -637,7 +371,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-codec";</div><div class='ctx'> 			reg = &lt;0x01c22c00 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;30&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 0&gt;, &lt;&amp;codec_clk&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB0_CODEC&gt;, &lt;&amp;ccu CLK_CODEC&gt;;</div><div class='ctx'> 			clock-names = "apb", "codec";</div><div class='ctx'> 			dmas = &lt;&amp;dma SUN4I_DMA_NORMAL 19&gt;,</div><div class='ctx'> 			       &lt;&amp;dma SUN4I_DMA_NORMAL 19&gt;;</div><div class='hunk'>@@ -663,7 +397,7 @@</div><div class='ctx'> 			interrupts = &lt;2&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 17&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_UART1&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -673,7 +407,7 @@</div><div class='ctx'> 			interrupts = &lt;4&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 19&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_UART3&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -681,7 +415,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-i2c";</div><div class='ctx'> 			reg = &lt;0x01c2ac00 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;7&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_I2C0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -691,7 +425,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-i2c";</div><div class='ctx'> 			reg = &lt;0x01c2b000 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;8&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 1&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_I2C1&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -701,7 +435,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-i2c";</div><div class='ctx'> 			reg = &lt;0x01c2b400 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;9&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 2&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_I2C2&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -711,7 +445,7 @@</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-hstimer";</div><div class='ctx'> 			reg = &lt;0x01c60000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;82&gt;, &lt;83&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb_gates 28&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB_HSTIMER&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts<br/>index 2f8cfab771e2..effbdc766938 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31-app4-evb1.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-app4-evb1.dts</a></div><div class='hunk'>@@ -68,10 +68,8 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb1_vbus_pin_a: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH27";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH27";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts<br/>index f9cf36888d93..f5ececd45bc0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-colombus.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31-colombus.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-colombus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-colombus.dts</a></div><div class='hunk'>@@ -124,29 +124,25 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc0_pins_a {</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_colombus: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PA8";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PA8";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb2_vbus_pin_colombus: usb2_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH24";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH24";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2c_lcd_pins: i2c_lcd_pin@0 {</div><div class='del'>-		allwinner,pins = "PA23", "PA24";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PA23", "PA24";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts<br/>index 9a74637f677f..f094eeb6c499 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-hummingbird.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31-hummingbird.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-hummingbird.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-hummingbird.dts</a></div><div class='hunk'>@@ -63,16 +63,87 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	vga-connector {</div><div class='add'>+		compatible = "vga-connector";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			vga_con_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;vga_dac_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vga-dac {</div><div class='add'>+		compatible = "dumb-vga-dac";</div><div class='add'>+		vdd-supply = &lt;&amp;reg_vga_3v3&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				vga_dac_in: endpoint@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					remote-endpoint = &lt;&amp;tcon0_out_vga&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+				vga_dac_out: endpoint@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					remote-endpoint = &lt;&amp;vga_con_in&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_vga_3v3: vga_3v3_regulator {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vga-3v3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		enable-active-high;</div><div class='add'>+		gpio = &lt;&amp;pio 7 25 GPIO_ACTIVE_HIGH&gt;; /* PH25 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	wifi_pwrseq: wifi_pwrseq {</div><div class='ctx'> 		compatible = "mmc-pwrseq-simple";</div><div class='ctx'> 		reset-gpios = &lt;&amp;pio 6 10 GPIO_ACTIVE_LOW&gt;; /* PG10 */</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;codec {</div><div class='add'>+	allwinner,audio-routing =</div><div class='add'>+		"Headphone", "HP",</div><div class='add'>+		"Speaker", "LINEOUT",</div><div class='add'>+		"LINEIN", "Line In",</div><div class='add'>+		"MIC1", "Mic",</div><div class='add'>+		"MIC2", "Headset Mic",</div><div class='add'>+		"Mic",	"MBIAS",</div><div class='add'>+		"Headset Mic", "HBIAS";</div><div class='add'>+	allwinner,pa-gpios = &lt;&amp;pio 7 22 GPIO_ACTIVE_HIGH&gt;; /* PH22 */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;cpu0 {</div><div class='ctx'> 	cpu-supply = &lt;&amp;reg_dcdc3&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;de {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;ehci0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -134,7 +205,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mmc0_pins_a {</div><div class='ctx'> 	/* external pull-ups missing for some pins */</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc1 {</div><div class='hunk'>@@ -153,24 +224,19 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	gmac_phy_reset_pin_hummingbird: gmac_phy_reset_pin@0 {</div><div class='del'>-		allwinner,pins = "PA21";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PA21";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PA8";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PA8";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	wifi_reset_pin_hummingbird: wifi_reset_pin@0 {</div><div class='del'>-		allwinner,pins = "PG10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG10";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -182,6 +248,7 @@</div><div class='ctx'> 		reg = &lt;0x68&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;nmi_intc&gt;;</div><div class='ctx'> 		interrupts = &lt;0 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		x-powers,drive-vbus-en;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -240,23 +307,54 @@</div><div class='ctx'> 	regulator-name = "vcc-dram";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;reg_drivevbus {</div><div class='add'>+	regulator-name = "usb0-vbus";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;reg_usb1_vbus {</div><div class='ctx'> 	gpio = &lt;&amp;pio 7 24 GPIO_ACTIVE_HIGH&gt;; /* PH24 */</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;tcon0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;lcd0_rgb888_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tcon0_out {</div><div class='add'>+	tcon0_out_vga: endpoint@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		remote-endpoint = &lt;&amp;vga_dac_in&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;usb_otg {</div><div class='add'>+	dr_mode = "otg";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_power_supply {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usb1_vbus_pin_a {</div><div class='ctx'> 	/* different pin from sunxi-common-regulators */</div><div class='del'>-	allwinner,pins = "PH24";</div><div class='add'>+	pins = "PH24";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbphy {</div><div class='add'>+	usb0_id_det-gpio = &lt;&amp;pio 0 15 GPIO_ACTIVE_HIGH&gt;; /* PA15 */</div><div class='add'>+	usb0_vbus_det-gpio = &lt;&amp;pio 0 16 GPIO_ACTIVE_HIGH&gt;; /* PA16 */</div><div class='add'>+	usb0_vbus_power-supply = &lt;&amp;usb_power_supply&gt;;</div><div class='add'>+	usb0_vbus-supply = &lt;&amp;reg_drivevbus&gt;;</div><div class='ctx'> 	usb1_vbus-supply = &lt;&amp;reg_usb1_vbus&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts<br/>index e9185dad67ee..2bc57d2dcd80 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-i7.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31-i7.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-i7.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-i7.dts</a></div><div class='hunk'>@@ -69,6 +69,29 @@</div><div class='ctx'> 			gpios = &lt;&amp;pio 7 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "simple-audio-card";</div><div class='add'>+		simple-audio-card,name = "On-board SPDIF";</div><div class='add'>+		simple-audio-card,cpu {</div><div class='add'>+			sound-dai = &lt;&amp;spdif&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		simple-audio-card,codec {</div><div class='add'>+			sound-dai = &lt;&amp;spdif_out&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spdif_out: spdif-out {</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "linux,spdif-dit";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;codec {</div><div class='add'>+	allwinner,audio-routing =</div><div class='add'>+		"Headphone", "HP";</div><div class='add'>+	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ehci0 {</div><div class='hunk'>@@ -109,24 +132,19 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_i7: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH13";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH13";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_i7: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH22";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH22";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_i7: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PC27";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PC27";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -137,6 +155,13 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;spdif {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spdif_pins_a&gt;;</div><div class='add'>+	spdif-out = "okay";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts<br/>index 29016a13a2c1..8af5b667a46d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-m9.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31-m9.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-m9.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-m9.dts</a></div><div class='hunk'>@@ -128,24 +128,19 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_m9: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH13";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH13";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_m9: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH22";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH22";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_m9: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PC27";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PC27";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts<br/>index 5faeae429e2a..bf0f5831126f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts</a></div><div class='hunk'>@@ -128,24 +128,19 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_m9: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH13";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH13";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_m9: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH22";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH22";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_m9: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PC27";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PC27";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi<br/>index ce1960453a0b..a4b96184cac1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31.dtsi</a></div><div class='hunk'>@@ -231,6 +231,12 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	de: display-engine {</div><div class='add'>+		compatible = "allwinner,sun6i-a31-display-engine";</div><div class='add'>+		allwinner,pipelines = &lt;&amp;fe0&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	soc@01c00000 {</div><div class='ctx'> 		compatible = "simple-bus";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -246,6 +252,44 @@</div><div class='ctx'> 			#dma-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		tcon0: lcd-controller@01c0c000 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-tcon";</div><div class='add'>+			reg = &lt;0x01c0c000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_AHB1_LCD0&gt;;</div><div class='add'>+			reset-names = "lcd";</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB1_LCD0&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_LCD0_CH0&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_LCD0_CH1&gt;;</div><div class='add'>+			clock-names = "ahb",</div><div class='add'>+				      "tcon-ch0",</div><div class='add'>+				      "tcon-ch1";</div><div class='add'>+			clock-output-names = "tcon0-pixel-clock";</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				tcon0_in: port@0 {</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+					tcon0_in_drc0: endpoint@0 {</div><div class='add'>+						reg = &lt;0&gt;;</div><div class='add'>+						remote-endpoint = &lt;&amp;drc0_out_tcon0&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				tcon0_out: port@1 {</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		mmc0: mmc@01c0f000 {</div><div class='ctx'> 			compatible = "allwinner,sun7i-a20-mmc";</div><div class='ctx'> 			reg = &lt;0x01c0f000 0x1000&gt;;</div><div class='hunk'>@@ -428,124 +472,129 @@</div><div class='ctx'> 				     &lt;GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 				     &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 				     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;ccu CLK_APB1_PIO&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_PIO&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='del'>-			uart0_pins_a: uart0@0 {</div><div class='del'>-				allwinner,pins = "PH20", "PH21";</div><div class='del'>-				allwinner,function = "uart0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+			gmac_pins_gmii_a: gmac_gmii@0 {</div><div class='add'>+				pins = "PA0", "PA1", "PA2", "PA3",</div><div class='add'>+						"PA4", "PA5", "PA6", "PA7",</div><div class='add'>+						"PA8", "PA9", "PA10", "PA11",</div><div class='add'>+						"PA12", "PA13", "PA14",	"PA15",</div><div class='add'>+						"PA16", "PA17", "PA18", "PA19",</div><div class='add'>+						"PA20", "PA21", "PA22", "PA23",</div><div class='add'>+						"PA24", "PA25", "PA26", "PA27";</div><div class='add'>+				function = "gmac";</div><div class='add'>+				/*</div><div class='add'>+				 * data lines in GMII mode run at 125MHz and</div><div class='add'>+				 * might need a higher signal drive strength</div><div class='add'>+				 */</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gmac_pins_mii_a: gmac_mii@0 {</div><div class='add'>+				pins = "PA0", "PA1", "PA2", "PA3",</div><div class='add'>+						"PA8", "PA9", "PA11",</div><div class='add'>+						"PA12", "PA13", "PA14", "PA19",</div><div class='add'>+						"PA20", "PA21", "PA22", "PA23",</div><div class='add'>+						"PA24", "PA26", "PA27";</div><div class='add'>+				function = "gmac";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			gmac_pins_rgmii_a: gmac_rgmii@0 {</div><div class='add'>+				pins = "PA0", "PA1", "PA2", "PA3",</div><div class='add'>+						"PA9", "PA10", "PA11",</div><div class='add'>+						"PA12", "PA13", "PA14", "PA19",</div><div class='add'>+						"PA20", "PA25", "PA26", "PA27";</div><div class='add'>+				function = "gmac";</div><div class='add'>+				/*</div><div class='add'>+				 * data lines in RGMII mode use DDR mode</div><div class='add'>+				 * and need a higher signal drive strength</div><div class='add'>+				 */</div><div class='add'>+				drive-strength = &lt;40&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c0_pins_a: i2c0@0 {</div><div class='del'>-				allwinner,pins = "PH14", "PH15";</div><div class='del'>-				allwinner,function = "i2c0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PH14", "PH15";</div><div class='add'>+				function = "i2c0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c1_pins_a: i2c1@0 {</div><div class='del'>-				allwinner,pins = "PH16", "PH17";</div><div class='del'>-				allwinner,function = "i2c1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PH16", "PH17";</div><div class='add'>+				function = "i2c1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c2_pins_a: i2c2@0 {</div><div class='del'>-				allwinner,pins = "PH18", "PH19";</div><div class='del'>-				allwinner,function = "i2c2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PH18", "PH19";</div><div class='add'>+				function = "i2c2";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			lcd0_rgb888_pins: lcd0_rgb888 {</div><div class='add'>+				pins = "PD0", "PD1", "PD2", "PD3",</div><div class='add'>+						 "PD4", "PD5", "PD6", "PD7",</div><div class='add'>+						 "PD8", "PD9", "PD10", "PD11",</div><div class='add'>+						 "PD12", "PD13", "PD14", "PD15",</div><div class='add'>+						 "PD16", "PD17", "PD18", "PD19",</div><div class='add'>+						 "PD20", "PD21", "PD22", "PD23",</div><div class='add'>+						 "PD24", "PD25", "PD26", "PD27";</div><div class='add'>+				function = "lcd0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc0_pins_a: mmc0@0 {</div><div class='del'>-				allwinner,pins = "PF0", "PF1", "PF2",</div><div class='add'>+				pins = "PF0", "PF1", "PF2",</div><div class='ctx'> 						 "PF3", "PF4", "PF5";</div><div class='del'>-				allwinner,function = "mmc0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				function = "mmc0";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc1_pins_a: mmc1@0 {</div><div class='del'>-				allwinner,pins = "PG0", "PG1", "PG2", "PG3",</div><div class='add'>+				pins = "PG0", "PG1", "PG2", "PG3",</div><div class='ctx'> 						 "PG4", "PG5";</div><div class='del'>-				allwinner,function = "mmc1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				function = "mmc1";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc2_pins_a: mmc2@0 {</div><div class='del'>-				allwinner,pins = "PC6", "PC7", "PC8", "PC9",</div><div class='add'>+				pins = "PC6", "PC7", "PC8", "PC9",</div><div class='ctx'> 						 "PC10", "PC11";</div><div class='del'>-				allwinner,function = "mmc2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+				function = "mmc2";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc2_8bit_emmc_pins: mmc2@1 {</div><div class='del'>-				allwinner,pins = "PC6", "PC7", "PC8", "PC9",</div><div class='add'>+				pins = "PC6", "PC7", "PC8", "PC9",</div><div class='ctx'> 						 "PC10", "PC11", "PC12",</div><div class='ctx'> 						 "PC13", "PC14", "PC15",</div><div class='ctx'> 						 "PC24";</div><div class='del'>-				allwinner,function = "mmc2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				function = "mmc2";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc3_8bit_emmc_pins: mmc3@1 {</div><div class='del'>-				allwinner,pins = "PC6", "PC7", "PC8", "PC9",</div><div class='add'>+				pins = "PC6", "PC7", "PC8", "PC9",</div><div class='ctx'> 						 "PC10", "PC11", "PC12",</div><div class='ctx'> 						 "PC13", "PC14", "PC15",</div><div class='ctx'> 						 "PC24";</div><div class='del'>-				allwinner,function = "mmc3";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_40_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				function = "mmc3";</div><div class='add'>+				drive-strength = &lt;40&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gmac_pins_mii_a: gmac_mii@0 {</div><div class='del'>-				allwinner,pins = "PA0", "PA1", "PA2", "PA3",</div><div class='del'>-						"PA8", "PA9", "PA11",</div><div class='del'>-						"PA12", "PA13", "PA14", "PA19",</div><div class='del'>-						"PA20", "PA21", "PA22", "PA23",</div><div class='del'>-						"PA24", "PA26", "PA27";</div><div class='del'>-				allwinner,function = "gmac";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+			spdif_pins_a: spdif@0 {</div><div class='add'>+				pins = "PH28";</div><div class='add'>+				function = "spdif";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gmac_pins_gmii_a: gmac_gmii@0 {</div><div class='del'>-				allwinner,pins = "PA0", "PA1", "PA2", "PA3",</div><div class='del'>-						"PA4", "PA5", "PA6", "PA7",</div><div class='del'>-						"PA8", "PA9", "PA10", "PA11",</div><div class='del'>-						"PA12", "PA13", "PA14",	"PA15",</div><div class='del'>-						"PA16", "PA17", "PA18", "PA19",</div><div class='del'>-						"PA20", "PA21", "PA22", "PA23",</div><div class='del'>-						"PA24", "PA25", "PA26", "PA27";</div><div class='del'>-				allwinner,function = "gmac";</div><div class='del'>-				/*</div><div class='del'>-				 * data lines in GMII mode run at 125MHz and</div><div class='del'>-				 * might need a higher signal drive strength</div><div class='del'>-				 */</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			gmac_pins_rgmii_a: gmac_rgmii@0 {</div><div class='del'>-				allwinner,pins = "PA0", "PA1", "PA2", "PA3",</div><div class='del'>-						"PA9", "PA10", "PA11",</div><div class='del'>-						"PA12", "PA13", "PA14", "PA19",</div><div class='del'>-						"PA20", "PA25", "PA26", "PA27";</div><div class='del'>-				allwinner,function = "gmac";</div><div class='del'>-				/*</div><div class='del'>-				 * data lines in RGMII mode use DDR mode</div><div class='del'>-				 * and need a higher signal drive strength</div><div class='del'>-				 */</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_40_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+			uart0_pins_a: uart0@0 {</div><div class='add'>+				pins = "PH20", "PH21";</div><div class='add'>+				function = "uart0";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -565,6 +614,19 @@</div><div class='ctx'> 			reg = &lt;0x01c20ca0 0x20&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		spdif: spdif@01c21000 {</div><div class='add'>+			#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "allwinner,sun6i-a31-spdif";</div><div class='add'>+			reg = &lt;0x01c21000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_SPDIF&gt;, &lt;&amp;ccu CLK_SPDIF&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_APB1_SPDIF&gt;;</div><div class='add'>+			clock-names = "apb", "spdif";</div><div class='add'>+			dmas = &lt;&amp;dma 2&gt;, &lt;&amp;dma 2&gt;;</div><div class='add'>+			dma-names = "rx", "tx";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		lradc: lradc@01c22800 {</div><div class='ctx'> 			compatible = "allwinner,sun4i-a10-lradc-keys";</div><div class='ctx'> 			reg = &lt;0x01c22800 0x100&gt;;</div><div class='hunk'>@@ -728,6 +790,19 @@</div><div class='ctx'> 			reset-names = "ahb";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		codec: codec@01c22c00 {</div><div class='add'>+			#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "allwinner,sun6i-a31-codec";</div><div class='add'>+			reg = &lt;0x01c22c00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_APB1_CODEC&gt;, &lt;&amp;ccu CLK_CODEC&gt;;</div><div class='add'>+			clock-names = "apb", "codec";</div><div class='add'>+			resets = &lt;&amp;ccu RST_APB1_CODEC&gt;;</div><div class='add'>+			dmas = &lt;&amp;dma 15&gt;, &lt;&amp;dma 15&gt;;</div><div class='add'>+			dma-names = "rx", "tx";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		timer@01c60000 {</div><div class='ctx'> 			compatible = "allwinner,sun6i-a31-hstimer",</div><div class='ctx'> 				     "allwinner,sun7i-a20-hstimer";</div><div class='hunk'>@@ -791,7 +866,7 @@</div><div class='ctx'> 		gic: interrupt-controller@01c81000 {</div><div class='ctx'> 			compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";</div><div class='ctx'> 			reg = &lt;0x01c81000 0x1000&gt;,</div><div class='del'>-			      &lt;0x01c82000 0x1000&gt;,</div><div class='add'>+			      &lt;0x01c82000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c84000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c86000 0x2000&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='hunk'>@@ -799,6 +874,115 @@</div><div class='ctx'> 			interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		fe0: display-frontend@01e00000 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-display-frontend";</div><div class='add'>+			reg = &lt;0x01e00000 0x20000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB1_FE0&gt;, &lt;&amp;ccu CLK_FE0&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_DRAM_FE0&gt;;</div><div class='add'>+			clock-names = "ahb", "mod",</div><div class='add'>+				      "ram";</div><div class='add'>+			resets = &lt;&amp;ccu RST_AHB1_FE0&gt;;</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				fe0_out: port@1 {</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+					fe0_out_be0: endpoint@0 {</div><div class='add'>+						reg = &lt;0&gt;;</div><div class='add'>+						remote-endpoint = &lt;&amp;be0_in_fe0&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		be0: display-backend@01e60000 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-display-backend";</div><div class='add'>+			reg = &lt;0x01e60000 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB1_BE0&gt;, &lt;&amp;ccu CLK_BE0&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_DRAM_BE0&gt;;</div><div class='add'>+			clock-names = "ahb", "mod",</div><div class='add'>+				      "ram";</div><div class='add'>+			resets = &lt;&amp;ccu RST_AHB1_BE0&gt;;</div><div class='add'>+</div><div class='add'>+			assigned-clocks = &lt;&amp;ccu CLK_BE0&gt;;</div><div class='add'>+			assigned-clock-rates = &lt;300000000&gt;;</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				be0_in: port@0 {</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+					be0_in_fe0: endpoint@0 {</div><div class='add'>+						reg = &lt;0&gt;;</div><div class='add'>+						remote-endpoint = &lt;&amp;fe0_out_be0&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				be0_out: port@1 {</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+					be0_out_drc0: endpoint@0 {</div><div class='add'>+						reg = &lt;0&gt;;</div><div class='add'>+						remote-endpoint = &lt;&amp;drc0_in_be0&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		drc0: drc@01e70000 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-drc";</div><div class='add'>+			reg = &lt;0x01e70000 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_AHB1_DRC0&gt;, &lt;&amp;ccu CLK_IEP_DRC0&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_DRAM_DRC0&gt;;</div><div class='add'>+			clock-names = "ahb", "mod",</div><div class='add'>+				      "ram";</div><div class='add'>+			resets = &lt;&amp;ccu RST_AHB1_DRC0&gt;;</div><div class='add'>+</div><div class='add'>+			assigned-clocks = &lt;&amp;ccu CLK_IEP_DRC0&gt;;</div><div class='add'>+			assigned-clock-rates = &lt;300000000&gt;;</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				drc0_in: port@0 {</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+					drc0_in_be0: endpoint@0 {</div><div class='add'>+						reg = &lt;0&gt;;</div><div class='add'>+						remote-endpoint = &lt;&amp;be0_out_drc0&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				drc0_out: port@1 {</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+					drc0_out_tcon0: endpoint@0 {</div><div class='add'>+						reg = &lt;0&gt;;</div><div class='add'>+						remote-endpoint = &lt;&amp;tcon0_in_drc0&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		rtc: rtc@01f00000 {</div><div class='ctx'> 			compatible = "allwinner,sun6i-a31-rtc";</div><div class='ctx'> 			reg = &lt;0x01f00000 0x54&gt;;</div><div class='hunk'>@@ -886,7 +1070,8 @@</div><div class='ctx'> 			reg = &lt;0x01f02c00 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 				     &lt;GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;apb0_gates 0&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='ctx'> 			resets = &lt;&amp;apb0_rst 0&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			interrupt-controller;</div><div class='hunk'>@@ -895,17 +1080,13 @@</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			ir_pins_a: ir@0 {</div><div class='del'>-				allwinner,pins = "PL4";</div><div class='del'>-				allwinner,function = "s_ir";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PL4";</div><div class='add'>+				function = "s_ir";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			p2wi_pins: p2wi {</div><div class='del'>-				allwinner,pins = "PL0", "PL1";</div><div class='del'>-				allwinner,function = "s_p2wi";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PL0", "PL1";</div><div class='add'>+				function = "s_p2wi";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts<br/>index 73c133f5e79c..2238eda318f6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31s-primo81.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31s-primo81.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31s-primo81.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31s-primo81.dts</a></div><div class='hunk'>@@ -134,24 +134,20 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	gt911_int_primo81: gt911_int_pin@0 {</div><div class='del'>-		allwinner,pins = "PA3";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PA3";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mma8452_int_primo81: mma8452_int_pin@0 {</div><div class='del'>-		allwinner,pins = "PA9";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PA9";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_primo81: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PA8";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PA8";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts<br/>index 6ead2f5c847a..7ff68bdd7109 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31s-sina31s.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31s-sina31s.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31s-sina31s.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31s-sina31s.dts</a></div><div class='hunk'>@@ -65,6 +65,14 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;codec {</div><div class='add'>+	allwinner,audio-routing =</div><div class='add'>+		"Line Out", "LINEOUT",</div><div class='add'>+		"MIC1", "Mic",</div><div class='add'>+		"Mic",	"MBIAS";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;ehci0 {</div><div class='ctx'> 	/* USB 2.0 4 port hub IC */</div><div class='ctx'> 	status = "okay";</div><div class='hunk'>@@ -128,17 +136,14 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pin_sina31s: led_pin@0 {</div><div class='del'>-		allwinner,pins = "PH13";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH13";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_sina31s: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PA4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PA4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -148,6 +153,11 @@</div><div class='ctx'> 	regulator-name = "vcc-gmac-phy";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;usb_otg {</div><div class='add'>+	dr_mode = "peripheral";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usbphy {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts<br/>index db7fa13f5425..3bd862bf82a9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts</a></div><div class='hunk'>@@ -122,7 +122,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc0_pins_a {</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc2 {</div><div class='hunk'>@@ -144,7 +144,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc2_pins_a {</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ohci0 {</div><div class='hunk'>@@ -153,33 +153,26 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin@0 {</div><div class='del'>-		allwinner,pins = "PA21";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PA21";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_bpi_m2: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PG5", "PG10", "PG11";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG5", "PG10", "PG11";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PA4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PA4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	mmc2_pwrseq_pin_bpi_m2: mmc2_pwrseq_pin@0 {</div><div class='del'>-		allwinner,pins = "PL8";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL8";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts<br/>index d6ad6196a768..154ebf5082ed 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts</a></div><div class='hunk'>@@ -92,10 +92,9 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_bs1078v2: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PA8";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PA8";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -110,7 +109,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc0_pins_a {</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;p2wi {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-a31s.dtsi b/arch/arm/boot/dts/sun6i-a31s.dtsi<br/>index c17a32771b98..97e2c51d0aea 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31s.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-a31s.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-a31s.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-a31s.dtsi</a></div><div class='hunk'>@@ -48,6 +48,14 @@</div><div class='ctx'> </div><div class='ctx'> #include "sun6i-a31.dtsi"</div><div class='ctx'> </div><div class='add'>+&amp;de {</div><div class='add'>+	compatible = "allwinner,sun6i-a31s-display-engine";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	compatible = "allwinner,sun6i-a31s-pinctrl";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;tcon0 {</div><div class='add'>+	compatible = "allwinner,sun6i-a31s-tcon";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi<br/>index 0c434304e040..edaba5f904fd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi</a></div><div class='hunk'>@@ -77,17 +77,15 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_e708_q1: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PA8";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PA8";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PA15";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PA15";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts<br/>index ba5bca0fe997..08e776ae095a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts</a></div><div class='hunk'>@@ -105,6 +105,10 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;cpu0 {</div><div class='add'>+	cpu-supply = &lt;&amp;reg_dcdc2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;ehci0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -132,16 +136,14 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='ctx'> 	axp209: pmic@34 {</div><div class='del'>-		compatible = "x-powers,axp209";</div><div class='ctx'> 		reg = &lt;0x34&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;nmi_intc&gt;;</div><div class='ctx'> 		interrupts = &lt;0 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#include "axp209.dtsi"</div><div class='add'>+</div><div class='ctx'> &amp;ir0 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;ir0_rx_pins_a&gt;;</div><div class='hunk'>@@ -167,7 +169,7 @@</div><div class='ctx'> 	mmc-pwrseq = &lt;&amp;mmc3_pwrseq&gt;;</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='ctx'> 	non-removable;</div><div class='del'>-	enable-sdio-wakeup;</div><div class='add'>+	wakeup-source;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='ctx'> 	brcmf: bcrmf@1 {</div><div class='hunk'>@@ -181,7 +183,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mmc3_pins_a {</div><div class='ctx'> 	/* AP6210 requires pull-up */</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ohci0 {</div><div class='hunk'>@@ -192,38 +194,81 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;otg_sram {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	gmac_power_pin_bpi_m1p: gmac_power_pin@0 {</div><div class='del'>-		allwinner,pins = "PH23";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH23";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_bpi_m1p: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH24", "PH25";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH24", "PH25";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_bpi_m1p: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH10";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH10";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc3_pwrseq_pin_bpi_m1p: mmc3_pwrseq_pin@0 {</div><div class='del'>-		allwinner,pins = "PH22";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH22";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;reg_dcdc2 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1400000&gt;;</div><div class='add'>+	regulator-name = "vdd-cpu";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_dcdc3 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1400000&gt;;</div><div class='add'>+	regulator-name = "vdd-int-dll";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo1 {</div><div class='add'>+	regulator-name = "vdd-rtc";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo2 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;3000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+	regulator-name = "avcc";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_usb0_vbus {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;usb_otg {</div><div class='add'>+	dr_mode = "otg";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_power_supply {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy {</div><div class='add'>+	usb0_id_det-gpios = &lt;&amp;pio 7 4 GPIO_ACTIVE_HIGH&gt;; /* PH4 */</div><div class='add'>+	usb0_vbus_power-supply = &lt;&amp;usb_power_supply&gt;;</div><div class='add'>+	usb0_vbus-supply = &lt;&amp;reg_usb0_vbus&gt;;</div><div class='add'>+	/* VBUS on usb host ports are tied to DC5V and therefore always on */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts<br/>index 67c8a7644b99..91f2e5f9efcb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-bananapi.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-bananapi.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-bananapi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-bananapi.dts</a></div><div class='hunk'>@@ -179,31 +179,25 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH10";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH10";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gmac_power_pin_bananapi: gmac_power_pin@0 {</div><div class='del'>-		allwinner,pins = "PH23";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH23";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_bananapi: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH24";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH24";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts<br/>index 18fcc87f4621..83516bc81225 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-bananapro.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-bananapro.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-bananapro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-bananapro.dts</a></div><div class='hunk'>@@ -76,6 +76,13 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	wifi_pwrseq: wifi-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;vmmc3_pin_bananapro&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;pio 7 22 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	reg_gmac_3v3: gmac-3v3 {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='hunk'>@@ -87,23 +94,16 @@</div><div class='ctx'> 		enable-active-high;</div><div class='ctx'> 		gpio = &lt;&amp;pio 7 23 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	reg_vmmc3: vmmc3 {</div><div class='del'>-		compatible = "regulator-fixed";</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;vmmc3_pin_bananapro&gt;;</div><div class='del'>-		regulator-name = "vmmc3";</div><div class='del'>-		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='del'>-		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;pio 7 22 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ahci {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;codec {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;ehci0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -166,10 +166,19 @@</div><div class='ctx'> &amp;mmc3 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;mmc3_pins_a&gt;;</div><div class='del'>-	vmmc-supply = &lt;&amp;reg_vmmc3&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	mmc-pwrseq = &lt;&amp;wifi_pwrseq&gt;;</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='ctx'> 	non-removable;</div><div class='ctx'> 	status = "okay";</div><div class='add'>+</div><div class='add'>+	brcmf: bcrmf@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		compatible = "brcm,bcm4329-fmac";</div><div class='add'>+		interrupt-parent = &lt;&amp;pio&gt;;</div><div class='add'>+		interrupts = &lt;7 15 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupt-names = "host-wake";</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ohci0 {</div><div class='hunk'>@@ -182,45 +191,34 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	gmac_power_pin_bananapro: gmac_power_pin@0 {</div><div class='del'>-		allwinner,pins = "PH23";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH23";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_bananapro: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH24", "PG2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH24", "PG2";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_bananapro: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH10";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH10";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH0";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH0";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH1";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH1";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	vmmc3_pin_bananapro: vmmc3_pin@0 {</div><div class='del'>-		allwinner,pins = "PH22";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH22";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts<br/>index 1fa832d7b469..4dc1e10f88c4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-cubieboard2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-cubieboard2.dts</a></div><div class='hunk'>@@ -160,17 +160,14 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_cubieboard2: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH20", "PH21";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH20", "PH21";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts<br/>index 83f39b0362cb..f019aa3fe96d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-cubietruck.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-cubietruck.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-cubietruck.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-cubietruck.dts</a></div><div class='hunk'>@@ -207,7 +207,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mmc3_pins_a {</div><div class='ctx'> 	/* AP6210 requires pull-up */</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ohci0 {</div><div class='hunk'>@@ -224,45 +224,33 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {</div><div class='del'>-		allwinner,pins = "PH12";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH12";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_cubietruck: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH7", "PH11", "PH20", "PH21";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH7", "PH11", "PH20", "PH21";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc3_pwrseq_pin_cubietruck: mmc3_pwrseq_pin@0 {</div><div class='del'>-		allwinner,pins = "PH9";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH9";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_pin_a: usb0_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH17";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH17";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH19";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH19";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH22";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH22";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts<br/>index 37f4a5497452..e921ba42f170 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-hummingbird.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-hummingbird.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-hummingbird.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-hummingbird.dts</a></div><div class='hunk'>@@ -188,31 +188,23 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	ahci_pwr_pin_a20_hummingbird: ahci_pwr_pin@0 {</div><div class='del'>-		allwinner,pins = "PH15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH15";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_a20_hummingbird: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH2";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc3_vdd_pin_a20_hummingbird: mmc3_vdd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH9";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH9";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gmac_vdd_pin_a20_hummingbird: gmac_vdd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH16";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH16";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts<br/>index 1e6bd360dac0..385fd8232ae0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts</a></div><div class='hunk'>@@ -185,7 +185,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mmc3_pins_a {</div><div class='ctx'> 	/* AP6210 / AP6330 requires pull-up */</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ohci0 {</div><div class='hunk'>@@ -198,31 +198,23 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	vmmc3_pin_i12_tvbox: vmmc3_pin@0 {</div><div class='del'>-		allwinner,pins = "PH2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH2";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	vmmc3_io_pin_i12_tvbox: vmmc3_io_pin@0 {</div><div class='del'>-		allwinner,pins = "PH12";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH12";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gmac_power_pin_i12_tvbox: gmac_power_pin@0 {</div><div class='del'>-		allwinner,pins = "PH21";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH21";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_i12_tvbox: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH9", "PH20";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH9", "PH20";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts<br/>index 10d48cbf81ff..d52222c82cb8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-itead-ibox.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-itead-ibox.dts</a></div><div class='hunk'>@@ -131,10 +131,9 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_itead_core: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH20","PH21";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH20","PH21";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts<br/>index 73c05dab0a69..72ec0d5ae052 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts</a></div><div class='hunk'>@@ -87,7 +87,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ahci_pwr_pin_a {</div><div class='del'>-	allwinner,pins = "PB3";</div><div class='add'>+	pins = "PB3";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ahci {</div><div class='hunk'>@@ -222,31 +222,25 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_lamobo_r1: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH10";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH10";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gmac_power_pin_lamobo_r1: gmac_power_pin@0 {</div><div class='del'>-		allwinner,pins = "PH23";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH23";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_lamobo_r1: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH24";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH24";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -327,7 +321,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb2_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PH12";</div><div class='add'>+	pins = "PH12";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbphy {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts<br/>index 8d9ea48dd98c..0e074bd0e8c9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-m3.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-m3.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-m3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-m3.dts</a></div><div class='hunk'>@@ -145,10 +145,8 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_m3: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH20";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH20";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts<br/>index 90ff4a267025..97d7a8b65a03 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-mk808c.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-mk808c.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-mk808c.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-mk808c.dts</a></div><div class='hunk'>@@ -132,17 +132,13 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts<br/>index 23aacce4d6c7..a1450c10b08e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts</a></div><div class='hunk'>@@ -88,6 +88,10 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;cpu0 {</div><div class='add'>+	cpu-supply = &lt;&amp;reg_dcdc2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;codec {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -116,6 +120,18 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c2_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;lradc {</div><div class='ctx'> 	vref-supply = &lt;&amp;reg_vcc3v0&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='hunk'>@@ -204,38 +220,30 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	ahci_pwr_pin_olimex_som_evb: ahci_pwr_pin@1 {</div><div class='del'>-		allwinner,pins = "PC3";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PC3";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_olimex_som_evb: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH2";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH0";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH0";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -284,12 +292,38 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;spi1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi1_pins_a&gt;,</div><div class='add'>+		    &lt;&amp;spi1_cs0_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spi2_pins_a&gt;,</div><div class='add'>+		    &lt;&amp;spi2_cs0_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;uart6 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart6_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart7 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart7_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usb_otg {</div><div class='ctx'> 	dr_mode = "otg";</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts<br/>index 35ad7006c53c..1297432c2802 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts</a></div><div class='hunk'>@@ -153,31 +153,26 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {</div><div class='del'>-		allwinner,pins = "PC3";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PC3";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_olinuxinolime: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH2";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts<br/>index 5ea4915f6d75..81f376f2a44d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts</a></div><div class='hunk'>@@ -56,11 +56,9 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='del'>-	mmc2_pins_nrst: mmc2@0 {</div><div class='del'>-		allwinner,pins = "PC16";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+	mmc2_pins_nrst: mmc2-rst-pin {</div><div class='add'>+		pins = "PC16";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts<br/>index d5c796c8d16f..71cca5360728 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts</a></div><div class='hunk'>@@ -112,57 +112,9 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='ctx'> 	axp209: pmic@34 {</div><div class='del'>-		compatible = "x-powers,axp209";</div><div class='ctx'> 		reg = &lt;0x34&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;nmi_intc&gt;;</div><div class='ctx'> 		interrupts = &lt;0 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-		acin-supply = &lt;&amp;reg_axp_ipsout&gt;;</div><div class='del'>-		vin2-supply = &lt;&amp;reg_axp_ipsout&gt;;</div><div class='del'>-		vin3-supply = &lt;&amp;reg_axp_ipsout&gt;;</div><div class='del'>-		ldo24in-supply = &lt;&amp;reg_axp_ipsout&gt;;</div><div class='del'>-		ldo3in-supply = &lt;&amp;reg_axp_ipsout&gt;;</div><div class='del'>-</div><div class='del'>-		regulators {</div><div class='del'>-			vdd_rtc: ldo1 {</div><div class='del'>-				regulator-min-microvolt = &lt;1300000&gt;;</div><div class='del'>-				regulator-max-microvolt = &lt;1300000&gt;;</div><div class='del'>-				regulator-always-on;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			avcc: ldo2 {</div><div class='del'>-				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='del'>-				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-				regulator-always-on;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			vcc_csi0: ldo3 {</div><div class='del'>-				regulator-min-microvolt = &lt;700000&gt;;</div><div class='del'>-				regulator-max-microvolt = &lt;3500000&gt;;</div><div class='del'>-				regulator-always-on;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			vcc_csi1: ldo4 {</div><div class='del'>-				regulator-min-microvolt = &lt;1250000&gt;;</div><div class='del'>-				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-				regulator-always-on;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			vdd_cpu: dcdc2 {</div><div class='del'>-				regulator-min-microvolt = &lt;700000&gt;;</div><div class='del'>-				regulator-max-microvolt = &lt;2275000&gt;;</div><div class='del'>-				regulator-always-on;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			vdd_int: dcdc3 {</div><div class='del'>-				regulator-min-microvolt = &lt;700000&gt;;</div><div class='del'>-				regulator-max-microvolt = &lt;3500000&gt;;</div><div class='del'>-				regulator-always-on;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -202,38 +154,31 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {</div><div class='del'>-		allwinner,pins = "PC3";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PC3";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_olinuxinolime: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH2";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_pin_lime2: usb0_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PC17";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PC17";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -243,6 +188,48 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#include "axp209.dtsi"</div><div class='add'>+</div><div class='add'>+&amp;reg_dcdc2 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1400000&gt;;</div><div class='add'>+	regulator-name = "vdd-cpu";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_dcdc3 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1400000&gt;;</div><div class='add'>+	regulator-name = "vdd-int-dll";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo1 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;1300000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1300000&gt;;</div><div class='add'>+	regulator-name = "vdd-rtc";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo2 {</div><div class='add'>+	regulator-always-on;</div><div class='add'>+	regulator-min-microvolt = &lt;3000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+	regulator-name = "avcc";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo3 {</div><div class='add'>+	regulator-min-microvolt = &lt;2800000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+	regulator-name = "vddio-csi0";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;reg_ldo4 {</div><div class='add'>+	regulator-min-microvolt = &lt;2800000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+	regulator-name = "vddio-csi1";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;reg_usb0_vbus {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;usb0_vbus_pin_lime2&gt;;</div><div class='ctx'> 	gpio = &lt;&amp;pio 2 17 GPIO_ACTIVE_HIGH&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts<br/>index 7e3006f6a775..223fbd9f7c62 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts</a></div><div class='hunk'>@@ -227,31 +227,27 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH11";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH11";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_olinuxino: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH2";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_DOWN&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-down;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts<br/>index 2be04c438b1e..a74265749227 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts</a></div><div class='hunk'>@@ -166,52 +166,41 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_orangepi: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH10";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH10";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc3_cd_pin_orangepi: mmc3_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH11";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH11";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH22";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH22";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gmac_power_pin_orangepi: gmac_power_pin@0 {</div><div class='del'>-		allwinner,pins = "PH23";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH23";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_orangepi: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH24", "PH25";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH24", "PH25";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH26";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH26";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts<br/>index 71125bf64575..3de980c8f8ff 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-orangepi.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-orangepi.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-orangepi.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-orangepi.dts</a></div><div class='hunk'>@@ -147,45 +147,35 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_orangepi: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH10";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH10";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH22";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH22";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gmac_power_pin_orangepi: gmac_power_pin@0 {</div><div class='del'>-		allwinner,pins = "PH23";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH23";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_orangepi: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH24";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH24";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH26";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH26";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts<br/>index ddac7328b852..f47a5c46bc20 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts</a></div><div class='hunk'>@@ -152,31 +152,24 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	ahci_pwr_pin_pcduino3_nano: ahci_pwr_pin@0 {</div><div class='del'>-		allwinner,pins = "PH2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH2";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_pcduino3_nano: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH16", "PH15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH16", "PH15";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_pcduino3_nano: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PD2";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PD2";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts<br/>index 1a8b39be1d61..4599f98a3aee 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-pcduino3.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-pcduino3.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-pcduino3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-pcduino3.dts</a></div><div class='hunk'>@@ -108,7 +108,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ahci_pwr_pin_a {</div><div class='del'>-	allwinner,pins = "PH2";</div><div class='add'>+	pins = "PH2";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;codec {</div><div class='hunk'>@@ -183,24 +183,19 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_pcduino3: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PH15", "PH16";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH15", "PH16";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	key_pins_pcduino3: key_pins@0 {</div><div class='del'>-		allwinner,pins = "PH17", "PH18", "PH19";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH17", "PH18", "PH19";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts<br/>index 2f6b21adddd9..e19f17177755 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts</a></div><div class='hunk'>@@ -173,31 +173,24 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	bl_enable_pin: bl_enable_pin@0 {</div><div class='del'>-		allwinner,pins = "PH7";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH7";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	codec_pa_pin: codec_pa_pin@0 {</div><div class='del'>-		allwinner,pins = "PH15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH15";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ts_reset_pin: ts_reset_pin@0 {</div><div class='del'>-		allwinner,pins = "PB13";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB13";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts<br/>index dc31d476ef81..c3078d4f1093 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts</a></div><div class='hunk'>@@ -160,17 +160,14 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	vmmc3_pin_ap6xxx_wl_regon: vmmc3_pin@0 {</div><div class='del'>-		allwinner,pins = "PH9";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH9";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi<br/>index 94cf5a1c7172..2db97fc820dd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun7i-a20.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun7i-a20.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun7i-a20.dtsi</a></div><div class='hunk'>@@ -871,6 +871,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='add'>+			num-cs = &lt;4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		spi1: spi@01c06000 {</div><div class='hunk'>@@ -885,6 +886,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='add'>+			num-cs = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		emac: ethernet@01c0b000 {</div><div class='hunk'>@@ -1037,6 +1039,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='add'>+			num-cs = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		ahci: sata@01c18000 {</div><div class='hunk'>@@ -1079,315 +1082,246 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='add'>+			num-cs = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pio: pinctrl@01c20800 {</div><div class='ctx'> 			compatible = "allwinner,sun7i-a20-pinctrl";</div><div class='ctx'> 			reg = &lt;0x01c20800 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 5&gt;;</div><div class='add'>+			clocks = &lt;&amp;apb0_gates 5&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			clk_out_a_pins_a: clk_out_a@0 {</div><div class='del'>-				allwinner,pins = "PI12";</div><div class='del'>-				allwinner,function = "clk_out_a";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI12";</div><div class='add'>+				function = "clk_out_a";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			clk_out_b_pins_a: clk_out_b@0 {</div><div class='del'>-				allwinner,pins = "PI13";</div><div class='del'>-				allwinner,function = "clk_out_b";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI13";</div><div class='add'>+				function = "clk_out_b";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			emac_pins_a: emac0@0 {</div><div class='del'>-				allwinner,pins = "PA0", "PA1", "PA2",</div><div class='del'>-						"PA3", "PA4", "PA5", "PA6",</div><div class='del'>-						"PA7", "PA8", "PA9", "PA10",</div><div class='del'>-						"PA11", "PA12", "PA13", "PA14",</div><div class='del'>-						"PA15", "PA16";</div><div class='del'>-				allwinner,function = "emac";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PA0", "PA1", "PA2",</div><div class='add'>+				       "PA3", "PA4", "PA5", "PA6",</div><div class='add'>+				       "PA7", "PA8", "PA9", "PA10",</div><div class='add'>+				       "PA11", "PA12", "PA13", "PA14",</div><div class='add'>+				       "PA15", "PA16";</div><div class='add'>+				function = "emac";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			gmac_pins_mii_a: gmac_mii@0 {</div><div class='del'>-				allwinner,pins = "PA0", "PA1", "PA2",</div><div class='del'>-						"PA3", "PA4", "PA5", "PA6",</div><div class='del'>-						"PA7", "PA8", "PA9", "PA10",</div><div class='del'>-						"PA11", "PA12", "PA13", "PA14",</div><div class='del'>-						"PA15", "PA16";</div><div class='del'>-				allwinner,function = "gmac";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PA0", "PA1", "PA2",</div><div class='add'>+				       "PA3", "PA4", "PA5", "PA6",</div><div class='add'>+				       "PA7", "PA8", "PA9", "PA10",</div><div class='add'>+				       "PA11", "PA12", "PA13", "PA14",</div><div class='add'>+				       "PA15", "PA16";</div><div class='add'>+				function = "gmac";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			gmac_pins_rgmii_a: gmac_rgmii@0 {</div><div class='del'>-				allwinner,pins = "PA0", "PA1", "PA2",</div><div class='del'>-						"PA3", "PA4", "PA5", "PA6",</div><div class='del'>-						"PA7", "PA8", "PA10",</div><div class='del'>-						"PA11", "PA12", "PA13",</div><div class='del'>-						"PA15", "PA16";</div><div class='del'>-				allwinner,function = "gmac";</div><div class='add'>+				pins = "PA0", "PA1", "PA2",</div><div class='add'>+				       "PA3", "PA4", "PA5", "PA6",</div><div class='add'>+				        "PA7", "PA8", "PA10",</div><div class='add'>+				       "PA11", "PA12", "PA13",</div><div class='add'>+				       "PA15", "PA16";</div><div class='add'>+				function = "gmac";</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * data lines in RGMII mode use DDR mode</div><div class='ctx'> 				 * and need a higher signal drive strength</div><div class='ctx'> 				 */</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_40_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				drive-strength = &lt;40&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c0_pins_a: i2c0@0 {</div><div class='del'>-				allwinner,pins = "PB0", "PB1";</div><div class='del'>-				allwinner,function = "i2c0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB0", "PB1";</div><div class='add'>+				function = "i2c0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c1_pins_a: i2c1@0 {</div><div class='del'>-				allwinner,pins = "PB18", "PB19";</div><div class='del'>-				allwinner,function = "i2c1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB18", "PB19";</div><div class='add'>+				function = "i2c1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c2_pins_a: i2c2@0 {</div><div class='del'>-				allwinner,pins = "PB20", "PB21";</div><div class='del'>-				allwinner,function = "i2c2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB20", "PB21";</div><div class='add'>+				function = "i2c2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c3_pins_a: i2c3@0 {</div><div class='del'>-				allwinner,pins = "PI0", "PI1";</div><div class='del'>-				allwinner,function = "i2c3";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI0", "PI1";</div><div class='add'>+				function = "i2c3";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ir0_rx_pins_a: ir0@0 {</div><div class='del'>-				    allwinner,pins = "PB4";</div><div class='del'>-				    allwinner,function = "ir0";</div><div class='del'>-				    allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				    allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB4";</div><div class='add'>+				function = "ir0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ir0_tx_pins_a: ir0@1 {</div><div class='del'>-				    allwinner,pins = "PB3";</div><div class='del'>-				    allwinner,function = "ir0";</div><div class='del'>-				    allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				    allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB3";</div><div class='add'>+				function = "ir0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ir1_rx_pins_a: ir1@0 {</div><div class='del'>-				    allwinner,pins = "PB23";</div><div class='del'>-				    allwinner,function = "ir1";</div><div class='del'>-				    allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				    allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB23";</div><div class='add'>+				function = "ir1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ir1_tx_pins_a: ir1@1 {</div><div class='del'>-				    allwinner,pins = "PB22";</div><div class='del'>-				    allwinner,function = "ir1";</div><div class='del'>-				    allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				    allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB22";</div><div class='add'>+				function = "ir1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc0_pins_a: mmc0@0 {</div><div class='del'>-				allwinner,pins = "PF0", "PF1", "PF2",</div><div class='del'>-						 "PF3", "PF4", "PF5";</div><div class='del'>-				allwinner,function = "mmc0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PF0", "PF1", "PF2",</div><div class='add'>+				       "PF3", "PF4", "PF5";</div><div class='add'>+				function = "mmc0";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {</div><div class='del'>-				allwinner,pins = "PH1";</div><div class='del'>-				allwinner,function = "gpio_in";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+				pins = "PH1";</div><div class='add'>+				function = "gpio_in";</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc2_pins_a: mmc2@0 {</div><div class='del'>-				allwinner,pins = "PC6", "PC7", "PC8",</div><div class='del'>-						 "PC9", "PC10", "PC11";</div><div class='del'>-				allwinner,function = "mmc2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+				pins = "PC6", "PC7", "PC8",</div><div class='add'>+				       "PC9", "PC10", "PC11";</div><div class='add'>+				function = "mmc2";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc3_pins_a: mmc3@0 {</div><div class='del'>-				allwinner,pins = "PI4", "PI5", "PI6",</div><div class='del'>-						 "PI7", "PI8", "PI9";</div><div class='del'>-				allwinner,function = "mmc3";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI4", "PI5", "PI6",</div><div class='add'>+				       "PI7", "PI8", "PI9";</div><div class='add'>+				function = "mmc3";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ps20_pins_a: ps20@0 {</div><div class='del'>-				allwinner,pins = "PI20", "PI21";</div><div class='del'>-				allwinner,function = "ps2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI20", "PI21";</div><div class='add'>+				function = "ps2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			ps21_pins_a: ps21@0 {</div><div class='del'>-				allwinner,pins = "PH12", "PH13";</div><div class='del'>-				allwinner,function = "ps2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PH12", "PH13";</div><div class='add'>+				function = "ps2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			pwm0_pins_a: pwm0@0 {</div><div class='del'>-				allwinner,pins = "PB2";</div><div class='del'>-				allwinner,function = "pwm";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB2";</div><div class='add'>+				function = "pwm";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			pwm1_pins_a: pwm1@0 {</div><div class='del'>-				allwinner,pins = "PI3";</div><div class='del'>-				allwinner,function = "pwm";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI3";</div><div class='add'>+				function = "pwm";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spdif_tx_pins_a: spdif@0 {</div><div class='del'>-				allwinner,pins = "PB13";</div><div class='del'>-				allwinner,function = "spdif";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+				pins = "PB13";</div><div class='add'>+				function = "spdif";</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi0_pins_a: spi0@0 {</div><div class='del'>-				allwinner,pins = "PI11", "PI12", "PI13";</div><div class='del'>-				allwinner,function = "spi0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI11", "PI12", "PI13";</div><div class='add'>+				function = "spi0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi0_cs0_pins_a: spi0_cs0@0 {</div><div class='del'>-				allwinner,pins = "PI10";</div><div class='del'>-				allwinner,function = "spi0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI10";</div><div class='add'>+				function = "spi0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi0_cs1_pins_a: spi0_cs1@0 {</div><div class='del'>-				allwinner,pins = "PI14";</div><div class='del'>-				allwinner,function = "spi0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI14";</div><div class='add'>+				function = "spi0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi1_pins_a: spi1@0 {</div><div class='del'>-				allwinner,pins = "PI17", "PI18", "PI19";</div><div class='del'>-				allwinner,function = "spi1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI17", "PI18", "PI19";</div><div class='add'>+				function = "spi1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi1_cs0_pins_a: spi1_cs0@0 {</div><div class='del'>-				allwinner,pins = "PI16";</div><div class='del'>-				allwinner,function = "spi1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI16";</div><div class='add'>+				function = "spi1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi2_pins_a: spi2@0 {</div><div class='del'>-				allwinner,pins = "PC20", "PC21", "PC22";</div><div class='del'>-				allwinner,function = "spi2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PC20", "PC21", "PC22";</div><div class='add'>+				function = "spi2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi2_pins_b: spi2@1 {</div><div class='del'>-				allwinner,pins = "PB15", "PB16", "PB17";</div><div class='del'>-				allwinner,function = "spi2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB15", "PB16", "PB17";</div><div class='add'>+				function = "spi2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi2_cs0_pins_a: spi2_cs0@0 {</div><div class='del'>-				allwinner,pins = "PC19";</div><div class='del'>-				allwinner,function = "spi2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PC19";</div><div class='add'>+				function = "spi2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			spi2_cs0_pins_b: spi2_cs0@1 {</div><div class='del'>-				allwinner,pins = "PB14";</div><div class='del'>-				allwinner,function = "spi2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB14";</div><div class='add'>+				function = "spi2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart0_pins_a: uart0@0 {</div><div class='del'>-				allwinner,pins = "PB22", "PB23";</div><div class='del'>-				allwinner,function = "uart0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB22", "PB23";</div><div class='add'>+				function = "uart0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart2_pins_a: uart2@0 {</div><div class='del'>-				allwinner,pins = "PI16", "PI17", "PI18", "PI19";</div><div class='del'>-				allwinner,function = "uart2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI16", "PI17", "PI18", "PI19";</div><div class='add'>+				function = "uart2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart3_pins_a: uart3@0 {</div><div class='del'>-				allwinner,pins = "PG6", "PG7", "PG8", "PG9";</div><div class='del'>-				allwinner,function = "uart3";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG6", "PG7", "PG8", "PG9";</div><div class='add'>+				function = "uart3";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart3_pins_b: uart3@1 {</div><div class='del'>-				allwinner,pins = "PH0", "PH1";</div><div class='del'>-				allwinner,function = "uart3";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PH0", "PH1";</div><div class='add'>+				function = "uart3";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart4_pins_a: uart4@0 {</div><div class='del'>-				allwinner,pins = "PG10", "PG11";</div><div class='del'>-				allwinner,function = "uart4";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG10", "PG11";</div><div class='add'>+				function = "uart4";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart4_pins_b: uart4@1 {</div><div class='del'>-				allwinner,pins = "PH4", "PH5";</div><div class='del'>-				allwinner,function = "uart4";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PH4", "PH5";</div><div class='add'>+				function = "uart4";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart5_pins_a: uart5@0 {</div><div class='del'>-				allwinner,pins = "PI10", "PI11";</div><div class='del'>-				allwinner,function = "uart5";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI10", "PI11";</div><div class='add'>+				function = "uart5";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart6_pins_a: uart6@0 {</div><div class='del'>-				allwinner,pins = "PI12", "PI13";</div><div class='del'>-				allwinner,function = "uart6";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI12", "PI13";</div><div class='add'>+				function = "uart6";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart7_pins_a: uart7@0 {</div><div class='del'>-				allwinner,pins = "PI20", "PI21";</div><div class='del'>-				allwinner,function = "uart7";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PI20", "PI21";</div><div class='add'>+				function = "uart7";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -1685,9 +1619,9 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		gic: interrupt-controller@01c81000 {</div><div class='del'>-			compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";</div><div class='add'>+			compatible = "arm,gic-400", "arm,cortex-a7-gic", "arm,cortex-a15-gic";</div><div class='ctx'> 			reg = &lt;0x01c81000 0x1000&gt;,</div><div class='del'>-			      &lt;0x01c82000 0x1000&gt;,</div><div class='add'>+			      &lt;0x01c82000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c84000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c86000 0x2000&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi<br/>index 300a1bd5a6ec..a952cc0703cc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23-a33.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-a23-a33.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23-a33.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23-a33.dtsi</a></div><div class='hunk'>@@ -84,7 +84,7 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		cpu@0 {</div><div class='add'>+		cpu0: cpu@0 {</div><div class='ctx'> 			compatible = "arm,cortex-a7";</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			reg = &lt;0&gt;;</div><div class='hunk'>@@ -106,14 +106,16 @@</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;24000000&gt;;</div><div class='add'>+			clock-accuracy = &lt;50000&gt;;</div><div class='ctx'> 			clock-output-names = "osc24M";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		osc32k: osc32k_clk {</div><div class='add'>+		ext_osc32k: ext_osc32k_clk {</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;32768&gt;;</div><div class='del'>-			clock-output-names = "osc32k";</div><div class='add'>+			clock-accuracy = &lt;50000&gt;;</div><div class='add'>+			clock-output-names = "ext-osc32k";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -256,7 +258,7 @@</div><div class='ctx'> </div><div class='ctx'> 		ccu: clock@01c20000 {</div><div class='ctx'> 			reg = &lt;0x01c20000 0x400&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;rtc 0&gt;;</div><div class='ctx'> 			clock-names = "hosc", "losc";</div><div class='ctx'> 			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 			#reset-cells = &lt;1&gt;;</div><div class='hunk'>@@ -266,95 +268,80 @@</div><div class='ctx'> 			/* compatible gets set in SoC specific dtsi file */</div><div class='ctx'> 			reg = &lt;0x01c20800 0x400&gt;;</div><div class='ctx'> 			/* interrupts get set in SoC specific dtsi file */</div><div class='del'>-			clocks = &lt;&amp;ccu CLK_BUS_PIO&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_PIO&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;rtc 0&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			uart0_pins_a: uart0@0 {</div><div class='del'>-				allwinner,pins = "PF2", "PF4";</div><div class='del'>-				allwinner,function = "uart0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PF2", "PF4";</div><div class='add'>+				function = "uart0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart1_pins_a: uart1@0 {</div><div class='del'>-				allwinner,pins = "PG6", "PG7";</div><div class='del'>-				allwinner,function = "uart1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG6", "PG7";</div><div class='add'>+				function = "uart1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart1_pins_cts_rts_a: uart1-cts-rts@0 {</div><div class='del'>-				allwinner,pins = "PG8", "PG9";</div><div class='del'>-				allwinner,function = "uart1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG8", "PG9";</div><div class='add'>+				function = "uart1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc0_pins_a: mmc0@0 {</div><div class='del'>-				allwinner,pins = "PF0", "PF1", "PF2",</div><div class='del'>-						 "PF3", "PF4", "PF5";</div><div class='del'>-				allwinner,function = "mmc0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PF0", "PF1", "PF2",</div><div class='add'>+				       "PF3", "PF4", "PF5";</div><div class='add'>+				function = "mmc0";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc1_pins_a: mmc1@0 {</div><div class='del'>-				allwinner,pins = "PG0", "PG1", "PG2",</div><div class='del'>-						 "PG3", "PG4", "PG5";</div><div class='del'>-				allwinner,function = "mmc1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG0", "PG1", "PG2",</div><div class='add'>+				       "PG3", "PG4", "PG5";</div><div class='add'>+				function = "mmc1";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc2_8bit_pins: mmc2_8bit {</div><div class='del'>-				allwinner,pins = "PC5", "PC6", "PC8",</div><div class='del'>-						 "PC9", "PC10", "PC11",</div><div class='del'>-						 "PC12", "PC13", "PC14",</div><div class='del'>-						 "PC15", "PC16";</div><div class='del'>-				allwinner,function = "mmc2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PC5", "PC6", "PC8",</div><div class='add'>+				       "PC9", "PC10", "PC11",</div><div class='add'>+				       "PC12", "PC13", "PC14",</div><div class='add'>+				       "PC15", "PC16";</div><div class='add'>+				function = "mmc2";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			pwm0_pins: pwm0 {</div><div class='del'>-				allwinner,pins = "PH0";</div><div class='del'>-				allwinner,function = "pwm0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PH0";</div><div class='add'>+				function = "pwm0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c0_pins_a: i2c0@0 {</div><div class='del'>-				allwinner,pins = "PH2", "PH3";</div><div class='del'>-				allwinner,function = "i2c0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PH2", "PH3";</div><div class='add'>+				function = "i2c0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c1_pins_a: i2c1@0 {</div><div class='del'>-				allwinner,pins = "PH4", "PH5";</div><div class='del'>-				allwinner,function = "i2c1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PH4", "PH5";</div><div class='add'>+				function = "i2c1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c2_pins_a: i2c2@0 {</div><div class='del'>-				allwinner,pins = "PE12", "PE13";</div><div class='del'>-				allwinner,function = "i2c2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PE12", "PE13";</div><div class='add'>+				function = "i2c2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			lcd_rgb666_pins: lcd-rgb666@0 {</div><div class='del'>-				allwinner,pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",</div><div class='del'>-						 "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",</div><div class='del'>-			                         "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",</div><div class='del'>-			                         "PD24", "PD25", "PD26", "PD27";</div><div class='del'>-				allwinner,function = "lcd0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",</div><div class='add'>+				       "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",</div><div class='add'>+				       "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",</div><div class='add'>+				       "PD24", "PD25", "PD26", "PD27";</div><div class='add'>+				function = "lcd0";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -485,10 +472,36 @@</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		mali: gpu@1c40000 {</div><div class='add'>+			compatible = "allwinner,sun8i-a23-mali",</div><div class='add'>+				     "allwinner,sun7i-a20-mali", "arm,mali-400";</div><div class='add'>+			reg = &lt;0x01c40000 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "gp",</div><div class='add'>+					  "gpmmu",</div><div class='add'>+					  "pp0",</div><div class='add'>+					  "ppmmu0",</div><div class='add'>+					  "pp1",</div><div class='add'>+					  "ppmmu1",</div><div class='add'>+					  "pmu";</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_GPU&gt;, &lt;&amp;ccu CLK_GPU&gt;;</div><div class='add'>+			clock-names = "bus", "core";</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_GPU&gt;;</div><div class='add'>+</div><div class='add'>+			assigned-clocks = &lt;&amp;ccu CLK_GPU&gt;;</div><div class='add'>+			assigned-clock-rates = &lt;408000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		gic: interrupt-controller@01c81000 {</div><div class='ctx'> 			compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";</div><div class='ctx'> 			reg = &lt;0x01c81000 0x1000&gt;,</div><div class='del'>-			      &lt;0x01c82000 0x1000&gt;,</div><div class='add'>+			      &lt;0x01c82000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c84000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c86000 0x2000&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='hunk'>@@ -501,6 +514,9 @@</div><div class='ctx'> 			reg = &lt;0x01f00000 0x54&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 				     &lt;GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-output-names = "osc32k";</div><div class='add'>+			clocks = &lt;&amp;ext_osc32k&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		nmi_intc: interrupt-controller@01f00c0c {</div><div class='hunk'>@@ -553,6 +569,10 @@</div><div class='ctx'> 				compatible = "allwinner,sun6i-a31-clock-reset";</div><div class='ctx'> 				#reset-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			codec_analog: codec-analog {</div><div class='add'>+				compatible = "allwinner,sun8i-a23-codec-analog";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpucfg@01f01c00 {</div><div class='hunk'>@@ -575,7 +595,8 @@</div><div class='ctx'> 			compatible = "allwinner,sun8i-a23-r-pinctrl";</div><div class='ctx'> 			reg = &lt;0x01f02c00 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;apb0_gates 0&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;rtc 0&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='ctx'> 			resets = &lt;&amp;apb0_rst 0&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			interrupt-controller;</div><div class='hunk'>@@ -585,17 +606,15 @@</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			r_rsb_pins: r_rsb {</div><div class='del'>-				allwinner,pins = "PL0", "PL1";</div><div class='del'>-				allwinner,function = "s_rsb";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+				pins = "PL0", "PL1";</div><div class='add'>+				function = "s_rsb";</div><div class='add'>+				drive-strength = &lt;20&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			r_uart_pins_a: r_uart@0 {</div><div class='del'>-				allwinner,pins = "PL2", "PL3";</div><div class='del'>-				allwinner,function = "s_uart";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PL2", "PL3";</div><div class='add'>+				function = "s_uart";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-a23-evb.dts b/arch/arm/boot/dts/sun8i-a23-evb.dts<br/>index 610786e635fa..c21f5b1b255e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23-evb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-a23-evb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23-evb.dts</a></div><div class='hunk'>@@ -115,10 +115,9 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_evb: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PB4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PB4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts<br/>index a86cbedda34c..649e31339662 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts</a></div><div class='hunk'>@@ -86,25 +86,16 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc1_pins_a {</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	wifi_pwrseq_pin_mid2407: wifi_pwrseq_pin@0 {</div><div class='del'>-		allwinner,pins = "PL6";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL6";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;reg_ldo_io1 {</div><div class='del'>-	regulator-min-microvolt = &lt;3300000&gt;;</div><div class='del'>-	regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-	regulator-name = "vcc-touchscreen";</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;touchscreen {</div><div class='ctx'> 	reg = &lt;0x40&gt;;</div><div class='ctx'> 	compatible = "silead,gsl1680";</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts<br/>index 9955f85f9147..6b3bcae089f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts</a></div><div class='hunk'>@@ -79,15 +79,13 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc1_pins_a {</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	wifi_pwrseq_pin_mid2809: wifi_pwrseq_pin@0 {</div><div class='del'>-		allwinner,pins = "PL6";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL6";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts b/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts<br/>index 956320a6cc78..3ab5c0c09d93 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-a23-q8-tablet.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23-q8-tablet.dts</a></div><div class='hunk'>@@ -48,3 +48,26 @@</div><div class='ctx'> 	model = "Q8 A23 Tablet";</div><div class='ctx'> 	compatible = "allwinner,q8-a23", "allwinner,sun8i-a23";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;codec {</div><div class='add'>+	pinctrl-0 = &lt;&amp;codec_pa_pin&gt;;</div><div class='add'>+	allwinner,pa-gpios = &lt;&amp;pio 7 9 GPIO_ACTIVE_HIGH&gt;; /* PH9 */</div><div class='add'>+	allwinner,audio-routing =</div><div class='add'>+		"Headphone", "HP",</div><div class='add'>+		"Headphone", "HPCOM",</div><div class='add'>+		"Speaker", "HP",</div><div class='add'>+		"MIC1", "Mic",</div><div class='add'>+		"MIC2", "Headset Mic",</div><div class='add'>+		"Mic",  "MBIAS",</div><div class='add'>+		"Headset Mic", "HBIAS";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pio {</div><div class='add'>+	codec_pa_pin: codec_pa_pin@0 {</div><div class='add'>+		allwinner,pins = "PH9";</div><div class='add'>+		allwinner,function = "gpio_out";</div><div class='add'>+		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='add'>+		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi<br/>index 54d045dab825..4d1f929780a8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-a23.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a23.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a23.dtsi</a></div><div class='hunk'>@@ -48,6 +48,22 @@</div><div class='ctx'> 	memory {</div><div class='ctx'> 		reg = &lt;0x40000000 0x40000000&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	soc@01c00000 {</div><div class='add'>+		codec: codec@01c22c00 {</div><div class='add'>+			#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "allwinner,sun8i-a23-codec";</div><div class='add'>+			reg = &lt;0x01c22c00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_CODEC&gt;, &lt;&amp;ccu CLK_AC_DIG&gt;;</div><div class='add'>+			clock-names = "apb", "codec";</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_CODEC&gt;;</div><div class='add'>+			dmas = &lt;&amp;dma 15&gt;, &lt;&amp;dma 15&gt;;</div><div class='add'>+			dma-names = "rx", "tx";</div><div class='add'>+			allwinner,codec-analog-controls = &lt;&amp;codec_analog&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ccu {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts<br/>index fb4665576dff..3e05959104f1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts</a></div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc1_pins_a {</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc1 {</div><div class='hunk'>@@ -89,10 +89,9 @@</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	led_pin_d978: led_pin_d978@0 {</div><div class='del'>-		allwinner,pins = "PL5";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL5";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+		drive-strength = &lt;20&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts<br/>index 9ea637e82b2d..be9a6b8d7a1e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a33-olinuxino.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-a33-olinuxino.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a33-olinuxino.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a33-olinuxino.dts</a></div><div class='hunk'>@@ -92,24 +92,18 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pin_olinuxino: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PB7";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB7";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PB4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB4";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PB3";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB3";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -126,7 +120,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#include "axp22x.dtsi"</div><div class='add'>+#include "axp223.dtsi"</div><div class='ctx'> </div><div class='ctx'> &amp;reg_aldo1 {</div><div class='ctx'> 	regulator-always-on;</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts<br/>index fef6abc0a703..03b89bdd55ba 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts</a></div><div class='hunk'>@@ -61,6 +61,35 @@</div><div class='ctx'> 	chosen {</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	panel {</div><div class='add'>+		compatible = "netron-dy,e231732";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		port@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			panel_input: endpoint@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				remote-endpoint = &lt;&amp;tcon0_out_panel&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;codec {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;de {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dai {</div><div class='add'>+	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ehci0 {</div><div class='hunk'>@@ -115,9 +144,9 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mmc2_8bit_pins {</div><div class='ctx'> 	/* Increase drive strength for DDR modes */</div><div class='del'>-	allwinner,drive = &lt;SUN4I_PINCTRL_40_MA&gt;;</div><div class='add'>+	drive-strength = &lt;40&gt;;</div><div class='ctx'> 	/* eMMC is missing pull-ups */</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ohci0 {</div><div class='hunk'>@@ -126,10 +155,9 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_sina33: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PB4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PB4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -145,7 +173,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#include "axp22x.dtsi"</div><div class='add'>+#include "axp223.dtsi"</div><div class='ctx'> </div><div class='ctx'> &amp;reg_aldo1 {</div><div class='ctx'> 	regulator-always-on;</div><div class='hunk'>@@ -207,12 +235,34 @@</div><div class='ctx'> 	regulator-name = "vcc-rtc";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;sound {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tcon0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;lcd_rgb666_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tcon0_out {</div><div class='add'>+	tcon0_out_panel: endpoint@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		remote-endpoint = &lt;&amp;panel_input&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart0_pins_b&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;usb_otg {</div><div class='add'>+	dr_mode = "peripheral";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;usbphy {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> 	usb1_vbus-supply = &lt;&amp;reg_vcc5v0&gt;; /* USB1 VBUS is always on */</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi<br/>index fd1e1cddd4a8..18c174fef84f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a33.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-a33.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a33.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a33.dtsi</a></div><div class='hunk'>@@ -45,7 +45,42 @@</div><div class='ctx'> #include "sun8i-a23-a33.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	cpu0_opp_table: opp_table0 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@648000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;648000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1040000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;244144&gt;; /* 8 32k periods */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		opp@816000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;816000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1100000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;244144&gt;; /* 8 32k periods */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		opp@1008000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1008000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1200000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;244144&gt;; /* 8 32k periods */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		opp@1200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1200000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1320000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;244144&gt;; /* 8 32k periods */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	cpus {</div><div class='add'>+		cpu@0 {</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_CPUX&gt;;</div><div class='add'>+			clock-names = "cpu";</div><div class='add'>+			operating-points-v2 = &lt;&amp;cpu0_opp_table&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		cpu@2 {</div><div class='ctx'> 			compatible = "arm,cortex-a7";</div><div class='ctx'> 			device_type = "cpu";</div><div class='hunk'>@@ -69,6 +104,28 @@</div><div class='ctx'> 		reg = &lt;0x40000000 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	sound: sound {</div><div class='add'>+		compatible = "simple-audio-card";</div><div class='add'>+		simple-audio-card,name = "sun8i-a33-audio";</div><div class='add'>+		simple-audio-card,format = "i2s";</div><div class='add'>+		simple-audio-card,frame-master = &lt;&amp;link_codec&gt;;</div><div class='add'>+		simple-audio-card,bitclock-master = &lt;&amp;link_codec&gt;;</div><div class='add'>+		simple-audio-card,mclk-fs = &lt;512&gt;;</div><div class='add'>+		simple-audio-card,aux-devs = &lt;&amp;codec_analog&gt;;</div><div class='add'>+		simple-audio-card,routing =</div><div class='add'>+			"Left DAC", "Digital Left DAC",</div><div class='add'>+			"Right DAC", "Digital Right DAC";</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='add'>+		simple-audio-card,cpu {</div><div class='add'>+			sound-dai = &lt;&amp;dai&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		link_codec: simple-audio-card,codec {</div><div class='add'>+			sound-dai = &lt;&amp;codec&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	soc@01c00000 {</div><div class='ctx'> 		tcon0: lcd-controller@01c0c000 {</div><div class='ctx'> 			compatible = "allwinner,sun8i-a33-tcon";</div><div class='hunk'>@@ -116,6 +173,29 @@</div><div class='ctx'> 			reset-names = "ahb";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		dai: dai@01c22c00 {</div><div class='add'>+			#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "allwinner,sun6i-a31-i2s";</div><div class='add'>+			reg = &lt;0x01c22c00 0x200&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_CODEC&gt;, &lt;&amp;ccu CLK_AC_DIG&gt;;</div><div class='add'>+			clock-names = "apb", "mod";</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_CODEC&gt;;</div><div class='add'>+			dmas = &lt;&amp;dma 15&gt;, &lt;&amp;dma 15&gt;;</div><div class='add'>+			dma-names = "rx", "tx";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		codec: codec@01c22e00 {</div><div class='add'>+			#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "allwinner,sun8i-a33-codec";</div><div class='add'>+			reg = &lt;0x01c22e00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_CODEC&gt;, &lt;&amp;ccu CLK_AC_DIG&gt;;</div><div class='add'>+			clock-names = "bus", "mod";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		fe0: display-frontend@01e00000 {</div><div class='ctx'> 			compatible = "allwinner,sun8i-a33-display-frontend";</div><div class='ctx'> 			reg = &lt;0x01e00000 0x20000&gt;;</div><div class='hunk'>@@ -238,10 +318,8 @@</div><div class='ctx'> 		     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> </div><div class='ctx'> 	uart0_pins_b: uart0@1 {</div><div class='del'>-		allwinner,pins = "PB0", "PB1";</div><div class='del'>-		allwinner,function = "uart0";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB0", "PB1";</div><div class='add'>+		function = "uart0";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi<br/>index d3473f81b12f..a789a7caf217 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a83t.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-a83t.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-a83t.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-a83t.dtsi</a></div><div class='hunk'>@@ -167,25 +167,21 @@</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			mmc0_pins_a: mmc0@0 {</div><div class='del'>-				allwinner,pins = "PF0", "PF1", "PF2",</div><div class='del'>-						 "PF3", "PF4", "PF5";</div><div class='del'>-				allwinner,function = "mmc0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PF0", "PF1", "PF2",</div><div class='add'>+				       "PF3", "PF4", "PF5";</div><div class='add'>+				function = "mmc0";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart0_pins_a: uart0@0 {</div><div class='del'>-				allwinner,pins = "PF2", "PF4";</div><div class='del'>-				allwinner,function = "uart0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PF2", "PF4";</div><div class='add'>+				function = "uart0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart0_pins_b: uart0@1 {</div><div class='del'>-				allwinner,pins = "PB9", "PB10";</div><div class='del'>-				allwinner,function = "uart0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PB9", "PB10";</div><div class='add'>+				function = "uart0";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -217,7 +213,7 @@</div><div class='ctx'> 		gic: interrupt-controller@01c81000 {</div><div class='ctx'> 			compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";</div><div class='ctx'> 			reg = &lt;0x01c81000 0x1000&gt;,</div><div class='del'>-			      &lt;0x01c82000 0x1000&gt;,</div><div class='add'>+			      &lt;0x01c82000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c84000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c86000 0x2000&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts<br/>new file mode 100644<br/>index 000000000000..b7ca916d871d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts</a></div><div class='hunk'>@@ -0,0 +1,160 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Icenowy Zheng &lt;icenowy@aosc.xyz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on sun8i-h3-orangepi-one.dts, which is:</div><div class='add'>+ *   Copyright (C) 2016 Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "sun8i-h3.dtsi"</div><div class='add'>+#include "sunxi-common-regulators.dtsi"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include &lt;dt-bindings/pinctrl/sun4i-a10.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Xunlong Orange Pi Zero";</div><div class='add'>+	compatible = "xunlong,orangepi-zero", "allwinner,sun8i-h2-plus";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart0;</div><div class='add'>+		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */</div><div class='add'>+		ethernet1 = &amp;xr819;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		pwr_led {</div><div class='add'>+			label = "orangepi:green:pwr";</div><div class='add'>+			gpios = &lt;&amp;r_pio 0 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "on";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		status_led {</div><div class='add'>+			label = "orangepi:red:status";</div><div class='add'>+			gpios = &lt;&amp;pio 0 17 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_vcc_wifi: reg_vcc_wifi {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-name = "vcc-wifi";</div><div class='add'>+		enable-active-high;</div><div class='add'>+		gpio = &lt;&amp;pio 0 20 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wifi_pwrseq: wifi_pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		reset-gpios = &lt;&amp;r_pio 0 7 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		post-power-on-delay-ms = &lt;200&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ehci1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc0_pins_a&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;pio 5 6 GPIO_ACTIVE_HIGH&gt;; /* PF6 */</div><div class='add'>+	cd-inverted;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc1_pins_a&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc_wifi&gt;;</div><div class='add'>+	mmc-pwrseq = &lt;&amp;wifi_pwrseq&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Explicitly define the sdio device, so that we can add an ethernet</div><div class='add'>+	 * alias for it (which e.g. makes u-boot set a mac-address).</div><div class='add'>+	 */</div><div class='add'>+	xr819: sdio_wifi@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1_pins_a {</div><div class='add'>+	bias-pull-up;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ohci1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart1_pins&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart2_pins&gt;;</div><div class='add'>+	status = "disabled";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy {</div><div class='add'>+	/* USB VBUS is always on */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts<br/>index 06fddaae8edd..c0c49dd4d3b2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts</a></div><div class='hunk'>@@ -156,24 +156,18 @@</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	pwr_led_bpi_m2p: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PL10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL10";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sw_r_bpi_m2p: key_pins@0 {</div><div class='del'>-		allwinner,pins = "PL3";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL3";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	wifi_en_bpi_m2p: wifi_en_pin {</div><div class='del'>-		allwinner,pins = "PL7";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL7";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts<br/>new file mode 100644<br/>index 000000000000..25b225b7dfd6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-beelink-x2.dts</a></div><div class='hunk'>@@ -0,0 +1,160 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2017 Marcus Cooper &lt;codekipper@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "sun8i-h3.dtsi"</div><div class='add'>+#include "sunxi-common-regulators.dtsi"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include &lt;dt-bindings/pinctrl/sun4i-a10.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Beelink X2";</div><div class='add'>+	compatible = "roofull,beelink-x2", "allwinner,sun8i-h3";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart0;</div><div class='add'>+		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */</div><div class='add'>+		ethernet1 = &amp;sdiowifi;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		blue {</div><div class='add'>+			label = "beelink-x2:blue:pwr";</div><div class='add'>+			gpios = &lt;&amp;r_pio 0 10 GPIO_ACTIVE_HIGH&gt;; /* PL10 */</div><div class='add'>+			default-state = "on";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		red {</div><div class='add'>+			label = "beelink-x2:red:standby";</div><div class='add'>+			gpios = &lt;&amp;pio 0 15 GPIO_ACTIVE_HIGH&gt;; /* PA15 */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wifi_pwrseq: wifi_pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		reset-gpios = &lt;&amp;r_pio 0 7 GPIO_ACTIVE_LOW&gt;; /* PL7 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound_spdif {</div><div class='add'>+		compatible = "simple-audio-card";</div><div class='add'>+		simple-audio-card,name = "On-board SPDIF";</div><div class='add'>+</div><div class='add'>+		simple-audio-card,cpu {</div><div class='add'>+			sound-dai = &lt;&amp;spdif&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		simple-audio-card,codec {</div><div class='add'>+			sound-dai = &lt;&amp;spdif_out&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spdif_out: spdif-out {</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "linux,spdif-dit";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ehci1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ir {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;ir_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc0_pins_a&gt;, &lt;&amp;mmc0_cd_pin&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;pio 5 6 GPIO_ACTIVE_HIGH&gt;; /* PF6 */</div><div class='add'>+	cd-inverted;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc1_pins_a&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Explicitly define the sdio device, so that we can add an ethernet</div><div class='add'>+	 * alias for it (which e.g. makes u-boot set a mac-address).</div><div class='add'>+	 */</div><div class='add'>+	sdiowifi: sdio_wifi@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ohci1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spdif {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;spdif_tx_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy {</div><div class='add'>+	/* USB VBUS is on as long as VCC-IO is on */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts<br/>new file mode 100644<br/>index 000000000000..ec63d104b404<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Milo Kim &lt;woogyom.kim@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "sun8i-h3-nanopi.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "FriendlyArm NanoPi M1";</div><div class='add'>+	compatible = "friendlyarm,nanopi-m1", "allwinner,sun8i-h3";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ehci1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ehci2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ohci1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ohci2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts<br/>index 3d64cafc1e90..8d2cc6e9a03f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts</a></div><div class='hunk'>@@ -40,86 +40,9 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='del'>-#include "sun8i-h3.dtsi"</div><div class='del'>-#include "sunxi-common-regulators.dtsi"</div><div class='del'>-</div><div class='del'>-#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='del'>-#include &lt;dt-bindings/pinctrl/sun4i-a10.h&gt;</div><div class='add'>+#include "sun8i-h3-nanopi.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "FriendlyARM NanoPi NEO";</div><div class='ctx'> 	compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3";</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		serial0 = &amp;uart0;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	chosen {</div><div class='del'>-		stdout-path = "serial0:115200n8";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	leds {</div><div class='del'>-		compatible = "gpio-leds";</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;leds_opc&gt;, &lt;&amp;leds_r_opc&gt;;</div><div class='del'>-</div><div class='del'>-		pwr {</div><div class='del'>-			label = "nanopi:green:pwr";</div><div class='del'>-			gpios = &lt;&amp;r_pio 0 10 GPIO_ACTIVE_HIGH&gt;; /* PL10 */</div><div class='del'>-			default-state = "on";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		status {</div><div class='del'>-			label = "nanopi:blue:status";</div><div class='del'>-			gpios = &lt;&amp;pio 0 10 GPIO_ACTIVE_HIGH&gt;; /* PA10 */</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;ehci3 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;mmc0 {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;mmc0_pins_a&gt;, &lt;&amp;mmc0_cd_pin&gt;;</div><div class='del'>-	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='del'>-	bus-width = &lt;4&gt;;</div><div class='del'>-	cd-gpios = &lt;&amp;pio 5 6 GPIO_ACTIVE_HIGH&gt;; /* PF6 */</div><div class='del'>-	cd-inverted;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;ohci3 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;pio {</div><div class='del'>-	leds_opc: led-pins {</div><div class='del'>-		allwinner,pins = "PA10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;r_pio {</div><div class='del'>-	leds_r_opc: led-pins {</div><div class='del'>-		allwinner,pins = "PL10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;uart0 {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;usbphy {</div><div class='del'>-	/* USB VBUS is always on */</div><div class='del'>-	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi<br/>new file mode 100644<br/>index 000000000000..2216e68d1838<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-nanopi.dtsi</a></div><div class='hunk'>@@ -0,0 +1,138 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 James Pettigrew &lt;james@innovum.com.au&gt;</div><div class='add'>+ * Copyright (C) 2016 Milo Kim &lt;woogyom.kim@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "sun8i-h3.dtsi"</div><div class='add'>+#include "sunxi-common-regulators.dtsi"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include &lt;dt-bindings/pinctrl/sun4i-a10.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;leds_npi&gt;, &lt;&amp;leds_r_npi&gt;;</div><div class='add'>+</div><div class='add'>+		status {</div><div class='add'>+			label = "nanopi:blue:status";</div><div class='add'>+			gpios = &lt;&amp;pio 0 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwr {</div><div class='add'>+			label = "nanopi:green:pwr";</div><div class='add'>+			gpios = &lt;&amp;r_pio 0 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "on";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	r_gpio_keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		input-name = "k1";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;sw_r_npi&gt;;</div><div class='add'>+</div><div class='add'>+		k1@0 {</div><div class='add'>+			label = "k1";</div><div class='add'>+			linux,code = &lt;KEY_POWER&gt;;</div><div class='add'>+			gpios = &lt;&amp;r_pio 0 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ehci3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;pio 5 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-inverted;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc0_pins_a&gt;, &lt;&amp;mmc0_cd_pin&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ohci3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pio {</div><div class='add'>+	leds_npi: led_pins@0 {</div><div class='add'>+		pins = "PA10";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;r_pio {</div><div class='add'>+	leds_r_npi: led_pins@0 {</div><div class='add'>+		pins = "PL10";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sw_r_npi: key_pins@0 {</div><div class='add'>+		pins = "PL3";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts<br/>index e5bcaba3e87f..047e9e1c6093 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-h3-orangepi-2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-2.dts</a></div><div class='hunk'>@@ -145,33 +145,25 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	leds_opc: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PA15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PA15";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	leds_r_opc: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PL10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL10";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sw_r_opc: key_pins@0 {</div><div class='del'>-		allwinner,pins = "PL3", "PL4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL3", "PL4";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	wifi_pwrseq_pin_orangepi: wifi_pwrseq_pin@0 {</div><div class='del'>-		allwinner,pins = "PL7";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL7";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -205,7 +197,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usb1_vbus_pin_a {</div><div class='del'>-	allwinner,pins = "PG13";</div><div class='add'>+	pins = "PG13";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;usbphy {</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts<br/>index 1550fee1ec68..22b99b407019 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts</a></div><div class='hunk'>@@ -143,26 +143,20 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	leds_opc: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PA15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PA15";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	leds_r_opc: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PL10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL10";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sw_r_opc: key_pins@0 {</div><div class='del'>-		allwinner,pins = "PL3";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL3";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts<br/>index 5c9b5bfa5c21..34da853ee037 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-h3-orangepi-one.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-one.dts</a></div><div class='hunk'>@@ -110,26 +110,20 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	leds_opc: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PA15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PA15";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	leds_r_opc: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PL10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL10";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sw_r_opc: key_pins@0 {</div><div class='del'>-		allwinner,pins = "PL3";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL3";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts<br/>index 851fd2c2cc8c..8b93f5c781a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts</a></div><div class='hunk'>@@ -82,7 +82,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mmc2_8bit_pins {</div><div class='ctx'> 	/* Increase drive strength for DDR modes */</div><div class='del'>-	allwinner,drive = &lt;SUN4I_PINCTRL_40_MA&gt;;</div><div class='add'>+	drive-strength = &lt;40&gt;;</div><div class='ctx'> 	/* eMMC is missing pull-ups */</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts<br/>index 3ec971285aa3..d43978d3294e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts</a></div><div class='hunk'>@@ -90,6 +90,14 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;codec {</div><div class='add'>+	allwinner,audio-routing =</div><div class='add'>+		"Line Out", "LINEOUT",</div><div class='add'>+		"MIC1", "Mic",</div><div class='add'>+		"Mic",  "MBIAS";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;ehci1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -132,26 +140,20 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	leds_opc: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PA15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PA15";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	leds_r_opc: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PL10";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL10";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sw_r_opc: key_pins@0 {</div><div class='del'>-		allwinner,pins = "PL3";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL3";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts<br/>index bb585918cf54..8c40ab7bfa72 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts</a></div><div class='hunk'>@@ -76,17 +76,15 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mmc2_8bit_pins {</div><div class='ctx'> 	/* Increase drive strength for DDR modes */</div><div class='del'>-	allwinner,drive = &lt;SUN4I_PINCTRL_40_MA&gt;;</div><div class='add'>+	drive-strength = &lt;40&gt;;</div><div class='ctx'> 	/* eMMC is missing pull-ups */</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	usb3_vbus_pin_a: usb3_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PG11";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PG11";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi<br/>index f4ba088b225e..27780b97c863 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-h3.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-h3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-h3.dtsi</a></div><div class='hunk'>@@ -321,99 +321,98 @@</div><div class='ctx'> 			reg = &lt;0x01c20800 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 				     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;ccu CLK_BUS_PIO&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_PIO&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			i2c0_pins: i2c0 {</div><div class='del'>-				allwinner,pins = "PA11", "PA12";</div><div class='del'>-				allwinner,function = "i2c0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PA11", "PA12";</div><div class='add'>+				function = "i2c0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c1_pins: i2c1 {</div><div class='del'>-				allwinner,pins = "PA18", "PA19";</div><div class='del'>-				allwinner,function = "i2c1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PA18", "PA19";</div><div class='add'>+				function = "i2c1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			i2c2_pins: i2c2 {</div><div class='del'>-				allwinner,pins = "PE12", "PE13";</div><div class='del'>-				allwinner,function = "i2c2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PE12", "PE13";</div><div class='add'>+				function = "i2c2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc0_pins_a: mmc0@0 {</div><div class='del'>-				allwinner,pins = "PF0", "PF1", "PF2", "PF3",</div><div class='del'>-						 "PF4", "PF5";</div><div class='del'>-				allwinner,function = "mmc0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PF0", "PF1", "PF2", "PF3",</div><div class='add'>+				       "PF4", "PF5";</div><div class='add'>+				function = "mmc0";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc0_cd_pin: mmc0_cd_pin@0 {</div><div class='del'>-				allwinner,pins = "PF6";</div><div class='del'>-				allwinner,function = "gpio_in";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+				pins = "PF6";</div><div class='add'>+				function = "gpio_in";</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc1_pins_a: mmc1@0 {</div><div class='del'>-				allwinner,pins = "PG0", "PG1", "PG2", "PG3",</div><div class='del'>-						 "PG4", "PG5";</div><div class='del'>-				allwinner,function = "mmc1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG0", "PG1", "PG2", "PG3",</div><div class='add'>+				       "PG4", "PG5";</div><div class='add'>+				function = "mmc1";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc2_8bit_pins: mmc2_8bit {</div><div class='del'>-				allwinner,pins = "PC5", "PC6", "PC8",</div><div class='del'>-						 "PC9", "PC10", "PC11",</div><div class='del'>-						 "PC12", "PC13", "PC14",</div><div class='del'>-						 "PC15", "PC16";</div><div class='del'>-				allwinner,function = "mmc2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PC5", "PC6", "PC8",</div><div class='add'>+				       "PC9", "PC10", "PC11",</div><div class='add'>+				       "PC12", "PC13", "PC14",</div><div class='add'>+				       "PC15", "PC16";</div><div class='add'>+				function = "mmc2";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			spdif_tx_pins_a: spdif@0 {</div><div class='add'>+				pins = "PA17";</div><div class='add'>+				function = "spdif";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			spi0_pins: spi0 {</div><div class='add'>+				pins = "PC0", "PC1", "PC2", "PC3";</div><div class='add'>+				function = "spi0";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			spi1_pins: spi1 {</div><div class='add'>+				pins = "PA15", "PA16", "PA14", "PA13";</div><div class='add'>+				function = "spi1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart0_pins_a: uart0@0 {</div><div class='del'>-				allwinner,pins = "PA4", "PA5";</div><div class='del'>-				allwinner,function = "uart0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PA4", "PA5";</div><div class='add'>+				function = "uart0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart1_pins: uart1 {</div><div class='del'>-				allwinner,pins = "PG6", "PG7";</div><div class='del'>-				allwinner,function = "uart1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG6", "PG7";</div><div class='add'>+				function = "uart1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart1_rts_cts_pins: uart1_rts_cts {</div><div class='del'>-				allwinner,pins = "PG8", "PG9";</div><div class='del'>-				allwinner,function = "uart1";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG8", "PG9";</div><div class='add'>+				function = "uart1";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart2_pins: uart2 {</div><div class='del'>-				allwinner,pins = "PA0", "PA1";</div><div class='del'>-				allwinner,function = "uart2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PA0", "PA1";</div><div class='add'>+				function = "uart2";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart3_pins: uart3 {</div><div class='del'>-				allwinner,pins = "PA13", "PA14";</div><div class='del'>-				allwinner,function = "uart3";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PA13", "PA14";</div><div class='add'>+				function = "uart3";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -425,12 +424,57 @@</div><div class='ctx'> 			clocks = &lt;&amp;osc24M&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		spi0: spi@01c68000 {</div><div class='add'>+			compatible = "allwinner,sun8i-h3-spi";</div><div class='add'>+			reg = &lt;0x01c68000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_SPI0&gt;, &lt;&amp;ccu CLK_SPI0&gt;;</div><div class='add'>+			clock-names = "ahb", "mod";</div><div class='add'>+			dmas = &lt;&amp;dma 23&gt;, &lt;&amp;dma 23&gt;;</div><div class='add'>+			dma-names = "rx", "tx";</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;spi0_pins&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_SPI0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spi1: spi@01c69000 {</div><div class='add'>+			compatible = "allwinner,sun8i-h3-spi";</div><div class='add'>+			reg = &lt;0x01c69000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_SPI1&gt;, &lt;&amp;ccu CLK_SPI1&gt;;</div><div class='add'>+			clock-names = "ahb", "mod";</div><div class='add'>+			dmas = &lt;&amp;dma 24&gt;, &lt;&amp;dma 24&gt;;</div><div class='add'>+			dma-names = "rx", "tx";</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;spi1_pins&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_SPI1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		wdt0: watchdog@01c20ca0 {</div><div class='ctx'> 			compatible = "allwinner,sun6i-a31-wdt";</div><div class='ctx'> 			reg = &lt;0x01c20ca0 0x20&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		spdif: spdif@01c21000 {</div><div class='add'>+			#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "allwinner,sun8i-h3-spdif";</div><div class='add'>+			reg = &lt;0x01c21000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_SPDIF&gt;, &lt;&amp;ccu CLK_SPDIF&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_SPDIF&gt;;</div><div class='add'>+			clock-names = "apb", "spdif";</div><div class='add'>+			dmas = &lt;&amp;dma 2&gt;;</div><div class='add'>+			dma-names = "tx";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pwm: pwm@01c21400 {</div><div class='ctx'> 			compatible = "allwinner,sun8i-h3-pwm";</div><div class='ctx'> 			reg = &lt;0x01c21400 0x8&gt;;</div><div class='hunk'>@@ -439,6 +483,20 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		codec: codec@01c22c00 {</div><div class='add'>+			#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "allwinner,sun8i-h3-codec";</div><div class='add'>+			reg = &lt;0x01c22c00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_CODEC&gt;, &lt;&amp;ccu CLK_AC_DIG&gt;;</div><div class='add'>+			clock-names = "apb", "codec";</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_CODEC&gt;;</div><div class='add'>+			dmas = &lt;&amp;dma 15&gt;, &lt;&amp;dma 15&gt;;</div><div class='add'>+			dma-names = "rx", "tx";</div><div class='add'>+			allwinner,codec-analog-controls = &lt;&amp;codec_analog&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		uart0: serial@01c28000 {</div><div class='ctx'> 			compatible = "snps,dw-apb-uart";</div><div class='ctx'> 			reg = &lt;0x01c28000 0x400&gt;;</div><div class='hunk'>@@ -533,7 +591,7 @@</div><div class='ctx'> 		gic: interrupt-controller@01c81000 {</div><div class='ctx'> 			compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";</div><div class='ctx'> 			reg = &lt;0x01c81000 0x1000&gt;,</div><div class='del'>-			      &lt;0x01c82000 0x1000&gt;,</div><div class='add'>+			      &lt;0x01c82000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c84000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c86000 0x2000&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='hunk'>@@ -554,6 +612,11 @@</div><div class='ctx'> 			#reset-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		codec_analog: codec-analog@01f015c0 {</div><div class='add'>+			compatible = "allwinner,sun8i-h3-codec-analog";</div><div class='add'>+			reg = &lt;0x01f015c0 0x4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		ir: ir@01f02000 {</div><div class='ctx'> 			compatible = "allwinner,sun5i-a13-ir";</div><div class='ctx'> 			clocks = &lt;&amp;apb0_gates 1&gt;, &lt;&amp;ir_clk&gt;;</div><div class='hunk'>@@ -568,7 +631,8 @@</div><div class='ctx'> 			compatible = "allwinner,sun8i-h3-r-pinctrl";</div><div class='ctx'> 			reg = &lt;0x01f02c00 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;apb0_gates 0&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='ctx'> 			resets = &lt;&amp;apb0_reset 0&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='hunk'>@@ -576,10 +640,8 @@</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			ir_pins_a: ir@0 {</div><div class='del'>-				allwinner,pins = "PL11";</div><div class='del'>-				allwinner,function = "s_cir_rx";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PL11";</div><div class='add'>+				function = "s_cir_rx";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi<br/>index 29f837a47771..c676940a96da 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-q8-common.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-q8-common.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-q8-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-q8-common.dtsi</a></div><div class='hunk'>@@ -83,15 +83,14 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc1_pins_a {</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	wifi_pwrseq_pin_q8: wifi_pwrseq_pin@0 {</div><div class='del'>-		allwinner,pins = "PL6", "PL7", "PL11";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PL6", "PL7", "PL11";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts<br/>index 47553e522982..472c03b7aeab 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-r16-parrot.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-r16-parrot.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-r16-parrot.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-r16-parrot.dts</a></div><div class='hunk'>@@ -84,6 +84,14 @@</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;codec {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dai {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;ehci0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='hunk'>@@ -149,8 +157,8 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc2_8bit_pins {</div><div class='del'>-	allwinner,drive = &lt;SUN4I_PINCTRL_40_MA&gt;;</div><div class='del'>-	allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+	drive-strength = &lt;40&gt;;</div><div class='add'>+	bias-pull-up;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ohci0 {</div><div class='hunk'>@@ -159,40 +167,32 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	mmc0_cd_pin_parrot: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PD14";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PD14";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	led_pins_parrot: led_pins@0 {</div><div class='del'>-		allwinner,pins = "PE16", "PE17";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PE16", "PE17";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_det: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PD10";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PD10";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_parrot: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PD12";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PD12";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	wifi_reset_pin_parrot: wifi_reset_pin@0 {</div><div class='del'>-		allwinner,pins = "PL6";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PL6";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -209,7 +209,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#include "axp22x.dtsi"</div><div class='add'>+#include "axp223.dtsi"</div><div class='ctx'> </div><div class='ctx'> &amp;reg_aldo1 {</div><div class='ctx'> 	regulator-always-on;</div><div class='hunk'>@@ -325,6 +325,10 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;sound {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;uart0_pins_b&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi<br/>index 08cd00143635..7097c18ff487 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi</a></div><div class='hunk'>@@ -94,31 +94,25 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	bl_en_pin: bl_en_pin@0 {</div><div class='del'>-		allwinner,pins = "PH6";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH6";</div><div class='add'>+		function = "gpio_in";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PB4";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PB4";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ts_power_pin: ts_power_pin@0 {</div><div class='del'>-		allwinner,pins = "PH1";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH1";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_id_detect_pin: usb0_id_detect_pin@0 {</div><div class='del'>-		allwinner,pins = "PH8";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH8";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -136,7 +130,7 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#include "axp22x.dtsi"</div><div class='add'>+#include "axp223.dtsi"</div><div class='ctx'> </div><div class='ctx'> &amp;reg_aldo1 {</div><div class='ctx'> 	regulator-always-on;</div><div class='hunk'>@@ -209,10 +203,21 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;reg_ldo_io1 {</div><div class='add'>+	regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-name = "vcc-touchscreen";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;reg_rtc_ldo {</div><div class='ctx'> 	regulator-name = "vcc-rtc";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;cpu0 {</div><div class='add'>+	cpu-supply = &lt;&amp;reg_dcdc2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;r_uart {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;r_uart_pins_a&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts<br/>new file mode 100644<br/>index 000000000000..387fc2aa546d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts</a></div><div class='hunk'>@@ -0,0 +1,103 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Icenowy Zheng &lt;icenowy@aosc.xyz&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "sun8i-v3s.dtsi"</div><div class='add'>+#include "sunxi-common-regulators.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Lichee Pi Zero";</div><div class='add'>+	compatible = "licheepi,licheepi-zero", "allwinner,sun8i-v3s";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		blue_led {</div><div class='add'>+			label = "licheepi:blue:usr";</div><div class='add'>+			gpios = &lt;&amp;pio 6 1 GPIO_ACTIVE_LOW&gt;; /* PG1 */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		green_led {</div><div class='add'>+			label = "licheepi:green:usr";</div><div class='add'>+			gpios = &lt;&amp;pio 6 0 GPIO_ACTIVE_LOW&gt;; /* PG0 */</div><div class='add'>+			default-state = "on";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		red_led {</div><div class='add'>+			label = "licheepi:red:usr";</div><div class='add'>+			gpios = &lt;&amp;pio 6 2 GPIO_ACTIVE_LOW&gt;; /* PG2 */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc0_pins_a&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	broken-cd;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_otg {</div><div class='add'>+	dr_mode = "otg";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy {</div><div class='add'>+	usb0_id_det-gpio = &lt;&amp;pio 5 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi<br/>new file mode 100644<br/>index 000000000000..71075969e5e6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun8i-v3s.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun8i-v3s.dtsi</a></div><div class='hunk'>@@ -0,0 +1,309 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Icenowy Zheng &lt;icenowy@aosc.xyz&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu@0 {</div><div class='add'>+			compatible = "arm,cortex-a7";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 14&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "arm,armv7-timer";</div><div class='add'>+		interrupts = &lt;GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clocks {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		osc24M: osc24M_clk {</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-frequency = &lt;24000000&gt;;</div><div class='add'>+			clock-output-names = "osc24M";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		osc32k: osc32k_clk {</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-frequency = &lt;32768&gt;;</div><div class='add'>+			clock-output-names = "osc32k";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		mmc0: mmc@01c0f000 {</div><div class='add'>+			compatible = "allwinner,sun7i-a20-mmc";</div><div class='add'>+			reg = &lt;0x01c0f000 0x1000&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 22&gt;,</div><div class='add'>+				 &lt;&amp;ccu 45&gt;,</div><div class='add'>+				 &lt;&amp;ccu 47&gt;,</div><div class='add'>+				 &lt;&amp;ccu 46&gt;;</div><div class='add'>+			clock-names = "ahb",</div><div class='add'>+				      "mmc",</div><div class='add'>+				      "output",</div><div class='add'>+				      "sample";</div><div class='add'>+			resets = &lt;&amp;ccu 7&gt;;</div><div class='add'>+			reset-names = "ahb";</div><div class='add'>+			interrupts = &lt;GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mmc1: mmc@01c10000 {</div><div class='add'>+			compatible = "allwinner,sun7i-a20-mmc";</div><div class='add'>+			reg = &lt;0x01c10000 0x1000&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 23&gt;,</div><div class='add'>+				 &lt;&amp;ccu 48&gt;,</div><div class='add'>+				 &lt;&amp;ccu 50&gt;,</div><div class='add'>+				 &lt;&amp;ccu 49&gt;;</div><div class='add'>+			clock-names = "ahb",</div><div class='add'>+				      "mmc",</div><div class='add'>+				      "output",</div><div class='add'>+				      "sample";</div><div class='add'>+			resets = &lt;&amp;ccu 8&gt;;</div><div class='add'>+			reset-names = "ahb";</div><div class='add'>+			interrupts = &lt;GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mmc2: mmc@01c11000 {</div><div class='add'>+			compatible = "allwinner,sun7i-a20-mmc";</div><div class='add'>+			reg = &lt;0x01c11000 0x1000&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 24&gt;,</div><div class='add'>+				 &lt;&amp;ccu 51&gt;,</div><div class='add'>+				 &lt;&amp;ccu 53&gt;,</div><div class='add'>+				 &lt;&amp;ccu 52&gt;;</div><div class='add'>+			clock-names = "ahb",</div><div class='add'>+				      "mmc",</div><div class='add'>+				      "output",</div><div class='add'>+				      "sample";</div><div class='add'>+			resets = &lt;&amp;ccu 9&gt;;</div><div class='add'>+			reset-names = "ahb";</div><div class='add'>+			interrupts = &lt;GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb_otg: usb@01c19000 {</div><div class='add'>+			compatible = "allwinner,sun8i-h3-musb";</div><div class='add'>+			reg = &lt;0x01c19000 0x0400&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 29&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 17&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "mc";</div><div class='add'>+			phys = &lt;&amp;usbphy 0&gt;;</div><div class='add'>+			phy-names = "usb";</div><div class='add'>+			extcon = &lt;&amp;usbphy 0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usbphy: phy@01c19400 {</div><div class='add'>+			compatible = "allwinner,sun8i-v3s-usb-phy";</div><div class='add'>+			reg = &lt;0x01c19400 0x2c&gt;,</div><div class='add'>+			      &lt;0x01c1a800 0x4&gt;;</div><div class='add'>+			reg-names = "phy_ctrl",</div><div class='add'>+				    "pmu0";</div><div class='add'>+			clocks = &lt;&amp;ccu 56&gt;;</div><div class='add'>+			clock-names = "usb0_phy";</div><div class='add'>+			resets = &lt;&amp;ccu 0&gt;;</div><div class='add'>+			reset-names = "usb0_reset";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#phy-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ccu: clock@01c20000 {</div><div class='add'>+			compatible = "allwinner,sun8i-v3s-ccu";</div><div class='add'>+			reg = &lt;0x01c20000 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "hosc", "losc";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			#reset-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtc: rtc@01c20400 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-rtc";</div><div class='add'>+			reg = &lt;0x01c20400 0x54&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pio: pinctrl@01c20800 {</div><div class='add'>+			compatible = "allwinner,sun8i-v3s-pinctrl";</div><div class='add'>+			reg = &lt;0x01c20800 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 37&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;3&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+</div><div class='add'>+			i2c0_pins: i2c0 {</div><div class='add'>+				pins = "PB6", "PB7";</div><div class='add'>+				function = "i2c0";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart0_pins_a: uart0@0 {</div><div class='add'>+				pins = "PB8", "PB9";</div><div class='add'>+				function = "uart0";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mmc0_pins_a: mmc0@0 {</div><div class='add'>+				pins = "PF0", "PF1", "PF2", "PF3",</div><div class='add'>+				       "PF4", "PF5";</div><div class='add'>+				function = "mmc0";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@01c20c00 {</div><div class='add'>+			compatible = "allwinner,sun4i-a10-timer";</div><div class='add'>+			reg = &lt;0x01c20c00 0xa0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;osc24M&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wdt0: watchdog@01c20ca0 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-wdt";</div><div class='add'>+			reg = &lt;0x01c20ca0 0x20&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart0: serial@01c28000 {</div><div class='add'>+			compatible = "snps,dw-apb-uart";</div><div class='add'>+			reg = &lt;0x01c28000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			reg-shift = &lt;2&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 40&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 49&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart1: serial@01c28400 {</div><div class='add'>+			compatible = "snps,dw-apb-uart";</div><div class='add'>+			reg = &lt;0x01c28400 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			reg-shift = &lt;2&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 41&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 50&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart2: serial@01c28800 {</div><div class='add'>+			compatible = "snps,dw-apb-uart";</div><div class='add'>+			reg = &lt;0x01c28800 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			reg-shift = &lt;2&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 42&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 51&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c0: i2c@01c2ac00 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-i2c";</div><div class='add'>+			reg = &lt;0x01c2ac00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 38&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 46&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;i2c0_pins&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c1: i2c@01c2b000 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-i2c";</div><div class='add'>+			reg = &lt;0x01c2b000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 39&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 47&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gic: interrupt-controller@01c81000 {</div><div class='add'>+			compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";</div><div class='add'>+			reg = &lt;0x01c81000 0x1000&gt;,</div><div class='add'>+			      &lt;0x01c82000 0x1000&gt;,</div><div class='add'>+			      &lt;0x01c84000 0x2000&gt;,</div><div class='add'>+			      &lt;0x01c86000 0x2000&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts<br/>index 439847acd41e..9112a200fd5e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun9i-a80-cubieboard4.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun9i-a80-cubieboard4.dts</a></div><div class='hunk'>@@ -76,6 +76,14 @@</div><div class='ctx'> 			gpios = &lt;&amp;pio 7 6 GPIO_ACTIVE_HIGH&gt;; /* PH6 */</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	wifi_pwrseq: wifi_pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		clocks = &lt;&amp;ac100_rtc 1&gt;;</div><div class='add'>+		clock-names = "ext_clock";</div><div class='add'>+		/* enables internal regulator and de-asserts reset */</div><div class='add'>+		reset-gpios = &lt;&amp;r_pio 0 2 GPIO_ACTIVE_LOW&gt;; /* PL2 WL-PMU-EN */</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;mmc0 {</div><div class='hunk'>@@ -88,6 +96,21 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc1_pins&gt;, &lt;&amp;wifi_en_pin_cubieboard4&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_dldo1&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;reg_cldo3&gt;;</div><div class='add'>+	mmc-pwrseq = &lt;&amp;wifi_pwrseq&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1_pins {</div><div class='add'>+	bias-pull-up;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;mmc2 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;mmc2_8bit_pins&gt;;</div><div class='hunk'>@@ -100,7 +123,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mmc2_8bit_pins {</div><div class='ctx'> 	/* Increase drive strength for DDR modes */</div><div class='del'>-	allwinner,drive = &lt;SUN4I_PINCTRL_40_MA&gt;;</div><div class='add'>+	drive-strength = &lt;40&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;osc32k {</div><div class='hunk'>@@ -110,17 +133,14 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_cubieboard4: led-pins@0 {</div><div class='del'>-		allwinner,pins = "PH6", "PH17";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH6", "PH17";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_cubieboard4: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH18";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH18";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -128,6 +148,13 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;r_pio {</div><div class='add'>+	wifi_en_pin_cubieboard4: wifi_en_pin@0 {</div><div class='add'>+		pins = "PL2";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;r_rsb {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts<br/>index ceb6ef15d669..0fc3a87f5576 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun9i-a80-optimus.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun9i-a80-optimus.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun9i-a80-optimus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun9i-a80-optimus.dts</a></div><div class='hunk'>@@ -105,6 +105,14 @@</div><div class='ctx'> 		enable-active-high;</div><div class='ctx'> 		gpio = &lt;&amp;pio 7 5 GPIO_ACTIVE_HIGH&gt;; /* PH5 */</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	wifi_pwrseq: wifi_pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		clocks = &lt;&amp;ac100_rtc 1&gt;;</div><div class='add'>+		clock-names = "ext_clock";</div><div class='add'>+		/* enables internal regulator and de-asserts reset */</div><div class='add'>+		reset-gpios = &lt;&amp;r_pio 0 2 GPIO_ACTIVE_LOW&gt;; /* PL2 WL-PMU-EN */</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ehci0 {</div><div class='hunk'>@@ -130,6 +138,21 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc1_pins&gt;, &lt;&amp;wifi_en_pin_optimus&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_dldo1&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;reg_cldo3&gt;;</div><div class='add'>+	mmc-pwrseq = &lt;&amp;wifi_pwrseq&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1_pins {</div><div class='add'>+	bias-pull-up;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;mmc2 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;mmc2_8bit_pins&gt;;</div><div class='hunk'>@@ -142,7 +165,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;mmc2_8bit_pins {</div><div class='ctx'> 	/* Increase drive strength for DDR modes */</div><div class='del'>-	allwinner,drive = &lt;SUN4I_PINCTRL_40_MA&gt;;</div><div class='add'>+	drive-strength = &lt;40&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ohci0 {</div><div class='hunk'>@@ -160,31 +183,24 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	led_pins_optimus: led-pins@0 {</div><div class='del'>-		allwinner,pins = "PH0", "PH1";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH0", "PH1";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	mmc0_cd_pin_optimus: mmc0_cd_pin@0 {</div><div class='del'>-		allwinner,pins = "PH18";</div><div class='del'>-		allwinner,function = "gpio_in";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+		pins = "PH18";</div><div class='add'>+		function = "gpio_in";</div><div class='add'>+		bias-pull-up;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_optimus: usb1_vbus_pin@1 {</div><div class='del'>-		allwinner,pins = "PH4";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH4";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb3_vbus_pin_optimus: usb3_vbus_pin@1 {</div><div class='del'>-		allwinner,pins = "PH5";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH5";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -194,10 +210,13 @@</div><div class='ctx'> </div><div class='ctx'> &amp;r_pio {</div><div class='ctx'> 	led_r_pins_optimus: led-pins@1 {</div><div class='del'>-		allwinner,pins = "PM15";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PM15";</div><div class='add'>+		function = "gpio_out";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wifi_en_pin_optimus: wifi_en_pin@0 {</div><div class='add'>+		pins = "PL2";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi<br/>index 3c5214cbe4e6..15b6d122f878 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sun9i-a80.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sun9i-a80.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sun9i-a80.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sun9i-a80.dtsi</a></div><div class='hunk'>@@ -48,6 +48,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/pinctrl/sun4i-a10.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;dt-bindings/clock/sun9i-a80-ccu.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/sun9i-a80-de.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/sun9i-a80-usb.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun9i-a80-ccu.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun9i-a80-de.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun9i-a80-usb.h&gt;</div><div class='add'>+</div><div class='ctx'> / {</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -159,228 +166,13 @@</div><div class='ctx'> 			clock-output-names = "osc32k";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		usb_mod_clk: clk@00a08000 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-usb-mod-clk";</div><div class='del'>-			reg = &lt;0x00a08000 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb1_gates 1&gt;;</div><div class='del'>-			clock-output-names = "usb0_ahb", "usb_ohci0",</div><div class='del'>-					     "usb1_ahb", "usb_ohci1",</div><div class='del'>-					     "usb2_ahb", "usb_ohci2";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb_phy_clk: clk@00a08004 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-usb-phy-clk";</div><div class='del'>-			reg = &lt;0x00a08004 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb1_gates 1&gt;;</div><div class='del'>-			clock-output-names = "usb_phy0", "usb_hsic1_480M",</div><div class='del'>-					     "usb_phy1", "usb_hsic2_480M",</div><div class='del'>-					     "usb_phy2", "usb_hsic_12M";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll3: clk@06000008 {</div><div class='del'>-			/* placeholder until implemented */</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-clock";</div><div class='del'>-			clock-rate = &lt;0&gt;;</div><div class='del'>-			clock-output-names = "pll3";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll4: clk@0600000c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-pll4-clk";</div><div class='del'>-			reg = &lt;0x0600000c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll4";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pll12: clk@0600002c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-pll4-clk";</div><div class='del'>-			reg = &lt;0x0600002c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;;</div><div class='del'>-			clock-output-names = "pll12";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gt_clk: clk@0600005c {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-gt-clk";</div><div class='del'>-			reg = &lt;0x0600005c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll4&gt;, &lt;&amp;pll12&gt;, &lt;&amp;pll12&gt;;</div><div class='del'>-			clock-output-names = "gt";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ahb0: clk@06000060 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-ahb-clk";</div><div class='del'>-			reg = &lt;0x06000060 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;gt_clk&gt;, &lt;&amp;pll4&gt;, &lt;&amp;pll12&gt;, &lt;&amp;pll12&gt;;</div><div class='del'>-			clock-output-names = "ahb0";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ahb1: clk@06000064 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-ahb-clk";</div><div class='del'>-			reg = &lt;0x06000064 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;gt_clk&gt;, &lt;&amp;pll4&gt;, &lt;&amp;pll12&gt;, &lt;&amp;pll12&gt;;</div><div class='del'>-			clock-output-names = "ahb1";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ahb2: clk@06000068 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-ahb-clk";</div><div class='del'>-			reg = &lt;0x06000068 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;gt_clk&gt;, &lt;&amp;pll4&gt;, &lt;&amp;pll12&gt;, &lt;&amp;pll12&gt;;</div><div class='del'>-			clock-output-names = "ahb2";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb0: clk@06000070 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-apb0-clk";</div><div class='del'>-			reg = &lt;0x06000070 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll4&gt;;</div><div class='del'>-			clock-output-names = "apb0";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb1: clk@06000074 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-apb1-clk";</div><div class='del'>-			reg = &lt;0x06000074 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll4&gt;;</div><div class='del'>-			clock-output-names = "apb1";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cci400_clk: clk@06000078 {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-gt-clk";</div><div class='del'>-			reg = &lt;0x06000078 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll4&gt;, &lt;&amp;pll12&gt;, &lt;&amp;pll12&gt;;</div><div class='del'>-			clock-output-names = "cci400";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc0_clk: clk@06000410 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-mmc-clk";</div><div class='del'>-			reg = &lt;0x06000410 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll4&gt;;</div><div class='del'>-			clock-output-names = "mmc0", "mmc0_output",</div><div class='del'>-					     "mmc0_sample";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc1_clk: clk@06000414 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-mmc-clk";</div><div class='del'>-			reg = &lt;0x06000414 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll4&gt;;</div><div class='del'>-			clock-output-names = "mmc1", "mmc1_output",</div><div class='del'>-					     "mmc1_sample";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc2_clk: clk@06000418 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-mmc-clk";</div><div class='del'>-			reg = &lt;0x06000418 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll4&gt;;</div><div class='del'>-			clock-output-names = "mmc2", "mmc2_output",</div><div class='del'>-					     "mmc2_sample";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mmc3_clk: clk@0600041c {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-mmc-clk";</div><div class='del'>-			reg = &lt;0x0600041c 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;pll4&gt;;</div><div class='del'>-			clock-output-names = "mmc3", "mmc3_output",</div><div class='del'>-					     "mmc3_sample";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ahb0_gates: clk@06000580 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-ahb0-gates-clk";</div><div class='del'>-			reg = &lt;0x06000580 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb0&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;1&gt;, &lt;3&gt;,</div><div class='del'>-					&lt;5&gt;, &lt;8&gt;, &lt;12&gt;,</div><div class='del'>-					&lt;13&gt;, &lt;14&gt;,</div><div class='del'>-					&lt;15&gt;, &lt;16&gt;, &lt;18&gt;,</div><div class='del'>-					&lt;20&gt;, &lt;21&gt;, &lt;22&gt;,</div><div class='del'>-					&lt;23&gt;;</div><div class='del'>-			clock-output-names = "ahb0_fd", "ahb0_ve", "ahb0_gpu",</div><div class='del'>-					"ahb0_ss", "ahb0_sd", "ahb0_nand1",</div><div class='del'>-					"ahb0_nand0", "ahb0_sdram",</div><div class='del'>-					"ahb0_mipi_hsi", "ahb0_sata", "ahb0_ts",</div><div class='del'>-					"ahb0_spi0", "ahb0_spi1", "ahb0_spi2",</div><div class='del'>-					"ahb0_spi3";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ahb1_gates: clk@06000584 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-ahb1-gates-clk";</div><div class='del'>-			reg = &lt;0x06000584 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb1&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;1&gt;,</div><div class='del'>-					&lt;17&gt;, &lt;21&gt;,</div><div class='del'>-					&lt;22&gt;, &lt;23&gt;,</div><div class='del'>-					&lt;24&gt;;</div><div class='del'>-			clock-output-names = "ahb1_usbotg", "ahb1_usbhci",</div><div class='del'>-					"ahb1_gmac", "ahb1_msgbox",</div><div class='del'>-					"ahb1_spinlock", "ahb1_hstimer",</div><div class='del'>-					"ahb1_dma";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ahb2_gates: clk@06000588 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-ahb2-gates-clk";</div><div class='del'>-			reg = &lt;0x06000588 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb2&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;1&gt;,</div><div class='del'>-					&lt;2&gt;, &lt;4&gt;, &lt;5&gt;,</div><div class='del'>-					&lt;7&gt;, &lt;8&gt;, &lt;11&gt;;</div><div class='del'>-			clock-output-names = "ahb2_lcd0", "ahb2_lcd1",</div><div class='del'>-					"ahb2_edp", "ahb2_csi", "ahb2_hdmi",</div><div class='del'>-					"ahb2_de", "ahb2_mp", "ahb2_mipi_dsi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb0_gates: clk@06000590 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-apb0-gates-clk";</div><div class='del'>-			reg = &lt;0x06000590 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0&gt;;</div><div class='del'>-			clock-indices = &lt;1&gt;, &lt;5&gt;,</div><div class='del'>-					&lt;11&gt;, &lt;12&gt;, &lt;13&gt;,</div><div class='del'>-					&lt;15&gt;, &lt;17&gt;, &lt;18&gt;,</div><div class='del'>-					&lt;19&gt;;</div><div class='del'>-			clock-output-names = "apb0_spdif", "apb0_pio",</div><div class='del'>-					"apb0_ac97", "apb0_i2s0", "apb0_i2s1",</div><div class='del'>-					"apb0_lradc", "apb0_gpadc", "apb0_twd",</div><div class='del'>-					"apb0_cirtx";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb1_gates: clk@06000594 {</div><div class='del'>-			#clock-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun9i-a80-apb1-gates-clk";</div><div class='del'>-			reg = &lt;0x06000594 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1&gt;;</div><div class='del'>-			clock-indices = &lt;0&gt;, &lt;1&gt;,</div><div class='del'>-					&lt;2&gt;, &lt;3&gt;, &lt;4&gt;,</div><div class='del'>-					&lt;16&gt;, &lt;17&gt;,</div><div class='del'>-					&lt;18&gt;, &lt;19&gt;,</div><div class='del'>-					&lt;20&gt;, &lt;21&gt;;</div><div class='del'>-			clock-output-names = "apb1_i2c0", "apb1_i2c1",</div><div class='del'>-					"apb1_i2c2", "apb1_i2c3", "apb1_i2c4",</div><div class='del'>-					"apb1_uart0", "apb1_uart1",</div><div class='del'>-					"apb1_uart2", "apb1_uart3",</div><div class='del'>-					"apb1_uart4", "apb1_uart5";</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		cpus_clk: clk@08001410 {</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-cpus-clk";</div><div class='ctx'> 			reg = &lt;0x08001410 0x4&gt;;</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='del'>-			clocks = &lt;&amp;osc32k&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;pll4&gt;, &lt;&amp;pll3&gt;;</div><div class='add'>+			clocks = &lt;&amp;osc32k&gt;, &lt;&amp;osc24M&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_PLL_PERIPH0&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_PLL_AUDIO&gt;;</div><div class='ctx'> 			clock-output-names = "cpus";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -453,8 +245,8 @@</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-ehci", "generic-ehci";</div><div class='ctx'> 			reg = &lt;0x00a00000 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;usb_mod_clk 1&gt;;</div><div class='del'>-			resets = &lt;&amp;usb_mod_clk 17&gt;;</div><div class='add'>+			clocks = &lt;&amp;usb_clocks CLK_BUS_HCI0&gt;;</div><div class='add'>+			resets = &lt;&amp;usb_clocks RST_USB0_HCI&gt;;</div><div class='ctx'> 			phys = &lt;&amp;usbphy1&gt;;</div><div class='ctx'> 			phy-names = "usb";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -464,8 +256,9 @@</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-ohci", "generic-ohci";</div><div class='ctx'> 			reg = &lt;0x00a00400 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;usb_mod_clk 1&gt;, &lt;&amp;usb_mod_clk 2&gt;;</div><div class='del'>-			resets = &lt;&amp;usb_mod_clk 17&gt;;</div><div class='add'>+			clocks = &lt;&amp;usb_clocks CLK_BUS_HCI0&gt;,</div><div class='add'>+				 &lt;&amp;usb_clocks CLK_USB_OHCI0&gt;;</div><div class='add'>+			resets = &lt;&amp;usb_clocks RST_USB0_HCI&gt;;</div><div class='ctx'> 			phys = &lt;&amp;usbphy1&gt;;</div><div class='ctx'> 			phy-names = "usb";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -474,9 +267,9 @@</div><div class='ctx'> 		usbphy1: phy@00a00800 {</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-usb-phy";</div><div class='ctx'> 			reg = &lt;0x00a00800 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;usb_phy_clk 1&gt;;</div><div class='add'>+			clocks = &lt;&amp;usb_clocks CLK_USB0_PHY&gt;;</div><div class='ctx'> 			clock-names = "phy";</div><div class='del'>-			resets = &lt;&amp;usb_phy_clk 17&gt;;</div><div class='add'>+			resets = &lt;&amp;usb_clocks RST_USB0_PHY&gt;;</div><div class='ctx'> 			reset-names = "phy";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#phy-cells = &lt;0&gt;;</div><div class='hunk'>@@ -486,8 +279,8 @@</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-ehci", "generic-ehci";</div><div class='ctx'> 			reg = &lt;0x00a01000 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;usb_mod_clk 3&gt;;</div><div class='del'>-			resets = &lt;&amp;usb_mod_clk 18&gt;;</div><div class='add'>+			clocks = &lt;&amp;usb_clocks CLK_BUS_HCI1&gt;;</div><div class='add'>+			resets = &lt;&amp;usb_clocks RST_USB1_HCI&gt;;</div><div class='ctx'> 			phys = &lt;&amp;usbphy2&gt;;</div><div class='ctx'> 			phy-names = "usb";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -496,11 +289,16 @@</div><div class='ctx'> 		usbphy2: phy@00a01800 {</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-usb-phy";</div><div class='ctx'> 			reg = &lt;0x00a01800 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;usb_phy_clk 2&gt;, &lt;&amp;usb_phy_clk 10&gt;,</div><div class='del'>-				 &lt;&amp;usb_phy_clk 3&gt;;</div><div class='del'>-			clock-names = "hsic_480M", "hsic_12M", "phy";</div><div class='del'>-			resets = &lt;&amp;usb_phy_clk 18&gt;, &lt;&amp;usb_phy_clk 19&gt;;</div><div class='del'>-			reset-names = "hsic", "phy";</div><div class='add'>+			clocks = &lt;&amp;usb_clocks CLK_USB1_HSIC&gt;,</div><div class='add'>+				 &lt;&amp;usb_clocks CLK_USB_HSIC&gt;,</div><div class='add'>+				 &lt;&amp;usb_clocks CLK_USB1_PHY&gt;;</div><div class='add'>+			clock-names = "hsic_480M",</div><div class='add'>+				      "hsic_12M",</div><div class='add'>+				      "phy";</div><div class='add'>+			resets = &lt;&amp;usb_clocks RST_USB1_HSIC&gt;,</div><div class='add'>+				 &lt;&amp;usb_clocks RST_USB1_PHY&gt;;</div><div class='add'>+			reset-names = "hsic",</div><div class='add'>+				      "phy";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#phy-cells = &lt;0&gt;;</div><div class='ctx'> 			/* usb1 is always used with HSIC */</div><div class='hunk'>@@ -511,8 +309,8 @@</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-ehci", "generic-ehci";</div><div class='ctx'> 			reg = &lt;0x00a02000 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;usb_mod_clk 5&gt;;</div><div class='del'>-			resets = &lt;&amp;usb_mod_clk 19&gt;;</div><div class='add'>+			clocks = &lt;&amp;usb_clocks CLK_BUS_HCI2&gt;;</div><div class='add'>+			resets = &lt;&amp;usb_clocks RST_USB2_HCI&gt;;</div><div class='ctx'> 			phys = &lt;&amp;usbphy3&gt;;</div><div class='ctx'> 			phy-names = "usb";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -522,8 +320,9 @@</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-ohci", "generic-ohci";</div><div class='ctx'> 			reg = &lt;0x00a02400 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;usb_mod_clk 5&gt;, &lt;&amp;usb_mod_clk 6&gt;;</div><div class='del'>-			resets = &lt;&amp;usb_mod_clk 19&gt;;</div><div class='add'>+			clocks = &lt;&amp;usb_clocks CLK_BUS_HCI2&gt;,</div><div class='add'>+				 &lt;&amp;usb_clocks CLK_USB_OHCI2&gt;;</div><div class='add'>+			resets = &lt;&amp;usb_clocks RST_USB2_HCI&gt;;</div><div class='ctx'> 			phys = &lt;&amp;usbphy3&gt;;</div><div class='ctx'> 			phy-names = "usb";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -532,20 +331,35 @@</div><div class='ctx'> 		usbphy3: phy@00a02800 {</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-usb-phy";</div><div class='ctx'> 			reg = &lt;0x00a02800 0x4&gt;;</div><div class='del'>-			clocks = &lt;&amp;usb_phy_clk 4&gt;, &lt;&amp;usb_phy_clk 10&gt;,</div><div class='del'>-				 &lt;&amp;usb_phy_clk 5&gt;;</div><div class='del'>-			clock-names = "hsic_480M", "hsic_12M", "phy";</div><div class='del'>-			resets = &lt;&amp;usb_phy_clk 20&gt;, &lt;&amp;usb_phy_clk 21&gt;;</div><div class='del'>-			reset-names = "hsic", "phy";</div><div class='add'>+			clocks = &lt;&amp;usb_clocks CLK_USB2_HSIC&gt;,</div><div class='add'>+				 &lt;&amp;usb_clocks CLK_USB_HSIC&gt;,</div><div class='add'>+				 &lt;&amp;usb_clocks CLK_USB2_PHY&gt;;</div><div class='add'>+			clock-names = "hsic_480M",</div><div class='add'>+				      "hsic_12M",</div><div class='add'>+				      "phy";</div><div class='add'>+			resets = &lt;&amp;usb_clocks RST_USB2_HSIC&gt;,</div><div class='add'>+				 &lt;&amp;usb_clocks RST_USB2_PHY&gt;;</div><div class='add'>+			reset-names = "hsic",</div><div class='add'>+				      "phy";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#phy-cells = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		usb_clocks: clock@00a08000 {</div><div class='add'>+			compatible = "allwinner,sun9i-a80-usb-clks";</div><div class='add'>+			reg = &lt;0x00a08000 0x8&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_USB&gt;, &lt;&amp;osc24M&gt;;</div><div class='add'>+			clock-names = "bus", "hosc";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			#reset-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		mmc0: mmc@01c0f000 {</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-mmc";</div><div class='ctx'> 			reg = &lt;0x01c0f000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;mmc_config_clk 0&gt;, &lt;&amp;mmc0_clk 0&gt;,</div><div class='del'>-				 &lt;&amp;mmc0_clk 1&gt;, &lt;&amp;mmc0_clk 2&gt;;</div><div class='add'>+			clocks = &lt;&amp;mmc_config_clk 0&gt;, &lt;&amp;ccu CLK_MMC0&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_MMC0_OUTPUT&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_MMC0_SAMPLE&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mmc", "output", "sample";</div><div class='ctx'> 			resets = &lt;&amp;mmc_config_clk 0&gt;;</div><div class='ctx'> 			reset-names = "ahb";</div><div class='hunk'>@@ -558,8 +372,9 @@</div><div class='ctx'> 		mmc1: mmc@01c10000 {</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-mmc";</div><div class='ctx'> 			reg = &lt;0x01c10000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;mmc_config_clk 1&gt;, &lt;&amp;mmc1_clk 0&gt;,</div><div class='del'>-				 &lt;&amp;mmc1_clk 1&gt;, &lt;&amp;mmc1_clk 2&gt;;</div><div class='add'>+			clocks = &lt;&amp;mmc_config_clk 1&gt;, &lt;&amp;ccu CLK_MMC1&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_MMC1_OUTPUT&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_MMC1_SAMPLE&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mmc", "output", "sample";</div><div class='ctx'> 			resets = &lt;&amp;mmc_config_clk 1&gt;;</div><div class='ctx'> 			reset-names = "ahb";</div><div class='hunk'>@@ -572,8 +387,9 @@</div><div class='ctx'> 		mmc2: mmc@01c11000 {</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-mmc";</div><div class='ctx'> 			reg = &lt;0x01c11000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;mmc_config_clk 2&gt;, &lt;&amp;mmc2_clk 0&gt;,</div><div class='del'>-				 &lt;&amp;mmc2_clk 1&gt;, &lt;&amp;mmc2_clk 2&gt;;</div><div class='add'>+			clocks = &lt;&amp;mmc_config_clk 2&gt;, &lt;&amp;ccu CLK_MMC2&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_MMC2_OUTPUT&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_MMC2_SAMPLE&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mmc", "output", "sample";</div><div class='ctx'> 			resets = &lt;&amp;mmc_config_clk 2&gt;;</div><div class='ctx'> 			reset-names = "ahb";</div><div class='hunk'>@@ -586,8 +402,9 @@</div><div class='ctx'> 		mmc3: mmc@01c12000 {</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-mmc";</div><div class='ctx'> 			reg = &lt;0x01c12000 0x1000&gt;;</div><div class='del'>-			clocks = &lt;&amp;mmc_config_clk 3&gt;, &lt;&amp;mmc3_clk 0&gt;,</div><div class='del'>-				 &lt;&amp;mmc3_clk 1&gt;, &lt;&amp;mmc3_clk 2&gt;;</div><div class='add'>+			clocks = &lt;&amp;mmc_config_clk 3&gt;, &lt;&amp;ccu CLK_MMC3&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_MMC3_OUTPUT&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_MMC3_SAMPLE&gt;;</div><div class='ctx'> 			clock-names = "ahb", "mmc", "output", "sample";</div><div class='ctx'> 			resets = &lt;&amp;mmc_config_clk 3&gt;;</div><div class='ctx'> 			reset-names = "ahb";</div><div class='hunk'>@@ -600,9 +417,9 @@</div><div class='ctx'> 		mmc_config_clk: clk@01c13000 {</div><div class='ctx'> 			compatible = "allwinner,sun9i-a80-mmc-config-clk";</div><div class='ctx'> 			reg = &lt;0x01c13000 0x10&gt;;</div><div class='del'>-			clocks = &lt;&amp;ahb0_gates 8&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_MMC&gt;;</div><div class='ctx'> 			clock-names = "ahb";</div><div class='del'>-			resets = &lt;&amp;ahb0_resets 8&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_MMC&gt;;</div><div class='ctx'> 			reset-names = "ahb";</div><div class='ctx'> 			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 			#reset-cells = &lt;1&gt;;</div><div class='hunk'>@@ -613,7 +430,7 @@</div><div class='ctx'> 		gic: interrupt-controller@01c41000 {</div><div class='ctx'> 			compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";</div><div class='ctx'> 			reg = &lt;0x01c41000 0x1000&gt;,</div><div class='del'>-			      &lt;0x01c42000 0x1000&gt;,</div><div class='add'>+			      &lt;0x01c42000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c44000 0x2000&gt;,</div><div class='ctx'> 			      &lt;0x01c46000 0x2000&gt;;</div><div class='ctx'> 			interrupt-controller;</div><div class='hunk'>@@ -621,34 +438,27 @@</div><div class='ctx'> 			interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ahb0_resets: reset@060005a0 {</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun6i-a31-clock-reset";</div><div class='del'>-			reg = &lt;0x060005a0 0x4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ahb1_resets: reset@060005a4 {</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun6i-a31-clock-reset";</div><div class='del'>-			reg = &lt;0x060005a4 0x4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ahb2_resets: reset@060005a8 {</div><div class='add'>+		de_clocks: clock@03000000 {</div><div class='add'>+			compatible = "allwinner,sun9i-a80-de-clks";</div><div class='add'>+			reg = &lt;0x03000000 0x30&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_DE&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_SDRAM&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_BUS_DE&gt;;</div><div class='add'>+			clock-names = "mod",</div><div class='add'>+				      "dram",</div><div class='add'>+				      "bus";</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_DE&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun6i-a31-clock-reset";</div><div class='del'>-			reg = &lt;0x060005a8 0x4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		apb0_resets: reset@060005b0 {</div><div class='del'>-			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun6i-a31-clock-reset";</div><div class='del'>-			reg = &lt;0x060005b0 0x4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb1_resets: reset@060005b4 {</div><div class='add'>+		ccu: clock@06000000 {</div><div class='add'>+			compatible = "allwinner,sun9i-a80-ccu";</div><div class='add'>+			reg = &lt;0x06000000 0x800&gt;;</div><div class='add'>+			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "hosc", "losc";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 			#reset-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "allwinner,sun6i-a31-clock-reset";</div><div class='del'>-			reg = &lt;0x060005b4 0x4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		timer@06000c00 {</div><div class='hunk'>@@ -678,7 +488,8 @@</div><div class='ctx'> 				     &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 				     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 				     &lt;GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb0_gates 5&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_PIO&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='hunk'>@@ -686,42 +497,44 @@</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			i2c3_pins_a: i2c3@0 {</div><div class='del'>-				allwinner,pins = "PG10", "PG11";</div><div class='del'>-				allwinner,function = "i2c3";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG10", "PG11";</div><div class='add'>+				function = "i2c3";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc0_pins: mmc0 {</div><div class='del'>-				allwinner,pins = "PF0", "PF1" ,"PF2", "PF3",</div><div class='del'>-						 "PF4", "PF5";</div><div class='del'>-				allwinner,function = "mmc0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PF0", "PF1" ,"PF2", "PF3",</div><div class='add'>+				       "PF4", "PF5";</div><div class='add'>+				function = "mmc0";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mmc1_pins: mmc1 {</div><div class='add'>+				pins = "PG0", "PG1" ,"PG2", "PG3",</div><div class='add'>+						 "PG4", "PG5";</div><div class='add'>+				function = "mmc1";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			mmc2_8bit_pins: mmc2_8bit {</div><div class='del'>-				allwinner,pins = "PC6", "PC7", "PC8", "PC9",</div><div class='del'>-						 "PC10", "PC11", "PC12",</div><div class='del'>-						 "PC13", "PC14", "PC15",</div><div class='del'>-						 "PC16";</div><div class='del'>-				allwinner,function = "mmc2";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_30_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PC6", "PC7", "PC8", "PC9",</div><div class='add'>+				       "PC10", "PC11", "PC12",</div><div class='add'>+				       "PC13", "PC14", "PC15",</div><div class='add'>+				       "PC16";</div><div class='add'>+				function = "mmc2";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart0_pins_a: uart0@0 {</div><div class='del'>-				allwinner,pins = "PH12", "PH13";</div><div class='del'>-				allwinner,function = "uart0";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PH12", "PH13";</div><div class='add'>+				function = "uart0";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			uart4_pins_a: uart4@0 {</div><div class='del'>-				allwinner,pins = "PG12", "PG13", "PG14", "PG15";</div><div class='del'>-				allwinner,function = "uart4";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PG12", "PG13", "PG14", "PG15";</div><div class='add'>+				function = "uart4";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -731,8 +544,8 @@</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 16&gt;;</div><div class='del'>-			resets = &lt;&amp;apb1_resets 16&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_UART0&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_UART0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -742,8 +555,8 @@</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 17&gt;;</div><div class='del'>-			resets = &lt;&amp;apb1_resets 17&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_UART1&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_UART1&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -753,8 +566,8 @@</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 18&gt;;</div><div class='del'>-			resets = &lt;&amp;apb1_resets 18&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_UART2&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_UART2&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -764,8 +577,8 @@</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 19&gt;;</div><div class='del'>-			resets = &lt;&amp;apb1_resets 19&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_UART3&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_UART3&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -775,8 +588,8 @@</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 20&gt;;</div><div class='del'>-			resets = &lt;&amp;apb1_resets 20&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_UART4&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_UART4&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -786,8 +599,8 @@</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			reg-shift = &lt;2&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 21&gt;;</div><div class='del'>-			resets = &lt;&amp;apb1_resets 21&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_UART5&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_UART5&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -795,8 +608,8 @@</div><div class='ctx'> 			compatible = "allwinner,sun6i-a31-i2c";</div><div class='ctx'> 			reg = &lt;0x07002800 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 0&gt;;</div><div class='del'>-			resets = &lt;&amp;apb1_resets 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_I2C0&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_I2C0&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -806,8 +619,8 @@</div><div class='ctx'> 			compatible = "allwinner,sun6i-a31-i2c";</div><div class='ctx'> 			reg = &lt;0x07002c00 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 1&gt;;</div><div class='del'>-			resets = &lt;&amp;apb1_resets 1&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_I2C1&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_I2C1&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -817,8 +630,8 @@</div><div class='ctx'> 			compatible = "allwinner,sun6i-a31-i2c";</div><div class='ctx'> 			reg = &lt;0x07003000 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 2&gt;;</div><div class='del'>-			resets = &lt;&amp;apb1_resets 2&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_I2C2&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_I2C2&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -828,8 +641,8 @@</div><div class='ctx'> 			compatible = "allwinner,sun6i-a31-i2c";</div><div class='ctx'> 			reg = &lt;0x07003400 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 3&gt;;</div><div class='del'>-			resets = &lt;&amp;apb1_resets 3&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_I2C3&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_I2C3&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -839,8 +652,8 @@</div><div class='ctx'> 			compatible = "allwinner,sun6i-a31-i2c";</div><div class='ctx'> 			reg = &lt;0x07003800 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;apb1_gates 4&gt;;</div><div class='del'>-			resets = &lt;&amp;apb1_resets 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_I2C4&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_I2C4&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -894,7 +707,8 @@</div><div class='ctx'> 			reg = &lt;0x08002c00 0x400&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 				     &lt;GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;apbs_gates 0&gt;;</div><div class='add'>+			clocks = &lt;&amp;apbs_gates 0&gt;, &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "apb", "hosc", "losc";</div><div class='ctx'> 			resets = &lt;&amp;apbs_rst 0&gt;;</div><div class='ctx'> 			gpio-controller;</div><div class='ctx'> 			interrupt-controller;</div><div class='hunk'>@@ -902,17 +716,15 @@</div><div class='ctx'> 			#gpio-cells = &lt;3&gt;;</div><div class='ctx'> </div><div class='ctx'> 			r_ir_pins: r_ir {</div><div class='del'>-				allwinner,pins = "PL6";</div><div class='del'>-				allwinner,function = "s_cir_rx";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+				pins = "PL6";</div><div class='add'>+				function = "s_cir_rx";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			r_rsb_pins: r_rsb {</div><div class='del'>-				allwinner,pins = "PN0", "PN1";</div><div class='del'>-				allwinner,function = "s_rsb";</div><div class='del'>-				allwinner,drive = &lt;SUN4I_PINCTRL_20_MA&gt;;</div><div class='del'>-				allwinner,pull = &lt;SUN4I_PINCTRL_PULL_UP&gt;;</div><div class='add'>+				pins = "PN0", "PN1";</div><div class='add'>+				function = "s_rsb";</div><div class='add'>+				drive-strength = &lt;20&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/sunxi-common-regulators.dtsi b/arch/arm/boot/dts/sunxi-common-regulators.dtsi<br/>index f1953b0c5059..17c09fed9e84 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/sunxi-common-regulators.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/sunxi-common-regulators.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/sunxi-common-regulators.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/sunxi-common-regulators.dtsi</a></div><div class='hunk'>@@ -47,31 +47,23 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pio {</div><div class='ctx'> 	ahci_pwr_pin_a: ahci_pwr_pin@0 {</div><div class='del'>-		allwinner,pins = "PB8";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB8";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb0_vbus_pin_a: usb0_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PB9";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PB9";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_vbus_pin_a: usb1_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH6";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH6";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb2_vbus_pin_a: usb2_vbus_pin@0 {</div><div class='del'>-		allwinner,pins = "PH3";</div><div class='del'>-		allwinner,function = "gpio_out";</div><div class='del'>-		allwinner,drive = &lt;SUN4I_PINCTRL_10_MA&gt;;</div><div class='del'>-		allwinner,pull = &lt;SUN4I_PINCTRL_NO_PULL&gt;;</div><div class='add'>+		pins = "PH3";</div><div class='add'>+		function = "gpio_out";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/tango4-common.dtsi b/arch/arm/boot/dts/tango4-common.dtsi<br/>index dd7eb5f624d9..0c8cad4d6ee6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tango4-common.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tango4-common.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tango4-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tango4-common.dtsi</a></div><div class='hunk'>@@ -97,6 +97,52 @@</div><div class='ctx'> 			clocks = &lt;&amp;xtal&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		mmc0: mmc@21000 {</div><div class='add'>+			compatible = "arasan,sdhci-8.9a";</div><div class='add'>+			reg = &lt;0x21000 0x200&gt;;</div><div class='add'>+			clock-names = "clk_xin", "clk_ahb";</div><div class='add'>+			clocks = &lt;&amp;clkgen SDIO_CLK&gt;, &lt;&amp;clkgen SYS_CLK&gt;;</div><div class='add'>+			interrupts = &lt;60 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mmc1: mmc@21200 {</div><div class='add'>+			compatible = "arasan,sdhci-8.9a";</div><div class='add'>+			reg = &lt;0x21200 0x200&gt;;</div><div class='add'>+			clock-names = "clk_xin", "clk_ahb";</div><div class='add'>+			clocks = &lt;&amp;clkgen SDIO_CLK&gt;, &lt;&amp;clkgen SYS_CLK&gt;;</div><div class='add'>+			interrupts = &lt;8 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb0: usb@21400 {</div><div class='add'>+			compatible = "chipidea,usb2";</div><div class='add'>+			reg = &lt;0x21400 0x200&gt;;</div><div class='add'>+			interrupts = &lt;40 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			phys = &lt;&amp;usb0_phy&gt;;</div><div class='add'>+			phy-names = "usb-phy";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb0_phy: phy@21700 {</div><div class='add'>+			compatible = "sigma,smp8642-usb-phy";</div><div class='add'>+			reg = &lt;0x21700 0x100&gt;;</div><div class='add'>+			#phy-cells = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;clkgen USB_CLK&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb1: usb@25400 {</div><div class='add'>+			compatible = "chipidea,usb2";</div><div class='add'>+			reg = &lt;0x25400 0x200&gt;;</div><div class='add'>+			interrupts = &lt;7 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			phys = &lt;&amp;usb1_phy&gt;;</div><div class='add'>+			phy-names = "usb-phy";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb1_phy: phy@25700 {</div><div class='add'>+			compatible = "sigma,smp8642-usb-phy";</div><div class='add'>+			reg = &lt;0x25700 0x100&gt;;</div><div class='add'>+			#phy-cells = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;clkgen USB_CLK&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		eth0: ethernet@26000 {</div><div class='ctx'> 			compatible = "sigma,smp8734-ethernet";</div><div class='ctx'> 			reg = &lt;0x26000 0x800&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/tango4-vantage-1172.dts b/arch/arm/boot/dts/tango4-vantage-1172.dts<br/>index 4cab64cb581e..86d8df98802f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tango4-vantage-1172.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tango4-vantage-1172.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tango4-vantage-1172.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tango4-vantage-1172.dts</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial = &amp;uart;</div><div class='add'>+		eth0 = &amp;eth0;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory@80000000 {</div><div class='hunk'>@@ -34,3 +35,7 @@</div><div class='ctx'> 		reg = &lt;4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	non-removable; /* eMMC */</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts<br/>index 653044a44f0d..5b860ad5cbee 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra124-apalis-eval.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tegra124-apalis-eval.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra124-apalis-eval.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra124-apalis-eval.dts</a></div><div class='hunk'>@@ -187,14 +187,8 @@</div><div class='ctx'> 	/* Apalis SD1 */</div><div class='ctx'> 	sdhci@700b0400 {</div><div class='ctx'> 		status = "okay";</div><div class='del'>-		/*</div><div class='del'>-		 * Don't use SD1_CD# aka SDMMC3_CLK_LB_OUT for now as it</div><div class='del'>-		 * features some magic properties even though the external</div><div class='del'>-		 * loopback is disabled and the internal loopback used as per</div><div class='del'>-		 * SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 bits being</div><div class='del'>-		 * set to 0xfffd according to the TRM!</div><div class='del'>-		 * cd-gpios = &lt;&amp;gpio TEGRA_GPIO(EE, 4) GPIO_ACTIVE_LOW&gt;;</div><div class='del'>-		 */</div><div class='add'>+		/* SD1_CD# */</div><div class='add'>+		cd-gpios = &lt;&amp;gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		bus-width = &lt;4&gt;;</div><div class='ctx'> 		vqmmc-supply = &lt;&amp;vddio_sdmmc3&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi<br/>index e7a73db17613..f9e623bdd5c3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra124-apalis.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tegra124-apalis.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra124-apalis.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra124-apalis.dtsi</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Toradex Apalis TK1 Module Device Tree</div><div class='del'>- * Compatible for Revisions 2GB: V1.0A</div><div class='add'>+ * Compatible for Revisions 2GB: V1.0A, V1.0B, V1.1A</div><div class='ctx'>  */</div><div class='ctx'> / {</div><div class='ctx'> 	model = "Toradex Apalis TK1";</div><div class='hunk'>@@ -257,7 +257,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> 			dp_hpd_pff0 {</div><div class='ctx'> 				nvidia,pins = "dp_hpd_pff0";</div><div class='del'>-				nvidia,function = "rsvd2";</div><div class='add'>+				nvidia,function = "dp";</div><div class='ctx'> 				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='ctx'> 				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='ctx'> 				nvidia,enable-input = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='hunk'>@@ -416,18 +416,10 @@</div><div class='ctx'> 				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='ctx'> 				nvidia,enable-input = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 			};</div><div class='del'>-			/*</div><div class='del'>-			 * Don't use MMC1_D6 aka SDMMC3_CLK_LB_IN for now as it</div><div class='del'>-			 * features some magic properties even though the</div><div class='del'>-			 * external loopback is disabled and the internal</div><div class='del'>-			 * loopback used as per SDMMC_VENDOR_MISC_CNTRL_0</div><div class='del'>-			 * register's SDMMC_SPARE1 bits being set to 0xfffd</div><div class='del'>-			 * according to the TRM!</div><div class='del'>-			 */</div><div class='ctx'> 			sdmmc3_clk_lb_in_pee5 { /* D6 GPIO */</div><div class='ctx'> 				nvidia,pins = "sdmmc3_clk_lb_in_pee5";</div><div class='del'>-				nvidia,function = "sdmmc3";</div><div class='del'>-				nvidia,pull = &lt;TEGRA_PIN_PULL_UP&gt;;</div><div class='add'>+				nvidia,function = "rsvd2";</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='ctx'> 				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='ctx'> 				nvidia,enable-input = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -522,20 +514,12 @@</div><div class='ctx'> 				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='ctx'> 				nvidia,enable-input = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 			};</div><div class='del'>-			/*</div><div class='del'>-			 * Don't use SD1_CD# aka SDMMC3_CLK_LB_OUT for now as it</div><div class='del'>-			 * features some magic properties even though the</div><div class='del'>-			 * external loopback is disabled and the internal</div><div class='del'>-			 * loopback used as per SDMMC_VENDOR_MISC_CNTRL_0</div><div class='del'>-			 * register's SDMMC_SPARE1 bits being set to 0xfffd</div><div class='del'>-			 * according to the TRM!</div><div class='del'>-			 */</div><div class='del'>-			sdmmc3_clk_lb_out_pee4 { /* CD# GPIO */</div><div class='del'>-				nvidia,pins = "sdmmc3_clk_lb_out_pee4";</div><div class='del'>-				nvidia,function = "rsvd2";</div><div class='del'>-				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='add'>+			sdmmc3_cd_n_pv2 { /* CD# GPIO */</div><div class='add'>+				nvidia,pins = "sdmmc3_cd_n_pv2";</div><div class='add'>+				nvidia,function = "rsvd3";</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_UP&gt;;</div><div class='ctx'> 				nvidia,tristate = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='del'>-				nvidia,enable-input = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,enable-input = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			/* Apalis SPDIF */</div><div class='hunk'>@@ -1153,11 +1137,11 @@</div><div class='ctx'> 				nvidia,enable-input = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			/* GPIO_PI6 aka TEMP_ALERT_L */</div><div class='add'>+			/* GPIO_PI6 aka TMP451 ALERT#/THERM2# */</div><div class='ctx'> 			pi6 {</div><div class='ctx'> 				nvidia,pins = "pi6";</div><div class='ctx'> 				nvidia,function = "rsvd1";</div><div class='del'>-				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_UP&gt;;</div><div class='ctx'> 				nvidia,tristate = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 				nvidia,enable-input = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -1514,13 +1498,6 @@</div><div class='ctx'> 				nvidia,tristate = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 				nvidia,enable-input = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='ctx'> 			};</div><div class='del'>-			sdmmc3_cd_n_pv2 { /* NC */</div><div class='del'>-				nvidia,pins = "sdmmc3_cd_n_pv2";</div><div class='del'>-				nvidia,function = "rsvd3";</div><div class='del'>-				nvidia,pull = &lt;TEGRA_PIN_PULL_DOWN&gt;;</div><div class='del'>-				nvidia,tristate = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='del'>-				nvidia,enable-input = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='del'>-			};</div><div class='ctx'> 			gpio_x1_aud_px1 { /* NC */</div><div class='ctx'> 				nvidia,pins = "gpio_x1_aud_px1";</div><div class='ctx'> 				nvidia,function = "rsvd2";</div><div class='hunk'>@@ -1570,6 +1547,22 @@</div><div class='ctx'> 				nvidia,tristate = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 				nvidia,enable-input = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='ctx'> 			};</div><div class='add'>+			/*</div><div class='add'>+			 * Leave SDMMC3_CLK_LB_OUT muxed as SDMMC3 with output</div><div class='add'>+			 * driver enabled aka not tristated and input driver</div><div class='add'>+			 * enabled as well as it features some magic properties</div><div class='add'>+			 * even though the external loopback is disabled and the</div><div class='add'>+			 * internal loopback used as per</div><div class='add'>+			 * SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1</div><div class='add'>+			 * bits being set to 0xfffd according to the TRM!</div><div class='add'>+			 */</div><div class='add'>+			sdmmc3_clk_lb_out_pee4 { /* NC */</div><div class='add'>+				nvidia,pins = "sdmmc3_clk_lb_out_pee4";</div><div class='add'>+				nvidia,function = "sdmmc3";</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='add'>+				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,enable-input = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1595,7 +1588,7 @@</div><div class='ctx'> 		clock-frequency = &lt;400000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		/* SGTL5000 audio codec */</div><div class='del'>-		sgtl5000: codec@0a {</div><div class='add'>+		sgtl5000: codec@a {</div><div class='ctx'> 			compatible = "fsl,sgtl5000";</div><div class='ctx'> 			reg = &lt;0x0a&gt;;</div><div class='ctx'> 			VDDA-supply = &lt;&amp;reg_3v3&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts b/arch/arm/boot/dts/tegra124-nyan-big.dts<br/>index 67d7cfb32541..12eb7809d9ab 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra124-nyan-big.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tegra124-nyan-big.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra124-nyan-big.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra124-nyan-big.dts</a></div><div class='hunk'>@@ -6,7 +6,11 @@</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Acer Chromebook 13 CB5-311";</div><div class='del'>-	compatible = "google,nyan-big", "nvidia,tegra124";</div><div class='add'>+	compatible = "google,nyan-big-rev7", "google,nyan-big-rev6",</div><div class='add'>+		     "google,nyan-big-rev5", "google,nyan-big-rev4",</div><div class='add'>+		     "google,nyan-big-rev3", "google,nyan-big-rev2",</div><div class='add'>+		     "google,nyan-big-rev1", "google,nyan-big-rev0",</div><div class='add'>+		     "google,nyan-big", "google,nyan", "nvidia,tegra124";</div><div class='ctx'> </div><div class='ctx'> 	panel: panel {</div><div class='ctx'> 		compatible = "auo,b133xtn01";</div><div class='hunk'>@@ -1098,19 +1102,19 @@</div><div class='ctx'> 			};</div><div class='ctx'> 			cam_i2c_scl_pbb1 {</div><div class='ctx'> 				nvidia,pins = "cam_i2c_scl_pbb1";</div><div class='del'>-				nvidia,function = "rsvd3";</div><div class='del'>-				nvidia,pull = &lt;TEGRA_PIN_PULL_DOWN&gt;;</div><div class='del'>-				nvidia,tristate = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='del'>-				nvidia,enable-input = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='del'>-				nvidia,open-drain = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,function = "i2c3";</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='add'>+				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,enable-input = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='add'>+				nvidia,open-drain = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			cam_i2c_sda_pbb2 {</div><div class='ctx'> 				nvidia,pins = "cam_i2c_sda_pbb2";</div><div class='del'>-				nvidia,function = "rsvd3";</div><div class='del'>-				nvidia,pull = &lt;TEGRA_PIN_PULL_DOWN&gt;;</div><div class='del'>-				nvidia,tristate = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='del'>-				nvidia,enable-input = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='del'>-				nvidia,open-drain = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,function = "i2c3";</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='add'>+				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,enable-input = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='add'>+				nvidia,open-drain = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			pbb3 {</div><div class='ctx'> 				nvidia,pins = "pbb3";</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra124-nyan-blaze.dts b/arch/arm/boot/dts/tegra124-nyan-blaze.dts<br/>index c9582361c26e..1078a73d5092 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra124-nyan-blaze.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tegra124-nyan-blaze.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra124-nyan-blaze.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra124-nyan-blaze.dts</a></div><div class='hunk'>@@ -6,7 +6,13 @@</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "HP Chromebook 14";</div><div class='del'>-	compatible = "google,nyan-blaze", "google,nyan", "nvidia,tegra124";</div><div class='add'>+	compatible = "google,nyan-blaze-rev10", "google,nyan-blaze-rev9",</div><div class='add'>+		     "google,nyan-blaze-rev8", "google,nyan-blaze-rev7",</div><div class='add'>+		     "google,nyan-blaze-rev6", "google,nyan-blaze-rev5",</div><div class='add'>+		     "google,nyan-blaze-rev4", "google,nyan-blaze-rev3",</div><div class='add'>+		     "google,nyan-blaze-rev2", "google,nyan-blaze-rev1",</div><div class='add'>+		     "google,nyan-blaze-rev0", "google,nyan-blaze",</div><div class='add'>+		     "google,nyan", "nvidia,tegra124";</div><div class='ctx'> </div><div class='ctx'> 	panel: panel {</div><div class='ctx'> 		compatible = "samsung,ltn140at29-301";</div><div class='hunk'>@@ -1094,19 +1100,19 @@</div><div class='ctx'> 			};</div><div class='ctx'> 			cam_i2c_scl_pbb1 {</div><div class='ctx'> 				nvidia,pins = "cam_i2c_scl_pbb1";</div><div class='del'>-				nvidia,function = "rsvd3";</div><div class='del'>-				nvidia,pull = &lt;TEGRA_PIN_PULL_DOWN&gt;;</div><div class='del'>-				nvidia,tristate = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='del'>-				nvidia,enable-input = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='del'>-				nvidia,open-drain = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,function = "i2c3";</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='add'>+				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,enable-input = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='add'>+				nvidia,open-drain = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			cam_i2c_sda_pbb2 {</div><div class='ctx'> 				nvidia,pins = "cam_i2c_sda_pbb2";</div><div class='del'>-				nvidia,function = "rsvd3";</div><div class='del'>-				nvidia,pull = &lt;TEGRA_PIN_PULL_DOWN&gt;;</div><div class='del'>-				nvidia,tristate = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='del'>-				nvidia,enable-input = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='del'>-				nvidia,open-drain = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,function = "i2c3";</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='add'>+				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,enable-input = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='add'>+				nvidia,open-drain = &lt;TEGRA_PIN_ENABLE&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			pbb3 {</div><div class='ctx'> 				nvidia,pins = "pbb3";</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi<br/>index 271505e0715f..5cf987b5401e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra124-nyan.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tegra124-nyan.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra124-nyan.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra124-nyan.dtsi</a></div><div class='hunk'>@@ -42,6 +42,12 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	gpu@0,57000000 {</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		vdd-supply = &lt;&amp;vdd_gpu&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	serial@70006000 {</div><div class='ctx'> 		/* Debug connector on the bottom of the board near SD card. */</div><div class='ctx'> 		status = "okay";</div><div class='hunk'>@@ -59,7 +65,7 @@</div><div class='ctx'> 			compatible = "maxim,max98090";</div><div class='ctx'> 			reg = &lt;0x10&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;gpio&gt;;</div><div class='del'>-			interrupts = &lt;TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			interrupts = &lt;TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		temperature-sensor@4c {</div><div class='hunk'>@@ -214,7 +220,7 @@</div><div class='ctx'> 					regulator-always-on;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='del'>-				sd6 {</div><div class='add'>+				vdd_gpu: sd6 {</div><div class='ctx'> 					regulator-name = "+VDD_GPU_AP";</div><div class='ctx'> 					regulator-min-microvolt = &lt;650000&gt;;</div><div class='ctx'> 					regulator-max-microvolt = &lt;1200000&gt;;</div><div class='hunk'>@@ -325,10 +331,11 @@</div><div class='ctx'> 					reg = &lt;0x9&gt;;</div><div class='ctx'> 					interrupt-parent = &lt;&amp;gpio&gt;;</div><div class='ctx'> 					interrupts = &lt;TEGRA_GPIO(J, 0)</div><div class='del'>-							GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+							IRQ_TYPE_EDGE_BOTH&gt;;</div><div class='ctx'> 					ti,ac-detect-gpios = &lt;&amp;gpio</div><div class='ctx'> 							TEGRA_GPIO(J, 0)</div><div class='ctx'> 							GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+					ti,external-control;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				battery: sbs-battery@b {</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts<br/>index 4e361a8c167e..b4bfa5586c23 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra20-paz00.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tegra20-paz00.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra20-paz00.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra20-paz00.dts</a></div><div class='hunk'>@@ -569,6 +569,7 @@</div><div class='ctx'> 			regulator-name = "+3VS,vdd_pnl";</div><div class='ctx'> 			regulator-min-microvolt = &lt;3300000&gt;;</div><div class='ctx'> 			regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+			regulator-boot-on;</div><div class='ctx'> 			gpio = &lt;&amp;gpio TEGRA_GPIO(A, 4) GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			enable-active-high;</div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts<br/>index 381747f114a9..87b07fbadbbe 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra20-trimslice.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tegra20-trimslice.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra20-trimslice.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra20-trimslice.dts</a></div><div class='hunk'>@@ -366,6 +366,7 @@</div><div class='ctx'> </div><div class='ctx'> 	sdhci@c8000000 {</div><div class='ctx'> 		status = "okay";</div><div class='add'>+		broken-cd;</div><div class='ctx'> 		bus-width = &lt;4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi<br/>index 2207c08e3fa3..e8807503f87c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra20.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tegra20.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra20.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra20.dtsi</a></div><div class='hunk'>@@ -376,6 +376,19 @@</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	gmi@70009000 {</div><div class='add'>+		compatible = "nvidia,tegra20-gmi";</div><div class='add'>+		reg = &lt;0x70009000 0x1000&gt;;</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges = &lt;0 0 0xd0000000 0xfffffff&gt;;</div><div class='add'>+		clocks = &lt;&amp;tegra_car TEGRA20_CLK_NOR&gt;;</div><div class='add'>+		clock-names = "gmi";</div><div class='add'>+		resets = &lt;&amp;tegra_car 42&gt;;</div><div class='add'>+		reset-names = "gmi";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pwm: pwm@7000a000 {</div><div class='ctx'> 		compatible = "nvidia,tegra20-pwm";</div><div class='ctx'> 		reg = &lt;0x7000a000 0x100&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi<br/>index 192b95177aac..f6c7c3e958ac 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra30-apalis.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tegra30-apalis.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra30-apalis.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra30-apalis.dtsi</a></div><div class='hunk'>@@ -48,6 +48,24 @@</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;state_default&gt;;</div><div class='ctx'> </div><div class='ctx'> 		state_default: pinmux {</div><div class='add'>+			/* Analogue Audio (On-module) */</div><div class='add'>+			clk1_out_pw4 {</div><div class='add'>+				nvidia,pins = "clk1_out_pw4";</div><div class='add'>+				nvidia,function = "extperiph1";</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='add'>+				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,enable-input = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+			};</div><div class='add'>+			dap3_fs_pp0 {</div><div class='add'>+				nvidia,pins =	"dap3_fs_pp0",</div><div class='add'>+						"dap3_sclk_pp3",</div><div class='add'>+						"dap3_din_pp1",</div><div class='add'>+						"dap3_dout_pp2";</div><div class='add'>+				nvidia,function = "i2s2";</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='add'>+				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			/* Apalis BKL1_ON */</div><div class='ctx'> 			pv2 {</div><div class='ctx'> 				nvidia,pins = "pv2";</div><div class='hunk'>@@ -429,6 +447,15 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 		clock-frequency = &lt;100000&gt;;</div><div class='ctx'> </div><div class='add'>+		/* SGTL5000 audio codec */</div><div class='add'>+		sgtl5000: codec@a {</div><div class='add'>+			compatible = "fsl,sgtl5000";</div><div class='add'>+			reg = &lt;0x0a&gt;;</div><div class='add'>+			VDDA-supply = &lt;&amp;sys_3v3_reg&gt;;</div><div class='add'>+			VDDIO-supply = &lt;&amp;sys_3v3_reg&gt;;</div><div class='add'>+			clocks = &lt;&amp;tegra_car TEGRA30_CLK_EXTERN1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pmic: tps65911@2d {</div><div class='ctx'> 			compatible = "ti,tps65911";</div><div class='ctx'> 			reg = &lt;0x2d&gt;;</div><div class='hunk'>@@ -660,6 +687,12 @@</div><div class='ctx'> 		nvidia,sys-clock-req-active-high;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	ahub@70080000 {</div><div class='add'>+		i2s@70080500 {</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	/* eMMC */</div><div class='ctx'> 	sdhci@78000600 {</div><div class='ctx'> 		status = "okay";</div><div class='hunk'>@@ -733,4 +766,20 @@</div><div class='ctx'> 			regulator-always-on;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "toradex,tegra-audio-sgtl5000-apalis_t30",</div><div class='add'>+			     "nvidia,tegra-audio-sgtl5000";</div><div class='add'>+		nvidia,model = "Toradex Apalis T30";</div><div class='add'>+		nvidia,audio-routing =</div><div class='add'>+			"Headphone Jack", "HP_OUT",</div><div class='add'>+			"LINE_IN", "Line In Jack",</div><div class='add'>+			"MIC_IN", "Mic Jack";</div><div class='add'>+		nvidia,i2s-controller = &lt;&amp;tegra_i2s2&gt;;</div><div class='add'>+		nvidia,audio-codec = &lt;&amp;sgtl5000&gt;;</div><div class='add'>+		clocks = &lt;&amp;tegra_car TEGRA30_CLK_PLL_A&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car TEGRA30_CLK_PLL_A_OUT0&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car TEGRA30_CLK_EXTERN1&gt;;</div><div class='add'>+		clock-names = "pll_a", "pll_a_out0", "mclk";</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi<br/>index a265534cd314..5360d638eedc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra30-colibri.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tegra30-colibri.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra30-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra30-colibri.dtsi</a></div><div class='hunk'>@@ -29,6 +29,24 @@</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;state_default&gt;;</div><div class='ctx'> </div><div class='ctx'> 		state_default: pinmux {</div><div class='add'>+			/* Analogue Audio (On-module) */</div><div class='add'>+			clk1_out_pw4 {</div><div class='add'>+				nvidia,pins = "clk1_out_pw4";</div><div class='add'>+				nvidia,function = "extperiph1";</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='add'>+				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+				nvidia,enable-input = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+			};</div><div class='add'>+			dap3_fs_pp0 {</div><div class='add'>+				nvidia,pins =	"dap3_fs_pp0",</div><div class='add'>+						"dap3_sclk_pp3",</div><div class='add'>+						"dap3_din_pp1",</div><div class='add'>+						"dap3_dout_pp2";</div><div class='add'>+				nvidia,function = "i2s2";</div><div class='add'>+				nvidia,pull = &lt;TEGRA_PIN_PULL_NONE&gt;;</div><div class='add'>+				nvidia,tristate = &lt;TEGRA_PIN_DISABLE&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			/* Colibri BL_ON */</div><div class='ctx'> 			pv2 {</div><div class='ctx'> 				nvidia,pins = "pv2";</div><div class='hunk'>@@ -207,6 +225,15 @@</div><div class='ctx'> 		status = "okay";</div><div class='ctx'> 		clock-frequency = &lt;100000&gt;;</div><div class='ctx'> </div><div class='add'>+		/* SGTL5000 audio codec */</div><div class='add'>+		sgtl5000: codec@a {</div><div class='add'>+			compatible = "fsl,sgtl5000";</div><div class='add'>+			reg = &lt;0x0a&gt;;</div><div class='add'>+			VDDA-supply = &lt;&amp;sys_3v3_reg&gt;;</div><div class='add'>+			VDDIO-supply = &lt;&amp;sys_3v3_reg&gt;;</div><div class='add'>+			clocks = &lt;&amp;tegra_car TEGRA30_CLK_EXTERN1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		pmic: tps65911@2d {</div><div class='ctx'> 			compatible = "ti,tps65911";</div><div class='ctx'> 			reg = &lt;0x2d&gt;;</div><div class='hunk'>@@ -396,6 +423,12 @@</div><div class='ctx'> 		nvidia,sys-clock-req-active-high;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	ahub@70080000 {</div><div class='add'>+		i2s@70080500 {</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	/* eMMC */</div><div class='ctx'> 	sdhci@78000600 {</div><div class='ctx'> 		status = "okay";</div><div class='hunk'>@@ -471,4 +504,20 @@</div><div class='ctx'> 			regulator-always-on;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "toradex,tegra-audio-sgtl5000-colibri_t30",</div><div class='add'>+			     "nvidia,tegra-audio-sgtl5000";</div><div class='add'>+		nvidia,model = "Toradex Colibri T30";</div><div class='add'>+		nvidia,audio-routing =</div><div class='add'>+			"Headphone Jack", "HP_OUT",</div><div class='add'>+			"LINE_IN", "Line In Jack",</div><div class='add'>+			"MIC_IN", "Mic Jack";</div><div class='add'>+		nvidia,i2s-controller = &lt;&amp;tegra_i2s2&gt;;</div><div class='add'>+		nvidia,audio-codec = &lt;&amp;sgtl5000&gt;;</div><div class='add'>+		clocks = &lt;&amp;tegra_car TEGRA30_CLK_PLL_A&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car TEGRA30_CLK_PLL_A_OUT0&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car TEGRA30_CLK_EXTERN1&gt;;</div><div class='add'>+		clock-names = "pll_a", "pll_a_out0", "mclk";</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi<br/>index 5030065cbdfe..bbb1c002e7f1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra30.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tegra30.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tegra30.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tegra30.dtsi</a></div><div class='hunk'>@@ -439,6 +439,19 @@</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	gmi@70009000 {</div><div class='add'>+		compatible = "nvidia,tegra30-gmi";</div><div class='add'>+		reg = &lt;0x70009000 0x1000&gt;;</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges = &lt;0 0 0x48000000 0x7ffffff&gt;;</div><div class='add'>+		clocks = &lt;&amp;tegra_car TEGRA30_CLK_NOR&gt;;</div><div class='add'>+		clock-names = "gmi";</div><div class='add'>+		resets = &lt;&amp;tegra_car 42&gt;;</div><div class='add'>+		reset-names = "gmi";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pwm: pwm@7000a000 {</div><div class='ctx'> 		compatible = "nvidia,tegra30-pwm", "nvidia,tegra20-pwm";</div><div class='ctx'> 		reg = &lt;0x7000a000 0x100&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/tps65217.dtsi b/arch/arm/boot/dts/tps65217.dtsi<br/>index a63272422d76..02de56b55823 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/tps65217.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/tps65217.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/tps65217.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/tps65217.dtsi</a></div><div class='hunk'>@@ -13,6 +13,18 @@</div><div class='ctx'> </div><div class='ctx'> &amp;tps {</div><div class='ctx'> 	compatible = "ti,tps65217";</div><div class='add'>+	interrupt-controller;</div><div class='add'>+	#interrupt-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+	charger {</div><div class='add'>+		compatible = "ti,tps65217-charger";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pwrbutton {</div><div class='add'>+		compatible = "ti,tps65217-pwrbutton";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	regulators {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/uniphier-common32.dtsi b/arch/arm/boot/dts/uniphier-common32.dtsi<br/>deleted file mode 100644<br/>index 8c8a85176b64..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-common32.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/uniphier-common32.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,199 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Device Tree Source commonly used by UniPhier ARM SoCs</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2015-2016 Socionext Inc.</div><div class='del'>- *   Author: Masahiro Yamada &lt;yamada.masahiro@socionext.com&gt;</div><div class='del'>- *</div><div class='del'>- * This file is dual-licensed: you can use it either under the terms</div><div class='del'>- * of the GPL or the X11 license, at your option. Note that this dual</div><div class='del'>- * licensing only applies to this file, and not this project as a</div><div class='del'>- * whole.</div><div class='del'>- *</div><div class='del'>- *  a) This file is free software; you can redistribute it and/or</div><div class='del'>- *     modify it under the terms of the GNU General Public License as</div><div class='del'>- *     published by the Free Software Foundation; either version 2 of the</div><div class='del'>- *     License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *     This file is distributed in the hope that it will be useful,</div><div class='del'>- *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *     GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * Or, alternatively,</div><div class='del'>- *</div><div class='del'>- *  b) Permission is hereby granted, free of charge, to any person</div><div class='del'>- *     obtaining a copy of this software and associated documentation</div><div class='del'>- *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='del'>- *     sell copies of the Software, and to permit persons to whom the</div><div class='del'>- *     Software is furnished to do so, subject to the following</div><div class='del'>- *     conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be</div><div class='del'>- *     included in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='del'>- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='del'>- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='del'>- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='del'>- *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/include/ "skeleton.dtsi"</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	psci {</div><div class='del'>-		compatible = "arm,psci-0.2";</div><div class='del'>-		method = "smc";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	clocks {</div><div class='del'>-		refclk: ref {</div><div class='del'>-			#clock-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fixed-clock";</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc: soc {</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		ranges;</div><div class='del'>-		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='del'>-</div><div class='del'>-		serial0: serial@54006800 {</div><div class='del'>-			compatible = "socionext,uniphier-uart";</div><div class='del'>-			status = "disabled";</div><div class='del'>-			reg = &lt;0x54006800 0x40&gt;;</div><div class='del'>-			interrupts = &lt;0 33 4&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_uart0&gt;;</div><div class='del'>-			clocks = &lt;&amp;peri_clk 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@54006900 {</div><div class='del'>-			compatible = "socionext,uniphier-uart";</div><div class='del'>-			status = "disabled";</div><div class='del'>-			reg = &lt;0x54006900 0x40&gt;;</div><div class='del'>-			interrupts = &lt;0 35 4&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='del'>-			clocks = &lt;&amp;peri_clk 1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial2: serial@54006a00 {</div><div class='del'>-			compatible = "socionext,uniphier-uart";</div><div class='del'>-			status = "disabled";</div><div class='del'>-			reg = &lt;0x54006a00 0x40&gt;;</div><div class='del'>-			interrupts = &lt;0 37 4&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_uart2&gt;;</div><div class='del'>-			clocks = &lt;&amp;peri_clk 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial3: serial@54006b00 {</div><div class='del'>-			compatible = "socionext,uniphier-uart";</div><div class='del'>-			status = "disabled";</div><div class='del'>-			reg = &lt;0x54006b00 0x40&gt;;</div><div class='del'>-			interrupts = &lt;0 177 4&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_uart3&gt;;</div><div class='del'>-			clocks = &lt;&amp;peri_clk 3&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		system_bus: system-bus@58c00000 {</div><div class='del'>-			compatible = "socionext,uniphier-system-bus";</div><div class='del'>-			status = "disabled";</div><div class='del'>-			reg = &lt;0x58c00000 0x400&gt;;</div><div class='del'>-			#address-cells = &lt;2&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			pinctrl-names = "default";</div><div class='del'>-			pinctrl-0 = &lt;&amp;pinctrl_system_bus&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		smpctrl@59800000 {</div><div class='del'>-			compatible = "socionext,uniphier-smpctrl";</div><div class='del'>-			reg = &lt;0x59801000 0x400&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mioctrl@59810000 {</div><div class='del'>-			compatible = "socionext,uniphier-mioctrl",</div><div class='del'>-				     "simple-mfd", "syscon";</div><div class='del'>-			reg = &lt;0x59810000 0x800&gt;;</div><div class='del'>-</div><div class='del'>-			mio_clk: clock {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			mio_rst: reset {</div><div class='del'>-				#reset-cells = &lt;1&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		perictrl@59820000 {</div><div class='del'>-			compatible = "socionext,uniphier-perictrl",</div><div class='del'>-				     "simple-mfd", "syscon";</div><div class='del'>-			reg = &lt;0x59820000 0x200&gt;;</div><div class='del'>-</div><div class='del'>-			peri_clk: clock {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			peri_rst: reset {</div><div class='del'>-				#reset-cells = &lt;1&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		timer@60000200 {</div><div class='del'>-			compatible = "arm,cortex-a9-global-timer";</div><div class='del'>-			reg = &lt;0x60000200 0x20&gt;;</div><div class='del'>-			interrupts = &lt;1 11 0x104&gt;;</div><div class='del'>-			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		timer@60000600 {</div><div class='del'>-			compatible = "arm,cortex-a9-twd-timer";</div><div class='del'>-			reg = &lt;0x60000600 0x20&gt;;</div><div class='del'>-			interrupts = &lt;1 13 0x104&gt;;</div><div class='del'>-			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		intc: interrupt-controller@60001000 {</div><div class='del'>-			compatible = "arm,cortex-a9-gic";</div><div class='del'>-			reg = &lt;0x60001000 0x1000&gt;,</div><div class='del'>-			      &lt;0x60000100 0x100&gt;;</div><div class='del'>-			#interrupt-cells = &lt;3&gt;;</div><div class='del'>-			interrupt-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		soc-glue@5f800000 {</div><div class='del'>-			compatible = "socionext,uniphier-soc-glue",</div><div class='del'>-				     "simple-mfd", "syscon";</div><div class='del'>-			reg = &lt;0x5f800000 0x2000&gt;;</div><div class='del'>-</div><div class='del'>-			pinctrl: pinctrl {</div><div class='del'>-				/* specify compatible in each SoC DTSI */</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sysctrl@61840000 {</div><div class='del'>-			compatible = "socionext,uniphier-sysctrl",</div><div class='del'>-				     "simple-mfd", "syscon";</div><div class='del'>-			reg = &lt;0x61840000 0x4000&gt;;</div><div class='del'>-</div><div class='del'>-			sys_clk: clock {</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sys_rst: reset {</div><div class='del'>-				#reset-cells = &lt;1&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/include/ "uniphier-pinctrl.dtsi"</div><div class='head'>diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi<br/>index 95f342c9d9c1..a7c494d7c43a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-ld4.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/uniphier-ld4.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-ld4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-ld4.dtsi</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "uniphier-common32.dtsi"</div><div class='add'>+/include/ "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "socionext,uniphier-ld4";</div><div class='hunk'>@@ -61,147 +61,267 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-0.2";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	clocks {</div><div class='add'>+		refclk: ref {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;24576000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		arm_timer_clk: arm_timer_clk {</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;50000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;soc {</div><div class='del'>-	l2: l2-cache@500c0000 {</div><div class='del'>-		compatible = "socionext,uniphier-system-cache";</div><div class='del'>-		reg = &lt;0x500c0000 0x2000&gt;, &lt;0x503c0100 0x4&gt;, &lt;0x506c0000 0x400&gt;;</div><div class='del'>-		interrupts = &lt;0 174 4&gt;, &lt;0 175 4&gt;;</div><div class='del'>-		cache-unified;</div><div class='del'>-		cache-size = &lt;(512 * 1024)&gt;;</div><div class='del'>-		cache-sets = &lt;256&gt;;</div><div class='del'>-		cache-line-size = &lt;128&gt;;</div><div class='del'>-		cache-level = &lt;2&gt;;</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	i2c0: i2c@58400000 {</div><div class='del'>-		compatible = "socionext,uniphier-i2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58400000 0x40&gt;;</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 41 1&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c0&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 4&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> </div><div class='del'>-	i2c1: i2c@58480000 {</div><div class='del'>-		compatible = "socionext,uniphier-i2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58480000 0x40&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 42 1&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 5&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		l2: l2-cache@500c0000 {</div><div class='add'>+			compatible = "socionext,uniphier-system-cache";</div><div class='add'>+			reg = &lt;0x500c0000 0x2000&gt;, &lt;0x503c0100 0x4&gt;,</div><div class='add'>+			      &lt;0x506c0000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;0 174 4&gt;, &lt;0 175 4&gt;;</div><div class='add'>+			cache-unified;</div><div class='add'>+			cache-size = &lt;(512 * 1024)&gt;;</div><div class='add'>+			cache-sets = &lt;256&gt;;</div><div class='add'>+			cache-line-size = &lt;128&gt;;</div><div class='add'>+			cache-level = &lt;2&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	/* chip-internal connection for DMD */</div><div class='del'>-	i2c2: i2c@58500000 {</div><div class='del'>-		compatible = "socionext,uniphier-i2c";</div><div class='del'>-		reg = &lt;0x58500000 0x40&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 43 1&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 6&gt;;</div><div class='del'>-		clock-frequency = &lt;400000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial0: serial@54006800 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006800 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 33 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart0&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 0&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	i2c3: i2c@58580000 {</div><div class='del'>-		compatible = "socionext,uniphier-i2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58580000 0x40&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 44 1&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 7&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial1: serial@54006900 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006900 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 35 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 1&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	usb0: usb@5a800100 {</div><div class='del'>-		compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x5a800100 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 80 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_usb0&gt;;</div><div class='del'>-		clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 8&gt;, &lt;&amp;mio_clk 12&gt;;</div><div class='del'>-		resets = &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 8&gt;, &lt;&amp;mio_rst 12&gt;, &lt;&amp;sys_rst 8&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial2: serial@54006a00 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006a00 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 37 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart2&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 2&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	usb1: usb@5a810100 {</div><div class='del'>-		compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x5a810100 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 81 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_usb1&gt;;</div><div class='del'>-		clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 9&gt;, &lt;&amp;mio_clk 13&gt;;</div><div class='del'>-		resets = &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 9&gt;, &lt;&amp;mio_rst 13&gt;, &lt;&amp;sys_rst 8&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial3: serial@54006b00 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006b00 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 29 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart3&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 3&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	usb2: usb@5a820100 {</div><div class='del'>-		compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x5a820100 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 82 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_usb2&gt;;</div><div class='del'>-		clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 10&gt;, &lt;&amp;mio_clk 14&gt;;</div><div class='del'>-		resets = &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 10&gt;, &lt;&amp;mio_rst 14&gt;, &lt;&amp;sys_rst 8&gt;;</div><div class='del'>-	};</div><div class='add'>+		i2c0: i2c@58400000 {</div><div class='add'>+			compatible = "socionext,uniphier-i2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58400000 0x40&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 41 1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c0&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 4&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-};</div><div class='add'>+		i2c1: i2c@58480000 {</div><div class='add'>+			compatible = "socionext,uniphier-i2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58480000 0x40&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 42 1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 5&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;refclk {</div><div class='del'>-	clock-frequency = &lt;24576000&gt;;</div><div class='del'>-};</div><div class='add'>+		/* chip-internal connection for DMD */</div><div class='add'>+		i2c2: i2c@58500000 {</div><div class='add'>+			compatible = "socionext,uniphier-i2c";</div><div class='add'>+			reg = &lt;0x58500000 0x40&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 43 1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 6&gt;;</div><div class='add'>+			clock-frequency = &lt;400000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;serial3 {</div><div class='del'>-	interrupts = &lt;0 29 4&gt;;</div><div class='del'>-};</div><div class='add'>+		i2c3: i2c@58580000 {</div><div class='add'>+			compatible = "socionext,uniphier-i2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58580000 0x40&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 44 1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 7&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;mio_clk {</div><div class='del'>-	compatible = "socionext,uniphier-ld4-mio-clock";</div><div class='del'>-};</div><div class='add'>+		system_bus: system-bus@58c00000 {</div><div class='add'>+			compatible = "socionext,uniphier-system-bus";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58c00000 0x400&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_system_bus&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;mio_rst {</div><div class='del'>-	compatible = "socionext,uniphier-ld4-mio-reset";</div><div class='del'>-	resets = &lt;&amp;sys_rst 7&gt;;</div><div class='del'>-};</div><div class='add'>+		smpctrl@59800000 {</div><div class='add'>+			compatible = "socionext,uniphier-smpctrl";</div><div class='add'>+			reg = &lt;0x59801000 0x400&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;peri_clk {</div><div class='del'>-	compatible = "socionext,uniphier-ld4-peri-clock";</div><div class='del'>-};</div><div class='add'>+		mioctrl@59810000 {</div><div class='add'>+			compatible = "socionext,uniphier-ld4-mioctrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x59810000 0x800&gt;;</div><div class='ctx'> </div><div class='del'>-&amp;peri_rst {</div><div class='del'>-	compatible = "socionext,uniphier-ld4-peri-reset";</div><div class='del'>-};</div><div class='add'>+			mio_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-ld4-mio-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='ctx'> </div><div class='del'>-&amp;pinctrl {</div><div class='del'>-	compatible = "socionext,uniphier-ld4-pinctrl";</div><div class='del'>-};</div><div class='add'>+			mio_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-ld4-mio-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;sys_clk {</div><div class='del'>-	compatible = "socionext,uniphier-ld4-clock";</div><div class='del'>-};</div><div class='add'>+		perictrl@59820000 {</div><div class='add'>+			compatible = "socionext,uniphier-ld4-perictrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x59820000 0x200&gt;;</div><div class='add'>+</div><div class='add'>+			peri_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-ld4-peri-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			peri_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-ld4-peri-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb0: usb@5a800100 {</div><div class='add'>+			compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x5a800100 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0 80 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_usb0&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 8&gt;, &lt;&amp;mio_clk 12&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 8&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 12&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb1: usb@5a810100 {</div><div class='add'>+			compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x5a810100 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0 81 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_usb1&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 9&gt;, &lt;&amp;mio_clk 13&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 9&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 13&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;sys_rst {</div><div class='del'>-	compatible = "socionext,uniphier-ld4-reset";</div><div class='add'>+		usb2: usb@5a820100 {</div><div class='add'>+			compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x5a820100 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0 82 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_usb2&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 10&gt;, &lt;&amp;mio_clk 14&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 10&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 14&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		soc-glue@5f800000 {</div><div class='add'>+			compatible = "socionext,uniphier-ld4-soc-glue",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x5f800000 0x2000&gt;;</div><div class='add'>+</div><div class='add'>+			pinctrl: pinctrl {</div><div class='add'>+				compatible = "socionext,uniphier-ld4-pinctrl";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@60000200 {</div><div class='add'>+			compatible = "arm,cortex-a9-global-timer";</div><div class='add'>+			reg = &lt;0x60000200 0x20&gt;;</div><div class='add'>+			interrupts = &lt;1 11 0x104&gt;;</div><div class='add'>+			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@60000600 {</div><div class='add'>+			compatible = "arm,cortex-a9-twd-timer";</div><div class='add'>+			reg = &lt;0x60000600 0x20&gt;;</div><div class='add'>+			interrupts = &lt;1 13 0x104&gt;;</div><div class='add'>+			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		intc: interrupt-controller@60001000 {</div><div class='add'>+			compatible = "arm,cortex-a9-gic";</div><div class='add'>+			reg = &lt;0x60001000 0x1000&gt;,</div><div class='add'>+			      &lt;0x60000100 0x100&gt;;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysctrl@61840000 {</div><div class='add'>+			compatible = "socionext,uniphier-ld4-sysctrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x61840000 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+			sys_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-ld4-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sys_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-ld4-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "uniphier-pinctrl.dtsi"</div><div class='head'>diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi<br/>index 10a711041b4a..8ee79da9af7c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-pinctrl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/uniphier-pinctrl.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-pinctrl.dtsi</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Device Tree Source for UniPhier SoCs default pinctrl settings</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2015 Masahiro Yamada &lt;yamada.masahiro@socionext.com&gt;</div><div class='add'>+ * Copyright (C) 2015-2017 Socionext Inc.</div><div class='add'>+ *   Author: Masahiro Yamada &lt;yamada.masahiro@socionext.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This file is dual-licensed: you can use it either under the terms</div><div class='ctx'>  * of the GPL or the X11 license, at your option. Note that this dual</div><div class='hunk'>@@ -43,6 +44,11 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> &amp;pinctrl {</div><div class='add'>+	pinctrl_emmc: emmc_grp {</div><div class='add'>+		groups = "emmc";</div><div class='add'>+		function = "emmc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pinctrl_i2c0: i2c0_grp {</div><div class='ctx'> 		groups = "i2c0";</div><div class='ctx'> 		function = "i2c0";</div><div class='hunk'>@@ -78,6 +84,16 @@</div><div class='ctx'> 		function = "nand";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	pinctrl_sd: sd_grp {</div><div class='add'>+		groups = "sd";</div><div class='add'>+		function = "sd";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_sd1: sd1_grp {</div><div class='add'>+		groups = "sd1";</div><div class='add'>+		function = "sd1";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pinctrl_system_bus: system_bus_grp {</div><div class='ctx'> 		groups = "system_bus", "system_bus_cs1";</div><div class='ctx'> 		function = "system_bus";</div><div class='head'>diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi<br/>index ba700267ad66..e960b09ff01c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-pro4.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/uniphier-pro4.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-pro4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-pro4.dtsi</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "uniphier-common32.dtsi"</div><div class='add'>+/include/ "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "socionext,uniphier-pro4";</div><div class='hunk'>@@ -69,155 +69,279 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-0.2";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	clocks {</div><div class='add'>+		refclk: ref {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;25000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		arm_timer_clk: arm_timer_clk {</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;50000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-&amp;soc {</div><div class='del'>-	l2: l2-cache@500c0000 {</div><div class='del'>-		compatible = "socionext,uniphier-system-cache";</div><div class='del'>-		reg = &lt;0x500c0000 0x2000&gt;, &lt;0x503c0100 0x4&gt;, &lt;0x506c0000 0x400&gt;;</div><div class='del'>-		interrupts = &lt;0 174 4&gt;, &lt;0 175 4&gt;;</div><div class='del'>-		cache-unified;</div><div class='del'>-		cache-size = &lt;(768 * 1024)&gt;;</div><div class='del'>-		cache-sets = &lt;256&gt;;</div><div class='del'>-		cache-line-size = &lt;128&gt;;</div><div class='del'>-		cache-level = &lt;2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	i2c0: i2c@58780000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58780000 0x80&gt;;</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 41 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c0&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 4&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> </div><div class='del'>-	i2c1: i2c@58781000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58781000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 42 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 5&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		l2: l2-cache@500c0000 {</div><div class='add'>+			compatible = "socionext,uniphier-system-cache";</div><div class='add'>+			reg = &lt;0x500c0000 0x2000&gt;, &lt;0x503c0100 0x4&gt;,</div><div class='add'>+			      &lt;0x506c0000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;0 174 4&gt;, &lt;0 175 4&gt;;</div><div class='add'>+			cache-unified;</div><div class='add'>+			cache-size = &lt;(768 * 1024)&gt;;</div><div class='add'>+			cache-sets = &lt;256&gt;;</div><div class='add'>+			cache-line-size = &lt;128&gt;;</div><div class='add'>+			cache-level = &lt;2&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	i2c2: i2c@58782000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58782000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 43 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 6&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial0: serial@54006800 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006800 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 33 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart0&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 0&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	i2c3: i2c@58783000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58783000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 44 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 7&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial1: serial@54006900 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006900 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 35 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 1&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	/* i2c4 does not exist */</div><div class='add'>+		serial2: serial@54006a00 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006a00 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 37 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart2&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 2&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	/* chip-internal connection for DMD */</div><div class='del'>-	i2c5: i2c@58785000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		reg = &lt;0x58785000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 25 4&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 9&gt;;</div><div class='del'>-		clock-frequency = &lt;400000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial3: serial@54006b00 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006b00 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 177 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart3&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 3&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	/* chip-internal connection for HDMI */</div><div class='del'>-	i2c6: i2c@58786000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		reg = &lt;0x58786000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 26 4&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 10&gt;;</div><div class='del'>-		clock-frequency = &lt;400000&gt;;</div><div class='del'>-	};</div><div class='add'>+		i2c0: i2c@58780000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58780000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 41 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c0&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 4&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	usb2: usb@5a800100 {</div><div class='del'>-		compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x5a800100 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 80 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_usb2&gt;;</div><div class='del'>-		clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 8&gt;, &lt;&amp;mio_clk 12&gt;;</div><div class='del'>-		resets = &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 8&gt;, &lt;&amp;mio_rst 12&gt;, &lt;&amp;sys_rst 8&gt;;</div><div class='del'>-	};</div><div class='add'>+		i2c1: i2c@58781000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58781000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 42 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 5&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	usb3: usb@5a810100 {</div><div class='del'>-		compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x5a810100 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 81 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_usb3&gt;;</div><div class='del'>-		clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 9&gt;, &lt;&amp;mio_clk 13&gt;;</div><div class='del'>-		resets = &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 9&gt;, &lt;&amp;mio_rst 13&gt;, &lt;&amp;sys_rst 8&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='add'>+		i2c2: i2c@58782000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58782000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 43 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 6&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;refclk {</div><div class='del'>-	clock-frequency = &lt;25000000&gt;;</div><div class='del'>-};</div><div class='add'>+		i2c3: i2c@58783000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58783000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 44 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 7&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;mio_clk {</div><div class='del'>-	compatible = "socionext,uniphier-pro4-mio-clock";</div><div class='del'>-};</div><div class='add'>+		/* i2c4 does not exist */</div><div class='ctx'> </div><div class='del'>-&amp;mio_rst {</div><div class='del'>-	compatible = "socionext,uniphier-pro4-mio-reset";</div><div class='del'>-	resets = &lt;&amp;sys_rst 7&gt;;</div><div class='del'>-};</div><div class='add'>+		/* chip-internal connection for DMD */</div><div class='add'>+		i2c5: i2c@58785000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			reg = &lt;0x58785000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 25 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 9&gt;;</div><div class='add'>+			clock-frequency = &lt;400000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;peri_clk {</div><div class='del'>-	compatible = "socionext,uniphier-pro4-peri-clock";</div><div class='del'>-};</div><div class='add'>+		/* chip-internal connection for HDMI */</div><div class='add'>+		i2c6: i2c@58786000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			reg = &lt;0x58786000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 26 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 10&gt;;</div><div class='add'>+			clock-frequency = &lt;400000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;peri_rst {</div><div class='del'>-	compatible = "socionext,uniphier-pro4-peri-reset";</div><div class='del'>-};</div><div class='add'>+		system_bus: system-bus@58c00000 {</div><div class='add'>+			compatible = "socionext,uniphier-system-bus";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58c00000 0x400&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_system_bus&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;pinctrl {</div><div class='del'>-	compatible = "socionext,uniphier-pro4-pinctrl";</div><div class='del'>-};</div><div class='add'>+		smpctrl@59800000 {</div><div class='add'>+			compatible = "socionext,uniphier-smpctrl";</div><div class='add'>+			reg = &lt;0x59801000 0x400&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;sys_clk {</div><div class='del'>-	compatible = "socionext,uniphier-pro4-clock";</div><div class='del'>-};</div><div class='add'>+		mioctrl@59810000 {</div><div class='add'>+			compatible = "socionext,uniphier-pro4-mioctrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x59810000 0x800&gt;;</div><div class='add'>+</div><div class='add'>+			mio_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-pro4-mio-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mio_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-pro4-mio-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		perictrl@59820000 {</div><div class='add'>+			compatible = "socionext,uniphier-pro4-perictrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x59820000 0x200&gt;;</div><div class='add'>+</div><div class='add'>+			peri_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-pro4-peri-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			peri_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-pro4-peri-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;sys_rst {</div><div class='del'>-	compatible = "socionext,uniphier-pro4-reset";</div><div class='add'>+		usb2: usb@5a800100 {</div><div class='add'>+			compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x5a800100 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0 80 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_usb2&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 8&gt;, &lt;&amp;mio_clk 12&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 8&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 12&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb3: usb@5a810100 {</div><div class='add'>+			compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x5a810100 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0 81 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_usb3&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 9&gt;, &lt;&amp;mio_clk 13&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 9&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 13&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		soc-glue@5f800000 {</div><div class='add'>+			compatible = "socionext,uniphier-pro4-soc-glue",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x5f800000 0x2000&gt;;</div><div class='add'>+</div><div class='add'>+			pinctrl: pinctrl {</div><div class='add'>+				compatible = "socionext,uniphier-pro4-pinctrl";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@60000200 {</div><div class='add'>+			compatible = "arm,cortex-a9-global-timer";</div><div class='add'>+			reg = &lt;0x60000200 0x20&gt;;</div><div class='add'>+			interrupts = &lt;1 11 0x304&gt;;</div><div class='add'>+			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@60000600 {</div><div class='add'>+			compatible = "arm,cortex-a9-twd-timer";</div><div class='add'>+			reg = &lt;0x60000600 0x20&gt;;</div><div class='add'>+			interrupts = &lt;1 13 0x304&gt;;</div><div class='add'>+			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		intc: interrupt-controller@60001000 {</div><div class='add'>+			compatible = "arm,cortex-a9-gic";</div><div class='add'>+			reg = &lt;0x60001000 0x1000&gt;,</div><div class='add'>+			      &lt;0x60000100 0x100&gt;;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysctrl@61840000 {</div><div class='add'>+			compatible = "socionext,uniphier-pro4-sysctrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x61840000 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+			sys_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-pro4-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sys_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-pro4-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "uniphier-pinctrl.dtsi"</div><div class='head'>diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi<br/>index 5357ea9c14b1..dbc5e5333163 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-pro5.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/uniphier-pro5.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-pro5.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-pro5.dtsi</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "uniphier-common32.dtsi"</div><div class='add'>+/include/ "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "socionext,uniphier-pro5";</div><div class='hunk'>@@ -56,157 +56,355 @@</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a9";</div><div class='ctx'> 			reg = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 32&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='ctx'> 			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cpu_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu@1 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a9";</div><div class='ctx'> 			reg = &lt;1&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 32&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='ctx'> 			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cpu_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	cpu_opp: opp_table {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@116667000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;116667000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@150000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;150000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@175000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;175000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@233334000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;233334000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@300000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;300000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@350000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;350000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@400000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;400000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@466667000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;466667000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@600000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;600000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@700000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;700000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@800000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;800000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@933334000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;933334000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1200000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1400000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1400000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-0.2";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	clocks {</div><div class='add'>+		refclk: ref {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;20000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		arm_timer_clk: arm_timer_clk {</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;50000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-&amp;soc {</div><div class='del'>-	l2: l2-cache@500c0000 {</div><div class='del'>-		compatible = "socionext,uniphier-system-cache";</div><div class='del'>-		reg = &lt;0x500c0000 0x2000&gt;, &lt;0x503c0100 0x8&gt;, &lt;0x506c0000 0x400&gt;;</div><div class='del'>-		interrupts = &lt;0 190 4&gt;, &lt;0 191 4&gt;;</div><div class='del'>-		cache-unified;</div><div class='del'>-		cache-size = &lt;(2 * 1024 * 1024)&gt;;</div><div class='del'>-		cache-sets = &lt;512&gt;;</div><div class='del'>-		cache-line-size = &lt;128&gt;;</div><div class='del'>-		cache-level = &lt;2&gt;;</div><div class='del'>-		next-level-cache = &lt;&amp;l3&gt;;</div><div class='del'>-	};</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> </div><div class='del'>-	l3: l3-cache@500c8000 {</div><div class='del'>-		compatible = "socionext,uniphier-system-cache";</div><div class='del'>-		reg = &lt;0x500c8000 0x2000&gt;, &lt;0x503c8100 0x8&gt;, &lt;0x506c8000 0x400&gt;;</div><div class='del'>-		interrupts = &lt;0 174 4&gt;, &lt;0 175 4&gt;;</div><div class='del'>-		cache-unified;</div><div class='del'>-		cache-size = &lt;(2 * 1024 * 1024)&gt;;</div><div class='del'>-		cache-sets = &lt;512&gt;;</div><div class='del'>-		cache-line-size = &lt;256&gt;;</div><div class='del'>-		cache-level = &lt;3&gt;;</div><div class='del'>-	};</div><div class='add'>+		l2: l2-cache@500c0000 {</div><div class='add'>+			compatible = "socionext,uniphier-system-cache";</div><div class='add'>+			reg = &lt;0x500c0000 0x2000&gt;, &lt;0x503c0100 0x8&gt;,</div><div class='add'>+			      &lt;0x506c0000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;0 190 4&gt;, &lt;0 191 4&gt;;</div><div class='add'>+			cache-unified;</div><div class='add'>+			cache-size = &lt;(2 * 1024 * 1024)&gt;;</div><div class='add'>+			cache-sets = &lt;512&gt;;</div><div class='add'>+			cache-line-size = &lt;128&gt;;</div><div class='add'>+			cache-level = &lt;2&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;l3&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	i2c0: i2c@58780000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58780000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 41 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c0&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 4&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		l3: l3-cache@500c8000 {</div><div class='add'>+			compatible = "socionext,uniphier-system-cache";</div><div class='add'>+			reg = &lt;0x500c8000 0x2000&gt;, &lt;0x503c8100 0x8&gt;,</div><div class='add'>+			      &lt;0x506c8000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;0 174 4&gt;, &lt;0 175 4&gt;;</div><div class='add'>+			cache-unified;</div><div class='add'>+			cache-size = &lt;(2 * 1024 * 1024)&gt;;</div><div class='add'>+			cache-sets = &lt;512&gt;;</div><div class='add'>+			cache-line-size = &lt;256&gt;;</div><div class='add'>+			cache-level = &lt;3&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	i2c1: i2c@58781000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58781000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 42 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 5&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial0: serial@54006800 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006800 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 33 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart0&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 0&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	i2c2: i2c@58782000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58782000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 43 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 6&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial1: serial@54006900 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006900 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 35 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 1&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	i2c3: i2c@58783000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58783000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 44 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 7&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial2: serial@54006a00 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006a00 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 37 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart2&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 2&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	/* i2c4 does not exist */</div><div class='add'>+		serial3: serial@54006b00 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006b00 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 177 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart3&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 3&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	/* chip-internal connection for DMD */</div><div class='del'>-	i2c5: i2c@58785000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		reg = &lt;0x58785000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 25 4&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 9&gt;;</div><div class='del'>-		clock-frequency = &lt;400000&gt;;</div><div class='del'>-	};</div><div class='add'>+		i2c0: i2c@58780000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58780000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 41 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c0&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 4&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	/* chip-internal connection for HDMI */</div><div class='del'>-	i2c6: i2c@58786000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		reg = &lt;0x58786000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 26 4&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 10&gt;;</div><div class='del'>-		clock-frequency = &lt;400000&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='add'>+		i2c1: i2c@58781000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58781000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 42 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 5&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;refclk {</div><div class='del'>-	clock-frequency = &lt;20000000&gt;;</div><div class='del'>-};</div><div class='add'>+		i2c2: i2c@58782000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58782000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 43 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 6&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;mio_clk {</div><div class='del'>-	compatible = "socionext,uniphier-pro5-sd-clock";</div><div class='del'>-};</div><div class='add'>+		i2c3: i2c@58783000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58783000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 44 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 7&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;mio_rst {</div><div class='del'>-	compatible = "socionext,uniphier-pro5-sd-reset";</div><div class='del'>-};</div><div class='add'>+		/* i2c4 does not exist */</div><div class='ctx'> </div><div class='del'>-&amp;peri_clk {</div><div class='del'>-	compatible = "socionext,uniphier-pro5-peri-clock";</div><div class='del'>-};</div><div class='add'>+		/* chip-internal connection for DMD */</div><div class='add'>+		i2c5: i2c@58785000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			reg = &lt;0x58785000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 25 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 9&gt;;</div><div class='add'>+			clock-frequency = &lt;400000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;peri_rst {</div><div class='del'>-	compatible = "socionext,uniphier-pro5-peri-reset";</div><div class='del'>-};</div><div class='add'>+		/* chip-internal connection for HDMI */</div><div class='add'>+		i2c6: i2c@58786000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			reg = &lt;0x58786000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 26 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 10&gt;;</div><div class='add'>+			clock-frequency = &lt;400000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;pinctrl {</div><div class='del'>-	compatible = "socionext,uniphier-pro5-pinctrl";</div><div class='del'>-};</div><div class='add'>+		system_bus: system-bus@58c00000 {</div><div class='add'>+			compatible = "socionext,uniphier-system-bus";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58c00000 0x400&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_system_bus&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;sys_clk {</div><div class='del'>-	compatible = "socionext,uniphier-pro5-clock";</div><div class='del'>-};</div><div class='add'>+		smpctrl@59800000 {</div><div class='add'>+			compatible = "socionext,uniphier-smpctrl";</div><div class='add'>+			reg = &lt;0x59801000 0x400&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;sys_rst {</div><div class='del'>-	compatible = "socionext,uniphier-pro5-reset";</div><div class='add'>+		sdctrl@59810000 {</div><div class='add'>+			compatible = "socionext,uniphier-pro5-sdctrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x59810000 0x800&gt;;</div><div class='add'>+</div><div class='add'>+			sd_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-pro5-sd-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sd_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-pro5-sd-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		perictrl@59820000 {</div><div class='add'>+			compatible = "socionext,uniphier-pro5-perictrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x59820000 0x200&gt;;</div><div class='add'>+</div><div class='add'>+			peri_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-pro5-peri-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			peri_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-pro5-peri-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		soc-glue@5f800000 {</div><div class='add'>+			compatible = "socionext,uniphier-pro5-soc-glue",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x5f800000 0x2000&gt;;</div><div class='add'>+</div><div class='add'>+			pinctrl: pinctrl {</div><div class='add'>+				compatible = "socionext,uniphier-pro5-pinctrl";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@60000200 {</div><div class='add'>+			compatible = "arm,cortex-a9-global-timer";</div><div class='add'>+			reg = &lt;0x60000200 0x20&gt;;</div><div class='add'>+			interrupts = &lt;1 11 0x304&gt;;</div><div class='add'>+			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@60000600 {</div><div class='add'>+			compatible = "arm,cortex-a9-twd-timer";</div><div class='add'>+			reg = &lt;0x60000600 0x20&gt;;</div><div class='add'>+			interrupts = &lt;1 13 0x304&gt;;</div><div class='add'>+			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		intc: interrupt-controller@60001000 {</div><div class='add'>+			compatible = "arm,cortex-a9-gic";</div><div class='add'>+			reg = &lt;0x60001000 0x1000&gt;,</div><div class='add'>+			      &lt;0x60000100 0x100&gt;;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysctrl@61840000 {</div><div class='add'>+			compatible = "socionext,uniphier-pro5-sysctrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x61840000 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+			sys_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-pro5-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sys_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-pro5-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "uniphier-pinctrl.dtsi"</div><div class='head'>diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi<br/>index 950f07ba0337..e9e031d63c1a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-pxs2.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/uniphier-pxs2.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-pxs2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-pxs2.dtsi</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "uniphier-common32.dtsi"</div><div class='add'>+/include/ "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "socionext,uniphier-pxs2";</div><div class='hunk'>@@ -56,170 +56,339 @@</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a9";</div><div class='ctx'> 			reg = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 32&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='ctx'> 			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cpu_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu@1 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a9";</div><div class='ctx'> 			reg = &lt;1&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 32&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='ctx'> 			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cpu_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu@2 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a9";</div><div class='ctx'> 			reg = &lt;2&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 32&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='ctx'> 			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cpu_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu@3 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a9";</div><div class='ctx'> 			reg = &lt;3&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 32&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='ctx'> 			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cpu_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	cpu_opp: opp_table {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@150000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;150000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@300000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;300000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@400000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;400000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@600000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;600000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@800000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;800000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1200000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-0.2";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	clocks {</div><div class='add'>+		refclk: ref {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;25000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		arm_timer_clk: arm_timer_clk {</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;50000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;soc {</div><div class='del'>-	l2: l2-cache@500c0000 {</div><div class='del'>-		compatible = "socionext,uniphier-system-cache";</div><div class='del'>-		reg = &lt;0x500c0000 0x2000&gt;, &lt;0x503c0100 0x4&gt;, &lt;0x506c0000 0x400&gt;;</div><div class='del'>-		interrupts = &lt;0 174 4&gt;, &lt;0 175 4&gt;, &lt;0 190 4&gt;, &lt;0 191 4&gt;;</div><div class='del'>-		cache-unified;</div><div class='del'>-		cache-size = &lt;(1280 * 1024)&gt;;</div><div class='del'>-		cache-sets = &lt;512&gt;;</div><div class='del'>-		cache-line-size = &lt;128&gt;;</div><div class='del'>-		cache-level = &lt;2&gt;;</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	i2c0: i2c@58780000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58780000 0x80&gt;;</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 41 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c0&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 4&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> </div><div class='del'>-	i2c1: i2c@58781000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58781000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 42 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 5&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		l2: l2-cache@500c0000 {</div><div class='add'>+			compatible = "socionext,uniphier-system-cache";</div><div class='add'>+			reg = &lt;0x500c0000 0x2000&gt;, &lt;0x503c0100 0x8&gt;,</div><div class='add'>+			      &lt;0x506c0000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;0 174 4&gt;, &lt;0 175 4&gt;, &lt;0 190 4&gt;, &lt;0 191 4&gt;;</div><div class='add'>+			cache-unified;</div><div class='add'>+			cache-size = &lt;(1280 * 1024)&gt;;</div><div class='add'>+			cache-sets = &lt;512&gt;;</div><div class='add'>+			cache-line-size = &lt;128&gt;;</div><div class='add'>+			cache-level = &lt;2&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	i2c2: i2c@58782000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58782000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='del'>-		interrupts = &lt;0 43 4&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 6&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial0: serial@54006800 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006800 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 33 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart0&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 0&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	i2c3: i2c@58783000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58783000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 44 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 7&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial1: serial@54006900 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006900 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 35 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 1&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	/* chip-internal connection for DMD */</div><div class='del'>-	i2c4: i2c@58784000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		reg = &lt;0x58784000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 45 4&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 8&gt;;</div><div class='del'>-		clock-frequency = &lt;400000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial2: serial@54006a00 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006a00 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 37 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart2&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 2&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	/* chip-internal connection for STM */</div><div class='del'>-	i2c5: i2c@58785000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		reg = &lt;0x58785000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 25 4&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 9&gt;;</div><div class='del'>-		clock-frequency = &lt;400000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial3: serial@54006b00 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006b00 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 177 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart3&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 3&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	/* chip-internal connection for HDMI */</div><div class='del'>-	i2c6: i2c@58786000 {</div><div class='del'>-		compatible = "socionext,uniphier-fi2c";</div><div class='del'>-		reg = &lt;0x58786000 0x80&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 26 4&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 10&gt;;</div><div class='del'>-		clock-frequency = &lt;400000&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='add'>+		i2c0: i2c@58780000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58780000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 41 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c0&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 4&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;refclk {</div><div class='del'>-	clock-frequency = &lt;25000000&gt;;</div><div class='del'>-};</div><div class='add'>+		i2c1: i2c@58781000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58781000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 42 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 5&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;mio_clk {</div><div class='del'>-	compatible = "socionext,uniphier-pxs2-sd-clock";</div><div class='del'>-};</div><div class='add'>+		i2c2: i2c@58782000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58782000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 43 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 6&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;mio_rst {</div><div class='del'>-	compatible = "socionext,uniphier-pxs2-sd-reset";</div><div class='del'>-};</div><div class='add'>+		i2c3: i2c@58783000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58783000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 44 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 7&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;peri_clk {</div><div class='del'>-	compatible = "socionext,uniphier-pxs2-peri-clock";</div><div class='del'>-};</div><div class='add'>+		/* chip-internal connection for DMD */</div><div class='add'>+		i2c4: i2c@58784000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			reg = &lt;0x58784000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 45 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 8&gt;;</div><div class='add'>+			clock-frequency = &lt;400000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;peri_rst {</div><div class='del'>-	compatible = "socionext,uniphier-pxs2-peri-reset";</div><div class='del'>-};</div><div class='add'>+		/* chip-internal connection for STM */</div><div class='add'>+		i2c5: i2c@58785000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			reg = &lt;0x58785000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 25 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 9&gt;;</div><div class='add'>+			clock-frequency = &lt;400000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;pinctrl {</div><div class='del'>-	compatible = "socionext,uniphier-pxs2-pinctrl";</div><div class='del'>-};</div><div class='add'>+		/* chip-internal connection for HDMI */</div><div class='add'>+		i2c6: i2c@58786000 {</div><div class='add'>+			compatible = "socionext,uniphier-fi2c";</div><div class='add'>+			reg = &lt;0x58786000 0x80&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 26 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 10&gt;;</div><div class='add'>+			clock-frequency = &lt;400000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;sys_clk {</div><div class='del'>-	compatible = "socionext,uniphier-pxs2-clock";</div><div class='del'>-};</div><div class='add'>+		system_bus: system-bus@58c00000 {</div><div class='add'>+			compatible = "socionext,uniphier-system-bus";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58c00000 0x400&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_system_bus&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		smpctrl@59800000 {</div><div class='add'>+			compatible = "socionext,uniphier-smpctrl";</div><div class='add'>+			reg = &lt;0x59801000 0x400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdctrl@59810000 {</div><div class='add'>+			compatible = "socionext,uniphier-pxs2-sdctrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x59810000 0x800&gt;;</div><div class='ctx'> </div><div class='del'>-&amp;sys_rst {</div><div class='del'>-	compatible = "socionext,uniphier-pxs2-reset";</div><div class='add'>+			sd_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-pxs2-sd-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sd_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-pxs2-sd-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		perictrl@59820000 {</div><div class='add'>+			compatible = "socionext,uniphier-pxs2-perictrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x59820000 0x200&gt;;</div><div class='add'>+</div><div class='add'>+			peri_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-pxs2-peri-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			peri_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-pxs2-peri-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		soc-glue@5f800000 {</div><div class='add'>+			compatible = "socionext,uniphier-pxs2-soc-glue",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x5f800000 0x2000&gt;;</div><div class='add'>+</div><div class='add'>+			pinctrl: pinctrl {</div><div class='add'>+				compatible = "socionext,uniphier-pxs2-pinctrl";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@60000200 {</div><div class='add'>+			compatible = "arm,cortex-a9-global-timer";</div><div class='add'>+			reg = &lt;0x60000200 0x20&gt;;</div><div class='add'>+			interrupts = &lt;1 11 0xf04&gt;;</div><div class='add'>+			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@60000600 {</div><div class='add'>+			compatible = "arm,cortex-a9-twd-timer";</div><div class='add'>+			reg = &lt;0x60000600 0x20&gt;;</div><div class='add'>+			interrupts = &lt;1 13 0xf04&gt;;</div><div class='add'>+			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		intc: interrupt-controller@60001000 {</div><div class='add'>+			compatible = "arm,cortex-a9-gic";</div><div class='add'>+			reg = &lt;0x60001000 0x1000&gt;,</div><div class='add'>+			      &lt;0x60000100 0x100&gt;;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysctrl@61840000 {</div><div class='add'>+			compatible = "socionext,uniphier-pxs2-sysctrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x61840000 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+			sys_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-pxs2-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sys_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-pxs2-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "uniphier-pinctrl.dtsi"</div><div class='head'>diff --git a/arch/arm/boot/dts/uniphier-sld3.dtsi b/arch/arm/boot/dts/uniphier-sld3.dtsi<br/>index 5fa96c939b5c..9fad6bd2db8a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-sld3.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/uniphier-sld3.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-sld3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-sld3.dtsi</a></div><div class='hunk'>@@ -135,7 +135,6 @@</div><div class='ctx'> 			reg = &lt;0x54006800 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;0 33 4&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;sys_clk 0&gt;;</div><div class='del'>-			fifo-size = &lt;64&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		serial1: serial@54006900 {</div><div class='hunk'>@@ -144,7 +143,6 @@</div><div class='ctx'> 			reg = &lt;0x54006900 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;0 35 4&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;sys_clk 0&gt;;</div><div class='del'>-			fifo-size = &lt;64&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		serial2: serial@54006a00 {</div><div class='hunk'>@@ -153,7 +151,6 @@</div><div class='ctx'> 			reg = &lt;0x54006a00 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;0 37 4&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;sys_clk 0&gt;;</div><div class='del'>-			fifo-size = &lt;64&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c0: i2c@58400000 {</div><div class='hunk'>@@ -225,7 +222,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		mioctrl@59810000 {</div><div class='del'>-			compatible = "socionext,uniphier-mioctrl",</div><div class='add'>+			compatible = "socionext,uniphier-sld3-mioctrl",</div><div class='ctx'> 				     "simple-mfd", "syscon";</div><div class='ctx'> 			reg = &lt;0x59810000 0x800&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -245,6 +242,9 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			reg = &lt;0x5a800100 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;0 80 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 8&gt;, &lt;&amp;mio_clk 12&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 8&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 12&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		usb1: usb@5a810100 {</div><div class='hunk'>@@ -252,6 +252,9 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			reg = &lt;0x5a810100 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;0 81 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 9&gt;, &lt;&amp;mio_clk 13&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 9&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 13&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		usb2: usb@5a820100 {</div><div class='hunk'>@@ -259,6 +262,9 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			reg = &lt;0x5a820100 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;0 82 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 10&gt;, &lt;&amp;mio_clk 14&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 10&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 14&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		usb3: usb@5a830100 {</div><div class='hunk'>@@ -266,12 +272,15 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			reg = &lt;0x5a830100 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;0 83 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 11&gt;, &lt;&amp;mio_clk 15&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 11&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 15&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sysctrl@f1840000 {</div><div class='del'>-			compatible = "socionext,uniphier-sysctrl",</div><div class='add'>+			compatible = "socionext,uniphier-sld3-sysctrl",</div><div class='ctx'> 				     "simple-mfd", "syscon";</div><div class='del'>-			reg = &lt;0xf1840000 0x4000&gt;;</div><div class='add'>+			reg = &lt;0xf1840000 0x10000&gt;;</div><div class='ctx'> </div><div class='ctx'> 			sys_clk: clock {</div><div class='ctx'> 				compatible = "socionext,uniphier-sld3-clock";</div><div class='head'>diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi<br/>index d8cf0e7e11ea..b2c980ead7f0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-sld8.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/uniphier-sld8.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/uniphier-sld8.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/uniphier-sld8.dtsi</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "uniphier-common32.dtsi"</div><div class='add'>+/include/ "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "socionext,uniphier-sld8";</div><div class='hunk'>@@ -61,146 +61,267 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-0.2";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	clocks {</div><div class='add'>+		refclk: ref {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;25000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		arm_timer_clk: arm_timer_clk {</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			clock-frequency = &lt;50000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;soc {</div><div class='del'>-	l2: l2-cache@500c0000 {</div><div class='del'>-		compatible = "socionext,uniphier-system-cache";</div><div class='del'>-		reg = &lt;0x500c0000 0x2000&gt;, &lt;0x503c0100 0x4&gt;, &lt;0x506c0000 0x400&gt;;</div><div class='del'>-		interrupts = &lt;0 174 4&gt;, &lt;0 175 4&gt;;</div><div class='del'>-		cache-unified;</div><div class='del'>-		cache-size = &lt;(256 * 1024)&gt;;</div><div class='del'>-		cache-sets = &lt;256&gt;;</div><div class='del'>-		cache-line-size = &lt;128&gt;;</div><div class='del'>-		cache-level = &lt;2&gt;;</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	i2c0: i2c@58400000 {</div><div class='del'>-		compatible = "socionext,uniphier-i2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58400000 0x40&gt;;</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 41 1&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c0&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 4&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> </div><div class='del'>-	i2c1: i2c@58480000 {</div><div class='del'>-		compatible = "socionext,uniphier-i2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58480000 0x40&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 42 1&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 5&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		l2: l2-cache@500c0000 {</div><div class='add'>+			compatible = "socionext,uniphier-system-cache";</div><div class='add'>+			reg = &lt;0x500c0000 0x2000&gt;, &lt;0x503c0100 0x4&gt;,</div><div class='add'>+			      &lt;0x506c0000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;0 174 4&gt;, &lt;0 175 4&gt;;</div><div class='add'>+			cache-unified;</div><div class='add'>+			cache-size = &lt;(256 * 1024)&gt;;</div><div class='add'>+			cache-sets = &lt;256&gt;;</div><div class='add'>+			cache-line-size = &lt;128&gt;;</div><div class='add'>+			cache-level = &lt;2&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	/* chip-internal connection for DMD */</div><div class='del'>-	i2c2: i2c@58500000 {</div><div class='del'>-		compatible = "socionext,uniphier-i2c";</div><div class='del'>-		reg = &lt;0x58500000 0x40&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 43 1&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 6&gt;;</div><div class='del'>-		clock-frequency = &lt;400000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial0: serial@54006800 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006800 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 33 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart0&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 0&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	i2c3: i2c@58580000 {</div><div class='del'>-		compatible = "socionext,uniphier-i2c";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x58580000 0x40&gt;;</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		interrupts = &lt;0 44 1&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='del'>-		clocks = &lt;&amp;peri_clk 7&gt;;</div><div class='del'>-		clock-frequency = &lt;100000&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial1: serial@54006900 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006900 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 35 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 1&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	usb0: usb@5a800100 {</div><div class='del'>-		compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x5a800100 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 80 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_usb0&gt;;</div><div class='del'>-		clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 8&gt;, &lt;&amp;mio_clk 12&gt;;</div><div class='del'>-		resets = &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 8&gt;, &lt;&amp;mio_rst 12&gt;, &lt;&amp;sys_rst 8&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial2: serial@54006a00 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006a00 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 37 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart2&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 2&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	usb1: usb@5a810100 {</div><div class='del'>-		compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x5a810100 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 81 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_usb1&gt;;</div><div class='del'>-		clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 9&gt;, &lt;&amp;mio_clk 13&gt;;</div><div class='del'>-		resets = &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 9&gt;, &lt;&amp;mio_rst 13&gt;, &lt;&amp;sys_rst 8&gt;;</div><div class='del'>-	};</div><div class='add'>+		serial3: serial@54006b00 {</div><div class='add'>+			compatible = "socionext,uniphier-uart";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x54006b00 0x40&gt;;</div><div class='add'>+			interrupts = &lt;0 29 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_uart3&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 3&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	usb2: usb@5a820100 {</div><div class='del'>-		compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='del'>-		status = "disabled";</div><div class='del'>-		reg = &lt;0x5a820100 0x100&gt;;</div><div class='del'>-		interrupts = &lt;0 82 4&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_usb2&gt;;</div><div class='del'>-		clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 10&gt;, &lt;&amp;mio_clk 14&gt;;</div><div class='del'>-		resets = &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 10&gt;, &lt;&amp;mio_rst 14&gt;, &lt;&amp;sys_rst 8&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='add'>+		i2c0: i2c@58400000 {</div><div class='add'>+			compatible = "socionext,uniphier-i2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58400000 0x40&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 41 1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c0&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 4&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;refclk {</div><div class='del'>-	clock-frequency = &lt;25000000&gt;;</div><div class='del'>-};</div><div class='add'>+		i2c1: i2c@58480000 {</div><div class='add'>+			compatible = "socionext,uniphier-i2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58480000 0x40&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 42 1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 5&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;serial3 {</div><div class='del'>-	interrupts = &lt;0 29 4&gt;;</div><div class='del'>-};</div><div class='add'>+		/* chip-internal connection for DMD */</div><div class='add'>+		i2c2: i2c@58500000 {</div><div class='add'>+			compatible = "socionext,uniphier-i2c";</div><div class='add'>+			reg = &lt;0x58500000 0x40&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 43 1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 6&gt;;</div><div class='add'>+			clock-frequency = &lt;400000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;mio_clk {</div><div class='del'>-	compatible = "socionext,uniphier-sld8-mio-clock";</div><div class='del'>-};</div><div class='add'>+		i2c3: i2c@58580000 {</div><div class='add'>+			compatible = "socionext,uniphier-i2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58580000 0x40&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupts = &lt;0 44 1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='add'>+			clocks = &lt;&amp;peri_clk 7&gt;;</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;mio_rst {</div><div class='del'>-	compatible = "socionext,uniphier-sld8-mio-reset";</div><div class='del'>-	resets = &lt;&amp;sys_rst 7&gt;;</div><div class='del'>-};</div><div class='add'>+		system_bus: system-bus@58c00000 {</div><div class='add'>+			compatible = "socionext,uniphier-system-bus";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x58c00000 0x400&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_system_bus&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;peri_clk {</div><div class='del'>-	compatible = "socionext,uniphier-sld8-peri-clock";</div><div class='del'>-};</div><div class='add'>+		smpctrl@59800000 {</div><div class='add'>+			compatible = "socionext,uniphier-smpctrl";</div><div class='add'>+			reg = &lt;0x59801000 0x400&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;peri_rst {</div><div class='del'>-	compatible = "socionext,uniphier-sld8-peri-reset";</div><div class='del'>-};</div><div class='add'>+		mioctrl@59810000 {</div><div class='add'>+			compatible = "socionext,uniphier-sld8-mioctrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x59810000 0x800&gt;;</div><div class='ctx'> </div><div class='del'>-&amp;pinctrl {</div><div class='del'>-	compatible = "socionext,uniphier-sld8-pinctrl";</div><div class='del'>-};</div><div class='add'>+			mio_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-sld8-mio-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='ctx'> </div><div class='del'>-&amp;sys_clk {</div><div class='del'>-	compatible = "socionext,uniphier-sld8-clock";</div><div class='del'>-};</div><div class='add'>+			mio_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-sld8-mio-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		perictrl@59820000 {</div><div class='add'>+			compatible = "socionext,uniphier-sld8-perictrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x59820000 0x200&gt;;</div><div class='add'>+</div><div class='add'>+			peri_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-sld8-peri-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			peri_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-sld8-peri-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb0: usb@5a800100 {</div><div class='add'>+			compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x5a800100 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0 80 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_usb0&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 8&gt;, &lt;&amp;mio_clk 12&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 8&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 12&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb1: usb@5a810100 {</div><div class='add'>+			compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x5a810100 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0 81 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_usb1&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 9&gt;, &lt;&amp;mio_clk 13&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 9&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 13&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb2: usb@5a820100 {</div><div class='add'>+			compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			reg = &lt;0x5a820100 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0 82 4&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_usb2&gt;;</div><div class='add'>+			clocks = &lt;&amp;mio_clk 7&gt;, &lt;&amp;mio_clk 10&gt;, &lt;&amp;mio_clk 14&gt;;</div><div class='add'>+			resets = &lt;&amp;sys_rst 8&gt;, &lt;&amp;mio_rst 7&gt;, &lt;&amp;mio_rst 10&gt;,</div><div class='add'>+				 &lt;&amp;mio_rst 14&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-&amp;sys_rst {</div><div class='del'>-	compatible = "socionext,uniphier-sld8-reset";</div><div class='add'>+		soc-glue@5f800000 {</div><div class='add'>+			compatible = "socionext,uniphier-sld8-soc-glue",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x5f800000 0x2000&gt;;</div><div class='add'>+</div><div class='add'>+			pinctrl: pinctrl {</div><div class='add'>+				compatible = "socionext,uniphier-sld8-pinctrl";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@60000200 {</div><div class='add'>+			compatible = "arm,cortex-a9-global-timer";</div><div class='add'>+			reg = &lt;0x60000200 0x20&gt;;</div><div class='add'>+			interrupts = &lt;1 11 0x104&gt;;</div><div class='add'>+			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@60000600 {</div><div class='add'>+			compatible = "arm,cortex-a9-twd-timer";</div><div class='add'>+			reg = &lt;0x60000600 0x20&gt;;</div><div class='add'>+			interrupts = &lt;1 13 0x104&gt;;</div><div class='add'>+			clocks = &lt;&amp;arm_timer_clk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		intc: interrupt-controller@60001000 {</div><div class='add'>+			compatible = "arm,cortex-a9-gic";</div><div class='add'>+			reg = &lt;0x60001000 0x1000&gt;,</div><div class='add'>+			      &lt;0x60000100 0x100&gt;;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysctrl@61840000 {</div><div class='add'>+			compatible = "socionext,uniphier-sld8-sysctrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x61840000 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+			sys_clk: clock {</div><div class='add'>+				compatible = "socionext,uniphier-sld8-clock";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sys_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-sld8-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "uniphier-pinctrl.dtsi"</div><div class='head'>diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts<br/>index 102838fcc588..15f4fd3f4695 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts</a></div><div class='hunk'>@@ -81,7 +81,7 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0 0x2c001000 0 0x1000&gt;,</div><div class='del'>-		      &lt;0 0x2c002000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x2c002000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0 0x2c004000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0 0x2c006000 0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;1 9 0xf04&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts<br/>index 0205c97efdef..bd107c5a0226 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts</a></div><div class='hunk'>@@ -39,6 +39,7 @@</div><div class='ctx'> 			reg = &lt;0&gt;;</div><div class='ctx'> 			cci-control-port = &lt;&amp;cci_control1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CLUSTER_SLEEP_BIG&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;1024&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu1: cpu@1 {</div><div class='hunk'>@@ -47,6 +48,7 @@</div><div class='ctx'> 			reg = &lt;1&gt;;</div><div class='ctx'> 			cci-control-port = &lt;&amp;cci_control1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CLUSTER_SLEEP_BIG&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;1024&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu2: cpu@2 {</div><div class='hunk'>@@ -55,6 +57,7 @@</div><div class='ctx'> 			reg = &lt;0x100&gt;;</div><div class='ctx'> 			cci-control-port = &lt;&amp;cci_control2&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CLUSTER_SLEEP_LITTLE&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;516&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu3: cpu@3 {</div><div class='hunk'>@@ -63,6 +66,7 @@</div><div class='ctx'> 			reg = &lt;0x101&gt;;</div><div class='ctx'> 			cci-control-port = &lt;&amp;cci_control2&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CLUSTER_SLEEP_LITTLE&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;516&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu4: cpu@4 {</div><div class='hunk'>@@ -71,6 +75,7 @@</div><div class='ctx'> 			reg = &lt;0x102&gt;;</div><div class='ctx'> 			cci-control-port = &lt;&amp;cci_control2&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CLUSTER_SLEEP_LITTLE&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;516&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		idle-states {</div><div class='hunk'>@@ -126,7 +131,7 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0 0x2c001000 0 0x1000&gt;,</div><div class='del'>-		      &lt;0 0x2c002000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x2c002000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0 0x2c004000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0 0x2c006000 0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;1 9 0xf04&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi<br/>index 1e0b823f7e8f..091b738041a0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf-colibri-eval-v3.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf-colibri-eval-v3.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/vf-colibri.dtsi b/arch/arm/boot/dts/vf-colibri.dtsi<br/>index b7417094dc11..b6a1eeeb2bb4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf-colibri.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf-colibri.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf-colibri.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -108,6 +108,10 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;edma1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;esdhc1 {</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pinctrl_esdhc1&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/vf500-colibri-eval-v3.dts b/arch/arm/boot/dts/vf500-colibri-eval-v3.dts<br/>index b3aeab58f718..076998968fb5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf500-colibri-eval-v3.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf500-colibri-eval-v3.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf500-colibri-eval-v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf500-colibri-eval-v3.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/vf500-colibri.dtsi b/arch/arm/boot/dts/vf500-colibri.dtsi<br/>index 1a8a0efa19a6..515c4d2f28b0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf500-colibri.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf500-colibri.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf500-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf500-colibri.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi<br/>index d7fdb2a7d97b..3d9896171bfc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf500.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf500.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf500.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf500.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/vf610-colibri-eval-v3.dts b/arch/arm/boot/dts/vf610-colibri-eval-v3.dts<br/>index dbca4f86fdbb..ef9b4d6209f6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610-colibri-eval-v3.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf610-colibri-eval-v3.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610-colibri-eval-v3.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-colibri-eval-v3.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi<br/>index 9ec9e337f5a8..395812c52933 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610-colibri.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf610-colibri.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610-colibri.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-colibri.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts<br/>index cdc100732514..53e3b8b250c6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610-twr.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf610-twr.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610-twr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-twr.dts</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts<br/>index 5c1fcab4a6f7..7940408838df 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf610-zii-dev-rev-b.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-zii-dev-rev-b.dts</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,43 +32,23 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='del'>-#include "vf610.dtsi"</div><div class='add'>+#include "vf610-zii-dev.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "ZII VF610 Development Board, Rev B";</div><div class='ctx'> 	compatible = "zii,vf610dev-b", "zii,vf610dev", "fsl,vf610";</div><div class='ctx'> </div><div class='del'>-	chosen {</div><div class='del'>-		stdout-path = "serial0:115200n8";</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	memory {</div><div class='del'>-		reg = &lt;0x80000000 0x20000000&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	gpio-leds {</div><div class='del'>-		compatible = "gpio-leds";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_leds_debug&gt;;</div><div class='del'>-		pinctrl-names = "default";</div><div class='del'>-</div><div class='del'>-		debug {</div><div class='del'>-			label = "zii:green:debug1";</div><div class='del'>-			gpios = &lt;&amp;gpio2 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-			linux,default-trigger = "heartbeat";</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	mdio-mux {</div><div class='ctx'> 		compatible = "mdio-mux-gpio";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pinctrl_mdio_mux&gt;;</div><div class='hunk'>@@ -86,29 +66,39 @@</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-			switch0: switch0@0 {</div><div class='add'>+			switch0: switch@0 {</div><div class='ctx'> 				compatible = "marvell,mv88e6085";</div><div class='add'>+				pinctrl-0 = &lt;&amp;pinctrl_gpio_switch0&gt;;</div><div class='add'>+				pinctrl-names = "default";</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='ctx'> 				dsa,member = &lt;0 0&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+				interrupts = &lt;27 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> </div><div class='ctx'> 				ports {</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='ctx'> 					port@0 {</div><div class='ctx'> 						reg = &lt;0&gt;;</div><div class='ctx'> 						label = "lan0";</div><div class='add'>+						phy-handle = &lt;&amp;switch0phy0&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> </div><div class='ctx'> 					port@1 {</div><div class='ctx'> 						reg = &lt;1&gt;;</div><div class='ctx'> 						label = "lan1";</div><div class='add'>+						phy-handle = &lt;&amp;switch0phy1&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> </div><div class='ctx'> 					port@2 {</div><div class='ctx'> 						reg = &lt;2&gt;;</div><div class='ctx'> 						label = "lan2";</div><div class='add'>+						phy-handle = &lt;&amp;switch0phy2&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> </div><div class='ctx'> 					switch0port5: port@5 {</div><div class='hunk'>@@ -127,12 +117,32 @@</div><div class='ctx'> 						reg = &lt;6&gt;;</div><div class='ctx'> 						label = "cpu";</div><div class='ctx'> 						ethernet = &lt;&amp;fec1&gt;;</div><div class='add'>+</div><div class='ctx'> 						fixed-link {</div><div class='ctx'> 							speed = &lt;100&gt;;</div><div class='ctx'> 							full-duplex;</div><div class='ctx'> 						};</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='add'>+				mdio {</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					switch0phy0: switch0phy0@0 {</div><div class='add'>+						reg = &lt;0&gt;;</div><div class='add'>+						interrupt-parent = &lt;&amp;switch0&gt;;</div><div class='add'>+						interrupts = &lt;0 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+					};</div><div class='add'>+					switch0phy1: switch1phy0@1 {</div><div class='add'>+						reg = &lt;1&gt;;</div><div class='add'>+						interrupt-parent = &lt;&amp;switch0&gt;;</div><div class='add'>+						interrupts = &lt;1 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+					};</div><div class='add'>+					switch0phy2: switch1phy0@2 {</div><div class='add'>+						reg = &lt;2&gt;;</div><div class='add'>+						interrupt-parent = &lt;&amp;switch0&gt;;</div><div class='add'>+						interrupts = &lt;2 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -141,16 +151,23 @@</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-			switch1: switch1@0 {</div><div class='add'>+			switch1: switch@0 {</div><div class='ctx'> 				compatible = "marvell,mv88e6085";</div><div class='add'>+				pinctrl-0 = &lt;&amp;pinctrl_gpio_switch1&gt;;</div><div class='add'>+				pinctrl-names = "default";</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;0&gt;;</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='ctx'> 				dsa,member = &lt;0 1&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+				interrupts = &lt;26 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+				interrupt-controller;</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> </div><div class='ctx'> 				ports {</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='ctx'> 					port@0 {</div><div class='ctx'> 						reg = &lt;0&gt;;</div><div class='ctx'> 						label = "lan3";</div><div class='hunk'>@@ -174,6 +191,7 @@</div><div class='ctx'> 						label = "dsa";</div><div class='ctx'> 						link = &lt;&amp;switch2port9&gt;;</div><div class='ctx'> 						phy-mode = "rgmii-txid";</div><div class='add'>+</div><div class='ctx'> 						fixed-link {</div><div class='ctx'> 							speed = &lt;1000&gt;;</div><div class='ctx'> 							full-duplex;</div><div class='hunk'>@@ -194,14 +212,23 @@</div><div class='ctx'> 				mdio {</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='ctx'> 					switch1phy0: switch1phy0@0 {</div><div class='ctx'> 						reg = &lt;0&gt;;</div><div class='add'>+						interrupt-parent = &lt;&amp;switch1&gt;;</div><div class='add'>+						interrupts = &lt;0 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 					};</div><div class='add'>+</div><div class='ctx'> 					switch1phy1: switch1phy0@1 {</div><div class='ctx'> 						reg = &lt;1&gt;;</div><div class='add'>+						interrupt-parent = &lt;&amp;switch1&gt;;</div><div class='add'>+						interrupts = &lt;1 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 					};</div><div class='add'>+</div><div class='ctx'> 					switch1phy2: switch1phy0@2 {</div><div class='ctx'> 						reg = &lt;2&gt;;</div><div class='add'>+						interrupt-parent = &lt;&amp;switch1&gt;;</div><div class='add'>+						interrupts = &lt;2 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 					};</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='hunk'>@@ -222,6 +249,7 @@</div><div class='ctx'> 				ports {</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='ctx'> 					#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='ctx'> 					port@0 {</div><div class='ctx'> 						reg = &lt;0&gt;;</div><div class='ctx'> 						label = "lan6";</div><div class='hunk'>@@ -240,6 +268,7 @@</div><div class='ctx'> 					port@3 {</div><div class='ctx'> 						reg = &lt;3&gt;;</div><div class='ctx'> 						label = "optical3";</div><div class='add'>+</div><div class='ctx'> 						fixed-link {</div><div class='ctx'> 							speed = &lt;1000&gt;;</div><div class='ctx'> 							full-duplex;</div><div class='hunk'>@@ -251,6 +280,7 @@</div><div class='ctx'> 					port@4 {</div><div class='ctx'> 						reg = &lt;4&gt;;</div><div class='ctx'> 						label = "optical4";</div><div class='add'>+</div><div class='ctx'> 						fixed-link {</div><div class='ctx'> 							speed = &lt;1000&gt;;</div><div class='ctx'> 							full-duplex;</div><div class='hunk'>@@ -265,6 +295,7 @@</div><div class='ctx'> 						phy-mode = "rgmii-txid";</div><div class='ctx'> 						link = &lt;&amp;switch1port5</div><div class='ctx'> 							&amp;switch0port5&gt;;</div><div class='add'>+</div><div class='ctx'> 						fixed-link {</div><div class='ctx'> 							speed = &lt;1000&gt;;</div><div class='ctx'> 							full-duplex;</div><div class='hunk'>@@ -281,25 +312,6 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	reg_vcc_3v3_mcu: regulator-vcc-3v3-mcu {</div><div class='del'>-		compatible = "regulator-fixed";</div><div class='del'>-		regulator-name = "vcc_3v3_mcu";</div><div class='del'>-		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='del'>-		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	usb0_vbus: regulator-usb0-vbus {</div><div class='del'>-		compatible = "regulator-fixed";</div><div class='del'>-		pinctrl-0 = &lt;&amp;pinctrl_usb_vbus&gt;;</div><div class='del'>-		regulator-name = "usb_vbus";</div><div class='del'>-		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-		enable-active-high;</div><div class='del'>-		regulator-always-on;</div><div class='del'>-		regulator-boot-on;</div><div class='del'>-		gpio = &lt;&amp;gpio0 6 0&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	spi0 {</div><div class='ctx'> 		compatible = "spi-gpio";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pinctrl_gpio_spi0&gt;;</div><div class='hunk'>@@ -336,49 +348,6 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;adc0 {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;pinctrl_adc0_ad5&gt;;</div><div class='del'>-	vref-supply = &lt;&amp;reg_vcc_3v3_mcu&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;edma0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;esdhc1 {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;pinctrl_esdhc1&gt;;</div><div class='del'>-	bus-width = &lt;4&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;fec0 {</div><div class='del'>-	phy-mode = "rmii";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;pinctrl_fec0&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;fec1 {</div><div class='del'>-	phy-mode = "rmii";</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;pinctrl_fec1&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-</div><div class='del'>-	fixed-link {</div><div class='del'>-		   speed = &lt;100&gt;;</div><div class='del'>-		   full-duplex;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	mdio1: mdio {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='del'>-		status = "okay";</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;i2c0 {</div><div class='ctx'> 	clock-frequency = &lt;100000&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='hunk'>@@ -403,33 +372,6 @@</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio2&gt;;</div><div class='ctx'> 		interrupts = &lt;2 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	lm75@48 {</div><div class='del'>-		compatible = "national,lm75";</div><div class='del'>-		reg = &lt;0x48&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	at24c04@50 {</div><div class='del'>-		compatible = "atmel,24c04";</div><div class='del'>-		reg = &lt;0x50&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	at24c04@52 {</div><div class='del'>-		compatible = "atmel,24c04";</div><div class='del'>-		reg = &lt;0x52&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	ds1682@6b {</div><div class='del'>-		compatible = "dallas,ds1682";</div><div class='del'>-		reg = &lt;0x6b&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;i2c1 {</div><div class='del'>-	clock-frequency = &lt;100000&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='del'>-	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c2 {</div><div class='hunk'>@@ -499,127 +441,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;i2c3 {</div><div class='del'>-	clock-frequency = &lt;100000&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;pinctrl_i2c3&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;uart0 {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;pinctrl_uart0&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;uart1 {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;uart2 {</div><div class='del'>-	pinctrl-names = "default";</div><div class='del'>-	pinctrl-0 = &lt;&amp;pinctrl_uart2&gt;;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;usbdev0 {</div><div class='del'>-	disable-over-current;</div><div class='del'>-	vbus-supply = &lt;&amp;usb0_vbus&gt;;</div><div class='del'>-	dr_mode = "host";</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;usbh1 {</div><div class='del'>-	disable-over-current;</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;usbmisc0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;usbmisc1 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;usbphy0 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-&amp;usbphy1 {</div><div class='del'>-	status = "okay";</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> &amp;iomuxc {</div><div class='del'>-	pinctrl_adc0_ad5: adc0ad5grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTC30__ADC0_SE5	0x00a1</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_dspi0: dspi0grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTB18__DSPI0_CS1	0x1182</div><div class='del'>-			VF610_PAD_PTB19__DSPI0_CS0	0x1182</div><div class='del'>-			VF610_PAD_PTB20__DSPI0_SIN	0x1181</div><div class='del'>-			VF610_PAD_PTB21__DSPI0_SOUT	0x1182</div><div class='del'>-			VF610_PAD_PTB22__DSPI0_SCK	0x1182</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_dspi2: dspi2grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTD31__DSPI2_CS1	0x1182</div><div class='del'>-			VF610_PAD_PTD30__DSPI2_CS0	0x1182</div><div class='del'>-			VF610_PAD_PTD29__DSPI2_SIN	0x1181</div><div class='del'>-			VF610_PAD_PTD28__DSPI2_SOUT	0x1182</div><div class='del'>-			VF610_PAD_PTD27__DSPI2_SCK	0x1182</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_esdhc1: esdhc1grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTA24__ESDHC1_CLK	0x31ef</div><div class='del'>-			VF610_PAD_PTA25__ESDHC1_CMD	0x31ef</div><div class='del'>-			VF610_PAD_PTA26__ESDHC1_DAT0	0x31ef</div><div class='del'>-			VF610_PAD_PTA27__ESDHC1_DAT1	0x31ef</div><div class='del'>-			VF610_PAD_PTA28__ESDHC1_DATA2	0x31ef</div><div class='del'>-			VF610_PAD_PTA29__ESDHC1_DAT3	0x31ef</div><div class='del'>-			VF610_PAD_PTA7__GPIO_134	0x219d</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_fec0: fec0grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTC0__ENET_RMII0_MDC	0x30d2</div><div class='del'>-			VF610_PAD_PTC1__ENET_RMII0_MDIO	0x30d3</div><div class='del'>-			VF610_PAD_PTC2__ENET_RMII0_CRS	0x30d1</div><div class='del'>-			VF610_PAD_PTC3__ENET_RMII0_RXD1	0x30d1</div><div class='del'>-			VF610_PAD_PTC4__ENET_RMII0_RXD0	0x30d1</div><div class='del'>-			VF610_PAD_PTC5__ENET_RMII0_RXER	0x30d1</div><div class='del'>-			VF610_PAD_PTC6__ENET_RMII0_TXD1	0x30d2</div><div class='del'>-			VF610_PAD_PTC7__ENET_RMII0_TXD0	0x30d2</div><div class='del'>-			VF610_PAD_PTC8__ENET_RMII0_TXEN	0x30d2</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_fec1: fec1grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTA6__RMII_CLKIN		0x30d1</div><div class='del'>-			VF610_PAD_PTC9__ENET_RMII1_MDC		0x30d2</div><div class='del'>-			VF610_PAD_PTC10__ENET_RMII1_MDIO	0x30d3</div><div class='del'>-			VF610_PAD_PTC11__ENET_RMII1_CRS		0x30d1</div><div class='del'>-			VF610_PAD_PTC12__ENET_RMII1_RXD1	0x30d1</div><div class='del'>-			VF610_PAD_PTC13__ENET_RMII1_RXD0	0x30d1</div><div class='del'>-			VF610_PAD_PTC14__ENET_RMII1_RXER	0x30d1</div><div class='del'>-			VF610_PAD_PTC15__ENET_RMII1_TXD1	0x30d2</div><div class='del'>-			VF610_PAD_PTC16__ENET_RMII1_TXD0	0x30d2</div><div class='del'>-			VF610_PAD_PTC17__ENET_RMII1_TXEN	0x30d2</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	pinctrl_gpio_e6185_eeprom_sel: pinctrl-gpio-e6185-eeprom-spi0 {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='ctx'> 			VF610_PAD_PTE27__GPIO_132	0x33e2</div><div class='hunk'>@@ -636,46 +459,18 @@</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pinctrl_i2c_mux_reset: pinctrl-i2c-mux-reset {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			 VF610_PAD_PTE14__GPIO_119	0x31c2</div><div class='del'>-			 &gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_i2c0: i2c0grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTB14__I2C0_SCL	0x37ff</div><div class='del'>-			VF610_PAD_PTB15__I2C0_SDA	0x37ff</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_i2c1: i2c1grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTB16__I2C1_SCL	0x37ff</div><div class='del'>-			VF610_PAD_PTB17__I2C1_SDA	0x37ff</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_i2c2: i2c2grp {</div><div class='add'>+	pinctrl_gpio_switch0: pinctrl-gpio-switch0 {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTA22__I2C2_SCL	0x37ff</div><div class='del'>-			VF610_PAD_PTA23__I2C2_SDA	0x37ff</div><div class='add'>+			VF610_PAD_PTB5__GPIO_27		0x219d</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pinctrl_i2c3: i2c3grp {</div><div class='add'>+	pinctrl_gpio_switch1: pinctrl-gpio-switch1 {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTA30__I2C3_SCL	0x37ff</div><div class='del'>-			VF610_PAD_PTA31__I2C3_SDA	0x37ff</div><div class='add'>+			VF610_PAD_PTB4__GPIO_26		0x219d</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pinctrl_leds_debug: pinctrl-leds-debug {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			 VF610_PAD_PTD20__GPIO_74	0x31c2</div><div class='del'>-			 &gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	pinctrl_mdio_mux: pinctrl-mdio-mux {</div><div class='ctx'> 		fsl,pins = &lt;</div><div class='ctx'> 			VF610_PAD_PTA18__GPIO_8		0x31c2</div><div class='hunk'>@@ -690,57 +485,4 @@</div><div class='ctx'> 			VF610_PAD_PTB28__GPIO_98	0x219d</div><div class='ctx'> 		&gt;;</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	pinctrl_pwm0: pwm0grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTB0__FTM0_CH0	0x1582</div><div class='del'>-			VF610_PAD_PTB1__FTM0_CH1	0x1582</div><div class='del'>-			VF610_PAD_PTB2__FTM0_CH2	0x1582</div><div class='del'>-			VF610_PAD_PTB3__FTM0_CH3	0x1582</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_qspi0: qspi0grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTD7__QSPI0_B_QSCK	0x31c3</div><div class='del'>-			VF610_PAD_PTD8__QSPI0_B_CS0	0x31ff</div><div class='del'>-			VF610_PAD_PTD9__QSPI0_B_DATA3	0x31c3</div><div class='del'>-			VF610_PAD_PTD10__QSPI0_B_DATA2	0x31c3</div><div class='del'>-			VF610_PAD_PTD11__QSPI0_B_DATA1	0x31c3</div><div class='del'>-			VF610_PAD_PTD12__QSPI0_B_DATA0	0x31c3</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_uart0: uart0grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTB10__UART0_TX	0x21a2</div><div class='del'>-			VF610_PAD_PTB11__UART0_RX	0x21a1</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_uart1: uart1grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTB23__UART1_TX	0x21a2</div><div class='del'>-			VF610_PAD_PTB24__UART1_RX	0x21a1</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_uart2: uart2grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTD0__UART2_TX	0x21a2</div><div class='del'>-			VF610_PAD_PTD1__UART2_RX	0x21a1</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_usb_vbus: pinctrl-usb-vbus {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTA16__GPIO_6	0x31c2</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pinctrl_usb0_host: usb0-host-grp {</div><div class='del'>-		fsl,pins = &lt;</div><div class='del'>-			VF610_PAD_PTD6__GPIO_85		0x0062</div><div class='del'>-		&gt;;</div><div class='del'>-	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts<br/>new file mode 100644<br/>index 000000000000..6a45bd24ffe6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-zii-dev-rev-c.dts</a></div><div class='hunk'>@@ -0,0 +1,416 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015, 2016 Zodiac Inflight Innovations</div><div class='add'>+ *</div><div class='add'>+ * Based on an original 'vf610-twr.dts' which is Copyright 2015,</div><div class='add'>+ * Freescale Semiconductor, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "vf610-zii-dev.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "ZII VF610 Development Board, Rev C";</div><div class='add'>+	compatible = "zii,vf610dev-c", "zii,vf610dev", "fsl,vf610";</div><div class='add'>+</div><div class='add'>+	mdio-mux {</div><div class='add'>+		compatible = "mdio-mux-gpio";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_mdio_mux&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		gpios = &lt;&amp;gpio0 8  GPIO_ACTIVE_HIGH</div><div class='add'>+			 &amp;gpio0 9  GPIO_ACTIVE_HIGH</div><div class='add'>+			 &amp;gpio0 25 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		mdio-parent-bus = &lt;&amp;mdio1&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		mdio_mux_1: mdio@1 {</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			switch0: switch@0 {</div><div class='add'>+				compatible = "marvell,mv88e6190";</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				dsa,member = &lt;0 0&gt;;</div><div class='add'>+				eeprom-length = &lt;512&gt;;</div><div class='add'>+</div><div class='add'>+				ports {</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+					port@0 {</div><div class='add'>+						reg = &lt;0&gt;;</div><div class='add'>+						label = "cpu";</div><div class='add'>+						ethernet = &lt;&amp;fec1&gt;;</div><div class='add'>+</div><div class='add'>+						fixed-link {</div><div class='add'>+							speed = &lt;100&gt;;</div><div class='add'>+							full-duplex;</div><div class='add'>+						};</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					port@1 {</div><div class='add'>+						reg = &lt;1&gt;;</div><div class='add'>+						label = "lan1";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					port@2 {</div><div class='add'>+						reg = &lt;2&gt;;</div><div class='add'>+						label = "lan2";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					port@3 {</div><div class='add'>+						reg = &lt;3&gt;;</div><div class='add'>+						label = "lan3";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					port@4 {</div><div class='add'>+						reg = &lt;4&gt;;</div><div class='add'>+						label = "lan4";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					switch0port10: port@10 {</div><div class='add'>+						reg = &lt;10&gt;;</div><div class='add'>+						label = "dsa";</div><div class='add'>+						phy-mode = "xgmii";</div><div class='add'>+						link = &lt;&amp;switch1port10&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mdio_mux_2: mdio@2 {</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			switch1: switch@0 {</div><div class='add'>+				compatible = "marvell,mv88e6190";</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				dsa,member = &lt;0 1&gt;;</div><div class='add'>+				eeprom-length = &lt;512&gt;;</div><div class='add'>+</div><div class='add'>+				ports {</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+					port@1 {</div><div class='add'>+						reg = &lt;1&gt;;</div><div class='add'>+						label = "lan5";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					port@2 {</div><div class='add'>+						reg = &lt;2&gt;;</div><div class='add'>+						label = "lan6";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					port@3 {</div><div class='add'>+						reg = &lt;3&gt;;</div><div class='add'>+						label = "lan7";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					port@4 {</div><div class='add'>+						reg = &lt;4&gt;;</div><div class='add'>+						label = "lan8";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+					switch1port10: port@10 {</div><div class='add'>+						reg = &lt;10&gt;;</div><div class='add'>+						label = "dsa";</div><div class='add'>+						phy-mode = "xgmii";</div><div class='add'>+						link = &lt;&amp;switch0port10&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mdio_mux_4: mdio@4 {</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dspi0 {</div><div class='add'>+	bus-num = &lt;0&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_dspi0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+	spi-num-chipselects = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	m25p128@0 {</div><div class='add'>+		compatible = "m25p128", "jedec,spi-nor";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;1000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	atzb-rf-233@1 {</div><div class='add'>+		compatible = "atmel,at86rf233";</div><div class='add'>+</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctr_atzb_rf_233&gt;;</div><div class='add'>+</div><div class='add'>+		spi-max-frequency = &lt;7500000&gt;;</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		interrupts = &lt;4 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio3&gt;;</div><div class='add'>+		xtal-trim = /bits/ 8 &lt;0x06&gt;;</div><div class='add'>+</div><div class='add'>+		sleep-gpio = &lt;&amp;gpio0 24 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		reset-gpio = &lt;&amp;gpio6 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		fsl,spi-cs-sck-delay = &lt;180&gt;;</div><div class='add'>+		fsl,spi-sck-cs-delay = &lt;250&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	/*</div><div class='add'>+	 * U712</div><div class='add'>+	 *</div><div class='add'>+	 * Exposed signals:</div><div class='add'>+	 *    P1 - WE2_CMD</div><div class='add'>+	 *    P2 - WE2_CLK</div><div class='add'>+	 */</div><div class='add'>+	gpio5: pca9557@18 {</div><div class='add'>+		compatible = "nxp,pca9557";</div><div class='add'>+		reg = &lt;0x18&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * U121</div><div class='add'>+	 *</div><div class='add'>+	 * Exposed signals:</div><div class='add'>+	 *    I/O0  - ENET_SWR_EN</div><div class='add'>+	 *    I/O1  - ESW1_RESETn</div><div class='add'>+	 *    I/O2  - ARINC_RESET</div><div class='add'>+	 *    I/O3  - DD1_IO_RESET</div><div class='add'>+	 *    I/O4  - ESW2_RESETn</div><div class='add'>+	 *    I/O5  - ESW3_RESETn</div><div class='add'>+	 *    I/O6  - ESW4_RESETn</div><div class='add'>+	 *    I/O8  - TP909</div><div class='add'>+	 *    I/O9  - FEM_SEL</div><div class='add'>+	 *    I/O10 - WIFI_RESETn</div><div class='add'>+	 *    I/O11 - PHY_RSTn</div><div class='add'>+	 *    I/O12 - OPT1_SD</div><div class='add'>+	 *    I/O13 - OPT2_SD</div><div class='add'>+	 *    I/O14 - OPT1_TX_DIS</div><div class='add'>+	 *    I/O15 - OPT2_TX_DIS</div><div class='add'>+	 */</div><div class='add'>+	gpio6: sx1503@20 {</div><div class='add'>+		compatible = "semtech,sx1503q";</div><div class='add'>+</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_sx1503_20&gt;;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		reg = &lt;0x20&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+		interrupts = &lt;23 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+</div><div class='add'>+		enet_swr_en {</div><div class='add'>+			gpio-hog;</div><div class='add'>+			gpios = &lt;0 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			output-high;</div><div class='add'>+			line-name = "enet-swr-en";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * U715</div><div class='add'>+	 *</div><div class='add'>+	 * Exposed signals:</div><div class='add'>+	 *     IO0 - WE1_CLK</div><div class='add'>+	 *     IO1 - WE1_CMD</div><div class='add'>+	 */</div><div class='add'>+	gpio7: pca9554@22 {</div><div class='add'>+		compatible = "nxp,pca9554";</div><div class='add'>+		reg = &lt;0x22&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	at24mac602@00 {</div><div class='add'>+		compatible = "atmel,24c02";</div><div class='add'>+		reg = &lt;0x50&gt;;</div><div class='add'>+		read-only;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	tca9548@70 {</div><div class='add'>+		compatible = "nxp,pca9548";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_i2c_mux_reset&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0x70&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio3 23 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+</div><div class='add'>+		i2c@0 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@1 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			sfp2: at24c04@50 {</div><div class='add'>+				compatible = "atmel,24c02";</div><div class='add'>+				reg = &lt;0x50&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@2 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+			sfp3: at24c04@50 {</div><div class='add'>+				compatible = "atmel,24c02";</div><div class='add'>+				reg = &lt;0x50&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@3 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart3 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart3&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gpio0 {</div><div class='add'>+	eth0_intrp {</div><div class='add'>+		gpio-hog;</div><div class='add'>+		gpios = &lt;23 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		input;</div><div class='add'>+		line-name = "sx1503-irq";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gpio3 {</div><div class='add'>+	eth0_intrp {</div><div class='add'>+		gpio-hog;</div><div class='add'>+		gpios = &lt;2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		input;</div><div class='add'>+		line-name = "eth0-intrp";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec0 {</div><div class='add'>+	mdio {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		ethernet-phy@0 {</div><div class='add'>+			compatible = "ethernet-phy-ieee802.3-c22";</div><div class='add'>+</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;pinctrl_fec0_phy_int&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-parent = &lt;&amp;gpio3&gt;;</div><div class='add'>+			interrupts = &lt;2 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctr_atzb_rf_233: pinctrl-atzb-rf-233 {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTB2__GPIO_24		0x31c2</div><div class='add'>+			VF610_PAD_PTE27__GPIO_132	0x33e2</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	pinctrl_sx1503_20: pinctrl-sx1503-20 {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTB1__GPIO_23		0x219d</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart3: uart3grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTA20__UART3_TX	0x21a2</div><div class='add'>+			VF610_PAD_PTA21__UART3_RX	0x21a1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_mdio_mux: pinctrl-mdio-mux {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTA18__GPIO_8		0x31c2</div><div class='add'>+			VF610_PAD_PTA19__GPIO_9		0x31c2</div><div class='add'>+			VF610_PAD_PTB3__GPIO_25		0x31c2</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_fec0_phy_int: pinctrl-fec0-phy-int {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTB28__GPIO_98	0x219d</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/vf610-zii-dev.dtsi b/arch/arm/boot/dts/vf610-zii-dev.dtsi<br/>new file mode 100644<br/>index 000000000000..ca9e1bc35e45<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610-zii-dev.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610-zii-dev.dtsi</a></div><div class='hunk'>@@ -0,0 +1,383 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015, 2016 Zodiac Inflight Innovations</div><div class='add'>+ *</div><div class='add'>+ * Based on an original 'vf610-twr.dts' which is Copyright 2015,</div><div class='add'>+ * Freescale Semiconductor, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License</div><div class='add'>+ *     version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "vf610.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x80000000 0x20000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_leds_debug&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+		debug {</div><div class='add'>+			label = "zii:green:debug1";</div><div class='add'>+			gpios = &lt;&amp;gpio2 10 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_vcc_3v3_mcu: regulator-vcc-3v3-mcu {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vcc_3v3_mcu";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb0_vbus: regulator-usb0-vbus {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pinctrl_usb_vbus&gt;;</div><div class='add'>+		regulator-name = "usb_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		gpio = &lt;&amp;gpio0 6 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;adc0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_adc0_ad5&gt;;</div><div class='add'>+	vref-supply = &lt;&amp;reg_vcc_3v3_mcu&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;edma0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;esdhc1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_esdhc1&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec0 {</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_fec0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;fec1 {</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_fec1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	fixed-link {</div><div class='add'>+		   speed = &lt;100&gt;;</div><div class='add'>+		   full-duplex;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio1: mdio {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default", "gpio";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c0&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;pinctrl_i2c0_gpio&gt;;</div><div class='add'>+	scl-gpios = &lt;&amp;gpio1 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	sda-gpios = &lt;&amp;gpio1 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	lm75@48 {</div><div class='add'>+		compatible = "national,lm75";</div><div class='add'>+		reg = &lt;0x48&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	at24c04@50 {</div><div class='add'>+		compatible = "atmel,24c04";</div><div class='add'>+		reg = &lt;0x50&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	at24c04@52 {</div><div class='add'>+		compatible = "atmel,24c04";</div><div class='add'>+		reg = &lt;0x52&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ds1682@6b {</div><div class='add'>+		compatible = "dallas,ds1682";</div><div class='add'>+		reg = &lt;0x6b&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_i2c2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_uart2&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbdev0 {</div><div class='add'>+	disable-over-current;</div><div class='add'>+	vbus-supply = &lt;&amp;usb0_vbus&gt;;</div><div class='add'>+	dr_mode = "host";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbh1 {</div><div class='add'>+	disable-over-current;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbmisc0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbmisc1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;iomuxc {</div><div class='add'>+	pinctrl_adc0_ad5: adc0ad5grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTC30__ADC0_SE5	0x00a1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_dspi0: dspi0grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTB18__DSPI0_CS1	0x1182</div><div class='add'>+			VF610_PAD_PTB19__DSPI0_CS0	0x1182</div><div class='add'>+			VF610_PAD_PTB20__DSPI0_SIN	0x1181</div><div class='add'>+			VF610_PAD_PTB21__DSPI0_SOUT	0x1182</div><div class='add'>+			VF610_PAD_PTB22__DSPI0_SCK	0x1182</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_dspi2: dspi2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTD31__DSPI2_CS1	0x1182</div><div class='add'>+			VF610_PAD_PTD30__DSPI2_CS0	0x1182</div><div class='add'>+			VF610_PAD_PTD29__DSPI2_SIN	0x1181</div><div class='add'>+			VF610_PAD_PTD28__DSPI2_SOUT	0x1182</div><div class='add'>+			VF610_PAD_PTD27__DSPI2_SCK	0x1182</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_esdhc1: esdhc1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTA24__ESDHC1_CLK	0x31ef</div><div class='add'>+			VF610_PAD_PTA25__ESDHC1_CMD	0x31ef</div><div class='add'>+			VF610_PAD_PTA26__ESDHC1_DAT0	0x31ef</div><div class='add'>+			VF610_PAD_PTA27__ESDHC1_DAT1	0x31ef</div><div class='add'>+			VF610_PAD_PTA28__ESDHC1_DATA2	0x31ef</div><div class='add'>+			VF610_PAD_PTA29__ESDHC1_DAT3	0x31ef</div><div class='add'>+			VF610_PAD_PTA7__GPIO_134	0x219d</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_fec0: fec0grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTC0__ENET_RMII0_MDC	0x30d2</div><div class='add'>+			VF610_PAD_PTC1__ENET_RMII0_MDIO	0x30d3</div><div class='add'>+			VF610_PAD_PTC2__ENET_RMII0_CRS	0x30d1</div><div class='add'>+			VF610_PAD_PTC3__ENET_RMII0_RXD1	0x30d1</div><div class='add'>+			VF610_PAD_PTC4__ENET_RMII0_RXD0	0x30d1</div><div class='add'>+			VF610_PAD_PTC5__ENET_RMII0_RXER	0x30d1</div><div class='add'>+			VF610_PAD_PTC6__ENET_RMII0_TXD1	0x30d2</div><div class='add'>+			VF610_PAD_PTC7__ENET_RMII0_TXD0	0x30d2</div><div class='add'>+			VF610_PAD_PTC8__ENET_RMII0_TXEN	0x30d2</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_fec1: fec1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTA6__RMII_CLKIN		0x30d1</div><div class='add'>+			VF610_PAD_PTC9__ENET_RMII1_MDC		0x30d2</div><div class='add'>+			VF610_PAD_PTC10__ENET_RMII1_MDIO	0x30d3</div><div class='add'>+			VF610_PAD_PTC11__ENET_RMII1_CRS		0x30d1</div><div class='add'>+			VF610_PAD_PTC12__ENET_RMII1_RXD1	0x30d1</div><div class='add'>+			VF610_PAD_PTC13__ENET_RMII1_RXD0	0x30d1</div><div class='add'>+			VF610_PAD_PTC14__ENET_RMII1_RXER	0x30d1</div><div class='add'>+			VF610_PAD_PTC15__ENET_RMII1_TXD1	0x30d2</div><div class='add'>+			VF610_PAD_PTC16__ENET_RMII1_TXD0	0x30d2</div><div class='add'>+			VF610_PAD_PTC17__ENET_RMII1_TXEN	0x30d2</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_gpio_spi0: pinctrl-gpio-spi0 {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTB22__GPIO_44	0x33e2</div><div class='add'>+			VF610_PAD_PTB21__GPIO_43	0x33e2</div><div class='add'>+			VF610_PAD_PTB20__GPIO_42	0x33e1</div><div class='add'>+			VF610_PAD_PTB19__GPIO_41	0x33e2</div><div class='add'>+			VF610_PAD_PTB18__GPIO_40	0x33e2</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c_mux_reset: pinctrl-i2c-mux-reset {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			 VF610_PAD_PTE14__GPIO_119	0x31c2</div><div class='add'>+			 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c0: i2c0grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTB14__I2C0_SCL	0x37ff</div><div class='add'>+			VF610_PAD_PTB15__I2C0_SDA	0x37ff</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c0_gpio: i2c0grp-gpio {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTB14__GPIO_36	0x31c2</div><div class='add'>+			VF610_PAD_PTB15__GPIO_37	0x31c2</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c1: i2c1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTB16__I2C1_SCL	0x37ff</div><div class='add'>+			VF610_PAD_PTB17__I2C1_SDA	0x37ff</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_i2c2: i2c2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTA22__I2C2_SCL	0x37ff</div><div class='add'>+			VF610_PAD_PTA23__I2C2_SDA	0x37ff</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_leds_debug: pinctrl-leds-debug {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			 VF610_PAD_PTD20__GPIO_74	0x31c2</div><div class='add'>+			 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_qspi0: qspi0grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTD7__QSPI0_B_QSCK	0x31c3</div><div class='add'>+			VF610_PAD_PTD8__QSPI0_B_CS0	0x31ff</div><div class='add'>+			VF610_PAD_PTD9__QSPI0_B_DATA3	0x31c3</div><div class='add'>+			VF610_PAD_PTD10__QSPI0_B_DATA2	0x31c3</div><div class='add'>+			VF610_PAD_PTD11__QSPI0_B_DATA1	0x31c3</div><div class='add'>+			VF610_PAD_PTD12__QSPI0_B_DATA0	0x31c3</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart0: uart0grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTB10__UART0_TX	0x21a2</div><div class='add'>+			VF610_PAD_PTB11__UART0_RX	0x21a1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart1: uart1grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTB23__UART1_TX	0x21a2</div><div class='add'>+			VF610_PAD_PTB24__UART1_RX	0x21a1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_uart2: uart2grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTD0__UART2_TX	0x21a2</div><div class='add'>+			VF610_PAD_PTD1__UART2_RX	0x21a1</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usb_vbus: pinctrl-usb-vbus {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTA16__GPIO_6	0x31c2</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl_usb0_host: usb0-host-grp {</div><div class='add'>+		fsl,pins = &lt;</div><div class='add'>+			VF610_PAD_PTD6__GPIO_85		0x0062</div><div class='add'>+		&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/vf610.dtsi b/arch/arm/boot/dts/vf610.dtsi<br/>index 0cfc060f94d7..80fef182c672 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf610.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/vf610m4-colibri.dts b/arch/arm/boot/dts/vf610m4-colibri.dts<br/>index 2931a80caccb..7198e8cceb0d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610m4-colibri.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf610m4-colibri.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610m4-colibri.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610m4-colibri.dts</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/vf610m4-cosmic.dts b/arch/arm/boot/dts/vf610m4-cosmic.dts<br/>index 8944a2d2054c..f7474c11aabd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610m4-cosmic.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf610m4-cosmic.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610m4-cosmic.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610m4-cosmic.dts</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/vf610m4.dtsi b/arch/arm/boot/dts/vf610m4.dtsi<br/>index 9f2c731839f2..1474bd34d0f1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610m4.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vf610m4.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vf610m4.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vf610m4.dtsi</a></div><div class='hunk'>@@ -13,17 +13,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi<br/>index 2c13ec696ac5..5d654b5b4ce6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/vfxxx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/vfxxx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/vfxxx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/vfxxx.dtsi</a></div><div class='hunk'>@@ -10,17 +10,17 @@</div><div class='ctx'>  *     modify it under the terms of the GNU General Public License</div><div class='ctx'>  *     version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -194,6 +194,9 @@</div><div class='ctx'> 				clocks = &lt;&amp;clks VF610_CLK_DSPI0&gt;;</div><div class='ctx'> 				clock-names = "dspi";</div><div class='ctx'> 				spi-num-chipselects = &lt;6&gt;;</div><div class='add'>+				dmas = &lt;&amp;edma1 1 12&gt;,</div><div class='add'>+					&lt;&amp;edma1 1 13&gt;;</div><div class='add'>+				dma-names = "rx", "tx";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -206,6 +209,9 @@</div><div class='ctx'> 				clocks = &lt;&amp;clks VF610_CLK_DSPI1&gt;;</div><div class='ctx'> 				clock-names = "dspi";</div><div class='ctx'> 				spi-num-chipselects = &lt;4&gt;;</div><div class='add'>+				dmas = &lt;&amp;edma1 1 14&gt;,</div><div class='add'>+					&lt;&amp;edma1 1 15&gt;;</div><div class='add'>+				dma-names = "rx", "tx";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -520,6 +526,12 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			ocotp: ocotp@400a5000 {</div><div class='add'>+				compatible = "fsl,vf610-ocotp";</div><div class='add'>+				reg = &lt;0x400a5000 0x1000&gt;;</div><div class='add'>+				clocks = &lt;&amp;clks VF610_CLK_OCOTP&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			snvs0: snvs@400a7000 {</div><div class='ctx'> 			    compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd";</div><div class='ctx'> 				reg = &lt;0x400a7000 0x2000&gt;;</div><div class='hunk'>@@ -561,6 +573,9 @@</div><div class='ctx'> 				clocks = &lt;&amp;clks VF610_CLK_DSPI2&gt;;</div><div class='ctx'> 				clock-names = "dspi";</div><div class='ctx'> 				spi-num-chipselects = &lt;2&gt;;</div><div class='add'>+				dmas = &lt;&amp;edma1 0 10&gt;,</div><div class='add'>+					&lt;&amp;edma1 0 11&gt;;</div><div class='add'>+				dma-names = "rx", "tx";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -573,6 +588,9 @@</div><div class='ctx'> 				clocks = &lt;&amp;clks VF610_CLK_DSPI3&gt;;</div><div class='ctx'> 				clock-names = "dspi";</div><div class='ctx'> 				spi-num-chipselects = &lt;2&gt;;</div><div class='add'>+				dmas = &lt;&amp;edma1 0 12&gt;,</div><div class='add'>+					&lt;&amp;edma1 0 13&gt;;</div><div class='add'>+				dma-names = "rx", "tx";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi<br/>index f283ff08381c..f3ac9bfe580e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-7000.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/zynq-7000.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-7000.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-7000.dtsi</a></div><div class='hunk'>@@ -10,9 +10,10 @@</div><div class='ctx'>  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='del'>-/include/ "skeleton.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='ctx'> 	compatible = "xlnx,zynq-7000";</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='hunk'>@@ -41,14 +42,15 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pmu {</div><div class='add'>+	pmu@f8891000 {</div><div class='ctx'> 		compatible = "arm,cortex-a9-pmu";</div><div class='ctx'> 		interrupts = &lt;0 5 4&gt;, &lt;0 6 4&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='del'>-		reg = &lt; 0xf8891000 0x1000 0xf8893000 0x1000 &gt;;</div><div class='add'>+		reg = &lt;0xf8891000 0x1000&gt;,</div><div class='add'>+		      &lt;0xf8893000 0x1000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	regulator_vccpint: fixedregulator@0 {</div><div class='add'>+	regulator_vccpint: fixedregulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "VCCPINT";</div><div class='ctx'> 		regulator-min-microvolt = &lt;1000000&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/zynq-microzed.dts b/arch/arm/boot/dts/zynq-microzed.dts<br/>new file mode 100644<br/>index 000000000000..b9376a4904b4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-microzed.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-microzed.dts</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 - 2014 Xilinx</div><div class='add'>+ * Copyright (C) 2016 Jagan Teki &lt;jteki@openedev.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+/include/ "zynq-7000.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Zynq MicroZED Development Board";</div><div class='add'>+	compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ethernet0 = &amp;gem0;</div><div class='add'>+		serial0 = &amp;uart1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "earlycon";</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb_phy0: phy0 {</div><div class='add'>+		compatible = "usb-nop-xceiv";</div><div class='add'>+		#phy-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;clkc {</div><div class='add'>+	ps-clk-frequency = &lt;33333333&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;gem0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	phy-mode = "rgmii-id";</div><div class='add'>+	phy-handle = &lt;&amp;ethernet_phy&gt;;</div><div class='add'>+</div><div class='add'>+	ethernet_phy: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdhci0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	dr_mode = "host";</div><div class='add'>+	usb-phy = &lt;&amp;usb_phy0&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pinctrl_usb0_default&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl0 {</div><div class='add'>+	pinctrl_usb0_default: usb0-default {</div><div class='add'>+		mux {</div><div class='add'>+			groups = "usb0_0_grp";</div><div class='add'>+			function = "usb0";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		conf {</div><div class='add'>+			groups = "usb0_0_grp";</div><div class='add'>+			slew-rate = &lt;0&gt;;</div><div class='add'>+			io-standard = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		conf-rx {</div><div class='add'>+			pins = "MIO29", "MIO31", "MIO36";</div><div class='add'>+			bias-high-impedance;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		conf-tx {</div><div class='add'>+			pins = "MIO28", "MIO30", "MIO32", "MIO33", "MIO34",</div><div class='add'>+			       "MIO35", "MIO37", "MIO38", "MIO39";</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts<br/>index 307ed201d658..64a6390fc501 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-parallella.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/zynq-parallella.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-parallella.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-parallella.dts</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> 		serial0 = &amp;uart1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x0 0x40000000&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts<br/>index e96959b2e67a..0cdad2cc8b78 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-zc702.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/zynq-zc702.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-zc702.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-zc702.dts</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> 		serial0 = &amp;uart1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x0 0x40000000&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts<br/>index be6a986bbbd8..ad4bb06dba25 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-zc706.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/zynq-zc706.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-zc706.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-zc706.dts</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> 		serial0 = &amp;uart1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x0 0x40000000&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts<br/>index 7250c1eac7f9..325379f7983c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-zed.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/zynq-zed.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-zed.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-zed.dts</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> 		serial0 = &amp;uart1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x0 0x20000000&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts<br/>index d9e0f3e70671..590ec24b8749 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-zybo.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/boot/dts/zynq-zybo.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/boot/dts/zynq-zybo.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/boot/dts/zynq-zybo.dts</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> 		serial0 = &amp;uart1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x0 0x20000000&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c<br/>index 37dc0fe1093f..57f3b7512636 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/common/bL_switcher.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/common/bL_switcher.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/common/bL_switcher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/common/bL_switcher.c</a></div><div class='hunk'>@@ -13,7 +13,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;uapi/linux/sched/types.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/cpu_pm.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='hunk'>@@ -757,19 +758,18 @@ EXPORT_SYMBOL_GPL(bL_switcher_put_enabled);</div><div class='ctx'>  * while the switcher is active.</div><div class='ctx'>  * We're just not ready to deal with that given the trickery involved.</div><div class='ctx'>  */</div><div class='del'>-static int bL_switcher_hotplug_callback(struct notifier_block *nfb,</div><div class='del'>-					unsigned long action, void *hcpu)</div><div class='add'>+static int bL_switcher_cpu_pre(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	if (bL_switcher_active) {</div><div class='del'>-		int pairing = bL_switcher_cpu_pairing[(unsigned long)hcpu];</div><div class='del'>-		switch (action &amp; 0xf) {</div><div class='del'>-		case CPU_UP_PREPARE:</div><div class='del'>-		case CPU_DOWN_PREPARE:</div><div class='del'>-			if (pairing == -1)</div><div class='del'>-				return NOTIFY_BAD;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return NOTIFY_DONE;</div><div class='add'>+	int pairing;</div><div class='add'>+</div><div class='add'>+	if (!bL_switcher_active)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pairing = bL_switcher_cpu_pairing[cpu];</div><div class='add'>+</div><div class='add'>+	if (pairing == -1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool no_bL_switcher;</div><div class='hunk'>@@ -782,8 +782,15 @@ static int __init bL_switcher_init(void)</div><div class='ctx'> 	if (!mcpm_is_available())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	cpu_notifier(bL_switcher_hotplug_callback, 0);</div><div class='del'>-</div><div class='add'>+	cpuhp_setup_state_nocalls(CPUHP_ARM_BL_PREPARE, "arm/bl:prepare",</div><div class='add'>+				  bL_switcher_cpu_pre, NULL);</div><div class='add'>+	ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "arm/bl:predown",</div><div class='add'>+					NULL, bL_switcher_cpu_pre);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		cpuhp_remove_state_nocalls(CPUHP_ARM_BL_PREPARE);</div><div class='add'>+		pr_err("bL_switcher: Failed to allocate a hotplug state\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> 	if (!no_bL_switcher) {</div><div class='ctx'> 		ret = bL_switcher_enable();</div><div class='ctx'> 		if (ret)</div><div class='head'>diff --git a/arch/arm/common/bL_switcher_dummy_if.c b/arch/arm/common/bL_switcher_dummy_if.c<br/>index 6053f64c3752..4c10c6452678 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/common/bL_switcher_dummy_if.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/common/bL_switcher_dummy_if.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/common/bL_switcher_dummy_if.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/common/bL_switcher_dummy_if.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/bL_switcher.h&gt;</div><div class='ctx'> </div><div class='ctx'> static ssize_t bL_switcher_write(struct file *file, const char __user *buf,</div><div class='head'>diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c<br/>index 301281645d08..9b1b7be2ec0e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/common/dmabounce.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/common/dmabounce.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/common/dmabounce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/common/dmabounce.c</a></div><div class='hunk'>@@ -243,7 +243,8 @@ static int needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size,</div><div class='del'>-		enum dma_data_direction dir)</div><div class='add'>+				    enum dma_data_direction dir,</div><div class='add'>+				    unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> 	struct dmabounce_device_info *device_info = dev-&gt;archdata.dmabounce;</div><div class='ctx'> 	struct safe_buffer *buf;</div><div class='hunk'>@@ -262,7 +263,8 @@ static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size,</div><div class='ctx'> 		__func__, buf-&gt;ptr, virt_to_dma(dev, buf-&gt;ptr),</div><div class='ctx'> 		buf-&gt;safe, buf-&gt;safe_dma_addr);</div><div class='ctx'> </div><div class='del'>-	if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL) {</div><div class='add'>+	if ((dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL) &amp;&amp;</div><div class='add'>+	    !(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)) {</div><div class='ctx'> 		dev_dbg(dev, "%s: copy unsafe %p to safe %p, size %d\n",</div><div class='ctx'> 			__func__, ptr, buf-&gt;safe, size);</div><div class='ctx'> 		memcpy(buf-&gt;safe, ptr, size);</div><div class='hunk'>@@ -272,7 +274,8 @@ static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void unmap_single(struct device *dev, struct safe_buffer *buf,</div><div class='del'>-		size_t size, enum dma_data_direction dir)</div><div class='add'>+				size_t size, enum dma_data_direction dir,</div><div class='add'>+				unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(buf-&gt;size != size);</div><div class='ctx'> 	BUG_ON(buf-&gt;direction != dir);</div><div class='hunk'>@@ -283,7 +286,8 @@ static inline void unmap_single(struct device *dev, struct safe_buffer *buf,</div><div class='ctx'> </div><div class='ctx'> 	DO_STATS(dev-&gt;archdata.dmabounce-&gt;bounce_count++);</div><div class='ctx'> </div><div class='del'>-	if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) {</div><div class='add'>+	if ((dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) &amp;&amp;</div><div class='add'>+	    !(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)) {</div><div class='ctx'> 		void *ptr = buf-&gt;ptr;</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(dev, "%s: copy back safe %p to unsafe %p size %d\n",</div><div class='hunk'>@@ -334,7 +338,7 @@ static dma_addr_t dmabounce_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 		return DMA_ERROR_CODE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return map_single(dev, page_address(page) + offset, size, dir);</div><div class='add'>+	return map_single(dev, page_address(page) + offset, size, dir, attrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -357,7 +361,7 @@ static void dmabounce_unmap_page(struct device *dev, dma_addr_t dma_addr, size_t</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	unmap_single(dev, buf, size, dir);</div><div class='add'>+	unmap_single(dev, buf, size, dir, attrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __dmabounce_sync_for_cpu(struct device *dev, dma_addr_t addr,</div><div class='hunk'>@@ -448,7 +452,7 @@ static int dmabounce_set_mask(struct device *dev, u64 dma_mask)</div><div class='ctx'> 	return arm_dma_ops.set_dma_mask(dev, dma_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops dmabounce_ops = {</div><div class='add'>+static const struct dma_map_ops dmabounce_ops = {</div><div class='ctx'> 	.alloc			= arm_dma_alloc,</div><div class='ctx'> 	.free			= arm_dma_free,</div><div class='ctx'> 	.mmap			= arm_dma_mmap,</div><div class='head'>diff --git a/arch/arm/common/mcpm_entry.c b/arch/arm/common/mcpm_entry.c<br/>index a923524d1040..cf062472e07b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/common/mcpm_entry.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/common/mcpm_entry.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/common/mcpm_entry.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/common/mcpm_entry.c</a></div><div class='hunk'>@@ -144,7 +144,7 @@ extern unsigned long mcpm_entry_vectors[MAX_NR_CLUSTERS][MAX_CPUS_PER_CLUSTER];</div><div class='ctx'> </div><div class='ctx'> void mcpm_set_entry_vector(unsigned cpu, unsigned cluster, void *ptr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long val = ptr ? virt_to_phys(ptr) : 0;</div><div class='add'>+	unsigned long val = ptr ? __pa_symbol(ptr) : 0;</div><div class='ctx'> 	mcpm_entry_vectors[cluster][cpu] = val;</div><div class='ctx'> 	sync_cache_w(&amp;mcpm_entry_vectors[cluster][cpu]);</div><div class='ctx'> }</div><div class='hunk'>@@ -299,8 +299,8 @@ void mcpm_cpu_power_down(void)</div><div class='ctx'> 	 * the kernel as if the power_up method just had deasserted reset</div><div class='ctx'> 	 * on the CPU.</div><div class='ctx'> 	 */</div><div class='del'>-	phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);</div><div class='del'>-	phys_reset(virt_to_phys(mcpm_entry_point));</div><div class='add'>+	phys_reset = (phys_reset_t)(unsigned long)__pa_symbol(cpu_reset);</div><div class='add'>+	phys_reset(__pa_symbol(mcpm_entry_point));</div><div class='ctx'> </div><div class='ctx'> 	/* should never get here */</div><div class='ctx'> 	BUG();</div><div class='hunk'>@@ -388,8 +388,8 @@ static int __init nocache_trampoline(unsigned long _arg)</div><div class='ctx'> 	__mcpm_outbound_leave_critical(cluster, CLUSTER_DOWN);</div><div class='ctx'> 	__mcpm_cpu_down(cpu, cluster);</div><div class='ctx'> </div><div class='del'>-	phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);</div><div class='del'>-	phys_reset(virt_to_phys(mcpm_entry_point));</div><div class='add'>+	phys_reset = (phys_reset_t)(unsigned long)__pa_symbol(cpu_reset);</div><div class='add'>+	phys_reset(__pa_symbol(mcpm_entry_point));</div><div class='ctx'> 	BUG();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -449,7 +449,7 @@ int __init mcpm_sync_init(</div><div class='ctx'> 	sync_cache_w(&amp;mcpm_sync);</div><div class='ctx'> </div><div class='ctx'> 	if (power_up_setup) {</div><div class='del'>-		mcpm_power_up_setup_phys = virt_to_phys(power_up_setup);</div><div class='add'>+		mcpm_power_up_setup_phys = __pa_symbol(power_up_setup);</div><div class='ctx'> 		sync_cache_w(&amp;mcpm_power_up_setup_phys);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/configs/am200epdkit_defconfig b/arch/arm/configs/am200epdkit_defconfig<br/>index f0dea52e49c4..113a5d815060 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/am200epdkit_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/am200epdkit_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/am200epdkit_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/am200epdkit_defconfig</a></div><div class='hunk'>@@ -55,8 +55,9 @@ CONFIG_MTD_CFI_INTELEXT=y</div><div class='ctx'> CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='ctx'> CONFIG_MTD_PXA2XX=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=m</div><div class='del'>-CONFIG_IDE=m</div><div class='del'>-CONFIG_BLK_DEV_IDECS=m</div><div class='add'>+CONFIG_BLK_DEV_SD=m</div><div class='add'>+CONFIG_ATA=m</div><div class='add'>+CONFIG_PATA_PCMCIA=m</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_SMC91X=m</div><div class='head'>diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig<br/>index ca39c04fec6b..d25010e3a0bc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/aspeed_g4_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/aspeed_g4_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/aspeed_g4_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/aspeed_g4_defconfig</a></div><div class='hunk'>@@ -25,26 +25,52 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_ARCH_MULTI_V7 is not set</div><div class='ctx'> CONFIG_ARCH_ASPEED=y</div><div class='ctx'> CONFIG_MACH_ASPEED_G4=y</div><div class='del'>-CONFIG_DEBUG_RODATA=y</div><div class='ctx'> CONFIG_AEABI=y</div><div class='ctx'> CONFIG_UACCESS_WITH_MEMCPY=y</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='del'>-# CONFIG_ATAGS is not set</div><div class='del'>-CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='del'>-CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='ctx'> CONFIG_ARM_APPENDED_DTB=y</div><div class='ctx'> CONFIG_ARM_ATAG_DTB_COMPAT=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_NET_NCSI=y</div><div class='add'>+# CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='add'>+# CONFIG_NET_VENDOR_AMAZON is not set</div><div class='add'>+# CONFIG_NET_VENDOR_ARC is not set</div><div class='add'>+# CONFIG_NET_CADENCE is not set</div><div class='add'>+# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_CIRRUS is not set</div><div class='add'>+# CONFIG_NET_VENDOR_EZCHIP is not set</div><div class='add'>+CONFIG_FTGMAC100=y</div><div class='add'>+# CONFIG_NET_VENDOR_HISILICON is not set</div><div class='add'>+# CONFIG_NET_VENDOR_INTEL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MARVELL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MICREL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NETRONOME is not set</div><div class='add'>+# CONFIG_NET_VENDOR_QUALCOMM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_RENESAS is not set</div><div class='add'>+# CONFIG_NET_VENDOR_ROCKER is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SMSC is not set</div><div class='add'>+# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='add'>+# CONFIG_NET_VENDOR_VIA is not set</div><div class='add'>+# CONFIG_NET_VENDOR_WIZNET is not set</div><div class='add'>+# CONFIG_WLAN is not set</div><div class='ctx'> # CONFIG_INPUT is not set</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='ctx'> # CONFIG_VT is not set</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='hunk'>@@ -53,7 +79,10 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=6</div><div class='ctx'> CONFIG_SERIAL_8250_EXTENDED=y</div><div class='ctx'> CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='ctx'> CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+CONFIG_ASPEED_BT_IPMI_BMC=y</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+CONFIG_GPIO_ASPEED=y</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_FIRMWARE_MEMMAP=y</div><div class='hunk'>@@ -79,7 +108,8 @@ CONFIG_DEBUG_LL_UART_8250=y</div><div class='ctx'> CONFIG_DEBUG_UART_PHYS=0x1e784000</div><div class='ctx'> CONFIG_DEBUG_UART_VIRT=0xe8784000</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='del'>-CONFIG_DEBUG_SET_MODULE_RONX=y</div><div class='add'>+CONFIG_STRICT_MODULE_RWX=y</div><div class='add'>+CONFIG_STRICT_KERNEL_RWX=y</div><div class='ctx'> # CONFIG_XZ_DEC_X86 is not set</div><div class='ctx'> # CONFIG_XZ_DEC_POWERPC is not set</div><div class='ctx'> # CONFIG_XZ_DEC_IA64 is not set</div><div class='head'>diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig<br/>index 4f366b0370e9..5f660b02abd9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/aspeed_g5_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/aspeed_g5_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/aspeed_g5_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/aspeed_g5_defconfig</a></div><div class='hunk'>@@ -26,7 +26,7 @@ CONFIG_ARCH_MULTI_V6=y</div><div class='ctx'> # CONFIG_ARCH_MULTI_V7 is not set</div><div class='ctx'> CONFIG_ARCH_ASPEED=y</div><div class='ctx'> CONFIG_MACH_ASPEED_G5=y</div><div class='del'>-CONFIG_DEBUG_RODATA=y</div><div class='add'>+CONFIG_VMSPLIT_2G=y</div><div class='ctx'> CONFIG_AEABI=y</div><div class='ctx'> CONFIG_UACCESS_WITH_MEMCPY=y</div><div class='ctx'> CONFIG_SECCOMP=y</div><div class='hunk'>@@ -37,15 +37,46 @@ CONFIG_ARM_APPENDED_DTB=y</div><div class='ctx'> CONFIG_ARM_ATAG_DTB_COMPAT=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_NET_NCSI=y</div><div class='add'>+# CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='add'>+# CONFIG_NET_VENDOR_AMAZON is not set</div><div class='add'>+# CONFIG_NET_VENDOR_ARC is not set</div><div class='add'>+# CONFIG_NET_CADENCE is not set</div><div class='add'>+# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_CIRRUS is not set</div><div class='add'>+# CONFIG_NET_VENDOR_EZCHIP is not set</div><div class='add'>+CONFIG_FTGMAC100=y</div><div class='add'>+# CONFIG_NET_VENDOR_HISILICON is not set</div><div class='add'>+# CONFIG_NET_VENDOR_INTEL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MARVELL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MICREL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NETRONOME is not set</div><div class='add'>+# CONFIG_NET_VENDOR_QUALCOMM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_RENESAS is not set</div><div class='add'>+# CONFIG_NET_VENDOR_ROCKER is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SMSC is not set</div><div class='add'>+# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='add'>+# CONFIG_NET_VENDOR_VIA is not set</div><div class='add'>+# CONFIG_NET_VENDOR_WIZNET is not set</div><div class='add'>+# CONFIG_WLAN is not set</div><div class='ctx'> # CONFIG_INPUT is not set</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='ctx'> # CONFIG_VT is not set</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='hunk'>@@ -54,7 +85,10 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=6</div><div class='ctx'> CONFIG_SERIAL_8250_EXTENDED=y</div><div class='ctx'> CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='ctx'> CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+CONFIG_ASPEED_BT_IPMI_BMC=y</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+CONFIG_GPIO_ASPEED=y</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_FIRMWARE_MEMMAP=y</div><div class='hunk'>@@ -81,7 +115,9 @@ CONFIG_DEBUG_LL_UART_8250=y</div><div class='ctx'> CONFIG_DEBUG_UART_PHYS=0x1e784000</div><div class='ctx'> CONFIG_DEBUG_UART_VIRT=0xe8784000</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='del'>-CONFIG_DEBUG_SET_MODULE_RONX=y</div><div class='add'>+CONFIG_STRICT_MODULE_RWX=y</div><div class='add'>+CONFIG_STRICT_KERNEL_RWX=y</div><div class='add'>+CONFIG_CRYPTO_ECHAINIV=y</div><div class='ctx'> # CONFIG_XZ_DEC_X86 is not set</div><div class='ctx'> # CONFIG_XZ_DEC_POWERPC is not set</div><div class='ctx'> # CONFIG_XZ_DEC_IA64 is not set</div><div class='head'>diff --git a/arch/arm/configs/assabet_defconfig b/arch/arm/configs/assabet_defconfig<br/>index 558ecd8f66ff..ab19ff1a0b71 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/assabet_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/assabet_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/assabet_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/assabet_defconfig</a></div><div class='hunk'>@@ -34,7 +34,6 @@ CONFIG_MTD_CFI_INTELEXT=y</div><div class='ctx'> CONFIG_MTD_SA1100=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=m</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='del'>-CONFIG_IDE=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_NET_PCMCIA=y</div><div class='head'>diff --git a/arch/arm/configs/badge4_defconfig b/arch/arm/configs/badge4_defconfig<br/>index d59009878312..2a604aa3195b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/badge4_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/badge4_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/badge4_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/badge4_defconfig</a></div><div class='hunk'>@@ -42,8 +42,6 @@ CONFIG_MTD_SA1100=y</div><div class='ctx'> CONFIG_PARPORT=m</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_NBD=m</div><div class='del'>-CONFIG_IDE=m</div><div class='del'>-CONFIG_BLK_DEV_IDECD=m</div><div class='ctx'> CONFIG_SCSI=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=m</div><div class='head'>diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig<br/>index 79de828e49ad..4b89f4e6e849 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/bcm2835_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/bcm2835_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/bcm2835_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/bcm2835_defconfig</a></div><div class='hunk'>@@ -73,6 +73,8 @@ CONFIG_SPI_BCM2835=y</div><div class='ctx'> CONFIG_SPI_BCM2835AUX=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+CONFIG_THERMAL=y</div><div class='add'>+CONFIG_BCM2835_THERMAL=y</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_BCM2835_WDT=y</div><div class='ctx'> CONFIG_DRM=y</div><div class='head'>diff --git a/arch/arm/configs/cerfcube_defconfig b/arch/arm/configs/cerfcube_defconfig<br/>index dce912d146b4..57a2a18690b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/cerfcube_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/cerfcube_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/cerfcube_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/cerfcube_defconfig</a></div><div class='hunk'>@@ -39,7 +39,6 @@ CONFIG_MTD_CFI_INTELEXT=y</div><div class='ctx'> CONFIG_MTD_SA1100=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=m</div><div class='ctx'> CONFIG_BLK_DEV_RAM=m</div><div class='del'>-CONFIG_IDE=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_NET_PCI=y</div><div class='head'>diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig<br/>index 52dbad5619e2..a8f3c596c39c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/collie_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/collie_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/collie_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/collie_defconfig</a></div><div class='hunk'>@@ -43,8 +43,9 @@ CONFIG_MTD_SA1100=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=1024</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECS=y</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_PCMCIA=y</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='ctx'> # CONFIG_KEYBOARD_ATKBD is not set</div><div class='head'>diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig<br/>index c1470a00f55a..462533bd84c6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/corgi_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/corgi_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/corgi_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/corgi_defconfig</a></div><div class='hunk'>@@ -99,15 +99,14 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='ctx'> CONFIG_MTD_NAND=y</div><div class='ctx'> CONFIG_MTD_NAND_SHARPSL=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECS=y</div><div class='del'>-CONFIG_SCSI=m</div><div class='del'>-CONFIG_BLK_DEV_SD=m</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=m</div><div class='ctx'> CONFIG_CHR_DEV_OSST=m</div><div class='ctx'> CONFIG_BLK_DEV_SR=m</div><div class='ctx'> CONFIG_CHR_DEV_SG=m</div><div class='ctx'> CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_PCMCIA=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_USB_CATC=m</div><div class='head'>diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig<br/>index 5e5dd6bc5ed9..c8663eac9b1b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/davinci_all_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/davinci_all_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/davinci_all_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/davinci_all_defconfig</a></div><div class='hunk'>@@ -7,13 +7,13 @@ CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_CGROUPS=y</div><div class='add'>+CONFIG_CHECKPOINT_RESTORE=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_EXPERT=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='ctx'> CONFIG_MODVERSIONS=y</div><div class='del'>-# CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='hunk'>@@ -34,6 +34,7 @@ CONFIG_DAVINCI_MUX_WARNINGS=y</div><div class='ctx'> CONFIG_DAVINCI_RESET_CLOCKS=y</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='ctx'> CONFIG_AEABI=y</div><div class='add'>+CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='ctx'> CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='ctx'> CONFIG_ARM_APPENDED_DTB=y</div><div class='hunk'>@@ -52,10 +53,10 @@ CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='del'>-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+CONFIG_DA8XX_MSTPRI=y</div><div class='ctx'> CONFIG_MTD=m</div><div class='ctx'> CONFIG_MTD_BLOCK=m</div><div class='ctx'> CONFIG_MTD_CFI=m</div><div class='hunk'>@@ -77,6 +78,8 @@ CONFIG_IDE=m</div><div class='ctx'> CONFIG_BLK_DEV_PALMCHIP_BK3710=m</div><div class='ctx'> CONFIG_SCSI=m</div><div class='ctx'> CONFIG_BLK_DEV_SD=m</div><div class='add'>+CONFIG_ATA=m</div><div class='add'>+CONFIG_AHCI_DA850=m</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_NETCONSOLE=y</div><div class='ctx'> CONFIG_TUN=m</div><div class='hunk'>@@ -99,6 +102,7 @@ CONFIG_KEYBOARD_XTKBD=m</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> CONFIG_INPUT_TOUCHSCREEN=y</div><div class='ctx'> CONFIG_INPUT_MISC=y</div><div class='add'>+CONFIG_INPUT_PWM_BEEPER=m</div><div class='ctx'> CONFIG_INPUT_DM355EVM=m</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_VT_CONSOLE is not set</div><div class='hunk'>@@ -113,9 +117,12 @@ CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_DAVINCI=y</div><div class='ctx'> CONFIG_SPI=y</div><div class='ctx'> CONFIG_SPI_DAVINCI=m</div><div class='add'>+CONFIG_PINCTRL_DA850_PUPD=m</div><div class='ctx'> CONFIG_PINCTRL_SINGLE=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_GPIO_PCA953X=y</div><div class='add'>+CONFIG_POWER_RESET=y</div><div class='add'>+CONFIG_POWER_RESET_GPIO=y</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_DAVINCI_WATCHDOG=m</div><div class='ctx'> CONFIG_MFD_DM355EVM_MSP=y</div><div class='hunk'>@@ -123,6 +130,15 @@ CONFIG_TPS6507X=y</div><div class='ctx'> CONFIG_REGULATOR=y</div><div class='ctx'> CONFIG_REGULATOR_FIXED_VOLTAGE=y</div><div class='ctx'> CONFIG_REGULATOR_TPS6507X=y</div><div class='add'>+CONFIG_MEDIA_SUPPORT=m</div><div class='add'>+CONFIG_MEDIA_CAMERA_SUPPORT=y</div><div class='add'>+CONFIG_V4L_PLATFORM_DRIVERS=y</div><div class='add'>+CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE=m</div><div class='add'>+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set</div><div class='add'>+CONFIG_VIDEO_TVP514X=m</div><div class='add'>+CONFIG_DRM=m</div><div class='add'>+CONFIG_DRM_TILCDC=m</div><div class='add'>+CONFIG_DRM_DUMB_VGA_DAC=m</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FIRMWARE_EDID=y</div><div class='ctx'> CONFIG_FB_DA8XX=y</div><div class='hunk'>@@ -153,10 +169,13 @@ CONFIG_HID_SONY=m</div><div class='ctx'> CONFIG_HID_SUNPLUS=m</div><div class='ctx'> CONFIG_USB=m</div><div class='ctx'> CONFIG_USB_MON=m</div><div class='add'>+CONFIG_USB_OHCI_HCD=m</div><div class='ctx'> CONFIG_USB_STORAGE=m</div><div class='ctx'> CONFIG_USB_MUSB_HDRC=m</div><div class='add'>+CONFIG_USB_MUSB_DA8XX=m</div><div class='ctx'> CONFIG_MUSB_PIO_ONLY=y</div><div class='ctx'> CONFIG_USB_TEST=m</div><div class='add'>+CONFIG_NOP_USB_XCEIV=m</div><div class='ctx'> CONFIG_USB_GADGET=m</div><div class='ctx'> CONFIG_USB_GADGET_DEBUG_FILES=y</div><div class='ctx'> CONFIG_USB_GADGET_DEBUG_FS=y</div><div class='hunk'>@@ -167,28 +186,44 @@ CONFIG_USB_MASS_STORAGE=m</div><div class='ctx'> CONFIG_USB_G_SERIAL=m</div><div class='ctx'> CONFIG_USB_G_PRINTER=m</div><div class='ctx'> CONFIG_USB_CDC_COMPOSITE=m</div><div class='del'>-CONFIG_MMC=m</div><div class='add'>+CONFIG_MMC=y</div><div class='ctx'> # CONFIG_MMC_BLOCK_BOUNCE is not set</div><div class='del'>-CONFIG_MMC_DAVINCI=m</div><div class='add'>+CONFIG_MMC_DAVINCI=y</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='ctx'> CONFIG_LEDS_CLASS=m</div><div class='ctx'> CONFIG_LEDS_GPIO=m</div><div class='ctx'> CONFIG_LEDS_TRIGGERS=y</div><div class='ctx'> CONFIG_LEDS_TRIGGER_TIMER=m</div><div class='ctx'> CONFIG_LEDS_TRIGGER_HEARTBEAT=m</div><div class='add'>+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='ctx'> CONFIG_RTC_DRV_OMAP=m</div><div class='ctx'> CONFIG_DMADEVICES=y</div><div class='ctx'> CONFIG_TI_EDMA=y</div><div class='ctx'> CONFIG_MEMORY=y</div><div class='ctx'> CONFIG_TI_AEMIF=m</div><div class='add'>+CONFIG_DA8XX_DDRCTL=y</div><div class='add'>+CONFIG_IIO=m</div><div class='add'>+CONFIG_IIO_BUFFER=y</div><div class='add'>+CONFIG_IIO_BUFFER_CB=m</div><div class='add'>+CONFIG_IIO_KFIFO_BUF=m</div><div class='add'>+CONFIG_IIO_TRIGGER=y</div><div class='add'>+CONFIG_IIO_SW_DEVICE=m</div><div class='add'>+CONFIG_IIO_SW_TRIGGER=m</div><div class='add'>+CONFIG_IIO_HRTIMER_TRIGGER=m</div><div class='add'>+CONFIG_IIO_SYSFS_TRIGGER=m</div><div class='add'>+CONFIG_PWM=y</div><div class='add'>+CONFIG_PWM_TIECAP=m</div><div class='add'>+CONFIG_PWM_TIEHRPWM=m</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_XFS_FS=m</div><div class='ctx'> CONFIG_AUTOFS4_FS=m</div><div class='ctx'> CONFIG_MSDOS_FS=y</div><div class='ctx'> CONFIG_VFAT_FS=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='add'>+CONFIG_TMPFS_XATTR=y</div><div class='ctx'> CONFIG_JFFS2_FS=m</div><div class='ctx'> CONFIG_UBIFS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='head'>diff --git a/arch/arm/configs/dram_0xc0000000.config b/arch/arm/configs/dram_0xc0000000.config<br/>new file mode 100644<br/>index 000000000000..343d5333d973<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/dram_0xc0000000.config?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/dram_0xc0000000.config</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+CONFIG_DRAM_BASE=0xc0000000</div><div class='head'>diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig<br/>index c58f6841f8aa..742baf067e1c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/exynos_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/exynos_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/exynos_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/exynos_defconfig</a></div><div class='hunk'>@@ -24,7 +24,7 @@ CONFIG_ARM_APPENDED_DTB=y</div><div class='ctx'> CONFIG_ARM_ATAG_DTB_COMPAT=y</div><div class='ctx'> CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='del'>-CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='ctx'> CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_POWERSAVE=m</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_USERSPACE=m</div><div class='hunk'>@@ -43,6 +43,7 @@ CONFIG_PACKET=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='ctx'> CONFIG_IP_PNP_BOOTP=y</div><div class='hunk'>@@ -155,6 +156,7 @@ CONFIG_VIDEO_EXYNOS4_FIMC_IS=m</div><div class='ctx'> CONFIG_V4L_MEM2MEM_DRIVERS=y</div><div class='ctx'> CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m</div><div class='ctx'> CONFIG_VIDEO_SAMSUNG_S5P_MFC=m</div><div class='add'>+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m</div><div class='ctx'> CONFIG_V4L_TEST_DRIVERS=y</div><div class='ctx'> CONFIG_DRM=y</div><div class='ctx'> CONFIG_DRM_EXYNOS=y</div><div class='head'>diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig<br/>index ea316c4b890e..d3f1768840e2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/ezx_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/ezx_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/ezx_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/ezx_defconfig</a></div><div class='hunk'>@@ -64,8 +64,8 @@ CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NETFILTER_NETLINK_QUEUE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='del'>-CONFIG_NF_CT_PROTO_SCTP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CT_PROTO_SCTP=y</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='head'>diff --git a/arch/arm/configs/h3600_defconfig b/arch/arm/configs/h3600_defconfig<br/>index 0142ec37e0be..ebeca11faa48 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/h3600_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/h3600_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/h3600_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/h3600_defconfig</a></div><div class='hunk'>@@ -39,8 +39,9 @@ CONFIG_MTD_SA1100=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=m</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECS=y</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_PCMCIA=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_PCMCIA_PCNET=y</div><div class='ctx'> CONFIG_PPP=m</div><div class='head'>diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig<br/>index 18e59feaa307..7f479cdb3479 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/imote2_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/imote2_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/imote2_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/imote2_defconfig</a></div><div class='hunk'>@@ -56,8 +56,8 @@ CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NETFILTER_NETLINK_QUEUE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='del'>-CONFIG_NF_CT_PROTO_SCTP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CT_PROTO_SCTP=y</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='head'>diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig<br/>index 8ec4dbbb50b0..eaba3b165d72 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/imx_v6_v7_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/imx_v6_v7_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/imx_v6_v7_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/imx_v6_v7_defconfig</a></div><div class='hunk'>@@ -79,6 +79,7 @@ CONFIG_BT_HCIUART=y</div><div class='ctx'> CONFIG_BT_HCIUART_H4=y</div><div class='ctx'> CONFIG_BT_HCIUART_LL=y</div><div class='ctx'> CONFIG_CFG80211=y</div><div class='add'>+CONFIG_CFG80211_WEXT=y</div><div class='ctx'> CONFIG_MAC80211=y</div><div class='ctx'> CONFIG_RFKILL=y</div><div class='ctx'> CONFIG_RFKILL_INPUT=y</div><div class='hunk'>@@ -86,6 +87,7 @@ CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_STANDALONE is not set</div><div class='ctx'> CONFIG_DMA_CMA=y</div><div class='add'>+CONFIG_CMA_SIZE_MBYTES=64</div><div class='ctx'> CONFIG_IMX_WEIM=y</div><div class='ctx'> CONFIG_CONNECTOR=y</div><div class='ctx'> CONFIG_MTD=y</div><div class='hunk'>@@ -173,7 +175,6 @@ CONFIG_INPUT_MISC=y</div><div class='ctx'> CONFIG_INPUT_MMA8450=y</div><div class='ctx'> CONFIG_SERIO_SERPORT=m</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> CONFIG_SERIAL_IMX=y</div><div class='ctx'> CONFIG_SERIAL_IMX_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_FSL_LPUART=y</div><div class='hunk'>@@ -193,11 +194,11 @@ CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_GPIO_MC9S08DZ60=y</div><div class='ctx'> CONFIG_GPIO_PCA953X=y</div><div class='ctx'> CONFIG_GPIO_STMPE=y</div><div class='del'>-CONFIG_POWER_SUPPLY=y</div><div class='ctx'> CONFIG_POWER_RESET=y</div><div class='ctx'> CONFIG_POWER_RESET_IMX=y</div><div class='ctx'> CONFIG_POWER_RESET_SYSCON=y</div><div class='ctx'> CONFIG_POWER_RESET_SYSCON_POWEROFF=y</div><div class='add'>+CONFIG_POWER_SUPPLY=y</div><div class='ctx'> CONFIG_SENSORS_GPIO_FAN=y</div><div class='ctx'> CONFIG_SENSORS_IIO_HWMON=y</div><div class='ctx'> CONFIG_THERMAL=y</div><div class='hunk'>@@ -256,6 +257,7 @@ CONFIG_SND_IMX_SOC=y</div><div class='ctx'> CONFIG_SND_SOC_PHYCORE_AC97=y</div><div class='ctx'> CONFIG_SND_SOC_EUKREA_TLV320=y</div><div class='ctx'> CONFIG_SND_SOC_IMX_WM8962=y</div><div class='add'>+CONFIG_SND_SOC_IMX_ES8328=y</div><div class='ctx'> CONFIG_SND_SOC_IMX_SGTL5000=y</div><div class='ctx'> CONFIG_SND_SOC_IMX_SPDIF=y</div><div class='ctx'> CONFIG_SND_SOC_IMX_MC13783=y</div><div class='head'>diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig<br/>index 869faae67201..69cb8f1efcea 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/integrator_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/integrator_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/integrator_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/integrator_defconfig</a></div><div class='hunk'>@@ -26,6 +26,7 @@ CONFIG_CPU_FREQ=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_POWERSAVE=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_USERSPACE=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_ONDEMAND=y</div><div class='add'>+CONFIG_CPUFREQ_DT=y</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='head'>diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig<br/>index cf4918a2c51f..bb910d9df6c1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/ixp4xx_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/ixp4xx_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/ixp4xx_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/ixp4xx_defconfig</a></div><div class='hunk'>@@ -127,16 +127,17 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='ctx'> CONFIG_EEPROM_LEGACY=y</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_CMD64X=y</div><div class='del'>-CONFIG_BLK_DEV_HPT366=y</div><div class='del'>-CONFIG_BLK_DEV_PDC202XX_NEW=y</div><div class='ctx'> # CONFIG_SCSI_PROC_FS is not set</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL is not set</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> CONFIG_SATA_VIA=y</div><div class='ctx'> CONFIG_PATA_ARTOP=y</div><div class='add'>+CONFIG_PATA_CMD64X=y</div><div class='add'>+CONFIG_PATA_HPT366=y</div><div class='add'>+CONFIG_PATA_HPT37X=y</div><div class='add'>+CONFIG_PATA_HPT3X2N=y</div><div class='add'>+CONFIG_PATA_PDC2027X=y</div><div class='ctx'> CONFIG_PATA_IXP4XX_CF=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='head'>diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig<br/>index ea80e7e867c2..9056284139be 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/jornada720_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/jornada720_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/jornada720_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/jornada720_defconfig</a></div><div class='hunk'>@@ -29,8 +29,9 @@ CONFIG_SA1100_FIR=m</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_NBD=y</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECS=y</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_PCMCIA=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='head'>diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig<br/>index 78cd2f197e01..1331f6dc456a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/keystone_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/keystone_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/keystone_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/keystone_defconfig</a></div><div class='hunk'>@@ -126,6 +126,7 @@ CONFIG_MTD_NAND_DAVINCI=y</div><div class='ctx'> CONFIG_MTD_SPI_NOR=y</div><div class='ctx'> CONFIG_MTD_UBI=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_SRAM=y</div><div class='ctx'> CONFIG_EEPROM_AT24=y</div><div class='ctx'> CONFIG_SCSI=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='head'>diff --git a/arch/arm/configs/lart_defconfig b/arch/arm/configs/lart_defconfig<br/>index faa2865658ac..8fc6fd09eb6d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/lart_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/lart_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/lart_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/lart_defconfig</a></div><div class='hunk'>@@ -36,8 +36,6 @@ CONFIG_MTD_CHAR=y</div><div class='ctx'> CONFIG_MTD_BLOCK=y</div><div class='ctx'> CONFIG_MTD_LART=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='del'>-CONFIG_IDE=m</div><div class='del'>-CONFIG_BLK_DEV_IDECD=m</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_DUMMY=m</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='head'>diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig<br/>index 04efa1b3ef25..e8d26b805be6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/mainstone_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/mainstone_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/mainstone_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/mainstone_defconfig</a></div><div class='hunk'>@@ -27,7 +27,6 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='ctx'> CONFIG_MTD_CFI_GEOMETRY=y</div><div class='ctx'> # CONFIG_MTD_CFI_I1 is not set</div><div class='ctx'> CONFIG_MTD_CFI_INTELEXT=y</div><div class='del'>-CONFIG_IDE=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_SMC91X=y</div><div class='head'>diff --git a/arch/arm/configs/moxart_defconfig b/arch/arm/configs/moxart_defconfig<br/>index a3cb76cfb828..b2ddd534867f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/moxart_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/moxart_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/moxart_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/moxart_defconfig</a></div><div class='hunk'>@@ -18,9 +18,8 @@ CONFIG_EMBEDDED=y</div><div class='ctx'> # CONFIG_LBDAF is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='del'>-CONFIG_ARCH_MULTI_V4T=y</div><div class='add'>+CONFIG_ARCH_MULTI_V4=y</div><div class='ctx'> # CONFIG_ARCH_MULTI_V7 is not set</div><div class='del'>-CONFIG_KEYBOARD_GPIO_POLLED=y</div><div class='ctx'> CONFIG_ARCH_MOXART=y</div><div class='ctx'> CONFIG_MACH_UC7112LX=y</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='hunk'>@@ -94,12 +93,10 @@ CONFIG_SERIAL_8250_EXTENDED=y</div><div class='ctx'> CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='ctx'> CONFIG_SERIAL_OF_PLATFORM=y</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='del'>-CONFIG_DEBUG_GPIO=y</div><div class='del'>-CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_GPIO_MOXART=y</div><div class='del'>-CONFIG_POWER_SUPPLY=y</div><div class='ctx'> CONFIG_POWER_RESET=y</div><div class='ctx'> CONFIG_POWER_RESET_GPIO=y</div><div class='add'>+CONFIG_POWER_SUPPLY=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_WATCHDOG_CORE=y</div><div class='hunk'>@@ -107,10 +104,13 @@ CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='ctx'> CONFIG_MOXART_WDT=y</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> CONFIG_MMC=y</div><div class='del'>-CONFIG_MMC_SDHCI_MOXART=y</div><div class='add'>+CONFIG_MMC_SDHCI=y</div><div class='add'>+CONFIG_MMC_SDHCI_PLTFM=y</div><div class='add'>+CONFIG_MMC_MOXART=y</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='ctx'> CONFIG_LEDS_CLASS=y</div><div class='ctx'> CONFIG_LEDS_GPIO=y</div><div class='add'>+CONFIG_LEDS_TRIGGERS=y</div><div class='ctx'> CONFIG_LEDS_TRIGGER_TIMER=y</div><div class='ctx'> CONFIG_LEDS_TRIGGER_ONESHOT=y</div><div class='ctx'> CONFIG_LEDS_TRIGGER_HEARTBEAT=y</div><div class='head'>diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig<br/>index 2658b80fa263..69a4bd13eea5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/multi_v5_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/multi_v5_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/multi_v5_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/multi_v5_defconfig</a></div><div class='hunk'>@@ -58,7 +58,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='ctx'> CONFIG_ARM_APPENDED_DTB=y</div><div class='ctx'> CONFIG_ARM_ATAG_DTB_COMPAT=y</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='del'>-CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='ctx'> CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y</div><div class='ctx'> CONFIG_CPU_IDLE=y</div><div class='ctx'> CONFIG_ARM_KIRKWOOD_CPUIDLE=y</div><div class='hunk'>@@ -150,7 +150,6 @@ CONFIG_SPI=y</div><div class='ctx'> CONFIG_SPI_ATMEL=y</div><div class='ctx'> CONFIG_SPI_IMX=y</div><div class='ctx'> CONFIG_SPI_ORION=y</div><div class='del'>-CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_POWER_RESET=y</div><div class='ctx'> CONFIG_POWER_RESET_GPIO=y</div><div class='ctx'> CONFIG_POWER_RESET_QNAP=y</div><div class='head'>diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig<br/>index 11f37ed1dbff..a94126fb02c2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/multi_v7_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/multi_v7_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/multi_v7_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/multi_v7_defconfig</a></div><div class='hunk'>@@ -87,6 +87,8 @@ CONFIG_ARCH_EMEV2=y</div><div class='ctx'> CONFIG_ARCH_R7S72100=y</div><div class='ctx'> CONFIG_ARCH_R8A73A4=y</div><div class='ctx'> CONFIG_ARCH_R8A7740=y</div><div class='add'>+CONFIG_ARCH_R8A7743=y</div><div class='add'>+CONFIG_ARCH_R8A7745=y</div><div class='ctx'> CONFIG_ARCH_R8A7778=y</div><div class='ctx'> CONFIG_ARCH_R8A7779=y</div><div class='ctx'> CONFIG_ARCH_R8A7790=y</div><div class='hunk'>@@ -132,7 +134,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> CONFIG_EFI=y</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='del'>-CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='ctx'> CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_POWERSAVE=m</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_USERSPACE=m</div><div class='hunk'>@@ -173,6 +175,11 @@ CONFIG_CAN_RCAR=m</div><div class='ctx'> CONFIG_CAN_XILINXCAN=y</div><div class='ctx'> CONFIG_CAN_MCP251X=y</div><div class='ctx'> CONFIG_NET_DSA_BCM_SF2=m</div><div class='add'>+CONFIG_B53=m</div><div class='add'>+CONFIG_B53_SPI_DRIVER=m</div><div class='add'>+CONFIG_B53_MDIO_DRIVER=m</div><div class='add'>+CONFIG_B53_MMAP_DRIVER=m</div><div class='add'>+CONFIG_B53_SRAB_DRIVER=m</div><div class='ctx'> CONFIG_CAN_SUN4I=y</div><div class='ctx'> CONFIG_BT=m</div><div class='ctx'> CONFIG_BT_MRVL=m</div><div class='hunk'>@@ -235,6 +242,7 @@ CONFIG_HIX5HD2_GMAC=y</div><div class='ctx'> CONFIG_SUN4I_EMAC=y</div><div class='ctx'> CONFIG_MACB=y</div><div class='ctx'> CONFIG_BCMGENET=m</div><div class='add'>+CONFIG_BGMAC_BCMA=y</div><div class='ctx'> CONFIG_SYSTEMPORT=m</div><div class='ctx'> CONFIG_NET_CALXEDA_XGMAC=y</div><div class='ctx'> CONFIG_GIANFAR=y</div><div class='hunk'>@@ -247,7 +255,8 @@ CONFIG_R8169=y</div><div class='ctx'> CONFIG_SH_ETH=y</div><div class='ctx'> CONFIG_SMSC911X=y</div><div class='ctx'> CONFIG_STMMAC_ETH=y</div><div class='del'>-CONFIG_SYNOPSYS_DWC_ETH_QOS=y</div><div class='add'>+CONFIG_STMMAC_PLATFORM=y</div><div class='add'>+CONFIG_DWMAC_DWC_QOS_ETH=y</div><div class='ctx'> CONFIG_TI_CPSW=y</div><div class='ctx'> CONFIG_XILINX_EMACLITE=y</div><div class='ctx'> CONFIG_AT803X_PHY=y</div><div class='hunk'>@@ -290,7 +299,6 @@ CONFIG_TOUCHSCREEN_WM97XX=m</div><div class='ctx'> CONFIG_INPUT_MISC=y</div><div class='ctx'> CONFIG_INPUT_MAX77693_HAPTIC=m</div><div class='ctx'> CONFIG_INPUT_MAX8997_HAPTIC=m</div><div class='del'>-CONFIG_INPUT_MPU3050=y</div><div class='ctx'> CONFIG_INPUT_AXP20X_PEK=m</div><div class='ctx'> CONFIG_INPUT_ADXL34X=m</div><div class='ctx'> CONFIG_SERIO_AMBAKMI=y</div><div class='hunk'>@@ -404,7 +412,6 @@ CONFIG_PINCTRL_MSM8X74=y</div><div class='ctx'> CONFIG_PINCTRL_MSM8916=y</div><div class='ctx'> CONFIG_PINCTRL_QCOM_SPMI_PMIC=y</div><div class='ctx'> CONFIG_PINCTRL_QCOM_SSBI_PMIC=y</div><div class='del'>-CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_GPIO_GENERIC_PLATFORM=y</div><div class='ctx'> CONFIG_GPIO_DAVINCI=y</div><div class='ctx'> CONFIG_GPIO_DWAPB=y</div><div class='hunk'>@@ -450,7 +457,6 @@ CONFIG_RCAR_THERMAL=y</div><div class='ctx'> CONFIG_ARMADA_THERMAL=y</div><div class='ctx'> CONFIG_DAVINCI_WATCHDOG=m</div><div class='ctx'> CONFIG_EXYNOS_THERMAL=m</div><div class='del'>-CONFIG_ST_THERMAL_SYSCFG=y</div><div class='ctx'> CONFIG_ST_THERMAL_MEMMAP=y</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_DA9063_WATCHDOG=m</div><div class='hunk'>@@ -467,6 +473,7 @@ CONFIG_MESON_WATCHDOG=y</div><div class='ctx'> CONFIG_DW_WATCHDOG=y</div><div class='ctx'> CONFIG_DIGICOLOR_WATCHDOG=y</div><div class='ctx'> CONFIG_BCM2835_WDT=y</div><div class='add'>+CONFIG_BCM47XX_WDT=y</div><div class='ctx'> CONFIG_BCM7038_WDT=m</div><div class='ctx'> CONFIG_BCM_KONA_WDT=y</div><div class='ctx'> CONFIG_MFD_ACT8945A=y</div><div class='hunk'>@@ -489,7 +496,7 @@ CONFIG_MFD_MAX8907=y</div><div class='ctx'> CONFIG_MFD_MAX8997=y</div><div class='ctx'> CONFIG_MFD_MAX8998=y</div><div class='ctx'> CONFIG_MFD_RK808=y</div><div class='del'>-CONFIG_MFD_PM8921_CORE=y</div><div class='add'>+CONFIG_MFD_PM8XXX=y</div><div class='ctx'> CONFIG_MFD_QCOM_RPM=y</div><div class='ctx'> CONFIG_MFD_SPMI_PMIC=y</div><div class='ctx'> CONFIG_MFD_SEC_CORE=y</div><div class='hunk'>@@ -561,7 +568,10 @@ CONFIG_VIDEO_EXYNOS4_FIMC_IS=m</div><div class='ctx'> CONFIG_V4L_MEM2MEM_DRIVERS=y</div><div class='ctx'> CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m</div><div class='ctx'> CONFIG_VIDEO_SAMSUNG_S5P_MFC=m</div><div class='add'>+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m</div><div class='ctx'> CONFIG_VIDEO_STI_BDISP=m</div><div class='add'>+CONFIG_VIDEO_STI_HVA=m</div><div class='add'>+CONFIG_VIDEO_STI_DELTA=m</div><div class='ctx'> CONFIG_VIDEO_RENESAS_JPU=m</div><div class='ctx'> CONFIG_VIDEO_RENESAS_VSP1=m</div><div class='ctx'> CONFIG_V4L_TEST_DRIVERS=y</div><div class='hunk'>@@ -572,6 +582,7 @@ CONFIG_DRM=y</div><div class='ctx'> CONFIG_DRM_I2C_ADV7511=m</div><div class='ctx'> # CONFIG_DRM_I2C_CH7006 is not set</div><div class='ctx'> # CONFIG_DRM_I2C_SIL164 is not set</div><div class='add'>+CONFIG_DRM_DUMB_VGA_DAC=m</div><div class='ctx'> CONFIG_DRM_NXP_PTN3460=m</div><div class='ctx'> CONFIG_DRM_PARADE_PS8622=m</div><div class='ctx'> CONFIG_DRM_NOUVEAU=m</div><div class='hunk'>@@ -649,6 +660,9 @@ CONFIG_SND_SOC_AK4642=m</div><div class='ctx'> CONFIG_SND_SOC_SGTL5000=m</div><div class='ctx'> CONFIG_SND_SOC_SPDIF=m</div><div class='ctx'> CONFIG_SND_SOC_WM8978=m</div><div class='add'>+CONFIG_SND_SOC_STI=m</div><div class='add'>+CONFIG_SND_SOC_STI_SAS=m</div><div class='add'>+CONFIG_SND_SIMPLE_CARD=m</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> CONFIG_USB_XHCI_HCD=y</div><div class='ctx'> CONFIG_USB_XHCI_MVEBU=y</div><div class='hunk'>@@ -790,6 +804,7 @@ CONFIG_DMA_OMAP=y</div><div class='ctx'> CONFIG_QCOM_BAM_DMA=y</div><div class='ctx'> CONFIG_XILINX_DMA=y</div><div class='ctx'> CONFIG_DMA_SUN6I=y</div><div class='add'>+CONFIG_ST_FDMA=m</div><div class='ctx'> CONFIG_STAGING=y</div><div class='ctx'> CONFIG_SENSORS_ISL29018=y</div><div class='ctx'> CONFIG_SENSORS_ISL29028=y</div><div class='hunk'>@@ -798,6 +813,10 @@ CONFIG_KEYBOARD_NVEC=y</div><div class='ctx'> CONFIG_SERIO_NVEC_PS2=y</div><div class='ctx'> CONFIG_NVEC_POWER=y</div><div class='ctx'> CONFIG_NVEC_PAZ00=y</div><div class='add'>+CONFIG_BCMA=y</div><div class='add'>+CONFIG_BCMA_HOST_SOC=y</div><div class='add'>+CONFIG_BCMA_DRIVER_GMAC_CMN=y</div><div class='add'>+CONFIG_BCMA_DRIVER_GPIO=y</div><div class='ctx'> CONFIG_QCOM_GSBI=y</div><div class='ctx'> CONFIG_QCOM_PM=y</div><div class='ctx'> CONFIG_QCOM_SMEM=y</div><div class='hunk'>@@ -808,6 +827,7 @@ CONFIG_QCOM_SMSM=y</div><div class='ctx'> CONFIG_QCOM_WCNSS_CTRL=m</div><div class='ctx'> CONFIG_ROCKCHIP_PM_DOMAINS=y</div><div class='ctx'> CONFIG_COMMON_CLK_QCOM=y</div><div class='add'>+CONFIG_QCOM_CLK_RPM=y</div><div class='ctx'> CONFIG_CHROME_PLATFORMS=y</div><div class='ctx'> CONFIG_STAGING_BOARD=y</div><div class='ctx'> CONFIG_CROS_EC_CHARDEV=m</div><div class='hunk'>@@ -823,21 +843,26 @@ CONFIG_HWSPINLOCK_QCOM=y</div><div class='ctx'> CONFIG_ROCKCHIP_IOMMU=y</div><div class='ctx'> CONFIG_TEGRA_IOMMU_GART=y</div><div class='ctx'> CONFIG_TEGRA_IOMMU_SMMU=y</div><div class='add'>+CONFIG_REMOTEPROC=m</div><div class='add'>+CONFIG_ST_REMOTEPROC=m</div><div class='ctx'> CONFIG_PM_DEVFREQ=y</div><div class='ctx'> CONFIG_ARM_TEGRA_DEVFREQ=m</div><div class='ctx'> CONFIG_MEMORY=y</div><div class='ctx'> CONFIG_EXTCON=y</div><div class='ctx'> CONFIG_TI_AEMIF=y</div><div class='ctx'> CONFIG_IIO=y</div><div class='add'>+CONFIG_IIO_SW_TRIGGER=y</div><div class='ctx'> CONFIG_AT91_ADC=m</div><div class='ctx'> CONFIG_AT91_SAMA5D2_ADC=m</div><div class='ctx'> CONFIG_BERLIN2_ADC=m</div><div class='ctx'> CONFIG_EXYNOS_ADC=m</div><div class='ctx'> CONFIG_VF610_ADC=m</div><div class='ctx'> CONFIG_XILINX_XADC=y</div><div class='add'>+CONFIG_MPU3050_I2C=y</div><div class='ctx'> CONFIG_CM36651=m</div><div class='ctx'> CONFIG_AK8975=y</div><div class='ctx'> CONFIG_RASPBERRYPI_POWER=y</div><div class='add'>+CONFIG_IIO_HRTIMER_TRIGGER=y</div><div class='ctx'> CONFIG_PWM=y</div><div class='ctx'> CONFIG_PWM_ATMEL=m</div><div class='ctx'> CONFIG_PWM_ATMEL_HLCDC_PWM=m</div><div class='hunk'>@@ -862,9 +887,7 @@ CONFIG_PHY_ROCKCHIP_DP=m</div><div class='ctx'> CONFIG_PHY_ROCKCHIP_USB=m</div><div class='ctx'> CONFIG_PHY_QCOM_APQ8064_SATA=m</div><div class='ctx'> CONFIG_PHY_MIPHY28LP=y</div><div class='del'>-CONFIG_PHY_MIPHY365X=y</div><div class='ctx'> CONFIG_PHY_RCAR_GEN2=m</div><div class='del'>-CONFIG_PHY_STIH41X_USB=y</div><div class='ctx'> CONFIG_PHY_STIH407_USB=y</div><div class='ctx'> CONFIG_PHY_SUN4I_USB=y</div><div class='ctx'> CONFIG_PHY_SUN9I_USB=y</div><div class='hunk'>@@ -877,6 +900,8 @@ CONFIG_BCM2835_MBOX=y</div><div class='ctx'> CONFIG_RASPBERRYPI_FIRMWARE=y</div><div class='ctx'> CONFIG_EFI_VARS=m</div><div class='ctx'> CONFIG_EFI_CAPSULE_LOADER=m</div><div class='add'>+CONFIG_BCM47XX_NVRAM=y</div><div class='add'>+CONFIG_BCM47XX_SPROM=y</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_AUTOFS4_FS=y</div><div class='ctx'> CONFIG_MSDOS_FS=y</div><div class='hunk'>@@ -888,6 +913,10 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_SQUASHFS=y</div><div class='ctx'> CONFIG_SQUASHFS_LZO=y</div><div class='ctx'> CONFIG_SQUASHFS_XZ=y</div><div class='add'>+CONFIG_PSTORE=y</div><div class='add'>+CONFIG_PSTORE_CONSOLE=y</div><div class='add'>+CONFIG_PSTORE_PMSG=y</div><div class='add'>+CONFIG_PSTORE_RAM=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3_ACL=y</div><div class='ctx'> CONFIG_NFS_V4=y</div><div class='hunk'>@@ -918,6 +947,9 @@ CONFIG_CRYPTO_SHA512_ARM=m</div><div class='ctx'> CONFIG_CRYPTO_AES_ARM=m</div><div class='ctx'> CONFIG_CRYPTO_AES_ARM_BS=m</div><div class='ctx'> CONFIG_CRYPTO_AES_ARM_CE=m</div><div class='add'>+CONFIG_CRYPTO_CHACHA20_NEON=m</div><div class='add'>+CONFIG_CRYPTO_CRC32_ARM_CE=m</div><div class='add'>+CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m</div><div class='ctx'> CONFIG_CRYPTO_GHASH_ARM_CE=m</div><div class='ctx'> CONFIG_CRYPTO_DEV_ATMEL_AES=m</div><div class='ctx'> CONFIG_CRYPTO_DEV_ATMEL_TDES=m</div><div class='head'>diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig<br/>index f7f6039419aa..4b598da0d086 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/mvebu_v5_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/mvebu_v5_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/mvebu_v5_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/mvebu_v5_defconfig</a></div><div class='hunk'>@@ -44,7 +44,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='ctx'> CONFIG_ARM_APPENDED_DTB=y</div><div class='ctx'> CONFIG_ARM_ATAG_DTB_COMPAT=y</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='del'>-CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='ctx'> CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y</div><div class='ctx'> CONFIG_CPU_IDLE=y</div><div class='ctx'> CONFIG_ARM_KIRKWOOD_CPUIDLE=y</div><div class='head'>diff --git a/arch/arm/configs/netwinder_defconfig b/arch/arm/configs/netwinder_defconfig<br/>index 4f3dfb21772b..f1395bbd436c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/netwinder_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/netwinder_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/netwinder_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/netwinder_defconfig</a></div><div class='hunk'>@@ -8,7 +8,7 @@ CONFIG_LEDS_CPU=y</div><div class='ctx'> CONFIG_DEPRECATED_PARAM_STRUCT=y</div><div class='ctx'> CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='ctx'> CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='del'>-CONFIG_CMDLINE="root=0x301"</div><div class='add'>+CONFIG_CMDLINE="root=0x801"</div><div class='ctx'> CONFIG_FPE_NWFPE=y</div><div class='ctx'> CONFIG_BINFMT_AOUT=y</div><div class='ctx'> CONFIG_NET=y</div><div class='hunk'>@@ -27,8 +27,9 @@ CONFIG_PARPORT=y</div><div class='ctx'> CONFIG_PARPORT_PC=y</div><div class='ctx'> CONFIG_PARPORT_PC_SUPERIO=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_SL82C105=y</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_WINBOND=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='head'>diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig<br/>index 0c8a78734536..6ffc9844542d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/omap1_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/omap1_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/omap1_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/omap1_defconfig</a></div><div class='hunk'>@@ -96,14 +96,14 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=2</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='del'>-CONFIG_IDE=m</div><div class='del'>-CONFIG_BLK_DEV_IDECS=m</div><div class='ctx'> CONFIG_SCSI=y</div><div class='ctx'> # CONFIG_SCSI_PROC_FS is not set</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=y</div><div class='ctx'> CONFIG_BLK_DEV_SR=y</div><div class='ctx'> CONFIG_CHR_DEV_SG=y</div><div class='add'>+CONFIG_ATA=m</div><div class='add'>+CONFIG_PATA_PCMCIA=m</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_TUN=y</div><div class='ctx'> CONFIG_PHYLIB=y</div><div class='head'>diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig<br/>index 53e1a884a1ea..f2462a6bdba6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/omap2plus_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/omap2plus_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/omap2plus_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/omap2plus_defconfig</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> CONFIG_KERNEL_LZMA=y</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='ctx'> CONFIG_POSIX_MQUEUE=y</div><div class='del'>-CONFIG_FHANDLE=y</div><div class='ctx'> CONFIG_AUDIT=y</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='hunk'>@@ -40,7 +39,6 @@ CONFIG_ARCH_MULTI_V6=y</div><div class='ctx'> CONFIG_POWER_AVS_OMAP=y</div><div class='ctx'> CONFIG_POWER_AVS_OMAP_CLASS3=y</div><div class='ctx'> CONFIG_OMAP_RESET_CLOCKS=y</div><div class='del'>-CONFIG_OMAP_MUX_DEBUG=y</div><div class='ctx'> CONFIG_ARCH_OMAP2=y</div><div class='ctx'> CONFIG_ARCH_OMAP3=y</div><div class='ctx'> CONFIG_ARCH_OMAP4=y</div><div class='hunk'>@@ -50,7 +48,6 @@ CONFIG_SOC_AM43XX=y</div><div class='ctx'> CONFIG_SOC_DRA7XX=y</div><div class='ctx'> CONFIG_ARM_THUMBEE=y</div><div class='ctx'> CONFIG_ARM_ERRATA_411920=y</div><div class='del'>-CONFIG_ARM_ERRATA_430973=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='ctx'> CONFIG_NR_CPUS=2</div><div class='ctx'> CONFIG_CMA=y</div><div class='hunk'>@@ -62,7 +59,6 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y</div><div class='ctx'> CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='del'>-CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='ctx'> CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_POWERSAVE=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_USERSPACE=y</div><div class='hunk'>@@ -141,7 +137,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384</div><div class='ctx'> CONFIG_SENSORS_TSL2550=m</div><div class='ctx'> CONFIG_SRAM=y</div><div class='ctx'> CONFIG_EEPROM_AT24=m</div><div class='del'>-CONFIG_SENSORS_LIS3_I2C=m</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_SCSI_SCAN_ASYNC=y</div><div class='ctx'> CONFIG_ATA=y</div><div class='hunk'>@@ -172,6 +167,7 @@ CONFIG_TI_CPTS=y</div><div class='ctx'> # CONFIG_NET_VENDOR_VIA is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_WIZNET is not set</div><div class='ctx'> CONFIG_AT803X_PHY=y</div><div class='add'>+CONFIG_MICREL_PHY=y</div><div class='ctx'> CONFIG_SMSC_PHY=y</div><div class='ctx'> CONFIG_USB_USBNET=m</div><div class='ctx'> CONFIG_USB_NET_SMSC75XX=m</div><div class='hunk'>@@ -205,6 +201,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m</div><div class='ctx'> CONFIG_TOUCHSCREEN_EDT_FT5X06=m</div><div class='ctx'> CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m</div><div class='ctx'> CONFIG_TOUCHSCREEN_PIXCIR=m</div><div class='add'>+CONFIG_TOUCHSCREEN_TSC2004=m</div><div class='ctx'> CONFIG_TOUCHSCREEN_TSC2005=m</div><div class='ctx'> CONFIG_TOUCHSCREEN_TSC2007=m</div><div class='ctx'> CONFIG_INPUT_MISC=y</div><div class='hunk'>@@ -216,6 +213,7 @@ CONFIG_SERIO=m</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_8250_NR_UARTS=32</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=6</div><div class='ctx'> CONFIG_SERIAL_8250_EXTENDED=y</div><div class='ctx'> CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='ctx'> CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='hunk'>@@ -240,14 +238,14 @@ CONFIG_GPIO_PALMAS=y</div><div class='ctx'> CONFIG_GPIO_TWL4030=y</div><div class='ctx'> CONFIG_W1=m</div><div class='ctx'> CONFIG_HDQ_MASTER_OMAP=m</div><div class='add'>+CONFIG_POWER_AVS=y</div><div class='add'>+CONFIG_POWER_RESET=y</div><div class='ctx'> CONFIG_BATTERY_BQ27XXX=m</div><div class='ctx'> CONFIG_CHARGER_ISP1704=m</div><div class='ctx'> CONFIG_CHARGER_TWL4030=m</div><div class='ctx'> CONFIG_CHARGER_BQ2415X=m</div><div class='ctx'> CONFIG_CHARGER_BQ24190=m</div><div class='ctx'> CONFIG_CHARGER_BQ24735=m</div><div class='del'>-CONFIG_POWER_RESET=y</div><div class='del'>-CONFIG_POWER_AVS=y</div><div class='ctx'> CONFIG_HWMON=m</div><div class='ctx'> CONFIG_SENSORS_GPIO_FAN=m</div><div class='ctx'> CONFIG_SENSORS_LM75=m</div><div class='hunk'>@@ -267,10 +265,13 @@ CONFIG_TWL4030_WATCHDOG=m</div><div class='ctx'> CONFIG_MFD_TI_AM335X_TSCADC=m</div><div class='ctx'> CONFIG_MFD_PALMAS=y</div><div class='ctx'> CONFIG_MFD_TPS65217=y</div><div class='add'>+CONFIG_MFD_TI_LP873X=y</div><div class='ctx'> CONFIG_MFD_TPS65218=y</div><div class='ctx'> CONFIG_MFD_TPS65910=y</div><div class='ctx'> CONFIG_TWL6040_CORE=y</div><div class='add'>+CONFIG_REGULATOR_GPIO=y</div><div class='ctx'> CONFIG_REGULATOR_LP872X=y</div><div class='add'>+CONFIG_REGULATOR_LP873X=y</div><div class='ctx'> CONFIG_REGULATOR_PALMAS=y</div><div class='ctx'> CONFIG_REGULATOR_PBIAS=y</div><div class='ctx'> CONFIG_REGULATOR_TI_ABB=y</div><div class='hunk'>@@ -413,6 +414,7 @@ CONFIG_LEDS_TRIGGER_GPIO=m</div><div class='ctx'> CONFIG_LEDS_TRIGGER_DEFAULT_ON=m</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='ctx'> CONFIG_RTC_DRV_DS1307=m</div><div class='add'>+CONFIG_RTC_DRV_M41T80=m</div><div class='ctx'> CONFIG_RTC_DRV_TWL92330=y</div><div class='ctx'> CONFIG_RTC_DRV_TWL4030=m</div><div class='ctx'> CONFIG_RTC_DRV_PALMAS=m</div><div class='hunk'>@@ -426,6 +428,9 @@ CONFIG_EXTCON_PALMAS=m</div><div class='ctx'> CONFIG_EXTCON_USB_GPIO=m</div><div class='ctx'> CONFIG_TI_EMIF=m</div><div class='ctx'> CONFIG_IIO=m</div><div class='add'>+CONFIG_IIO_SW_DEVICE=m</div><div class='add'>+CONFIG_IIO_SW_TRIGGER=m</div><div class='add'>+CONFIG_IIO_ST_ACCEL_3AXIS=m</div><div class='ctx'> CONFIG_TI_AM335X_ADC=m</div><div class='ctx'> CONFIG_BMP280=m</div><div class='ctx'> CONFIG_PWM=y</div><div class='head'>diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig<br/>index a016ecc0084b..2aac99fd1c41 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/pxa_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/pxa_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/pxa_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/pxa_defconfig</a></div><div class='hunk'>@@ -97,7 +97,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='ctx'> CONFIG_CMDLINE="root=/dev/ram0 ro"</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='del'>-CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='ctx'> CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_POWERSAVE=m</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_USERSPACE=m</div><div class='hunk'>@@ -334,7 +334,6 @@ CONFIG_TOUCHSCREEN_TOUCHIT213=m</div><div class='ctx'> CONFIG_TOUCHSCREEN_PCAP=m</div><div class='ctx'> CONFIG_TOUCHSCREEN_ST1232=m</div><div class='ctx'> CONFIG_INPUT_MISC=y</div><div class='del'>-CONFIG_INPUT_MPU3050=m</div><div class='ctx'> CONFIG_INPUT_AXP20X_PEK=m</div><div class='ctx'> CONFIG_INPUT_UINPUT=m</div><div class='ctx'> CONFIG_INPUT_GPIO_ROTARY_ENCODER=m</div><div class='hunk'>@@ -411,7 +410,6 @@ CONFIG_MFD_MAX77693=y</div><div class='ctx'> CONFIG_MFD_MAX8907=m</div><div class='ctx'> CONFIG_EZX_PCAP=y</div><div class='ctx'> CONFIG_UCB1400_CORE=m</div><div class='del'>-CONFIG_MFD_PM8921_CORE=m</div><div class='ctx'> CONFIG_MFD_SEC_CORE=y</div><div class='ctx'> CONFIG_MFD_PALMAS=y</div><div class='ctx'> CONFIG_MFD_TPS65090=y</div><div class='head'>diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig<br/>index c2dff4fd5fc4..4ffdd607205d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/qcom_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/qcom_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/qcom_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/qcom_defconfig</a></div><div class='hunk'>@@ -24,6 +24,9 @@ CONFIG_ARCH_MSM8X60=y</div><div class='ctx'> CONFIG_ARCH_MSM8960=y</div><div class='ctx'> CONFIG_ARCH_MSM8974=y</div><div class='ctx'> CONFIG_ARCH_MDM9615=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_MSI=y</div><div class='add'>+CONFIG_PCIE_QCOM=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='ctx'> CONFIG_HAVE_ARM_ARCH_TIMER=y</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='hunk'>@@ -55,6 +58,7 @@ CONFIG_CFG80211=y</div><div class='ctx'> CONFIG_RFKILL=y</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='add'>+CONFIG_QCOM_EBI2=y</div><div class='ctx'> CONFIG_MTD=y</div><div class='ctx'> CONFIG_MTD_BLOCK=y</div><div class='ctx'> CONFIG_MTD_M25P80=y</div><div class='hunk'>@@ -68,9 +72,14 @@ CONFIG_CHR_DEV_SCH=y</div><div class='ctx'> CONFIG_SCSI_CONSTANTS=y</div><div class='ctx'> CONFIG_SCSI_LOGGING=y</div><div class='ctx'> CONFIG_SCSI_SCAN_ASYNC=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_SATA_AHCI=y</div><div class='add'>+CONFIG_SATA_AHCI_PLATFORM=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='add'>+CONFIG_ATL1C=y</div><div class='ctx'> CONFIG_KS8851=y</div><div class='add'>+CONFIG_SMSC911X=y</div><div class='ctx'> CONFIG_MDIO_BITBANG=y</div><div class='ctx'> CONFIG_MDIO_GPIO=y</div><div class='ctx'> CONFIG_SLIP=y</div><div class='hunk'>@@ -118,8 +127,8 @@ CONFIG_CHARGER_QCOM_SMBB=y</div><div class='ctx'> CONFIG_POWER_RESET=y</div><div class='ctx'> CONFIG_POWER_RESET_MSM=y</div><div class='ctx'> CONFIG_THERMAL=y</div><div class='add'>+CONFIG_QCOM_TSENS=y</div><div class='ctx'> CONFIG_MFD_PM8XXX=y</div><div class='del'>-CONFIG_MFD_PM8921_CORE=y</div><div class='ctx'> CONFIG_MFD_QCOM_RPM=y</div><div class='ctx'> CONFIG_MFD_SPMI_PMIC=y</div><div class='ctx'> CONFIG_REGULATOR=y</div><div class='hunk'>@@ -138,10 +147,16 @@ CONFIG_SND_SOC=y</div><div class='ctx'> CONFIG_HID_BATTERY_STRENGTH=y</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> CONFIG_USB_ANNOUNCE_NEW_DEVICES=y</div><div class='add'>+CONFIG_USB_OTG=y</div><div class='ctx'> CONFIG_USB_MON=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='add'>+CONFIG_USB_EHCI_MSM=y</div><div class='ctx'> CONFIG_USB_ACM=y</div><div class='add'>+CONFIG_USB_CHIPIDEA=y</div><div class='add'>+CONFIG_USB_CHIPIDEA_UDC=y</div><div class='add'>+CONFIG_USB_CHIPIDEA_HOST=y</div><div class='ctx'> CONFIG_USB_SERIAL=y</div><div class='add'>+CONFIG_USB_MSM_OTG=y</div><div class='ctx'> CONFIG_USB_GADGET=y</div><div class='ctx'> CONFIG_USB_GADGET_DEBUG_FILES=y</div><div class='ctx'> CONFIG_USB_GADGET_VBUS_DRAW=500</div><div class='hunk'>@@ -152,18 +167,26 @@ CONFIG_MMC_QCOM_DML=y</div><div class='ctx'> CONFIG_MMC_SDHCI=y</div><div class='ctx'> CONFIG_MMC_SDHCI_PLTFM=y</div><div class='ctx'> CONFIG_MMC_SDHCI_MSM=y</div><div class='add'>+CONFIG_NEW_LEDS=y</div><div class='add'>+CONFIG_LEDS_CLASS=y</div><div class='add'>+CONFIG_LEDS_GPIO=y</div><div class='add'>+CONFIG_LEDS_PM8058=y</div><div class='add'>+CONFIG_LEDS_TRIGGERS=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_HEARTBEAT=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='ctx'> CONFIG_RTC_DRV_PM8XXX=y</div><div class='ctx'> CONFIG_DMADEVICES=y</div><div class='ctx'> CONFIG_QCOM_BAM_DMA=y</div><div class='ctx'> CONFIG_STAGING=y</div><div class='ctx'> CONFIG_COMMON_CLK_QCOM=y</div><div class='add'>+CONFIG_QCOM_CLK_RPM=y</div><div class='add'>+CONFIG_QCOM_CLK_SMD_RPM=y</div><div class='ctx'> CONFIG_APQ_MMCC_8084=y</div><div class='ctx'> CONFIG_IPQ_LCC_806X=y</div><div class='ctx'> CONFIG_MSM_GCC_8660=y</div><div class='ctx'> CONFIG_MSM_LCC_8960=y</div><div class='del'>-CONFIG_MSM_GCC_9615=y</div><div class='del'>-CONFIG_MSM_LCC_9615=y</div><div class='add'>+CONFIG_MDM_GCC_9615=y</div><div class='add'>+CONFIG_MDM_LCC_9615=y</div><div class='ctx'> CONFIG_MSM_MMCC_8960=y</div><div class='ctx'> CONFIG_MSM_MMCC_8974=y</div><div class='ctx'> CONFIG_HWSPINLOCK_QCOM=y</div><div class='hunk'>@@ -172,8 +195,18 @@ CONFIG_QCOM_PM=y</div><div class='ctx'> CONFIG_QCOM_SMEM=y</div><div class='ctx'> CONFIG_QCOM_SMD=y</div><div class='ctx'> CONFIG_QCOM_SMD_RPM=y</div><div class='add'>+CONFIG_IIO=y</div><div class='add'>+CONFIG_IIO_BUFFER_CB=y</div><div class='add'>+CONFIG_IIO_SW_TRIGGER=y</div><div class='add'>+CONFIG_KXSD9=y</div><div class='add'>+CONFIG_MPU3050_I2C=y</div><div class='add'>+CONFIG_AK8975=y</div><div class='add'>+CONFIG_IIO_HRTIMER_TRIGGER=y</div><div class='add'>+CONFIG_BMP280=y</div><div class='ctx'> CONFIG_PHY_QCOM_APQ8064_SATA=y</div><div class='ctx'> CONFIG_PHY_QCOM_IPQ806X_SATA=y</div><div class='add'>+CONFIG_NVMEM=y</div><div class='add'>+CONFIG_QCOM_QFPROM=y</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> CONFIG_EXT2_FS_XATTR=y</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='head'>diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig<br/>index bc4bfe02e611..1e6c48dd7b11 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/s3c2410_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/s3c2410_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/s3c2410_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/s3c2410_defconfig</a></div><div class='hunk'>@@ -86,9 +86,9 @@ CONFIG_IPV6_TUNNEL=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='del'>-CONFIG_NF_CT_PROTO_DCCP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_SCTP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CT_PROTO_DCCP=y</div><div class='add'>+CONFIG_NF_CT_PROTO_SCTP=y</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -219,20 +219,16 @@ CONFIG_BLK_DEV_NBD=m</div><div class='ctx'> CONFIG_BLK_DEV_UB=m</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_ATA_OVER_ETH=m</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-CONFIG_BLK_DEV_IDETAPE=m</div><div class='del'>-CONFIG_BLK_DEV_PLATFORM=y</div><div class='del'>-CONFIG_SCSI=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=m</div><div class='del'>-CONFIG_BLK_DEV_SR=m</div><div class='add'>+CONFIG_BLK_DEV_SR=y</div><div class='ctx'> CONFIG_BLK_DEV_SR_VENDOR=y</div><div class='ctx'> CONFIG_CHR_DEV_SG=y</div><div class='ctx'> CONFIG_CHR_DEV_SCH=m</div><div class='del'>-CONFIG_SCSI_MULTI_LUN=y</div><div class='ctx'> CONFIG_SCSI_CONSTANTS=y</div><div class='ctx'> CONFIG_SCSI_SCAN_ASYNC=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_PLATFORM=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_DM9000=y</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='head'>diff --git a/arch/arm/configs/s5pv210_defconfig b/arch/arm/configs/s5pv210_defconfig<br/>index fa989902236d..c51f0f02012b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/s5pv210_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/s5pv210_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/s5pv210_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/s5pv210_defconfig</a></div><div class='hunk'>@@ -9,10 +9,6 @@ CONFIG_ARCH_S5PV210=y</div><div class='ctx'> CONFIG_S3C_LOWLEVEL_UART_PORT=1</div><div class='ctx'> CONFIG_S3C_DEV_FB=y</div><div class='ctx'> CONFIG_S5PV210_SETUP_FB_24BPP=y</div><div class='del'>-CONFIG_MACH_AQUILA=y</div><div class='del'>-CONFIG_MACH_GONI=y</div><div class='del'>-CONFIG_MACH_SMDKC110=y</div><div class='del'>-CONFIG_MACH_SMDKV210=y</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_VMSPLIT_2G=y</div><div class='head'>diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig<br/>index aca8625b6fc9..777c9e986425 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/sama5_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/sama5_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/sama5_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/sama5_defconfig</a></div><div class='hunk'>@@ -131,7 +131,7 @@ CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_POWER_SUPPLY=y</div><div class='ctx'> CONFIG_BATTERY_ACT8945A=y</div><div class='ctx'> CONFIG_POWER_RESET=y</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_SENSORS_JC42=m</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_AT91SAM9X_WATCHDOG=y</div><div class='ctx'> CONFIG_SAMA5D4_WATCHDOG=y</div><div class='hunk'>@@ -142,6 +142,7 @@ CONFIG_REGULATOR=y</div><div class='ctx'> CONFIG_REGULATOR_FIXED_VOLTAGE=y</div><div class='ctx'> CONFIG_REGULATOR_ACT8865=y</div><div class='ctx'> CONFIG_REGULATOR_ACT8945A=y</div><div class='add'>+CONFIG_REGULATOR_PWM=m</div><div class='ctx'> CONFIG_MEDIA_SUPPORT=y</div><div class='ctx'> CONFIG_MEDIA_CAMERA_SUPPORT=y</div><div class='ctx'> CONFIG_V4L_PLATFORM_DRIVERS=y</div><div class='hunk'>@@ -164,6 +165,7 @@ CONFIG_SND_ATMEL_SOC=y</div><div class='ctx'> CONFIG_SND_ATMEL_SOC_WM8904=y</div><div class='ctx'> # CONFIG_HID_GENERIC is not set</div><div class='ctx'> CONFIG_SND_ATMEL_SOC_PDMIC=y</div><div class='add'>+CONFIG_SND_ATMEL_SOC_TSE850_PCM5142=m</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> CONFIG_USB_ANNOUNCE_NEW_DEVICES=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='hunk'>@@ -199,6 +201,9 @@ CONFIG_AT_XDMAC=y</div><div class='ctx'> CONFIG_IIO=y</div><div class='ctx'> CONFIG_AT91_ADC=y</div><div class='ctx'> CONFIG_AT91_SAMA5D2_ADC=y</div><div class='add'>+CONFIG_ENVELOPE_DETECTOR=m</div><div class='add'>+CONFIG_DPOT_DAC=m</div><div class='add'>+CONFIG_MCP4531=m</div><div class='ctx'> CONFIG_PWM=y</div><div class='ctx'> CONFIG_PWM_ATMEL=y</div><div class='ctx'> CONFIG_PWM_ATMEL_HLCDC_PWM=y</div><div class='head'>diff --git a/arch/arm/configs/shannon_defconfig b/arch/arm/configs/shannon_defconfig<br/>index b0b96942f4bd..e52395629810 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/shannon_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/shannon_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/shannon_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/shannon_defconfig</a></div><div class='hunk'>@@ -25,7 +25,6 @@ CONFIG_MTD_CFI_AMDSTD=y</div><div class='ctx'> CONFIG_MTD_SA1100=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='del'>-CONFIG_IDE=m</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_NET_PCMCIA=y</div><div class='head'>diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig<br/>index baa07a46a88b..3c66a422fb4d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/shmobile_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/shmobile_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/shmobile_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/shmobile_defconfig</a></div><div class='hunk'>@@ -2,6 +2,7 @@ CONFIG_SYSVIPC=y</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_CGROUPS=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL=y</div><div class='hunk'>@@ -13,6 +14,8 @@ CONFIG_ARCH_EMEV2=y</div><div class='ctx'> CONFIG_ARCH_R7S72100=y</div><div class='ctx'> CONFIG_ARCH_R8A73A4=y</div><div class='ctx'> CONFIG_ARCH_R8A7740=y</div><div class='add'>+CONFIG_ARCH_R8A7743=y</div><div class='add'>+CONFIG_ARCH_R8A7745=y</div><div class='ctx'> CONFIG_ARCH_R8A7778=y</div><div class='ctx'> CONFIG_ARCH_R8A7779=y</div><div class='ctx'> CONFIG_ARCH_R8A7790=y</div><div class='hunk'>@@ -32,12 +35,13 @@ CONFIG_HAVE_ARM_ARCH_TIMER=y</div><div class='ctx'> CONFIG_NR_CPUS=8</div><div class='ctx'> CONFIG_AEABI=y</div><div class='ctx'> CONFIG_HIGHMEM=y</div><div class='add'>+CONFIG_CMA=y</div><div class='ctx'> CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='ctx'> CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='ctx'> CONFIG_ARM_APPENDED_DTB=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='del'>-CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_POWERSAVE=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_USERSPACE=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_ONDEMAND=y</div><div class='hunk'>@@ -57,6 +61,8 @@ CONFIG_CAN_RCAR=y</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='add'>+CONFIG_DMA_CMA=y</div><div class='add'>+CONFIG_CMA_SIZE_MBYTES=64</div><div class='ctx'> CONFIG_SIMPLE_PM_BUS=y</div><div class='ctx'> CONFIG_MTD=y</div><div class='ctx'> CONFIG_MTD_BLOCK=y</div><div class='hunk'>@@ -144,6 +150,7 @@ CONFIG_VIDEO_RENESAS_JPU=y</div><div class='ctx'> CONFIG_VIDEO_RENESAS_VSP1=y</div><div class='ctx'> # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set</div><div class='ctx'> CONFIG_VIDEO_ADV7180=y</div><div class='add'>+CONFIG_VIDEO_ADV7604=y</div><div class='ctx'> CONFIG_VIDEO_ML86V7667=y</div><div class='ctx'> CONFIG_DRM=y</div><div class='ctx'> CONFIG_DRM_I2C_ADV7511=y</div><div class='head'>diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig<br/>index 9f84be5b3ac5..030264c98eec 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/socfpga_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/socfpga_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/socfpga_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/socfpga_defconfig</a></div><div class='hunk'>@@ -25,6 +25,7 @@ CONFIG_PCIE_ALTERA_MSI=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='ctx'> CONFIG_NR_CPUS=2</div><div class='ctx'> CONFIG_AEABI=y</div><div class='add'>+CONFIG_HIGHMEM=y</div><div class='ctx'> CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='ctx'> CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='ctx'> CONFIG_VFP=y</div><div class='hunk'>@@ -50,11 +51,21 @@ CONFIG_CAN_DEBUG_DEVICES=y</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+CONFIG_MTD_M25P80=y</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+CONFIG_MTD_NAND_DENALI_DT=y</div><div class='add'>+CONFIG_MTD_SPI_NOR=y</div><div class='add'>+CONFIG_SPI_CADENCE_QUADSPI=y</div><div class='add'>+CONFIG_OF_OVERLAY=y</div><div class='add'>+CONFIG_OF_CONFIGFS=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=2</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='ctx'> CONFIG_BLK_DEV_NVME=m</div><div class='ctx'> CONFIG_SRAM=y</div><div class='add'>+CONFIG_EEPROM_AT24=y</div><div class='ctx'> CONFIG_SCSI=y</div><div class='ctx'> # CONFIG_SCSI_PROC_FS is not set</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='hunk'>@@ -64,6 +75,7 @@ CONFIG_E1000E=m</div><div class='ctx'> CONFIG_IGB=m</div><div class='ctx'> CONFIG_IXGBE=m</div><div class='ctx'> CONFIG_STMMAC_ETH=y</div><div class='add'>+CONFIG_MARVELL_PHY=y</div><div class='ctx'> CONFIG_MICREL_PHY=y</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='ctx'> CONFIG_INPUT_TOUCHSCREEN=y</div><div class='hunk'>@@ -79,14 +91,22 @@ CONFIG_SERIAL_8250_DW=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_DESIGNWARE_PLATFORM=y</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_DESIGNWARE=y</div><div class='add'>+CONFIG_SPI_DW_MMIO=y</div><div class='add'>+CONFIG_SPI_SPIDEV=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='add'>+CONFIG_GPIO_ALTERA=y</div><div class='ctx'> CONFIG_GPIO_DWAPB=y</div><div class='add'>+CONFIG_GPIO_ALTERA_A10SR=y</div><div class='add'>+CONFIG_SENSORS_MAX1619=y</div><div class='ctx'> CONFIG_PMBUS=y</div><div class='ctx'> CONFIG_SENSORS_LTC2978=y</div><div class='ctx'> CONFIG_SENSORS_LTC2978_REGULATOR=y</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_DW_WATCHDOG=y</div><div class='add'>+CONFIG_MFD_ALTERA_A10SR=y</div><div class='ctx'> CONFIG_MFD_STMPE=y</div><div class='ctx'> CONFIG_REGULATOR=y</div><div class='ctx'> CONFIG_REGULATOR_FIXED_VOLTAGE=y</div><div class='hunk'>@@ -97,22 +117,41 @@ CONFIG_NOP_USB_XCEIV=y</div><div class='ctx'> CONFIG_USB_GADGET=y</div><div class='ctx'> CONFIG_MMC=y</div><div class='ctx'> CONFIG_MMC_DW=y</div><div class='add'>+CONFIG_NEW_LEDS=y</div><div class='add'>+CONFIG_LEDS_CLASS=y</div><div class='add'>+CONFIG_LEDS_GPIO=y</div><div class='add'>+CONFIG_LEDS_TRIGGERS=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_TIMER=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_CPU=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_DRV_DS1307=y</div><div class='ctx'> CONFIG_DMADEVICES=y</div><div class='ctx'> CONFIG_PL330_DMA=y</div><div class='ctx'> CONFIG_DMATEST=m</div><div class='ctx'> CONFIG_FPGA=y</div><div class='add'>+CONFIG_FPGA_REGION=y</div><div class='ctx'> CONFIG_FPGA_MGR_SOCFPGA=y</div><div class='add'>+CONFIG_FPGA_MGR_SOCFPGA_A10=y</div><div class='add'>+CONFIG_FPGA_BRIDGE=y</div><div class='add'>+CONFIG_SOCFPGA_FPGA_BRIDGE=y</div><div class='add'>+CONFIG_ALTERA_FREEZE_BRIDGE=y</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> CONFIG_EXT2_FS_XATTR=y</div><div class='ctx'> CONFIG_EXT2_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_AUTOFS4_FS=y</div><div class='ctx'> CONFIG_VFAT_FS=y</div><div class='ctx'> CONFIG_NTFS_FS=y</div><div class='ctx'> CONFIG_NTFS_RW=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='del'>-CONFIG_CONFIGFS_FS=y</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_NFSD=y</div><div class='add'>+CONFIG_NFSD_V3_ACL=y</div><div class='add'>+CONFIG_NFSD_V4=y</div><div class='ctx'> CONFIG_NLS_CODEPAGE_437=y</div><div class='ctx'> CONFIG_NLS_ISO8859_1=y</div><div class='ctx'> CONFIG_PRINTK_TIME=y</div><div class='hunk'>@@ -120,5 +159,5 @@ CONFIG_DEBUG_INFO=y</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DETECT_HUNG_TASK=y</div><div class='ctx'> # CONFIG_SCHED_DEBUG is not set</div><div class='del'>-CONFIG_ENABLE_DEFAULT_TRACERS=y</div><div class='add'>+CONFIG_FUNCTION_TRACER=y</div><div class='ctx'> CONFIG_DEBUG_USER=y</div><div class='head'>diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig<br/>index a1ede1966baf..d8c529332fb4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/spitz_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/spitz_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/spitz_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/spitz_defconfig</a></div><div class='hunk'>@@ -96,15 +96,13 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='ctx'> CONFIG_MTD_NAND=y</div><div class='ctx'> CONFIG_MTD_NAND_SHARPSL=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECS=y</div><div class='del'>-CONFIG_SCSI=m</div><div class='del'>-CONFIG_BLK_DEV_SD=m</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=m</div><div class='ctx'> CONFIG_CHR_DEV_OSST=m</div><div class='ctx'> CONFIG_BLK_DEV_SR=m</div><div class='ctx'> CONFIG_CHR_DEV_SG=m</div><div class='del'>-CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_PCMCIA=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_USB_CATC=m</div><div class='head'>diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig<br/>index 1e5ec2a0e4cf..a9d8e3c9b487 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/stm32_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/stm32_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/stm32_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/stm32_defconfig</a></div><div class='hunk'>@@ -38,8 +38,7 @@ CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> # CONFIG_BLK_DEV is not set</div><div class='ctx'> CONFIG_EEPROM_93CX6=y</div><div class='del'>-# CONFIG_INPUT is not set</div><div class='del'>-# CONFIG_SERIO is not set</div><div class='add'>+CONFIG_KEYBOARD_GPIO=y</div><div class='ctx'> # CONFIG_VT is not set</div><div class='ctx'> # CONFIG_UNIX98_PTYS is not set</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='hunk'>@@ -49,14 +48,21 @@ CONFIG_SERIAL_STM32=y</div><div class='ctx'> CONFIG_SERIAL_STM32_CONSOLE=y</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+CONFIG_REGULATOR=y</div><div class='add'>+CONFIG_REGULATOR_FIXED_VOLTAGE=y</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='ctx'> CONFIG_LEDS_CLASS=y</div><div class='ctx'> CONFIG_LEDS_GPIO=y</div><div class='ctx'> CONFIG_LEDS_TRIGGERS=y</div><div class='ctx'> CONFIG_LEDS_TRIGGER_HEARTBEAT=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_DRV_STM32=y</div><div class='ctx'> CONFIG_DMADEVICES=y</div><div class='ctx'> CONFIG_STM32_DMA=y</div><div class='add'>+CONFIG_IIO=y</div><div class='add'>+CONFIG_STM32_ADC_CORE=y</div><div class='add'>+CONFIG_STM32_ADC=y</div><div class='ctx'> # CONFIG_FILE_LOCKING is not set</div><div class='ctx'> # CONFIG_DNOTIFY is not set</div><div class='ctx'> # CONFIG_INOTIFY_USER is not set</div><div class='head'>diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig<br/>index 714da336ec86..da92c25eb7cc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/sunxi_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/sunxi_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/sunxi_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/sunxi_defconfig</a></div><div class='hunk'>@@ -83,6 +83,7 @@ CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_POWER_SUPPLY=y</div><div class='ctx'> CONFIG_AXP20X_POWER=y</div><div class='ctx'> CONFIG_THERMAL=y</div><div class='add'>+CONFIG_THERMAL_OF=y</div><div class='ctx'> CONFIG_CPU_THERMAL=y</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_SUNXI_WATCHDOG=y</div><div class='hunk'>@@ -98,6 +99,7 @@ CONFIG_MEDIA_RC_SUPPORT=y</div><div class='ctx'> CONFIG_RC_DEVICES=y</div><div class='ctx'> CONFIG_IR_SUNXI=y</div><div class='ctx'> CONFIG_DRM=y</div><div class='add'>+CONFIG_DRM_DUMB_VGA_DAC=y</div><div class='ctx'> CONFIG_DRM_SUN4I=y</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FB_SIMPLE=y</div><div class='head'>diff --git a/arch/arm/configs/tango4_defconfig b/arch/arm/configs/tango4_defconfig<br/>new file mode 100644<br/>index 000000000000..68725d4eae45<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/tango4_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/tango4_defconfig</a></div><div class='hunk'>@@ -0,0 +1,94 @@</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_NO_HZ_IDLE=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+# CONFIG_COMPAT_BRK is not set</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+CONFIG_ARCH_TANGO=y</div><div class='add'>+# CONFIG_ARM_ERRATA_643719 is not set</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_HZ_300=y</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+CONFIG_HIGHMEM=y</div><div class='add'>+# CONFIG_ATAGS is not set</div><div class='add'>+CONFIG_ARM_APPENDED_DTB=y</div><div class='add'>+CONFIG_ARM_ATAG_DTB_COMPAT=y</div><div class='add'>+CONFIG_CPU_FREQ=y</div><div class='add'>+CONFIG_CPU_FREQ_GOV_ONDEMAND=y</div><div class='add'>+CONFIG_CPUFREQ_DT=y</div><div class='add'>+CONFIG_VFP=y</div><div class='add'>+CONFIG_NEON=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_DEVTMPFS=y</div><div class='add'>+CONFIG_DEVTMPFS_MOUNT=y</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_TESTS=m</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+CONFIG_MTD_NAND_TANGO=y</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_NET_VENDOR_AURORA=y</div><div class='add'>+CONFIG_AURORA_NB8800=y</div><div class='add'>+CONFIG_AT803X_PHY=y</div><div class='add'>+# CONFIG_WLAN is not set</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_RT288X=y</div><div class='add'>+CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_XLR=y</div><div class='add'>+CONFIG_GPIOLIB=y</div><div class='add'>+CONFIG_THERMAL=y</div><div class='add'>+CONFIG_CPU_THERMAL=y</div><div class='add'>+CONFIG_TANGO_THERMAL=y</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_TANGOX_WATCHDOG=y</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_HID is not set</div><div class='add'>+# CONFIG_USB_HID is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+CONFIG_USB_EHCI_HCD=y</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+CONFIG_USB_CHIPIDEA=y</div><div class='add'>+CONFIG_USB_CHIPIDEA_HOST=y</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+CONFIG_MMC_SDHCI=y</div><div class='add'>+CONFIG_MMC_SDHCI_PLTFM=y</div><div class='add'>+CONFIG_MMC_SDHCI_OF_ARASAN=y</div><div class='add'>+CONFIG_DMADEVICES=y</div><div class='add'>+CONFIG_EXT4_FS=y</div><div class='add'>+CONFIG_FUSE_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+# CONFIG_NFS_V2 is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+CONFIG_NLS_UTF8=m</div><div class='add'>+CONFIG_PRINTK_TIME=y</div><div class='add'>+# CONFIG_CRYPTO_ECHAINIV is not set</div><div class='head'>diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig<br/>index 6012a1ec779f..f0efc854b5a2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/tegra_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/tegra_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/tegra_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/tegra_defconfig</a></div><div class='hunk'>@@ -1,16 +1,15 @@</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='del'>-CONFIG_FHANDLE=y</div><div class='ctx'> CONFIG_IRQ_DOMAIN_DEBUG=y</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='ctx'> CONFIG_CGROUPS=y</div><div class='del'>-CONFIG_CGROUP_DEBUG=y</div><div class='del'>-CONFIG_CGROUP_FREEZER=y</div><div class='del'>-CONFIG_CGROUP_CPUACCT=y</div><div class='ctx'> CONFIG_CGROUP_SCHED=y</div><div class='ctx'> CONFIG_RT_GROUP_SCHED=y</div><div class='add'>+CONFIG_CGROUP_FREEZER=y</div><div class='add'>+CONFIG_CGROUP_CPUACCT=y</div><div class='add'>+CONFIG_CGROUP_DEBUG=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> # CONFIG_ELF_CORE is not set</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='hunk'>@@ -24,14 +23,10 @@ CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='ctx'> CONFIG_ARCH_TEGRA=y</div><div class='del'>-CONFIG_ARCH_TEGRA_2x_SOC=y</div><div class='del'>-CONFIG_ARCH_TEGRA_3x_SOC=y</div><div class='del'>-CONFIG_ARCH_TEGRA_114_SOC=y</div><div class='del'>-CONFIG_ARCH_TEGRA_124_SOC=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='add'>+CONFIG_PCIEPORTBUS=y</div><div class='ctx'> CONFIG_PCI_MSI=y</div><div class='ctx'> CONFIG_PCI_TEGRA=y</div><div class='del'>-CONFIG_PCIEPORTBUS=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='ctx'> CONFIG_AEABI=y</div><div class='hunk'>@@ -41,7 +36,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='ctx'> CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='del'>-CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='ctx'> CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y</div><div class='ctx'> CONFIG_CPUFREQ_DT=y</div><div class='ctx'> CONFIG_CPU_IDLE=y</div><div class='hunk'>@@ -59,7 +53,6 @@ CONFIG_IP_PNP_RARP=y</div><div class='ctx'> CONFIG_INET_ESP=y</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='del'>-# CONFIG_INET_LRO is not set</div><div class='ctx'> # CONFIG_INET_DIAG is not set</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_IPV6_OPTIMISTIC_DAD=y</div><div class='hunk'>@@ -86,6 +79,7 @@ CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='ctx'> CONFIG_DMA_CMA=y</div><div class='ctx'> CONFIG_CMA_SIZE_MBYTES=64</div><div class='add'>+CONFIG_TEGRA_GMI=y</div><div class='ctx'> CONFIG_MTD=y</div><div class='ctx'> CONFIG_MTD_M25P80=y</div><div class='ctx'> CONFIG_MTD_SPI_NOR=y</div><div class='hunk'>@@ -126,13 +120,12 @@ CONFIG_TOUCHSCREEN_WM97XX=y</div><div class='ctx'> # CONFIG_TOUCHSCREEN_WM9713 is not set</div><div class='ctx'> CONFIG_TOUCHSCREEN_STMPE=y</div><div class='ctx'> CONFIG_INPUT_MISC=y</div><div class='del'>-CONFIG_INPUT_MPU3050=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_DEVKMEM is not set</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='del'>-CONFIG_SERIAL_TEGRA=y</div><div class='ctx'> CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+CONFIG_SERIAL_TEGRA=y</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_I2C_COMPAT is not set</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='hunk'>@@ -151,11 +144,11 @@ CONFIG_GPIO_PCA953X_IRQ=y</div><div class='ctx'> CONFIG_GPIO_PALMAS=y</div><div class='ctx'> CONFIG_GPIO_TPS6586X=y</div><div class='ctx'> CONFIG_GPIO_TPS65910=y</div><div class='del'>-CONFIG_BATTERY_SBS=y</div><div class='del'>-CONFIG_CHARGER_TPS65090=y</div><div class='ctx'> CONFIG_POWER_RESET=y</div><div class='ctx'> CONFIG_POWER_RESET_AS3722=y</div><div class='ctx'> CONFIG_POWER_RESET_GPIO=y</div><div class='add'>+CONFIG_BATTERY_SBS=y</div><div class='add'>+CONFIG_CHARGER_TPS65090=y</div><div class='ctx'> CONFIG_SENSORS_LM90=y</div><div class='ctx'> CONFIG_SENSORS_LM95245=y</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='hunk'>@@ -216,6 +209,7 @@ CONFIG_SND_SOC_TEGRA_WM9712=y</div><div class='ctx'> CONFIG_SND_SOC_TEGRA_TRIMSLICE=y</div><div class='ctx'> CONFIG_SND_SOC_TEGRA_ALC5632=y</div><div class='ctx'> CONFIG_SND_SOC_TEGRA_MAX98090=y</div><div class='add'>+CONFIG_SND_SOC_TEGRA_SGTL5000=y</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> CONFIG_USB_XHCI_HCD=y</div><div class='ctx'> CONFIG_USB_XHCI_TEGRA=y</div><div class='hunk'>@@ -262,8 +256,13 @@ CONFIG_NVEC_POWER=y</div><div class='ctx'> CONFIG_NVEC_PAZ00=y</div><div class='ctx'> CONFIG_TEGRA_IOMMU_GART=y</div><div class='ctx'> CONFIG_TEGRA_IOMMU_SMMU=y</div><div class='add'>+CONFIG_ARCH_TEGRA_2x_SOC=y</div><div class='add'>+CONFIG_ARCH_TEGRA_3x_SOC=y</div><div class='add'>+CONFIG_ARCH_TEGRA_114_SOC=y</div><div class='add'>+CONFIG_ARCH_TEGRA_124_SOC=y</div><div class='ctx'> CONFIG_MEMORY=y</div><div class='ctx'> CONFIG_IIO=y</div><div class='add'>+CONFIG_MPU3050_I2C=y</div><div class='ctx'> CONFIG_AK8975=y</div><div class='ctx'> CONFIG_PWM=y</div><div class='ctx'> CONFIG_PWM_TEGRA=y</div><div class='head'>diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig<br/>index b7b09189f1c5..e2151a7aaf49 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/u8500_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/u8500_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/u8500_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/u8500_defconfig</a></div><div class='hunk'>@@ -4,7 +4,6 @@ CONFIG_NO_HZ_IDLE=y</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='del'>-CONFIG_PERF_EVENTS=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='hunk'>@@ -26,7 +25,6 @@ CONFIG_CPU_IDLE=y</div><div class='ctx'> CONFIG_ARM_U8500_CPUIDLE=y</div><div class='ctx'> CONFIG_VFP=y</div><div class='ctx'> CONFIG_NEON=y</div><div class='del'>-CONFIG_PM=y</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='hunk'>@@ -108,18 +106,19 @@ CONFIG_DMADEVICES=y</div><div class='ctx'> CONFIG_STE_DMA40=y</div><div class='ctx'> CONFIG_HSEM_U8500=y</div><div class='ctx'> CONFIG_IIO=y</div><div class='del'>-CONFIG_IIO_BUFFER=y</div><div class='add'>+CONFIG_IIO_SW_TRIGGER=y</div><div class='ctx'> CONFIG_IIO_ST_ACCEL_3AXIS=y</div><div class='ctx'> CONFIG_IIO_ST_GYRO_3AXIS=y</div><div class='ctx'> CONFIG_BH1780=y</div><div class='add'>+CONFIG_AK8974=y</div><div class='ctx'> CONFIG_IIO_ST_MAGN_3AXIS=y</div><div class='add'>+CONFIG_IIO_HRTIMER_TRIGGER=y</div><div class='ctx'> CONFIG_IIO_ST_PRESS=y</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> CONFIG_EXT2_FS_XATTR=y</div><div class='ctx'> CONFIG_EXT2_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_EXT2_FS_SECURITY=y</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='del'>-CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_VFAT_FS=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_TMPFS_POSIX_ACL=y</div><div class='head'>diff --git a/arch/arm/configs/vf610m4_defconfig b/arch/arm/configs/vf610m4_defconfig<br/>index aeb2482c492e..b7ecb83a95b6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/configs/vf610m4_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/configs/vf610m4_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/configs/vf610m4_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/configs/vf610m4_defconfig</a></div><div class='hunk'>@@ -7,7 +7,6 @@ CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> # CONFIG_MMU is not set</div><div class='del'>-CONFIG_ARM_SINGLE_ARMV7M=y</div><div class='ctx'> CONFIG_ARCH_MXC=y</div><div class='ctx'> CONFIG_SOC_VF610=y</div><div class='ctx'> CONFIG_SET_MEM_PARAM=y</div><div class='hunk'>@@ -38,5 +37,5 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y</div><div class='ctx'> CONFIG_MFD_SYSCON=y</div><div class='ctx'> # CONFIG_HID is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='add'>+CONFIG_EXT4_FS=y</div><div class='ctx'> # CONFIG_MISC_FILESYSTEMS is not set</div><div class='del'>-# CONFIG_FTRACE is not set</div><div class='head'>diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig<br/>index 27ed1b1cd1d7..a8fce93137fb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/crypto/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/crypto/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/Kconfig</a></div><div class='hunk'>@@ -62,35 +62,18 @@ config CRYPTO_SHA512_ARM</div><div class='ctx'> 	  using optimized ARM assembler and NEON, when available.</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_AES_ARM</div><div class='del'>-	tristate "AES cipher algorithms (ARM-asm)"</div><div class='del'>-	depends on ARM</div><div class='add'>+	tristate "Scalar AES cipher for ARM"</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='ctx'> 	select CRYPTO_AES</div><div class='ctx'> 	help</div><div class='ctx'> 	  Use optimized AES assembler routines for ARM platforms.</div><div class='ctx'> </div><div class='del'>-	  AES cipher algorithms (FIPS-197). AES uses the Rijndael</div><div class='del'>-	  algorithm.</div><div class='del'>-</div><div class='del'>-	  Rijndael appears to be consistently a very good performer in</div><div class='del'>-	  both hardware and software across a wide range of computing</div><div class='del'>-	  environments regardless of its use in feedback or non-feedback</div><div class='del'>-	  modes. Its key setup time is excellent, and its key agility is</div><div class='del'>-	  good. Rijndael's very low memory requirements make it very well</div><div class='del'>-	  suited for restricted-space environments, in which it also</div><div class='del'>-	  demonstrates excellent performance. Rijndael's operations are</div><div class='del'>-	  among the easiest to defend against power and timing attacks.</div><div class='del'>-</div><div class='del'>-	  The AES specifies three key sizes: 128, 192 and 256 bits</div><div class='del'>-</div><div class='del'>-	  See &lt;http://csrc.nist.gov/encryption/aes/&gt; for more information.</div><div class='del'>-</div><div class='ctx'> config CRYPTO_AES_ARM_BS</div><div class='ctx'> 	tristate "Bit sliced AES using NEON instructions"</div><div class='ctx'> 	depends on KERNEL_MODE_NEON</div><div class='del'>-	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_BLKCIPHER</div><div class='add'>+	select CRYPTO_SIMD</div><div class='ctx'> 	select CRYPTO_AES_ARM</div><div class='del'>-	select CRYPTO_ABLK_HELPER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Use a faster and more secure NEON based implementation of AES in CBC,</div><div class='ctx'> 	  CTR and XTS modes</div><div class='hunk'>@@ -104,8 +87,8 @@ config CRYPTO_AES_ARM_BS</div><div class='ctx'> config CRYPTO_AES_ARM_CE</div><div class='ctx'> 	tristate "Accelerated AES using ARMv8 Crypto Extensions"</div><div class='ctx'> 	depends on KERNEL_MODE_NEON</div><div class='del'>-	select CRYPTO_ALGAPI</div><div class='del'>-	select CRYPTO_ABLK_HELPER</div><div class='add'>+	select CRYPTO_BLKCIPHER</div><div class='add'>+	select CRYPTO_SIMD</div><div class='ctx'> 	help</div><div class='ctx'> 	  Use an implementation of AES in CBC, CTR and XTS modes that uses</div><div class='ctx'> 	  ARMv8 Crypto Extensions</div><div class='hunk'>@@ -120,4 +103,20 @@ config CRYPTO_GHASH_ARM_CE</div><div class='ctx'> 	  that uses the 64x64 to 128 bit polynomial multiplication (vmull.p64)</div><div class='ctx'> 	  that is part of the ARMv8 Crypto Extensions</div><div class='ctx'> </div><div class='add'>+config CRYPTO_CRCT10DIF_ARM_CE</div><div class='add'>+	tristate "CRCT10DIF digest algorithm using PMULL instructions"</div><div class='add'>+	depends on KERNEL_MODE_NEON &amp;&amp; CRC_T10DIF</div><div class='add'>+	select CRYPTO_HASH</div><div class='add'>+</div><div class='add'>+config CRYPTO_CRC32_ARM_CE</div><div class='add'>+	tristate "CRC32(C) digest algorithm using CRC and/or PMULL instructions"</div><div class='add'>+	depends on KERNEL_MODE_NEON &amp;&amp; CRC32</div><div class='add'>+	select CRYPTO_HASH</div><div class='add'>+</div><div class='add'>+config CRYPTO_CHACHA20_NEON</div><div class='add'>+	tristate "NEON accelerated ChaCha20 symmetric cipher"</div><div class='add'>+	depends on KERNEL_MODE_NEON</div><div class='add'>+	select CRYPTO_BLKCIPHER</div><div class='add'>+	select CRYPTO_CHACHA20</div><div class='add'>+</div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/arm/crypto/Makefile b/arch/arm/crypto/Makefile<br/>index fc5150702b64..f2215fbeed13 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/crypto/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/crypto/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/Makefile</a></div><div class='hunk'>@@ -8,11 +8,24 @@ obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha20-neon.o</div><div class='ctx'> </div><div class='ctx'> ce-obj-$(CONFIG_CRYPTO_AES_ARM_CE) += aes-arm-ce.o</div><div class='ctx'> ce-obj-$(CONFIG_CRYPTO_SHA1_ARM_CE) += sha1-arm-ce.o</div><div class='ctx'> ce-obj-$(CONFIG_CRYPTO_SHA2_ARM_CE) += sha2-arm-ce.o</div><div class='ctx'> ce-obj-$(CONFIG_CRYPTO_GHASH_ARM_CE) += ghash-arm-ce.o</div><div class='add'>+ce-obj-$(CONFIG_CRYPTO_CRCT10DIF_ARM_CE) += crct10dif-arm-ce.o</div><div class='add'>+crc-obj-$(CONFIG_CRYPTO_CRC32_ARM_CE) += crc32-arm-ce.o</div><div class='add'>+</div><div class='add'>+ifneq ($(crc-obj-y)$(crc-obj-m),)</div><div class='add'>+ifeq ($(call as-instr,.arch armv8-a\n.arch_extension crc,y,n),y)</div><div class='add'>+ce-obj-y += $(crc-obj-y)</div><div class='add'>+ce-obj-m += $(crc-obj-m)</div><div class='add'>+else</div><div class='add'>+$(warning These CRC Extensions modules need binutils 2.23 or higher)</div><div class='add'>+$(warning $(crc-obj-y) $(crc-obj-m))</div><div class='add'>+endif</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> ifneq ($(ce-obj-y)$(ce-obj-m),)</div><div class='ctx'> ifeq ($(call as-instr,.fpu crypto-neon-fp-armv8,y,n),y)</div><div class='hunk'>@@ -24,8 +37,8 @@ $(warning $(ce-obj-y) $(ce-obj-m))</div><div class='ctx'> endif</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-aes-arm-y	:= aes-armv4.o aes_glue.o</div><div class='del'>-aes-arm-bs-y	:= aesbs-core.o aesbs-glue.o</div><div class='add'>+aes-arm-y	:= aes-cipher-core.o aes-cipher-glue.o</div><div class='add'>+aes-arm-bs-y	:= aes-neonbs-core.o aes-neonbs-glue.o</div><div class='ctx'> sha1-arm-y	:= sha1-armv4-large.o sha1_glue.o</div><div class='ctx'> sha1-arm-neon-y	:= sha1-armv7-neon.o sha1_neon_glue.o</div><div class='ctx'> sha256-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha256_neon_glue.o</div><div class='hunk'>@@ -36,17 +49,17 @@ sha1-arm-ce-y	:= sha1-ce-core.o sha1-ce-glue.o</div><div class='ctx'> sha2-arm-ce-y	:= sha2-ce-core.o sha2-ce-glue.o</div><div class='ctx'> aes-arm-ce-y	:= aes-ce-core.o aes-ce-glue.o</div><div class='ctx'> ghash-arm-ce-y	:= ghash-ce-core.o ghash-ce-glue.o</div><div class='add'>+crct10dif-arm-ce-y	:= crct10dif-ce-core.o crct10dif-ce-glue.o</div><div class='add'>+crc32-arm-ce-y:= crc32-ce-core.o crc32-ce-glue.o</div><div class='add'>+chacha20-neon-y := chacha20-neon-core.o chacha20-neon-glue.o</div><div class='ctx'> </div><div class='ctx'> quiet_cmd_perl = PERL    $@</div><div class='ctx'>       cmd_perl = $(PERL) $(&lt;) &gt; $(@)</div><div class='ctx'> </div><div class='del'>-$(src)/aesbs-core.S_shipped: $(src)/bsaes-armv7.pl</div><div class='del'>-	$(call cmd,perl)</div><div class='del'>-</div><div class='ctx'> $(src)/sha256-core.S_shipped: $(src)/sha256-armv4.pl</div><div class='ctx'> 	$(call cmd,perl)</div><div class='ctx'> </div><div class='ctx'> $(src)/sha512-core.S_shipped: $(src)/sha512-armv4.pl</div><div class='ctx'> 	$(call cmd,perl)</div><div class='ctx'> </div><div class='del'>-.PRECIOUS: $(obj)/aesbs-core.S $(obj)/sha256-core.S $(obj)/sha512-core.S</div><div class='add'>+.PRECIOUS: $(obj)/sha256-core.S $(obj)/sha512-core.S</div><div class='head'>diff --git a/arch/arm/crypto/aes-armv4.S b/arch/arm/crypto/aes-armv4.S<br/>deleted file mode 100644<br/>index ebb9761fb572..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/crypto/aes-armv4.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/crypto/aes-armv4.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1089 +0,0 @@</div><div class='del'>-#define __ARM_ARCH__ __LINUX_ARM_ARCH__</div><div class='del'>-@ ====================================================================</div><div class='del'>-@ Written by Andy Polyakov &lt;appro@fy.chalmers.se&gt; for the OpenSSL</div><div class='del'>-@ project. The module is, however, dual licensed under OpenSSL and</div><div class='del'>-@ CRYPTOGAMS licenses depending on where you obtain it. For further</div><div class='del'>-@ details see http://www.openssl.org/~appro/cryptogams/.</div><div class='del'>-@ ====================================================================</div><div class='del'>-</div><div class='del'>-@ AES for ARMv4</div><div class='del'>-</div><div class='del'>-@ January 2007.</div><div class='del'>-@</div><div class='del'>-@ Code uses single 1K S-box and is &gt;2 times faster than code generated</div><div class='del'>-@ by gcc-3.4.1. This is thanks to unique feature of ARMv4 ISA, which</div><div class='del'>-@ allows to merge logical or arithmetic operation with shift or rotate</div><div class='del'>-@ in one instruction and emit combined result every cycle. The module</div><div class='del'>-@ is endian-neutral. The performance is ~42 cycles/byte for 128-bit</div><div class='del'>-@ key [on single-issue Xscale PXA250 core].</div><div class='del'>-</div><div class='del'>-@ May 2007.</div><div class='del'>-@</div><div class='del'>-@ AES_set_[en|de]crypt_key is added.</div><div class='del'>-</div><div class='del'>-@ July 2010.</div><div class='del'>-@</div><div class='del'>-@ Rescheduling for dual-issue pipeline resulted in 12% improvement on</div><div class='del'>-@ Cortex A8 core and ~25 cycles per byte processed with 128-bit key.</div><div class='del'>-</div><div class='del'>-@ February 2011.</div><div class='del'>-@</div><div class='del'>-@ Profiler-assisted and platform-specific optimization resulted in 16%</div><div class='del'>-@ improvement on Cortex A8 core and ~21.5 cycles per byte.</div><div class='del'>-</div><div class='del'>-@ A little glue here to select the correct code below for the ARM CPU</div><div class='del'>-@ that is being targetted.</div><div class='del'>-</div><div class='del'>-#include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;asm/assembler.h&gt;</div><div class='del'>-</div><div class='del'>-.text</div><div class='del'>-</div><div class='del'>-.type	AES_Te,%object</div><div class='del'>-.align	5</div><div class='del'>-AES_Te:</div><div class='del'>-.word	0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d</div><div class='del'>-.word	0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554</div><div class='del'>-.word	0x60303050, 0x02010103, 0xce6767a9, 0x562b2b7d</div><div class='del'>-.word	0xe7fefe19, 0xb5d7d762, 0x4dababe6, 0xec76769a</div><div class='del'>-.word	0x8fcaca45, 0x1f82829d, 0x89c9c940, 0xfa7d7d87</div><div class='del'>-.word	0xeffafa15, 0xb25959eb, 0x8e4747c9, 0xfbf0f00b</div><div class='del'>-.word	0x41adadec, 0xb3d4d467, 0x5fa2a2fd, 0x45afafea</div><div class='del'>-.word	0x239c9cbf, 0x53a4a4f7, 0xe4727296, 0x9bc0c05b</div><div class='del'>-.word	0x75b7b7c2, 0xe1fdfd1c, 0x3d9393ae, 0x4c26266a</div><div class='del'>-.word	0x6c36365a, 0x7e3f3f41, 0xf5f7f702, 0x83cccc4f</div><div class='del'>-.word	0x6834345c, 0x51a5a5f4, 0xd1e5e534, 0xf9f1f108</div><div class='del'>-.word	0xe2717193, 0xabd8d873, 0x62313153, 0x2a15153f</div><div class='del'>-.word	0x0804040c, 0x95c7c752, 0x46232365, 0x9dc3c35e</div><div class='del'>-.word	0x30181828, 0x379696a1, 0x0a05050f, 0x2f9a9ab5</div><div class='del'>-.word	0x0e070709, 0x24121236, 0x1b80809b, 0xdfe2e23d</div><div class='del'>-.word	0xcdebeb26, 0x4e272769, 0x7fb2b2cd, 0xea75759f</div><div class='del'>-.word	0x1209091b, 0x1d83839e, 0x582c2c74, 0x341a1a2e</div><div class='del'>-.word	0x361b1b2d, 0xdc6e6eb2, 0xb45a5aee, 0x5ba0a0fb</div><div class='del'>-.word	0xa45252f6, 0x763b3b4d, 0xb7d6d661, 0x7db3b3ce</div><div class='del'>-.word	0x5229297b, 0xdde3e33e, 0x5e2f2f71, 0x13848497</div><div class='del'>-.word	0xa65353f5, 0xb9d1d168, 0x00000000, 0xc1eded2c</div><div class='del'>-.word	0x40202060, 0xe3fcfc1f, 0x79b1b1c8, 0xb65b5bed</div><div class='del'>-.word	0xd46a6abe, 0x8dcbcb46, 0x67bebed9, 0x7239394b</div><div class='del'>-.word	0x944a4ade, 0x984c4cd4, 0xb05858e8, 0x85cfcf4a</div><div class='del'>-.word	0xbbd0d06b, 0xc5efef2a, 0x4faaaae5, 0xedfbfb16</div><div class='del'>-.word	0x864343c5, 0x9a4d4dd7, 0x66333355, 0x11858594</div><div class='del'>-.word	0x8a4545cf, 0xe9f9f910, 0x04020206, 0xfe7f7f81</div><div class='del'>-.word	0xa05050f0, 0x783c3c44, 0x259f9fba, 0x4ba8a8e3</div><div class='del'>-.word	0xa25151f3, 0x5da3a3fe, 0x804040c0, 0x058f8f8a</div><div class='del'>-.word	0x3f9292ad, 0x219d9dbc, 0x70383848, 0xf1f5f504</div><div class='del'>-.word	0x63bcbcdf, 0x77b6b6c1, 0xafdada75, 0x42212163</div><div class='del'>-.word	0x20101030, 0xe5ffff1a, 0xfdf3f30e, 0xbfd2d26d</div><div class='del'>-.word	0x81cdcd4c, 0x180c0c14, 0x26131335, 0xc3ecec2f</div><div class='del'>-.word	0xbe5f5fe1, 0x359797a2, 0x884444cc, 0x2e171739</div><div class='del'>-.word	0x93c4c457, 0x55a7a7f2, 0xfc7e7e82, 0x7a3d3d47</div><div class='del'>-.word	0xc86464ac, 0xba5d5de7, 0x3219192b, 0xe6737395</div><div class='del'>-.word	0xc06060a0, 0x19818198, 0x9e4f4fd1, 0xa3dcdc7f</div><div class='del'>-.word	0x44222266, 0x542a2a7e, 0x3b9090ab, 0x0b888883</div><div class='del'>-.word	0x8c4646ca, 0xc7eeee29, 0x6bb8b8d3, 0x2814143c</div><div class='del'>-.word	0xa7dede79, 0xbc5e5ee2, 0x160b0b1d, 0xaddbdb76</div><div class='del'>-.word	0xdbe0e03b, 0x64323256, 0x743a3a4e, 0x140a0a1e</div><div class='del'>-.word	0x924949db, 0x0c06060a, 0x4824246c, 0xb85c5ce4</div><div class='del'>-.word	0x9fc2c25d, 0xbdd3d36e, 0x43acacef, 0xc46262a6</div><div class='del'>-.word	0x399191a8, 0x319595a4, 0xd3e4e437, 0xf279798b</div><div class='del'>-.word	0xd5e7e732, 0x8bc8c843, 0x6e373759, 0xda6d6db7</div><div class='del'>-.word	0x018d8d8c, 0xb1d5d564, 0x9c4e4ed2, 0x49a9a9e0</div><div class='del'>-.word	0xd86c6cb4, 0xac5656fa, 0xf3f4f407, 0xcfeaea25</div><div class='del'>-.word	0xca6565af, 0xf47a7a8e, 0x47aeaee9, 0x10080818</div><div class='del'>-.word	0x6fbabad5, 0xf0787888, 0x4a25256f, 0x5c2e2e72</div><div class='del'>-.word	0x381c1c24, 0x57a6a6f1, 0x73b4b4c7, 0x97c6c651</div><div class='del'>-.word	0xcbe8e823, 0xa1dddd7c, 0xe874749c, 0x3e1f1f21</div><div class='del'>-.word	0x964b4bdd, 0x61bdbddc, 0x0d8b8b86, 0x0f8a8a85</div><div class='del'>-.word	0xe0707090, 0x7c3e3e42, 0x71b5b5c4, 0xcc6666aa</div><div class='del'>-.word	0x904848d8, 0x06030305, 0xf7f6f601, 0x1c0e0e12</div><div class='del'>-.word	0xc26161a3, 0x6a35355f, 0xae5757f9, 0x69b9b9d0</div><div class='del'>-.word	0x17868691, 0x99c1c158, 0x3a1d1d27, 0x279e9eb9</div><div class='del'>-.word	0xd9e1e138, 0xebf8f813, 0x2b9898b3, 0x22111133</div><div class='del'>-.word	0xd26969bb, 0xa9d9d970, 0x078e8e89, 0x339494a7</div><div class='del'>-.word	0x2d9b9bb6, 0x3c1e1e22, 0x15878792, 0xc9e9e920</div><div class='del'>-.word	0x87cece49, 0xaa5555ff, 0x50282878, 0xa5dfdf7a</div><div class='del'>-.word	0x038c8c8f, 0x59a1a1f8, 0x09898980, 0x1a0d0d17</div><div class='del'>-.word	0x65bfbfda, 0xd7e6e631, 0x844242c6, 0xd06868b8</div><div class='del'>-.word	0x824141c3, 0x299999b0, 0x5a2d2d77, 0x1e0f0f11</div><div class='del'>-.word	0x7bb0b0cb, 0xa85454fc, 0x6dbbbbd6, 0x2c16163a</div><div class='del'>-@ Te4[256]</div><div class='del'>-.byte	0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5</div><div class='del'>-.byte	0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76</div><div class='del'>-.byte	0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0</div><div class='del'>-.byte	0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0</div><div class='del'>-.byte	0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc</div><div class='del'>-.byte	0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15</div><div class='del'>-.byte	0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a</div><div class='del'>-.byte	0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75</div><div class='del'>-.byte	0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0</div><div class='del'>-.byte	0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84</div><div class='del'>-.byte	0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b</div><div class='del'>-.byte	0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf</div><div class='del'>-.byte	0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85</div><div class='del'>-.byte	0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8</div><div class='del'>-.byte	0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5</div><div class='del'>-.byte	0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2</div><div class='del'>-.byte	0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17</div><div class='del'>-.byte	0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73</div><div class='del'>-.byte	0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88</div><div class='del'>-.byte	0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb</div><div class='del'>-.byte	0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c</div><div class='del'>-.byte	0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79</div><div class='del'>-.byte	0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9</div><div class='del'>-.byte	0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08</div><div class='del'>-.byte	0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6</div><div class='del'>-.byte	0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a</div><div class='del'>-.byte	0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e</div><div class='del'>-.byte	0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e</div><div class='del'>-.byte	0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94</div><div class='del'>-.byte	0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf</div><div class='del'>-.byte	0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68</div><div class='del'>-.byte	0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16</div><div class='del'>-@ rcon[]</div><div class='del'>-.word	0x01000000, 0x02000000, 0x04000000, 0x08000000</div><div class='del'>-.word	0x10000000, 0x20000000, 0x40000000, 0x80000000</div><div class='del'>-.word	0x1B000000, 0x36000000, 0, 0, 0, 0, 0, 0</div><div class='del'>-.size	AES_Te,.-AES_Te</div><div class='del'>-</div><div class='del'>-@ void AES_encrypt(const unsigned char *in, unsigned char *out,</div><div class='del'>-@ 		 const AES_KEY *key) {</div><div class='del'>-.align	5</div><div class='del'>-ENTRY(AES_encrypt)</div><div class='del'>-	adr	r3,AES_encrypt</div><div class='del'>-	stmdb   sp!,{r1,r4-r12,lr}</div><div class='del'>-	mov	r12,r0		@ inp</div><div class='del'>-	mov	r11,r2</div><div class='del'>-	sub	r10,r3,#AES_encrypt-AES_Te	@ Te</div><div class='del'>-#if __ARM_ARCH__&lt;7</div><div class='del'>-	ldrb	r0,[r12,#3]	@ load input data in endian-neutral</div><div class='del'>-	ldrb	r4,[r12,#2]	@ manner...</div><div class='del'>-	ldrb	r5,[r12,#1]</div><div class='del'>-	ldrb	r6,[r12,#0]</div><div class='del'>-	orr	r0,r0,r4,lsl#8</div><div class='del'>-	ldrb	r1,[r12,#7]</div><div class='del'>-	orr	r0,r0,r5,lsl#16</div><div class='del'>-	ldrb	r4,[r12,#6]</div><div class='del'>-	orr	r0,r0,r6,lsl#24</div><div class='del'>-	ldrb	r5,[r12,#5]</div><div class='del'>-	ldrb	r6,[r12,#4]</div><div class='del'>-	orr	r1,r1,r4,lsl#8</div><div class='del'>-	ldrb	r2,[r12,#11]</div><div class='del'>-	orr	r1,r1,r5,lsl#16</div><div class='del'>-	ldrb	r4,[r12,#10]</div><div class='del'>-	orr	r1,r1,r6,lsl#24</div><div class='del'>-	ldrb	r5,[r12,#9]</div><div class='del'>-	ldrb	r6,[r12,#8]</div><div class='del'>-	orr	r2,r2,r4,lsl#8</div><div class='del'>-	ldrb	r3,[r12,#15]</div><div class='del'>-	orr	r2,r2,r5,lsl#16</div><div class='del'>-	ldrb	r4,[r12,#14]</div><div class='del'>-	orr	r2,r2,r6,lsl#24</div><div class='del'>-	ldrb	r5,[r12,#13]</div><div class='del'>-	ldrb	r6,[r12,#12]</div><div class='del'>-	orr	r3,r3,r4,lsl#8</div><div class='del'>-	orr	r3,r3,r5,lsl#16</div><div class='del'>-	orr	r3,r3,r6,lsl#24</div><div class='del'>-#else</div><div class='del'>-	ldr	r0,[r12,#0]</div><div class='del'>-	ldr	r1,[r12,#4]</div><div class='del'>-	ldr	r2,[r12,#8]</div><div class='del'>-	ldr	r3,[r12,#12]</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	rev	r0,r0</div><div class='del'>-	rev	r1,r1</div><div class='del'>-	rev	r2,r2</div><div class='del'>-	rev	r3,r3</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-	bl	_armv4_AES_encrypt</div><div class='del'>-</div><div class='del'>-	ldr	r12,[sp],#4		@ pop out</div><div class='del'>-#if __ARM_ARCH__&gt;=7</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	rev	r0,r0</div><div class='del'>-	rev	r1,r1</div><div class='del'>-	rev	r2,r2</div><div class='del'>-	rev	r3,r3</div><div class='del'>-#endif</div><div class='del'>-	str	r0,[r12,#0]</div><div class='del'>-	str	r1,[r12,#4]</div><div class='del'>-	str	r2,[r12,#8]</div><div class='del'>-	str	r3,[r12,#12]</div><div class='del'>-#else</div><div class='del'>-	mov	r4,r0,lsr#24		@ write output in endian-neutral</div><div class='del'>-	mov	r5,r0,lsr#16		@ manner...</div><div class='del'>-	mov	r6,r0,lsr#8</div><div class='del'>-	strb	r4,[r12,#0]</div><div class='del'>-	strb	r5,[r12,#1]</div><div class='del'>-	mov	r4,r1,lsr#24</div><div class='del'>-	strb	r6,[r12,#2]</div><div class='del'>-	mov	r5,r1,lsr#16</div><div class='del'>-	strb	r0,[r12,#3]</div><div class='del'>-	mov	r6,r1,lsr#8</div><div class='del'>-	strb	r4,[r12,#4]</div><div class='del'>-	strb	r5,[r12,#5]</div><div class='del'>-	mov	r4,r2,lsr#24</div><div class='del'>-	strb	r6,[r12,#6]</div><div class='del'>-	mov	r5,r2,lsr#16</div><div class='del'>-	strb	r1,[r12,#7]</div><div class='del'>-	mov	r6,r2,lsr#8</div><div class='del'>-	strb	r4,[r12,#8]</div><div class='del'>-	strb	r5,[r12,#9]</div><div class='del'>-	mov	r4,r3,lsr#24</div><div class='del'>-	strb	r6,[r12,#10]</div><div class='del'>-	mov	r5,r3,lsr#16</div><div class='del'>-	strb	r2,[r12,#11]</div><div class='del'>-	mov	r6,r3,lsr#8</div><div class='del'>-	strb	r4,[r12,#12]</div><div class='del'>-	strb	r5,[r12,#13]</div><div class='del'>-	strb	r6,[r12,#14]</div><div class='del'>-	strb	r3,[r12,#15]</div><div class='del'>-#endif</div><div class='del'>-	ldmia	sp!,{r4-r12,pc}</div><div class='del'>-ENDPROC(AES_encrypt)</div><div class='del'>-</div><div class='del'>-.type   _armv4_AES_encrypt,%function</div><div class='del'>-.align	2</div><div class='del'>-_armv4_AES_encrypt:</div><div class='del'>-	str	lr,[sp,#-4]!		@ push lr</div><div class='del'>-	ldmia	r11!,{r4-r7}</div><div class='del'>-	eor	r0,r0,r4</div><div class='del'>-	ldr	r12,[r11,#240-16]</div><div class='del'>-	eor	r1,r1,r5</div><div class='del'>-	eor	r2,r2,r6</div><div class='del'>-	eor	r3,r3,r7</div><div class='del'>-	sub	r12,r12,#1</div><div class='del'>-	mov	lr,#255</div><div class='del'>-</div><div class='del'>-	and	r7,lr,r0</div><div class='del'>-	and	r8,lr,r0,lsr#8</div><div class='del'>-	and	r9,lr,r0,lsr#16</div><div class='del'>-	mov	r0,r0,lsr#24</div><div class='del'>-.Lenc_loop:</div><div class='del'>-	ldr	r4,[r10,r7,lsl#2]	@ Te3[s0&gt;&gt;0]</div><div class='del'>-	and	r7,lr,r1,lsr#16	@ i0</div><div class='del'>-	ldr	r5,[r10,r8,lsl#2]	@ Te2[s0&gt;&gt;8]</div><div class='del'>-	and	r8,lr,r1</div><div class='del'>-	ldr	r6,[r10,r9,lsl#2]	@ Te1[s0&gt;&gt;16]</div><div class='del'>-	and	r9,lr,r1,lsr#8</div><div class='del'>-	ldr	r0,[r10,r0,lsl#2]	@ Te0[s0&gt;&gt;24]</div><div class='del'>-	mov	r1,r1,lsr#24</div><div class='del'>-</div><div class='del'>-	ldr	r7,[r10,r7,lsl#2]	@ Te1[s1&gt;&gt;16]</div><div class='del'>-	ldr	r8,[r10,r8,lsl#2]	@ Te3[s1&gt;&gt;0]</div><div class='del'>-	ldr	r9,[r10,r9,lsl#2]	@ Te2[s1&gt;&gt;8]</div><div class='del'>-	eor	r0,r0,r7,ror#8</div><div class='del'>-	ldr	r1,[r10,r1,lsl#2]	@ Te0[s1&gt;&gt;24]</div><div class='del'>-	and	r7,lr,r2,lsr#8	@ i0</div><div class='del'>-	eor	r5,r5,r8,ror#8</div><div class='del'>-	and	r8,lr,r2,lsr#16	@ i1</div><div class='del'>-	eor	r6,r6,r9,ror#8</div><div class='del'>-	and	r9,lr,r2</div><div class='del'>-	ldr	r7,[r10,r7,lsl#2]	@ Te2[s2&gt;&gt;8]</div><div class='del'>-	eor	r1,r1,r4,ror#24</div><div class='del'>-	ldr	r8,[r10,r8,lsl#2]	@ Te1[s2&gt;&gt;16]</div><div class='del'>-	mov	r2,r2,lsr#24</div><div class='del'>-</div><div class='del'>-	ldr	r9,[r10,r9,lsl#2]	@ Te3[s2&gt;&gt;0]</div><div class='del'>-	eor	r0,r0,r7,ror#16</div><div class='del'>-	ldr	r2,[r10,r2,lsl#2]	@ Te0[s2&gt;&gt;24]</div><div class='del'>-	and	r7,lr,r3		@ i0</div><div class='del'>-	eor	r1,r1,r8,ror#8</div><div class='del'>-	and	r8,lr,r3,lsr#8	@ i1</div><div class='del'>-	eor	r6,r6,r9,ror#16</div><div class='del'>-	and	r9,lr,r3,lsr#16	@ i2</div><div class='del'>-	ldr	r7,[r10,r7,lsl#2]	@ Te3[s3&gt;&gt;0]</div><div class='del'>-	eor	r2,r2,r5,ror#16</div><div class='del'>-	ldr	r8,[r10,r8,lsl#2]	@ Te2[s3&gt;&gt;8]</div><div class='del'>-	mov	r3,r3,lsr#24</div><div class='del'>-</div><div class='del'>-	ldr	r9,[r10,r9,lsl#2]	@ Te1[s3&gt;&gt;16]</div><div class='del'>-	eor	r0,r0,r7,ror#24</div><div class='del'>-	ldr	r7,[r11],#16</div><div class='del'>-	eor	r1,r1,r8,ror#16</div><div class='del'>-	ldr	r3,[r10,r3,lsl#2]	@ Te0[s3&gt;&gt;24]</div><div class='del'>-	eor	r2,r2,r9,ror#8</div><div class='del'>-	ldr	r4,[r11,#-12]</div><div class='del'>-	eor	r3,r3,r6,ror#8</div><div class='del'>-</div><div class='del'>-	ldr	r5,[r11,#-8]</div><div class='del'>-	eor	r0,r0,r7</div><div class='del'>-	ldr	r6,[r11,#-4]</div><div class='del'>-	and	r7,lr,r0</div><div class='del'>-	eor	r1,r1,r4</div><div class='del'>-	and	r8,lr,r0,lsr#8</div><div class='del'>-	eor	r2,r2,r5</div><div class='del'>-	and	r9,lr,r0,lsr#16</div><div class='del'>-	eor	r3,r3,r6</div><div class='del'>-	mov	r0,r0,lsr#24</div><div class='del'>-</div><div class='del'>-	subs	r12,r12,#1</div><div class='del'>-	bne	.Lenc_loop</div><div class='del'>-</div><div class='del'>-	add	r10,r10,#2</div><div class='del'>-</div><div class='del'>-	ldrb	r4,[r10,r7,lsl#2]	@ Te4[s0&gt;&gt;0]</div><div class='del'>-	and	r7,lr,r1,lsr#16	@ i0</div><div class='del'>-	ldrb	r5,[r10,r8,lsl#2]	@ Te4[s0&gt;&gt;8]</div><div class='del'>-	and	r8,lr,r1</div><div class='del'>-	ldrb	r6,[r10,r9,lsl#2]	@ Te4[s0&gt;&gt;16]</div><div class='del'>-	and	r9,lr,r1,lsr#8</div><div class='del'>-	ldrb	r0,[r10,r0,lsl#2]	@ Te4[s0&gt;&gt;24]</div><div class='del'>-	mov	r1,r1,lsr#24</div><div class='del'>-</div><div class='del'>-	ldrb	r7,[r10,r7,lsl#2]	@ Te4[s1&gt;&gt;16]</div><div class='del'>-	ldrb	r8,[r10,r8,lsl#2]	@ Te4[s1&gt;&gt;0]</div><div class='del'>-	ldrb	r9,[r10,r9,lsl#2]	@ Te4[s1&gt;&gt;8]</div><div class='del'>-	eor	r0,r7,r0,lsl#8</div><div class='del'>-	ldrb	r1,[r10,r1,lsl#2]	@ Te4[s1&gt;&gt;24]</div><div class='del'>-	and	r7,lr,r2,lsr#8	@ i0</div><div class='del'>-	eor	r5,r8,r5,lsl#8</div><div class='del'>-	and	r8,lr,r2,lsr#16	@ i1</div><div class='del'>-	eor	r6,r9,r6,lsl#8</div><div class='del'>-	and	r9,lr,r2</div><div class='del'>-	ldrb	r7,[r10,r7,lsl#2]	@ Te4[s2&gt;&gt;8]</div><div class='del'>-	eor	r1,r4,r1,lsl#24</div><div class='del'>-	ldrb	r8,[r10,r8,lsl#2]	@ Te4[s2&gt;&gt;16]</div><div class='del'>-	mov	r2,r2,lsr#24</div><div class='del'>-</div><div class='del'>-	ldrb	r9,[r10,r9,lsl#2]	@ Te4[s2&gt;&gt;0]</div><div class='del'>-	eor	r0,r7,r0,lsl#8</div><div class='del'>-	ldrb	r2,[r10,r2,lsl#2]	@ Te4[s2&gt;&gt;24]</div><div class='del'>-	and	r7,lr,r3		@ i0</div><div class='del'>-	eor	r1,r1,r8,lsl#16</div><div class='del'>-	and	r8,lr,r3,lsr#8	@ i1</div><div class='del'>-	eor	r6,r9,r6,lsl#8</div><div class='del'>-	and	r9,lr,r3,lsr#16	@ i2</div><div class='del'>-	ldrb	r7,[r10,r7,lsl#2]	@ Te4[s3&gt;&gt;0]</div><div class='del'>-	eor	r2,r5,r2,lsl#24</div><div class='del'>-	ldrb	r8,[r10,r8,lsl#2]	@ Te4[s3&gt;&gt;8]</div><div class='del'>-	mov	r3,r3,lsr#24</div><div class='del'>-</div><div class='del'>-	ldrb	r9,[r10,r9,lsl#2]	@ Te4[s3&gt;&gt;16]</div><div class='del'>-	eor	r0,r7,r0,lsl#8</div><div class='del'>-	ldr	r7,[r11,#0]</div><div class='del'>-	ldrb	r3,[r10,r3,lsl#2]	@ Te4[s3&gt;&gt;24]</div><div class='del'>-	eor	r1,r1,r8,lsl#8</div><div class='del'>-	ldr	r4,[r11,#4]</div><div class='del'>-	eor	r2,r2,r9,lsl#16</div><div class='del'>-	ldr	r5,[r11,#8]</div><div class='del'>-	eor	r3,r6,r3,lsl#24</div><div class='del'>-	ldr	r6,[r11,#12]</div><div class='del'>-</div><div class='del'>-	eor	r0,r0,r7</div><div class='del'>-	eor	r1,r1,r4</div><div class='del'>-	eor	r2,r2,r5</div><div class='del'>-	eor	r3,r3,r6</div><div class='del'>-</div><div class='del'>-	sub	r10,r10,#2</div><div class='del'>-	ldr	pc,[sp],#4		@ pop and return</div><div class='del'>-.size	_armv4_AES_encrypt,.-_armv4_AES_encrypt</div><div class='del'>-</div><div class='del'>-.align	5</div><div class='del'>-ENTRY(private_AES_set_encrypt_key)</div><div class='del'>-_armv4_AES_set_encrypt_key:</div><div class='del'>-	adr	r3,_armv4_AES_set_encrypt_key</div><div class='del'>-	teq	r0,#0</div><div class='del'>-	moveq	r0,#-1</div><div class='del'>-	beq	.Labrt</div><div class='del'>-	teq	r2,#0</div><div class='del'>-	moveq	r0,#-1</div><div class='del'>-	beq	.Labrt</div><div class='del'>-</div><div class='del'>-	teq	r1,#128</div><div class='del'>-	beq	.Lok</div><div class='del'>-	teq	r1,#192</div><div class='del'>-	beq	.Lok</div><div class='del'>-	teq	r1,#256</div><div class='del'>-	movne	r0,#-1</div><div class='del'>-	bne	.Labrt</div><div class='del'>-</div><div class='del'>-.Lok:	stmdb   sp!,{r4-r12,lr}</div><div class='del'>-	sub	r10,r3,#_armv4_AES_set_encrypt_key-AES_Te-1024	@ Te4</div><div class='del'>-</div><div class='del'>-	mov	r12,r0		@ inp</div><div class='del'>-	mov	lr,r1			@ bits</div><div class='del'>-	mov	r11,r2			@ key</div><div class='del'>-</div><div class='del'>-#if __ARM_ARCH__&lt;7</div><div class='del'>-	ldrb	r0,[r12,#3]	@ load input data in endian-neutral</div><div class='del'>-	ldrb	r4,[r12,#2]	@ manner...</div><div class='del'>-	ldrb	r5,[r12,#1]</div><div class='del'>-	ldrb	r6,[r12,#0]</div><div class='del'>-	orr	r0,r0,r4,lsl#8</div><div class='del'>-	ldrb	r1,[r12,#7]</div><div class='del'>-	orr	r0,r0,r5,lsl#16</div><div class='del'>-	ldrb	r4,[r12,#6]</div><div class='del'>-	orr	r0,r0,r6,lsl#24</div><div class='del'>-	ldrb	r5,[r12,#5]</div><div class='del'>-	ldrb	r6,[r12,#4]</div><div class='del'>-	orr	r1,r1,r4,lsl#8</div><div class='del'>-	ldrb	r2,[r12,#11]</div><div class='del'>-	orr	r1,r1,r5,lsl#16</div><div class='del'>-	ldrb	r4,[r12,#10]</div><div class='del'>-	orr	r1,r1,r6,lsl#24</div><div class='del'>-	ldrb	r5,[r12,#9]</div><div class='del'>-	ldrb	r6,[r12,#8]</div><div class='del'>-	orr	r2,r2,r4,lsl#8</div><div class='del'>-	ldrb	r3,[r12,#15]</div><div class='del'>-	orr	r2,r2,r5,lsl#16</div><div class='del'>-	ldrb	r4,[r12,#14]</div><div class='del'>-	orr	r2,r2,r6,lsl#24</div><div class='del'>-	ldrb	r5,[r12,#13]</div><div class='del'>-	ldrb	r6,[r12,#12]</div><div class='del'>-	orr	r3,r3,r4,lsl#8</div><div class='del'>-	str	r0,[r11],#16</div><div class='del'>-	orr	r3,r3,r5,lsl#16</div><div class='del'>-	str	r1,[r11,#-12]</div><div class='del'>-	orr	r3,r3,r6,lsl#24</div><div class='del'>-	str	r2,[r11,#-8]</div><div class='del'>-	str	r3,[r11,#-4]</div><div class='del'>-#else</div><div class='del'>-	ldr	r0,[r12,#0]</div><div class='del'>-	ldr	r1,[r12,#4]</div><div class='del'>-	ldr	r2,[r12,#8]</div><div class='del'>-	ldr	r3,[r12,#12]</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	rev	r0,r0</div><div class='del'>-	rev	r1,r1</div><div class='del'>-	rev	r2,r2</div><div class='del'>-	rev	r3,r3</div><div class='del'>-#endif</div><div class='del'>-	str	r0,[r11],#16</div><div class='del'>-	str	r1,[r11,#-12]</div><div class='del'>-	str	r2,[r11,#-8]</div><div class='del'>-	str	r3,[r11,#-4]</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	teq	lr,#128</div><div class='del'>-	bne	.Lnot128</div><div class='del'>-	mov	r12,#10</div><div class='del'>-	str	r12,[r11,#240-16]</div><div class='del'>-	add	r6,r10,#256			@ rcon</div><div class='del'>-	mov	lr,#255</div><div class='del'>-</div><div class='del'>-.L128_loop:</div><div class='del'>-	and	r5,lr,r3,lsr#24</div><div class='del'>-	and	r7,lr,r3,lsr#16</div><div class='del'>-	ldrb	r5,[r10,r5]</div><div class='del'>-	and	r8,lr,r3,lsr#8</div><div class='del'>-	ldrb	r7,[r10,r7]</div><div class='del'>-	and	r9,lr,r3</div><div class='del'>-	ldrb	r8,[r10,r8]</div><div class='del'>-	orr	r5,r5,r7,lsl#24</div><div class='del'>-	ldrb	r9,[r10,r9]</div><div class='del'>-	orr	r5,r5,r8,lsl#16</div><div class='del'>-	ldr	r4,[r6],#4			@ rcon[i++]</div><div class='del'>-	orr	r5,r5,r9,lsl#8</div><div class='del'>-	eor	r5,r5,r4</div><div class='del'>-	eor	r0,r0,r5			@ rk[4]=rk[0]^...</div><div class='del'>-	eor	r1,r1,r0			@ rk[5]=rk[1]^rk[4]</div><div class='del'>-	str	r0,[r11],#16</div><div class='del'>-	eor	r2,r2,r1			@ rk[6]=rk[2]^rk[5]</div><div class='del'>-	str	r1,[r11,#-12]</div><div class='del'>-	eor	r3,r3,r2			@ rk[7]=rk[3]^rk[6]</div><div class='del'>-	str	r2,[r11,#-8]</div><div class='del'>-	subs	r12,r12,#1</div><div class='del'>-	str	r3,[r11,#-4]</div><div class='del'>-	bne	.L128_loop</div><div class='del'>-	sub	r2,r11,#176</div><div class='del'>-	b	.Ldone</div><div class='del'>-</div><div class='del'>-.Lnot128:</div><div class='del'>-#if __ARM_ARCH__&lt;7</div><div class='del'>-	ldrb	r8,[r12,#19]</div><div class='del'>-	ldrb	r4,[r12,#18]</div><div class='del'>-	ldrb	r5,[r12,#17]</div><div class='del'>-	ldrb	r6,[r12,#16]</div><div class='del'>-	orr	r8,r8,r4,lsl#8</div><div class='del'>-	ldrb	r9,[r12,#23]</div><div class='del'>-	orr	r8,r8,r5,lsl#16</div><div class='del'>-	ldrb	r4,[r12,#22]</div><div class='del'>-	orr	r8,r8,r6,lsl#24</div><div class='del'>-	ldrb	r5,[r12,#21]</div><div class='del'>-	ldrb	r6,[r12,#20]</div><div class='del'>-	orr	r9,r9,r4,lsl#8</div><div class='del'>-	orr	r9,r9,r5,lsl#16</div><div class='del'>-	str	r8,[r11],#8</div><div class='del'>-	orr	r9,r9,r6,lsl#24</div><div class='del'>-	str	r9,[r11,#-4]</div><div class='del'>-#else</div><div class='del'>-	ldr	r8,[r12,#16]</div><div class='del'>-	ldr	r9,[r12,#20]</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	rev	r8,r8</div><div class='del'>-	rev	r9,r9</div><div class='del'>-#endif</div><div class='del'>-	str	r8,[r11],#8</div><div class='del'>-	str	r9,[r11,#-4]</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	teq	lr,#192</div><div class='del'>-	bne	.Lnot192</div><div class='del'>-	mov	r12,#12</div><div class='del'>-	str	r12,[r11,#240-24]</div><div class='del'>-	add	r6,r10,#256			@ rcon</div><div class='del'>-	mov	lr,#255</div><div class='del'>-	mov	r12,#8</div><div class='del'>-</div><div class='del'>-.L192_loop:</div><div class='del'>-	and	r5,lr,r9,lsr#24</div><div class='del'>-	and	r7,lr,r9,lsr#16</div><div class='del'>-	ldrb	r5,[r10,r5]</div><div class='del'>-	and	r8,lr,r9,lsr#8</div><div class='del'>-	ldrb	r7,[r10,r7]</div><div class='del'>-	and	r9,lr,r9</div><div class='del'>-	ldrb	r8,[r10,r8]</div><div class='del'>-	orr	r5,r5,r7,lsl#24</div><div class='del'>-	ldrb	r9,[r10,r9]</div><div class='del'>-	orr	r5,r5,r8,lsl#16</div><div class='del'>-	ldr	r4,[r6],#4			@ rcon[i++]</div><div class='del'>-	orr	r5,r5,r9,lsl#8</div><div class='del'>-	eor	r9,r5,r4</div><div class='del'>-	eor	r0,r0,r9			@ rk[6]=rk[0]^...</div><div class='del'>-	eor	r1,r1,r0			@ rk[7]=rk[1]^rk[6]</div><div class='del'>-	str	r0,[r11],#24</div><div class='del'>-	eor	r2,r2,r1			@ rk[8]=rk[2]^rk[7]</div><div class='del'>-	str	r1,[r11,#-20]</div><div class='del'>-	eor	r3,r3,r2			@ rk[9]=rk[3]^rk[8]</div><div class='del'>-	str	r2,[r11,#-16]</div><div class='del'>-	subs	r12,r12,#1</div><div class='del'>-	str	r3,[r11,#-12]</div><div class='del'>-	subeq	r2,r11,#216</div><div class='del'>-	beq	.Ldone</div><div class='del'>-</div><div class='del'>-	ldr	r7,[r11,#-32]</div><div class='del'>-	ldr	r8,[r11,#-28]</div><div class='del'>-	eor	r7,r7,r3			@ rk[10]=rk[4]^rk[9]</div><div class='del'>-	eor	r9,r8,r7			@ rk[11]=rk[5]^rk[10]</div><div class='del'>-	str	r7,[r11,#-8]</div><div class='del'>-	str	r9,[r11,#-4]</div><div class='del'>-	b	.L192_loop</div><div class='del'>-</div><div class='del'>-.Lnot192:</div><div class='del'>-#if __ARM_ARCH__&lt;7</div><div class='del'>-	ldrb	r8,[r12,#27]</div><div class='del'>-	ldrb	r4,[r12,#26]</div><div class='del'>-	ldrb	r5,[r12,#25]</div><div class='del'>-	ldrb	r6,[r12,#24]</div><div class='del'>-	orr	r8,r8,r4,lsl#8</div><div class='del'>-	ldrb	r9,[r12,#31]</div><div class='del'>-	orr	r8,r8,r5,lsl#16</div><div class='del'>-	ldrb	r4,[r12,#30]</div><div class='del'>-	orr	r8,r8,r6,lsl#24</div><div class='del'>-	ldrb	r5,[r12,#29]</div><div class='del'>-	ldrb	r6,[r12,#28]</div><div class='del'>-	orr	r9,r9,r4,lsl#8</div><div class='del'>-	orr	r9,r9,r5,lsl#16</div><div class='del'>-	str	r8,[r11],#8</div><div class='del'>-	orr	r9,r9,r6,lsl#24</div><div class='del'>-	str	r9,[r11,#-4]</div><div class='del'>-#else</div><div class='del'>-	ldr	r8,[r12,#24]</div><div class='del'>-	ldr	r9,[r12,#28]</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	rev	r8,r8</div><div class='del'>-	rev	r9,r9</div><div class='del'>-#endif</div><div class='del'>-	str	r8,[r11],#8</div><div class='del'>-	str	r9,[r11,#-4]</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	mov	r12,#14</div><div class='del'>-	str	r12,[r11,#240-32]</div><div class='del'>-	add	r6,r10,#256			@ rcon</div><div class='del'>-	mov	lr,#255</div><div class='del'>-	mov	r12,#7</div><div class='del'>-</div><div class='del'>-.L256_loop:</div><div class='del'>-	and	r5,lr,r9,lsr#24</div><div class='del'>-	and	r7,lr,r9,lsr#16</div><div class='del'>-	ldrb	r5,[r10,r5]</div><div class='del'>-	and	r8,lr,r9,lsr#8</div><div class='del'>-	ldrb	r7,[r10,r7]</div><div class='del'>-	and	r9,lr,r9</div><div class='del'>-	ldrb	r8,[r10,r8]</div><div class='del'>-	orr	r5,r5,r7,lsl#24</div><div class='del'>-	ldrb	r9,[r10,r9]</div><div class='del'>-	orr	r5,r5,r8,lsl#16</div><div class='del'>-	ldr	r4,[r6],#4			@ rcon[i++]</div><div class='del'>-	orr	r5,r5,r9,lsl#8</div><div class='del'>-	eor	r9,r5,r4</div><div class='del'>-	eor	r0,r0,r9			@ rk[8]=rk[0]^...</div><div class='del'>-	eor	r1,r1,r0			@ rk[9]=rk[1]^rk[8]</div><div class='del'>-	str	r0,[r11],#32</div><div class='del'>-	eor	r2,r2,r1			@ rk[10]=rk[2]^rk[9]</div><div class='del'>-	str	r1,[r11,#-28]</div><div class='del'>-	eor	r3,r3,r2			@ rk[11]=rk[3]^rk[10]</div><div class='del'>-	str	r2,[r11,#-24]</div><div class='del'>-	subs	r12,r12,#1</div><div class='del'>-	str	r3,[r11,#-20]</div><div class='del'>-	subeq	r2,r11,#256</div><div class='del'>-	beq	.Ldone</div><div class='del'>-</div><div class='del'>-	and	r5,lr,r3</div><div class='del'>-	and	r7,lr,r3,lsr#8</div><div class='del'>-	ldrb	r5,[r10,r5]</div><div class='del'>-	and	r8,lr,r3,lsr#16</div><div class='del'>-	ldrb	r7,[r10,r7]</div><div class='del'>-	and	r9,lr,r3,lsr#24</div><div class='del'>-	ldrb	r8,[r10,r8]</div><div class='del'>-	orr	r5,r5,r7,lsl#8</div><div class='del'>-	ldrb	r9,[r10,r9]</div><div class='del'>-	orr	r5,r5,r8,lsl#16</div><div class='del'>-	ldr	r4,[r11,#-48]</div><div class='del'>-	orr	r5,r5,r9,lsl#24</div><div class='del'>-</div><div class='del'>-	ldr	r7,[r11,#-44]</div><div class='del'>-	ldr	r8,[r11,#-40]</div><div class='del'>-	eor	r4,r4,r5			@ rk[12]=rk[4]^...</div><div class='del'>-	ldr	r9,[r11,#-36]</div><div class='del'>-	eor	r7,r7,r4			@ rk[13]=rk[5]^rk[12]</div><div class='del'>-	str	r4,[r11,#-16]</div><div class='del'>-	eor	r8,r8,r7			@ rk[14]=rk[6]^rk[13]</div><div class='del'>-	str	r7,[r11,#-12]</div><div class='del'>-	eor	r9,r9,r8			@ rk[15]=rk[7]^rk[14]</div><div class='del'>-	str	r8,[r11,#-8]</div><div class='del'>-	str	r9,[r11,#-4]</div><div class='del'>-	b	.L256_loop</div><div class='del'>-</div><div class='del'>-.Ldone:	mov	r0,#0</div><div class='del'>-	ldmia   sp!,{r4-r12,lr}</div><div class='del'>-.Labrt:	ret	lr</div><div class='del'>-ENDPROC(private_AES_set_encrypt_key)</div><div class='del'>-</div><div class='del'>-.align	5</div><div class='del'>-ENTRY(private_AES_set_decrypt_key)</div><div class='del'>-	str	lr,[sp,#-4]!            @ push lr</div><div class='del'>-#if 0</div><div class='del'>-	@ kernel does both of these in setkey so optimise this bit out by</div><div class='del'>-	@ expecting the key to already have the enc_key work done (see aes_glue.c)</div><div class='del'>-	bl	_armv4_AES_set_encrypt_key</div><div class='del'>-#else</div><div class='del'>-	mov	r0,#0</div><div class='del'>-#endif</div><div class='del'>-	teq	r0,#0</div><div class='del'>-	ldrne	lr,[sp],#4              @ pop lr</div><div class='del'>-	bne	.Labrt</div><div class='del'>-</div><div class='del'>-	stmdb   sp!,{r4-r12}</div><div class='del'>-</div><div class='del'>-	ldr	r12,[r2,#240]	@ AES_set_encrypt_key preserves r2,</div><div class='del'>-	mov	r11,r2			@ which is AES_KEY *key</div><div class='del'>-	mov	r7,r2</div><div class='del'>-	add	r8,r2,r12,lsl#4</div><div class='del'>-</div><div class='del'>-.Linv:	ldr	r0,[r7]</div><div class='del'>-	ldr	r1,[r7,#4]</div><div class='del'>-	ldr	r2,[r7,#8]</div><div class='del'>-	ldr	r3,[r7,#12]</div><div class='del'>-	ldr	r4,[r8]</div><div class='del'>-	ldr	r5,[r8,#4]</div><div class='del'>-	ldr	r6,[r8,#8]</div><div class='del'>-	ldr	r9,[r8,#12]</div><div class='del'>-	str	r0,[r8],#-16</div><div class='del'>-	str	r1,[r8,#16+4]</div><div class='del'>-	str	r2,[r8,#16+8]</div><div class='del'>-	str	r3,[r8,#16+12]</div><div class='del'>-	str	r4,[r7],#16</div><div class='del'>-	str	r5,[r7,#-12]</div><div class='del'>-	str	r6,[r7,#-8]</div><div class='del'>-	str	r9,[r7,#-4]</div><div class='del'>-	teq	r7,r8</div><div class='del'>-	bne	.Linv</div><div class='del'>-	ldr	r0,[r11,#16]!		@ prefetch tp1</div><div class='del'>-	mov	r7,#0x80</div><div class='del'>-	mov	r8,#0x1b</div><div class='del'>-	orr	r7,r7,#0x8000</div><div class='del'>-	orr	r8,r8,#0x1b00</div><div class='del'>-	orr	r7,r7,r7,lsl#16</div><div class='del'>-	orr	r8,r8,r8,lsl#16</div><div class='del'>-	sub	r12,r12,#1</div><div class='del'>-	mvn	r9,r7</div><div class='del'>-	mov	r12,r12,lsl#2	@ (rounds-1)*4</div><div class='del'>-</div><div class='del'>-.Lmix:	and	r4,r0,r7</div><div class='del'>-	and	r1,r0,r9</div><div class='del'>-	sub	r4,r4,r4,lsr#7</div><div class='del'>-	and	r4,r4,r8</div><div class='del'>-	eor	r1,r4,r1,lsl#1	@ tp2</div><div class='del'>-</div><div class='del'>-	and	r4,r1,r7</div><div class='del'>-	and	r2,r1,r9</div><div class='del'>-	sub	r4,r4,r4,lsr#7</div><div class='del'>-	and	r4,r4,r8</div><div class='del'>-	eor	r2,r4,r2,lsl#1	@ tp4</div><div class='del'>-</div><div class='del'>-	and	r4,r2,r7</div><div class='del'>-	and	r3,r2,r9</div><div class='del'>-	sub	r4,r4,r4,lsr#7</div><div class='del'>-	and	r4,r4,r8</div><div class='del'>-	eor	r3,r4,r3,lsl#1	@ tp8</div><div class='del'>-</div><div class='del'>-	eor	r4,r1,r2</div><div class='del'>-	eor	r5,r0,r3		@ tp9</div><div class='del'>-	eor	r4,r4,r3		@ tpe</div><div class='del'>-	eor	r4,r4,r1,ror#24</div><div class='del'>-	eor	r4,r4,r5,ror#24	@ ^= ROTATE(tpb=tp9^tp2,8)</div><div class='del'>-	eor	r4,r4,r2,ror#16</div><div class='del'>-	eor	r4,r4,r5,ror#16	@ ^= ROTATE(tpd=tp9^tp4,16)</div><div class='del'>-	eor	r4,r4,r5,ror#8	@ ^= ROTATE(tp9,24)</div><div class='del'>-</div><div class='del'>-	ldr	r0,[r11,#4]		@ prefetch tp1</div><div class='del'>-	str	r4,[r11],#4</div><div class='del'>-	subs	r12,r12,#1</div><div class='del'>-	bne	.Lmix</div><div class='del'>-</div><div class='del'>-	mov	r0,#0</div><div class='del'>-	ldmia	sp!,{r4-r12,pc}</div><div class='del'>-ENDPROC(private_AES_set_decrypt_key)</div><div class='del'>-</div><div class='del'>-.type	AES_Td,%object</div><div class='del'>-.align	5</div><div class='del'>-AES_Td:</div><div class='del'>-.word	0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96</div><div class='del'>-.word	0x3bab6bcb, 0x1f9d45f1, 0xacfa58ab, 0x4be30393</div><div class='del'>-.word	0x2030fa55, 0xad766df6, 0x88cc7691, 0xf5024c25</div><div class='del'>-.word	0x4fe5d7fc, 0xc52acbd7, 0x26354480, 0xb562a38f</div><div class='del'>-.word	0xdeb15a49, 0x25ba1b67, 0x45ea0e98, 0x5dfec0e1</div><div class='del'>-.word	0xc32f7502, 0x814cf012, 0x8d4697a3, 0x6bd3f9c6</div><div class='del'>-.word	0x038f5fe7, 0x15929c95, 0xbf6d7aeb, 0x955259da</div><div class='del'>-.word	0xd4be832d, 0x587421d3, 0x49e06929, 0x8ec9c844</div><div class='del'>-.word	0x75c2896a, 0xf48e7978, 0x99583e6b, 0x27b971dd</div><div class='del'>-.word	0xbee14fb6, 0xf088ad17, 0xc920ac66, 0x7dce3ab4</div><div class='del'>-.word	0x63df4a18, 0xe51a3182, 0x97513360, 0x62537f45</div><div class='del'>-.word	0xb16477e0, 0xbb6bae84, 0xfe81a01c, 0xf9082b94</div><div class='del'>-.word	0x70486858, 0x8f45fd19, 0x94de6c87, 0x527bf8b7</div><div class='del'>-.word	0xab73d323, 0x724b02e2, 0xe31f8f57, 0x6655ab2a</div><div class='del'>-.word	0xb2eb2807, 0x2fb5c203, 0x86c57b9a, 0xd33708a5</div><div class='del'>-.word	0x302887f2, 0x23bfa5b2, 0x02036aba, 0xed16825c</div><div class='del'>-.word	0x8acf1c2b, 0xa779b492, 0xf307f2f0, 0x4e69e2a1</div><div class='del'>-.word	0x65daf4cd, 0x0605bed5, 0xd134621f, 0xc4a6fe8a</div><div class='del'>-.word	0x342e539d, 0xa2f355a0, 0x058ae132, 0xa4f6eb75</div><div class='del'>-.word	0x0b83ec39, 0x4060efaa, 0x5e719f06, 0xbd6e1051</div><div class='del'>-.word	0x3e218af9, 0x96dd063d, 0xdd3e05ae, 0x4de6bd46</div><div class='del'>-.word	0x91548db5, 0x71c45d05, 0x0406d46f, 0x605015ff</div><div class='del'>-.word	0x1998fb24, 0xd6bde997, 0x894043cc, 0x67d99e77</div><div class='del'>-.word	0xb0e842bd, 0x07898b88, 0xe7195b38, 0x79c8eedb</div><div class='del'>-.word	0xa17c0a47, 0x7c420fe9, 0xf8841ec9, 0x00000000</div><div class='del'>-.word	0x09808683, 0x322bed48, 0x1e1170ac, 0x6c5a724e</div><div class='del'>-.word	0xfd0efffb, 0x0f853856, 0x3daed51e, 0x362d3927</div><div class='del'>-.word	0x0a0fd964, 0x685ca621, 0x9b5b54d1, 0x24362e3a</div><div class='del'>-.word	0x0c0a67b1, 0x9357e70f, 0xb4ee96d2, 0x1b9b919e</div><div class='del'>-.word	0x80c0c54f, 0x61dc20a2, 0x5a774b69, 0x1c121a16</div><div class='del'>-.word	0xe293ba0a, 0xc0a02ae5, 0x3c22e043, 0x121b171d</div><div class='del'>-.word	0x0e090d0b, 0xf28bc7ad, 0x2db6a8b9, 0x141ea9c8</div><div class='del'>-.word	0x57f11985, 0xaf75074c, 0xee99ddbb, 0xa37f60fd</div><div class='del'>-.word	0xf701269f, 0x5c72f5bc, 0x44663bc5, 0x5bfb7e34</div><div class='del'>-.word	0x8b432976, 0xcb23c6dc, 0xb6edfc68, 0xb8e4f163</div><div class='del'>-.word	0xd731dcca, 0x42638510, 0x13972240, 0x84c61120</div><div class='del'>-.word	0x854a247d, 0xd2bb3df8, 0xaef93211, 0xc729a16d</div><div class='del'>-.word	0x1d9e2f4b, 0xdcb230f3, 0x0d8652ec, 0x77c1e3d0</div><div class='del'>-.word	0x2bb3166c, 0xa970b999, 0x119448fa, 0x47e96422</div><div class='del'>-.word	0xa8fc8cc4, 0xa0f03f1a, 0x567d2cd8, 0x223390ef</div><div class='del'>-.word	0x87494ec7, 0xd938d1c1, 0x8ccaa2fe, 0x98d40b36</div><div class='del'>-.word	0xa6f581cf, 0xa57ade28, 0xdab78e26, 0x3fadbfa4</div><div class='del'>-.word	0x2c3a9de4, 0x5078920d, 0x6a5fcc9b, 0x547e4662</div><div class='del'>-.word	0xf68d13c2, 0x90d8b8e8, 0x2e39f75e, 0x82c3aff5</div><div class='del'>-.word	0x9f5d80be, 0x69d0937c, 0x6fd52da9, 0xcf2512b3</div><div class='del'>-.word	0xc8ac993b, 0x10187da7, 0xe89c636e, 0xdb3bbb7b</div><div class='del'>-.word	0xcd267809, 0x6e5918f4, 0xec9ab701, 0x834f9aa8</div><div class='del'>-.word	0xe6956e65, 0xaaffe67e, 0x21bccf08, 0xef15e8e6</div><div class='del'>-.word	0xbae79bd9, 0x4a6f36ce, 0xea9f09d4, 0x29b07cd6</div><div class='del'>-.word	0x31a4b2af, 0x2a3f2331, 0xc6a59430, 0x35a266c0</div><div class='del'>-.word	0x744ebc37, 0xfc82caa6, 0xe090d0b0, 0x33a7d815</div><div class='del'>-.word	0xf104984a, 0x41ecdaf7, 0x7fcd500e, 0x1791f62f</div><div class='del'>-.word	0x764dd68d, 0x43efb04d, 0xccaa4d54, 0xe49604df</div><div class='del'>-.word	0x9ed1b5e3, 0x4c6a881b, 0xc12c1fb8, 0x4665517f</div><div class='del'>-.word	0x9d5eea04, 0x018c355d, 0xfa877473, 0xfb0b412e</div><div class='del'>-.word	0xb3671d5a, 0x92dbd252, 0xe9105633, 0x6dd64713</div><div class='del'>-.word	0x9ad7618c, 0x37a10c7a, 0x59f8148e, 0xeb133c89</div><div class='del'>-.word	0xcea927ee, 0xb761c935, 0xe11ce5ed, 0x7a47b13c</div><div class='del'>-.word	0x9cd2df59, 0x55f2733f, 0x1814ce79, 0x73c737bf</div><div class='del'>-.word	0x53f7cdea, 0x5ffdaa5b, 0xdf3d6f14, 0x7844db86</div><div class='del'>-.word	0xcaaff381, 0xb968c43e, 0x3824342c, 0xc2a3405f</div><div class='del'>-.word	0x161dc372, 0xbce2250c, 0x283c498b, 0xff0d9541</div><div class='del'>-.word	0x39a80171, 0x080cb3de, 0xd8b4e49c, 0x6456c190</div><div class='del'>-.word	0x7bcb8461, 0xd532b670, 0x486c5c74, 0xd0b85742</div><div class='del'>-@ Td4[256]</div><div class='del'>-.byte	0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38</div><div class='del'>-.byte	0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb</div><div class='del'>-.byte	0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87</div><div class='del'>-.byte	0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb</div><div class='del'>-.byte	0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d</div><div class='del'>-.byte	0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e</div><div class='del'>-.byte	0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2</div><div class='del'>-.byte	0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25</div><div class='del'>-.byte	0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16</div><div class='del'>-.byte	0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92</div><div class='del'>-.byte	0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda</div><div class='del'>-.byte	0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84</div><div class='del'>-.byte	0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a</div><div class='del'>-.byte	0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06</div><div class='del'>-.byte	0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02</div><div class='del'>-.byte	0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b</div><div class='del'>-.byte	0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea</div><div class='del'>-.byte	0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73</div><div class='del'>-.byte	0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85</div><div class='del'>-.byte	0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e</div><div class='del'>-.byte	0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89</div><div class='del'>-.byte	0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b</div><div class='del'>-.byte	0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20</div><div class='del'>-.byte	0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4</div><div class='del'>-.byte	0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31</div><div class='del'>-.byte	0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f</div><div class='del'>-.byte	0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d</div><div class='del'>-.byte	0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef</div><div class='del'>-.byte	0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0</div><div class='del'>-.byte	0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61</div><div class='del'>-.byte	0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26</div><div class='del'>-.byte	0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d</div><div class='del'>-.size	AES_Td,.-AES_Td</div><div class='del'>-</div><div class='del'>-@ void AES_decrypt(const unsigned char *in, unsigned char *out,</div><div class='del'>-@ 		 const AES_KEY *key) {</div><div class='del'>-.align	5</div><div class='del'>-ENTRY(AES_decrypt)</div><div class='del'>-	adr	r3,AES_decrypt</div><div class='del'>-	stmdb   sp!,{r1,r4-r12,lr}</div><div class='del'>-	mov	r12,r0		@ inp</div><div class='del'>-	mov	r11,r2</div><div class='del'>-	sub	r10,r3,#AES_decrypt-AES_Td		@ Td</div><div class='del'>-#if __ARM_ARCH__&lt;7</div><div class='del'>-	ldrb	r0,[r12,#3]	@ load input data in endian-neutral</div><div class='del'>-	ldrb	r4,[r12,#2]	@ manner...</div><div class='del'>-	ldrb	r5,[r12,#1]</div><div class='del'>-	ldrb	r6,[r12,#0]</div><div class='del'>-	orr	r0,r0,r4,lsl#8</div><div class='del'>-	ldrb	r1,[r12,#7]</div><div class='del'>-	orr	r0,r0,r5,lsl#16</div><div class='del'>-	ldrb	r4,[r12,#6]</div><div class='del'>-	orr	r0,r0,r6,lsl#24</div><div class='del'>-	ldrb	r5,[r12,#5]</div><div class='del'>-	ldrb	r6,[r12,#4]</div><div class='del'>-	orr	r1,r1,r4,lsl#8</div><div class='del'>-	ldrb	r2,[r12,#11]</div><div class='del'>-	orr	r1,r1,r5,lsl#16</div><div class='del'>-	ldrb	r4,[r12,#10]</div><div class='del'>-	orr	r1,r1,r6,lsl#24</div><div class='del'>-	ldrb	r5,[r12,#9]</div><div class='del'>-	ldrb	r6,[r12,#8]</div><div class='del'>-	orr	r2,r2,r4,lsl#8</div><div class='del'>-	ldrb	r3,[r12,#15]</div><div class='del'>-	orr	r2,r2,r5,lsl#16</div><div class='del'>-	ldrb	r4,[r12,#14]</div><div class='del'>-	orr	r2,r2,r6,lsl#24</div><div class='del'>-	ldrb	r5,[r12,#13]</div><div class='del'>-	ldrb	r6,[r12,#12]</div><div class='del'>-	orr	r3,r3,r4,lsl#8</div><div class='del'>-	orr	r3,r3,r5,lsl#16</div><div class='del'>-	orr	r3,r3,r6,lsl#24</div><div class='del'>-#else</div><div class='del'>-	ldr	r0,[r12,#0]</div><div class='del'>-	ldr	r1,[r12,#4]</div><div class='del'>-	ldr	r2,[r12,#8]</div><div class='del'>-	ldr	r3,[r12,#12]</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	rev	r0,r0</div><div class='del'>-	rev	r1,r1</div><div class='del'>-	rev	r2,r2</div><div class='del'>-	rev	r3,r3</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-	bl	_armv4_AES_decrypt</div><div class='del'>-</div><div class='del'>-	ldr	r12,[sp],#4		@ pop out</div><div class='del'>-#if __ARM_ARCH__&gt;=7</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	rev	r0,r0</div><div class='del'>-	rev	r1,r1</div><div class='del'>-	rev	r2,r2</div><div class='del'>-	rev	r3,r3</div><div class='del'>-#endif</div><div class='del'>-	str	r0,[r12,#0]</div><div class='del'>-	str	r1,[r12,#4]</div><div class='del'>-	str	r2,[r12,#8]</div><div class='del'>-	str	r3,[r12,#12]</div><div class='del'>-#else</div><div class='del'>-	mov	r4,r0,lsr#24		@ write output in endian-neutral</div><div class='del'>-	mov	r5,r0,lsr#16		@ manner...</div><div class='del'>-	mov	r6,r0,lsr#8</div><div class='del'>-	strb	r4,[r12,#0]</div><div class='del'>-	strb	r5,[r12,#1]</div><div class='del'>-	mov	r4,r1,lsr#24</div><div class='del'>-	strb	r6,[r12,#2]</div><div class='del'>-	mov	r5,r1,lsr#16</div><div class='del'>-	strb	r0,[r12,#3]</div><div class='del'>-	mov	r6,r1,lsr#8</div><div class='del'>-	strb	r4,[r12,#4]</div><div class='del'>-	strb	r5,[r12,#5]</div><div class='del'>-	mov	r4,r2,lsr#24</div><div class='del'>-	strb	r6,[r12,#6]</div><div class='del'>-	mov	r5,r2,lsr#16</div><div class='del'>-	strb	r1,[r12,#7]</div><div class='del'>-	mov	r6,r2,lsr#8</div><div class='del'>-	strb	r4,[r12,#8]</div><div class='del'>-	strb	r5,[r12,#9]</div><div class='del'>-	mov	r4,r3,lsr#24</div><div class='del'>-	strb	r6,[r12,#10]</div><div class='del'>-	mov	r5,r3,lsr#16</div><div class='del'>-	strb	r2,[r12,#11]</div><div class='del'>-	mov	r6,r3,lsr#8</div><div class='del'>-	strb	r4,[r12,#12]</div><div class='del'>-	strb	r5,[r12,#13]</div><div class='del'>-	strb	r6,[r12,#14]</div><div class='del'>-	strb	r3,[r12,#15]</div><div class='del'>-#endif</div><div class='del'>-	ldmia	sp!,{r4-r12,pc}</div><div class='del'>-ENDPROC(AES_decrypt)</div><div class='del'>-</div><div class='del'>-.type   _armv4_AES_decrypt,%function</div><div class='del'>-.align	2</div><div class='del'>-_armv4_AES_decrypt:</div><div class='del'>-	str	lr,[sp,#-4]!		@ push lr</div><div class='del'>-	ldmia	r11!,{r4-r7}</div><div class='del'>-	eor	r0,r0,r4</div><div class='del'>-	ldr	r12,[r11,#240-16]</div><div class='del'>-	eor	r1,r1,r5</div><div class='del'>-	eor	r2,r2,r6</div><div class='del'>-	eor	r3,r3,r7</div><div class='del'>-	sub	r12,r12,#1</div><div class='del'>-	mov	lr,#255</div><div class='del'>-</div><div class='del'>-	and	r7,lr,r0,lsr#16</div><div class='del'>-	and	r8,lr,r0,lsr#8</div><div class='del'>-	and	r9,lr,r0</div><div class='del'>-	mov	r0,r0,lsr#24</div><div class='del'>-.Ldec_loop:</div><div class='del'>-	ldr	r4,[r10,r7,lsl#2]	@ Td1[s0&gt;&gt;16]</div><div class='del'>-	and	r7,lr,r1		@ i0</div><div class='del'>-	ldr	r5,[r10,r8,lsl#2]	@ Td2[s0&gt;&gt;8]</div><div class='del'>-	and	r8,lr,r1,lsr#16</div><div class='del'>-	ldr	r6,[r10,r9,lsl#2]	@ Td3[s0&gt;&gt;0]</div><div class='del'>-	and	r9,lr,r1,lsr#8</div><div class='del'>-	ldr	r0,[r10,r0,lsl#2]	@ Td0[s0&gt;&gt;24]</div><div class='del'>-	mov	r1,r1,lsr#24</div><div class='del'>-</div><div class='del'>-	ldr	r7,[r10,r7,lsl#2]	@ Td3[s1&gt;&gt;0]</div><div class='del'>-	ldr	r8,[r10,r8,lsl#2]	@ Td1[s1&gt;&gt;16]</div><div class='del'>-	ldr	r9,[r10,r9,lsl#2]	@ Td2[s1&gt;&gt;8]</div><div class='del'>-	eor	r0,r0,r7,ror#24</div><div class='del'>-	ldr	r1,[r10,r1,lsl#2]	@ Td0[s1&gt;&gt;24]</div><div class='del'>-	and	r7,lr,r2,lsr#8	@ i0</div><div class='del'>-	eor	r5,r8,r5,ror#8</div><div class='del'>-	and	r8,lr,r2		@ i1</div><div class='del'>-	eor	r6,r9,r6,ror#8</div><div class='del'>-	and	r9,lr,r2,lsr#16</div><div class='del'>-	ldr	r7,[r10,r7,lsl#2]	@ Td2[s2&gt;&gt;8]</div><div class='del'>-	eor	r1,r1,r4,ror#8</div><div class='del'>-	ldr	r8,[r10,r8,lsl#2]	@ Td3[s2&gt;&gt;0]</div><div class='del'>-	mov	r2,r2,lsr#24</div><div class='del'>-</div><div class='del'>-	ldr	r9,[r10,r9,lsl#2]	@ Td1[s2&gt;&gt;16]</div><div class='del'>-	eor	r0,r0,r7,ror#16</div><div class='del'>-	ldr	r2,[r10,r2,lsl#2]	@ Td0[s2&gt;&gt;24]</div><div class='del'>-	and	r7,lr,r3,lsr#16	@ i0</div><div class='del'>-	eor	r1,r1,r8,ror#24</div><div class='del'>-	and	r8,lr,r3,lsr#8	@ i1</div><div class='del'>-	eor	r6,r9,r6,ror#8</div><div class='del'>-	and	r9,lr,r3		@ i2</div><div class='del'>-	ldr	r7,[r10,r7,lsl#2]	@ Td1[s3&gt;&gt;16]</div><div class='del'>-	eor	r2,r2,r5,ror#8</div><div class='del'>-	ldr	r8,[r10,r8,lsl#2]	@ Td2[s3&gt;&gt;8]</div><div class='del'>-	mov	r3,r3,lsr#24</div><div class='del'>-</div><div class='del'>-	ldr	r9,[r10,r9,lsl#2]	@ Td3[s3&gt;&gt;0]</div><div class='del'>-	eor	r0,r0,r7,ror#8</div><div class='del'>-	ldr	r7,[r11],#16</div><div class='del'>-	eor	r1,r1,r8,ror#16</div><div class='del'>-	ldr	r3,[r10,r3,lsl#2]	@ Td0[s3&gt;&gt;24]</div><div class='del'>-	eor	r2,r2,r9,ror#24</div><div class='del'>-</div><div class='del'>-	ldr	r4,[r11,#-12]</div><div class='del'>-	eor	r0,r0,r7</div><div class='del'>-	ldr	r5,[r11,#-8]</div><div class='del'>-	eor	r3,r3,r6,ror#8</div><div class='del'>-	ldr	r6,[r11,#-4]</div><div class='del'>-	and	r7,lr,r0,lsr#16</div><div class='del'>-	eor	r1,r1,r4</div><div class='del'>-	and	r8,lr,r0,lsr#8</div><div class='del'>-	eor	r2,r2,r5</div><div class='del'>-	and	r9,lr,r0</div><div class='del'>-	eor	r3,r3,r6</div><div class='del'>-	mov	r0,r0,lsr#24</div><div class='del'>-</div><div class='del'>-	subs	r12,r12,#1</div><div class='del'>-	bne	.Ldec_loop</div><div class='del'>-</div><div class='del'>-	add	r10,r10,#1024</div><div class='del'>-</div><div class='del'>-	ldr	r5,[r10,#0]		@ prefetch Td4</div><div class='del'>-	ldr	r6,[r10,#32]</div><div class='del'>-	ldr	r4,[r10,#64]</div><div class='del'>-	ldr	r5,[r10,#96]</div><div class='del'>-	ldr	r6,[r10,#128]</div><div class='del'>-	ldr	r4,[r10,#160]</div><div class='del'>-	ldr	r5,[r10,#192]</div><div class='del'>-	ldr	r6,[r10,#224]</div><div class='del'>-</div><div class='del'>-	ldrb	r0,[r10,r0]		@ Td4[s0&gt;&gt;24]</div><div class='del'>-	ldrb	r4,[r10,r7]		@ Td4[s0&gt;&gt;16]</div><div class='del'>-	and	r7,lr,r1		@ i0</div><div class='del'>-	ldrb	r5,[r10,r8]		@ Td4[s0&gt;&gt;8]</div><div class='del'>-	and	r8,lr,r1,lsr#16</div><div class='del'>-	ldrb	r6,[r10,r9]		@ Td4[s0&gt;&gt;0]</div><div class='del'>-	and	r9,lr,r1,lsr#8</div><div class='del'>-</div><div class='del'>-	ldrb	r7,[r10,r7]		@ Td4[s1&gt;&gt;0]</div><div class='del'>- ARM(	ldrb	r1,[r10,r1,lsr#24]  )	@ Td4[s1&gt;&gt;24]</div><div class='del'>- THUMB(	add	r1,r10,r1,lsr#24    ) 	@ Td4[s1&gt;&gt;24]</div><div class='del'>- THUMB(	ldrb	r1,[r1]		    )</div><div class='del'>-	ldrb	r8,[r10,r8]		@ Td4[s1&gt;&gt;16]</div><div class='del'>-	eor	r0,r7,r0,lsl#24</div><div class='del'>-	ldrb	r9,[r10,r9]		@ Td4[s1&gt;&gt;8]</div><div class='del'>-	eor	r1,r4,r1,lsl#8</div><div class='del'>-	and	r7,lr,r2,lsr#8	@ i0</div><div class='del'>-	eor	r5,r5,r8,lsl#8</div><div class='del'>-	and	r8,lr,r2		@ i1</div><div class='del'>-	ldrb	r7,[r10,r7]		@ Td4[s2&gt;&gt;8]</div><div class='del'>-	eor	r6,r6,r9,lsl#8</div><div class='del'>-	ldrb	r8,[r10,r8]		@ Td4[s2&gt;&gt;0]</div><div class='del'>-	and	r9,lr,r2,lsr#16</div><div class='del'>-</div><div class='del'>- ARM(	ldrb	r2,[r10,r2,lsr#24]  )	@ Td4[s2&gt;&gt;24]</div><div class='del'>- THUMB(	add	r2,r10,r2,lsr#24    )	@ Td4[s2&gt;&gt;24]</div><div class='del'>- THUMB(	ldrb	r2,[r2]		    )</div><div class='del'>-	eor	r0,r0,r7,lsl#8</div><div class='del'>-	ldrb	r9,[r10,r9]		@ Td4[s2&gt;&gt;16]</div><div class='del'>-	eor	r1,r8,r1,lsl#16</div><div class='del'>-	and	r7,lr,r3,lsr#16	@ i0</div><div class='del'>-	eor	r2,r5,r2,lsl#16</div><div class='del'>-	and	r8,lr,r3,lsr#8	@ i1</div><div class='del'>-	ldrb	r7,[r10,r7]		@ Td4[s3&gt;&gt;16]</div><div class='del'>-	eor	r6,r6,r9,lsl#16</div><div class='del'>-	ldrb	r8,[r10,r8]		@ Td4[s3&gt;&gt;8]</div><div class='del'>-	and	r9,lr,r3		@ i2</div><div class='del'>-</div><div class='del'>-	ldrb	r9,[r10,r9]		@ Td4[s3&gt;&gt;0]</div><div class='del'>- ARM(	ldrb	r3,[r10,r3,lsr#24]  )	@ Td4[s3&gt;&gt;24]</div><div class='del'>- THUMB(	add	r3,r10,r3,lsr#24    )	@ Td4[s3&gt;&gt;24]</div><div class='del'>- THUMB(	ldrb	r3,[r3]		    )</div><div class='del'>-	eor	r0,r0,r7,lsl#16</div><div class='del'>-	ldr	r7,[r11,#0]</div><div class='del'>-	eor	r1,r1,r8,lsl#8</div><div class='del'>-	ldr	r4,[r11,#4]</div><div class='del'>-	eor	r2,r9,r2,lsl#8</div><div class='del'>-	ldr	r5,[r11,#8]</div><div class='del'>-	eor	r3,r6,r3,lsl#24</div><div class='del'>-	ldr	r6,[r11,#12]</div><div class='del'>-</div><div class='del'>-	eor	r0,r0,r7</div><div class='del'>-	eor	r1,r1,r4</div><div class='del'>-	eor	r2,r2,r5</div><div class='del'>-	eor	r3,r3,r6</div><div class='del'>-</div><div class='del'>-	sub	r10,r10,#1024</div><div class='del'>-	ldr	pc,[sp],#4		@ pop and return</div><div class='del'>-.size	_armv4_AES_decrypt,.-_armv4_AES_decrypt</div><div class='del'>-.asciz	"AES for ARMv4, CRYPTOGAMS by &lt;appro@openssl.org&gt;"</div><div class='del'>-.align	2</div><div class='head'>diff --git a/arch/arm/crypto/aes-ce-core.S b/arch/arm/crypto/aes-ce-core.S<br/>index 987aa632c9f0..ba8e6a32fdc9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/crypto/aes-ce-core.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/crypto/aes-ce-core.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/aes-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-ce-core.S</a></div><div class='hunk'>@@ -169,19 +169,19 @@ ENTRY(ce_aes_ecb_encrypt)</div><div class='ctx'> .Lecbencloop3x:</div><div class='ctx'> 	subs		r4, r4, #3</div><div class='ctx'> 	bmi		.Lecbenc1x</div><div class='del'>-	vld1.8		{q0-q1}, [r1, :64]!</div><div class='del'>-	vld1.8		{q2}, [r1, :64]!</div><div class='add'>+	vld1.8		{q0-q1}, [r1]!</div><div class='add'>+	vld1.8		{q2}, [r1]!</div><div class='ctx'> 	bl		aes_encrypt_3x</div><div class='del'>-	vst1.8		{q0-q1}, [r0, :64]!</div><div class='del'>-	vst1.8		{q2}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0-q1}, [r0]!</div><div class='add'>+	vst1.8		{q2}, [r0]!</div><div class='ctx'> 	b		.Lecbencloop3x</div><div class='ctx'> .Lecbenc1x:</div><div class='ctx'> 	adds		r4, r4, #3</div><div class='ctx'> 	beq		.Lecbencout</div><div class='ctx'> .Lecbencloop:</div><div class='del'>-	vld1.8		{q0}, [r1, :64]!</div><div class='add'>+	vld1.8		{q0}, [r1]!</div><div class='ctx'> 	bl		aes_encrypt</div><div class='del'>-	vst1.8		{q0}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0}, [r0]!</div><div class='ctx'> 	subs		r4, r4, #1</div><div class='ctx'> 	bne		.Lecbencloop</div><div class='ctx'> .Lecbencout:</div><div class='hunk'>@@ -195,19 +195,19 @@ ENTRY(ce_aes_ecb_decrypt)</div><div class='ctx'> .Lecbdecloop3x:</div><div class='ctx'> 	subs		r4, r4, #3</div><div class='ctx'> 	bmi		.Lecbdec1x</div><div class='del'>-	vld1.8		{q0-q1}, [r1, :64]!</div><div class='del'>-	vld1.8		{q2}, [r1, :64]!</div><div class='add'>+	vld1.8		{q0-q1}, [r1]!</div><div class='add'>+	vld1.8		{q2}, [r1]!</div><div class='ctx'> 	bl		aes_decrypt_3x</div><div class='del'>-	vst1.8		{q0-q1}, [r0, :64]!</div><div class='del'>-	vst1.8		{q2}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0-q1}, [r0]!</div><div class='add'>+	vst1.8		{q2}, [r0]!</div><div class='ctx'> 	b		.Lecbdecloop3x</div><div class='ctx'> .Lecbdec1x:</div><div class='ctx'> 	adds		r4, r4, #3</div><div class='ctx'> 	beq		.Lecbdecout</div><div class='ctx'> .Lecbdecloop:</div><div class='del'>-	vld1.8		{q0}, [r1, :64]!</div><div class='add'>+	vld1.8		{q0}, [r1]!</div><div class='ctx'> 	bl		aes_decrypt</div><div class='del'>-	vst1.8		{q0}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0}, [r0]!</div><div class='ctx'> 	subs		r4, r4, #1</div><div class='ctx'> 	bne		.Lecbdecloop</div><div class='ctx'> .Lecbdecout:</div><div class='hunk'>@@ -226,10 +226,10 @@ ENTRY(ce_aes_cbc_encrypt)</div><div class='ctx'> 	vld1.8		{q0}, [r5]</div><div class='ctx'> 	prepare_key	r2, r3</div><div class='ctx'> .Lcbcencloop:</div><div class='del'>-	vld1.8		{q1}, [r1, :64]!	@ get next pt block</div><div class='add'>+	vld1.8		{q1}, [r1]!		@ get next pt block</div><div class='ctx'> 	veor		q0, q0, q1		@ ..and xor with iv</div><div class='ctx'> 	bl		aes_encrypt</div><div class='del'>-	vst1.8		{q0}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0}, [r0]!</div><div class='ctx'> 	subs		r4, r4, #1</div><div class='ctx'> 	bne		.Lcbcencloop</div><div class='ctx'> 	vst1.8		{q0}, [r5]</div><div class='hunk'>@@ -244,8 +244,8 @@ ENTRY(ce_aes_cbc_decrypt)</div><div class='ctx'> .Lcbcdecloop3x:</div><div class='ctx'> 	subs		r4, r4, #3</div><div class='ctx'> 	bmi		.Lcbcdec1x</div><div class='del'>-	vld1.8		{q0-q1}, [r1, :64]!</div><div class='del'>-	vld1.8		{q2}, [r1, :64]!</div><div class='add'>+	vld1.8		{q0-q1}, [r1]!</div><div class='add'>+	vld1.8		{q2}, [r1]!</div><div class='ctx'> 	vmov		q3, q0</div><div class='ctx'> 	vmov		q4, q1</div><div class='ctx'> 	vmov		q5, q2</div><div class='hunk'>@@ -254,19 +254,19 @@ ENTRY(ce_aes_cbc_decrypt)</div><div class='ctx'> 	veor		q1, q1, q3</div><div class='ctx'> 	veor		q2, q2, q4</div><div class='ctx'> 	vmov		q6, q5</div><div class='del'>-	vst1.8		{q0-q1}, [r0, :64]!</div><div class='del'>-	vst1.8		{q2}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0-q1}, [r0]!</div><div class='add'>+	vst1.8		{q2}, [r0]!</div><div class='ctx'> 	b		.Lcbcdecloop3x</div><div class='ctx'> .Lcbcdec1x:</div><div class='ctx'> 	adds		r4, r4, #3</div><div class='ctx'> 	beq		.Lcbcdecout</div><div class='ctx'> 	vmov		q15, q14		@ preserve last round key</div><div class='ctx'> .Lcbcdecloop:</div><div class='del'>-	vld1.8		{q0}, [r1, :64]!	@ get next ct block</div><div class='add'>+	vld1.8		{q0}, [r1]!		@ get next ct block</div><div class='ctx'> 	veor		q14, q15, q6		@ combine prev ct with last key</div><div class='ctx'> 	vmov		q6, q0</div><div class='ctx'> 	bl		aes_decrypt</div><div class='del'>-	vst1.8		{q0}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0}, [r0]!</div><div class='ctx'> 	subs		r4, r4, #1</div><div class='ctx'> 	bne		.Lcbcdecloop</div><div class='ctx'> .Lcbcdecout:</div><div class='hunk'>@@ -300,15 +300,15 @@ ENTRY(ce_aes_ctr_encrypt)</div><div class='ctx'> 	rev		ip, r6</div><div class='ctx'> 	add		r6, r6, #1</div><div class='ctx'> 	vmov		s11, ip</div><div class='del'>-	vld1.8		{q3-q4}, [r1, :64]!</div><div class='del'>-	vld1.8		{q5}, [r1, :64]!</div><div class='add'>+	vld1.8		{q3-q4}, [r1]!</div><div class='add'>+	vld1.8		{q5}, [r1]!</div><div class='ctx'> 	bl		aes_encrypt_3x</div><div class='ctx'> 	veor		q0, q0, q3</div><div class='ctx'> 	veor		q1, q1, q4</div><div class='ctx'> 	veor		q2, q2, q5</div><div class='ctx'> 	rev		ip, r6</div><div class='del'>-	vst1.8		{q0-q1}, [r0, :64]!</div><div class='del'>-	vst1.8		{q2}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0-q1}, [r0]!</div><div class='add'>+	vst1.8		{q2}, [r0]!</div><div class='ctx'> 	vmov		s27, ip</div><div class='ctx'> 	b		.Lctrloop3x</div><div class='ctx'> .Lctr1x:</div><div class='hunk'>@@ -318,10 +318,10 @@ ENTRY(ce_aes_ctr_encrypt)</div><div class='ctx'> 	vmov		q0, q6</div><div class='ctx'> 	bl		aes_encrypt</div><div class='ctx'> 	subs		r4, r4, #1</div><div class='del'>-	bmi		.Lctrhalfblock		@ blocks &lt; 0 means 1/2 block</div><div class='del'>-	vld1.8		{q3}, [r1, :64]!</div><div class='add'>+	bmi		.Lctrtailblock		@ blocks &lt; 0 means tail block</div><div class='add'>+	vld1.8		{q3}, [r1]!</div><div class='ctx'> 	veor		q3, q0, q3</div><div class='del'>-	vst1.8		{q3}, [r0, :64]!</div><div class='add'>+	vst1.8		{q3}, [r0]!</div><div class='ctx'> </div><div class='ctx'> 	adds		r6, r6, #1		@ increment BE ctr</div><div class='ctx'> 	rev		ip, r6</div><div class='hunk'>@@ -333,10 +333,8 @@ ENTRY(ce_aes_ctr_encrypt)</div><div class='ctx'> 	vst1.8		{q6}, [r5]</div><div class='ctx'> 	pop		{r4-r6, pc}</div><div class='ctx'> </div><div class='del'>-.Lctrhalfblock:</div><div class='del'>-	vld1.8		{d1}, [r1, :64]</div><div class='del'>-	veor		d0, d0, d1</div><div class='del'>-	vst1.8		{d0}, [r0, :64]</div><div class='add'>+.Lctrtailblock:</div><div class='add'>+	vst1.8		{q0}, [r0, :64]		@ return just the key stream</div><div class='ctx'> 	pop		{r4-r6, pc}</div><div class='ctx'> </div><div class='ctx'> .Lctrcarry:</div><div class='hunk'>@@ -405,8 +403,8 @@ ENTRY(ce_aes_xts_encrypt)</div><div class='ctx'> .Lxtsenc3x:</div><div class='ctx'> 	subs		r4, r4, #3</div><div class='ctx'> 	bmi		.Lxtsenc1x</div><div class='del'>-	vld1.8		{q0-q1}, [r1, :64]!	@ get 3 pt blocks</div><div class='del'>-	vld1.8		{q2}, [r1, :64]!</div><div class='add'>+	vld1.8		{q0-q1}, [r1]!		@ get 3 pt blocks</div><div class='add'>+	vld1.8		{q2}, [r1]!</div><div class='ctx'> 	next_tweak	q4, q3, q7, q6</div><div class='ctx'> 	veor		q0, q0, q3</div><div class='ctx'> 	next_tweak	q5, q4, q7, q6</div><div class='hunk'>@@ -416,8 +414,8 @@ ENTRY(ce_aes_xts_encrypt)</div><div class='ctx'> 	veor		q0, q0, q3</div><div class='ctx'> 	veor		q1, q1, q4</div><div class='ctx'> 	veor		q2, q2, q5</div><div class='del'>-	vst1.8		{q0-q1}, [r0, :64]!	@ write 3 ct blocks</div><div class='del'>-	vst1.8		{q2}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0-q1}, [r0]!		@ write 3 ct blocks</div><div class='add'>+	vst1.8		{q2}, [r0]!</div><div class='ctx'> 	vmov		q3, q5</div><div class='ctx'> 	teq		r4, #0</div><div class='ctx'> 	beq		.Lxtsencout</div><div class='hunk'>@@ -426,11 +424,11 @@ ENTRY(ce_aes_xts_encrypt)</div><div class='ctx'> 	adds		r4, r4, #3</div><div class='ctx'> 	beq		.Lxtsencout</div><div class='ctx'> .Lxtsencloop:</div><div class='del'>-	vld1.8		{q0}, [r1, :64]!</div><div class='add'>+	vld1.8		{q0}, [r1]!</div><div class='ctx'> 	veor		q0, q0, q3</div><div class='ctx'> 	bl		aes_encrypt</div><div class='ctx'> 	veor		q0, q0, q3</div><div class='del'>-	vst1.8		{q0}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0}, [r0]!</div><div class='ctx'> 	subs		r4, r4, #1</div><div class='ctx'> 	beq		.Lxtsencout</div><div class='ctx'> 	next_tweak	q3, q3, q7, q6</div><div class='hunk'>@@ -456,8 +454,8 @@ ENTRY(ce_aes_xts_decrypt)</div><div class='ctx'> .Lxtsdec3x:</div><div class='ctx'> 	subs		r4, r4, #3</div><div class='ctx'> 	bmi		.Lxtsdec1x</div><div class='del'>-	vld1.8		{q0-q1}, [r1, :64]!	@ get 3 ct blocks</div><div class='del'>-	vld1.8		{q2}, [r1, :64]!</div><div class='add'>+	vld1.8		{q0-q1}, [r1]!		@ get 3 ct blocks</div><div class='add'>+	vld1.8		{q2}, [r1]!</div><div class='ctx'> 	next_tweak	q4, q3, q7, q6</div><div class='ctx'> 	veor		q0, q0, q3</div><div class='ctx'> 	next_tweak	q5, q4, q7, q6</div><div class='hunk'>@@ -467,8 +465,8 @@ ENTRY(ce_aes_xts_decrypt)</div><div class='ctx'> 	veor		q0, q0, q3</div><div class='ctx'> 	veor		q1, q1, q4</div><div class='ctx'> 	veor		q2, q2, q5</div><div class='del'>-	vst1.8		{q0-q1}, [r0, :64]!	@ write 3 pt blocks</div><div class='del'>-	vst1.8		{q2}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0-q1}, [r0]!		@ write 3 pt blocks</div><div class='add'>+	vst1.8		{q2}, [r0]!</div><div class='ctx'> 	vmov		q3, q5</div><div class='ctx'> 	teq		r4, #0</div><div class='ctx'> 	beq		.Lxtsdecout</div><div class='hunk'>@@ -477,12 +475,12 @@ ENTRY(ce_aes_xts_decrypt)</div><div class='ctx'> 	adds		r4, r4, #3</div><div class='ctx'> 	beq		.Lxtsdecout</div><div class='ctx'> .Lxtsdecloop:</div><div class='del'>-	vld1.8		{q0}, [r1, :64]!</div><div class='add'>+	vld1.8		{q0}, [r1]!</div><div class='ctx'> 	veor		q0, q0, q3</div><div class='ctx'> 	add		ip, r2, #32		@ 3rd round key</div><div class='ctx'> 	bl		aes_decrypt</div><div class='ctx'> 	veor		q0, q0, q3</div><div class='del'>-	vst1.8		{q0}, [r0, :64]!</div><div class='add'>+	vst1.8		{q0}, [r0]!</div><div class='ctx'> 	subs		r4, r4, #1</div><div class='ctx'> 	beq		.Lxtsdecout</div><div class='ctx'> 	next_tweak	q3, q3, q7, q6</div><div class='head'>diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c<br/>index aef022a87c53..883b84d828c5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/crypto/aes-ce-glue.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/crypto/aes-ce-glue.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/aes-ce-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-ce-glue.c</a></div><div class='hunk'>@@ -12,8 +12,8 @@</div><div class='ctx'> #include &lt;asm/neon.h&gt;</div><div class='ctx'> #include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='del'>-#include &lt;crypto/ablk_helper.h&gt;</div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;crypto/xts.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -88,8 +88,13 @@ static int ce_aes_expandkey(struct crypto_aes_ctx *ctx, const u8 *in_key,</div><div class='ctx'> 		u32 *rki = ctx-&gt;key_enc + (i * kwords);</div><div class='ctx'> 		u32 *rko = rki + kwords;</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_CPU_BIG_ENDIAN</div><div class='ctx'> 		rko[0] = ror32(ce_aes_sub(rki[kwords - 1]), 8);</div><div class='ctx'> 		rko[0] = rko[0] ^ rki[0] ^ rcon[i];</div><div class='add'>+#else</div><div class='add'>+		rko[0] = rol32(ce_aes_sub(rki[kwords - 1]), 8);</div><div class='add'>+		rko[0] = rko[0] ^ rki[0] ^ (rcon[i] &lt;&lt; 24);</div><div class='add'>+#endif</div><div class='ctx'> 		rko[1] = rko[0] ^ rki[1];</div><div class='ctx'> 		rko[2] = rko[1] ^ rki[2];</div><div class='ctx'> 		rko[3] = rko[2] ^ rki[3];</div><div class='hunk'>@@ -128,17 +133,17 @@ static int ce_aes_expandkey(struct crypto_aes_ctx *ctx, const u8 *in_key,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ce_aes_setkey(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+static int ce_aes_setkey(struct crypto_skcipher *tfm, const u8 *in_key,</div><div class='ctx'> 			 unsigned int key_len)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ce_aes_expandkey(ctx, in_key, key_len);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='add'>+	crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -147,13 +152,13 @@ struct crypto_aes_xts_ctx {</div><div class='ctx'> 	struct crypto_aes_ctx __aligned(8) key2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int xts_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+static int xts_set_key(struct crypto_skcipher *tfm, const u8 *in_key,</div><div class='ctx'> 		       unsigned int key_len)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct crypto_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = xts_check_key(tfm, in_key, key_len);</div><div class='add'>+	ret = xts_verify_key(tfm, in_key, key_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -164,365 +169,286 @@ static int xts_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='add'>+	crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ecb_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int ecb_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	while ((blocks = (walk.nbytes / AES_BLOCK_SIZE))) {</div><div class='ctx'> 		ce_aes_ecb_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				   (u8 *)ctx-&gt;key_enc, num_rounds(ctx), blocks);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk,</div><div class='del'>-					  walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int ecb_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	while ((blocks = (walk.nbytes / AES_BLOCK_SIZE))) {</div><div class='ctx'> 		ce_aes_ecb_decrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				   (u8 *)ctx-&gt;key_dec, num_rounds(ctx), blocks);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk,</div><div class='del'>-					  walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cbc_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int cbc_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	while ((blocks = (walk.nbytes / AES_BLOCK_SIZE))) {</div><div class='ctx'> 		ce_aes_cbc_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				   (u8 *)ctx-&gt;key_enc, num_rounds(ctx), blocks,</div><div class='ctx'> 				   walk.iv);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk,</div><div class='del'>-					  walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int cbc_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	while ((blocks = (walk.nbytes / AES_BLOCK_SIZE))) {</div><div class='ctx'> 		ce_aes_cbc_decrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				   (u8 *)ctx-&gt;key_dec, num_rounds(ctx), blocks,</div><div class='ctx'> 				   walk.iv);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk,</div><div class='del'>-					  walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ctr_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int ctr_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	int err, blocks;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt_block(desc, &amp;walk, AES_BLOCK_SIZE);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	while ((blocks = (walk.nbytes / AES_BLOCK_SIZE))) {</div><div class='ctx'> 		ce_aes_ctr_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				   (u8 *)ctx-&gt;key_enc, num_rounds(ctx), blocks,</div><div class='ctx'> 				   walk.iv);</div><div class='del'>-		nbytes -= blocks * AES_BLOCK_SIZE;</div><div class='del'>-		if (nbytes &amp;&amp; nbytes == walk.nbytes % AES_BLOCK_SIZE)</div><div class='del'>-			break;</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk,</div><div class='del'>-					  walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='del'>-	if (walk.nbytes % AES_BLOCK_SIZE) {</div><div class='del'>-		u8 *tdst = walk.dst.virt.addr + blocks * AES_BLOCK_SIZE;</div><div class='del'>-		u8 *tsrc = walk.src.virt.addr + blocks * AES_BLOCK_SIZE;</div><div class='add'>+	if (walk.nbytes) {</div><div class='ctx'> 		u8 __aligned(8) tail[AES_BLOCK_SIZE];</div><div class='add'>+		unsigned int nbytes = walk.nbytes;</div><div class='add'>+		u8 *tdst = walk.dst.virt.addr;</div><div class='add'>+		u8 *tsrc = walk.src.virt.addr;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Minimum alignment is 8 bytes, so if nbytes is &lt;= 8, we need</div><div class='del'>-		 * to tell aes_ctr_encrypt() to only read half a block.</div><div class='add'>+		 * Tell aes_ctr_encrypt() to process a tail block.</div><div class='ctx'> 		 */</div><div class='del'>-		blocks = (nbytes &lt;= 8) ? -1 : 1;</div><div class='add'>+		blocks = -1;</div><div class='ctx'> </div><div class='del'>-		ce_aes_ctr_encrypt(tail, tsrc, (u8 *)ctx-&gt;key_enc,</div><div class='add'>+		ce_aes_ctr_encrypt(tail, NULL, (u8 *)ctx-&gt;key_enc,</div><div class='ctx'> 				   num_rounds(ctx), blocks, walk.iv);</div><div class='del'>-		memcpy(tdst, tail, nbytes);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, 0);</div><div class='add'>+		if (tdst != tsrc)</div><div class='add'>+			memcpy(tdst, tsrc, nbytes);</div><div class='add'>+		crypto_xor(tdst, tail, nbytes);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int xts_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int err, first, rounds = num_rounds(&amp;ctx-&gt;key1);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {</div><div class='ctx'> 		ce_aes_xts_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				   (u8 *)ctx-&gt;key1.key_enc, rounds, blocks,</div><div class='ctx'> 				   walk.iv, (u8 *)ctx-&gt;key2.key_enc, first);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk,</div><div class='del'>-					  walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int xts_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int err, first, rounds = num_rounds(&amp;ctx-&gt;key1);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {</div><div class='ctx'> 		ce_aes_xts_decrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				   (u8 *)ctx-&gt;key1.key_dec, rounds, blocks,</div><div class='ctx'> 				   walk.iv, (u8 *)ctx-&gt;key2.key_enc, first);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk,</div><div class='del'>-					  walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct crypto_alg aes_algs[] = { {</div><div class='del'>-	.cra_name		= "__ecb-aes-ce",</div><div class='del'>-	.cra_driver_name	= "__driver-ecb-aes-ce",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_blkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= 0,</div><div class='del'>-		.setkey		= ce_aes_setkey,</div><div class='del'>-		.encrypt	= ecb_encrypt,</div><div class='del'>-		.decrypt	= ecb_decrypt,</div><div class='add'>+static struct skcipher_alg aes_algs[] = { {</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "__ecb(aes)",</div><div class='add'>+		.cra_driver_name	= "__ecb-aes-ce",</div><div class='add'>+		.cra_priority		= 300,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+		.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='add'>+	.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+	.setkey		= ce_aes_setkey,</div><div class='add'>+	.encrypt	= ecb_encrypt,</div><div class='add'>+	.decrypt	= ecb_decrypt,</div><div class='ctx'> }, {</div><div class='del'>-	.cra_name		= "__cbc-aes-ce",</div><div class='del'>-	.cra_driver_name	= "__driver-cbc-aes-ce",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_blkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= ce_aes_setkey,</div><div class='del'>-		.encrypt	= cbc_encrypt,</div><div class='del'>-		.decrypt	= cbc_decrypt,</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "__cbc(aes)",</div><div class='add'>+		.cra_driver_name	= "__cbc-aes-ce",</div><div class='add'>+		.cra_priority		= 300,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+		.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='add'>+	.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey		= ce_aes_setkey,</div><div class='add'>+	.encrypt	= cbc_encrypt,</div><div class='add'>+	.decrypt	= cbc_decrypt,</div><div class='ctx'> }, {</div><div class='del'>-	.cra_name		= "__ctr-aes-ce",</div><div class='del'>-	.cra_driver_name	= "__driver-ctr-aes-ce",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= 1,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_blkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= ce_aes_setkey,</div><div class='del'>-		.encrypt	= ctr_encrypt,</div><div class='del'>-		.decrypt	= ctr_encrypt,</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "__ctr(aes)",</div><div class='add'>+		.cra_driver_name	= "__ctr-aes-ce",</div><div class='add'>+		.cra_priority		= 300,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+		.cra_blocksize		= 1,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='add'>+	.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.chunksize	= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey		= ce_aes_setkey,</div><div class='add'>+	.encrypt	= ctr_encrypt,</div><div class='add'>+	.decrypt	= ctr_encrypt,</div><div class='ctx'> }, {</div><div class='del'>-	.cra_name		= "__xts-aes-ce",</div><div class='del'>-	.cra_driver_name	= "__driver-xts-aes-ce",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_xts_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_blkcipher = {</div><div class='del'>-		.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= xts_set_key,</div><div class='del'>-		.encrypt	= xts_encrypt,</div><div class='del'>-		.decrypt	= xts_decrypt,</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "__xts(aes)",</div><div class='add'>+		.cra_driver_name	= "__xts-aes-ce",</div><div class='add'>+		.cra_priority		= 300,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+		.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct crypto_aes_xts_ctx),</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "ecb(aes)",</div><div class='del'>-	.cra_driver_name	= "ecb-aes-ce",</div><div class='del'>-	.cra_priority		= 300,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER|CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_ablkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= 0,</div><div class='del'>-		.setkey		= ablk_set_key,</div><div class='del'>-		.encrypt	= ablk_encrypt,</div><div class='del'>-		.decrypt	= ablk_decrypt,</div><div class='del'>-	}</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "cbc(aes)",</div><div class='del'>-	.cra_driver_name	= "cbc-aes-ce",</div><div class='del'>-	.cra_priority		= 300,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER|CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_ablkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= ablk_set_key,</div><div class='del'>-		.encrypt	= ablk_encrypt,</div><div class='del'>-		.decrypt	= ablk_decrypt,</div><div class='del'>-	}</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "ctr(aes)",</div><div class='del'>-	.cra_driver_name	= "ctr-aes-ce",</div><div class='del'>-	.cra_priority		= 300,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER|CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= 1,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_ablkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= ablk_set_key,</div><div class='del'>-		.encrypt	= ablk_encrypt,</div><div class='del'>-		.decrypt	= ablk_decrypt,</div><div class='del'>-	}</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "xts(aes)",</div><div class='del'>-	.cra_driver_name	= "xts-aes-ce",</div><div class='del'>-	.cra_priority		= 300,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER|CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_ablkcipher = {</div><div class='del'>-		.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= ablk_set_key,</div><div class='del'>-		.encrypt	= ablk_encrypt,</div><div class='del'>-		.decrypt	= ablk_decrypt,</div><div class='del'>-	}</div><div class='add'>+	.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey		= xts_set_key,</div><div class='add'>+	.encrypt	= xts_encrypt,</div><div class='add'>+	.decrypt	= xts_decrypt,</div><div class='ctx'> } };</div><div class='ctx'> </div><div class='add'>+static struct simd_skcipher_alg *aes_simd_algs[ARRAY_SIZE(aes_algs)];</div><div class='add'>+</div><div class='add'>+static void aes_exit(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aes_simd_algs) &amp;&amp; aes_simd_algs[i]; i++)</div><div class='add'>+		simd_skcipher_free(aes_simd_algs[i]);</div><div class='add'>+</div><div class='add'>+	crypto_unregister_skciphers(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init aes_init(void)</div><div class='ctx'> {</div><div class='add'>+	struct simd_skcipher_alg *simd;</div><div class='add'>+	const char *basename;</div><div class='add'>+	const char *algname;</div><div class='add'>+	const char *drvname;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	if (!(elf_hwcap2 &amp; HWCAP2_AES))</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	return crypto_register_algs(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void __exit aes_exit(void)</div><div class='del'>-{</div><div class='del'>-	crypto_unregister_algs(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='add'>+	err = crypto_register_skciphers(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aes_algs); i++) {</div><div class='add'>+		algname = aes_algs[i].base.cra_name + 2;</div><div class='add'>+		drvname = aes_algs[i].base.cra_driver_name + 2;</div><div class='add'>+		basename = aes_algs[i].base.cra_driver_name;</div><div class='add'>+		simd = simd_skcipher_create_compat(algname, drvname, basename);</div><div class='add'>+		err = PTR_ERR(simd);</div><div class='add'>+		if (IS_ERR(simd))</div><div class='add'>+			goto unregister_simds;</div><div class='add'>+</div><div class='add'>+		aes_simd_algs[i] = simd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unregister_simds:</div><div class='add'>+	aes_exit();</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(aes_init);</div><div class='head'>diff --git a/arch/arm/crypto/aes-cipher-core.S b/arch/arm/crypto/aes-cipher-core.S<br/>new file mode 100644<br/>index 000000000000..c817a86c4ca8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/aes-cipher-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-cipher-core.S</a></div><div class='hunk'>@@ -0,0 +1,179 @@</div><div class='add'>+/*</div><div class='add'>+ * Scalar AES core transform</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linaro Ltd.</div><div class='add'>+ * Author: Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+	.align		5</div><div class='add'>+</div><div class='add'>+	rk		.req	r0</div><div class='add'>+	rounds		.req	r1</div><div class='add'>+	in		.req	r2</div><div class='add'>+	out		.req	r3</div><div class='add'>+	ttab		.req	ip</div><div class='add'>+</div><div class='add'>+	t0		.req	lr</div><div class='add'>+	t1		.req	r2</div><div class='add'>+	t2		.req	r3</div><div class='add'>+</div><div class='add'>+	.macro		__select, out, in, idx</div><div class='add'>+	.if		__LINUX_ARM_ARCH__ &lt; 7</div><div class='add'>+	and		\out, \in, #0xff &lt;&lt; (8 * \idx)</div><div class='add'>+	.else</div><div class='add'>+	ubfx		\out, \in, #(8 * \idx), #8</div><div class='add'>+	.endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		__load, out, in, idx</div><div class='add'>+	.if		__LINUX_ARM_ARCH__ &lt; 7 &amp;&amp; \idx &gt; 0</div><div class='add'>+	ldr		\out, [ttab, \in, lsr #(8 * \idx) - 2]</div><div class='add'>+	.else</div><div class='add'>+	ldr		\out, [ttab, \in, lsl #2]</div><div class='add'>+	.endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		__hround, out0, out1, in0, in1, in2, in3, t3, t4, enc</div><div class='add'>+	__select	\out0, \in0, 0</div><div class='add'>+	__select	t0, \in1, 1</div><div class='add'>+	__load		\out0, \out0, 0</div><div class='add'>+	__load		t0, t0, 1</div><div class='add'>+</div><div class='add'>+	.if		\enc</div><div class='add'>+	__select	\out1, \in1, 0</div><div class='add'>+	__select	t1, \in2, 1</div><div class='add'>+	.else</div><div class='add'>+	__select	\out1, \in3, 0</div><div class='add'>+	__select	t1, \in0, 1</div><div class='add'>+	.endif</div><div class='add'>+	__load		\out1, \out1, 0</div><div class='add'>+	__select	t2, \in2, 2</div><div class='add'>+	__load		t1, t1, 1</div><div class='add'>+	__load		t2, t2, 2</div><div class='add'>+</div><div class='add'>+	eor		\out0, \out0, t0, ror #24</div><div class='add'>+</div><div class='add'>+	__select	t0, \in3, 3</div><div class='add'>+	.if		\enc</div><div class='add'>+	__select	\t3, \in3, 2</div><div class='add'>+	__select	\t4, \in0, 3</div><div class='add'>+	.else</div><div class='add'>+	__select	\t3, \in1, 2</div><div class='add'>+	__select	\t4, \in2, 3</div><div class='add'>+	.endif</div><div class='add'>+	__load		\t3, \t3, 2</div><div class='add'>+	__load		t0, t0, 3</div><div class='add'>+	__load		\t4, \t4, 3</div><div class='add'>+</div><div class='add'>+	eor		\out1, \out1, t1, ror #24</div><div class='add'>+	eor		\out0, \out0, t2, ror #16</div><div class='add'>+	ldm		rk!, {t1, t2}</div><div class='add'>+	eor		\out1, \out1, \t3, ror #16</div><div class='add'>+	eor		\out0, \out0, t0, ror #8</div><div class='add'>+	eor		\out1, \out1, \t4, ror #8</div><div class='add'>+	eor		\out0, \out0, t1</div><div class='add'>+	eor		\out1, \out1, t2</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		fround, out0, out1, out2, out3, in0, in1, in2, in3</div><div class='add'>+	__hround	\out0, \out1, \in0, \in1, \in2, \in3, \out2, \out3, 1</div><div class='add'>+	__hround	\out2, \out3, \in2, \in3, \in0, \in1, \in1, \in2, 1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		iround, out0, out1, out2, out3, in0, in1, in2, in3</div><div class='add'>+	__hround	\out0, \out1, \in0, \in3, \in2, \in1, \out2, \out3, 0</div><div class='add'>+	__hround	\out2, \out3, \in2, \in1, \in0, \in3, \in1, \in0, 0</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		__rev, out, in</div><div class='add'>+	.if		__LINUX_ARM_ARCH__ &lt; 6</div><div class='add'>+	lsl		t0, \in, #24</div><div class='add'>+	and		t1, \in, #0xff00</div><div class='add'>+	and		t2, \in, #0xff0000</div><div class='add'>+	orr		\out, t0, \in, lsr #24</div><div class='add'>+	orr		\out, \out, t1, lsl #8</div><div class='add'>+	orr		\out, \out, t2, lsr #8</div><div class='add'>+	.else</div><div class='add'>+	rev		\out, \in</div><div class='add'>+	.endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		__adrl, out, sym, c</div><div class='add'>+	.if		__LINUX_ARM_ARCH__ &lt; 7</div><div class='add'>+	ldr\c		\out, =\sym</div><div class='add'>+	.else</div><div class='add'>+	movw\c		\out, #:lower16:\sym</div><div class='add'>+	movt\c		\out, #:upper16:\sym</div><div class='add'>+	.endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		do_crypt, round, ttab, ltab</div><div class='add'>+	push		{r3-r11, lr}</div><div class='add'>+</div><div class='add'>+	ldr		r4, [in]</div><div class='add'>+	ldr		r5, [in, #4]</div><div class='add'>+	ldr		r6, [in, #8]</div><div class='add'>+	ldr		r7, [in, #12]</div><div class='add'>+</div><div class='add'>+	ldm		rk!, {r8-r11}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+	__rev		r4, r4</div><div class='add'>+	__rev		r5, r5</div><div class='add'>+	__rev		r6, r6</div><div class='add'>+	__rev		r7, r7</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	eor		r4, r4, r8</div><div class='add'>+	eor		r5, r5, r9</div><div class='add'>+	eor		r6, r6, r10</div><div class='add'>+	eor		r7, r7, r11</div><div class='add'>+</div><div class='add'>+	__adrl		ttab, \ttab</div><div class='add'>+</div><div class='add'>+	tst		rounds, #2</div><div class='add'>+	bne		1f</div><div class='add'>+</div><div class='add'>+0:	\round		r8, r9, r10, r11, r4, r5, r6, r7</div><div class='add'>+	\round		r4, r5, r6, r7, r8, r9, r10, r11</div><div class='add'>+</div><div class='add'>+1:	subs		rounds, rounds, #4</div><div class='add'>+	\round		r8, r9, r10, r11, r4, r5, r6, r7</div><div class='add'>+	__adrl		ttab, \ltab, ls</div><div class='add'>+	\round		r4, r5, r6, r7, r8, r9, r10, r11</div><div class='add'>+	bhi		0b</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+	__rev		r4, r4</div><div class='add'>+	__rev		r5, r5</div><div class='add'>+	__rev		r6, r6</div><div class='add'>+	__rev		r7, r7</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ldr		out, [sp]</div><div class='add'>+</div><div class='add'>+	str		r4, [out]</div><div class='add'>+	str		r5, [out, #4]</div><div class='add'>+	str		r6, [out, #8]</div><div class='add'>+	str		r7, [out, #12]</div><div class='add'>+</div><div class='add'>+	pop		{r3-r11, pc}</div><div class='add'>+</div><div class='add'>+	.align		3</div><div class='add'>+	.ltorg</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+ENTRY(__aes_arm_encrypt)</div><div class='add'>+	do_crypt	fround, crypto_ft_tab, crypto_fl_tab</div><div class='add'>+ENDPROC(__aes_arm_encrypt)</div><div class='add'>+</div><div class='add'>+ENTRY(__aes_arm_decrypt)</div><div class='add'>+	do_crypt	iround, crypto_it_tab, crypto_il_tab</div><div class='add'>+ENDPROC(__aes_arm_decrypt)</div><div class='head'>diff --git a/arch/arm/crypto/aes-cipher-glue.c b/arch/arm/crypto/aes-cipher-glue.c<br/>new file mode 100644<br/>index 000000000000..c222f6e072ad<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/aes-cipher-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-cipher-glue.c</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+/*</div><div class='add'>+ * Scalar AES core transform</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linaro Ltd.</div><div class='add'>+ * Author: Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+asmlinkage void __aes_arm_encrypt(u32 *rk, int rounds, const u8 *in, u8 *out);</div><div class='add'>+EXPORT_SYMBOL(__aes_arm_encrypt);</div><div class='add'>+</div><div class='add'>+asmlinkage void __aes_arm_decrypt(u32 *rk, int rounds, const u8 *in, u8 *out);</div><div class='add'>+EXPORT_SYMBOL(__aes_arm_decrypt);</div><div class='add'>+</div><div class='add'>+static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	int rounds = 6 + ctx-&gt;key_length / 4;</div><div class='add'>+</div><div class='add'>+	__aes_arm_encrypt(ctx-&gt;key_enc, rounds, in, out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	int rounds = 6 + ctx-&gt;key_length / 4;</div><div class='add'>+</div><div class='add'>+	__aes_arm_decrypt(ctx-&gt;key_dec, rounds, in, out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg aes_alg = {</div><div class='add'>+	.cra_name			= "aes",</div><div class='add'>+	.cra_driver_name		= "aes-arm",</div><div class='add'>+	.cra_priority			= 200,</div><div class='add'>+	.cra_flags			= CRYPTO_ALG_TYPE_CIPHER,</div><div class='add'>+	.cra_blocksize			= AES_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize			= sizeof(struct crypto_aes_ctx),</div><div class='add'>+	.cra_module			= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.cra_cipher.cia_min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+	.cra_cipher.cia_max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+	.cra_cipher.cia_setkey		= crypto_aes_set_key,</div><div class='add'>+	.cra_cipher.cia_encrypt		= aes_encrypt,</div><div class='add'>+	.cra_cipher.cia_decrypt		= aes_decrypt,</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='add'>+	.cra_alignmask			= 3,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init aes_init(void)</div><div class='add'>+{</div><div class='add'>+	return crypto_register_alg(&amp;aes_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit aes_fini(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_alg(&amp;aes_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(aes_init);</div><div class='add'>+module_exit(aes_fini);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Scalar AES cipher for ARM");</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS_CRYPTO("aes");</div><div class='head'>diff --git a/arch/arm/crypto/aes-neonbs-core.S b/arch/arm/crypto/aes-neonbs-core.S<br/>new file mode 100644<br/>index 000000000000..2b625c6d4712<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/aes-neonbs-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-neonbs-core.S</a></div><div class='hunk'>@@ -0,0 +1,1023 @@</div><div class='add'>+/*</div><div class='add'>+ * Bit sliced AES using NEON instructions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linaro Ltd.</div><div class='add'>+ * Author: Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The algorithm implemented here is described in detail by the paper</div><div class='add'>+ * 'Faster and Timing-Attack Resistant AES-GCM' by Emilia Kaesper and</div><div class='add'>+ * Peter Schwabe (https://eprint.iacr.org/2009/129.pdf)</div><div class='add'>+ *</div><div class='add'>+ * This implementation is based primarily on the OpenSSL implementation</div><div class='add'>+ * for 32-bit ARM written by Andy Polyakov &lt;appro@openssl.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+	.fpu		neon</div><div class='add'>+</div><div class='add'>+	rounds		.req	ip</div><div class='add'>+	bskey		.req	r4</div><div class='add'>+</div><div class='add'>+	q0l		.req	d0</div><div class='add'>+	q0h		.req	d1</div><div class='add'>+	q1l		.req	d2</div><div class='add'>+	q1h		.req	d3</div><div class='add'>+	q2l		.req	d4</div><div class='add'>+	q2h		.req	d5</div><div class='add'>+	q3l		.req	d6</div><div class='add'>+	q3h		.req	d7</div><div class='add'>+	q4l		.req	d8</div><div class='add'>+	q4h		.req	d9</div><div class='add'>+	q5l		.req	d10</div><div class='add'>+	q5h		.req	d11</div><div class='add'>+	q6l		.req	d12</div><div class='add'>+	q6h		.req	d13</div><div class='add'>+	q7l		.req	d14</div><div class='add'>+	q7h		.req	d15</div><div class='add'>+	q8l		.req	d16</div><div class='add'>+	q8h		.req	d17</div><div class='add'>+	q9l		.req	d18</div><div class='add'>+	q9h		.req	d19</div><div class='add'>+	q10l		.req	d20</div><div class='add'>+	q10h		.req	d21</div><div class='add'>+	q11l		.req	d22</div><div class='add'>+	q11h		.req	d23</div><div class='add'>+	q12l		.req	d24</div><div class='add'>+	q12h		.req	d25</div><div class='add'>+	q13l		.req	d26</div><div class='add'>+	q13h		.req	d27</div><div class='add'>+	q14l		.req	d28</div><div class='add'>+	q14h		.req	d29</div><div class='add'>+	q15l		.req	d30</div><div class='add'>+	q15h		.req	d31</div><div class='add'>+</div><div class='add'>+	.macro		__tbl, out, tbl, in, tmp</div><div class='add'>+	.ifc		\out, \tbl</div><div class='add'>+	.ifb		\tmp</div><div class='add'>+	.error		__tbl needs temp register if out == tbl</div><div class='add'>+	.endif</div><div class='add'>+	vmov		\tmp, \out</div><div class='add'>+	.endif</div><div class='add'>+	vtbl.8		\out\()l, {\tbl}, \in\()l</div><div class='add'>+	.ifc		\out, \tbl</div><div class='add'>+	vtbl.8		\out\()h, {\tmp}, \in\()h</div><div class='add'>+	.else</div><div class='add'>+	vtbl.8		\out\()h, {\tbl}, \in\()h</div><div class='add'>+	.endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		__ldr, out, sym</div><div class='add'>+	vldr		\out\()l, \sym</div><div class='add'>+	vldr		\out\()h, \sym + 8</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		__adr, reg, lbl</div><div class='add'>+	adr		\reg, \lbl</div><div class='add'>+THUMB(	orr		\reg, \reg, #1		)</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		in_bs_ch, b0, b1, b2, b3, b4, b5, b6, b7</div><div class='add'>+	veor		\b2, \b2, \b1</div><div class='add'>+	veor		\b5, \b5, \b6</div><div class='add'>+	veor		\b3, \b3, \b0</div><div class='add'>+	veor		\b6, \b6, \b2</div><div class='add'>+	veor		\b5, \b5, \b0</div><div class='add'>+	veor		\b6, \b6, \b3</div><div class='add'>+	veor		\b3, \b3, \b7</div><div class='add'>+	veor		\b7, \b7, \b5</div><div class='add'>+	veor		\b3, \b3, \b4</div><div class='add'>+	veor		\b4, \b4, \b5</div><div class='add'>+	veor		\b2, \b2, \b7</div><div class='add'>+	veor		\b3, \b3, \b1</div><div class='add'>+	veor		\b1, \b1, \b5</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		out_bs_ch, b0, b1, b2, b3, b4, b5, b6, b7</div><div class='add'>+	veor		\b0, \b0, \b6</div><div class='add'>+	veor		\b1, \b1, \b4</div><div class='add'>+	veor		\b4, \b4, \b6</div><div class='add'>+	veor		\b2, \b2, \b0</div><div class='add'>+	veor		\b6, \b6, \b1</div><div class='add'>+	veor		\b1, \b1, \b5</div><div class='add'>+	veor		\b5, \b5, \b3</div><div class='add'>+	veor		\b3, \b3, \b7</div><div class='add'>+	veor		\b7, \b7, \b5</div><div class='add'>+	veor		\b2, \b2, \b5</div><div class='add'>+	veor		\b4, \b4, \b7</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		inv_in_bs_ch, b6, b1, b2, b4, b7, b0, b3, b5</div><div class='add'>+	veor		\b1, \b1, \b7</div><div class='add'>+	veor		\b4, \b4, \b7</div><div class='add'>+	veor		\b7, \b7, \b5</div><div class='add'>+	veor		\b1, \b1, \b3</div><div class='add'>+	veor		\b2, \b2, \b5</div><div class='add'>+	veor		\b3, \b3, \b7</div><div class='add'>+	veor		\b6, \b6, \b1</div><div class='add'>+	veor		\b2, \b2, \b0</div><div class='add'>+	veor		\b5, \b5, \b3</div><div class='add'>+	veor		\b4, \b4, \b6</div><div class='add'>+	veor		\b0, \b0, \b6</div><div class='add'>+	veor		\b1, \b1, \b4</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		inv_out_bs_ch, b6, b5, b0, b3, b7, b1, b4, b2</div><div class='add'>+	veor		\b1, \b1, \b5</div><div class='add'>+	veor		\b2, \b2, \b7</div><div class='add'>+	veor		\b3, \b3, \b1</div><div class='add'>+	veor		\b4, \b4, \b5</div><div class='add'>+	veor		\b7, \b7, \b5</div><div class='add'>+	veor		\b3, \b3, \b4</div><div class='add'>+	veor 		\b5, \b5, \b0</div><div class='add'>+	veor		\b3, \b3, \b7</div><div class='add'>+	veor		\b6, \b6, \b2</div><div class='add'>+	veor		\b2, \b2, \b1</div><div class='add'>+	veor		\b6, \b6, \b3</div><div class='add'>+	veor		\b3, \b3, \b0</div><div class='add'>+	veor		\b5, \b5, \b6</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		mul_gf4, x0, x1, y0, y1, t0, t1</div><div class='add'>+	veor 		\t0, \y0, \y1</div><div class='add'>+	vand		\t0, \t0, \x0</div><div class='add'>+	veor		\x0, \x0, \x1</div><div class='add'>+	vand		\t1, \x1, \y0</div><div class='add'>+	vand		\x0, \x0, \y1</div><div class='add'>+	veor		\x1, \t1, \t0</div><div class='add'>+	veor		\x0, \x0, \t1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		mul_gf4_n_gf4, x0, x1, y0, y1, t0, x2, x3, y2, y3, t1</div><div class='add'>+	veor		\t0, \y0, \y1</div><div class='add'>+	veor 		\t1, \y2, \y3</div><div class='add'>+	vand		\t0, \t0, \x0</div><div class='add'>+	vand		\t1, \t1, \x2</div><div class='add'>+	veor		\x0, \x0, \x1</div><div class='add'>+	veor		\x2, \x2, \x3</div><div class='add'>+	vand		\x1, \x1, \y0</div><div class='add'>+	vand		\x3, \x3, \y2</div><div class='add'>+	vand		\x0, \x0, \y1</div><div class='add'>+	vand		\x2, \x2, \y3</div><div class='add'>+	veor		\x1, \x1, \x0</div><div class='add'>+	veor		\x2, \x2, \x3</div><div class='add'>+	veor		\x0, \x0, \t0</div><div class='add'>+	veor		\x3, \x3, \t1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		mul_gf16_2, x0, x1, x2, x3, x4, x5, x6, x7, \</div><div class='add'>+				    y0, y1, y2, y3, t0, t1, t2, t3</div><div class='add'>+	veor		\t0, \x0, \x2</div><div class='add'>+	veor		\t1, \x1, \x3</div><div class='add'>+	mul_gf4  	\x0, \x1, \y0, \y1, \t2, \t3</div><div class='add'>+	veor		\y0, \y0, \y2</div><div class='add'>+	veor		\y1, \y1, \y3</div><div class='add'>+	mul_gf4_n_gf4	\t0, \t1, \y0, \y1, \t3, \x2, \x3, \y2, \y3, \t2</div><div class='add'>+	veor		\x0, \x0, \t0</div><div class='add'>+	veor		\x2, \x2, \t0</div><div class='add'>+	veor		\x1, \x1, \t1</div><div class='add'>+	veor		\x3, \x3, \t1</div><div class='add'>+	veor		\t0, \x4, \x6</div><div class='add'>+	veor		\t1, \x5, \x7</div><div class='add'>+	mul_gf4_n_gf4	\t0, \t1, \y0, \y1, \t3, \x6, \x7, \y2, \y3, \t2</div><div class='add'>+	veor		\y0, \y0, \y2</div><div class='add'>+	veor		\y1, \y1, \y3</div><div class='add'>+	mul_gf4  	\x4, \x5, \y0, \y1, \t2, \t3</div><div class='add'>+	veor		\x4, \x4, \t0</div><div class='add'>+	veor		\x6, \x6, \t0</div><div class='add'>+	veor		\x5, \x5, \t1</div><div class='add'>+	veor		\x7, \x7, \t1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		inv_gf256, x0, x1, x2, x3, x4, x5, x6, x7, \</div><div class='add'>+				   t0, t1, t2, t3, s0, s1, s2, s3</div><div class='add'>+	veor		\t3, \x4, \x6</div><div class='add'>+	veor		\t0, \x5, \x7</div><div class='add'>+	veor		\t1, \x1, \x3</div><div class='add'>+	veor		\s1, \x7, \x6</div><div class='add'>+	veor		\s0, \x0, \x2</div><div class='add'>+	veor		\s3, \t3, \t0</div><div class='add'>+	vorr		\t2, \t0, \t1</div><div class='add'>+	vand		\s2, \t3, \s0</div><div class='add'>+	vorr		\t3, \t3, \s0</div><div class='add'>+	veor		\s0, \s0, \t1</div><div class='add'>+	vand		\t0, \t0, \t1</div><div class='add'>+	veor		\t1, \x3, \x2</div><div class='add'>+	vand		\s3, \s3, \s0</div><div class='add'>+	vand		\s1, \s1, \t1</div><div class='add'>+	veor		\t1, \x4, \x5</div><div class='add'>+	veor		\s0, \x1, \x0</div><div class='add'>+	veor		\t3, \t3, \s1</div><div class='add'>+	veor		\t2, \t2, \s1</div><div class='add'>+	vand		\s1, \t1, \s0</div><div class='add'>+	vorr		\t1, \t1, \s0</div><div class='add'>+	veor		\t3, \t3, \s3</div><div class='add'>+	veor		\t0, \t0, \s1</div><div class='add'>+	veor		\t2, \t2, \s2</div><div class='add'>+	veor		\t1, \t1, \s3</div><div class='add'>+	veor		\t0, \t0, \s2</div><div class='add'>+	vand		\s0, \x7, \x3</div><div class='add'>+	veor		\t1, \t1, \s2</div><div class='add'>+	vand		\s1, \x6, \x2</div><div class='add'>+	vand		\s2, \x5, \x1</div><div class='add'>+	vorr		\s3, \x4, \x0</div><div class='add'>+	veor		\t3, \t3, \s0</div><div class='add'>+	veor		\t1, \t1, \s2</div><div class='add'>+	veor		\s0, \t0, \s3</div><div class='add'>+	veor		\t2, \t2, \s1</div><div class='add'>+	vand		\s2, \t3, \t1</div><div class='add'>+	veor		\s1, \t2, \s2</div><div class='add'>+	veor		\s3, \s0, \s2</div><div class='add'>+	vbsl		\s1, \t1, \s0</div><div class='add'>+	vmvn		\t0, \s0</div><div class='add'>+	vbsl		\s0, \s1, \s3</div><div class='add'>+	vbsl		\t0, \s1, \s3</div><div class='add'>+	vbsl		\s3, \t3, \t2</div><div class='add'>+	veor		\t3, \t3, \t2</div><div class='add'>+	vand		\s2, \s0, \s3</div><div class='add'>+	veor		\t1, \t1, \t0</div><div class='add'>+	veor		\s2, \s2, \t3</div><div class='add'>+	mul_gf16_2	\x0, \x1, \x2, \x3, \x4, \x5, \x6, \x7, \</div><div class='add'>+			\s3, \s2, \s1, \t1, \s0, \t0, \t2, \t3</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		sbox, b0, b1, b2, b3, b4, b5, b6, b7, \</div><div class='add'>+			      t0, t1, t2, t3, s0, s1, s2, s3</div><div class='add'>+	in_bs_ch	\b0, \b1, \b2, \b3, \b4, \b5, \b6, \b7</div><div class='add'>+	inv_gf256	\b6, \b5, \b0, \b3, \b7, \b1, \b4, \b2, \</div><div class='add'>+			\t0, \t1, \t2, \t3, \s0, \s1, \s2, \s3</div><div class='add'>+	out_bs_ch	\b7, \b1, \b4, \b2, \b6, \b5, \b0, \b3</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		inv_sbox, b0, b1, b2, b3, b4, b5, b6, b7, \</div><div class='add'>+				  t0, t1, t2, t3, s0, s1, s2, s3</div><div class='add'>+	inv_in_bs_ch	\b0, \b1, \b2, \b3, \b4, \b5, \b6, \b7</div><div class='add'>+	inv_gf256	\b5, \b1, \b2, \b6, \b3, \b7, \b0, \b4, \</div><div class='add'>+			\t0, \t1, \t2, \t3, \s0, \s1, \s2, \s3</div><div class='add'>+	inv_out_bs_ch	\b3, \b7, \b0, \b4, \b5, \b1, \b2, \b6</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		shift_rows, x0, x1, x2, x3, x4, x5, x6, x7, \</div><div class='add'>+				    t0, t1, t2, t3, mask</div><div class='add'>+	vld1.8		{\t0-\t1}, [bskey, :256]!</div><div class='add'>+	veor		\t0, \t0, \x0</div><div class='add'>+	vld1.8		{\t2-\t3}, [bskey, :256]!</div><div class='add'>+	veor		\t1, \t1, \x1</div><div class='add'>+	__tbl		\x0, \t0, \mask</div><div class='add'>+	veor		\t2, \t2, \x2</div><div class='add'>+	__tbl		\x1, \t1, \mask</div><div class='add'>+	vld1.8		{\t0-\t1}, [bskey, :256]!</div><div class='add'>+	veor		\t3, \t3, \x3</div><div class='add'>+	__tbl		\x2, \t2, \mask</div><div class='add'>+	__tbl		\x3, \t3, \mask</div><div class='add'>+	vld1.8		{\t2-\t3}, [bskey, :256]!</div><div class='add'>+	veor		\t0, \t0, \x4</div><div class='add'>+	veor		\t1, \t1, \x5</div><div class='add'>+	__tbl		\x4, \t0, \mask</div><div class='add'>+	veor		\t2, \t2, \x6</div><div class='add'>+	__tbl		\x5, \t1, \mask</div><div class='add'>+	veor		\t3, \t3, \x7</div><div class='add'>+	__tbl		\x6, \t2, \mask</div><div class='add'>+	__tbl		\x7, \t3, \mask</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		inv_shift_rows, x0, x1, x2, x3, x4, x5, x6, x7, \</div><div class='add'>+					t0, t1, t2, t3, mask</div><div class='add'>+	__tbl		\x0, \x0, \mask, \t0</div><div class='add'>+	__tbl		\x1, \x1, \mask, \t1</div><div class='add'>+	__tbl		\x2, \x2, \mask, \t2</div><div class='add'>+	__tbl		\x3, \x3, \mask, \t3</div><div class='add'>+	__tbl		\x4, \x4, \mask, \t0</div><div class='add'>+	__tbl		\x5, \x5, \mask, \t1</div><div class='add'>+	__tbl		\x6, \x6, \mask, \t2</div><div class='add'>+	__tbl		\x7, \x7, \mask, \t3</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		mix_cols, x0, x1, x2, x3, x4, x5, x6, x7, \</div><div class='add'>+				  t0, t1, t2, t3, t4, t5, t6, t7, inv</div><div class='add'>+	vext.8		\t0, \x0, \x0, #12</div><div class='add'>+	vext.8		\t1, \x1, \x1, #12</div><div class='add'>+	veor		\x0, \x0, \t0</div><div class='add'>+	vext.8		\t2, \x2, \x2, #12</div><div class='add'>+	veor		\x1, \x1, \t1</div><div class='add'>+	vext.8		\t3, \x3, \x3, #12</div><div class='add'>+	veor		\x2, \x2, \t2</div><div class='add'>+	vext.8		\t4, \x4, \x4, #12</div><div class='add'>+	veor		\x3, \x3, \t3</div><div class='add'>+	vext.8		\t5, \x5, \x5, #12</div><div class='add'>+	veor		\x4, \x4, \t4</div><div class='add'>+	vext.8		\t6, \x6, \x6, #12</div><div class='add'>+	veor		\x5, \x5, \t5</div><div class='add'>+	vext.8		\t7, \x7, \x7, #12</div><div class='add'>+	veor		\x6, \x6, \t6</div><div class='add'>+	veor		\t1, \t1, \x0</div><div class='add'>+	veor.8		\x7, \x7, \t7</div><div class='add'>+	vext.8		\x0, \x0, \x0, #8</div><div class='add'>+	veor		\t2, \t2, \x1</div><div class='add'>+	veor		\t0, \t0, \x7</div><div class='add'>+	veor		\t1, \t1, \x7</div><div class='add'>+	vext.8		\x1, \x1, \x1, #8</div><div class='add'>+	veor		\t5, \t5, \x4</div><div class='add'>+	veor		\x0, \x0, \t0</div><div class='add'>+	veor		\t6, \t6, \x5</div><div class='add'>+	veor		\x1, \x1, \t1</div><div class='add'>+	vext.8		\t0, \x4, \x4, #8</div><div class='add'>+	veor		\t4, \t4, \x3</div><div class='add'>+	vext.8		\t1, \x5, \x5, #8</div><div class='add'>+	veor		\t7, \t7, \x6</div><div class='add'>+	vext.8		\x4, \x3, \x3, #8</div><div class='add'>+	veor		\t3, \t3, \x2</div><div class='add'>+	vext.8		\x5, \x7, \x7, #8</div><div class='add'>+	veor		\t4, \t4, \x7</div><div class='add'>+	vext.8		\x3, \x6, \x6, #8</div><div class='add'>+	veor		\t3, \t3, \x7</div><div class='add'>+	vext.8		\x6, \x2, \x2, #8</div><div class='add'>+	veor		\x7, \t1, \t5</div><div class='add'>+	.ifb		\inv</div><div class='add'>+	veor		\x2, \t0, \t4</div><div class='add'>+	veor		\x4, \x4, \t3</div><div class='add'>+	veor		\x5, \x5, \t7</div><div class='add'>+	veor		\x3, \x3, \t6</div><div class='add'>+	veor		\x6, \x6, \t2</div><div class='add'>+	.else</div><div class='add'>+	veor		\t3, \t3, \x4</div><div class='add'>+	veor		\x5, \x5, \t7</div><div class='add'>+	veor		\x2, \x3, \t6</div><div class='add'>+	veor		\x3, \t0, \t4</div><div class='add'>+	veor		\x4, \x6, \t2</div><div class='add'>+	vmov		\x6, \t3</div><div class='add'>+	.endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		inv_mix_cols, x0, x1, x2, x3, x4, x5, x6, x7, \</div><div class='add'>+				      t0, t1, t2, t3, t4, t5, t6, t7</div><div class='add'>+	vld1.8		{\t0-\t1}, [bskey, :256]!</div><div class='add'>+	veor		\x0, \x0, \t0</div><div class='add'>+	vld1.8		{\t2-\t3}, [bskey, :256]!</div><div class='add'>+	veor		\x1, \x1, \t1</div><div class='add'>+	vld1.8		{\t4-\t5}, [bskey, :256]!</div><div class='add'>+	veor		\x2, \x2, \t2</div><div class='add'>+	vld1.8		{\t6-\t7}, [bskey, :256]</div><div class='add'>+	sub		bskey, bskey, #224</div><div class='add'>+	veor		\x3, \x3, \t3</div><div class='add'>+	veor		\x4, \x4, \t4</div><div class='add'>+	veor		\x5, \x5, \t5</div><div class='add'>+	veor		\x6, \x6, \t6</div><div class='add'>+	veor		\x7, \x7, \t7</div><div class='add'>+	vext.8		\t0, \x0, \x0, #8</div><div class='add'>+	vext.8		\t6, \x6, \x6, #8</div><div class='add'>+	vext.8		\t7, \x7, \x7, #8</div><div class='add'>+	veor		\t0, \t0, \x0</div><div class='add'>+	vext.8		\t1, \x1, \x1, #8</div><div class='add'>+	veor		\t6, \t6, \x6</div><div class='add'>+	vext.8		\t2, \x2, \x2, #8</div><div class='add'>+	veor		\t7, \t7, \x7</div><div class='add'>+	vext.8		\t3, \x3, \x3, #8</div><div class='add'>+	veor		\t1, \t1, \x1</div><div class='add'>+	vext.8		\t4, \x4, \x4, #8</div><div class='add'>+	veor		\t2, \t2, \x2</div><div class='add'>+	vext.8		\t5, \x5, \x5, #8</div><div class='add'>+	veor		\t3, \t3, \x3</div><div class='add'>+	veor		\t4, \t4, \x4</div><div class='add'>+	veor		\t5, \t5, \x5</div><div class='add'>+	veor		\x0, \x0, \t6</div><div class='add'>+	veor		\x1, \x1, \t6</div><div class='add'>+	veor		\x2, \x2, \t0</div><div class='add'>+	veor		\x4, \x4, \t2</div><div class='add'>+	veor		\x3, \x3, \t1</div><div class='add'>+	veor		\x1, \x1, \t7</div><div class='add'>+	veor		\x2, \x2, \t7</div><div class='add'>+	veor		\x4, \x4, \t6</div><div class='add'>+	veor		\x5, \x5, \t3</div><div class='add'>+	veor		\x3, \x3, \t6</div><div class='add'>+	veor		\x6, \x6, \t4</div><div class='add'>+	veor		\x4, \x4, \t7</div><div class='add'>+	veor		\x5, \x5, \t7</div><div class='add'>+	veor		\x7, \x7, \t5</div><div class='add'>+	mix_cols	\x0, \x1, \x2, \x3, \x4, \x5, \x6, \x7, \</div><div class='add'>+			\t0, \t1, \t2, \t3, \t4, \t5, \t6, \t7, 1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		swapmove_2x, a0, b0, a1, b1, n, mask, t0, t1</div><div class='add'>+	vshr.u64	\t0, \b0, #\n</div><div class='add'>+	vshr.u64	\t1, \b1, #\n</div><div class='add'>+	veor		\t0, \t0, \a0</div><div class='add'>+	veor		\t1, \t1, \a1</div><div class='add'>+	vand		\t0, \t0, \mask</div><div class='add'>+	vand		\t1, \t1, \mask</div><div class='add'>+	veor		\a0, \a0, \t0</div><div class='add'>+	vshl.s64	\t0, \t0, #\n</div><div class='add'>+	veor		\a1, \a1, \t1</div><div class='add'>+	vshl.s64	\t1, \t1, #\n</div><div class='add'>+	veor		\b0, \b0, \t0</div><div class='add'>+	veor		\b1, \b1, \t1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		bitslice, x7, x6, x5, x4, x3, x2, x1, x0, t0, t1, t2, t3</div><div class='add'>+	vmov.i8		\t0, #0x55</div><div class='add'>+	vmov.i8		\t1, #0x33</div><div class='add'>+	swapmove_2x	\x0, \x1, \x2, \x3, 1, \t0, \t2, \t3</div><div class='add'>+	swapmove_2x	\x4, \x5, \x6, \x7, 1, \t0, \t2, \t3</div><div class='add'>+	vmov.i8		\t0, #0x0f</div><div class='add'>+	swapmove_2x	\x0, \x2, \x1, \x3, 2, \t1, \t2, \t3</div><div class='add'>+	swapmove_2x	\x4, \x6, \x5, \x7, 2, \t1, \t2, \t3</div><div class='add'>+	swapmove_2x	\x0, \x4, \x1, \x5, 4, \t0, \t2, \t3</div><div class='add'>+	swapmove_2x	\x2, \x6, \x3, \x7, 4, \t0, \t2, \t3</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+M0:	.quad		0x02060a0e03070b0f, 0x0004080c0105090d</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * void aesbs_convert_key(u8 out[], u32 const rk[], int rounds)</div><div class='add'>+	 */</div><div class='add'>+ENTRY(aesbs_convert_key)</div><div class='add'>+	vld1.32		{q7}, [r1]!		// load round 0 key</div><div class='add'>+	vld1.32		{q15}, [r1]!		// load round 1 key</div><div class='add'>+</div><div class='add'>+	vmov.i8		q8,  #0x01		// bit masks</div><div class='add'>+	vmov.i8		q9,  #0x02</div><div class='add'>+	vmov.i8		q10, #0x04</div><div class='add'>+	vmov.i8		q11, #0x08</div><div class='add'>+	vmov.i8		q12, #0x10</div><div class='add'>+	vmov.i8		q13, #0x20</div><div class='add'>+	__ldr		q14, M0</div><div class='add'>+</div><div class='add'>+	sub		r2, r2, #1</div><div class='add'>+	vst1.8		{q7}, [r0, :128]!	// save round 0 key</div><div class='add'>+</div><div class='add'>+.Lkey_loop:</div><div class='add'>+	__tbl		q7, q15, q14</div><div class='add'>+	vmov.i8		q6, #0x40</div><div class='add'>+	vmov.i8		q15, #0x80</div><div class='add'>+</div><div class='add'>+	vtst.8		q0, q7, q8</div><div class='add'>+	vtst.8		q1, q7, q9</div><div class='add'>+	vtst.8		q2, q7, q10</div><div class='add'>+	vtst.8		q3, q7, q11</div><div class='add'>+	vtst.8		q4, q7, q12</div><div class='add'>+	vtst.8		q5, q7, q13</div><div class='add'>+	vtst.8		q6, q7, q6</div><div class='add'>+	vtst.8		q7, q7, q15</div><div class='add'>+	vld1.32		{q15}, [r1]!		// load next round key</div><div class='add'>+	vmvn		q0, q0</div><div class='add'>+	vmvn		q1, q1</div><div class='add'>+	vmvn		q5, q5</div><div class='add'>+	vmvn		q6, q6</div><div class='add'>+</div><div class='add'>+	subs		r2, r2, #1</div><div class='add'>+	vst1.8		{q0-q1}, [r0, :256]!</div><div class='add'>+	vst1.8		{q2-q3}, [r0, :256]!</div><div class='add'>+	vst1.8		{q4-q5}, [r0, :256]!</div><div class='add'>+	vst1.8		{q6-q7}, [r0, :256]!</div><div class='add'>+	bne		.Lkey_loop</div><div class='add'>+</div><div class='add'>+	vmov.i8		q7, #0x63		// compose .L63</div><div class='add'>+	veor		q15, q15, q7</div><div class='add'>+	vst1.8		{q15}, [r0, :128]</div><div class='add'>+	bx		lr</div><div class='add'>+ENDPROC(aesbs_convert_key)</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+M0SR:	.quad		0x0a0e02060f03070b, 0x0004080c05090d01</div><div class='add'>+</div><div class='add'>+aesbs_encrypt8:</div><div class='add'>+	vld1.8		{q9}, [bskey, :128]!	// round 0 key</div><div class='add'>+	__ldr		q8, M0SR</div><div class='add'>+</div><div class='add'>+	veor		q10, q0, q9		// xor with round0 key</div><div class='add'>+	veor		q11, q1, q9</div><div class='add'>+	__tbl		q0, q10, q8</div><div class='add'>+	veor		q12, q2, q9</div><div class='add'>+	__tbl		q1, q11, q8</div><div class='add'>+	veor		q13, q3, q9</div><div class='add'>+	__tbl		q2, q12, q8</div><div class='add'>+	veor		q14, q4, q9</div><div class='add'>+	__tbl		q3, q13, q8</div><div class='add'>+	veor		q15, q5, q9</div><div class='add'>+	__tbl		q4, q14, q8</div><div class='add'>+	veor		q10, q6, q9</div><div class='add'>+	__tbl		q5, q15, q8</div><div class='add'>+	veor		q11, q7, q9</div><div class='add'>+	__tbl		q6, q10, q8</div><div class='add'>+	__tbl		q7, q11, q8</div><div class='add'>+</div><div class='add'>+	bitslice	q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11</div><div class='add'>+</div><div class='add'>+	sub		rounds, rounds, #1</div><div class='add'>+	b		.Lenc_sbox</div><div class='add'>+</div><div class='add'>+	.align		5</div><div class='add'>+SR:	.quad		0x0504070600030201, 0x0f0e0d0c0a09080b</div><div class='add'>+SRM0:	.quad		0x0304090e00050a0f, 0x01060b0c0207080d</div><div class='add'>+</div><div class='add'>+.Lenc_last:</div><div class='add'>+	__ldr		q12, SRM0</div><div class='add'>+.Lenc_loop:</div><div class='add'>+	shift_rows	q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11, q12</div><div class='add'>+.Lenc_sbox:</div><div class='add'>+	sbox		q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11, q12, \</div><div class='add'>+								q13, q14, q15</div><div class='add'>+	subs		rounds, rounds, #1</div><div class='add'>+	bcc		.Lenc_done</div><div class='add'>+</div><div class='add'>+	mix_cols	q0, q1, q4, q6, q3, q7, q2, q5, q8, q9, q10, q11, q12, \</div><div class='add'>+								q13, q14, q15</div><div class='add'>+</div><div class='add'>+	beq		.Lenc_last</div><div class='add'>+	__ldr		q12, SR</div><div class='add'>+	b		.Lenc_loop</div><div class='add'>+</div><div class='add'>+.Lenc_done:</div><div class='add'>+	vld1.8		{q12}, [bskey, :128]	// last round key</div><div class='add'>+</div><div class='add'>+	bitslice	q0, q1, q4, q6, q3, q7, q2, q5, q8, q9, q10, q11</div><div class='add'>+</div><div class='add'>+	veor		q0, q0, q12</div><div class='add'>+	veor		q1, q1, q12</div><div class='add'>+	veor		q4, q4, q12</div><div class='add'>+	veor		q6, q6, q12</div><div class='add'>+	veor		q3, q3, q12</div><div class='add'>+	veor		q7, q7, q12</div><div class='add'>+	veor		q2, q2, q12</div><div class='add'>+	veor		q5, q5, q12</div><div class='add'>+	bx		lr</div><div class='add'>+ENDPROC(aesbs_encrypt8)</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+M0ISR:	.quad		0x0a0e0206070b0f03, 0x0004080c0d010509</div><div class='add'>+</div><div class='add'>+aesbs_decrypt8:</div><div class='add'>+	add		bskey, bskey, rounds, lsl #7</div><div class='add'>+	sub		bskey, bskey, #112</div><div class='add'>+	vld1.8		{q9}, [bskey, :128]	// round 0 key</div><div class='add'>+	sub		bskey, bskey, #128</div><div class='add'>+	__ldr		q8, M0ISR</div><div class='add'>+</div><div class='add'>+	veor		q10, q0, q9		// xor with round0 key</div><div class='add'>+	veor		q11, q1, q9</div><div class='add'>+	__tbl		q0, q10, q8</div><div class='add'>+	veor		q12, q2, q9</div><div class='add'>+	__tbl		q1, q11, q8</div><div class='add'>+	veor		q13, q3, q9</div><div class='add'>+	__tbl		q2, q12, q8</div><div class='add'>+	veor		q14, q4, q9</div><div class='add'>+	__tbl		q3, q13, q8</div><div class='add'>+	veor		q15, q5, q9</div><div class='add'>+	__tbl		q4, q14, q8</div><div class='add'>+	veor		q10, q6, q9</div><div class='add'>+	__tbl		q5, q15, q8</div><div class='add'>+	veor		q11, q7, q9</div><div class='add'>+	__tbl		q6, q10, q8</div><div class='add'>+	__tbl		q7, q11, q8</div><div class='add'>+</div><div class='add'>+	bitslice	q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11</div><div class='add'>+</div><div class='add'>+	sub		rounds, rounds, #1</div><div class='add'>+	b		.Ldec_sbox</div><div class='add'>+</div><div class='add'>+	.align		5</div><div class='add'>+ISR:	.quad		0x0504070602010003, 0x0f0e0d0c080b0a09</div><div class='add'>+ISRM0:	.quad		0x01040b0e0205080f, 0x0306090c00070a0d</div><div class='add'>+</div><div class='add'>+.Ldec_last:</div><div class='add'>+	__ldr		q12, ISRM0</div><div class='add'>+.Ldec_loop:</div><div class='add'>+	inv_shift_rows	q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11, q12</div><div class='add'>+.Ldec_sbox:</div><div class='add'>+	inv_sbox	q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11, q12, \</div><div class='add'>+								q13, q14, q15</div><div class='add'>+	subs		rounds, rounds, #1</div><div class='add'>+	bcc		.Ldec_done</div><div class='add'>+</div><div class='add'>+	inv_mix_cols	q0, q1, q6, q4, q2, q7, q3, q5, q8, q9, q10, q11, q12, \</div><div class='add'>+								q13, q14, q15</div><div class='add'>+</div><div class='add'>+	beq		.Ldec_last</div><div class='add'>+	__ldr		q12, ISR</div><div class='add'>+	b		.Ldec_loop</div><div class='add'>+</div><div class='add'>+.Ldec_done:</div><div class='add'>+	add		bskey, bskey, #112</div><div class='add'>+	vld1.8		{q12}, [bskey, :128]	// last round key</div><div class='add'>+</div><div class='add'>+	bitslice	q0, q1, q6, q4, q2, q7, q3, q5, q8, q9, q10, q11</div><div class='add'>+</div><div class='add'>+	veor		q0, q0, q12</div><div class='add'>+	veor		q1, q1, q12</div><div class='add'>+	veor		q6, q6, q12</div><div class='add'>+	veor		q4, q4, q12</div><div class='add'>+	veor		q2, q2, q12</div><div class='add'>+	veor		q7, q7, q12</div><div class='add'>+	veor		q3, q3, q12</div><div class='add'>+	veor		q5, q5, q12</div><div class='add'>+	bx		lr</div><div class='add'>+ENDPROC(aesbs_decrypt8)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * aesbs_ecb_encrypt(u8 out[], u8 const in[], u8 const rk[], int rounds,</div><div class='add'>+	 *		     int blocks)</div><div class='add'>+	 * aesbs_ecb_decrypt(u8 out[], u8 const in[], u8 const rk[], int rounds,</div><div class='add'>+	 *		     int blocks)</div><div class='add'>+	 */</div><div class='add'>+	.macro		__ecb_crypt, do8, o0, o1, o2, o3, o4, o5, o6, o7</div><div class='add'>+	push		{r4-r6, lr}</div><div class='add'>+	ldr		r5, [sp, #16]		// number of blocks</div><div class='add'>+</div><div class='add'>+99:	__adr		ip, 0f</div><div class='add'>+	and		lr, r5, #7</div><div class='add'>+	cmp		r5, #8</div><div class='add'>+	sub		ip, ip, lr, lsl #2</div><div class='add'>+	bxlt		ip			// computed goto if blocks &lt; 8</div><div class='add'>+</div><div class='add'>+	vld1.8		{q0}, [r1]!</div><div class='add'>+	vld1.8		{q1}, [r1]!</div><div class='add'>+	vld1.8		{q2}, [r1]!</div><div class='add'>+	vld1.8		{q3}, [r1]!</div><div class='add'>+	vld1.8		{q4}, [r1]!</div><div class='add'>+	vld1.8		{q5}, [r1]!</div><div class='add'>+	vld1.8		{q6}, [r1]!</div><div class='add'>+	vld1.8		{q7}, [r1]!</div><div class='add'>+</div><div class='add'>+0:	mov		bskey, r2</div><div class='add'>+	mov		rounds, r3</div><div class='add'>+	bl		\do8</div><div class='add'>+</div><div class='add'>+	__adr		ip, 1f</div><div class='add'>+	and		lr, r5, #7</div><div class='add'>+	cmp		r5, #8</div><div class='add'>+	sub		ip, ip, lr, lsl #2</div><div class='add'>+	bxlt		ip			// computed goto if blocks &lt; 8</div><div class='add'>+</div><div class='add'>+	vst1.8		{\o0}, [r0]!</div><div class='add'>+	vst1.8		{\o1}, [r0]!</div><div class='add'>+	vst1.8		{\o2}, [r0]!</div><div class='add'>+	vst1.8		{\o3}, [r0]!</div><div class='add'>+	vst1.8		{\o4}, [r0]!</div><div class='add'>+	vst1.8		{\o5}, [r0]!</div><div class='add'>+	vst1.8		{\o6}, [r0]!</div><div class='add'>+	vst1.8		{\o7}, [r0]!</div><div class='add'>+</div><div class='add'>+1:	subs		r5, r5, #8</div><div class='add'>+	bgt		99b</div><div class='add'>+</div><div class='add'>+	pop		{r4-r6, pc}</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+ENTRY(aesbs_ecb_encrypt)</div><div class='add'>+	__ecb_crypt	aesbs_encrypt8, q0, q1, q4, q6, q3, q7, q2, q5</div><div class='add'>+ENDPROC(aesbs_ecb_encrypt)</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+ENTRY(aesbs_ecb_decrypt)</div><div class='add'>+	__ecb_crypt	aesbs_decrypt8, q0, q1, q6, q4, q2, q7, q3, q5</div><div class='add'>+ENDPROC(aesbs_ecb_decrypt)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * aesbs_cbc_decrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+	 *		     int rounds, int blocks, u8 iv[])</div><div class='add'>+	 */</div><div class='add'>+	.align		4</div><div class='add'>+ENTRY(aesbs_cbc_decrypt)</div><div class='add'>+	mov		ip, sp</div><div class='add'>+	push		{r4-r6, lr}</div><div class='add'>+	ldm		ip, {r5-r6}		// load args 4-5</div><div class='add'>+</div><div class='add'>+99:	__adr		ip, 0f</div><div class='add'>+	and		lr, r5, #7</div><div class='add'>+	cmp		r5, #8</div><div class='add'>+	sub		ip, ip, lr, lsl #2</div><div class='add'>+	mov		lr, r1</div><div class='add'>+	bxlt		ip			// computed goto if blocks &lt; 8</div><div class='add'>+</div><div class='add'>+	vld1.8		{q0}, [lr]!</div><div class='add'>+	vld1.8		{q1}, [lr]!</div><div class='add'>+	vld1.8		{q2}, [lr]!</div><div class='add'>+	vld1.8		{q3}, [lr]!</div><div class='add'>+	vld1.8		{q4}, [lr]!</div><div class='add'>+	vld1.8		{q5}, [lr]!</div><div class='add'>+	vld1.8		{q6}, [lr]!</div><div class='add'>+	vld1.8		{q7}, [lr]</div><div class='add'>+</div><div class='add'>+0:	mov		bskey, r2</div><div class='add'>+	mov		rounds, r3</div><div class='add'>+	bl		aesbs_decrypt8</div><div class='add'>+</div><div class='add'>+	vld1.8		{q8}, [r6]</div><div class='add'>+	vmov		q9, q8</div><div class='add'>+	vmov		q10, q8</div><div class='add'>+	vmov		q11, q8</div><div class='add'>+	vmov		q12, q8</div><div class='add'>+	vmov		q13, q8</div><div class='add'>+	vmov		q14, q8</div><div class='add'>+	vmov		q15, q8</div><div class='add'>+</div><div class='add'>+	__adr		ip, 1f</div><div class='add'>+	and		lr, r5, #7</div><div class='add'>+	cmp		r5, #8</div><div class='add'>+	sub		ip, ip, lr, lsl #2</div><div class='add'>+	bxlt		ip			// computed goto if blocks &lt; 8</div><div class='add'>+</div><div class='add'>+	vld1.8		{q9}, [r1]!</div><div class='add'>+	vld1.8		{q10}, [r1]!</div><div class='add'>+	vld1.8		{q11}, [r1]!</div><div class='add'>+	vld1.8		{q12}, [r1]!</div><div class='add'>+	vld1.8		{q13}, [r1]!</div><div class='add'>+	vld1.8		{q14}, [r1]!</div><div class='add'>+	vld1.8		{q15}, [r1]!</div><div class='add'>+	W(nop)</div><div class='add'>+</div><div class='add'>+1:	__adr		ip, 2f</div><div class='add'>+	sub		ip, ip, lr, lsl #3</div><div class='add'>+	bxlt		ip			// computed goto if blocks &lt; 8</div><div class='add'>+</div><div class='add'>+	veor		q0, q0, q8</div><div class='add'>+	vst1.8		{q0}, [r0]!</div><div class='add'>+	veor		q1, q1, q9</div><div class='add'>+	vst1.8		{q1}, [r0]!</div><div class='add'>+	veor		q6, q6, q10</div><div class='add'>+	vst1.8		{q6}, [r0]!</div><div class='add'>+	veor		q4, q4, q11</div><div class='add'>+	vst1.8		{q4}, [r0]!</div><div class='add'>+	veor		q2, q2, q12</div><div class='add'>+	vst1.8		{q2}, [r0]!</div><div class='add'>+	veor		q7, q7, q13</div><div class='add'>+	vst1.8		{q7}, [r0]!</div><div class='add'>+	veor		q3, q3, q14</div><div class='add'>+	vst1.8		{q3}, [r0]!</div><div class='add'>+	veor		q5, q5, q15</div><div class='add'>+	vld1.8		{q8}, [r1]!		// load next round's iv</div><div class='add'>+2:	vst1.8		{q5}, [r0]!</div><div class='add'>+</div><div class='add'>+	subs		r5, r5, #8</div><div class='add'>+	vst1.8		{q8}, [r6]		// store next round's iv</div><div class='add'>+	bgt		99b</div><div class='add'>+</div><div class='add'>+	pop		{r4-r6, pc}</div><div class='add'>+ENDPROC(aesbs_cbc_decrypt)</div><div class='add'>+</div><div class='add'>+	.macro		next_ctr, q</div><div class='add'>+	vmov.32		\q\()h[1], r10</div><div class='add'>+	adds		r10, r10, #1</div><div class='add'>+	vmov.32		\q\()h[0], r9</div><div class='add'>+	adcs		r9, r9, #0</div><div class='add'>+	vmov.32		\q\()l[1], r8</div><div class='add'>+	adcs		r8, r8, #0</div><div class='add'>+	vmov.32		\q\()l[0], r7</div><div class='add'>+	adc		r7, r7, #0</div><div class='add'>+	vrev32.8	\q, \q</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * aesbs_ctr_encrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+	 *		     int rounds, int blocks, u8 ctr[], u8 final[])</div><div class='add'>+	 */</div><div class='add'>+ENTRY(aesbs_ctr_encrypt)</div><div class='add'>+	mov		ip, sp</div><div class='add'>+	push		{r4-r10, lr}</div><div class='add'>+</div><div class='add'>+	ldm		ip, {r5-r7}		// load args 4-6</div><div class='add'>+	teq		r7, #0</div><div class='add'>+	addne		r5, r5, #1		// one extra block if final != 0</div><div class='add'>+</div><div class='add'>+	vld1.8		{q0}, [r6]		// load counter</div><div class='add'>+	vrev32.8	q1, q0</div><div class='add'>+	vmov		r9, r10, d3</div><div class='add'>+	vmov		r7, r8, d2</div><div class='add'>+</div><div class='add'>+	adds		r10, r10, #1</div><div class='add'>+	adcs		r9, r9, #0</div><div class='add'>+	adcs		r8, r8, #0</div><div class='add'>+	adc		r7, r7, #0</div><div class='add'>+</div><div class='add'>+99:	vmov		q1, q0</div><div class='add'>+	vmov		q2, q0</div><div class='add'>+	vmov		q3, q0</div><div class='add'>+	vmov		q4, q0</div><div class='add'>+	vmov		q5, q0</div><div class='add'>+	vmov		q6, q0</div><div class='add'>+	vmov		q7, q0</div><div class='add'>+</div><div class='add'>+	__adr		ip, 0f</div><div class='add'>+	sub		lr, r5, #1</div><div class='add'>+	and		lr, lr, #7</div><div class='add'>+	cmp		r5, #8</div><div class='add'>+	sub		ip, ip, lr, lsl #5</div><div class='add'>+	sub		ip, ip, lr, lsl #2</div><div class='add'>+	bxlt		ip			// computed goto if blocks &lt; 8</div><div class='add'>+</div><div class='add'>+	next_ctr	q1</div><div class='add'>+	next_ctr	q2</div><div class='add'>+	next_ctr	q3</div><div class='add'>+	next_ctr	q4</div><div class='add'>+	next_ctr	q5</div><div class='add'>+	next_ctr	q6</div><div class='add'>+	next_ctr	q7</div><div class='add'>+</div><div class='add'>+0:	mov		bskey, r2</div><div class='add'>+	mov		rounds, r3</div><div class='add'>+	bl		aesbs_encrypt8</div><div class='add'>+</div><div class='add'>+	__adr		ip, 1f</div><div class='add'>+	and		lr, r5, #7</div><div class='add'>+	cmp		r5, #8</div><div class='add'>+	movgt		r4, #0</div><div class='add'>+	ldrle		r4, [sp, #40]		// load final in the last round</div><div class='add'>+	sub		ip, ip, lr, lsl #2</div><div class='add'>+	bxlt		ip			// computed goto if blocks &lt; 8</div><div class='add'>+</div><div class='add'>+	vld1.8		{q8}, [r1]!</div><div class='add'>+	vld1.8		{q9}, [r1]!</div><div class='add'>+	vld1.8		{q10}, [r1]!</div><div class='add'>+	vld1.8		{q11}, [r1]!</div><div class='add'>+	vld1.8		{q12}, [r1]!</div><div class='add'>+	vld1.8		{q13}, [r1]!</div><div class='add'>+	vld1.8		{q14}, [r1]!</div><div class='add'>+	teq		r4, #0			// skip last block if 'final'</div><div class='add'>+1:	bne		2f</div><div class='add'>+	vld1.8		{q15}, [r1]!</div><div class='add'>+</div><div class='add'>+2:	__adr		ip, 3f</div><div class='add'>+	cmp		r5, #8</div><div class='add'>+	sub		ip, ip, lr, lsl #3</div><div class='add'>+	bxlt		ip			// computed goto if blocks &lt; 8</div><div class='add'>+</div><div class='add'>+	veor		q0, q0, q8</div><div class='add'>+	vst1.8		{q0}, [r0]!</div><div class='add'>+	veor		q1, q1, q9</div><div class='add'>+	vst1.8		{q1}, [r0]!</div><div class='add'>+	veor		q4, q4, q10</div><div class='add'>+	vst1.8		{q4}, [r0]!</div><div class='add'>+	veor		q6, q6, q11</div><div class='add'>+	vst1.8		{q6}, [r0]!</div><div class='add'>+	veor		q3, q3, q12</div><div class='add'>+	vst1.8		{q3}, [r0]!</div><div class='add'>+	veor		q7, q7, q13</div><div class='add'>+	vst1.8		{q7}, [r0]!</div><div class='add'>+	veor		q2, q2, q14</div><div class='add'>+	vst1.8		{q2}, [r0]!</div><div class='add'>+	teq		r4, #0			// skip last block if 'final'</div><div class='add'>+	W(bne)		5f</div><div class='add'>+3:	veor		q5, q5, q15</div><div class='add'>+	vst1.8		{q5}, [r0]!</div><div class='add'>+</div><div class='add'>+4:	next_ctr	q0</div><div class='add'>+</div><div class='add'>+	subs		r5, r5, #8</div><div class='add'>+	bgt		99b</div><div class='add'>+</div><div class='add'>+	vst1.8		{q0}, [r6]</div><div class='add'>+	pop		{r4-r10, pc}</div><div class='add'>+</div><div class='add'>+5:	vst1.8		{q5}, [r4]</div><div class='add'>+	b		4b</div><div class='add'>+ENDPROC(aesbs_ctr_encrypt)</div><div class='add'>+</div><div class='add'>+	.macro		next_tweak, out, in, const, tmp</div><div class='add'>+	vshr.s64	\tmp, \in, #63</div><div class='add'>+	vand		\tmp, \tmp, \const</div><div class='add'>+	vadd.u64	\out, \in, \in</div><div class='add'>+	vext.8		\tmp, \tmp, \tmp, #8</div><div class='add'>+	veor		\out, \out, \tmp</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+.Lxts_mul_x:</div><div class='add'>+	.quad		1, 0x87</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * aesbs_xts_encrypt(u8 out[], u8 const in[], u8 const rk[], int rounds,</div><div class='add'>+	 *		     int blocks, u8 iv[])</div><div class='add'>+	 * aesbs_xts_decrypt(u8 out[], u8 const in[], u8 const rk[], int rounds,</div><div class='add'>+	 *		     int blocks, u8 iv[])</div><div class='add'>+	 */</div><div class='add'>+__xts_prepare8:</div><div class='add'>+	vld1.8		{q14}, [r7]		// load iv</div><div class='add'>+	__ldr		q15, .Lxts_mul_x	// load tweak mask</div><div class='add'>+	vmov		q12, q14</div><div class='add'>+</div><div class='add'>+	__adr		ip, 0f</div><div class='add'>+	and		r4, r6, #7</div><div class='add'>+	cmp		r6, #8</div><div class='add'>+	sub		ip, ip, r4, lsl #5</div><div class='add'>+	mov		r4, sp</div><div class='add'>+	bxlt		ip			// computed goto if blocks &lt; 8</div><div class='add'>+</div><div class='add'>+	vld1.8		{q0}, [r1]!</div><div class='add'>+	next_tweak	q12, q14, q15, q13</div><div class='add'>+	veor		q0, q0, q14</div><div class='add'>+	vst1.8		{q14}, [r4, :128]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q1}, [r1]!</div><div class='add'>+	next_tweak	q14, q12, q15, q13</div><div class='add'>+	veor		q1, q1, q12</div><div class='add'>+	vst1.8		{q12}, [r4, :128]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q2}, [r1]!</div><div class='add'>+	next_tweak	q12, q14, q15, q13</div><div class='add'>+	veor		q2, q2, q14</div><div class='add'>+	vst1.8		{q14}, [r4, :128]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q3}, [r1]!</div><div class='add'>+	next_tweak	q14, q12, q15, q13</div><div class='add'>+	veor		q3, q3, q12</div><div class='add'>+	vst1.8		{q12}, [r4, :128]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q4}, [r1]!</div><div class='add'>+	next_tweak	q12, q14, q15, q13</div><div class='add'>+	veor		q4, q4, q14</div><div class='add'>+	vst1.8		{q14}, [r4, :128]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q5}, [r1]!</div><div class='add'>+	next_tweak	q14, q12, q15, q13</div><div class='add'>+	veor		q5, q5, q12</div><div class='add'>+	vst1.8		{q12}, [r4, :128]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q6}, [r1]!</div><div class='add'>+	next_tweak	q12, q14, q15, q13</div><div class='add'>+	veor		q6, q6, q14</div><div class='add'>+	vst1.8		{q14}, [r4, :128]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q7}, [r1]!</div><div class='add'>+	next_tweak	q14, q12, q15, q13</div><div class='add'>+	veor		q7, q7, q12</div><div class='add'>+	vst1.8		{q12}, [r4, :128]</div><div class='add'>+</div><div class='add'>+0:	vst1.8		{q14}, [r7]		// store next iv</div><div class='add'>+	bx		lr</div><div class='add'>+ENDPROC(__xts_prepare8)</div><div class='add'>+</div><div class='add'>+	.macro		__xts_crypt, do8, o0, o1, o2, o3, o4, o5, o6, o7</div><div class='add'>+	push		{r4-r8, lr}</div><div class='add'>+	mov		r5, sp			// preserve sp</div><div class='add'>+	ldrd		r6, r7, [sp, #24]	// get blocks and iv args</div><div class='add'>+	sub		ip, sp, #128		// make room for 8x tweak</div><div class='add'>+	bic		ip, ip, #0xf		// align sp to 16 bytes</div><div class='add'>+	mov		sp, ip</div><div class='add'>+</div><div class='add'>+99:	bl		__xts_prepare8</div><div class='add'>+</div><div class='add'>+	mov		bskey, r2</div><div class='add'>+	mov		rounds, r3</div><div class='add'>+	bl		\do8</div><div class='add'>+</div><div class='add'>+	__adr		ip, 0f</div><div class='add'>+	and		lr, r6, #7</div><div class='add'>+	cmp		r6, #8</div><div class='add'>+	sub		ip, ip, lr, lsl #2</div><div class='add'>+	mov		r4, sp</div><div class='add'>+	bxlt		ip			// computed goto if blocks &lt; 8</div><div class='add'>+</div><div class='add'>+	vld1.8		{q8}, [r4, :128]!</div><div class='add'>+	vld1.8		{q9}, [r4, :128]!</div><div class='add'>+	vld1.8		{q10}, [r4, :128]!</div><div class='add'>+	vld1.8		{q11}, [r4, :128]!</div><div class='add'>+	vld1.8		{q12}, [r4, :128]!</div><div class='add'>+	vld1.8		{q13}, [r4, :128]!</div><div class='add'>+	vld1.8		{q14}, [r4, :128]!</div><div class='add'>+	vld1.8		{q15}, [r4, :128]</div><div class='add'>+</div><div class='add'>+0:	__adr		ip, 1f</div><div class='add'>+	sub		ip, ip, lr, lsl #3</div><div class='add'>+	bxlt		ip			// computed goto if blocks &lt; 8</div><div class='add'>+</div><div class='add'>+	veor		\o0, \o0, q8</div><div class='add'>+	vst1.8		{\o0}, [r0]!</div><div class='add'>+	veor		\o1, \o1, q9</div><div class='add'>+	vst1.8		{\o1}, [r0]!</div><div class='add'>+	veor		\o2, \o2, q10</div><div class='add'>+	vst1.8		{\o2}, [r0]!</div><div class='add'>+	veor		\o3, \o3, q11</div><div class='add'>+	vst1.8		{\o3}, [r0]!</div><div class='add'>+	veor		\o4, \o4, q12</div><div class='add'>+	vst1.8		{\o4}, [r0]!</div><div class='add'>+	veor		\o5, \o5, q13</div><div class='add'>+	vst1.8		{\o5}, [r0]!</div><div class='add'>+	veor		\o6, \o6, q14</div><div class='add'>+	vst1.8		{\o6}, [r0]!</div><div class='add'>+	veor		\o7, \o7, q15</div><div class='add'>+	vst1.8		{\o7}, [r0]!</div><div class='add'>+</div><div class='add'>+1:	subs		r6, r6, #8</div><div class='add'>+	bgt		99b</div><div class='add'>+</div><div class='add'>+	mov		sp, r5</div><div class='add'>+	pop		{r4-r8, pc}</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+ENTRY(aesbs_xts_encrypt)</div><div class='add'>+	__xts_crypt	aesbs_encrypt8, q0, q1, q4, q6, q3, q7, q2, q5</div><div class='add'>+ENDPROC(aesbs_xts_encrypt)</div><div class='add'>+</div><div class='add'>+ENTRY(aesbs_xts_decrypt)</div><div class='add'>+	__xts_crypt	aesbs_decrypt8, q0, q1, q6, q4, q2, q7, q3, q5</div><div class='add'>+ENDPROC(aesbs_xts_decrypt)</div><div class='head'>diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c<br/>new file mode 100644<br/>index 000000000000..2920b96dbd36<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/aes-neonbs-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/aes-neonbs-glue.c</a></div><div class='hunk'>@@ -0,0 +1,406 @@</div><div class='add'>+/*</div><div class='add'>+ * Bit sliced AES using NEON instructions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/neon.h&gt;</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/cbc.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/xts.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS_CRYPTO("ecb(aes)");</div><div class='add'>+MODULE_ALIAS_CRYPTO("cbc(aes)");</div><div class='add'>+MODULE_ALIAS_CRYPTO("ctr(aes)");</div><div class='add'>+MODULE_ALIAS_CRYPTO("xts(aes)");</div><div class='add'>+</div><div class='add'>+asmlinkage void aesbs_convert_key(u8 out[], u32 const rk[], int rounds);</div><div class='add'>+</div><div class='add'>+asmlinkage void aesbs_ecb_encrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks);</div><div class='add'>+asmlinkage void aesbs_ecb_decrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks);</div><div class='add'>+</div><div class='add'>+asmlinkage void aesbs_cbc_decrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks, u8 iv[]);</div><div class='add'>+</div><div class='add'>+asmlinkage void aesbs_ctr_encrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks, u8 ctr[], u8 final[]);</div><div class='add'>+</div><div class='add'>+asmlinkage void aesbs_xts_encrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks, u8 iv[]);</div><div class='add'>+asmlinkage void aesbs_xts_decrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks, u8 iv[]);</div><div class='add'>+</div><div class='add'>+asmlinkage void __aes_arm_encrypt(const u32 rk[], int rounds, const u8 in[],</div><div class='add'>+				  u8 out[]);</div><div class='add'>+</div><div class='add'>+struct aesbs_ctx {</div><div class='add'>+	int	rounds;</div><div class='add'>+	u8	rk[13 * (8 * AES_BLOCK_SIZE) + 32] __aligned(AES_BLOCK_SIZE);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aesbs_cbc_ctx {</div><div class='add'>+	struct aesbs_ctx	key;</div><div class='add'>+	u32			enc[AES_MAX_KEYLENGTH_U32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aesbs_xts_ctx {</div><div class='add'>+	struct aesbs_ctx	key;</div><div class='add'>+	u32			twkey[AES_MAX_KEYLENGTH_U32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int aesbs_setkey(struct crypto_skcipher *tfm, const u8 *in_key,</div><div class='add'>+			unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct aesbs_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_aes_ctx rk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_aes_expand_key(&amp;rk, in_key, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;rounds = 6 + key_len / 4;</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	aesbs_convert_key(ctx-&gt;rk, rk.key_enc, ctx-&gt;rounds);</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ecb_crypt(struct skcipher_request *req,</div><div class='add'>+		       void (*fn)(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks))</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct aesbs_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	while (walk.nbytes &gt;= AES_BLOCK_SIZE) {</div><div class='add'>+		unsigned int blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+		if (walk.nbytes &lt; walk.total)</div><div class='add'>+			blocks = round_down(blocks,</div><div class='add'>+					    walk.stride / AES_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+		fn(walk.dst.virt.addr, walk.src.virt.addr, ctx-&gt;rk,</div><div class='add'>+		   ctx-&gt;rounds, blocks);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk,</div><div class='add'>+					 walk.nbytes - blocks * AES_BLOCK_SIZE);</div><div class='add'>+	}</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_encrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return __ecb_crypt(req, aesbs_ecb_encrypt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_decrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return __ecb_crypt(req, aesbs_ecb_decrypt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aesbs_cbc_setkey(struct crypto_skcipher *tfm, const u8 *in_key,</div><div class='add'>+			    unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_aes_ctx rk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_aes_expand_key(&amp;rk, in_key, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;key.rounds = 6 + key_len / 4;</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;enc, rk.key_enc, sizeof(ctx-&gt;enc));</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	aesbs_convert_key(ctx-&gt;key.rk, rk.key_enc, ctx-&gt;key.rounds);</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cbc_encrypt_one(struct crypto_skcipher *tfm, const u8 *src, u8 *dst)</div><div class='add'>+{</div><div class='add'>+	struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	__aes_arm_encrypt(ctx-&gt;enc, ctx-&gt;key.rounds, src, dst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbc_encrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return crypto_cbc_encrypt_walk(req, cbc_encrypt_one);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbc_decrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	while (walk.nbytes &gt;= AES_BLOCK_SIZE) {</div><div class='add'>+		unsigned int blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+		if (walk.nbytes &lt; walk.total)</div><div class='add'>+			blocks = round_down(blocks,</div><div class='add'>+					    walk.stride / AES_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+		aesbs_cbc_decrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='add'>+				  ctx-&gt;key.rk, ctx-&gt;key.rounds, blocks,</div><div class='add'>+				  walk.iv);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk,</div><div class='add'>+					 walk.nbytes - blocks * AES_BLOCK_SIZE);</div><div class='add'>+	}</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctr_encrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct aesbs_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	u8 buf[AES_BLOCK_SIZE];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	while (walk.nbytes &gt; 0) {</div><div class='add'>+		unsigned int blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='add'>+		u8 *final = (walk.total % AES_BLOCK_SIZE) ? buf : NULL;</div><div class='add'>+</div><div class='add'>+		if (walk.nbytes &lt; walk.total) {</div><div class='add'>+			blocks = round_down(blocks,</div><div class='add'>+					    walk.stride / AES_BLOCK_SIZE);</div><div class='add'>+			final = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		aesbs_ctr_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='add'>+				  ctx-&gt;rk, ctx-&gt;rounds, blocks, walk.iv, final);</div><div class='add'>+</div><div class='add'>+		if (final) {</div><div class='add'>+			u8 *dst = walk.dst.virt.addr + blocks * AES_BLOCK_SIZE;</div><div class='add'>+			u8 *src = walk.src.virt.addr + blocks * AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+			if (dst != src)</div><div class='add'>+				memcpy(dst, src, walk.total % AES_BLOCK_SIZE);</div><div class='add'>+			crypto_xor(dst, final, walk.total % AES_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+			err = skcipher_walk_done(&amp;walk, 0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		err = skcipher_walk_done(&amp;walk,</div><div class='add'>+					 walk.nbytes - blocks * AES_BLOCK_SIZE);</div><div class='add'>+	}</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,</div><div class='add'>+			    unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct aesbs_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_aes_ctx rk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = xts_verify_key(tfm, in_key, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	key_len /= 2;</div><div class='add'>+	err = crypto_aes_expand_key(&amp;rk, in_key + key_len, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;twkey, rk.key_enc, sizeof(ctx-&gt;twkey));</div><div class='add'>+</div><div class='add'>+	return aesbs_setkey(tfm, in_key, key_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __xts_crypt(struct skcipher_request *req,</div><div class='add'>+		       void (*fn)(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks, u8 iv[]))</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct aesbs_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+</div><div class='add'>+	__aes_arm_encrypt(ctx-&gt;twkey, ctx-&gt;key.rounds, walk.iv, walk.iv);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	while (walk.nbytes &gt;= AES_BLOCK_SIZE) {</div><div class='add'>+		unsigned int blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+		if (walk.nbytes &lt; walk.total)</div><div class='add'>+			blocks = round_down(blocks,</div><div class='add'>+					    walk.stride / AES_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+		fn(walk.dst.virt.addr, walk.src.virt.addr, ctx-&gt;key.rk,</div><div class='add'>+		   ctx-&gt;key.rounds, blocks, walk.iv);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk,</div><div class='add'>+					 walk.nbytes - blocks * AES_BLOCK_SIZE);</div><div class='add'>+	}</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_encrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return __xts_crypt(req, aesbs_xts_encrypt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_decrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return __xts_crypt(req, aesbs_xts_decrypt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct skcipher_alg aes_algs[] = { {</div><div class='add'>+	.base.cra_name		= "__ecb(aes)",</div><div class='add'>+	.base.cra_driver_name	= "__ecb-aes-neonbs",</div><div class='add'>+	.base.cra_priority	= 250,</div><div class='add'>+	.base.cra_blocksize	= AES_BLOCK_SIZE,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct aesbs_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize		= AES_MAX_KEY_SIZE,</div><div class='add'>+	.walksize		= 8 * AES_BLOCK_SIZE,</div><div class='add'>+	.setkey			= aesbs_setkey,</div><div class='add'>+	.encrypt		= ecb_encrypt,</div><div class='add'>+	.decrypt		= ecb_decrypt,</div><div class='add'>+}, {</div><div class='add'>+	.base.cra_name		= "__cbc(aes)",</div><div class='add'>+	.base.cra_driver_name	= "__cbc-aes-neonbs",</div><div class='add'>+	.base.cra_priority	= 250,</div><div class='add'>+	.base.cra_blocksize	= AES_BLOCK_SIZE,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct aesbs_cbc_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize		= AES_MAX_KEY_SIZE,</div><div class='add'>+	.walksize		= 8 * AES_BLOCK_SIZE,</div><div class='add'>+	.ivsize			= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey			= aesbs_cbc_setkey,</div><div class='add'>+	.encrypt		= cbc_encrypt,</div><div class='add'>+	.decrypt		= cbc_decrypt,</div><div class='add'>+}, {</div><div class='add'>+	.base.cra_name		= "__ctr(aes)",</div><div class='add'>+	.base.cra_driver_name	= "__ctr-aes-neonbs",</div><div class='add'>+	.base.cra_priority	= 250,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct aesbs_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize		= AES_MAX_KEY_SIZE,</div><div class='add'>+	.chunksize		= AES_BLOCK_SIZE,</div><div class='add'>+	.walksize		= 8 * AES_BLOCK_SIZE,</div><div class='add'>+	.ivsize			= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey			= aesbs_setkey,</div><div class='add'>+	.encrypt		= ctr_encrypt,</div><div class='add'>+	.decrypt		= ctr_encrypt,</div><div class='add'>+}, {</div><div class='add'>+	.base.cra_name		= "__xts(aes)",</div><div class='add'>+	.base.cra_driver_name	= "__xts-aes-neonbs",</div><div class='add'>+	.base.cra_priority	= 250,</div><div class='add'>+	.base.cra_blocksize	= AES_BLOCK_SIZE,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct aesbs_xts_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= 2 * AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize		= 2 * AES_MAX_KEY_SIZE,</div><div class='add'>+	.walksize		= 8 * AES_BLOCK_SIZE,</div><div class='add'>+	.ivsize			= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey			= aesbs_xts_setkey,</div><div class='add'>+	.encrypt		= xts_encrypt,</div><div class='add'>+	.decrypt		= xts_decrypt,</div><div class='add'>+} };</div><div class='add'>+</div><div class='add'>+static struct simd_skcipher_alg *aes_simd_algs[ARRAY_SIZE(aes_algs)];</div><div class='add'>+</div><div class='add'>+static void aes_exit(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aes_simd_algs); i++)</div><div class='add'>+		if (aes_simd_algs[i])</div><div class='add'>+			simd_skcipher_free(aes_simd_algs[i]);</div><div class='add'>+</div><div class='add'>+	crypto_unregister_skciphers(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init aes_init(void)</div><div class='add'>+{</div><div class='add'>+	struct simd_skcipher_alg *simd;</div><div class='add'>+	const char *basename;</div><div class='add'>+	const char *algname;</div><div class='add'>+	const char *drvname;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!(elf_hwcap &amp; HWCAP_NEON))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_skciphers(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aes_algs); i++) {</div><div class='add'>+		if (!(aes_algs[i].base.cra_flags &amp; CRYPTO_ALG_INTERNAL))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		algname = aes_algs[i].base.cra_name + 2;</div><div class='add'>+		drvname = aes_algs[i].base.cra_driver_name + 2;</div><div class='add'>+		basename = aes_algs[i].base.cra_driver_name;</div><div class='add'>+		simd = simd_skcipher_create_compat(algname, drvname, basename);</div><div class='add'>+		err = PTR_ERR(simd);</div><div class='add'>+		if (IS_ERR(simd))</div><div class='add'>+			goto unregister_simds;</div><div class='add'>+</div><div class='add'>+		aes_simd_algs[i] = simd;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unregister_simds:</div><div class='add'>+	aes_exit();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(aes_init);</div><div class='add'>+module_exit(aes_exit);</div><div class='head'>diff --git a/arch/arm/crypto/aes_glue.c b/arch/arm/crypto/aes_glue.c<br/>deleted file mode 100644<br/>index 0409b8f89782..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/crypto/aes_glue.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/crypto/aes_glue.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Glue Code for the asm optimized version of the AES Cipher Algorithm</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;crypto/aes.h&gt;</div><div class='del'>-</div><div class='del'>-#include "aes_glue.h"</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(AES_encrypt);</div><div class='del'>-EXPORT_SYMBOL(AES_decrypt);</div><div class='del'>-EXPORT_SYMBOL(private_AES_set_encrypt_key);</div><div class='del'>-EXPORT_SYMBOL(private_AES_set_decrypt_key);</div><div class='del'>-</div><div class='del'>-static void aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='del'>-{</div><div class='del'>-	struct AES_CTX *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	AES_encrypt(src, dst, &amp;ctx-&gt;enc_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='del'>-{</div><div class='del'>-	struct AES_CTX *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	AES_decrypt(src, dst, &amp;ctx-&gt;dec_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='del'>-		unsigned int key_len)</div><div class='del'>-{</div><div class='del'>-	struct AES_CTX *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-</div><div class='del'>-	switch (key_len) {</div><div class='del'>-	case AES_KEYSIZE_128:</div><div class='del'>-		key_len = 128;</div><div class='del'>-		break;</div><div class='del'>-	case AES_KEYSIZE_192:</div><div class='del'>-		key_len = 192;</div><div class='del'>-		break;</div><div class='del'>-	case AES_KEYSIZE_256:</div><div class='del'>-		key_len = 256;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (private_AES_set_encrypt_key(in_key, key_len, &amp;ctx-&gt;enc_key) == -1) {</div><div class='del'>-		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	/* private_AES_set_decrypt_key expects an encryption key as input */</div><div class='del'>-	ctx-&gt;dec_key = ctx-&gt;enc_key;</div><div class='del'>-	if (private_AES_set_decrypt_key(in_key, key_len, &amp;ctx-&gt;dec_key) == -1) {</div><div class='del'>-		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct crypto_alg aes_alg = {</div><div class='del'>-	.cra_name		= "aes",</div><div class='del'>-	.cra_driver_name	= "aes-asm",</div><div class='del'>-	.cra_priority		= 200,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_CIPHER,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct AES_CTX),</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_list		= LIST_HEAD_INIT(aes_alg.cra_list),</div><div class='del'>-	.cra_u	= {</div><div class='del'>-		.cipher	= {</div><div class='del'>-			.cia_min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-			.cia_max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-			.cia_setkey		= aes_set_key,</div><div class='del'>-			.cia_encrypt		= aes_encrypt,</div><div class='del'>-			.cia_decrypt		= aes_decrypt</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init aes_init(void)</div><div class='del'>-{</div><div class='del'>-	return crypto_register_alg(&amp;aes_alg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit aes_fini(void)</div><div class='del'>-{</div><div class='del'>-	crypto_unregister_alg(&amp;aes_alg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(aes_init);</div><div class='del'>-module_exit(aes_fini);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm (ASM)");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS_CRYPTO("aes");</div><div class='del'>-MODULE_ALIAS_CRYPTO("aes-asm");</div><div class='del'>-MODULE_AUTHOR("David McCullough &lt;ucdevel@gmail.com&gt;");</div><div class='head'>diff --git a/arch/arm/crypto/aes_glue.h b/arch/arm/crypto/aes_glue.h<br/>deleted file mode 100644<br/>index cca3e51eb606..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/crypto/aes_glue.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/crypto/aes_glue.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-</div><div class='del'>-#define AES_MAXNR 14</div><div class='del'>-</div><div class='del'>-struct AES_KEY {</div><div class='del'>-	unsigned int rd_key[4 * (AES_MAXNR + 1)];</div><div class='del'>-	int rounds;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct AES_CTX {</div><div class='del'>-	struct AES_KEY enc_key;</div><div class='del'>-	struct AES_KEY dec_key;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-asmlinkage void AES_encrypt(const u8 *in, u8 *out, struct AES_KEY *ctx);</div><div class='del'>-asmlinkage void AES_decrypt(const u8 *in, u8 *out, struct AES_KEY *ctx);</div><div class='del'>-asmlinkage int private_AES_set_decrypt_key(const unsigned char *userKey,</div><div class='del'>-					   const int bits, struct AES_KEY *key);</div><div class='del'>-asmlinkage int private_AES_set_encrypt_key(const unsigned char *userKey,</div><div class='del'>-					   const int bits, struct AES_KEY *key);</div><div class='head'>diff --git a/arch/arm/crypto/aesbs-core.S_shipped b/arch/arm/crypto/aesbs-core.S_shipped<br/>deleted file mode 100644<br/>index 1d1800f71c5b..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/crypto/aesbs-core.S_shipped?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/crypto/aesbs-core.S_shipped</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2548 +0,0 @@</div><div class='del'>-</div><div class='del'>-@ ====================================================================</div><div class='del'>-@ Written by Andy Polyakov &lt;appro@openssl.org&gt; for the OpenSSL</div><div class='del'>-@ project. The module is, however, dual licensed under OpenSSL and</div><div class='del'>-@ CRYPTOGAMS licenses depending on where you obtain it. For further</div><div class='del'>-@ details see http://www.openssl.org/~appro/cryptogams/.</div><div class='del'>-@</div><div class='del'>-@ Specific modes and adaptation for Linux kernel by Ard Biesheuvel</div><div class='del'>-@ &lt;ard.biesheuvel@linaro.org&gt;. Permission to use under GPL terms is</div><div class='del'>-@ granted.</div><div class='del'>-@ ====================================================================</div><div class='del'>-</div><div class='del'>-@ Bit-sliced AES for ARM NEON</div><div class='del'>-@</div><div class='del'>-@ February 2012.</div><div class='del'>-@</div><div class='del'>-@ This implementation is direct adaptation of bsaes-x86_64 module for</div><div class='del'>-@ ARM NEON. Except that this module is endian-neutral [in sense that</div><div class='del'>-@ it can be compiled for either endianness] by courtesy of vld1.8's</div><div class='del'>-@ neutrality. Initial version doesn't implement interface to OpenSSL,</div><div class='del'>-@ only low-level primitives and unsupported entry points, just enough</div><div class='del'>-@ to collect performance results, which for Cortex-A8 core are:</div><div class='del'>-@</div><div class='del'>-@ encrypt	19.5 cycles per byte processed with 128-bit key</div><div class='del'>-@ decrypt	22.1 cycles per byte processed with 128-bit key</div><div class='del'>-@ key conv.	440  cycles per 128-bit key/0.18 of 8x block</div><div class='del'>-@</div><div class='del'>-@ Snapdragon S4 encrypts byte in 17.6 cycles and decrypts in 19.7,</div><div class='del'>-@ which is [much] worse than anticipated (for further details see</div><div class='del'>-@ http://www.openssl.org/~appro/Snapdragon-S4.html).</div><div class='del'>-@</div><div class='del'>-@ Cortex-A15 manages in 14.2/16.1 cycles [when integer-only code</div><div class='del'>-@ manages in 20.0 cycles].</div><div class='del'>-@</div><div class='del'>-@ When comparing to x86_64 results keep in mind that NEON unit is</div><div class='del'>-@ [mostly] single-issue and thus can't [fully] benefit from</div><div class='del'>-@ instruction-level parallelism. And when comparing to aes-armv4</div><div class='del'>-@ results keep in mind key schedule conversion overhead (see</div><div class='del'>-@ bsaes-x86_64.pl for further details)...</div><div class='del'>-@</div><div class='del'>-@						&lt;appro@openssl.org&gt;</div><div class='del'>-</div><div class='del'>-@ April-August 2013</div><div class='del'>-@</div><div class='del'>-@ Add CBC, CTR and XTS subroutines, adapt for kernel use.</div><div class='del'>-@</div><div class='del'>-@					&lt;ard.biesheuvel@linaro.org&gt;</div><div class='del'>-</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-# include "arm_arch.h"</div><div class='del'>-</div><div class='del'>-# define VFP_ABI_PUSH	vstmdb	sp!,{d8-d15}</div><div class='del'>-# define VFP_ABI_POP	vldmia	sp!,{d8-d15}</div><div class='del'>-# define VFP_ABI_FRAME	0x40</div><div class='del'>-#else</div><div class='del'>-# define VFP_ABI_PUSH</div><div class='del'>-# define VFP_ABI_POP</div><div class='del'>-# define VFP_ABI_FRAME	0</div><div class='del'>-# define BSAES_ASM_EXTENDED_KEY</div><div class='del'>-# define XTS_CHAIN_TWEAK</div><div class='del'>-# define __ARM_ARCH__ __LINUX_ARM_ARCH__</div><div class='del'>-# define __ARM_MAX_ARCH__ 7</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __thumb__</div><div class='del'>-# define adrl adr</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if __ARM_MAX_ARCH__&gt;=7</div><div class='del'>-.arch	armv7-a</div><div class='del'>-.fpu	neon</div><div class='del'>-</div><div class='del'>-.text</div><div class='del'>-.syntax	unified 	@ ARMv7-capable assembler is expected to handle this</div><div class='del'>-#ifdef __thumb2__</div><div class='del'>-.thumb</div><div class='del'>-#else</div><div class='del'>-.code   32</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-.type	_bsaes_decrypt8,%function</div><div class='del'>-.align	4</div><div class='del'>-_bsaes_decrypt8:</div><div class='del'>-	adr	r6,_bsaes_decrypt8</div><div class='del'>-	vldmia	r4!, {q9}		@ round 0 key</div><div class='del'>-	add	r6,r6,#.LM0ISR-_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vldmia	r6!, {q8}		@ .LM0ISR</div><div class='del'>-	veor	q10, q0, q9	@ xor with round0 key</div><div class='del'>-	veor	q11, q1, q9</div><div class='del'>-	 vtbl.8	d0, {q10}, d16</div><div class='del'>-	 vtbl.8	d1, {q10}, d17</div><div class='del'>-	veor	q12, q2, q9</div><div class='del'>-	 vtbl.8	d2, {q11}, d16</div><div class='del'>-	 vtbl.8	d3, {q11}, d17</div><div class='del'>-	veor	q13, q3, q9</div><div class='del'>-	 vtbl.8	d4, {q12}, d16</div><div class='del'>-	 vtbl.8	d5, {q12}, d17</div><div class='del'>-	veor	q14, q4, q9</div><div class='del'>-	 vtbl.8	d6, {q13}, d16</div><div class='del'>-	 vtbl.8	d7, {q13}, d17</div><div class='del'>-	veor	q15, q5, q9</div><div class='del'>-	 vtbl.8	d8, {q14}, d16</div><div class='del'>-	 vtbl.8	d9, {q14}, d17</div><div class='del'>-	veor	q10, q6, q9</div><div class='del'>-	 vtbl.8	d10, {q15}, d16</div><div class='del'>-	 vtbl.8	d11, {q15}, d17</div><div class='del'>-	veor	q11, q7, q9</div><div class='del'>-	 vtbl.8	d12, {q10}, d16</div><div class='del'>-	 vtbl.8	d13, {q10}, d17</div><div class='del'>-	 vtbl.8	d14, {q11}, d16</div><div class='del'>-	 vtbl.8	d15, {q11}, d17</div><div class='del'>-	vmov.i8	q8,#0x55			@ compose .LBS0</div><div class='del'>-	vmov.i8	q9,#0x33			@ compose .LBS1</div><div class='del'>-	vshr.u64	q10, q6, #1</div><div class='del'>-	 vshr.u64	q11, q4, #1</div><div class='del'>-	veor		q10, q10, q7</div><div class='del'>-	 veor		q11, q11, q5</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q7, q7, q10</div><div class='del'>-	vshl.u64	q10, q10, #1</div><div class='del'>-	 veor		q5, q5, q11</div><div class='del'>-	 vshl.u64	q11, q11, #1</div><div class='del'>-	veor		q6, q6, q10</div><div class='del'>-	 veor		q4, q4, q11</div><div class='del'>-	vshr.u64	q10, q2, #1</div><div class='del'>-	 vshr.u64	q11, q0, #1</div><div class='del'>-	veor		q10, q10, q3</div><div class='del'>-	 veor		q11, q11, q1</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q3, q3, q10</div><div class='del'>-	vshl.u64	q10, q10, #1</div><div class='del'>-	 veor		q1, q1, q11</div><div class='del'>-	 vshl.u64	q11, q11, #1</div><div class='del'>-	veor		q2, q2, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	vmov.i8	q8,#0x0f			@ compose .LBS2</div><div class='del'>-	vshr.u64	q10, q5, #2</div><div class='del'>-	 vshr.u64	q11, q4, #2</div><div class='del'>-	veor		q10, q10, q7</div><div class='del'>-	 veor		q11, q11, q6</div><div class='del'>-	vand		q10, q10, q9</div><div class='del'>-	 vand		q11, q11, q9</div><div class='del'>-	veor		q7, q7, q10</div><div class='del'>-	vshl.u64	q10, q10, #2</div><div class='del'>-	 veor		q6, q6, q11</div><div class='del'>-	 vshl.u64	q11, q11, #2</div><div class='del'>-	veor		q5, q5, q10</div><div class='del'>-	 veor		q4, q4, q11</div><div class='del'>-	vshr.u64	q10, q1, #2</div><div class='del'>-	 vshr.u64	q11, q0, #2</div><div class='del'>-	veor		q10, q10, q3</div><div class='del'>-	 veor		q11, q11, q2</div><div class='del'>-	vand		q10, q10, q9</div><div class='del'>-	 vand		q11, q11, q9</div><div class='del'>-	veor		q3, q3, q10</div><div class='del'>-	vshl.u64	q10, q10, #2</div><div class='del'>-	 veor		q2, q2, q11</div><div class='del'>-	 vshl.u64	q11, q11, #2</div><div class='del'>-	veor		q1, q1, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	vshr.u64	q10, q3, #4</div><div class='del'>-	 vshr.u64	q11, q2, #4</div><div class='del'>-	veor		q10, q10, q7</div><div class='del'>-	 veor		q11, q11, q6</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q7, q7, q10</div><div class='del'>-	vshl.u64	q10, q10, #4</div><div class='del'>-	 veor		q6, q6, q11</div><div class='del'>-	 vshl.u64	q11, q11, #4</div><div class='del'>-	veor		q3, q3, q10</div><div class='del'>-	 veor		q2, q2, q11</div><div class='del'>-	vshr.u64	q10, q1, #4</div><div class='del'>-	 vshr.u64	q11, q0, #4</div><div class='del'>-	veor		q10, q10, q5</div><div class='del'>-	 veor		q11, q11, q4</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q5, q5, q10</div><div class='del'>-	vshl.u64	q10, q10, #4</div><div class='del'>-	 veor		q4, q4, q11</div><div class='del'>-	 vshl.u64	q11, q11, #4</div><div class='del'>-	veor		q1, q1, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	sub	r5,r5,#1</div><div class='del'>-	b	.Ldec_sbox</div><div class='del'>-.align	4</div><div class='del'>-.Ldec_loop:</div><div class='del'>-	vldmia	r4!, {q8-q11}</div><div class='del'>-	veor	q8, q8, q0</div><div class='del'>-	veor	q9, q9, q1</div><div class='del'>-	vtbl.8	d0, {q8}, d24</div><div class='del'>-	vtbl.8	d1, {q8}, d25</div><div class='del'>-	vldmia	r4!, {q8}</div><div class='del'>-	veor	q10, q10, q2</div><div class='del'>-	vtbl.8	d2, {q9}, d24</div><div class='del'>-	vtbl.8	d3, {q9}, d25</div><div class='del'>-	vldmia	r4!, {q9}</div><div class='del'>-	veor	q11, q11, q3</div><div class='del'>-	vtbl.8	d4, {q10}, d24</div><div class='del'>-	vtbl.8	d5, {q10}, d25</div><div class='del'>-	vldmia	r4!, {q10}</div><div class='del'>-	vtbl.8	d6, {q11}, d24</div><div class='del'>-	vtbl.8	d7, {q11}, d25</div><div class='del'>-	vldmia	r4!, {q11}</div><div class='del'>-	veor	q8, q8, q4</div><div class='del'>-	veor	q9, q9, q5</div><div class='del'>-	vtbl.8	d8, {q8}, d24</div><div class='del'>-	vtbl.8	d9, {q8}, d25</div><div class='del'>-	veor	q10, q10, q6</div><div class='del'>-	vtbl.8	d10, {q9}, d24</div><div class='del'>-	vtbl.8	d11, {q9}, d25</div><div class='del'>-	veor	q11, q11, q7</div><div class='del'>-	vtbl.8	d12, {q10}, d24</div><div class='del'>-	vtbl.8	d13, {q10}, d25</div><div class='del'>-	vtbl.8	d14, {q11}, d24</div><div class='del'>-	vtbl.8	d15, {q11}, d25</div><div class='del'>-.Ldec_sbox:</div><div class='del'>-	 veor	q1, q1, q4</div><div class='del'>-	veor	q3, q3, q4</div><div class='del'>-</div><div class='del'>-	veor	q4, q4, q7</div><div class='del'>-	 veor	q1, q1, q6</div><div class='del'>-	veor	q2, q2, q7</div><div class='del'>-	veor	q6, q6, q4</div><div class='del'>-</div><div class='del'>-	veor	q0, q0, q1</div><div class='del'>-	veor	q2, q2, q5</div><div class='del'>-	 veor	q7, q7, q6</div><div class='del'>-	veor	q3, q3, q0</div><div class='del'>-	veor	q5, q5, q0</div><div class='del'>-	veor	q1, q1, q3</div><div class='del'>-	veor	q11, q3, q0</div><div class='del'>-	veor	q10, q7, q4</div><div class='del'>-	veor	q9, q1, q6</div><div class='del'>-	veor	q13, q4, q0</div><div class='del'>-	 vmov	q8, q10</div><div class='del'>-	veor	q12, q5, q2</div><div class='del'>-</div><div class='del'>-	vorr	q10, q10, q9</div><div class='del'>-	veor	q15, q11, q8</div><div class='del'>-	vand	q14, q11, q12</div><div class='del'>-	vorr	q11, q11, q12</div><div class='del'>-	veor	q12, q12, q9</div><div class='del'>-	vand	q8, q8, q9</div><div class='del'>-	veor	q9, q6, q2</div><div class='del'>-	vand	q15, q15, q12</div><div class='del'>-	vand	q13, q13, q9</div><div class='del'>-	veor	q9, q3, q7</div><div class='del'>-	veor	q12, q1, q5</div><div class='del'>-	veor	q11, q11, q13</div><div class='del'>-	veor	q10, q10, q13</div><div class='del'>-	vand	q13, q9, q12</div><div class='del'>-	vorr	q9, q9, q12</div><div class='del'>-	veor	q11, q11, q15</div><div class='del'>-	veor	q8, q8, q13</div><div class='del'>-	veor	q10, q10, q14</div><div class='del'>-	veor	q9, q9, q15</div><div class='del'>-	veor	q8, q8, q14</div><div class='del'>-	vand	q12, q4, q6</div><div class='del'>-	veor	q9, q9, q14</div><div class='del'>-	vand	q13, q0, q2</div><div class='del'>-	vand	q14, q7, q1</div><div class='del'>-	vorr	q15, q3, q5</div><div class='del'>-	veor	q11, q11, q12</div><div class='del'>-	veor	q9, q9, q14</div><div class='del'>-	veor	q8, q8, q15</div><div class='del'>-	veor	q10, q10, q13</div><div class='del'>-</div><div class='del'>-	@ Inv_GF16 	0, 	1, 	2, 	3, s0, s1, s2, s3</div><div class='del'>-</div><div class='del'>-	@ new smaller inversion</div><div class='del'>-</div><div class='del'>-	vand	q14, q11, q9</div><div class='del'>-	vmov	q12, q8</div><div class='del'>-</div><div class='del'>-	veor	q13, q10, q14</div><div class='del'>-	veor	q15, q8, q14</div><div class='del'>-	veor	q14, q8, q14	@ q14=q15</div><div class='del'>-</div><div class='del'>-	vbsl	q13, q9, q8</div><div class='del'>-	vbsl	q15, q11, q10</div><div class='del'>-	veor	q11, q11, q10</div><div class='del'>-</div><div class='del'>-	vbsl	q12, q13, q14</div><div class='del'>-	vbsl	q8, q14, q13</div><div class='del'>-</div><div class='del'>-	vand	q14, q12, q15</div><div class='del'>-	veor	q9, q9, q8</div><div class='del'>-</div><div class='del'>-	veor	q14, q14, q11</div><div class='del'>-	veor	q12, q5, q2</div><div class='del'>-	veor	q8, q1, q6</div><div class='del'>-	veor 	q10, q15, q14</div><div class='del'>-	vand	q10, q10, q5</div><div class='del'>-	veor	q5, q5, q1</div><div class='del'>-	vand	q11, q1, q15</div><div class='del'>-	vand	q5, q5, q14</div><div class='del'>-	veor	q1, q11, q10</div><div class='del'>-	veor	q5, q5, q11</div><div class='del'>-	veor	q15, q15, q13</div><div class='del'>-	veor	q14, q14, q9</div><div class='del'>-	veor	q11, q15, q14</div><div class='del'>-	 veor 	q10, q13, q9</div><div class='del'>-	vand	q11, q11, q12</div><div class='del'>-	 vand	q10, q10, q2</div><div class='del'>-	veor	q12, q12, q8</div><div class='del'>-	 veor	q2, q2, q6</div><div class='del'>-	vand	q8, q8, q15</div><div class='del'>-	 vand	q6, q6, q13</div><div class='del'>-	vand	q12, q12, q14</div><div class='del'>-	 vand	q2, q2, q9</div><div class='del'>-	veor	q8, q8, q12</div><div class='del'>-	 veor	q2, q2, q6</div><div class='del'>-	veor	q12, q12, q11</div><div class='del'>-	 veor	q6, q6, q10</div><div class='del'>-	veor	q5, q5, q12</div><div class='del'>-	veor	q2, q2, q12</div><div class='del'>-	veor	q1, q1, q8</div><div class='del'>-	veor	q6, q6, q8</div><div class='del'>-</div><div class='del'>-	veor	q12, q3, q0</div><div class='del'>-	veor	q8, q7, q4</div><div class='del'>-	veor	q11, q15, q14</div><div class='del'>-	 veor 	q10, q13, q9</div><div class='del'>-	vand	q11, q11, q12</div><div class='del'>-	 vand	q10, q10, q0</div><div class='del'>-	veor	q12, q12, q8</div><div class='del'>-	 veor	q0, q0, q4</div><div class='del'>-	vand	q8, q8, q15</div><div class='del'>-	 vand	q4, q4, q13</div><div class='del'>-	vand	q12, q12, q14</div><div class='del'>-	 vand	q0, q0, q9</div><div class='del'>-	veor	q8, q8, q12</div><div class='del'>-	 veor	q0, q0, q4</div><div class='del'>-	veor	q12, q12, q11</div><div class='del'>-	 veor	q4, q4, q10</div><div class='del'>-	veor	q15, q15, q13</div><div class='del'>-	veor	q14, q14, q9</div><div class='del'>-	veor 	q10, q15, q14</div><div class='del'>-	vand	q10, q10, q3</div><div class='del'>-	veor	q3, q3, q7</div><div class='del'>-	vand	q11, q7, q15</div><div class='del'>-	vand	q3, q3, q14</div><div class='del'>-	veor	q7, q11, q10</div><div class='del'>-	veor	q3, q3, q11</div><div class='del'>-	veor	q3, q3, q12</div><div class='del'>-	veor	q0, q0, q12</div><div class='del'>-	veor	q7, q7, q8</div><div class='del'>-	veor	q4, q4, q8</div><div class='del'>-	veor	q1, q1, q7</div><div class='del'>-	veor	q6, q6, q5</div><div class='del'>-</div><div class='del'>-	veor	q4, q4, q1</div><div class='del'>-	veor	q2, q2, q7</div><div class='del'>-	veor	q5, q5, q7</div><div class='del'>-	veor	q4, q4, q2</div><div class='del'>-	 veor 	q7, q7, q0</div><div class='del'>-	veor	q4, q4, q5</div><div class='del'>-	 veor	q3, q3, q6</div><div class='del'>-	 veor	q6, q6, q1</div><div class='del'>-	veor	q3, q3, q4</div><div class='del'>-</div><div class='del'>-	veor	q4, q4, q0</div><div class='del'>-	veor	q7, q7, q3</div><div class='del'>-	subs	r5,r5,#1</div><div class='del'>-	bcc	.Ldec_done</div><div class='del'>-	@ multiplication by 0x05-0x00-0x04-0x00</div><div class='del'>-	vext.8	q8, q0, q0, #8</div><div class='del'>-	vext.8	q14, q3, q3, #8</div><div class='del'>-	vext.8	q15, q5, q5, #8</div><div class='del'>-	veor	q8, q8, q0</div><div class='del'>-	vext.8	q9, q1, q1, #8</div><div class='del'>-	veor	q14, q14, q3</div><div class='del'>-	vext.8	q10, q6, q6, #8</div><div class='del'>-	veor	q15, q15, q5</div><div class='del'>-	vext.8	q11, q4, q4, #8</div><div class='del'>-	veor	q9, q9, q1</div><div class='del'>-	vext.8	q12, q2, q2, #8</div><div class='del'>-	veor	q10, q10, q6</div><div class='del'>-	vext.8	q13, q7, q7, #8</div><div class='del'>-	veor	q11, q11, q4</div><div class='del'>-	veor	q12, q12, q2</div><div class='del'>-	veor	q13, q13, q7</div><div class='del'>-</div><div class='del'>-	 veor	q0, q0, q14</div><div class='del'>-	 veor	q1, q1, q14</div><div class='del'>-	 veor	q6, q6, q8</div><div class='del'>-	 veor	q2, q2, q10</div><div class='del'>-	 veor	q4, q4, q9</div><div class='del'>-	 veor	q1, q1, q15</div><div class='del'>-	 veor	q6, q6, q15</div><div class='del'>-	 veor	q2, q2, q14</div><div class='del'>-	 veor	q7, q7, q11</div><div class='del'>-	 veor	q4, q4, q14</div><div class='del'>-	 veor	q3, q3, q12</div><div class='del'>-	 veor	q2, q2, q15</div><div class='del'>-	 veor	q7, q7, q15</div><div class='del'>-	 veor	q5, q5, q13</div><div class='del'>-	vext.8	q8, q0, q0, #12	@ x0 &lt;&lt;&lt; 32</div><div class='del'>-	vext.8	q9, q1, q1, #12</div><div class='del'>-	 veor	q0, q0, q8		@ x0 ^ (x0 &lt;&lt;&lt; 32)</div><div class='del'>-	vext.8	q10, q6, q6, #12</div><div class='del'>-	 veor	q1, q1, q9</div><div class='del'>-	vext.8	q11, q4, q4, #12</div><div class='del'>-	 veor	q6, q6, q10</div><div class='del'>-	vext.8	q12, q2, q2, #12</div><div class='del'>-	 veor	q4, q4, q11</div><div class='del'>-	vext.8	q13, q7, q7, #12</div><div class='del'>-	 veor	q2, q2, q12</div><div class='del'>-	vext.8	q14, q3, q3, #12</div><div class='del'>-	 veor	q7, q7, q13</div><div class='del'>-	vext.8	q15, q5, q5, #12</div><div class='del'>-	 veor	q3, q3, q14</div><div class='del'>-</div><div class='del'>-	veor	q9, q9, q0</div><div class='del'>-	 veor	q5, q5, q15</div><div class='del'>-	 vext.8	q0, q0, q0, #8		@ (x0 ^ (x0 &lt;&lt;&lt; 32)) &lt;&lt;&lt; 64)</div><div class='del'>-	veor	q10, q10, q1</div><div class='del'>-	veor	q8, q8, q5</div><div class='del'>-	veor	q9, q9, q5</div><div class='del'>-	 vext.8	q1, q1, q1, #8</div><div class='del'>-	veor	q13, q13, q2</div><div class='del'>-	 veor	q0, q0, q8</div><div class='del'>-	veor	q14, q14, q7</div><div class='del'>-	 veor	q1, q1, q9</div><div class='del'>-	 vext.8	q8, q2, q2, #8</div><div class='del'>-	veor	q12, q12, q4</div><div class='del'>-	 vext.8	q9, q7, q7, #8</div><div class='del'>-	veor	q15, q15, q3</div><div class='del'>-	 vext.8	q2, q4, q4, #8</div><div class='del'>-	veor	q11, q11, q6</div><div class='del'>-	 vext.8	q7, q5, q5, #8</div><div class='del'>-	veor	q12, q12, q5</div><div class='del'>-	 vext.8	q4, q3, q3, #8</div><div class='del'>-	veor	q11, q11, q5</div><div class='del'>-	 vext.8	q3, q6, q6, #8</div><div class='del'>-	veor	q5, q9, q13</div><div class='del'>-	veor	q11, q11, q2</div><div class='del'>-	veor	q7, q7, q15</div><div class='del'>-	veor	q6, q4, q14</div><div class='del'>-	veor	q4, q8, q12</div><div class='del'>-	veor	q2, q3, q10</div><div class='del'>-	vmov	q3, q11</div><div class='del'>-	 @ vmov	q5, q9</div><div class='del'>-	vldmia	r6, {q12}		@ .LISR</div><div class='del'>-	ite	eq				@ Thumb2 thing, sanity check in ARM</div><div class='del'>-	addeq	r6,r6,#0x10</div><div class='del'>-	bne	.Ldec_loop</div><div class='del'>-	vldmia	r6, {q12}		@ .LISRM0</div><div class='del'>-	b	.Ldec_loop</div><div class='del'>-.align	4</div><div class='del'>-.Ldec_done:</div><div class='del'>-	vmov.i8	q8,#0x55			@ compose .LBS0</div><div class='del'>-	vmov.i8	q9,#0x33			@ compose .LBS1</div><div class='del'>-	vshr.u64	q10, q3, #1</div><div class='del'>-	 vshr.u64	q11, q2, #1</div><div class='del'>-	veor		q10, q10, q5</div><div class='del'>-	 veor		q11, q11, q7</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q5, q5, q10</div><div class='del'>-	vshl.u64	q10, q10, #1</div><div class='del'>-	 veor		q7, q7, q11</div><div class='del'>-	 vshl.u64	q11, q11, #1</div><div class='del'>-	veor		q3, q3, q10</div><div class='del'>-	 veor		q2, q2, q11</div><div class='del'>-	vshr.u64	q10, q6, #1</div><div class='del'>-	 vshr.u64	q11, q0, #1</div><div class='del'>-	veor		q10, q10, q4</div><div class='del'>-	 veor		q11, q11, q1</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q4, q4, q10</div><div class='del'>-	vshl.u64	q10, q10, #1</div><div class='del'>-	 veor		q1, q1, q11</div><div class='del'>-	 vshl.u64	q11, q11, #1</div><div class='del'>-	veor		q6, q6, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	vmov.i8	q8,#0x0f			@ compose .LBS2</div><div class='del'>-	vshr.u64	q10, q7, #2</div><div class='del'>-	 vshr.u64	q11, q2, #2</div><div class='del'>-	veor		q10, q10, q5</div><div class='del'>-	 veor		q11, q11, q3</div><div class='del'>-	vand		q10, q10, q9</div><div class='del'>-	 vand		q11, q11, q9</div><div class='del'>-	veor		q5, q5, q10</div><div class='del'>-	vshl.u64	q10, q10, #2</div><div class='del'>-	 veor		q3, q3, q11</div><div class='del'>-	 vshl.u64	q11, q11, #2</div><div class='del'>-	veor		q7, q7, q10</div><div class='del'>-	 veor		q2, q2, q11</div><div class='del'>-	vshr.u64	q10, q1, #2</div><div class='del'>-	 vshr.u64	q11, q0, #2</div><div class='del'>-	veor		q10, q10, q4</div><div class='del'>-	 veor		q11, q11, q6</div><div class='del'>-	vand		q10, q10, q9</div><div class='del'>-	 vand		q11, q11, q9</div><div class='del'>-	veor		q4, q4, q10</div><div class='del'>-	vshl.u64	q10, q10, #2</div><div class='del'>-	 veor		q6, q6, q11</div><div class='del'>-	 vshl.u64	q11, q11, #2</div><div class='del'>-	veor		q1, q1, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	vshr.u64	q10, q4, #4</div><div class='del'>-	 vshr.u64	q11, q6, #4</div><div class='del'>-	veor		q10, q10, q5</div><div class='del'>-	 veor		q11, q11, q3</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q5, q5, q10</div><div class='del'>-	vshl.u64	q10, q10, #4</div><div class='del'>-	 veor		q3, q3, q11</div><div class='del'>-	 vshl.u64	q11, q11, #4</div><div class='del'>-	veor		q4, q4, q10</div><div class='del'>-	 veor		q6, q6, q11</div><div class='del'>-	vshr.u64	q10, q1, #4</div><div class='del'>-	 vshr.u64	q11, q0, #4</div><div class='del'>-	veor		q10, q10, q7</div><div class='del'>-	 veor		q11, q11, q2</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q7, q7, q10</div><div class='del'>-	vshl.u64	q10, q10, #4</div><div class='del'>-	 veor		q2, q2, q11</div><div class='del'>-	 vshl.u64	q11, q11, #4</div><div class='del'>-	veor		q1, q1, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	vldmia	r4, {q8}			@ last round key</div><div class='del'>-	veor	q6, q6, q8</div><div class='del'>-	veor	q4, q4, q8</div><div class='del'>-	veor	q2, q2, q8</div><div class='del'>-	veor	q7, q7, q8</div><div class='del'>-	veor	q3, q3, q8</div><div class='del'>-	veor	q5, q5, q8</div><div class='del'>-	veor	q0, q0, q8</div><div class='del'>-	veor	q1, q1, q8</div><div class='del'>-	bx	lr</div><div class='del'>-.size	_bsaes_decrypt8,.-_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-.type	_bsaes_const,%object</div><div class='del'>-.align	6</div><div class='del'>-_bsaes_const:</div><div class='del'>-.LM0ISR:	@ InvShiftRows constants</div><div class='del'>-	.quad	0x0a0e0206070b0f03, 0x0004080c0d010509</div><div class='del'>-.LISR:</div><div class='del'>-	.quad	0x0504070602010003, 0x0f0e0d0c080b0a09</div><div class='del'>-.LISRM0:</div><div class='del'>-	.quad	0x01040b0e0205080f, 0x0306090c00070a0d</div><div class='del'>-.LM0SR:		@ ShiftRows constants</div><div class='del'>-	.quad	0x0a0e02060f03070b, 0x0004080c05090d01</div><div class='del'>-.LSR:</div><div class='del'>-	.quad	0x0504070600030201, 0x0f0e0d0c0a09080b</div><div class='del'>-.LSRM0:</div><div class='del'>-	.quad	0x0304090e00050a0f, 0x01060b0c0207080d</div><div class='del'>-.LM0:</div><div class='del'>-	.quad	0x02060a0e03070b0f, 0x0004080c0105090d</div><div class='del'>-.LREVM0SR:</div><div class='del'>-	.quad	0x090d01050c000408, 0x03070b0f060a0e02</div><div class='del'>-.asciz	"Bit-sliced AES for NEON, CRYPTOGAMS by &lt;appro@openssl.org&gt;"</div><div class='del'>-.align	6</div><div class='del'>-.size	_bsaes_const,.-_bsaes_const</div><div class='del'>-</div><div class='del'>-.type	_bsaes_encrypt8,%function</div><div class='del'>-.align	4</div><div class='del'>-_bsaes_encrypt8:</div><div class='del'>-	adr	r6,_bsaes_encrypt8</div><div class='del'>-	vldmia	r4!, {q9}		@ round 0 key</div><div class='del'>-	sub	r6,r6,#_bsaes_encrypt8-.LM0SR</div><div class='del'>-</div><div class='del'>-	vldmia	r6!, {q8}		@ .LM0SR</div><div class='del'>-_bsaes_encrypt8_alt:</div><div class='del'>-	veor	q10, q0, q9	@ xor with round0 key</div><div class='del'>-	veor	q11, q1, q9</div><div class='del'>-	 vtbl.8	d0, {q10}, d16</div><div class='del'>-	 vtbl.8	d1, {q10}, d17</div><div class='del'>-	veor	q12, q2, q9</div><div class='del'>-	 vtbl.8	d2, {q11}, d16</div><div class='del'>-	 vtbl.8	d3, {q11}, d17</div><div class='del'>-	veor	q13, q3, q9</div><div class='del'>-	 vtbl.8	d4, {q12}, d16</div><div class='del'>-	 vtbl.8	d5, {q12}, d17</div><div class='del'>-	veor	q14, q4, q9</div><div class='del'>-	 vtbl.8	d6, {q13}, d16</div><div class='del'>-	 vtbl.8	d7, {q13}, d17</div><div class='del'>-	veor	q15, q5, q9</div><div class='del'>-	 vtbl.8	d8, {q14}, d16</div><div class='del'>-	 vtbl.8	d9, {q14}, d17</div><div class='del'>-	veor	q10, q6, q9</div><div class='del'>-	 vtbl.8	d10, {q15}, d16</div><div class='del'>-	 vtbl.8	d11, {q15}, d17</div><div class='del'>-	veor	q11, q7, q9</div><div class='del'>-	 vtbl.8	d12, {q10}, d16</div><div class='del'>-	 vtbl.8	d13, {q10}, d17</div><div class='del'>-	 vtbl.8	d14, {q11}, d16</div><div class='del'>-	 vtbl.8	d15, {q11}, d17</div><div class='del'>-_bsaes_encrypt8_bitslice:</div><div class='del'>-	vmov.i8	q8,#0x55			@ compose .LBS0</div><div class='del'>-	vmov.i8	q9,#0x33			@ compose .LBS1</div><div class='del'>-	vshr.u64	q10, q6, #1</div><div class='del'>-	 vshr.u64	q11, q4, #1</div><div class='del'>-	veor		q10, q10, q7</div><div class='del'>-	 veor		q11, q11, q5</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q7, q7, q10</div><div class='del'>-	vshl.u64	q10, q10, #1</div><div class='del'>-	 veor		q5, q5, q11</div><div class='del'>-	 vshl.u64	q11, q11, #1</div><div class='del'>-	veor		q6, q6, q10</div><div class='del'>-	 veor		q4, q4, q11</div><div class='del'>-	vshr.u64	q10, q2, #1</div><div class='del'>-	 vshr.u64	q11, q0, #1</div><div class='del'>-	veor		q10, q10, q3</div><div class='del'>-	 veor		q11, q11, q1</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q3, q3, q10</div><div class='del'>-	vshl.u64	q10, q10, #1</div><div class='del'>-	 veor		q1, q1, q11</div><div class='del'>-	 vshl.u64	q11, q11, #1</div><div class='del'>-	veor		q2, q2, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	vmov.i8	q8,#0x0f			@ compose .LBS2</div><div class='del'>-	vshr.u64	q10, q5, #2</div><div class='del'>-	 vshr.u64	q11, q4, #2</div><div class='del'>-	veor		q10, q10, q7</div><div class='del'>-	 veor		q11, q11, q6</div><div class='del'>-	vand		q10, q10, q9</div><div class='del'>-	 vand		q11, q11, q9</div><div class='del'>-	veor		q7, q7, q10</div><div class='del'>-	vshl.u64	q10, q10, #2</div><div class='del'>-	 veor		q6, q6, q11</div><div class='del'>-	 vshl.u64	q11, q11, #2</div><div class='del'>-	veor		q5, q5, q10</div><div class='del'>-	 veor		q4, q4, q11</div><div class='del'>-	vshr.u64	q10, q1, #2</div><div class='del'>-	 vshr.u64	q11, q0, #2</div><div class='del'>-	veor		q10, q10, q3</div><div class='del'>-	 veor		q11, q11, q2</div><div class='del'>-	vand		q10, q10, q9</div><div class='del'>-	 vand		q11, q11, q9</div><div class='del'>-	veor		q3, q3, q10</div><div class='del'>-	vshl.u64	q10, q10, #2</div><div class='del'>-	 veor		q2, q2, q11</div><div class='del'>-	 vshl.u64	q11, q11, #2</div><div class='del'>-	veor		q1, q1, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	vshr.u64	q10, q3, #4</div><div class='del'>-	 vshr.u64	q11, q2, #4</div><div class='del'>-	veor		q10, q10, q7</div><div class='del'>-	 veor		q11, q11, q6</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q7, q7, q10</div><div class='del'>-	vshl.u64	q10, q10, #4</div><div class='del'>-	 veor		q6, q6, q11</div><div class='del'>-	 vshl.u64	q11, q11, #4</div><div class='del'>-	veor		q3, q3, q10</div><div class='del'>-	 veor		q2, q2, q11</div><div class='del'>-	vshr.u64	q10, q1, #4</div><div class='del'>-	 vshr.u64	q11, q0, #4</div><div class='del'>-	veor		q10, q10, q5</div><div class='del'>-	 veor		q11, q11, q4</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q5, q5, q10</div><div class='del'>-	vshl.u64	q10, q10, #4</div><div class='del'>-	 veor		q4, q4, q11</div><div class='del'>-	 vshl.u64	q11, q11, #4</div><div class='del'>-	veor		q1, q1, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	sub	r5,r5,#1</div><div class='del'>-	b	.Lenc_sbox</div><div class='del'>-.align	4</div><div class='del'>-.Lenc_loop:</div><div class='del'>-	vldmia	r4!, {q8-q11}</div><div class='del'>-	veor	q8, q8, q0</div><div class='del'>-	veor	q9, q9, q1</div><div class='del'>-	vtbl.8	d0, {q8}, d24</div><div class='del'>-	vtbl.8	d1, {q8}, d25</div><div class='del'>-	vldmia	r4!, {q8}</div><div class='del'>-	veor	q10, q10, q2</div><div class='del'>-	vtbl.8	d2, {q9}, d24</div><div class='del'>-	vtbl.8	d3, {q9}, d25</div><div class='del'>-	vldmia	r4!, {q9}</div><div class='del'>-	veor	q11, q11, q3</div><div class='del'>-	vtbl.8	d4, {q10}, d24</div><div class='del'>-	vtbl.8	d5, {q10}, d25</div><div class='del'>-	vldmia	r4!, {q10}</div><div class='del'>-	vtbl.8	d6, {q11}, d24</div><div class='del'>-	vtbl.8	d7, {q11}, d25</div><div class='del'>-	vldmia	r4!, {q11}</div><div class='del'>-	veor	q8, q8, q4</div><div class='del'>-	veor	q9, q9, q5</div><div class='del'>-	vtbl.8	d8, {q8}, d24</div><div class='del'>-	vtbl.8	d9, {q8}, d25</div><div class='del'>-	veor	q10, q10, q6</div><div class='del'>-	vtbl.8	d10, {q9}, d24</div><div class='del'>-	vtbl.8	d11, {q9}, d25</div><div class='del'>-	veor	q11, q11, q7</div><div class='del'>-	vtbl.8	d12, {q10}, d24</div><div class='del'>-	vtbl.8	d13, {q10}, d25</div><div class='del'>-	vtbl.8	d14, {q11}, d24</div><div class='del'>-	vtbl.8	d15, {q11}, d25</div><div class='del'>-.Lenc_sbox:</div><div class='del'>-	veor	q2, q2, q1</div><div class='del'>-	veor	q5, q5, q6</div><div class='del'>-	veor	q3, q3, q0</div><div class='del'>-	veor	q6, q6, q2</div><div class='del'>-	veor	q5, q5, q0</div><div class='del'>-</div><div class='del'>-	veor	q6, q6, q3</div><div class='del'>-	veor	q3, q3, q7</div><div class='del'>-	veor	q7, q7, q5</div><div class='del'>-	veor	q3, q3, q4</div><div class='del'>-	veor	q4, q4, q5</div><div class='del'>-</div><div class='del'>-	veor	q2, q2, q7</div><div class='del'>-	veor	q3, q3, q1</div><div class='del'>-	veor	q1, q1, q5</div><div class='del'>-	veor	q11, q7, q4</div><div class='del'>-	veor	q10, q1, q2</div><div class='del'>-	veor	q9, q5, q3</div><div class='del'>-	veor	q13, q2, q4</div><div class='del'>-	 vmov	q8, q10</div><div class='del'>-	veor	q12, q6, q0</div><div class='del'>-</div><div class='del'>-	vorr	q10, q10, q9</div><div class='del'>-	veor	q15, q11, q8</div><div class='del'>-	vand	q14, q11, q12</div><div class='del'>-	vorr	q11, q11, q12</div><div class='del'>-	veor	q12, q12, q9</div><div class='del'>-	vand	q8, q8, q9</div><div class='del'>-	veor	q9, q3, q0</div><div class='del'>-	vand	q15, q15, q12</div><div class='del'>-	vand	q13, q13, q9</div><div class='del'>-	veor	q9, q7, q1</div><div class='del'>-	veor	q12, q5, q6</div><div class='del'>-	veor	q11, q11, q13</div><div class='del'>-	veor	q10, q10, q13</div><div class='del'>-	vand	q13, q9, q12</div><div class='del'>-	vorr	q9, q9, q12</div><div class='del'>-	veor	q11, q11, q15</div><div class='del'>-	veor	q8, q8, q13</div><div class='del'>-	veor	q10, q10, q14</div><div class='del'>-	veor	q9, q9, q15</div><div class='del'>-	veor	q8, q8, q14</div><div class='del'>-	vand	q12, q2, q3</div><div class='del'>-	veor	q9, q9, q14</div><div class='del'>-	vand	q13, q4, q0</div><div class='del'>-	vand	q14, q1, q5</div><div class='del'>-	vorr	q15, q7, q6</div><div class='del'>-	veor	q11, q11, q12</div><div class='del'>-	veor	q9, q9, q14</div><div class='del'>-	veor	q8, q8, q15</div><div class='del'>-	veor	q10, q10, q13</div><div class='del'>-</div><div class='del'>-	@ Inv_GF16 	0, 	1, 	2, 	3, s0, s1, s2, s3</div><div class='del'>-</div><div class='del'>-	@ new smaller inversion</div><div class='del'>-</div><div class='del'>-	vand	q14, q11, q9</div><div class='del'>-	vmov	q12, q8</div><div class='del'>-</div><div class='del'>-	veor	q13, q10, q14</div><div class='del'>-	veor	q15, q8, q14</div><div class='del'>-	veor	q14, q8, q14	@ q14=q15</div><div class='del'>-</div><div class='del'>-	vbsl	q13, q9, q8</div><div class='del'>-	vbsl	q15, q11, q10</div><div class='del'>-	veor	q11, q11, q10</div><div class='del'>-</div><div class='del'>-	vbsl	q12, q13, q14</div><div class='del'>-	vbsl	q8, q14, q13</div><div class='del'>-</div><div class='del'>-	vand	q14, q12, q15</div><div class='del'>-	veor	q9, q9, q8</div><div class='del'>-</div><div class='del'>-	veor	q14, q14, q11</div><div class='del'>-	veor	q12, q6, q0</div><div class='del'>-	veor	q8, q5, q3</div><div class='del'>-	veor 	q10, q15, q14</div><div class='del'>-	vand	q10, q10, q6</div><div class='del'>-	veor	q6, q6, q5</div><div class='del'>-	vand	q11, q5, q15</div><div class='del'>-	vand	q6, q6, q14</div><div class='del'>-	veor	q5, q11, q10</div><div class='del'>-	veor	q6, q6, q11</div><div class='del'>-	veor	q15, q15, q13</div><div class='del'>-	veor	q14, q14, q9</div><div class='del'>-	veor	q11, q15, q14</div><div class='del'>-	 veor 	q10, q13, q9</div><div class='del'>-	vand	q11, q11, q12</div><div class='del'>-	 vand	q10, q10, q0</div><div class='del'>-	veor	q12, q12, q8</div><div class='del'>-	 veor	q0, q0, q3</div><div class='del'>-	vand	q8, q8, q15</div><div class='del'>-	 vand	q3, q3, q13</div><div class='del'>-	vand	q12, q12, q14</div><div class='del'>-	 vand	q0, q0, q9</div><div class='del'>-	veor	q8, q8, q12</div><div class='del'>-	 veor	q0, q0, q3</div><div class='del'>-	veor	q12, q12, q11</div><div class='del'>-	 veor	q3, q3, q10</div><div class='del'>-	veor	q6, q6, q12</div><div class='del'>-	veor	q0, q0, q12</div><div class='del'>-	veor	q5, q5, q8</div><div class='del'>-	veor	q3, q3, q8</div><div class='del'>-</div><div class='del'>-	veor	q12, q7, q4</div><div class='del'>-	veor	q8, q1, q2</div><div class='del'>-	veor	q11, q15, q14</div><div class='del'>-	 veor 	q10, q13, q9</div><div class='del'>-	vand	q11, q11, q12</div><div class='del'>-	 vand	q10, q10, q4</div><div class='del'>-	veor	q12, q12, q8</div><div class='del'>-	 veor	q4, q4, q2</div><div class='del'>-	vand	q8, q8, q15</div><div class='del'>-	 vand	q2, q2, q13</div><div class='del'>-	vand	q12, q12, q14</div><div class='del'>-	 vand	q4, q4, q9</div><div class='del'>-	veor	q8, q8, q12</div><div class='del'>-	 veor	q4, q4, q2</div><div class='del'>-	veor	q12, q12, q11</div><div class='del'>-	 veor	q2, q2, q10</div><div class='del'>-	veor	q15, q15, q13</div><div class='del'>-	veor	q14, q14, q9</div><div class='del'>-	veor 	q10, q15, q14</div><div class='del'>-	vand	q10, q10, q7</div><div class='del'>-	veor	q7, q7, q1</div><div class='del'>-	vand	q11, q1, q15</div><div class='del'>-	vand	q7, q7, q14</div><div class='del'>-	veor	q1, q11, q10</div><div class='del'>-	veor	q7, q7, q11</div><div class='del'>-	veor	q7, q7, q12</div><div class='del'>-	veor	q4, q4, q12</div><div class='del'>-	veor	q1, q1, q8</div><div class='del'>-	veor	q2, q2, q8</div><div class='del'>-	veor	q7, q7, q0</div><div class='del'>-	veor	q1, q1, q6</div><div class='del'>-	veor	q6, q6, q0</div><div class='del'>-	veor	q4, q4, q7</div><div class='del'>-	veor	q0, q0, q1</div><div class='del'>-</div><div class='del'>-	veor	q1, q1, q5</div><div class='del'>-	veor	q5, q5, q2</div><div class='del'>-	veor	q2, q2, q3</div><div class='del'>-	veor	q3, q3, q5</div><div class='del'>-	veor	q4, q4, q5</div><div class='del'>-</div><div class='del'>-	veor	q6, q6, q3</div><div class='del'>-	subs	r5,r5,#1</div><div class='del'>-	bcc	.Lenc_done</div><div class='del'>-	vext.8	q8, q0, q0, #12	@ x0 &lt;&lt;&lt; 32</div><div class='del'>-	vext.8	q9, q1, q1, #12</div><div class='del'>-	 veor	q0, q0, q8		@ x0 ^ (x0 &lt;&lt;&lt; 32)</div><div class='del'>-	vext.8	q10, q4, q4, #12</div><div class='del'>-	 veor	q1, q1, q9</div><div class='del'>-	vext.8	q11, q6, q6, #12</div><div class='del'>-	 veor	q4, q4, q10</div><div class='del'>-	vext.8	q12, q3, q3, #12</div><div class='del'>-	 veor	q6, q6, q11</div><div class='del'>-	vext.8	q13, q7, q7, #12</div><div class='del'>-	 veor	q3, q3, q12</div><div class='del'>-	vext.8	q14, q2, q2, #12</div><div class='del'>-	 veor	q7, q7, q13</div><div class='del'>-	vext.8	q15, q5, q5, #12</div><div class='del'>-	 veor	q2, q2, q14</div><div class='del'>-</div><div class='del'>-	veor	q9, q9, q0</div><div class='del'>-	 veor	q5, q5, q15</div><div class='del'>-	 vext.8	q0, q0, q0, #8		@ (x0 ^ (x0 &lt;&lt;&lt; 32)) &lt;&lt;&lt; 64)</div><div class='del'>-	veor	q10, q10, q1</div><div class='del'>-	veor	q8, q8, q5</div><div class='del'>-	veor	q9, q9, q5</div><div class='del'>-	 vext.8	q1, q1, q1, #8</div><div class='del'>-	veor	q13, q13, q3</div><div class='del'>-	 veor	q0, q0, q8</div><div class='del'>-	veor	q14, q14, q7</div><div class='del'>-	 veor	q1, q1, q9</div><div class='del'>-	 vext.8	q8, q3, q3, #8</div><div class='del'>-	veor	q12, q12, q6</div><div class='del'>-	 vext.8	q9, q7, q7, #8</div><div class='del'>-	veor	q15, q15, q2</div><div class='del'>-	 vext.8	q3, q6, q6, #8</div><div class='del'>-	veor	q11, q11, q4</div><div class='del'>-	 vext.8	q7, q5, q5, #8</div><div class='del'>-	veor	q12, q12, q5</div><div class='del'>-	 vext.8	q6, q2, q2, #8</div><div class='del'>-	veor	q11, q11, q5</div><div class='del'>-	 vext.8	q2, q4, q4, #8</div><div class='del'>-	veor	q5, q9, q13</div><div class='del'>-	veor	q4, q8, q12</div><div class='del'>-	veor	q3, q3, q11</div><div class='del'>-	veor	q7, q7, q15</div><div class='del'>-	veor	q6, q6, q14</div><div class='del'>-	 @ vmov	q4, q8</div><div class='del'>-	veor	q2, q2, q10</div><div class='del'>-	 @ vmov	q5, q9</div><div class='del'>-	vldmia	r6, {q12}		@ .LSR</div><div class='del'>-	ite	eq				@ Thumb2 thing, samity check in ARM</div><div class='del'>-	addeq	r6,r6,#0x10</div><div class='del'>-	bne	.Lenc_loop</div><div class='del'>-	vldmia	r6, {q12}		@ .LSRM0</div><div class='del'>-	b	.Lenc_loop</div><div class='del'>-.align	4</div><div class='del'>-.Lenc_done:</div><div class='del'>-	vmov.i8	q8,#0x55			@ compose .LBS0</div><div class='del'>-	vmov.i8	q9,#0x33			@ compose .LBS1</div><div class='del'>-	vshr.u64	q10, q2, #1</div><div class='del'>-	 vshr.u64	q11, q3, #1</div><div class='del'>-	veor		q10, q10, q5</div><div class='del'>-	 veor		q11, q11, q7</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q5, q5, q10</div><div class='del'>-	vshl.u64	q10, q10, #1</div><div class='del'>-	 veor		q7, q7, q11</div><div class='del'>-	 vshl.u64	q11, q11, #1</div><div class='del'>-	veor		q2, q2, q10</div><div class='del'>-	 veor		q3, q3, q11</div><div class='del'>-	vshr.u64	q10, q4, #1</div><div class='del'>-	 vshr.u64	q11, q0, #1</div><div class='del'>-	veor		q10, q10, q6</div><div class='del'>-	 veor		q11, q11, q1</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q6, q6, q10</div><div class='del'>-	vshl.u64	q10, q10, #1</div><div class='del'>-	 veor		q1, q1, q11</div><div class='del'>-	 vshl.u64	q11, q11, #1</div><div class='del'>-	veor		q4, q4, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	vmov.i8	q8,#0x0f			@ compose .LBS2</div><div class='del'>-	vshr.u64	q10, q7, #2</div><div class='del'>-	 vshr.u64	q11, q3, #2</div><div class='del'>-	veor		q10, q10, q5</div><div class='del'>-	 veor		q11, q11, q2</div><div class='del'>-	vand		q10, q10, q9</div><div class='del'>-	 vand		q11, q11, q9</div><div class='del'>-	veor		q5, q5, q10</div><div class='del'>-	vshl.u64	q10, q10, #2</div><div class='del'>-	 veor		q2, q2, q11</div><div class='del'>-	 vshl.u64	q11, q11, #2</div><div class='del'>-	veor		q7, q7, q10</div><div class='del'>-	 veor		q3, q3, q11</div><div class='del'>-	vshr.u64	q10, q1, #2</div><div class='del'>-	 vshr.u64	q11, q0, #2</div><div class='del'>-	veor		q10, q10, q6</div><div class='del'>-	 veor		q11, q11, q4</div><div class='del'>-	vand		q10, q10, q9</div><div class='del'>-	 vand		q11, q11, q9</div><div class='del'>-	veor		q6, q6, q10</div><div class='del'>-	vshl.u64	q10, q10, #2</div><div class='del'>-	 veor		q4, q4, q11</div><div class='del'>-	 vshl.u64	q11, q11, #2</div><div class='del'>-	veor		q1, q1, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	vshr.u64	q10, q6, #4</div><div class='del'>-	 vshr.u64	q11, q4, #4</div><div class='del'>-	veor		q10, q10, q5</div><div class='del'>-	 veor		q11, q11, q2</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q5, q5, q10</div><div class='del'>-	vshl.u64	q10, q10, #4</div><div class='del'>-	 veor		q2, q2, q11</div><div class='del'>-	 vshl.u64	q11, q11, #4</div><div class='del'>-	veor		q6, q6, q10</div><div class='del'>-	 veor		q4, q4, q11</div><div class='del'>-	vshr.u64	q10, q1, #4</div><div class='del'>-	 vshr.u64	q11, q0, #4</div><div class='del'>-	veor		q10, q10, q7</div><div class='del'>-	 veor		q11, q11, q3</div><div class='del'>-	vand		q10, q10, q8</div><div class='del'>-	 vand		q11, q11, q8</div><div class='del'>-	veor		q7, q7, q10</div><div class='del'>-	vshl.u64	q10, q10, #4</div><div class='del'>-	 veor		q3, q3, q11</div><div class='del'>-	 vshl.u64	q11, q11, #4</div><div class='del'>-	veor		q1, q1, q10</div><div class='del'>-	 veor		q0, q0, q11</div><div class='del'>-	vldmia	r4, {q8}			@ last round key</div><div class='del'>-	veor	q4, q4, q8</div><div class='del'>-	veor	q6, q6, q8</div><div class='del'>-	veor	q3, q3, q8</div><div class='del'>-	veor	q7, q7, q8</div><div class='del'>-	veor	q2, q2, q8</div><div class='del'>-	veor	q5, q5, q8</div><div class='del'>-	veor	q0, q0, q8</div><div class='del'>-	veor	q1, q1, q8</div><div class='del'>-	bx	lr</div><div class='del'>-.size	_bsaes_encrypt8,.-_bsaes_encrypt8</div><div class='del'>-.type	_bsaes_key_convert,%function</div><div class='del'>-.align	4</div><div class='del'>-_bsaes_key_convert:</div><div class='del'>-	adr	r6,_bsaes_key_convert</div><div class='del'>-	vld1.8	{q7},  [r4]!		@ load round 0 key</div><div class='del'>-	sub	r6,r6,#_bsaes_key_convert-.LM0</div><div class='del'>-	vld1.8	{q15}, [r4]!		@ load round 1 key</div><div class='del'>-</div><div class='del'>-	vmov.i8	q8,  #0x01			@ bit masks</div><div class='del'>-	vmov.i8	q9,  #0x02</div><div class='del'>-	vmov.i8	q10, #0x04</div><div class='del'>-	vmov.i8	q11, #0x08</div><div class='del'>-	vmov.i8	q12, #0x10</div><div class='del'>-	vmov.i8	q13, #0x20</div><div class='del'>-	vldmia	r6, {q14}		@ .LM0</div><div class='del'>-</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	vrev32.8	q7,  q7</div><div class='del'>-	vrev32.8	q15, q15</div><div class='del'>-#endif</div><div class='del'>-	sub	r5,r5,#1</div><div class='del'>-	vstmia	r12!, {q7}		@ save round 0 key</div><div class='del'>-	b	.Lkey_loop</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lkey_loop:</div><div class='del'>-	vtbl.8	d14,{q15},d28</div><div class='del'>-	vtbl.8	d15,{q15},d29</div><div class='del'>-	vmov.i8	q6,  #0x40</div><div class='del'>-	vmov.i8	q15, #0x80</div><div class='del'>-</div><div class='del'>-	vtst.8	q0, q7, q8</div><div class='del'>-	vtst.8	q1, q7, q9</div><div class='del'>-	vtst.8	q2, q7, q10</div><div class='del'>-	vtst.8	q3, q7, q11</div><div class='del'>-	vtst.8	q4, q7, q12</div><div class='del'>-	vtst.8	q5, q7, q13</div><div class='del'>-	vtst.8	q6, q7, q6</div><div class='del'>-	vtst.8	q7, q7, q15</div><div class='del'>-	vld1.8	{q15}, [r4]!		@ load next round key</div><div class='del'>-	vmvn	q0, q0		@ "pnot"</div><div class='del'>-	vmvn	q1, q1</div><div class='del'>-	vmvn	q5, q5</div><div class='del'>-	vmvn	q6, q6</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	vrev32.8	q15, q15</div><div class='del'>-#endif</div><div class='del'>-	subs	r5,r5,#1</div><div class='del'>-	vstmia	r12!,{q0-q7}		@ write bit-sliced round key</div><div class='del'>-	bne	.Lkey_loop</div><div class='del'>-</div><div class='del'>-	vmov.i8	q7,#0x63			@ compose .L63</div><div class='del'>-	@ don't save last round key</div><div class='del'>-	bx	lr</div><div class='del'>-.size	_bsaes_key_convert,.-_bsaes_key_convert</div><div class='del'>-.extern AES_cbc_encrypt</div><div class='del'>-.extern AES_decrypt</div><div class='del'>-</div><div class='del'>-.global	bsaes_cbc_encrypt</div><div class='del'>-.type	bsaes_cbc_encrypt,%function</div><div class='del'>-.align	5</div><div class='del'>-bsaes_cbc_encrypt:</div><div class='del'>-#ifndef	__KERNEL__</div><div class='del'>-	cmp	r2, #128</div><div class='del'>-#ifndef	__thumb__</div><div class='del'>-	blo	AES_cbc_encrypt</div><div class='del'>-#else</div><div class='del'>-	bhs	1f</div><div class='del'>-	b	AES_cbc_encrypt</div><div class='del'>-1:</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	@ it is up to the caller to make sure we are called with enc == 0</div><div class='del'>-</div><div class='del'>-	mov	ip, sp</div><div class='del'>-	stmdb	sp!, {r4-r10, lr}</div><div class='del'>-	VFP_ABI_PUSH</div><div class='del'>-	ldr	r8, [ip]			@ IV is 1st arg on the stack</div><div class='del'>-	mov	r2, r2, lsr#4		@ len in 16 byte blocks</div><div class='del'>-	sub	sp, #0x10			@ scratch space to carry over the IV</div><div class='del'>-	mov	r9, sp				@ save sp</div><div class='del'>-</div><div class='del'>-	ldr	r10, [r3, #240]		@ get # of rounds</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	@ allocate the key schedule on the stack</div><div class='del'>-	sub	r12, sp, r10, lsl#7		@ 128 bytes per inner round key</div><div class='del'>-	add	r12, #96			@ sifze of bit-slices key schedule</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	mov	r4, r3			@ pass key</div><div class='del'>-	mov	r5, r10			@ pass # of rounds</div><div class='del'>-	mov	sp, r12				@ sp is sp</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	vldmia	sp, {q6}</div><div class='del'>-	vstmia	r12,  {q15}		@ save last round key</div><div class='del'>-	veor	q7, q7, q6	@ fix up round 0 key</div><div class='del'>-	vstmia	sp, {q7}</div><div class='del'>-#else</div><div class='del'>-	ldr	r12, [r3, #244]</div><div class='del'>-	eors	r12, #1</div><div class='del'>-	beq	0f</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	str	r12, [r3, #244]</div><div class='del'>-	mov	r4, r3			@ pass key</div><div class='del'>-	mov	r5, r10			@ pass # of rounds</div><div class='del'>-	add	r12, r3, #248			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	add	r4, r3, #248</div><div class='del'>-	vldmia	r4, {q6}</div><div class='del'>-	vstmia	r12, {q15}			@ save last round key</div><div class='del'>-	veor	q7, q7, q6	@ fix up round 0 key</div><div class='del'>-	vstmia	r4, {q7}</div><div class='del'>-</div><div class='del'>-.align	2</div><div class='del'>-0:</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	vld1.8	{q15}, [r8]		@ load IV</div><div class='del'>-	b	.Lcbc_dec_loop</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_loop:</div><div class='del'>-	subs	r2, r2, #0x8</div><div class='del'>-	bmi	.Lcbc_dec_loop_finish</div><div class='del'>-</div><div class='del'>-	vld1.8	{q0-q1}, [r0]!	@ load input</div><div class='del'>-	vld1.8	{q2-q3}, [r0]!</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	mov	r4, sp			@ pass the key</div><div class='del'>-#else</div><div class='del'>-	add	r4, r3, #248</div><div class='del'>-#endif</div><div class='del'>-	vld1.8	{q4-q5}, [r0]!</div><div class='del'>-	mov	r5, r10</div><div class='del'>-	vld1.8	{q6-q7}, [r0]</div><div class='del'>-	sub	r0, r0, #0x60</div><div class='del'>-	vstmia	r9, {q15}			@ put aside IV</div><div class='del'>-</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vldmia	r9, {q14}			@ reload IV</div><div class='del'>-	vld1.8	{q8-q9}, [r0]!	@ reload input</div><div class='del'>-	veor	q0, q0, q14	@ ^= IV</div><div class='del'>-	vld1.8	{q10-q11}, [r0]!</div><div class='del'>-	veor	q1, q1, q8</div><div class='del'>-	veor	q6, q6, q9</div><div class='del'>-	vld1.8	{q12-q13}, [r0]!</div><div class='del'>-	veor	q4, q4, q10</div><div class='del'>-	veor	q2, q2, q11</div><div class='del'>-	vld1.8	{q14-q15}, [r0]!</div><div class='del'>-	veor	q7, q7, q12</div><div class='del'>-	vst1.8	{q0-q1}, [r1]!	@ write output</div><div class='del'>-	veor	q3, q3, q13</div><div class='del'>-	vst1.8	{q6}, [r1]!</div><div class='del'>-	veor	q5, q5, q14</div><div class='del'>-	vst1.8	{q4}, [r1]!</div><div class='del'>-	vst1.8	{q2}, [r1]!</div><div class='del'>-	vst1.8	{q7}, [r1]!</div><div class='del'>-	vst1.8	{q3}, [r1]!</div><div class='del'>-	vst1.8	{q5}, [r1]!</div><div class='del'>-</div><div class='del'>-	b	.Lcbc_dec_loop</div><div class='del'>-</div><div class='del'>-.Lcbc_dec_loop_finish:</div><div class='del'>-	adds	r2, r2, #8</div><div class='del'>-	beq	.Lcbc_dec_done</div><div class='del'>-</div><div class='del'>-	vld1.8	{q0}, [r0]!		@ load input</div><div class='del'>-	cmp	r2, #2</div><div class='del'>-	blo	.Lcbc_dec_one</div><div class='del'>-	vld1.8	{q1}, [r0]!</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	mov	r4, sp			@ pass the key</div><div class='del'>-#else</div><div class='del'>-	add	r4, r3, #248</div><div class='del'>-#endif</div><div class='del'>-	mov	r5, r10</div><div class='del'>-	vstmia	r9, {q15}			@ put aside IV</div><div class='del'>-	beq	.Lcbc_dec_two</div><div class='del'>-	vld1.8	{q2}, [r0]!</div><div class='del'>-	cmp	r2, #4</div><div class='del'>-	blo	.Lcbc_dec_three</div><div class='del'>-	vld1.8	{q3}, [r0]!</div><div class='del'>-	beq	.Lcbc_dec_four</div><div class='del'>-	vld1.8	{q4}, [r0]!</div><div class='del'>-	cmp	r2, #6</div><div class='del'>-	blo	.Lcbc_dec_five</div><div class='del'>-	vld1.8	{q5}, [r0]!</div><div class='del'>-	beq	.Lcbc_dec_six</div><div class='del'>-	vld1.8	{q6}, [r0]!</div><div class='del'>-	sub	r0, r0, #0x70</div><div class='del'>-</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vldmia	r9, {q14}			@ reload IV</div><div class='del'>-	vld1.8	{q8-q9}, [r0]!	@ reload input</div><div class='del'>-	veor	q0, q0, q14	@ ^= IV</div><div class='del'>-	vld1.8	{q10-q11}, [r0]!</div><div class='del'>-	veor	q1, q1, q8</div><div class='del'>-	veor	q6, q6, q9</div><div class='del'>-	vld1.8	{q12-q13}, [r0]!</div><div class='del'>-	veor	q4, q4, q10</div><div class='del'>-	veor	q2, q2, q11</div><div class='del'>-	vld1.8	{q15}, [r0]!</div><div class='del'>-	veor	q7, q7, q12</div><div class='del'>-	vst1.8	{q0-q1}, [r1]!	@ write output</div><div class='del'>-	veor	q3, q3, q13</div><div class='del'>-	vst1.8	{q6}, [r1]!</div><div class='del'>-	vst1.8	{q4}, [r1]!</div><div class='del'>-	vst1.8	{q2}, [r1]!</div><div class='del'>-	vst1.8	{q7}, [r1]!</div><div class='del'>-	vst1.8	{q3}, [r1]!</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_six:</div><div class='del'>-	sub	r0, r0, #0x60</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-	vldmia	r9,{q14}			@ reload IV</div><div class='del'>-	vld1.8	{q8-q9}, [r0]!	@ reload input</div><div class='del'>-	veor	q0, q0, q14	@ ^= IV</div><div class='del'>-	vld1.8	{q10-q11}, [r0]!</div><div class='del'>-	veor	q1, q1, q8</div><div class='del'>-	veor	q6, q6, q9</div><div class='del'>-	vld1.8	{q12}, [r0]!</div><div class='del'>-	veor	q4, q4, q10</div><div class='del'>-	veor	q2, q2, q11</div><div class='del'>-	vld1.8	{q15}, [r0]!</div><div class='del'>-	veor	q7, q7, q12</div><div class='del'>-	vst1.8	{q0-q1}, [r1]!	@ write output</div><div class='del'>-	vst1.8	{q6}, [r1]!</div><div class='del'>-	vst1.8	{q4}, [r1]!</div><div class='del'>-	vst1.8	{q2}, [r1]!</div><div class='del'>-	vst1.8	{q7}, [r1]!</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_five:</div><div class='del'>-	sub	r0, r0, #0x50</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-	vldmia	r9, {q14}			@ reload IV</div><div class='del'>-	vld1.8	{q8-q9}, [r0]!	@ reload input</div><div class='del'>-	veor	q0, q0, q14	@ ^= IV</div><div class='del'>-	vld1.8	{q10-q11}, [r0]!</div><div class='del'>-	veor	q1, q1, q8</div><div class='del'>-	veor	q6, q6, q9</div><div class='del'>-	vld1.8	{q15}, [r0]!</div><div class='del'>-	veor	q4, q4, q10</div><div class='del'>-	vst1.8	{q0-q1}, [r1]!	@ write output</div><div class='del'>-	veor	q2, q2, q11</div><div class='del'>-	vst1.8	{q6}, [r1]!</div><div class='del'>-	vst1.8	{q4}, [r1]!</div><div class='del'>-	vst1.8	{q2}, [r1]!</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_four:</div><div class='del'>-	sub	r0, r0, #0x40</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-	vldmia	r9, {q14}			@ reload IV</div><div class='del'>-	vld1.8	{q8-q9}, [r0]!	@ reload input</div><div class='del'>-	veor	q0, q0, q14	@ ^= IV</div><div class='del'>-	vld1.8	{q10}, [r0]!</div><div class='del'>-	veor	q1, q1, q8</div><div class='del'>-	veor	q6, q6, q9</div><div class='del'>-	vld1.8	{q15}, [r0]!</div><div class='del'>-	veor	q4, q4, q10</div><div class='del'>-	vst1.8	{q0-q1}, [r1]!	@ write output</div><div class='del'>-	vst1.8	{q6}, [r1]!</div><div class='del'>-	vst1.8	{q4}, [r1]!</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_three:</div><div class='del'>-	sub	r0, r0, #0x30</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-	vldmia	r9, {q14}			@ reload IV</div><div class='del'>-	vld1.8	{q8-q9}, [r0]!	@ reload input</div><div class='del'>-	veor	q0, q0, q14	@ ^= IV</div><div class='del'>-	vld1.8	{q15}, [r0]!</div><div class='del'>-	veor	q1, q1, q8</div><div class='del'>-	veor	q6, q6, q9</div><div class='del'>-	vst1.8	{q0-q1}, [r1]!	@ write output</div><div class='del'>-	vst1.8	{q6}, [r1]!</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_two:</div><div class='del'>-	sub	r0, r0, #0x20</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-	vldmia	r9, {q14}			@ reload IV</div><div class='del'>-	vld1.8	{q8}, [r0]!		@ reload input</div><div class='del'>-	veor	q0, q0, q14	@ ^= IV</div><div class='del'>-	vld1.8	{q15}, [r0]!		@ reload input</div><div class='del'>-	veor	q1, q1, q8</div><div class='del'>-	vst1.8	{q0-q1}, [r1]!	@ write output</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_one:</div><div class='del'>-	sub	r0, r0, #0x10</div><div class='del'>-	mov	r10, r1			@ save original out pointer</div><div class='del'>-	mov	r1, r9			@ use the iv scratch space as out buffer</div><div class='del'>-	mov	r2, r3</div><div class='del'>-	vmov	q4,q15		@ just in case ensure that IV</div><div class='del'>-	vmov	q5,q0			@ and input are preserved</div><div class='del'>-	bl	AES_decrypt</div><div class='del'>-	vld1.8	{q0}, [r9,:64]		@ load result</div><div class='del'>-	veor	q0, q0, q4	@ ^= IV</div><div class='del'>-	vmov	q15, q5		@ q5 holds input</div><div class='del'>-	vst1.8	{q0}, [r10]		@ write output</div><div class='del'>-</div><div class='del'>-.Lcbc_dec_done:</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	vmov.i32	q0, #0</div><div class='del'>-	vmov.i32	q1, #0</div><div class='del'>-.Lcbc_dec_bzero:				@ wipe key schedule [if any]</div><div class='del'>-	vstmia		sp!, {q0-q1}</div><div class='del'>-	cmp		sp, r9</div><div class='del'>-	bne		.Lcbc_dec_bzero</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	mov	sp, r9</div><div class='del'>-	add	sp, #0x10			@ add sp,r9,#0x10 is no good for thumb</div><div class='del'>-	vst1.8	{q15}, [r8]		@ return IV</div><div class='del'>-	VFP_ABI_POP</div><div class='del'>-	ldmia	sp!, {r4-r10, pc}</div><div class='del'>-.size	bsaes_cbc_encrypt,.-bsaes_cbc_encrypt</div><div class='del'>-.extern	AES_encrypt</div><div class='del'>-.global	bsaes_ctr32_encrypt_blocks</div><div class='del'>-.type	bsaes_ctr32_encrypt_blocks,%function</div><div class='del'>-.align	5</div><div class='del'>-bsaes_ctr32_encrypt_blocks:</div><div class='del'>-	cmp	r2, #8			@ use plain AES for</div><div class='del'>-	blo	.Lctr_enc_short			@ small sizes</div><div class='del'>-</div><div class='del'>-	mov	ip, sp</div><div class='del'>-	stmdb	sp!, {r4-r10, lr}</div><div class='del'>-	VFP_ABI_PUSH</div><div class='del'>-	ldr	r8, [ip]			@ ctr is 1st arg on the stack</div><div class='del'>-	sub	sp, sp, #0x10			@ scratch space to carry over the ctr</div><div class='del'>-	mov	r9, sp				@ save sp</div><div class='del'>-</div><div class='del'>-	ldr	r10, [r3, #240]		@ get # of rounds</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	@ allocate the key schedule on the stack</div><div class='del'>-	sub	r12, sp, r10, lsl#7		@ 128 bytes per inner round key</div><div class='del'>-	add	r12, #96			@ size of bit-sliced key schedule</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	mov	r4, r3			@ pass key</div><div class='del'>-	mov	r5, r10			@ pass # of rounds</div><div class='del'>-	mov	sp, r12				@ sp is sp</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	veor	q7,q7,q15	@ fix up last round key</div><div class='del'>-	vstmia	r12, {q7}			@ save last round key</div><div class='del'>-</div><div class='del'>-	vld1.8	{q0}, [r8]		@ load counter</div><div class='del'>-	add	r8, r6, #.LREVM0SR-.LM0	@ borrow r8</div><div class='del'>-	vldmia	sp, {q4}		@ load round0 key</div><div class='del'>-#else</div><div class='del'>-	ldr	r12, [r3, #244]</div><div class='del'>-	eors	r12, #1</div><div class='del'>-	beq	0f</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	str	r12, [r3, #244]</div><div class='del'>-	mov	r4, r3			@ pass key</div><div class='del'>-	mov	r5, r10			@ pass # of rounds</div><div class='del'>-	add	r12, r3, #248			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	veor	q7,q7,q15	@ fix up last round key</div><div class='del'>-	vstmia	r12, {q7}			@ save last round key</div><div class='del'>-</div><div class='del'>-.align	2</div><div class='del'>-0:	add	r12, r3, #248</div><div class='del'>-	vld1.8	{q0}, [r8]		@ load counter</div><div class='del'>-	adrl	r8, .LREVM0SR			@ borrow r8</div><div class='del'>-	vldmia	r12, {q4}			@ load round0 key</div><div class='del'>-	sub	sp, #0x10			@ place for adjusted round0 key</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	vmov.i32	q8,#1		@ compose 1&lt;&lt;96</div><div class='del'>-	veor		q9,q9,q9</div><div class='del'>-	vrev32.8	q0,q0</div><div class='del'>-	vext.8		q8,q9,q8,#4</div><div class='del'>-	vrev32.8	q4,q4</div><div class='del'>-	vadd.u32	q9,q8,q8	@ compose 2&lt;&lt;96</div><div class='del'>-	vstmia	sp, {q4}		@ save adjusted round0 key</div><div class='del'>-	b	.Lctr_enc_loop</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lctr_enc_loop:</div><div class='del'>-	vadd.u32	q10, q8, q9	@ compose 3&lt;&lt;96</div><div class='del'>-	vadd.u32	q1, q0, q8	@ +1</div><div class='del'>-	vadd.u32	q2, q0, q9	@ +2</div><div class='del'>-	vadd.u32	q3, q0, q10	@ +3</div><div class='del'>-	vadd.u32	q4, q1, q10</div><div class='del'>-	vadd.u32	q5, q2, q10</div><div class='del'>-	vadd.u32	q6, q3, q10</div><div class='del'>-	vadd.u32	q7, q4, q10</div><div class='del'>-	vadd.u32	q10, q5, q10	@ next counter</div><div class='del'>-</div><div class='del'>-	@ Borrow prologue from _bsaes_encrypt8 to use the opportunity</div><div class='del'>-	@ to flip byte order in 32-bit counter</div><div class='del'>-</div><div class='del'>-	vldmia		sp, {q9}		@ load round0 key</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x10		@ pass next round key</div><div class='del'>-#else</div><div class='del'>-	add		r4, r3, #264</div><div class='del'>-#endif</div><div class='del'>-	vldmia		r8, {q8}			@ .LREVM0SR</div><div class='del'>-	mov		r5, r10			@ pass rounds</div><div class='del'>-	vstmia		r9, {q10}			@ save next counter</div><div class='del'>-	sub		r6, r8, #.LREVM0SR-.LSR	@ pass constants</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8_alt</div><div class='del'>-</div><div class='del'>-	subs		r2, r2, #8</div><div class='del'>-	blo		.Lctr_enc_loop_done</div><div class='del'>-</div><div class='del'>-	vld1.8		{q8-q9}, [r0]!	@ load input</div><div class='del'>-	vld1.8		{q10-q11}, [r0]!</div><div class='del'>-	veor		q0, q8</div><div class='del'>-	veor		q1, q9</div><div class='del'>-	vld1.8		{q12-q13}, [r0]!</div><div class='del'>-	veor		q4, q10</div><div class='del'>-	veor		q6, q11</div><div class='del'>-	vld1.8		{q14-q15}, [r0]!</div><div class='del'>-	veor		q3, q12</div><div class='del'>-	vst1.8		{q0-q1}, [r1]!	@ write output</div><div class='del'>-	veor		q7, q13</div><div class='del'>-	veor		q2, q14</div><div class='del'>-	vst1.8		{q4}, [r1]!</div><div class='del'>-	veor		q5, q15</div><div class='del'>-	vst1.8		{q6}, [r1]!</div><div class='del'>-	vmov.i32	q8, #1			@ compose 1&lt;&lt;96</div><div class='del'>-	vst1.8		{q3}, [r1]!</div><div class='del'>-	veor		q9, q9, q9</div><div class='del'>-	vst1.8		{q7}, [r1]!</div><div class='del'>-	vext.8		q8, q9, q8, #4</div><div class='del'>-	vst1.8		{q2}, [r1]!</div><div class='del'>-	vadd.u32	q9,q8,q8		@ compose 2&lt;&lt;96</div><div class='del'>-	vst1.8		{q5}, [r1]!</div><div class='del'>-	vldmia		r9, {q0}			@ load counter</div><div class='del'>-</div><div class='del'>-	bne		.Lctr_enc_loop</div><div class='del'>-	b		.Lctr_enc_done</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lctr_enc_loop_done:</div><div class='del'>-	add		r2, r2, #8</div><div class='del'>-	vld1.8		{q8}, [r0]!	@ load input</div><div class='del'>-	veor		q0, q8</div><div class='del'>-	vst1.8		{q0}, [r1]!	@ write output</div><div class='del'>-	cmp		r2, #2</div><div class='del'>-	blo		.Lctr_enc_done</div><div class='del'>-	vld1.8		{q9}, [r0]!</div><div class='del'>-	veor		q1, q9</div><div class='del'>-	vst1.8		{q1}, [r1]!</div><div class='del'>-	beq		.Lctr_enc_done</div><div class='del'>-	vld1.8		{q10}, [r0]!</div><div class='del'>-	veor		q4, q10</div><div class='del'>-	vst1.8		{q4}, [r1]!</div><div class='del'>-	cmp		r2, #4</div><div class='del'>-	blo		.Lctr_enc_done</div><div class='del'>-	vld1.8		{q11}, [r0]!</div><div class='del'>-	veor		q6, q11</div><div class='del'>-	vst1.8		{q6}, [r1]!</div><div class='del'>-	beq		.Lctr_enc_done</div><div class='del'>-	vld1.8		{q12}, [r0]!</div><div class='del'>-	veor		q3, q12</div><div class='del'>-	vst1.8		{q3}, [r1]!</div><div class='del'>-	cmp		r2, #6</div><div class='del'>-	blo		.Lctr_enc_done</div><div class='del'>-	vld1.8		{q13}, [r0]!</div><div class='del'>-	veor		q7, q13</div><div class='del'>-	vst1.8		{q7}, [r1]!</div><div class='del'>-	beq		.Lctr_enc_done</div><div class='del'>-	vld1.8		{q14}, [r0]</div><div class='del'>-	veor		q2, q14</div><div class='del'>-	vst1.8		{q2}, [r1]!</div><div class='del'>-</div><div class='del'>-.Lctr_enc_done:</div><div class='del'>-	vmov.i32	q0, #0</div><div class='del'>-	vmov.i32	q1, #0</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-.Lctr_enc_bzero:			@ wipe key schedule [if any]</div><div class='del'>-	vstmia		sp!, {q0-q1}</div><div class='del'>-	cmp		sp, r9</div><div class='del'>-	bne		.Lctr_enc_bzero</div><div class='del'>-#else</div><div class='del'>-	vstmia		sp, {q0-q1}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	mov	sp, r9</div><div class='del'>-	add	sp, #0x10		@ add sp,r9,#0x10 is no good for thumb</div><div class='del'>-	VFP_ABI_POP</div><div class='del'>-	ldmia	sp!, {r4-r10, pc}	@ return</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lctr_enc_short:</div><div class='del'>-	ldr	ip, [sp]		@ ctr pointer is passed on stack</div><div class='del'>-	stmdb	sp!, {r4-r8, lr}</div><div class='del'>-</div><div class='del'>-	mov	r4, r0		@ copy arguments</div><div class='del'>-	mov	r5, r1</div><div class='del'>-	mov	r6, r2</div><div class='del'>-	mov	r7, r3</div><div class='del'>-	ldr	r8, [ip, #12]		@ load counter LSW</div><div class='del'>-	vld1.8	{q1}, [ip]		@ load whole counter value</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	rev	r8, r8</div><div class='del'>-#endif</div><div class='del'>-	sub	sp, sp, #0x10</div><div class='del'>-	vst1.8	{q1}, [sp,:64]	@ copy counter value</div><div class='del'>-	sub	sp, sp, #0x10</div><div class='del'>-</div><div class='del'>-.Lctr_enc_short_loop:</div><div class='del'>-	add	r0, sp, #0x10		@ input counter value</div><div class='del'>-	mov	r1, sp			@ output on the stack</div><div class='del'>-	mov	r2, r7			@ key</div><div class='del'>-</div><div class='del'>-	bl	AES_encrypt</div><div class='del'>-</div><div class='del'>-	vld1.8	{q0}, [r4]!	@ load input</div><div class='del'>-	vld1.8	{q1}, [sp,:64]	@ load encrypted counter</div><div class='del'>-	add	r8, r8, #1</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	rev	r0, r8</div><div class='del'>-	str	r0, [sp, #0x1c]		@ next counter value</div><div class='del'>-#else</div><div class='del'>-	str	r8, [sp, #0x1c]		@ next counter value</div><div class='del'>-#endif</div><div class='del'>-	veor	q0,q0,q1</div><div class='del'>-	vst1.8	{q0}, [r5]!	@ store output</div><div class='del'>-	subs	r6, r6, #1</div><div class='del'>-	bne	.Lctr_enc_short_loop</div><div class='del'>-</div><div class='del'>-	vmov.i32	q0, #0</div><div class='del'>-	vmov.i32	q1, #0</div><div class='del'>-	vstmia		sp!, {q0-q1}</div><div class='del'>-</div><div class='del'>-	ldmia	sp!, {r4-r8, pc}</div><div class='del'>-.size	bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks</div><div class='del'>-.globl	bsaes_xts_encrypt</div><div class='del'>-.type	bsaes_xts_encrypt,%function</div><div class='del'>-.align	4</div><div class='del'>-bsaes_xts_encrypt:</div><div class='del'>-	mov	ip, sp</div><div class='del'>-	stmdb	sp!, {r4-r10, lr}		@ 0x20</div><div class='del'>-	VFP_ABI_PUSH</div><div class='del'>-	mov	r6, sp				@ future r3</div><div class='del'>-</div><div class='del'>-	mov	r7, r0</div><div class='del'>-	mov	r8, r1</div><div class='del'>-	mov	r9, r2</div><div class='del'>-	mov	r10, r3</div><div class='del'>-</div><div class='del'>-	sub	r0, sp, #0x10			@ 0x10</div><div class='del'>-	bic	r0, #0xf			@ align at 16 bytes</div><div class='del'>-	mov	sp, r0</div><div class='del'>-</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	ldr	r0, [ip]			@ pointer to input tweak</div><div class='del'>-#else</div><div class='del'>-	@ generate initial tweak</div><div class='del'>-	ldr	r0, [ip, #4]			@ iv[]</div><div class='del'>-	mov	r1, sp</div><div class='del'>-	ldr	r2, [ip, #0]			@ key2</div><div class='del'>-	bl	AES_encrypt</div><div class='del'>-	mov	r0,sp				@ pointer to initial tweak</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ldr	r1, [r10, #240]		@ get # of rounds</div><div class='del'>-	mov	r3, r6</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	@ allocate the key schedule on the stack</div><div class='del'>-	sub	r12, sp, r1, lsl#7		@ 128 bytes per inner round key</div><div class='del'>-	@ add	r12, #96			@ size of bit-sliced key schedule</div><div class='del'>-	sub	r12, #48			@ place for tweak[9]</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	mov	r4, r10			@ pass key</div><div class='del'>-	mov	r5, r1			@ pass # of rounds</div><div class='del'>-	mov	sp, r12</div><div class='del'>-	add	r12, #0x90			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	veor	q7, q7, q15	@ fix up last round key</div><div class='del'>-	vstmia	r12, {q7}			@ save last round key</div><div class='del'>-#else</div><div class='del'>-	ldr	r12, [r10, #244]</div><div class='del'>-	eors	r12, #1</div><div class='del'>-	beq	0f</div><div class='del'>-</div><div class='del'>-	str	r12, [r10, #244]</div><div class='del'>-	mov	r4, r10			@ pass key</div><div class='del'>-	mov	r5, r1			@ pass # of rounds</div><div class='del'>-	add	r12, r10, #248			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	veor	q7, q7, q15	@ fix up last round key</div><div class='del'>-	vstmia	r12, {q7}</div><div class='del'>-</div><div class='del'>-.align	2</div><div class='del'>-0:	sub	sp, #0x90			@ place for tweak[9]</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	vld1.8	{q8}, [r0]			@ initial tweak</div><div class='del'>-	adr	r2, .Lxts_magic</div><div class='del'>-</div><div class='del'>-	subs	r9, #0x80</div><div class='del'>-	blo	.Lxts_enc_short</div><div class='del'>-	b	.Lxts_enc_loop</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_loop:</div><div class='del'>-	vldmia		r2, {q5}	@ load XTS magic</div><div class='del'>-	vshr.s64	q6, q8, #63</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vadd.u64	q9, q8, q8</div><div class='del'>-	vst1.64		{q8}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q9, #63</div><div class='del'>-	veor		q9, q9, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vadd.u64	q10, q9, q9</div><div class='del'>-	vst1.64		{q9}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q10, #63</div><div class='del'>-	veor		q10, q10, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q0}, [r7]!</div><div class='del'>-	vadd.u64	q11, q10, q10</div><div class='del'>-	vst1.64		{q10}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q11, #63</div><div class='del'>-	veor		q11, q11, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q1}, [r7]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vadd.u64	q12, q11, q11</div><div class='del'>-	vst1.64		{q11}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q12, #63</div><div class='del'>-	veor		q12, q12, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q2}, [r7]!</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	vadd.u64	q13, q12, q12</div><div class='del'>-	vst1.64		{q12}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q13, #63</div><div class='del'>-	veor		q13, q13, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q3}, [r7]!</div><div class='del'>-	veor		q2, q2, q10</div><div class='del'>-	vadd.u64	q14, q13, q13</div><div class='del'>-	vst1.64		{q13}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q14, #63</div><div class='del'>-	veor		q14, q14, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q4}, [r7]!</div><div class='del'>-	veor		q3, q3, q11</div><div class='del'>-	vadd.u64	q15, q14, q14</div><div class='del'>-	vst1.64		{q14}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q15, #63</div><div class='del'>-	veor		q15, q15, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q5}, [r7]!</div><div class='del'>-	veor		q4, q4, q12</div><div class='del'>-	vadd.u64	q8, q15, q15</div><div class='del'>-	vst1.64		{q15}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	veor		q8, q8, q7</div><div class='del'>-	vst1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	vld1.8		{q6-q7}, [r7]!</div><div class='del'>-	veor		q5, q5, q13</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q6, q6, q14</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	veor		q7, q7, q15</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10-q11}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vld1.64		{q12-q13}, [r0,:128]!</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q4, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	veor		q9, q6, q11</div><div class='del'>-	vld1.64		{q14-q15}, [r0,:128]!</div><div class='del'>-	veor		q10, q3, q12</div><div class='del'>-	vst1.8		{q8-q9}, [r8]!</div><div class='del'>-	veor		q11, q7, q13</div><div class='del'>-	veor		q12, q2, q14</div><div class='del'>-	vst1.8		{q10-q11}, [r8]!</div><div class='del'>-	veor		q13, q5, q15</div><div class='del'>-	vst1.8		{q12-q13}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	subs		r9, #0x80</div><div class='del'>-	bpl		.Lxts_enc_loop</div><div class='del'>-</div><div class='del'>-.Lxts_enc_short:</div><div class='del'>-	adds		r9, #0x70</div><div class='del'>-	bmi		.Lxts_enc_done</div><div class='del'>-</div><div class='del'>-	vldmia		r2, {q5}	@ load XTS magic</div><div class='del'>-	vshr.s64	q7, q8, #63</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vadd.u64	q9, q8, q8</div><div class='del'>-	vst1.64		{q8}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q9, #63</div><div class='del'>-	veor		q9, q9, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vadd.u64	q10, q9, q9</div><div class='del'>-	vst1.64		{q9}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q10, #63</div><div class='del'>-	veor		q10, q10, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q0}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_enc_1</div><div class='del'>-	vadd.u64	q11, q10, q10</div><div class='del'>-	vst1.64		{q10}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q11, #63</div><div class='del'>-	veor		q11, q11, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q1}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_enc_2</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vadd.u64	q12, q11, q11</div><div class='del'>-	vst1.64		{q11}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q12, #63</div><div class='del'>-	veor		q12, q12, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q2}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_enc_3</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	vadd.u64	q13, q12, q12</div><div class='del'>-	vst1.64		{q12}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q13, #63</div><div class='del'>-	veor		q13, q13, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q3}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_enc_4</div><div class='del'>-	veor		q2, q2, q10</div><div class='del'>-	vadd.u64	q14, q13, q13</div><div class='del'>-	vst1.64		{q13}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q14, #63</div><div class='del'>-	veor		q14, q14, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q4}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_enc_5</div><div class='del'>-	veor		q3, q3, q11</div><div class='del'>-	vadd.u64	q15, q14, q14</div><div class='del'>-	vst1.64		{q14}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q15, #63</div><div class='del'>-	veor		q15, q15, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q5}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_enc_6</div><div class='del'>-	veor		q4, q4, q12</div><div class='del'>-	sub		r9, #0x10</div><div class='del'>-	vst1.64		{q15}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	vld1.8		{q6}, [r7]!</div><div class='del'>-	veor		q5, q5, q13</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q6, q6, q14</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10-q11}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vld1.64		{q12-q13}, [r0,:128]!</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q4, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	veor		q9, q6, q11</div><div class='del'>-	vld1.64		{q14}, [r0,:128]!</div><div class='del'>-	veor		q10, q3, q12</div><div class='del'>-	vst1.8		{q8-q9}, [r8]!</div><div class='del'>-	veor		q11, q7, q13</div><div class='del'>-	veor		q12, q2, q14</div><div class='del'>-	vst1.8		{q10-q11}, [r8]!</div><div class='del'>-	vst1.8		{q12}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_6:</div><div class='del'>-	vst1.64		{q14}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		q4, q4, q12</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q5, q5, q13</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10-q11}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vld1.64		{q12-q13}, [r0,:128]!</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q4, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	veor		q9, q6, q11</div><div class='del'>-	veor		q10, q3, q12</div><div class='del'>-	vst1.8		{q8-q9}, [r8]!</div><div class='del'>-	veor		q11, q7, q13</div><div class='del'>-	vst1.8		{q10-q11}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-</div><div class='del'>-@ put this in range for both ARM and Thumb mode adr instructions</div><div class='del'>-.align	5</div><div class='del'>-.Lxts_magic:</div><div class='del'>-	.quad	1, 0x87</div><div class='del'>-</div><div class='del'>-.align	5</div><div class='del'>-.Lxts_enc_5:</div><div class='del'>-	vst1.64		{q13}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		q3, q3, q11</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q4, q4, q12</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10-q11}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vld1.64		{q12}, [r0,:128]!</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q4, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	veor		q9, q6, q11</div><div class='del'>-	veor		q10, q3, q12</div><div class='del'>-	vst1.8		{q8-q9}, [r8]!</div><div class='del'>-	vst1.8		{q10}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_4:</div><div class='del'>-	vst1.64		{q12}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		q2, q2, q10</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q3, q3, q11</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10-q11}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q4, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	veor		q9, q6, q11</div><div class='del'>-	vst1.8		{q8-q9}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_3:</div><div class='del'>-	vst1.64		{q11}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q2, q2, q10</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q4, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	vst1.8		{q8}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_2:</div><div class='del'>-	vst1.64		{q10}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_1:</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	veor		q0, q8</div><div class='del'>-	mov		r1, sp</div><div class='del'>-	vst1.8		{q0}, [sp,:128]</div><div class='del'>-	mov		r2, r10</div><div class='del'>-	mov		r4, r3				@ preserve fp</div><div class='del'>-</div><div class='del'>-	bl		AES_encrypt</div><div class='del'>-</div><div class='del'>-	vld1.8		{q0}, [sp,:128]</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vst1.8		{q0}, [r8]!</div><div class='del'>-	mov		r3, r4</div><div class='del'>-</div><div class='del'>-	vmov		q8, q9		@ next round tweak</div><div class='del'>-</div><div class='del'>-.Lxts_enc_done:</div><div class='del'>-#ifndef	XTS_CHAIN_TWEAK</div><div class='del'>-	adds		r9, #0x10</div><div class='del'>-	beq		.Lxts_enc_ret</div><div class='del'>-	sub		r6, r8, #0x10</div><div class='del'>-</div><div class='del'>-.Lxts_enc_steal:</div><div class='del'>-	ldrb		r0, [r7], #1</div><div class='del'>-	ldrb		r1, [r8, #-0x10]</div><div class='del'>-	strb		r0, [r8, #-0x10]</div><div class='del'>-	strb		r1, [r8], #1</div><div class='del'>-</div><div class='del'>-	subs		r9, #1</div><div class='del'>-	bhi		.Lxts_enc_steal</div><div class='del'>-</div><div class='del'>-	vld1.8		{q0}, [r6]</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	mov		r1, sp</div><div class='del'>-	vst1.8		{q0}, [sp,:128]</div><div class='del'>-	mov		r2, r10</div><div class='del'>-	mov		r4, r3			@ preserve fp</div><div class='del'>-</div><div class='del'>-	bl		AES_encrypt</div><div class='del'>-</div><div class='del'>-	vld1.8		{q0}, [sp,:128]</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vst1.8		{q0}, [r6]</div><div class='del'>-	mov		r3, r4</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-.Lxts_enc_ret:</div><div class='del'>-	bic		r0, r3, #0xf</div><div class='del'>-	vmov.i32	q0, #0</div><div class='del'>-	vmov.i32	q1, #0</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	ldr		r1, [r3, #0x20+VFP_ABI_FRAME]	@ chain tweak</div><div class='del'>-#endif</div><div class='del'>-.Lxts_enc_bzero:				@ wipe key schedule [if any]</div><div class='del'>-	vstmia		sp!, {q0-q1}</div><div class='del'>-	cmp		sp, r0</div><div class='del'>-	bne		.Lxts_enc_bzero</div><div class='del'>-</div><div class='del'>-	mov		sp, r3</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	vst1.8		{q8}, [r1]</div><div class='del'>-#endif</div><div class='del'>-	VFP_ABI_POP</div><div class='del'>-	ldmia		sp!, {r4-r10, pc}	@ return</div><div class='del'>-</div><div class='del'>-.size	bsaes_xts_encrypt,.-bsaes_xts_encrypt</div><div class='del'>-</div><div class='del'>-.globl	bsaes_xts_decrypt</div><div class='del'>-.type	bsaes_xts_decrypt,%function</div><div class='del'>-.align	4</div><div class='del'>-bsaes_xts_decrypt:</div><div class='del'>-	mov	ip, sp</div><div class='del'>-	stmdb	sp!, {r4-r10, lr}		@ 0x20</div><div class='del'>-	VFP_ABI_PUSH</div><div class='del'>-	mov	r6, sp				@ future r3</div><div class='del'>-</div><div class='del'>-	mov	r7, r0</div><div class='del'>-	mov	r8, r1</div><div class='del'>-	mov	r9, r2</div><div class='del'>-	mov	r10, r3</div><div class='del'>-</div><div class='del'>-	sub	r0, sp, #0x10			@ 0x10</div><div class='del'>-	bic	r0, #0xf			@ align at 16 bytes</div><div class='del'>-	mov	sp, r0</div><div class='del'>-</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	ldr	r0, [ip]			@ pointer to input tweak</div><div class='del'>-#else</div><div class='del'>-	@ generate initial tweak</div><div class='del'>-	ldr	r0, [ip, #4]			@ iv[]</div><div class='del'>-	mov	r1, sp</div><div class='del'>-	ldr	r2, [ip, #0]			@ key2</div><div class='del'>-	bl	AES_encrypt</div><div class='del'>-	mov	r0, sp				@ pointer to initial tweak</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ldr	r1, [r10, #240]		@ get # of rounds</div><div class='del'>-	mov	r3, r6</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	@ allocate the key schedule on the stack</div><div class='del'>-	sub	r12, sp, r1, lsl#7		@ 128 bytes per inner round key</div><div class='del'>-	@ add	r12, #96			@ size of bit-sliced key schedule</div><div class='del'>-	sub	r12, #48			@ place for tweak[9]</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	mov	r4, r10			@ pass key</div><div class='del'>-	mov	r5, r1			@ pass # of rounds</div><div class='del'>-	mov	sp, r12</div><div class='del'>-	add	r12, #0x90			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	add	r4, sp, #0x90</div><div class='del'>-	vldmia	r4, {q6}</div><div class='del'>-	vstmia	r12,  {q15}		@ save last round key</div><div class='del'>-	veor	q7, q7, q6	@ fix up round 0 key</div><div class='del'>-	vstmia	r4, {q7}</div><div class='del'>-#else</div><div class='del'>-	ldr	r12, [r10, #244]</div><div class='del'>-	eors	r12, #1</div><div class='del'>-	beq	0f</div><div class='del'>-</div><div class='del'>-	str	r12, [r10, #244]</div><div class='del'>-	mov	r4, r10			@ pass key</div><div class='del'>-	mov	r5, r1			@ pass # of rounds</div><div class='del'>-	add	r12, r10, #248			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	add	r4, r10, #248</div><div class='del'>-	vldmia	r4, {q6}</div><div class='del'>-	vstmia	r12,  {q15}		@ save last round key</div><div class='del'>-	veor	q7, q7, q6	@ fix up round 0 key</div><div class='del'>-	vstmia	r4, {q7}</div><div class='del'>-</div><div class='del'>-.align	2</div><div class='del'>-0:	sub	sp, #0x90			@ place for tweak[9]</div><div class='del'>-#endif</div><div class='del'>-	vld1.8	{q8}, [r0]			@ initial tweak</div><div class='del'>-	adr	r2, .Lxts_magic</div><div class='del'>-</div><div class='del'>-#ifndef	XTS_CHAIN_TWEAK</div><div class='del'>-	tst	r9, #0xf			@ if not multiple of 16</div><div class='del'>-	it	ne				@ Thumb2 thing, sanity check in ARM</div><div class='del'>-	subne	r9, #0x10			@ subtract another 16 bytes</div><div class='del'>-#endif</div><div class='del'>-	subs	r9, #0x80</div><div class='del'>-</div><div class='del'>-	blo	.Lxts_dec_short</div><div class='del'>-	b	.Lxts_dec_loop</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_loop:</div><div class='del'>-	vldmia		r2, {q5}	@ load XTS magic</div><div class='del'>-	vshr.s64	q6, q8, #63</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vadd.u64	q9, q8, q8</div><div class='del'>-	vst1.64		{q8}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q9, #63</div><div class='del'>-	veor		q9, q9, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vadd.u64	q10, q9, q9</div><div class='del'>-	vst1.64		{q9}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q10, #63</div><div class='del'>-	veor		q10, q10, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q0}, [r7]!</div><div class='del'>-	vadd.u64	q11, q10, q10</div><div class='del'>-	vst1.64		{q10}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q11, #63</div><div class='del'>-	veor		q11, q11, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q1}, [r7]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vadd.u64	q12, q11, q11</div><div class='del'>-	vst1.64		{q11}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q12, #63</div><div class='del'>-	veor		q12, q12, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q2}, [r7]!</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	vadd.u64	q13, q12, q12</div><div class='del'>-	vst1.64		{q12}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q13, #63</div><div class='del'>-	veor		q13, q13, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q3}, [r7]!</div><div class='del'>-	veor		q2, q2, q10</div><div class='del'>-	vadd.u64	q14, q13, q13</div><div class='del'>-	vst1.64		{q13}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q14, #63</div><div class='del'>-	veor		q14, q14, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q4}, [r7]!</div><div class='del'>-	veor		q3, q3, q11</div><div class='del'>-	vadd.u64	q15, q14, q14</div><div class='del'>-	vst1.64		{q14}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q15, #63</div><div class='del'>-	veor		q15, q15, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q5}, [r7]!</div><div class='del'>-	veor		q4, q4, q12</div><div class='del'>-	vadd.u64	q8, q15, q15</div><div class='del'>-	vst1.64		{q15}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	veor		q8, q8, q7</div><div class='del'>-	vst1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	vld1.8		{q6-q7}, [r7]!</div><div class='del'>-	veor		q5, q5, q13</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q6, q6, q14</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	veor		q7, q7, q15</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10-q11}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vld1.64		{q12-q13}, [r0,:128]!</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q6, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	veor		q9, q4, q11</div><div class='del'>-	vld1.64		{q14-q15}, [r0,:128]!</div><div class='del'>-	veor		q10, q2, q12</div><div class='del'>-	vst1.8		{q8-q9}, [r8]!</div><div class='del'>-	veor		q11, q7, q13</div><div class='del'>-	veor		q12, q3, q14</div><div class='del'>-	vst1.8		{q10-q11}, [r8]!</div><div class='del'>-	veor		q13, q5, q15</div><div class='del'>-	vst1.8		{q12-q13}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	subs		r9, #0x80</div><div class='del'>-	bpl		.Lxts_dec_loop</div><div class='del'>-</div><div class='del'>-.Lxts_dec_short:</div><div class='del'>-	adds		r9, #0x70</div><div class='del'>-	bmi		.Lxts_dec_done</div><div class='del'>-</div><div class='del'>-	vldmia		r2, {q5}	@ load XTS magic</div><div class='del'>-	vshr.s64	q7, q8, #63</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vadd.u64	q9, q8, q8</div><div class='del'>-	vst1.64		{q8}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q9, #63</div><div class='del'>-	veor		q9, q9, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vadd.u64	q10, q9, q9</div><div class='del'>-	vst1.64		{q9}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q10, #63</div><div class='del'>-	veor		q10, q10, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q0}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_dec_1</div><div class='del'>-	vadd.u64	q11, q10, q10</div><div class='del'>-	vst1.64		{q10}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q11, #63</div><div class='del'>-	veor		q11, q11, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q1}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_dec_2</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vadd.u64	q12, q11, q11</div><div class='del'>-	vst1.64		{q11}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q12, #63</div><div class='del'>-	veor		q12, q12, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q2}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_dec_3</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	vadd.u64	q13, q12, q12</div><div class='del'>-	vst1.64		{q12}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q13, #63</div><div class='del'>-	veor		q13, q13, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q3}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_dec_4</div><div class='del'>-	veor		q2, q2, q10</div><div class='del'>-	vadd.u64	q14, q13, q13</div><div class='del'>-	vst1.64		{q13}, [r0,:128]!</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	vshr.s64	q7, q14, #63</div><div class='del'>-	veor		q14, q14, q6</div><div class='del'>-	vand		q7, q7, q5</div><div class='del'>-	vld1.8		{q4}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_dec_5</div><div class='del'>-	veor		q3, q3, q11</div><div class='del'>-	vadd.u64	q15, q14, q14</div><div class='del'>-	vst1.64		{q14}, [r0,:128]!</div><div class='del'>-	vswp		d15,d14</div><div class='del'>-	vshr.s64	q6, q15, #63</div><div class='del'>-	veor		q15, q15, q7</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vld1.8		{q5}, [r7]!</div><div class='del'>-	subs		r9, #0x10</div><div class='del'>-	bmi		.Lxts_dec_6</div><div class='del'>-	veor		q4, q4, q12</div><div class='del'>-	sub		r9, #0x10</div><div class='del'>-	vst1.64		{q15}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	vld1.8		{q6}, [r7]!</div><div class='del'>-	veor		q5, q5, q13</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q6, q6, q14</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10-q11}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vld1.64		{q12-q13}, [r0,:128]!</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q6, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	veor		q9, q4, q11</div><div class='del'>-	vld1.64		{q14}, [r0,:128]!</div><div class='del'>-	veor		q10, q2, q12</div><div class='del'>-	vst1.8		{q8-q9}, [r8]!</div><div class='del'>-	veor		q11, q7, q13</div><div class='del'>-	veor		q12, q3, q14</div><div class='del'>-	vst1.8		{q10-q11}, [r8]!</div><div class='del'>-	vst1.8		{q12}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_6:</div><div class='del'>-	vst1.64		{q14}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		q4, q4, q12</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q5, q5, q13</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10-q11}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vld1.64		{q12-q13}, [r0,:128]!</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q6, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	veor		q9, q4, q11</div><div class='del'>-	veor		q10, q2, q12</div><div class='del'>-	vst1.8		{q8-q9}, [r8]!</div><div class='del'>-	veor		q11, q7, q13</div><div class='del'>-	vst1.8		{q10-q11}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_5:</div><div class='del'>-	vst1.64		{q13}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		q3, q3, q11</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q4, q4, q12</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10-q11}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vld1.64		{q12}, [r0,:128]!</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q6, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	veor		q9, q4, q11</div><div class='del'>-	veor		q10, q2, q12</div><div class='del'>-	vst1.8		{q8-q9}, [r8]!</div><div class='del'>-	vst1.8		{q10}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_4:</div><div class='del'>-	vst1.64		{q12}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		q2, q2, q10</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q3, q3, q11</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10-q11}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q6, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	veor		q9, q4, q11</div><div class='del'>-	vst1.8		{q8-q9}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_3:</div><div class='del'>-	vst1.64		{q11}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q2, q2, q10</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	vld1.64		{q10}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	veor		q8, q6, q10</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-	vst1.8		{q8}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_2:</div><div class='del'>-	vst1.64		{q10}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, r10, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	mov		r5, r1			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8-q9}, [r0,:128]!</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	veor		q1, q1, q9</div><div class='del'>-	vst1.8		{q0-q1}, [r8]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{q8}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_1:</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	veor		q0, q8</div><div class='del'>-	mov		r1, sp</div><div class='del'>-	vst1.8		{q0}, [sp,:128]</div><div class='del'>-	mov		r2, r10</div><div class='del'>-	mov		r4, r3				@ preserve fp</div><div class='del'>-	mov		r5, r2			@ preserve magic</div><div class='del'>-</div><div class='del'>-	bl		AES_decrypt</div><div class='del'>-</div><div class='del'>-	vld1.8		{q0}, [sp,:128]</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vst1.8		{q0}, [r8]!</div><div class='del'>-	mov		r3, r4</div><div class='del'>-	mov		r2, r5</div><div class='del'>-</div><div class='del'>-	vmov		q8, q9		@ next round tweak</div><div class='del'>-</div><div class='del'>-.Lxts_dec_done:</div><div class='del'>-#ifndef	XTS_CHAIN_TWEAK</div><div class='del'>-	adds		r9, #0x10</div><div class='del'>-	beq		.Lxts_dec_ret</div><div class='del'>-</div><div class='del'>-	@ calculate one round of extra tweak for the stolen ciphertext</div><div class='del'>-	vldmia		r2, {q5}</div><div class='del'>-	vshr.s64	q6, q8, #63</div><div class='del'>-	vand		q6, q6, q5</div><div class='del'>-	vadd.u64	q9, q8, q8</div><div class='del'>-	vswp		d13,d12</div><div class='del'>-	veor		q9, q9, q6</div><div class='del'>-</div><div class='del'>-	@ perform the final decryption with the last tweak value</div><div class='del'>-	vld1.8		{q0}, [r7]!</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	veor		q0, q0, q9</div><div class='del'>-	mov		r1, sp</div><div class='del'>-	vst1.8		{q0}, [sp,:128]</div><div class='del'>-	mov		r2, r10</div><div class='del'>-	mov		r4, r3			@ preserve fp</div><div class='del'>-</div><div class='del'>-	bl		AES_decrypt</div><div class='del'>-</div><div class='del'>-	vld1.8		{q0}, [sp,:128]</div><div class='del'>-	veor		q0, q0, q9</div><div class='del'>-	vst1.8		{q0}, [r8]</div><div class='del'>-</div><div class='del'>-	mov		r6, r8</div><div class='del'>-.Lxts_dec_steal:</div><div class='del'>-	ldrb		r1, [r8]</div><div class='del'>-	ldrb		r0, [r7], #1</div><div class='del'>-	strb		r1, [r8, #0x10]</div><div class='del'>-	strb		r0, [r8], #1</div><div class='del'>-</div><div class='del'>-	subs		r9, #1</div><div class='del'>-	bhi		.Lxts_dec_steal</div><div class='del'>-</div><div class='del'>-	vld1.8		{q0}, [r6]</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	veor		q0, q8</div><div class='del'>-	mov		r1, sp</div><div class='del'>-	vst1.8		{q0}, [sp,:128]</div><div class='del'>-	mov		r2, r10</div><div class='del'>-</div><div class='del'>-	bl		AES_decrypt</div><div class='del'>-</div><div class='del'>-	vld1.8		{q0}, [sp,:128]</div><div class='del'>-	veor		q0, q0, q8</div><div class='del'>-	vst1.8		{q0}, [r6]</div><div class='del'>-	mov		r3, r4</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-.Lxts_dec_ret:</div><div class='del'>-	bic		r0, r3, #0xf</div><div class='del'>-	vmov.i32	q0, #0</div><div class='del'>-	vmov.i32	q1, #0</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	ldr		r1, [r3, #0x20+VFP_ABI_FRAME]	@ chain tweak</div><div class='del'>-#endif</div><div class='del'>-.Lxts_dec_bzero:				@ wipe key schedule [if any]</div><div class='del'>-	vstmia		sp!, {q0-q1}</div><div class='del'>-	cmp		sp, r0</div><div class='del'>-	bne		.Lxts_dec_bzero</div><div class='del'>-</div><div class='del'>-	mov		sp, r3</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	vst1.8		{q8}, [r1]</div><div class='del'>-#endif</div><div class='del'>-	VFP_ABI_POP</div><div class='del'>-	ldmia		sp!, {r4-r10, pc}	@ return</div><div class='del'>-</div><div class='del'>-.size	bsaes_xts_decrypt,.-bsaes_xts_decrypt</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/crypto/aesbs-glue.c b/arch/arm/crypto/aesbs-glue.c<br/>deleted file mode 100644<br/>index 0511a6cafe24..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/crypto/aesbs-glue.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/crypto/aesbs-glue.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,443 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/arm/crypto/aesbs-glue.c - glue code for NEON bit sliced AES</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2013 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/neon.h&gt;</div><div class='del'>-#include &lt;crypto/aes.h&gt;</div><div class='del'>-#include &lt;crypto/ablk_helper.h&gt;</div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;crypto/xts.h&gt;</div><div class='del'>-</div><div class='del'>-#include "aes_glue.h"</div><div class='del'>-</div><div class='del'>-#define BIT_SLICED_KEY_MAXSIZE	(128 * (AES_MAXNR - 1) + 2 * AES_BLOCK_SIZE)</div><div class='del'>-</div><div class='del'>-struct BS_KEY {</div><div class='del'>-	struct AES_KEY	rk;</div><div class='del'>-	int		converted;</div><div class='del'>-	u8 __aligned(8)	bs[BIT_SLICED_KEY_MAXSIZE];</div><div class='del'>-} __aligned(8);</div><div class='del'>-</div><div class='del'>-asmlinkage void bsaes_enc_key_convert(u8 out[], struct AES_KEY const *in);</div><div class='del'>-asmlinkage void bsaes_dec_key_convert(u8 out[], struct AES_KEY const *in);</div><div class='del'>-</div><div class='del'>-asmlinkage void bsaes_cbc_encrypt(u8 const in[], u8 out[], u32 bytes,</div><div class='del'>-				  struct BS_KEY *key, u8 iv[]);</div><div class='del'>-</div><div class='del'>-asmlinkage void bsaes_ctr32_encrypt_blocks(u8 const in[], u8 out[], u32 blocks,</div><div class='del'>-					   struct BS_KEY *key, u8 const iv[]);</div><div class='del'>-</div><div class='del'>-asmlinkage void bsaes_xts_encrypt(u8 const in[], u8 out[], u32 bytes,</div><div class='del'>-				  struct BS_KEY *key, u8 tweak[]);</div><div class='del'>-</div><div class='del'>-asmlinkage void bsaes_xts_decrypt(u8 const in[], u8 out[], u32 bytes,</div><div class='del'>-				  struct BS_KEY *key, u8 tweak[]);</div><div class='del'>-</div><div class='del'>-struct aesbs_cbc_ctx {</div><div class='del'>-	struct AES_KEY	enc;</div><div class='del'>-	struct BS_KEY	dec;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct aesbs_ctr_ctx {</div><div class='del'>-	struct BS_KEY	enc;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct aesbs_xts_ctx {</div><div class='del'>-	struct BS_KEY	enc;</div><div class='del'>-	struct BS_KEY	dec;</div><div class='del'>-	struct AES_KEY	twkey;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int aesbs_cbc_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='del'>-			     unsigned int key_len)</div><div class='del'>-{</div><div class='del'>-	struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	int bits = key_len * 8;</div><div class='del'>-</div><div class='del'>-	if (private_AES_set_encrypt_key(in_key, bits, &amp;ctx-&gt;enc)) {</div><div class='del'>-		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;dec.rk = ctx-&gt;enc;</div><div class='del'>-	private_AES_set_decrypt_key(in_key, bits, &amp;ctx-&gt;dec.rk);</div><div class='del'>-	ctx-&gt;dec.converted = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aesbs_ctr_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='del'>-			     unsigned int key_len)</div><div class='del'>-{</div><div class='del'>-	struct aesbs_ctr_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	int bits = key_len * 8;</div><div class='del'>-</div><div class='del'>-	if (private_AES_set_encrypt_key(in_key, bits, &amp;ctx-&gt;enc.rk)) {</div><div class='del'>-		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;enc.converted = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aesbs_xts_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='del'>-			     unsigned int key_len)</div><div class='del'>-{</div><div class='del'>-	struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	int bits = key_len * 4;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xts_check_key(tfm, in_key, key_len);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (private_AES_set_encrypt_key(in_key, bits, &amp;ctx-&gt;enc.rk)) {</div><div class='del'>-		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;dec.rk = ctx-&gt;enc.rk;</div><div class='del'>-	private_AES_set_decrypt_key(in_key, bits, &amp;ctx-&gt;dec.rk);</div><div class='del'>-	private_AES_set_encrypt_key(in_key + key_len / 2, bits, &amp;ctx-&gt;twkey);</div><div class='del'>-	ctx-&gt;enc.converted = ctx-&gt;dec.converted = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aesbs_cbc_encrypt(struct blkcipher_desc *desc,</div><div class='del'>-			     struct scatterlist *dst,</div><div class='del'>-			     struct scatterlist *src, unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	struct aesbs_cbc_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='del'>-</div><div class='del'>-	while (walk.nbytes) {</div><div class='del'>-		u32 blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='del'>-		u8 *src = walk.src.virt.addr;</div><div class='del'>-</div><div class='del'>-		if (walk.dst.virt.addr == walk.src.virt.addr) {</div><div class='del'>-			u8 *iv = walk.iv;</div><div class='del'>-</div><div class='del'>-			do {</div><div class='del'>-				crypto_xor(src, iv, AES_BLOCK_SIZE);</div><div class='del'>-				AES_encrypt(src, src, &amp;ctx-&gt;enc);</div><div class='del'>-				iv = src;</div><div class='del'>-				src += AES_BLOCK_SIZE;</div><div class='del'>-			} while (--blocks);</div><div class='del'>-			memcpy(walk.iv, iv, AES_BLOCK_SIZE);</div><div class='del'>-		} else {</div><div class='del'>-			u8 *dst = walk.dst.virt.addr;</div><div class='del'>-</div><div class='del'>-			do {</div><div class='del'>-				crypto_xor(walk.iv, src, AES_BLOCK_SIZE);</div><div class='del'>-				AES_encrypt(walk.iv, dst, &amp;ctx-&gt;enc);</div><div class='del'>-				memcpy(walk.iv, dst, AES_BLOCK_SIZE);</div><div class='del'>-				src += AES_BLOCK_SIZE;</div><div class='del'>-				dst += AES_BLOCK_SIZE;</div><div class='del'>-			} while (--blocks);</div><div class='del'>-		}</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aesbs_cbc_decrypt(struct blkcipher_desc *desc,</div><div class='del'>-			     struct scatterlist *dst,</div><div class='del'>-			     struct scatterlist *src, unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	struct aesbs_cbc_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt_block(desc, &amp;walk, 8 * AES_BLOCK_SIZE);</div><div class='del'>-</div><div class='del'>-	while ((walk.nbytes / AES_BLOCK_SIZE) &gt;= 8) {</div><div class='del'>-		kernel_neon_begin();</div><div class='del'>-		bsaes_cbc_encrypt(walk.src.virt.addr, walk.dst.virt.addr,</div><div class='del'>-				  walk.nbytes, &amp;ctx-&gt;dec, walk.iv);</div><div class='del'>-		kernel_neon_end();</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='del'>-	}</div><div class='del'>-	while (walk.nbytes) {</div><div class='del'>-		u32 blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='del'>-		u8 *dst = walk.dst.virt.addr;</div><div class='del'>-		u8 *src = walk.src.virt.addr;</div><div class='del'>-		u8 bk[2][AES_BLOCK_SIZE];</div><div class='del'>-		u8 *iv = walk.iv;</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			if (walk.dst.virt.addr == walk.src.virt.addr)</div><div class='del'>-				memcpy(bk[blocks &amp; 1], src, AES_BLOCK_SIZE);</div><div class='del'>-</div><div class='del'>-			AES_decrypt(src, dst, &amp;ctx-&gt;dec.rk);</div><div class='del'>-			crypto_xor(dst, iv, AES_BLOCK_SIZE);</div><div class='del'>-</div><div class='del'>-			if (walk.dst.virt.addr == walk.src.virt.addr)</div><div class='del'>-				iv = bk[blocks &amp; 1];</div><div class='del'>-			else</div><div class='del'>-				iv = src;</div><div class='del'>-</div><div class='del'>-			dst += AES_BLOCK_SIZE;</div><div class='del'>-			src += AES_BLOCK_SIZE;</div><div class='del'>-		} while (--blocks);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void inc_be128_ctr(__be32 ctr[], u32 addend)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 3; i &gt;= 0; i--, addend = 1) {</div><div class='del'>-		u32 n = be32_to_cpu(ctr[i]) + addend;</div><div class='del'>-</div><div class='del'>-		ctr[i] = cpu_to_be32(n);</div><div class='del'>-		if (n &gt;= addend)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aesbs_ctr_encrypt(struct blkcipher_desc *desc,</div><div class='del'>-			     struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-			     unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	struct aesbs_ctr_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='del'>-	u32 blocks;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt_block(desc, &amp;walk, 8 * AES_BLOCK_SIZE);</div><div class='del'>-</div><div class='del'>-	while ((blocks = walk.nbytes / AES_BLOCK_SIZE)) {</div><div class='del'>-		u32 tail = walk.nbytes % AES_BLOCK_SIZE;</div><div class='del'>-		__be32 *ctr = (__be32 *)walk.iv;</div><div class='del'>-		u32 headroom = UINT_MAX - be32_to_cpu(ctr[3]);</div><div class='del'>-</div><div class='del'>-		/* avoid 32 bit counter overflow in the NEON code */</div><div class='del'>-		if (unlikely(headroom &lt; blocks)) {</div><div class='del'>-			blocks = headroom + 1;</div><div class='del'>-			tail = walk.nbytes - blocks * AES_BLOCK_SIZE;</div><div class='del'>-		}</div><div class='del'>-		kernel_neon_begin();</div><div class='del'>-		bsaes_ctr32_encrypt_blocks(walk.src.virt.addr,</div><div class='del'>-					   walk.dst.virt.addr, blocks,</div><div class='del'>-					   &amp;ctx-&gt;enc, walk.iv);</div><div class='del'>-		kernel_neon_end();</div><div class='del'>-		inc_be128_ctr(ctr, blocks);</div><div class='del'>-</div><div class='del'>-		nbytes -= blocks * AES_BLOCK_SIZE;</div><div class='del'>-		if (nbytes &amp;&amp; nbytes == tail &amp;&amp; nbytes &lt;= AES_BLOCK_SIZE)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, tail);</div><div class='del'>-	}</div><div class='del'>-	if (walk.nbytes) {</div><div class='del'>-		u8 *tdst = walk.dst.virt.addr + blocks * AES_BLOCK_SIZE;</div><div class='del'>-		u8 *tsrc = walk.src.virt.addr + blocks * AES_BLOCK_SIZE;</div><div class='del'>-		u8 ks[AES_BLOCK_SIZE];</div><div class='del'>-</div><div class='del'>-		AES_encrypt(walk.iv, ks, &amp;ctx-&gt;enc.rk);</div><div class='del'>-		if (tdst != tsrc)</div><div class='del'>-			memcpy(tdst, tsrc, nbytes);</div><div class='del'>-		crypto_xor(tdst, ks, nbytes);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, 0);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aesbs_xts_encrypt(struct blkcipher_desc *desc,</div><div class='del'>-			     struct scatterlist *dst,</div><div class='del'>-			     struct scatterlist *src, unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	struct aesbs_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt_block(desc, &amp;walk, 8 * AES_BLOCK_SIZE);</div><div class='del'>-</div><div class='del'>-	/* generate the initial tweak */</div><div class='del'>-	AES_encrypt(walk.iv, walk.iv, &amp;ctx-&gt;twkey);</div><div class='del'>-</div><div class='del'>-	while (walk.nbytes) {</div><div class='del'>-		kernel_neon_begin();</div><div class='del'>-		bsaes_xts_encrypt(walk.src.virt.addr, walk.dst.virt.addr,</div><div class='del'>-				  walk.nbytes, &amp;ctx-&gt;enc, walk.iv);</div><div class='del'>-		kernel_neon_end();</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aesbs_xts_decrypt(struct blkcipher_desc *desc,</div><div class='del'>-			     struct scatterlist *dst,</div><div class='del'>-			     struct scatterlist *src, unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	struct aesbs_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt_block(desc, &amp;walk, 8 * AES_BLOCK_SIZE);</div><div class='del'>-</div><div class='del'>-	/* generate the initial tweak */</div><div class='del'>-	AES_encrypt(walk.iv, walk.iv, &amp;ctx-&gt;twkey);</div><div class='del'>-</div><div class='del'>-	while (walk.nbytes) {</div><div class='del'>-		kernel_neon_begin();</div><div class='del'>-		bsaes_xts_decrypt(walk.src.virt.addr, walk.dst.virt.addr,</div><div class='del'>-				  walk.nbytes, &amp;ctx-&gt;dec, walk.iv);</div><div class='del'>-		kernel_neon_end();</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct crypto_alg aesbs_algs[] = { {</div><div class='del'>-	.cra_name		= "__cbc-aes-neonbs",</div><div class='del'>-	.cra_driver_name	= "__driver-cbc-aes-neonbs",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct aesbs_cbc_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_blkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= aesbs_cbc_set_key,</div><div class='del'>-		.encrypt	= aesbs_cbc_encrypt,</div><div class='del'>-		.decrypt	= aesbs_cbc_decrypt,</div><div class='del'>-	},</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "__ctr-aes-neonbs",</div><div class='del'>-	.cra_driver_name	= "__driver-ctr-aes-neonbs",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= 1,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct aesbs_ctr_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_blkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= aesbs_ctr_set_key,</div><div class='del'>-		.encrypt	= aesbs_ctr_encrypt,</div><div class='del'>-		.decrypt	= aesbs_ctr_encrypt,</div><div class='del'>-	},</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "__xts-aes-neonbs",</div><div class='del'>-	.cra_driver_name	= "__driver-xts-aes-neonbs",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct aesbs_xts_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_blkcipher = {</div><div class='del'>-		.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= aesbs_xts_set_key,</div><div class='del'>-		.encrypt	= aesbs_xts_encrypt,</div><div class='del'>-		.decrypt	= aesbs_xts_decrypt,</div><div class='del'>-	},</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "cbc(aes)",</div><div class='del'>-	.cra_driver_name	= "cbc-aes-neonbs",</div><div class='del'>-	.cra_priority		= 300,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER|CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_ablkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= ablk_set_key,</div><div class='del'>-		.encrypt	= __ablk_encrypt,</div><div class='del'>-		.decrypt	= ablk_decrypt,</div><div class='del'>-	}</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "ctr(aes)",</div><div class='del'>-	.cra_driver_name	= "ctr-aes-neonbs",</div><div class='del'>-	.cra_priority		= 300,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER|CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= 1,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_ablkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= ablk_set_key,</div><div class='del'>-		.encrypt	= ablk_encrypt,</div><div class='del'>-		.decrypt	= ablk_decrypt,</div><div class='del'>-	}</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "xts(aes)",</div><div class='del'>-	.cra_driver_name	= "xts-aes-neonbs",</div><div class='del'>-	.cra_priority		= 300,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER|CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_ablkcipher = {</div><div class='del'>-		.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= ablk_set_key,</div><div class='del'>-		.encrypt	= ablk_encrypt,</div><div class='del'>-		.decrypt	= ablk_decrypt,</div><div class='del'>-	}</div><div class='del'>-} };</div><div class='del'>-</div><div class='del'>-static int __init aesbs_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	if (!cpu_has_neon())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	return crypto_register_algs(aesbs_algs, ARRAY_SIZE(aesbs_algs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit aesbs_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	crypto_unregister_algs(aesbs_algs, ARRAY_SIZE(aesbs_algs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(aesbs_mod_init);</div><div class='del'>-module_exit(aesbs_mod_exit);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Bit sliced AES in CBC/CTR/XTS modes using NEON");</div><div class='del'>-MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/arch/arm/crypto/bsaes-armv7.pl b/arch/arm/crypto/bsaes-armv7.pl<br/>deleted file mode 100644<br/>index a4d3856e7d24..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/crypto/bsaes-armv7.pl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/crypto/bsaes-armv7.pl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2471 +0,0 @@</div><div class='del'>-#!/usr/bin/env perl</div><div class='del'>-</div><div class='del'>-# ====================================================================</div><div class='del'>-# Written by Andy Polyakov &lt;appro@openssl.org&gt; for the OpenSSL</div><div class='del'>-# project. The module is, however, dual licensed under OpenSSL and</div><div class='del'>-# CRYPTOGAMS licenses depending on where you obtain it. For further</div><div class='del'>-# details see http://www.openssl.org/~appro/cryptogams/.</div><div class='del'>-#</div><div class='del'>-# Specific modes and adaptation for Linux kernel by Ard Biesheuvel</div><div class='del'>-# &lt;ard.biesheuvel@linaro.org&gt;. Permission to use under GPL terms is</div><div class='del'>-# granted.</div><div class='del'>-# ====================================================================</div><div class='del'>-</div><div class='del'>-# Bit-sliced AES for ARM NEON</div><div class='del'>-#</div><div class='del'>-# February 2012.</div><div class='del'>-#</div><div class='del'>-# This implementation is direct adaptation of bsaes-x86_64 module for</div><div class='del'>-# ARM NEON. Except that this module is endian-neutral [in sense that</div><div class='del'>-# it can be compiled for either endianness] by courtesy of vld1.8's</div><div class='del'>-# neutrality. Initial version doesn't implement interface to OpenSSL,</div><div class='del'>-# only low-level primitives and unsupported entry points, just enough</div><div class='del'>-# to collect performance results, which for Cortex-A8 core are:</div><div class='del'>-#</div><div class='del'>-# encrypt	19.5 cycles per byte processed with 128-bit key</div><div class='del'>-# decrypt	22.1 cycles per byte processed with 128-bit key</div><div class='del'>-# key conv.	440  cycles per 128-bit key/0.18 of 8x block</div><div class='del'>-#</div><div class='del'>-# Snapdragon S4 encrypts byte in 17.6 cycles and decrypts in 19.7,</div><div class='del'>-# which is [much] worse than anticipated (for further details see</div><div class='del'>-# http://www.openssl.org/~appro/Snapdragon-S4.html).</div><div class='del'>-#</div><div class='del'>-# Cortex-A15 manages in 14.2/16.1 cycles [when integer-only code</div><div class='del'>-# manages in 20.0 cycles].</div><div class='del'>-#</div><div class='del'>-# When comparing to x86_64 results keep in mind that NEON unit is</div><div class='del'>-# [mostly] single-issue and thus can't [fully] benefit from</div><div class='del'>-# instruction-level parallelism. And when comparing to aes-armv4</div><div class='del'>-# results keep in mind key schedule conversion overhead (see</div><div class='del'>-# bsaes-x86_64.pl for further details)...</div><div class='del'>-#</div><div class='del'>-#						&lt;appro@openssl.org&gt;</div><div class='del'>-</div><div class='del'>-# April-August 2013</div><div class='del'>-#</div><div class='del'>-# Add CBC, CTR and XTS subroutines, adapt for kernel use.</div><div class='del'>-#</div><div class='del'>-#					&lt;ard.biesheuvel@linaro.org&gt;</div><div class='del'>-</div><div class='del'>-while (($output=shift) &amp;&amp; ($output!~/^\w[\w\-]*\.\w+$/)) {}</div><div class='del'>-open STDOUT,"&gt;$output";</div><div class='del'>-</div><div class='del'>-my ($inp,$out,$len,$key)=("r0","r1","r2","r3");</div><div class='del'>-my @XMM=map("q$_",(0..15));</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-my ($key,$rounds,$const)=("r4","r5","r6");</div><div class='del'>-</div><div class='del'>-sub Dlo()   { shift=~m|q([1]?[0-9])|?"d".($1*2):"";     }</div><div class='del'>-sub Dhi()   { shift=~m|q([1]?[0-9])|?"d".($1*2+1):"";   }</div><div class='del'>-</div><div class='del'>-sub Sbox {</div><div class='del'>-# input in  lsb &gt; [b0, b1, b2, b3, b4, b5, b6, b7] &lt; msb</div><div class='del'>-# output in lsb &gt; [b0, b1, b4, b6, b3, b7, b2, b5] &lt; msb</div><div class='del'>-my @b=@_[0..7];</div><div class='del'>-my @t=@_[8..11];</div><div class='del'>-my @s=@_[12..15];</div><div class='del'>-	&amp;InBasisChange	(@b);</div><div class='del'>-	&amp;Inv_GF256	(@b[6,5,0,3,7,1,4,2],@t,@s);</div><div class='del'>-	&amp;OutBasisChange	(@b[7,1,4,2,6,5,0,3]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub InBasisChange {</div><div class='del'>-# input in  lsb &gt; [b0, b1, b2, b3, b4, b5, b6, b7] &lt; msb</div><div class='del'>-# output in lsb &gt; [b6, b5, b0, b3, b7, b1, b4, b2] &lt; msb </div><div class='del'>-my @b=@_[0..7];</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor	@b[2], @b[2], @b[1]</div><div class='del'>-	veor	@b[5], @b[5], @b[6]</div><div class='del'>-	veor	@b[3], @b[3], @b[0]</div><div class='del'>-	veor	@b[6], @b[6], @b[2]</div><div class='del'>-	veor	@b[5], @b[5], @b[0]</div><div class='del'>-</div><div class='del'>-	veor	@b[6], @b[6], @b[3]</div><div class='del'>-	veor	@b[3], @b[3], @b[7]</div><div class='del'>-	veor	@b[7], @b[7], @b[5]</div><div class='del'>-	veor	@b[3], @b[3], @b[4]</div><div class='del'>-	veor	@b[4], @b[4], @b[5]</div><div class='del'>-</div><div class='del'>-	veor	@b[2], @b[2], @b[7]</div><div class='del'>-	veor	@b[3], @b[3], @b[1]</div><div class='del'>-	veor	@b[1], @b[1], @b[5]</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub OutBasisChange {</div><div class='del'>-# input in  lsb &gt; [b0, b1, b2, b3, b4, b5, b6, b7] &lt; msb</div><div class='del'>-# output in lsb &gt; [b6, b1, b2, b4, b7, b0, b3, b5] &lt; msb</div><div class='del'>-my @b=@_[0..7];</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor	@b[0], @b[0], @b[6]</div><div class='del'>-	veor	@b[1], @b[1], @b[4]</div><div class='del'>-	veor	@b[4], @b[4], @b[6]</div><div class='del'>-	veor	@b[2], @b[2], @b[0]</div><div class='del'>-	veor	@b[6], @b[6], @b[1]</div><div class='del'>-</div><div class='del'>-	veor	@b[1], @b[1], @b[5]</div><div class='del'>-	veor	@b[5], @b[5], @b[3]</div><div class='del'>-	veor	@b[3], @b[3], @b[7]</div><div class='del'>-	veor	@b[7], @b[7], @b[5]</div><div class='del'>-	veor	@b[2], @b[2], @b[5]</div><div class='del'>-</div><div class='del'>-	veor	@b[4], @b[4], @b[7]</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub InvSbox {</div><div class='del'>-# input in lsb 	&gt; [b0, b1, b2, b3, b4, b5, b6, b7] &lt; msb</div><div class='del'>-# output in lsb	&gt; [b0, b1, b6, b4, b2, b7, b3, b5] &lt; msb</div><div class='del'>-my @b=@_[0..7];</div><div class='del'>-my @t=@_[8..11];</div><div class='del'>-my @s=@_[12..15];</div><div class='del'>-	&amp;InvInBasisChange	(@b);</div><div class='del'>-	&amp;Inv_GF256		(@b[5,1,2,6,3,7,0,4],@t,@s);</div><div class='del'>-	&amp;InvOutBasisChange	(@b[3,7,0,4,5,1,2,6]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub InvInBasisChange {		# OutBasisChange in reverse (with twist)</div><div class='del'>-my @b=@_[5,1,2,6,3,7,0,4];</div><div class='del'>-$code.=&lt;&lt;___</div><div class='del'>-	 veor	@b[1], @b[1], @b[7]</div><div class='del'>-	veor	@b[4], @b[4], @b[7]</div><div class='del'>-</div><div class='del'>-	veor	@b[7], @b[7], @b[5]</div><div class='del'>-	 veor	@b[1], @b[1], @b[3]</div><div class='del'>-	veor	@b[2], @b[2], @b[5]</div><div class='del'>-	veor	@b[3], @b[3], @b[7]</div><div class='del'>-</div><div class='del'>-	veor	@b[6], @b[6], @b[1]</div><div class='del'>-	veor	@b[2], @b[2], @b[0]</div><div class='del'>-	 veor	@b[5], @b[5], @b[3]</div><div class='del'>-	veor	@b[4], @b[4], @b[6]</div><div class='del'>-	veor	@b[0], @b[0], @b[6]</div><div class='del'>-	veor	@b[1], @b[1], @b[4]</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub InvOutBasisChange {		# InBasisChange in reverse</div><div class='del'>-my @b=@_[2,5,7,3,6,1,0,4];</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor	@b[1], @b[1], @b[5]</div><div class='del'>-	veor	@b[2], @b[2], @b[7]</div><div class='del'>-</div><div class='del'>-	veor	@b[3], @b[3], @b[1]</div><div class='del'>-	veor	@b[4], @b[4], @b[5]</div><div class='del'>-	veor	@b[7], @b[7], @b[5]</div><div class='del'>-	veor	@b[3], @b[3], @b[4]</div><div class='del'>-	 veor 	@b[5], @b[5], @b[0]</div><div class='del'>-	veor	@b[3], @b[3], @b[7]</div><div class='del'>-	 veor	@b[6], @b[6], @b[2]</div><div class='del'>-	 veor	@b[2], @b[2], @b[1]</div><div class='del'>-	veor	@b[6], @b[6], @b[3]</div><div class='del'>-</div><div class='del'>-	veor	@b[3], @b[3], @b[0]</div><div class='del'>-	veor	@b[5], @b[5], @b[6]</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub Mul_GF4 {</div><div class='del'>-#;*************************************************************</div><div class='del'>-#;* Mul_GF4: Input x0-x1,y0-y1 Output x0-x1 Temp t0 (8) *</div><div class='del'>-#;*************************************************************</div><div class='del'>-my ($x0,$x1,$y0,$y1,$t0,$t1)=@_;</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor 	$t0, $y0, $y1</div><div class='del'>-	vand	$t0, $t0, $x0</div><div class='del'>-	veor	$x0, $x0, $x1</div><div class='del'>-	vand	$t1, $x1, $y0</div><div class='del'>-	vand	$x0, $x0, $y1</div><div class='del'>-	veor	$x1, $t1, $t0</div><div class='del'>-	veor	$x0, $x0, $t1</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub Mul_GF4_N {				# not used, see next subroutine</div><div class='del'>-# multiply and scale by N</div><div class='del'>-my ($x0,$x1,$y0,$y1,$t0)=@_;</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor	$t0, $y0, $y1</div><div class='del'>-	vand	$t0, $t0, $x0</div><div class='del'>-	veor	$x0, $x0, $x1</div><div class='del'>-	vand	$x1, $x1, $y0</div><div class='del'>-	vand	$x0, $x0, $y1</div><div class='del'>-	veor	$x1, $x1, $x0</div><div class='del'>-	veor	$x0, $x0, $t0</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub Mul_GF4_N_GF4 {</div><div class='del'>-# interleaved Mul_GF4_N and Mul_GF4</div><div class='del'>-my ($x0,$x1,$y0,$y1,$t0,</div><div class='del'>-    $x2,$x3,$y2,$y3,$t1)=@_;</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor	$t0, $y0, $y1</div><div class='del'>-	 veor 	$t1, $y2, $y3</div><div class='del'>-	vand	$t0, $t0, $x0</div><div class='del'>-	 vand	$t1, $t1, $x2</div><div class='del'>-	veor	$x0, $x0, $x1</div><div class='del'>-	 veor	$x2, $x2, $x3</div><div class='del'>-	vand	$x1, $x1, $y0</div><div class='del'>-	 vand	$x3, $x3, $y2</div><div class='del'>-	vand	$x0, $x0, $y1</div><div class='del'>-	 vand	$x2, $x2, $y3</div><div class='del'>-	veor	$x1, $x1, $x0</div><div class='del'>-	 veor	$x2, $x2, $x3</div><div class='del'>-	veor	$x0, $x0, $t0</div><div class='del'>-	 veor	$x3, $x3, $t1</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-sub Mul_GF16_2 {</div><div class='del'>-my @x=@_[0..7];</div><div class='del'>-my @y=@_[8..11];</div><div class='del'>-my @t=@_[12..15];</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor	@t[0], @x[0], @x[2]</div><div class='del'>-	veor	@t[1], @x[1], @x[3]</div><div class='del'>-___</div><div class='del'>-	&amp;Mul_GF4  	(@x[0], @x[1], @y[0], @y[1], @t[2..3]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor	@y[0], @y[0], @y[2]</div><div class='del'>-	veor	@y[1], @y[1], @y[3]</div><div class='del'>-___</div><div class='del'>-	Mul_GF4_N_GF4	(@t[0], @t[1], @y[0], @y[1], @t[3],</div><div class='del'>-			 @x[2], @x[3], @y[2], @y[3], @t[2]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor	@x[0], @x[0], @t[0]</div><div class='del'>-	veor	@x[2], @x[2], @t[0]</div><div class='del'>-	veor	@x[1], @x[1], @t[1]</div><div class='del'>-	veor	@x[3], @x[3], @t[1]</div><div class='del'>-</div><div class='del'>-	veor	@t[0], @x[4], @x[6]</div><div class='del'>-	veor	@t[1], @x[5], @x[7]</div><div class='del'>-___</div><div class='del'>-	&amp;Mul_GF4_N_GF4	(@t[0], @t[1], @y[0], @y[1], @t[3],</div><div class='del'>-			 @x[6], @x[7], @y[2], @y[3], @t[2]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor	@y[0], @y[0], @y[2]</div><div class='del'>-	veor	@y[1], @y[1], @y[3]</div><div class='del'>-___</div><div class='del'>-	&amp;Mul_GF4  	(@x[4], @x[5], @y[0], @y[1], @t[2..3]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor	@x[4], @x[4], @t[0]</div><div class='del'>-	veor	@x[6], @x[6], @t[0]</div><div class='del'>-	veor	@x[5], @x[5], @t[1]</div><div class='del'>-	veor	@x[7], @x[7], @t[1]</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-sub Inv_GF256 {</div><div class='del'>-#;********************************************************************</div><div class='del'>-#;* Inv_GF256: Input x0-x7 Output x0-x7 Temp t0-t3,s0-s3 (144)       *</div><div class='del'>-#;********************************************************************</div><div class='del'>-my @x=@_[0..7];</div><div class='del'>-my @t=@_[8..11];</div><div class='del'>-my @s=@_[12..15];</div><div class='del'>-# direct optimizations from hardware</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	veor	@t[3], @x[4], @x[6]</div><div class='del'>-	veor	@t[2], @x[5], @x[7]</div><div class='del'>-	veor	@t[1], @x[1], @x[3]</div><div class='del'>-	veor	@s[1], @x[7], @x[6]</div><div class='del'>-	 vmov	@t[0], @t[2]</div><div class='del'>-	veor	@s[0], @x[0], @x[2]</div><div class='del'>-</div><div class='del'>-	vorr	@t[2], @t[2], @t[1]</div><div class='del'>-	veor	@s[3], @t[3], @t[0]</div><div class='del'>-	vand	@s[2], @t[3], @s[0]</div><div class='del'>-	vorr	@t[3], @t[3], @s[0]</div><div class='del'>-	veor	@s[0], @s[0], @t[1]</div><div class='del'>-	vand	@t[0], @t[0], @t[1]</div><div class='del'>-	veor	@t[1], @x[3], @x[2]</div><div class='del'>-	vand	@s[3], @s[3], @s[0]</div><div class='del'>-	vand	@s[1], @s[1], @t[1]</div><div class='del'>-	veor	@t[1], @x[4], @x[5]</div><div class='del'>-	veor	@s[0], @x[1], @x[0]</div><div class='del'>-	veor	@t[3], @t[3], @s[1]</div><div class='del'>-	veor	@t[2], @t[2], @s[1]</div><div class='del'>-	vand	@s[1], @t[1], @s[0]</div><div class='del'>-	vorr	@t[1], @t[1], @s[0]</div><div class='del'>-	veor	@t[3], @t[3], @s[3]</div><div class='del'>-	veor	@t[0], @t[0], @s[1]</div><div class='del'>-	veor	@t[2], @t[2], @s[2]</div><div class='del'>-	veor	@t[1], @t[1], @s[3]</div><div class='del'>-	veor	@t[0], @t[0], @s[2]</div><div class='del'>-	vand	@s[0], @x[7], @x[3]</div><div class='del'>-	veor	@t[1], @t[1], @s[2]</div><div class='del'>-	vand	@s[1], @x[6], @x[2]</div><div class='del'>-	vand	@s[2], @x[5], @x[1]</div><div class='del'>-	vorr	@s[3], @x[4], @x[0]</div><div class='del'>-	veor	@t[3], @t[3], @s[0]</div><div class='del'>-	veor	@t[1], @t[1], @s[2]</div><div class='del'>-	veor	@t[0], @t[0], @s[3]</div><div class='del'>-	veor	@t[2], @t[2], @s[1]</div><div class='del'>-</div><div class='del'>-	@ Inv_GF16 \t0, \t1, \t2, \t3, \s0, \s1, \s2, \s3</div><div class='del'>-</div><div class='del'>-	@ new smaller inversion</div><div class='del'>-</div><div class='del'>-	vand	@s[2], @t[3], @t[1]</div><div class='del'>-	vmov	@s[0], @t[0]</div><div class='del'>-</div><div class='del'>-	veor	@s[1], @t[2], @s[2]</div><div class='del'>-	veor	@s[3], @t[0], @s[2]</div><div class='del'>-	veor	@s[2], @t[0], @s[2]	@ @s[2]=@s[3]</div><div class='del'>-</div><div class='del'>-	vbsl	@s[1], @t[1], @t[0]</div><div class='del'>-	vbsl	@s[3], @t[3], @t[2]</div><div class='del'>-	veor	@t[3], @t[3], @t[2]</div><div class='del'>-</div><div class='del'>-	vbsl	@s[0], @s[1], @s[2]</div><div class='del'>-	vbsl	@t[0], @s[2], @s[1]</div><div class='del'>-</div><div class='del'>-	vand	@s[2], @s[0], @s[3]</div><div class='del'>-	veor	@t[1], @t[1], @t[0]</div><div class='del'>-</div><div class='del'>-	veor	@s[2], @s[2], @t[3]</div><div class='del'>-___</div><div class='del'>-# output in s3, s2, s1, t1</div><div class='del'>-</div><div class='del'>-# Mul_GF16_2 \x0, \x1, \x2, \x3, \x4, \x5, \x6, \x7, \t2, \t3, \t0, \t1, \s0, \s1, \s2, \s3</div><div class='del'>-</div><div class='del'>-# Mul_GF16_2 \x0, \x1, \x2, \x3, \x4, \x5, \x6, \x7, \s3, \s2, \s1, \t1, \s0, \t0, \t2, \t3</div><div class='del'>-	&amp;Mul_GF16_2(@x,@s[3,2,1],@t[1],@s[0],@t[0,2,3]);</div><div class='del'>-</div><div class='del'>-### output msb &gt; [x3,x2,x1,x0,x7,x6,x5,x4] &lt; lsb</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# AES linear components</div><div class='del'>-</div><div class='del'>-sub ShiftRows {</div><div class='del'>-my @x=@_[0..7];</div><div class='del'>-my @t=@_[8..11];</div><div class='del'>-my $mask=pop;</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vldmia	$key!, {@t[0]-@t[3]}</div><div class='del'>-	veor	@t[0], @t[0], @x[0]</div><div class='del'>-	veor	@t[1], @t[1], @x[1]</div><div class='del'>-	vtbl.8	`&amp;Dlo(@x[0])`, {@t[0]}, `&amp;Dlo($mask)`</div><div class='del'>-	vtbl.8	`&amp;Dhi(@x[0])`, {@t[0]}, `&amp;Dhi($mask)`</div><div class='del'>-	vldmia	$key!, {@t[0]}</div><div class='del'>-	veor	@t[2], @t[2], @x[2]</div><div class='del'>-	vtbl.8	`&amp;Dlo(@x[1])`, {@t[1]}, `&amp;Dlo($mask)`</div><div class='del'>-	vtbl.8	`&amp;Dhi(@x[1])`, {@t[1]}, `&amp;Dhi($mask)`</div><div class='del'>-	vldmia	$key!, {@t[1]}</div><div class='del'>-	veor	@t[3], @t[3], @x[3]</div><div class='del'>-	vtbl.8	`&amp;Dlo(@x[2])`, {@t[2]}, `&amp;Dlo($mask)`</div><div class='del'>-	vtbl.8	`&amp;Dhi(@x[2])`, {@t[2]}, `&amp;Dhi($mask)`</div><div class='del'>-	vldmia	$key!, {@t[2]}</div><div class='del'>-	vtbl.8	`&amp;Dlo(@x[3])`, {@t[3]}, `&amp;Dlo($mask)`</div><div class='del'>-	vtbl.8	`&amp;Dhi(@x[3])`, {@t[3]}, `&amp;Dhi($mask)`</div><div class='del'>-	vldmia	$key!, {@t[3]}</div><div class='del'>-	veor	@t[0], @t[0], @x[4]</div><div class='del'>-	veor	@t[1], @t[1], @x[5]</div><div class='del'>-	vtbl.8	`&amp;Dlo(@x[4])`, {@t[0]}, `&amp;Dlo($mask)`</div><div class='del'>-	vtbl.8	`&amp;Dhi(@x[4])`, {@t[0]}, `&amp;Dhi($mask)`</div><div class='del'>-	veor	@t[2], @t[2], @x[6]</div><div class='del'>-	vtbl.8	`&amp;Dlo(@x[5])`, {@t[1]}, `&amp;Dlo($mask)`</div><div class='del'>-	vtbl.8	`&amp;Dhi(@x[5])`, {@t[1]}, `&amp;Dhi($mask)`</div><div class='del'>-	veor	@t[3], @t[3], @x[7]</div><div class='del'>-	vtbl.8	`&amp;Dlo(@x[6])`, {@t[2]}, `&amp;Dlo($mask)`</div><div class='del'>-	vtbl.8	`&amp;Dhi(@x[6])`, {@t[2]}, `&amp;Dhi($mask)`</div><div class='del'>-	vtbl.8	`&amp;Dlo(@x[7])`, {@t[3]}, `&amp;Dlo($mask)`</div><div class='del'>-	vtbl.8	`&amp;Dhi(@x[7])`, {@t[3]}, `&amp;Dhi($mask)`</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub MixColumns {</div><div class='del'>-# modified to emit output in order suitable for feeding back to aesenc[last]</div><div class='del'>-my @x=@_[0..7];</div><div class='del'>-my @t=@_[8..15];</div><div class='del'>-my $inv=@_[16];	# optional</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vext.8	@t[0], @x[0], @x[0], #12	@ x0 &lt;&lt;&lt; 32</div><div class='del'>-	vext.8	@t[1], @x[1], @x[1], #12</div><div class='del'>-	 veor	@x[0], @x[0], @t[0]		@ x0 ^ (x0 &lt;&lt;&lt; 32)</div><div class='del'>-	vext.8	@t[2], @x[2], @x[2], #12</div><div class='del'>-	 veor	@x[1], @x[1], @t[1]</div><div class='del'>-	vext.8	@t[3], @x[3], @x[3], #12</div><div class='del'>-	 veor	@x[2], @x[2], @t[2]</div><div class='del'>-	vext.8	@t[4], @x[4], @x[4], #12</div><div class='del'>-	 veor	@x[3], @x[3], @t[3]</div><div class='del'>-	vext.8	@t[5], @x[5], @x[5], #12</div><div class='del'>-	 veor	@x[4], @x[4], @t[4]</div><div class='del'>-	vext.8	@t[6], @x[6], @x[6], #12</div><div class='del'>-	 veor	@x[5], @x[5], @t[5]</div><div class='del'>-	vext.8	@t[7], @x[7], @x[7], #12</div><div class='del'>-	 veor	@x[6], @x[6], @t[6]</div><div class='del'>-</div><div class='del'>-	veor	@t[1], @t[1], @x[0]</div><div class='del'>-	 veor	@x[7], @x[7], @t[7]</div><div class='del'>-	 vext.8	@x[0], @x[0], @x[0], #8		@ (x0 ^ (x0 &lt;&lt;&lt; 32)) &lt;&lt;&lt; 64)</div><div class='del'>-	veor	@t[2], @t[2], @x[1]</div><div class='del'>-	veor	@t[0], @t[0], @x[7]</div><div class='del'>-	veor	@t[1], @t[1], @x[7]</div><div class='del'>-	 vext.8	@x[1], @x[1], @x[1], #8</div><div class='del'>-	veor	@t[5], @t[5], @x[4]</div><div class='del'>-	 veor	@x[0], @x[0], @t[0]</div><div class='del'>-	veor	@t[6], @t[6], @x[5]</div><div class='del'>-	 veor	@x[1], @x[1], @t[1]</div><div class='del'>-	 vext.8	@t[0], @x[4], @x[4], #8</div><div class='del'>-	veor	@t[4], @t[4], @x[3]</div><div class='del'>-	 vext.8	@t[1], @x[5], @x[5], #8</div><div class='del'>-	veor	@t[7], @t[7], @x[6]</div><div class='del'>-	 vext.8	@x[4], @x[3], @x[3], #8</div><div class='del'>-	veor	@t[3], @t[3], @x[2]</div><div class='del'>-	 vext.8	@x[5], @x[7], @x[7], #8</div><div class='del'>-	veor	@t[4], @t[4], @x[7]</div><div class='del'>-	 vext.8	@x[3], @x[6], @x[6], #8</div><div class='del'>-	veor	@t[3], @t[3], @x[7]</div><div class='del'>-	 vext.8	@x[6], @x[2], @x[2], #8</div><div class='del'>-	veor	@x[7], @t[1], @t[5]</div><div class='del'>-___</div><div class='del'>-$code.=&lt;&lt;___ if (!$inv);</div><div class='del'>-	veor	@x[2], @t[0], @t[4]</div><div class='del'>-	veor	@x[4], @x[4], @t[3]</div><div class='del'>-	veor	@x[5], @x[5], @t[7]</div><div class='del'>-	veor	@x[3], @x[3], @t[6]</div><div class='del'>-	 @ vmov	@x[2], @t[0]</div><div class='del'>-	veor	@x[6], @x[6], @t[2]</div><div class='del'>-	 @ vmov	@x[7], @t[1]</div><div class='del'>-___</div><div class='del'>-$code.=&lt;&lt;___ if ($inv);</div><div class='del'>-	veor	@t[3], @t[3], @x[4]</div><div class='del'>-	veor	@x[5], @x[5], @t[7]</div><div class='del'>-	veor	@x[2], @x[3], @t[6]</div><div class='del'>-	veor	@x[3], @t[0], @t[4]</div><div class='del'>-	veor	@x[4], @x[6], @t[2]</div><div class='del'>-	vmov	@x[6], @t[3]</div><div class='del'>-	 @ vmov	@x[7], @t[1]</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub InvMixColumns_orig {</div><div class='del'>-my @x=@_[0..7];</div><div class='del'>-my @t=@_[8..15];</div><div class='del'>-</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	@ multiplication by 0x0e</div><div class='del'>-	vext.8	@t[7], @x[7], @x[7], #12</div><div class='del'>-	vmov	@t[2], @x[2]</div><div class='del'>-	veor	@x[2], @x[2], @x[5]		@ 2 5</div><div class='del'>-	veor	@x[7], @x[7], @x[5]		@ 7 5</div><div class='del'>-	vext.8	@t[0], @x[0], @x[0], #12</div><div class='del'>-	vmov	@t[5], @x[5]</div><div class='del'>-	veor	@x[5], @x[5], @x[0]		@ 5 0		[1]</div><div class='del'>-	veor	@x[0], @x[0], @x[1]		@ 0 1</div><div class='del'>-	vext.8	@t[1], @x[1], @x[1], #12</div><div class='del'>-	veor	@x[1], @x[1], @x[2]		@ 1 25</div><div class='del'>-	veor	@x[0], @x[0], @x[6]		@ 01 6		[2]</div><div class='del'>-	vext.8	@t[3], @x[3], @x[3], #12</div><div class='del'>-	veor	@x[1], @x[1], @x[3]		@ 125 3		[4]</div><div class='del'>-	veor	@x[2], @x[2], @x[0]		@ 25 016	[3]</div><div class='del'>-	veor	@x[3], @x[3], @x[7]		@ 3 75</div><div class='del'>-	veor	@x[7], @x[7], @x[6]		@ 75 6		[0]</div><div class='del'>-	vext.8	@t[6], @x[6], @x[6], #12</div><div class='del'>-	vmov	@t[4], @x[4]</div><div class='del'>-	veor	@x[6], @x[6], @x[4]		@ 6 4</div><div class='del'>-	veor	@x[4], @x[4], @x[3]		@ 4 375		[6]</div><div class='del'>-	veor	@x[3], @x[3], @x[7]		@ 375 756=36</div><div class='del'>-	veor	@x[6], @x[6], @t[5]		@ 64 5		[7]</div><div class='del'>-	veor	@x[3], @x[3], @t[2]		@ 36 2</div><div class='del'>-	vext.8	@t[5], @t[5], @t[5], #12</div><div class='del'>-	veor	@x[3], @x[3], @t[4]		@ 362 4		[5]</div><div class='del'>-___</div><div class='del'>-					my @y = @x[7,5,0,2,1,3,4,6];</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	@ multiplication by 0x0b</div><div class='del'>-	veor	@y[1], @y[1], @y[0]</div><div class='del'>-	veor	@y[0], @y[0], @t[0]</div><div class='del'>-	vext.8	@t[2], @t[2], @t[2], #12</div><div class='del'>-	veor	@y[1], @y[1], @t[1]</div><div class='del'>-	veor	@y[0], @y[0], @t[5]</div><div class='del'>-	vext.8	@t[4], @t[4], @t[4], #12</div><div class='del'>-	veor	@y[1], @y[1], @t[6]</div><div class='del'>-	veor	@y[0], @y[0], @t[7]</div><div class='del'>-	veor	@t[7], @t[7], @t[6]		@ clobber t[7]</div><div class='del'>-</div><div class='del'>-	veor	@y[3], @y[3], @t[0]</div><div class='del'>-	 veor	@y[1], @y[1], @y[0]</div><div class='del'>-	vext.8	@t[0], @t[0], @t[0], #12</div><div class='del'>-	veor	@y[2], @y[2], @t[1]</div><div class='del'>-	veor	@y[4], @y[4], @t[1]</div><div class='del'>-	vext.8	@t[1], @t[1], @t[1], #12</div><div class='del'>-	veor	@y[2], @y[2], @t[2]</div><div class='del'>-	veor	@y[3], @y[3], @t[2]</div><div class='del'>-	veor	@y[5], @y[5], @t[2]</div><div class='del'>-	veor	@y[2], @y[2], @t[7]</div><div class='del'>-	vext.8	@t[2], @t[2], @t[2], #12</div><div class='del'>-	veor	@y[3], @y[3], @t[3]</div><div class='del'>-	veor	@y[6], @y[6], @t[3]</div><div class='del'>-	veor	@y[4], @y[4], @t[3]</div><div class='del'>-	veor	@y[7], @y[7], @t[4]</div><div class='del'>-	vext.8	@t[3], @t[3], @t[3], #12</div><div class='del'>-	veor	@y[5], @y[5], @t[4]</div><div class='del'>-	veor	@y[7], @y[7], @t[7]</div><div class='del'>-	veor	@t[7], @t[7], @t[5]		@ clobber t[7] even more</div><div class='del'>-	veor	@y[3], @y[3], @t[5]</div><div class='del'>-	veor	@y[4], @y[4], @t[4]</div><div class='del'>-</div><div class='del'>-	veor	@y[5], @y[5], @t[7]</div><div class='del'>-	vext.8	@t[4], @t[4], @t[4], #12</div><div class='del'>-	veor	@y[6], @y[6], @t[7]</div><div class='del'>-	veor	@y[4], @y[4], @t[7]</div><div class='del'>-</div><div class='del'>-	veor	@t[7], @t[7], @t[5]</div><div class='del'>-	vext.8	@t[5], @t[5], @t[5], #12</div><div class='del'>-</div><div class='del'>-	@ multiplication by 0x0d</div><div class='del'>-	veor	@y[4], @y[4], @y[7]</div><div class='del'>-	 veor	@t[7], @t[7], @t[6]		@ restore t[7]</div><div class='del'>-	veor	@y[7], @y[7], @t[4]</div><div class='del'>-	vext.8	@t[6], @t[6], @t[6], #12</div><div class='del'>-	veor	@y[2], @y[2], @t[0]</div><div class='del'>-	veor	@y[7], @y[7], @t[5]</div><div class='del'>-	vext.8	@t[7], @t[7], @t[7], #12</div><div class='del'>-	veor	@y[2], @y[2], @t[2]</div><div class='del'>-</div><div class='del'>-	veor	@y[3], @y[3], @y[1]</div><div class='del'>-	veor	@y[1], @y[1], @t[1]</div><div class='del'>-	veor	@y[0], @y[0], @t[0]</div><div class='del'>-	veor	@y[3], @y[3], @t[0]</div><div class='del'>-	veor	@y[1], @y[1], @t[5]</div><div class='del'>-	veor	@y[0], @y[0], @t[5]</div><div class='del'>-	vext.8	@t[0], @t[0], @t[0], #12</div><div class='del'>-	veor	@y[1], @y[1], @t[7]</div><div class='del'>-	veor	@y[0], @y[0], @t[6]</div><div class='del'>-	veor	@y[3], @y[3], @y[1]</div><div class='del'>-	veor	@y[4], @y[4], @t[1]</div><div class='del'>-	vext.8	@t[1], @t[1], @t[1], #12</div><div class='del'>-</div><div class='del'>-	veor	@y[7], @y[7], @t[7]</div><div class='del'>-	veor	@y[4], @y[4], @t[2]</div><div class='del'>-	veor	@y[5], @y[5], @t[2]</div><div class='del'>-	veor	@y[2], @y[2], @t[6]</div><div class='del'>-	veor	@t[6], @t[6], @t[3]		@ clobber t[6]</div><div class='del'>-	vext.8	@t[2], @t[2], @t[2], #12</div><div class='del'>-	veor	@y[4], @y[4], @y[7]</div><div class='del'>-	veor	@y[3], @y[3], @t[6]</div><div class='del'>-</div><div class='del'>-	veor	@y[6], @y[6], @t[6]</div><div class='del'>-	veor	@y[5], @y[5], @t[5]</div><div class='del'>-	vext.8	@t[5], @t[5], @t[5], #12</div><div class='del'>-	veor	@y[6], @y[6], @t[4]</div><div class='del'>-	vext.8	@t[4], @t[4], @t[4], #12</div><div class='del'>-	veor	@y[5], @y[5], @t[6]</div><div class='del'>-	veor	@y[6], @y[6], @t[7]</div><div class='del'>-	vext.8	@t[7], @t[7], @t[7], #12</div><div class='del'>-	veor	@t[6], @t[6], @t[3]		@ restore t[6]</div><div class='del'>-	vext.8	@t[3], @t[3], @t[3], #12</div><div class='del'>-</div><div class='del'>-	@ multiplication by 0x09</div><div class='del'>-	veor	@y[4], @y[4], @y[1]</div><div class='del'>-	veor	@t[1], @t[1], @y[1]		@ t[1]=y[1]</div><div class='del'>-	veor	@t[0], @t[0], @t[5]		@ clobber t[0]</div><div class='del'>-	vext.8	@t[6], @t[6], @t[6], #12</div><div class='del'>-	veor	@t[1], @t[1], @t[5]</div><div class='del'>-	veor	@y[3], @y[3], @t[0]</div><div class='del'>-	veor	@t[0], @t[0], @y[0]		@ t[0]=y[0]</div><div class='del'>-	veor	@t[1], @t[1], @t[6]</div><div class='del'>-	veor	@t[6], @t[6], @t[7]		@ clobber t[6]</div><div class='del'>-	veor	@y[4], @y[4], @t[1]</div><div class='del'>-	veor	@y[7], @y[7], @t[4]</div><div class='del'>-	veor	@y[6], @y[6], @t[3]</div><div class='del'>-	veor	@y[5], @y[5], @t[2]</div><div class='del'>-	veor	@t[4], @t[4], @y[4]		@ t[4]=y[4]</div><div class='del'>-	veor	@t[3], @t[3], @y[3]		@ t[3]=y[3]</div><div class='del'>-	veor	@t[5], @t[5], @y[5]		@ t[5]=y[5]</div><div class='del'>-	veor	@t[2], @t[2], @y[2]		@ t[2]=y[2]</div><div class='del'>-	veor	@t[3], @t[3], @t[7]</div><div class='del'>-	veor	@XMM[5], @t[5], @t[6]</div><div class='del'>-	veor	@XMM[6], @t[6], @y[6]		@ t[6]=y[6]</div><div class='del'>-	veor	@XMM[2], @t[2], @t[6]</div><div class='del'>-	veor	@XMM[7], @t[7], @y[7]		@ t[7]=y[7]</div><div class='del'>-</div><div class='del'>-	vmov	@XMM[0], @t[0]</div><div class='del'>-	vmov	@XMM[1], @t[1]</div><div class='del'>-	@ vmov	@XMM[2], @t[2]</div><div class='del'>-	vmov	@XMM[3], @t[3]</div><div class='del'>-	vmov	@XMM[4], @t[4]</div><div class='del'>-	@ vmov	@XMM[5], @t[5]</div><div class='del'>-	@ vmov	@XMM[6], @t[6]</div><div class='del'>-	@ vmov	@XMM[7], @t[7]</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub InvMixColumns {</div><div class='del'>-my @x=@_[0..7];</div><div class='del'>-my @t=@_[8..15];</div><div class='del'>-</div><div class='del'>-# Thanks to Jussi Kivilinna for providing pointer to</div><div class='del'>-#</div><div class='del'>-# | 0e 0b 0d 09 |   | 02 03 01 01 |   | 05 00 04 00 |</div><div class='del'>-# | 09 0e 0b 0d | = | 01 02 03 01 | x | 00 05 00 04 |</div><div class='del'>-# | 0d 09 0e 0b |   | 01 01 02 03 |   | 04 00 05 00 |</div><div class='del'>-# | 0b 0d 09 0e |   | 03 01 01 02 |   | 00 04 00 05 |</div><div class='del'>-</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	@ multiplication by 0x05-0x00-0x04-0x00</div><div class='del'>-	vext.8	@t[0], @x[0], @x[0], #8</div><div class='del'>-	vext.8	@t[6], @x[6], @x[6], #8</div><div class='del'>-	vext.8	@t[7], @x[7], @x[7], #8</div><div class='del'>-	veor	@t[0], @t[0], @x[0]</div><div class='del'>-	vext.8	@t[1], @x[1], @x[1], #8</div><div class='del'>-	veor	@t[6], @t[6], @x[6]</div><div class='del'>-	vext.8	@t[2], @x[2], @x[2], #8</div><div class='del'>-	veor	@t[7], @t[7], @x[7]</div><div class='del'>-	vext.8	@t[3], @x[3], @x[3], #8</div><div class='del'>-	veor	@t[1], @t[1], @x[1]</div><div class='del'>-	vext.8	@t[4], @x[4], @x[4], #8</div><div class='del'>-	veor	@t[2], @t[2], @x[2]</div><div class='del'>-	vext.8	@t[5], @x[5], @x[5], #8</div><div class='del'>-	veor	@t[3], @t[3], @x[3]</div><div class='del'>-	veor	@t[4], @t[4], @x[4]</div><div class='del'>-	veor	@t[5], @t[5], @x[5]</div><div class='del'>-</div><div class='del'>-	 veor	@x[0], @x[0], @t[6]</div><div class='del'>-	 veor	@x[1], @x[1], @t[6]</div><div class='del'>-	 veor	@x[2], @x[2], @t[0]</div><div class='del'>-	 veor	@x[4], @x[4], @t[2]</div><div class='del'>-	 veor	@x[3], @x[3], @t[1]</div><div class='del'>-	 veor	@x[1], @x[1], @t[7]</div><div class='del'>-	 veor	@x[2], @x[2], @t[7]</div><div class='del'>-	 veor	@x[4], @x[4], @t[6]</div><div class='del'>-	 veor	@x[5], @x[5], @t[3]</div><div class='del'>-	 veor	@x[3], @x[3], @t[6]</div><div class='del'>-	 veor	@x[6], @x[6], @t[4]</div><div class='del'>-	 veor	@x[4], @x[4], @t[7]</div><div class='del'>-	 veor	@x[5], @x[5], @t[7]</div><div class='del'>-	 veor	@x[7], @x[7], @t[5]</div><div class='del'>-___</div><div class='del'>-	&amp;MixColumns	(@x,@t,1);	# flipped 2&lt;-&gt;3 and 4&lt;-&gt;6</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub swapmove {</div><div class='del'>-my ($a,$b,$n,$mask,$t)=@_;</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vshr.u64	$t, $b, #$n</div><div class='del'>-	veor		$t, $t, $a</div><div class='del'>-	vand		$t, $t, $mask</div><div class='del'>-	veor		$a, $a, $t</div><div class='del'>-	vshl.u64	$t, $t, #$n</div><div class='del'>-	veor		$b, $b, $t</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-sub swapmove2x {</div><div class='del'>-my ($a0,$b0,$a1,$b1,$n,$mask,$t0,$t1)=@_;</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vshr.u64	$t0, $b0, #$n</div><div class='del'>-	 vshr.u64	$t1, $b1, #$n</div><div class='del'>-	veor		$t0, $t0, $a0</div><div class='del'>-	 veor		$t1, $t1, $a1</div><div class='del'>-	vand		$t0, $t0, $mask</div><div class='del'>-	 vand		$t1, $t1, $mask</div><div class='del'>-	veor		$a0, $a0, $t0</div><div class='del'>-	vshl.u64	$t0, $t0, #$n</div><div class='del'>-	 veor		$a1, $a1, $t1</div><div class='del'>-	 vshl.u64	$t1, $t1, #$n</div><div class='del'>-	veor		$b0, $b0, $t0</div><div class='del'>-	 veor		$b1, $b1, $t1</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub bitslice {</div><div class='del'>-my @x=reverse(@_[0..7]);</div><div class='del'>-my ($t0,$t1,$t2,$t3)=@_[8..11];</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vmov.i8	$t0,#0x55			@ compose .LBS0</div><div class='del'>-	vmov.i8	$t1,#0x33			@ compose .LBS1</div><div class='del'>-___</div><div class='del'>-	&amp;swapmove2x(@x[0,1,2,3],1,$t0,$t2,$t3);</div><div class='del'>-	&amp;swapmove2x(@x[4,5,6,7],1,$t0,$t2,$t3);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vmov.i8	$t0,#0x0f			@ compose .LBS2</div><div class='del'>-___</div><div class='del'>-	&amp;swapmove2x(@x[0,2,1,3],2,$t1,$t2,$t3);</div><div class='del'>-	&amp;swapmove2x(@x[4,6,5,7],2,$t1,$t2,$t3);</div><div class='del'>-</div><div class='del'>-	&amp;swapmove2x(@x[0,4,1,5],4,$t0,$t2,$t3);</div><div class='del'>-	&amp;swapmove2x(@x[2,6,3,7],4,$t0,$t2,$t3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-# include "arm_arch.h"</div><div class='del'>-</div><div class='del'>-# define VFP_ABI_PUSH	vstmdb	sp!,{d8-d15}</div><div class='del'>-# define VFP_ABI_POP	vldmia	sp!,{d8-d15}</div><div class='del'>-# define VFP_ABI_FRAME	0x40</div><div class='del'>-#else</div><div class='del'>-# define VFP_ABI_PUSH</div><div class='del'>-# define VFP_ABI_POP</div><div class='del'>-# define VFP_ABI_FRAME	0</div><div class='del'>-# define BSAES_ASM_EXTENDED_KEY</div><div class='del'>-# define XTS_CHAIN_TWEAK</div><div class='del'>-# define __ARM_ARCH__ __LINUX_ARM_ARCH__</div><div class='del'>-# define __ARM_MAX_ARCH__ 7</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __thumb__</div><div class='del'>-# define adrl adr</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if __ARM_MAX_ARCH__&gt;=7</div><div class='del'>-.arch	armv7-a</div><div class='del'>-.fpu	neon</div><div class='del'>-</div><div class='del'>-.text</div><div class='del'>-.syntax	unified 	@ ARMv7-capable assembler is expected to handle this</div><div class='del'>-#ifdef __thumb2__</div><div class='del'>-.thumb</div><div class='del'>-#else</div><div class='del'>-.code   32</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-.type	_bsaes_decrypt8,%function</div><div class='del'>-.align	4</div><div class='del'>-_bsaes_decrypt8:</div><div class='del'>-	adr	$const,_bsaes_decrypt8</div><div class='del'>-	vldmia	$key!, {@XMM[9]}		@ round 0 key</div><div class='del'>-	add	$const,$const,#.LM0ISR-_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vldmia	$const!, {@XMM[8]}		@ .LM0ISR</div><div class='del'>-	veor	@XMM[10], @XMM[0], @XMM[9]	@ xor with round0 key</div><div class='del'>-	veor	@XMM[11], @XMM[1], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[0])`, {@XMM[10]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[0])`, {@XMM[10]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[12], @XMM[2], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[1])`, {@XMM[11]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[1])`, {@XMM[11]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[13], @XMM[3], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[2])`, {@XMM[12]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[2])`, {@XMM[12]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[14], @XMM[4], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[3])`, {@XMM[13]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[3])`, {@XMM[13]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[15], @XMM[5], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[4])`, {@XMM[14]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[4])`, {@XMM[14]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[10], @XMM[6], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[5])`, {@XMM[15]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[5])`, {@XMM[15]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[11], @XMM[7], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[6])`, {@XMM[10]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[6])`, {@XMM[10]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[7])`, {@XMM[11]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[7])`, {@XMM[11]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-___</div><div class='del'>-	&amp;bitslice	(@XMM[0..7, 8..11]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	sub	$rounds,$rounds,#1</div><div class='del'>-	b	.Ldec_sbox</div><div class='del'>-.align	4</div><div class='del'>-.Ldec_loop:</div><div class='del'>-___</div><div class='del'>-	&amp;ShiftRows	(@XMM[0..7, 8..12]);</div><div class='del'>-$code.=".Ldec_sbox:\n";</div><div class='del'>-	&amp;InvSbox	(@XMM[0..7, 8..15]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	subs	$rounds,$rounds,#1</div><div class='del'>-	bcc	.Ldec_done</div><div class='del'>-___</div><div class='del'>-	&amp;InvMixColumns	(@XMM[0,1,6,4,2,7,3,5, 8..15]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vldmia	$const, {@XMM[12]}		@ .LISR</div><div class='del'>-	ite	eq				@ Thumb2 thing, sanity check in ARM</div><div class='del'>-	addeq	$const,$const,#0x10</div><div class='del'>-	bne	.Ldec_loop</div><div class='del'>-	vldmia	$const, {@XMM[12]}		@ .LISRM0</div><div class='del'>-	b	.Ldec_loop</div><div class='del'>-.align	4</div><div class='del'>-.Ldec_done:</div><div class='del'>-___</div><div class='del'>-	&amp;bitslice	(@XMM[0,1,6,4,2,7,3,5, 8..11]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vldmia	$key, {@XMM[8]}			@ last round key</div><div class='del'>-	veor	@XMM[6], @XMM[6], @XMM[8]</div><div class='del'>-	veor	@XMM[4], @XMM[4], @XMM[8]</div><div class='del'>-	veor	@XMM[2], @XMM[2], @XMM[8]</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[8]</div><div class='del'>-	veor	@XMM[3], @XMM[3], @XMM[8]</div><div class='del'>-	veor	@XMM[5], @XMM[5], @XMM[8]</div><div class='del'>-	veor	@XMM[0], @XMM[0], @XMM[8]</div><div class='del'>-	veor	@XMM[1], @XMM[1], @XMM[8]</div><div class='del'>-	bx	lr</div><div class='del'>-.size	_bsaes_decrypt8,.-_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-.type	_bsaes_const,%object</div><div class='del'>-.align	6</div><div class='del'>-_bsaes_const:</div><div class='del'>-.LM0ISR:	@ InvShiftRows constants</div><div class='del'>-	.quad	0x0a0e0206070b0f03, 0x0004080c0d010509</div><div class='del'>-.LISR:</div><div class='del'>-	.quad	0x0504070602010003, 0x0f0e0d0c080b0a09</div><div class='del'>-.LISRM0:</div><div class='del'>-	.quad	0x01040b0e0205080f, 0x0306090c00070a0d</div><div class='del'>-.LM0SR:		@ ShiftRows constants</div><div class='del'>-	.quad	0x0a0e02060f03070b, 0x0004080c05090d01</div><div class='del'>-.LSR:</div><div class='del'>-	.quad	0x0504070600030201, 0x0f0e0d0c0a09080b</div><div class='del'>-.LSRM0:</div><div class='del'>-	.quad	0x0304090e00050a0f, 0x01060b0c0207080d</div><div class='del'>-.LM0:</div><div class='del'>-	.quad	0x02060a0e03070b0f, 0x0004080c0105090d</div><div class='del'>-.LREVM0SR:</div><div class='del'>-	.quad	0x090d01050c000408, 0x03070b0f060a0e02</div><div class='del'>-.asciz	"Bit-sliced AES for NEON, CRYPTOGAMS by &lt;appro\@openssl.org&gt;"</div><div class='del'>-.align	6</div><div class='del'>-.size	_bsaes_const,.-_bsaes_const</div><div class='del'>-</div><div class='del'>-.type	_bsaes_encrypt8,%function</div><div class='del'>-.align	4</div><div class='del'>-_bsaes_encrypt8:</div><div class='del'>-	adr	$const,_bsaes_encrypt8</div><div class='del'>-	vldmia	$key!, {@XMM[9]}		@ round 0 key</div><div class='del'>-	sub	$const,$const,#_bsaes_encrypt8-.LM0SR</div><div class='del'>-</div><div class='del'>-	vldmia	$const!, {@XMM[8]}		@ .LM0SR</div><div class='del'>-_bsaes_encrypt8_alt:</div><div class='del'>-	veor	@XMM[10], @XMM[0], @XMM[9]	@ xor with round0 key</div><div class='del'>-	veor	@XMM[11], @XMM[1], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[0])`, {@XMM[10]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[0])`, {@XMM[10]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[12], @XMM[2], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[1])`, {@XMM[11]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[1])`, {@XMM[11]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[13], @XMM[3], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[2])`, {@XMM[12]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[2])`, {@XMM[12]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[14], @XMM[4], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[3])`, {@XMM[13]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[3])`, {@XMM[13]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[15], @XMM[5], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[4])`, {@XMM[14]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[4])`, {@XMM[14]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[10], @XMM[6], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[5])`, {@XMM[15]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[5])`, {@XMM[15]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	veor	@XMM[11], @XMM[7], @XMM[9]</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[6])`, {@XMM[10]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[6])`, {@XMM[10]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dlo(@XMM[7])`, {@XMM[11]}, `&amp;Dlo(@XMM[8])`</div><div class='del'>-	 vtbl.8	`&amp;Dhi(@XMM[7])`, {@XMM[11]}, `&amp;Dhi(@XMM[8])`</div><div class='del'>-_bsaes_encrypt8_bitslice:</div><div class='del'>-___</div><div class='del'>-	&amp;bitslice	(@XMM[0..7, 8..11]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	sub	$rounds,$rounds,#1</div><div class='del'>-	b	.Lenc_sbox</div><div class='del'>-.align	4</div><div class='del'>-.Lenc_loop:</div><div class='del'>-___</div><div class='del'>-	&amp;ShiftRows	(@XMM[0..7, 8..12]);</div><div class='del'>-$code.=".Lenc_sbox:\n";</div><div class='del'>-	&amp;Sbox		(@XMM[0..7, 8..15]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	subs	$rounds,$rounds,#1</div><div class='del'>-	bcc	.Lenc_done</div><div class='del'>-___</div><div class='del'>-	&amp;MixColumns	(@XMM[0,1,4,6,3,7,2,5, 8..15]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vldmia	$const, {@XMM[12]}		@ .LSR</div><div class='del'>-	ite	eq				@ Thumb2 thing, samity check in ARM</div><div class='del'>-	addeq	$const,$const,#0x10</div><div class='del'>-	bne	.Lenc_loop</div><div class='del'>-	vldmia	$const, {@XMM[12]}		@ .LSRM0</div><div class='del'>-	b	.Lenc_loop</div><div class='del'>-.align	4</div><div class='del'>-.Lenc_done:</div><div class='del'>-___</div><div class='del'>-	# output in lsb &gt; [t0, t1, t4, t6, t3, t7, t2, t5] &lt; msb</div><div class='del'>-	&amp;bitslice	(@XMM[0,1,4,6,3,7,2,5, 8..11]);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vldmia	$key, {@XMM[8]}			@ last round key</div><div class='del'>-	veor	@XMM[4], @XMM[4], @XMM[8]</div><div class='del'>-	veor	@XMM[6], @XMM[6], @XMM[8]</div><div class='del'>-	veor	@XMM[3], @XMM[3], @XMM[8]</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[8]</div><div class='del'>-	veor	@XMM[2], @XMM[2], @XMM[8]</div><div class='del'>-	veor	@XMM[5], @XMM[5], @XMM[8]</div><div class='del'>-	veor	@XMM[0], @XMM[0], @XMM[8]</div><div class='del'>-	veor	@XMM[1], @XMM[1], @XMM[8]</div><div class='del'>-	bx	lr</div><div class='del'>-.size	_bsaes_encrypt8,.-_bsaes_encrypt8</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-{</div><div class='del'>-my ($out,$inp,$rounds,$const)=("r12","r4","r5","r6");</div><div class='del'>-</div><div class='del'>-sub bitslice_key {</div><div class='del'>-my @x=reverse(@_[0..7]);</div><div class='del'>-my ($bs0,$bs1,$bs2,$t2,$t3)=@_[8..12];</div><div class='del'>-</div><div class='del'>-	&amp;swapmove	(@x[0,1],1,$bs0,$t2,$t3);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	@ &amp;swapmove(@x[2,3],1,$t0,$t2,$t3);</div><div class='del'>-	vmov	@x[2], @x[0]</div><div class='del'>-	vmov	@x[3], @x[1]</div><div class='del'>-___</div><div class='del'>-	#&amp;swapmove2x(@x[4,5,6,7],1,$t0,$t2,$t3);</div><div class='del'>-</div><div class='del'>-	&amp;swapmove2x	(@x[0,2,1,3],2,$bs1,$t2,$t3);</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	@ &amp;swapmove2x(@x[4,6,5,7],2,$t1,$t2,$t3);</div><div class='del'>-	vmov	@x[4], @x[0]</div><div class='del'>-	vmov	@x[6], @x[2]</div><div class='del'>-	vmov	@x[5], @x[1]</div><div class='del'>-	vmov	@x[7], @x[3]</div><div class='del'>-___</div><div class='del'>-	&amp;swapmove2x	(@x[0,4,1,5],4,$bs2,$t2,$t3);</div><div class='del'>-	&amp;swapmove2x	(@x[2,6,3,7],4,$bs2,$t2,$t3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-.type	_bsaes_key_convert,%function</div><div class='del'>-.align	4</div><div class='del'>-_bsaes_key_convert:</div><div class='del'>-	adr	$const,_bsaes_key_convert</div><div class='del'>-	vld1.8	{@XMM[7]},  [$inp]!		@ load round 0 key</div><div class='del'>-	sub	$const,$const,#_bsaes_key_convert-.LM0</div><div class='del'>-	vld1.8	{@XMM[15]}, [$inp]!		@ load round 1 key</div><div class='del'>-</div><div class='del'>-	vmov.i8	@XMM[8],  #0x01			@ bit masks</div><div class='del'>-	vmov.i8	@XMM[9],  #0x02</div><div class='del'>-	vmov.i8	@XMM[10], #0x04</div><div class='del'>-	vmov.i8	@XMM[11], #0x08</div><div class='del'>-	vmov.i8	@XMM[12], #0x10</div><div class='del'>-	vmov.i8	@XMM[13], #0x20</div><div class='del'>-	vldmia	$const, {@XMM[14]}		@ .LM0</div><div class='del'>-</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	vrev32.8	@XMM[7],  @XMM[7]</div><div class='del'>-	vrev32.8	@XMM[15], @XMM[15]</div><div class='del'>-#endif</div><div class='del'>-	sub	$rounds,$rounds,#1</div><div class='del'>-	vstmia	$out!, {@XMM[7]}		@ save round 0 key</div><div class='del'>-	b	.Lkey_loop</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lkey_loop:</div><div class='del'>-	vtbl.8	`&amp;Dlo(@XMM[7])`,{@XMM[15]},`&amp;Dlo(@XMM[14])`</div><div class='del'>-	vtbl.8	`&amp;Dhi(@XMM[7])`,{@XMM[15]},`&amp;Dhi(@XMM[14])`</div><div class='del'>-	vmov.i8	@XMM[6],  #0x40</div><div class='del'>-	vmov.i8	@XMM[15], #0x80</div><div class='del'>-</div><div class='del'>-	vtst.8	@XMM[0], @XMM[7], @XMM[8]</div><div class='del'>-	vtst.8	@XMM[1], @XMM[7], @XMM[9]</div><div class='del'>-	vtst.8	@XMM[2], @XMM[7], @XMM[10]</div><div class='del'>-	vtst.8	@XMM[3], @XMM[7], @XMM[11]</div><div class='del'>-	vtst.8	@XMM[4], @XMM[7], @XMM[12]</div><div class='del'>-	vtst.8	@XMM[5], @XMM[7], @XMM[13]</div><div class='del'>-	vtst.8	@XMM[6], @XMM[7], @XMM[6]</div><div class='del'>-	vtst.8	@XMM[7], @XMM[7], @XMM[15]</div><div class='del'>-	vld1.8	{@XMM[15]}, [$inp]!		@ load next round key</div><div class='del'>-	vmvn	@XMM[0], @XMM[0]		@ "pnot"</div><div class='del'>-	vmvn	@XMM[1], @XMM[1]</div><div class='del'>-	vmvn	@XMM[5], @XMM[5]</div><div class='del'>-	vmvn	@XMM[6], @XMM[6]</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	vrev32.8	@XMM[15], @XMM[15]</div><div class='del'>-#endif</div><div class='del'>-	subs	$rounds,$rounds,#1</div><div class='del'>-	vstmia	$out!,{@XMM[0]-@XMM[7]}		@ write bit-sliced round key</div><div class='del'>-	bne	.Lkey_loop</div><div class='del'>-</div><div class='del'>-	vmov.i8	@XMM[7],#0x63			@ compose .L63</div><div class='del'>-	@ don't save last round key</div><div class='del'>-	bx	lr</div><div class='del'>-.size	_bsaes_key_convert,.-_bsaes_key_convert</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-if (0) {		# following four functions are unsupported interface</div><div class='del'>-			# used for benchmarking...</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-.globl	bsaes_enc_key_convert</div><div class='del'>-.type	bsaes_enc_key_convert,%function</div><div class='del'>-.align	4</div><div class='del'>-bsaes_enc_key_convert:</div><div class='del'>-	stmdb	sp!,{r4-r6,lr}</div><div class='del'>-	vstmdb	sp!,{d8-d15}		@ ABI specification says so</div><div class='del'>-</div><div class='del'>-	ldr	r5,[$inp,#240]			@ pass rounds</div><div class='del'>-	mov	r4,$inp				@ pass key</div><div class='del'>-	mov	r12,$out			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	veor	@XMM[7],@XMM[7],@XMM[15]	@ fix up last round key</div><div class='del'>-	vstmia	r12, {@XMM[7]}			@ save last round key</div><div class='del'>-</div><div class='del'>-	vldmia	sp!,{d8-d15}</div><div class='del'>-	ldmia	sp!,{r4-r6,pc}</div><div class='del'>-.size	bsaes_enc_key_convert,.-bsaes_enc_key_convert</div><div class='del'>-</div><div class='del'>-.globl	bsaes_encrypt_128</div><div class='del'>-.type	bsaes_encrypt_128,%function</div><div class='del'>-.align	4</div><div class='del'>-bsaes_encrypt_128:</div><div class='del'>-	stmdb	sp!,{r4-r6,lr}</div><div class='del'>-	vstmdb	sp!,{d8-d15}		@ ABI specification says so</div><div class='del'>-.Lenc128_loop:</div><div class='del'>-	vld1.8	{@XMM[0]-@XMM[1]}, [$inp]!	@ load input</div><div class='del'>-	vld1.8	{@XMM[2]-@XMM[3]}, [$inp]!</div><div class='del'>-	mov	r4,$key				@ pass the key</div><div class='del'>-	vld1.8	{@XMM[4]-@XMM[5]}, [$inp]!</div><div class='del'>-	mov	r5,#10				@ pass rounds</div><div class='del'>-	vld1.8	{@XMM[6]-@XMM[7]}, [$inp]!</div><div class='del'>-</div><div class='del'>-	bl	_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vst1.8	{@XMM[0]-@XMM[1]}, [$out]!	@ write output</div><div class='del'>-	vst1.8	{@XMM[4]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[6]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[3]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[7]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[2]}, [$out]!</div><div class='del'>-	subs	$len,$len,#0x80</div><div class='del'>-	vst1.8	{@XMM[5]}, [$out]!</div><div class='del'>-	bhi	.Lenc128_loop</div><div class='del'>-</div><div class='del'>-	vldmia	sp!,{d8-d15}</div><div class='del'>-	ldmia	sp!,{r4-r6,pc}</div><div class='del'>-.size	bsaes_encrypt_128,.-bsaes_encrypt_128</div><div class='del'>-</div><div class='del'>-.globl	bsaes_dec_key_convert</div><div class='del'>-.type	bsaes_dec_key_convert,%function</div><div class='del'>-.align	4</div><div class='del'>-bsaes_dec_key_convert:</div><div class='del'>-	stmdb	sp!,{r4-r6,lr}</div><div class='del'>-	vstmdb	sp!,{d8-d15}		@ ABI specification says so</div><div class='del'>-</div><div class='del'>-	ldr	r5,[$inp,#240]			@ pass rounds</div><div class='del'>-	mov	r4,$inp				@ pass key</div><div class='del'>-	mov	r12,$out			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	vldmia	$out, {@XMM[6]}</div><div class='del'>-	vstmia	r12,  {@XMM[15]}		@ save last round key</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[6]	@ fix up round 0 key</div><div class='del'>-	vstmia	$out, {@XMM[7]}</div><div class='del'>-</div><div class='del'>-	vldmia	sp!,{d8-d15}</div><div class='del'>-	ldmia	sp!,{r4-r6,pc}</div><div class='del'>-.size	bsaes_dec_key_convert,.-bsaes_dec_key_convert</div><div class='del'>-</div><div class='del'>-.globl	bsaes_decrypt_128</div><div class='del'>-.type	bsaes_decrypt_128,%function</div><div class='del'>-.align	4</div><div class='del'>-bsaes_decrypt_128:</div><div class='del'>-	stmdb	sp!,{r4-r6,lr}</div><div class='del'>-	vstmdb	sp!,{d8-d15}		@ ABI specification says so</div><div class='del'>-.Ldec128_loop:</div><div class='del'>-	vld1.8	{@XMM[0]-@XMM[1]}, [$inp]!	@ load input</div><div class='del'>-	vld1.8	{@XMM[2]-@XMM[3]}, [$inp]!</div><div class='del'>-	mov	r4,$key				@ pass the key</div><div class='del'>-	vld1.8	{@XMM[4]-@XMM[5]}, [$inp]!</div><div class='del'>-	mov	r5,#10				@ pass rounds</div><div class='del'>-	vld1.8	{@XMM[6]-@XMM[7]}, [$inp]!</div><div class='del'>-</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vst1.8	{@XMM[0]-@XMM[1]}, [$out]!	@ write output</div><div class='del'>-	vst1.8	{@XMM[6]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[4]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[2]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[7]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[3]}, [$out]!</div><div class='del'>-	subs	$len,$len,#0x80</div><div class='del'>-	vst1.8	{@XMM[5]}, [$out]!</div><div class='del'>-	bhi	.Ldec128_loop</div><div class='del'>-</div><div class='del'>-	vldmia	sp!,{d8-d15}</div><div class='del'>-	ldmia	sp!,{r4-r6,pc}</div><div class='del'>-.size	bsaes_decrypt_128,.-bsaes_decrypt_128</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-{</div><div class='del'>-my ($inp,$out,$len,$key, $ivp,$fp,$rounds)=map("r$_",(0..3,8..10));</div><div class='del'>-my ($keysched)=("sp");</div><div class='del'>-</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-.extern AES_cbc_encrypt</div><div class='del'>-.extern AES_decrypt</div><div class='del'>-</div><div class='del'>-.global	bsaes_cbc_encrypt</div><div class='del'>-.type	bsaes_cbc_encrypt,%function</div><div class='del'>-.align	5</div><div class='del'>-bsaes_cbc_encrypt:</div><div class='del'>-#ifndef	__KERNEL__</div><div class='del'>-	cmp	$len, #128</div><div class='del'>-#ifndef	__thumb__</div><div class='del'>-	blo	AES_cbc_encrypt</div><div class='del'>-#else</div><div class='del'>-	bhs	1f</div><div class='del'>-	b	AES_cbc_encrypt</div><div class='del'>-1:</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	@ it is up to the caller to make sure we are called with enc == 0</div><div class='del'>-</div><div class='del'>-	mov	ip, sp</div><div class='del'>-	stmdb	sp!, {r4-r10, lr}</div><div class='del'>-	VFP_ABI_PUSH</div><div class='del'>-	ldr	$ivp, [ip]			@ IV is 1st arg on the stack</div><div class='del'>-	mov	$len, $len, lsr#4		@ len in 16 byte blocks</div><div class='del'>-	sub	sp, #0x10			@ scratch space to carry over the IV</div><div class='del'>-	mov	$fp, sp				@ save sp</div><div class='del'>-</div><div class='del'>-	ldr	$rounds, [$key, #240]		@ get # of rounds</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	@ allocate the key schedule on the stack</div><div class='del'>-	sub	r12, sp, $rounds, lsl#7		@ 128 bytes per inner round key</div><div class='del'>-	add	r12, #`128-32`			@ sifze of bit-slices key schedule</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	mov	r4, $key			@ pass key</div><div class='del'>-	mov	r5, $rounds			@ pass # of rounds</div><div class='del'>-	mov	sp, r12				@ sp is $keysched</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	vldmia	$keysched, {@XMM[6]}</div><div class='del'>-	vstmia	r12,  {@XMM[15]}		@ save last round key</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[6]	@ fix up round 0 key</div><div class='del'>-	vstmia	$keysched, {@XMM[7]}</div><div class='del'>-#else</div><div class='del'>-	ldr	r12, [$key, #244]</div><div class='del'>-	eors	r12, #1</div><div class='del'>-	beq	0f</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	str	r12, [$key, #244]</div><div class='del'>-	mov	r4, $key			@ pass key</div><div class='del'>-	mov	r5, $rounds			@ pass # of rounds</div><div class='del'>-	add	r12, $key, #248			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	add	r4, $key, #248</div><div class='del'>-	vldmia	r4, {@XMM[6]}</div><div class='del'>-	vstmia	r12, {@XMM[15]}			@ save last round key</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[6]	@ fix up round 0 key</div><div class='del'>-	vstmia	r4, {@XMM[7]}</div><div class='del'>-</div><div class='del'>-.align	2</div><div class='del'>-0:</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	vld1.8	{@XMM[15]}, [$ivp]		@ load IV</div><div class='del'>-	b	.Lcbc_dec_loop</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_loop:</div><div class='del'>-	subs	$len, $len, #0x8</div><div class='del'>-	bmi	.Lcbc_dec_loop_finish</div><div class='del'>-</div><div class='del'>-	vld1.8	{@XMM[0]-@XMM[1]}, [$inp]!	@ load input</div><div class='del'>-	vld1.8	{@XMM[2]-@XMM[3]}, [$inp]!</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	mov	r4, $keysched			@ pass the key</div><div class='del'>-#else</div><div class='del'>-	add	r4, $key, #248</div><div class='del'>-#endif</div><div class='del'>-	vld1.8	{@XMM[4]-@XMM[5]}, [$inp]!</div><div class='del'>-	mov	r5, $rounds</div><div class='del'>-	vld1.8	{@XMM[6]-@XMM[7]}, [$inp]</div><div class='del'>-	sub	$inp, $inp, #0x60</div><div class='del'>-	vstmia	$fp, {@XMM[15]}			@ put aside IV</div><div class='del'>-</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vldmia	$fp, {@XMM[14]}			@ reload IV</div><div class='del'>-	vld1.8	{@XMM[8]-@XMM[9]}, [$inp]!	@ reload input</div><div class='del'>-	veor	@XMM[0], @XMM[0], @XMM[14]	@ ^= IV</div><div class='del'>-	vld1.8	{@XMM[10]-@XMM[11]}, [$inp]!</div><div class='del'>-	veor	@XMM[1], @XMM[1], @XMM[8]</div><div class='del'>-	veor	@XMM[6], @XMM[6], @XMM[9]</div><div class='del'>-	vld1.8	{@XMM[12]-@XMM[13]}, [$inp]!</div><div class='del'>-	veor	@XMM[4], @XMM[4], @XMM[10]</div><div class='del'>-	veor	@XMM[2], @XMM[2], @XMM[11]</div><div class='del'>-	vld1.8	{@XMM[14]-@XMM[15]}, [$inp]!</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[12]</div><div class='del'>-	vst1.8	{@XMM[0]-@XMM[1]}, [$out]!	@ write output</div><div class='del'>-	veor	@XMM[3], @XMM[3], @XMM[13]</div><div class='del'>-	vst1.8	{@XMM[6]}, [$out]!</div><div class='del'>-	veor	@XMM[5], @XMM[5], @XMM[14]</div><div class='del'>-	vst1.8	{@XMM[4]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[2]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[7]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[3]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[5]}, [$out]!</div><div class='del'>-</div><div class='del'>-	b	.Lcbc_dec_loop</div><div class='del'>-</div><div class='del'>-.Lcbc_dec_loop_finish:</div><div class='del'>-	adds	$len, $len, #8</div><div class='del'>-	beq	.Lcbc_dec_done</div><div class='del'>-</div><div class='del'>-	vld1.8	{@XMM[0]}, [$inp]!		@ load input</div><div class='del'>-	cmp	$len, #2</div><div class='del'>-	blo	.Lcbc_dec_one</div><div class='del'>-	vld1.8	{@XMM[1]}, [$inp]!</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	mov	r4, $keysched			@ pass the key</div><div class='del'>-#else</div><div class='del'>-	add	r4, $key, #248</div><div class='del'>-#endif</div><div class='del'>-	mov	r5, $rounds</div><div class='del'>-	vstmia	$fp, {@XMM[15]}			@ put aside IV</div><div class='del'>-	beq	.Lcbc_dec_two</div><div class='del'>-	vld1.8	{@XMM[2]}, [$inp]!</div><div class='del'>-	cmp	$len, #4</div><div class='del'>-	blo	.Lcbc_dec_three</div><div class='del'>-	vld1.8	{@XMM[3]}, [$inp]!</div><div class='del'>-	beq	.Lcbc_dec_four</div><div class='del'>-	vld1.8	{@XMM[4]}, [$inp]!</div><div class='del'>-	cmp	$len, #6</div><div class='del'>-	blo	.Lcbc_dec_five</div><div class='del'>-	vld1.8	{@XMM[5]}, [$inp]!</div><div class='del'>-	beq	.Lcbc_dec_six</div><div class='del'>-	vld1.8	{@XMM[6]}, [$inp]!</div><div class='del'>-	sub	$inp, $inp, #0x70</div><div class='del'>-</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vldmia	$fp, {@XMM[14]}			@ reload IV</div><div class='del'>-	vld1.8	{@XMM[8]-@XMM[9]}, [$inp]!	@ reload input</div><div class='del'>-	veor	@XMM[0], @XMM[0], @XMM[14]	@ ^= IV</div><div class='del'>-	vld1.8	{@XMM[10]-@XMM[11]}, [$inp]!</div><div class='del'>-	veor	@XMM[1], @XMM[1], @XMM[8]</div><div class='del'>-	veor	@XMM[6], @XMM[6], @XMM[9]</div><div class='del'>-	vld1.8	{@XMM[12]-@XMM[13]}, [$inp]!</div><div class='del'>-	veor	@XMM[4], @XMM[4], @XMM[10]</div><div class='del'>-	veor	@XMM[2], @XMM[2], @XMM[11]</div><div class='del'>-	vld1.8	{@XMM[15]}, [$inp]!</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[12]</div><div class='del'>-	vst1.8	{@XMM[0]-@XMM[1]}, [$out]!	@ write output</div><div class='del'>-	veor	@XMM[3], @XMM[3], @XMM[13]</div><div class='del'>-	vst1.8	{@XMM[6]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[4]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[2]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[7]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[3]}, [$out]!</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_six:</div><div class='del'>-	sub	$inp, $inp, #0x60</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-	vldmia	$fp,{@XMM[14]}			@ reload IV</div><div class='del'>-	vld1.8	{@XMM[8]-@XMM[9]}, [$inp]!	@ reload input</div><div class='del'>-	veor	@XMM[0], @XMM[0], @XMM[14]	@ ^= IV</div><div class='del'>-	vld1.8	{@XMM[10]-@XMM[11]}, [$inp]!</div><div class='del'>-	veor	@XMM[1], @XMM[1], @XMM[8]</div><div class='del'>-	veor	@XMM[6], @XMM[6], @XMM[9]</div><div class='del'>-	vld1.8	{@XMM[12]}, [$inp]!</div><div class='del'>-	veor	@XMM[4], @XMM[4], @XMM[10]</div><div class='del'>-	veor	@XMM[2], @XMM[2], @XMM[11]</div><div class='del'>-	vld1.8	{@XMM[15]}, [$inp]!</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[12]</div><div class='del'>-	vst1.8	{@XMM[0]-@XMM[1]}, [$out]!	@ write output</div><div class='del'>-	vst1.8	{@XMM[6]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[4]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[2]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[7]}, [$out]!</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_five:</div><div class='del'>-	sub	$inp, $inp, #0x50</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-	vldmia	$fp, {@XMM[14]}			@ reload IV</div><div class='del'>-	vld1.8	{@XMM[8]-@XMM[9]}, [$inp]!	@ reload input</div><div class='del'>-	veor	@XMM[0], @XMM[0], @XMM[14]	@ ^= IV</div><div class='del'>-	vld1.8	{@XMM[10]-@XMM[11]}, [$inp]!</div><div class='del'>-	veor	@XMM[1], @XMM[1], @XMM[8]</div><div class='del'>-	veor	@XMM[6], @XMM[6], @XMM[9]</div><div class='del'>-	vld1.8	{@XMM[15]}, [$inp]!</div><div class='del'>-	veor	@XMM[4], @XMM[4], @XMM[10]</div><div class='del'>-	vst1.8	{@XMM[0]-@XMM[1]}, [$out]!	@ write output</div><div class='del'>-	veor	@XMM[2], @XMM[2], @XMM[11]</div><div class='del'>-	vst1.8	{@XMM[6]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[4]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[2]}, [$out]!</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_four:</div><div class='del'>-	sub	$inp, $inp, #0x40</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-	vldmia	$fp, {@XMM[14]}			@ reload IV</div><div class='del'>-	vld1.8	{@XMM[8]-@XMM[9]}, [$inp]!	@ reload input</div><div class='del'>-	veor	@XMM[0], @XMM[0], @XMM[14]	@ ^= IV</div><div class='del'>-	vld1.8	{@XMM[10]}, [$inp]!</div><div class='del'>-	veor	@XMM[1], @XMM[1], @XMM[8]</div><div class='del'>-	veor	@XMM[6], @XMM[6], @XMM[9]</div><div class='del'>-	vld1.8	{@XMM[15]}, [$inp]!</div><div class='del'>-	veor	@XMM[4], @XMM[4], @XMM[10]</div><div class='del'>-	vst1.8	{@XMM[0]-@XMM[1]}, [$out]!	@ write output</div><div class='del'>-	vst1.8	{@XMM[6]}, [$out]!</div><div class='del'>-	vst1.8	{@XMM[4]}, [$out]!</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_three:</div><div class='del'>-	sub	$inp, $inp, #0x30</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-	vldmia	$fp, {@XMM[14]}			@ reload IV</div><div class='del'>-	vld1.8	{@XMM[8]-@XMM[9]}, [$inp]!	@ reload input</div><div class='del'>-	veor	@XMM[0], @XMM[0], @XMM[14]	@ ^= IV</div><div class='del'>-	vld1.8	{@XMM[15]}, [$inp]!</div><div class='del'>-	veor	@XMM[1], @XMM[1], @XMM[8]</div><div class='del'>-	veor	@XMM[6], @XMM[6], @XMM[9]</div><div class='del'>-	vst1.8	{@XMM[0]-@XMM[1]}, [$out]!	@ write output</div><div class='del'>-	vst1.8	{@XMM[6]}, [$out]!</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_two:</div><div class='del'>-	sub	$inp, $inp, #0x20</div><div class='del'>-	bl	_bsaes_decrypt8</div><div class='del'>-	vldmia	$fp, {@XMM[14]}			@ reload IV</div><div class='del'>-	vld1.8	{@XMM[8]}, [$inp]!		@ reload input</div><div class='del'>-	veor	@XMM[0], @XMM[0], @XMM[14]	@ ^= IV</div><div class='del'>-	vld1.8	{@XMM[15]}, [$inp]!		@ reload input</div><div class='del'>-	veor	@XMM[1], @XMM[1], @XMM[8]</div><div class='del'>-	vst1.8	{@XMM[0]-@XMM[1]}, [$out]!	@ write output</div><div class='del'>-	b	.Lcbc_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lcbc_dec_one:</div><div class='del'>-	sub	$inp, $inp, #0x10</div><div class='del'>-	mov	$rounds, $out			@ save original out pointer</div><div class='del'>-	mov	$out, $fp			@ use the iv scratch space as out buffer</div><div class='del'>-	mov	r2, $key</div><div class='del'>-	vmov	@XMM[4],@XMM[15]		@ just in case ensure that IV</div><div class='del'>-	vmov	@XMM[5],@XMM[0]			@ and input are preserved</div><div class='del'>-	bl	AES_decrypt</div><div class='del'>-	vld1.8	{@XMM[0]}, [$fp,:64]		@ load result</div><div class='del'>-	veor	@XMM[0], @XMM[0], @XMM[4]	@ ^= IV</div><div class='del'>-	vmov	@XMM[15], @XMM[5]		@ @XMM[5] holds input</div><div class='del'>-	vst1.8	{@XMM[0]}, [$rounds]		@ write output</div><div class='del'>-</div><div class='del'>-.Lcbc_dec_done:</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	vmov.i32	q0, #0</div><div class='del'>-	vmov.i32	q1, #0</div><div class='del'>-.Lcbc_dec_bzero:				@ wipe key schedule [if any]</div><div class='del'>-	vstmia		$keysched!, {q0-q1}</div><div class='del'>-	cmp		$keysched, $fp</div><div class='del'>-	bne		.Lcbc_dec_bzero</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	mov	sp, $fp</div><div class='del'>-	add	sp, #0x10			@ add sp,$fp,#0x10 is no good for thumb</div><div class='del'>-	vst1.8	{@XMM[15]}, [$ivp]		@ return IV</div><div class='del'>-	VFP_ABI_POP</div><div class='del'>-	ldmia	sp!, {r4-r10, pc}</div><div class='del'>-.size	bsaes_cbc_encrypt,.-bsaes_cbc_encrypt</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-{</div><div class='del'>-my ($inp,$out,$len,$key, $ctr,$fp,$rounds)=(map("r$_",(0..3,8..10)));</div><div class='del'>-my $const = "r6";	# shared with _bsaes_encrypt8_alt</div><div class='del'>-my $keysched = "sp";</div><div class='del'>-</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-.extern	AES_encrypt</div><div class='del'>-.global	bsaes_ctr32_encrypt_blocks</div><div class='del'>-.type	bsaes_ctr32_encrypt_blocks,%function</div><div class='del'>-.align	5</div><div class='del'>-bsaes_ctr32_encrypt_blocks:</div><div class='del'>-	cmp	$len, #8			@ use plain AES for</div><div class='del'>-	blo	.Lctr_enc_short			@ small sizes</div><div class='del'>-</div><div class='del'>-	mov	ip, sp</div><div class='del'>-	stmdb	sp!, {r4-r10, lr}</div><div class='del'>-	VFP_ABI_PUSH</div><div class='del'>-	ldr	$ctr, [ip]			@ ctr is 1st arg on the stack</div><div class='del'>-	sub	sp, sp, #0x10			@ scratch space to carry over the ctr</div><div class='del'>-	mov	$fp, sp				@ save sp</div><div class='del'>-</div><div class='del'>-	ldr	$rounds, [$key, #240]		@ get # of rounds</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	@ allocate the key schedule on the stack</div><div class='del'>-	sub	r12, sp, $rounds, lsl#7		@ 128 bytes per inner round key</div><div class='del'>-	add	r12, #`128-32`			@ size of bit-sliced key schedule</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	mov	r4, $key			@ pass key</div><div class='del'>-	mov	r5, $rounds			@ pass # of rounds</div><div class='del'>-	mov	sp, r12				@ sp is $keysched</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	veor	@XMM[7],@XMM[7],@XMM[15]	@ fix up last round key</div><div class='del'>-	vstmia	r12, {@XMM[7]}			@ save last round key</div><div class='del'>-</div><div class='del'>-	vld1.8	{@XMM[0]}, [$ctr]		@ load counter</div><div class='del'>-	add	$ctr, $const, #.LREVM0SR-.LM0	@ borrow $ctr</div><div class='del'>-	vldmia	$keysched, {@XMM[4]}		@ load round0 key</div><div class='del'>-#else</div><div class='del'>-	ldr	r12, [$key, #244]</div><div class='del'>-	eors	r12, #1</div><div class='del'>-	beq	0f</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	str	r12, [$key, #244]</div><div class='del'>-	mov	r4, $key			@ pass key</div><div class='del'>-	mov	r5, $rounds			@ pass # of rounds</div><div class='del'>-	add	r12, $key, #248			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	veor	@XMM[7],@XMM[7],@XMM[15]	@ fix up last round key</div><div class='del'>-	vstmia	r12, {@XMM[7]}			@ save last round key</div><div class='del'>-</div><div class='del'>-.align	2</div><div class='del'>-0:	add	r12, $key, #248</div><div class='del'>-	vld1.8	{@XMM[0]}, [$ctr]		@ load counter</div><div class='del'>-	adrl	$ctr, .LREVM0SR			@ borrow $ctr</div><div class='del'>-	vldmia	r12, {@XMM[4]}			@ load round0 key</div><div class='del'>-	sub	sp, #0x10			@ place for adjusted round0 key</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	vmov.i32	@XMM[8],#1		@ compose 1&lt;&lt;96</div><div class='del'>-	veor		@XMM[9],@XMM[9],@XMM[9]</div><div class='del'>-	vrev32.8	@XMM[0],@XMM[0]</div><div class='del'>-	vext.8		@XMM[8],@XMM[9],@XMM[8],#4</div><div class='del'>-	vrev32.8	@XMM[4],@XMM[4]</div><div class='del'>-	vadd.u32	@XMM[9],@XMM[8],@XMM[8]	@ compose 2&lt;&lt;96</div><div class='del'>-	vstmia	$keysched, {@XMM[4]}		@ save adjusted round0 key</div><div class='del'>-	b	.Lctr_enc_loop</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lctr_enc_loop:</div><div class='del'>-	vadd.u32	@XMM[10], @XMM[8], @XMM[9]	@ compose 3&lt;&lt;96</div><div class='del'>-	vadd.u32	@XMM[1], @XMM[0], @XMM[8]	@ +1</div><div class='del'>-	vadd.u32	@XMM[2], @XMM[0], @XMM[9]	@ +2</div><div class='del'>-	vadd.u32	@XMM[3], @XMM[0], @XMM[10]	@ +3</div><div class='del'>-	vadd.u32	@XMM[4], @XMM[1], @XMM[10]</div><div class='del'>-	vadd.u32	@XMM[5], @XMM[2], @XMM[10]</div><div class='del'>-	vadd.u32	@XMM[6], @XMM[3], @XMM[10]</div><div class='del'>-	vadd.u32	@XMM[7], @XMM[4], @XMM[10]</div><div class='del'>-	vadd.u32	@XMM[10], @XMM[5], @XMM[10]	@ next counter</div><div class='del'>-</div><div class='del'>-	@ Borrow prologue from _bsaes_encrypt8 to use the opportunity</div><div class='del'>-	@ to flip byte order in 32-bit counter</div><div class='del'>-</div><div class='del'>-	vldmia		$keysched, {@XMM[9]}		@ load round0 key</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, $keysched, #0x10		@ pass next round key</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #`248+16`</div><div class='del'>-#endif</div><div class='del'>-	vldmia		$ctr, {@XMM[8]}			@ .LREVM0SR</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	vstmia		$fp, {@XMM[10]}			@ save next counter</div><div class='del'>-	sub		$const, $ctr, #.LREVM0SR-.LSR	@ pass constants</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8_alt</div><div class='del'>-</div><div class='del'>-	subs		$len, $len, #8</div><div class='del'>-	blo		.Lctr_enc_loop_done</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[8]-@XMM[9]}, [$inp]!	@ load input</div><div class='del'>-	vld1.8		{@XMM[10]-@XMM[11]}, [$inp]!</div><div class='del'>-	veor		@XMM[0], @XMM[8]</div><div class='del'>-	veor		@XMM[1], @XMM[9]</div><div class='del'>-	vld1.8		{@XMM[12]-@XMM[13]}, [$inp]!</div><div class='del'>-	veor		@XMM[4], @XMM[10]</div><div class='del'>-	veor		@XMM[6], @XMM[11]</div><div class='del'>-	vld1.8		{@XMM[14]-@XMM[15]}, [$inp]!</div><div class='del'>-	veor		@XMM[3], @XMM[12]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!	@ write output</div><div class='del'>-	veor		@XMM[7], @XMM[13]</div><div class='del'>-	veor		@XMM[2], @XMM[14]</div><div class='del'>-	vst1.8		{@XMM[4]}, [$out]!</div><div class='del'>-	veor		@XMM[5], @XMM[15]</div><div class='del'>-	vst1.8		{@XMM[6]}, [$out]!</div><div class='del'>-	vmov.i32	@XMM[8], #1			@ compose 1&lt;&lt;96</div><div class='del'>-	vst1.8		{@XMM[3]}, [$out]!</div><div class='del'>-	veor		@XMM[9], @XMM[9], @XMM[9]</div><div class='del'>-	vst1.8		{@XMM[7]}, [$out]!</div><div class='del'>-	vext.8		@XMM[8], @XMM[9], @XMM[8], #4</div><div class='del'>-	vst1.8		{@XMM[2]}, [$out]!</div><div class='del'>-	vadd.u32	@XMM[9],@XMM[8],@XMM[8]		@ compose 2&lt;&lt;96</div><div class='del'>-	vst1.8		{@XMM[5]}, [$out]!</div><div class='del'>-	vldmia		$fp, {@XMM[0]}			@ load counter</div><div class='del'>-</div><div class='del'>-	bne		.Lctr_enc_loop</div><div class='del'>-	b		.Lctr_enc_done</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lctr_enc_loop_done:</div><div class='del'>-	add		$len, $len, #8</div><div class='del'>-	vld1.8		{@XMM[8]}, [$inp]!	@ load input</div><div class='del'>-	veor		@XMM[0], @XMM[8]</div><div class='del'>-	vst1.8		{@XMM[0]}, [$out]!	@ write output</div><div class='del'>-	cmp		$len, #2</div><div class='del'>-	blo		.Lctr_enc_done</div><div class='del'>-	vld1.8		{@XMM[9]}, [$inp]!</div><div class='del'>-	veor		@XMM[1], @XMM[9]</div><div class='del'>-	vst1.8		{@XMM[1]}, [$out]!</div><div class='del'>-	beq		.Lctr_enc_done</div><div class='del'>-	vld1.8		{@XMM[10]}, [$inp]!</div><div class='del'>-	veor		@XMM[4], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[4]}, [$out]!</div><div class='del'>-	cmp		$len, #4</div><div class='del'>-	blo		.Lctr_enc_done</div><div class='del'>-	vld1.8		{@XMM[11]}, [$inp]!</div><div class='del'>-	veor		@XMM[6], @XMM[11]</div><div class='del'>-	vst1.8		{@XMM[6]}, [$out]!</div><div class='del'>-	beq		.Lctr_enc_done</div><div class='del'>-	vld1.8		{@XMM[12]}, [$inp]!</div><div class='del'>-	veor		@XMM[3], @XMM[12]</div><div class='del'>-	vst1.8		{@XMM[3]}, [$out]!</div><div class='del'>-	cmp		$len, #6</div><div class='del'>-	blo		.Lctr_enc_done</div><div class='del'>-	vld1.8		{@XMM[13]}, [$inp]!</div><div class='del'>-	veor		@XMM[7], @XMM[13]</div><div class='del'>-	vst1.8		{@XMM[7]}, [$out]!</div><div class='del'>-	beq		.Lctr_enc_done</div><div class='del'>-	vld1.8		{@XMM[14]}, [$inp]</div><div class='del'>-	veor		@XMM[2], @XMM[14]</div><div class='del'>-	vst1.8		{@XMM[2]}, [$out]!</div><div class='del'>-</div><div class='del'>-.Lctr_enc_done:</div><div class='del'>-	vmov.i32	q0, #0</div><div class='del'>-	vmov.i32	q1, #0</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-.Lctr_enc_bzero:			@ wipe key schedule [if any]</div><div class='del'>-	vstmia		$keysched!, {q0-q1}</div><div class='del'>-	cmp		$keysched, $fp</div><div class='del'>-	bne		.Lctr_enc_bzero</div><div class='del'>-#else</div><div class='del'>-	vstmia		$keysched, {q0-q1}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	mov	sp, $fp</div><div class='del'>-	add	sp, #0x10		@ add sp,$fp,#0x10 is no good for thumb</div><div class='del'>-	VFP_ABI_POP</div><div class='del'>-	ldmia	sp!, {r4-r10, pc}	@ return</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lctr_enc_short:</div><div class='del'>-	ldr	ip, [sp]		@ ctr pointer is passed on stack</div><div class='del'>-	stmdb	sp!, {r4-r8, lr}</div><div class='del'>-</div><div class='del'>-	mov	r4, $inp		@ copy arguments</div><div class='del'>-	mov	r5, $out</div><div class='del'>-	mov	r6, $len</div><div class='del'>-	mov	r7, $key</div><div class='del'>-	ldr	r8, [ip, #12]		@ load counter LSW</div><div class='del'>-	vld1.8	{@XMM[1]}, [ip]		@ load whole counter value</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	rev	r8, r8</div><div class='del'>-#endif</div><div class='del'>-	sub	sp, sp, #0x10</div><div class='del'>-	vst1.8	{@XMM[1]}, [sp,:64]	@ copy counter value</div><div class='del'>-	sub	sp, sp, #0x10</div><div class='del'>-</div><div class='del'>-.Lctr_enc_short_loop:</div><div class='del'>-	add	r0, sp, #0x10		@ input counter value</div><div class='del'>-	mov	r1, sp			@ output on the stack</div><div class='del'>-	mov	r2, r7			@ key</div><div class='del'>-</div><div class='del'>-	bl	AES_encrypt</div><div class='del'>-</div><div class='del'>-	vld1.8	{@XMM[0]}, [r4]!	@ load input</div><div class='del'>-	vld1.8	{@XMM[1]}, [sp,:64]	@ load encrypted counter</div><div class='del'>-	add	r8, r8, #1</div><div class='del'>-#ifdef __ARMEL__</div><div class='del'>-	rev	r0, r8</div><div class='del'>-	str	r0, [sp, #0x1c]		@ next counter value</div><div class='del'>-#else</div><div class='del'>-	str	r8, [sp, #0x1c]		@ next counter value</div><div class='del'>-#endif</div><div class='del'>-	veor	@XMM[0],@XMM[0],@XMM[1]</div><div class='del'>-	vst1.8	{@XMM[0]}, [r5]!	@ store output</div><div class='del'>-	subs	r6, r6, #1</div><div class='del'>-	bne	.Lctr_enc_short_loop</div><div class='del'>-</div><div class='del'>-	vmov.i32	q0, #0</div><div class='del'>-	vmov.i32	q1, #0</div><div class='del'>-	vstmia		sp!, {q0-q1}</div><div class='del'>-</div><div class='del'>-	ldmia	sp!, {r4-r8, pc}</div><div class='del'>-.size	bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-{</div><div class='del'>-######################################################################</div><div class='del'>-# void bsaes_xts_[en|de]crypt(const char *inp,char *out,size_t len,</div><div class='del'>-#	const AES_KEY *key1, const AES_KEY *key2,</div><div class='del'>-#	const unsigned char iv[16]);</div><div class='del'>-#</div><div class='del'>-my ($inp,$out,$len,$key,$rounds,$magic,$fp)=(map("r$_",(7..10,1..3)));</div><div class='del'>-my $const="r6";		# returned by _bsaes_key_convert</div><div class='del'>-my $twmask=@XMM[5];</div><div class='del'>-my @T=@XMM[6..7];</div><div class='del'>-</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-.globl	bsaes_xts_encrypt</div><div class='del'>-.type	bsaes_xts_encrypt,%function</div><div class='del'>-.align	4</div><div class='del'>-bsaes_xts_encrypt:</div><div class='del'>-	mov	ip, sp</div><div class='del'>-	stmdb	sp!, {r4-r10, lr}		@ 0x20</div><div class='del'>-	VFP_ABI_PUSH</div><div class='del'>-	mov	r6, sp				@ future $fp</div><div class='del'>-</div><div class='del'>-	mov	$inp, r0</div><div class='del'>-	mov	$out, r1</div><div class='del'>-	mov	$len, r2</div><div class='del'>-	mov	$key, r3</div><div class='del'>-</div><div class='del'>-	sub	r0, sp, #0x10			@ 0x10</div><div class='del'>-	bic	r0, #0xf			@ align at 16 bytes</div><div class='del'>-	mov	sp, r0</div><div class='del'>-</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	ldr	r0, [ip]			@ pointer to input tweak</div><div class='del'>-#else</div><div class='del'>-	@ generate initial tweak</div><div class='del'>-	ldr	r0, [ip, #4]			@ iv[]</div><div class='del'>-	mov	r1, sp</div><div class='del'>-	ldr	r2, [ip, #0]			@ key2</div><div class='del'>-	bl	AES_encrypt</div><div class='del'>-	mov	r0,sp				@ pointer to initial tweak</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ldr	$rounds, [$key, #240]		@ get # of rounds</div><div class='del'>-	mov	$fp, r6</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	@ allocate the key schedule on the stack</div><div class='del'>-	sub	r12, sp, $rounds, lsl#7		@ 128 bytes per inner round key</div><div class='del'>-	@ add	r12, #`128-32`			@ size of bit-sliced key schedule</div><div class='del'>-	sub	r12, #`32+16`			@ place for tweak[9]</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	mov	r4, $key			@ pass key</div><div class='del'>-	mov	r5, $rounds			@ pass # of rounds</div><div class='del'>-	mov	sp, r12</div><div class='del'>-	add	r12, #0x90			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[15]	@ fix up last round key</div><div class='del'>-	vstmia	r12, {@XMM[7]}			@ save last round key</div><div class='del'>-#else</div><div class='del'>-	ldr	r12, [$key, #244]</div><div class='del'>-	eors	r12, #1</div><div class='del'>-	beq	0f</div><div class='del'>-</div><div class='del'>-	str	r12, [$key, #244]</div><div class='del'>-	mov	r4, $key			@ pass key</div><div class='del'>-	mov	r5, $rounds			@ pass # of rounds</div><div class='del'>-	add	r12, $key, #248			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[15]	@ fix up last round key</div><div class='del'>-	vstmia	r12, {@XMM[7]}</div><div class='del'>-</div><div class='del'>-.align	2</div><div class='del'>-0:	sub	sp, #0x90			@ place for tweak[9]</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	vld1.8	{@XMM[8]}, [r0]			@ initial tweak</div><div class='del'>-	adr	$magic, .Lxts_magic</div><div class='del'>-</div><div class='del'>-	subs	$len, #0x80</div><div class='del'>-	blo	.Lxts_enc_short</div><div class='del'>-	b	.Lxts_enc_loop</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_loop:</div><div class='del'>-	vldmia		$magic, {$twmask}	@ load XTS magic</div><div class='del'>-	vshr.s64	@T[0], @XMM[8], #63</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	vand		@T[0], @T[0], $twmask</div><div class='del'>-___</div><div class='del'>-for($i=9;$i&lt;16;$i++) {</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vadd.u64	@XMM[$i], @XMM[$i-1], @XMM[$i-1]</div><div class='del'>-	vst1.64		{@XMM[$i-1]}, [r0,:128]!</div><div class='del'>-	vswp		`&amp;Dhi("@T[0]")`,`&amp;Dlo("@T[0]")`</div><div class='del'>-	vshr.s64	@T[1], @XMM[$i], #63</div><div class='del'>-	veor		@XMM[$i], @XMM[$i], @T[0]</div><div class='del'>-	vand		@T[1], @T[1], $twmask</div><div class='del'>-___</div><div class='del'>-	@T=reverse(@T);</div><div class='del'>-</div><div class='del'>-$code.=&lt;&lt;___ if ($i&gt;=10);</div><div class='del'>-	vld1.8		{@XMM[$i-10]}, [$inp]!</div><div class='del'>-___</div><div class='del'>-$code.=&lt;&lt;___ if ($i&gt;=11);</div><div class='del'>-	veor		@XMM[$i-11], @XMM[$i-11], @XMM[$i-3]</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vadd.u64	@XMM[8], @XMM[15], @XMM[15]</div><div class='del'>-	vst1.64		{@XMM[15]}, [r0,:128]!</div><div class='del'>-	vswp		`&amp;Dhi("@T[0]")`,`&amp;Dlo("@T[0]")`</div><div class='del'>-	veor		@XMM[8], @XMM[8], @T[0]</div><div class='del'>-	vst1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[6]-@XMM[7]}, [$inp]!</div><div class='del'>-	veor		@XMM[5], @XMM[5], @XMM[13]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[6], @XMM[6], @XMM[14]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	veor		@XMM[7], @XMM[7], @XMM[15]</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[ 8]-@XMM[ 9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]-@XMM[11]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	vld1.64		{@XMM[12]-@XMM[13]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[4], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	veor		@XMM[9], @XMM[6], @XMM[11]</div><div class='del'>-	vld1.64		{@XMM[14]-@XMM[15]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[10], @XMM[3], @XMM[12]</div><div class='del'>-	vst1.8		{@XMM[8]-@XMM[9]}, [$out]!</div><div class='del'>-	veor		@XMM[11], @XMM[7], @XMM[13]</div><div class='del'>-	veor		@XMM[12], @XMM[2], @XMM[14]</div><div class='del'>-	vst1.8		{@XMM[10]-@XMM[11]}, [$out]!</div><div class='del'>-	veor		@XMM[13], @XMM[5], @XMM[15]</div><div class='del'>-	vst1.8		{@XMM[12]-@XMM[13]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	subs		$len, #0x80</div><div class='del'>-	bpl		.Lxts_enc_loop</div><div class='del'>-</div><div class='del'>-.Lxts_enc_short:</div><div class='del'>-	adds		$len, #0x70</div><div class='del'>-	bmi		.Lxts_enc_done</div><div class='del'>-</div><div class='del'>-	vldmia		$magic, {$twmask}	@ load XTS magic</div><div class='del'>-	vshr.s64	@T[0], @XMM[8], #63</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	vand		@T[0], @T[0], $twmask</div><div class='del'>-___</div><div class='del'>-for($i=9;$i&lt;16;$i++) {</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vadd.u64	@XMM[$i], @XMM[$i-1], @XMM[$i-1]</div><div class='del'>-	vst1.64		{@XMM[$i-1]}, [r0,:128]!</div><div class='del'>-	vswp		`&amp;Dhi("@T[0]")`,`&amp;Dlo("@T[0]")`</div><div class='del'>-	vshr.s64	@T[1], @XMM[$i], #63</div><div class='del'>-	veor		@XMM[$i], @XMM[$i], @T[0]</div><div class='del'>-	vand		@T[1], @T[1], $twmask</div><div class='del'>-___</div><div class='del'>-	@T=reverse(@T);</div><div class='del'>-</div><div class='del'>-$code.=&lt;&lt;___ if ($i&gt;=10);</div><div class='del'>-	vld1.8		{@XMM[$i-10]}, [$inp]!</div><div class='del'>-	subs		$len, #0x10</div><div class='del'>-	bmi		.Lxts_enc_`$i-9`</div><div class='del'>-___</div><div class='del'>-$code.=&lt;&lt;___ if ($i&gt;=11);</div><div class='del'>-	veor		@XMM[$i-11], @XMM[$i-11], @XMM[$i-3]</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	sub		$len, #0x10</div><div class='del'>-	vst1.64		{@XMM[15]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[6]}, [$inp]!</div><div class='del'>-	veor		@XMM[5], @XMM[5], @XMM[13]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[6], @XMM[6], @XMM[14]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[ 8]-@XMM[ 9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]-@XMM[11]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	vld1.64		{@XMM[12]-@XMM[13]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[4], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	veor		@XMM[9], @XMM[6], @XMM[11]</div><div class='del'>-	vld1.64		{@XMM[14]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[10], @XMM[3], @XMM[12]</div><div class='del'>-	vst1.8		{@XMM[8]-@XMM[9]}, [$out]!</div><div class='del'>-	veor		@XMM[11], @XMM[7], @XMM[13]</div><div class='del'>-	veor		@XMM[12], @XMM[2], @XMM[14]</div><div class='del'>-	vst1.8		{@XMM[10]-@XMM[11]}, [$out]!</div><div class='del'>-	vst1.8		{@XMM[12]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_6:</div><div class='del'>-	vst1.64		{@XMM[14]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		@XMM[4], @XMM[4], @XMM[12]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[5], @XMM[5], @XMM[13]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[ 8]-@XMM[ 9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]-@XMM[11]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	vld1.64		{@XMM[12]-@XMM[13]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[4], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	veor		@XMM[9], @XMM[6], @XMM[11]</div><div class='del'>-	veor		@XMM[10], @XMM[3], @XMM[12]</div><div class='del'>-	vst1.8		{@XMM[8]-@XMM[9]}, [$out]!</div><div class='del'>-	veor		@XMM[11], @XMM[7], @XMM[13]</div><div class='del'>-	vst1.8		{@XMM[10]-@XMM[11]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-</div><div class='del'>-@ put this in range for both ARM and Thumb mode adr instructions</div><div class='del'>-.align	5</div><div class='del'>-.Lxts_magic:</div><div class='del'>-	.quad	1, 0x87</div><div class='del'>-</div><div class='del'>-.align	5</div><div class='del'>-.Lxts_enc_5:</div><div class='del'>-	vst1.64		{@XMM[13]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		@XMM[3], @XMM[3], @XMM[11]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[4], @XMM[4], @XMM[12]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[ 8]-@XMM[ 9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]-@XMM[11]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	vld1.64		{@XMM[12]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[4], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	veor		@XMM[9], @XMM[6], @XMM[11]</div><div class='del'>-	veor		@XMM[10], @XMM[3], @XMM[12]</div><div class='del'>-	vst1.8		{@XMM[8]-@XMM[9]}, [$out]!</div><div class='del'>-	vst1.8		{@XMM[10]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_4:</div><div class='del'>-	vst1.64		{@XMM[12]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		@XMM[2], @XMM[2], @XMM[10]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[3], @XMM[3], @XMM[11]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[ 8]-@XMM[ 9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]-@XMM[11]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[4], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	veor		@XMM[9], @XMM[6], @XMM[11]</div><div class='del'>-	vst1.8		{@XMM[8]-@XMM[9]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_3:</div><div class='del'>-	vst1.64		{@XMM[11]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[9]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[2], @XMM[2], @XMM[10]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]-@XMM[9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[4], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	vst1.8		{@XMM[8]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_2:</div><div class='del'>-	vst1.64		{@XMM[10]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[8]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[9]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_encrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]-@XMM[9]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_enc_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_enc_1:</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	veor		@XMM[0], @XMM[8]</div><div class='del'>-	mov		r1, sp</div><div class='del'>-	vst1.8		{@XMM[0]}, [sp,:128]</div><div class='del'>-	mov		r2, $key</div><div class='del'>-	mov		r4, $fp				@ preserve fp</div><div class='del'>-</div><div class='del'>-	bl		AES_encrypt</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[0]}, [sp,:128]</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[8]</div><div class='del'>-	vst1.8		{@XMM[0]}, [$out]!</div><div class='del'>-	mov		$fp, r4</div><div class='del'>-</div><div class='del'>-	vmov		@XMM[8], @XMM[9]		@ next round tweak</div><div class='del'>-</div><div class='del'>-.Lxts_enc_done:</div><div class='del'>-#ifndef	XTS_CHAIN_TWEAK</div><div class='del'>-	adds		$len, #0x10</div><div class='del'>-	beq		.Lxts_enc_ret</div><div class='del'>-	sub		r6, $out, #0x10</div><div class='del'>-</div><div class='del'>-.Lxts_enc_steal:</div><div class='del'>-	ldrb		r0, [$inp], #1</div><div class='del'>-	ldrb		r1, [$out, #-0x10]</div><div class='del'>-	strb		r0, [$out, #-0x10]</div><div class='del'>-	strb		r1, [$out], #1</div><div class='del'>-</div><div class='del'>-	subs		$len, #1</div><div class='del'>-	bhi		.Lxts_enc_steal</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[0]}, [r6]</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[8]</div><div class='del'>-	mov		r1, sp</div><div class='del'>-	vst1.8		{@XMM[0]}, [sp,:128]</div><div class='del'>-	mov		r2, $key</div><div class='del'>-	mov		r4, $fp			@ preserve fp</div><div class='del'>-</div><div class='del'>-	bl		AES_encrypt</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[0]}, [sp,:128]</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[8]</div><div class='del'>-	vst1.8		{@XMM[0]}, [r6]</div><div class='del'>-	mov		$fp, r4</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-.Lxts_enc_ret:</div><div class='del'>-	bic		r0, $fp, #0xf</div><div class='del'>-	vmov.i32	q0, #0</div><div class='del'>-	vmov.i32	q1, #0</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	ldr		r1, [$fp, #0x20+VFP_ABI_FRAME]	@ chain tweak</div><div class='del'>-#endif</div><div class='del'>-.Lxts_enc_bzero:				@ wipe key schedule [if any]</div><div class='del'>-	vstmia		sp!, {q0-q1}</div><div class='del'>-	cmp		sp, r0</div><div class='del'>-	bne		.Lxts_enc_bzero</div><div class='del'>-</div><div class='del'>-	mov		sp, $fp</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	vst1.8		{@XMM[8]}, [r1]</div><div class='del'>-#endif</div><div class='del'>-	VFP_ABI_POP</div><div class='del'>-	ldmia		sp!, {r4-r10, pc}	@ return</div><div class='del'>-</div><div class='del'>-.size	bsaes_xts_encrypt,.-bsaes_xts_encrypt</div><div class='del'>-</div><div class='del'>-.globl	bsaes_xts_decrypt</div><div class='del'>-.type	bsaes_xts_decrypt,%function</div><div class='del'>-.align	4</div><div class='del'>-bsaes_xts_decrypt:</div><div class='del'>-	mov	ip, sp</div><div class='del'>-	stmdb	sp!, {r4-r10, lr}		@ 0x20</div><div class='del'>-	VFP_ABI_PUSH</div><div class='del'>-	mov	r6, sp				@ future $fp</div><div class='del'>-</div><div class='del'>-	mov	$inp, r0</div><div class='del'>-	mov	$out, r1</div><div class='del'>-	mov	$len, r2</div><div class='del'>-	mov	$key, r3</div><div class='del'>-</div><div class='del'>-	sub	r0, sp, #0x10			@ 0x10</div><div class='del'>-	bic	r0, #0xf			@ align at 16 bytes</div><div class='del'>-	mov	sp, r0</div><div class='del'>-</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	ldr	r0, [ip]			@ pointer to input tweak</div><div class='del'>-#else</div><div class='del'>-	@ generate initial tweak</div><div class='del'>-	ldr	r0, [ip, #4]			@ iv[]</div><div class='del'>-	mov	r1, sp</div><div class='del'>-	ldr	r2, [ip, #0]			@ key2</div><div class='del'>-	bl	AES_encrypt</div><div class='del'>-	mov	r0, sp				@ pointer to initial tweak</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ldr	$rounds, [$key, #240]		@ get # of rounds</div><div class='del'>-	mov	$fp, r6</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	@ allocate the key schedule on the stack</div><div class='del'>-	sub	r12, sp, $rounds, lsl#7		@ 128 bytes per inner round key</div><div class='del'>-	@ add	r12, #`128-32`			@ size of bit-sliced key schedule</div><div class='del'>-	sub	r12, #`32+16`			@ place for tweak[9]</div><div class='del'>-</div><div class='del'>-	@ populate the key schedule</div><div class='del'>-	mov	r4, $key			@ pass key</div><div class='del'>-	mov	r5, $rounds			@ pass # of rounds</div><div class='del'>-	mov	sp, r12</div><div class='del'>-	add	r12, #0x90			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	add	r4, sp, #0x90</div><div class='del'>-	vldmia	r4, {@XMM[6]}</div><div class='del'>-	vstmia	r12,  {@XMM[15]}		@ save last round key</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[6]	@ fix up round 0 key</div><div class='del'>-	vstmia	r4, {@XMM[7]}</div><div class='del'>-#else</div><div class='del'>-	ldr	r12, [$key, #244]</div><div class='del'>-	eors	r12, #1</div><div class='del'>-	beq	0f</div><div class='del'>-</div><div class='del'>-	str	r12, [$key, #244]</div><div class='del'>-	mov	r4, $key			@ pass key</div><div class='del'>-	mov	r5, $rounds			@ pass # of rounds</div><div class='del'>-	add	r12, $key, #248			@ pass key schedule</div><div class='del'>-	bl	_bsaes_key_convert</div><div class='del'>-	add	r4, $key, #248</div><div class='del'>-	vldmia	r4, {@XMM[6]}</div><div class='del'>-	vstmia	r12,  {@XMM[15]}		@ save last round key</div><div class='del'>-	veor	@XMM[7], @XMM[7], @XMM[6]	@ fix up round 0 key</div><div class='del'>-	vstmia	r4, {@XMM[7]}</div><div class='del'>-</div><div class='del'>-.align	2</div><div class='del'>-0:	sub	sp, #0x90			@ place for tweak[9]</div><div class='del'>-#endif</div><div class='del'>-	vld1.8	{@XMM[8]}, [r0]			@ initial tweak</div><div class='del'>-	adr	$magic, .Lxts_magic</div><div class='del'>-</div><div class='del'>-#ifndef	XTS_CHAIN_TWEAK</div><div class='del'>-	tst	$len, #0xf			@ if not multiple of 16</div><div class='del'>-	it	ne				@ Thumb2 thing, sanity check in ARM</div><div class='del'>-	subne	$len, #0x10			@ subtract another 16 bytes</div><div class='del'>-#endif</div><div class='del'>-	subs	$len, #0x80</div><div class='del'>-</div><div class='del'>-	blo	.Lxts_dec_short</div><div class='del'>-	b	.Lxts_dec_loop</div><div class='del'>-</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_loop:</div><div class='del'>-	vldmia		$magic, {$twmask}	@ load XTS magic</div><div class='del'>-	vshr.s64	@T[0], @XMM[8], #63</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	vand		@T[0], @T[0], $twmask</div><div class='del'>-___</div><div class='del'>-for($i=9;$i&lt;16;$i++) {</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vadd.u64	@XMM[$i], @XMM[$i-1], @XMM[$i-1]</div><div class='del'>-	vst1.64		{@XMM[$i-1]}, [r0,:128]!</div><div class='del'>-	vswp		`&amp;Dhi("@T[0]")`,`&amp;Dlo("@T[0]")`</div><div class='del'>-	vshr.s64	@T[1], @XMM[$i], #63</div><div class='del'>-	veor		@XMM[$i], @XMM[$i], @T[0]</div><div class='del'>-	vand		@T[1], @T[1], $twmask</div><div class='del'>-___</div><div class='del'>-	@T=reverse(@T);</div><div class='del'>-</div><div class='del'>-$code.=&lt;&lt;___ if ($i&gt;=10);</div><div class='del'>-	vld1.8		{@XMM[$i-10]}, [$inp]!</div><div class='del'>-___</div><div class='del'>-$code.=&lt;&lt;___ if ($i&gt;=11);</div><div class='del'>-	veor		@XMM[$i-11], @XMM[$i-11], @XMM[$i-3]</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vadd.u64	@XMM[8], @XMM[15], @XMM[15]</div><div class='del'>-	vst1.64		{@XMM[15]}, [r0,:128]!</div><div class='del'>-	vswp		`&amp;Dhi("@T[0]")`,`&amp;Dlo("@T[0]")`</div><div class='del'>-	veor		@XMM[8], @XMM[8], @T[0]</div><div class='del'>-	vst1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[6]-@XMM[7]}, [$inp]!</div><div class='del'>-	veor		@XMM[5], @XMM[5], @XMM[13]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[6], @XMM[6], @XMM[14]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	veor		@XMM[7], @XMM[7], @XMM[15]</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[ 8]-@XMM[ 9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]-@XMM[11]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	vld1.64		{@XMM[12]-@XMM[13]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[6], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	veor		@XMM[9], @XMM[4], @XMM[11]</div><div class='del'>-	vld1.64		{@XMM[14]-@XMM[15]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[10], @XMM[2], @XMM[12]</div><div class='del'>-	vst1.8		{@XMM[8]-@XMM[9]}, [$out]!</div><div class='del'>-	veor		@XMM[11], @XMM[7], @XMM[13]</div><div class='del'>-	veor		@XMM[12], @XMM[3], @XMM[14]</div><div class='del'>-	vst1.8		{@XMM[10]-@XMM[11]}, [$out]!</div><div class='del'>-	veor		@XMM[13], @XMM[5], @XMM[15]</div><div class='del'>-	vst1.8		{@XMM[12]-@XMM[13]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	subs		$len, #0x80</div><div class='del'>-	bpl		.Lxts_dec_loop</div><div class='del'>-</div><div class='del'>-.Lxts_dec_short:</div><div class='del'>-	adds		$len, #0x70</div><div class='del'>-	bmi		.Lxts_dec_done</div><div class='del'>-</div><div class='del'>-	vldmia		$magic, {$twmask}	@ load XTS magic</div><div class='del'>-	vshr.s64	@T[0], @XMM[8], #63</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	vand		@T[0], @T[0], $twmask</div><div class='del'>-___</div><div class='del'>-for($i=9;$i&lt;16;$i++) {</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	vadd.u64	@XMM[$i], @XMM[$i-1], @XMM[$i-1]</div><div class='del'>-	vst1.64		{@XMM[$i-1]}, [r0,:128]!</div><div class='del'>-	vswp		`&amp;Dhi("@T[0]")`,`&amp;Dlo("@T[0]")`</div><div class='del'>-	vshr.s64	@T[1], @XMM[$i], #63</div><div class='del'>-	veor		@XMM[$i], @XMM[$i], @T[0]</div><div class='del'>-	vand		@T[1], @T[1], $twmask</div><div class='del'>-___</div><div class='del'>-	@T=reverse(@T);</div><div class='del'>-</div><div class='del'>-$code.=&lt;&lt;___ if ($i&gt;=10);</div><div class='del'>-	vld1.8		{@XMM[$i-10]}, [$inp]!</div><div class='del'>-	subs		$len, #0x10</div><div class='del'>-	bmi		.Lxts_dec_`$i-9`</div><div class='del'>-___</div><div class='del'>-$code.=&lt;&lt;___ if ($i&gt;=11);</div><div class='del'>-	veor		@XMM[$i-11], @XMM[$i-11], @XMM[$i-3]</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-	sub		$len, #0x10</div><div class='del'>-	vst1.64		{@XMM[15]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[6]}, [$inp]!</div><div class='del'>-	veor		@XMM[5], @XMM[5], @XMM[13]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[6], @XMM[6], @XMM[14]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[ 8]-@XMM[ 9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]-@XMM[11]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	vld1.64		{@XMM[12]-@XMM[13]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[6], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	veor		@XMM[9], @XMM[4], @XMM[11]</div><div class='del'>-	vld1.64		{@XMM[14]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[10], @XMM[2], @XMM[12]</div><div class='del'>-	vst1.8		{@XMM[8]-@XMM[9]}, [$out]!</div><div class='del'>-	veor		@XMM[11], @XMM[7], @XMM[13]</div><div class='del'>-	veor		@XMM[12], @XMM[3], @XMM[14]</div><div class='del'>-	vst1.8		{@XMM[10]-@XMM[11]}, [$out]!</div><div class='del'>-	vst1.8		{@XMM[12]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_6:</div><div class='del'>-	vst1.64		{@XMM[14]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		@XMM[4], @XMM[4], @XMM[12]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[5], @XMM[5], @XMM[13]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[ 8]-@XMM[ 9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]-@XMM[11]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	vld1.64		{@XMM[12]-@XMM[13]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[6], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	veor		@XMM[9], @XMM[4], @XMM[11]</div><div class='del'>-	veor		@XMM[10], @XMM[2], @XMM[12]</div><div class='del'>-	vst1.8		{@XMM[8]-@XMM[9]}, [$out]!</div><div class='del'>-	veor		@XMM[11], @XMM[7], @XMM[13]</div><div class='del'>-	vst1.8		{@XMM[10]-@XMM[11]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_5:</div><div class='del'>-	vst1.64		{@XMM[13]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		@XMM[3], @XMM[3], @XMM[11]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[4], @XMM[4], @XMM[12]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[ 8]-@XMM[ 9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]-@XMM[11]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	vld1.64		{@XMM[12]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[6], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	veor		@XMM[9], @XMM[4], @XMM[11]</div><div class='del'>-	veor		@XMM[10], @XMM[2], @XMM[12]</div><div class='del'>-	vst1.8		{@XMM[8]-@XMM[9]}, [$out]!</div><div class='del'>-	vst1.8		{@XMM[10]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_4:</div><div class='del'>-	vst1.64		{@XMM[12]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		@XMM[2], @XMM[2], @XMM[10]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[3], @XMM[3], @XMM[11]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[ 8]-@XMM[ 9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]-@XMM[11]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[6], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	veor		@XMM[9], @XMM[4], @XMM[11]</div><div class='del'>-	vst1.8		{@XMM[8]-@XMM[9]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_3:</div><div class='del'>-	vst1.64		{@XMM[11]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[9]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[2], @XMM[2], @XMM[10]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]-@XMM[9]}, [r0,:128]!</div><div class='del'>-	vld1.64		{@XMM[10]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	veor		@XMM[8], @XMM[6], @XMM[10]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-	vst1.8		{@XMM[8]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_2:</div><div class='del'>-	vst1.64		{@XMM[10]}, [r0,:128]		@ next round tweak</div><div class='del'>-</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[8]</div><div class='del'>-#ifndef	BSAES_ASM_EXTENDED_KEY</div><div class='del'>-	add		r4, sp, #0x90			@ pass key schedule</div><div class='del'>-#else</div><div class='del'>-	add		r4, $key, #248			@ pass key schedule</div><div class='del'>-#endif</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[9]</div><div class='del'>-	mov		r5, $rounds			@ pass rounds</div><div class='del'>-	mov		r0, sp</div><div class='del'>-</div><div class='del'>-	bl		_bsaes_decrypt8</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]-@XMM[9]}, [r0,:128]!</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[ 8]</div><div class='del'>-	veor		@XMM[1], @XMM[1], @XMM[ 9]</div><div class='del'>-	vst1.8		{@XMM[0]-@XMM[1]}, [$out]!</div><div class='del'>-</div><div class='del'>-	vld1.64		{@XMM[8]}, [r0,:128]		@ next round tweak</div><div class='del'>-	b		.Lxts_dec_done</div><div class='del'>-.align	4</div><div class='del'>-.Lxts_dec_1:</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	veor		@XMM[0], @XMM[8]</div><div class='del'>-	mov		r1, sp</div><div class='del'>-	vst1.8		{@XMM[0]}, [sp,:128]</div><div class='del'>-	mov		r2, $key</div><div class='del'>-	mov		r4, $fp				@ preserve fp</div><div class='del'>-	mov		r5, $magic			@ preserve magic</div><div class='del'>-</div><div class='del'>-	bl		AES_decrypt</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[0]}, [sp,:128]</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[8]</div><div class='del'>-	vst1.8		{@XMM[0]}, [$out]!</div><div class='del'>-	mov		$fp, r4</div><div class='del'>-	mov		$magic, r5</div><div class='del'>-</div><div class='del'>-	vmov		@XMM[8], @XMM[9]		@ next round tweak</div><div class='del'>-</div><div class='del'>-.Lxts_dec_done:</div><div class='del'>-#ifndef	XTS_CHAIN_TWEAK</div><div class='del'>-	adds		$len, #0x10</div><div class='del'>-	beq		.Lxts_dec_ret</div><div class='del'>-</div><div class='del'>-	@ calculate one round of extra tweak for the stolen ciphertext</div><div class='del'>-	vldmia		$magic, {$twmask}</div><div class='del'>-	vshr.s64	@XMM[6], @XMM[8], #63</div><div class='del'>-	vand		@XMM[6], @XMM[6], $twmask</div><div class='del'>-	vadd.u64	@XMM[9], @XMM[8], @XMM[8]</div><div class='del'>-	vswp		`&amp;Dhi("@XMM[6]")`,`&amp;Dlo("@XMM[6]")`</div><div class='del'>-	veor		@XMM[9], @XMM[9], @XMM[6]</div><div class='del'>-</div><div class='del'>-	@ perform the final decryption with the last tweak value</div><div class='del'>-	vld1.8		{@XMM[0]}, [$inp]!</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[9]</div><div class='del'>-	mov		r1, sp</div><div class='del'>-	vst1.8		{@XMM[0]}, [sp,:128]</div><div class='del'>-	mov		r2, $key</div><div class='del'>-	mov		r4, $fp			@ preserve fp</div><div class='del'>-</div><div class='del'>-	bl		AES_decrypt</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[0]}, [sp,:128]</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[9]</div><div class='del'>-	vst1.8		{@XMM[0]}, [$out]</div><div class='del'>-</div><div class='del'>-	mov		r6, $out</div><div class='del'>-.Lxts_dec_steal:</div><div class='del'>-	ldrb		r1, [$out]</div><div class='del'>-	ldrb		r0, [$inp], #1</div><div class='del'>-	strb		r1, [$out, #0x10]</div><div class='del'>-	strb		r0, [$out], #1</div><div class='del'>-</div><div class='del'>-	subs		$len, #1</div><div class='del'>-	bhi		.Lxts_dec_steal</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[0]}, [r6]</div><div class='del'>-	mov		r0, sp</div><div class='del'>-	veor		@XMM[0], @XMM[8]</div><div class='del'>-	mov		r1, sp</div><div class='del'>-	vst1.8		{@XMM[0]}, [sp,:128]</div><div class='del'>-	mov		r2, $key</div><div class='del'>-</div><div class='del'>-	bl		AES_decrypt</div><div class='del'>-</div><div class='del'>-	vld1.8		{@XMM[0]}, [sp,:128]</div><div class='del'>-	veor		@XMM[0], @XMM[0], @XMM[8]</div><div class='del'>-	vst1.8		{@XMM[0]}, [r6]</div><div class='del'>-	mov		$fp, r4</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-.Lxts_dec_ret:</div><div class='del'>-	bic		r0, $fp, #0xf</div><div class='del'>-	vmov.i32	q0, #0</div><div class='del'>-	vmov.i32	q1, #0</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	ldr		r1, [$fp, #0x20+VFP_ABI_FRAME]	@ chain tweak</div><div class='del'>-#endif</div><div class='del'>-.Lxts_dec_bzero:				@ wipe key schedule [if any]</div><div class='del'>-	vstmia		sp!, {q0-q1}</div><div class='del'>-	cmp		sp, r0</div><div class='del'>-	bne		.Lxts_dec_bzero</div><div class='del'>-</div><div class='del'>-	mov		sp, $fp</div><div class='del'>-#ifdef	XTS_CHAIN_TWEAK</div><div class='del'>-	vst1.8		{@XMM[8]}, [r1]</div><div class='del'>-#endif</div><div class='del'>-	VFP_ABI_POP</div><div class='del'>-	ldmia		sp!, {r4-r10, pc}	@ return</div><div class='del'>-</div><div class='del'>-.size	bsaes_xts_decrypt,.-bsaes_xts_decrypt</div><div class='del'>-___</div><div class='del'>-}</div><div class='del'>-$code.=&lt;&lt;___;</div><div class='del'>-#endif</div><div class='del'>-___</div><div class='del'>-</div><div class='del'>-$code =~ s/\`([^\`]*)\`/eval($1)/gem;</div><div class='del'>-</div><div class='del'>-open SELF,$0;</div><div class='del'>-while(&lt;SELF&gt;) {</div><div class='del'>-	next if (/^#!/);</div><div class='del'>-        last if (!s/^#/@/ and !/^$/);</div><div class='del'>-        print;</div><div class='del'>-}</div><div class='del'>-close SELF;</div><div class='del'>-</div><div class='del'>-print $code;</div><div class='del'>-</div><div class='del'>-close STDOUT;</div><div class='head'>diff --git a/arch/arm/crypto/chacha20-neon-core.S b/arch/arm/crypto/chacha20-neon-core.S<br/>new file mode 100644<br/>index 000000000000..3fecb2124c35<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/chacha20-neon-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/chacha20-neon-core.S</a></div><div class='hunk'>@@ -0,0 +1,523 @@</div><div class='add'>+/*</div><div class='add'>+ * ChaCha20 256-bit cipher algorithm, RFC7539, ARM NEON functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro, Ltd. &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Based on:</div><div class='add'>+ * ChaCha20 256-bit cipher algorithm, RFC7539, x64 SSE3 functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015 Martin Willi</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+	.fpu		neon</div><div class='add'>+	.align		5</div><div class='add'>+</div><div class='add'>+ENTRY(chacha20_block_xor_neon)</div><div class='add'>+	// r0: Input state matrix, s</div><div class='add'>+	// r1: 1 data block output, o</div><div class='add'>+	// r2: 1 data block input, i</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// This function encrypts one ChaCha20 block by loading the state matrix</div><div class='add'>+	// in four NEON registers. It performs matrix operation on four words in</div><div class='add'>+	// parallel, but requireds shuffling to rearrange the words after each</div><div class='add'>+	// round.</div><div class='add'>+	//</div><div class='add'>+</div><div class='add'>+	// x0..3 = s0..3</div><div class='add'>+	add		ip, r0, #0x20</div><div class='add'>+	vld1.32		{q0-q1}, [r0]</div><div class='add'>+	vld1.32		{q2-q3}, [ip]</div><div class='add'>+</div><div class='add'>+	vmov		q8, q0</div><div class='add'>+	vmov		q9, q1</div><div class='add'>+	vmov		q10, q2</div><div class='add'>+	vmov		q11, q3</div><div class='add'>+</div><div class='add'>+	mov		r3, #10</div><div class='add'>+</div><div class='add'>+.Ldoubleround:</div><div class='add'>+	// x0 += x1, x3 = rotl32(x3 ^ x0, 16)</div><div class='add'>+	vadd.i32	q0, q0, q1</div><div class='add'>+	veor		q4, q3, q0</div><div class='add'>+	vshl.u32	q3, q4, #16</div><div class='add'>+	vsri.u32	q3, q4, #16</div><div class='add'>+</div><div class='add'>+	// x2 += x3, x1 = rotl32(x1 ^ x2, 12)</div><div class='add'>+	vadd.i32	q2, q2, q3</div><div class='add'>+	veor		q4, q1, q2</div><div class='add'>+	vshl.u32	q1, q4, #12</div><div class='add'>+	vsri.u32	q1, q4, #20</div><div class='add'>+</div><div class='add'>+	// x0 += x1, x3 = rotl32(x3 ^ x0, 8)</div><div class='add'>+	vadd.i32	q0, q0, q1</div><div class='add'>+	veor		q4, q3, q0</div><div class='add'>+	vshl.u32	q3, q4, #8</div><div class='add'>+	vsri.u32	q3, q4, #24</div><div class='add'>+</div><div class='add'>+	// x2 += x3, x1 = rotl32(x1 ^ x2, 7)</div><div class='add'>+	vadd.i32	q2, q2, q3</div><div class='add'>+	veor		q4, q1, q2</div><div class='add'>+	vshl.u32	q1, q4, #7</div><div class='add'>+	vsri.u32	q1, q4, #25</div><div class='add'>+</div><div class='add'>+	// x1 = shuffle32(x1, MASK(0, 3, 2, 1))</div><div class='add'>+	vext.8		q1, q1, q1, #4</div><div class='add'>+	// x2 = shuffle32(x2, MASK(1, 0, 3, 2))</div><div class='add'>+	vext.8		q2, q2, q2, #8</div><div class='add'>+	// x3 = shuffle32(x3, MASK(2, 1, 0, 3))</div><div class='add'>+	vext.8		q3, q3, q3, #12</div><div class='add'>+</div><div class='add'>+	// x0 += x1, x3 = rotl32(x3 ^ x0, 16)</div><div class='add'>+	vadd.i32	q0, q0, q1</div><div class='add'>+	veor		q4, q3, q0</div><div class='add'>+	vshl.u32	q3, q4, #16</div><div class='add'>+	vsri.u32	q3, q4, #16</div><div class='add'>+</div><div class='add'>+	// x2 += x3, x1 = rotl32(x1 ^ x2, 12)</div><div class='add'>+	vadd.i32	q2, q2, q3</div><div class='add'>+	veor		q4, q1, q2</div><div class='add'>+	vshl.u32	q1, q4, #12</div><div class='add'>+	vsri.u32	q1, q4, #20</div><div class='add'>+</div><div class='add'>+	// x0 += x1, x3 = rotl32(x3 ^ x0, 8)</div><div class='add'>+	vadd.i32	q0, q0, q1</div><div class='add'>+	veor		q4, q3, q0</div><div class='add'>+	vshl.u32	q3, q4, #8</div><div class='add'>+	vsri.u32	q3, q4, #24</div><div class='add'>+</div><div class='add'>+	// x2 += x3, x1 = rotl32(x1 ^ x2, 7)</div><div class='add'>+	vadd.i32	q2, q2, q3</div><div class='add'>+	veor		q4, q1, q2</div><div class='add'>+	vshl.u32	q1, q4, #7</div><div class='add'>+	vsri.u32	q1, q4, #25</div><div class='add'>+</div><div class='add'>+	// x1 = shuffle32(x1, MASK(2, 1, 0, 3))</div><div class='add'>+	vext.8		q1, q1, q1, #12</div><div class='add'>+	// x2 = shuffle32(x2, MASK(1, 0, 3, 2))</div><div class='add'>+	vext.8		q2, q2, q2, #8</div><div class='add'>+	// x3 = shuffle32(x3, MASK(0, 3, 2, 1))</div><div class='add'>+	vext.8		q3, q3, q3, #4</div><div class='add'>+</div><div class='add'>+	subs		r3, r3, #1</div><div class='add'>+	bne		.Ldoubleround</div><div class='add'>+</div><div class='add'>+	add		ip, r2, #0x20</div><div class='add'>+	vld1.8		{q4-q5}, [r2]</div><div class='add'>+	vld1.8		{q6-q7}, [ip]</div><div class='add'>+</div><div class='add'>+	// o0 = i0 ^ (x0 + s0)</div><div class='add'>+	vadd.i32	q0, q0, q8</div><div class='add'>+	veor		q0, q0, q4</div><div class='add'>+</div><div class='add'>+	// o1 = i1 ^ (x1 + s1)</div><div class='add'>+	vadd.i32	q1, q1, q9</div><div class='add'>+	veor		q1, q1, q5</div><div class='add'>+</div><div class='add'>+	// o2 = i2 ^ (x2 + s2)</div><div class='add'>+	vadd.i32	q2, q2, q10</div><div class='add'>+	veor		q2, q2, q6</div><div class='add'>+</div><div class='add'>+	// o3 = i3 ^ (x3 + s3)</div><div class='add'>+	vadd.i32	q3, q3, q11</div><div class='add'>+	veor		q3, q3, q7</div><div class='add'>+</div><div class='add'>+	add		ip, r1, #0x20</div><div class='add'>+	vst1.8		{q0-q1}, [r1]</div><div class='add'>+	vst1.8		{q2-q3}, [ip]</div><div class='add'>+</div><div class='add'>+	bx		lr</div><div class='add'>+ENDPROC(chacha20_block_xor_neon)</div><div class='add'>+</div><div class='add'>+	.align		5</div><div class='add'>+ENTRY(chacha20_4block_xor_neon)</div><div class='add'>+	push		{r4-r6, lr}</div><div class='add'>+	mov		ip, sp			// preserve the stack pointer</div><div class='add'>+	sub		r3, sp, #0x20		// allocate a 32 byte buffer</div><div class='add'>+	bic		r3, r3, #0x1f		// aligned to 32 bytes</div><div class='add'>+	mov		sp, r3</div><div class='add'>+</div><div class='add'>+	// r0: Input state matrix, s</div><div class='add'>+	// r1: 4 data blocks output, o</div><div class='add'>+	// r2: 4 data blocks input, i</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// This function encrypts four consecutive ChaCha20 blocks by loading</div><div class='add'>+	// the state matrix in NEON registers four times. The algorithm performs</div><div class='add'>+	// each operation on the corresponding word of each state matrix, hence</div><div class='add'>+	// requires no word shuffling. For final XORing step we transpose the</div><div class='add'>+	// matrix by interleaving 32- and then 64-bit words, which allows us to</div><div class='add'>+	// do XOR in NEON registers.</div><div class='add'>+	//</div><div class='add'>+</div><div class='add'>+	// x0..15[0-3] = s0..3[0..3]</div><div class='add'>+	add		r3, r0, #0x20</div><div class='add'>+	vld1.32		{q0-q1}, [r0]</div><div class='add'>+	vld1.32		{q2-q3}, [r3]</div><div class='add'>+</div><div class='add'>+	adr		r3, CTRINC</div><div class='add'>+	vdup.32		q15, d7[1]</div><div class='add'>+	vdup.32		q14, d7[0]</div><div class='add'>+	vld1.32		{q11}, [r3, :128]</div><div class='add'>+	vdup.32		q13, d6[1]</div><div class='add'>+	vdup.32		q12, d6[0]</div><div class='add'>+	vadd.i32	q12, q12, q11		// x12 += counter values 0-3</div><div class='add'>+	vdup.32		q11, d5[1]</div><div class='add'>+	vdup.32		q10, d5[0]</div><div class='add'>+	vdup.32		q9, d4[1]</div><div class='add'>+	vdup.32		q8, d4[0]</div><div class='add'>+	vdup.32		q7, d3[1]</div><div class='add'>+	vdup.32		q6, d3[0]</div><div class='add'>+	vdup.32		q5, d2[1]</div><div class='add'>+	vdup.32		q4, d2[0]</div><div class='add'>+	vdup.32		q3, d1[1]</div><div class='add'>+	vdup.32		q2, d1[0]</div><div class='add'>+	vdup.32		q1, d0[1]</div><div class='add'>+	vdup.32		q0, d0[0]</div><div class='add'>+</div><div class='add'>+	mov		r3, #10</div><div class='add'>+</div><div class='add'>+.Ldoubleround4:</div><div class='add'>+	// x0 += x4, x12 = rotl32(x12 ^ x0, 16)</div><div class='add'>+	// x1 += x5, x13 = rotl32(x13 ^ x1, 16)</div><div class='add'>+	// x2 += x6, x14 = rotl32(x14 ^ x2, 16)</div><div class='add'>+	// x3 += x7, x15 = rotl32(x15 ^ x3, 16)</div><div class='add'>+	vadd.i32	q0, q0, q4</div><div class='add'>+	vadd.i32	q1, q1, q5</div><div class='add'>+	vadd.i32	q2, q2, q6</div><div class='add'>+	vadd.i32	q3, q3, q7</div><div class='add'>+</div><div class='add'>+	veor		q12, q12, q0</div><div class='add'>+	veor		q13, q13, q1</div><div class='add'>+	veor		q14, q14, q2</div><div class='add'>+	veor		q15, q15, q3</div><div class='add'>+</div><div class='add'>+	vrev32.16	q12, q12</div><div class='add'>+	vrev32.16	q13, q13</div><div class='add'>+	vrev32.16	q14, q14</div><div class='add'>+	vrev32.16	q15, q15</div><div class='add'>+</div><div class='add'>+	// x8 += x12, x4 = rotl32(x4 ^ x8, 12)</div><div class='add'>+	// x9 += x13, x5 = rotl32(x5 ^ x9, 12)</div><div class='add'>+	// x10 += x14, x6 = rotl32(x6 ^ x10, 12)</div><div class='add'>+	// x11 += x15, x7 = rotl32(x7 ^ x11, 12)</div><div class='add'>+	vadd.i32	q8, q8, q12</div><div class='add'>+	vadd.i32	q9, q9, q13</div><div class='add'>+	vadd.i32	q10, q10, q14</div><div class='add'>+	vadd.i32	q11, q11, q15</div><div class='add'>+</div><div class='add'>+	vst1.32		{q8-q9}, [sp, :256]</div><div class='add'>+</div><div class='add'>+	veor		q8, q4, q8</div><div class='add'>+	veor		q9, q5, q9</div><div class='add'>+	vshl.u32	q4, q8, #12</div><div class='add'>+	vshl.u32	q5, q9, #12</div><div class='add'>+	vsri.u32	q4, q8, #20</div><div class='add'>+	vsri.u32	q5, q9, #20</div><div class='add'>+</div><div class='add'>+	veor		q8, q6, q10</div><div class='add'>+	veor		q9, q7, q11</div><div class='add'>+	vshl.u32	q6, q8, #12</div><div class='add'>+	vshl.u32	q7, q9, #12</div><div class='add'>+	vsri.u32	q6, q8, #20</div><div class='add'>+	vsri.u32	q7, q9, #20</div><div class='add'>+</div><div class='add'>+	// x0 += x4, x12 = rotl32(x12 ^ x0, 8)</div><div class='add'>+	// x1 += x5, x13 = rotl32(x13 ^ x1, 8)</div><div class='add'>+	// x2 += x6, x14 = rotl32(x14 ^ x2, 8)</div><div class='add'>+	// x3 += x7, x15 = rotl32(x15 ^ x3, 8)</div><div class='add'>+	vadd.i32	q0, q0, q4</div><div class='add'>+	vadd.i32	q1, q1, q5</div><div class='add'>+	vadd.i32	q2, q2, q6</div><div class='add'>+	vadd.i32	q3, q3, q7</div><div class='add'>+</div><div class='add'>+	veor		q8, q12, q0</div><div class='add'>+	veor		q9, q13, q1</div><div class='add'>+	vshl.u32	q12, q8, #8</div><div class='add'>+	vshl.u32	q13, q9, #8</div><div class='add'>+	vsri.u32	q12, q8, #24</div><div class='add'>+	vsri.u32	q13, q9, #24</div><div class='add'>+</div><div class='add'>+	veor		q8, q14, q2</div><div class='add'>+	veor		q9, q15, q3</div><div class='add'>+	vshl.u32	q14, q8, #8</div><div class='add'>+	vshl.u32	q15, q9, #8</div><div class='add'>+	vsri.u32	q14, q8, #24</div><div class='add'>+	vsri.u32	q15, q9, #24</div><div class='add'>+</div><div class='add'>+	vld1.32		{q8-q9}, [sp, :256]</div><div class='add'>+</div><div class='add'>+	// x8 += x12, x4 = rotl32(x4 ^ x8, 7)</div><div class='add'>+	// x9 += x13, x5 = rotl32(x5 ^ x9, 7)</div><div class='add'>+	// x10 += x14, x6 = rotl32(x6 ^ x10, 7)</div><div class='add'>+	// x11 += x15, x7 = rotl32(x7 ^ x11, 7)</div><div class='add'>+	vadd.i32	q8, q8, q12</div><div class='add'>+	vadd.i32	q9, q9, q13</div><div class='add'>+	vadd.i32	q10, q10, q14</div><div class='add'>+	vadd.i32	q11, q11, q15</div><div class='add'>+</div><div class='add'>+	vst1.32		{q8-q9}, [sp, :256]</div><div class='add'>+</div><div class='add'>+	veor		q8, q4, q8</div><div class='add'>+	veor		q9, q5, q9</div><div class='add'>+	vshl.u32	q4, q8, #7</div><div class='add'>+	vshl.u32	q5, q9, #7</div><div class='add'>+	vsri.u32	q4, q8, #25</div><div class='add'>+	vsri.u32	q5, q9, #25</div><div class='add'>+</div><div class='add'>+	veor		q8, q6, q10</div><div class='add'>+	veor		q9, q7, q11</div><div class='add'>+	vshl.u32	q6, q8, #7</div><div class='add'>+	vshl.u32	q7, q9, #7</div><div class='add'>+	vsri.u32	q6, q8, #25</div><div class='add'>+	vsri.u32	q7, q9, #25</div><div class='add'>+</div><div class='add'>+	vld1.32		{q8-q9}, [sp, :256]</div><div class='add'>+</div><div class='add'>+	// x0 += x5, x15 = rotl32(x15 ^ x0, 16)</div><div class='add'>+	// x1 += x6, x12 = rotl32(x12 ^ x1, 16)</div><div class='add'>+	// x2 += x7, x13 = rotl32(x13 ^ x2, 16)</div><div class='add'>+	// x3 += x4, x14 = rotl32(x14 ^ x3, 16)</div><div class='add'>+	vadd.i32	q0, q0, q5</div><div class='add'>+	vadd.i32	q1, q1, q6</div><div class='add'>+	vadd.i32	q2, q2, q7</div><div class='add'>+	vadd.i32	q3, q3, q4</div><div class='add'>+</div><div class='add'>+	veor		q15, q15, q0</div><div class='add'>+	veor		q12, q12, q1</div><div class='add'>+	veor		q13, q13, q2</div><div class='add'>+	veor		q14, q14, q3</div><div class='add'>+</div><div class='add'>+	vrev32.16	q15, q15</div><div class='add'>+	vrev32.16	q12, q12</div><div class='add'>+	vrev32.16	q13, q13</div><div class='add'>+	vrev32.16	q14, q14</div><div class='add'>+</div><div class='add'>+	// x10 += x15, x5 = rotl32(x5 ^ x10, 12)</div><div class='add'>+	// x11 += x12, x6 = rotl32(x6 ^ x11, 12)</div><div class='add'>+	// x8 += x13, x7 = rotl32(x7 ^ x8, 12)</div><div class='add'>+	// x9 += x14, x4 = rotl32(x4 ^ x9, 12)</div><div class='add'>+	vadd.i32	q10, q10, q15</div><div class='add'>+	vadd.i32	q11, q11, q12</div><div class='add'>+	vadd.i32	q8, q8, q13</div><div class='add'>+	vadd.i32	q9, q9, q14</div><div class='add'>+</div><div class='add'>+	vst1.32		{q8-q9}, [sp, :256]</div><div class='add'>+</div><div class='add'>+	veor		q8, q7, q8</div><div class='add'>+	veor		q9, q4, q9</div><div class='add'>+	vshl.u32	q7, q8, #12</div><div class='add'>+	vshl.u32	q4, q9, #12</div><div class='add'>+	vsri.u32	q7, q8, #20</div><div class='add'>+	vsri.u32	q4, q9, #20</div><div class='add'>+</div><div class='add'>+	veor		q8, q5, q10</div><div class='add'>+	veor		q9, q6, q11</div><div class='add'>+	vshl.u32	q5, q8, #12</div><div class='add'>+	vshl.u32	q6, q9, #12</div><div class='add'>+	vsri.u32	q5, q8, #20</div><div class='add'>+	vsri.u32	q6, q9, #20</div><div class='add'>+</div><div class='add'>+	// x0 += x5, x15 = rotl32(x15 ^ x0, 8)</div><div class='add'>+	// x1 += x6, x12 = rotl32(x12 ^ x1, 8)</div><div class='add'>+	// x2 += x7, x13 = rotl32(x13 ^ x2, 8)</div><div class='add'>+	// x3 += x4, x14 = rotl32(x14 ^ x3, 8)</div><div class='add'>+	vadd.i32	q0, q0, q5</div><div class='add'>+	vadd.i32	q1, q1, q6</div><div class='add'>+	vadd.i32	q2, q2, q7</div><div class='add'>+	vadd.i32	q3, q3, q4</div><div class='add'>+</div><div class='add'>+	veor		q8, q15, q0</div><div class='add'>+	veor		q9, q12, q1</div><div class='add'>+	vshl.u32	q15, q8, #8</div><div class='add'>+	vshl.u32	q12, q9, #8</div><div class='add'>+	vsri.u32	q15, q8, #24</div><div class='add'>+	vsri.u32	q12, q9, #24</div><div class='add'>+</div><div class='add'>+	veor		q8, q13, q2</div><div class='add'>+	veor		q9, q14, q3</div><div class='add'>+	vshl.u32	q13, q8, #8</div><div class='add'>+	vshl.u32	q14, q9, #8</div><div class='add'>+	vsri.u32	q13, q8, #24</div><div class='add'>+	vsri.u32	q14, q9, #24</div><div class='add'>+</div><div class='add'>+	vld1.32		{q8-q9}, [sp, :256]</div><div class='add'>+</div><div class='add'>+	// x10 += x15, x5 = rotl32(x5 ^ x10, 7)</div><div class='add'>+	// x11 += x12, x6 = rotl32(x6 ^ x11, 7)</div><div class='add'>+	// x8 += x13, x7 = rotl32(x7 ^ x8, 7)</div><div class='add'>+	// x9 += x14, x4 = rotl32(x4 ^ x9, 7)</div><div class='add'>+	vadd.i32	q10, q10, q15</div><div class='add'>+	vadd.i32	q11, q11, q12</div><div class='add'>+	vadd.i32	q8, q8, q13</div><div class='add'>+	vadd.i32	q9, q9, q14</div><div class='add'>+</div><div class='add'>+	vst1.32		{q8-q9}, [sp, :256]</div><div class='add'>+</div><div class='add'>+	veor		q8, q7, q8</div><div class='add'>+	veor		q9, q4, q9</div><div class='add'>+	vshl.u32	q7, q8, #7</div><div class='add'>+	vshl.u32	q4, q9, #7</div><div class='add'>+	vsri.u32	q7, q8, #25</div><div class='add'>+	vsri.u32	q4, q9, #25</div><div class='add'>+</div><div class='add'>+	veor		q8, q5, q10</div><div class='add'>+	veor		q9, q6, q11</div><div class='add'>+	vshl.u32	q5, q8, #7</div><div class='add'>+	vshl.u32	q6, q9, #7</div><div class='add'>+	vsri.u32	q5, q8, #25</div><div class='add'>+	vsri.u32	q6, q9, #25</div><div class='add'>+</div><div class='add'>+	subs		r3, r3, #1</div><div class='add'>+	beq		0f</div><div class='add'>+</div><div class='add'>+	vld1.32		{q8-q9}, [sp, :256]</div><div class='add'>+	b		.Ldoubleround4</div><div class='add'>+</div><div class='add'>+	// x0[0-3] += s0[0]</div><div class='add'>+	// x1[0-3] += s0[1]</div><div class='add'>+	// x2[0-3] += s0[2]</div><div class='add'>+	// x3[0-3] += s0[3]</div><div class='add'>+0:	ldmia		r0!, {r3-r6}</div><div class='add'>+	vdup.32		q8, r3</div><div class='add'>+	vdup.32		q9, r4</div><div class='add'>+	vadd.i32	q0, q0, q8</div><div class='add'>+	vadd.i32	q1, q1, q9</div><div class='add'>+	vdup.32		q8, r5</div><div class='add'>+	vdup.32		q9, r6</div><div class='add'>+	vadd.i32	q2, q2, q8</div><div class='add'>+	vadd.i32	q3, q3, q9</div><div class='add'>+</div><div class='add'>+	// x4[0-3] += s1[0]</div><div class='add'>+	// x5[0-3] += s1[1]</div><div class='add'>+	// x6[0-3] += s1[2]</div><div class='add'>+	// x7[0-3] += s1[3]</div><div class='add'>+	ldmia		r0!, {r3-r6}</div><div class='add'>+	vdup.32		q8, r3</div><div class='add'>+	vdup.32		q9, r4</div><div class='add'>+	vadd.i32	q4, q4, q8</div><div class='add'>+	vadd.i32	q5, q5, q9</div><div class='add'>+	vdup.32		q8, r5</div><div class='add'>+	vdup.32		q9, r6</div><div class='add'>+	vadd.i32	q6, q6, q8</div><div class='add'>+	vadd.i32	q7, q7, q9</div><div class='add'>+</div><div class='add'>+	// interleave 32-bit words in state n, n+1</div><div class='add'>+	vzip.32		q0, q1</div><div class='add'>+	vzip.32		q2, q3</div><div class='add'>+	vzip.32		q4, q5</div><div class='add'>+	vzip.32		q6, q7</div><div class='add'>+</div><div class='add'>+	// interleave 64-bit words in state n, n+2</div><div class='add'>+	vswp		d1, d4</div><div class='add'>+	vswp		d3, d6</div><div class='add'>+	vswp		d9, d12</div><div class='add'>+	vswp		d11, d14</div><div class='add'>+</div><div class='add'>+	// xor with corresponding input, write to output</div><div class='add'>+	vld1.8		{q8-q9}, [r2]!</div><div class='add'>+	veor		q8, q8, q0</div><div class='add'>+	veor		q9, q9, q4</div><div class='add'>+	vst1.8		{q8-q9}, [r1]!</div><div class='add'>+</div><div class='add'>+	vld1.32		{q8-q9}, [sp, :256]</div><div class='add'>+</div><div class='add'>+	// x8[0-3] += s2[0]</div><div class='add'>+	// x9[0-3] += s2[1]</div><div class='add'>+	// x10[0-3] += s2[2]</div><div class='add'>+	// x11[0-3] += s2[3]</div><div class='add'>+	ldmia		r0!, {r3-r6}</div><div class='add'>+	vdup.32		q0, r3</div><div class='add'>+	vdup.32		q4, r4</div><div class='add'>+	vadd.i32	q8, q8, q0</div><div class='add'>+	vadd.i32	q9, q9, q4</div><div class='add'>+	vdup.32		q0, r5</div><div class='add'>+	vdup.32		q4, r6</div><div class='add'>+	vadd.i32	q10, q10, q0</div><div class='add'>+	vadd.i32	q11, q11, q4</div><div class='add'>+</div><div class='add'>+	// x12[0-3] += s3[0]</div><div class='add'>+	// x13[0-3] += s3[1]</div><div class='add'>+	// x14[0-3] += s3[2]</div><div class='add'>+	// x15[0-3] += s3[3]</div><div class='add'>+	ldmia		r0!, {r3-r6}</div><div class='add'>+	vdup.32		q0, r3</div><div class='add'>+	vdup.32		q4, r4</div><div class='add'>+	adr		r3, CTRINC</div><div class='add'>+	vadd.i32	q12, q12, q0</div><div class='add'>+	vld1.32		{q0}, [r3, :128]</div><div class='add'>+	vadd.i32	q13, q13, q4</div><div class='add'>+	vadd.i32	q12, q12, q0		// x12 += counter values 0-3</div><div class='add'>+</div><div class='add'>+	vdup.32		q0, r5</div><div class='add'>+	vdup.32		q4, r6</div><div class='add'>+	vadd.i32	q14, q14, q0</div><div class='add'>+	vadd.i32	q15, q15, q4</div><div class='add'>+</div><div class='add'>+	// interleave 32-bit words in state n, n+1</div><div class='add'>+	vzip.32		q8, q9</div><div class='add'>+	vzip.32		q10, q11</div><div class='add'>+	vzip.32		q12, q13</div><div class='add'>+	vzip.32		q14, q15</div><div class='add'>+</div><div class='add'>+	// interleave 64-bit words in state n, n+2</div><div class='add'>+	vswp		d17, d20</div><div class='add'>+	vswp		d19, d22</div><div class='add'>+	vswp		d25, d28</div><div class='add'>+	vswp		d27, d30</div><div class='add'>+</div><div class='add'>+	vmov		q4, q1</div><div class='add'>+</div><div class='add'>+	vld1.8		{q0-q1}, [r2]!</div><div class='add'>+	veor		q0, q0, q8</div><div class='add'>+	veor		q1, q1, q12</div><div class='add'>+	vst1.8		{q0-q1}, [r1]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q0-q1}, [r2]!</div><div class='add'>+	veor		q0, q0, q2</div><div class='add'>+	veor		q1, q1, q6</div><div class='add'>+	vst1.8		{q0-q1}, [r1]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q0-q1}, [r2]!</div><div class='add'>+	veor		q0, q0, q10</div><div class='add'>+	veor		q1, q1, q14</div><div class='add'>+	vst1.8		{q0-q1}, [r1]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q0-q1}, [r2]!</div><div class='add'>+	veor		q0, q0, q4</div><div class='add'>+	veor		q1, q1, q5</div><div class='add'>+	vst1.8		{q0-q1}, [r1]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q0-q1}, [r2]!</div><div class='add'>+	veor		q0, q0, q9</div><div class='add'>+	veor		q1, q1, q13</div><div class='add'>+	vst1.8		{q0-q1}, [r1]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q0-q1}, [r2]!</div><div class='add'>+	veor		q0, q0, q3</div><div class='add'>+	veor		q1, q1, q7</div><div class='add'>+	vst1.8		{q0-q1}, [r1]!</div><div class='add'>+</div><div class='add'>+	vld1.8		{q0-q1}, [r2]</div><div class='add'>+	veor		q0, q0, q11</div><div class='add'>+	veor		q1, q1, q15</div><div class='add'>+	vst1.8		{q0-q1}, [r1]</div><div class='add'>+</div><div class='add'>+	mov		sp, ip</div><div class='add'>+	pop		{r4-r6, pc}</div><div class='add'>+ENDPROC(chacha20_4block_xor_neon)</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+CTRINC:	.word		0, 1, 2, 3</div><div class='head'>diff --git a/arch/arm/crypto/chacha20-neon-glue.c b/arch/arm/crypto/chacha20-neon-glue.c<br/>new file mode 100644<br/>index 000000000000..59a7be08e80c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/chacha20-neon-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/chacha20-neon-glue.c</a></div><div class='hunk'>@@ -0,0 +1,127 @@</div><div class='add'>+/*</div><div class='add'>+ * ChaCha20 256-bit cipher algorithm, RFC7539, ARM NEON functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro, Ltd. &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Based on:</div><div class='add'>+ * ChaCha20 256-bit cipher algorithm, RFC7539, SIMD glue code</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015 Martin Willi</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/chacha20.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='add'>+#include &lt;asm/neon.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='add'>+</div><div class='add'>+asmlinkage void chacha20_block_xor_neon(u32 *state, u8 *dst, const u8 *src);</div><div class='add'>+asmlinkage void chacha20_4block_xor_neon(u32 *state, u8 *dst, const u8 *src);</div><div class='add'>+</div><div class='add'>+static void chacha20_doneon(u32 *state, u8 *dst, const u8 *src,</div><div class='add'>+			    unsigned int bytes)</div><div class='add'>+{</div><div class='add'>+	u8 buf[CHACHA20_BLOCK_SIZE];</div><div class='add'>+</div><div class='add'>+	while (bytes &gt;= CHACHA20_BLOCK_SIZE * 4) {</div><div class='add'>+		chacha20_4block_xor_neon(state, dst, src);</div><div class='add'>+		bytes -= CHACHA20_BLOCK_SIZE * 4;</div><div class='add'>+		src += CHACHA20_BLOCK_SIZE * 4;</div><div class='add'>+		dst += CHACHA20_BLOCK_SIZE * 4;</div><div class='add'>+		state[12] += 4;</div><div class='add'>+	}</div><div class='add'>+	while (bytes &gt;= CHACHA20_BLOCK_SIZE) {</div><div class='add'>+		chacha20_block_xor_neon(state, dst, src);</div><div class='add'>+		bytes -= CHACHA20_BLOCK_SIZE;</div><div class='add'>+		src += CHACHA20_BLOCK_SIZE;</div><div class='add'>+		dst += CHACHA20_BLOCK_SIZE;</div><div class='add'>+		state[12]++;</div><div class='add'>+	}</div><div class='add'>+	if (bytes) {</div><div class='add'>+		memcpy(buf, src, bytes);</div><div class='add'>+		chacha20_block_xor_neon(state, buf, buf);</div><div class='add'>+		memcpy(dst, buf, bytes);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chacha20_neon(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct chacha20_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	u32 state[16];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;cryptlen &lt;= CHACHA20_BLOCK_SIZE || !may_use_simd())</div><div class='add'>+		return crypto_chacha20_crypt(req);</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+</div><div class='add'>+	crypto_chacha20_init(state, ctx, walk.iv);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	while (walk.nbytes &gt; 0) {</div><div class='add'>+		unsigned int nbytes = walk.nbytes;</div><div class='add'>+</div><div class='add'>+		if (nbytes &lt; walk.total)</div><div class='add'>+			nbytes = round_down(nbytes, walk.stride);</div><div class='add'>+</div><div class='add'>+		chacha20_doneon(state, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='add'>+				nbytes);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes - nbytes);</div><div class='add'>+	}</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct skcipher_alg alg = {</div><div class='add'>+	.base.cra_name		= "chacha20",</div><div class='add'>+	.base.cra_driver_name	= "chacha20-neon",</div><div class='add'>+	.base.cra_priority	= 300,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct chacha20_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= CHACHA20_KEY_SIZE,</div><div class='add'>+	.max_keysize		= CHACHA20_KEY_SIZE,</div><div class='add'>+	.ivsize			= CHACHA20_IV_SIZE,</div><div class='add'>+	.chunksize		= CHACHA20_BLOCK_SIZE,</div><div class='add'>+	.walksize		= 4 * CHACHA20_BLOCK_SIZE,</div><div class='add'>+	.setkey			= crypto_chacha20_setkey,</div><div class='add'>+	.encrypt		= chacha20_neon,</div><div class='add'>+	.decrypt		= chacha20_neon,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init chacha20_simd_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	if (!(elf_hwcap &amp; HWCAP_NEON))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return crypto_register_skcipher(&amp;alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit chacha20_simd_mod_fini(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_skcipher(&amp;alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(chacha20_simd_mod_init);</div><div class='add'>+module_exit(chacha20_simd_mod_fini);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS_CRYPTO("chacha20");</div><div class='head'>diff --git a/arch/arm/crypto/crc32-ce-core.S b/arch/arm/crypto/crc32-ce-core.S<br/>new file mode 100644<br/>index 000000000000..5cbd4a6fedad<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/crc32-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/crc32-ce-core.S</a></div><div class='hunk'>@@ -0,0 +1,306 @@</div><div class='add'>+/*</div><div class='add'>+ * Accelerated CRC32(C) using ARM CRC, NEON and Crypto Extensions instructions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* GPL HEADER START</div><div class='add'>+ *</div><div class='add'>+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 only,</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License version 2 for more details (a copy is included</div><div class='add'>+ * in the LICENSE file that accompanied this code).</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * version 2 along with this program; If not, see http://www.gnu.org/licenses</div><div class='add'>+ *</div><div class='add'>+ * Please  visit http://www.xyratex.com/contact if you need additional</div><div class='add'>+ * information or have any questions.</div><div class='add'>+ *</div><div class='add'>+ * GPL HEADER END</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2012 Xyratex Technology Limited</div><div class='add'>+ *</div><div class='add'>+ * Using hardware provided PCLMULQDQ instruction to accelerate the CRC32</div><div class='add'>+ * calculation.</div><div class='add'>+ * CRC32 polynomial:0x04c11db7(BE)/0xEDB88320(LE)</div><div class='add'>+ * PCLMULQDQ is a new instruction in Intel SSE4.2, the reference can be found</div><div class='add'>+ * at:</div><div class='add'>+ * http://www.intel.com/products/processor/manuals/</div><div class='add'>+ * Intel(R) 64 and IA-32 Architectures Software Developer's Manual</div><div class='add'>+ * Volume 2B: Instruction Set Reference, N-Z</div><div class='add'>+ *</div><div class='add'>+ * Authors:   Gregory Prestas &lt;Gregory_Prestas@us.xyratex.com&gt;</div><div class='add'>+ *	      Alexander Boyko &lt;Alexander_Boyko@xyratex.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+	.align		6</div><div class='add'>+	.arch		armv8-a</div><div class='add'>+	.arch_extension	crc</div><div class='add'>+	.fpu		crypto-neon-fp-armv8</div><div class='add'>+</div><div class='add'>+.Lcrc32_constants:</div><div class='add'>+	/*</div><div class='add'>+	 * [x4*128+32 mod P(x) &lt;&lt; 32)]'  &lt;&lt; 1   = 0x154442bd4</div><div class='add'>+	 * #define CONSTANT_R1  0x154442bd4LL</div><div class='add'>+	 *</div><div class='add'>+	 * [(x4*128-32 mod P(x) &lt;&lt; 32)]' &lt;&lt; 1   = 0x1c6e41596</div><div class='add'>+	 * #define CONSTANT_R2  0x1c6e41596LL</div><div class='add'>+	 */</div><div class='add'>+	.quad		0x0000000154442bd4</div><div class='add'>+	.quad		0x00000001c6e41596</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * [(x128+32 mod P(x) &lt;&lt; 32)]'   &lt;&lt; 1   = 0x1751997d0</div><div class='add'>+	 * #define CONSTANT_R3  0x1751997d0LL</div><div class='add'>+	 *</div><div class='add'>+	 * [(x128-32 mod P(x) &lt;&lt; 32)]'   &lt;&lt; 1   = 0x0ccaa009e</div><div class='add'>+	 * #define CONSTANT_R4  0x0ccaa009eLL</div><div class='add'>+	 */</div><div class='add'>+	.quad		0x00000001751997d0</div><div class='add'>+	.quad		0x00000000ccaa009e</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * [(x64 mod P(x) &lt;&lt; 32)]'       &lt;&lt; 1   = 0x163cd6124</div><div class='add'>+	 * #define CONSTANT_R5  0x163cd6124LL</div><div class='add'>+	 */</div><div class='add'>+	.quad		0x0000000163cd6124</div><div class='add'>+	.quad		0x00000000FFFFFFFF</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * #define CRCPOLY_TRUE_LE_FULL 0x1DB710641LL</div><div class='add'>+	 *</div><div class='add'>+	 * Barrett Reduction constant (u64`) = u` = (x**64 / P(x))`</div><div class='add'>+	 *                                                      = 0x1F7011641LL</div><div class='add'>+	 * #define CONSTANT_RU  0x1F7011641LL</div><div class='add'>+	 */</div><div class='add'>+	.quad		0x00000001DB710641</div><div class='add'>+	.quad		0x00000001F7011641</div><div class='add'>+</div><div class='add'>+.Lcrc32c_constants:</div><div class='add'>+	.quad		0x00000000740eef02</div><div class='add'>+	.quad		0x000000009e4addf8</div><div class='add'>+	.quad		0x00000000f20c0dfe</div><div class='add'>+	.quad		0x000000014cd00bd6</div><div class='add'>+	.quad		0x00000000dd45aab8</div><div class='add'>+	.quad		0x00000000FFFFFFFF</div><div class='add'>+	.quad		0x0000000105ec76f0</div><div class='add'>+	.quad		0x00000000dea713f1</div><div class='add'>+</div><div class='add'>+	dCONSTANTl	.req	d0</div><div class='add'>+	dCONSTANTh	.req	d1</div><div class='add'>+	qCONSTANT	.req	q0</div><div class='add'>+</div><div class='add'>+	BUF		.req	r0</div><div class='add'>+	LEN		.req	r1</div><div class='add'>+	CRC		.req	r2</div><div class='add'>+</div><div class='add'>+	qzr		.req	q9</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * Calculate crc32</div><div class='add'>+	 * BUF - buffer</div><div class='add'>+	 * LEN - sizeof buffer (multiple of 16 bytes), LEN should be &gt; 63</div><div class='add'>+	 * CRC - initial crc32</div><div class='add'>+	 * return %eax crc32</div><div class='add'>+	 * uint crc32_pmull_le(unsigned char const *buffer,</div><div class='add'>+	 *                     size_t len, uint crc32)</div><div class='add'>+	 */</div><div class='add'>+ENTRY(crc32_pmull_le)</div><div class='add'>+	adr		r3, .Lcrc32_constants</div><div class='add'>+	b		0f</div><div class='add'>+</div><div class='add'>+ENTRY(crc32c_pmull_le)</div><div class='add'>+	adr		r3, .Lcrc32c_constants</div><div class='add'>+</div><div class='add'>+0:	bic		LEN, LEN, #15</div><div class='add'>+	vld1.8		{q1-q2}, [BUF, :128]!</div><div class='add'>+	vld1.8		{q3-q4}, [BUF, :128]!</div><div class='add'>+	vmov.i8		qzr, #0</div><div class='add'>+	vmov.i8		qCONSTANT, #0</div><div class='add'>+	vmov.32		dCONSTANTl[0], CRC</div><div class='add'>+	veor.8		d2, d2, dCONSTANTl</div><div class='add'>+	sub		LEN, LEN, #0x40</div><div class='add'>+	cmp		LEN, #0x40</div><div class='add'>+	blt		less_64</div><div class='add'>+</div><div class='add'>+	vld1.64		{qCONSTANT}, [r3]</div><div class='add'>+</div><div class='add'>+loop_64:		/* 64 bytes Full cache line folding */</div><div class='add'>+	sub		LEN, LEN, #0x40</div><div class='add'>+</div><div class='add'>+	vmull.p64	q5, d3, dCONSTANTh</div><div class='add'>+	vmull.p64	q6, d5, dCONSTANTh</div><div class='add'>+	vmull.p64	q7, d7, dCONSTANTh</div><div class='add'>+	vmull.p64	q8, d9, dCONSTANTh</div><div class='add'>+</div><div class='add'>+	vmull.p64	q1, d2, dCONSTANTl</div><div class='add'>+	vmull.p64	q2, d4, dCONSTANTl</div><div class='add'>+	vmull.p64	q3, d6, dCONSTANTl</div><div class='add'>+	vmull.p64	q4, d8, dCONSTANTl</div><div class='add'>+</div><div class='add'>+	veor.8		q1, q1, q5</div><div class='add'>+	vld1.8		{q5}, [BUF, :128]!</div><div class='add'>+	veor.8		q2, q2, q6</div><div class='add'>+	vld1.8		{q6}, [BUF, :128]!</div><div class='add'>+	veor.8		q3, q3, q7</div><div class='add'>+	vld1.8		{q7}, [BUF, :128]!</div><div class='add'>+	veor.8		q4, q4, q8</div><div class='add'>+	vld1.8		{q8}, [BUF, :128]!</div><div class='add'>+</div><div class='add'>+	veor.8		q1, q1, q5</div><div class='add'>+	veor.8		q2, q2, q6</div><div class='add'>+	veor.8		q3, q3, q7</div><div class='add'>+	veor.8		q4, q4, q8</div><div class='add'>+</div><div class='add'>+	cmp		LEN, #0x40</div><div class='add'>+	bge		loop_64</div><div class='add'>+</div><div class='add'>+less_64:		/* Folding cache line into 128bit */</div><div class='add'>+	vldr		dCONSTANTl, [r3, #16]</div><div class='add'>+	vldr		dCONSTANTh, [r3, #24]</div><div class='add'>+</div><div class='add'>+	vmull.p64	q5, d3, dCONSTANTh</div><div class='add'>+	vmull.p64	q1, d2, dCONSTANTl</div><div class='add'>+	veor.8		q1, q1, q5</div><div class='add'>+	veor.8		q1, q1, q2</div><div class='add'>+</div><div class='add'>+	vmull.p64	q5, d3, dCONSTANTh</div><div class='add'>+	vmull.p64	q1, d2, dCONSTANTl</div><div class='add'>+	veor.8		q1, q1, q5</div><div class='add'>+	veor.8		q1, q1, q3</div><div class='add'>+</div><div class='add'>+	vmull.p64	q5, d3, dCONSTANTh</div><div class='add'>+	vmull.p64	q1, d2, dCONSTANTl</div><div class='add'>+	veor.8		q1, q1, q5</div><div class='add'>+	veor.8		q1, q1, q4</div><div class='add'>+</div><div class='add'>+	teq		LEN, #0</div><div class='add'>+	beq		fold_64</div><div class='add'>+</div><div class='add'>+loop_16:		/* Folding rest buffer into 128bit */</div><div class='add'>+	subs		LEN, LEN, #0x10</div><div class='add'>+</div><div class='add'>+	vld1.8		{q2}, [BUF, :128]!</div><div class='add'>+	vmull.p64	q5, d3, dCONSTANTh</div><div class='add'>+	vmull.p64	q1, d2, dCONSTANTl</div><div class='add'>+	veor.8		q1, q1, q5</div><div class='add'>+	veor.8		q1, q1, q2</div><div class='add'>+</div><div class='add'>+	bne		loop_16</div><div class='add'>+</div><div class='add'>+fold_64:</div><div class='add'>+	/* perform the last 64 bit fold, also adds 32 zeroes</div><div class='add'>+	 * to the input stream */</div><div class='add'>+	vmull.p64	q2, d2, dCONSTANTh</div><div class='add'>+	vext.8		q1, q1, qzr, #8</div><div class='add'>+	veor.8		q1, q1, q2</div><div class='add'>+</div><div class='add'>+	/* final 32-bit fold */</div><div class='add'>+	vldr		dCONSTANTl, [r3, #32]</div><div class='add'>+	vldr		d6, [r3, #40]</div><div class='add'>+	vmov.i8		d7, #0</div><div class='add'>+</div><div class='add'>+	vext.8		q2, q1, qzr, #4</div><div class='add'>+	vand.8		d2, d2, d6</div><div class='add'>+	vmull.p64	q1, d2, dCONSTANTl</div><div class='add'>+	veor.8		q1, q1, q2</div><div class='add'>+</div><div class='add'>+	/* Finish up with the bit-reversed barrett reduction 64 ==&gt; 32 bits */</div><div class='add'>+	vldr		dCONSTANTl, [r3, #48]</div><div class='add'>+	vldr		dCONSTANTh, [r3, #56]</div><div class='add'>+</div><div class='add'>+	vand.8		q2, q1, q3</div><div class='add'>+	vext.8		q2, qzr, q2, #8</div><div class='add'>+	vmull.p64	q2, d5, dCONSTANTh</div><div class='add'>+	vand.8		q2, q2, q3</div><div class='add'>+	vmull.p64	q2, d4, dCONSTANTl</div><div class='add'>+	veor.8		q1, q1, q2</div><div class='add'>+	vmov		r0, s5</div><div class='add'>+</div><div class='add'>+	bx		lr</div><div class='add'>+ENDPROC(crc32_pmull_le)</div><div class='add'>+ENDPROC(crc32c_pmull_le)</div><div class='add'>+</div><div class='add'>+	.macro		__crc32, c</div><div class='add'>+	subs		ip, r2, #8</div><div class='add'>+	bmi		.Ltail\c</div><div class='add'>+</div><div class='add'>+	tst		r1, #3</div><div class='add'>+	bne		.Lunaligned\c</div><div class='add'>+</div><div class='add'>+	teq		ip, #0</div><div class='add'>+.Laligned8\c:</div><div class='add'>+	ldrd		r2, r3, [r1], #8</div><div class='add'>+ARM_BE8(rev		r2, r2		)</div><div class='add'>+ARM_BE8(rev		r3, r3		)</div><div class='add'>+	crc32\c\()w	r0, r0, r2</div><div class='add'>+	crc32\c\()w	r0, r0, r3</div><div class='add'>+	bxeq		lr</div><div class='add'>+	subs		ip, ip, #8</div><div class='add'>+	bpl		.Laligned8\c</div><div class='add'>+</div><div class='add'>+.Ltail\c:</div><div class='add'>+	tst		ip, #4</div><div class='add'>+	beq		2f</div><div class='add'>+	ldr		r3, [r1], #4</div><div class='add'>+ARM_BE8(rev		r3, r3		)</div><div class='add'>+	crc32\c\()w	r0, r0, r3</div><div class='add'>+</div><div class='add'>+2:	tst		ip, #2</div><div class='add'>+	beq		1f</div><div class='add'>+	ldrh		r3, [r1], #2</div><div class='add'>+ARM_BE8(rev16		r3, r3		)</div><div class='add'>+	crc32\c\()h	r0, r0, r3</div><div class='add'>+</div><div class='add'>+1:	tst		ip, #1</div><div class='add'>+	bxeq		lr</div><div class='add'>+	ldrb		r3, [r1]</div><div class='add'>+	crc32\c\()b	r0, r0, r3</div><div class='add'>+	bx		lr</div><div class='add'>+</div><div class='add'>+.Lunaligned\c:</div><div class='add'>+	tst		r1, #1</div><div class='add'>+	beq		2f</div><div class='add'>+	ldrb		r3, [r1], #1</div><div class='add'>+	subs		r2, r2, #1</div><div class='add'>+	crc32\c\()b	r0, r0, r3</div><div class='add'>+</div><div class='add'>+	tst		r1, #2</div><div class='add'>+	beq		0f</div><div class='add'>+2:	ldrh		r3, [r1], #2</div><div class='add'>+	subs		r2, r2, #2</div><div class='add'>+ARM_BE8(rev16		r3, r3		)</div><div class='add'>+	crc32\c\()h	r0, r0, r3</div><div class='add'>+</div><div class='add'>+0:	subs		ip, r2, #8</div><div class='add'>+	bpl		.Laligned8\c</div><div class='add'>+	b		.Ltail\c</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.align		5</div><div class='add'>+ENTRY(crc32_armv8_le)</div><div class='add'>+	__crc32</div><div class='add'>+ENDPROC(crc32_armv8_le)</div><div class='add'>+</div><div class='add'>+	.align		5</div><div class='add'>+ENTRY(crc32c_armv8_le)</div><div class='add'>+	__crc32		c</div><div class='add'>+ENDPROC(crc32c_armv8_le)</div><div class='head'>diff --git a/arch/arm/crypto/crc32-ce-glue.c b/arch/arm/crypto/crc32-ce-glue.c<br/>new file mode 100644<br/>index 000000000000..e1566bec1016<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/crc32-ce-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/crc32-ce-glue.c</a></div><div class='hunk'>@@ -0,0 +1,242 @@</div><div class='add'>+/*</div><div class='add'>+ * Accelerated CRC32(C) using ARM CRC, NEON and Crypto Extensions instructions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='add'>+#include &lt;asm/neon.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+#define PMULL_MIN_LEN		64L	/* minimum size of buffer</div><div class='add'>+					 * for crc32_pmull_le_16 */</div><div class='add'>+#define SCALE_F			16L	/* size of NEON register */</div><div class='add'>+</div><div class='add'>+asmlinkage u32 crc32_pmull_le(const u8 buf[], u32 len, u32 init_crc);</div><div class='add'>+asmlinkage u32 crc32_armv8_le(u32 init_crc, const u8 buf[], u32 len);</div><div class='add'>+</div><div class='add'>+asmlinkage u32 crc32c_pmull_le(const u8 buf[], u32 len, u32 init_crc);</div><div class='add'>+asmlinkage u32 crc32c_armv8_le(u32 init_crc, const u8 buf[], u32 len);</div><div class='add'>+</div><div class='add'>+static u32 (*fallback_crc32)(u32 init_crc, const u8 buf[], u32 len);</div><div class='add'>+static u32 (*fallback_crc32c)(u32 init_crc, const u8 buf[], u32 len);</div><div class='add'>+</div><div class='add'>+static int crc32_cra_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	u32 *key = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	*key = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_cra_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	u32 *key = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	*key = ~0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32_setkey(struct crypto_shash *hash, const u8 *key,</div><div class='add'>+			unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	u32 *mctx = crypto_shash_ctx(hash);</div><div class='add'>+</div><div class='add'>+	if (keylen != sizeof(u32)) {</div><div class='add'>+		crypto_shash_set_flags(hash, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	*mctx = le32_to_cpup((__le32 *)key);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32_init(struct shash_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u32 *mctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	*crc = *mctx;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			unsigned int length)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	*crc = crc32_armv8_le(*crc, data, length);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			 unsigned int length)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	*crc = crc32c_armv8_le(*crc, data, length);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32_final(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(*crc, out);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_final(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(~*crc, out);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32_pmull_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			      unsigned int length)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+	unsigned int l;</div><div class='add'>+</div><div class='add'>+	if (may_use_simd()) {</div><div class='add'>+		if ((u32)data % SCALE_F) {</div><div class='add'>+			l = min_t(u32, length, SCALE_F - ((u32)data % SCALE_F));</div><div class='add'>+</div><div class='add'>+			*crc = fallback_crc32(*crc, data, l);</div><div class='add'>+</div><div class='add'>+			data += l;</div><div class='add'>+			length -= l;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (length &gt;= PMULL_MIN_LEN) {</div><div class='add'>+			l = round_down(length, SCALE_F);</div><div class='add'>+</div><div class='add'>+			kernel_neon_begin();</div><div class='add'>+			*crc = crc32_pmull_le(data, l, *crc);</div><div class='add'>+			kernel_neon_end();</div><div class='add'>+</div><div class='add'>+			data += l;</div><div class='add'>+			length -= l;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (length &gt; 0)</div><div class='add'>+		*crc = fallback_crc32(*crc, data, length);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_pmull_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			       unsigned int length)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+	unsigned int l;</div><div class='add'>+</div><div class='add'>+	if (may_use_simd()) {</div><div class='add'>+		if ((u32)data % SCALE_F) {</div><div class='add'>+			l = min_t(u32, length, SCALE_F - ((u32)data % SCALE_F));</div><div class='add'>+</div><div class='add'>+			*crc = fallback_crc32c(*crc, data, l);</div><div class='add'>+</div><div class='add'>+			data += l;</div><div class='add'>+			length -= l;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (length &gt;= PMULL_MIN_LEN) {</div><div class='add'>+			l = round_down(length, SCALE_F);</div><div class='add'>+</div><div class='add'>+			kernel_neon_begin();</div><div class='add'>+			*crc = crc32c_pmull_le(data, l, *crc);</div><div class='add'>+			kernel_neon_end();</div><div class='add'>+</div><div class='add'>+			data += l;</div><div class='add'>+			length -= l;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (length &gt; 0)</div><div class='add'>+		*crc = fallback_crc32c(*crc, data, length);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct shash_alg crc32_pmull_algs[] = { {</div><div class='add'>+	.setkey			= crc32_setkey,</div><div class='add'>+	.init			= crc32_init,</div><div class='add'>+	.update			= crc32_update,</div><div class='add'>+	.final			= crc32_final,</div><div class='add'>+	.descsize		= sizeof(u32),</div><div class='add'>+	.digestsize		= sizeof(u32),</div><div class='add'>+</div><div class='add'>+	.base.cra_ctxsize	= sizeof(u32),</div><div class='add'>+	.base.cra_init		= crc32_cra_init,</div><div class='add'>+	.base.cra_name		= "crc32",</div><div class='add'>+	.base.cra_driver_name	= "crc32-arm-ce",</div><div class='add'>+	.base.cra_priority	= 200,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+}, {</div><div class='add'>+	.setkey			= crc32_setkey,</div><div class='add'>+	.init			= crc32_init,</div><div class='add'>+	.update			= crc32c_update,</div><div class='add'>+	.final			= crc32c_final,</div><div class='add'>+	.descsize		= sizeof(u32),</div><div class='add'>+	.digestsize		= sizeof(u32),</div><div class='add'>+</div><div class='add'>+	.base.cra_ctxsize	= sizeof(u32),</div><div class='add'>+	.base.cra_init		= crc32c_cra_init,</div><div class='add'>+	.base.cra_name		= "crc32c",</div><div class='add'>+	.base.cra_driver_name	= "crc32c-arm-ce",</div><div class='add'>+	.base.cra_priority	= 200,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+} };</div><div class='add'>+</div><div class='add'>+static int __init crc32_pmull_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	if (elf_hwcap2 &amp; HWCAP2_PMULL) {</div><div class='add'>+		crc32_pmull_algs[0].update = crc32_pmull_update;</div><div class='add'>+		crc32_pmull_algs[1].update = crc32c_pmull_update;</div><div class='add'>+</div><div class='add'>+		if (elf_hwcap2 &amp; HWCAP2_CRC32) {</div><div class='add'>+			fallback_crc32 = crc32_armv8_le;</div><div class='add'>+			fallback_crc32c = crc32c_armv8_le;</div><div class='add'>+		} else {</div><div class='add'>+			fallback_crc32 = crc32_le;</div><div class='add'>+			fallback_crc32c = __crc32c_le;</div><div class='add'>+		}</div><div class='add'>+	} else if (!(elf_hwcap2 &amp; HWCAP2_CRC32)) {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return crypto_register_shashes(crc32_pmull_algs,</div><div class='add'>+				       ARRAY_SIZE(crc32_pmull_algs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit crc32_pmull_mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_shashes(crc32_pmull_algs,</div><div class='add'>+				  ARRAY_SIZE(crc32_pmull_algs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(crc32_pmull_mod_init);</div><div class='add'>+module_exit(crc32_pmull_mod_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS_CRYPTO("crc32");</div><div class='add'>+MODULE_ALIAS_CRYPTO("crc32c");</div><div class='head'>diff --git a/arch/arm/crypto/crct10dif-ce-core.S b/arch/arm/crypto/crct10dif-ce-core.S<br/>new file mode 100644<br/>index 000000000000..ce45ba0c0687<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/crct10dif-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/crct10dif-ce-core.S</a></div><div class='hunk'>@@ -0,0 +1,427 @@</div><div class='add'>+//</div><div class='add'>+// Accelerated CRC-T10DIF using ARM NEON and Crypto Extensions instructions</div><div class='add'>+//</div><div class='add'>+// Copyright (C) 2016 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+//</div><div class='add'>+// This program is free software; you can redistribute it and/or modify</div><div class='add'>+// it under the terms of the GNU General Public License version 2 as</div><div class='add'>+// published by the Free Software Foundation.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+// Implement fast CRC-T10DIF computation with SSE and PCLMULQDQ instructions</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2013, Intel Corporation</div><div class='add'>+//</div><div class='add'>+// Authors:</div><div class='add'>+//     Erdinc Ozturk &lt;erdinc.ozturk@intel.com&gt;</div><div class='add'>+//     Vinodh Gopal &lt;vinodh.gopal@intel.com&gt;</div><div class='add'>+//     James Guilford &lt;james.guilford@intel.com&gt;</div><div class='add'>+//     Tim Chen &lt;tim.c.chen@linux.intel.com&gt;</div><div class='add'>+//</div><div class='add'>+// This software is available to you under a choice of one of two</div><div class='add'>+// licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+// General Public License (GPL) Version 2, available from the file</div><div class='add'>+// COPYING in the main directory of this source tree, or the</div><div class='add'>+// OpenIB.org BSD license below:</div><div class='add'>+//</div><div class='add'>+// Redistribution and use in source and binary forms, with or without</div><div class='add'>+// modification, are permitted provided that the following conditions are</div><div class='add'>+// met:</div><div class='add'>+//</div><div class='add'>+// * Redistributions of source code must retain the above copyright</div><div class='add'>+//   notice, this list of conditions and the following disclaimer.</div><div class='add'>+//</div><div class='add'>+// * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+//   notice, this list of conditions and the following disclaimer in the</div><div class='add'>+//   documentation and/or other materials provided with the</div><div class='add'>+//   distribution.</div><div class='add'>+//</div><div class='add'>+// * Neither the name of the Intel Corporation nor the names of its</div><div class='add'>+//   contributors may be used to endorse or promote products derived from</div><div class='add'>+//   this software without specific prior written permission.</div><div class='add'>+//</div><div class='add'>+//</div><div class='add'>+// THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION ""AS IS"" AND ANY</div><div class='add'>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION OR</div><div class='add'>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,</div><div class='add'>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,</div><div class='add'>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR</div><div class='add'>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF</div><div class='add'>+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING</div><div class='add'>+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+//</div><div class='add'>+//       Function API:</div><div class='add'>+//       UINT16 crc_t10dif_pcl(</div><div class='add'>+//               UINT16 init_crc, //initial CRC value, 16 bits</div><div class='add'>+//               const unsigned char *buf, //buffer pointer to calculate CRC on</div><div class='add'>+//               UINT64 len //buffer length in bytes (64-bit data)</div><div class='add'>+//       );</div><div class='add'>+//</div><div class='add'>+//       Reference paper titled "Fast CRC Computation for Generic</div><div class='add'>+//	Polynomials Using PCLMULQDQ Instruction"</div><div class='add'>+//       URL: http://www.intel.com/content/dam/www/public/us/en/documents</div><div class='add'>+//  /white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf</div><div class='add'>+//</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_ENDIAN_BE8</div><div class='add'>+#define CPU_LE(code...)</div><div class='add'>+#else</div><div class='add'>+#define CPU_LE(code...)		code</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+	.fpu		crypto-neon-fp-armv8</div><div class='add'>+</div><div class='add'>+	arg1_low32	.req	r0</div><div class='add'>+	arg2		.req	r1</div><div class='add'>+	arg3		.req	r2</div><div class='add'>+</div><div class='add'>+	qzr		.req	q13</div><div class='add'>+</div><div class='add'>+	q0l		.req	d0</div><div class='add'>+	q0h		.req	d1</div><div class='add'>+	q1l		.req	d2</div><div class='add'>+	q1h		.req	d3</div><div class='add'>+	q2l		.req	d4</div><div class='add'>+	q2h		.req	d5</div><div class='add'>+	q3l		.req	d6</div><div class='add'>+	q3h		.req	d7</div><div class='add'>+	q4l		.req	d8</div><div class='add'>+	q4h		.req	d9</div><div class='add'>+	q5l		.req	d10</div><div class='add'>+	q5h		.req	d11</div><div class='add'>+	q6l		.req	d12</div><div class='add'>+	q6h		.req	d13</div><div class='add'>+	q7l		.req	d14</div><div class='add'>+	q7h		.req	d15</div><div class='add'>+</div><div class='add'>+ENTRY(crc_t10dif_pmull)</div><div class='add'>+	vmov.i8		qzr, #0			// init zero register</div><div class='add'>+</div><div class='add'>+	// adjust the 16-bit initial_crc value, scale it to 32 bits</div><div class='add'>+	lsl		arg1_low32, arg1_low32, #16</div><div class='add'>+</div><div class='add'>+	// check if smaller than 256</div><div class='add'>+	cmp		arg3, #256</div><div class='add'>+</div><div class='add'>+	// for sizes less than 128, we can't fold 64B at a time...</div><div class='add'>+	blt		_less_than_128</div><div class='add'>+</div><div class='add'>+	// load the initial crc value</div><div class='add'>+	// crc value does not need to be byte-reflected, but it needs</div><div class='add'>+	// to be moved to the high part of the register.</div><div class='add'>+	// because data will be byte-reflected and will align with</div><div class='add'>+	// initial crc at correct place.</div><div class='add'>+	vmov		s0, arg1_low32		// initial crc</div><div class='add'>+	vext.8		q10, qzr, q0, #4</div><div class='add'>+</div><div class='add'>+	// receive the initial 64B data, xor the initial crc value</div><div class='add'>+	vld1.64		{q0-q1}, [arg2, :128]!</div><div class='add'>+	vld1.64		{q2-q3}, [arg2, :128]!</div><div class='add'>+	vld1.64		{q4-q5}, [arg2, :128]!</div><div class='add'>+	vld1.64		{q6-q7}, [arg2, :128]!</div><div class='add'>+CPU_LE(	vrev64.8	q0, q0			)</div><div class='add'>+CPU_LE(	vrev64.8	q1, q1			)</div><div class='add'>+CPU_LE(	vrev64.8	q2, q2			)</div><div class='add'>+CPU_LE(	vrev64.8	q3, q3			)</div><div class='add'>+CPU_LE(	vrev64.8	q4, q4			)</div><div class='add'>+CPU_LE(	vrev64.8	q5, q5			)</div><div class='add'>+CPU_LE(	vrev64.8	q6, q6			)</div><div class='add'>+CPU_LE(	vrev64.8	q7, q7			)</div><div class='add'>+</div><div class='add'>+	vswp		d0, d1</div><div class='add'>+	vswp		d2, d3</div><div class='add'>+	vswp		d4, d5</div><div class='add'>+	vswp		d6, d7</div><div class='add'>+	vswp		d8, d9</div><div class='add'>+	vswp		d10, d11</div><div class='add'>+	vswp		d12, d13</div><div class='add'>+	vswp		d14, d15</div><div class='add'>+</div><div class='add'>+	// XOR the initial_crc value</div><div class='add'>+	veor.8		q0, q0, q10</div><div class='add'>+</div><div class='add'>+	adr		ip, rk3</div><div class='add'>+	vld1.64		{q10}, [ip, :128]	// xmm10 has rk3 and rk4</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// we subtract 256 instead of 128 to save one instruction from the loop</div><div class='add'>+	//</div><div class='add'>+	sub		arg3, arg3, #256</div><div class='add'>+</div><div class='add'>+	// at this section of the code, there is 64*x+y (0&lt;=y&lt;64) bytes of</div><div class='add'>+	// buffer. The _fold_64_B_loop will fold 64B at a time</div><div class='add'>+	// until we have 64+y Bytes of buffer</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	// fold 64B at a time. This section of the code folds 4 vector</div><div class='add'>+	// registers in parallel</div><div class='add'>+_fold_64_B_loop:</div><div class='add'>+</div><div class='add'>+	.macro		fold64, reg1, reg2</div><div class='add'>+	vld1.64		{q11-q12}, [arg2, :128]!</div><div class='add'>+</div><div class='add'>+	vmull.p64	q8, \reg1\()h, d21</div><div class='add'>+	vmull.p64	\reg1, \reg1\()l, d20</div><div class='add'>+	vmull.p64	q9, \reg2\()h, d21</div><div class='add'>+	vmull.p64	\reg2, \reg2\()l, d20</div><div class='add'>+</div><div class='add'>+CPU_LE(	vrev64.8	q11, q11		)</div><div class='add'>+CPU_LE(	vrev64.8	q12, q12		)</div><div class='add'>+	vswp		d22, d23</div><div class='add'>+	vswp		d24, d25</div><div class='add'>+</div><div class='add'>+	veor.8		\reg1, \reg1, q8</div><div class='add'>+	veor.8		\reg2, \reg2, q9</div><div class='add'>+	veor.8		\reg1, \reg1, q11</div><div class='add'>+	veor.8		\reg2, \reg2, q12</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	fold64		q0, q1</div><div class='add'>+	fold64		q2, q3</div><div class='add'>+	fold64		q4, q5</div><div class='add'>+	fold64		q6, q7</div><div class='add'>+</div><div class='add'>+	subs		arg3, arg3, #128</div><div class='add'>+</div><div class='add'>+	// check if there is another 64B in the buffer to be able to fold</div><div class='add'>+	bge		_fold_64_B_loop</div><div class='add'>+</div><div class='add'>+	// at this point, the buffer pointer is pointing at the last y Bytes</div><div class='add'>+	// of the buffer the 64B of folded data is in 4 of the vector</div><div class='add'>+	// registers: v0, v1, v2, v3</div><div class='add'>+</div><div class='add'>+	// fold the 8 vector registers to 1 vector register with different</div><div class='add'>+	// constants</div><div class='add'>+</div><div class='add'>+	adr		ip, rk9</div><div class='add'>+	vld1.64		{q10}, [ip, :128]!</div><div class='add'>+</div><div class='add'>+	.macro		fold16, reg, rk</div><div class='add'>+	vmull.p64	q8, \reg\()l, d20</div><div class='add'>+	vmull.p64	\reg, \reg\()h, d21</div><div class='add'>+	.ifnb		\rk</div><div class='add'>+	vld1.64		{q10}, [ip, :128]!</div><div class='add'>+	.endif</div><div class='add'>+	veor.8		q7, q7, q8</div><div class='add'>+	veor.8		q7, q7, \reg</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	fold16		q0, rk11</div><div class='add'>+	fold16		q1, rk13</div><div class='add'>+	fold16		q2, rk15</div><div class='add'>+	fold16		q3, rk17</div><div class='add'>+	fold16		q4, rk19</div><div class='add'>+	fold16		q5, rk1</div><div class='add'>+	fold16		q6</div><div class='add'>+</div><div class='add'>+	// instead of 64, we add 48 to the loop counter to save 1 instruction</div><div class='add'>+	// from the loop instead of a cmp instruction, we use the negative</div><div class='add'>+	// flag with the jl instruction</div><div class='add'>+	adds		arg3, arg3, #(128-16)</div><div class='add'>+	blt		_final_reduction_for_128</div><div class='add'>+</div><div class='add'>+	// now we have 16+y bytes left to reduce. 16 Bytes is in register v7</div><div class='add'>+	// and the rest is in memory. We can fold 16 bytes at a time if y&gt;=16</div><div class='add'>+	// continue folding 16B at a time</div><div class='add'>+</div><div class='add'>+_16B_reduction_loop:</div><div class='add'>+	vmull.p64	q8, d14, d20</div><div class='add'>+	vmull.p64	q7, d15, d21</div><div class='add'>+	veor.8		q7, q7, q8</div><div class='add'>+</div><div class='add'>+	vld1.64		{q0}, [arg2, :128]!</div><div class='add'>+CPU_LE(	vrev64.8	q0, q0		)</div><div class='add'>+	vswp		d0, d1</div><div class='add'>+	veor.8		q7, q7, q0</div><div class='add'>+	subs		arg3, arg3, #16</div><div class='add'>+</div><div class='add'>+	// instead of a cmp instruction, we utilize the flags with the</div><div class='add'>+	// jge instruction equivalent of: cmp arg3, 16-16</div><div class='add'>+	// check if there is any more 16B in the buffer to be able to fold</div><div class='add'>+	bge		_16B_reduction_loop</div><div class='add'>+</div><div class='add'>+	// now we have 16+z bytes left to reduce, where 0&lt;= z &lt; 16.</div><div class='add'>+	// first, we reduce the data in the xmm7 register</div><div class='add'>+</div><div class='add'>+_final_reduction_for_128:</div><div class='add'>+	// check if any more data to fold. If not, compute the CRC of</div><div class='add'>+	// the final 128 bits</div><div class='add'>+	adds		arg3, arg3, #16</div><div class='add'>+	beq		_128_done</div><div class='add'>+</div><div class='add'>+	// here we are getting data that is less than 16 bytes.</div><div class='add'>+	// since we know that there was data before the pointer, we can</div><div class='add'>+	// offset the input pointer before the actual point, to receive</div><div class='add'>+	// exactly 16 bytes. after that the registers need to be adjusted.</div><div class='add'>+_get_last_two_regs:</div><div class='add'>+	add		arg2, arg2, arg3</div><div class='add'>+	sub		arg2, arg2, #16</div><div class='add'>+	vld1.64		{q1}, [arg2]</div><div class='add'>+CPU_LE(	vrev64.8	q1, q1			)</div><div class='add'>+	vswp		d2, d3</div><div class='add'>+</div><div class='add'>+	// get rid of the extra data that was loaded before</div><div class='add'>+	// load the shift constant</div><div class='add'>+	adr		ip, tbl_shf_table + 16</div><div class='add'>+	sub		ip, ip, arg3</div><div class='add'>+	vld1.8		{q0}, [ip]</div><div class='add'>+</div><div class='add'>+	// shift v2 to the left by arg3 bytes</div><div class='add'>+	vtbl.8		d4, {d14-d15}, d0</div><div class='add'>+	vtbl.8		d5, {d14-d15}, d1</div><div class='add'>+</div><div class='add'>+	// shift v7 to the right by 16-arg3 bytes</div><div class='add'>+	vmov.i8		q9, #0x80</div><div class='add'>+	veor.8		q0, q0, q9</div><div class='add'>+	vtbl.8		d18, {d14-d15}, d0</div><div class='add'>+	vtbl.8		d19, {d14-d15}, d1</div><div class='add'>+</div><div class='add'>+	// blend</div><div class='add'>+	vshr.s8		q0, q0, #7		// convert to 8-bit mask</div><div class='add'>+	vbsl.8		q0, q2, q1</div><div class='add'>+</div><div class='add'>+	// fold 16 Bytes</div><div class='add'>+	vmull.p64	q8, d18, d20</div><div class='add'>+	vmull.p64	q7, d19, d21</div><div class='add'>+	veor.8		q7, q7, q8</div><div class='add'>+	veor.8		q7, q7, q0</div><div class='add'>+</div><div class='add'>+_128_done:</div><div class='add'>+	// compute crc of a 128-bit value</div><div class='add'>+	vldr		d20, rk5</div><div class='add'>+	vldr		d21, rk6		// rk5 and rk6 in xmm10</div><div class='add'>+</div><div class='add'>+	// 64b fold</div><div class='add'>+	vext.8		q0, qzr, q7, #8</div><div class='add'>+	vmull.p64	q7, d15, d20</div><div class='add'>+	veor.8		q7, q7, q0</div><div class='add'>+</div><div class='add'>+	// 32b fold</div><div class='add'>+	vext.8		q0, q7, qzr, #12</div><div class='add'>+	vmov		s31, s3</div><div class='add'>+	vmull.p64	q0, d0, d21</div><div class='add'>+	veor.8		q7, q0, q7</div><div class='add'>+</div><div class='add'>+	// barrett reduction</div><div class='add'>+_barrett:</div><div class='add'>+	vldr		d20, rk7</div><div class='add'>+	vldr		d21, rk8</div><div class='add'>+</div><div class='add'>+	vmull.p64	q0, d15, d20</div><div class='add'>+	vext.8		q0, qzr, q0, #12</div><div class='add'>+	vmull.p64	q0, d1, d21</div><div class='add'>+	vext.8		q0, qzr, q0, #12</div><div class='add'>+	veor.8		q7, q7, q0</div><div class='add'>+	vmov		r0, s29</div><div class='add'>+</div><div class='add'>+_cleanup:</div><div class='add'>+	// scale the result back to 16 bits</div><div class='add'>+	lsr		r0, r0, #16</div><div class='add'>+	bx		lr</div><div class='add'>+</div><div class='add'>+_less_than_128:</div><div class='add'>+	teq		arg3, #0</div><div class='add'>+	beq		_cleanup</div><div class='add'>+</div><div class='add'>+	vmov.i8		q0, #0</div><div class='add'>+	vmov		s3, arg1_low32		// get the initial crc value</div><div class='add'>+</div><div class='add'>+	vld1.64		{q7}, [arg2, :128]!</div><div class='add'>+CPU_LE(	vrev64.8	q7, q7		)</div><div class='add'>+	vswp		d14, d15</div><div class='add'>+	veor.8		q7, q7, q0</div><div class='add'>+</div><div class='add'>+	cmp		arg3, #16</div><div class='add'>+	beq		_128_done		// exactly 16 left</div><div class='add'>+	blt		_less_than_16_left</div><div class='add'>+</div><div class='add'>+	// now if there is, load the constants</div><div class='add'>+	vldr		d20, rk1</div><div class='add'>+	vldr		d21, rk2		// rk1 and rk2 in xmm10</div><div class='add'>+</div><div class='add'>+	// check if there is enough buffer to be able to fold 16B at a time</div><div class='add'>+	subs		arg3, arg3, #32</div><div class='add'>+	addlt		arg3, arg3, #16</div><div class='add'>+	blt		_get_last_two_regs</div><div class='add'>+	b		_16B_reduction_loop</div><div class='add'>+</div><div class='add'>+_less_than_16_left:</div><div class='add'>+	// shl r9, 4</div><div class='add'>+	adr		ip, tbl_shf_table + 16</div><div class='add'>+	sub		ip, ip, arg3</div><div class='add'>+	vld1.8		{q0}, [ip]</div><div class='add'>+	vmov.i8		q9, #0x80</div><div class='add'>+	veor.8		q0, q0, q9</div><div class='add'>+	vtbl.8		d18, {d14-d15}, d0</div><div class='add'>+	vtbl.8		d15, {d14-d15}, d1</div><div class='add'>+	vmov		d14, d18</div><div class='add'>+	b		_128_done</div><div class='add'>+ENDPROC(crc_t10dif_pmull)</div><div class='add'>+</div><div class='add'>+// precomputed constants</div><div class='add'>+// these constants are precomputed from the poly:</div><div class='add'>+// 0x8bb70000 (0x8bb7 scaled to 32 bits)</div><div class='add'>+	.align		4</div><div class='add'>+// Q = 0x18BB70000</div><div class='add'>+// rk1 = 2^(32*3) mod Q &lt;&lt; 32</div><div class='add'>+// rk2 = 2^(32*5) mod Q &lt;&lt; 32</div><div class='add'>+// rk3 = 2^(32*15) mod Q &lt;&lt; 32</div><div class='add'>+// rk4 = 2^(32*17) mod Q &lt;&lt; 32</div><div class='add'>+// rk5 = 2^(32*3) mod Q &lt;&lt; 32</div><div class='add'>+// rk6 = 2^(32*2) mod Q &lt;&lt; 32</div><div class='add'>+// rk7 = floor(2^64/Q)</div><div class='add'>+// rk8 = Q</div><div class='add'>+</div><div class='add'>+rk3:	.quad		0x9d9d000000000000</div><div class='add'>+rk4:	.quad		0x7cf5000000000000</div><div class='add'>+rk5:	.quad		0x2d56000000000000</div><div class='add'>+rk6:	.quad		0x1368000000000000</div><div class='add'>+rk7:	.quad		0x00000001f65a57f8</div><div class='add'>+rk8:	.quad		0x000000018bb70000</div><div class='add'>+rk9:	.quad		0xceae000000000000</div><div class='add'>+rk10:	.quad		0xbfd6000000000000</div><div class='add'>+rk11:	.quad		0x1e16000000000000</div><div class='add'>+rk12:	.quad		0x713c000000000000</div><div class='add'>+rk13:	.quad		0xf7f9000000000000</div><div class='add'>+rk14:	.quad		0x80a6000000000000</div><div class='add'>+rk15:	.quad		0x044c000000000000</div><div class='add'>+rk16:	.quad		0xe658000000000000</div><div class='add'>+rk17:	.quad		0xad18000000000000</div><div class='add'>+rk18:	.quad		0xa497000000000000</div><div class='add'>+rk19:	.quad		0x6ee3000000000000</div><div class='add'>+rk20:	.quad		0xe7b5000000000000</div><div class='add'>+rk1:	.quad		0x2d56000000000000</div><div class='add'>+rk2:	.quad		0x06df000000000000</div><div class='add'>+</div><div class='add'>+tbl_shf_table:</div><div class='add'>+// use these values for shift constants for the tbl/tbx instruction</div><div class='add'>+// different alignments result in values as shown:</div><div class='add'>+//	DDQ 0x008f8e8d8c8b8a898887868584838281 # shl 15 (16-1) / shr1</div><div class='add'>+//	DDQ 0x01008f8e8d8c8b8a8988878685848382 # shl 14 (16-3) / shr2</div><div class='add'>+//	DDQ 0x0201008f8e8d8c8b8a89888786858483 # shl 13 (16-4) / shr3</div><div class='add'>+//	DDQ 0x030201008f8e8d8c8b8a898887868584 # shl 12 (16-4) / shr4</div><div class='add'>+//	DDQ 0x04030201008f8e8d8c8b8a8988878685 # shl 11 (16-5) / shr5</div><div class='add'>+//	DDQ 0x0504030201008f8e8d8c8b8a89888786 # shl 10 (16-6) / shr6</div><div class='add'>+//	DDQ 0x060504030201008f8e8d8c8b8a898887 # shl 9  (16-7) / shr7</div><div class='add'>+//	DDQ 0x07060504030201008f8e8d8c8b8a8988 # shl 8  (16-8) / shr8</div><div class='add'>+//	DDQ 0x0807060504030201008f8e8d8c8b8a89 # shl 7  (16-9) / shr9</div><div class='add'>+//	DDQ 0x090807060504030201008f8e8d8c8b8a # shl 6  (16-10) / shr10</div><div class='add'>+//	DDQ 0x0a090807060504030201008f8e8d8c8b # shl 5  (16-11) / shr11</div><div class='add'>+//	DDQ 0x0b0a090807060504030201008f8e8d8c # shl 4  (16-12) / shr12</div><div class='add'>+//	DDQ 0x0c0b0a090807060504030201008f8e8d # shl 3  (16-13) / shr13</div><div class='add'>+//	DDQ 0x0d0c0b0a090807060504030201008f8e # shl 2  (16-14) / shr14</div><div class='add'>+//	DDQ 0x0e0d0c0b0a090807060504030201008f # shl 1  (16-15) / shr15</div><div class='add'>+</div><div class='add'>+	.byte		 0x0, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87</div><div class='add'>+	.byte		0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f</div><div class='add'>+	.byte		 0x0,  0x1,  0x2,  0x3,  0x4,  0x5,  0x6,  0x7</div><div class='add'>+	.byte		 0x8,  0x9,  0xa,  0xb,  0xc,  0xd,  0xe , 0x0</div><div class='head'>diff --git a/arch/arm/crypto/crct10dif-ce-glue.c b/arch/arm/crypto/crct10dif-ce-glue.c<br/>new file mode 100644<br/>index 000000000000..d428355cf38d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/crypto/crct10dif-ce-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/crypto/crct10dif-ce-glue.c</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+/*</div><div class='add'>+ * Accelerated CRC-T10DIF using ARM NEON and Crypto Extensions instructions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/crc-t10dif.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/neon.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='add'>+</div><div class='add'>+#define CRC_T10DIF_PMULL_CHUNK_SIZE	16U</div><div class='add'>+</div><div class='add'>+asmlinkage u16 crc_t10dif_pmull(u16 init_crc, const u8 buf[], u32 len);</div><div class='add'>+</div><div class='add'>+static int crct10dif_init(struct shash_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u16 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	*crc = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crct10dif_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			    unsigned int length)</div><div class='add'>+{</div><div class='add'>+	u16 *crc = shash_desc_ctx(desc);</div><div class='add'>+	unsigned int l;</div><div class='add'>+</div><div class='add'>+	if (!may_use_simd()) {</div><div class='add'>+		*crc = crc_t10dif_generic(*crc, data, length);</div><div class='add'>+	} else {</div><div class='add'>+		if (unlikely((u32)data % CRC_T10DIF_PMULL_CHUNK_SIZE)) {</div><div class='add'>+			l = min_t(u32, length, CRC_T10DIF_PMULL_CHUNK_SIZE -</div><div class='add'>+				  ((u32)data % CRC_T10DIF_PMULL_CHUNK_SIZE));</div><div class='add'>+</div><div class='add'>+			*crc = crc_t10dif_generic(*crc, data, l);</div><div class='add'>+</div><div class='add'>+			length -= l;</div><div class='add'>+			data += l;</div><div class='add'>+		}</div><div class='add'>+		if (length &gt; 0) {</div><div class='add'>+			kernel_neon_begin();</div><div class='add'>+			*crc = crc_t10dif_pmull(*crc, data, length);</div><div class='add'>+			kernel_neon_end();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crct10dif_final(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	u16 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	*(u16 *)out = *crc;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct shash_alg crc_t10dif_alg = {</div><div class='add'>+	.digestsize		= CRC_T10DIF_DIGEST_SIZE,</div><div class='add'>+	.init			= crct10dif_init,</div><div class='add'>+	.update			= crct10dif_update,</div><div class='add'>+	.final			= crct10dif_final,</div><div class='add'>+	.descsize		= CRC_T10DIF_DIGEST_SIZE,</div><div class='add'>+</div><div class='add'>+	.base.cra_name		= "crct10dif",</div><div class='add'>+	.base.cra_driver_name	= "crct10dif-arm-ce",</div><div class='add'>+	.base.cra_priority	= 200,</div><div class='add'>+	.base.cra_blocksize	= CRC_T10DIF_BLOCK_SIZE,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init crc_t10dif_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	if (!(elf_hwcap2 &amp; HWCAP2_PMULL))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return crypto_register_shash(&amp;crc_t10dif_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit crc_t10dif_mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_shash(&amp;crc_t10dif_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(crc_t10dif_mod_init);</div><div class='add'>+module_exit(crc_t10dif_mod_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS_CRYPTO("crct10dif");</div><div class='head'>diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild<br/>index 55e0e3ea9cb6..b14e8c7d71bd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/Kbuild</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> </div><div class='ctx'> generic-y += bitsperlong.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += early_ioremap.h</div><div class='ctx'> generic-y += emergency-restart.h</div><div class='hunk'>@@ -38,3 +37,6 @@ generic-y += termios.h</div><div class='ctx'> generic-y += timex.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='ctx'> generic-y += unaligned.h</div><div class='add'>+</div><div class='add'>+generated-y += mach-types.h</div><div class='add'>+generated-y += unistd-nr.h</div><div class='head'>diff --git a/arch/arm/include/asm/arch_gicv3.h b/arch/arm/include/asm/arch_gicv3.h<br/>index a8088290b778..27475904e096 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/arch_gicv3.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/arch_gicv3.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/arch_gicv3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/arch_gicv3.h</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/barrier.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/cp15.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ICC_EOIR1			__ACCESS_CP15(c12, 0, c12, 1)</div><div class='hunk'>@@ -230,19 +231,14 @@ static inline void gic_write_bpr1(u32 val)</div><div class='ctx'>  * AArch32, since the syndrome register doesn't provide any information for</div><div class='ctx'>  * them.</div><div class='ctx'>  * Consequently, the following IO helpers use 32bit accesses.</div><div class='del'>- *</div><div class='del'>- * There are only two registers that need 64bit accesses in this driver:</div><div class='del'>- * - GICD_IROUTERn, contain the affinity values associated to each interrupt.</div><div class='del'>- *   The upper-word (aff3) will always be 0, so there is no need for a lock.</div><div class='del'>- * - GICR_TYPER is an ID register and doesn't need atomicity.</div><div class='ctx'>  */</div><div class='del'>-static inline void gic_write_irouter(u64 val, volatile void __iomem *addr)</div><div class='add'>+static inline void __gic_writeq_nonatomic(u64 val, volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	writel_relaxed((u32)val, addr);</div><div class='ctx'> 	writel_relaxed((u32)(val &gt;&gt; 32), addr + 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 gic_read_typer(const volatile void __iomem *addr)</div><div class='add'>+static inline u64 __gic_readq_nonatomic(const volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u64 val;</div><div class='ctx'> </div><div class='hunk'>@@ -251,5 +247,49 @@ static inline u64 gic_read_typer(const volatile void __iomem *addr)</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define gic_flush_dcache_to_poc(a,l)    __cpuc_flush_dcache_area((a), (l))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  GICD_IROUTERn, contain the affinity values associated to each interrupt.</div><div class='add'>+ *  The upper-word (aff3) will always be 0, so there is no need for a lock.</div><div class='add'>+ */</div><div class='add'>+#define gic_write_irouter(v, c)		__gic_writeq_nonatomic(v, c)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GICR_TYPER is an ID register and doesn't need atomicity.</div><div class='add'>+ */</div><div class='add'>+#define gic_read_typer(c)		__gic_readq_nonatomic(c)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GITS_BASER - hi and lo bits may be accessed independently.</div><div class='add'>+ */</div><div class='add'>+#define gits_read_baser(c)		__gic_readq_nonatomic(c)</div><div class='add'>+#define gits_write_baser(v, c)		__gic_writeq_nonatomic(v, c)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GICR_PENDBASER and GICR_PROPBASE are changed with LPIs disabled, so they</div><div class='add'>+ * won't be being used during any updates and can be changed non-atomically</div><div class='add'>+ */</div><div class='add'>+#define gicr_read_propbaser(c)		__gic_readq_nonatomic(c)</div><div class='add'>+#define gicr_write_propbaser(v, c)	__gic_writeq_nonatomic(v, c)</div><div class='add'>+#define gicr_read_pendbaser(c)		__gic_readq_nonatomic(c)</div><div class='add'>+#define gicr_write_pendbaser(v, c)	__gic_writeq_nonatomic(v, c)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GITS_TYPER is an ID register and doesn't need atomicity.</div><div class='add'>+ */</div><div class='add'>+#define gits_read_typer(c)		__gic_readq_nonatomic(c)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GITS_CBASER - hi and lo bits may be accessed independently.</div><div class='add'>+ */</div><div class='add'>+#define gits_read_cbaser(c)		__gic_readq_nonatomic(c)</div><div class='add'>+#define gits_write_cbaser(v, c)		__gic_writeq_nonatomic(v, c)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GITS_CWRITER - hi and lo bits may be accessed independently.</div><div class='add'>+ */</div><div class='add'>+#define gits_write_cwriter(v, c)	__gic_writeq_nonatomic(v, c)</div><div class='add'>+</div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> #endif /* !__ASM_ARCH_GICV3_H */</div><div class='head'>diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h<br/>index bdd283bc5842..02454fa15d2c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/cacheflush.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/cacheflush.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/cacheflush.h</a></div><div class='hunk'>@@ -490,7 +490,7 @@ static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }</div><div class='ctx'> static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_RODATA</div><div class='add'>+#ifdef CONFIG_STRICT_KERNEL_RWX</div><div class='ctx'> void set_kernel_text_rw(void);</div><div class='ctx'> void set_kernel_text_ro(void);</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h<br/>index 522b5feb4eaa..b62eaeb147aa 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/cputype.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/cputype.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/cputype.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/cputype.h</a></div><div class='hunk'>@@ -94,6 +94,9 @@</div><div class='ctx'> #define ARM_CPU_XSCALE_ARCH_V2		0x4000</div><div class='ctx'> #define ARM_CPU_XSCALE_ARCH_V3		0x6000</div><div class='ctx'> </div><div class='add'>+/* Qualcomm implemented cores */</div><div class='add'>+#define ARM_CPU_PART_SCORPION		0x510002d0</div><div class='add'>+</div><div class='ctx'> extern unsigned int processor_id;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_CP15</div><div class='head'>diff --git a/arch/arm/include/asm/delay.h b/arch/arm/include/asm/delay.h<br/>index b1ce037e4380..e986b7f717c4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/delay.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/delay.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/delay.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/delay.h</a></div><div class='hunk'>@@ -9,6 +9,33 @@</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;	/* HZ */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Loop (or tick) based delay:</div><div class='add'>+ *</div><div class='add'>+ * loops = loops_per_jiffy * jiffies_per_sec * delay_us / us_per_sec</div><div class='add'>+ *</div><div class='add'>+ * where:</div><div class='add'>+ *</div><div class='add'>+ * jiffies_per_sec = HZ</div><div class='add'>+ * us_per_sec = 1000000</div><div class='add'>+ *</div><div class='add'>+ * Therefore the constant part is HZ / 1000000 which is a small</div><div class='add'>+ * fractional number. To make this usable with integer math, we</div><div class='add'>+ * scale up this constant by 2^31, perform the actual multiplication,</div><div class='add'>+ * and scale the result back down by 2^31 with a simple shift:</div><div class='add'>+ *</div><div class='add'>+ * loops = (loops_per_jiffy * delay_us * UDELAY_MULT) &gt;&gt; 31</div><div class='add'>+ *</div><div class='add'>+ * where:</div><div class='add'>+ *</div><div class='add'>+ * UDELAY_MULT = 2^31 * HZ / 1000000</div><div class='add'>+ *             = (2^31 / 1000000) * HZ</div><div class='add'>+ *             = 2147.483648 * HZ</div><div class='add'>+ *             = 2147 * HZ + 483648 * HZ / 1000000</div><div class='add'>+ *</div><div class='add'>+ * 31 is the biggest scale shift value that won't overflow 32 bits for</div><div class='add'>+ * delay_us * UDELAY_MULT assuming HZ &lt;= 1000 and delay_us &lt;= 2000.</div><div class='add'>+ */</div><div class='ctx'> #define MAX_UDELAY_MS	2</div><div class='ctx'> #define UDELAY_MULT	UL(2147 * HZ + 483648 * HZ / 1000000)</div><div class='ctx'> #define UDELAY_SHIFT	31</div><div class='head'>diff --git a/arch/arm/include/asm/device.h b/arch/arm/include/asm/device.h<br/>index 4111592f0130..220ba207be91 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/device.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/device.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/device.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #define ASMARM_DEVICE_H</div><div class='ctx'> </div><div class='ctx'> struct dev_archdata {</div><div class='del'>-	struct dma_map_ops	*dma_ops;</div><div class='ctx'> #ifdef CONFIG_DMABOUNCE</div><div class='ctx'> 	struct dmabounce_device_info *dmabounce;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h<br/>index bf02dbd9ccda..716656925975 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -13,28 +13,22 @@</div><div class='ctx'> #include &lt;asm/xen/hypervisor.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DMA_ERROR_CODE	(~(dma_addr_t)0x0)</div><div class='del'>-extern struct dma_map_ops arm_dma_ops;</div><div class='del'>-extern struct dma_map_ops arm_coherent_dma_ops;</div><div class='add'>+extern const struct dma_map_ops arm_dma_ops;</div><div class='add'>+extern const struct dma_map_ops arm_coherent_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *__generic_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *__generic_dma_ops(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	if (dev &amp;&amp; dev-&gt;archdata.dma_ops)</div><div class='del'>-		return dev-&gt;archdata.dma_ops;</div><div class='add'>+	if (dev &amp;&amp; dev-&gt;dma_ops)</div><div class='add'>+		return dev-&gt;dma_ops;</div><div class='ctx'> 	return &amp;arm_dma_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	if (xen_initial_domain())</div><div class='ctx'> 		return xen_dma_ops;</div><div class='ctx'> 	else</div><div class='del'>-		return __generic_dma_ops(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!dev);</div><div class='del'>-	dev-&gt;archdata.dma_ops = ops;</div><div class='add'>+		return __generic_dma_ops(NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define HAVE_ARCH_DMA_SUPPORTED 1</div><div class='head'>diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h<br/>index 766bf9b78160..e4e6a9d6a825 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/efi.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/efi.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/efi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/efi.h</a></div><div class='hunk'>@@ -55,8 +55,12 @@ void efi_virtmap_unload(void);</div><div class='ctx'> </div><div class='ctx'> #define efi_call_early(f, ...)		sys_table_arg-&gt;boottime-&gt;f(__VA_ARGS__)</div><div class='ctx'> #define __efi_call_early(f, ...)	f(__VA_ARGS__)</div><div class='add'>+#define efi_call_runtime(f, ...)	sys_table_arg-&gt;runtime-&gt;f(__VA_ARGS__)</div><div class='ctx'> #define efi_is_64bit()			(false)</div><div class='ctx'> </div><div class='add'>+#define efi_call_proto(protocol, f, instance, ...)			\</div><div class='add'>+	((protocol##_t *)instance)-&gt;f(instance, ##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> struct screen_info *alloc_screen_info(efi_system_table_t *sys_table_arg);</div><div class='ctx'> void free_screen_info(efi_system_table_t *sys_table, struct screen_info *si);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h<br/>index bfe2a2f5a644..22b73112b75f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/ftrace.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/ftrace.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/ftrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/ftrace.h</a></div><div class='hunk'>@@ -54,6 +54,24 @@ static inline void *return_address(unsigned int level)</div><div class='ctx'> </div><div class='ctx'> #define ftrace_return_address(n) return_address(n)</div><div class='ctx'> </div><div class='add'>+#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME</div><div class='add'>+</div><div class='add'>+static inline bool arch_syscall_match_sym_name(const char *sym,</div><div class='add'>+					       const char *name)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(sym, "sys_mmap2"))</div><div class='add'>+		sym = "sys_mmap_pgoff";</div><div class='add'>+	else if (!strcmp(sym, "sys_statfs64_wrapper"))</div><div class='add'>+		sym = "sys_statfs64";</div><div class='add'>+	else if (!strcmp(sym, "sys_fstatfs64_wrapper"))</div><div class='add'>+		sym = "sys_fstatfs64";</div><div class='add'>+	else if (!strcmp(sym, "sys_arm_fadvise64_64"))</div><div class='add'>+		sym = "sys_fadvise64_64";</div><div class='add'>+</div><div class='add'>+	/* Ignore case since sym may start with "SyS" instead of "sys" */</div><div class='add'>+	return !strcasecmp(sym, name);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* ifndef __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_ARM_FTRACE */</div><div class='head'>diff --git a/arch/arm/include/asm/hardware/cache-uniphier.h b/arch/arm/include/asm/hardware/cache-uniphier.h<br/>index eaa60da7dac3..0ef42ae75b6c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/hardware/cache-uniphier.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/hardware/cache-uniphier.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/hardware/cache-uniphier.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/hardware/cache-uniphier.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #ifndef __CACHE_UNIPHIER_H</div><div class='ctx'> #define __CACHE_UNIPHIER_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CACHE_UNIPHIER</div><div class='ctx'> int uniphier_cache_init(void);</div><div class='head'>diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h<br/>index 021692c64de3..42871fb8340e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/io.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/io.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/io.h</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/blk_types.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm-generic/pci_iomap.h&gt;</div><div class='head'>diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h<br/>index 3ea9be559726..59655459da59 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/kprobes.h</a></div><div class='hunk'>@@ -16,6 +16,9 @@</div><div class='ctx'> #ifndef _ARM_KPROBES_H</div><div class='ctx'> #define _ARM_KPROBES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='hunk'>@@ -83,4 +86,5 @@ struct arch_optimized_insn {</div><div class='ctx'> 	 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='ctx'> #endif /* _ARM_KPROBES_H */</div><div class='head'>diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h<br/>index d5423ab15ed5..cc495d799c67 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/kvm_host.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/kvm_host.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/kvm_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/kvm_host.h</a></div><div class='hunk'>@@ -60,9 +60,6 @@ struct kvm_arch {</div><div class='ctx'> 	/* The last vcpu id that ran on each physical CPU */</div><div class='ctx'> 	int __percpu *last_vcpu_ran;</div><div class='ctx'> </div><div class='del'>-	/* Timer */</div><div class='del'>-	struct arch_timer_kvm	timer;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Anything that is not used directly from assembly code goes</div><div class='ctx'> 	 * here.</div><div class='head'>diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h<br/>index 74a44727f8e1..95f38dcd611d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/kvm_mmu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/kvm_mmu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/kvm_mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/kvm_mmu.h</a></div><div class='hunk'>@@ -129,8 +129,7 @@ static inline bool vcpu_has_cache_enabled(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> static inline void __coherent_cache_guest_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					       kvm_pfn_t pfn,</div><div class='del'>-					       unsigned long size,</div><div class='del'>-					       bool ipa_uncached)</div><div class='add'>+					       unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are going to insert an instruction page and the icache is</div><div class='hunk'>@@ -150,18 +149,12 @@ static inline void __coherent_cache_guest_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	 * and iterate over the range.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	bool need_flush = !vcpu_has_cache_enabled(vcpu) || ipa_uncached;</div><div class='del'>-</div><div class='ctx'> 	VM_BUG_ON(size &amp; ~PAGE_MASK);</div><div class='ctx'> </div><div class='del'>-	if (!need_flush &amp;&amp; !icache_is_pipt())</div><div class='del'>-		goto vipt_cache;</div><div class='del'>-</div><div class='ctx'> 	while (size) {</div><div class='ctx'> 		void *va = kmap_atomic_pfn(pfn);</div><div class='ctx'> </div><div class='del'>-		if (need_flush)</div><div class='del'>-			kvm_flush_dcache_to_poc(va, PAGE_SIZE);</div><div class='add'>+		kvm_flush_dcache_to_poc(va, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		if (icache_is_pipt())</div><div class='ctx'> 			__cpuc_coherent_user_range((unsigned long)va,</div><div class='hunk'>@@ -173,7 +166,6 @@ static inline void __coherent_cache_guest_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		kunmap_atomic(va);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-vipt_cache:</div><div class='ctx'> 	if (!icache_is_pipt() &amp;&amp; !icache_is_vivt_asid_tagged()) {</div><div class='ctx'> 		/* any kind of VIPT cache */</div><div class='ctx'> 		__flush_icache_all();</div><div class='head'>diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h<br/>deleted file mode 100644<br/>index 948178cc6ba8..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/mach-types.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/mach-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-#include &lt;generated/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/include/asm/mach/flash.h b/arch/arm/include/asm/mach/flash.h<br/>index 4ca69fe2c850..bada3f845a97 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/mach/flash.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/mach/flash.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/mach/flash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/mach/flash.h</a></div><div class='hunk'>@@ -22,7 +22,7 @@ struct mtd_info;</div><div class='ctx'>  * set_vpp:	method called to enable or disable VPP</div><div class='ctx'>  * mmcontrol:	method called to enable or disable Sync. Burst Read in OneNAND</div><div class='ctx'>  * parts:	optional array of mtd_partitions for static partitioning</div><div class='del'>- * nr_parts:	number of mtd_partitions for static partitoning</div><div class='add'>+ * nr_parts:	number of mtd_partitions for static partitioning</div><div class='ctx'>  */</div><div class='ctx'> struct flash_platform_data {</div><div class='ctx'> 	const char	*map_name;</div><div class='head'>diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h<br/>index 76cbd9c674df..1f54e4e98c1e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/memory.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/memory.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/memory.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/memory.h</a></div><div class='hunk'>@@ -83,8 +83,15 @@</div><div class='ctx'> #define IOREMAP_MAX_ORDER	24</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define VECTORS_BASE		UL(0xffff0000)</div><div class='add'>+</div><div class='ctx'> #else /* CONFIG_MMU */</div><div class='ctx'> </div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+extern unsigned long vectors_base;</div><div class='add'>+#define VECTORS_BASE		vectors_base</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The limitation of user task size can grow up to the end of free ram region.</div><div class='ctx'>  * It is difficult to define and perhaps will never meet the original meaning</div><div class='hunk'>@@ -111,6 +118,13 @@</div><div class='ctx'> </div><div class='ctx'> #endif /* !CONFIG_MMU */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_XIP_KERNEL</div><div class='add'>+#define KERNEL_START		_sdata</div><div class='add'>+#else</div><div class='add'>+#define KERNEL_START		_stext</div><div class='add'>+#endif</div><div class='add'>+#define KERNEL_END		_end</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * We fix the TCM memories max 32 KiB ITCM resp DTCM at these</div><div class='ctx'>  * locations</div><div class='hunk'>@@ -206,7 +220,7 @@ extern const void *__pv_table_begin, *__pv_table_end;</div><div class='ctx'> 	: "r" (x), "I" (__PV_BITS_31_24)		\</div><div class='ctx'> 	: "cc")</div><div class='ctx'> </div><div class='del'>-static inline phys_addr_t __virt_to_phys(unsigned long x)</div><div class='add'>+static inline phys_addr_t __virt_to_phys_nodebug(unsigned long x)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t t;</div><div class='ctx'> </div><div class='hunk'>@@ -238,7 +252,7 @@ static inline unsigned long __phys_to_virt(phys_addr_t x)</div><div class='ctx'> #define PHYS_OFFSET	PLAT_PHYS_OFFSET</div><div class='ctx'> #define PHYS_PFN_OFFSET	((unsigned long)(PHYS_OFFSET &gt;&gt; PAGE_SHIFT))</div><div class='ctx'> </div><div class='del'>-static inline phys_addr_t __virt_to_phys(unsigned long x)</div><div class='add'>+static inline phys_addr_t __virt_to_phys_nodebug(unsigned long x)</div><div class='ctx'> {</div><div class='ctx'> 	return (phys_addr_t)x - PAGE_OFFSET + PHYS_OFFSET;</div><div class='ctx'> }</div><div class='hunk'>@@ -254,6 +268,16 @@ static inline unsigned long __phys_to_virt(phys_addr_t x)</div><div class='ctx'> 	((((unsigned long)(kaddr) - PAGE_OFFSET) &gt;&gt; PAGE_SHIFT) + \</div><div class='ctx'> 	 PHYS_PFN_OFFSET)</div><div class='ctx'> </div><div class='add'>+#define __pa_symbol_nodebug(x)	__virt_to_phys_nodebug((x))</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_VIRTUAL</div><div class='add'>+extern phys_addr_t __virt_to_phys(unsigned long x);</div><div class='add'>+extern phys_addr_t __phys_addr_symbol(unsigned long x);</div><div class='add'>+#else</div><div class='add'>+#define __virt_to_phys(x)	__virt_to_phys_nodebug(x)</div><div class='add'>+#define __phys_addr_symbol(x)	__pa_symbol_nodebug(x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * These are *only* valid on the kernel direct mapped RAM memory.</div><div class='ctx'>  * Note: Drivers should NOT use these.  They are the wrong</div><div class='hunk'>@@ -276,6 +300,7 @@ static inline void *phys_to_virt(phys_addr_t x)</div><div class='ctx'>  * Drivers should NOT use these either.</div><div class='ctx'>  */</div><div class='ctx'> #define __pa(x)			__virt_to_phys((unsigned long)(x))</div><div class='add'>+#define __pa_symbol(x)		__phys_addr_symbol(RELOC_HIDE((unsigned long)(x), 0))</div><div class='ctx'> #define __va(x)			((void *)__phys_to_virt((phys_addr_t)(x)))</div><div class='ctx'> #define pfn_to_kaddr(pfn)	__va((phys_addr_t)(pfn) &lt;&lt; PAGE_SHIFT)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/mmu_context.h b/arch/arm/include/asm/mmu_context.h<br/>index 3cc14dd8587c..7f303295ef19 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -15,7 +15,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/cachetype.h&gt;</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='head'>diff --git a/arch/arm/include/asm/mutex.h b/arch/arm/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 87c044910fe0..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/include/asm/mutex.h</div><div class='del'>- *</div><div class='del'>- * ARM optimized mutex locking primitives</div><div class='del'>- *</div><div class='del'>- * Please look into asm-generic/mutex-xchg.h for a formal definition.</div><div class='del'>- */</div><div class='del'>-#ifndef _ASM_MUTEX_H</div><div class='del'>-#define _ASM_MUTEX_H</div><div class='del'>-/*</div><div class='del'>- * On pre-ARMv6 hardware this results in a swp-based implementation,</div><div class='del'>- * which is the most efficient. For ARMv6+, we have exclusive memory</div><div class='del'>- * accessors and use atomic_dec to avoid the extra xchg operations</div><div class='del'>- * on the locking slowpaths.</div><div class='del'>- */</div><div class='del'>-#if __LINUX_ARM_ARCH__ &lt; 6</div><div class='del'>-#include &lt;asm-generic/mutex-xchg.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#endif	/* _ASM_MUTEX_H */</div><div class='head'>diff --git a/arch/arm/include/asm/pgtable-nommu.h b/arch/arm/include/asm/pgtable-nommu.h<br/>index add094d09e3e..302240c19a5a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/pgtable-nommu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/pgtable-nommu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/pgtable-nommu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/pgtable-nommu.h</a></div><div class='hunk'>@@ -63,9 +63,9 @@ typedef pte_t *pte_addr_t;</div><div class='ctx'> /*</div><div class='ctx'>  * Mark the prot value as uncacheable and unbufferable.</div><div class='ctx'>  */</div><div class='del'>-#define pgprot_noncached(prot)	__pgprot(0)</div><div class='del'>-#define pgprot_writecombine(prot) __pgprot(0)</div><div class='del'>-#define pgprot_dmacoherent(prot) __pgprot(0)</div><div class='add'>+#define pgprot_noncached(prot)	(prot)</div><div class='add'>+#define pgprot_writecombine(prot) (prot)</div><div class='add'>+#define pgprot_dmacoherent(prot) (prot)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h<br/>index 8a1e8e995dae..c3d5fc124a05 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/processor.h</a></div><div class='hunk'>@@ -82,8 +82,6 @@ unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define cpu_relax()			barrier()</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define cpu_relax_lowlatency()                cpu_relax()</div><div class='del'>-</div><div class='ctx'> #define task_pt_regs(p) \</div><div class='ctx'> 	((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h<br/>index 1e25cd80589e..3f2eb76243e3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/tlb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/tlb.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/tlb.h</a></div><div class='hunk'>@@ -186,6 +186,8 @@ tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, unsigned long addr)</div><div class='ctx'> 	tlb_add_flush(tlb, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\</div><div class='add'>+	tlb_remove_tlb_entry(tlb, ptep, address)</div><div class='ctx'> /*</div><div class='ctx'>  * In the case of tlb vma handling, we can optimise these away in the</div><div class='ctx'>  * case where we're doing a full MM flush.  When we're doing a munmap,</div><div class='hunk'>@@ -211,18 +213,17 @@ tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> static inline bool __tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='ctx'> {</div><div class='add'>+	tlb-&gt;pages[tlb-&gt;nr++] = page;</div><div class='add'>+	VM_WARN_ON(tlb-&gt;nr &gt; tlb-&gt;max);</div><div class='ctx'> 	if (tlb-&gt;nr == tlb-&gt;max)</div><div class='ctx'> 		return true;</div><div class='del'>-	tlb-&gt;pages[tlb-&gt;nr++] = page;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='ctx'> {</div><div class='del'>-	if (__tlb_remove_page(tlb, page)) {</div><div class='add'>+	if (__tlb_remove_page(tlb, page))</div><div class='ctx'> 		tlb_flush_mmu(tlb);</div><div class='del'>-		__tlb_remove_page(tlb, page);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='hunk'>@@ -231,12 +232,6 @@ static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 	return __tlb_remove_page(tlb, page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool __tlb_remove_pte_page(struct mmu_gather *tlb,</div><div class='del'>-					 struct page *page)</div><div class='del'>-{</div><div class='del'>-	return __tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 					struct page *page, int page_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -284,5 +279,11 @@ tlb_remove_pmd_tlb_entry(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr</div><div class='ctx'> </div><div class='ctx'> #define tlb_migrate_finish(mm)		do { } while (0)</div><div class='ctx'> </div><div class='add'>+#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='add'>+static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='add'>+						     unsigned int page_size)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h<br/>index def9e570199f..1897b5196fb5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/tlbflush.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/tlbflush.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/tlbflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/tlbflush.h</a></div><div class='hunk'>@@ -10,6 +10,10 @@</div><div class='ctx'> #ifndef _ASMARM_TLBFLUSH_H</div><div class='ctx'> #define _ASMARM_TLBFLUSH_H</div><div class='ctx'> </div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+# include &lt;linux/mm_types.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/glue.h&gt;</div><div class='hunk'>@@ -644,9 +648,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,</div><div class='ctx'> #elif defined(CONFIG_SMP)	/* !CONFIG_MMU */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mm_types.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void local_flush_tlb_all(void)									{ }</div><div class='ctx'> static inline void local_flush_tlb_mm(struct mm_struct *mm)							{ }</div><div class='ctx'> static inline void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)			{ }</div><div class='head'>diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h<br/>deleted file mode 100644<br/>index a53cdb8f068c..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/types.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,40 +0,0 @@</div><div class='del'>-#ifndef _ASM_TYPES_H</div><div class='del'>-#define _ASM_TYPES_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/int-ll64.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as</div><div class='del'>- * unambiguous on ARM as you would expect. For the types below, there is a</div><div class='del'>- * difference on ARM between GCC built for bare metal ARM, GCC built for glibc</div><div class='del'>- * and the kernel itself, which results in build errors if you try to build with</div><div class='del'>- * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h'</div><div class='del'>- * in order to use NEON intrinsics)</div><div class='del'>- *</div><div class='del'>- * As the typedefs for these types in 'stdint.h' are based on builtin defines</div><div class='del'>- * supplied by GCC, we can tweak these to align with the kernel's idea of those</div><div class='del'>- * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same</div><div class='del'>- * source file (provided that -ffreestanding is used).</div><div class='del'>- *</div><div class='del'>- *                    int32_t         uint32_t               uintptr_t</div><div class='del'>- * bare metal GCC     long            unsigned long          unsigned int</div><div class='del'>- * glibc GCC          int             unsigned int           unsigned int</div><div class='del'>- * kernel             int             unsigned int           unsigned long</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef __INT32_TYPE__</div><div class='del'>-#undef __INT32_TYPE__</div><div class='del'>-#define __INT32_TYPE__		int</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __UINT32_TYPE__</div><div class='del'>-#undef __UINT32_TYPE__</div><div class='del'>-#define __UINT32_TYPE__	unsigned int</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __UINTPTR_TYPE__</div><div class='del'>-#undef __UINTPTR_TYPE__</div><div class='del'>-#define __UINTPTR_TYPE__	unsigned long</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_TYPES_H */</div><div class='head'>diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h<br/>index 1f59ea051bab..b7e0125c0bbf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/uaccess.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/uaccess.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/uaccess.h</a></div><div class='hunk'>@@ -478,11 +478,10 @@ extern unsigned long __must_check</div><div class='ctx'> arm_copy_from_user(void *to, const void __user *from, unsigned long n);</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long __must_check</div><div class='del'>-__copy_from_user(void *to, const void __user *from, unsigned long n)</div><div class='add'>+__arch_copy_from_user(void *to, const void __user *from, unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int __ua_flags;</div><div class='ctx'> </div><div class='del'>-	check_object_size(to, n, false);</div><div class='ctx'> 	__ua_flags = uaccess_save_and_enable();</div><div class='ctx'> 	n = arm_copy_from_user(to, from, n);</div><div class='ctx'> 	uaccess_restore(__ua_flags);</div><div class='hunk'>@@ -495,18 +494,15 @@ extern unsigned long __must_check</div><div class='ctx'> __copy_to_user_std(void __user *to, const void *from, unsigned long n);</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long __must_check</div><div class='del'>-__copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='add'>+__arch_copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> #ifndef CONFIG_UACCESS_WITH_MEMCPY</div><div class='ctx'> 	unsigned int __ua_flags;</div><div class='del'>-</div><div class='del'>-	check_object_size(from, n, true);</div><div class='ctx'> 	__ua_flags = uaccess_save_and_enable();</div><div class='ctx'> 	n = arm_copy_to_user(to, from, n);</div><div class='ctx'> 	uaccess_restore(__ua_flags);</div><div class='ctx'> 	return n;</div><div class='ctx'> #else</div><div class='del'>-	check_object_size(from, n, true);</div><div class='ctx'> 	return arm_copy_to_user(to, from, n);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -526,25 +522,49 @@ __clear_user(void __user *addr, unsigned long n)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-#define __copy_from_user(to, from, n)	(memcpy(to, (void __force *)from, n), 0)</div><div class='del'>-#define __copy_to_user(to, from, n)	(memcpy((void __force *)to, from, n), 0)</div><div class='add'>+#define __arch_copy_from_user(to, from, n)	\</div><div class='add'>+					(memcpy(to, (void __force *)from, n), 0)</div><div class='add'>+#define __arch_copy_to_user(to, from, n)	\</div><div class='add'>+					(memcpy((void __force *)to, from, n), 0)</div><div class='ctx'> #define __clear_user(addr, n)		(memset((void __force *)addr, 0, n), 0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)</div><div class='add'>+static inline unsigned long __must_check</div><div class='add'>+__copy_from_user(void *to, const void __user *from, unsigned long n)</div><div class='add'>+{</div><div class='add'>+	check_object_size(to, n, false);</div><div class='add'>+	return __arch_copy_from_user(to, from, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long __must_check</div><div class='add'>+copy_from_user(void *to, const void __user *from, unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long res = n;</div><div class='add'>+</div><div class='add'>+	check_object_size(to, n, false);</div><div class='add'>+</div><div class='ctx'> 	if (likely(access_ok(VERIFY_READ, from, n)))</div><div class='del'>-		res = __copy_from_user(to, from, n);</div><div class='add'>+		res = __arch_copy_from_user(to, from, n);</div><div class='ctx'> 	if (unlikely(res))</div><div class='ctx'> 		memset(to + (n - res), 0, res);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='add'>+static inline unsigned long __must_check</div><div class='add'>+__copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='ctx'> {</div><div class='add'>+	check_object_size(from, n, true);</div><div class='add'>+</div><div class='add'>+	return __arch_copy_to_user(to, from, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long __must_check</div><div class='add'>+copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='add'>+{</div><div class='add'>+	check_object_size(from, n, true);</div><div class='add'>+</div><div class='ctx'> 	if (access_ok(VERIFY_WRITE, to, n))</div><div class='del'>-		n = __copy_to_user(to, from, n);</div><div class='add'>+		n = __arch_copy_to_user(to, from, n);</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h<br/>index ada0d29a660f..076090d2dbf5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/unistd.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/unistd.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/unistd.h</a></div><div class='hunk'>@@ -14,12 +14,7 @@</div><div class='ctx'> #define __ASM_ARM_UNISTD_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/asm/unistd.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This may need to be greater than __NR_last_syscall+1 in order to</div><div class='del'>- * account for the padding in the syscall table</div><div class='del'>- */</div><div class='del'>-#define __NR_syscalls  (400)</div><div class='add'>+#include &lt;asm/unistd-nr.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __ARCH_WANT_STAT64</div><div class='ctx'> #define __ARCH_WANT_SYS_GETHOSTNAME</div><div class='hunk'>@@ -52,4 +47,23 @@</div><div class='ctx'> #define __IGNORE_fadvise64_64</div><div class='ctx'> #define __IGNORE_migrate_pages</div><div class='ctx'> </div><div class='add'>+#ifdef __ARM_EABI__</div><div class='add'>+/*</div><div class='add'>+ * The following syscalls are obsolete and no longer available for EABI:</div><div class='add'>+ *  __NR_time</div><div class='add'>+ *  __NR_umount</div><div class='add'>+ *  __NR_stime</div><div class='add'>+ *  __NR_alarm</div><div class='add'>+ *  __NR_utime</div><div class='add'>+ *  __NR_getrlimit</div><div class='add'>+ *  __NR_select</div><div class='add'>+ *  __NR_readdir</div><div class='add'>+ *  __NR_mmap</div><div class='add'>+ *  __NR_socketcall</div><div class='add'>+ *  __NR_syscall</div><div class='add'>+ *  __NR_ipc</div><div class='add'>+ */</div><div class='add'>+#define __IGNORE_getrlimit</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_ARM_UNISTD_H */</div><div class='head'>diff --git a/arch/arm/include/asm/virt.h b/arch/arm/include/asm/virt.h<br/>index a2e75b84e2ae..6dae1956c74d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/virt.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/virt.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/virt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/virt.h</a></div><div class='hunk'>@@ -80,6 +80,11 @@ static inline bool is_kernel_in_hyp_mode(void)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool has_vhe(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* The section containing the hypervisor idmap text */</div><div class='ctx'> extern char __hyp_idmap_text_start[];</div><div class='ctx'> extern char __hyp_idmap_text_end[];</div><div class='head'>diff --git a/arch/arm/include/asm/xen/hypercall.h b/arch/arm/include/asm/xen/hypercall.h<br/>index 9d874db13c0e..3522cbaed316 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/xen/hypercall.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/xen/hypercall.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/xen/hypercall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/xen/hypercall.h</a></div><div class='hunk'>@@ -1,87 +1 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- * hypercall.h</div><div class='del'>- *</div><div class='del'>- * Linux-specific hypervisor handling.</div><div class='del'>- *</div><div class='del'>- * Stefano Stabellini &lt;stefano.stabellini@eu.citrix.com&gt;, Citrix, 2012</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation; or, when distributed</div><div class='del'>- * separately from the Linux kernel or incorporated into other</div><div class='del'>- * software packages, subject to the following license:</div><div class='del'>- *</div><div class='del'>- * Permission is hereby granted, free of charge, to any person obtaining a copy</div><div class='del'>- * of this source file (the "Software"), to deal in the Software without</div><div class='del'>- * restriction, including without limitation the rights to use, copy, modify,</div><div class='del'>- * merge, publish, distribute, sublicense, and/or sell copies of the Software,</div><div class='del'>- * and to permit persons to whom the Software is furnished to do so, subject to</div><div class='del'>- * the following conditions:</div><div class='del'>- *</div><div class='del'>- * The above copyright notice and this permission notice shall be included in</div><div class='del'>- * all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='del'>- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='del'>- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE</div><div class='del'>- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='del'>- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='del'>- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS</div><div class='del'>- * IN THE SOFTWARE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ASM_ARM_XEN_HYPERCALL_H</div><div class='del'>-#define _ASM_ARM_XEN_HYPERCALL_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;xen/interface/xen.h&gt;</div><div class='del'>-#include &lt;xen/interface/sched.h&gt;</div><div class='del'>-#include &lt;xen/interface/platform.h&gt;</div><div class='del'>-</div><div class='del'>-long privcmd_call(unsigned call, unsigned long a1,</div><div class='del'>-		unsigned long a2, unsigned long a3,</div><div class='del'>-		unsigned long a4, unsigned long a5);</div><div class='del'>-int HYPERVISOR_xen_version(int cmd, void *arg);</div><div class='del'>-int HYPERVISOR_console_io(int cmd, int count, char *str);</div><div class='del'>-int HYPERVISOR_grant_table_op(unsigned int cmd, void *uop, unsigned int count);</div><div class='del'>-int HYPERVISOR_sched_op(int cmd, void *arg);</div><div class='del'>-int HYPERVISOR_event_channel_op(int cmd, void *arg);</div><div class='del'>-unsigned long HYPERVISOR_hvm_op(int op, void *arg);</div><div class='del'>-int HYPERVISOR_memory_op(unsigned int cmd, void *arg);</div><div class='del'>-int HYPERVISOR_physdev_op(int cmd, void *arg);</div><div class='del'>-int HYPERVISOR_vcpu_op(int cmd, int vcpuid, void *extra_args);</div><div class='del'>-int HYPERVISOR_tmem_op(void *arg);</div><div class='del'>-int HYPERVISOR_vm_assist(unsigned int cmd, unsigned int type);</div><div class='del'>-int HYPERVISOR_platform_op_raw(void *arg);</div><div class='del'>-static inline int HYPERVISOR_platform_op(struct xen_platform_op *op)</div><div class='del'>-{</div><div class='del'>-	op-&gt;interface_version = XENPF_INTERFACE_VERSION;</div><div class='del'>-	return HYPERVISOR_platform_op_raw(op);</div><div class='del'>-}</div><div class='del'>-int HYPERVISOR_multicall(struct multicall_entry *calls, uint32_t nr);</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-HYPERVISOR_suspend(unsigned long start_info_mfn)</div><div class='del'>-{</div><div class='del'>-	struct sched_shutdown r = { .reason = SHUTDOWN_suspend };</div><div class='del'>-</div><div class='del'>-	/* start_info_mfn is unused on ARM */</div><div class='del'>-	return HYPERVISOR_sched_op(SCHEDOP_shutdown, &amp;r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,</div><div class='del'>-			unsigned int new_val, unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req,</div><div class='del'>-		 int count, int *success_count, domid_t domid)</div><div class='del'>-{</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_ARM_XEN_HYPERCALL_H */</div><div class='add'>+#include &lt;xen/arm/hypercall.h&gt;</div><div class='head'>diff --git a/arch/arm/include/asm/xen/hypervisor.h b/arch/arm/include/asm/xen/hypervisor.h<br/>index 95251512e2c4..d6e7709d0688 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/xen/hypervisor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/xen/hypervisor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/xen/hypervisor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/xen/hypervisor.h</a></div><div class='hunk'>@@ -1,39 +1 @@</div><div class='del'>-#ifndef _ASM_ARM_XEN_HYPERVISOR_H</div><div class='del'>-#define _ASM_ARM_XEN_HYPERVISOR_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-extern struct shared_info *HYPERVISOR_shared_info;</div><div class='del'>-extern struct start_info *xen_start_info;</div><div class='del'>-</div><div class='del'>-/* Lazy mode for batching updates / context switch */</div><div class='del'>-enum paravirt_lazy_mode {</div><div class='del'>-	PARAVIRT_LAZY_NONE,</div><div class='del'>-	PARAVIRT_LAZY_MMU,</div><div class='del'>-	PARAVIRT_LAZY_CPU,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline enum paravirt_lazy_mode paravirt_get_lazy_mode(void)</div><div class='del'>-{</div><div class='del'>-	return PARAVIRT_LAZY_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern struct dma_map_ops *xen_dma_ops;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_XEN</div><div class='del'>-void __init xen_early_init(void);</div><div class='del'>-#else</div><div class='del'>-static inline void xen_early_init(void) { return; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-static inline void xen_arch_register_cpu(int num)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void xen_arch_unregister_cpu(int num)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_ARM_XEN_HYPERVISOR_H */</div><div class='add'>+#include &lt;xen/arm/hypervisor.h&gt;</div><div class='head'>diff --git a/arch/arm/include/asm/xen/interface.h b/arch/arm/include/asm/xen/interface.h<br/>index 75d596862892..88c0d75da190 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/xen/interface.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/xen/interface.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/xen/interface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/xen/interface.h</a></div><div class='hunk'>@@ -1,85 +1 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- * Guest OS interface to ARM Xen.</div><div class='del'>- *</div><div class='del'>- * Stefano Stabellini &lt;stefano.stabellini@eu.citrix.com&gt;, Citrix, 2012</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ASM_ARM_XEN_INTERFACE_H</div><div class='del'>-#define _ASM_ARM_XEN_INTERFACE_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#define uint64_aligned_t uint64_t __attribute__((aligned(8)))</div><div class='del'>-</div><div class='del'>-#define __DEFINE_GUEST_HANDLE(name, type) \</div><div class='del'>-	typedef struct { union { type *p; uint64_aligned_t q; }; }  \</div><div class='del'>-        __guest_handle_ ## name</div><div class='del'>-</div><div class='del'>-#define DEFINE_GUEST_HANDLE_STRUCT(name) \</div><div class='del'>-	__DEFINE_GUEST_HANDLE(name, struct name)</div><div class='del'>-#define DEFINE_GUEST_HANDLE(name) __DEFINE_GUEST_HANDLE(name, name)</div><div class='del'>-#define GUEST_HANDLE(name)        __guest_handle_ ## name</div><div class='del'>-</div><div class='del'>-#define set_xen_guest_handle(hnd, val)			\</div><div class='del'>-	do {						\</div><div class='del'>-		if (sizeof(hnd) == 8)			\</div><div class='del'>-			*(uint64_t *)&amp;(hnd) = 0;	\</div><div class='del'>-		(hnd).p = val;				\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define __HYPERVISOR_platform_op_raw __HYPERVISOR_platform_op</div><div class='del'>-</div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-/* Explicitly size integers that represent pfns in the interface with</div><div class='del'>- * Xen so that we can have one ABI that works for 32 and 64 bit guests.</div><div class='del'>- * Note that this means that the xen_pfn_t type may be capable of</div><div class='del'>- * representing pfn's which the guest cannot represent in its own pfn</div><div class='del'>- * type. However since pfn space is controlled by the guest this is</div><div class='del'>- * fine since it simply wouldn't be able to create any sure pfns in</div><div class='del'>- * the first place.</div><div class='del'>- */</div><div class='del'>-typedef uint64_t xen_pfn_t;</div><div class='del'>-#define PRI_xen_pfn "llx"</div><div class='del'>-typedef uint64_t xen_ulong_t;</div><div class='del'>-#define PRI_xen_ulong "llx"</div><div class='del'>-typedef int64_t xen_long_t;</div><div class='del'>-#define PRI_xen_long "llx"</div><div class='del'>-/* Guest handles for primitive C types. */</div><div class='del'>-__DEFINE_GUEST_HANDLE(uchar, unsigned char);</div><div class='del'>-__DEFINE_GUEST_HANDLE(uint,  unsigned int);</div><div class='del'>-DEFINE_GUEST_HANDLE(char);</div><div class='del'>-DEFINE_GUEST_HANDLE(int);</div><div class='del'>-DEFINE_GUEST_HANDLE(void);</div><div class='del'>-DEFINE_GUEST_HANDLE(uint64_t);</div><div class='del'>-DEFINE_GUEST_HANDLE(uint32_t);</div><div class='del'>-DEFINE_GUEST_HANDLE(xen_pfn_t);</div><div class='del'>-DEFINE_GUEST_HANDLE(xen_ulong_t);</div><div class='del'>-</div><div class='del'>-/* Maximum number of virtual CPUs in multi-processor guests. */</div><div class='del'>-#define MAX_VIRT_CPUS 1</div><div class='del'>-</div><div class='del'>-struct arch_vcpu_info { };</div><div class='del'>-struct arch_shared_info { };</div><div class='del'>-</div><div class='del'>-/* TODO: Move pvclock definitions some place arch independent */</div><div class='del'>-struct pvclock_vcpu_time_info {</div><div class='del'>-	u32   version;</div><div class='del'>-	u32   pad0;</div><div class='del'>-	u64   tsc_timestamp;</div><div class='del'>-	u64   system_time;</div><div class='del'>-	u32   tsc_to_system_mul;</div><div class='del'>-	s8    tsc_shift;</div><div class='del'>-	u8    flags;</div><div class='del'>-	u8    pad[2];</div><div class='del'>-} __attribute__((__packed__)); /* 32 bytes */</div><div class='del'>-</div><div class='del'>-/* It is OK to have a 12 bytes struct with no padding because it is packed */</div><div class='del'>-struct pvclock_wall_clock {</div><div class='del'>-	u32   version;</div><div class='del'>-	u32   sec;</div><div class='del'>-	u32   nsec;</div><div class='del'>-	u32   sec_hi;</div><div class='del'>-} __attribute__((__packed__));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_ARM_XEN_INTERFACE_H */</div><div class='add'>+#include &lt;xen/arm/interface.h&gt;</div><div class='head'>diff --git a/arch/arm/include/asm/xen/page-coherent.h b/arch/arm/include/asm/xen/page-coherent.h<br/>index 95ce6ac3a971..b3ef061d8b74 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/xen/page-coherent.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/xen/page-coherent.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/xen/page-coherent.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/xen/page-coherent.h</a></div><div class='hunk'>@@ -1,98 +1 @@</div><div class='del'>-#ifndef _ASM_ARM_XEN_PAGE_COHERENT_H</div><div class='del'>-#define _ASM_ARM_XEN_PAGE_COHERENT_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-</div><div class='del'>-void __xen_dma_map_page(struct device *hwdev, struct page *page,</div><div class='del'>-	     dma_addr_t dev_addr, unsigned long offset, size_t size,</div><div class='del'>-	     enum dma_data_direction dir, unsigned long attrs);</div><div class='del'>-void __xen_dma_unmap_page(struct device *hwdev, dma_addr_t handle,</div><div class='del'>-		size_t size, enum dma_data_direction dir,</div><div class='del'>-		unsigned long attrs);</div><div class='del'>-void __xen_dma_sync_single_for_cpu(struct device *hwdev,</div><div class='del'>-		dma_addr_t handle, size_t size, enum dma_data_direction dir);</div><div class='del'>-</div><div class='del'>-void __xen_dma_sync_single_for_device(struct device *hwdev,</div><div class='del'>-		dma_addr_t handle, size_t size, enum dma_data_direction dir);</div><div class='del'>-</div><div class='del'>-static inline void *xen_alloc_coherent_pages(struct device *hwdev, size_t size,</div><div class='del'>-		dma_addr_t *dma_handle, gfp_t flags, unsigned long attrs)</div><div class='del'>-{</div><div class='del'>-	return __generic_dma_ops(hwdev)-&gt;alloc(hwdev, size, dma_handle, flags, attrs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void xen_free_coherent_pages(struct device *hwdev, size_t size,</div><div class='del'>-		void *cpu_addr, dma_addr_t dma_handle, unsigned long attrs)</div><div class='del'>-{</div><div class='del'>-	__generic_dma_ops(hwdev)-&gt;free(hwdev, size, cpu_addr, dma_handle, attrs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void xen_dma_map_page(struct device *hwdev, struct page *page,</div><div class='del'>-	     dma_addr_t dev_addr, unsigned long offset, size_t size,</div><div class='del'>-	     enum dma_data_direction dir, unsigned long attrs)</div><div class='del'>-{</div><div class='del'>-	unsigned long page_pfn = page_to_xen_pfn(page);</div><div class='del'>-	unsigned long dev_pfn = XEN_PFN_DOWN(dev_addr);</div><div class='del'>-	unsigned long compound_pages =</div><div class='del'>-		(1&lt;&lt;compound_order(page)) * XEN_PFN_PER_PAGE;</div><div class='del'>-	bool local = (page_pfn &lt;= dev_pfn) &amp;&amp;</div><div class='del'>-		(dev_pfn - page_pfn &lt; compound_pages);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Dom0 is mapped 1:1, while the Linux page can span across</div><div class='del'>-	 * multiple Xen pages, it's not possible for it to contain a</div><div class='del'>-	 * mix of local and foreign Xen pages. So if the first xen_pfn</div><div class='del'>-	 * == mfn the page is local otherwise it's a foreign page</div><div class='del'>-	 * grant-mapped in dom0. If the page is local we can safely</div><div class='del'>-	 * call the native dma_ops function, otherwise we call the xen</div><div class='del'>-	 * specific function.</div><div class='del'>-	 */</div><div class='del'>-	if (local)</div><div class='del'>-		__generic_dma_ops(hwdev)-&gt;map_page(hwdev, page, offset, size, dir, attrs);</div><div class='del'>-	else</div><div class='del'>-		__xen_dma_map_page(hwdev, page, dev_addr, offset, size, dir, attrs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void xen_dma_unmap_page(struct device *hwdev, dma_addr_t handle,</div><div class='del'>-		size_t size, enum dma_data_direction dir, unsigned long attrs)</div><div class='del'>-{</div><div class='del'>-	unsigned long pfn = PFN_DOWN(handle);</div><div class='del'>-	/*</div><div class='del'>-	 * Dom0 is mapped 1:1, while the Linux page can be spanned accross</div><div class='del'>-	 * multiple Xen page, it's not possible to have a mix of local and</div><div class='del'>-	 * foreign Xen page. Dom0 is mapped 1:1, so calling pfn_valid on a</div><div class='del'>-	 * foreign mfn will always return false. If the page is local we can</div><div class='del'>-	 * safely call the native dma_ops function, otherwise we call the xen</div><div class='del'>-	 * specific function.</div><div class='del'>-	 */</div><div class='del'>-	if (pfn_valid(pfn)) {</div><div class='del'>-		if (__generic_dma_ops(hwdev)-&gt;unmap_page)</div><div class='del'>-			__generic_dma_ops(hwdev)-&gt;unmap_page(hwdev, handle, size, dir, attrs);</div><div class='del'>-	} else</div><div class='del'>-		__xen_dma_unmap_page(hwdev, handle, size, dir, attrs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void xen_dma_sync_single_for_cpu(struct device *hwdev,</div><div class='del'>-		dma_addr_t handle, size_t size, enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-	unsigned long pfn = PFN_DOWN(handle);</div><div class='del'>-	if (pfn_valid(pfn)) {</div><div class='del'>-		if (__generic_dma_ops(hwdev)-&gt;sync_single_for_cpu)</div><div class='del'>-			__generic_dma_ops(hwdev)-&gt;sync_single_for_cpu(hwdev, handle, size, dir);</div><div class='del'>-	} else</div><div class='del'>-		__xen_dma_sync_single_for_cpu(hwdev, handle, size, dir);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void xen_dma_sync_single_for_device(struct device *hwdev,</div><div class='del'>-		dma_addr_t handle, size_t size, enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-	unsigned long pfn = PFN_DOWN(handle);</div><div class='del'>-	if (pfn_valid(pfn)) {</div><div class='del'>-		if (__generic_dma_ops(hwdev)-&gt;sync_single_for_device)</div><div class='del'>-			__generic_dma_ops(hwdev)-&gt;sync_single_for_device(hwdev, handle, size, dir);</div><div class='del'>-	} else</div><div class='del'>-		__xen_dma_sync_single_for_device(hwdev, handle, size, dir);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_ARM_XEN_PAGE_COHERENT_H */</div><div class='add'>+#include &lt;xen/arm/page-coherent.h&gt;</div><div class='head'>diff --git a/arch/arm/include/asm/xen/page.h b/arch/arm/include/asm/xen/page.h<br/>index 415dbc6e43fd..31bbc803cecb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/asm/xen/page.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/asm/xen/page.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/asm/xen/page.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/asm/xen/page.h</a></div><div class='hunk'>@@ -1,122 +1 @@</div><div class='del'>-#ifndef _ASM_ARM_XEN_PAGE_H</div><div class='del'>-#define _ASM_ARM_XEN_PAGE_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pfn.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;xen/xen.h&gt;</div><div class='del'>-#include &lt;xen/interface/grant_table.h&gt;</div><div class='del'>-</div><div class='del'>-#define phys_to_machine_mapping_valid(pfn) (1)</div><div class='del'>-</div><div class='del'>-/* Xen machine address */</div><div class='del'>-typedef struct xmaddr {</div><div class='del'>-	phys_addr_t maddr;</div><div class='del'>-} xmaddr_t;</div><div class='del'>-</div><div class='del'>-/* Xen pseudo-physical address */</div><div class='del'>-typedef struct xpaddr {</div><div class='del'>-	phys_addr_t paddr;</div><div class='del'>-} xpaddr_t;</div><div class='del'>-</div><div class='del'>-#define XMADDR(x)	((xmaddr_t) { .maddr = (x) })</div><div class='del'>-#define XPADDR(x)	((xpaddr_t) { .paddr = (x) })</div><div class='del'>-</div><div class='del'>-#define INVALID_P2M_ENTRY      (~0UL)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The pseudo-physical frame (pfn) used in all the helpers is always based</div><div class='del'>- * on Xen page granularity (i.e 4KB).</div><div class='del'>- *</div><div class='del'>- * A Linux page may be split across multiple non-contiguous Xen page so we</div><div class='del'>- * have to keep track with frame based on 4KB page granularity.</div><div class='del'>- *</div><div class='del'>- * PV drivers should never make a direct usage of those helpers (particularly</div><div class='del'>- * pfn_to_gfn and gfn_to_pfn).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-unsigned long __pfn_to_mfn(unsigned long pfn);</div><div class='del'>-extern struct rb_root phys_to_mach;</div><div class='del'>-</div><div class='del'>-/* Pseudo-physical &lt;-&gt; Guest conversion */</div><div class='del'>-static inline unsigned long pfn_to_gfn(unsigned long pfn)</div><div class='del'>-{</div><div class='del'>-	return pfn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long gfn_to_pfn(unsigned long gfn)</div><div class='del'>-{</div><div class='del'>-	return gfn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Pseudo-physical &lt;-&gt; BUS conversion */</div><div class='del'>-static inline unsigned long pfn_to_bfn(unsigned long pfn)</div><div class='del'>-{</div><div class='del'>-	unsigned long mfn;</div><div class='del'>-</div><div class='del'>-	if (phys_to_mach.rb_node != NULL) {</div><div class='del'>-		mfn = __pfn_to_mfn(pfn);</div><div class='del'>-		if (mfn != INVALID_P2M_ENTRY)</div><div class='del'>-			return mfn;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return pfn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long bfn_to_pfn(unsigned long bfn)</div><div class='del'>-{</div><div class='del'>-	return bfn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bfn_to_local_pfn(bfn)	bfn_to_pfn(bfn)</div><div class='del'>-</div><div class='del'>-/* VIRT &lt;-&gt; GUEST conversion */</div><div class='del'>-#define virt_to_gfn(v)		(pfn_to_gfn(virt_to_phys(v) &gt;&gt; XEN_PAGE_SHIFT))</div><div class='del'>-#define gfn_to_virt(m)		(__va(gfn_to_pfn(m) &lt;&lt; XEN_PAGE_SHIFT))</div><div class='del'>-</div><div class='del'>-/* Only used in PV code. But ARM guests are always HVM. */</div><div class='del'>-static inline xmaddr_t arbitrary_virt_to_machine(void *vaddr)</div><div class='del'>-{</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* TODO: this shouldn't be here but it is because the frontend drivers</div><div class='del'>- * are using it (its rolled in headers) even though we won't hit the code path.</div><div class='del'>- * So for right now just punt with this.</div><div class='del'>- */</div><div class='del'>-static inline pte_t *lookup_address(unsigned long address, unsigned int *level)</div><div class='del'>-{</div><div class='del'>-	BUG();</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,</div><div class='del'>-				   struct gnttab_map_grant_ref *kmap_ops,</div><div class='del'>-				   struct page **pages, unsigned int count);</div><div class='del'>-</div><div class='del'>-extern int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,</div><div class='del'>-				     struct gnttab_unmap_grant_ref *kunmap_ops,</div><div class='del'>-				     struct page **pages, unsigned int count);</div><div class='del'>-</div><div class='del'>-bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn);</div><div class='del'>-bool __set_phys_to_machine_multi(unsigned long pfn, unsigned long mfn,</div><div class='del'>-		unsigned long nr_pages);</div><div class='del'>-</div><div class='del'>-static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn)</div><div class='del'>-{</div><div class='del'>-	return __set_phys_to_machine(pfn, mfn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define xen_remap(cookie, size) ioremap_cache((cookie), (size))</div><div class='del'>-#define xen_unmap(cookie) iounmap((cookie))</div><div class='del'>-</div><div class='del'>-bool xen_arch_need_swiotlb(struct device *dev,</div><div class='del'>-			   phys_addr_t phys,</div><div class='del'>-			   dma_addr_t dev_addr);</div><div class='del'>-unsigned long xen_get_swiotlb_free_pages(unsigned int order);</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_ARM_XEN_PAGE_H */</div><div class='add'>+#include &lt;xen/arm/page.h&gt;</div><div class='head'>diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild<br/>index a1c05f93d920..46a76cd6acb6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/uapi/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/uapi/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -18,3 +18,6 @@ header-y += stat.h</div><div class='ctx'> header-y += statfs.h</div><div class='ctx'> header-y += swab.h</div><div class='ctx'> header-y += unistd.h</div><div class='add'>+genhdr-y += unistd-common.h</div><div class='add'>+genhdr-y += unistd-oabi.h</div><div class='add'>+genhdr-y += unistd-eabi.h</div><div class='head'>diff --git a/arch/arm/include/uapi/asm/kvm.h b/arch/arm/include/uapi/asm/kvm.h<br/>index b38c10c73579..6ebd3e6a1fd1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/uapi/asm/kvm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/uapi/asm/kvm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/uapi/asm/kvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/uapi/asm/kvm.h</a></div><div class='hunk'>@@ -87,9 +87,11 @@ struct kvm_regs {</div><div class='ctx'> /* Supported VGICv3 address types  */</div><div class='ctx'> #define KVM_VGIC_V3_ADDR_TYPE_DIST	2</div><div class='ctx'> #define KVM_VGIC_V3_ADDR_TYPE_REDIST	3</div><div class='add'>+#define KVM_VGIC_ITS_ADDR_TYPE		4</div><div class='ctx'> </div><div class='ctx'> #define KVM_VGIC_V3_DIST_SIZE		SZ_64K</div><div class='ctx'> #define KVM_VGIC_V3_REDIST_SIZE		(2 * SZ_64K)</div><div class='add'>+#define KVM_VGIC_V3_ITS_SIZE		(2 * SZ_64K)</div><div class='ctx'> </div><div class='ctx'> #define KVM_ARM_VCPU_POWER_OFF		0 /* CPU is started in OFF state */</div><div class='ctx'> #define KVM_ARM_VCPU_PSCI_0_2		1 /* CPU uses PSCI v0.2 */</div><div class='hunk'>@@ -179,10 +181,23 @@ struct kvm_arch_memory_slot {</div><div class='ctx'> #define KVM_DEV_ARM_VGIC_GRP_CPU_REGS	2</div><div class='ctx'> #define   KVM_DEV_ARM_VGIC_CPUID_SHIFT	32</div><div class='ctx'> #define   KVM_DEV_ARM_VGIC_CPUID_MASK	(0xffULL &lt;&lt; KVM_DEV_ARM_VGIC_CPUID_SHIFT)</div><div class='add'>+#define   KVM_DEV_ARM_VGIC_V3_MPIDR_SHIFT 32</div><div class='add'>+#define   KVM_DEV_ARM_VGIC_V3_MPIDR_MASK \</div><div class='add'>+			(0xffffffffULL &lt;&lt; KVM_DEV_ARM_VGIC_V3_MPIDR_SHIFT)</div><div class='ctx'> #define   KVM_DEV_ARM_VGIC_OFFSET_SHIFT	0</div><div class='ctx'> #define   KVM_DEV_ARM_VGIC_OFFSET_MASK	(0xffffffffULL &lt;&lt; KVM_DEV_ARM_VGIC_OFFSET_SHIFT)</div><div class='add'>+#define   KVM_DEV_ARM_VGIC_SYSREG_INSTR_MASK (0xffff)</div><div class='ctx'> #define KVM_DEV_ARM_VGIC_GRP_NR_IRQS	3</div><div class='ctx'> #define KVM_DEV_ARM_VGIC_GRP_CTRL       4</div><div class='add'>+#define KVM_DEV_ARM_VGIC_GRP_REDIST_REGS 5</div><div class='add'>+#define KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS 6</div><div class='add'>+#define KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO  7</div><div class='add'>+#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT	10</div><div class='add'>+#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_MASK \</div><div class='add'>+			(0x3fffffULL &lt;&lt; KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT)</div><div class='add'>+#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INTID_MASK 0x3ff</div><div class='add'>+#define VGIC_LEVEL_INFO_LINE_LEVEL	0</div><div class='add'>+</div><div class='ctx'> #define   KVM_DEV_ARM_VGIC_CTRL_INIT    0</div><div class='ctx'> </div><div class='ctx'> /* KVM_IRQ_LINE irq field index values */</div><div class='head'>diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h<br/>new file mode 100644<br/>index 000000000000..9435a42f575e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/uapi/asm/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/uapi/asm/types.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+#ifndef _UAPI_ASM_TYPES_H</div><div class='add'>+#define _UAPI_ASM_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/int-ll64.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as</div><div class='add'>+ * unambiguous on ARM as you would expect. For the types below, there is a</div><div class='add'>+ * difference on ARM between GCC built for bare metal ARM, GCC built for glibc</div><div class='add'>+ * and the kernel itself, which results in build errors if you try to build with</div><div class='add'>+ * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h'</div><div class='add'>+ * in order to use NEON intrinsics)</div><div class='add'>+ *</div><div class='add'>+ * As the typedefs for these types in 'stdint.h' are based on builtin defines</div><div class='add'>+ * supplied by GCC, we can tweak these to align with the kernel's idea of those</div><div class='add'>+ * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same</div><div class='add'>+ * source file (provided that -ffreestanding is used).</div><div class='add'>+ *</div><div class='add'>+ *                    int32_t         uint32_t               uintptr_t</div><div class='add'>+ * bare metal GCC     long            unsigned long          unsigned int</div><div class='add'>+ * glibc GCC          int             unsigned int           unsigned int</div><div class='add'>+ * kernel             int             unsigned int           unsigned long</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef __INT32_TYPE__</div><div class='add'>+#undef __INT32_TYPE__</div><div class='add'>+#define __INT32_TYPE__		int</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef __UINT32_TYPE__</div><div class='add'>+#undef __UINT32_TYPE__</div><div class='add'>+#define __UINT32_TYPE__	unsigned int</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef __UINTPTR_TYPE__</div><div class='add'>+#undef __UINTPTR_TYPE__</div><div class='add'>+#define __UINTPTR_TYPE__	unsigned long</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _UAPI_ASM_TYPES_H */</div><div class='head'>diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h<br/>index 314100a06ccb..28bd456494a3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/include/uapi/asm/unistd.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/include/uapi/asm/unistd.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/include/uapi/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/include/uapi/asm/unistd.h</a></div><div class='hunk'>@@ -17,412 +17,14 @@</div><div class='ctx'> </div><div class='ctx'> #if defined(__thumb__) || defined(__ARM_EABI__)</div><div class='ctx'> #define __NR_SYSCALL_BASE	0</div><div class='add'>+#include &lt;asm/unistd-eabi.h&gt;</div><div class='ctx'> #else</div><div class='ctx'> #define __NR_SYSCALL_BASE	__NR_OABI_SYSCALL_BASE</div><div class='add'>+#include &lt;asm/unistd-oabi.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This file contains the system call numbers.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define __NR_restart_syscall		(__NR_SYSCALL_BASE+  0)</div><div class='del'>-#define __NR_exit			(__NR_SYSCALL_BASE+  1)</div><div class='del'>-#define __NR_fork			(__NR_SYSCALL_BASE+  2)</div><div class='del'>-#define __NR_read			(__NR_SYSCALL_BASE+  3)</div><div class='del'>-#define __NR_write			(__NR_SYSCALL_BASE+  4)</div><div class='del'>-#define __NR_open			(__NR_SYSCALL_BASE+  5)</div><div class='del'>-#define __NR_close			(__NR_SYSCALL_BASE+  6)</div><div class='del'>-					/* 7 was sys_waitpid */</div><div class='del'>-#define __NR_creat			(__NR_SYSCALL_BASE+  8)</div><div class='del'>-#define __NR_link			(__NR_SYSCALL_BASE+  9)</div><div class='del'>-#define __NR_unlink			(__NR_SYSCALL_BASE+ 10)</div><div class='del'>-#define __NR_execve			(__NR_SYSCALL_BASE+ 11)</div><div class='del'>-#define __NR_chdir			(__NR_SYSCALL_BASE+ 12)</div><div class='del'>-#define __NR_time			(__NR_SYSCALL_BASE+ 13)</div><div class='del'>-#define __NR_mknod			(__NR_SYSCALL_BASE+ 14)</div><div class='del'>-#define __NR_chmod			(__NR_SYSCALL_BASE+ 15)</div><div class='del'>-#define __NR_lchown			(__NR_SYSCALL_BASE+ 16)</div><div class='del'>-					/* 17 was sys_break */</div><div class='del'>-					/* 18 was sys_stat */</div><div class='del'>-#define __NR_lseek			(__NR_SYSCALL_BASE+ 19)</div><div class='del'>-#define __NR_getpid			(__NR_SYSCALL_BASE+ 20)</div><div class='del'>-#define __NR_mount			(__NR_SYSCALL_BASE+ 21)</div><div class='del'>-#define __NR_umount			(__NR_SYSCALL_BASE+ 22)</div><div class='del'>-#define __NR_setuid			(__NR_SYSCALL_BASE+ 23)</div><div class='del'>-#define __NR_getuid			(__NR_SYSCALL_BASE+ 24)</div><div class='del'>-#define __NR_stime			(__NR_SYSCALL_BASE+ 25)</div><div class='del'>-#define __NR_ptrace			(__NR_SYSCALL_BASE+ 26)</div><div class='del'>-#define __NR_alarm			(__NR_SYSCALL_BASE+ 27)</div><div class='del'>-					/* 28 was sys_fstat */</div><div class='del'>-#define __NR_pause			(__NR_SYSCALL_BASE+ 29)</div><div class='del'>-#define __NR_utime			(__NR_SYSCALL_BASE+ 30)</div><div class='del'>-					/* 31 was sys_stty */</div><div class='del'>-					/* 32 was sys_gtty */</div><div class='del'>-#define __NR_access			(__NR_SYSCALL_BASE+ 33)</div><div class='del'>-#define __NR_nice			(__NR_SYSCALL_BASE+ 34)</div><div class='del'>-					/* 35 was sys_ftime */</div><div class='del'>-#define __NR_sync			(__NR_SYSCALL_BASE+ 36)</div><div class='del'>-#define __NR_kill			(__NR_SYSCALL_BASE+ 37)</div><div class='del'>-#define __NR_rename			(__NR_SYSCALL_BASE+ 38)</div><div class='del'>-#define __NR_mkdir			(__NR_SYSCALL_BASE+ 39)</div><div class='del'>-#define __NR_rmdir			(__NR_SYSCALL_BASE+ 40)</div><div class='del'>-#define __NR_dup			(__NR_SYSCALL_BASE+ 41)</div><div class='del'>-#define __NR_pipe			(__NR_SYSCALL_BASE+ 42)</div><div class='del'>-#define __NR_times			(__NR_SYSCALL_BASE+ 43)</div><div class='del'>-					/* 44 was sys_prof */</div><div class='del'>-#define __NR_brk			(__NR_SYSCALL_BASE+ 45)</div><div class='del'>-#define __NR_setgid			(__NR_SYSCALL_BASE+ 46)</div><div class='del'>-#define __NR_getgid			(__NR_SYSCALL_BASE+ 47)</div><div class='del'>-					/* 48 was sys_signal */</div><div class='del'>-#define __NR_geteuid			(__NR_SYSCALL_BASE+ 49)</div><div class='del'>-#define __NR_getegid			(__NR_SYSCALL_BASE+ 50)</div><div class='del'>-#define __NR_acct			(__NR_SYSCALL_BASE+ 51)</div><div class='del'>-#define __NR_umount2			(__NR_SYSCALL_BASE+ 52)</div><div class='del'>-					/* 53 was sys_lock */</div><div class='del'>-#define __NR_ioctl			(__NR_SYSCALL_BASE+ 54)</div><div class='del'>-#define __NR_fcntl			(__NR_SYSCALL_BASE+ 55)</div><div class='del'>-					/* 56 was sys_mpx */</div><div class='del'>-#define __NR_setpgid			(__NR_SYSCALL_BASE+ 57)</div><div class='del'>-					/* 58 was sys_ulimit */</div><div class='del'>-					/* 59 was sys_olduname */</div><div class='del'>-#define __NR_umask			(__NR_SYSCALL_BASE+ 60)</div><div class='del'>-#define __NR_chroot			(__NR_SYSCALL_BASE+ 61)</div><div class='del'>-#define __NR_ustat			(__NR_SYSCALL_BASE+ 62)</div><div class='del'>-#define __NR_dup2			(__NR_SYSCALL_BASE+ 63)</div><div class='del'>-#define __NR_getppid			(__NR_SYSCALL_BASE+ 64)</div><div class='del'>-#define __NR_getpgrp			(__NR_SYSCALL_BASE+ 65)</div><div class='del'>-#define __NR_setsid			(__NR_SYSCALL_BASE+ 66)</div><div class='del'>-#define __NR_sigaction			(__NR_SYSCALL_BASE+ 67)</div><div class='del'>-					/* 68 was sys_sgetmask */</div><div class='del'>-					/* 69 was sys_ssetmask */</div><div class='del'>-#define __NR_setreuid			(__NR_SYSCALL_BASE+ 70)</div><div class='del'>-#define __NR_setregid			(__NR_SYSCALL_BASE+ 71)</div><div class='del'>-#define __NR_sigsuspend			(__NR_SYSCALL_BASE+ 72)</div><div class='del'>-#define __NR_sigpending			(__NR_SYSCALL_BASE+ 73)</div><div class='del'>-#define __NR_sethostname		(__NR_SYSCALL_BASE+ 74)</div><div class='del'>-#define __NR_setrlimit			(__NR_SYSCALL_BASE+ 75)</div><div class='del'>-#define __NR_getrlimit			(__NR_SYSCALL_BASE+ 76)	/* Back compat 2GB limited rlimit */</div><div class='del'>-#define __NR_getrusage			(__NR_SYSCALL_BASE+ 77)</div><div class='del'>-#define __NR_gettimeofday		(__NR_SYSCALL_BASE+ 78)</div><div class='del'>-#define __NR_settimeofday		(__NR_SYSCALL_BASE+ 79)</div><div class='del'>-#define __NR_getgroups			(__NR_SYSCALL_BASE+ 80)</div><div class='del'>-#define __NR_setgroups			(__NR_SYSCALL_BASE+ 81)</div><div class='del'>-#define __NR_select			(__NR_SYSCALL_BASE+ 82)</div><div class='del'>-#define __NR_symlink			(__NR_SYSCALL_BASE+ 83)</div><div class='del'>-					/* 84 was sys_lstat */</div><div class='del'>-#define __NR_readlink			(__NR_SYSCALL_BASE+ 85)</div><div class='del'>-#define __NR_uselib			(__NR_SYSCALL_BASE+ 86)</div><div class='del'>-#define __NR_swapon			(__NR_SYSCALL_BASE+ 87)</div><div class='del'>-#define __NR_reboot			(__NR_SYSCALL_BASE+ 88)</div><div class='del'>-#define __NR_readdir			(__NR_SYSCALL_BASE+ 89)</div><div class='del'>-#define __NR_mmap			(__NR_SYSCALL_BASE+ 90)</div><div class='del'>-#define __NR_munmap			(__NR_SYSCALL_BASE+ 91)</div><div class='del'>-#define __NR_truncate			(__NR_SYSCALL_BASE+ 92)</div><div class='del'>-#define __NR_ftruncate			(__NR_SYSCALL_BASE+ 93)</div><div class='del'>-#define __NR_fchmod			(__NR_SYSCALL_BASE+ 94)</div><div class='del'>-#define __NR_fchown			(__NR_SYSCALL_BASE+ 95)</div><div class='del'>-#define __NR_getpriority		(__NR_SYSCALL_BASE+ 96)</div><div class='del'>-#define __NR_setpriority		(__NR_SYSCALL_BASE+ 97)</div><div class='del'>-					/* 98 was sys_profil */</div><div class='del'>-#define __NR_statfs			(__NR_SYSCALL_BASE+ 99)</div><div class='del'>-#define __NR_fstatfs			(__NR_SYSCALL_BASE+100)</div><div class='del'>-					/* 101 was sys_ioperm */</div><div class='del'>-#define __NR_socketcall			(__NR_SYSCALL_BASE+102)</div><div class='del'>-#define __NR_syslog			(__NR_SYSCALL_BASE+103)</div><div class='del'>-#define __NR_setitimer			(__NR_SYSCALL_BASE+104)</div><div class='del'>-#define __NR_getitimer			(__NR_SYSCALL_BASE+105)</div><div class='del'>-#define __NR_stat			(__NR_SYSCALL_BASE+106)</div><div class='del'>-#define __NR_lstat			(__NR_SYSCALL_BASE+107)</div><div class='del'>-#define __NR_fstat			(__NR_SYSCALL_BASE+108)</div><div class='del'>-					/* 109 was sys_uname */</div><div class='del'>-					/* 110 was sys_iopl */</div><div class='del'>-#define __NR_vhangup			(__NR_SYSCALL_BASE+111)</div><div class='del'>-					/* 112 was sys_idle */</div><div class='del'>-#define __NR_syscall			(__NR_SYSCALL_BASE+113) /* syscall to call a syscall! */</div><div class='del'>-#define __NR_wait4			(__NR_SYSCALL_BASE+114)</div><div class='del'>-#define __NR_swapoff			(__NR_SYSCALL_BASE+115)</div><div class='del'>-#define __NR_sysinfo			(__NR_SYSCALL_BASE+116)</div><div class='del'>-#define __NR_ipc			(__NR_SYSCALL_BASE+117)</div><div class='del'>-#define __NR_fsync			(__NR_SYSCALL_BASE+118)</div><div class='del'>-#define __NR_sigreturn			(__NR_SYSCALL_BASE+119)</div><div class='del'>-#define __NR_clone			(__NR_SYSCALL_BASE+120)</div><div class='del'>-#define __NR_setdomainname		(__NR_SYSCALL_BASE+121)</div><div class='del'>-#define __NR_uname			(__NR_SYSCALL_BASE+122)</div><div class='del'>-					/* 123 was sys_modify_ldt */</div><div class='del'>-#define __NR_adjtimex			(__NR_SYSCALL_BASE+124)</div><div class='del'>-#define __NR_mprotect			(__NR_SYSCALL_BASE+125)</div><div class='del'>-#define __NR_sigprocmask		(__NR_SYSCALL_BASE+126)</div><div class='del'>-					/* 127 was sys_create_module */</div><div class='del'>-#define __NR_init_module		(__NR_SYSCALL_BASE+128)</div><div class='del'>-#define __NR_delete_module		(__NR_SYSCALL_BASE+129)</div><div class='del'>-					/* 130 was sys_get_kernel_syms */</div><div class='del'>-#define __NR_quotactl			(__NR_SYSCALL_BASE+131)</div><div class='del'>-#define __NR_getpgid			(__NR_SYSCALL_BASE+132)</div><div class='del'>-#define __NR_fchdir			(__NR_SYSCALL_BASE+133)</div><div class='del'>-#define __NR_bdflush			(__NR_SYSCALL_BASE+134)</div><div class='del'>-#define __NR_sysfs			(__NR_SYSCALL_BASE+135)</div><div class='del'>-#define __NR_personality		(__NR_SYSCALL_BASE+136)</div><div class='del'>-					/* 137 was sys_afs_syscall */</div><div class='del'>-#define __NR_setfsuid			(__NR_SYSCALL_BASE+138)</div><div class='del'>-#define __NR_setfsgid			(__NR_SYSCALL_BASE+139)</div><div class='del'>-#define __NR__llseek			(__NR_SYSCALL_BASE+140)</div><div class='del'>-#define __NR_getdents			(__NR_SYSCALL_BASE+141)</div><div class='del'>-#define __NR__newselect			(__NR_SYSCALL_BASE+142)</div><div class='del'>-#define __NR_flock			(__NR_SYSCALL_BASE+143)</div><div class='del'>-#define __NR_msync			(__NR_SYSCALL_BASE+144)</div><div class='del'>-#define __NR_readv			(__NR_SYSCALL_BASE+145)</div><div class='del'>-#define __NR_writev			(__NR_SYSCALL_BASE+146)</div><div class='del'>-#define __NR_getsid			(__NR_SYSCALL_BASE+147)</div><div class='del'>-#define __NR_fdatasync			(__NR_SYSCALL_BASE+148)</div><div class='del'>-#define __NR__sysctl			(__NR_SYSCALL_BASE+149)</div><div class='del'>-#define __NR_mlock			(__NR_SYSCALL_BASE+150)</div><div class='del'>-#define __NR_munlock			(__NR_SYSCALL_BASE+151)</div><div class='del'>-#define __NR_mlockall			(__NR_SYSCALL_BASE+152)</div><div class='del'>-#define __NR_munlockall			(__NR_SYSCALL_BASE+153)</div><div class='del'>-#define __NR_sched_setparam		(__NR_SYSCALL_BASE+154)</div><div class='del'>-#define __NR_sched_getparam		(__NR_SYSCALL_BASE+155)</div><div class='del'>-#define __NR_sched_setscheduler		(__NR_SYSCALL_BASE+156)</div><div class='del'>-#define __NR_sched_getscheduler		(__NR_SYSCALL_BASE+157)</div><div class='del'>-#define __NR_sched_yield		(__NR_SYSCALL_BASE+158)</div><div class='del'>-#define __NR_sched_get_priority_max	(__NR_SYSCALL_BASE+159)</div><div class='del'>-#define __NR_sched_get_priority_min	(__NR_SYSCALL_BASE+160)</div><div class='del'>-#define __NR_sched_rr_get_interval	(__NR_SYSCALL_BASE+161)</div><div class='del'>-#define __NR_nanosleep			(__NR_SYSCALL_BASE+162)</div><div class='del'>-#define __NR_mremap			(__NR_SYSCALL_BASE+163)</div><div class='del'>-#define __NR_setresuid			(__NR_SYSCALL_BASE+164)</div><div class='del'>-#define __NR_getresuid			(__NR_SYSCALL_BASE+165)</div><div class='del'>-					/* 166 was sys_vm86 */</div><div class='del'>-					/* 167 was sys_query_module */</div><div class='del'>-#define __NR_poll			(__NR_SYSCALL_BASE+168)</div><div class='del'>-#define __NR_nfsservctl			(__NR_SYSCALL_BASE+169)</div><div class='del'>-#define __NR_setresgid			(__NR_SYSCALL_BASE+170)</div><div class='del'>-#define __NR_getresgid			(__NR_SYSCALL_BASE+171)</div><div class='del'>-#define __NR_prctl			(__NR_SYSCALL_BASE+172)</div><div class='del'>-#define __NR_rt_sigreturn		(__NR_SYSCALL_BASE+173)</div><div class='del'>-#define __NR_rt_sigaction		(__NR_SYSCALL_BASE+174)</div><div class='del'>-#define __NR_rt_sigprocmask		(__NR_SYSCALL_BASE+175)</div><div class='del'>-#define __NR_rt_sigpending		(__NR_SYSCALL_BASE+176)</div><div class='del'>-#define __NR_rt_sigtimedwait		(__NR_SYSCALL_BASE+177)</div><div class='del'>-#define __NR_rt_sigqueueinfo		(__NR_SYSCALL_BASE+178)</div><div class='del'>-#define __NR_rt_sigsuspend		(__NR_SYSCALL_BASE+179)</div><div class='del'>-#define __NR_pread64			(__NR_SYSCALL_BASE+180)</div><div class='del'>-#define __NR_pwrite64			(__NR_SYSCALL_BASE+181)</div><div class='del'>-#define __NR_chown			(__NR_SYSCALL_BASE+182)</div><div class='del'>-#define __NR_getcwd			(__NR_SYSCALL_BASE+183)</div><div class='del'>-#define __NR_capget			(__NR_SYSCALL_BASE+184)</div><div class='del'>-#define __NR_capset			(__NR_SYSCALL_BASE+185)</div><div class='del'>-#define __NR_sigaltstack		(__NR_SYSCALL_BASE+186)</div><div class='del'>-#define __NR_sendfile			(__NR_SYSCALL_BASE+187)</div><div class='del'>-					/* 188 reserved */</div><div class='del'>-					/* 189 reserved */</div><div class='del'>-#define __NR_vfork			(__NR_SYSCALL_BASE+190)</div><div class='del'>-#define __NR_ugetrlimit			(__NR_SYSCALL_BASE+191)	/* SuS compliant getrlimit */</div><div class='del'>-#define __NR_mmap2			(__NR_SYSCALL_BASE+192)</div><div class='del'>-#define __NR_truncate64			(__NR_SYSCALL_BASE+193)</div><div class='del'>-#define __NR_ftruncate64		(__NR_SYSCALL_BASE+194)</div><div class='del'>-#define __NR_stat64			(__NR_SYSCALL_BASE+195)</div><div class='del'>-#define __NR_lstat64			(__NR_SYSCALL_BASE+196)</div><div class='del'>-#define __NR_fstat64			(__NR_SYSCALL_BASE+197)</div><div class='del'>-#define __NR_lchown32			(__NR_SYSCALL_BASE+198)</div><div class='del'>-#define __NR_getuid32			(__NR_SYSCALL_BASE+199)</div><div class='del'>-#define __NR_getgid32			(__NR_SYSCALL_BASE+200)</div><div class='del'>-#define __NR_geteuid32			(__NR_SYSCALL_BASE+201)</div><div class='del'>-#define __NR_getegid32			(__NR_SYSCALL_BASE+202)</div><div class='del'>-#define __NR_setreuid32			(__NR_SYSCALL_BASE+203)</div><div class='del'>-#define __NR_setregid32			(__NR_SYSCALL_BASE+204)</div><div class='del'>-#define __NR_getgroups32		(__NR_SYSCALL_BASE+205)</div><div class='del'>-#define __NR_setgroups32		(__NR_SYSCALL_BASE+206)</div><div class='del'>-#define __NR_fchown32			(__NR_SYSCALL_BASE+207)</div><div class='del'>-#define __NR_setresuid32		(__NR_SYSCALL_BASE+208)</div><div class='del'>-#define __NR_getresuid32		(__NR_SYSCALL_BASE+209)</div><div class='del'>-#define __NR_setresgid32		(__NR_SYSCALL_BASE+210)</div><div class='del'>-#define __NR_getresgid32		(__NR_SYSCALL_BASE+211)</div><div class='del'>-#define __NR_chown32			(__NR_SYSCALL_BASE+212)</div><div class='del'>-#define __NR_setuid32			(__NR_SYSCALL_BASE+213)</div><div class='del'>-#define __NR_setgid32			(__NR_SYSCALL_BASE+214)</div><div class='del'>-#define __NR_setfsuid32			(__NR_SYSCALL_BASE+215)</div><div class='del'>-#define __NR_setfsgid32			(__NR_SYSCALL_BASE+216)</div><div class='del'>-#define __NR_getdents64			(__NR_SYSCALL_BASE+217)</div><div class='del'>-#define __NR_pivot_root			(__NR_SYSCALL_BASE+218)</div><div class='del'>-#define __NR_mincore			(__NR_SYSCALL_BASE+219)</div><div class='del'>-#define __NR_madvise			(__NR_SYSCALL_BASE+220)</div><div class='del'>-#define __NR_fcntl64			(__NR_SYSCALL_BASE+221)</div><div class='del'>-					/* 222 for tux */</div><div class='del'>-					/* 223 is unused */</div><div class='del'>-#define __NR_gettid			(__NR_SYSCALL_BASE+224)</div><div class='del'>-#define __NR_readahead			(__NR_SYSCALL_BASE+225)</div><div class='del'>-#define __NR_setxattr			(__NR_SYSCALL_BASE+226)</div><div class='del'>-#define __NR_lsetxattr			(__NR_SYSCALL_BASE+227)</div><div class='del'>-#define __NR_fsetxattr			(__NR_SYSCALL_BASE+228)</div><div class='del'>-#define __NR_getxattr			(__NR_SYSCALL_BASE+229)</div><div class='del'>-#define __NR_lgetxattr			(__NR_SYSCALL_BASE+230)</div><div class='del'>-#define __NR_fgetxattr			(__NR_SYSCALL_BASE+231)</div><div class='del'>-#define __NR_listxattr			(__NR_SYSCALL_BASE+232)</div><div class='del'>-#define __NR_llistxattr			(__NR_SYSCALL_BASE+233)</div><div class='del'>-#define __NR_flistxattr			(__NR_SYSCALL_BASE+234)</div><div class='del'>-#define __NR_removexattr		(__NR_SYSCALL_BASE+235)</div><div class='del'>-#define __NR_lremovexattr		(__NR_SYSCALL_BASE+236)</div><div class='del'>-#define __NR_fremovexattr		(__NR_SYSCALL_BASE+237)</div><div class='del'>-#define __NR_tkill			(__NR_SYSCALL_BASE+238)</div><div class='del'>-#define __NR_sendfile64			(__NR_SYSCALL_BASE+239)</div><div class='del'>-#define __NR_futex			(__NR_SYSCALL_BASE+240)</div><div class='del'>-#define __NR_sched_setaffinity		(__NR_SYSCALL_BASE+241)</div><div class='del'>-#define __NR_sched_getaffinity		(__NR_SYSCALL_BASE+242)</div><div class='del'>-#define __NR_io_setup			(__NR_SYSCALL_BASE+243)</div><div class='del'>-#define __NR_io_destroy			(__NR_SYSCALL_BASE+244)</div><div class='del'>-#define __NR_io_getevents		(__NR_SYSCALL_BASE+245)</div><div class='del'>-#define __NR_io_submit			(__NR_SYSCALL_BASE+246)</div><div class='del'>-#define __NR_io_cancel			(__NR_SYSCALL_BASE+247)</div><div class='del'>-#define __NR_exit_group			(__NR_SYSCALL_BASE+248)</div><div class='del'>-#define __NR_lookup_dcookie		(__NR_SYSCALL_BASE+249)</div><div class='del'>-#define __NR_epoll_create		(__NR_SYSCALL_BASE+250)</div><div class='del'>-#define __NR_epoll_ctl			(__NR_SYSCALL_BASE+251)</div><div class='del'>-#define __NR_epoll_wait			(__NR_SYSCALL_BASE+252)</div><div class='del'>-#define __NR_remap_file_pages		(__NR_SYSCALL_BASE+253)</div><div class='del'>-					/* 254 for set_thread_area */</div><div class='del'>-					/* 255 for get_thread_area */</div><div class='del'>-#define __NR_set_tid_address		(__NR_SYSCALL_BASE+256)</div><div class='del'>-#define __NR_timer_create		(__NR_SYSCALL_BASE+257)</div><div class='del'>-#define __NR_timer_settime		(__NR_SYSCALL_BASE+258)</div><div class='del'>-#define __NR_timer_gettime		(__NR_SYSCALL_BASE+259)</div><div class='del'>-#define __NR_timer_getoverrun		(__NR_SYSCALL_BASE+260)</div><div class='del'>-#define __NR_timer_delete		(__NR_SYSCALL_BASE+261)</div><div class='del'>-#define __NR_clock_settime		(__NR_SYSCALL_BASE+262)</div><div class='del'>-#define __NR_clock_gettime		(__NR_SYSCALL_BASE+263)</div><div class='del'>-#define __NR_clock_getres		(__NR_SYSCALL_BASE+264)</div><div class='del'>-#define __NR_clock_nanosleep		(__NR_SYSCALL_BASE+265)</div><div class='del'>-#define __NR_statfs64			(__NR_SYSCALL_BASE+266)</div><div class='del'>-#define __NR_fstatfs64			(__NR_SYSCALL_BASE+267)</div><div class='del'>-#define __NR_tgkill			(__NR_SYSCALL_BASE+268)</div><div class='del'>-#define __NR_utimes			(__NR_SYSCALL_BASE+269)</div><div class='del'>-#define __NR_arm_fadvise64_64		(__NR_SYSCALL_BASE+270)</div><div class='del'>-#define __NR_pciconfig_iobase		(__NR_SYSCALL_BASE+271)</div><div class='del'>-#define __NR_pciconfig_read		(__NR_SYSCALL_BASE+272)</div><div class='del'>-#define __NR_pciconfig_write		(__NR_SYSCALL_BASE+273)</div><div class='del'>-#define __NR_mq_open			(__NR_SYSCALL_BASE+274)</div><div class='del'>-#define __NR_mq_unlink			(__NR_SYSCALL_BASE+275)</div><div class='del'>-#define __NR_mq_timedsend		(__NR_SYSCALL_BASE+276)</div><div class='del'>-#define __NR_mq_timedreceive		(__NR_SYSCALL_BASE+277)</div><div class='del'>-#define __NR_mq_notify			(__NR_SYSCALL_BASE+278)</div><div class='del'>-#define __NR_mq_getsetattr		(__NR_SYSCALL_BASE+279)</div><div class='del'>-#define __NR_waitid			(__NR_SYSCALL_BASE+280)</div><div class='del'>-#define __NR_socket			(__NR_SYSCALL_BASE+281)</div><div class='del'>-#define __NR_bind			(__NR_SYSCALL_BASE+282)</div><div class='del'>-#define __NR_connect			(__NR_SYSCALL_BASE+283)</div><div class='del'>-#define __NR_listen			(__NR_SYSCALL_BASE+284)</div><div class='del'>-#define __NR_accept			(__NR_SYSCALL_BASE+285)</div><div class='del'>-#define __NR_getsockname		(__NR_SYSCALL_BASE+286)</div><div class='del'>-#define __NR_getpeername		(__NR_SYSCALL_BASE+287)</div><div class='del'>-#define __NR_socketpair			(__NR_SYSCALL_BASE+288)</div><div class='del'>-#define __NR_send			(__NR_SYSCALL_BASE+289)</div><div class='del'>-#define __NR_sendto			(__NR_SYSCALL_BASE+290)</div><div class='del'>-#define __NR_recv			(__NR_SYSCALL_BASE+291)</div><div class='del'>-#define __NR_recvfrom			(__NR_SYSCALL_BASE+292)</div><div class='del'>-#define __NR_shutdown			(__NR_SYSCALL_BASE+293)</div><div class='del'>-#define __NR_setsockopt			(__NR_SYSCALL_BASE+294)</div><div class='del'>-#define __NR_getsockopt			(__NR_SYSCALL_BASE+295)</div><div class='del'>-#define __NR_sendmsg			(__NR_SYSCALL_BASE+296)</div><div class='del'>-#define __NR_recvmsg			(__NR_SYSCALL_BASE+297)</div><div class='del'>-#define __NR_semop			(__NR_SYSCALL_BASE+298)</div><div class='del'>-#define __NR_semget			(__NR_SYSCALL_BASE+299)</div><div class='del'>-#define __NR_semctl			(__NR_SYSCALL_BASE+300)</div><div class='del'>-#define __NR_msgsnd			(__NR_SYSCALL_BASE+301)</div><div class='del'>-#define __NR_msgrcv			(__NR_SYSCALL_BASE+302)</div><div class='del'>-#define __NR_msgget			(__NR_SYSCALL_BASE+303)</div><div class='del'>-#define __NR_msgctl			(__NR_SYSCALL_BASE+304)</div><div class='del'>-#define __NR_shmat			(__NR_SYSCALL_BASE+305)</div><div class='del'>-#define __NR_shmdt			(__NR_SYSCALL_BASE+306)</div><div class='del'>-#define __NR_shmget			(__NR_SYSCALL_BASE+307)</div><div class='del'>-#define __NR_shmctl			(__NR_SYSCALL_BASE+308)</div><div class='del'>-#define __NR_add_key			(__NR_SYSCALL_BASE+309)</div><div class='del'>-#define __NR_request_key		(__NR_SYSCALL_BASE+310)</div><div class='del'>-#define __NR_keyctl			(__NR_SYSCALL_BASE+311)</div><div class='del'>-#define __NR_semtimedop			(__NR_SYSCALL_BASE+312)</div><div class='del'>-#define __NR_vserver			(__NR_SYSCALL_BASE+313)</div><div class='del'>-#define __NR_ioprio_set			(__NR_SYSCALL_BASE+314)</div><div class='del'>-#define __NR_ioprio_get			(__NR_SYSCALL_BASE+315)</div><div class='del'>-#define __NR_inotify_init		(__NR_SYSCALL_BASE+316)</div><div class='del'>-#define __NR_inotify_add_watch		(__NR_SYSCALL_BASE+317)</div><div class='del'>-#define __NR_inotify_rm_watch		(__NR_SYSCALL_BASE+318)</div><div class='del'>-#define __NR_mbind			(__NR_SYSCALL_BASE+319)</div><div class='del'>-#define __NR_get_mempolicy		(__NR_SYSCALL_BASE+320)</div><div class='del'>-#define __NR_set_mempolicy		(__NR_SYSCALL_BASE+321)</div><div class='del'>-#define __NR_openat			(__NR_SYSCALL_BASE+322)</div><div class='del'>-#define __NR_mkdirat			(__NR_SYSCALL_BASE+323)</div><div class='del'>-#define __NR_mknodat			(__NR_SYSCALL_BASE+324)</div><div class='del'>-#define __NR_fchownat			(__NR_SYSCALL_BASE+325)</div><div class='del'>-#define __NR_futimesat			(__NR_SYSCALL_BASE+326)</div><div class='del'>-#define __NR_fstatat64			(__NR_SYSCALL_BASE+327)</div><div class='del'>-#define __NR_unlinkat			(__NR_SYSCALL_BASE+328)</div><div class='del'>-#define __NR_renameat			(__NR_SYSCALL_BASE+329)</div><div class='del'>-#define __NR_linkat			(__NR_SYSCALL_BASE+330)</div><div class='del'>-#define __NR_symlinkat			(__NR_SYSCALL_BASE+331)</div><div class='del'>-#define __NR_readlinkat			(__NR_SYSCALL_BASE+332)</div><div class='del'>-#define __NR_fchmodat			(__NR_SYSCALL_BASE+333)</div><div class='del'>-#define __NR_faccessat			(__NR_SYSCALL_BASE+334)</div><div class='del'>-#define __NR_pselect6			(__NR_SYSCALL_BASE+335)</div><div class='del'>-#define __NR_ppoll			(__NR_SYSCALL_BASE+336)</div><div class='del'>-#define __NR_unshare			(__NR_SYSCALL_BASE+337)</div><div class='del'>-#define __NR_set_robust_list		(__NR_SYSCALL_BASE+338)</div><div class='del'>-#define __NR_get_robust_list		(__NR_SYSCALL_BASE+339)</div><div class='del'>-#define __NR_splice			(__NR_SYSCALL_BASE+340)</div><div class='del'>-#define __NR_arm_sync_file_range	(__NR_SYSCALL_BASE+341)</div><div class='add'>+#include &lt;asm/unistd-common.h&gt;</div><div class='ctx'> #define __NR_sync_file_range2		__NR_arm_sync_file_range</div><div class='del'>-#define __NR_tee			(__NR_SYSCALL_BASE+342)</div><div class='del'>-#define __NR_vmsplice			(__NR_SYSCALL_BASE+343)</div><div class='del'>-#define __NR_move_pages			(__NR_SYSCALL_BASE+344)</div><div class='del'>-#define __NR_getcpu			(__NR_SYSCALL_BASE+345)</div><div class='del'>-#define __NR_epoll_pwait		(__NR_SYSCALL_BASE+346)</div><div class='del'>-#define __NR_kexec_load			(__NR_SYSCALL_BASE+347)</div><div class='del'>-#define __NR_utimensat			(__NR_SYSCALL_BASE+348)</div><div class='del'>-#define __NR_signalfd			(__NR_SYSCALL_BASE+349)</div><div class='del'>-#define __NR_timerfd_create		(__NR_SYSCALL_BASE+350)</div><div class='del'>-#define __NR_eventfd			(__NR_SYSCALL_BASE+351)</div><div class='del'>-#define __NR_fallocate			(__NR_SYSCALL_BASE+352)</div><div class='del'>-#define __NR_timerfd_settime		(__NR_SYSCALL_BASE+353)</div><div class='del'>-#define __NR_timerfd_gettime		(__NR_SYSCALL_BASE+354)</div><div class='del'>-#define __NR_signalfd4			(__NR_SYSCALL_BASE+355)</div><div class='del'>-#define __NR_eventfd2			(__NR_SYSCALL_BASE+356)</div><div class='del'>-#define __NR_epoll_create1		(__NR_SYSCALL_BASE+357)</div><div class='del'>-#define __NR_dup3			(__NR_SYSCALL_BASE+358)</div><div class='del'>-#define __NR_pipe2			(__NR_SYSCALL_BASE+359)</div><div class='del'>-#define __NR_inotify_init1		(__NR_SYSCALL_BASE+360)</div><div class='del'>-#define __NR_preadv			(__NR_SYSCALL_BASE+361)</div><div class='del'>-#define __NR_pwritev			(__NR_SYSCALL_BASE+362)</div><div class='del'>-#define __NR_rt_tgsigqueueinfo		(__NR_SYSCALL_BASE+363)</div><div class='del'>-#define __NR_perf_event_open		(__NR_SYSCALL_BASE+364)</div><div class='del'>-#define __NR_recvmmsg			(__NR_SYSCALL_BASE+365)</div><div class='del'>-#define __NR_accept4			(__NR_SYSCALL_BASE+366)</div><div class='del'>-#define __NR_fanotify_init		(__NR_SYSCALL_BASE+367)</div><div class='del'>-#define __NR_fanotify_mark		(__NR_SYSCALL_BASE+368)</div><div class='del'>-#define __NR_prlimit64			(__NR_SYSCALL_BASE+369)</div><div class='del'>-#define __NR_name_to_handle_at		(__NR_SYSCALL_BASE+370)</div><div class='del'>-#define __NR_open_by_handle_at		(__NR_SYSCALL_BASE+371)</div><div class='del'>-#define __NR_clock_adjtime		(__NR_SYSCALL_BASE+372)</div><div class='del'>-#define __NR_syncfs			(__NR_SYSCALL_BASE+373)</div><div class='del'>-#define __NR_sendmmsg			(__NR_SYSCALL_BASE+374)</div><div class='del'>-#define __NR_setns			(__NR_SYSCALL_BASE+375)</div><div class='del'>-#define __NR_process_vm_readv		(__NR_SYSCALL_BASE+376)</div><div class='del'>-#define __NR_process_vm_writev		(__NR_SYSCALL_BASE+377)</div><div class='del'>-#define __NR_kcmp			(__NR_SYSCALL_BASE+378)</div><div class='del'>-#define __NR_finit_module		(__NR_SYSCALL_BASE+379)</div><div class='del'>-#define __NR_sched_setattr		(__NR_SYSCALL_BASE+380)</div><div class='del'>-#define __NR_sched_getattr		(__NR_SYSCALL_BASE+381)</div><div class='del'>-#define __NR_renameat2			(__NR_SYSCALL_BASE+382)</div><div class='del'>-#define __NR_seccomp			(__NR_SYSCALL_BASE+383)</div><div class='del'>-#define __NR_getrandom			(__NR_SYSCALL_BASE+384)</div><div class='del'>-#define __NR_memfd_create		(__NR_SYSCALL_BASE+385)</div><div class='del'>-#define __NR_bpf			(__NR_SYSCALL_BASE+386)</div><div class='del'>-#define __NR_execveat			(__NR_SYSCALL_BASE+387)</div><div class='del'>-#define __NR_userfaultfd		(__NR_SYSCALL_BASE+388)</div><div class='del'>-#define __NR_membarrier			(__NR_SYSCALL_BASE+389)</div><div class='del'>-#define __NR_mlock2			(__NR_SYSCALL_BASE+390)</div><div class='del'>-#define __NR_copy_file_range		(__NR_SYSCALL_BASE+391)</div><div class='del'>-#define __NR_preadv2			(__NR_SYSCALL_BASE+392)</div><div class='del'>-#define __NR_pwritev2			(__NR_SYSCALL_BASE+393)</div><div class='del'>-#define __NR_pkey_mprotect		(__NR_SYSCALL_BASE+394)</div><div class='del'>-#define __NR_pkey_alloc			(__NR_SYSCALL_BASE+395)</div><div class='del'>-#define __NR_pkey_free			(__NR_SYSCALL_BASE+396)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The following SWIs are ARM private.</div><div class='hunk'>@@ -434,24 +36,4 @@</div><div class='ctx'> #define __ARM_NR_usr32			(__ARM_NR_BASE+4)</div><div class='ctx'> #define __ARM_NR_set_tls		(__ARM_NR_BASE+5)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The following syscalls are obsolete and no longer available for EABI.</div><div class='del'>- */</div><div class='del'>-#if !defined(__KERNEL__)</div><div class='del'>-#if defined(__ARM_EABI__)</div><div class='del'>-#undef __NR_time</div><div class='del'>-#undef __NR_umount</div><div class='del'>-#undef __NR_stime</div><div class='del'>-#undef __NR_alarm</div><div class='del'>-#undef __NR_utime</div><div class='del'>-#undef __NR_getrlimit</div><div class='del'>-#undef __NR_select</div><div class='del'>-#undef __NR_readdir</div><div class='del'>-#undef __NR_mmap</div><div class='del'>-#undef __NR_socketcall</div><div class='del'>-#undef __NR_syscall</div><div class='del'>-#undef __NR_ipc</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif /* _UAPI__ASM_ARM_UNISTD_H */</div><div class='head'>diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c<br/>index 7e45f69a0ddc..8e8d20cdbce7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/armksyms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/armksyms.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/armksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/armksyms.c</a></div><div class='hunk'>@@ -178,6 +178,6 @@ EXPORT_SYMBOL(__pv_offset);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_ARM_SMCCC</div><div class='del'>-EXPORT_SYMBOL(arm_smccc_smc);</div><div class='del'>-EXPORT_SYMBOL(arm_smccc_hvc);</div><div class='add'>+EXPORT_SYMBOL(__arm_smccc_smc);</div><div class='add'>+EXPORT_SYMBOL(__arm_smccc_hvc);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S<br/>deleted file mode 100644<br/>index 08030b18f10a..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/calls.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/calls.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,415 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/arch/arm/kernel/calls.S</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 1995-2005 Russell King</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This file is included thrice in entry-common.S</div><div class='del'>- */</div><div class='del'>-/* 0 */		CALL(sys_restart_syscall)</div><div class='del'>-		CALL(sys_exit)</div><div class='del'>-		CALL(sys_fork)</div><div class='del'>-		CALL(sys_read)</div><div class='del'>-		CALL(sys_write)</div><div class='del'>-/* 5 */		CALL(sys_open)</div><div class='del'>-		CALL(sys_close)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_waitpid */</div><div class='del'>-		CALL(sys_creat)</div><div class='del'>-		CALL(sys_link)</div><div class='del'>-/* 10 */	CALL(sys_unlink)</div><div class='del'>-		CALL(sys_execve)</div><div class='del'>-		CALL(sys_chdir)</div><div class='del'>-		CALL(OBSOLETE(sys_time))	/* used by libc4 */</div><div class='del'>-		CALL(sys_mknod)</div><div class='del'>-/* 15 */	CALL(sys_chmod)</div><div class='del'>-		CALL(sys_lchown16)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_break */</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_stat */</div><div class='del'>-		CALL(sys_lseek)</div><div class='del'>-/* 20 */	CALL(sys_getpid)</div><div class='del'>-		CALL(sys_mount)</div><div class='del'>-		CALL(OBSOLETE(sys_oldumount))	/* used by libc4 */</div><div class='del'>-		CALL(sys_setuid16)</div><div class='del'>-		CALL(sys_getuid16)</div><div class='del'>-/* 25 */	CALL(OBSOLETE(sys_stime))</div><div class='del'>-		CALL(sys_ptrace)</div><div class='del'>-		CALL(OBSOLETE(sys_alarm))	/* used by libc4 */</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_fstat */</div><div class='del'>-		CALL(sys_pause)</div><div class='del'>-/* 30 */	CALL(OBSOLETE(sys_utime))	/* used by libc4 */</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_stty */</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_getty */</div><div class='del'>-		CALL(sys_access)</div><div class='del'>-		CALL(sys_nice)</div><div class='del'>-/* 35 */	CALL(sys_ni_syscall)		/* was sys_ftime */</div><div class='del'>-		CALL(sys_sync)</div><div class='del'>-		CALL(sys_kill)</div><div class='del'>-		CALL(sys_rename)</div><div class='del'>-		CALL(sys_mkdir)</div><div class='del'>-/* 40 */	CALL(sys_rmdir)</div><div class='del'>-		CALL(sys_dup)</div><div class='del'>-		CALL(sys_pipe)</div><div class='del'>-		CALL(sys_times)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_prof */</div><div class='del'>-/* 45 */	CALL(sys_brk)</div><div class='del'>-		CALL(sys_setgid16)</div><div class='del'>-		CALL(sys_getgid16)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_signal */</div><div class='del'>-		CALL(sys_geteuid16)</div><div class='del'>-/* 50 */	CALL(sys_getegid16)</div><div class='del'>-		CALL(sys_acct)</div><div class='del'>-		CALL(sys_umount)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_lock */</div><div class='del'>-		CALL(sys_ioctl)</div><div class='del'>-/* 55 */	CALL(sys_fcntl)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_mpx */</div><div class='del'>-		CALL(sys_setpgid)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_ulimit */</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_olduname */</div><div class='del'>-/* 60 */	CALL(sys_umask)</div><div class='del'>-		CALL(sys_chroot)</div><div class='del'>-		CALL(sys_ustat)</div><div class='del'>-		CALL(sys_dup2)</div><div class='del'>-		CALL(sys_getppid)</div><div class='del'>-/* 65 */	CALL(sys_getpgrp)</div><div class='del'>-		CALL(sys_setsid)</div><div class='del'>-		CALL(sys_sigaction)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_sgetmask */</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_ssetmask */</div><div class='del'>-/* 70 */	CALL(sys_setreuid16)</div><div class='del'>-		CALL(sys_setregid16)</div><div class='del'>-		CALL(sys_sigsuspend)</div><div class='del'>-		CALL(sys_sigpending)</div><div class='del'>-		CALL(sys_sethostname)</div><div class='del'>-/* 75 */	CALL(sys_setrlimit)</div><div class='del'>-		CALL(OBSOLETE(sys_old_getrlimit)) /* used by libc4 */</div><div class='del'>-		CALL(sys_getrusage)</div><div class='del'>-		CALL(sys_gettimeofday)</div><div class='del'>-		CALL(sys_settimeofday)</div><div class='del'>-/* 80 */	CALL(sys_getgroups16)</div><div class='del'>-		CALL(sys_setgroups16)</div><div class='del'>-		CALL(OBSOLETE(sys_old_select))	/* used by libc4 */</div><div class='del'>-		CALL(sys_symlink)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_lstat */</div><div class='del'>-/* 85 */	CALL(sys_readlink)</div><div class='del'>-		CALL(sys_uselib)</div><div class='del'>-		CALL(sys_swapon)</div><div class='del'>-		CALL(sys_reboot)</div><div class='del'>-		CALL(OBSOLETE(sys_old_readdir))	/* used by libc4 */</div><div class='del'>-/* 90 */	CALL(OBSOLETE(sys_old_mmap))	/* used by libc4 */</div><div class='del'>-		CALL(sys_munmap)</div><div class='del'>-		CALL(sys_truncate)</div><div class='del'>-		CALL(sys_ftruncate)</div><div class='del'>-		CALL(sys_fchmod)</div><div class='del'>-/* 95 */	CALL(sys_fchown16)</div><div class='del'>-		CALL(sys_getpriority)</div><div class='del'>-		CALL(sys_setpriority)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_profil */</div><div class='del'>-		CALL(sys_statfs)</div><div class='del'>-/* 100 */	CALL(sys_fstatfs)</div><div class='del'>-		CALL(sys_ni_syscall)		/* sys_ioperm */</div><div class='del'>-		CALL(OBSOLETE(ABI(sys_socketcall, sys_oabi_socketcall)))</div><div class='del'>-		CALL(sys_syslog)</div><div class='del'>-		CALL(sys_setitimer)</div><div class='del'>-/* 105 */	CALL(sys_getitimer)</div><div class='del'>-		CALL(sys_newstat)</div><div class='del'>-		CALL(sys_newlstat)</div><div class='del'>-		CALL(sys_newfstat)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_uname */</div><div class='del'>-/* 110 */	CALL(sys_ni_syscall)		/* was sys_iopl */</div><div class='del'>-		CALL(sys_vhangup)</div><div class='del'>-		CALL(sys_ni_syscall)</div><div class='del'>-		CALL(OBSOLETE(sys_syscall))	/* call a syscall */</div><div class='del'>-		CALL(sys_wait4)</div><div class='del'>-/* 115 */	CALL(sys_swapoff)</div><div class='del'>-		CALL(sys_sysinfo)</div><div class='del'>-		CALL(OBSOLETE(ABI(sys_ipc, sys_oabi_ipc)))</div><div class='del'>-		CALL(sys_fsync)</div><div class='del'>-		CALL(sys_sigreturn_wrapper)</div><div class='del'>-/* 120 */	CALL(sys_clone)</div><div class='del'>-		CALL(sys_setdomainname)</div><div class='del'>-		CALL(sys_newuname)</div><div class='del'>-		CALL(sys_ni_syscall)		/* modify_ldt */</div><div class='del'>-		CALL(sys_adjtimex)</div><div class='del'>-/* 125 */	CALL(sys_mprotect)</div><div class='del'>-		CALL(sys_sigprocmask)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_create_module */</div><div class='del'>-		CALL(sys_init_module)</div><div class='del'>-		CALL(sys_delete_module)</div><div class='del'>-/* 130 */	CALL(sys_ni_syscall)		/* was sys_get_kernel_syms */</div><div class='del'>-		CALL(sys_quotactl)</div><div class='del'>-		CALL(sys_getpgid)</div><div class='del'>-		CALL(sys_fchdir)</div><div class='del'>-		CALL(sys_bdflush)</div><div class='del'>-/* 135 */	CALL(sys_sysfs)</div><div class='del'>-		CALL(sys_personality)</div><div class='del'>-		CALL(sys_ni_syscall)		/* reserved for afs_syscall */</div><div class='del'>-		CALL(sys_setfsuid16)</div><div class='del'>-		CALL(sys_setfsgid16)</div><div class='del'>-/* 140 */	CALL(sys_llseek)</div><div class='del'>-		CALL(sys_getdents)</div><div class='del'>-		CALL(sys_select)</div><div class='del'>-		CALL(sys_flock)</div><div class='del'>-		CALL(sys_msync)</div><div class='del'>-/* 145 */	CALL(sys_readv)</div><div class='del'>-		CALL(sys_writev)</div><div class='del'>-		CALL(sys_getsid)</div><div class='del'>-		CALL(sys_fdatasync)</div><div class='del'>-		CALL(sys_sysctl)</div><div class='del'>-/* 150 */	CALL(sys_mlock)</div><div class='del'>-		CALL(sys_munlock)</div><div class='del'>-		CALL(sys_mlockall)</div><div class='del'>-		CALL(sys_munlockall)</div><div class='del'>-		CALL(sys_sched_setparam)</div><div class='del'>-/* 155 */	CALL(sys_sched_getparam)</div><div class='del'>-		CALL(sys_sched_setscheduler)</div><div class='del'>-		CALL(sys_sched_getscheduler)</div><div class='del'>-		CALL(sys_sched_yield)</div><div class='del'>-		CALL(sys_sched_get_priority_max)</div><div class='del'>-/* 160 */	CALL(sys_sched_get_priority_min)</div><div class='del'>-		CALL(sys_sched_rr_get_interval)</div><div class='del'>-		CALL(sys_nanosleep)</div><div class='del'>-		CALL(sys_mremap)</div><div class='del'>-		CALL(sys_setresuid16)</div><div class='del'>-/* 165 */	CALL(sys_getresuid16)</div><div class='del'>-		CALL(sys_ni_syscall)		/* vm86 */</div><div class='del'>-		CALL(sys_ni_syscall)		/* was sys_query_module */</div><div class='del'>-		CALL(sys_poll)</div><div class='del'>-		CALL(sys_ni_syscall)		/* was nfsservctl */</div><div class='del'>-/* 170 */	CALL(sys_setresgid16)</div><div class='del'>-		CALL(sys_getresgid16)</div><div class='del'>-		CALL(sys_prctl)</div><div class='del'>-		CALL(sys_rt_sigreturn_wrapper)</div><div class='del'>-		CALL(sys_rt_sigaction)</div><div class='del'>-/* 175 */	CALL(sys_rt_sigprocmask)</div><div class='del'>-		CALL(sys_rt_sigpending)</div><div class='del'>-		CALL(sys_rt_sigtimedwait)</div><div class='del'>-		CALL(sys_rt_sigqueueinfo)</div><div class='del'>-		CALL(sys_rt_sigsuspend)</div><div class='del'>-/* 180 */	CALL(ABI(sys_pread64, sys_oabi_pread64))</div><div class='del'>-		CALL(ABI(sys_pwrite64, sys_oabi_pwrite64))</div><div class='del'>-		CALL(sys_chown16)</div><div class='del'>-		CALL(sys_getcwd)</div><div class='del'>-		CALL(sys_capget)</div><div class='del'>-/* 185 */	CALL(sys_capset)</div><div class='del'>-		CALL(sys_sigaltstack)</div><div class='del'>-		CALL(sys_sendfile)</div><div class='del'>-		CALL(sys_ni_syscall)		/* getpmsg */</div><div class='del'>-		CALL(sys_ni_syscall)		/* putpmsg */</div><div class='del'>-/* 190 */	CALL(sys_vfork)</div><div class='del'>-		CALL(sys_getrlimit)</div><div class='del'>-		CALL(sys_mmap2)</div><div class='del'>-		CALL(ABI(sys_truncate64, sys_oabi_truncate64))</div><div class='del'>-		CALL(ABI(sys_ftruncate64, sys_oabi_ftruncate64))</div><div class='del'>-/* 195 */	CALL(ABI(sys_stat64, sys_oabi_stat64))</div><div class='del'>-		CALL(ABI(sys_lstat64, sys_oabi_lstat64))</div><div class='del'>-		CALL(ABI(sys_fstat64, sys_oabi_fstat64))</div><div class='del'>-		CALL(sys_lchown)</div><div class='del'>-		CALL(sys_getuid)</div><div class='del'>-/* 200 */	CALL(sys_getgid)</div><div class='del'>-		CALL(sys_geteuid)</div><div class='del'>-		CALL(sys_getegid)</div><div class='del'>-		CALL(sys_setreuid)</div><div class='del'>-		CALL(sys_setregid)</div><div class='del'>-/* 205 */	CALL(sys_getgroups)</div><div class='del'>-		CALL(sys_setgroups)</div><div class='del'>-		CALL(sys_fchown)</div><div class='del'>-		CALL(sys_setresuid)</div><div class='del'>-		CALL(sys_getresuid)</div><div class='del'>-/* 210 */	CALL(sys_setresgid)</div><div class='del'>-		CALL(sys_getresgid)</div><div class='del'>-		CALL(sys_chown)</div><div class='del'>-		CALL(sys_setuid)</div><div class='del'>-		CALL(sys_setgid)</div><div class='del'>-/* 215 */	CALL(sys_setfsuid)</div><div class='del'>-		CALL(sys_setfsgid)</div><div class='del'>-		CALL(sys_getdents64)</div><div class='del'>-		CALL(sys_pivot_root)</div><div class='del'>-		CALL(sys_mincore)</div><div class='del'>-/* 220 */	CALL(sys_madvise)</div><div class='del'>-		CALL(ABI(sys_fcntl64, sys_oabi_fcntl64))</div><div class='del'>-		CALL(sys_ni_syscall) /* TUX */</div><div class='del'>-		CALL(sys_ni_syscall)</div><div class='del'>-		CALL(sys_gettid)</div><div class='del'>-/* 225 */	CALL(ABI(sys_readahead, sys_oabi_readahead))</div><div class='del'>-		CALL(sys_setxattr)</div><div class='del'>-		CALL(sys_lsetxattr)</div><div class='del'>-		CALL(sys_fsetxattr)</div><div class='del'>-		CALL(sys_getxattr)</div><div class='del'>-/* 230 */	CALL(sys_lgetxattr)</div><div class='del'>-		CALL(sys_fgetxattr)</div><div class='del'>-		CALL(sys_listxattr)</div><div class='del'>-		CALL(sys_llistxattr)</div><div class='del'>-		CALL(sys_flistxattr)</div><div class='del'>-/* 235 */	CALL(sys_removexattr)</div><div class='del'>-		CALL(sys_lremovexattr)</div><div class='del'>-		CALL(sys_fremovexattr)</div><div class='del'>-		CALL(sys_tkill)</div><div class='del'>-		CALL(sys_sendfile64)</div><div class='del'>-/* 240 */	CALL(sys_futex)</div><div class='del'>-		CALL(sys_sched_setaffinity)</div><div class='del'>-		CALL(sys_sched_getaffinity)</div><div class='del'>-		CALL(sys_io_setup)</div><div class='del'>-		CALL(sys_io_destroy)</div><div class='del'>-/* 245 */	CALL(sys_io_getevents)</div><div class='del'>-		CALL(sys_io_submit)</div><div class='del'>-		CALL(sys_io_cancel)</div><div class='del'>-		CALL(sys_exit_group)</div><div class='del'>-		CALL(sys_lookup_dcookie)</div><div class='del'>-/* 250 */	CALL(sys_epoll_create)</div><div class='del'>-		CALL(ABI(sys_epoll_ctl, sys_oabi_epoll_ctl))</div><div class='del'>-		CALL(ABI(sys_epoll_wait, sys_oabi_epoll_wait))</div><div class='del'>-		CALL(sys_remap_file_pages)</div><div class='del'>-		CALL(sys_ni_syscall)	/* sys_set_thread_area */</div><div class='del'>-/* 255 */	CALL(sys_ni_syscall)	/* sys_get_thread_area */</div><div class='del'>-		CALL(sys_set_tid_address)</div><div class='del'>-		CALL(sys_timer_create)</div><div class='del'>-		CALL(sys_timer_settime)</div><div class='del'>-		CALL(sys_timer_gettime)</div><div class='del'>-/* 260 */	CALL(sys_timer_getoverrun)</div><div class='del'>-		CALL(sys_timer_delete)</div><div class='del'>-		CALL(sys_clock_settime)</div><div class='del'>-		CALL(sys_clock_gettime)</div><div class='del'>-		CALL(sys_clock_getres)</div><div class='del'>-/* 265 */	CALL(sys_clock_nanosleep)</div><div class='del'>-		CALL(sys_statfs64_wrapper)</div><div class='del'>-		CALL(sys_fstatfs64_wrapper)</div><div class='del'>-		CALL(sys_tgkill)</div><div class='del'>-		CALL(sys_utimes)</div><div class='del'>-/* 270 */	CALL(sys_arm_fadvise64_64)</div><div class='del'>-		CALL(sys_pciconfig_iobase)</div><div class='del'>-		CALL(sys_pciconfig_read)</div><div class='del'>-		CALL(sys_pciconfig_write)</div><div class='del'>-		CALL(sys_mq_open)</div><div class='del'>-/* 275 */	CALL(sys_mq_unlink)</div><div class='del'>-		CALL(sys_mq_timedsend)</div><div class='del'>-		CALL(sys_mq_timedreceive)</div><div class='del'>-		CALL(sys_mq_notify)</div><div class='del'>-		CALL(sys_mq_getsetattr)</div><div class='del'>-/* 280 */	CALL(sys_waitid)</div><div class='del'>-		CALL(sys_socket)</div><div class='del'>-		CALL(ABI(sys_bind, sys_oabi_bind))</div><div class='del'>-		CALL(ABI(sys_connect, sys_oabi_connect))</div><div class='del'>-		CALL(sys_listen)</div><div class='del'>-/* 285 */	CALL(sys_accept)</div><div class='del'>-		CALL(sys_getsockname)</div><div class='del'>-		CALL(sys_getpeername)</div><div class='del'>-		CALL(sys_socketpair)</div><div class='del'>-		CALL(sys_send)</div><div class='del'>-/* 290 */	CALL(ABI(sys_sendto, sys_oabi_sendto))</div><div class='del'>-		CALL(sys_recv)</div><div class='del'>-		CALL(sys_recvfrom)</div><div class='del'>-		CALL(sys_shutdown)</div><div class='del'>-		CALL(sys_setsockopt)</div><div class='del'>-/* 295 */	CALL(sys_getsockopt)</div><div class='del'>-		CALL(ABI(sys_sendmsg, sys_oabi_sendmsg))</div><div class='del'>-		CALL(sys_recvmsg)</div><div class='del'>-		CALL(ABI(sys_semop, sys_oabi_semop))</div><div class='del'>-		CALL(sys_semget)</div><div class='del'>-/* 300 */	CALL(sys_semctl)</div><div class='del'>-		CALL(sys_msgsnd)</div><div class='del'>-		CALL(sys_msgrcv)</div><div class='del'>-		CALL(sys_msgget)</div><div class='del'>-		CALL(sys_msgctl)</div><div class='del'>-/* 305 */	CALL(sys_shmat)</div><div class='del'>-		CALL(sys_shmdt)</div><div class='del'>-		CALL(sys_shmget)</div><div class='del'>-		CALL(sys_shmctl)</div><div class='del'>-		CALL(sys_add_key)</div><div class='del'>-/* 310 */	CALL(sys_request_key)</div><div class='del'>-		CALL(sys_keyctl)</div><div class='del'>-		CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))</div><div class='del'>-/* vserver */	CALL(sys_ni_syscall)</div><div class='del'>-		CALL(sys_ioprio_set)</div><div class='del'>-/* 315 */	CALL(sys_ioprio_get)</div><div class='del'>-		CALL(sys_inotify_init)</div><div class='del'>-		CALL(sys_inotify_add_watch)</div><div class='del'>-		CALL(sys_inotify_rm_watch)</div><div class='del'>-		CALL(sys_mbind)</div><div class='del'>-/* 320 */	CALL(sys_get_mempolicy)</div><div class='del'>-		CALL(sys_set_mempolicy)</div><div class='del'>-		CALL(sys_openat)</div><div class='del'>-		CALL(sys_mkdirat)</div><div class='del'>-		CALL(sys_mknodat)</div><div class='del'>-/* 325 */	CALL(sys_fchownat)</div><div class='del'>-		CALL(sys_futimesat)</div><div class='del'>-		CALL(ABI(sys_fstatat64,  sys_oabi_fstatat64))</div><div class='del'>-		CALL(sys_unlinkat)</div><div class='del'>-		CALL(sys_renameat)</div><div class='del'>-/* 330 */	CALL(sys_linkat)</div><div class='del'>-		CALL(sys_symlinkat)</div><div class='del'>-		CALL(sys_readlinkat)</div><div class='del'>-		CALL(sys_fchmodat)</div><div class='del'>-		CALL(sys_faccessat)</div><div class='del'>-/* 335 */	CALL(sys_pselect6)</div><div class='del'>-		CALL(sys_ppoll)</div><div class='del'>-		CALL(sys_unshare)</div><div class='del'>-		CALL(sys_set_robust_list)</div><div class='del'>-		CALL(sys_get_robust_list)</div><div class='del'>-/* 340 */	CALL(sys_splice)</div><div class='del'>-		CALL(sys_sync_file_range2)</div><div class='del'>-		CALL(sys_tee)</div><div class='del'>-		CALL(sys_vmsplice)</div><div class='del'>-		CALL(sys_move_pages)</div><div class='del'>-/* 345 */	CALL(sys_getcpu)</div><div class='del'>-		CALL(sys_epoll_pwait)</div><div class='del'>-		CALL(sys_kexec_load)</div><div class='del'>-		CALL(sys_utimensat)</div><div class='del'>-		CALL(sys_signalfd)</div><div class='del'>-/* 350 */	CALL(sys_timerfd_create)</div><div class='del'>-		CALL(sys_eventfd)</div><div class='del'>-		CALL(sys_fallocate)</div><div class='del'>-		CALL(sys_timerfd_settime)</div><div class='del'>-		CALL(sys_timerfd_gettime)</div><div class='del'>-/* 355 */	CALL(sys_signalfd4)</div><div class='del'>-		CALL(sys_eventfd2)</div><div class='del'>-		CALL(sys_epoll_create1)</div><div class='del'>-		CALL(sys_dup3)</div><div class='del'>-		CALL(sys_pipe2)</div><div class='del'>-/* 360 */	CALL(sys_inotify_init1)</div><div class='del'>-		CALL(sys_preadv)</div><div class='del'>-		CALL(sys_pwritev)</div><div class='del'>-		CALL(sys_rt_tgsigqueueinfo)</div><div class='del'>-		CALL(sys_perf_event_open)</div><div class='del'>-/* 365 */	CALL(sys_recvmmsg)</div><div class='del'>-		CALL(sys_accept4)</div><div class='del'>-		CALL(sys_fanotify_init)</div><div class='del'>-		CALL(sys_fanotify_mark)</div><div class='del'>-		CALL(sys_prlimit64)</div><div class='del'>-/* 370 */	CALL(sys_name_to_handle_at)</div><div class='del'>-		CALL(sys_open_by_handle_at)</div><div class='del'>-		CALL(sys_clock_adjtime)</div><div class='del'>-		CALL(sys_syncfs)</div><div class='del'>-		CALL(sys_sendmmsg)</div><div class='del'>-/* 375 */	CALL(sys_setns)</div><div class='del'>-		CALL(sys_process_vm_readv)</div><div class='del'>-		CALL(sys_process_vm_writev)</div><div class='del'>-		CALL(sys_kcmp)</div><div class='del'>-		CALL(sys_finit_module)</div><div class='del'>-/* 380 */	CALL(sys_sched_setattr)</div><div class='del'>-		CALL(sys_sched_getattr)</div><div class='del'>-		CALL(sys_renameat2)</div><div class='del'>-		CALL(sys_seccomp)</div><div class='del'>-		CALL(sys_getrandom)</div><div class='del'>-/* 385 */	CALL(sys_memfd_create)</div><div class='del'>-		CALL(sys_bpf)</div><div class='del'>-		CALL(sys_execveat)</div><div class='del'>-		CALL(sys_userfaultfd)</div><div class='del'>-		CALL(sys_membarrier)</div><div class='del'>-/* 390 */	CALL(sys_mlock2)</div><div class='del'>-		CALL(sys_copy_file_range)</div><div class='del'>-		CALL(sys_preadv2)</div><div class='del'>-		CALL(sys_pwritev2)</div><div class='del'>-		CALL(sys_pkey_mprotect)</div><div class='del'>-/* 395 */	CALL(sys_pkey_alloc)</div><div class='del'>-		CALL(sys_pkey_free)</div><div class='del'>-#ifndef syscalls_counted</div><div class='del'>-.equ syscalls_padding, ((NR_syscalls + 3) &amp; ~3) - NR_syscalls</div><div class='del'>-#define syscalls_counted</div><div class='del'>-#endif</div><div class='del'>-.rept syscalls_padding</div><div class='del'>-		CALL(sys_ni_syscall)</div><div class='del'>-.endr</div><div class='head'>diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S<br/>index 10c3283d6c19..eb5cd77bf1d8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/entry-common.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/entry-common.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/entry-common.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/entry-common.S</a></div><div class='hunk'>@@ -12,6 +12,11 @@</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/ftrace.h&gt;</div><div class='ctx'> #include &lt;asm/unwind.h&gt;</div><div class='add'>+#ifdef CONFIG_AEABI</div><div class='add'>+#include &lt;asm/unistd-oabi.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	.equ	NR_syscalls, __NR_syscalls</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NEED_RET_TO_USER</div><div class='ctx'> #include &lt;mach/entry-macro.S&gt;</div><div class='hunk'>@@ -120,21 +125,6 @@ ENTRY(ret_from_fork)</div><div class='ctx'> 	b	ret_slow_syscall</div><div class='ctx'> ENDPROC(ret_from_fork)</div><div class='ctx'> </div><div class='del'>-	.equ NR_syscalls,0</div><div class='del'>-#define CALL(x) .equ NR_syscalls,NR_syscalls+1</div><div class='del'>-#include "calls.S"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Ensure that the system call table is equal to __NR_syscalls,</div><div class='del'>- * which is the value the rest of the system sees</div><div class='del'>- */</div><div class='del'>-.ifne NR_syscalls - __NR_syscalls</div><div class='del'>-.error "__NR_syscalls is not equal to the size of the syscall table"</div><div class='del'>-.endif</div><div class='del'>-</div><div class='del'>-#undef CALL</div><div class='del'>-#define CALL(x) .long x</div><div class='del'>-</div><div class='ctx'> /*=============================================================================</div><div class='ctx'>  * SWI handler</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='hunk'>@@ -291,22 +281,48 @@ __cr_alignment:</div><div class='ctx'> #endif</div><div class='ctx'> 	.ltorg</div><div class='ctx'> </div><div class='add'>+	.macro	syscall_table_start, sym</div><div class='add'>+	.equ	__sys_nr, 0</div><div class='add'>+	.type	\sym, #object</div><div class='add'>+ENTRY(\sym)</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	syscall, nr, func</div><div class='add'>+	.ifgt	__sys_nr - \nr</div><div class='add'>+	.error	"Duplicated/unorded system call entry"</div><div class='add'>+	.endif</div><div class='add'>+	.rept	\nr - __sys_nr</div><div class='add'>+	.long	sys_ni_syscall</div><div class='add'>+	.endr</div><div class='add'>+	.long	\func</div><div class='add'>+	.equ	__sys_nr, \nr + 1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	syscall_table_end, sym</div><div class='add'>+	.ifgt	__sys_nr - __NR_syscalls</div><div class='add'>+	.error	"System call table too big"</div><div class='add'>+	.endif</div><div class='add'>+	.rept	__NR_syscalls - __sys_nr</div><div class='add'>+	.long	sys_ni_syscall</div><div class='add'>+	.endr</div><div class='add'>+	.size	\sym, . - \sym</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+#define NATIVE(nr, func) syscall nr, func</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is the syscall table declaration for native ABI syscalls.</div><div class='ctx'>  * With EABI a couple syscalls are obsolete and defined as sys_ni_syscall.</div><div class='ctx'>  */</div><div class='del'>-#define ABI(native, compat) native</div><div class='add'>+	syscall_table_start sys_call_table</div><div class='add'>+#define COMPAT(nr, native, compat) syscall nr, native</div><div class='ctx'> #ifdef CONFIG_AEABI</div><div class='del'>-#define OBSOLETE(syscall) sys_ni_syscall</div><div class='add'>+#include &lt;calls-eabi.S&gt;</div><div class='ctx'> #else</div><div class='del'>-#define OBSOLETE(syscall) syscall</div><div class='add'>+#include &lt;calls-oabi.S&gt;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	.type	sys_call_table, #object</div><div class='del'>-ENTRY(sys_call_table)</div><div class='del'>-#include "calls.S"</div><div class='del'>-#undef ABI</div><div class='del'>-#undef OBSOLETE</div><div class='add'>+#undef COMPAT</div><div class='add'>+	syscall_table_end sys_call_table</div><div class='ctx'> </div><div class='ctx'> /*============================================================================</div><div class='ctx'>  * Special system call wrappers</div><div class='hunk'>@@ -407,14 +423,10 @@ ENDPROC(sys_oabi_readahead)</div><div class='ctx'>  * Let's declare a second syscall table for old ABI binaries</div><div class='ctx'>  * using the compatibility syscall entries.</div><div class='ctx'>  */</div><div class='del'>-#define ABI(native, compat) compat</div><div class='del'>-#define OBSOLETE(syscall) syscall</div><div class='del'>-</div><div class='del'>-	.type	sys_oabi_call_table, #object</div><div class='del'>-ENTRY(sys_oabi_call_table)</div><div class='del'>-#include "calls.S"</div><div class='del'>-#undef ABI</div><div class='del'>-#undef OBSOLETE</div><div class='add'>+	syscall_table_start sys_oabi_call_table</div><div class='add'>+#define COMPAT(nr, native, compat) syscall nr, compat</div><div class='add'>+#include &lt;calls-oabi.S&gt;</div><div class='add'>+	syscall_table_end sys_oabi_call_table</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S<br/>index 6b4eb27b8758..2e21e08de747 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/head-nommu.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/head-nommu.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/head-nommu.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/head-nommu.S</a></div><div class='hunk'>@@ -152,11 +152,6 @@ __after_proc_init:</div><div class='ctx'> #ifdef CONFIG_CPU_ICACHE_DISABLE</div><div class='ctx'> 	bic	r0, r0, #CR_I</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_CPU_HIGH_VECTOR</div><div class='del'>-	orr	r0, r0, #CR_V</div><div class='del'>-#else</div><div class='del'>-	bic	r0, r0, #CR_V</div><div class='del'>-#endif</div><div class='ctx'> 	mcr	p15, 0, r0, c1, c0, 0		@ write control reg</div><div class='ctx'> #elif defined (CONFIG_CPU_V7M)</div><div class='ctx'> 	/* For V7M systems we want to modify the CCR similarly to the SCTLR */</div><div class='head'>diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c<br/>index b8df45883cf7..be3b3fbd382f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/hw_breakpoint.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/hw_breakpoint.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/hw_breakpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/hw_breakpoint.c</a></div><div class='hunk'>@@ -925,9 +925,9 @@ static bool core_has_os_save_restore(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void reset_ctrl_regs(void *unused)</div><div class='add'>+static void reset_ctrl_regs(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	int i, raw_num_brps, err = 0, cpu = smp_processor_id();</div><div class='add'>+	int i, raw_num_brps, err = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1020,25 +1020,20 @@ out_mdbgen:</div><div class='ctx'> 		cpumask_or(&amp;debug_err_mask, &amp;debug_err_mask, cpumask_of(cpu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dbg_reset_notify(struct notifier_block *self,</div><div class='del'>-				      unsigned long action, void *cpu)</div><div class='add'>+static int dbg_reset_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	if ((action &amp; ~CPU_TASKS_FROZEN) == CPU_ONLINE)</div><div class='del'>-		smp_call_function_single((int)cpu, reset_ctrl_regs, NULL, 1);</div><div class='del'>-</div><div class='del'>-	return NOTIFY_OK;</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	reset_ctrl_regs(cpu);</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block dbg_reset_nb = {</div><div class='del'>-	.notifier_call = dbg_reset_notify,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_CPU_PM</div><div class='ctx'> static int dbg_cpu_pm_notify(struct notifier_block *self, unsigned long action,</div><div class='ctx'> 			     void *v)</div><div class='ctx'> {</div><div class='ctx'> 	if (action == CPU_PM_EXIT)</div><div class='del'>-		reset_ctrl_regs(NULL);</div><div class='add'>+		reset_ctrl_regs(smp_processor_id());</div><div class='ctx'> </div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -1059,6 +1054,8 @@ static inline void pm_init(void)</div><div class='ctx'> </div><div class='ctx'> static int __init arch_hw_breakpoint_init(void)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	debug_arch = get_debug_arch();</div><div class='ctx'> </div><div class='ctx'> 	if (!debug_arch_supported()) {</div><div class='hunk'>@@ -1066,31 +1063,50 @@ static int __init arch_hw_breakpoint_init(void)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Scorpion CPUs (at least those in APQ8060) seem to set DBGPRSR.SPD</div><div class='add'>+	 * whenever a WFI is issued, even if the core is not powered down, in</div><div class='add'>+	 * violation of the architecture.  When DBGPRSR.SPD is set, accesses to</div><div class='add'>+	 * breakpoint and watchpoint registers are treated as undefined, so</div><div class='add'>+	 * this results in boot time and runtime failures when these are</div><div class='add'>+	 * accessed and we unexpectedly take a trap.</div><div class='add'>+	 *</div><div class='add'>+	 * It's not clear if/how this can be worked around, so we blacklist</div><div class='add'>+	 * Scorpion CPUs to avoid these issues.</div><div class='add'>+	*/</div><div class='add'>+	if (read_cpuid_part() == ARM_CPU_PART_SCORPION) {</div><div class='add'>+		pr_info("Scorpion CPU detected. Hardware breakpoints and watchpoints disabled\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	has_ossr = core_has_os_save_restore();</div><div class='ctx'> </div><div class='ctx'> 	/* Determine how many BRPs/WRPs are available. */</div><div class='ctx'> 	core_num_brps = get_num_brps();</div><div class='ctx'> 	core_num_wrps = get_num_wrps();</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to tread carefully here because DBGSWENABLE may be</div><div class='ctx'> 	 * driven low on this core and there isn't an architected way to</div><div class='ctx'> 	 * determine that.</div><div class='ctx'> 	 */</div><div class='add'>+	get_online_cpus();</div><div class='ctx'> 	register_undef_hook(&amp;debug_reg_hook);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Reset the breakpoint resources. We assume that a halting</div><div class='del'>-	 * debugger will leave the world in a nice state for us.</div><div class='add'>+	 * Register CPU notifier which resets the breakpoint resources. We</div><div class='add'>+	 * assume that a halting debugger will leave the world in a nice state</div><div class='add'>+	 * for us.</div><div class='ctx'> 	 */</div><div class='del'>-	on_each_cpu(reset_ctrl_regs, NULL, 1);</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "arm/hw_breakpoint:online",</div><div class='add'>+				dbg_reset_online, NULL);</div><div class='ctx'> 	unregister_undef_hook(&amp;debug_reg_hook);</div><div class='del'>-	if (!cpumask_empty(&amp;debug_err_mask)) {</div><div class='add'>+	if (WARN_ON(ret &lt; 0) || !cpumask_empty(&amp;debug_err_mask)) {</div><div class='ctx'> 		core_num_brps = 0;</div><div class='ctx'> 		core_num_wrps = 0;</div><div class='del'>-		cpu_notifier_register_done();</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			cpuhp_remove_state_nocalls(ret);</div><div class='add'>+		put_online_cpus();</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1108,12 +1124,9 @@ static int __init arch_hw_breakpoint_init(void)</div><div class='ctx'> 			TRAP_HWBKPT, "watchpoint debug exception");</div><div class='ctx'> 	hook_ifault_code(FAULT_CODE_DEBUG, hw_breakpoint_pending, SIGTRAP,</div><div class='ctx'> 			TRAP_HWBKPT, "breakpoint debug exception");</div><div class='add'>+	put_online_cpus();</div><div class='ctx'> </div><div class='del'>-	/* Register hotplug and PM notifiers. */</div><div class='del'>-	__register_cpu_notifier(&amp;dbg_reset_nb);</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-</div><div class='add'>+	/* Register PM notifiers. */</div><div class='ctx'> 	pm_init();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c<br/>index 4f14b5ce6535..80254b47dc34 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/module.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/module.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/module.c</a></div><div class='hunk'>@@ -155,8 +155,17 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,</div><div class='ctx'> 		       break;</div><div class='ctx'> </div><div class='ctx'> 		case R_ARM_PREL31:</div><div class='del'>-			offset = *(u32 *)loc + sym-&gt;st_value - loc;</div><div class='del'>-			*(u32 *)loc = offset &amp; 0x7fffffff;</div><div class='add'>+			offset = (*(s32 *)loc &lt;&lt; 1) &gt;&gt; 1; /* sign extend */</div><div class='add'>+			offset += sym-&gt;st_value - loc;</div><div class='add'>+			if (offset &gt;= 0x40000000 || offset &lt; -0x40000000) {</div><div class='add'>+				pr_err("%s: section %u reloc %u sym '%s': relocation %u out of range (%#lx -&gt; %#x)\n",</div><div class='add'>+				       module-&gt;name, relindex, i, symname,</div><div class='add'>+				       ELF32_R_TYPE(rel-&gt;r_info), loc,</div><div class='add'>+				       sym-&gt;st_value);</div><div class='add'>+				return -ENOEXEC;</div><div class='add'>+			}</div><div class='add'>+			*(u32 *)loc &amp;= 0x80000000;</div><div class='add'>+			*(u32 *)loc |= offset &amp; 0x7fffffff;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case R_ARM_MOVW_ABS_NC:</div><div class='head'>diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c<br/>index 69bda1a5707e..020560b2dcb7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/patch.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/patch.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/patch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/patch.c</a></div><div class='hunk'>@@ -24,9 +24,9 @@ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)</div><div class='ctx'> 	bool module = !core_kernel_text(uintaddr);</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='del'>-	if (module &amp;&amp; IS_ENABLED(CONFIG_DEBUG_SET_MODULE_RONX))</div><div class='add'>+	if (module &amp;&amp; IS_ENABLED(CONFIG_STRICT_MODULE_RWX))</div><div class='ctx'> 		page = vmalloc_to_page(addr);</div><div class='del'>-	else if (!module &amp;&amp; IS_ENABLED(CONFIG_DEBUG_RODATA))</div><div class='add'>+	else if (!module &amp;&amp; IS_ENABLED(CONFIG_STRICT_KERNEL_RWX))</div><div class='ctx'> 		page = virt_to_page(addr);</div><div class='ctx'> 	else</div><div class='ctx'> 		return addr;</div><div class='head'>diff --git a/arch/arm/kernel/perf_event_v6.c b/arch/arm/kernel/perf_event_v6.c<br/>index 09413e7b49aa..96b7a477a8db 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/perf_event_v6.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/perf_event_v6.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/perf_event_v6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/perf_event_v6.c</a></div><div class='hunk'>@@ -581,9 +581,5 @@ static struct platform_driver armv6_pmu_driver = {</div><div class='ctx'> 	.probe		= armv6_pmu_device_probe,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init register_armv6_pmu_driver(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;armv6_pmu_driver);</div><div class='del'>-}</div><div class='del'>-device_initcall(register_armv6_pmu_driver);</div><div class='add'>+builtin_platform_driver(armv6_pmu_driver);</div><div class='ctx'> #endif	/* CONFIG_CPU_V6 || CONFIG_CPU_V6K */</div><div class='head'>diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c<br/>index b9423491b9d7..ab6522b43659 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/perf_event_v7.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/perf_event_v7.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/perf_event_v7.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/perf_event_v7.c</a></div><div class='hunk'>@@ -2034,9 +2034,5 @@ static struct platform_driver armv7_pmu_driver = {</div><div class='ctx'> 	.probe		= armv7_pmu_device_probe,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init register_armv7_pmu_driver(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;armv7_pmu_driver);</div><div class='del'>-}</div><div class='del'>-device_initcall(register_armv7_pmu_driver);</div><div class='add'>+builtin_platform_driver(armv7_pmu_driver);</div><div class='ctx'> #endif	/* CONFIG_CPU_V7 */</div><div class='head'>diff --git a/arch/arm/kernel/perf_event_xscale.c b/arch/arm/kernel/perf_event_xscale.c<br/>index aa0499e2eef7..0e51f5e4f879 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/perf_event_xscale.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/perf_event_xscale.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/perf_event_xscale.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/perf_event_xscale.c</a></div><div class='hunk'>@@ -767,9 +767,5 @@ static struct platform_driver xscale_pmu_driver = {</div><div class='ctx'> 	.probe		= xscale_pmu_device_probe,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init register_xscale_pmu_driver(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;xscale_pmu_driver);</div><div class='del'>-}</div><div class='del'>-device_initcall(register_xscale_pmu_driver);</div><div class='add'>+builtin_platform_driver(xscale_pmu_driver);</div><div class='ctx'> #endif	/* CONFIG_CPU_XSCALE */</div><div class='head'>diff --git a/arch/arm/kernel/perf_regs.c b/arch/arm/kernel/perf_regs.c<br/>index 592dda3f21ff..c366b83bf955 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/perf_regs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/perf_regs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/perf_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/perf_regs.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;asm/perf_regs.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c<br/>index 91d2d5b01414..939e8b58c59d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/process.c</a></div><div class='hunk'>@@ -12,6 +12,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c<br/>index ce131ed5939d..58e3771e4c5b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/ptrace.c</a></div><div class='hunk'>@@ -10,7 +10,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -600,7 +601,7 @@ static int gpr_set(struct task_struct *target,</div><div class='ctx'> 		   const void *kbuf, const void __user *ubuf)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct pt_regs newregs;</div><div class='add'>+	struct pt_regs newregs = *task_pt_regs(target);</div><div class='ctx'> </div><div class='ctx'> 	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='ctx'> 				 &amp;newregs,</div><div class='head'>diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c<br/>index 34e3f3c45634..f4e54503afa9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/setup.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ __setup("fpe=", fpe_setup);</div><div class='ctx'> extern void init_default_cache_policy(unsigned long);</div><div class='ctx'> extern void paging_init(const struct machine_desc *desc);</div><div class='ctx'> extern void early_paging_init(const struct machine_desc *);</div><div class='del'>-extern void sanity_check_meminfo(void);</div><div class='add'>+extern void adjust_lowmem_bounds(void);</div><div class='ctx'> extern enum reboot_mode reboot_mode;</div><div class='ctx'> extern void setup_dma_zone(const struct machine_desc *desc);</div><div class='ctx'> </div><div class='hunk'>@@ -1093,8 +1093,14 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	setup_dma_zone(mdesc);</div><div class='ctx'> 	xen_early_init();</div><div class='ctx'> 	efi_init();</div><div class='del'>-	sanity_check_meminfo();</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the calculation for lowmem/highmem is set appropriately</div><div class='add'>+	 * before reserving/allocating any mmeory</div><div class='add'>+	 */</div><div class='add'>+	adjust_lowmem_bounds();</div><div class='ctx'> 	arm_memblock_init(mdesc);</div><div class='add'>+	/* Memory may have been removed so recalculate the bounds. */</div><div class='add'>+	adjust_lowmem_bounds();</div><div class='ctx'> </div><div class='ctx'> 	early_ioremap_reset();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/smccc-call.S b/arch/arm/kernel/smccc-call.S<br/>index 2e48b674aab1..e5d43066b889 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/smccc-call.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/smccc-call.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/smccc-call.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/smccc-call.S</a></div><div class='hunk'>@@ -46,17 +46,19 @@ UNWIND(	.fnend)</div><div class='ctx'> /*</div><div class='ctx'>  * void smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2,</div><div class='ctx'>  *		  unsigned long a3, unsigned long a4, unsigned long a5,</div><div class='del'>- *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res)</div><div class='add'>+ *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res,</div><div class='add'>+ *		  struct arm_smccc_quirk *quirk)</div><div class='ctx'>  */</div><div class='del'>-ENTRY(arm_smccc_smc)</div><div class='add'>+ENTRY(__arm_smccc_smc)</div><div class='ctx'> 	SMCCC SMCCC_SMC</div><div class='del'>-ENDPROC(arm_smccc_smc)</div><div class='add'>+ENDPROC(__arm_smccc_smc)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2,</div><div class='ctx'>  *		  unsigned long a3, unsigned long a4, unsigned long a5,</div><div class='del'>- *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res)</div><div class='add'>+ *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res,</div><div class='add'>+ *		  struct arm_smccc_quirk *quirk)</div><div class='ctx'>  */</div><div class='del'>-ENTRY(arm_smccc_hvc)</div><div class='add'>+ENTRY(__arm_smccc_hvc)</div><div class='ctx'> 	SMCCC SMCCC_HVC</div><div class='del'>-ENDPROC(arm_smccc_hvc)</div><div class='add'>+ENDPROC(__arm_smccc_hvc)</div><div class='head'>diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c<br/>index 7dd14e8395e6..572a8df1b766 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/smp.c</a></div><div class='hunk'>@@ -11,7 +11,9 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='hunk'>@@ -251,7 +253,7 @@ void __cpu_die(unsigned int cpu)</div><div class='ctx'> 		pr_err("CPU%u: cpu didn't die\n", cpu);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	pr_notice("CPU%u: shutdown\n", cpu);</div><div class='add'>+	pr_debug("CPU%u: shutdown\n", cpu);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * platform_cpu_kill() is generally expected to do the powering off</div><div class='hunk'>@@ -371,7 +373,7 @@ asmlinkage void secondary_start_kernel(void)</div><div class='ctx'> 	 * reference and switch to it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	cpu = smp_processor_id();</div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_count);</div><div class='add'>+	mmgrab(mm);</div><div class='ctx'> 	current-&gt;active_mm = mm;</div><div class='ctx'> 	cpumask_set_cpu(cpu, mm_cpumask(mm));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/smp_tlb.c b/arch/arm/kernel/smp_tlb.c<br/>index 22313cb53362..9af0701f7094 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/smp_tlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/smp_tlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/smp_tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/smp_tlb.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/smp_plat.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='hunk'>@@ -40,8 +41,11 @@ static inline void ipi_flush_tlb_mm(void *arg)</div><div class='ctx'> static inline void ipi_flush_tlb_page(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct tlb_args *ta = (struct tlb_args *)arg;</div><div class='add'>+	unsigned int __ua_flags = uaccess_save_and_enable();</div><div class='ctx'> </div><div class='ctx'> 	local_flush_tlb_page(ta-&gt;ta_vma, ta-&gt;ta_start);</div><div class='add'>+</div><div class='add'>+	uaccess_restore(__ua_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ipi_flush_tlb_kernel_page(void *arg)</div><div class='hunk'>@@ -54,8 +58,11 @@ static inline void ipi_flush_tlb_kernel_page(void *arg)</div><div class='ctx'> static inline void ipi_flush_tlb_range(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct tlb_args *ta = (struct tlb_args *)arg;</div><div class='add'>+	unsigned int __ua_flags = uaccess_save_and_enable();</div><div class='ctx'> </div><div class='ctx'> 	local_flush_tlb_range(ta-&gt;ta_vma, ta-&gt;ta_start, ta-&gt;ta_end);</div><div class='add'>+</div><div class='add'>+	uaccess_restore(__ua_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ipi_flush_tlb_kernel_range(void *arg)</div><div class='head'>diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c<br/>index 02d5e5e8d44c..895ae5197159 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/smp_twd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/smp_twd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/smp_twd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/smp_twd.c</a></div><div class='hunk'>@@ -339,7 +339,7 @@ static int __init twd_local_timer_common_register(struct device_node *np)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpuhp_setup_state_nocalls(CPUHP_AP_ARM_TWD_STARTING,</div><div class='del'>-				  "AP_ARM_TWD_STARTING",</div><div class='add'>+				  "arm/timer/twd:starting",</div><div class='ctx'> 				  twd_timer_starting_cpu, twd_timer_dying_cpu);</div><div class='ctx'> </div><div class='ctx'> 	twd_get_clock(np);</div><div class='head'>diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c<br/>index 92b72375c4c7..3a2fa203637a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/stacktrace.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/suspend.c b/arch/arm/kernel/suspend.c<br/>index 9a2f882a0a2d..ef794c799cb6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/suspend.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/suspend.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/suspend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/suspend.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/idmap.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c<br/>index c3fe769d7558..3bda08bee674 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/swp_emulate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/swp_emulate.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/swp_emulate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/swp_emulate.c</a></div><div class='hunk'>@@ -23,13 +23,14 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/opcodes.h&gt;</div><div class='ctx'> #include &lt;asm/system_info.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Error-checking SWP macros implemented using ldrex{b}/strex{b}</div><div class='head'>diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c<br/>index 5f221acd21ae..b9786f491873 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/sys_oabi-compat.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/sys_oabi-compat.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/sys_oabi-compat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/sys_oabi-compat.c</a></div><div class='hunk'>@@ -76,6 +76,7 @@</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/cred.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/eventpoll.h&gt;</div><div class='ctx'> #include &lt;linux/sem.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c<br/>index ec279d161b32..f8a3ab82e77f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/topology.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/topology.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/topology.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -20,8 +21,11 @@</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/topology.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/topology.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -41,6 +45,7 @@</div><div class='ctx'>  * updated during this sequence.</div><div class='ctx'>  */</div><div class='ctx'> static DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;</div><div class='add'>+static DEFINE_MUTEX(cpu_scale_mutex);</div><div class='ctx'> </div><div class='ctx'> unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -52,6 +57,65 @@ static void set_capacity_scale(unsigned int cpu, unsigned long capacity)</div><div class='ctx'> 	per_cpu(cpu_scale, cpu) = capacity;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PROC_SYSCTL</div><div class='add'>+static ssize_t cpu_capacity_show(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr,</div><div class='add'>+				 char *buf)</div><div class='add'>+{</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%lu\n",</div><div class='add'>+			arch_scale_cpu_capacity(NULL, cpu-&gt;dev.id));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t cpu_capacity_store(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr,</div><div class='add'>+				  const char *buf,</div><div class='add'>+				  size_t count)</div><div class='add'>+{</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev);</div><div class='add'>+	int this_cpu = cpu-&gt;dev.id, i;</div><div class='add'>+	unsigned long new_capacity;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	if (count) {</div><div class='add'>+		ret = kstrtoul(buf, 0, &amp;new_capacity);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		if (new_capacity &gt; SCHED_CAPACITY_SCALE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;cpu_scale_mutex);</div><div class='add'>+		for_each_cpu(i, &amp;cpu_topology[this_cpu].core_sibling)</div><div class='add'>+			set_capacity_scale(i, new_capacity);</div><div class='add'>+		mutex_unlock(&amp;cpu_scale_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR_RW(cpu_capacity);</div><div class='add'>+</div><div class='add'>+static int register_cpu_capacity_sysctl(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct device *cpu;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		cpu = get_cpu_device(i);</div><div class='add'>+		if (!cpu) {</div><div class='add'>+			pr_err("%s: too early to get CPU%d device!\n",</div><div class='add'>+			       __func__, i);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		device_create_file(cpu, &amp;dev_attr_cpu_capacity);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(register_cpu_capacity_sysctl);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_OF</div><div class='ctx'> struct cpu_efficiency {</div><div class='ctx'> 	const char *compatible;</div><div class='hunk'>@@ -78,6 +142,146 @@ static unsigned long *__cpu_capacity;</div><div class='ctx'> #define cpu_capacity(cpu)	__cpu_capacity[cpu]</div><div class='ctx'> </div><div class='ctx'> static unsigned long middle_capacity = 1;</div><div class='add'>+static bool cap_from_dt = true;</div><div class='add'>+static u32 *raw_capacity;</div><div class='add'>+static bool cap_parsing_failed;</div><div class='add'>+static u32 capacity_scale;</div><div class='add'>+</div><div class='add'>+static int __init parse_cpu_capacity(struct device_node *cpu_node, int cpu)</div><div class='add'>+{</div><div class='add'>+	int ret = 1;</div><div class='add'>+	u32 cpu_capacity;</div><div class='add'>+</div><div class='add'>+	if (cap_parsing_failed)</div><div class='add'>+		return !ret;</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_u32(cpu_node,</div><div class='add'>+				   "capacity-dmips-mhz",</div><div class='add'>+				   &amp;cpu_capacity);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!raw_capacity) {</div><div class='add'>+			raw_capacity = kcalloc(num_possible_cpus(),</div><div class='add'>+					       sizeof(*raw_capacity),</div><div class='add'>+					       GFP_KERNEL);</div><div class='add'>+			if (!raw_capacity) {</div><div class='add'>+				pr_err("cpu_capacity: failed to allocate memory for raw capacities\n");</div><div class='add'>+				cap_parsing_failed = true;</div><div class='add'>+				return !ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		capacity_scale = max(cpu_capacity, capacity_scale);</div><div class='add'>+		raw_capacity[cpu] = cpu_capacity;</div><div class='add'>+		pr_debug("cpu_capacity: %s cpu_capacity=%u (raw)\n",</div><div class='add'>+			cpu_node-&gt;full_name, raw_capacity[cpu]);</div><div class='add'>+	} else {</div><div class='add'>+		if (raw_capacity) {</div><div class='add'>+			pr_err("cpu_capacity: missing %s raw capacity\n",</div><div class='add'>+				cpu_node-&gt;full_name);</div><div class='add'>+			pr_err("cpu_capacity: partial information: fallback to 1024 for all CPUs\n");</div><div class='add'>+		}</div><div class='add'>+		cap_parsing_failed = true;</div><div class='add'>+		kfree(raw_capacity);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return !ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void normalize_cpu_capacity(void)</div><div class='add'>+{</div><div class='add'>+	u64 capacity;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	if (!raw_capacity || cap_parsing_failed)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pr_debug("cpu_capacity: capacity_scale=%u\n", capacity_scale);</div><div class='add'>+	mutex_lock(&amp;cpu_scale_mutex);</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		capacity = (raw_capacity[cpu] &lt;&lt; SCHED_CAPACITY_SHIFT)</div><div class='add'>+			/ capacity_scale;</div><div class='add'>+		set_capacity_scale(cpu, capacity);</div><div class='add'>+		pr_debug("cpu_capacity: CPU%d cpu_capacity=%lu\n",</div><div class='add'>+			cpu, arch_scale_cpu_capacity(NULL, cpu));</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;cpu_scale_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_FREQ</div><div class='add'>+static cpumask_var_t cpus_to_visit;</div><div class='add'>+static bool cap_parsing_done;</div><div class='add'>+static void parsing_done_workfn(struct work_struct *work);</div><div class='add'>+static DECLARE_WORK(parsing_done_work, parsing_done_workfn);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+init_cpu_capacity_callback(struct notifier_block *nb,</div><div class='add'>+			   unsigned long val,</div><div class='add'>+			   void *data)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_policy *policy = data;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	if (cap_parsing_failed || cap_parsing_done)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (val) {</div><div class='add'>+	case CPUFREQ_NOTIFY:</div><div class='add'>+		pr_debug("cpu_capacity: init cpu capacity for CPUs [%*pbl] (to_visit=%*pbl)\n",</div><div class='add'>+				cpumask_pr_args(policy-&gt;related_cpus),</div><div class='add'>+				cpumask_pr_args(cpus_to_visit));</div><div class='add'>+		cpumask_andnot(cpus_to_visit,</div><div class='add'>+			       cpus_to_visit,</div><div class='add'>+			       policy-&gt;related_cpus);</div><div class='add'>+		for_each_cpu(cpu, policy-&gt;related_cpus) {</div><div class='add'>+			raw_capacity[cpu] = arch_scale_cpu_capacity(NULL, cpu) *</div><div class='add'>+					    policy-&gt;cpuinfo.max_freq / 1000UL;</div><div class='add'>+			capacity_scale = max(raw_capacity[cpu], capacity_scale);</div><div class='add'>+		}</div><div class='add'>+		if (cpumask_empty(cpus_to_visit)) {</div><div class='add'>+			normalize_cpu_capacity();</div><div class='add'>+			kfree(raw_capacity);</div><div class='add'>+			pr_debug("cpu_capacity: parsing done\n");</div><div class='add'>+			cap_parsing_done = true;</div><div class='add'>+			schedule_work(&amp;parsing_done_work);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block init_cpu_capacity_notifier = {</div><div class='add'>+	.notifier_call = init_cpu_capacity_callback,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init register_cpufreq_notifier(void)</div><div class='add'>+{</div><div class='add'>+	if (cap_parsing_failed)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!alloc_cpumask_var(&amp;cpus_to_visit, GFP_KERNEL)) {</div><div class='add'>+		pr_err("cpu_capacity: failed to allocate memory for cpus_to_visit\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	cpumask_copy(cpus_to_visit, cpu_possible_mask);</div><div class='add'>+</div><div class='add'>+	return cpufreq_register_notifier(&amp;init_cpu_capacity_notifier,</div><div class='add'>+					 CPUFREQ_POLICY_NOTIFIER);</div><div class='add'>+}</div><div class='add'>+core_initcall(register_cpufreq_notifier);</div><div class='add'>+</div><div class='add'>+static void parsing_done_workfn(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	cpufreq_unregister_notifier(&amp;init_cpu_capacity_notifier,</div><div class='add'>+					 CPUFREQ_POLICY_NOTIFIER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static int __init free_raw_capacity(void)</div><div class='add'>+{</div><div class='add'>+	kfree(raw_capacity);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+core_initcall(free_raw_capacity);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Iterate all CPUs' descriptor in DT and compute the efficiency</div><div class='hunk'>@@ -99,6 +303,12 @@ static void __init parse_dt_topology(void)</div><div class='ctx'> 	__cpu_capacity = kcalloc(nr_cpu_ids, sizeof(*__cpu_capacity),</div><div class='ctx'> 				 GFP_NOWAIT);</div><div class='ctx'> </div><div class='add'>+	cn = of_find_node_by_path("/cpus");</div><div class='add'>+	if (!cn) {</div><div class='add'>+		pr_err("No CPU information found in DT\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		const u32 *rate;</div><div class='ctx'> 		int len;</div><div class='hunk'>@@ -110,6 +320,13 @@ static void __init parse_dt_topology(void)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (parse_cpu_capacity(cn, cpu)) {</div><div class='add'>+			of_node_put(cn);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cap_from_dt = false;</div><div class='add'>+</div><div class='ctx'> 		for (cpu_eff = table_efficiency; cpu_eff-&gt;compatible; cpu_eff++)</div><div class='ctx'> 			if (of_device_is_compatible(cn, cpu_eff-&gt;compatible))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -151,6 +368,8 @@ static void __init parse_dt_topology(void)</div><div class='ctx'> 		middle_capacity = ((max_capacity / 3)</div><div class='ctx'> 				&gt;&gt; (SCHED_CAPACITY_SHIFT-1)) + 1;</div><div class='ctx'> </div><div class='add'>+	if (cap_from_dt &amp;&amp; !cap_parsing_failed)</div><div class='add'>+		normalize_cpu_capacity();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -160,7 +379,7 @@ static void __init parse_dt_topology(void)</div><div class='ctx'>  */</div><div class='ctx'> static void update_cpu_capacity(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	if (!cpu_capacity(cpu))</div><div class='add'>+	if (!cpu_capacity(cpu) || cap_from_dt)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	set_capacity_scale(cpu, cpu_capacity(cpu) / middle_capacity);</div><div class='head'>diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c<br/>index 9688ec0c6ef4..948c648fea00 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/traps.c</a></div><div class='hunk'>@@ -24,7 +24,9 @@</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S<br/>index f7f55df0bf7b..ce18007f9e4e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kernel/vmlinux.lds.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -97,7 +97,7 @@ SECTIONS</div><div class='ctx'> 		HEAD_TEXT</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_RODATA</div><div class='add'>+#ifdef CONFIG_STRICT_KERNEL_RWX</div><div class='ctx'> 	. = ALIGN(1&lt;&lt;SECTION_SHIFT);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +158,7 @@ SECTIONS</div><div class='ctx'> </div><div class='ctx'> 	NOTES</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_RODATA</div><div class='add'>+#ifdef CONFIG_STRICT_KERNEL_RWX</div><div class='ctx'> 	. = ALIGN(1&lt;&lt;SECTION_SHIFT);</div><div class='ctx'> #else</div><div class='ctx'> 	. = ALIGN(PAGE_SIZE);</div><div class='hunk'>@@ -230,7 +230,7 @@ SECTIONS</div><div class='ctx'> 	PERCPU_SECTION(L1_CACHE_BYTES)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_RODATA</div><div class='add'>+#ifdef CONFIG_STRICT_KERNEL_RWX</div><div class='ctx'> 	. = ALIGN(1&lt;&lt;SECTION_SHIFT);</div><div class='ctx'> #else</div><div class='ctx'> 	. = ALIGN(THREAD_SIZE);</div><div class='hunk'>@@ -325,7 +325,7 @@ SECTIONS</div><div class='ctx'> 	STABS_DEBUG</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_RODATA</div><div class='add'>+#ifdef CONFIG_STRICT_KERNEL_RWX</div><div class='ctx'> /*</div><div class='ctx'>  * Without CONFIG_DEBUG_ALIGN_RODATA, __start_rodata_section_aligned will</div><div class='ctx'>  * be the first section-aligned location after __start_rodata. Otherwise,</div><div class='head'>diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig<br/>index 3e1cd0452d67..90d0176fb30d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kvm/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kvm/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kvm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/Kconfig</a></div><div class='hunk'>@@ -34,6 +34,7 @@ config KVM</div><div class='ctx'> 	select HAVE_KVM_IRQFD</div><div class='ctx'> 	select HAVE_KVM_IRQCHIP</div><div class='ctx'> 	select HAVE_KVM_IRQ_ROUTING</div><div class='add'>+	select HAVE_KVM_MSI</div><div class='ctx'> 	depends on ARM_VIRT_EXT &amp;&amp; ARM_LPAE &amp;&amp; ARM_ARCH_TIMER</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Support hosting virtualized guest machines.</div><div class='head'>diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile<br/>index f19842ea5418..7b3670c2ae7b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kvm/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kvm/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kvm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/Makefile</a></div><div class='hunk'>@@ -7,7 +7,7 @@ ifeq ($(plus_virt),+virt)</div><div class='ctx'> 	plus_virt_def := -DREQUIRES_VIRT=1</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-ccflags-y += -Iarch/arm/kvm</div><div class='add'>+ccflags-y += -Iarch/arm/kvm -Ivirt/kvm/arm/vgic</div><div class='ctx'> CFLAGS_arm.o := -I. $(plus_virt_def)</div><div class='ctx'> CFLAGS_mmu.o := -I.</div><div class='ctx'> </div><div class='hunk'>@@ -20,7 +20,7 @@ kvm-arm-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vf</div><div class='ctx'> obj-$(CONFIG_KVM_ARM_HOST) += hyp/</div><div class='ctx'> obj-y += kvm-arm.o init.o interrupts.o</div><div class='ctx'> obj-y += arm.o handle_exit.o guest.o mmu.o emulate.o reset.o</div><div class='del'>-obj-y += coproc.o coproc_a15.o coproc_a7.o mmio.o psci.o perf.o</div><div class='add'>+obj-y += coproc.o coproc_a15.o coproc_a7.o mmio.o psci.o perf.o vgic-v3-coproc.o</div><div class='ctx'> obj-y += $(KVM)/arm/aarch32.o</div><div class='ctx'> </div><div class='ctx'> obj-y += $(KVM)/arm/vgic/vgic.o</div><div class='hunk'>@@ -32,5 +32,7 @@ obj-y += $(KVM)/arm/vgic/vgic-mmio.o</div><div class='ctx'> obj-y += $(KVM)/arm/vgic/vgic-mmio-v2.o</div><div class='ctx'> obj-y += $(KVM)/arm/vgic/vgic-mmio-v3.o</div><div class='ctx'> obj-y += $(KVM)/arm/vgic/vgic-kvm-device.o</div><div class='add'>+obj-y += $(KVM)/arm/vgic/vgic-its.o</div><div class='add'>+obj-y += $(KVM)/arm/vgic/vgic-debug.o</div><div class='ctx'> obj-y += $(KVM)/irqchip.o</div><div class='ctx'> obj-y += $(KVM)/arm/arch_timer.o</div><div class='head'>diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c<br/>index 19b5f5c1c0ff..c9a2103faeb9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kvm/arm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kvm/arm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kvm/arm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/arm.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include "trace.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/mman.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='hunk'>@@ -135,7 +135,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)</div><div class='ctx'> 		goto out_free_stage2_pgd;</div><div class='ctx'> </div><div class='ctx'> 	kvm_vgic_early_init(kvm);</div><div class='del'>-	kvm_timer_init(kvm);</div><div class='ctx'> </div><div class='ctx'> 	/* Mark the initial VMID generation invalid */</div><div class='ctx'> 	kvm-&gt;arch.vmid_gen = 0;</div><div class='hunk'>@@ -207,6 +206,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> 	case KVM_CAP_ARM_PSCI_0_2:</div><div class='ctx'> 	case KVM_CAP_READONLY_MEM:</div><div class='ctx'> 	case KVM_CAP_MP_STATE:</div><div class='add'>+	case KVM_CAP_IMMEDIATE_EXIT:</div><div class='ctx'> 		r = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KVM_CAP_COALESCED_MMIO:</div><div class='hunk'>@@ -221,6 +221,12 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> 	case KVM_CAP_MAX_VCPUS:</div><div class='ctx'> 		r = KVM_MAX_VCPUS;</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_CAP_MSI_DEVID:</div><div class='add'>+		if (!kvm)</div><div class='add'>+			r = -EINVAL;</div><div class='add'>+		else</div><div class='add'>+			r = kvm-&gt;arch.vgic.msis_require_devid;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		r = kvm_arch_dev_ioctl_check_extension(kvm, ext);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -295,7 +301,8 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	return kvm_timer_should_fire(vcpu);</div><div class='add'>+	return kvm_timer_should_fire(vcpu_vtimer(vcpu)) ||</div><div class='add'>+	       kvm_timer_should_fire(vcpu_ptimer(vcpu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -598,6 +605,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (run-&gt;immediate_exit)</div><div class='add'>+		return -EINTR;</div><div class='add'>+</div><div class='ctx'> 	if (vcpu-&gt;sigset_active)</div><div class='ctx'> 		sigprocmask(SIG_SETMASK, &amp;vcpu-&gt;sigset, &amp;sigsaved);</div><div class='ctx'> </div><div class='hunk'>@@ -1093,6 +1103,9 @@ static void cpu_init_hyp_mode(void *dummy)</div><div class='ctx'> 	__cpu_init_hyp_mode(pgd_ptr, hyp_stack_ptr, vector_ptr);</div><div class='ctx'> 	__cpu_init_stage2();</div><div class='ctx'> </div><div class='add'>+	if (is_kernel_in_hyp_mode())</div><div class='add'>+		kvm_timer_init_vhe();</div><div class='add'>+</div><div class='ctx'> 	kvm_arm_init_debug();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c<br/>index 9aca92074f85..fa6182a40941 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kvm/guest.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kvm/guest.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kvm/guest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/guest.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/kvm.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_emulate.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_coproc.h&gt;</div><div class='head'>diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c<br/>index a5265edbeeab..962616fd4ddd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kvm/mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kvm/mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kvm/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/mmu.c</a></div><div class='hunk'>@@ -1232,9 +1232,9 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void coherent_cache_guest_page(struct kvm_vcpu *vcpu, kvm_pfn_t pfn,</div><div class='del'>-				      unsigned long size, bool uncached)</div><div class='add'>+				      unsigned long size)</div><div class='ctx'> {</div><div class='del'>-	__coherent_cache_guest_page(vcpu, pfn, size, uncached);</div><div class='add'>+	__coherent_cache_guest_page(vcpu, pfn, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,</div><div class='hunk'>@@ -1250,7 +1250,6 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='ctx'> 	kvm_pfn_t pfn;</div><div class='ctx'> 	pgprot_t mem_type = PAGE_S2;</div><div class='del'>-	bool fault_ipa_uncached;</div><div class='ctx'> 	bool logging_active = memslot_is_logging(memslot);</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1337,8 +1336,6 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,</div><div class='ctx'> 	if (!hugetlb &amp;&amp; !force_pte)</div><div class='ctx'> 		hugetlb = transparent_hugepage_adjust(&amp;pfn, &amp;fault_ipa);</div><div class='ctx'> </div><div class='del'>-	fault_ipa_uncached = memslot-&gt;flags &amp; KVM_MEMSLOT_INCOHERENT;</div><div class='del'>-</div><div class='ctx'> 	if (hugetlb) {</div><div class='ctx'> 		pmd_t new_pmd = pfn_pmd(pfn, mem_type);</div><div class='ctx'> 		new_pmd = pmd_mkhuge(new_pmd);</div><div class='hunk'>@@ -1346,7 +1343,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,</div><div class='ctx'> 			new_pmd = kvm_s2pmd_mkwrite(new_pmd);</div><div class='ctx'> 			kvm_set_pfn_dirty(pfn);</div><div class='ctx'> 		}</div><div class='del'>-		coherent_cache_guest_page(vcpu, pfn, PMD_SIZE, fault_ipa_uncached);</div><div class='add'>+		coherent_cache_guest_page(vcpu, pfn, PMD_SIZE);</div><div class='ctx'> 		ret = stage2_set_pmd_huge(kvm, memcache, fault_ipa, &amp;new_pmd);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pte_t new_pte = pfn_pte(pfn, mem_type);</div><div class='hunk'>@@ -1356,7 +1353,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,</div><div class='ctx'> 			kvm_set_pfn_dirty(pfn);</div><div class='ctx'> 			mark_page_dirty(kvm, gfn);</div><div class='ctx'> 		}</div><div class='del'>-		coherent_cache_guest_page(vcpu, pfn, PAGE_SIZE, fault_ipa_uncached);</div><div class='add'>+		coherent_cache_guest_page(vcpu, pfn, PAGE_SIZE);</div><div class='ctx'> 		ret = stage2_set_pte(kvm, memcache, fault_ipa, &amp;new_pte, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1879,15 +1876,6 @@ void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,</div><div class='ctx'> int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,</div><div class='ctx'> 			    unsigned long npages)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * Readonly memslots are not incoherent with the caches by definition,</div><div class='del'>-	 * but in practice, they are used mostly to emulate ROMs or NOR flashes</div><div class='del'>-	 * that the guest may consider devices and hence map as uncached.</div><div class='del'>-	 * To prevent incoherency issues in these cases, tag all readonly</div><div class='del'>-	 * regions as incoherent.</div><div class='del'>-	 */</div><div class='del'>-	if (slot-&gt;flags &amp; KVM_MEM_READONLY)</div><div class='del'>-		slot-&gt;flags |= KVM_MEMSLOT_INCOHERENT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c<br/>index 4b5e802e57d1..1da8b2d14550 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/kvm/reset.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/kvm/reset.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/kvm/reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/reset.c</a></div><div class='hunk'>@@ -37,6 +37,11 @@ static struct kvm_regs cortexa_regs_reset = {</div><div class='ctx'> 	.usr_regs.ARM_cpsr = SVC_MODE | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct kvm_irq_level cortexa_ptimer_irq = {</div><div class='add'>+	{ .irq = 30 },</div><div class='add'>+	.level = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct kvm_irq_level cortexa_vtimer_irq = {</div><div class='ctx'> 	{ .irq = 27 },</div><div class='ctx'> 	.level = 1,</div><div class='hunk'>@@ -58,6 +63,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_regs *reset_regs;</div><div class='ctx'> 	const struct kvm_irq_level *cpu_vtimer_irq;</div><div class='add'>+	const struct kvm_irq_level *cpu_ptimer_irq;</div><div class='ctx'> </div><div class='ctx'> 	switch (vcpu-&gt;arch.target) {</div><div class='ctx'> 	case KVM_ARM_TARGET_CORTEX_A7:</div><div class='hunk'>@@ -65,6 +71,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		reset_regs = &amp;cortexa_regs_reset;</div><div class='ctx'> 		vcpu-&gt;arch.midr = read_cpuid_id();</div><div class='ctx'> 		cpu_vtimer_irq = &amp;cortexa_vtimer_irq;</div><div class='add'>+		cpu_ptimer_irq = &amp;cortexa_ptimer_irq;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -77,5 +84,5 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	kvm_reset_coprocs(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset arch_timer context */</div><div class='del'>-	return kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq);</div><div class='add'>+	return kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq, cpu_ptimer_irq);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/kvm/vgic-v3-coproc.c b/arch/arm/kvm/vgic-v3-coproc.c<br/>new file mode 100644<br/>index 000000000000..f41abf76366f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/kvm/vgic-v3-coproc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/kvm/vgic-v3-coproc.c</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/*</div><div class='add'>+ * VGIC system registers handling functions for AArch32 mode</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kvm.h&gt;</div><div class='add'>+#include &lt;linux/kvm_host.h&gt;</div><div class='add'>+#include &lt;asm/kvm_emulate.h&gt;</div><div class='add'>+#include "vgic.h"</div><div class='add'>+</div><div class='add'>+int vgic_v3_has_cpu_sysregs_attr(struct kvm_vcpu *vcpu, bool is_write, u64 id,</div><div class='add'>+				 u64 *reg)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: Implement for AArch32</div><div class='add'>+	 */</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vgic_v3_cpu_sysregs_uaccess(struct kvm_vcpu *vcpu, bool is_write, u64 id,</div><div class='add'>+				u64 *reg)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: Implement for AArch32</div><div class='add'>+	 */</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/lib/delay-loop.S b/arch/arm/lib/delay-loop.S<br/>index 792c59d885bc..c766694e929c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/lib/delay-loop.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/lib/delay-loop.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/lib/delay-loop.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/lib/delay-loop.S</a></div><div class='hunk'>@@ -17,24 +17,23 @@</div><div class='ctx'> .LC1:		.word	UDELAY_MULT</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * loops = r0 * HZ * loops_per_jiffy / 1000000</div><div class='add'>+ *</div><div class='ctx'>  * r0  &lt;= 2000</div><div class='ctx'>  * HZ  &lt;= 1000</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> ENTRY(__loop_udelay)</div><div class='ctx'> 		ldr	r2, .LC1</div><div class='del'>-		mul	r0, r2, r0</div><div class='del'>-ENTRY(__loop_const_udelay)			@ 0 &lt;= r0 &lt;= 0x7fffff06</div><div class='add'>+		mul	r0, r2, r0		@ r0 = delay_us * UDELAY_MULT</div><div class='add'>+ENTRY(__loop_const_udelay)			@ 0 &lt;= r0 &lt;= 0xfffffaf0</div><div class='ctx'> 		ldr	r2, .LC0</div><div class='ctx'> 		ldr	r2, [r2]</div><div class='del'>-		umull	r1, r0, r2, r0</div><div class='del'>-		adds	r1, r1, #0xffffffff</div><div class='del'>-		adcs	r0, r0, r0</div><div class='add'>+		umull	r1, r0, r2, r0		@ r0-r1 = r0 * loops_per_jiffy</div><div class='add'>+		adds	r1, r1, #0xffffffff	@ rounding up ...</div><div class='add'>+		adcs	r0, r0, r0		@ and right shift by 31</div><div class='ctx'> 		reteq	lr</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * loops = r0 * HZ * loops_per_jiffy / 1000000</div><div class='del'>- */</div><div class='ctx'> 		.align 3</div><div class='ctx'> </div><div class='ctx'> @ Delay routine</div><div class='head'>diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S<br/>index 8ecfd15c3a02..df73914e81c8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/lib/getuser.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/lib/getuser.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/lib/getuser.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/lib/getuser.S</a></div><div class='hunk'>@@ -67,7 +67,7 @@ ENTRY(__get_user_4)</div><div class='ctx'> ENDPROC(__get_user_4)</div><div class='ctx'> </div><div class='ctx'> ENTRY(__get_user_8)</div><div class='del'>-	check_uaccess r0, 8, r1, r2, __get_user_bad</div><div class='add'>+	check_uaccess r0, 8, r1, r2, __get_user_bad8</div><div class='ctx'> #ifdef CONFIG_THUMB2_KERNEL</div><div class='ctx'> 5: TUSER(ldr)	r2, [r0]</div><div class='ctx'> 6: TUSER(ldr)	r3, [r0, #4]</div><div class='head'>diff --git a/arch/arm/mach-alpine/platsmp.c b/arch/arm/mach-alpine/platsmp.c<br/>index dd77ea25e7ca..6dc6d491f88a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-alpine/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-alpine/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-alpine/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-alpine/platsmp.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ static int alpine_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t addr;</div><div class='ctx'> </div><div class='del'>-	addr = virt_to_phys(secondary_startup);</div><div class='add'>+	addr = __pa_symbol(secondary_startup);</div><div class='ctx'> </div><div class='ctx'> 	if (addr &gt; (phys_addr_t)(uint32_t)(-1)) {</div><div class='ctx'> 		pr_err("FAIL: resume address over 32bit (%pa)", &amp;addr);</div><div class='head'>diff --git a/arch/arm/mach-artpec/Kconfig b/arch/arm/mach-artpec/Kconfig<br/>index 6cbe5a2eabab..85a962abb77f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-artpec/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-artpec/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-artpec/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-artpec/Kconfig</a></div><div class='hunk'>@@ -14,6 +14,7 @@ config MACH_ARTPEC6</div><div class='ctx'> 	select HAVE_ARM_ARCH_TIMER</div><div class='ctx'> 	select HAVE_ARM_SCU</div><div class='ctx'> 	select HAVE_ARM_TWD if SMP</div><div class='add'>+	select MFD_SYSCON</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Axis ARTPEC-6 ARM Cortex A9 Platform</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-aspeed/Kconfig b/arch/arm/mach-aspeed/Kconfig<br/>index 5225fbcb250d..f3f8c5c658db 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-aspeed/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-aspeed/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-aspeed/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-aspeed/Kconfig</a></div><div class='hunk'>@@ -5,6 +5,8 @@ menuconfig ARCH_ASPEED</div><div class='ctx'> 	select WATCHDOG</div><div class='ctx'> 	select ASPEED_WATCHDOG</div><div class='ctx'> 	select MOXART_TIMER</div><div class='add'>+	select MFD_SYSCON</div><div class='add'>+	select PINCTRL</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you want to run your kernel on an ASpeed BMC SoC.</div><div class='ctx'> </div><div class='hunk'>@@ -14,6 +16,7 @@ config MACH_ASPEED_G4</div><div class='ctx'> 	bool "Aspeed SoC 4th Generation"</div><div class='ctx'> 	depends on ARCH_MULTI_V5</div><div class='ctx'> 	select CPU_ARM926T</div><div class='add'>+	select PINCTRL_ASPEED_G4</div><div class='ctx'> 	help</div><div class='ctx'> 	 Say yes if you intend to run on an Aspeed ast2400 or similar</div><div class='ctx'> 	 fourth generation BMCs, such as those used by OpenPower Power8</div><div class='hunk'>@@ -23,6 +26,7 @@ config MACH_ASPEED_G5</div><div class='ctx'> 	bool "Aspeed SoC 5th Generation"</div><div class='ctx'> 	depends on ARCH_MULTI_V6</div><div class='ctx'> 	select CPU_V6</div><div class='add'>+	select PINCTRL_ASPEED_G5</div><div class='ctx'> 	help</div><div class='ctx'> 	 Say yes if you intend to run on an Aspeed ast2500 or similar</div><div class='ctx'> 	 fifth generation Aspeed BMCs.</div><div class='head'>diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c<br/>index b4332b727e9c..3d89b7905bd9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-at91/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-at91/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-at91/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-at91/pm.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ static struct {</div><div class='ctx'> 	int memctrl;</div><div class='ctx'> } at91_pm_data;</div><div class='ctx'> </div><div class='del'>-void __iomem *at91_ramc_base[2];</div><div class='add'>+static void __iomem *at91_ramc_base[2];</div><div class='ctx'> </div><div class='ctx'> static int at91_pm_valid_state(suspend_state_t state)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h<br/>index 3fcf8810f14e..bf980c6ef294 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-at91/pm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-at91/pm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-at91/pm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-at91/pm.h</a></div><div class='hunk'>@@ -18,8 +18,6 @@</div><div class='ctx'> #include &lt;soc/at91/at91sam9_sdramc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='del'>-extern void __iomem *at91_ramc_base[];</div><div class='del'>-</div><div class='ctx'> #define at91_ramc_read(id, field) \</div><div class='ctx'> 	__raw_readl(at91_ramc_base[id] + field)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-axxia/platsmp.c b/arch/arm/mach-axxia/platsmp.c<br/>index ffbd71d45008..502e3df69f69 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-axxia/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-axxia/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-axxia/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-axxia/platsmp.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> static void write_release_addr(u32 release_phys)</div><div class='ctx'> {</div><div class='ctx'> 	u32 *virt = (u32 *) phys_to_virt(release_phys);</div><div class='del'>-	writel_relaxed(virt_to_phys(secondary_startup), virt);</div><div class='add'>+	writel_relaxed(__pa_symbol(secondary_startup), virt);</div><div class='ctx'> 	/* Make sure this store is visible to other CPUs */</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> 	__cpuc_flush_dcache_area(virt, sizeof(u32));</div><div class='head'>diff --git a/arch/arm/mach-bcm/bcm63xx_smp.c b/arch/arm/mach-bcm/bcm63xx_smp.c<br/>index 9b6727ed68cd..f5fb10b4376f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-bcm/bcm63xx_smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-bcm/bcm63xx_smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-bcm/bcm63xx_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-bcm/bcm63xx_smp.c</a></div><div class='hunk'>@@ -135,7 +135,7 @@ static int bcm63138_smp_boot_secondary(unsigned int cpu,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Write the secondary init routine to the BootLUT reset vector */</div><div class='del'>-	val = virt_to_phys(secondary_startup);</div><div class='add'>+	val = __pa_symbol(secondary_startup);</div><div class='ctx'> 	writel_relaxed(val, bootlut_base + BOOTLUT_RESET_VECT);</div><div class='ctx'> </div><div class='ctx'> 	/* Power up the core, will jump straight to its reset vector when we</div><div class='head'>diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c<br/>index c8830a2b0d60..fe067f6cebb6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-bcm/bcm_5301x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-bcm/bcm_5301x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-bcm/bcm_5301x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-bcm/bcm_5301x.c</a></div><div class='hunk'>@@ -9,14 +9,42 @@</div><div class='ctx'> #include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/siginfo.h&gt;</div><div class='add'>+#include &lt;asm/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#define FSR_EXTERNAL		(1 &lt;&lt; 12)</div><div class='add'>+#define FSR_READ		(0 &lt;&lt; 10)</div><div class='add'>+#define FSR_IMPRECISE		0x0406</div><div class='ctx'> </div><div class='ctx'> static const char *const bcm5301x_dt_compat[] __initconst = {</div><div class='ctx'> 	"brcm,bcm4708",</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int bcm5301x_abort_handler(unsigned long addr, unsigned int fsr,</div><div class='add'>+				  struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * We want to ignore aborts forwarded from the PCIe bus that are</div><div class='add'>+	 * expected and shouldn't really be passed by the PCIe controller.</div><div class='add'>+	 * The biggest disadvantage is the same FSR code may be reported when</div><div class='add'>+	 * reading non-existing APB register and we shouldn't ignore that.</div><div class='add'>+	 */</div><div class='add'>+	if (fsr == (FSR_EXTERNAL | FSR_READ | FSR_IMPRECISE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init bcm5301x_init_early(void)</div><div class='add'>+{</div><div class='add'>+	hook_fault_code(16 + 6, bcm5301x_abort_handler, SIGBUS, BUS_OBJERR,</div><div class='add'>+			"imprecise external abort");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> DT_MACHINE_START(BCM5301X, "BCM5301X")</div><div class='ctx'> 	.l2c_aux_val	= 0,</div><div class='ctx'> 	.l2c_aux_mask	= ~0,</div><div class='ctx'> 	.dt_compat	= bcm5301x_dt_compat,</div><div class='add'>+	.init_early	= bcm5301x_init_early,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-bcm/platsmp-brcmstb.c b/arch/arm/mach-bcm/platsmp-brcmstb.c<br/>index 40dc8448445e..12379960e982 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-bcm/platsmp-brcmstb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-bcm/platsmp-brcmstb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-bcm/platsmp-brcmstb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-bcm/platsmp-brcmstb.c</a></div><div class='hunk'>@@ -151,7 +151,7 @@ static void brcmstb_cpu_boot(u32 cpu)</div><div class='ctx'> 	 * Set the reset vector to point to the secondary_startup</div><div class='ctx'> 	 * routine</div><div class='ctx'> 	 */</div><div class='del'>-	cpu_set_boot_addr(cpu, virt_to_phys(secondary_startup));</div><div class='add'>+	cpu_set_boot_addr(cpu, __pa_symbol(secondary_startup));</div><div class='ctx'> </div><div class='ctx'> 	/* Unhalt the cpu */</div><div class='ctx'> 	cpu_rst_cfg_set(cpu, 0);</div><div class='head'>diff --git a/arch/arm/mach-bcm/platsmp.c b/arch/arm/mach-bcm/platsmp.c<br/>index 3ac3a9bc663c..9e3f275934eb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-bcm/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-bcm/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-bcm/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-bcm/platsmp.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='hunk'>@@ -116,7 +117,7 @@ static int nsp_write_lut(unsigned int cpu)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	secondary_startup_phy = virt_to_phys(secondary_startup);</div><div class='add'>+	secondary_startup_phy = __pa_symbol(secondary_startup);</div><div class='ctx'> 	BUG_ON(secondary_startup_phy &gt; (phys_addr_t)U32_MAX);</div><div class='ctx'> </div><div class='ctx'> 	writel_relaxed(secondary_startup_phy, sku_rom_lut);</div><div class='hunk'>@@ -189,7 +190,7 @@ static int kona_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> 	 * Secondary cores will start in secondary_startup(),</div><div class='ctx'> 	 * defined in "arch/arm/kernel/head.S"</div><div class='ctx'> 	 */</div><div class='del'>-	boot_func = virt_to_phys(secondary_startup);</div><div class='add'>+	boot_func = __pa_symbol(secondary_startup);</div><div class='ctx'> 	BUG_ON(boot_func &amp; BOOT_ADDR_CPUID_MASK);</div><div class='ctx'> 	BUG_ON(boot_func &gt; (phys_addr_t)U32_MAX);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-berlin/platsmp.c b/arch/arm/mach-berlin/platsmp.c<br/>index 93f90688db18..7586b7aec272 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-berlin/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-berlin/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-berlin/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-berlin/platsmp.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/cp15.h&gt;</div><div class='add'>+#include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/smp_plat.h&gt;</div><div class='ctx'> #include &lt;asm/smp_scu.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -75,7 +76,7 @@ static void __init berlin_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	if (!cpu_ctrl)</div><div class='ctx'> 		goto unmap_scu;</div><div class='ctx'> </div><div class='del'>-	vectors_base = ioremap(CONFIG_VECTORS_BASE, SZ_32K);</div><div class='add'>+	vectors_base = ioremap(VECTORS_BASE, SZ_32K);</div><div class='ctx'> 	if (!vectors_base)</div><div class='ctx'> 		goto unmap_scu;</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +93,7 @@ static void __init berlin_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	 * Write the secondary startup address into the SW reset address</div><div class='ctx'> 	 * vector. This is used by boot_inst.</div><div class='ctx'> 	 */</div><div class='del'>-	writel(virt_to_phys(secondary_startup), vectors_base + SW_RESET_ADDR);</div><div class='add'>+	writel(__pa_symbol(secondary_startup), vectors_base + SW_RESET_ADDR);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(vectors_base);</div><div class='ctx'> unmap_scu:</div><div class='head'>diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile<br/>index da4c336b4637..df96ca9eab6d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/Makefile</a></div><div class='hunk'>@@ -21,7 +21,7 @@ obj-$(CONFIG_AINTC)			+= irq.o</div><div class='ctx'> obj-$(CONFIG_CP_INTC)			+= cp_intc.o</div><div class='ctx'> </div><div class='ctx'> # Board specific</div><div class='del'>-obj-$(CONFIG_MACH_DA8XX_DT)		+= da8xx-dt.o</div><div class='add'>+obj-$(CONFIG_MACH_DA8XX_DT)		+= da8xx-dt.o pdata-quirks.o</div><div class='ctx'> obj-$(CONFIG_MACH_DAVINCI_EVM)  	+= board-dm644x-evm.o</div><div class='ctx'> obj-$(CONFIG_MACH_SFFSDR)		+= board-sffsdr.o</div><div class='ctx'> obj-$(CONFIG_MACH_NEUROS_OSD2)		+= board-neuros-osd2.o</div><div class='hunk'>@@ -36,5 +36,7 @@ obj-$(CONFIG_MACH_OMAPL138_HAWKBOARD)	+= board-omapl138-hawk.o</div><div class='ctx'> </div><div class='ctx'> # Power Management</div><div class='ctx'> obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o</div><div class='del'>-obj-$(CONFIG_SUSPEND)			+= pm.o sleep.o</div><div class='ctx'> obj-$(CONFIG_HAVE_CLK)			+= pm_domain.o</div><div class='add'>+ifeq ($(CONFIG_SUSPEND),y)</div><div class='add'>+obj-$(CONFIG_ARCH_DAVINCI_DA850)	+= pm.o sleep.o</div><div class='add'>+endif</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c<br/>index 3d8cf8cbd98a..58075627c6df 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-da830-evm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/board-da830-evm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-da830-evm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-da830-evm.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/gpio/machine.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c/pcf857x.h&gt;</div><div class='hunk'>@@ -27,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/platform_data/mtd-davinci-aemif.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/spi-davinci.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/usb-davinci.h&gt;</div><div class='add'>+#include &lt;linux/regulator/machine.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -106,43 +108,24 @@ static irqreturn_t da830_evm_usb_ocic_irq(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static __init void da830_evm_usb_init(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cfgchip2;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Set up USB clock/mode in the CFGCHIP2 register.</div><div class='del'>-	 * FYI:  CFGCHIP2 is 0x0000ef00 initially.</div><div class='del'>-	 */</div><div class='del'>-	cfgchip2 = __raw_readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='del'>-</div><div class='del'>-	/* USB2.0 PHY reference clock is 24 MHz */</div><div class='del'>-	cfgchip2 &amp;= ~CFGCHIP2_REFFREQ;</div><div class='del'>-	cfgchip2 |=  CFGCHIP2_REFFREQ_24MHZ;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Select internal reference clock for USB 2.0 PHY</div><div class='del'>-	 * and use it as a clock source for USB 1.1 PHY</div><div class='del'>-	 * (this is the default setting anyway).</div><div class='del'>-	 */</div><div class='del'>-	cfgchip2 &amp;= ~CFGCHIP2_USB1PHYCLKMUX;</div><div class='del'>-	cfgchip2 |=  CFGCHIP2_USB2PHYCLKMUX;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We have to override VBUS/ID signals when MUSB is configured into the</div><div class='del'>-	 * host-only mode -- ID pin will float if no cable is connected, so the</div><div class='del'>-	 * controller won't be able to drive VBUS thinking that it's a B-device.</div><div class='del'>-	 * Otherwise, we want to use the OTG mode and enable VBUS comparators.</div><div class='del'>-	 */</div><div class='del'>-	cfgchip2 &amp;= ~CFGCHIP2_OTGMODE;</div><div class='del'>-#ifdef	CONFIG_USB_MUSB_HOST</div><div class='del'>-	cfgchip2 |=  CFGCHIP2_FORCE_HOST;</div><div class='del'>-#else</div><div class='del'>-	cfgchip2 |=  CFGCHIP2_SESENDEN | CFGCHIP2_VBDTCTEN;</div><div class='del'>-#endif</div><div class='add'>+	/* USB_REFCLKIN is not used. */</div><div class='add'>+	ret = da8xx_register_usb20_phy_clk(false);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: USB 2.0 PHY CLK registration failed: %d\n",</div><div class='add'>+			__func__, ret);</div><div class='ctx'> </div><div class='del'>-	__raw_writel(cfgchip2, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='add'>+	ret = da8xx_register_usb11_phy_clk(false);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: USB 1.1 PHY CLK registration failed: %d\n",</div><div class='add'>+			__func__, ret);</div><div class='add'>+</div><div class='add'>+	ret = da8xx_register_usb_phy();</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: USB PHY registration failed: %d\n",</div><div class='add'>+			__func__, ret);</div><div class='ctx'> </div><div class='del'>-	/* USB_REFCLKIN is not used. */</div><div class='ctx'> 	ret = davinci_cfg_reg(DA830_USB0_DRVVBUS);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		pr_warn("%s: USB 2.0 PinMux setup failed: %d\n", __func__, ret);</div><div class='hunk'>@@ -222,22 +205,16 @@ static const short da830_evm_mmc_sd_pins[] = {</div><div class='ctx'> 	-1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define DA830_MMCSD_WP_PIN		GPIO_TO_PIN(2, 1)</div><div class='del'>-#define DA830_MMCSD_CD_PIN		GPIO_TO_PIN(2, 2)</div><div class='del'>-</div><div class='del'>-static int da830_evm_mmc_get_ro(int index)</div><div class='del'>-{</div><div class='del'>-	return gpio_get_value(DA830_MMCSD_WP_PIN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int da830_evm_mmc_get_cd(int index)</div><div class='del'>-{</div><div class='del'>-	return !gpio_get_value(DA830_MMCSD_CD_PIN);</div><div class='del'>-}</div><div class='add'>+static struct gpiod_lookup_table mmc_gpios_table = {</div><div class='add'>+	.dev_id = "da830-mmc.0",</div><div class='add'>+	.table = {</div><div class='add'>+		/* gpio chip 1 contains gpio range 32-63 */</div><div class='add'>+		GPIO_LOOKUP("davinci_gpio.1", 2, "cd", GPIO_ACTIVE_LOW),</div><div class='add'>+		GPIO_LOOKUP("davinci_gpio.1", 1, "wp", GPIO_ACTIVE_LOW),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct davinci_mmc_config da830_evm_mmc_config = {</div><div class='del'>-	.get_ro			= da830_evm_mmc_get_ro,</div><div class='del'>-	.get_cd			= da830_evm_mmc_get_cd,</div><div class='ctx'> 	.wires			= 8,</div><div class='ctx'> 	.max_freq		= 50000000,</div><div class='ctx'> 	.caps			= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,</div><div class='hunk'>@@ -253,26 +230,12 @@ static inline void da830_evm_init_mmc(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = gpio_request(DA830_MMCSD_WP_PIN, "MMC WP");</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_warn("%s: can not open GPIO %d\n",</div><div class='del'>-			__func__, DA830_MMCSD_WP_PIN);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	gpio_direction_input(DA830_MMCSD_WP_PIN);</div><div class='del'>-</div><div class='del'>-	ret = gpio_request(DA830_MMCSD_CD_PIN, "MMC CD\n");</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_warn("%s: can not open GPIO %d\n",</div><div class='del'>-			__func__, DA830_MMCSD_CD_PIN);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	gpio_direction_input(DA830_MMCSD_CD_PIN);</div><div class='add'>+	gpiod_add_lookup_table(&amp;mmc_gpios_table);</div><div class='ctx'> </div><div class='ctx'> 	ret = da8xx_register_mmcsd0(&amp;da830_evm_mmc_config);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_warn("%s: mmc/sd registration failed: %d\n", __func__, ret);</div><div class='del'>-		gpio_free(DA830_MMCSD_WP_PIN);</div><div class='add'>+		gpiod_remove_lookup_table(&amp;mmc_gpios_table);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -588,6 +551,10 @@ static __init void da830_evm_init(void)</div><div class='ctx'> 	struct davinci_soc_info *soc_info = &amp;davinci_soc_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = da8xx_register_cfgchip();</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: CFGCHIP registration failed: %d\n", __func__, ret);</div><div class='add'>+</div><div class='ctx'> 	ret = da830_register_gpio();</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);</div><div class='hunk'>@@ -647,6 +614,8 @@ static __init void da830_evm_init(void)</div><div class='ctx'> 	ret = da8xx_register_spi_bus(0, ARRAY_SIZE(da830evm_spi_info));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		pr_warn("%s: spi 0 registration failed: %d\n", __func__, ret);</div><div class='add'>+</div><div class='add'>+	regulator_has_full_constraints();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIAL_8250_CONSOLE</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c<br/>index 8e4539f69fdc..df3ca38778af 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-da850-evm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/board-da850-evm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-da850-evm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-da850-evm.c</a></div><div class='hunk'>@@ -15,8 +15,10 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='add'>+#include &lt;linux/gpio/machine.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/at24.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/pca953x.h&gt;</div><div class='hunk'>@@ -56,9 +58,6 @@</div><div class='ctx'> #define DA850_LCD_PWR_PIN		GPIO_TO_PIN(2, 8)</div><div class='ctx'> #define DA850_LCD_BL_PIN		GPIO_TO_PIN(2, 15)</div><div class='ctx'> </div><div class='del'>-#define DA850_MMCSD_CD_PIN		GPIO_TO_PIN(4, 0)</div><div class='del'>-#define DA850_MMCSD_WP_PIN		GPIO_TO_PIN(4, 1)</div><div class='del'>-</div><div class='ctx'> #define DA850_MII_MDIO_CLKEN_PIN	GPIO_TO_PIN(2, 6)</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition da850evm_spiflash_part[] = {</div><div class='hunk'>@@ -196,18 +195,6 @@ static struct platform_device da850_evm_norflash_device = {</div><div class='ctx'> 	.resource	= da850_evm_norflash_resource,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct davinci_pm_config da850_pm_pdata = {</div><div class='del'>-	.sleepcount = 128,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device da850_pm_device = {</div><div class='del'>-	.name           = "pm-davinci",</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data	= &amp;da850_pm_pdata,</div><div class='del'>-	},</div><div class='del'>-	.id             = -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* DA850/OMAP-L138 EVM includes a 512 MByte large-page NAND flash</div><div class='ctx'>  * (128K blocks). It may be used instead of the (default) SPI flash</div><div class='ctx'>  * to boot, using TI's tools to install the secondary boot loader</div><div class='hunk'>@@ -776,19 +763,16 @@ static const short da850_evm_mcasp_pins[] __initconst = {</div><div class='ctx'> 	-1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int da850_evm_mmc_get_ro(int index)</div><div class='del'>-{</div><div class='del'>-	return gpio_get_value(DA850_MMCSD_WP_PIN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int da850_evm_mmc_get_cd(int index)</div><div class='del'>-{</div><div class='del'>-	return !gpio_get_value(DA850_MMCSD_CD_PIN);</div><div class='del'>-}</div><div class='add'>+static struct gpiod_lookup_table mmc_gpios_table = {</div><div class='add'>+	.dev_id = "da830-mmc.0",</div><div class='add'>+	.table = {</div><div class='add'>+		/* gpio chip 2 contains gpio range 64-95 */</div><div class='add'>+		GPIO_LOOKUP("davinci_gpio.2", 0, "cd", GPIO_ACTIVE_LOW),</div><div class='add'>+		GPIO_LOOKUP("davinci_gpio.2", 1, "wp", GPIO_ACTIVE_LOW),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct davinci_mmc_config da850_mmc_config = {</div><div class='del'>-	.get_ro		= da850_evm_mmc_get_ro,</div><div class='del'>-	.get_cd		= da850_evm_mmc_get_cd,</div><div class='ctx'> 	.wires		= 4,</div><div class='ctx'> 	.max_freq	= 50000000,</div><div class='ctx'> 	.caps		= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,</div><div class='hunk'>@@ -1345,6 +1329,10 @@ static __init void da850_evm_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = da8xx_register_cfgchip();</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: CFGCHIP registration failed: %d\n", __func__, ret);</div><div class='add'>+</div><div class='ctx'> 	ret = da850_register_gpio();</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);</div><div class='hunk'>@@ -1379,17 +1367,7 @@ static __init void da850_evm_init(void)</div><div class='ctx'> 			pr_warn("%s: MMCSD0 mux setup failed: %d\n",</div><div class='ctx'> 				__func__, ret);</div><div class='ctx'> </div><div class='del'>-		ret = gpio_request(DA850_MMCSD_CD_PIN, "MMC CD\n");</div><div class='del'>-		if (ret)</div><div class='del'>-			pr_warn("%s: can not open GPIO %d\n",</div><div class='del'>-				__func__, DA850_MMCSD_CD_PIN);</div><div class='del'>-		gpio_direction_input(DA850_MMCSD_CD_PIN);</div><div class='del'>-</div><div class='del'>-		ret = gpio_request(DA850_MMCSD_WP_PIN, "MMC WP\n");</div><div class='del'>-		if (ret)</div><div class='del'>-			pr_warn("%s: can not open GPIO %d\n",</div><div class='del'>-				__func__, DA850_MMCSD_WP_PIN);</div><div class='del'>-		gpio_direction_input(DA850_MMCSD_WP_PIN);</div><div class='add'>+		gpiod_add_lookup_table(&amp;mmc_gpios_table);</div><div class='ctx'> </div><div class='ctx'> 		ret = da8xx_register_mmcsd0(&amp;da850_mmc_config);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -1453,10 +1431,7 @@ static __init void da850_evm_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		pr_warn("%s: cpuidle registration failed: %d\n", __func__, ret);</div><div class='ctx'> </div><div class='del'>-	ret = da850_register_pm(&amp;da850_pm_device);</div><div class='del'>-	if (ret)</div><div class='del'>-		pr_warn("%s: suspend registration failed: %d\n", __func__, ret);</div><div class='del'>-</div><div class='add'>+	davinci_pm_init();</div><div class='ctx'> 	da850_vpif_init();</div><div class='ctx'> </div><div class='ctx'> 	ret = spi_register_board_info(da850evm_spi_info,</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c<br/>index 521e40977265..023480b75244 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-dm644x-evm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/board-dm644x-evm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-dm644x-evm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-dm644x-evm.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;linux/v4l2-dv-timings.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;media/i2c/tvp514x.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c<br/>index bc4e63fa9808..b73ce7bae81f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-mityomapl138.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/board-mityomapl138.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-mityomapl138.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-mityomapl138.c</a></div><div class='hunk'>@@ -498,22 +498,14 @@ static void __init mityomapl138_config_emac(void)</div><div class='ctx'> 		pr_warn("emac registration failed: %d\n", ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct davinci_pm_config da850_pm_pdata = {</div><div class='del'>-	.sleepcount = 128,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device da850_pm_device = {</div><div class='del'>-	.name	= "pm-davinci",</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data  = &amp;da850_pm_pdata,</div><div class='del'>-	},</div><div class='del'>-	.id	= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init mityomapl138_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = da8xx_register_cfgchip();</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: CFGCHIP registration failed: %d\n", __func__, ret);</div><div class='add'>+</div><div class='ctx'> 	/* for now, no special EDMA channels are reserved */</div><div class='ctx'> 	ret = da850_register_edma(NULL);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -555,9 +547,7 @@ static void __init mityomapl138_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		pr_warn("cpuidle registration failed: %d\n", ret);</div><div class='ctx'> </div><div class='del'>-	ret = da850_register_pm(&amp;da850_pm_device);</div><div class='del'>-	if (ret)</div><div class='del'>-		pr_warn("suspend registration failed: %d\n", ret);</div><div class='add'>+	davinci_pm_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIAL_8250_CONSOLE</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c<br/>index ad10017203c1..0a7838852649 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-neuros-osd2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/board-neuros-osd2.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-neuros-osd2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-neuros-osd2.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/gpio-davinci.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/i2c-davinci.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c<br/>index ee624861ca66..a3e78074be70 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-omapl138-hawk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/board-omapl138-hawk.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/board-omapl138-hawk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/board-omapl138-hawk.c</a></div><div class='hunk'>@@ -12,8 +12,11 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/gpio/machine.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/gpio-davinci.h&gt;</div><div class='add'>+#include &lt;linux/regulator/machine.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -24,8 +27,6 @@</div><div class='ctx'> #include &lt;mach/mux.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define HAWKBOARD_PHY_ID		"davinci_mdio-0:07"</div><div class='del'>-#define DA850_HAWK_MMCSD_CD_PIN		GPIO_TO_PIN(3, 12)</div><div class='del'>-#define DA850_HAWK_MMCSD_WP_PIN		GPIO_TO_PIN(3, 13)</div><div class='ctx'> </div><div class='ctx'> #define DA850_USB1_VBUS_PIN		GPIO_TO_PIN(2, 4)</div><div class='ctx'> #define DA850_USB1_OC_PIN		GPIO_TO_PIN(6, 13)</div><div class='hunk'>@@ -122,19 +123,16 @@ static const short hawk_mmcsd0_pins[] = {</div><div class='ctx'> 	-1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int da850_hawk_mmc_get_ro(int index)</div><div class='del'>-{</div><div class='del'>-	return gpio_get_value(DA850_HAWK_MMCSD_WP_PIN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int da850_hawk_mmc_get_cd(int index)</div><div class='del'>-{</div><div class='del'>-	return !gpio_get_value(DA850_HAWK_MMCSD_CD_PIN);</div><div class='del'>-}</div><div class='add'>+static struct gpiod_lookup_table mmc_gpios_table = {</div><div class='add'>+	.dev_id = "da830-mmc.0",</div><div class='add'>+	.table = {</div><div class='add'>+		/* CD: gpio3_12: gpio60: chip 1 contains gpio range 32-63*/</div><div class='add'>+		GPIO_LOOKUP("davinci_gpio.1", 28, "cd", GPIO_ACTIVE_LOW),</div><div class='add'>+		GPIO_LOOKUP("davinci_gpio.1", 29, "wp", GPIO_ACTIVE_LOW),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct davinci_mmc_config da850_mmc_config = {</div><div class='del'>-	.get_ro		= da850_hawk_mmc_get_ro,</div><div class='del'>-	.get_cd		= da850_hawk_mmc_get_cd,</div><div class='ctx'> 	.wires		= 4,</div><div class='ctx'> 	.max_freq	= 50000000,</div><div class='ctx'> 	.caps		= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,</div><div class='hunk'>@@ -150,21 +148,7 @@ static __init void omapl138_hawk_mmc_init(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = gpio_request_one(DA850_HAWK_MMCSD_CD_PIN,</div><div class='del'>-			GPIOF_DIR_IN, "MMC CD");</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_warn("%s: can not open GPIO %d\n",</div><div class='del'>-			__func__, DA850_HAWK_MMCSD_CD_PIN);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = gpio_request_one(DA850_HAWK_MMCSD_WP_PIN,</div><div class='del'>-			GPIOF_DIR_IN, "MMC WP");</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_warn("%s: can not open GPIO %d\n",</div><div class='del'>-			__func__, DA850_HAWK_MMCSD_WP_PIN);</div><div class='del'>-		goto mmc_setup_wp_fail;</div><div class='del'>-	}</div><div class='add'>+	gpiod_add_lookup_table(&amp;mmc_gpios_table);</div><div class='ctx'> </div><div class='ctx'> 	ret = da8xx_register_mmcsd0(&amp;da850_mmc_config);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -175,9 +159,7 @@ static __init void omapl138_hawk_mmc_init(void)</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> mmc_setup_mmcsd_fail:</div><div class='del'>-	gpio_free(DA850_HAWK_MMCSD_WP_PIN);</div><div class='del'>-mmc_setup_wp_fail:</div><div class='del'>-	gpio_free(DA850_HAWK_MMCSD_CD_PIN);</div><div class='add'>+	gpiod_remove_lookup_table(&amp;mmc_gpios_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t omapl138_hawk_usb_ocic_irq(int irq, void *dev_id);</div><div class='hunk'>@@ -243,7 +225,6 @@ static irqreturn_t omapl138_hawk_usb_ocic_irq(int irq, void *dev_id)</div><div class='ctx'> static __init void omapl138_hawk_usb_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u32 cfgchip2;</div><div class='ctx'> </div><div class='ctx'> 	ret = davinci_cfg_reg_list(da850_hawk_usb11_pins);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -251,12 +232,20 @@ static __init void omapl138_hawk_usb_init(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Setup the Ref. clock frequency for the HAWK at 24 MHz. */</div><div class='add'>+	ret = da8xx_register_usb20_phy_clk(false);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: USB 2.0 PHY CLK registration failed: %d\n",</div><div class='add'>+			__func__, ret);</div><div class='ctx'> </div><div class='del'>-	cfgchip2 = __raw_readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='del'>-	cfgchip2 &amp;= ~CFGCHIP2_REFFREQ;</div><div class='del'>-	cfgchip2 |=  CFGCHIP2_REFFREQ_24MHZ;</div><div class='del'>-	__raw_writel(cfgchip2, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='add'>+	ret = da8xx_register_usb11_phy_clk(false);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: USB 1.1 PHY CLK registration failed: %d\n",</div><div class='add'>+			__func__, ret);</div><div class='add'>+</div><div class='add'>+	ret = da8xx_register_usb_phy();</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: USB PHY registration failed: %d\n",</div><div class='add'>+			__func__, ret);</div><div class='ctx'> </div><div class='ctx'> 	ret = gpio_request_one(DA850_USB1_VBUS_PIN,</div><div class='ctx'> 			GPIOF_DIR_OUT, "USB1 VBUS");</div><div class='hunk'>@@ -292,6 +281,10 @@ static __init void omapl138_hawk_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = da8xx_register_cfgchip();</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: CFGCHIP registration failed: %d\n", __func__, ret);</div><div class='add'>+</div><div class='ctx'> 	ret = da850_register_gpio();</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);</div><div class='hunk'>@@ -317,6 +310,8 @@ static __init void omapl138_hawk_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		pr_warn("%s: dsp/rproc registration failed: %d\n",</div><div class='ctx'> 			__func__, ret);</div><div class='add'>+</div><div class='add'>+	regulator_has_full_constraints();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIAL_8250_CONSOLE</div><div class='head'>diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c<br/>index df42c93a93d6..f5dce9b4e617 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/clock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/clock.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/clock.c</a></div><div class='hunk'>@@ -31,10 +31,10 @@ static LIST_HEAD(clocks);</div><div class='ctx'> static DEFINE_MUTEX(clocks_mutex);</div><div class='ctx'> static DEFINE_SPINLOCK(clockfw_lock);</div><div class='ctx'> </div><div class='del'>-static void __clk_enable(struct clk *clk)</div><div class='add'>+void davinci_clk_enable(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	if (clk-&gt;parent)</div><div class='del'>-		__clk_enable(clk-&gt;parent);</div><div class='add'>+		davinci_clk_enable(clk-&gt;parent);</div><div class='ctx'> 	if (clk-&gt;usecount++ == 0) {</div><div class='ctx'> 		if (clk-&gt;flags &amp; CLK_PSC)</div><div class='ctx'> 			davinci_psc_config(clk-&gt;domain, clk-&gt;gpsc, clk-&gt;lpsc,</div><div class='hunk'>@@ -44,7 +44,7 @@ static void __clk_enable(struct clk *clk)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __clk_disable(struct clk *clk)</div><div class='add'>+void davinci_clk_disable(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	if (WARN_ON(clk-&gt;usecount == 0))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -56,7 +56,7 @@ static void __clk_disable(struct clk *clk)</div><div class='ctx'> 			clk-&gt;clk_disable(clk);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (clk-&gt;parent)</div><div class='del'>-		__clk_disable(clk-&gt;parent);</div><div class='add'>+		davinci_clk_disable(clk-&gt;parent);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int davinci_clk_reset(struct clk *clk, bool reset)</div><div class='hunk'>@@ -103,7 +103,7 @@ int clk_enable(struct clk *clk)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;clockfw_lock, flags);</div><div class='del'>-	__clk_enable(clk);</div><div class='add'>+	davinci_clk_enable(clk);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;clockfw_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -118,7 +118,7 @@ void clk_disable(struct clk *clk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;clockfw_lock, flags);</div><div class='del'>-	__clk_disable(clk);</div><div class='add'>+	davinci_clk_disable(clk);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;clockfw_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(clk_disable);</div><div class='head'>diff --git a/arch/arm/mach-davinci/clock.h b/arch/arm/mach-davinci/clock.h<br/>index e2a5437a1aee..fa2b83752e03 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/clock.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/clock.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/clock.h</a></div><div class='hunk'>@@ -132,6 +132,8 @@ int davinci_set_sysclk_rate(struct clk *clk, unsigned long rate);</div><div class='ctx'> int davinci_set_refclk_rate(unsigned long rate);</div><div class='ctx'> int davinci_simple_set_rate(struct clk *clk, unsigned long rate);</div><div class='ctx'> int davinci_clk_reset(struct clk *clk, bool reset);</div><div class='add'>+void davinci_clk_enable(struct clk *clk);</div><div class='add'>+void davinci_clk_disable(struct clk *clk);</div><div class='ctx'> </div><div class='ctx'> extern struct platform_device davinci_wdt_device;</div><div class='ctx'> extern void davinci_watchdog_reset(struct platform_device *);</div><div class='head'>diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c<br/>index 049025f6d531..9f9fbfa6da0d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/common.c</a></div><div class='hunk'>@@ -118,6 +118,5 @@ err:</div><div class='ctx'> void __init davinci_init_late(void)</div><div class='ctx'> {</div><div class='ctx'> 	davinci_cpufreq_init();</div><div class='del'>-	davinci_pm_init();</div><div class='ctx'> 	davinci_clk_disable_unused();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c<br/>index 426fd7477357..073c458d0c67 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/da830.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/da830.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/da830.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/da830.c</a></div><div class='hunk'>@@ -412,7 +412,7 @@ static struct clk_lookup da830_clks[] = {</div><div class='ctx'> 	CLK("davinci-mcasp.0",	NULL,		&amp;mcasp0_clk),</div><div class='ctx'> 	CLK("davinci-mcasp.1",	NULL,		&amp;mcasp1_clk),</div><div class='ctx'> 	CLK("davinci-mcasp.2",	NULL,		&amp;mcasp2_clk),</div><div class='del'>-	CLK(NULL,		"usb20",	&amp;usb20_clk),</div><div class='add'>+	CLK("musb-da8xx",	"usb20",	&amp;usb20_clk),</div><div class='ctx'> 	CLK(NULL,		"aemif",	&amp;aemif_clk),</div><div class='ctx'> 	CLK(NULL,		"aintc",	&amp;aintc_clk),</div><div class='ctx'> 	CLK(NULL,		"secu_mgr",	&amp;secu_mgr_clk),</div><div class='hunk'>@@ -420,7 +420,7 @@ static struct clk_lookup da830_clks[] = {</div><div class='ctx'> 	CLK("davinci_mdio.0",   "fck",          &amp;emac_clk),</div><div class='ctx'> 	CLK(NULL,		"gpio",		&amp;gpio_clk),</div><div class='ctx'> 	CLK("i2c_davinci.2",	NULL,		&amp;i2c1_clk),</div><div class='del'>-	CLK(NULL,		"usb11",	&amp;usb11_clk),</div><div class='add'>+	CLK("ohci-da8xx",	"usb11",	&amp;usb11_clk),</div><div class='ctx'> 	CLK(NULL,		"emif3",	&amp;emif3_clk),</div><div class='ctx'> 	CLK(NULL,		"arm",		&amp;arm_clk),</div><div class='ctx'> 	CLK(NULL,		"rmii",		&amp;rmii_clk),</div><div class='head'>diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c<br/>index ed3d0e9f72ac..ccad2f99dfc9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/da850.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/da850.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/da850.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/da850.c</a></div><div class='hunk'>@@ -319,6 +319,16 @@ static struct clk emac_clk = {</div><div class='ctx'> 	.gpsc		= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * In order to avoid adding the emac_clk to the clock lookup table twice (and</div><div class='add'>+ * screwing up the linked list in the process) create a separate clock for</div><div class='add'>+ * mdio inheriting the rate from emac_clk.</div><div class='add'>+ */</div><div class='add'>+static struct clk mdio_clk = {</div><div class='add'>+	.name		= "mdio",</div><div class='add'>+	.parent		= &amp;emac_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk mcasp_clk = {</div><div class='ctx'> 	.name		= "mcasp",</div><div class='ctx'> 	.parent		= &amp;async3_clk,</div><div class='hunk'>@@ -367,6 +377,16 @@ static struct clk aemif_clk = {</div><div class='ctx'> 	.flags		= ALWAYS_ENABLED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * In order to avoid adding the aemif_clk to the clock lookup table twice (and</div><div class='add'>+ * screwing up the linked list in the process) create a separate clock for</div><div class='add'>+ * nand inheriting the rate from aemif_clk.</div><div class='add'>+ */</div><div class='add'>+static struct clk aemif_nand_clk = {</div><div class='add'>+	.name		= "nand",</div><div class='add'>+	.parent		= &amp;aemif_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk usb11_clk = {</div><div class='ctx'> 	.name		= "usb11",</div><div class='ctx'> 	.parent		= &amp;pll0_sysclk4,</div><div class='hunk'>@@ -424,6 +444,16 @@ static struct clk ehrpwm_clk = {</div><div class='ctx'> 	.gpsc		= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk ehrpwm0_clk = {</div><div class='add'>+	.name		= "ehrpwm0",</div><div class='add'>+	.parent		= &amp;ehrpwm_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk ehrpwm1_clk = {</div><div class='add'>+	.name		= "ehrpwm1",</div><div class='add'>+	.parent		= &amp;ehrpwm_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define DA8XX_EHRPWM_TBCLKSYNC	BIT(12)</div><div class='ctx'> </div><div class='ctx'> static void ehrpwm_tblck_enable(struct clk *clk)</div><div class='hunk'>@@ -451,6 +481,16 @@ static struct clk ehrpwm_tbclk = {</div><div class='ctx'> 	.clk_disable	= ehrpwm_tblck_disable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk ehrpwm0_tbclk = {</div><div class='add'>+	.name		= "ehrpwm0_tbclk",</div><div class='add'>+	.parent		= &amp;ehrpwm_tbclk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk ehrpwm1_tbclk = {</div><div class='add'>+	.name		= "ehrpwm1_tbclk",</div><div class='add'>+	.parent		= &amp;ehrpwm_tbclk,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk ecap_clk = {</div><div class='ctx'> 	.name		= "ecap",</div><div class='ctx'> 	.parent		= &amp;async3_clk,</div><div class='hunk'>@@ -458,6 +498,21 @@ static struct clk ecap_clk = {</div><div class='ctx'> 	.gpsc		= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk ecap0_clk = {</div><div class='add'>+	.name		= "ecap0_clk",</div><div class='add'>+	.parent		= &amp;ecap_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk ecap1_clk = {</div><div class='add'>+	.name		= "ecap1_clk",</div><div class='add'>+	.parent		= &amp;ecap_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk ecap2_clk = {</div><div class='add'>+	.name		= "ecap2_clk",</div><div class='add'>+	.parent		= &amp;ecap_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk_lookup da850_clks[] = {</div><div class='ctx'> 	CLK(NULL,		"ref",		&amp;ref_clk),</div><div class='ctx'> 	CLK(NULL,		"pll0",		&amp;pll0_clk),</div><div class='hunk'>@@ -494,7 +549,7 @@ static struct clk_lookup da850_clks[] = {</div><div class='ctx'> 	CLK(NULL,		"arm",		&amp;arm_clk),</div><div class='ctx'> 	CLK(NULL,		"rmii",		&amp;rmii_clk),</div><div class='ctx'> 	CLK("davinci_emac.1",	NULL,		&amp;emac_clk),</div><div class='del'>-	CLK("davinci_mdio.0",	"fck",		&amp;emac_clk),</div><div class='add'>+	CLK("davinci_mdio.0",	"fck",		&amp;mdio_clk),</div><div class='ctx'> 	CLK("davinci-mcasp.0",	NULL,		&amp;mcasp_clk),</div><div class='ctx'> 	CLK("davinci-mcbsp.0",	NULL,		&amp;mcbsp0_clk),</div><div class='ctx'> 	CLK("davinci-mcbsp.1",	NULL,		&amp;mcbsp1_clk),</div><div class='hunk'>@@ -502,17 +557,24 @@ static struct clk_lookup da850_clks[] = {</div><div class='ctx'> 	CLK("da830-mmc.0",	NULL,		&amp;mmcsd0_clk),</div><div class='ctx'> 	CLK("da830-mmc.1",	NULL,		&amp;mmcsd1_clk),</div><div class='ctx'> 	CLK("ti-aemif",		NULL,		&amp;aemif_clk),</div><div class='del'>-	CLK(NULL,		"aemif",	&amp;aemif_clk),</div><div class='del'>-	CLK(NULL,		"usb11",	&amp;usb11_clk),</div><div class='del'>-	CLK(NULL,		"usb20",	&amp;usb20_clk),</div><div class='add'>+	CLK("davinci-nand.0",	"aemif",	&amp;aemif_nand_clk),</div><div class='add'>+	CLK("ohci-da8xx",	"usb11",	&amp;usb11_clk),</div><div class='add'>+	CLK("musb-da8xx",	"usb20",	&amp;usb20_clk),</div><div class='ctx'> 	CLK("spi_davinci.0",	NULL,		&amp;spi0_clk),</div><div class='ctx'> 	CLK("spi_davinci.1",	NULL,		&amp;spi1_clk),</div><div class='ctx'> 	CLK("vpif",		NULL,		&amp;vpif_clk),</div><div class='del'>-	CLK("ahci_da850",		NULL,		&amp;sata_clk),</div><div class='add'>+	CLK("ahci_da850",	"fck",		&amp;sata_clk),</div><div class='ctx'> 	CLK("davinci-rproc.0",	NULL,		&amp;dsp_clk),</div><div class='del'>-	CLK("ehrpwm",		"fck",		&amp;ehrpwm_clk),</div><div class='del'>-	CLK("ehrpwm",		"tbclk",	&amp;ehrpwm_tbclk),</div><div class='del'>-	CLK("ecap",		"fck",		&amp;ecap_clk),</div><div class='add'>+	CLK(NULL,		NULL,		&amp;ehrpwm_clk),</div><div class='add'>+	CLK("ehrpwm.0",		"fck",		&amp;ehrpwm0_clk),</div><div class='add'>+	CLK("ehrpwm.1",		"fck",		&amp;ehrpwm1_clk),</div><div class='add'>+	CLK(NULL,		NULL,		&amp;ehrpwm_tbclk),</div><div class='add'>+	CLK("ehrpwm.0",		"tbclk",	&amp;ehrpwm0_tbclk),</div><div class='add'>+	CLK("ehrpwm.1",		"tbclk",	&amp;ehrpwm1_tbclk),</div><div class='add'>+	CLK(NULL,		NULL,		&amp;ecap_clk),</div><div class='add'>+	CLK("ecap.0",		"fck",		&amp;ecap0_clk),</div><div class='add'>+	CLK("ecap.1",		"fck",		&amp;ecap1_clk),</div><div class='add'>+	CLK("ecap.2",		"fck",		&amp;ecap2_clk),</div><div class='ctx'> 	CLK(NULL,		NULL,		NULL),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1132,14 +1194,28 @@ static int da850_set_armrate(struct clk *clk, unsigned long index)</div><div class='ctx'> 	return clk_set_rate(pllclk, index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int da850_set_pll0rate(struct clk *clk, unsigned long index)</div><div class='add'>+static int da850_set_pll0rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> {</div><div class='del'>-	unsigned int prediv, mult, postdiv;</div><div class='del'>-	struct da850_opp *opp;</div><div class='ctx'> 	struct pll_data *pll = clk-&gt;pll_data;</div><div class='add'>+	struct cpufreq_frequency_table *freq;</div><div class='add'>+	unsigned int prediv, mult, postdiv;</div><div class='add'>+	struct da850_opp *opp = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	opp = (struct da850_opp *) cpufreq_info.freq_table[index].driver_data;</div><div class='add'>+	rate /= 1000;</div><div class='add'>+</div><div class='add'>+	for (freq = da850_freq_table;</div><div class='add'>+	     freq-&gt;frequency != CPUFREQ_TABLE_END; freq++) {</div><div class='add'>+		/* rate is in Hz, freq-&gt;frequency is in KHz */</div><div class='add'>+		if (freq-&gt;frequency == rate) {</div><div class='add'>+			opp = (struct da850_opp *)freq-&gt;driver_data;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!opp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	prediv = opp-&gt;prediv;</div><div class='ctx'> 	mult = opp-&gt;mult;</div><div class='ctx'> 	postdiv = opp-&gt;postdiv;</div><div class='hunk'>@@ -1172,44 +1248,6 @@ static int da850_round_armrate(struct clk *clk, unsigned long rate)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __init da850_register_pm(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct davinci_pm_config *pdata = pdev-&gt;dev.platform_data;</div><div class='del'>-</div><div class='del'>-	ret = davinci_cfg_reg(DA850_RTC_ALARM);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	pdata-&gt;ddr2_ctlr_base = da8xx_get_mem_ctlr();</div><div class='del'>-	pdata-&gt;deepsleep_reg = DA8XX_SYSCFG1_VIRT(DA8XX_DEEPSLEEP_REG);</div><div class='del'>-	pdata-&gt;ddrpsc_num = DA8XX_LPSC1_EMIF3C;</div><div class='del'>-</div><div class='del'>-	pdata-&gt;cpupll_reg_base = ioremap(DA8XX_PLL0_BASE, SZ_4K);</div><div class='del'>-	if (!pdata-&gt;cpupll_reg_base)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	pdata-&gt;ddrpll_reg_base = ioremap(DA850_PLL1_BASE, SZ_4K);</div><div class='del'>-	if (!pdata-&gt;ddrpll_reg_base) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto no_ddrpll_mem;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pdata-&gt;ddrpsc_reg_base = ioremap(DA8XX_PSC1_BASE, SZ_4K);</div><div class='del'>-	if (!pdata-&gt;ddrpsc_reg_base) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto no_ddrpsc_mem;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return platform_device_register(pdev);</div><div class='del'>-</div><div class='del'>-no_ddrpsc_mem:</div><div class='del'>-	iounmap(pdata-&gt;ddrpll_reg_base);</div><div class='del'>-no_ddrpll_mem:</div><div class='del'>-	iounmap(pdata-&gt;cpupll_reg_base);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* VPIF resource, platform data */</div><div class='ctx'> static u64 da850_vpif_dma_mask = DMA_BIT_MASK(32);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c<br/>index c9f7e9274aa8..e3cef503cd8f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/da8xx-dt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/da8xx-dt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/da8xx-dt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/da8xx-dt.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/irqdomain.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/ti-aemif.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -18,16 +19,25 @@</div><div class='ctx'> #include "cp_intc.h"</div><div class='ctx'> #include &lt;mach/da8xx.h&gt;</div><div class='ctx'> </div><div class='add'>+static struct of_dev_auxdata da850_aemif_auxdata_lookup[] = {</div><div class='add'>+	OF_DEV_AUXDATA("ti,davinci-nand", 0x62000000, "davinci-nand.0", NULL),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct aemif_platform_data aemif_data = {</div><div class='add'>+	.dev_lookup = da850_aemif_auxdata_lookup,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,davinci-i2c", 0x01e28000, "i2c_davinci.2", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "davinci-wdt", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,da830-mmc", 0x01c40000, "da830-mmc.0", NULL),</div><div class='del'>-	OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f00000, "ehrpwm", NULL),</div><div class='del'>-	OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f02000, "ehrpwm", NULL),</div><div class='del'>-	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f06000, "ecap", NULL),</div><div class='del'>-	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f07000, "ecap", NULL),</div><div class='del'>-	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f08000, "ecap", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f00000, "ehrpwm.0", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f02000, "ehrpwm.1", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f06000, "ecap.0", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f07000, "ecap.1", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f08000, "ecap.2", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,da830-spi", 0x01c41000, "spi_davinci.0", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,da830-spi", 0x01f0e000, "spi_davinci.1", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("ns16550a", 0x01c42000, "serial8250.0", NULL),</div><div class='hunk'>@@ -37,7 +47,12 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,davinci-dm6467-emac", 0x01e20000, "davinci_emac.1",</div><div class='ctx'> 		       NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,da830-mcasp-audio", 0x01d00000, "davinci-mcasp.0", NULL),</div><div class='del'>-	OF_DEV_AUXDATA("ti,da850-aemif", 0x68000000, "ti-aemif", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("ti,da850-aemif", 0x68000000, "ti-aemif", &amp;aemif_data),</div><div class='add'>+	OF_DEV_AUXDATA("ti,da850-tilcdc", 0x01e13000, "da8xx_lcdc.0", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("ti,da830-ohci", 0x01e25000, "ohci-da8xx", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("ti,da830-musb", 0x01e00000, "musb-da8xx", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("ti,da830-usb-phy", 0x01c1417c, "da8xx-usb-phy", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("ti,da850-ahci", 0x01e18000, "ahci_da850", NULL),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -45,7 +60,28 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static void __init da850_init_machine(void)</div><div class='ctx'> {</div><div class='add'>+	/* All existing boards use 100MHz SATA refclkpn */</div><div class='add'>+	static const unsigned long sata_refclkpn = 100 * 1000 * 1000;</div><div class='add'>+</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = da8xx_register_usb20_phy_clk(false);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: registering USB 2.0 PHY clock failed: %d",</div><div class='add'>+			__func__, ret);</div><div class='add'>+	ret = da8xx_register_usb11_phy_clk(false);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: registering USB 1.1 PHY clock failed: %d",</div><div class='add'>+			__func__, ret);</div><div class='add'>+</div><div class='add'>+	ret = da850_register_sata_refclk(sata_refclkpn);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warn("%s: registering SATA REFCLK failed: %d",</div><div class='add'>+			__func__, ret);</div><div class='add'>+</div><div class='ctx'> 	of_platform_default_populate(NULL, da850_auxdata_lookup, NULL);</div><div class='add'>+	davinci_pm_init();</div><div class='add'>+	pdata_quirks_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *const da850_boards_compat[] __initconst = {</div><div class='head'>diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c<br/>index add3771d38f6..7cf529ffbe5a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/devices-da8xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/devices-da8xx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/devices-da8xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/devices-da8xx.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/syscon.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-contiguous.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='hunk'>@@ -23,6 +24,7 @@</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/time.h&gt;</div><div class='ctx'> #include &lt;mach/da8xx.h&gt;</div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> #include "cpuidle.h"</div><div class='ctx'> #include "sram.h"</div><div class='ctx'> </div><div class='hunk'>@@ -57,15 +59,6 @@</div><div class='ctx'> #define DA8XX_EMAC_RAM_OFFSET		0x0000</div><div class='ctx'> #define DA8XX_EMAC_CTRL_RAM_SIZE	SZ_8K</div><div class='ctx'> </div><div class='del'>-#define DA8XX_DMA_SPI0_RX	EDMA_CTLR_CHAN(0, 14)</div><div class='del'>-#define DA8XX_DMA_SPI0_TX	EDMA_CTLR_CHAN(0, 15)</div><div class='del'>-#define DA8XX_DMA_MMCSD0_RX	EDMA_CTLR_CHAN(0, 16)</div><div class='del'>-#define DA8XX_DMA_MMCSD0_TX	EDMA_CTLR_CHAN(0, 17)</div><div class='del'>-#define DA8XX_DMA_SPI1_RX	EDMA_CTLR_CHAN(0, 18)</div><div class='del'>-#define DA8XX_DMA_SPI1_TX	EDMA_CTLR_CHAN(0, 19)</div><div class='del'>-#define DA850_DMA_MMCSD1_RX	EDMA_CTLR_CHAN(1, 28)</div><div class='del'>-#define DA850_DMA_MMCSD1_TX	EDMA_CTLR_CHAN(1, 29)</div><div class='del'>-</div><div class='ctx'> void __iomem *da8xx_syscfg0_base;</div><div class='ctx'> void __iomem *da8xx_syscfg1_base;</div><div class='ctx'> </div><div class='hunk'>@@ -964,16 +957,6 @@ static struct resource da8xx_spi0_resources[] = {</div><div class='ctx'> 		.end	= IRQ_DA8XX_SPINT0,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start	= DA8XX_DMA_SPI0_RX,</div><div class='del'>-		.end	= DA8XX_DMA_SPI0_RX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start	= DA8XX_DMA_SPI0_TX,</div><div class='del'>-		.end	= DA8XX_DMA_SPI0_TX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource da8xx_spi1_resources[] = {</div><div class='hunk'>@@ -987,16 +970,6 @@ static struct resource da8xx_spi1_resources[] = {</div><div class='ctx'> 		.end	= IRQ_DA8XX_SPINT1,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start	= DA8XX_DMA_SPI1_RX,</div><div class='del'>-		.end	= DA8XX_DMA_SPI1_RX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start	= DA8XX_DMA_SPI1_TX,</div><div class='del'>-		.end	= DA8XX_DMA_SPI1_TX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct davinci_spi_platform_data da8xx_spi_pdata[] = {</div><div class='hunk'>@@ -1051,6 +1024,28 @@ int __init da8xx_register_spi_bus(int instance, unsigned num_chipselect)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_DAVINCI_DA850</div><div class='add'>+static struct clk sata_refclk = {</div><div class='add'>+	.name		= "sata_refclk",</div><div class='add'>+	.set_rate	= davinci_simple_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup sata_refclk_lookup =</div><div class='add'>+		CLK("ahci_da850", "refclk", &amp;sata_refclk);</div><div class='add'>+</div><div class='add'>+int __init da850_register_sata_refclk(int rate)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sata_refclk.rate = rate;</div><div class='add'>+	ret = clk_register(&amp;sata_refclk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	clkdev_add(&amp;sata_refclk_lookup);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct resource da850_sata_resources[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.start	= DA850_SATA_BASE,</div><div class='hunk'>@@ -1083,9 +1078,39 @@ static struct platform_device da850_sata_device = {</div><div class='ctx'> </div><div class='ctx'> int __init da850_register_sata(unsigned long refclkpn)</div><div class='ctx'> {</div><div class='del'>-	/* please see comment in drivers/ata/ahci_da850.c */</div><div class='del'>-	BUG_ON(refclkpn != 100 * 1000 * 1000);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = da850_register_sata_refclk(refclkpn);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return platform_device_register(&amp;da850_sata_device);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+static struct syscon_platform_data da8xx_cfgchip_platform_data = {</div><div class='add'>+	.label	= "cfgchip",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource da8xx_cfgchip_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= DA8XX_SYSCFG0_BASE + DA8XX_CFGCHIP0_REG,</div><div class='add'>+		.end	= DA8XX_SYSCFG0_BASE + DA8XX_CFGCHIP4_REG + 3,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device da8xx_cfgchip_device = {</div><div class='add'>+	.name	= "syscon",</div><div class='add'>+	.id	= -1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data	= &amp;da8xx_cfgchip_platform_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(da8xx_cfgchip_resources),</div><div class='add'>+	.resource	= da8xx_cfgchip_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init da8xx_register_cfgchip(void)</div><div class='add'>+{</div><div class='add'>+	return platform_device_register(&amp;da8xx_cfgchip_device);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c<br/>index 67d26c5bda0b..3ae70f2909b0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/devices.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/devices.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/devices.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/devices.c</a></div><div class='hunk'>@@ -36,9 +36,6 @@</div><div class='ctx'> #define DM365_MMCSD0_BASE	     0x01D11000</div><div class='ctx'> #define DM365_MMCSD1_BASE	     0x01D00000</div><div class='ctx'> </div><div class='del'>-#define DAVINCI_DMA_MMCRXEVT	26</div><div class='del'>-#define DAVINCI_DMA_MMCTXEVT	27</div><div class='del'>-</div><div class='ctx'> void __iomem  *davinci_sysmod_base;</div><div class='ctx'> </div><div class='ctx'> void davinci_map_sysmod(void)</div><div class='head'>diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c<br/>index d33322ddedab..bd50367f654e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/dm355.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/dm355.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/dm355.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/dm355.c</a></div><div class='hunk'>@@ -397,14 +397,6 @@ static struct resource dm355_spi0_resources[] = {</div><div class='ctx'> 		.start = IRQ_DM355_SPINT0_0,</div><div class='ctx'> 		.flags = IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='del'>-	{</div><div class='del'>-		.start = 17,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = 16,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct davinci_spi_platform_data dm355_spi0_pdata = {</div><div class='head'>diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c<br/>index ef3add999263..8be04ec95adf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/dm365.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/dm365.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/dm365.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/dm365.c</a></div><div class='hunk'>@@ -660,14 +660,6 @@ static struct resource dm365_spi0_resources[] = {</div><div class='ctx'> 		.start = IRQ_DM365_SPIINT0_0,</div><div class='ctx'> 		.flags = IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='del'>-	{</div><div class='del'>-		.start = 17,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start = 16,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device dm365_spi0_device = {</div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h<br/>index 0b3c169758ed..037aa66bcac1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/include/mach/common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/include/mach/common.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/include/mach/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/include/mach/common.h</a></div><div class='hunk'>@@ -102,6 +102,8 @@ int davinci_pm_init(void);</div><div class='ctx'> static inline int davinci_pm_init(void) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+void __init pdata_quirks_init(void);</div><div class='add'>+</div><div class='ctx'> #define SRAM_SIZE	SZ_128K</div><div class='ctx'> </div><div class='ctx'> #endif /* __ARCH_ARM_MACH_DAVINCI_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h<br/>index f9f9713aacdd..7e464228948b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/include/mach/da8xx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/include/mach/da8xx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/include/mach/da8xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/include/mach/da8xx.h</a></div><div class='hunk'>@@ -61,6 +61,7 @@ extern unsigned int da850_max_speed;</div><div class='ctx'> #define DA8XX_CFGCHIP1_REG	0x180</div><div class='ctx'> #define DA8XX_CFGCHIP2_REG	0x184</div><div class='ctx'> #define DA8XX_CFGCHIP3_REG	0x188</div><div class='add'>+#define DA8XX_CFGCHIP4_REG	0x18c</div><div class='ctx'> </div><div class='ctx'> #define DA8XX_SYSCFG1_BASE	(IO_PHYS + 0x22C000)</div><div class='ctx'> #define DA8XX_SYSCFG1_VIRT(x)	(da8xx_syscfg1_base + (x))</div><div class='hunk'>@@ -88,8 +89,13 @@ int da850_register_edma(struct edma_rsv_info *rsv[2]);</div><div class='ctx'> int da8xx_register_i2c(int instance, struct davinci_i2c_platform_data *pdata);</div><div class='ctx'> int da8xx_register_spi_bus(int instance, unsigned num_chipselect);</div><div class='ctx'> int da8xx_register_watchdog(void);</div><div class='add'>+int da8xx_register_usb_phy(void);</div><div class='ctx'> int da8xx_register_usb20(unsigned mA, unsigned potpgt);</div><div class='ctx'> int da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata);</div><div class='add'>+int da8xx_register_usb_refclkin(int rate);</div><div class='add'>+int da8xx_register_usb20_phy_clk(bool use_usb_refclkin);</div><div class='add'>+int da8xx_register_usb11_phy_clk(bool use_usb_refclkin);</div><div class='add'>+int da850_register_sata_refclk(int rate);</div><div class='ctx'> int da8xx_register_emac(void);</div><div class='ctx'> int da8xx_register_uio_pruss(void);</div><div class='ctx'> int da8xx_register_lcdc(struct da8xx_lcdc_platform_data *pdata);</div><div class='hunk'>@@ -101,7 +107,6 @@ int da8xx_register_gpio(void *pdata);</div><div class='ctx'> int da850_register_cpufreq(char *async_clk);</div><div class='ctx'> int da8xx_register_cpuidle(void);</div><div class='ctx'> void __iomem *da8xx_get_mem_ctlr(void);</div><div class='del'>-int da850_register_pm(struct platform_device *pdev);</div><div class='ctx'> int da850_register_sata(unsigned long refclkpn);</div><div class='ctx'> int da850_register_vpif(void);</div><div class='ctx'> int da850_register_vpif_display</div><div class='hunk'>@@ -113,6 +118,7 @@ void da8xx_rproc_reserve_cma(void);</div><div class='ctx'> int da8xx_register_rproc(void);</div><div class='ctx'> int da850_register_gpio(void);</div><div class='ctx'> int da830_register_gpio(void);</div><div class='add'>+int da8xx_register_cfgchip(void);</div><div class='ctx'> </div><div class='ctx'> extern struct platform_device da8xx_serial_device[];</div><div class='ctx'> extern struct emac_platform_data da8xx_emac_pdata;</div><div class='head'>diff --git a/arch/arm/mach-davinci/pdata-quirks.c b/arch/arm/mach-davinci/pdata-quirks.c<br/>new file mode 100644<br/>index 000000000000..5b57da475065<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/pdata-quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/pdata-quirks.c</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+/*</div><div class='add'>+ * Legacy platform_data quirks</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 BayLibre, Inc</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+</div><div class='add'>+struct pdata_init {</div><div class='add'>+	const char *compatible;</div><div class='add'>+	void (*fn)(void);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void pdata_quirks_check(struct pdata_init *quirks)</div><div class='add'>+{</div><div class='add'>+	while (quirks-&gt;compatible) {</div><div class='add'>+		if (of_machine_is_compatible(quirks-&gt;compatible)) {</div><div class='add'>+			if (quirks-&gt;fn)</div><div class='add'>+				quirks-&gt;fn();</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		quirks++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pdata_init pdata_quirks[] __initdata = {</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init pdata_quirks_init(void)</div><div class='add'>+{</div><div class='add'>+	pdata_quirks_check(pdata_quirks);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c<br/>index 8929569b1f8a..0afd201ab980 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/pm.c</a></div><div class='hunk'>@@ -21,15 +21,22 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/da8xx.h&gt;</div><div class='del'>-#include "sram.h"</div><div class='add'>+#include &lt;mach/mux.h&gt;</div><div class='ctx'> #include &lt;mach/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "clock.h"</div><div class='add'>+#include "psc.h"</div><div class='add'>+#include "sram.h"</div><div class='ctx'> </div><div class='add'>+#define DA850_PLL1_BASE		0x01e1a000</div><div class='ctx'> #define DEEPSLEEP_SLEEPCOUNT_MASK	0xFFFF</div><div class='add'>+#define DEEPSLEEP_SLEEPCOUNT		128</div><div class='ctx'> </div><div class='ctx'> static void (*davinci_sram_suspend) (struct davinci_pm_config *);</div><div class='del'>-static struct davinci_pm_config *pdata;</div><div class='add'>+static struct davinci_pm_config pm_config = {</div><div class='add'>+	.sleepcount = DEEPSLEEP_SLEEPCOUNT,</div><div class='add'>+	.ddrpsc_num = DA8XX_LPSC1_EMIF3C,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void davinci_sram_push(void *dest, void *src, unsigned int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -41,58 +48,58 @@ static void davinci_pm_suspend(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned val;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;cpupll_reg_base != pdata-&gt;ddrpll_reg_base) {</div><div class='add'>+	if (pm_config.cpupll_reg_base != pm_config.ddrpll_reg_base) {</div><div class='ctx'> </div><div class='ctx'> 		/* Switch CPU PLL to bypass mode */</div><div class='del'>-		val = __raw_readl(pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> 		val &amp;= ~(PLLCTL_PLLENSRC | PLLCTL_PLLEN);</div><div class='del'>-		__raw_writel(val, pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		__raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> </div><div class='ctx'> 		udelay(PLL_BYPASS_TIME);</div><div class='ctx'> </div><div class='ctx'> 		/* Powerdown CPU PLL */</div><div class='del'>-		val = __raw_readl(pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> 		val |= PLLCTL_PLLPWRDN;</div><div class='del'>-		__raw_writel(val, pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		__raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Configure sleep count in deep sleep register */</div><div class='del'>-	val = __raw_readl(pdata-&gt;deepsleep_reg);</div><div class='add'>+	val = __raw_readl(pm_config.deepsleep_reg);</div><div class='ctx'> 	val &amp;= ~DEEPSLEEP_SLEEPCOUNT_MASK,</div><div class='del'>-	val |= pdata-&gt;sleepcount;</div><div class='del'>-	__raw_writel(val, pdata-&gt;deepsleep_reg);</div><div class='add'>+	val |= pm_config.sleepcount;</div><div class='add'>+	__raw_writel(val, pm_config.deepsleep_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* System goes to sleep in this call */</div><div class='del'>-	davinci_sram_suspend(pdata);</div><div class='add'>+	davinci_sram_suspend(&amp;pm_config);</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;cpupll_reg_base != pdata-&gt;ddrpll_reg_base) {</div><div class='add'>+	if (pm_config.cpupll_reg_base != pm_config.ddrpll_reg_base) {</div><div class='ctx'> </div><div class='ctx'> 		/* put CPU PLL in reset */</div><div class='del'>-		val = __raw_readl(pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> 		val &amp;= ~PLLCTL_PLLRST;</div><div class='del'>-		__raw_writel(val, pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		__raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> </div><div class='ctx'> 		/* put CPU PLL in power down */</div><div class='del'>-		val = __raw_readl(pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> 		val &amp;= ~PLLCTL_PLLPWRDN;</div><div class='del'>-		__raw_writel(val, pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		__raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> </div><div class='ctx'> 		/* wait for CPU PLL reset */</div><div class='ctx'> 		udelay(PLL_RESET_TIME);</div><div class='ctx'> </div><div class='ctx'> 		/* bring CPU PLL out of reset */</div><div class='del'>-		val = __raw_readl(pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> 		val |= PLLCTL_PLLRST;</div><div class='del'>-		__raw_writel(val, pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		__raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> </div><div class='ctx'> 		/* Wait for CPU PLL to lock */</div><div class='ctx'> 		udelay(PLL_LOCK_TIME);</div><div class='ctx'> </div><div class='ctx'> 		/* Remove CPU PLL from bypass mode */</div><div class='del'>-		val = __raw_readl(pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> 		val &amp;= ~PLLCTL_PLLENSRC;</div><div class='ctx'> 		val |= PLLCTL_PLLEN;</div><div class='del'>-		__raw_writel(val, pdata-&gt;cpupll_reg_base + PLLCTL);</div><div class='add'>+		__raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -117,17 +124,36 @@ static const struct platform_suspend_ops davinci_pm_ops = {</div><div class='ctx'> 	.valid		= suspend_valid_only_mem,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init davinci_pm_probe(struct platform_device *pdev)</div><div class='add'>+int __init davinci_pm_init(void)</div><div class='ctx'> {</div><div class='del'>-	pdata = pdev-&gt;dev.platform_data;</div><div class='del'>-	if (!pdata) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "cannot get platform data\n");</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = davinci_cfg_reg(DA850_RTC_ALARM);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pm_config.ddr2_ctlr_base = da8xx_get_mem_ctlr();</div><div class='add'>+	pm_config.deepsleep_reg = DA8XX_SYSCFG1_VIRT(DA8XX_DEEPSLEEP_REG);</div><div class='add'>+</div><div class='add'>+	pm_config.cpupll_reg_base = ioremap(DA8XX_PLL0_BASE, SZ_4K);</div><div class='add'>+	if (!pm_config.cpupll_reg_base)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pm_config.ddrpll_reg_base = ioremap(DA850_PLL1_BASE, SZ_4K);</div><div class='add'>+	if (!pm_config.ddrpll_reg_base) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto no_ddrpll_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_config.ddrpsc_reg_base = ioremap(DA8XX_PSC1_BASE, SZ_4K);</div><div class='add'>+	if (!pm_config.ddrpsc_reg_base) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto no_ddrpsc_mem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	davinci_sram_suspend = sram_alloc(davinci_cpu_suspend_sz, NULL);</div><div class='ctx'> 	if (!davinci_sram_suspend) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "cannot allocate SRAM memory\n");</div><div class='add'>+		pr_err("PM: cannot allocate SRAM memory\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -136,23 +162,9 @@ static int __init davinci_pm_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	suspend_set_ops(&amp;davinci_pm_ops);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __exit davinci_pm_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	sram_free(davinci_sram_suspend, davinci_cpu_suspend_sz);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver davinci_pm_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name	 = "pm-davinci",</div><div class='del'>-	},</div><div class='del'>-	.remove = __exit_p(davinci_pm_remove),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int __init davinci_pm_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_probe(&amp;davinci_pm_driver, davinci_pm_probe);</div><div class='add'>+no_ddrpsc_mem:</div><div class='add'>+	iounmap(pm_config.ddrpll_reg_base);</div><div class='add'>+no_ddrpll_mem:</div><div class='add'>+	iounmap(pm_config.cpupll_reg_base);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c<br/>index 6c18445a4639..034f865fe78e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/time.c</a></div><div class='hunk'>@@ -268,7 +268,7 @@ static void __init timer_init(void)</div><div class='ctx'> /*</div><div class='ctx'>  * clocksource</div><div class='ctx'>  */</div><div class='del'>-static cycle_t read_cycles(struct clocksource *cs)</div><div class='add'>+static u64 read_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct timer_s *t = &amp;timers[TID_CLOCKSOURCE];</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c<br/>index f141f5171906..9a6af0bd5dc3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-davinci/usb-da8xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-davinci/usb-da8xx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-davinci/usb-da8xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-davinci/usb-da8xx.c</a></div><div class='hunk'>@@ -1,21 +1,46 @@</div><div class='ctx'> /*</div><div class='ctx'>  * DA8xx USB</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mfd/da8xx-cfgchip.h&gt;</div><div class='add'>+#include &lt;linux/phy/phy.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/usb-davinci.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/usb/musb.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/clock.h&gt;</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/cputype.h&gt;</div><div class='ctx'> #include &lt;mach/da8xx.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "clock.h"</div><div class='add'>+</div><div class='ctx'> #define DA8XX_USB0_BASE		0x01e00000</div><div class='ctx'> #define DA8XX_USB1_BASE		0x01e25000</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)</div><div class='add'>+static struct clk *usb20_clk;</div><div class='add'>+</div><div class='add'>+static struct platform_device da8xx_usb_phy = {</div><div class='add'>+	.name		= "da8xx-usb-phy",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		/*</div><div class='add'>+		 * Setting init_name so that clock lookup will work in</div><div class='add'>+		 * da8xx_register_usb11_phy_clk() even if this device is not</div><div class='add'>+		 * registered yet.</div><div class='add'>+		 */</div><div class='add'>+		.init_name	= "da8xx-usb-phy",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init da8xx_register_usb_phy(void)</div><div class='add'>+{</div><div class='add'>+	return platform_device_register(&amp;da8xx_usb_phy);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static struct musb_hdrc_config musb_config = {</div><div class='ctx'> 	.multipoint	= true,</div><div class='hunk'>@@ -45,10 +70,15 @@ static struct resource da8xx_usb20_resources[] = {</div><div class='ctx'> </div><div class='ctx'> static u64 usb_dmamask = DMA_BIT_MASK(32);</div><div class='ctx'> </div><div class='del'>-static struct platform_device usb_dev = {</div><div class='add'>+static struct platform_device da8xx_usb20_dev = {</div><div class='ctx'> 	.name		= "musb-da8xx",</div><div class='ctx'> 	.id             = -1,</div><div class='ctx'> 	.dev = {</div><div class='add'>+		/*</div><div class='add'>+		 * Setting init_name so that clock lookup will work in</div><div class='add'>+		 * usb20_phy_clk_enable() even if this device is not registered.</div><div class='add'>+		 */</div><div class='add'>+		.init_name		= "musb-da8xx",</div><div class='ctx'> 		.platform_data		= &amp;usb_data,</div><div class='ctx'> 		.dma_mask		= &amp;usb_dmamask,</div><div class='ctx'> 		.coherent_dma_mask      = DMA_BIT_MASK(32),</div><div class='hunk'>@@ -62,18 +92,9 @@ int __init da8xx_register_usb20(unsigned int mA, unsigned int potpgt)</div><div class='ctx'> 	usb_data.power	= mA &gt; 510 ? 255 : mA / 2;</div><div class='ctx'> 	usb_data.potpgt = (potpgt + 1) / 2;</div><div class='ctx'> </div><div class='del'>-	return platform_device_register(&amp;usb_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-int __init da8xx_register_usb20(unsigned int mA, unsigned int potpgt)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='add'>+	return platform_device_register(&amp;da8xx_usb20_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif  /* CONFIG_USB_MUSB_HDRC */</div><div class='del'>-</div><div class='ctx'> static struct resource da8xx_usb11_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= DA8XX_USB1_BASE,</div><div class='hunk'>@@ -90,8 +111,8 @@ static struct resource da8xx_usb11_resources[] = {</div><div class='ctx'> static u64 da8xx_usb11_dma_mask = DMA_BIT_MASK(32);</div><div class='ctx'> </div><div class='ctx'> static struct platform_device da8xx_usb11_device = {</div><div class='del'>-	.name		= "ohci",</div><div class='del'>-	.id		= 0,</div><div class='add'>+	.name		= "ohci-da8xx",</div><div class='add'>+	.id		= -1,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask		= &amp;da8xx_usb11_dma_mask,</div><div class='ctx'> 		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='hunk'>@@ -105,3 +126,230 @@ int __init da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata)</div><div class='ctx'> 	da8xx_usb11_device.dev.platform_data = pdata;</div><div class='ctx'> 	return platform_device_register(&amp;da8xx_usb11_device);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static struct clk usb_refclkin = {</div><div class='add'>+	.name		= "usb_refclkin",</div><div class='add'>+	.set_rate	= davinci_simple_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup usb_refclkin_lookup =</div><div class='add'>+	CLK(NULL, "usb_refclkin", &amp;usb_refclkin);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * da8xx_register_usb_refclkin - register USB_REFCLKIN clock</div><div class='add'>+ *</div><div class='add'>+ * @rate: The clock rate in Hz</div><div class='add'>+ *</div><div class='add'>+ * This clock is only needed if the board provides an external USB_REFCLKIN</div><div class='add'>+ * signal, in which case it will be used as the parent of usb20_phy_clk and/or</div><div class='add'>+ * usb11_phy_clk.</div><div class='add'>+ */</div><div class='add'>+int __init da8xx_register_usb_refclkin(int rate)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	usb_refclkin.rate = rate;</div><div class='add'>+	ret = clk_register(&amp;usb_refclkin);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	clkdev_add(&amp;usb_refclkin_lookup);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb20_phy_clk_enable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 timeout = 500000; /* 500 msec */</div><div class='add'>+</div><div class='add'>+	val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='add'>+</div><div class='add'>+	/* The USB 2.O PLL requires that the USB 2.O PSC is enabled as well. */</div><div class='add'>+	davinci_clk_enable(usb20_clk);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Turn on the USB 2.0 PHY, but just the PLL, and not OTG. The USB 1.1</div><div class='add'>+	 * host may use the PLL clock without USB 2.0 OTG being used.</div><div class='add'>+	 */</div><div class='add'>+	val &amp;= ~(CFGCHIP2_RESET | CFGCHIP2_PHYPWRDN);</div><div class='add'>+	val |= CFGCHIP2_PHY_PLLON;</div><div class='add'>+</div><div class='add'>+	writel(val, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='add'>+</div><div class='add'>+	while (--timeout) {</div><div class='add'>+		val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='add'>+		if (val &amp; CFGCHIP2_PHYCLKGD)</div><div class='add'>+			goto done;</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_err("Timeout waiting for USB 2.0 PHY clock good\n");</div><div class='add'>+done:</div><div class='add'>+	davinci_clk_disable(usb20_clk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb20_phy_clk_disable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='add'>+	val |= CFGCHIP2_PHYPWRDN;</div><div class='add'>+	writel(val, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usb20_phy_clk_set_parent(struct clk *clk, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='add'>+</div><div class='add'>+	/* Set the mux depending on the parent clock. */</div><div class='add'>+	if (parent == &amp;usb_refclkin) {</div><div class='add'>+		val &amp;= ~CFGCHIP2_USB2PHYCLKMUX;</div><div class='add'>+	} else if (strcmp(parent-&gt;name, "pll0_aux_clk") == 0) {</div><div class='add'>+		val |= CFGCHIP2_USB2PHYCLKMUX;</div><div class='add'>+	} else {</div><div class='add'>+		pr_err("Bad parent on USB 2.0 PHY clock\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reference frequency also comes from parent clock */</div><div class='add'>+	val &amp;= ~CFGCHIP2_REFFREQ_MASK;</div><div class='add'>+	switch (clk_get_rate(parent)) {</div><div class='add'>+	case 12000000:</div><div class='add'>+		val |= CFGCHIP2_REFFREQ_12MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case 13000000:</div><div class='add'>+		val |= CFGCHIP2_REFFREQ_13MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case 19200000:</div><div class='add'>+		val |= CFGCHIP2_REFFREQ_19_2MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case 20000000:</div><div class='add'>+		val |= CFGCHIP2_REFFREQ_20MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case 24000000:</div><div class='add'>+		val |= CFGCHIP2_REFFREQ_24MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case 26000000:</div><div class='add'>+		val |= CFGCHIP2_REFFREQ_26MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case 38400000:</div><div class='add'>+		val |= CFGCHIP2_REFFREQ_38_4MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case 40000000:</div><div class='add'>+		val |= CFGCHIP2_REFFREQ_40MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case 48000000:</div><div class='add'>+		val |= CFGCHIP2_REFFREQ_48MHZ;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("Bad parent clock rate on USB 2.0 PHY clock\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(val, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk usb20_phy_clk = {</div><div class='add'>+	.name		= "usb20_phy",</div><div class='add'>+	.clk_enable	= usb20_phy_clk_enable,</div><div class='add'>+	.clk_disable	= usb20_phy_clk_disable,</div><div class='add'>+	.set_parent	= usb20_phy_clk_set_parent,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup usb20_phy_clk_lookup =</div><div class='add'>+	CLK("da8xx-usb-phy", "usb20_phy", &amp;usb20_phy_clk);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * da8xx_register_usb20_phy_clk - register USB0PHYCLKMUX clock</div><div class='add'>+ *</div><div class='add'>+ * @use_usb_refclkin: Selects the parent clock - either "usb_refclkin" if true</div><div class='add'>+ *	or "pll0_aux" if false.</div><div class='add'>+ */</div><div class='add'>+int __init da8xx_register_usb20_phy_clk(bool use_usb_refclkin)</div><div class='add'>+{</div><div class='add'>+	struct clk *parent;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	usb20_clk = clk_get(&amp;da8xx_usb20_dev.dev, "usb20");</div><div class='add'>+	ret = PTR_ERR_OR_ZERO(usb20_clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	parent = clk_get(NULL, use_usb_refclkin ? "usb_refclkin" : "pll0_aux");</div><div class='add'>+	ret = PTR_ERR_OR_ZERO(parent);</div><div class='add'>+	if (ret) {</div><div class='add'>+		clk_put(usb20_clk);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb20_phy_clk.parent = parent;</div><div class='add'>+	ret = clk_register(&amp;usb20_phy_clk);</div><div class='add'>+	if (!ret)</div><div class='add'>+		clkdev_add(&amp;usb20_phy_clk_lookup);</div><div class='add'>+</div><div class='add'>+	clk_put(parent);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usb11_phy_clk_set_parent(struct clk *clk, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='add'>+</div><div class='add'>+	/* Set the USB 1.1 PHY clock mux based on the parent clock. */</div><div class='add'>+	if (parent == &amp;usb20_phy_clk) {</div><div class='add'>+		val &amp;= ~CFGCHIP2_USB1PHYCLKMUX;</div><div class='add'>+	} else if (parent == &amp;usb_refclkin) {</div><div class='add'>+		val |= CFGCHIP2_USB1PHYCLKMUX;</div><div class='add'>+	} else {</div><div class='add'>+		pr_err("Bad parent on USB 1.1 PHY clock\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(val, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk usb11_phy_clk = {</div><div class='add'>+	.name		= "usb11_phy",</div><div class='add'>+	.set_parent	= usb11_phy_clk_set_parent,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup usb11_phy_clk_lookup =</div><div class='add'>+	CLK("da8xx-usb-phy", "usb11_phy", &amp;usb11_phy_clk);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * da8xx_register_usb11_phy_clk - register USB1PHYCLKMUX clock</div><div class='add'>+ *</div><div class='add'>+ * @use_usb_refclkin: Selects the parent clock - either "usb_refclkin" if true</div><div class='add'>+ *	or "usb20_phy" if false.</div><div class='add'>+ */</div><div class='add'>+int __init da8xx_register_usb11_phy_clk(bool use_usb_refclkin)</div><div class='add'>+{</div><div class='add'>+	struct clk *parent;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (use_usb_refclkin)</div><div class='add'>+		parent = clk_get(NULL, "usb_refclkin");</div><div class='add'>+	else</div><div class='add'>+		parent = clk_get(&amp;da8xx_usb_phy.dev, "usb20_phy");</div><div class='add'>+	if (IS_ERR(parent))</div><div class='add'>+		return PTR_ERR(parent);</div><div class='add'>+</div><div class='add'>+	usb11_phy_clk.parent = parent;</div><div class='add'>+	ret = clk_register(&amp;usb11_phy_clk);</div><div class='add'>+	if (!ret)</div><div class='add'>+		clkdev_add(&amp;usb11_phy_clk_lookup);</div><div class='add'>+</div><div class='add'>+	clk_put(parent);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c<br/>index ad92d9f7e4df..0ac176386789 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/edb93xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ep93xx/edb93xx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/edb93xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/edb93xx.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-gpio.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='hunk'>@@ -106,33 +105,10 @@ static struct cs4271_platform_data edb93xx_cs4271_data = {</div><div class='ctx'> 	.gpio_nreset	= -EINVAL,	/* filled in later */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int edb93xx_cs4271_hw_setup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	return gpio_request_one(EP93XX_GPIO_LINE_EGPIO6,</div><div class='del'>-				GPIOF_OUT_INIT_HIGH, spi-&gt;modalias);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void edb93xx_cs4271_hw_cleanup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	gpio_free(EP93XX_GPIO_LINE_EGPIO6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void edb93xx_cs4271_hw_cs_control(struct spi_device *spi, int value)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(EP93XX_GPIO_LINE_EGPIO6, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ep93xx_spi_chip_ops edb93xx_cs4271_hw = {</div><div class='del'>-	.setup		= edb93xx_cs4271_hw_setup,</div><div class='del'>-	.cleanup	= edb93xx_cs4271_hw_cleanup,</div><div class='del'>-	.cs_control	= edb93xx_cs4271_hw_cs_control,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct spi_board_info edb93xx_spi_board_info[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.modalias		= "cs4271",</div><div class='ctx'> 		.platform_data		= &amp;edb93xx_cs4271_data,</div><div class='del'>-		.controller_data	= &amp;edb93xx_cs4271_hw,</div><div class='ctx'> 		.max_speed_hz		= 6000000,</div><div class='ctx'> 		.bus_num		= 0,</div><div class='ctx'> 		.chip_select		= 0,</div><div class='hunk'>@@ -140,8 +116,13 @@ static struct spi_board_info edb93xx_spi_board_info[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int edb93xx_spi_chipselects[] __initdata = {</div><div class='add'>+	EP93XX_GPIO_LINE_EGPIO6,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct ep93xx_spi_info edb93xx_spi_info __initdata = {</div><div class='del'>-	.num_chipselect	= ARRAY_SIZE(edb93xx_spi_board_info),</div><div class='add'>+	.chipselect	= edb93xx_spi_chipselects,</div><div class='add'>+	.num_chipselect	= ARRAY_SIZE(edb93xx_spi_chipselects),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init edb93xx_register_spi(void)</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h<br/>index 03c42e5400d2..b0cf2de77f81 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/include/mach/uncompress.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ep93xx/include/mach/uncompress.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/include/mach/uncompress.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/include/mach/uncompress.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/ep93xx-regs.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned char __raw_readb(unsigned int ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -75,8 +76,19 @@ static void ethernet_reset(void)</div><div class='ctx'> 		;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define TS72XX_WDT_CONTROL_PHYS_BASE	0x23800000</div><div class='add'>+#define TS72XX_WDT_FEED_PHYS_BASE	0x23c00000</div><div class='add'>+#define TS72XX_WDT_FEED_VAL		0x05</div><div class='add'>+</div><div class='add'>+static void __maybe_unused ts72xx_watchdog_disable(void)</div><div class='add'>+{</div><div class='add'>+	__raw_writeb(TS72XX_WDT_FEED_VAL, TS72XX_WDT_FEED_PHYS_BASE);</div><div class='add'>+	__raw_writeb(0, TS72XX_WDT_CONTROL_PHYS_BASE);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void arch_decomp_setup(void)</div><div class='ctx'> {</div><div class='add'>+	if (machine_is_ts72xx())</div><div class='add'>+		ts72xx_watchdog_disable();</div><div class='ctx'> 	ethernet_reset();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c<br/>index 7bb540c421ee..c7a40f245892 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/simone.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ep93xx/simone.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/simone.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/simone.c</a></div><div class='hunk'>@@ -49,56 +49,6 @@ static struct ep93xxfb_mach_info __initdata simone_fb_info = {</div><div class='ctx'> #define MMC_CARD_DETECT_GPIO EP93XX_GPIO_LINE_EGPIO0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Up to v1.3, the Sim.One used SFRMOUT as SD card chip select, but this goes</div><div class='del'>- * low between multi-message command blocks. From v1.4, it uses a GPIO instead.</div><div class='del'>- * v1.3 parts will still work, since the signal on SFRMOUT is automatic.</div><div class='del'>- */</div><div class='del'>-#define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * MMC SPI chip select GPIO handling. If you are using SFRMOUT (SFRM1) signal,</div><div class='del'>- * you can leave these empty and pass NULL as .controller_data.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int simone_mmc_spi_setup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	unsigned int gpio = MMC_CHIP_SELECT_GPIO;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = gpio_request(gpio, spi-&gt;modalias);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = gpio_direction_output(gpio, 1);</div><div class='del'>-	if (err) {</div><div class='del'>-		gpio_free(gpio);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void simone_mmc_spi_cleanup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	unsigned int gpio = MMC_CHIP_SELECT_GPIO;</div><div class='del'>-</div><div class='del'>-	gpio_set_value(gpio, 1);</div><div class='del'>-	gpio_direction_input(gpio);</div><div class='del'>-	gpio_free(gpio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void simone_mmc_spi_cs_control(struct spi_device *spi, int value)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(MMC_CHIP_SELECT_GPIO, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ep93xx_spi_chip_ops simone_mmc_spi_ops = {</div><div class='del'>-	.setup		= simone_mmc_spi_setup,</div><div class='del'>-	.cleanup	= simone_mmc_spi_cleanup,</div><div class='del'>-	.cs_control	= simone_mmc_spi_cs_control,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * MMC card detection GPIO setup.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -152,7 +102,6 @@ static struct mmc_spi_platform_data simone_mmc_spi_data = {</div><div class='ctx'> static struct spi_board_info simone_spi_devices[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.modalias		= "mmc_spi",</div><div class='del'>-		.controller_data	= &amp;simone_mmc_spi_ops,</div><div class='ctx'> 		.platform_data		= &amp;simone_mmc_spi_data,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We use 10 MHz even though the maximum is 3.7 MHz. The driver</div><div class='hunk'>@@ -165,8 +114,18 @@ static struct spi_board_info simone_spi_devices[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Up to v1.3, the Sim.One used SFRMOUT as SD card chip select, but this goes</div><div class='add'>+ * low between multi-message command blocks. From v1.4, it uses a GPIO instead.</div><div class='add'>+ * v1.3 parts will still work, since the signal on SFRMOUT is automatic.</div><div class='add'>+ */</div><div class='add'>+static int simone_spi_chipselects[] __initdata = {</div><div class='add'>+	EP93XX_GPIO_LINE_EGPIO1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct ep93xx_spi_info simone_spi_info __initdata = {</div><div class='del'>-	.num_chipselect	= ARRAY_SIZE(simone_spi_devices),</div><div class='add'>+	.chipselect	= simone_spi_chipselects,</div><div class='add'>+	.num_chipselect	= ARRAY_SIZE(simone_spi_chipselects),</div><div class='ctx'> 	.use_dma = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/timer-ep93xx.c b/arch/arm/mach-ep93xx/timer-ep93xx.c<br/>index e5f791145bd0..874cbc91b669 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/timer-ep93xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ep93xx/timer-ep93xx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/timer-ep93xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/timer-ep93xx.c</a></div><div class='hunk'>@@ -59,13 +59,13 @@ static u64 notrace ep93xx_read_sched_clock(void)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-cycle_t ep93xx_clocksource_read(struct clocksource *c)</div><div class='add'>+u64 ep93xx_clocksource_read(struct clocksource *c)</div><div class='ctx'> {</div><div class='ctx'> 	u64 ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = readl(EP93XX_TIMER4_VALUE_LOW);</div><div class='ctx'> 	ret |= ((u64) (readl(EP93XX_TIMER4_VALUE_HIGH) &amp; 0xff) &lt;&lt; 32);</div><div class='del'>-	return (cycle_t) ret;</div><div class='add'>+	return (u64) ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ep93xx_clkevt_set_next_event(unsigned long next,</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c<br/>index 3b39ea353d30..8a5b6f059498 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/ts72xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ep93xx/ts72xx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/ts72xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/ts72xx.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/rtc-m48t86.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -45,16 +44,6 @@ static struct map_desc ts72xx_io_desc[] __initdata = {</div><div class='ctx'> 		.pfn		= __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE),</div><div class='ctx'> 		.length		= TS72XX_OPTIONS2_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)TS72XX_RTC_INDEX_VIRT_BASE,</div><div class='del'>-		.pfn		= __phys_to_pfn(TS72XX_RTC_INDEX_PHYS_BASE),</div><div class='del'>-		.length		= TS72XX_RTC_INDEX_SIZE,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)TS72XX_RTC_DATA_VIRT_BASE,</div><div class='del'>-		.pfn		= __phys_to_pfn(TS72XX_RTC_DATA_PHYS_BASE),</div><div class='del'>-		.length		= TS72XX_RTC_DATA_SIZE,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -179,31 +168,22 @@ static void __init ts72xx_register_flash(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*************************************************************************</div><div class='add'>+ * RTC M48T86</div><div class='add'>+ *************************************************************************/</div><div class='add'>+#define TS72XX_RTC_INDEX_PHYS_BASE	(EP93XX_CS1_PHYS_BASE + 0x00800000)</div><div class='add'>+#define TS72XX_RTC_DATA_PHYS_BASE	(EP93XX_CS1_PHYS_BASE + 0x01700000)</div><div class='ctx'> </div><div class='del'>-static unsigned char ts72xx_rtc_readbyte(unsigned long addr)</div><div class='del'>-{</div><div class='del'>-	__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);</div><div class='del'>-	return __raw_readb(TS72XX_RTC_DATA_VIRT_BASE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ts72xx_rtc_writebyte(unsigned char value, unsigned long addr)</div><div class='del'>-{</div><div class='del'>-	__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);</div><div class='del'>-	__raw_writeb(value, TS72XX_RTC_DATA_VIRT_BASE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct m48t86_ops ts72xx_rtc_ops = {</div><div class='del'>-	.readbyte	= ts72xx_rtc_readbyte,</div><div class='del'>-	.writebyte	= ts72xx_rtc_writebyte,</div><div class='add'>+static struct resource ts72xx_rtc_resources[] = {</div><div class='add'>+	DEFINE_RES_MEM(TS72XX_RTC_INDEX_PHYS_BASE, 0x01),</div><div class='add'>+	DEFINE_RES_MEM(TS72XX_RTC_DATA_PHYS_BASE, 0x01),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device ts72xx_rtc_device = {</div><div class='ctx'> 	.name		= "rtc-m48t86",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data	= &amp;ts72xx_rtc_ops,</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= 0,</div><div class='add'>+	.resource	= ts72xx_rtc_resources,</div><div class='add'>+	.num_resources 	= ARRAY_SIZE(ts72xx_rtc_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource ts72xx_wdt_resources[] = {</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/ts72xx.h b/arch/arm/mach-ep93xx/ts72xx.h<br/>index 071feaa30adc..2255ba29fdd6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/ts72xx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ep93xx/ts72xx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/ts72xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/ts72xx.h</a></div><div class='hunk'>@@ -9,8 +9,6 @@</div><div class='ctx'>  * febff000	22000000	4K	model number register (bits 0-2)</div><div class='ctx'>  * febfe000	22400000	4K	options register</div><div class='ctx'>  * febfd000	22800000	4K	options register #2</div><div class='del'>- * febf9000	10800000	4K	TS-5620 RTC index register</div><div class='del'>- * febf8000	11700000	4K	TS-5620 RTC data register</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define TS72XX_MODEL_PHYS_BASE		0x22000000</div><div class='hunk'>@@ -40,15 +38,6 @@</div><div class='ctx'> #define TS72XX_OPTIONS2_TS9420		0x04</div><div class='ctx'> #define TS72XX_OPTIONS2_TS9420_BOOT	0x02</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define TS72XX_RTC_INDEX_VIRT_BASE	IOMEM(0xfebf9000)</div><div class='del'>-#define TS72XX_RTC_INDEX_PHYS_BASE	0x10800000</div><div class='del'>-#define TS72XX_RTC_INDEX_SIZE		0x00001000</div><div class='del'>-</div><div class='del'>-#define TS72XX_RTC_DATA_VIRT_BASE	IOMEM(0xfebf8000)</div><div class='del'>-#define TS72XX_RTC_DATA_PHYS_BASE	0x11700000</div><div class='del'>-#define TS72XX_RTC_DATA_SIZE		0x00001000</div><div class='del'>-</div><div class='ctx'> #define TS72XX_WDT_CONTROL_PHYS_BASE	0x23800000</div><div class='ctx'> #define TS72XX_WDT_FEED_PHYS_BASE	0x23c00000</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c<br/>index 5cced5988498..1daf9441058c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/vision_ep9307.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ep93xx/vision_ep9307.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ep93xx/vision_ep9307.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ep93xx/vision_ep9307.c</a></div><div class='hunk'>@@ -175,33 +175,9 @@ static struct cs4271_platform_data vision_cs4271_data = {</div><div class='ctx'> 	.gpio_nreset	= EP93XX_GPIO_LINE_H(2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int vision_cs4271_hw_setup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	return gpio_request_one(EP93XX_GPIO_LINE_EGPIO6,</div><div class='del'>-				GPIOF_OUT_INIT_HIGH, spi-&gt;modalias);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vision_cs4271_hw_cleanup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	gpio_free(EP93XX_GPIO_LINE_EGPIO6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vision_cs4271_hw_cs_control(struct spi_device *spi, int value)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(EP93XX_GPIO_LINE_EGPIO6, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ep93xx_spi_chip_ops vision_cs4271_hw = {</div><div class='del'>-	.setup		= vision_cs4271_hw_setup,</div><div class='del'>-	.cleanup	= vision_cs4271_hw_cleanup,</div><div class='del'>-	.cs_control	= vision_cs4271_hw_cs_control,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*************************************************************************</div><div class='ctx'>  * SPI Flash</div><div class='ctx'>  *************************************************************************/</div><div class='del'>-#define VISION_SPI_FLASH_CS	EP93XX_GPIO_LINE_EGPIO7</div><div class='del'>-</div><div class='ctx'> static struct mtd_partition vision_spi_flash_partitions[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "SPI bootstrap",</div><div class='hunk'>@@ -224,68 +200,20 @@ static struct flash_platform_data vision_spi_flash_data = {</div><div class='ctx'> 	.nr_parts	= ARRAY_SIZE(vision_spi_flash_partitions),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int vision_spi_flash_hw_setup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	return gpio_request_one(VISION_SPI_FLASH_CS, GPIOF_INIT_HIGH,</div><div class='del'>-				spi-&gt;modalias);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vision_spi_flash_hw_cleanup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	gpio_free(VISION_SPI_FLASH_CS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vision_spi_flash_hw_cs_control(struct spi_device *spi, int value)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(VISION_SPI_FLASH_CS, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ep93xx_spi_chip_ops vision_spi_flash_hw = {</div><div class='del'>-	.setup		= vision_spi_flash_hw_setup,</div><div class='del'>-	.cleanup	= vision_spi_flash_hw_cleanup,</div><div class='del'>-	.cs_control	= vision_spi_flash_hw_cs_control,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*************************************************************************</div><div class='ctx'>  * SPI SD/MMC host</div><div class='ctx'>  *************************************************************************/</div><div class='del'>-#define VISION_SPI_MMC_CS	EP93XX_GPIO_LINE_G(2)</div><div class='del'>-#define VISION_SPI_MMC_WP	EP93XX_GPIO_LINE_F(0)</div><div class='del'>-#define VISION_SPI_MMC_CD	EP93XX_GPIO_LINE_EGPIO15</div><div class='del'>-</div><div class='ctx'> static struct mmc_spi_platform_data vision_spi_mmc_data = {</div><div class='ctx'> 	.detect_delay	= 100,</div><div class='ctx'> 	.powerup_msecs	= 100,</div><div class='ctx'> 	.ocr_mask	= MMC_VDD_32_33 | MMC_VDD_33_34,</div><div class='ctx'> 	.flags		= MMC_SPI_USE_CD_GPIO | MMC_SPI_USE_RO_GPIO,</div><div class='del'>-	.cd_gpio	= VISION_SPI_MMC_CD,</div><div class='add'>+	.cd_gpio	= EP93XX_GPIO_LINE_EGPIO15,</div><div class='ctx'> 	.cd_debounce	= 1,</div><div class='del'>-	.ro_gpio	= VISION_SPI_MMC_WP,</div><div class='add'>+	.ro_gpio	= EP93XX_GPIO_LINE_F(0),</div><div class='ctx'> 	.caps2		= MMC_CAP2_RO_ACTIVE_HIGH,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int vision_spi_mmc_hw_setup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	return gpio_request_one(VISION_SPI_MMC_CS, GPIOF_INIT_HIGH,</div><div class='del'>-				spi-&gt;modalias);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vision_spi_mmc_hw_cleanup(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	gpio_free(VISION_SPI_MMC_CS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vision_spi_mmc_hw_cs_control(struct spi_device *spi, int value)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(VISION_SPI_MMC_CS, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ep93xx_spi_chip_ops vision_spi_mmc_hw = {</div><div class='del'>-	.setup		= vision_spi_mmc_hw_setup,</div><div class='del'>-	.cleanup	= vision_spi_mmc_hw_cleanup,</div><div class='del'>-	.cs_control	= vision_spi_mmc_hw_cs_control,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*************************************************************************</div><div class='ctx'>  * SPI Bus</div><div class='ctx'>  *************************************************************************/</div><div class='hunk'>@@ -293,7 +221,6 @@ static struct spi_board_info vision_spi_board_info[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.modalias		= "cs4271",</div><div class='ctx'> 		.platform_data		= &amp;vision_cs4271_data,</div><div class='del'>-		.controller_data	= &amp;vision_cs4271_hw,</div><div class='ctx'> 		.max_speed_hz		= 6000000,</div><div class='ctx'> 		.bus_num		= 0,</div><div class='ctx'> 		.chip_select		= 0,</div><div class='hunk'>@@ -301,7 +228,6 @@ static struct spi_board_info vision_spi_board_info[] __initdata = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.modalias		= "sst25l",</div><div class='ctx'> 		.platform_data		= &amp;vision_spi_flash_data,</div><div class='del'>-		.controller_data	= &amp;vision_spi_flash_hw,</div><div class='ctx'> 		.max_speed_hz		= 20000000,</div><div class='ctx'> 		.bus_num		= 0,</div><div class='ctx'> 		.chip_select		= 1,</div><div class='hunk'>@@ -309,7 +235,6 @@ static struct spi_board_info vision_spi_board_info[] __initdata = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.modalias		= "mmc_spi",</div><div class='ctx'> 		.platform_data		= &amp;vision_spi_mmc_data,</div><div class='del'>-		.controller_data	= &amp;vision_spi_mmc_hw,</div><div class='ctx'> 		.max_speed_hz		= 20000000,</div><div class='ctx'> 		.bus_num		= 0,</div><div class='ctx'> 		.chip_select		= 2,</div><div class='hunk'>@@ -317,8 +242,15 @@ static struct spi_board_info vision_spi_board_info[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int vision_spi_chipselects[] __initdata = {</div><div class='add'>+	EP93XX_GPIO_LINE_EGPIO6,</div><div class='add'>+	EP93XX_GPIO_LINE_EGPIO7,</div><div class='add'>+	EP93XX_GPIO_LINE_G(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct ep93xx_spi_info vision_spi_master __initdata = {</div><div class='del'>-	.num_chipselect	= ARRAY_SIZE(vision_spi_board_info),</div><div class='add'>+	.chipselect	= vision_spi_chipselects,</div><div class='add'>+	.num_chipselect	= ARRAY_SIZE(vision_spi_chipselects),</div><div class='ctx'> 	.use_dma	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig<br/>index 0bb63b8d21e7..0a99140b6ba2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-exynos/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-exynos/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-exynos/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/Kconfig</a></div><div class='hunk'>@@ -95,11 +95,6 @@ config SOC_EXYNOS4412</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on ARCH_EXYNOS4</div><div class='ctx'> </div><div class='del'>-config SOC_EXYNOS4415</div><div class='del'>-	bool "SAMSUNG EXYNOS4415"</div><div class='del'>-	default y</div><div class='del'>-	depends on ARCH_EXYNOS4</div><div class='del'>-</div><div class='ctx'> config SOC_EXYNOS5250</div><div class='ctx'> 	bool "SAMSUNG EXYNOS5250"</div><div class='ctx'> 	default y</div><div class='head'>diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c<br/>index 757fc11de30d..c404c15ad07f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-exynos/exynos.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-exynos/exynos.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-exynos/exynos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/exynos.c</a></div><div class='hunk'>@@ -45,8 +45,8 @@ static struct platform_device exynos_cpuidle = {</div><div class='ctx'> 	.id                = -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __iomem *sysram_base_addr;</div><div class='del'>-void __iomem *sysram_ns_base_addr;</div><div class='add'>+void __iomem *sysram_base_addr __ro_after_init;</div><div class='add'>+void __iomem *sysram_ns_base_addr __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> void __init exynos_sysram_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -210,7 +210,6 @@ static char const *const exynos_dt_compat[] __initconst = {</div><div class='ctx'> 	"samsung,exynos4210",</div><div class='ctx'> 	"samsung,exynos4212",</div><div class='ctx'> 	"samsung,exynos4412",</div><div class='del'>-	"samsung,exynos4415",</div><div class='ctx'> 	"samsung,exynos5",</div><div class='ctx'> 	"samsung,exynos5250",</div><div class='ctx'> 	"samsung,exynos5260",</div><div class='head'>diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c<br/>index fd6da5419b51..e81a78b125d9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-exynos/firmware.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-exynos/firmware.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-exynos/firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/firmware.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ static int exynos_do_idle(unsigned long mode)</div><div class='ctx'> 	case FW_DO_IDLE_AFTR:</div><div class='ctx'> 		if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)</div><div class='ctx'> 			exynos_save_cp15();</div><div class='del'>-		writel_relaxed(virt_to_phys(exynos_cpu_resume_ns),</div><div class='add'>+		writel_relaxed(__pa_symbol(exynos_cpu_resume_ns),</div><div class='ctx'> 			       sysram_ns_base_addr + 0x24);</div><div class='ctx'> 		writel_relaxed(EXYNOS_AFTR_MAGIC, sysram_ns_base_addr + 0x20);</div><div class='ctx'> 		if (soc_is_exynos3250()) {</div><div class='hunk'>@@ -135,7 +135,7 @@ static int exynos_suspend(void)</div><div class='ctx'> 		exynos_save_cp15();</div><div class='ctx'> </div><div class='ctx'> 	writel(EXYNOS_SLEEP_MAGIC, sysram_ns_base_addr + EXYNOS_BOOT_FLAG);</div><div class='del'>-	writel(virt_to_phys(exynos_cpu_resume_ns),</div><div class='add'>+	writel(__pa_symbol(exynos_cpu_resume_ns),</div><div class='ctx'> 		sysram_ns_base_addr + EXYNOS_BOOT_ADDR);</div><div class='ctx'> </div><div class='ctx'> 	return cpu_suspend(0, exynos_cpu_suspend);</div><div class='head'>diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c<br/>index f086bf615b29..b42622562ea7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-exynos/mcpm-exynos.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-exynos/mcpm-exynos.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-exynos/mcpm-exynos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/mcpm-exynos.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #define EXYNOS5420_USE_ARM_CORE_DOWN_STATE	BIT(29)</div><div class='ctx'> #define EXYNOS5420_USE_L2_COMMON_UP_STATE	BIT(30)</div><div class='ctx'> </div><div class='del'>-static void __iomem *ns_sram_base_addr;</div><div class='add'>+static void __iomem *ns_sram_base_addr __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The common v7_exit_coherency_flush API could not be used because of the</div><div class='hunk'>@@ -221,7 +221,7 @@ static void exynos_mcpm_setup_entry_point(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	__raw_writel(0xe59f0000, ns_sram_base_addr);     /* ldr r0, [pc, #0] */</div><div class='ctx'> 	__raw_writel(0xe12fff10, ns_sram_base_addr + 4); /* bx  r0 */</div><div class='del'>-	__raw_writel(virt_to_phys(mcpm_entry_point), ns_sram_base_addr + 8);</div><div class='add'>+	__raw_writel(__pa_symbol(mcpm_entry_point), ns_sram_base_addr + 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct syscore_ops exynos_mcpm_syscore_ops = {</div><div class='head'>diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c<br/>index 98ffe1e62ad5..5a03bffe7226 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-exynos/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-exynos/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-exynos/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/platsmp.c</a></div><div class='hunk'>@@ -353,7 +353,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> </div><div class='ctx'> 		smp_rmb();</div><div class='ctx'> </div><div class='del'>-		boot_addr = virt_to_phys(exynos4_secondary_startup);</div><div class='add'>+		boot_addr = __pa_symbol(exynos4_secondary_startup);</div><div class='ctx'> </div><div class='ctx'> 		ret = exynos_set_boot_addr(core_id, boot_addr);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -385,36 +385,6 @@ fail:</div><div class='ctx'> 	return pen_release != -1 ? ret : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Initialise the CPU possible map early - this describes the CPUs</div><div class='del'>- * which may be present or become present in the system.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __init exynos_smp_init_cpus(void)</div><div class='del'>-{</div><div class='del'>-	void __iomem *scu_base = scu_base_addr();</div><div class='del'>-	unsigned int i, ncores;</div><div class='del'>-</div><div class='del'>-	if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)</div><div class='del'>-		ncores = scu_base ? scu_get_core_count(scu_base) : 1;</div><div class='del'>-	else</div><div class='del'>-		/*</div><div class='del'>-		 * CPU Nodes are passed thru DT and set_cpu_possible</div><div class='del'>-		 * is set by "arm_dt_init_cpu_maps".</div><div class='del'>-		 */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* sanity check */</div><div class='del'>-	if (ncores &gt; nr_cpu_ids) {</div><div class='del'>-		pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",</div><div class='del'>-			ncores, nr_cpu_ids);</div><div class='del'>-		ncores = nr_cpu_ids;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ncores; i++)</div><div class='del'>-		set_cpu_possible(i, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -443,7 +413,7 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> </div><div class='ctx'> 		mpidr = cpu_logical_map(i);</div><div class='ctx'> 		core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0);</div><div class='del'>-		boot_addr = virt_to_phys(exynos4_secondary_startup);</div><div class='add'>+		boot_addr = __pa_symbol(exynos4_secondary_startup);</div><div class='ctx'> </div><div class='ctx'> 		ret = exynos_set_boot_addr(core_id, boot_addr);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -479,7 +449,6 @@ static void exynos_cpu_die(unsigned int cpu)</div><div class='ctx'> #endif /* CONFIG_HOTPLUG_CPU */</div><div class='ctx'> </div><div class='ctx'> const struct smp_operations exynos_smp_ops __initconst = {</div><div class='del'>-	.smp_init_cpus		= exynos_smp_init_cpus,</div><div class='ctx'> 	.smp_prepare_cpus	= exynos_smp_prepare_cpus,</div><div class='ctx'> 	.smp_secondary_init	= exynos_secondary_init,</div><div class='ctx'> 	.smp_boot_secondary	= exynos_boot_secondary,</div><div class='head'>diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c<br/>index 487295f4a56b..1a7e5b5d08d8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-exynos/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-exynos/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-exynos/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/pm.c</a></div><div class='hunk'>@@ -132,7 +132,7 @@ static void exynos_set_wakeupmask(long mask)</div><div class='ctx'> </div><div class='ctx'> static void exynos_cpu_set_boot_vector(long flags)</div><div class='ctx'> {</div><div class='del'>-	writel_relaxed(virt_to_phys(exynos_cpu_resume),</div><div class='add'>+	writel_relaxed(__pa_symbol(exynos_cpu_resume),</div><div class='ctx'> 		       exynos_boot_vector_addr());</div><div class='ctx'> 	writel_relaxed(flags, exynos_boot_vector_flag());</div><div class='ctx'> }</div><div class='hunk'>@@ -238,7 +238,7 @@ static int exynos_cpu0_enter_aftr(void)</div><div class='ctx'> </div><div class='ctx'> abort:</div><div class='ctx'> 	if (cpu_online(1)) {</div><div class='del'>-		unsigned long boot_addr = virt_to_phys(exynos_cpu_resume);</div><div class='add'>+		unsigned long boot_addr = __pa_symbol(exynos_cpu_resume);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Set the boot vector to something non-zero</div><div class='hunk'>@@ -330,7 +330,7 @@ cpu1_aborted:</div><div class='ctx'> </div><div class='ctx'> static void exynos_pre_enter_aftr(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long boot_addr = virt_to_phys(exynos_cpu_resume);</div><div class='add'>+	unsigned long boot_addr = __pa_symbol(exynos_cpu_resume);</div><div class='ctx'> </div><div class='ctx'> 	(void)exynos_set_boot_addr(1, boot_addr);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c<br/>index 06332f626565..748cfb8d5212 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-exynos/suspend.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-exynos/suspend.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-exynos/suspend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-exynos/suspend.c</a></div><div class='hunk'>@@ -57,7 +57,6 @@ struct exynos_wkup_irq {</div><div class='ctx'> struct exynos_pm_data {</div><div class='ctx'> 	const struct exynos_wkup_irq *wkup_irq;</div><div class='ctx'> 	unsigned int wake_disable_mask;</div><div class='del'>-	unsigned int *release_ret_regs;</div><div class='ctx'> </div><div class='ctx'> 	void (*pm_prepare)(void);</div><div class='ctx'> 	void (*pm_resume_prepare)(void);</div><div class='hunk'>@@ -66,7 +65,7 @@ struct exynos_pm_data {</div><div class='ctx'> 	int (*cpu_suspend)(unsigned long);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct exynos_pm_data *pm_data;</div><div class='add'>+static const struct exynos_pm_data *pm_data __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> static int exynos5420_cpu_state;</div><div class='ctx'> static unsigned int exynos_pmu_spare3;</div><div class='hunk'>@@ -95,47 +94,6 @@ static const struct exynos_wkup_irq exynos5250_wkup_irq[] = {</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int exynos_release_ret_regs[] = {</div><div class='del'>-	S5P_PAD_RET_MAUDIO_OPTION,</div><div class='del'>-	S5P_PAD_RET_GPIO_OPTION,</div><div class='del'>-	S5P_PAD_RET_UART_OPTION,</div><div class='del'>-	S5P_PAD_RET_MMCA_OPTION,</div><div class='del'>-	S5P_PAD_RET_MMCB_OPTION,</div><div class='del'>-	S5P_PAD_RET_EBIA_OPTION,</div><div class='del'>-	S5P_PAD_RET_EBIB_OPTION,</div><div class='del'>-	REG_TABLE_END,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int exynos3250_release_ret_regs[] = {</div><div class='del'>-	S5P_PAD_RET_MAUDIO_OPTION,</div><div class='del'>-	S5P_PAD_RET_GPIO_OPTION,</div><div class='del'>-	S5P_PAD_RET_UART_OPTION,</div><div class='del'>-	S5P_PAD_RET_MMCA_OPTION,</div><div class='del'>-	S5P_PAD_RET_MMCB_OPTION,</div><div class='del'>-	S5P_PAD_RET_EBIA_OPTION,</div><div class='del'>-	S5P_PAD_RET_EBIB_OPTION,</div><div class='del'>-	S5P_PAD_RET_MMC2_OPTION,</div><div class='del'>-	S5P_PAD_RET_SPI_OPTION,</div><div class='del'>-	REG_TABLE_END,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int exynos5420_release_ret_regs[] = {</div><div class='del'>-	EXYNOS_PAD_RET_DRAM_OPTION,</div><div class='del'>-	EXYNOS_PAD_RET_MAUDIO_OPTION,</div><div class='del'>-	EXYNOS_PAD_RET_JTAG_OPTION,</div><div class='del'>-	EXYNOS5420_PAD_RET_GPIO_OPTION,</div><div class='del'>-	EXYNOS5420_PAD_RET_UART_OPTION,</div><div class='del'>-	EXYNOS5420_PAD_RET_MMCA_OPTION,</div><div class='del'>-	EXYNOS5420_PAD_RET_MMCB_OPTION,</div><div class='del'>-	EXYNOS5420_PAD_RET_MMCC_OPTION,</div><div class='del'>-	EXYNOS5420_PAD_RET_HSI_OPTION,</div><div class='del'>-	EXYNOS_PAD_RET_EBIA_OPTION,</div><div class='del'>-	EXYNOS_PAD_RET_EBIB_OPTION,</div><div class='del'>-	EXYNOS5420_PAD_RET_SPI_OPTION,</div><div class='del'>-	EXYNOS5420_PAD_RET_DRAM_COREBLK_OPTION,</div><div class='del'>-	REG_TABLE_END,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int exynos_irq_set_wake(struct irq_data *data, unsigned int state)</div><div class='ctx'> {</div><div class='ctx'> 	const struct exynos_wkup_irq *wkup_irq;</div><div class='hunk'>@@ -270,7 +228,6 @@ EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu");</div><div class='ctx'> EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu");</div><div class='ctx'> EXYNOS_PMU_IRQ(exynos4212_pmu_irq, "samsung,exynos4212-pmu");</div><div class='ctx'> EXYNOS_PMU_IRQ(exynos4412_pmu_irq, "samsung,exynos4412-pmu");</div><div class='del'>-EXYNOS_PMU_IRQ(exynos4415_pmu_irq, "samsung,exynos4415-pmu");</div><div class='ctx'> EXYNOS_PMU_IRQ(exynos5250_pmu_irq, "samsung,exynos5250-pmu");</div><div class='ctx'> EXYNOS_PMU_IRQ(exynos5420_pmu_irq, "samsung,exynos5420-pmu");</div><div class='ctx'> </div><div class='hunk'>@@ -344,7 +301,7 @@ static void exynos_pm_prepare(void)</div><div class='ctx'> 	exynos_pm_enter_sleep_mode();</div><div class='ctx'> </div><div class='ctx'> 	/* ensure at least INFORM0 has the resume address */</div><div class='del'>-	pmu_raw_writel(virt_to_phys(exynos_cpu_resume), S5P_INFORM0);</div><div class='add'>+	pmu_raw_writel(__pa_symbol(exynos_cpu_resume), S5P_INFORM0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void exynos3250_pm_prepare(void)</div><div class='hunk'>@@ -361,7 +318,7 @@ static void exynos3250_pm_prepare(void)</div><div class='ctx'> 	exynos_pm_enter_sleep_mode();</div><div class='ctx'> </div><div class='ctx'> 	/* ensure at least INFORM0 has the resume address */</div><div class='del'>-	pmu_raw_writel(virt_to_phys(exynos_cpu_resume), S5P_INFORM0);</div><div class='add'>+	pmu_raw_writel(__pa_symbol(exynos_cpu_resume), S5P_INFORM0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void exynos5420_pm_prepare(void)</div><div class='hunk'>@@ -386,11 +343,11 @@ static void exynos5420_pm_prepare(void)</div><div class='ctx'> </div><div class='ctx'> 	/* ensure at least INFORM0 has the resume address */</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_EXYNOS5420_MCPM))</div><div class='del'>-		pmu_raw_writel(virt_to_phys(mcpm_entry_point), S5P_INFORM0);</div><div class='add'>+		pmu_raw_writel(__pa_symbol(mcpm_entry_point), S5P_INFORM0);</div><div class='ctx'> </div><div class='del'>-	tmp = pmu_raw_readl(EXYNOS5_ARM_L2_OPTION);</div><div class='del'>-	tmp &amp;= ~EXYNOS5_USE_RETENTION;</div><div class='del'>-	pmu_raw_writel(tmp, EXYNOS5_ARM_L2_OPTION);</div><div class='add'>+	tmp = pmu_raw_readl(EXYNOS_L2_OPTION(0));</div><div class='add'>+	tmp &amp;= ~EXYNOS_L2_USE_RETENTION;</div><div class='add'>+	pmu_raw_writel(tmp, EXYNOS_L2_OPTION(0));</div><div class='ctx'> </div><div class='ctx'> 	tmp = pmu_raw_readl(EXYNOS5420_SFR_AXI_CGDIS1);</div><div class='ctx'> 	tmp |= EXYNOS5420_UFS;</div><div class='hunk'>@@ -442,15 +399,6 @@ static int exynos5420_pm_suspend(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void exynos_pm_release_retention(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; (pm_data-&gt;release_ret_regs[i] != REG_TABLE_END); i++)</div><div class='del'>-		pmu_raw_writel(EXYNOS_WAKEUP_FROM_LOWPWR,</div><div class='del'>-				pm_data-&gt;release_ret_regs[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void exynos_pm_resume(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cpuid = read_cpuid_part();</div><div class='hunk'>@@ -458,9 +406,6 @@ static void exynos_pm_resume(void)</div><div class='ctx'> 	if (exynos_pm_central_resume())</div><div class='ctx'> 		goto early_wakeup;</div><div class='ctx'> </div><div class='del'>-	/* For release retention */</div><div class='del'>-	exynos_pm_release_retention();</div><div class='del'>-</div><div class='ctx'> 	if (cpuid == ARM_CPU_PART_CORTEX_A9)</div><div class='ctx'> 		scu_enable(S5P_VA_SCU);</div><div class='ctx'> </div><div class='hunk'>@@ -482,9 +427,6 @@ static void exynos3250_pm_resume(void)</div><div class='ctx'> 	if (exynos_pm_central_resume())</div><div class='ctx'> 		goto early_wakeup;</div><div class='ctx'> </div><div class='del'>-	/* For release retention */</div><div class='del'>-	exynos_pm_release_retention();</div><div class='del'>-</div><div class='ctx'> 	pmu_raw_writel(S5P_USE_STANDBY_WFI_ALL, S5P_CENTRAL_SEQ_OPTION);</div><div class='ctx'> </div><div class='ctx'> 	if (call_firmware_op(resume) == -ENOSYS</div><div class='hunk'>@@ -522,9 +464,6 @@ static void exynos5420_pm_resume(void)</div><div class='ctx'> 	if (exynos_pm_central_resume())</div><div class='ctx'> 		goto early_wakeup;</div><div class='ctx'> </div><div class='del'>-	/* For release retention */</div><div class='del'>-	exynos_pm_release_retention();</div><div class='del'>-</div><div class='ctx'> 	pmu_raw_writel(exynos_pmu_spare3, S5P_PMU_SPARE3);</div><div class='ctx'> </div><div class='ctx'> early_wakeup:</div><div class='hunk'>@@ -637,7 +576,6 @@ static const struct platform_suspend_ops exynos_suspend_ops = {</div><div class='ctx'> static const struct exynos_pm_data exynos3250_pm_data = {</div><div class='ctx'> 	.wkup_irq	= exynos3250_wkup_irq,</div><div class='ctx'> 	.wake_disable_mask = ((0xFF &lt;&lt; 8) | (0x1F &lt;&lt; 1)),</div><div class='del'>-	.release_ret_regs = exynos3250_release_ret_regs,</div><div class='ctx'> 	.pm_suspend	= exynos_pm_suspend,</div><div class='ctx'> 	.pm_resume	= exynos3250_pm_resume,</div><div class='ctx'> 	.pm_prepare	= exynos3250_pm_prepare,</div><div class='hunk'>@@ -647,7 +585,6 @@ static const struct exynos_pm_data exynos3250_pm_data = {</div><div class='ctx'> static const struct exynos_pm_data exynos4_pm_data = {</div><div class='ctx'> 	.wkup_irq	= exynos4_wkup_irq,</div><div class='ctx'> 	.wake_disable_mask = ((0xFF &lt;&lt; 8) | (0x1F &lt;&lt; 1)),</div><div class='del'>-	.release_ret_regs = exynos_release_ret_regs,</div><div class='ctx'> 	.pm_suspend	= exynos_pm_suspend,</div><div class='ctx'> 	.pm_resume	= exynos_pm_resume,</div><div class='ctx'> 	.pm_prepare	= exynos_pm_prepare,</div><div class='hunk'>@@ -657,7 +594,6 @@ static const struct exynos_pm_data exynos4_pm_data = {</div><div class='ctx'> static const struct exynos_pm_data exynos5250_pm_data = {</div><div class='ctx'> 	.wkup_irq	= exynos5250_wkup_irq,</div><div class='ctx'> 	.wake_disable_mask = ((0xFF &lt;&lt; 8) | (0x1F &lt;&lt; 1)),</div><div class='del'>-	.release_ret_regs = exynos_release_ret_regs,</div><div class='ctx'> 	.pm_suspend	= exynos_pm_suspend,</div><div class='ctx'> 	.pm_resume	= exynos_pm_resume,</div><div class='ctx'> 	.pm_prepare	= exynos_pm_prepare,</div><div class='hunk'>@@ -667,7 +603,6 @@ static const struct exynos_pm_data exynos5250_pm_data = {</div><div class='ctx'> static const struct exynos_pm_data exynos5420_pm_data = {</div><div class='ctx'> 	.wkup_irq	= exynos5250_wkup_irq,</div><div class='ctx'> 	.wake_disable_mask = (0x7F &lt;&lt; 7) | (0x1F &lt;&lt; 1),</div><div class='del'>-	.release_ret_regs = exynos5420_release_ret_regs,</div><div class='ctx'> 	.pm_resume_prepare = exynos5420_prepare_pm_resume,</div><div class='ctx'> 	.pm_resume	= exynos5420_pm_resume,</div><div class='ctx'> 	.pm_suspend	= exynos5420_pm_suspend,</div><div class='head'>diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c<br/>index 810edc78c817..75395a720e63 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-footbridge/dc21285-timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-footbridge/dc21285-timer.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-footbridge/dc21285-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-footbridge/dc21285-timer.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='del'>-static cycle_t cksrc_dc21285_read(struct clocksource *cs)</div><div class='add'>+static u64 cksrc_dc21285_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return cs-&gt;mask - *CSR_TIMER2_VALUE;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-hisi/core.h b/arch/arm/mach-hisi/core.h<br/>index e883583a23f1..c58b68ab0cb6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-hisi/core.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-hisi/core.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-hisi/core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-hisi/core.h</a></div><div class='hunk'>@@ -15,5 +15,4 @@ extern void hix5hd2_set_cpu(int cpu, bool enable);</div><div class='ctx'> extern void hix5hd2_cpu_die(unsigned int cpu);</div><div class='ctx'> </div><div class='ctx'> extern void hip01_set_cpu(int cpu, bool enable);</div><div class='del'>-extern void hip01_cpu_die(unsigned int cpu);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-hisi/platmcpm.c b/arch/arm/mach-hisi/platmcpm.c<br/>index 4b653a8cb75c..a6c117622d67 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-hisi/platmcpm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-hisi/platmcpm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-hisi/platmcpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-hisi/platmcpm.c</a></div><div class='hunk'>@@ -327,7 +327,7 @@ static int __init hip04_smp_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	writel_relaxed(hip04_boot_method[0], relocation);</div><div class='ctx'> 	writel_relaxed(0xa5a5a5a5, relocation + 4);	/* magic number */</div><div class='del'>-	writel_relaxed(virt_to_phys(secondary_startup), relocation + 8);</div><div class='add'>+	writel_relaxed(__pa_symbol(secondary_startup), relocation + 8);</div><div class='ctx'> 	writel_relaxed(0, relocation + 12);</div><div class='ctx'> 	iounmap(relocation);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-hisi/platsmp.c b/arch/arm/mach-hisi/platsmp.c<br/>index e1d67648d5d0..91bb02dec20f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-hisi/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-hisi/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-hisi/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-hisi/platsmp.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@ void hi3xxx_set_cpu_jump(int cpu, void *jump_addr)</div><div class='ctx'> 	cpu = cpu_logical_map(cpu);</div><div class='ctx'> 	if (!cpu || !ctrl_base)</div><div class='ctx'> 		return;</div><div class='del'>-	writel_relaxed(virt_to_phys(jump_addr), ctrl_base + ((cpu - 1) &lt;&lt; 2));</div><div class='add'>+	writel_relaxed(__pa_symbol(jump_addr), ctrl_base + ((cpu - 1) &lt;&lt; 2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hi3xxx_get_cpu_jump(int cpu)</div><div class='hunk'>@@ -118,7 +118,7 @@ static int hix5hd2_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t jumpaddr;</div><div class='ctx'> </div><div class='del'>-	jumpaddr = virt_to_phys(secondary_startup);</div><div class='add'>+	jumpaddr = __pa_symbol(secondary_startup);</div><div class='ctx'> 	hix5hd2_set_scu_boot_addr(HIX5HD2_BOOT_ADDRESS, jumpaddr);</div><div class='ctx'> 	hix5hd2_set_cpu(cpu, true);</div><div class='ctx'> 	arch_send_wakeup_ipi_mask(cpumask_of(cpu));</div><div class='hunk'>@@ -156,7 +156,7 @@ static int hip01_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> 	struct device_node *node;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	jumpaddr = virt_to_phys(secondary_startup);</div><div class='add'>+	jumpaddr = __pa_symbol(secondary_startup);</div><div class='ctx'> 	hip01_set_boot_addr(HIP01_BOOT_ADDRESS, jumpaddr);</div><div class='ctx'> </div><div class='ctx'> 	node = of_find_compatible_node(NULL, NULL, "hisilicon,hip01-sysctrl");</div><div class='head'>diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig<br/>index 9155b639c9aa..936c59d0e18b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/Kconfig</a></div><div class='hunk'>@@ -557,7 +557,6 @@ config SOC_VF610</div><div class='ctx'> 	bool "Vybrid Family VF610 support"</div><div class='ctx'> 	select ARM_GIC if ARCH_MULTI_V7</div><div class='ctx'> 	select PINCTRL_VF610</div><div class='del'>-	select PL310_ERRATA_769419 if CACHE_L2X0</div><div class='ctx'> </div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for Freescale Vybrid VF610 processor.</div><div class='head'>diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h<br/>index c4436d9c52ff..b09a2ec19267 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/common.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/common.h</a></div><div class='hunk'>@@ -43,7 +43,6 @@ int mx21_clocks_init(unsigned long lref, unsigned long fref);</div><div class='ctx'> int mx27_clocks_init(unsigned long fref);</div><div class='ctx'> int mx31_clocks_init(unsigned long fref);</div><div class='ctx'> int mx35_clocks_init(void);</div><div class='del'>-int mx31_clocks_init_dt(void);</div><div class='ctx'> struct platform_device *mxc_register_gpio(char *name, int id,</div><div class='ctx'> 	resource_size_t iobase, resource_size_t iosize, int irq, int irq_high);</div><div class='ctx'> void mxc_set_cpu_type(unsigned int type);</div><div class='head'>diff --git a/arch/arm/mach-imx/devices/platform-flexcan.c b/arch/arm/mach-imx/devices/platform-flexcan.c<br/>index 55d61eaf63c6..8a1a2fc4ce10 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/devices/platform-flexcan.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/devices/platform-flexcan.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/devices/platform-flexcan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/devices/platform-flexcan.c</a></div><div class='hunk'>@@ -19,15 +19,6 @@</div><div class='ctx'> #define imx_flexcan_data_entry(soc, _id, _hwid, _size)			\</div><div class='ctx'> 	[_id] = imx_flexcan_data_entry_single(soc, _id, _hwid, _size)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SOC_IMX25</div><div class='del'>-const struct imx_flexcan_data imx25_flexcan_data[] __initconst = {</div><div class='del'>-#define imx25_flexcan_data_entry(_id, _hwid)				\</div><div class='del'>-	imx_flexcan_data_entry(MX25, _id, _hwid, SZ_16K)</div><div class='del'>-	imx25_flexcan_data_entry(0, 1),</div><div class='del'>-	imx25_flexcan_data_entry(1, 2),</div><div class='del'>-};</div><div class='del'>-#endif /* ifdef CONFIG_SOC_IMX25 */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SOC_IMX35</div><div class='ctx'> const struct imx_flexcan_data imx35_flexcan_data[] __initconst = {</div><div class='ctx'> #define imx35_flexcan_data_entry(_id, _hwid)				\</div><div class='head'>diff --git a/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c b/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c<br/>index 3d039ef021e0..466c9ccc6675 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c</a></div><div class='hunk'>@@ -22,16 +22,6 @@</div><div class='ctx'> #define imx_sdhci_esdhc_imx_data_entry(soc, devid, id, hwid)	\</div><div class='ctx'> 	[id] = imx_sdhci_esdhc_imx_data_entry_single(soc, devid, id, hwid)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SOC_IMX25</div><div class='del'>-const struct imx_sdhci_esdhc_imx_data</div><div class='del'>-imx25_sdhci_esdhc_imx_data[] __initconst = {</div><div class='del'>-#define imx25_sdhci_esdhc_imx_data_entry(_id, _hwid)			\</div><div class='del'>-	imx_sdhci_esdhc_imx_data_entry(MX25, "sdhci-esdhc-imx25", _id, _hwid)</div><div class='del'>-	imx25_sdhci_esdhc_imx_data_entry(0, 1),</div><div class='del'>-	imx25_sdhci_esdhc_imx_data_entry(1, 2),</div><div class='del'>-};</div><div class='del'>-#endif /* ifdef CONFIG_SOC_IMX25 */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SOC_IMX35</div><div class='ctx'> const struct imx_sdhci_esdhc_imx_data</div><div class='ctx'> imx35_sdhci_esdhc_imx_data[] __initconst = {</div><div class='head'>diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c<br/>index b54db47f6f32..1dc2a34b9dbd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/gpc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/gpc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/gpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/gpc.c</a></div><div class='hunk'>@@ -380,13 +380,6 @@ static struct pu_domain imx6q_pu_domain = {</div><div class='ctx'> 		.name = "PU",</div><div class='ctx'> 		.power_off = imx6q_pm_pu_power_off,</div><div class='ctx'> 		.power_on = imx6q_pm_pu_power_on,</div><div class='del'>-		.states = {</div><div class='del'>-			[0] = {</div><div class='del'>-				.power_off_latency_ns = 25000,</div><div class='del'>-				.power_on_latency_ns = 2000000,</div><div class='del'>-			},</div><div class='del'>-		},</div><div class='del'>-		.state_count = 1,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -430,6 +423,16 @@ static int imx_gpc_genpd_init(struct device *dev, struct regulator *pu_reg)</div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	imx6q_pu_domain.base.states = devm_kzalloc(dev,</div><div class='add'>+					sizeof(*imx6q_pu_domain.base.states),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!imx6q_pu_domain.base.states)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	imx6q_pu_domain.base.states[0].power_off_latency_ns = 25000;</div><div class='add'>+	imx6q_pu_domain.base.states[0].power_on_latency_ns = 2000000;</div><div class='add'>+	imx6q_pu_domain.base.state_count = 1;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(imx_gpc_domains); i++)</div><div class='ctx'> 		pm_genpd_init(imx_gpc_domains[i], NULL, false);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-imx/imx31-dt.c b/arch/arm/mach-imx/imx31-dt.c<br/>index 62e6b4fb5370..668d74b72511 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/imx31-dt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/imx31-dt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/imx31-dt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/imx31-dt.c</a></div><div class='hunk'>@@ -23,11 +23,6 @@ static const char * const imx31_dt_board_compat[] __initconst = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __init imx31_dt_timer_init(void)</div><div class='del'>-{</div><div class='del'>-	mx31_clocks_init_dt();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* FIXME: replace with DT binding */</div><div class='ctx'> static const struct resource imx31_rnga_res[] __initconst = {</div><div class='ctx'> 	DEFINE_RES_MEM(MX31_RNGA_BASE_ADDR, SZ_16K),</div><div class='hunk'>@@ -43,7 +38,6 @@ DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)")</div><div class='ctx'> 	.map_io		= mx31_map_io,</div><div class='ctx'> 	.init_early	= imx31_init_early,</div><div class='ctx'> 	.init_irq	= mx31_init_irq,</div><div class='del'>-	.init_time	= imx31_dt_timer_init,</div><div class='ctx'> 	.init_machine	= imx31_dt_mach_init,</div><div class='ctx'> 	.dt_compat	= imx31_dt_board_compat,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-imx1.c b/arch/arm/mach-imx/mach-imx1.c<br/>index de5ab8d88549..3a8406e45b65 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-imx1.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/mach-imx1.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-imx1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-imx1.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@ static const char * const imx1_dt_board_compat[] __initconst = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> DT_MACHINE_START(IMX1_DT, "Freescale i.MX1 (Device Tree Support)")</div><div class='del'>-	.map_io		= debug_ll_io_init,</div><div class='ctx'> 	.init_early	= imx1_init_early,</div><div class='ctx'> 	.init_irq	= imx1_init_irq,</div><div class='ctx'> 	.dt_compat	= imx1_dt_board_compat,</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c<br/>index 58a2b88233e6..6cb8a22b617d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-imx6ul.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/mach-imx6ul.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-imx6ul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-imx6ul.c</a></div><div class='hunk'>@@ -89,6 +89,7 @@ static void __init imx6ul_init_late(void)</div><div class='ctx'> </div><div class='ctx'> static const char * const imx6ul_dt_compat[] __initconst = {</div><div class='ctx'> 	"fsl,imx6ul",</div><div class='add'>+	"fsl,imx6ull",</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c<br/>index 7ba651a9b5b8..45e16bd7e2f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-mx27_3ds.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/mach-mx27_3ds.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-mx27_3ds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-mx27_3ds.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;linux/regulator/machine.h&gt;</div><div class='ctx'> #include &lt;linux/spi/l4f00242t03.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;media/soc_camera.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -53,8 +52,6 @@</div><div class='ctx'> #define SD1_CD			IMX_GPIO_NR(2, 26)</div><div class='ctx'> #define LCD_RESET		IMX_GPIO_NR(1, 3)</div><div class='ctx'> #define LCD_ENABLE		IMX_GPIO_NR(1, 31)</div><div class='del'>-#define CSI_PWRDWN		IMX_GPIO_NR(4, 19)</div><div class='del'>-#define CSI_RESET		IMX_GPIO_NR(3, 6)</div><div class='ctx'> </div><div class='ctx'> static const int mx27pdk_pins[] __initconst = {</div><div class='ctx'> 	/* UART1 */</div><div class='hunk'>@@ -144,21 +141,6 @@ static const int mx27pdk_pins[] __initconst = {</div><div class='ctx'> 	PA30_PF_CONTRAST,</div><div class='ctx'> 	LCD_ENABLE | GPIO_GPIO | GPIO_OUT,</div><div class='ctx'> 	LCD_RESET | GPIO_GPIO | GPIO_OUT,</div><div class='del'>-	/* CSI */</div><div class='del'>-	PB10_PF_CSI_D0,</div><div class='del'>-	PB11_PF_CSI_D1,</div><div class='del'>-	PB12_PF_CSI_D2,</div><div class='del'>-	PB13_PF_CSI_D3,</div><div class='del'>-	PB14_PF_CSI_D4,</div><div class='del'>-	PB15_PF_CSI_MCLK,</div><div class='del'>-	PB16_PF_CSI_PIXCLK,</div><div class='del'>-	PB17_PF_CSI_D5,</div><div class='del'>-	PB18_PF_CSI_D6,</div><div class='del'>-	PB19_PF_CSI_D7,</div><div class='del'>-	PB20_PF_CSI_VSYNC,</div><div class='del'>-	PB21_PF_CSI_HSYNC,</div><div class='del'>-	CSI_PWRDWN | GPIO_GPIO | GPIO_OUT,</div><div class='del'>-	CSI_RESET | GPIO_GPIO | GPIO_OUT,</div><div class='ctx'> 	/* SSI4 */</div><div class='ctx'> 	PC16_PF_SSI4_FS,</div><div class='ctx'> 	PC17_PF_SSI4_RXD,</div><div class='hunk'>@@ -166,11 +148,6 @@ static const int mx27pdk_pins[] __initconst = {</div><div class='ctx'> 	PC19_PF_SSI4_CLK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct gpio mx27_3ds_camera_gpios[] = {</div><div class='del'>-	{ CSI_PWRDWN, GPIOF_OUT_INIT_HIGH, "camera-power" },</div><div class='del'>-	{ CSI_RESET, GPIOF_OUT_INIT_HIGH, "camera-reset" },</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct imxuart_platform_data uart_pdata __initconst = {</div><div class='ctx'> 	.flags = IMXUART_HAVE_RTSCTS,</div><div class='ctx'> };</div><div class='hunk'>@@ -270,7 +247,6 @@ static struct regulator_init_data gpo_init = {</div><div class='ctx'> </div><div class='ctx'> static struct regulator_consumer_supply vmmc1_consumers[] = {</div><div class='ctx'> 	REGULATOR_SUPPLY("vcore", "spi0.0"),</div><div class='del'>-	REGULATOR_SUPPLY("cmos_2v8", "soc-camera-pdrv.0"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct regulator_init_data vmmc1_init = {</div><div class='hunk'>@@ -299,22 +275,6 @@ static struct regulator_init_data vgen_init = {</div><div class='ctx'> 	.consumer_supplies = vgen_consumers,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_consumer_supply vvib_consumers[] = {</div><div class='del'>-	REGULATOR_SUPPLY("cmos_vcore", "soc-camera-pdrv.0"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data vvib_init = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV = 1300000,</div><div class='del'>-		.max_uV = 1300000,</div><div class='del'>-		.apply_uV = 1,</div><div class='del'>-		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |</div><div class='del'>-				  REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies = ARRAY_SIZE(vvib_consumers),</div><div class='del'>-	.consumer_supplies = vvib_consumers,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = MC13783_REG_VMMC1,</div><div class='hunk'>@@ -328,9 +288,6 @@ static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id = MC13783_REG_GPO3, /* Turn on 3.3V */</div><div class='ctx'> 		.init_data = &amp;gpo_init,</div><div class='del'>-	}, {</div><div class='del'>-		.id = MC13783_REG_VVIB,  /* Power OV2640 */</div><div class='del'>-		.init_data = &amp;vvib_init,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -370,51 +327,6 @@ static const struct spi_imx_master spi2_pdata __initconst = {</div><div class='ctx'> 	.num_chipselect	= ARRAY_SIZE(spi2_chipselect),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int mx27_3ds_camera_power(struct device *dev, int on)</div><div class='del'>-{</div><div class='del'>-	/* enable or disable the camera */</div><div class='del'>-	pr_debug("%s: %s the camera\n", __func__, on ? "ENABLE" : "DISABLE");</div><div class='del'>-	gpio_set_value(CSI_PWRDWN, on ? 0 : 1);</div><div class='del'>-</div><div class='del'>-	if (!on)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* If enabled, give a reset impulse */</div><div class='del'>-	gpio_set_value(CSI_RESET, 0);</div><div class='del'>-	msleep(20);</div><div class='del'>-	gpio_set_value(CSI_RESET, 1);</div><div class='del'>-	msleep(100);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct i2c_board_info mx27_3ds_i2c_camera = {</div><div class='del'>-	I2C_BOARD_INFO("ov2640", 0x30),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_bulk_data mx27_3ds_camera_regs[] = {</div><div class='del'>-	{ .supply = "cmos_vcore" },</div><div class='del'>-	{ .supply = "cmos_2v8" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct soc_camera_link iclink_ov2640 = {</div><div class='del'>-	.bus_id		= 0,</div><div class='del'>-	.board_info	= &amp;mx27_3ds_i2c_camera,</div><div class='del'>-	.i2c_adapter_id	= 0,</div><div class='del'>-	.power		= mx27_3ds_camera_power,</div><div class='del'>-	.regulators	= mx27_3ds_camera_regs,</div><div class='del'>-	.num_regulators	= ARRAY_SIZE(mx27_3ds_camera_regs),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device mx27_3ds_ov2640 = {</div><div class='del'>-	.name	= "soc-camera-pdrv",</div><div class='del'>-	.id	= 0,</div><div class='del'>-	.dev	= {</div><div class='del'>-		.platform_data = &amp;iclink_ov2640,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct imx_fb_videomode mx27_3ds_modes[] = {</div><div class='ctx'> 	{	/* 480x640 @ 60 Hz */</div><div class='ctx'> 		.mode = {</div><div class='hunk'>@@ -471,14 +383,6 @@ static struct spi_board_info mx27_3ds_spi_devs[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device *devices[] __initdata = {</div><div class='del'>-	&amp;mx27_3ds_ov2640,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct mx2_camera_platform_data mx27_3ds_cam_pdata __initconst = {</div><div class='del'>-	.clk = 26000000,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct imxi2c_platform_data mx27_3ds_i2c0_data __initconst = {</div><div class='ctx'> 	.bitrate = 100000,</div><div class='ctx'> };</div><div class='hunk'>@@ -498,7 +402,6 @@ static void __init mx27pdk_init(void)</div><div class='ctx'> 	imx27_add_spi_imx0(&amp;spi1_pdata);</div><div class='ctx'> </div><div class='ctx'> 	imx27_add_imx_i2c(0, &amp;mx27_3ds_i2c0_data);</div><div class='del'>-	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='ctx'> 	imx27_add_imx_fb(&amp;mx27_3ds_fb_data);</div><div class='ctx'> </div><div class='ctx'> 	imx27_add_imx_ssi(0, &amp;mx27_3ds_ssi_pdata);</div><div class='hunk'>@@ -506,8 +409,6 @@ static void __init mx27pdk_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __init mx27pdk_late_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	mx27_3ds_sdhc1_enable_level_translator();</div><div class='ctx'> 	imx27_add_mxc_mmc(0, &amp;sdhc1_pdata);</div><div class='ctx'> </div><div class='hunk'>@@ -531,14 +432,6 @@ static void __init mx27pdk_late_init(void)</div><div class='ctx'> 	if (mxc_expio_init(MX27_CS5_BASE_ADDR, IMX_GPIO_NR(3, 28)))</div><div class='ctx'> 		pr_warn("Init of the debugboard failed, all devices on the debugboard are unusable.\n");</div><div class='ctx'> </div><div class='del'>-	ret = gpio_request_array(mx27_3ds_camera_gpios,</div><div class='del'>-				 ARRAY_SIZE(mx27_3ds_camera_gpios));</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("Failed to request camera gpios");</div><div class='del'>-		iclink_ov2640.power = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	imx27_add_mx2_camera(&amp;mx27_3ds_cam_pdata);</div><div class='ctx'> </div><div class='ctx'> 	imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c<br/>index 12b8a52c9cb4..558e5f8589cb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-mx31_3ds.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/mach-mx31_3ds.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-mx31_3ds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-mx31_3ds.c</a></div><div class='hunk'>@@ -26,16 +26,12 @@</div><div class='ctx'> #include &lt;linux/regulator/machine.h&gt;</div><div class='ctx'> #include &lt;linux/usb/otg.h&gt;</div><div class='ctx'> #include &lt;linux/usb/ulpi.h&gt;</div><div class='del'>-#include &lt;linux/memblock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;media/soc_camera.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/memblock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "3ds_debugboard.h"</div><div class='ctx'> #include "common.h"</div><div class='hunk'>@@ -137,23 +133,6 @@ static int mx31_3ds_pins[] = {</div><div class='ctx'> 	MX31_PIN_HSYNC__HSYNC,</div><div class='ctx'> 	MX31_PIN_FPSHIFT__FPSHIFT,</div><div class='ctx'> 	MX31_PIN_CONTRAST__CONTRAST,</div><div class='del'>-	/* CSI */</div><div class='del'>-	MX31_PIN_CSI_D6__CSI_D6,</div><div class='del'>-	MX31_PIN_CSI_D7__CSI_D7,</div><div class='del'>-	MX31_PIN_CSI_D8__CSI_D8,</div><div class='del'>-	MX31_PIN_CSI_D9__CSI_D9,</div><div class='del'>-	MX31_PIN_CSI_D10__CSI_D10,</div><div class='del'>-	MX31_PIN_CSI_D11__CSI_D11,</div><div class='del'>-	MX31_PIN_CSI_D12__CSI_D12,</div><div class='del'>-	MX31_PIN_CSI_D13__CSI_D13,</div><div class='del'>-	MX31_PIN_CSI_D14__CSI_D14,</div><div class='del'>-	MX31_PIN_CSI_D15__CSI_D15,</div><div class='del'>-	MX31_PIN_CSI_HSYNC__CSI_HSYNC,</div><div class='del'>-	MX31_PIN_CSI_MCLK__CSI_MCLK,</div><div class='del'>-	MX31_PIN_CSI_PIXCLK__CSI_PIXCLK,</div><div class='del'>-	MX31_PIN_CSI_VSYNC__CSI_VSYNC,</div><div class='del'>-	MX31_PIN_CSI_D5__GPIO3_5, /* CMOS PWDN */</div><div class='del'>-	IOMUX_MODE(MX31_PIN_RI_DTE1, IOMUX_CONFIG_GPIO), /* CMOS reset */</div><div class='ctx'> 	/* SSI */</div><div class='ctx'> 	MX31_PIN_STXD4__STXD4,</div><div class='ctx'> 	MX31_PIN_SRXD4__SRXD4,</div><div class='hunk'>@@ -162,98 +141,6 @@ static int mx31_3ds_pins[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Camera support</div><div class='del'>- */</div><div class='del'>-static phys_addr_t mx3_camera_base __initdata;</div><div class='del'>-#define MX31_3DS_CAMERA_BUF_SIZE SZ_8M</div><div class='del'>-</div><div class='del'>-#define MX31_3DS_GPIO_CAMERA_PW IOMUX_TO_GPIO(MX31_PIN_CSI_D5)</div><div class='del'>-#define MX31_3DS_GPIO_CAMERA_RST IOMUX_TO_GPIO(MX31_PIN_RI_DTE1)</div><div class='del'>-</div><div class='del'>-static struct gpio mx31_3ds_camera_gpios[] = {</div><div class='del'>-	{ MX31_3DS_GPIO_CAMERA_PW, GPIOF_OUT_INIT_HIGH, "camera-power" },</div><div class='del'>-	{ MX31_3DS_GPIO_CAMERA_RST, GPIOF_OUT_INIT_HIGH, "camera-reset" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct mx3_camera_pdata mx31_3ds_camera_pdata __initconst = {</div><div class='del'>-	.flags = MX3_CAMERA_DATAWIDTH_10,</div><div class='del'>-	.mclk_10khz = 2600,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mx31_3ds_init_camera(void)</div><div class='del'>-{</div><div class='del'>-	int dma, ret = -ENOMEM;</div><div class='del'>-	struct platform_device *pdev =</div><div class='del'>-		imx31_alloc_mx3_camera(&amp;mx31_3ds_camera_pdata);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(pdev))</div><div class='del'>-		return PTR_ERR(pdev);</div><div class='del'>-</div><div class='del'>-	if (!mx3_camera_base)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	dma = dma_declare_coherent_memory(&amp;pdev-&gt;dev,</div><div class='del'>-					mx3_camera_base, mx3_camera_base,</div><div class='del'>-					MX31_3DS_CAMERA_BUF_SIZE,</div><div class='del'>-					DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);</div><div class='del'>-</div><div class='del'>-	if (!(dma &amp; DMA_MEMORY_MAP))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = platform_device_add(pdev);</div><div class='del'>-	if (ret)</div><div class='del'>-err:</div><div class='del'>-		platform_device_put(pdev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mx31_3ds_camera_power(struct device *dev, int on)</div><div class='del'>-{</div><div class='del'>-	/* enable or disable the camera */</div><div class='del'>-	pr_debug("%s: %s the camera\n", __func__, on ? "ENABLE" : "DISABLE");</div><div class='del'>-	gpio_set_value(MX31_3DS_GPIO_CAMERA_PW, on ? 0 : 1);</div><div class='del'>-</div><div class='del'>-	if (!on)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* If enabled, give a reset impulse */</div><div class='del'>-	gpio_set_value(MX31_3DS_GPIO_CAMERA_RST, 0);</div><div class='del'>-	msleep(20);</div><div class='del'>-	gpio_set_value(MX31_3DS_GPIO_CAMERA_RST, 1);</div><div class='del'>-	msleep(100);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct i2c_board_info mx31_3ds_i2c_camera = {</div><div class='del'>-	I2C_BOARD_INFO("ov2640", 0x30),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_bulk_data mx31_3ds_camera_regs[] = {</div><div class='del'>-	{ .supply = "cmos_vcore" },</div><div class='del'>-	{ .supply = "cmos_2v8" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct soc_camera_link iclink_ov2640 = {</div><div class='del'>-	.bus_id		= 0,</div><div class='del'>-	.board_info	= &amp;mx31_3ds_i2c_camera,</div><div class='del'>-	.i2c_adapter_id	= 0,</div><div class='del'>-	.power		= mx31_3ds_camera_power,</div><div class='del'>-	.regulators	= mx31_3ds_camera_regs,</div><div class='del'>-	.num_regulators	= ARRAY_SIZE(mx31_3ds_camera_regs),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device mx31_3ds_ov2640 = {</div><div class='del'>-	.name	= "soc-camera-pdrv",</div><div class='del'>-	.id	= 0,</div><div class='del'>-	.dev	= {</div><div class='del'>-		.platform_data = &amp;iclink_ov2640,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * FB support</div><div class='ctx'>  */</div><div class='ctx'> static const struct fb_videomode fb_modedb[] = {</div><div class='hunk'>@@ -410,7 +297,6 @@ static struct regulator_init_data vmmc2_init = {</div><div class='ctx'> </div><div class='ctx'> static struct regulator_consumer_supply vmmc1_consumers[] = {</div><div class='ctx'> 	REGULATOR_SUPPLY("vcore", "spi0.0"),</div><div class='del'>-	REGULATOR_SUPPLY("cmos_2v8", "soc-camera-pdrv.0"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct regulator_init_data vmmc1_init = {</div><div class='hunk'>@@ -441,22 +327,6 @@ static struct regulator_init_data vgen_init = {</div><div class='ctx'> 	.consumer_supplies = vgen_consumers,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_consumer_supply vvib_consumers[] = {</div><div class='del'>-	REGULATOR_SUPPLY("cmos_vcore", "soc-camera-pdrv.0"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data vvib_init = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV = 1300000,</div><div class='del'>-		.max_uV = 1300000,</div><div class='del'>-		.apply_uV = 1,</div><div class='del'>-		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |</div><div class='del'>-				  REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies = ARRAY_SIZE(vvib_consumers),</div><div class='del'>-	.consumer_supplies = vvib_consumers,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = MC13783_REG_PWGT1SPI, /* Power Gate for ARM core. */</div><div class='hunk'>@@ -480,9 +350,6 @@ static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id = MC13783_REG_VGEN,  /* Power LCD */</div><div class='ctx'> 		.init_data = &amp;vgen_init,</div><div class='del'>-	}, {</div><div class='del'>-		.id = MC13783_REG_VVIB,  /* Power CMOS */</div><div class='del'>-		.init_data = &amp;vvib_init,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -688,10 +555,6 @@ static const struct imxi2c_platform_data mx31_3ds_i2c0_data __initconst = {</div><div class='ctx'> 	.bitrate = 100000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device *devices[] __initdata = {</div><div class='del'>-	&amp;mx31_3ds_ov2640,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init mx31_3ds_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	imx31_soc_init();</div><div class='hunk'>@@ -723,14 +586,10 @@ static void __init mx31_3ds_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __init mx31_3ds_late(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	mx31_3ds_spi_devs[0].irq = gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_3));</div><div class='ctx'> 	spi_register_board_info(mx31_3ds_spi_devs,</div><div class='ctx'> 				ARRAY_SIZE(mx31_3ds_spi_devs));</div><div class='ctx'> </div><div class='del'>-	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='del'>-</div><div class='ctx'> 	mx31_3ds_usbotg_init();</div><div class='ctx'> 	if (otg_mode_host) {</div><div class='ctx'> 		otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |</div><div class='hunk'>@@ -751,17 +610,6 @@ static void __init mx31_3ds_late(void)</div><div class='ctx'> 		       "devices on the debug board are unusable.\n");</div><div class='ctx'> </div><div class='ctx'> 	imx31_add_mxc_mmc(0, &amp;sdhc1_pdata);</div><div class='del'>-</div><div class='del'>-	/* CSI */</div><div class='del'>-	/* Camera power: default - off */</div><div class='del'>-	ret = gpio_request_array(mx31_3ds_camera_gpios,</div><div class='del'>-				 ARRAY_SIZE(mx31_3ds_camera_gpios));</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("Failed to request camera gpios");</div><div class='del'>-		iclink_ov2640.power = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mx31_3ds_init_camera();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init mx31_3ds_timer_init(void)</div><div class='hunk'>@@ -769,13 +617,6 @@ static void __init mx31_3ds_timer_init(void)</div><div class='ctx'> 	mx31_clocks_init(26000000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init mx31_3ds_reserve(void)</div><div class='del'>-{</div><div class='del'>-	/* reserve MX31_3DS_CAMERA_BUF_SIZE bytes for mx3-camera */</div><div class='del'>-	mx3_camera_base = arm_memblock_steal(MX31_3DS_CAMERA_BUF_SIZE,</div><div class='del'>-					 MX31_3DS_CAMERA_BUF_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")</div><div class='ctx'> 	/* Maintainer: Freescale Semiconductor, Inc. */</div><div class='ctx'> 	.atag_offset = 0x100,</div><div class='hunk'>@@ -785,6 +626,5 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")</div><div class='ctx'> 	.init_time	= mx31_3ds_timer_init,</div><div class='ctx'> 	.init_machine = mx31_3ds_init,</div><div class='ctx'> 	.init_late	= mx31_3ds_late,</div><div class='del'>-	.reserve = mx31_3ds_reserve,</div><div class='ctx'> 	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c<br/>index c8c2e0956048..1c33a6ce326c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-mx35_3ds.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/mach-mx35_3ds.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-mx35_3ds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-mx35_3ds.c</a></div><div class='hunk'>@@ -41,12 +41,9 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/memblock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/platform_lcd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;media/soc_camera.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "3ds_debugboard.h"</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "devices-imx35.h"</div><div class='hunk'>@@ -233,83 +230,10 @@ static const iomux_v3_cfg_t mx35pdk_pads[] __initconst = {</div><div class='ctx'> 	MX35_PAD_D3_VSYNC__IPU_DISPB_D3_VSYNC,</div><div class='ctx'> 	MX35_PAD_D3_REV__IPU_DISPB_D3_REV,</div><div class='ctx'> 	MX35_PAD_D3_CLS__IPU_DISPB_D3_CLS,</div><div class='del'>-	/* CSI */</div><div class='del'>-	MX35_PAD_TX1__IPU_CSI_D_6,</div><div class='del'>-	MX35_PAD_TX0__IPU_CSI_D_7,</div><div class='del'>-	MX35_PAD_CSI_D8__IPU_CSI_D_8,</div><div class='del'>-	MX35_PAD_CSI_D9__IPU_CSI_D_9,</div><div class='del'>-	MX35_PAD_CSI_D10__IPU_CSI_D_10,</div><div class='del'>-	MX35_PAD_CSI_D11__IPU_CSI_D_11,</div><div class='del'>-	MX35_PAD_CSI_D12__IPU_CSI_D_12,</div><div class='del'>-	MX35_PAD_CSI_D13__IPU_CSI_D_13,</div><div class='del'>-	MX35_PAD_CSI_D14__IPU_CSI_D_14,</div><div class='del'>-	MX35_PAD_CSI_D15__IPU_CSI_D_15,</div><div class='del'>-	MX35_PAD_CSI_HSYNC__IPU_CSI_HSYNC,</div><div class='del'>-	MX35_PAD_CSI_MCLK__IPU_CSI_MCLK,</div><div class='del'>-	MX35_PAD_CSI_PIXCLK__IPU_CSI_PIXCLK,</div><div class='del'>-	MX35_PAD_CSI_VSYNC__IPU_CSI_VSYNC,</div><div class='ctx'> 	/*PMIC IRQ*/</div><div class='ctx'> 	MX35_PAD_GPIO2_0__GPIO2_0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Camera support</div><div class='del'>-*/</div><div class='del'>-static phys_addr_t mx3_camera_base __initdata;</div><div class='del'>-#define MX35_3DS_CAMERA_BUF_SIZE SZ_8M</div><div class='del'>-</div><div class='del'>-static const struct mx3_camera_pdata mx35_3ds_camera_pdata __initconst = {</div><div class='del'>-	.flags = MX3_CAMERA_DATAWIDTH_8,</div><div class='del'>-	.mclk_10khz = 2000,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init imx35_3ds_init_camera(void)</div><div class='del'>-{</div><div class='del'>-	int dma, ret = -ENOMEM;</div><div class='del'>-	struct platform_device *pdev =</div><div class='del'>-		imx35_alloc_mx3_camera(&amp;mx35_3ds_camera_pdata);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(pdev))</div><div class='del'>-		return PTR_ERR(pdev);</div><div class='del'>-</div><div class='del'>-	if (!mx3_camera_base)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	dma = dma_declare_coherent_memory(&amp;pdev-&gt;dev,</div><div class='del'>-					mx3_camera_base, mx3_camera_base,</div><div class='del'>-					MX35_3DS_CAMERA_BUF_SIZE,</div><div class='del'>-					DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);</div><div class='del'>-</div><div class='del'>-	if (!(dma &amp; DMA_MEMORY_MAP))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = platform_device_add(pdev);</div><div class='del'>-	if (ret)</div><div class='del'>-err:</div><div class='del'>-		platform_device_put(pdev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct i2c_board_info mx35_3ds_i2c_camera = {</div><div class='del'>-	I2C_BOARD_INFO("ov2640", 0x30),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct soc_camera_link iclink_ov2640 = {</div><div class='del'>-	.bus_id		= 0,</div><div class='del'>-	.board_info	= &amp;mx35_3ds_i2c_camera,</div><div class='del'>-	.i2c_adapter_id	= 0,</div><div class='del'>-	.power		= NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device mx35_3ds_ov2640 = {</div><div class='del'>-	.name	= "soc-camera-pdrv",</div><div class='del'>-	.id	= 0,</div><div class='del'>-	.dev	= {</div><div class='del'>-		.platform_data = &amp;iclink_ov2640,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct regulator_consumer_supply sw1_consumers[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.supply = "cpu_vcc",</div><div class='hunk'>@@ -321,10 +245,6 @@ static struct regulator_consumer_supply vcam_consumers[] = {</div><div class='ctx'> 	REGULATOR_SUPPLY("VDDA", "0-000a"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_consumer_supply vaudio_consumers[] = {</div><div class='del'>-	REGULATOR_SUPPLY("cmos_vio", "soc-camera-pdrv.0"),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct regulator_init_data sw1_init = {</div><div class='ctx'> 	.constraints = {</div><div class='ctx'> 		.name = "SW1",</div><div class='hunk'>@@ -405,18 +325,6 @@ static struct regulator_init_data vvideo_init = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_init_data vaudio_init = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.name = "VAUDIO",</div><div class='del'>-		.min_uV = 2300000,</div><div class='del'>-		.max_uV = 3000000,</div><div class='del'>-		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,</div><div class='del'>-		.boot_on = 1</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies = ARRAY_SIZE(vaudio_consumers),</div><div class='del'>-	.consumer_supplies = vaudio_consumers,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct regulator_init_data vcam_init = {</div><div class='ctx'> 	.constraints = {</div><div class='ctx'> 		.name = "VCAM",</div><div class='hunk'>@@ -460,7 +368,6 @@ static struct mc13xxx_regulator_init_data mx35_3ds_regulators[] = {</div><div class='ctx'> 	{ .id = MC13892_VDIG, .init_data = &amp;vdig_init },</div><div class='ctx'> 	{ .id = MC13892_VUSB2, .init_data = &amp;vusb2_init },</div><div class='ctx'> 	{ .id = MC13892_VVIDEO, .init_data = &amp;vvideo_init },</div><div class='del'>-	{ .id = MC13892_VAUDIO, .init_data = &amp;vaudio_init },</div><div class='ctx'> 	{ .id = MC13892_VCAM, .init_data = &amp;vcam_init },</div><div class='ctx'> 	{ .id = MC13892_VGEN1, .init_data = &amp;vgen1_init },</div><div class='ctx'> 	{ .id = MC13892_VGEN2, .init_data = &amp;vgen2_init },</div><div class='hunk'>@@ -583,8 +490,6 @@ static void __init mx35_3ds_init(void)</div><div class='ctx'> 		0, i2c_devices_3ds, ARRAY_SIZE(i2c_devices_3ds));</div><div class='ctx'> </div><div class='ctx'> 	imx35_add_ipu_core();</div><div class='del'>-	platform_device_register(&amp;mx35_3ds_ov2640);</div><div class='del'>-	imx35_3ds_init_camera();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init mx35_3ds_late_init(void)</div><div class='hunk'>@@ -607,13 +512,6 @@ static void __init mx35pdk_timer_init(void)</div><div class='ctx'> 	mx35_clocks_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init mx35_3ds_reserve(void)</div><div class='del'>-{</div><div class='del'>-	/* reserve MX35_3DS_CAMERA_BUF_SIZE bytes for mx3-camera */</div><div class='del'>-	mx3_camera_base = arm_memblock_steal(MX35_3DS_CAMERA_BUF_SIZE,</div><div class='del'>-					 MX35_3DS_CAMERA_BUF_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> MACHINE_START(MX35_3DS, "Freescale MX35PDK")</div><div class='ctx'> 	/* Maintainer: Freescale Semiconductor, Inc */</div><div class='ctx'> 	.atag_offset = 0x100,</div><div class='hunk'>@@ -623,6 +521,5 @@ MACHINE_START(MX35_3DS, "Freescale MX35PDK")</div><div class='ctx'> 	.init_time	= mx35pdk_timer_init,</div><div class='ctx'> 	.init_machine = mx35_3ds_init,</div><div class='ctx'> 	.init_late	= mx35_3ds_late_init,</div><div class='del'>-	.reserve = mx35_3ds_reserve,</div><div class='ctx'> 	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c<br/>index 9f0f55b0422c..b787ba6897e4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-pcm037.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/mach-pcm037.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/mach-pcm037.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mach-pcm037.c</a></div><div class='hunk'>@@ -31,17 +31,13 @@</div><div class='ctx'> #include &lt;linux/usb/otg.h&gt;</div><div class='ctx'> #include &lt;linux/usb/ulpi.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/machine.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/fixed.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;media/soc_camera.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/memblock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "devices-imx31.h"</div><div class='hunk'>@@ -150,22 +146,6 @@ static unsigned int pcm037_pins[] = {</div><div class='ctx'> 	MX31_PIN_D3_SPL__D3_SPL,</div><div class='ctx'> 	MX31_PIN_D3_CLS__D3_CLS,</div><div class='ctx'> 	MX31_PIN_LCS0__GPIO3_23,</div><div class='del'>-	/* CSI */</div><div class='del'>-	IOMUX_MODE(MX31_PIN_CSI_D5, IOMUX_CONFIG_GPIO),</div><div class='del'>-	MX31_PIN_CSI_D6__CSI_D6,</div><div class='del'>-	MX31_PIN_CSI_D7__CSI_D7,</div><div class='del'>-	MX31_PIN_CSI_D8__CSI_D8,</div><div class='del'>-	MX31_PIN_CSI_D9__CSI_D9,</div><div class='del'>-	MX31_PIN_CSI_D10__CSI_D10,</div><div class='del'>-	MX31_PIN_CSI_D11__CSI_D11,</div><div class='del'>-	MX31_PIN_CSI_D12__CSI_D12,</div><div class='del'>-	MX31_PIN_CSI_D13__CSI_D13,</div><div class='del'>-	MX31_PIN_CSI_D14__CSI_D14,</div><div class='del'>-	MX31_PIN_CSI_D15__CSI_D15,</div><div class='del'>-	MX31_PIN_CSI_HSYNC__CSI_HSYNC,</div><div class='del'>-	MX31_PIN_CSI_MCLK__CSI_MCLK,</div><div class='del'>-	MX31_PIN_CSI_PIXCLK__CSI_PIXCLK,</div><div class='del'>-	MX31_PIN_CSI_VSYNC__CSI_VSYNC,</div><div class='ctx'> 	/* GPIO */</div><div class='ctx'> 	IOMUX_MODE(MX31_PIN_ATA_DMACK, IOMUX_CONFIG_GPIO),</div><div class='ctx'> 	/* OTG */</div><div class='hunk'>@@ -289,34 +269,6 @@ static struct at24_platform_data board_eeprom = {</div><div class='ctx'> 	.flags = AT24_FLAG_ADDR16,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int pcm037_camera_power(struct device *dev, int on)</div><div class='del'>-{</div><div class='del'>-	/* disable or enable the camera in X7 or X8 PCM970 connector */</div><div class='del'>-	gpio_set_value(IOMUX_TO_GPIO(MX31_PIN_CSI_D5), !on);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct i2c_board_info pcm037_i2c_camera[] = {</div><div class='del'>-	{</div><div class='del'>-		I2C_BOARD_INFO("mt9t031", 0x5d),</div><div class='del'>-	}, {</div><div class='del'>-		I2C_BOARD_INFO("mt9v022", 0x48),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct soc_camera_link iclink_mt9v022 = {</div><div class='del'>-	.bus_id		= 0,		/* Must match with the camera ID */</div><div class='del'>-	.board_info	= &amp;pcm037_i2c_camera[1],</div><div class='del'>-	.i2c_adapter_id	= 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct soc_camera_link iclink_mt9t031 = {</div><div class='del'>-	.bus_id		= 0,		/* Must match with the camera ID */</div><div class='del'>-	.power		= pcm037_camera_power,</div><div class='del'>-	.board_info	= &amp;pcm037_i2c_camera[0],</div><div class='del'>-	.i2c_adapter_id	= 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct i2c_board_info pcm037_i2c_devices[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */</div><div class='hunk'>@@ -326,22 +278,6 @@ static struct i2c_board_info pcm037_i2c_devices[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device pcm037_mt9t031 = {</div><div class='del'>-	.name	= "soc-camera-pdrv",</div><div class='del'>-	.id	= 0,</div><div class='del'>-	.dev	= {</div><div class='del'>-		.platform_data = &amp;iclink_mt9t031,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device pcm037_mt9v022 = {</div><div class='del'>-	.name	= "soc-camera-pdrv",</div><div class='del'>-	.id	= 1,</div><div class='del'>-	.dev	= {</div><div class='del'>-		.platform_data = &amp;iclink_mt9v022,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Not connected by default */</div><div class='ctx'> #ifdef PCM970_SDHC_RW_SWITCH</div><div class='ctx'> static int pcm970_sdhc1_get_ro(struct device *dev)</div><div class='hunk'>@@ -403,42 +339,9 @@ static const struct imxmmc_platform_data sdhc_pdata __initconst = {</div><div class='ctx'> 	.exit = pcm970_sdhc1_exit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mx3_camera_pdata camera_pdata __initdata = {</div><div class='del'>-	.flags		= MX3_CAMERA_DATAWIDTH_8 | MX3_CAMERA_DATAWIDTH_10,</div><div class='del'>-	.mclk_10khz	= 2000,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static phys_addr_t mx3_camera_base __initdata;</div><div class='del'>-#define MX3_CAMERA_BUF_SIZE SZ_4M</div><div class='del'>-</div><div class='del'>-static int __init pcm037_init_camera(void)</div><div class='del'>-{</div><div class='del'>-	int dma, ret = -ENOMEM;</div><div class='del'>-	struct platform_device *pdev = imx31_alloc_mx3_camera(&amp;camera_pdata);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(pdev))</div><div class='del'>-		return PTR_ERR(pdev);</div><div class='del'>-</div><div class='del'>-	dma = dma_declare_coherent_memory(&amp;pdev-&gt;dev,</div><div class='del'>-					mx3_camera_base, mx3_camera_base,</div><div class='del'>-					MX3_CAMERA_BUF_SIZE,</div><div class='del'>-					DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);</div><div class='del'>-	if (!(dma &amp; DMA_MEMORY_MAP))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = platform_device_add(pdev);</div><div class='del'>-	if (ret)</div><div class='del'>-err:</div><div class='del'>-		platform_device_put(pdev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;pcm037_flash,</div><div class='ctx'> 	&amp;pcm037_sram_device,</div><div class='del'>-	&amp;pcm037_mt9t031,</div><div class='del'>-	&amp;pcm037_mt9v022,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct fb_videomode fb_modedb[] = {</div><div class='hunk'>@@ -651,13 +554,6 @@ static void __init pcm037_timer_init(void)</div><div class='ctx'> 	mx31_clocks_init(26000000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init pcm037_reserve(void)</div><div class='del'>-{</div><div class='del'>-	/* reserve 4 MiB for mx3-camera */</div><div class='del'>-	mx3_camera_base = arm_memblock_steal(MX3_CAMERA_BUF_SIZE,</div><div class='del'>-			MX3_CAMERA_BUF_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init pcm037_init_late(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -677,16 +573,6 @@ static void __init pcm037_init_late(void)</div><div class='ctx'> </div><div class='ctx'> 	imx31_add_mxc_mmc(0, &amp;sdhc_pdata);</div><div class='ctx'> </div><div class='del'>-	/* CSI */</div><div class='del'>-	/* Camera power: default - off */</div><div class='del'>-	ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_CSI_D5), "mt9t031-power");</div><div class='del'>-	if (!ret)</div><div class='del'>-		gpio_direction_output(IOMUX_TO_GPIO(MX31_PIN_CSI_D5), 1);</div><div class='del'>-	else</div><div class='del'>-		iclink_mt9t031.power = NULL;</div><div class='del'>-</div><div class='del'>-	pcm037_init_camera();</div><div class='del'>-</div><div class='ctx'> 	pcm970_sja1000_resources[1].start =</div><div class='ctx'> 			gpio_to_irq(IOMUX_TO_GPIO(IOMUX_PIN(48, 105)));</div><div class='ctx'> 	pcm970_sja1000_resources[1].end =</div><div class='hunk'>@@ -699,7 +585,6 @@ static void __init pcm037_init_late(void)</div><div class='ctx'> MACHINE_START(PCM037, "Phytec Phycore pcm037")</div><div class='ctx'> 	/* Maintainer: Pengutronix */</div><div class='ctx'> 	.atag_offset = 0x100,</div><div class='del'>-	.reserve = pcm037_reserve,</div><div class='ctx'> 	.map_io = mx31_map_io,</div><div class='ctx'> 	.init_early = imx31_init_early,</div><div class='ctx'> 	.init_irq = mx31_init_irq,</div><div class='head'>diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c<br/>index db9621c718ec..c03bf28d8bbc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/mmdc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/mmdc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/mmdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mmdc.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2011 Freescale Semiconductor, Inc.</div><div class='add'>+ * Copyright 2011,2016 Freescale Semiconductor, Inc.</div><div class='ctx'>  * Copyright 2011 Linaro Ltd.</div><div class='ctx'>  *</div><div class='ctx'>  * The code contained herein is licensed under the GNU General Public</div><div class='hunk'>@@ -10,12 +10,16 @@</div><div class='ctx'>  * http://www.gnu.org/copyleft/gpl.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='hunk'>@@ -27,8 +31,499 @@</div><div class='ctx'> #define BM_MMDC_MDMISC_DDR_TYPE	0x18</div><div class='ctx'> #define BP_MMDC_MDMISC_DDR_TYPE	0x3</div><div class='ctx'> </div><div class='add'>+#define TOTAL_CYCLES		0x0</div><div class='add'>+#define BUSY_CYCLES		0x1</div><div class='add'>+#define READ_ACCESSES		0x2</div><div class='add'>+#define WRITE_ACCESSES		0x3</div><div class='add'>+#define READ_BYTES		0x4</div><div class='add'>+#define WRITE_BYTES		0x5</div><div class='add'>+</div><div class='add'>+/* Enables, resets, freezes, overflow profiling*/</div><div class='add'>+#define DBG_DIS			0x0</div><div class='add'>+#define DBG_EN			0x1</div><div class='add'>+#define DBG_RST			0x2</div><div class='add'>+#define PRF_FRZ			0x4</div><div class='add'>+#define CYC_OVF			0x8</div><div class='add'>+#define PROFILE_SEL		0x10</div><div class='add'>+</div><div class='add'>+#define MMDC_MADPCR0	0x410</div><div class='add'>+#define MMDC_MADPSR0	0x418</div><div class='add'>+#define MMDC_MADPSR1	0x41C</div><div class='add'>+#define MMDC_MADPSR2	0x420</div><div class='add'>+#define MMDC_MADPSR3	0x424</div><div class='add'>+#define MMDC_MADPSR4	0x428</div><div class='add'>+#define MMDC_MADPSR5	0x42C</div><div class='add'>+</div><div class='add'>+#define MMDC_NUM_COUNTERS	6</div><div class='add'>+</div><div class='add'>+#define MMDC_FLAG_PROFILE_SEL	0x1</div><div class='add'>+</div><div class='add'>+#define to_mmdc_pmu(p) container_of(p, struct mmdc_pmu, pmu)</div><div class='add'>+</div><div class='ctx'> static int ddr_type;</div><div class='ctx'> </div><div class='add'>+struct fsl_mmdc_devtype_data {</div><div class='add'>+	unsigned int flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct fsl_mmdc_devtype_data imx6q_data = {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct fsl_mmdc_devtype_data imx6qp_data = {</div><div class='add'>+	.flags = MMDC_FLAG_PROFILE_SEL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id imx_mmdc_dt_ids[] = {</div><div class='add'>+	{ .compatible = "fsl,imx6q-mmdc", .data = (void *)&amp;imx6q_data},</div><div class='add'>+	{ .compatible = "fsl,imx6qp-mmdc", .data = (void *)&amp;imx6qp_data},</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PERF_EVENTS</div><div class='add'>+</div><div class='add'>+static enum cpuhp_state cpuhp_mmdc_state;</div><div class='add'>+static DEFINE_IDA(mmdc_ida);</div><div class='add'>+</div><div class='add'>+PMU_EVENT_ATTR_STRING(total-cycles, mmdc_pmu_total_cycles, "event=0x00")</div><div class='add'>+PMU_EVENT_ATTR_STRING(busy-cycles, mmdc_pmu_busy_cycles, "event=0x01")</div><div class='add'>+PMU_EVENT_ATTR_STRING(read-accesses, mmdc_pmu_read_accesses, "event=0x02")</div><div class='add'>+PMU_EVENT_ATTR_STRING(write-accesses, mmdc_pmu_write_accesses, "config=0x03")</div><div class='add'>+PMU_EVENT_ATTR_STRING(read-bytes, mmdc_pmu_read_bytes, "event=0x04")</div><div class='add'>+PMU_EVENT_ATTR_STRING(read-bytes.unit, mmdc_pmu_read_bytes_unit, "MB");</div><div class='add'>+PMU_EVENT_ATTR_STRING(read-bytes.scale, mmdc_pmu_read_bytes_scale, "0.000001");</div><div class='add'>+PMU_EVENT_ATTR_STRING(write-bytes, mmdc_pmu_write_bytes, "event=0x05")</div><div class='add'>+PMU_EVENT_ATTR_STRING(write-bytes.unit, mmdc_pmu_write_bytes_unit, "MB");</div><div class='add'>+PMU_EVENT_ATTR_STRING(write-bytes.scale, mmdc_pmu_write_bytes_scale, "0.000001");</div><div class='add'>+</div><div class='add'>+struct mmdc_pmu {</div><div class='add'>+	struct pmu pmu;</div><div class='add'>+	void __iomem *mmdc_base;</div><div class='add'>+	cpumask_t cpu;</div><div class='add'>+	struct hrtimer hrtimer;</div><div class='add'>+	unsigned int active_events;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct perf_event *mmdc_events[MMDC_NUM_COUNTERS];</div><div class='add'>+	struct hlist_node node;</div><div class='add'>+	struct fsl_mmdc_devtype_data *devtype_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Polling period is set to one second, overflow of total-cycles (the fastest</div><div class='add'>+ * increasing counter) takes ten seconds so one second is safe</div><div class='add'>+ */</div><div class='add'>+static unsigned int mmdc_pmu_poll_period_us = 1000000;</div><div class='add'>+</div><div class='add'>+module_param_named(pmu_pmu_poll_period_us, mmdc_pmu_poll_period_us, uint,</div><div class='add'>+		S_IRUGO | S_IWUSR);</div><div class='add'>+</div><div class='add'>+static ktime_t mmdc_pmu_timer_period(void)</div><div class='add'>+{</div><div class='add'>+	return ns_to_ktime((u64)mmdc_pmu_poll_period_us * 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mmdc_pmu_cpumask_show(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct mmdc_pmu *pmu_mmdc = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return cpumap_print_to_pagebuf(true, buf, &amp;pmu_mmdc-&gt;cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_attribute mmdc_pmu_cpumask_attr =</div><div class='add'>+	__ATTR(cpumask, S_IRUGO, mmdc_pmu_cpumask_show, NULL);</div><div class='add'>+</div><div class='add'>+static struct attribute *mmdc_pmu_cpumask_attrs[] = {</div><div class='add'>+	&amp;mmdc_pmu_cpumask_attr.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group mmdc_pmu_cpumask_attr_group = {</div><div class='add'>+	.attrs = mmdc_pmu_cpumask_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute *mmdc_pmu_events_attrs[] = {</div><div class='add'>+	&amp;mmdc_pmu_total_cycles.attr.attr,</div><div class='add'>+	&amp;mmdc_pmu_busy_cycles.attr.attr,</div><div class='add'>+	&amp;mmdc_pmu_read_accesses.attr.attr,</div><div class='add'>+	&amp;mmdc_pmu_write_accesses.attr.attr,</div><div class='add'>+	&amp;mmdc_pmu_read_bytes.attr.attr,</div><div class='add'>+	&amp;mmdc_pmu_read_bytes_unit.attr.attr,</div><div class='add'>+	&amp;mmdc_pmu_read_bytes_scale.attr.attr,</div><div class='add'>+	&amp;mmdc_pmu_write_bytes.attr.attr,</div><div class='add'>+	&amp;mmdc_pmu_write_bytes_unit.attr.attr,</div><div class='add'>+	&amp;mmdc_pmu_write_bytes_scale.attr.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group mmdc_pmu_events_attr_group = {</div><div class='add'>+	.name = "events",</div><div class='add'>+	.attrs = mmdc_pmu_events_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+PMU_FORMAT_ATTR(event, "config:0-63");</div><div class='add'>+static struct attribute *mmdc_pmu_format_attrs[] = {</div><div class='add'>+	&amp;format_attr_event.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group mmdc_pmu_format_attr_group = {</div><div class='add'>+	.name = "format",</div><div class='add'>+	.attrs = mmdc_pmu_format_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *attr_groups[] = {</div><div class='add'>+	&amp;mmdc_pmu_events_attr_group,</div><div class='add'>+	&amp;mmdc_pmu_format_attr_group,</div><div class='add'>+	&amp;mmdc_pmu_cpumask_attr_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 mmdc_pmu_read_counter(struct mmdc_pmu *pmu_mmdc, int cfg)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mmdc_base, *reg;</div><div class='add'>+</div><div class='add'>+	mmdc_base = pmu_mmdc-&gt;mmdc_base;</div><div class='add'>+</div><div class='add'>+	switch (cfg) {</div><div class='add'>+	case TOTAL_CYCLES:</div><div class='add'>+		reg = mmdc_base + MMDC_MADPSR0;</div><div class='add'>+		break;</div><div class='add'>+	case BUSY_CYCLES:</div><div class='add'>+		reg = mmdc_base + MMDC_MADPSR1;</div><div class='add'>+		break;</div><div class='add'>+	case READ_ACCESSES:</div><div class='add'>+		reg = mmdc_base + MMDC_MADPSR2;</div><div class='add'>+		break;</div><div class='add'>+	case WRITE_ACCESSES:</div><div class='add'>+		reg = mmdc_base + MMDC_MADPSR3;</div><div class='add'>+		break;</div><div class='add'>+	case READ_BYTES:</div><div class='add'>+		reg = mmdc_base + MMDC_MADPSR4;</div><div class='add'>+		break;</div><div class='add'>+	case WRITE_BYTES:</div><div class='add'>+		reg = mmdc_base + MMDC_MADPSR5;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return WARN_ONCE(1,</div><div class='add'>+			"invalid configuration %d for mmdc counter", cfg);</div><div class='add'>+	}</div><div class='add'>+	return readl(reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mmdc_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node)</div><div class='add'>+{</div><div class='add'>+	struct mmdc_pmu *pmu_mmdc = hlist_entry_safe(node, struct mmdc_pmu, node);</div><div class='add'>+	int target;</div><div class='add'>+</div><div class='add'>+	if (!cpumask_test_and_clear_cpu(cpu, &amp;pmu_mmdc-&gt;cpu))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	target = cpumask_any_but(cpu_online_mask, cpu);</div><div class='add'>+	if (target &gt;= nr_cpu_ids)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	perf_pmu_migrate_context(&amp;pmu_mmdc-&gt;pmu, cpu, target);</div><div class='add'>+	cpumask_set_cpu(target, &amp;pmu_mmdc-&gt;cpu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool mmdc_pmu_group_event_is_valid(struct perf_event *event,</div><div class='add'>+					  struct pmu *pmu,</div><div class='add'>+					  unsigned long *used_counters)</div><div class='add'>+{</div><div class='add'>+	int cfg = event-&gt;attr.config;</div><div class='add'>+</div><div class='add'>+	if (is_software_event(event))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (event-&gt;pmu != pmu)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return !test_and_set_bit(cfg, used_counters);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Each event has a single fixed-purpose counter, so we can only have a</div><div class='add'>+ * single active event for each at any point in time. Here we just check</div><div class='add'>+ * for duplicates, and rely on mmdc_pmu_event_init to verify that the HW</div><div class='add'>+ * event numbers are valid.</div><div class='add'>+ */</div><div class='add'>+static bool mmdc_pmu_group_is_valid(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	struct pmu *pmu = event-&gt;pmu;</div><div class='add'>+	struct perf_event *leader = event-&gt;group_leader;</div><div class='add'>+	struct perf_event *sibling;</div><div class='add'>+	unsigned long counter_mask = 0;</div><div class='add'>+</div><div class='add'>+	set_bit(leader-&gt;attr.config, &amp;counter_mask);</div><div class='add'>+</div><div class='add'>+	if (event != leader) {</div><div class='add'>+		if (!mmdc_pmu_group_event_is_valid(event, pmu, &amp;counter_mask))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(sibling, &amp;leader-&gt;sibling_list, group_entry) {</div><div class='add'>+		if (!mmdc_pmu_group_event_is_valid(sibling, pmu, &amp;counter_mask))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mmdc_pmu_event_init(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	struct mmdc_pmu *pmu_mmdc = to_mmdc_pmu(event-&gt;pmu);</div><div class='add'>+	int cfg = event-&gt;attr.config;</div><div class='add'>+</div><div class='add'>+	if (event-&gt;attr.type != event-&gt;pmu-&gt;type)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (is_sampling_event(event) || event-&gt;attach_state &amp; PERF_ATTACH_TASK)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (event-&gt;cpu &lt; 0) {</div><div class='add'>+		dev_warn(pmu_mmdc-&gt;dev, "Can't provide per-task data!\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (event-&gt;attr.exclude_user		||</div><div class='add'>+			event-&gt;attr.exclude_kernel	||</div><div class='add'>+			event-&gt;attr.exclude_hv		||</div><div class='add'>+			event-&gt;attr.exclude_idle	||</div><div class='add'>+			event-&gt;attr.exclude_host	||</div><div class='add'>+			event-&gt;attr.exclude_guest	||</div><div class='add'>+			event-&gt;attr.sample_period)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (cfg &lt; 0 || cfg &gt;= MMDC_NUM_COUNTERS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!mmdc_pmu_group_is_valid(event))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	event-&gt;cpu = cpumask_first(&amp;pmu_mmdc-&gt;cpu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mmdc_pmu_event_update(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	struct mmdc_pmu *pmu_mmdc = to_mmdc_pmu(event-&gt;pmu);</div><div class='add'>+	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='add'>+	u64 delta, prev_raw_count, new_raw_count;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		prev_raw_count = local64_read(&amp;hwc-&gt;prev_count);</div><div class='add'>+		new_raw_count = mmdc_pmu_read_counter(pmu_mmdc,</div><div class='add'>+						      event-&gt;attr.config);</div><div class='add'>+	} while (local64_cmpxchg(&amp;hwc-&gt;prev_count, prev_raw_count,</div><div class='add'>+		new_raw_count) != prev_raw_count);</div><div class='add'>+</div><div class='add'>+	delta = (new_raw_count - prev_raw_count) &amp; 0xFFFFFFFF;</div><div class='add'>+</div><div class='add'>+	local64_add(delta, &amp;event-&gt;count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mmdc_pmu_event_start(struct perf_event *event, int flags)</div><div class='add'>+{</div><div class='add'>+	struct mmdc_pmu *pmu_mmdc = to_mmdc_pmu(event-&gt;pmu);</div><div class='add'>+	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='add'>+	void __iomem *mmdc_base, *reg;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	mmdc_base = pmu_mmdc-&gt;mmdc_base;</div><div class='add'>+	reg = mmdc_base + MMDC_MADPCR0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * hrtimer is required because mmdc does not provide an interrupt so</div><div class='add'>+	 * polling is necessary</div><div class='add'>+	 */</div><div class='add'>+	hrtimer_start(&amp;pmu_mmdc-&gt;hrtimer, mmdc_pmu_timer_period(),</div><div class='add'>+			HRTIMER_MODE_REL_PINNED);</div><div class='add'>+</div><div class='add'>+	local64_set(&amp;hwc-&gt;prev_count, 0);</div><div class='add'>+</div><div class='add'>+	writel(DBG_RST, reg);</div><div class='add'>+</div><div class='add'>+	val = DBG_EN;</div><div class='add'>+	if (pmu_mmdc-&gt;devtype_data-&gt;flags &amp; MMDC_FLAG_PROFILE_SEL)</div><div class='add'>+		val |= PROFILE_SEL;</div><div class='add'>+</div><div class='add'>+	writel(val, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mmdc_pmu_event_add(struct perf_event *event, int flags)</div><div class='add'>+{</div><div class='add'>+	struct mmdc_pmu *pmu_mmdc = to_mmdc_pmu(event-&gt;pmu);</div><div class='add'>+	struct hw_perf_event *hwc = &amp;event-&gt;hw;</div><div class='add'>+</div><div class='add'>+	int cfg = event-&gt;attr.config;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; PERF_EF_START)</div><div class='add'>+		mmdc_pmu_event_start(event, flags);</div><div class='add'>+</div><div class='add'>+	if (pmu_mmdc-&gt;mmdc_events[cfg] != NULL)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	pmu_mmdc-&gt;mmdc_events[cfg] = event;</div><div class='add'>+	pmu_mmdc-&gt;active_events++;</div><div class='add'>+</div><div class='add'>+	local64_set(&amp;hwc-&gt;prev_count, mmdc_pmu_read_counter(pmu_mmdc, cfg));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mmdc_pmu_event_stop(struct perf_event *event, int flags)</div><div class='add'>+{</div><div class='add'>+	struct mmdc_pmu *pmu_mmdc = to_mmdc_pmu(event-&gt;pmu);</div><div class='add'>+	void __iomem *mmdc_base, *reg;</div><div class='add'>+</div><div class='add'>+	mmdc_base = pmu_mmdc-&gt;mmdc_base;</div><div class='add'>+	reg = mmdc_base + MMDC_MADPCR0;</div><div class='add'>+</div><div class='add'>+	writel(PRF_FRZ, reg);</div><div class='add'>+	mmdc_pmu_event_update(event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mmdc_pmu_event_del(struct perf_event *event, int flags)</div><div class='add'>+{</div><div class='add'>+	struct mmdc_pmu *pmu_mmdc = to_mmdc_pmu(event-&gt;pmu);</div><div class='add'>+	int cfg = event-&gt;attr.config;</div><div class='add'>+</div><div class='add'>+	pmu_mmdc-&gt;mmdc_events[cfg] = NULL;</div><div class='add'>+	pmu_mmdc-&gt;active_events--;</div><div class='add'>+</div><div class='add'>+	if (pmu_mmdc-&gt;active_events == 0)</div><div class='add'>+		hrtimer_cancel(&amp;pmu_mmdc-&gt;hrtimer);</div><div class='add'>+</div><div class='add'>+	mmdc_pmu_event_stop(event, PERF_EF_UPDATE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mmdc_pmu_overflow_handler(struct mmdc_pmu *pmu_mmdc)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MMDC_NUM_COUNTERS; i++) {</div><div class='add'>+		struct perf_event *event = pmu_mmdc-&gt;mmdc_events[i];</div><div class='add'>+</div><div class='add'>+		if (event)</div><div class='add'>+			mmdc_pmu_event_update(event);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart mmdc_pmu_timer_handler(struct hrtimer *hrtimer)</div><div class='add'>+{</div><div class='add'>+	struct mmdc_pmu *pmu_mmdc = container_of(hrtimer, struct mmdc_pmu,</div><div class='add'>+			hrtimer);</div><div class='add'>+</div><div class='add'>+	mmdc_pmu_overflow_handler(pmu_mmdc);</div><div class='add'>+	hrtimer_forward_now(hrtimer, mmdc_pmu_timer_period());</div><div class='add'>+</div><div class='add'>+	return HRTIMER_RESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc,</div><div class='add'>+		void __iomem *mmdc_base, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int mmdc_num;</div><div class='add'>+</div><div class='add'>+	*pmu_mmdc = (struct mmdc_pmu) {</div><div class='add'>+		.pmu = (struct pmu) {</div><div class='add'>+			.task_ctx_nr    = perf_invalid_context,</div><div class='add'>+			.attr_groups    = attr_groups,</div><div class='add'>+			.event_init     = mmdc_pmu_event_init,</div><div class='add'>+			.add            = mmdc_pmu_event_add,</div><div class='add'>+			.del            = mmdc_pmu_event_del,</div><div class='add'>+			.start          = mmdc_pmu_event_start,</div><div class='add'>+			.stop           = mmdc_pmu_event_stop,</div><div class='add'>+			.read           = mmdc_pmu_event_update,</div><div class='add'>+		},</div><div class='add'>+		.mmdc_base = mmdc_base,</div><div class='add'>+		.dev = dev,</div><div class='add'>+		.active_events = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mmdc_num = ida_simple_get(&amp;mmdc_ida, 0, 0, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	return mmdc_num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int imx_mmdc_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mmdc_pmu *pmu_mmdc = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &amp;pmu_mmdc-&gt;node);</div><div class='add'>+	perf_pmu_unregister(&amp;pmu_mmdc-&gt;pmu);</div><div class='add'>+	kfree(pmu_mmdc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_base)</div><div class='add'>+{</div><div class='add'>+	struct mmdc_pmu *pmu_mmdc;</div><div class='add'>+	char *name;</div><div class='add'>+	int mmdc_num;</div><div class='add'>+	int ret;</div><div class='add'>+	const struct of_device_id *of_id =</div><div class='add'>+		of_match_device(imx_mmdc_dt_ids, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	pmu_mmdc = kzalloc(sizeof(*pmu_mmdc), GFP_KERNEL);</div><div class='add'>+	if (!pmu_mmdc) {</div><div class='add'>+		pr_err("failed to allocate PMU device!\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The first instance registers the hotplug state */</div><div class='add'>+	if (!cpuhp_mmdc_state) {</div><div class='add'>+		ret = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN,</div><div class='add'>+					      "perf/arm/mmdc:online", NULL,</div><div class='add'>+					      mmdc_pmu_offline_cpu);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			pr_err("cpuhp_setup_state_multi failed\n");</div><div class='add'>+			goto pmu_free;</div><div class='add'>+		}</div><div class='add'>+		cpuhp_mmdc_state = ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mmdc_num = mmdc_pmu_init(pmu_mmdc, mmdc_base, &amp;pdev-&gt;dev);</div><div class='add'>+	if (mmdc_num == 0)</div><div class='add'>+		name = "mmdc";</div><div class='add'>+	else</div><div class='add'>+		name = devm_kasprintf(&amp;pdev-&gt;dev,</div><div class='add'>+				GFP_KERNEL, "mmdc%d", mmdc_num);</div><div class='add'>+</div><div class='add'>+	pmu_mmdc-&gt;devtype_data = (struct fsl_mmdc_devtype_data *)of_id-&gt;data;</div><div class='add'>+</div><div class='add'>+	hrtimer_init(&amp;pmu_mmdc-&gt;hrtimer, CLOCK_MONOTONIC,</div><div class='add'>+			HRTIMER_MODE_REL);</div><div class='add'>+	pmu_mmdc-&gt;hrtimer.function = mmdc_pmu_timer_handler;</div><div class='add'>+</div><div class='add'>+	cpumask_set_cpu(raw_smp_processor_id(), &amp;pmu_mmdc-&gt;cpu);</div><div class='add'>+</div><div class='add'>+	/* Register the pmu instance for cpu hotplug */</div><div class='add'>+	cpuhp_state_add_instance_nocalls(cpuhp_mmdc_state, &amp;pmu_mmdc-&gt;node);</div><div class='add'>+</div><div class='add'>+	ret = perf_pmu_register(&amp;(pmu_mmdc-&gt;pmu), name, -1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto pmu_register_err;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, pmu_mmdc);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+pmu_register_err:</div><div class='add'>+	pr_warn("MMDC Perf PMU failed (%d), disabled\n", ret);</div><div class='add'>+	cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &amp;pmu_mmdc-&gt;node);</div><div class='add'>+	hrtimer_cancel(&amp;pmu_mmdc-&gt;hrtimer);</div><div class='add'>+pmu_free:</div><div class='add'>+	kfree(pmu_mmdc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define imx_mmdc_remove NULL</div><div class='add'>+#define imx_mmdc_perf_init(pdev, mmdc_base) 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int imx_mmdc_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='hunk'>@@ -62,7 +557,7 @@ static int imx_mmdc_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return imx_mmdc_perf_init(pdev, mmdc_base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int imx_mmdc_get_ddr_type(void)</div><div class='hunk'>@@ -70,17 +565,13 @@ int imx_mmdc_get_ddr_type(void)</div><div class='ctx'> 	return ddr_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id imx_mmdc_dt_ids[] = {</div><div class='del'>-	{ .compatible = "fsl,imx6q-mmdc", },</div><div class='del'>-	{ /* sentinel */ }</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct platform_driver imx_mmdc_driver = {</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "imx-mmdc",</div><div class='ctx'> 		.of_match_table = imx_mmdc_dt_ids,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= imx_mmdc_probe,</div><div class='add'>+	.remove		= imx_mmdc_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init imx_mmdc_init(void)</div><div class='head'>diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c<br/>index 2e895a82a6eb..922d49175cb4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/mx31moboard-marxbot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/mx31moboard-marxbot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/mx31moboard-marxbot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mx31moboard-marxbot.c</a></div><div class='hunk'>@@ -24,8 +24,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/usb/otg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;media/soc_camera.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "devices-imx31.h"</div><div class='ctx'> #include "ehci.h"</div><div class='hunk'>@@ -39,17 +37,6 @@ static unsigned int marxbot_pins[] = {</div><div class='ctx'> 	MX31_PIN_PC_READY__SD2_DATA1, MX31_PIN_PC_WAIT_B__SD2_DATA0,</div><div class='ctx'> 	MX31_PIN_PC_CD2_B__SD2_CLK, MX31_PIN_PC_CD1_B__SD2_CMD,</div><div class='ctx'> 	MX31_PIN_ATA_DIOR__GPIO3_28, MX31_PIN_ATA_DIOW__GPIO3_29,</div><div class='del'>-	/* CSI */</div><div class='del'>-	MX31_PIN_CSI_D6__CSI_D6, MX31_PIN_CSI_D7__CSI_D7,</div><div class='del'>-	MX31_PIN_CSI_D8__CSI_D8, MX31_PIN_CSI_D9__CSI_D9,</div><div class='del'>-	MX31_PIN_CSI_D10__CSI_D10, MX31_PIN_CSI_D11__CSI_D11,</div><div class='del'>-	MX31_PIN_CSI_D12__CSI_D12, MX31_PIN_CSI_D13__CSI_D13,</div><div class='del'>-	MX31_PIN_CSI_D14__CSI_D14, MX31_PIN_CSI_D15__CSI_D15,</div><div class='del'>-	MX31_PIN_CSI_HSYNC__CSI_HSYNC, MX31_PIN_CSI_MCLK__CSI_MCLK,</div><div class='del'>-	MX31_PIN_CSI_PIXCLK__CSI_PIXCLK, MX31_PIN_CSI_VSYNC__CSI_VSYNC,</div><div class='del'>-	MX31_PIN_CSI_D4__GPIO3_4, MX31_PIN_CSI_D5__GPIO3_5,</div><div class='del'>-	MX31_PIN_GPIO3_0__GPIO3_0, MX31_PIN_GPIO3_1__GPIO3_1,</div><div class='del'>-	MX31_PIN_TXD2__GPIO1_28,</div><div class='ctx'> 	/* dsPIC resets */</div><div class='ctx'> 	MX31_PIN_STXD5__GPIO1_21, MX31_PIN_SRXD5__GPIO1_22,</div><div class='ctx'> 	/*battery detection */</div><div class='hunk'>@@ -143,82 +130,6 @@ static struct spi_board_info marxbot_spi_board_info[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define TURRETCAM_POWER	IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)</div><div class='del'>-#define BASECAM_POWER	IOMUX_TO_GPIO(MX31_PIN_CSI_D5)</div><div class='del'>-#define TURRETCAM_RST_B	IOMUX_TO_GPIO(MX31_PIN_GPIO3_0)</div><div class='del'>-#define BASECAM_RST_B	IOMUX_TO_GPIO(MX31_PIN_CSI_D4)</div><div class='del'>-#define CAM_CHOICE	IOMUX_TO_GPIO(MX31_PIN_TXD2)</div><div class='del'>-</div><div class='del'>-static int marxbot_basecam_power(struct device *dev, int on)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(BASECAM_POWER, !on);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int marxbot_basecam_reset(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(BASECAM_RST_B, 0);</div><div class='del'>-	udelay(100);</div><div class='del'>-	gpio_set_value(BASECAM_RST_B, 1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct i2c_board_info marxbot_i2c_devices[] = {</div><div class='del'>-	{</div><div class='del'>-		I2C_BOARD_INFO("mt9t031", 0x5d),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct soc_camera_link base_iclink = {</div><div class='del'>-	.bus_id		= 0,		/* Must match with the camera ID */</div><div class='del'>-	.power		= marxbot_basecam_power,</div><div class='del'>-	.reset		= marxbot_basecam_reset,</div><div class='del'>-	.board_info	= &amp;marxbot_i2c_devices[0],</div><div class='del'>-	.i2c_adapter_id	= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device marxbot_camera[] = {</div><div class='del'>-	{</div><div class='del'>-		.name	= "soc-camera-pdrv",</div><div class='del'>-		.id	= 0,</div><div class='del'>-		.dev	= {</div><div class='del'>-			.platform_data = &amp;base_iclink,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device *marxbot_cameras[] __initdata = {</div><div class='del'>-	&amp;marxbot_camera[0],</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init marxbot_cam_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret = gpio_request(CAM_CHOICE, "cam-choice");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	gpio_direction_output(CAM_CHOICE, 0);</div><div class='del'>-</div><div class='del'>-	ret = gpio_request(BASECAM_RST_B, "basecam-reset");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	gpio_direction_output(BASECAM_RST_B, 1);</div><div class='del'>-	ret = gpio_request(BASECAM_POWER, "basecam-standby");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	gpio_direction_output(BASECAM_POWER, 0);</div><div class='del'>-</div><div class='del'>-	ret = gpio_request(TURRETCAM_RST_B, "turretcam-reset");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	gpio_direction_output(TURRETCAM_RST_B, 1);</div><div class='del'>-	ret = gpio_request(TURRETCAM_POWER, "turretcam-standby");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	gpio_direction_output(TURRETCAM_POWER, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define SEL0 IOMUX_TO_GPIO(MX31_PIN_DTR_DCE1)</div><div class='ctx'> #define SEL1 IOMUX_TO_GPIO(MX31_PIN_DSR_DCE1)</div><div class='ctx'> #define SEL2 IOMUX_TO_GPIO(MX31_PIN_RI_DCE1)</div><div class='hunk'>@@ -356,9 +267,6 @@ void __init mx31moboard_marxbot_init(void)</div><div class='ctx'> 	spi_register_board_info(marxbot_spi_board_info,</div><div class='ctx'> 		ARRAY_SIZE(marxbot_spi_board_info));</div><div class='ctx'> </div><div class='del'>-	marxbot_cam_init();</div><div class='del'>-	platform_add_devices(marxbot_cameras, ARRAY_SIZE(marxbot_cameras));</div><div class='del'>-</div><div class='ctx'> 	/* battery present pin */</div><div class='ctx'> 	gpio_request(IOMUX_TO_GPIO(MX31_PIN_LCS0), "bat-present");</div><div class='ctx'> 	gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_LCS0));</div><div class='head'>diff --git a/arch/arm/mach-imx/mx31moboard-smartbot.c b/arch/arm/mach-imx/mx31moboard-smartbot.c<br/>index 89fc35a64448..5cdd7abce515 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/mx31moboard-smartbot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/mx31moboard-smartbot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/mx31moboard-smartbot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/mx31moboard-smartbot.c</a></div><div class='hunk'>@@ -23,8 +23,6 @@</div><div class='ctx'> #include &lt;linux/usb/otg.h&gt;</div><div class='ctx'> #include &lt;linux/usb/ulpi.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;media/soc_camera.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "board-mx31moboard.h"</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "devices-imx31.h"</div><div class='hunk'>@@ -37,16 +35,6 @@ static unsigned int smartbot_pins[] = {</div><div class='ctx'> 	/* UART1 */</div><div class='ctx'> 	MX31_PIN_CTS2__CTS2, MX31_PIN_RTS2__RTS2,</div><div class='ctx'> 	MX31_PIN_TXD2__TXD2, MX31_PIN_RXD2__RXD2,</div><div class='del'>-	/* CSI */</div><div class='del'>-	MX31_PIN_CSI_D4__CSI_D4, MX31_PIN_CSI_D5__CSI_D5,</div><div class='del'>-	MX31_PIN_CSI_D6__CSI_D6, MX31_PIN_CSI_D7__CSI_D7,</div><div class='del'>-	MX31_PIN_CSI_D8__CSI_D8, MX31_PIN_CSI_D9__CSI_D9,</div><div class='del'>-	MX31_PIN_CSI_D10__CSI_D10, MX31_PIN_CSI_D11__CSI_D11,</div><div class='del'>-	MX31_PIN_CSI_D12__CSI_D12, MX31_PIN_CSI_D13__CSI_D13,</div><div class='del'>-	MX31_PIN_CSI_D14__CSI_D14, MX31_PIN_CSI_D15__CSI_D15,</div><div class='del'>-	MX31_PIN_CSI_HSYNC__CSI_HSYNC, MX31_PIN_CSI_MCLK__CSI_MCLK,</div><div class='del'>-	MX31_PIN_CSI_PIXCLK__CSI_PIXCLK, MX31_PIN_CSI_VSYNC__CSI_VSYNC,</div><div class='del'>-	MX31_PIN_GPIO3_0__GPIO3_0, MX31_PIN_GPIO3_1__GPIO3_1,</div><div class='ctx'> 	/* ENABLES */</div><div class='ctx'> 	MX31_PIN_DTR_DCE1__GPIO2_8, MX31_PIN_DSR_DCE1__GPIO2_9,</div><div class='ctx'> 	MX31_PIN_RI_DCE1__GPIO2_10, MX31_PIN_DCD_DCE1__GPIO2_11,</div><div class='hunk'>@@ -56,65 +44,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = {</div><div class='ctx'> 	.flags = IMXUART_HAVE_RTSCTS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CAM_POWER	IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)</div><div class='del'>-#define CAM_RST_B	IOMUX_TO_GPIO(MX31_PIN_GPIO3_0)</div><div class='del'>-</div><div class='del'>-static int smartbot_cam_power(struct device *dev, int on)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(CAM_POWER, !on);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int smartbot_cam_reset(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(CAM_RST_B, 0);</div><div class='del'>-	udelay(100);</div><div class='del'>-	gpio_set_value(CAM_RST_B, 1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct i2c_board_info smartbot_i2c_devices[] = {</div><div class='del'>-	{</div><div class='del'>-		I2C_BOARD_INFO("mt9t031", 0x5d),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct soc_camera_link base_iclink = {</div><div class='del'>-	.bus_id		= 0,		/* Must match with the camera ID */</div><div class='del'>-	.power		= smartbot_cam_power,</div><div class='del'>-	.reset		= smartbot_cam_reset,</div><div class='del'>-	.board_info	= &amp;smartbot_i2c_devices[0],</div><div class='del'>-	.i2c_adapter_id	= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device smartbot_camera[] = {</div><div class='del'>-	{</div><div class='del'>-		.name	= "soc-camera-pdrv",</div><div class='del'>-		.id	= 0,</div><div class='del'>-		.dev	= {</div><div class='del'>-			.platform_data = &amp;base_iclink,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device *smartbot_cameras[] __initdata = {</div><div class='del'>-	&amp;smartbot_camera[0],</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init smartbot_cam_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret = gpio_request(CAM_RST_B, "cam-reset");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	gpio_direction_output(CAM_RST_B, 1);</div><div class='del'>-	ret = gpio_request(CAM_POWER, "cam-standby");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	gpio_direction_output(CAM_POWER, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct fsl_usb2_platform_data usb_pdata __initconst = {</div><div class='ctx'> 	.operating_mode	= FSL_USB2_DR_DEVICE,</div><div class='ctx'> 	.phy_mode	= FSL_USB2_PHY_ULPI,</div><div class='hunk'>@@ -201,7 +130,4 @@ void __init mx31moboard_smartbot_init(int board)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	smartbot_resets_init();</div><div class='del'>-</div><div class='del'>-	smartbot_cam_init();</div><div class='del'>-	platform_add_devices(smartbot_cameras, ARRAY_SIZE(smartbot_cameras));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-imx/platsmp.c b/arch/arm/mach-imx/platsmp.c<br/>index 711dbbd5badd..c2d1b329fba1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/platsmp.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ static void __init ls1021a_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	dcfg_base = of_iomap(np, 0);</div><div class='ctx'> 	BUG_ON(!dcfg_base);</div><div class='ctx'> </div><div class='del'>-	paddr = virt_to_phys(secondary_startup);</div><div class='add'>+	paddr = __pa_symbol(secondary_startup);</div><div class='ctx'> 	writel_relaxed(cpu_to_be32(paddr), dcfg_base + DCFG_CCSR_SCRATCHRW1);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(dcfg_base);</div><div class='head'>diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c<br/>index 1515e498d348..e61b1d1027e1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/pm-imx6.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/pm-imx6.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/pm-imx6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/pm-imx6.c</a></div><div class='hunk'>@@ -499,7 +499,7 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata)</div><div class='ctx'> 	memset(suspend_ocram_base, 0, sizeof(*pm_info));</div><div class='ctx'> 	pm_info = suspend_ocram_base;</div><div class='ctx'> 	pm_info-&gt;pbase = ocram_pbase;</div><div class='del'>-	pm_info-&gt;resume_addr = virt_to_phys(v7_cpu_resume);</div><div class='add'>+	pm_info-&gt;resume_addr = __pa_symbol(v7_cpu_resume);</div><div class='ctx'> 	pm_info-&gt;pm_info_size = sizeof(*pm_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c<br/>index 70b083fe934a..495d85d0fe7e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-imx/src.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-imx/src.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-imx/src.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-imx/src.c</a></div><div class='hunk'>@@ -99,7 +99,7 @@ void imx_enable_cpu(int cpu, bool enable)</div><div class='ctx'> void imx_set_cpu_jump(int cpu, void *jump_addr)</div><div class='ctx'> {</div><div class='ctx'> 	cpu = cpu_logical_map(cpu);</div><div class='del'>-	writel_relaxed(virt_to_phys(jump_addr),</div><div class='add'>+	writel_relaxed(__pa_symbol(jump_addr),</div><div class='ctx'> 		       src_base + SRC_GPR1 + cpu * 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c<br/>index ed9a01484030..a109f6482413 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-integrator/impd1.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-integrator/impd1.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-integrator/impd1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-integrator/impd1.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='ctx'> #include &lt;linux/amba/mmci.h&gt;</div><div class='del'>-#include &lt;linux/amba/pl061.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/clk-integrator.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c<br/>index 23b98fd414bf..a1af634f8709 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-integrator/integrator_ap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-integrator/integrator_ap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-integrator/integrator_ap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-integrator/integrator_ap.c</a></div><div class='hunk'>@@ -27,6 +27,8 @@</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/termios.h&gt;</div><div class='add'>+#include &lt;linux/mfd/syscon.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -37,11 +39,8 @@</div><div class='ctx'> #include "pci_v3.h"</div><div class='ctx'> #include "lm.h"</div><div class='ctx'> </div><div class='del'>-/* Base address to the AP system controller */</div><div class='del'>-void __iomem *ap_syscon_base;</div><div class='del'>-/* Base address to the external bus interface */</div><div class='del'>-static void __iomem *ebi_base;</div><div class='del'>-</div><div class='add'>+/* Regmap to the AP system controller */</div><div class='add'>+static struct regmap *ap_syscon_map;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx</div><div class='hunk'>@@ -125,6 +124,7 @@ static void integrator_uart_set_mctrl(struct amba_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ctrls = 0, ctrlc = 0, rts_mask, dtr_mask;</div><div class='ctx'> 	u32 phybase = dev-&gt;res.start;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (phybase == INTEGRATOR_UART0_BASE) {</div><div class='ctx'> 		/* UART0 */</div><div class='hunk'>@@ -146,8 +146,17 @@ static void integrator_uart_set_mctrl(struct amba_device *dev,</div><div class='ctx'> 	else</div><div class='ctx'> 		ctrls |= dtr_mask;</div><div class='ctx'> </div><div class='del'>-	__raw_writel(ctrls, ap_syscon_base + INTEGRATOR_SC_CTRLS_OFFSET);</div><div class='del'>-	__raw_writel(ctrlc, ap_syscon_base + INTEGRATOR_SC_CTRLC_OFFSET);</div><div class='add'>+	ret = regmap_write(ap_syscon_map,</div><div class='add'>+			   INTEGRATOR_SC_CTRLS_OFFSET,</div><div class='add'>+			   ctrls);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_err("MODEM: unable to write PL010 UART CTRLS\n");</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(ap_syscon_map,</div><div class='add'>+			   INTEGRATOR_SC_CTRLC_OFFSET,</div><div class='add'>+			   ctrlc);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_err("MODEM: unable to write PL010 UART CRTLC\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct amba_pl010_data ap_uart_data = {</div><div class='hunk'>@@ -178,35 +187,32 @@ static const struct of_device_id ap_syscon_match[] = {</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id ebi_match[] = {</div><div class='del'>-	{ .compatible = "arm,external-bus-interface"},</div><div class='del'>-	{ },</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init ap_init_of(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long sc_dec;</div><div class='add'>+	u32 sc_dec;</div><div class='ctx'> 	struct device_node *syscon;</div><div class='del'>-	struct device_node *ebi;</div><div class='add'>+	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	of_platform_default_populate(NULL, ap_auxdata_lookup, NULL);</div><div class='add'>+</div><div class='ctx'> 	syscon = of_find_matching_node(NULL, ap_syscon_match);</div><div class='ctx'> 	if (!syscon)</div><div class='ctx'> 		return;</div><div class='del'>-	ebi = of_find_matching_node(NULL, ebi_match);</div><div class='del'>-	if (!ebi)</div><div class='add'>+	ap_syscon_map = syscon_node_to_regmap(syscon);</div><div class='add'>+	if (IS_ERR(ap_syscon_map)) {</div><div class='add'>+		pr_crit("could not find Integrator/AP system controller\n");</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ap_syscon_base = of_iomap(syscon, 0);</div><div class='del'>-	if (!ap_syscon_base)</div><div class='del'>-		return;</div><div class='del'>-	ebi_base = of_iomap(ebi, 0);</div><div class='del'>-	if (!ebi_base)</div><div class='add'>+	ret = regmap_read(ap_syscon_map,</div><div class='add'>+			  INTEGRATOR_SC_DEC_OFFSET,</div><div class='add'>+			  &amp;sc_dec);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_crit("could not read from Integrator/AP syscon\n");</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	of_platform_default_populate(NULL, ap_auxdata_lookup, NULL);</div><div class='del'>-</div><div class='del'>-	sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET);</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		struct lm_device *lmdev;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-iop13xx/irq.c b/arch/arm/mach-iop13xx/irq.c<br/>index c702cc4092de..bd9b43c8004e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-iop13xx/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-iop13xx/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-iop13xx/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-iop13xx/irq.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c<br/>index 26874f608ca9..846e033c56fa 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ixp4xx/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ixp4xx/common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ixp4xx/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ixp4xx/common.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;mach/udc.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -493,7 +493,7 @@ static u64 notrace ixp4xx_read_sched_clock(void)</div><div class='ctx'>  * clocksource</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static cycle_t ixp4xx_clocksource_read(struct clocksource *c)</div><div class='add'>+static u64 ixp4xx_clocksource_read(struct clocksource *c)</div><div class='ctx'> {</div><div class='ctx'> 	return *IXP4XX_OSTS;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c<br/>index 43ee06d3abe5..b3bd0e137f6d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ixp4xx/dsmg600-setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ixp4xx/dsmg600-setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ixp4xx/dsmg600-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ixp4xx/dsmg600-setup.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-gpio.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig<br/>index 24bd64dabdfc..554357035f30 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-keystone/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-keystone/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-keystone/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-keystone/Kconfig</a></div><div class='hunk'>@@ -4,6 +4,7 @@ config ARCH_KEYSTONE</div><div class='ctx'> 	select ARM_GIC</div><div class='ctx'> 	select HAVE_ARM_ARCH_TIMER</div><div class='ctx'> 	select KEYSTONE_TIMER</div><div class='add'>+	select ARCH_HAS_RESET_CONTROLLER</div><div class='ctx'> 	select ARM_ERRATA_798181 if SMP</div><div class='ctx'> 	select COMMON_CLK_KEYSTONE</div><div class='ctx'> 	select ARCH_SUPPORTS_BIG_ENDIAN</div><div class='head'>diff --git a/arch/arm/mach-lpc32xx/clock.h b/arch/arm/mach-lpc32xx/clock.h<br/>deleted file mode 100644<br/>index c0a8434307f7..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-lpc32xx/clock.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-lpc32xx/clock.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,38 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-lpc32xx/clock.h</div><div class='del'>- *</div><div class='del'>- * Author: Kevin Wells &lt;kevin.wells@nxp.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 NXP Semiconductors</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LPC32XX_CLOCK_H</div><div class='del'>-#define __LPC32XX_CLOCK_H</div><div class='del'>-</div><div class='del'>-struct clk {</div><div class='del'>-	struct list_head node;</div><div class='del'>-	struct clk *parent;</div><div class='del'>-	u32 rate;</div><div class='del'>-	u32 usecount;</div><div class='del'>-</div><div class='del'>-	int (*set_rate) (struct clk *, unsigned long);</div><div class='del'>-	unsigned long (*round_rate) (struct clk *, unsigned long);</div><div class='del'>-	unsigned long (*get_rate) (struct clk *clk);</div><div class='del'>-	int (*enable) (struct clk *, int);</div><div class='del'>-</div><div class='del'>-	/* Register address and bit mask for simple clocks */</div><div class='del'>-	void __iomem *enable_reg;</div><div class='del'>-	u32 enable_mask;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h<br/>index 30c9e64fc65b..02575c2444e4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-lpc32xx/common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-lpc32xx/common.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-lpc32xx/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-lpc32xx/common.h</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Other arch specific structures and functions</div><div class='ctx'>  */</div><div class='del'>-extern void __init lpc32xx_init_irq(void);</div><div class='ctx'> extern void __init lpc32xx_map_io(void);</div><div class='ctx'> extern void __init lpc32xx_serial_init(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-lpc32xx/include/mach/irqs.h b/arch/arm/mach-lpc32xx/include/mach/irqs.h<br/>deleted file mode 100644<br/>index 00190535df90..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-lpc32xx/include/mach/irqs.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-lpc32xx/include/mach/irqs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,117 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-lpc32xx/include/mach/irqs.h</div><div class='del'>- *</div><div class='del'>- * Author: Kevin Wells &lt;kevin.wells@nxp.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 NXP Semiconductors</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARM_ARCH_IRQS_H</div><div class='del'>-#define __ASM_ARM_ARCH_IRQS_H</div><div class='del'>-</div><div class='del'>-#define LPC32XX_SIC1_IRQ(n)		(32 + (n))</div><div class='del'>-#define LPC32XX_SIC2_IRQ(n)		(64 + (n))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * MIC interrupts</div><div class='del'>- */</div><div class='del'>-#define IRQ_LPC32XX_SUB1IRQ		0</div><div class='del'>-#define IRQ_LPC32XX_SUB2IRQ		1</div><div class='del'>-#define IRQ_LPC32XX_PWM3		3</div><div class='del'>-#define IRQ_LPC32XX_PWM4		4</div><div class='del'>-#define IRQ_LPC32XX_HSTIMER		5</div><div class='del'>-#define IRQ_LPC32XX_WATCH		6</div><div class='del'>-#define IRQ_LPC32XX_UART_IIR3		7</div><div class='del'>-#define IRQ_LPC32XX_UART_IIR4		8</div><div class='del'>-#define IRQ_LPC32XX_UART_IIR5		9</div><div class='del'>-#define IRQ_LPC32XX_UART_IIR6		10</div><div class='del'>-#define IRQ_LPC32XX_FLASH		11</div><div class='del'>-#define IRQ_LPC32XX_SD1			13</div><div class='del'>-#define IRQ_LPC32XX_LCD			14</div><div class='del'>-#define IRQ_LPC32XX_SD0			15</div><div class='del'>-#define IRQ_LPC32XX_TIMER0		16</div><div class='del'>-#define IRQ_LPC32XX_TIMER1		17</div><div class='del'>-#define IRQ_LPC32XX_TIMER2		18</div><div class='del'>-#define IRQ_LPC32XX_TIMER3		19</div><div class='del'>-#define IRQ_LPC32XX_SSP0		20</div><div class='del'>-#define IRQ_LPC32XX_SSP1		21</div><div class='del'>-#define IRQ_LPC32XX_I2S0		22</div><div class='del'>-#define IRQ_LPC32XX_I2S1		23</div><div class='del'>-#define IRQ_LPC32XX_UART_IIR7		24</div><div class='del'>-#define IRQ_LPC32XX_UART_IIR2		25</div><div class='del'>-#define IRQ_LPC32XX_UART_IIR1		26</div><div class='del'>-#define IRQ_LPC32XX_MSTIMER		27</div><div class='del'>-#define IRQ_LPC32XX_DMA			28</div><div class='del'>-#define IRQ_LPC32XX_ETHERNET		29</div><div class='del'>-#define IRQ_LPC32XX_SUB1FIQ		30</div><div class='del'>-#define IRQ_LPC32XX_SUB2FIQ		31</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SIC1 interrupts start at offset 32</div><div class='del'>- */</div><div class='del'>-#define IRQ_LPC32XX_JTAG_COMM_TX	LPC32XX_SIC1_IRQ(1)</div><div class='del'>-#define IRQ_LPC32XX_JTAG_COMM_RX	LPC32XX_SIC1_IRQ(2)</div><div class='del'>-#define IRQ_LPC32XX_GPI_28		LPC32XX_SIC1_IRQ(4)</div><div class='del'>-#define IRQ_LPC32XX_TS_P		LPC32XX_SIC1_IRQ(6)</div><div class='del'>-#define IRQ_LPC32XX_TS_IRQ		LPC32XX_SIC1_IRQ(7)</div><div class='del'>-#define IRQ_LPC32XX_TS_AUX		LPC32XX_SIC1_IRQ(8)</div><div class='del'>-#define IRQ_LPC32XX_SPI2		LPC32XX_SIC1_IRQ(12)</div><div class='del'>-#define IRQ_LPC32XX_PLLUSB		LPC32XX_SIC1_IRQ(13)</div><div class='del'>-#define IRQ_LPC32XX_PLLHCLK		LPC32XX_SIC1_IRQ(14)</div><div class='del'>-#define IRQ_LPC32XX_PLL397		LPC32XX_SIC1_IRQ(17)</div><div class='del'>-#define IRQ_LPC32XX_I2C_2		LPC32XX_SIC1_IRQ(18)</div><div class='del'>-#define IRQ_LPC32XX_I2C_1		LPC32XX_SIC1_IRQ(19)</div><div class='del'>-#define IRQ_LPC32XX_RTC			LPC32XX_SIC1_IRQ(20)</div><div class='del'>-#define IRQ_LPC32XX_KEY			LPC32XX_SIC1_IRQ(22)</div><div class='del'>-#define IRQ_LPC32XX_SPI1		LPC32XX_SIC1_IRQ(23)</div><div class='del'>-#define IRQ_LPC32XX_SW			LPC32XX_SIC1_IRQ(24)</div><div class='del'>-#define IRQ_LPC32XX_USB_OTG_TIMER	LPC32XX_SIC1_IRQ(25)</div><div class='del'>-#define IRQ_LPC32XX_USB_OTG_ATX		LPC32XX_SIC1_IRQ(26)</div><div class='del'>-#define IRQ_LPC32XX_USB_HOST		LPC32XX_SIC1_IRQ(27)</div><div class='del'>-#define IRQ_LPC32XX_USB_DEV_DMA		LPC32XX_SIC1_IRQ(28)</div><div class='del'>-#define IRQ_LPC32XX_USB_DEV_LP		LPC32XX_SIC1_IRQ(29)</div><div class='del'>-#define IRQ_LPC32XX_USB_DEV_HP		LPC32XX_SIC1_IRQ(30)</div><div class='del'>-#define IRQ_LPC32XX_USB_I2C		LPC32XX_SIC1_IRQ(31)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SIC2 interrupts start at offset 64</div><div class='del'>- */</div><div class='del'>-#define IRQ_LPC32XX_GPIO_00		LPC32XX_SIC2_IRQ(0)</div><div class='del'>-#define IRQ_LPC32XX_GPIO_01		LPC32XX_SIC2_IRQ(1)</div><div class='del'>-#define IRQ_LPC32XX_GPIO_02		LPC32XX_SIC2_IRQ(2)</div><div class='del'>-#define IRQ_LPC32XX_GPIO_03		LPC32XX_SIC2_IRQ(3)</div><div class='del'>-#define IRQ_LPC32XX_GPIO_04		LPC32XX_SIC2_IRQ(4)</div><div class='del'>-#define IRQ_LPC32XX_GPIO_05		LPC32XX_SIC2_IRQ(5)</div><div class='del'>-#define IRQ_LPC32XX_SPI2_DATAIN		LPC32XX_SIC2_IRQ(6)</div><div class='del'>-#define IRQ_LPC32XX_U2_HCTS		LPC32XX_SIC2_IRQ(7)</div><div class='del'>-#define IRQ_LPC32XX_P0_P1_IRQ		LPC32XX_SIC2_IRQ(8)</div><div class='del'>-#define IRQ_LPC32XX_GPI_08		LPC32XX_SIC2_IRQ(9)</div><div class='del'>-#define IRQ_LPC32XX_GPI_09		LPC32XX_SIC2_IRQ(10)</div><div class='del'>-#define IRQ_LPC32XX_GPI_19		LPC32XX_SIC2_IRQ(11)</div><div class='del'>-#define IRQ_LPC32XX_U7_HCTS		LPC32XX_SIC2_IRQ(12)</div><div class='del'>-#define IRQ_LPC32XX_GPI_07		LPC32XX_SIC2_IRQ(15)</div><div class='del'>-#define IRQ_LPC32XX_SDIO		LPC32XX_SIC2_IRQ(18)</div><div class='del'>-#define IRQ_LPC32XX_U5_RX		LPC32XX_SIC2_IRQ(19)</div><div class='del'>-#define IRQ_LPC32XX_SPI1_DATAIN		LPC32XX_SIC2_IRQ(20)</div><div class='del'>-#define IRQ_LPC32XX_GPI_00		LPC32XX_SIC2_IRQ(22)</div><div class='del'>-#define IRQ_LPC32XX_GPI_01		LPC32XX_SIC2_IRQ(23)</div><div class='del'>-#define IRQ_LPC32XX_GPI_02		LPC32XX_SIC2_IRQ(24)</div><div class='del'>-#define IRQ_LPC32XX_GPI_03		LPC32XX_SIC2_IRQ(25)</div><div class='del'>-#define IRQ_LPC32XX_GPI_04		LPC32XX_SIC2_IRQ(26)</div><div class='del'>-#define IRQ_LPC32XX_GPI_05		LPC32XX_SIC2_IRQ(27)</div><div class='del'>-#define IRQ_LPC32XX_GPI_06		LPC32XX_SIC2_IRQ(28)</div><div class='del'>-#define IRQ_LPC32XX_SYSCLK		LPC32XX_SIC2_IRQ(31)</div><div class='del'>-</div><div class='del'>-#define LPC32XX_NR_IRQS			96</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c<br/>index 0e4cbbe980eb..6c52bd32610e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-lpc32xx/phy3250.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-lpc32xx/phy3250.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-lpc32xx/phy3250.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-lpc32xx/phy3250.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-lpc32xx/pm.c b/arch/arm/mach-lpc32xx/pm.c<br/>index 207e81275ff0..62471570d586 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-lpc32xx/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-lpc32xx/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-lpc32xx/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-lpc32xx/pm.c</a></div><div class='hunk'>@@ -73,7 +73,6 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/platform.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='del'>-#include "clock.h"</div><div class='ctx'> </div><div class='ctx'> #define TEMP_IRAM_AREA  IO_ADDRESS(LPC32XX_IRAM_BASE)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mediatek/Makefile b/arch/arm/mach-mediatek/Makefile<br/>index 21164605b83f..dadae67d79b7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-mediatek/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-mediatek/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-mediatek/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mediatek/Makefile</a></div><div class='hunk'>@@ -1,4 +1,2 @@</div><div class='del'>-ifeq ($(CONFIG_SMP),y)</div><div class='del'>-obj-$(CONFIG_ARCH_MEDIATEK) += platsmp.o</div><div class='del'>-endif</div><div class='del'>-obj-$(CONFIG_ARCH_MEDIATEK) += mediatek.o</div><div class='add'>+obj-$(CONFIG_SMP)	+= platsmp.o</div><div class='add'>+obj-y			+= mediatek.o</div><div class='head'>diff --git a/arch/arm/mach-mediatek/platsmp.c b/arch/arm/mach-mediatek/platsmp.c<br/>index b821e34474b6..726eb69bb655 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-mediatek/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-mediatek/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-mediatek/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mediatek/platsmp.c</a></div><div class='hunk'>@@ -122,7 +122,7 @@ static void __init __mtk_smp_prepare_cpus(unsigned int max_cpus, int trustzone)</div><div class='ctx'> 	 * write the address of slave startup address into the system-wide</div><div class='ctx'> 	 * jump register</div><div class='ctx'> 	 */</div><div class='del'>-	writel_relaxed(virt_to_phys(secondary_startup_arm),</div><div class='add'>+	writel_relaxed(__pa_symbol(secondary_startup_arm),</div><div class='ctx'> 			mtk_smp_base + mtk_smp_info-&gt;jump_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c<br/>index 3c2c92aaa0ae..96ad1db0b04b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-mmp/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-mmp/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-mmp/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mmp/time.c</a></div><div class='hunk'>@@ -144,7 +144,7 @@ static struct clock_event_device ckevt = {</div><div class='ctx'> 	.set_state_oneshot	= timer_set_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static cycle_t clksrc_read(struct clocksource *cs)</div><div class='add'>+static u64 clksrc_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return timer_read();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c<br/>index 13a7d72ee0c4..81ff4327a962 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-mv78xx0/pcie.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-mv78xx0/pcie.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-mv78xx0/pcie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mv78xx0/pcie.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@ struct pcie_port {</div><div class='ctx'> 	u8			root_bus_nr;</div><div class='ctx'> 	void __iomem		*base;</div><div class='ctx'> 	spinlock_t		conf_lock;</div><div class='del'>-	char			mem_space_name[16];</div><div class='add'>+	char			mem_space_name[20];</div><div class='ctx'> 	struct resource		res;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c<br/>index ae2a018b9305..8f8748a0c84f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-mvebu/coherency.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-mvebu/coherency.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-mvebu/coherency.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mvebu/coherency.c</a></div><div class='hunk'>@@ -148,7 +148,7 @@ static void __init armada_370_coherency_init(struct device_node *np)</div><div class='ctx'> 	of_node_put(cpu_config_np);</div><div class='ctx'> </div><div class='ctx'> 	cpuhp_setup_state_nocalls(CPUHP_AP_ARM_MVEBU_COHERENCY,</div><div class='del'>-				  "AP_ARM_MVEBU_COHERENCY",</div><div class='add'>+				  "arm/mvebu/coherency:starting",</div><div class='ctx'> 				  armada_xp_clear_l2_starting, NULL);</div><div class='ctx'> exit:</div><div class='ctx'> 	set_cpu_coherent();</div><div class='head'>diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c<br/>index 46c742d3bd41..e62273aacb43 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-mvebu/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-mvebu/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-mvebu/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mvebu/platsmp.c</a></div><div class='hunk'>@@ -184,3 +184,78 @@ const struct smp_operations armada_xp_smp_ops __initconst = {</div><div class='ctx'> </div><div class='ctx'> CPU_METHOD_OF_DECLARE(armada_xp_smp, "marvell,armada-xp-smp",</div><div class='ctx'> 		      &amp;armada_xp_smp_ops);</div><div class='add'>+</div><div class='add'>+#define MV98DX3236_CPU_RESUME_CTRL_REG 0x08</div><div class='add'>+#define MV98DX3236_CPU_RESUME_ADDR_REG 0x04</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_mv98dx3236_resume_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "marvell,98dx3336-resume-ctrl",</div><div class='add'>+	},</div><div class='add'>+	{ /* end of list */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mv98dx3236_resume_set_cpu_boot_addr(int hw_cpu, void *boot_addr)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	WARN_ON(hw_cpu != 1);</div><div class='add'>+</div><div class='add'>+	np = of_find_matching_node(NULL, of_mv98dx3236_resume_table);</div><div class='add'>+	if (!np)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	base = of_io_request_and_map(np, 0, of_node_full_name(np));</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	if (IS_ERR(base))</div><div class='add'>+		return PTR_ERR(base);</div><div class='add'>+</div><div class='add'>+	writel(0, base + MV98DX3236_CPU_RESUME_CTRL_REG);</div><div class='add'>+	writel(virt_to_phys(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG);</div><div class='add'>+</div><div class='add'>+	iounmap(base);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv98dx3236_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='add'>+{</div><div class='add'>+	int ret, hw_cpu;</div><div class='add'>+</div><div class='add'>+	hw_cpu = cpu_logical_map(cpu);</div><div class='add'>+	set_secondary_cpu_clock(hw_cpu);</div><div class='add'>+	mv98dx3236_resume_set_cpu_boot_addr(hw_cpu,</div><div class='add'>+					    armada_xp_secondary_startup);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is needed to wake up CPUs in the offline state after</div><div class='add'>+	 * using CPU hotplug.</div><div class='add'>+	 */</div><div class='add'>+	arch_send_wakeup_ipi_mask(cpumask_of(cpu));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is needed to take secondary CPUs out of reset on the</div><div class='add'>+	 * initial boot.</div><div class='add'>+	 */</div><div class='add'>+	ret = mvebu_cpu_reset_deassert(hw_cpu);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_warn("unable to boot CPU: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct smp_operations mv98dx3236_smp_ops __initconst = {</div><div class='add'>+	.smp_init_cpus		= armada_xp_smp_init_cpus,</div><div class='add'>+	.smp_prepare_cpus	= armada_xp_smp_prepare_cpus,</div><div class='add'>+	.smp_boot_secondary	= mv98dx3236_boot_secondary,</div><div class='add'>+	.smp_secondary_init     = armada_xp_secondary_init,</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+	.cpu_die		= armada_xp_cpu_die,</div><div class='add'>+	.cpu_kill               = armada_xp_cpu_kill,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+CPU_METHOD_OF_DECLARE(mv98dx3236_smp, "marvell,98dx3236-smp",</div><div class='add'>+		      &amp;mv98dx3236_smp_ops);</div><div class='head'>diff --git a/arch/arm/mach-mvebu/pm.c b/arch/arm/mach-mvebu/pm.c<br/>index 2990c5269b18..c487be61d6d8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-mvebu/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-mvebu/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-mvebu/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mvebu/pm.c</a></div><div class='hunk'>@@ -110,7 +110,7 @@ static void mvebu_pm_store_armadaxp_bootinfo(u32 *store_addr)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t resume_pc;</div><div class='ctx'> </div><div class='del'>-	resume_pc = virt_to_phys(armada_370_xp_cpu_resume);</div><div class='add'>+	resume_pc = __pa_symbol(armada_370_xp_cpu_resume);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The bootloader expects the first two words to be a magic</div><div class='head'>diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c<br/>index f39bd51bce18..27a78c80e5b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-mvebu/pmsu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-mvebu/pmsu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-mvebu/pmsu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mvebu/pmsu.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ static const struct of_device_id of_pmsu_table[] = {</div><div class='ctx'> </div><div class='ctx'> void mvebu_pmsu_set_cpu_boot_addr(int hw_cpu, void *boot_addr)</div><div class='ctx'> {</div><div class='del'>-	writel(virt_to_phys(boot_addr), pmsu_mp_base +</div><div class='add'>+	writel(__pa_symbol(boot_addr), pmsu_mp_base +</div><div class='ctx'> 		PMSU_BOOT_ADDR_REDIRECT_OFFSET(hw_cpu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c<br/>index 76cbc82a7407..04d9ebe6a90a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-mvebu/system-controller.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-mvebu/system-controller.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-mvebu/system-controller.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-mvebu/system-controller.c</a></div><div class='hunk'>@@ -153,7 +153,7 @@ void mvebu_system_controller_set_cpu_boot_addr(void *boot_addr)</div><div class='ctx'> 	if (of_machine_is_compatible("marvell,armada375"))</div><div class='ctx'> 		mvebu_armada375_smp_wa_init();</div><div class='ctx'> </div><div class='del'>-	writel(virt_to_phys(boot_addr), system_controller_base +</div><div class='add'>+	writel(__pa_symbol(boot_addr), system_controller_base +</div><div class='ctx'> 	       mvebu_sc-&gt;resume_boot_addr);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig<br/>index afb809509140..45c6b733c881 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap1/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap1/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap1/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/Kconfig</a></div><div class='hunk'>@@ -31,6 +31,32 @@ config ARCH_OMAP16XX</div><div class='ctx'> 	select ARCH_OMAP_OTG</div><div class='ctx'> 	select CPU_ARM926T</div><div class='ctx'> </div><div class='add'>+config OMAP_MUX</div><div class='add'>+	bool "OMAP multiplexing support"</div><div class='add'>+	depends on ARCH_OMAP</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Pin multiplexing support for OMAP boards. If your bootloader</div><div class='add'>+	  sets the multiplexing correctly, say N. Otherwise, or if unsure,</div><div class='add'>+	  say Y.</div><div class='add'>+</div><div class='add'>+config OMAP_MUX_DEBUG</div><div class='add'>+	bool "Multiplexing debug output"</div><div class='add'>+	depends on OMAP_MUX</div><div class='add'>+	help</div><div class='add'>+	  Makes the multiplexing functions print out a lot of debug info.</div><div class='add'>+	  This is useful if you want to find out the correct values of the</div><div class='add'>+	  multiplexing registers.</div><div class='add'>+</div><div class='add'>+config OMAP_MUX_WARNINGS</div><div class='add'>+	bool "Warn about pins the bootloader didn't set up"</div><div class='add'>+	depends on OMAP_MUX</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Choose Y here to warn whenever driver initialization logic needs</div><div class='add'>+	  to change the pin multiplexing setup.	 When there are no warnings</div><div class='add'>+	  printed, it's safe to deselect OMAP_MUX for your product.</div><div class='add'>+</div><div class='ctx'> comment "OMAP Board Type"</div><div class='ctx'> 	depends on ARCH_OMAP1</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c<br/>index 4f5fd4a084c0..43e3e188f521 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap1/clock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap1/clock.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap1/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/clock.c</a></div><div class='hunk'>@@ -720,26 +720,6 @@ EXPORT_SYMBOL(clk_get_parent);</div><div class='ctx'>  * OMAP specific clock functions shared between omap1 and omap2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int __initdata mpurate;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * By default we use the rate set by the bootloader.</div><div class='del'>- * You can override this with mpurate= cmdline option.</div><div class='del'>- */</div><div class='del'>-static int __init omap_clk_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	get_option(&amp;str, &amp;mpurate);</div><div class='del'>-</div><div class='del'>-	if (!mpurate)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (mpurate &lt; 1000)</div><div class='del'>-		mpurate *= 1000000;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("mpurate=", omap_clk_setup);</div><div class='del'>-</div><div class='ctx'> /* Used for clocks that always have same value as the parent clock */</div><div class='ctx'> unsigned long followparent_recalc(struct clk *clk)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h<br/>index 1e4918a3a5ee..f2d1be211723 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap1/clock.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap1/clock.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap1/clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/clock.h</a></div><div class='hunk'>@@ -173,8 +173,6 @@ struct clk_functions {</div><div class='ctx'> 	void		(*clk_disable_unused)(struct clk *clk);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern int mpurate;</div><div class='del'>-</div><div class='ctx'> extern int clk_init(struct clk_functions *custom_clocks);</div><div class='ctx'> extern void clk_preinit(struct clk *clk);</div><div class='ctx'> extern int clk_register(struct clk *clk);</div><div class='head'>diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c<br/>index f6ba589cd312..c821c1d5610e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap1/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap1/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap1/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/dma.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> #include "soc.h"</div><div class='ctx'> </div><div class='ctx'> #define OMAP1_DMA_BASE			(0xfffed800)</div><div class='del'>-#define OMAP1_LOGICAL_DMA_CH_COUNT	17</div><div class='ctx'> </div><div class='ctx'> static u32 enable_1510_mode;</div><div class='ctx'> </div><div class='hunk'>@@ -348,8 +347,6 @@ static int __init omap1_system_dma_init(void)</div><div class='ctx'> 		goto exit_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	d-&gt;lch_count		= OMAP1_LOGICAL_DMA_CH_COUNT;</div><div class='del'>-</div><div class='ctx'> 	/* Valid attributes for omap1 plus processors */</div><div class='ctx'> 	if (cpu_is_omap15xx())</div><div class='ctx'> 		d-&gt;dev_caps = ENABLE_1510_MODE;</div><div class='hunk'>@@ -366,13 +363,14 @@ static int __init omap1_system_dma_init(void)</div><div class='ctx'> 	d-&gt;dev_caps		|= CLEAR_CSR_ON_READ;</div><div class='ctx'> 	d-&gt;dev_caps		|= IS_WORD_16;</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_omap15xx())</div><div class='del'>-		d-&gt;chan_count = 9;</div><div class='del'>-	else if (cpu_is_omap16xx() || cpu_is_omap7xx()) {</div><div class='del'>-		if (!(d-&gt;dev_caps &amp; ENABLE_1510_MODE))</div><div class='del'>-			d-&gt;chan_count = 16;</div><div class='add'>+	/* available logical channels */</div><div class='add'>+	if (cpu_is_omap15xx()) {</div><div class='add'>+		d-&gt;lch_count = 9;</div><div class='add'>+	} else {</div><div class='add'>+		if (d-&gt;dev_caps &amp; ENABLE_1510_MODE)</div><div class='add'>+			d-&gt;lch_count = 9;</div><div class='ctx'> 		else</div><div class='del'>-			d-&gt;chan_count = 9;</div><div class='add'>+			d-&gt;lch_count = 16;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p = dma_plat_info;</div><div class='head'>diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c<br/>index 82887d645a6a..32f6c53367bf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap1/i2c.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap1/i2c.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap1/i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/i2c.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-omap.h&gt;</div><div class='ctx'> #include &lt;mach/mux.h&gt;</div><div class='ctx'> #include "soc.h"</div><div class='hunk'>@@ -91,6 +92,88 @@ int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *pdata,</div><div class='ctx'> 	return platform_device_register(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define OMAP_I2C_MAX_CONTROLLERS 4</div><div class='add'>+static struct omap_i2c_bus_platform_data i2c_pdata[OMAP_I2C_MAX_CONTROLLERS];</div><div class='add'>+</div><div class='add'>+#define OMAP_I2C_CMDLINE_SETUP	(BIT(31))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap_i2c_bus_setup - Process command line options for the I2C bus speed</div><div class='add'>+ * @str: String of options</div><div class='add'>+ *</div><div class='add'>+ * This function allow to override the default I2C bus speed for given I2C</div><div class='add'>+ * bus with a command line option.</div><div class='add'>+ *</div><div class='add'>+ * Format: i2c_bus=bus_id,clkrate (in kHz)</div><div class='add'>+ *</div><div class='add'>+ * Returns 1 on success, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static int __init omap_i2c_bus_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	int ints[3];</div><div class='add'>+</div><div class='add'>+	get_options(str, 3, ints);</div><div class='add'>+	if (ints[0] &lt; 2 || ints[1] &lt; 1 ||</div><div class='add'>+			ints[1] &gt; OMAP_I2C_MAX_CONTROLLERS)</div><div class='add'>+		return 0;</div><div class='add'>+	i2c_pdata[ints[1] - 1].clkrate = ints[2];</div><div class='add'>+	i2c_pdata[ints[1] - 1].clkrate |= OMAP_I2C_CMDLINE_SETUP;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("i2c_bus=", omap_i2c_bus_setup);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register busses defined in command line but that are not registered with</div><div class='add'>+ * omap_register_i2c_bus from board initialization code.</div><div class='add'>+ */</div><div class='add'>+int __init omap_register_i2c_bus_cmdline(void)</div><div class='add'>+{</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(i2c_pdata); i++)</div><div class='add'>+		if (i2c_pdata[i].clkrate &amp; OMAP_I2C_CMDLINE_SETUP) {</div><div class='add'>+			i2c_pdata[i].clkrate &amp;= ~OMAP_I2C_CMDLINE_SETUP;</div><div class='add'>+			err = omap_i2c_add_bus(&amp;i2c_pdata[i], i + 1);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap_register_i2c_bus - register I2C bus with device descriptors</div><div class='add'>+ * @bus_id: bus id counting from number 1</div><div class='add'>+ * @clkrate: clock rate of the bus in kHz</div><div class='add'>+ * @info: pointer into I2C device descriptor table or NULL</div><div class='add'>+ * @len: number of descriptors in the table</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or an error code.</div><div class='add'>+ */</div><div class='add'>+int __init omap_register_i2c_bus(int bus_id, u32 clkrate,</div><div class='add'>+			  struct i2c_board_info const *info,</div><div class='add'>+			  unsigned len)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BUG_ON(bus_id &lt; 1 || bus_id &gt; OMAP_I2C_MAX_CONTROLLERS);</div><div class='add'>+</div><div class='add'>+	if (info) {</div><div class='add'>+		err = i2c_register_board_info(bus_id, info, len);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!i2c_pdata[bus_id - 1].clkrate)</div><div class='add'>+		i2c_pdata[bus_id - 1].clkrate = clkrate;</div><div class='add'>+</div><div class='add'>+	i2c_pdata[bus_id - 1].clkrate &amp;= ~OMAP_I2C_CMDLINE_SETUP;</div><div class='add'>+</div><div class='add'>+	return omap_i2c_add_bus(&amp;i2c_pdata[bus_id - 1], bus_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static  int __init omap_i2c_cmdline(void)</div><div class='ctx'> {</div><div class='ctx'> 	return omap_register_i2c_bus_cmdline();</div><div class='head'>diff --git a/arch/arm/mach-omap1/include/mach/usb.h b/arch/arm/mach-omap1/include/mach/usb.h<br/>index a7c5559caef2..eb76628ff843 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap1/include/mach/usb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap1/include/mach/usb.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap1/include/mach/usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/include/mach/usb.h</a></div><div class='hunk'>@@ -10,8 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/platform_data/usb-omap1.h&gt;</div><div class='ctx'> </div><div class='del'>-void omap_otg_init(struct omap_usb_config *config);</div><div class='del'>-</div><div class='ctx'> #if IS_ENABLED(CONFIG_USB)</div><div class='ctx'> void omap1_usb_init(struct omap_usb_config *pdata);</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c<br/>index 2506e598a067..455e2cf2866d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap1/usb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap1/usb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap1/usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap1/usb.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Platform level USB initialization for FS USB OTG controller on omap1 and 24xx</div><div class='add'>+ * Platform level USB initialization for FS USB OTG controller on omap1</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004 Texas Instruments, Inc.</div><div class='ctx'>  *</div><div class='hunk'>@@ -58,11 +58,12 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_ARCH_OMAP_OTG</div><div class='ctx'> </div><div class='del'>-void __init</div><div class='add'>+static void __init</div><div class='ctx'> omap_otg_init(struct omap_usb_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	u32		syscon;</div><div class='ctx'> 	int		alt_pingroup = 0;</div><div class='add'>+	u16		w;</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE:  no bus or clock setup (yet?) */</div><div class='ctx'> </div><div class='hunk'>@@ -87,39 +88,35 @@ omap_otg_init(struct omap_usb_config *config)</div><div class='ctx'> 	if (config-&gt;otg)</div><div class='ctx'> 		syscon |= OTG_EN;</div><div class='ctx'> #endif</div><div class='del'>-	if (cpu_class_is_omap1())</div><div class='del'>-		pr_debug("USB_TRANSCEIVER_CTRL = %03x\n",</div><div class='del'>-			 omap_readl(USB_TRANSCEIVER_CTRL));</div><div class='add'>+	pr_debug("USB_TRANSCEIVER_CTRL = %03x\n",</div><div class='add'>+		 omap_readl(USB_TRANSCEIVER_CTRL));</div><div class='ctx'> 	pr_debug("OTG_SYSCON_2 = %08x\n", omap_readl(OTG_SYSCON_2));</div><div class='ctx'> 	omap_writel(syscon, OTG_SYSCON_2);</div><div class='ctx'> </div><div class='ctx'> 	printk("USB: hmc %d", config-&gt;hmc_mode);</div><div class='ctx'> 	if (!alt_pingroup)</div><div class='del'>-		printk(", usb2 alt %d wires", config-&gt;pins[2]);</div><div class='add'>+		pr_cont(", usb2 alt %d wires", config-&gt;pins[2]);</div><div class='ctx'> 	else if (config-&gt;pins[0])</div><div class='del'>-		printk(", usb0 %d wires%s", config-&gt;pins[0],</div><div class='add'>+		pr_cont(", usb0 %d wires%s", config-&gt;pins[0],</div><div class='ctx'> 			is_usb0_device(config) ? " (dev)" : "");</div><div class='ctx'> 	if (config-&gt;pins[1])</div><div class='del'>-		printk(", usb1 %d wires", config-&gt;pins[1]);</div><div class='add'>+		pr_cont(", usb1 %d wires", config-&gt;pins[1]);</div><div class='ctx'> 	if (!alt_pingroup &amp;&amp; config-&gt;pins[2])</div><div class='del'>-		printk(", usb2 %d wires", config-&gt;pins[2]);</div><div class='add'>+		pr_cont(", usb2 %d wires", config-&gt;pins[2]);</div><div class='ctx'> 	if (config-&gt;otg)</div><div class='del'>-		printk(", Mini-AB on usb%d", config-&gt;otg - 1);</div><div class='del'>-	printk("\n");</div><div class='add'>+		pr_cont(", Mini-AB on usb%d", config-&gt;otg - 1);</div><div class='add'>+	pr_cont("\n");</div><div class='ctx'> </div><div class='del'>-	if (cpu_class_is_omap1()) {</div><div class='del'>-		u16 w;</div><div class='add'>+	/* leave USB clocks/controllers off until needed */</div><div class='add'>+	w = omap_readw(ULPD_SOFT_REQ);</div><div class='add'>+	w &amp;= ~SOFT_USB_CLK_REQ;</div><div class='add'>+	omap_writew(w, ULPD_SOFT_REQ);</div><div class='ctx'> </div><div class='del'>-		/* leave USB clocks/controllers off until needed */</div><div class='del'>-		w = omap_readw(ULPD_SOFT_REQ);</div><div class='del'>-		w &amp;= ~SOFT_USB_CLK_REQ;</div><div class='del'>-		omap_writew(w, ULPD_SOFT_REQ);</div><div class='add'>+	w = omap_readw(ULPD_CLOCK_CTRL);</div><div class='add'>+	w &amp;= ~USB_MCLK_EN;</div><div class='add'>+	w |= DIS_USB_PVCI_CLK;</div><div class='add'>+	omap_writew(w, ULPD_CLOCK_CTRL);</div><div class='ctx'> </div><div class='del'>-		w = omap_readw(ULPD_CLOCK_CTRL);</div><div class='del'>-		w &amp;= ~USB_MCLK_EN;</div><div class='del'>-		w |= DIS_USB_PVCI_CLK;</div><div class='del'>-		omap_writew(w, ULPD_CLOCK_CTRL);</div><div class='del'>-	}</div><div class='ctx'> 	syscon = omap_readl(OTG_SYSCON_1);</div><div class='ctx'> 	syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN;</div><div class='ctx'> </div><div class='hunk'>@@ -166,7 +163,7 @@ omap_otg_init(struct omap_usb_config *config)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-void omap_otg_init(struct omap_usb_config *config) {}</div><div class='add'>+static void omap_otg_init(struct omap_usb_config *config) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_USB_OMAP)</div><div class='hunk'>@@ -573,13 +570,13 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)</div><div class='ctx'> </div><div class='ctx'> 	printk("USB: hmc %d", config-&gt;hmc_mode);</div><div class='ctx'> 	if (config-&gt;pins[0])</div><div class='del'>-		printk(", usb0 %d wires%s", config-&gt;pins[0],</div><div class='add'>+		pr_cont(", usb0 %d wires%s", config-&gt;pins[0],</div><div class='ctx'> 			is_usb0_device(config) ? " (dev)" : "");</div><div class='ctx'> 	if (config-&gt;pins[1])</div><div class='del'>-		printk(", usb1 %d wires", config-&gt;pins[1]);</div><div class='add'>+		pr_cont(", usb1 %d wires", config-&gt;pins[1]);</div><div class='ctx'> 	if (config-&gt;pins[2])</div><div class='del'>-		printk(", usb2 %d wires", config-&gt;pins[2]);</div><div class='del'>-	printk("\n");</div><div class='add'>+		pr_cont(", usb2 %d wires", config-&gt;pins[2]);</div><div class='add'>+	pr_cont("\n");</div><div class='ctx'> </div><div class='ctx'> 	/* use DPLL for 48 MHz function clock */</div><div class='ctx'> 	pr_debug("APLL %04x DPLL %04x REQ %04x\n", omap_readw(ULPD_APLL_CTRL),</div><div class='head'>diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile<br/>index 5b37ec29996e..093458b62c8d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/Makefile</a></div><div class='hunk'>@@ -6,8 +6,8 @@ ccflags-y := -I$(srctree)/$(src)/include \</div><div class='ctx'> 	-I$(srctree)/arch/arm/plat-omap/include</div><div class='ctx'> </div><div class='ctx'> # Common support</div><div class='del'>-obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o timer.o pm.o \</div><div class='del'>-	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \</div><div class='add'>+obj-y := id.o io.o control.o devices.o fb.o timer.o pm.o \</div><div class='add'>+	 common.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \</div><div class='ctx'> 	 omap_device.o omap-headsmp.o sram.o drm.o</div><div class='ctx'> </div><div class='ctx'> hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \</div><div class='hunk'>@@ -63,9 +63,6 @@ obj-$(CONFIG_ARCH_OMAP4)		+= omap4-restart.o</div><div class='ctx'> obj-$(CONFIG_SOC_OMAP5)			+= omap4-restart.o</div><div class='ctx'> obj-$(CONFIG_SOC_DRA7XX)		+= omap4-restart.o</div><div class='ctx'> </div><div class='del'>-# Pin multiplexing</div><div class='del'>-obj-$(CONFIG_ARCH_OMAP3)		+= mux34xx.o</div><div class='del'>-</div><div class='ctx'> # SMS/SDRC</div><div class='ctx'> obj-$(CONFIG_ARCH_OMAP2)		+= sdrc2xxx.o</div><div class='ctx'> # obj-$(CONFIG_ARCH_OMAP3)		+= sdrc3xxx.o</div><div class='hunk'>@@ -80,7 +77,7 @@ endif</div><div class='ctx'> # Power Management</div><div class='ctx'> omap-4-5-pm-common			= omap-mpuss-lowpower.o</div><div class='ctx'> obj-$(CONFIG_ARCH_OMAP4)		+= $(omap-4-5-pm-common)</div><div class='del'>-obj-$(CONFIG_ARCH_OMAP5)		+= $(omap-4-5-pm-common)</div><div class='add'>+obj-$(CONFIG_SOC_OMAP5)			+= $(omap-4-5-pm-common)</div><div class='ctx'> obj-$(CONFIG_OMAP_PM_NOOP)		+= omap-pm-noop.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_PM),y)</div><div class='hunk'>@@ -235,26 +232,15 @@ obj-$(CONFIG_MACH_NOKIA_N8X0)		+= board-n8x0.o</div><div class='ctx'> </div><div class='ctx'> # Platform specific device init code</div><div class='ctx'> </div><div class='del'>-omap-flash-$(CONFIG_MTD_NAND_OMAP2)	:= board-flash.o</div><div class='del'>-omap-flash-$(CONFIG_MTD_ONENAND_OMAP2)	:= board-flash.o</div><div class='del'>-obj-y					+= $(omap-flash-y) $(omap-flash-m)</div><div class='del'>-</div><div class='ctx'> omap-hsmmc-$(CONFIG_MMC_OMAP_HS)	:= hsmmc.o</div><div class='ctx'> obj-y					+= $(omap-hsmmc-m) $(omap-hsmmc-y)</div><div class='ctx'> </div><div class='del'>-obj-y					+= usb-musb.o</div><div class='ctx'> obj-y					+= omap_phy_internal.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MACH_OMAP2_TUSB6010)	+= usb-tusb6010.o</div><div class='del'>-obj-y					+= usb-host.o</div><div class='ctx'> </div><div class='ctx'> onenand-$(CONFIG_MTD_ONENAND_OMAP2)	:= gpmc-onenand.o</div><div class='ctx'> obj-y					+= $(onenand-m) $(onenand-y)</div><div class='ctx'> </div><div class='ctx'> nand-$(CONFIG_MTD_NAND_OMAP2)		:= gpmc-nand.o</div><div class='ctx'> obj-y					+= $(nand-m) $(nand-y)</div><div class='del'>-</div><div class='del'>-smsc911x-$(CONFIG_SMSC911X)		:= gpmc-smsc911x.o</div><div class='del'>-obj-y					+= $(smsc911x-m) $(smsc911x-y)</div><div class='del'>-</div><div class='del'>-obj-y					+= common-board-devices.o twl-common.o dss-common.o</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c<br/>deleted file mode 100644<br/>index 2188dc30e232..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/board-flash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/board-flash.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,242 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * board-flash.c</div><div class='del'>- * Modified from mach-omap2/board-3430sdp-flash.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Nokia Corporation</div><div class='del'>- * Copyright (C) 2009 Texas Instruments</div><div class='del'>- *</div><div class='del'>- * Vimal Singh &lt;vimalsingh@ti.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/omap-gpmc.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/mtd/physmap.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_data/mtd-nand-omap2.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/mtd-onenand-omap2.h&gt;</div><div class='del'>-</div><div class='del'>-#include "soc.h"</div><div class='del'>-#include "common.h"</div><div class='del'>-#include "board-flash.h"</div><div class='del'>-</div><div class='del'>-#define REG_FPGA_REV			0x10</div><div class='del'>-#define REG_FPGA_DIP_SWITCH_INPUT2	0x60</div><div class='del'>-#define MAX_SUPPORTED_GPMC_CONFIG	3</div><div class='del'>-</div><div class='del'>-#define DEBUG_BASE		0x08000000 /* debug board */</div><div class='del'>-</div><div class='del'>-/* various memory sizes */</div><div class='del'>-#define FLASH_SIZE_SDPV1	SZ_64M	/* NOR flash (64 Meg aligned) */</div><div class='del'>-#define FLASH_SIZE_SDPV2	SZ_128M	/* NOR flash (256 Meg aligned) */</div><div class='del'>-</div><div class='del'>-static struct physmap_flash_data board_nor_data = {</div><div class='del'>-	.width		= 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource board_nor_resource = {</div><div class='del'>-	.flags		= IORESOURCE_MEM,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device board_nor_device = {</div><div class='del'>-	.name		= "physmap-flash",</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.dev		= {</div><div class='del'>-			.platform_data = &amp;board_nor_data,</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= 1,</div><div class='del'>-	.resource	= &amp;board_nor_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-__init board_nor_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	board_nor_data.parts	= nor_parts;</div><div class='del'>-	board_nor_data.nr_parts	= nr_parts;</div><div class='del'>-</div><div class='del'>-	/* Configure start address and size of NOR device */</div><div class='del'>-	if (omap_rev() &gt;= OMAP3430_REV_ES1_0) {</div><div class='del'>-		err = gpmc_cs_request(cs, FLASH_SIZE_SDPV2 - 1,</div><div class='del'>-				(unsigned long *)&amp;board_nor_resource.start);</div><div class='del'>-		board_nor_resource.end = board_nor_resource.start</div><div class='del'>-					+ FLASH_SIZE_SDPV2 - 1;</div><div class='del'>-	} else {</div><div class='del'>-		err = gpmc_cs_request(cs, FLASH_SIZE_SDPV1 - 1,</div><div class='del'>-				(unsigned long *)&amp;board_nor_resource.start);</div><div class='del'>-		board_nor_resource.end = board_nor_resource.start</div><div class='del'>-					+ FLASH_SIZE_SDPV1 - 1;</div><div class='del'>-	}</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		pr_err("NOR: Can't request GPMC CS\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (platform_device_register(&amp;board_nor_device) &lt; 0)</div><div class='del'>-		pr_err("Unable to register NOR device\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)</div><div class='del'>-static struct omap_onenand_platform_data board_onenand_data = {</div><div class='del'>-	.dma_channel	= -1,   /* disable DMA in OMAP OneNAND driver */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-__init board_onenand_init(struct mtd_partition *onenand_parts,</div><div class='del'>-				u8 nr_parts, u8 cs)</div><div class='del'>-{</div><div class='del'>-	board_onenand_data.cs		= cs;</div><div class='del'>-	board_onenand_data.parts	= onenand_parts;</div><div class='del'>-	board_onenand_data.nr_parts	= nr_parts;</div><div class='del'>-</div><div class='del'>-	gpmc_onenand_init(&amp;board_onenand_data);</div><div class='del'>-}</div><div class='del'>-#endif /* IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2) */</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2)</div><div class='del'>-</div><div class='del'>-/* Note that all values in this struct are in nanoseconds */</div><div class='del'>-struct gpmc_timings nand_default_timings[1] = {</div><div class='del'>-	{</div><div class='del'>-		.sync_clk = 0,</div><div class='del'>-</div><div class='del'>-		.cs_on = 0,</div><div class='del'>-		.cs_rd_off = 36,</div><div class='del'>-		.cs_wr_off = 36,</div><div class='del'>-</div><div class='del'>-		.we_on = 6,</div><div class='del'>-		.oe_on = 6,</div><div class='del'>-</div><div class='del'>-		.adv_on = 6,</div><div class='del'>-		.adv_rd_off = 24,</div><div class='del'>-		.adv_wr_off = 36,</div><div class='del'>-</div><div class='del'>-		.we_off = 30,</div><div class='del'>-		.oe_off = 48,</div><div class='del'>-</div><div class='del'>-		.access = 54,</div><div class='del'>-		.rd_cycle = 72,</div><div class='del'>-		.wr_cycle = 72,</div><div class='del'>-</div><div class='del'>-		.wr_access = 30,</div><div class='del'>-		.wr_data_mux_bus = 0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_nand_platform_data board_nand_data;</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-__init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs,</div><div class='del'>-				int nand_type, struct gpmc_timings *gpmc_t)</div><div class='del'>-{</div><div class='del'>-	board_nand_data.cs		= cs;</div><div class='del'>-	board_nand_data.parts		= nand_parts;</div><div class='del'>-	board_nand_data.nr_parts	= nr_parts;</div><div class='del'>-	board_nand_data.devsize		= nand_type;</div><div class='del'>-</div><div class='del'>-	board_nand_data.ecc_opt = OMAP_ECC_HAM1_CODE_SW;</div><div class='del'>-	gpmc_nand_init(&amp;board_nand_data, gpmc_t);</div><div class='del'>-}</div><div class='del'>-#endif /* IS_ENABLED(CONFIG_MTD_NAND_OMAP2) */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * get_gpmc0_type - Reads the FPGA DIP_SWITCH_INPUT_REGISTER2 to get</div><div class='del'>- * the various cs values.</div><div class='del'>- */</div><div class='del'>-static u8 get_gpmc0_type(void)</div><div class='del'>-{</div><div class='del'>-	u8 cs = 0;</div><div class='del'>-	void __iomem *fpga_map_addr;</div><div class='del'>-</div><div class='del'>-	fpga_map_addr = ioremap(DEBUG_BASE, 4096);</div><div class='del'>-	if (!fpga_map_addr)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!(readw_relaxed(fpga_map_addr + REG_FPGA_REV)))</div><div class='del'>-		/* we dont have an DEBUG FPGA??? */</div><div class='del'>-		/* Depend on #defines!! default to strata boot return param */</div><div class='del'>-		goto unmap;</div><div class='del'>-</div><div class='del'>-	/* S8-DIP-OFF = 1, S8-DIP-ON = 0 */</div><div class='del'>-	cs = readw_relaxed(fpga_map_addr + REG_FPGA_DIP_SWITCH_INPUT2) &amp; 0xf;</div><div class='del'>-</div><div class='del'>-	/* ES2.0 SDP's onwards 4 dip switches are provided for CS */</div><div class='del'>-	if (omap_rev() &gt;= OMAP3430_REV_ES1_0)</div><div class='del'>-		/* change (S8-1:4=DS-2:0) to (S8-4:1=DS-2:0) */</div><div class='del'>-		cs = ((cs &amp; 8) &gt;&gt; 3) | ((cs &amp; 4) &gt;&gt; 1) |</div><div class='del'>-			((cs &amp; 2) &lt;&lt; 1) | ((cs &amp; 1) &lt;&lt; 3);</div><div class='del'>-	else</div><div class='del'>-		/* change (S8-1:3=DS-2:0) to (S8-3:1=DS-2:0) */</div><div class='del'>-		cs = ((cs &amp; 4) &gt;&gt; 2) | (cs &amp; 2) | ((cs &amp; 1) &lt;&lt; 2);</div><div class='del'>-unmap:</div><div class='del'>-	iounmap(fpga_map_addr);</div><div class='del'>-	return cs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * board_flash_init - Identify devices connected to GPMC and register.</div><div class='del'>- *</div><div class='del'>- * @return - void.</div><div class='del'>- */</div><div class='del'>-void __init board_flash_init(struct flash_partitions partition_info[],</div><div class='del'>-			char chip_sel_board[][GPMC_CS_NUM], int nand_type)</div><div class='del'>-{</div><div class='del'>-	u8		cs = 0;</div><div class='del'>-	u8		norcs = GPMC_CS_NUM + 1;</div><div class='del'>-	u8		nandcs = GPMC_CS_NUM + 1;</div><div class='del'>-	u8		onenandcs = GPMC_CS_NUM + 1;</div><div class='del'>-	u8		idx;</div><div class='del'>-	unsigned char	*config_sel = NULL;</div><div class='del'>-</div><div class='del'>-	/* REVISIT: Is this return correct idx for 2430 SDP?</div><div class='del'>-	 * for which cs configuration matches for 2430 SDP?</div><div class='del'>-	 */</div><div class='del'>-	idx = get_gpmc0_type();</div><div class='del'>-	if (idx &gt;= MAX_SUPPORTED_GPMC_CONFIG) {</div><div class='del'>-		pr_err("%s: Invalid chip select: %d\n", __func__, cs);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	config_sel = (unsigned char *)(chip_sel_board[idx]);</div><div class='del'>-</div><div class='del'>-	while (cs &lt; GPMC_CS_NUM) {</div><div class='del'>-		switch (config_sel[cs]) {</div><div class='del'>-		case PDC_NOR:</div><div class='del'>-			if (norcs &gt; GPMC_CS_NUM)</div><div class='del'>-				norcs = cs;</div><div class='del'>-			break;</div><div class='del'>-		case PDC_NAND:</div><div class='del'>-			if (nandcs &gt; GPMC_CS_NUM)</div><div class='del'>-				nandcs = cs;</div><div class='del'>-			break;</div><div class='del'>-		case PDC_ONENAND:</div><div class='del'>-			if (onenandcs &gt; GPMC_CS_NUM)</div><div class='del'>-				onenandcs = cs;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		cs++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (norcs &gt; GPMC_CS_NUM)</div><div class='del'>-		pr_err("NOR: Unable to find configuration in GPMC\n");</div><div class='del'>-	else</div><div class='del'>-		board_nor_init(partition_info[0].parts,</div><div class='del'>-				partition_info[0].nr_parts, norcs);</div><div class='del'>-</div><div class='del'>-	if (onenandcs &gt; GPMC_CS_NUM)</div><div class='del'>-		pr_err("OneNAND: Unable to find configuration in GPMC\n");</div><div class='del'>-	else</div><div class='del'>-		board_onenand_init(partition_info[1].parts,</div><div class='del'>-					partition_info[1].nr_parts, onenandcs);</div><div class='del'>-</div><div class='del'>-	if (nandcs &gt; GPMC_CS_NUM)</div><div class='del'>-		pr_err("NAND: Unable to find configuration in GPMC\n");</div><div class='del'>-	else</div><div class='del'>-		board_nand_init(partition_info[2].parts,</div><div class='del'>-			partition_info[2].nr_parts, nandcs,</div><div class='del'>-			nand_type, nand_default_timings);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-flash.h b/arch/arm/mach-omap2/board-flash.h<br/>deleted file mode 100644<br/>index 8b39eec07318..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/board-flash.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/board-flash.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  board-sdp.h</div><div class='del'>- *</div><div class='del'>- *  Information structures for SDP-specific board config data</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2009 Nokia Corporation</div><div class='del'>- *  Copyright (C) 2009 Texas Instruments</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/mtd/mtd.h&gt;</div><div class='del'>-#include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-</div><div class='del'>-#define PDC_NOR		1</div><div class='del'>-#define PDC_NAND	2</div><div class='del'>-#define PDC_ONENAND	3</div><div class='del'>-#define DBG_MPDB	4</div><div class='del'>-</div><div class='del'>-struct flash_partitions {</div><div class='del'>-	struct mtd_partition *parts;</div><div class='del'>-	int nr_parts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2) || IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)</div><div class='del'>-extern void board_flash_init(struct flash_partitions [],</div><div class='del'>-				char chip_sel[][GPMC_CS_NUM], int nand_type);</div><div class='del'>-#else</div><div class='del'>-static inline void board_flash_init(struct flash_partitions part[],</div><div class='del'>-				char chip_sel[][GPMC_CS_NUM], int nand_type)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2)</div><div class='del'>-extern void board_nand_init(struct mtd_partition *nand_parts,</div><div class='del'>-		u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t);</div><div class='del'>-extern struct gpmc_timings nand_default_timings[];</div><div class='del'>-#else</div><div class='del'>-static inline void board_nand_init(struct mtd_partition *nand_parts,</div><div class='del'>-		u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#define	nand_default_timings	NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)</div><div class='del'>-extern void board_onenand_init(struct mtd_partition *nand_parts,</div><div class='del'>-					u8 nr_parts, u8 cs);</div><div class='del'>-#else</div><div class='del'>-static inline void board_onenand_init(struct mtd_partition *nand_parts,</div><div class='del'>-					u8 nr_parts, u8 cs)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c<br/>index bab814d2f37d..dc9e34e670a2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/board-generic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/board-generic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/board-generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/board-generic.c</a></div><div class='hunk'>@@ -30,8 +30,6 @@ static const struct of_device_id omap_dt_match_table[] __initconst = {</div><div class='ctx'> </div><div class='ctx'> static void __init omap_generic_init(void)</div><div class='ctx'> {</div><div class='del'>-	omapdss_early_init_of();</div><div class='del'>-</div><div class='ctx'> 	pdata_quirks_init(omap_dt_match_table);</div><div class='ctx'> </div><div class='ctx'> 	omapdss_init_of();</div><div class='hunk'>@@ -306,7 +304,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")</div><div class='ctx'> 	.init_late	= am43xx_init_late,</div><div class='ctx'> 	.init_irq	= omap_gic_of_init,</div><div class='ctx'> 	.init_machine	= omap_generic_init,</div><div class='del'>-	.init_time	= omap4_local_timer_init,</div><div class='add'>+	.init_time	= omap3_gptimer_timer_init,</div><div class='ctx'> 	.dt_compat	= am43_boards_compat,</div><div class='ctx'> 	.restart	= omap44xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='hunk'>@@ -341,6 +339,7 @@ static const char *const dra72x_boards_compat[] __initconst = {</div><div class='ctx'> 	"ti,am5718",</div><div class='ctx'> 	"ti,am5716",</div><div class='ctx'> 	"ti,dra722",</div><div class='add'>+	"ti,dra718",</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c<br/>index d058125876d8..1270afdcacdf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/clock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/clock.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/clock.c</a></div><div class='hunk'>@@ -78,8 +78,6 @@ int __init omap2_clk_setup_ll_ops(void)</div><div class='ctx'>  * OMAP2+ specific clock functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Private functions */</div><div class='del'>-</div><div class='ctx'> /* Public functions */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -112,65 +110,6 @@ void omap2_init_clk_clkdm(struct clk_hw *hw)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __initdata mpurate;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * By default we use the rate set by the bootloader.</div><div class='del'>- * You can override this with mpurate= cmdline option.</div><div class='del'>- */</div><div class='del'>-static int __init omap_clk_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	get_option(&amp;str, &amp;mpurate);</div><div class='del'>-</div><div class='del'>-	if (!mpurate)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (mpurate &lt; 1000)</div><div class='del'>-		mpurate *= 1000000;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("mpurate=", omap_clk_setup);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap2_clk_print_new_rates - print summary of current clock tree rates</div><div class='del'>- * @hfclkin_ck_name: clk name for the off-chip HF oscillator</div><div class='del'>- * @core_ck_name: clk name for the on-chip CORE_CLK</div><div class='del'>- * @mpu_ck_name: clk name for the ARM MPU clock</div><div class='del'>- *</div><div class='del'>- * Prints a short message to the console with the HFCLKIN oscillator</div><div class='del'>- * rate, the rate of the CORE clock, and the rate of the ARM MPU clock.</div><div class='del'>- * Called by the boot-time MPU rate switching code.   XXX This is intended</div><div class='del'>- * to be handled by the OPP layer code in the near future and should be</div><div class='del'>- * removed from the clock code.  No return value.</div><div class='del'>- */</div><div class='del'>-void __init omap2_clk_print_new_rates(const char *hfclkin_ck_name,</div><div class='del'>-				      const char *core_ck_name,</div><div class='del'>-				      const char *mpu_ck_name)</div><div class='del'>-{</div><div class='del'>-	struct clk *hfclkin_ck, *core_ck, *mpu_ck;</div><div class='del'>-	unsigned long hfclkin_rate;</div><div class='del'>-</div><div class='del'>-	mpu_ck = clk_get(NULL, mpu_ck_name);</div><div class='del'>-	if (WARN(IS_ERR(mpu_ck), "clock: failed to get %s.\n", mpu_ck_name))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	core_ck = clk_get(NULL, core_ck_name);</div><div class='del'>-	if (WARN(IS_ERR(core_ck), "clock: failed to get %s.\n", core_ck_name))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hfclkin_ck = clk_get(NULL, hfclkin_ck_name);</div><div class='del'>-	if (WARN(IS_ERR(hfclkin_ck), "Failed to get %s.\n", hfclkin_ck_name))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hfclkin_rate = clk_get_rate(hfclkin_ck);</div><div class='del'>-</div><div class='del'>-	pr_info("Switched to new clocking rate (Crystal/Core/MPU): %ld.%01ld/%ld/%ld MHz\n",</div><div class='del'>-		(hfclkin_rate / 1000000), ((hfclkin_rate / 100000) % 10),</div><div class='del'>-		(clk_get_rate(core_ck) / 1000000),</div><div class='del'>-		(clk_get_rate(mpu_ck) / 1000000));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ti_clk_init_features - init clock features struct for the SoC</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h<br/>index 67da640ba1c7..4e66295dca25 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/clock.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/clock.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/clock.h</a></div><div class='hunk'>@@ -64,10 +64,6 @@</div><div class='ctx'> #define OMAP4XXX_EN_DPLL_FRBYPASS		0x6</div><div class='ctx'> #define OMAP4XXX_EN_DPLL_LOCKED			0x7</div><div class='ctx'> </div><div class='del'>-void omap2_clk_print_new_rates(const char *hfclkin_ck_name,</div><div class='del'>-			       const char *core_ck_name,</div><div class='del'>-			       const char *mpu_ck_name);</div><div class='del'>-</div><div class='ctx'> extern u16 cpu_mask;</div><div class='ctx'> </div><div class='ctx'> extern const struct clkops clkops_omap2_dflt_wait;</div><div class='head'>diff --git a/arch/arm/mach-omap2/clockdomains7xx_data.c b/arch/arm/mach-omap2/clockdomains7xx_data.c<br/>index ef9ed36e8a61..6c679659cda5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/clockdomains7xx_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/clockdomains7xx_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/clockdomains7xx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/clockdomains7xx_data.c</a></div><div class='hunk'>@@ -409,7 +409,7 @@ static struct clockdomain l4sec_7xx_clkdm = {</div><div class='ctx'> 	.dep_bit	  = DRA7XX_L4SEC_STATDEP_SHIFT,</div><div class='ctx'> 	.wkdep_srcs	  = l4sec_wkup_sleep_deps,</div><div class='ctx'> 	.sleepdep_srcs	  = l4sec_wkup_sleep_deps,</div><div class='del'>-	.flags		  = CLKDM_CAN_HWSUP_SWSUP,</div><div class='add'>+	.flags		  = CLKDM_CAN_SWSUP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clockdomain l3main1_7xx_clkdm = {</div><div class='head'>diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c<br/>deleted file mode 100644<br/>index 5388fcd3de72..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/common-board-devices.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/common-board-devices.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,102 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * common-board-devices.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2011 CompuLab, Ltd.</div><div class='del'>- * Author: Mike Rapoport &lt;mike@compulab.co.il&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * version 2 as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA</div><div class='del'>- * 02110-1301 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/spi/spi.h&gt;</div><div class='del'>-#include &lt;linux/spi/ads7846.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_data/spi-omap2-mcspi.h&gt;</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-#include "common-board-devices.h"</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_TOUCHSCREEN_ADS7846)</div><div class='del'>-static struct omap2_mcspi_device_config ads7846_mcspi_config = {</div><div class='del'>-	.turbo_mode	= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ads7846_platform_data ads7846_config = {</div><div class='del'>-	.x_max			= 0x0fff,</div><div class='del'>-	.y_max			= 0x0fff,</div><div class='del'>-	.x_plate_ohms		= 180,</div><div class='del'>-	.pressure_max		= 255,</div><div class='del'>-	.debounce_max		= 10,</div><div class='del'>-	.debounce_tol		= 3,</div><div class='del'>-	.debounce_rep		= 1,</div><div class='del'>-	.gpio_pendown		= -EINVAL,</div><div class='del'>-	.keep_vref_on		= 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct spi_board_info ads7846_spi_board_info __initdata = {</div><div class='del'>-	.modalias		= "ads7846",</div><div class='del'>-	.bus_num		= -EINVAL,</div><div class='del'>-	.chip_select		= 0,</div><div class='del'>-	.max_speed_hz		= 1500000,</div><div class='del'>-	.controller_data	= &amp;ads7846_mcspi_config,</div><div class='del'>-	.irq			= -EINVAL,</div><div class='del'>-	.platform_data		= &amp;ads7846_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,</div><div class='del'>-			      struct ads7846_platform_data *board_pdata)</div><div class='del'>-{</div><div class='del'>-	struct spi_board_info *spi_bi = &amp;ads7846_spi_board_info;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If a board defines get_pendown_state() function, request the pendown</div><div class='del'>-	 * GPIO and set the GPIO debounce time.</div><div class='del'>-	 * If a board does not define the get_pendown_state() function, then</div><div class='del'>-	 * the ads7846 driver will setup the pendown GPIO itself.</div><div class='del'>-	 */</div><div class='del'>-	if (board_pdata &amp;&amp; board_pdata-&gt;get_pendown_state) {</div><div class='del'>-		err = gpio_request_one(gpio_pendown, GPIOF_IN, "TSPenDown");</div><div class='del'>-		if (err) {</div><div class='del'>-			pr_err("Couldn't obtain gpio for TSPenDown: %d\n", err);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (gpio_debounce)</div><div class='del'>-			gpio_set_debounce(gpio_pendown, gpio_debounce);</div><div class='del'>-</div><div class='del'>-		gpio_export(gpio_pendown, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spi_bi-&gt;bus_num	= bus_num;</div><div class='del'>-	spi_bi-&gt;irq	= gpio_to_irq(gpio_pendown);</div><div class='del'>-</div><div class='del'>-	ads7846_config.gpio_pendown = gpio_pendown;</div><div class='del'>-</div><div class='del'>-	if (board_pdata) {</div><div class='del'>-		board_pdata-&gt;gpio_pendown = gpio_pendown;</div><div class='del'>-		board_pdata-&gt;gpio_pendown_debounce = gpio_debounce;</div><div class='del'>-		spi_bi-&gt;platform_data = board_pdata;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spi_register_board_info(&amp;ads7846_spi_board_info, 1);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,</div><div class='del'>-			      struct ads7846_platform_data *board_pdata)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h<br/>index 07c88ae083fb..335c7822fea1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/common-board-devices.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/common-board-devices.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/common-board-devices.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/common-board-devices.h</a></div><div class='hunk'>@@ -3,15 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/tlv320aic3x.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/menelaus.h&gt;</div><div class='del'>-#include "twl-common.h"</div><div class='ctx'> </div><div class='del'>-#define NAND_BLOCK_SIZE	SZ_128K</div><div class='del'>-</div><div class='del'>-struct mtd_partition;</div><div class='del'>-struct ads7846_platform_data;</div><div class='del'>-</div><div class='del'>-void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,</div><div class='del'>-		       struct ads7846_platform_data *board_pdata);</div><div class='ctx'> void *n8x0_legacy_init(void);</div><div class='ctx'> </div><div class='ctx'> extern struct menelaus_platform_data n8x0_menelaus_platform_data;</div><div class='head'>diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h<br/>index deed42e1dd9c..c4f2ace91ea2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/common.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/common.h</a></div><div class='hunk'>@@ -77,15 +77,6 @@ static inline int omap4_pm_init_early(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_OMAP_MUX</div><div class='del'>-int omap_mux_late_init(void);</div><div class='del'>-#else</div><div class='del'>-static inline int omap_mux_late_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> extern void omap2_init_common_infrastructure(void);</div><div class='ctx'> </div><div class='ctx'> extern void omap_init_time(void);</div><div class='hunk'>@@ -262,8 +253,6 @@ extern void __iomem *omap4_get_sar_ram_base(void);</div><div class='ctx'> extern void omap4_mpuss_early_init(void);</div><div class='ctx'> extern void omap_do_wfi(void);</div><div class='ctx'> </div><div class='del'>-extern void omap4_secondary_startup(void);</div><div class='del'>-extern void omap4460_secondary_startup(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> /* Needed for secondary core boot */</div><div class='hunk'>@@ -275,16 +264,11 @@ extern void omap4_cpu_die(unsigned int cpu);</div><div class='ctx'> extern int omap4_cpu_kill(unsigned int cpu);</div><div class='ctx'> </div><div class='ctx'> extern const struct smp_operations omap4_smp_ops;</div><div class='del'>-</div><div class='del'>-extern void omap5_secondary_startup(void);</div><div class='del'>-extern void omap5_secondary_hyp_startup(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_PM)</div><div class='ctx'> extern int omap4_mpuss_init(void);</div><div class='ctx'> extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state);</div><div class='del'>-extern int omap4_finish_suspend(unsigned long cpu_state);</div><div class='del'>-extern void omap4_cpu_resume(void);</div><div class='ctx'> extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state);</div><div class='ctx'> #else</div><div class='ctx'> static inline int omap4_enter_lowpower(unsigned int cpu,</div><div class='hunk'>@@ -305,14 +289,41 @@ static inline int omap4_mpuss_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP4</div><div class='add'>+void omap4_secondary_startup(void);</div><div class='add'>+void omap4460_secondary_startup(void);</div><div class='add'>+int omap4_finish_suspend(unsigned long cpu_state);</div><div class='add'>+void omap4_cpu_resume(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omap4_secondary_startup(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void omap4460_secondary_startup(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> static inline int omap4_finish_suspend(unsigned long cpu_state)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> static inline void omap4_cpu_resume(void)</div><div class='del'>-{}</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)</div><div class='add'>+void omap5_secondary_startup(void);</div><div class='add'>+void omap5_secondary_hyp_startup(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omap5_secondary_startup(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void omap5_secondary_hyp_startup(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void pdata_quirks_init(const struct of_device_id *);</div><div class='hunk'>@@ -332,7 +343,6 @@ extern int omap_dss_reset(struct omap_hwmod *);</div><div class='ctx'> int omap_clk_init(void);</div><div class='ctx'> </div><div class='ctx'> int __init omapdss_init_of(void);</div><div class='del'>-void __init omapdss_early_init_of(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLER__ */</div><div class='ctx'> #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c<br/>index 1662071bb2cc..bd8089ff929f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/control.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/control.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/control.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/control.c</a></div><div class='hunk'>@@ -315,15 +315,15 @@ void omap3_save_scratchpad_contents(void)</div><div class='ctx'> 	scratchpad_contents.boot_config_ptr = 0x0;</div><div class='ctx'> 	if (cpu_is_omap3630())</div><div class='ctx'> 		scratchpad_contents.public_restore_ptr =</div><div class='del'>-			virt_to_phys(omap3_restore_3630);</div><div class='add'>+			__pa_symbol(omap3_restore_3630);</div><div class='ctx'> 	else if (omap_rev() != OMAP3430_REV_ES3_0 &amp;&amp;</div><div class='ctx'> 					omap_rev() != OMAP3430_REV_ES3_1 &amp;&amp;</div><div class='ctx'> 					omap_rev() != OMAP3430_REV_ES3_1_2)</div><div class='ctx'> 		scratchpad_contents.public_restore_ptr =</div><div class='del'>-			virt_to_phys(omap3_restore);</div><div class='add'>+			__pa_symbol(omap3_restore);</div><div class='ctx'> 	else</div><div class='ctx'> 		scratchpad_contents.public_restore_ptr =</div><div class='del'>-			virt_to_phys(omap3_restore_es3);</div><div class='add'>+			__pa_symbol(omap3_restore_es3);</div><div class='ctx'> </div><div class='ctx'> 	if (omap_type() == OMAP2_DEVICE_TYPE_GP)</div><div class='ctx'> 		scratchpad_contents.secure_ram_restore_ptr = 0x0;</div><div class='hunk'>@@ -395,7 +395,7 @@ void omap3_save_scratchpad_contents(void)</div><div class='ctx'> 	sdrc_block_contents.flags = 0x0;</div><div class='ctx'> 	sdrc_block_contents.block_size = 0x0;</div><div class='ctx'> </div><div class='del'>-	arm_context_addr = virt_to_phys(omap3_arm_context);</div><div class='add'>+	arm_context_addr = __pa_symbol(omap3_arm_context);</div><div class='ctx'> </div><div class='ctx'> 	/* Copy all the contents to the scratchpad location */</div><div class='ctx'> 	scratchpad_address = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD);</div><div class='head'>diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c<br/>index fa138d4032b6..a8b291f00109 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/cpuidle44xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/cpuidle44xx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/cpuidle44xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/cpuidle44xx.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "pm.h"</div><div class='ctx'> #include "prm.h"</div><div class='add'>+#include "soc.h"</div><div class='ctx'> #include "clockdomain.h"</div><div class='ctx'> </div><div class='ctx'> #define MAX_CPUS	2</div><div class='hunk'>@@ -30,6 +31,7 @@ struct idle_statedata {</div><div class='ctx'> 	u32 cpu_state;</div><div class='ctx'> 	u32 mpu_logic_state;</div><div class='ctx'> 	u32 mpu_state;</div><div class='add'>+	u32 mpu_state_vote;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct idle_statedata omap4_idle_data[] = {</div><div class='hunk'>@@ -50,12 +52,26 @@ static struct idle_statedata omap4_idle_data[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct idle_statedata omap5_idle_data[] = {</div><div class='add'>+	{</div><div class='add'>+		.cpu_state = PWRDM_POWER_ON,</div><div class='add'>+		.mpu_state = PWRDM_POWER_ON,</div><div class='add'>+		.mpu_logic_state = PWRDM_POWER_ON,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cpu_state = PWRDM_POWER_RET,</div><div class='add'>+		.mpu_state = PWRDM_POWER_RET,</div><div class='add'>+		.mpu_logic_state = PWRDM_POWER_RET,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct powerdomain *mpu_pd, *cpu_pd[MAX_CPUS];</div><div class='ctx'> static struct clockdomain *cpu_clkdm[MAX_CPUS];</div><div class='ctx'> </div><div class='ctx'> static atomic_t abort_barrier;</div><div class='ctx'> static bool cpu_done[MAX_CPUS];</div><div class='ctx'> static struct idle_statedata *state_ptr = &amp;omap4_idle_data[0];</div><div class='add'>+static DEFINE_RAW_SPINLOCK(mpu_lock);</div><div class='ctx'> </div><div class='ctx'> /* Private functions */</div><div class='ctx'> </div><div class='hunk'>@@ -77,6 +93,32 @@ static int omap_enter_idle_simple(struct cpuidle_device *dev,</div><div class='ctx'> 	return index;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int omap_enter_idle_smp(struct cpuidle_device *dev,</div><div class='add'>+			       struct cpuidle_driver *drv,</div><div class='add'>+			       int index)</div><div class='add'>+{</div><div class='add'>+	struct idle_statedata *cx = state_ptr + index;</div><div class='add'>+	unsigned long flag;</div><div class='add'>+</div><div class='add'>+	raw_spin_lock_irqsave(&amp;mpu_lock, flag);</div><div class='add'>+	cx-&gt;mpu_state_vote++;</div><div class='add'>+	if (cx-&gt;mpu_state_vote == num_online_cpus()) {</div><div class='add'>+		pwrdm_set_logic_retst(mpu_pd, cx-&gt;mpu_logic_state);</div><div class='add'>+		omap_set_pwrdm_state(mpu_pd, cx-&gt;mpu_state);</div><div class='add'>+	}</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;mpu_lock, flag);</div><div class='add'>+</div><div class='add'>+	omap4_enter_lowpower(dev-&gt;cpu, cx-&gt;cpu_state);</div><div class='add'>+</div><div class='add'>+	raw_spin_lock_irqsave(&amp;mpu_lock, flag);</div><div class='add'>+	if (cx-&gt;mpu_state_vote == num_online_cpus())</div><div class='add'>+		omap_set_pwrdm_state(mpu_pd, PWRDM_POWER_ON);</div><div class='add'>+	cx-&gt;mpu_state_vote--;</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;mpu_lock, flag);</div><div class='add'>+</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int omap_enter_idle_coupled(struct cpuidle_device *dev,</div><div class='ctx'> 			struct cpuidle_driver *drv,</div><div class='ctx'> 			int index)</div><div class='hunk'>@@ -220,6 +262,32 @@ static struct cpuidle_driver omap4_idle_driver = {</div><div class='ctx'> 	.safe_state_index = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct cpuidle_driver omap5_idle_driver = {</div><div class='add'>+	.name				= "omap5_idle",</div><div class='add'>+	.owner				= THIS_MODULE,</div><div class='add'>+	.states = {</div><div class='add'>+		{</div><div class='add'>+			/* C1 - CPU0 ON + CPU1 ON + MPU ON */</div><div class='add'>+			.exit_latency = 2 + 2,</div><div class='add'>+			.target_residency = 5,</div><div class='add'>+			.enter = omap_enter_idle_simple,</div><div class='add'>+			.name = "C1",</div><div class='add'>+			.desc = "CPUx WFI, MPUSS ON"</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			/* C2 - CPU0 RET + CPU1 RET + MPU CSWR */</div><div class='add'>+			.exit_latency = 48 + 60,</div><div class='add'>+			.target_residency = 100,</div><div class='add'>+			.flags = CPUIDLE_FLAG_TIMER_STOP,</div><div class='add'>+			.enter = omap_enter_idle_smp,</div><div class='add'>+			.name = "C2",</div><div class='add'>+			.desc = "CPUx CSWR, MPUSS CSWR",</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.state_count = ARRAY_SIZE(omap5_idle_data),</div><div class='add'>+	.safe_state_index = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Public functions */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -230,6 +298,16 @@ static struct cpuidle_driver omap4_idle_driver = {</div><div class='ctx'>  */</div><div class='ctx'> int __init omap4_idle_init(void)</div><div class='ctx'> {</div><div class='add'>+	struct cpuidle_driver *idle_driver;</div><div class='add'>+</div><div class='add'>+	if (soc_is_omap54xx()) {</div><div class='add'>+		state_ptr = &amp;omap5_idle_data[0];</div><div class='add'>+		idle_driver = &amp;omap5_idle_driver;</div><div class='add'>+	} else {</div><div class='add'>+		state_ptr = &amp;omap4_idle_data[0];</div><div class='add'>+		idle_driver = &amp;omap4_idle_driver;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mpu_pd = pwrdm_lookup("mpu_pwrdm");</div><div class='ctx'> 	cpu_pd[0] = pwrdm_lookup("cpu0_pwrdm");</div><div class='ctx'> 	cpu_pd[1] = pwrdm_lookup("cpu1_pwrdm");</div><div class='hunk'>@@ -244,5 +322,5 @@ int __init omap4_idle_init(void)</div><div class='ctx'> 	/* Configure the broadcast timer on each cpu */</div><div class='ctx'> 	on_each_cpu(omap_setup_broadcast_timer, NULL, 1);</div><div class='ctx'> </div><div class='del'>-	return cpuidle_register(&amp;omap4_idle_driver, cpu_online_mask);</div><div class='add'>+	return cpuidle_register(idle_driver, cpu_online_mask);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c<br/>index 60a20f3b44de..3fdb94599184 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/devices.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/devices.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/devices.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/devices.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "soc.h"</div><div class='ctx'> #include "common.h"</div><div class='del'>-#include "mux.h"</div><div class='ctx'> #include "control.h"</div><div class='ctx'> #include "display.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c<br/>index 70b3eaf085e4..8fa01c0ecdb2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/display.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/display.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/display.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/display.c</a></div><div class='hunk'>@@ -46,8 +46,6 @@</div><div class='ctx'> #define DISPC_CONTROL3		0x0848</div><div class='ctx'> #define DISPC_IRQSTATUS		0x0018</div><div class='ctx'> </div><div class='del'>-#define DSS_SYSCONFIG		0x10</div><div class='del'>-#define DSS_SYSSTATUS		0x14</div><div class='ctx'> #define DSS_CONTROL		0x40</div><div class='ctx'> #define DSS_SDI_CONTROL		0x44</div><div class='ctx'> #define DSS_PLL_CONTROL		0x48</div><div class='hunk'>@@ -76,36 +74,6 @@ static struct platform_device omap_display_device = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct omap_dss_hwmod_data {</div><div class='del'>-	const char *oh_name;</div><div class='del'>-	const char *dev_name;</div><div class='del'>-	const int id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct omap_dss_hwmod_data omap2_dss_hwmod_data[] __initconst = {</div><div class='del'>-	{ "dss_core", "omapdss_dss", -1 },</div><div class='del'>-	{ "dss_dispc", "omapdss_dispc", -1 },</div><div class='del'>-	{ "dss_rfbi", "omapdss_rfbi", -1 },</div><div class='del'>-	{ "dss_venc", "omapdss_venc", -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initconst = {</div><div class='del'>-	{ "dss_core", "omapdss_dss", -1 },</div><div class='del'>-	{ "dss_dispc", "omapdss_dispc", -1 },</div><div class='del'>-	{ "dss_rfbi", "omapdss_rfbi", -1 },</div><div class='del'>-	{ "dss_venc", "omapdss_venc", -1 },</div><div class='del'>-	{ "dss_dsi1", "omapdss_dsi", 0 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initconst = {</div><div class='del'>-	{ "dss_core", "omapdss_dss", -1 },</div><div class='del'>-	{ "dss_dispc", "omapdss_dispc", -1 },</div><div class='del'>-	{ "dss_rfbi", "omapdss_rfbi", -1 },</div><div class='del'>-	{ "dss_dsi1", "omapdss_dsi", 0 },</div><div class='del'>-	{ "dss_dsi2", "omapdss_dsi", 1 },</div><div class='del'>-	{ "dss_hdmi", "omapdss_hdmi", -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define OMAP4_DSIPHY_SYSCON_OFFSET		0x78</div><div class='ctx'> </div><div class='ctx'> static struct regmap *omap4_dsi_mux_syscon;</div><div class='hunk'>@@ -162,104 +130,6 @@ static int omap_dss_set_min_bus_tput(struct device *dev, unsigned long tput)</div><div class='ctx'> 	return omap_pm_set_min_bus_tput(dev, OCP_INITIATOR_AGENT, tput);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct platform_device *create_dss_pdev(const char *pdev_name,</div><div class='del'>-		int pdev_id, const char *oh_name, void *pdata, int pdata_len,</div><div class='del'>-		struct platform_device *parent)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-	struct omap_device *od;</div><div class='del'>-	struct omap_hwmod *ohs[1];</div><div class='del'>-	struct omap_hwmod *oh;</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	oh = omap_hwmod_lookup(oh_name);</div><div class='del'>-	if (!oh) {</div><div class='del'>-		pr_err("Could not look up %s\n", oh_name);</div><div class='del'>-		r = -ENODEV;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pdev = platform_device_alloc(pdev_name, pdev_id);</div><div class='del'>-	if (!pdev) {</div><div class='del'>-		pr_err("Could not create pdev for %s\n", pdev_name);</div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (parent != NULL)</div><div class='del'>-		pdev-&gt;dev.parent = &amp;parent-&gt;dev;</div><div class='del'>-</div><div class='del'>-	if (pdev-&gt;id != -1)</div><div class='del'>-		dev_set_name(&amp;pdev-&gt;dev, "%s.%d", pdev-&gt;name, pdev-&gt;id);</div><div class='del'>-	else</div><div class='del'>-		dev_set_name(&amp;pdev-&gt;dev, "%s", pdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	ohs[0] = oh;</div><div class='del'>-	od = omap_device_alloc(pdev, ohs, 1);</div><div class='del'>-	if (IS_ERR(od)) {</div><div class='del'>-		pr_err("Could not alloc omap_device for %s\n", pdev_name);</div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = platform_device_add_data(pdev, pdata, pdata_len);</div><div class='del'>-	if (r) {</div><div class='del'>-		pr_err("Could not set pdata for %s\n", pdev_name);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = omap_device_register(pdev);</div><div class='del'>-	if (r) {</div><div class='del'>-		pr_err("Could not register omap_device for %s\n", pdev_name);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return pdev;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	return ERR_PTR(r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_device *create_simple_dss_pdev(const char *pdev_name,</div><div class='del'>-		int pdev_id, void *pdata, int pdata_len,</div><div class='del'>-		struct platform_device *parent)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	pdev = platform_device_alloc(pdev_name, pdev_id);</div><div class='del'>-	if (!pdev) {</div><div class='del'>-		pr_err("Could not create pdev for %s\n", pdev_name);</div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (parent != NULL)</div><div class='del'>-		pdev-&gt;dev.parent = &amp;parent-&gt;dev;</div><div class='del'>-</div><div class='del'>-	if (pdev-&gt;id != -1)</div><div class='del'>-		dev_set_name(&amp;pdev-&gt;dev, "%s.%d", pdev-&gt;name, pdev-&gt;id);</div><div class='del'>-	else</div><div class='del'>-		dev_set_name(&amp;pdev-&gt;dev, "%s", pdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	r = platform_device_add_data(pdev, pdata, pdata_len);</div><div class='del'>-	if (r) {</div><div class='del'>-		pr_err("Could not set pdata for %s\n", pdev_name);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = platform_device_add(pdev);</div><div class='del'>-	if (r) {</div><div class='del'>-		pr_err("Could not register platform_device for %s\n", pdev_name);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return pdev;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	return ERR_PTR(r);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static enum omapdss_version __init omap_display_get_version(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (cpu_is_omap24xx())</div><div class='hunk'>@@ -293,132 +163,6 @@ static enum omapdss_version __init omap_display_get_version(void)</div><div class='ctx'> 		return OMAPDSS_VER_UNKNOWN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init omap_display_init(struct omap_dss_board_info *board_data)</div><div class='del'>-{</div><div class='del'>-	int r = 0;</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-	int i, oh_count;</div><div class='del'>-	const struct omap_dss_hwmod_data *curr_dss_hwmod;</div><div class='del'>-	struct platform_device *dss_pdev;</div><div class='del'>-	enum omapdss_version ver;</div><div class='del'>-</div><div class='del'>-	/* create omapdss device */</div><div class='del'>-</div><div class='del'>-	ver = omap_display_get_version();</div><div class='del'>-</div><div class='del'>-	if (ver == OMAPDSS_VER_UNKNOWN) {</div><div class='del'>-		pr_err("DSS not supported on this SoC\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	board_data-&gt;version = ver;</div><div class='del'>-	board_data-&gt;dsi_enable_pads = omap_dsi_enable_pads;</div><div class='del'>-	board_data-&gt;dsi_disable_pads = omap_dsi_disable_pads;</div><div class='del'>-	board_data-&gt;set_min_bus_tput = omap_dss_set_min_bus_tput;</div><div class='del'>-</div><div class='del'>-	omap_display_device.dev.platform_data = board_data;</div><div class='del'>-</div><div class='del'>-	r = platform_device_register(&amp;omap_display_device);</div><div class='del'>-	if (r &lt; 0) {</div><div class='del'>-		pr_err("Unable to register omapdss device\n");</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create devices for dss hwmods */</div><div class='del'>-</div><div class='del'>-	if (cpu_is_omap24xx()) {</div><div class='del'>-		curr_dss_hwmod = omap2_dss_hwmod_data;</div><div class='del'>-		oh_count = ARRAY_SIZE(omap2_dss_hwmod_data);</div><div class='del'>-	} else if (cpu_is_omap34xx()) {</div><div class='del'>-		curr_dss_hwmod = omap3_dss_hwmod_data;</div><div class='del'>-		oh_count = ARRAY_SIZE(omap3_dss_hwmod_data);</div><div class='del'>-	} else {</div><div class='del'>-		curr_dss_hwmod = omap4_dss_hwmod_data;</div><div class='del'>-		oh_count = ARRAY_SIZE(omap4_dss_hwmod_data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * First create the pdev for dss_core, which is used as a parent device</div><div class='del'>-	 * by the other dss pdevs. Note: dss_core has to be the first item in</div><div class='del'>-	 * the hwmod list.</div><div class='del'>-	 */</div><div class='del'>-	dss_pdev = create_dss_pdev(curr_dss_hwmod[0].dev_name,</div><div class='del'>-			curr_dss_hwmod[0].id,</div><div class='del'>-			curr_dss_hwmod[0].oh_name,</div><div class='del'>-			board_data, sizeof(*board_data),</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(dss_pdev)) {</div><div class='del'>-		pr_err("Could not build omap_device for %s\n",</div><div class='del'>-				curr_dss_hwmod[0].oh_name);</div><div class='del'>-</div><div class='del'>-		return PTR_ERR(dss_pdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; oh_count; i++) {</div><div class='del'>-		pdev = create_dss_pdev(curr_dss_hwmod[i].dev_name,</div><div class='del'>-				curr_dss_hwmod[i].id,</div><div class='del'>-				curr_dss_hwmod[i].oh_name,</div><div class='del'>-				board_data, sizeof(*board_data),</div><div class='del'>-				dss_pdev);</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(pdev)) {</div><div class='del'>-			pr_err("Could not build omap_device for %s\n",</div><div class='del'>-					curr_dss_hwmod[i].oh_name);</div><div class='del'>-</div><div class='del'>-			return PTR_ERR(pdev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create devices for DPI and SDI */</div><div class='del'>-</div><div class='del'>-	pdev = create_simple_dss_pdev("omapdss_dpi", 0,</div><div class='del'>-			board_data, sizeof(*board_data), dss_pdev);</div><div class='del'>-	if (IS_ERR(pdev)) {</div><div class='del'>-		pr_err("Could not build platform_device for omapdss_dpi\n");</div><div class='del'>-		return PTR_ERR(pdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cpu_is_omap34xx()) {</div><div class='del'>-		pdev = create_simple_dss_pdev("omapdss_sdi", 0,</div><div class='del'>-				board_data, sizeof(*board_data), dss_pdev);</div><div class='del'>-		if (IS_ERR(pdev)) {</div><div class='del'>-			pr_err("Could not build platform_device for omapdss_sdi\n");</div><div class='del'>-			return PTR_ERR(pdev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create DRM device */</div><div class='del'>-	r = omap_init_drm();</div><div class='del'>-	if (r &lt; 0) {</div><div class='del'>-		pr_err("Unable to register omapdrm device\n");</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create vrfb device */</div><div class='del'>-	r = omap_init_vrfb();</div><div class='del'>-	if (r &lt; 0) {</div><div class='del'>-		pr_err("Unable to register omapvrfb device\n");</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create FB device */</div><div class='del'>-	r = omap_init_fb();</div><div class='del'>-	if (r &lt; 0) {</div><div class='del'>-		pr_err("Unable to register omapfb device\n");</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create V4L2 display device */</div><div class='del'>-	r = omap_init_vout();</div><div class='del'>-	if (r &lt; 0) {</div><div class='del'>-		pr_err("Unable to register omap_vout device\n");</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void dispc_disable_outputs(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 v, irq_mask = 0;</div><div class='hunk'>@@ -565,11 +309,6 @@ int omap_dss_reset(struct omap_hwmod *oh)</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init omapdss_early_init_of(void)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const char * const omapdss_compat_names[] __initconst = {</div><div class='ctx'> 	"ti,omap2-dss",</div><div class='ctx'> 	"ti,omap3-dss",</div><div class='hunk'>@@ -578,7 +317,7 @@ static const char * const omapdss_compat_names[] __initconst = {</div><div class='ctx'> 	"ti,dra7-dss",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct device_node * __init omapdss_find_dss_of_node(void)</div><div class='add'>+static struct device_node * __init omapdss_find_dss_of_node(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *node;</div><div class='ctx'> 	int i;</div><div class='head'>diff --git a/arch/arm/mach-omap2/display.h b/arch/arm/mach-omap2/display.h<br/>index 78f253005279..9a39646d4316 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/display.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/display.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/display.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/display.h</a></div><div class='hunk'>@@ -31,11 +31,4 @@ int omap_init_vrfb(void);</div><div class='ctx'> int omap_init_fb(void);</div><div class='ctx'> int omap_init_vout(void);</div><div class='ctx'> </div><div class='del'>-struct device_node * __init omapdss_find_dss_of_node(void);</div><div class='del'>-</div><div class='del'>-struct omap_dss_board_info;</div><div class='del'>-</div><div class='del'>-/* Init with the board info */</div><div class='del'>-int omap_display_init(struct omap_dss_board_info *board_data);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/dss-common.c b/arch/arm/mach-omap2/dss-common.c<br/>deleted file mode 100644<br/>index 1d583bc0b1a9..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/dss-common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/dss-common.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2012 Texas Instruments, Inc..</div><div class='del'>- * Author: Tomi Valkeinen &lt;tomi.valkeinen@ti.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * version 2 as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA</div><div class='del'>- * 02110-1301 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NOTE: this is a transitional file to help with DT adaptation.</div><div class='del'>- * This file will be removed when DSS supports DT.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_data/omapdss.h&gt;</div><div class='del'>-#include &lt;video/omap-panel-data.h&gt;</div><div class='del'>-</div><div class='del'>-#include "soc.h"</div><div class='del'>-#include "dss-common.h"</div><div class='del'>-#include "mux.h"</div><div class='del'>-#include "display.h"</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-omap2/dss-common.h b/arch/arm/mach-omap2/dss-common.h<br/>deleted file mode 100644<br/>index a9becf0d5be8..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/dss-common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/dss-common.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-#ifndef __OMAP_DSS_COMMON__</div><div class='del'>-#define __OMAP_DSS_COMMON__</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NOTE: this is a transitional file to help with DT adaptation.</div><div class='del'>- * This file will be removed when DSS supports DT.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void __init omap4_panda_display_init_of(void);</div><div class='del'>-void __init omap_4430sdp_display_init_of(void);</div><div class='del'>-void __init omap3_igep2_display_init_of(void);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c<br/>deleted file mode 100644<br/>index 7a577145b68b..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/gpio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/gpio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,160 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * OMAP2+ specific gpio initialization</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *	Charulatha V &lt;charu@ti.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License as</div><div class='del'>- * published by the Free Software Foundation version 2.</div><div class='del'>- *</div><div class='del'>- * This program is distributed "as is" WITHOUT ANY WARRANTY of any</div><div class='del'>- * kind, whether express or implied; without even the implied warranty</div><div class='del'>- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/gpio-omap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "soc.h"</div><div class='del'>-#include "omap_hwmod.h"</div><div class='del'>-#include "omap_device.h"</div><div class='del'>-#include "omap-pm.h"</div><div class='del'>-</div><div class='del'>-#include "powerdomain.h"</div><div class='del'>-</div><div class='del'>-static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-	struct omap_gpio_platform_data *pdata;</div><div class='del'>-	struct omap_gpio_dev_attr *dev_attr;</div><div class='del'>-	char *name = "omap_gpio";</div><div class='del'>-	int id;</div><div class='del'>-	struct powerdomain *pwrdm;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * extract the device id from name field available in the</div><div class='del'>-	 * hwmod database and use the same for constructing ids for</div><div class='del'>-	 * gpio devices.</div><div class='del'>-	 * CAUTION: Make sure the name in the hwmod database does</div><div class='del'>-	 * not change. If changed, make corresponding change here</div><div class='del'>-	 * or make use of static variable mechanism to handle this.</div><div class='del'>-	 */</div><div class='del'>-	sscanf(oh-&gt;name, "gpio%d", &amp;id);</div><div class='del'>-</div><div class='del'>-	pdata = kzalloc(sizeof(struct omap_gpio_platform_data), GFP_KERNEL);</div><div class='del'>-	if (!pdata) {</div><div class='del'>-		pr_err("gpio%d: Memory allocation failed\n", id);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_attr = (struct omap_gpio_dev_attr *)oh-&gt;dev_attr;</div><div class='del'>-	pdata-&gt;bank_width = dev_attr-&gt;bank_width;</div><div class='del'>-	pdata-&gt;dbck_flag = dev_attr-&gt;dbck_flag;</div><div class='del'>-	pdata-&gt;get_context_loss_count = omap_pm_get_dev_context_loss_count;</div><div class='del'>-	pdata-&gt;regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL);</div><div class='del'>-	if (!pdata-&gt;regs) {</div><div class='del'>-		pr_err("gpio%d: Memory allocation failed\n", id);</div><div class='del'>-		kfree(pdata);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (oh-&gt;class-&gt;rev) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (id == 1)</div><div class='del'>-			/* non-wakeup GPIO pins for OMAP2 Bank1 */</div><div class='del'>-			pdata-&gt;non_wakeup_gpios = 0xe203ffc0;</div><div class='del'>-		else if (id == 2)</div><div class='del'>-			/* non-wakeup GPIO pins for OMAP2 Bank2 */</div><div class='del'>-			pdata-&gt;non_wakeup_gpios = 0x08700040;</div><div class='del'>-		/* fall through */</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-		pdata-&gt;regs-&gt;revision = OMAP24XX_GPIO_REVISION;</div><div class='del'>-		pdata-&gt;regs-&gt;direction = OMAP24XX_GPIO_OE;</div><div class='del'>-		pdata-&gt;regs-&gt;datain = OMAP24XX_GPIO_DATAIN;</div><div class='del'>-		pdata-&gt;regs-&gt;dataout = OMAP24XX_GPIO_DATAOUT;</div><div class='del'>-		pdata-&gt;regs-&gt;set_dataout = OMAP24XX_GPIO_SETDATAOUT;</div><div class='del'>-		pdata-&gt;regs-&gt;clr_dataout = OMAP24XX_GPIO_CLEARDATAOUT;</div><div class='del'>-		pdata-&gt;regs-&gt;irqstatus = OMAP24XX_GPIO_IRQSTATUS1;</div><div class='del'>-		pdata-&gt;regs-&gt;irqstatus2 = OMAP24XX_GPIO_IRQSTATUS2;</div><div class='del'>-		pdata-&gt;regs-&gt;irqenable = OMAP24XX_GPIO_IRQENABLE1;</div><div class='del'>-		pdata-&gt;regs-&gt;irqenable2 = OMAP24XX_GPIO_IRQENABLE2;</div><div class='del'>-		pdata-&gt;regs-&gt;set_irqenable = OMAP24XX_GPIO_SETIRQENABLE1;</div><div class='del'>-		pdata-&gt;regs-&gt;clr_irqenable = OMAP24XX_GPIO_CLEARIRQENABLE1;</div><div class='del'>-		pdata-&gt;regs-&gt;debounce = OMAP24XX_GPIO_DEBOUNCE_VAL;</div><div class='del'>-		pdata-&gt;regs-&gt;debounce_en = OMAP24XX_GPIO_DEBOUNCE_EN;</div><div class='del'>-		pdata-&gt;regs-&gt;ctrl = OMAP24XX_GPIO_CTRL;</div><div class='del'>-		pdata-&gt;regs-&gt;wkup_en = OMAP24XX_GPIO_WAKE_EN;</div><div class='del'>-		pdata-&gt;regs-&gt;leveldetect0 = OMAP24XX_GPIO_LEVELDETECT0;</div><div class='del'>-		pdata-&gt;regs-&gt;leveldetect1 = OMAP24XX_GPIO_LEVELDETECT1;</div><div class='del'>-		pdata-&gt;regs-&gt;risingdetect = OMAP24XX_GPIO_RISINGDETECT;</div><div class='del'>-		pdata-&gt;regs-&gt;fallingdetect = OMAP24XX_GPIO_FALLINGDETECT;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		pdata-&gt;regs-&gt;revision = OMAP4_GPIO_REVISION;</div><div class='del'>-		pdata-&gt;regs-&gt;direction = OMAP4_GPIO_OE;</div><div class='del'>-		pdata-&gt;regs-&gt;datain = OMAP4_GPIO_DATAIN;</div><div class='del'>-		pdata-&gt;regs-&gt;dataout = OMAP4_GPIO_DATAOUT;</div><div class='del'>-		pdata-&gt;regs-&gt;set_dataout = OMAP4_GPIO_SETDATAOUT;</div><div class='del'>-		pdata-&gt;regs-&gt;clr_dataout = OMAP4_GPIO_CLEARDATAOUT;</div><div class='del'>-		pdata-&gt;regs-&gt;irqstatus_raw0 = OMAP4_GPIO_IRQSTATUSRAW0;</div><div class='del'>-		pdata-&gt;regs-&gt;irqstatus_raw1 = OMAP4_GPIO_IRQSTATUSRAW1;</div><div class='del'>-		pdata-&gt;regs-&gt;irqstatus = OMAP4_GPIO_IRQSTATUS0;</div><div class='del'>-		pdata-&gt;regs-&gt;irqstatus2 = OMAP4_GPIO_IRQSTATUS1;</div><div class='del'>-		pdata-&gt;regs-&gt;irqenable = OMAP4_GPIO_IRQSTATUSSET0;</div><div class='del'>-		pdata-&gt;regs-&gt;irqenable2 = OMAP4_GPIO_IRQSTATUSSET1;</div><div class='del'>-		pdata-&gt;regs-&gt;set_irqenable = OMAP4_GPIO_IRQSTATUSSET0;</div><div class='del'>-		pdata-&gt;regs-&gt;clr_irqenable = OMAP4_GPIO_IRQSTATUSCLR0;</div><div class='del'>-		pdata-&gt;regs-&gt;debounce = OMAP4_GPIO_DEBOUNCINGTIME;</div><div class='del'>-		pdata-&gt;regs-&gt;debounce_en = OMAP4_GPIO_DEBOUNCENABLE;</div><div class='del'>-		pdata-&gt;regs-&gt;ctrl = OMAP4_GPIO_CTRL;</div><div class='del'>-		pdata-&gt;regs-&gt;wkup_en = OMAP4_GPIO_IRQWAKEN0;</div><div class='del'>-		pdata-&gt;regs-&gt;leveldetect0 = OMAP4_GPIO_LEVELDETECT0;</div><div class='del'>-		pdata-&gt;regs-&gt;leveldetect1 = OMAP4_GPIO_LEVELDETECT1;</div><div class='del'>-		pdata-&gt;regs-&gt;risingdetect = OMAP4_GPIO_RISINGDETECT;</div><div class='del'>-		pdata-&gt;regs-&gt;fallingdetect = OMAP4_GPIO_FALLINGDETECT;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN(1, "Invalid gpio bank_type\n");</div><div class='del'>-		kfree(pdata-&gt;regs);</div><div class='del'>-		kfree(pdata);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pwrdm = omap_hwmod_get_pwrdm(oh);</div><div class='del'>-	pdata-&gt;loses_context = pwrdm_can_ever_lose_context(pwrdm);</div><div class='del'>-</div><div class='del'>-	pdev = omap_device_build(name, id - 1, oh, pdata, sizeof(*pdata));</div><div class='del'>-	kfree(pdata);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(pdev)) {</div><div class='del'>-		WARN(1, "Can't build omap_device for %s:%s.\n",</div><div class='del'>-					name, oh-&gt;name);</div><div class='del'>-		return PTR_ERR(pdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * gpio_init needs to be done before</div><div class='del'>- * machine_init functions access gpio APIs.</div><div class='del'>- * Hence gpio_init is a omap_postcore_initcall.</div><div class='del'>- */</div><div class='del'>-static int __init omap2_gpio_init(void)</div><div class='del'>-{</div><div class='del'>-	/* If dtb is there, the devices will be created dynamically */</div><div class='del'>-	if (of_have_populated_dt())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	return omap_hwmod_for_each_by_class("gpio", omap2_gpio_dev_init, NULL);</div><div class='del'>-}</div><div class='del'>-omap_postcore_initcall(omap2_gpio_init);</div><div class='head'>diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c<br/>deleted file mode 100644<br/>index 2757504a13c4..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/gpmc-smsc911x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/gpmc-smsc911x.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/arm/mach-omap2/gpmc-smsc911x.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Li-Pro.Net</div><div class='del'>- * Stephan Linz &lt;linz@li-pro.net&gt;</div><div class='del'>- *</div><div class='del'>- * Modified from linux/arch/arm/mach-omap2/gpmc-smc91x.c</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#define pr_fmt(fmt) "%s: " fmt, __func__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/smsc911x.h&gt;</div><div class='del'>-</div><div class='del'>-#include "gpmc.h"</div><div class='del'>-#include "gpmc-smsc911x.h"</div><div class='del'>-</div><div class='del'>-static struct resource gpmc_smsc911x_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.flags		= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.flags		= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct smsc911x_platform_config gpmc_smsc911x_config = {</div><div class='del'>-	.phy_interface	= PHY_INTERFACE_MODE_MII,</div><div class='del'>-	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,</div><div class='del'>-	.irq_type	= SMSC911X_IRQ_TYPE_OPEN_DRAIN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize smsc911x device connected to the GPMC. Note that we</div><div class='del'>- * assume that pin multiplexing is done in the board-*.c file,</div><div class='del'>- * or in the bootloader.</div><div class='del'>- */</div><div class='del'>-void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *gpmc_cfg)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-	unsigned long cs_mem_base;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (gpmc_cs_request(gpmc_cfg-&gt;cs, SZ_16M, &amp;cs_mem_base) &lt; 0) {</div><div class='del'>-		pr_err("Failed to request GPMC mem region\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gpmc_smsc911x_resources[0].start = cs_mem_base + 0x0;</div><div class='del'>-	gpmc_smsc911x_resources[0].end = cs_mem_base + 0xff;</div><div class='del'>-</div><div class='del'>-	if (gpio_request_one(gpmc_cfg-&gt;gpio_irq, GPIOF_IN, "smsc911x irq")) {</div><div class='del'>-		pr_err("Failed to request IRQ GPIO%d\n", gpmc_cfg-&gt;gpio_irq);</div><div class='del'>-		goto free1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gpmc_smsc911x_resources[1].start = gpio_to_irq(gpmc_cfg-&gt;gpio_irq);</div><div class='del'>-</div><div class='del'>-	if (gpio_is_valid(gpmc_cfg-&gt;gpio_reset)) {</div><div class='del'>-		ret = gpio_request_one(gpmc_cfg-&gt;gpio_reset,</div><div class='del'>-				       GPIOF_OUT_INIT_HIGH, "smsc911x reset");</div><div class='del'>-		if (ret) {</div><div class='del'>-			pr_err("Failed to request reset GPIO%d\n",</div><div class='del'>-			       gpmc_cfg-&gt;gpio_reset);</div><div class='del'>-			goto free2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gpio_set_value(gpmc_cfg-&gt;gpio_reset, 0);</div><div class='del'>-		msleep(100);</div><div class='del'>-		gpio_set_value(gpmc_cfg-&gt;gpio_reset, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gpmc_smsc911x_config.flags = gpmc_cfg-&gt;flags ? : SMSC911X_USE_16BIT;</div><div class='del'>-</div><div class='del'>-	pdev = platform_device_register_resndata(NULL, "smsc911x", gpmc_cfg-&gt;id,</div><div class='del'>-		 gpmc_smsc911x_resources, ARRAY_SIZE(gpmc_smsc911x_resources),</div><div class='del'>-		 &amp;gpmc_smsc911x_config, sizeof(gpmc_smsc911x_config));</div><div class='del'>-	if (IS_ERR(pdev)) {</div><div class='del'>-		pr_err("Unable to register platform device\n");</div><div class='del'>-		gpio_free(gpmc_cfg-&gt;gpio_reset);</div><div class='del'>-		goto free2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-free2:</div><div class='del'>-	gpio_free(gpmc_cfg-&gt;gpio_irq);</div><div class='del'>-free1:</div><div class='del'>-	gpmc_cs_free(gpmc_cfg-&gt;cs);</div><div class='del'>-</div><div class='del'>-	pr_err("Could not initialize smsc911x device\n");</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.h b/arch/arm/mach-omap2/gpmc-smsc911x.h<br/>deleted file mode 100644<br/>index 99a05b8412fa..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/gpmc-smsc911x.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/gpmc-smsc911x.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/plat-omap/include/plat/gpmc-smsc911x.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Li-Pro.Net</div><div class='del'>- * Stephan Linz &lt;linz@li-pro.net&gt;</div><div class='del'>- *</div><div class='del'>- * Modified from arch/arm/plat-omap/include/plat/gpmc-smc91x.h</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_OMAP_GPMC_SMSC911X_H__</div><div class='del'>-</div><div class='del'>-struct omap_smsc911x_platform_data {</div><div class='del'>-	int	id;</div><div class='del'>-	int	cs;</div><div class='del'>-	int	gpio_irq;</div><div class='del'>-	int	gpio_reset;</div><div class='del'>-	u32	flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_SMSC911X)</div><div class='del'>-</div><div class='del'>-extern void gpmc_smsc911x_init(struct omap_smsc911x_platform_data *d);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void gpmc_smsc911x_init(struct omap_smsc911x_platform_data *d)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c<br/>index 478097741bce..cb754c46747e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/hsmmc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/hsmmc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/hsmmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/hsmmc.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include "omap_device.h"</div><div class='ctx'> #include "omap-pm.h"</div><div class='ctx'> </div><div class='del'>-#include "mux.h"</div><div class='ctx'> #include "hsmmc.h"</div><div class='ctx'> #include "control.h"</div><div class='ctx'> </div><div class='hunk'>@@ -147,91 +146,6 @@ static int nop_mmc_set_power(struct device *dev, int power_on, int vdd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void omap_hsmmc_mux(struct omap_hsmmc_platform_data</div><div class='del'>-				  *mmc_controller, int controller_nr)</div><div class='del'>-{</div><div class='del'>-	if (gpio_is_valid(mmc_controller-&gt;gpio_cd) &amp;&amp;</div><div class='del'>-	    (mmc_controller-&gt;gpio_cd &lt; OMAP_MAX_GPIO_LINES))</div><div class='del'>-		omap_mux_init_gpio(mmc_controller-&gt;gpio_cd,</div><div class='del'>-				   OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-	if (gpio_is_valid(mmc_controller-&gt;gpio_cod) &amp;&amp;</div><div class='del'>-	    (mmc_controller-&gt;gpio_cod &lt; OMAP_MAX_GPIO_LINES))</div><div class='del'>-		omap_mux_init_gpio(mmc_controller-&gt;gpio_cod,</div><div class='del'>-				   OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-	if (gpio_is_valid(mmc_controller-&gt;gpio_wp) &amp;&amp;</div><div class='del'>-	    (mmc_controller-&gt;gpio_wp &lt; OMAP_MAX_GPIO_LINES))</div><div class='del'>-		omap_mux_init_gpio(mmc_controller-&gt;gpio_wp,</div><div class='del'>-				   OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-	if (cpu_is_omap34xx()) {</div><div class='del'>-		if (controller_nr == 0) {</div><div class='del'>-			omap_mux_init_signal("sdmmc1_clk",</div><div class='del'>-				OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-			omap_mux_init_signal("sdmmc1_cmd",</div><div class='del'>-				OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-			omap_mux_init_signal("sdmmc1_dat0",</div><div class='del'>-				OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-			if (mmc_controller-&gt;caps &amp;</div><div class='del'>-				(MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA)) {</div><div class='del'>-				omap_mux_init_signal("sdmmc1_dat1",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-				omap_mux_init_signal("sdmmc1_dat2",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-				omap_mux_init_signal("sdmmc1_dat3",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-			}</div><div class='del'>-			if (mmc_controller-&gt;caps &amp;</div><div class='del'>-						MMC_CAP_8_BIT_DATA) {</div><div class='del'>-				omap_mux_init_signal("sdmmc1_dat4",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-				omap_mux_init_signal("sdmmc1_dat5",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-				omap_mux_init_signal("sdmmc1_dat6",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-				omap_mux_init_signal("sdmmc1_dat7",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (controller_nr == 1) {</div><div class='del'>-			/* MMC2 */</div><div class='del'>-			omap_mux_init_signal("sdmmc2_clk",</div><div class='del'>-				OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-			omap_mux_init_signal("sdmmc2_cmd",</div><div class='del'>-				OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-			omap_mux_init_signal("sdmmc2_dat0",</div><div class='del'>-				OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * For 8 wire configurations, Lines DAT4, 5, 6 and 7</div><div class='del'>-			 * need to be muxed in the board-*.c files</div><div class='del'>-			 */</div><div class='del'>-			if (mmc_controller-&gt;caps &amp;</div><div class='del'>-				(MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA)) {</div><div class='del'>-				omap_mux_init_signal("sdmmc2_dat1",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-				omap_mux_init_signal("sdmmc2_dat2",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-				omap_mux_init_signal("sdmmc2_dat3",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-			}</div><div class='del'>-			if (mmc_controller-&gt;caps &amp;</div><div class='del'>-							MMC_CAP_8_BIT_DATA) {</div><div class='del'>-				omap_mux_init_signal("sdmmc2_dat4.sdmmc2_dat4",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-				omap_mux_init_signal("sdmmc2_dat5.sdmmc2_dat5",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-				omap_mux_init_signal("sdmmc2_dat6.sdmmc2_dat6",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-				omap_mux_init_signal("sdmmc2_dat7.sdmmc2_dat7",</div><div class='del'>-					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * For MMC3 the pins need to be muxed in the board-*.c files</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,</div><div class='ctx'> 					struct omap_hsmmc_platform_data *mmc)</div><div class='ctx'> {</div><div class='hunk'>@@ -410,8 +324,6 @@ static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo,</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		goto free_mmc;</div><div class='ctx'> </div><div class='del'>-	omap_hsmmc_mux(mmc_data, (ctrl_nr - 1));</div><div class='del'>-</div><div class='ctx'> 	name = "omap_hsmmc";</div><div class='ctx'> 	res = snprintf(oh_name, MAX_OMAP_MMC_HWMOD_NAME_LEN,</div><div class='ctx'> 		     "mmc%d", ctrl_nr);</div><div class='head'>diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c<br/>index b9d8e47ffe8e..91a21c3923b2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/i2c.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/i2c.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/i2c.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "prm.h"</div><div class='ctx'> #include "common.h"</div><div class='del'>-#include "mux.h"</div><div class='ctx'> #include "i2c.h"</div><div class='ctx'> </div><div class='ctx'> /* In register I2C_CON, Bit 15 is the I2C enable bit */</div><div class='hunk'>@@ -36,20 +35,6 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX_OMAP_I2C_HWMOD_NAME_LEN	16</div><div class='ctx'> </div><div class='del'>-static void __init omap2_i2c_mux_pins(int bus_id)</div><div class='del'>-{</div><div class='del'>-	char mux_name[sizeof("i2c2_scl.i2c2_scl")];</div><div class='del'>-</div><div class='del'>-	/* First I2C bus is not muxable */</div><div class='del'>-	if (bus_id == 1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sprintf(mux_name, "i2c%i_scl.i2c%i_scl", bus_id, bus_id);</div><div class='del'>-	omap_mux_init_signal(mux_name, OMAP_PIN_INPUT);</div><div class='del'>-	sprintf(mux_name, "i2c%i_sda.i2c%i_sda", bus_id, bus_id);</div><div class='del'>-	omap_mux_init_signal(mux_name, OMAP_PIN_INPUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * omap_i2c_reset - reset the omap i2c module.</div><div class='ctx'>  * @oh: struct omap_hwmod *</div><div class='hunk'>@@ -107,85 +92,3 @@ int omap_i2c_reset(struct omap_hwmod *oh)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int __init omap_i2c_nr_ports(void)</div><div class='del'>-{</div><div class='del'>-	int ports = 0;</div><div class='del'>-</div><div class='del'>-	if (cpu_is_omap24xx())</div><div class='del'>-		ports = 2;</div><div class='del'>-	else if (cpu_is_omap34xx())</div><div class='del'>-		ports = 3;</div><div class='del'>-	else if (cpu_is_omap44xx())</div><div class='del'>-		ports = 4;</div><div class='del'>-	return ports;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XXX This function is a temporary compatibility wrapper - only</div><div class='del'>- * needed until the I2C driver can be converted to call</div><div class='del'>- * omap_pm_set_max_dev_wakeup_lat() and handle a return code.</div><div class='del'>- */</div><div class='del'>-static void omap_pm_set_max_mpu_wakeup_lat_compat(struct device *dev, long t)</div><div class='del'>-{</div><div class='del'>-	omap_pm_set_max_mpu_wakeup_lat(dev, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char name[] = "omap_i2c";</div><div class='del'>-</div><div class='del'>-int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *i2c_pdata,</div><div class='del'>-				int bus_id)</div><div class='del'>-{</div><div class='del'>-	int l;</div><div class='del'>-	struct omap_hwmod *oh;</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-	char oh_name[MAX_OMAP_I2C_HWMOD_NAME_LEN];</div><div class='del'>-	struct omap_i2c_bus_platform_data *pdata;</div><div class='del'>-	struct omap_i2c_dev_attr *dev_attr;</div><div class='del'>-</div><div class='del'>-	if (bus_id &gt; omap_i2c_nr_ports())</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	omap2_i2c_mux_pins(bus_id);</div><div class='del'>-</div><div class='del'>-	l = snprintf(oh_name, MAX_OMAP_I2C_HWMOD_NAME_LEN, "i2c%d", bus_id);</div><div class='del'>-	WARN(l &gt;= MAX_OMAP_I2C_HWMOD_NAME_LEN,</div><div class='del'>-		"String buffer overflow in I2C%d device setup\n", bus_id);</div><div class='del'>-	oh = omap_hwmod_lookup(oh_name);</div><div class='del'>-	if (!oh) {</div><div class='del'>-			pr_err("Could not look up %s\n", oh_name);</div><div class='del'>-			return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pdata = i2c_pdata;</div><div class='del'>-	/*</div><div class='del'>-	 * pass the hwmod class's CPU-specific knowledge of I2C IP revision in</div><div class='del'>-	 * use, and functionality implementation flags, up to the OMAP I2C</div><div class='del'>-	 * driver via platform data</div><div class='del'>-	 */</div><div class='del'>-	pdata-&gt;rev = oh-&gt;class-&gt;rev;</div><div class='del'>-</div><div class='del'>-	dev_attr = (struct omap_i2c_dev_attr *)oh-&gt;dev_attr;</div><div class='del'>-	pdata-&gt;flags = dev_attr-&gt;flags;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When waiting for completion of a i2c transfer, we need to</div><div class='del'>-	 * set a wake up latency constraint for the MPU. This is to</div><div class='del'>-	 * ensure quick enough wakeup from idle, when transfer</div><div class='del'>-	 * completes.</div><div class='del'>-	 * Only omap3 has support for constraints</div><div class='del'>-	 */</div><div class='del'>-	if (cpu_is_omap34xx())</div><div class='del'>-		pdata-&gt;set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat_compat;</div><div class='del'>-	pdev = omap_device_build(name, bus_id, oh, pdata,</div><div class='del'>-				 sizeof(struct omap_i2c_bus_platform_data));</div><div class='del'>-	WARN(IS_ERR(pdev), "Could not build omap_device for %s\n", name);</div><div class='del'>-</div><div class='del'>-	return PTR_ERR_OR_ZERO(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static  int __init omap_i2c_cmdline(void)</div><div class='del'>-{</div><div class='del'>-	return omap_register_i2c_bus_cmdline();</div><div class='del'>-}</div><div class='del'>-omap_subsys_initcall(omap_i2c_cmdline);</div><div class='head'>diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c<br/>index cc6d9fa60924..e2274a162b74 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/id.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/id.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/id.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/id.c</a></div><div class='hunk'>@@ -223,7 +223,15 @@ static void __init omap3_cpuinfo(void)</div><div class='ctx'> 	 * and CPU class bits.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (soc_is_omap3630()) {</div><div class='del'>-		cpu_name = "OMAP3630";</div><div class='add'>+		if (omap3_has_iva() &amp;&amp; omap3_has_sgx()) {</div><div class='add'>+			cpu_name = (omap3_has_isp()) ? "OMAP3630/DM3730" : "OMAP3621";</div><div class='add'>+		} else if (omap3_has_iva()) {</div><div class='add'>+			cpu_name = "DM3725";</div><div class='add'>+		} else if (omap3_has_sgx()) {</div><div class='add'>+			cpu_name = "OMAP3615/AM3715";</div><div class='add'>+		} else {</div><div class='add'>+			cpu_name = (omap3_has_isp()) ? "AM3703" : "OMAP3611";</div><div class='add'>+		}</div><div class='ctx'> 	} else if (soc_is_am35xx()) {</div><div class='ctx'> 		cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";</div><div class='ctx'> 	} else if (soc_is_ti816x()) {</div><div class='head'>diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c<br/>index 0e9acdd95d70..5aafb8449c40 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/io.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/io.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/io.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/io.c</a></div><div class='hunk'>@@ -427,7 +427,6 @@ static void __init omap_hwmod_init_postsetup(void)</div><div class='ctx'> </div><div class='ctx'> static void __init __maybe_unused omap_common_late_init(void)</div><div class='ctx'> {</div><div class='del'>-	omap_mux_late_init();</div><div class='ctx'> 	omap2_common_pm_late_init();</div><div class='ctx'> 	omap_soc_device_init();</div><div class='ctx'> }</div><div class='hunk'>@@ -717,10 +716,11 @@ void __init omap5_init_early(void)</div><div class='ctx'> 			      OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE));</div><div class='ctx'> 	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));</div><div class='ctx'> 	omap2_control_base_init();</div><div class='del'>-	omap4_pm_init_early();</div><div class='ctx'> 	omap2_prcm_base_init();</div><div class='ctx'> 	omap5xxx_check_revision();</div><div class='ctx'> 	omap4_sar_ram_init();</div><div class='add'>+	omap4_mpuss_early_init();</div><div class='add'>+	omap4_pm_init_early();</div><div class='ctx'> 	omap54xx_voltagedomains_init();</div><div class='ctx'> 	omap54xx_powerdomains_init();</div><div class='ctx'> 	omap54xx_clockdomains_init();</div><div class='head'>diff --git a/arch/arm/mach-omap2/msdi.c b/arch/arm/mach-omap2/msdi.c<br/>index 8bdf182422bd..5a3bc3de58d0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/msdi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/msdi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/msdi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/msdi.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include "control.h"</div><div class='ctx'> #include "omap_hwmod.h"</div><div class='ctx'> #include "omap_device.h"</div><div class='del'>-#include "mux.h"</div><div class='ctx'> #include "mmc.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c<br/>deleted file mode 100644<br/>index 176eef6ef338..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/mux.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/mux.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1153 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/arm/mach-omap2/mux.c</div><div class='del'>- *</div><div class='del'>- * OMAP2, OMAP3 and OMAP4 pin multiplexing configurations</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2004 - 2010 Texas Instruments Inc.</div><div class='del'>- * Copyright (C) 2003 - 2008 Nokia Corporation</div><div class='del'>- *</div><div class='del'>- * Written by Tony Lindgren</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include "omap_hwmod.h"</div><div class='del'>-</div><div class='del'>-#include "soc.h"</div><div class='del'>-#include "control.h"</div><div class='del'>-#include "mux.h"</div><div class='del'>-#include "prm.h"</div><div class='del'>-#include "common.h"</div><div class='del'>-</div><div class='del'>-#define OMAP_MUX_BASE_OFFSET		0x30	/* Offset from CTRL_BASE */</div><div class='del'>-#define OMAP_MUX_BASE_SZ		0x5ca</div><div class='del'>-</div><div class='del'>-struct omap_mux_entry {</div><div class='del'>-	struct omap_mux		mux;</div><div class='del'>-	struct list_head	node;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static LIST_HEAD(mux_partitions);</div><div class='del'>-static DEFINE_MUTEX(muxmode_mutex);</div><div class='del'>-</div><div class='del'>-struct omap_mux_partition *omap_mux_get(const char *name)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *partition;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(partition, &amp;mux_partitions, node) {</div><div class='del'>-		if (!strcmp(name, partition-&gt;name))</div><div class='del'>-			return partition;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 omap_mux_read(struct omap_mux_partition *partition, u16 reg)</div><div class='del'>-{</div><div class='del'>-	if (partition-&gt;flags &amp; OMAP_MUX_REG_8BIT)</div><div class='del'>-		return readb_relaxed(partition-&gt;base + reg);</div><div class='del'>-	else</div><div class='del'>-		return readw_relaxed(partition-&gt;base + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void omap_mux_write(struct omap_mux_partition *partition, u16 val,</div><div class='del'>-			   u16 reg)</div><div class='del'>-{</div><div class='del'>-	if (partition-&gt;flags &amp; OMAP_MUX_REG_8BIT)</div><div class='del'>-		writeb_relaxed(val, partition-&gt;base + reg);</div><div class='del'>-	else</div><div class='del'>-		writew_relaxed(val, partition-&gt;base + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void omap_mux_write_array(struct omap_mux_partition *partition,</div><div class='del'>-				 struct omap_board_mux *board_mux)</div><div class='del'>-{</div><div class='del'>-	if (!board_mux)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	while (board_mux-&gt;reg_offset != OMAP_MUX_TERMINATOR) {</div><div class='del'>-		omap_mux_write(partition, board_mux-&gt;value,</div><div class='del'>-			       board_mux-&gt;reg_offset);</div><div class='del'>-		board_mux++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_OMAP_MUX</div><div class='del'>-</div><div class='del'>-static char *omap_mux_options;</div><div class='del'>-</div><div class='del'>-static int __init _omap_mux_init_gpio(struct omap_mux_partition *partition,</div><div class='del'>-				      int gpio, int val)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_entry *e;</div><div class='del'>-	struct omap_mux *gpio_mux = NULL;</div><div class='del'>-	u16 old_mode;</div><div class='del'>-	u16 mux_mode;</div><div class='del'>-	int found = 0;</div><div class='del'>-	struct list_head *muxmodes = &amp;partition-&gt;muxmodes;</div><div class='del'>-</div><div class='del'>-	if (!gpio)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(e, muxmodes, node) {</div><div class='del'>-		struct omap_mux *m = &amp;e-&gt;mux;</div><div class='del'>-		if (gpio == m-&gt;gpio) {</div><div class='del'>-			gpio_mux = m;</div><div class='del'>-			found++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (found == 0) {</div><div class='del'>-		pr_err("%s: Could not set gpio%i\n", __func__, gpio);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (found &gt; 1) {</div><div class='del'>-		pr_info("%s: Multiple gpio paths (%d) for gpio%i\n", __func__,</div><div class='del'>-			found, gpio);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	old_mode = omap_mux_read(partition, gpio_mux-&gt;reg_offset);</div><div class='del'>-	mux_mode = val &amp; ~(OMAP_MUX_NR_MODES - 1);</div><div class='del'>-	mux_mode |= partition-&gt;gpio;</div><div class='del'>-	pr_debug("%s: Setting signal %s.gpio%i 0x%04x -&gt; 0x%04x\n", __func__,</div><div class='del'>-		 gpio_mux-&gt;muxnames[0], gpio, old_mode, mux_mode);</div><div class='del'>-	omap_mux_write(partition, mux_mode, gpio_mux-&gt;reg_offset);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init omap_mux_init_gpio(int gpio, int val)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *partition;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(partition, &amp;mux_partitions, node) {</div><div class='del'>-		ret = _omap_mux_init_gpio(partition, gpio, val);</div><div class='del'>-		if (!ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init _omap_mux_get_by_name(struct omap_mux_partition *partition,</div><div class='del'>-					const char *muxname,</div><div class='del'>-					struct omap_mux **found_mux)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux *mux = NULL;</div><div class='del'>-	struct omap_mux_entry *e;</div><div class='del'>-	const char *mode_name;</div><div class='del'>-	int found = 0, found_mode = 0, mode0_len = 0;</div><div class='del'>-	struct list_head *muxmodes = &amp;partition-&gt;muxmodes;</div><div class='del'>-</div><div class='del'>-	mode_name = strchr(muxname, '.');</div><div class='del'>-	if (mode_name) {</div><div class='del'>-		mode0_len = strlen(muxname) - strlen(mode_name);</div><div class='del'>-		mode_name++;</div><div class='del'>-	} else {</div><div class='del'>-		mode_name = muxname;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(e, muxmodes, node) {</div><div class='del'>-		char *m0_entry;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		mux = &amp;e-&gt;mux;</div><div class='del'>-		m0_entry = mux-&gt;muxnames[0];</div><div class='del'>-</div><div class='del'>-		/* First check for full name in mode0.muxmode format */</div><div class='del'>-		if (mode0_len)</div><div class='del'>-			if (strncmp(muxname, m0_entry, mode0_len) ||</div><div class='del'>-			    (strlen(m0_entry) != mode0_len))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-		/* Then check for muxmode only */</div><div class='del'>-		for (i = 0; i &lt; OMAP_MUX_NR_MODES; i++) {</div><div class='del'>-			char *mode_cur = mux-&gt;muxnames[i];</div><div class='del'>-</div><div class='del'>-			if (!mode_cur)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (!strcmp(mode_name, mode_cur)) {</div><div class='del'>-				*found_mux = mux;</div><div class='del'>-				found++;</div><div class='del'>-				found_mode = i;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (found == 1) {</div><div class='del'>-		return found_mode;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (found &gt; 1) {</div><div class='del'>-		pr_err("%s: Multiple signal paths (%i) for %s\n", __func__,</div><div class='del'>-		       found, muxname);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init omap_mux_get_by_name(const char *muxname,</div><div class='del'>-			struct omap_mux_partition **found_partition,</div><div class='del'>-			struct omap_mux **found_mux)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *partition;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(partition, &amp;mux_partitions, node) {</div><div class='del'>-		struct omap_mux *mux = NULL;</div><div class='del'>-		int mux_mode = _omap_mux_get_by_name(partition, muxname, &amp;mux);</div><div class='del'>-		if (mux_mode &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		*found_partition = partition;</div><div class='del'>-		*found_mux = mux;</div><div class='del'>-</div><div class='del'>-		return mux_mode;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_err("%s: Could not find signal %s\n", __func__, muxname);</div><div class='del'>-</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init omap_mux_init_signal(const char *muxname, int val)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *partition = NULL;</div><div class='del'>-	struct omap_mux *mux = NULL;</div><div class='del'>-	u16 old_mode;</div><div class='del'>-	int mux_mode;</div><div class='del'>-</div><div class='del'>-	mux_mode = omap_mux_get_by_name(muxname, &amp;partition, &amp;mux);</div><div class='del'>-	if (mux_mode &lt; 0 || !mux)</div><div class='del'>-		return mux_mode;</div><div class='del'>-</div><div class='del'>-	old_mode = omap_mux_read(partition, mux-&gt;reg_offset);</div><div class='del'>-	mux_mode |= val;</div><div class='del'>-	pr_debug("%s: Setting signal %s 0x%04x -&gt; 0x%04x\n",</div><div class='del'>-			 __func__, muxname, old_mode, mux_mode);</div><div class='del'>-	omap_mux_write(partition, mux_mode, mux-&gt;reg_offset);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_mux_info * __init</div><div class='del'>-omap_hwmod_mux_init(struct omap_device_pad *bpads, int nr_pads)</div><div class='del'>-{</div><div class='del'>-	struct omap_hwmod_mux_info *hmux;</div><div class='del'>-	int i, nr_pads_dynamic = 0;</div><div class='del'>-</div><div class='del'>-	if (!bpads || nr_pads &lt; 1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	hmux = kzalloc(sizeof(struct omap_hwmod_mux_info), GFP_KERNEL);</div><div class='del'>-	if (!hmux)</div><div class='del'>-		goto err1;</div><div class='del'>-</div><div class='del'>-	hmux-&gt;nr_pads = nr_pads;</div><div class='del'>-</div><div class='del'>-	hmux-&gt;pads = kzalloc(sizeof(struct omap_device_pad) *</div><div class='del'>-				nr_pads, GFP_KERNEL);</div><div class='del'>-	if (!hmux-&gt;pads)</div><div class='del'>-		goto err2;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hmux-&gt;nr_pads; i++) {</div><div class='del'>-		struct omap_mux_partition *partition;</div><div class='del'>-		struct omap_device_pad *bpad = &amp;bpads[i], *pad = &amp;hmux-&gt;pads[i];</div><div class='del'>-		struct omap_mux *mux;</div><div class='del'>-		int mux_mode;</div><div class='del'>-</div><div class='del'>-		mux_mode = omap_mux_get_by_name(bpad-&gt;name, &amp;partition, &amp;mux);</div><div class='del'>-		if (mux_mode &lt; 0)</div><div class='del'>-			goto err3;</div><div class='del'>-		if (!pad-&gt;partition)</div><div class='del'>-			pad-&gt;partition = partition;</div><div class='del'>-		if (!pad-&gt;mux)</div><div class='del'>-			pad-&gt;mux = mux;</div><div class='del'>-</div><div class='del'>-		pad-&gt;name = kzalloc(strlen(bpad-&gt;name) + 1, GFP_KERNEL);</div><div class='del'>-		if (!pad-&gt;name) {</div><div class='del'>-			int j;</div><div class='del'>-</div><div class='del'>-			for (j = i - 1; j &gt;= 0; j--)</div><div class='del'>-				kfree(hmux-&gt;pads[j].name);</div><div class='del'>-			goto err3;</div><div class='del'>-		}</div><div class='del'>-		strcpy(pad-&gt;name, bpad-&gt;name);</div><div class='del'>-</div><div class='del'>-		pad-&gt;flags = bpad-&gt;flags;</div><div class='del'>-		pad-&gt;enable = bpad-&gt;enable;</div><div class='del'>-		pad-&gt;idle = bpad-&gt;idle;</div><div class='del'>-		pad-&gt;off = bpad-&gt;off;</div><div class='del'>-</div><div class='del'>-		if (pad-&gt;flags &amp;</div><div class='del'>-		    (OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP))</div><div class='del'>-			nr_pads_dynamic++;</div><div class='del'>-</div><div class='del'>-		pr_debug("%s: Initialized %s\n", __func__, pad-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!nr_pads_dynamic)</div><div class='del'>-		return hmux;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Add pads that need dynamic muxing into a separate list</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	hmux-&gt;nr_pads_dynamic = nr_pads_dynamic;</div><div class='del'>-	hmux-&gt;pads_dynamic = kzalloc(sizeof(struct omap_device_pad *) *</div><div class='del'>-					nr_pads_dynamic, GFP_KERNEL);</div><div class='del'>-	if (!hmux-&gt;pads_dynamic) {</div><div class='del'>-		pr_err("%s: Could not allocate dynamic pads\n", __func__);</div><div class='del'>-		return hmux;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nr_pads_dynamic = 0;</div><div class='del'>-	for (i = 0; i &lt; hmux-&gt;nr_pads; i++) {</div><div class='del'>-		struct omap_device_pad *pad = &amp;hmux-&gt;pads[i];</div><div class='del'>-</div><div class='del'>-		if (pad-&gt;flags &amp;</div><div class='del'>-		    (OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP)) {</div><div class='del'>-			pr_debug("%s: pad %s tagged dynamic\n",</div><div class='del'>-					__func__, pad-&gt;name);</div><div class='del'>-			hmux-&gt;pads_dynamic[nr_pads_dynamic] = pad;</div><div class='del'>-			nr_pads_dynamic++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hmux;</div><div class='del'>-</div><div class='del'>-err3:</div><div class='del'>-	kfree(hmux-&gt;pads);</div><div class='del'>-err2:</div><div class='del'>-	kfree(hmux);</div><div class='del'>-err1:</div><div class='del'>-	pr_err("%s: Could not allocate device mux entry\n", __func__);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_hwmod_mux_scan_wakeups - omap hwmod scan wakeup pads</div><div class='del'>- * @hmux: Pads for a hwmod</div><div class='del'>- * @mpu_irqs: MPU irq array for a hwmod</div><div class='del'>- *</div><div class='del'>- * Scans the wakeup status of pads for a single hwmod.  If an irq</div><div class='del'>- * array is defined for this mux, the parser will call the registered</div><div class='del'>- * ISRs for corresponding pads, otherwise the parser will stop at the</div><div class='del'>- * first wakeup active pad and return.  Returns true if there is a</div><div class='del'>- * pending and non-served wakeup event for the mux, otherwise false.</div><div class='del'>- */</div><div class='del'>-static bool omap_hwmod_mux_scan_wakeups(struct omap_hwmod_mux_info *hmux,</div><div class='del'>-		struct omap_hwmod_irq_info *mpu_irqs)</div><div class='del'>-{</div><div class='del'>-	int i, irq;</div><div class='del'>-	unsigned int val;</div><div class='del'>-	u32 handled_irqs = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hmux-&gt;nr_pads_dynamic; i++) {</div><div class='del'>-		struct omap_device_pad *pad = hmux-&gt;pads_dynamic[i];</div><div class='del'>-</div><div class='del'>-		if (!(pad-&gt;flags &amp; OMAP_DEVICE_PAD_WAKEUP) ||</div><div class='del'>-		    !(pad-&gt;idle &amp; OMAP_WAKEUP_EN))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		val = omap_mux_read(pad-&gt;partition, pad-&gt;mux-&gt;reg_offset);</div><div class='del'>-		if (!(val &amp; OMAP_WAKEUP_EVENT))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!hmux-&gt;irqs)</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-		irq = hmux-&gt;irqs[i];</div><div class='del'>-		/* make sure we only handle each irq once */</div><div class='del'>-		if (handled_irqs &amp; 1 &lt;&lt; irq)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		handled_irqs |= 1 &lt;&lt; irq;</div><div class='del'>-</div><div class='del'>-		generic_handle_irq(mpu_irqs[irq].irq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * _omap_hwmod_mux_handle_irq - Process wakeup events for a single hwmod</div><div class='del'>- *</div><div class='del'>- * Checks a single hwmod for every wakeup capable pad to see if there is an</div><div class='del'>- * active wakeup event. If this is the case, call the corresponding ISR.</div><div class='del'>- */</div><div class='del'>-static int _omap_hwmod_mux_handle_irq(struct omap_hwmod *oh, void *data)</div><div class='del'>-{</div><div class='del'>-	if (!oh-&gt;mux || !oh-&gt;mux-&gt;enabled)</div><div class='del'>-		return 0;</div><div class='del'>-	if (omap_hwmod_mux_scan_wakeups(oh-&gt;mux, oh-&gt;mpu_irqs))</div><div class='del'>-		generic_handle_irq(oh-&gt;mpu_irqs[0].irq);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_hwmod_mux_handle_irq - Process pad wakeup irqs.</div><div class='del'>- *</div><div class='del'>- * Calls a function for each registered omap_hwmod to check</div><div class='del'>- * pad wakeup statuses.</div><div class='del'>- */</div><div class='del'>-static irqreturn_t omap_hwmod_mux_handle_irq(int irq, void *unused)</div><div class='del'>-{</div><div class='del'>-	omap_hwmod_for_each(_omap_hwmod_mux_handle_irq, NULL);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Assumes the calling function takes care of locking */</div><div class='del'>-void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Runtime idling of dynamic pads */</div><div class='del'>-	if (state == _HWMOD_STATE_IDLE &amp;&amp; hmux-&gt;enabled) {</div><div class='del'>-		for (i = 0; i &lt; hmux-&gt;nr_pads_dynamic; i++) {</div><div class='del'>-			struct omap_device_pad *pad = hmux-&gt;pads_dynamic[i];</div><div class='del'>-			int val = -EINVAL;</div><div class='del'>-</div><div class='del'>-			val = pad-&gt;idle;</div><div class='del'>-			omap_mux_write(pad-&gt;partition, val,</div><div class='del'>-					pad-&gt;mux-&gt;reg_offset);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Runtime enabling of dynamic pads */</div><div class='del'>-	if ((state == _HWMOD_STATE_ENABLED) &amp;&amp; hmux-&gt;pads_dynamic</div><div class='del'>-					&amp;&amp; hmux-&gt;enabled) {</div><div class='del'>-		for (i = 0; i &lt; hmux-&gt;nr_pads_dynamic; i++) {</div><div class='del'>-			struct omap_device_pad *pad = hmux-&gt;pads_dynamic[i];</div><div class='del'>-			int val = -EINVAL;</div><div class='del'>-</div><div class='del'>-			val = pad-&gt;enable;</div><div class='del'>-			omap_mux_write(pad-&gt;partition, val,</div><div class='del'>-					pad-&gt;mux-&gt;reg_offset);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enabling or disabling of all pads */</div><div class='del'>-	for (i = 0; i &lt; hmux-&gt;nr_pads; i++) {</div><div class='del'>-		struct omap_device_pad *pad = &amp;hmux-&gt;pads[i];</div><div class='del'>-		int flags, val = -EINVAL;</div><div class='del'>-</div><div class='del'>-		flags = pad-&gt;flags;</div><div class='del'>-</div><div class='del'>-		switch (state) {</div><div class='del'>-		case _HWMOD_STATE_ENABLED:</div><div class='del'>-			val = pad-&gt;enable;</div><div class='del'>-			pr_debug("%s: Enabling %s %x\n", __func__,</div><div class='del'>-					pad-&gt;name, val);</div><div class='del'>-			break;</div><div class='del'>-		case _HWMOD_STATE_DISABLED:</div><div class='del'>-			/* Use safe mode unless OMAP_DEVICE_PAD_REMUX */</div><div class='del'>-			if (flags &amp; OMAP_DEVICE_PAD_REMUX)</div><div class='del'>-				val = pad-&gt;off;</div><div class='del'>-			else</div><div class='del'>-				val = OMAP_MUX_MODE7;</div><div class='del'>-			pr_debug("%s: Disabling %s %x\n", __func__,</div><div class='del'>-					pad-&gt;name, val);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			/* Nothing to be done */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (val &gt;= 0) {</div><div class='del'>-			omap_mux_write(pad-&gt;partition, val,</div><div class='del'>-					pad-&gt;mux-&gt;reg_offset);</div><div class='del'>-			pad-&gt;flags = flags;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (state == _HWMOD_STATE_ENABLED)</div><div class='del'>-		hmux-&gt;enabled = true;</div><div class='del'>-	else</div><div class='del'>-		hmux-&gt;enabled = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-</div><div class='del'>-#define OMAP_MUX_MAX_NR_FLAGS	10</div><div class='del'>-#define OMAP_MUX_TEST_FLAG(val, mask)				\</div><div class='del'>-	if (((val) &amp; (mask)) == (mask)) {			\</div><div class='del'>-		i++;						\</div><div class='del'>-		flags[i] =  #mask;				\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-/* REVISIT: Add checking for non-optimal mux settings */</div><div class='del'>-static inline void omap_mux_decode(struct seq_file *s, u16 val)</div><div class='del'>-{</div><div class='del'>-	char *flags[OMAP_MUX_MAX_NR_FLAGS];</div><div class='del'>-	char mode[sizeof("OMAP_MUX_MODE") + 1];</div><div class='del'>-	int i = -1;</div><div class='del'>-</div><div class='del'>-	sprintf(mode, "OMAP_MUX_MODE%d", val &amp; 0x7);</div><div class='del'>-	i++;</div><div class='del'>-	flags[i] = mode;</div><div class='del'>-</div><div class='del'>-	OMAP_MUX_TEST_FLAG(val, OMAP_PIN_OFF_WAKEUPENABLE);</div><div class='del'>-	if (val &amp; OMAP_OFF_EN) {</div><div class='del'>-		if (!(val &amp; OMAP_OFFOUT_EN)) {</div><div class='del'>-			if (!(val &amp; OMAP_OFF_PULL_UP)) {</div><div class='del'>-				OMAP_MUX_TEST_FLAG(val,</div><div class='del'>-					OMAP_PIN_OFF_INPUT_PULLDOWN);</div><div class='del'>-			} else {</div><div class='del'>-				OMAP_MUX_TEST_FLAG(val,</div><div class='del'>-					OMAP_PIN_OFF_INPUT_PULLUP);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (!(val &amp; OMAP_OFFOUT_VAL)) {</div><div class='del'>-				OMAP_MUX_TEST_FLAG(val,</div><div class='del'>-					OMAP_PIN_OFF_OUTPUT_LOW);</div><div class='del'>-			} else {</div><div class='del'>-				OMAP_MUX_TEST_FLAG(val,</div><div class='del'>-					OMAP_PIN_OFF_OUTPUT_HIGH);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (val &amp; OMAP_INPUT_EN) {</div><div class='del'>-		if (val &amp; OMAP_PULL_ENA) {</div><div class='del'>-			if (!(val &amp; OMAP_PULL_UP)) {</div><div class='del'>-				OMAP_MUX_TEST_FLAG(val,</div><div class='del'>-					OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-			} else {</div><div class='del'>-				OMAP_MUX_TEST_FLAG(val, OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			OMAP_MUX_TEST_FLAG(val, OMAP_PIN_INPUT);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		i++;</div><div class='del'>-		flags[i] = "OMAP_PIN_OUTPUT";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		seq_printf(s, "%s", flags[i]);</div><div class='del'>-		if (i &gt; 0)</div><div class='del'>-			seq_printf(s, " | ");</div><div class='del'>-	} while (i-- &gt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define OMAP_MUX_DEFNAME_LEN	32</div><div class='del'>-</div><div class='del'>-static int omap_mux_dbg_board_show(struct seq_file *s, void *unused)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *partition = s-&gt;private;</div><div class='del'>-	struct omap_mux_entry *e;</div><div class='del'>-	u8 omap_gen = omap_rev() &gt;&gt; 28;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(e, &amp;partition-&gt;muxmodes, node) {</div><div class='del'>-		struct omap_mux *m = &amp;e-&gt;mux;</div><div class='del'>-		char m0_def[OMAP_MUX_DEFNAME_LEN];</div><div class='del'>-		char *m0_name = m-&gt;muxnames[0];</div><div class='del'>-		u16 val;</div><div class='del'>-		int i, mode;</div><div class='del'>-</div><div class='del'>-		if (!m0_name)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* REVISIT: Needs to be updated if mode0 names get longer */</div><div class='del'>-		for (i = 0; i &lt; OMAP_MUX_DEFNAME_LEN; i++) {</div><div class='del'>-			if (m0_name[i] == '\0') {</div><div class='del'>-				m0_def[i] = m0_name[i];</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			m0_def[i] = toupper(m0_name[i]);</div><div class='del'>-		}</div><div class='del'>-		val = omap_mux_read(partition, m-&gt;reg_offset);</div><div class='del'>-		mode = val &amp; OMAP_MUX_MODE7;</div><div class='del'>-		if (mode != 0)</div><div class='del'>-			seq_printf(s, "/* %s */\n", m-&gt;muxnames[mode]);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: Might be revisited to support differences across</div><div class='del'>-		 * same OMAP generation.</div><div class='del'>-		 */</div><div class='del'>-		seq_printf(s, "OMAP%d_MUX(%s, ", omap_gen, m0_def);</div><div class='del'>-		omap_mux_decode(s, val);</div><div class='del'>-		seq_printf(s, "),\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int omap_mux_dbg_board_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, omap_mux_dbg_board_show, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations omap_mux_dbg_board_fops = {</div><div class='del'>-	.open		= omap_mux_dbg_board_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_mux_partition *omap_mux_get_partition(struct omap_mux *mux)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *partition;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(partition, &amp;mux_partitions, node) {</div><div class='del'>-		struct list_head *muxmodes = &amp;partition-&gt;muxmodes;</div><div class='del'>-		struct omap_mux_entry *e;</div><div class='del'>-</div><div class='del'>-		list_for_each_entry(e, muxmodes, node) {</div><div class='del'>-			struct omap_mux *m = &amp;e-&gt;mux;</div><div class='del'>-</div><div class='del'>-			if (m == mux)</div><div class='del'>-				return partition;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int omap_mux_dbg_signal_show(struct seq_file *s, void *unused)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux *m = s-&gt;private;</div><div class='del'>-	struct omap_mux_partition *partition;</div><div class='del'>-	const char *none = "NA";</div><div class='del'>-	u16 val;</div><div class='del'>-	int mode;</div><div class='del'>-</div><div class='del'>-	partition = omap_mux_get_partition(m);</div><div class='del'>-	if (!partition)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	val = omap_mux_read(partition, m-&gt;reg_offset);</div><div class='del'>-	mode = val &amp; OMAP_MUX_MODE7;</div><div class='del'>-</div><div class='del'>-	seq_printf(s, "name: %s.%s (0x%08x/0x%03x = 0x%04x), b %s, t %s\n",</div><div class='del'>-			m-&gt;muxnames[0], m-&gt;muxnames[mode],</div><div class='del'>-			partition-&gt;phys + m-&gt;reg_offset, m-&gt;reg_offset, val,</div><div class='del'>-			m-&gt;balls[0] ? m-&gt;balls[0] : none,</div><div class='del'>-			m-&gt;balls[1] ? m-&gt;balls[1] : none);</div><div class='del'>-	seq_printf(s, "mode: ");</div><div class='del'>-	omap_mux_decode(s, val);</div><div class='del'>-	seq_printf(s, "\n");</div><div class='del'>-	seq_printf(s, "signals: %s | %s | %s | %s | %s | %s | %s | %s\n",</div><div class='del'>-			m-&gt;muxnames[0] ? m-&gt;muxnames[0] : none,</div><div class='del'>-			m-&gt;muxnames[1] ? m-&gt;muxnames[1] : none,</div><div class='del'>-			m-&gt;muxnames[2] ? m-&gt;muxnames[2] : none,</div><div class='del'>-			m-&gt;muxnames[3] ? m-&gt;muxnames[3] : none,</div><div class='del'>-			m-&gt;muxnames[4] ? m-&gt;muxnames[4] : none,</div><div class='del'>-			m-&gt;muxnames[5] ? m-&gt;muxnames[5] : none,</div><div class='del'>-			m-&gt;muxnames[6] ? m-&gt;muxnames[6] : none,</div><div class='del'>-			m-&gt;muxnames[7] ? m-&gt;muxnames[7] : none);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define OMAP_MUX_MAX_ARG_CHAR  7</div><div class='del'>-</div><div class='del'>-static ssize_t omap_mux_dbg_signal_write(struct file *file,</div><div class='del'>-					 const char __user *user_buf,</div><div class='del'>-					 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct seq_file *seqf;</div><div class='del'>-	struct omap_mux *m;</div><div class='del'>-	u16 val;</div><div class='del'>-	int ret;</div><div class='del'>-	struct omap_mux_partition *partition;</div><div class='del'>-</div><div class='del'>-	if (count &gt; OMAP_MUX_MAX_ARG_CHAR)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ret = kstrtou16_from_user(user_buf, count, 0x10, &amp;val);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	seqf = file-&gt;private_data;</div><div class='del'>-	m = seqf-&gt;private;</div><div class='del'>-</div><div class='del'>-	partition = omap_mux_get_partition(m);</div><div class='del'>-	if (!partition)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	omap_mux_write(partition, val, m-&gt;reg_offset);</div><div class='del'>-	*ppos += count;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int omap_mux_dbg_signal_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, omap_mux_dbg_signal_show, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations omap_mux_dbg_signal_fops = {</div><div class='del'>-	.open		= omap_mux_dbg_signal_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.write		= omap_mux_dbg_signal_write,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dentry *mux_dbg_dir;</div><div class='del'>-</div><div class='del'>-static void __init omap_mux_dbg_create_entry(</div><div class='del'>-				struct omap_mux_partition *partition,</div><div class='del'>-				struct dentry *mux_dbg_dir)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_entry *e;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(e, &amp;partition-&gt;muxmodes, node) {</div><div class='del'>-		struct omap_mux *m = &amp;e-&gt;mux;</div><div class='del'>-</div><div class='del'>-		(void)debugfs_create_file(m-&gt;muxnames[0], S_IWUSR | S_IRUGO,</div><div class='del'>-					  mux_dbg_dir, m,</div><div class='del'>-					  &amp;omap_mux_dbg_signal_fops);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init omap_mux_dbg_init(void)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *partition;</div><div class='del'>-	static struct dentry *mux_dbg_board_dir;</div><div class='del'>-</div><div class='del'>-	mux_dbg_dir = debugfs_create_dir("omap_mux", NULL);</div><div class='del'>-	if (!mux_dbg_dir)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mux_dbg_board_dir = debugfs_create_dir("board", mux_dbg_dir);</div><div class='del'>-	if (!mux_dbg_board_dir)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(partition, &amp;mux_partitions, node) {</div><div class='del'>-		omap_mux_dbg_create_entry(partition, mux_dbg_dir);</div><div class='del'>-		(void)debugfs_create_file(partition-&gt;name, S_IRUGO,</div><div class='del'>-					  mux_dbg_board_dir, partition,</div><div class='del'>-					  &amp;omap_mux_dbg_board_fops);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-static inline void omap_mux_dbg_init(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif	/* CONFIG_DEBUG_FS */</div><div class='del'>-</div><div class='del'>-static void __init omap_mux_free_names(struct omap_mux *m)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; OMAP_MUX_NR_MODES; i++)</div><div class='del'>-		kfree(m-&gt;muxnames[i]);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-	for (i = 0; i &lt; OMAP_MUX_NR_SIDES; i++)</div><div class='del'>-		kfree(m-&gt;balls[i]);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Free all data except for GPIO pins unless CONFIG_DEBUG_FS is set */</div><div class='del'>-int __init omap_mux_late_init(void)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *partition;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(partition, &amp;mux_partitions, node) {</div><div class='del'>-		struct omap_mux_entry *e, *tmp;</div><div class='del'>-		list_for_each_entry_safe(e, tmp, &amp;partition-&gt;muxmodes, node) {</div><div class='del'>-			struct omap_mux *m = &amp;e-&gt;mux;</div><div class='del'>-			u16 mode = omap_mux_read(partition, m-&gt;reg_offset);</div><div class='del'>-</div><div class='del'>-			if (OMAP_MODE_GPIO(partition, mode))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_DEBUG_FS</div><div class='del'>-			mutex_lock(&amp;muxmode_mutex);</div><div class='del'>-			list_del(&amp;e-&gt;node);</div><div class='del'>-			mutex_unlock(&amp;muxmode_mutex);</div><div class='del'>-			omap_mux_free_names(m);</div><div class='del'>-			kfree(m);</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap_mux_dbg_init();</div><div class='del'>-</div><div class='del'>-	/* see pinctrl-single-omap for the wake-up interrupt handling */</div><div class='del'>-	if (of_have_populated_dt())</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = request_irq(omap_prcm_event_to_irq("io"),</div><div class='del'>-		omap_hwmod_mux_handle_irq, IRQF_SHARED | IRQF_NO_SUSPEND,</div><div class='del'>-			"hwmod_io", omap_mux_late_init);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		pr_warn("mux: Failed to setup hwmod io irq %d\n", ret);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init omap_mux_package_fixup(struct omap_mux *p,</div><div class='del'>-					struct omap_mux *superset)</div><div class='del'>-{</div><div class='del'>-	while (p-&gt;reg_offset !=  OMAP_MUX_TERMINATOR) {</div><div class='del'>-		struct omap_mux *s = superset;</div><div class='del'>-		int found = 0;</div><div class='del'>-</div><div class='del'>-		while (s-&gt;reg_offset != OMAP_MUX_TERMINATOR) {</div><div class='del'>-			if (s-&gt;reg_offset == p-&gt;reg_offset) {</div><div class='del'>-				*s = *p;</div><div class='del'>-				found++;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			s++;</div><div class='del'>-		}</div><div class='del'>-		if (!found)</div><div class='del'>-			pr_err("%s: Unknown entry offset 0x%x\n", __func__,</div><div class='del'>-			       p-&gt;reg_offset);</div><div class='del'>-		p++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-</div><div class='del'>-static void __init omap_mux_package_init_balls(struct omap_ball *b,</div><div class='del'>-				struct omap_mux *superset)</div><div class='del'>-{</div><div class='del'>-	while (b-&gt;reg_offset != OMAP_MUX_TERMINATOR) {</div><div class='del'>-		struct omap_mux *s = superset;</div><div class='del'>-		int found = 0;</div><div class='del'>-</div><div class='del'>-		while (s-&gt;reg_offset != OMAP_MUX_TERMINATOR) {</div><div class='del'>-			if (s-&gt;reg_offset == b-&gt;reg_offset) {</div><div class='del'>-				s-&gt;balls[0] = b-&gt;balls[0];</div><div class='del'>-				s-&gt;balls[1] = b-&gt;balls[1];</div><div class='del'>-				found++;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			s++;</div><div class='del'>-		}</div><div class='del'>-		if (!found)</div><div class='del'>-			pr_err("%s: Unknown ball offset 0x%x\n", __func__,</div><div class='del'>-			       b-&gt;reg_offset);</div><div class='del'>-		b++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else	/* CONFIG_DEBUG_FS */</div><div class='del'>-</div><div class='del'>-static inline void omap_mux_package_init_balls(struct omap_ball *b,</div><div class='del'>-					struct omap_mux *superset)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif	/* CONFIG_DEBUG_FS */</div><div class='del'>-</div><div class='del'>-static int __init omap_mux_setup(char *options)</div><div class='del'>-{</div><div class='del'>-	if (!options)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	omap_mux_options = options;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("omap_mux=", omap_mux_setup);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Note that the omap_mux=some.signal1=0x1234,some.signal2=0x1234</div><div class='del'>- * cmdline options only override the bootloader values.</div><div class='del'>- * During development, please enable CONFIG_DEBUG_FS, and use the</div><div class='del'>- * signal specific entries under debugfs.</div><div class='del'>- */</div><div class='del'>-static void __init omap_mux_set_cmdline_signals(void)</div><div class='del'>-{</div><div class='del'>-	char *options, *next_opt, *token;</div><div class='del'>-</div><div class='del'>-	if (!omap_mux_options)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	options = kstrdup(omap_mux_options, GFP_KERNEL);</div><div class='del'>-	if (!options)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	next_opt = options;</div><div class='del'>-</div><div class='del'>-	while ((token = strsep(&amp;next_opt, ",")) != NULL) {</div><div class='del'>-		char *keyval, *name;</div><div class='del'>-		u16 val;</div><div class='del'>-</div><div class='del'>-		keyval = token;</div><div class='del'>-		name = strsep(&amp;keyval, "=");</div><div class='del'>-		if (name) {</div><div class='del'>-			int res;</div><div class='del'>-</div><div class='del'>-			res = kstrtou16(keyval, 0x10, &amp;val);</div><div class='del'>-			if (res &lt; 0)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			omap_mux_init_signal(name, (u16)val);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init omap_mux_copy_names(struct omap_mux *src,</div><div class='del'>-				      struct omap_mux *dst)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; OMAP_MUX_NR_MODES; i++) {</div><div class='del'>-		if (src-&gt;muxnames[i]) {</div><div class='del'>-			dst-&gt;muxnames[i] = kstrdup(src-&gt;muxnames[i],</div><div class='del'>-						   GFP_KERNEL);</div><div class='del'>-			if (!dst-&gt;muxnames[i])</div><div class='del'>-				goto free;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-	for (i = 0; i &lt; OMAP_MUX_NR_SIDES; i++) {</div><div class='del'>-		if (src-&gt;balls[i]) {</div><div class='del'>-			dst-&gt;balls[i] = kstrdup(src-&gt;balls[i], GFP_KERNEL);</div><div class='del'>-			if (!dst-&gt;balls[i])</div><div class='del'>-				goto free;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-free:</div><div class='del'>-	omap_mux_free_names(dst);</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif	/* CONFIG_OMAP_MUX */</div><div class='del'>-</div><div class='del'>-static struct omap_mux *omap_mux_get_by_gpio(</div><div class='del'>-				struct omap_mux_partition *partition,</div><div class='del'>-				int gpio)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_entry *e;</div><div class='del'>-	struct omap_mux *ret = NULL;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(e, &amp;partition-&gt;muxmodes, node) {</div><div class='del'>-		struct omap_mux *m = &amp;e-&gt;mux;</div><div class='del'>-		if (m-&gt;gpio == gpio) {</div><div class='del'>-			ret = m;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Needed for dynamic muxing of GPIO pins for off-idle */</div><div class='del'>-u16 omap_mux_get_gpio(int gpio)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *partition;</div><div class='del'>-	struct omap_mux *m = NULL;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(partition, &amp;mux_partitions, node) {</div><div class='del'>-		m = omap_mux_get_by_gpio(partition, gpio);</div><div class='del'>-		if (m)</div><div class='del'>-			return omap_mux_read(partition, m-&gt;reg_offset);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!m || m-&gt;reg_offset == OMAP_MUX_TERMINATOR)</div><div class='del'>-		pr_err("%s: Could not get gpio%i\n", __func__, gpio);</div><div class='del'>-</div><div class='del'>-	return OMAP_MUX_TERMINATOR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Needed for dynamic muxing of GPIO pins for off-idle */</div><div class='del'>-void omap_mux_set_gpio(u16 val, int gpio)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *partition;</div><div class='del'>-	struct omap_mux *m = NULL;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(partition, &amp;mux_partitions, node) {</div><div class='del'>-		m = omap_mux_get_by_gpio(partition, gpio);</div><div class='del'>-		if (m) {</div><div class='del'>-			omap_mux_write(partition, val, m-&gt;reg_offset);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!m || m-&gt;reg_offset == OMAP_MUX_TERMINATOR)</div><div class='del'>-		pr_err("%s: Could not set gpio%i\n", __func__, gpio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct omap_mux * __init omap_mux_list_add(</div><div class='del'>-					struct omap_mux_partition *partition,</div><div class='del'>-					struct omap_mux *src)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_entry *entry;</div><div class='del'>-	struct omap_mux *m;</div><div class='del'>-</div><div class='del'>-	entry = kzalloc(sizeof(struct omap_mux_entry), GFP_KERNEL);</div><div class='del'>-	if (!entry)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	m = &amp;entry-&gt;mux;</div><div class='del'>-	entry-&gt;mux = *src;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_OMAP_MUX</div><div class='del'>-	if (omap_mux_copy_names(src, m)) {</div><div class='del'>-		kfree(entry);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;muxmode_mutex);</div><div class='del'>-	list_add_tail(&amp;entry-&gt;node, &amp;partition-&gt;muxmodes);</div><div class='del'>-	mutex_unlock(&amp;muxmode_mutex);</div><div class='del'>-</div><div class='del'>-	return m;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Note if CONFIG_OMAP_MUX is not selected, we will only initialize</div><div class='del'>- * the GPIO to mux offset mapping that is needed for dynamic muxing</div><div class='del'>- * of GPIO pins for off-idle.</div><div class='del'>- */</div><div class='del'>-static void __init omap_mux_init_list(struct omap_mux_partition *partition,</div><div class='del'>-				      struct omap_mux *superset)</div><div class='del'>-{</div><div class='del'>-	while (superset-&gt;reg_offset !=  OMAP_MUX_TERMINATOR) {</div><div class='del'>-		struct omap_mux *entry;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_OMAP_MUX</div><div class='del'>-		if (!superset-&gt;muxnames[0]) {</div><div class='del'>-			superset++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		/* Skip pins that are not muxed as GPIO by bootloader */</div><div class='del'>-		if (!OMAP_MODE_GPIO(partition, omap_mux_read(partition,</div><div class='del'>-				    superset-&gt;reg_offset))) {</div><div class='del'>-			superset++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		entry = omap_mux_list_add(partition, superset);</div><div class='del'>-		if (!entry) {</div><div class='del'>-			pr_err("%s: Could not add entry\n", __func__);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		superset++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_OMAP_MUX</div><div class='del'>-</div><div class='del'>-static void omap_mux_init_package(struct omap_mux *superset,</div><div class='del'>-				  struct omap_mux *package_subset,</div><div class='del'>-				  struct omap_ball *package_balls)</div><div class='del'>-{</div><div class='del'>-	if (package_subset)</div><div class='del'>-		omap_mux_package_fixup(package_subset, superset);</div><div class='del'>-	if (package_balls)</div><div class='del'>-		omap_mux_package_init_balls(package_balls, superset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init omap_mux_init_signals(struct omap_mux_partition *partition,</div><div class='del'>-					 struct omap_board_mux *board_mux)</div><div class='del'>-{</div><div class='del'>-	omap_mux_set_cmdline_signals();</div><div class='del'>-	omap_mux_write_array(partition, board_mux);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static void omap_mux_init_package(struct omap_mux *superset,</div><div class='del'>-				  struct omap_mux *package_subset,</div><div class='del'>-				  struct omap_ball *package_balls)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init omap_mux_init_signals(struct omap_mux_partition *partition,</div><div class='del'>-					 struct omap_board_mux *board_mux)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static u32 mux_partitions_cnt;</div><div class='del'>-</div><div class='del'>-int __init omap_mux_init(const char *name, u32 flags,</div><div class='del'>-			 u32 mux_pbase, u32 mux_size,</div><div class='del'>-			 struct omap_mux *superset,</div><div class='del'>-			 struct omap_mux *package_subset,</div><div class='del'>-			 struct omap_board_mux *board_mux,</div><div class='del'>-			 struct omap_ball *package_balls)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *partition;</div><div class='del'>-</div><div class='del'>-	partition = kzalloc(sizeof(struct omap_mux_partition), GFP_KERNEL);</div><div class='del'>-	if (!partition)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	partition-&gt;name = name;</div><div class='del'>-	partition-&gt;flags = flags;</div><div class='del'>-	partition-&gt;gpio = flags &amp; OMAP_MUX_MODE7;</div><div class='del'>-	partition-&gt;size = mux_size;</div><div class='del'>-	partition-&gt;phys = mux_pbase;</div><div class='del'>-	partition-&gt;base = ioremap(mux_pbase, mux_size);</div><div class='del'>-	if (!partition-&gt;base) {</div><div class='del'>-		pr_err("%s: Could not ioremap mux partition at 0x%08x\n",</div><div class='del'>-			__func__, partition-&gt;phys);</div><div class='del'>-		kfree(partition);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;partition-&gt;muxmodes);</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;partition-&gt;node, &amp;mux_partitions);</div><div class='del'>-	mux_partitions_cnt++;</div><div class='del'>-	pr_info("%s: Add partition: #%d: %s, flags: %x\n", __func__,</div><div class='del'>-		mux_partitions_cnt, partition-&gt;name, partition-&gt;flags);</div><div class='del'>-</div><div class='del'>-	omap_mux_init_package(superset, package_subset, package_balls);</div><div class='del'>-	omap_mux_init_list(partition, superset);</div><div class='del'>-	omap_mux_init_signals(partition, board_mux);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h<br/>deleted file mode 100644<br/>index d121fb6df4e6..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/mux.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/mux.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,352 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 Nokia</div><div class='del'>- * Copyright (C) 2009-2010 Texas Instruments</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "mux34xx.h"</div><div class='del'>-</div><div class='del'>-#define OMAP_MUX_TERMINATOR	0xffff</div><div class='del'>-</div><div class='del'>-/* 34xx mux mode options for each pin. See TRM for options */</div><div class='del'>-#define OMAP_MUX_MODE0      0</div><div class='del'>-#define OMAP_MUX_MODE1      1</div><div class='del'>-#define OMAP_MUX_MODE2      2</div><div class='del'>-#define OMAP_MUX_MODE3      3</div><div class='del'>-#define OMAP_MUX_MODE4      4</div><div class='del'>-#define OMAP_MUX_MODE5      5</div><div class='del'>-#define OMAP_MUX_MODE6      6</div><div class='del'>-#define OMAP_MUX_MODE7      7</div><div class='del'>-</div><div class='del'>-/* 24xx/34xx mux bit defines */</div><div class='del'>-#define OMAP_PULL_ENA			(1 &lt;&lt; 3)</div><div class='del'>-#define OMAP_PULL_UP			(1 &lt;&lt; 4)</div><div class='del'>-#define OMAP_ALTELECTRICALSEL		(1 &lt;&lt; 5)</div><div class='del'>-</div><div class='del'>-/* omap3/4/5 specific mux bit defines */</div><div class='del'>-#define OMAP_INPUT_EN			(1 &lt;&lt; 8)</div><div class='del'>-#define OMAP_OFF_EN			(1 &lt;&lt; 9)</div><div class='del'>-#define OMAP_OFFOUT_EN			(1 &lt;&lt; 10)</div><div class='del'>-#define OMAP_OFFOUT_VAL			(1 &lt;&lt; 11)</div><div class='del'>-#define OMAP_OFF_PULL_EN		(1 &lt;&lt; 12)</div><div class='del'>-#define OMAP_OFF_PULL_UP		(1 &lt;&lt; 13)</div><div class='del'>-#define OMAP_WAKEUP_EN			(1 &lt;&lt; 14)</div><div class='del'>-#define OMAP_WAKEUP_EVENT		(1 &lt;&lt; 15)</div><div class='del'>-</div><div class='del'>-/* Active pin states */</div><div class='del'>-#define OMAP_PIN_OUTPUT			0</div><div class='del'>-#define OMAP_PIN_INPUT			OMAP_INPUT_EN</div><div class='del'>-#define OMAP_PIN_INPUT_PULLUP		(OMAP_PULL_ENA | OMAP_INPUT_EN \</div><div class='del'>-						| OMAP_PULL_UP)</div><div class='del'>-#define OMAP_PIN_INPUT_PULLDOWN		(OMAP_PULL_ENA | OMAP_INPUT_EN)</div><div class='del'>-</div><div class='del'>-/* Off mode states */</div><div class='del'>-#define OMAP_PIN_OFF_NONE		0</div><div class='del'>-#define OMAP_PIN_OFF_OUTPUT_HIGH	(OMAP_OFF_EN | OMAP_OFFOUT_EN \</div><div class='del'>-						| OMAP_OFFOUT_VAL)</div><div class='del'>-#define OMAP_PIN_OFF_OUTPUT_LOW		(OMAP_OFF_EN | OMAP_OFFOUT_EN)</div><div class='del'>-#define OMAP_PIN_OFF_INPUT_PULLUP	(OMAP_OFF_EN | OMAP_OFF_PULL_EN \</div><div class='del'>-						| OMAP_OFF_PULL_UP)</div><div class='del'>-#define OMAP_PIN_OFF_INPUT_PULLDOWN	(OMAP_OFF_EN | OMAP_OFF_PULL_EN)</div><div class='del'>-#define OMAP_PIN_OFF_WAKEUPENABLE	OMAP_WAKEUP_EN</div><div class='del'>-</div><div class='del'>-#define OMAP_MODE_GPIO(partition, x)	(((x) &amp; OMAP_MUX_MODE7) == \</div><div class='del'>-					  partition-&gt;gpio)</div><div class='del'>-#define OMAP_MODE_UART(x)	(((x) &amp; OMAP_MUX_MODE7) == OMAP_MUX_MODE0)</div><div class='del'>-</div><div class='del'>-/* Flags for omapX_mux_init */</div><div class='del'>-#define OMAP_PACKAGE_MASK		0xffff</div><div class='del'>-#define OMAP_PACKAGE_CBP		6		/* 515-pin 0.40 0.50 */</div><div class='del'>-#define OMAP_PACKAGE_CUS		5		/* 423-pin 0.65 */</div><div class='del'>-#define OMAP_PACKAGE_CBB		4		/* 515-pin 0.40 0.50 */</div><div class='del'>-#define OMAP_PACKAGE_CBC		3		/* 515-pin 0.50 0.65 */</div><div class='del'>-</div><div class='del'>-#define OMAP_MUX_NR_MODES		8		/* Available modes */</div><div class='del'>-#define OMAP_MUX_NR_SIDES		2		/* Bottom &amp; top */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * omap_mux_init flags definition:</div><div class='del'>- *</div><div class='del'>- * OMAP_GPIO_MUX_MODE, bits 0-2: gpio muxing mode, same like pad control</div><div class='del'>- *      register which includes values from 0-7.</div><div class='del'>- * OMAP_MUX_REG_8BIT: Ensure that access to padconf is done in 8 bits.</div><div class='del'>- * The default value is 16 bits.</div><div class='del'>- */</div><div class='del'>-#define OMAP_MUX_GPIO_IN_MODE0		OMAP_MUX_MODE0</div><div class='del'>-#define OMAP_MUX_GPIO_IN_MODE1		OMAP_MUX_MODE1</div><div class='del'>-#define OMAP_MUX_GPIO_IN_MODE2		OMAP_MUX_MODE2</div><div class='del'>-#define OMAP_MUX_GPIO_IN_MODE3		OMAP_MUX_MODE3</div><div class='del'>-#define OMAP_MUX_GPIO_IN_MODE4		OMAP_MUX_MODE4</div><div class='del'>-#define OMAP_MUX_GPIO_IN_MODE5		OMAP_MUX_MODE5</div><div class='del'>-#define OMAP_MUX_GPIO_IN_MODE6		OMAP_MUX_MODE6</div><div class='del'>-#define OMAP_MUX_GPIO_IN_MODE7		OMAP_MUX_MODE7</div><div class='del'>-#define OMAP_MUX_REG_8BIT		(1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct omap_board_data - board specific device data</div><div class='del'>- * @id: instance id</div><div class='del'>- * @flags: additional flags for platform init code</div><div class='del'>- * @pads: array of device specific pads</div><div class='del'>- * @pads_cnt: ARRAY_SIZE() of pads</div><div class='del'>- */</div><div class='del'>-struct omap_board_data {</div><div class='del'>-	int			id;</div><div class='del'>-	u32			flags;</div><div class='del'>-	struct omap_device_pad	*pads;</div><div class='del'>-	int			pads_cnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct mux_partition - contain partition related information</div><div class='del'>- * @name: name of the current partition</div><div class='del'>- * @flags: flags specific to this partition</div><div class='del'>- * @gpio: gpio mux mode</div><div class='del'>- * @phys: physical address</div><div class='del'>- * @size: partition size</div><div class='del'>- * @base: virtual address after ioremap</div><div class='del'>- * @muxmodes: list of nodes that belong to a partition</div><div class='del'>- * @node: list node for the partitions linked list</div><div class='del'>- */</div><div class='del'>-struct omap_mux_partition {</div><div class='del'>-	const char		*name;</div><div class='del'>-	u32			flags;</div><div class='del'>-	u32			gpio;</div><div class='del'>-	u32			phys;</div><div class='del'>-	u32			size;</div><div class='del'>-	void __iomem		*base;</div><div class='del'>-	struct list_head	muxmodes;</div><div class='del'>-	struct list_head	node;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct omap_mux - data for omap mux register offset and it's value</div><div class='del'>- * @reg_offset:	mux register offset from the mux base</div><div class='del'>- * @gpio:	GPIO number</div><div class='del'>- * @muxnames:	available signal modes for a ball</div><div class='del'>- * @balls:	available balls on the package</div><div class='del'>- */</div><div class='del'>-struct omap_mux {</div><div class='del'>-	u16	reg_offset;</div><div class='del'>-	u16	gpio;</div><div class='del'>-#ifdef CONFIG_OMAP_MUX</div><div class='del'>-	char	*muxnames[OMAP_MUX_NR_MODES];</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-	char	*balls[OMAP_MUX_NR_SIDES];</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct omap_ball - data for balls on omap package</div><div class='del'>- * @reg_offset:	mux register offset from the mux base</div><div class='del'>- * @balls:	available balls on the package</div><div class='del'>- */</div><div class='del'>-struct omap_ball {</div><div class='del'>-	u16	reg_offset;</div><div class='del'>-	char	*balls[OMAP_MUX_NR_SIDES];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct omap_board_mux - data for initializing mux registers</div><div class='del'>- * @reg_offset:	mux register offset from the mux base</div><div class='del'>- * @mux_value:	desired mux value to set</div><div class='del'>- */</div><div class='del'>-struct omap_board_mux {</div><div class='del'>-	u16	reg_offset;</div><div class='del'>-	u16	value;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define OMAP_DEVICE_PAD_REMUX		BIT(1)	/* Dynamically remux a pad,</div><div class='del'>-						   needs enable, idle and off</div><div class='del'>-						   values */</div><div class='del'>-#define OMAP_DEVICE_PAD_WAKEUP		BIT(0)	/* Pad is wake-up capable */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct omap_device_pad - device specific pad configuration</div><div class='del'>- * @name:		signal name</div><div class='del'>- * @flags:		pad specific runtime flags</div><div class='del'>- * @enable:		runtime value for a pad</div><div class='del'>- * @idle:		idle value for a pad</div><div class='del'>- * @off:		off value for a pad, defaults to safe mode</div><div class='del'>- * @partition:		mux partition</div><div class='del'>- * @mux:		mux register</div><div class='del'>- */</div><div class='del'>-struct omap_device_pad {</div><div class='del'>-	char				*name;</div><div class='del'>-	u8				flags;</div><div class='del'>-	u16				enable;</div><div class='del'>-	u16				idle;</div><div class='del'>-	u16				off;</div><div class='del'>-	struct omap_mux_partition	*partition;</div><div class='del'>-	struct omap_mux			*mux;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_mux_info;</div><div class='del'>-</div><div class='del'>-#define OMAP_MUX_STATIC(signal, mode)					\</div><div class='del'>-{									\</div><div class='del'>-	.name	= (signal),						\</div><div class='del'>-	.enable	= (mode),						\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_OMAP_MUX)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_mux_init_gpio - initialize a signal based on the GPIO number</div><div class='del'>- * @gpio:		GPIO number</div><div class='del'>- * @val:		Options for the mux register value</div><div class='del'>- */</div><div class='del'>-int omap_mux_init_gpio(int gpio, int val);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_mux_init_signal - initialize a signal based on the signal name</div><div class='del'>- * @muxname:		Mux name in mode0_name.signal_name format</div><div class='del'>- * @val:		Options for the mux register value</div><div class='del'>- */</div><div class='del'>-int omap_mux_init_signal(const char *muxname, int val);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_hwmod_mux_init - initialize hwmod specific mux data</div><div class='del'>- * @bpads:		Board specific device signal names</div><div class='del'>- * @nr_pads:		Number of signal names for the device</div><div class='del'>- */</div><div class='del'>-extern struct omap_hwmod_mux_info *</div><div class='del'>-omap_hwmod_mux_init(struct omap_device_pad *bpads, int nr_pads);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_hwmod_mux - omap hwmod specific pin muxing</div><div class='del'>- * @hmux:		Pads for a hwmod</div><div class='del'>- * @state:		Desired _HWMOD_STATE</div><div class='del'>- *</div><div class='del'>- * Called only from omap_hwmod.c, do not use.</div><div class='del'>- */</div><div class='del'>-void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state);</div><div class='del'>-</div><div class='del'>-int omap_mux_get_by_name(const char *muxname,</div><div class='del'>-		struct omap_mux_partition **found_partition,</div><div class='del'>-		struct omap_mux **found_mux);</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline int omap_mux_get_by_name(const char *muxname,</div><div class='del'>-		struct omap_mux_partition **found_partition,</div><div class='del'>-		struct omap_mux **found_mux)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int omap_mux_init_gpio(int gpio, int val)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline int omap_mux_init_signal(char *muxname, int val)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct omap_hwmod_mux_info *</div><div class='del'>-omap_hwmod_mux_init(struct omap_device_pad *bpads, int nr_pads)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct omap_board_mux *board_mux __maybe_unused;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_mux_get_gpio() - get mux register value based on GPIO number</div><div class='del'>- * @gpio:		GPIO number</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-u16 omap_mux_get_gpio(int gpio);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_mux_set_gpio() - set mux register value based on GPIO number</div><div class='del'>- * @val:		New mux register value</div><div class='del'>- * @gpio:		GPIO number</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-void omap_mux_set_gpio(u16 val, int gpio);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_mux_get() - get a mux partition by name</div><div class='del'>- * @name:		Name of the mux partition</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-struct omap_mux_partition *omap_mux_get(const char *name);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_mux_read() - read mux register</div><div class='del'>- * @partition:		Mux partition</div><div class='del'>- * @mux_offset:		Offset of the mux register</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-u16 omap_mux_read(struct omap_mux_partition *p, u16 mux_offset);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_mux_write() - write mux register</div><div class='del'>- * @partition:		Mux partition</div><div class='del'>- * @val:		New mux register value</div><div class='del'>- * @mux_offset:		Offset of the mux register</div><div class='del'>- *</div><div class='del'>- * This should be only needed for dynamic remuxing of non-gpio signals.</div><div class='del'>- */</div><div class='del'>-void omap_mux_write(struct omap_mux_partition *p, u16 val, u16 mux_offset);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_mux_write_array() - write an array of mux registers</div><div class='del'>- * @partition:		Mux partition</div><div class='del'>- * @board_mux:		Array of mux registers terminated by MAP_MUX_TERMINATOR</div><div class='del'>- *</div><div class='del'>- * This should be only needed for dynamic remuxing of non-gpio signals.</div><div class='del'>- */</div><div class='del'>-void omap_mux_write_array(struct omap_mux_partition *p,</div><div class='del'>-			  struct omap_board_mux *board_mux);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap2420_mux_init() - initialize mux system with board specific set</div><div class='del'>- * @board_mux:		Board specific mux table</div><div class='del'>- * @flags:		OMAP package type used for the board</div><div class='del'>- */</div><div class='del'>-int omap2420_mux_init(struct omap_board_mux *board_mux, int flags);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap2430_mux_init() - initialize mux system with board specific set</div><div class='del'>- * @board_mux:		Board specific mux table</div><div class='del'>- * @flags:		OMAP package type used for the board</div><div class='del'>- */</div><div class='del'>-int omap2430_mux_init(struct omap_board_mux *board_mux, int flags);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap3_mux_init() - initialize mux system with board specific set</div><div class='del'>- * @board_mux:		Board specific mux table</div><div class='del'>- * @flags:		OMAP package type used for the board</div><div class='del'>- */</div><div class='del'>-int omap3_mux_init(struct omap_board_mux *board_mux, int flags);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap4_mux_init() - initialize mux system with board specific set</div><div class='del'>- * @board_subset:	Board specific mux table</div><div class='del'>- * @board_wkup_subset:	Board specific mux table for wakeup instance</div><div class='del'>- * @flags:		OMAP package type used for the board</div><div class='del'>- */</div><div class='del'>-int omap4_mux_init(struct omap_board_mux *board_subset,</div><div class='del'>-	struct omap_board_mux *board_wkup_subset, int flags);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_mux_init - private mux init function, do not call</div><div class='del'>- */</div><div class='del'>-int omap_mux_init(const char *name, u32 flags,</div><div class='del'>-		  u32 mux_pbase, u32 mux_size,</div><div class='del'>-		  struct omap_mux *superset,</div><div class='del'>-		  struct omap_mux *package_subset,</div><div class='del'>-		  struct omap_board_mux *board_mux,</div><div class='del'>-		  struct omap_ball *package_balls);</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-omap2/mux34xx.c b/arch/arm/mach-omap2/mux34xx.c<br/>deleted file mode 100644<br/>index 393e687f99e2..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/mux34xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/mux34xx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2061 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 Nokia</div><div class='del'>- * Copyright (C) 2009 Texas Instruments</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mux.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_OMAP_MUX</div><div class='del'>-</div><div class='del'>-#define _OMAP3_MUXENTRY(M0, g, m0, m1, m2, m3, m4, m5, m6, m7)		\</div><div class='del'>-{									\</div><div class='del'>-	.reg_offset	= (OMAP3_CONTROL_PADCONF_##M0##_OFFSET),	\</div><div class='del'>-	.gpio		= (g),						\</div><div class='del'>-	.muxnames	= { m0, m1, m2, m3, m4, m5, m6, m7 },		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#define _OMAP3_MUXENTRY(M0, g, m0, m1, m2, m3, m4, m5, m6, m7)		\</div><div class='del'>-{									\</div><div class='del'>-	.reg_offset	= (OMAP3_CONTROL_PADCONF_##M0##_OFFSET),	\</div><div class='del'>-	.gpio		= (g),						\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define _OMAP3_BALLENTRY(M0, bb, bt)					\</div><div class='del'>-{									\</div><div class='del'>-	.reg_offset	= (OMAP3_CONTROL_PADCONF_##M0##_OFFSET),	\</div><div class='del'>-	.balls		= { bb, bt },					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Superset of all mux modes for omap3</div><div class='del'>- */</div><div class='del'>-static struct omap_mux __initdata omap3_muxmodes[] = {</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D0, 99,</div><div class='del'>-		"cam_d0", NULL, NULL, NULL,</div><div class='del'>-		"gpio_99", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D1, 100,</div><div class='del'>-		"cam_d1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_100", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D10, 109,</div><div class='del'>-		"cam_d10", NULL, NULL, NULL,</div><div class='del'>-		"gpio_109", "hw_dbg8", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D11, 110,</div><div class='del'>-		"cam_d11", NULL, NULL, NULL,</div><div class='del'>-		"gpio_110", "hw_dbg9", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D2, 101,</div><div class='del'>-		"cam_d2", NULL, NULL, NULL,</div><div class='del'>-		"gpio_101", "hw_dbg4", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D3, 102,</div><div class='del'>-		"cam_d3", NULL, NULL, NULL,</div><div class='del'>-		"gpio_102", "hw_dbg5", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D4, 103,</div><div class='del'>-		"cam_d4", NULL, NULL, NULL,</div><div class='del'>-		"gpio_103", "hw_dbg6", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D5, 104,</div><div class='del'>-		"cam_d5", NULL, NULL, NULL,</div><div class='del'>-		"gpio_104", "hw_dbg7", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D6, 105,</div><div class='del'>-		"cam_d6", NULL, NULL, NULL,</div><div class='del'>-		"gpio_105", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D7, 106,</div><div class='del'>-		"cam_d7", NULL, NULL, NULL,</div><div class='del'>-		"gpio_106", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D8, 107,</div><div class='del'>-		"cam_d8", NULL, NULL, NULL,</div><div class='del'>-		"gpio_107", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D9, 108,</div><div class='del'>-		"cam_d9", NULL, NULL, NULL,</div><div class='del'>-		"gpio_108", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_FLD, 98,</div><div class='del'>-		"cam_fld", NULL, "cam_global_reset", NULL,</div><div class='del'>-		"gpio_98", "hw_dbg3", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_HS, 94,</div><div class='del'>-		"cam_hs", NULL, NULL, NULL,</div><div class='del'>-		"gpio_94", "hw_dbg0", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_PCLK, 97,</div><div class='del'>-		"cam_pclk", NULL, NULL, NULL,</div><div class='del'>-		"gpio_97", "hw_dbg2", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_STROBE, 126,</div><div class='del'>-		"cam_strobe", NULL, NULL, NULL,</div><div class='del'>-		"gpio_126", "hw_dbg11", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_VS, 95,</div><div class='del'>-		"cam_vs", NULL, NULL, NULL,</div><div class='del'>-		"gpio_95", "hw_dbg1", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_WEN, 167,</div><div class='del'>-		"cam_wen", NULL, "cam_shutter", NULL,</div><div class='del'>-		"gpio_167", "hw_dbg10", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_XCLKA, 96,</div><div class='del'>-		"cam_xclka", NULL, NULL, NULL,</div><div class='del'>-		"gpio_96", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_XCLKB, 111,</div><div class='del'>-		"cam_xclkb", NULL, NULL, NULL,</div><div class='del'>-		"gpio_111", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CSI2_DX0, 112,</div><div class='del'>-		"csi2_dx0", NULL, NULL, NULL,</div><div class='del'>-		"gpio_112", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CSI2_DX1, 114,</div><div class='del'>-		"csi2_dx1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_114", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CSI2_DY0, 113,</div><div class='del'>-		"csi2_dy0", NULL, NULL, NULL,</div><div class='del'>-		"gpio_113", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CSI2_DY1, 115,</div><div class='del'>-		"csi2_dy1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_115", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_ACBIAS, 69,</div><div class='del'>-		"dss_acbias", NULL, NULL, NULL,</div><div class='del'>-		"gpio_69", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA0, 70,</div><div class='del'>-		"dss_data0", NULL, "uart1_cts", NULL,</div><div class='del'>-		"gpio_70", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA1, 71,</div><div class='del'>-		"dss_data1", NULL, "uart1_rts", NULL,</div><div class='del'>-		"gpio_71", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA10, 80,</div><div class='del'>-		"dss_data10", NULL, NULL, NULL,</div><div class='del'>-		"gpio_80", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA11, 81,</div><div class='del'>-		"dss_data11", NULL, NULL, NULL,</div><div class='del'>-		"gpio_81", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA12, 82,</div><div class='del'>-		"dss_data12", NULL, NULL, NULL,</div><div class='del'>-		"gpio_82", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA13, 83,</div><div class='del'>-		"dss_data13", NULL, NULL, NULL,</div><div class='del'>-		"gpio_83", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA14, 84,</div><div class='del'>-		"dss_data14", NULL, NULL, NULL,</div><div class='del'>-		"gpio_84", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA15, 85,</div><div class='del'>-		"dss_data15", NULL, NULL, NULL,</div><div class='del'>-		"gpio_85", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA16, 86,</div><div class='del'>-		"dss_data16", NULL, NULL, NULL,</div><div class='del'>-		"gpio_86", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA17, 87,</div><div class='del'>-		"dss_data17", NULL, NULL, NULL,</div><div class='del'>-		"gpio_87", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA18, 88,</div><div class='del'>-		"dss_data18", NULL, "mcspi3_clk", "dss_data0",</div><div class='del'>-		"gpio_88", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA19, 89,</div><div class='del'>-		"dss_data19", NULL, "mcspi3_simo", "dss_data1",</div><div class='del'>-		"gpio_89", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA20, 90,</div><div class='del'>-		"dss_data20", NULL, "mcspi3_somi", "dss_data2",</div><div class='del'>-		"gpio_90", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA21, 91,</div><div class='del'>-		"dss_data21", NULL, "mcspi3_cs0", "dss_data3",</div><div class='del'>-		"gpio_91", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA22, 92,</div><div class='del'>-		"dss_data22", NULL, "mcspi3_cs1", "dss_data4",</div><div class='del'>-		"gpio_92", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA23, 93,</div><div class='del'>-		"dss_data23", NULL, NULL, "dss_data5",</div><div class='del'>-		"gpio_93", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA2, 72,</div><div class='del'>-		"dss_data2", NULL, NULL, NULL,</div><div class='del'>-		"gpio_72", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA3, 73,</div><div class='del'>-		"dss_data3", NULL, NULL, NULL,</div><div class='del'>-		"gpio_73", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA4, 74,</div><div class='del'>-		"dss_data4", NULL, "uart3_rx_irrx", NULL,</div><div class='del'>-		"gpio_74", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA5, 75,</div><div class='del'>-		"dss_data5", NULL, "uart3_tx_irtx", NULL,</div><div class='del'>-		"gpio_75", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA6, 76,</div><div class='del'>-		"dss_data6", NULL, "uart1_tx", NULL,</div><div class='del'>-		"gpio_76", "hw_dbg14", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA7, 77,</div><div class='del'>-		"dss_data7", NULL, "uart1_rx", NULL,</div><div class='del'>-		"gpio_77", "hw_dbg15", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA8, 78,</div><div class='del'>-		"dss_data8", NULL, NULL, NULL,</div><div class='del'>-		"gpio_78", "hw_dbg16", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA9, 79,</div><div class='del'>-		"dss_data9", NULL, NULL, NULL,</div><div class='del'>-		"gpio_79", "hw_dbg17", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_HSYNC, 67,</div><div class='del'>-		"dss_hsync", NULL, NULL, NULL,</div><div class='del'>-		"gpio_67", "hw_dbg13", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_PCLK, 66,</div><div class='del'>-		"dss_pclk", NULL, NULL, NULL,</div><div class='del'>-		"gpio_66", "hw_dbg12", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_VSYNC, 68,</div><div class='del'>-		"dss_vsync", NULL, NULL, NULL,</div><div class='del'>-		"gpio_68", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_CLK, 12,</div><div class='del'>-		"etk_clk", "mcbsp5_clkx", "sdmmc3_clk", "hsusb1_stp",</div><div class='del'>-		"gpio_12", "mm1_rxdp", "hsusb1_tll_stp", "hw_dbg0"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_CTL, 13,</div><div class='del'>-		"etk_ctl", NULL, "sdmmc3_cmd", "hsusb1_clk",</div><div class='del'>-		"gpio_13", NULL, "hsusb1_tll_clk", "hw_dbg1"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D0, 14,</div><div class='del'>-		"etk_d0", "mcspi3_simo", "sdmmc3_dat4", "hsusb1_data0",</div><div class='del'>-		"gpio_14", "mm1_rxrcv", "hsusb1_tll_data0", "hw_dbg2"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D1, 15,</div><div class='del'>-		"etk_d1", "mcspi3_somi", NULL, "hsusb1_data1",</div><div class='del'>-		"gpio_15", "mm1_txse0", "hsusb1_tll_data1", "hw_dbg3"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D10, 24,</div><div class='del'>-		"etk_d10", NULL, "uart1_rx", "hsusb2_clk",</div><div class='del'>-		"gpio_24", NULL, "hsusb2_tll_clk", "hw_dbg12"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D11, 25,</div><div class='del'>-		"etk_d11", NULL, NULL, "hsusb2_stp",</div><div class='del'>-		"gpio_25", "mm2_rxdp", "hsusb2_tll_stp", "hw_dbg13"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D12, 26,</div><div class='del'>-		"etk_d12", NULL, NULL, "hsusb2_dir",</div><div class='del'>-		"gpio_26", NULL, "hsusb2_tll_dir", "hw_dbg14"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D13, 27,</div><div class='del'>-		"etk_d13", NULL, NULL, "hsusb2_nxt",</div><div class='del'>-		"gpio_27", "mm2_rxdm", "hsusb2_tll_nxt", "hw_dbg15"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D14, 28,</div><div class='del'>-		"etk_d14", NULL, NULL, "hsusb2_data0",</div><div class='del'>-		"gpio_28", "mm2_rxrcv", "hsusb2_tll_data0", "hw_dbg16"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D15, 29,</div><div class='del'>-		"etk_d15", NULL, NULL, "hsusb2_data1",</div><div class='del'>-		"gpio_29", "mm2_txse0", "hsusb2_tll_data1", "hw_dbg17"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D2, 16,</div><div class='del'>-		"etk_d2", "mcspi3_cs0", NULL, "hsusb1_data2",</div><div class='del'>-		"gpio_16", "mm1_txdat", "hsusb1_tll_data2", "hw_dbg4"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D3, 17,</div><div class='del'>-		"etk_d3", "mcspi3_clk", "sdmmc3_dat3", "hsusb1_data7",</div><div class='del'>-		"gpio_17", NULL, "hsusb1_tll_data7", "hw_dbg5"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D4, 18,</div><div class='del'>-		"etk_d4", "mcbsp5_dr", "sdmmc3_dat0", "hsusb1_data4",</div><div class='del'>-		"gpio_18", NULL, "hsusb1_tll_data4", "hw_dbg6"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D5, 19,</div><div class='del'>-		"etk_d5", "mcbsp5_fsx", "sdmmc3_dat1", "hsusb1_data5",</div><div class='del'>-		"gpio_19", NULL, "hsusb1_tll_data5", "hw_dbg7"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D6, 20,</div><div class='del'>-		"etk_d6", "mcbsp5_dx", "sdmmc3_dat2", "hsusb1_data6",</div><div class='del'>-		"gpio_20", NULL, "hsusb1_tll_data6", "hw_dbg8"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D7, 21,</div><div class='del'>-		"etk_d7", "mcspi3_cs1", "sdmmc3_dat7", "hsusb1_data3",</div><div class='del'>-		"gpio_21", "mm1_txen_n", "hsusb1_tll_data3", "hw_dbg9"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D8, 22,</div><div class='del'>-		"etk_d8", "sys_drm_msecure", "sdmmc3_dat6", "hsusb1_dir",</div><div class='del'>-		"gpio_22", NULL, "hsusb1_tll_dir", "hw_dbg10"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D9, 23,</div><div class='del'>-		"etk_d9", "sys_secure_indicator", "sdmmc3_dat5", "hsusb1_nxt",</div><div class='del'>-		"gpio_23", "mm1_rxdm", "hsusb1_tll_nxt", "hw_dbg11"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A1, 34,</div><div class='del'>-		"gpmc_a1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_34", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A10, 43,</div><div class='del'>-		"gpmc_a10", "sys_ndmareq3", NULL, NULL,</div><div class='del'>-		"gpio_43", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A2, 35,</div><div class='del'>-		"gpmc_a2", NULL, NULL, NULL,</div><div class='del'>-		"gpio_35", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A3, 36,</div><div class='del'>-		"gpmc_a3", NULL, NULL, NULL,</div><div class='del'>-		"gpio_36", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A4, 37,</div><div class='del'>-		"gpmc_a4", NULL, NULL, NULL,</div><div class='del'>-		"gpio_37", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A5, 38,</div><div class='del'>-		"gpmc_a5", NULL, NULL, NULL,</div><div class='del'>-		"gpio_38", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A6, 39,</div><div class='del'>-		"gpmc_a6", NULL, NULL, NULL,</div><div class='del'>-		"gpio_39", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A7, 40,</div><div class='del'>-		"gpmc_a7", NULL, NULL, NULL,</div><div class='del'>-		"gpio_40", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A8, 41,</div><div class='del'>-		"gpmc_a8", NULL, NULL, NULL,</div><div class='del'>-		"gpio_41", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A9, 42,</div><div class='del'>-		"gpmc_a9", "sys_ndmareq2", NULL, NULL,</div><div class='del'>-		"gpio_42", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_CLK, 59,</div><div class='del'>-		"gpmc_clk", NULL, NULL, NULL,</div><div class='del'>-		"gpio_59", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_D10, 46,</div><div class='del'>-		"gpmc_d10", NULL, NULL, NULL,</div><div class='del'>-		"gpio_46", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_D11, 47,</div><div class='del'>-		"gpmc_d11", NULL, NULL, NULL,</div><div class='del'>-		"gpio_47", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_D12, 48,</div><div class='del'>-		"gpmc_d12", NULL, NULL, NULL,</div><div class='del'>-		"gpio_48", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_D13, 49,</div><div class='del'>-		"gpmc_d13", NULL, NULL, NULL,</div><div class='del'>-		"gpio_49", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_D14, 50,</div><div class='del'>-		"gpmc_d14", NULL, NULL, NULL,</div><div class='del'>-		"gpio_50", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_D15, 51,</div><div class='del'>-		"gpmc_d15", NULL, NULL, NULL,</div><div class='del'>-		"gpio_51", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_D8, 44,</div><div class='del'>-		"gpmc_d8", NULL, NULL, NULL,</div><div class='del'>-		"gpio_44", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_D9, 45,</div><div class='del'>-		"gpmc_d9", NULL, NULL, NULL,</div><div class='del'>-		"gpio_45", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_NBE0_CLE, 60,</div><div class='del'>-		"gpmc_nbe0_cle", NULL, NULL, NULL,</div><div class='del'>-		"gpio_60", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_NBE1, 61,</div><div class='del'>-		"gpmc_nbe1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_61", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_NCS1, 52,</div><div class='del'>-		"gpmc_ncs1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_52", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_NCS2, 53,</div><div class='del'>-		"gpmc_ncs2", NULL, NULL, NULL,</div><div class='del'>-		"gpio_53", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_NCS3, 54,</div><div class='del'>-		"gpmc_ncs3", "sys_ndmareq0", NULL, NULL,</div><div class='del'>-		"gpio_54", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_NCS4, 55,</div><div class='del'>-		"gpmc_ncs4", "sys_ndmareq1", "mcbsp4_clkx", "gpt9_pwm_evt",</div><div class='del'>-		"gpio_55", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_NCS5, 56,</div><div class='del'>-		"gpmc_ncs5", "sys_ndmareq2", "mcbsp4_dr", "gpt10_pwm_evt",</div><div class='del'>-		"gpio_56", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_NCS6, 57,</div><div class='del'>-		"gpmc_ncs6", "sys_ndmareq3", "mcbsp4_dx", "gpt11_pwm_evt",</div><div class='del'>-		"gpio_57", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_NCS7, 58,</div><div class='del'>-		"gpmc_ncs7", "gpmc_io_dir", "mcbsp4_fsx", "gpt8_pwm_evt",</div><div class='del'>-		"gpio_58", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_NWP, 62,</div><div class='del'>-		"gpmc_nwp", NULL, NULL, NULL,</div><div class='del'>-		"gpio_62", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_WAIT1, 63,</div><div class='del'>-		"gpmc_wait1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_63", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_WAIT2, 64,</div><div class='del'>-		"gpmc_wait2", NULL, NULL, NULL,</div><div class='del'>-		"gpio_64", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_WAIT3, 65,</div><div class='del'>-		"gpmc_wait3", "sys_ndmareq1", NULL, NULL,</div><div class='del'>-		"gpio_65", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HDQ_SIO, 170,</div><div class='del'>-		"hdq_sio", "sys_altclk", "i2c2_sccbe", "i2c3_sccbe",</div><div class='del'>-		"gpio_170", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_CLK, 120,</div><div class='del'>-		"hsusb0_clk", NULL, NULL, NULL,</div><div class='del'>-		"gpio_120", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA0, 125,</div><div class='del'>-		"hsusb0_data0", NULL, "uart3_tx_irtx", NULL,</div><div class='del'>-		"gpio_125", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA1, 130,</div><div class='del'>-		"hsusb0_data1", NULL, "uart3_rx_irrx", NULL,</div><div class='del'>-		"gpio_130", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA2, 131,</div><div class='del'>-		"hsusb0_data2", NULL, "uart3_rts_sd", NULL,</div><div class='del'>-		"gpio_131", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA3, 169,</div><div class='del'>-		"hsusb0_data3", NULL, "uart3_cts_rctx", NULL,</div><div class='del'>-		"gpio_169", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA4, 188,</div><div class='del'>-		"hsusb0_data4", NULL, NULL, NULL,</div><div class='del'>-		"gpio_188", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA5, 189,</div><div class='del'>-		"hsusb0_data5", NULL, NULL, NULL,</div><div class='del'>-		"gpio_189", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA6, 190,</div><div class='del'>-		"hsusb0_data6", NULL, NULL, NULL,</div><div class='del'>-		"gpio_190", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA7, 191,</div><div class='del'>-		"hsusb0_data7", NULL, NULL, NULL,</div><div class='del'>-		"gpio_191", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DIR, 122,</div><div class='del'>-		"hsusb0_dir", NULL, NULL, NULL,</div><div class='del'>-		"gpio_122", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_NXT, 124,</div><div class='del'>-		"hsusb0_nxt", NULL, NULL, NULL,</div><div class='del'>-		"gpio_124", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_STP, 121,</div><div class='del'>-		"hsusb0_stp", NULL, NULL, NULL,</div><div class='del'>-		"gpio_121", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(I2C2_SCL, 168,</div><div class='del'>-		"i2c2_scl", NULL, NULL, NULL,</div><div class='del'>-		"gpio_168", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(I2C2_SDA, 183,</div><div class='del'>-		"i2c2_sda", NULL, NULL, NULL,</div><div class='del'>-		"gpio_183", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(I2C3_SCL, 184,</div><div class='del'>-		"i2c3_scl", NULL, NULL, NULL,</div><div class='del'>-		"gpio_184", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(I2C3_SDA, 185,</div><div class='del'>-		"i2c3_sda", NULL, NULL, NULL,</div><div class='del'>-		"gpio_185", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(I2C4_SCL, 0,</div><div class='del'>-		"i2c4_scl", "sys_nvmode1", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(I2C4_SDA, 0,</div><div class='del'>-		"i2c4_sda", "sys_nvmode2", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(JTAG_EMU0, 11,</div><div class='del'>-		"jtag_emu0", NULL, NULL, NULL,</div><div class='del'>-		"gpio_11", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(JTAG_EMU1, 31,</div><div class='del'>-		"jtag_emu1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_31", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP1_CLKR, 156,</div><div class='del'>-		"mcbsp1_clkr", "mcspi4_clk", NULL, NULL,</div><div class='del'>-		"gpio_156", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP1_CLKX, 162,</div><div class='del'>-		"mcbsp1_clkx", NULL, "mcbsp3_clkx", NULL,</div><div class='del'>-		"gpio_162", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP1_DR, 159,</div><div class='del'>-		"mcbsp1_dr", "mcspi4_somi", "mcbsp3_dr", NULL,</div><div class='del'>-		"gpio_159", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP1_DX, 158,</div><div class='del'>-		"mcbsp1_dx", "mcspi4_simo", "mcbsp3_dx", NULL,</div><div class='del'>-		"gpio_158", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP1_FSR, 157,</div><div class='del'>-		"mcbsp1_fsr", NULL, "cam_global_reset", NULL,</div><div class='del'>-		"gpio_157", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP1_FSX, 161,</div><div class='del'>-		"mcbsp1_fsx", "mcspi4_cs0", "mcbsp3_fsx", NULL,</div><div class='del'>-		"gpio_161", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP2_CLKX, 117,</div><div class='del'>-		"mcbsp2_clkx", NULL, NULL, NULL,</div><div class='del'>-		"gpio_117", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP2_DR, 118,</div><div class='del'>-		"mcbsp2_dr", NULL, NULL, NULL,</div><div class='del'>-		"gpio_118", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP2_DX, 119,</div><div class='del'>-		"mcbsp2_dx", NULL, NULL, NULL,</div><div class='del'>-		"gpio_119", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP2_FSX, 116,</div><div class='del'>-		"mcbsp2_fsx", NULL, NULL, NULL,</div><div class='del'>-		"gpio_116", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP3_CLKX, 142,</div><div class='del'>-		"mcbsp3_clkx", "uart2_tx", NULL, NULL,</div><div class='del'>-		"gpio_142", "hsusb3_tll_data6", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP3_DR, 141,</div><div class='del'>-		"mcbsp3_dr", "uart2_rts", NULL, NULL,</div><div class='del'>-		"gpio_141", "hsusb3_tll_data5", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP3_DX, 140,</div><div class='del'>-		"mcbsp3_dx", "uart2_cts", NULL, NULL,</div><div class='del'>-		"gpio_140", "hsusb3_tll_data4", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP3_FSX, 143,</div><div class='del'>-		"mcbsp3_fsx", "uart2_rx", NULL, NULL,</div><div class='del'>-		"gpio_143", "hsusb3_tll_data7", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP4_CLKX, 152,</div><div class='del'>-		"mcbsp4_clkx", NULL, NULL, NULL,</div><div class='del'>-		"gpio_152", "hsusb3_tll_data1", "mm3_txse0", "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP4_DR, 153,</div><div class='del'>-		"mcbsp4_dr", NULL, NULL, NULL,</div><div class='del'>-		"gpio_153", "hsusb3_tll_data0", "mm3_rxrcv", "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP4_DX, 154,</div><div class='del'>-		"mcbsp4_dx", NULL, NULL, NULL,</div><div class='del'>-		"gpio_154", "hsusb3_tll_data2", "mm3_txdat", "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP4_FSX, 155,</div><div class='del'>-		"mcbsp4_fsx", NULL, NULL, NULL,</div><div class='del'>-		"gpio_155", "hsusb3_tll_data3", "mm3_txen_n", "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP_CLKS, 160,</div><div class='del'>-		"mcbsp_clks", NULL, "cam_shutter", NULL,</div><div class='del'>-		"gpio_160", "uart1_cts", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI1_CLK, 171,</div><div class='del'>-		"mcspi1_clk", "sdmmc2_dat4", NULL, NULL,</div><div class='del'>-		"gpio_171", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI1_CS0, 174,</div><div class='del'>-		"mcspi1_cs0", "sdmmc2_dat7", NULL, NULL,</div><div class='del'>-		"gpio_174", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI1_CS1, 175,</div><div class='del'>-		"mcspi1_cs1", NULL, NULL, "sdmmc3_cmd",</div><div class='del'>-		"gpio_175", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI1_CS2, 176,</div><div class='del'>-		"mcspi1_cs2", NULL, NULL, "sdmmc3_clk",</div><div class='del'>-		"gpio_176", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI1_CS3, 177,</div><div class='del'>-		"mcspi1_cs3", NULL, "hsusb2_tll_data2", "hsusb2_data2",</div><div class='del'>-		"gpio_177", "mm2_txdat", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI1_SIMO, 172,</div><div class='del'>-		"mcspi1_simo", "sdmmc2_dat5", NULL, NULL,</div><div class='del'>-		"gpio_172", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI1_SOMI, 173,</div><div class='del'>-		"mcspi1_somi", "sdmmc2_dat6", NULL, NULL,</div><div class='del'>-		"gpio_173", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI2_CLK, 178,</div><div class='del'>-		"mcspi2_clk", NULL, "hsusb2_tll_data7", "hsusb2_data7",</div><div class='del'>-		"gpio_178", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI2_CS0, 181,</div><div class='del'>-		"mcspi2_cs0", "gpt11_pwm_evt",</div><div class='del'>-		"hsusb2_tll_data6", "hsusb2_data6",</div><div class='del'>-		"gpio_181", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI2_CS1, 182,</div><div class='del'>-		"mcspi2_cs1", "gpt8_pwm_evt",</div><div class='del'>-		"hsusb2_tll_data3", "hsusb2_data3",</div><div class='del'>-		"gpio_182", "mm2_txen_n", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI2_SIMO, 179,</div><div class='del'>-		"mcspi2_simo", "gpt9_pwm_evt",</div><div class='del'>-		"hsusb2_tll_data4", "hsusb2_data4",</div><div class='del'>-		"gpio_179", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI2_SOMI, 180,</div><div class='del'>-		"mcspi2_somi", "gpt10_pwm_evt",</div><div class='del'>-		"hsusb2_tll_data5", "hsusb2_data5",</div><div class='del'>-		"gpio_180", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_CLK, 120,</div><div class='del'>-		"sdmmc1_clk", NULL, NULL, NULL,</div><div class='del'>-		"gpio_120", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_CMD, 121,</div><div class='del'>-		"sdmmc1_cmd", NULL, NULL, NULL,</div><div class='del'>-		"gpio_121", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT0, 122,</div><div class='del'>-		"sdmmc1_dat0", NULL, NULL, NULL,</div><div class='del'>-		"gpio_122", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT1, 123,</div><div class='del'>-		"sdmmc1_dat1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_123", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT2, 124,</div><div class='del'>-		"sdmmc1_dat2", NULL, NULL, NULL,</div><div class='del'>-		"gpio_124", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT3, 125,</div><div class='del'>-		"sdmmc1_dat3", NULL, NULL, NULL,</div><div class='del'>-		"gpio_125", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT4, 126,</div><div class='del'>-		"sdmmc1_dat4", NULL, "sim_io", NULL,</div><div class='del'>-		"gpio_126", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT5, 127,</div><div class='del'>-		"sdmmc1_dat5", NULL, "sim_clk", NULL,</div><div class='del'>-		"gpio_127", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT6, 128,</div><div class='del'>-		"sdmmc1_dat6", NULL, "sim_pwrctrl", NULL,</div><div class='del'>-		"gpio_128", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT7, 129,</div><div class='del'>-		"sdmmc1_dat7", NULL, "sim_rst", NULL,</div><div class='del'>-		"gpio_129", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_CLK, 130,</div><div class='del'>-		"sdmmc2_clk", "mcspi3_clk", NULL, NULL,</div><div class='del'>-		"gpio_130", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_CMD, 131,</div><div class='del'>-		"sdmmc2_cmd", "mcspi3_simo", NULL, NULL,</div><div class='del'>-		"gpio_131", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_DAT0, 132,</div><div class='del'>-		"sdmmc2_dat0", "mcspi3_somi", NULL, NULL,</div><div class='del'>-		"gpio_132", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_DAT1, 133,</div><div class='del'>-		"sdmmc2_dat1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_133", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_DAT2, 134,</div><div class='del'>-		"sdmmc2_dat2", "mcspi3_cs1", NULL, NULL,</div><div class='del'>-		"gpio_134", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_DAT3, 135,</div><div class='del'>-		"sdmmc2_dat3", "mcspi3_cs0", NULL, NULL,</div><div class='del'>-		"gpio_135", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_DAT4, 136,</div><div class='del'>-		"sdmmc2_dat4", "sdmmc2_dir_dat0", NULL, "sdmmc3_dat0",</div><div class='del'>-		"gpio_136", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_DAT5, 137,</div><div class='del'>-		"sdmmc2_dat5", "sdmmc2_dir_dat1",</div><div class='del'>-		"cam_global_reset", "sdmmc3_dat1",</div><div class='del'>-		"gpio_137", "hsusb3_tll_stp", "mm3_rxdp", "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_DAT6, 138,</div><div class='del'>-		"sdmmc2_dat6", "sdmmc2_dir_cmd", "cam_shutter", "sdmmc3_dat2",</div><div class='del'>-		"gpio_138", "hsusb3_tll_dir", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_DAT7, 139,</div><div class='del'>-		"sdmmc2_dat7", "sdmmc2_clkin", NULL, "sdmmc3_dat3",</div><div class='del'>-		"gpio_139", "hsusb3_tll_nxt", "mm3_rxdm", "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDRC_CKE0, 0,</div><div class='del'>-		"sdrc_cke0", NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDRC_CKE1, 0,</div><div class='del'>-		"sdrc_cke1", NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT0, 2,</div><div class='del'>-		"sys_boot0", NULL, NULL, NULL,</div><div class='del'>-		"gpio_2", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT1, 3,</div><div class='del'>-		"sys_boot1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_3", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT2, 4,</div><div class='del'>-		"sys_boot2", NULL, NULL, NULL,</div><div class='del'>-		"gpio_4", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT3, 5,</div><div class='del'>-		"sys_boot3", NULL, NULL, NULL,</div><div class='del'>-		"gpio_5", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT4, 6,</div><div class='del'>-		"sys_boot4", "sdmmc2_dir_dat2", NULL, NULL,</div><div class='del'>-		"gpio_6", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT5, 7,</div><div class='del'>-		"sys_boot5", "sdmmc2_dir_dat3", NULL, NULL,</div><div class='del'>-		"gpio_7", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT6, 8,</div><div class='del'>-		"sys_boot6", NULL, NULL, NULL,</div><div class='del'>-		"gpio_8", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_CLKOUT1, 10,</div><div class='del'>-		"sys_clkout1", NULL, NULL, NULL,</div><div class='del'>-		"gpio_10", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_CLKOUT2, 186,</div><div class='del'>-		"sys_clkout2", NULL, NULL, NULL,</div><div class='del'>-		"gpio_186", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_CLKREQ, 1,</div><div class='del'>-		"sys_clkreq", NULL, NULL, NULL,</div><div class='del'>-		"gpio_1", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_NIRQ, 0,</div><div class='del'>-		"sys_nirq", NULL, NULL, NULL,</div><div class='del'>-		"gpio_0", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_NRESWARM, 30,</div><div class='del'>-		"sys_nreswarm", NULL, NULL, NULL,</div><div class='del'>-		"gpio_30", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_OFF_MODE, 9,</div><div class='del'>-		"sys_off_mode", NULL, NULL, NULL,</div><div class='del'>-		"gpio_9", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART1_CTS, 150,</div><div class='del'>-		"uart1_cts", "ssi1_rdy_tx", NULL, NULL,</div><div class='del'>-		"gpio_150", "hsusb3_tll_clk", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART1_RTS, 149,</div><div class='del'>-		"uart1_rts", "ssi1_flag_tx", NULL, NULL,</div><div class='del'>-		"gpio_149", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART1_RX, 151,</div><div class='del'>-		"uart1_rx", "ssi1_wake_tx", "mcbsp1_clkr", "mcspi4_clk",</div><div class='del'>-		"gpio_151", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART1_TX, 148,</div><div class='del'>-		"uart1_tx", "ssi1_dat_tx", NULL, NULL,</div><div class='del'>-		"gpio_148", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART2_CTS, 144,</div><div class='del'>-		"uart2_cts", "mcbsp3_dx", "gpt9_pwm_evt", NULL,</div><div class='del'>-		"gpio_144", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART2_RTS, 145,</div><div class='del'>-		"uart2_rts", "mcbsp3_dr", "gpt10_pwm_evt", NULL,</div><div class='del'>-		"gpio_145", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART2_RX, 147,</div><div class='del'>-		"uart2_rx", "mcbsp3_fsx", "gpt8_pwm_evt", NULL,</div><div class='del'>-		"gpio_147", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART2_TX, 146,</div><div class='del'>-		"uart2_tx", "mcbsp3_clkx", "gpt11_pwm_evt", NULL,</div><div class='del'>-		"gpio_146", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART3_CTS_RCTX, 163,</div><div class='del'>-		"uart3_cts_rctx", NULL, NULL, NULL,</div><div class='del'>-		"gpio_163", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART3_RTS_SD, 164,</div><div class='del'>-		"uart3_rts_sd", NULL, NULL, NULL,</div><div class='del'>-		"gpio_164", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART3_RX_IRRX, 165,</div><div class='del'>-		"uart3_rx_irrx", NULL, NULL, NULL,</div><div class='del'>-		"gpio_165", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART3_TX_IRTX, 166,</div><div class='del'>-		"uart3_tx_irtx", NULL, NULL, NULL,</div><div class='del'>-		"gpio_166", NULL, NULL, "safe_mode"),</div><div class='del'>-</div><div class='del'>-	/* Only on 3630, see omap36xx_cbp_subset for the signals */</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A11, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MBUSFLAG, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MREAD, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MWRITE, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_SBUSFLAG, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_SREAD, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_SWRITE, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A11, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD28, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD29, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD32, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD33, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD34, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD35, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD36, 0,</div><div class='del'>-		NULL, NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Signals different on CBC package compared to the superset</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_OMAP_MUX) &amp;&amp; defined(CONFIG_OMAP_PACKAGE_CBC)</div><div class='del'>-static struct omap_mux __initdata omap3_cbc_subset[] = {</div><div class='del'>-	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-#define omap3_cbc_subset	NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Balls for CBC package</div><div class='del'>- * 515-pin s-PBGA Package, 0.65mm Ball Pitch (Top), 0.50mm Ball Pitch (Bottom)</div><div class='del'>- *</div><div class='del'>- * FIXME: What's up with the outdated TI documentation? See:</div><div class='del'>- *</div><div class='del'>- * http://wiki.davincidsp.com/index.php/Datasheet_Errata_for_OMAP35x_CBC_Package</div><div class='del'>- * http://community.ti.com/forums/t/10982.aspx</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_OMAP_MUX) &amp;&amp; defined(CONFIG_DEBUG_FS)	\</div><div class='del'>-		&amp;&amp; defined(CONFIG_OMAP_PACKAGE_CBC)</div><div class='del'>-static struct omap_ball __initdata omap3_cbc_ball[] = {</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D0, "ae16", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D1, "ae15", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D10, "d25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D11, "e26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D2, "a24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D3, "b24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D4, "d24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D5, "c24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D6, "p25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D7, "p26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D8, "n25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D9, "n26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_FLD, "b23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_HS, "c23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_PCLK, "c26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_STROBE, "d26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_VS, "d23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_WEN, "a23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_XCLKA, "c25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_XCLKB, "e25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DX0, "ad17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DX1, "ae18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DY0, "ad16", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DY1, "ae17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_ACBIAS, "f26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA0, "ae21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA1, "ae22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA10, "ac26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA11, "ad26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA12, "aa25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA13, "y25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA14, "aa26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA15, "ab26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA16, "l25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA17, "l26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA18, "m24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA19, "m26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA2, "ae23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA20, "f25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA21, "n24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA22, "ac25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA23, "ab25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA3, "ae24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA4, "ad23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA5, "ad24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA6, "g26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA7, "h25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA8, "h26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA9, "j26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_HSYNC, "k24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_PCLK, "g25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_VSYNC, "m25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_CLK, "ab2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_CTL, "ab3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D0, "ac3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D1, "ad4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D10, "ae4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D11, "af6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D12, "ae6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D13, "af7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D14, "af9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D15, "ae9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D2, "ad3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D3, "aa3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D4, "y3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D5, "ab1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D6, "ae3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D7, "ad2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D8, "aa4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D9, "v2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A1, "j2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A10, "d2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A2, "h1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A3, "h2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A4, "g2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A5, "f1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A6, "f2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A7, "e1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A8, "e2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A9, "d1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_CLK, "n1", "l1"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D10, "t1", "n1"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D11, "u2", "p2"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D12, "u1", "p1"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D13, "p1", "m1"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D14, "l2", "j2"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D15, "m2", "k2"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D8, "v1", "r1"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D9, "y1", "t1"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NBE0_CLE, "k2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NBE1, "j1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS1, "ad1", "w1"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS2, "a3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS3, "b6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS4, "b4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS5, "c4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS6, "b5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS7, "c5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NWP, "ac6", "y5"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_WAIT1, "ac8", "y8"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_WAIT2, "b3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_WAIT3, "c6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HDQ_SIO, "j23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_CLK, "w19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA0, "v20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA1, "y20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA2, "v18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA3, "w20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA4, "w17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA5, "y18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA6, "y19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA7, "y17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DIR, "v19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_NXT, "w18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_STP, "u20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C2_SCL, "c2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C2_SDA, "c1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C3_SCL, "ab4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C3_SDA, "ac4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C4_SCL, "ad15", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C4_SDA, "w16", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(JTAG_EMU0, "y15", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(JTAG_EMU1, "y14", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_CLKR, "u19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_CLKX, "t17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_DR, "t20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_DX, "u17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_FSR, "v17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_FSX, "p20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_CLKX, "r18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_DR, "t18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_DX, "r19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_FSX, "u18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_CLKX, "u3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_DR, "n3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_DX, "p3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_FSX, "w3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_CLKX, "v3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_DR, "u4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_DX, "r3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_FSX, "t3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP_CLKS, "t19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CLK, "p9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS0, "r7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS1, "r8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS2, "r9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS3, "t8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_SIMO, "p8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_SOMI, "p7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CLK, "w7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CS0, "v8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CS1, "v9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_SIMO, "w8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_SOMI, "u8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_CLK, "n19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_CMD, "l18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT0, "m19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT1, "m18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT2, "k18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT3, "n20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT4, "m20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT5, "p17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT6, "p18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT7, "p19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_CLK, "w10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_CMD, "r10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT0, "t10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT1, "t9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT2, "u10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT3, "u9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT4, "v10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT5, "m3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT6, "l3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT7, "k3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT0, "f3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT1, "d3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT2, "c3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT3, "e3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT4, "e4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT5, "g3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT6, "d4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKOUT1, "ae14", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKOUT2, "w11", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKREQ, "w15", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_NIRQ, "v16", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_NRESWARM, "ad7", "aa5"),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_OFF_MODE, "v12", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_CTS, "w2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_RTS, "r2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_RX, "h3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_TX, "l4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_CTS, "y24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_RTS, "aa24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_RX, "ad21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_TX, "ad22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_CTS_RCTX, "f23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_RTS_SD, "f24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_RX_IRRX, "h24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_TX_IRTX, "g24", NULL),</div><div class='del'>-	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-#define omap3_cbc_ball	 NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Signals different on CUS package compared to superset</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_OMAP_MUX) &amp;&amp; defined(CONFIG_OMAP_PACKAGE_CUS)</div><div class='del'>-static struct omap_mux __initdata omap3_cus_subset[] = {</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D10, 109,</div><div class='del'>-		"cam_d10", NULL, NULL, NULL,</div><div class='del'>-		"gpio_109", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D11, 110,</div><div class='del'>-		"cam_d11", NULL, NULL, NULL,</div><div class='del'>-		"gpio_110", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D2, 101,</div><div class='del'>-		"cam_d2", NULL, NULL, NULL,</div><div class='del'>-		"gpio_101", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D3, 102,</div><div class='del'>-		"cam_d3", NULL, NULL, NULL,</div><div class='del'>-		"gpio_102", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D4, 103,</div><div class='del'>-		"cam_d4", NULL, NULL, NULL,</div><div class='del'>-		"gpio_103", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D5, 104,</div><div class='del'>-		"cam_d5", NULL, NULL, NULL,</div><div class='del'>-		"gpio_104", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_FLD, 98,</div><div class='del'>-		"cam_fld", NULL, "cam_global_reset", NULL,</div><div class='del'>-		"gpio_98", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_HS, 94,</div><div class='del'>-		"cam_hs", NULL, NULL, NULL,</div><div class='del'>-		"gpio_94", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_PCLK, 97,</div><div class='del'>-		"cam_pclk", NULL, NULL, NULL,</div><div class='del'>-		"gpio_97", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_STROBE, 126,</div><div class='del'>-		"cam_strobe", NULL, NULL, NULL,</div><div class='del'>-		"gpio_126", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_VS, 95,</div><div class='del'>-		"cam_vs", NULL, NULL, NULL,</div><div class='del'>-		"gpio_95", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_WEN, 167,</div><div class='del'>-		"cam_wen", NULL, "cam_shutter", NULL,</div><div class='del'>-		"gpio_167", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA6, 76,</div><div class='del'>-		"dss_data6", NULL, "uart1_tx", NULL,</div><div class='del'>-		"gpio_76", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA7, 77,</div><div class='del'>-		"dss_data7", NULL, "uart1_rx", NULL,</div><div class='del'>-		"gpio_77", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA8, 78,</div><div class='del'>-		"dss_data8", NULL, NULL, NULL,</div><div class='del'>-		"gpio_78", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA9, 79,</div><div class='del'>-		"dss_data9", NULL, NULL, NULL,</div><div class='del'>-		"gpio_79", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_HSYNC, 67,</div><div class='del'>-		"dss_hsync", NULL, NULL, NULL,</div><div class='del'>-		"gpio_67", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_PCLK, 66,</div><div class='del'>-		"dss_pclk", NULL, NULL, NULL,</div><div class='del'>-		"gpio_66", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_CLK, 12,</div><div class='del'>-		"etk_clk", "mcbsp5_clkx", "sdmmc3_clk", "hsusb1_stp",</div><div class='del'>-		"gpio_12", "mm1_rxdp", "hsusb1_tll_stp", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_CTL, 13,</div><div class='del'>-		"etk_ctl", NULL, "sdmmc3_cmd", "hsusb1_clk",</div><div class='del'>-		"gpio_13", NULL, "hsusb1_tll_clk", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D0, 14,</div><div class='del'>-		"etk_d0", "mcspi3_simo", "sdmmc3_dat4", "hsusb1_data0",</div><div class='del'>-		"gpio_14", "mm1_rxrcv", "hsusb1_tll_data0", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D1, 15,</div><div class='del'>-		"etk_d1", "mcspi3_somi", NULL, "hsusb1_data1",</div><div class='del'>-		"gpio_15", "mm1_txse0", "hsusb1_tll_data1", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D10, 24,</div><div class='del'>-		"etk_d10", NULL, "uart1_rx", "hsusb2_clk",</div><div class='del'>-		"gpio_24", NULL, "hsusb2_tll_clk", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D11, 25,</div><div class='del'>-		"etk_d11", NULL, NULL, "hsusb2_stp",</div><div class='del'>-		"gpio_25", "mm2_rxdp", "hsusb2_tll_stp", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D12, 26,</div><div class='del'>-		"etk_d12", NULL, NULL, "hsusb2_dir",</div><div class='del'>-		"gpio_26", NULL, "hsusb2_tll_dir", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D13, 27,</div><div class='del'>-		"etk_d13", NULL, NULL, "hsusb2_nxt",</div><div class='del'>-		"gpio_27", "mm2_rxdm", "hsusb2_tll_nxt", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D14, 28,</div><div class='del'>-		"etk_d14", NULL, NULL, "hsusb2_data0",</div><div class='del'>-		"gpio_28", "mm2_rxrcv", "hsusb2_tll_data0", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D15, 29,</div><div class='del'>-		"etk_d15", NULL, NULL, "hsusb2_data1",</div><div class='del'>-		"gpio_29", "mm2_txse0", "hsusb2_tll_data1", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D2, 16,</div><div class='del'>-		"etk_d2", "mcspi3_cs0", NULL, "hsusb1_data2",</div><div class='del'>-		"gpio_16", "mm1_txdat", "hsusb1_tll_data2", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D3, 17,</div><div class='del'>-		"etk_d3", "mcspi3_clk", "sdmmc3_dat3", "hsusb1_data7",</div><div class='del'>-		"gpio_17", NULL, "hsusb1_tll_data7", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D4, 18,</div><div class='del'>-		"etk_d4", "mcbsp5_dr", "sdmmc3_dat0", "hsusb1_data4",</div><div class='del'>-		"gpio_18", NULL, "hsusb1_tll_data4", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D5, 19,</div><div class='del'>-		"etk_d5", "mcbsp5_fsx", "sdmmc3_dat1", "hsusb1_data5",</div><div class='del'>-		"gpio_19", NULL, "hsusb1_tll_data5", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D6, 20,</div><div class='del'>-		"etk_d6", "mcbsp5_dx", "sdmmc3_dat2", "hsusb1_data6",</div><div class='del'>-		"gpio_20", NULL, "hsusb1_tll_data6", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D7, 21,</div><div class='del'>-		"etk_d7", "mcspi3_cs1", "sdmmc3_dat7", "hsusb1_data3",</div><div class='del'>-		"gpio_21", "mm1_txen_n", "hsusb1_tll_data3", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D8, 22,</div><div class='del'>-		"etk_d8", "sys_drm_msecure", "sdmmc3_dat6", "hsusb1_dir",</div><div class='del'>-		"gpio_22", NULL, "hsusb1_tll_dir", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D9, 23,</div><div class='del'>-		"etk_d9", "sys_secure_indicator", "sdmmc3_dat5", "hsusb1_nxt",</div><div class='del'>-		"gpio_23", "mm1_rxdm", "hsusb1_tll_nxt", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP3_CLKX, 142,</div><div class='del'>-		"mcbsp3_clkx", "uart2_tx", NULL, NULL,</div><div class='del'>-		"gpio_142", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP3_DR, 141,</div><div class='del'>-		"mcbsp3_dr", "uart2_rts", NULL, NULL,</div><div class='del'>-		"gpio_141", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP3_DX, 140,</div><div class='del'>-		"mcbsp3_dx", "uart2_cts", NULL, NULL,</div><div class='del'>-		"gpio_140", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP3_FSX, 143,</div><div class='del'>-		"mcbsp3_fsx", "uart2_rx", NULL, NULL,</div><div class='del'>-		"gpio_143", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_DAT5, 137,</div><div class='del'>-		"sdmmc2_dat5", "sdmmc2_dir_dat1",</div><div class='del'>-		"cam_global_reset", "sdmmc3_dat1",</div><div class='del'>-		"gpio_137", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_DAT6, 138,</div><div class='del'>-		"sdmmc2_dat6", "sdmmc2_dir_cmd", "cam_shutter", "sdmmc3_dat2",</div><div class='del'>-		"gpio_138", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC2_DAT7, 139,</div><div class='del'>-		"sdmmc2_dat7", "sdmmc2_clkin", NULL, "sdmmc3_dat3",</div><div class='del'>-		"gpio_139", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART1_CTS, 150,</div><div class='del'>-		"uart1_cts", NULL, NULL, NULL,</div><div class='del'>-		"gpio_150", NULL, NULL, "safe_mode"),</div><div class='del'>-	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-#define omap3_cus_subset	NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Balls for CUS package</div><div class='del'>- * 423-pin s-PBGA Package, 0.65mm Ball Pitch (Bottom)</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_OMAP_MUX) &amp;&amp; defined(CONFIG_DEBUG_FS)		\</div><div class='del'>-		&amp;&amp; defined(CONFIG_OMAP_PACKAGE_CUS)</div><div class='del'>-static struct omap_ball __initdata omap3_cus_ball[] = {</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D0, "ab18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D1, "ac18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D10, "f21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D11, "g21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D2, "g19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D3, "f19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D4, "g20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D5, "b21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D6, "l24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D7, "k24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D8, "j23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D9, "k23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_FLD, "h24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_HS, "a22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_PCLK, "j19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_STROBE, "j20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_VS, "e18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_WEN, "f18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_XCLKA, "b22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_XCLKB, "c22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_ACBIAS, "j21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA0, "ac19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA1, "ab19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA10, "ac22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA11, "ac23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA12, "ab22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA13, "y22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA14, "w22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA15, "v22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA16, "j22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA17, "g23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA18, "g24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA19, "h23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA2, "ad20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA20, "d23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA21, "k22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA22, "v21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA23, "w21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA3, "ac20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA4, "ad21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA5, "ac21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA6, "d24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA7, "e23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA8, "e24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA9, "f23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_HSYNC, "e22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_PCLK, "g22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_VSYNC, "f22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_CLK, "ac1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_CTL, "ad3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D0, "ad6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D1, "ac6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D10, "ac3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D11, "ac9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D12, "ac10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D13, "ad11", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D14, "ac11", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D15, "ad12", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D2, "ac7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D3, "ad8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D4, "ac5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D5, "ad2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D6, "ac8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D7, "ad9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D8, "ac4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D9, "ad5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A1, "k4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A10, "g2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A2, "k3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A3, "k2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A4, "j4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A5, "j3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A6, "j2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A7, "j1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A8, "h1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A9, "h2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_CLK, "w2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D10, "u1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D11, "r3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D12, "t3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D13, "u2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D14, "v1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D15, "v2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D8, "r2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D9, "t2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NBE0_CLE, "k5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NBE1, "l1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS3, "d2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS4, "f4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS5, "g5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS6, "f3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS7, "g4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NWP, "e1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_WAIT3, "c2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HDQ_SIO, "a24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_CLK, "r21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA0, "t24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA1, "t23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA2, "u24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA3, "u23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA4, "w24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA5, "v23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA6, "w23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA7, "t22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DIR, "p23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_NXT, "r22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_STP, "r23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C2_SCL, "ac15", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C2_SDA, "ac14", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C3_SCL, "ac13", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C3_SDA, "ac12", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C4_SCL, "y16", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C4_SDA, "y15", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(JTAG_EMU0, "ac24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(JTAG_EMU1, "ad24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_CLKR, "w19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_CLKX, "v18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_DR, "y18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_DX, "w18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_FSR, "ab20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_FSX, "aa19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_CLKX, "t21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_DR, "v19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_DX, "r20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_FSX, "v20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_CLKX, "w4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_DR, "v5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_DX, "v6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_FSX, "v4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP_CLKS, "aa18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CLK, "t5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS0, "t6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS3, "r5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_SIMO, "r4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_SOMI, "t4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CLK, "n5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CS0, "m5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CS1, "m4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_SIMO, "n4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_SOMI, "n3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_CLK, "m23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_CMD, "l23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT0, "m22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT1, "m21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT2, "m20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT3, "n23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT4, "n22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT5, "n21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT6, "n20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT7, "p24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_CLK, "y1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_CMD, "ab5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT0, "ab3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT1, "y3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT2, "w3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT3, "v3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT4, "ab2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT5, "aa2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT6, "y2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT7, "aa1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT0, "ab12", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT1, "ac16", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT2, "ad17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT3, "ad18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT4, "ac17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT5, "ab16", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT6, "aa15", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKOUT1, "y7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKOUT2, "aa6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKREQ, "y13", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_NIRQ, "w16", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_NRESWARM, "y10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_OFF_MODE, "ad23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_CTS, "ac2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_RTS, "w6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_RX, "v7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_TX, "w7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_CTS_RCTX, "a23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_RTS_SD, "b23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_RX_IRRX, "b24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_TX_IRTX, "c23", NULL),</div><div class='del'>-	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-#define omap3_cus_ball	 NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Signals different on CBB package compared to superset</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_OMAP_MUX) &amp;&amp; defined(CONFIG_OMAP_PACKAGE_CBB)</div><div class='del'>-static struct omap_mux __initdata omap3_cbb_subset[] = {</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D10, 109,</div><div class='del'>-		"cam_d10", NULL, NULL, NULL,</div><div class='del'>-		"gpio_109", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D11, 110,</div><div class='del'>-		"cam_d11", NULL, NULL, NULL,</div><div class='del'>-		"gpio_110", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D2, 101,</div><div class='del'>-		"cam_d2", NULL, NULL, NULL,</div><div class='del'>-		"gpio_101", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D3, 102,</div><div class='del'>-		"cam_d3", NULL, NULL, NULL,</div><div class='del'>-		"gpio_102", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D4, 103,</div><div class='del'>-		"cam_d4", NULL, NULL, NULL,</div><div class='del'>-		"gpio_103", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D5, 104,</div><div class='del'>-		"cam_d5", NULL, NULL, NULL,</div><div class='del'>-		"gpio_104", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_FLD, 98,</div><div class='del'>-		"cam_fld", NULL, "cam_global_reset", NULL,</div><div class='del'>-		"gpio_98", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_HS, 94,</div><div class='del'>-		"cam_hs", NULL, NULL, NULL,</div><div class='del'>-		"gpio_94", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_PCLK, 97,</div><div class='del'>-		"cam_pclk", NULL, NULL, NULL,</div><div class='del'>-		"gpio_97", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_STROBE, 126,</div><div class='del'>-		"cam_strobe", NULL, NULL, NULL,</div><div class='del'>-		"gpio_126", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_VS, 95,</div><div class='del'>-		"cam_vs", NULL, NULL, NULL,</div><div class='del'>-		"gpio_95", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_WEN, 167,</div><div class='del'>-		"cam_wen", NULL, "cam_shutter", NULL,</div><div class='del'>-		"gpio_167", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA6, 76,</div><div class='del'>-		"dss_data6", NULL, "uart1_tx", NULL,</div><div class='del'>-		"gpio_76", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA7, 77,</div><div class='del'>-		"dss_data7", NULL, "uart1_rx", NULL,</div><div class='del'>-		"gpio_77", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA8, 78,</div><div class='del'>-		"dss_data8", NULL, NULL, NULL,</div><div class='del'>-		"gpio_78", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA9, 79,</div><div class='del'>-		"dss_data9", NULL, NULL, NULL,</div><div class='del'>-		"gpio_79", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_HSYNC, 67,</div><div class='del'>-		"dss_hsync", NULL, NULL, NULL,</div><div class='del'>-		"gpio_67", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_PCLK, 66,</div><div class='del'>-		"dss_pclk", NULL, NULL, NULL,</div><div class='del'>-		"gpio_66", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_CLK, 12,</div><div class='del'>-		"etk_clk", "mcbsp5_clkx", "sdmmc3_clk", "hsusb1_stp",</div><div class='del'>-		"gpio_12", "mm1_rxdp", "hsusb1_tll_stp", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_CTL, 13,</div><div class='del'>-		"etk_ctl", NULL, "sdmmc3_cmd", "hsusb1_clk",</div><div class='del'>-		"gpio_13", NULL, "hsusb1_tll_clk", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D0, 14,</div><div class='del'>-		"etk_d0", "mcspi3_simo", "sdmmc3_dat4", "hsusb1_data0",</div><div class='del'>-		"gpio_14", "mm1_rxrcv", "hsusb1_tll_data0", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D1, 15,</div><div class='del'>-		"etk_d1", "mcspi3_somi", NULL, "hsusb1_data1",</div><div class='del'>-		"gpio_15", "mm1_txse0", "hsusb1_tll_data1", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D10, 24,</div><div class='del'>-		"etk_d10", NULL, "uart1_rx", "hsusb2_clk",</div><div class='del'>-		"gpio_24", NULL, "hsusb2_tll_clk", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D11, 25,</div><div class='del'>-		"etk_d11", NULL, NULL, "hsusb2_stp",</div><div class='del'>-		"gpio_25", "mm2_rxdp", "hsusb2_tll_stp", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D12, 26,</div><div class='del'>-		"etk_d12", NULL, NULL, "hsusb2_dir",</div><div class='del'>-		"gpio_26", NULL, "hsusb2_tll_dir", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D13, 27,</div><div class='del'>-		"etk_d13", NULL, NULL, "hsusb2_nxt",</div><div class='del'>-		"gpio_27", "mm2_rxdm", "hsusb2_tll_nxt", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D14, 28,</div><div class='del'>-		"etk_d14", NULL, NULL, "hsusb2_data0",</div><div class='del'>-		"gpio_28", "mm2_rxrcv", "hsusb2_tll_data0", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D15, 29,</div><div class='del'>-		"etk_d15", NULL, NULL, "hsusb2_data1",</div><div class='del'>-		"gpio_29", "mm2_txse0", "hsusb2_tll_data1", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D2, 16,</div><div class='del'>-		"etk_d2", "mcspi3_cs0", NULL, "hsusb1_data2",</div><div class='del'>-		"gpio_16", "mm1_txdat", "hsusb1_tll_data2", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D3, 17,</div><div class='del'>-		"etk_d3", "mcspi3_clk", "sdmmc3_dat3", "hsusb1_data7",</div><div class='del'>-		"gpio_17", NULL, "hsusb1_tll_data7", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D4, 18,</div><div class='del'>-		"etk_d4", "mcbsp5_dr", "sdmmc3_dat0", "hsusb1_data4",</div><div class='del'>-		"gpio_18", NULL, "hsusb1_tll_data4", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D5, 19,</div><div class='del'>-		"etk_d5", "mcbsp5_fsx", "sdmmc3_dat1", "hsusb1_data5",</div><div class='del'>-		"gpio_19", NULL, "hsusb1_tll_data5", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D6, 20,</div><div class='del'>-		"etk_d6", "mcbsp5_dx", "sdmmc3_dat2", "hsusb1_data6",</div><div class='del'>-		"gpio_20", NULL, "hsusb1_tll_data6", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D7, 21,</div><div class='del'>-		"etk_d7", "mcspi3_cs1", "sdmmc3_dat7", "hsusb1_data3",</div><div class='del'>-		"gpio_21", "mm1_txen_n", "hsusb1_tll_data3", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D8, 22,</div><div class='del'>-		"etk_d8", "sys_drm_msecure", "sdmmc3_dat6", "hsusb1_dir",</div><div class='del'>-		"gpio_22", NULL, "hsusb1_tll_dir", NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D9, 23,</div><div class='del'>-		"etk_d9", "sys_secure_indicator", "sdmmc3_dat5", "hsusb1_nxt",</div><div class='del'>-		"gpio_23", "mm1_rxdm", "hsusb1_tll_nxt", NULL),</div><div class='del'>-	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-#define omap3_cbb_subset	NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Balls for CBB package</div><div class='del'>- * 515-pin s-PBGA Package, 0.50mm Ball Pitch (Top), 0.40mm Ball Pitch (Bottom)</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_OMAP_MUX) &amp;&amp; defined(CONFIG_DEBUG_FS)		\</div><div class='del'>-		&amp;&amp; defined(CONFIG_OMAP_PACKAGE_CBB)</div><div class='del'>-static struct omap_ball __initdata omap3_cbb_ball[] = {</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D0, "ag17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D1, "ah17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D10, "b25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D11, "c26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D2, "b24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D3, "c24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D4, "d24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D5, "a25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D6, "k28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D7, "l28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D8, "k27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D9, "l27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_FLD, "c23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_HS, "a24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_PCLK, "c27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_STROBE, "d25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_VS, "a23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_WEN, "b23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_XCLKA, "c25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_XCLKB, "b26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DX0, "ag19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DX1, "ag18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DY0, "ah19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DY1, "ah18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_ACBIAS, "e27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA0, "ag22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA1, "ah22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA10, "ad28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA11, "ad27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA12, "ab28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA13, "ab27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA14, "aa28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA15, "aa27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA16, "g25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA17, "h27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA18, "h26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA19, "h25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA2, "ag23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA20, "e28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA21, "j26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA22, "ac27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA23, "ac28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA3, "ah23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA4, "ag24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA5, "ah24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA6, "e26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA7, "f28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA8, "f27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA9, "g26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_HSYNC, "d26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_PCLK, "d28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_VSYNC, "d27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_CLK, "af10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_CTL, "ae10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D0, "af11", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D1, "ag12", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D10, "ae7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D11, "af7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D12, "ag7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D13, "ah7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D14, "ag8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D15, "ah8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D2, "ah12", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D3, "ae13", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D4, "ae11", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D5, "ah9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D6, "af13", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D7, "ah14", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D8, "af9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D9, "ag9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A1, "n4", "ac15"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A10, "k3", "ab19"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A2, "m4", "ab15"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A3, "l4", "ac16"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A4, "k4", "ab16"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A5, "t3", "ac17"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A6, "r3", "ab17"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A7, "n3", "ac18"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A8, "m3", "ab18"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A9, "l3", "ac19"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_CLK, "t4", "w2"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D10, "p1", "ab4"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D11, "r1", "ac4"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D12, "r2", "ab6"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D13, "t2", "ac6"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D14, "w1", "ab7"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D15, "y1", "ac7"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D8, "h2", "ab3"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D9, "k2", "ac3"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NBE0_CLE, "g3", "ac12"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NBE1, "u3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS1, "h3", "y1"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS2, "v8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS3, "u8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS4, "t8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS5, "r8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS6, "p8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS7, "n8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NWP, "h1", "ab10"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_WAIT1, "l8", "ac10"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_WAIT2, "k8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_WAIT3, "j8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HDQ_SIO, "j25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_CLK, "t28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA0, "t27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA1, "u28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA2, "u27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA3, "u26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA4, "u25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA5, "v28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA6, "v27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA7, "v26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DIR, "r28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_NXT, "t26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_STP, "t25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C2_SCL, "af15", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C2_SDA, "ae15", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C3_SCL, "af14", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C3_SDA, "ag14", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C4_SCL, "ad26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C4_SDA, "ae26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(JTAG_EMU0, "aa11", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(JTAG_EMU1, "aa10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_CLKR, "y21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_CLKX, "w21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_DR, "u21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_DX, "v21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_FSR, "aa21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_FSX, "k26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_CLKX, "n21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_DR, "r21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_DX, "m21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_FSX, "p21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_CLKX, "af5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_DR, "ae6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_DX, "af6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_FSX, "ae5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_CLKX, "ae1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_DR, "ad1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_DX, "ad2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_FSX, "ac1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP_CLKS, "t21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CLK, "ab3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS0, "ac2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS1, "ac3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS2, "ab1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS3, "ab2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_SIMO, "ab4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_SOMI, "aa4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CLK, "aa3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CS0, "y4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CS1, "v3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_SIMO, "y2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_SOMI, "y3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_CLK, "n28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_CMD, "m27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT0, "n27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT1, "n26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT2, "n25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT3, "p28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT4, "p27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT5, "p26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT6, "r27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT7, "r25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_CLK, "ae2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_CMD, "ag5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT0, "ah5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT1, "ah4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT2, "ag4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT3, "af4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT4, "ae4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT5, "ah3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT6, "af3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT7, "ae3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT0, "ah26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT1, "ag26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT2, "ae14", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT3, "af18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT4, "af19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT5, "ae21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT6, "af21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKOUT1, "ag25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKOUT2, "ae22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKREQ, "af25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_NIRQ, "af26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_NRESWARM, "af24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_OFF_MODE, "af22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_CTS, "w8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_RTS, "aa9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_RX, "y8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_TX, "aa8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_CTS, "ab26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_RTS, "ab25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_RX, "ad25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_TX, "aa25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_CTS_RCTX, "h18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_RTS_SD, "h19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_RX_IRRX, "h20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_TX_IRTX, "h21", NULL),</div><div class='del'>-	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-#define omap3_cbb_ball	 NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Signals different on 36XX CBP package compared to 34XX CBC package</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_OMAP_MUX) &amp;&amp; defined(CONFIG_OMAP_PACKAGE_CBP)</div><div class='del'>-static struct omap_mux __initdata omap36xx_cbp_subset[] = {</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D0, 99,</div><div class='del'>-		"cam_d0", NULL, "csi2_dx2", NULL,</div><div class='del'>-		"gpio_99", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D1, 100,</div><div class='del'>-		"cam_d1", NULL, "csi2_dy2", NULL,</div><div class='del'>-		"gpio_100", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D10, 109,</div><div class='del'>-		"cam_d10", "ssi2_wake", NULL, NULL,</div><div class='del'>-		"gpio_109", "hw_dbg8", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D2, 101,</div><div class='del'>-		"cam_d2", "ssi2_rdy_tx", NULL, NULL,</div><div class='del'>-		"gpio_101", "hw_dbg4", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D3, 102,</div><div class='del'>-		"cam_d3", "ssi2_dat_rx", NULL, NULL,</div><div class='del'>-		"gpio_102", "hw_dbg5", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D4, 103,</div><div class='del'>-		"cam_d4", "ssi2_flag_rx", NULL, NULL,</div><div class='del'>-		"gpio_103", "hw_dbg6", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_D5, 104,</div><div class='del'>-		"cam_d5", "ssi2_rdy_rx", NULL, NULL,</div><div class='del'>-		"gpio_104", "hw_dbg7", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_HS, 94,</div><div class='del'>-		"cam_hs", "ssi2_dat_tx", NULL, NULL,</div><div class='del'>-		"gpio_94", "hw_dbg0", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(CAM_VS, 95,</div><div class='del'>-		"cam_vs", "ssi2_flag_tx", NULL, NULL,</div><div class='del'>-		"gpio_95", "hw_dbg1", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA0, 70,</div><div class='del'>-		"dss_data0", "dsi_dx0", "uart1_cts", NULL,</div><div class='del'>-		"gpio_70", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA1, 71,</div><div class='del'>-		"dss_data1", "dsi_dy0", "uart1_rts", NULL,</div><div class='del'>-		"gpio_71", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA2, 72,</div><div class='del'>-		"dss_data2", "dsi_dx1", NULL, NULL,</div><div class='del'>-		"gpio_72", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA3, 73,</div><div class='del'>-		"dss_data3", "dsi_dy1", NULL, NULL,</div><div class='del'>-		"gpio_73", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA4, 74,</div><div class='del'>-		"dss_data4", "dsi_dx2", "uart3_rx_irrx", NULL,</div><div class='del'>-		"gpio_74", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA5, 75,</div><div class='del'>-		"dss_data5", "dsi_dy2", "uart3_tx_irtx", NULL,</div><div class='del'>-		"gpio_75", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA6, 76,</div><div class='del'>-		"dss_data6", NULL, "uart1_tx", "dssvenc656_data6",</div><div class='del'>-		"gpio_76", "hw_dbg14", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA7, 77,</div><div class='del'>-		"dss_data7", NULL, "uart1_rx", "dssvenc656_data7",</div><div class='del'>-		"gpio_77", "hw_dbg15", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA8, 78,</div><div class='del'>-		"dss_data8", NULL, "uart3_rx_irrx", NULL,</div><div class='del'>-		"gpio_78", "hw_dbg16", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(DSS_DATA9, 79,</div><div class='del'>-		"dss_data9", NULL, "uart3_tx_irtx", NULL,</div><div class='del'>-		"gpio_79", "hw_dbg17", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(ETK_D12, 26,</div><div class='del'>-		"etk_d12", "sys_drm_msecure", NULL, "hsusb2_dir",</div><div class='del'>-		"gpio_26", NULL, "hsusb2_tll_dir", "hw_dbg14"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_A11, 0,</div><div class='del'>-		"gpmc_a11", NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_WAIT2, 64,</div><div class='del'>-		"gpmc_wait2", NULL, "uart4_tx", NULL,</div><div class='del'>-		"gpio_64", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(GPMC_WAIT3, 65,</div><div class='del'>-		"gpmc_wait3", "sys_ndmareq1", "uart4_rx", NULL,</div><div class='del'>-		"gpio_65", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA0, 125,</div><div class='del'>-		"hsusb0_data0", NULL, "uart3_tx_irtx", NULL,</div><div class='del'>-		"gpio_125", "uart2_tx", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA1, 130,</div><div class='del'>-		"hsusb0_data1", NULL, "uart3_rx_irrx", NULL,</div><div class='del'>-		"gpio_130", "uart2_rx", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA2, 131,</div><div class='del'>-		"hsusb0_data2", NULL, "uart3_rts_sd", NULL,</div><div class='del'>-		"gpio_131", "uart2_rts", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(HSUSB0_DATA3, 169,</div><div class='del'>-		"hsusb0_data3", NULL, "uart3_cts_rctx", NULL,</div><div class='del'>-		"gpio_169", "uart2_cts", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP1_CLKR, 156,</div><div class='del'>-		"mcbsp1_clkr", "mcspi4_clk", "sim_cd", NULL,</div><div class='del'>-		"gpio_156", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP1_FSR, 157,</div><div class='del'>-		"mcbsp1_fsr", "adpllv2d_dithering_en1",</div><div class='del'>-		"cam_global_reset", NULL,</div><div class='del'>-		"gpio_157", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP4_CLKX, 152,</div><div class='del'>-		"mcbsp4_clkx", "ssi1_dat_rx", NULL, NULL,</div><div class='del'>-		"gpio_152", "hsusb3_tll_data1", "mm3_txse0", "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP4_DR, 153,</div><div class='del'>-		"mcbsp4_dr", "ssi1_flag_rx", NULL, NULL,</div><div class='del'>-		"gpio_153", "hsusb3_tll_data0", "mm3_rxrcv", "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP4_DX, 154,</div><div class='del'>-		"mcbsp4_dx", "ssi1_rdy_rx", NULL, NULL,</div><div class='del'>-		"gpio_154", "hsusb3_tll_data2", "mm3_txdat", "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCBSP4_FSX, 155,</div><div class='del'>-		"mcbsp4_fsx", "ssi1_wake", NULL, NULL,</div><div class='del'>-		"gpio_155", "hsusb3_tll_data3", "mm3_txen_n", "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(MCSPI1_CS1, 175,</div><div class='del'>-		"mcspi1_cs1", "adpllv2d_dithering_en2", NULL, "sdmmc3_cmd",</div><div class='del'>-		"gpio_175", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MBUSFLAG, 0,</div><div class='del'>-		"sad2d_mbusflag", "mad2d_sbusflag", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD28, 0,</div><div class='del'>-		"sad2d_mcad28", "mad2d_mcad28", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD29, 0,</div><div class='del'>-		"sad2d_mcad29", "mad2d_mcad29", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD32, 0,</div><div class='del'>-		"sad2d_mcad32", "mad2d_mcad32", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD33, 0,</div><div class='del'>-		"sad2d_mcad33", "mad2d_mcad33", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD34, 0,</div><div class='del'>-		"sad2d_mcad34", "mad2d_mcad34", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD35, 0,</div><div class='del'>-		"sad2d_mcad35", "mad2d_mcad35", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MCAD36, 0,</div><div class='del'>-		"sad2d_mcad36", "mad2d_mcad36", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MREAD, 0,</div><div class='del'>-		"sad2d_mread", "mad2d_sread", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_MWRITE, 0,</div><div class='del'>-		"sad2d_mwrite", "mad2d_swrite", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_SBUSFLAG, 0,</div><div class='del'>-		"sad2d_sbusflag", "mad2d_mbusflag", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_SREAD, 0,</div><div class='del'>-		"sad2d_sread", "mad2d_mread", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SAD2D_SWRITE, 0,</div><div class='del'>-		"sad2d_swrite", "mad2d_mwrite", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_CLK, 120,</div><div class='del'>-		"sdmmc1_clk", "ms_clk", NULL, NULL,</div><div class='del'>-		"gpio_120", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_CMD, 121,</div><div class='del'>-		"sdmmc1_cmd", "ms_bs", NULL, NULL,</div><div class='del'>-		"gpio_121", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT0, 122,</div><div class='del'>-		"sdmmc1_dat0", "ms_dat0", NULL, NULL,</div><div class='del'>-		"gpio_122", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT1, 123,</div><div class='del'>-		"sdmmc1_dat1", "ms_dat1", NULL, NULL,</div><div class='del'>-		"gpio_123", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT2, 124,</div><div class='del'>-		"sdmmc1_dat2", "ms_dat2", NULL, NULL,</div><div class='del'>-		"gpio_124", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDMMC1_DAT3, 125,</div><div class='del'>-		"sdmmc1_dat3", "ms_dat3", NULL, NULL,</div><div class='del'>-		"gpio_125", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDRC_CKE0, 0,</div><div class='del'>-		"sdrc_cke0", NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, "safe_mode_out1"),</div><div class='del'>-	_OMAP3_MUXENTRY(SDRC_CKE1, 0,</div><div class='del'>-		"sdrc_cke1", NULL, NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, "safe_mode_out1"),</div><div class='del'>-	_OMAP3_MUXENTRY(SIM_IO, 126,</div><div class='del'>-		"sim_io", "sim_io_low_impedance", NULL, NULL,</div><div class='del'>-		"gpio_126", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SIM_CLK, 127,</div><div class='del'>-		"sim_clk", NULL, NULL, NULL,</div><div class='del'>-		"gpio_127", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SIM_PWRCTRL, 128,</div><div class='del'>-		"sim_pwrctrl", NULL, NULL, NULL,</div><div class='del'>-		"gpio_128", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SIM_RST, 129,</div><div class='del'>-		"sim_rst", NULL, NULL, NULL,</div><div class='del'>-		"gpio_129", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT0, 2,</div><div class='del'>-		"sys_boot0", NULL, NULL, "dss_data18",</div><div class='del'>-		"gpio_2", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT1, 3,</div><div class='del'>-		"sys_boot1", NULL, NULL, "dss_data19",</div><div class='del'>-		"gpio_3", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT3, 5,</div><div class='del'>-		"sys_boot3", NULL, NULL, "dss_data20",</div><div class='del'>-		"gpio_5", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT4, 6,</div><div class='del'>-		"sys_boot4", "sdmmc2_dir_dat2", NULL, "dss_data21",</div><div class='del'>-		"gpio_6", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT5, 7,</div><div class='del'>-		"sys_boot5", "sdmmc2_dir_dat3", NULL, "dss_data22",</div><div class='del'>-		"gpio_7", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(SYS_BOOT6, 8,</div><div class='del'>-		"sys_boot6", NULL, NULL, "dss_data23",</div><div class='del'>-		"gpio_8", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART1_CTS, 150,</div><div class='del'>-		"uart1_cts", "ssi1_rdy_tx", NULL, NULL,</div><div class='del'>-		"gpio_150", "hsusb3_tll_clk", NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART1_RTS, 149,</div><div class='del'>-		"uart1_rts", "ssi1_flag_tx", NULL, NULL,</div><div class='del'>-		"gpio_149", NULL, NULL, "safe_mode"),</div><div class='del'>-	_OMAP3_MUXENTRY(UART1_TX, 148,</div><div class='del'>-		"uart1_tx", "ssi1_dat_tx", NULL, NULL,</div><div class='del'>-		"gpio_148", NULL, NULL, "safe_mode"),</div><div class='del'>-	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-#define omap36xx_cbp_subset	NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Balls for 36XX CBP package</div><div class='del'>- * 515-pin s-PBGA Package, 0.50mm Ball Pitch (Top), 0.40mm Ball Pitch (Bottom)</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_OMAP_MUX) &amp;&amp; defined(CONFIG_DEBUG_FS)		\</div><div class='del'>-		&amp;&amp; defined (CONFIG_OMAP_PACKAGE_CBP)</div><div class='del'>-static struct omap_ball __initdata omap36xx_cbp_ball[] = {</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D0, "ag17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D1, "ah17", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D10, "b25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D11, "c26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D2, "b24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D3, "c24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D4, "d24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D5, "a25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D6, "k28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D7, "l28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D8, "k27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_D9, "l27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_FLD, "c23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_HS, "a24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_PCLK, "c27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_STROBE, "d25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_VS, "a23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_WEN, "b23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_XCLKA, "c25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CAM_XCLKB, "b26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DX0, "ag19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DX1, "ag18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DY0, "ah19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(CSI2_DY1, "ah18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_ACBIAS, "e27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA0, "ag22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA1, "ah22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA10, "ad28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA11, "ad27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA12, "ab28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA13, "ab27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA14, "aa28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA15, "aa27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA16, "g25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA17, "h27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA18, "h26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA19, "h25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA2, "ag23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA20, "e28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA21, "j26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA22, "ac27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA23, "ac28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA3, "ah23", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA4, "ag24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA5, "ah24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA6, "e26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA7, "f28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA8, "f27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_DATA9, "g26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_HSYNC, "d26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_PCLK, "d28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(DSS_VSYNC, "d27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_CLK, "af10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_CTL, "ae10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D0, "af11", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D1, "ag12", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D10, "ae7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D11, "af7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D12, "ag7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D13, "ah7", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D14, "ag8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D15, "ah8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D2, "ah12", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D3, "ae13", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D4, "ae11", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D5, "ah9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D6, "af13", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D7, "ah14", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D8, "af9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(ETK_D9, "ag9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A1, "n4", "ac15"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A10, "k3", "ab19"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A11, NULL, "ac20"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A2, "m4", "ab15"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A3, "l4", "ac16"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A4, "k4", "ab16"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A5, "t3", "ac17"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A6, "r3", "ab17"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A7, "n3", "ac18"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A8, "m3", "ab18"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_A9, "l3", "ac19"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_CLK, "t4", "w2"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D10, "p1", "ab4"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D11, "r1", "ac4"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D12, "r2", "ab6"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D13, "t2", "ac6"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D14, "w1", "ab7"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D15, "y1", "ac7"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_D9, "k2", "ac3"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NBE0_CLE, "g3", "ac12"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NBE1, "u3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS1, "h3", "y1"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS2, "v8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS3, "u8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS4, "t8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS5, "r8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS6, "p8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NCS7, "n8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_NWP, "h1", "ab10"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_WAIT1, "l8", "ac10"),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_WAIT2, "k8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(GPMC_WAIT3, "j8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HDQ_SIO, "j25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_CLK, "t28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA0, "t27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA1, "u28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA2, "u27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA3, "u26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA4, "u25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA5, "v28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA6, "v27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DATA7, "v26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_DIR, "r28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_NXT, "t26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(HSUSB0_STP, "t25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C2_SCL, "af15", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C2_SDA, "ae15", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C3_SCL, "af14", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C3_SDA, "ag14", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C4_SCL, "ad26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(I2C4_SDA, "ae26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(JTAG_EMU0, "aa11", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(JTAG_EMU1, "aa10", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_CLKR, "y21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_CLKX, "w21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_DR, "u21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_DX, "v21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_FSR, "aa21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP1_FSX, "k26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_CLKX, "n21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_DR, "r21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_DX, "m21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP2_FSX, "p21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_CLKX, "af5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_DR, "ae6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_DX, "af6", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP3_FSX, "ae5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_CLKX, "ae1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_DR, "ad1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_DX, "ad2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP4_FSX, "ac1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCBSP_CLKS, "t21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CLK, "ab3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS0, "ac2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS1, "ac3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS2, "ab1", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_CS3, "ab2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_SIMO, "ab4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI1_SOMI, "aa4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CLK, "aa3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CS0, "y4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_CS1, "v3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_SIMO, "y2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(MCSPI2_SOMI, "y3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_CLK, "n28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_CMD, "m27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT0, "n27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT1, "n26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT2, "n25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC1_DAT3, "p28", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_CLK, "ae2", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_CMD, "ag5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT0, "ah5", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT1, "ah4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT2, "ag4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT3, "af4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT4, "ae4", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT5, "ah3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT6, "af3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDMMC2_DAT7, "ae3", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SDRC_CKE0, "h16", "j22"),</div><div class='del'>-	_OMAP3_BALLENTRY(SDRC_CKE1, "h17", "j23"),</div><div class='del'>-	_OMAP3_BALLENTRY(SIM_CLK, "p26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SIM_IO, "p27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SIM_PWRCTRL, "r27", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SIM_RST, "r25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT0, "ah26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT1, "ag26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT2, "ae14", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT3, "af18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT4, "af19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT5, "ae21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_BOOT6, "af21", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKOUT1, "ag25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKOUT2, "ae22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_CLKREQ, "af25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_NIRQ, "af26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_NRESWARM, "af24", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(SYS_OFF_MODE, "af22", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_CTS, "w8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_RTS, "aa9", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_RX, "y8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART1_TX, "aa8", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_CTS, "ab26", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_RTS, "ab25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_RX, "ad25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART2_TX, "aa25", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_CTS_RCTX, "h18", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_RTS_SD, "h19", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_RX_IRRX, "h20", NULL),</div><div class='del'>-	_OMAP3_BALLENTRY(UART3_TX_IRTX, "h21", NULL),</div><div class='del'>-	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-#define omap36xx_cbp_ball	 NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int __init omap3_mux_init(struct omap_board_mux *board_subset, int flags)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux *package_subset;</div><div class='del'>-	struct omap_ball *package_balls;</div><div class='del'>-</div><div class='del'>-	switch (flags &amp; OMAP_PACKAGE_MASK) {</div><div class='del'>-	case OMAP_PACKAGE_CBC:</div><div class='del'>-		package_subset = omap3_cbc_subset;</div><div class='del'>-		package_balls = omap3_cbc_ball;</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_PACKAGE_CBB:</div><div class='del'>-		package_subset = omap3_cbb_subset;</div><div class='del'>-		package_balls = omap3_cbb_ball;</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_PACKAGE_CUS:</div><div class='del'>-		package_subset = omap3_cus_subset;</div><div class='del'>-		package_balls = omap3_cus_ball;</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_PACKAGE_CBP:</div><div class='del'>-		package_subset = omap36xx_cbp_subset;</div><div class='del'>-		package_balls = omap36xx_cbp_ball;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("%s Unknown omap package, mux disabled\n", __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return omap_mux_init("core", OMAP_MUX_GPIO_IN_MODE4,</div><div class='del'>-			     OMAP3_CONTROL_PADCONF_MUX_PBASE,</div><div class='del'>-			     OMAP3_CONTROL_PADCONF_MUX_SIZE,</div><div class='del'>-			     omap3_muxmodes, package_subset, board_subset,</div><div class='del'>-			     package_balls);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-omap2/mux34xx.h b/arch/arm/mach-omap2/mux34xx.h<br/>deleted file mode 100644<br/>index 3f26d297c082..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/mux34xx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/mux34xx.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,402 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 Nokia</div><div class='del'>- * Copyright (C) 2009 Texas Instruments</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MUX_PBASE				0x48002030LU</div><div class='del'>-</div><div class='del'>-#define OMAP3_MUX(mode0, mux_value)					\</div><div class='del'>-{									\</div><div class='del'>-	.reg_offset	= (OMAP3_CONTROL_PADCONF_##mode0##_OFFSET),	\</div><div class='del'>-	.value		= (mux_value),					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * OMAP3 CONTROL_PADCONF* register offsets for pin-muxing</div><div class='del'>- *</div><div class='del'>- * Extracted from the TRM.  Add 0x48002030 to these values to get the</div><div class='del'>- * absolute addresses.  The name in the macro is the mode-0 name of</div><div class='del'>- * the pin.  NOTE: These registers are 16-bits wide.</div><div class='del'>- *</div><div class='del'>- * Note that 34XX TRM uses MMC instead of SDMMC and SAD2D instead</div><div class='del'>- * of CHASSIS for some registers. For the defines, we follow the</div><div class='del'>- * 36XX naming, and use SDMMC and CHASSIS.</div><div class='del'>- */</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D0_OFFSET			0x000</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D1_OFFSET			0x002</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D2_OFFSET			0x004</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D3_OFFSET			0x006</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D4_OFFSET			0x008</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D5_OFFSET			0x00a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D6_OFFSET			0x00c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D7_OFFSET			0x00e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D8_OFFSET			0x010</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D9_OFFSET			0x012</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D10_OFFSET			0x014</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D11_OFFSET			0x016</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D12_OFFSET			0x018</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D13_OFFSET			0x01a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D14_OFFSET			0x01c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D15_OFFSET			0x01e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D16_OFFSET			0x020</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D17_OFFSET			0x022</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D18_OFFSET			0x024</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D19_OFFSET			0x026</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D20_OFFSET			0x028</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D21_OFFSET			0x02a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D22_OFFSET			0x02c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D23_OFFSET			0x02e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D24_OFFSET			0x030</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D25_OFFSET			0x032</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D26_OFFSET			0x034</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D27_OFFSET			0x036</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D28_OFFSET			0x038</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D29_OFFSET			0x03a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D30_OFFSET			0x03c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_D31_OFFSET			0x03e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_CLK_OFFSET			0x040</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_DQS0_OFFSET			0x042</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_DQS1_OFFSET			0x044</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_DQS2_OFFSET			0x046</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_DQS3_OFFSET			0x048</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_A1_OFFSET			0x04a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_A2_OFFSET			0x04c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_A3_OFFSET			0x04e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_A4_OFFSET			0x050</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_A5_OFFSET			0x052</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_A6_OFFSET			0x054</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_A7_OFFSET			0x056</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_A8_OFFSET			0x058</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_A9_OFFSET			0x05a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_A10_OFFSET			0x05c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D0_OFFSET			0x05e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D1_OFFSET			0x060</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D2_OFFSET			0x062</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D3_OFFSET			0x064</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D4_OFFSET			0x066</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D5_OFFSET			0x068</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D6_OFFSET			0x06a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D7_OFFSET			0x06c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D8_OFFSET			0x06e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D9_OFFSET			0x070</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D10_OFFSET			0x072</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D11_OFFSET			0x074</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D12_OFFSET			0x076</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D13_OFFSET			0x078</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D14_OFFSET			0x07a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_D15_OFFSET			0x07c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NCS0_OFFSET			0x07e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NCS1_OFFSET			0x080</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NCS2_OFFSET			0x082</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NCS3_OFFSET			0x084</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NCS4_OFFSET			0x086</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NCS5_OFFSET			0x088</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NCS6_OFFSET			0x08a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NCS7_OFFSET			0x08c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_CLK_OFFSET			0x08e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NADV_ALE_OFFSET		0x090</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NOE_OFFSET			0x092</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NWE_OFFSET			0x094</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NBE0_CLE_OFFSET		0x096</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NBE1_OFFSET			0x098</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_NWP_OFFSET			0x09a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_WAIT0_OFFSET			0x09c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_WAIT1_OFFSET			0x09e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_WAIT2_OFFSET			0x0a0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_WAIT3_OFFSET			0x0a2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_PCLK_OFFSET			0x0a4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_HSYNC_OFFSET			0x0a6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_VSYNC_OFFSET			0x0a8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_ACBIAS_OFFSET			0x0aa</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA0_OFFSET			0x0ac</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA1_OFFSET			0x0ae</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA2_OFFSET			0x0b0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA3_OFFSET			0x0b2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA4_OFFSET			0x0b4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA5_OFFSET			0x0b6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA6_OFFSET			0x0b8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA7_OFFSET			0x0ba</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA8_OFFSET			0x0bc</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA9_OFFSET			0x0be</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA10_OFFSET			0x0c0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA11_OFFSET			0x0c2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA12_OFFSET			0x0c4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA13_OFFSET			0x0c6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA14_OFFSET			0x0c8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA15_OFFSET			0x0ca</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA16_OFFSET			0x0cc</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA17_OFFSET			0x0ce</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA18_OFFSET			0x0d0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA19_OFFSET			0x0d2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA20_OFFSET			0x0d4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA21_OFFSET			0x0d6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA22_OFFSET			0x0d8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_DSS_DATA23_OFFSET			0x0da</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_HS_OFFSET			0x0dc</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_VS_OFFSET			0x0de</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_XCLKA_OFFSET			0x0e0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_PCLK_OFFSET			0x0e2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_FLD_OFFSET			0x0e4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D0_OFFSET			0x0e6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D1_OFFSET			0x0e8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D2_OFFSET			0x0ea</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D3_OFFSET			0x0ec</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D4_OFFSET			0x0ee</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D5_OFFSET			0x0f0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D6_OFFSET			0x0f2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D7_OFFSET			0x0f4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D8_OFFSET			0x0f6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D9_OFFSET			0x0f8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D10_OFFSET			0x0fa</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_D11_OFFSET			0x0fc</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_XCLKB_OFFSET			0x0fe</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_WEN_OFFSET			0x100</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CAM_STROBE_OFFSET			0x102</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CSI2_DX0_OFFSET			0x104</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CSI2_DY0_OFFSET			0x106</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CSI2_DX1_OFFSET			0x108</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CSI2_DY1_OFFSET			0x10a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP2_FSX_OFFSET			0x10c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP2_CLKX_OFFSET		0x10e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP2_DR_OFFSET			0x110</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP2_DX_OFFSET			0x112</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC1_CLK_OFFSET			0x114</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC1_CMD_OFFSET			0x116</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC1_DAT0_OFFSET		0x118</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC1_DAT1_OFFSET		0x11a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC1_DAT2_OFFSET		0x11c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC1_DAT3_OFFSET		0x11e</div><div class='del'>-</div><div class='del'>-/* SDMMC1_DAT4 - DAT7 are SIM_IO SIM_CLK SIM_PWRCTRL and SIM_RST on 36xx */</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC1_DAT4_OFFSET		0x120</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC1_DAT5_OFFSET		0x122</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC1_DAT6_OFFSET		0x124</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC1_DAT7_OFFSET		0x126</div><div class='del'>-</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC2_CLK_OFFSET			0x128</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC2_CMD_OFFSET			0x12a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC2_DAT0_OFFSET		0x12c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC2_DAT1_OFFSET		0x12e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC2_DAT2_OFFSET		0x130</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC2_DAT3_OFFSET		0x132</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC2_DAT4_OFFSET		0x134</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC2_DAT5_OFFSET		0x136</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC2_DAT6_OFFSET		0x138</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDMMC2_DAT7_OFFSET		0x13a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP3_DX_OFFSET			0x13c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP3_DR_OFFSET			0x13e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP3_CLKX_OFFSET		0x140</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP3_FSX_OFFSET			0x142</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART2_CTS_OFFSET			0x144</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART2_RTS_OFFSET			0x146</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART2_TX_OFFSET			0x148</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART2_RX_OFFSET			0x14a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART1_TX_OFFSET			0x14c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART1_RTS_OFFSET			0x14e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART1_CTS_OFFSET			0x150</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART1_RX_OFFSET			0x152</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP4_CLKX_OFFSET		0x154</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP4_DR_OFFSET			0x156</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP4_DX_OFFSET			0x158</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP4_FSX_OFFSET			0x15a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP1_CLKR_OFFSET		0x15c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP1_FSR_OFFSET			0x15e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP1_DX_OFFSET			0x160</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP1_DR_OFFSET			0x162</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP_CLKS_OFFSET			0x164</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP1_FSX_OFFSET			0x166</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCBSP1_CLKX_OFFSET		0x168</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART3_CTS_RCTX_OFFSET		0x16a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART3_RTS_SD_OFFSET		0x16c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART3_RX_IRRX_OFFSET		0x16e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_UART3_TX_IRTX_OFFSET		0x170</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_CLK_OFFSET			0x172</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_STP_OFFSET			0x174</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_DIR_OFFSET			0x176</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_NXT_OFFSET			0x178</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_DATA0_OFFSET		0x17a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_DATA1_OFFSET		0x17c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_DATA2_OFFSET		0x17e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_DATA3_OFFSET		0x180</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_DATA4_OFFSET		0x182</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_DATA5_OFFSET		0x184</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_DATA6_OFFSET		0x186</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HSUSB0_DATA7_OFFSET		0x188</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_I2C1_SCL_OFFSET			0x18a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_I2C1_SDA_OFFSET			0x18c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_I2C2_SCL_OFFSET			0x18e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_I2C2_SDA_OFFSET			0x190</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_I2C3_SCL_OFFSET			0x192</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_I2C3_SDA_OFFSET			0x194</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_HDQ_SIO_OFFSET			0x196</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI1_CLK_OFFSET			0x198</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI1_SIMO_OFFSET		0x19a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI1_SOMI_OFFSET		0x19c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI1_CS0_OFFSET			0x19e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI1_CS1_OFFSET			0x1a0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI1_CS2_OFFSET			0x1a2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI1_CS3_OFFSET			0x1a4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI2_CLK_OFFSET			0x1a6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI2_SIMO_OFFSET		0x1a8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI2_SOMI_OFFSET		0x1aa</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI2_CS0_OFFSET			0x1ac</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MCSPI2_CS1_OFFSET			0x1ae</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_NIRQ_OFFSET			0x1b0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_CLKOUT2_OFFSET		0x1b2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD0_OFFSET		0x1b4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD1_OFFSET		0x1b6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD2_OFFSET		0x1b8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD3_OFFSET		0x1ba</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD4_OFFSET		0x1bc</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD5_OFFSET		0x1be</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD6_OFFSET		0x1c0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD7_OFFSET		0x1c2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD8_OFFSET		0x1c4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD9_OFFSET		0x1c6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD10_OFFSET		0x1c8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD11_OFFSET		0x1ca</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD12_OFFSET		0x1cc</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD13_OFFSET		0x1ce</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD14_OFFSET		0x1d0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD15_OFFSET		0x1d2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD16_OFFSET		0x1d4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD17_OFFSET		0x1d6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD18_OFFSET		0x1d8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD19_OFFSET		0x1da</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD20_OFFSET		0x1dc</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD21_OFFSET		0x1de</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD22_OFFSET		0x1e0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD23_OFFSET		0x1e2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD24_OFFSET		0x1e4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD25_OFFSET		0x1e6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD26_OFFSET		0x1e8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD27_OFFSET		0x1ea</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD28_OFFSET		0x1ec</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD29_OFFSET		0x1ee</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD30_OFFSET		0x1f0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD31_OFFSET		0x1f2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD32_OFFSET		0x1f4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD33_OFFSET		0x1f6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD34_OFFSET		0x1f8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD35_OFFSET		0x1fa</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MCAD36_OFFSET		0x1fc</div><div class='del'>-</div><div class='del'>-/* Note that 34xx TRM has SAD2D instead of CHASSIS for these */</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_CLK26MI_OFFSET		0x1fe</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_NRESPWRON_OFFSET		0x200</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_NRESWARW_OFFSET		0x202</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_NIRQ_OFFSET		0x204</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_FIQ_OFFSET		0x206</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_ARMIRQ_OFFSET		0x208</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_IVAIRQ_OFFSET		0x20a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_DMAREQ0_OFFSET		0x20c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_DMAREQ1_OFFSET		0x20e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_DMAREQ2_OFFSET		0x210</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_DMAREQ3_OFFSET		0x212</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_NTRST_OFFSET		0x214</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_TDI_OFFSET		0x216</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_TDO_OFFSET		0x218</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_TMS_OFFSET		0x21a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_TCK_OFFSET		0x21c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_RTCK_OFFSET		0x21e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_MSTDBY_OFFSET		0x220</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_IDLEREQ_OFFSET		0x222</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_CHASSIS_IDLEACK_OFFSET		0x224</div><div class='del'>-</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MWRITE_OFFSET		0x226</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_SWRITE_OFFSET		0x228</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MREAD_OFFSET		0x22a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_SREAD_OFFSET		0x22c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_MBUSFLAG_OFFSET		0x22e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_SBUSFLAG_OFFSET		0x230</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_CKE0_OFFSET			0x232</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_CKE1_OFFSET			0x234</div><div class='del'>-</div><div class='del'>-/* 36xx only */</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPMC_A11_OFFSET			0x236</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_BA0_OFFSET			0x570</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_BA1_OFFSET			0x572</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A0_OFFSET			0x574</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A1_OFFSET			0x576</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A2_OFFSET			0x578</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A3_OFFSET			0x57a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A4_OFFSET			0x57c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A5_OFFSET			0x57e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A6_OFFSET			0x580</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A7_OFFSET			0x582</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A8_OFFSET			0x584</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A9_OFFSET			0x586</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A10_OFFSET			0x588</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A11_OFFSET			0x58a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A12_OFFSET			0x58c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A13_OFFSET			0x58e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_A14_OFFSET			0x590</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_NCS0_OFFSET			0x592</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_NCS1_OFFSET			0x594</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_NCLK_OFFSET			0x596</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_NRAS_OFFSET			0x598</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_NCAS_OFFSET			0x59a</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_NWE_OFFSET			0x59c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_DM0_OFFSET			0x59e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_DM1_OFFSET			0x5a0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_DM2_OFFSET			0x5a2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SDRC_DM3_OFFSET			0x5a4</div><div class='del'>-</div><div class='del'>-/* 36xx only, these are SDMMC1_DAT4 - DAT7 on 34xx */</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SIM_IO_OFFSET			0x120</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SIM_CLK_OFFSET			0x122</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SIM_PWRCTRL_OFFSET		0x124</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SIM_RST_OFFSET			0x126</div><div class='del'>-</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_CLK_OFFSET			0x5a8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_CTL_OFFSET			0x5aa</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D0_OFFSET			0x5ac</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D1_OFFSET			0x5ae</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D2_OFFSET			0x5b0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D3_OFFSET			0x5b2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D4_OFFSET			0x5b4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D5_OFFSET			0x5b6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D6_OFFSET			0x5b8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D7_OFFSET			0x5ba</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D8_OFFSET			0x5bc</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D9_OFFSET			0x5be</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D10_OFFSET			0x5c0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D11_OFFSET			0x5c2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D12_OFFSET			0x5c4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D13_OFFSET			0x5c6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D14_OFFSET			0x5c8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_ETK_D15_OFFSET			0x5ca</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_I2C4_SCL_OFFSET			0x9d0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_I2C4_SDA_OFFSET			0x9d2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_32K_OFFSET			0x9d4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_CLKREQ_OFFSET			0x9d6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_NRESWARM_OFFSET		0x9d8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_BOOT0_OFFSET			0x9da</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_BOOT1_OFFSET			0x9dc</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_BOOT2_OFFSET			0x9de</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_BOOT3_OFFSET			0x9e0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_BOOT4_OFFSET			0x9e2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_BOOT5_OFFSET			0x9e4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_BOOT6_OFFSET			0x9e6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_OFF_MODE_OFFSET		0x9e8</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SYS_CLKOUT1_OFFSET		0x9ea</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_JTAG_NTRST_OFFSET			0x9ec</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_JTAG_TCK_OFFSET			0x9ee</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_JTAG_TMS_TMSC_OFFSET		0x9f0</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_JTAG_TDI_OFFSET			0x9f2</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_JTAG_EMU0_OFFSET			0x9f4</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_JTAG_EMU1_OFFSET			0x9f6</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_SAD2D_SWAKEUP_OFFSET		0xa1c</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_JTAG_RTCK_OFFSET			0xa1e</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_JTAG_TDO_OFFSET			0xa20</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPIO_127				0xa24</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPIO_126				0xa26</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPIO_128				0xa28</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_GPIO_129				0xa2a</div><div class='del'>-</div><div class='del'>-#define OMAP3_CONTROL_PADCONF_MUX_SIZE				\</div><div class='del'>-		(OMAP3_CONTROL_PADCONF_GPIO_129 + 0x2)</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c<br/>index ad982465efd0..113ab2dd2ee9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap-mpuss-lowpower.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap-mpuss-lowpower.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap-mpuss-lowpower.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap-mpuss-lowpower.c</a></div><div class='hunk'>@@ -48,6 +48,7 @@</div><div class='ctx'> #include &lt;asm/smp_scu.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/suspend.h&gt;</div><div class='add'>+#include &lt;asm/virt.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "soc.h"</div><div class='hunk'>@@ -244,10 +245,9 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state)</div><div class='ctx'> 		save_state = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PWRDM_POWER_RET:</div><div class='del'>-		if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) {</div><div class='add'>+		if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE))</div><div class='ctx'> 			save_state = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * CPUx CSWR is invalid hardware state. Also CPUx OSWR</div><div class='hunk'>@@ -273,7 +273,7 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state)</div><div class='ctx'> 	cpu_clear_prev_logic_pwrst(cpu);</div><div class='ctx'> 	pwrdm_set_next_pwrst(pm_info-&gt;pwrdm, power_state);</div><div class='ctx'> 	pwrdm_set_logic_retst(pm_info-&gt;pwrdm, cpu_logic_state);</div><div class='del'>-	set_cpu_wakeup_addr(cpu, virt_to_phys(omap_pm_ops.resume));</div><div class='add'>+	set_cpu_wakeup_addr(cpu, __pa_symbol(omap_pm_ops.resume));</div><div class='ctx'> 	omap_pm_ops.scu_prepare(cpu, power_state);</div><div class='ctx'> 	l2x0_pwrst_prepare(cpu, save_state);</div><div class='ctx'> </div><div class='hunk'>@@ -325,7 +325,7 @@ int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)</div><div class='ctx'> </div><div class='ctx'> 	pwrdm_clear_all_prev_pwrst(pm_info-&gt;pwrdm);</div><div class='ctx'> 	pwrdm_set_next_pwrst(pm_info-&gt;pwrdm, power_state);</div><div class='del'>-	set_cpu_wakeup_addr(cpu, virt_to_phys(omap_pm_ops.hotplug_restart));</div><div class='add'>+	set_cpu_wakeup_addr(cpu, __pa_symbol(omap_pm_ops.hotplug_restart));</div><div class='ctx'> 	omap_pm_ops.scu_prepare(cpu, power_state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -371,8 +371,12 @@ int __init omap4_mpuss_init(void)</div><div class='ctx'> 	pm_info = &amp;per_cpu(omap4_pm_info, 0x0);</div><div class='ctx'> 	if (sar_base) {</div><div class='ctx'> 		pm_info-&gt;scu_sar_addr = sar_base + SCU_OFFSET0;</div><div class='del'>-		pm_info-&gt;wkup_sar_addr = sar_base +</div><div class='del'>-					CPU0_WAKEUP_NS_PA_ADDR_OFFSET;</div><div class='add'>+		if (cpu_is_omap44xx())</div><div class='add'>+			pm_info-&gt;wkup_sar_addr = sar_base +</div><div class='add'>+				CPU0_WAKEUP_NS_PA_ADDR_OFFSET;</div><div class='add'>+		else</div><div class='add'>+			pm_info-&gt;wkup_sar_addr = sar_base +</div><div class='add'>+				OMAP5_CPU0_WAKEUP_NS_PA_ADDR_OFFSET;</div><div class='ctx'> 		pm_info-&gt;l2x0_sar_addr = sar_base + L2X0_SAVE_OFFSET0;</div><div class='ctx'> 	}</div><div class='ctx'> 	pm_info-&gt;pwrdm = pwrdm_lookup("cpu0_pwrdm");</div><div class='hunk'>@@ -391,8 +395,12 @@ int __init omap4_mpuss_init(void)</div><div class='ctx'> 	pm_info = &amp;per_cpu(omap4_pm_info, 0x1);</div><div class='ctx'> 	if (sar_base) {</div><div class='ctx'> 		pm_info-&gt;scu_sar_addr = sar_base + SCU_OFFSET1;</div><div class='del'>-		pm_info-&gt;wkup_sar_addr = sar_base +</div><div class='del'>-					CPU1_WAKEUP_NS_PA_ADDR_OFFSET;</div><div class='add'>+		if (cpu_is_omap44xx())</div><div class='add'>+			pm_info-&gt;wkup_sar_addr = sar_base +</div><div class='add'>+				CPU1_WAKEUP_NS_PA_ADDR_OFFSET;</div><div class='add'>+		else</div><div class='add'>+			pm_info-&gt;wkup_sar_addr = sar_base +</div><div class='add'>+				OMAP5_CPU1_WAKEUP_NS_PA_ADDR_OFFSET;</div><div class='ctx'> 		pm_info-&gt;l2x0_sar_addr = sar_base + L2X0_SAVE_OFFSET1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -453,15 +461,24 @@ void __init omap4_mpuss_early_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long startup_pa;</div><div class='ctx'> </div><div class='del'>-	if (!cpu_is_omap44xx())</div><div class='add'>+	if (!(cpu_is_omap44xx() || soc_is_omap54xx()))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	sar_base = omap4_get_sar_ram_base();</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_omap443x())</div><div class='del'>-		startup_pa = virt_to_phys(omap4_secondary_startup);</div><div class='add'>+		startup_pa = __pa_symbol(omap4_secondary_startup);</div><div class='add'>+	else if (cpu_is_omap446x())</div><div class='add'>+		startup_pa = __pa_symbol(omap4460_secondary_startup);</div><div class='add'>+	else if ((__boot_cpu_mode &amp; MODE_MASK) == HYP_MODE)</div><div class='add'>+		startup_pa = __pa_symbol(omap5_secondary_hyp_startup);</div><div class='ctx'> 	else</div><div class='del'>-		startup_pa = virt_to_phys(omap4460_secondary_startup);</div><div class='add'>+		startup_pa = __pa_symbol(omap5_secondary_startup);</div><div class='ctx'> </div><div class='del'>-	writel_relaxed(startup_pa, sar_base + CPU1_WAKEUP_NS_PA_ADDR_OFFSET);</div><div class='add'>+	if (cpu_is_omap44xx())</div><div class='add'>+		writel_relaxed(startup_pa, sar_base +</div><div class='add'>+			       CPU1_WAKEUP_NS_PA_ADDR_OFFSET);</div><div class='add'>+	else</div><div class='add'>+		writel_relaxed(startup_pa, sar_base +</div><div class='add'>+			       OMAP5_CPU1_WAKEUP_NS_PA_ADDR_OFFSET);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c<br/>index b4de3da6dffa..003353b0b794 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap-smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap-smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap-smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap-smp.c</a></div><div class='hunk'>@@ -316,9 +316,9 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	 * A barrier is added to ensure that write buffer is drained</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (omap_secure_apis_support())</div><div class='del'>-		omap_auxcoreboot_addr(virt_to_phys(cfg.startup_addr));</div><div class='add'>+		omap_auxcoreboot_addr(__pa_symbol(cfg.startup_addr));</div><div class='ctx'> 	else</div><div class='del'>-		writel_relaxed(virt_to_phys(cfg.startup_addr),</div><div class='add'>+		writel_relaxed(__pa_symbol(cfg.startup_addr),</div><div class='ctx'> 			       base + OMAP_AUX_CORE_BOOT_1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/omap4-sar-layout.h b/arch/arm/mach-omap2/omap4-sar-layout.h<br/>index 792b1069f724..5b2966a0f733 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap4-sar-layout.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap4-sar-layout.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap4-sar-layout.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap4-sar-layout.h</a></div><div class='hunk'>@@ -31,6 +31,8 @@</div><div class='ctx'> /* CPUx Wakeup Non-Secure Physical Address offsets in SAR_BANK3 */</div><div class='ctx'> #define CPU0_WAKEUP_NS_PA_ADDR_OFFSET		0xa04</div><div class='ctx'> #define CPU1_WAKEUP_NS_PA_ADDR_OFFSET		0xa08</div><div class='add'>+#define OMAP5_CPU0_WAKEUP_NS_PA_ADDR_OFFSET	0xe00</div><div class='add'>+#define OMAP5_CPU1_WAKEUP_NS_PA_ADDR_OFFSET	0xe04</div><div class='ctx'> </div><div class='ctx'> #define SAR_BACKUP_STATUS_OFFSET		(SAR_BANK3_OFFSET + 0x500)</div><div class='ctx'> #define SAR_SECURE_RAM_SIZE_OFFSET		(SAR_BANK3_OFFSET + 0x504)</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c<br/>index 1052b29697b8..0da4f2ea76c4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod.c</a></div><div class='hunk'>@@ -160,7 +160,6 @@</div><div class='ctx'> #include "prm44xx.h"</div><div class='ctx'> #include "prm33xx.h"</div><div class='ctx'> #include "prminst44xx.h"</div><div class='del'>-#include "mux.h"</div><div class='ctx'> #include "pm.h"</div><div class='ctx'> </div><div class='ctx'> /* Name of the OMAP hwmod for the MPU */</div><div class='hunk'>@@ -217,9 +216,6 @@ static LIST_HEAD(omap_hwmod_list);</div><div class='ctx'> /* mpu_oh: used to add/remove MPU initiator from sleepdep list */</div><div class='ctx'> static struct omap_hwmod *mpu_oh;</div><div class='ctx'> </div><div class='del'>-/* io_chain_lock: used to serialize reconfigurations of the I/O chain */</div><div class='del'>-static DEFINE_SPINLOCK(io_chain_lock);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * linkspace: ptr to a buffer that struct omap_hwmod_link records are</div><div class='ctx'>  * allocated from - used to reduce the number of small memory</div><div class='hunk'>@@ -594,51 +590,6 @@ static int _set_module_autoidle(struct omap_hwmod *oh, u8 autoidle,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * _set_idle_ioring_wakeup - enable/disable IO pad wakeup on hwmod idle for mux</div><div class='del'>- * @oh: struct omap_hwmod *</div><div class='del'>- * @set_wake: bool value indicating to set (true) or clear (false) wakeup enable</div><div class='del'>- *</div><div class='del'>- * Set or clear the I/O pad wakeup flag in the mux entries for the</div><div class='del'>- * hwmod @oh.  This function changes the @oh-&gt;mux-&gt;pads_dynamic array</div><div class='del'>- * in memory.  If the hwmod is currently idled, and the new idle</div><div class='del'>- * values don't match the previous ones, this function will also</div><div class='del'>- * update the SCM PADCTRL registers.  Otherwise, if the hwmod is not</div><div class='del'>- * currently idled, this function won't touch the hardware: the new</div><div class='del'>- * mux settings are written to the SCM PADCTRL registers when the</div><div class='del'>- * hwmod is idled.  No return value.</div><div class='del'>- */</div><div class='del'>-static void _set_idle_ioring_wakeup(struct omap_hwmod *oh, bool set_wake)</div><div class='del'>-{</div><div class='del'>-	struct omap_device_pad *pad;</div><div class='del'>-	bool change = false;</div><div class='del'>-	u16 prev_idle;</div><div class='del'>-	int j;</div><div class='del'>-</div><div class='del'>-	if (!oh-&gt;mux || !oh-&gt;mux-&gt;enabled)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; oh-&gt;mux-&gt;nr_pads_dynamic; j++) {</div><div class='del'>-		pad = oh-&gt;mux-&gt;pads_dynamic[j];</div><div class='del'>-</div><div class='del'>-		if (!(pad-&gt;flags &amp; OMAP_DEVICE_PAD_WAKEUP))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		prev_idle = pad-&gt;idle;</div><div class='del'>-</div><div class='del'>-		if (set_wake)</div><div class='del'>-			pad-&gt;idle |= OMAP_WAKEUP_EN;</div><div class='del'>-		else</div><div class='del'>-			pad-&gt;idle &amp;= ~OMAP_WAKEUP_EN;</div><div class='del'>-</div><div class='del'>-		if (prev_idle != pad-&gt;idle)</div><div class='del'>-			change = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (change &amp;&amp; oh-&gt;_state == _HWMOD_STATE_IDLE)</div><div class='del'>-		omap_hwmod_mux(oh-&gt;mux, _HWMOD_STATE_IDLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * _enable_wakeup: set OCP_SYSCONFIG.ENAWAKEUP bit in the hardware</div><div class='ctx'>  * @oh: struct omap_hwmod *</div><div class='ctx'>  *</div><div class='hunk'>@@ -790,14 +741,14 @@ static int _init_main_clk(struct omap_hwmod *oh)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	char name[MOD_CLK_MAX_NAME_LEN];</div><div class='ctx'> 	struct clk *clk;</div><div class='add'>+	static const char modck[] = "_mod_ck";</div><div class='ctx'> </div><div class='del'>-	/* +7 magic comes from '_mod_ck' suffix */</div><div class='del'>-	if (strlen(oh-&gt;name) + 7 &gt; MOD_CLK_MAX_NAME_LEN)</div><div class='add'>+	if (strlen(oh-&gt;name) &gt;= MOD_CLK_MAX_NAME_LEN - strlen(modck))</div><div class='ctx'> 		pr_warn("%s: warning: cropping name for %s\n", __func__,</div><div class='ctx'> 			oh-&gt;name);</div><div class='ctx'> </div><div class='del'>-	strncpy(name, oh-&gt;name, MOD_CLK_MAX_NAME_LEN - 7);</div><div class='del'>-	strcat(name, "_mod_ck");</div><div class='add'>+	strlcpy(name, oh-&gt;name, MOD_CLK_MAX_NAME_LEN - strlen(modck));</div><div class='add'>+	strlcat(name, modck, MOD_CLK_MAX_NAME_LEN);</div><div class='ctx'> </div><div class='ctx'> 	clk = clk_get(NULL, name);</div><div class='ctx'> 	if (!IS_ERR(clk)) {</div><div class='hunk'>@@ -2018,29 +1969,6 @@ static int _reset(struct omap_hwmod *oh)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * _reconfigure_io_chain - clear any I/O chain wakeups and reconfigure chain</div><div class='del'>- *</div><div class='del'>- * Call the appropriate PRM function to clear any logged I/O chain</div><div class='del'>- * wakeups and to reconfigure the chain.  This apparently needs to be</div><div class='del'>- * done upon every mux change.  Since hwmods can be concurrently</div><div class='del'>- * enabled and idled, hold a spinlock around the I/O chain</div><div class='del'>- * reconfiguration sequence.  No return value.</div><div class='del'>- *</div><div class='del'>- * XXX When the PRM code is moved to drivers, this function can be removed,</div><div class='del'>- * as the PRM infrastructure should abstract this.</div><div class='del'>- */</div><div class='del'>-static void _reconfigure_io_chain(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;io_chain_lock, flags);</div><div class='del'>-</div><div class='del'>-	omap_prm_reconfigure_io_chain();</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;io_chain_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * _omap4_update_context_lost - increment hwmod context loss counter if</div><div class='ctx'>  * hwmod context was lost, and clear hardware context loss reg</div><div class='ctx'>  * @oh: hwmod to check for context loss</div><div class='hunk'>@@ -2109,18 +2037,9 @@ static int _enable(struct omap_hwmod *oh)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * hwmods with HWMOD_INIT_NO_IDLE flag set are left in enabled</div><div class='del'>-	 * state at init.  Now that someone is really trying to enable</div><div class='del'>-	 * them, just ensure that the hwmod mux is set.</div><div class='add'>+	 * state at init.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (oh-&gt;_int_flags &amp; _HWMOD_SKIP_ENABLE) {</div><div class='del'>-		/*</div><div class='del'>-		 * If the caller has mux data populated, do the mux'ing</div><div class='del'>-		 * which wouldn't have been done as part of the _enable()</div><div class='del'>-		 * done during setup.</div><div class='del'>-		 */</div><div class='del'>-		if (oh-&gt;mux)</div><div class='del'>-			omap_hwmod_mux(oh-&gt;mux, _HWMOD_STATE_ENABLED);</div><div class='del'>-</div><div class='ctx'> 		oh-&gt;_int_flags &amp;= ~_HWMOD_SKIP_ENABLE;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2145,16 +2064,6 @@ static int _enable(struct omap_hwmod *oh)</div><div class='ctx'> 	if (_are_all_hardreset_lines_asserted(oh))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* Mux pins for device runtime if populated */</div><div class='del'>-	if (oh-&gt;mux &amp;&amp; (!oh-&gt;mux-&gt;enabled ||</div><div class='del'>-			((oh-&gt;_state == _HWMOD_STATE_IDLE) &amp;&amp;</div><div class='del'>-			 oh-&gt;mux-&gt;pads_dynamic))) {</div><div class='del'>-		omap_hwmod_mux(oh-&gt;mux, _HWMOD_STATE_ENABLED);</div><div class='del'>-		_reconfigure_io_chain();</div><div class='del'>-	} else if (oh-&gt;flags &amp; HWMOD_RECONFIG_IO_CHAIN) {</div><div class='del'>-		_reconfigure_io_chain();</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	_add_initiator_dep(oh, mpu_oh);</div><div class='ctx'> </div><div class='ctx'> 	if (oh-&gt;clkdm) {</div><div class='hunk'>@@ -2260,14 +2169,6 @@ static int _idle(struct omap_hwmod *oh)</div><div class='ctx'> 		clkdm_hwmod_disable(oh-&gt;clkdm, oh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Mux pins for device idle if populated */</div><div class='del'>-	if (oh-&gt;mux &amp;&amp; oh-&gt;mux-&gt;pads_dynamic) {</div><div class='del'>-		omap_hwmod_mux(oh-&gt;mux, _HWMOD_STATE_IDLE);</div><div class='del'>-		_reconfigure_io_chain();</div><div class='del'>-	} else if (oh-&gt;flags &amp; HWMOD_RECONFIG_IO_CHAIN) {</div><div class='del'>-		_reconfigure_io_chain();</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	oh-&gt;_state = _HWMOD_STATE_IDLE;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2334,10 +2235,6 @@ static int _shutdown(struct omap_hwmod *oh)</div><div class='ctx'> 	for (i = 0; i &lt; oh-&gt;rst_lines_cnt; i++)</div><div class='ctx'> 		_assert_hardreset(oh, oh-&gt;rst_lines[i].name);</div><div class='ctx'> </div><div class='del'>-	/* Mux pins to safe mode or use populated off mode values */</div><div class='del'>-	if (oh-&gt;mux)</div><div class='del'>-		omap_hwmod_mux(oh-&gt;mux, _HWMOD_STATE_DISABLED);</div><div class='del'>-</div><div class='ctx'> 	oh-&gt;_state = _HWMOD_STATE_DISABLED;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3352,6 +3249,36 @@ int __init omap_hwmod_setup_one(const char *oh_name)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * omap_hwmod_setup_earlycon_flags - set up flags for early console</div><div class='add'>+ *</div><div class='add'>+ * Enable DEBUG_OMAPUART_FLAGS for uart hwmod that is being used as</div><div class='add'>+ * early concole so that hwmod core doesn't reset and keep it in idle</div><div class='add'>+ * that specific uart.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_SERIAL_EARLYCON</div><div class='add'>+static void __init omap_hwmod_setup_earlycon_flags(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct omap_hwmod *oh;</div><div class='add'>+	const char *uart;</div><div class='add'>+</div><div class='add'>+	np = of_find_node_by_path("/chosen");</div><div class='add'>+	if (np) {</div><div class='add'>+		uart = of_get_property(np, "stdout-path", NULL);</div><div class='add'>+		if (uart) {</div><div class='add'>+			np = of_find_node_by_path(uart);</div><div class='add'>+			if (np) {</div><div class='add'>+				uart = of_get_property(np, "ti,hwmods", NULL);</div><div class='add'>+				oh = omap_hwmod_lookup(uart);</div><div class='add'>+				if (oh)</div><div class='add'>+					oh-&gt;flags |= DEBUG_OMAPUART_FLAGS;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * omap_hwmod_setup_all - set up all registered IP blocks</div><div class='ctx'>  *</div><div class='ctx'>  * Initialize and set up all IP blocks registered with the hwmod code.</div><div class='hunk'>@@ -3364,6 +3291,9 @@ static int __init omap_hwmod_setup_all(void)</div><div class='ctx'> 	_ensure_mpu_hwmod_is_setup(NULL);</div><div class='ctx'> </div><div class='ctx'> 	omap_hwmod_for_each(_init, NULL);</div><div class='add'>+#ifdef CONFIG_SERIAL_EARLYCON</div><div class='add'>+	omap_hwmod_setup_earlycon_flags();</div><div class='add'>+#endif</div><div class='ctx'> 	omap_hwmod_for_each(_setup, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3729,7 +3659,6 @@ int omap_hwmod_enable_wakeup(struct omap_hwmod *oh)</div><div class='ctx'> 		_write_sysconfig(v, oh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_set_idle_ioring_wakeup(oh, true);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;oh-&gt;_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3762,7 +3691,6 @@ int omap_hwmod_disable_wakeup(struct omap_hwmod *oh)</div><div class='ctx'> 		_write_sysconfig(v, oh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_set_idle_ioring_wakeup(oh, false);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;oh-&gt;_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c<br/>index c1e98d589100..6d2e32462df9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c</a></div><div class='hunk'>@@ -17,156 +17,11 @@</div><div class='ctx'> </div><div class='ctx'> #include "omap_hwmod_common_data.h"</div><div class='ctx'> </div><div class='del'>-struct omap_hwmod_addr_space omap2430_mmc1_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x4809c000,</div><div class='del'>-		.pa_end		= 0x4809c1ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2430_mmc2_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x480b4000,</div><div class='del'>-		.pa_end		= 0x480b41ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_i2c1_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48070000,</div><div class='del'>-		.pa_end		= 0x48070000 + SZ_128 - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_i2c2_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48072000,</div><div class='del'>-		.pa_end		= 0x48072000 + SZ_128 - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_dss_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48050000,</div><div class='del'>-		.pa_end		= 0x48050000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_dss_dispc_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48050400,</div><div class='del'>-		.pa_end		= 0x48050400 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_dss_rfbi_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48050800,</div><div class='del'>-		.pa_end		= 0x48050800 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_dss_venc_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48050C00,</div><div class='del'>-		.pa_end		= 0x48050C00 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_timer10_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48086000,</div><div class='del'>-		.pa_end		= 0x48086000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_timer11_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48088000,</div><div class='del'>-		.pa_end		= 0x48088000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2xxx_timer12_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x4808a000,</div><div class='del'>-		.pa_end		= 0x4808a000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_mcspi1_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48098000,</div><div class='del'>-		.pa_end		= 0x48098000 + SZ_256 - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_mcspi2_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x4809a000,</div><div class='del'>-		.pa_end		= 0x4809a000 + SZ_256 - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x480b8000,</div><div class='del'>-		.pa_end		= 0x480b8000 + SZ_256 - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct omap_hwmod_addr_space omap2_dma_system_addrs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.pa_start	= 0x48056000,</div><div class='ctx'> 		.pa_end		= 0x48056000 + SZ_4K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_mcbsp1_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "mpu",</div><div class='del'>-		.pa_start	= 0x48074000,</div><div class='del'>-		.pa_end		= 0x480740ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_addr_space omap2_hdq1w_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start       = 0x480b2000,</div><div class='del'>-		.pa_end         = 0x480b2fff,</div><div class='del'>-		.flags          = ADDR_TYPE_RT,</div><div class='add'>+		.flags		= ADDR_TYPE_RT,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='add'>+	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c<br/>index c6c6384de867..cfaeb0f78cc8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c</a></div><div class='hunk'>@@ -45,204 +45,31 @@ struct omap_hwmod_class omap2_venc_hwmod_class = {</div><div class='ctx'> 	.name = "venc",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* Common DMA request line data */</div><div class='del'>-struct omap_hwmod_dma_info omap2_uart1_sdma_reqs[] = {</div><div class='del'>-	{ .name = "rx", .dma_req = 50, },</div><div class='del'>-	{ .name = "tx", .dma_req = 49, },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_dma_info omap2_uart2_sdma_reqs[] = {</div><div class='del'>-	{ .name = "rx", .dma_req = 52, },</div><div class='del'>-	{ .name = "tx", .dma_req = 51, },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_dma_info omap2_uart3_sdma_reqs[] = {</div><div class='del'>-	{ .name = "rx", .dma_req = 54, },</div><div class='del'>-	{ .name = "tx", .dma_req = 53, },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_dma_info omap2_i2c1_sdma_reqs[] = {</div><div class='del'>-	{ .name = "tx", .dma_req = 27 },</div><div class='del'>-	{ .name = "rx", .dma_req = 28 },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_dma_info omap2_i2c2_sdma_reqs[] = {</div><div class='del'>-	{ .name = "tx", .dma_req = 29 },</div><div class='del'>-	{ .name = "rx", .dma_req = 30 },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_dma_info omap2_mcspi1_sdma_reqs[] = {</div><div class='del'>-	{ .name = "tx0", .dma_req = 35 }, /* DMA_SPI1_TX0 */</div><div class='del'>-	{ .name = "rx0", .dma_req = 36 }, /* DMA_SPI1_RX0 */</div><div class='del'>-	{ .name = "tx1", .dma_req = 37 }, /* DMA_SPI1_TX1 */</div><div class='del'>-	{ .name = "rx1", .dma_req = 38 }, /* DMA_SPI1_RX1 */</div><div class='del'>-	{ .name = "tx2", .dma_req = 39 }, /* DMA_SPI1_TX2 */</div><div class='del'>-	{ .name = "rx2", .dma_req = 40 }, /* DMA_SPI1_RX2 */</div><div class='del'>-	{ .name = "tx3", .dma_req = 41 }, /* DMA_SPI1_TX3 */</div><div class='del'>-	{ .name = "rx3", .dma_req = 42 }, /* DMA_SPI1_RX3 */</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_dma_info omap2_mcspi2_sdma_reqs[] = {</div><div class='del'>-	{ .name = "tx0", .dma_req = 43 }, /* DMA_SPI2_TX0 */</div><div class='del'>-	{ .name = "rx0", .dma_req = 44 }, /* DMA_SPI2_RX0 */</div><div class='del'>-	{ .name = "tx1", .dma_req = 45 }, /* DMA_SPI2_TX1 */</div><div class='del'>-	{ .name = "rx1", .dma_req = 46 }, /* DMA_SPI2_RX1 */</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_dma_info omap2_mcbsp1_sdma_reqs[] = {</div><div class='del'>-	{ .name = "rx", .dma_req = 32 },</div><div class='del'>-	{ .name = "tx", .dma_req = 31 },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_dma_info omap2_mcbsp2_sdma_reqs[] = {</div><div class='del'>-	{ .name = "rx", .dma_req = 34 },</div><div class='del'>-	{ .name = "tx", .dma_req = 33 },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_dma_info omap2_mcbsp3_sdma_reqs[] = {</div><div class='del'>-	{ .name = "rx", .dma_req = 18 },</div><div class='del'>-	{ .name = "tx", .dma_req = 17 },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Other IP block data */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * omap_hwmod class data</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct omap_hwmod_class l3_hwmod_class = {</div><div class='del'>-	.name = "l3"</div><div class='add'>+	.name = "l3",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct omap_hwmod_class l4_hwmod_class = {</div><div class='del'>-	.name = "l4"</div><div class='add'>+	.name = "l4",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct omap_hwmod_class mpu_hwmod_class = {</div><div class='del'>-	.name = "mpu"</div><div class='add'>+	.name = "mpu",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct omap_hwmod_class iva_hwmod_class = {</div><div class='del'>-	.name = "iva"</div><div class='add'>+	.name = "iva",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Common MPU IRQ line data */</div><div class='ctx'> </div><div class='del'>-struct omap_hwmod_irq_info omap2_timer1_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 37 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_timer2_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 38 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_timer3_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 39 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_timer4_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 40 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_timer5_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 41 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_timer6_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 42 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_timer7_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 43 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_timer8_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 44 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_timer9_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 45 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_timer10_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 46 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_timer11_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 47 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_uart1_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 72 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_uart2_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 73 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_uart3_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 74 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct omap_hwmod_irq_info omap2_dispc_irqs[] = {</div><div class='ctx'> 	{ .irq = 25 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_i2c1_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 56 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_i2c2_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 57 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_gpio1_irqs[] = {</div><div class='del'>-	{ .irq = 29 + OMAP_INTC_START, }, /* INT_24XX_GPIO_BANK1 */</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_gpio2_irqs[] = {</div><div class='del'>-	{ .irq = 30 + OMAP_INTC_START, }, /* INT_24XX_GPIO_BANK2 */</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_gpio3_irqs[] = {</div><div class='del'>-	{ .irq = 31 + OMAP_INTC_START, }, /* INT_24XX_GPIO_BANK3 */</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_gpio4_irqs[] = {</div><div class='del'>-	{ .irq = 32 + OMAP_INTC_START, }, /* INT_24XX_GPIO_BANK4 */</div><div class='del'>-	{ .irq = -1 },</div><div class='add'>+	{ .irq = -1, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct omap_hwmod_irq_info omap2_dma_system_irqs[] = {</div><div class='hunk'>@@ -250,17 +77,7 @@ struct omap_hwmod_irq_info omap2_dma_system_irqs[] = {</div><div class='ctx'> 	{ .name = "1", .irq = 13 + OMAP_INTC_START, }, /* INT_24XX_SDMA_IRQ1 */</div><div class='ctx'> 	{ .name = "2", .irq = 14 + OMAP_INTC_START, }, /* INT_24XX_SDMA_IRQ2 */</div><div class='ctx'> 	{ .name = "3", .irq = 15 + OMAP_INTC_START, }, /* INT_24XX_SDMA_IRQ3 */</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_mcspi1_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 65 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_mcspi2_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 66 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='add'>+	{ .irq = -1, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct omap_hwmod_class_sysconfig omap2_hdq1w_sysc = {</div><div class='hunk'>@@ -277,9 +94,3 @@ struct omap_hwmod_class omap2_hdq1w_class = {</div><div class='ctx'> 	.sysc	= &amp;omap2_hdq1w_sysc,</div><div class='ctx'> 	.reset	= &amp;omap_hdq1w_reset,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-struct omap_hwmod_irq_info omap2_hdq1w_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 58 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c<br/>index 656861c29d5c..9b30b6b471ae 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c</a></div><div class='hunk'>@@ -191,7 +191,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss = {</div><div class='ctx'> 	.master		= &amp;omap2xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap2xxx_dss_core_hwmod,</div><div class='ctx'> 	.clk		= "dss_ick",</div><div class='del'>-	.addr		= omap2_dss_addrs,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,</div><div class='hunk'>@@ -206,7 +205,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_dispc = {</div><div class='ctx'> 	.master		= &amp;omap2xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap2xxx_dss_dispc_hwmod,</div><div class='ctx'> 	.clk		= "dss_ick",</div><div class='del'>-	.addr		= omap2_dss_dispc_addrs,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_DISPC_REGION,</div><div class='hunk'>@@ -221,7 +219,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_rfbi = {</div><div class='ctx'> 	.master		= &amp;omap2xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap2xxx_dss_rfbi_hwmod,</div><div class='ctx'> 	.clk		= "dss_ick",</div><div class='del'>-	.addr		= omap2_dss_rfbi_addrs,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,</div><div class='hunk'>@@ -236,7 +233,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_venc = {</div><div class='ctx'> 	.master		= &amp;omap2xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap2xxx_dss_venc_hwmod,</div><div class='ctx'> 	.clk		= "dss_ick",</div><div class='del'>-	.addr		= omap2_dss_venc_addrs,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_VENC_REGION,</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c<br/>index 36bcd2e75422..e047033caa3e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c</a></div><div class='hunk'>@@ -569,7 +569,6 @@ struct omap_hwmod omap2xxx_dss_core_hwmod = {</div><div class='ctx'> struct omap_hwmod omap2xxx_dss_dispc_hwmod = {</div><div class='ctx'> 	.name		= "dss_dispc",</div><div class='ctx'> 	.class		= &amp;omap2_dispc_hwmod_class,</div><div class='del'>-	.mpu_irqs	= omap2_dispc_irqs,</div><div class='ctx'> 	.main_clk	= "dss1_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h<br/>index d3e61d1a02d7..434bd1a77229 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h</a></div><div class='hunk'>@@ -68,6 +68,7 @@ extern struct omap_hwmod_ocp_if am33xx_l4_ls__uart6;</div><div class='ctx'> extern struct omap_hwmod_ocp_if am33xx_l3_main__ocmc;</div><div class='ctx'> extern struct omap_hwmod_ocp_if am33xx_l3_main__sha0;</div><div class='ctx'> extern struct omap_hwmod_ocp_if am33xx_l3_main__aes0;</div><div class='add'>+extern struct omap_hwmod_ocp_if am33xx_l4_per__rng;</div><div class='ctx'> </div><div class='ctx'> extern struct omap_hwmod am33xx_l3_main_hwmod;</div><div class='ctx'> extern struct omap_hwmod am33xx_l3_s_hwmod;</div><div class='hunk'>@@ -80,6 +81,7 @@ extern struct omap_hwmod am33xx_gfx_hwmod;</div><div class='ctx'> extern struct omap_hwmod am33xx_prcm_hwmod;</div><div class='ctx'> extern struct omap_hwmod am33xx_aes0_hwmod;</div><div class='ctx'> extern struct omap_hwmod am33xx_sha0_hwmod;</div><div class='add'>+extern struct omap_hwmod am33xx_rng_hwmod;</div><div class='ctx'> extern struct omap_hwmod am33xx_ocmcram_hwmod;</div><div class='ctx'> extern struct omap_hwmod am33xx_smartreflex0_hwmod;</div><div class='ctx'> extern struct omap_hwmod am33xx_smartreflex1_hwmod;</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c<br/>index 10dff2f0086a..8236e5c49ec3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c</a></div><div class='hunk'>@@ -547,3 +547,11 @@ struct omap_hwmod_ocp_if am33xx_l3_main__aes0 = {</div><div class='ctx'> 	.addr		= am33xx_aes0_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* l4 per -&gt; rng */</div><div class='add'>+struct omap_hwmod_ocp_if am33xx_l4_per__rng = {</div><div class='add'>+	.master		= &amp;am33xx_l4_ls_hwmod,</div><div class='add'>+	.slave		= &amp;am33xx_rng_hwmod,</div><div class='add'>+	.clk		= "rng_fck",</div><div class='add'>+	.user		= OCP_USER_MPU,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c<br/>index e2d84aa7f595..de06a1d5ffab 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c</a></div><div class='hunk'>@@ -268,6 +268,33 @@ struct omap_hwmod am33xx_sha0_hwmod = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* rng */</div><div class='add'>+static struct omap_hwmod_class_sysconfig am33xx_rng_sysc = {</div><div class='add'>+	.rev_offs	= 0x1fe0,</div><div class='add'>+	.sysc_offs	= 0x1fe4,</div><div class='add'>+	.sysc_flags	= SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE,</div><div class='add'>+	.idlemodes	= SIDLE_FORCE | SIDLE_NO,</div><div class='add'>+	.sysc_fields	= &amp;omap_hwmod_sysc_type1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class am33xx_rng_hwmod_class = {</div><div class='add'>+	.name		= "rng",</div><div class='add'>+	.sysc		= &amp;am33xx_rng_sysc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct omap_hwmod am33xx_rng_hwmod = {</div><div class='add'>+	.name		= "rng",</div><div class='add'>+	.class		= &amp;am33xx_rng_hwmod_class,</div><div class='add'>+	.clkdm_name	= "l4ls_clkdm",</div><div class='add'>+	.flags		= HWMOD_SWSUP_SIDLE,</div><div class='add'>+	.main_clk	= "rng_fck",</div><div class='add'>+	.prcm		= {</div><div class='add'>+		.omap4	= {</div><div class='add'>+			.modulemode	= MODULEMODE_SWCTRL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* ocmcram */</div><div class='ctx'> static struct omap_hwmod_class am33xx_ocmcram_hwmod_class = {</div><div class='ctx'> 	.name = "ocmcram",</div><div class='hunk'>@@ -1315,6 +1342,7 @@ static void omap_hwmod_am33xx_clkctrl(void)</div><div class='ctx'> 	CLKCTRL(am33xx_ocmcram_hwmod , AM33XX_CM_PER_OCMCRAM_CLKCTRL_OFFSET);</div><div class='ctx'> 	CLKCTRL(am33xx_sha0_hwmod , AM33XX_CM_PER_SHA0_CLKCTRL_OFFSET);</div><div class='ctx'> 	CLKCTRL(am33xx_aes0_hwmod , AM33XX_CM_PER_AES0_CLKCTRL_OFFSET);</div><div class='add'>+	CLKCTRL(am33xx_rng_hwmod, AM33XX_CM_PER_RNG_CLKCTRL_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void omap_hwmod_am33xx_rst(void)</div><div class='hunk'>@@ -1388,6 +1416,7 @@ static void omap_hwmod_am43xx_clkctrl(void)</div><div class='ctx'> 	CLKCTRL(am33xx_ocmcram_hwmod , AM43XX_CM_PER_OCMCRAM_CLKCTRL_OFFSET);</div><div class='ctx'> 	CLKCTRL(am33xx_sha0_hwmod , AM43XX_CM_PER_SHA0_CLKCTRL_OFFSET);</div><div class='ctx'> 	CLKCTRL(am33xx_aes0_hwmod , AM43XX_CM_PER_AES0_CLKCTRL_OFFSET);</div><div class='add'>+	CLKCTRL(am33xx_rng_hwmod, AM43XX_CM_PER_RNG_CLKCTRL_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void omap_hwmod_am43xx_rst(void)</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c<br/>index e1c2025d6d3e..6dc51a774a26 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_33xx_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_33xx_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_33xx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_33xx_data.c</a></div><div class='hunk'>@@ -503,41 +503,6 @@ static struct omap_hwmod_ocp_if am33xx_l3_s__usbss = {</div><div class='ctx'> 	.flags		= OCPIF_SWSUP_IDLE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* rng */</div><div class='del'>-static struct omap_hwmod_class_sysconfig am33xx_rng_sysc = {</div><div class='del'>-	.rev_offs	= 0x1fe0,</div><div class='del'>-	.sysc_offs	= 0x1fe4,</div><div class='del'>-	.sysc_flags	= SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE,</div><div class='del'>-	.idlemodes	= SIDLE_FORCE | SIDLE_NO,</div><div class='del'>-	.sysc_fields	= &amp;omap_hwmod_sysc_type1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_hwmod_class am33xx_rng_hwmod_class = {</div><div class='del'>-	.name		= "rng",</div><div class='del'>-	.sysc		= &amp;am33xx_rng_sysc,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_hwmod am33xx_rng_hwmod = {</div><div class='del'>-	.name		= "rng",</div><div class='del'>-	.class		= &amp;am33xx_rng_hwmod_class,</div><div class='del'>-	.clkdm_name	= "l4ls_clkdm",</div><div class='del'>-	.flags		= HWMOD_SWSUP_SIDLE,</div><div class='del'>-	.main_clk	= "rng_fck",</div><div class='del'>-	.prcm		= {</div><div class='del'>-		.omap4	= {</div><div class='del'>-			.clkctrl_offs	= AM33XX_CM_PER_RNG_CLKCTRL_OFFSET,</div><div class='del'>-			.modulemode	= MODULEMODE_SWCTRL,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_hwmod_ocp_if am33xx_l4_per__rng = {</div><div class='del'>-	.master		= &amp;am33xx_l4_ls_hwmod,</div><div class='del'>-	.slave		= &amp;am33xx_rng_hwmod,</div><div class='del'>-	.clk		= "rng_fck",</div><div class='del'>-	.user		= OCP_USER_MPU,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;am33xx_l3_main__emif,</div><div class='ctx'> 	&amp;am33xx_mpu__l3_main,</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c<br/>index 1cc4a6f3954e..56f917ec8621 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_3xxx_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_3xxx_data.c</a></div><div class='hunk'>@@ -53,16 +53,10 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* L3 */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_l3_main_irqs[] = {</div><div class='del'>-	{ .irq = 9 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = 10 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_l3_main_hwmod = {</div><div class='ctx'> 	.name		= "l3_main",</div><div class='ctx'> 	.class		= &amp;l3_hwmod_class,</div><div class='del'>-	.mpu_irqs	= omap3xxx_l3_main_irqs,</div><div class='ctx'> 	.flags		= HWMOD_NO_IDLEST,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -95,14 +89,9 @@ static struct omap_hwmod omap3xxx_l4_sec_hwmod = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* MPU */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_mpu_irqs[] = {</div><div class='del'>-	{ .name = "pmu", .irq = 3 + OMAP_INTC_START },</div><div class='del'>-	{ .irq = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_mpu_hwmod = {</div><div class='ctx'> 	.name		= "mpu",</div><div class='del'>-	.mpu_irqs	= omap3xxx_mpu_irqs,</div><div class='ctx'> 	.class		= &amp;mpu_hwmod_class,</div><div class='ctx'> 	.main_clk	= "arm_fck",</div><div class='ctx'> };</div><div class='hunk'>@@ -128,7 +117,7 @@ static struct omap_hwmod omap3xxx_iva_hwmod = {</div><div class='ctx'> 			.module_bit = OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT,</div><div class='ctx'> 			.idlest_reg_id = 1,</div><div class='ctx'> 			.idlest_idle_bit = OMAP3430_ST_IVA2_SHIFT,</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -197,7 +186,6 @@ static struct omap_timer_capability_dev_attr capability_dsp_pwm_dev_attr = {</div><div class='ctx'> /* timer1 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_timer1_hwmod = {</div><div class='ctx'> 	.name		= "timer1",</div><div class='del'>-	.mpu_irqs	= omap2_timer1_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt1_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -216,7 +204,6 @@ static struct omap_hwmod omap3xxx_timer1_hwmod = {</div><div class='ctx'> /* timer2 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_timer2_hwmod = {</div><div class='ctx'> 	.name		= "timer2",</div><div class='del'>-	.mpu_irqs	= omap2_timer2_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt2_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -234,7 +221,6 @@ static struct omap_hwmod omap3xxx_timer2_hwmod = {</div><div class='ctx'> /* timer3 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_timer3_hwmod = {</div><div class='ctx'> 	.name		= "timer3",</div><div class='del'>-	.mpu_irqs	= omap2_timer3_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt3_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -252,7 +238,6 @@ static struct omap_hwmod omap3xxx_timer3_hwmod = {</div><div class='ctx'> /* timer4 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_timer4_hwmod = {</div><div class='ctx'> 	.name		= "timer4",</div><div class='del'>-	.mpu_irqs	= omap2_timer4_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt4_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -270,7 +255,6 @@ static struct omap_hwmod omap3xxx_timer4_hwmod = {</div><div class='ctx'> /* timer5 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_timer5_hwmod = {</div><div class='ctx'> 	.name		= "timer5",</div><div class='del'>-	.mpu_irqs	= omap2_timer5_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt5_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -289,7 +273,6 @@ static struct omap_hwmod omap3xxx_timer5_hwmod = {</div><div class='ctx'> /* timer6 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_timer6_hwmod = {</div><div class='ctx'> 	.name		= "timer6",</div><div class='del'>-	.mpu_irqs	= omap2_timer6_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt6_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -308,7 +291,6 @@ static struct omap_hwmod omap3xxx_timer6_hwmod = {</div><div class='ctx'> /* timer7 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_timer7_hwmod = {</div><div class='ctx'> 	.name		= "timer7",</div><div class='del'>-	.mpu_irqs	= omap2_timer7_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt7_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -327,7 +309,6 @@ static struct omap_hwmod omap3xxx_timer7_hwmod = {</div><div class='ctx'> /* timer8 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_timer8_hwmod = {</div><div class='ctx'> 	.name		= "timer8",</div><div class='del'>-	.mpu_irqs	= omap2_timer8_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt8_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -346,7 +327,6 @@ static struct omap_hwmod omap3xxx_timer8_hwmod = {</div><div class='ctx'> /* timer9 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_timer9_hwmod = {</div><div class='ctx'> 	.name		= "timer9",</div><div class='del'>-	.mpu_irqs	= omap2_timer9_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt9_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -365,7 +345,6 @@ static struct omap_hwmod omap3xxx_timer9_hwmod = {</div><div class='ctx'> /* timer10 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_timer10_hwmod = {</div><div class='ctx'> 	.name		= "timer10",</div><div class='del'>-	.mpu_irqs	= omap2_timer10_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt10_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -384,7 +363,6 @@ static struct omap_hwmod omap3xxx_timer10_hwmod = {</div><div class='ctx'> /* timer11 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_timer11_hwmod = {</div><div class='ctx'> 	.name		= "timer11",</div><div class='del'>-	.mpu_irqs	= omap2_timer11_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt11_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -401,14 +379,9 @@ static struct omap_hwmod omap3xxx_timer11_hwmod = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* timer12 */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_timer12_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 95 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_timer12_hwmod = {</div><div class='ctx'> 	.name		= "timer12",</div><div class='del'>-	.mpu_irqs	= omap3xxx_timer12_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "gpt12_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -485,8 +458,6 @@ static struct omap_hwmod omap3xxx_wd_timer2_hwmod = {</div><div class='ctx'> /* UART1 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_uart1_hwmod = {</div><div class='ctx'> 	.name		= "uart1",</div><div class='del'>-	.mpu_irqs	= omap2_uart1_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap2_uart1_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "uart1_fck",</div><div class='ctx'> 	.flags		= DEBUG_TI81XXUART1_FLAGS | HWMOD_SWSUP_SIDLE,</div><div class='ctx'> 	.prcm		= {</div><div class='hunk'>@@ -504,8 +475,6 @@ static struct omap_hwmod omap3xxx_uart1_hwmod = {</div><div class='ctx'> /* UART2 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_uart2_hwmod = {</div><div class='ctx'> 	.name		= "uart2",</div><div class='del'>-	.mpu_irqs	= omap2_uart2_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap2_uart2_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "uart2_fck",</div><div class='ctx'> 	.flags		= DEBUG_TI81XXUART2_FLAGS | HWMOD_SWSUP_SIDLE,</div><div class='ctx'> 	.prcm		= {</div><div class='hunk'>@@ -523,8 +492,6 @@ static struct omap_hwmod omap3xxx_uart2_hwmod = {</div><div class='ctx'> /* UART3 */</div><div class='ctx'> static struct omap_hwmod omap3xxx_uart3_hwmod = {</div><div class='ctx'> 	.name		= "uart3",</div><div class='del'>-	.mpu_irqs	= omap2_uart3_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap2_uart3_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "uart3_fck",</div><div class='ctx'> 	.flags		= DEBUG_OMAP3UART3_FLAGS | DEBUG_TI81XXUART3_FLAGS |</div><div class='ctx'> 				HWMOD_SWSUP_SIDLE,</div><div class='hunk'>@@ -541,21 +508,10 @@ static struct omap_hwmod omap3xxx_uart3_hwmod = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* UART4 */</div><div class='del'>-static struct omap_hwmod_irq_info uart4_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 80 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info uart4_sdma_reqs[] = {</div><div class='del'>-	{ .name = "rx",	.dma_req = 82, },</div><div class='del'>-	{ .name = "tx",	.dma_req = 81, },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap36xx_uart4_hwmod = {</div><div class='ctx'> 	.name		= "uart4",</div><div class='del'>-	.mpu_irqs	= uart4_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= uart4_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "uart4_fck",</div><div class='ctx'> 	.flags		= DEBUG_OMAP3UART4_FLAGS | HWMOD_SWSUP_SIDLE,</div><div class='ctx'> 	.prcm		= {</div><div class='hunk'>@@ -570,16 +526,7 @@ static struct omap_hwmod omap36xx_uart4_hwmod = {</div><div class='ctx'> 	.class		= &amp;omap2_uart_class,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info am35xx_uart4_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 84 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info am35xx_uart4_sdma_reqs[] = {</div><div class='del'>-	{ .name = "rx", .dma_req = 55, },</div><div class='del'>-	{ .name = "tx", .dma_req = 54, },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * XXX AM35xx UART4 cannot complete its softreset without uart1_fck or</div><div class='hunk'>@@ -597,8 +544,6 @@ static struct omap_hwmod_opt_clk am35xx_uart4_opt_clks[] = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod am35xx_uart4_hwmod = {</div><div class='ctx'> 	.name		= "uart4",</div><div class='del'>-	.mpu_irqs	= am35xx_uart4_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= am35xx_uart4_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "uart4_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -625,7 +570,7 @@ static struct omap_hwmod_class i2c_class = {</div><div class='ctx'> static struct omap_hwmod_dma_info omap3xxx_dss_sdma_chs[] = {</div><div class='ctx'> 	{ .name = "dispc", .dma_req = 5 },</div><div class='ctx'> 	{ .name = "dsi1", .dma_req = 74 },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='add'>+	{ .dma_req = -1, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* dss */</div><div class='hunk'>@@ -714,7 +659,7 @@ static struct omap_hwmod omap3xxx_dss_dispc_hwmod = {</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.flags		= HWMOD_NO_IDLEST,</div><div class='del'>-	.dev_attr	= &amp;omap2_3_dss_dispc_dev_attr</div><div class='add'>+	.dev_attr	= &amp;omap2_3_dss_dispc_dev_attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -738,11 +683,6 @@ static struct omap_hwmod_class omap3xxx_dsi_hwmod_class = {</div><div class='ctx'> 	.sysc	= &amp;omap3xxx_dsi_sysc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_dsi1_irqs[] = {</div><div class='del'>-	{ .irq = 25 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* dss_dsi1 */</div><div class='ctx'> static struct omap_hwmod_opt_clk dss_dsi1_opt_clks[] = {</div><div class='ctx'> 	{ .role = "sys_clk", .clk = "dss2_alwon_fck" },</div><div class='hunk'>@@ -751,7 +691,6 @@ static struct omap_hwmod_opt_clk dss_dsi1_opt_clks[] = {</div><div class='ctx'> static struct omap_hwmod omap3xxx_dss_dsi1_hwmod = {</div><div class='ctx'> 	.name		= "dss_dsi1",</div><div class='ctx'> 	.class		= &amp;omap3xxx_dsi_hwmod_class,</div><div class='del'>-	.mpu_irqs	= omap3xxx_dsi1_irqs,</div><div class='ctx'> 	.main_clk	= "dss1_alwon_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -815,8 +754,6 @@ static struct omap_i2c_dev_attr i2c1_dev_attr = {</div><div class='ctx'> static struct omap_hwmod omap3xxx_i2c1_hwmod = {</div><div class='ctx'> 	.name		= "i2c1",</div><div class='ctx'> 	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='del'>-	.mpu_irqs	= omap2_i2c1_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap2_i2c1_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "i2c1_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -840,8 +777,6 @@ static struct omap_i2c_dev_attr i2c2_dev_attr = {</div><div class='ctx'> static struct omap_hwmod omap3xxx_i2c2_hwmod = {</div><div class='ctx'> 	.name		= "i2c2",</div><div class='ctx'> 	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='del'>-	.mpu_irqs	= omap2_i2c2_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap2_i2c2_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "i2c2_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -862,22 +797,11 @@ static struct omap_i2c_dev_attr i2c3_dev_attr = {</div><div class='ctx'> 	.flags = OMAP_I2C_FLAG_BUS_SHIFT_2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info i2c3_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 61 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info i2c3_sdma_reqs[] = {</div><div class='del'>-	{ .name = "tx", .dma_req = 25 },</div><div class='del'>-	{ .name = "rx", .dma_req = 26 },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_i2c3_hwmod = {</div><div class='ctx'> 	.name		= "i2c3",</div><div class='ctx'> 	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='del'>-	.mpu_irqs	= i2c3_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= i2c3_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "i2c3_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -928,7 +852,6 @@ static struct omap_hwmod_opt_clk gpio1_opt_clks[] = {</div><div class='ctx'> static struct omap_hwmod omap3xxx_gpio1_hwmod = {</div><div class='ctx'> 	.name		= "gpio1",</div><div class='ctx'> 	.flags		= HWMOD_CONTROL_OPT_CLKS_IN_RESET,</div><div class='del'>-	.mpu_irqs	= omap2_gpio1_irqs,</div><div class='ctx'> 	.main_clk	= "gpio1_ick",</div><div class='ctx'> 	.opt_clks	= gpio1_opt_clks,</div><div class='ctx'> 	.opt_clks_cnt	= ARRAY_SIZE(gpio1_opt_clks),</div><div class='hunk'>@@ -953,7 +876,6 @@ static struct omap_hwmod_opt_clk gpio2_opt_clks[] = {</div><div class='ctx'> static struct omap_hwmod omap3xxx_gpio2_hwmod = {</div><div class='ctx'> 	.name		= "gpio2",</div><div class='ctx'> 	.flags		= HWMOD_CONTROL_OPT_CLKS_IN_RESET,</div><div class='del'>-	.mpu_irqs	= omap2_gpio2_irqs,</div><div class='ctx'> 	.main_clk	= "gpio2_ick",</div><div class='ctx'> 	.opt_clks	= gpio2_opt_clks,</div><div class='ctx'> 	.opt_clks_cnt	= ARRAY_SIZE(gpio2_opt_clks),</div><div class='hunk'>@@ -978,7 +900,6 @@ static struct omap_hwmod_opt_clk gpio3_opt_clks[] = {</div><div class='ctx'> static struct omap_hwmod omap3xxx_gpio3_hwmod = {</div><div class='ctx'> 	.name		= "gpio3",</div><div class='ctx'> 	.flags		= HWMOD_CONTROL_OPT_CLKS_IN_RESET,</div><div class='del'>-	.mpu_irqs	= omap2_gpio3_irqs,</div><div class='ctx'> 	.main_clk	= "gpio3_ick",</div><div class='ctx'> 	.opt_clks	= gpio3_opt_clks,</div><div class='ctx'> 	.opt_clks_cnt	= ARRAY_SIZE(gpio3_opt_clks),</div><div class='hunk'>@@ -1003,7 +924,6 @@ static struct omap_hwmod_opt_clk gpio4_opt_clks[] = {</div><div class='ctx'> static struct omap_hwmod omap3xxx_gpio4_hwmod = {</div><div class='ctx'> 	.name		= "gpio4",</div><div class='ctx'> 	.flags		= HWMOD_CONTROL_OPT_CLKS_IN_RESET,</div><div class='del'>-	.mpu_irqs	= omap2_gpio4_irqs,</div><div class='ctx'> 	.main_clk	= "gpio4_ick",</div><div class='ctx'> 	.opt_clks	= gpio4_opt_clks,</div><div class='ctx'> 	.opt_clks_cnt	= ARRAY_SIZE(gpio4_opt_clks),</div><div class='hunk'>@@ -1021,10 +941,6 @@ static struct omap_hwmod omap3xxx_gpio4_hwmod = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* gpio5 */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_gpio5_irqs[] = {</div><div class='del'>-	{ .irq = 33 + OMAP_INTC_START, }, /* INT_34XX_GPIO_BANK5 */</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_opt_clk gpio5_opt_clks[] = {</div><div class='ctx'> 	{ .role = "dbclk", .clk = "gpio5_dbck", },</div><div class='hunk'>@@ -1033,7 +949,6 @@ static struct omap_hwmod_opt_clk gpio5_opt_clks[] = {</div><div class='ctx'> static struct omap_hwmod omap3xxx_gpio5_hwmod = {</div><div class='ctx'> 	.name		= "gpio5",</div><div class='ctx'> 	.flags		= HWMOD_CONTROL_OPT_CLKS_IN_RESET,</div><div class='del'>-	.mpu_irqs	= omap3xxx_gpio5_irqs,</div><div class='ctx'> 	.main_clk	= "gpio5_ick",</div><div class='ctx'> 	.opt_clks	= gpio5_opt_clks,</div><div class='ctx'> 	.opt_clks_cnt	= ARRAY_SIZE(gpio5_opt_clks),</div><div class='hunk'>@@ -1051,10 +966,6 @@ static struct omap_hwmod omap3xxx_gpio5_hwmod = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* gpio6 */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_gpio6_irqs[] = {</div><div class='del'>-	{ .irq = 34 + OMAP_INTC_START, }, /* INT_34XX_GPIO_BANK6 */</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_opt_clk gpio6_opt_clks[] = {</div><div class='ctx'> 	{ .role = "dbclk", .clk = "gpio6_dbck", },</div><div class='hunk'>@@ -1063,7 +974,6 @@ static struct omap_hwmod_opt_clk gpio6_opt_clks[] = {</div><div class='ctx'> static struct omap_hwmod omap3xxx_gpio6_hwmod = {</div><div class='ctx'> 	.name		= "gpio6",</div><div class='ctx'> 	.flags		= HWMOD_CONTROL_OPT_CLKS_IN_RESET,</div><div class='del'>-	.mpu_irqs	= omap3xxx_gpio6_irqs,</div><div class='ctx'> 	.main_clk	= "gpio6_ick",</div><div class='ctx'> 	.opt_clks	= gpio6_opt_clks,</div><div class='ctx'> 	.opt_clks_cnt	= ARRAY_SIZE(gpio6_opt_clks),</div><div class='hunk'>@@ -1156,18 +1066,10 @@ static struct omap_hwmod_opt_clk mcbsp234_opt_clks[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* mcbsp1 */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_mcbsp1_irqs[] = {</div><div class='del'>-	{ .name = "common", .irq = 16 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "tx", .irq = 59 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "rx", .irq = 60 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_mcbsp1_hwmod = {</div><div class='ctx'> 	.name		= "mcbsp1",</div><div class='ctx'> 	.class		= &amp;omap3xxx_mcbsp_hwmod_class,</div><div class='del'>-	.mpu_irqs	= omap3xxx_mcbsp1_irqs,</div><div class='del'>-	.sdma_reqs	= omap2_mcbsp1_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "mcbsp1_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -1183,12 +1085,6 @@ static struct omap_hwmod omap3xxx_mcbsp1_hwmod = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* mcbsp2 */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_mcbsp2_irqs[] = {</div><div class='del'>-	{ .name = "common", .irq = 17 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "tx", .irq = 62 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "rx", .irq = 63 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_mcbsp_dev_attr omap34xx_mcbsp2_dev_attr = {</div><div class='ctx'> 	.sidetone	= "mcbsp2_sidetone",</div><div class='hunk'>@@ -1197,8 +1093,6 @@ static struct omap_mcbsp_dev_attr omap34xx_mcbsp2_dev_attr = {</div><div class='ctx'> static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {</div><div class='ctx'> 	.name		= "mcbsp2",</div><div class='ctx'> 	.class		= &amp;omap3xxx_mcbsp_hwmod_class,</div><div class='del'>-	.mpu_irqs	= omap3xxx_mcbsp2_irqs,</div><div class='del'>-	.sdma_reqs	= omap2_mcbsp2_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "mcbsp2_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -1215,12 +1109,6 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* mcbsp3 */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_mcbsp3_irqs[] = {</div><div class='del'>-	{ .name = "common", .irq = 22 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "tx", .irq = 89 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "rx", .irq = 90 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_mcbsp_dev_attr omap34xx_mcbsp3_dev_attr = {</div><div class='ctx'> 	.sidetone	= "mcbsp3_sidetone",</div><div class='hunk'>@@ -1229,8 +1117,6 @@ static struct omap_mcbsp_dev_attr omap34xx_mcbsp3_dev_attr = {</div><div class='ctx'> static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {</div><div class='ctx'> 	.name		= "mcbsp3",</div><div class='ctx'> 	.class		= &amp;omap3xxx_mcbsp_hwmod_class,</div><div class='del'>-	.mpu_irqs	= omap3xxx_mcbsp3_irqs,</div><div class='del'>-	.sdma_reqs	= omap2_mcbsp3_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "mcbsp3_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -1247,24 +1133,11 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* mcbsp4 */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_mcbsp4_irqs[] = {</div><div class='del'>-	{ .name = "common", .irq = 23 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "tx", .irq = 54 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "rx", .irq = 55 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info omap3xxx_mcbsp4_sdma_chs[] = {</div><div class='del'>-	{ .name = "rx", .dma_req = 20 },</div><div class='del'>-	{ .name = "tx", .dma_req = 19 },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_mcbsp4_hwmod = {</div><div class='ctx'> 	.name		= "mcbsp4",</div><div class='ctx'> 	.class		= &amp;omap3xxx_mcbsp_hwmod_class,</div><div class='del'>-	.mpu_irqs	= omap3xxx_mcbsp4_irqs,</div><div class='del'>-	.sdma_reqs	= omap3xxx_mcbsp4_sdma_chs,</div><div class='ctx'> 	.main_clk	= "mcbsp4_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -1280,24 +1153,11 @@ static struct omap_hwmod omap3xxx_mcbsp4_hwmod = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* mcbsp5 */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_mcbsp5_irqs[] = {</div><div class='del'>-	{ .name = "common", .irq = 27 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "tx", .irq = 81 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "rx", .irq = 82 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info omap3xxx_mcbsp5_sdma_chs[] = {</div><div class='del'>-	{ .name = "rx", .dma_req = 22 },</div><div class='del'>-	{ .name = "tx", .dma_req = 21 },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_mcbsp5_hwmod = {</div><div class='ctx'> 	.name		= "mcbsp5",</div><div class='ctx'> 	.class		= &amp;omap3xxx_mcbsp_hwmod_class,</div><div class='del'>-	.mpu_irqs	= omap3xxx_mcbsp5_irqs,</div><div class='del'>-	.sdma_reqs	= omap3xxx_mcbsp5_sdma_chs,</div><div class='ctx'> 	.main_clk	= "mcbsp5_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -1325,29 +1185,19 @@ static struct omap_hwmod_class omap3xxx_mcbsp_sidetone_hwmod_class = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* mcbsp2_sidetone */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_mcbsp2_sidetone_irqs[] = {</div><div class='del'>-	{ .name = "irq", .irq = 4 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_mcbsp2_sidetone_hwmod = {</div><div class='ctx'> 	.name		= "mcbsp2_sidetone",</div><div class='ctx'> 	.class		= &amp;omap3xxx_mcbsp_sidetone_hwmod_class,</div><div class='del'>-	.mpu_irqs	= omap3xxx_mcbsp2_sidetone_irqs,</div><div class='ctx'> 	.main_clk	= "mcbsp2_ick",</div><div class='ctx'> 	.flags		= HWMOD_NO_IDLEST,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* mcbsp3_sidetone */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_mcbsp3_sidetone_irqs[] = {</div><div class='del'>-	{ .name = "irq", .irq = 5 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_mcbsp3_sidetone_hwmod = {</div><div class='ctx'> 	.name		= "mcbsp3_sidetone",</div><div class='ctx'> 	.class		= &amp;omap3xxx_mcbsp_sidetone_hwmod_class,</div><div class='del'>-	.mpu_irqs	= omap3xxx_mcbsp3_sidetone_irqs,</div><div class='ctx'> 	.main_clk	= "mcbsp3_ick",</div><div class='ctx'> 	.flags		= HWMOD_NO_IDLEST,</div><div class='ctx'> };</div><div class='hunk'>@@ -1394,10 +1244,6 @@ static struct omap_smartreflex_dev_attr sr1_dev_attr = {</div><div class='ctx'> 	.sensor_voltdm_name   = "mpu_iva",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info omap3_smartreflex_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 18 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap34xx_sr1_hwmod = {</div><div class='ctx'> 	.name		= "smartreflex_mpu_iva",</div><div class='hunk'>@@ -1413,7 +1259,6 @@ static struct omap_hwmod omap34xx_sr1_hwmod = {</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.dev_attr	= &amp;sr1_dev_attr,</div><div class='del'>-	.mpu_irqs	= omap3_smartreflex_mpu_irqs,</div><div class='ctx'> 	.flags		= HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1431,7 +1276,6 @@ static struct omap_hwmod omap36xx_sr1_hwmod = {</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.dev_attr	= &amp;sr1_dev_attr,</div><div class='del'>-	.mpu_irqs	= omap3_smartreflex_mpu_irqs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SR2 */</div><div class='hunk'>@@ -1439,10 +1283,6 @@ static struct omap_smartreflex_dev_attr sr2_dev_attr = {</div><div class='ctx'> 	.sensor_voltdm_name	= "core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info omap3_smartreflex_core_irqs[] = {</div><div class='del'>-	{ .irq = 19 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap34xx_sr2_hwmod = {</div><div class='ctx'> 	.name		= "smartreflex_core",</div><div class='hunk'>@@ -1458,7 +1298,6 @@ static struct omap_hwmod omap34xx_sr2_hwmod = {</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.dev_attr	= &amp;sr2_dev_attr,</div><div class='del'>-	.mpu_irqs	= omap3_smartreflex_core_irqs,</div><div class='ctx'> 	.flags		= HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1476,7 +1315,6 @@ static struct omap_hwmod omap36xx_sr2_hwmod = {</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.dev_attr	= &amp;sr2_dev_attr,</div><div class='del'>-	.mpu_irqs	= omap3_smartreflex_core_irqs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1545,8 +1383,6 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap34xx_mcspi1 = {</div><div class='ctx'> 	.name		= "mcspi1",</div><div class='del'>-	.mpu_irqs	= omap2_mcspi1_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap2_mcspi1_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "mcspi1_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -1568,8 +1404,6 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap34xx_mcspi2 = {</div><div class='ctx'> 	.name		= "mcspi2",</div><div class='del'>-	.mpu_irqs	= omap2_mcspi2_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap2_mcspi2_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "mcspi2_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -1585,18 +1419,7 @@ static struct omap_hwmod omap34xx_mcspi2 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* mcspi3 */</div><div class='del'>-static struct omap_hwmod_irq_info omap34xx_mcspi3_mpu_irqs[] = {</div><div class='del'>-	{ .name = "irq", .irq = 91 + OMAP_INTC_START, }, /* 91 */</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info omap34xx_mcspi3_sdma_reqs[] = {</div><div class='del'>-	{ .name = "tx0", .dma_req = 15 },</div><div class='del'>-	{ .name = "rx0", .dma_req = 16 },</div><div class='del'>-	{ .name = "tx1", .dma_req = 23 },</div><div class='del'>-	{ .name = "rx1", .dma_req = 24 },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap2_mcspi_dev_attr omap_mcspi3_dev_attr = {</div><div class='ctx'> 	.num_chipselect = 2,</div><div class='hunk'>@@ -1604,8 +1427,6 @@ static struct omap2_mcspi_dev_attr omap_mcspi3_dev_attr = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap34xx_mcspi3 = {</div><div class='ctx'> 	.name		= "mcspi3",</div><div class='del'>-	.mpu_irqs	= omap34xx_mcspi3_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap34xx_mcspi3_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "mcspi3_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -1621,16 +1442,7 @@ static struct omap_hwmod omap34xx_mcspi3 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* mcspi4 */</div><div class='del'>-static struct omap_hwmod_irq_info omap34xx_mcspi4_mpu_irqs[] = {</div><div class='del'>-	{ .name = "irq", .irq = 48 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info omap34xx_mcspi4_sdma_reqs[] = {</div><div class='del'>-	{ .name = "tx0", .dma_req = 70 }, /* DMA_SPI4_TX0 */</div><div class='del'>-	{ .name = "rx0", .dma_req = 71 }, /* DMA_SPI4_RX0 */</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap2_mcspi_dev_attr omap_mcspi4_dev_attr = {</div><div class='ctx'> 	.num_chipselect = 1,</div><div class='hunk'>@@ -1638,8 +1450,6 @@ static struct omap2_mcspi_dev_attr omap_mcspi4_dev_attr = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap34xx_mcspi4 = {</div><div class='ctx'> 	.name		= "mcspi4",</div><div class='del'>-	.mpu_irqs	= omap34xx_mcspi4_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap34xx_mcspi4_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "mcspi4_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -1673,16 +1483,9 @@ static struct omap_hwmod_class usbotg_class = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* usb_otg_hs */</div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_usbhsotg_mpu_irqs[] = {</div><div class='del'>-</div><div class='del'>-	{ .name = "mc", .irq = 92 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "dma", .irq = 93 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_usbhsotg_hwmod = {</div><div class='ctx'> 	.name		= "usb_otg_hs",</div><div class='del'>-	.mpu_irqs	= omap3xxx_usbhsotg_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "hsotgusb_ick",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -1691,7 +1494,7 @@ static struct omap_hwmod omap3xxx_usbhsotg_hwmod = {</div><div class='ctx'> 			.module_offs = CORE_MOD,</div><div class='ctx'> 			.idlest_reg_id = 1,</div><div class='ctx'> 			.idlest_idle_bit = OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT,</div><div class='del'>-			.idlest_stdby_bit = OMAP3430ES2_ST_HSOTGUSB_STDBY_SHIFT</div><div class='add'>+			.idlest_stdby_bit = OMAP3430ES2_ST_HSOTGUSB_STDBY_SHIFT,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.class		= &amp;usbotg_class,</div><div class='hunk'>@@ -1711,10 +1514,6 @@ static struct omap_hwmod omap3xxx_usbhsotg_hwmod = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* usb_otg_hs */</div><div class='del'>-static struct omap_hwmod_irq_info am35xx_usbhsotg_mpu_irqs[] = {</div><div class='del'>-	{ .name = "mc", .irq = 71 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_class am35xx_usbotg_class = {</div><div class='ctx'> 	.name = "am35xx_usbotg",</div><div class='hunk'>@@ -1722,7 +1521,6 @@ static struct omap_hwmod_class am35xx_usbotg_class = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod am35xx_usbhsotg_hwmod = {</div><div class='ctx'> 	.name		= "am35x_otg_hs",</div><div class='del'>-	.mpu_irqs	= am35xx_usbhsotg_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "hsotgusb_fck",</div><div class='ctx'> 	.class		= &amp;am35xx_usbotg_class,</div><div class='ctx'> 	.flags		= HWMOD_NO_IDLEST,</div><div class='hunk'>@@ -1747,16 +1545,7 @@ static struct omap_hwmod_class omap34xx_mmc_class = {</div><div class='ctx'> </div><div class='ctx'> /* MMC/SD/SDIO1 */</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info omap34xx_mmc1_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 83 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info omap34xx_mmc1_sdma_reqs[] = {</div><div class='del'>-	{ .name = "tx",	.dma_req = 61, },</div><div class='del'>-	{ .name = "rx",	.dma_req = 62, },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_opt_clk omap34xx_mmc1_opt_clks[] = {</div><div class='ctx'> 	{ .role = "dbck", .clk = "omap_32k_fck", },</div><div class='hunk'>@@ -1774,8 +1563,6 @@ static struct omap_hsmmc_dev_attr mmc1_pre_es3_dev_attr = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_pre_es3_mmc1_hwmod = {</div><div class='ctx'> 	.name		= "mmc1",</div><div class='del'>-	.mpu_irqs	= omap34xx_mmc1_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap34xx_mmc1_sdma_reqs,</div><div class='ctx'> 	.opt_clks	= omap34xx_mmc1_opt_clks,</div><div class='ctx'> 	.opt_clks_cnt	= ARRAY_SIZE(omap34xx_mmc1_opt_clks),</div><div class='ctx'> 	.main_clk	= "mmchs1_fck",</div><div class='hunk'>@@ -1794,8 +1581,6 @@ static struct omap_hwmod omap3xxx_pre_es3_mmc1_hwmod = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_es3plus_mmc1_hwmod = {</div><div class='ctx'> 	.name		= "mmc1",</div><div class='del'>-	.mpu_irqs	= omap34xx_mmc1_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap34xx_mmc1_sdma_reqs,</div><div class='ctx'> 	.opt_clks	= omap34xx_mmc1_opt_clks,</div><div class='ctx'> 	.opt_clks_cnt	= ARRAY_SIZE(omap34xx_mmc1_opt_clks),</div><div class='ctx'> 	.main_clk	= "mmchs1_fck",</div><div class='hunk'>@@ -1814,16 +1599,7 @@ static struct omap_hwmod omap3xxx_es3plus_mmc1_hwmod = {</div><div class='ctx'> </div><div class='ctx'> /* MMC/SD/SDIO2 */</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info omap34xx_mmc2_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 86 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info omap34xx_mmc2_sdma_reqs[] = {</div><div class='del'>-	{ .name = "tx",	.dma_req = 47, },</div><div class='del'>-	{ .name = "rx",	.dma_req = 48, },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_opt_clk omap34xx_mmc2_opt_clks[] = {</div><div class='ctx'> 	{ .role = "dbck", .clk = "omap_32k_fck", },</div><div class='hunk'>@@ -1836,8 +1612,6 @@ static struct omap_hsmmc_dev_attr mmc2_pre_es3_dev_attr = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_pre_es3_mmc2_hwmod = {</div><div class='ctx'> 	.name		= "mmc2",</div><div class='del'>-	.mpu_irqs	= omap34xx_mmc2_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap34xx_mmc2_sdma_reqs,</div><div class='ctx'> 	.opt_clks	= omap34xx_mmc2_opt_clks,</div><div class='ctx'> 	.opt_clks_cnt	= ARRAY_SIZE(omap34xx_mmc2_opt_clks),</div><div class='ctx'> 	.main_clk	= "mmchs2_fck",</div><div class='hunk'>@@ -1856,8 +1630,6 @@ static struct omap_hwmod omap3xxx_pre_es3_mmc2_hwmod = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_es3plus_mmc2_hwmod = {</div><div class='ctx'> 	.name		= "mmc2",</div><div class='del'>-	.mpu_irqs	= omap34xx_mmc2_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap34xx_mmc2_sdma_reqs,</div><div class='ctx'> 	.opt_clks	= omap34xx_mmc2_opt_clks,</div><div class='ctx'> 	.opt_clks_cnt	= ARRAY_SIZE(omap34xx_mmc2_opt_clks),</div><div class='ctx'> 	.main_clk	= "mmchs2_fck",</div><div class='hunk'>@@ -1875,16 +1647,7 @@ static struct omap_hwmod omap3xxx_es3plus_mmc2_hwmod = {</div><div class='ctx'> </div><div class='ctx'> /* MMC/SD/SDIO3 */</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info omap34xx_mmc3_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 94 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info omap34xx_mmc3_sdma_reqs[] = {</div><div class='del'>-	{ .name = "tx",	.dma_req = 77, },</div><div class='del'>-	{ .name = "rx",	.dma_req = 78, },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_opt_clk omap34xx_mmc3_opt_clks[] = {</div><div class='ctx'> 	{ .role = "dbck", .clk = "omap_32k_fck", },</div><div class='hunk'>@@ -1892,8 +1655,6 @@ static struct omap_hwmod_opt_clk omap34xx_mmc3_opt_clks[] = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_mmc3_hwmod = {</div><div class='ctx'> 	.name		= "mmc3",</div><div class='del'>-	.mpu_irqs	= omap34xx_mmc3_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap34xx_mmc3_sdma_reqs,</div><div class='ctx'> 	.opt_clks	= omap34xx_mmc3_opt_clks,</div><div class='ctx'> 	.opt_clks_cnt	= ARRAY_SIZE(omap34xx_mmc3_opt_clks),</div><div class='ctx'> 	.main_clk	= "mmchs3_fck",</div><div class='hunk'>@@ -1931,17 +1692,11 @@ static struct omap_hwmod_class omap3xxx_usb_host_hs_hwmod_class = {</div><div class='ctx'> 	.sysc = &amp;omap3xxx_usb_host_hs_sysc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = {</div><div class='del'>-	{ .name = "ohci-irq", .irq = 76 + OMAP_INTC_START, },</div><div class='del'>-	{ .name = "ehci-irq", .irq = 77 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {</div><div class='ctx'> 	.name		= "usb_host_hs",</div><div class='ctx'> 	.class		= &amp;omap3xxx_usb_host_hs_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "usbhost_clkdm",</div><div class='del'>-	.mpu_irqs	= omap3xxx_usb_host_hs_irqs,</div><div class='ctx'> 	.main_clk	= "usbhost_48m_fck",</div><div class='ctx'> 	.prcm = {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -2015,16 +1770,11 @@ static struct omap_hwmod_class omap3xxx_usb_tll_hs_hwmod_class = {</div><div class='ctx'> 	.sysc = &amp;omap3xxx_usb_tll_hs_sysc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_usb_tll_hs_irqs[] = {</div><div class='del'>-	{ .name = "tll-irq", .irq = 78 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 },</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod = {</div><div class='ctx'> 	.name		= "usb_tll_hs",</div><div class='ctx'> 	.class		= &amp;omap3xxx_usb_tll_hs_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "core_l4_clkdm",</div><div class='del'>-	.mpu_irqs	= omap3xxx_usb_tll_hs_irqs,</div><div class='ctx'> 	.main_clk	= "usbtll_fck",</div><div class='ctx'> 	.prcm = {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -2039,7 +1789,6 @@ static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_hdq1w_hwmod = {</div><div class='ctx'> 	.name		= "hdq1w",</div><div class='del'>-	.mpu_irqs	= omap2_hdq1w_mpu_irqs,</div><div class='ctx'> 	.main_clk	= "hdq_fck",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -2134,16 +1883,10 @@ static struct omap_hwmod_class omap3xxx_gpmc_hwmod_class = {</div><div class='ctx'> 	.sysc	= &amp;omap3xxx_gpmc_sysc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = {</div><div class='del'>-	{ .irq = 20 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct omap_hwmod omap3xxx_gpmc_hwmod = {</div><div class='ctx'> 	.name		= "gpmc",</div><div class='ctx'> 	.class		= &amp;omap3xxx_gpmc_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "core_l3_clkdm",</div><div class='del'>-	.mpu_irqs	= omap3xxx_gpmc_irqs,</div><div class='ctx'> 	.main_clk	= "gpmc_fck",</div><div class='ctx'> 	/* Skip reset for CONFIG_OMAP_GPMC_DEBUG for bootloader timings */</div><div class='ctx'> 	.flags		= HWMOD_NO_IDLEST | DEBUG_OMAP_GPMC_HWMOD_FLAGS,</div><div class='hunk'>@@ -2167,37 +1910,19 @@ static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_per = {</div><div class='ctx'> 	.user	= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_l3_main_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x68000000,</div><div class='del'>-		.pa_end		= 0x6800ffff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* MPU -&gt; L3 interface */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_mpu__l3_main = {</div><div class='ctx'> 	.master   = &amp;omap3xxx_mpu_hwmod,</div><div class='ctx'> 	.slave    = &amp;omap3xxx_l3_main_hwmod,</div><div class='del'>-	.addr     = omap3xxx_l3_main_addrs,</div><div class='ctx'> 	.user	= OCP_USER_MPU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_l4_emu_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x54000000,</div><div class='del'>-		.pa_end		= 0x547fffff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l3 -&gt; debugss */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_debugss = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l3_main_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_debugss_hwmod,</div><div class='del'>-	.addr		= omap3xxx_l4_emu_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2215,7 +1940,7 @@ static struct omap_hwmod_ocp_if omap3xxx_dss__l3 = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l3_perm_bit  = OMAP3_L3_CORE_FW_INIT_ID_DSS,</div><div class='ctx'> 			.flags	= OMAP_FIREWALL_L3,</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='hunk'>@@ -2256,18 +1981,16 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__pre_es3_mmc1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_pre_es3_mmc1_hwmod,</div><div class='ctx'> 	.clk		= "mmchs1_ick",</div><div class='del'>-	.addr		= omap2430_mmc1_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='del'>-	.flags		= OMAP_FIREWALL_L4</div><div class='add'>+	.flags		= OMAP_FIREWALL_L4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_core__es3plus_mmc1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_es3plus_mmc1_hwmod,</div><div class='ctx'> 	.clk		= "mmchs1_ick",</div><div class='del'>-	.addr		= omap2430_mmc1_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='del'>-	.flags		= OMAP_FIREWALL_L4</div><div class='add'>+	.flags		= OMAP_FIREWALL_L4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* L4 CORE -&gt; MMC2 interface */</div><div class='hunk'>@@ -2275,126 +1998,70 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__pre_es3_mmc2 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_pre_es3_mmc2_hwmod,</div><div class='ctx'> 	.clk		= "mmchs2_ick",</div><div class='del'>-	.addr		= omap2430_mmc2_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='del'>-	.flags		= OMAP_FIREWALL_L4</div><div class='add'>+	.flags		= OMAP_FIREWALL_L4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_core__es3plus_mmc2 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_es3plus_mmc2_hwmod,</div><div class='ctx'> 	.clk		= "mmchs2_ick",</div><div class='del'>-	.addr		= omap2430_mmc2_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='del'>-	.flags		= OMAP_FIREWALL_L4</div><div class='add'>+	.flags		= OMAP_FIREWALL_L4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* L4 CORE -&gt; MMC3 interface */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_mmc3_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x480ad000,</div><div class='del'>-		.pa_end		= 0x480ad1ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmc3 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_mmc3_hwmod,</div><div class='ctx'> 	.clk		= "mmchs3_ick",</div><div class='del'>-	.addr		= omap3xxx_mmc3_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='del'>-	.flags		= OMAP_FIREWALL_L4</div><div class='add'>+	.flags		= OMAP_FIREWALL_L4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* L4 CORE -&gt; UART1 interface */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_uart1_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= OMAP3_UART1_BASE,</div><div class='del'>-		.pa_end		= OMAP3_UART1_BASE + SZ_8K - 1,</div><div class='del'>-		.flags		= ADDR_MAP_ON_INIT | ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3_l4_core__uart1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_uart1_hwmod,</div><div class='ctx'> 	.clk		= "uart1_ick",</div><div class='del'>-	.addr		= omap3xxx_uart1_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* L4 CORE -&gt; UART2 interface */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_uart2_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= OMAP3_UART2_BASE,</div><div class='del'>-		.pa_end		= OMAP3_UART2_BASE + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_MAP_ON_INIT | ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3_l4_core__uart2 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_uart2_hwmod,</div><div class='ctx'> 	.clk		= "uart2_ick",</div><div class='del'>-	.addr		= omap3xxx_uart2_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* L4 PER -&gt; UART3 interface */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_uart3_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= OMAP3_UART3_BASE,</div><div class='del'>-		.pa_end		= OMAP3_UART3_BASE + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_MAP_ON_INIT | ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3_l4_per__uart3 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_uart3_hwmod,</div><div class='ctx'> 	.clk		= "uart3_ick",</div><div class='del'>-	.addr		= omap3xxx_uart3_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* L4 PER -&gt; UART4 interface */</div><div class='del'>-static struct omap_hwmod_addr_space omap36xx_uart4_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= OMAP3_UART4_BASE,</div><div class='del'>-		.pa_end		= OMAP3_UART4_BASE + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_MAP_ON_INIT | ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap36xx_l4_per__uart4 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap36xx_uart4_hwmod,</div><div class='ctx'> 	.clk		= "uart4_ick",</div><div class='del'>-	.addr		= omap36xx_uart4_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* AM35xx: L4 CORE -&gt; UART4 interface */</div><div class='del'>-static struct omap_hwmod_addr_space am35xx_uart4_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= OMAP3_UART4_AM35XX_BASE,</div><div class='del'>-		.pa_end		= OMAP3_UART4_AM35XX_BASE + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_MAP_ON_INIT | ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if am35xx_l4_core__uart4 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;am35xx_uart4_hwmod,</div><div class='ctx'> 	.clk		= "uart4_ick",</div><div class='del'>-	.addr		= am35xx_uart4_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2403,13 +2070,12 @@ static struct omap_hwmod_ocp_if omap3_l4_core__i2c1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_i2c1_hwmod,</div><div class='ctx'> 	.clk		= "i2c1_ick",</div><div class='del'>-	.addr		= omap2_i2c1_addr_space,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP3_L4_CORE_FW_I2C1_REGION,</div><div class='ctx'> 			.l4_prot_group = 7,</div><div class='ctx'> 			.flags	= OMAP_FIREWALL_L4,</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='hunk'>@@ -2419,57 +2085,38 @@ static struct omap_hwmod_ocp_if omap3_l4_core__i2c2 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_i2c2_hwmod,</div><div class='ctx'> 	.clk		= "i2c2_ick",</div><div class='del'>-	.addr		= omap2_i2c2_addr_space,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP3_L4_CORE_FW_I2C2_REGION,</div><div class='ctx'> 			.l4_prot_group = 7,</div><div class='ctx'> 			.flags = OMAP_FIREWALL_L4,</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* L4 CORE -&gt; I2C3 interface */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_i2c3_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48060000,</div><div class='del'>-		.pa_end		= 0x48060000 + SZ_128 - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3_l4_core__i2c3 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_i2c3_hwmod,</div><div class='ctx'> 	.clk		= "i2c3_ick",</div><div class='del'>-	.addr		= omap3xxx_i2c3_addr_space,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP3_L4_CORE_FW_I2C3_REGION,</div><div class='ctx'> 			.l4_prot_group = 7,</div><div class='ctx'> 			.flags = OMAP_FIREWALL_L4,</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* L4 CORE -&gt; SR1 interface */</div><div class='del'>-static struct omap_hwmod_addr_space omap3_sr1_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= OMAP34XX_SR1_BASE,</div><div class='del'>-		.pa_end		= OMAP34XX_SR1_BASE + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap34xx_l4_core__sr1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap34xx_sr1_hwmod,</div><div class='ctx'> 	.clk		= "sr_l4_ick",</div><div class='del'>-	.addr		= omap3_sr1_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2477,25 +2124,15 @@ static struct omap_hwmod_ocp_if omap36xx_l4_core__sr1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap36xx_sr1_hwmod,</div><div class='ctx'> 	.clk		= "sr_l4_ick",</div><div class='del'>-	.addr		= omap3_sr1_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* L4 CORE -&gt; SR1 interface */</div><div class='del'>-static struct omap_hwmod_addr_space omap3_sr2_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= OMAP34XX_SR2_BASE,</div><div class='del'>-		.pa_end		= OMAP34XX_SR2_BASE + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap34xx_l4_core__sr2 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap34xx_sr2_hwmod,</div><div class='ctx'> 	.clk		= "sr_l4_ick",</div><div class='del'>-	.addr		= omap3_sr2_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2503,43 +2140,24 @@ static struct omap_hwmod_ocp_if omap36xx_l4_core__sr2 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap36xx_sr2_hwmod,</div><div class='ctx'> 	.clk		= "sr_l4_ick",</div><div class='del'>-	.addr		= omap3_sr2_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_usbhsotg_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= OMAP34XX_HSUSB_OTG_BASE,</div><div class='del'>-		.pa_end		= OMAP34XX_HSUSB_OTG_BASE + SZ_4K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_core -&gt; usbhsotg  */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_core__usbhsotg = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_usbhsotg_hwmod,</div><div class='ctx'> 	.clk		= "l4_ick",</div><div class='del'>-	.addr		= omap3xxx_usbhsotg_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space am35xx_usbhsotg_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= AM35XX_IPSS_USBOTGSS_BASE,</div><div class='del'>-		.pa_end		= AM35XX_IPSS_USBOTGSS_BASE + SZ_4K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_core -&gt; usbhsotg  */</div><div class='ctx'> static struct omap_hwmod_ocp_if am35xx_l4_core__usbhsotg = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;am35xx_usbhsotg_hwmod,</div><div class='ctx'> 	.clk		= "hsotgusb_ick",</div><div class='del'>-	.addr		= am35xx_usbhsotg_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2558,165 +2176,84 @@ static struct omap_hwmod_ocp_if omap3xxx_l3__iva = {</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_timer1_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48318000,</div><div class='del'>-		.pa_end		= 0x48318000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_wkup -&gt; timer1 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__timer1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_wkup_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer1_hwmod,</div><div class='ctx'> 	.clk		= "gpt1_ick",</div><div class='del'>-	.addr		= omap3xxx_timer1_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_timer2_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x49032000,</div><div class='del'>-		.pa_end		= 0x49032000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; timer2 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer2 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer2_hwmod,</div><div class='ctx'> 	.clk		= "gpt2_ick",</div><div class='del'>-	.addr		= omap3xxx_timer2_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_timer3_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x49034000,</div><div class='del'>-		.pa_end		= 0x49034000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; timer3 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer3 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer3_hwmod,</div><div class='ctx'> 	.clk		= "gpt3_ick",</div><div class='del'>-	.addr		= omap3xxx_timer3_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_timer4_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x49036000,</div><div class='del'>-		.pa_end		= 0x49036000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; timer4 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer4 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer4_hwmod,</div><div class='ctx'> 	.clk		= "gpt4_ick",</div><div class='del'>-	.addr		= omap3xxx_timer4_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_timer5_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x49038000,</div><div class='del'>-		.pa_end		= 0x49038000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; timer5 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer5 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer5_hwmod,</div><div class='ctx'> 	.clk		= "gpt5_ick",</div><div class='del'>-	.addr		= omap3xxx_timer5_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_timer6_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x4903A000,</div><div class='del'>-		.pa_end		= 0x4903A000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; timer6 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer6 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer6_hwmod,</div><div class='ctx'> 	.clk		= "gpt6_ick",</div><div class='del'>-	.addr		= omap3xxx_timer6_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_timer7_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x4903C000,</div><div class='del'>-		.pa_end		= 0x4903C000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; timer7 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer7 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer7_hwmod,</div><div class='ctx'> 	.clk		= "gpt7_ick",</div><div class='del'>-	.addr		= omap3xxx_timer7_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_timer8_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x4903E000,</div><div class='del'>-		.pa_end		= 0x4903E000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; timer8 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer8 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer8_hwmod,</div><div class='ctx'> 	.clk		= "gpt8_ick",</div><div class='del'>-	.addr		= omap3xxx_timer8_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_timer9_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x49040000,</div><div class='del'>-		.pa_end		= 0x49040000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; timer9 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__timer9 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer9_hwmod,</div><div class='ctx'> 	.clk		= "gpt9_ick",</div><div class='del'>-	.addr		= omap3xxx_timer9_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2725,7 +2262,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer10 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer10_hwmod,</div><div class='ctx'> 	.clk		= "gpt10_ick",</div><div class='del'>-	.addr		= omap2_timer10_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2734,43 +2270,24 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer11 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer11_hwmod,</div><div class='ctx'> 	.clk		= "gpt11_ick",</div><div class='del'>-	.addr		= omap2_timer11_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_timer12_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48304000,</div><div class='del'>-		.pa_end		= 0x48304000 + SZ_1K - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_core -&gt; timer12 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_sec__timer12 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_sec_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_timer12_hwmod,</div><div class='ctx'> 	.clk		= "gpt12_ick",</div><div class='del'>-	.addr		= omap3xxx_timer12_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* l4_wkup -&gt; wd_timer2 */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_wd_timer2_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48314000,</div><div class='del'>-		.pa_end		= 0x4831407f,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__wd_timer2 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_wkup_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_wd_timer2_hwmod,</div><div class='ctx'> 	.clk		= "wdt2_ick",</div><div class='del'>-	.addr		= omap3xxx_wd_timer2_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2779,13 +2296,12 @@ static struct omap_hwmod_ocp_if omap3430es1_l4_core__dss = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3430es1_dss_core_hwmod,</div><div class='ctx'> 	.clk		= "dss_ick",</div><div class='del'>-	.addr		= omap2_dss_addrs,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP3ES1_L4_CORE_FW_DSS_CORE_REGION,</div><div class='ctx'> 			.l4_prot_group = OMAP3_L4_CORE_FW_DSS_PROT_GROUP,</div><div class='ctx'> 			.flags	= OMAP_FIREWALL_L4,</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='hunk'>@@ -2794,13 +2310,12 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_dss_core_hwmod,</div><div class='ctx'> 	.clk		= "dss_ick",</div><div class='del'>-	.addr		= omap2_dss_addrs,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP3_L4_CORE_FW_DSS_CORE_REGION,</div><div class='ctx'> 			.l4_prot_group = OMAP3_L4_CORE_FW_DSS_PROT_GROUP,</div><div class='ctx'> 			.flags	= OMAP_FIREWALL_L4,</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='hunk'>@@ -2810,38 +2325,27 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_dispc = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_dss_dispc_hwmod,</div><div class='ctx'> 	.clk		= "dss_ick",</div><div class='del'>-	.addr		= omap2_dss_dispc_addrs,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP3_L4_CORE_FW_DSS_DISPC_REGION,</div><div class='ctx'> 			.l4_prot_group = OMAP3_L4_CORE_FW_DSS_PROT_GROUP,</div><div class='ctx'> 			.flags	= OMAP_FIREWALL_L4,</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_dss_dsi1_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x4804FC00,</div><div class='del'>-		.pa_end		= 0x4804FFFF,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* l4_core -&gt; dss_dsi1 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_dsi1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_dss_dsi1_hwmod,</div><div class='ctx'> 	.clk		= "dss_ick",</div><div class='del'>-	.addr		= omap3xxx_dss_dsi1_addrs,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP3_L4_CORE_FW_DSS_DSI_REGION,</div><div class='ctx'> 			.l4_prot_group = OMAP3_L4_CORE_FW_DSS_PROT_GROUP,</div><div class='ctx'> 			.flags	= OMAP_FIREWALL_L4,</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='hunk'>@@ -2851,13 +2355,12 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_rfbi = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_dss_rfbi_hwmod,</div><div class='ctx'> 	.clk		= "dss_ick",</div><div class='del'>-	.addr		= omap2_dss_rfbi_addrs,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP3_L4_CORE_FW_DSS_RFBI_REGION,</div><div class='ctx'> 			.l4_prot_group = OMAP3_L4_CORE_FW_DSS_PROT_GROUP ,</div><div class='ctx'> 			.flags	= OMAP_FIREWALL_L4,</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='hunk'>@@ -2867,66 +2370,38 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_venc = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_dss_venc_hwmod,</div><div class='ctx'> 	.clk		= "dss_ick",</div><div class='del'>-	.addr		= omap2_dss_venc_addrs,</div><div class='ctx'> 	.fw = {</div><div class='ctx'> 		.omap2 = {</div><div class='ctx'> 			.l4_fw_region  = OMAP3_L4_CORE_FW_DSS_VENC_REGION,</div><div class='ctx'> 			.l4_prot_group = OMAP3_L4_CORE_FW_DSS_PROT_GROUP,</div><div class='ctx'> 			.flags	= OMAP_FIREWALL_L4,</div><div class='del'>-		}</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.flags		= OCPIF_SWSUP_IDLE,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* l4_wkup -&gt; gpio1 */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_gpio1_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48310000,</div><div class='del'>-		.pa_end		= 0x483101ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__gpio1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_wkup_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_gpio1_hwmod,</div><div class='del'>-	.addr		= omap3xxx_gpio1_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; gpio2 */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_gpio2_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x49050000,</div><div class='del'>-		.pa_end		= 0x490501ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio2 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_gpio2_hwmod,</div><div class='del'>-	.addr		= omap3xxx_gpio2_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; gpio3 */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_gpio3_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x49052000,</div><div class='del'>-		.pa_end		= 0x490521ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio3 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_gpio3_hwmod,</div><div class='del'>-	.addr		= omap3xxx_gpio3_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3002,53 +2477,26 @@ static struct omap_hwmod omap3xxx_mmu_iva_hwmod = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; gpio4 */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_gpio4_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x49054000,</div><div class='del'>-		.pa_end		= 0x490541ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio4 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_gpio4_hwmod,</div><div class='del'>-	.addr		= omap3xxx_gpio4_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; gpio5 */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_gpio5_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x49056000,</div><div class='del'>-		.pa_end		= 0x490561ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio5 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_gpio5_hwmod,</div><div class='del'>-	.addr		= omap3xxx_gpio5_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; gpio6 */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_gpio6_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x49058000,</div><div class='del'>-		.pa_end		= 0x490581ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__gpio6 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_gpio6_hwmod,</div><div class='del'>-	.addr		= omap3xxx_gpio6_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3064,9 +2512,9 @@ static struct omap_hwmod_addr_space omap3xxx_dma_system_addrs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.pa_start	= 0x48056000,</div><div class='ctx'> 		.pa_end		= 0x48056fff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='add'>+		.flags		= ADDR_TYPE_RT,</div><div class='ctx'> 	},</div><div class='del'>-	{ }</div><div class='add'>+	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* l4_cfg -&gt; dma_system */</div><div class='hunk'>@@ -3078,136 +2526,66 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dma_system = {</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_mcbsp1_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "mpu",</div><div class='del'>-		.pa_start	= 0x48074000,</div><div class='del'>-		.pa_end		= 0x480740ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_core -&gt; mcbsp1 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_core__mcbsp1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_mcbsp1_hwmod,</div><div class='ctx'> 	.clk		= "mcbsp1_ick",</div><div class='del'>-	.addr		= omap3xxx_mcbsp1_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_mcbsp2_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "mpu",</div><div class='del'>-		.pa_start	= 0x49022000,</div><div class='del'>-		.pa_end		= 0x490220ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; mcbsp2 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp2 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_mcbsp2_hwmod,</div><div class='ctx'> 	.clk		= "mcbsp2_ick",</div><div class='del'>-	.addr		= omap3xxx_mcbsp2_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_mcbsp3_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "mpu",</div><div class='del'>-		.pa_start	= 0x49024000,</div><div class='del'>-		.pa_end		= 0x490240ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; mcbsp3 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp3 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_mcbsp3_hwmod,</div><div class='ctx'> 	.clk		= "mcbsp3_ick",</div><div class='del'>-	.addr		= omap3xxx_mcbsp3_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_mcbsp4_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "mpu",</div><div class='del'>-		.pa_start	= 0x49026000,</div><div class='del'>-		.pa_end		= 0x490260ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; mcbsp4 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp4 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_mcbsp4_hwmod,</div><div class='ctx'> 	.clk		= "mcbsp4_ick",</div><div class='del'>-	.addr		= omap3xxx_mcbsp4_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_mcbsp5_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "mpu",</div><div class='del'>-		.pa_start	= 0x48096000,</div><div class='del'>-		.pa_end		= 0x480960ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_core -&gt; mcbsp5 */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_core__mcbsp5 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_mcbsp5_hwmod,</div><div class='ctx'> 	.clk		= "mcbsp5_ick",</div><div class='del'>-	.addr		= omap3xxx_mcbsp5_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_mcbsp2_sidetone_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "sidetone",</div><div class='del'>-		.pa_start	= 0x49028000,</div><div class='del'>-		.pa_end		= 0x490280ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; mcbsp2_sidetone */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp2_sidetone = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_mcbsp2_sidetone_hwmod,</div><div class='ctx'> 	.clk		= "mcbsp2_ick",</div><div class='del'>-	.addr		= omap3xxx_mcbsp2_sidetone_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_mcbsp3_sidetone_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "sidetone",</div><div class='del'>-		.pa_start	= 0x4902A000,</div><div class='del'>-		.pa_end		= 0x4902A0ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> /* l4_per -&gt; mcbsp3_sidetone */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp3_sidetone = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_mcbsp3_sidetone_hwmod,</div><div class='ctx'> 	.clk		= "mcbsp3_ick",</div><div class='del'>-	.addr		= omap3xxx_mcbsp3_sidetone_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3223,7 +2601,6 @@ static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap34xx_mcspi1,</div><div class='ctx'> 	.clk		= "mcspi1_ick",</div><div class='del'>-	.addr		= omap2_mcspi1_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3232,7 +2609,6 @@ static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi2 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap34xx_mcspi2,</div><div class='ctx'> 	.clk		= "mcspi2_ick",</div><div class='del'>-	.addr		= omap2_mcspi2_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3241,25 +2617,15 @@ static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi3 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap34xx_mcspi3,</div><div class='ctx'> 	.clk		= "mcspi3_ick",</div><div class='del'>-	.addr		= omap2430_mcspi3_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* l4 core -&gt; mcspi4 interface */</div><div class='del'>-static struct omap_hwmod_addr_space omap34xx_mcspi4_addr_space[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x480ba000,</div><div class='del'>-		.pa_end		= 0x480ba0ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap34xx_l4_core__mcspi4 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap34xx_mcspi4,</div><div class='ctx'> 	.clk		= "mcspi4_ick",</div><div class='del'>-	.addr		= omap34xx_mcspi4_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3270,49 +2636,19 @@ static struct omap_hwmod_ocp_if omap3xxx_usb_host_hs__l3_main_2 = {</div><div class='ctx'> 	.user		= OCP_USER_MPU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_usb_host_hs_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "uhh",</div><div class='del'>-		.pa_start	= 0x48064000,</div><div class='del'>-		.pa_end		= 0x480643ff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name		= "ohci",</div><div class='del'>-		.pa_start	= 0x48064400,</div><div class='del'>-		.pa_end		= 0x480647ff,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name		= "ehci",</div><div class='del'>-		.pa_start	= 0x48064800,</div><div class='del'>-		.pa_end		= 0x48064cff,</div><div class='del'>-	},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_core__usb_host_hs = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_usb_host_hs_hwmod,</div><div class='ctx'> 	.clk		= "usbhost_ick",</div><div class='del'>-	.addr		= omap3xxx_usb_host_hs_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_usb_tll_hs_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "tll",</div><div class='del'>-		.pa_start	= 0x48062000,</div><div class='del'>-		.pa_end		= 0x48062fff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_core__usb_tll_hs = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_usb_tll_hs_hwmod,</div><div class='ctx'> 	.clk		= "usbtll_ick",</div><div class='del'>-	.addr		= omap3xxx_usb_tll_hs_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3321,35 +2657,17 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__hdq1w = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_hdq1w_hwmod,</div><div class='ctx'> 	.clk		= "hdq_ick",</div><div class='del'>-	.addr		= omap2_hdq1w_addr_space,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> 	.flags		= OMAP_FIREWALL_L4 | OCPIF_SWSUP_IDLE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* l4_wkup -&gt; 32ksync_counter */</div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_counter_32k_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x48320000,</div><div class='del'>-		.pa_end		= 0x4832001f,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_gpmc_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x6e000000,</div><div class='del'>-		.pa_end		= 0x6e000fff,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__counter_32k = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_wkup_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_counter_32k_hwmod,</div><div class='ctx'> 	.clk		= "omap_32ksync_ick",</div><div class='del'>-	.addr		= omap3xxx_counter_32k_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3434,7 +2752,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l3_main__gpmc = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l3_main_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_gpmc_hwmod,</div><div class='ctx'> 	.clk		= "core_l3_ick",</div><div class='del'>-	.addr		= omap3xxx_gpmc_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3459,20 +2776,10 @@ static struct omap_hwmod_class omap3xxx_sham_class = {</div><div class='ctx'> 	.sysc	= &amp;omap3_sham_sysc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_irq_info omap3_sham_mpu_irqs[] = {</div><div class='del'>-	{ .irq = 49 + OMAP_INTC_START, },</div><div class='del'>-	{ .irq = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info omap3_sham_sdma_reqs[] = {</div><div class='del'>-	{ .name = "rx", .dma_req = 69, },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_sham_hwmod = {</div><div class='ctx'> 	.name		= "sham",</div><div class='del'>-	.mpu_irqs	= omap3_sham_mpu_irqs,</div><div class='del'>-	.sdma_reqs	= omap3_sham_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "sha12_ick",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -3486,20 +2793,11 @@ static struct omap_hwmod omap3xxx_sham_hwmod = {</div><div class='ctx'> 	.class		= &amp;omap3xxx_sham_class,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_sham_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x480c3000,</div><div class='del'>-		.pa_end		= 0x480c3000 + 0x64 - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_core__sham = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_sham_hwmod,</div><div class='ctx'> 	.clk		= "sha12_ick",</div><div class='del'>-	.addr		= omap3xxx_sham_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3525,15 +2823,9 @@ static struct omap_hwmod_class omap3xxx_aes_class = {</div><div class='ctx'> 	.sysc	= &amp;omap3_aes_sysc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_dma_info omap3_aes_sdma_reqs[] = {</div><div class='del'>-	{ .name = "tx", .dma_req = 65, },</div><div class='del'>-	{ .name = "rx", .dma_req = 66, },</div><div class='del'>-	{ .dma_req = -1 }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_aes_hwmod = {</div><div class='ctx'> 	.name		= "aes",</div><div class='del'>-	.sdma_reqs	= omap3_aes_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "aes2_ick",</div><div class='ctx'> 	.prcm		= {</div><div class='ctx'> 		.omap2 = {</div><div class='hunk'>@@ -3547,20 +2839,11 @@ static struct omap_hwmod omap3xxx_aes_hwmod = {</div><div class='ctx'> 	.class		= &amp;omap3xxx_aes_class,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod_addr_space omap3xxx_aes_addrs[] = {</div><div class='del'>-	{</div><div class='del'>-		.pa_start	= 0x480c5000,</div><div class='del'>-		.pa_end		= 0x480c5000 + 0x50 - 1,</div><div class='del'>-		.flags		= ADDR_TYPE_RT</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l4_core__aes = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	.slave		= &amp;omap3xxx_aes_hwmod,</div><div class='ctx'> 	.clk		= "aes2_ick",</div><div class='del'>-	.addr		= omap3xxx_aes_addrs,</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3661,28 +2944,28 @@ static struct omap_hwmod_ocp_if *omap3xxx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> /* GP-only hwmod links */</div><div class='ctx'> static struct omap_hwmod_ocp_if *omap34xx_gp_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3xxx_l4_sec__timer12,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if *omap36xx_gp_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3xxx_l4_sec__timer12,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if *am35xx_gp_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3xxx_l4_sec__timer12,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* crypto hwmod links */</div><div class='ctx'> static struct omap_hwmod_ocp_if *omap34xx_sham_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3xxx_l4_core__sham,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if *omap34xx_aes_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3xxx_l4_core__aes,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if *omap36xx_sham_hwmod_ocp_ifs[] __initdata = {</div><div class='hunk'>@@ -3710,14 +2993,14 @@ static struct omap_hwmod_ocp_if *am35xx_sham_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if *am35xx_aes_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	/* &amp;omap3xxx_l4_core__aes, */</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 3430ES1-only hwmod links */</div><div class='ctx'> static struct omap_hwmod_ocp_if *omap3430es1_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3430es1_dss__l3,</div><div class='ctx'> 	&amp;omap3430es1_l4_core__dss,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 3430ES2+-only hwmod links */</div><div class='hunk'>@@ -3729,21 +3012,21 @@ static struct omap_hwmod_ocp_if *omap3430es2plus_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3xxx_usb_host_hs__l3_main_2,</div><div class='ctx'> 	&amp;omap3xxx_l4_core__usb_host_hs,</div><div class='ctx'> 	&amp;omap3xxx_l4_core__usb_tll_hs,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* &lt;= 3430ES3-only hwmod links */</div><div class='ctx'> static struct omap_hwmod_ocp_if *omap3430_pre_es3_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3xxx_l4_core__pre_es3_mmc1,</div><div class='ctx'> 	&amp;omap3xxx_l4_core__pre_es3_mmc2,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 3430ES3+-only hwmod links */</div><div class='ctx'> static struct omap_hwmod_ocp_if *omap3430_es3plus_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3xxx_l4_core__es3plus_mmc1,</div><div class='ctx'> 	&amp;omap3xxx_l4_core__es3plus_mmc2,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 34xx-only hwmod links (all ES revisions) */</div><div class='hunk'>@@ -3757,7 +3040,7 @@ static struct omap_hwmod_ocp_if *omap34xx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3xxx_l4_core__mmu_isp,</div><div class='ctx'> 	&amp;omap3xxx_l3_main__mmu_iva,</div><div class='ctx'> 	&amp;omap3xxx_l4_core__ssi,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 36xx-only hwmod links (all ES revisions) */</div><div class='hunk'>@@ -3781,7 +3064,7 @@ static struct omap_hwmod_ocp_if *omap36xx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3xxx_l4_core__mmu_isp,</div><div class='ctx'> 	&amp;omap3xxx_l3_main__mmu_iva,</div><div class='ctx'> 	&amp;omap3xxx_l4_core__ssi,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if *am35xx_hwmod_ocp_ifs[] __initdata = {</div><div class='hunk'>@@ -3800,7 +3083,7 @@ static struct omap_hwmod_ocp_if *am35xx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;am35xx_l4_core__mdio,</div><div class='ctx'> 	&amp;am35xx_emac__l3,</div><div class='ctx'> 	&amp;am35xx_l4_core__emac,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod_ocp_if *omap3xxx_dss_hwmod_ocp_ifs[] __initdata = {</div><div class='hunk'>@@ -3808,7 +3091,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_dss_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;omap3xxx_l4_core__dss_dsi1,</div><div class='ctx'> 	&amp;omap3xxx_l4_core__dss_rfbi,</div><div class='ctx'> 	&amp;omap3xxx_l4_core__dss_venc,</div><div class='del'>-	NULL</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c<br/>index 61f2f301d739..afbce1f6f641 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_43xx_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_43xx_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_43xx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_43xx_data.c</a></div><div class='hunk'>@@ -442,6 +442,31 @@ static struct omap_hwmod am43xx_adc_tsc_hwmod = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct omap_hwmod_class_sysconfig am43xx_des_sysc = {</div><div class='add'>+	.rev_offs	= 0x30,</div><div class='add'>+	.sysc_offs	= 0x34,</div><div class='add'>+	.syss_offs	= 0x38,</div><div class='add'>+	.sysc_flags	= SYSS_HAS_RESET_STATUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class am43xx_des_hwmod_class = {</div><div class='add'>+	.name		= "des",</div><div class='add'>+	.sysc		= &amp;am43xx_des_sysc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod am43xx_des_hwmod = {</div><div class='add'>+	.name		= "des",</div><div class='add'>+	.class		= &amp;am43xx_des_hwmod_class,</div><div class='add'>+	.clkdm_name	= "l3_clkdm",</div><div class='add'>+	.main_clk	= "l3_gclk",</div><div class='add'>+	.prcm		= {</div><div class='add'>+		.omap4	= {</div><div class='add'>+			.clkctrl_offs	= AM43XX_CM_PER_DES_CLKCTRL_OFFSET,</div><div class='add'>+			.modulemode	= MODULEMODE_SWCTRL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* dss */</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod am43xx_dss_core_hwmod = {</div><div class='hunk'>@@ -870,6 +895,13 @@ static struct omap_hwmod_ocp_if am43xx_l4_ls__vpfe1 = {</div><div class='ctx'> 	.user           = OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct omap_hwmod_ocp_if am43xx_l3_main__des = {</div><div class='add'>+	.master		= &amp;am33xx_l3_main_hwmod,</div><div class='add'>+	.slave		= &amp;am43xx_des_hwmod,</div><div class='add'>+	.clk		= "l3_gclk",</div><div class='add'>+	.user		= OCP_USER_MPU,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;am33xx_l4_wkup__synctimer,</div><div class='ctx'> 	&amp;am43xx_l4_ls__timer8,</div><div class='hunk'>@@ -917,6 +949,7 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;am33xx_l4_per__i2c2,</div><div class='ctx'> 	&amp;am33xx_l4_per__i2c3,</div><div class='ctx'> 	&amp;am33xx_l4_per__mailbox,</div><div class='add'>+	&amp;am33xx_l4_per__rng,</div><div class='ctx'> 	&amp;am33xx_l4_ls__mcasp0,</div><div class='ctx'> 	&amp;am33xx_l4_ls__mcasp1,</div><div class='ctx'> 	&amp;am33xx_l4_ls__mmc0,</div><div class='hunk'>@@ -950,6 +983,7 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;am33xx_cpgmac0__mdio,</div><div class='ctx'> 	&amp;am33xx_l3_main__sha0,</div><div class='ctx'> 	&amp;am33xx_l3_main__aes0,</div><div class='add'>+	&amp;am43xx_l3_main__des,</div><div class='ctx'> 	&amp;am43xx_l4_ls__ocp2scp0,</div><div class='ctx'> 	&amp;am43xx_l4_ls__ocp2scp1,</div><div class='ctx'> 	&amp;am43xx_l3_s__usbotgss0,</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c<br/>index 8cdfd9b7ab4f..a2d763a4cc57 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_54xx_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_54xx_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_54xx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_54xx_data.c</a></div><div class='hunk'>@@ -1748,6 +1748,7 @@ static struct omap_hwmod omap54xx_uart1_hwmod = {</div><div class='ctx'> 	.name		= "uart1",</div><div class='ctx'> 	.class		= &amp;omap54xx_uart_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "l4per_clkdm",</div><div class='add'>+	.flags		= HWMOD_SWSUP_SIDLE_ACT,</div><div class='ctx'> 	.main_clk	= "func_48m_fclk",</div><div class='ctx'> 	.prcm = {</div><div class='ctx'> 		.omap4 = {</div><div class='hunk'>@@ -1763,6 +1764,7 @@ static struct omap_hwmod omap54xx_uart2_hwmod = {</div><div class='ctx'> 	.name		= "uart2",</div><div class='ctx'> 	.class		= &amp;omap54xx_uart_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "l4per_clkdm",</div><div class='add'>+	.flags		= HWMOD_SWSUP_SIDLE_ACT,</div><div class='ctx'> 	.main_clk	= "func_48m_fclk",</div><div class='ctx'> 	.prcm = {</div><div class='ctx'> 		.omap4 = {</div><div class='hunk'>@@ -1778,7 +1780,7 @@ static struct omap_hwmod omap54xx_uart3_hwmod = {</div><div class='ctx'> 	.name		= "uart3",</div><div class='ctx'> 	.class		= &amp;omap54xx_uart_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "l4per_clkdm",</div><div class='del'>-	.flags		= DEBUG_OMAP4UART3_FLAGS,</div><div class='add'>+	.flags		= DEBUG_OMAP4UART3_FLAGS | HWMOD_SWSUP_SIDLE_ACT,</div><div class='ctx'> 	.main_clk	= "func_48m_fclk",</div><div class='ctx'> 	.prcm = {</div><div class='ctx'> 		.omap4 = {</div><div class='hunk'>@@ -1794,7 +1796,7 @@ static struct omap_hwmod omap54xx_uart4_hwmod = {</div><div class='ctx'> 	.name		= "uart4",</div><div class='ctx'> 	.class		= &amp;omap54xx_uart_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "l4per_clkdm",</div><div class='del'>-	.flags		= DEBUG_OMAP4UART4_FLAGS,</div><div class='add'>+	.flags		= DEBUG_OMAP4UART4_FLAGS | HWMOD_SWSUP_SIDLE_ACT,</div><div class='ctx'> 	.main_clk	= "func_48m_fclk",</div><div class='ctx'> 	.prcm = {</div><div class='ctx'> 		.omap4 = {</div><div class='hunk'>@@ -1810,6 +1812,7 @@ static struct omap_hwmod omap54xx_uart5_hwmod = {</div><div class='ctx'> 	.name		= "uart5",</div><div class='ctx'> 	.class		= &amp;omap54xx_uart_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "l4per_clkdm",</div><div class='add'>+	.flags		= HWMOD_SWSUP_SIDLE_ACT,</div><div class='ctx'> 	.main_clk	= "func_48m_fclk",</div><div class='ctx'> 	.prcm = {</div><div class='ctx'> 		.omap4 = {</div><div class='hunk'>@@ -1825,6 +1828,7 @@ static struct omap_hwmod omap54xx_uart6_hwmod = {</div><div class='ctx'> 	.name		= "uart6",</div><div class='ctx'> 	.class		= &amp;omap54xx_uart_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "l4per_clkdm",</div><div class='add'>+	.flags		= HWMOD_SWSUP_SIDLE_ACT,</div><div class='ctx'> 	.main_clk	= "func_48m_fclk",</div><div class='ctx'> 	.prcm = {</div><div class='ctx'> 		.omap4 = {</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c<br/>index 1ab7096af8e2..d0585293a381 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_7xx_data.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_7xx_data.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_7xx_data.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_7xx_data.c</a></div><div class='hunk'>@@ -690,6 +690,78 @@ static struct omap_hwmod dra7xx_dss_hdmi_hwmod = {</div><div class='ctx'> 	.parent_hwmod	= &amp;dra7xx_dss_hwmod,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* AES (the 'P' (public) device) */</div><div class='add'>+static struct omap_hwmod_class_sysconfig dra7xx_aes_sysc = {</div><div class='add'>+	.rev_offs	= 0x0080,</div><div class='add'>+	.sysc_offs	= 0x0084,</div><div class='add'>+	.syss_offs	= 0x0088,</div><div class='add'>+	.sysc_flags	= SYSS_HAS_RESET_STATUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class dra7xx_aes_hwmod_class = {</div><div class='add'>+	.name	= "aes",</div><div class='add'>+	.sysc	= &amp;dra7xx_aes_sysc,</div><div class='add'>+	.rev	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* AES1 */</div><div class='add'>+static struct omap_hwmod dra7xx_aes1_hwmod = {</div><div class='add'>+	.name		= "aes1",</div><div class='add'>+	.class		= &amp;dra7xx_aes_hwmod_class,</div><div class='add'>+	.clkdm_name	= "l4sec_clkdm",</div><div class='add'>+	.main_clk	= "l3_iclk_div",</div><div class='add'>+	.prcm = {</div><div class='add'>+		.omap4 = {</div><div class='add'>+			.clkctrl_offs = DRA7XX_CM_L4SEC_AES1_CLKCTRL_OFFSET,</div><div class='add'>+			.context_offs = DRA7XX_RM_L4SEC_AES1_CONTEXT_OFFSET,</div><div class='add'>+			.modulemode   = MODULEMODE_HWCTRL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* AES2 */</div><div class='add'>+static struct omap_hwmod dra7xx_aes2_hwmod = {</div><div class='add'>+	.name		= "aes2",</div><div class='add'>+	.class		= &amp;dra7xx_aes_hwmod_class,</div><div class='add'>+	.clkdm_name	= "l4sec_clkdm",</div><div class='add'>+	.main_clk	= "l3_iclk_div",</div><div class='add'>+	.prcm = {</div><div class='add'>+		.omap4 = {</div><div class='add'>+			.clkctrl_offs = DRA7XX_CM_L4SEC_AES2_CLKCTRL_OFFSET,</div><div class='add'>+			.context_offs = DRA7XX_RM_L4SEC_AES2_CONTEXT_OFFSET,</div><div class='add'>+			.modulemode   = MODULEMODE_HWCTRL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* sha0 HIB2 (the 'P' (public) device) */</div><div class='add'>+static struct omap_hwmod_class_sysconfig dra7xx_sha0_sysc = {</div><div class='add'>+	.rev_offs	= 0x100,</div><div class='add'>+	.sysc_offs	= 0x110,</div><div class='add'>+	.syss_offs	= 0x114,</div><div class='add'>+	.sysc_flags	= SYSS_HAS_RESET_STATUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class dra7xx_sha0_hwmod_class = {</div><div class='add'>+	.name		= "sham",</div><div class='add'>+	.sysc		= &amp;dra7xx_sha0_sysc,</div><div class='add'>+	.rev		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct omap_hwmod dra7xx_sha0_hwmod = {</div><div class='add'>+	.name		= "sham",</div><div class='add'>+	.class		= &amp;dra7xx_sha0_hwmod_class,</div><div class='add'>+	.clkdm_name	= "l4sec_clkdm",</div><div class='add'>+	.main_clk	= "l3_iclk_div",</div><div class='add'>+	.prcm		= {</div><div class='add'>+		.omap4 = {</div><div class='add'>+			.clkctrl_offs = DRA7XX_CM_L4SEC_SHA2MD51_CLKCTRL_OFFSET,</div><div class='add'>+			.context_offs = DRA7XX_RM_L4SEC_SHA2MD51_CONTEXT_OFFSET,</div><div class='add'>+			.modulemode   = MODULEMODE_HWCTRL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * 'elm' class</div><div class='ctx'>  *</div><div class='hunk'>@@ -2541,6 +2613,62 @@ static struct omap_hwmod dra7xx_uart10_hwmod = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* DES (the 'P' (public) device) */</div><div class='add'>+static struct omap_hwmod_class_sysconfig dra7xx_des_sysc = {</div><div class='add'>+	.rev_offs	= 0x0030,</div><div class='add'>+	.sysc_offs	= 0x0034,</div><div class='add'>+	.syss_offs	= 0x0038,</div><div class='add'>+	.sysc_flags	= SYSS_HAS_RESET_STATUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class dra7xx_des_hwmod_class = {</div><div class='add'>+	.name	= "des",</div><div class='add'>+	.sysc	= &amp;dra7xx_des_sysc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DES */</div><div class='add'>+static struct omap_hwmod dra7xx_des_hwmod = {</div><div class='add'>+	.name		= "des",</div><div class='add'>+	.class		= &amp;dra7xx_des_hwmod_class,</div><div class='add'>+	.clkdm_name	= "l4sec_clkdm",</div><div class='add'>+	.main_clk	= "l3_iclk_div",</div><div class='add'>+	.prcm = {</div><div class='add'>+		.omap4 = {</div><div class='add'>+			.clkctrl_offs = DRA7XX_CM_L4SEC_DES3DES_CLKCTRL_OFFSET,</div><div class='add'>+			.context_offs = DRA7XX_RM_L4SEC_DES3DES_CONTEXT_OFFSET,</div><div class='add'>+			.modulemode   = MODULEMODE_HWCTRL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* rng */</div><div class='add'>+static struct omap_hwmod_class_sysconfig dra7xx_rng_sysc = {</div><div class='add'>+	.rev_offs       = 0x1fe0,</div><div class='add'>+	.sysc_offs      = 0x1fe4,</div><div class='add'>+	.sysc_flags     = SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE,</div><div class='add'>+	.idlemodes      = SIDLE_FORCE | SIDLE_NO,</div><div class='add'>+	.sysc_fields    = &amp;omap_hwmod_sysc_type1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class dra7xx_rng_hwmod_class = {</div><div class='add'>+	.name           = "rng",</div><div class='add'>+	.sysc           = &amp;dra7xx_rng_sysc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod dra7xx_rng_hwmod = {</div><div class='add'>+	.name           = "rng",</div><div class='add'>+	.class          = &amp;dra7xx_rng_hwmod_class,</div><div class='add'>+	.flags		= HWMOD_SWSUP_SIDLE,</div><div class='add'>+	.clkdm_name     = "l4sec_clkdm",</div><div class='add'>+	.prcm = {</div><div class='add'>+		.omap4 = {</div><div class='add'>+			.clkctrl_offs = DRA7XX_CM_L4SEC_RNG_CLKCTRL_OFFSET,</div><div class='add'>+			.context_offs = DRA7XX_RM_L4SEC_RNG_CONTEXT_OFFSET,</div><div class='add'>+			.modulemode   = MODULEMODE_HWCTRL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * 'usb_otg_ss' class</div><div class='ctx'>  *</div><div class='hunk'>@@ -2929,6 +3057,30 @@ static struct omap_hwmod_ocp_if dra7xx_l3_main_1__hdmi = {</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* l3_main_1 -&gt; aes1 */</div><div class='add'>+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__aes1 = {</div><div class='add'>+	.master		= &amp;dra7xx_l3_main_1_hwmod,</div><div class='add'>+	.slave		= &amp;dra7xx_aes1_hwmod,</div><div class='add'>+	.clk		= "l3_iclk_div",</div><div class='add'>+	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* l3_main_1 -&gt; aes2 */</div><div class='add'>+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__aes2 = {</div><div class='add'>+	.master		= &amp;dra7xx_l3_main_1_hwmod,</div><div class='add'>+	.slave		= &amp;dra7xx_aes2_hwmod,</div><div class='add'>+	.clk		= "l3_iclk_div",</div><div class='add'>+	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* l3_main_1 -&gt; sha0 */</div><div class='add'>+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__sha0 = {</div><div class='add'>+	.master		= &amp;dra7xx_l3_main_1_hwmod,</div><div class='add'>+	.slave		= &amp;dra7xx_sha0_hwmod,</div><div class='add'>+	.clk		= "l3_iclk_div",</div><div class='add'>+	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* l4_per2 -&gt; mcasp1 */</div><div class='ctx'> static struct omap_hwmod_ocp_if dra7xx_l4_per2__mcasp1 = {</div><div class='ctx'> 	.master		= &amp;dra7xx_l4_per2_hwmod,</div><div class='hunk'>@@ -3642,6 +3794,14 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per2__uart7 = {</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* l4_per1 -&gt; des */</div><div class='add'>+static struct omap_hwmod_ocp_if dra7xx_l4_per1__des = {</div><div class='add'>+	.master		= &amp;dra7xx_l4_per1_hwmod,</div><div class='add'>+	.slave		= &amp;dra7xx_des_hwmod,</div><div class='add'>+	.clk		= "l3_iclk_div",</div><div class='add'>+	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* l4_per2 -&gt; uart8 */</div><div class='ctx'> static struct omap_hwmod_ocp_if dra7xx_l4_per2__uart8 = {</div><div class='ctx'> 	.master		= &amp;dra7xx_l4_per2_hwmod,</div><div class='hunk'>@@ -3666,6 +3826,13 @@ static struct omap_hwmod_ocp_if dra7xx_l4_wkup__uart10 = {</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* l4_per1 -&gt; rng */</div><div class='add'>+static struct omap_hwmod_ocp_if dra7xx_l4_per1__rng = {</div><div class='add'>+	.master         = &amp;dra7xx_l4_per1_hwmod,</div><div class='add'>+	.slave          = &amp;dra7xx_rng_hwmod,</div><div class='add'>+	.user           = OCP_USER_MPU,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* l4_per3 -&gt; usb_otg_ss1 */</div><div class='ctx'> static struct omap_hwmod_ocp_if dra7xx_l4_per3__usb_otg_ss1 = {</div><div class='ctx'> 	.master		= &amp;dra7xx_l4_per3_hwmod,</div><div class='hunk'>@@ -3800,6 +3967,9 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;dra7xx_l3_main_1__dss,</div><div class='ctx'> 	&amp;dra7xx_l3_main_1__dispc,</div><div class='ctx'> 	&amp;dra7xx_l3_main_1__hdmi,</div><div class='add'>+	&amp;dra7xx_l3_main_1__aes1,</div><div class='add'>+	&amp;dra7xx_l3_main_1__aes2,</div><div class='add'>+	&amp;dra7xx_l3_main_1__sha0,</div><div class='ctx'> 	&amp;dra7xx_l4_per1__elm,</div><div class='ctx'> 	&amp;dra7xx_l4_wkup__gpio1,</div><div class='ctx'> 	&amp;dra7xx_l4_per1__gpio2,</div><div class='hunk'>@@ -3845,7 +4015,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;dra7xx_l3_main_1__pciess2,</div><div class='ctx'> 	&amp;dra7xx_l4_cfg__pciess2,</div><div class='ctx'> 	&amp;dra7xx_l3_main_1__qspi,</div><div class='del'>-	&amp;dra7xx_l4_per3__rtcss,</div><div class='ctx'> 	&amp;dra7xx_l4_cfg__sata,</div><div class='ctx'> 	&amp;dra7xx_l4_cfg__smartreflex_core,</div><div class='ctx'> 	&amp;dra7xx_l4_cfg__smartreflex_mpu,</div><div class='hunk'>@@ -3875,6 +4044,7 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;dra7xx_l4_per2__uart8,</div><div class='ctx'> 	&amp;dra7xx_l4_per2__uart9,</div><div class='ctx'> 	&amp;dra7xx_l4_wkup__uart10,</div><div class='add'>+	&amp;dra7xx_l4_per1__des,</div><div class='ctx'> 	&amp;dra7xx_l4_per3__usb_otg_ss1,</div><div class='ctx'> 	&amp;dra7xx_l4_per3__usb_otg_ss2,</div><div class='ctx'> 	&amp;dra7xx_l4_per3__usb_otg_ss3,</div><div class='hunk'>@@ -3892,6 +4062,7 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> /* GP-only hwmod links */</div><div class='ctx'> static struct omap_hwmod_ocp_if *dra7xx_gp_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	&amp;dra7xx_l4_wkup__timer12,</div><div class='add'>+	&amp;dra7xx_l4_per1__rng,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3905,6 +4076,11 @@ static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[] __initdata = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct omap_hwmod_ocp_if *dra74x_dra72x_hwmod_ocp_ifs[] __initdata = {</div><div class='add'>+	&amp;dra7xx_l4_per3__rtcss,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int __init dra7xx_hwmod_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -3920,5 +4096,9 @@ int __init dra7xx_hwmod_init(void)</div><div class='ctx'> 	if (!ret &amp;&amp; omap_type() == OMAP2_DEVICE_TYPE_GP)</div><div class='ctx'> 		ret = omap_hwmod_register_links(dra7xx_gp_hwmod_ocp_ifs);</div><div class='ctx'> </div><div class='add'>+	/* now for the IPs *NOT* in dra71 */</div><div class='add'>+	if (!ret &amp;&amp; !of_machine_is_compatible("ti,dra718"))</div><div class='add'>+		ret = omap_hwmod_register_links(dra74x_dra72x_hwmod_ocp_ifs);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_common_data.h b/arch/arm/mach-omap2/omap_hwmod_common_data.h<br/>index 11ed5a17dd77..f22e9cb39f4a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_common_data.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_hwmod_common_data.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_hwmod_common_data.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_hwmod_common_data.h</a></div><div class='hunk'>@@ -19,22 +19,7 @@</div><div class='ctx'> #include "display.h"</div><div class='ctx'> </div><div class='ctx'> /* Common address space across OMAP2xxx/3xxx */</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_i2c1_addr_space[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_i2c2_addr_space[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_dss_addrs[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_dss_dispc_addrs[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_dss_rfbi_addrs[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_dss_venc_addrs[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_timer10_addrs[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_timer11_addrs[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2430_mmc1_addr_space[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2430_mmc2_addr_space[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_mcspi1_addr_space[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_mcspi2_addr_space[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[];</div><div class='ctx'> extern struct omap_hwmod_addr_space omap2_dma_system_addrs[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[];</div><div class='del'>-extern struct omap_hwmod_addr_space omap2_hdq1w_addr_space[];</div><div class='ctx'> </div><div class='ctx'> /* Common IP block data across OMAP2xxx */</div><div class='ctx'> extern struct omap_gpio_dev_attr omap2xxx_gpio_dev_attr;</div><div class='hunk'>@@ -136,10 +121,6 @@ extern struct omap_hwmod_irq_info omap2_uart3_mpu_irqs[];</div><div class='ctx'> extern struct omap_hwmod_irq_info omap2_dispc_irqs[];</div><div class='ctx'> extern struct omap_hwmod_irq_info omap2_i2c1_mpu_irqs[];</div><div class='ctx'> extern struct omap_hwmod_irq_info omap2_i2c2_mpu_irqs[];</div><div class='del'>-extern struct omap_hwmod_irq_info omap2_gpio1_irqs[];</div><div class='del'>-extern struct omap_hwmod_irq_info omap2_gpio2_irqs[];</div><div class='del'>-extern struct omap_hwmod_irq_info omap2_gpio3_irqs[];</div><div class='del'>-extern struct omap_hwmod_irq_info omap2_gpio4_irqs[];</div><div class='ctx'> extern struct omap_hwmod_irq_info omap2_dma_system_irqs[];</div><div class='ctx'> extern struct omap_hwmod_irq_info omap2_mcspi1_mpu_irqs[];</div><div class='ctx'> extern struct omap_hwmod_irq_info omap2_mcspi2_mpu_irqs[];</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c<br/>index 6bf626700557..1346b3ab34a5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_twl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/omap_twl.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/omap_twl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/omap_twl.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /**</div><div class='del'>- * OMAP and TWL PMIC specific intializations.</div><div class='add'>+ * OMAP and TWL PMIC specific initializations.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 Texas Instruments Incorporated.</div><div class='ctx'>  * Thara Gopinath</div><div class='head'>diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c<br/>index 05e20aaf68dd..9700a8ef0f16 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/pdata-quirks.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/pdata-quirks.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/pdata-quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/pdata-quirks.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "common-board-devices.h"</div><div class='del'>-#include "dss-common.h"</div><div class='ctx'> #include "control.h"</div><div class='ctx'> #include "omap_device.h"</div><div class='ctx'> #include "omap-pm.h"</div><div class='hunk'>@@ -162,7 +161,7 @@ static struct ti_st_plat_data wilink7_pdata = {</div><div class='ctx'> 	.nshutdown_gpio = 162,</div><div class='ctx'> 	.dev_name = "/dev/ttyO1",</div><div class='ctx'> 	.flow_cntrl = 1,</div><div class='del'>-	.baud_rate = 300000,</div><div class='add'>+	.baud_rate = 3000000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device wl128x_device = {</div><div class='hunk'>@@ -485,15 +484,15 @@ static struct pwm_omap_dmtimer_pdata pwm_dmtimer_pdata = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct lirc_rx51_platform_data __maybe_unused rx51_lirc_data = {</div><div class='add'>+static struct ir_rx51_platform_data __maybe_unused rx51_ir_data = {</div><div class='ctx'> 	.set_max_mpu_wakeup_lat = omap_pm_set_max_mpu_wakeup_lat,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device __maybe_unused rx51_lirc_device = {</div><div class='del'>-	.name           = "lirc_rx51",</div><div class='add'>+static struct platform_device __maybe_unused rx51_ir_device = {</div><div class='add'>+	.name           = "ir_rx51",</div><div class='ctx'> 	.id             = -1,</div><div class='ctx'> 	.dev            = {</div><div class='del'>-		.platform_data = &amp;rx51_lirc_data,</div><div class='add'>+		.platform_data = &amp;rx51_ir_data,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -534,7 +533,7 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {</div><div class='ctx'> 		       &amp;omap3_iommu_pdata),</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,omap3-hsmmc", 0x4809c000, "4809c000.mmc", &amp;mmc_pdata[0]),</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,omap3-hsmmc", 0x480b4000, "480b4000.mmc", &amp;mmc_pdata[1]),</div><div class='del'>-	OF_DEV_AUXDATA("nokia,n900-ir", 0, "n900-ir", &amp;rx51_lirc_data),</div><div class='add'>+	OF_DEV_AUXDATA("nokia,n900-ir", 0, "n900-ir", &amp;rx51_ir_data),</div><div class='ctx'> 	/* Only on am3517 */</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,davinci_mdio", 0x5c030000, "davinci_mdio.0", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("ti,am3517-emac", 0x5c000000, "davinci_emac.0",</div><div class='hunk'>@@ -600,7 +599,6 @@ static void pdata_quirks_check(struct pdata_init *quirks)</div><div class='ctx'> 		if (of_machine_is_compatible(quirks-&gt;compatible)) {</div><div class='ctx'> 			if (quirks-&gt;fn)</div><div class='ctx'> 				quirks-&gt;fn();</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		quirks++;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c<br/>index 0b339861d751..5c46ea6756d7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/pm-debug.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/pm-debug.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/pm-debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/pm-debug.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -114,8 +115,7 @@ static int pwrdm_dbg_show_counter(struct powerdomain *pwrdm, void *user)</div><div class='ctx'> 		seq_printf(s, ",RET-MEMBANK%d-OFF:%d", i + 1,</div><div class='ctx'> 				pwrdm-&gt;ret_mem_off_counter[i]);</div><div class='ctx'> </div><div class='del'>-	seq_printf(s, "\n");</div><div class='del'>-</div><div class='add'>+	seq_putc(s, '\n');</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -138,7 +138,7 @@ static int pwrdm_dbg_show_timer(struct powerdomain *pwrdm, void *user)</div><div class='ctx'> 		seq_printf(s, ",%s:%lld", pwrdm_state_names[i],</div><div class='ctx'> 			pwrdm-&gt;state_timer[i]);</div><div class='ctx'> </div><div class='del'>-	seq_printf(s, "\n");</div><div class='add'>+	seq_putc(s, '\n');</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c<br/>index 678d2a31dcb8..0598630c1778 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/pm.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include "powerdomain.h"</div><div class='ctx'> #include "clockdomain.h"</div><div class='ctx'> #include "pm.h"</div><div class='del'>-#include "twl-common.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SUSPEND</div><div class='ctx'> /*</div><div class='hunk'>@@ -72,42 +71,6 @@ void omap_pm_get_oscillator(u32 *tstart, u32 *tshut)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __init _init_omap_device(char *name)</div><div class='del'>-{</div><div class='del'>-	struct omap_hwmod *oh;</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-</div><div class='del'>-	oh = omap_hwmod_lookup(name);</div><div class='del'>-	if (WARN(!oh, "%s: could not find omap_hwmod for %s\n",</div><div class='del'>-		 __func__, name))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	pdev = omap_device_build(oh-&gt;name, 0, oh, NULL, 0);</div><div class='del'>-	if (WARN(IS_ERR(pdev), "%s: could not build omap_device for %s\n",</div><div class='del'>-		 __func__, name))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Build omap_devices for processors and bus.</div><div class='del'>- */</div><div class='del'>-static void __init omap2_init_processor_devices(void)</div><div class='del'>-{</div><div class='del'>-	_init_omap_device("mpu");</div><div class='del'>-	if (omap3_has_iva())</div><div class='del'>-		_init_omap_device("iva");</div><div class='del'>-</div><div class='del'>-	if (cpu_is_omap44xx()) {</div><div class='del'>-		_init_omap_device("l3_main_1");</div><div class='del'>-		_init_omap_device("dsp");</div><div class='del'>-		_init_omap_device("iva");</div><div class='del'>-	} else {</div><div class='del'>-		_init_omap_device("l3_main");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int __init omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	clkdm_allow_idle(clkdm);</div><div class='hunk'>@@ -167,17 +130,16 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name,</div><div class='ctx'> 	freq = clk_get_rate(clk);</div><div class='ctx'> 	clk_put(clk);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	opp = dev_pm_opp_find_freq_ceil(dev, &amp;freq);</div><div class='ctx'> 	if (IS_ERR(opp)) {</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 		pr_err("%s: unable to find boot up OPP for vdd_%s\n",</div><div class='ctx'> 			__func__, vdd_name);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bootup_volt = dev_pm_opp_get_voltage(opp);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	dev_pm_opp_put(opp);</div><div class='add'>+</div><div class='ctx'> 	if (!bootup_volt) {</div><div class='ctx'> 		pr_err("%s: unable to find voltage corresponding to the bootup OPP for vdd_%s\n",</div><div class='ctx'> 		       __func__, vdd_name);</div><div class='hunk'>@@ -215,7 +177,7 @@ static int omap_pm_enter(suspend_state_t suspend_state)</div><div class='ctx'> static int omap_pm_begin(suspend_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_idle_poll_ctrl(true);</div><div class='del'>-	if (cpu_is_omap34xx())</div><div class='add'>+	if (soc_is_omap34xx())</div><div class='ctx'> 		omap_prcm_irq_prepare();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -227,7 +189,7 @@ static void omap_pm_end(void)</div><div class='ctx'> </div><div class='ctx'> static void omap_pm_finish(void)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_is_omap34xx())</div><div class='add'>+	if (soc_is_omap34xx())</div><div class='ctx'> 		omap_prcm_irq_complete();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -252,7 +214,7 @@ void omap_common_suspend_init(void *pm_suspend)</div><div class='ctx'> </div><div class='ctx'> static void __init omap3_init_voltages(void)</div><div class='ctx'> {</div><div class='del'>-	if (!cpu_is_omap34xx())</div><div class='add'>+	if (!soc_is_omap34xx())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	omap2_set_init_voltage("mpu_iva", "dpll1_ck", "mpu");</div><div class='hunk'>@@ -261,7 +223,7 @@ static void __init omap3_init_voltages(void)</div><div class='ctx'> </div><div class='ctx'> static void __init omap4_init_voltages(void)</div><div class='ctx'> {</div><div class='del'>-	if (!cpu_is_omap44xx())</div><div class='add'>+	if (!soc_is_omap44xx())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	omap2_set_init_voltage("mpu", "dpll_mpu_ck", "mpu");</div><div class='hunk'>@@ -269,18 +231,8 @@ static void __init omap4_init_voltages(void)</div><div class='ctx'> 	omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", "iva");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void omap_init_cpufreq(void)</div><div class='del'>-{</div><div class='del'>-	struct platform_device_info devinfo = { .name = "omap-cpufreq" };</div><div class='del'>-</div><div class='del'>-	if (!of_have_populated_dt())</div><div class='del'>-		platform_device_register_full(&amp;devinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init omap2_common_pm_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!of_have_populated_dt())</div><div class='del'>-		omap2_init_processor_devices();</div><div class='ctx'> 	omap_pm_if_init();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -289,13 +241,9 @@ omap_postcore_initcall(omap2_common_pm_init);</div><div class='ctx'> </div><div class='ctx'> int __init omap2_common_pm_late_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (of_have_populated_dt()) {</div><div class='del'>-		omap3_twl_init();</div><div class='del'>-		omap4_twl_init();</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Init the voltage layer */</div><div class='del'>-	omap_pmic_late_init();</div><div class='add'>+	omap3_twl_init();</div><div class='add'>+	omap4_twl_init();</div><div class='ctx'> 	omap_voltage_late_init();</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the voltages */</div><div class='hunk'>@@ -305,8 +253,5 @@ int __init omap2_common_pm_late_init(void)</div><div class='ctx'> 	/* Smartreflex device init */</div><div class='ctx'> 	omap_devinit_smartreflex();</div><div class='ctx'> </div><div class='del'>-	/* cpufreq dummy device instantiation */</div><div class='del'>-	omap_init_cpufreq();</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c<br/>index 178e22c146b7..b3870220612e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/pm44xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/pm44xx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/pm44xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/pm44xx.c</a></div><div class='hunk'>@@ -287,7 +287,7 @@ int __init omap4_pm_init(void)</div><div class='ctx'> 	/* Overwrite the default cpu_do_idle() */</div><div class='ctx'> 	arm_pm_idle = omap_default_idle;</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_omap44xx())</div><div class='add'>+	if (cpu_is_omap44xx() || soc_is_omap54xx())</div><div class='ctx'> 		omap4_idle_init();</div><div class='ctx'> </div><div class='ctx'> err2:</div><div class='head'>diff --git a/arch/arm/mach-omap2/prcm43xx.h b/arch/arm/mach-omap2/prcm43xx.h<br/>index babb5db5a3a4..e2ad14e77064 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/prcm43xx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/prcm43xx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/prcm43xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/prcm43xx.h</a></div><div class='hunk'>@@ -92,6 +92,7 @@</div><div class='ctx'> #define AM43XX_CM_PER_MAILBOX0_CLKCTRL_OFFSET		0x04b8</div><div class='ctx'> #define AM43XX_CM_PER_MMC0_CLKCTRL_OFFSET		0x04c0</div><div class='ctx'> #define AM43XX_CM_PER_MMC1_CLKCTRL_OFFSET		0x04c8</div><div class='add'>+#define AM43XX_CM_PER_RNG_CLKCTRL_OFFSET		0x04e0</div><div class='ctx'> #define AM43XX_CM_PER_SPI0_CLKCTRL_OFFSET		0x0500</div><div class='ctx'> #define AM43XX_CM_PER_SPI1_CLKCTRL_OFFSET		0x0508</div><div class='ctx'> #define AM43XX_CM_PER_SPINLOCK_CLKCTRL_OFFSET		0x0528</div><div class='hunk'>@@ -133,6 +134,7 @@</div><div class='ctx'> #define AM43XX_CM_PER_OCMCRAM_CLKCTRL_OFFSET		0x0050</div><div class='ctx'> #define AM43XX_CM_PER_SHA0_CLKCTRL_OFFSET		0x0058</div><div class='ctx'> #define AM43XX_CM_PER_AES0_CLKCTRL_OFFSET		0x0028</div><div class='add'>+#define AM43XX_CM_PER_DES_CLKCTRL_OFFSET		0x0030</div><div class='ctx'> #define AM43XX_CM_PER_TIMER8_CLKCTRL_OFFSET		0x0560</div><div class='ctx'> #define AM43XX_CM_PER_TIMER9_CLKCTRL_OFFSET		0x0568</div><div class='ctx'> #define AM43XX_CM_PER_TIMER10_CLKCTRL_OFFSET		0x0570</div><div class='head'>diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c<br/>index 5b2f5138d938..2b138b65129a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/prm_common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/prm_common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/prm_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/prm_common.c</a></div><div class='hunk'>@@ -295,10 +295,8 @@ int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup)</div><div class='ctx'> 		GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!prcm_irq_chips || !prcm_irq_setup-&gt;saved_mask ||</div><div class='del'>-	    !prcm_irq_setup-&gt;priority_mask) {</div><div class='del'>-		pr_err("PRCM: kzalloc failed\n");</div><div class='add'>+	    !prcm_irq_setup-&gt;priority_mask)</div><div class='ctx'> 		goto err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	memset(mask, 0, sizeof(mask));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h b/arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h<br/>deleted file mode 100644<br/>index 1ee58c281a31..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * SDRC register values for the Hynix H8MBX00U0MER-0EM</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Texas Instruments, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ARCH_ARM_MACH_OMAP2_SDRAM_HYNIX_H8MBX00U0MER0EM</div><div class='del'>-#define __ARCH_ARM_MACH_OMAP2_SDRAM_HYNIX_H8MBX00U0MER0EM</div><div class='del'>-</div><div class='del'>-#include "sdrc.h"</div><div class='del'>-</div><div class='del'>-/* Hynix H8MBX00U0MER-0EM */</div><div class='del'>-static struct omap_sdrc_params h8mbx00u0mer0em_sdrc_params[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.rate        = 200000000,</div><div class='del'>-		.actim_ctrla = 0xa2e1b4c6,</div><div class='del'>-		.actim_ctrlb = 0x0002131c,</div><div class='del'>-		.rfr_ctrl    = 0x0005e601,</div><div class='del'>-		.mr          = 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.rate        = 166000000,</div><div class='del'>-		.actim_ctrla = 0x629db4c6,</div><div class='del'>-		.actim_ctrlb = 0x00012214,</div><div class='del'>-		.rfr_ctrl    = 0x0004dc01,</div><div class='del'>-		.mr          = 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.rate        = 100000000,</div><div class='del'>-		.actim_ctrla = 0x51912284,</div><div class='del'>-		.actim_ctrlb = 0x0002120e,</div><div class='del'>-		.rfr_ctrl    = 0x0002d101,</div><div class='del'>-		.mr          = 0x00000022,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.rate        = 83000000,</div><div class='del'>-		.actim_ctrla = 0x31512283,</div><div class='del'>-		.actim_ctrlb = 0x0001220a,</div><div class='del'>-		.rfr_ctrl    = 0x00025501,</div><div class='del'>-		.mr          = 0x00000022,</div><div class='del'>-	},</div><div class='del'>-	[4] = {</div><div class='del'>-		.rate        = 0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h b/arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h<br/>deleted file mode 100644<br/>index 85cccc004c06..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * SDRC register values for the Micron MT46H32M32LF-6</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2008 Texas Instruments, Inc.</div><div class='del'>- * Copyright (C) 2008-2009 Nokia Corporation</div><div class='del'>- *</div><div class='del'>- * Paul Walmsley</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT46H32M32LF</div><div class='del'>-#define ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT46H32M32LF</div><div class='del'>-</div><div class='del'>-#include "sdrc.h"</div><div class='del'>-</div><div class='del'>-/* Micron MT46H32M32LF-6 */</div><div class='del'>-/* XXX Using ARE = 0x1 (no autorefresh burst) -- can this be changed? */</div><div class='del'>-static struct omap_sdrc_params mt46h32m32lf6_sdrc_params[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.rate	     = 166000000,</div><div class='del'>-		.actim_ctrla = 0x9a9db4c6,</div><div class='del'>-		.actim_ctrlb = 0x00011217,</div><div class='del'>-		.rfr_ctrl    = 0x0004dc01,</div><div class='del'>-		.mr	     = 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.rate	     = 165941176,</div><div class='del'>-		.actim_ctrla = 0x9a9db4c6,</div><div class='del'>-		.actim_ctrlb = 0x00011217,</div><div class='del'>-		.rfr_ctrl    = 0x0004dc01,</div><div class='del'>-		.mr	     = 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.rate	     = 83000000,</div><div class='del'>-		.actim_ctrla = 0x51512283,</div><div class='del'>-		.actim_ctrlb = 0x0001120c,</div><div class='del'>-		.rfr_ctrl    = 0x00025501,</div><div class='del'>-		.mr	     = 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.rate	     = 82970588,</div><div class='del'>-		.actim_ctrla = 0x51512283,</div><div class='del'>-		.actim_ctrlb = 0x0001120c,</div><div class='del'>-		.rfr_ctrl    = 0x00025501,</div><div class='del'>-		.mr	     = 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[4] = {</div><div class='del'>-		.rate	     = 0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/sdram-nokia.c b/arch/arm/mach-omap2/sdram-nokia.c<br/>deleted file mode 100644<br/>index 0fa7ffa9b5ed..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/sdram-nokia.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/sdram-nokia.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,299 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * SDRC register values for Nokia boards</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2008, 2010-2011 Nokia Corporation</div><div class='del'>- *</div><div class='del'>- * Lauri Leukkunen &lt;lauri.leukkunen@nokia.com&gt;</div><div class='del'>- *</div><div class='del'>- * Original code by Juha Yrjola &lt;juha.yrjola@solidboot.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-#include "sdram-nokia.h"</div><div class='del'>-#include "sdrc.h"</div><div class='del'>-</div><div class='del'>-/* In picoseconds, except for tREF (ns), tXP, tCKE, tWTR (clks) */</div><div class='del'>-struct sdram_timings {</div><div class='del'>-	u32 casl;</div><div class='del'>-	u32 tDAL;</div><div class='del'>-	u32 tDPL;</div><div class='del'>-	u32 tRRD;</div><div class='del'>-	u32 tRCD;</div><div class='del'>-	u32 tRP;</div><div class='del'>-	u32 tRAS;</div><div class='del'>-	u32 tRC;</div><div class='del'>-	u32 tRFC;</div><div class='del'>-	u32 tXSR;</div><div class='del'>-</div><div class='del'>-	u32 tREF; /* in ns */</div><div class='del'>-</div><div class='del'>-	u32 tXP;</div><div class='del'>-	u32 tCKE;</div><div class='del'>-	u32 tWTR;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct sdram_timings nokia_97dot6mhz_timings[] = {</div><div class='del'>-	{</div><div class='del'>-		.casl = 3,</div><div class='del'>-		.tDAL = 30725,</div><div class='del'>-		.tDPL = 15362,</div><div class='del'>-		.tRRD = 10241,</div><div class='del'>-		.tRCD = 20483,</div><div class='del'>-		.tRP = 15362,</div><div class='del'>-		.tRAS = 40967,</div><div class='del'>-		.tRC = 56330,</div><div class='del'>-		.tRFC = 138266,</div><div class='del'>-		.tXSR = 204839,</div><div class='del'>-</div><div class='del'>-		.tREF = 7798,</div><div class='del'>-</div><div class='del'>-		.tXP = 2,</div><div class='del'>-		.tCKE = 4,</div><div class='del'>-		.tWTR = 2,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct sdram_timings nokia_166mhz_timings[] = {</div><div class='del'>-	{</div><div class='del'>-		.casl = 3,</div><div class='del'>-		.tDAL = 33000,</div><div class='del'>-		.tDPL = 15000,</div><div class='del'>-		.tRRD = 12000,</div><div class='del'>-		.tRCD = 22500,</div><div class='del'>-		.tRP = 18000,</div><div class='del'>-		.tRAS = 42000,</div><div class='del'>-		.tRC = 66000,</div><div class='del'>-		.tRFC = 138000,</div><div class='del'>-		.tXSR = 200000,</div><div class='del'>-</div><div class='del'>-		.tREF = 7800,</div><div class='del'>-</div><div class='del'>-		.tXP = 2,</div><div class='del'>-		.tCKE = 2,</div><div class='del'>-		.tWTR = 2</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct sdram_timings nokia_195dot2mhz_timings[] = {</div><div class='del'>-	{</div><div class='del'>-		.casl = 3,</div><div class='del'>-		.tDAL = 30725,</div><div class='del'>-		.tDPL = 15362,</div><div class='del'>-		.tRRD = 10241,</div><div class='del'>-		.tRCD = 20483,</div><div class='del'>-		.tRP = 15362,</div><div class='del'>-		.tRAS = 40967,</div><div class='del'>-		.tRC = 56330,</div><div class='del'>-		.tRFC = 138266,</div><div class='del'>-		.tXSR = 204839,</div><div class='del'>-</div><div class='del'>-		.tREF = 7752,</div><div class='del'>-</div><div class='del'>-		.tXP = 2,</div><div class='del'>-		.tCKE = 4,</div><div class='del'>-		.tWTR = 2,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct sdram_timings nokia_200mhz_timings[] = {</div><div class='del'>-	{</div><div class='del'>-		.casl = 3,</div><div class='del'>-		.tDAL = 30000,</div><div class='del'>-		.tDPL = 15000,</div><div class='del'>-		.tRRD = 10000,</div><div class='del'>-		.tRCD = 20000,</div><div class='del'>-		.tRP = 15000,</div><div class='del'>-		.tRAS = 40000,</div><div class='del'>-		.tRC = 55000,</div><div class='del'>-		.tRFC = 140000,</div><div class='del'>-		.tXSR = 200000,</div><div class='del'>-</div><div class='del'>-		.tREF = 7800,</div><div class='del'>-</div><div class='del'>-		.tXP = 2,</div><div class='del'>-		.tCKE = 4,</div><div class='del'>-		.tWTR = 2</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct {</div><div class='del'>-	long rate;</div><div class='del'>-	struct sdram_timings const *data;</div><div class='del'>-} nokia_timings[] = {</div><div class='del'>-	{ 83000000, nokia_166mhz_timings },</div><div class='del'>-	{ 97600000, nokia_97dot6mhz_timings },</div><div class='del'>-	{ 100000000, nokia_200mhz_timings },</div><div class='del'>-	{ 166000000, nokia_166mhz_timings },</div><div class='del'>-	{ 195200000, nokia_195dot2mhz_timings },</div><div class='del'>-	{ 200000000, nokia_200mhz_timings },</div><div class='del'>-};</div><div class='del'>-static struct omap_sdrc_params nokia_sdrc_params[ARRAY_SIZE(nokia_timings) + 1];</div><div class='del'>-</div><div class='del'>-static unsigned long sdrc_get_fclk_period(long rate)</div><div class='del'>-{</div><div class='del'>-	/* In picoseconds */</div><div class='del'>-	return 1000000000 / rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int sdrc_ps_to_ticks(unsigned int time_ps, long rate)</div><div class='del'>-{</div><div class='del'>-	unsigned long tick_ps;</div><div class='del'>-</div><div class='del'>-	/* Calculate in picosecs to yield more exact results */</div><div class='del'>-	tick_ps = sdrc_get_fclk_period(rate);</div><div class='del'>-</div><div class='del'>-	return (time_ps + tick_ps - 1) / tick_ps;</div><div class='del'>-}</div><div class='del'>-#undef DEBUG</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-static int set_sdrc_timing_regval(u32 *regval, int st_bit, int end_bit,</div><div class='del'>-				int ticks, long rate, const char *name)</div><div class='del'>-#else</div><div class='del'>-static int set_sdrc_timing_regval(u32 *regval, int st_bit, int end_bit,</div><div class='del'>-			       int ticks)</div><div class='del'>-#endif</div><div class='del'>-{</div><div class='del'>-	int mask, nr_bits;</div><div class='del'>-</div><div class='del'>-	nr_bits = end_bit - st_bit + 1;</div><div class='del'>-	if (ticks &gt;= 1 &lt;&lt; nr_bits)</div><div class='del'>-		return -1;</div><div class='del'>-	mask = (1 &lt;&lt; nr_bits) - 1;</div><div class='del'>-	*regval &amp;= ~(mask &lt;&lt; st_bit);</div><div class='del'>-	*regval |= ticks &lt;&lt; st_bit;</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_INFO "SDRC %s: %i ticks %i ns\n", name, ticks,</div><div class='del'>-			(unsigned int)sdrc_get_fclk_period(rate) * ticks /</div><div class='del'>-			1000);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-#define SDRC_SET_ONE(reg, st, end, field, rate) \</div><div class='del'>-	if (set_sdrc_timing_regval((reg), (st), (end), \</div><div class='del'>-			memory_timings-&gt;field, (rate), #field) &lt; 0) \</div><div class='del'>-		err = -1;</div><div class='del'>-#else</div><div class='del'>-#define SDRC_SET_ONE(reg, st, end, field, rate) \</div><div class='del'>-	if (set_sdrc_timing_regval((reg), (st), (end), \</div><div class='del'>-			memory_timings-&gt;field) &lt; 0) \</div><div class='del'>-		err = -1;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-static int set_sdrc_timing_regval_ps(u32 *regval, int st_bit, int end_bit,</div><div class='del'>-				int time, long rate, const char *name)</div><div class='del'>-#else</div><div class='del'>-static int set_sdrc_timing_regval_ps(u32 *regval, int st_bit, int end_bit,</div><div class='del'>-				int time, long rate)</div><div class='del'>-#endif</div><div class='del'>-{</div><div class='del'>-	int ticks, ret;</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-	if (time == 0)</div><div class='del'>-		ticks = 0;</div><div class='del'>-	else</div><div class='del'>-		ticks = sdrc_ps_to_ticks(time, rate);</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	ret = set_sdrc_timing_regval(regval, st_bit, end_bit, ticks,</div><div class='del'>-				     rate, name);</div><div class='del'>-#else</div><div class='del'>-	ret = set_sdrc_timing_regval(regval, st_bit, end_bit, ticks);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-#define SDRC_SET_ONE_PS(reg, st, end, field, rate) \</div><div class='del'>-	if (set_sdrc_timing_regval_ps((reg), (st), (end), \</div><div class='del'>-			memory_timings-&gt;field, \</div><div class='del'>-			(rate), #field) &lt; 0) \</div><div class='del'>-		err = -1;</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define SDRC_SET_ONE_PS(reg, st, end, field, rate) \</div><div class='del'>-	if (set_sdrc_timing_regval_ps((reg), (st), (end), \</div><div class='del'>-			memory_timings-&gt;field, (rate)) &lt; 0) \</div><div class='del'>-		err = -1;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int sdrc_timings(int id, long rate,</div><div class='del'>-			const struct sdram_timings *memory_timings)</div><div class='del'>-{</div><div class='del'>-	u32 ticks_per_ms;</div><div class='del'>-	u32 rfr, l;</div><div class='del'>-	u32 actim_ctrla = 0, actim_ctrlb = 0;</div><div class='del'>-	u32 rfr_ctrl;</div><div class='del'>-	int err = 0;</div><div class='del'>-	long l3_rate = rate / 1000;</div><div class='del'>-</div><div class='del'>-	SDRC_SET_ONE_PS(&amp;actim_ctrla,  0,  4, tDAL, l3_rate);</div><div class='del'>-	SDRC_SET_ONE_PS(&amp;actim_ctrla,  6,  8, tDPL, l3_rate);</div><div class='del'>-	SDRC_SET_ONE_PS(&amp;actim_ctrla,  9, 11, tRRD, l3_rate);</div><div class='del'>-	SDRC_SET_ONE_PS(&amp;actim_ctrla, 12, 14, tRCD, l3_rate);</div><div class='del'>-	SDRC_SET_ONE_PS(&amp;actim_ctrla, 15, 17, tRP, l3_rate);</div><div class='del'>-	SDRC_SET_ONE_PS(&amp;actim_ctrla, 18, 21, tRAS, l3_rate);</div><div class='del'>-	SDRC_SET_ONE_PS(&amp;actim_ctrla, 22, 26, tRC, l3_rate);</div><div class='del'>-	SDRC_SET_ONE_PS(&amp;actim_ctrla, 27, 31, tRFC, l3_rate);</div><div class='del'>-</div><div class='del'>-	SDRC_SET_ONE_PS(&amp;actim_ctrlb,  0,  7, tXSR, l3_rate);</div><div class='del'>-</div><div class='del'>-	SDRC_SET_ONE(&amp;actim_ctrlb,  8, 10, tXP, l3_rate);</div><div class='del'>-	SDRC_SET_ONE(&amp;actim_ctrlb, 12, 14, tCKE, l3_rate);</div><div class='del'>-	SDRC_SET_ONE(&amp;actim_ctrlb, 16, 17, tWTR, l3_rate);</div><div class='del'>-</div><div class='del'>-	ticks_per_ms = l3_rate;</div><div class='del'>-	rfr = memory_timings[0].tREF * ticks_per_ms / 1000000;</div><div class='del'>-	if (rfr &gt; 65535 + 50)</div><div class='del'>-		rfr = 65535;</div><div class='del'>-	else</div><div class='del'>-		rfr -= 50;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_INFO "SDRC tREF: %i ticks\n", rfr);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	l = rfr &lt;&lt; 8;</div><div class='del'>-	rfr_ctrl = l | 0x1; /* autorefresh, reload counter with 1xARCV */</div><div class='del'>-</div><div class='del'>-	nokia_sdrc_params[id].rate = rate;</div><div class='del'>-	nokia_sdrc_params[id].actim_ctrla = actim_ctrla;</div><div class='del'>-	nokia_sdrc_params[id].actim_ctrlb = actim_ctrlb;</div><div class='del'>-	nokia_sdrc_params[id].rfr_ctrl = rfr_ctrl;</div><div class='del'>-	nokia_sdrc_params[id].mr = 0x32;</div><div class='del'>-</div><div class='del'>-	nokia_sdrc_params[id + 1].rate = 0;</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct omap_sdrc_params *nokia_get_sdram_timings(void)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(nokia_timings); i++) {</div><div class='del'>-		err |= sdrc_timings(i, nokia_timings[i].rate,</div><div class='del'>-				       nokia_timings[i].data);</div><div class='del'>-		if (err)</div><div class='del'>-			pr_err("%s: error with rate %ld: %d\n", __func__,</div><div class='del'>-			       nokia_timings[i].rate, err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err ? NULL : nokia_sdrc_params;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-omap2/sdram-nokia.h b/arch/arm/mach-omap2/sdram-nokia.h<br/>deleted file mode 100644<br/>index ee63da5f8df0..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/sdram-nokia.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/sdram-nokia.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * SDRC register values for Nokia boards</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 Nokia</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct omap_sdrc_params *nokia_get_sdram_timings(void);</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h b/arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h<br/>deleted file mode 100644<br/>index 003f7bf4e2e3..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * SDRC register values for the Numonyx M65KXXXXAM</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Integration Software and Electronic Engineering.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ARCH_ARM_MACH_OMAP2_SDRAM_NUMONYX_M65KXXXXAM</div><div class='del'>-#define __ARCH_ARM_MACH_OMAP2_SDRAM_NUMONYX_M65KXXXXAM</div><div class='del'>-</div><div class='del'>-#include "sdrc.h"</div><div class='del'>-</div><div class='del'>-/* Numonyx  M65KXXXXAM */</div><div class='del'>-static struct omap_sdrc_params m65kxxxxam_sdrc_params[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.rate		= 200000000,</div><div class='del'>-		.actim_ctrla	= 0xe321d4c6,</div><div class='del'>-		.actim_ctrlb	= 0x00022328,</div><div class='del'>-		.rfr_ctrl	= 0x0005e601,</div><div class='del'>-		.mr		= 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.rate		= 166000000,</div><div class='del'>-		.actim_ctrla	= 0xba9dc485,</div><div class='del'>-		.actim_ctrlb	= 0x00022321,</div><div class='del'>-		.rfr_ctrl	= 0x0004dc01,</div><div class='del'>-		.mr		= 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.rate		= 133000000,</div><div class='del'>-		.actim_ctrla	= 0x9a19b485,</div><div class='del'>-		.actim_ctrlb	= 0x0002231b,</div><div class='del'>-		.rfr_ctrl	= 0x0003de01,</div><div class='del'>-		.mr		= 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.rate		= 83000000,</div><div class='del'>-		.actim_ctrla	= 0x594ca242,</div><div class='del'>-		.actim_ctrlb	= 0x00022310,</div><div class='del'>-		.rfr_ctrl	= 0x00025501,</div><div class='del'>-		.mr		= 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[4] = {</div><div class='del'>-		.rate			= 0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h b/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h<br/>deleted file mode 100644<br/>index 8dc3de5ebb5b..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * SDRC register values for the Qimonda HYB18M512160AF-6</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2008-2009 Texas Instruments, Inc.</div><div class='del'>- * Copyright (C) 2008-2009 Nokia Corporation</div><div class='del'>- *</div><div class='del'>- * Paul Walmsley</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6</div><div class='del'>-#define ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6</div><div class='del'>-</div><div class='del'>-#include "sdrc.h"</div><div class='del'>-</div><div class='del'>-/* Qimonda HYB18M512160AF-6 */</div><div class='del'>-static struct omap_sdrc_params hyb18m512160af6_sdrc_params[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.rate	     = 166000000,</div><div class='del'>-		.actim_ctrla = 0x629db4c6,</div><div class='del'>-		.actim_ctrlb = 0x00012214,</div><div class='del'>-		.rfr_ctrl    = 0x0004dc01,</div><div class='del'>-		.mr	     = 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.rate	     = 165941176,</div><div class='del'>-		.actim_ctrla = 0x629db4c6,</div><div class='del'>-		.actim_ctrlb = 0x00012214,</div><div class='del'>-		.rfr_ctrl    = 0x0004dc01,</div><div class='del'>-		.mr	     = 0x00000032,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.rate	     = 83000000,</div><div class='del'>-		.actim_ctrla = 0x31512283,</div><div class='del'>-		.actim_ctrlb = 0x0001220a,</div><div class='del'>-		.rfr_ctrl    = 0x00025501,</div><div class='del'>-		.mr	     = 0x00000022,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.rate	     = 82970588,</div><div class='del'>-		.actim_ctrla = 0x31512283,</div><div class='del'>-		.actim_ctrlb = 0x0001220a,</div><div class='del'>-		.rfr_ctrl    = 0x00025501,</div><div class='del'>-		.mr	     = 0x00000022,</div><div class='del'>-	},</div><div class='del'>-	[4] = {</div><div class='del'>-		.rate	     = 0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c<br/>deleted file mode 100644<br/>index 8e072de89fed..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/serial.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/serial.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,332 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-omap2/serial.c</div><div class='del'>- *</div><div class='del'>- * OMAP2 serial support.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2005-2008 Nokia Corporation</div><div class='del'>- * Author: Paul Mundt &lt;paul.mundt@nokia.com&gt;</div><div class='del'>- *</div><div class='del'>- * Major rework for PM support by Kevin Hilman</div><div class='del'>- *</div><div class='del'>- * Based off of arch/arm/mach-omap/omap1/serial.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Texas Instruments</div><div class='del'>- * Added OMAP4 support - Santosh Shilimkar &lt;santosh.shilimkar@ti.com</div><div class='del'>- *</div><div class='del'>- * This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- * License. See the file "COPYING" in the main directory of this archive</div><div class='del'>- * for more details.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pm_runtime.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/omap-dma.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/serial-omap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-#include "omap_hwmod.h"</div><div class='del'>-#include "omap_device.h"</div><div class='del'>-#include "omap-pm.h"</div><div class='del'>-#include "soc.h"</div><div class='del'>-#include "prm2xxx_3xxx.h"</div><div class='del'>-#include "pm.h"</div><div class='del'>-#include "cm2xxx_3xxx.h"</div><div class='del'>-#include "prm-regbits-34xx.h"</div><div class='del'>-#include "control.h"</div><div class='del'>-#include "mux.h"</div><div class='del'>-#include "serial.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NOTE: By default the serial auto_suspend timeout is disabled as it causes</div><div class='del'>- * lost characters over the serial ports. This means that the UART clocks will</div><div class='del'>- * stay on until power/autosuspend_delay is set for the uart from sysfs.</div><div class='del'>- * This also causes that any deeper omap sleep states are blocked.</div><div class='del'>- */</div><div class='del'>-#define DEFAULT_AUTOSUSPEND_DELAY	-1</div><div class='del'>-</div><div class='del'>-#define MAX_UART_HWMOD_NAME_LEN		16</div><div class='del'>-</div><div class='del'>-struct omap_uart_state {</div><div class='del'>-	int num;</div><div class='del'>-</div><div class='del'>-	struct list_head node;</div><div class='del'>-	struct omap_hwmod *oh;</div><div class='del'>-	struct omap_device_pad default_omap_uart_pads[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static LIST_HEAD(uart_list);</div><div class='del'>-static u8 num_uarts;</div><div class='del'>-static u8 console_uart_id = -1;</div><div class='del'>-static u8 uart_debug;</div><div class='del'>-</div><div class='del'>-#define DEFAULT_RXDMA_POLLRATE		1	/* RX DMA polling rate (us) */</div><div class='del'>-#define DEFAULT_RXDMA_BUFSIZE		4096	/* RX DMA buffer size */</div><div class='del'>-#define DEFAULT_RXDMA_TIMEOUT		(3 * HZ)/* RX DMA timeout (jiffies) */</div><div class='del'>-</div><div class='del'>-static struct omap_uart_port_info omap_serial_default_info[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.dma_enabled	= false,</div><div class='del'>-		.dma_rx_buf_size = DEFAULT_RXDMA_BUFSIZE,</div><div class='del'>-		.dma_rx_poll_rate = DEFAULT_RXDMA_POLLRATE,</div><div class='del'>-		.dma_rx_timeout = DEFAULT_RXDMA_TIMEOUT,</div><div class='del'>-		.autosuspend_timeout = DEFAULT_AUTOSUSPEND_DELAY,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static void omap_uart_enable_wakeup(struct device *dev, bool enable)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct omap_device *od = to_omap_device(pdev);</div><div class='del'>-</div><div class='del'>-	if (!od)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (enable)</div><div class='del'>-		omap_hwmod_enable_wakeup(od-&gt;hwmods[0]);</div><div class='del'>-	else</div><div class='del'>-		omap_hwmod_disable_wakeup(od-&gt;hwmods[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-static void omap_uart_enable_wakeup(struct device *dev, bool enable)</div><div class='del'>-{}</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_OMAP_MUX</div><div class='del'>-</div><div class='del'>-#define OMAP_UART_DEFAULT_PAD_NAME_LEN	28</div><div class='del'>-static char rx_pad_name[OMAP_UART_DEFAULT_PAD_NAME_LEN],</div><div class='del'>-		tx_pad_name[OMAP_UART_DEFAULT_PAD_NAME_LEN] __initdata;</div><div class='del'>-</div><div class='del'>-static void  __init</div><div class='del'>-omap_serial_fill_uart_tx_rx_pads(struct omap_board_data *bdata,</div><div class='del'>-				struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-	uart-&gt;default_omap_uart_pads[0].name = rx_pad_name;</div><div class='del'>-	uart-&gt;default_omap_uart_pads[0].flags = OMAP_DEVICE_PAD_REMUX |</div><div class='del'>-							OMAP_DEVICE_PAD_WAKEUP;</div><div class='del'>-	uart-&gt;default_omap_uart_pads[0].enable = OMAP_PIN_INPUT |</div><div class='del'>-							OMAP_MUX_MODE0;</div><div class='del'>-	uart-&gt;default_omap_uart_pads[0].idle = OMAP_PIN_INPUT | OMAP_MUX_MODE0;</div><div class='del'>-	uart-&gt;default_omap_uart_pads[1].name = tx_pad_name;</div><div class='del'>-	uart-&gt;default_omap_uart_pads[1].enable = OMAP_PIN_OUTPUT |</div><div class='del'>-							OMAP_MUX_MODE0;</div><div class='del'>-	bdata-&gt;pads = uart-&gt;default_omap_uart_pads;</div><div class='del'>-	bdata-&gt;pads_cnt = ARRAY_SIZE(uart-&gt;default_omap_uart_pads);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void  __init omap_serial_check_wakeup(struct omap_board_data *bdata,</div><div class='del'>-						struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-	struct omap_mux_partition *tx_partition = NULL, *rx_partition = NULL;</div><div class='del'>-	struct omap_mux *rx_mux = NULL, *tx_mux = NULL;</div><div class='del'>-	char *rx_fmt, *tx_fmt;</div><div class='del'>-	int uart_nr = bdata-&gt;id + 1;</div><div class='del'>-</div><div class='del'>-	if (bdata-&gt;id != 2) {</div><div class='del'>-		rx_fmt = "uart%d_rx.uart%d_rx";</div><div class='del'>-		tx_fmt = "uart%d_tx.uart%d_tx";</div><div class='del'>-	} else {</div><div class='del'>-		rx_fmt = "uart%d_rx_irrx.uart%d_rx_irrx";</div><div class='del'>-		tx_fmt = "uart%d_tx_irtx.uart%d_tx_irtx";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snprintf(rx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, rx_fmt,</div><div class='del'>-			uart_nr, uart_nr);</div><div class='del'>-	snprintf(tx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, tx_fmt,</div><div class='del'>-			uart_nr, uart_nr);</div><div class='del'>-</div><div class='del'>-	if (omap_mux_get_by_name(rx_pad_name, &amp;rx_partition, &amp;rx_mux) &gt;= 0 &amp;&amp;</div><div class='del'>-			omap_mux_get_by_name</div><div class='del'>-				(tx_pad_name, &amp;tx_partition, &amp;tx_mux) &gt;= 0) {</div><div class='del'>-		u16 tx_mode, rx_mode;</div><div class='del'>-</div><div class='del'>-		tx_mode = omap_mux_read(tx_partition, tx_mux-&gt;reg_offset);</div><div class='del'>-		rx_mode = omap_mux_read(rx_partition, rx_mux-&gt;reg_offset);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Check if uart is used in default tx/rx mode i.e. in mux mode0</div><div class='del'>-		 * if yes then configure rx pin for wake up capability</div><div class='del'>-		 */</div><div class='del'>-		if (OMAP_MODE_UART(rx_mode) &amp;&amp; OMAP_MODE_UART(tx_mode))</div><div class='del'>-			omap_serial_fill_uart_tx_rx_pads(bdata, uart);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static void __init omap_serial_check_wakeup(struct omap_board_data *bdata,</div><div class='del'>-		struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static char *cmdline_find_option(char *str)</div><div class='del'>-{</div><div class='del'>-	extern char *saved_command_line;</div><div class='del'>-</div><div class='del'>-	return strstr(saved_command_line, str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init omap_serial_early_init(void)</div><div class='del'>-{</div><div class='del'>-	if (of_have_populated_dt())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		char oh_name[MAX_UART_HWMOD_NAME_LEN];</div><div class='del'>-		struct omap_hwmod *oh;</div><div class='del'>-		struct omap_uart_state *uart;</div><div class='del'>-		char uart_name[MAX_UART_HWMOD_NAME_LEN];</div><div class='del'>-</div><div class='del'>-		snprintf(oh_name, MAX_UART_HWMOD_NAME_LEN,</div><div class='del'>-			 "uart%d", num_uarts + 1);</div><div class='del'>-		oh = omap_hwmod_lookup(oh_name);</div><div class='del'>-		if (!oh)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		uart = kzalloc(sizeof(struct omap_uart_state), GFP_KERNEL);</div><div class='del'>-		if (WARN_ON(!uart))</div><div class='del'>-			return -ENODEV;</div><div class='del'>-</div><div class='del'>-		uart-&gt;oh = oh;</div><div class='del'>-		uart-&gt;num = num_uarts++;</div><div class='del'>-		list_add_tail(&amp;uart-&gt;node, &amp;uart_list);</div><div class='del'>-		snprintf(uart_name, MAX_UART_HWMOD_NAME_LEN,</div><div class='del'>-				"%s%d", OMAP_SERIAL_NAME, uart-&gt;num);</div><div class='del'>-</div><div class='del'>-		if (cmdline_find_option(uart_name)) {</div><div class='del'>-			console_uart_id = uart-&gt;num;</div><div class='del'>-</div><div class='del'>-			if (console_loglevel &gt;= CONSOLE_LOGLEVEL_DEBUG) {</div><div class='del'>-				uart_debug = true;</div><div class='del'>-				pr_info("%s used as console in debug mode: uart%d clocks will not be gated",</div><div class='del'>-					uart_name, uart-&gt;num);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-omap_postcore_initcall(omap_serial_early_init);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_serial_init_port() - initialize single serial port</div><div class='del'>- * @bdata: port specific board data pointer</div><div class='del'>- * @info: platform specific data pointer</div><div class='del'>- *</div><div class='del'>- * This function initialies serial driver for given port only.</div><div class='del'>- * Platforms can call this function instead of omap_serial_init()</div><div class='del'>- * if they don't plan to use all available UARTs as serial ports.</div><div class='del'>- *</div><div class='del'>- * Don't mix calls to omap_serial_init_port() and omap_serial_init(),</div><div class='del'>- * use only one of the two.</div><div class='del'>- */</div><div class='del'>-void __init omap_serial_init_port(struct omap_board_data *bdata,</div><div class='del'>-			struct omap_uart_port_info *info)</div><div class='del'>-{</div><div class='del'>-	struct omap_uart_state *uart;</div><div class='del'>-	struct omap_hwmod *oh;</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-	void *pdata = NULL;</div><div class='del'>-	u32 pdata_size = 0;</div><div class='del'>-	char *name;</div><div class='del'>-	struct omap_uart_port_info omap_up;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!bdata))</div><div class='del'>-		return;</div><div class='del'>-	if (WARN_ON(bdata-&gt;id &lt; 0))</div><div class='del'>-		return;</div><div class='del'>-	if (WARN_ON(bdata-&gt;id &gt;= num_uarts))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(uart, &amp;uart_list, node)</div><div class='del'>-		if (bdata-&gt;id == uart-&gt;num)</div><div class='del'>-			break;</div><div class='del'>-	if (!info)</div><div class='del'>-		info = omap_serial_default_info;</div><div class='del'>-</div><div class='del'>-	oh = uart-&gt;oh;</div><div class='del'>-	name = OMAP_SERIAL_DRIVER_NAME;</div><div class='del'>-</div><div class='del'>-	omap_up.dma_enabled = info-&gt;dma_enabled;</div><div class='del'>-	omap_up.uartclk = OMAP24XX_BASE_BAUD * 16;</div><div class='del'>-	omap_up.flags = UPF_BOOT_AUTOCONF;</div><div class='del'>-	omap_up.get_context_loss_count = omap_pm_get_dev_context_loss_count;</div><div class='del'>-	omap_up.enable_wakeup = omap_uart_enable_wakeup;</div><div class='del'>-	omap_up.dma_rx_buf_size = info-&gt;dma_rx_buf_size;</div><div class='del'>-	omap_up.dma_rx_timeout = info-&gt;dma_rx_timeout;</div><div class='del'>-	omap_up.dma_rx_poll_rate = info-&gt;dma_rx_poll_rate;</div><div class='del'>-	omap_up.autosuspend_timeout = info-&gt;autosuspend_timeout;</div><div class='del'>-</div><div class='del'>-	pdata = &amp;omap_up;</div><div class='del'>-	pdata_size = sizeof(struct omap_uart_port_info);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!oh))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pdev = omap_device_build(name, uart-&gt;num, oh, pdata, pdata_size);</div><div class='del'>-	if (IS_ERR(pdev)) {</div><div class='del'>-		WARN(1, "Could not build omap_device for %s: %s.\n", name,</div><div class='del'>-		     oh-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	oh-&gt;mux = omap_hwmod_mux_init(bdata-&gt;pads, bdata-&gt;pads_cnt);</div><div class='del'>-</div><div class='del'>-	if (console_uart_id == bdata-&gt;id) {</div><div class='del'>-		omap_device_enable(pdev);</div><div class='del'>-		pm_runtime_set_active(&amp;pdev-&gt;dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	oh-&gt;dev_attr = uart;</div><div class='del'>-</div><div class='del'>-	if (((cpu_is_omap34xx() || cpu_is_omap44xx()) &amp;&amp; bdata-&gt;pads)</div><div class='del'>-			&amp;&amp; !uart_debug)</div><div class='del'>-		device_init_wakeup(&amp;pdev-&gt;dev, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_serial_board_init() - initialize all supported serial ports</div><div class='del'>- * @info: platform specific data pointer</div><div class='del'>- *</div><div class='del'>- * Initializes all available UARTs as serial ports. Platforms</div><div class='del'>- * can call this function when they want to have default behaviour</div><div class='del'>- * for serial ports (e.g initialize them all as serial ports).</div><div class='del'>- */</div><div class='del'>-void __init omap_serial_board_init(struct omap_uart_port_info *info)</div><div class='del'>-{</div><div class='del'>-	struct omap_uart_state *uart;</div><div class='del'>-	struct omap_board_data bdata;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(uart, &amp;uart_list, node) {</div><div class='del'>-		bdata.id = uart-&gt;num;</div><div class='del'>-		bdata.flags = 0;</div><div class='del'>-		bdata.pads = NULL;</div><div class='del'>-		bdata.pads_cnt = 0;</div><div class='del'>-</div><div class='del'>-		omap_serial_check_wakeup(&amp;bdata, uart);</div><div class='del'>-</div><div class='del'>-		if (!info)</div><div class='del'>-			omap_serial_init_port(&amp;bdata, NULL);</div><div class='del'>-		else</div><div class='del'>-			omap_serial_init_port(&amp;bdata, &amp;info[uart-&gt;num]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_serial_init() - initialize all supported serial ports</div><div class='del'>- *</div><div class='del'>- * Initializes all available UARTs.</div><div class='del'>- * Platforms can call this function when they want to have default behaviour</div><div class='del'>- * for serial ports (e.g initialize them all as serial ports).</div><div class='del'>- */</div><div class='del'>-void __init omap_serial_init(void)</div><div class='del'>-{</div><div class='del'>-	omap_serial_board_init(NULL);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c<br/>index 5e2e2218a402..07dd692c4737 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/timer.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/timer.c</a></div><div class='hunk'>@@ -369,9 +369,9 @@ static bool use_gptimer_clksrc __initdata;</div><div class='ctx'> /*</div><div class='ctx'>  * clocksource</div><div class='ctx'>  */</div><div class='del'>-static cycle_t clocksource_read_cycles(struct clocksource *cs)</div><div class='add'>+static u64 clocksource_read_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)__omap_dm_timer_read_counter(&amp;clksrc,</div><div class='add'>+	return (u64)__omap_dm_timer_read_counter(&amp;clksrc,</div><div class='ctx'> 						     OMAP_TIMER_NONPOSTED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -510,18 +510,19 @@ void __init omap3_secure_sync32k_timer_init(void)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_ARCH_OMAP3 */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX)</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || \</div><div class='add'>+	defined(CONFIG_SOC_AM43XX)</div><div class='ctx'> void __init omap3_gptimer_timer_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	__omap_sync32k_timer_init(2, "timer_sys_ck", NULL,</div><div class='ctx'> 			1, "timer_sys_ck", "ti,timer-alwon", true);</div><div class='del'>-</div><div class='del'>-	clocksource_probe();</div><div class='add'>+	if (of_have_populated_dt())</div><div class='add'>+		clocksource_probe();</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) ||		\</div><div class='del'>-	defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)</div><div class='add'>+	defined(CONFIG_SOC_DRA7XX)</div><div class='ctx'> static void __init omap4_sync32k_timer_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",</div><div class='head'>diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c<br/>deleted file mode 100644<br/>index a72738eab009..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/twl-common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/twl-common.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,564 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * twl-common.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2011 Texas Instruments, Inc..</div><div class='del'>- * Author: Peter Ujfalusi &lt;peter.ujfalusi@ti.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * version 2 as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA</div><div class='del'>- * 02110-1301 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/i2c/twl.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/phy/phy.h&gt;</div><div class='del'>-#include &lt;linux/regulator/machine.h&gt;</div><div class='del'>-#include &lt;linux/regulator/fixed.h&gt;</div><div class='del'>-</div><div class='del'>-#include "soc.h"</div><div class='del'>-#include "twl-common.h"</div><div class='del'>-#include "pm.h"</div><div class='del'>-#include "voltage.h"</div><div class='del'>-#include "mux.h"</div><div class='del'>-</div><div class='del'>-static struct i2c_board_info __initdata pmic_i2c_board_info = {</div><div class='del'>-	.addr		= 0x48,</div><div class='del'>-	.flags		= I2C_CLIENT_WAKE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)</div><div class='del'>-static int twl_set_voltage(void *data, int target_uV)</div><div class='del'>-{</div><div class='del'>-	struct voltagedomain *voltdm = (struct voltagedomain *)data;</div><div class='del'>-	return voltdm_scale(voltdm, target_uV);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int twl_get_voltage(void *data)</div><div class='del'>-{</div><div class='del'>-	struct voltagedomain *voltdm = (struct voltagedomain *)data;</div><div class='del'>-	return voltdm_get_voltage(voltdm);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void __init omap_pmic_init(int bus, u32 clkrate,</div><div class='del'>-			   const char *pmic_type, int pmic_irq,</div><div class='del'>-			   struct twl4030_platform_data *pmic_data)</div><div class='del'>-{</div><div class='del'>-	omap_mux_init_signal("sys_nirq", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE);</div><div class='del'>-	strlcpy(pmic_i2c_board_info.type, pmic_type,</div><div class='del'>-		sizeof(pmic_i2c_board_info.type));</div><div class='del'>-	pmic_i2c_board_info.irq = pmic_irq;</div><div class='del'>-	pmic_i2c_board_info.platform_data = pmic_data;</div><div class='del'>-</div><div class='del'>-	omap_register_i2c_bus(bus, clkrate, &amp;pmic_i2c_board_info, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP4</div><div class='del'>-void __init omap4_pmic_init(const char *pmic_type,</div><div class='del'>-		    struct twl4030_platform_data *pmic_data,</div><div class='del'>-		    struct i2c_board_info *devices, int nr_devices)</div><div class='del'>-{</div><div class='del'>-	/* PMIC part*/</div><div class='del'>-	unsigned int irq;</div><div class='del'>-</div><div class='del'>-	omap_mux_init_signal("sys_nirq1", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE);</div><div class='del'>-	omap_mux_init_signal("fref_clk0_out.sys_drm_msecure", OMAP_PIN_OUTPUT);</div><div class='del'>-	irq = omap4_xlate_irq(7 + OMAP44XX_IRQ_GIC_START);</div><div class='del'>-	omap_pmic_init(1, 400, pmic_type, irq, pmic_data);</div><div class='del'>-</div><div class='del'>-	/* Register additional devices on i2c1 bus if needed */</div><div class='del'>-	if (devices)</div><div class='del'>-		i2c_register_board_info(1, devices, nr_devices);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void __init omap_pmic_late_init(void)</div><div class='del'>-{</div><div class='del'>-	/* Init the OMAP TWL parameters (if PMIC has been registerd) */</div><div class='del'>-	if (!pmic_i2c_board_info.irq)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	omap3_twl_init();</div><div class='del'>-	omap4_twl_init();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_ARCH_OMAP3)</div><div class='del'>-static struct twl4030_usb_data omap3_usb_pdata = {</div><div class='del'>-	.usb_mode = T2_USB_MODE_ULPI,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int omap3_batt_table[] = {</div><div class='del'>-/* 0 C */</div><div class='del'>-30800, 29500, 28300, 27100,</div><div class='del'>-26000, 24900, 23900, 22900, 22000, 21100, 20300, 19400, 18700, 17900,</div><div class='del'>-17200, 16500, 15900, 15300, 14700, 14100, 13600, 13100, 12600, 12100,</div><div class='del'>-11600, 11200, 10800, 10400, 10000, 9630,  9280,  8950,  8620,  8310,</div><div class='del'>-8020,  7730,  7460,  7200,  6950,  6710,  6470,  6250,  6040,  5830,</div><div class='del'>-5640,  5450,  5260,  5090,  4920,  4760,  4600,  4450,  4310,  4170,</div><div class='del'>-4040,  3910,  3790,  3670,  3550</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct twl4030_bci_platform_data omap3_bci_pdata = {</div><div class='del'>-	.battery_tmp_tbl	= omap3_batt_table,</div><div class='del'>-	.tblsize		= ARRAY_SIZE(omap3_batt_table),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct twl4030_madc_platform_data omap3_madc_pdata = {</div><div class='del'>-	.irq_line	= 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct twl4030_codec_data omap3_codec;</div><div class='del'>-</div><div class='del'>-static struct twl4030_audio_data omap3_audio_pdata = {</div><div class='del'>-	.audio_mclk = 26000000,</div><div class='del'>-	.codec = &amp;omap3_codec,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap3_vdda_dac_supplies[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap3_vdac_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV			= 1800000,</div><div class='del'>-		.max_uV			= 1800000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies	= ARRAY_SIZE(omap3_vdda_dac_supplies),</div><div class='del'>-	.consumer_supplies	= omap3_vdda_dac_supplies,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap3_vpll2_supplies[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),</div><div class='del'>-	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dpi.0"),</div><div class='del'>-	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.0"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap3_vpll2_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV                 = 1800000,</div><div class='del'>-		.max_uV                 = 1800000,</div><div class='del'>-		.valid_modes_mask       = REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask         = REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies		= ARRAY_SIZE(omap3_vpll2_supplies),</div><div class='del'>-	.consumer_supplies		= omap3_vpll2_supplies,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap3_vdd1_supply[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vcc", "cpu0"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap3_vdd2_supply[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vcc", "l3_main.0"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap3_vdd1 = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.name			= "vdd_mpu_iva",</div><div class='del'>-		.min_uV			= 600000,</div><div class='del'>-		.max_uV			= 1450000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies		= ARRAY_SIZE(omap3_vdd1_supply),</div><div class='del'>-	.consumer_supplies		= omap3_vdd1_supply,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap3_vdd2 = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.name			= "vdd_core",</div><div class='del'>-		.min_uV			= 600000,</div><div class='del'>-		.max_uV			= 1450000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies		= ARRAY_SIZE(omap3_vdd2_supply),</div><div class='del'>-	.consumer_supplies		= omap3_vdd2_supply,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct twl_regulator_driver_data omap3_vdd1_drvdata = {</div><div class='del'>-	.get_voltage = twl_get_voltage,</div><div class='del'>-	.set_voltage = twl_set_voltage,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct twl_regulator_driver_data omap3_vdd2_drvdata = {</div><div class='del'>-	.get_voltage = twl_get_voltage,</div><div class='del'>-	.set_voltage = twl_set_voltage,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,</div><div class='del'>-				  u32 pdata_flags, u32 regulators_flags)</div><div class='del'>-{</div><div class='del'>-	if (!pmic_data-&gt;vdd1) {</div><div class='del'>-		omap3_vdd1.driver_data = &amp;omap3_vdd1_drvdata;</div><div class='del'>-		omap3_vdd1_drvdata.data = voltdm_lookup("mpu_iva");</div><div class='del'>-		pmic_data-&gt;vdd1 = &amp;omap3_vdd1;</div><div class='del'>-	}</div><div class='del'>-	if (!pmic_data-&gt;vdd2) {</div><div class='del'>-		omap3_vdd2.driver_data = &amp;omap3_vdd2_drvdata;</div><div class='del'>-		omap3_vdd2_drvdata.data = voltdm_lookup("core");</div><div class='del'>-		pmic_data-&gt;vdd2 = &amp;omap3_vdd2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Common platform data configurations */</div><div class='del'>-	if (pdata_flags &amp; TWL_COMMON_PDATA_USB &amp;&amp; !pmic_data-&gt;usb)</div><div class='del'>-		pmic_data-&gt;usb = &amp;omap3_usb_pdata;</div><div class='del'>-</div><div class='del'>-	if (pdata_flags &amp; TWL_COMMON_PDATA_BCI &amp;&amp; !pmic_data-&gt;bci)</div><div class='del'>-		pmic_data-&gt;bci = &amp;omap3_bci_pdata;</div><div class='del'>-</div><div class='del'>-	if (pdata_flags &amp; TWL_COMMON_PDATA_MADC &amp;&amp; !pmic_data-&gt;madc)</div><div class='del'>-		pmic_data-&gt;madc = &amp;omap3_madc_pdata;</div><div class='del'>-</div><div class='del'>-	if (pdata_flags &amp; TWL_COMMON_PDATA_AUDIO &amp;&amp; !pmic_data-&gt;audio)</div><div class='del'>-		pmic_data-&gt;audio = &amp;omap3_audio_pdata;</div><div class='del'>-</div><div class='del'>-	/* Common regulator configurations */</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_VDAC &amp;&amp; !pmic_data-&gt;vdac)</div><div class='del'>-		pmic_data-&gt;vdac = &amp;omap3_vdac_idata;</div><div class='del'>-</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_VPLL2 &amp;&amp; !pmic_data-&gt;vpll2)</div><div class='del'>-		pmic_data-&gt;vpll2 = &amp;omap3_vpll2_idata;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_ARCH_OMAP3 */</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_ARCH_OMAP4)</div><div class='del'>-static struct twl4030_usb_data omap4_usb_pdata = {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap4_vdda_hdmi_dac_supplies[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vdda_hdmi_dac", "omapdss_hdmi"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_vdac_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV			= 1800000,</div><div class='del'>-		.max_uV			= 1800000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies	= ARRAY_SIZE(omap4_vdda_hdmi_dac_supplies),</div><div class='del'>-	.consumer_supplies	= omap4_vdda_hdmi_dac_supplies,</div><div class='del'>-	.supply_regulator	= "V2V1",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_vaux2_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV			= 1200000,</div><div class='del'>-		.max_uV			= 2800000,</div><div class='del'>-		.apply_uV		= true,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE</div><div class='del'>-					| REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_vaux3_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV			= 1000000,</div><div class='del'>-		.max_uV			= 3000000,</div><div class='del'>-		.apply_uV		= true,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE</div><div class='del'>-					| REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap4_vmmc_supply[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* VMMC1 for MMC1 card */</div><div class='del'>-static struct regulator_init_data omap4_vmmc_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV			= 1200000,</div><div class='del'>-		.max_uV			= 3000000,</div><div class='del'>-		.apply_uV		= true,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE</div><div class='del'>-					| REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies  = ARRAY_SIZE(omap4_vmmc_supply),</div><div class='del'>-	.consumer_supplies      = omap4_vmmc_supply,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_vpp_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV			= 1800000,</div><div class='del'>-		.max_uV			= 2500000,</div><div class='del'>-		.apply_uV		= true,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE</div><div class='del'>-					| REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_vana_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV			= 2100000,</div><div class='del'>-		.max_uV			= 2100000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap4_vcxio_supply[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dss"),</div><div class='del'>-	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.0"),</div><div class='del'>-	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.1"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_vcxio_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV			= 1800000,</div><div class='del'>-		.max_uV			= 1800000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-		.always_on		= true,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies	= ARRAY_SIZE(omap4_vcxio_supply),</div><div class='del'>-	.consumer_supplies	= omap4_vcxio_supply,</div><div class='del'>-	.supply_regulator	= "V2V1",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_vusb_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV			= 3300000,</div><div class='del'>-		.max_uV			= 3300000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_clk32kg_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap4_vdd1_supply[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vcc", "cpu0"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap4_vdd2_supply[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vcc", "iva.0"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap4_vdd3_supply[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vcc", "l3_main.0"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_vdd1 = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.name			= "vdd_mpu",</div><div class='del'>-		.min_uV			= 500000,</div><div class='del'>-		.max_uV			= 1500000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies		= ARRAY_SIZE(omap4_vdd1_supply),</div><div class='del'>-	.consumer_supplies		= omap4_vdd1_supply,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_vdd2 = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.name			= "vdd_iva",</div><div class='del'>-		.min_uV			= 500000,</div><div class='del'>-		.max_uV			= 1500000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies		= ARRAY_SIZE(omap4_vdd2_supply),</div><div class='del'>-	.consumer_supplies		= omap4_vdd2_supply,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_vdd3 = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.name			= "vdd_core",</div><div class='del'>-		.min_uV			= 500000,</div><div class='del'>-		.max_uV			= 1500000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies		= ARRAY_SIZE(omap4_vdd3_supply),</div><div class='del'>-	.consumer_supplies		= omap4_vdd3_supply,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct twl_regulator_driver_data omap4_vdd1_drvdata = {</div><div class='del'>-	.get_voltage = twl_get_voltage,</div><div class='del'>-	.set_voltage = twl_set_voltage,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct twl_regulator_driver_data omap4_vdd2_drvdata = {</div><div class='del'>-	.get_voltage = twl_get_voltage,</div><div class='del'>-	.set_voltage = twl_set_voltage,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct twl_regulator_driver_data omap4_vdd3_drvdata = {</div><div class='del'>-	.get_voltage = twl_get_voltage,</div><div class='del'>-	.set_voltage = twl_set_voltage,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap4_v1v8_supply[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vio", "1-004b"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_v1v8_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV			= 1800000,</div><div class='del'>-		.max_uV			= 1800000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-		.always_on		= true,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies	= ARRAY_SIZE(omap4_v1v8_supply),</div><div class='del'>-	.consumer_supplies	= omap4_v1v8_supply,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_consumer_supply omap4_v2v1_supply[] = {</div><div class='del'>-	REGULATOR_SUPPLY("v2v1", "1-004b"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regulator_init_data omap4_v2v1_idata = {</div><div class='del'>-	.constraints = {</div><div class='del'>-		.min_uV			= 2100000,</div><div class='del'>-		.max_uV			= 2100000,</div><div class='del'>-		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='del'>-					| REGULATOR_MODE_STANDBY,</div><div class='del'>-		.valid_ops_mask		= REGULATOR_CHANGE_MODE</div><div class='del'>-					| REGULATOR_CHANGE_STATUS,</div><div class='del'>-	},</div><div class='del'>-	.num_consumer_supplies	= ARRAY_SIZE(omap4_v2v1_supply),</div><div class='del'>-	.consumer_supplies	= omap4_v2v1_supply,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,</div><div class='del'>-				  u32 pdata_flags, u32 regulators_flags)</div><div class='del'>-{</div><div class='del'>-	if (!pmic_data-&gt;vdd1) {</div><div class='del'>-		omap4_vdd1.driver_data = &amp;omap4_vdd1_drvdata;</div><div class='del'>-		omap4_vdd1_drvdata.data = voltdm_lookup("mpu");</div><div class='del'>-		pmic_data-&gt;vdd1 = &amp;omap4_vdd1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!pmic_data-&gt;vdd2) {</div><div class='del'>-		omap4_vdd2.driver_data = &amp;omap4_vdd2_drvdata;</div><div class='del'>-		omap4_vdd2_drvdata.data = voltdm_lookup("iva");</div><div class='del'>-		pmic_data-&gt;vdd2 = &amp;omap4_vdd2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!pmic_data-&gt;vdd3) {</div><div class='del'>-		omap4_vdd3.driver_data = &amp;omap4_vdd3_drvdata;</div><div class='del'>-		omap4_vdd3_drvdata.data = voltdm_lookup("core");</div><div class='del'>-		pmic_data-&gt;vdd3 = &amp;omap4_vdd3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Common platform data configurations */</div><div class='del'>-	if (pdata_flags &amp; TWL_COMMON_PDATA_USB &amp;&amp; !pmic_data-&gt;usb)</div><div class='del'>-		pmic_data-&gt;usb = &amp;omap4_usb_pdata;</div><div class='del'>-</div><div class='del'>-	/* Common regulator configurations */</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_VDAC &amp;&amp; !pmic_data-&gt;vdac)</div><div class='del'>-		pmic_data-&gt;vdac = &amp;omap4_vdac_idata;</div><div class='del'>-</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_VAUX2 &amp;&amp; !pmic_data-&gt;vaux2)</div><div class='del'>-		pmic_data-&gt;vaux2 = &amp;omap4_vaux2_idata;</div><div class='del'>-</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_VAUX3 &amp;&amp; !pmic_data-&gt;vaux3)</div><div class='del'>-		pmic_data-&gt;vaux3 = &amp;omap4_vaux3_idata;</div><div class='del'>-</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_VMMC &amp;&amp; !pmic_data-&gt;vmmc)</div><div class='del'>-		pmic_data-&gt;vmmc = &amp;omap4_vmmc_idata;</div><div class='del'>-</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_VPP &amp;&amp; !pmic_data-&gt;vpp)</div><div class='del'>-		pmic_data-&gt;vpp = &amp;omap4_vpp_idata;</div><div class='del'>-</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_VANA &amp;&amp; !pmic_data-&gt;vana)</div><div class='del'>-		pmic_data-&gt;vana = &amp;omap4_vana_idata;</div><div class='del'>-</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_VCXIO &amp;&amp; !pmic_data-&gt;vcxio)</div><div class='del'>-		pmic_data-&gt;vcxio = &amp;omap4_vcxio_idata;</div><div class='del'>-</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_VUSB &amp;&amp; !pmic_data-&gt;vusb)</div><div class='del'>-		pmic_data-&gt;vusb = &amp;omap4_vusb_idata;</div><div class='del'>-</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_CLK32KG &amp;&amp;</div><div class='del'>-	    !pmic_data-&gt;clk32kg)</div><div class='del'>-		pmic_data-&gt;clk32kg = &amp;omap4_clk32kg_idata;</div><div class='del'>-</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_V1V8 &amp;&amp; !pmic_data-&gt;v1v8)</div><div class='del'>-		pmic_data-&gt;v1v8 = &amp;omap4_v1v8_idata;</div><div class='del'>-</div><div class='del'>-	if (regulators_flags &amp; TWL_COMMON_REGULATOR_V2V1 &amp;&amp; !pmic_data-&gt;v2v1)</div><div class='del'>-		pmic_data-&gt;v2v1 = &amp;omap4_v2v1_idata;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_ARCH_OMAP4 */</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_SND_OMAP_SOC_OMAP_TWL4030)</div><div class='del'>-#include &lt;linux/platform_data/omap-twl4030.h&gt;</div><div class='del'>-</div><div class='del'>-/* Commonly used configuration */</div><div class='del'>-static struct omap_tw4030_pdata omap_twl4030_audio_data;</div><div class='del'>-</div><div class='del'>-static struct platform_device audio_device = {</div><div class='del'>-	.name		= "omap-twl4030",</div><div class='del'>-	.id		= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void omap_twl4030_audio_init(char *card_name,</div><div class='del'>-				    struct omap_tw4030_pdata *pdata)</div><div class='del'>-{</div><div class='del'>-	if (!pdata)</div><div class='del'>-		pdata = &amp;omap_twl4030_audio_data;</div><div class='del'>-</div><div class='del'>-	pdata-&gt;card_name = card_name;</div><div class='del'>-</div><div class='del'>-	audio_device.dev.platform_data = pdata;</div><div class='del'>-	platform_device_register(&amp;audio_device);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* SOC_OMAP_TWL4030 */</div><div class='del'>-void omap_twl4030_audio_init(char *card_name,</div><div class='del'>-				    struct omap_tw4030_pdata *pdata)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-#endif /* SOC_OMAP_TWL4030 */</div><div class='head'>diff --git a/arch/arm/mach-omap2/twl-common.h b/arch/arm/mach-omap2/twl-common.h<br/>deleted file mode 100644<br/>index 24b65d081b69..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/twl-common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/twl-common.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-#ifndef __OMAP_PMIC_COMMON__</div><div class='del'>-#define __OMAP_PMIC_COMMON__</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-</div><div class='del'>-#define TWL_COMMON_PDATA_USB		(1 &lt;&lt; 0)</div><div class='del'>-#define TWL_COMMON_PDATA_BCI		(1 &lt;&lt; 1)</div><div class='del'>-#define TWL_COMMON_PDATA_MADC		(1 &lt;&lt; 2)</div><div class='del'>-#define TWL_COMMON_PDATA_AUDIO		(1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-/* Common LDO regulators for TWL4030/TWL6030 */</div><div class='del'>-#define TWL_COMMON_REGULATOR_VDAC	(1 &lt;&lt; 0)</div><div class='del'>-#define TWL_COMMON_REGULATOR_VAUX1	(1 &lt;&lt; 1)</div><div class='del'>-#define TWL_COMMON_REGULATOR_VAUX2	(1 &lt;&lt; 2)</div><div class='del'>-#define TWL_COMMON_REGULATOR_VAUX3	(1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-/* TWL6030 LDO regulators */</div><div class='del'>-#define TWL_COMMON_REGULATOR_VMMC	(1 &lt;&lt; 4)</div><div class='del'>-#define TWL_COMMON_REGULATOR_VPP	(1 &lt;&lt; 5)</div><div class='del'>-#define TWL_COMMON_REGULATOR_VUSIM	(1 &lt;&lt; 6)</div><div class='del'>-#define TWL_COMMON_REGULATOR_VANA	(1 &lt;&lt; 7)</div><div class='del'>-#define TWL_COMMON_REGULATOR_VCXIO	(1 &lt;&lt; 8)</div><div class='del'>-#define TWL_COMMON_REGULATOR_VUSB	(1 &lt;&lt; 9)</div><div class='del'>-#define TWL_COMMON_REGULATOR_CLK32KG	(1 &lt;&lt; 10)</div><div class='del'>-#define TWL_COMMON_REGULATOR_V1V8	(1 &lt;&lt; 11)</div><div class='del'>-#define TWL_COMMON_REGULATOR_V2V1	(1 &lt;&lt; 12)</div><div class='del'>-</div><div class='del'>-/* TWL4030 LDO regulators */</div><div class='del'>-#define TWL_COMMON_REGULATOR_VPLL1	(1 &lt;&lt; 4)</div><div class='del'>-#define TWL_COMMON_REGULATOR_VPLL2	(1 &lt;&lt; 5)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct twl4030_platform_data;</div><div class='del'>-struct twl6040_platform_data;</div><div class='del'>-struct omap_tw4030_pdata;</div><div class='del'>-struct i2c_board_info;</div><div class='del'>-</div><div class='del'>-void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq,</div><div class='del'>-		    struct twl4030_platform_data *pmic_data);</div><div class='del'>-void omap_pmic_late_init(void);</div><div class='del'>-</div><div class='del'>-static inline void omap2_pmic_init(const char *pmic_type,</div><div class='del'>-				   struct twl4030_platform_data *pmic_data)</div><div class='del'>-{</div><div class='del'>-	omap_pmic_init(2, 2600, pmic_type, 7 + OMAP_INTC_START, pmic_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void omap3_pmic_init(const char *pmic_type,</div><div class='del'>-				   struct twl4030_platform_data *pmic_data)</div><div class='del'>-{</div><div class='del'>-	omap_pmic_init(1, 2600, pmic_type, 7 + OMAP_INTC_START, pmic_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void omap4_pmic_init(const char *pmic_type,</div><div class='del'>-		    struct twl4030_platform_data *pmic_data,</div><div class='del'>-		    struct i2c_board_info *devices, int nr_devices);</div><div class='del'>-</div><div class='del'>-void omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,</div><div class='del'>-			   u32 pdata_flags, u32 regulators_flags);</div><div class='del'>-</div><div class='del'>-void omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,</div><div class='del'>-			   u32 pdata_flags, u32 regulators_flags);</div><div class='del'>-</div><div class='del'>-void omap_twl4030_audio_init(char *card_name, struct omap_tw4030_pdata *pdata);</div><div class='del'>-</div><div class='del'>-#endif /* __OMAP_PMIC_COMMON__ */</div><div class='head'>diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c<br/>deleted file mode 100644<br/>index 745367c0c2bb..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/usb-host.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/usb-host.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,496 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * usb-host.c - OMAP USB Host</div><div class='del'>- *</div><div class='del'>- * This file will contain the board specific details for the</div><div class='del'>- * Synopsys EHCI/OHCI host controller on OMAP3430 and onwards</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2007-2011 Texas Instruments</div><div class='del'>- * Author: Vikram Pandita &lt;vikram.pandita@ti.com&gt;</div><div class='del'>- * Author: Keshava Munegowda &lt;keshava_mgowda@ti.com&gt;</div><div class='del'>- *</div><div class='del'>- * Generalization by:</div><div class='del'>- * Felipe Balbi &lt;balbi@ti.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/regulator/machine.h&gt;</div><div class='del'>-#include &lt;linux/regulator/fixed.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/usb/phy.h&gt;</div><div class='del'>-#include &lt;linux/usb/usb_phy_generic.h&gt;</div><div class='del'>-</div><div class='del'>-#include "soc.h"</div><div class='del'>-#include "omap_device.h"</div><div class='del'>-#include "mux.h"</div><div class='del'>-#include "usb.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MFD_OMAP_USB_HOST</div><div class='del'>-</div><div class='del'>-#define OMAP_USBHS_DEVICE	"usbhs_omap"</div><div class='del'>-#define OMAP_USBTLL_DEVICE	"usbhs_tll"</div><div class='del'>-#define	USBHS_UHH_HWMODNAME	"usb_host_hs"</div><div class='del'>-#define USBHS_TLL_HWMODNAME	"usb_tll_hs"</div><div class='del'>-</div><div class='del'>-/* MUX settings for EHCI pins */</div><div class='del'>-/*</div><div class='del'>- * setup_ehci_io_mux - initialize IO pad mux for USBHOST</div><div class='del'>- */</div><div class='del'>-static void __init setup_ehci_io_mux(const enum usbhs_omap_port_mode *port_mode)</div><div class='del'>-{</div><div class='del'>-	switch (port_mode[0]) {</div><div class='del'>-	case OMAP_EHCI_PORT_MODE_PHY:</div><div class='del'>-		omap_mux_init_signal("hsusb1_stp", OMAP_PIN_OUTPUT);</div><div class='del'>-		omap_mux_init_signal("hsusb1_clk", OMAP_PIN_OUTPUT);</div><div class='del'>-		omap_mux_init_signal("hsusb1_dir", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_nxt", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_data0", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_data1", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_data2", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_data3", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_data4", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_data5", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_data6", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_data7", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_EHCI_PORT_MODE_TLL:</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_stp",</div><div class='del'>-			OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_clk",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_dir",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_nxt",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_data0",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_data1",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_data2",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_data3",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_data4",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_data5",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_data6",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb1_tll_data7",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_USBHS_PORT_MODE_UNUSED:</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (port_mode[1]) {</div><div class='del'>-	case OMAP_EHCI_PORT_MODE_PHY:</div><div class='del'>-		omap_mux_init_signal("hsusb2_stp", OMAP_PIN_OUTPUT);</div><div class='del'>-		omap_mux_init_signal("hsusb2_clk", OMAP_PIN_OUTPUT);</div><div class='del'>-		omap_mux_init_signal("hsusb2_dir", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_nxt", OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_data0",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_data1",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_data2",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_data3",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_data4",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_data5",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_data6",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_data7",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_EHCI_PORT_MODE_TLL:</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_stp",</div><div class='del'>-			OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_clk",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_dir",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_nxt",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_data0",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_data1",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_data2",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_data3",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_data4",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_data5",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_data6",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb2_tll_data7",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_USBHS_PORT_MODE_UNUSED:</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (port_mode[2]) {</div><div class='del'>-	case OMAP_EHCI_PORT_MODE_PHY:</div><div class='del'>-		printk(KERN_WARNING "Port3 can't be used in PHY mode\n");</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_EHCI_PORT_MODE_TLL:</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_stp",</div><div class='del'>-			OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_clk",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_dir",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_nxt",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_data0",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_data1",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_data2",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_data3",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_data4",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_data5",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_data6",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("hsusb3_tll_data7",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_USBHS_PORT_MODE_UNUSED:</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init setup_ohci_io_mux(const enum usbhs_omap_port_mode *port_mode)</div><div class='del'>-{</div><div class='del'>-	switch (port_mode[0]) {</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:</div><div class='del'>-		omap_mux_init_signal("mm1_rxdp",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("mm1_rxdm",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:</div><div class='del'>-		omap_mux_init_signal("mm1_rxrcv",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:</div><div class='del'>-		omap_mux_init_signal("mm1_txen_n", OMAP_PIN_OUTPUT);</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:</div><div class='del'>-		omap_mux_init_signal("mm1_txse0",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("mm1_txdat",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_USBHS_PORT_MODE_UNUSED:</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	switch (port_mode[1]) {</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:</div><div class='del'>-		omap_mux_init_signal("mm2_rxdp",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("mm2_rxdm",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:</div><div class='del'>-		omap_mux_init_signal("mm2_rxrcv",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:</div><div class='del'>-		omap_mux_init_signal("mm2_txen_n", OMAP_PIN_OUTPUT);</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:</div><div class='del'>-		omap_mux_init_signal("mm2_txse0",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("mm2_txdat",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_USBHS_PORT_MODE_UNUSED:</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	switch (port_mode[2]) {</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:</div><div class='del'>-		omap_mux_init_signal("mm3_rxdp",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("mm3_rxdm",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:</div><div class='del'>-		omap_mux_init_signal("mm3_rxrcv",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:</div><div class='del'>-		omap_mux_init_signal("mm3_txen_n", OMAP_PIN_OUTPUT);</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:</div><div class='del'>-	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:</div><div class='del'>-		omap_mux_init_signal("mm3_txse0",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		omap_mux_init_signal("mm3_txdat",</div><div class='del'>-			OMAP_PIN_INPUT_PULLDOWN);</div><div class='del'>-		break;</div><div class='del'>-	case OMAP_USBHS_PORT_MODE_UNUSED:</div><div class='del'>-		/* FALLTHROUGH */</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init usbhs_init(struct usbhs_omap_platform_data *pdata)</div><div class='del'>-{</div><div class='del'>-	struct omap_hwmod	*uhh_hwm, *tll_hwm;</div><div class='del'>-	struct platform_device	*pdev;</div><div class='del'>-	int			bus_id = -1;</div><div class='del'>-</div><div class='del'>-	if (cpu_is_omap34xx()) {</div><div class='del'>-		setup_ehci_io_mux(pdata-&gt;port_mode);</div><div class='del'>-		setup_ohci_io_mux(pdata-&gt;port_mode);</div><div class='del'>-</div><div class='del'>-		if (omap_rev() &lt;= OMAP3430_REV_ES2_1)</div><div class='del'>-			pdata-&gt;single_ulpi_bypass = true;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	uhh_hwm = omap_hwmod_lookup(USBHS_UHH_HWMODNAME);</div><div class='del'>-	if (!uhh_hwm) {</div><div class='del'>-		pr_err("Could not look up %s\n", USBHS_UHH_HWMODNAME);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tll_hwm = omap_hwmod_lookup(USBHS_TLL_HWMODNAME);</div><div class='del'>-	if (!tll_hwm) {</div><div class='del'>-		pr_err("Could not look up %s\n", USBHS_TLL_HWMODNAME);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pdev = omap_device_build(OMAP_USBTLL_DEVICE, bus_id, tll_hwm,</div><div class='del'>-				pdata, sizeof(*pdata));</div><div class='del'>-	if (IS_ERR(pdev)) {</div><div class='del'>-		pr_err("Could not build hwmod device %s\n",</div><div class='del'>-		       USBHS_TLL_HWMODNAME);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pdev = omap_device_build(OMAP_USBHS_DEVICE, bus_id, uhh_hwm,</div><div class='del'>-				pdata, sizeof(*pdata));</div><div class='del'>-	if (IS_ERR(pdev)) {</div><div class='del'>-		pr_err("Could not build hwmod devices %s\n",</div><div class='del'>-		       USBHS_UHH_HWMODNAME);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-void __init usbhs_init(struct usbhs_omap_platform_data *pdata)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Template for PHY regulators */</div><div class='del'>-static struct fixed_voltage_config hsusb_reg_config = {</div><div class='del'>-	/* .supply_name filled later */</div><div class='del'>-	.microvolts = 3300000,</div><div class='del'>-	.gpio = -1,		/* updated later */</div><div class='del'>-	.startup_delay = 70000, /* 70msec */</div><div class='del'>-	.enable_high = 1,	/* updated later */</div><div class='del'>-	.enabled_at_boot = 0,	/* keep in RESET */</div><div class='del'>-	/* .init_data filled later */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *nop_name = "usb_phy_generic"; /* NOP PHY driver */</div><div class='del'>-static const char *reg_name = "reg-fixed-voltage"; /* Regulator driver */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * usbhs_add_regulator - Add a gpio based fixed voltage regulator device</div><div class='del'>- * @name: name for the regulator</div><div class='del'>- * @dev_id: device id of the device this regulator supplies power to</div><div class='del'>- * @dev_supply: supply name that the device expects</div><div class='del'>- * @gpio: GPIO number</div><div class='del'>- * @polarity: 1 - Active high, 0 - Active low</div><div class='del'>- */</div><div class='del'>-static int usbhs_add_regulator(char *name, char *dev_id, char *dev_supply,</div><div class='del'>-						int gpio, int polarity)</div><div class='del'>-{</div><div class='del'>-	struct regulator_consumer_supply *supplies;</div><div class='del'>-	struct regulator_init_data *reg_data;</div><div class='del'>-	struct fixed_voltage_config *config;</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-	struct platform_device_info pdevinfo;</div><div class='del'>-	int ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	supplies = kzalloc(sizeof(*supplies), GFP_KERNEL);</div><div class='del'>-	if (!supplies)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	supplies-&gt;supply = dev_supply;</div><div class='del'>-	supplies-&gt;dev_name = dev_id;</div><div class='del'>-</div><div class='del'>-	reg_data = kzalloc(sizeof(*reg_data), GFP_KERNEL);</div><div class='del'>-	if (!reg_data)</div><div class='del'>-		goto err_data;</div><div class='del'>-</div><div class='del'>-	reg_data-&gt;constraints.valid_ops_mask = REGULATOR_CHANGE_STATUS;</div><div class='del'>-	reg_data-&gt;consumer_supplies = supplies;</div><div class='del'>-	reg_data-&gt;num_consumer_supplies = 1;</div><div class='del'>-</div><div class='del'>-	config = kmemdup(&amp;hsusb_reg_config, sizeof(hsusb_reg_config),</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	if (!config)</div><div class='del'>-		goto err_config;</div><div class='del'>-</div><div class='del'>-	config-&gt;supply_name = kstrdup(name, GFP_KERNEL);</div><div class='del'>-	if (!config-&gt;supply_name)</div><div class='del'>-		goto err_supplyname;</div><div class='del'>-</div><div class='del'>-	config-&gt;gpio = gpio;</div><div class='del'>-	config-&gt;enable_high = polarity;</div><div class='del'>-	config-&gt;init_data = reg_data;</div><div class='del'>-</div><div class='del'>-	/* create a regulator device */</div><div class='del'>-	memset(&amp;pdevinfo, 0, sizeof(pdevinfo));</div><div class='del'>-	pdevinfo.name = reg_name;</div><div class='del'>-	pdevinfo.id = PLATFORM_DEVID_AUTO;</div><div class='del'>-	pdevinfo.data = config;</div><div class='del'>-	pdevinfo.size_data = sizeof(*config);</div><div class='del'>-</div><div class='del'>-	pdev = platform_device_register_full(&amp;pdevinfo);</div><div class='del'>-	if (IS_ERR(pdev)) {</div><div class='del'>-		ret = PTR_ERR(pdev);</div><div class='del'>-		pr_err("%s: Failed registering regulator %s for %s : %d\n",</div><div class='del'>-				__func__, name, dev_id, ret);</div><div class='del'>-		goto err_register;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_register:</div><div class='del'>-	kfree(config-&gt;supply_name);</div><div class='del'>-err_supplyname:</div><div class='del'>-	kfree(config);</div><div class='del'>-err_config:</div><div class='del'>-	kfree(reg_data);</div><div class='del'>-err_data:</div><div class='del'>-	kfree(supplies);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MAX_STR 20</div><div class='del'>-</div><div class='del'>-int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys)</div><div class='del'>-{</div><div class='del'>-	char rail_name[MAX_STR];</div><div class='del'>-	int i;</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-	char *phy_id;</div><div class='del'>-	struct platform_device_info pdevinfo;</div><div class='del'>-	struct usb_phy_generic_platform_data nop_pdata;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_phys; i++) {</div><div class='del'>-</div><div class='del'>-		if (!phy-&gt;port) {</div><div class='del'>-			pr_err("%s: Invalid port 0. Must start from 1\n",</div><div class='del'>-						__func__);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* do we need a NOP PHY device ? */</div><div class='del'>-		if (!gpio_is_valid(phy-&gt;reset_gpio) &amp;&amp;</div><div class='del'>-			!gpio_is_valid(phy-&gt;vcc_gpio))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		phy_id = kmalloc(MAX_STR, GFP_KERNEL);</div><div class='del'>-		if (!phy_id) {</div><div class='del'>-			pr_err("%s: kmalloc() failed\n", __func__);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* set platform data */</div><div class='del'>-		memset(&amp;nop_pdata, 0, sizeof(nop_pdata));</div><div class='del'>-		if (gpio_is_valid(phy-&gt;vcc_gpio))</div><div class='del'>-			nop_pdata.needs_vcc = true;</div><div class='del'>-		nop_pdata.gpio_reset = phy-&gt;reset_gpio;</div><div class='del'>-		nop_pdata.type = USB_PHY_TYPE_USB2;</div><div class='del'>-</div><div class='del'>-		/* create a NOP PHY device */</div><div class='del'>-		memset(&amp;pdevinfo, 0, sizeof(pdevinfo));</div><div class='del'>-		pdevinfo.name = nop_name;</div><div class='del'>-		pdevinfo.id = phy-&gt;port;</div><div class='del'>-		pdevinfo.data = &amp;nop_pdata;</div><div class='del'>-		pdevinfo.size_data =</div><div class='del'>-			sizeof(struct usb_phy_generic_platform_data);</div><div class='del'>-		scnprintf(phy_id, MAX_STR, "usb_phy_generic.%d",</div><div class='del'>-					phy-&gt;port);</div><div class='del'>-		pdev = platform_device_register_full(&amp;pdevinfo);</div><div class='del'>-		if (IS_ERR(pdev)) {</div><div class='del'>-			pr_err("%s: Failed to register device %s : %ld\n",</div><div class='del'>-				__func__,  phy_id, PTR_ERR(pdev));</div><div class='del'>-			kfree(phy_id);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		usb_bind_phy("ehci-omap.0", phy-&gt;port - 1, phy_id);</div><div class='del'>-</div><div class='del'>-		/* Do we need VCC regulator ? */</div><div class='del'>-		if (gpio_is_valid(phy-&gt;vcc_gpio)) {</div><div class='del'>-			scnprintf(rail_name, MAX_STR, "hsusb%d_vcc", phy-&gt;port);</div><div class='del'>-			usbhs_add_regulator(rail_name, phy_id, "vcc",</div><div class='del'>-					phy-&gt;vcc_gpio, phy-&gt;vcc_polarity);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		phy++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c<br/>deleted file mode 100644<br/>index e4562b2b973b..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/usb-musb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/usb-musb.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,106 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/arm/mach-omap2/usb-musb.c</div><div class='del'>- *</div><div class='del'>- * This file will contain the board specific details for the</div><div class='del'>- * MENTOR USB OTG controller on OMAP3430</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2007-2008 Texas Instruments</div><div class='del'>- * Copyright (C) 2008 Nokia Corporation</div><div class='del'>- * Author: Vikram Pandita</div><div class='del'>- *</div><div class='del'>- * Generalization by:</div><div class='del'>- * Felipe Balbi &lt;felipe.balbi@nokia.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/usb/musb.h&gt;</div><div class='del'>-</div><div class='del'>-#include "omap_device.h"</div><div class='del'>-#include "soc.h"</div><div class='del'>-#include "mux.h"</div><div class='del'>-#include "usb.h"</div><div class='del'>-</div><div class='del'>-static struct musb_hdrc_config musb_config = {</div><div class='del'>-	.multipoint	= 1,</div><div class='del'>-	.dyn_fifo	= 1,</div><div class='del'>-	.num_eps	= 16,</div><div class='del'>-	.ram_bits	= 12,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct musb_hdrc_platform_data musb_plat = {</div><div class='del'>-	.mode		= MUSB_OTG,</div><div class='del'>-</div><div class='del'>-	/* .clock is set dynamically */</div><div class='del'>-	.config		= &amp;musb_config,</div><div class='del'>-</div><div class='del'>-	/* REVISIT charge pump on TWL4030 can supply up to</div><div class='del'>-	 * 100 mA ... but this value is board-specific, like</div><div class='del'>-	 * "mode", and should be passed to usb_musb_init().</div><div class='del'>-	 */</div><div class='del'>-	.power		= 50,			/* up to 100 mA */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u64 musb_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='del'>-static struct omap_musb_board_data musb_default_board_data = {</div><div class='del'>-	.interface_type		= MUSB_INTERFACE_ULPI,</div><div class='del'>-	.mode			= MUSB_OTG,</div><div class='del'>-	.power			= 100,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)</div><div class='del'>-{</div><div class='del'>-	struct omap_hwmod		*oh;</div><div class='del'>-	struct platform_device		*pdev;</div><div class='del'>-	struct device			*dev;</div><div class='del'>-	int				bus_id = -1;</div><div class='del'>-	const char			*oh_name, *name;</div><div class='del'>-	struct omap_musb_board_data	*board_data;</div><div class='del'>-</div><div class='del'>-	if (musb_board_data)</div><div class='del'>-		board_data = musb_board_data;</div><div class='del'>-	else</div><div class='del'>-		board_data = &amp;musb_default_board_data;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * REVISIT: This line can be removed once all the platforms using</div><div class='del'>-	 * musb_core.c have been converted to use use clkdev.</div><div class='del'>-	 */</div><div class='del'>-	musb_plat.clock = "ick";</div><div class='del'>-	musb_plat.board_data = board_data;</div><div class='del'>-	musb_plat.power = board_data-&gt;power &gt;&gt; 1;</div><div class='del'>-	musb_plat.mode = board_data-&gt;mode;</div><div class='del'>-	musb_plat.extvbus = board_data-&gt;extvbus;</div><div class='del'>-</div><div class='del'>-	oh_name = "usb_otg_hs";</div><div class='del'>-	name = "musb-omap2430";</div><div class='del'>-</div><div class='del'>-        oh = omap_hwmod_lookup(oh_name);</div><div class='del'>-        if (WARN(!oh, "%s: could not find omap_hwmod for %s\n",</div><div class='del'>-                 __func__, oh_name))</div><div class='del'>-                return;</div><div class='del'>-</div><div class='del'>-	pdev = omap_device_build(name, bus_id, oh, &amp;musb_plat,</div><div class='del'>-				 sizeof(musb_plat));</div><div class='del'>-	if (IS_ERR(pdev)) {</div><div class='del'>-		pr_err("Could not build omap_device for %s %s\n",</div><div class='del'>-						name, oh_name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev = &amp;pdev-&gt;dev;</div><div class='del'>-	get_device(dev);</div><div class='del'>-	dev-&gt;dma_mask = &amp;musb_dmamask;</div><div class='del'>-	dev-&gt;coherent_dma_mask = musb_dmamask;</div><div class='del'>-	put_device(dev);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c<br/>index e554d9e66a1c..c2a6fbd7f8a9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-omap2/usb-tusb6010.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-omap2/usb-tusb6010.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-omap2/usb-tusb6010.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-omap2/usb-tusb6010.c</a></div><div class='hunk'>@@ -22,8 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "gpmc.h"</div><div class='ctx'> </div><div class='del'>-#include "mux.h"</div><div class='del'>-</div><div class='ctx'> static u8		async_cs, sync_cs;</div><div class='ctx'> static unsigned		refclk_psec;</div><div class='ctx'> </div><div class='hunk'>@@ -226,25 +224,6 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data,</div><div class='ctx'> 	}</div><div class='ctx'> 	tusb_device.dev.platform_data = data;</div><div class='ctx'> </div><div class='del'>-	/* REVISIT let the driver know what DMA channels work */</div><div class='del'>-	if (!dmachan)</div><div class='del'>-		tusb_device.dev.dma_mask = NULL;</div><div class='del'>-	else {</div><div class='del'>-		/* assume OMAP 2420 ES2.0 and later */</div><div class='del'>-		if (dmachan &amp; (1 &lt;&lt; 0))</div><div class='del'>-			omap_mux_init_signal("sys_ndmareq0", 0);</div><div class='del'>-		if (dmachan &amp; (1 &lt;&lt; 1))</div><div class='del'>-			omap_mux_init_signal("sys_ndmareq1", 0);</div><div class='del'>-		if (dmachan &amp; (1 &lt;&lt; 2))</div><div class='del'>-			omap_mux_init_signal("sys_ndmareq2", 0);</div><div class='del'>-		if (dmachan &amp; (1 &lt;&lt; 3))</div><div class='del'>-			omap_mux_init_signal("sys_ndmareq3", 0);</div><div class='del'>-		if (dmachan &amp; (1 &lt;&lt; 4))</div><div class='del'>-			omap_mux_init_signal("sys_ndmareq4", 0);</div><div class='del'>-		if (dmachan &amp; (1 &lt;&lt; 5))</div><div class='del'>-			omap_mux_init_signal("sys_ndmareq5", 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* so far so good ... register the device */</div><div class='ctx'> 	status = platform_device_register(&amp;tusb_device);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='head'>diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig<br/>index 89bb0fc796bd..633442ad4e4c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-orion5x/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-orion5x/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-orion5x/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/Kconfig</a></div><div class='hunk'>@@ -84,13 +84,6 @@ config MACH_LINKSTATION_PRO</div><div class='ctx'> 	  Buffalo Linkstation Pro/Live platform. Both v1 and</div><div class='ctx'> 	  v2 devices are supported.</div><div class='ctx'> </div><div class='del'>-config MACH_LINKSTATION_LSCHL</div><div class='del'>-	bool "Buffalo Linkstation Live v3 (LS-CHL)"</div><div class='del'>-	select I2C_BOARDINFO if I2C</div><div class='del'>-	help</div><div class='del'>-	  Say 'Y' here if you want your kernel to support the</div><div class='del'>-	  Buffalo Linkstation Live v3 (LS-CHL) platform.</div><div class='del'>-</div><div class='ctx'> config MACH_LINKSTATION_MINI</div><div class='ctx'> 	bool "Buffalo Linkstation Mini (Flattened Device Tree)"</div><div class='ctx'> 	select ARCH_ORION5X_DT</div><div class='head'>diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile<br/>index 4b2502b4ca0d..ae91872eeee4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-orion5x/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-orion5x/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-orion5x/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/Makefile</a></div><div class='hunk'>@@ -18,7 +18,6 @@ obj-$(CONFIG_MACH_WNR854T)	+= wnr854t-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_RD88F5181L_GE)	+= rd88f5181l-ge-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_RD88F5181L_FXO)	+= rd88f5181l-fxo-setup.o</div><div class='ctx'> obj-$(CONFIG_MACH_RD88F6183AP_GE)	+= rd88f6183ap-ge-setup.o</div><div class='del'>-obj-$(CONFIG_MACH_LINKSTATION_LSCHL)	+= ls-chl-setup.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ARCH_ORION5X_DT)		+= board-dt.o</div><div class='ctx'> obj-$(CONFIG_MACH_D2NET_DT)	+= board-d2net.o</div><div class='head'>diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c<br/>index 04910764c385..83a7ec4c16d0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-orion5x/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-orion5x/common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-orion5x/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/common.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * Ethernet switch</div><div class='ctx'>  ****************************************************************************/</div><div class='del'>-void __init orion5x_eth_switch_init(struct dsa_platform_data *d)</div><div class='add'>+void __init orion5x_eth_switch_init(struct dsa_chip_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	orion_ge00_switch_init(d);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h<br/>index 8a4115bd441d..efeffc6b4ebb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-orion5x/common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-orion5x/common.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-orion5x/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/common.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> </div><div class='del'>-struct dsa_platform_data;</div><div class='add'>+struct dsa_chip_data;</div><div class='ctx'> struct mv643xx_eth_platform_data;</div><div class='ctx'> struct mv_sata_platform_data;</div><div class='ctx'> </div><div class='hunk'>@@ -41,7 +41,7 @@ void orion5x_setup_wins(void);</div><div class='ctx'> void orion5x_ehci0_init(void);</div><div class='ctx'> void orion5x_ehci1_init(void);</div><div class='ctx'> void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data);</div><div class='del'>-void orion5x_eth_switch_init(struct dsa_platform_data *d);</div><div class='add'>+void orion5x_eth_switch_init(struct dsa_chip_data *d);</div><div class='ctx'> void orion5x_i2c_init(void);</div><div class='ctx'> void orion5x_sata_init(struct mv_sata_platform_data *sata_data);</div><div class='ctx'> void orion5x_spi_init(void);</div><div class='head'>diff --git a/arch/arm/mach-orion5x/ls-chl-setup.c b/arch/arm/mach-orion5x/ls-chl-setup.c<br/>deleted file mode 100644<br/>index dfdaa8a498a4..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-orion5x/ls-chl-setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-orion5x/ls-chl-setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,331 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-orion5x/ls-chl-setup.c</div><div class='del'>- *</div><div class='del'>- * Maintainer: Ash Hughes &lt;ashley.hughes@blueyonder.co.uk&gt;</div><div class='del'>- *</div><div class='del'>- * This file is licensed under the terms of the GNU General Public</div><div class='del'>- * License version 2.  This program is licensed "as is" without any</div><div class='del'>- * warranty of any kind, whether express or implied.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/mtd/physmap.h&gt;</div><div class='del'>-#include &lt;linux/mv643xx_eth.h&gt;</div><div class='del'>-#include &lt;linux/leds.h&gt;</div><div class='del'>-#include &lt;linux/gpio_keys.h&gt;</div><div class='del'>-#include &lt;linux/gpio-fan.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/ata_platform.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include "common.h"</div><div class='del'>-#include "mpp.h"</div><div class='del'>-#include "orion5x.h"</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- * Linkstation LS-CHL Info</div><div class='del'>- ****************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 256K NOR flash Device bus boot chip select</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define LSCHL_NOR_BOOT_BASE	0xf4000000</div><div class='del'>-#define LSCHL_NOR_BOOT_SIZE	SZ_256K</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- * 256KB NOR Flash on BOOT Device</div><div class='del'>- ****************************************************************************/</div><div class='del'>-</div><div class='del'>-static struct physmap_flash_data lschl_nor_flash_data = {</div><div class='del'>-	.width = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource lschl_nor_flash_resource = {</div><div class='del'>-	.flags	= IORESOURCE_MEM,</div><div class='del'>-	.start	= LSCHL_NOR_BOOT_BASE,</div><div class='del'>-	.end	= LSCHL_NOR_BOOT_BASE + LSCHL_NOR_BOOT_SIZE - 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device lschl_nor_flash = {</div><div class='del'>-	.name = "physmap-flash",</div><div class='del'>-	.id = 0,</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data	= &amp;lschl_nor_flash_data,</div><div class='del'>-	},</div><div class='del'>-	.num_resources = 1,</div><div class='del'>-	.resource = &amp;lschl_nor_flash_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- * Ethernet</div><div class='del'>- ****************************************************************************/</div><div class='del'>-</div><div class='del'>-static struct mv643xx_eth_platform_data lschl_eth_data = {</div><div class='del'>-	.phy_addr = MV643XX_ETH_PHY_ADDR(8),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- * RTC 5C372a on I2C bus</div><div class='del'>- ****************************************************************************/</div><div class='del'>-</div><div class='del'>-static struct i2c_board_info __initdata lschl_i2c_rtc = {</div><div class='del'>-	I2C_BOARD_INFO("rs5c372a", 0x32),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- * LEDs attached to GPIO</div><div class='del'>- ****************************************************************************/</div><div class='del'>-</div><div class='del'>-#define LSCHL_GPIO_LED_ALARM	2</div><div class='del'>-#define LSCHL_GPIO_LED_INFO	3</div><div class='del'>-#define LSCHL_GPIO_LED_FUNC	17</div><div class='del'>-#define LSCHL_GPIO_LED_PWR	0</div><div class='del'>-</div><div class='del'>-static struct gpio_led lschl_led_pins[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "alarm:red",</div><div class='del'>-		.gpio = LSCHL_GPIO_LED_ALARM,</div><div class='del'>-		.active_low = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "info:amber",</div><div class='del'>-		.gpio = LSCHL_GPIO_LED_INFO,</div><div class='del'>-		.active_low = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "func:blue:top",</div><div class='del'>-		.gpio = LSCHL_GPIO_LED_FUNC,</div><div class='del'>-		.active_low = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "power:blue:bottom",</div><div class='del'>-		.gpio = LSCHL_GPIO_LED_PWR,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct gpio_led_platform_data lschl_led_data = {</div><div class='del'>-	.leds = lschl_led_pins,</div><div class='del'>-	.num_leds = ARRAY_SIZE(lschl_led_pins),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device lschl_leds = {</div><div class='del'>-	.name = "leds-gpio",</div><div class='del'>-	.id = -1,</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data = &amp;lschl_led_data,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- * SATA</div><div class='del'>- ****************************************************************************/</div><div class='del'>-static struct mv_sata_platform_data lschl_sata_data = {</div><div class='del'>-	.n_ports = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- * LS-CHL specific power off method: reboot</div><div class='del'>- ****************************************************************************/</div><div class='del'>-/*</div><div class='del'>- * On the LS-CHL, the shutdown process is following:</div><div class='del'>- * - Userland monitors key events until the power switch goes to off position</div><div class='del'>- * - The board reboots</div><div class='del'>- * - U-boot starts and goes into an idle mode waiting for the user</div><div class='del'>- *   to move the switch to ON position</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void lschl_power_off(void)</div><div class='del'>-{</div><div class='del'>-	orion5x_restart(REBOOT_HARD, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- * General Setup</div><div class='del'>- ****************************************************************************/</div><div class='del'>-#define LSCHL_GPIO_USB_POWER	9</div><div class='del'>-#define LSCHL_GPIO_AUTO_POWER	17</div><div class='del'>-#define LSCHL_GPIO_POWER	18</div><div class='del'>-</div><div class='del'>-/****************************************************************************</div><div class='del'>- * GPIO Attached Keys</div><div class='del'>- ****************************************************************************/</div><div class='del'>-#define LSCHL_GPIO_KEY_FUNC		15</div><div class='del'>-#define LSCHL_GPIO_KEY_POWER		8</div><div class='del'>-#define LSCHL_GPIO_KEY_AUTOPOWER	10</div><div class='del'>-#define LSCHL_SW_POWER		0x00</div><div class='del'>-#define LSCHL_SW_AUTOPOWER	0x01</div><div class='del'>-#define LSCHL_SW_FUNC		0x02</div><div class='del'>-</div><div class='del'>-static struct gpio_keys_button lschl_buttons[] = {</div><div class='del'>-	{</div><div class='del'>-		.type = EV_SW,</div><div class='del'>-		.code = LSCHL_SW_POWER,</div><div class='del'>-		.gpio = LSCHL_GPIO_KEY_POWER,</div><div class='del'>-		.desc = "Power-on Switch",</div><div class='del'>-		.active_low = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.type = EV_SW,</div><div class='del'>-		.code = LSCHL_SW_AUTOPOWER,</div><div class='del'>-		.gpio = LSCHL_GPIO_KEY_AUTOPOWER,</div><div class='del'>-		.desc = "Power-auto Switch",</div><div class='del'>-		.active_low = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.type = EV_SW,</div><div class='del'>-		.code = LSCHL_SW_FUNC,</div><div class='del'>-		.gpio = LSCHL_GPIO_KEY_FUNC,</div><div class='del'>-		.desc = "Function Switch",</div><div class='del'>-		.active_low = 1,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct gpio_keys_platform_data lschl_button_data = {</div><div class='del'>-	.buttons = lschl_buttons,</div><div class='del'>-	.nbuttons = ARRAY_SIZE(lschl_buttons),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device lschl_button_device = {</div><div class='del'>-	.name = "gpio-keys",</div><div class='del'>-	.id = -1,</div><div class='del'>-	.num_resources = 0,</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data = &amp;lschl_button_data,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define LSCHL_GPIO_HDD_POWER	1</div><div class='del'>-</div><div class='del'>-/****************************************************************************</div><div class='del'>- * GPIO Fan</div><div class='del'>- ****************************************************************************/</div><div class='del'>-</div><div class='del'>-#define LSCHL_GPIO_FAN_LOW	16</div><div class='del'>-#define LSCHL_GPIO_FAN_HIGH	14</div><div class='del'>-#define LSCHL_GPIO_FAN_LOCK	6</div><div class='del'>-</div><div class='del'>-static struct gpio_fan_alarm lschl_alarm = {</div><div class='del'>-	.gpio = LSCHL_GPIO_FAN_LOCK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct gpio_fan_speed lschl_speeds[] = {</div><div class='del'>-	{</div><div class='del'>-		.rpm = 0,</div><div class='del'>-		.ctrl_val = 3,</div><div class='del'>-	}, {</div><div class='del'>-		.rpm = 1500,</div><div class='del'>-		.ctrl_val = 2,</div><div class='del'>-	}, {</div><div class='del'>-		.rpm = 3250,</div><div class='del'>-		.ctrl_val = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.rpm = 5000,</div><div class='del'>-		.ctrl_val = 0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int lschl_gpio_list[] = {</div><div class='del'>-	LSCHL_GPIO_FAN_HIGH, LSCHL_GPIO_FAN_LOW,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct gpio_fan_platform_data lschl_fan_data = {</div><div class='del'>-	.num_ctrl = ARRAY_SIZE(lschl_gpio_list),</div><div class='del'>-	.ctrl = lschl_gpio_list,</div><div class='del'>-	.alarm = &amp;lschl_alarm,</div><div class='del'>-	.num_speed = ARRAY_SIZE(lschl_speeds),</div><div class='del'>-	.speed = lschl_speeds,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device lschl_fan_device = {</div><div class='del'>-	.name = "gpio-fan",</div><div class='del'>-	.id = -1,</div><div class='del'>-	.num_resources = 0,</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data = &amp;lschl_fan_data,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/****************************************************************************</div><div class='del'>- * GPIO Data</div><div class='del'>- ****************************************************************************/</div><div class='del'>-</div><div class='del'>-static unsigned int lschl_mpp_modes[] __initdata = {</div><div class='del'>-	MPP0_GPIO, /* LED POWER */</div><div class='del'>-	MPP1_GPIO, /* HDD POWER */</div><div class='del'>-	MPP2_GPIO, /* LED ALARM */</div><div class='del'>-	MPP3_GPIO, /* LED INFO */</div><div class='del'>-	MPP4_UNUSED,</div><div class='del'>-	MPP5_UNUSED,</div><div class='del'>-	MPP6_GPIO, /* FAN LOCK */</div><div class='del'>-	MPP7_GPIO, /* SW INIT */</div><div class='del'>-	MPP8_GPIO, /* SW POWER */</div><div class='del'>-	MPP9_GPIO, /* USB POWER */</div><div class='del'>-	MPP10_GPIO, /* SW AUTO POWER */</div><div class='del'>-	MPP11_UNUSED,</div><div class='del'>-	MPP12_UNUSED,</div><div class='del'>-	MPP13_UNUSED,</div><div class='del'>-	MPP14_GPIO, /* FAN HIGH */</div><div class='del'>-	MPP15_GPIO, /* SW FUNC */</div><div class='del'>-	MPP16_GPIO, /* FAN LOW */</div><div class='del'>-	MPP17_GPIO, /* LED FUNC */</div><div class='del'>-	MPP18_UNUSED,</div><div class='del'>-	MPP19_UNUSED,</div><div class='del'>-	0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init lschl_init(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Setup basic Orion functions. Needs to be called early.</div><div class='del'>-	 */</div><div class='del'>-	orion5x_init();</div><div class='del'>-</div><div class='del'>-	orion5x_mpp_conf(lschl_mpp_modes);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Configure peripherals.</div><div class='del'>-	 */</div><div class='del'>-	orion5x_ehci0_init();</div><div class='del'>-	orion5x_ehci1_init();</div><div class='del'>-	orion5x_eth_init(&amp;lschl_eth_data);</div><div class='del'>-	orion5x_i2c_init();</div><div class='del'>-	orion5x_sata_init(&amp;lschl_sata_data);</div><div class='del'>-	orion5x_uart0_init();</div><div class='del'>-	orion5x_xor_init();</div><div class='del'>-</div><div class='del'>-	mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,</div><div class='del'>-				    ORION_MBUS_DEVBUS_BOOT_ATTR,</div><div class='del'>-				    LSCHL_NOR_BOOT_BASE,</div><div class='del'>-				    LSCHL_NOR_BOOT_SIZE);</div><div class='del'>-	platform_device_register(&amp;lschl_nor_flash);</div><div class='del'>-</div><div class='del'>-	platform_device_register(&amp;lschl_leds);</div><div class='del'>-</div><div class='del'>-	platform_device_register(&amp;lschl_button_device);</div><div class='del'>-</div><div class='del'>-	platform_device_register(&amp;lschl_fan_device);</div><div class='del'>-</div><div class='del'>-	i2c_register_board_info(0, &amp;lschl_i2c_rtc, 1);</div><div class='del'>-</div><div class='del'>-	/* usb power on */</div><div class='del'>-	gpio_set_value(LSCHL_GPIO_USB_POWER, 1);</div><div class='del'>-</div><div class='del'>-	/* register power-off method */</div><div class='del'>-	pm_power_off = lschl_power_off;</div><div class='del'>-</div><div class='del'>-	pr_info("%s: finished\n", __func__);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MACHINE_START(LINKSTATION_LSCHL, "Buffalo Linkstation LiveV3 (LS-CHL)")</div><div class='del'>-	/* Maintainer: Ash Hughes &lt;ashley.hughes@blueyonder.co.uk&gt; */</div><div class='del'>-	.atag_offset	= 0x100,</div><div class='del'>-	.nr_irqs	= ORION5X_NR_IRQS,</div><div class='del'>-	.init_machine	= lschl_init,</div><div class='del'>-	.map_io		= orion5x_map_io,</div><div class='del'>-	.init_early	= orion5x_init_early,</div><div class='del'>-	.init_irq	= orion5x_init_irq,</div><div class='del'>-	.init_time	= orion5x_timer_init,</div><div class='del'>-	.fixup		= tag_fixup_mem32,</div><div class='del'>-	.restart	= orion5x_restart,</div><div class='del'>-MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c<br/>index dccadf68ea2b..a3c1336d30c9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a></div><div class='hunk'>@@ -101,11 +101,6 @@ static struct dsa_chip_data rd88f5181l_fxo_switch_chip_data = {</div><div class='ctx'> 	.port_names[7]	= "lan3",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dsa_platform_data __initdata rd88f5181l_fxo_switch_plat_data = {</div><div class='del'>-	.nr_chips	= 1,</div><div class='del'>-	.chip		= &amp;rd88f5181l_fxo_switch_chip_data,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init rd88f5181l_fxo_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -120,7 +115,7 @@ static void __init rd88f5181l_fxo_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	orion5x_ehci0_init();</div><div class='ctx'> 	orion5x_eth_init(&amp;rd88f5181l_fxo_eth_data);</div><div class='del'>-	orion5x_eth_switch_init(&amp;rd88f5181l_fxo_switch_plat_data);</div><div class='add'>+	orion5x_eth_switch_init(&amp;rd88f5181l_fxo_switch_chip_data);</div><div class='ctx'> 	orion5x_uart0_init();</div><div class='ctx'> </div><div class='ctx'> 	mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c<br/>index affe5ec825de..252efe29bd1a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a></div><div class='hunk'>@@ -102,11 +102,6 @@ static struct dsa_chip_data rd88f5181l_ge_switch_chip_data = {</div><div class='ctx'> 	.port_names[7]	= "lan3",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dsa_platform_data __initdata rd88f5181l_ge_switch_plat_data = {</div><div class='del'>-	.nr_chips	= 1,</div><div class='del'>-	.chip		= &amp;rd88f5181l_ge_switch_chip_data,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct i2c_board_info __initdata rd88f5181l_ge_i2c_rtc = {</div><div class='ctx'> 	I2C_BOARD_INFO("ds1338", 0x68),</div><div class='ctx'> };</div><div class='hunk'>@@ -125,7 +120,7 @@ static void __init rd88f5181l_ge_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	orion5x_ehci0_init();</div><div class='ctx'> 	orion5x_eth_init(&amp;rd88f5181l_ge_eth_data);</div><div class='del'>-	orion5x_eth_switch_init(&amp;rd88f5181l_ge_switch_plat_data);</div><div class='add'>+	orion5x_eth_switch_init(&amp;rd88f5181l_ge_switch_chip_data);</div><div class='ctx'> 	orion5x_i2c_init();</div><div class='ctx'> 	orion5x_uart0_init();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c<br/>index 67ee8571b03c..f4f1dbe1d91d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c</a></div><div class='hunk'>@@ -40,11 +40,6 @@ static struct dsa_chip_data rd88f6183ap_ge_switch_chip_data = {</div><div class='ctx'> 	.port_names[5]	= "cpu",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dsa_platform_data __initdata rd88f6183ap_ge_switch_plat_data = {</div><div class='del'>-	.nr_chips	= 1,</div><div class='del'>-	.chip		= &amp;rd88f6183ap_ge_switch_chip_data,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct mtd_partition rd88f6183ap_ge_partitions[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name	= "kernel",</div><div class='hunk'>@@ -89,7 +84,7 @@ static void __init rd88f6183ap_ge_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	orion5x_ehci0_init();</div><div class='ctx'> 	orion5x_eth_init(&amp;rd88f6183ap_ge_eth_data);</div><div class='del'>-	orion5x_eth_switch_init(&amp;rd88f6183ap_ge_switch_plat_data);</div><div class='add'>+	orion5x_eth_switch_init(&amp;rd88f6183ap_ge_switch_chip_data);</div><div class='ctx'> 	spi_register_board_info(rd88f6183ap_ge_spi_slave_info,</div><div class='ctx'> 				ARRAY_SIZE(rd88f6183ap_ge_spi_slave_info));</div><div class='ctx'> 	orion5x_spi_init();</div><div class='head'>diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c<br/>index 8d597267d0c4..7ef80a8304c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-orion5x/ts78xx-setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-orion5x/ts78xx-setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-orion5x/ts78xx-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/ts78xx-setup.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/rtc-m48t86.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/timeriomem-rng.h&gt;</div><div class='hunk'>@@ -80,79 +79,38 @@ static struct mv_sata_platform_data ts78xx_sata_data = {</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * RTC M48T86 - nicked^Wborrowed from arch/arm/mach-ep93xx/ts72xx.c</div><div class='ctx'>  ****************************************************************************/</div><div class='del'>-#define TS_RTC_CTRL	(TS78XX_FPGA_REGS_VIRT_BASE + 0x808)</div><div class='del'>-#define TS_RTC_DATA	(TS78XX_FPGA_REGS_VIRT_BASE + 0x80c)</div><div class='add'>+#define TS_RTC_CTRL	(TS78XX_FPGA_REGS_PHYS_BASE + 0x808)</div><div class='add'>+#define TS_RTC_DATA	(TS78XX_FPGA_REGS_PHYS_BASE + 0x80c)</div><div class='ctx'> </div><div class='del'>-static unsigned char ts78xx_ts_rtc_readbyte(unsigned long addr)</div><div class='del'>-{</div><div class='del'>-	writeb(addr, TS_RTC_CTRL);</div><div class='del'>-	return readb(TS_RTC_DATA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ts78xx_ts_rtc_writebyte(unsigned char value, unsigned long addr)</div><div class='del'>-{</div><div class='del'>-	writeb(addr, TS_RTC_CTRL);</div><div class='del'>-	writeb(value, TS_RTC_DATA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct m48t86_ops ts78xx_ts_rtc_ops = {</div><div class='del'>-	.readbyte	= ts78xx_ts_rtc_readbyte,</div><div class='del'>-	.writebyte	= ts78xx_ts_rtc_writebyte,</div><div class='add'>+static struct resource ts78xx_ts_rtc_resources[] = {</div><div class='add'>+	DEFINE_RES_MEM(TS_RTC_CTRL, 0x01),</div><div class='add'>+	DEFINE_RES_MEM(TS_RTC_DATA, 0x01),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device ts78xx_ts_rtc_device = {</div><div class='ctx'> 	.name		= "rtc-m48t86",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data	= &amp;ts78xx_ts_rtc_ops,</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= 0,</div><div class='add'>+	.resource	= ts78xx_ts_rtc_resources,</div><div class='add'>+	.num_resources 	= ARRAY_SIZE(ts78xx_ts_rtc_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * TS uses some of the user storage space on the RTC chip so see if it is</div><div class='del'>- * present; as it's an optional feature at purchase time and not all boards</div><div class='del'>- * will have it present</div><div class='del'>- *</div><div class='del'>- * I've used the method TS use in their rtc7800.c example for the detection</div><div class='del'>- *</div><div class='del'>- * TODO: track down a guinea pig without an RTC to see if we can work out a</div><div class='del'>- *		better RTC detection routine</div><div class='del'>- */</div><div class='ctx'> static int ts78xx_ts_rtc_load(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	unsigned char tmp_rtc0, tmp_rtc1;</div><div class='del'>-</div><div class='del'>-	tmp_rtc0 = ts78xx_ts_rtc_readbyte(126);</div><div class='del'>-	tmp_rtc1 = ts78xx_ts_rtc_readbyte(127);</div><div class='del'>-</div><div class='del'>-	ts78xx_ts_rtc_writebyte(0x00, 126);</div><div class='del'>-	ts78xx_ts_rtc_writebyte(0x55, 127);</div><div class='del'>-	if (ts78xx_ts_rtc_readbyte(127) == 0x55) {</div><div class='del'>-		ts78xx_ts_rtc_writebyte(0xaa, 127);</div><div class='del'>-		if (ts78xx_ts_rtc_readbyte(127) == 0xaa</div><div class='del'>-				&amp;&amp; ts78xx_ts_rtc_readbyte(126) == 0x00) {</div><div class='del'>-			ts78xx_ts_rtc_writebyte(tmp_rtc0, 126);</div><div class='del'>-			ts78xx_ts_rtc_writebyte(tmp_rtc1, 127);</div><div class='del'>-</div><div class='del'>-			if (ts78xx_fpga.supports.ts_rtc.init == 0) {</div><div class='del'>-				rc = platform_device_register(&amp;ts78xx_ts_rtc_device);</div><div class='del'>-				if (!rc)</div><div class='del'>-					ts78xx_fpga.supports.ts_rtc.init = 1;</div><div class='del'>-			} else</div><div class='del'>-				rc = platform_device_add(&amp;ts78xx_ts_rtc_device);</div><div class='del'>-</div><div class='del'>-			if (rc)</div><div class='del'>-				pr_info("RTC could not be registered: %d\n",</div><div class='del'>-					rc);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+	if (ts78xx_fpga.supports.ts_rtc.init == 0) {</div><div class='add'>+		rc = platform_device_register(&amp;ts78xx_ts_rtc_device);</div><div class='add'>+		if (!rc)</div><div class='add'>+			ts78xx_fpga.supports.ts_rtc.init = 1;</div><div class='add'>+	} else {</div><div class='add'>+		rc = platform_device_add(&amp;ts78xx_ts_rtc_device);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_info("RTC not found\n");</div><div class='del'>-	return -ENODEV;</div><div class='del'>-};</div><div class='add'>+	if (rc)</div><div class='add'>+		pr_info("RTC could not be registered: %d\n", rc);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void ts78xx_ts_rtc_unload(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c<br/>index 4dbcdbe1de7c..d162d4c7f85d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-orion5x/wnr854t-setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-orion5x/wnr854t-setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-orion5x/wnr854t-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/wnr854t-setup.c</a></div><div class='hunk'>@@ -106,11 +106,6 @@ static struct dsa_chip_data wnr854t_switch_chip_data = {</div><div class='ctx'> 	.port_names[7] = "lan2",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dsa_platform_data __initdata wnr854t_switch_plat_data = {</div><div class='del'>-	.nr_chips	= 1,</div><div class='del'>-	.chip		= &amp;wnr854t_switch_chip_data,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init wnr854t_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -124,7 +119,7 @@ static void __init wnr854t_init(void)</div><div class='ctx'> 	 * Configure peripherals.</div><div class='ctx'> 	 */</div><div class='ctx'> 	orion5x_eth_init(&amp;wnr854t_eth_data);</div><div class='del'>-	orion5x_eth_switch_init(&amp;wnr854t_switch_plat_data);</div><div class='add'>+	orion5x_eth_switch_init(&amp;wnr854t_switch_chip_data);</div><div class='ctx'> 	orion5x_uart0_init();</div><div class='ctx'> </div><div class='ctx'> 	mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,</div><div class='head'>diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c<br/>index a6a8c4648d74..9250bb2e429c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-orion5x/wrt350n-v2-setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-orion5x/wrt350n-v2-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a></div><div class='hunk'>@@ -191,11 +191,6 @@ static struct dsa_chip_data wrt350n_v2_switch_chip_data = {</div><div class='ctx'> 	.port_names[7]	= "lan4",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dsa_platform_data __initdata wrt350n_v2_switch_plat_data = {</div><div class='del'>-	.nr_chips	= 1,</div><div class='del'>-	.chip		= &amp;wrt350n_v2_switch_chip_data,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init wrt350n_v2_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -210,7 +205,7 @@ static void __init wrt350n_v2_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	orion5x_ehci0_init();</div><div class='ctx'> 	orion5x_eth_init(&amp;wrt350n_v2_eth_data);</div><div class='del'>-	orion5x_eth_switch_init(&amp;wrt350n_v2_switch_plat_data);</div><div class='add'>+	orion5x_eth_switch_init(&amp;wrt350n_v2_switch_chip_data);</div><div class='ctx'> 	orion5x_uart0_init();</div><div class='ctx'> </div><div class='ctx'> 	mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,</div><div class='head'>diff --git a/arch/arm/mach-oxnas/Kconfig b/arch/arm/mach-oxnas/Kconfig<br/>index 29100beb2e7f..8fa4557e27a9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-oxnas/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-oxnas/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-oxnas/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-oxnas/Kconfig</a></div><div class='hunk'>@@ -1,9 +1,16 @@</div><div class='ctx'> menuconfig ARCH_OXNAS</div><div class='ctx'> 	bool "Oxford Semiconductor OXNAS Family SoCs"</div><div class='ctx'> 	select ARCH_HAS_RESET_CONTROLLER</div><div class='add'>+	select COMMON_CLK_OXNAS</div><div class='ctx'> 	select GPIOLIB</div><div class='add'>+	select MFD_SYSCON</div><div class='add'>+	select OXNAS_RPS_TIMER</div><div class='add'>+	select PINCTRL_OXNAS</div><div class='add'>+	select RESET_CONTROLLER</div><div class='add'>+	select RESET_OXNAS</div><div class='add'>+	select VERSATILE_FPGA_IRQ</div><div class='ctx'> 	select PINCTRL</div><div class='del'>-	depends on ARCH_MULTI_V5</div><div class='add'>+	depends on ARCH_MULTI_V5 || ARCH_MULTI_V6</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for OxNas SoC family developed by Oxford Semiconductor.</div><div class='ctx'> </div><div class='hunk'>@@ -11,16 +18,21 @@ if ARCH_OXNAS</div><div class='ctx'> </div><div class='ctx'> config MACH_OX810SE</div><div class='ctx'> 	bool "Support OX810SE Based Products"</div><div class='del'>-	select ARCH_HAS_RESET_CONTROLLER</div><div class='del'>-	select COMMON_CLK_OXNAS</div><div class='add'>+	depends on ARCH_MULTI_V5</div><div class='ctx'> 	select CPU_ARM926T</div><div class='del'>-	select MFD_SYSCON</div><div class='del'>-	select OXNAS_RPS_TIMER</div><div class='del'>-	select PINCTRL_OXNAS</div><div class='del'>-	select RESET_CONTROLLER</div><div class='del'>-	select RESET_OXNAS</div><div class='del'>-	select VERSATILE_FPGA_IRQ</div><div class='ctx'> 	help</div><div class='ctx'> 	  Include Support for the Oxford Semiconductor OX810SE SoC Based Products.</div><div class='ctx'> </div><div class='add'>+config MACH_OX820</div><div class='add'>+	bool "Support OX820 Based Products"</div><div class='add'>+	depends on ARCH_MULTI_V6</div><div class='add'>+	select ARM_GIC</div><div class='add'>+	select DMA_CACHE_RWFO if SMP</div><div class='add'>+	select CPU_V6K</div><div class='add'>+	select HAVE_SMP</div><div class='add'>+	select HAVE_ARM_SCU if SMP</div><div class='add'>+	select HAVE_ARM_TWD if SMP</div><div class='add'>+	help</div><div class='add'>+	  Include Support for the Oxford Semiconductor OX820 SoC Based Products.</div><div class='add'>+</div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/arm/mach-oxnas/Makefile b/arch/arm/mach-oxnas/Makefile<br/>new file mode 100644<br/>index 000000000000..b625906a9970<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-oxnas/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-oxnas/Makefile</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o</div><div class='add'>+obj-$(CONFIG_HOTPLUG_CPU) 	+= hotplug.o</div><div class='head'>diff --git a/arch/arm/mach-oxnas/headsmp.S b/arch/arm/mach-oxnas/headsmp.S<br/>new file mode 100644<br/>index 000000000000..25fd4f82ab3a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-oxnas/headsmp.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-oxnas/headsmp.S</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2013 Ma Haijun &lt;mahaijuns@gmail.com&gt;</div><div class='add'>+ * Copyright (c) 2003 ARM Limited</div><div class='add'>+ * All Rights Reserved</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+	__INIT</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * OX820 specific entry point for secondary CPUs.</div><div class='add'>+ */</div><div class='add'>+ENTRY(ox820_secondary_startup)</div><div class='add'>+	mov r4, #0</div><div class='add'>+	/* invalidate both caches and branch target cache */</div><div class='add'>+	mcr p15, 0, r4, c7, c7, 0</div><div class='add'>+	/*</div><div class='add'>+	 * we've been released from the holding pen: secondary_stack</div><div class='add'>+	 * should now contain the SVC stack for this core</div><div class='add'>+	 */</div><div class='add'>+	b	secondary_startup</div><div class='head'>diff --git a/arch/arm/mach-oxnas/hotplug.c b/arch/arm/mach-oxnas/hotplug.c<br/>new file mode 100644<br/>index 000000000000..854f29b8cba6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-oxnas/hotplug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-oxnas/hotplug.c</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2002 ARM Ltd.</div><div class='add'>+ *  All Rights Reserved</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cp15.h&gt;</div><div class='add'>+#include &lt;asm/smp_plat.h&gt;</div><div class='add'>+</div><div class='add'>+static inline void cpu_enter_lowpower(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int v;</div><div class='add'>+</div><div class='add'>+	asm volatile(</div><div class='add'>+	"	mcr	p15, 0, %1, c7, c5, 0\n"</div><div class='add'>+	"	mcr	p15, 0, %1, c7, c10, 4\n"</div><div class='add'>+	/*</div><div class='add'>+	 * Turn off coherency</div><div class='add'>+	 */</div><div class='add'>+	"	mrc	p15, 0, %0, c1, c0, 1\n"</div><div class='add'>+	"	bic	%0, %0, #0x20\n"</div><div class='add'>+	"	mcr	p15, 0, %0, c1, c0, 1\n"</div><div class='add'>+	"	mrc	p15, 0, %0, c1, c0, 0\n"</div><div class='add'>+	"	bic	%0, %0, %2\n"</div><div class='add'>+	"	mcr	p15, 0, %0, c1, c0, 0\n"</div><div class='add'>+	  : "=&amp;r" (v)</div><div class='add'>+	  : "r" (0), "Ir" (CR_C)</div><div class='add'>+	  : "cc");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cpu_leave_lowpower(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int v;</div><div class='add'>+</div><div class='add'>+	asm volatile(	"mrc	p15, 0, %0, c1, c0, 0\n"</div><div class='add'>+	"	orr	%0, %0, %1\n"</div><div class='add'>+	"	mcr	p15, 0, %0, c1, c0, 0\n"</div><div class='add'>+	"	mrc	p15, 0, %0, c1, c0, 1\n"</div><div class='add'>+	"	orr	%0, %0, #0x20\n"</div><div class='add'>+	"	mcr	p15, 0, %0, c1, c0, 1\n"</div><div class='add'>+	  : "=&amp;r" (v)</div><div class='add'>+	  : "Ir" (CR_C)</div><div class='add'>+	  : "cc");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void platform_do_lowpower(unsigned int cpu, int *spurious)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * there is no power-control hardware on this platform, so all</div><div class='add'>+	 * we can do is put the core into WFI; this is safe as the calling</div><div class='add'>+	 * code will have already disabled interrupts</div><div class='add'>+	 */</div><div class='add'>+	for (;;) {</div><div class='add'>+		/*</div><div class='add'>+		 * here's the WFI</div><div class='add'>+		 */</div><div class='add'>+		asm(".word	0xe320f003\n"</div><div class='add'>+		    :</div><div class='add'>+		    :</div><div class='add'>+		    : "memory", "cc");</div><div class='add'>+</div><div class='add'>+		if (pen_release == cpu_logical_map(cpu)) {</div><div class='add'>+			/*</div><div class='add'>+			 * OK, proper wakeup, we're done</div><div class='add'>+			 */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Getting here, means that we have come out of WFI without</div><div class='add'>+		 * having been woken up - this shouldn't happen</div><div class='add'>+		 *</div><div class='add'>+		 * Just note it happening - when we're woken, we can report</div><div class='add'>+		 * its occurrence.</div><div class='add'>+		 */</div><div class='add'>+		(*spurious)++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * platform-specific code to shutdown a CPU</div><div class='add'>+ *</div><div class='add'>+ * Called with IRQs disabled</div><div class='add'>+ */</div><div class='add'>+void ox820_cpu_die(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	int spurious = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * we're ready for shutdown now, so do it</div><div class='add'>+	 */</div><div class='add'>+	cpu_enter_lowpower();</div><div class='add'>+	platform_do_lowpower(cpu, &amp;spurious);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * bring this CPU back into the world of cache</div><div class='add'>+	 * coherency, and then restore interrupts</div><div class='add'>+	 */</div><div class='add'>+	cpu_leave_lowpower();</div><div class='add'>+</div><div class='add'>+	if (spurious)</div><div class='add'>+		pr_warn("CPU%u: %u spurious wakeup calls\n", cpu, spurious);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-oxnas/platsmp.c b/arch/arm/mach-oxnas/platsmp.c<br/>new file mode 100644<br/>index 000000000000..442cc8a2f7dc<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-oxnas/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-oxnas/platsmp.c</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Neil Armstrong &lt;narmstrong@baylibre.com&gt;</div><div class='add'>+ * Copyright (C) 2013 Ma Haijun &lt;mahaijuns@gmail.com&gt;</div><div class='add'>+ * Copyright (C) 2002 ARM Ltd.</div><div class='add'>+ * All Rights Reserved</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/cp15.h&gt;</div><div class='add'>+#include &lt;asm/smp_plat.h&gt;</div><div class='add'>+#include &lt;asm/smp_scu.h&gt;</div><div class='add'>+</div><div class='add'>+extern void ox820_secondary_startup(void);</div><div class='add'>+extern void ox820_cpu_die(unsigned int cpu);</div><div class='add'>+</div><div class='add'>+static void __iomem *cpu_ctrl;</div><div class='add'>+static void __iomem *gic_cpu_ctrl;</div><div class='add'>+</div><div class='add'>+#define HOLDINGPEN_CPU_OFFSET		0xc8</div><div class='add'>+#define HOLDINGPEN_LOCATION_OFFSET	0xc4</div><div class='add'>+</div><div class='add'>+#define GIC_NCPU_OFFSET(cpu)		(0x100 + (cpu)*0x100)</div><div class='add'>+#define GIC_CPU_CTRL			0x00</div><div class='add'>+#define GIC_CPU_CTRL_ENABLE		1</div><div class='add'>+</div><div class='add'>+int __init ox820_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Write the address of secondary startup into the</div><div class='add'>+	 * system-wide flags register. The BootMonitor waits</div><div class='add'>+	 * until it receives a soft interrupt, and then the</div><div class='add'>+	 * secondary CPU branches to this address.</div><div class='add'>+	 */</div><div class='add'>+	writel(virt_to_phys(ox820_secondary_startup),</div><div class='add'>+			cpu_ctrl + HOLDINGPEN_LOCATION_OFFSET);</div><div class='add'>+</div><div class='add'>+	writel(cpu, cpu_ctrl + HOLDINGPEN_CPU_OFFSET);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable GIC cpu interface in CPU Interface Control Register</div><div class='add'>+	 */</div><div class='add'>+	writel(GIC_CPU_CTRL_ENABLE,</div><div class='add'>+		gic_cpu_ctrl + GIC_NCPU_OFFSET(cpu) + GIC_CPU_CTRL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Send the secondary CPU a soft interrupt, thereby causing</div><div class='add'>+	 * the boot monitor to read the system wide flags register,</div><div class='add'>+	 * and branch to the address found there.</div><div class='add'>+	 */</div><div class='add'>+	arch_send_wakeup_ipi_mask(cpumask_of(cpu));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init ox820_smp_prepare_cpus(unsigned int max_cpus)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	void __iomem *scu_base;</div><div class='add'>+</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "arm,arm11mp-scu");</div><div class='add'>+	scu_base = of_iomap(np, 0);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	if (!scu_base)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Remap CPU Interrupt Interface Registers */</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "arm,arm11mp-gic");</div><div class='add'>+	gic_cpu_ctrl = of_iomap(np, 1);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	if (!gic_cpu_ctrl)</div><div class='add'>+		goto unmap_scu;</div><div class='add'>+</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "oxsemi,ox820-sys-ctrl");</div><div class='add'>+	cpu_ctrl = of_iomap(np, 0);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	if (!cpu_ctrl)</div><div class='add'>+		goto unmap_scu;</div><div class='add'>+</div><div class='add'>+	scu_enable(scu_base);</div><div class='add'>+	flush_cache_all();</div><div class='add'>+</div><div class='add'>+unmap_scu:</div><div class='add'>+	iounmap(scu_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct smp_operations ox820_smp_ops __initconst = {</div><div class='add'>+	.smp_prepare_cpus	= ox820_smp_prepare_cpus,</div><div class='add'>+	.smp_boot_secondary	= ox820_boot_secondary,</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+	.cpu_die		= ox820_cpu_die,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+CPU_METHOD_OF_DECLARE(ox820_smp, "oxsemi,ox820-smp", &amp;ox820_smp_ops);</div><div class='head'>diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c<br/>index 0875b99add18..75ef5d4be554 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-prima2/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-prima2/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-prima2/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-prima2/platsmp.c</a></div><div class='hunk'>@@ -65,7 +65,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> 	 * waiting for. This would wake up the secondary core from WFE</div><div class='ctx'> 	 */</div><div class='ctx'> #define SIRFSOC_CPU1_JUMPADDR_OFFSET 0x2bc</div><div class='del'>-	__raw_writel(virt_to_phys(sirfsoc_secondary_startup),</div><div class='add'>+	__raw_writel(__pa_symbol(sirfsoc_secondary_startup),</div><div class='ctx'> 		clk_base + SIRFSOC_CPU1_JUMPADDR_OFFSET);</div><div class='ctx'> </div><div class='ctx'> #define SIRFSOC_CPU1_WAKEMAGIC_OFFSET 0x2b8</div><div class='head'>diff --git a/arch/arm/mach-prima2/pm.c b/arch/arm/mach-prima2/pm.c<br/>index 83e94c95e314..b0bcf1ff02dd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-prima2/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-prima2/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-prima2/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-prima2/pm.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ static void sirfsoc_set_sleep_mode(u32 mode)</div><div class='ctx'> </div><div class='ctx'> static int sirfsoc_pre_suspend_power_off(void)</div><div class='ctx'> {</div><div class='del'>-	u32 wakeup_entry = virt_to_phys(cpu_resume);</div><div class='add'>+	u32 wakeup_entry = __pa_symbol(cpu_resume);</div><div class='ctx'> </div><div class='ctx'> 	sirfsoc_rtc_iobrg_writel(wakeup_entry, sirfsoc_pwrc_base +</div><div class='ctx'> 		SIRFSOC_PWRC_SCRATCH_PAD1);</div><div class='head'>diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c<br/>index 8a3c409294bf..d452a49c0396 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/balloon3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/balloon3.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/balloon3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/balloon3.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/colibri-pxa270-income.c b/arch/arm/mach-pxa/colibri-pxa270-income.c<br/>index 8cff770e6a00..d7cf47d03618 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/colibri-pxa270-income.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/colibri-pxa270-income.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/colibri-pxa270-income.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/colibri-pxa270-income.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c<br/>index 10bfdb169366..7270f0db3432 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/corgi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/corgi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/corgi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/corgi.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='hunk'>@@ -35,7 +36,6 @@</div><div class='ctx'> #include &lt;linux/mtd/sharpsl.h&gt;</div><div class='ctx'> #include &lt;linux/input/matrix_keypad.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;video/w100fb.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c<br/>index 03354c21e1f2..811a7317f3ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/em-x270.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/em-x270.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/em-x270.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/em-x270.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/da903x.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/machine.h&gt;</div><div class='add'>+#include &lt;linux/regulator/fixed.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/tdo24m.h&gt;</div><div class='ctx'> #include &lt;linux/spi/libertas_spi.h&gt;</div><div class='hunk'>@@ -34,8 +35,6 @@</div><div class='ctx'> #include &lt;linux/i2c/pxa-i2c.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/userspace-consumer.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;media/soc_camera.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -958,8 +957,6 @@ static inline void em_x270_init_gpio_keys(void) {}</div><div class='ctx'> </div><div class='ctx'> /* Quick Capture Interface and sensor setup */</div><div class='ctx'> #if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE)</div><div class='del'>-static struct regulator *em_x270_camera_ldo;</div><div class='del'>-</div><div class='ctx'> static int em_x270_sensor_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -969,81 +966,53 @@ static int em_x270_sensor_init(void)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	gpio_direction_output(cam_reset, 0);</div><div class='del'>-</div><div class='del'>-	em_x270_camera_ldo = regulator_get(NULL, "vcc cam");</div><div class='del'>-	if (em_x270_camera_ldo == NULL) {</div><div class='del'>-		gpio_free(cam_reset);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = regulator_enable(em_x270_camera_ldo);</div><div class='del'>-	if (ret) {</div><div class='del'>-		regulator_put(em_x270_camera_ldo);</div><div class='del'>-		gpio_free(cam_reset);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	gpio_set_value(cam_reset, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct pxacamera_platform_data em_x270_camera_platform_data = {</div><div class='del'>-	.flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 |</div><div class='del'>-		PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN,</div><div class='del'>-	.mclk_10khz = 2600,</div><div class='add'>+static struct regulator_consumer_supply camera_dummy_supplies[] = {</div><div class='add'>+	REGULATOR_SUPPLY("vdd", "0-005d"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int em_x270_sensor_power(struct device *dev, int on)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	int is_on = regulator_is_enabled(em_x270_camera_ldo);</div><div class='del'>-</div><div class='del'>-	if (on == is_on)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	gpio_set_value(cam_reset, !on);</div><div class='del'>-</div><div class='del'>-	if (on)</div><div class='del'>-		ret = regulator_enable(em_x270_camera_ldo);</div><div class='del'>-	else</div><div class='del'>-		ret = regulator_disable(em_x270_camera_ldo);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	gpio_set_value(cam_reset, on);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct i2c_board_info em_x270_i2c_cam_info[] = {</div><div class='del'>-	{</div><div class='del'>-		I2C_BOARD_INFO("mt9m111", 0x48),</div><div class='add'>+static struct regulator_init_data camera_dummy_initdata = {</div><div class='add'>+	.consumer_supplies = camera_dummy_supplies,</div><div class='add'>+	.num_consumer_supplies = ARRAY_SIZE(camera_dummy_supplies),</div><div class='add'>+	.constraints = {</div><div class='add'>+		.valid_ops_mask = REGULATOR_CHANGE_STATUS,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct soc_camera_link iclink = {</div><div class='del'>-	.bus_id		= 0,</div><div class='del'>-	.power		= em_x270_sensor_power,</div><div class='del'>-	.board_info	= &amp;em_x270_i2c_cam_info[0],</div><div class='del'>-	.i2c_adapter_id	= 0,</div><div class='add'>+static struct fixed_voltage_config camera_dummy_config = {</div><div class='add'>+	.supply_name		= "camera_vdd",</div><div class='add'>+	.input_supply		= "vcc cam",</div><div class='add'>+	.microvolts		= 2800000,</div><div class='add'>+	.gpio			= -1,</div><div class='add'>+	.enable_high		= 0,</div><div class='add'>+	.init_data		= &amp;camera_dummy_initdata,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device em_x270_camera = {</div><div class='del'>-	.name	= "soc-camera-pdrv",</div><div class='del'>-	.id	= -1,</div><div class='add'>+static struct platform_device camera_supply_dummy_device = {</div><div class='add'>+	.name	= "reg-fixed-voltage",</div><div class='add'>+	.id	= 1,</div><div class='ctx'> 	.dev	= {</div><div class='del'>-		.platform_data = &amp;iclink,</div><div class='add'>+		.platform_data = &amp;camera_dummy_config,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct pxacamera_platform_data em_x270_camera_platform_data = {</div><div class='add'>+	.flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 |</div><div class='add'>+		PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN,</div><div class='add'>+	.mclk_10khz = 2600,</div><div class='add'>+	.sensor_i2c_adapter_id = 0,</div><div class='add'>+	.sensor_i2c_address = 0x5d,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void  __init em_x270_init_camera(void)</div><div class='ctx'> {</div><div class='del'>-	if (em_x270_sensor_init() == 0) {</div><div class='add'>+	if (em_x270_sensor_init() == 0)</div><div class='ctx'> 		pxa_set_camera_info(&amp;em_x270_camera_platform_data);</div><div class='del'>-		platform_device_register(&amp;em_x270_camera);</div><div class='del'>-	}</div><div class='add'>+	platform_device_register(&amp;camera_supply_dummy_device);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline void em_x270_init_camera(void) {}</div><div class='head'>diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c<br/>index 34ad0a89d4a9..a057cf9c0e7b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/ezx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/ezx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/ezx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/ezx.c</a></div><div class='hunk'>@@ -17,14 +17,14 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pwm.h&gt;</div><div class='ctx'> #include &lt;linux/pwm_backlight.h&gt;</div><div class='add'>+#include &lt;linux/regulator/machine.h&gt;</div><div class='add'>+#include &lt;linux/regulator/fixed.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='ctx'> #include &lt;linux/leds-lp3944.h&gt;</div><div class='ctx'> #include &lt;linux/i2c/pxa-i2c.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;media/soc_camera.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -696,6 +696,37 @@ static struct pxa27x_keypad_platform_data e2_keypad_platform_data = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_MACH_EZX_E2 */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_MACH_EZX_A780) || defined(CONFIG_MACH_EZX_A910)</div><div class='add'>+/* camera */</div><div class='add'>+static struct regulator_consumer_supply camera_dummy_supplies[] = {</div><div class='add'>+	REGULATOR_SUPPLY("vdd", "0-005d"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regulator_init_data camera_dummy_initdata = {</div><div class='add'>+	.consumer_supplies = camera_dummy_supplies,</div><div class='add'>+	.num_consumer_supplies = ARRAY_SIZE(camera_dummy_supplies),</div><div class='add'>+	.constraints = {</div><div class='add'>+		.valid_ops_mask = REGULATOR_CHANGE_STATUS,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fixed_voltage_config camera_dummy_config = {</div><div class='add'>+	.supply_name		= "camera_vdd",</div><div class='add'>+	.microvolts		= 2800000,</div><div class='add'>+	.gpio			= GPIO50_nCAM_EN,</div><div class='add'>+	.enable_high		= 0,</div><div class='add'>+	.init_data		= &amp;camera_dummy_initdata,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device camera_supply_dummy_device = {</div><div class='add'>+	.name	= "reg-fixed-voltage",</div><div class='add'>+	.id	= 1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data = &amp;camera_dummy_config,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MACH_EZX_A780</div><div class='ctx'> /* gpio_keys */</div><div class='ctx'> static struct gpio_keys_button a780_buttons[] = {</div><div class='hunk'>@@ -723,6 +754,15 @@ static struct platform_device a780_gpio_keys = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* camera */</div><div class='add'>+static int a780_camera_reset(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(GPIO19_GEN1_CAM_RST, 0);</div><div class='add'>+	msleep(10);</div><div class='add'>+	gpio_set_value(GPIO19_GEN1_CAM_RST, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int a780_camera_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -731,73 +771,36 @@ static int a780_camera_init(void)</div><div class='ctx'> 	 * GPIO50_nCAM_EN is active low</div><div class='ctx'> 	 * GPIO19_GEN1_CAM_RST is active on rising edge</div><div class='ctx'> 	 */</div><div class='del'>-	err = gpio_request(GPIO50_nCAM_EN, "nCAM_EN");</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("%s: Failed to request nCAM_EN\n", __func__);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	err = gpio_request(GPIO19_GEN1_CAM_RST, "CAM_RST");</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_err("%s: Failed to request CAM_RST\n", __func__);</div><div class='del'>-		goto fail_gpio_cam_rst;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	gpio_direction_output(GPIO50_nCAM_EN, 1);</div><div class='ctx'> 	gpio_direction_output(GPIO19_GEN1_CAM_RST, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-fail_gpio_cam_rst:</div><div class='del'>-	gpio_free(GPIO50_nCAM_EN);</div><div class='del'>-fail:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a780_camera_power(struct device *dev, int on)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(GPIO50_nCAM_EN, !on);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a780_camera_reset(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(GPIO19_GEN1_CAM_RST, 0);</div><div class='del'>-	msleep(10);</div><div class='del'>-	gpio_set_value(GPIO19_GEN1_CAM_RST, 1);</div><div class='add'>+	a780_camera_reset(NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct pxacamera_platform_data a780_pxacamera_platform_data = {</div><div class='ctx'> 	.flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 |</div><div class='del'>-		PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN,</div><div class='add'>+		PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN |</div><div class='add'>+		PXA_CAMERA_PCP,</div><div class='ctx'> 	.mclk_10khz = 5000,</div><div class='add'>+	.sensor_i2c_adapter_id = 0,</div><div class='add'>+	.sensor_i2c_address = 0x5d,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct i2c_board_info a780_camera_i2c_board_info = {</div><div class='del'>-	I2C_BOARD_INFO("mt9m111", 0x5d),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct soc_camera_link a780_iclink = {</div><div class='del'>-	.bus_id         = 0,</div><div class='del'>-	.flags          = SOCAM_SENSOR_INVERT_PCLK,</div><div class='del'>-	.i2c_adapter_id = 0,</div><div class='del'>-	.board_info     = &amp;a780_camera_i2c_board_info,</div><div class='del'>-	.power          = a780_camera_power,</div><div class='del'>-	.reset          = a780_camera_reset,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device a780_camera = {</div><div class='del'>-	.name   = "soc-camera-pdrv",</div><div class='del'>-	.id     = 0,</div><div class='del'>-	.dev    = {</div><div class='del'>-		.platform_data = &amp;a780_iclink,</div><div class='add'>+static struct i2c_board_info a780_i2c_board_info[] = {</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("mt9m111", 0x5d),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *a780_devices[] __initdata = {</div><div class='ctx'> 	&amp;a780_gpio_keys,</div><div class='add'>+	&amp;camera_supply_dummy_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init a780_init(void)</div><div class='hunk'>@@ -811,19 +814,19 @@ static void __init a780_init(void)</div><div class='ctx'> 	pxa_set_stuart_info(NULL);</div><div class='ctx'> </div><div class='ctx'> 	pxa_set_i2c_info(NULL);</div><div class='add'>+	i2c_register_board_info(0, ARRAY_AND_SIZE(a780_i2c_board_info));</div><div class='ctx'> </div><div class='ctx'> 	pxa_set_fb_info(NULL, &amp;ezx_fb_info_1);</div><div class='ctx'> </div><div class='ctx'> 	pxa_set_keypad_info(&amp;a780_keypad_platform_data);</div><div class='ctx'> </div><div class='del'>-	if (a780_camera_init() == 0) {</div><div class='add'>+	if (a780_camera_init() == 0)</div><div class='ctx'> 		pxa_set_camera_info(&amp;a780_pxacamera_platform_data);</div><div class='del'>-		platform_device_register(&amp;a780_camera);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pwm_add_table(ezx_pwm_lookup, ARRAY_SIZE(ezx_pwm_lookup));</div><div class='ctx'> 	platform_add_devices(ARRAY_AND_SIZE(ezx_devices));</div><div class='ctx'> 	platform_add_devices(ARRAY_AND_SIZE(a780_devices));</div><div class='add'>+	regulator_has_full_constraints();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(EZX_A780, "Motorola EZX A780")</div><div class='hunk'>@@ -1001,6 +1004,15 @@ static struct platform_device a910_gpio_keys = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* camera */</div><div class='add'>+static int a910_camera_reset(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(GPIO28_GEN2_CAM_RST, 0);</div><div class='add'>+	msleep(10);</div><div class='add'>+	gpio_set_value(GPIO28_GEN2_CAM_RST, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int a910_camera_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1009,68 +1021,25 @@ static int a910_camera_init(void)</div><div class='ctx'> 	 * GPIO50_nCAM_EN is active low</div><div class='ctx'> 	 * GPIO28_GEN2_CAM_RST is active on rising edge</div><div class='ctx'> 	 */</div><div class='del'>-	err = gpio_request(GPIO50_nCAM_EN, "nCAM_EN");</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("%s: Failed to request nCAM_EN\n", __func__);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	err = gpio_request(GPIO28_GEN2_CAM_RST, "CAM_RST");</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_err("%s: Failed to request CAM_RST\n", __func__);</div><div class='del'>-		goto fail_gpio_cam_rst;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	gpio_direction_output(GPIO50_nCAM_EN, 1);</div><div class='ctx'> 	gpio_direction_output(GPIO28_GEN2_CAM_RST, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-fail_gpio_cam_rst:</div><div class='del'>-	gpio_free(GPIO50_nCAM_EN);</div><div class='del'>-fail:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a910_camera_power(struct device *dev, int on)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(GPIO50_nCAM_EN, !on);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int a910_camera_reset(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	gpio_set_value(GPIO28_GEN2_CAM_RST, 0);</div><div class='del'>-	msleep(10);</div><div class='del'>-	gpio_set_value(GPIO28_GEN2_CAM_RST, 1);</div><div class='add'>+	a910_camera_reset(NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct pxacamera_platform_data a910_pxacamera_platform_data = {</div><div class='ctx'> 	.flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 |</div><div class='del'>-		PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN,</div><div class='add'>+		PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN |</div><div class='add'>+		PXA_CAMERA_PCP,</div><div class='ctx'> 	.mclk_10khz = 5000,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct i2c_board_info a910_camera_i2c_board_info = {</div><div class='del'>-	I2C_BOARD_INFO("mt9m111", 0x5d),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct soc_camera_link a910_iclink = {</div><div class='del'>-	.bus_id         = 0,</div><div class='del'>-	.i2c_adapter_id = 0,</div><div class='del'>-	.board_info     = &amp;a910_camera_i2c_board_info,</div><div class='del'>-	.power          = a910_camera_power,</div><div class='del'>-	.reset          = a910_camera_reset,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device a910_camera = {</div><div class='del'>-	.name   = "soc-camera-pdrv",</div><div class='del'>-	.id     = 0,</div><div class='del'>-	.dev    = {</div><div class='del'>-		.platform_data = &amp;a910_iclink,</div><div class='del'>-	},</div><div class='add'>+	.sensor_i2c_adapter_id = 0,</div><div class='add'>+	.sensor_i2c_address = 0x5d,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* leds-lp3944 */</div><div class='hunk'>@@ -1122,10 +1091,14 @@ static struct i2c_board_info __initdata a910_i2c_board_info[] = {</div><div class='ctx'> 		I2C_BOARD_INFO("lp3944", 0x60),</div><div class='ctx'> 		.platform_data = &amp;a910_lp3944_leds,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("mt9m111", 0x5d),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *a910_devices[] __initdata = {</div><div class='ctx'> 	&amp;a910_gpio_keys,</div><div class='add'>+	&amp;camera_supply_dummy_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init a910_init(void)</div><div class='hunk'>@@ -1145,14 +1118,13 @@ static void __init a910_init(void)</div><div class='ctx'> </div><div class='ctx'> 	pxa_set_keypad_info(&amp;a910_keypad_platform_data);</div><div class='ctx'> </div><div class='del'>-	if (a910_camera_init() == 0) {</div><div class='add'>+	if (a910_camera_init() == 0)</div><div class='ctx'> 		pxa_set_camera_info(&amp;a910_pxacamera_platform_data);</div><div class='del'>-		platform_device_register(&amp;a910_camera);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pwm_add_table(ezx_pwm_lookup, ARRAY_SIZE(ezx_pwm_lookup));</div><div class='ctx'> 	platform_add_devices(ARRAY_AND_SIZE(ezx_devices));</div><div class='ctx'> 	platform_add_devices(ARRAY_AND_SIZE(a910_devices));</div><div class='add'>+	regulator_has_full_constraints();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(EZX_A910, "Motorola EZX A910")</div><div class='head'>diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c<br/>index ec510ecf8370..cb73a9723d0e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/generic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/generic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/generic.c</a></div><div class='hunk'>@@ -43,21 +43,6 @@ void clear_reset_status(unsigned int mask)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned long get_clock_tick_rate(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long clock_tick_rate;</div><div class='del'>-</div><div class='del'>-	if (cpu_is_pxa25x())</div><div class='del'>-		clock_tick_rate = 3686400;</div><div class='del'>-	else if (machine_is_mainstone())</div><div class='del'>-		clock_tick_rate = 3249600;</div><div class='del'>-	else</div><div class='del'>-		clock_tick_rate = 3250000;</div><div class='del'>-</div><div class='del'>-	return clock_tick_rate;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(get_clock_tick_rate);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * For non device-tree builds, keep legacy timer init</div><div class='ctx'>  */</div><div class='hunk'>@@ -69,8 +54,7 @@ void __init pxa_timer_init(void)</div><div class='ctx'> 		pxa27x_clocks_init();</div><div class='ctx'> 	if (cpu_is_pxa3xx())</div><div class='ctx'> 		pxa3xx_clocks_init();</div><div class='del'>-	pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x40a00000),</div><div class='del'>-			    get_clock_tick_rate());</div><div class='add'>+	pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x40a00000));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c<br/>index 66070acaa888..88e0068f92a8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/idp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/idp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/idp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/idp.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -85,6 +86,7 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> static struct smc91x_platdata smc91x_platdata = {</div><div class='ctx'> 	.flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT |</div><div class='ctx'> 		 SMC91X_USE_DMA | SMC91X_NOWAIT,</div><div class='add'>+	.pxa_u16_align4 = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device smc91x_device = {</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h<br/>index 8d63c211b22f..55064124ca4e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/include/mach/hardware.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/include/mach/hardware.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/include/mach/hardware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/include/mach/hardware.h</a></div><div class='hunk'>@@ -303,8 +303,6 @@</div><div class='ctx'>  */</div><div class='ctx'> extern unsigned int get_memclk_frequency_10khz(void);</div><div class='ctx'> </div><div class='del'>-/* return the clock tick rate of the OS timer */</div><div class='del'>-extern unsigned long get_clock_tick_rate(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif  /* _ASM_ARCH_HARDWARE_H */</div><div class='head'>diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c<br/>index 40964069a17c..a2d851a3a546 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/mainstone.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/mainstone.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/mainstone.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/mainstone.c</a></div><div class='hunk'>@@ -140,6 +140,7 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> static struct smc91x_platdata mainstone_smc91x_info = {</div><div class='ctx'> 	.flags	= SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT |</div><div class='ctx'> 		  SMC91X_NOWAIT | SMC91X_USE_DMA,</div><div class='add'>+	.pxa_u16_align4 = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device smc91x_device = {</div><div class='head'>diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c<br/>index 38a96a193dc4..8a5d0491e73c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/mioa701.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/mioa701.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/mioa701.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/mioa701.c</a></div><div class='hunk'>@@ -57,7 +57,6 @@</div><div class='ctx'> #include &lt;linux/platform_data/media/camera-pxa.h&gt;</div><div class='ctx'> #include &lt;mach/audio.h&gt;</div><div class='ctx'> #include &lt;mach/smemc.h&gt;</div><div class='del'>-#include &lt;media/soc_camera.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mioa701.h"</div><div class='ctx'> </div><div class='hunk'>@@ -627,6 +626,8 @@ struct pxacamera_platform_data mioa701_pxacamera_platform_data = {</div><div class='ctx'> 	.flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 |</div><div class='ctx'> 		PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN,</div><div class='ctx'> 	.mclk_10khz = 5000,</div><div class='add'>+	.sensor_i2c_adapter_id = 0,</div><div class='add'>+	.sensor_i2c_address = 0x5d,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct i2c_board_info __initdata mioa701_pi2c_devices[] = {</div><div class='hunk'>@@ -643,12 +644,6 @@ static struct i2c_board_info mioa701_i2c_devices[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct soc_camera_link iclink = {</div><div class='del'>-	.bus_id		= 0, /* Match id in pxa27x_device_camera in device.c */</div><div class='del'>-	.board_info	= &amp;mioa701_i2c_devices[0],</div><div class='del'>-	.i2c_adapter_id	= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct i2c_pxa_platform_data i2c_pdata = {</div><div class='ctx'> 	.fast_mode = 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -684,7 +679,6 @@ MIO_SIMPLE_DEV(mioa701_sound,	  "mioa701-wm9713", NULL)</div><div class='ctx'> MIO_SIMPLE_DEV(mioa701_board,	  "mioa701-board",  NULL)</div><div class='ctx'> MIO_SIMPLE_DEV(wm9713_acodec,	  "wm9713-codec",   NULL);</div><div class='ctx'> MIO_SIMPLE_DEV(gpio_vbus,	  "gpio-vbus",      &amp;gpio_vbus_data);</div><div class='del'>-MIO_SIMPLE_DEV(mioa701_camera,	  "soc-camera-pdrv",&amp;iclink);</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;mioa701_gpio_keys,</div><div class='hunk'>@@ -696,7 +690,6 @@ static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;power_dev,</div><div class='ctx'> 	&amp;docg3,</div><div class='ctx'> 	&amp;gpio_vbus,</div><div class='del'>-	&amp;mioa701_camera,</div><div class='ctx'> 	&amp;mioa701_board,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -761,6 +754,7 @@ static void __init mioa701_machine_init(void)</div><div class='ctx'> 	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='ctx'> 	gsm_init();</div><div class='ctx'> </div><div class='add'>+	i2c_register_board_info(0, ARRAY_AND_SIZE(mioa701_i2c_devices));</div><div class='ctx'> 	i2c_register_board_info(1, ARRAY_AND_SIZE(mioa701_pi2c_devices));</div><div class='ctx'> 	pxa_set_i2c_info(&amp;i2c_pdata);</div><div class='ctx'> 	pxa27x_set_i2c_power_info(NULL);</div><div class='hunk'>@@ -769,6 +763,7 @@ static void __init mioa701_machine_init(void)</div><div class='ctx'> 	regulator_register_always_on(0, "fixed-5.0V", fixed_5v0_consumers,</div><div class='ctx'> 				     ARRAY_SIZE(fixed_5v0_consumers),</div><div class='ctx'> 				     5000000);</div><div class='add'>+	regulator_has_full_constraints();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mioa701_machine_exit(void)</div><div class='head'>diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c<br/>index 9c308de158c6..29630061e700 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/palmz72.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/palmz72.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/palmz72.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/palmz72.c</a></div><div class='hunk'>@@ -249,7 +249,7 @@ static int palmz72_pm_suspend(void)</div><div class='ctx'> 	store_ptr = *PALMZ72_SAVE_DWORD;</div><div class='ctx'> </div><div class='ctx'> 	/* Setting PSPR to a proper value */</div><div class='del'>-	PSPR = virt_to_phys(&amp;palmz72_resume_info);</div><div class='add'>+	PSPR = __pa_symbol(&amp;palmz72_resume_info);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c<br/>index 12b94357fbc1..ba431fad5c47 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/pxa25x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/pxa25x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/pxa25x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/pxa25x.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state)</div><div class='ctx'> static int pxa25x_cpu_pm_prepare(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* set resume return address */</div><div class='del'>-	PSPR = virt_to_phys(cpu_resume);</div><div class='add'>+	PSPR = __pa_symbol(cpu_resume);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -156,7 +156,7 @@ static int __init __init</div><div class='ctx'> pxa25x_dt_init_irq(struct device_node *node, struct device_node *parent)</div><div class='ctx'> {</div><div class='ctx'> 	pxa_dt_irq_init(pxa25x_set_wake);</div><div class='del'>-	set_handle_irq(ichp_handle_irq);</div><div class='add'>+	set_handle_irq(icip_handle_irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c<br/>index c0185c5c5a08..9b69be4e9fe3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/pxa27x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/pxa27x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/pxa27x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/pxa27x.c</a></div><div class='hunk'>@@ -168,7 +168,7 @@ static int pxa27x_cpu_pm_valid(suspend_state_t state)</div><div class='ctx'> static int pxa27x_cpu_pm_prepare(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* set resume return address */</div><div class='del'>-	PSPR = virt_to_phys(cpu_resume);</div><div class='add'>+	PSPR = __pa_symbol(cpu_resume);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c<br/>index 87acc96388c7..0cc9f124c9ac 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/pxa3xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/pxa3xx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/pxa3xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/pxa3xx.c</a></div><div class='hunk'>@@ -123,7 +123,7 @@ static void pxa3xx_cpu_pm_suspend(void)</div><div class='ctx'> 	PSPR = 0x5c014000;</div><div class='ctx'> </div><div class='ctx'> 	/* overwrite with the resume address */</div><div class='del'>-	*p = virt_to_phys(cpu_resume);</div><div class='add'>+	*p = __pa_symbol(cpu_resume);</div><div class='ctx'> </div><div class='ctx'> 	cpu_suspend(0, pxa3xx_finish_suspend);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa_cplds_irqs.c b/arch/arm/mach-pxa/pxa_cplds_irqs.c<br/>index e362f865fcd2..941508585e34 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/pxa_cplds_irqs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/pxa_cplds_irqs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/pxa_cplds_irqs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/pxa_cplds_irqs.c</a></div><div class='hunk'>@@ -120,13 +120,9 @@ static int cplds_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!fpga)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='del'>-	if (res) {</div><div class='del'>-		fpga-&gt;irq = (unsigned int)res-&gt;start;</div><div class='del'>-		irqflags = res-&gt;flags;</div><div class='del'>-	}</div><div class='del'>-	if (!fpga-&gt;irq)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	fpga-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (fpga-&gt;irq &lt;= 0)</div><div class='add'>+		return fpga-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	base_irq = platform_get_irq(pdev, 1);</div><div class='ctx'> 	if (base_irq &lt; 0)</div><div class='hunk'>@@ -142,6 +138,7 @@ static int cplds_probe(struct platform_device *pdev)</div><div class='ctx'> 	writel(fpga-&gt;irq_mask, fpga-&gt;base + FPGA_IRQ_MASK_EN);</div><div class='ctx'> 	writel(0, fpga-&gt;base + FPGA_IRQ_SET_CLR);</div><div class='ctx'> </div><div class='add'>+	irqflags = irq_get_trigger_type(fpga-&gt;irq);</div><div class='ctx'> 	ret = devm_request_irq(&amp;pdev-&gt;dev, fpga-&gt;irq, cplds_irq_handler,</div><div class='ctx'> 			       irqflags, dev_name(&amp;pdev-&gt;dev), fpga);</div><div class='ctx'> 	if (ret == -ENOSYS)</div><div class='head'>diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c<br/>index 2c150bfc0cd5..67d66c702574 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/spitz.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/spitz.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/spitz.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/spitz.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;linux/input/matrix_keypad.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/machine.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c<br/>index 702f4f14b708..7b6610e9dae4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/stargate2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/stargate2.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/stargate2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/stargate2.c</a></div><div class='hunk'>@@ -673,6 +673,7 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> static struct smc91x_platdata stargate2_smc91x_info = {</div><div class='ctx'> 	.flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT</div><div class='ctx'> 	| SMC91X_NOWAIT | SMC91X_USE_DMA,</div><div class='add'>+	.pxa_u16_align4 = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device smc91x_device = {</div><div class='head'>diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c<br/>index ea78bc5c4198..3dd13b44c311 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/trizeps4.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/trizeps4.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/trizeps4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/trizeps4.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c<br/>index c006ee902a8f..70ab3ad28237 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/vpac270.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/vpac270.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/vpac270.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/vpac270.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/usb/gpio_vbus.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c<br/>index 3b94ecfb9426..ecbcaee5a2d5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/zeus.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/zeus.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/zeus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/zeus.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c<br/>index 3642389b301a..4268552d600d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-pxa/zylonite.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-pxa/zylonite.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-pxa/zylonite.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-pxa/zylonite.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-realview/platsmp-dt.c b/arch/arm/mach-realview/platsmp-dt.c<br/>index 70ca99eb52c6..c242423bf8db 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-realview/platsmp-dt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-realview/platsmp-dt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-realview/platsmp-dt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-realview/platsmp-dt.c</a></div><div class='hunk'>@@ -76,7 +76,7 @@ static void __init realview_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Put the boot address in this magic register */</div><div class='ctx'> 	regmap_write(map, REALVIEW_SYS_FLAGSSET_OFFSET,</div><div class='del'>-		     virt_to_phys(versatile_secondary_startup));</div><div class='add'>+		     __pa_symbol(versatile_secondary_startup));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct smp_operations realview_dt_smp_ops __initconst = {</div><div class='head'>diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c<br/>index 4d827a069d49..3abafdbdd7f4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-rockchip/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-rockchip/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-rockchip/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-rockchip/platsmp.c</a></div><div class='hunk'>@@ -156,7 +156,7 @@ static int rockchip_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> 		 */</div><div class='ctx'> 		mdelay(1); /* ensure the cpus other than cpu0 to startup */</div><div class='ctx'> </div><div class='del'>-		writel(virt_to_phys(secondary_startup), sram_base_addr + 8);</div><div class='add'>+		writel(__pa_symbol(secondary_startup), sram_base_addr + 8);</div><div class='ctx'> 		writel(0xDEADBEAF, sram_base_addr + 4);</div><div class='ctx'> 		dsb_sev();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -195,7 +195,7 @@ static int __init rockchip_smp_prepare_sram(struct device_node *node)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set the boot function for the sram code */</div><div class='del'>-	rockchip_boot_fn = virt_to_phys(secondary_startup);</div><div class='add'>+	rockchip_boot_fn = __pa_symbol(secondary_startup);</div><div class='ctx'> </div><div class='ctx'> 	/* copy the trampoline to sram, that runs during startup of the core */</div><div class='ctx'> 	memcpy(sram_base_addr, &amp;rockchip_secondary_trampoline, trampoline_sz);</div><div class='head'>diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c<br/>index bee8c8051929..0592534e0b88 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-rockchip/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-rockchip/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-rockchip/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-rockchip/pm.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ static inline u32 rk3288_l2_config(void)</div><div class='ctx'> static void rk3288_config_bootdata(void)</div><div class='ctx'> {</div><div class='ctx'> 	rkpm_bootdata_cpusp = rk3288_bootram_phy + (SZ_4K - 8);</div><div class='del'>-	rkpm_bootdata_cpu_code = virt_to_phys(cpu_resume);</div><div class='add'>+	rkpm_bootdata_cpu_code = __pa_symbol(cpu_resume);</div><div class='ctx'> </div><div class='ctx'> 	rkpm_bootdata_l2ctlr_f  = 1;</div><div class='ctx'> 	rkpm_bootdata_l2ctlr = rk3288_l2_config();</div><div class='head'>diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c<br/>index a7ab9ec141f8..ef0500a4c8ad 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-rockchip/rockchip.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-rockchip/rockchip.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-rockchip/rockchip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-rockchip/rockchip.c</a></div><div class='hunk'>@@ -29,13 +29,11 @@</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "pm.h"</div><div class='ctx'> </div><div class='del'>-#define RK3288_GRF_SOC_CON0 0x244</div><div class='ctx'> #define RK3288_TIMER6_7_PHYS 0xff810000</div><div class='ctx'> </div><div class='ctx'> static void __init rockchip_timer_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (of_machine_is_compatible("rockchip,rk3288")) {</div><div class='del'>-		struct regmap *grf;</div><div class='ctx'> 		void __iomem *reg_base;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -54,16 +52,6 @@ static void __init rockchip_timer_init(void)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pr_err("rockchip: could not map timer7 registers\n");</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Disable auto jtag/sdmmc switching that causes issues</div><div class='del'>-		 * with the mmc controllers making them unreliable</div><div class='del'>-		 */</div><div class='del'>-		grf = syscon_regmap_lookup_by_compatible("rockchip,rk3288-grf");</div><div class='del'>-		if (!IS_ERR(grf))</div><div class='del'>-			regmap_write(grf, RK3288_GRF_SOC_CON0, 0x10000000);</div><div class='del'>-		else</div><div class='del'>-			pr_err("rockchip: could not get grf syscon\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	of_clk_init(NULL);</div><div class='head'>diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c<br/>index 6d3517dc4772..fb48f3141fb4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-rpc/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-rpc/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-rpc/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-rpc/dma.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;asm/fiq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/dma.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/iomd.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c<br/>index dc67a7fb3831..6b279d037774 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-rpc/ecard.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-rpc/ecard.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-rpc/ecard.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-rpc/ecard.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/bast-irq.c b/arch/arm/mach-s3c24xx/bast-irq.c<br/>index 2bb08961e934..ad8f4cd7c327 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/bast-irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/bast-irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/bast-irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/bast-irq.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> /* table of ISA irq nos to the relevant mask... zero means</div><div class='ctx'>  * the irq is not implemented</div><div class='ctx'> */</div><div class='del'>-static unsigned char bast_pc104_irqmasks[] = {</div><div class='add'>+static const unsigned char bast_pc104_irqmasks[] = {</div><div class='ctx'> 	0,   /* 0 */</div><div class='ctx'> 	0,   /* 1 */</div><div class='ctx'> 	0,   /* 2 */</div><div class='hunk'>@@ -63,7 +63,7 @@ static unsigned char bast_pc104_irqmasks[] = {</div><div class='ctx'> 	0,   /* 15 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };</div><div class='add'>+static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> bast_pc104_mask(struct irq_data *data)</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/common-smdk.c b/arch/arm/mach-s3c24xx/common-smdk.c<br/>index e9fbcc91c5c0..9e0bc46e90ec 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/common-smdk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/common-smdk.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/common-smdk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/common-smdk.c</a></div><div class='hunk'>@@ -171,6 +171,7 @@ static struct s3c2410_platform_nand smdk_nand_info = {</div><div class='ctx'> 	.twrph1		= 20,</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(smdk_nand_sets),</div><div class='ctx'> 	.sets		= smdk_nand_sets,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* devices we initialise */</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c<br/>index f6c3f151d0d4..b59f4f4f256f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/common.c</a></div><div class='hunk'>@@ -345,10 +345,40 @@ static struct s3c24xx_dma_channel s3c2410_dma_channels[DMACH_MAX] = {</div><div class='ctx'> 	[DMACH_USB_EP4] = { S3C24XX_DMA_APB, true, S3C24XX_DMA_CHANREQ(4, 3), },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct dma_slave_map s3c2410_dma_slave_map[] = {</div><div class='add'>+	{ "s3c2410-sdi", "rx-tx", (void *)DMACH_SDI },</div><div class='add'>+	{ "s3c2410-spi.0", "rx", (void *)DMACH_SPI0_RX },</div><div class='add'>+	{ "s3c2410-spi.0", "tx", (void *)DMACH_SPI0_TX },</div><div class='add'>+	{ "s3c2410-spi.1", "rx", (void *)DMACH_SPI1_RX },</div><div class='add'>+	{ "s3c2410-spi.1", "tx", (void *)DMACH_SPI1_TX },</div><div class='add'>+	/*</div><div class='add'>+	 * The DMA request source[1] (DMACH_UARTx_SRC2) are</div><div class='add'>+	 * not used in the UART driver.</div><div class='add'>+	 */</div><div class='add'>+	{ "s3c2410-uart.0", "rx", (void *)DMACH_UART0 },</div><div class='add'>+	{ "s3c2410-uart.0", "tx", (void *)DMACH_UART0 },</div><div class='add'>+	{ "s3c2410-uart.1", "rx", (void *)DMACH_UART1 },</div><div class='add'>+	{ "s3c2410-uart.1", "tx", (void *)DMACH_UART1 },</div><div class='add'>+	{ "s3c2410-uart.2", "rx", (void *)DMACH_UART2 },</div><div class='add'>+	{ "s3c2410-uart.2", "tx", (void *)DMACH_UART2 },</div><div class='add'>+	{ "s3c24xx-iis", "rx", (void *)DMACH_I2S_IN },</div><div class='add'>+	{ "s3c24xx-iis", "tx", (void *)DMACH_I2S_OUT },</div><div class='add'>+	{ "s3c-hsudc", "rx0", (void *)DMACH_USB_EP1 },</div><div class='add'>+	{ "s3c-hsudc", "tx0", (void *)DMACH_USB_EP1 },</div><div class='add'>+	{ "s3c-hsudc", "rx1", (void *)DMACH_USB_EP2 },</div><div class='add'>+	{ "s3c-hsudc", "tx1", (void *)DMACH_USB_EP2 },</div><div class='add'>+	{ "s3c-hsudc", "rx2", (void *)DMACH_USB_EP3 },</div><div class='add'>+	{ "s3c-hsudc", "tx2", (void *)DMACH_USB_EP3 },</div><div class='add'>+	{ "s3c-hsudc", "rx3", (void *)DMACH_USB_EP4 },</div><div class='add'>+	{ "s3c-hsudc", "tx3", (void *)DMACH_USB_EP4 }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct s3c24xx_dma_platdata s3c2410_dma_platdata = {</div><div class='ctx'> 	.num_phy_channels = 4,</div><div class='ctx'> 	.channels = s3c2410_dma_channels,</div><div class='ctx'> 	.num_channels = DMACH_MAX,</div><div class='add'>+	.slave_map = s3c2410_dma_slave_map,</div><div class='add'>+	.slavecnt = ARRAY_SIZE(s3c2410_dma_slave_map),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device s3c2410_device_dma = {</div><div class='hunk'>@@ -388,10 +418,36 @@ static struct s3c24xx_dma_channel s3c2412_dma_channels[DMACH_MAX] = {</div><div class='ctx'> 	[DMACH_USB_EP4] = { S3C24XX_DMA_APB, true, 16 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct dma_slave_map s3c2412_dma_slave_map[] = {</div><div class='add'>+	{ "s3c2412-sdi", "rx-tx", (void *)DMACH_SDI },</div><div class='add'>+	{ "s3c2412-spi.0", "rx", (void *)DMACH_SPI0_RX },</div><div class='add'>+	{ "s3c2412-spi.0", "tx", (void *)DMACH_SPI0_TX },</div><div class='add'>+	{ "s3c2412-spi.1", "rx", (void *)DMACH_SPI1_RX },</div><div class='add'>+	{ "s3c2412-spi.1", "tx", (void *)DMACH_SPI1_TX },</div><div class='add'>+	{ "s3c2440-uart.0", "rx", (void *)DMACH_UART0 },</div><div class='add'>+	{ "s3c2440-uart.0", "tx", (void *)DMACH_UART0 },</div><div class='add'>+	{ "s3c2440-uart.1", "rx", (void *)DMACH_UART1 },</div><div class='add'>+	{ "s3c2440-uart.1", "tx", (void *)DMACH_UART1 },</div><div class='add'>+	{ "s3c2440-uart.2", "rx", (void *)DMACH_UART2 },</div><div class='add'>+	{ "s3c2440-uart.2", "tx", (void *)DMACH_UART2 },</div><div class='add'>+	{ "s3c2412-iis", "rx", (void *)DMACH_I2S_IN },</div><div class='add'>+	{ "s3c2412-iis", "tx", (void *)DMACH_I2S_OUT },</div><div class='add'>+	{ "s3c-hsudc", "rx0", (void *)DMACH_USB_EP1 },</div><div class='add'>+	{ "s3c-hsudc", "tx0", (void *)DMACH_USB_EP1 },</div><div class='add'>+	{ "s3c-hsudc", "rx1", (void *)DMACH_USB_EP2 },</div><div class='add'>+	{ "s3c-hsudc", "tx1", (void *)DMACH_USB_EP2 },</div><div class='add'>+	{ "s3c-hsudc", "rx2", (void *)DMACH_USB_EP3 },</div><div class='add'>+	{ "s3c-hsudc", "tx2", (void *)DMACH_USB_EP3 },</div><div class='add'>+	{ "s3c-hsudc", "rx3", (void *)DMACH_USB_EP4 },</div><div class='add'>+	{ "s3c-hsudc", "tx3", (void *)DMACH_USB_EP4 }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct s3c24xx_dma_platdata s3c2412_dma_platdata = {</div><div class='ctx'> 	.num_phy_channels = 4,</div><div class='ctx'> 	.channels = s3c2412_dma_channels,</div><div class='ctx'> 	.num_channels = DMACH_MAX,</div><div class='add'>+	.slave_map = s3c2412_dma_slave_map,</div><div class='add'>+	.slavecnt = ARRAY_SIZE(s3c2412_dma_slave_map),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device s3c2412_device_dma = {</div><div class='hunk'>@@ -534,10 +590,30 @@ static struct s3c24xx_dma_channel s3c2443_dma_channels[DMACH_MAX] = {</div><div class='ctx'> 	[DMACH_MIC_IN] = { S3C24XX_DMA_APB, true, 29 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct dma_slave_map s3c2443_dma_slave_map[] = {</div><div class='add'>+	{ "s3c2440-sdi", "rx-tx", (void *)DMACH_SDI },</div><div class='add'>+	{ "s3c2443-spi.0", "rx", (void *)DMACH_SPI0_RX },</div><div class='add'>+	{ "s3c2443-spi.0", "tx", (void *)DMACH_SPI0_TX },</div><div class='add'>+	{ "s3c2443-spi.1", "rx", (void *)DMACH_SPI1_RX },</div><div class='add'>+	{ "s3c2443-spi.1", "tx", (void *)DMACH_SPI1_TX },</div><div class='add'>+	{ "s3c2440-uart.0", "rx", (void *)DMACH_UART0 },</div><div class='add'>+	{ "s3c2440-uart.0", "tx", (void *)DMACH_UART0 },</div><div class='add'>+	{ "s3c2440-uart.1", "rx", (void *)DMACH_UART1 },</div><div class='add'>+	{ "s3c2440-uart.1", "tx", (void *)DMACH_UART1 },</div><div class='add'>+	{ "s3c2440-uart.2", "rx", (void *)DMACH_UART2 },</div><div class='add'>+	{ "s3c2440-uart.2", "tx", (void *)DMACH_UART2 },</div><div class='add'>+	{ "s3c2440-uart.3", "rx", (void *)DMACH_UART3 },</div><div class='add'>+	{ "s3c2440-uart.3", "tx", (void *)DMACH_UART3 },</div><div class='add'>+	{ "s3c24xx-iis", "rx", (void *)DMACH_I2S_IN },</div><div class='add'>+	{ "s3c24xx-iis", "tx", (void *)DMACH_I2S_OUT },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct s3c24xx_dma_platdata s3c2443_dma_platdata = {</div><div class='ctx'> 	.num_phy_channels = 6,</div><div class='ctx'> 	.channels = s3c2443_dma_channels,</div><div class='ctx'> 	.num_channels = DMACH_MAX,</div><div class='add'>+	.slave_map = s3c2443_dma_slave_map,</div><div class='add'>+	.slavecnt = ARRAY_SIZE(s3c2443_dma_slave_map),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device s3c2443_device_dma = {</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/iotiming-s3c2410.c b/arch/arm/mach-s3c24xx/iotiming-s3c2410.c<br/>index 65e5f9cb650f..b7970f1fa3d5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/iotiming-s3c2410.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/iotiming-s3c2410.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/iotiming-s3c2410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/iotiming-s3c2410.c</a></div><div class='hunk'>@@ -249,7 +249,7 @@ static int s3c2410_calc_bank(struct s3c_cpufreq_config *cfg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int tacc_tab[] = {</div><div class='add'>+static const unsigned int tacc_tab[] = {</div><div class='ctx'> 	[0]	= 1,</div><div class='ctx'> 	[1]	= 2,</div><div class='ctx'> 	[2]	= 3,</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c<br/>index d03df0df01fa..029ef1b58925 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-anubis.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/mach-anubis.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-anubis.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-anubis.c</a></div><div class='hunk'>@@ -223,6 +223,7 @@ static struct s3c2410_platform_nand __initdata anubis_nand_info = {</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(anubis_nand_sets),</div><div class='ctx'> 	.sets		= anubis_nand_sets,</div><div class='ctx'> 	.select_chip	= anubis_nand_select,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* IDE channels */</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c<br/>index 9ae170fef2a7..7b28eb623fc1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-at2440evb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/mach-at2440evb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-at2440evb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-at2440evb.c</a></div><div class='hunk'>@@ -114,6 +114,7 @@ static struct s3c2410_platform_nand __initdata at2440evb_nand_info = {</div><div class='ctx'> 	.twrph1		= 40,</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(at2440evb_nand_sets),</div><div class='ctx'> 	.sets		= at2440evb_nand_sets,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* DM9000AEP 10/100 ethernet controller */</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c<br/>index ed07cf392d4b..5185036765db 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-bast.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/mach-bast.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-bast.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-bast.c</a></div><div class='hunk'>@@ -299,6 +299,7 @@ static struct s3c2410_platform_nand __initdata bast_nand_info = {</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(bast_nand_sets),</div><div class='ctx'> 	.sets		= bast_nand_sets,</div><div class='ctx'> 	.select_chip	= bast_nand_select,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* DM9000 */</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c<br/>index 27ae6877550f..b0ed401da3a3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-gta02.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/mach-gta02.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-gta02.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-gta02.c</a></div><div class='hunk'>@@ -443,6 +443,7 @@ static struct s3c2410_platform_nand __initdata gta02_nand_info = {</div><div class='ctx'> 	.twrph1		= 15,</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(gta02_nand_sets),</div><div class='ctx'> 	.sets		= gta02_nand_sets,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c<br/>index 7d99fe8f6157..f5b5c49b56ac 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-jive.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/mach-jive.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-jive.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-jive.c</a></div><div class='hunk'>@@ -232,6 +232,7 @@ static struct s3c2410_platform_nand __initdata jive_nand_info = {</div><div class='ctx'> 	.twrph1		= 40,</div><div class='ctx'> 	.sets		= jive_nand_sets,</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(jive_nand_sets),</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init jive_mtdset(char *options)</div><div class='hunk'>@@ -483,7 +484,7 @@ static int jive_pm_suspend(void)</div><div class='ctx'> 	 * correct address to resume from. */</div><div class='ctx'> </div><div class='ctx'> 	__raw_writel(0x2BED, S3C2412_INFORM0);</div><div class='del'>-	__raw_writel(virt_to_phys(s3c_cpu_resume), S3C2412_INFORM1);</div><div class='add'>+	__raw_writel(__pa_symbol(s3c_cpu_resume), S3C2412_INFORM1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c<br/>index ec60bd4a1646..71af8d2fd320 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-mini2440.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/mach-mini2440.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-mini2440.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-mini2440.c</a></div><div class='hunk'>@@ -287,6 +287,7 @@ static struct s3c2410_platform_nand mini2440_nand_info __initdata = {</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(mini2440_nand_sets),</div><div class='ctx'> 	.sets		= mini2440_nand_sets,</div><div class='ctx'> 	.ignore_unset_ecc = 1,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* DM9000AEP 10/100 ethernet controller */</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c<br/>index 2f6fdc326835..70b0eb7d3134 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-osiris.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/mach-osiris.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-osiris.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-osiris.c</a></div><div class='hunk'>@@ -238,6 +238,7 @@ static struct s3c2410_platform_nand __initdata osiris_nand_info = {</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(osiris_nand_sets),</div><div class='ctx'> 	.sets		= osiris_nand_sets,</div><div class='ctx'> 	.select_chip	= osiris_nand_select,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* PCMCIA control and configuration */</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c<br/>index 984516e8307a..868c82087403 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-qt2410.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/mach-qt2410.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-qt2410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-qt2410.c</a></div><div class='hunk'>@@ -284,6 +284,7 @@ static struct s3c2410_platform_nand __initdata qt2410_nand_info = {</div><div class='ctx'> 	.twrph1		= 20,</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(qt2410_nand_sets),</div><div class='ctx'> 	.sets		= qt2410_nand_sets,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* UDC */</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c<br/>index 25a139bb9826..e86ad6a68a0b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-rx1950.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/mach-rx1950.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-rx1950.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-rx1950.c</a></div><div class='hunk'>@@ -611,6 +611,7 @@ static struct s3c2410_platform_nand rx1950_nand_info = {</div><div class='ctx'> 	.twrph1 = 15,</div><div class='ctx'> 	.nr_sets = ARRAY_SIZE(rx1950_nand_sets),</div><div class='ctx'> 	.sets = rx1950_nand_sets,</div><div class='add'>+	.ecc_mode = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct s3c2410_udc_mach_info rx1950_udc_cfg __initdata = {</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c<br/>index cf55196f89ca..a39fb9780dd3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-rx3715.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/mach-rx3715.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-rx3715.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-rx3715.c</a></div><div class='hunk'>@@ -164,6 +164,7 @@ static struct s3c2410_platform_nand __initdata rx3715_nand_info = {</div><div class='ctx'> 	.twrph1		= 15,</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(rx3715_nand_sets),</div><div class='ctx'> 	.sets		= rx3715_nand_sets,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *rx3715_devices[] __initdata = {</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c<br/>index b4460d5f7011..f5e6322145fa 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-vstms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/mach-vstms.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/mach-vstms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/mach-vstms.c</a></div><div class='hunk'>@@ -117,6 +117,7 @@ static struct s3c2410_platform_nand __initdata vstms_nand_info = {</div><div class='ctx'> 	.twrph1		= 20,</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(vstms_nand_sets),</div><div class='ctx'> 	.sets		= vstms_nand_sets,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *vstms_devices[] __initdata = {</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/pm-s3c2410.c b/arch/arm/mach-s3c24xx/pm-s3c2410.c<br/>index 20e481d8a33a..a4588daeddb0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/pm-s3c2410.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/pm-s3c2410.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/pm-s3c2410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/pm-s3c2410.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@ static void s3c2410_pm_prepare(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* ensure at least GSTATUS3 has the resume address */</div><div class='ctx'> </div><div class='del'>-	__raw_writel(virt_to_phys(s3c_cpu_resume), S3C2410_GSTATUS3);</div><div class='add'>+	__raw_writel(__pa_symbol(s3c_cpu_resume), S3C2410_GSTATUS3);</div><div class='ctx'> </div><div class='ctx'> 	S3C_PMDBG("GSTATUS3 0x%08x\n", __raw_readl(S3C2410_GSTATUS3));</div><div class='ctx'> 	S3C_PMDBG("GSTATUS4 0x%08x\n", __raw_readl(S3C2410_GSTATUS4));</div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/pm-s3c2412.c b/arch/arm/mach-s3c24xx/pm-s3c2412.c<br/>index d75f95e487ee..0ae4d47a4663 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/pm-s3c2412.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/pm-s3c2412.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/pm-s3c2412.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/pm-s3c2412.c</a></div><div class='hunk'>@@ -53,7 +53,7 @@ static int s3c2412_cpu_suspend(unsigned long arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* mapping of interrupts to parts of the wakeup mask */</div><div class='del'>-static struct samsung_wakeup_mask wake_irqs[] = {</div><div class='add'>+static const struct samsung_wakeup_mask wake_irqs[] = {</div><div class='ctx'> 	{ .irq = IRQ_RTC,	.bit = S3C2412_PWRCFG_RTC_MASKIRQ, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c24xx/pm-s3c2416.c b/arch/arm/mach-s3c24xx/pm-s3c2416.c<br/>index c0e328e37bd6..b5bbf0d5985c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/pm-s3c2416.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c24xx/pm-s3c2416.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c24xx/pm-s3c2416.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c24xx/pm-s3c2416.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ static void s3c2416_pm_prepare(void)</div><div class='ctx'> 	 * correct address to resume from.</div><div class='ctx'> 	 */</div><div class='ctx'> 	__raw_writel(0x2BED, S3C2412_INFORM0);</div><div class='del'>-	__raw_writel(virt_to_phys(s3c_cpu_resume), S3C2412_INFORM1);</div><div class='add'>+	__raw_writel(__pa_symbol(s3c_cpu_resume), S3C2412_INFORM1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int s3c2416_pm_add(struct device *dev, struct subsys_interface *sif)</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c<br/>index 7c66ce1a6bb6..9843eb4dd04e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c64xx/common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/common.c</a></div><div class='hunk'>@@ -56,7 +56,8 @@</div><div class='ctx'> #include "watchdog-reset.h"</div><div class='ctx'> </div><div class='ctx'> /* External clock frequency */</div><div class='del'>-static unsigned long xtal_f = 12000000, xusbxti_f = 48000000;</div><div class='add'>+static unsigned long xtal_f __ro_after_init = 12000000;</div><div class='add'>+static unsigned long xusbxti_f __ro_after_init = 48000000;</div><div class='ctx'> </div><div class='ctx'> void __init s3c64xx_set_xtal_freq(unsigned long freq)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c<br/>index b57783371d52..cb953e238b2a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/dev-audio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c64xx/dev-audio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/dev-audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/dev-audio.c</a></div><div class='hunk'>@@ -58,9 +58,6 @@ static struct resource s3c64xx_iis0_resource[] = {</div><div class='ctx'> </div><div class='ctx'> static struct s3c_audio_pdata i2s0_pdata = {</div><div class='ctx'> 	.cfg_gpio = s3c64xx_i2s_cfg_gpio,</div><div class='del'>-	.dma_filter = pl08x_filter_id,</div><div class='del'>-	.dma_playback = DMACH_I2S0_OUT,</div><div class='del'>-	.dma_capture = DMACH_I2S0_IN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device s3c64xx_device_iis0 = {</div><div class='hunk'>@@ -80,9 +77,6 @@ static struct resource s3c64xx_iis1_resource[] = {</div><div class='ctx'> </div><div class='ctx'> static struct s3c_audio_pdata i2s1_pdata = {</div><div class='ctx'> 	.cfg_gpio = s3c64xx_i2s_cfg_gpio,</div><div class='del'>-	.dma_filter = pl08x_filter_id,</div><div class='del'>-	.dma_playback = DMACH_I2S1_OUT,</div><div class='del'>-	.dma_capture = DMACH_I2S1_IN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device s3c64xx_device_iis1 = {</div><div class='hunk'>@@ -102,13 +96,8 @@ static struct resource s3c64xx_iisv4_resource[] = {</div><div class='ctx'> </div><div class='ctx'> static struct s3c_audio_pdata i2sv4_pdata = {</div><div class='ctx'> 	.cfg_gpio = s3c64xx_i2s_cfg_gpio,</div><div class='del'>-	.dma_filter = pl08x_filter_id,</div><div class='del'>-	.dma_playback = DMACH_HSI_I2SV40_TX,</div><div class='del'>-	.dma_capture = DMACH_HSI_I2SV40_RX,</div><div class='ctx'> 	.type = {</div><div class='del'>-		.i2s = {</div><div class='del'>-			.quirks = QUIRK_PRI_6CHAN,</div><div class='del'>-		},</div><div class='add'>+		.quirks = QUIRK_PRI_6CHAN,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -153,9 +142,6 @@ static struct resource s3c64xx_pcm0_resource[] = {</div><div class='ctx'> </div><div class='ctx'> static struct s3c_audio_pdata s3c_pcm0_pdata = {</div><div class='ctx'> 	.cfg_gpio = s3c64xx_pcm_cfg_gpio,</div><div class='del'>-	.dma_filter = pl08x_filter_id,</div><div class='del'>-	.dma_capture = DMACH_PCM0_RX,</div><div class='del'>-	.dma_playback = DMACH_PCM0_TX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device s3c64xx_device_pcm0 = {</div><div class='hunk'>@@ -175,9 +161,6 @@ static struct resource s3c64xx_pcm1_resource[] = {</div><div class='ctx'> </div><div class='ctx'> static struct s3c_audio_pdata s3c_pcm1_pdata = {</div><div class='ctx'> 	.cfg_gpio = s3c64xx_pcm_cfg_gpio,</div><div class='del'>-	.dma_filter = pl08x_filter_id,</div><div class='del'>-	.dma_playback = DMACH_PCM1_TX,</div><div class='del'>-	.dma_capture = DMACH_PCM1_RX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device s3c64xx_device_pcm1 = {</div><div class='hunk'>@@ -209,10 +192,6 @@ static struct resource s3c64xx_ac97_resource[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct s3c_audio_pdata s3c_ac97_pdata = {</div><div class='del'>-	.dma_playback = DMACH_AC97_PCMOUT,</div><div class='del'>-	.dma_filter = pl08x_filter_id,</div><div class='del'>-	.dma_capture = DMACH_AC97_PCMIN,</div><div class='del'>-	.dma_capture_mic = DMACH_AC97_MICIN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u64 s3c64xx_ac97_dmamask = DMA_BIT_MASK(32);</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c<br/>index bc7dc1fcbf7d..59b5531f1987 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/mach-hmt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c64xx/mach-hmt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/mach-hmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/mach-hmt.c</a></div><div class='hunk'>@@ -204,6 +204,7 @@ static struct s3c2410_platform_nand hmt_nand_info = {</div><div class='ctx'> 	.twrph1		= 40,</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(hmt_nand_sets),</div><div class='ctx'> 	.sets		= hmt_nand_sets,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct gpio_led hmt_leds[] = {</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c<br/>index ae999fb3fe6d..a3e3e25728b4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/mach-mini6410.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c64xx/mach-mini6410.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/mach-mini6410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/mach-mini6410.c</a></div><div class='hunk'>@@ -142,6 +142,7 @@ static struct s3c2410_platform_nand mini6410_nand_info = {</div><div class='ctx'> 	.twrph1		= 40,</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(mini6410_nand_sets),</div><div class='ctx'> 	.sets		= mini6410_nand_sets,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct s3c_fb_pd_win mini6410_lcd_type0_fb_win = {</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c<br/>index 4e240ffa7ac7..d6b3ffd7704b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/mach-real6410.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c64xx/mach-real6410.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/mach-real6410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/mach-real6410.c</a></div><div class='hunk'>@@ -194,6 +194,7 @@ static struct s3c2410_platform_nand real6410_nand_info = {</div><div class='ctx'> 	.twrph1		= 40,</div><div class='ctx'> 	.nr_sets	= ARRAY_SIZE(real6410_nand_sets),</div><div class='ctx'> 	.sets		= real6410_nand_sets,</div><div class='add'>+	.ecc_mode       = NAND_ECC_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *real6410_devices[] __initdata = {</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/pl080.c b/arch/arm/mach-s3c64xx/pl080.c<br/>index 89c5a62830a7..261820a855ec 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/pl080.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c64xx/pl080.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/pl080.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/pl080.c</a></div><div class='hunk'>@@ -117,6 +117,25 @@ static struct pl08x_channel_data s3c64xx_dma0_info[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct dma_slave_map s3c64xx_dma0_slave_map[] = {</div><div class='add'>+	{ "s3c6400-uart.0", "tx", &amp;s3c64xx_dma0_info[0] },</div><div class='add'>+	{ "s3c6400-uart.0", "rx", &amp;s3c64xx_dma0_info[1] },</div><div class='add'>+	{ "s3c6400-uart.1", "tx", &amp;s3c64xx_dma0_info[2] },</div><div class='add'>+	{ "s3c6400-uart.1", "rx", &amp;s3c64xx_dma0_info[3] },</div><div class='add'>+	{ "s3c6400-uart.2", "tx", &amp;s3c64xx_dma0_info[4] },</div><div class='add'>+	{ "s3c6400-uart.2", "rx", &amp;s3c64xx_dma0_info[5] },</div><div class='add'>+	{ "s3c6400-uart.3", "tx", &amp;s3c64xx_dma0_info[6] },</div><div class='add'>+	{ "s3c6400-uart.3", "rx", &amp;s3c64xx_dma0_info[7] },</div><div class='add'>+	{ "samsung-pcm.0", "tx", &amp;s3c64xx_dma0_info[8] },</div><div class='add'>+	{ "samsung-pcm.0", "rx", &amp;s3c64xx_dma0_info[9] },</div><div class='add'>+	{ "samsung-i2s.0", "tx", &amp;s3c64xx_dma0_info[10] },</div><div class='add'>+	{ "samsung-i2s.0", "rx", &amp;s3c64xx_dma0_info[11] },</div><div class='add'>+	{ "s3c6410-spi.0", "tx", &amp;s3c64xx_dma0_info[12] },</div><div class='add'>+	{ "s3c6410-spi.0", "rx", &amp;s3c64xx_dma0_info[13] },</div><div class='add'>+	{ "samsung-i2s.2", "tx", &amp;s3c64xx_dma0_info[14] },</div><div class='add'>+	{ "samsung-i2s.2", "rx", &amp;s3c64xx_dma0_info[15] },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct pl08x_platform_data s3c64xx_dma0_plat_data = {</div><div class='ctx'> 	.memcpy_channel = {</div><div class='ctx'> 		.bus_id = "memcpy",</div><div class='hunk'>@@ -134,6 +153,8 @@ struct pl08x_platform_data s3c64xx_dma0_plat_data = {</div><div class='ctx'> 	.put_xfer_signal = pl08x_put_xfer_signal,</div><div class='ctx'> 	.slave_channels = s3c64xx_dma0_info,</div><div class='ctx'> 	.num_slave_channels = ARRAY_SIZE(s3c64xx_dma0_info),</div><div class='add'>+	.slave_map = s3c64xx_dma0_slave_map,</div><div class='add'>+	.slave_map_len = ARRAY_SIZE(s3c64xx_dma0_slave_map),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static AMBA_AHB_DEVICE(s3c64xx_dma0, "dma-pl080s.0", 0,</div><div class='hunk'>@@ -207,6 +228,15 @@ static struct pl08x_channel_data s3c64xx_dma1_info[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct dma_slave_map s3c64xx_dma1_slave_map[] = {</div><div class='add'>+	{ "samsung-pcm.1", "tx", &amp;s3c64xx_dma1_info[0] },</div><div class='add'>+	{ "samsung-pcm.1", "rx", &amp;s3c64xx_dma1_info[1] },</div><div class='add'>+	{ "samsung-i2s.1", "tx", &amp;s3c64xx_dma1_info[2] },</div><div class='add'>+	{ "samsung-i2s.1", "rx", &amp;s3c64xx_dma1_info[3] },</div><div class='add'>+	{ "s3c6410-spi.1", "tx", &amp;s3c64xx_dma1_info[4] },</div><div class='add'>+	{ "s3c6410-spi.1", "rx", &amp;s3c64xx_dma1_info[5] },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct pl08x_platform_data s3c64xx_dma1_plat_data = {</div><div class='ctx'> 	.memcpy_channel = {</div><div class='ctx'> 		.bus_id = "memcpy",</div><div class='hunk'>@@ -224,6 +254,8 @@ struct pl08x_platform_data s3c64xx_dma1_plat_data = {</div><div class='ctx'> 	.put_xfer_signal = pl08x_put_xfer_signal,</div><div class='ctx'> 	.slave_channels = s3c64xx_dma1_info,</div><div class='ctx'> 	.num_slave_channels = ARRAY_SIZE(s3c64xx_dma1_info),</div><div class='add'>+	.slave_map = s3c64xx_dma1_slave_map,</div><div class='add'>+	.slave_map_len = ARRAY_SIZE(s3c64xx_dma1_slave_map),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static AMBA_AHB_DEVICE(s3c64xx_dma1, "dma-pl080s.1", 0,</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c<br/>index 59d91b83b03d..2f579be8fe67 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s3c64xx/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s3c64xx/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s3c64xx/pm.c</a></div><div class='hunk'>@@ -285,7 +285,7 @@ static int s3c64xx_cpu_suspend(unsigned long arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* mapping of interrupts to parts of the wakeup mask */</div><div class='del'>-static struct samsung_wakeup_mask wake_irqs[] = {</div><div class='add'>+static const struct samsung_wakeup_mask wake_irqs[] = {</div><div class='ctx'> 	{ .irq = IRQ_RTC_ALARM,	.bit = S3C64XX_PWRCFG_RTC_ALARM_DISABLE, },</div><div class='ctx'> 	{ .irq = IRQ_RTC_TIC,	.bit = S3C64XX_PWRCFG_RTC_TICK_DISABLE, },</div><div class='ctx'> 	{ .irq = IRQ_PENDN,	.bit = S3C64XX_PWRCFG_TS_DISABLE, },</div><div class='hunk'>@@ -304,7 +304,7 @@ static void s3c64xx_pm_prepare(void)</div><div class='ctx'> 			      wake_irqs, ARRAY_SIZE(wake_irqs));</div><div class='ctx'> </div><div class='ctx'> 	/* store address of resume. */</div><div class='del'>-	__raw_writel(virt_to_phys(s3c_cpu_resume), S3C64XX_INFORM0);</div><div class='add'>+	__raw_writel(__pa_symbol(s3c_cpu_resume), S3C64XX_INFORM0);</div><div class='ctx'> </div><div class='ctx'> 	/* ensure previous wakeup state is cleared before sleeping */</div><div class='ctx'> 	__raw_writel(__raw_readl(S3C64XX_WAKEUP_STAT), S3C64XX_WAKEUP_STAT);</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c<br/>index 21b4b13c5ab7..07cee14a363b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s5pv210/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s5pv210/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s5pv210/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s5pv210/pm.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ static void s5pv210_pm_prepare(void)</div><div class='ctx'> 	__raw_writel(s5pv210_irqwake_intmask, S5P_WAKEUP_MASK);</div><div class='ctx'> </div><div class='ctx'> 	/* ensure at least INFORM0 has the resume address */</div><div class='del'>-	__raw_writel(virt_to_phys(s5pv210_cpu_resume), S5P_INFORM0);</div><div class='add'>+	__raw_writel(__pa_symbol(s5pv210_cpu_resume), S5P_INFORM0);</div><div class='ctx'> </div><div class='ctx'> 	tmp = __raw_readl(S5P_SLEEP_CFG);</div><div class='ctx'> 	tmp &amp;= ~(S5P_SLEEP_CFG_OSC_EN | S5P_SLEEP_CFG_USBOSC_EN);</div><div class='hunk'>@@ -155,13 +155,6 @@ static const struct platform_suspend_ops s5pv210_suspend_ops = {</div><div class='ctx'>  */</div><div class='ctx'> static void s5pv210_pm_resume(void)</div><div class='ctx'> {</div><div class='del'>-	u32 tmp;</div><div class='del'>-</div><div class='del'>-	tmp = __raw_readl(S5P_OTHERS);</div><div class='del'>-	tmp |= (S5P_OTHERS_RET_IO | S5P_OTHERS_RET_CF |\</div><div class='del'>-		S5P_OTHERS_RET_MMC | S5P_OTHERS_RET_UART);</div><div class='del'>-	__raw_writel(tmp , S5P_OTHERS);</div><div class='del'>-</div><div class='ctx'> 	s3c_pm_do_restore_core(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s5pv210/regs-clock.h b/arch/arm/mach-s5pv210/regs-clock.h<br/>index 4640f0f03c12..fb3eb77412db 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-s5pv210/regs-clock.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-s5pv210/regs-clock.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-s5pv210/regs-clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-s5pv210/regs-clock.h</a></div><div class='hunk'>@@ -188,10 +188,6 @@</div><div class='ctx'> #define S5P_SLEEP_CFG_USBOSC_EN		(1 &lt;&lt; 1)</div><div class='ctx'> </div><div class='ctx'> /* OTHERS Resgister */</div><div class='del'>-#define S5P_OTHERS_RET_IO		(1 &lt;&lt; 31)</div><div class='del'>-#define S5P_OTHERS_RET_CF		(1 &lt;&lt; 30)</div><div class='del'>-#define S5P_OTHERS_RET_MMC		(1 &lt;&lt; 29)</div><div class='del'>-#define S5P_OTHERS_RET_UART		(1 &lt;&lt; 28)</div><div class='ctx'> #define S5P_OTHERS_USB_SIG_MASK		(1 &lt;&lt; 16)</div><div class='ctx'> </div><div class='ctx'> /* S5P_DAC_CONTROL */</div><div class='head'>diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c<br/>index 3e09beddb6e8..2eb00691b07d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-sa1100/generic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-sa1100/generic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-sa1100/generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sa1100/generic.c</a></div><div class='hunk'>@@ -378,7 +378,7 @@ void __init sa1100_map_io(void)</div><div class='ctx'> </div><div class='ctx'> void __init sa1100_timer_init(void)</div><div class='ctx'> {</div><div class='del'>-	pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x90000000), 3686400);</div><div class='add'>+	pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x90000000));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct resource irq_resource =</div><div class='head'>diff --git a/arch/arm/mach-sa1100/include/mach/SA-1101.h b/arch/arm/mach-sa1100/include/mach/SA-1101.h<br/>deleted file mode 100644<br/>index 5d2ad7db991c..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-sa1100/include/mach/SA-1101.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-sa1100/include/mach/SA-1101.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,925 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * SA-1101.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) Peter Danielsson 1999</div><div class='del'>- *</div><div class='del'>- * Definition of constants related to the sa1101</div><div class='del'>- * support chip for the sa1100</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Be sure that virtual mapping is defined right */</div><div class='del'>-#ifndef __ASM_ARCH_HARDWARE_H</div><div class='del'>-#error You must include hardware.h not SA-1101.h</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef SA1101_BASE</div><div class='del'>-#error You must define SA-1101 physical base address</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef LANGUAGE</div><div class='del'>-# ifdef __ASSEMBLY__</div><div class='del'>-#  define LANGUAGE Assembly</div><div class='del'>-# else</div><div class='del'>-#  define LANGUAGE C</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We have mapped the sa1101 depending on the value of SA1101_BASE.</div><div class='del'>- * It then appears from 0xf4000000.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define SA1101_p2v( x )         ((x) - SA1101_BASE + 0xf4000000)</div><div class='del'>-#define SA1101_v2p( x )         ((x) - 0xf4000000  + SA1101_BASE)</div><div class='del'>-</div><div class='del'>-#ifndef SA1101_p2v</div><div class='del'>-#define SA1101_p2v(PhAdd)  (PhAdd)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;mach/bitfield.h&gt;</div><div class='del'>-</div><div class='del'>-#define C               0</div><div class='del'>-#define Assembly        1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Memory map</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define __SHMEM_CONTROL0	0x00000000</div><div class='del'>-#define __SYSTEM_CONTROL1	0x00000400</div><div class='del'>-#define __ARBITER		0x00020000</div><div class='del'>-#define __SYSTEM_CONTROL2	0x00040000</div><div class='del'>-#define __SYSTEM_CONTROL3	0x00060000</div><div class='del'>-#define __PARALLEL_PORT		0x00080000</div><div class='del'>-#define __VIDMEM_CONTROL	0x00100000</div><div class='del'>-#define __UPDATE_FIFO		0x00120000</div><div class='del'>-#define __SHMEM_CONTROL1	0x00140000</div><div class='del'>-#define __INTERRUPT_CONTROL	0x00160000</div><div class='del'>-#define __USB_CONTROL		0x00180000</div><div class='del'>-#define __TRACK_INTERFACE	0x001a0000</div><div class='del'>-#define __MOUSE_INTERFACE	0x001b0000</div><div class='del'>-#define __KEYPAD_INTERFACE	0x001c0000</div><div class='del'>-#define __PCMCIA_INTERFACE	0x001e0000</div><div class='del'>-#define	__VGA_CONTROL		0x00200000</div><div class='del'>-#define __GPIO_INTERFACE	0x00300000</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Macro that calculates real address for registers in the SA-1101</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _SA1101( x )    ((x) + SA1101_BASE)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Interface and shared memory controller registers</div><div class='del'>- *</div><div class='del'>- * Registers</div><div class='del'>- *	SKCR		SA-1101 control register (read/write)</div><div class='del'>- *	SMCR		Shared Memory Controller Register</div><div class='del'>- *	SNPR		Snoop Register</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _SKCR		_SA1101( 0x00000000 ) /* SA-1101 Control Reg. */</div><div class='del'>-#define _SMCR		_SA1101( 0x00140000 ) /* Shared Mem. Control Reg. */</div><div class='del'>-#define _SNPR		_SA1101( 0x00140400 ) /* Snoop Reg. */</div><div class='del'>-</div><div class='del'>-#if LANGUAGE == C</div><div class='del'>-#define SKCR		(*((volatile Word *) SA1101_p2v (_SKCR)))</div><div class='del'>-#define SMCR		(*((volatile Word *) SA1101_p2v (_SMCR)))</div><div class='del'>-#define SNPR		(*((volatile Word *) SA1101_p2v (_SNPR)))</div><div class='del'>-</div><div class='del'>-#define SKCR_PLLEn	  0x0001	  /* Enable On-Chip PLL */</div><div class='del'>-#define SKCR_BCLKEn	  0x0002	  /* Enables BCLK */</div><div class='del'>-#define SKCR_Sleep	  0x0004	  /* Sleep Mode */</div><div class='del'>-#define SKCR_IRefEn	  0x0008	  /* DAC Iref input enable */</div><div class='del'>-#define SKCR_VCOON	  0x0010	  /* VCO bias */</div><div class='del'>-#define SKCR_ScanTestEn	  0x0020	  /* Enables scan test */</div><div class='del'>-#define SKCR_ClockTestEn  0x0040	  /* Enables clock test */</div><div class='del'>-</div><div class='del'>-#define SMCR_DCAC	  Fld(2,0)	  /* Number of column address bits */</div><div class='del'>-#define SMCR_DRAC	  Fld(2,2)	  /* Number of row address bits */</div><div class='del'>-#define SMCR_ArbiterBias  0x0008	  /* favor video or USB */</div><div class='del'>-#define SMCR_TopVidMem	  Fld(4,5)	  /* Top 4 bits of vidmem addr. */</div><div class='del'>-</div><div class='del'>-#define SMCR_ColAdrBits( x )		  /* col. addr bits 8..11 */ \</div><div class='del'>-	(( (x) - 8 ) &lt;&lt; FShft (SMCR_DCAC))</div><div class='del'>-#define SMCR_RowAdrBits( x )		  /* row addr bits 9..12 */\</div><div class='del'>-	(( (x) - 9 ) &lt;&lt; FShft (SMCR_DRAC))</div><div class='del'>-</div><div class='del'>-#define SNPR_VFBstart	  Fld(12,0)	/* Video frame buffer addr */</div><div class='del'>-#define SNPR_VFBsize	  Fld(11,12)	/* Video frame buffer size */</div><div class='del'>-#define SNPR_WholeBank	  (1 &lt;&lt; 23)	/* Whole bank bit */</div><div class='del'>-#define SNPR_BankSelect	  Fld(2,27)	/* Bank select */</div><div class='del'>-#define SNPR_SnoopEn	  (1 &lt;&lt; 31)	/* Enable snoop operation */</div><div class='del'>-</div><div class='del'>-#define SNPR_Set_VFBsize( x )   /* set frame buffer size (in kb) */ \</div><div class='del'>-	( (x) &lt;&lt; FShft (SNPR_VFBsize))</div><div class='del'>-#define SNPR_Select_Bank(x)     /* select bank 0 or 1 */  \</div><div class='del'>-	(( (x) + 1 ) &lt;&lt; FShft (SNPR_BankSelect ))</div><div class='del'>-</div><div class='del'>-#endif /* LANGUAGE == C */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Video Memory Controller</div><div class='del'>- *</div><div class='del'>- * Registers</div><div class='del'>- *    VMCCR	Configuration register</div><div class='del'>- *    VMCAR	VMC address register</div><div class='del'>- *    VMCDR	VMC data register</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _VMCCR		_SA1101( 0x00100000 )	/* Configuration register */</div><div class='del'>-#define _VMCAR		_SA1101( 0x00101000 )	/* VMC address register */</div><div class='del'>-#define _VMCDR		_SA1101( 0x00101400 )	/* VMC data register */</div><div class='del'>-</div><div class='del'>-#if LANGUAGE == C</div><div class='del'>-#define VMCCR		(*((volatile Word *) SA1101_p2v (_VMCCR)))</div><div class='del'>-#define VMCAR		(*((volatile Word *) SA1101_p2v (_VMCAR)))</div><div class='del'>-#define VMCDR		(*((volatile Word *) SA1101_p2v (_VMCDR)))</div><div class='del'>-</div><div class='del'>-#define VMCCR_RefreshEn	    0x0000	  /* Enable memory refresh */</div><div class='del'>-#define VMCCR_Config	    0x0001	  /* DRAM size */</div><div class='del'>-#define VMCCR_RefPeriod	    Fld(2,3)	  /* Refresh period */</div><div class='del'>-#define VMCCR_StaleDataWait Fld(4,5)	  /* Stale FIFO data timeout counter */</div><div class='del'>-#define VMCCR_SleepState    (1&lt;&lt;9)	  /* State of interface pins in sleep*/</div><div class='del'>-#define VMCCR_RefTest	    (1&lt;&lt;10)	  /* refresh test */</div><div class='del'>-#define VMCCR_RefLow	    Fld(6,11)	  /* refresh low counter */</div><div class='del'>-#define VMCCR_RefHigh	    Fld(7,17)	  /* refresh high counter */</div><div class='del'>-#define VMCCR_SDTCTest	    Fld(7,24)	  /* stale data timeout counter */</div><div class='del'>-#define VMCCR_ForceSelfRef  (1&lt;&lt;31)	  /* Force self refresh */</div><div class='del'>-</div><div class='del'>-#endif LANGUAGE == C</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Update FIFO</div><div class='del'>- *</div><div class='del'>- * Registers</div><div class='del'>- *    UFCR	Update FIFO Control Register</div><div class='del'>- *    UFSR	Update FIFO Status Register</div><div class='del'>- *    UFLVLR	update FIFO level register</div><div class='del'>- *    UFDR	update FIFO data register</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _UFCR	_SA1101(0x00120000)   /* Update FIFO Control Reg. */</div><div class='del'>-#define _UFSR	_SA1101(0x00120400)   /* Update FIFO Status Reg. */	</div><div class='del'>-#define _UFLVLR	_SA1101(0x00120800)   /* Update FIFO level reg. */</div><div class='del'>-#define _UFDR	_SA1101(0x00120c00)   /* Update FIFO data reg. */</div><div class='del'>-</div><div class='del'>-#if LANGUAGE == C</div><div class='del'>-</div><div class='del'>-#define UFCR 	(*((volatile Word *) SA1101_p2v (_UFCR)))</div><div class='del'>-#define UFSR	(*((volatile Word *) SA1101_p2v (_UFSR)))</div><div class='del'>-#define UFLVLR	(*((volatile Word *) SA1101_p2v (_UFLVLR))) </div><div class='del'>-#define UFDR	(*((volatile Word *) SA1101_p2v (_UFDR)))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define UFCR_FifoThreshhold	Fld(7,0)	/* Level for FifoGTn flag */</div><div class='del'>-</div><div class='del'>-#define UFSR_FifoGTnFlag	0x01		/* FifoGTn flag */#define UFSR_FifoEmpty		0x80		/* FIFO is empty */</div><div class='del'>-</div><div class='del'>-#endif /* LANGUAGE == C */</div><div class='del'>-</div><div class='del'>-/* System Controller</div><div class='del'>- *</div><div class='del'>- * Registers</div><div class='del'>- *    SKPCR	Power Control Register</div><div class='del'>- *    SKCDR	Clock Divider Register</div><div class='del'>- *    DACDR1	DAC1 Data register</div><div class='del'>- *    DACDR2	DAC2 Data register</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _SKPCR		_SA1101(0x00000400)</div><div class='del'>-#define _SKCDR		_SA1101(0x00040000)</div><div class='del'>-#define _DACDR1		_SA1101(0x00060000)</div><div class='del'>-#define _DACDR2		_SA1101(0x00060400)</div><div class='del'>-</div><div class='del'>-#if LANGUAGE == C</div><div class='del'>-#define SKPCR 	(*((volatile Word *) SA1101_p2v (_SKPCR)))</div><div class='del'>-#define SKCDR	(*((volatile Word *) SA1101_p2v (_SKCDR)))</div><div class='del'>-#define DACDR1	(*((volatile Word *) SA1101_p2v (_DACDR1)))</div><div class='del'>-#define DACDR2	(*((volatile Word *) SA1101_p2v (_DACDR2)))</div><div class='del'>-</div><div class='del'>-#define SKPCR_UCLKEn	     0x01    /* USB Enable */</div><div class='del'>-#define SKPCR_PCLKEn	     0x02    /* PS/2 Enable */</div><div class='del'>-#define SKPCR_ICLKEn	     0x04    /* Interrupt Controller Enable */</div><div class='del'>-#define SKPCR_VCLKEn	     0x08    /* Video Controller Enable */</div><div class='del'>-#define SKPCR_PICLKEn	     0x10    /* parallel port Enable */</div><div class='del'>-#define SKPCR_DCLKEn	     0x20    /* DACs Enable */</div><div class='del'>-#define SKPCR_nKPADEn	     0x40    /* Multiplexer */</div><div class='del'>-</div><div class='del'>-#define SKCDR_PLLMul	     Fld(7,0)	/* PLL Multiplier */</div><div class='del'>-#define SKCDR_VCLKEn	     Fld(2,7)	/* Video controller clock divider */</div><div class='del'>-#define SKDCR_BCLKEn	     (1&lt;&lt;9)	/* BCLK Divider */</div><div class='del'>-#define SKDCR_UTESTCLKEn     (1&lt;&lt;10)	/* Route USB clock during test mode */</div><div class='del'>-#define SKDCR_DivRValue	     Fld(6,11)	/* Input clock divider for PLL */</div><div class='del'>-#define SKDCR_DivNValue	     Fld(5,17)	/* Output clock divider for PLL */</div><div class='del'>-#define SKDCR_PLLRSH	     Fld(3,22)	/* PLL bandwidth control */</div><div class='del'>-#define SKDCR_ChargePump     (1&lt;&lt;25)	/* Charge pump control */</div><div class='del'>-#define SKDCR_ClkTestMode    (1&lt;&lt;26)	/* Clock output test mode */</div><div class='del'>-#define SKDCR_ClkTestEn	     (1&lt;&lt;27)	/* Test clock generator */</div><div class='del'>-#define SKDCR_ClkJitterCntl  Fld(3,28)	/* video clock jitter compensation */</div><div class='del'>-</div><div class='del'>-#define DACDR_DACCount	     Fld(8,0)	/* Count value */</div><div class='del'>-#define DACDR1_DACCount	     DACDR_DACCount</div><div class='del'>-#define DACDR2_DACCount	     DACDR_DACCount</div><div class='del'>-</div><div class='del'>-#endif /* LANGUAGE == C */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Parallel Port Interface</div><div class='del'>- *</div><div class='del'>- * Registers</div><div class='del'>- *    IEEE_Config	IEEE mode selection and programmable attributes</div><div class='del'>- *    IEEE_Control	Controls the states of IEEE port control outputs</div><div class='del'>- *    IEEE_Data		Forward transfer data register</div><div class='del'>- *    IEEE_Addr		Forward transfer address register</div><div class='del'>- *    IEEE_Status	Port IO signal status register</div><div class='del'>- *    IEEE_IntStatus	Port interrupts status register</div><div class='del'>- *    IEEE_FifoLevels   Rx and Tx FIFO interrupt generation levels</div><div class='del'>- *    IEEE_InitTime	Forward timeout counter initial value</div><div class='del'>- *    IEEE_TimerStatus	Forward timeout counter current value</div><div class='del'>- *    IEEE_FifoReset	Reset forward transfer FIFO</div><div class='del'>- *    IEEE_ReloadValue	Counter reload value</div><div class='del'>- *    IEEE_TestControl	Control testmode</div><div class='del'>- *    IEEE_TestDataIn	Test data register</div><div class='del'>- *    IEEE_TestDataInEn	Enable test data</div><div class='del'>- *    IEEE_TestCtrlIn	Test control signals</div><div class='del'>- *    IEEE_TestCtrlInEn	Enable test control signals</div><div class='del'>- *    IEEE_TestDataStat	Current data bus value</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The control registers are defined as offsets from a base address </div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-#define _IEEE( x ) _SA1101( (x) + __PARALLEL_PORT )</div><div class='del'>-</div><div class='del'>-#define _IEEE_Config	    _IEEE( 0x0000 )</div><div class='del'>-#define _IEEE_Control	    _IEEE( 0x0400 )</div><div class='del'>-#define _IEEE_Data	    _IEEE( 0x4000 )</div><div class='del'>-#define _IEEE_Addr	    _IEEE( 0x0800 )</div><div class='del'>-#define _IEEE_Status	    _IEEE( 0x0c00 )</div><div class='del'>-#define _IEEE_IntStatus	    _IEEE( 0x1000 )</div><div class='del'>-#define _IEEE_FifoLevels    _IEEE( 0x1400 )</div><div class='del'>-#define _IEEE_InitTime	    _IEEE( 0x1800 )</div><div class='del'>-#define _IEEE_TimerStatus   _IEEE( 0x1c00 )</div><div class='del'>-#define _IEEE_FifoReset	    _IEEE( 0x2000 )</div><div class='del'>-#define _IEEE_ReloadValue   _IEEE( 0x3c00 )</div><div class='del'>-#define _IEEE_TestControl   _IEEE( 0x2400 )</div><div class='del'>-#define _IEEE_TestDataIn    _IEEE( 0x2800 )</div><div class='del'>-#define _IEEE_TestDataInEn  _IEEE( 0x2c00 )</div><div class='del'>-#define _IEEE_TestCtrlIn    _IEEE( 0x3000 )</div><div class='del'>-#define _IEEE_TestCtrlInEn  _IEEE( 0x3400 )</div><div class='del'>-#define _IEEE_TestDataStat  _IEEE( 0x3800 )</div><div class='del'>- </div><div class='del'>-</div><div class='del'>-#if LANGUAGE == C</div><div class='del'>-#define IEEE_Config	    (*((volatile Word *) SA1101_p2v (_IEEE_Config)))</div><div class='del'>-#define IEEE_Control	    (*((volatile Word *) SA1101_p2v (_IEEE_Control)))</div><div class='del'>-#define IEEE_Data	    (*((volatile Word *) SA1101_p2v (_IEEE_Data)))</div><div class='del'>-#define IEEE_Addr	    (*((volatile Word *) SA1101_p2v (_IEEE_Addr)))</div><div class='del'>-#define IEEE_Status	    (*((volatile Word *) SA1101_p2v (_IEEE_Status)))</div><div class='del'>-#define IEEE_IntStatus	    (*((volatile Word *) SA1101_p2v (_IEEE_IntStatus)))</div><div class='del'>-#define IEEE_FifoLevels	    (*((volatile Word *) SA1101_p2v (_IEEE_FifoLevels)))</div><div class='del'>-#define IEEE_InitTime	    (*((volatile Word *) SA1101_p2v (_IEEE_InitTime)))</div><div class='del'>-#define IEEE_TimerStatus    (*((volatile Word *) SA1101_p2v (_IEEE_TimerStatus)))</div><div class='del'>-#define IEEE_FifoReset	    (*((volatile Word *) SA1101_p2v (_IEEE_FifoReset)))</div><div class='del'>-#define IEEE_ReloadValue    (*((volatile Word *) SA1101_p2v (_IEEE_ReloadValue)))</div><div class='del'>-#define IEEE_TestControl    (*((volatile Word *) SA1101_p2v (_IEEE_TestControl)))</div><div class='del'>-#define IEEE_TestDataIn     (*((volatile Word *) SA1101_p2v (_IEEE_TestDataIn)))</div><div class='del'>-#define IEEE_TestDataInEn   (*((volatile Word *) SA1101_p2v (_IEEE_TestDataInEn)))</div><div class='del'>-#define IEEE_TestCtrlIn     (*((volatile Word *) SA1101_p2v (_IEEE_TestCtrlIn)))</div><div class='del'>-#define IEEE_TestCtrlInEn   (*((volatile Word *) SA1101_p2v (_IEEE_TestCtrlInEn)))</div><div class='del'>-#define IEEE_TestDataStat   (*((volatile Word *) SA1101_p2v (_IEEE_TestDataStat)))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define IEEE_Config_M	    Fld(3,0)	 /* Mode select */</div><div class='del'>-#define IEEE_Config_D	    0x04	 /* FIFO access enable */</div><div class='del'>-#define IEEE_Config_B	    0x08	 /* 9-bit word enable */</div><div class='del'>-#define IEEE_Config_T	    0x10	 /* Data transfer enable */</div><div class='del'>-#define IEEE_Config_A	    0x20	 /* Data transfer direction */</div><div class='del'>-#define IEEE_Config_E	    0x40	 /* Timer enable */</div><div class='del'>-#define IEEE_Control_A	    0x08	 /* AutoFd output */</div><div class='del'>-#define IEEE_Control_E	    0x04	 /* Selectin output */</div><div class='del'>-#define IEEE_Control_T	    0x02	 /* Strobe output */</div><div class='del'>-#define IEEE_Control_I	    0x01	 /* Port init output */</div><div class='del'>-#define IEEE_Data_C	    (1&lt;&lt;31)	 /* Byte count */</div><div class='del'>-#define IEEE_Data_Db	    Fld(9,16)	 /* Data byte 2 */</div><div class='del'>-#define IEEE_Data_Da	    Fld(9,0)	 /* Data byte 1 */</div><div class='del'>-#define IEEE_Addr_A	    Fld(8,0)	 /* forward address transfer byte */</div><div class='del'>-#define IEEE_Status_A	    0x0100	 /* nAutoFd port output status */</div><div class='del'>-#define IEEE_Status_E	    0x0080	 /* nSelectIn port output status */</div><div class='del'>-#define IEEE_Status_T	    0x0040	 /* nStrobe port output status */</div><div class='del'>-#define IEEE_Status_I	    0x0020	 /* nInit port output status */</div><div class='del'>-#define IEEE_Status_B	    0x0010	 /* Busy port inout status */</div><div class='del'>-#define IEEE_Status_S	    0x0008	 /* Select port input status */</div><div class='del'>-#define IEEE_Status_K	    0x0004	 /* nAck port input status */</div><div class='del'>-#define IEEE_Status_F	    0x0002	 /* nFault port input status */</div><div class='del'>-#define IEEE_Status_R	    0x0001	 /* pError port input status */</div><div class='del'>-</div><div class='del'>-#define IEEE_IntStatus_IntReqDat	 0x0100</div><div class='del'>-#define IEEE_IntStatus_IntReqEmp	 0x0080</div><div class='del'>-#define IEEE_IntStatus_IntReqInt	 0x0040</div><div class='del'>-#define IEEE_IntStatus_IntReqRav	 0x0020</div><div class='del'>-#define IEEE_IntStatus_IntReqTim	 0x0010</div><div class='del'>-#define IEEE_IntStatus_RevAddrComp	 0x0008</div><div class='del'>-#define IEEE_IntStatus_RevDataComp	 0x0004</div><div class='del'>-#define IEEE_IntStatus_FwdAddrComp	 0x0002</div><div class='del'>-#define IEEE_IntStatus_FwdDataComp	 0x0001</div><div class='del'>-#define IEEE_FifoLevels_RevFifoLevel	 2</div><div class='del'>-#define IEEE_FifoLevels_FwdFifoLevel	 1</div><div class='del'>-#define IEEE_InitTime_TimValInit	 Fld(22,0)</div><div class='del'>-#define IEEE_TimerStatus_TimValStat	 Fld(22,0)</div><div class='del'>-#define IEEE_ReloadValue_Reload		 Fld(4,0)</div><div class='del'>-</div><div class='del'>-#define IEEE_TestControl_RegClk		 0x04</div><div class='del'>-#define IEEE_TestControl_ClockSelect	 Fld(2,1)</div><div class='del'>-#define IEEE_TestControl_TimerTestModeEn 0x01</div><div class='del'>-#define IEEE_TestCtrlIn_PError		 0x10</div><div class='del'>-#define IEEE_TestCtrlIn_nFault		 0x08</div><div class='del'>-#define IEEE_TestCtrlIn_nAck		 0x04</div><div class='del'>-#define IEEE_TestCtrlIn_PSel		 0x02</div><div class='del'>-#define IEEE_TestCtrlIn_Busy		 0x01</div><div class='del'>-</div><div class='del'>-#endif /* LANGUAGE == C */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * VGA Controller</div><div class='del'>- *</div><div class='del'>- * Registers</div><div class='del'>- *    VideoControl	Video Control Register</div><div class='del'>- *    VgaTiming0	VGA Timing Register 0</div><div class='del'>- *    VgaTiming1	VGA Timing Register 1</div><div class='del'>- *    VgaTiming2	VGA Timing Register 2</div><div class='del'>- *    VgaTiming3	VGA Timing Register 3</div><div class='del'>- *    VgaBorder		VGA Border Color Register</div><div class='del'>- *    VgaDBAR		VGADMA Base Address Register</div><div class='del'>- *    VgaDCAR		VGADMA Channel Current Address Register</div><div class='del'>- *    VgaStatus		VGA Status Register</div><div class='del'>- *    VgaInterruptMask	VGA Interrupt Mask Register</div><div class='del'>- *    VgaPalette	VGA Palette Registers</div><div class='del'>- *    DacControl	DAC Control Register</div><div class='del'>- *    VgaTest		VGA Controller Test Register</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _VGA( x )	_SA1101( ( x ) + __VGA_CONTROL )</div><div class='del'>-</div><div class='del'>-#define _VideoControl	    _VGA( 0x0000 )</div><div class='del'>-#define _VgaTiming0	    _VGA( 0x0400 )</div><div class='del'>-#define _VgaTiming1	    _VGA( 0x0800 )</div><div class='del'>-#define _VgaTiming2	    _VGA( 0x0c00 )</div><div class='del'>-#define _VgaTiming3	    _VGA( 0x1000 )</div><div class='del'>-#define _VgaBorder	    _VGA( 0x1400 )</div><div class='del'>-#define _VgaDBAR	    _VGA( 0x1800 )</div><div class='del'>-#define _VgaDCAR	    _VGA( 0x1c00 )</div><div class='del'>-#define _VgaStatus	    _VGA( 0x2000 )</div><div class='del'>-#define _VgaInterruptMask   _VGA( 0x2400 )</div><div class='del'>-#define _VgaPalette	    _VGA( 0x40000 )</div><div class='del'>-#define _DacControl	    _VGA( 0x3000 )</div><div class='del'>-#define _VgaTest	    _VGA( 0x2c00 )</div><div class='del'>-</div><div class='del'>-#if (LANGUAGE == C)</div><div class='del'>-#define VideoControl   (*((volatile Word *) SA1101_p2v (_VideoControl)))</div><div class='del'>-#define VgaTiming0     (*((volatile Word *) SA1101_p2v (_VgaTiming0)))</div><div class='del'>-#define VgaTiming1     (*((volatile Word *) SA1101_p2v (_VgaTiming1)))</div><div class='del'>-#define VgaTiming2     (*((volatile Word *) SA1101_p2v (_VgaTiming2)))</div><div class='del'>-#define VgaTiming3     (*((volatile Word *) SA1101_p2v (_VgaTiming3)))</div><div class='del'>-#define VgaBorder      (*((volatile Word *) SA1101_p2v (_VgaBorder)))</div><div class='del'>-#define VgaDBAR	       (*((volatile Word *) SA1101_p2v (_VgaDBAR)))</div><div class='del'>-#define VgaDCAR	       (*((volatile Word *) SA1101_p2v (_VgaDCAR)))</div><div class='del'>-#define VgaStatus      (*((volatile Word *) SA1101_p2v (_VgaStatus)))</div><div class='del'>-#define VgaInterruptMask (*((volatile Word *) SA1101_p2v (_VgaInterruptMask)))</div><div class='del'>-#define VgaPalette     (*((volatile Word *) SA1101_p2v (_VgaPalette)))</div><div class='del'>-#define DacControl     (*((volatile Word *) SA1101_p2v (_DacControl)))</div><div class='del'>-#define VgaTest        (*((volatile Word *) SA1101_p2v (_VgaTest)))</div><div class='del'>-</div><div class='del'>-#define VideoControl_VgaEn    0x00000000</div><div class='del'>-#define VideoControl_BGR      0x00000001</div><div class='del'>-#define VideoControl_VCompVal Fld(2,2)</div><div class='del'>-#define VideoControl_VgaReq   Fld(4,4)</div><div class='del'>-#define VideoControl_VBurstL  Fld(4,8)</div><div class='del'>-#define VideoControl_VMode    (1&lt;&lt;12)</div><div class='del'>-#define VideoControl_PalRead  (1&lt;&lt;13)</div><div class='del'>-</div><div class='del'>-#define VgaTiming0_PPL	      Fld(6,2)</div><div class='del'>-#define VgaTiming0_HSW	      Fld(8,8)</div><div class='del'>-#define VgaTiming0_HFP	      Fld(8,16)</div><div class='del'>-#define VgaTiming0_HBP	      Fld(8,24)</div><div class='del'>-</div><div class='del'>-#define VgaTiming1_LPS	      Fld(10,0)</div><div class='del'>-#define VgaTiming1_VSW	      Fld(6,10)</div><div class='del'>-#define VgaTiming1_VFP	      Fld(8,16)</div><div class='del'>-#define VgaTiming1_VBP	      Fld(8,24)</div><div class='del'>-</div><div class='del'>-#define VgaTiming2_IVS	      0x01</div><div class='del'>-#define VgaTiming2_IHS	      0x02</div><div class='del'>-#define VgaTiming2_CVS	      0x04</div><div class='del'>-#define VgaTiming2_CHS	      0x08</div><div class='del'>-</div><div class='del'>-#define VgaTiming3_HBS	      Fld(8,0)</div><div class='del'>-#define VgaTiming3_HBE	      Fld(8,8)</div><div class='del'>-#define VgaTiming3_VBS	      Fld(8,16)</div><div class='del'>-#define VgaTiming3_VBE	      Fld(8,24)</div><div class='del'>-</div><div class='del'>-#define VgaBorder_BCOL	      Fld(24,0)</div><div class='del'>-</div><div class='del'>-#define VgaStatus_VFUF	      0x01</div><div class='del'>-#define VgaStatus_VNext	      0x02</div><div class='del'>-#define VgaStatus_VComp	      0x04</div><div class='del'>-</div><div class='del'>-#define VgaInterruptMask_VFUFMask   0x00</div><div class='del'>-#define VgaInterruptMask_VNextMask  0x01</div><div class='del'>-#define VgaInterruptMask_VCompMask  0x02</div><div class='del'>-</div><div class='del'>-#define VgaPalette_R	      Fld(8,0)</div><div class='del'>-#define VgaPalette_G	      Fld(8,8)</div><div class='del'>-#define VgaPalette_B	      Fld(8,16)</div><div class='del'>-</div><div class='del'>-#define DacControl_DACON      0x0001</div><div class='del'>-#define DacControl_COMPON     0x0002</div><div class='del'>-#define DacControl_PEDON      0x0004</div><div class='del'>-#define DacControl_RTrim      Fld(5,4)</div><div class='del'>-#define DacControl_GTrim      Fld(5,9)</div><div class='del'>-#define DacControl_BTrim      Fld(5,14)</div><div class='del'>-</div><div class='del'>-#define VgaTest_TDAC	      0x00</div><div class='del'>-#define VgaTest_Datatest      Fld(4,1)</div><div class='del'>-#define VgaTest_DACTESTDAC    0x10</div><div class='del'>-#define VgaTest_DACTESTOUT    Fld(3,5)</div><div class='del'>-</div><div class='del'>-#endif /* LANGUAGE == C */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * USB Host Interface Controller</div><div class='del'>- *</div><div class='del'>- * Registers</div><div class='del'>- *    Revision</div><div class='del'>- *    Control</div><div class='del'>- *    CommandStatus</div><div class='del'>- *    InterruptStatus</div><div class='del'>- *    InterruptEnable</div><div class='del'>- *    HCCA</div><div class='del'>- *    PeriodCurrentED</div><div class='del'>- *    ControlHeadED</div><div class='del'>- *    BulkHeadED</div><div class='del'>- *    BulkCurrentED</div><div class='del'>- *    DoneHead</div><div class='del'>- *    FmInterval</div><div class='del'>- *    FmRemaining</div><div class='del'>- *    FmNumber</div><div class='del'>- *    PeriodicStart</div><div class='del'>- *    LSThreshold</div><div class='del'>- *    RhDescriptorA</div><div class='del'>- *    RhDescriptorB</div><div class='del'>- *    RhStatus</div><div class='del'>- *    RhPortStatus</div><div class='del'>- *    USBStatus</div><div class='del'>- *    USBReset</div><div class='del'>- *    USTAR</div><div class='del'>- *    USWER</div><div class='del'>- *    USRFR</div><div class='del'>- *    USNFR</div><div class='del'>- *    USTCSR</div><div class='del'>- *    USSR</div><div class='del'>- *    </div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _USB( x )	_SA1101( ( x ) + __USB_CONTROL )</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define _Revision	  _USB( 0x0000 )</div><div class='del'>-#define _Control	  _USB( 0x0888 )</div><div class='del'>-#define _CommandStatus	  _USB( 0x0c00 )</div><div class='del'>-#define _InterruptStatus  _USB( 0x1000 )</div><div class='del'>-#define _InterruptEnable  _USB( 0x1400 )</div><div class='del'>-#define _HCCA		  _USB( 0x1800 )</div><div class='del'>-#define _PeriodCurrentED  _USB( 0x1c00 )</div><div class='del'>-#define _ControlHeadED	  _USB( 0x2000 )</div><div class='del'>-#define _BulkHeadED	  _USB( 0x2800 )</div><div class='del'>-#define _BulkCurrentED	  _USB( 0x2c00 )</div><div class='del'>-#define _DoneHead	  _USB( 0x3000 )</div><div class='del'>-#define _FmInterval	  _USB( 0x3400 )</div><div class='del'>-#define _FmRemaining	  _USB( 0x3800 )</div><div class='del'>-#define _FmNumber	  _USB( 0x3c00 )</div><div class='del'>-#define _PeriodicStart	  _USB( 0x4000 )</div><div class='del'>-#define _LSThreshold	  _USB( 0x4400 )</div><div class='del'>-#define _RhDescriptorA	  _USB( 0x4800 )</div><div class='del'>-#define _RhDescriptorB	  _USB( 0x4c00 )</div><div class='del'>-#define _RhStatus	  _USB( 0x5000 )</div><div class='del'>-#define _RhPortStatus	  _USB( 0x5400 )</div><div class='del'>-#define _USBStatus	  _USB( 0x11800 )</div><div class='del'>-#define _USBReset	  _USB( 0x11c00 )</div><div class='del'>-</div><div class='del'>-#define _USTAR		  _USB( 0x10400 )</div><div class='del'>-#define _USWER		  _USB( 0x10800 )</div><div class='del'>-#define _USRFR		  _USB( 0x10c00 )</div><div class='del'>-#define _USNFR		  _USB( 0x11000 )</div><div class='del'>-#define _USTCSR		  _USB( 0x11400 )</div><div class='del'>-#define _USSR		  _USB( 0x11800 )</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if (LANGUAGE == C)</div><div class='del'>-</div><div class='del'>-#define Revision	(*((volatile Word *) SA1101_p2v (_Revision)))</div><div class='del'>-#define Control		(*((volatile Word *) SA1101_p2v (_Control)))</div><div class='del'>-#define CommandStatus	(*((volatile Word *) SA1101_p2v (_CommandStatus)))</div><div class='del'>-#define InterruptStatus	(*((volatile Word *) SA1101_p2v (_InterruptStatus)))</div><div class='del'>-#define InterruptEnable	(*((volatile Word *) SA1101_p2v (_InterruptEnable)))</div><div class='del'>-#define HCCA		(*((volatile Word *) SA1101_p2v (_HCCA)))</div><div class='del'>-#define PeriodCurrentED	(*((volatile Word *) SA1101_p2v (_PeriodCurrentED)))</div><div class='del'>-#define ControlHeadED	(*((volatile Word *) SA1101_p2v (_ControlHeadED)))</div><div class='del'>-#define BulkHeadED	(*((volatile Word *) SA1101_p2v (_BulkHeadED)))</div><div class='del'>-#define BulkCurrentED	(*((volatile Word *) SA1101_p2v (_BulkCurrentED)))</div><div class='del'>-#define DoneHead	(*((volatile Word *) SA1101_p2v (_DoneHead)))</div><div class='del'>-#define FmInterval	(*((volatile Word *) SA1101_p2v (_FmInterval)))</div><div class='del'>-#define FmRemaining	(*((volatile Word *) SA1101_p2v (_FmRemaining)))</div><div class='del'>-#define FmNumber	(*((volatile Word *) SA1101_p2v (_FmNumber)))</div><div class='del'>-#define PeriodicStart	(*((volatile Word *) SA1101_p2v (_PeriodicStart)))</div><div class='del'>-#define LSThreshold	(*((volatile Word *) SA1101_p2v (_LSThreshold)))</div><div class='del'>-#define RhDescriptorA	(*((volatile Word *) SA1101_p2v (_RhDescriptorA)))</div><div class='del'>-#define RhDescriptorB	(*((volatile Word *) SA1101_p2v (_RhDescriptorB)))</div><div class='del'>-#define RhStatus	(*((volatile Word *) SA1101_p2v (_RhStatus)))</div><div class='del'>-#define RhPortStatus	(*((volatile Word *) SA1101_p2v (_RhPortStatus)))</div><div class='del'>-#define USBStatus	(*((volatile Word *) SA1101_p2v (_USBStatus)))</div><div class='del'>-#define USBReset	(*((volatile Word *) SA1101_p2v (_USBReset)))</div><div class='del'>-#define USTAR		(*((volatile Word *) SA1101_p2v (_USTAR)))</div><div class='del'>-#define USWER		(*((volatile Word *) SA1101_p2v (_USWER)))</div><div class='del'>-#define USRFR		(*((volatile Word *) SA1101_p2v (_USRFR)))</div><div class='del'>-#define USNFR		(*((volatile Word *) SA1101_p2v (_USNFR)))</div><div class='del'>-#define USTCSR		(*((volatile Word *) SA1101_p2v (_USTCSR)))</div><div class='del'>-#define USSR		(*((volatile Word *) SA1101_p2v (_USSR)))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define USBStatus_IrqHciRmtWkp	     (1&lt;&lt;7)</div><div class='del'>-#define USBStatus_IrqHciBuffAcc	     (1&lt;&lt;8)</div><div class='del'>-#define USBStatus_nIrqHciM	     (1&lt;&lt;9)</div><div class='del'>-#define USBStatus_nHciMFClr	     (1&lt;&lt;10)</div><div class='del'>-</div><div class='del'>-#define USBReset_ForceIfReset	     0x01</div><div class='del'>-#define USBReset_ForceHcReset	     0x02</div><div class='del'>-#define USBReset_ClkGenReset	     0x04</div><div class='del'>-</div><div class='del'>-#define USTCR_RdBstCntrl	     Fld(3,0)</div><div class='del'>-#define USTCR_ByteEnable	     Fld(4,3)</div><div class='del'>-#define USTCR_WriteEn		     (1&lt;&lt;7)</div><div class='del'>-#define USTCR_FifoCir		     (1&lt;&lt;8)</div><div class='del'>-#define USTCR_TestXferSel	     (1&lt;&lt;9)</div><div class='del'>-#define USTCR_FifoCirAtEnd	     (1&lt;&lt;10)</div><div class='del'>-#define USTCR_nSimScaleDownClk	     (1&lt;&lt;11)</div><div class='del'>-</div><div class='del'>-#define USSR_nAppMDEmpty	     0x01</div><div class='del'>-#define USSR_nAppMDFirst	     0x02</div><div class='del'>-#define USSR_nAppMDLast		     0x04</div><div class='del'>-#define USSR_nAppMDFull		     0x08</div><div class='del'>-#define USSR_nAppMAFull		     0x10</div><div class='del'>-#define USSR_XferReq		     0x20</div><div class='del'>-#define USSR_XferEnd		     0x40</div><div class='del'>-</div><div class='del'>-#endif /* LANGUAGE == C */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Interrupt Controller</div><div class='del'>- *</div><div class='del'>- * Registers</div><div class='del'>- *    INTTEST0		Test register 0</div><div class='del'>- *    INTTEST1		Test register 1</div><div class='del'>- *    INTENABLE0	Interrupt Enable register 0</div><div class='del'>- *    INTENABLE1	Interrupt Enable register 1</div><div class='del'>- *    INTPOL0		Interrupt Polarity selection 0</div><div class='del'>- *    INTPOL1		Interrupt Polarity selection 1</div><div class='del'>- *    INTTSTSEL		Interrupt source selection</div><div class='del'>- *    INTSTATCLR0	Interrupt Status 0</div><div class='del'>- *    INTSTATCLR1	Interrupt Status 1</div><div class='del'>- *    INTSET0		Interrupt Set 0</div><div class='del'>- *    INTSET1		Interrupt Set 1</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _INT( x )	_SA1101( ( x ) + __INTERRUPT_CONTROL)</div><div class='del'>-</div><div class='del'>-#define _INTTEST0	_INT( 0x1000 )</div><div class='del'>-#define _INTTEST1	_INT( 0x1400 )</div><div class='del'>-#define _INTENABLE0	_INT( 0x2000 )</div><div class='del'>-#define _INTENABLE1	_INT( 0x2400 )</div><div class='del'>-#define _INTPOL0	_INT( 0x3000 )</div><div class='del'>-#define _INTPOL1	_INT( 0x3400 )</div><div class='del'>-#define _INTTSTSEL     	_INT( 0x5000 )</div><div class='del'>-#define _INTSTATCLR0	_INT( 0x6000 )</div><div class='del'>-#define _INTSTATCLR1	_INT( 0x6400 )</div><div class='del'>-#define _INTSET0	_INT( 0x7000 )</div><div class='del'>-#define _INTSET1	_INT( 0x7400 )</div><div class='del'>-</div><div class='del'>-#if ( LANGUAGE == C )</div><div class='del'>-#define INTTEST0	(*((volatile Word *) SA1101_p2v (_INTTEST0)))</div><div class='del'>-#define INTTEST1	(*((volatile Word *) SA1101_p2v (_INTTEST1)))</div><div class='del'>-#define INTENABLE0	(*((volatile Word *) SA1101_p2v (_INTENABLE0)))</div><div class='del'>-#define INTENABLE1	(*((volatile Word *) SA1101_p2v (_INTENABLE1)))</div><div class='del'>-#define INTPOL0		(*((volatile Word *) SA1101_p2v (_INTPOL0)))</div><div class='del'>-#define INTPOL1		(*((volatile Word *) SA1101_p2v (_INTPOL1)))</div><div class='del'>-#define INTTSTSEL	(*((volatile Word *) SA1101_p2v (_INTTSTSEL)))</div><div class='del'>-#define INTSTATCLR0	(*((volatile Word *) SA1101_p2v (_INTSTATCLR0)))</div><div class='del'>-#define INTSTATCLR1	(*((volatile Word *) SA1101_p2v (_INTSTATCLR1)))</div><div class='del'>-#define INTSET0		(*((volatile Word *) SA1101_p2v (_INTSET0)))</div><div class='del'>-#define INTSET1		(*((volatile Word *) SA1101_p2v (_INTSET1)))</div><div class='del'>-</div><div class='del'>-#endif /* LANGUAGE == C */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PS/2 Trackpad and Mouse Interfaces</div><div class='del'>- *</div><div class='del'>- * Registers   (prefix kbd applies to trackpad interface, mse to mouse)</div><div class='del'>- *    KBDCR		Control Register</div><div class='del'>- *    KBDSTAT		Status Register</div><div class='del'>- *    KBDDATA		Transmit/Receive Data register</div><div class='del'>- *    KBDCLKDIV		Clock Division Register</div><div class='del'>- *    KBDPRECNT		Clock Precount Register</div><div class='del'>- *    KBDTEST1		Test register 1</div><div class='del'>- *    KBDTEST2		Test register 2</div><div class='del'>- *    KBDTEST3		Test register 3</div><div class='del'>- *    KBDTEST4		Test register 4</div><div class='del'>- *    MSECR	</div><div class='del'>- *    MSESTAT</div><div class='del'>- *    MSEDATA</div><div class='del'>- *    MSECLKDIV</div><div class='del'>- *    MSEPRECNT</div><div class='del'>- *    MSETEST1</div><div class='del'>- *    MSETEST2</div><div class='del'>- *    MSETEST3</div><div class='del'>- *    MSETEST4</div><div class='del'>- *     </div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _KBD( x )	_SA1101( ( x ) + __TRACK_INTERFACE )</div><div class='del'>-#define _MSE( x )	_SA1101( ( x ) + __MOUSE_INTERFACE )</div><div class='del'>-</div><div class='del'>-#define _KBDCR		_KBD( 0x0000 )</div><div class='del'>-#define _KBDSTAT	_KBD( 0x0400 )</div><div class='del'>-#define _KBDDATA	_KBD( 0x0800 )</div><div class='del'>-#define _KBDCLKDIV	_KBD( 0x0c00 )</div><div class='del'>-#define _KBDPRECNT	_KBD( 0x1000 )</div><div class='del'>-#define	_KBDTEST1	_KBD( 0x2000 )</div><div class='del'>-#define _KBDTEST2	_KBD( 0x2400 )</div><div class='del'>-#define _KBDTEST3	_KBD( 0x2800 )</div><div class='del'>-#define _KBDTEST4	_KBD( 0x2c00 )</div><div class='del'>-#define _MSECR		_MSE( 0x0000 )</div><div class='del'>-#define _MSESTAT	_MSE( 0x0400 )</div><div class='del'>-#define _MSEDATA	_MSE( 0x0800 )</div><div class='del'>-#define _MSECLKDIV	_MSE( 0x0c00 )</div><div class='del'>-#define _MSEPRECNT	_MSE( 0x1000 )</div><div class='del'>-#define	_MSETEST1	_MSE( 0x2000 )</div><div class='del'>-#define _MSETEST2	_MSE( 0x2400 )</div><div class='del'>-#define _MSETEST3	_MSE( 0x2800 )</div><div class='del'>-#define _MSETEST4	_MSE( 0x2c00 )</div><div class='del'>-</div><div class='del'>-#if ( LANGUAGE == C )</div><div class='del'>-</div><div class='del'>-#define KBDCR	    (*((volatile Word *) SA1101_p2v (_KBDCR)))</div><div class='del'>-#define KBDSTAT	    (*((volatile Word *) SA1101_p2v (_KBDSTAT)))</div><div class='del'>-#define KBDDATA	    (*((volatile Word *) SA1101_p2v (_KBDDATA)))</div><div class='del'>-#define KBDCLKDIV   (*((volatile Word *) SA1101_p2v (_KBDCLKDIV)))</div><div class='del'>-#define KBDPRECNT   (*((volatile Word *) SA1101_p2v (_KBDPRECNT)))</div><div class='del'>-#define KBDTEST1    (*((volatile Word *) SA1101_p2v (_KBDTEST1)))</div><div class='del'>-#define KBDTEST2    (*((volatile Word *) SA1101_p2v (_KBDTEST2)))</div><div class='del'>-#define KBDTEST3    (*((volatile Word *) SA1101_p2v (_KBDTEST3)))</div><div class='del'>-#define KBDTEST4    (*((volatile Word *) SA1101_p2v (_KBDTEST4)))</div><div class='del'>-#define MSECR	    (*((volatile Word *) SA1101_p2v (_MSECR)))</div><div class='del'>-#define MSESTAT	    (*((volatile Word *) SA1101_p2v (_MSESTAT)))</div><div class='del'>-#define MSEDATA	    (*((volatile Word *) SA1101_p2v (_MSEDATA)))</div><div class='del'>-#define MSECLKDIV   (*((volatile Word *) SA1101_p2v (_MSECLKDIV)))</div><div class='del'>-#define MSEPRECNT   (*((volatile Word *) SA1101_p2v (_MSEPRECNT)))</div><div class='del'>-#define MSETEST1    (*((volatile Word *) SA1101_p2v (_MSETEST1)))</div><div class='del'>-#define MSETEST2    (*((volatile Word *) SA1101_p2v (_MSETEST2)))</div><div class='del'>-#define MSETEST3    (*((volatile Word *) SA1101_p2v (_MSETEST3)))</div><div class='del'>-#define MSETEST4    (*((volatile Word *) SA1101_p2v (_MSETEST4)))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define KBDCR_ENA		 0x08</div><div class='del'>-#define KBDCR_FKD		 0x02</div><div class='del'>-#define KBDCR_FKC		 0x01</div><div class='del'>-</div><div class='del'>-#define KBDSTAT_TXE		 0x80</div><div class='del'>-#define KBDSTAT_TXB		 0x40</div><div class='del'>-#define KBDSTAT_RXF		 0x20</div><div class='del'>-#define KBDSTAT_RXB		 0x10</div><div class='del'>-#define KBDSTAT_ENA		 0x08</div><div class='del'>-#define KBDSTAT_RXP		 0x04</div><div class='del'>-#define KBDSTAT_KBD		 0x02</div><div class='del'>-#define KBDSTAT_KBC		 0x01</div><div class='del'>-</div><div class='del'>-#define KBDCLKDIV_DivVal	 Fld(4,0)</div><div class='del'>-</div><div class='del'>-#define MSECR_ENA		 0x08</div><div class='del'>-#define MSECR_FKD		 0x02</div><div class='del'>-#define MSECR_FKC		 0x01</div><div class='del'>-</div><div class='del'>-#define MSESTAT_TXE		 0x80</div><div class='del'>-#define MSESTAT_TXB		 0x40</div><div class='del'>-#define MSESTAT_RXF		 0x20</div><div class='del'>-#define MSESTAT_RXB		 0x10</div><div class='del'>-#define MSESTAT_ENA		 0x08</div><div class='del'>-#define MSESTAT_RXP		 0x04	</div><div class='del'>-#define MSESTAT_MSD		 0x02</div><div class='del'>-#define MSESTAT_MSC		 0x01</div><div class='del'>-</div><div class='del'>-#define MSECLKDIV_DivVal	 Fld(4,0)</div><div class='del'>-</div><div class='del'>-#define KBDTEST1_CD		 0x80</div><div class='del'>-#define KBDTEST1_RC1		 0x40</div><div class='del'>-#define KBDTEST1_MC		 0x20</div><div class='del'>-#define KBDTEST1_C		 Fld(2,3)</div><div class='del'>-#define KBDTEST1_T2		 0x40</div><div class='del'>-#define KBDTEST1_T1		 0x20</div><div class='del'>-#define KBDTEST1_T0		 0x10</div><div class='del'>-#define KBDTEST2_TICBnRES	 0x08</div><div class='del'>-#define KBDTEST2_RKC		 0x04</div><div class='del'>-#define KBDTEST2_RKD		 0x02</div><div class='del'>-#define KBDTEST2_SEL		 0x01</div><div class='del'>-#define KBDTEST3_ms_16		 0x80</div><div class='del'>-#define KBDTEST3_us_64		 0x40</div><div class='del'>-#define KBDTEST3_us_16		 0x20</div><div class='del'>-#define KBDTEST3_DIV8		 0x10</div><div class='del'>-#define KBDTEST3_DIn		 0x08</div><div class='del'>-#define KBDTEST3_CIn		 0x04</div><div class='del'>-#define KBDTEST3_KD		 0x02</div><div class='del'>-#define KBDTEST3_KC		 0x01</div><div class='del'>-#define KBDTEST4_BC12		 0x80</div><div class='del'>-#define KBDTEST4_BC11		 0x40</div><div class='del'>-#define KBDTEST4_TRES		 0x20</div><div class='del'>-#define KBDTEST4_CLKOE		 0x10</div><div class='del'>-#define KBDTEST4_CRES		 0x08</div><div class='del'>-#define KBDTEST4_RXB		 0x04</div><div class='del'>-#define KBDTEST4_TXB		 0x02</div><div class='del'>-#define KBDTEST4_SRX		 0x01</div><div class='del'>-</div><div class='del'>-#define MSETEST1_CD		 0x80</div><div class='del'>-#define MSETEST1_RC1		 0x40</div><div class='del'>-#define MSETEST1_MC		 0x20</div><div class='del'>-#define MSETEST1_C		 Fld(2,3)</div><div class='del'>-#define MSETEST1_T2		 0x40</div><div class='del'>-#define MSETEST1_T1		 0x20</div><div class='del'>-#define MSETEST1_T0		 0x10</div><div class='del'>-#define MSETEST2_TICBnRES	 0x08</div><div class='del'>-#define MSETEST2_RKC		 0x04</div><div class='del'>-#define MSETEST2_RKD		 0x02</div><div class='del'>-#define MSETEST2_SEL		 0x01</div><div class='del'>-#define MSETEST3_ms_16		 0x80</div><div class='del'>-#define MSETEST3_us_64		 0x40</div><div class='del'>-#define MSETEST3_us_16		 0x20</div><div class='del'>-#define MSETEST3_DIV8		 0x10</div><div class='del'>-#define MSETEST3_DIn		 0x08</div><div class='del'>-#define MSETEST3_CIn		 0x04</div><div class='del'>-#define MSETEST3_KD		 0x02</div><div class='del'>-#define MSETEST3_KC		 0x01</div><div class='del'>-#define MSETEST4_BC12		 0x80</div><div class='del'>-#define MSETEST4_BC11		 0x40</div><div class='del'>-#define MSETEST4_TRES		 0x20</div><div class='del'>-#define MSETEST4_CLKOE		 0x10</div><div class='del'>-#define MSETEST4_CRES		 0x08</div><div class='del'>-#define MSETEST4_RXB		 0x04</div><div class='del'>-#define MSETEST4_TXB		 0x02</div><div class='del'>-#define MSETEST4_SRX		 0x01</div><div class='del'>-</div><div class='del'>-#endif  /* LANGUAGE == C */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * General-Purpose I/O Interface</div><div class='del'>- *</div><div class='del'>- * Registers</div><div class='del'>- *    PADWR	Port A Data Write Register</div><div class='del'>- *    PBDWR	Port B Data Write Register</div><div class='del'>- *    PADRR	Port A Data Read Register</div><div class='del'>- *    PBDRR	Port B Data Read Register</div><div class='del'>- *    PADDR	Port A Data Direction Register</div><div class='del'>- *    PBDDR	Port B Data Direction Register</div><div class='del'>- *    PASSR	Port A Sleep State Register</div><div class='del'>- *    PBSSR	Port B Sleep State Register</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _PIO( x )      _SA1101( ( x ) + __GPIO_INTERFACE )</div><div class='del'>-</div><div class='del'>-#define _PADWR	       _PIO( 0x0000 )</div><div class='del'>-#define _PBDWR	       _PIO( 0x0400 )</div><div class='del'>-#define _PADRR	       _PIO( 0x0000 )</div><div class='del'>-#define _PBDRR	       _PIO( 0x0400 )</div><div class='del'>-#define _PADDR	       _PIO( 0x0800 )</div><div class='del'>-#define _PBDDR	       _PIO( 0x0c00 )</div><div class='del'>-#define _PASSR	       _PIO( 0x1000 )</div><div class='del'>-#define _PBSSR	       _PIO( 0x1400 )</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if ( LANGUAGE == C )</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PADWR	    (*((volatile Word *) SA1101_p2v (_PADWR)))</div><div class='del'>-#define PBDWR	    (*((volatile Word *) SA1101_p2v (_PBDWR)))</div><div class='del'>-#define PADRR	    (*((volatile Word *) SA1101_p2v (_PADRR)))</div><div class='del'>-#define PBDRR	    (*((volatile Word *) SA1101_p2v (_PBDRR)))</div><div class='del'>-#define PADDR	    (*((volatile Word *) SA1101_p2v (_PADDR)))</div><div class='del'>-#define PBDDR	    (*((volatile Word *) SA1101_p2v (_PBDDR)))</div><div class='del'>-#define PASSR	    (*((volatile Word *) SA1101_p2v (_PASSR)))</div><div class='del'>-#define PBSSR	    (*((volatile Word *) SA1101_p2v (_PBSSR)))</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Keypad Interface</div><div class='del'>- *</div><div class='del'>- * Registers</div><div class='del'>- *    PXDWR</div><div class='del'>- *    PXDRR</div><div class='del'>- *    PYDWR</div><div class='del'>- *    PYDRR</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _KEYPAD( x )	_SA1101( ( x ) + __KEYPAD_INTERFACE ) </div><div class='del'>-</div><div class='del'>-#define _PXDWR	   _KEYPAD( 0x0000 )</div><div class='del'>-#define _PXDRR	   _KEYPAD( 0x0000 )</div><div class='del'>-#define _PYDWR	   _KEYPAD( 0x0400 )</div><div class='del'>-#define _PYDRR	   _KEYPAD( 0x0400 )</div><div class='del'>-</div><div class='del'>-#if ( LANGUAGE == C )</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PXDWR	    (*((volatile Word *) SA1101_p2v (_PXDWR)))</div><div class='del'>-#define PXDRR	    (*((volatile Word *) SA1101_p2v (_PXDRR)))</div><div class='del'>-#define PYDWR	    (*((volatile Word *) SA1101_p2v (_PYDWR)))</div><div class='del'>-#define PYDRR	    (*((volatile Word *) SA1101_p2v (_PYDRR)))</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PCMCIA Interface</div><div class='del'>- *</div><div class='del'>- * Registers</div><div class='del'>- *    PCSR	Status Register</div><div class='del'>- *    PCCR	Control Register</div><div class='del'>- *    PCSSR	Sleep State Register</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define _CARD( x )	_SA1101( ( x ) + __PCMCIA_INTERFACE )</div><div class='del'>-</div><div class='del'>-#define _PCSR	   _CARD( 0x0000 )</div><div class='del'>-#define _PCCR	   _CARD( 0x0400 )</div><div class='del'>-#define _PCSSR	   _CARD( 0x0800 )</div><div class='del'>-</div><div class='del'>-#if ( LANGUAGE == C )</div><div class='del'>-#define PCSR    (*((volatile Word *) SA1101_p2v (_PCSR)))</div><div class='del'>-#define PCCR	(*((volatile Word *) SA1101_p2v (_PCCR)))</div><div class='del'>-#define PCSSR	(*((volatile Word *) SA1101_p2v (_PCSSR)))</div><div class='del'>-</div><div class='del'>-#define PCSR_S0_ready		0x0001</div><div class='del'>-#define PCSR_S1_ready		0x0002</div><div class='del'>-#define PCSR_S0_detected	0x0004</div><div class='del'>-#define PCSR_S1_detected	0x0008</div><div class='del'>-#define PCSR_S0_VS1		0x0010</div><div class='del'>-#define PCSR_S0_VS2		0x0020</div><div class='del'>-#define PCSR_S1_VS1		0x0040</div><div class='del'>-#define PCSR_S1_VS2		0x0080</div><div class='del'>-#define PCSR_S0_WP		0x0100</div><div class='del'>-#define PCSR_S1_WP		0x0200</div><div class='del'>-#define PCSR_S0_BVD1_nSTSCHG	0x0400</div><div class='del'>-#define PCSR_S0_BVD2_nSPKR	0x0800</div><div class='del'>-#define PCSR_S1_BVD1_nSTSCHG	0x1000</div><div class='del'>-#define PCSR_S1_BVD2_nSPKR	0x2000</div><div class='del'>-</div><div class='del'>-#define PCCR_S0_VPP0		0x0001</div><div class='del'>-#define PCCR_S0_VPP1		0x0002</div><div class='del'>-#define PCCR_S0_VCC0		0x0004</div><div class='del'>-#define PCCR_S0_VCC1		0x0008</div><div class='del'>-#define PCCR_S1_VPP0		0x0010</div><div class='del'>-#define PCCR_S1_VPP1		0x0020</div><div class='del'>-#define PCCR_S1_VCC0		0x0040</div><div class='del'>-#define PCCR_S1_VCC1		0x0080</div><div class='del'>-#define PCCR_S0_reset		0x0100</div><div class='del'>-#define PCCR_S1_reset		0x0200</div><div class='del'>-#define PCCR_S0_float		0x0400</div><div class='del'>-#define PCCR_S1_float		0x0800</div><div class='del'>-</div><div class='del'>-#define PCSSR_S0_VCC0		0x0001</div><div class='del'>-#define PCSSR_S0_VCC1		0x0002</div><div class='del'>-#define PCSSR_S0_VPP0		0x0004</div><div class='del'>-#define PCSSR_S0_VPP1		0x0008</div><div class='del'>-#define PCSSR_S0_control	0x0010</div><div class='del'>-#define PCSSR_S1_VCC0		0x0020</div><div class='del'>-#define PCSSR_S1_VCC1		0x0040</div><div class='del'>-#define PCSSR_S1_VPP0		0x0080</div><div class='del'>-#define PCSSR_S1_VPP1		0x0100</div><div class='del'>-#define PCSSR_S1_control	0x0200</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#undef C</div><div class='del'>-#undef Assembly</div><div class='head'>diff --git a/arch/arm/mach-sa1100/include/mach/hardware.h b/arch/arm/mach-sa1100/include/mach/hardware.h<br/>index d944fd7e464f..cc43f95f33cc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-sa1100/include/mach/hardware.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-sa1100/include/mach/hardware.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-sa1100/include/mach/hardware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sa1100/include/mach/hardware.h</a></div><div class='hunk'>@@ -43,10 +43,6 @@</div><div class='ctx'> # define __REG(x)	(*((volatile unsigned long __iomem *)io_p2v(x)))</div><div class='ctx'> # define __PREG(x)	(io_v2p((unsigned long)&amp;(x)))</div><div class='ctx'> </div><div class='del'>-static inline unsigned long get_clock_tick_rate(void)</div><div class='del'>-{</div><div class='del'>-	return 3686400;</div><div class='del'>-}</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> # define __REG(x)	io_p2v(x)</div><div class='hunk'>@@ -56,8 +52,4 @@ static inline unsigned long get_clock_tick_rate(void)</div><div class='ctx'> </div><div class='ctx'> #include "SA-1100.h"</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SA1101</div><div class='del'>-#include "SA-1101.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif  /* _ASM_ARCH_HARDWARE_H */</div><div class='head'>diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c<br/>index 34853d5dfda2..9a7079f565bd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-sa1100/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-sa1100/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-sa1100/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sa1100/pm.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ static int sa11x0_pm_enter(suspend_state_t state)</div><div class='ctx'> 	RCSR = RCSR_HWR | RCSR_SWR | RCSR_WDR | RCSR_SMR;</div><div class='ctx'> </div><div class='ctx'> 	/* set resume return address */</div><div class='del'>-	PSPR = virt_to_phys(cpu_resume);</div><div class='add'>+	PSPR = __pa_symbol(cpu_resume);</div><div class='ctx'> </div><div class='ctx'> 	/* go zzz */</div><div class='ctx'> 	cpu_suspend(0, sa1100_finish_suspend);</div><div class='head'>diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig<br/>index 09817bae4558..ad7d604ff001 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-shmobile/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/Kconfig</a></div><div class='hunk'>@@ -32,15 +32,16 @@ config ARCH_RMOBILE</div><div class='ctx'> menuconfig ARCH_RENESAS</div><div class='ctx'> 	bool "Renesas ARM SoCs"</div><div class='ctx'> 	depends on ARCH_MULTI_V7 &amp;&amp; MMU</div><div class='add'>+	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE</div><div class='ctx'> 	select ARCH_SHMOBILE</div><div class='ctx'> 	select ARCH_SHMOBILE_MULTI</div><div class='add'>+	select ARM_GIC</div><div class='add'>+	select GPIOLIB</div><div class='ctx'> 	select HAVE_ARM_SCU if SMP</div><div class='ctx'> 	select HAVE_ARM_TWD if SMP</div><div class='del'>-	select ARM_GIC</div><div class='del'>-	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE</div><div class='ctx'> 	select NO_IOPORT_MAP</div><div class='ctx'> 	select PINCTRL</div><div class='del'>-	select GPIOLIB</div><div class='add'>+	select SOC_BUS</div><div class='ctx'> 	select ZONE_DMA if ARM_LPAE</div><div class='ctx'> </div><div class='ctx'> if ARCH_RENESAS</div><div class='hunk'>@@ -56,10 +57,12 @@ config ARCH_R7S72100</div><div class='ctx'> 	select PM</div><div class='ctx'> 	select PM_GENERIC_DOMAINS</div><div class='ctx'> 	select SYS_SUPPORTS_SH_MTU2</div><div class='add'>+	select RENESAS_OSTM</div><div class='ctx'> </div><div class='ctx'> config ARCH_R8A73A4</div><div class='ctx'> 	bool "R-Mobile APE6 (R8A73A40)"</div><div class='ctx'> 	select ARCH_RMOBILE</div><div class='add'>+	select ARM_ERRATA_798181 if SMP</div><div class='ctx'> 	select RENESAS_IRQC</div><div class='ctx'> </div><div class='ctx'> config ARCH_R8A7740</div><div class='hunk'>@@ -67,6 +70,15 @@ config ARCH_R8A7740</div><div class='ctx'> 	select ARCH_RMOBILE</div><div class='ctx'> 	select RENESAS_INTC_IRQPIN</div><div class='ctx'> </div><div class='add'>+config ARCH_R8A7743</div><div class='add'>+	bool "RZ/G1M (R8A77430)"</div><div class='add'>+	select ARCH_RCAR_GEN2</div><div class='add'>+	select ARM_ERRATA_798181 if SMP</div><div class='add'>+</div><div class='add'>+config ARCH_R8A7745</div><div class='add'>+	bool "RZ/G1E (R8A77450)"</div><div class='add'>+	select ARCH_RCAR_GEN2</div><div class='add'>+</div><div class='ctx'> config ARCH_R8A7778</div><div class='ctx'> 	bool "R-Car M1A (R8A77781)"</div><div class='ctx'> 	select ARCH_RCAR_GEN1</div><div class='hunk'>@@ -78,20 +90,24 @@ config ARCH_R8A7779</div><div class='ctx'> config ARCH_R8A7790</div><div class='ctx'> 	bool "R-Car H2 (R8A77900)"</div><div class='ctx'> 	select ARCH_RCAR_GEN2</div><div class='add'>+	select ARM_ERRATA_798181 if SMP</div><div class='ctx'> 	select I2C</div><div class='ctx'> </div><div class='ctx'> config ARCH_R8A7791</div><div class='ctx'> 	bool "R-Car M2-W (R8A77910)"</div><div class='ctx'> 	select ARCH_RCAR_GEN2</div><div class='add'>+	select ARM_ERRATA_798181 if SMP</div><div class='ctx'> 	select I2C</div><div class='ctx'> </div><div class='ctx'> config ARCH_R8A7792</div><div class='ctx'> 	bool "R-Car V2H (R8A77920)"</div><div class='ctx'> 	select ARCH_RCAR_GEN2</div><div class='add'>+	select ARM_ERRATA_798181 if SMP</div><div class='ctx'> </div><div class='ctx'> config ARCH_R8A7793</div><div class='ctx'> 	bool "R-Car M2-N (R8A7793)"</div><div class='ctx'> 	select ARCH_RCAR_GEN2</div><div class='add'>+	select ARM_ERRATA_798181 if SMP</div><div class='ctx'> 	select I2C</div><div class='ctx'> </div><div class='ctx'> config ARCH_R8A7794</div><div class='head'>diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile<br/>index 3fc48b02eb4f..64611a1b4276 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-shmobile/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/Makefile</a></div><div class='hunk'>@@ -13,9 +13,6 @@ obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o</div><div class='ctx'> obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o pm-r8a7779.o</div><div class='ctx'> obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o</div><div class='ctx'> obj-$(CONFIG_ARCH_R8A7791)	+= setup-r8a7791.o</div><div class='del'>-obj-$(CONFIG_ARCH_R8A7792)	+= setup-r8a7792.o</div><div class='del'>-obj-$(CONFIG_ARCH_R8A7793)	+= setup-r8a7793.o</div><div class='del'>-obj-$(CONFIG_ARCH_R8A7794)	+= setup-r8a7794.o</div><div class='ctx'> obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o</div><div class='ctx'> obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s72100.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c<br/>index 0c6bb458b7a4..3ca2c13346f0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/platsmp-apmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/platsmp-apmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-shmobile/platsmp-apmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/platsmp-apmu.c</a></div><div class='hunk'>@@ -31,9 +31,21 @@ static struct {</div><div class='ctx'> 	int bit;</div><div class='ctx'> } apmu_cpus[NR_CPUS];</div><div class='ctx'> </div><div class='del'>-#define WUPCR_OFFS 0x10</div><div class='del'>-#define PSTR_OFFS 0x40</div><div class='del'>-#define CPUNCR_OFFS(n) (0x100 + (0x10 * (n)))</div><div class='add'>+#define WUPCR_OFFS	 0x10		/* Wake Up Control Register */</div><div class='add'>+#define PSTR_OFFS	 0x40		/* Power Status Register */</div><div class='add'>+#define CPUNCR_OFFS(n)	(0x100 + (0x10 * (n)))</div><div class='add'>+					/* CPUn Power Status Control Register */</div><div class='add'>+#define DBGRCR_OFFS	0x180		/* Debug Resource Reset Control Reg. */</div><div class='add'>+</div><div class='add'>+/* Power Status Register */</div><div class='add'>+#define CPUNST(r, n)	(((r) &gt;&gt; (n * 4)) &amp; 3)	/* CPUn Status Bit */</div><div class='add'>+#define CPUST_RUN	0		/* Run Mode */</div><div class='add'>+#define CPUST_STANDBY	3		/* CoreStandby Mode */</div><div class='add'>+</div><div class='add'>+/* Debug Resource Reset Control Register */</div><div class='add'>+#define DBGCPUREN	BIT(24)		/* CPU Other Reset Request Enable */</div><div class='add'>+#define DBGCPUNREN(n)	BIT((n) + 20)	/* CPUn Reset Request Enable */</div><div class='add'>+#define DBGCPUPREN	BIT(19)		/* CPU Peripheral Reset Req. Enable */</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused apmu_power_on(void __iomem *p, int bit)</div><div class='ctx'> {</div><div class='hunk'>@@ -59,7 +71,7 @@ static int __maybe_unused apmu_power_off_poll(void __iomem *p, int bit)</div><div class='ctx'> 	int k;</div><div class='ctx'> </div><div class='ctx'> 	for (k = 0; k &lt; 1000; k++) {</div><div class='del'>-		if (((readl_relaxed(p + PSTR_OFFS) &gt;&gt; (bit * 4)) &amp; 0x03) == 3)</div><div class='add'>+		if (CPUNST(readl_relaxed(p + PSTR_OFFS), bit) == CPUST_STANDBY)</div><div class='ctx'> 			return 1;</div><div class='ctx'> </div><div class='ctx'> 		mdelay(1);</div><div class='hunk'>@@ -78,6 +90,8 @@ static int __maybe_unused apmu_wrap(int cpu, int (*fn)(void __iomem *p, int cpu)</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static void apmu_init_cpu(struct resource *res, int cpu, int bit)</div><div class='ctx'> {</div><div class='add'>+	u32 x;</div><div class='add'>+</div><div class='ctx'> 	if ((cpu &gt;= ARRAY_SIZE(apmu_cpus)) || apmu_cpus[cpu].iomem)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -85,6 +99,11 @@ static void apmu_init_cpu(struct resource *res, int cpu, int bit)</div><div class='ctx'> 	apmu_cpus[cpu].bit = bit;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("apmu ioremap %d %d %pr\n", cpu, bit, res);</div><div class='add'>+</div><div class='add'>+	/* Setup for debug mode */</div><div class='add'>+	x = readl(apmu_cpus[cpu].iomem + DBGRCR_OFFS);</div><div class='add'>+	x |= DBGCPUREN | DBGCPUNREN(bit) | DBGCPUPREN;</div><div class='add'>+	writel(x, apmu_cpus[cpu].iomem + DBGRCR_OFFS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void apmu_parse_cfg(void (*fn)(struct resource *res, int cpu, int bit),</div><div class='hunk'>@@ -171,7 +190,7 @@ static void apmu_parse_dt(void (*fn)(struct resource *res, int cpu, int bit))</div><div class='ctx'> static void __init shmobile_smp_apmu_setup_boot(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* install boot code shared by all CPUs */</div><div class='del'>-	shmobile_boot_fn = virt_to_phys(shmobile_smp_boot);</div><div class='add'>+	shmobile_boot_fn = __pa_symbol(shmobile_smp_boot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus,</div><div class='hunk'>@@ -185,7 +204,7 @@ void __init shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus,</div><div class='ctx'> int shmobile_smp_apmu_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> {</div><div class='ctx'> 	/* For this particular CPU register boot vector */</div><div class='del'>-	shmobile_smp_hook(cpu, virt_to_phys(secondary_startup), 0);</div><div class='add'>+	shmobile_smp_hook(cpu, __pa_symbol(secondary_startup), 0);</div><div class='ctx'> </div><div class='ctx'> 	return apmu_wrap(cpu, apmu_power_on);</div><div class='ctx'> }</div><div class='hunk'>@@ -197,21 +216,9 @@ static void __init shmobile_smp_apmu_prepare_cpus_dt(unsigned int max_cpus)</div><div class='ctx'> 	rcar_gen2_pm_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int shmobile_smp_apmu_boot_secondary_md21(unsigned int cpu,</div><div class='del'>-						 struct task_struct *idle)</div><div class='del'>-{</div><div class='del'>-	/* Error out when hardware debug mode is enabled */</div><div class='del'>-	if (rcar_gen2_read_mode_pins() &amp; BIT(21)) {</div><div class='del'>-		pr_warn("Unable to boot CPU%u when MD21 is set\n", cpu);</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return shmobile_smp_apmu_boot_secondary(cpu, idle);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct smp_operations apmu_smp_ops __initdata = {</div><div class='ctx'> 	.smp_prepare_cpus	= shmobile_smp_apmu_prepare_cpus_dt,</div><div class='del'>-	.smp_boot_secondary	= shmobile_smp_apmu_boot_secondary_md21,</div><div class='add'>+	.smp_boot_secondary	= shmobile_smp_apmu_boot_secondary,</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> 	.cpu_can_disable	= shmobile_smp_cpu_can_disable,</div><div class='ctx'> 	.cpu_die		= shmobile_smp_apmu_cpu_die,</div><div class='hunk'>@@ -301,7 +308,7 @@ int shmobile_smp_apmu_cpu_kill(unsigned int cpu)</div><div class='ctx'> #if defined(CONFIG_SUSPEND)</div><div class='ctx'> static int shmobile_smp_apmu_do_suspend(unsigned long cpu)</div><div class='ctx'> {</div><div class='del'>-	shmobile_smp_hook(cpu, virt_to_phys(cpu_resume), 0);</div><div class='add'>+	shmobile_smp_hook(cpu, __pa_symbol(cpu_resume), 0);</div><div class='ctx'> 	shmobile_smp_apmu_cpu_shutdown(cpu);</div><div class='ctx'> 	cpu_do_idle(); /* WFI selects Core Standby */</div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c<br/>index d1ecaf37d142..f1a1efde4beb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/platsmp-scu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/platsmp-scu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-shmobile/platsmp-scu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/platsmp-scu.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@ static void __iomem *shmobile_scu_base;</div><div class='ctx'> static int shmobile_scu_cpu_prepare(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	/* For this particular CPU register SCU SMP boot vector */</div><div class='del'>-	shmobile_smp_hook(cpu, virt_to_phys(shmobile_boot_scu),</div><div class='add'>+	shmobile_smp_hook(cpu, __pa_symbol(shmobile_boot_scu),</div><div class='ctx'> 			  shmobile_scu_base_phys);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -33,7 +33,7 @@ void __init shmobile_smp_scu_prepare_cpus(phys_addr_t scu_base_phys,</div><div class='ctx'> 					  unsigned int max_cpus)</div><div class='ctx'> {</div><div class='ctx'> 	/* install boot code shared by all CPUs */</div><div class='del'>-	shmobile_boot_fn = virt_to_phys(shmobile_smp_boot);</div><div class='add'>+	shmobile_boot_fn = __pa_symbol(shmobile_smp_boot);</div><div class='ctx'> </div><div class='ctx'> 	/* enable SCU and cache coherency on booting CPU */</div><div class='ctx'> 	shmobile_scu_base_phys = scu_base_phys;</div><div class='head'>diff --git a/arch/arm/mach-shmobile/pm-rcar-gen2.c b/arch/arm/mach-shmobile/pm-rcar-gen2.c<br/>index dd9ac366868f..0178da7ace82 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/pm-rcar-gen2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/pm-rcar-gen2.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-shmobile/pm-rcar-gen2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/pm-rcar-gen2.c</a></div><div class='hunk'>@@ -20,14 +20,30 @@</div><div class='ctx'> </div><div class='ctx'> /* RST */</div><div class='ctx'> #define RST		0xe6160000</div><div class='del'>-#define CA15BAR		0x0020</div><div class='del'>-#define CA7BAR		0x0030</div><div class='del'>-#define CA15RESCNT	0x0040</div><div class='del'>-#define CA7RESCNT	0x0044</div><div class='add'>+</div><div class='add'>+#define CA15BAR		0x0020		/* CA15 Boot Address Register */</div><div class='add'>+#define CA7BAR		0x0030		/* CA7 Boot Address Register */</div><div class='add'>+#define CA15RESCNT	0x0040		/* CA15 Reset Control Register */</div><div class='add'>+#define CA7RESCNT	0x0044		/* CA7 Reset Control Register */</div><div class='add'>+</div><div class='add'>+/* SYS Boot Address Register */</div><div class='add'>+#define SBAR_BAREN	BIT(4)		/* SBAR is valid */</div><div class='add'>+</div><div class='add'>+/* Reset Control Registers */</div><div class='add'>+#define CA15RESCNT_CODE	0xa5a50000</div><div class='add'>+#define CA15RESCNT_CPUS	0xf		/* CPU0-3 */</div><div class='add'>+#define CA7RESCNT_CODE	0x5a5a0000</div><div class='add'>+#define CA7RESCNT_CPUS	0xf		/* CPU0-3 */</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* On-chip RAM */</div><div class='ctx'> #define ICRAM1		0xe63c0000	/* Inter Connect RAM1 (4 KiB) */</div><div class='ctx'> </div><div class='add'>+static inline u32 phys_to_sbar(phys_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	return (addr &gt;&gt; 8) &amp; 0xfffffc00;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* SYSC */</div><div class='ctx'> #define SYSCIER 0x0c</div><div class='ctx'> #define SYSCIMR 0x10</div><div class='hunk'>@@ -82,22 +98,24 @@ void __init rcar_gen2_pm_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* setup reset vectors */</div><div class='ctx'> 	p = ioremap_nocache(RST, 0x63);</div><div class='del'>-	bar = (boot_vector_addr &gt;&gt; 8) &amp; 0xfffffc00;</div><div class='add'>+	bar = phys_to_sbar(boot_vector_addr);</div><div class='ctx'> 	if (has_a15) {</div><div class='ctx'> 		writel_relaxed(bar, p + CA15BAR);</div><div class='del'>-		writel_relaxed(bar | 0x10, p + CA15BAR);</div><div class='add'>+		writel_relaxed(bar | SBAR_BAREN, p + CA15BAR);</div><div class='ctx'> </div><div class='ctx'> 		/* de-assert reset for CA15 CPUs */</div><div class='del'>-		writel_relaxed((readl_relaxed(p + CA15RESCNT) &amp; ~0x0f) |</div><div class='del'>-				0xa5a50000, p + CA15RESCNT);</div><div class='add'>+		writel_relaxed((readl_relaxed(p + CA15RESCNT) &amp;</div><div class='add'>+				~CA15RESCNT_CPUS) | CA15RESCNT_CODE,</div><div class='add'>+			       p + CA15RESCNT);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (has_a7) {</div><div class='ctx'> 		writel_relaxed(bar, p + CA7BAR);</div><div class='del'>-		writel_relaxed(bar | 0x10, p + CA7BAR);</div><div class='add'>+		writel_relaxed(bar | SBAR_BAREN, p + CA7BAR);</div><div class='ctx'> </div><div class='ctx'> 		/* de-assert reset for CA7 CPUs */</div><div class='del'>-		writel_relaxed((readl_relaxed(p + CA7RESCNT) &amp; ~0x0f) |</div><div class='del'>-				0x5a5a0000, p + CA7RESCNT);</div><div class='add'>+		writel_relaxed((readl_relaxed(p + CA7RESCNT) &amp;</div><div class='add'>+				~CA7RESCNT_CPUS) | CA7RESCNT_CODE,</div><div class='add'>+			       p + CA7RESCNT);</div><div class='ctx'> 	}</div><div class='ctx'> 	iounmap(p);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-shmobile/rcar-gen2.h b/arch/arm/mach-shmobile/rcar-gen2.h<br/>index 8a66b4aae035..6792e249cf56 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/rcar-gen2.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/rcar-gen2.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-shmobile/rcar-gen2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/rcar-gen2.h</a></div><div class='hunk'>@@ -2,8 +2,6 @@</div><div class='ctx'> #define __ASM_RCAR_GEN2_H__</div><div class='ctx'> </div><div class='ctx'> void rcar_gen2_timer_init(void);</div><div class='del'>-#define MD(nr) BIT(nr)</div><div class='del'>-u32 rcar_gen2_read_mode_pins(void);</div><div class='ctx'> void rcar_gen2_reserve(void);</div><div class='ctx'> void rcar_gen2_pm_init(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c<br/>index cf236db686a9..7fa4a0b5f654 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/setup-r8a7778.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/setup-r8a7778.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-shmobile/setup-r8a7778.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/setup-r8a7778.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/clk/renesas.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/irqchip.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -23,19 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='del'>-#define MODEMR 0xffcc0020</div><div class='del'>-</div><div class='del'>-static void __init r8a7778_timer_init(void)</div><div class='del'>-{</div><div class='del'>-	u32 mode;</div><div class='del'>-	void __iomem *modemr = ioremap_nocache(MODEMR, 4);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!modemr);</div><div class='del'>-	mode = ioread32(modemr);</div><div class='del'>-	iounmap(modemr);</div><div class='del'>-	r8a7778_clocks_init(mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define INT2SMSKCR0	0x82288 /* 0xfe782288 */</div><div class='ctx'> #define INT2SMSKCR1	0x8228c /* 0xfe78228c */</div><div class='ctx'> </div><div class='hunk'>@@ -70,6 +56,5 @@ DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")</div><div class='ctx'> 	.init_early	= shmobile_init_delay,</div><div class='ctx'> 	.init_irq	= r8a7778_init_irq_dt,</div><div class='ctx'> 	.init_late	= shmobile_init_late,</div><div class='del'>-	.init_time	= r8a7778_timer_init,</div><div class='ctx'> 	.dt_compat	= r8a7778_compat_dt,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c<br/>index 0007ff51d180..0686112f2435 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/setup-r8a7779.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/setup-r8a7779.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-shmobile/setup-r8a7779.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/setup-r8a7779.c</a></div><div class='hunk'>@@ -14,8 +14,6 @@</div><div class='ctx'>  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/clk/renesas.h&gt;</div><div class='del'>-#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/irqchip.h&gt;</div><div class='hunk'>@@ -76,30 +74,6 @@ static void __init r8a7779_init_irq_dt(void)</div><div class='ctx'> 	__raw_writel(0x003fee3f, INT2SMSKCR4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MODEMR		0xffcc0020</div><div class='del'>-</div><div class='del'>-static u32 __init r8a7779_read_mode_pins(void)</div><div class='del'>-{</div><div class='del'>-	static u32 mode;</div><div class='del'>-	static bool mode_valid;</div><div class='del'>-</div><div class='del'>-	if (!mode_valid) {</div><div class='del'>-		void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);</div><div class='del'>-		BUG_ON(!modemr);</div><div class='del'>-		mode = ioread32(modemr);</div><div class='del'>-		iounmap(modemr);</div><div class='del'>-		mode_valid = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init r8a7779_init_time(void)</div><div class='del'>-{</div><div class='del'>-	r8a7779_clocks_init(r8a7779_read_mode_pins());</div><div class='del'>-	clocksource_probe();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const char *const r8a7779_compat_dt[] __initconst = {</div><div class='ctx'> 	"renesas,r8a7779",</div><div class='ctx'> 	NULL,</div><div class='hunk'>@@ -109,7 +83,6 @@ DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")</div><div class='ctx'> 	.smp		= smp_ops(r8a7779_smp_ops),</div><div class='ctx'> 	.map_io		= r8a7779_map_io,</div><div class='ctx'> 	.init_early	= shmobile_init_delay,</div><div class='del'>-	.init_time	= r8a7779_init_time,</div><div class='ctx'> 	.init_irq	= r8a7779_init_irq_dt,</div><div class='ctx'> 	.init_late	= shmobile_init_late,</div><div class='ctx'> 	.dt_compat	= r8a7779_compat_dt,</div><div class='head'>diff --git a/arch/arm/mach-shmobile/setup-r8a7792.c b/arch/arm/mach-shmobile/setup-r8a7792.c<br/>deleted file mode 100644<br/>index a0910395da09..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/setup-r8a7792.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/setup-r8a7792.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * r8a7792 processor support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2014 Renesas Electronics Corporation</div><div class='del'>- * Copyright (C) 2016 Cogent  Embedded, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach/arch.h&gt;</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-#include "rcar-gen2.h"</div><div class='del'>-</div><div class='del'>-static const char * const r8a7792_boards_compat_dt[] __initconst = {</div><div class='del'>-	"renesas,r8a7792",</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-DT_MACHINE_START(R8A7792_DT, "Generic R8A7792 (Flattened Device Tree)")</div><div class='del'>-	.init_early	= shmobile_init_delay,</div><div class='del'>-	.init_late	= shmobile_init_late,</div><div class='del'>-	.init_time	= rcar_gen2_timer_init,</div><div class='del'>-	.reserve	= rcar_gen2_reserve,</div><div class='del'>-	.dt_compat	= r8a7792_boards_compat_dt,</div><div class='del'>-MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-shmobile/setup-r8a7793.c b/arch/arm/mach-shmobile/setup-r8a7793.c<br/>deleted file mode 100644<br/>index 5fce87f7f254..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/setup-r8a7793.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/setup-r8a7793.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * r8a7793 processor support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2015  Ulrich Hecht</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/mach/arch.h&gt;</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-#include "rcar-gen2.h"</div><div class='del'>-</div><div class='del'>-static const char * const r8a7793_boards_compat_dt[] __initconst = {</div><div class='del'>-	"renesas,r8a7793",</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-DT_MACHINE_START(R8A7793_DT, "Generic R8A7793 (Flattened Device Tree)")</div><div class='del'>-	.init_early	= shmobile_init_delay,</div><div class='del'>-	.init_time	= rcar_gen2_timer_init,</div><div class='del'>-	.init_late	= shmobile_init_late,</div><div class='del'>-	.reserve	= rcar_gen2_reserve,</div><div class='del'>-	.dt_compat	= r8a7793_boards_compat_dt,</div><div class='del'>-MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-shmobile/setup-r8a7794.c b/arch/arm/mach-shmobile/setup-r8a7794.c<br/>deleted file mode 100644<br/>index d2b093033132..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/setup-r8a7794.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/setup-r8a7794.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * r8a7794 processor support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2014  Renesas Electronics Corporation</div><div class='del'>- * Copyright (C) 2014  Ulrich Hecht</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-#include "common.h"</div><div class='del'>-#include "rcar-gen2.h"</div><div class='del'>-#include &lt;asm/mach/arch.h&gt;</div><div class='del'>-</div><div class='del'>-static const char * const r8a7794_boards_compat_dt[] __initconst = {</div><div class='del'>-	"renesas,r8a7794",</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-DT_MACHINE_START(R8A7794_DT, "Generic R8A7794 (Flattened Device Tree)")</div><div class='del'>-	.init_early	= shmobile_init_delay,</div><div class='del'>-	.init_late	= shmobile_init_late,</div><div class='del'>-	.init_time	= rcar_gen2_timer_init,</div><div class='del'>-	.reserve	= rcar_gen2_reserve,</div><div class='del'>-	.dt_compat	= r8a7794_boards_compat_dt,</div><div class='del'>-MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c<br/>index afb9fdcd3d90..52d466b75973 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/setup-rcar-gen2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/setup-rcar-gen2.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-shmobile/setup-rcar-gen2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/setup-rcar-gen2.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/clk/renesas.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-contiguous.h&gt;</div><div class='hunk'>@@ -24,28 +24,11 @@</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_fdt.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "rcar-gen2.h"</div><div class='ctx'> </div><div class='del'>-#define MODEMR 0xe6160060</div><div class='del'>-</div><div class='del'>-u32 rcar_gen2_read_mode_pins(void)</div><div class='del'>-{</div><div class='del'>-	static u32 mode;</div><div class='del'>-	static bool mode_valid;</div><div class='del'>-</div><div class='del'>-	if (!mode_valid) {</div><div class='del'>-		void __iomem *modemr = ioremap_nocache(MODEMR, 4);</div><div class='del'>-		BUG_ON(!modemr);</div><div class='del'>-		mode = ioread32(modemr);</div><div class='del'>-		iounmap(modemr);</div><div class='del'>-		mode_valid = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned int __init get_extal_freq(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *cpg, *extal;</div><div class='hunk'>@@ -71,7 +54,6 @@ static unsigned int __init get_extal_freq(void)</div><div class='ctx'> </div><div class='ctx'> void __init rcar_gen2_timer_init(void)</div><div class='ctx'> {</div><div class='del'>-	u32 mode = rcar_gen2_read_mode_pins();</div><div class='ctx'> #ifdef CONFIG_ARM_ARCH_TIMER</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	u32 freq;</div><div class='hunk'>@@ -130,7 +112,7 @@ void __init rcar_gen2_timer_init(void)</div><div class='ctx'> 	iounmap(base);</div><div class='ctx'> #endif /* CONFIG_ARM_ARCH_TIMER */</div><div class='ctx'> </div><div class='del'>-	rcar_gen2_clocks_init(mode);</div><div class='add'>+	of_clk_init(NULL);</div><div class='ctx'> 	clocksource_probe();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -203,3 +185,36 @@ void __init rcar_gen2_reserve(void)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static const char * const rcar_gen2_boards_compat_dt[] __initconst = {</div><div class='add'>+	/*</div><div class='add'>+	 * R8A7790 and R8A7791 can't be handled here as long as they need SMP</div><div class='add'>+	 * initialization fallback.</div><div class='add'>+	 */</div><div class='add'>+	"renesas,r8a7792",</div><div class='add'>+	"renesas,r8a7793",</div><div class='add'>+	"renesas,r8a7794",</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DT_MACHINE_START(RCAR_GEN2_DT, "Generic R-Car Gen2 (Flattened Device Tree)")</div><div class='add'>+	.init_early	= shmobile_init_delay,</div><div class='add'>+	.init_late	= shmobile_init_late,</div><div class='add'>+	.init_time	= rcar_gen2_timer_init,</div><div class='add'>+	.reserve	= rcar_gen2_reserve,</div><div class='add'>+	.dt_compat	= rcar_gen2_boards_compat_dt,</div><div class='add'>+MACHINE_END</div><div class='add'>+</div><div class='add'>+static const char * const rz_g1_boards_compat_dt[] __initconst = {</div><div class='add'>+	"renesas,r8a7743",</div><div class='add'>+	"renesas,r8a7745",</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DT_MACHINE_START(RZ_G1_DT, "Generic RZ/G1 (Flattened Device Tree)")</div><div class='add'>+	.init_early	= shmobile_init_delay,</div><div class='add'>+	.init_late	= shmobile_init_late,</div><div class='add'>+	.init_time	= rcar_gen2_timer_init,</div><div class='add'>+	.reserve	= rcar_gen2_reserve,</div><div class='add'>+	.dt_compat	= rz_g1_boards_compat_dt,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-shmobile/smp-r8a7791.c b/arch/arm/mach-shmobile/smp-r8a7791.c<br/>index 2d6417af73b5..2948c22cfc53 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-shmobile/smp-r8a7791.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-shmobile/smp-r8a7791.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-shmobile/smp-r8a7791.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-shmobile/smp-r8a7791.c</a></div><div class='hunk'>@@ -42,21 +42,9 @@ static void __init r8a7791_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	rcar_gen2_pm_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int r8a7791_smp_boot_secondary(unsigned int cpu,</div><div class='del'>-				      struct task_struct *idle)</div><div class='del'>-{</div><div class='del'>-	/* Error out when hardware debug mode is enabled */</div><div class='del'>-	if (rcar_gen2_read_mode_pins() &amp; BIT(21)) {</div><div class='del'>-		pr_warn("Unable to boot CPU%u when MD21 is set\n", cpu);</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return shmobile_smp_apmu_boot_secondary(cpu, idle);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> const struct smp_operations r8a7791_smp_ops __initconst = {</div><div class='ctx'> 	.smp_prepare_cpus	= r8a7791_smp_prepare_cpus,</div><div class='del'>-	.smp_boot_secondary	= r8a7791_smp_boot_secondary,</div><div class='add'>+	.smp_boot_secondary	= shmobile_smp_apmu_boot_secondary,</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> 	.cpu_can_disable	= shmobile_smp_cpu_can_disable,</div><div class='ctx'> 	.cpu_die		= shmobile_smp_apmu_cpu_die,</div><div class='head'>diff --git a/arch/arm/mach-socfpga/l2_cache.c b/arch/arm/mach-socfpga/l2_cache.c<br/>index 4267c95f2158..bb359d727b34 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-socfpga/l2_cache.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-socfpga/l2_cache.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-socfpga/l2_cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-socfpga/l2_cache.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ void socfpga_init_arria10_l2_ecc(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!sys_manager_base_addr) {</div><div class='del'>-		pr_err("System Mananger not mapped for L2 ECC\n");</div><div class='add'>+		pr_err("System Manager not mapped for L2 ECC\n");</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Clear any pending IRQs */</div><div class='head'>diff --git a/arch/arm/mach-socfpga/platsmp.c b/arch/arm/mach-socfpga/platsmp.c<br/>index 07945748b571..0ee76772b507 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-socfpga/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-socfpga/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-socfpga/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-socfpga/platsmp.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> </div><div class='ctx'> 		memcpy(phys_to_virt(0), &amp;secondary_trampoline, trampoline_size);</div><div class='ctx'> </div><div class='del'>-		writel(virt_to_phys(secondary_startup),</div><div class='add'>+		writel(__pa_symbol(secondary_startup),</div><div class='ctx'> 		       sys_manager_base_addr + (socfpga_cpu1start_addr &amp; 0x000000ff));</div><div class='ctx'> </div><div class='ctx'> 		flush_cache_all();</div><div class='hunk'>@@ -63,7 +63,7 @@ static int socfpga_a10_boot_secondary(unsigned int cpu, struct task_struct *idle</div><div class='ctx'> 		       SOCFPGA_A10_RSTMGR_MODMPURST);</div><div class='ctx'> 		memcpy(phys_to_virt(0), &amp;secondary_trampoline, trampoline_size);</div><div class='ctx'> </div><div class='del'>-		writel(virt_to_phys(secondary_startup),</div><div class='add'>+		writel(__pa_symbol(secondary_startup),</div><div class='ctx'> 		       sys_manager_base_addr + (socfpga_cpu1start_addr &amp; 0x00000fff));</div><div class='ctx'> </div><div class='ctx'> 		flush_cache_all();</div><div class='head'>diff --git a/arch/arm/mach-spear/platsmp.c b/arch/arm/mach-spear/platsmp.c<br/>index 8d1e2d551786..39038a03836a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-spear/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-spear/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-spear/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-spear/platsmp.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ static void __init spear13xx_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	 * (presently it is in SRAM). The BootMonitor waits until it receives a</div><div class='ctx'> 	 * soft interrupt, and then the secondary CPU branches to this address.</div><div class='ctx'> 	 */</div><div class='del'>-	__raw_writel(virt_to_phys(spear13xx_secondary_startup), SYS_LOCATION);</div><div class='add'>+	__raw_writel(__pa_symbol(spear13xx_secondary_startup), SYS_LOCATION);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct smp_operations spear13xx_smp_ops __initconst = {</div><div class='head'>diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c<br/>index 9ccffc1d0f28..4878ba90026d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-spear/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-spear/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-spear/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-spear/time.c</a></div><div class='hunk'>@@ -233,7 +233,7 @@ void __init spear_setup_of_timer(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	gpt_clk = clk_get_sys("gpt0", NULL);</div><div class='del'>-	if (!gpt_clk) {</div><div class='add'>+	if (IS_ERR(gpt_clk)) {</div><div class='ctx'> 		pr_err("%s:couldn't get clk for gpt\n", __func__);</div><div class='ctx'> 		goto err_iomap;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig<br/>index 119e1108b1f8..f8eeeffddaff 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-sti/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-sti/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-sti/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sti/Kconfig</a></div><div class='hunk'>@@ -28,7 +28,6 @@ if ARCH_STI</div><div class='ctx'> config SOC_STIH415</div><div class='ctx'> 	bool "STiH415 STMicroelectronics Consumer Electronics family"</div><div class='ctx'> 	default y</div><div class='del'>-	select STIH415_RESET</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for STMicroelectronics Digital Consumer</div><div class='ctx'> 	  Electronics family StiH415 parts, primarily targeted at set-top-box</div><div class='hunk'>@@ -38,7 +37,6 @@ config SOC_STIH415</div><div class='ctx'> config SOC_STIH416</div><div class='ctx'> 	bool "STiH416 STMicroelectronics Consumer Electronics family"</div><div class='ctx'> 	default y</div><div class='del'>-	select STIH416_RESET</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for STMicroelectronics Digital Consumer</div><div class='ctx'> 	  Electronics family StiH416 parts, primarily targeted at set-top-box</div><div class='head'>diff --git a/arch/arm/mach-sti/platsmp.c b/arch/arm/mach-sti/platsmp.c<br/>index ea5a2277ee46..231f19e17436 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-sti/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-sti/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-sti/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sti/platsmp.c</a></div><div class='hunk'>@@ -103,7 +103,7 @@ static void __init sti_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	u32 __iomem *cpu_strt_ptr;</div><div class='ctx'> 	u32 release_phys;</div><div class='ctx'> 	int cpu;</div><div class='del'>-	unsigned long entry_pa = virt_to_phys(sti_secondary_startup);</div><div class='add'>+	unsigned long entry_pa = __pa_symbol(sti_secondary_startup);</div><div class='ctx'> </div><div class='ctx'> 	np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-stm32/board-dt.c b/arch/arm/mach-stm32/board-dt.c<br/>index ceee47735eec..c354222a4158 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-stm32/board-dt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-stm32/board-dt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-stm32/board-dt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-stm32/board-dt.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> static const char *const stm32_compat[] __initconst = {</div><div class='ctx'> 	"st,stm32f429",</div><div class='ctx'> 	"st,stm32f469",</div><div class='add'>+	"st,stm32f746",</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sunxi/platsmp.c b/arch/arm/mach-sunxi/platsmp.c<br/>index 6642267812c9..8fb5088464db 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-sunxi/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-sunxi/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-sunxi/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sunxi/platsmp.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@ static int sun6i_smp_boot_secondary(unsigned int cpu,</div><div class='ctx'> 	spin_lock(&amp;cpu_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Set CPU boot address */</div><div class='del'>-	writel(virt_to_phys(secondary_startup),</div><div class='add'>+	writel(__pa_symbol(secondary_startup),</div><div class='ctx'> 	       cpucfg_membase + CPUCFG_PRIVATE0_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* Assert the CPU core in reset */</div><div class='hunk'>@@ -162,7 +162,7 @@ static int sun8i_smp_boot_secondary(unsigned int cpu,</div><div class='ctx'> 	spin_lock(&amp;cpu_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Set CPU boot address */</div><div class='del'>-	writel(virt_to_phys(secondary_startup),</div><div class='add'>+	writel(__pa_symbol(secondary_startup),</div><div class='ctx'> 	       cpucfg_membase + CPUCFG_PRIVATE0_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* Assert the CPU core in reset */</div><div class='head'>diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c<br/>index 2e2bde271205..f44e3acb5c90 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-sunxi/sunxi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-sunxi/sunxi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-sunxi/sunxi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-sunxi/sunxi.c</a></div><div class='hunk'>@@ -63,7 +63,9 @@ static const char * const sun8i_board_dt_compat[] = {</div><div class='ctx'> 	"allwinner,sun8i-a23",</div><div class='ctx'> 	"allwinner,sun8i-a33",</div><div class='ctx'> 	"allwinner,sun8i-a83t",</div><div class='add'>+	"allwinner,sun8i-h2-plus",</div><div class='ctx'> 	"allwinner,sun8i-h3",</div><div class='add'>+	"allwinner,sun8i-v3s",</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-tango/platsmp.c b/arch/arm/mach-tango/platsmp.c<br/>index 98c62a4a8623..2f0c6c050fed 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-tango/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-tango/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-tango/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-tango/platsmp.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> static int tango_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> {</div><div class='del'>-	tango_set_aux_boot_addr(virt_to_phys(secondary_startup));</div><div class='add'>+	tango_set_aux_boot_addr(__pa_symbol(secondary_startup));</div><div class='ctx'> 	tango_start_aux_core(cpu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-tango/pm.c b/arch/arm/mach-tango/pm.c<br/>index b05c6d6f99d0..406c0814eb6e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-tango/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-tango/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-tango/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-tango/pm.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> static int tango_pm_powerdown(unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	tango_suspend(virt_to_phys(cpu_resume));</div><div class='add'>+	tango_suspend(__pa_symbol(cpu_resume));</div><div class='ctx'> </div><div class='ctx'> 	return -EIO; /* tango_suspend has failed */</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c<br/>index 7478f6fb3664..ea6bff404161 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-tegra/board-paz00.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-tegra/board-paz00.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-tegra/board-paz00.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-tegra/board-paz00.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "board.h"</div><div class='ctx'> </div><div class='del'>-static struct property_entry __initdata wifi_rfkill_prop[] = {</div><div class='add'>+static struct property_entry wifi_rfkill_prop[] __initdata = {</div><div class='ctx'> 	PROPERTY_ENTRY_STRING("name", "wifi_rfkill"),</div><div class='ctx'> 	PROPERTY_ENTRY_STRING("type", "wlan"),</div><div class='ctx'> 	{ },</div><div class='head'>diff --git a/arch/arm/mach-tegra/reset.c b/arch/arm/mach-tegra/reset.c<br/>index 6fd9db54887e..dc558892753c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-tegra/reset.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-tegra/reset.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-tegra/reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-tegra/reset.c</a></div><div class='hunk'>@@ -94,14 +94,14 @@ void __init tegra_cpu_reset_handler_init(void)</div><div class='ctx'> 	__tegra_cpu_reset_handler_data[TEGRA_RESET_MASK_PRESENT] =</div><div class='ctx'> 		*((u32 *)cpu_possible_mask);</div><div class='ctx'> 	__tegra_cpu_reset_handler_data[TEGRA_RESET_STARTUP_SECONDARY] =</div><div class='del'>-		virt_to_phys((void *)secondary_startup);</div><div class='add'>+		__pa_symbol((void *)secondary_startup);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	__tegra_cpu_reset_handler_data[TEGRA_RESET_STARTUP_LP1] =</div><div class='ctx'> 		TEGRA_IRAM_LPx_RESUME_AREA;</div><div class='ctx'> 	__tegra_cpu_reset_handler_data[TEGRA_RESET_STARTUP_LP2] =</div><div class='del'>-		virt_to_phys((void *)tegra_resume);</div><div class='add'>+		__pa_symbol((void *)tegra_resume);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	tegra_cpu_reset_handler_enable();</div><div class='head'>diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile<br/>index 56d0eb6e254e..a9a3453548f4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ux500/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ux500/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ux500/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/Makefile</a></div><div class='hunk'>@@ -4,9 +4,5 @@</div><div class='ctx'> </div><div class='ctx'> obj-y				:= pm.o</div><div class='ctx'> obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o</div><div class='del'>-obj-$(CONFIG_MACH_MOP500)	+= board-mop500-audio.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= platsmp.o</div><div class='del'>-obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o</div><div class='ctx'> obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o</div><div class='del'>-</div><div class='del'>-CFLAGS_hotplug.o		+= -march=armv7-a</div><div class='head'>diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c<br/>deleted file mode 100644<br/>index b2a0899e7453..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ux500/board-mop500-audio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ux500/board-mop500-audio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) ST-Ericsson SA 2010</div><div class='del'>- *</div><div class='del'>- * License terms: GNU General Public License (GPL), version 2</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/dma-ste-dma40.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_data/asoc-ux500-msp.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ste-dma40-db8500.h"</div><div class='del'>-#include "board-mop500.h"</div><div class='del'>-</div><div class='del'>-static struct stedma40_chan_cfg msp0_dma_rx = {</div><div class='del'>-	.high_priority = true,</div><div class='del'>-	.dir = DMA_DEV_TO_MEM,</div><div class='del'>-	.dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct stedma40_chan_cfg msp0_dma_tx = {</div><div class='del'>-	.high_priority = true,</div><div class='del'>-	.dir = DMA_MEM_TO_DEV,</div><div class='del'>-	.dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct msp_i2s_platform_data msp0_platform_data = {</div><div class='del'>-	.id = 0,</div><div class='del'>-	.msp_i2s_dma_rx = &amp;msp0_dma_rx,</div><div class='del'>-	.msp_i2s_dma_tx = &amp;msp0_dma_tx,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct stedma40_chan_cfg msp1_dma_rx = {</div><div class='del'>-	.high_priority = true,</div><div class='del'>-	.dir = DMA_DEV_TO_MEM,</div><div class='del'>-	.dev_type = DB8500_DMA_DEV30_MSP3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct stedma40_chan_cfg msp1_dma_tx = {</div><div class='del'>-	.high_priority = true,</div><div class='del'>-	.dir = DMA_MEM_TO_DEV,</div><div class='del'>-	.dev_type = DB8500_DMA_DEV30_MSP1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct msp_i2s_platform_data msp1_platform_data = {</div><div class='del'>-	.id = 1,</div><div class='del'>-	.msp_i2s_dma_rx = NULL,</div><div class='del'>-	.msp_i2s_dma_tx = &amp;msp1_dma_tx,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct stedma40_chan_cfg msp2_dma_rx = {</div><div class='del'>-	.high_priority = true,</div><div class='del'>-	.dir = DMA_DEV_TO_MEM,</div><div class='del'>-	.dev_type = DB8500_DMA_DEV14_MSP2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct stedma40_chan_cfg msp2_dma_tx = {</div><div class='del'>-	.high_priority = true,</div><div class='del'>-	.dir = DMA_MEM_TO_DEV,</div><div class='del'>-	.dev_type = DB8500_DMA_DEV14_MSP2,</div><div class='del'>-	.use_fixed_channel = true,</div><div class='del'>-	.phy_channel = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct msp_i2s_platform_data msp2_platform_data = {</div><div class='del'>-	.id = 2,</div><div class='del'>-	.msp_i2s_dma_rx = &amp;msp2_dma_rx,</div><div class='del'>-	.msp_i2s_dma_tx = &amp;msp2_dma_tx,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct msp_i2s_platform_data msp3_platform_data = {</div><div class='del'>-	.id		= 3,</div><div class='del'>-	.msp_i2s_dma_rx	= &amp;msp1_dma_rx,</div><div class='del'>-	.msp_i2s_dma_tx	= NULL,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h<br/>deleted file mode 100644<br/>index 7c7b0adca582..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ux500/board-mop500.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ux500/board-mop500.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) ST-Ericsson SA 2010</div><div class='del'>- *</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __BOARD_MOP500_H</div><div class='del'>-#define __BOARD_MOP500_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_data/asoc-ux500-msp.h&gt;</div><div class='del'>-</div><div class='del'>-extern struct msp_i2s_platform_data msp0_platform_data;</div><div class='del'>-extern struct msp_i2s_platform_data msp1_platform_data;</div><div class='del'>-extern struct msp_i2s_platform_data msp2_platform_data;</div><div class='del'>-extern struct msp_i2s_platform_data msp3_platform_data;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c<br/>index 46b1da1bf5d2..28083ef72819 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ux500/cpu-db8500.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ux500/cpu-db8500.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ux500/cpu-db8500.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/cpu-db8500.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/irqchip.h&gt;</div><div class='hunk'>@@ -32,9 +31,6 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "setup.h"</div><div class='del'>-</div><div class='del'>-#include "board-mop500.h"</div><div class='ctx'> #include "db8500-regs.h"</div><div class='ctx'> </div><div class='ctx'> static int __init ux500_l2x0_unlock(void)</div><div class='hunk'>@@ -142,21 +138,6 @@ static struct arm_pmu_platdata db8500_pmu_platdata = {</div><div class='ctx'> static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {</div><div class='ctx'> 	/* Requires call-back bindings. */</div><div class='ctx'> 	OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &amp;db8500_pmu_platdata),</div><div class='del'>-	/* Requires DMA bindings. */</div><div class='del'>-	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,</div><div class='del'>-		       "ux500-msp-i2s.0", &amp;msp0_platform_data),</div><div class='del'>-	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000,</div><div class='del'>-		       "ux500-msp-i2s.1", &amp;msp1_platform_data),</div><div class='del'>-	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80117000,</div><div class='del'>-		       "ux500-msp-i2s.2", &amp;msp2_platform_data),</div><div class='del'>-	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000,</div><div class='del'>-		       "ux500-msp-i2s.3", &amp;msp3_platform_data),</div><div class='del'>-	/* Requires non-DT:able platform data. */</div><div class='del'>-	OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", NULL),</div><div class='del'>-	OF_DEV_AUXDATA("stericsson,ux500-cryp", 0xa03cb000, "cryp1", NULL),</div><div class='del'>-	OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL),</div><div class='del'>-	OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0",</div><div class='del'>-			NULL),</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c<br/>deleted file mode 100644<br/>index 1cbed0331fd3..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ux500/hotplug.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ux500/hotplug.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) STMicroelectronics 2009</div><div class='del'>- * Copyright (C) ST-Ericsson SA 2010</div><div class='del'>- *</div><div class='del'>- * License Terms: GNU General Public License v2</div><div class='del'>- *	Based on ARM realview platform</div><div class='del'>- *</div><div class='del'>- * Author: Sundar Iyer &lt;sundar.iyer@stericsson.com&gt;</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/smp_plat.h&gt;</div><div class='del'>-</div><div class='del'>-#include "setup.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * platform-specific code to shutdown a CPU</div><div class='del'>- *</div><div class='del'>- * Called with IRQs disabled</div><div class='del'>- */</div><div class='del'>-void ux500_cpu_die(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	/* directly enter low power state, skipping secure registers */</div><div class='del'>-	for (;;) {</div><div class='del'>-		__asm__ __volatile__("dsb\n\t" "wfi\n\t"</div><div class='del'>-				: : : "memory");</div><div class='del'>-		if (pen_release == cpu_logical_map(cpu)) {</div><div class='del'>-			/*</div><div class='del'>-			 * OK, proper wakeup, we're done</div><div class='del'>-			 */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c<br/>index 8f2f615ff958..69c2361ca688 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ux500/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ux500/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ux500/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/platsmp.c</a></div><div class='hunk'>@@ -23,18 +23,20 @@</div><div class='ctx'> #include &lt;asm/smp_plat.h&gt;</div><div class='ctx'> #include &lt;asm/smp_scu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "setup.h"</div><div class='del'>-</div><div class='ctx'> #include "db8500-regs.h"</div><div class='ctx'> </div><div class='ctx'> /* Magic triggers in backup RAM */</div><div class='ctx'> #define UX500_CPU1_JUMPADDR_OFFSET 0x1FF4</div><div class='ctx'> #define UX500_CPU1_WAKEMAGIC_OFFSET 0x1FF0</div><div class='ctx'> </div><div class='del'>-static void wakeup_secondary(void)</div><div class='add'>+static void __iomem *backupram;</div><div class='add'>+</div><div class='add'>+static void __init ux500_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np;</div><div class='del'>-	static void __iomem *backupram;</div><div class='add'>+	static void __iomem *scu_base;</div><div class='add'>+	unsigned int ncores;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	np = of_find_compatible_node(NULL, NULL, "ste,dbx500-backupram");</div><div class='ctx'> 	if (!np) {</div><div class='hunk'>@@ -48,29 +50,6 @@ static void wakeup_secondary(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * write the address of secondary startup into the backup ram register</div><div class='del'>-	 * at offset 0x1FF4, then write the magic number 0xA1FEED01 to the</div><div class='del'>-	 * backup ram register at offset 0x1FF0, which is what boot rom code</div><div class='del'>-	 * is waiting for. This will wake up the secondary core from WFE.</div><div class='del'>-	 */</div><div class='del'>-	writel(virt_to_phys(secondary_startup),</div><div class='del'>-	       backupram + UX500_CPU1_JUMPADDR_OFFSET);</div><div class='del'>-	writel(0xA1FEED01,</div><div class='del'>-	       backupram + UX500_CPU1_WAKEMAGIC_OFFSET);</div><div class='del'>-</div><div class='del'>-	/* make sure write buffer is drained */</div><div class='del'>-	mb();</div><div class='del'>-	iounmap(backupram);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init ux500_smp_prepare_cpus(unsigned int max_cpus)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	static void __iomem *scu_base;</div><div class='del'>-	unsigned int ncores;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");</div><div class='ctx'> 	if (!np) {</div><div class='ctx'> 		pr_err("No SCU base address\n");</div><div class='hunk'>@@ -92,11 +71,30 @@ static void __init ux500_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> </div><div class='ctx'> static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> {</div><div class='del'>-	wakeup_secondary();</div><div class='add'>+	/*</div><div class='add'>+	 * write the address of secondary startup into the backup ram register</div><div class='add'>+	 * at offset 0x1FF4, then write the magic number 0xA1FEED01 to the</div><div class='add'>+	 * backup ram register at offset 0x1FF0, which is what boot rom code</div><div class='add'>+	 * is waiting for. This will wake up the secondary core from WFE.</div><div class='add'>+	 */</div><div class='add'>+	writel(__pa_symbol(secondary_startup),</div><div class='add'>+	       backupram + UX500_CPU1_JUMPADDR_OFFSET);</div><div class='add'>+	writel(0xA1FEED01,</div><div class='add'>+	       backupram + UX500_CPU1_WAKEMAGIC_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* make sure write buffer is drained */</div><div class='add'>+	mb();</div><div class='ctx'> 	arch_send_wakeup_ipi_mask(cpumask_of(cpu));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+void ux500_cpu_die(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	wfi();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static const struct smp_operations ux500_smp_ops __initconst = {</div><div class='ctx'> 	.smp_prepare_cpus	= ux500_smp_prepare_cpus,</div><div class='ctx'> 	.smp_boot_secondary	= ux500_boot_secondary,</div><div class='head'>diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c<br/>index 8538910db202..a970e7fcba9e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ux500/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ux500/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-ux500/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-ux500/pm.c</a></div><div class='hunk'>@@ -134,8 +134,8 @@ bool prcmu_pending_irq(void)</div><div class='ctx'>  */</div><div class='ctx'> bool prcmu_is_cpu_in_wfi(int cpu)</div><div class='ctx'> {</div><div class='del'>-	return readl(PRCM_ARM_WFI_STANDBY) &amp; cpu ? PRCM_ARM_WFI_STANDBY_WFI1 :</div><div class='del'>-		     PRCM_ARM_WFI_STANDBY_WFI0;</div><div class='add'>+	return readl(PRCM_ARM_WFI_STANDBY) &amp;</div><div class='add'>+		(cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : PRCM_ARM_WFI_STANDBY_WFI0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h<br/>deleted file mode 100644<br/>index 988e7c77068d..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ux500/setup.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ux500/setup.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 ST-Ericsson.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * These symbols are needed for board-specific files to call their</div><div class='del'>- * own cpu-specific files</div><div class='del'>- */</div><div class='del'>-#ifndef __ASM_ARCH_SETUP_H</div><div class='del'>-#define __ASM_ARCH_SETUP_H</div><div class='del'>-</div><div class='del'>-extern void ux500_cpu_die(unsigned int cpu);</div><div class='del'>-</div><div class='del'>-#endif /*  __ASM_ARCH_SETUP_H */</div><div class='head'>diff --git a/arch/arm/mach-ux500/ste-dma40-db8500.h b/arch/arm/mach-ux500/ste-dma40-db8500.h<br/>deleted file mode 100644<br/>index 0296ae5b0fd9..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-ux500/ste-dma40-db8500.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-ux500/ste-dma40-db8500.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-ux500/ste_dma40_db8500.h</div><div class='del'>- * DB8500-SoC-specific configuration for DMA40</div><div class='del'>- *</div><div class='del'>- * Copyright (C) ST-Ericsson 2007-2010</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='del'>- * Author: Per Friden &lt;per.friden@stericsson.com&gt;</div><div class='del'>- * Author: Jonas Aaberg &lt;jonas.aberg@stericsson.com&gt;</div><div class='del'>- */</div><div class='del'>-#ifndef STE_DMA40_DB8500_H</div><div class='del'>-#define STE_DMA40_DB8500_H</div><div class='del'>-</div><div class='del'>-#define DB8500_DMA_NR_DEV 64</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Unless otherwise specified, all channels numbers are used for</div><div class='del'>- * TX &amp; RX, and can be used for either source or destination</div><div class='del'>- * channels.</div><div class='del'>- */</div><div class='del'>-enum dma_dev_type {</div><div class='del'>-	DB8500_DMA_DEV0_SPI0 = 0,</div><div class='del'>-	DB8500_DMA_DEV1_SD_MMC0 = 1,</div><div class='del'>-	DB8500_DMA_DEV2_SD_MMC1 = 2,</div><div class='del'>-	DB8500_DMA_DEV3_SD_MMC2 = 3,</div><div class='del'>-	DB8500_DMA_DEV4_I2C1 = 4,</div><div class='del'>-	DB8500_DMA_DEV5_I2C3 = 5,</div><div class='del'>-	DB8500_DMA_DEV6_I2C2 = 6,</div><div class='del'>-	DB8500_DMA_DEV7_I2C4 = 7,			/* Only on V1 and later */</div><div class='del'>-	DB8500_DMA_DEV8_SSP0 = 8,</div><div class='del'>-	DB8500_DMA_DEV9_SSP1 = 9,</div><div class='del'>-	DB8500_DMA_DEV10_MCDE_RX = 10,			/* RX only */</div><div class='del'>-	DB8500_DMA_DEV11_UART2 = 11,</div><div class='del'>-	DB8500_DMA_DEV12_UART1 = 12,</div><div class='del'>-	DB8500_DMA_DEV13_UART0 = 13,</div><div class='del'>-	DB8500_DMA_DEV14_MSP2 = 14,</div><div class='del'>-	DB8500_DMA_DEV15_I2C0 = 15,</div><div class='del'>-	DB8500_DMA_DEV16_USB_OTG_IEP_AND_OEP_7_15 = 16,</div><div class='del'>-	DB8500_DMA_DEV17_USB_OTG_IEP_AND_OEP_6_14 = 17,</div><div class='del'>-	DB8500_DMA_DEV18_USB_OTG_IEP_AND_OEP_5_13 = 18,</div><div class='del'>-	DB8500_DMA_DEV19_USB_OTG_IEP_AND_OEP_4_12 = 19,</div><div class='del'>-	DB8500_DMA_DEV20_SLIM0_CH0_HSI_CH0 = 20,</div><div class='del'>-	DB8500_DMA_DEV21_SLIM0_CH1_HSI_CH1 = 21,</div><div class='del'>-	DB8500_DMA_DEV22_SLIM0_CH2_HSI_CH2 = 22,</div><div class='del'>-	DB8500_DMA_DEV23_SLIM0_CH3_HSI_CH3 = 23,</div><div class='del'>-	DB8500_DMA_DEV24_SXA0 = 24,</div><div class='del'>-	DB8500_DMA_DEV25_SXA1 = 25,</div><div class='del'>-	DB8500_DMA_DEV26_SXA2 = 26,</div><div class='del'>-	DB8500_DMA_DEV27_SXA3 = 27,</div><div class='del'>-	DB8500_DMA_DEV28_SD_MM2 = 28,</div><div class='del'>-	DB8500_DMA_DEV29_SD_MM0 = 29,</div><div class='del'>-	DB8500_DMA_DEV30_MSP1 = 30,</div><div class='del'>-	/* On DB8500v2, MSP3 RX replaces MSP1 RX */</div><div class='del'>-	DB8500_DMA_DEV30_MSP3 = 30,</div><div class='del'>-	DB8500_DMA_DEV31_MSP0_SLIM0_CH0 = 31,</div><div class='del'>-	DB8500_DMA_DEV32_SD_MM1 = 32,</div><div class='del'>-	DB8500_DMA_DEV33_SPI2 = 33,</div><div class='del'>-	DB8500_DMA_DEV34_I2C3_RX2_TX2 = 34,</div><div class='del'>-	DB8500_DMA_DEV35_SPI1 = 35,</div><div class='del'>-	DB8500_DMA_DEV36_USB_OTG_IEP_AND_OEP_3_11 = 36,</div><div class='del'>-	DB8500_DMA_DEV37_USB_OTG_IEP_AND_OEP_2_10 = 37,</div><div class='del'>-	DB8500_DMA_DEV38_USB_OTG_IEP_AND_OEP_1_9 = 38,</div><div class='del'>-	DB8500_DMA_DEV39_USB_OTG_IEP_AND_OEP_8 = 39,</div><div class='del'>-	DB8500_DMA_DEV40_SPI3 = 40,</div><div class='del'>-	DB8500_DMA_DEV41_SD_MM3 = 41,</div><div class='del'>-	DB8500_DMA_DEV42_SD_MM4 = 42,</div><div class='del'>-	DB8500_DMA_DEV43_SD_MM5 = 43,</div><div class='del'>-	DB8500_DMA_DEV44_SXA4 = 44,</div><div class='del'>-	DB8500_DMA_DEV45_SXA5 = 45,</div><div class='del'>-	DB8500_DMA_DEV46_SLIM0_CH8_SRC_SXA6 = 46,</div><div class='del'>-	DB8500_DMA_DEV47_SLIM0_CH9_SRC_SXA7 = 47,</div><div class='del'>-	DB8500_DMA_DEV48_CAC1 = 48,</div><div class='del'>-	DB8500_DMA_DEV49_CAC1_TX_HAC1_TX = 49,		/* TX only */</div><div class='del'>-	DB8500_DMA_DEV50_HAC1_TX = 50,			/* TX only */</div><div class='del'>-	DB8500_DMA_MEMCPY_TX_0 = 51,			/* TX only */</div><div class='del'>-	DB8500_DMA_DEV52_SLIM0_CH4_HSI_CH4 = 52,</div><div class='del'>-	DB8500_DMA_DEV53_SLIM0_CH5_HSI_CH5 = 53,</div><div class='del'>-	DB8500_DMA_DEV54_SLIM0_CH6_HSI_CH6 = 54,</div><div class='del'>-	DB8500_DMA_DEV55_SLIM0_CH7_HSI_CH7 = 55,</div><div class='del'>-	/* 56 -&gt; 60 are channels reserved for memcpy only */</div><div class='del'>-	DB8500_DMA_DEV61_CAC0 = 61,</div><div class='del'>-	DB8500_DMA_DEV62_CAC0_TX_HAC0_TX = 62,		/* TX only */</div><div class='del'>-	DB8500_DMA_DEV63_HAC0_TX = 63,			/* TX only */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-vexpress/dcscb.c b/arch/arm/mach-vexpress/dcscb.c<br/>index 5cedcf572104..ee2a0faafaa1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-vexpress/dcscb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-vexpress/dcscb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-vexpress/dcscb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-vexpress/dcscb.c</a></div><div class='hunk'>@@ -166,7 +166,7 @@ static int __init dcscb_init(void)</div><div class='ctx'> 	 * Future entries into the kernel can now go</div><div class='ctx'> 	 * through the cluster entry vectors.</div><div class='ctx'> 	 */</div><div class='del'>-	vexpress_flags_set(virt_to_phys(mcpm_entry_point));</div><div class='add'>+	vexpress_flags_set(__pa_symbol(mcpm_entry_point));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-vexpress/platsmp.c b/arch/arm/mach-vexpress/platsmp.c<br/>index 8b8d0724f6c6..742499bac6d0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-vexpress/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-vexpress/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-vexpress/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-vexpress/platsmp.c</a></div><div class='hunk'>@@ -26,19 +26,37 @@</div><div class='ctx'> bool __init vexpress_smp_init_ops(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_MCPM</div><div class='add'>+	int cpu;</div><div class='add'>+	struct device_node *cpu_node, *cci_node;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * The best way to detect a multi-cluster configuration at the moment</div><div class='del'>-	 * is to look for the presence of a CCI in the system.</div><div class='add'>+	 * The best way to detect a multi-cluster configuration</div><div class='add'>+	 * is to detect if the kernel can take over CCI ports</div><div class='add'>+	 * control. Loop over possible CPUs and check if CCI</div><div class='add'>+	 * port control is available.</div><div class='ctx'> 	 * Override the default vexpress_smp_ops if so.</div><div class='ctx'> 	 */</div><div class='del'>-	struct device_node *node;</div><div class='del'>-	node = of_find_compatible_node(NULL, NULL, "arm,cci-400");</div><div class='del'>-	if (node &amp;&amp; of_device_is_available(node)) {</div><div class='del'>-		mcpm_smp_set_ops();</div><div class='del'>-		return true;</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		bool available;</div><div class='add'>+</div><div class='add'>+		cpu_node = of_get_cpu_node(cpu, NULL);</div><div class='add'>+		if (WARN(!cpu_node, "Missing cpu device node!"))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		cci_node = of_parse_phandle(cpu_node, "cci-control-port", 0);</div><div class='add'>+		available = cci_node &amp;&amp; of_device_is_available(cci_node);</div><div class='add'>+		of_node_put(cci_node);</div><div class='add'>+		of_node_put(cpu_node);</div><div class='add'>+</div><div class='add'>+		if (!available)</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	mcpm_smp_set_ops();</div><div class='add'>+	return true;</div><div class='add'>+#else</div><div class='ctx'> 	return false;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id vexpress_smp_dt_scu_match[] __initconst = {</div><div class='hunk'>@@ -61,7 +79,7 @@ static void __init vexpress_smp_dt_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	 * until it receives a soft interrupt, and then the</div><div class='ctx'> 	 * secondary CPU branches to this address.</div><div class='ctx'> 	 */</div><div class='del'>-	vexpress_flags_set(virt_to_phys(versatile_secondary_startup));</div><div class='add'>+	vexpress_flags_set(__pa_symbol(versatile_secondary_startup));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct smp_operations vexpress_smp_dt_ops __initconst = {</div><div class='head'>diff --git a/arch/arm/mach-vexpress/tc2_pm.c b/arch/arm/mach-vexpress/tc2_pm.c<br/>index 1aa4ccece69f..9b5f3c427086 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-vexpress/tc2_pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-vexpress/tc2_pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-vexpress/tc2_pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-vexpress/tc2_pm.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ static int tc2_pm_cpu_powerup(unsigned int cpu, unsigned int cluster)</div><div class='ctx'> 	if (cluster &gt;= TC2_CLUSTERS || cpu &gt;= tc2_nr_cpus[cluster])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	ve_spc_set_resume_addr(cluster, cpu,</div><div class='del'>-			       virt_to_phys(mcpm_entry_point));</div><div class='add'>+			       __pa_symbol(mcpm_entry_point));</div><div class='ctx'> 	ve_spc_cpu_wakeup_irq(cluster, cpu, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -159,7 +159,7 @@ static int tc2_pm_wait_for_powerdown(unsigned int cpu, unsigned int cluster)</div><div class='ctx'> </div><div class='ctx'> static void tc2_pm_cpu_suspend_prepare(unsigned int cpu, unsigned int cluster)</div><div class='ctx'> {</div><div class='del'>-	ve_spc_set_resume_addr(cluster, cpu, virt_to_phys(mcpm_entry_point));</div><div class='add'>+	ve_spc_set_resume_addr(cluster, cpu, __pa_symbol(mcpm_entry_point));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tc2_pm_cpu_is_up(unsigned int cpu, unsigned int cluster)</div><div class='head'>diff --git a/arch/arm/mach-zx/platsmp.c b/arch/arm/mach-zx/platsmp.c<br/>index 0297f92084e0..afb9a82dedc3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-zx/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-zx/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-zx/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-zx/platsmp.c</a></div><div class='hunk'>@@ -76,7 +76,7 @@ void __init zx_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	 * until it receives a soft interrupt, and then the</div><div class='ctx'> 	 * secondary CPU branches to this address.</div><div class='ctx'> 	 */</div><div class='del'>-	__raw_writel(virt_to_phys(zx_secondary_startup),</div><div class='add'>+	__raw_writel(__pa_symbol(zx_secondary_startup),</div><div class='ctx'> 		     aonsysctrl_base + AON_SYS_CTRL_RESERVED1);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(aonsysctrl_base);</div><div class='hunk'>@@ -94,7 +94,7 @@ void __init zx_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> </div><div class='ctx'> 	/* Map the first 4 KB IRAM for suspend usage */</div><div class='ctx'> 	sys_iram = __arm_ioremap_exec(ZX_IRAM_BASE, PAGE_SIZE, false);</div><div class='del'>-	zx_secondary_startup_pa = virt_to_phys(zx_secondary_startup);</div><div class='add'>+	zx_secondary_startup_pa = __pa_symbol(zx_secondary_startup);</div><div class='ctx'> 	fncpy(sys_iram, &amp;zx_resume_jump, zx_suspend_iram_sz);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-zx/zx296702-pm-domain.c b/arch/arm/mach-zx/zx296702-pm-domain.c<br/>index e08574d4e2ca..79dcf2549267 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-zx/zx296702-pm-domain.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-zx/zx296702-pm-domain.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-zx/zx296702-pm-domain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-zx/zx296702-pm-domain.c</a></div><div class='hunk'>@@ -169,7 +169,7 @@ static int zx296702_pd_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pcubase = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='del'>-	if (!pcubase) {</div><div class='add'>+	if (IS_ERR(pcubase)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "ioremap fail.\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c<br/>index d12002cd63bc..ed118648313f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-zynq/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-zynq/common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-zynq/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-zynq/common.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ void __iomem *zynq_scu_base;</div><div class='ctx'> static void __init zynq_memory_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!__pa(PAGE_OFFSET))</div><div class='del'>-		memblock_reserve(__pa(PAGE_OFFSET), __pa(swapper_pg_dir));</div><div class='add'>+		memblock_reserve(__pa(PAGE_OFFSET), 0x80000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_device zynq_cpuidle_device = {</div><div class='head'>diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c<br/>index 7cd9865bdeb7..caa6d5fe9078 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mach-zynq/platsmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mach-zynq/platsmp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mach-zynq/platsmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mach-zynq/platsmp.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ EXPORT_SYMBOL(zynq_cpun_start);</div><div class='ctx'> </div><div class='ctx'> static int zynq_boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> {</div><div class='del'>-	return zynq_cpun_start(virt_to_phys(secondary_startup), cpu);</div><div class='add'>+	return zynq_cpun_start(__pa_symbol(secondary_startup), cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig<br/>index c1799dd1d0d9..c6c4c9c8824b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/Kconfig</a></div><div class='hunk'>@@ -29,6 +29,7 @@ config CPU_ARM720T</div><div class='ctx'> 	select CPU_COPY_V4WT if MMU</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WT if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  A 32-bit RISC processor with 8kByte Cache, Write Buffer and</div><div class='hunk'>@@ -46,6 +47,7 @@ config CPU_ARM740T</div><div class='ctx'> 	select CPU_CACHE_V4</div><div class='ctx'> 	select CPU_CP15_MPU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	help</div><div class='ctx'> 	  A 32-bit RISC processor with 8KB cache or 4KB variants,</div><div class='ctx'> 	  write buffer and MPU(Protection Unit) built around</div><div class='hunk'>@@ -79,6 +81,7 @@ config CPU_ARM920T</div><div class='ctx'> 	select CPU_COPY_V4WB if MMU</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM920T is licensed to be produced by numerous vendors,</div><div class='hunk'>@@ -97,6 +100,7 @@ config CPU_ARM922T</div><div class='ctx'> 	select CPU_COPY_V4WB if MMU</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM922T is a version of the ARM920T, but with smaller</div><div class='hunk'>@@ -116,6 +120,7 @@ config CPU_ARM925T</div><div class='ctx'> 	select CPU_COPY_V4WB if MMU</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WBI if MMU</div><div class='ctx'>  	help</div><div class='ctx'>  	  The ARM925T is a mix between the ARM920T and ARM926T, but with</div><div class='hunk'>@@ -134,6 +139,7 @@ config CPU_ARM926T</div><div class='ctx'> 	select CPU_COPY_V4WB if MMU</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is a variant of the ARM920.  It has slightly different</div><div class='hunk'>@@ -170,6 +176,7 @@ config CPU_ARM940T</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='ctx'> 	select CPU_CP15_MPU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	help</div><div class='ctx'> 	  ARM940T is a member of the ARM9TDMI family of general-</div><div class='ctx'> 	  purpose microprocessors with MPU and separate 4KB</div><div class='hunk'>@@ -188,6 +195,7 @@ config CPU_ARM946E</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='ctx'> 	select CPU_CP15_MPU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	help</div><div class='ctx'> 	  ARM946E-S is a member of the ARM9E-S family of high-</div><div class='ctx'> 	  performance, 32-bit system-on-chip processor solutions.</div><div class='hunk'>@@ -206,6 +214,7 @@ config CPU_ARM1020</div><div class='ctx'> 	select CPU_COPY_V4WB if MMU</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM1020 is the 32K cached version of the ARM10 processor,</div><div class='hunk'>@@ -225,6 +234,7 @@ config CPU_ARM1020E</div><div class='ctx'> 	select CPU_COPY_V4WB if MMU</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> </div><div class='ctx'> # ARM1022E</div><div class='hunk'>@@ -236,6 +246,7 @@ config CPU_ARM1022</div><div class='ctx'> 	select CPU_COPY_V4WB if MMU # can probably do better</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM1022E is an implementation of the ARMv5TE architecture</div><div class='hunk'>@@ -254,6 +265,7 @@ config CPU_ARM1026</div><div class='ctx'> 	select CPU_COPY_V4WB if MMU # can probably do better</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM1026EJ-S is an implementation of the ARMv5TEJ architecture</div><div class='hunk'>@@ -302,6 +314,7 @@ config CPU_XSCALE</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> </div><div class='ctx'> # XScale Core Version 3</div><div class='hunk'>@@ -312,6 +325,7 @@ config CPU_XSC3</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	select IO_36</div><div class='ctx'> </div><div class='hunk'>@@ -324,6 +338,7 @@ config CPU_MOHAWK</div><div class='ctx'> 	select CPU_COPY_V4WB if MMU</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> </div><div class='ctx'> # Feroceon</div><div class='hunk'>@@ -335,6 +350,7 @@ config CPU_FEROCEON</div><div class='ctx'> 	select CPU_COPY_FEROCEON if MMU</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_PABRT_LEGACY</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_FEROCEON if MMU</div><div class='ctx'> </div><div class='ctx'> config CPU_FEROCEON_OLD_ID</div><div class='hunk'>@@ -367,6 +383,7 @@ config CPU_V6</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_HAS_ASID if MMU</div><div class='ctx'> 	select CPU_PABRT_V6</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V6 if MMU</div><div class='ctx'> </div><div class='ctx'> # ARMv6k</div><div class='hunk'>@@ -381,6 +398,7 @@ config CPU_V6K</div><div class='ctx'> 	select CPU_CP15_MMU</div><div class='ctx'> 	select CPU_HAS_ASID if MMU</div><div class='ctx'> 	select CPU_PABRT_V6</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V6 if MMU</div><div class='ctx'> </div><div class='ctx'> # ARMv7</div><div class='hunk'>@@ -396,6 +414,7 @@ config CPU_V7</div><div class='ctx'> 	select CPU_CP15_MPU if !MMU</div><div class='ctx'> 	select CPU_HAS_ASID if MMU</div><div class='ctx'> 	select CPU_PABRT_V7</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	select CPU_TLB_V7 if MMU</div><div class='ctx'> </div><div class='ctx'> # ARMv7M</div><div class='hunk'>@@ -410,11 +429,17 @@ config CPU_V7M</div><div class='ctx'> </div><div class='ctx'> config CPU_THUMBONLY</div><div class='ctx'> 	bool</div><div class='add'>+	select CPU_THUMB_CAPABLE</div><div class='ctx'> 	# There are no CPUs available with MMU that don't implement an ARM ISA:</div><div class='ctx'> 	depends on !MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select this if your CPU doesn't support the 32 bit ARM instructions.</div><div class='ctx'> </div><div class='add'>+config CPU_THUMB_CAPABLE</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Select this if your CPU can support Thumb mode.</div><div class='add'>+</div><div class='ctx'> # Figure out what processor architecture version we should be using.</div><div class='ctx'> # This defines the compiler instruction set which depends on the machine type.</div><div class='ctx'> config CPU_32v3</div><div class='hunk'>@@ -655,11 +680,7 @@ config ARCH_DMA_ADDR_T_64BIT</div><div class='ctx'> </div><div class='ctx'> config ARM_THUMB</div><div class='ctx'> 	bool "Support Thumb user binaries" if !CPU_THUMBONLY</div><div class='del'>-	depends on CPU_ARM720T || CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || \</div><div class='del'>-		CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || \</div><div class='del'>-		CPU_ARM1020 || CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \</div><div class='del'>-		CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_V6 || CPU_V6K || \</div><div class='del'>-		CPU_V7 || CPU_FEROCEON || CPU_V7M</div><div class='add'>+	depends on CPU_THUMB_CAPABLE</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y if you want to include kernel support for running user space</div><div class='hunk'>@@ -991,7 +1012,7 @@ config CACHE_TAUROS2</div><div class='ctx'> config CACHE_UNIPHIER</div><div class='ctx'> 	bool "Enable the UniPhier outer cache controller"</div><div class='ctx'> 	depends on ARCH_UNIPHIER</div><div class='del'>-	default y</div><div class='add'>+	select ARM_L1_CACHE_SHIFT_7</div><div class='ctx'> 	select OUTER_CACHE</div><div class='ctx'> 	select OUTER_CACHE_SYNC</div><div class='ctx'> 	help</div><div class='hunk'>@@ -1012,8 +1033,14 @@ config ARM_L1_CACHE_SHIFT_6</div><div class='ctx'> 	help</div><div class='ctx'> 	  Setting ARM L1 cache line size to 64 Bytes.</div><div class='ctx'> </div><div class='add'>+config ARM_L1_CACHE_SHIFT_7</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Setting ARM L1 cache line size to 128 Bytes.</div><div class='add'>+</div><div class='ctx'> config ARM_L1_CACHE_SHIFT</div><div class='ctx'> 	int</div><div class='add'>+	default 7 if ARM_L1_CACHE_SHIFT_7</div><div class='ctx'> 	default 6 if ARM_L1_CACHE_SHIFT_6</div><div class='ctx'> 	default 5</div><div class='ctx'> </div><div class='hunk'>@@ -1045,21 +1072,9 @@ config ARCH_SUPPORTS_BIG_ENDIAN</div><div class='ctx'> 	  This option specifies the architecture can support big endian</div><div class='ctx'> 	  operation.</div><div class='ctx'> </div><div class='del'>-config DEBUG_RODATA</div><div class='del'>-	bool "Make kernel text and rodata read-only"</div><div class='del'>-	depends on MMU &amp;&amp; !XIP_KERNEL</div><div class='del'>-	default y if CPU_V7</div><div class='del'>-	help</div><div class='del'>-	  If this is set, kernel text and rodata memory will be made</div><div class='del'>-	  read-only, and non-text kernel memory will be made non-executable.</div><div class='del'>-	  The tradeoff is that each region is padded to section-size (1MiB)</div><div class='del'>-	  boundaries (because their permissions are different and splitting</div><div class='del'>-	  the 1M pages into 4K ones causes TLB performance problems), which</div><div class='del'>-	  can waste memory.</div><div class='del'>-</div><div class='ctx'> config DEBUG_ALIGN_RODATA</div><div class='ctx'> 	bool "Make rodata strictly non-executable"</div><div class='del'>-	depends on DEBUG_RODATA</div><div class='add'>+	depends on STRICT_KERNEL_RWX</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  If this is set, rodata will be made explicitly non-executable. This</div><div class='head'>diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile<br/>index e8698241ece9..b3dea80715b4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/Makefile</a></div><div class='hunk'>@@ -14,6 +14,7 @@ endif</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ARM_PTDUMP)	+= dump.o</div><div class='ctx'> obj-$(CONFIG_MODULES)		+= proc-syms.o</div><div class='add'>+obj-$(CONFIG_DEBUG_VIRTUAL)	+= physaddr.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ALIGNMENT_TRAP)	+= alignment.o</div><div class='ctx'> obj-$(CONFIG_HIGHMEM)		+= highmem.o</div><div class='head'>diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c<br/>index 7d5f4c736a16..2c96190e018b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/alignment.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/alignment.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/alignment.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/alignment.c</a></div><div class='hunk'>@@ -14,12 +14,13 @@</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cp15.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/cache-l2x0-pmu.c b/arch/arm/mm/cache-l2x0-pmu.c<br/>index 976d3057272e..0a1e2280141f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/cache-l2x0-pmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/cache-l2x0-pmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/cache-l2x0-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/cache-l2x0-pmu.c</a></div><div class='hunk'>@@ -563,7 +563,7 @@ static __init int l2x0_pmu_init(void)</div><div class='ctx'> </div><div class='ctx'> 	cpumask_set_cpu(0, &amp;pmu_cpu);</div><div class='ctx'> 	ret = cpuhp_setup_state_nocalls(CPUHP_AP_PERF_ARM_L2X0_ONLINE,</div><div class='del'>-					"AP_PERF_ARM_L2X0_ONLINE", NULL,</div><div class='add'>+					"perf/arm/l2x0:online", NULL,</div><div class='ctx'> 					l2x0_pmu_offline_cpu);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_pmu;</div><div class='head'>diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c<br/>index d1870c777c6e..2290be390f87 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/cache-l2x0.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/cache-l2x0.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/cache-l2x0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/cache-l2x0.c</a></div><div class='hunk'>@@ -683,7 +683,7 @@ static void __init l2c310_enable(void __iomem *base, unsigned num_lock)</div><div class='ctx'> </div><div class='ctx'> 	if (aux &amp; L310_AUX_CTRL_FULL_LINE_ZERO)</div><div class='ctx'> 		cpuhp_setup_state(CPUHP_AP_ARM_L2X0_STARTING,</div><div class='del'>-				  "AP_ARM_L2X0_STARTING", l2c310_starting_cpu,</div><div class='add'>+				  "arm/l2x0:starting", l2c310_starting_cpu,</div><div class='ctx'> 				  l2c310_dying_cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/cache-uniphier.c b/arch/arm/mm/cache-uniphier.c<br/>index dfe97b409916..f57b080b6fd4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/cache-uniphier.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/cache-uniphier.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/cache-uniphier.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/cache-uniphier.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt)		"uniphier: " fmt</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='hunk'>@@ -71,8 +72,7 @@</div><div class='ctx'>  * @ctrl_base: virtual base address of control registers</div><div class='ctx'>  * @rev_base: virtual base address of revision registers</div><div class='ctx'>  * @op_base: virtual base address of operation registers</div><div class='del'>- * @way_present_mask: each bit specifies if the way is present</div><div class='del'>- * @way_locked_mask: each bit specifies if the way is locked</div><div class='add'>+ * @way_mask: each bit specifies if the way is present</div><div class='ctx'>  * @nsets: number of associativity sets</div><div class='ctx'>  * @line_size: line size in bytes</div><div class='ctx'>  * @range_op_max_size: max size that can be handled by a single range operation</div><div class='hunk'>@@ -83,8 +83,7 @@ struct uniphier_cache_data {</div><div class='ctx'> 	void __iomem *rev_base;</div><div class='ctx'> 	void __iomem *op_base;</div><div class='ctx'> 	void __iomem *way_ctrl_base;</div><div class='del'>-	u32 way_present_mask;</div><div class='del'>-	u32 way_locked_mask;</div><div class='add'>+	u32 way_mask;</div><div class='ctx'> 	u32 nsets;</div><div class='ctx'> 	u32 line_size;</div><div class='ctx'> 	u32 range_op_max_size;</div><div class='hunk'>@@ -234,17 +233,13 @@ static void __uniphier_cache_enable(struct uniphier_cache_data *data, bool on)</div><div class='ctx'> 	writel_relaxed(val, data-&gt;ctrl_base + UNIPHIER_SSCC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init __uniphier_cache_set_locked_ways(</div><div class='del'>-					struct uniphier_cache_data *data,</div><div class='del'>-					u32 way_mask)</div><div class='add'>+static void __init __uniphier_cache_set_active_ways(</div><div class='add'>+					struct uniphier_cache_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu;</div><div class='ctx'> </div><div class='del'>-	data-&gt;way_locked_mask = way_mask &amp; data-&gt;way_present_mask;</div><div class='del'>-</div><div class='ctx'> 	for_each_possible_cpu(cpu)</div><div class='del'>-		writel_relaxed(~data-&gt;way_locked_mask &amp; data-&gt;way_present_mask,</div><div class='del'>-			       data-&gt;way_ctrl_base + 4 * cpu);</div><div class='add'>+		writel_relaxed(data-&gt;way_mask, data-&gt;way_ctrl_base + 4 * cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void uniphier_cache_maint_range(unsigned long start, unsigned long end,</div><div class='hunk'>@@ -307,7 +302,7 @@ static void __init uniphier_cache_enable(void)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(data, &amp;uniphier_cache_list, list) {</div><div class='ctx'> 		__uniphier_cache_enable(data, true);</div><div class='del'>-		__uniphier_cache_set_locked_ways(data, 0);</div><div class='add'>+		__uniphier_cache_set_active_ways(data);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -382,8 +377,8 @@ static int __init __uniphier_cache_init(struct device_node *np,</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	data-&gt;way_present_mask =</div><div class='del'>-		((u32)1 &lt;&lt; cache_size / data-&gt;nsets / data-&gt;line_size) - 1;</div><div class='add'>+	data-&gt;way_mask = GENMASK(cache_size / data-&gt;nsets / data-&gt;line_size - 1,</div><div class='add'>+				 0);</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;ctrl_base = of_iomap(np, 0);</div><div class='ctx'> 	if (!data-&gt;ctrl_base) {</div><div class='head'>diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S<br/>index a134d8a13d00..de78109d002d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/cache-v7.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/cache-v7.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/cache-v7.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/cache-v7.S</a></div><div class='hunk'>@@ -164,7 +164,7 @@ skip:</div><div class='ctx'> 	cmp	r3, r10</div><div class='ctx'> 	bgt	flush_levels</div><div class='ctx'> finished:</div><div class='del'>-	mov	r10, #0				@ swith back to cache level 0</div><div class='add'>+	mov	r10, #0				@ switch back to cache level 0</div><div class='ctx'> 	mcr	p15, 2, r10, c0, c0, 0		@ select current cache level in cssr</div><div class='ctx'> 	dsb	st</div><div class='ctx'> 	isb</div><div class='head'>diff --git a/arch/arm/mm/cache-v7m.S b/arch/arm/mm/cache-v7m.S<br/>index 816a7e44e6f1..788486e830d3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/cache-v7m.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/cache-v7m.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/cache-v7m.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/cache-v7m.S</a></div><div class='hunk'>@@ -217,7 +217,7 @@ skip:</div><div class='ctx'> 	cmp	r3, r10</div><div class='ctx'> 	bgt	flush_levels</div><div class='ctx'> finished:</div><div class='del'>-	mov	r10, #0				@ swith back to cache level 0</div><div class='add'>+	mov	r10, #0				@ switch back to cache level 0</div><div class='ctx'> 	write_csselr r10, r3			@ select current cache level in cssr</div><div class='ctx'> 	dsb	st</div><div class='ctx'> 	isb</div><div class='head'>diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c<br/>index ab7710002ba6..63eabb06f9f1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/dma-mapping.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/dma-mapping.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/dma-mapping.c</a></div><div class='hunk'>@@ -180,7 +180,7 @@ static void arm_dma_sync_single_for_device(struct device *dev,</div><div class='ctx'> 	__dma_page_cpu_to_dev(page, offset, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops arm_dma_ops = {</div><div class='add'>+const struct dma_map_ops arm_dma_ops = {</div><div class='ctx'> 	.alloc			= arm_dma_alloc,</div><div class='ctx'> 	.free			= arm_dma_free,</div><div class='ctx'> 	.mmap			= arm_dma_mmap,</div><div class='hunk'>@@ -204,7 +204,7 @@ static int arm_coherent_dma_mmap(struct device *dev, struct vm_area_struct *vma,</div><div class='ctx'> 		 void *cpu_addr, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 		 unsigned long attrs);</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops arm_coherent_dma_ops = {</div><div class='add'>+const struct dma_map_ops arm_coherent_dma_ops = {</div><div class='ctx'> 	.alloc			= arm_coherent_dma_alloc,</div><div class='ctx'> 	.free			= arm_coherent_dma_free,</div><div class='ctx'> 	.mmap			= arm_coherent_dma_mmap,</div><div class='hunk'>@@ -349,7 +349,7 @@ static void __dma_free_buffer(struct page *page, size_t size)</div><div class='ctx'> static void *__alloc_from_contiguous(struct device *dev, size_t size,</div><div class='ctx'> 				     pgprot_t prot, struct page **ret_page,</div><div class='ctx'> 				     const void *caller, bool want_vaddr,</div><div class='del'>-				     int coherent_flag);</div><div class='add'>+				     int coherent_flag, gfp_t gfp);</div><div class='ctx'> </div><div class='ctx'> static void *__alloc_remap_buffer(struct device *dev, size_t size, gfp_t gfp,</div><div class='ctx'> 				 pgprot_t prot, struct page **ret_page,</div><div class='hunk'>@@ -420,7 +420,8 @@ static int __init atomic_pool_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (dev_get_cma_area(NULL))</div><div class='ctx'> 		ptr = __alloc_from_contiguous(NULL, atomic_pool_size, prot,</div><div class='del'>-				      &amp;page, atomic_pool_init, true, NORMAL);</div><div class='add'>+				      &amp;page, atomic_pool_init, true, NORMAL,</div><div class='add'>+				      GFP_KERNEL);</div><div class='ctx'> 	else</div><div class='ctx'> 		ptr = __alloc_remap_buffer(NULL, atomic_pool_size, gfp, prot,</div><div class='ctx'> 					   &amp;page, atomic_pool_init, true);</div><div class='hunk'>@@ -594,14 +595,14 @@ static int __free_from_pool(void *start, size_t size)</div><div class='ctx'> static void *__alloc_from_contiguous(struct device *dev, size_t size,</div><div class='ctx'> 				     pgprot_t prot, struct page **ret_page,</div><div class='ctx'> 				     const void *caller, bool want_vaddr,</div><div class='del'>-				     int coherent_flag)</div><div class='add'>+				     int coherent_flag, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long order = get_order(size);</div><div class='ctx'> 	size_t count = size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	void *ptr = NULL;</div><div class='ctx'> </div><div class='del'>-	page = dma_alloc_from_contiguous(dev, count, order);</div><div class='add'>+	page = dma_alloc_from_contiguous(dev, count, order, gfp);</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -655,7 +656,7 @@ static inline pgprot_t __get_dma_pgprot(unsigned long attrs, pgprot_t prot)</div><div class='ctx'> #define __get_dma_pgprot(attrs, prot)				__pgprot(0)</div><div class='ctx'> #define __alloc_remap_buffer(dev, size, gfp, prot, ret, c, wv)	NULL</div><div class='ctx'> #define __alloc_from_pool(size, ret_page)			NULL</div><div class='del'>-#define __alloc_from_contiguous(dev, size, prot, ret, c, wv, coherent_flag)	NULL</div><div class='add'>+#define __alloc_from_contiguous(dev, size, prot, ret, c, wv, coherent_flag, gfp)	NULL</div><div class='ctx'> #define __free_from_pool(cpu_addr, size)			do { } while (0)</div><div class='ctx'> #define __free_from_contiguous(dev, page, cpu_addr, size, wv)	do { } while (0)</div><div class='ctx'> #define __dma_free_remap(cpu_addr, size)			do { } while (0)</div><div class='hunk'>@@ -697,7 +698,8 @@ static void *cma_allocator_alloc(struct arm_dma_alloc_args *args,</div><div class='ctx'> {</div><div class='ctx'> 	return __alloc_from_contiguous(args-&gt;dev, args-&gt;size, args-&gt;prot,</div><div class='ctx'> 				       ret_page, args-&gt;caller,</div><div class='del'>-				       args-&gt;want_vaddr, args-&gt;coherent_flag);</div><div class='add'>+				       args-&gt;want_vaddr, args-&gt;coherent_flag,</div><div class='add'>+				       args-&gt;gfp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cma_allocator_free(struct arm_dma_free_args *args)</div><div class='hunk'>@@ -868,6 +870,9 @@ static int __arm_dma_mmap(struct device *dev, struct vm_area_struct *vma,</div><div class='ctx'> 				      vma-&gt;vm_end - vma-&gt;vm_start,</div><div class='ctx'> 				      vma-&gt;vm_page_prot);</div><div class='ctx'> 	}</div><div class='add'>+#else</div><div class='add'>+	ret = vm_iomap_memory(vma, vma-&gt;vm_start,</div><div class='add'>+			      (vma-&gt;vm_end - vma-&gt;vm_start));</div><div class='ctx'> #endif	/* CONFIG_MMU */</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1067,7 +1072,7 @@ static void __dma_page_dev_to_cpu(struct page *page, unsigned long off,</div><div class='ctx'> int arm_dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> 		enum dma_data_direction dir, unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	struct dma_map_ops *ops = get_dma_ops(dev);</div><div class='add'>+	const struct dma_map_ops *ops = get_dma_ops(dev);</div><div class='ctx'> 	struct scatterlist *s;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='hunk'>@@ -1101,7 +1106,7 @@ int arm_dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> void arm_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> 		enum dma_data_direction dir, unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	struct dma_map_ops *ops = get_dma_ops(dev);</div><div class='add'>+	const struct dma_map_ops *ops = get_dma_ops(dev);</div><div class='ctx'> 	struct scatterlist *s;</div><div class='ctx'> </div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1120,7 +1125,7 @@ void arm_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 			int nents, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	struct dma_map_ops *ops = get_dma_ops(dev);</div><div class='add'>+	const struct dma_map_ops *ops = get_dma_ops(dev);</div><div class='ctx'> 	struct scatterlist *s;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1139,7 +1144,7 @@ void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> void arm_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 			int nents, enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	struct dma_map_ops *ops = get_dma_ops(dev);</div><div class='add'>+	const struct dma_map_ops *ops = get_dma_ops(dev);</div><div class='ctx'> 	struct scatterlist *s;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1171,6 +1176,25 @@ core_initcall(dma_debug_do_init);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARM_DMA_USE_IOMMU</div><div class='ctx'> </div><div class='add'>+static int __dma_info_to_prot(enum dma_data_direction dir, unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+	int prot = 0;</div><div class='add'>+</div><div class='add'>+	if (attrs &amp; DMA_ATTR_PRIVILEGED)</div><div class='add'>+		prot |= IOMMU_PRIV;</div><div class='add'>+</div><div class='add'>+	switch (dir) {</div><div class='add'>+	case DMA_BIDIRECTIONAL:</div><div class='add'>+		return prot | IOMMU_READ | IOMMU_WRITE;</div><div class='add'>+	case DMA_TO_DEVICE:</div><div class='add'>+		return prot | IOMMU_READ;</div><div class='add'>+	case DMA_FROM_DEVICE:</div><div class='add'>+		return prot | IOMMU_WRITE;</div><div class='add'>+	default:</div><div class='add'>+		return prot;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* IOMMU */</div><div class='ctx'> </div><div class='ctx'> static int extend_iommu_mapping(struct dma_iommu_mapping *mapping);</div><div class='hunk'>@@ -1293,7 +1317,7 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size,</div><div class='ctx'> 		unsigned long order = get_order(size);</div><div class='ctx'> 		struct page *page;</div><div class='ctx'> </div><div class='del'>-		page = dma_alloc_from_contiguous(dev, count, order);</div><div class='add'>+		page = dma_alloc_from_contiguous(dev, count, order, gfp);</div><div class='ctx'> 		if (!page)</div><div class='ctx'> 			goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -1394,7 +1418,8 @@ __iommu_alloc_remap(struct page **pages, size_t size, gfp_t gfp, pgprot_t prot,</div><div class='ctx'>  * Create a mapping in device IO address space for specified pages</div><div class='ctx'>  */</div><div class='ctx'> static dma_addr_t</div><div class='del'>-__iommu_create_mapping(struct device *dev, struct page **pages, size_t size)</div><div class='add'>+__iommu_create_mapping(struct device *dev, struct page **pages, size_t size,</div><div class='add'>+		       unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev);</div><div class='ctx'> 	unsigned int count = PAGE_ALIGN(size) &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -1419,7 +1444,7 @@ __iommu_create_mapping(struct device *dev, struct page **pages, size_t size)</div><div class='ctx'> </div><div class='ctx'> 		len = (j - i) &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 		ret = iommu_map(mapping-&gt;domain, iova, phys, len,</div><div class='del'>-				IOMMU_READ|IOMMU_WRITE);</div><div class='add'>+				__dma_info_to_prot(DMA_BIDIRECTIONAL, attrs));</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		iova += len;</div><div class='hunk'>@@ -1476,7 +1501,8 @@ static struct page **__iommu_get_pages(void *cpu_addr, unsigned long attrs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *__iommu_alloc_simple(struct device *dev, size_t size, gfp_t gfp,</div><div class='del'>-				  dma_addr_t *handle, int coherent_flag)</div><div class='add'>+				  dma_addr_t *handle, int coherent_flag,</div><div class='add'>+				  unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	void *addr;</div><div class='hunk'>@@ -1488,7 +1514,7 @@ static void *__iommu_alloc_simple(struct device *dev, size_t size, gfp_t gfp,</div><div class='ctx'> 	if (!addr)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	*handle = __iommu_create_mapping(dev, &amp;page, size);</div><div class='add'>+	*handle = __iommu_create_mapping(dev, &amp;page, size, attrs);</div><div class='ctx'> 	if (*handle == DMA_ERROR_CODE)</div><div class='ctx'> 		goto err_mapping;</div><div class='ctx'> </div><div class='hunk'>@@ -1522,7 +1548,7 @@ static void *__arm_iommu_alloc_attrs(struct device *dev, size_t size,</div><div class='ctx'> </div><div class='ctx'> 	if (coherent_flag  == COHERENT || !gfpflags_allow_blocking(gfp))</div><div class='ctx'> 		return __iommu_alloc_simple(dev, size, gfp, handle,</div><div class='del'>-					    coherent_flag);</div><div class='add'>+					    coherent_flag, attrs);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Following is a work-around (a.k.a. hack) to prevent pages</div><div class='hunk'>@@ -1537,7 +1563,7 @@ static void *__arm_iommu_alloc_attrs(struct device *dev, size_t size,</div><div class='ctx'> 	if (!pages)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	*handle = __iommu_create_mapping(dev, pages, size);</div><div class='add'>+	*handle = __iommu_create_mapping(dev, pages, size, attrs);</div><div class='ctx'> 	if (*handle == DMA_ERROR_CODE)</div><div class='ctx'> 		goto err_buffer;</div><div class='ctx'> </div><div class='hunk'>@@ -1672,27 +1698,6 @@ static int arm_iommu_get_sgtable(struct device *dev, struct sg_table *sgt,</div><div class='ctx'> 					 GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __dma_direction_to_prot(enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-	int prot;</div><div class='del'>-</div><div class='del'>-	switch (dir) {</div><div class='del'>-	case DMA_BIDIRECTIONAL:</div><div class='del'>-		prot = IOMMU_READ | IOMMU_WRITE;</div><div class='del'>-		break;</div><div class='del'>-	case DMA_TO_DEVICE:</div><div class='del'>-		prot = IOMMU_READ;</div><div class='del'>-		break;</div><div class='del'>-	case DMA_FROM_DEVICE:</div><div class='del'>-		prot = IOMMU_WRITE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		prot = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return prot;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Map a part of the scatter-gather list into contiguous io address space</div><div class='ctx'>  */</div><div class='hunk'>@@ -1722,7 +1727,7 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 		if (!is_coherent &amp;&amp; (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC) == 0)</div><div class='ctx'> 			__dma_page_cpu_to_dev(sg_page(s), s-&gt;offset, s-&gt;length, dir);</div><div class='ctx'> </div><div class='del'>-		prot = __dma_direction_to_prot(dir);</div><div class='add'>+		prot = __dma_info_to_prot(dir, attrs);</div><div class='ctx'> </div><div class='ctx'> 		ret = iommu_map(mapping-&gt;domain, iova, phys, len, prot);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -1930,7 +1935,7 @@ static dma_addr_t arm_coherent_iommu_map_page(struct device *dev, struct page *p</div><div class='ctx'> 	if (dma_addr == DMA_ERROR_CODE)</div><div class='ctx'> 		return dma_addr;</div><div class='ctx'> </div><div class='del'>-	prot = __dma_direction_to_prot(dir);</div><div class='add'>+	prot = __dma_info_to_prot(dir, attrs);</div><div class='ctx'> </div><div class='ctx'> 	ret = iommu_map(mapping-&gt;domain, dma_addr, page_to_phys(page), len, prot);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -2036,7 +2041,7 @@ static dma_addr_t arm_iommu_map_resource(struct device *dev,</div><div class='ctx'> 	if (dma_addr == DMA_ERROR_CODE)</div><div class='ctx'> 		return dma_addr;</div><div class='ctx'> </div><div class='del'>-	prot = __dma_direction_to_prot(dir) | IOMMU_MMIO;</div><div class='add'>+	prot = __dma_info_to_prot(dir, attrs) | IOMMU_MMIO;</div><div class='ctx'> </div><div class='ctx'> 	ret = iommu_map(mapping-&gt;domain, dma_addr, addr, len, prot);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -2099,7 +2104,7 @@ static void arm_iommu_sync_single_for_device(struct device *dev,</div><div class='ctx'> 	__dma_page_cpu_to_dev(page, offset, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops iommu_ops = {</div><div class='add'>+const struct dma_map_ops iommu_ops = {</div><div class='ctx'> 	.alloc		= arm_iommu_alloc_attrs,</div><div class='ctx'> 	.free		= arm_iommu_free_attrs,</div><div class='ctx'> 	.mmap		= arm_iommu_mmap_attrs,</div><div class='hunk'>@@ -2119,7 +2124,7 @@ struct dma_map_ops iommu_ops = {</div><div class='ctx'> 	.unmap_resource		= arm_iommu_unmap_resource,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops iommu_coherent_ops = {</div><div class='add'>+const struct dma_map_ops iommu_coherent_ops = {</div><div class='ctx'> 	.alloc		= arm_coherent_iommu_alloc_attrs,</div><div class='ctx'> 	.free		= arm_coherent_iommu_free_attrs,</div><div class='ctx'> 	.mmap		= arm_coherent_iommu_mmap_attrs,</div><div class='hunk'>@@ -2319,7 +2324,7 @@ void arm_iommu_detach_device(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(arm_iommu_detach_device);</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops *arm_get_iommu_dma_map_ops(bool coherent)</div><div class='add'>+static const struct dma_map_ops *arm_get_iommu_dma_map_ops(bool coherent)</div><div class='ctx'> {</div><div class='ctx'> 	return coherent ? &amp;iommu_coherent_ops : &amp;iommu_ops;</div><div class='ctx'> }</div><div class='hunk'>@@ -2374,7 +2379,7 @@ static void arm_teardown_iommu_dma_ops(struct device *dev) { }</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_ARM_DMA_USE_IOMMU */</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops *arm_get_dma_map_ops(bool coherent)</div><div class='add'>+static const struct dma_map_ops *arm_get_dma_map_ops(bool coherent)</div><div class='ctx'> {</div><div class='ctx'> 	return coherent ? &amp;arm_coherent_dma_ops : &amp;arm_dma_ops;</div><div class='ctx'> }</div><div class='hunk'>@@ -2382,7 +2387,7 @@ static struct dma_map_ops *arm_get_dma_map_ops(bool coherent)</div><div class='ctx'> void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,</div><div class='ctx'> 			const struct iommu_ops *iommu, bool coherent)</div><div class='ctx'> {</div><div class='del'>-	struct dma_map_ops *dma_ops;</div><div class='add'>+	const struct dma_map_ops *dma_ops;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;archdata.dma_coherent = coherent;</div><div class='ctx'> 	if (arm_setup_iommu_dma_ops(dev, dma_base, size, iommu))</div><div class='head'>diff --git a/arch/arm/mm/dump.c b/arch/arm/mm/dump.c<br/>index 9fe8e241335c..21192d6eda40 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/dump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/dump.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/dump.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='add'>+#include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct addr_marker {</div><div class='hunk'>@@ -31,8 +32,8 @@ static struct addr_marker address_markers[] = {</div><div class='ctx'> 	{ 0,			"vmalloc() Area" },</div><div class='ctx'> 	{ VMALLOC_END,		"vmalloc() End" },</div><div class='ctx'> 	{ FIXADDR_START,	"Fixmap Area" },</div><div class='del'>-	{ CONFIG_VECTORS_BASE,	"Vectors" },</div><div class='del'>-	{ CONFIG_VECTORS_BASE + PAGE_SIZE * 2, "Vectors End" },</div><div class='add'>+	{ VECTORS_BASE,	"Vectors" },</div><div class='add'>+	{ VECTORS_BASE + PAGE_SIZE * 2, "Vectors End" },</div><div class='ctx'> 	{ -1,			NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/extable.c b/arch/arm/mm/extable.c<br/>index 312e15e6d00b..f436f7439e46 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/extable.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  linux/arch/arm/mm/extable.c</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs)</div><div class='head'>diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c<br/>index 3a2e678b8d30..ff8b0aa2dfde 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/fault.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='hunk'>@@ -16,7 +16,8 @@</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/page-flags.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -610,9 +611,9 @@ static int __init early_abort_handler(unsigned long addr, unsigned int fsr,</div><div class='ctx'> </div><div class='ctx'> void __init early_abt_enable(void)</div><div class='ctx'> {</div><div class='del'>-	fsr_info[22].fn = early_abort_handler;</div><div class='add'>+	fsr_info[FSR_FS_AEA].fn = early_abort_handler;</div><div class='ctx'> 	local_abt_enable();</div><div class='del'>-	fsr_info[22].fn = do_bad;</div><div class='add'>+	fsr_info[FSR_FS_AEA].fn = do_bad;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_ARM_LPAE</div><div class='head'>diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h<br/>index 67532f242271..afc1f84e763b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/fault.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/fault.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/fault.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/fault.h</a></div><div class='hunk'>@@ -11,11 +11,15 @@</div><div class='ctx'> #define FSR_FS5_0		(0x3f)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARM_LPAE</div><div class='add'>+#define FSR_FS_AEA		17</div><div class='add'>+</div><div class='ctx'> static inline int fsr_fs(unsigned int fsr)</div><div class='ctx'> {</div><div class='ctx'> 	return fsr &amp; FSR_FS5_0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='add'>+#define FSR_FS_AEA		22</div><div class='add'>+</div><div class='ctx'> static inline int fsr_fs(unsigned int fsr)</div><div class='ctx'> {</div><div class='ctx'> 	return (fsr &amp; FSR_FS3_0) | (fsr &amp; FSR_FS4) &gt;&gt; 6;</div><div class='head'>diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c<br/>index 3cced8455727..f1e6190aa7ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/flush.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/flush.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/flush.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/flush.c</a></div><div class='hunk'>@@ -327,6 +327,12 @@ void flush_dcache_page(struct page *page)</div><div class='ctx'> 	if (page == ZERO_PAGE(0))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (!cache_ops_need_broadcast() &amp;&amp; cache_is_vipt_nonaliasing()) {</div><div class='add'>+		if (test_bit(PG_dcache_clean, &amp;page-&gt;flags))</div><div class='add'>+			clear_bit(PG_dcache_clean, &amp;page-&gt;flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mapping = page_mapping(page);</div><div class='ctx'> </div><div class='ctx'> 	if (!cache_ops_need_broadcast() &amp;&amp;</div><div class='head'>diff --git a/arch/arm/mm/idmap.c b/arch/arm/mm/idmap.c<br/>index c1a48f88764e..3e511bec69b8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/idmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/idmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/idmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/idmap.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/idmap.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c<br/>index 370581aeb871..1d8558ff9827 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/init.c</a></div><div class='hunk'>@@ -13,6 +13,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='hunk'>@@ -27,6 +29,7 @@</div><div class='ctx'> #include &lt;asm/cp15.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/memblock.h&gt;</div><div class='add'>+#include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -227,41 +230,59 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)</div><div class='ctx'> 	return phys;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init arm_memblock_init(const struct machine_desc *mdesc)</div><div class='add'>+static void __init arm_initrd_init(void)</div><div class='ctx'> {</div><div class='del'>-	/* Register the kernel text, kernel data and initrd with memblock. */</div><div class='del'>-#ifdef CONFIG_XIP_KERNEL</div><div class='del'>-	memblock_reserve(__pa(_sdata), _end - _sdata);</div><div class='del'>-#else</div><div class='del'>-	memblock_reserve(__pa(_stext), _end - _stext);</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='add'>+	phys_addr_t start;</div><div class='add'>+	unsigned long size;</div><div class='add'>+</div><div class='ctx'> 	/* FDT scan will populate initrd_start */</div><div class='ctx'> 	if (initrd_start &amp;&amp; !phys_initrd_size) {</div><div class='ctx'> 		phys_initrd_start = __virt_to_phys(initrd_start);</div><div class='ctx'> 		phys_initrd_size = initrd_end - initrd_start;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	initrd_start = initrd_end = 0;</div><div class='del'>-	if (phys_initrd_size &amp;&amp;</div><div class='del'>-	    !memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) {</div><div class='add'>+</div><div class='add'>+	if (!phys_initrd_size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Round the memory region to page boundaries as per free_initrd_mem()</div><div class='add'>+	 * This allows us to detect whether the pages overlapping the initrd</div><div class='add'>+	 * are in use, but more importantly, reserves the entire set of pages</div><div class='add'>+	 * as we don't want these pages allocated for other purposes.</div><div class='add'>+	 */</div><div class='add'>+	start = round_down(phys_initrd_start, PAGE_SIZE);</div><div class='add'>+	size = phys_initrd_size + (phys_initrd_start - start);</div><div class='add'>+	size = round_up(size, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	if (!memblock_is_region_memory(start, size)) {</div><div class='ctx'> 		pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd\n",</div><div class='del'>-		       (u64)phys_initrd_start, phys_initrd_size);</div><div class='del'>-		phys_initrd_start = phys_initrd_size = 0;</div><div class='add'>+		       (u64)start, size);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (phys_initrd_size &amp;&amp;</div><div class='del'>-	    memblock_is_region_reserved(phys_initrd_start, phys_initrd_size)) {</div><div class='add'>+</div><div class='add'>+	if (memblock_is_region_reserved(start, size)) {</div><div class='ctx'> 		pr_err("INITRD: 0x%08llx+0x%08lx overlaps in-use memory region - disabling initrd\n",</div><div class='del'>-		       (u64)phys_initrd_start, phys_initrd_size);</div><div class='del'>-		phys_initrd_start = phys_initrd_size = 0;</div><div class='add'>+		       (u64)start, size);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (phys_initrd_size) {</div><div class='del'>-		memblock_reserve(phys_initrd_start, phys_initrd_size);</div><div class='ctx'> </div><div class='del'>-		/* Now convert initrd to virtual addresses */</div><div class='del'>-		initrd_start = __phys_to_virt(phys_initrd_start);</div><div class='del'>-		initrd_end = initrd_start + phys_initrd_size;</div><div class='del'>-	}</div><div class='add'>+	memblock_reserve(start, size);</div><div class='add'>+</div><div class='add'>+	/* Now convert initrd to virtual addresses */</div><div class='add'>+	initrd_start = __phys_to_virt(phys_initrd_start);</div><div class='add'>+	initrd_end = initrd_start + phys_initrd_size;</div><div class='ctx'> #endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init arm_memblock_init(const struct machine_desc *mdesc)</div><div class='add'>+{</div><div class='add'>+	/* Register the kernel text, kernel data and initrd with memblock. */</div><div class='add'>+	memblock_reserve(__pa(KERNEL_START), KERNEL_END - KERNEL_START);</div><div class='add'>+</div><div class='add'>+	arm_initrd_init();</div><div class='ctx'> </div><div class='ctx'> 	arm_mm_memblock_reserve();</div><div class='ctx'> </div><div class='hunk'>@@ -521,8 +542,7 @@ void __init mem_init(void)</div><div class='ctx'> 			"      .data : 0x%p" " - 0x%p" "   (%4td kB)\n"</div><div class='ctx'> 			"       .bss : 0x%p" " - 0x%p" "   (%4td kB)\n",</div><div class='ctx'> </div><div class='del'>-			MLK(UL(CONFIG_VECTORS_BASE), UL(CONFIG_VECTORS_BASE) +</div><div class='del'>-				(PAGE_SIZE)),</div><div class='add'>+			MLK(VECTORS_BASE, VECTORS_BASE + PAGE_SIZE),</div><div class='ctx'> #ifdef CONFIG_HAVE_TCM</div><div class='ctx'> 			MLK(DTCM_OFFSET, (unsigned long) dtcm_end),</div><div class='ctx'> 			MLK(ITCM_OFFSET, (unsigned long) itcm_end),</div><div class='hunk'>@@ -572,7 +592,7 @@ void __init mem_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_RODATA</div><div class='add'>+#ifdef CONFIG_STRICT_KERNEL_RWX</div><div class='ctx'> struct section_perm {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	unsigned long start;</div><div class='hunk'>@@ -741,7 +761,7 @@ void set_kernel_text_ro(void)</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> static inline void fix_kernmem_perms(void) { }</div><div class='del'>-#endif /* CONFIG_DEBUG_RODATA */</div><div class='add'>+#endif /* CONFIG_STRICT_KERNEL_RWX */</div><div class='ctx'> </div><div class='ctx'> void free_tcmmem(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c<br/>index 66353caa35b9..2239fde10b80 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/mmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/mmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/mmap.c</a></div><div class='hunk'>@@ -5,7 +5,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/shm.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c<br/>index 4001dd15818d..4e016d7f37b3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/mmu.c</a></div><div class='hunk'>@@ -1152,13 +1152,12 @@ early_param("vmalloc", early_vmalloc);</div><div class='ctx'> </div><div class='ctx'> phys_addr_t arm_lowmem_limit __initdata = 0;</div><div class='ctx'> </div><div class='del'>-void __init sanity_check_meminfo(void)</div><div class='add'>+void __init adjust_lowmem_bounds(void)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t memblock_limit = 0;</div><div class='del'>-	int highmem = 0;</div><div class='ctx'> 	u64 vmalloc_limit;</div><div class='ctx'> 	struct memblock_region *reg;</div><div class='del'>-	bool should_use_highmem = false;</div><div class='add'>+	phys_addr_t lowmem_limit = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Let's use our own (unoptimized) equivalent of __pa() that is</div><div class='hunk'>@@ -1172,43 +1171,18 @@ void __init sanity_check_meminfo(void)</div><div class='ctx'> 	for_each_memblock(memory, reg) {</div><div class='ctx'> 		phys_addr_t block_start = reg-&gt;base;</div><div class='ctx'> 		phys_addr_t block_end = reg-&gt;base + reg-&gt;size;</div><div class='del'>-		phys_addr_t size_limit = reg-&gt;size;</div><div class='ctx'> </div><div class='del'>-		if (reg-&gt;base &gt;= vmalloc_limit)</div><div class='del'>-			highmem = 1;</div><div class='del'>-		else</div><div class='del'>-			size_limit = vmalloc_limit - reg-&gt;base;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		if (!IS_ENABLED(CONFIG_HIGHMEM) || cache_is_vipt_aliasing()) {</div><div class='del'>-</div><div class='del'>-			if (highmem) {</div><div class='del'>-				pr_notice("Ignoring RAM at %pa-%pa (!CONFIG_HIGHMEM)\n",</div><div class='del'>-					  &amp;block_start, &amp;block_end);</div><div class='del'>-				memblock_remove(reg-&gt;base, reg-&gt;size);</div><div class='del'>-				should_use_highmem = true;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (reg-&gt;size &gt; size_limit) {</div><div class='del'>-				phys_addr_t overlap_size = reg-&gt;size - size_limit;</div><div class='del'>-</div><div class='del'>-				pr_notice("Truncating RAM at %pa-%pa",</div><div class='del'>-					  &amp;block_start, &amp;block_end);</div><div class='del'>-				block_end = vmalloc_limit;</div><div class='del'>-				pr_cont(" to -%pa", &amp;block_end);</div><div class='del'>-				memblock_remove(vmalloc_limit, overlap_size);</div><div class='del'>-				should_use_highmem = true;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!highmem) {</div><div class='del'>-			if (block_end &gt; arm_lowmem_limit) {</div><div class='del'>-				if (reg-&gt;size &gt; size_limit)</div><div class='del'>-					arm_lowmem_limit = vmalloc_limit;</div><div class='del'>-				else</div><div class='del'>-					arm_lowmem_limit = block_end;</div><div class='del'>-			}</div><div class='add'>+		if (reg-&gt;base &lt; vmalloc_limit) {</div><div class='add'>+			if (block_end &gt; lowmem_limit)</div><div class='add'>+				/*</div><div class='add'>+				 * Compare as u64 to ensure vmalloc_limit does</div><div class='add'>+				 * not get truncated. block_end should always</div><div class='add'>+				 * fit in phys_addr_t so there should be no</div><div class='add'>+				 * issue with assignment.</div><div class='add'>+				 */</div><div class='add'>+				lowmem_limit = min_t(u64,</div><div class='add'>+							 vmalloc_limit,</div><div class='add'>+							 block_end);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Find the first non-pmd-aligned page, and point</div><div class='hunk'>@@ -1227,14 +1201,13 @@ void __init sanity_check_meminfo(void)</div><div class='ctx'> 				if (!IS_ALIGNED(block_start, PMD_SIZE))</div><div class='ctx'> 					memblock_limit = block_start;</div><div class='ctx'> 				else if (!IS_ALIGNED(block_end, PMD_SIZE))</div><div class='del'>-					memblock_limit = arm_lowmem_limit;</div><div class='add'>+					memblock_limit = lowmem_limit;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (should_use_highmem)</div><div class='del'>-		pr_notice("Consider using a HIGHMEM enabled kernel.\n");</div><div class='add'>+	arm_lowmem_limit = lowmem_limit;</div><div class='ctx'> </div><div class='ctx'> 	high_memory = __va(arm_lowmem_limit - 1) + 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1248,6 +1221,18 @@ void __init sanity_check_meminfo(void)</div><div class='ctx'> 	if (!memblock_limit)</div><div class='ctx'> 		memblock_limit = arm_lowmem_limit;</div><div class='ctx'> </div><div class='add'>+	if (!IS_ENABLED(CONFIG_HIGHMEM) || cache_is_vipt_aliasing()) {</div><div class='add'>+		if (memblock_end_of_DRAM() &gt; arm_lowmem_limit) {</div><div class='add'>+			phys_addr_t end = memblock_end_of_DRAM();</div><div class='add'>+</div><div class='add'>+			pr_notice("Ignoring RAM at %pa-%pa\n",</div><div class='add'>+				  &amp;memblock_limit, &amp;end);</div><div class='add'>+			pr_notice("Consider using a HIGHMEM enabled kernel.\n");</div><div class='add'>+</div><div class='add'>+			memblock_remove(memblock_limit, end - memblock_limit);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	memblock_set_current_limit(memblock_limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1437,11 +1422,7 @@ static void __init kmap_init(void)</div><div class='ctx'> static void __init map_lowmem(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct memblock_region *reg;</div><div class='del'>-#ifdef CONFIG_XIP_KERNEL</div><div class='del'>-	phys_addr_t kernel_x_start = round_down(__pa(_sdata), SECTION_SIZE);</div><div class='del'>-#else</div><div class='del'>-	phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);</div><div class='del'>-#endif</div><div class='add'>+	phys_addr_t kernel_x_start = round_down(__pa(KERNEL_START), SECTION_SIZE);</div><div class='ctx'> 	phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Map all the lowmem memory banks. */</div><div class='head'>diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c<br/>index 2740967727e2..3b5c7aaf9c76 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/nommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/nommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/nommu.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/cp15.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -22,6 +23,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "mm.h"</div><div class='ctx'> </div><div class='add'>+unsigned long vectors_base;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ARM_MPU</div><div class='ctx'> struct mpu_rgn_info mpu_rgn_info;</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +88,7 @@ static unsigned long irbar_read(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* MPU initialisation functions */</div><div class='del'>-void __init sanity_check_meminfo_mpu(void)</div><div class='add'>+void __init adjust_lowmem_bounds_mpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t phys_offset = PHYS_OFFSET;</div><div class='ctx'> 	phys_addr_t aligned_region_size, specified_mem_size, rounded_mem_size;</div><div class='hunk'>@@ -274,19 +277,64 @@ void __init mpu_setup(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static void sanity_check_meminfo_mpu(void) {}</div><div class='add'>+static void adjust_lowmem_bounds_mpu(void) {}</div><div class='ctx'> static void __init mpu_setup(void) {}</div><div class='ctx'> #endif /* CONFIG_ARM_MPU */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_CP15</div><div class='add'>+#ifdef CONFIG_CPU_HIGH_VECTOR</div><div class='add'>+static unsigned long __init setup_vectors_base(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg = get_cr();</div><div class='add'>+</div><div class='add'>+	set_cr(reg | CR_V);</div><div class='add'>+	return 0xffff0000;</div><div class='add'>+}</div><div class='add'>+#else /* CONFIG_CPU_HIGH_VECTOR */</div><div class='add'>+/* Write exception base address to VBAR */</div><div class='add'>+static inline void set_vbar(unsigned long val)</div><div class='add'>+{</div><div class='add'>+	asm("mcr p15, 0, %0, c12, c0, 0" : : "r" (val) : "cc");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Security extensions, bits[7:4], permitted values,</div><div class='add'>+ * 0b0000 - not implemented, 0b0001/0b0010 - implemented</div><div class='add'>+ */</div><div class='add'>+static inline bool security_extensions_enabled(void)</div><div class='add'>+{</div><div class='add'>+	return !!cpuid_feature_extract(CPUID_EXT_PFR1, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long __init setup_vectors_base(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long base = 0, reg = get_cr();</div><div class='add'>+</div><div class='add'>+	set_cr(reg &amp; ~CR_V);</div><div class='add'>+	if (security_extensions_enabled()) {</div><div class='add'>+		if (IS_ENABLED(CONFIG_REMAP_VECTORS_TO_RAM))</div><div class='add'>+			base = CONFIG_DRAM_BASE;</div><div class='add'>+		set_vbar(base);</div><div class='add'>+	} else if (IS_ENABLED(CONFIG_REMAP_VECTORS_TO_RAM)) {</div><div class='add'>+		if (CONFIG_DRAM_BASE != 0)</div><div class='add'>+			pr_err("Security extensions not enabled, vectors cannot be remapped to RAM, vectors base will be 0x00000000\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return base;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_CPU_HIGH_VECTOR */</div><div class='add'>+#endif /* CONFIG_CPU_CP15 */</div><div class='add'>+</div><div class='ctx'> void __init arm_mm_memblock_reserve(void)</div><div class='ctx'> {</div><div class='ctx'> #ifndef CONFIG_CPU_V7M</div><div class='add'>+	vectors_base = IS_ENABLED(CONFIG_CPU_CP15) ? setup_vectors_base() : 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Register the exception vector page.</div><div class='ctx'> 	 * some architectures which the DRAM is the exception vector to trap,</div><div class='ctx'> 	 * alloc_page breaks with error, although it is not NULL, but "0."</div><div class='ctx'> 	 */</div><div class='del'>-	memblock_reserve(CONFIG_VECTORS_BASE, 2 * PAGE_SIZE);</div><div class='add'>+	memblock_reserve(vectors_base, 2 * PAGE_SIZE);</div><div class='ctx'> #else /* ifndef CONFIG_CPU_V7M */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * There is no dedicated vector page on V7-M. So nothing needs to be</div><div class='hunk'>@@ -295,10 +343,10 @@ void __init arm_mm_memblock_reserve(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init sanity_check_meminfo(void)</div><div class='add'>+void __init adjust_lowmem_bounds(void)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t end;</div><div class='del'>-	sanity_check_meminfo_mpu();</div><div class='add'>+	adjust_lowmem_bounds_mpu();</div><div class='ctx'> 	end = memblock_end_of_DRAM();</div><div class='ctx'> 	high_memory = __va(end - 1) + 1;</div><div class='ctx'> 	memblock_set_current_limit(end);</div><div class='hunk'>@@ -310,7 +358,7 @@ void __init sanity_check_meminfo(void)</div><div class='ctx'>  */</div><div class='ctx'> void __init paging_init(const struct machine_desc *mdesc)</div><div class='ctx'> {</div><div class='del'>-	early_trap_init((void *)CONFIG_VECTORS_BASE);</div><div class='add'>+	early_trap_init((void *)vectors_base);</div><div class='ctx'> 	mpu_setup();</div><div class='ctx'> 	bootmem_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c<br/>index d19b1ad29b07..3b69f2642513 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/mm/pageattr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/mm/pageattr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/pageattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/pageattr.c</a></div><div class='hunk'>@@ -34,28 +34,29 @@ static int change_page_range(pte_t *ptep, pgtable_t token, unsigned long addr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool in_range(unsigned long start, unsigned long size,</div><div class='add'>+	unsigned long range_start, unsigned long range_end)</div><div class='add'>+{</div><div class='add'>+	return start &gt;= range_start &amp;&amp; start &lt; range_end &amp;&amp;</div><div class='add'>+		size &lt;= range_end - start;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int change_memory_common(unsigned long addr, int numpages,</div><div class='ctx'> 				pgprot_t set_mask, pgprot_t clear_mask)</div><div class='ctx'> {</div><div class='del'>-	unsigned long start = addr;</div><div class='del'>-	unsigned long size = PAGE_SIZE*numpages;</div><div class='del'>-	unsigned long end = start + size;</div><div class='add'>+	unsigned long start = addr &amp; PAGE_MASK;</div><div class='add'>+	unsigned long end = PAGE_ALIGN(addr) + numpages * PAGE_SIZE;</div><div class='add'>+	unsigned long size = end - start;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct page_change_data data;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ALIGNED(addr, PAGE_SIZE)) {</div><div class='del'>-		start &amp;= PAGE_MASK;</div><div class='del'>-		end = start + size;</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-	}</div><div class='add'>+	WARN_ON_ONCE(start != addr);</div><div class='ctx'> </div><div class='del'>-	if (!numpages)</div><div class='add'>+	if (!size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (start &lt; MODULES_VADDR || start &gt;= MODULES_END)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (end &lt; MODULES_VADDR || start &gt;= MODULES_END)</div><div class='add'>+	if (!in_range(start, size, MODULES_VADDR, MODULES_END) &amp;&amp;</div><div class='add'>+	    !in_range(start, size, VMALLOC_START, VMALLOC_END))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	data.set_mask = set_mask;</div><div class='head'>diff --git a/arch/arm/mm/physaddr.c b/arch/arm/mm/physaddr.c<br/>new file mode 100644<br/>index 000000000000..02e60f495608<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/mm/physaddr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/mm/physaddr.c</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mmdebug.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='add'>+#include &lt;asm/memory.h&gt;</div><div class='add'>+#include &lt;asm/fixmap.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mm.h"</div><div class='add'>+</div><div class='add'>+static inline bool __virt_addr_valid(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * high_memory does not get immediately defined, and there</div><div class='add'>+	 * are early callers of __pa() against PAGE_OFFSET</div><div class='add'>+	 */</div><div class='add'>+	if (!high_memory &amp;&amp; x &gt;= PAGE_OFFSET)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (high_memory &amp;&amp; x &gt;= PAGE_OFFSET &amp;&amp; x &lt; (unsigned long)high_memory)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * MAX_DMA_ADDRESS is a virtual address that may not correspond to an</div><div class='add'>+	 * actual physical address. Enough code relies on __pa(MAX_DMA_ADDRESS)</div><div class='add'>+	 * that we just need to work around it and always return true.</div><div class='add'>+	 */</div><div class='add'>+	if (x == MAX_DMA_ADDRESS)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+phys_addr_t __virt_to_phys(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	WARN(!__virt_addr_valid(x),</div><div class='add'>+	     "virt_to_phys used for non-linear address: %pK (%pS)\n",</div><div class='add'>+	     (void *)x, (void *)x);</div><div class='add'>+</div><div class='add'>+	return __virt_to_phys_nodebug(x);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__virt_to_phys);</div><div class='add'>+</div><div class='add'>+phys_addr_t __phys_addr_symbol(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	/* This is bounds checking against the kernel image only.</div><div class='add'>+	 * __pa_symbol should only be used on kernel symbol addresses.</div><div class='add'>+	 */</div><div class='add'>+	VIRTUAL_BUG_ON(x &lt; (unsigned long)KERNEL_START ||</div><div class='add'>+		       x &gt; (unsigned long)KERNEL_END);</div><div class='add'>+</div><div class='add'>+	return __pa_symbol_nodebug(x);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__phys_addr_symbol);</div><div class='head'>diff --git a/arch/arm/nwfpe/fpmodule.c b/arch/arm/nwfpe/fpmodule.c<br/>index ec717c190e2c..1365e8650843 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/nwfpe/fpmodule.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/nwfpe/fpmodule.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/nwfpe/fpmodule.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/nwfpe/fpmodule.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/thread_notify.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c<br/>index 101e8f2c7abe..2cff0010f677 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/plat-iop/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/plat-iop/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/plat-iop/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-iop/time.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/sched_clock.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;mach/time.h&gt;</div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * IOP clocksource (free-running timer 1).</div><div class='ctx'>  */</div><div class='del'>-static cycle_t notrace iop_clocksource_read(struct clocksource *unused)</div><div class='add'>+static u64 notrace iop_clocksource_read(struct clocksource *unused)</div><div class='ctx'> {</div><div class='ctx'> 	return 0xffffffffu - read_tcr1();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig<br/>index d055db32ffcb..3e27bffb352d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/plat-omap/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/plat-omap/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/plat-omap/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-omap/Kconfig</a></div><div class='hunk'>@@ -63,32 +63,6 @@ config OMAP_RESET_CLOCKS</div><div class='ctx'> 	  probably do not want this option enabled until your</div><div class='ctx'> 	  device drivers work properly.</div><div class='ctx'> </div><div class='del'>-config OMAP_MUX</div><div class='del'>-	bool "OMAP multiplexing support"</div><div class='del'>-	depends on ARCH_OMAP</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Pin multiplexing support for OMAP boards. If your bootloader</div><div class='del'>-	  sets the multiplexing correctly, say N. Otherwise, or if unsure,</div><div class='del'>-	  say Y.</div><div class='del'>-</div><div class='del'>-config OMAP_MUX_DEBUG</div><div class='del'>-	bool "Multiplexing debug output"</div><div class='del'>-	depends on OMAP_MUX</div><div class='del'>-	help</div><div class='del'>-	  Makes the multiplexing functions print out a lot of debug info.</div><div class='del'>-	  This is useful if you want to find out the correct values of the</div><div class='del'>-	  multiplexing registers.</div><div class='del'>-</div><div class='del'>-config OMAP_MUX_WARNINGS</div><div class='del'>-	bool "Warn about pins the bootloader didn't set up"</div><div class='del'>-	depends on OMAP_MUX</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Choose Y here to warn whenever driver initialization logic needs</div><div class='del'>-	  to change the pin multiplexing setup.	 When there are no warnings</div><div class='del'>-	  printed, it's safe to deselect OMAP_MUX for your product.</div><div class='del'>-</div><div class='ctx'> config OMAP_MPU_TIMER</div><div class='ctx'> 	bool "Use mpu timer"</div><div class='ctx'> 	depends on ARCH_OMAP1</div><div class='head'>diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile<br/>index 97a50e8883f9..47e186729d44 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/plat-omap/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/plat-omap/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/plat-omap/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-omap/Makefile</a></div><div class='hunk'>@@ -11,6 +11,3 @@ obj-y := sram.o dma.o counter_32k.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o</div><div class='ctx'> obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o</div><div class='del'>-i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o</div><div class='del'>-obj-y += $(i2c-omap-m) $(i2c-omap-y)</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c<br/>deleted file mode 100644<br/>index 58213d9714cd..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm/plat-omap/i2c.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/plat-omap/i2c.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,116 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/arm/plat-omap/i2c.c</div><div class='del'>- *</div><div class='del'>- * Helper module for board specific I2C bus registration</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2007 Nokia Corporation.</div><div class='del'>- *</div><div class='del'>- * Contact: Jarkko Nikula &lt;jhnikula@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * version 2 as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA</div><div class='del'>- * 02110-1301 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/i2c-omap.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/i2c.h&gt;</div><div class='del'>-</div><div class='del'>-#define OMAP_I2C_MAX_CONTROLLERS 4</div><div class='del'>-static struct omap_i2c_bus_platform_data i2c_pdata[OMAP_I2C_MAX_CONTROLLERS];</div><div class='del'>-</div><div class='del'>-#define OMAP_I2C_CMDLINE_SETUP	(BIT(31))</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_i2c_bus_setup - Process command line options for the I2C bus speed</div><div class='del'>- * @str: String of options</div><div class='del'>- *</div><div class='del'>- * This function allow to override the default I2C bus speed for given I2C</div><div class='del'>- * bus with a command line option.</div><div class='del'>- *</div><div class='del'>- * Format: i2c_bus=bus_id,clkrate (in kHz)</div><div class='del'>- *</div><div class='del'>- * Returns 1 on success, 0 otherwise.</div><div class='del'>- */</div><div class='del'>-static int __init omap_i2c_bus_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	int ints[3];</div><div class='del'>-</div><div class='del'>-	get_options(str, 3, ints);</div><div class='del'>-	if (ints[0] &lt; 2 || ints[1] &lt; 1 ||</div><div class='del'>-			ints[1] &gt; OMAP_I2C_MAX_CONTROLLERS)</div><div class='del'>-		return 0;</div><div class='del'>-	i2c_pdata[ints[1] - 1].clkrate = ints[2];</div><div class='del'>-	i2c_pdata[ints[1] - 1].clkrate |= OMAP_I2C_CMDLINE_SETUP;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("i2c_bus=", omap_i2c_bus_setup);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Register busses defined in command line but that are not registered with</div><div class='del'>- * omap_register_i2c_bus from board initialization code.</div><div class='del'>- */</div><div class='del'>-int __init omap_register_i2c_bus_cmdline(void)</div><div class='del'>-{</div><div class='del'>-	int i, err = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(i2c_pdata); i++)</div><div class='del'>-		if (i2c_pdata[i].clkrate &amp; OMAP_I2C_CMDLINE_SETUP) {</div><div class='del'>-			i2c_pdata[i].clkrate &amp;= ~OMAP_I2C_CMDLINE_SETUP;</div><div class='del'>-			err = omap_i2c_add_bus(&amp;i2c_pdata[i], i + 1);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_register_i2c_bus - register I2C bus with device descriptors</div><div class='del'>- * @bus_id: bus id counting from number 1</div><div class='del'>- * @clkrate: clock rate of the bus in kHz</div><div class='del'>- * @info: pointer into I2C device descriptor table or NULL</div><div class='del'>- * @len: number of descriptors in the table</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success or an error code.</div><div class='del'>- */</div><div class='del'>-int __init omap_register_i2c_bus(int bus_id, u32 clkrate,</div><div class='del'>-			  struct i2c_board_info const *info,</div><div class='del'>-			  unsigned len)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bus_id &lt; 1 || bus_id &gt; OMAP_I2C_MAX_CONTROLLERS);</div><div class='del'>-</div><div class='del'>-	if (info) {</div><div class='del'>-		err = i2c_register_board_info(bus_id, info, len);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!i2c_pdata[bus_id - 1].clkrate)</div><div class='del'>-		i2c_pdata[bus_id - 1].clkrate = clkrate;</div><div class='del'>-</div><div class='del'>-	i2c_pdata[bus_id - 1].clkrate &amp;= ~OMAP_I2C_CMDLINE_SETUP;</div><div class='del'>-</div><div class='del'>-	return omap_i2c_add_bus(&amp;i2c_pdata[bus_id - 1], bus_id);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c<br/>index 272f49b2c68f..9255b6d67ba5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/plat-orion/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/plat-orion/common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/plat-orion/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-orion/common.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/platform_data/dma-mv_xor.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/usb-ehci-orion.h&gt;</div><div class='ctx'> #include &lt;plat/common.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Create a clkdev entry for a given device/clk */</div><div class='ctx'> void __init orion_clkdev_add(const char *con_id, const char *dev_id,</div><div class='hunk'>@@ -470,15 +471,27 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * Ethernet switch</div><div class='ctx'>  ****************************************************************************/</div><div class='del'>-void __init orion_ge00_switch_init(struct dsa_platform_data *d)</div><div class='add'>+static __initconst const char *orion_ge00_mvmdio_bus_name = "orion-mii";</div><div class='add'>+static __initdata struct mdio_board_info</div><div class='add'>+		  orion_ge00_switch_board_info;</div><div class='add'>+</div><div class='add'>+void __init orion_ge00_switch_init(struct dsa_chip_data *d)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct mdio_board_info *bd;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(d-&gt;port_names); i++)</div><div class='add'>+		if (!strcmp(d-&gt;port_names[i], "cpu"))</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	d-&gt;netdev = &amp;orion_ge00.dev;</div><div class='del'>-	for (i = 0; i &lt; d-&gt;nr_chips; i++)</div><div class='del'>-		d-&gt;chip[i].host_dev = &amp;orion_ge_mvmdio.dev;</div><div class='add'>+	bd = &amp;orion_ge00_switch_board_info;</div><div class='add'>+	bd-&gt;bus_id = orion_ge00_mvmdio_bus_name;</div><div class='add'>+	bd-&gt;mdio_addr = d-&gt;sw_addr;</div><div class='add'>+	d-&gt;netdev[i] = &amp;orion_ge00.dev;</div><div class='add'>+	strcpy(bd-&gt;modalias, "mv88e6085");</div><div class='add'>+	bd-&gt;platform_data = d;</div><div class='ctx'> </div><div class='del'>-	platform_device_register_data(NULL, "dsa", 0, d, sizeof(d));</div><div class='add'>+	mdiobus_register_board_info(&amp;orion_ge00_switch_board_info, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='head'>diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c<br/>index f74069386c13..26a531ebb6e9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/plat-orion/gpio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/plat-orion/gpio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/plat-orion/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-orion/gpio.c</a></div><div class='hunk'>@@ -478,13 +478,13 @@ static void orion_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)</div><div class='ctx'> 			   (data_in ^ in_pol) &amp; msk  ? "hi" : "lo",</div><div class='ctx'> 			   in_pol &amp; msk ? "lo" : "hi");</div><div class='ctx'> 		if (!((edg_msk | lvl_msk) &amp; msk)) {</div><div class='del'>-			seq_printf(s, " disabled\n");</div><div class='add'>+			seq_puts(s, " disabled\n");</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (edg_msk &amp; msk)</div><div class='del'>-			seq_printf(s, " edge ");</div><div class='add'>+			seq_puts(s, " edge ");</div><div class='ctx'> 		if (lvl_msk &amp; msk)</div><div class='del'>-			seq_printf(s, " level");</div><div class='add'>+			seq_puts(s, " level");</div><div class='ctx'> 		seq_printf(s, " (%s)\n", cause &amp; msk ? "pending" : "clear  ");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h<br/>index 9347f3c58a6d..3647d3b33c20 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/plat-orion/include/plat/common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/plat-orion/include/plat/common.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/plat-orion/include/plat/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-orion/include/plat/common.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/usb-ehci-orion.h&gt;</div><div class='ctx'> </div><div class='del'>-struct dsa_platform_data;</div><div class='add'>+struct dsa_chip_data;</div><div class='ctx'> struct mv_sata_platform_data;</div><div class='ctx'> </div><div class='ctx'> void __init orion_uart0_init(void __iomem *membase,</div><div class='hunk'>@@ -57,7 +57,7 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='ctx'> 			    unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq);</div><div class='ctx'> </div><div class='del'>-void __init orion_ge00_switch_init(struct dsa_platform_data *d);</div><div class='add'>+void __init orion_ge00_switch_init(struct dsa_chip_data *d);</div><div class='ctx'> </div><div class='ctx'> void __init orion_i2c_init(unsigned long mapbase,</div><div class='ctx'> 			   unsigned long irq,</div><div class='head'>diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c<br/>index e93aa6734147..03fac123676d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/plat-samsung/devs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/plat-samsung/devs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/plat-samsung/devs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-samsung/devs.c</a></div><div class='hunk'>@@ -77,15 +77,6 @@ static struct resource s3c_ac97_resource[] = {</div><div class='ctx'> 	[1] = DEFINE_RES_IRQ(IRQ_S3C244X_AC97),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct s3c_audio_pdata s3c_ac97_pdata = {</div><div class='del'>-#ifdef CONFIG_S3C24XX_DMAC</div><div class='del'>-	.dma_filter = s3c24xx_dma_filter,</div><div class='del'>-#endif</div><div class='del'>-	.dma_playback = (void *)DMACH_PCM_OUT,</div><div class='del'>-	.dma_capture = (void *)DMACH_PCM_IN,</div><div class='del'>-	.dma_capture_mic = (void *)DMACH_MIC_IN,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct platform_device s3c_device_ac97 = {</div><div class='ctx'> 	.name		= "samsung-ac97",</div><div class='ctx'> 	.id		= -1,</div><div class='hunk'>@@ -94,7 +85,6 @@ struct platform_device s3c_device_ac97 = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.dma_mask		= &amp;samsung_device_dma_mask,</div><div class='ctx'> 		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data		= &amp;s3c_ac97_pdata,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_CPU_S3C2440 */</div><div class='hunk'>@@ -574,14 +564,6 @@ static struct resource s3c_iis_resource[] = {</div><div class='ctx'> 	[0] = DEFINE_RES_MEM(S3C24XX_PA_IIS, S3C24XX_SZ_IIS),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct s3c_audio_pdata s3c_iis_platdata = {</div><div class='del'>-#ifdef CONFIG_S3C24XX_DMAC</div><div class='del'>-	.dma_filter = s3c24xx_dma_filter,</div><div class='del'>-#endif</div><div class='del'>-	.dma_playback = (void *)DMACH_I2S_OUT,</div><div class='del'>-	.dma_capture = (void *)DMACH_I2S_IN,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct platform_device s3c_device_iis = {</div><div class='ctx'> 	.name		= "s3c24xx-iis",</div><div class='ctx'> 	.id		= -1,</div><div class='hunk'>@@ -590,7 +572,6 @@ struct platform_device s3c_device_iis = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.dma_mask		= &amp;samsung_device_dma_mask,</div><div class='ctx'> 		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data		= &amp;s3c_iis_platdata,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_PLAT_S3C24XX */</div><div class='hunk'>@@ -1124,15 +1105,6 @@ void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,</div><div class='ctx'> 	pd.num_cs = num_cs;</div><div class='ctx'> 	pd.src_clk_nr = src_clk_nr;</div><div class='ctx'> 	pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi0_cfg_gpio;</div><div class='del'>-	pd.dma_tx = (void *)DMACH_SPI0_TX;</div><div class='del'>-	pd.dma_rx = (void *)DMACH_SPI0_RX;</div><div class='del'>-#if defined(CONFIG_PL330_DMA)</div><div class='del'>-	pd.filter = pl330_filter;</div><div class='del'>-#elif defined(CONFIG_S3C64XX_PL080)</div><div class='del'>-	pd.filter = pl08x_filter_id;</div><div class='del'>-#elif defined(CONFIG_S3C24XX_DMAC)</div><div class='del'>-	pd.filter = s3c24xx_dma_filter;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	s3c_set_platdata(&amp;pd, sizeof(pd), &amp;s3c64xx_device_spi0);</div><div class='ctx'> }</div><div class='hunk'>@@ -1169,14 +1141,6 @@ void __init s3c64xx_spi1_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,</div><div class='ctx'> 	pd.num_cs = num_cs;</div><div class='ctx'> 	pd.src_clk_nr = src_clk_nr;</div><div class='ctx'> 	pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi1_cfg_gpio;</div><div class='del'>-	pd.dma_tx = (void *)DMACH_SPI1_TX;</div><div class='del'>-	pd.dma_rx = (void *)DMACH_SPI1_RX;</div><div class='del'>-#if defined(CONFIG_PL330_DMA)</div><div class='del'>-	pd.filter = pl330_filter;</div><div class='del'>-#elif defined(CONFIG_S3C64XX_PL080)</div><div class='del'>-	pd.filter = pl08x_filter_id;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> 	s3c_set_platdata(&amp;pd, sizeof(pd), &amp;s3c64xx_device_spi1);</div><div class='ctx'> }</div><div class='hunk'>@@ -1213,13 +1177,6 @@ void __init s3c64xx_spi2_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,</div><div class='ctx'> 	pd.num_cs = num_cs;</div><div class='ctx'> 	pd.src_clk_nr = src_clk_nr;</div><div class='ctx'> 	pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi2_cfg_gpio;</div><div class='del'>-	pd.dma_tx = (void *)DMACH_SPI2_TX;</div><div class='del'>-	pd.dma_rx = (void *)DMACH_SPI2_RX;</div><div class='del'>-#if defined(CONFIG_PL330_DMA)</div><div class='del'>-	pd.filter = pl330_filter;</div><div class='del'>-#elif defined(CONFIG_S3C64XX_PL080)</div><div class='del'>-	pd.filter = pl08x_filter_id;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	s3c_set_platdata(&amp;pd, sizeof(pd), &amp;s3c64xx_device_spi2);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/gpio-cfg.h b/arch/arm/plat-samsung/include/plat/gpio-cfg.h<br/>index 21391faab068..e55d1f597db8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/plat-samsung/include/plat/gpio-cfg.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/plat-samsung/include/plat/gpio-cfg.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/plat-samsung/include/plat/gpio-cfg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-samsung/include/plat/gpio-cfg.h</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-typedef unsigned int __bitwise__ samsung_gpio_pull_t;</div><div class='add'>+typedef unsigned int __bitwise samsung_gpio_pull_t;</div><div class='ctx'> </div><div class='ctx'> /* forward declaration if gpio-core.h hasn't been included */</div><div class='ctx'> struct samsung_gpio_chip;</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/wakeup-mask.h b/arch/arm/plat-samsung/include/plat/wakeup-mask.h<br/>index 43e4acd2e1c6..bbfa84b0505a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/plat-samsung/include/plat/wakeup-mask.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/plat-samsung/include/plat/wakeup-mask.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/plat-samsung/include/plat/wakeup-mask.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-samsung/include/plat/wakeup-mask.h</a></div><div class='hunk'>@@ -38,7 +38,7 @@ struct samsung_wakeup_mask {</div><div class='ctx'>  * required to be correct before we enter sleep.</div><div class='ctx'>  */</div><div class='ctx'> extern void samsung_sync_wakemask(void __iomem *reg,</div><div class='del'>-				  struct samsung_wakeup_mask *masks,</div><div class='add'>+				  const struct samsung_wakeup_mask *masks,</div><div class='ctx'> 				  int nr_masks);</div><div class='ctx'> </div><div class='ctx'> #endif /* __PLAT_WAKEUP_MASK_H */</div><div class='head'>diff --git a/arch/arm/plat-samsung/wakeup-mask.c b/arch/arm/plat-samsung/wakeup-mask.c<br/>index 20c3d9117cc2..b9de6b543330 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/plat-samsung/wakeup-mask.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/plat-samsung/wakeup-mask.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/plat-samsung/wakeup-mask.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/plat-samsung/wakeup-mask.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> void samsung_sync_wakemask(void __iomem *reg,</div><div class='del'>-			   struct samsung_wakeup_mask *mask, int nr_mask)</div><div class='add'>+			   const struct samsung_wakeup_mask *mask, int nr_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct irq_data *data;</div><div class='ctx'> 	u32 val;</div><div class='head'>diff --git a/arch/arm/probes/decode.h b/arch/arm/probes/decode.h<br/>index f9b08ba7fe73..548d622a3159 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/probes/decode.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/probes/decode.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/probes/decode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/probes/decode.h</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;asm/probes.h&gt;</div><div class='add'>+#include &lt;asm/kprobes.h&gt;</div><div class='ctx'> </div><div class='ctx'> void __init arm_probes_decode_init(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/probes/kprobes/core.c b/arch/arm/probes/kprobes/core.c<br/>index a4ec240ee7ba..b6dc9d838a9a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/probes/kprobes/core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/probes/kprobes/core.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/probes/kprobes/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/probes/kprobes/core.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/stop_machine.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/opcodes.h&gt;</div><div class='head'>diff --git a/arch/arm/probes/kprobes/test-core.c b/arch/arm/probes/kprobes/test-core.c<br/>index 9775de22e2ff..c893726aa52d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/probes/kprobes/test-core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/probes/kprobes/test-core.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/probes/kprobes/test-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/probes/kprobes/test-core.c</a></div><div class='hunk'>@@ -203,6 +203,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='head'>diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile<br/>index 6e4cd1867a9f..92eb5c3b486c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/tools/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/tools/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/tools/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/Makefile</a></div><div class='hunk'>@@ -4,10 +4,76 @@</div><div class='ctx'> # Copyright (C) 2001 Russell King</div><div class='ctx'> #</div><div class='ctx'> </div><div class='add'>+gen := arch/$(ARCH)/include/generated</div><div class='add'>+kapi := $(gen)/asm</div><div class='add'>+uapi := $(gen)/uapi/asm</div><div class='add'>+syshdr := $(srctree)/$(src)/syscallhdr.sh</div><div class='add'>+sysnr := $(srctree)/$(src)/syscallnr.sh</div><div class='add'>+systbl := $(srctree)/$(src)/syscalltbl.sh</div><div class='add'>+syscall := $(srctree)/$(src)/syscall.tbl</div><div class='add'>+</div><div class='add'>+gen-y := $(gen)/calls-oabi.S</div><div class='add'>+gen-y += $(gen)/calls-eabi.S</div><div class='add'>+kapi-hdrs-y := $(kapi)/unistd-nr.h</div><div class='add'>+kapi-hdrs-y += $(kapi)/mach-types.h</div><div class='add'>+uapi-hdrs-y := $(uapi)/unistd-common.h</div><div class='add'>+uapi-hdrs-y += $(uapi)/unistd-oabi.h</div><div class='add'>+uapi-hdrs-y += $(uapi)/unistd-eabi.h</div><div class='add'>+</div><div class='add'>+targets += $(addprefix ../../../,$(gen-y) $(kapi-hdrs-y) $(uapi-hdrs-y))</div><div class='add'>+</div><div class='add'>+PHONY += kapi uapi</div><div class='add'>+</div><div class='add'>+kapi:	$(kapi-hdrs-y) $(gen-y)</div><div class='add'>+</div><div class='add'>+uapi:	$(uapi-hdrs-y)</div><div class='add'>+</div><div class='add'>+# Create output directory if not already present</div><div class='add'>+_dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') \</div><div class='add'>+          $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)')</div><div class='add'>+</div><div class='ctx'> quiet_cmd_gen_mach = GEN     $@</div><div class='ctx'>       cmd_gen_mach = mkdir -p $(dir $@) &amp;&amp; \</div><div class='ctx'> 		     $(AWK) -f $(filter-out $(PHONY),$^) &gt; $@ || \</div><div class='ctx'> 		     { rm -f $@; /bin/false; }</div><div class='ctx'> </div><div class='del'>-include/generated/mach-types.h: $(src)/gen-mach-types $(src)/mach-types FORCE</div><div class='add'>+$(kapi)/mach-types.h: $(src)/gen-mach-types $(src)/mach-types FORCE</div><div class='ctx'> 	$(call if_changed,gen_mach)</div><div class='add'>+</div><div class='add'>+quiet_cmd_syshdr = SYSHDR  $@</div><div class='add'>+      cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$&lt;' '$@' \</div><div class='add'>+		   '$(syshdr_abi_$(basetarget))' \</div><div class='add'>+		   '$(syshdr_pfx_$(basetarget))' \</div><div class='add'>+		   '__NR_SYSCALL_BASE'</div><div class='add'>+</div><div class='add'>+quiet_cmd_systbl = SYSTBL  $@</div><div class='add'>+      cmd_systbl = $(CONFIG_SHELL) '$(systbl)' '$&lt;' '$@' \</div><div class='add'>+		   '$(systbl_abi_$(basetarget))'</div><div class='add'>+</div><div class='add'>+quiet_cmd_sysnr  = SYSNR   $@</div><div class='add'>+      cmd_sysnr  = $(CONFIG_SHELL) '$(sysnr)' '$&lt;' '$@' \</div><div class='add'>+		   '$(syshdr_abi_$(basetarget))'</div><div class='add'>+</div><div class='add'>+syshdr_abi_unistd-common := common</div><div class='add'>+$(uapi)/unistd-common.h: $(syscall) $(syshdr) FORCE</div><div class='add'>+	$(call if_changed,syshdr)</div><div class='add'>+</div><div class='add'>+syshdr_abi_unistd-oabi := oabi</div><div class='add'>+$(uapi)/unistd-oabi.h: $(syscall) $(syshdr) FORCE</div><div class='add'>+	$(call if_changed,syshdr)</div><div class='add'>+</div><div class='add'>+syshdr_abi_unistd-eabi := eabi</div><div class='add'>+$(uapi)/unistd-eabi.h: $(syscall) $(syshdr) FORCE</div><div class='add'>+	$(call if_changed,syshdr)</div><div class='add'>+</div><div class='add'>+sysnr_abi_unistd-nr := common,oabi,eabi,compat</div><div class='add'>+$(kapi)/unistd-nr.h: $(syscall) $(sysnr) FORCE</div><div class='add'>+	$(call if_changed,sysnr)</div><div class='add'>+</div><div class='add'>+systbl_abi_calls-oabi := common,oabi</div><div class='add'>+$(gen)/calls-oabi.S: $(syscall) $(systbl) FORCE</div><div class='add'>+	$(call if_changed,systbl)</div><div class='add'>+</div><div class='add'>+systbl_abi_calls-eabi := common,eabi</div><div class='add'>+$(gen)/calls-eabi.S: $(syscall) $(systbl) FORCE</div><div class='add'>+	$(call if_changed,systbl)</div><div class='head'>diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types<br/>index 2ed1b8a922ed..a9313b66f770 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/tools/mach-types?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/tools/mach-types</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/tools/mach-types?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/mach-types</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> # are merged into mainline or have been edited in the machine database</div><div class='ctx'> # within the last 12 months.  References to machine_is_NAME() do not count!</div><div class='ctx'> #</div><div class='del'>-# Last update: Fri Mar 22 17:24:50 2013</div><div class='add'>+# Last update: Sun Oct 30 20:21:01 2016</div><div class='ctx'> #</div><div class='ctx'> # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number</div><div class='ctx'> #</div><div class='hunk'>@@ -152,7 +152,6 @@ colibri			MACH_COLIBRI		COLIBRI			729</div><div class='ctx'> gateway7001		MACH_GATEWAY7001	GATEWAY7001		731</div><div class='ctx'> pcm027			MACH_PCM027		PCM027			732</div><div class='ctx'> anubis			MACH_ANUBIS		ANUBIS			734</div><div class='del'>-xboardgp8		MACH_XBOARDGP8		XBOARDGP8		742</div><div class='ctx'> akita			MACH_AKITA		AKITA			744</div><div class='ctx'> e330			MACH_E330		E330			753</div><div class='ctx'> nokia770		MACH_NOKIA770		NOKIA770		755</div><div class='hunk'>@@ -393,7 +392,6 @@ anw6410			MACH_ANW6410		ANW6410			2183</div><div class='ctx'> imx27_visstrim_m10	MACH_IMX27_VISSTRIM_M10	IMX27_VISSTRIM_M10	2187</div><div class='ctx'> portuxg20		MACH_PORTUXG20		PORTUXG20		2191</div><div class='ctx'> smdkc110		MACH_SMDKC110		SMDKC110		2193</div><div class='del'>-cabespresso		MACH_CABESPRESSO	CABESPRESSO		2194</div><div class='ctx'> omap3517evm		MACH_OMAP3517EVM	OMAP3517EVM		2200</div><div class='ctx'> netspace_v2		MACH_NETSPACE_V2	NETSPACE_V2		2201</div><div class='ctx'> netspace_max_v2		MACH_NETSPACE_MAX_V2	NETSPACE_MAX_V2		2202</div><div class='hunk'>@@ -412,7 +410,6 @@ bigdisk			MACH_BIGDISK		BIGDISK			2283</div><div class='ctx'> at91sam9g20ek_2mmc	MACH_AT91SAM9G20EK_2MMC	AT91SAM9G20EK_2MMC	2288</div><div class='ctx'> bcmring			MACH_BCMRING		BCMRING			2289</div><div class='ctx'> mahimahi		MACH_MAHIMAHI		MAHIMAHI		2304</div><div class='del'>-cerebric		MACH_CEREBRIC		CEREBRIC		2311</div><div class='ctx'> smdk6442		MACH_SMDK6442		SMDK6442		2324</div><div class='ctx'> openrd_base		MACH_OPENRD_BASE	OPENRD_BASE		2325</div><div class='ctx'> devkit8000		MACH_DEVKIT8000		DEVKIT8000		2330</div><div class='hunk'>@@ -435,9 +432,7 @@ tnetv107x		MACH_TNETV107X		TNETV107X		2418</div><div class='ctx'> smdkv210		MACH_SMDKV210		SMDKV210		2456</div><div class='ctx'> omap_zoom3		MACH_OMAP_ZOOM3		OMAP_ZOOM3		2464</div><div class='ctx'> omap_3630sdp		MACH_OMAP_3630SDP	OMAP_3630SDP		2465</div><div class='del'>-cybook2440		MACH_CYBOOK2440		CYBOOK2440		2466</div><div class='ctx'> smartq7			MACH_SMARTQ7		SMARTQ7			2479</div><div class='del'>-watson_efm_plugin	MACH_WATSON_EFM_PLUGIN	WATSON_EFM_PLUGIN	2491</div><div class='ctx'> g4evm			MACH_G4EVM		G4EVM			2493</div><div class='ctx'> omapl138_hawkboard	MACH_OMAPL138_HAWKBOARD	OMAPL138_HAWKBOARD	2495</div><div class='ctx'> ts41x			MACH_TS41X		TS41X			2502</div><div class='hunk'>@@ -472,7 +467,6 @@ igep0030		MACH_IGEP0030		IGEP0030		2717</div><div class='ctx'> sbc3530			MACH_SBC3530		SBC3530			2722</div><div class='ctx'> saarb			MACH_SAARB		SAARB			2727</div><div class='ctx'> harmony			MACH_HARMONY		HARMONY			2731</div><div class='del'>-cybook_orizon		MACH_CYBOOK_ORIZON	CYBOOK_ORIZON		2733</div><div class='ctx'> msm7x30_fluid		MACH_MSM7X30_FLUID	MSM7X30_FLUID		2741</div><div class='ctx'> cm_t3517		MACH_CM_T3517		CM_T3517		2750</div><div class='ctx'> wbd222			MACH_WBD222		WBD222			2753</div><div class='hunk'>@@ -490,6 +484,7 @@ eukrea_cpuimx51		MACH_EUKREA_CPUIMX51	EUKREA_CPUIMX51		2823</div><div class='ctx'> smdkc210		MACH_SMDKC210		SMDKC210		2838</div><div class='ctx'> t5325			MACH_T5325		T5325			2846</div><div class='ctx'> income			MACH_INCOME		INCOME			2849</div><div class='add'>+meson			MACH_MESON		MESON			2853</div><div class='ctx'> goni			MACH_GONI		GONI			2862</div><div class='ctx'> bv07			MACH_BV07		BV07			2882</div><div class='ctx'> openrd_ultimate		MACH_OPENRD_ULTIMATE	OPENRD_ULTIMATE		2884</div><div class='hunk'>@@ -523,9 +518,9 @@ prima2_evb		MACH_PRIMA2_EVB		PRIMA2_EVB		3103</div><div class='ctx'> paz00			MACH_PAZ00		PAZ00			3128</div><div class='ctx'> acmenetusfoxg20		MACH_ACMENETUSFOXG20	ACMENETUSFOXG20		3129</div><div class='ctx'> ag5evm			MACH_AG5EVM		AG5EVM			3189</div><div class='del'>-ics_if_voip		MACH_ICS_IF_VOIP	ICS_IF_VOIP		3206</div><div class='ctx'> wlf_cragg_6410		MACH_WLF_CRAGG_6410	WLF_CRAGG_6410		3207</div><div class='ctx'> trimslice		MACH_TRIMSLICE		TRIMSLICE		3209</div><div class='add'>+mackerel		MACH_MACKEREL		MACKEREL		3211</div><div class='ctx'> kaen			MACH_KAEN		KAEN			3217</div><div class='ctx'> nokia_rm680		MACH_NOKIA_RM680	NOKIA_RM680		3220</div><div class='ctx'> msm8960_sim		MACH_MSM8960_SIM	MSM8960_SIM		3230</div><div class='hunk'>@@ -540,469 +535,66 @@ snowball		MACH_SNOWBALL		SNOWBALL		3363</div><div class='ctx'> xilinx_ep107		MACH_XILINX_EP107	XILINX_EP107		3378</div><div class='ctx'> nuri			MACH_NURI		NURI			3379</div><div class='ctx'> origen			MACH_ORIGEN		ORIGEN			3455</div><div class='add'>+xarina			MACH_XARINA		XARINA			3476</div><div class='ctx'> nspire			MACH_NSPIRE		NSPIRE			3503</div><div class='ctx'> nokia_rm696		MACH_NOKIA_RM696	NOKIA_RM696		3522</div><div class='del'>-mikrap_x168		MACH_MIKRAP_X168	MIKRAP_X168		3543</div><div class='del'>-deto_macarm9		MACH_DETO_MACARM9	DETO_MACARM9		3568</div><div class='ctx'> m28evk			MACH_M28EVK		M28EVK			3613</div><div class='ctx'> kota2			MACH_KOTA2		KOTA2			3616</div><div class='ctx'> bonito			MACH_BONITO		BONITO			3623</div><div class='del'>-omap3_egf		MACH_OMAP3_EGF		OMAP3_EGF		3637</div><div class='ctx'> smdk4212		MACH_SMDK4212		SMDK4212		3638</div><div class='ctx'> apx4devkit		MACH_APX4DEVKIT		APX4DEVKIT		3712</div><div class='ctx'> smdk4412		MACH_SMDK4412		SMDK4412		3765</div><div class='ctx'> marzen			MACH_MARZEN		MARZEN			3790</div><div class='del'>-krome			MACH_KROME		KROME			3797</div><div class='del'>-armadillo800eva		MACH_ARMADILLO800EVA	ARMADILLO800EVA		3863</div><div class='del'>-mx53_umobo		MACH_MX53_UMOBO		MX53_UMOBO		3927</div><div class='del'>-mt4			MACH_MT4		MT4			3981</div><div class='add'>+empc_a500		MACH_EMPC_A500		EMPC_A500		3848</div><div class='ctx'> u8520			MACH_U8520		U8520			3990</div><div class='del'>-chupacabra		MACH_CHUPACABRA		CHUPACABRA		4098</div><div class='del'>-scorpion		MACH_SCORPION		SCORPION		4099</div><div class='del'>-davinci_he_hmi10	MACH_DAVINCI_HE_HMI10	DAVINCI_HE_HMI10	4100</div><div class='del'>-topkick			MACH_TOPKICK		TOPKICK			4101</div><div class='del'>-m3_auguestrush		MACH_M3_AUGUESTRUSH	M3_AUGUESTRUSH		4102</div><div class='del'>-ipc335x			MACH_IPC335X		IPC335X			4103</div><div class='del'>-sun4i			MACH_SUN4I		SUN4I			4104</div><div class='del'>-imx233_olinuxino	MACH_IMX233_OLINUXINO	IMX233_OLINUXINO	4105</div><div class='del'>-k2_wl			MACH_K2_WL		K2_WL			4106</div><div class='del'>-k2_ul			MACH_K2_UL		K2_UL			4107</div><div class='del'>-k2_cl			MACH_K2_CL		K2_CL			4108</div><div class='del'>-minbari_w		MACH_MINBARI_W		MINBARI_W		4109</div><div class='del'>-minbari_m		MACH_MINBARI_M		MINBARI_M		4110</div><div class='del'>-k035			MACH_K035		K035			4111</div><div class='del'>-ariel			MACH_ARIEL		ARIEL			4112</div><div class='del'>-arielsaarc		MACH_ARIELSAARC		ARIELSAARC		4113</div><div class='del'>-arieldkb		MACH_ARIELDKB		ARIELDKB		4114</div><div class='del'>-armadillo810		MACH_ARMADILLO810	ARMADILLO810		4115</div><div class='del'>-tam335x			MACH_TAM335X		TAM335X			4116</div><div class='del'>-grouper			MACH_GROUPER		GROUPER			4117</div><div class='del'>-mpcsa21_9g20		MACH_MPCSA21_9G20	MPCSA21_9G20		4118</div><div class='del'>-m6u_cpu			MACH_M6U_CPU		M6U_CPU			4119</div><div class='del'>-ginkgo			MACH_GINKGO		GINKGO			4121</div><div class='del'>-cgt_qmx6		MACH_CGT_QMX6		CGT_QMX6		4122</div><div class='del'>-profpga			MACH_PROFPGA		PROFPGA			4123</div><div class='del'>-acfx100oc		MACH_ACFX100OC		ACFX100OC		4124</div><div class='del'>-acfx100nb		MACH_ACFX100NB		ACFX100NB		4125</div><div class='del'>-capricorn		MACH_CAPRICORN		CAPRICORN		4126</div><div class='del'>-pisces			MACH_PISCES		PISCES			4127</div><div class='del'>-aries			MACH_ARIES		ARIES			4128</div><div class='del'>-cancer			MACH_CANCER		CANCER			4129</div><div class='del'>-leo			MACH_LEO		LEO			4130</div><div class='del'>-virgo			MACH_VIRGO		VIRGO			4131</div><div class='del'>-sagittarius		MACH_SAGITTARIUS	SAGITTARIUS		4132</div><div class='del'>-devil			MACH_DEVIL		DEVIL			4133</div><div class='del'>-ballantines		MACH_BALLANTINES	BALLANTINES		4134</div><div class='del'>-omap3_procerusvpu	MACH_OMAP3_PROCERUSVPU	OMAP3_PROCERUSVPU	4135</div><div class='del'>-my27			MACH_MY27		MY27			4136</div><div class='del'>-sun6i			MACH_SUN6I		SUN6I			4137</div><div class='del'>-sun5i			MACH_SUN5I		SUN5I			4138</div><div class='del'>-mx512_mx		MACH_MX512_MX		MX512_MX		4139</div><div class='del'>-kzm9g			MACH_KZM9G		KZM9G			4140</div><div class='del'>-vdstbn			MACH_VDSTBN		VDSTBN			4141</div><div class='del'>-cfa10036		MACH_CFA10036		CFA10036		4142</div><div class='del'>-cfa10049		MACH_CFA10049		CFA10049		4143</div><div class='del'>-pcm051			MACH_PCM051		PCM051			4144</div><div class='del'>-vybrid_vf7xx		MACH_VYBRID_VF7XX	VYBRID_VF7XX		4145</div><div class='del'>-vybrid_vf6xx		MACH_VYBRID_VF6XX	VYBRID_VF6XX		4146</div><div class='del'>-vybrid_vf5xx		MACH_VYBRID_VF5XX	VYBRID_VF5XX		4147</div><div class='del'>-vybrid_vf4xx		MACH_VYBRID_VF4XX	VYBRID_VF4XX		4148</div><div class='del'>-aria_g25		MACH_ARIA_G25		ARIA_G25		4149</div><div class='del'>-bcm21553		MACH_BCM21553		BCM21553		4150</div><div class='del'>-smdk5410		MACH_SMDK5410		SMDK5410		4151</div><div class='del'>-lpc18xx			MACH_LPC18XX		LPC18XX			4152</div><div class='del'>-oratisparty		MACH_ORATISPARTY	ORATISPARTY		4153</div><div class='del'>-qseven			MACH_QSEVEN		QSEVEN			4154</div><div class='del'>-gmv_generic		MACH_GMV_GENERIC	GMV_GENERIC		4155</div><div class='del'>-th_link_eth		MACH_TH_LINK_ETH	TH_LINK_ETH		4156</div><div class='del'>-tn_muninn		MACH_TN_MUNINN		TN_MUNINN		4157</div><div class='del'>-rampage			MACH_RAMPAGE		RAMPAGE			4158</div><div class='del'>-visstrim_mv10		MACH_VISSTRIM_MV10	VISSTRIM_MV10		4159</div><div class='del'>-mx28_wilma		MACH_MX28_WILMA		MX28_WILMA		4164</div><div class='del'>-msm8625_ffa		MACH_MSM8625_FFA	MSM8625_FFA		4166</div><div class='del'>-vpu101			MACH_VPU101		VPU101			4167</div><div class='del'>-baileys			MACH_BAILEYS		BAILEYS			4169</div><div class='del'>-familybox		MACH_FAMILYBOX		FAMILYBOX		4170</div><div class='del'>-ensemble_mx35		MACH_ENSEMBLE_MX35	ENSEMBLE_MX35		4171</div><div class='del'>-sc_sps_1		MACH_SC_SPS_1		SC_SPS_1		4172</div><div class='del'>-ucsimply_sam9260	MACH_UCSIMPLY_SAM9260	UCSIMPLY_SAM9260	4173</div><div class='del'>-unicorn			MACH_UNICORN		UNICORN			4174</div><div class='del'>-m9g45a			MACH_M9G45A		M9G45A			4175</div><div class='del'>-mtwebif			MACH_MTWEBIF		MTWEBIF			4176</div><div class='del'>-playstone		MACH_PLAYSTONE		PLAYSTONE		4177</div><div class='del'>-chelsea			MACH_CHELSEA		CHELSEA			4178</div><div class='del'>-bayern			MACH_BAYERN		BAYERN			4179</div><div class='del'>-mitwo			MACH_MITWO		MITWO			4180</div><div class='del'>-mx25_noah		MACH_MX25_NOAH		MX25_NOAH		4181</div><div class='del'>-stm_b2020		MACH_STM_B2020		STM_B2020		4182</div><div class='del'>-annax_src		MACH_ANNAX_SRC		ANNAX_SRC		4183</div><div class='del'>-ionics_stratus		MACH_IONICS_STRATUS	IONICS_STRATUS		4184</div><div class='del'>-hugo			MACH_HUGO		HUGO			4185</div><div class='del'>-em300			MACH_EM300		EM300			4186</div><div class='del'>-mmp3_qseven		MACH_MMP3_QSEVEN	MMP3_QSEVEN		4187</div><div class='del'>-bosphorus2		MACH_BOSPHORUS2		BOSPHORUS2		4188</div><div class='del'>-tt2200			MACH_TT2200		TT2200			4189</div><div class='del'>-ocelot3			MACH_OCELOT3		OCELOT3			4190</div><div class='del'>-tek_cobra		MACH_TEK_COBRA		TEK_COBRA		4191</div><div class='del'>-protou			MACH_PROTOU		PROTOU			4192</div><div class='del'>-msm8625_evt		MACH_MSM8625_EVT	MSM8625_EVT		4193</div><div class='del'>-mx53_sellwood		MACH_MX53_SELLWOOD	MX53_SELLWOOD		4194</div><div class='del'>-somiq_am35		MACH_SOMIQ_AM35		SOMIQ_AM35		4195</div><div class='del'>-somiq_am37		MACH_SOMIQ_AM37		SOMIQ_AM37		4196</div><div class='del'>-k2_plc_cl		MACH_K2_PLC_CL		K2_PLC_CL		4197</div><div class='del'>-tc2			MACH_TC2		TC2			4198</div><div class='del'>-dulex_j			MACH_DULEX_J		DULEX_J			4199</div><div class='del'>-stm_b2044		MACH_STM_B2044		STM_B2044		4200</div><div class='del'>-deluxe_j		MACH_DELUXE_J		DELUXE_J		4201</div><div class='del'>-mango2443		MACH_MANGO2443		MANGO2443		4202</div><div class='del'>-cp2dcg			MACH_CP2DCG		CP2DCG			4203</div><div class='del'>-cp2dtg			MACH_CP2DTG		CP2DTG			4204</div><div class='del'>-cp2dug			MACH_CP2DUG		CP2DUG			4205</div><div class='del'>-var_som_am33		MACH_VAR_SOM_AM33	VAR_SOM_AM33		4206</div><div class='del'>-pepper			MACH_PEPPER		PEPPER			4207</div><div class='del'>-mango2450		MACH_MANGO2450		MANGO2450		4208</div><div class='del'>-valente_wx_c9		MACH_VALENTE_WX_C9	VALENTE_WX_C9		4209</div><div class='del'>-minitv			MACH_MINITV		MINITV			4210</div><div class='del'>-u8540			MACH_U8540		U8540			4211</div><div class='del'>-iv_atlas_i_z7e		MACH_IV_ATLAS_I_Z7E	IV_ATLAS_I_Z7E		4212</div><div class='del'>-mach_type_sky		MACH_MACH_TYPE_SKY	MACH_TYPE_SKY		4214</div><div class='del'>-bluesky			MACH_BLUESKY		BLUESKY			4215</div><div class='del'>-ngrouter		MACH_NGROUTER		NGROUTER		4216</div><div class='del'>-mx53_denetim		MACH_MX53_DENETIM	MX53_DENETIM		4217</div><div class='del'>-opal			MACH_OPAL		OPAL			4218</div><div class='del'>-gnet_us3gref		MACH_GNET_US3GREF	GNET_US3GREF		4219</div><div class='del'>-gnet_nc3g		MACH_GNET_NC3G		GNET_NC3G		4220</div><div class='del'>-gnet_ge3g		MACH_GNET_GE3G		GNET_GE3G		4221</div><div class='del'>-adp2			MACH_ADP2		ADP2			4222</div><div class='del'>-tqma28			MACH_TQMA28		TQMA28			4223</div><div class='del'>-kacom3			MACH_KACOM3		KACOM3			4224</div><div class='del'>-rrhdemo			MACH_RRHDEMO		RRHDEMO			4225</div><div class='del'>-protodug		MACH_PROTODUG		PROTODUG		4226</div><div class='del'>-lago			MACH_LAGO		LAGO			4227</div><div class='del'>-ktt30			MACH_KTT30		KTT30			4228</div><div class='del'>-ts43xx			MACH_TS43XX		TS43XX			4229</div><div class='del'>-mx6q_denso		MACH_MX6Q_DENSO		MX6Q_DENSO		4230</div><div class='del'>-comsat_gsmumts8		MACH_COMSAT_GSMUMTS8	COMSAT_GSMUMTS8		4231</div><div class='del'>-dreamx			MACH_DREAMX		DREAMX			4232</div><div class='del'>-thunderstonem		MACH_THUNDERSTONEM	THUNDERSTONEM		4233</div><div class='del'>-yoyopad			MACH_YOYOPAD		YOYOPAD			4234</div><div class='del'>-yoyopatient		MACH_YOYOPATIENT	YOYOPATIENT		4235</div><div class='del'>-a10l			MACH_A10L		A10L			4236</div><div class='del'>-mq60			MACH_MQ60		MQ60			4237</div><div class='del'>-linkstation_lsql	MACH_LINKSTATION_LSQL	LINKSTATION_LSQL	4238</div><div class='del'>-am3703gateway		MACH_AM3703GATEWAY	AM3703GATEWAY		4239</div><div class='del'>-accipiter		MACH_ACCIPITER		ACCIPITER		4240</div><div class='del'>-magnidug		MACH_MAGNIDUG		MAGNIDUG		4242</div><div class='del'>-hydra			MACH_HYDRA		HYDRA			4243</div><div class='del'>-sun3i			MACH_SUN3I		SUN3I			4244</div><div class='del'>-stm_b2078		MACH_STM_B2078		STM_B2078		4245</div><div class='del'>-at91sam9263deskv2	MACH_AT91SAM9263DESKV2	AT91SAM9263DESKV2	4246</div><div class='del'>-deluxe_r		MACH_DELUXE_R		DELUXE_R		4247</div><div class='del'>-p_98_v			MACH_P_98_V		P_98_V			4248</div><div class='del'>-p_98_c			MACH_P_98_C		P_98_C			4249</div><div class='del'>-davinci_am18xx_omn	MACH_DAVINCI_AM18XX_OMN	DAVINCI_AM18XX_OMN	4250</div><div class='del'>-socfpga_cyclone5	MACH_SOCFPGA_CYCLONE5	SOCFPGA_CYCLONE5	4251</div><div class='del'>-cabatuin		MACH_CABATUIN		CABATUIN		4252</div><div class='del'>-yoyopad_ft		MACH_YOYOPAD_FT		YOYOPAD_FT		4253</div><div class='del'>-dan2400evb		MACH_DAN2400EVB		DAN2400EVB		4254</div><div class='del'>-dan3400evb		MACH_DAN3400EVB		DAN3400EVB		4255</div><div class='del'>-edm_sf_imx6		MACH_EDM_SF_IMX6	EDM_SF_IMX6		4256</div><div class='del'>-edm_cf_imx6		MACH_EDM_CF_IMX6	EDM_CF_IMX6		4257</div><div class='del'>-vpos3xx			MACH_VPOS3XX		VPOS3XX			4258</div><div class='del'>-vulcano_9x5		MACH_VULCANO_9X5	VULCANO_9X5		4259</div><div class='del'>-spmp8000		MACH_SPMP8000		SPMP8000		4260</div><div class='del'>-catalina		MACH_CATALINA		CATALINA		4261</div><div class='del'>-rd88f5181l_fe		MACH_RD88F5181L_FE	RD88F5181L_FE		4262</div><div class='del'>-mx535_mx		MACH_MX535_MX		MX535_MX		4263</div><div class='del'>-armadillo840		MACH_ARMADILLO840	ARMADILLO840		4264</div><div class='del'>-spc9000baseboard	MACH_SPC9000BASEBOARD	SPC9000BASEBOARD	4265</div><div class='del'>-iris			MACH_IRIS		IRIS			4266</div><div class='del'>-protodcg		MACH_PROTODCG		PROTODCG		4267</div><div class='del'>-palmtree		MACH_PALMTREE		PALMTREE		4268</div><div class='del'>-novena			MACH_NOVENA		NOVENA			4269</div><div class='del'>-ma_um			MACH_MA_UM		MA_UM			4270</div><div class='del'>-ma_am			MACH_MA_AM		MA_AM			4271</div><div class='del'>-ems348			MACH_EMS348		EMS348			4272</div><div class='del'>-cm_fx6			MACH_CM_FX6		CM_FX6			4273</div><div class='del'>-arndale			MACH_ARNDALE		ARNDALE			4274</div><div class='del'>-q5xr5			MACH_Q5XR5		Q5XR5			4275</div><div class='del'>-willow			MACH_WILLOW		WILLOW			4276</div><div class='del'>-omap3621_odyv3		MACH_OMAP3621_ODYV3	OMAP3621_ODYV3		4277</div><div class='del'>-omapl138_presonus	MACH_OMAPL138_PRESONUS	OMAPL138_PRESONUS	4278</div><div class='del'>-dvf99			MACH_DVF99		DVF99			4279</div><div class='del'>-impression_j		MACH_IMPRESSION_J	IMPRESSION_J		4280</div><div class='del'>-qblissa9		MACH_QBLISSA9		QBLISSA9		4281</div><div class='del'>-robin_heliview10	MACH_ROBIN_HELIVIEW10	ROBIN_HELIVIEW10	4282</div><div class='del'>-sun7i			MACH_SUN7I		SUN7I			4283</div><div class='del'>-mx6q_hdmidongle		MACH_MX6Q_HDMIDONGLE	MX6Q_HDMIDONGLE		4284</div><div class='del'>-mx6_sid2		MACH_MX6_SID2		MX6_SID2		4285</div><div class='del'>-helios_v3		MACH_HELIOS_V3		HELIOS_V3		4286</div><div class='del'>-helios_v4		MACH_HELIOS_V4		HELIOS_V4		4287</div><div class='del'>-q7_imx6			MACH_Q7_IMX6		Q7_IMX6			4288</div><div class='del'>-odroidx			MACH_ODROIDX		ODROIDX			4289</div><div class='del'>-robpro			MACH_ROBPRO		ROBPRO			4290</div><div class='del'>-research59if_mk1	MACH_RESEARCH59IF_MK1	RESEARCH59IF_MK1	4291</div><div class='del'>-bobsleigh		MACH_BOBSLEIGH		BOBSLEIGH		4292</div><div class='del'>-dcshgwt3		MACH_DCSHGWT3		DCSHGWT3		4293</div><div class='del'>-gld1018			MACH_GLD1018		GLD1018			4294</div><div class='del'>-ev10			MACH_EV10		EV10			4295</div><div class='del'>-nitrogen6x		MACH_NITROGEN6X		NITROGEN6X		4296</div><div class='del'>-p_107_bb		MACH_P_107_BB		P_107_BB		4297</div><div class='del'>-evita_utl		MACH_EVITA_UTL		EVITA_UTL		4298</div><div class='del'>-falconwing		MACH_FALCONWING		FALCONWING		4299</div><div class='del'>-dct3			MACH_DCT3		DCT3			4300</div><div class='del'>-cpx2e_cell		MACH_CPX2E_CELL		CPX2E_CELL		4301</div><div class='del'>-amiro			MACH_AMIRO		AMIRO			4302</div><div class='del'>-mx6q_brassboard		MACH_MX6Q_BRASSBOARD	MX6Q_BRASSBOARD		4303</div><div class='del'>-dalmore			MACH_DALMORE		DALMORE			4304</div><div class='del'>-omap3_portal7cp		MACH_OMAP3_PORTAL7CP	OMAP3_PORTAL7CP		4305</div><div class='del'>-tegra_pluto		MACH_TEGRA_PLUTO	TEGRA_PLUTO		4306</div><div class='del'>-mx6sl_evk		MACH_MX6SL_EVK		MX6SL_EVK		4307</div><div class='del'>-m7			MACH_M7			M7			4308</div><div class='del'>-pxm2			MACH_PXM2		PXM2			4309</div><div class='del'>-haba_knx_lite		MACH_HABA_KNX_LITE	HABA_KNX_LITE		4310</div><div class='del'>-tai			MACH_TAI		TAI			4311</div><div class='del'>-prototd			MACH_PROTOTD		PROTOTD			4312</div><div class='del'>-dst_tonto		MACH_DST_TONTO		DST_TONTO		4313</div><div class='del'>-draco			MACH_DRACO		DRACO			4314</div><div class='del'>-dxr2			MACH_DXR2		DXR2			4315</div><div class='del'>-rut			MACH_RUT		RUT			4316</div><div class='del'>-am180x_wsc		MACH_AM180X_WSC		AM180X_WSC		4317</div><div class='del'>-deluxe_u		MACH_DELUXE_U		DELUXE_U		4318</div><div class='del'>-deluxe_ul		MACH_DELUXE_UL		DELUXE_UL		4319</div><div class='del'>-at91sam9260medths	MACH_AT91SAM9260MEDTHS	AT91SAM9260MEDTHS	4320</div><div class='del'>-matrix516		MACH_MATRIX516		MATRIX516		4321</div><div class='del'>-vid401x			MACH_VID401X		VID401X			4322</div><div class='del'>-helios_v5		MACH_HELIOS_V5		HELIOS_V5		4323</div><div class='del'>-playpaq2		MACH_PLAYPAQ2		PLAYPAQ2		4324</div><div class='del'>-igam			MACH_IGAM		IGAM			4325</div><div class='del'>-amico_i			MACH_AMICO_I		AMICO_I			4326</div><div class='del'>-amico_e			MACH_AMICO_E		AMICO_E			4327</div><div class='del'>-sentient_mm3_ck		MACH_SENTIENT_MM3_CK	SENTIENT_MM3_CK		4328</div><div class='del'>-smx6			MACH_SMX6		SMX6			4329</div><div class='del'>-pango			MACH_PANGO		PANGO			4330</div><div class='del'>-ns115_stick		MACH_NS115_STICK	NS115_STICK		4331</div><div class='del'>-bctrm3			MACH_BCTRM3		BCTRM3			4332</div><div class='del'>-doctorws		MACH_DOCTORWS		DOCTORWS		4333</div><div class='del'>-m2601			MACH_M2601		M2601			4334</div><div class='del'>-vgg1111			MACH_VGG1111		VGG1111			4337</div><div class='del'>-countach		MACH_COUNTACH		COUNTACH		4338</div><div class='del'>-visstrim_sm20		MACH_VISSTRIM_SM20	VISSTRIM_SM20		4339</div><div class='del'>-a639			MACH_A639		A639			4340</div><div class='del'>-spacemonkey		MACH_SPACEMONKEY	SPACEMONKEY		4341</div><div class='del'>-zpdu_stamp		MACH_ZPDU_STAMP		ZPDU_STAMP		4342</div><div class='del'>-htc_g7_clone		MACH_HTC_G7_CLONE	HTC_G7_CLONE		4343</div><div class='del'>-ft2080_corvus		MACH_FT2080_CORVUS	FT2080_CORVUS		4344</div><div class='del'>-fisland			MACH_FISLAND		FISLAND			4345</div><div class='del'>-zpdu			MACH_ZPDU		ZPDU			4346</div><div class='ctx'> urt			MACH_URT		URT			4347</div><div class='del'>-conti_ovip		MACH_CONTI_OVIP		CONTI_OVIP		4348</div><div class='del'>-omapl138_nagra		MACH_OMAPL138_NAGRA	OMAPL138_NAGRA		4349</div><div class='del'>-da850_at3kp1		MACH_DA850_AT3KP1	DA850_AT3KP1		4350</div><div class='del'>-da850_at3kp2		MACH_DA850_AT3KP2	DA850_AT3KP2		4351</div><div class='del'>-surma			MACH_SURMA		SURMA			4352</div><div class='del'>-stm_b2092		MACH_STM_B2092		STM_B2092		4353</div><div class='del'>-mx535_ycr		MACH_MX535_YCR		MX535_YCR		4354</div><div class='del'>-m7_wl			MACH_M7_WL		M7_WL			4355</div><div class='del'>-m7_u			MACH_M7_U		M7_U			4356</div><div class='del'>-omap3_stndt_evm		MACH_OMAP3_STNDT_EVM	OMAP3_STNDT_EVM		4357</div><div class='del'>-m7_wlv			MACH_M7_WLV		M7_WLV			4358</div><div class='del'>-xam3517			MACH_XAM3517		XAM3517			4359</div><div class='del'>-a220			MACH_A220		A220			4360</div><div class='del'>-aclima_odie		MACH_ACLIMA_ODIE	ACLIMA_ODIE		4361</div><div class='del'>-vibble			MACH_VIBBLE		VIBBLE			4362</div><div class='del'>-k2_u			MACH_K2_U		K2_U			4363</div><div class='del'>-mx53_egf		MACH_MX53_EGF		MX53_EGF		4364</div><div class='del'>-novpek_imx53		MACH_NOVPEK_IMX53	NOVPEK_IMX53		4365</div><div class='del'>-novpek_imx6x		MACH_NOVPEK_IMX6X	NOVPEK_IMX6X		4366</div><div class='del'>-mx25_smartbox		MACH_MX25_SMARTBOX	MX25_SMARTBOX		4367</div><div class='del'>-eicg6410		MACH_EICG6410		EICG6410		4368</div><div class='del'>-picasso_e3		MACH_PICASSO_E3		PICASSO_E3		4369</div><div class='del'>-motonavigator		MACH_MOTONAVIGATOR	MOTONAVIGATOR		4370</div><div class='del'>-varioconnect2		MACH_VARIOCONNECT2	VARIOCONNECT2		4371</div><div class='del'>-deluxe_tw		MACH_DELUXE_TW		DELUXE_TW		4372</div><div class='del'>-kore3			MACH_KORE3		KORE3			4374</div><div class='del'>-mx6s_drs		MACH_MX6S_DRS		MX6S_DRS		4375</div><div class='del'>-cmimx6			MACH_CMIMX6		CMIMX6			4376</div><div class='del'>-roth			MACH_ROTH		ROTH			4377</div><div class='del'>-eq4ux			MACH_EQ4UX		EQ4UX			4378</div><div class='del'>-x1plus			MACH_X1PLUS		X1PLUS			4379</div><div class='del'>-modimx27		MACH_MODIMX27		MODIMX27		4380</div><div class='del'>-videon_hduac		MACH_VIDEON_HDUAC	VIDEON_HDUAC		4381</div><div class='del'>-blackbird		MACH_BLACKBIRD		BLACKBIRD		4382</div><div class='del'>-runmaster		MACH_RUNMASTER		RUNMASTER		4383</div><div class='del'>-ceres			MACH_CERES		CERES			4384</div><div class='del'>-nad435			MACH_NAD435		NAD435			4385</div><div class='del'>-ns115_proto_type	MACH_NS115_PROTO_TYPE	NS115_PROTO_TYPE	4386</div><div class='del'>-fs20_vcc		MACH_FS20_VCC		FS20_VCC		4387</div><div class='del'>-meson6tv_skt		MACH_MESON6TV_SKT	MESON6TV_SKT		4389</div><div class='ctx'> keystone		MACH_KEYSTONE		KEYSTONE		4390</div><div class='del'>-pcm052			MACH_PCM052		PCM052			4391</div><div class='del'>-qrd_skud_prime		MACH_QRD_SKUD_PRIME	QRD_SKUD_PRIME		4393</div><div class='del'>-guf_santaro		MACH_GUF_SANTARO	GUF_SANTARO		4395</div><div class='del'>-sheepshead		MACH_SHEEPSHEAD		SHEEPSHEAD		4396</div><div class='del'>-mx6_iwg15m_mxm		MACH_MX6_IWG15M_MXM	MX6_IWG15M_MXM		4397</div><div class='del'>-mx6_iwg15m_q7		MACH_MX6_IWG15M_Q7	MX6_IWG15M_Q7		4398</div><div class='del'>-at91sam9263if8mic	MACH_AT91SAM9263IF8MIC	AT91SAM9263IF8MIC	4399</div><div class='del'>-marcopolo		MACH_MARCOPOLO		MARCOPOLO		4401</div><div class='del'>-mx535_sdcr		MACH_MX535_SDCR		MX535_SDCR		4402</div><div class='del'>-mx53_csb2733		MACH_MX53_CSB2733	MX53_CSB2733		4403</div><div class='del'>-diva			MACH_DIVA		DIVA			4404</div><div class='del'>-ncr_7744		MACH_NCR_7744		NCR_7744		4405</div><div class='del'>-macallan		MACH_MACALLAN		MACALLAN		4406</div><div class='del'>-wnr3500			MACH_WNR3500		WNR3500			4407</div><div class='del'>-pgavrf			MACH_PGAVRF		PGAVRF			4408</div><div class='del'>-helios_v6		MACH_HELIOS_V6		HELIOS_V6		4409</div><div class='del'>-lcct			MACH_LCCT		LCCT			4410</div><div class='del'>-csndug			MACH_CSNDUG		CSNDUG			4411</div><div class='del'>-wandboard_imx6		MACH_WANDBOARD_IMX6	WANDBOARD_IMX6		4412</div><div class='del'>-omap4_jet		MACH_OMAP4_JET		OMAP4_JET		4413</div><div class='del'>-tegra_roth		MACH_TEGRA_ROTH		TEGRA_ROTH		4414</div><div class='del'>-m7dcg			MACH_M7DCG		M7DCG			4415</div><div class='del'>-m7dug			MACH_M7DUG		M7DUG			4416</div><div class='del'>-m7dtg			MACH_M7DTG		M7DTG			4417</div><div class='del'>-ap42x			MACH_AP42X		AP42X			4418</div><div class='del'>-var_som_mx6		MACH_VAR_SOM_MX6	VAR_SOM_MX6		4419</div><div class='del'>-pdlu			MACH_PDLU		PDLU			4420</div><div class='del'>-hydrogen		MACH_HYDROGEN		HYDROGEN		4421</div><div class='del'>-npa211e			MACH_NPA211E		NPA211E			4422</div><div class='del'>-arcadia			MACH_ARCADIA		ARCADIA			4423</div><div class='del'>-arcadia_l		MACH_ARCADIA_L		ARCADIA_L		4424</div><div class='del'>-msm8930dt		MACH_MSM8930DT		MSM8930DT		4425</div><div class='del'>-ktam3874		MACH_KTAM3874		KTAM3874		4426</div><div class='del'>-cec4			MACH_CEC4		CEC4			4427</div><div class='del'>-ape6evm			MACH_APE6EVM		APE6EVM			4428</div><div class='del'>-tx6			MACH_TX6		TX6			4429</div><div class='del'>-cfa10037		MACH_CFA10037		CFA10037		4431</div><div class='del'>-ezp1000			MACH_EZP1000		EZP1000			4433</div><div class='del'>-wgr826v			MACH_WGR826V		WGR826V			4434</div><div class='del'>-exuma			MACH_EXUMA		EXUMA			4435</div><div class='del'>-fregate			MACH_FREGATE		FREGATE			4436</div><div class='del'>-osirisimx508		MACH_OSIRISIMX508	OSIRISIMX508		4437</div><div class='del'>-st_exigo		MACH_ST_EXIGO		ST_EXIGO		4438</div><div class='del'>-pismo			MACH_PISMO		PISMO			4439</div><div class='del'>-atc7			MACH_ATC7		ATC7			4440</div><div class='del'>-nspireclp		MACH_NSPIRECLP		NSPIRECLP		4441</div><div class='del'>-nspiretp		MACH_NSPIRETP		NSPIRETP		4442</div><div class='del'>-nspirecx		MACH_NSPIRECX		NSPIRECX		4443</div><div class='del'>-maya			MACH_MAYA		MAYA			4444</div><div class='del'>-wecct			MACH_WECCT		WECCT			4445</div><div class='del'>-m2s			MACH_M2S		M2S			4446</div><div class='del'>-msm8625q_evbd		MACH_MSM8625Q_EVBD	MSM8625Q_EVBD		4447</div><div class='del'>-tiny210			MACH_TINY210		TINY210			4448</div><div class='del'>-g3			MACH_G3			G3			4449</div><div class='del'>-hurricane		MACH_HURRICANE		HURRICANE		4450</div><div class='del'>-mx6_pod			MACH_MX6_POD		MX6_POD			4451</div><div class='del'>-elondcn			MACH_ELONDCN		ELONDCN			4452</div><div class='del'>-cwmx535			MACH_CWMX535		CWMX535			4453</div><div class='del'>-m7_wlj			MACH_M7_WLJ		M7_WLJ			4454</div><div class='del'>-qsp_arm			MACH_QSP_ARM		QSP_ARM			4455</div><div class='del'>-msm8625q_skud		MACH_MSM8625Q_SKUD	MSM8625Q_SKUD		4456</div><div class='del'>-htcmondrian		MACH_HTCMONDRIAN	HTCMONDRIAN		4457</div><div class='del'>-watson_ead		MACH_WATSON_EAD		WATSON_EAD		4458</div><div class='del'>-mitwoa			MACH_MITWOA		MITWOA			4459</div><div class='del'>-omap3_wolverine		MACH_OMAP3_WOLVERINE	OMAP3_WOLVERINE		4460</div><div class='del'>-mapletree		MACH_MAPLETREE		MAPLETREE		4461</div><div class='del'>-msm8625_fih_sae		MACH_MSM8625_FIH_SAE	MSM8625_FIH_SAE		4462</div><div class='del'>-epc35			MACH_EPC35		EPC35			4463</div><div class='del'>-smartrtu		MACH_SMARTRTU		SMARTRTU		4464</div><div class='del'>-rcm101			MACH_RCM101		RCM101			4465</div><div class='del'>-amx_imx53_mxx		MACH_AMX_IMX53_MXX	AMX_IMX53_MXX		4466</div><div class='del'>-acer_a12		MACH_ACER_A12		ACER_A12		4470</div><div class='del'>-sbc6x			MACH_SBC6X		SBC6X			4471</div><div class='del'>-u2			MACH_U2			U2			4472</div><div class='del'>-smdk4270		MACH_SMDK4270		SMDK4270		4473</div><div class='del'>-priscillag		MACH_PRISCILLAG		PRISCILLAG		4474</div><div class='del'>-priscillac		MACH_PRISCILLAC		PRISCILLAC		4475</div><div class='del'>-priscilla		MACH_PRISCILLA		PRISCILLA		4476</div><div class='del'>-innova_shpu_v2		MACH_INNOVA_SHPU_V2	INNOVA_SHPU_V2		4477</div><div class='del'>-mach_type_dep2410	MACH_MACH_TYPE_DEP2410	MACH_TYPE_DEP2410	4479</div><div class='del'>-bctre3			MACH_BCTRE3		BCTRE3			4480</div><div class='del'>-omap_m100		MACH_OMAP_M100		OMAP_M100		4481</div><div class='del'>-flo			MACH_FLO		FLO			4482</div><div class='del'>-nanobone		MACH_NANOBONE		NANOBONE		4483</div><div class='del'>-stm_b2105		MACH_STM_B2105		STM_B2105		4484</div><div class='del'>-omap4_bsc_bap_v3	MACH_OMAP4_BSC_BAP_V3	OMAP4_BSC_BAP_V3	4485</div><div class='del'>-ss1pam			MACH_SS1PAM		SS1PAM			4486</div><div class='del'>-primominiu		MACH_PRIMOMINIU		PRIMOMINIU		4488</div><div class='del'>-mrt_35hd_dualnas_e	MACH_MRT_35HD_DUALNAS_E	MRT_35HD_DUALNAS_E	4489</div><div class='del'>-kiwi			MACH_KIWI		KIWI			4490</div><div class='del'>-hw90496			MACH_HW90496		HW90496			4491</div><div class='del'>-mep2440			MACH_MEP2440		MEP2440			4492</div><div class='del'>-colibri_t30		MACH_COLIBRI_T30	COLIBRI_T30		4493</div><div class='del'>-cwv1			MACH_CWV1		CWV1			4494</div><div class='del'>-nsa325			MACH_NSA325		NSA325			4495</div><div class='del'>-dpxmtc			MACH_DPXMTC		DPXMTC			4497</div><div class='del'>-tt_stuttgart		MACH_TT_STUTTGART	TT_STUTTGART		4498</div><div class='del'>-miranda_apcii		MACH_MIRANDA_APCII	MIRANDA_APCII		4499</div><div class='del'>-mx6q_moderox		MACH_MX6Q_MODEROX	MX6Q_MODEROX		4500</div><div class='del'>-mudskipper		MACH_MUDSKIPPER		MUDSKIPPER		4501</div><div class='del'>-urania			MACH_URANIA		URANIA			4502</div><div class='del'>-stm_b2112		MACH_STM_B2112		STM_B2112		4503</div><div class='del'>-mx6q_ats_phoenix	MACH_MX6Q_ATS_PHOENIX	MX6Q_ATS_PHOENIX	4505</div><div class='del'>-stm_b2116		MACH_STM_B2116		STM_B2116		4506</div><div class='del'>-mythology		MACH_MYTHOLOGY		MYTHOLOGY		4507</div><div class='del'>-fc360v1			MACH_FC360V1		FC360V1			4508</div><div class='del'>-gps_sensor		MACH_GPS_SENSOR		GPS_SENSOR		4509</div><div class='del'>-gazelle			MACH_GAZELLE		GAZELLE			4510</div><div class='del'>-mpq8064_dma		MACH_MPQ8064_DMA	MPQ8064_DMA		4511</div><div class='del'>-wems_asd01		MACH_WEMS_ASD01		WEMS_ASD01		4512</div><div class='del'>-apalis_t30		MACH_APALIS_T30		APALIS_T30		4513</div><div class='del'>-armstonea9		MACH_ARMSTONEA9		ARMSTONEA9		4515</div><div class='del'>-omap_blazetablet	MACH_OMAP_BLAZETABLET	OMAP_BLAZETABLET	4516</div><div class='del'>-ar6mxq			MACH_AR6MXQ		AR6MXQ			4517</div><div class='del'>-ar6mxs			MACH_AR6MXS		AR6MXS			4518</div><div class='del'>-gwventana		MACH_GWVENTANA		GWVENTANA		4520</div><div class='del'>-igep0033		MACH_IGEP0033		IGEP0033		4521</div><div class='del'>-h52c1_concerto		MACH_H52C1_CONCERTO	H52C1_CONCERTO		4524</div><div class='del'>-fcmbrd			MACH_FCMBRD		FCMBRD			4525</div><div class='del'>-pcaaxs1			MACH_PCAAXS1		PCAAXS1			4526</div><div class='del'>-ls_orca			MACH_LS_ORCA		LS_ORCA			4527</div><div class='del'>-pcm051lb		MACH_PCM051LB		PCM051LB		4528</div><div class='del'>-mx6s_lp507_gvci		MACH_MX6S_LP507_GVCI	MX6S_LP507_GVCI		4529</div><div class='del'>-dido			MACH_DIDO		DIDO			4530</div><div class='del'>-swarco_itc3_9g20	MACH_SWARCO_ITC3_9G20	SWARCO_ITC3_9G20	4531</div><div class='del'>-robo_roady		MACH_ROBO_ROADY		ROBO_ROADY		4532</div><div class='del'>-rskrza1			MACH_RSKRZA1		RSKRZA1			4533</div><div class='del'>-swarco_sid		MACH_SWARCO_SID		SWARCO_SID		4534</div><div class='del'>-mx6_iwg15s_sbc		MACH_MX6_IWG15S_SBC	MX6_IWG15S_SBC		4535</div><div class='del'>-mx6q_camaro		MACH_MX6Q_CAMARO	MX6Q_CAMARO		4536</div><div class='del'>-hb6mxs			MACH_HB6MXS		HB6MXS			4537</div><div class='del'>-lager			MACH_LAGER		LAGER			4538</div><div class='del'>-lp8x4x			MACH_LP8X4X		LP8X4X			4539</div><div class='del'>-tegratab7		MACH_TEGRATAB7		TEGRATAB7		4540</div><div class='del'>-andromeda		MACH_ANDROMEDA		ANDROMEDA		4541</div><div class='del'>-bootes			MACH_BOOTES		BOOTES			4542</div><div class='del'>-nethmi			MACH_NETHMI		NETHMI			4543</div><div class='del'>-tegratab		MACH_TEGRATAB		TEGRATAB		4544</div><div class='del'>-som5_evb		MACH_SOM5_EVB		SOM5_EVB		4545</div><div class='del'>-venaticorum		MACH_VENATICORUM	VENATICORUM		4546</div><div class='del'>-stm_b2110		MACH_STM_B2110		STM_B2110		4547</div><div class='del'>-elux_hathor		MACH_ELUX_HATHOR	ELUX_HATHOR		4548</div><div class='del'>-helios_v7		MACH_HELIOS_V7		HELIOS_V7		4549</div><div class='del'>-xc10v1			MACH_XC10V1		XC10V1			4550</div><div class='del'>-cp2u			MACH_CP2U		CP2U			4551</div><div class='del'>-iap_f			MACH_IAP_F		IAP_F			4552</div><div class='del'>-iap_g			MACH_IAP_G		IAP_G			4553</div><div class='del'>-aae			MACH_AAE		AAE			4554</div><div class='del'>-pegasus			MACH_PEGASUS		PEGASUS			4555</div><div class='del'>-cygnus			MACH_CYGNUS		CYGNUS			4556</div><div class='del'>-centaurus		MACH_CENTAURUS		CENTAURUS		4557</div><div class='del'>-msm8930_qrd8930		MACH_MSM8930_QRD8930	MSM8930_QRD8930		4558</div><div class='del'>-quby_tim		MACH_QUBY_TIM		QUBY_TIM		4559</div><div class='del'>-zedi3250a		MACH_ZEDI3250A		ZEDI3250A		4560</div><div class='del'>-grus			MACH_GRUS		GRUS			4561</div><div class='del'>-apollo3			MACH_APOLLO3		APOLLO3			4562</div><div class='del'>-cowon_r7		MACH_COWON_R7		COWON_R7		4563</div><div class='del'>-tonga3			MACH_TONGA3		TONGA3			4564</div><div class='del'>-p535			MACH_P535		P535			4565</div><div class='del'>-sa3874i			MACH_SA3874I		SA3874I			4566</div><div class='del'>-mx6_navico_com		MACH_MX6_NAVICO_COM	MX6_NAVICO_COM		4567</div><div class='del'>-proxmobil2		MACH_PROXMOBIL2		PROXMOBIL2		4568</div><div class='del'>-ubinux1			MACH_UBINUX1		UBINUX1			4569</div><div class='del'>-istos			MACH_ISTOS		ISTOS			4570</div><div class='del'>-benvolio4		MACH_BENVOLIO4		BENVOLIO4		4571</div><div class='del'>-eco5_bx2		MACH_ECO5_BX2		ECO5_BX2		4572</div><div class='del'>-eukrea_cpuimx28sd	MACH_EUKREA_CPUIMX28SD	EUKREA_CPUIMX28SD	4573</div><div class='del'>-domotab			MACH_DOMOTAB		DOMOTAB			4574</div><div class='del'>-pfla03			MACH_PFLA03		PFLA03			4575</div><div class='add'>+ckb_rza1h		MACH_CKB_RZA1H		CKB_RZA1H		4780</div><div class='add'>+bcm2835			MACH_BCM2835		BCM2835			4828</div><div class='add'>+cm_3g			MACH_CM_3G		CM_3G			4943</div><div class='add'>+empc_aimx6		MACH_EMPC_AIMX6		EMPC_AIMX6		4958</div><div class='add'>+diyefis6410		MACH_DIYEFIS6410	DIYEFIS6410		5063</div><div class='add'>+mx53_turing		MACH_MX53_TURING	MX53_TURING		5064</div><div class='add'>+mx6dl_turing		MACH_MX6DL_TURING	MX6DL_TURING		5066</div><div class='add'>+mx53_indash		MACH_MX53_INDASH	MX53_INDASH		5067</div><div class='add'>+mx6q_indash		MACH_MX6Q_INDASH	MX6Q_INDASH		5068</div><div class='add'>+mx6dl_indash		MACH_MX6DL_INDASH	MX6DL_INDASH		5069</div><div class='add'>+rts_g6			MACH_RTS_G6		RTS_G6			5070</div><div class='add'>+ka_titan		MACH_KA_TITAN		KA_TITAN		5071</div><div class='add'>+cl_som_imx7		MACH_CL_SOM_IMX7	CL_SOM_IMX7		5072</div><div class='add'>+vvdn_mgsi_vsis		MACH_VVDN_MGSI_VSIS	VVDN_MGSI_VSIS		5073</div><div class='add'>+mx6q_nano		MACH_MX6Q_NANO		MX6Q_NANO		5074</div><div class='add'>+pdu001			MACH_PDU001		PDU001			5075</div><div class='add'>+cab_proyk		MACH_CAB_PROYK		CAB_PROYK		5076</div><div class='add'>+klin			MACH_KLIN		KLIN			5077</div><div class='add'>+enman_steuerbox		MACH_ENMAN_STEUERBOX	ENMAN_STEUERBOX		5078</div><div class='add'>+ls_stingray		MACH_LS_STINGRAY	LS_STINGRAY		5079</div><div class='add'>+ipdu			MACH_IPDU		IPDU			5080</div><div class='add'>+linda			MACH_LINDA		LINDA			5081</div><div class='add'>+mx6q_openrex		MACH_MX6Q_OPENREX	MX6Q_OPENREX		5082</div><div class='add'>+on100			MACH_ON100		ON100			5083</div><div class='add'>+eminds_rtu12		MACH_EMINDS_RTU12	EMINDS_RTU12		5084</div><div class='add'>+eminds_avl10		MACH_EMINDS_AVL10	EMINDS_AVL10		5085</div><div class='add'>+main_plc_lme		MACH_MAIN_PLC_LME	MAIN_PLC_LME		5086</div><div class='add'>+mspx			MACH_MSPX		MSPX			5087</div><div class='add'>+cgw_300			MACH_CGW_300		CGW_300			5088</div><div class='add'>+mx7d_cicada		MACH_MX7D_CICADA	MX7D_CICADA		5089</div><div class='add'>+virt2real_dm365		MACH_VIRT2REAL_DM365	VIRT2REAL_DM365		5090</div><div class='add'>+dm365_virt2real		MACH_DM365_VIRT2REAL	DM365_VIRT2REAL		5091</div><div class='add'>+h6073			MACH_H6073		H6073			5092</div><div class='add'>+gtgateway		MACH_GTGATEWAY		GTGATEWAY		5093</div><div class='add'>+xarina_standard		MACH_XARINA_STANDARD	XARINA_STANDARD		5094</div><div class='add'>+novasoms		MACH_NOVASOMS		NOVASOMS		5095</div><div class='add'>+novasomp		MACH_NOVASOMP		NOVASOMP		5096</div><div class='add'>+novasomu		MACH_NOVASOMU		NOVASOMU		5097</div><div class='add'>+mx6q_mpbd		MACH_MX6Q_MPBD		MX6Q_MPBD		5098</div><div class='add'>+ncr_1930		MACH_NCR_1930		NCR_1930		5099</div><div class='add'>+uap301			MACH_UAP301		UAP301			5100</div><div class='add'>+urt02			MACH_URT02		URT02			5101</div><div class='add'>+atc8			MACH_ATC8		ATC8			5102</div><div class='add'>+iot_gateway		MACH_IOT_GATEWAY	IOT_GATEWAY		5103</div><div class='add'>+hsm_phoenix		MACH_HSM_PHOENIX	HSM_PHOENIX		5104</div><div class='add'>+missouri		MACH_MISSOURI		MISSOURI		5105</div><div class='add'>+remarkable		MACH_REMARKABLE		REMARKABLE		5106</div><div class='add'>+fa0113			MACH_FA0113		FA0113			5107</div><div class='add'>+innova_statnettawm	MACH_INNOVA_STATNETTAWM	INNOVA_STATNETTAWM	5108</div><div class='head'>diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl<br/>new file mode 100644<br/>index 000000000000..3c2cb5d5adfa<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/tools/syscall.tbl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/syscall.tbl</a></div><div class='hunk'>@@ -0,0 +1,413 @@</div><div class='add'>+#</div><div class='add'>+# Linux system call numbers and entry vectors</div><div class='add'>+#</div><div class='add'>+# The format is:</div><div class='add'>+# &lt;num&gt;	&lt;abi&gt;	&lt;name&gt;			[&lt;entry point&gt;			[&lt;oabi compat entry point&gt;]]</div><div class='add'>+#</div><div class='add'>+# Where abi is:</div><div class='add'>+#  common - for system calls shared between oabi and eabi (may have compat)</div><div class='add'>+#  oabi   - for oabi-only system calls (may have compat)</div><div class='add'>+#  eabi   - for eabi-only system calls</div><div class='add'>+#</div><div class='add'>+# For each syscall number, "common" is mutually exclusive with oabi and eabi</div><div class='add'>+#</div><div class='add'>+0	common	restart_syscall		sys_restart_syscall</div><div class='add'>+1	common	exit			sys_exit</div><div class='add'>+2	common	fork			sys_fork</div><div class='add'>+3	common	read			sys_read</div><div class='add'>+4	common	write			sys_write</div><div class='add'>+5	common	open			sys_open</div><div class='add'>+6	common	close			sys_close</div><div class='add'>+# 7 was sys_waitpid</div><div class='add'>+8	common	creat			sys_creat</div><div class='add'>+9	common	link			sys_link</div><div class='add'>+10	common	unlink			sys_unlink</div><div class='add'>+11	common	execve			sys_execve</div><div class='add'>+12	common	chdir			sys_chdir</div><div class='add'>+13	oabi	time			sys_time</div><div class='add'>+14	common	mknod			sys_mknod</div><div class='add'>+15	common	chmod			sys_chmod</div><div class='add'>+16	common	lchown			sys_lchown16</div><div class='add'>+# 17 was sys_break</div><div class='add'>+# 18 was sys_stat</div><div class='add'>+19	common	lseek			sys_lseek</div><div class='add'>+20	common	getpid			sys_getpid</div><div class='add'>+21	common	mount			sys_mount</div><div class='add'>+22	oabi	umount			sys_oldumount</div><div class='add'>+23	common	setuid			sys_setuid16</div><div class='add'>+24	common	getuid			sys_getuid16</div><div class='add'>+25	oabi	stime			sys_stime</div><div class='add'>+26	common	ptrace			sys_ptrace</div><div class='add'>+27	oabi	alarm			sys_alarm</div><div class='add'>+# 28 was sys_fstat</div><div class='add'>+29	common	pause			sys_pause</div><div class='add'>+30	oabi	utime			sys_utime</div><div class='add'>+# 31 was sys_stty</div><div class='add'>+# 32 was sys_gtty</div><div class='add'>+33	common	access			sys_access</div><div class='add'>+34	common	nice			sys_nice</div><div class='add'>+# 35 was sys_ftime</div><div class='add'>+36	common	sync			sys_sync</div><div class='add'>+37	common	kill			sys_kill</div><div class='add'>+38	common	rename			sys_rename</div><div class='add'>+39	common	mkdir			sys_mkdir</div><div class='add'>+40	common	rmdir			sys_rmdir</div><div class='add'>+41	common	dup			sys_dup</div><div class='add'>+42	common	pipe			sys_pipe</div><div class='add'>+43	common	times			sys_times</div><div class='add'>+# 44 was sys_prof</div><div class='add'>+45	common	brk			sys_brk</div><div class='add'>+46	common	setgid			sys_setgid16</div><div class='add'>+47	common	getgid			sys_getgid16</div><div class='add'>+# 48 was sys_signal</div><div class='add'>+49	common	geteuid			sys_geteuid16</div><div class='add'>+50	common	getegid			sys_getegid16</div><div class='add'>+51	common	acct			sys_acct</div><div class='add'>+52	common	umount2			sys_umount</div><div class='add'>+# 53 was sys_lock</div><div class='add'>+54	common	ioctl			sys_ioctl</div><div class='add'>+55	common	fcntl			sys_fcntl</div><div class='add'>+# 56 was sys_mpx</div><div class='add'>+57	common	setpgid			sys_setpgid</div><div class='add'>+# 58 was sys_ulimit</div><div class='add'>+# 59 was sys_olduname</div><div class='add'>+60	common	umask			sys_umask</div><div class='add'>+61	common	chroot			sys_chroot</div><div class='add'>+62	common	ustat			sys_ustat</div><div class='add'>+63	common	dup2			sys_dup2</div><div class='add'>+64	common	getppid			sys_getppid</div><div class='add'>+65	common	getpgrp			sys_getpgrp</div><div class='add'>+66	common	setsid			sys_setsid</div><div class='add'>+67	common	sigaction		sys_sigaction</div><div class='add'>+# 68 was sys_sgetmask</div><div class='add'>+# 69 was sys_ssetmask</div><div class='add'>+70	common	setreuid		sys_setreuid16</div><div class='add'>+71	common	setregid		sys_setregid16</div><div class='add'>+72	common	sigsuspend		sys_sigsuspend</div><div class='add'>+73	common	sigpending		sys_sigpending</div><div class='add'>+74	common	sethostname		sys_sethostname</div><div class='add'>+75	common	setrlimit		sys_setrlimit</div><div class='add'>+# Back compat 2GB limited rlimit</div><div class='add'>+76	oabi	getrlimit		sys_old_getrlimit</div><div class='add'>+77	common	getrusage		sys_getrusage</div><div class='add'>+78	common	gettimeofday		sys_gettimeofday</div><div class='add'>+79	common	settimeofday		sys_settimeofday</div><div class='add'>+80	common	getgroups		sys_getgroups16</div><div class='add'>+81	common	setgroups		sys_setgroups16</div><div class='add'>+82	oabi	select			sys_old_select</div><div class='add'>+83	common	symlink			sys_symlink</div><div class='add'>+# 84 was sys_lstat</div><div class='add'>+85	common	readlink		sys_readlink</div><div class='add'>+86	common	uselib			sys_uselib</div><div class='add'>+87	common	swapon			sys_swapon</div><div class='add'>+88	common	reboot			sys_reboot</div><div class='add'>+89	oabi	readdir			sys_old_readdir</div><div class='add'>+90	oabi	mmap			sys_old_mmap</div><div class='add'>+91	common	munmap			sys_munmap</div><div class='add'>+92	common	truncate		sys_truncate</div><div class='add'>+93	common	ftruncate		sys_ftruncate</div><div class='add'>+94	common	fchmod			sys_fchmod</div><div class='add'>+95	common	fchown			sys_fchown16</div><div class='add'>+96	common	getpriority		sys_getpriority</div><div class='add'>+97	common	setpriority		sys_setpriority</div><div class='add'>+# 98 was sys_profil</div><div class='add'>+99	common	statfs			sys_statfs</div><div class='add'>+100	common	fstatfs			sys_fstatfs</div><div class='add'>+# 101 was sys_ioperm</div><div class='add'>+102	oabi	socketcall		sys_socketcall		sys_oabi_socketcall</div><div class='add'>+103	common	syslog			sys_syslog</div><div class='add'>+104	common	setitimer		sys_setitimer</div><div class='add'>+105	common	getitimer		sys_getitimer</div><div class='add'>+106	common	stat			sys_newstat</div><div class='add'>+107	common	lstat			sys_newlstat</div><div class='add'>+108	common	fstat			sys_newfstat</div><div class='add'>+# 109 was sys_uname</div><div class='add'>+# 110 was sys_iopl</div><div class='add'>+111	common	vhangup			sys_vhangup</div><div class='add'>+# 112 was sys_idle</div><div class='add'>+# syscall to call a syscall!</div><div class='add'>+113	oabi	syscall			sys_syscall</div><div class='add'>+114	common	wait4			sys_wait4</div><div class='add'>+115	common	swapoff			sys_swapoff</div><div class='add'>+116	common	sysinfo			sys_sysinfo</div><div class='add'>+117	oabi	ipc			sys_ipc			sys_oabi_ipc</div><div class='add'>+118	common	fsync			sys_fsync</div><div class='add'>+119	common	sigreturn		sys_sigreturn_wrapper</div><div class='add'>+120	common	clone			sys_clone</div><div class='add'>+121	common	setdomainname		sys_setdomainname</div><div class='add'>+122	common	uname			sys_newuname</div><div class='add'>+# 123 was sys_modify_ldt</div><div class='add'>+124	common	adjtimex		sys_adjtimex</div><div class='add'>+125	common	mprotect		sys_mprotect</div><div class='add'>+126	common	sigprocmask		sys_sigprocmask</div><div class='add'>+# 127 was sys_create_module</div><div class='add'>+128	common	init_module		sys_init_module</div><div class='add'>+129	common	delete_module		sys_delete_module</div><div class='add'>+# 130 was sys_get_kernel_syms</div><div class='add'>+131	common	quotactl		sys_quotactl</div><div class='add'>+132	common	getpgid			sys_getpgid</div><div class='add'>+133	common	fchdir			sys_fchdir</div><div class='add'>+134	common	bdflush			sys_bdflush</div><div class='add'>+135	common	sysfs			sys_sysfs</div><div class='add'>+136	common	personality		sys_personality</div><div class='add'>+# 137 was sys_afs_syscall</div><div class='add'>+138	common	setfsuid		sys_setfsuid16</div><div class='add'>+139	common	setfsgid		sys_setfsgid16</div><div class='add'>+140	common	_llseek			sys_llseek</div><div class='add'>+141	common	getdents		sys_getdents</div><div class='add'>+142	common	_newselect		sys_select</div><div class='add'>+143	common	flock			sys_flock</div><div class='add'>+144	common	msync			sys_msync</div><div class='add'>+145	common	readv			sys_readv</div><div class='add'>+146	common	writev			sys_writev</div><div class='add'>+147	common	getsid			sys_getsid</div><div class='add'>+148	common	fdatasync		sys_fdatasync</div><div class='add'>+149	common	_sysctl			sys_sysctl</div><div class='add'>+150	common	mlock			sys_mlock</div><div class='add'>+151	common	munlock			sys_munlock</div><div class='add'>+152	common	mlockall		sys_mlockall</div><div class='add'>+153	common	munlockall		sys_munlockall</div><div class='add'>+154	common	sched_setparam		sys_sched_setparam</div><div class='add'>+155	common	sched_getparam		sys_sched_getparam</div><div class='add'>+156	common	sched_setscheduler	sys_sched_setscheduler</div><div class='add'>+157	common	sched_getscheduler	sys_sched_getscheduler</div><div class='add'>+158	common	sched_yield		sys_sched_yield</div><div class='add'>+159	common	sched_get_priority_max	sys_sched_get_priority_max</div><div class='add'>+160	common	sched_get_priority_min	sys_sched_get_priority_min</div><div class='add'>+161	common	sched_rr_get_interval	sys_sched_rr_get_interval</div><div class='add'>+162	common	nanosleep		sys_nanosleep</div><div class='add'>+163	common	mremap			sys_mremap</div><div class='add'>+164	common	setresuid		sys_setresuid16</div><div class='add'>+165	common	getresuid		sys_getresuid16</div><div class='add'>+# 166 was sys_vm86</div><div class='add'>+# 167 was sys_query_module</div><div class='add'>+168	common	poll			sys_poll</div><div class='add'>+169	common	nfsservctl</div><div class='add'>+170	common	setresgid		sys_setresgid16</div><div class='add'>+171	common	getresgid		sys_getresgid16</div><div class='add'>+172	common	prctl			sys_prctl</div><div class='add'>+173	common	rt_sigreturn		sys_rt_sigreturn_wrapper</div><div class='add'>+174	common	rt_sigaction		sys_rt_sigaction</div><div class='add'>+175	common	rt_sigprocmask		sys_rt_sigprocmask</div><div class='add'>+176	common	rt_sigpending		sys_rt_sigpending</div><div class='add'>+177	common	rt_sigtimedwait		sys_rt_sigtimedwait</div><div class='add'>+178	common	rt_sigqueueinfo		sys_rt_sigqueueinfo</div><div class='add'>+179	common	rt_sigsuspend		sys_rt_sigsuspend</div><div class='add'>+180	common	pread64			sys_pread64		sys_oabi_pread64</div><div class='add'>+181	common	pwrite64		sys_pwrite64		sys_oabi_pwrite64</div><div class='add'>+182	common	chown			sys_chown16</div><div class='add'>+183	common	getcwd			sys_getcwd</div><div class='add'>+184	common	capget			sys_capget</div><div class='add'>+185	common	capset			sys_capset</div><div class='add'>+186	common	sigaltstack		sys_sigaltstack</div><div class='add'>+187	common	sendfile		sys_sendfile</div><div class='add'>+# 188 reserved</div><div class='add'>+# 189 reserved</div><div class='add'>+190	common	vfork			sys_vfork</div><div class='add'>+# SuS compliant getrlimit</div><div class='add'>+191	common	ugetrlimit		sys_getrlimit</div><div class='add'>+192	common	mmap2			sys_mmap2</div><div class='add'>+193	common	truncate64		sys_truncate64		sys_oabi_truncate64</div><div class='add'>+194	common	ftruncate64		sys_ftruncate64		sys_oabi_ftruncate64</div><div class='add'>+195	common	stat64			sys_stat64		sys_oabi_stat64</div><div class='add'>+196	common	lstat64			sys_lstat64		sys_oabi_lstat64</div><div class='add'>+197	common	fstat64			sys_fstat64		sys_oabi_fstat64</div><div class='add'>+198	common	lchown32		sys_lchown</div><div class='add'>+199	common	getuid32		sys_getuid</div><div class='add'>+200	common	getgid32		sys_getgid</div><div class='add'>+201	common	geteuid32		sys_geteuid</div><div class='add'>+202	common	getegid32		sys_getegid</div><div class='add'>+203	common	setreuid32		sys_setreuid</div><div class='add'>+204	common	setregid32		sys_setregid</div><div class='add'>+205	common	getgroups32		sys_getgroups</div><div class='add'>+206	common	setgroups32		sys_setgroups</div><div class='add'>+207	common	fchown32		sys_fchown</div><div class='add'>+208	common	setresuid32		sys_setresuid</div><div class='add'>+209	common	getresuid32		sys_getresuid</div><div class='add'>+210	common	setresgid32		sys_setresgid</div><div class='add'>+211	common	getresgid32		sys_getresgid</div><div class='add'>+212	common	chown32			sys_chown</div><div class='add'>+213	common	setuid32		sys_setuid</div><div class='add'>+214	common	setgid32		sys_setgid</div><div class='add'>+215	common	setfsuid32		sys_setfsuid</div><div class='add'>+216	common	setfsgid32		sys_setfsgid</div><div class='add'>+217	common	getdents64		sys_getdents64</div><div class='add'>+218	common	pivot_root		sys_pivot_root</div><div class='add'>+219	common	mincore			sys_mincore</div><div class='add'>+220	common	madvise			sys_madvise</div><div class='add'>+221	common	fcntl64			sys_fcntl64		sys_oabi_fcntl64</div><div class='add'>+# 222 for tux</div><div class='add'>+# 223 is unused</div><div class='add'>+224	common	gettid			sys_gettid</div><div class='add'>+225	common	readahead		sys_readahead		sys_oabi_readahead</div><div class='add'>+226	common	setxattr		sys_setxattr</div><div class='add'>+227	common	lsetxattr		sys_lsetxattr</div><div class='add'>+228	common	fsetxattr		sys_fsetxattr</div><div class='add'>+229	common	getxattr		sys_getxattr</div><div class='add'>+230	common	lgetxattr		sys_lgetxattr</div><div class='add'>+231	common	fgetxattr		sys_fgetxattr</div><div class='add'>+232	common	listxattr		sys_listxattr</div><div class='add'>+233	common	llistxattr		sys_llistxattr</div><div class='add'>+234	common	flistxattr		sys_flistxattr</div><div class='add'>+235	common	removexattr		sys_removexattr</div><div class='add'>+236	common	lremovexattr		sys_lremovexattr</div><div class='add'>+237	common	fremovexattr		sys_fremovexattr</div><div class='add'>+238	common	tkill			sys_tkill</div><div class='add'>+239	common	sendfile64		sys_sendfile64</div><div class='add'>+240	common	futex			sys_futex</div><div class='add'>+241	common	sched_setaffinity	sys_sched_setaffinity</div><div class='add'>+242	common	sched_getaffinity	sys_sched_getaffinity</div><div class='add'>+243	common	io_setup		sys_io_setup</div><div class='add'>+244	common	io_destroy		sys_io_destroy</div><div class='add'>+245	common	io_getevents		sys_io_getevents</div><div class='add'>+246	common	io_submit		sys_io_submit</div><div class='add'>+247	common	io_cancel		sys_io_cancel</div><div class='add'>+248	common	exit_group		sys_exit_group</div><div class='add'>+249	common	lookup_dcookie		sys_lookup_dcookie</div><div class='add'>+250	common	epoll_create		sys_epoll_create</div><div class='add'>+251	common	epoll_ctl		sys_epoll_ctl		sys_oabi_epoll_ctl</div><div class='add'>+252	common	epoll_wait		sys_epoll_wait		sys_oabi_epoll_wait</div><div class='add'>+253	common	remap_file_pages	sys_remap_file_pages</div><div class='add'>+# 254 for set_thread_area</div><div class='add'>+# 255 for get_thread_area</div><div class='add'>+256	common	set_tid_address		sys_set_tid_address</div><div class='add'>+257	common	timer_create		sys_timer_create</div><div class='add'>+258	common	timer_settime		sys_timer_settime</div><div class='add'>+259	common	timer_gettime		sys_timer_gettime</div><div class='add'>+260	common	timer_getoverrun	sys_timer_getoverrun</div><div class='add'>+261	common	timer_delete		sys_timer_delete</div><div class='add'>+262	common	clock_settime		sys_clock_settime</div><div class='add'>+263	common	clock_gettime		sys_clock_gettime</div><div class='add'>+264	common	clock_getres		sys_clock_getres</div><div class='add'>+265	common	clock_nanosleep		sys_clock_nanosleep</div><div class='add'>+266	common	statfs64		sys_statfs64_wrapper</div><div class='add'>+267	common	fstatfs64		sys_fstatfs64_wrapper</div><div class='add'>+268	common	tgkill			sys_tgkill</div><div class='add'>+269	common	utimes			sys_utimes</div><div class='add'>+270	common	arm_fadvise64_64	sys_arm_fadvise64_64</div><div class='add'>+271	common	pciconfig_iobase	sys_pciconfig_iobase</div><div class='add'>+272	common	pciconfig_read		sys_pciconfig_read</div><div class='add'>+273	common	pciconfig_write		sys_pciconfig_write</div><div class='add'>+274	common	mq_open			sys_mq_open</div><div class='add'>+275	common	mq_unlink		sys_mq_unlink</div><div class='add'>+276	common	mq_timedsend		sys_mq_timedsend</div><div class='add'>+277	common	mq_timedreceive		sys_mq_timedreceive</div><div class='add'>+278	common	mq_notify		sys_mq_notify</div><div class='add'>+279	common	mq_getsetattr		sys_mq_getsetattr</div><div class='add'>+280	common	waitid			sys_waitid</div><div class='add'>+281	common	socket			sys_socket</div><div class='add'>+282	common	bind			sys_bind		sys_oabi_bind</div><div class='add'>+283	common	connect			sys_connect		sys_oabi_connect</div><div class='add'>+284	common	listen			sys_listen</div><div class='add'>+285	common	accept			sys_accept</div><div class='add'>+286	common	getsockname		sys_getsockname</div><div class='add'>+287	common	getpeername		sys_getpeername</div><div class='add'>+288	common	socketpair		sys_socketpair</div><div class='add'>+289	common	send			sys_send</div><div class='add'>+290	common	sendto			sys_sendto		sys_oabi_sendto</div><div class='add'>+291	common	recv			sys_recv</div><div class='add'>+292	common	recvfrom		sys_recvfrom</div><div class='add'>+293	common	shutdown		sys_shutdown</div><div class='add'>+294	common	setsockopt		sys_setsockopt</div><div class='add'>+295	common	getsockopt		sys_getsockopt</div><div class='add'>+296	common	sendmsg			sys_sendmsg		sys_oabi_sendmsg</div><div class='add'>+297	common	recvmsg			sys_recvmsg</div><div class='add'>+298	common	semop			sys_semop		sys_oabi_semop</div><div class='add'>+299	common	semget			sys_semget</div><div class='add'>+300	common	semctl			sys_semctl</div><div class='add'>+301	common	msgsnd			sys_msgsnd</div><div class='add'>+302	common	msgrcv			sys_msgrcv</div><div class='add'>+303	common	msgget			sys_msgget</div><div class='add'>+304	common	msgctl			sys_msgctl</div><div class='add'>+305	common	shmat			sys_shmat</div><div class='add'>+306	common	shmdt			sys_shmdt</div><div class='add'>+307	common	shmget			sys_shmget</div><div class='add'>+308	common	shmctl			sys_shmctl</div><div class='add'>+309	common	add_key			sys_add_key</div><div class='add'>+310	common	request_key		sys_request_key</div><div class='add'>+311	common	keyctl			sys_keyctl</div><div class='add'>+312	common	semtimedop		sys_semtimedop		sys_oabi_semtimedop</div><div class='add'>+313	common	vserver</div><div class='add'>+314	common	ioprio_set		sys_ioprio_set</div><div class='add'>+315	common	ioprio_get		sys_ioprio_get</div><div class='add'>+316	common	inotify_init		sys_inotify_init</div><div class='add'>+317	common	inotify_add_watch	sys_inotify_add_watch</div><div class='add'>+318	common	inotify_rm_watch	sys_inotify_rm_watch</div><div class='add'>+319	common	mbind			sys_mbind</div><div class='add'>+320	common	get_mempolicy		sys_get_mempolicy</div><div class='add'>+321	common	set_mempolicy		sys_set_mempolicy</div><div class='add'>+322	common	openat			sys_openat</div><div class='add'>+323	common	mkdirat			sys_mkdirat</div><div class='add'>+324	common	mknodat			sys_mknodat</div><div class='add'>+325	common	fchownat		sys_fchownat</div><div class='add'>+326	common	futimesat		sys_futimesat</div><div class='add'>+327	common	fstatat64		sys_fstatat64		sys_oabi_fstatat64</div><div class='add'>+328	common	unlinkat		sys_unlinkat</div><div class='add'>+329	common	renameat		sys_renameat</div><div class='add'>+330	common	linkat			sys_linkat</div><div class='add'>+331	common	symlinkat		sys_symlinkat</div><div class='add'>+332	common	readlinkat		sys_readlinkat</div><div class='add'>+333	common	fchmodat		sys_fchmodat</div><div class='add'>+334	common	faccessat		sys_faccessat</div><div class='add'>+335	common	pselect6		sys_pselect6</div><div class='add'>+336	common	ppoll			sys_ppoll</div><div class='add'>+337	common	unshare			sys_unshare</div><div class='add'>+338	common	set_robust_list		sys_set_robust_list</div><div class='add'>+339	common	get_robust_list		sys_get_robust_list</div><div class='add'>+340	common	splice			sys_splice</div><div class='add'>+341	common	arm_sync_file_range	sys_sync_file_range2</div><div class='add'>+342	common	tee			sys_tee</div><div class='add'>+343	common	vmsplice		sys_vmsplice</div><div class='add'>+344	common	move_pages		sys_move_pages</div><div class='add'>+345	common	getcpu			sys_getcpu</div><div class='add'>+346	common	epoll_pwait		sys_epoll_pwait</div><div class='add'>+347	common	kexec_load		sys_kexec_load</div><div class='add'>+348	common	utimensat		sys_utimensat</div><div class='add'>+349	common	signalfd		sys_signalfd</div><div class='add'>+350	common	timerfd_create		sys_timerfd_create</div><div class='add'>+351	common	eventfd			sys_eventfd</div><div class='add'>+352	common	fallocate		sys_fallocate</div><div class='add'>+353	common	timerfd_settime		sys_timerfd_settime</div><div class='add'>+354	common	timerfd_gettime		sys_timerfd_gettime</div><div class='add'>+355	common	signalfd4		sys_signalfd4</div><div class='add'>+356	common	eventfd2		sys_eventfd2</div><div class='add'>+357	common	epoll_create1		sys_epoll_create1</div><div class='add'>+358	common	dup3			sys_dup3</div><div class='add'>+359	common	pipe2			sys_pipe2</div><div class='add'>+360	common	inotify_init1		sys_inotify_init1</div><div class='add'>+361	common	preadv			sys_preadv</div><div class='add'>+362	common	pwritev			sys_pwritev</div><div class='add'>+363	common	rt_tgsigqueueinfo	sys_rt_tgsigqueueinfo</div><div class='add'>+364	common	perf_event_open		sys_perf_event_open</div><div class='add'>+365	common	recvmmsg		sys_recvmmsg</div><div class='add'>+366	common	accept4			sys_accept4</div><div class='add'>+367	common	fanotify_init		sys_fanotify_init</div><div class='add'>+368	common	fanotify_mark		sys_fanotify_mark</div><div class='add'>+369	common	prlimit64		sys_prlimit64</div><div class='add'>+370	common	name_to_handle_at	sys_name_to_handle_at</div><div class='add'>+371	common	open_by_handle_at	sys_open_by_handle_at</div><div class='add'>+372	common	clock_adjtime		sys_clock_adjtime</div><div class='add'>+373	common	syncfs			sys_syncfs</div><div class='add'>+374	common	sendmmsg		sys_sendmmsg</div><div class='add'>+375	common	setns			sys_setns</div><div class='add'>+376	common	process_vm_readv	sys_process_vm_readv</div><div class='add'>+377	common	process_vm_writev	sys_process_vm_writev</div><div class='add'>+378	common	kcmp			sys_kcmp</div><div class='add'>+379	common	finit_module		sys_finit_module</div><div class='add'>+380	common	sched_setattr		sys_sched_setattr</div><div class='add'>+381	common	sched_getattr		sys_sched_getattr</div><div class='add'>+382	common	renameat2		sys_renameat2</div><div class='add'>+383	common	seccomp			sys_seccomp</div><div class='add'>+384	common	getrandom		sys_getrandom</div><div class='add'>+385	common	memfd_create		sys_memfd_create</div><div class='add'>+386	common	bpf			sys_bpf</div><div class='add'>+387	common	execveat		sys_execveat</div><div class='add'>+388	common	userfaultfd		sys_userfaultfd</div><div class='add'>+389	common	membarrier		sys_membarrier</div><div class='add'>+390	common	mlock2			sys_mlock2</div><div class='add'>+391	common	copy_file_range		sys_copy_file_range</div><div class='add'>+392	common	preadv2			sys_preadv2</div><div class='add'>+393	common	pwritev2		sys_pwritev2</div><div class='add'>+394	common	pkey_mprotect		sys_pkey_mprotect</div><div class='add'>+395	common	pkey_alloc		sys_pkey_alloc</div><div class='add'>+396	common	pkey_free		sys_pkey_free</div><div class='head'>diff --git a/arch/arm/tools/syscallhdr.sh b/arch/arm/tools/syscallhdr.sh<br/>new file mode 100644<br/>index 000000000000..72d4b2e3bdec<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/tools/syscallhdr.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/syscallhdr.sh</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+</div><div class='add'>+in="$1"</div><div class='add'>+out="$2"</div><div class='add'>+my_abis=`echo "($3)" | tr ',' '|'`</div><div class='add'>+prefix="$4"</div><div class='add'>+offset="$5"</div><div class='add'>+</div><div class='add'>+fileguard=_ASM_ARM_`basename "$out" | sed \</div><div class='add'>+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \</div><div class='add'>+    -e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'`</div><div class='add'>+if echo $out | grep -q uapi; then</div><div class='add'>+    fileguard="_UAPI$fileguard"</div><div class='add'>+fi</div><div class='add'>+grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | (</div><div class='add'>+    echo "#ifndef ${fileguard}"</div><div class='add'>+    echo "#define ${fileguard} 1"</div><div class='add'>+    echo ""</div><div class='add'>+</div><div class='add'>+    while read nr abi name entry ; do</div><div class='add'>+	if [ -z "$offset" ]; then</div><div class='add'>+	    echo "#define __NR_${prefix}${name} $nr"</div><div class='add'>+	else</div><div class='add'>+	    echo "#define __NR_${prefix}${name} ($offset + $nr)"</div><div class='add'>+        fi</div><div class='add'>+    done</div><div class='add'>+</div><div class='add'>+    echo ""</div><div class='add'>+    echo "#endif /* ${fileguard} */"</div><div class='add'>+) &gt; "$out"</div><div class='head'>diff --git a/arch/arm/tools/syscallnr.sh b/arch/arm/tools/syscallnr.sh<br/>new file mode 100644<br/>index 000000000000..d2971296469a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/tools/syscallnr.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/syscallnr.sh</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+in="$1"</div><div class='add'>+out="$2"</div><div class='add'>+my_abis=`echo "($3)" | tr ',' '|'`</div><div class='add'>+align=1</div><div class='add'>+</div><div class='add'>+fileguard=_ASM_ARM_`basename "$out" | sed \</div><div class='add'>+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \</div><div class='add'>+    -e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'`</div><div class='add'>+</div><div class='add'>+grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | tail -n1 | (</div><div class='add'>+    echo "#ifndef ${fileguard}</div><div class='add'>+#define ${fileguard} 1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This needs to be greater than __NR_last_syscall+1 in order to account</div><div class='add'>+ * for the padding in the syscall table.</div><div class='add'>+ */</div><div class='add'>+"</div><div class='add'>+</div><div class='add'>+    while read nr abi name entry; do</div><div class='add'>+        nr=$(($nr + 1))</div><div class='add'>+        while [ "$(($nr / (256 * $align) ))" -gt 0 ]; do</div><div class='add'>+            align=$(( $align * 4 ))</div><div class='add'>+        done</div><div class='add'>+        nr=$(( ($nr + $align - 1) &amp; ~($align - 1) ))</div><div class='add'>+        echo "/* aligned to $align */"</div><div class='add'>+        echo "#define __NR_syscalls $nr"</div><div class='add'>+    done</div><div class='add'>+</div><div class='add'>+    echo ""</div><div class='add'>+    echo "#endif /* ${fileguard} */"</div><div class='add'>+) &gt; "$out"</div><div class='head'>diff --git a/arch/arm/tools/syscalltbl.sh b/arch/arm/tools/syscalltbl.sh<br/>new file mode 100644<br/>index 000000000000..5ca834545ed3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm/tools/syscalltbl.sh?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/tools/syscalltbl.sh</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+in="$1"</div><div class='add'>+out="$2"</div><div class='add'>+my_abis=`echo "($3)" | tr ',' '|'`</div><div class='add'>+</div><div class='add'>+grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | (</div><div class='add'>+    while read nr abi name entry compat; do</div><div class='add'>+        if [ "$abi" = "eabi" -a -n "$compat" ]; then</div><div class='add'>+            echo "$in: error: a compat entry for an EABI syscall ($name) makes no sense" &gt;&amp;2</div><div class='add'>+            exit 1</div><div class='add'>+        fi</div><div class='add'>+</div><div class='add'>+	if [ -n "$entry" ]; then</div><div class='add'>+            if [ -z "$compat" ]; then</div><div class='add'>+                echo "NATIVE($nr, $entry)"</div><div class='add'>+            else</div><div class='add'>+                echo "COMPAT($nr, $entry, $compat)"</div><div class='add'>+            fi</div><div class='add'>+        fi</div><div class='add'>+    done</div><div class='add'>+) &gt; "$out"</div><div class='head'>diff --git a/arch/arm/vfp/vfp.h b/arch/arm/vfp/vfp.h<br/>index c8c98dd44ad4..89773e5ddf35 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/vfp/vfp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/vfp/vfp.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/vfp/vfp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/vfp/vfp.h</a></div><div class='hunk'>@@ -155,8 +155,8 @@ struct vfp_single {</div><div class='ctx'> 	u32	significand;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern s32 vfp_get_float(unsigned int reg);</div><div class='del'>-extern void vfp_put_float(s32 val, unsigned int reg);</div><div class='add'>+asmlinkage s32 vfp_get_float(unsigned int reg);</div><div class='add'>+asmlinkage void vfp_put_float(s32 val, unsigned int reg);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * VFP_SINGLE_MANTISSA_BITS - number of bits in the mantissa</div><div class='hunk'>@@ -270,8 +270,8 @@ struct vfp_double {</div><div class='ctx'> #else</div><div class='ctx'> #define VFP_REG_ZERO	16</div><div class='ctx'> #endif</div><div class='del'>-extern u64 vfp_get_double(unsigned int reg);</div><div class='del'>-extern void vfp_put_double(u64 val, unsigned int reg);</div><div class='add'>+asmlinkage u64 vfp_get_double(unsigned int reg);</div><div class='add'>+asmlinkage void vfp_put_double(u64 val, unsigned int reg);</div><div class='ctx'> </div><div class='ctx'> #define VFP_DOUBLE_MANTISSA_BITS	(52)</div><div class='ctx'> #define VFP_DOUBLE_EXPONENT_BITS	(11)</div><div class='hunk'>@@ -377,4 +377,4 @@ struct op {</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern void vfp_save_state(void *location, u32 fpexc);</div><div class='add'>+asmlinkage void vfp_save_state(void *location, u32 fpexc);</div><div class='head'>diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c<br/>index da0b33deba6d..a71a48e71fff 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/vfp/vfpmodule.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/vfp/vfpmodule.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/vfp/vfpmodule.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/vfp/vfpmodule.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Our undef handlers (in entry.S)</div><div class='ctx'>  */</div><div class='del'>-void vfp_testing_entry(void);</div><div class='del'>-void vfp_support_entry(void);</div><div class='del'>-void vfp_null_entry(void);</div><div class='add'>+asmlinkage void vfp_testing_entry(void);</div><div class='add'>+asmlinkage void vfp_support_entry(void);</div><div class='add'>+asmlinkage void vfp_null_entry(void);</div><div class='ctx'> </div><div class='del'>-void (*vfp_vector)(void) = vfp_null_entry;</div><div class='add'>+asmlinkage void (*vfp_vector)(void) = vfp_null_entry;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Dual-use variable.</div><div class='hunk'>@@ -799,7 +799,7 @@ static int __init vfp_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpuhp_setup_state_nocalls(CPUHP_AP_ARM_VFP_STARTING,</div><div class='del'>-				  "AP_ARM_VFP_STARTING", vfp_starting_cpu,</div><div class='add'>+				  "arm/vfp:starting", vfp_starting_cpu,</div><div class='ctx'> 				  vfp_dying_cpu);</div><div class='ctx'> </div><div class='ctx'> 	vfp_vector = vfp_support_entry;</div><div class='head'>diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c<br/>index f193414d0f6f..81e3217b12d3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/xen/enlighten.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/xen/enlighten.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/xen/enlighten.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/xen/enlighten.c</a></div><div class='hunk'>@@ -372,8 +372,7 @@ static int __init xen_guest_init(void)</div><div class='ctx'> 	 * for secondary CPUs as they are brought up.</div><div class='ctx'> 	 * For uniformity we use VCPUOP_register_vcpu_info even on cpu0.</div><div class='ctx'> 	 */</div><div class='del'>-	xen_vcpu_info = __alloc_percpu(sizeof(struct vcpu_info),</div><div class='del'>-			                       sizeof(struct vcpu_info));</div><div class='add'>+	xen_vcpu_info = alloc_percpu(struct vcpu_info);</div><div class='ctx'> 	if (xen_vcpu_info == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -413,7 +412,7 @@ static int __init xen_guest_init(void)</div><div class='ctx'> 		pvclock_gtod_register_notifier(&amp;xen_pvclock_gtod_notifier);</div><div class='ctx'> </div><div class='ctx'> 	return cpuhp_setup_state(CPUHP_AP_ARM_XEN_STARTING,</div><div class='del'>-				 "AP_ARM_XEN_STARTING", xen_starting_cpu,</div><div class='add'>+				 "arm/xen:starting", xen_starting_cpu,</div><div class='ctx'> 				 xen_dying_cpu);</div><div class='ctx'> }</div><div class='ctx'> early_initcall(xen_guest_init);</div><div class='hunk'>@@ -458,4 +457,5 @@ EXPORT_SYMBOL_GPL(HYPERVISOR_tmem_op);</div><div class='ctx'> EXPORT_SYMBOL_GPL(HYPERVISOR_platform_op);</div><div class='ctx'> EXPORT_SYMBOL_GPL(HYPERVISOR_multicall);</div><div class='ctx'> EXPORT_SYMBOL_GPL(HYPERVISOR_vm_assist);</div><div class='add'>+EXPORT_SYMBOL_GPL(HYPERVISOR_dm_op);</div><div class='ctx'> EXPORT_SYMBOL_GPL(privcmd_call);</div><div class='head'>diff --git a/arch/arm/xen/hypercall.S b/arch/arm/xen/hypercall.S<br/>index a648dfc3be30..b0b80c0f09f3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/xen/hypercall.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/xen/hypercall.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/xen/hypercall.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/xen/hypercall.S</a></div><div class='hunk'>@@ -92,6 +92,7 @@ HYPERCALL1(tmem_op);</div><div class='ctx'> HYPERCALL1(platform_op_raw);</div><div class='ctx'> HYPERCALL2(multicall);</div><div class='ctx'> HYPERCALL2(vm_assist);</div><div class='add'>+HYPERCALL3(dm_op);</div><div class='ctx'> </div><div class='ctx'> ENTRY(privcmd_call)</div><div class='ctx'> 	stmdb sp!, {r4}</div><div class='head'>diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c<br/>index d062f08f5020..ce18c91b50a1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm/xen/mm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm/xen/mm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm/xen/mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm/xen/mm.c</a></div><div class='hunk'>@@ -182,11 +182,10 @@ void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(xen_destroy_contiguous_region);</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *xen_dma_ops;</div><div class='add'>+const struct dma_map_ops *xen_dma_ops;</div><div class='ctx'> EXPORT_SYMBOL(xen_dma_ops);</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops xen_swiotlb_dma_ops = {</div><div class='del'>-	.mapping_error = xen_swiotlb_dma_mapping_error,</div><div class='add'>+static const struct dma_map_ops xen_swiotlb_dma_ops = {</div><div class='ctx'> 	.alloc = xen_swiotlb_alloc_coherent,</div><div class='ctx'> 	.free = xen_swiotlb_free_coherent,</div><div class='ctx'> 	.sync_single_for_cpu = xen_swiotlb_sync_single_for_cpu,</div><div class='head'>diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig<br/>index 969ef880d234..a39029b5414e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/Kconfig</a></div><div class='hunk'>@@ -6,13 +6,17 @@ config ARM64</div><div class='ctx'> 	select ACPI_MCFG if ACPI</div><div class='ctx'> 	select ACPI_SPCR_TABLE if ACPI</div><div class='ctx'> 	select ARCH_CLOCKSOURCE_DATA</div><div class='add'>+	select ARCH_HAS_DEBUG_VIRTUAL</div><div class='ctx'> 	select ARCH_HAS_DEVMEM_IS_ALLOWED</div><div class='ctx'> 	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI</div><div class='ctx'> 	select ARCH_HAS_ELF_RANDOMIZE</div><div class='ctx'> 	select ARCH_HAS_GCOV_PROFILE_ALL</div><div class='ctx'> 	select ARCH_HAS_GIGANTIC_PAGE</div><div class='ctx'> 	select ARCH_HAS_KCOV</div><div class='add'>+	select ARCH_HAS_SET_MEMORY</div><div class='ctx'> 	select ARCH_HAS_SG_CHAIN</div><div class='add'>+	select ARCH_HAS_STRICT_KERNEL_RWX</div><div class='add'>+	select ARCH_HAS_STRICT_MODULE_RWX</div><div class='ctx'> 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST</div><div class='ctx'> 	select ARCH_USE_CMPXCHG_LOCKREF</div><div class='ctx'> 	select ARCH_SUPPORTS_ATOMIC_RMW</div><div class='hunk'>@@ -52,6 +56,7 @@ config ARM64</div><div class='ctx'> 	select GENERIC_TIME_VSYSCALL</div><div class='ctx'> 	select HANDLE_DOMAIN_IRQ</div><div class='ctx'> 	select HARDIRQS_SW_RESEND</div><div class='add'>+	select HAVE_ACPI_APEI if (ACPI &amp;&amp; EFI)</div><div class='ctx'> 	select HAVE_ALIGNED_STRUCT_PAGE if SLUB</div><div class='ctx'> 	select HAVE_ARCH_AUDITSYSCALL</div><div class='ctx'> 	select HAVE_ARCH_BITREVERSE</div><div class='hunk'>@@ -95,7 +100,7 @@ config ARM64</div><div class='ctx'> 	select HAVE_RCU_TABLE_FREE</div><div class='ctx'> 	select HAVE_SYSCALL_TRACEPOINTS</div><div class='ctx'> 	select HAVE_KPROBES</div><div class='del'>-	select HAVE_KRETPROBES if HAVE_KPROBES</div><div class='add'>+	select HAVE_KRETPROBES</div><div class='ctx'> 	select IOMMU_DMA if IOMMU_SUPPORT</div><div class='ctx'> 	select IRQ_DOMAIN</div><div class='ctx'> 	select IRQ_FORCED_THREADING</div><div class='hunk'>@@ -109,6 +114,7 @@ config ARM64</div><div class='ctx'> 	select POWER_SUPPLY</div><div class='ctx'> 	select SPARSE_IRQ</div><div class='ctx'> 	select SYSCTL_EXCEPTION_TRACE</div><div class='add'>+	select THREAD_INFO_IN_TASK</div><div class='ctx'> 	help</div><div class='ctx'> 	  ARM 64-bit (AArch64) Linux support.</div><div class='ctx'> </div><div class='hunk'>@@ -121,9 +127,6 @@ config ARCH_PHYS_ADDR_T_64BIT</div><div class='ctx'> config MMU</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config DEBUG_RODATA</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config ARM64_PAGE_SHIFT</div><div class='ctx'> 	int</div><div class='ctx'> 	default 16 if ARM64_64K_PAGES</div><div class='hunk'>@@ -238,6 +241,9 @@ config PGTABLE_LEVELS</div><div class='ctx'> 	default 3 if ARM64_16K_PAGES &amp;&amp; ARM64_VA_BITS_47</div><div class='ctx'> 	default 4 if !ARM64_64K_PAGES &amp;&amp; ARM64_VA_BITS_48</div><div class='ctx'> </div><div class='add'>+config ARCH_SUPPORTS_UPROBES</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='ctx'> source "init/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "kernel/Kconfig.freezer"</div><div class='hunk'>@@ -474,6 +480,34 @@ config CAVIUM_ERRATUM_27456</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='add'>+config QCOM_FALKOR_ERRATUM_1003</div><div class='add'>+	bool "Falkor E1003: Incorrect translation due to ASID change"</div><div class='add'>+	default y</div><div class='add'>+	select ARM64_PAN if ARM64_SW_TTBR0_PAN</div><div class='add'>+	help</div><div class='add'>+	  On Falkor v1, an incorrect ASID may be cached in the TLB when ASID</div><div class='add'>+	  and BADDR are changed together in TTBRx_EL1. The workaround for this</div><div class='add'>+	  issue is to use a reserved ASID in cpu_do_switch_mm() before</div><div class='add'>+	  switching to the new ASID. Saying Y here selects ARM64_PAN if</div><div class='add'>+	  ARM64_SW_TTBR0_PAN is selected. This is done because implementing and</div><div class='add'>+	  maintaining the E1003 workaround in the software PAN emulation code</div><div class='add'>+	  would be an unnecessary complication. The affected Falkor v1 CPU</div><div class='add'>+	  implements ARMv8.1 hardware PAN support and using hardware PAN</div><div class='add'>+	  support versus software PAN emulation is mutually exclusive at</div><div class='add'>+	  runtime.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='add'>+config QCOM_FALKOR_ERRATUM_1009</div><div class='add'>+	bool "Falkor E1009: Prematurely complete a DSB after a TLBI"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  On Falkor v1, the CPU may prematurely complete a DSB following a</div><div class='add'>+	  TLBI xxIS invalidate maintenance operation. Repeat the TLBI operation</div><div class='add'>+	  one more time to fix the issue.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -609,6 +643,10 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on NUMA</div><div class='ctx'> </div><div class='add'>+config HOLES_IN_ZONE</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on NUMA</div><div class='add'>+</div><div class='ctx'> source kernel/Kconfig.preempt</div><div class='ctx'> source kernel/Kconfig.hz</div><div class='ctx'> </div><div class='hunk'>@@ -790,6 +828,14 @@ config SETEND_EMULATION</div><div class='ctx'> 	  If unsure, say Y</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+config ARM64_SW_TTBR0_PAN</div><div class='add'>+	bool "Emulate Privileged Access Never using TTBR0_EL1 switching"</div><div class='add'>+	help</div><div class='add'>+	  Enabling this option prevents the kernel from accessing</div><div class='add'>+	  user-space memory directly by pointing TTBR0_EL1 to a reserved</div><div class='add'>+	  zeroed area and reserved ASID. The user access routines</div><div class='add'>+	  restore the valid TTBR0_EL1 temporarily.</div><div class='add'>+</div><div class='ctx'> menu "ARMv8.1 architectural features"</div><div class='ctx'> </div><div class='ctx'> config ARM64_HW_AFDBM</div><div class='hunk'>@@ -997,7 +1043,7 @@ source "fs/Kconfig.binfmt"</div><div class='ctx'> config COMPAT</div><div class='ctx'> 	bool "Kernel support for 32-bit EL0"</div><div class='ctx'> 	depends on ARM64_4K_PAGES || EXPERT</div><div class='del'>-	select COMPAT_BINFMT_ELF</div><div class='add'>+	select COMPAT_BINFMT_ELF if BINFMT_ELF</div><div class='ctx'> 	select HAVE_UID16</div><div class='ctx'> 	select OLD_SIGSUSPEND3</div><div class='ctx'> 	select COMPAT_OLD_SIGACTION</div><div class='head'>diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug<br/>index b661fe742615..fca2f02cde68 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/Kconfig.debug?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/Kconfig.debug</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/Kconfig.debug</a></div><div class='hunk'>@@ -2,9 +2,13 @@ menu "Kernel hacking"</div><div class='ctx'> </div><div class='ctx'> source "lib/Kconfig.debug"</div><div class='ctx'> </div><div class='del'>-config ARM64_PTDUMP</div><div class='add'>+config ARM64_PTDUMP_CORE</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='add'>+config ARM64_PTDUMP_DEBUGFS</div><div class='ctx'> 	bool "Export kernel pagetable layout to userspace via debugfs"</div><div class='ctx'> 	depends on DEBUG_KERNEL</div><div class='add'>+	select ARM64_PTDUMP_CORE</div><div class='ctx'> 	select DEBUG_FS</div><div class='ctx'>         help</div><div class='ctx'> 	  Say Y here if you want to show the kernel pagetable layout in a</div><div class='hunk'>@@ -38,19 +42,37 @@ config ARM64_RANDOMIZE_TEXT_OFFSET</div><div class='ctx'> 	  of TEXT_OFFSET and platforms must not require a specific</div><div class='ctx'> 	  value.</div><div class='ctx'> </div><div class='del'>-config DEBUG_SET_MODULE_RONX</div><div class='del'>-	bool "Set loadable kernel module data as NX and text as RO"</div><div class='del'>-	depends on MODULES</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Is this is set, kernel module text and rodata will be made read-only.</div><div class='del'>-	  This is to help catch accidental or malicious attempts to change the</div><div class='del'>-	  kernel's executable code.</div><div class='add'>+config DEBUG_WX</div><div class='add'>+	bool "Warn on W+X mappings at boot"</div><div class='add'>+	select ARM64_PTDUMP_CORE</div><div class='add'>+	---help---</div><div class='add'>+	  Generate a warning if any W+X mappings are found at boot.</div><div class='add'>+</div><div class='add'>+	  This is useful for discovering cases where the kernel is leaving</div><div class='add'>+	  W+X mappings after applying NX, as such mappings are a security risk.</div><div class='add'>+	  This check also includes UXN, which should be set on all kernel</div><div class='add'>+	  mappings.</div><div class='add'>+</div><div class='add'>+	  Look for a message in dmesg output like this:</div><div class='add'>+</div><div class='add'>+	    arm64/mm: Checked W+X mappings: passed, no W+X pages found.</div><div class='add'>+</div><div class='add'>+	  or like this, if the check failed:</div><div class='ctx'> </div><div class='del'>-	  If in doubt, say Y.</div><div class='add'>+	    arm64/mm: Checked W+X mappings: FAILED, &lt;N&gt; W+X pages found.</div><div class='add'>+</div><div class='add'>+	  Note that even if the check fails, your kernel is possibly</div><div class='add'>+	  still fine, as W+X mappings are not a security hole in</div><div class='add'>+	  themselves, what they do is that they make the exploitation</div><div class='add'>+	  of other unfixed kernel bugs easier.</div><div class='add'>+</div><div class='add'>+	  There is no runtime or memory usage effect of this option</div><div class='add'>+	  once the kernel has booted up - it's a one time check.</div><div class='add'>+</div><div class='add'>+	  If in doubt, say "Y".</div><div class='ctx'> </div><div class='ctx'> config DEBUG_ALIGN_RODATA</div><div class='del'>-	depends on DEBUG_RODATA</div><div class='add'>+	depends on STRICT_KERNEL_RWX</div><div class='ctx'> 	bool "Align linker sections up to SECTION_SIZE"</div><div class='ctx'> 	help</div><div class='ctx'> 	  If this option is enabled, sections that may potentially be marked as</div><div class='hunk'>@@ -62,6 +84,14 @@ config DEBUG_ALIGN_RODATA</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say N.</div><div class='ctx'> </div><div class='add'>+config DEBUG_EFI</div><div class='add'>+	depends on EFI &amp;&amp; DEBUG_INFO</div><div class='add'>+	bool "UEFI debugging"</div><div class='add'>+	help</div><div class='add'>+	  Enable this option to include EFI specific debugging features into</div><div class='add'>+	  the kernel that are only useful when using a debug build of the</div><div class='add'>+	  UEFI firmware</div><div class='add'>+</div><div class='ctx'> source "drivers/hwtracing/coresight/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms<br/>index 101794f5ce10..129cc5ae4091 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/Kconfig.platforms?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/Kconfig.platforms</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/Kconfig.platforms?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/Kconfig.platforms</a></div><div class='hunk'>@@ -113,6 +113,7 @@ config ARCH_MVEBU</div><div class='ctx'> </div><div class='ctx'> config ARCH_QCOM</div><div class='ctx'> 	bool "Qualcomm Platforms"</div><div class='add'>+	select GPIOLIB</div><div class='ctx'> 	select PINCTRL</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for the ARMv8 based Qualcomm chipsets.</div><div class='hunk'>@@ -143,6 +144,7 @@ config ARCH_RENESAS</div><div class='ctx'> 	select PM</div><div class='ctx'> 	select PM_GENERIC_DOMAINS</div><div class='ctx'> 	select RENESAS_IRQC</div><div class='add'>+	select SOC_BUS</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for the ARMv8 based Renesas SoCs.</div><div class='ctx'> </div><div class='hunk'>@@ -188,6 +190,13 @@ config ARCH_THUNDER</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for Cavium's Thunder Family of SoCs.</div><div class='ctx'> </div><div class='add'>+config ARCH_THUNDER2</div><div class='add'>+	bool "Cavium ThunderX2 Server Processors"</div><div class='add'>+	select GPIOLIB</div><div class='add'>+	help</div><div class='add'>+	  This enables support for Cavium's ThunderX2 CN99XX family of</div><div class='add'>+	  server processors.</div><div class='add'>+</div><div class='ctx'> config ARCH_UNIPHIER</div><div class='ctx'> 	bool "Socionext UniPhier SoC Family"</div><div class='ctx'> 	select ARCH_HAS_RESET_CONTROLLER</div><div class='head'>diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile<br/>index 3635b8662724..b9a4a934ca05 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/Makefile</a></div><div class='hunk'>@@ -37,10 +37,16 @@ $(warning LSE atomics not supported by binutils)</div><div class='ctx'>   endif</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-KBUILD_CFLAGS	+= -mgeneral-regs-only $(lseinstr)</div><div class='add'>+brokengasinst := $(call as-instr,1:\n.inst 0\n.rept . - 1b\n\nnop\n.endr\n,,-DCONFIG_BROKEN_GAS_INST=1)</div><div class='add'>+</div><div class='add'>+ifneq ($(brokengasinst),)</div><div class='add'>+$(warning Detected assembler with broken .inst; disassembly will be unreliable)</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+KBUILD_CFLAGS	+= -mgeneral-regs-only $(lseinstr) $(brokengasinst)</div><div class='ctx'> KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables</div><div class='ctx'> KBUILD_CFLAGS	+= $(call cc-option, -mpc-relative-literal-loads)</div><div class='del'>-KBUILD_AFLAGS	+= $(lseinstr)</div><div class='add'>+KBUILD_AFLAGS	+= $(lseinstr) $(brokengasinst)</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)</div><div class='ctx'> KBUILD_CPPFLAGS	+= -mbig-endian</div><div class='head'>diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile<br/>index 6684f97c2722..080232b0270e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/Makefile</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> dts-dirs += al</div><div class='add'>+dts-dirs += allwinner</div><div class='ctx'> dts-dirs += altera</div><div class='ctx'> dts-dirs += amd</div><div class='ctx'> dts-dirs += amlogic</div><div class='head'>diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile<br/>new file mode 100644<br/>index 000000000000..bc6f342be59f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/allwinner/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/allwinner/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb</div><div class='add'>+</div><div class='add'>+always		:= $(dtb-y)</div><div class='add'>+subdir-y	:= $(dts-dirs)</div><div class='add'>+clean-files	:= *.dtb</div><div class='head'>diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts<br/>new file mode 100644<br/>index 000000000000..6872135d7f84<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 ARM Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "sun50i-a64.dtsi"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "BananaPi-M64";</div><div class='add'>+	compatible = "sinovoip,bananapi-m64", "allwinner,sun50i-a64";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart0;</div><div class='add'>+		serial1 = &amp;uart1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_vcc3v3: vcc3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vcc3v3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1_pins {</div><div class='add'>+	bias-pull-up;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc0_pins&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;pio 5 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-inverted;</div><div class='add'>+	disable-wp;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc1_pins&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc2 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc2_pins&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	cap-mmc-hw-reset;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart1_pins&gt;, &lt;&amp;uart1_rts_cts_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts<br/>new file mode 100644<br/>index 000000000000..790d14daaa6a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 ARM Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "sun50i-a64-pine64.dts"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Pine64+";</div><div class='add'>+	compatible = "pine64,pine64-plus", "allwinner,sun50i-a64";</div><div class='add'>+</div><div class='add'>+	/* TODO: Camera, Ethernet PHY, touchscreen, etc. */</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts<br/>new file mode 100644<br/>index 000000000000..c680ed385da3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts</a></div><div class='hunk'>@@ -0,0 +1,111 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 ARM Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "sun50i-a64.dtsi"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Pine64";</div><div class='add'>+	compatible = "pine64,pine64", "allwinner,sun50i-a64";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_vcc3v3: vcc3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vcc3v3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ehci1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c1_pins&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1_pins {</div><div class='add'>+	bias-pull-up;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mmc0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;mmc0_pins&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_vcc3v3&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;pio 5 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-inverted;</div><div class='add'>+	disable-wp;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ohci1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart0_pins_a&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_otg {</div><div class='add'>+	dr_mode = "host";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbphy {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi<br/>new file mode 100644<br/>index 000000000000..1c64ea2d23f9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi</a></div><div class='hunk'>@@ -0,0 +1,396 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 ARM Ltd.</div><div class='add'>+ * based on the Allwinner H3 dtsi:</div><div class='add'>+ *    Copyright (C) 2015 Jens Kuske &lt;jenskuske@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/sun50i-a64-ccu.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun50i-a64-ccu.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@0 {</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu1: cpu@1 {</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu2: cpu@2 {</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu3: cpu@3 {</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;3&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	osc24M: osc24M_clk {</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		clock-frequency = &lt;24000000&gt;;</div><div class='add'>+		clock-output-names = "osc24M";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	osc32k: osc32k_clk {</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		clock-frequency = &lt;32768&gt;;</div><div class='add'>+		clock-output-names = "osc32k";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-0.2";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "arm,armv8-timer";</div><div class='add'>+		interrupts = &lt;GIC_PPI 13</div><div class='add'>+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 14</div><div class='add'>+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 11</div><div class='add'>+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 10</div><div class='add'>+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		mmc0: mmc@1c0f000 {</div><div class='add'>+			compatible = "allwinner,sun50i-a64-mmc";</div><div class='add'>+			reg = &lt;0x01c0f000 0x1000&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_MMC0&gt;, &lt;&amp;ccu CLK_MMC0&gt;;</div><div class='add'>+			clock-names = "ahb", "mmc";</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_MMC0&gt;;</div><div class='add'>+			reset-names = "ahb";</div><div class='add'>+			interrupts = &lt;GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			max-frequency = &lt;150000000&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mmc1: mmc@1c10000 {</div><div class='add'>+			compatible = "allwinner,sun50i-a64-mmc";</div><div class='add'>+			reg = &lt;0x01c10000 0x1000&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_MMC1&gt;, &lt;&amp;ccu CLK_MMC1&gt;;</div><div class='add'>+			clock-names = "ahb", "mmc";</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_MMC1&gt;;</div><div class='add'>+			reset-names = "ahb";</div><div class='add'>+			interrupts = &lt;GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			max-frequency = &lt;150000000&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mmc2: mmc@1c11000 {</div><div class='add'>+			compatible = "allwinner,sun50i-a64-emmc";</div><div class='add'>+			reg = &lt;0x01c11000 0x1000&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_MMC2&gt;, &lt;&amp;ccu CLK_MMC2&gt;;</div><div class='add'>+			clock-names = "ahb", "mmc";</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_MMC2&gt;;</div><div class='add'>+			reset-names = "ahb";</div><div class='add'>+			interrupts = &lt;GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			max-frequency = &lt;200000000&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb_otg: usb@01c19000 {</div><div class='add'>+			compatible = "allwinner,sun8i-a33-musb";</div><div class='add'>+			reg = &lt;0x01c19000 0x0400&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_OTG&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_OTG&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "mc";</div><div class='add'>+			phys = &lt;&amp;usbphy 0&gt;;</div><div class='add'>+			phy-names = "usb";</div><div class='add'>+			extcon = &lt;&amp;usbphy 0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usbphy: phy@01c19400 {</div><div class='add'>+			compatible = "allwinner,sun50i-a64-usb-phy";</div><div class='add'>+			reg = &lt;0x01c19400 0x14&gt;,</div><div class='add'>+			      &lt;0x01c1b800 0x4&gt;;</div><div class='add'>+			reg-names = "phy_ctrl",</div><div class='add'>+				    "pmu1";</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_USB_PHY0&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_USB_PHY1&gt;;</div><div class='add'>+			clock-names = "usb0_phy",</div><div class='add'>+				      "usb1_phy";</div><div class='add'>+			resets = &lt;&amp;ccu RST_USB_PHY0&gt;,</div><div class='add'>+				 &lt;&amp;ccu RST_USB_PHY1&gt;;</div><div class='add'>+			reset-names = "usb0_reset",</div><div class='add'>+				      "usb1_reset";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#phy-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ehci1: usb@01c1b000 {</div><div class='add'>+			compatible = "allwinner,sun50i-a64-ehci", "generic-ehci";</div><div class='add'>+			reg = &lt;0x01c1b000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_OHCI1&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_BUS_EHCI1&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_USB_OHCI1&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_OHCI1&gt;,</div><div class='add'>+				 &lt;&amp;ccu RST_BUS_EHCI1&gt;;</div><div class='add'>+			phys = &lt;&amp;usbphy 1&gt;;</div><div class='add'>+			phy-names = "usb";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ohci1: usb@01c1b400 {</div><div class='add'>+			compatible = "allwinner,sun50i-a64-ohci", "generic-ohci";</div><div class='add'>+			reg = &lt;0x01c1b400 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu CLK_BUS_OHCI1&gt;,</div><div class='add'>+				 &lt;&amp;ccu CLK_USB_OHCI1&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu RST_BUS_OHCI1&gt;;</div><div class='add'>+			phys = &lt;&amp;usbphy 1&gt;;</div><div class='add'>+			phy-names = "usb";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ccu: clock@01c20000 {</div><div class='add'>+			compatible = "allwinner,sun50i-a64-ccu";</div><div class='add'>+			reg = &lt;0x01c20000 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;osc24M&gt;, &lt;&amp;osc32k&gt;;</div><div class='add'>+			clock-names = "hosc", "losc";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			#reset-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pio: pinctrl@1c20800 {</div><div class='add'>+			compatible = "allwinner,sun50i-a64-pinctrl";</div><div class='add'>+			reg = &lt;0x01c20800 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 58&gt;;</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;3&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+</div><div class='add'>+			i2c1_pins: i2c1_pins {</div><div class='add'>+				pins = "PH2", "PH3";</div><div class='add'>+				function = "i2c1";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mmc0_pins: mmc0-pins {</div><div class='add'>+				pins = "PF0", "PF1", "PF2", "PF3",</div><div class='add'>+				       "PF4", "PF5";</div><div class='add'>+				function = "mmc0";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mmc1_pins: mmc1-pins {</div><div class='add'>+				pins = "PG0", "PG1", "PG2", "PG3",</div><div class='add'>+				       "PG4", "PG5";</div><div class='add'>+				function = "mmc1";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mmc2_pins: mmc2-pins {</div><div class='add'>+				pins = "PC1", "PC5", "PC6", "PC8", "PC9",</div><div class='add'>+				       "PC10","PC11", "PC12", "PC13",</div><div class='add'>+				       "PC14", "PC15", "PC16";</div><div class='add'>+				function = "mmc2";</div><div class='add'>+				drive-strength = &lt;30&gt;;</div><div class='add'>+				bias-pull-up;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart0_pins_a: uart0@0 {</div><div class='add'>+				pins = "PB8", "PB9";</div><div class='add'>+				function = "uart0";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart1_pins: uart1_pins {</div><div class='add'>+				pins = "PG6", "PG7";</div><div class='add'>+				function = "uart1";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart1_rts_cts_pins: uart1_rts_cts_pins {</div><div class='add'>+				pins = "PG8", "PG9";</div><div class='add'>+				function = "uart1";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart0: serial@1c28000 {</div><div class='add'>+			compatible = "snps,dw-apb-uart";</div><div class='add'>+			reg = &lt;0x01c28000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			reg-shift = &lt;2&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 67&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 46&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart1: serial@1c28400 {</div><div class='add'>+			compatible = "snps,dw-apb-uart";</div><div class='add'>+			reg = &lt;0x01c28400 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			reg-shift = &lt;2&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 68&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 47&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart2: serial@1c28800 {</div><div class='add'>+			compatible = "snps,dw-apb-uart";</div><div class='add'>+			reg = &lt;0x01c28800 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			reg-shift = &lt;2&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 69&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 48&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart3: serial@1c28c00 {</div><div class='add'>+			compatible = "snps,dw-apb-uart";</div><div class='add'>+			reg = &lt;0x01c28c00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			reg-shift = &lt;2&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 70&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 49&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart4: serial@1c29000 {</div><div class='add'>+			compatible = "snps,dw-apb-uart";</div><div class='add'>+			reg = &lt;0x01c29000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			reg-shift = &lt;2&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 71&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 50&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c0: i2c@1c2ac00 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-i2c";</div><div class='add'>+			reg = &lt;0x01c2ac00 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 63&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 42&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c1: i2c@1c2b000 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-i2c";</div><div class='add'>+			reg = &lt;0x01c2b000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 64&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 43&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c2: i2c@1c2b400 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-i2c";</div><div class='add'>+			reg = &lt;0x01c2b400 0x400&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;ccu 65&gt;;</div><div class='add'>+			resets = &lt;&amp;ccu 44&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gic: interrupt-controller@1c81000 {</div><div class='add'>+			compatible = "arm,gic-400";</div><div class='add'>+			reg = &lt;0x01c81000 0x1000&gt;,</div><div class='add'>+			      &lt;0x01c82000 0x2000&gt;,</div><div class='add'>+			      &lt;0x01c84000 0x2000&gt;,</div><div class='add'>+			      &lt;0x01c86000 0x2000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtc: rtc@1f00000 {</div><div class='add'>+			compatible = "allwinner,sun6i-a31-rtc";</div><div class='add'>+			reg = &lt;0x01f00000 0x54&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile<br/>index 47ec703cb230..3f94bce33b7f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/amlogic/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/Makefile</a></div><div class='hunk'>@@ -1,9 +1,19 @@</div><div class='add'>+dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p200.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p201.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-pro.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb</div><div class='ctx'> </div><div class='ctx'> always		:= $(dtb-y)</div><div class='ctx'> subdir-y	:= $(dts-dirs)</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi<br/>new file mode 100644<br/>index 000000000000..7a078bef04cd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi</a></div><div class='hunk'>@@ -0,0 +1,190 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Common DTSI for same Amlogic Q200/Q201 and P230/P231 boards using either</div><div class='add'>+ * the pin-compatible S912 (GXM) or S905D (GXL) SoCs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart_AO;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@0 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x80000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddio_boot: regulator-vddio_boot {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VDDIO_BOOT";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddao_3v3: regulator-vddao_3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VDDAO_3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_3v3: regulator-vcc_3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VCC_3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	emmc_pwrseq: emmc-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-emmc";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio BOOT_9 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wifi32k: wifi32k {</div><div class='add'>+		compatible = "pwm-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;32768&gt;;</div><div class='add'>+		pwms = &lt;&amp;pwm_ef 0 30518 0&gt;; /* PWM_E at 32.768KHz */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdio_pwrseq: sdio-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio GPIOX_6 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;wifi32k&gt;;</div><div class='add'>+		clock-names = "ext_clock";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This UART is brought out to the DB9 connector */</div><div class='add'>+&amp;uart_AO {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart_ao_a_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ir {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;remote_input_ao_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Wireless SDIO Module */</div><div class='add'>+&amp;sd_emmc_a {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;sdio_pwrseq&gt;;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vddao_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_boot&gt;;</div><div class='add'>+</div><div class='add'>+	brcmf: bcrmf@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		compatible = "brcm,bcm4329-fmac";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SD card */</div><div class='add'>+&amp;sd_emmc_b {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdcard_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	cd-gpios = &lt;&amp;gpio CARD_6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-inverted;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vddao_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_boot&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* eMMC */</div><div class='add'>+&amp;sd_emmc_c {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	max-frequency = &lt;200000000&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+	mmc-ddr-1_8v;</div><div class='add'>+	mmc-hs200-1_8v;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;emmc_pwrseq&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_boot&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm_ef {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pwm_e_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_FCLK_DIV4&gt;;</div><div class='add'>+	clock-names = "clkin0";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ethmac {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi<br/>new file mode 100644<br/>index 000000000000..5d995f7724af<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gx.dtsi</a></div><div class='hunk'>@@ -0,0 +1,462 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Andreas Färber</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 BayLibre, SAS.</div><div class='add'>+ * Author: Neil Armstrong &lt;narmstrong@baylibre.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		/* 16 MiB reserved for Hardware ROM Firmware */</div><div class='add'>+		hwrom_reserved: hwrom@0 {</div><div class='add'>+			reg = &lt;0x0 0x0 0x0 0x1000000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/* 2 MiB reserved for ARM Trusted Firmware (BL31) */</div><div class='add'>+		secmon_reserved: secmon@10000000 {</div><div class='add'>+			reg = &lt;0x0 0x10000000 0x0 0x200000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;0x2&gt;;</div><div class='add'>+		#size-cells = &lt;0x0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			reg = &lt;0x0 0x0&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu1: cpu@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			reg = &lt;0x0 0x1&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu2: cpu@2 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			reg = &lt;0x0 0x2&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu3: cpu@3 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			reg = &lt;0x0 0x3&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		l2: l2-cache0 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	arm-pmu {</div><div class='add'>+		compatible = "arm,cortex-a53-pmu";</div><div class='add'>+		interrupts = &lt;GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		interrupt-affinity = &lt;&amp;cpu0&gt;, &lt;&amp;cpu1&gt;, &lt;&amp;cpu2&gt;, &lt;&amp;cpu3&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-0.2";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "arm,armv8-timer";</div><div class='add'>+		interrupts = &lt;GIC_PPI 13</div><div class='add'>+			(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 14</div><div class='add'>+			(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 11</div><div class='add'>+			(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 10</div><div class='add'>+			(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	xtal: xtal-clk {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		clock-frequency = &lt;24000000&gt;;</div><div class='add'>+		clock-output-names = "xtal";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	firmware {</div><div class='add'>+		sm: secure-monitor {</div><div class='add'>+			compatible = "amlogic,meson-gx-sm", "amlogic,meson-gxbb-sm";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	efuse: efuse {</div><div class='add'>+		compatible = "amlogic,meson-gx-efuse", "amlogic,meson-gxbb-efuse";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		sn: sn@14 {</div><div class='add'>+			reg = &lt;0x14 0x10&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		eth_mac: eth_mac@34 {</div><div class='add'>+			reg = &lt;0x34 0x10&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		bid: bid@46 {</div><div class='add'>+			reg = &lt;0x46 0x30&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	scpi {</div><div class='add'>+		compatible = "amlogic,meson-gxbb-scpi", "arm,scpi-pre-1.0";</div><div class='add'>+		mboxes = &lt;&amp;mailbox 1 &amp;mailbox 2&gt;;</div><div class='add'>+		shmem = &lt;&amp;cpu_scp_lpri &amp;cpu_scp_hpri&gt;;</div><div class='add'>+</div><div class='add'>+		scpi_clocks: clocks {</div><div class='add'>+			compatible = "arm,scpi-clocks";</div><div class='add'>+</div><div class='add'>+			scpi_dvfs: scpi_clocks@0 {</div><div class='add'>+				compatible = "arm,scpi-dvfs-clocks";</div><div class='add'>+				#clock-cells = &lt;1&gt;;</div><div class='add'>+				clock-indices = &lt;0&gt;;</div><div class='add'>+				clock-output-names = "vcpu";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scpi_sensors: sensors {</div><div class='add'>+			compatible = "arm,scpi-sensors";</div><div class='add'>+			#thermal-sensor-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		cbus: cbus@c1100000 {</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			reg = &lt;0x0 0xc1100000 0x0 0x100000&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x0 0x0 0xc1100000 0x0 0x100000&gt;;</div><div class='add'>+</div><div class='add'>+			reset: reset-controller@4404 {</div><div class='add'>+				compatible = "amlogic,meson-gx-reset", "amlogic,meson-gxbb-reset";</div><div class='add'>+				reg = &lt;0x0 0x04404 0x0 0x20&gt;;</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart_A: serial@84c0 {</div><div class='add'>+				compatible = "amlogic,meson-uart";</div><div class='add'>+				reg = &lt;0x0 0x84c0 0x0 0x14&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 26 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				clocks = &lt;&amp;xtal&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart_B: serial@84dc {</div><div class='add'>+				compatible = "amlogic,meson-uart";</div><div class='add'>+				reg = &lt;0x0 0x84dc 0x0 0x14&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 75 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				clocks = &lt;&amp;xtal&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c_A: i2c@8500 {</div><div class='add'>+				compatible = "amlogic,meson-gxbb-i2c";</div><div class='add'>+				reg = &lt;0x0 0x08500 0x0 0x20&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 21 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pwm_ab: pwm@8550 {</div><div class='add'>+				compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";</div><div class='add'>+				reg = &lt;0x0 0x08550 0x0 0x10&gt;;</div><div class='add'>+				#pwm-cells = &lt;3&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pwm_cd: pwm@8650 {</div><div class='add'>+				compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";</div><div class='add'>+				reg = &lt;0x0 0x08650 0x0 0x10&gt;;</div><div class='add'>+				#pwm-cells = &lt;3&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			saradc: adc@8680 {</div><div class='add'>+				compatible = "amlogic,meson-saradc";</div><div class='add'>+				reg = &lt;0x0 0x8680 0x0 0x34&gt;;</div><div class='add'>+				#io-channel-cells = &lt;1&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 73 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pwm_ef: pwm@86c0 {</div><div class='add'>+				compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";</div><div class='add'>+				reg = &lt;0x0 0x086c0 0x0 0x10&gt;;</div><div class='add'>+				#pwm-cells = &lt;3&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart_C: serial@8700 {</div><div class='add'>+				compatible = "amlogic,meson-uart";</div><div class='add'>+				reg = &lt;0x0 0x8700 0x0 0x14&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 93 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				clocks = &lt;&amp;xtal&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c_B: i2c@87c0 {</div><div class='add'>+				compatible = "amlogic,meson-gxbb-i2c";</div><div class='add'>+				reg = &lt;0x0 0x087c0 0x0 0x20&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 214 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c_C: i2c@87e0 {</div><div class='add'>+				compatible = "amlogic,meson-gxbb-i2c";</div><div class='add'>+				reg = &lt;0x0 0x087e0 0x0 0x20&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 215 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			watchdog@98d0 {</div><div class='add'>+				compatible = "amlogic,meson-gx-wdt", "amlogic,meson-gxbb-wdt";</div><div class='add'>+				reg = &lt;0x0 0x098d0 0x0 0x10&gt;;</div><div class='add'>+				clocks = &lt;&amp;xtal&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gic: interrupt-controller@c4301000 {</div><div class='add'>+			compatible = "arm,gic-400";</div><div class='add'>+			reg = &lt;0x0 0xc4301000 0 0x1000&gt;,</div><div class='add'>+			      &lt;0x0 0xc4302000 0 0x2000&gt;,</div><div class='add'>+			      &lt;0x0 0xc4304000 0 0x2000&gt;,</div><div class='add'>+			      &lt;0x0 0xc4306000 0 0x2000&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			interrupts = &lt;GIC_PPI 9</div><div class='add'>+				(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			#address-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sram: sram@c8000000 {</div><div class='add'>+			compatible = "amlogic,meson-gxbb-sram", "mmio-sram";</div><div class='add'>+			reg = &lt;0x0 0xc8000000 0x0 0x14000&gt;;</div><div class='add'>+</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges = &lt;0 0x0 0xc8000000 0x14000&gt;;</div><div class='add'>+</div><div class='add'>+			cpu_scp_lpri: scp-shmem@0 {</div><div class='add'>+				compatible = "amlogic,meson-gxbb-scp-shmem";</div><div class='add'>+				reg = &lt;0x13000 0x400&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cpu_scp_hpri: scp-shmem@200 {</div><div class='add'>+				compatible = "amlogic,meson-gxbb-scp-shmem";</div><div class='add'>+				reg = &lt;0x13400 0x400&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		aobus: aobus@c8100000 {</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			reg = &lt;0x0 0xc8100000 0x0 0x100000&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x0 0x0 0xc8100000 0x0 0x100000&gt;;</div><div class='add'>+</div><div class='add'>+			uart_AO: serial@4c0 {</div><div class='add'>+				compatible = "amlogic,meson-uart";</div><div class='add'>+				reg = &lt;0x0 0x004c0 0x0 0x14&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 193 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				clocks = &lt;&amp;xtal&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart_AO_B: serial@4e0 {</div><div class='add'>+				compatible = "amlogic,meson-uart";</div><div class='add'>+				reg = &lt;0x0 0x004e0 0x0 0x14&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 197 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				clocks = &lt;&amp;xtal&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pwm_AO_ab: pwm@550 {</div><div class='add'>+				compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";</div><div class='add'>+				reg = &lt;0x0 0x00550 0x0 0x10&gt;;</div><div class='add'>+				#pwm-cells = &lt;3&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ir: ir@580 {</div><div class='add'>+				compatible = "amlogic,meson-gxbb-ir";</div><div class='add'>+				reg = &lt;0x0 0x00580 0x0 0x40&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 196 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		periphs: periphs@c8834000 {</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			reg = &lt;0x0 0xc8834000 0x0 0x2000&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x0 0x0 0xc8834000 0x0 0x2000&gt;;</div><div class='add'>+</div><div class='add'>+			rng {</div><div class='add'>+				compatible = "amlogic,meson-rng";</div><div class='add'>+				reg = &lt;0x0 0x0 0x0 0x4&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		hiubus: hiubus@c883c000 {</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			reg = &lt;0x0 0xc883c000 0x0 0x2000&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x0 0x0 0xc883c000 0x0 0x2000&gt;;</div><div class='add'>+</div><div class='add'>+			mailbox: mailbox@404 {</div><div class='add'>+				compatible = "amlogic,meson-gx-mhu", "amlogic,meson-gxbb-mhu";</div><div class='add'>+				reg = &lt;0 0x404 0 0x4c&gt;;</div><div class='add'>+				interrupts = &lt;0 208 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+					     &lt;0 209 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+					     &lt;0 210 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				#mbox-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ethmac: ethernet@c9410000 {</div><div class='add'>+			compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";</div><div class='add'>+			reg = &lt;0x0 0xc9410000 0x0 0x10000</div><div class='add'>+			       0x0 0xc8834540 0x0 0x4&gt;;</div><div class='add'>+			interrupts = &lt;0 8 1&gt;;</div><div class='add'>+			interrupt-names = "macirq";</div><div class='add'>+			phy-mode = "rgmii";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		apb: apb@d0000000 {</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			reg = &lt;0x0 0xd0000000 0x0 0x200000&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x0 0x0 0xd0000000 0x0 0x200000&gt;;</div><div class='add'>+</div><div class='add'>+			sd_emmc_a: mmc@70000 {</div><div class='add'>+				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";</div><div class='add'>+				reg = &lt;0x0 0x70000 0x0 0x2000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 216 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sd_emmc_b: mmc@72000 {</div><div class='add'>+				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";</div><div class='add'>+				reg = &lt;0x0 0x72000 0x0 0x2000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 217 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sd_emmc_c: mmc@74000 {</div><div class='add'>+				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";</div><div class='add'>+				reg = &lt;0x0 0x74000 0x0 0x2000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 218 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		vpu: vpu@d0100000 {</div><div class='add'>+			compatible = "amlogic,meson-gx-vpu";</div><div class='add'>+			reg = &lt;0x0 0xd0100000 0x0 0x100000&gt;,</div><div class='add'>+			      &lt;0x0 0xc883c000 0x0 0x1000&gt;,</div><div class='add'>+			      &lt;0x0 0xc8838000 0x0 0x1000&gt;;</div><div class='add'>+			reg-names = "vpu", "hhi", "dmc";</div><div class='add'>+			interrupts = &lt;GIC_SPI 3 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			/* CVBS VDAC output port */</div><div class='add'>+			cvbs_vdac_port: port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts<br/>new file mode 100644<br/>index 000000000000..4cbd626a9e88<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts</a></div><div class='hunk'>@@ -0,0 +1,247 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Andreas Färber</div><div class='add'>+ * Copyright (c) 2016 BayLibre, Inc.</div><div class='add'>+ * Author: Neil Armstrong &lt;narmstrong@kernel.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "meson-gxbb.dtsi"</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "nexbox,a95x", "amlogic,meson-gxbb";</div><div class='add'>+	model = "NEXBOX A95X";</div><div class='add'>+	</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart_AO;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@0 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+		blue {</div><div class='add'>+			label = "a95x:system-status";</div><div class='add'>+			gpios = &lt;&amp;gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys-polled {</div><div class='add'>+		compatible = "gpio-keys-polled";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		poll-interval = &lt;100&gt;;</div><div class='add'>+</div><div class='add'>+		button@0 {</div><div class='add'>+			label = "reset";</div><div class='add'>+			linux,code = &lt;KEY_RESTART&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddio_card: gpio-regulator {</div><div class='add'>+		compatible = "regulator-gpio";</div><div class='add'>+</div><div class='add'>+		regulator-name = "VDDIO_CARD";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+</div><div class='add'>+		gpios = &lt;&amp;gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpios-states = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		/* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */</div><div class='add'>+		states = &lt;1800000 0</div><div class='add'>+			  3300000 1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddio_boot: regulator-vddio_boot {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VDDIO_BOOT";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddao_3v3: regulator-vddao_3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VDDAO_3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_3v3: regulator-vcc_3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VCC_3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	emmc_pwrseq: emmc-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-emmc";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio BOOT_9 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wifi32k: wifi32k {</div><div class='add'>+		compatible = "pwm-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;32768&gt;;</div><div class='add'>+		pwms = &lt;&amp;pwm_ef 0 30518 0&gt;; /* PWM_E at 32.768KHz */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdio_pwrseq: sdio-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio GPIOX_6 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;wifi32k&gt;;</div><div class='add'>+		clock-names = "ext_clock";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cvbs-connector {</div><div class='add'>+		compatible = "composite-video-connector";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			cvbs_connector_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;cvbs_vdac_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart_AO {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart_ao_a_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ethmac {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;eth_rmii_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ir {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;remote_input_ao_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Wireless SDIO Module */</div><div class='add'>+&amp;sd_emmc_a {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;sdio_pwrseq&gt;;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vddao_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_boot&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SD card */</div><div class='add'>+&amp;sd_emmc_b {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdcard_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	cd-gpios = &lt;&amp;gpio CARD_6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-inverted;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vddao_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_card&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* eMMC */</div><div class='add'>+&amp;sd_emmc_c {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	max-frequency = &lt;200000000&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+	mmc-ddr-1_8v;</div><div class='add'>+	mmc-hs200-1_8v;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;emmc_pwrseq&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_boot&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm_ef {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pwm_e_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_FCLK_DIV4&gt;;</div><div class='add'>+	clock-names = "clkin0";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cvbs_vdac_port {</div><div class='add'>+	cvbs_vdac_out: endpoint {</div><div class='add'>+		remote-endpoint = &lt;&amp;cvbs_connector_in&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts<br/>index e6e3491d48a5..c59403adb387 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts</a></div><div class='hunk'>@@ -64,6 +64,18 @@</div><div class='ctx'> 		reg = &lt;0x0 0x0 0x0 0x80000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	usb_otg_pwr: regulator-usb-pwrs {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+</div><div class='add'>+		regulator-name = "USB_OTG_PWR";</div><div class='add'>+</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+</div><div class='add'>+		gpio = &lt;&amp;gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	leds {</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> 		blue {</div><div class='hunk'>@@ -73,6 +85,60 @@</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	tflash_vdd: regulator-tflash_vdd {</div><div class='add'>+		/*</div><div class='add'>+		 * signal name from schematics: TFLASH_VDD_EN</div><div class='add'>+		 */</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+</div><div class='add'>+		regulator-name = "TFLASH_VDD";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+</div><div class='add'>+		gpio = &lt;&amp;gpio_ao GPIOAO_12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	tf_io: gpio-regulator-tf_io {</div><div class='add'>+		compatible = "regulator-gpio";</div><div class='add'>+</div><div class='add'>+		regulator-name = "TF_IO";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * signal name from schematics: TF_3V3N_1V8_EN</div><div class='add'>+		 */</div><div class='add'>+		gpios = &lt;&amp;gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpios-states = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		states = &lt;3300000 0</div><div class='add'>+			  1800000 1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc1v8: regulator-vcc1v8 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VCC1V8";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc3v3: regulator-vcc3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VCC3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	emmc_pwrseq: emmc-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-emmc";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio BOOT_9 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;scpi_clocks {</div><div class='add'>+	status = "disabled";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart_AO {</div><div class='hunk'>@@ -83,8 +149,20 @@</div><div class='ctx'> </div><div class='ctx'> &amp;ethmac {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-0 = &lt;&amp;eth_pins&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;eth_rgmii_pins&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='add'>+	phy-handle = &lt;&amp;eth_phy0&gt;;</div><div class='add'>+</div><div class='add'>+	mdio {</div><div class='add'>+		compatible = "snps,dwmac-mdio";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		eth_phy0: ethernet-phy@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			eee-broken-1000t;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ir {</div><div class='hunk'>@@ -98,3 +176,58 @@</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;i2c_a_pins&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;usb0_phy {</div><div class='add'>+	status = "okay";</div><div class='add'>+	phy-supply = &lt;&amp;usb_otg_pwr&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb1_phy {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SD */</div><div class='add'>+&amp;sd_emmc_b {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdcard_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	cd-gpios = &lt;&amp;gpio CARD_6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-inverted;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;tflash_vdd&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;tf_io&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* eMMC */</div><div class='add'>+&amp;sd_emmc_c {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;200000000&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	mmc-ddr-1_8v;</div><div class='add'>+	mmc-hs200-1_8v;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;emmc_pwrseq&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vcc1v8&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts<br/>index 03e3d76626dd..fc0e86cb4cde 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts</a></div><div class='hunk'>@@ -45,10 +45,55 @@</div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='ctx'> #include "meson-gxbb-p20x.dtsi"</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "amlogic,p200", "amlogic,meson-gxbb";</div><div class='ctx'> 	model = "Amlogic Meson GXBB P200 Development Board";</div><div class='add'>+</div><div class='add'>+	avdd18_usb_adc: regulator-avdd18_usb_adc {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "AVDD18_USB_ADC";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	adc_keys {</div><div class='add'>+		compatible = "adc-keys";</div><div class='add'>+		io-channels = &lt;&amp;saradc 0&gt;;</div><div class='add'>+		io-channel-names = "buttons";</div><div class='add'>+		keyup-threshold-microvolt = &lt;1800000&gt;;</div><div class='add'>+</div><div class='add'>+		button-home {</div><div class='add'>+			label = "Home";</div><div class='add'>+			linux,code = &lt;KEY_HOME&gt;;</div><div class='add'>+			press-threshold-microvolt = &lt;900000&gt;; /* 50% */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		button-esc {</div><div class='add'>+			label = "Esc";</div><div class='add'>+			linux,code = &lt;KEY_ESC&gt;;</div><div class='add'>+			press-threshold-microvolt = &lt;684000&gt;; /* 38% */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		button-up {</div><div class='add'>+			label = "Volume Up";</div><div class='add'>+			linux,code = &lt;KEY_VOLUMEUP&gt;;</div><div class='add'>+			press-threshold-microvolt = &lt;468000&gt;; /* 26% */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		button-down {</div><div class='add'>+			label = "Volume Down";</div><div class='add'>+			linux,code = &lt;KEY_VOLUMEDOWN&gt;;</div><div class='add'>+			press-threshold-microvolt = &lt;252000&gt;; /* 14% */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		button-menu {</div><div class='add'>+			label = "Menu";</div><div class='add'>+			linux,code = &lt;KEY_MENU&gt;;</div><div class='add'>+			press-threshold-microvolt = &lt;0&gt;; /* 0% */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;i2c_B {</div><div class='hunk'>@@ -56,3 +101,8 @@</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;i2c_b_pins&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;saradc {</div><div class='add'>+	status = "okay";</div><div class='add'>+	vref-supply = &lt;&amp;avdd18_usb_adc&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi<br/>index 06a34dc6002f..4a96e0f6f926 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi</a></div><div class='hunk'>@@ -70,6 +70,71 @@</div><div class='ctx'> 		gpio = &lt;&amp;gpio GPIODV_24 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		enable-active-high;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	vddio_card: gpio-regulator {</div><div class='add'>+		compatible = "regulator-gpio";</div><div class='add'>+</div><div class='add'>+		regulator-name = "VDDIO_CARD";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+</div><div class='add'>+		gpios = &lt;&amp;gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpios-states = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		/* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */</div><div class='add'>+		states = &lt;1800000 0</div><div class='add'>+			  3300000 1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddio_boot: regulator-vddio_boot {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VDDIO_BOOT";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddao_3v3: regulator-vddao_3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VDDAO_3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_3v3: regulator-vcc_3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VCC_3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	emmc_pwrseq: emmc-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-emmc";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio BOOT_9 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wifi32k: wifi32k {</div><div class='add'>+		compatible = "pwm-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;32768&gt;;</div><div class='add'>+		pwms = &lt;&amp;pwm_ef 0 30518 0&gt;; /* PWM_E at 32.768KHz */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdio_pwrseq: sdio-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio GPIOX_6 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;wifi32k&gt;;</div><div class='add'>+		clock-names = "ext_clock";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cvbs-connector {</div><div class='add'>+		compatible = "composite-video-connector";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			cvbs_connector_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;cvbs_vdac_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This UART is brought out to the DB9 connector */</div><div class='hunk'>@@ -81,7 +146,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;ethmac {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-0 = &lt;&amp;eth_pins&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;eth_rgmii_pins&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -107,3 +172,81 @@</div><div class='ctx'> &amp;usb1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* Wireless SDIO Module */</div><div class='add'>+&amp;sd_emmc_a {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;sdio_pwrseq&gt;;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vddao_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_boot&gt;;</div><div class='add'>+</div><div class='add'>+	brcmf: bcrmf@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		compatible = "brcm,bcm4329-fmac";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SD card */</div><div class='add'>+&amp;sd_emmc_b {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdcard_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	cd-gpios = &lt;&amp;gpio CARD_6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-inverted;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vddao_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_card&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* eMMC */</div><div class='add'>+&amp;sd_emmc_c {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	max-frequency = &lt;200000000&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+	mmc-ddr-1_8v;</div><div class='add'>+	mmc-hs200-1_8v;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;emmc_pwrseq&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_boot&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm_ef {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pwm_e_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_FCLK_DIV4&gt;;</div><div class='add'>+	clock-names = "clkin0";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cvbs_vdac_port {</div><div class='add'>+	cvbs_vdac_out: endpoint {</div><div class='add'>+		remote-endpoint = &lt;&amp;cvbs_connector_in&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi<br/>index 73f159370188..86709929fd20 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi</a></div><div class='hunk'>@@ -53,6 +53,17 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		blue {</div><div class='add'>+			label = "vega-s95:blue:on";</div><div class='add'>+			gpios = &lt;&amp;gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "on";</div><div class='add'>+			panic-indicator;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	usb_vbus: regulator-usb0-vbus {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> </div><div class='hunk'>@@ -65,6 +76,39 @@</div><div class='ctx'> 		enable-active-high;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	vcc_3v3: regulator-vcc_3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VCC_3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_1v8: regulator-vcc_1v8 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VCC_1V8";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	emmc_pwrseq: emmc-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-emmc";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio BOOT_9 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wifi32k: wifi32k {</div><div class='add'>+		compatible = "pwm-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;32768&gt;;</div><div class='add'>+		pwms = &lt;&amp;pwm_ef 0 30518 0&gt;; /* PWM_E at 32.768KHz */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdio_pwrseq: sdio-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio GPIOX_6 GPIO_ACTIVE_LOW&gt;,</div><div class='add'>+				&lt;&amp;gpio GPIOX_20 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;wifi32k&gt;;</div><div class='add'>+		clock-names = "ext_clock";</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;uart_AO {</div><div class='hunk'>@@ -82,7 +126,7 @@</div><div class='ctx'> </div><div class='ctx'> &amp;ethmac {</div><div class='ctx'> 	status = "okay";</div><div class='del'>-	pinctrl-0 = &lt;&amp;eth_pins&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;eth_rgmii_pins&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -102,3 +146,74 @@</div><div class='ctx'> &amp;usb1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* Wireless SDIO Module */</div><div class='add'>+&amp;sd_emmc_a {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdio_pins &amp;sdio_irq_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;sdio_pwrseq&gt;;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vcc_1v8&gt;;</div><div class='add'>+</div><div class='add'>+	brcmf: bcrmf@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		compatible = "brcm,bcm4329-fmac";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SD card */</div><div class='add'>+&amp;sd_emmc_b {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdcard_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	cd-gpios = &lt;&amp;gpio CARD_6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-inverted;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_3v3&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* eMMC */</div><div class='add'>+&amp;sd_emmc_c {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	max-frequency = &lt;200000000&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+	mmc-ddr-1_8v;</div><div class='add'>+	mmc-hs200-1_8v;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;emmc_pwrseq&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_3v3&gt;;</div><div class='add'>+	vmmcq-sumpply = &lt;&amp;vcc_1v8&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm_ef {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pwm_e_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_FCLK_DIV4&gt;;</div><div class='add'>+	clock-names = "clkin0";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts<br/>new file mode 100644<br/>index 000000000000..56f855901262<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 BayLibre, Inc.</div><div class='add'>+ * Author: Neil Armstrong &lt;narmstrong@baylibre.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "meson-gxbb-p20x.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "wetek,hub", "amlogic,meson-gxbb";</div><div class='add'>+	model = "WeTek Hub";</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		system {</div><div class='add'>+			label = "wetek-play:system-status";</div><div class='add'>+			gpios = &lt;&amp;gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "on";</div><div class='add'>+			panic-indicator;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cvbs-connector {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts<br/>new file mode 100644<br/>index 000000000000..ea79fdd2c248<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts</a></div><div class='hunk'>@@ -0,0 +1,94 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 BayLibre, Inc.</div><div class='add'>+ * Author: Neil Armstrong &lt;narmstrong@baylibre.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "meson-gxbb-p20x.dtsi"</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "wetek,play2", "amlogic,meson-gxbb";</div><div class='add'>+	model = "WeTek Play 2";</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		system {</div><div class='add'>+			label = "wetek-play:system-status";</div><div class='add'>+			gpios = &lt;&amp;gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "on";</div><div class='add'>+			panic-indicator;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wifi {</div><div class='add'>+			label = "wetek-play:wifi-status";</div><div class='add'>+			gpios = &lt;&amp;gpio GPIODV_26 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ethernet {</div><div class='add'>+			label = "wetek-play:ethernet-status";</div><div class='add'>+			gpios = &lt;&amp;gpio GPIODV_27 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			default-state = "off";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys-polled {</div><div class='add'>+		compatible = "gpio-keys-polled";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		poll-interval = &lt;100&gt;;</div><div class='add'>+</div><div class='add'>+		button@0 {</div><div class='add'>+			label = "reset";</div><div class='add'>+			linux,code = &lt;KEY_RESTART&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c_A {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c_a_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi<br/>index 610e0e1c3cee..04b3324bc132 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi</a></div><div class='hunk'>@@ -40,9 +40,7 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='del'>-#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='del'>-#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include "meson-gx.dtsi"</div><div class='ctx'> #include &lt;dt-bindings/gpio/meson-gxbb-gpio.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/reset/amlogic,meson-gxbb-reset.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/clock/gxbb-clkc.h&gt;</div><div class='hunk'>@@ -51,619 +49,478 @@</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "amlogic,meson-gxbb";</div><div class='del'>-	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='ctx'> </div><div class='del'>-	cpus {</div><div class='del'>-		#address-cells = &lt;0x2&gt;;</div><div class='del'>-		#size-cells = &lt;0x0&gt;;</div><div class='del'>-</div><div class='del'>-		cpu0: cpu@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='del'>-			reg = &lt;0x0 0x0&gt;;</div><div class='del'>-			enable-method = "psci";</div><div class='add'>+	soc {</div><div class='add'>+		usb0_phy: phy@c0000000 {</div><div class='add'>+			compatible = "amlogic,meson-gxbb-usb2-phy";</div><div class='add'>+			#phy-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x0 0xc0000000 0x0 0x20&gt;;</div><div class='add'>+			resets = &lt;&amp;reset RESET_USB_OTG&gt;;</div><div class='add'>+			clocks = &lt;&amp;clkc CLKID_USB&gt;, &lt;&amp;clkc CLKID_USB0&gt;;</div><div class='add'>+			clock-names = "usb_general", "usb";</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu1: cpu@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='del'>-			reg = &lt;0x0 0x1&gt;;</div><div class='del'>-			enable-method = "psci";</div><div class='add'>+		usb1_phy: phy@c0000020 {</div><div class='add'>+			compatible = "amlogic,meson-gxbb-usb2-phy";</div><div class='add'>+			#phy-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x0 0xc0000020 0x0 0x20&gt;;</div><div class='add'>+			resets = &lt;&amp;reset RESET_USB_OTG&gt;;</div><div class='add'>+			clocks = &lt;&amp;clkc CLKID_USB&gt;, &lt;&amp;clkc CLKID_USB1&gt;;</div><div class='add'>+			clock-names = "usb_general", "usb";</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu2: cpu@2 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='del'>-			reg = &lt;0x0 0x2&gt;;</div><div class='del'>-			enable-method = "psci";</div><div class='add'>+		usb0: usb@c9000000 {</div><div class='add'>+			compatible = "amlogic,meson-gxbb-usb", "snps,dwc2";</div><div class='add'>+			reg = &lt;0x0 0xc9000000 0x0 0x40000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clkc CLKID_USB0_DDR_BRIDGE&gt;;</div><div class='add'>+			clock-names = "otg";</div><div class='add'>+			phys = &lt;&amp;usb0_phy&gt;;</div><div class='add'>+			phy-names = "usb2-phy";</div><div class='add'>+			dr_mode = "host";</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu3: cpu@3 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='del'>-			reg = &lt;0x0 0x3&gt;;</div><div class='del'>-			enable-method = "psci";</div><div class='add'>+		usb1: usb@c9100000 {</div><div class='add'>+			compatible = "amlogic,meson-gxbb-usb", "snps,dwc2";</div><div class='add'>+			reg = &lt;0x0 0xc9100000 0x0 0x40000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clkc CLKID_USB1_DDR_BRIDGE&gt;;</div><div class='add'>+			clock-names = "otg";</div><div class='add'>+			phys = &lt;&amp;usb1_phy&gt;;</div><div class='add'>+			phy-names = "usb2-phy";</div><div class='add'>+			dr_mode = "host";</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	arm-pmu {</div><div class='del'>-		compatible = "arm,cortex-a53-pmu";</div><div class='del'>-		interrupts = &lt;GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='del'>-			     &lt;GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='del'>-			     &lt;GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='del'>-			     &lt;GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-		interrupt-affinity = &lt;&amp;cpu0&gt;, &lt;&amp;cpu1&gt;, &lt;&amp;cpu2&gt;, &lt;&amp;cpu3&gt;;</div><div class='add'>+&amp;cbus {</div><div class='add'>+	spifc: spi@8c80 {</div><div class='add'>+		compatible = "amlogic,meson-gxbb-spifc";</div><div class='add'>+		reg = &lt;0x0 0x08c80 0x0 0x80&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;clkc CLKID_SPI&gt;;</div><div class='add'>+		status = "disabled";</div><div class='ctx'> 	};</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	psci {</div><div class='del'>-		compatible = "arm,psci-0.2";</div><div class='del'>-		method = "smc";</div><div class='del'>-	};</div><div class='add'>+&amp;ethmac {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_ETH&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_FCLK_DIV2&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_MPLL2&gt;;</div><div class='add'>+	clock-names = "stmmaceth", "clkin0", "clkin1";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;aobus {</div><div class='add'>+	pinctrl_aobus: pinctrl@14 {</div><div class='add'>+		compatible = "amlogic,meson-gxbb-aobus-pinctrl";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='ctx'> </div><div class='del'>-	firmware {</div><div class='del'>-		sm: secure-monitor {</div><div class='del'>-			compatible = "amlogic,meson-gxbb-sm";</div><div class='add'>+		gpio_ao: bank@14 {</div><div class='add'>+			reg = &lt;0x0 0x00014 0x0 0x8&gt;,</div><div class='add'>+			      &lt;0x0 0x0002c 0x0 0x4&gt;,</div><div class='add'>+			      &lt;0x0 0x00024 0x0 0x8&gt;;</div><div class='add'>+			reg-names = "mux", "pull", "gpio";</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	efuse: efuse {</div><div class='del'>-		compatible = "amlogic,meson-gxbb-efuse";</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='add'>+		uart_ao_a_pins: uart_ao_a {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_tx_ao_a", "uart_rx_ao_a";</div><div class='add'>+				function = "uart_ao";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_ao_a_cts_rts_pins: uart_ao_a_cts_rts {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_cts_ao_a",</div><div class='add'>+				       "uart_rts_ao_a";</div><div class='add'>+				function = "uart_ao";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_ao_b_pins: uart_ao_b {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_tx_ao_b", "uart_rx_ao_b";</div><div class='add'>+				function = "uart_ao_b";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_ao_b_cts_rts_pins: uart_ao_b_cts_rts {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_cts_ao_b",</div><div class='add'>+				       "uart_rts_ao_b";</div><div class='add'>+				function = "uart_ao_b";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-		sn: sn@14 {</div><div class='del'>-			reg = &lt;0x14 0x10&gt;;</div><div class='add'>+		remote_input_ao_pins: remote_input_ao {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "remote_input_ao";</div><div class='add'>+				function = "remote_input_ao";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c_ao_pins: i2c_ao {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "i2c_sck_ao",</div><div class='add'>+				       "i2c_sda_ao";</div><div class='add'>+				function = "i2c_ao";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm_ao_a_3_pins: pwm_ao_a_3 {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_ao_a_3";</div><div class='add'>+				function = "pwm_ao_a_3";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm_ao_a_6_pins: pwm_ao_a_6 {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_ao_a_6";</div><div class='add'>+				function = "pwm_ao_a_6";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		eth_mac: eth_mac@34 {</div><div class='del'>-			reg = &lt;0x34 0x10&gt;;</div><div class='add'>+		pwm_ao_a_12_pins: pwm_ao_a_12 {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_ao_a_12";</div><div class='add'>+				function = "pwm_ao_a_12";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		bid: bid@46 {</div><div class='del'>-			reg = &lt;0x46 0x30&gt;;</div><div class='add'>+		pwm_ao_b_pins: pwm_ao_b {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_ao_b";</div><div class='add'>+				function = "pwm_ao_b";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	timer {</div><div class='del'>-		compatible = "arm,armv8-timer";</div><div class='del'>-		interrupts = &lt;GIC_PPI 13</div><div class='del'>-			(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='del'>-			     &lt;GIC_PPI 14</div><div class='del'>-			(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='del'>-			     &lt;GIC_PPI 11</div><div class='del'>-			(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='del'>-			     &lt;GIC_PPI 10</div><div class='del'>-			(GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='add'>+	clkc_AO: clock-controller@040 {</div><div class='add'>+		compatible = "amlogic,gxbb-aoclkc";</div><div class='add'>+		reg = &lt;0x0 0x00040 0x0 0x4&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+		#reset-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	xtal: xtal-clk {</div><div class='del'>-		compatible = "fixed-clock";</div><div class='del'>-		clock-frequency = &lt;24000000&gt;;</div><div class='del'>-		clock-output-names = "xtal";</div><div class='del'>-		#clock-cells = &lt;0&gt;;</div><div class='add'>+	pwm_ab_AO: pwm@550 {</div><div class='add'>+		compatible = "amlogic,meson-gxbb-pwm";</div><div class='add'>+		reg = &lt;0x0 0x0550 0x0 0x10&gt;;</div><div class='add'>+		#pwm-cells = &lt;3&gt;;</div><div class='add'>+		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc {</div><div class='del'>-		compatible = "simple-bus";</div><div class='add'>+	i2c_AO: i2c@500 {</div><div class='add'>+		compatible = "amlogic,meson-gxbb-i2c";</div><div class='add'>+		reg = &lt;0x0 0x500 0x0 0x20&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 195 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+		clocks = &lt;&amp;clkc CLKID_AO_I2C&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;periphs {</div><div class='add'>+	pinctrl_periphs: pinctrl@4b0 {</div><div class='add'>+		compatible = "amlogic,meson-gxbb-periphs-pinctrl";</div><div class='ctx'> 		#address-cells = &lt;2&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		ranges;</div><div class='ctx'> </div><div class='del'>-		usb0_phy: phy@c0000000 {</div><div class='del'>-			compatible = "amlogic,meson-gxbb-usb2-phy";</div><div class='del'>-			#phy-cells = &lt;0&gt;;</div><div class='del'>-			reg = &lt;0x0 0xc0000000 0x0 0x20&gt;;</div><div class='del'>-			resets = &lt;&amp;reset RESET_USB_OTG&gt;;</div><div class='del'>-			clocks = &lt;&amp;clkc CLKID_USB&gt;, &lt;&amp;clkc CLKID_USB0&gt;;</div><div class='del'>-			clock-names = "usb_general", "usb";</div><div class='del'>-			status = "disabled";</div><div class='add'>+		gpio: bank@4b0 {</div><div class='add'>+			reg = &lt;0x0 0x004b0 0x0 0x28&gt;,</div><div class='add'>+			      &lt;0x0 0x004e8 0x0 0x14&gt;,</div><div class='add'>+			      &lt;0x0 0x00120 0x0 0x14&gt;,</div><div class='add'>+			      &lt;0x0 0x00430 0x0 0x40&gt;;</div><div class='add'>+			reg-names = "mux", "pull", "pull-enable", "gpio";</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		usb1_phy: phy@c0000020 {</div><div class='del'>-			compatible = "amlogic,meson-gxbb-usb2-phy";</div><div class='del'>-			#phy-cells = &lt;0&gt;;</div><div class='del'>-			reg = &lt;0x0 0xc0000020 0x0 0x20&gt;;</div><div class='del'>-			clocks = &lt;&amp;clkc CLKID_USB&gt;, &lt;&amp;clkc CLKID_USB1&gt;;</div><div class='del'>-			clock-names = "usb_general", "usb";</div><div class='del'>-			status = "disabled";</div><div class='add'>+		emmc_pins: emmc {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "emmc_nand_d07",</div><div class='add'>+				       "emmc_cmd",</div><div class='add'>+				       "emmc_clk",</div><div class='add'>+				       "emmc_ds";</div><div class='add'>+				function = "emmc";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		nor_pins: nor {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "nor_d",</div><div class='add'>+				       "nor_q",</div><div class='add'>+				       "nor_c",</div><div class='add'>+				       "nor_cs";</div><div class='add'>+				function = "nor";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cbus: cbus@c1100000 {</div><div class='del'>-			compatible = "simple-bus";</div><div class='del'>-			reg = &lt;0x0 0xc1100000 0x0 0x100000&gt;;</div><div class='del'>-			#address-cells = &lt;2&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x0 0x0 0xc1100000 0x0 0x100000&gt;;</div><div class='add'>+		sdcard_pins: sdcard {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "sdcard_d0",</div><div class='add'>+				       "sdcard_d1",</div><div class='add'>+				       "sdcard_d2",</div><div class='add'>+				       "sdcard_d3",</div><div class='add'>+				       "sdcard_cmd",</div><div class='add'>+				       "sdcard_clk";</div><div class='add'>+				function = "sdcard";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-			reset: reset-controller@4404 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-reset";</div><div class='del'>-				reg = &lt;0x0 0x04404 0x0 0x20&gt;;</div><div class='del'>-				#reset-cells = &lt;1&gt;;</div><div class='add'>+		sdio_pins: sdio {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "sdio_d0",</div><div class='add'>+				       "sdio_d1",</div><div class='add'>+				       "sdio_d2",</div><div class='add'>+				       "sdio_d3",</div><div class='add'>+				       "sdio_cmd",</div><div class='add'>+				       "sdio_clk";</div><div class='add'>+				function = "sdio";</div><div class='ctx'> 			};</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-			uart_A: serial@84c0 {</div><div class='del'>-				compatible = "amlogic,meson-uart";</div><div class='del'>-				reg = &lt;0x0 0x84c0 0x0 0x14&gt;;</div><div class='del'>-				interrupts = &lt;GIC_SPI 26 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-				clocks = &lt;&amp;xtal&gt;;</div><div class='del'>-				status = "disabled";</div><div class='add'>+		sdio_irq_pins: sdio_irq {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "sdio_irq";</div><div class='add'>+				function = "sdio";</div><div class='ctx'> 			};</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-			uart_B: serial@84dc {</div><div class='del'>-				compatible = "amlogic,meson-uart";</div><div class='del'>-				reg = &lt;0x0 0x84dc 0x0 0x14&gt;;</div><div class='del'>-				interrupts = &lt;GIC_SPI 75 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-				clocks = &lt;&amp;xtal&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pwm_ab: pwm@8550 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-pwm";</div><div class='del'>-				reg = &lt;0x0 0x08550 0x0 0x10&gt;;</div><div class='del'>-				#pwm-cells = &lt;3&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pwm_cd: pwm@8650 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-pwm";</div><div class='del'>-				reg = &lt;0x0 0x08650 0x0 0x10&gt;;</div><div class='del'>-				#pwm-cells = &lt;3&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pwm_ef: pwm@86c0 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-pwm";</div><div class='del'>-				reg = &lt;0x0 0x086c0 0x0 0x10&gt;;</div><div class='del'>-				#pwm-cells = &lt;3&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			uart_C: serial@8700 {</div><div class='del'>-				compatible = "amlogic,meson-uart";</div><div class='del'>-				reg = &lt;0x0 0x8700 0x0 0x14&gt;;</div><div class='del'>-				interrupts = &lt;GIC_SPI 93 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-				clocks = &lt;&amp;xtal&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			watchdog@98d0 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-wdt";</div><div class='del'>-				reg = &lt;0x0 0x098d0 0x0 0x10&gt;;</div><div class='del'>-				clocks = &lt;&amp;xtal&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			spifc: spi@8c80 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-spifc";</div><div class='del'>-				reg = &lt;0x0 0x08c80 0x0 0x80&gt;;</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				clocks = &lt;&amp;clkc CLKID_SPI&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c_A: i2c@8500 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-i2c";</div><div class='del'>-				reg = &lt;0x0 0x08500 0x0 0x20&gt;;</div><div class='del'>-				interrupts = &lt;GIC_SPI 21 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-				clocks = &lt;&amp;clkc CLKID_I2C&gt;;</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c_B: i2c@87c0 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-i2c";</div><div class='del'>-				reg = &lt;0x0 0x087c0 0x0 0x20&gt;;</div><div class='del'>-				interrupts = &lt;GIC_SPI 214 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-				clocks = &lt;&amp;clkc CLKID_I2C&gt;;</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c_C: i2c@87e0 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-i2c";</div><div class='del'>-				reg = &lt;0x0 0x087e0 0x0 0x20&gt;;</div><div class='del'>-				interrupts = &lt;GIC_SPI 215 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-				clocks = &lt;&amp;clkc CLKID_I2C&gt;;</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gic: interrupt-controller@c4301000 {</div><div class='del'>-			compatible = "arm,gic-400";</div><div class='del'>-			reg = &lt;0x0 0xc4301000 0 0x1000&gt;,</div><div class='del'>-			      &lt;0x0 0xc4302000 0 0x2000&gt;,</div><div class='del'>-			      &lt;0x0 0xc4304000 0 0x2000&gt;,</div><div class='del'>-			      &lt;0x0 0xc4306000 0 0x2000&gt;;</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			interrupts = &lt;GIC_PPI 9</div><div class='del'>-				(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='del'>-			#interrupt-cells = &lt;3&gt;;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		aobus: aobus@c8100000 {</div><div class='del'>-			compatible = "simple-bus";</div><div class='del'>-			reg = &lt;0x0 0xc8100000 0x0 0x100000&gt;;</div><div class='del'>-			#address-cells = &lt;2&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x0 0x0 0xc8100000 0x0 0x100000&gt;;</div><div class='del'>-</div><div class='del'>-			pinctrl_aobus: pinctrl@14 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-aobus-pinctrl";</div><div class='del'>-				#address-cells = &lt;2&gt;;</div><div class='del'>-				#size-cells = &lt;2&gt;;</div><div class='del'>-				ranges;</div><div class='del'>-</div><div class='del'>-				gpio_ao: bank@14 {</div><div class='del'>-					reg = &lt;0x0 0x00014 0x0 0x8&gt;,</div><div class='del'>-					      &lt;0x0 0x0002c 0x0 0x4&gt;,</div><div class='del'>-					      &lt;0x0 0x00024 0x0 0x8&gt;;</div><div class='del'>-					reg-names = "mux", "pull", "gpio";</div><div class='del'>-					gpio-controller;</div><div class='del'>-					#gpio-cells = &lt;2&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				uart_ao_a_pins: uart_ao_a {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "uart_tx_ao_a", "uart_rx_ao_a";</div><div class='del'>-						function = "uart_ao";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				remote_input_ao_pins: remote_input_ao {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "remote_input_ao";</div><div class='del'>-						function = "remote_input_ao";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				i2c_ao_pins: i2c_ao {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "i2c_sck_ao",</div><div class='del'>-						       "i2c_sda_ao";</div><div class='del'>-						function = "i2c_ao";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pwm_ao_a_3_pins: pwm_ao_a_3 {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "pwm_ao_a_3";</div><div class='del'>-						function = "pwm_ao_a_3";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pwm_ao_a_6_pins: pwm_ao_a_6 {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "pwm_ao_a_6";</div><div class='del'>-						function = "pwm_ao_a_6";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pwm_ao_a_12_pins: pwm_ao_a_12 {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "pwm_ao_a_12";</div><div class='del'>-						function = "pwm_ao_a_12";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pwm_ao_b_pins: pwm_ao_b {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "pwm_ao_b";</div><div class='del'>-						function = "pwm_ao_b";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			clkc_AO: clock-controller@040 {</div><div class='del'>-				compatible = "amlogic,gxbb-aoclkc";</div><div class='del'>-				reg = &lt;0x0 0x00040 0x0 0x4&gt;;</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				#reset-cells = &lt;1&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			uart_AO: serial@4c0 {</div><div class='del'>-				compatible = "amlogic,meson-uart";</div><div class='del'>-				reg = &lt;0x0 0x004c0 0x0 0x14&gt;;</div><div class='del'>-				interrupts = &lt;GIC_SPI 193 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-				clocks = &lt;&amp;xtal&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			ir: ir@580 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-ir";</div><div class='del'>-				reg = &lt;0x0 0x00580 0x0 0x40&gt;;</div><div class='del'>-				interrupts = &lt;GIC_SPI 196 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pwm_ab_AO: pwm@550 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-pwm";</div><div class='del'>-				reg = &lt;0x0 0x0550 0x0 0x10&gt;;</div><div class='del'>-				#pwm-cells = &lt;3&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			i2c_AO: i2c@500 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-i2c";</div><div class='del'>-				reg = &lt;0x0 0x500 0x0 0x20&gt;;</div><div class='del'>-				interrupts = &lt;GIC_SPI 195 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-				clocks = &lt;&amp;clkc CLKID_AO_I2C&gt;;</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				status = "disabled";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		periphs: periphs@c8834000 {</div><div class='del'>-			compatible = "simple-bus";</div><div class='del'>-			reg = &lt;0x0 0xc8834000 0x0 0x2000&gt;;</div><div class='del'>-			#address-cells = &lt;2&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x0 0x0 0xc8834000 0x0 0x2000&gt;;</div><div class='del'>-</div><div class='del'>-			rng {</div><div class='del'>-				compatible = "amlogic,meson-rng";</div><div class='del'>-				reg = &lt;0x0 0x0 0x0 0x4&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			pinctrl_periphs: pinctrl@4b0 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-periphs-pinctrl";</div><div class='del'>-				#address-cells = &lt;2&gt;;</div><div class='del'>-				#size-cells = &lt;2&gt;;</div><div class='del'>-				ranges;</div><div class='del'>-</div><div class='del'>-				gpio: bank@4b0 {</div><div class='del'>-					reg = &lt;0x0 0x004b0 0x0 0x28&gt;,</div><div class='del'>-					      &lt;0x0 0x004e8 0x0 0x14&gt;,</div><div class='del'>-					      &lt;0x0 0x00120 0x0 0x14&gt;,</div><div class='del'>-					      &lt;0x0 0x00430 0x0 0x40&gt;;</div><div class='del'>-					reg-names = "mux", "pull", "pull-enable", "gpio";</div><div class='del'>-					gpio-controller;</div><div class='del'>-					#gpio-cells = &lt;2&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				emmc_pins: emmc {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "emmc_nand_d07",</div><div class='del'>-						       "emmc_cmd",</div><div class='del'>-						       "emmc_clk";</div><div class='del'>-						function = "emmc";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				nor_pins: nor {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "nor_d",</div><div class='del'>-						       "nor_q",</div><div class='del'>-						       "nor_c",</div><div class='del'>-						       "nor_cs";</div><div class='del'>-						function = "nor";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				sdcard_pins: sdcard {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "sdcard_d0",</div><div class='del'>-						       "sdcard_d1",</div><div class='del'>-						       "sdcard_d2",</div><div class='del'>-						       "sdcard_d3",</div><div class='del'>-						       "sdcard_cmd",</div><div class='del'>-						       "sdcard_clk";</div><div class='del'>-						function = "sdcard";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				sdio_pins: sdio {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "sdio_d0",</div><div class='del'>-						       "sdio_d1",</div><div class='del'>-						       "sdio_d2",</div><div class='del'>-						       "sdio_d3",</div><div class='del'>-						       "sdio_cmd",</div><div class='del'>-						       "sdio_clk";</div><div class='del'>-						function = "sdio";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				sdio_irq_pins: sdio_irq {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "sdio_irq";</div><div class='del'>-						function = "sdio";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				uart_a_pins: uart_a {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "uart_tx_a",</div><div class='del'>-						       "uart_rx_a";</div><div class='del'>-						function = "uart_a";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				uart_b_pins: uart_b {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "uart_tx_b",</div><div class='del'>-						       "uart_rx_b";</div><div class='del'>-						function = "uart_b";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				uart_c_pins: uart_c {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "uart_tx_c",</div><div class='del'>-						       "uart_rx_c";</div><div class='del'>-						function = "uart_c";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				i2c_a_pins: i2c_a {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "i2c_sck_a",</div><div class='del'>-						       "i2c_sda_a";</div><div class='del'>-						function = "i2c_a";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				i2c_b_pins: i2c_b {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "i2c_sck_b",</div><div class='del'>-						       "i2c_sda_b";</div><div class='del'>-						function = "i2c_b";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				i2c_c_pins: i2c_c {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "i2c_sck_c",</div><div class='del'>-						       "i2c_sda_c";</div><div class='del'>-						function = "i2c_c";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				eth_pins: eth_c {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "eth_mdio",</div><div class='del'>-						       "eth_mdc",</div><div class='del'>-						       "eth_clk_rx_clk",</div><div class='del'>-						       "eth_rx_dv",</div><div class='del'>-						       "eth_rxd0",</div><div class='del'>-						       "eth_rxd1",</div><div class='del'>-						       "eth_rxd2",</div><div class='del'>-						       "eth_rxd3",</div><div class='del'>-						       "eth_rgmii_tx_clk",</div><div class='del'>-						       "eth_tx_en",</div><div class='del'>-						       "eth_txd0",</div><div class='del'>-						       "eth_txd1",</div><div class='del'>-						       "eth_txd2",</div><div class='del'>-						       "eth_txd3";</div><div class='del'>-						function = "eth";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pwm_a_x_pins: pwm_a_x {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "pwm_a_x";</div><div class='del'>-						function = "pwm_a_x";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pwm_a_y_pins: pwm_a_y {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "pwm_a_y";</div><div class='del'>-						function = "pwm_a_y";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pwm_b_pins: pwm_b {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "pwm_b";</div><div class='del'>-						function = "pwm_b";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pwm_d_pins: pwm_d {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "pwm_d";</div><div class='del'>-						function = "pwm_d";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pwm_e_pins: pwm_e {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "pwm_e";</div><div class='del'>-						function = "pwm_e";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pwm_f_x_pins: pwm_f_x {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "pwm_f_x";</div><div class='del'>-						function = "pwm_f_x";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				pwm_f_y_pins: pwm_f_y {</div><div class='del'>-					mux {</div><div class='del'>-						groups = "pwm_f_y";</div><div class='del'>-						function = "pwm_f_y";</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		hiubus: hiubus@c883c000 {</div><div class='del'>-			compatible = "simple-bus";</div><div class='del'>-			reg = &lt;0x0 0xc883c000 0x0 0x2000&gt;;</div><div class='del'>-			#address-cells = &lt;2&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x0 0x0 0xc883c000 0x0 0x2000&gt;;</div><div class='del'>-</div><div class='del'>-			clkc: clock-controller@0 {</div><div class='del'>-				compatible = "amlogic,gxbb-clkc";</div><div class='del'>-				#clock-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0x0 0x0 0x0 0x3db&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			mailbox: mailbox@404 {</div><div class='del'>-				compatible = "amlogic,meson-gxbb-mhu";</div><div class='del'>-				reg = &lt;0 0x404 0 0x4c&gt;;</div><div class='del'>-				interrupts = &lt;0 208 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='del'>-					     &lt;0 209 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='del'>-					     &lt;0 210 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='del'>-				#mbox-cells = &lt;1&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		apb: apb@d0000000 {</div><div class='del'>-			compatible = "simple-bus";</div><div class='del'>-			reg = &lt;0x0 0xd0000000 0x0 0x200000&gt;;</div><div class='del'>-			#address-cells = &lt;2&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x0 0x0 0xd0000000 0x0 0x200000&gt;;</div><div class='add'>+		uart_a_pins: uart_a {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_tx_a",</div><div class='add'>+				       "uart_rx_a";</div><div class='add'>+				function = "uart_a";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		usb0: usb@c9000000 {</div><div class='del'>-			compatible = "amlogic,meson-gxbb-usb", "snps,dwc2";</div><div class='del'>-			reg = &lt;0x0 0xc9000000 0x0 0x40000&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;clkc CLKID_USB0_DDR_BRIDGE&gt;;</div><div class='del'>-			clock-names = "otg";</div><div class='del'>-			phys = &lt;&amp;usb0_phy&gt;;</div><div class='del'>-			phy-names = "usb2-phy";</div><div class='del'>-			dr_mode = "host";</div><div class='del'>-			status = "disabled";</div><div class='add'>+		uart_a_cts_rts_pins: uart_a_cts_rts {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_cts_a",</div><div class='add'>+				       "uart_rts_a";</div><div class='add'>+				function = "uart_a";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		usb1: usb@c9100000 {</div><div class='del'>-			compatible = "amlogic,meson-gxbb-usb", "snps,dwc2";</div><div class='del'>-			reg = &lt;0x0 0xc9100000 0x0 0x40000&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			clocks = &lt;&amp;clkc CLKID_USB1_DDR_BRIDGE&gt;;</div><div class='del'>-			clock-names = "otg";</div><div class='del'>-			phys = &lt;&amp;usb1_phy&gt;;</div><div class='del'>-			phy-names = "usb2-phy";</div><div class='del'>-			dr_mode = "host";</div><div class='del'>-			status = "disabled";</div><div class='add'>+		uart_b_pins: uart_b {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_tx_b",</div><div class='add'>+				       "uart_rx_b";</div><div class='add'>+				function = "uart_b";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ethmac: ethernet@c9410000 {</div><div class='del'>-			compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac";</div><div class='del'>-			reg = &lt;0x0 0xc9410000 0x0 0x10000</div><div class='del'>-			       0x0 0xc8834540 0x0 0x4&gt;;</div><div class='del'>-			interrupts = &lt;0 8 1&gt;;</div><div class='del'>-			interrupt-names = "macirq";</div><div class='del'>-			clocks = &lt;&amp;clkc CLKID_ETH&gt;,</div><div class='del'>-				 &lt;&amp;clkc CLKID_FCLK_DIV2&gt;,</div><div class='del'>-				 &lt;&amp;clkc CLKID_MPLL2&gt;;</div><div class='del'>-			clock-names = "stmmaceth", "clkin0", "clkin1";</div><div class='del'>-			phy-mode = "rgmii";</div><div class='del'>-			status = "disabled";</div><div class='add'>+		uart_b_cts_rts_pins: uart_b_cts_rts {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_cts_b",</div><div class='add'>+				       "uart_rts_b";</div><div class='add'>+				function = "uart_b";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_c_pins: uart_c {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_tx_c",</div><div class='add'>+				       "uart_rx_c";</div><div class='add'>+				function = "uart_c";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_c_cts_rts_pins: uart_c_cts_rts {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_cts_c",</div><div class='add'>+				       "uart_rts_c";</div><div class='add'>+				function = "uart_c";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c_a_pins: i2c_a {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "i2c_sck_a",</div><div class='add'>+				       "i2c_sda_a";</div><div class='add'>+				function = "i2c_a";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c_b_pins: i2c_b {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "i2c_sck_b",</div><div class='add'>+				       "i2c_sda_b";</div><div class='add'>+				function = "i2c_b";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c_c_pins: i2c_c {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "i2c_sck_c",</div><div class='add'>+				       "i2c_sda_c";</div><div class='add'>+				function = "i2c_c";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		eth_rgmii_pins: eth-rgmii {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "eth_mdio",</div><div class='add'>+				       "eth_mdc",</div><div class='add'>+				       "eth_clk_rx_clk",</div><div class='add'>+				       "eth_rx_dv",</div><div class='add'>+				       "eth_rxd0",</div><div class='add'>+				       "eth_rxd1",</div><div class='add'>+				       "eth_rxd2",</div><div class='add'>+				       "eth_rxd3",</div><div class='add'>+				       "eth_rgmii_tx_clk",</div><div class='add'>+				       "eth_tx_en",</div><div class='add'>+				       "eth_txd0",</div><div class='add'>+				       "eth_txd1",</div><div class='add'>+				       "eth_txd2",</div><div class='add'>+				       "eth_txd3";</div><div class='add'>+				function = "eth";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		eth_rmii_pins: eth-rmii {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "eth_mdio",</div><div class='add'>+				       "eth_mdc",</div><div class='add'>+				       "eth_clk_rx_clk",</div><div class='add'>+				       "eth_rx_dv",</div><div class='add'>+				       "eth_rxd0",</div><div class='add'>+				       "eth_rxd1",</div><div class='add'>+				       "eth_tx_en",</div><div class='add'>+				       "eth_txd0",</div><div class='add'>+				       "eth_txd1";</div><div class='add'>+				function = "eth";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm_a_x_pins: pwm_a_x {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_a_x";</div><div class='add'>+				function = "pwm_a_x";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm_a_y_pins: pwm_a_y {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_a_y";</div><div class='add'>+				function = "pwm_a_y";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm_b_pins: pwm_b {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_b";</div><div class='add'>+				function = "pwm_b";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm_d_pins: pwm_d {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_d";</div><div class='add'>+				function = "pwm_d";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm_e_pins: pwm_e {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_e";</div><div class='add'>+				function = "pwm_e";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm_f_x_pins: pwm_f_x {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_f_x";</div><div class='add'>+				function = "pwm_f_x";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm_f_y_pins: pwm_f_y {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_f_y";</div><div class='add'>+				function = "pwm_f_y";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hdmi_hpd_pins: hdmi_hpd {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "hdmi_hpd";</div><div class='add'>+				function = "hdmi_hpd";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hdmi_i2c_pins: hdmi_i2c {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "hdmi_sda", "hdmi_scl";</div><div class='add'>+				function = "hdmi_i2c";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;hiubus {</div><div class='add'>+	clkc: clock-controller@0 {</div><div class='add'>+		compatible = "amlogic,gxbb-clkc";</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x3db&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c_A {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_I2C&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c_B {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_I2C&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c_C {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_I2C&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;saradc {</div><div class='add'>+	compatible = "amlogic,meson-gxbb-saradc", "amlogic,meson-saradc";</div><div class='add'>+	clocks = &lt;&amp;xtal&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_SAR_ADC&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_SANA&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_SAR_ADC_CLK&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_SAR_ADC_SEL&gt;;</div><div class='add'>+	clock-names = "clkin", "core", "sana", "adc_clk", "adc_sel";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sd_emmc_a {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_SD_EMMC_A&gt;,</div><div class='add'>+		 &lt;&amp;xtal&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_FCLK_DIV2&gt;;</div><div class='add'>+	clock-names = "core", "clkin0", "clkin1";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sd_emmc_b {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_SD_EMMC_B&gt;,</div><div class='add'>+		 &lt;&amp;xtal&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_FCLK_DIV2&gt;;</div><div class='add'>+	clock-names = "core", "clkin0", "clkin1";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sd_emmc_c {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_SD_EMMC_C&gt;,</div><div class='add'>+		 &lt;&amp;xtal&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_FCLK_DIV2&gt;;</div><div class='add'>+	clock-names = "core", "clkin0", "clkin1";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;vpu {</div><div class='add'>+	compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts<br/>new file mode 100644<br/>index 000000000000..f66939cacd37<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "meson-gxl-s905d.dtsi"</div><div class='add'>+#include "meson-gx-p23x-q20x.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "amlogic,p230", "amlogic,s905d", "amlogic,meson-gxl";</div><div class='add'>+	model = "Amlogic Meson GXL (S905D) P230 Development Board";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* P230 has exclusive choice between internal or external PHY */</div><div class='add'>+&amp;ethmac {</div><div class='add'>+	pinctrl-0 = &lt;&amp;eth_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	/* Select external PHY by default */</div><div class='add'>+	phy-handle = &lt;&amp;external_phy&gt;;</div><div class='add'>+</div><div class='add'>+	/* External PHY reset is shared with internal PHY Led signals */</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio GPIOZ_14 0&gt;;</div><div class='add'>+	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='add'>+	snps,reset-active-low;</div><div class='add'>+</div><div class='add'>+	/* External PHY is in RGMII */</div><div class='add'>+	phy-mode = "rgmii";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;external_mdio {</div><div class='add'>+	external_phy: ethernet-phy@0 {</div><div class='add'>+		compatible = "ethernet-phy-id001c.c916", "ethernet-phy-ieee802.3-c22";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		max-speed = &lt;1000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts<br/>new file mode 100644<br/>index 000000000000..95992cf1fe61<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "meson-gxl-s905d.dtsi"</div><div class='add'>+#include "meson-gx-p23x-q20x.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "amlogic,p231", "amlogic,s905d", "amlogic,meson-gxl";</div><div class='add'>+	model = "Amlogic Meson GXL (S905D) P231 Development Board";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* P231 has only internal PHY port */</div><div class='add'>+&amp;ethmac {</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+	phy-handle = &lt;&amp;internal_phy&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi<br/>new file mode 100644<br/>index 000000000000..615308e55576<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "meson-gxl.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "amlogic,s905d", "amlogic,meson-gxl";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts<br/>new file mode 100644<br/>index 000000000000..cea4a3eded9b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts</a></div><div class='hunk'>@@ -0,0 +1,221 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Andreas Färber</div><div class='add'>+ * Copyright (c) 2016 BayLibre, Inc.</div><div class='add'>+ * Author: Neil Armstrong &lt;narmstrong@kernel.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "meson-gxl-s905x.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "nexbox,a95x", "amlogic,s905x", "amlogic,meson-gxl";</div><div class='add'>+	model = "NEXBOX A95X (S905X)";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart_AO;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@0 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x80000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddio_card: gpio-regulator {</div><div class='add'>+		compatible = "regulator-gpio";</div><div class='add'>+</div><div class='add'>+		regulator-name = "VDDIO_CARD";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+</div><div class='add'>+		gpios = &lt;&amp;gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpios-states = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		/* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */</div><div class='add'>+		states = &lt;1800000 0</div><div class='add'>+			  3300000 1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddio_boot: regulator-vddio_boot {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VDDIO_BOOT";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddao_3v3: regulator-vddao_3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VDDAO_3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_3v3: regulator-vcc_3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VCC_3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	emmc_pwrseq: emmc-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-emmc";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio BOOT_9 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wifi32k: wifi32k {</div><div class='add'>+		compatible = "pwm-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;32768&gt;;</div><div class='add'>+		pwms = &lt;&amp;pwm_ef 0 30518 0&gt;; /* PWM_E at 32.768KHz */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdio_pwrseq: sdio-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-simple";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio GPIOX_6 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;wifi32k&gt;;</div><div class='add'>+		clock-names = "ext_clock";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cvbs-connector {</div><div class='add'>+		compatible = "composite-video-connector";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			cvbs_connector_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;cvbs_vdac_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart_AO {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart_ao_a_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ethmac {</div><div class='add'>+	status = "okay";</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+	phy-handle = &lt;&amp;internal_phy&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ir {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;remote_input_ao_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Wireless SDIO Module */</div><div class='add'>+&amp;sd_emmc_a {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdio_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;sdio_pwrseq&gt;;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vddao_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_boot&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SD card */</div><div class='add'>+&amp;sd_emmc_b {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdcard_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	cd-gpios = &lt;&amp;gpio CARD_6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-inverted;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vddao_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_card&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* eMMC */</div><div class='add'>+&amp;sd_emmc_c {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	max-frequency = &lt;200000000&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+	mmc-ddr-1_8v;</div><div class='add'>+	mmc-hs200-1_8v;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;emmc_pwrseq&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_boot&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm_ef {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;pwm_e_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_FCLK_DIV4&gt;;</div><div class='add'>+	clock-names = "clkin0";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cvbs_vdac_port {</div><div class='add'>+	cvbs_vdac_out: endpoint {</div><div class='add'>+		remote-endpoint = &lt;&amp;cvbs_connector_in&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts<br/>new file mode 100644<br/>index 000000000000..9639f012b02b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "meson-gxl-s905x.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "amlogic,p212", "amlogic,s905x", "amlogic,meson-gxl";</div><div class='add'>+	model = "Amlogic Meson GXL (S905X) P212 Development Board";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart_AO;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@0 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x80000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This UART is brought out to the DB9 connector */</div><div class='add'>+&amp;uart_AO {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi<br/>new file mode 100644<br/>index 000000000000..08237ee1e362<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "meson-gxl.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "amlogic,s905x", "amlogic,meson-gxl";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* S905X Only has access to its internal PHY */</div><div class='add'>+&amp;ethmac {</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+	phy-handle = &lt;&amp;internal_phy&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi<br/>new file mode 100644<br/>index 000000000000..fe11b5fc61f7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxl.dtsi</a></div><div class='hunk'>@@ -0,0 +1,383 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "meson-gx.dtsi"</div><div class='add'>+#include &lt;dt-bindings/clock/gxbb-clkc.h&gt;</div><div class='add'>+#include &lt;dt-bindings/gpio/meson-gxl-gpio.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "amlogic,meson-gxl";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ethmac {</div><div class='add'>+	reg = &lt;0x0 0xc9410000 0x0 0x10000</div><div class='add'>+	       0x0 0xc8834540 0x0 0x4&gt;;</div><div class='add'>+</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_ETH&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_FCLK_DIV2&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_MPLL2&gt;;</div><div class='add'>+	clock-names = "stmmaceth", "clkin0", "clkin1";</div><div class='add'>+</div><div class='add'>+	mdio0: mdio {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "snps,dwmac-mdio";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;aobus {</div><div class='add'>+	pinctrl_aobus: pinctrl@14 {</div><div class='add'>+		compatible = "amlogic,meson-gxl-aobus-pinctrl";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		gpio_ao: bank@14 {</div><div class='add'>+			reg = &lt;0x0 0x00014 0x0 0x8&gt;,</div><div class='add'>+			      &lt;0x0 0x0002c 0x0 0x4&gt;,</div><div class='add'>+			      &lt;0x0 0x00024 0x0 0x8&gt;;</div><div class='add'>+			reg-names = "mux", "pull", "gpio";</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_ao_a_pins: uart_ao_a {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_tx_ao_a", "uart_rx_ao_a";</div><div class='add'>+				function = "uart_ao";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_ao_a_cts_rts_pins: uart_ao_a_cts_rts {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_cts_ao_a",</div><div class='add'>+				       "uart_rts_ao_a";</div><div class='add'>+				function = "uart_ao";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_ao_b_pins: uart_ao_b {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_tx_ao_b", "uart_rx_ao_b";</div><div class='add'>+				function = "uart_ao_b";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_ao_b_cts_rts_pins: uart_ao_b_cts_rts {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_cts_ao_b",</div><div class='add'>+				       "uart_rts_ao_b";</div><div class='add'>+				function = "uart_ao_b";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		remote_input_ao_pins: remote_input_ao {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "remote_input_ao";</div><div class='add'>+				function = "remote_input_ao";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm_ao_b_pins: pwm_ao_b {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_ao_b";</div><div class='add'>+				function = "pwm_ao_b";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;periphs {</div><div class='add'>+	pinctrl_periphs: pinctrl@4b0 {</div><div class='add'>+		compatible = "amlogic,meson-gxl-periphs-pinctrl";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		gpio: bank@4b0 {</div><div class='add'>+			reg = &lt;0x0 0x004b0 0x0 0x28&gt;,</div><div class='add'>+			      &lt;0x0 0x004e8 0x0 0x14&gt;,</div><div class='add'>+			      &lt;0x0 0x00120 0x0 0x14&gt;,</div><div class='add'>+			      &lt;0x0 0x00430 0x0 0x40&gt;;</div><div class='add'>+			reg-names = "mux", "pull", "pull-enable", "gpio";</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		emmc_pins: emmc {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "emmc_nand_d07",</div><div class='add'>+				       "emmc_cmd",</div><div class='add'>+				       "emmc_clk",</div><div class='add'>+				       "emmc_ds";</div><div class='add'>+				function = "emmc";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdcard_pins: sdcard {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "sdcard_d0",</div><div class='add'>+				       "sdcard_d1",</div><div class='add'>+				       "sdcard_d2",</div><div class='add'>+				       "sdcard_d3",</div><div class='add'>+				       "sdcard_cmd",</div><div class='add'>+				       "sdcard_clk";</div><div class='add'>+				function = "sdcard";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdio_pins: sdio {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "sdio_d0",</div><div class='add'>+				       "sdio_d1",</div><div class='add'>+				       "sdio_d2",</div><div class='add'>+				       "sdio_d3",</div><div class='add'>+				       "sdio_cmd",</div><div class='add'>+				       "sdio_clk";</div><div class='add'>+				function = "sdio";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdio_irq_pins: sdio_irq {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "sdio_irq";</div><div class='add'>+				function = "sdio";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_a_pins: uart_a {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_tx_a",</div><div class='add'>+				       "uart_rx_a";</div><div class='add'>+				function = "uart_a";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_a_cts_rts_pins: uart_a_cts_rts {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_cts_a",</div><div class='add'>+				       "uart_rts_a";</div><div class='add'>+				function = "uart_a";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_b_pins: uart_b {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_tx_b",</div><div class='add'>+				       "uart_rx_b";</div><div class='add'>+				function = "uart_b";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_b_cts_rts_pins: uart_b_cts_rts {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_cts_b",</div><div class='add'>+				       "uart_rts_b";</div><div class='add'>+				function = "uart_b";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_c_pins: uart_c {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_tx_c",</div><div class='add'>+				       "uart_rx_c";</div><div class='add'>+				function = "uart_c";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart_c_cts_rts_pins: uart_c_cts_rts {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "uart_cts_c",</div><div class='add'>+				       "uart_rts_c";</div><div class='add'>+				function = "uart_c";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c_a_pins: i2c_a {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "i2c_sck_a",</div><div class='add'>+				     "i2c_sda_a";</div><div class='add'>+				function = "i2c_a";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c_b_pins: i2c_b {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "i2c_sck_b",</div><div class='add'>+				      "i2c_sda_b";</div><div class='add'>+				function = "i2c_b";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c_c_pins: i2c_c {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "i2c_sck_c",</div><div class='add'>+				      "i2c_sda_c";</div><div class='add'>+				function = "i2c_c";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		eth_pins: eth_c {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "eth_mdio",</div><div class='add'>+				       "eth_mdc",</div><div class='add'>+				       "eth_clk_rx_clk",</div><div class='add'>+				       "eth_rx_dv",</div><div class='add'>+				       "eth_rxd0",</div><div class='add'>+				       "eth_rxd1",</div><div class='add'>+				       "eth_rxd2",</div><div class='add'>+				       "eth_rxd3",</div><div class='add'>+				       "eth_rgmii_tx_clk",</div><div class='add'>+				       "eth_tx_en",</div><div class='add'>+				       "eth_txd0",</div><div class='add'>+				       "eth_txd1",</div><div class='add'>+				       "eth_txd2",</div><div class='add'>+				       "eth_txd3";</div><div class='add'>+				function = "eth";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm_e_pins: pwm_e {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "pwm_e";</div><div class='add'>+				function = "pwm_e";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hdmi_hpd_pins: hdmi_hpd {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "hdmi_hpd";</div><div class='add'>+				function = "hdmi_hpd";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hdmi_i2c_pins: hdmi_i2c {</div><div class='add'>+			mux {</div><div class='add'>+				groups = "hdmi_sda", "hdmi_scl";</div><div class='add'>+				function = "hdmi_i2c";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	eth-phy-mux {</div><div class='add'>+		compatible = "mdio-mux-mmioreg", "mdio-mux";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0x0 0x55c 0x0 0x4&gt;;</div><div class='add'>+		mux-mask = &lt;0xffffffff&gt;;</div><div class='add'>+		mdio-parent-bus = &lt;&amp;mdio0&gt;;</div><div class='add'>+</div><div class='add'>+		internal_mdio: mdio@e40908ff {</div><div class='add'>+			reg = &lt;0xe40908ff&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			internal_phy: ethernet-phy@8 {</div><div class='add'>+				compatible = "ethernet-phy-id0181.4400", "ethernet-phy-ieee802.3-c22";</div><div class='add'>+				reg = &lt;8&gt;;</div><div class='add'>+				max-speed = &lt;100&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		external_mdio: mdio@2009087f {</div><div class='add'>+			reg = &lt;0x2009087f&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hiubus {</div><div class='add'>+	clkc: clock-controller@0 {</div><div class='add'>+		compatible = "amlogic,gxl-clkc", "amlogic,gxbb-clkc";</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x3db&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c_A {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_I2C&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c_B {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_I2C&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c_C {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_I2C&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;saradc {</div><div class='add'>+	compatible = "amlogic,meson-gxl-saradc", "amlogic,meson-saradc";</div><div class='add'>+	clocks = &lt;&amp;xtal&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_SAR_ADC&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_SANA&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_SAR_ADC_CLK&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_SAR_ADC_SEL&gt;;</div><div class='add'>+	clock-names = "clkin", "core", "sana", "adc_clk", "adc_sel";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sd_emmc_a {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_SD_EMMC_A&gt;,</div><div class='add'>+		 &lt;&amp;xtal&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_FCLK_DIV2&gt;;</div><div class='add'>+	clock-names = "core", "clkin0", "clkin1";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sd_emmc_b {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_SD_EMMC_B&gt;,</div><div class='add'>+		 &lt;&amp;xtal&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_FCLK_DIV2&gt;;</div><div class='add'>+       clock-names = "core", "clkin0", "clkin1";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sd_emmc_c {</div><div class='add'>+	clocks = &lt;&amp;clkc CLKID_SD_EMMC_C&gt;,</div><div class='add'>+		 &lt;&amp;xtal&gt;,</div><div class='add'>+		 &lt;&amp;clkc CLKID_FCLK_DIV2&gt;;</div><div class='add'>+	clock-names = "core", "clkin0", "clkin1";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;vpu {</div><div class='add'>+	compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts<br/>new file mode 100644<br/>index 000000000000..5a337d339df1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts</a></div><div class='hunk'>@@ -0,0 +1,185 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 BayLibre, SAS.</div><div class='add'>+ * Author: Neil Armstrong &lt;narmstrong@baylibre.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "meson-gxm.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "nexbox,a1", "amlogic,s912", "amlogic,meson-gxm";</div><div class='add'>+	model = "NEXBOX A1";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart_AO;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@0 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x80000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddio_boot: regulator-vddio-boot {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VDDIO_BOOT";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vddao_3v3: regulator-vddao-3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VDDAO_3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_3v3: regulator-vcc-3v3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VCC_3V3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	emmc_pwrseq: emmc-pwrseq {</div><div class='add'>+		compatible = "mmc-pwrseq-emmc";</div><div class='add'>+		reset-gpios = &lt;&amp;gpio BOOT_9 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cvbs-connector {</div><div class='add'>+		compatible = "composite-video-connector";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			cvbs_connector_in: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;cvbs_vdac_out&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This UART is brought out to the DB9 connector */</div><div class='add'>+&amp;uart_AO {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;uart_ao_a_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ir {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;remote_input_ao_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SD card */</div><div class='add'>+&amp;sd_emmc_b {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdcard_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	max-frequency = &lt;100000000&gt;;</div><div class='add'>+	disable-wp;</div><div class='add'>+</div><div class='add'>+	cd-gpios = &lt;&amp;gpio CARD_6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-inverted;</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vddao_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_boot&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* eMMC */</div><div class='add'>+&amp;sd_emmc_c {</div><div class='add'>+	status = "okay";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	max-frequency = &lt;200000000&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	disable-wp;</div><div class='add'>+	mmc-ddr-1_8v;</div><div class='add'>+	mmc-hs200-1_8v;</div><div class='add'>+</div><div class='add'>+	mmc-pwrseq = &lt;&amp;emmc_pwrseq&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_3v3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vddio_boot&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ethmac {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pinctrl-0 = &lt;&amp;eth_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	/* Select external PHY by default */</div><div class='add'>+	phy-handle = &lt;&amp;external_phy&gt;;</div><div class='add'>+</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio GPIOZ_14 0&gt;;</div><div class='add'>+	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='add'>+	snps,reset-active-low;</div><div class='add'>+</div><div class='add'>+	/* External PHY is in RGMII */</div><div class='add'>+	phy-mode = "rgmii";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;external_mdio {</div><div class='add'>+	external_phy: ethernet-phy@0 {</div><div class='add'>+		compatible = "ethernet-phy-id001c.c916", "ethernet-phy-ieee802.3-c22";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		max-speed = &lt;1000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cvbs_vdac_port {</div><div class='add'>+	cvbs_vdac_out: endpoint {</div><div class='add'>+		remote-endpoint = &lt;&amp;cvbs_connector_in&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts<br/>new file mode 100644<br/>index 000000000000..5dbc66088355<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "meson-gxm.dtsi"</div><div class='add'>+#include "meson-gx-p23x-q20x.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "amlogic,q200", "amlogic,s912", "amlogic,meson-gxm";</div><div class='add'>+	model = "Amlogic Meson GXM (S912) Q200 Development Board";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Q200 has exclusive choice between internal or external PHY */</div><div class='add'>+&amp;ethmac {</div><div class='add'>+	pinctrl-0 = &lt;&amp;eth_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	/* Select external PHY by default */</div><div class='add'>+	phy-handle = &lt;&amp;external_phy&gt;;</div><div class='add'>+</div><div class='add'>+	/* External PHY reset is shared with internal PHY Led signals */</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio GPIOZ_14 0&gt;;</div><div class='add'>+	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='add'>+	snps,reset-active-low;</div><div class='add'>+</div><div class='add'>+	/* External PHY is in RGMII */</div><div class='add'>+	phy-mode = "rgmii";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;external_mdio {</div><div class='add'>+	external_phy: ethernet-phy@0 {</div><div class='add'>+		compatible = "ethernet-phy-id001c.c916", "ethernet-phy-ieee802.3-c22";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		max-speed = &lt;1000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts<br/>new file mode 100644<br/>index 000000000000..95e11d7faab8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "meson-gxm.dtsi"</div><div class='add'>+#include "meson-gx-p23x-q20x.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "amlogic,q201", "amlogic,s912", "amlogic,meson-gxm";</div><div class='add'>+	model = "Amlogic Meson GXM (S912) Q201 Development Board";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Q201 has only internal PHY port */</div><div class='add'>+&amp;ethmac {</div><div class='add'>+	phy-mode = "rmii";</div><div class='add'>+	phy-handle = &lt;&amp;internal_phy&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi<br/>new file mode 100644<br/>index 000000000000..ddea7305c644<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/amlogic/meson-gxm.dtsi</a></div><div class='hunk'>@@ -0,0 +1,132 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Endless Computers, Inc.</div><div class='add'>+ * Author: Carlo Caione &lt;carlo@endlessm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "meson-gxl.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "amlogic,meson-gxm";</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		cpu-map {</div><div class='add'>+			cluster0 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu0&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu1&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu2&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu3&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster1 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu4&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu5&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu6&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu7&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu4: cpu@100 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			reg = &lt;0x0 0x100&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu5: cpu@101 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			reg = &lt;0x0 0x101&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu6: cpu@102 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			reg = &lt;0x0 0x102&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu7: cpu@103 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			reg = &lt;0x0 0x103&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;saradc {</div><div class='add'>+	compatible = "amlogic,meson-gxm-saradc", "amlogic,meson-saradc";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;scpi_dvfs {</div><div class='add'>+	clock-indices = &lt;0 1&gt;;</div><div class='add'>+	clock-output-names = "vbig", "vlittle";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;vpu {</div><div class='add'>+	compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu";</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi<br/>index 7d3a2acc6a55..df539e865b90 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno-base.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/arm/juno-base.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno-base.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-base.dtsi</a></div><div class='hunk'>@@ -1,6 +1,10 @@</div><div class='add'>+#include "juno-clocks.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Devices shared by all Juno boards</div><div class='ctx'> 	 */</div><div class='add'>+	dma-ranges = &lt;0 0 0 0 0x100 0&gt;;</div><div class='ctx'> </div><div class='ctx'> 	memtimer: timer@2a810000 {</div><div class='ctx'> 		compatible = "arm,armv7-timer-mem";</div><div class='hunk'>@@ -29,6 +33,29 @@</div><div class='ctx'> 		clock-names = "apb_pclk";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	smmu_pcie: iommu@2b500000 {</div><div class='add'>+		compatible = "arm,mmu-401", "arm,smmu-v1";</div><div class='add'>+		reg = &lt;0x0 0x2b500000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#iommu-cells = &lt;1&gt;;</div><div class='add'>+		#global-interrupts = &lt;1&gt;;</div><div class='add'>+		dma-coherent;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	smmu_etr: iommu@2b600000 {</div><div class='add'>+		compatible = "arm,mmu-401", "arm,smmu-v1";</div><div class='add'>+		reg = &lt;0x0 0x2b600000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#iommu-cells = &lt;1&gt;;</div><div class='add'>+		#global-interrupts = &lt;1&gt;;</div><div class='add'>+		dma-coherent;</div><div class='add'>+		power-domains = &lt;&amp;scpi_devpd 0&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	gic: interrupt-controller@2c010000 {</div><div class='ctx'> 		compatible = "arm,gic-400", "arm,cortex-a15-gic";</div><div class='ctx'> 		reg = &lt;0x0 0x2c010000 0 0x1000&gt;,</div><div class='hunk'>@@ -61,7 +88,7 @@</div><div class='ctx'> 	 * The actual size is just 4K though 64K is reserved. Access to the</div><div class='ctx'> 	 * unmapped reserved region results in a DECERR response.</div><div class='ctx'> 	 */</div><div class='del'>-	etf@20010000 {</div><div class='add'>+	etf@20010000 { /* etf0 */</div><div class='ctx'> 		compatible = "arm,coresight-tmc", "arm,primecell";</div><div class='ctx'> 		reg = &lt;0 0x20010000 0 0x1000&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -75,7 +102,7 @@</div><div class='ctx'> 			/* input port */</div><div class='ctx'> 			port@0 {</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='del'>-				etf_in_port: endpoint {</div><div class='add'>+				etf0_in_port: endpoint {</div><div class='ctx'> 					slave-mode;</div><div class='ctx'> 					remote-endpoint = &lt;&amp;main_funnel_out_port&gt;;</div><div class='ctx'> 				};</div><div class='hunk'>@@ -84,8 +111,7 @@</div><div class='ctx'> 			/* output port */</div><div class='ctx'> 			port@1 {</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='del'>-				etf_out_port: endpoint {</div><div class='del'>-					remote-endpoint = &lt;&amp;replicator_in_port0&gt;;</div><div class='add'>+				etf0_out_port: endpoint {</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -106,7 +132,8 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	main-funnel@20040000 {</div><div class='add'>+	/* main funnel on Juno r0, cssys0 funnel on Juno r1/r2 as per TRM*/</div><div class='add'>+	main_funnel: funnel@20040000 {</div><div class='ctx'> 		compatible = "arm,coresight-funnel", "arm,primecell";</div><div class='ctx'> 		reg = &lt;0 0x20040000 0 0x1000&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -117,13 +144,15 @@</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='add'>+			/* output port */</div><div class='ctx'> 			port@0 {</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='ctx'> 				main_funnel_out_port: endpoint {</div><div class='del'>-					remote-endpoint = &lt;&amp;etf_in_port&gt;;</div><div class='add'>+					remote-endpoint = &lt;&amp;etf0_in_port&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			/* input ports */</div><div class='ctx'> 			port@1 {</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='ctx'> 				main_funnel_in_port0: endpoint {</div><div class='hunk'>@@ -139,13 +168,13 @@</div><div class='ctx'> 					remote-endpoint = &lt;&amp;cluster1_funnel_out_port&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='del'>-</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	etr@20070000 {</div><div class='ctx'> 		compatible = "arm,coresight-tmc", "arm,primecell";</div><div class='ctx'> 		reg = &lt;0 0x20070000 0 0x1000&gt;;</div><div class='add'>+		iommus = &lt;&amp;smmu_etr 0&gt;;</div><div class='ctx'> </div><div class='ctx'> 		clocks = &lt;&amp;soc_smc50mhz&gt;;</div><div class='ctx'> 		clock-names = "apb_pclk";</div><div class='hunk'>@@ -158,6 +187,21 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	stm@20100000 {</div><div class='add'>+		compatible = "arm,coresight-stm", "arm,primecell";</div><div class='add'>+		reg = &lt;0 0x20100000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0 0x28000000 0 0x1000000&gt;;</div><div class='add'>+		reg-names = "stm-base", "stm-stimulus-base";</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;soc_smc50mhz&gt;;</div><div class='add'>+		clock-names = "apb_pclk";</div><div class='add'>+		power-domains = &lt;&amp;scpi_devpd 0&gt;;</div><div class='add'>+		port {</div><div class='add'>+			stm_out_port: endpoint {</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	etm0: etm@22040000 {</div><div class='ctx'> 		compatible = "arm,coresight-etm4x", "arm,primecell";</div><div class='ctx'> 		reg = &lt;0 0x22040000 0 0x1000&gt;;</div><div class='hunk'>@@ -172,7 +216,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	cluster0-funnel@220c0000 {</div><div class='add'>+	funnel@220c0000 { /* cluster0 funnel */</div><div class='ctx'> 		compatible = "arm,coresight-funnel", "arm,primecell";</div><div class='ctx'> 		reg = &lt;0 0x220c0000 0 0x1000&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +280,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	cluster1-funnel@230c0000 {</div><div class='add'>+	funnel@230c0000 { /* cluster1 funnel */</div><div class='ctx'> 		compatible = "arm,coresight-funnel", "arm,primecell";</div><div class='ctx'> 		reg = &lt;0 0x230c0000 0 0x1000&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -328,12 +372,13 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	coresight-replicator {</div><div class='del'>-		/*</div><div class='del'>-		 * Non-configurable replicators don't show up on the</div><div class='del'>-		 * AMBA bus.  As such no need to add "arm,primecell".</div><div class='del'>-		 */</div><div class='del'>-		compatible = "arm,coresight-replicator";</div><div class='add'>+	replicator@20120000 {</div><div class='add'>+		compatible = "qcom,coresight-replicator1x", "arm,primecell";</div><div class='add'>+		reg = &lt;0 0x20120000 0 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;soc_smc50mhz&gt;;</div><div class='add'>+		clock-names = "apb_pclk";</div><div class='add'>+		power-domains = &lt;&amp;scpi_devpd 0&gt;;</div><div class='ctx'> </div><div class='ctx'> 		ports {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -359,7 +404,6 @@</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='ctx'> 				replicator_in_port0: endpoint {</div><div class='ctx'> 					slave-mode;</div><div class='del'>-					remote-endpoint = &lt;&amp;etf_out_port&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -404,6 +448,8 @@</div><div class='ctx'> 				&lt;0 0 0 4 &amp;gic 0 0 0 139 4&gt;;</div><div class='ctx'> 		msi-parent = &lt;&amp;v2m_0&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='add'>+		iommu-map-mask = &lt;0x0&gt;;	/* RC has no means to output PCI RID */</div><div class='add'>+		iommu-map = &lt;0x0 &amp;smmu_pcie 0x0 0x1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	scpi {</div><div class='hunk'>@@ -482,7 +528,47 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	/include/ "juno-clocks.dtsi"</div><div class='add'>+	smmu_dma: iommu@7fb00000 {</div><div class='add'>+		compatible = "arm,mmu-401", "arm,smmu-v1";</div><div class='add'>+		reg = &lt;0x0 0x7fb00000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#iommu-cells = &lt;1&gt;;</div><div class='add'>+		#global-interrupts = &lt;1&gt;;</div><div class='add'>+		dma-coherent;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	smmu_hdlcd1: iommu@7fb10000 {</div><div class='add'>+		compatible = "arm,mmu-401", "arm,smmu-v1";</div><div class='add'>+		reg = &lt;0x0 0x7fb10000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#iommu-cells = &lt;1&gt;;</div><div class='add'>+		#global-interrupts = &lt;1&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	smmu_hdlcd0: iommu@7fb20000 {</div><div class='add'>+		compatible = "arm,mmu-401", "arm,smmu-v1";</div><div class='add'>+		reg = &lt;0x0 0x7fb20000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#iommu-cells = &lt;1&gt;;</div><div class='add'>+		#global-interrupts = &lt;1&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	smmu_usb: iommu@7fb30000 {</div><div class='add'>+		compatible = "arm,mmu-401", "arm,smmu-v1";</div><div class='add'>+		reg = &lt;0x0 0x7fb30000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#iommu-cells = &lt;1&gt;;</div><div class='add'>+		#global-interrupts = &lt;1&gt;;</div><div class='add'>+		dma-coherent;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	dma@7ff00000 {</div><div class='ctx'> 		compatible = "arm,pl330", "arm,primecell";</div><div class='hunk'>@@ -499,6 +585,15 @@</div><div class='ctx'> 			     &lt;GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 			     &lt;GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 			     &lt;GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		iommus = &lt;&amp;smmu_dma 0&gt;,</div><div class='add'>+			 &lt;&amp;smmu_dma 1&gt;,</div><div class='add'>+			 &lt;&amp;smmu_dma 2&gt;,</div><div class='add'>+			 &lt;&amp;smmu_dma 3&gt;,</div><div class='add'>+			 &lt;&amp;smmu_dma 4&gt;,</div><div class='add'>+			 &lt;&amp;smmu_dma 5&gt;,</div><div class='add'>+			 &lt;&amp;smmu_dma 6&gt;,</div><div class='add'>+			 &lt;&amp;smmu_dma 7&gt;,</div><div class='add'>+			 &lt;&amp;smmu_dma 8&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;soc_faxiclk&gt;;</div><div class='ctx'> 		clock-names = "apb_pclk";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -507,6 +602,7 @@</div><div class='ctx'> 		compatible = "arm,hdlcd";</div><div class='ctx'> 		reg = &lt;0 0x7ff50000 0 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		iommus = &lt;&amp;smmu_hdlcd1 0&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;scpi_clk 3&gt;;</div><div class='ctx'> 		clock-names = "pxlclk";</div><div class='ctx'> </div><div class='hunk'>@@ -521,6 +617,7 @@</div><div class='ctx'> 		compatible = "arm,hdlcd";</div><div class='ctx'> 		reg = &lt;0 0x7ff60000 0 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		iommus = &lt;&amp;smmu_hdlcd0 0&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;scpi_clk 3&gt;;</div><div class='ctx'> 		clock-names = "pxlclk";</div><div class='ctx'> </div><div class='hunk'>@@ -574,6 +671,7 @@</div><div class='ctx'> 		compatible = "generic-ohci";</div><div class='ctx'> 		reg = &lt;0x0 0x7ffb0000 0x0 0x10000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		iommus = &lt;&amp;smmu_usb 0&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;soc_usb48mhz&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -581,6 +679,7 @@</div><div class='ctx'> 		compatible = "generic-ehci";</div><div class='ctx'> 		reg = &lt;0x0 0x7ffc0000 0x0 0x10000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		iommus = &lt;&amp;smmu_usb 0&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;soc_usb48mhz&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -639,3 +738,4 @@</div><div class='ctx'> 		interrupt-map-mask = &lt;0 0&gt;;</div><div class='ctx'> 		interrupt-map = &lt;0 0 &amp;gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/arm/juno-clocks.dtsi b/arch/arm64/boot/dts/arm/juno-clocks.dtsi<br/>index 25352ed943e6..e5e265dfa902 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno-clocks.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/arm/juno-clocks.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno-clocks.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-clocks.dtsi</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * This file is licensed under a dual GPLv2 or BSD license.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-</div><div class='add'>+/ {</div><div class='ctx'> 	/* SoC fixed clocks */</div><div class='ctx'> 	soc_uartclk: refclk7273800hz {</div><div class='ctx'> 		compatible = "fixed-clock";</div><div class='hunk'>@@ -42,3 +42,4 @@</div><div class='ctx'> 		clock-frequency = &lt;400000000&gt;;</div><div class='ctx'> 		clock-output-names = "faxi_clk";</div><div class='ctx'> 	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi<br/>new file mode 100644<br/>index 000000000000..aa03050dd7df<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+/ {</div><div class='add'>+	funnel@20130000 { /* cssys1 */</div><div class='add'>+		compatible = "arm,coresight-funnel", "arm,primecell";</div><div class='add'>+		reg = &lt;0 0x20130000 0 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;soc_smc50mhz&gt;;</div><div class='add'>+		clock-names = "apb_pclk";</div><div class='add'>+		power-domains = &lt;&amp;scpi_devpd 0&gt;;</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			/* output port */</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				csys1_funnel_out_port: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;etf1_in_port&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* input port */</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				csys1_funnel_in_port0: endpoint {</div><div class='add'>+					slave-mode;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	etf@20140000 { /* etf1 */</div><div class='add'>+		compatible = "arm,coresight-tmc", "arm,primecell";</div><div class='add'>+		reg = &lt;0 0x20140000 0 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;soc_smc50mhz&gt;;</div><div class='add'>+		clock-names = "apb_pclk";</div><div class='add'>+		power-domains = &lt;&amp;scpi_devpd 0&gt;;</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			/* input port */</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				etf1_in_port: endpoint {</div><div class='add'>+					slave-mode;</div><div class='add'>+					remote-endpoint = &lt;&amp;csys1_funnel_out_port&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* output port */</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				etf1_out_port: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;csys2_funnel_in_port1&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	funnel@20150000 { /* cssys2 */</div><div class='add'>+		compatible = "arm,coresight-funnel", "arm,primecell";</div><div class='add'>+		reg = &lt;0 0x20150000 0 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;soc_smc50mhz&gt;;</div><div class='add'>+		clock-names = "apb_pclk";</div><div class='add'>+		power-domains = &lt;&amp;scpi_devpd 0&gt;;</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			/* output port */</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				csys2_funnel_out_port: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;replicator_in_port0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* input ports */</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				csys2_funnel_in_port0: endpoint {</div><div class='add'>+					slave-mode;</div><div class='add'>+					remote-endpoint = &lt;&amp;etf0_out_port&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@2 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				csys2_funnel_in_port1: endpoint {</div><div class='add'>+					slave-mode;</div><div class='add'>+					remote-endpoint = &lt;&amp;etf1_out_port&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi<br/>index 3ad4c3000611..098601657f82 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno-motherboard.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/arm/juno-motherboard.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno-motherboard.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-motherboard.dtsi</a></div><div class='hunk'>@@ -131,13 +131,6 @@</div><div class='ctx'> 				vddvario-supply = &lt;&amp;mb_fixed_3v3&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			usb@5,00000000 {</div><div class='del'>-				compatible = "nxp,usb-isp1763";</div><div class='del'>-				reg = &lt;5 0x00000000 0x20000&gt;;</div><div class='del'>-				bus-width = &lt;16&gt;;</div><div class='del'>-				interrupts = &lt;4&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='ctx'> 			iofpga@3,00000000 {</div><div class='ctx'> 				compatible = "simple-bus";</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts<br/>index f0b857d6d73c..0033c59a64b5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno-r1.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/arm/juno-r1.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno-r1.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-r1.dts</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include "juno-base.dtsi"</div><div class='add'>+#include "juno-cs-r1r2.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "ARM Juno development board (r1)";</div><div class='hunk'>@@ -90,6 +92,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A57_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;1024&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A57_1: cpu@1 {</div><div class='hunk'>@@ -100,6 +103,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A57_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;1024&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_0: cpu@100 {</div><div class='hunk'>@@ -110,6 +114,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;578&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_1: cpu@101 {</div><div class='hunk'>@@ -120,6 +125,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;578&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_2: cpu@102 {</div><div class='hunk'>@@ -130,6 +136,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;578&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_3: cpu@103 {</div><div class='hunk'>@@ -140,6 +147,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;578&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A57_L2: l2-cache0 {</div><div class='hunk'>@@ -170,8 +178,6 @@</div><div class='ctx'> 				     &lt;&amp;A53_2&gt;,</div><div class='ctx'> 				     &lt;&amp;A53_3&gt;;</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	#include "juno-base.dtsi"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;memtimer {</div><div class='hunk'>@@ -221,3 +227,15 @@</div><div class='ctx'> &amp;gpu1_thermal_zone {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;etf0_out_port {</div><div class='add'>+	remote-endpoint = &lt;&amp;csys2_funnel_in_port0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;replicator_in_port0 {</div><div class='add'>+	remote-endpoint = &lt;&amp;csys2_funnel_out_port&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;stm_out_port {</div><div class='add'>+	remote-endpoint = &lt;&amp;csys1_funnel_in_port0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts<br/>index 26aaa6a7670f..218d0e4736a8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno-r2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/arm/juno-r2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno-r2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno-r2.dts</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include "juno-base.dtsi"</div><div class='add'>+#include "juno-cs-r1r2.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "ARM Juno development board (r2)";</div><div class='hunk'>@@ -90,6 +92,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A72_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;1024&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A72_1: cpu@1 {</div><div class='hunk'>@@ -100,6 +103,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A72_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;1024&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_0: cpu@100 {</div><div class='hunk'>@@ -110,6 +114,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;485&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_1: cpu@101 {</div><div class='hunk'>@@ -120,6 +125,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;485&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_2: cpu@102 {</div><div class='hunk'>@@ -130,6 +136,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;485&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_3: cpu@103 {</div><div class='hunk'>@@ -140,6 +147,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;485&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A72_L2: l2-cache0 {</div><div class='hunk'>@@ -170,8 +178,6 @@</div><div class='ctx'> 				     &lt;&amp;A53_2&gt;,</div><div class='ctx'> 				     &lt;&amp;A53_3&gt;;</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	#include "juno-base.dtsi"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;memtimer {</div><div class='hunk'>@@ -221,3 +227,15 @@</div><div class='ctx'> &amp;gpu1_thermal_zone {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;etf0_out_port {</div><div class='add'>+	remote-endpoint = &lt;&amp;csys2_funnel_in_port0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;replicator_in_port0 {</div><div class='add'>+	remote-endpoint = &lt;&amp;csys2_funnel_out_port&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;stm_out_port {</div><div class='add'>+	remote-endpoint = &lt;&amp;csys1_funnel_in_port0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts<br/>index 6e154d948a80..bb2820ef3d5b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/arm/juno.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/juno.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/juno.dts</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include "juno-base.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "ARM Juno development board (r0)";</div><div class='hunk'>@@ -90,6 +91,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A57_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;1024&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A57_1: cpu@1 {</div><div class='hunk'>@@ -100,6 +102,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A57_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 0&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;1024&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_0: cpu@100 {</div><div class='hunk'>@@ -110,6 +113,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;578&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_1: cpu@101 {</div><div class='hunk'>@@ -120,6 +124,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;578&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_2: cpu@102 {</div><div class='hunk'>@@ -130,6 +135,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;578&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A53_3: cpu@103 {</div><div class='hunk'>@@ -140,6 +146,7 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;A53_L2&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;scpi_dvfs 1&gt;;</div><div class='ctx'> 			cpu-idle-states = &lt;&amp;CPU_SLEEP_0 &amp;CLUSTER_SLEEP_0&gt;;</div><div class='add'>+			capacity-dmips-mhz = &lt;578&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		A57_L2: l2-cache0 {</div><div class='hunk'>@@ -170,8 +177,6 @@</div><div class='ctx'> 				     &lt;&amp;A53_2&gt;,</div><div class='ctx'> 				     &lt;&amp;A53_3&gt;;</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	#include "juno-base.dtsi"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;etm0 {</div><div class='hunk'>@@ -197,3 +202,27 @@</div><div class='ctx'> &amp;etm5 {</div><div class='ctx'> 	cpu = &lt;&amp;A53_3&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;etf0_out_port {</div><div class='add'>+	remote-endpoint = &lt;&amp;replicator_in_port0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;replicator_in_port0 {</div><div class='add'>+	remote-endpoint = &lt;&amp;etf0_out_port&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;stm_out_port {</div><div class='add'>+	remote-endpoint = &lt;&amp;main_funnel_in_port2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;main_funnel {</div><div class='add'>+	ports {</div><div class='add'>+		port@3 {</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+			main_funnel_in_port2: endpoint {</div><div class='add'>+				slave-mode;</div><div class='add'>+				remote-endpoint = &lt;&amp;stm_out_port&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts<br/>index a852e28a40e1..a83ed2c6bbf7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts</a></div><div class='hunk'>@@ -81,7 +81,7 @@</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0x0 0x2c001000 0 0x1000&gt;,</div><div class='del'>-		      &lt;0x0 0x2c002000 0 0x1000&gt;,</div><div class='add'>+		      &lt;0x0 0x2c002000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x0 0x2c004000 0 0x2000&gt;,</div><div class='ctx'> 		      &lt;0x0 0x2c006000 0 0x2000&gt;;</div><div class='ctx'> 		interrupts = &lt;1 9 0xf04&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile<br/>index 05faf2a8a35c..f1caece9d3a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/broadcom/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/Makefile</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb</div><div class='del'>-dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb ns2-xmc.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_VULCAN) += vulcan-eval.dtb</div><div class='ctx'> </div><div class='ctx'> always		:= $(dtb-y)</div><div class='head'>diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts<br/>index 7841b724e340..c309633a1e87 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #include "bcm2837.dtsi"</div><div class='ctx'> #include "bcm2835-rpi.dtsi"</div><div class='ctx'> #include "bcm283x-rpi-smsc9514.dtsi"</div><div class='add'>+#include "bcm283x-rpi-usb-host.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";</div><div class='hunk'>@@ -15,13 +16,6 @@</div><div class='ctx'> 		act {</div><div class='ctx'> 			gpios = &lt;&amp;gpio 47 0&gt;;</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		pwr {</div><div class='del'>-			label = "PWR";</div><div class='del'>-			gpios = &lt;&amp;gpio 35 0&gt;;</div><div class='del'>-			default-state = "keep";</div><div class='del'>-			linux,default-trigger = "default-on";</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi b/arch/arm64/boot/dts/broadcom/bcm2837.dtsi<br/>index 8216bbb29fe0..19f2fe620a21 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/bcm2837.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/broadcom/bcm2837.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/bcm2837.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/bcm2837.dtsi</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #include "bcm283x.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	compatible = "brcm,bcm2836";</div><div class='add'>+	compatible = "brcm,bcm2837";</div><div class='ctx'> </div><div class='ctx'> 	soc {</div><div class='ctx'> 		ranges = &lt;0x7e000000 0x3f000000 0x1000000&gt;,</div><div class='hunk'>@@ -74,3 +74,9 @@</div><div class='ctx'> 	interrupt-parent = &lt;&amp;local_intc&gt;;</div><div class='ctx'> 	interrupts = &lt;8&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* enable thermal sensor with the correct compatible property set */</div><div class='add'>+&amp;thermal {</div><div class='add'>+	compatible = "brcm,bcm2837-thermal";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi<br/>new file mode 120000<br/>index 000000000000..cbeebe312ff8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+../../../../arm/boot/dts/bcm283x-rpi-usb-host.dtsi
\ No newline at end of file</div><div class='head'>diff --git a/arch/arm64/boot/dts/broadcom/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/ns2-svk.dts<br/>index b09f3bc5c6c1..5ae08161649e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/ns2-svk.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/broadcom/ns2-svk.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/ns2-svk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/ns2-svk.dts</a></div><div class='hunk'>@@ -56,6 +56,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;enet {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;pci_phy0 {</div><div class='ctx'> 	status = "ok";</div><div class='ctx'> };</div><div class='hunk'>@@ -72,6 +76,10 @@</div><div class='ctx'> 	status = "ok";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;pcie8 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;i2c0 {</div><div class='ctx'> 	status = "ok";</div><div class='ctx'> };</div><div class='hunk'>@@ -157,6 +165,10 @@</div><div class='ctx'> 	status = "ok";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;sdio1 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;nand {</div><div class='ctx'> 	nandcs@0 {</div><div class='ctx'> 		compatible = "brcm,nandcs";</div><div class='hunk'>@@ -174,6 +186,7 @@</div><div class='ctx'> &amp;mdio_mux_iproc {</div><div class='ctx'> 	mdio@10 {</div><div class='ctx'> 		gphy0: eth-phy@10 {</div><div class='add'>+			enet-phy-lane-swap;</div><div class='ctx'> 			reg = &lt;0x10&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -187,3 +200,37 @@</div><div class='ctx'> 		groups = "nand_grp";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	bspi-sel = &lt;0&gt;;</div><div class='add'>+	flash: m25p80@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;12500000&gt;;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "boot";</div><div class='add'>+			reg = &lt;0x00000000 0x000a0000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@a0000 {</div><div class='add'>+			label = "env";</div><div class='add'>+			reg = &lt;0x000a0000 0x00060000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@100000 {</div><div class='add'>+			label = "system";</div><div class='add'>+			reg = &lt;0x00100000 0x00600000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@700000 {</div><div class='add'>+			label = "rootfs";</div><div class='add'>+			reg = &lt;0x00700000 0x01900000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/broadcom/ns2-xmc.dts b/arch/arm64/boot/dts/broadcom/ns2-xmc.dts<br/>new file mode 100644<br/>index 000000000000..99a2723cccd2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/ns2-xmc.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/ns2-xmc.dts</a></div><div class='hunk'>@@ -0,0 +1,191 @@</div><div class='add'>+/*</div><div class='add'>+ *  BSD LICENSE</div><div class='add'>+ *</div><div class='add'>+ *  Copyright(c) 2016 Broadcom.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ *  Redistribution and use in source and binary forms, with or without</div><div class='add'>+ *  modification, are permitted provided that the following conditions</div><div class='add'>+ *  are met:</div><div class='add'>+ *</div><div class='add'>+ *    * Redistributions of source code must retain the above copyright</div><div class='add'>+ *      notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *    * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *      notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *      the documentation and/or other materials provided with the</div><div class='add'>+ *      distribution.</div><div class='add'>+ *    * Neither the name of Broadcom Corporation nor the names of its</div><div class='add'>+ *      contributors may be used to endorse or promote products derived</div><div class='add'>+ *      from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='add'>+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='add'>+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='add'>+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='add'>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "ns2.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Broadcom NS2 XMC";</div><div class='add'>+	compatible = "brcm,ns2-xmc", "brcm,ns2";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+		bootargs = "earlycon=uart8250,mmio32,0x66130000";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x000000000 0x80000000 0x00000001 0x00000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;enet {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio_mux_iproc {</div><div class='add'>+	mdio@10 {</div><div class='add'>+		gphy0: eth-phy@10 {</div><div class='add'>+			reg = &lt;0x10&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;nand {</div><div class='add'>+	nandcs@0 {</div><div class='add'>+		compatible = "brcm,nandcs";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		nand-ecc-mode = "hw";</div><div class='add'>+		nand-ecc-strength = &lt;8&gt;;</div><div class='add'>+		nand-ecc-step-size = &lt;512&gt;;</div><div class='add'>+		nand-bus-width = &lt;16&gt;;</div><div class='add'>+		brcm,nand-oob-sector-size = &lt;16&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "nboot";</div><div class='add'>+			reg = &lt;0x00000000 0x00280000&gt;; /*  2.5MB */</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@280000 {</div><div class='add'>+			label = "nenv";</div><div class='add'>+			reg = &lt;0x00280000 0x00040000&gt;; /* 0.25MB */</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@2c0000 {</div><div class='add'>+			label = "ndtb";</div><div class='add'>+			reg = &lt;0x002c0000 0x00040000&gt;; /* 0.25MB */</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@300000 {</div><div class='add'>+			label = "nsystem";</div><div class='add'>+			reg = &lt;0x00300000 0x03d00000&gt;; /*   61MB */</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@4000000 {</div><div class='add'>+			label = "nrootfs";</div><div class='add'>+			reg = &lt;0x04000000 0x06400000&gt;; /*  100MB */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@0a400000{</div><div class='add'>+			label = "ncustfs";</div><div class='add'>+			reg = &lt;0x0a400000 0x35c00000&gt;; /*  860MB */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pci_phy0 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pcie0 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pcie8 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata_phy0 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata_phy1 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sata {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	flash: m25p80@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		spi-max-frequency = &lt;62500000&gt;;</div><div class='add'>+		m25p,default-addr-width = &lt;3&gt;;</div><div class='add'>+		reg = &lt;0x0 0x0&gt;;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			label = "bl0";</div><div class='add'>+			reg = &lt;0x00000000 0x00080000&gt;; /*  512KB */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@80000 {</div><div class='add'>+			label = "fip";</div><div class='add'>+			reg = &lt;0x00080000 0x00150000&gt;; /* 1344KB */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@1e0000 {</div><div class='add'>+			label = "env";</div><div class='add'>+			reg = &lt;0x001e0000 0x00010000&gt;;/*    64KB */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@1f0000 {</div><div class='add'>+			label = "dtb";</div><div class='add'>+			reg = &lt;0x001f0000 0x00010000&gt;; /*   64KB */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@200000 {</div><div class='add'>+			label = "kernel";</div><div class='add'>+			reg = &lt;0x00200000 0x00e00000&gt;; /*   14MB */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@1000000 {</div><div class='add'>+			label = "rootfs";</div><div class='add'>+			reg = &lt;0x01000000 0x01000000&gt;; /*   16MB */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart3 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/broadcom/ns2.dtsi b/arch/arm64/boot/dts/broadcom/ns2.dtsi<br/>index d95dc408629a..9f9e203c09c5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/ns2.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/broadcom/ns2.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/broadcom/ns2.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/broadcom/ns2.dtsi</a></div><div class='hunk'>@@ -30,6 +30,8 @@</div><div class='ctx'>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/memreserve/ 0x81000000 0x00200000;</div><div class='add'>+</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/clock/bcm-ns2.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -115,7 +117,7 @@</div><div class='ctx'> </div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		interrupt-map-mask = &lt;0 0 0 0&gt;;</div><div class='del'>-		interrupt-map = &lt;0 0 0 0 &amp;gic GIC_SPI 281 IRQ_TYPE_NONE&gt;;</div><div class='add'>+		interrupt-map = &lt;0 0 0 0 &amp;gic 0 GIC_SPI 281 IRQ_TYPE_NONE&gt;;</div><div class='ctx'> </div><div class='ctx'> 		linux,pci-domain = &lt;0&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -133,18 +135,10 @@</div><div class='ctx'> </div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> </div><div class='del'>-		msi-parent = &lt;&amp;msi0&gt;;</div><div class='del'>-		msi0: msi@20020000 {</div><div class='del'>-			compatible = "brcm,iproc-msi";</div><div class='del'>-			msi-controller;</div><div class='del'>-			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 277 IRQ_TYPE_NONE&gt;,</div><div class='del'>-				     &lt;GIC_SPI 278 IRQ_TYPE_NONE&gt;,</div><div class='del'>-				     &lt;GIC_SPI 279 IRQ_TYPE_NONE&gt;,</div><div class='del'>-				     &lt;GIC_SPI 280 IRQ_TYPE_NONE&gt;;</div><div class='del'>-			brcm,num-eq-region = &lt;1&gt;;</div><div class='del'>-			brcm,num-msi-msg-region = &lt;1&gt;;</div><div class='del'>-		};</div><div class='add'>+		phys = &lt;&amp;pci_phy0&gt;;</div><div class='add'>+		phy-names = "pcie-phy";</div><div class='add'>+</div><div class='add'>+		msi-parent = &lt;&amp;v2m0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pcie4: pcie@50020000 {</div><div class='hunk'>@@ -153,7 +147,7 @@</div><div class='ctx'> </div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		interrupt-map-mask = &lt;0 0 0 0&gt;;</div><div class='del'>-		interrupt-map = &lt;0 0 0 0 &amp;gic GIC_SPI 305 IRQ_TYPE_NONE&gt;;</div><div class='add'>+		interrupt-map = &lt;0 0 0 0 &amp;gic 0 GIC_SPI 305 IRQ_TYPE_NONE&gt;;</div><div class='ctx'> </div><div class='ctx'> 		linux,pci-domain = &lt;4&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -171,16 +165,27 @@</div><div class='ctx'> </div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> </div><div class='del'>-		msi-parent = &lt;&amp;msi4&gt;;</div><div class='del'>-		msi4: msi@50020000 {</div><div class='del'>-			compatible = "brcm,iproc-msi";</div><div class='del'>-			msi-controller;</div><div class='del'>-			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 301 IRQ_TYPE_NONE&gt;,</div><div class='del'>-				     &lt;GIC_SPI 302 IRQ_TYPE_NONE&gt;,</div><div class='del'>-				     &lt;GIC_SPI 303 IRQ_TYPE_NONE&gt;,</div><div class='del'>-				     &lt;GIC_SPI 304 IRQ_TYPE_NONE&gt;;</div><div class='del'>-		};</div><div class='add'>+		phys = &lt;&amp;pci_phy1&gt;;</div><div class='add'>+		phy-names = "pcie-phy";</div><div class='add'>+</div><div class='add'>+		msi-parent = &lt;&amp;v2m0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pcie8: pcie@60c00000 {</div><div class='add'>+		compatible = "brcm,iproc-pcie-paxc";</div><div class='add'>+		reg = &lt;0 0x60c00000 0 0x1000&gt;;</div><div class='add'>+		linux,pci-domain = &lt;8&gt;;</div><div class='add'>+</div><div class='add'>+		bus-range = &lt;0x0 0x1&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		ranges = &lt;0x83000000 0 0x00000000 0 0x60000000 0 0x00c00000&gt;;</div><div class='add'>+</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='add'>+		msi-parent = &lt;&amp;v2m0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc: soc {</div><div class='hunk'>@@ -191,6 +196,54 @@</div><div class='ctx'> </div><div class='ctx'> 		#include "ns2-clock.dtsi"</div><div class='ctx'> </div><div class='add'>+		enet: ethernet@61000000 {</div><div class='add'>+			compatible = "brcm,ns2-amac";</div><div class='add'>+			reg = &lt;0x61000000 0x1000&gt;,</div><div class='add'>+			      &lt;0x61090000 0x1000&gt;,</div><div class='add'>+			      &lt;0x61030000 0x100&gt;;</div><div class='add'>+			reg-names = "amac_base", "idm_base", "nicpm_base";</div><div class='add'>+			interrupts = &lt;GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			phy-handle = &lt;&amp;gphy0&gt;;</div><div class='add'>+			phy-mode = "rgmii";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pdc0: iproc-pdc0@612c0000 {</div><div class='add'>+			compatible = "brcm,iproc-pdc-mbox";</div><div class='add'>+			reg = &lt;0x612c0000 0x445&gt;;  /* PDC FS0 regs */</div><div class='add'>+			interrupts = &lt;GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#mbox-cells = &lt;1&gt;;</div><div class='add'>+			brcm,rx-status-len = &lt;32&gt;;</div><div class='add'>+			brcm,use-bcm-hdr;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pdc1: iproc-pdc1@612e0000 {</div><div class='add'>+			compatible = "brcm,iproc-pdc-mbox";</div><div class='add'>+			reg = &lt;0x612e0000 0x445&gt;;  /* PDC FS1 regs */</div><div class='add'>+			interrupts = &lt;GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#mbox-cells = &lt;1&gt;;</div><div class='add'>+			brcm,rx-status-len = &lt;32&gt;;</div><div class='add'>+			brcm,use-bcm-hdr;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pdc2: iproc-pdc2@61300000 {</div><div class='add'>+			compatible = "brcm,iproc-pdc-mbox";</div><div class='add'>+			reg = &lt;0x61300000 0x445&gt;;  /* PDC FS2 regs */</div><div class='add'>+			interrupts = &lt;GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#mbox-cells = &lt;1&gt;;</div><div class='add'>+			brcm,rx-status-len = &lt;32&gt;;</div><div class='add'>+			brcm,use-bcm-hdr;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pdc3: iproc-pdc3@61320000 {</div><div class='add'>+			compatible = "brcm,iproc-pdc-mbox";</div><div class='add'>+			reg = &lt;0x61320000 0x445&gt;;  /* PDC FS3 regs */</div><div class='add'>+			interrupts = &lt;GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#mbox-cells = &lt;1&gt;;</div><div class='add'>+			brcm,rx-status-len = &lt;32&gt;;</div><div class='add'>+			brcm,use-bcm-hdr;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		dma0: dma@61360000 {</div><div class='ctx'> 			compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 			reg = &lt;0x61360000 0x1000&gt;;</div><div class='hunk'>@@ -248,7 +301,7 @@</div><div class='ctx'> 				     &lt;GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 				     &lt;GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='ctx'> 				     &lt;GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			mmu-masters;</div><div class='add'>+			#iommu-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl: pinctrl@6501d130 {</div><div class='hunk'>@@ -277,6 +330,82 @@</div><div class='ctx'> 			      &lt;0x65260000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_RAW(0xf) |</div><div class='ctx'> 				      IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges = &lt;0 0x652e0000 0x80000&gt;;</div><div class='add'>+</div><div class='add'>+			v2m0: v2m@00000 {</div><div class='add'>+				compatible = "arm,gic-v2m-frame";</div><div class='add'>+				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+				msi-controller;</div><div class='add'>+				reg = &lt;0x00000 0x1000&gt;;</div><div class='add'>+				arm,msi-base-spi = &lt;72&gt;;</div><div class='add'>+				arm,msi-num-spis = &lt;16&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			v2m1: v2m@10000 {</div><div class='add'>+				compatible = "arm,gic-v2m-frame";</div><div class='add'>+				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+				msi-controller;</div><div class='add'>+				reg = &lt;0x10000 0x1000&gt;;</div><div class='add'>+				arm,msi-base-spi = &lt;88&gt;;</div><div class='add'>+				arm,msi-num-spis = &lt;16&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			v2m2: v2m@20000 {</div><div class='add'>+				compatible = "arm,gic-v2m-frame";</div><div class='add'>+				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+				msi-controller;</div><div class='add'>+				reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+				arm,msi-base-spi = &lt;104&gt;;</div><div class='add'>+				arm,msi-num-spis = &lt;16&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			v2m3: v2m@30000 {</div><div class='add'>+				compatible = "arm,gic-v2m-frame";</div><div class='add'>+				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+				msi-controller;</div><div class='add'>+				reg = &lt;0x30000 0x1000&gt;;</div><div class='add'>+				arm,msi-base-spi = &lt;120&gt;;</div><div class='add'>+				arm,msi-num-spis = &lt;16&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			v2m4: v2m@40000 {</div><div class='add'>+				compatible = "arm,gic-v2m-frame";</div><div class='add'>+				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+				msi-controller;</div><div class='add'>+				reg = &lt;0x40000 0x1000&gt;;</div><div class='add'>+				arm,msi-base-spi = &lt;136&gt;;</div><div class='add'>+				arm,msi-num-spis = &lt;16&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			v2m5: v2m@50000 {</div><div class='add'>+				compatible = "arm,gic-v2m-frame";</div><div class='add'>+				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+				msi-controller;</div><div class='add'>+				reg = &lt;0x50000 0x1000&gt;;</div><div class='add'>+				arm,msi-base-spi = &lt;152&gt;;</div><div class='add'>+				arm,msi-num-spis = &lt;16&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			v2m6: v2m@60000 {</div><div class='add'>+				compatible = "arm,gic-v2m-frame";</div><div class='add'>+				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+				msi-controller;</div><div class='add'>+				reg = &lt;0x60000 0x1000&gt;;</div><div class='add'>+				arm,msi-base-spi = &lt;168&gt;;</div><div class='add'>+				arm,msi-num-spis = &lt;16&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			v2m7: v2m@70000 {</div><div class='add'>+				compatible = "arm,gic-v2m-frame";</div><div class='add'>+				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+				msi-controller;</div><div class='add'>+				reg = &lt;0x70000 0x1000&gt;;</div><div class='add'>+				arm,msi-base-spi = &lt;184&gt;;</div><div class='add'>+				arm,msi-num-spis = &lt;16&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cci@65590000 {</div><div class='hunk'>@@ -565,5 +694,23 @@</div><div class='ctx'> </div><div class='ctx'> 			brcm,nand-has-wp;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		qspi: spi@66470200 {</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi";</div><div class='add'>+			reg = &lt;0x66470200 0x184&gt;,</div><div class='add'>+				&lt;0x66470000 0x124&gt;,</div><div class='add'>+				&lt;0x67017408 0x004&gt;,</div><div class='add'>+				&lt;0x664703a0 0x01c&gt;;</div><div class='add'>+			reg-names = "mspi", "bspi", "intr_regs",</div><div class='add'>+				"intr_status_reg";</div><div class='add'>+			interrupts = &lt;GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "spi_l1_intr";</div><div class='add'>+			clocks = &lt;&amp;iprocmed&gt;;</div><div class='add'>+			clock-names = "iprocmed";</div><div class='add'>+			num-cs = &lt;2&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/Makefile b/arch/arm64/boot/dts/exynos/Makefile<br/>index 50c9b9383cfa..7ddea53769a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/exynos/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/Makefile</a></div><div class='hunk'>@@ -1,4 +1,7 @@</div><div class='del'>-dtb-$(CONFIG_ARCH_EXYNOS) += exynos7-espresso.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_EXYNOS) += \</div><div class='add'>+	exynos5433-tm2.dtb	\</div><div class='add'>+	exynos5433-tm2e.dtb	\</div><div class='add'>+	exynos7-espresso.dtb</div><div class='ctx'> </div><div class='ctx'> always		:= $(dtb-y)</div><div class='ctx'> subdir-y	:= $(dts-dirs)</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi<br/>new file mode 100644<br/>index 000000000000..c42dc39c3223<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi</a></div><div class='hunk'>@@ -0,0 +1,197 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung's Exynos5433 SoC Memory interface and AMBA bus device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	bus_g2d_400: bus0 {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;cmu_top CLK_ACLK_G2D_400&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_g2d_400_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_g2d_266: bus1 {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;cmu_top CLK_ACLK_G2D_266&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_g2d_266_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_gscl: bus2 {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;cmu_top CLK_ACLK_GSCL_333&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_gscl_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_hevc: bus3 {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;cmu_top CLK_ACLK_HEVC_400&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_hevc_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_jpeg: bus4 {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;cmu_top CLK_SCLK_JPEG_MSCL&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_g2d_400_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_mfc: bus5 {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;cmu_top CLK_ACLK_MFC_400&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_g2d_400_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_mscl: bus6 {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;cmu_top CLK_ACLK_MSCL_400&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_g2d_400_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_noc0: bus7 {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;cmu_top CLK_ACLK_BUS0_400&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_hevc_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_noc1: bus8 {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;cmu_top CLK_ACLK_BUS1_400&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_hevc_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_noc2: bus9 {</div><div class='add'>+		compatible = "samsung,exynos-bus";</div><div class='add'>+		clocks = &lt;&amp;cmu_mif CLK_ACLK_BUS2_400&gt;;</div><div class='add'>+		clock-names = "bus";</div><div class='add'>+		operating-points-v2 = &lt;&amp;bus_noc2_opp_table&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_g2d_400_opp_table: opp_table2 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@400000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;400000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1075000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@267000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;267000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;975000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@160000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;160000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;962500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@134000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;950000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;937500&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_g2d_266_opp_table: opp_table3 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+</div><div class='add'>+		opp@267000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;267000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@160000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;160000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@134000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_gscl_opp_table: opp_table4 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+</div><div class='add'>+		opp@333000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;333000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@222000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;222000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@166500000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;166500000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_hevc_opp_table: opp_table5 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@400000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;400000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@267000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;267000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@160000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;160000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@134000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bus_noc2_opp_table: opp_table6 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+</div><div class='add'>+		opp@400000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;400000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;200000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@134000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;134000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;100000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi<br/>new file mode 100644<br/>index 000000000000..50403700274b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi</a></div><div class='hunk'>@@ -0,0 +1,793 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung's Exynos5433 SoC pin-mux and pin-config device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Samsung's Exynos5433 SoC pin-mux and pin-config options are listed as device</div><div class='add'>+ * tree nodes are listed in this file.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/pinctrl/samsung.h&gt;</div><div class='add'>+</div><div class='add'>+#define PIN(_func, _pin, _pull, _drv)					\</div><div class='add'>+	_pin {								\</div><div class='add'>+		samsung,pins = #_pin;					\</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_ ##_func&gt;;	\</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_ ##_pull&gt;;		\</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_ ##_drv&gt;;		\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_alive {</div><div class='add'>+	gpa0: gpa0 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpa1: gpa1 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpa2: gpa2 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpa3: gpa3 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpf1: gpf1 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpf2: gpf2 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpf3: gpf3 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpf4: gpf4 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpf5: gpf5 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_aud {</div><div class='add'>+	gpz0: gpz0 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpz1: gpz1 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2s0_bus: i2s0-bus {</div><div class='add'>+		samsung,pins = "gpz0-0", "gpz0-1", "gpz0-2", "gpz0-3",</div><div class='add'>+				"gpz0-4", "gpz0-5", "gpz0-6";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pcm0_bus: pcm0-bus {</div><div class='add'>+		samsung,pins = "gpz1-0", "gpz1-1", "gpz1-2", "gpz1-3";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart_aud_bus: uart-aud-bus {</div><div class='add'>+		samsung,pins = "gpz1-3", "gpz1-2", "gpz1-1", "gpz1-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_cpif {</div><div class='add'>+	gpv6: gpv6 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_ese {</div><div class='add'>+	gpj2: gpj2 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_finger {</div><div class='add'>+	gpd5: gpd5 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi2_bus: spi2-bus {</div><div class='add'>+		samsung,pins = "gpd5-0", "gpd5-2", "gpd5-3";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c6_bus: hs-i2c6-bus {</div><div class='add'>+		samsung,pins = "gpd5-3", "gpd5-2";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_fsys {</div><div class='add'>+	gph1: gph1 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpr4: gpr4 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpr0: gpr0 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpr1: gpr1 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpr2: gpr2 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpr3: gpr3 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd0_clk: sd0-clk {</div><div class='add'>+		samsung,pins = "gpr0-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd0_cmd: sd0-cmd {</div><div class='add'>+		samsung,pins = "gpr0-1";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd0_rdqs: sd0-rdqs {</div><div class='add'>+		samsung,pins = "gpr0-2";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_DOWN&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd0_qrdy: sd0-qrdy {</div><div class='add'>+		samsung,pins = "gpr0-3";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_DOWN&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd0_bus1: sd0-bus-width1 {</div><div class='add'>+		samsung,pins = "gpr1-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd0_bus4: sd0-bus-width4 {</div><div class='add'>+		samsung,pins = "gpr1-1", "gpr1-2", "gpr1-3";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd0_bus8: sd0-bus-width8 {</div><div class='add'>+		samsung,pins = "gpr1-4", "gpr1-5", "gpr1-6", "gpr1-7";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd1_clk: sd1-clk {</div><div class='add'>+		samsung,pins = "gpr2-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd1_cmd: sd1-cmd {</div><div class='add'>+		samsung,pins = "gpr2-1";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd1_bus1: sd1-bus-width1 {</div><div class='add'>+		samsung,pins = "gpr3-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd1_bus4: sd1-bus-width4 {</div><div class='add'>+		samsung,pins = "gpr3-1", "gpr3-2", "gpr3-3";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd1_bus8: sd1-bus-width8 {</div><div class='add'>+		samsung,pins = "gpr3-4", "gpr3-5", "gpr3-6", "gpr3-7";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pcie_bus: pcie_bus {</div><div class='add'>+		samsung,pins = "gpr3-4", "gpr3-5", "gpr3-6", "gpr3-7";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd2_clk: sd2-clk {</div><div class='add'>+		samsung,pins = "gpr4-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd2_cmd: sd2-cmd {</div><div class='add'>+		samsung,pins = "gpr4-1";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd2_cd: sd2-cd {</div><div class='add'>+		samsung,pins = "gpr4-2";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd2_bus1: sd2-bus-width1 {</div><div class='add'>+		samsung,pins = "gpr4-3";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd2_bus4: sd2-bus-width4 {</div><div class='add'>+		samsung,pins = "gpr4-4", "gpr4-5", "gpr4-6";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd2_clk_output: sd2-clk-output {</div><div class='add'>+		samsung,pins = "gpr4-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_OUTPUT&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR3&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sd2_cmd_output: sd2-cmd-output {</div><div class='add'>+		samsung,pins = "gpr4-1";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_OUTPUT&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR3&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_imem {</div><div class='add'>+	gpf0: gpf0 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_nfc {</div><div class='add'>+	gpj0: gpj0 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c4_bus: hs-i2c4-bus {</div><div class='add'>+		samsung,pins = "gpj0-1", "gpj0-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_peric {</div><div class='add'>+	gpv7: gpv7 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpb0: gpb0 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpc0: gpc0 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpc1: gpc1 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpc2: gpc2 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpc3: gpc3 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpg0: gpg0 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpd0: gpd0 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpd1: gpd1 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpd2: gpd2 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpd4: gpd4 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpd8: gpd8 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpd6: gpd6 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpd7: gpd7 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpg1: gpg1 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpg2: gpg2 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpg3: gpg3 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c8_bus: hs-i2c8-bus {</div><div class='add'>+		samsung,pins = "gpb0-1", "gpb0-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c9_bus: hs-i2c9-bus {</div><div class='add'>+		samsung,pins = "gpb0-3", "gpb0-2";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2s1_bus: i2s1-bus {</div><div class='add'>+		samsung,pins = "gpd4-0", "gpd4-1", "gpd4-2",</div><div class='add'>+				"gpd4-3", "gpd4-4";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pcm1_bus: pcm1-bus {</div><div class='add'>+		samsung,pins = "gpd4-0", "gpd4-1", "gpd4-2",</div><div class='add'>+				"gpd4-3", "gpd4-4";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spdif_bus: spdif-bus {</div><div class='add'>+		samsung,pins = "gpd4-3", "gpd4-4";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fimc_is_spi_pin0: fimc-is-spi-pin0 {</div><div class='add'>+		samsung,pins = "gpc3-3", "gpc3-2", "gpc3-1", "gpc3-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fimc_is_spi_pin1: fimc-is-spi-pin1 {</div><div class='add'>+		samsung,pins = "gpc3-7", "gpc3-6", "gpc3-5", "gpc3-4";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart0_bus: uart0-bus {</div><div class='add'>+		samsung,pins = "gpd0-3", "gpd0-2", "gpd0-1", "gpd0-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c2_bus: hs-i2c2-bus {</div><div class='add'>+		samsung,pins = "gpd0-3", "gpd0-2";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart2_bus: uart2-bus {</div><div class='add'>+		samsung,pins = "gpd1-5", "gpd1-4";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart1_bus: uart1-bus {</div><div class='add'>+		samsung,pins = "gpd1-3", "gpd1-2", "gpd1-1", "gpd1-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c3_bus: hs-i2c3-bus {</div><div class='add'>+		samsung,pins = "gpd1-3", "gpd1-2";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c0_bus: hs-i2c0-bus {</div><div class='add'>+		samsung,pins = "gpd2-1", "gpd2-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c1_bus: hs-i2c1-bus {</div><div class='add'>+		samsung,pins = "gpd2-3", "gpd2-2";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pwm0_out: pwm0-out {</div><div class='add'>+		samsung,pins = "gpd2-4";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pwm1_out: pwm1-out {</div><div class='add'>+		samsung,pins = "gpd2-5";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pwm2_out: pwm2-out {</div><div class='add'>+		samsung,pins = "gpd2-6";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pwm3_out: pwm3-out {</div><div class='add'>+		samsung,pins = "gpd2-7";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi1_bus: spi1-bus {</div><div class='add'>+		samsung,pins = "gpd6-2", "gpd6-4", "gpd6-5";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c7_bus: hs-i2c7-bus {</div><div class='add'>+		samsung,pins = "gpd2-7", "gpd2-6";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi0_bus: spi0-bus {</div><div class='add'>+		samsung,pins = "gpd8-0", "gpd6-0", "gpd6-1";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c10_bus: hs-i2c10-bus {</div><div class='add'>+		samsung,pins = "gpg3-1", "gpg3-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c11_bus: hs-i2c11-bus {</div><div class='add'>+		samsung,pins = "gpg3-3", "gpg3-2";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi3_bus: spi3-bus {</div><div class='add'>+		samsung,pins = "gpg3-4", "gpg3-6", "gpg3-7";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi4_bus: spi4-bus {</div><div class='add'>+		samsung,pins = "gpv7-1", "gpv7-3", "gpv7-4";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fimc_is_uart: fimc-is-uart {</div><div class='add'>+		samsung,pins = "gpc1-1", "gpc0-7";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fimc_is_ch0_i2c: fimc-is-ch0_i2c {</div><div class='add'>+		samsung,pins = "gpc2-1", "gpc2-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fimc_is_ch0_mclk: fimc-is-ch0_mclk {</div><div class='add'>+		samsung,pins = "gpd7-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fimc_is_ch1_i2c: fimc-is-ch1-i2c {</div><div class='add'>+		samsung,pins = "gpc2-3", "gpc2-2";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fimc_is_ch1_mclk: fimc-is-ch1-mclk {</div><div class='add'>+		samsung,pins = "gpd7-1";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fimc_is_ch2_i2c: fimc-is-ch2-i2c {</div><div class='add'>+		samsung,pins = "gpc2-5", "gpc2-4";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fimc_is_ch2_mclk: fimc-is-ch2-mclk {</div><div class='add'>+		samsung,pins = "gpd7-2";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_touch {</div><div class='add'>+	gpj1: gpj1 {</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hs_i2c5_bus: hs-i2c5-bus {</div><div class='add'>+		samsung,pins = "gpj1-1", "gpj1-0";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_4&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS5433_PIN_DRV_FAST_SR1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi<br/>new file mode 100644<br/>index 000000000000..098ad557fee3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi</a></div><div class='hunk'>@@ -0,0 +1,1191 @@</div><div class='add'>+/*</div><div class='add'>+ * SAMSUNG Exynos5433 TM2 board device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Common device tree source file for Samsung's TM2 and TM2E boards</div><div class='add'>+ * which are based on Samsung Exynos5433 SoC.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "exynos5433.dtsi"</div><div class='add'>+#include &lt;dt-bindings/clock/samsung,s2mps11.h&gt;</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	aliases {</div><div class='add'>+		gsc0 = &amp;gsc_0;</div><div class='add'>+		gsc1 = &amp;gsc_1;</div><div class='add'>+		gsc2 = &amp;gsc_2;</div><div class='add'>+		pinctrl0 = &amp;pinctrl_alive;</div><div class='add'>+		pinctrl1 = &amp;pinctrl_aud;</div><div class='add'>+		pinctrl2 = &amp;pinctrl_cpif;</div><div class='add'>+		pinctrl3 = &amp;pinctrl_ese;</div><div class='add'>+		pinctrl4 = &amp;pinctrl_finger;</div><div class='add'>+		pinctrl5 = &amp;pinctrl_fsys;</div><div class='add'>+		pinctrl6 = &amp;pinctrl_imem;</div><div class='add'>+		pinctrl7 = &amp;pinctrl_nfc;</div><div class='add'>+		pinctrl8 = &amp;pinctrl_peric;</div><div class='add'>+		pinctrl9 = &amp;pinctrl_touch;</div><div class='add'>+		serial0 = &amp;serial_0;</div><div class='add'>+		serial1 = &amp;serial_1;</div><div class='add'>+		serial2 = &amp;serial_2;</div><div class='add'>+		serial3 = &amp;serial_3;</div><div class='add'>+		spi0 = &amp;spi_0;</div><div class='add'>+		spi1 = &amp;spi_1;</div><div class='add'>+		spi2 = &amp;spi_2;</div><div class='add'>+		spi3 = &amp;spi_3;</div><div class='add'>+		spi4 = &amp;spi_4;</div><div class='add'>+		mshc0 = &amp;mshc_0;</div><div class='add'>+		mshc2 = &amp;mshc_2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = &amp;serial_1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@20000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x20000000 0x0 0xc0000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+</div><div class='add'>+		power-key {</div><div class='add'>+			gpios = &lt;&amp;gpa2 7 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;KEY_POWER&gt;;</div><div class='add'>+			label = "power key";</div><div class='add'>+			debounce-interval = &lt;10&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		volume-up-key {</div><div class='add'>+			gpios = &lt;&amp;gpa2 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;KEY_VOLUMEUP&gt;;</div><div class='add'>+			label = "volume-up key";</div><div class='add'>+			debounce-interval = &lt;10&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		volume-down-key {</div><div class='add'>+			gpios = &lt;&amp;gpa2 1 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;KEY_VOLUMEDOWN&gt;;</div><div class='add'>+			label = "volume-down key";</div><div class='add'>+			debounce-interval = &lt;10&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		homepage-key {</div><div class='add'>+			gpios = &lt;&amp;gpa0 3 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			linux,code = &lt;KEY_MENU&gt;;</div><div class='add'>+			label = "homepage key";</div><div class='add'>+			debounce-interval = &lt;10&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c_max98504: i2c-gpio-0 {</div><div class='add'>+		compatible = "i2c-gpio";</div><div class='add'>+		gpios = &lt;&amp;gpd0 1 GPIO_ACTIVE_HIGH /* SPK_AMP_SDA */</div><div class='add'>+			 &amp;gpd0 0 GPIO_ACTIVE_HIGH /* SPK_AMP_SCL */ &gt;;</div><div class='add'>+		i2c-gpio,delay-us = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		max98504: max98504@31 {</div><div class='add'>+			compatible = "maxim,max98504";</div><div class='add'>+			reg = &lt;0x31&gt;;</div><div class='add'>+			maxim,rx-path = &lt;1&gt;;</div><div class='add'>+			maxim,tx-path = &lt;1&gt;;</div><div class='add'>+			maxim,tx-channel-mask = &lt;3&gt;;</div><div class='add'>+			maxim,tx-channel-source = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "samsung,tm2-audio";</div><div class='add'>+		audio-codec = &lt;&amp;wm5110&gt;;</div><div class='add'>+		i2s-controller = &lt;&amp;i2s0&gt;;</div><div class='add'>+		audio-amplifier = &lt;&amp;max98504&gt;;</div><div class='add'>+		mic-bias-gpios = &lt;&amp;gpr3 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		model = "wm5110";</div><div class='add'>+		samsung,audio-routing =</div><div class='add'>+			/* Headphone */</div><div class='add'>+			"HP", "HPOUT1L",</div><div class='add'>+			"HP", "HPOUT1R",</div><div class='add'>+</div><div class='add'>+			/* Speaker */</div><div class='add'>+			"SPK", "SPKOUT",</div><div class='add'>+			"SPKOUT", "HPOUT2L",</div><div class='add'>+			"SPKOUT", "HPOUT2R",</div><div class='add'>+</div><div class='add'>+			/* Receiver */</div><div class='add'>+			"RCV", "HPOUT3L",</div><div class='add'>+			"RCV", "HPOUT3R";</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;adc {</div><div class='add'>+	vdd-supply = &lt;&amp;ldo3_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	thermistor-ap {</div><div class='add'>+		compatible = "murata,ncp03wf104";</div><div class='add'>+		pullup-uv = &lt;1800000&gt;;</div><div class='add'>+		pullup-ohm = &lt;100000&gt;;</div><div class='add'>+		pulldown-ohm = &lt;0&gt;;</div><div class='add'>+		io-channels = &lt;&amp;adc 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	thermistor-battery {</div><div class='add'>+		compatible = "murata,ncp03wf104";</div><div class='add'>+		pullup-uv = &lt;1800000&gt;;</div><div class='add'>+		pullup-ohm = &lt;100000&gt;;</div><div class='add'>+		pulldown-ohm = &lt;0&gt;;</div><div class='add'>+		io-channels = &lt;&amp;adc 1&gt;;</div><div class='add'>+		#thermal-sensor-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	thermistor-charger {</div><div class='add'>+		compatible = "murata,ncp03wf104";</div><div class='add'>+		pullup-uv = &lt;1800000&gt;;</div><div class='add'>+		pullup-ohm = &lt;100000&gt;;</div><div class='add'>+		pulldown-ohm = &lt;0&gt;;</div><div class='add'>+		io-channels = &lt;&amp;adc 2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_g2d_400 {</div><div class='add'>+	devfreq-events = &lt;&amp;ppmu_event0_d0_general&gt;, &lt;&amp;ppmu_event0_d1_general&gt;;</div><div class='add'>+	vdd-supply = &lt;&amp;buck4_reg&gt;;</div><div class='add'>+	exynos,saturation-ratio = &lt;10&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_g2d_266 {</div><div class='add'>+	devfreq = &lt;&amp;bus_g2d_400&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_gscl {</div><div class='add'>+	devfreq = &lt;&amp;bus_g2d_400&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_hevc {</div><div class='add'>+	devfreq = &lt;&amp;bus_g2d_400&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_jpeg {</div><div class='add'>+	devfreq = &lt;&amp;bus_g2d_400&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_mfc {</div><div class='add'>+	devfreq = &lt;&amp;bus_g2d_400&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_mscl {</div><div class='add'>+	devfreq = &lt;&amp;bus_g2d_400&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_noc0 {</div><div class='add'>+	devfreq = &lt;&amp;bus_g2d_400&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_noc1 {</div><div class='add'>+	devfreq = &lt;&amp;bus_g2d_400&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;bus_noc2 {</div><div class='add'>+	devfreq = &lt;&amp;bus_g2d_400&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cmu_aud {</div><div class='add'>+	assigned-clocks = &lt;&amp;cmu_aud CLK_MOUT_AUD_PLL_USER&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;cmu_top CLK_FOUT_AUD_PLL&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cmu_fsys {</div><div class='add'>+	assigned-clocks = &lt;&amp;cmu_top CLK_MOUT_SCLK_USBDRD30&gt;,</div><div class='add'>+		&lt;&amp;cmu_top CLK_MOUT_SCLK_USBHOST30&gt;,</div><div class='add'>+		&lt;&amp;cmu_fsys CLK_MOUT_SCLK_USBDRD30_USER&gt;,</div><div class='add'>+		&lt;&amp;cmu_fsys CLK_MOUT_SCLK_USBHOST30_USER&gt;,</div><div class='add'>+		&lt;&amp;cmu_fsys CLK_MOUT_PHYCLK_USBDRD30_UDRD30_PIPE_PCLK_USER&gt;,</div><div class='add'>+		&lt;&amp;cmu_fsys CLK_MOUT_PHYCLK_USBHOST30_UHOST30_PIPE_PCLK_USER&gt;,</div><div class='add'>+		&lt;&amp;cmu_fsys CLK_MOUT_PHYCLK_USBDRD30_UDRD30_PHYCLOCK_USER&gt;,</div><div class='add'>+		&lt;&amp;cmu_fsys CLK_MOUT_PHYCLK_USBHOST30_UHOST30_PHYCLOCK_USER&gt;,</div><div class='add'>+		&lt;&amp;cmu_top CLK_DIV_SCLK_USBDRD30&gt;,</div><div class='add'>+		&lt;&amp;cmu_top CLK_DIV_SCLK_USBHOST30&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;cmu_top CLK_MOUT_BUS_PLL_USER&gt;,</div><div class='add'>+		&lt;&amp;cmu_top CLK_MOUT_BUS_PLL_USER&gt;,</div><div class='add'>+		&lt;&amp;cmu_top CLK_SCLK_USBDRD30_FSYS&gt;,</div><div class='add'>+		&lt;&amp;cmu_top CLK_SCLK_USBHOST30_FSYS&gt;,</div><div class='add'>+		&lt;&amp;cmu_fsys CLK_PHYCLK_USBDRD30_UDRD30_PIPE_PCLK_PHY&gt;,</div><div class='add'>+		&lt;&amp;cmu_fsys CLK_PHYCLK_USBHOST30_UHOST30_PIPE_PCLK_PHY&gt;,</div><div class='add'>+		&lt;&amp;cmu_fsys CLK_PHYCLK_USBDRD30_UDRD30_PHYCLOCK_PHY&gt;,</div><div class='add'>+		&lt;&amp;cmu_fsys CLK_PHYCLK_USBHOST30_UHOST30_PHYCLOCK_PHY&gt;;</div><div class='add'>+	assigned-clock-rates = &lt;0&gt;, &lt;0&gt;, &lt;0&gt;, &lt;0&gt;, &lt;0&gt;, &lt;0&gt;, &lt;0&gt;, &lt;0&gt;,</div><div class='add'>+			       &lt;66700000&gt;, &lt;66700000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cmu_gscl {</div><div class='add'>+	assigned-clocks = &lt;&amp;cmu_gscl CLK_MOUT_ACLK_GSCL_111_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_gscl CLK_MOUT_ACLK_GSCL_333_USER&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;cmu_top CLK_ACLK_GSCL_111&gt;,</div><div class='add'>+				 &lt;&amp;cmu_top CLK_ACLK_GSCL_333&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cmu_mfc {</div><div class='add'>+	assigned-clocks = &lt;&amp;cmu_mfc CLK_MOUT_ACLK_MFC_400_USER&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;cmu_top CLK_ACLK_MFC_400&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cmu_mscl {</div><div class='add'>+	assigned-clocks = &lt;&amp;cmu_mscl CLK_MOUT_ACLK_MSCL_400_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_mscl CLK_MOUT_SCLK_JPEG_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_mscl CLK_MOUT_SCLK_JPEG&gt;,</div><div class='add'>+			  &lt;&amp;cmu_top CLK_MOUT_SCLK_JPEG_A&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;cmu_top CLK_ACLK_MSCL_400&gt;,</div><div class='add'>+				 &lt;&amp;cmu_top CLK_SCLK_JPEG_MSCL&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mscl CLK_MOUT_SCLK_JPEG_USER&gt;,</div><div class='add'>+				 &lt;&amp;cmu_top CLK_MOUT_BUS_PLL_USER&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpu0 {</div><div class='add'>+	cpu-supply = &lt;&amp;buck3_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpu4 {</div><div class='add'>+	cpu-supply = &lt;&amp;buck2_reg&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;decon {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	i80-if-timings {</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;decon_tv {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	ports {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		port@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			tv_to_hdmi: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;hdmi_to_tv&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dsi {</div><div class='add'>+	status = "okay";</div><div class='add'>+	vddcore-supply = &lt;&amp;ldo6_reg&gt;;</div><div class='add'>+	vddio-supply = &lt;&amp;ldo7_reg&gt;;</div><div class='add'>+	samsung,pll-clock-frequency = &lt;24000000&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;te_irq&gt;;</div><div class='add'>+</div><div class='add'>+	ports {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		port@1 {</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			dsi_out: endpoint {</div><div class='add'>+				samsung,burst-clock-frequency = &lt;512000000&gt;;</div><div class='add'>+				samsung,esc-clock-frequency = &lt;16000000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hdmi {</div><div class='add'>+	hpd-gpios = &lt;&amp;gpa3 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+	vdd-supply = &lt;&amp;ldo6_reg&gt;;</div><div class='add'>+	vdd_osc-supply = &lt;&amp;ldo7_reg&gt;;</div><div class='add'>+	vdd_pll-supply = &lt;&amp;ldo6_reg&gt;;</div><div class='add'>+</div><div class='add'>+	ports {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		port@0 {</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			hdmi_to_tv: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;tv_to_hdmi&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port@1 {</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			hdmi_to_mhl: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;mhl_to_hdmi&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hsi2c_0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	clock-frequency = &lt;2500000&gt;;</div><div class='add'>+</div><div class='add'>+	s2mps13-pmic@66 {</div><div class='add'>+		compatible = "samsung,s2mps13-pmic";</div><div class='add'>+		interrupt-parent = &lt;&amp;gpa0&gt;;</div><div class='add'>+		interrupts = &lt;7 IRQ_TYPE_NONE&gt;;</div><div class='add'>+		reg = &lt;0x66&gt;;</div><div class='add'>+		samsung,s2mps11-wrstbi-ground;</div><div class='add'>+</div><div class='add'>+		s2mps13_osc: clocks {</div><div class='add'>+			compatible = "samsung,s2mps13-clk";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			clock-output-names = "s2mps13_ap", "s2mps13_cp",</div><div class='add'>+				"s2mps13_bt";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			ldo1_reg: LDO1 {</div><div class='add'>+				regulator-name = "VDD_ALIVE_0.9V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;900000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;900000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo2_reg: LDO2 {</div><div class='add'>+				regulator-name = "VDDQ_MMC2_2.8V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;2800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo3_reg: LDO3 {</div><div class='add'>+				regulator-name = "VDD1_E_1.8V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo4_reg: LDO4 {</div><div class='add'>+				regulator-name = "VDD10_MIF_PLL_1.0V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo5_reg: LDO5 {</div><div class='add'>+				regulator-name = "VDD10_DPLL_1.0V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo6_reg: LDO6 {</div><div class='add'>+				regulator-name = "VDD10_MIPI2L_1.0V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo7_reg: LDO7 {</div><div class='add'>+				regulator-name = "VDD18_MIPI2L_1.8V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo8_reg: LDO8 {</div><div class='add'>+				regulator-name = "VDD18_LLI_1.8V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo9_reg: LDO9 {</div><div class='add'>+				regulator-name = "VDD18_ABB_ETC_1.8V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo10_reg: LDO10 {</div><div class='add'>+				regulator-name = "VDD33_USB30_3.0V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;3000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo11_reg: LDO11 {</div><div class='add'>+				regulator-name = "VDD_INT_M_1.0V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo12_reg: LDO12 {</div><div class='add'>+				regulator-name = "VDD_KFC_M_1.1V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1350000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo13_reg: LDO13 {</div><div class='add'>+				regulator-name = "VDD_G3D_M_0.95V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;950000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;950000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo14_reg: LDO14 {</div><div class='add'>+				regulator-name = "VDDQ_M1_LDO_1.2V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1200000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1200000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo15_reg: LDO15 {</div><div class='add'>+				regulator-name = "VDDQ_M2_LDO_1.2V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1200000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1200000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo16_reg: LDO16 {</div><div class='add'>+				regulator-name = "VDDQ_EFUSE";</div><div class='add'>+				regulator-min-microvolt = &lt;1400000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3400000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo17_reg: LDO17 {</div><div class='add'>+				regulator-name = "V_TFLASH_2.8V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;2800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo18_reg: LDO18 {</div><div class='add'>+				regulator-name = "V_CODEC_1.8V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo19_reg: LDO19 {</div><div class='add'>+				regulator-name = "VDDA_1.8V_COMP";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo20_reg: LDO20 {</div><div class='add'>+				regulator-name = "VCC_2.8V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;2800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo21_reg: LDO21 {</div><div class='add'>+				regulator-name = "VT_CAM_1.8V";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo22_reg: LDO22 {</div><div class='add'>+				regulator-name = "CAM_IO_1.8V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo23_reg: LDO23 {</div><div class='add'>+				regulator-name = "CAM_SEN_CORE_1.05V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1050000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1050000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo24_reg: LDO24 {</div><div class='add'>+				regulator-name = "VT_CAM_1.2V";</div><div class='add'>+				regulator-min-microvolt = &lt;1200000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1200000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo25_reg: LDO25 {</div><div class='add'>+				regulator-name = "UNUSED_LDO25";</div><div class='add'>+				regulator-min-microvolt = &lt;2800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo26_reg: LDO26 {</div><div class='add'>+				regulator-name = "CAM_AF_2.8V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;2800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo27_reg: LDO27 {</div><div class='add'>+				regulator-name = "VCC_3.0V_LCD_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;3000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo28_reg: LDO28 {</div><div class='add'>+				regulator-name = "VCC_1.8V_LCD_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo29_reg: LDO29 {</div><div class='add'>+				regulator-name = "VT_CAM_2.8V";</div><div class='add'>+				regulator-min-microvolt = &lt;3000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo30_reg: LDO30 {</div><div class='add'>+				regulator-name = "TSP_AVDD_3.3V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo31_reg: LDO31 {</div><div class='add'>+				/*</div><div class='add'>+				 * LDO31 differs from target to target,</div><div class='add'>+				 * its definition is in the .dts</div><div class='add'>+				 */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo32_reg: LDO32 {</div><div class='add'>+				regulator-name = "VTOUCH_1.8V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo33_reg: LDO33 {</div><div class='add'>+				regulator-name = "VTOUCH_LED_3.3V";</div><div class='add'>+				regulator-min-microvolt = &lt;2500000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-ramp-delay = &lt;12500&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo34_reg: LDO34 {</div><div class='add'>+				regulator-name = "VCC_1.8V_MHL_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2100000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo35_reg: LDO35 {</div><div class='add'>+				regulator-name = "OIS_VM_2.8V";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;2800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo36_reg: LDO36 {</div><div class='add'>+				regulator-name = "VSIL_1.0V";</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo37_reg: LDO37 {</div><div class='add'>+				regulator-name = "VF_1.8V";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo38_reg: LDO38 {</div><div class='add'>+				/*</div><div class='add'>+				 * LDO38 differs from target to target,</div><div class='add'>+				 * its definition is in the .dts</div><div class='add'>+				 */</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo39_reg: LDO39 {</div><div class='add'>+				regulator-name = "V_HRM_1.8V";</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ldo40_reg: LDO40 {</div><div class='add'>+				regulator-name = "V_HRM_3.3V";</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck1_reg: BUCK1 {</div><div class='add'>+				regulator-name = "VDD_MIF_0.9V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;600000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1500000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck2_reg: BUCK2 {</div><div class='add'>+				regulator-name = "VDD_EGL_1.0V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;900000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck3_reg: BUCK3 {</div><div class='add'>+				regulator-name = "VDD_KFC_1.0V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1200000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck4_reg: BUCK4 {</div><div class='add'>+				regulator-name = "VDD_INT_0.95V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;600000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1500000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck5_reg: BUCK5 {</div><div class='add'>+				regulator-name = "VDD_DISP_CAM0_0.9V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;600000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1500000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck6_reg: BUCK6 {</div><div class='add'>+				regulator-name = "VDD_G3D_0.9V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;600000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1500000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-state-mem {</div><div class='add'>+					regulator-off-in-suspend;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck7_reg: BUCK7 {</div><div class='add'>+				regulator-name = "VDD_MEM1_1.2V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1200000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1200000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck8_reg: BUCK8 {</div><div class='add'>+				regulator-name = "VDD_LLDO_1.35V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1350000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck9_reg: BUCK9 {</div><div class='add'>+				regulator-name = "VDD_MLDO_2.0V_AP";</div><div class='add'>+				regulator-min-microvolt = &lt;1350000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			buck10_reg: BUCK10 {</div><div class='add'>+				regulator-name = "vdd_mem2";</div><div class='add'>+				regulator-min-microvolt = &lt;550000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1500000&gt;;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hsi2c_7 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	sii8620@39 {</div><div class='add'>+		reg = &lt;0x39&gt;;</div><div class='add'>+		compatible = "sil,sii8620";</div><div class='add'>+		cvcc10-supply = &lt;&amp;ldo36_reg&gt;;</div><div class='add'>+		iovcc18-supply = &lt;&amp;ldo34_reg&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpf0&gt;;</div><div class='add'>+		interrupts = &lt;2 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpv7 0 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		clocks = &lt;&amp;pmu_system_controller 0&gt;;</div><div class='add'>+		clock-names = "xtal";</div><div class='add'>+</div><div class='add'>+		port {</div><div class='add'>+			mhl_to_hdmi: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;hdmi_to_mhl&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hsi2c_8 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	max77843@66 {</div><div class='add'>+		compatible = "maxim,max77843";</div><div class='add'>+		interrupt-parent = &lt;&amp;gpa1&gt;;</div><div class='add'>+		interrupts = &lt;5 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		reg = &lt;0x66&gt;;</div><div class='add'>+</div><div class='add'>+		muic: max77843-muic {</div><div class='add'>+			compatible = "maxim,max77843-muic";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			compatible = "maxim,max77843-regulator";</div><div class='add'>+			safeout1_reg: SAFEOUT1 {</div><div class='add'>+				regulator-name = "SAFEOUT1";</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;4950000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			safeout2_reg: SAFEOUT2 {</div><div class='add'>+				regulator-name = "SAFEOUT2";</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;4950000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			charger_reg: CHARGER {</div><div class='add'>+				regulator-name = "CHARGER";</div><div class='add'>+				regulator-min-microamp = &lt;100000&gt;;</div><div class='add'>+				regulator-max-microamp = &lt;3150000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		haptic: max77843-haptic {</div><div class='add'>+			compatible = "maxim,max77843-haptic";</div><div class='add'>+			haptic-supply = &lt;&amp;ldo38_reg&gt;;</div><div class='add'>+			pwms = &lt;&amp;pwm 0 33670 0&gt;;</div><div class='add'>+			pwm-names = "haptic";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hsi2c_11 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2s0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mshc_0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	num-slots = &lt;1&gt;;</div><div class='add'>+	mmc-hs200-1_8v;</div><div class='add'>+	mmc-hs400-1_8v;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	non-removable;</div><div class='add'>+	card-detect-delay = &lt;200&gt;;</div><div class='add'>+	samsung,dw-mshc-ciu-div = &lt;3&gt;;</div><div class='add'>+	samsung,dw-mshc-sdr-timing = &lt;0 4&gt;;</div><div class='add'>+	samsung,dw-mshc-ddr-timing = &lt;0 2&gt;;</div><div class='add'>+	samsung,dw-mshc-hs400-timing = &lt;0 3&gt;;</div><div class='add'>+	samsung,read-strobe-delay = &lt;90&gt;;</div><div class='add'>+	fifo-depth = &lt;0x80&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sd0_clk &amp;sd0_cmd &amp;sd0_qrdy &amp;sd0_bus1 &amp;sd0_bus4</div><div class='add'>+			&amp;sd0_bus8 &amp;sd0_rdqs&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	assigned-clocks = &lt;&amp;cmu_top CLK_SCLK_MMC0_FSYS&gt;;</div><div class='add'>+	assigned-clock-rates = &lt;800000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mshc_2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	num-slots = &lt;1&gt;;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	disable-wp;</div><div class='add'>+	cd-gpios = &lt;&amp;gpa2 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	cd-inverted;</div><div class='add'>+	card-detect-delay = &lt;200&gt;;</div><div class='add'>+	samsung,dw-mshc-ciu-div = &lt;3&gt;;</div><div class='add'>+	samsung,dw-mshc-sdr-timing = &lt;0 4&gt;;</div><div class='add'>+	samsung,dw-mshc-ddr-timing = &lt;0 2&gt;;</div><div class='add'>+	fifo-depth = &lt;0x80&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sd2_clk &amp;sd2_cmd &amp;sd2_bus1 &amp;sd2_bus4&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ppmu_d0_general {</div><div class='add'>+	status = "okay";</div><div class='add'>+	events {</div><div class='add'>+		ppmu_event0_d0_general: ppmu-event0-d0-general {</div><div class='add'>+			event-name = "ppmu-event0-d0-general";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ppmu_d1_general {</div><div class='add'>+	status = "okay";</div><div class='add'>+	events {</div><div class='add'>+		ppmu_event0_d1_general: ppmu-event0-d1-general {</div><div class='add'>+		       event-name = "ppmu-event0-d1-general";</div><div class='add'>+	       };</div><div class='add'>+       };</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_alive {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;initial_alive&gt;;</div><div class='add'>+</div><div class='add'>+	initial_alive: initial-state {</div><div class='add'>+		PIN(INPUT, gpa0-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa0-1, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa0-2, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa0-3, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa0-4, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa0-5, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa0-6, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa0-7, NONE, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpa1-0, UP, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa1-1, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa1-2, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa1-3, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa1-4, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa1-5, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa1-6, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa1-7, NONE, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpa2-0, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa2-1, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa2-2, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa2-3, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa2-4, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa2-5, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa2-6, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa2-7, NONE, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpa3-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa3-1, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa3-2, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa3-3, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa3-4, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa3-5, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa3-6, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpa3-7, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpf1-0, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf1-1, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf1-2, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf1-4, UP, FAST_SR1);</div><div class='add'>+		PIN(OUTPUT, gpf1-5, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf1-6, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf1-7, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpf2-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf2-1, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf2-2, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf2-3, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpf3-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf3-1, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf3-2, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf3-3, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpf4-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf4-1, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf4-2, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf4-3, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf4-4, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf4-5, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf4-6, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf4-7, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpf5-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf5-1, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf5-2, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf5-3, DOWN, FAST_SR1);</div><div class='add'>+		PIN(OUTPUT, gpf5-4, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf5-5, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf5-6, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf5-7, DOWN, FAST_SR1);</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	te_irq: te_irq {</div><div class='add'>+		samsung,pins = "gpf1-3";</div><div class='add'>+		samsung,pin-function = &lt;0xf&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_cpif {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;initial_cpif&gt;;</div><div class='add'>+</div><div class='add'>+	initial_cpif: initial-state {</div><div class='add'>+		PIN(INPUT, gpv6-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpv6-1, DOWN, FAST_SR1);</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_ese {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;initial_ese&gt;;</div><div class='add'>+</div><div class='add'>+	initial_ese: initial-state {</div><div class='add'>+		PIN(INPUT, gpj2-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpj2-1, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpj2-2, DOWN, FAST_SR1);</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_fsys {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;initial_fsys&gt;;</div><div class='add'>+</div><div class='add'>+	initial_fsys: initial-state {</div><div class='add'>+		PIN(INPUT, gpr3-0, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpr3-1, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpr3-2, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpr3-3, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpr3-7, NONE, FAST_SR1);</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_imem {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;initial_imem&gt;;</div><div class='add'>+</div><div class='add'>+	initial_imem: initial-state {</div><div class='add'>+		PIN(INPUT, gpf0-0, UP, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf0-1, UP, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf0-2, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf0-3, UP, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf0-4, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf0-5, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf0-6, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpf0-7, UP, FAST_SR1);</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_nfc {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;initial_nfc&gt;;</div><div class='add'>+</div><div class='add'>+	initial_nfc: initial-state {</div><div class='add'>+		PIN(INPUT, gpj0-2, DOWN, FAST_SR1);</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_peric {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;initial_peric&gt;;</div><div class='add'>+</div><div class='add'>+	initial_peric: initial-state {</div><div class='add'>+		PIN(INPUT, gpv7-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpv7-1, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpv7-2, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpv7-3, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpv7-4, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpv7-5, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpb0-4, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpc0-2, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpc0-5, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpc0-7, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpc1-1, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpc3-4, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpc3-5, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpc3-6, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpc3-7, NONE, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(OUTPUT, gpg0-0, NONE, FAST_SR1);</div><div class='add'>+		PIN(2, gpg0-1, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpd2-5, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpd4-0, NONE, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpd4-1, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpd4-2, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpd4-3, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpd4-4, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpd6-3, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpd8-1, UP, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpg1-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpg1-1, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpg1-2, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpg1-3, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpg1-4, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpg2-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpg2-1, DOWN, FAST_SR1);</div><div class='add'>+</div><div class='add'>+		PIN(INPUT, gpg3-0, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpg3-1, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpg3-5, DOWN, FAST_SR1);</div><div class='add'>+		PIN(INPUT, gpg3-7, DOWN, FAST_SR1);</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_touch {</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;initial_touch&gt;;</div><div class='add'>+</div><div class='add'>+	initial_touch: initial-state {</div><div class='add'>+		PIN(INPUT, gpj1-2, DOWN, FAST_SR1);</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm {</div><div class='add'>+	pinctrl-0 = &lt;&amp;pwm0_out&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mic {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	i80-if-timings {</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pmu_system_controller {</div><div class='add'>+	assigned-clocks = &lt;&amp;pmu_system_controller 0&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;&amp;xxti&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;serial_1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spi_1 {</div><div class='add'>+	cs-gpios = &lt;&amp;gpd6 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	wm5110: wm5110-codec@0 {</div><div class='add'>+		compatible = "wlf,wm5110";</div><div class='add'>+		reg = &lt;0x0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;20000000&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpa0&gt;;</div><div class='add'>+		interrupts = &lt;4 IRQ_TYPE_NONE&gt;;</div><div class='add'>+		clocks = &lt;&amp;pmu_system_controller 0&gt;,</div><div class='add'>+			&lt;&amp;s2mps13_osc S2MPS11_CLK_BT&gt;;</div><div class='add'>+		clock-names = "mclk1", "mclk2";</div><div class='add'>+</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		wlf,micd-detect-debounce = &lt;300&gt;;</div><div class='add'>+		wlf,micd-bias-start-time = &lt;0x1&gt;;</div><div class='add'>+		wlf,micd-rate = &lt;0x7&gt;;</div><div class='add'>+		wlf,micd-dbtime = &lt;0x1&gt;;</div><div class='add'>+		wlf,micd-force-micbias;</div><div class='add'>+		wlf,micd-configs = &lt;0x0 1 0&gt;;</div><div class='add'>+		wlf,hpdet-channel = &lt;1&gt;;</div><div class='add'>+		wlf,gpsw = &lt;0x1&gt;;</div><div class='add'>+		wlf,inmode = &lt;2 0 2 0&gt;;</div><div class='add'>+</div><div class='add'>+		wlf,reset = &lt;&amp;gpc0 7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		wlf,ldoena = &lt;&amp;gpf0 0 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		/* core supplies */</div><div class='add'>+		AVDD-supply = &lt;&amp;ldo18_reg&gt;;</div><div class='add'>+		DBVDD1-supply = &lt;&amp;ldo18_reg&gt;;</div><div class='add'>+		CPVDD-supply = &lt;&amp;ldo18_reg&gt;;</div><div class='add'>+		DBVDD2-supply = &lt;&amp;ldo18_reg&gt;;</div><div class='add'>+		DBVDD3-supply = &lt;&amp;ldo18_reg&gt;;</div><div class='add'>+</div><div class='add'>+		controller-data {</div><div class='add'>+			samsung,spi-feedback-delay = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;timer {</div><div class='add'>+	clock-frequency = &lt;24000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tmu_atlas0 {</div><div class='add'>+	vtmu-supply = &lt;&amp;ldo3_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tmu_apollo {</div><div class='add'>+	vtmu-supply = &lt;&amp;ldo3_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tmu_g3d {</div><div class='add'>+	vtmu-supply = &lt;&amp;ldo3_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbdrd30 {</div><div class='add'>+	vdd33-supply = &lt;&amp;ldo10_reg&gt;;</div><div class='add'>+	vdd10-supply = &lt;&amp;ldo6_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbdrd_dwc3_0 {</div><div class='add'>+	dr_mode = "otg";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbdrd30_phy {</div><div class='add'>+	vbus-supply = &lt;&amp;safeout1_reg&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;xxti {</div><div class='add'>+	clock-frequency = &lt;24000000&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts<br/>new file mode 100644<br/>index 000000000000..dea0a6f5bc18<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tm2.dts</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+/*</div><div class='add'>+ * SAMSUNG Exynos5433 TM2 board device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Device tree source file for Samsung's TM2 board which is based on</div><div class='add'>+ * Samsung Exynos5433 SoC.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "exynos5433-tm2-common.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Samsung TM2 board";</div><div class='add'>+	compatible = "samsung,tm2", "samsung,exynos5433";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cmu_disp {</div><div class='add'>+	/*</div><div class='add'>+	 * TM2 and TM2e differ only by DISP_PLL rate, but define all assigned</div><div class='add'>+	 * clocks properties for DISP CMU for each board to keep them together</div><div class='add'>+	 * for easier review and maintenance.</div><div class='add'>+	 */</div><div class='add'>+	assigned-clocks = &lt;&amp;cmu_disp CLK_FOUT_DISP_PLL&gt;,</div><div class='add'>+			  &lt;&amp;cmu_mif CLK_DIV_SCLK_DECON_TV_ECLK&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_ACLK_DISP_333_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DSIM0_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DSIM0&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_ECLK_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_ECLK&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_PHYCLK_MIPIDPHY0_RXCLKESC0_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_PHYCLK_MIPIDPHY0_BITCLKDIV8_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_DISP_PLL&gt;,</div><div class='add'>+			  &lt;&amp;cmu_mif CLK_MOUT_SCLK_DECON_TV_ECLK_A&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;0&gt;, &lt;0&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mif CLK_ACLK_DISP_333&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mif CLK_SCLK_DSIM0_DISP&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_MOUT_SCLK_DSIM0_USER&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mif CLK_SCLK_DECON_ECLK_DISP&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_ECLK_USER&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_PHYCLK_MIPIDPHY0_RXCLKESC0_PHY&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_PHYCLK_MIPIDPHY0_BITCLKDIV8_PHY&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_FOUT_DISP_PLL&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mif CLK_MOUT_BUS_PLL_DIV2&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mif CLK_SCLK_DECON_TV_ECLK_DISP&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER&gt;;</div><div class='add'>+	assigned-clock-rates = &lt;250000000&gt;, &lt;400000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;hsi2c_9 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	touchkey@20 {</div><div class='add'>+		compatible = "cypress,tm2-touchkey";</div><div class='add'>+		reg = &lt;0x20&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpa3&gt;;</div><div class='add'>+		interrupts = &lt;2 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		vcc-supply = &lt;&amp;ldo32_reg&gt;;</div><div class='add'>+		vdd-supply = &lt;&amp;ldo33_reg&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ldo31_reg {</div><div class='add'>+	regulator-name = "TSP_VDD_1.85V_AP";</div><div class='add'>+	regulator-min-microvolt = &lt;1850000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1850000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ldo38_reg {</div><div class='add'>+	regulator-name = "VCC_3.0V_MOTOR_AP";</div><div class='add'>+	regulator-min-microvolt = &lt;3000000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3000000&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts<br/>new file mode 100644<br/>index 000000000000..7891a31adc17<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/*</div><div class='add'>+ * SAMSUNG Exynos5433 TM2E board device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Device tree source file for Samsung's TM2E(TM2 EDGE) board which is based on</div><div class='add'>+ * Samsung Exynos5433 SoC.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "exynos5433-tm2-common.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Samsung TM2E board";</div><div class='add'>+	compatible = "samsung,tm2e", "samsung,exynos5433";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cmu_disp {</div><div class='add'>+	/*</div><div class='add'>+	 * TM2 and TM2e differ only by DISP_PLL rate, but define all assigned</div><div class='add'>+	 * clocks properties for DISP CMU for each board to keep them together</div><div class='add'>+	 * for easier review and maintenance.</div><div class='add'>+	 */</div><div class='add'>+	assigned-clocks = &lt;&amp;cmu_disp CLK_FOUT_DISP_PLL&gt;,</div><div class='add'>+			  &lt;&amp;cmu_mif CLK_DIV_SCLK_DECON_TV_ECLK&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_ACLK_DISP_333_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DSIM0_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DSIM0&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_ECLK_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_ECLK&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_PHYCLK_MIPIDPHY0_RXCLKESC0_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_PHYCLK_MIPIDPHY0_BITCLKDIV8_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_DISP_PLL&gt;,</div><div class='add'>+			  &lt;&amp;cmu_mif CLK_MOUT_SCLK_DECON_TV_ECLK_A&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER&gt;,</div><div class='add'>+			  &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK&gt;;</div><div class='add'>+	assigned-clock-parents = &lt;0&gt;, &lt;0&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mif CLK_ACLK_DISP_333&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mif CLK_SCLK_DSIM0_DISP&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_MOUT_SCLK_DSIM0_USER&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mif CLK_SCLK_DECON_ECLK_DISP&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_ECLK_USER&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_PHYCLK_MIPIDPHY0_RXCLKESC0_PHY&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_PHYCLK_MIPIDPHY0_BITCLKDIV8_PHY&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_FOUT_DISP_PLL&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mif CLK_MOUT_BUS_PLL_DIV2&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mif CLK_SCLK_DECON_TV_ECLK_DISP&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER&gt;;</div><div class='add'>+	assigned-clock-rates = &lt;278000000&gt;, &lt;400000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ldo31_reg {</div><div class='add'>+	regulator-name = "TSP_VDD_1.8V_AP";</div><div class='add'>+	regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ldo38_reg {</div><div class='add'>+	regulator-name = "VCC_3.3V_MOTOR_AP";</div><div class='add'>+	regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+	regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi<br/>new file mode 100644<br/>index 000000000000..9be2978f1b9a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/*</div><div class='add'>+ * Device tree sources for Exynos5433 TMU sensor configuration</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Jonghwa Lee &lt;jonghwa3.lee@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/thermal/thermal_exynos.h&gt;</div><div class='add'>+</div><div class='add'>+#thermal-sensor-cells = &lt;0&gt;;</div><div class='add'>+samsung,tmu_gain = &lt;8&gt;;</div><div class='add'>+samsung,tmu_reference_voltage = &lt;23&gt;;</div><div class='add'>+samsung,tmu_noise_cancel_mode = &lt;4&gt;;</div><div class='add'>+samsung,tmu_efuse_value = &lt;75&gt;;</div><div class='add'>+samsung,tmu_min_efuse_value = &lt;40&gt;;</div><div class='add'>+samsung,tmu_max_efuse_value = &lt;150&gt;;</div><div class='add'>+samsung,tmu_first_point_trim = &lt;25&gt;;</div><div class='add'>+samsung,tmu_second_point_trim = &lt;85&gt;;</div><div class='add'>+samsung,tmu_default_temp_offset = &lt;50&gt;;</div><div class='add'>+samsung,tmu_mux_addr = &lt;6&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi<br/>new file mode 100644<br/>index 000000000000..125fe58d77ce<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/*</div><div class='add'>+ * Device tree sources for Exynos5433 TMU sensor configuration</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/thermal/thermal_exynos.h&gt;</div><div class='add'>+</div><div class='add'>+#thermal-sensor-cells = &lt;0&gt;;</div><div class='add'>+samsung,tmu_gain = &lt;8&gt;;</div><div class='add'>+samsung,tmu_reference_voltage = &lt;16&gt;;</div><div class='add'>+samsung,tmu_noise_cancel_mode = &lt;4&gt;;</div><div class='add'>+samsung,tmu_efuse_value = &lt;75&gt;;</div><div class='add'>+samsung,tmu_min_efuse_value = &lt;40&gt;;</div><div class='add'>+samsung,tmu_max_efuse_value = &lt;150&gt;;</div><div class='add'>+samsung,tmu_first_point_trim = &lt;25&gt;;</div><div class='add'>+samsung,tmu_second_point_trim = &lt;85&gt;;</div><div class='add'>+samsung,tmu_default_temp_offset = &lt;50&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi<br/>new file mode 100644<br/>index 000000000000..ceaa05145b8a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi</a></div><div class='hunk'>@@ -0,0 +1,296 @@</div><div class='add'>+/*</div><div class='add'>+ * Device tree sources for Exynos5433 thermal zone</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/thermal/thermal.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+thermal-zones {</div><div class='add'>+	atlas0_thermal: atlas0-thermal {</div><div class='add'>+		thermal-sensors = &lt;&amp;tmu_atlas0&gt;;</div><div class='add'>+		polling-delay-passive = &lt;0&gt;;</div><div class='add'>+		polling-delay = &lt;0&gt;;</div><div class='add'>+		trips {</div><div class='add'>+			atlas0_alert_0: atlas0-alert-0 {</div><div class='add'>+				temperature = &lt;65000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas0_alert_1: atlas0-alert-1 {</div><div class='add'>+				temperature = &lt;70000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas0_alert_2: atlas0-alert-2 {</div><div class='add'>+				temperature = &lt;75000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas0_alert_3: atlas0-alert-3 {</div><div class='add'>+				temperature = &lt;80000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas0_alert_4: atlas0-alert-4 {</div><div class='add'>+				temperature = &lt;85000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas0_alert_5: atlas0-alert-5 {</div><div class='add'>+				temperature = &lt;90000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas0_alert_6: atlas0-alert-6 {</div><div class='add'>+				temperature = &lt;95000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cooling-maps {</div><div class='add'>+			map0 {</div><div class='add'>+				/* Set maximum frequency as 1800MHz  */</div><div class='add'>+				trip = &lt;&amp;atlas0_alert_0&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu4 1 2&gt;;</div><div class='add'>+			};</div><div class='add'>+			map1 {</div><div class='add'>+				/* Set maximum frequency as 1700MHz  */</div><div class='add'>+				trip = &lt;&amp;atlas0_alert_1&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu4 2 3&gt;;</div><div class='add'>+			};</div><div class='add'>+			map2 {</div><div class='add'>+				/* Set maximum frequency as 1600MHz  */</div><div class='add'>+				trip = &lt;&amp;atlas0_alert_2&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu4 3 4&gt;;</div><div class='add'>+			};</div><div class='add'>+			map3 {</div><div class='add'>+				/* Set maximum frequency as 1500MHz  */</div><div class='add'>+				trip = &lt;&amp;atlas0_alert_3&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu4 4 5&gt;;</div><div class='add'>+			};</div><div class='add'>+			map4 {</div><div class='add'>+				/* Set maximum frequency as 1400MHz  */</div><div class='add'>+				trip = &lt;&amp;atlas0_alert_4&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu4 5 7&gt;;</div><div class='add'>+			};</div><div class='add'>+			map5 {</div><div class='add'>+				/* Set maximum frequencyas 1200MHz  */</div><div class='add'>+				trip = &lt;&amp;atlas0_alert_5&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu4 7 9&gt;;</div><div class='add'>+			};</div><div class='add'>+			map6 {</div><div class='add'>+				/* Set maximum frequency as 1000MHz  */</div><div class='add'>+				trip = &lt;&amp;atlas0_alert_6&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu4 9 14&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	atlas1_thermal: atlas1-thermal {</div><div class='add'>+		thermal-sensors = &lt;&amp;tmu_atlas1&gt;;</div><div class='add'>+		polling-delay-passive = &lt;0&gt;;</div><div class='add'>+		polling-delay = &lt;0&gt;;</div><div class='add'>+		trips {</div><div class='add'>+			atlas1_alert_0: atlas1-alert-0 {</div><div class='add'>+				temperature = &lt;65000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas1_alert_1: atlas1-alert-1 {</div><div class='add'>+				temperature = &lt;70000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas1_alert_2: atlas1-alert-2 {</div><div class='add'>+				temperature = &lt;75000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas1_alert_3: atlas1-alert-3 {</div><div class='add'>+				temperature = &lt;80000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas1_alert_4: atlas1-alert-4 {</div><div class='add'>+				temperature = &lt;85000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas1_alert_5: atlas1-alert-5 {</div><div class='add'>+				temperature = &lt;90000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			atlas1_alert_6: atlas1-alert-6 {</div><div class='add'>+				temperature = &lt;95000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	g3d_thermal: g3d-thermal {</div><div class='add'>+		thermal-sensors = &lt;&amp;tmu_g3d&gt;;</div><div class='add'>+		polling-delay-passive = &lt;0&gt;;</div><div class='add'>+		polling-delay = &lt;0&gt;;</div><div class='add'>+		trips {</div><div class='add'>+			g3d_alert_0: g3d-alert-0 {</div><div class='add'>+				temperature = &lt;70000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			g3d_alert_1: g3d-alert-1 {</div><div class='add'>+				temperature = &lt;75000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			g3d_alert_2: g3d-alert-2 {</div><div class='add'>+				temperature = &lt;80000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			g3d_alert_3: g3d-alert-3 {</div><div class='add'>+				temperature = &lt;85000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			g3d_alert_4: g3d-alert-4 {</div><div class='add'>+				temperature = &lt;90000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			g3d_alert_5: g3d-alert-5 {</div><div class='add'>+				temperature = &lt;95000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			g3d_alert_6: g3d-alert-6 {</div><div class='add'>+				temperature = &lt;100000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	apollo_thermal: apollo-thermal {</div><div class='add'>+		thermal-sensors = &lt;&amp;tmu_apollo&gt;;</div><div class='add'>+		polling-delay-passive = &lt;0&gt;;</div><div class='add'>+		polling-delay = &lt;0&gt;;</div><div class='add'>+		trips {</div><div class='add'>+			apollo_alert_0: apollo-alert-0 {</div><div class='add'>+				temperature = &lt;65000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			apollo_alert_1: apollo-alert-1 {</div><div class='add'>+				temperature = &lt;70000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			apollo_alert_2: apollo-alert-2 {</div><div class='add'>+				temperature = &lt;75000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			apollo_alert_3: apollo-alert-3 {</div><div class='add'>+				temperature = &lt;80000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			apollo_alert_4: apollo-alert-4 {</div><div class='add'>+				temperature = &lt;85000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			apollo_alert_5: apollo-alert-5 {</div><div class='add'>+				temperature = &lt;90000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			apollo_alert_6: apollo-alert-6 {</div><div class='add'>+				temperature = &lt;95000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cooling-maps {</div><div class='add'>+			map0 {</div><div class='add'>+				/* Set maximum frequency as 1200MHz  */</div><div class='add'>+				trip = &lt;&amp;apollo_alert_2&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu0 1 2&gt;;</div><div class='add'>+			};</div><div class='add'>+			map1 {</div><div class='add'>+				/* Set maximum frequency as 1100MHz  */</div><div class='add'>+				trip = &lt;&amp;apollo_alert_3&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu0 2 3&gt;;</div><div class='add'>+			};</div><div class='add'>+			map2 {</div><div class='add'>+				/* Set maximum frequency as 1000MHz  */</div><div class='add'>+				trip = &lt;&amp;apollo_alert_4&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu0 3 4&gt;;</div><div class='add'>+			};</div><div class='add'>+			map3 {</div><div class='add'>+				/* Set maximum frequency as 900MHz  */</div><div class='add'>+				trip = &lt;&amp;apollo_alert_5&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu0 4 5&gt;;</div><div class='add'>+			};</div><div class='add'>+			map4 {</div><div class='add'>+				/* Set maximum frequency as 800MHz  */</div><div class='add'>+				trip = &lt;&amp;apollo_alert_6&gt;;</div><div class='add'>+				cooling-device = &lt;&amp;cpu0 5 9&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	isp_thermal: isp-thermal {</div><div class='add'>+		thermal-sensors = &lt;&amp;tmu_isp&gt;;</div><div class='add'>+		polling-delay-passive = &lt;0&gt;;</div><div class='add'>+		polling-delay = &lt;0&gt;;</div><div class='add'>+		trips {</div><div class='add'>+			isp_alert_0: isp-alert-0 {</div><div class='add'>+				temperature = &lt;80000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			isp_alert_1: isp-alert-1 {</div><div class='add'>+				temperature = &lt;85000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			isp_alert_2: isp-alert-2 {</div><div class='add'>+				temperature = &lt;90000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			isp_alert_3: isp-alert-3 {</div><div class='add'>+				temperature = &lt;95000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			isp_alert_4: isp-alert-4 {</div><div class='add'>+				temperature = &lt;100000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			isp_alert_5: isp-alert-5 {</div><div class='add'>+				temperature = &lt;105000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+			isp_alert_6: isp-alert-6 {</div><div class='add'>+				temperature = &lt;110000&gt;;	/* millicelsius */</div><div class='add'>+				hysteresis = &lt;1000&gt;;	/* millicelsius */</div><div class='add'>+				type = "active";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi<br/>new file mode 100644<br/>index 000000000000..16072c1c3ed3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos5433.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos5433.dtsi</a></div><div class='hunk'>@@ -0,0 +1,1561 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung's Exynos5433 SoC device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Samsung's Exynos5433 SoC device nodes are listed in this file.</div><div class='add'>+ * Exynos5433 based board files can include this file and provide</div><div class='add'>+ * values for board specific bindings.</div><div class='add'>+ *</div><div class='add'>+ * Note: This file does not include device nodes for all the controllers in</div><div class='add'>+ * Exynos5433 SoC. As device tree coverage for Exynos5433 increases,</div><div class='add'>+ * additional nodes can be added to this file.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/exynos5433.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "samsung,exynos5433";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@100 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			reg = &lt;0x100&gt;;</div><div class='add'>+			clock-frequency = &lt;1300000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_apollo CLK_SCLK_APOLLO&gt;;</div><div class='add'>+			clock-names = "apolloclk";</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster_a53_opp_table&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu1: cpu@101 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			reg = &lt;0x101&gt;;</div><div class='add'>+			clock-frequency = &lt;1300000000&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster_a53_opp_table&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu2: cpu@102 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			reg = &lt;0x102&gt;;</div><div class='add'>+			clock-frequency = &lt;1300000000&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster_a53_opp_table&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu3: cpu@103 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			reg = &lt;0x103&gt;;</div><div class='add'>+			clock-frequency = &lt;1300000000&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster_a53_opp_table&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu4: cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			clock-frequency = &lt;1900000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_atlas CLK_SCLK_ATLAS&gt;;</div><div class='add'>+			clock-names = "atlasclk";</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster_a57_opp_table&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu5: cpu@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+			clock-frequency = &lt;1900000000&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster_a57_opp_table&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu6: cpu@2 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			reg = &lt;0x2&gt;;</div><div class='add'>+			clock-frequency = &lt;1900000000&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster_a57_opp_table&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu7: cpu@3 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			reg = &lt;0x3&gt;;</div><div class='add'>+			clock-frequency = &lt;1900000000&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster_a57_opp_table&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cluster_a53_opp_table: opp_table0 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@400000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;400000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;900000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@500000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;500000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;925000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@600000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;600000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;950000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@700000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;700000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;975000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@800000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;800000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@900000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;900000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1050000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1000000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1075000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1100000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1112500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1200000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1112500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1300000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1300000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1150000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cluster_a57_opp_table: opp_table1 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@500000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;500000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;900000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@600000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;600000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;900000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@700000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;700000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;912500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@800000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;800000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;912500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@900000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;900000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;937500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1000000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;975000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1100000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1012500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1200000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1200000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1037500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1300000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1300000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1062500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1400000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1400000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1087500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1500000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1500000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1125000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1600000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1600000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1137500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1700000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1700000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1175000&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1800000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1800000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1212500&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1900000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1900000000&gt;;</div><div class='add'>+			opp-microvolt = &lt;1262500&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci";</div><div class='add'>+		method = "smc";</div><div class='add'>+		cpu_off = &lt;0x84000002&gt;;</div><div class='add'>+		cpu_on = &lt;0xC4000003&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reboot: syscon-reboot {</div><div class='add'>+		compatible = "syscon-reboot";</div><div class='add'>+		regmap = &lt;&amp;pmu_system_controller&gt;;</div><div class='add'>+		offset = &lt;0x400&gt;; /* SWRESET */</div><div class='add'>+		mask = &lt;0x1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc: soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges = &lt;0x0 0x0 0x0 0x18000000&gt;;</div><div class='add'>+</div><div class='add'>+		chipid@10000000 {</div><div class='add'>+			compatible = "samsung,exynos4210-chipid";</div><div class='add'>+			reg = &lt;0x10000000 0x100&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		xxti: xxti {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-output-names = "oscclk";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_top: clock-controller@10030000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-top";</div><div class='add'>+			reg = &lt;0x10030000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk",</div><div class='add'>+				"sclk_mphy_pll",</div><div class='add'>+				"sclk_mfc_pll",</div><div class='add'>+				"sclk_bus_pll";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_cpif CLK_SCLK_MPHY_PLL&gt;,</div><div class='add'>+				&lt;&amp;cmu_mif CLK_SCLK_MFC_PLL&gt;,</div><div class='add'>+				&lt;&amp;cmu_mif CLK_SCLK_BUS_PLL&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_cpif: clock-controller@10fc0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-cpif";</div><div class='add'>+			reg = &lt;0x10fc0000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_mif: clock-controller@105b0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-mif";</div><div class='add'>+			reg = &lt;0x105b0000 0x2000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk",</div><div class='add'>+				"sclk_mphy_pll";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_cpif CLK_SCLK_MPHY_PLL&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_peric: clock-controller@14c80000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-peric";</div><div class='add'>+			reg = &lt;0x14c80000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_peris: clock-controller@10040000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-peris";</div><div class='add'>+			reg = &lt;0x10040000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_fsys: clock-controller@156e0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-fsys";</div><div class='add'>+			reg = &lt;0x156e0000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk",</div><div class='add'>+				"sclk_ufs_mphy",</div><div class='add'>+				"aclk_fsys_200",</div><div class='add'>+				"sclk_pcie_100_fsys",</div><div class='add'>+				"sclk_ufsunipro_fsys",</div><div class='add'>+				"sclk_mmc2_fsys",</div><div class='add'>+				"sclk_mmc1_fsys",</div><div class='add'>+				"sclk_mmc0_fsys",</div><div class='add'>+				"sclk_usbhost30_fsys",</div><div class='add'>+				"sclk_usbdrd30_fsys";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_cpif CLK_SCLK_UFS_MPHY&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_FSYS_200&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_SCLK_PCIE_100_FSYS&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_SCLK_UFSUNIPRO_FSYS&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_SCLK_MMC2_FSYS&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_SCLK_MMC1_FSYS&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_SCLK_MMC0_FSYS&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_SCLK_USBHOST30_FSYS&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_SCLK_USBDRD30_FSYS&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_g2d: clock-controller@12460000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-g2d";</div><div class='add'>+			reg = &lt;0x12460000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk",</div><div class='add'>+				"aclk_g2d_266",</div><div class='add'>+				"aclk_g2d_400";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_G2D_266&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_G2D_400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_disp: clock-controller@13b90000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-disp";</div><div class='add'>+			reg = &lt;0x13b90000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk",</div><div class='add'>+				"sclk_dsim1_disp",</div><div class='add'>+				"sclk_dsim0_disp",</div><div class='add'>+				"sclk_dsd_disp",</div><div class='add'>+				"sclk_decon_tv_eclk_disp",</div><div class='add'>+				"sclk_decon_vclk_disp",</div><div class='add'>+				"sclk_decon_eclk_disp",</div><div class='add'>+				"sclk_decon_tv_vclk_disp",</div><div class='add'>+				"aclk_disp_333";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_mif CLK_SCLK_DSIM1_DISP&gt;,</div><div class='add'>+				&lt;&amp;cmu_mif CLK_SCLK_DSIM0_DISP&gt;,</div><div class='add'>+				&lt;&amp;cmu_mif CLK_SCLK_DSD_DISP&gt;,</div><div class='add'>+				&lt;&amp;cmu_mif CLK_SCLK_DECON_TV_ECLK_DISP&gt;,</div><div class='add'>+				&lt;&amp;cmu_mif CLK_SCLK_DECON_VCLK_DISP&gt;,</div><div class='add'>+				&lt;&amp;cmu_mif CLK_SCLK_DECON_ECLK_DISP&gt;,</div><div class='add'>+				&lt;&amp;cmu_mif CLK_SCLK_DECON_TV_VCLK_DISP&gt;,</div><div class='add'>+				&lt;&amp;cmu_mif CLK_ACLK_DISP_333&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_aud: clock-controller@114c0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-aud";</div><div class='add'>+			reg = &lt;0x114c0000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			clock-names = "oscclk", "fout_aud_pll";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;, &lt;&amp;cmu_top CLK_FOUT_AUD_PLL&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_bus0: clock-controller@13600000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-bus0";</div><div class='add'>+			reg = &lt;0x13600000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "aclk_bus0_400";</div><div class='add'>+			clocks = &lt;&amp;cmu_top CLK_ACLK_BUS0_400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_bus1: clock-controller@14800000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-bus1";</div><div class='add'>+			reg = &lt;0x14800000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "aclk_bus1_400";</div><div class='add'>+			clocks = &lt;&amp;cmu_top CLK_ACLK_BUS1_400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_bus2: clock-controller@13400000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-bus2";</div><div class='add'>+			reg = &lt;0x13400000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk", "aclk_bus2_400";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;, &lt;&amp;cmu_mif CLK_ACLK_BUS2_400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_g3d: clock-controller@14aa0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-g3d";</div><div class='add'>+			reg = &lt;0x14aa0000 0x2000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk", "aclk_g3d_400";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;, &lt;&amp;cmu_top CLK_ACLK_G3D_400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_gscl: clock-controller@13cf0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-gscl";</div><div class='add'>+			reg = &lt;0x13cf0000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk",</div><div class='add'>+				"aclk_gscl_111",</div><div class='add'>+				"aclk_gscl_333";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_GSCL_111&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_GSCL_333&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_apollo: clock-controller@11900000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-apollo";</div><div class='add'>+			reg = &lt;0x11900000 0x2000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk", "sclk_bus_pll_apollo";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;, &lt;&amp;cmu_mif CLK_SCLK_BUS_PLL_APOLLO&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_atlas: clock-controller@11800000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-atlas";</div><div class='add'>+			reg = &lt;0x11800000 0x2000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk", "sclk_bus_pll_atlas";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;, &lt;&amp;cmu_mif CLK_SCLK_BUS_PLL_ATLAS&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_mscl: clock-controller@105d0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-mscl";</div><div class='add'>+			reg = &lt;0x150d0000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk",</div><div class='add'>+				"sclk_jpeg_mscl",</div><div class='add'>+				"aclk_mscl_400";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_SCLK_JPEG_MSCL&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_MSCL_400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_mfc: clock-controller@15280000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-mfc";</div><div class='add'>+			reg = &lt;0x15280000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk", "aclk_mfc_400";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;, &lt;&amp;cmu_top CLK_ACLK_MFC_400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_hevc: clock-controller@14f80000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-hevc";</div><div class='add'>+			reg = &lt;0x14f80000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk", "aclk_hevc_400";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;, &lt;&amp;cmu_top CLK_ACLK_HEVC_400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_isp: clock-controller@146d0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-isp";</div><div class='add'>+			reg = &lt;0x146d0000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk",</div><div class='add'>+				"aclk_isp_dis_400",</div><div class='add'>+				"aclk_isp_400";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_ISP_DIS_400&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_ISP_400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_cam0: clock-controller@120d0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-cam0";</div><div class='add'>+			reg = &lt;0x120d0000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk",</div><div class='add'>+				"aclk_cam0_333",</div><div class='add'>+				"aclk_cam0_400",</div><div class='add'>+				"aclk_cam0_552";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_CAM0_333&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_CAM0_400&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_CAM0_552&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cmu_cam1: clock-controller@145d0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-cmu-cam1";</div><div class='add'>+			reg = &lt;0x145d0000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			clock-names = "oscclk",</div><div class='add'>+				"sclk_isp_uart_cam1",</div><div class='add'>+				"sclk_isp_spi1_cam1",</div><div class='add'>+				"sclk_isp_spi0_cam1",</div><div class='add'>+				"aclk_cam1_333",</div><div class='add'>+				"aclk_cam1_400",</div><div class='add'>+				"aclk_cam1_552";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_SCLK_ISP_UART_CAM1&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_SCLK_ISP_SPI1_CAM1&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_SCLK_ISP_SPI0_CAM1&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_CAM1_333&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_CAM1_400&gt;,</div><div class='add'>+				&lt;&amp;cmu_top CLK_ACLK_CAM1_552&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tmu_atlas0: tmu@10060000 {</div><div class='add'>+			compatible = "samsung,exynos5433-tmu";</div><div class='add'>+			reg = &lt;0x10060000 0x200&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peris CLK_PCLK_TMU0_APBIF&gt;,</div><div class='add'>+				&lt;&amp;cmu_peris CLK_SCLK_TMU0&gt;;</div><div class='add'>+			clock-names = "tmu_apbif", "tmu_sclk";</div><div class='add'>+			#include "exynos5433-tmu-sensor-conf.dtsi"</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tmu_atlas1: tmu@10068000 {</div><div class='add'>+			compatible = "samsung,exynos5433-tmu";</div><div class='add'>+			reg = &lt;0x10068000 0x200&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peris CLK_PCLK_TMU0_APBIF&gt;,</div><div class='add'>+				&lt;&amp;cmu_peris CLK_SCLK_TMU0&gt;;</div><div class='add'>+			clock-names = "tmu_apbif", "tmu_sclk";</div><div class='add'>+			#include "exynos5433-tmu-sensor-conf.dtsi"</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tmu_g3d: tmu@10070000 {</div><div class='add'>+			compatible = "samsung,exynos5433-tmu";</div><div class='add'>+			reg = &lt;0x10070000 0x200&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peris CLK_PCLK_TMU1_APBIF&gt;,</div><div class='add'>+				&lt;&amp;cmu_peris CLK_SCLK_TMU1&gt;;</div><div class='add'>+			clock-names = "tmu_apbif", "tmu_sclk";</div><div class='add'>+			#include "exynos5433-tmu-g3d-sensor-conf.dtsi"</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tmu_apollo: tmu@10078000 {</div><div class='add'>+			compatible = "samsung,exynos5433-tmu";</div><div class='add'>+			reg = &lt;0x10078000 0x200&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peris CLK_PCLK_TMU1_APBIF&gt;,</div><div class='add'>+				&lt;&amp;cmu_peris CLK_SCLK_TMU1&gt;;</div><div class='add'>+			clock-names = "tmu_apbif", "tmu_sclk";</div><div class='add'>+			#include "exynos5433-tmu-sensor-conf.dtsi"</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tmu_isp: tmu@1007c000 {</div><div class='add'>+			compatible = "samsung,exynos5433-tmu";</div><div class='add'>+			reg = &lt;0x1007c000 0x200&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peris CLK_PCLK_TMU1_APBIF&gt;,</div><div class='add'>+				&lt;&amp;cmu_peris CLK_SCLK_TMU1&gt;;</div><div class='add'>+			clock-names = "tmu_apbif", "tmu_sclk";</div><div class='add'>+			#include "exynos5433-tmu-sensor-conf.dtsi"</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mct@101c0000 {</div><div class='add'>+			compatible = "samsung,exynos4210-mct";</div><div class='add'>+			reg = &lt;0x101c0000 0x800&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				&lt;GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;, &lt;&amp;cmu_peris CLK_PCLK_MCT&gt;;</div><div class='add'>+			clock-names = "fin_pll", "mct";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ppmu_d0_cpu: ppmu@10480000 {</div><div class='add'>+			compatible = "samsung,exynos-ppmu-v2";</div><div class='add'>+			reg = &lt;0x10480000 0x2000&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ppmu_d0_general: ppmu@10490000 {</div><div class='add'>+			compatible = "samsung,exynos-ppmu-v2";</div><div class='add'>+			reg = &lt;0x10490000 0x2000&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ppmu_d1_cpu: ppmu@104b0000 {</div><div class='add'>+			compatible = "samsung,exynos-ppmu-v2";</div><div class='add'>+			reg = &lt;0x104b0000 0x2000&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ppmu_d1_general: ppmu@104c0000 {</div><div class='add'>+			compatible = "samsung,exynos-ppmu-v2";</div><div class='add'>+			reg = &lt;0x104c0000 0x2000&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinctrl_alive: pinctrl@10580000 {</div><div class='add'>+			compatible = "samsung,exynos5433-pinctrl";</div><div class='add'>+			reg = &lt;0x10580000 0x1a20&gt;, &lt;0x11090000 0x100&gt;;</div><div class='add'>+</div><div class='add'>+			wakeup-interrupt-controller {</div><div class='add'>+				compatible = "samsung,exynos7-wakeup-eint";</div><div class='add'>+				interrupts = &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinctrl_aud: pinctrl@114b0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-pinctrl";</div><div class='add'>+			reg = &lt;0x114b0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinctrl_cpif: pinctrl@10fe0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-pinctrl";</div><div class='add'>+			reg = &lt;0x10fe0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 179 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinctrl_ese: pinctrl@14ca0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-pinctrl";</div><div class='add'>+			reg = &lt;0x14ca0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 413 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinctrl_finger: pinctrl@14cb0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-pinctrl";</div><div class='add'>+			reg = &lt;0x14cb0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinctrl_fsys: pinctrl@15690000 {</div><div class='add'>+			compatible = "samsung,exynos5433-pinctrl";</div><div class='add'>+			reg = &lt;0x15690000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinctrl_imem: pinctrl@11090000 {</div><div class='add'>+			compatible = "samsung,exynos5433-pinctrl";</div><div class='add'>+			reg = &lt;0x11090000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinctrl_nfc: pinctrl@14cd0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-pinctrl";</div><div class='add'>+			reg = &lt;0x14cd0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 441 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinctrl_peric: pinctrl@14cc0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-pinctrl";</div><div class='add'>+			reg = &lt;0x14cc0000 0x1100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 440 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinctrl_touch: pinctrl@14ce0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-pinctrl";</div><div class='add'>+			reg = &lt;0x14ce0000 0x1100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 442 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pmu_system_controller: system-controller@105c0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-pmu", "syscon";</div><div class='add'>+			reg = &lt;0x105c0000 0x5008&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			clock-names = "clkout16";</div><div class='add'>+			clocks = &lt;&amp;xxti&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gic: interrupt-controller@11001000 {</div><div class='add'>+			compatible = "arm,gic-400";</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			reg = &lt;0x11001000 0x1000&gt;,</div><div class='add'>+				&lt;0x11002000 0x2000&gt;,</div><div class='add'>+				&lt;0x11004000 0x2000&gt;,</div><div class='add'>+				&lt;0x11006000 0x2000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_PPI 9 0xf04&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mipi_phy: video-phy {</div><div class='add'>+			compatible = "samsung,exynos5433-mipi-video-phy";</div><div class='add'>+			#phy-cells = &lt;1&gt;;</div><div class='add'>+			samsung,pmu-syscon = &lt;&amp;pmu_system_controller&gt;;</div><div class='add'>+			samsung,cam0-sysreg = &lt;&amp;syscon_cam0&gt;;</div><div class='add'>+			samsung,cam1-sysreg = &lt;&amp;syscon_cam1&gt;;</div><div class='add'>+			samsung,disp-sysreg = &lt;&amp;syscon_disp&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		decon: decon@13800000 {</div><div class='add'>+			compatible = "samsung,exynos5433-decon";</div><div class='add'>+			reg = &lt;0x13800000 0x2104&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_disp CLK_PCLK_DECON&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_ACLK_DECON&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_ACLK_SMMU_DECON0X&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_ACLK_XIU_DECON0X&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_PCLK_SMMU_DECON0X&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_SCLK_DECON_VCLK&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_SCLK_DECON_ECLK&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk_decon", "aclk_smmu_decon0x",</div><div class='add'>+				"aclk_xiu_decon0x", "pclk_smmu_decon0x",</div><div class='add'>+				"sclk_decon_vclk", "sclk_decon_eclk";</div><div class='add'>+			interrupt-names = "fifo", "vsync", "lcd_sys";</div><div class='add'>+			interrupts = &lt;GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			samsung,disp-sysreg = &lt;&amp;syscon_disp&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			iommus = &lt;&amp;sysmmu_decon0x&gt;, &lt;&amp;sysmmu_decon1x&gt;;</div><div class='add'>+			iommu-names = "m0", "m1";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					decon_to_mic: endpoint {</div><div class='add'>+						remote-endpoint =</div><div class='add'>+							&lt;&amp;mic_to_decon&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		decon_tv: decon@13880000 {</div><div class='add'>+			compatible = "samsung,exynos5433-decon-tv";</div><div class='add'>+			reg = &lt;0x13880000 0x20b8&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_disp CLK_PCLK_DECON_TV&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_ACLK_DECON_TV&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_ACLK_SMMU_TV0X&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_ACLK_XIU_TV0X&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_PCLK_SMMU_TV0X&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_SCLK_DECON_TV_VCLK&gt;,</div><div class='add'>+				 &lt;&amp;cmu_disp CLK_SCLK_DECON_TV_ECLK&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk_decon", "aclk_smmu_decon0x",</div><div class='add'>+				      "aclk_xiu_decon0x", "pclk_smmu_decon0x",</div><div class='add'>+				      "sclk_decon_vclk", "sclk_decon_eclk";</div><div class='add'>+			samsung,disp-sysreg = &lt;&amp;syscon_disp&gt;;</div><div class='add'>+			interrupt-names = "fifo", "vsync", "lcd_sys";</div><div class='add'>+			interrupts = &lt;GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			iommus = &lt;&amp;sysmmu_tv0x&gt;, &lt;&amp;sysmmu_tv1x&gt;;</div><div class='add'>+			iommu-names = "m0", "m1";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dsi: dsi@13900000 {</div><div class='add'>+			compatible = "samsung,exynos5433-mipi-dsi";</div><div class='add'>+			reg = &lt;0x13900000 0xC0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			phys = &lt;&amp;mipi_phy 1&gt;;</div><div class='add'>+			phy-names = "dsim";</div><div class='add'>+			clocks = &lt;&amp;cmu_disp CLK_PCLK_DSIM0&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_PHYCLK_MIPIDPHY0_BITCLKDIV8&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_PHYCLK_MIPIDPHY0_RXCLKESC0&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_SCLK_RGB_VCLK_TO_DSIM0&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_SCLK_DSIM0&gt;;</div><div class='add'>+			clock-names = "bus_clk",</div><div class='add'>+					"phyclk_mipidphy0_bitclkdiv8",</div><div class='add'>+					"phyclk_mipidphy0_rxclkesc0",</div><div class='add'>+					"sclk_rgb_vclk_to_dsim0",</div><div class='add'>+					"sclk_mipi";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					dsi_to_mic: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;mic_to_dsi&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mic: mic@13930000 {</div><div class='add'>+			compatible = "samsung,exynos5433-mic";</div><div class='add'>+			reg = &lt;0x13930000 0x48&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_disp CLK_PCLK_MIC0&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_SCLK_RGB_VCLK_TO_MIC0&gt;;</div><div class='add'>+			clock-names = "pclk_mic0", "sclk_rgb_vclk_to_mic0";</div><div class='add'>+			samsung,disp-syscon = &lt;&amp;syscon_disp&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					mic_to_decon: endpoint {</div><div class='add'>+						remote-endpoint =</div><div class='add'>+							&lt;&amp;decon_to_mic&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				port@1 {</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+					mic_to_dsi: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;dsi_to_mic&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hdmi: hdmi@13970000 {</div><div class='add'>+			compatible = "samsung,exynos5433-hdmi";</div><div class='add'>+			reg = &lt;0x13970000 0x70000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_disp CLK_PCLK_HDMI&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_PCLK_HDMIPHY&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_PHYCLK_HDMIPHY_TMDS_CLKO&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_PHYCLK_HDMI_PIXEL&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_PHYCLK_HDMIPHY_TMDS_CLKO_PHY&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_MOUT_PHYCLK_HDMIPHY_TMDS_CLKO_USER&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_PHYCLK_HDMIPHY_PIXEL_CLKO_PHY&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_MOUT_PHYCLK_HDMIPHY_PIXEL_CLKO_USER&gt;,</div><div class='add'>+				&lt;&amp;xxti&gt;, &lt;&amp;cmu_disp CLK_SCLK_HDMI_SPDIF&gt;;</div><div class='add'>+			clock-names = "hdmi_pclk", "hdmi_i_pclk",</div><div class='add'>+				"i_tmds_clk", "i_pixel_clk",</div><div class='add'>+				"tmds_clko", "tmds_clko_user",</div><div class='add'>+				"pixel_clko", "pixel_clko_user",</div><div class='add'>+				"oscclk", "i_spdif_clk";</div><div class='add'>+			phy = &lt;&amp;hdmiphy&gt;;</div><div class='add'>+			ddc = &lt;&amp;hsi2c_11&gt;;</div><div class='add'>+			samsung,syscon-phandle = &lt;&amp;pmu_system_controller&gt;;</div><div class='add'>+			samsung,sysreg-phandle = &lt;&amp;syscon_disp&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hdmiphy: hdmiphy@13af0000 {</div><div class='add'>+			reg = &lt;0x13af0000 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		syscon_disp: syscon@13b80000 {</div><div class='add'>+			compatible = "syscon";</div><div class='add'>+			reg = &lt;0x13b80000 0x1010&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		syscon_cam0: syscon@120f0000 {</div><div class='add'>+			compatible = "syscon";</div><div class='add'>+			reg = &lt;0x120f0000 0x1020&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		syscon_cam1: syscon@145f0000 {</div><div class='add'>+			compatible = "syscon";</div><div class='add'>+			reg = &lt;0x145f0000 0x1038&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gsc_0: video-scaler@13C00000 {</div><div class='add'>+			compatible = "samsung,exynos5433-gsc";</div><div class='add'>+			reg = &lt;0x13c00000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk", "aclk_xiu",</div><div class='add'>+				      "aclk_gsclbend";</div><div class='add'>+			clocks = &lt;&amp;cmu_gscl CLK_PCLK_GSCL0&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_ACLK_GSCL0&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_ACLK_XIU_GSCLX&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_ACLK_GSCLBEND_333&gt;;</div><div class='add'>+			iommus = &lt;&amp;sysmmu_gscl0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gsc_1: video-scaler@13C10000 {</div><div class='add'>+			compatible = "samsung,exynos5433-gsc";</div><div class='add'>+			reg = &lt;0x13c10000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk", "aclk_xiu",</div><div class='add'>+				      "aclk_gsclbend";</div><div class='add'>+			clocks = &lt;&amp;cmu_gscl CLK_PCLK_GSCL1&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_ACLK_GSCL1&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_ACLK_XIU_GSCLX&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_ACLK_GSCLBEND_333&gt;;</div><div class='add'>+			iommus = &lt;&amp;sysmmu_gscl1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gsc_2: video-scaler@13C20000 {</div><div class='add'>+			compatible = "samsung,exynos5433-gsc";</div><div class='add'>+			reg = &lt;0x13c20000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk", "aclk_xiu",</div><div class='add'>+				      "aclk_gsclbend";</div><div class='add'>+			clocks = &lt;&amp;cmu_gscl CLK_PCLK_GSCL2&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_ACLK_GSCL2&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_ACLK_XIU_GSCLX&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_ACLK_GSCLBEND_333&gt;;</div><div class='add'>+			iommus = &lt;&amp;sysmmu_gscl2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		jpeg: codec@15020000 {</div><div class='add'>+			compatible = "samsung,exynos5433-jpeg";</div><div class='add'>+			reg = &lt;0x15020000 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 411 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk", "aclk_xiu", "sclk";</div><div class='add'>+			clocks = &lt;&amp;cmu_mscl CLK_PCLK_JPEG&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mscl CLK_ACLK_JPEG&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mscl CLK_ACLK_XIU_MSCLX&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mscl CLK_SCLK_JPEG&gt;;</div><div class='add'>+			iommus = &lt;&amp;sysmmu_jpeg&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mfc: codec@152E0000 {</div><div class='add'>+			compatible = "samsung,exynos5433-mfc";</div><div class='add'>+			reg = &lt;0x152E0000 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk", "aclk_xiu";</div><div class='add'>+			clocks = &lt;&amp;cmu_mfc CLK_PCLK_MFC&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mfc CLK_ACLK_MFC&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mfc CLK_ACLK_XIU_MFCX&gt;;</div><div class='add'>+			iommus = &lt;&amp;sysmmu_mfc_0&gt;, &lt;&amp;sysmmu_mfc_1&gt;;</div><div class='add'>+			iommu-names = "left", "right";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysmmu_decon0x: sysmmu@13a00000 {</div><div class='add'>+			compatible = "samsung,exynos-sysmmu";</div><div class='add'>+			reg = &lt;0x13a00000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk";</div><div class='add'>+			clocks = &lt;&amp;cmu_disp CLK_PCLK_SMMU_DECON0X&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_ACLK_SMMU_DECON0X&gt;;</div><div class='add'>+			#iommu-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysmmu_decon1x: sysmmu@13a10000 {</div><div class='add'>+			compatible = "samsung,exynos-sysmmu";</div><div class='add'>+			reg = &lt;0x13a10000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk";</div><div class='add'>+			clocks = &lt;&amp;cmu_disp CLK_PCLK_SMMU_DECON1X&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_ACLK_SMMU_DECON1X&gt;;</div><div class='add'>+			#iommu-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysmmu_tv0x: sysmmu@13a20000 {</div><div class='add'>+			compatible = "samsung,exynos-sysmmu";</div><div class='add'>+			reg = &lt;0x13a20000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk";</div><div class='add'>+			clocks = &lt;&amp;cmu_disp CLK_PCLK_SMMU_TV0X&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_ACLK_SMMU_TV0X&gt;;</div><div class='add'>+			#iommu-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysmmu_tv1x: sysmmu@13a30000 {</div><div class='add'>+			compatible = "samsung,exynos-sysmmu";</div><div class='add'>+			reg = &lt;0x13a30000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk";</div><div class='add'>+			clocks = &lt;&amp;cmu_disp CLK_PCLK_SMMU_TV1X&gt;,</div><div class='add'>+				&lt;&amp;cmu_disp CLK_ACLK_SMMU_TV1X&gt;;</div><div class='add'>+			#iommu-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysmmu_gscl0: sysmmu@13c80000 {</div><div class='add'>+			compatible = "samsung,exynos-sysmmu";</div><div class='add'>+			reg = &lt;0x13C80000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "aclk", "pclk";</div><div class='add'>+			clocks = &lt;&amp;cmu_gscl CLK_ACLK_SMMU_GSCL0&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_PCLK_SMMU_GSCL0&gt;;</div><div class='add'>+			#iommu-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysmmu_gscl1: sysmmu@13c90000 {</div><div class='add'>+			compatible = "samsung,exynos-sysmmu";</div><div class='add'>+			reg = &lt;0x13C90000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "aclk", "pclk";</div><div class='add'>+			clocks = &lt;&amp;cmu_gscl CLK_ACLK_SMMU_GSCL1&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_PCLK_SMMU_GSCL1&gt;;</div><div class='add'>+			#iommu-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysmmu_gscl2: sysmmu@13ca0000 {</div><div class='add'>+			compatible = "samsung,exynos-sysmmu";</div><div class='add'>+			reg = &lt;0x13CA0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 292 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "aclk", "pclk";</div><div class='add'>+			clocks = &lt;&amp;cmu_gscl CLK_ACLK_SMMU_GSCL2&gt;,</div><div class='add'>+				 &lt;&amp;cmu_gscl CLK_PCLK_SMMU_GSCL2&gt;;</div><div class='add'>+			#iommu-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysmmu_jpeg: sysmmu@15060000 {</div><div class='add'>+			compatible = "samsung,exynos-sysmmu";</div><div class='add'>+			reg = &lt;0x15060000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 408 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk";</div><div class='add'>+			clocks = &lt;&amp;cmu_mscl CLK_PCLK_SMMU_JPEG&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mscl CLK_ACLK_SMMU_JPEG&gt;;</div><div class='add'>+			#iommu-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysmmu_mfc_0: sysmmu@15200000 {</div><div class='add'>+			compatible = "samsung,exynos-sysmmu";</div><div class='add'>+			reg = &lt;0x15200000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk";</div><div class='add'>+			clocks = &lt;&amp;cmu_mfc CLK_PCLK_SMMU_MFC_0&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mfc CLK_ACLK_SMMU_MFC_0&gt;;</div><div class='add'>+			#iommu-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sysmmu_mfc_1: sysmmu@15210000 {</div><div class='add'>+			compatible = "samsung,exynos-sysmmu";</div><div class='add'>+			reg = &lt;0x15210000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "pclk", "aclk";</div><div class='add'>+			clocks = &lt;&amp;cmu_mfc CLK_PCLK_SMMU_MFC_1&gt;,</div><div class='add'>+				 &lt;&amp;cmu_mfc CLK_ACLK_SMMU_MFC_1&gt;;</div><div class='add'>+			#iommu-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		serial_0: serial@14c10000 {</div><div class='add'>+			compatible = "samsung,exynos5433-uart";</div><div class='add'>+			reg = &lt;0x14c10000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_UART0&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_UART0&gt;;</div><div class='add'>+			clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;uart0_bus&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		serial_1: serial@14c20000 {</div><div class='add'>+			compatible = "samsung,exynos5433-uart";</div><div class='add'>+			reg = &lt;0x14c20000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_UART1&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_UART1&gt;;</div><div class='add'>+			clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;uart1_bus&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		serial_2: serial@14c30000 {</div><div class='add'>+			compatible = "samsung,exynos5433-uart";</div><div class='add'>+			reg = &lt;0x14c30000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_UART2&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_UART2&gt;;</div><div class='add'>+			clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;uart2_bus&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spi_0: spi@14d20000 {</div><div class='add'>+			compatible = "samsung,exynos5433-spi";</div><div class='add'>+			reg = &lt;0x14d20000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 432 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			dmas = &lt;&amp;pdma0 9&gt;, &lt;&amp;pdma0 8&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_SPI0&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_SPI0&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_IOCLK_SPI0&gt;;</div><div class='add'>+			clock-names = "spi", "spi_busclk0", "spi_ioclk";</div><div class='add'>+			samsung,spi-src-clk = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;spi0_bus&gt;;</div><div class='add'>+			num-cs = &lt;1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spi_1: spi@14d30000 {</div><div class='add'>+			compatible = "samsung,exynos5433-spi";</div><div class='add'>+			reg = &lt;0x14d30000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 433 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			dmas = &lt;&amp;pdma0 11&gt;, &lt;&amp;pdma0 10&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_SPI1&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_SPI1&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_IOCLK_SPI1&gt;;</div><div class='add'>+			clock-names = "spi", "spi_busclk0", "spi_ioclk";</div><div class='add'>+			samsung,spi-src-clk = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;spi1_bus&gt;;</div><div class='add'>+			num-cs = &lt;1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spi_2: spi@14d40000 {</div><div class='add'>+			compatible = "samsung,exynos5433-spi";</div><div class='add'>+			reg = &lt;0x14d40000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 434 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			dmas = &lt;&amp;pdma0 13&gt;, &lt;&amp;pdma0 12&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_SPI2&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_SPI2&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_IOCLK_SPI2&gt;;</div><div class='add'>+			clock-names = "spi", "spi_busclk0", "spi_ioclk";</div><div class='add'>+			samsung,spi-src-clk = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;spi2_bus&gt;;</div><div class='add'>+			num-cs = &lt;1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spi_3: spi@14d50000 {</div><div class='add'>+			compatible = "samsung,exynos5433-spi";</div><div class='add'>+			reg = &lt;0x14d50000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 447 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			dmas = &lt;&amp;pdma0 23&gt;, &lt;&amp;pdma0 22&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_SPI3&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_SPI3&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_IOCLK_SPI3&gt;;</div><div class='add'>+			clock-names = "spi", "spi_busclk0", "spi_ioclk";</div><div class='add'>+			samsung,spi-src-clk = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;spi3_bus&gt;;</div><div class='add'>+			num-cs = &lt;1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spi_4: spi@14d00000 {</div><div class='add'>+			compatible = "samsung,exynos5433-spi";</div><div class='add'>+			reg = &lt;0x14d00000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			dmas = &lt;&amp;pdma0 25&gt;, &lt;&amp;pdma0 24&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_SPI4&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_SPI4&gt;,</div><div class='add'>+				&lt;&amp;cmu_peric CLK_SCLK_IOCLK_SPI4&gt;;</div><div class='add'>+			clock-names = "spi", "spi_busclk0", "spi_ioclk";</div><div class='add'>+			samsung,spi-src-clk = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;spi4_bus&gt;;</div><div class='add'>+			num-cs = &lt;1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		adc: adc@14d10000 {</div><div class='add'>+			compatible = "samsung,exynos7-adc";</div><div class='add'>+			reg = &lt;0x14d10000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 438 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "adc";</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_ADCIF&gt;;</div><div class='add'>+			#io-channel-cells = &lt;1&gt;;</div><div class='add'>+			io-channel-ranges;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm: pwm@14dd0000 {</div><div class='add'>+			compatible = "samsung,exynos4210-pwm";</div><div class='add'>+			reg = &lt;0x14dd0000 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			samsung,pwm-outputs = &lt;0&gt;, &lt;1&gt;, &lt;2&gt;, &lt;3&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_PWM&gt;;</div><div class='add'>+			clock-names = "timers";</div><div class='add'>+			#pwm-cells = &lt;3&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_0: hsi2c@14e40000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14e40000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c0_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C0&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_1: hsi2c@14e50000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14e50000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c1_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C1&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_2: hsi2c@14e60000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14e60000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c2_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C2&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_3: hsi2c@14e70000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14e70000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c3_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C3&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_4: hsi2c@14ec0000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14ec0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c4_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C4&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_5: hsi2c@14ed0000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14ed0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c5_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C5&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_6: hsi2c@14ee0000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14ee0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c6_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C6&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_7: hsi2c@14ef0000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14ef0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c7_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C7&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_8: hsi2c@14d90000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14d90000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 443 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c8_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C8&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_9: hsi2c@14da0000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14da0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 444 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c9_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C9&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_10: hsi2c@14de0000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14de0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 445 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c10_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C10&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hsi2c_11: hsi2c@14df0000 {</div><div class='add'>+			compatible = "samsung,exynos7-hsi2c";</div><div class='add'>+			reg = &lt;0x14df0000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;hs_i2c11_bus&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_peric CLK_PCLK_HSI2C11&gt;;</div><div class='add'>+			clock-names = "hsi2c";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usbdrd30: usbdrd {</div><div class='add'>+			compatible = "samsung,exynos5250-dwusb3";</div><div class='add'>+			clocks = &lt;&amp;cmu_fsys CLK_ACLK_USBDRD30&gt;,</div><div class='add'>+				&lt;&amp;cmu_fsys CLK_SCLK_USBDRD30&gt;;</div><div class='add'>+			clock-names = "usbdrd30", "usbdrd30_susp_clk";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			dwc3@15400000 {</div><div class='add'>+				compatible = "snps,dwc3";</div><div class='add'>+				reg = &lt;0x15400000 0x10000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				phys = &lt;&amp;usbdrd30_phy 0&gt;, &lt;&amp;usbdrd30_phy 1&gt;;</div><div class='add'>+				phy-names = "usb2-phy", "usb3-phy";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usbdrd30_phy: phy@15500000 {</div><div class='add'>+			compatible = "samsung,exynos5433-usbdrd-phy";</div><div class='add'>+			reg = &lt;0x15500000 0x100&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_fsys CLK_ACLK_USBDRD30&gt;, &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_fsys CLK_PHYCLK_USBDRD30_UDRD30_PHYCLOCK&gt;,</div><div class='add'>+				&lt;&amp;cmu_fsys CLK_PHYCLK_USBDRD30_UDRD30_PIPE_PCLK&gt;,</div><div class='add'>+				&lt;&amp;cmu_fsys CLK_SCLK_USBDRD30&gt;;</div><div class='add'>+			clock-names = "phy", "ref", "phy_utmi", "phy_pipe",</div><div class='add'>+					"itp";</div><div class='add'>+			#phy-cells = &lt;1&gt;;</div><div class='add'>+			samsung,pmu-syscon = &lt;&amp;pmu_system_controller&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usbhost30_phy: phy@15580000 {</div><div class='add'>+			compatible = "samsung,exynos5433-usbdrd-phy";</div><div class='add'>+			reg = &lt;0x15580000 0x100&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_fsys CLK_ACLK_USBHOST30&gt;, &lt;&amp;xxti&gt;,</div><div class='add'>+				&lt;&amp;cmu_fsys CLK_PHYCLK_USBHOST30_UHOST30_PHYCLOCK&gt;,</div><div class='add'>+				&lt;&amp;cmu_fsys CLK_PHYCLK_USBHOST30_UHOST30_PIPE_PCLK&gt;,</div><div class='add'>+				&lt;&amp;cmu_fsys CLK_SCLK_USBHOST30&gt;;</div><div class='add'>+			clock-names = "phy", "ref", "phy_utmi", "phy_pipe",</div><div class='add'>+					"itp";</div><div class='add'>+			#phy-cells = &lt;1&gt;;</div><div class='add'>+			samsung,pmu-syscon = &lt;&amp;pmu_system_controller&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usbhost30: usbhost {</div><div class='add'>+			compatible = "samsung,exynos5250-dwusb3";</div><div class='add'>+			clocks = &lt;&amp;cmu_fsys CLK_ACLK_USBHOST30&gt;,</div><div class='add'>+				&lt;&amp;cmu_fsys CLK_SCLK_USBHOST30&gt;;</div><div class='add'>+			clock-names = "usbdrd30", "usbdrd30_susp_clk";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			usbdrd_dwc3_0: dwc3@15a00000 {</div><div class='add'>+				compatible = "snps,dwc3";</div><div class='add'>+				reg = &lt;0x15a00000 0x10000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				phys = &lt;&amp;usbhost30_phy 0&gt;, &lt;&amp;usbhost30_phy 1&gt;;</div><div class='add'>+				phy-names = "usb2-phy", "usb3-phy";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mshc_0: mshc@15540000 {</div><div class='add'>+			compatible = "samsung,exynos7-dw-mshc-smu";</div><div class='add'>+			interrupts = &lt;GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x15540000 0x2000&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_fsys CLK_ACLK_MMC0&gt;,</div><div class='add'>+				&lt;&amp;cmu_fsys CLK_SCLK_MMC0&gt;;</div><div class='add'>+			clock-names = "biu", "ciu";</div><div class='add'>+			fifo-depth = &lt;0x40&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mshc_1: mshc@15550000 {</div><div class='add'>+			compatible = "samsung,exynos7-dw-mshc-smu";</div><div class='add'>+			interrupts = &lt;GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x15550000 0x2000&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_fsys CLK_ACLK_MMC1&gt;,</div><div class='add'>+				&lt;&amp;cmu_fsys CLK_SCLK_MMC1&gt;;</div><div class='add'>+			clock-names = "biu", "ciu";</div><div class='add'>+			fifo-depth = &lt;0x40&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mshc_2: mshc@15560000 {</div><div class='add'>+			compatible = "samsung,exynos7-dw-mshc-smu";</div><div class='add'>+			interrupts = &lt;GIC_SPI 227 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x15560000 0x2000&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_fsys CLK_ACLK_MMC2&gt;,</div><div class='add'>+				&lt;&amp;cmu_fsys CLK_SCLK_MMC2&gt;;</div><div class='add'>+			clock-names = "biu", "ciu";</div><div class='add'>+			fifo-depth = &lt;0x40&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		amba {</div><div class='add'>+			compatible = "simple-bus";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			pdma0: pdma@15610000 {</div><div class='add'>+				compatible = "arm,pl330", "arm,primecell";</div><div class='add'>+				reg = &lt;0x15610000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 228 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;cmu_fsys CLK_PDMA0&gt;;</div><div class='add'>+				clock-names = "apb_pclk";</div><div class='add'>+				#dma-cells = &lt;1&gt;;</div><div class='add'>+				#dma-channels = &lt;8&gt;;</div><div class='add'>+				#dma-requests = &lt;32&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			pdma1: pdma@15600000 {</div><div class='add'>+				compatible = "arm,pl330", "arm,primecell";</div><div class='add'>+				reg = &lt;0x15600000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;cmu_fsys CLK_PDMA1&gt;;</div><div class='add'>+				clock-names = "apb_pclk";</div><div class='add'>+				#dma-cells = &lt;1&gt;;</div><div class='add'>+				#dma-channels = &lt;8&gt;;</div><div class='add'>+				#dma-requests = &lt;32&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		audio-subsystem@11400000 {</div><div class='add'>+			compatible = "samsung,exynos5433-lpass";</div><div class='add'>+			reg = &lt;0x11400000 0x100&gt;, &lt;0x11500000 0x08&gt;;</div><div class='add'>+			clocks = &lt;&amp;cmu_aud CLK_PCLK_SFR0_CTRL&gt;;</div><div class='add'>+			clock-names = "sfr0_ctrl";</div><div class='add'>+			samsung,pmu-syscon = &lt;&amp;pmu_system_controller&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			adma: adma@11420000 {</div><div class='add'>+				compatible = "arm,pl330", "arm,primecell";</div><div class='add'>+				reg = &lt;0x11420000 0x1000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;cmu_aud CLK_ACLK_DMAC&gt;;</div><div class='add'>+				clock-names = "apb_pclk";</div><div class='add'>+				#dma-cells = &lt;1&gt;;</div><div class='add'>+				#dma-channels = &lt;8&gt;;</div><div class='add'>+				#dma-requests = &lt;32&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2s0: i2s0@11440000 {</div><div class='add'>+				compatible = "samsung,exynos7-i2s";</div><div class='add'>+				reg = &lt;0x11440000 0x100&gt;;</div><div class='add'>+				dmas = &lt;&amp;adma 0 &amp;adma 2&gt;;</div><div class='add'>+				dma-names = "tx", "rx";</div><div class='add'>+				interrupts = &lt;GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				clocks = &lt;&amp;cmu_aud CLK_PCLK_AUD_I2S&gt;,</div><div class='add'>+					&lt;&amp;cmu_aud CLK_SCLK_AUD_I2S&gt;,</div><div class='add'>+					&lt;&amp;cmu_aud CLK_SCLK_I2S_BCLK&gt;;</div><div class='add'>+				clock-names = "iis", "i2s_opclk0", "i2s_opclk1";</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+				pinctrl-0 = &lt;&amp;i2s0_bus&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			serial_3: serial@11460000 {</div><div class='add'>+				compatible = "samsung,exynos5433-uart";</div><div class='add'>+				reg = &lt;0x11460000 0x100&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;cmu_aud CLK_PCLK_AUD_UART&gt;,</div><div class='add'>+					&lt;&amp;cmu_aud CLK_SCLK_AUD_UART&gt;;</div><div class='add'>+				clock-names = "uart", "clk_uart_baud0";</div><div class='add'>+				pinctrl-names = "default";</div><div class='add'>+				pinctrl-0 = &lt;&amp;uart_aud_bus&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer: timer {</div><div class='add'>+		compatible = "arm,armv8-timer";</div><div class='add'>+		interrupts = &lt;GIC_PPI 13</div><div class='add'>+				(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)&gt;,</div><div class='add'>+			&lt;GIC_PPI 14</div><div class='add'>+				(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)&gt;,</div><div class='add'>+			&lt;GIC_PPI 11</div><div class='add'>+				(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)&gt;,</div><div class='add'>+			&lt;GIC_PPI 10</div><div class='add'>+				(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#include "exynos5433-bus.dtsi"</div><div class='add'>+#include "exynos5433-pinctrl.dtsi"</div><div class='add'>+#include "exynos5433-tmu.dtsi"</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts<br/>index c528dd52ba2d..e5892bb0ae6e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos7-espresso.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/exynos/exynos7-espresso.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos7-espresso.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos7-espresso.dts</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include "exynos7.dtsi"</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/clock/samsung,s2mps11.h&gt;</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Samsung Exynos7 Espresso board based on EXYNOS7";</div><div class='hunk'>@@ -32,6 +33,29 @@</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x0 0x40000000 0x0 0xC0000000&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	usb30_vbus_reg: regulator-usb30 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VBUS_5V";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gph1 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;usb30_vbus_en&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb3drd_boost_5v: regulator-usb3drd-boost {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "VUSB_VBUS_5V";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpf4 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;usb3drd_boost_en&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;fin_pll {</div><div class='hunk'>@@ -328,8 +352,8 @@</div><div class='ctx'> &amp;pinctrl_alive {</div><div class='ctx'> 	pmic_irq: pmic-irq {</div><div class='ctx'> 		samsung,pins = "gpa0-2";</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -365,3 +389,24 @@</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;ldo2_reg&gt;;</div><div class='ctx'> 	disable-wp;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;pinctrl_bus1 {</div><div class='add'>+	usb30_vbus_en: usb30-vbus-en {</div><div class='add'>+		samsung,pins = "gph1-1";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_OUTPUT&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb3drd_boost_en: usb3drd-boost-en {</div><div class='add'>+		samsung,pins = "gpf4-1";</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_OUTPUT&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usbdrd_phy {</div><div class='add'>+	vbus-supply = &lt;&amp;usb30_vbus_reg&gt;;</div><div class='add'>+	vbus-boost-supply = &lt;&amp;usb3drd_boost_5v&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi<br/>index f77ddaf21d04..8f58850cd28c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+#include &lt;dt-bindings/pinctrl/samsung.h&gt;</div><div class='add'>+</div><div class='ctx'> &amp;pinctrl_alive {</div><div class='ctx'> 	gpa0: gpa0 {</div><div class='ctx'> 		gpio-controller;</div><div class='hunk'>@@ -20,8 +22,14 @@</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		interrupts = &lt;0 0 0&gt;, &lt;0 1 0&gt;, &lt;0 2 0&gt;, &lt;0 3 0&gt;,</div><div class='del'>-			     &lt;0 4 0&gt;, &lt;0 5 0&gt;, &lt;0 6 0&gt;, &lt;0 7 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gpa1: gpa1 {</div><div class='hunk'>@@ -31,8 +39,14 @@</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 		#interrupt-cells = &lt;2&gt;;</div><div class='del'>-		interrupts = &lt;0 8 0&gt;, &lt;0 9 0&gt;, &lt;0 10 0&gt;, &lt;0 11 0&gt;,</div><div class='del'>-			     &lt;0 12 0&gt;, &lt;0 13 0&gt;, &lt;0 14 0&gt;, &lt;0 15 0&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	gpa2: gpa2 {</div><div class='hunk'>@@ -175,163 +189,163 @@</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c10_bus: hs-i2c10-bus {</div><div class='ctx'> 		samsung,pins = "gpb0-1", "gpb0-0";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c11_bus: hs-i2c11-bus {</div><div class='ctx'> 		samsung,pins = "gpb0-3", "gpb0-2";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c2_bus: hs-i2c2-bus {</div><div class='ctx'> 		samsung,pins = "gpd0-3", "gpd0-2";</div><div class='del'>-		samsung,pin-function = &lt;3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	uart0_data: uart0-data {</div><div class='ctx'> 		samsung,pins = "gpd0-0", "gpd0-1";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	uart0_fctl: uart0-fctl {</div><div class='ctx'> 		samsung,pins = "gpd0-2", "gpd0-3";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	uart2_data: uart2-data {</div><div class='ctx'> 		samsung,pins = "gpd1-4", "gpd1-5";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c3_bus: hs-i2c3-bus {</div><div class='ctx'> 		samsung,pins = "gpd1-3", "gpd1-2";</div><div class='del'>-		samsung,pin-function = &lt;3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	uart1_data: uart1-data {</div><div class='ctx'> 		samsung,pins = "gpd1-0", "gpd1-1";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	uart1_fctl: uart1-fctl {</div><div class='ctx'> 		samsung,pins = "gpd1-2", "gpd1-3";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c0_bus: hs-i2c0-bus {</div><div class='ctx'> 		samsung,pins = "gpd2-1", "gpd2-0";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c1_bus: hs-i2c1-bus {</div><div class='ctx'> 		samsung,pins = "gpd2-3", "gpd2-2";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c9_bus: hs-i2c9-bus {</div><div class='ctx'> 		samsung,pins = "gpd2-7", "gpd2-6";</div><div class='del'>-		samsung,pin-function = &lt;3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pwm0_out: pwm0-out {</div><div class='ctx'> 		samsung,pins = "gpd2-4";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pwm1_out: pwm1-out {</div><div class='ctx'> 		samsung,pins = "gpd2-5";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pwm2_out: pwm2-out {</div><div class='ctx'> 		samsung,pins = "gpd2-6";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pwm3_out: pwm3-out {</div><div class='ctx'> 		samsung,pins = "gpd2-7";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c8_bus: hs-i2c8-bus {</div><div class='ctx'> 		samsung,pins = "gpd5-3", "gpd5-2";</div><div class='del'>-		samsung,pin-function = &lt;3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	uart3_data: uart3-data {</div><div class='ctx'> 		samsung,pins = "gpd5-0", "gpd5-1";</div><div class='del'>-		samsung,pin-function = &lt;3&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_3&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	spi2_bus: spi2-bus {</div><div class='ctx'> 		samsung,pins = "gpd5-0", "gpd5-1", "gpd5-2", "gpd5-3";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	spi1_bus: spi1-bus {</div><div class='ctx'> 		samsung,pins = "gpd6-2", "gpd6-3", "gpd6-4", "gpd6-5";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	spi0_bus: spi0-bus {</div><div class='ctx'> 		samsung,pins = "gpd8-0", "gpd8-1", "gpd6-0", "gpd6-1";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c4_bus: hs-i2c4-bus {</div><div class='ctx'> 		samsung,pins = "gpg3-1", "gpg3-0";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c5_bus: hs-i2c5-bus {</div><div class='ctx'> 		samsung,pins = "gpg3-3", "gpg3-2";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -346,9 +360,9 @@</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c6_bus: hs-i2c6-bus {</div><div class='ctx'> 		samsung,pins = "gpj0-1", "gpj0-0";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -363,9 +377,9 @@</div><div class='ctx'> </div><div class='ctx'> 	hs_i2c7_bus: hs-i2c7-bus {</div><div class='ctx'> 		samsung,pins = "gpj1-1", "gpj1-0";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -380,9 +394,9 @@</div><div class='ctx'> </div><div class='ctx'> 	spi3_bus: spi3-bus {</div><div class='ctx'> 		samsung,pins = "gpg4-0", "gpg4-1", "gpg4-2", "gpg4-3";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -397,9 +411,9 @@</div><div class='ctx'> </div><div class='ctx'> 	spi4_bus: spi4-bus {</div><div class='ctx'> 		samsung,pins = "gpv7-0", "gpv7-1", "gpv7-2", "gpv7-3";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -414,37 +428,37 @@</div><div class='ctx'> </div><div class='ctx'> 	sd2_clk: sd2-clk {</div><div class='ctx'> 		samsung,pins = "gpr4-0";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd2_cmd: sd2-cmd {</div><div class='ctx'> 		samsung,pins = "gpr4-1";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd2_cd: sd2-cd {</div><div class='ctx'> 		samsung,pins = "gpr4-2";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd2_bus1: sd2-bus-width1 {</div><div class='ctx'> 		samsung,pins = "gpr4-3";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd2_bus4: sd2-bus-width4 {</div><div class='ctx'> 		samsung,pins = "gpr4-4", "gpr4-5", "gpr4-6";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -483,107 +497,107 @@</div><div class='ctx'> </div><div class='ctx'> 	sd0_clk: sd0-clk {</div><div class='ctx'> 		samsung,pins = "gpr0-0";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd0_cmd: sd0-cmd {</div><div class='ctx'> 		samsung,pins = "gpr0-1";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd0_ds: sd0-ds {</div><div class='ctx'> 		samsung,pins = "gpr0-2";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;1&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_DOWN&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd0_qrdy: sd0-qrdy {</div><div class='ctx'> 		samsung,pins = "gpr0-3";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;1&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_DOWN&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd0_bus1: sd0-bus-width1 {</div><div class='ctx'> 		samsung,pins = "gpr1-0";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd0_bus4: sd0-bus-width4 {</div><div class='ctx'> 		samsung,pins = "gpr1-1", "gpr1-2", "gpr1-3";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd0_bus8: sd0-bus-width8 {</div><div class='ctx'> 		samsung,pins = "gpr1-4", "gpr1-5", "gpr1-6", "gpr1-7";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;3&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd1_clk: sd1-clk {</div><div class='ctx'> 		samsung,pins = "gpr2-0";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;2&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV3&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd1_cmd: sd1-cmd {</div><div class='ctx'> 		samsung,pins = "gpr2-1";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;2&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV3&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd1_ds: sd1-ds {</div><div class='ctx'> 		samsung,pins = "gpr2-2";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;1&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;6&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_DOWN&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd1_qrdy: sd1-qrdy {</div><div class='ctx'> 		samsung,pins = "gpr2-3";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;1&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;6&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_DOWN&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd1_int: sd1-int {</div><div class='ctx'> 		samsung,pins = "gpr2-4";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;1&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;6&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_DOWN&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV4&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd1_bus1: sd1-bus-width1 {</div><div class='ctx'> 		samsung,pins = "gpr3-0";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;2&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV3&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd1_bus4: sd1-bus-width4 {</div><div class='ctx'> 		samsung,pins = "gpr3-1", "gpr3-2", "gpr3-3";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;2&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV3&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sd1_bus8: sd1-bus-width8 {</div><div class='ctx'> 		samsung,pins = "gpr3-4", "gpr3-5", "gpr3-6", "gpr3-7";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;2&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS7_FSYS1_PIN_DRV_LV3&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -670,22 +684,22 @@</div><div class='ctx'> </div><div class='ctx'> 	spi5_bus: spi5-bus {</div><div class='ctx'> 		samsung,pins = "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ufs_refclk_out: ufs-refclk-out {</div><div class='ctx'> 		samsung,pins = "gpg2-4";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;0&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;2&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_NONE&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV2&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ufs_rst_n: ufs-rst-n {</div><div class='ctx'> 		samsung,pins = "gph1-5";</div><div class='del'>-		samsung,pin-function = &lt;2&gt;;</div><div class='del'>-		samsung,pin-pud = &lt;3&gt;;</div><div class='del'>-		samsung,pin-drv = &lt;0&gt;;</div><div class='add'>+		samsung,pin-function = &lt;EXYNOS_PIN_FUNC_2&gt;;</div><div class='add'>+		samsung,pin-pud = &lt;EXYNOS_PIN_PULL_UP&gt;;</div><div class='add'>+		samsung,pin-drv = &lt;EXYNOS4_PIN_DRV_LV1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/exynos/exynos7.dtsi b/arch/arm64/boot/dts/exynos/exynos7.dtsi<br/>index 6328a66ed97e..9a3fbed1765a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos7.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/exynos/exynos7.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/exynos/exynos7.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/exynos/exynos7.dtsi</a></div><div class='hunk'>@@ -35,28 +35,28 @@</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> </div><div class='del'>-		cpu@0 {</div><div class='add'>+		cpu_atlas0: cpu@0 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='ctx'> 			reg = &lt;0x0&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@1 {</div><div class='add'>+		cpu_atlas1: cpu@1 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='ctx'> 			reg = &lt;0x1&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@2 {</div><div class='add'>+		cpu_atlas2: cpu@2 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='ctx'> 			reg = &lt;0x2&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@3 {</div><div class='add'>+		cpu_atlas3: cpu@3 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='ctx'> 			reg = &lt;0x3&gt;;</div><div class='hunk'>@@ -106,7 +106,7 @@</div><div class='ctx'> 			pdma0: pdma@10E10000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x10E10000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 225 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clock_fsys0 ACLK_PDMA0&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -117,7 +117,7 @@</div><div class='ctx'> 			pdma1: pdma@10EB0000 {</div><div class='ctx'> 				compatible = "arm,pl330", "arm,primecell";</div><div class='ctx'> 				reg = &lt;0x10EB0000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;0 226 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;clock_fsys0 ACLK_PDMA1&gt;;</div><div class='ctx'> 				clock-names = "apb_pclk";</div><div class='ctx'> 				#dma-cells = &lt;1&gt;;</div><div class='hunk'>@@ -220,7 +220,7 @@</div><div class='ctx'> 		serial_0: serial@13630000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x13630000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 440 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 440 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_peric0 PCLK_UART0&gt;,</div><div class='ctx'> 				 &lt;&amp;clock_peric0 SCLK_UART0&gt;;</div><div class='ctx'> 			clock-names = "uart", "clk_uart_baud0";</div><div class='hunk'>@@ -230,7 +230,7 @@</div><div class='ctx'> 		serial_1: serial@14c20000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x14c20000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 456 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 456 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_peric1 PCLK_UART1&gt;,</div><div class='ctx'> 				 &lt;&amp;clock_peric1 SCLK_UART1&gt;;</div><div class='ctx'> 			clock-names = "uart", "clk_uart_baud0";</div><div class='hunk'>@@ -240,7 +240,7 @@</div><div class='ctx'> 		serial_2: serial@14c30000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x14c30000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 457 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 457 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_peric1 PCLK_UART2&gt;,</div><div class='ctx'> 				 &lt;&amp;clock_peric1 SCLK_UART2&gt;;</div><div class='ctx'> 			clock-names = "uart", "clk_uart_baud0";</div><div class='hunk'>@@ -250,7 +250,7 @@</div><div class='ctx'> 		serial_3: serial@14c40000 {</div><div class='ctx'> 			compatible = "samsung,exynos4210-uart";</div><div class='ctx'> 			reg = &lt;0x14c40000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 458 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 458 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_peric1 PCLK_UART3&gt;,</div><div class='ctx'> 				 &lt;&amp;clock_peric1 SCLK_UART3&gt;;</div><div class='ctx'> 			clock-names = "uart", "clk_uart_baud0";</div><div class='hunk'>@@ -264,62 +264,62 @@</div><div class='ctx'> 			wakeup-interrupt-controller {</div><div class='ctx'> 				compatible = "samsung,exynos7-wakeup-eint";</div><div class='ctx'> 				interrupt-parent = &lt;&amp;gic&gt;;</div><div class='del'>-				interrupts = &lt;0 16 0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_bus0: pinctrl@13470000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-pinctrl";</div><div class='ctx'> 			reg = &lt;0x13470000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 383 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_nfc: pinctrl@14cd0000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-pinctrl";</div><div class='ctx'> 			reg = &lt;0x14cd0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 473 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_touch: pinctrl@14ce0000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-pinctrl";</div><div class='ctx'> 			reg = &lt;0x14ce0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 474 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_ff: pinctrl@14c90000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-pinctrl";</div><div class='ctx'> 			reg = &lt;0x14c90000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 475 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 475 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_ese: pinctrl@14ca0000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-pinctrl";</div><div class='ctx'> 			reg = &lt;0x14ca0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 476 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 476 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_fsys0: pinctrl@10e60000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-pinctrl";</div><div class='ctx'> 			reg = &lt;0x10e60000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 221 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_fsys1: pinctrl@15690000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-pinctrl";</div><div class='ctx'> 			reg = &lt;0x15690000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 203 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pinctrl_bus1: pinctrl@14870000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-pinctrl";</div><div class='ctx'> 			reg = &lt;0x14870000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 384 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 384 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		hsi2c_0: hsi2c@13640000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x13640000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 441 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 441 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -332,7 +332,7 @@</div><div class='ctx'> 		hsi2c_1: hsi2c@13650000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x13650000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 442 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 442 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -345,7 +345,7 @@</div><div class='ctx'> 		hsi2c_2: hsi2c@14e60000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x14e60000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 459 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 459 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -358,7 +358,7 @@</div><div class='ctx'> 		hsi2c_3: hsi2c@14e70000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x14e70000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 460 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 460 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -371,7 +371,7 @@</div><div class='ctx'> 		hsi2c_4: hsi2c@13660000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x13660000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 443 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 443 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -384,7 +384,7 @@</div><div class='ctx'> 		hsi2c_5: hsi2c@13670000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x13670000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 444 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 444 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -397,7 +397,7 @@</div><div class='ctx'> 		hsi2c_6: hsi2c@14e00000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x14e00000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 461 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 461 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -410,7 +410,7 @@</div><div class='ctx'> 		hsi2c_7: hsi2c@13e10000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x13e10000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 462 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 462 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -423,7 +423,7 @@</div><div class='ctx'> 		hsi2c_8: hsi2c@14e20000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x14e20000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 463 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 463 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -436,7 +436,7 @@</div><div class='ctx'> 		hsi2c_9: hsi2c@13680000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x13680000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 445 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 445 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -449,7 +449,7 @@</div><div class='ctx'> 		hsi2c_10: hsi2c@13690000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x13690000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 446 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -462,7 +462,7 @@</div><div class='ctx'> 		hsi2c_11: hsi2c@136a0000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-hsi2c";</div><div class='ctx'> 			reg = &lt;0x136a0000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;0 447 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 447 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='hunk'>@@ -472,6 +472,16 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		arm-pmu {</div><div class='add'>+			compatible = "arm,cortex-a57-pmu", "arm,armv8-pmuv3";</div><div class='add'>+			interrupts = &lt;GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-affinity = &lt;&amp;cpu_atlas0&gt;, &lt;&amp;cpu_atlas1&gt;,</div><div class='add'>+					     &lt;&amp;cpu_atlas2&gt;, &lt;&amp;cpu_atlas3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		timer {</div><div class='ctx'> 			compatible = "arm,armv8-timer";</div><div class='ctx'> 			interrupts = &lt;GIC_PPI 13</div><div class='hunk'>@@ -499,7 +509,8 @@</div><div class='ctx'> 		rtc: rtc@10590000 {</div><div class='ctx'> 			compatible = "samsung,s3c6410-rtc";</div><div class='ctx'> 			reg = &lt;0x10590000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 355 0&gt;, &lt;0 356 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_ccore PCLK_RTC&gt;;</div><div class='ctx'> 			clock-names = "rtc";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -508,7 +519,7 @@</div><div class='ctx'> 		watchdog: watchdog@101d0000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-wdt";</div><div class='ctx'> 			reg = &lt;0x101d0000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 110 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_peris PCLK_WDT&gt;;</div><div class='ctx'> 			clock-names = "watchdog";</div><div class='ctx'> 			samsung,syscon-phandle = &lt;&amp;pmu_system_controller&gt;;</div><div class='hunk'>@@ -517,7 +528,7 @@</div><div class='ctx'> </div><div class='ctx'> 		mmc_0: mmc@15740000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-dw-mshc-smu";</div><div class='del'>-			interrupts = &lt;0 201 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			reg = &lt;0x15740000 0x2000&gt;;</div><div class='hunk'>@@ -530,7 +541,7 @@</div><div class='ctx'> </div><div class='ctx'> 		mmc_1: mmc@15750000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-dw-mshc";</div><div class='del'>-			interrupts = &lt;0 202 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			reg = &lt;0x15750000 0x2000&gt;;</div><div class='hunk'>@@ -543,7 +554,7 @@</div><div class='ctx'> </div><div class='ctx'> 		mmc_2: mmc@15560000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-dw-mshc-smu";</div><div class='del'>-			interrupts = &lt;0 216 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='ctx'> 			reg = &lt;0x15560000 0x2000&gt;;</div><div class='hunk'>@@ -557,7 +568,7 @@</div><div class='ctx'> 		adc: adc@13620000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-adc";</div><div class='ctx'> 			reg = &lt;0x13620000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;0 448 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 448 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_peric0 PCLK_ADCIF&gt;;</div><div class='ctx'> 			clock-names = "adc";</div><div class='ctx'> 			#io-channel-cells = &lt;1&gt;;</div><div class='hunk'>@@ -577,7 +588,7 @@</div><div class='ctx'> 		tmuctrl_0: tmu@10060000 {</div><div class='ctx'> 			compatible = "samsung,exynos7-tmu";</div><div class='ctx'> 			reg = &lt;0x10060000 0x200&gt;;</div><div class='del'>-			interrupts = &lt;0 108 0&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clock_peris PCLK_TMU&gt;,</div><div class='ctx'> 				 &lt;&amp;clock_peris SCLK_TMU&gt;;</div><div class='ctx'> 			clock-names = "tmu_apbif", "tmu_sclk";</div><div class='hunk'>@@ -592,6 +603,40 @@</div><div class='ctx'> 				#include "exynos7-trip-points.dtsi"</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		usbdrd_phy: phy@15500000 {</div><div class='add'>+			compatible = "samsung,exynos7-usbdrd-phy";</div><div class='add'>+			reg = &lt;0x15500000 0x100&gt;;</div><div class='add'>+			clocks = &lt;&amp;clock_fsys0 ACLK_USBDRD300&gt;,</div><div class='add'>+			       &lt;&amp;clock_fsys0 OSCCLK_PHY_CLKOUT_USB30_PHY&gt;,</div><div class='add'>+			       &lt;&amp;clock_fsys0 PHYCLK_USBDRD300_UDRD30_PIPE_PCLK_USER&gt;,</div><div class='add'>+			       &lt;&amp;clock_fsys0 PHYCLK_USBDRD300_UDRD30_PHYCLK_USER&gt;,</div><div class='add'>+			       &lt;&amp;clock_fsys0 SCLK_USBDRD300_REFCLK&gt;;</div><div class='add'>+			clock-names = "phy", "ref", "phy_pipe",</div><div class='add'>+				"phy_utmi", "itp";</div><div class='add'>+			samsung,pmu-syscon = &lt;&amp;pmu_system_controller&gt;;</div><div class='add'>+			#phy-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usbdrd3 {</div><div class='add'>+			compatible = "samsung,exynos7-dwusb3";</div><div class='add'>+			clocks = &lt;&amp;clock_fsys0 ACLK_USBDRD300&gt;,</div><div class='add'>+			       &lt;&amp;clock_fsys0 SCLK_USBDRD300_SUSPENDCLK&gt;,</div><div class='add'>+			       &lt;&amp;clock_fsys0 ACLK_AXIUS_USBDRD30X_FSYS0X&gt;;</div><div class='add'>+			clock-names = "usbdrd30", "usbdrd30_susp_clk",</div><div class='add'>+				"usbdrd30_axius_clk";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			dwc3@15400000 {</div><div class='add'>+				compatible = "snps,dwc3";</div><div class='add'>+				reg = &lt;0x15400000 0x10000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				phys = &lt;&amp;usbdrd_phy 0&gt;, &lt;&amp;usbdrd_phy 1&gt;;</div><div class='add'>+				phy-names = "usb2-phy", "usb3-phy";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile<br/>index 1b7783db7de4..39db645b268e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/freescale/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/Makefile</a></div><div class='hunk'>@@ -1,5 +1,10 @@</div><div class='add'>+dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frdm.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-qds.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-rdb.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-qds.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-rdb.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-qds.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-rdb.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-simu.dtb</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts<br/>new file mode 100644<br/>index 000000000000..a619f6496a4c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree file for Freescale LS1012A Freedom Board.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016, Freescale Semiconductor</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPLv2 or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "fsl-ls1012a.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "LS1012A Freedom Board";</div><div class='add'>+	compatible = "fsl,ls1012a-frdm", "fsl,ls1012a";</div><div class='add'>+</div><div class='add'>+	sys_mclk: clock-mclk {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;25000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_1p8v: regulator-1p8v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "1P8V";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "simple-audio-card";</div><div class='add'>+		simple-audio-card,format = "i2s";</div><div class='add'>+		simple-audio-card,widgets =</div><div class='add'>+			"Microphone", "Microphone Jack",</div><div class='add'>+			"Headphone", "Headphone Jack",</div><div class='add'>+			"Speaker", "Speaker Ext",</div><div class='add'>+			"Line", "Line In Jack";</div><div class='add'>+		simple-audio-card,routing =</div><div class='add'>+			"MIC_IN", "Microphone Jack",</div><div class='add'>+			"Microphone Jack", "Mic Bias",</div><div class='add'>+			"LINE_IN", "Line In Jack",</div><div class='add'>+			"Headphone Jack", "HP_OUT",</div><div class='add'>+			"Speaker Ext", "LINE_OUT";</div><div class='add'>+</div><div class='add'>+		simple-audio-card,cpu {</div><div class='add'>+			sound-dai = &lt;&amp;sai2&gt;;</div><div class='add'>+			frame-master;</div><div class='add'>+			bitclock-master;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		simple-audio-card,codec {</div><div class='add'>+			sound-dai = &lt;&amp;codec&gt;;</div><div class='add'>+			frame-master;</div><div class='add'>+			bitclock-master;</div><div class='add'>+			system-clock-frequency = &lt;25000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;duart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	codec: sgtl5000@a {</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "fsl,sgtl5000";</div><div class='add'>+		reg = &lt;0xa&gt;;</div><div class='add'>+		VDDA-supply = &lt;&amp;reg_1p8v&gt;;</div><div class='add'>+		VDDIO-supply = &lt;&amp;reg_1p8v&gt;;</div><div class='add'>+		clocks = &lt;&amp;sys_mclk&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sai2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts<br/>new file mode 100644<br/>index 000000000000..14a67f1709e7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts</a></div><div class='hunk'>@@ -0,0 +1,128 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree file for Freescale LS1012A QDS Board.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016, Freescale Semiconductor</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPLv2 or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "fsl-ls1012a.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "LS1012A QDS Board";</div><div class='add'>+	compatible = "fsl,ls1012a-qds", "fsl,ls1012a";</div><div class='add'>+</div><div class='add'>+	sys_mclk: clock-mclk {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;24576000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3p3v: regulator-3p3v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "3P3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sound {</div><div class='add'>+		compatible = "simple-audio-card";</div><div class='add'>+		simple-audio-card,format = "i2s";</div><div class='add'>+		simple-audio-card,widgets =</div><div class='add'>+			"Microphone", "Microphone Jack",</div><div class='add'>+			"Headphone", "Headphone Jack",</div><div class='add'>+			"Speaker", "Speaker Ext",</div><div class='add'>+			"Line", "Line In Jack";</div><div class='add'>+		simple-audio-card,routing =</div><div class='add'>+			"MIC_IN", "Microphone Jack",</div><div class='add'>+			"Microphone Jack", "Mic Bias",</div><div class='add'>+			"LINE_IN", "Line In Jack",</div><div class='add'>+			"Headphone Jack", "HP_OUT",</div><div class='add'>+			"Speaker Ext", "LINE_OUT";</div><div class='add'>+</div><div class='add'>+		simple-audio-card,cpu {</div><div class='add'>+			sound-dai = &lt;&amp;sai2&gt;;</div><div class='add'>+			frame-master;</div><div class='add'>+			bitclock-master;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		simple-audio-card,codec {</div><div class='add'>+			sound-dai = &lt;&amp;codec&gt;;</div><div class='add'>+			frame-master;</div><div class='add'>+			bitclock-master;</div><div class='add'>+			system-clock-frequency = &lt;24576000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;duart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pca9547@77 {</div><div class='add'>+		compatible = "nxp,pca9547";</div><div class='add'>+		reg = &lt;0x77&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		i2c@4 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x4&gt;;</div><div class='add'>+</div><div class='add'>+			codec: sgtl5000@a {</div><div class='add'>+				#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+				compatible = "fsl,sgtl5000";</div><div class='add'>+				reg = &lt;0xa&gt;;</div><div class='add'>+				VDDA-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+				VDDIO-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+				clocks = &lt;&amp;sys_mclk&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sai2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts<br/>new file mode 100644<br/>index 000000000000..62c5c7123a15<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree file for Freescale LS1012A RDB Board.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016, Freescale Semiconductor</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPLv2 or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "fsl-ls1012a.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "LS1012A RDB Board";</div><div class='add'>+	compatible = "fsl,ls1012a-rdb", "fsl,ls1012a";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;duart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi<br/>new file mode 100644<br/>index 000000000000..cffebb4b3df1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi</a></div><div class='hunk'>@@ -0,0 +1,247 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Include file for Freescale Layerscape-1012A family SoC.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016, Freescale Semiconductor</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPLv2 or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,ls1012a";</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 1 0&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sysclk: sysclk {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;100000000&gt;;</div><div class='add'>+		clock-output-names = "sysclk";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "arm,armv8-timer";</div><div class='add'>+		interrupts = &lt;1 13 IRQ_TYPE_LEVEL_LOW&gt;,/* Physical Secure PPI */</div><div class='add'>+			     &lt;1 14 IRQ_TYPE_LEVEL_LOW&gt;,/* Physical Non-Secure PPI */</div><div class='add'>+			     &lt;1 11 IRQ_TYPE_LEVEL_LOW&gt;,/* Virtual PPI */</div><div class='add'>+			     &lt;1 10 IRQ_TYPE_LEVEL_LOW&gt;;/* Hypervisor PPI */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmu {</div><div class='add'>+		compatible = "arm,armv8-pmuv3";</div><div class='add'>+		interrupts = &lt;0 106 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gic: interrupt-controller@1400000 {</div><div class='add'>+		compatible = "arm,gic-400";</div><div class='add'>+		#interrupt-cells = &lt;3&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		reg = &lt;0x0 0x1401000 0 0x1000&gt;, /* GICD */</div><div class='add'>+		      &lt;0x0 0x1402000 0 0x2000&gt;, /* GICC */</div><div class='add'>+		      &lt;0x0 0x1404000 0 0x2000&gt;, /* GICH */</div><div class='add'>+		      &lt;0x0 0x1406000 0 0x2000&gt;; /* GICV */</div><div class='add'>+		interrupts = &lt;1 9 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reboot {</div><div class='add'>+		compatible = "syscon-reboot";</div><div class='add'>+		regmap = &lt;&amp;dcfg&gt;;</div><div class='add'>+		offset = &lt;0xb0&gt;;</div><div class='add'>+		mask = &lt;0x02&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		scfg: scfg@1570000 {</div><div class='add'>+			compatible = "fsl,ls1012a-scfg", "syscon";</div><div class='add'>+			reg = &lt;0x0 0x1570000 0x0 0x10000&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dcfg: dcfg@1ee0000 {</div><div class='add'>+			compatible = "fsl,ls1012a-dcfg",</div><div class='add'>+				     "syscon";</div><div class='add'>+			reg = &lt;0x0 0x1ee0000 0x0 0x10000&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clockgen: clocking@1ee1000 {</div><div class='add'>+			compatible = "fsl,ls1012a-clockgen";</div><div class='add'>+			reg = &lt;0x0 0x1ee1000 0x0 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;2&gt;;</div><div class='add'>+			clocks = &lt;&amp;sysclk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c0: i2c@2180000 {</div><div class='add'>+			compatible = "fsl,vf610-i2c";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x0 0x2180000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 56 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c1: i2c@2190000 {</div><div class='add'>+			compatible = "fsl,vf610-i2c";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x0 0x2190000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 57 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		duart0: serial@21c0500 {</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550a";</div><div class='add'>+			reg = &lt;0x00 0x21c0500 0x0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0 54 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		duart1: serial@21c0600 {</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550a";</div><div class='add'>+			reg = &lt;0x00 0x21c0600 0x0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;0 54 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio0: gpio@2300000 {</div><div class='add'>+			compatible = "fsl,qoriq-gpio";</div><div class='add'>+			reg = &lt;0x0 0x2300000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 66 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio1: gpio@2310000 {</div><div class='add'>+			compatible = "fsl,qoriq-gpio";</div><div class='add'>+			reg = &lt;0x0 0x2310000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 67 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wdog0: wdog@2ad0000 {</div><div class='add'>+			compatible = "fsl,ls1012a-wdt",</div><div class='add'>+				     "fsl,imx21-wdt";</div><div class='add'>+			reg = &lt;0x0 0x2ad0000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 83 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 0&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sai1: sai@2b50000 {</div><div class='add'>+			#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fsl,vf610-sai";</div><div class='add'>+			reg = &lt;0x0 0x2b50000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 148 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 3&gt;, &lt;&amp;clockgen 4 3&gt;,</div><div class='add'>+				 &lt;&amp;clockgen 4 3&gt;, &lt;&amp;clockgen 4 3&gt;;</div><div class='add'>+			clock-names = "bus", "mclk1", "mclk2", "mclk3";</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			dmas = &lt;&amp;edma0 1 47&gt;,</div><div class='add'>+			       &lt;&amp;edma0 1 46&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sai2: sai@2b60000 {</div><div class='add'>+			#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "fsl,vf610-sai";</div><div class='add'>+			reg = &lt;0x0 0x2b60000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 149 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 3&gt;, &lt;&amp;clockgen 4 3&gt;,</div><div class='add'>+				 &lt;&amp;clockgen 4 3&gt;, &lt;&amp;clockgen 4 3&gt;;</div><div class='add'>+			clock-names = "bus", "mclk1", "mclk2", "mclk3";</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			dmas = &lt;&amp;edma0 1 45&gt;,</div><div class='add'>+			       &lt;&amp;edma0 1 44&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		edma0: edma@2c00000 {</div><div class='add'>+			#dma-cells = &lt;2&gt;;</div><div class='add'>+			compatible = "fsl,vf610-edma";</div><div class='add'>+			reg = &lt;0x0 0x2c00000 0x0 0x10000&gt;,</div><div class='add'>+			      &lt;0x0 0x2c10000 0x0 0x10000&gt;,</div><div class='add'>+			      &lt;0x0 0x2c20000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 103 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;0 103 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "edma-tx", "edma-err";</div><div class='add'>+			dma-channels = &lt;32&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+			clock-names = "dmamux0", "dmamux1";</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 3&gt;,</div><div class='add'>+				 &lt;&amp;clockgen 4 3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sata: sata@3200000 {</div><div class='add'>+			compatible = "fsl,ls1012a-ahci", "fsl,ls1043a-ahci";</div><div class='add'>+			reg = &lt;0x0 0x3200000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 69 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts<br/>index dd9e91941df4..0989d635b558 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='del'>-/include/ "fsl-ls1043a.dtsi"</div><div class='add'>+#include "fsl-ls1043a.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "LS1043A QDS Board";</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts<br/>index d2313e05fd22..c37110bc1506 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='del'>-/include/ "fsl-ls1043a.dtsi"</div><div class='add'>+#include "fsl-ls1043a.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "LS1043A RDB Board";</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi<br/>index 97d331ec2500..ec13a6ecb754 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi</a></div><div class='hunk'>@@ -44,6 +44,8 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;dt-bindings/thermal/thermal.h&gt;</div><div class='add'>+</div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "fsl,ls1043a";</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='hunk'>@@ -66,6 +68,7 @@</div><div class='ctx'> 			reg = &lt;0x0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clockgen 1 0&gt;;</div><div class='ctx'> 			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu1: cpu@1 {</div><div class='hunk'>@@ -255,6 +258,81 @@</div><div class='ctx'> 			big-endian;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		tmu: tmu@1f00000 {</div><div class='add'>+			compatible = "fsl,qoriq-tmu";</div><div class='add'>+			reg = &lt;0x0 0x1f00000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 33 0x4&gt;;</div><div class='add'>+			fsl,tmu-range = &lt;0xb0000 0x9002a 0x6004c 0x30062&gt;;</div><div class='add'>+			fsl,tmu-calibration = &lt;0x00000000 0x00000026</div><div class='add'>+					       0x00000001 0x0000002d</div><div class='add'>+					       0x00000002 0x00000032</div><div class='add'>+					       0x00000003 0x00000039</div><div class='add'>+					       0x00000004 0x0000003f</div><div class='add'>+					       0x00000005 0x00000046</div><div class='add'>+					       0x00000006 0x0000004d</div><div class='add'>+					       0x00000007 0x00000054</div><div class='add'>+					       0x00000008 0x0000005a</div><div class='add'>+					       0x00000009 0x00000061</div><div class='add'>+					       0x0000000a 0x0000006a</div><div class='add'>+					       0x0000000b 0x00000071</div><div class='add'>+</div><div class='add'>+					       0x00010000 0x00000025</div><div class='add'>+					       0x00010001 0x0000002c</div><div class='add'>+					       0x00010002 0x00000035</div><div class='add'>+					       0x00010003 0x0000003d</div><div class='add'>+					       0x00010004 0x00000045</div><div class='add'>+					       0x00010005 0x0000004e</div><div class='add'>+					       0x00010006 0x00000057</div><div class='add'>+					       0x00010007 0x00000061</div><div class='add'>+					       0x00010008 0x0000006b</div><div class='add'>+					       0x00010009 0x00000076</div><div class='add'>+</div><div class='add'>+					       0x00020000 0x00000029</div><div class='add'>+					       0x00020001 0x00000033</div><div class='add'>+					       0x00020002 0x0000003d</div><div class='add'>+					       0x00020003 0x00000049</div><div class='add'>+					       0x00020004 0x00000056</div><div class='add'>+					       0x00020005 0x00000061</div><div class='add'>+					       0x00020006 0x0000006d</div><div class='add'>+</div><div class='add'>+					       0x00030000 0x00000021</div><div class='add'>+					       0x00030001 0x0000002a</div><div class='add'>+					       0x00030002 0x0000003c</div><div class='add'>+					       0x00030003 0x0000004e&gt;;</div><div class='add'>+			#thermal-sensor-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		thermal-zones {</div><div class='add'>+			cpu_thermal: cpu-thermal {</div><div class='add'>+				polling-delay-passive = &lt;1000&gt;;</div><div class='add'>+				polling-delay = &lt;5000&gt;;</div><div class='add'>+</div><div class='add'>+				thermal-sensors = &lt;&amp;tmu 3&gt;;</div><div class='add'>+</div><div class='add'>+				trips {</div><div class='add'>+					cpu_alert: cpu-alert {</div><div class='add'>+						temperature = &lt;85000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "passive";</div><div class='add'>+					};</div><div class='add'>+					cpu_crit: cpu-crit {</div><div class='add'>+						temperature = &lt;95000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "critical";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				cooling-maps {</div><div class='add'>+					map0 {</div><div class='add'>+						trip = &lt;&amp;cpu_alert&gt;;</div><div class='add'>+						cooling-device =</div><div class='add'>+							&lt;&amp;cpu0 THERMAL_NO_LIMIT</div><div class='add'>+							THERMAL_NO_LIMIT&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		dspi0: dspi@2100000 {</div><div class='ctx'> 			compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts<br/>new file mode 100644<br/>index 000000000000..290e5b014414<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts</a></div><div class='hunk'>@@ -0,0 +1,212 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Include file for Freescale Layerscape-1046A family SoC.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016, Freescale Semiconductor, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Shaohui Xie &lt;Shaohui.Xie@nxp.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPLv2 or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "fsl-ls1046a.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "LS1046A QDS Board";</div><div class='add'>+	compatible = "fsl,ls1046a-qds", "fsl,ls1046a";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		gpio0 = &amp;gpio0;</div><div class='add'>+		gpio1 = &amp;gpio1;</div><div class='add'>+		gpio2 = &amp;gpio2;</div><div class='add'>+		gpio3 = &amp;gpio3;</div><div class='add'>+		serial0 = &amp;duart0;</div><div class='add'>+		serial1 = &amp;duart1;</div><div class='add'>+		serial2 = &amp;duart2;</div><div class='add'>+		serial3 = &amp;duart3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dspi {</div><div class='add'>+	bus-num = &lt;0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	flash@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "n25q128a11", "jedec,spi-nor";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;10000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	flash@1 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "sst25wf040b", "jedec,spi-nor";</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+		spi-max-frequency = &lt;10000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	flash@2 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "en25s64", "jedec,spi-nor";</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+		reg = &lt;2&gt;;</div><div class='add'>+		spi-max-frequency = &lt;10000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;duart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;duart1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pca9547@77 {</div><div class='add'>+		compatible = "nxp,pca9547";</div><div class='add'>+		reg = &lt;0x77&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		i2c@2 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x2&gt;;</div><div class='add'>+</div><div class='add'>+			ina220@40 {</div><div class='add'>+				compatible = "ti,ina220";</div><div class='add'>+				reg = &lt;0x40&gt;;</div><div class='add'>+				shunt-resistor = &lt;1000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ina220@41 {</div><div class='add'>+				compatible = "ti,ina220";</div><div class='add'>+				reg = &lt;0x41&gt;;</div><div class='add'>+				shunt-resistor = &lt;1000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@3 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x3&gt;;</div><div class='add'>+</div><div class='add'>+			rtc@51 {</div><div class='add'>+				compatible = "nxp,pcf2129";</div><div class='add'>+				reg = &lt;0x51&gt;;</div><div class='add'>+				/* IRQ10_B */</div><div class='add'>+				interrupts = &lt;0 150 0x4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			eeprom@56 {</div><div class='add'>+				compatible = "atmel,24c512";</div><div class='add'>+				reg = &lt;0x56&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			eeprom@57 {</div><div class='add'>+				compatible = "atmel,24c512";</div><div class='add'>+				reg = &lt;0x57&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			temp-sensor@4c {</div><div class='add'>+				compatible = "adi,adt7461a";</div><div class='add'>+				reg = &lt;0x4c&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ifc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/* NOR, NAND Flashes and FPGA on board */</div><div class='add'>+	ranges = &lt;0x0 0x0 0x0 0x60000000 0x08000000</div><div class='add'>+		  0x1 0x0 0x0 0x7e800000 0x00010000</div><div class='add'>+		  0x2 0x0 0x0 0x7fb00000 0x00000100&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	nor@0,0 {</div><div class='add'>+		compatible = "cfi-flash";</div><div class='add'>+		reg = &lt;0x0 0x0 0x8000000&gt;;</div><div class='add'>+		bank-width = &lt;2&gt;;</div><div class='add'>+		device-width = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nand@1,0 {</div><div class='add'>+		compatible = "fsl,ifc-nand";</div><div class='add'>+		reg = &lt;0x1 0x0 0x10000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fpga: board-control@2,0 {</div><div class='add'>+		compatible = "fsl,ls1046aqds-fpga", "fsl,fpga-qixis";</div><div class='add'>+		reg = &lt;0x2 0x0 0x0000100&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;lpuart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	num-cs = &lt;2&gt;;</div><div class='add'>+	bus-num = &lt;0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	qflash0: s25fl128s@0 {</div><div class='add'>+		compatible = "spansion,m25p80";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		spi-max-frequency = &lt;20000000&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts<br/>new file mode 100644<br/>index 000000000000..d1ccc000d05a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Include file for Freescale Layerscape-1046A family SoC.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016, Freescale Semiconductor, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Mingkai Hu &lt;mingkai.hu@nxp.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPLv2 or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "fsl-ls1046a.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "LS1046A RDB Board";</div><div class='add'>+	compatible = "fsl,ls1046a-rdb", "fsl,ls1046a";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;duart0;</div><div class='add'>+		serial1 = &amp;duart1;</div><div class='add'>+		serial2 = &amp;duart2;</div><div class='add'>+		serial3 = &amp;duart3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;duart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;duart1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	ina220@40 {</div><div class='add'>+		compatible = "ti,ina220";</div><div class='add'>+		reg = &lt;0x40&gt;;</div><div class='add'>+		shunt-resistor = &lt;1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	temp-sensor@4c {</div><div class='add'>+		compatible = "adi,adt7461";</div><div class='add'>+		reg = &lt;0x4c&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	eeprom@56 {</div><div class='add'>+		compatible = "atmel,24c512";</div><div class='add'>+		reg = &lt;0x52&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	eeprom@57 {</div><div class='add'>+		compatible = "atmel,24c512";</div><div class='add'>+		reg = &lt;0x53&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	rtc@51 {</div><div class='add'>+		compatible = "nxp,pcf2129";</div><div class='add'>+		reg = &lt;0x51&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;ifc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	/* NAND Flashe and CPLD on board */</div><div class='add'>+	ranges = &lt;0x0 0x0 0x0 0x7e800000 0x00010000</div><div class='add'>+		  0x2 0x0 0x0 0x7fb00000 0x00000100&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	nand@0,0 {</div><div class='add'>+		compatible = "fsl,ifc-nand";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x0 0x0 0x10000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpld: board-control@2,0 {</div><div class='add'>+		compatible = "fsl,ls1046ardb-cpld";</div><div class='add'>+		reg = &lt;0x2 0x0 0x0000100&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	num-cs = &lt;2&gt;;</div><div class='add'>+	bus-num = &lt;0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	qflash0: s25fs512s@0 {</div><div class='add'>+		compatible = "spansion,m25p80";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		spi-max-frequency = &lt;20000000&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qflash1: s25fs512s@1 {</div><div class='add'>+		compatible = "spansion,m25p80";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		spi-max-frequency = &lt;20000000&gt;;</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi<br/>new file mode 100644<br/>index 000000000000..4a164b801882<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi</a></div><div class='hunk'>@@ -0,0 +1,595 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Include file for Freescale Layerscape-1046A family SoC.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016, Freescale Semiconductor, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Mingkai Hu &lt;mingkai.hu@nxp.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPLv2 or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/thermal/thermal.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,ls1046a";</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		crypto = &amp;crypto;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 1 0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			cpu-idle-states = &lt;&amp;CPU_PH20&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu1: cpu@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72";</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 1 0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			cpu-idle-states = &lt;&amp;CPU_PH20&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu2: cpu@2 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72";</div><div class='add'>+			reg = &lt;0x2&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 1 0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			cpu-idle-states = &lt;&amp;CPU_PH20&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu3: cpu@3 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72";</div><div class='add'>+			reg = &lt;0x3&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 1 0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;l2&gt;;</div><div class='add'>+			cpu-idle-states = &lt;&amp;CPU_PH20&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		l2: l2-cache {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	idle-states {</div><div class='add'>+		/*</div><div class='add'>+		 * PSCI node is not added default, U-boot will add missing</div><div class='add'>+		 * parts if it determines to use PSCI.</div><div class='add'>+		 */</div><div class='add'>+		entry-method = "arm,psci";</div><div class='add'>+</div><div class='add'>+		CPU_PH20: cpu-ph20 {</div><div class='add'>+			compatible = "arm,idle-state";</div><div class='add'>+			idle-state-name = "PH20";</div><div class='add'>+			arm,psci-suspend-param = &lt;0x00010000&gt;;</div><div class='add'>+			entry-latency-us = &lt;1000&gt;;</div><div class='add'>+			exit-latency-us = &lt;1000&gt;;</div><div class='add'>+			min-residency-us = &lt;3000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@80000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sysclk: sysclk {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;100000000&gt;;</div><div class='add'>+		clock-output-names = "sysclk";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reboot {</div><div class='add'>+		compatible ="syscon-reboot";</div><div class='add'>+		regmap = &lt;&amp;dcfg&gt;;</div><div class='add'>+		offset = &lt;0xb0&gt;;</div><div class='add'>+		mask = &lt;0x02&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "arm,armv8-timer";</div><div class='add'>+		interrupts = &lt;GIC_PPI 13 (GIC_CPU_MASK_RAW(0xf) |</div><div class='add'>+					  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 14 (GIC_CPU_MASK_RAW(0xf) |</div><div class='add'>+					  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 11 (GIC_CPU_MASK_RAW(0xf) |</div><div class='add'>+					  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 10 (GIC_CPU_MASK_RAW(0xf) |</div><div class='add'>+					  IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmu {</div><div class='add'>+		compatible = "arm,cortex-a72-pmu";</div><div class='add'>+		interrupts = &lt;GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		interrupt-affinity = &lt;&amp;cpu0&gt;,</div><div class='add'>+				     &lt;&amp;cpu1&gt;,</div><div class='add'>+				     &lt;&amp;cpu2&gt;,</div><div class='add'>+				     &lt;&amp;cpu3&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gic: interrupt-controller@1400000 {</div><div class='add'>+		compatible = "arm,gic-400";</div><div class='add'>+		#interrupt-cells = &lt;3&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		reg = &lt;0x0 0x1410000 0 0x10000&gt;, /* GICD */</div><div class='add'>+		      &lt;0x0 0x1420000 0 0x20000&gt;, /* GICC */</div><div class='add'>+		      &lt;0x0 0x1440000 0 0x20000&gt;, /* GICH */</div><div class='add'>+		      &lt;0x0 0x1460000 0 0x20000&gt;; /* GICV */</div><div class='add'>+		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_RAW(0xf) |</div><div class='add'>+					 IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		ddr: memory-controller@1080000 {</div><div class='add'>+			compatible = "fsl,qoriq-memory-controller";</div><div class='add'>+			reg = &lt;0x0 0x1080000 0x0 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ifc: ifc@1530000 {</div><div class='add'>+			compatible = "fsl,ifc", "simple-bus";</div><div class='add'>+			reg = &lt;0x0 0x1530000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qspi: quadspi@1550000 {</div><div class='add'>+			compatible = "fsl,ls1021a-qspi";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x0 0x1550000 0x0 0x10000&gt;,</div><div class='add'>+				&lt;0x0 0x40000000 0x0 0x10000000&gt;;</div><div class='add'>+			reg-names = "QuadSPI", "QuadSPI-memory";</div><div class='add'>+			interrupts = &lt;GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "qspi_en", "qspi";</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;, &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+			fsl,qspi-has-second-chip;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		esdhc: esdhc@1560000 {</div><div class='add'>+			compatible = "fsl,esdhc";</div><div class='add'>+			reg = &lt;0x0 0x1560000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-frequency = &lt;0&gt;;</div><div class='add'>+			voltage-ranges = &lt;1800 1800 3300 3300&gt;;</div><div class='add'>+			sdhci,auto-cmd12;</div><div class='add'>+			big-endian;</div><div class='add'>+			bus-width = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		scfg: scfg@1570000 {</div><div class='add'>+			compatible = "fsl,ls1046a-scfg", "syscon";</div><div class='add'>+			reg = &lt;0x0 0x1570000 0x0 0x10000&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		crypto: crypto@1700000 {</div><div class='add'>+			compatible = "fsl,sec-v5.4", "fsl,sec-v5.0",</div><div class='add'>+				     "fsl,sec-v4.0";</div><div class='add'>+			fsl,sec-era = &lt;8&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x00 0x1700000 0x100000&gt;;</div><div class='add'>+			reg = &lt;0x00 0x1700000 0x0 0x100000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+			sec_jr0: jr@10000 {</div><div class='add'>+				compatible = "fsl,sec-v5.4-job-ring",</div><div class='add'>+					     "fsl,sec-v5.0-job-ring",</div><div class='add'>+					     "fsl,sec-v4.0-job-ring";</div><div class='add'>+				reg	   = &lt;0x10000 0x10000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sec_jr1: jr@20000 {</div><div class='add'>+				compatible = "fsl,sec-v5.4-job-ring",</div><div class='add'>+					     "fsl,sec-v5.0-job-ring",</div><div class='add'>+					     "fsl,sec-v4.0-job-ring";</div><div class='add'>+				reg	   = &lt;0x20000 0x10000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sec_jr2: jr@30000 {</div><div class='add'>+				compatible = "fsl,sec-v5.4-job-ring",</div><div class='add'>+					     "fsl,sec-v5.0-job-ring",</div><div class='add'>+					     "fsl,sec-v4.0-job-ring";</div><div class='add'>+				reg	   = &lt;0x30000 0x10000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sec_jr3: jr@40000 {</div><div class='add'>+				compatible = "fsl,sec-v5.4-job-ring",</div><div class='add'>+					     "fsl,sec-v5.0-job-ring",</div><div class='add'>+					     "fsl,sec-v4.0-job-ring";</div><div class='add'>+				reg	   = &lt;0x40000 0x10000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dcfg: dcfg@1ee0000 {</div><div class='add'>+			compatible = "fsl,ls1046a-dcfg", "syscon";</div><div class='add'>+			reg = &lt;0x0 0x1ee0000 0x0 0x10000&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clockgen: clocking@1ee1000 {</div><div class='add'>+			compatible = "fsl,ls1046a-clockgen";</div><div class='add'>+			reg = &lt;0x0 0x1ee1000 0x0 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;2&gt;;</div><div class='add'>+			clocks = &lt;&amp;sysclk&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tmu: tmu@1f00000 {</div><div class='add'>+			compatible = "fsl,qoriq-tmu";</div><div class='add'>+			reg = &lt;0x0 0x1f00000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 33 0x4&gt;;</div><div class='add'>+			fsl,tmu-range = &lt;0xb0000 0x9002a 0x6004c 0x30062&gt;;</div><div class='add'>+			fsl,tmu-calibration =</div><div class='add'>+				/* Calibration data group 1 */</div><div class='add'>+				&lt;0x00000000 0x00000026</div><div class='add'>+				0x00000001 0x0000002d</div><div class='add'>+				0x00000002 0x00000032</div><div class='add'>+				0x00000003 0x00000039</div><div class='add'>+				0x00000004 0x0000003f</div><div class='add'>+				0x00000005 0x00000046</div><div class='add'>+				0x00000006 0x0000004d</div><div class='add'>+				0x00000007 0x00000054</div><div class='add'>+				0x00000008 0x0000005a</div><div class='add'>+				0x00000009 0x00000061</div><div class='add'>+				0x0000000a 0x0000006a</div><div class='add'>+				0x0000000b 0x00000071</div><div class='add'>+				/* Calibration data group 2 */</div><div class='add'>+				0x00010000 0x00000025</div><div class='add'>+				0x00010001 0x0000002c</div><div class='add'>+				0x00010002 0x00000035</div><div class='add'>+				0x00010003 0x0000003d</div><div class='add'>+				0x00010004 0x00000045</div><div class='add'>+				0x00010005 0x0000004e</div><div class='add'>+				0x00010006 0x00000057</div><div class='add'>+				0x00010007 0x00000061</div><div class='add'>+				0x00010008 0x0000006b</div><div class='add'>+				0x00010009 0x00000076</div><div class='add'>+				/* Calibration data group 3 */</div><div class='add'>+				0x00020000 0x00000029</div><div class='add'>+				0x00020001 0x00000033</div><div class='add'>+				0x00020002 0x0000003d</div><div class='add'>+				0x00020003 0x00000049</div><div class='add'>+				0x00020004 0x00000056</div><div class='add'>+				0x00020005 0x00000061</div><div class='add'>+				0x00020006 0x0000006d</div><div class='add'>+				/* Calibration data group 4 */</div><div class='add'>+				0x00030000 0x00000021</div><div class='add'>+				0x00030001 0x0000002a</div><div class='add'>+				0x00030002 0x0000003c</div><div class='add'>+				0x00030003 0x0000004e&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+			#thermal-sensor-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		thermal-zones {</div><div class='add'>+			cpu_thermal: cpu-thermal {</div><div class='add'>+				polling-delay-passive = &lt;1000&gt;;</div><div class='add'>+				polling-delay = &lt;5000&gt;;</div><div class='add'>+				thermal-sensors = &lt;&amp;tmu 3&gt;;</div><div class='add'>+</div><div class='add'>+				trips {</div><div class='add'>+					cpu_alert: cpu-alert {</div><div class='add'>+						temperature = &lt;85000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "passive";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					cpu_crit: cpu-crit {</div><div class='add'>+						temperature = &lt;95000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "critical";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				cooling-maps {</div><div class='add'>+					map0 {</div><div class='add'>+						trip = &lt;&amp;cpu_alert&gt;;</div><div class='add'>+						cooling-device =</div><div class='add'>+							&lt;&amp;cpu0 THERMAL_NO_LIMIT</div><div class='add'>+							THERMAL_NO_LIMIT&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dspi: dspi@2100000 {</div><div class='add'>+			compatible = "fsl,ls1021a-v1.0-dspi";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x0 0x2100000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clock-names = "dspi";</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			spi-num-chipselects = &lt;5&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c0: i2c@2180000 {</div><div class='add'>+			compatible = "fsl,vf610-i2c";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x0 0x2180000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			dmas = &lt;&amp;edma0 1 39&gt;,</div><div class='add'>+			       &lt;&amp;edma0 1 38&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c1: i2c@2190000 {</div><div class='add'>+			compatible = "fsl,vf610-i2c";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x0 0x2190000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c2: i2c@21a0000 {</div><div class='add'>+			compatible = "fsl,vf610-i2c";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x0 0x21a0000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c3: i2c@21b0000 {</div><div class='add'>+			compatible = "fsl,vf610-i2c";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			reg = &lt;0x0 0x21b0000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		duart0: serial@21c0500 {</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550a";</div><div class='add'>+			reg = &lt;0x00 0x21c0500 0x0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		duart1: serial@21c0600 {</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550a";</div><div class='add'>+			reg = &lt;0x00 0x21c0600 0x0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		duart2: serial@21d0500 {</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550a";</div><div class='add'>+			reg = &lt;0x0 0x21d0500 0x0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		duart3: serial@21d0600 {</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550a";</div><div class='add'>+			reg = &lt;0x0 0x21d0600 0x0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio0: gpio@2300000 {</div><div class='add'>+			compatible = "fsl,qoriq-gpio";</div><div class='add'>+			reg = &lt;0x0 0x2300000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio1: gpio@2310000 {</div><div class='add'>+			compatible = "fsl,qoriq-gpio";</div><div class='add'>+			reg = &lt;0x0 0x2310000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio2: gpio@2320000 {</div><div class='add'>+			compatible = "fsl,qoriq-gpio";</div><div class='add'>+			reg = &lt;0x0 0x2320000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio3: gpio@2330000 {</div><div class='add'>+			compatible = "fsl,qoriq-gpio";</div><div class='add'>+			reg = &lt;0x0 0x2330000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lpuart0: serial@2950000 {</div><div class='add'>+			compatible = "fsl,ls1021a-lpuart";</div><div class='add'>+			reg = &lt;0x0 0x2950000 0x0 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 0&gt;;</div><div class='add'>+			clock-names = "ipg";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lpuart1: serial@2960000 {</div><div class='add'>+			compatible = "fsl,ls1021a-lpuart";</div><div class='add'>+			reg = &lt;0x0 0x2960000 0x0 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			clock-names = "ipg";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lpuart2: serial@2970000 {</div><div class='add'>+			compatible = "fsl,ls1021a-lpuart";</div><div class='add'>+			reg = &lt;0x0 0x2970000 0x0 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			clock-names = "ipg";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lpuart3: serial@2980000 {</div><div class='add'>+			compatible = "fsl,ls1021a-lpuart";</div><div class='add'>+			reg = &lt;0x0 0x2980000 0x0 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			clock-names = "ipg";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lpuart4: serial@2990000 {</div><div class='add'>+			compatible = "fsl,ls1021a-lpuart";</div><div class='add'>+			reg = &lt;0x0 0x2990000 0x0 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			clock-names = "ipg";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lpuart5: serial@29a0000 {</div><div class='add'>+			compatible = "fsl,ls1021a-lpuart";</div><div class='add'>+			reg = &lt;0x0 0x29a0000 0x0 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			clock-names = "ipg";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		wdog0: watchdog@2ad0000 {</div><div class='add'>+			compatible = "fsl,imx21-wdt";</div><div class='add'>+			reg = &lt;0x0 0x2ad0000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		edma0: edma@2c00000 {</div><div class='add'>+			#dma-cells = &lt;2&gt;;</div><div class='add'>+			compatible = "fsl,vf610-edma";</div><div class='add'>+			reg = &lt;0x0 0x2c00000 0x0 0x10000&gt;,</div><div class='add'>+			      &lt;0x0 0x2c10000 0x0 0x10000&gt;,</div><div class='add'>+			      &lt;0x0 0x2c20000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "edma-tx", "edma-err";</div><div class='add'>+			dma-channels = &lt;32&gt;;</div><div class='add'>+			big-endian;</div><div class='add'>+			clock-names = "dmamux0", "dmamux1";</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;,</div><div class='add'>+				 &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb0: usb@2f00000 {</div><div class='add'>+			compatible = "snps,dwc3";</div><div class='add'>+			reg = &lt;0x0 0x2f00000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			dr_mode = "host";</div><div class='add'>+			snps,quirk-frame-length-adjustment = &lt;0x20&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb1: usb@3000000 {</div><div class='add'>+			compatible = "snps,dwc3";</div><div class='add'>+			reg = &lt;0x0 0x3000000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			dr_mode = "host";</div><div class='add'>+			snps,quirk-frame-length-adjustment = &lt;0x20&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb2: usb@3100000 {</div><div class='add'>+			compatible = "snps,dwc3";</div><div class='add'>+			reg = &lt;0x0 0x3100000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			dr_mode = "host";</div><div class='add'>+			snps,quirk-frame-length-adjustment = &lt;0x20&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sata: sata@3200000 {</div><div class='add'>+			compatible = "fsl,ls1046a-ahci";</div><div class='add'>+			reg = &lt;0x0 0x3200000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;clockgen 4 1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts<br/>index b0dd010979e7..8bc1f8f6fcfc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='del'>-/include/ "fsl-ls2080a.dtsi"</div><div class='add'>+#include "fsl-ls2080a.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Freescale Layerscape 2080a QDS Board";</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts<br/>index ad0ebb8a1949..2ff46ca450b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='del'>-/include/ "fsl-ls2080a.dtsi"</div><div class='add'>+#include "fsl-ls2080a.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Freescale Layerscape 2080a RDB Board";</div><div class='hunk'>@@ -102,7 +102,6 @@</div><div class='ctx'> 		reg = &lt;0x75&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		status = "disabled";</div><div class='ctx'> 		i2c@1 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts b/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts<br/>index 505d038078a3..290604b0a603 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='del'>-/include/ "fsl-ls2080a.dtsi"</div><div class='add'>+#include "fsl-ls2080a.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Freescale Layerscape 2080a software Simulator model";</div><div class='head'>diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi<br/>index 7f0dc13b4087..e5935f28848c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi</a></div><div class='hunk'>@@ -44,6 +44,8 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;dt-bindings/thermal/thermal.h&gt;</div><div class='add'>+</div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "fsl,ls2080a";</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='hunk'>@@ -62,15 +64,16 @@</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		/* We have 4 clusters having 2 Cortex-A57 cores each */</div><div class='del'>-		cpu@0 {</div><div class='add'>+		cpu0: cpu@0 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57";</div><div class='ctx'> 			reg = &lt;0x0&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clockgen 1 0&gt;;</div><div class='ctx'> 			next-level-cache = &lt;&amp;cluster0_l2&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@1 {</div><div class='add'>+		cpu1: cpu@1 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57";</div><div class='ctx'> 			reg = &lt;0x1&gt;;</div><div class='hunk'>@@ -78,15 +81,16 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;cluster0_l2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@100 {</div><div class='add'>+		cpu2: cpu@100 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57";</div><div class='ctx'> 			reg = &lt;0x100&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clockgen 1 1&gt;;</div><div class='ctx'> 			next-level-cache = &lt;&amp;cluster1_l2&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@101 {</div><div class='add'>+		cpu3: cpu@101 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57";</div><div class='ctx'> 			reg = &lt;0x101&gt;;</div><div class='hunk'>@@ -94,15 +98,16 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;cluster1_l2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@200 {</div><div class='add'>+		cpu4: cpu@200 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57";</div><div class='ctx'> 			reg = &lt;0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clockgen 1 2&gt;;</div><div class='ctx'> 			next-level-cache = &lt;&amp;cluster2_l2&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@201 {</div><div class='add'>+		cpu5: cpu@201 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57";</div><div class='ctx'> 			reg = &lt;0x201&gt;;</div><div class='hunk'>@@ -110,15 +115,16 @@</div><div class='ctx'> 			next-level-cache = &lt;&amp;cluster2_l2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@300 {</div><div class='add'>+		cpu6: cpu@300 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57";</div><div class='ctx'> 			reg = &lt;0x300&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;clockgen 1 3&gt;;</div><div class='ctx'> 			next-level-cache = &lt;&amp;cluster3_l2&gt;;</div><div class='add'>+			#cooling-cells = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		cpu@301 {</div><div class='add'>+		cpu7: cpu@301 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a57";</div><div class='ctx'> 			reg = &lt;0x301&gt;;</div><div class='hunk'>@@ -216,6 +222,106 @@</div><div class='ctx'> 			clocks = &lt;&amp;sysclk&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		dcfg: dcfg@1e00000 {</div><div class='add'>+			compatible = "fsl,ls2080a-dcfg", "syscon";</div><div class='add'>+			reg = &lt;0x0 0x1e00000 0x0 0x10000&gt;;</div><div class='add'>+			little-endian;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tmu: tmu@1f80000 {</div><div class='add'>+			compatible = "fsl,qoriq-tmu";</div><div class='add'>+			reg = &lt;0x0 0x1f80000 0x0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;0 23 0x4&gt;;</div><div class='add'>+			fsl,tmu-range = &lt;0xb0000 0x9002a 0x6004c 0x30062&gt;;</div><div class='add'>+			fsl,tmu-calibration = &lt;0x00000000 0x00000026</div><div class='add'>+					       0x00000001 0x0000002d</div><div class='add'>+					       0x00000002 0x00000032</div><div class='add'>+					       0x00000003 0x00000039</div><div class='add'>+					       0x00000004 0x0000003f</div><div class='add'>+					       0x00000005 0x00000046</div><div class='add'>+					       0x00000006 0x0000004d</div><div class='add'>+					       0x00000007 0x00000054</div><div class='add'>+					       0x00000008 0x0000005a</div><div class='add'>+					       0x00000009 0x00000061</div><div class='add'>+					       0x0000000a 0x0000006a</div><div class='add'>+					       0x0000000b 0x00000071</div><div class='add'>+</div><div class='add'>+					       0x00010000 0x00000025</div><div class='add'>+					       0x00010001 0x0000002c</div><div class='add'>+					       0x00010002 0x00000035</div><div class='add'>+					       0x00010003 0x0000003d</div><div class='add'>+					       0x00010004 0x00000045</div><div class='add'>+					       0x00010005 0x0000004e</div><div class='add'>+					       0x00010006 0x00000057</div><div class='add'>+					       0x00010007 0x00000061</div><div class='add'>+					       0x00010008 0x0000006b</div><div class='add'>+					       0x00010009 0x00000076</div><div class='add'>+</div><div class='add'>+					       0x00020000 0x00000029</div><div class='add'>+					       0x00020001 0x00000033</div><div class='add'>+					       0x00020002 0x0000003d</div><div class='add'>+					       0x00020003 0x00000049</div><div class='add'>+					       0x00020004 0x00000056</div><div class='add'>+					       0x00020005 0x00000061</div><div class='add'>+					       0x00020006 0x0000006d</div><div class='add'>+</div><div class='add'>+					       0x00030000 0x00000021</div><div class='add'>+					       0x00030001 0x0000002a</div><div class='add'>+					       0x00030002 0x0000003c</div><div class='add'>+					       0x00030003 0x0000004e&gt;;</div><div class='add'>+			little-endian;</div><div class='add'>+			#thermal-sensor-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		thermal-zones {</div><div class='add'>+			cpu_thermal: cpu-thermal {</div><div class='add'>+				polling-delay-passive = &lt;1000&gt;;</div><div class='add'>+				polling-delay = &lt;5000&gt;;</div><div class='add'>+</div><div class='add'>+				thermal-sensors = &lt;&amp;tmu 4&gt;;</div><div class='add'>+</div><div class='add'>+				trips {</div><div class='add'>+					cpu_alert: cpu-alert {</div><div class='add'>+						temperature = &lt;75000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "passive";</div><div class='add'>+					};</div><div class='add'>+					cpu_crit: cpu-crit {</div><div class='add'>+						temperature = &lt;85000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "critical";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				cooling-maps {</div><div class='add'>+					map0 {</div><div class='add'>+						trip = &lt;&amp;cpu_alert&gt;;</div><div class='add'>+						cooling-device =</div><div class='add'>+							&lt;&amp;cpu0 THERMAL_NO_LIMIT</div><div class='add'>+							THERMAL_NO_LIMIT&gt;;</div><div class='add'>+					};</div><div class='add'>+					map1 {</div><div class='add'>+						trip = &lt;&amp;cpu_alert&gt;;</div><div class='add'>+						cooling-device =</div><div class='add'>+							&lt;&amp;cpu2 THERMAL_NO_LIMIT</div><div class='add'>+							THERMAL_NO_LIMIT&gt;;</div><div class='add'>+					};</div><div class='add'>+					map2 {</div><div class='add'>+						trip = &lt;&amp;cpu_alert&gt;;</div><div class='add'>+						cooling-device =</div><div class='add'>+							&lt;&amp;cpu4 THERMAL_NO_LIMIT</div><div class='add'>+							THERMAL_NO_LIMIT&gt;;</div><div class='add'>+					};</div><div class='add'>+					map3 {</div><div class='add'>+						trip = &lt;&amp;cpu_alert&gt;;</div><div class='add'>+						cooling-device =</div><div class='add'>+							&lt;&amp;cpu6 THERMAL_NO_LIMIT</div><div class='add'>+							THERMAL_NO_LIMIT&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		serial0: serial@21c0500 {</div><div class='ctx'> 			compatible = "fsl,ns16550", "ns16550a";</div><div class='ctx'> 			reg = &lt;0x0 0x21c0500 0x0 0x100&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/hisilicon/Makefile b/arch/arm64/boot/dts/hisilicon/Makefile<br/>index d5f43a06b1c1..c3a6c1943038 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/hisilicon/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/Makefile</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='add'>+dtb-$(CONFIG_ARCH_HISI) += hi3660-hikey960.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_HISI) += hi6220-hikey.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_HISI) += hip05-d02.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_HISI) += hip06-d03.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_HISI) += hip07-d05.dtb</div><div class='ctx'> </div><div class='ctx'> always		:= $(dtb-y)</div><div class='ctx'> subdir-y	:= $(dts-dirs)</div><div class='head'>diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts<br/>new file mode 100644<br/>index 000000000000..ff37f0a0aa93<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/*</div><div class='add'>+ * dts file for Hisilicon HiKey960 Development Board</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016, Hisilicon Ltd.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "hi3660.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "HiKey960";</div><div class='add'>+	compatible = "hisilicon,hi3660";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial5 = &amp;uart5;       /* console UART */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial5:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@0 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		/* rewrite this at bootloader */</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart5 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi<br/>new file mode 100644<br/>index 000000000000..3983086bd67b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/hi3660.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hi3660.dtsi</a></div><div class='hunk'>@@ -0,0 +1,160 @@</div><div class='add'>+/*</div><div class='add'>+ * dts file for Hisilicon Hi3660 SoC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016, Hisilicon Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "hisilicon,hi3660";</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-0.2";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu-map {</div><div class='add'>+			cluster0 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu0&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu1&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu2&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu3&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+			cluster1 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu4&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu5&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu6&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu7&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@0 {</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0 0x0&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu1: cpu@1 {</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0 0x1&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu2: cpu@2 {</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0 0x2&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu3: cpu@3 {</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0 0x3&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu4: cpu@100 {</div><div class='add'>+			compatible = "arm,cortex-a73", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0 0x100&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu5: cpu@101 {</div><div class='add'>+			compatible = "arm,cortex-a73", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0 0x101&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu6: cpu@102 {</div><div class='add'>+			compatible = "arm,cortex-a73", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0 0x102&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu7: cpu@103 {</div><div class='add'>+			compatible = "arm,cortex-a73", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0 0x103&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gic: interrupt-controller@e82b0000 {</div><div class='add'>+		compatible = "arm,gic-400";</div><div class='add'>+		reg = &lt;0x0 0xe82b1000 0 0x1000&gt;, /* GICD */</div><div class='add'>+		      &lt;0x0 0xe82b2000 0 0x2000&gt;, /* GICC */</div><div class='add'>+		      &lt;0x0 0xe82b4000 0 0x2000&gt;, /* GICH */</div><div class='add'>+		      &lt;0x0 0xe82b6000 0 0x2000&gt;; /* GICV */</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;3&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		interrupts = &lt;GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(8) |</div><div class='add'>+					 IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "arm,armv8-timer";</div><div class='add'>+		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+		interrupts = &lt;GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(8) |</div><div class='add'>+					  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) |</div><div class='add'>+					  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) |</div><div class='add'>+					  IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(8) |</div><div class='add'>+					  IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		fixed_uart5: fixed_19_2M {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;19200000&gt;;</div><div class='add'>+			clock-output-names = "fixed:uart5";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart5: uart@fdf05000 {</div><div class='add'>+			compatible = "arm,pl011", "arm,primecell";</div><div class='add'>+			reg = &lt;0x0 0xfdf05000 0x0 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;fixed_uart5 &amp;fixed_uart5&gt;;</div><div class='add'>+			clock-names = "uartclk", "apb_pclk";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi<br/>index 17839db585d5..470461ddd427 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/hi6220.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/hisilicon/hi6220.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/hi6220.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hi6220.dtsi</a></div><div class='hunk'>@@ -364,6 +364,7 @@</div><div class='ctx'> 			reg = &lt;0x0 0xf7010000  0x0 0x27c&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 			#gpio-range-cells = &lt;3&gt;;</div><div class='ctx'> 			pinctrl-single,register-width = &lt;32&gt;;</div><div class='ctx'> 			pinctrl-single,function-mask = &lt;7&gt;;</div><div class='hunk'>@@ -402,6 +403,7 @@</div><div class='ctx'> 			reg = &lt;0x0 0xf7010800 0x0 0x28c&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 			pinctrl-single,register-width = &lt;32&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -410,6 +412,7 @@</div><div class='ctx'> 			reg = &lt;0x0 0xf8001800 0x0 0x78&gt;;</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='add'>+			#pinctrl-cells = &lt;1&gt;;</div><div class='ctx'> 			pinctrl-single,register-width = &lt;32&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -747,7 +750,6 @@</div><div class='ctx'> 			clocks = &lt;&amp;sys_ctrl HI6220_USBOTG_HCLK&gt;;</div><div class='ctx'> 			clock-names = "otg";</div><div class='ctx'> 			dr_mode = "otg";</div><div class='del'>-			g-use-dma;</div><div class='ctx'> 			g-rx-fifo-size = &lt;512&gt;;</div><div class='ctx'> 			g-np-tx-fifo-size = &lt;128&gt;;</div><div class='ctx'> 			g-tx-fifo-size = &lt;128 128 128 128 128 128&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/hisilicon/hip06-d03.dts b/arch/arm64/boot/dts/hisilicon/hip06-d03.dts<br/>index f54b28359607..7c4114a67753 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/hip06-d03.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/hisilicon/hip06-d03.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/hip06-d03.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hip06-d03.dts</a></div><div class='hunk'>@@ -41,18 +41,10 @@</div><div class='ctx'> 	status = "ok";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;sas0 {</div><div class='del'>-	status = "ok";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;sas1 {</div><div class='ctx'> 	status = "ok";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;sas2 {</div><div class='del'>-	status = "ok";</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> &amp;usb_ohci {</div><div class='ctx'> 	status = "ok";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/hisilicon/hip06.dtsi b/arch/arm64/boot/dts/hisilicon/hip06.dtsi<br/>index b548763366dd..a049b64f2101 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/hip06.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/hisilicon/hip06.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/hip06.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hip06.dtsi</a></div><div class='hunk'>@@ -318,11 +318,17 @@</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		ranges;</div><div class='ctx'> </div><div class='add'>+		refclk: refclk {</div><div class='add'>+			compatible = "fixed-clock";</div><div class='add'>+			clock-frequency = &lt;50000000&gt;;</div><div class='add'>+			#clock-cells = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		usb_ohci: ohci@a7030000 {</div><div class='ctx'> 			compatible = "generic-ohci";</div><div class='ctx'> 			reg = &lt;0x0 0xa7030000 0x0 0x10000&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;mbigen_usb&gt;;</div><div class='del'>-			interrupts = &lt;64 4&gt;;</div><div class='add'>+			interrupts = &lt;640 4&gt;;</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -331,7 +337,7 @@</div><div class='ctx'> 			compatible = "generic-ehci";</div><div class='ctx'> 			reg = &lt;0x0 0xa7020000 0x0 0x10000&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;mbigen_usb&gt;;</div><div class='del'>-			interrupts = &lt;65 4&gt;;</div><div class='add'>+			interrupts = &lt;641 4&gt;;</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -508,7 +514,7 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		eth0: ethernet@4{</div><div class='add'>+		eth0: ethernet-4{</div><div class='ctx'> 			compatible = "hisilicon,hns-nic-v2";</div><div class='ctx'> 			ae-handle = &lt;&amp;dsaf0&gt;;</div><div class='ctx'> 			port-idx-in-ae = &lt;4&gt;;</div><div class='hunk'>@@ -517,7 +523,7 @@</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		eth1: ethernet@5{</div><div class='add'>+		eth1: ethernet-5{</div><div class='ctx'> 			compatible = "hisilicon,hns-nic-v2";</div><div class='ctx'> 			ae-handle = &lt;&amp;dsaf0&gt;;</div><div class='ctx'> 			port-idx-in-ae = &lt;5&gt;;</div><div class='hunk'>@@ -526,7 +532,7 @@</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		eth2: ethernet@0{</div><div class='add'>+		eth2: ethernet-0{</div><div class='ctx'> 			compatible = "hisilicon,hns-nic-v2";</div><div class='ctx'> 			ae-handle = &lt;&amp;dsaf0&gt;;</div><div class='ctx'> 			port-idx-in-ae = &lt;0&gt;;</div><div class='hunk'>@@ -535,7 +541,7 @@</div><div class='ctx'> 			dma-coherent;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		eth3: ethernet@1{</div><div class='add'>+		eth3: ethernet-1{</div><div class='ctx'> 			compatible = "hisilicon,hns-nic-v2";</div><div class='ctx'> 			ae-handle = &lt;&amp;dsaf0&gt;;</div><div class='ctx'> 			port-idx-in-ae = &lt;1&gt;;</div><div class='hunk'>@@ -552,6 +558,7 @@</div><div class='ctx'> 			ctrl-reset-reg = &lt;0xa60&gt;;</div><div class='ctx'> 			ctrl-reset-sts-reg = &lt;0x5a30&gt;;</div><div class='ctx'> 			ctrl-clock-ena-reg = &lt;0x338&gt;;</div><div class='add'>+			clocks = &lt;&amp;refclk 0&gt;;</div><div class='ctx'> 			queue-count = &lt;16&gt;;</div><div class='ctx'> 			phy-count = &lt;8&gt;;</div><div class='ctx'> 			dma-coherent;</div><div class='hunk'>@@ -590,10 +597,11 @@</div><div class='ctx'> 			reg = &lt;0 0xa2000000 0 0x10000&gt;;</div><div class='ctx'> 			sas-addr = [50 01 88 20 16 00 00 00];</div><div class='ctx'> 			hisilicon,sas-syscon = &lt;&amp;pcie_subctl&gt;;</div><div class='del'>-			am-max-trans;</div><div class='add'>+			hip06-sas-v2-quirk-amt;</div><div class='ctx'> 			ctrl-reset-reg = &lt;0xa18&gt;;</div><div class='ctx'> 			ctrl-reset-sts-reg = &lt;0x5a0c&gt;;</div><div class='ctx'> 			ctrl-clock-ena-reg = &lt;0x318&gt;;</div><div class='add'>+			clocks = &lt;&amp;refclk 0&gt;;</div><div class='ctx'> 			queue-count = &lt;16&gt;;</div><div class='ctx'> 			phy-count = &lt;8&gt;;</div><div class='ctx'> 			dma-coherent;</div><div class='hunk'>@@ -635,6 +643,7 @@</div><div class='ctx'> 			ctrl-reset-reg = &lt;0xae0&gt;;</div><div class='ctx'> 			ctrl-reset-sts-reg = &lt;0x5a70&gt;;</div><div class='ctx'> 			ctrl-clock-ena-reg = &lt;0x3a8&gt;;</div><div class='add'>+			clocks = &lt;&amp;refclk 0&gt;;</div><div class='ctx'> 			queue-count = &lt;16&gt;;</div><div class='ctx'> 			phy-count = &lt;9&gt;;</div><div class='ctx'> 			dma-coherent;</div><div class='head'>diff --git a/arch/arm64/boot/dts/hisilicon/hip07-d05.dts b/arch/arm64/boot/dts/hisilicon/hip07-d05.dts<br/>new file mode 100644<br/>index 000000000000..e05844230583<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/hip07-d05.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hip07-d05.dts</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/**</div><div class='add'>+ * dts file for Hisilicon D05 Development Board</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Hisilicon Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * publishhed by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "hip07.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Hisilicon Hip07 D05 Development Board";</div><div class='add'>+	compatible = "hisilicon,hip07-d05";</div><div class='add'>+</div><div class='add'>+	/* the mem node will be updated by UEFI. */</div><div class='add'>+	memory@0 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x00000000 0x0 0x40000000&gt;;</div><div class='add'>+		numa-node-id = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	distance-map {</div><div class='add'>+		compatible = "numa-distance-map-v1";</div><div class='add'>+		distance-matrix = &lt;0 0 10&gt;,</div><div class='add'>+				  &lt;0 1 15&gt;,</div><div class='add'>+				  &lt;0 2 20&gt;,</div><div class='add'>+				  &lt;0 3 25&gt;,</div><div class='add'>+				  &lt;1 0 15&gt;,</div><div class='add'>+				  &lt;1 1 10&gt;,</div><div class='add'>+				  &lt;1 2 25&gt;,</div><div class='add'>+				  &lt;1 3 30&gt;,</div><div class='add'>+				  &lt;2 0 20&gt;,</div><div class='add'>+				  &lt;2 1 25&gt;,</div><div class='add'>+				  &lt;2 2 10&gt;,</div><div class='add'>+				  &lt;2 3 15&gt;,</div><div class='add'>+				  &lt;3 0 25&gt;,</div><div class='add'>+				  &lt;3 1 30&gt;,</div><div class='add'>+				  &lt;3 2 15&gt;,</div><div class='add'>+				  &lt;3 3 10&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_ohci {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_ehci {</div><div class='add'>+	status = "ok";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/hisilicon/hip07.dtsi b/arch/arm64/boot/dts/hisilicon/hip07.dtsi<br/>new file mode 100644<br/>index 000000000000..5144eb1c179d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/hisilicon/hip07.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/hisilicon/hip07.dtsi</a></div><div class='hunk'>@@ -0,0 +1,1059 @@</div><div class='add'>+/**</div><div class='add'>+ * dts file for Hisilicon D05 Development Board</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Hisilicon Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * publishhed by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "hisilicon,hip07-d05";</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-0.2";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu-map {</div><div class='add'>+			cluster0 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu0&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu1&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu2&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu3&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster1 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu4&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu5&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu6&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu7&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster2 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu8&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu9&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu10&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu11&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster3 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu12&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu13&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu14&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu15&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster4 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu16&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu17&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu18&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu19&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster5 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu20&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu21&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu22&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu23&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster6 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu24&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu25&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu26&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu27&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster7 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu28&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu29&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu30&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu31&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster8 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu32&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu33&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu34&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu35&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster9 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu36&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu37&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu38&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu39&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster10 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu40&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu41&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu42&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu43&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster11 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu44&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu45&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu46&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu47&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster12 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu48&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu49&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu50&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu51&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster13 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu52&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu53&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu54&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu55&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster14 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu56&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu57&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu58&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu59&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			cluster15 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;cpu60&gt;;</div><div class='add'>+				};</div><div class='add'>+				core1 {</div><div class='add'>+					cpu = &lt;&amp;cpu61&gt;;</div><div class='add'>+				};</div><div class='add'>+				core2 {</div><div class='add'>+					cpu = &lt;&amp;cpu62&gt;;</div><div class='add'>+				};</div><div class='add'>+				core3 {</div><div class='add'>+					cpu = &lt;&amp;cpu63&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@10000 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10000&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster0_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu1: cpu@10001 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10001&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster0_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu2: cpu@10002 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10002&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster0_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu3: cpu@10003 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10003&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster0_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu4: cpu@10100 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10100&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster1_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu5: cpu@10101 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10101&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster1_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu6: cpu@10102 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10102&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster1_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu7: cpu@10103 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10103&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster1_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu8: cpu@10200 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10200&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster2_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu9: cpu@10201 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10201&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster2_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu10: cpu@10202 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10202&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster2_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu11: cpu@10203 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10203&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster2_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu12: cpu@10300 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10300&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster3_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu13: cpu@10301 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10301&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster3_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu14: cpu@10302 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10302&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster3_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu15: cpu@10303 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x10303&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster3_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu16: cpu@30000 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30000&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster4_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu17: cpu@30001 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30001&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster4_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu18: cpu@30002 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30002&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster4_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu19: cpu@30003 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30003&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster4_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu20: cpu@30100 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30100&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster5_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu21: cpu@30101 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30101&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster5_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu22: cpu@30102 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30102&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster5_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu23: cpu@30103 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30103&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster5_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu24: cpu@30200 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30200&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster6_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu25: cpu@30201 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30201&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster6_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu26: cpu@30202 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30202&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster6_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu27: cpu@30203 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30203&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster6_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu28: cpu@30300 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30300&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster7_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu29: cpu@30301 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30301&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster7_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu30: cpu@30302 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30302&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster7_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu31: cpu@30303 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x30303&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster7_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu32: cpu@50000 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50000&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster8_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu33: cpu@50001 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50001&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster8_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu34: cpu@50002 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50002&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster8_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu35: cpu@50003 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50003&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster8_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu36: cpu@50100 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50100&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster9_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu37: cpu@50101 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50101&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster9_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu38: cpu@50102 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50102&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster9_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu39: cpu@50103 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50103&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster9_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu40: cpu@50200 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50200&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster10_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu41: cpu@50201 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50201&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster10_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu42: cpu@50202 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50202&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster10_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu43: cpu@50203 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50203&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster10_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu44: cpu@50300 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50300&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster11_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu45: cpu@50301 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50301&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster11_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu46: cpu@50302 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50302&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster11_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu47: cpu@50303 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x50303&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster11_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu48: cpu@70000 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70000&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster12_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu49: cpu@70001 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70001&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster12_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu50: cpu@70002 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70002&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster12_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu51: cpu@70003 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70003&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster12_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu52: cpu@70100 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70100&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster13_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu53: cpu@70101 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70101&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster13_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu54: cpu@70102 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70102&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster13_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu55: cpu@70103 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70103&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster13_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu56: cpu@70200 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70200&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster14_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu57: cpu@70201 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70201&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster14_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu58: cpu@70202 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70202&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster14_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu59: cpu@70203 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70203&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster14_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu60: cpu@70300 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70300&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster15_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu61: cpu@70301 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70301&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster15_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu62: cpu@70302 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70302&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster15_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu63: cpu@70303 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='add'>+			reg = &lt;0x70303&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			next-level-cache = &lt;&amp;cluster15_l2&gt;;</div><div class='add'>+			numa-node-id = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster0_l2: l2-cache0 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster1_l2: l2-cache1 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster2_l2: l2-cache2 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster3_l2: l2-cache3 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster4_l2: l2-cache4 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster5_l2: l2-cache5 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster6_l2: l2-cache6 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster7_l2: l2-cache7 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster8_l2: l2-cache8 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster9_l2: l2-cache9 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster10_l2: l2-cache10 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster11_l2: l2-cache11 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster12_l2: l2-cache12 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster13_l2: l2-cache13 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster14_l2: l2-cache14 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cluster15_l2: l2-cache15 {</div><div class='add'>+			compatible = "cache";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gic: interrupt-controller@4d000000 {</div><div class='add'>+		compatible = "arm,gic-v3";</div><div class='add'>+		#interrupt-cells = &lt;3&gt;;</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#redistributor-regions = &lt;4&gt;;</div><div class='add'>+		redistributor-stride = &lt;0x0 0x40000&gt;;</div><div class='add'>+		reg = &lt;0x0 0x4d000000 0x0 0x10000&gt;,	/* GICD */</div><div class='add'>+		      &lt;0x0 0x4d100000 0x0 0x400000&gt;,	/* p0 GICR node 0 */</div><div class='add'>+		      &lt;0x0 0x6d100000 0x0 0x400000&gt;,	/* p0 GICR node 1 */</div><div class='add'>+		      &lt;0x400 0x4d100000 0x0 0x400000&gt;,	/* p1 GICR node 2 */</div><div class='add'>+		      &lt;0x400 0x6d100000 0x0 0x400000&gt;,	/* p1 GICR node 3 */</div><div class='add'>+		      &lt;0x0 0xfe000000 0x0 0x10000&gt;,	/* GICC */</div><div class='add'>+		      &lt;0x0 0xfe010000 0x0 0x10000&gt;,	/* GICH */</div><div class='add'>+		      &lt;0x0 0xfe020000 0x0 0x10000&gt;;	/* GICV */</div><div class='add'>+		interrupts = &lt;GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		p0_its_peri_a: interrupt-controller@4c000000 {</div><div class='add'>+			compatible = "arm,gic-v3-its";</div><div class='add'>+			msi-controller;</div><div class='add'>+			#msi-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x0 0x4c000000 0x0 0x40000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		p0_its_peri_b: interrupt-controller@6c000000 {</div><div class='add'>+			compatible = "arm,gic-v3-its";</div><div class='add'>+			msi-controller;</div><div class='add'>+			#msi-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x0 0x6c000000 0x0 0x40000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		p0_its_dsa_a: interrupt-controller@c6000000 {</div><div class='add'>+			compatible = "arm,gic-v3-its";</div><div class='add'>+			msi-controller;</div><div class='add'>+			#msi-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x0 0xc6000000 0x0 0x40000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		p0_its_dsa_b: interrupt-controller@8,c6000000 {</div><div class='add'>+			compatible = "arm,gic-v3-its";</div><div class='add'>+			msi-controller;</div><div class='add'>+			#msi-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x8 0xc6000000 0x0 0x40000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		p1_its_peri_a: interrupt-controller@400,4c000000 {</div><div class='add'>+			compatible = "arm,gic-v3-its";</div><div class='add'>+			msi-controller;</div><div class='add'>+			#msi-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x400 0x4c000000 0x0 0x40000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		p1_its_peri_b: interrupt-controller@400,6c000000 {</div><div class='add'>+			compatible = "arm,gic-v3-its";</div><div class='add'>+			msi-controller;</div><div class='add'>+			#msi-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x400 0x6c000000 0x0 0x40000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		p1_its_dsa_a: interrupt-controller@400,c6000000 {</div><div class='add'>+			compatible = "arm,gic-v3-its";</div><div class='add'>+			msi-controller;</div><div class='add'>+			#msi-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x400 0xc6000000 0x0 0x40000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		p1_its_dsa_b: interrupt-controller@408,c6000000 {</div><div class='add'>+			compatible = "arm,gic-v3-its";</div><div class='add'>+			msi-controller;</div><div class='add'>+			#msi-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x408 0xc6000000 0x0 0x40000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "arm,armv8-timer";</div><div class='add'>+		interrupts = &lt;GIC_PPI 13 IRQ_TYPE_LEVEL_LOW&gt;,</div><div class='add'>+			     &lt;GIC_PPI 14 IRQ_TYPE_LEVEL_LOW&gt;,</div><div class='add'>+			     &lt;GIC_PPI 11 IRQ_TYPE_LEVEL_LOW&gt;,</div><div class='add'>+			     &lt;GIC_PPI 10 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmu {</div><div class='add'>+		compatible = "arm,cortex-a72-pmu";</div><div class='add'>+		interrupts = &lt;GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	p0_mbigen_peri_b: interrupt-controller@60080000 {</div><div class='add'>+		compatible = "hisilicon,mbigen-v2";</div><div class='add'>+		reg = &lt;0x0 0x60080000 0x0 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+		mbigen_uart: uart_intc {</div><div class='add'>+			msi-parent = &lt;&amp;p0_its_peri_b 0x120c7&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+			num-pins = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	p0_mbigen_pcie_a: interrupt-controller@a0080000 {</div><div class='add'>+		compatible = "hisilicon,mbigen-v2";</div><div class='add'>+		reg = &lt;0x0 0xa0080000 0x0 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+		mbigen_usb: intc_usb {</div><div class='add'>+			msi-parent = &lt;&amp;p0_its_dsa_a 0x40080&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+			num-pins = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		uart0: uart@602b0000 {</div><div class='add'>+			compatible = "arm,sbsa-uart";</div><div class='add'>+			reg = &lt;0x0 0x602b0000 0x0 0x1000&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;mbigen_uart&gt;;</div><div class='add'>+			interrupts = &lt;807 4&gt;;</div><div class='add'>+			current-speed = &lt;115200&gt;;</div><div class='add'>+			reg-io-width = &lt;4&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb_ohci: ohci@a7030000 {</div><div class='add'>+			compatible = "generic-ohci";</div><div class='add'>+			reg = &lt;0x0 0xa7030000 0x0 0x10000&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;mbigen_usb&gt;;</div><div class='add'>+			interrupts = &lt;640 4&gt;;</div><div class='add'>+			dma-coherent;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb_ehci: ehci@a7020000 {</div><div class='add'>+			compatible = "generic-ehci";</div><div class='add'>+			reg = &lt;0x0 0xa7020000 0x0 0x10000&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;mbigen_usb&gt;;</div><div class='add'>+			interrupts = &lt;641 4&gt;;</div><div class='add'>+			dma-coherent;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile<br/>index cf3953124cef..3e6ce6c15a74 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/marvell/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/Makefile</a></div><div class='hunk'>@@ -4,8 +4,10 @@ dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-stb.dtb</div><div class='ctx'> </div><div class='ctx'> # Mvebu SoC Family</div><div class='ctx'> dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb</div><div class='ctx'> </div><div class='ctx'> always		:= $(dtb-y)</div><div class='ctx'> subdir-y	:= $(dts-dirs)</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/armada-371x.dtsi b/arch/arm64/boot/dts/marvell/armada-371x.dtsi<br/>index c9e5325b8ac3..11226f7b9ed9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-371x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/marvell/armada-371x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-371x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-371x.dtsi</a></div><div class='hunk'>@@ -16,17 +16,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -35,11 +35,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts<br/>index 1372e9a6aaa4..86602c907a61 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-3720-db.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/marvell/armada-3720-db.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-3720-db.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-3720-db.dts</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -56,17 +56,51 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x00000000 0x00000000 0x20000000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* CON3 */</div><div class='ctx'> &amp;sata {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;spi0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	m25p80@0 {</div><div class='add'>+		compatible = "jedec,spi-nor";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;108000000&gt;;</div><div class='add'>+		spi-rx-bus-width = &lt;4&gt;;</div><div class='add'>+		spi-tx-bus-width = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+		partitions {</div><div class='add'>+			compatible = "fixed-partitions";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			partition@0 {</div><div class='add'>+				label = "bootloader";</div><div class='add'>+				reg = &lt;0x0 0x200000&gt;;</div><div class='add'>+			};</div><div class='add'>+			partition@200000 {</div><div class='add'>+				label = "U-boot Env";</div><div class='add'>+				reg = &lt;0x200000 0x10000&gt;;</div><div class='add'>+			};</div><div class='add'>+			partition@210000 {</div><div class='add'>+				label = "Linux";</div><div class='add'>+				reg = &lt;0x210000 0xDF0000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Exported on the micro USB connector CON32 through an FTDI */</div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	status = "okay";</div><div class='hunk'>@@ -81,3 +115,26 @@</div><div class='ctx'> &amp;pcie0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	status = "okay";</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	phy1: ethernet-phy@1 {</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;eth0 {</div><div class='add'>+	phy-mode = "rgmii-id";</div><div class='add'>+	phy = &lt;&amp;phy0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;eth1 {</div><div class='add'>+	phy-mode = "sgmii";</div><div class='add'>+	phy = &lt;&amp;phy1&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts<br/>new file mode 100644<br/>index 000000000000..e3a136ed77b0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts</a></div><div class='hunk'>@@ -0,0 +1,148 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree file for Globalscale Marvell ESPRESSOBin Board</div><div class='add'>+ * Copyright (C) 2016 Marvell</div><div class='add'>+ *</div><div class='add'>+ * Romain Perier &lt;romain.perier@free-electrons.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "armada-372x.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Globalscale Marvell ESPRESSOBin Board";</div><div class='add'>+	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@0 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x00000000 0x00000000 0x00000000 0x20000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* J9 */</div><div class='add'>+&amp;pcie0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* J6 */</div><div class='add'>+&amp;sata {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Exported on the micro USB connector J5 through an FTDI */</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* J7 */</div><div class='add'>+&amp;usb3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mdio {</div><div class='add'>+	switch0: switch0@1 {</div><div class='add'>+		compatible = "marvell,mv88e6085";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		dsa,member = &lt;0 0&gt;;</div><div class='add'>+</div><div class='add'>+		ports {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			port@0 {</div><div class='add'>+				reg = &lt;0&gt;;</div><div class='add'>+				label = "cpu";</div><div class='add'>+				ethernet = &lt;&amp;eth0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@1 {</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				label = "wan";</div><div class='add'>+				phy-handle = &lt;&amp;switch0phy0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@2 {</div><div class='add'>+				reg = &lt;2&gt;;</div><div class='add'>+				label = "lan0";</div><div class='add'>+				phy-handle = &lt;&amp;switch0phy1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			port@3 {</div><div class='add'>+				reg = &lt;3&gt;;</div><div class='add'>+				label = "lan1";</div><div class='add'>+				phy-handle = &lt;&amp;switch0phy2&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mdio {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+			switch0phy0: switch0phy0@11 {</div><div class='add'>+				reg = &lt;0x11&gt;;</div><div class='add'>+			};</div><div class='add'>+			switch0phy1: switch0phy1@12 {</div><div class='add'>+				reg = &lt;0x12&gt;;</div><div class='add'>+			};</div><div class='add'>+			switch0phy2: switch0phy2@13 {</div><div class='add'>+				reg = &lt;0x13&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;eth0 {</div><div class='add'>+	phy-mode = "rgmii-id";</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	fixed-link {</div><div class='add'>+		speed = &lt;1000&gt;;</div><div class='add'>+		full-duplex;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi<br/>index 5120296596c2..59d7557d3b1b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-372x.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/marvell/armada-372x.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-372x.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-372x.dtsi</a></div><div class='hunk'>@@ -16,17 +16,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -35,11 +35,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi<br/>index e9bd58793464..b48d668a6ab6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-37xx.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/marvell/armada-37xx.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-37xx.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-37xx.dtsi</a></div><div class='hunk'>@@ -15,17 +15,17 @@</div><div class='ctx'>  *     published by the Free Software Foundation; either version 2 of the</div><div class='ctx'>  *     License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- *     This file is distributed in the hope that it will be useful</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='ctx'>  *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  *     GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- * Or, alternatively</div><div class='add'>+ * Or, alternatively,</div><div class='ctx'>  *</div><div class='ctx'>  *  b) Permission is hereby granted, free of charge, to any person</div><div class='ctx'>  *     obtaining a copy of this software and associated documentation</div><div class='ctx'>  *     files (the "Software"), to deal in the Software without</div><div class='del'>- *     restriction, including without limitation the rights to use</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='ctx'>  *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='ctx'>  *     sell copies of the Software, and to permit persons to whom the</div><div class='ctx'>  *     Software is furnished to do so, subject to the following</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  *     The above copyright notice and this permission notice shall be</div><div class='ctx'>  *     included in all copies or substantial portions of the Software.</div><div class='ctx'>  *</div><div class='del'>- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='ctx'>  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='ctx'>  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='ctx'>  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='del'>- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='ctx'>  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='ctx'>  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='hunk'>@@ -91,13 +91,42 @@</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		ranges;</div><div class='ctx'> </div><div class='del'>-		internal-regs {</div><div class='add'>+		internal-regs@d0000000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "simple-bus";</div><div class='ctx'> 			/* 32M internal register @ 0xd000_0000 */</div><div class='ctx'> 			ranges = &lt;0x0 0x0 0xd0000000 0x2000000&gt;;</div><div class='ctx'> </div><div class='add'>+			spi0: spi@10600 {</div><div class='add'>+				compatible = "marvell,armada-3700-spi";</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				reg = &lt;0x10600 0xA00&gt;;</div><div class='add'>+				clocks = &lt;&amp;nb_periph_clk 7&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				num-cs = &lt;4&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c0: i2c@11000 {</div><div class='add'>+				compatible = "marvell,armada-3700-i2c";</div><div class='add'>+				reg = &lt;0x11000 0x24&gt;;</div><div class='add'>+				clocks = &lt;&amp;nb_periph_clk 10&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				mrvl,i2c-fast-mode;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			i2c1: i2c@11080 {</div><div class='add'>+				compatible = "marvell,armada-3700-i2c";</div><div class='add'>+				reg = &lt;0x11080 0x24&gt;;</div><div class='add'>+				clocks = &lt;&amp;nb_periph_clk 9&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				mrvl,i2c-fast-mode;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			uart0: serial@12000 {</div><div class='ctx'> 				compatible = "marvell,armada-3700-uart";</div><div class='ctx'> 				reg = &lt;0x12000 0x400&gt;;</div><div class='hunk'>@@ -140,6 +169,29 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			eth0: ethernet@30000 {</div><div class='add'>+				   compatible = "marvell,armada-3700-neta";</div><div class='add'>+				   reg = &lt;0x30000 0x4000&gt;;</div><div class='add'>+				   interrupts = &lt;GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				   clocks = &lt;&amp;sb_periph_clk 8&gt;;</div><div class='add'>+				   status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mdio: mdio@32004 {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				compatible = "marvell,orion-mdio";</div><div class='add'>+				reg = &lt;0x32004 0x4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			eth1: ethernet@40000 {</div><div class='add'>+				compatible = "marvell,armada-3700-neta";</div><div class='add'>+				reg = &lt;0x40000 0x4000&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;sb_periph_clk 7&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			usb3: usb@58000 {</div><div class='ctx'> 				compatible = "marvell,armada3700-xhci",</div><div class='ctx'> 				"generic-xhci";</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts<br/>new file mode 100644<br/>index 000000000000..f7bb0cc03147<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts</a></div><div class='hunk'>@@ -0,0 +1,138 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Marvell Technology Group Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPLv2 or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This library is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This library is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Device Tree file for MACCHIATOBin Armada 8040 community board platform</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "armada-8040.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Marvell 8040 MACHIATOBin";</div><div class='add'>+	compatible = "marvell,armada8040-mcbin", "marvell,armada8040",</div><div class='add'>+			"marvell,armada-ap806-quad", "marvell,armada-ap806";</div><div class='add'>+</div><div class='add'>+	memory@00000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x80000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Regulator labels correspond with schematics */</div><div class='add'>+	v_3_3: regulator-3-3v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "v_3_3";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	v_vddo_h: regulator-1-8v {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "v_vddo_h";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	v_5v0_usb3_hst_vbus: regulator-usb3-vbus0 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "v_5v0_usb3_hst_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		/* actually GPIO controlled, but 8k has no GPIO support yet */</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb3h0_phy: usb3_phy0 {</div><div class='add'>+		compatible = "usb-nop-xceiv";</div><div class='add'>+		vcc-supply = &lt;&amp;v_5v0_usb3_hst_vbus&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpm_i2c0 {</div><div class='add'>+	clock-frequency = &lt;100000&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpm_sata0 {</div><div class='add'>+	/* CPM Lane 0 - U29 */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpm_usb3_0 {</div><div class='add'>+	/* J38? - USB2.0 only */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cpm_usb3_1 {</div><div class='add'>+	/* J38? - USB2.0 only */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cps_sata0 {</div><div class='add'>+	/* CPS Lane 1 - U32 */</div><div class='add'>+	/* CPS Lane 3 - U31 */</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cps_spi1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	spi-flash@0 {</div><div class='add'>+		compatible = "st,w25q32";</div><div class='add'>+		spi-max-frequency = &lt;50000000&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;cps_usb3_0 {</div><div class='add'>+	/* CPS Lane 2 - CON7 */</div><div class='add'>+	usb-phy = &lt;&amp;usb3h0_phy&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi<br/>index 7b6136182ad0..a749ba2edec4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-ap806.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/marvell/armada-ap806.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-ap806.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-ap806.dtsi</a></div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 		ranges;</div><div class='ctx'> </div><div class='del'>-		config-space {</div><div class='add'>+		config-space@f0000000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "simple-bus";</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi<br/>index 602e2c2e9a4d..3a99c36433d6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 		ranges;</div><div class='ctx'> </div><div class='del'>-		config-space {</div><div class='add'>+		config-space@f2000000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "simple-bus";</div><div class='hunk'>@@ -74,13 +74,14 @@</div><div class='ctx'> 					"cpm-gop-dp", "none", "cpm-pcie_x10",</div><div class='ctx'> 					"cpm-pcie_x11", "cpm-pcie_x4", "cpm-pcie-xor",</div><div class='ctx'> 					"cpm-sata", "cpm-sata-usb", "cpm-main",</div><div class='del'>-					"cpm-sd-mmc", "none", "none",</div><div class='add'>+					"cpm-sd-mmc-gop", "none", "none",</div><div class='ctx'> 					"cpm-slow-io", "cpm-usb3h0", "cpm-usb3h1",</div><div class='ctx'> 					"cpm-usb3dev", "cpm-eip150", "cpm-eip197";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			cpm_sata0: sata@540000 {</div><div class='del'>-				compatible = "marvell,armada-8k-ahci";</div><div class='add'>+				compatible = "marvell,armada-8k-ahci",</div><div class='add'>+					     "generic-ahci";</div><div class='ctx'> 				reg = &lt;0x540000 0x30000&gt;;</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;cpm_syscon0 1 15&gt;;</div><div class='hunk'>@@ -164,6 +165,14 @@</div><div class='ctx'> 				clocks = &lt;&amp;cpm_syscon0 1 21&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			cpm_trng: trng@760000 {</div><div class='add'>+				compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76";</div><div class='add'>+				reg = &lt;0x760000 0x7d&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;cpm_syscon0 1 25&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpm_pcie0: pcie@f2600000 {</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi<br/>index 6bf9e241179b..9e09c4d3b6bd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 		ranges;</div><div class='ctx'> </div><div class='del'>-		config-space {</div><div class='add'>+		config-space@f4000000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='ctx'> 			compatible = "simple-bus";</div><div class='hunk'>@@ -74,13 +74,14 @@</div><div class='ctx'> 					"cps-gop-dp", "none", "cps-pcie_x10",</div><div class='ctx'> 					"cps-pcie_x11", "cps-pcie_x4", "cps-pcie-xor",</div><div class='ctx'> 					"cps-sata", "cps-sata-usb", "cps-main",</div><div class='del'>-					"cps-sd-mmc", "none", "none",</div><div class='add'>+					"cps-sd-mmc-gop", "none", "none",</div><div class='ctx'> 					"cps-slow-io", "cps-usb3h0", "cps-usb3h1",</div><div class='ctx'> 					"cps-usb3dev", "cps-eip150", "cps-eip197";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			cps_sata0: sata@540000 {</div><div class='del'>-				compatible = "marvell,armada-8k-ahci";</div><div class='add'>+				compatible = "marvell,armada-8k-ahci",</div><div class='add'>+					     "generic-ahci";</div><div class='ctx'> 				reg = &lt;0x540000 0x30000&gt;;</div><div class='ctx'> 				interrupts = &lt;GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 				clocks = &lt;&amp;cps_syscon0 1 15&gt;;</div><div class='hunk'>@@ -164,6 +165,14 @@</div><div class='ctx'> 				clocks = &lt;&amp;cps_syscon0 1 21&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			cps_trng: trng@760000 {</div><div class='add'>+				compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76";</div><div class='add'>+				reg = &lt;0x760000 0x7d&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				clocks = &lt;&amp;cps_syscon0 1 25&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cps_pcie0: pcie@f4600000 {</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts b/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts<br/>index 0d70d39fa8d2..fae6c6924705 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts</a></div><div class='hunk'>@@ -54,7 +54,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@1000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		/* the first 16MB is for firmwares' usage */</div><div class='ctx'> 		reg = &lt;0 0x01000000 0 0x7f000000&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts b/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts<br/>index 348c37ecf069..d47edad13e68 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/marvell/berlin4ct-stb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/berlin4ct-stb.dts</a></div><div class='hunk'>@@ -54,7 +54,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@1000000 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		/* the first 16MB is for firmwares' usage */</div><div class='ctx'> 		reg = &lt;0 0x01000000 0 0x7f000000&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi<br/>index 85c23facb9fe..d6b800fd26d0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/berlin4ct.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/marvell/berlin4ct.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/marvell/berlin4ct.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/marvell/berlin4ct.dtsi</a></div><div class='hunk'>@@ -142,7 +142,7 @@</div><div class='ctx'> 			     &lt;GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc {</div><div class='add'>+	soc@f7000000 {</div><div class='ctx'> 		compatible = "simple-bus";</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts<br/>index 2a7f731c7759..0ecaad4333a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/mediatek/mt8173-evb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/mediatek/mt8173-evb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/mediatek/mt8173-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/mediatek/mt8173-evb.dts</a></div><div class='hunk'>@@ -34,15 +34,6 @@</div><div class='ctx'> </div><div class='ctx'> 	chosen { };</div><div class='ctx'> </div><div class='del'>-	usb_p1_vbus: regulator@0 {</div><div class='del'>-		compatible = "regulator-fixed";</div><div class='del'>-		regulator-name = "usb_vbus";</div><div class='del'>-		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='del'>-		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='del'>-		gpio = &lt;&amp;pio 130 GPIO_ACTIVE_HIGH&gt;;</div><div class='del'>-		enable-active-high;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	connector {</div><div class='ctx'> 		compatible = "hdmi-connector";</div><div class='ctx'> 		label = "hdmi";</div><div class='hunk'>@@ -54,6 +45,29 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	extcon_usb: extcon_iddig {</div><div class='add'>+		compatible = "linux,extcon-usb-gpio";</div><div class='add'>+		id-gpio = &lt;&amp;pio 16 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb_p1_vbus: regulator@0 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "usb_vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;pio 130 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb_p0_vbus: regulator@1 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vbus";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		gpio = &lt;&amp;pio 9 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;cec {</div><div class='hunk'>@@ -243,6 +257,20 @@</div><div class='ctx'> 			bias-pull-down = &lt;MTK_PUPD_SET_R1R0_10&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	usb_id_pins_float: usb_iddig_pull_up {</div><div class='add'>+		pins_iddig {</div><div class='add'>+			pinmux = &lt;MT8173_PIN_16_IDDIG__FUNC_IDDIG&gt;;</div><div class='add'>+			bias-pull-up;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb_id_pins_ground: usb_iddig_pull_down {</div><div class='add'>+		pins_iddig {</div><div class='add'>+			pinmux = &lt;MT8173_PIN_16_IDDIG__FUNC_IDDIG&gt;;</div><div class='add'>+			bias-pull-down;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;pwm0 {</div><div class='hunk'>@@ -469,12 +497,25 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;ssusb {</div><div class='add'>+	vusb33-supply = &lt;&amp;mt6397_vusb_reg&gt;;</div><div class='add'>+	vbus-supply = &lt;&amp;usb_p0_vbus&gt;;</div><div class='add'>+	extcon = &lt;&amp;extcon_usb&gt;;</div><div class='add'>+	dr_mode = "otg";</div><div class='add'>+	mediatek,enable-wakeup;</div><div class='add'>+	pinctrl-names = "default", "id_float", "id_ground";</div><div class='add'>+	pinctrl-0 = &lt;&amp;usb_id_pins_float&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;usb_id_pins_float&gt;;</div><div class='add'>+	pinctrl-2 = &lt;&amp;usb_id_pins_ground&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;uart0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-&amp;usb30 {</div><div class='add'>+&amp;usb_host {</div><div class='ctx'> 	vusb33-supply = &lt;&amp;mt6397_vusb_reg&gt;;</div><div class='ctx'> 	vbus-supply = &lt;&amp;usb_p1_vbus&gt;;</div><div class='del'>-	mediatek,wakeup-src = &lt;1&gt;;</div><div class='add'>+	status = "okay";</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi<br/>index 1c71e256601d..6922252f317b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/mediatek/mt8173.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/mediatek/mt8173.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/mediatek/mt8173.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/mediatek/mt8173.dtsi</a></div><div class='hunk'>@@ -41,6 +41,14 @@</div><div class='ctx'> 		dpi0 = &amp;dpi0;</div><div class='ctx'> 		dsi0 = &amp;dsi0;</div><div class='ctx'> 		dsi1 = &amp;dsi1;</div><div class='add'>+		mdp_rdma0 = &amp;mdp_rdma0;</div><div class='add'>+		mdp_rdma1 = &amp;mdp_rdma1;</div><div class='add'>+		mdp_rsz0 = &amp;mdp_rsz0;</div><div class='add'>+		mdp_rsz1 = &amp;mdp_rsz1;</div><div class='add'>+		mdp_rsz2 = &amp;mdp_rsz2;</div><div class='add'>+		mdp_wdma0 = &amp;mdp_wdma0;</div><div class='add'>+		mdp_wrot0 = &amp;mdp_wrot0;</div><div class='add'>+		mdp_wrot1 = &amp;mdp_wrot1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='hunk'>@@ -174,12 +182,12 @@</div><div class='ctx'> 				map@0 {</div><div class='ctx'> 					trip = &lt;&amp;target&gt;;</div><div class='ctx'> 					cooling-device = &lt;&amp;cpu0 0 0&gt;;</div><div class='del'>-					contribution = &lt;1024&gt;;</div><div class='add'>+					contribution = &lt;3072&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 				map@1 {</div><div class='ctx'> 					trip = &lt;&amp;target&gt;;</div><div class='ctx'> 					cooling-device = &lt;&amp;cpu2 0 0&gt;;</div><div class='del'>-					contribution = &lt;2048&gt;;</div><div class='add'>+					contribution = &lt;1024&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -393,6 +401,11 @@</div><div class='ctx'> 		efuse: efuse@10206000 {</div><div class='ctx'> 			compatible = "mediatek,mt8173-efuse";</div><div class='ctx'> 			reg = &lt;0 0x10206000 0 0x1000&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			thermal_calibration: calib@528 {</div><div class='add'>+				reg = &lt;0x528 0xc&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		apmixedsys: clock-controller@10209000 {</div><div class='hunk'>@@ -450,6 +463,9 @@</div><div class='ctx'> 		auxadc: auxadc@11001000 {</div><div class='ctx'> 			compatible = "mediatek,mt8173-auxadc";</div><div class='ctx'> 			reg = &lt;0 0x11001000 0 0x1000&gt;;</div><div class='add'>+			clocks = &lt;&amp;pericfg CLK_PERI_AUXADC&gt;;</div><div class='add'>+			clock-names = "main";</div><div class='add'>+			#io-channel-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		uart0: serial@11002000 {</div><div class='hunk'>@@ -563,6 +579,8 @@</div><div class='ctx'> 			resets = &lt;&amp;pericfg MT8173_PERI_THERM_SW_RST&gt;;</div><div class='ctx'> 			mediatek,auxadc = &lt;&amp;auxadc&gt;;</div><div class='ctx'> 			mediatek,apmixedsys = &lt;&amp;apmixedsys&gt;;</div><div class='add'>+			nvmem-cells = &lt;&amp;thermal_calibration&gt;;</div><div class='add'>+			nvmem-cell-names = "calibration-data";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		nor_flash: spi@1100d000 {</div><div class='hunk'>@@ -707,22 +725,39 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		usb30: usb@11270000 {</div><div class='del'>-			compatible = "mediatek,mt8173-xhci";</div><div class='del'>-			reg = &lt;0 0x11270000 0 0x1000&gt;,</div><div class='add'>+		ssusb: usb@11271000 {</div><div class='add'>+			compatible = "mediatek,mt8173-mtu3";</div><div class='add'>+			reg = &lt;0 0x11271000 0 0x3000&gt;,</div><div class='ctx'> 			      &lt;0 0x11280700 0 0x0100&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 115 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+			reg-names = "mac", "ippc";</div><div class='add'>+			interrupts = &lt;GIC_SPI 64 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+			phys = &lt;&amp;phy_port0 PHY_TYPE_USB3&gt;,</div><div class='add'>+			       &lt;&amp;phy_port1 PHY_TYPE_USB2&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_USB&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;topckgen CLK_TOP_USB30_SEL&gt;,</div><div class='add'>+				 &lt;&amp;clk26m&gt;,</div><div class='ctx'> 				 &lt;&amp;pericfg CLK_PERI_USB0&gt;,</div><div class='ctx'> 				 &lt;&amp;pericfg CLK_PERI_USB1&gt;;</div><div class='ctx'> 			clock-names = "sys_ck",</div><div class='add'>+				      "ref_ck",</div><div class='ctx'> 				      "wakeup_deb_p0",</div><div class='ctx'> 				      "wakeup_deb_p1";</div><div class='del'>-			phys = &lt;&amp;phy_port0 PHY_TYPE_USB3&gt;,</div><div class='del'>-			       &lt;&amp;phy_port1 PHY_TYPE_USB2&gt;;</div><div class='ctx'> 			mediatek,syscon-wakeup = &lt;&amp;pericfg&gt;;</div><div class='del'>-			status = "okay";</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			usb_host: xhci@11270000 {</div><div class='add'>+				compatible = "mediatek,mt8173-xhci";</div><div class='add'>+				reg = &lt;0 0x11270000 0 0x1000&gt;;</div><div class='add'>+				reg-names = "mac";</div><div class='add'>+				interrupts = &lt;GIC_SPI 115 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+				power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_USB&gt;;</div><div class='add'>+				clocks = &lt;&amp;topckgen CLK_TOP_USB30_SEL&gt;, &lt;&amp;clk26m&gt;;</div><div class='add'>+				clock-names = "sys_ck", "ref_ck";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		u3phy: usb-phy@11290000 {</div><div class='hunk'>@@ -752,9 +787,87 @@</div><div class='ctx'> 			compatible = "mediatek,mt8173-mmsys", "syscon";</div><div class='ctx'> 			reg = &lt;0 0x14000000 0 0x1000&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+			assigned-clocks = &lt;&amp;topckgen CLK_TOP_MM_SEL&gt;;</div><div class='add'>+			assigned-clock-rates = &lt;400000000&gt;;</div><div class='ctx'> 			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		mdp {</div><div class='add'>+			compatible = "mediatek,mt8173-mdp";</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+			mediatek,vpu = &lt;&amp;vpu&gt;;</div><div class='add'>+</div><div class='add'>+			mdp_rdma0: rdma@14001000 {</div><div class='add'>+				compatible = "mediatek,mt8173-mdp-rdma";</div><div class='add'>+				reg = &lt;0 0x14001000 0 0x1000&gt;;</div><div class='add'>+				clocks = &lt;&amp;mmsys CLK_MM_MDP_RDMA0&gt;,</div><div class='add'>+					 &lt;&amp;mmsys CLK_MM_MUTEX_32K&gt;;</div><div class='add'>+				power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+				iommus = &lt;&amp;iommu M4U_PORT_MDP_RDMA0&gt;;</div><div class='add'>+				mediatek,larb = &lt;&amp;larb0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mdp_rdma1: rdma@14002000 {</div><div class='add'>+				compatible = "mediatek,mt8173-mdp-rdma";</div><div class='add'>+				reg = &lt;0 0x14002000 0 0x1000&gt;;</div><div class='add'>+				clocks = &lt;&amp;mmsys CLK_MM_MDP_RDMA1&gt;,</div><div class='add'>+					 &lt;&amp;mmsys CLK_MM_MUTEX_32K&gt;;</div><div class='add'>+				power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+				iommus = &lt;&amp;iommu M4U_PORT_MDP_RDMA1&gt;;</div><div class='add'>+				mediatek,larb = &lt;&amp;larb4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mdp_rsz0: rsz@14003000 {</div><div class='add'>+				compatible = "mediatek,mt8173-mdp-rsz";</div><div class='add'>+				reg = &lt;0 0x14003000 0 0x1000&gt;;</div><div class='add'>+				clocks = &lt;&amp;mmsys CLK_MM_MDP_RSZ0&gt;;</div><div class='add'>+				power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mdp_rsz1: rsz@14004000 {</div><div class='add'>+				compatible = "mediatek,mt8173-mdp-rsz";</div><div class='add'>+				reg = &lt;0 0x14004000 0 0x1000&gt;;</div><div class='add'>+				clocks = &lt;&amp;mmsys CLK_MM_MDP_RSZ1&gt;;</div><div class='add'>+				power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mdp_rsz2: rsz@14005000 {</div><div class='add'>+				compatible = "mediatek,mt8173-mdp-rsz";</div><div class='add'>+				reg = &lt;0 0x14005000 0 0x1000&gt;;</div><div class='add'>+				clocks = &lt;&amp;mmsys CLK_MM_MDP_RSZ2&gt;;</div><div class='add'>+				power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mdp_wdma0: wdma@14006000 {</div><div class='add'>+				compatible = "mediatek,mt8173-mdp-wdma";</div><div class='add'>+				reg = &lt;0 0x14006000 0 0x1000&gt;;</div><div class='add'>+				clocks = &lt;&amp;mmsys CLK_MM_MDP_WDMA&gt;;</div><div class='add'>+				power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+				iommus = &lt;&amp;iommu M4U_PORT_MDP_WDMA&gt;;</div><div class='add'>+				mediatek,larb = &lt;&amp;larb0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mdp_wrot0: wrot@14007000 {</div><div class='add'>+				compatible = "mediatek,mt8173-mdp-wrot";</div><div class='add'>+				reg = &lt;0 0x14007000 0 0x1000&gt;;</div><div class='add'>+				clocks = &lt;&amp;mmsys CLK_MM_MDP_WROT0&gt;;</div><div class='add'>+				power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+				iommus = &lt;&amp;iommu M4U_PORT_MDP_WROT0&gt;;</div><div class='add'>+				mediatek,larb = &lt;&amp;larb0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mdp_wrot1: wrot@14008000 {</div><div class='add'>+				compatible = "mediatek,mt8173-mdp-wrot";</div><div class='add'>+				reg = &lt;0 0x14008000 0 0x1000&gt;;</div><div class='add'>+				clocks = &lt;&amp;mmsys CLK_MM_MDP_WROT1&gt;;</div><div class='add'>+				power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_MM&gt;;</div><div class='add'>+				iommus = &lt;&amp;iommu M4U_PORT_MDP_WROT1&gt;;</div><div class='add'>+				mediatek,larb = &lt;&amp;larb4&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		ovl0: ovl@1400c000 {</div><div class='ctx'> 			compatible = "mediatek,mt8173-disp-ovl";</div><div class='ctx'> 			reg = &lt;0 0x1400c000 0 0x1000&gt;;</div><div class='hunk'>@@ -1051,6 +1164,50 @@</div><div class='ctx'> 			#clock-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		vcodec_dec: vcodec@16000000 {</div><div class='add'>+			compatible = "mediatek,mt8173-vcodec-dec";</div><div class='add'>+			reg = &lt;0 0x16000000 0 0x100&gt;,	/* VDEC_SYS */</div><div class='add'>+			      &lt;0 0x16020000 0 0x1000&gt;,	/* VDEC_MISC */</div><div class='add'>+			      &lt;0 0x16021000 0 0x800&gt;,	/* VDEC_LD */</div><div class='add'>+			      &lt;0 0x16021800 0 0x800&gt;,	/* VDEC_TOP */</div><div class='add'>+			      &lt;0 0x16022000 0 0x1000&gt;,	/* VDEC_CM */</div><div class='add'>+			      &lt;0 0x16023000 0 0x1000&gt;,	/* VDEC_AD */</div><div class='add'>+			      &lt;0 0x16024000 0 0x1000&gt;,	/* VDEC_AV */</div><div class='add'>+			      &lt;0 0x16025000 0 0x1000&gt;,	/* VDEC_PP */</div><div class='add'>+			      &lt;0 0x16026800 0 0x800&gt;,	/* VDEC_HWD */</div><div class='add'>+			      &lt;0 0x16027000 0 0x800&gt;,	/* VDEC_HWQ */</div><div class='add'>+			      &lt;0 0x16027800 0 0x800&gt;,	/* VDEC_HWB */</div><div class='add'>+			      &lt;0 0x16028400 0 0x400&gt;;	/* VDEC_HWG */</div><div class='add'>+			interrupts = &lt;GIC_SPI 204 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+			mediatek,larb = &lt;&amp;larb1&gt;;</div><div class='add'>+			iommus = &lt;&amp;iommu M4U_PORT_HW_VDEC_MC_EXT&gt;,</div><div class='add'>+				 &lt;&amp;iommu M4U_PORT_HW_VDEC_PP_EXT&gt;,</div><div class='add'>+				 &lt;&amp;iommu M4U_PORT_HW_VDEC_AVC_MV_EXT&gt;,</div><div class='add'>+				 &lt;&amp;iommu M4U_PORT_HW_VDEC_PRED_RD_EXT&gt;,</div><div class='add'>+				 &lt;&amp;iommu M4U_PORT_HW_VDEC_PRED_WR_EXT&gt;,</div><div class='add'>+				 &lt;&amp;iommu M4U_PORT_HW_VDEC_UFO_EXT&gt;,</div><div class='add'>+				 &lt;&amp;iommu M4U_PORT_HW_VDEC_VLD_EXT&gt;,</div><div class='add'>+				 &lt;&amp;iommu M4U_PORT_HW_VDEC_VLD2_EXT&gt;;</div><div class='add'>+			mediatek,vpu = &lt;&amp;vpu&gt;;</div><div class='add'>+			power-domains = &lt;&amp;scpsys MT8173_POWER_DOMAIN_VDEC&gt;;</div><div class='add'>+			clocks = &lt;&amp;apmixedsys CLK_APMIXED_VCODECPLL&gt;,</div><div class='add'>+				 &lt;&amp;topckgen CLK_TOP_UNIVPLL_D2&gt;,</div><div class='add'>+				 &lt;&amp;topckgen CLK_TOP_CCI400_SEL&gt;,</div><div class='add'>+				 &lt;&amp;topckgen CLK_TOP_VDEC_SEL&gt;,</div><div class='add'>+				 &lt;&amp;topckgen CLK_TOP_VCODECPLL&gt;,</div><div class='add'>+				 &lt;&amp;apmixedsys CLK_APMIXED_VENCPLL&gt;,</div><div class='add'>+				 &lt;&amp;topckgen CLK_TOP_VENC_LT_SEL&gt;,</div><div class='add'>+				 &lt;&amp;topckgen CLK_TOP_VCODECPLL_370P5&gt;;</div><div class='add'>+			clock-names = "vcodecpll",</div><div class='add'>+				      "univpll_d2",</div><div class='add'>+				      "clk_cci400_sel",</div><div class='add'>+				      "vdec_sel",</div><div class='add'>+				      "vdecpll",</div><div class='add'>+				      "vencpll",</div><div class='add'>+				      "venc_lt_sel",</div><div class='add'>+				      "vdec_bus_clk_src";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		larb1: larb@16010000 {</div><div class='ctx'> 			compatible = "mediatek,mt8173-smi-larb";</div><div class='ctx'> 			reg = &lt;0 0x16010000 0 0x1000&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/nvidia/Makefile b/arch/arm64/boot/dts/nvidia/Makefile<br/>index 0f7cdf3e05c1..18941458cb4d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/nvidia/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/Makefile</a></div><div class='hunk'>@@ -3,6 +3,7 @@ dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-0000.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-2180.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2571.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-smaug.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb</div><div class='ctx'> </div><div class='ctx'> always		:= $(dtb-y)</div><div class='ctx'> clean-files	:= *.dtb</div><div class='head'>diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts<br/>new file mode 100644<br/>index 000000000000..0d3c0996d832<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "tegra186-p3310.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "NVIDIA Tegra186 P2771-0000 Development Board";</div><div class='add'>+	compatible = "nvidia,p2771-0000", "nvidia,tegra186";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi<br/>new file mode 100644<br/>index 000000000000..1abe2eceb3d1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+#include "tegra186.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "NVIDIA Tegra186 P3310 Processor Module";</div><div class='add'>+	compatible = "nvidia,p3310", "nvidia,tegra186";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uarta;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "earlycon console=ttyS0,115200n8";</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x80000000 0x2 0x00000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@3100000 {</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hsp@3c00000 {</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		cpu@0 {</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu@1 {</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu@2 {</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu@3 {</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu@4 {</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu@5 {</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bpmp {</div><div class='add'>+		status = "okay";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-1.0";</div><div class='add'>+		status = "okay";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi<br/>new file mode 100644<br/>index 000000000000..62fa85ae0271<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/tegra186.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra186.dtsi</a></div><div class='hunk'>@@ -0,0 +1,402 @@</div><div class='add'>+#include &lt;dt-bindings/clock/tegra186-clock.h&gt;</div><div class='add'>+#include &lt;dt-bindings/gpio/tegra186-gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/mailbox/tegra186-hsp.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/tegra186-reset.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "nvidia,tegra186";</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	gpio: gpio@2200000 {</div><div class='add'>+		compatible = "nvidia,tegra186-gpio";</div><div class='add'>+		reg-names = "security", "gpio";</div><div class='add'>+		reg = &lt;0x0 0x2200000 0x0 0x10000&gt;,</div><div class='add'>+		      &lt;0x0 0x2210000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI  47 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI  50 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI  53 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI  56 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI  59 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uarta: serial@3100000 {</div><div class='add'>+		compatible = "nvidia,tegra186-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x0 0x03100000 0x0 0x40&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_UARTA&gt;;</div><div class='add'>+		clock-names = "serial";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_UARTA&gt;;</div><div class='add'>+		reset-names = "serial";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uartb: serial@3110000 {</div><div class='add'>+		compatible = "nvidia,tegra186-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x0 0x03110000 0x0 0x40&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_UARTB&gt;;</div><div class='add'>+		clock-names = "serial";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_UARTB&gt;;</div><div class='add'>+		reset-names = "serial";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uartd: serial@3130000 {</div><div class='add'>+		compatible = "nvidia,tegra186-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x0 0x03130000 0x0 0x40&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_UARTD&gt;;</div><div class='add'>+		clock-names = "serial";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_UARTD&gt;;</div><div class='add'>+		reset-names = "serial";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uarte: serial@3140000 {</div><div class='add'>+		compatible = "nvidia,tegra186-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x0 0x03140000 0x0 0x40&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_UARTE&gt;;</div><div class='add'>+		clock-names = "serial";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_UARTE&gt;;</div><div class='add'>+		reset-names = "serial";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uartf: serial@3150000 {</div><div class='add'>+		compatible = "nvidia,tegra186-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x0 0x03150000 0x0 0x40&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_UARTF&gt;;</div><div class='add'>+		clock-names = "serial";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_UARTF&gt;;</div><div class='add'>+		reset-names = "serial";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gen1_i2c: i2c@3160000 {</div><div class='add'>+		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";</div><div class='add'>+		reg = &lt;0x0 0x03160000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_I2C1&gt;;</div><div class='add'>+		clock-names = "div-clk";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_I2C1&gt;;</div><div class='add'>+		reset-names = "i2c";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cam_i2c: i2c@3180000 {</div><div class='add'>+		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";</div><div class='add'>+		reg = &lt;0x0 0x03180000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_I2C3&gt;;</div><div class='add'>+		clock-names = "div-clk";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_I2C3&gt;;</div><div class='add'>+		reset-names = "i2c";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* shares pads with dpaux1 */</div><div class='add'>+	dp_aux_ch1_i2c: i2c@3190000 {</div><div class='add'>+		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";</div><div class='add'>+		reg = &lt;0x0 0x03190000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_I2C4&gt;;</div><div class='add'>+		clock-names = "div-clk";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_I2C4&gt;;</div><div class='add'>+		reset-names = "i2c";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* controlled by BPMP, should not be enabled */</div><div class='add'>+	pwr_i2c: i2c@31a0000 {</div><div class='add'>+		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";</div><div class='add'>+		reg = &lt;0x0 0x031a0000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_I2C5&gt;;</div><div class='add'>+		clock-names = "div-clk";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_I2C5&gt;;</div><div class='add'>+		reset-names = "i2c";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* shares pads with dpaux0 */</div><div class='add'>+	dp_aux_ch0_i2c: i2c@31b0000 {</div><div class='add'>+		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";</div><div class='add'>+		reg = &lt;0x0 0x031b0000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_I2C6&gt;;</div><div class='add'>+		clock-names = "div-clk";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_I2C6&gt;;</div><div class='add'>+		reset-names = "i2c";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gen7_i2c: i2c@31c0000 {</div><div class='add'>+		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";</div><div class='add'>+		reg = &lt;0x0 0x031c0000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_I2C7&gt;;</div><div class='add'>+		clock-names = "div-clk";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_I2C7&gt;;</div><div class='add'>+		reset-names = "i2c";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gen9_i2c: i2c@31e0000 {</div><div class='add'>+		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";</div><div class='add'>+		reg = &lt;0x0 0x031e0000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_I2C9&gt;;</div><div class='add'>+		clock-names = "div-clk";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_I2C9&gt;;</div><div class='add'>+		reset-names = "i2c";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdmmc1: sdhci@3400000 {</div><div class='add'>+		compatible = "nvidia,tegra186-sdhci";</div><div class='add'>+		reg = &lt;0x0 0x03400000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_SDMMC1&gt;;</div><div class='add'>+		clock-names = "sdhci";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_SDMMC1&gt;;</div><div class='add'>+		reset-names = "sdhci";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdmmc2: sdhci@3420000 {</div><div class='add'>+		compatible = "nvidia,tegra186-sdhci";</div><div class='add'>+		reg = &lt;0x0 0x03420000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_SDMMC2&gt;;</div><div class='add'>+		clock-names = "sdhci";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_SDMMC2&gt;;</div><div class='add'>+		reset-names = "sdhci";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdmmc3: sdhci@3440000 {</div><div class='add'>+		compatible = "nvidia,tegra186-sdhci";</div><div class='add'>+		reg = &lt;0x0 0x03440000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_SDMMC3&gt;;</div><div class='add'>+		clock-names = "sdhci";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_SDMMC3&gt;;</div><div class='add'>+		reset-names = "sdhci";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdmmc4: sdhci@3460000 {</div><div class='add'>+		compatible = "nvidia,tegra186-sdhci";</div><div class='add'>+		reg = &lt;0x0 0x03460000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_SDMMC4&gt;;</div><div class='add'>+		clock-names = "sdhci";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_SDMMC4&gt;;</div><div class='add'>+		reset-names = "sdhci";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gic: interrupt-controller@3881000 {</div><div class='add'>+		compatible = "arm,gic-400";</div><div class='add'>+		#interrupt-cells = &lt;3&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		reg = &lt;0x0 0x03881000 0x0 0x1000&gt;,</div><div class='add'>+		      &lt;0x0 0x03882000 0x0 0x2000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_PPI 9</div><div class='add'>+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hsp_top0: hsp@3c00000 {</div><div class='add'>+		compatible = "nvidia,tegra186-hsp";</div><div class='add'>+		reg = &lt;0x0 0x03c00000 0x0 0xa0000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		interrupt-names = "doorbell";</div><div class='add'>+		#mbox-cells = &lt;2&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gen2_i2c: i2c@c240000 {</div><div class='add'>+		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";</div><div class='add'>+		reg = &lt;0x0 0x0c240000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_I2C2&gt;;</div><div class='add'>+		clock-names = "div-clk";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_I2C2&gt;;</div><div class='add'>+		reset-names = "i2c";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gen8_i2c: i2c@c250000 {</div><div class='add'>+		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";</div><div class='add'>+		reg = &lt;0x0 0x0c250000 0x0 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_I2C8&gt;;</div><div class='add'>+		clock-names = "div-clk";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_I2C8&gt;;</div><div class='add'>+		reset-names = "i2c";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uartc: serial@c280000 {</div><div class='add'>+		compatible = "nvidia,tegra186-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x0 0x0c280000 0x0 0x40&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_UARTC&gt;;</div><div class='add'>+		clock-names = "serial";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_UARTC&gt;;</div><div class='add'>+		reset-names = "serial";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uartg: serial@c290000 {</div><div class='add'>+		compatible = "nvidia,tegra186-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x0 0x0c290000 0x0 0x40&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;bpmp TEGRA186_CLK_UARTG&gt;;</div><div class='add'>+		clock-names = "serial";</div><div class='add'>+		resets = &lt;&amp;bpmp TEGRA186_RESET_UARTG&gt;;</div><div class='add'>+		reset-names = "serial";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio_aon: gpio@c2f0000 {</div><div class='add'>+		compatible = "nvidia,tegra186-gpio-aon";</div><div class='add'>+		reg-names = "security", "gpio";</div><div class='add'>+		reg = &lt;0x0 0xc2f0000 0x0 0x1000&gt;,</div><div class='add'>+		      &lt;0x0 0xc2f1000 0x0 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sysram@30000000 {</div><div class='add'>+		compatible = "nvidia,tegra186-sysram", "mmio-sram";</div><div class='add'>+		reg = &lt;0x0 0x30000000 0x0 0x50000&gt;;</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges = &lt;0 0x0 0x0 0x30000000 0x0 0x50000&gt;;</div><div class='add'>+</div><div class='add'>+		cpu_bpmp_tx: shmem@4e000 {</div><div class='add'>+			compatible = "nvidia,tegra186-bpmp-shmem";</div><div class='add'>+			reg = &lt;0x0 0x4e000 0x0 0x1000&gt;;</div><div class='add'>+			label = "cpu-bpmp-tx";</div><div class='add'>+			pool;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu_bpmp_rx: shmem@4f000 {</div><div class='add'>+			compatible = "nvidia,tegra186-bpmp-shmem";</div><div class='add'>+			reg = &lt;0x0 0x4f000 0x0 0x1000&gt;;</div><div class='add'>+			label = "cpu-bpmp-rx";</div><div class='add'>+			pool;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu@0 {</div><div class='add'>+			compatible = "nvidia,tegra186-denver", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu@1 {</div><div class='add'>+			compatible = "nvidia,tegra186-denver", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x001&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu@2 {</div><div class='add'>+			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x100&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu@3 {</div><div class='add'>+			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x101&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu@4 {</div><div class='add'>+			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x102&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cpu@5 {</div><div class='add'>+			compatible = "arm,cortex-a57", "arm,armv8";</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x103&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bpmp: bpmp {</div><div class='add'>+		compatible = "nvidia,tegra186-bpmp";</div><div class='add'>+		mboxes = &lt;&amp;hsp_top0 TEGRA_HSP_MBOX_TYPE_DB</div><div class='add'>+				    TEGRA_HSP_DB_MASTER_BPMP&gt;;</div><div class='add'>+		shmem = &lt;&amp;cpu_bpmp_tx &amp;cpu_bpmp_rx&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+		#reset-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		bpmp_i2c: i2c {</div><div class='add'>+			compatible = "nvidia,tegra186-bpmp-i2c";</div><div class='add'>+			nvidia,bpmp-bus-id = &lt;5&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "arm,armv8-timer";</div><div class='add'>+		interrupts = &lt;GIC_PPI 13</div><div class='add'>+				(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 14</div><div class='add'>+				(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 11</div><div class='add'>+				(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 10</div><div class='add'>+				(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi<br/>index 5fda583351d7..906fb836d241 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi</a></div><div class='hunk'>@@ -21,6 +21,10 @@</div><div class='ctx'> 		reg = &lt;0x0 0x80000000 0x1 0x0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	gpu@57000000 {</div><div class='add'>+		vdd-supply = &lt;&amp;vdd_gpu&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	/* debug port */</div><div class='ctx'> 	serial@70006000 {</div><div class='ctx'> 		status = "okay";</div><div class='hunk'>@@ -291,4 +295,18 @@</div><div class='ctx'> 			clock-frequency = &lt;32768&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	regulators {</div><div class='add'>+		vdd_gpu: regulator@100 {</div><div class='add'>+			compatible = "pwm-regulator";</div><div class='add'>+			reg = &lt;100&gt;;</div><div class='add'>+			pwms = &lt;&amp;pwm 1 4880&gt;;</div><div class='add'>+			regulator-name = "VDD_GPU";</div><div class='add'>+			regulator-min-microvolt = &lt;710000&gt;;</div><div class='add'>+			regulator-max-microvolt = &lt;1320000&gt;;</div><div class='add'>+			enable-gpios = &lt;&amp;pmic 6 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			regulator-ramp-delay = &lt;80&gt;;</div><div class='add'>+			regulator-enable-ramp-delay = &lt;1000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts b/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts<br/>index 983775e637a4..4c1ea7a08d43 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts</a></div><div class='hunk'>@@ -7,6 +7,32 @@</div><div class='ctx'> 	model = "NVIDIA Jetson TX1 Developer Kit";</div><div class='ctx'> 	compatible = "nvidia,p2371-2180", "nvidia,tegra210";</div><div class='ctx'> </div><div class='add'>+	pcie-controller@01003000 {</div><div class='add'>+		status = "okay";</div><div class='add'>+</div><div class='add'>+		avdd-pll-uerefe-supply = &lt;&amp;avdd_1v05_pll&gt;;</div><div class='add'>+		hvddio-pex-supply = &lt;&amp;vdd_1v8&gt;;</div><div class='add'>+		dvddio-pex-supply = &lt;&amp;vdd_pex_1v05&gt;;</div><div class='add'>+		dvdd-pex-pll-supply = &lt;&amp;vdd_pex_1v05&gt;;</div><div class='add'>+		hvdd-pex-pll-e-supply = &lt;&amp;vdd_1v8&gt;;</div><div class='add'>+		vddio-pex-ctl-supply = &lt;&amp;vdd_1v8&gt;;</div><div class='add'>+</div><div class='add'>+		pci@1,0 {</div><div class='add'>+			phys = &lt;&amp;{/padctl@7009f000/pads/pcie/lanes/pcie-0}&gt;,</div><div class='add'>+			       &lt;&amp;{/padctl@7009f000/pads/pcie/lanes/pcie-1}&gt;,</div><div class='add'>+			       &lt;&amp;{/padctl@7009f000/pads/pcie/lanes/pcie-2}&gt;,</div><div class='add'>+			       &lt;&amp;{/padctl@7009f000/pads/pcie/lanes/pcie-3}&gt;;</div><div class='add'>+			phy-names = "pcie-0", "pcie-1", "pcie-2", "pcie-3";</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pci@2,0 {</div><div class='add'>+			phys = &lt;&amp;{/padctl@7009f000/pads/pcie/lanes/pcie-4}&gt;;</div><div class='add'>+			phy-names = "pcie-0";</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	host1x@50000000 {</div><div class='ctx'> 		dsi@54300000 {</div><div class='ctx'> 			status = "okay";</div><div class='head'>diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts<br/>index c2becb603e11..7703227f5d1a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/nvidia/tegra210-smaug.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra210-smaug.dts</a></div><div class='hunk'>@@ -11,7 +11,8 @@</div><div class='ctx'> 	compatible = "google,smaug-rev8", "google,smaug-rev7",</div><div class='ctx'> 		     "google,smaug-rev6", "google,smaug-rev5",</div><div class='ctx'> 		     "google,smaug-rev4", "google,smaug-rev3",</div><div class='del'>-		     "google,smaug-rev1", "google,smaug", "nvidia,tegra210";</div><div class='add'>+		     "google,smaug-rev2", "google,smaug-rev1",</div><div class='add'>+		     "google,smaug", "nvidia,tegra210";</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial0 = &amp;uarta;</div><div class='head'>diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi<br/>index 46045fe719da..2f832df29da8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/tegra210.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/nvidia/tegra210.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/nvidia/tegra210.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/nvidia/tegra210.dtsi</a></div><div class='hunk'>@@ -11,6 +11,69 @@</div><div class='ctx'> 	#address-cells = &lt;2&gt;;</div><div class='ctx'> 	#size-cells = &lt;2&gt;;</div><div class='ctx'> </div><div class='add'>+	pcie-controller@01003000 {</div><div class='add'>+		compatible = "nvidia,tegra210-pcie";</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		reg = &lt;0x0 0x01003000 0x0 0x00000800   /* PADS registers */</div><div class='add'>+		       0x0 0x01003800 0x0 0x00000800   /* AFI registers */</div><div class='add'>+		       0x0 0x02000000 0x0 0x10000000&gt;; /* configuration space */</div><div class='add'>+		reg-names = "pads", "afi", "cs";</div><div class='add'>+		interrupts = &lt;GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH&gt;, /* controller interrupt */</div><div class='add'>+			     &lt;GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH&gt;; /* MSI interrupt */</div><div class='add'>+		interrupt-names = "intr", "msi";</div><div class='add'>+</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0 0 0 0&gt;;</div><div class='add'>+		interrupt-map = &lt;0 0 0 0 &amp;gic GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+		bus-range = &lt;0x00 0xff&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		ranges = &lt;0x82000000 0 0x01000000 0x0 0x01000000 0 0x00001000   /* port 0 configuration space */</div><div class='add'>+			  0x82000000 0 0x01001000 0x0 0x01001000 0 0x00001000   /* port 1 configuration space */</div><div class='add'>+			  0x81000000 0 0x0        0x0 0x12000000 0 0x00010000   /* downstream I/O (64 KiB) */</div><div class='add'>+			  0x82000000 0 0x13000000 0x0 0x13000000 0 0x0d000000   /* non-prefetchable memory (208 MiB) */</div><div class='add'>+			  0xc2000000 0 0x20000000 0x0 0x20000000 0 0x20000000&gt;; /* prefetchable memory (512 MiB) */</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;tegra_car TEGRA210_CLK_PCIE&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car TEGRA210_CLK_AFI&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car TEGRA210_CLK_PLL_E&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car TEGRA210_CLK_CML0&gt;;</div><div class='add'>+		clock-names = "pex", "afi", "pll_e", "cml";</div><div class='add'>+		resets = &lt;&amp;tegra_car 70&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car 72&gt;,</div><div class='add'>+			 &lt;&amp;tegra_car 74&gt;;</div><div class='add'>+		reset-names = "pex", "afi", "pcie_x";</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='add'>+		pci@1,0 {</div><div class='add'>+			device_type = "pci";</div><div class='add'>+			assigned-addresses = &lt;0x82000800 0 0x01000000 0 0x1000&gt;;</div><div class='add'>+			reg = &lt;0x000800 0 0 0 0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			nvidia,num-lanes = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pci@2,0 {</div><div class='add'>+			device_type = "pci";</div><div class='add'>+			assigned-addresses = &lt;0x82001000 0 0x01001000 0 0x1000&gt;;</div><div class='add'>+			reg = &lt;0x001000 0 0 0 0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+</div><div class='add'>+			nvidia,num-lanes = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	host1x@50000000 {</div><div class='ctx'> 		compatible = "nvidia,tegra210-host1x", "simple-bus";</div><div class='ctx'> 		reg = &lt;0x0 0x50000000 0x0 0x00034000&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile<br/>index 5dd05de5619b..cc0f02d9dd02 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/qcom/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/Makefile</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='del'>-dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-sbc.dtb msm8916-mtp.dtb</div><div class='del'>-dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-sbc.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-mtp.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-bullhead-rev-101.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-angler-rev-101.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb</div><div class='ctx'> </div><div class='ctx'> always		:= $(dtb-y)</div><div class='ctx'> subdir-y	:= $(dts-dirs)</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi<br/>index f881437d53c5..d94640812194 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> #include &lt;dt-bindings/pinctrl/qcom,pmic-gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/pinctrl/qcom,pmic-mpp.h&gt;</div><div class='ctx'> </div><div class='ctx'> &amp;pm8916_gpios {</div><div class='ctx'> </div><div class='hunk'>@@ -30,6 +31,18 @@</div><div class='ctx'> </div><div class='ctx'> &amp;pm8916_mpps {</div><div class='ctx'> </div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;ls_exp_gpio_f&gt;;</div><div class='add'>+</div><div class='add'>+	ls_exp_gpio_f: pm8916_mpp4 {</div><div class='add'>+		pinconf {</div><div class='add'>+			pins = "mpp4";</div><div class='add'>+			function = "digital";</div><div class='add'>+			output-low;</div><div class='add'>+			power-source = &lt;PM8916_MPP_L5&gt;;	// 1.8V</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	pm8916_mpps_leds: pm8916_mpps_leds {</div><div class='ctx'> 		pinconf {</div><div class='ctx'> 			pins = "mpp2", "mpp3";</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi<br/>index e1e6c6b5c489..185388de914c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi</a></div><div class='hunk'>@@ -72,4 +72,17 @@</div><div class='ctx'> 			bias-disable;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	msm_key_volp_n_default: msm_key_volp_n_default {</div><div class='add'>+		pinmux {</div><div class='add'>+			function = "gpio";</div><div class='add'>+			pins = "gpio107";</div><div class='add'>+		};</div><div class='add'>+		pinconf {</div><div class='add'>+			pins = "gpio107";</div><div class='add'>+			drive-strength = &lt;8&gt;;</div><div class='add'>+			input-enable;</div><div class='add'>+			bias-pull-up;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi<br/>index bb062b547110..eac5389f2f38 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi</a></div><div class='hunk'>@@ -15,6 +15,9 @@</div><div class='ctx'> #include "pm8916.dtsi"</div><div class='ctx'> #include "apq8016-sbc-soc-pins.dtsi"</div><div class='ctx'> #include "apq8016-sbc-pmic-pins.dtsi"</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include &lt;dt-bindings/sound/apq8016-lpass.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	aliases {</div><div class='hunk'>@@ -84,6 +87,7 @@</div><div class='ctx'> 				pinctrl-names = "default","sleep";</div><div class='ctx'> 				pinctrl-0 = &lt;&amp;adv7533_int_active &amp;adv7533_switch_active&gt;;</div><div class='ctx'> 				pinctrl-1 = &lt;&amp;adv7533_int_suspend &amp;adv7533_switch_suspend&gt;;</div><div class='add'>+				#sound-dai-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 				ports {</div><div class='ctx'> 					#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -251,6 +255,73 @@</div><div class='ctx'> 				vddio-supply = &lt;&amp;pm8916_l6&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		lpass_codec: codec{</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		Internal Codec</div><div class='add'>+			playback - Primary MI2S</div><div class='add'>+			capture - Ter MI2S</div><div class='add'>+</div><div class='add'>+		External Primary:</div><div class='add'>+			playback - secondary MI2S</div><div class='add'>+			capture - Quat MI2S</div><div class='add'>+</div><div class='add'>+		External Secondary:</div><div class='add'>+			playback - Quat MI2S</div><div class='add'>+			capture - Quat MI2S</div><div class='add'>+</div><div class='add'>+		*/</div><div class='add'>+</div><div class='add'>+                sound: sound {</div><div class='add'>+                        compatible = "qcom,apq8016-sbc-sndcard";</div><div class='add'>+                        reg = &lt;0x07702000 0x4&gt;, &lt;0x07702004 0x4&gt;;</div><div class='add'>+                        reg-names = "mic-iomux", "spkr-iomux";</div><div class='add'>+</div><div class='add'>+                        status = "okay";</div><div class='add'>+                        pinctrl-0 = &lt;&amp;cdc_pdm_lines_act &amp;ext_sec_tlmm_lines_act &amp;ext_mclk_tlmm_lines_act&gt;;</div><div class='add'>+                        pinctrl-1 = &lt;&amp;cdc_pdm_lines_sus &amp;ext_sec_tlmm_lines_sus &amp;ext_mclk_tlmm_lines_sus&gt;;</div><div class='add'>+                        pinctrl-names = "default", "sleep";</div><div class='add'>+                        qcom,model = "DB410c";</div><div class='add'>+                        qcom,audio-routing =</div><div class='add'>+                                "AMIC2", "MIC BIAS Internal2",</div><div class='add'>+                                "AMIC3", "MIC BIAS External1";</div><div class='add'>+			external-dai-link@0 {</div><div class='add'>+				link-name = "ADV7533";</div><div class='add'>+				cpu { /* QUAT */</div><div class='add'>+					sound-dai = &lt;&amp;lpass MI2S_QUATERNARY&gt;;</div><div class='add'>+				};</div><div class='add'>+				codec {</div><div class='add'>+					sound-dai = &lt;&amp;adv_bridge 0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+                        internal-codec-playback-dai-link@0 {            /* I2S - Internal codec */</div><div class='add'>+                                link-name = "WCD";</div><div class='add'>+                                cpu { /* PRIMARY */</div><div class='add'>+                                        sound-dai = &lt;&amp;lpass MI2S_PRIMARY&gt;;</div><div class='add'>+                                };</div><div class='add'>+                                codec {</div><div class='add'>+                                        sound-dai = &lt;&amp;lpass_codec 0&gt;, &lt;&amp;wcd_codec 0&gt;;</div><div class='add'>+                                };</div><div class='add'>+                        };</div><div class='add'>+</div><div class='add'>+                        internal-codec-capture-dai-link@0 {             /* I2S - Internal codec */</div><div class='add'>+                                link-name = "WCD-Capture";</div><div class='add'>+                                cpu { /* PRIMARY */</div><div class='add'>+                                        sound-dai = &lt;&amp;lpass MI2S_TERTIARY&gt;;</div><div class='add'>+                                };</div><div class='add'>+                                codec {</div><div class='add'>+                                        sound-dai = &lt;&amp;lpass_codec 1&gt;, &lt;&amp;wcd_codec 1&gt;;</div><div class='add'>+                                };</div><div class='add'>+                        };</div><div class='add'>+                };</div><div class='add'>+</div><div class='add'>+		wcnss@a21b000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb2513 {</div><div class='hunk'>@@ -276,6 +347,28 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	gpio_keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		autorepeat;</div><div class='add'>+</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;msm_key_volp_n_default&gt;;</div><div class='add'>+</div><div class='add'>+		button@0 {</div><div class='add'>+			label = "Volume Up";</div><div class='add'>+			linux,code = &lt;KEY_VOLUMEUP&gt;;</div><div class='add'>+			gpios = &lt;&amp;msmgpio 107 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;wcd_codec {</div><div class='add'>+        status = "okay";</div><div class='add'>+        clocks = &lt;&amp;gcc GCC_CODEC_DIGCODEC_CLK&gt;;</div><div class='add'>+        clock-names = "mclk";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;smd_rpm_regulators {</div><div class='hunk'>@@ -308,8 +401,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	l2 {</div><div class='del'>-		regulator-min-microvolt = &lt;375000&gt;;</div><div class='del'>-		regulator-max-microvolt = &lt;1525000&gt;;</div><div class='add'>+		regulator-min-microvolt = &lt;1200000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1200000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	l3 {</div><div class='hunk'>@@ -328,8 +421,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	l6 {</div><div class='del'>-		regulator-min-microvolt = &lt;1750000&gt;;</div><div class='del'>-		regulator-max-microvolt = &lt;3337000&gt;;</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	l7 {</div><div class='hunk'>@@ -388,8 +481,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	l17 {</div><div class='del'>-		regulator-min-microvolt = &lt;1750000&gt;;</div><div class='del'>-		regulator-max-microvolt = &lt;3337000&gt;;</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	l18 {</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi<br/>new file mode 100644<br/>index 000000000000..b1142c45fdc9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/pinctrl/qcom,pmic-gpio.h&gt;</div><div class='add'>+&amp;pm8994_gpios {</div><div class='add'>+</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;ls_exp_gpio_f&gt;;</div><div class='add'>+</div><div class='add'>+	ls_exp_gpio_f: pm8994_gpio5 {</div><div class='add'>+		pinconf {</div><div class='add'>+			pins = "gpio5";</div><div class='add'>+			output-low;</div><div class='add'>+			power-source = &lt;2&gt;; // PM8994_GPIO_S4, 1.8V</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	volume_up_gpio: pm8996_gpio2 {</div><div class='add'>+		pinconf {</div><div class='add'>+			pins = "gpio2";</div><div class='add'>+			function = "normal";</div><div class='add'>+			input-enable;</div><div class='add'>+			drive-push-pull;</div><div class='add'>+			bias-pull-up;</div><div class='add'>+			qcom,drive-strength = &lt;PMIC_GPIO_STRENGTH_NO&gt;;</div><div class='add'>+			power-source = &lt;PM8994_GPIO_S4&gt;; // 1.8V</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi<br/>index afb218cffc60..d2196fc6d739 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi</a></div><div class='hunk'>@@ -12,7 +12,11 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "msm8996.dtsi"</div><div class='add'>+#include "pm8994.dtsi"</div><div class='ctx'> #include "apq8096-db820c-pins.dtsi"</div><div class='add'>+#include "apq8096-db820c-pmic-pins.dtsi"</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	aliases {</div><div class='hunk'>@@ -85,4 +89,21 @@</div><div class='ctx'> 			status = "okay";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	gpio_keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		autorepeat;</div><div class='add'>+</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;volume_up_gpio&gt;;</div><div class='add'>+</div><div class='add'>+		button@0 {</div><div class='add'>+			label = "Volume Up";</div><div class='add'>+			linux,code = &lt;KEY_VOLUMEUP&gt;;</div><div class='add'>+			gpios = &lt;&amp;pm8994_gpios 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi<br/>index 10c83e11c272..4cb0b5834143 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/qcom/msm8916-pins.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8916-pins.dtsi</a></div><div class='hunk'>@@ -720,4 +720,17 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	wcnss_pin_a: wcnss-active {</div><div class='add'>+		pinmux {</div><div class='add'>+			pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44";</div><div class='add'>+			function = "wcss_wlan";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pinconf {</div><div class='add'>+			pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44";</div><div class='add'>+			drive-strength = &lt;6&gt;;</div><div class='add'>+			bias-pull-up;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi<br/>index 466ca5705c99..68a8e67cba29 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8916.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/qcom/msm8916.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8916.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8916.dtsi</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/clock/qcom,gcc-msm8916.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/reset/qcom,gcc-msm8916.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/qcom,rpmcc.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Qualcomm Technologies, Inc. MSM8916";</div><div class='hunk'>@@ -77,12 +78,12 @@</div><div class='ctx'> 			no-map;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		mpss@86800000 {</div><div class='add'>+		mpss_mem: mpss@86800000 {</div><div class='ctx'> 			reg = &lt;0x0 0x86800000 0x0 0x2b00000&gt;;</div><div class='ctx'> 			no-map;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		wcnss@89300000 {</div><div class='add'>+		wcnss_mem: wcnss@89300000 {</div><div class='ctx'> 			reg = &lt;0x0 0x89300000 0x0 0x600000&gt;;</div><div class='ctx'> 			no-map;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -504,6 +505,15 @@</div><div class='ctx'> 			reg-names = "lpass-lpaif";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+                lpass_codec: codec{</div><div class='add'>+			compatible = "qcom,msm8916-wcd-digital-codec";</div><div class='add'>+			reg = &lt;0x0771c000 0x400&gt;;</div><div class='add'>+			clocks = &lt;&amp;gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK&gt;,</div><div class='add'>+				 &lt;&amp;gcc GCC_CODEC_DIGCODEC_CLK&gt;;</div><div class='add'>+			clock-names = "ahbix-clk", "mclk";</div><div class='add'>+			#sound-dai-cells = &lt;1&gt;;</div><div class='add'>+                };</div><div class='add'>+</div><div class='ctx'> 		sdhc_1: sdhci@07824000 {</div><div class='ctx'> 			compatible = "qcom,sdhci-msm-v4";</div><div class='ctx'> 			reg = &lt;0x07824900 0x11c&gt;, &lt;0x07824000 0x800&gt;;</div><div class='hunk'>@@ -512,8 +522,10 @@</div><div class='ctx'> 			interrupts = &lt;0 123 0&gt;, &lt;0 138 0&gt;;</div><div class='ctx'> 			interrupt-names = "hc_irq", "pwr_irq";</div><div class='ctx'> 			clocks = &lt;&amp;gcc GCC_SDCC1_APPS_CLK&gt;,</div><div class='del'>-				 &lt;&amp;gcc GCC_SDCC1_AHB_CLK&gt;;</div><div class='del'>-			clock-names = "core", "iface";</div><div class='add'>+				 &lt;&amp;gcc GCC_SDCC1_AHB_CLK&gt;,</div><div class='add'>+				 &lt;&amp;xo_board&gt;;</div><div class='add'>+			clock-names = "core", "iface", "xo";</div><div class='add'>+			mmc-ddr-1_8v;</div><div class='ctx'> 			bus-width = &lt;8&gt;;</div><div class='ctx'> 			non-removable;</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -527,8 +539,9 @@</div><div class='ctx'> 			interrupts = &lt;0 125 0&gt;, &lt;0 221 0&gt;;</div><div class='ctx'> 			interrupt-names = "hc_irq", "pwr_irq";</div><div class='ctx'> 			clocks = &lt;&amp;gcc GCC_SDCC2_APPS_CLK&gt;,</div><div class='del'>-				 &lt;&amp;gcc GCC_SDCC2_AHB_CLK&gt;;</div><div class='del'>-			clock-names = "core", "iface";</div><div class='add'>+				 &lt;&amp;gcc GCC_SDCC2_AHB_CLK&gt;,</div><div class='add'>+				 &lt;&amp;xo_board&gt;;</div><div class='add'>+			clock-names = "core", "iface", "xo";</div><div class='ctx'> 			bus-width = &lt;4&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -801,6 +814,359 @@</div><div class='ctx'> 				clock-names = "iface_clk";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		hexagon@4080000 {</div><div class='add'>+			compatible = "qcom,q6v5-pil";</div><div class='add'>+			reg = &lt;0x04080000 0x100&gt;,</div><div class='add'>+			      &lt;0x04020000 0x040&gt;;</div><div class='add'>+</div><div class='add'>+			reg-names = "qdsp6", "rmb";</div><div class='add'>+</div><div class='add'>+			interrupts-extended = &lt;&amp;intc 0 24 1&gt;,</div><div class='add'>+					      &lt;&amp;hexagon_smp2p_in 0 0&gt;,</div><div class='add'>+					      &lt;&amp;hexagon_smp2p_in 1 0&gt;,</div><div class='add'>+					      &lt;&amp;hexagon_smp2p_in 2 0&gt;,</div><div class='add'>+					      &lt;&amp;hexagon_smp2p_in 3 0&gt;;</div><div class='add'>+			interrupt-names = "wdog", "fatal", "ready",</div><div class='add'>+					  "handover", "stop-ack";</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;gcc GCC_MSS_CFG_AHB_CLK&gt;,</div><div class='add'>+				 &lt;&amp;gcc GCC_MSS_Q6_BIMC_AXI_CLK&gt;,</div><div class='add'>+				 &lt;&amp;gcc GCC_BOOT_ROM_AHB_CLK&gt;;</div><div class='add'>+			clock-names = "iface", "bus", "mem";</div><div class='add'>+</div><div class='add'>+			qcom,smem-states = &lt;&amp;hexagon_smp2p_out 0&gt;;</div><div class='add'>+			qcom,smem-state-names = "stop";</div><div class='add'>+</div><div class='add'>+			resets = &lt;&amp;scm 0&gt;;</div><div class='add'>+			reset-names = "mss_restart";</div><div class='add'>+</div><div class='add'>+			mx-supply = &lt;&amp;pm8916_l3&gt;;</div><div class='add'>+			pll-supply = &lt;&amp;pm8916_l7&gt;;</div><div class='add'>+</div><div class='add'>+			qcom,halt-regs = &lt;&amp;tcsr 0x18000 0x19000 0x1a000&gt;;</div><div class='add'>+</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			mba {</div><div class='add'>+				memory-region = &lt;&amp;mba_mem&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mpss {</div><div class='add'>+				memory-region = &lt;&amp;mpss_mem&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pronto: wcnss@a21b000 {</div><div class='add'>+			compatible = "qcom,pronto-v2-pil", "qcom,pronto";</div><div class='add'>+			reg = &lt;0x0a204000 0x2000&gt;, &lt;0x0a202000 0x1000&gt;, &lt;0x0a21b000 0x3000&gt;;</div><div class='add'>+			reg-names = "ccu", "dxe", "pmu";</div><div class='add'>+</div><div class='add'>+			memory-region = &lt;&amp;wcnss_mem&gt;;</div><div class='add'>+</div><div class='add'>+			interrupts-extended = &lt;&amp;intc 0 149 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+					      &lt;&amp;wcnss_smp2p_in 0 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+					      &lt;&amp;wcnss_smp2p_in 1 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+					      &lt;&amp;wcnss_smp2p_in 2 IRQ_TYPE_EDGE_RISING&gt;,</div><div class='add'>+					      &lt;&amp;wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+			interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";</div><div class='add'>+</div><div class='add'>+			vddmx-supply = &lt;&amp;pm8916_l3&gt;;</div><div class='add'>+			vddpx-supply = &lt;&amp;pm8916_l7&gt;;</div><div class='add'>+</div><div class='add'>+			qcom,state = &lt;&amp;wcnss_smp2p_out 0&gt;;</div><div class='add'>+			qcom,state-names = "stop";</div><div class='add'>+</div><div class='add'>+			pinctrl-names = "default";</div><div class='add'>+			pinctrl-0 = &lt;&amp;wcnss_pin_a&gt;;</div><div class='add'>+</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			iris {</div><div class='add'>+				compatible = "qcom,wcn3620";</div><div class='add'>+</div><div class='add'>+				clocks = &lt;&amp;rpmcc RPM_SMD_RF_CLK2&gt;;</div><div class='add'>+				clock-names = "xo";</div><div class='add'>+</div><div class='add'>+				vddxo-supply = &lt;&amp;pm8916_l7&gt;;</div><div class='add'>+				vddrfa-supply = &lt;&amp;pm8916_s3&gt;;</div><div class='add'>+				vddpa-supply = &lt;&amp;pm8916_l9&gt;;</div><div class='add'>+				vdddig-supply = &lt;&amp;pm8916_l5&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			smd-edge {</div><div class='add'>+				interrupts = &lt;0 142 1&gt;;</div><div class='add'>+</div><div class='add'>+				qcom,ipc = &lt;&amp;apcs 8 17&gt;;</div><div class='add'>+				qcom,smd-edge = &lt;6&gt;;</div><div class='add'>+				qcom,remote-pid = &lt;4&gt;;</div><div class='add'>+</div><div class='add'>+				label = "pronto";</div><div class='add'>+</div><div class='add'>+				wcnss {</div><div class='add'>+					compatible = "qcom,wcnss";</div><div class='add'>+					qcom,smd-channels = "WCNSS_CTRL";</div><div class='add'>+</div><div class='add'>+					qcom,mmio = &lt;&amp;pronto&gt;;</div><div class='add'>+</div><div class='add'>+					bt {</div><div class='add'>+						compatible = "qcom,wcnss-bt";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					wifi {</div><div class='add'>+						compatible = "qcom,wcnss-wlan";</div><div class='add'>+</div><div class='add'>+						interrupts = &lt;0 145 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+							     &lt;0 146 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+						interrupt-names = "tx", "rx";</div><div class='add'>+</div><div class='add'>+						qcom,smem-states = &lt;&amp;apps_smsm 10&gt;, &lt;&amp;apps_smsm 9&gt;;</div><div class='add'>+						qcom,smem-state-names = "tx-enable", "tx-rings-empty";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tpiu@820000 {</div><div class='add'>+			compatible = "arm,coresight-tpiu", "arm,primecell";</div><div class='add'>+			reg = &lt;0x820000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;, &lt;&amp;rpmcc RPM_QDSS_A_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk", "atclk";</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				tpiu_in: endpoint {</div><div class='add'>+					slave-mode;</div><div class='add'>+					remote-endpoint = &lt;&amp;replicator_out1&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		funnel@821000 {</div><div class='add'>+			compatible = "arm,coresight-funnel", "arm,primecell";</div><div class='add'>+			reg = &lt;0x821000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;, &lt;&amp;rpmcc RPM_QDSS_A_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk", "atclk";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				/*</div><div class='add'>+				 * Not described input ports:</div><div class='add'>+				 * 0 - connected to Resource and Power Manger CPU ETM</div><div class='add'>+				 * 1 - not-connected</div><div class='add'>+				 * 2 - connected to Modem CPU ETM</div><div class='add'>+				 * 3 - not-connected</div><div class='add'>+				 * 5 - not-connected</div><div class='add'>+				 * 6 - connected trought funnel to Wireless CPU ETM</div><div class='add'>+				 * 7 - connected to STM component</div><div class='add'>+				 */</div><div class='add'>+</div><div class='add'>+				port@4 {</div><div class='add'>+					reg = &lt;4&gt;;</div><div class='add'>+					funnel0_in4: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;funnel1_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@8 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					funnel0_out: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;etf_in&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		replicator@824000 {</div><div class='add'>+			compatible = "qcom,coresight-replicator1x", "arm,primecell";</div><div class='add'>+			reg = &lt;0x824000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;, &lt;&amp;rpmcc RPM_QDSS_A_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk", "atclk";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					replicator_out0: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;etr_in&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@1 {</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+					replicator_out1: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;tpiu_in&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@2 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					replicator_in: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;etf_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etf@825000 {</div><div class='add'>+			compatible = "arm,coresight-tmc", "arm,primecell";</div><div class='add'>+			reg = &lt;0x825000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;, &lt;&amp;rpmcc RPM_QDSS_A_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk", "atclk";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					etf_out: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;funnel0_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@1 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					etf_in: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;replicator_in&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etr@826000 {</div><div class='add'>+			compatible = "arm,coresight-tmc", "arm,primecell";</div><div class='add'>+			reg = &lt;0x826000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;, &lt;&amp;rpmcc RPM_QDSS_A_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk", "atclk";</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				etr_in: endpoint {</div><div class='add'>+					slave-mode;</div><div class='add'>+					remote-endpoint = &lt;&amp;replicator_out0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		funnel@841000 {	/* APSS funnel only 4 inputs are used */</div><div class='add'>+			compatible = "arm,coresight-funnel", "arm,primecell";</div><div class='add'>+			reg = &lt;0x841000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;, &lt;&amp;rpmcc RPM_QDSS_A_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk", "atclk";</div><div class='add'>+</div><div class='add'>+			ports {</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+				port@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					funnel1_in0: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;etm0_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@1 {</div><div class='add'>+					reg = &lt;1&gt;;</div><div class='add'>+					funnel1_in1: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;etm1_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@2 {</div><div class='add'>+					reg = &lt;2&gt;;</div><div class='add'>+					funnel1_in2: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;etm2_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@3 {</div><div class='add'>+					reg = &lt;3&gt;;</div><div class='add'>+					funnel1_in3: endpoint {</div><div class='add'>+						slave-mode;</div><div class='add'>+						remote-endpoint = &lt;&amp;etm3_out&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+				port@4 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					funnel1_out: endpoint {</div><div class='add'>+						remote-endpoint = &lt;&amp;funnel0_in4&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etm@85c000 {</div><div class='add'>+			compatible = "arm,coresight-etm4x", "arm,primecell";</div><div class='add'>+			reg = &lt;0x85c000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;, &lt;&amp;rpmcc RPM_QDSS_A_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk", "atclk";</div><div class='add'>+</div><div class='add'>+			cpu = &lt;&amp;CPU0&gt;;</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				etm0_out: endpoint {</div><div class='add'>+				remote-endpoint = &lt;&amp;funnel1_in0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etm@85d000 {</div><div class='add'>+			compatible = "arm,coresight-etm4x", "arm,primecell";</div><div class='add'>+			reg = &lt;0x85d000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;, &lt;&amp;rpmcc RPM_QDSS_A_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk", "atclk";</div><div class='add'>+</div><div class='add'>+			cpu = &lt;&amp;CPU1&gt;;</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				etm1_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;funnel1_in1&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etm@85e000 {</div><div class='add'>+			compatible = "arm,coresight-etm4x", "arm,primecell";</div><div class='add'>+			reg = &lt;0x85e000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;, &lt;&amp;rpmcc RPM_QDSS_A_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk", "atclk";</div><div class='add'>+</div><div class='add'>+			cpu = &lt;&amp;CPU2&gt;;</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				etm2_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;funnel1_in2&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		etm@85f000 {</div><div class='add'>+			compatible = "arm,coresight-etm4x", "arm,primecell";</div><div class='add'>+			reg = &lt;0x85f000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			clocks = &lt;&amp;rpmcc RPM_QDSS_CLK&gt;, &lt;&amp;rpmcc RPM_QDSS_A_CLK&gt;;</div><div class='add'>+			clock-names = "apb_pclk", "atclk";</div><div class='add'>+</div><div class='add'>+			cpu = &lt;&amp;CPU3&gt;;</div><div class='add'>+</div><div class='add'>+			port {</div><div class='add'>+				etm3_out: endpoint {</div><div class='add'>+					remote-endpoint = &lt;&amp;funnel1_in3&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	smd {</div><div class='hunk'>@@ -816,7 +1182,7 @@</div><div class='ctx'> 				qcom,smd-channels = "rpm_requests";</div><div class='ctx'> </div><div class='ctx'> 				rpmcc: qcom,rpmcc {</div><div class='del'>-					compatible = "qcom,rpmcc-msm8916", "qcom,rpmcc";</div><div class='add'>+					compatible = "qcom,rpmcc-msm8916";</div><div class='ctx'> 					#clock-cells = &lt;1&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='hunk'>@@ -848,6 +1214,14 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		hexagon {</div><div class='add'>+			interrupts = &lt;0 25 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+</div><div class='add'>+			qcom,smd-edge = &lt;0&gt;;</div><div class='add'>+			qcom,ipc = &lt;&amp;apcs 8 12&gt;;</div><div class='add'>+			qcom,remote-pid = &lt;1&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	hexagon-smp2p {</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts<br/>new file mode 100644<br/>index 000000000000..454213391671<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/* Copyright (c) 2015, LGE Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 and</div><div class='add'>+ * only version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "msm8992.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "LG Nexus 5X";</div><div class='add'>+	compatible = "lg,bullhead", "qcom,msm8992";</div><div class='add'>+	/* required for bootloader to select correct board */</div><div class='add'>+	qcom,board-id = &lt;0xb64 0&gt;;</div><div class='add'>+	qcom,pmic-id = &lt;0x10009 0x1000A 0x0 0x0&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;blsp1_uart2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		serial@f991e000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+			pinctrl-names = "default", "sleep";</div><div class='add'>+			pinctrl-0 = &lt;&amp;blsp1_uart2_default&gt;;</div><div class='add'>+			pinctrl-1 = &lt;&amp;blsp1_uart2_sleep&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi<br/>new file mode 100644<br/>index 000000000000..d2a26f0f8d73<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8992-pins.dtsi</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 and</div><div class='add'>+ * only version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;msmgpio {</div><div class='add'>+	blsp1_uart2_default: blsp1_uart2_default {</div><div class='add'>+		pinmux {</div><div class='add'>+			function = "blsp_uart2";</div><div class='add'>+			pins = "gpio4", "gpio5";</div><div class='add'>+		};</div><div class='add'>+		pinconf {</div><div class='add'>+			pins = "gpio4", "gpio5";</div><div class='add'>+			drive-strength = &lt;16&gt;;</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	blsp1_uart2_sleep: blsp1_uart2_sleep {</div><div class='add'>+		pinmux {</div><div class='add'>+			function = "gpio";</div><div class='add'>+			pins = "gpio4", "gpio5";</div><div class='add'>+		};</div><div class='add'>+		pinconf {</div><div class='add'>+			pins = "gpio4", "gpio5";</div><div class='add'>+			drive-strength = &lt;2&gt;;</div><div class='add'>+			bias-pull-down;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi<br/>new file mode 100644<br/>index 000000000000..44b2d37d8c4b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8992.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8992.dtsi</a></div><div class='hunk'>@@ -0,0 +1,184 @@</div><div class='add'>+/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 and</div><div class='add'>+ * only version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/qcom,gcc-msm8994.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Qualcomm Technologies, Inc. MSM 8992";</div><div class='add'>+	compatible = "qcom,msm8992";</div><div class='add'>+	// msm-id needed by bootloader for selecting correct blob</div><div class='add'>+	qcom,msm-id = &lt;251 0&gt;, &lt;252 0&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	chosen { };</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		cpu-map {</div><div class='add'>+			cluster0 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;CPU0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		CPU0: cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			reg = &lt;0x0 0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='add'>+			L2_0: l2-cache {</div><div class='add'>+				compatible = "cache";</div><div class='add'>+				cache-level = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "arm,armv8-timer";</div><div class='add'>+		interrupts = &lt;GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;,</div><div class='add'>+			     &lt;GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	xo_board: xo_board {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;19200000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sleep_clk: sleep_clk {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;32768&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges = &lt;0 0 0 0xffffffff&gt;;</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+</div><div class='add'>+		intc: interrupt-controller@f9000000 {</div><div class='add'>+			compatible = "qcom,msm-qgic2";</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			reg = &lt;0xf9000000 0x1000&gt;,</div><div class='add'>+				&lt;0xf9002000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@f9020000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+			compatible = "arm,armv7-timer-mem";</div><div class='add'>+			reg = &lt;0xf9020000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			frame@f9021000 {</div><div class='add'>+				frame-number = &lt;0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+						&lt;GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9021000 0x1000&gt;,</div><div class='add'>+					&lt;0xf9022000 0x1000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9023000 {</div><div class='add'>+				frame-number = &lt;1&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9023000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9024000 {</div><div class='add'>+				frame-number = &lt;2&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9024000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9025000 {</div><div class='add'>+				frame-number = &lt;3&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9025000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9026000 {</div><div class='add'>+				frame-number = &lt;4&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9026000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9027000 {</div><div class='add'>+				frame-number = &lt;5&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9027000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9028000 {</div><div class='add'>+				frame-number = &lt;6&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9028000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		restart@fc4ab000 {</div><div class='add'>+			compatible = "qcom,pshold";</div><div class='add'>+			reg = &lt;0xfc4ab000 0x4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		msmgpio: pinctrl@fd510000 {</div><div class='add'>+			compatible = "qcom,msm8994-pinctrl";</div><div class='add'>+			reg = &lt;0xfd510000 0x4000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		blsp1_uart2: serial@f991e000 {</div><div class='add'>+			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";</div><div class='add'>+			reg = &lt;0xf991e000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 108 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			clock-names = "core", "iface";</div><div class='add'>+			clocks = &lt;&amp;clock_gcc GCC_BLSP1_UART2_APPS_CLK&gt;,</div><div class='add'>+				&lt;&amp;clock_gcc GCC_BLSP1_AHB_CLK&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clock_gcc: clock-controller@fc400000 {</div><div class='add'>+			compatible = "qcom,gcc-msm8994";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			#reset-cells = &lt;1&gt;;</div><div class='add'>+			#power-domain-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0xfc400000 0x2000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0 0 0 0&gt;; // bootloader will update</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "msm8992-pins.dtsi"</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts<br/>new file mode 100644<br/>index 000000000000..dfa08f513dc4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/* Copyright (c) 2015, Huawei Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 and</div><div class='add'>+ * only version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "msm8994.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Huawei Nexus 6P";</div><div class='add'>+	compatible = "huawei,angler", "qcom,msm8994";</div><div class='add'>+	/* required for bootloader to select correct board */</div><div class='add'>+	qcom,board-id = &lt;8026 0&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;blsp1_uart2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		serial@f991e000 {</div><div class='add'>+			status = "okay";</div><div class='add'>+			pinctrl-names = "default", "sleep";</div><div class='add'>+			pinctrl-0 = &lt;&amp;blsp1_uart2_default&gt;;</div><div class='add'>+			pinctrl-1 = &lt;&amp;blsp1_uart2_sleep&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/msm8994-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8994-pins.dtsi<br/>new file mode 100644<br/>index 000000000000..0e4eea0df25d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8994-pins.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8994-pins.dtsi</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 and</div><div class='add'>+ * only version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;msmgpio {</div><div class='add'>+	blsp1_uart2_default: blsp1_uart2_default {</div><div class='add'>+		pinmux {</div><div class='add'>+			function = "blsp_uart2";</div><div class='add'>+			pins = "gpio4", "gpio5";</div><div class='add'>+		};</div><div class='add'>+		pinconf {</div><div class='add'>+			pins = "gpio4", "gpio5";</div><div class='add'>+			drive-strength = &lt;16&gt;;</div><div class='add'>+			bias-disable;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	blsp1_uart2_sleep: blsp1_uart2_sleep {</div><div class='add'>+		pinmux {</div><div class='add'>+			function = "gpio";</div><div class='add'>+			pins = "gpio4", "gpio5";</div><div class='add'>+		};</div><div class='add'>+		pinconf {</div><div class='add'>+			pins = "gpio4", "gpio5";</div><div class='add'>+			drive-strength = &lt;2&gt;;</div><div class='add'>+			bias-pull-down;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi<br/>new file mode 100644<br/>index 000000000000..f33c41d01c86<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8994.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8994.dtsi</a></div><div class='hunk'>@@ -0,0 +1,216 @@</div><div class='add'>+/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 and</div><div class='add'>+ * only version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/qcom,gcc-msm8994.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Qualcomm Technologies, Inc. MSM 8994";</div><div class='add'>+	compatible = "qcom,msm8994";</div><div class='add'>+	// msm-id and pmic-id are required by bootloader for</div><div class='add'>+	// proper selection of dt blob</div><div class='add'>+	qcom,msm-id = &lt;207 0x20000&gt;;</div><div class='add'>+	qcom,pmic-id = &lt;0x10009 0x1000A 0x0 0x0&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	chosen { };</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		cpu-map {</div><div class='add'>+			cluster0 {</div><div class='add'>+				core0 {</div><div class='add'>+					cpu = &lt;&amp;CPU0&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		CPU0: cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='add'>+			L2_0: l2-cache {</div><div class='add'>+			      compatible = "cache";</div><div class='add'>+			      cache-level = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "arm,armv8-timer";</div><div class='add'>+		interrupts = &lt;1 2 0xff08&gt;,</div><div class='add'>+			     &lt;1 3 0xff08&gt;,</div><div class='add'>+			     &lt;1 4 0xff08&gt;,</div><div class='add'>+			     &lt;1 1 0xff08&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc: soc {</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges = &lt;0 0 0 0xffffffff&gt;;</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+</div><div class='add'>+		intc: interrupt-controller@f9000000 {</div><div class='add'>+			compatible = "qcom,msm-qgic2";</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;3&gt;;</div><div class='add'>+			reg = &lt;0xf9000000 0x1000&gt;,</div><div class='add'>+				  &lt;0xf9002000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer@f9020000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges;</div><div class='add'>+			compatible = "arm,armv7-timer-mem";</div><div class='add'>+			reg = &lt;0xf9020000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			frame@f9021000 {</div><div class='add'>+				frame-number = &lt;0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+					     &lt;GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9021000 0x1000&gt;,</div><div class='add'>+				      &lt;0xf9022000 0x1000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9023000 {</div><div class='add'>+				frame-number = &lt;1&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9023000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9024000 {</div><div class='add'>+				frame-number = &lt;2&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9024000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9025000 {</div><div class='add'>+				frame-number = &lt;3&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9025000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9026000 {</div><div class='add'>+				frame-number = &lt;4&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9026000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9027000 {</div><div class='add'>+				frame-number = &lt;5&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9027000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			frame@f9028000 {</div><div class='add'>+				frame-number = &lt;6&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+				reg = &lt;0xf9028000 0x1000&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		restart@fc4ab000 {</div><div class='add'>+			compatible = "qcom,pshold";</div><div class='add'>+			reg = &lt;0xfc4ab000 0x4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		msmgpio: pinctrl@fd510000 {</div><div class='add'>+			compatible = "qcom,msm8994-pinctrl";</div><div class='add'>+			reg = &lt;0xfd510000 0x4000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		blsp1_uart2: serial@f991e000 {</div><div class='add'>+			compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";</div><div class='add'>+			reg = &lt;0xf991e000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+			clock-names = "core", "iface";</div><div class='add'>+			clocks = &lt;&amp;clock_gcc GCC_BLSP1_UART2_APPS_CLK&gt;,</div><div class='add'>+				 &lt;&amp;clock_gcc GCC_BLSP1_AHB_CLK&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tcsr_mutex_regs: syscon@fd484000 {</div><div class='add'>+			compatible = "syscon";</div><div class='add'>+			reg = &lt;0xfd484000 0x2000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clock_gcc: clock-controller@fc400000 {</div><div class='add'>+			compatible = "qcom,gcc-msm8994";</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+			#reset-cells = &lt;1&gt;;</div><div class='add'>+			#power-domain-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0xfc400000 0x2000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		// We expect the bootloader to fill in the reg</div><div class='add'>+		reg = &lt;0 0 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	xo_board: xo_board {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;19200000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sleep_clk: sleep_clk {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;32768&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		smem_mem: smem_region@6a00000 {</div><div class='add'>+			reg = &lt;0x0 0x6a00000 0x0 0x200000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	tcsr_mutex: hwlock {</div><div class='add'>+		compatible = "qcom,tcsr-mutex";</div><div class='add'>+		syscon = &lt;&amp;tcsr_mutex_regs 0 0x80&gt;;</div><div class='add'>+		#hwlock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qcom,smem@6a00000 {</div><div class='add'>+		compatible = "qcom,smem";</div><div class='add'>+		memory-region = &lt;&amp;smem_mem&gt;;</div><div class='add'>+		hwlocks = &lt;&amp;tcsr_mutex 3&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "msm8994-pins.dtsi"</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi<br/>index 338f82a7fdc7..ed7223d3c8cb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8996.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/qcom/msm8996.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/msm8996.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/msm8996.dtsi</a></div><div class='hunk'>@@ -30,6 +30,52 @@</div><div class='ctx'> 		reg = &lt;0 0 0 0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		mba_region: mba@91500000 {</div><div class='add'>+			reg = &lt;0x0 0x91500000 0x0 0x200000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		slpi_region: slpi@90b00000 {</div><div class='add'>+			reg = &lt;0x0 0x90b00000 0x0 0xa00000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		venus_region: venus@90400000 {</div><div class='add'>+			reg = &lt;0x0 0x90400000 0x0 0x700000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		adsp_region: adsp@8ea00000 {</div><div class='add'>+			reg = &lt;0x0 0x8ea00000 0x0 0x1a00000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mpss_region: mpss@88800000 {</div><div class='add'>+			reg = &lt;0x0 0x88800000 0x0 0x6200000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		smem_mem: smem-mem@86000000 {</div><div class='add'>+			reg = &lt;0x0 0x86000000 0x0 0x200000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		memory@85800000 {</div><div class='add'>+			reg = &lt;0x0 0x85800000 0x0 0x800000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		memory@86200000 {</div><div class='add'>+			reg = &lt;0x0 0x86200000 0x0 0x2600000&gt;;</div><div class='add'>+			no-map;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	cpus {</div><div class='ctx'> 		#address-cells = &lt;2&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='hunk'>@@ -192,14 +238,14 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	clocks {</div><div class='del'>-		xo_board {</div><div class='add'>+		xo_board: xo_board {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			clock-frequency = &lt;19200000&gt;;</div><div class='ctx'> 			clock-output-names = "xo_board";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		sleep_clk {</div><div class='add'>+		sleep_clk: sleep_clk {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='ctx'> 			#clock-cells = &lt;0&gt;;</div><div class='ctx'> 			clock-frequency = &lt;32764&gt;;</div><div class='hunk'>@@ -212,12 +258,35 @@</div><div class='ctx'> 		method = "smc";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	firmware {</div><div class='add'>+		scm {</div><div class='add'>+			compatible = "qcom,scm-msm8996";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	tcsr_mutex: hwlock {</div><div class='add'>+		compatible = "qcom,tcsr-mutex";</div><div class='add'>+		syscon = &lt;&amp;tcsr_mutex_regs 0 0x1000&gt;;</div><div class='add'>+		#hwlock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	smem {</div><div class='add'>+		compatible = "qcom,smem";</div><div class='add'>+		memory-region = &lt;&amp;smem_mem&gt;;</div><div class='add'>+		hwlocks = &lt;&amp;tcsr_mutex 3&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	soc: soc {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='ctx'> 		ranges = &lt;0 0 0 0xffffffff&gt;;</div><div class='ctx'> 		compatible = "simple-bus";</div><div class='ctx'> </div><div class='add'>+		tcsr_mutex_regs: syscon@740000 {</div><div class='add'>+			compatible = "syscon";</div><div class='add'>+			reg = &lt;0x740000 0x20000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		intc: interrupt-controller@9bc0000 {</div><div class='ctx'> 			compatible = "arm,gic-v3";</div><div class='ctx'> 			#interrupt-cells = &lt;3&gt;;</div><div class='hunk'>@@ -229,6 +298,11 @@</div><div class='ctx'> 			interrupts = &lt;GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		apcs: syscon@9820000 {</div><div class='add'>+			compatible = "syscon";</div><div class='add'>+			reg = &lt;0x9820000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		gcc: clock-controller@300000 {</div><div class='ctx'> 			compatible = "qcom,gcc-msm8996";</div><div class='ctx'> 			#clock-cells = &lt;1&gt;;</div><div class='hunk'>@@ -347,9 +421,10 @@</div><div class='ctx'> 			 interrupts = &lt;0 125 0&gt;, &lt;0 221 0&gt;;</div><div class='ctx'> 			 interrupt-names = "hc_irq", "pwr_irq";</div><div class='ctx'> </div><div class='del'>-			 clock-names = "iface", "core";</div><div class='add'>+			 clock-names = "iface", "core", "xo";</div><div class='ctx'> 			 clocks = &lt;&amp;gcc GCC_SDCC2_AHB_CLK&gt;,</div><div class='del'>-			 &lt;&amp;gcc GCC_SDCC2_APPS_CLK&gt;;</div><div class='add'>+			 &lt;&amp;gcc GCC_SDCC2_APPS_CLK&gt;,</div><div class='add'>+			 &lt;&amp;xo_board&gt;;</div><div class='ctx'> 			 bus-width = &lt;4&gt;;</div><div class='ctx'> 		 };</div><div class='ctx'> </div><div class='hunk'>@@ -458,5 +533,29 @@</div><div class='ctx'> 					       &lt;825000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	adsp-smp2p {</div><div class='add'>+		compatible = "qcom,smp2p";</div><div class='add'>+		qcom,smem = &lt;443&gt;, &lt;429&gt;;</div><div class='add'>+</div><div class='add'>+		interrupts = &lt;0 158 IRQ_TYPE_EDGE_RISING&gt;;</div><div class='add'>+</div><div class='add'>+		qcom,ipc = &lt;&amp;apcs 16 10&gt;;</div><div class='add'>+</div><div class='add'>+		qcom,local-pid = &lt;0&gt;;</div><div class='add'>+		qcom,remote-pid = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+		adsp_smp2p_out: master-kernel {</div><div class='add'>+			qcom,entry-name = "master-kernel";</div><div class='add'>+			#qcom,state-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		adsp_smp2p_in: slave-kernel {</div><div class='add'>+			qcom,entry-name = "slave-kernel";</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> #include "msm8996-pins.dtsi"</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi<br/>index f71679b15d54..53deebf9f515 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/pm8916.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/qcom/pm8916.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/pm8916.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/pm8916.dtsi</a></div><div class='hunk'>@@ -91,9 +91,52 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pm8916_1: pm8916@1 {</div><div class='del'>-		compatible = "qcom,spmi-pmic";</div><div class='add'>+		compatible = "qcom,pm8916", "qcom,spmi-pmic";</div><div class='ctx'> 		reg = &lt;0x1 SPMI_USID&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+                wcd_codec: codec@f000 {</div><div class='add'>+                       compatible = "qcom,pm8916-wcd-analog-codec";</div><div class='add'>+	               reg = &lt;0xf000 0x200&gt;;</div><div class='add'>+	               reg-names = "pmic-codec-core";</div><div class='add'>+	               clocks = &lt;&amp;gcc GCC_CODEC_DIGCODEC_CLK&gt;;</div><div class='add'>+	               clock-names = "mclk";</div><div class='add'>+	               interrupt-parent = &lt;&amp;spmi_bus&gt;;</div><div class='add'>+	               interrupts = &lt;0x1 0xf0 0x0 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf0 0x1 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf0 0x2 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf0 0x3 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf0 0x4 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf0 0x5 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf0 0x6 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf0 0x7 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf1 0x0 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf1 0x1 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf1 0x2 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf1 0x3 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf1 0x4 IRQ_TYPE_NONE&gt;,</div><div class='add'>+	                            &lt;0x1 0xf1 0x5 IRQ_TYPE_NONE&gt;;</div><div class='add'>+	               interrupt-names = "cdc_spk_cnp_int",</div><div class='add'>+	                                 "cdc_spk_clip_int",</div><div class='add'>+	                                 "cdc_spk_ocp_int",</div><div class='add'>+	                                 "mbhc_ins_rem_det1",</div><div class='add'>+	                                 "mbhc_but_rel_det",</div><div class='add'>+	                                 "mbhc_but_press_det",</div><div class='add'>+	                                 "mbhc_ins_rem_det",</div><div class='add'>+	                                 "mbhc_switch_int",</div><div class='add'>+	                                 "cdc_ear_ocp_int",</div><div class='add'>+	                                 "cdc_hphr_ocp_int",</div><div class='add'>+	                                 "cdc_hphl_ocp_det",</div><div class='add'>+	                                 "cdc_ear_cnp_int",</div><div class='add'>+	                                 "cdc_hphr_cnp_int",</div><div class='add'>+	                                 "cdc_hphl_cnp_int";</div><div class='add'>+	               vdd-cdc-io-supply = &lt;&amp;pm8916_l5&gt;;</div><div class='add'>+	               vdd-cdc-tx-rx-cx-supply = &lt;&amp;pm8916_l5&gt;;</div><div class='add'>+	               vdd-micbias-supply = &lt;&amp;pm8916_l13&gt;;</div><div class='add'>+	               #sound-dai-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+                };</div><div class='add'>+</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/qcom/pm8994.dtsi b/arch/arm64/boot/dts/qcom/pm8994.dtsi<br/>index 1222d2e904f6..0f1866024ae3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/pm8994.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/qcom/pm8994.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/qcom/pm8994.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/qcom/pm8994.dtsi</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> 				     &lt;0 0xcc 0 IRQ_TYPE_NONE&gt;,</div><div class='ctx'> 				     &lt;0 0xcd 0 IRQ_TYPE_NONE&gt;,</div><div class='ctx'> 				     &lt;0 0xce 0 IRQ_TYPE_NONE&gt;,</div><div class='add'>+				     &lt;0 0xcf 0 IRQ_TYPE_NONE&gt;,</div><div class='ctx'> 				     &lt;0 0xd0 0 IRQ_TYPE_NONE&gt;,</div><div class='ctx'> 				     &lt;0 0xd1 0 IRQ_TYPE_NONE&gt;,</div><div class='ctx'> 				     &lt;0 0xd2 0 IRQ_TYPE_NONE&gt;,</div><div class='head'>diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile<br/>index eb72830ec9eb..1618e0a3c81d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/renesas/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/Makefile</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb</div><div class='del'>-dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb</div><div class='ctx'> </div><div class='ctx'> always		:= $(dtb-y)</div><div class='ctx'> clean-files	:= *.dtb</div><div class='head'>diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts<br/>index bcb11a868343..c5f8f69a4f5f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Device Tree Source for the H3ULCB board</div><div class='add'>+ * Device Tree Source for the H3ULCB (R-Car Starter Kit Premier) board</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2016 Renesas Electronics Corp.</div><div class='ctx'>  * Copyright (C) 2016 Cogent Embedded, Inc.</div><div class='hunk'>@@ -62,6 +62,24 @@</div><div class='ctx'> 		clock-frequency = &lt;24576000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	reg_1p8v: regulator0 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "fixed-1.8V";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3p3v: regulator1 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "fixed-3.3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	vcc_sdhi0: regulator-vcc-sdhi0 {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> </div><div class='hunk'>@@ -145,18 +163,30 @@</div><div class='ctx'> 		function = "avb";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	sdhi0_pins_3v3: sd0_3v3 {</div><div class='add'>+	sdhi0_pins: sd0 {</div><div class='ctx'> 		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='ctx'> 		function = "sdhi0";</div><div class='ctx'> 		power-source = &lt;3300&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	sdhi0_pins_1v8: sd0_1v8 {</div><div class='add'>+	sdhi0_pins_uhs: sd0_uhs {</div><div class='ctx'> 		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='ctx'> 		function = "sdhi0";</div><div class='ctx'> 		power-source = &lt;1800&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	sdhi2_pins: sd2 {</div><div class='add'>+		groups = "sdhi2_data8", "sdhi2_ctrl";</div><div class='add'>+		function = "sdhi2";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi2_pins_uhs: sd2_uhs {</div><div class='add'>+		groups = "sdhi2_data8", "sdhi2_ctrl";</div><div class='add'>+		function = "sdhi2";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sound_pins: sound {</div><div class='ctx'> 		groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a";</div><div class='ctx'> 		function = "ssi";</div><div class='hunk'>@@ -247,6 +277,8 @@</div><div class='ctx'> 		 &lt;&amp;cpg CPG_MOD 1026&gt;, &lt;&amp;cpg CPG_MOD 1027&gt;,</div><div class='ctx'> 		 &lt;&amp;cpg CPG_MOD 1028&gt;, &lt;&amp;cpg CPG_MOD 1029&gt;,</div><div class='ctx'> 		 &lt;&amp;cpg CPG_MOD 1030&gt;, &lt;&amp;cpg CPG_MOD 1031&gt;,</div><div class='add'>+		 &lt;&amp;cpg CPG_MOD 1020&gt;, &lt;&amp;cpg CPG_MOD 1021&gt;,</div><div class='add'>+		 &lt;&amp;cpg CPG_MOD 1020&gt;, &lt;&amp;cpg CPG_MOD 1021&gt;,</div><div class='ctx'> 		 &lt;&amp;cpg CPG_MOD 1019&gt;, &lt;&amp;cpg CPG_MOD 1018&gt;,</div><div class='ctx'> 		 &lt;&amp;audio_clk_a&gt;, &lt;&amp;cs2000&gt;,</div><div class='ctx'> 		 &lt;&amp;audio_clk_c&gt;,</div><div class='hunk'>@@ -261,8 +293,8 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;sdhi0 {</div><div class='del'>-	pinctrl-0 = &lt;&amp;sdhi0_pins_3v3&gt;;</div><div class='del'>-	pinctrl-1 = &lt;&amp;sdhi0_pins_1v8&gt;;</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdhi0_pins&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi0_pins_uhs&gt;;</div><div class='ctx'> 	pinctrl-names = "default", "state_uhs";</div><div class='ctx'> </div><div class='ctx'> 	vmmc-supply = &lt;&amp;vcc_sdhi0&gt;;</div><div class='hunk'>@@ -273,6 +305,19 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;sdhi2 {</div><div class='add'>+	/* used for on-board 8bit eMMC */</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdhi2_pins&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi2_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;reg_1p8v&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;ssi1 {</div><div class='ctx'> 	shared-pin;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts<br/>index b1eab6876f8c..7a8986edcdc0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts</a></div><div class='hunk'>@@ -62,6 +62,24 @@</div><div class='ctx'> 		clock-frequency = &lt;24576000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	reg_1p8v: regulator0 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "fixed-1.8V";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3p3v: regulator1 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "fixed-3.3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	vcc_sdhi0: regulator-vcc-sdhi0 {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> </div><div class='hunk'>@@ -191,6 +209,10 @@</div><div class='ctx'> 				remote-endpoint = &lt;&amp;adv7123_in&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='add'>+		port@3 {</div><div class='add'>+			lvds_connector: endpoint {</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -237,11 +259,37 @@</div><div class='ctx'> 	sdhi0_pins: sd0 {</div><div class='ctx'> 		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='ctx'> 		function = "sdhi0";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi0_pins_uhs: sd0_uhs {</div><div class='add'>+		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='add'>+		function = "sdhi0";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi2_pins: sd2 {</div><div class='add'>+		groups = "sdhi2_data8", "sdhi2_ctrl";</div><div class='add'>+		function = "sdhi2";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi2_pins_uhs: sd2_uhs {</div><div class='add'>+		groups = "sdhi2_data8", "sdhi2_ctrl";</div><div class='add'>+		function = "sdhi2";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhi3_pins: sd3 {</div><div class='ctx'> 		groups = "sdhi3_data4", "sdhi3_ctrl";</div><div class='ctx'> 		function = "sdhi3";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi3_pins_uhs: sd3_uhs {</div><div class='add'>+		groups = "sdhi3_data4", "sdhi3_ctrl";</div><div class='add'>+		function = "sdhi3";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sound_pins: sound {</div><div class='hunk'>@@ -261,8 +309,20 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb1_pins: usb1 {</div><div class='del'>-		groups = "usb1";</div><div class='del'>-		function = "usb1";</div><div class='add'>+		mux {</div><div class='add'>+			groups = "usb1";</div><div class='add'>+			function = "usb1";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ovc {</div><div class='add'>+			pins = "GP_6_27";</div><div class='add'>+			bias-pull-up;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwen {</div><div class='add'>+			pins = "GP_6_26";</div><div class='add'>+			bias-pull-down;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	usb2_pins: usb2 {</div><div class='hunk'>@@ -352,6 +412,8 @@</div><div class='ctx'> 		 &lt;&amp;cpg CPG_MOD 1026&gt;, &lt;&amp;cpg CPG_MOD 1027&gt;,</div><div class='ctx'> 		 &lt;&amp;cpg CPG_MOD 1028&gt;, &lt;&amp;cpg CPG_MOD 1029&gt;,</div><div class='ctx'> 		 &lt;&amp;cpg CPG_MOD 1030&gt;, &lt;&amp;cpg CPG_MOD 1031&gt;,</div><div class='add'>+		 &lt;&amp;cpg CPG_MOD 1020&gt;, &lt;&amp;cpg CPG_MOD 1021&gt;,</div><div class='add'>+		 &lt;&amp;cpg CPG_MOD 1020&gt;, &lt;&amp;cpg CPG_MOD 1021&gt;,</div><div class='ctx'> 		 &lt;&amp;cpg CPG_MOD 1019&gt;, &lt;&amp;cpg CPG_MOD 1018&gt;,</div><div class='ctx'> 		 &lt;&amp;audio_clk_a&gt;, &lt;&amp;cs2000&gt;,</div><div class='ctx'> 		 &lt;&amp;audio_clk_c&gt;,</div><div class='hunk'>@@ -371,25 +433,42 @@</div><div class='ctx'> </div><div class='ctx'> &amp;sdhi0 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sdhi0_pins&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi0_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='ctx'> </div><div class='ctx'> 	vmmc-supply = &lt;&amp;vcc_sdhi0&gt;;</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;vccq_sdhi0&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio3 12 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	wp-gpios = &lt;&amp;gpio3 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='add'>+	sd-uhs-sdr50;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdhi2 {</div><div class='add'>+	/* used for on-board 8bit eMMC */</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdhi2_pins&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi2_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;reg_1p8v&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	non-removable;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;sdhi3 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;sdhi3_pins&gt;;</div><div class='del'>-	pinctrl-names = "default";</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi3_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='ctx'> </div><div class='ctx'> 	vmmc-supply = &lt;&amp;vcc_sdhi3&gt;;</div><div class='ctx'> 	vqmmc-supply = &lt;&amp;vccq_sdhi3&gt;;</div><div class='ctx'> 	cd-gpios = &lt;&amp;gpio4 15 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	wp-gpios = &lt;&amp;gpio4 16 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='add'>+	sd-uhs-sdr50;</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi<br/>index 8c15040f2540..eac4f29aa5cd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/r8a7795.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/renesas/r8a7795.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/r8a7795.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7795.dtsi</a></div><div class='hunk'>@@ -166,6 +166,9 @@</div><div class='ctx'> 			      &lt;0x0 0xf1060000 0 0x20000&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_PPI 9</div><div class='ctx'> 					(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 408&gt;;</div><div class='add'>+			clock-names = "clk";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		wdt0: watchdog@e6020000 {</div><div class='hunk'>@@ -321,76 +324,20 @@</div><div class='ctx'> 			#power-domain-cells = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		sysc: system-controller@e6180000 {</div><div class='del'>-			compatible = "renesas,r8a7795-sysc";</div><div class='del'>-			reg = &lt;0 0xe6180000 0 0x0400&gt;;</div><div class='del'>-			#power-domain-cells = &lt;1&gt;;</div><div class='add'>+		rst: reset-controller@e6160000 {</div><div class='add'>+			compatible = "renesas,r8a7795-rst";</div><div class='add'>+			reg = &lt;0 0xe6160000 0 0x0200&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		audma0: dma-controller@ec700000 {</div><div class='del'>-			compatible = "renesas,dmac-r8a7795",</div><div class='del'>-				     "renesas,rcar-dmac";</div><div class='del'>-			reg = &lt;0 0xec700000 0 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names = "error",</div><div class='del'>-					"ch0", "ch1", "ch2", "ch3",</div><div class='del'>-					"ch4", "ch5", "ch6", "ch7",</div><div class='del'>-					"ch8", "ch9", "ch10", "ch11",</div><div class='del'>-					"ch12", "ch13", "ch14", "ch15";</div><div class='del'>-			clocks = &lt;&amp;cpg CPG_MOD 502&gt;;</div><div class='del'>-			clock-names = "fck";</div><div class='del'>-			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='del'>-			#dma-cells = &lt;1&gt;;</div><div class='del'>-			dma-channels = &lt;16&gt;;</div><div class='add'>+		prr: chipid@fff00044 {</div><div class='add'>+			compatible = "renesas,prr";</div><div class='add'>+			reg = &lt;0 0xfff00044 0 4&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		audma1: dma-controller@ec720000 {</div><div class='del'>-			compatible = "renesas,dmac-r8a7795",</div><div class='del'>-				     "renesas,rcar-dmac";</div><div class='del'>-			reg = &lt;0 0xec720000 0 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH</div><div class='del'>-				      GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='del'>-			interrupt-names = "error",</div><div class='del'>-					"ch0", "ch1", "ch2", "ch3",</div><div class='del'>-					"ch4", "ch5", "ch6", "ch7",</div><div class='del'>-					"ch8", "ch9", "ch10", "ch11",</div><div class='del'>-					"ch12", "ch13", "ch14", "ch15";</div><div class='del'>-			clocks = &lt;&amp;cpg CPG_MOD 501&gt;;</div><div class='del'>-			clock-names = "fck";</div><div class='del'>-			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='del'>-			#dma-cells = &lt;1&gt;;</div><div class='del'>-			dma-channels = &lt;16&gt;;</div><div class='add'>+		sysc: system-controller@e6180000 {</div><div class='add'>+			compatible = "renesas,r8a7795-sysc";</div><div class='add'>+			reg = &lt;0 0xe6180000 0 0x0400&gt;;</div><div class='add'>+			#power-domain-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pfc: pfc@e6060000 {</div><div class='hunk'>@@ -512,6 +459,72 @@</div><div class='ctx'> 			dma-channels = &lt;16&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		audma0: dma-controller@ec700000 {</div><div class='add'>+			compatible = "renesas,dmac-r8a7795",</div><div class='add'>+				     "renesas,rcar-dmac";</div><div class='add'>+			reg = &lt;0 0xec700000 0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "error",</div><div class='add'>+					"ch0", "ch1", "ch2", "ch3",</div><div class='add'>+					"ch4", "ch5", "ch6", "ch7",</div><div class='add'>+					"ch8", "ch9", "ch10", "ch11",</div><div class='add'>+					"ch12", "ch13", "ch14", "ch15";</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 502&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			dma-channels = &lt;16&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		audma1: dma-controller@ec720000 {</div><div class='add'>+			compatible = "renesas,dmac-r8a7795",</div><div class='add'>+				     "renesas,rcar-dmac";</div><div class='add'>+			reg = &lt;0 0xec720000 0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "error",</div><div class='add'>+					"ch0", "ch1", "ch2", "ch3",</div><div class='add'>+					"ch4", "ch5", "ch6", "ch7",</div><div class='add'>+					"ch8", "ch9", "ch10", "ch11",</div><div class='add'>+					"ch12", "ch13", "ch14", "ch15";</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 501&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			dma-channels = &lt;16&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		avb: ethernet@e6800000 {</div><div class='ctx'> 			compatible = "renesas,etheravb-r8a7795",</div><div class='ctx'> 				     "renesas,etheravb-rcar-gen3";</div><div class='hunk'>@@ -553,6 +566,7 @@</div><div class='ctx'> 			phy-mode = "rgmii-id";</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		can0: can@e6c30000 {</div><div class='hunk'>@@ -782,7 +796,8 @@</div><div class='ctx'> 		i2c0: i2c@e6500000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "renesas,i2c-r8a7795";</div><div class='add'>+			compatible = "renesas,i2c-r8a7795",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe6500000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 931&gt;;</div><div class='hunk'>@@ -796,7 +811,8 @@</div><div class='ctx'> 		i2c1: i2c@e6508000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "renesas,i2c-r8a7795";</div><div class='add'>+			compatible = "renesas,i2c-r8a7795",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe6508000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 930&gt;;</div><div class='hunk'>@@ -810,7 +826,8 @@</div><div class='ctx'> 		i2c2: i2c@e6510000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "renesas,i2c-r8a7795";</div><div class='add'>+			compatible = "renesas,i2c-r8a7795",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe6510000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 929&gt;;</div><div class='hunk'>@@ -824,7 +841,8 @@</div><div class='ctx'> 		i2c3: i2c@e66d0000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "renesas,i2c-r8a7795";</div><div class='add'>+			compatible = "renesas,i2c-r8a7795",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe66d0000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 928&gt;;</div><div class='hunk'>@@ -838,7 +856,8 @@</div><div class='ctx'> 		i2c4: i2c@e66d8000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "renesas,i2c-r8a7795";</div><div class='add'>+			compatible = "renesas,i2c-r8a7795",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe66d8000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 927&gt;;</div><div class='hunk'>@@ -852,7 +871,8 @@</div><div class='ctx'> 		i2c5: i2c@e66e0000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "renesas,i2c-r8a7795";</div><div class='add'>+			compatible = "renesas,i2c-r8a7795",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe66e0000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 919&gt;;</div><div class='hunk'>@@ -866,7 +886,8 @@</div><div class='ctx'> 		i2c6: i2c@e66e8000 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "renesas,i2c-r8a7795";</div><div class='add'>+			compatible = "renesas,i2c-r8a7795",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='ctx'> 			reg = &lt;0 0xe66e8000 0 0x40&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 918&gt;;</div><div class='hunk'>@@ -877,6 +898,69 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		pwm0: pwm@e6e30000 {</div><div class='add'>+			compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar";</div><div class='add'>+			reg = &lt;0 0xe6e30000 0 0x8&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 523&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#pwm-cells = &lt;2&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm1: pwm@e6e31000 {</div><div class='add'>+			compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar";</div><div class='add'>+			reg = &lt;0 0xe6e31000 0 0x8&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 523&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#pwm-cells = &lt;2&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm2: pwm@e6e32000 {</div><div class='add'>+			compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar";</div><div class='add'>+			reg = &lt;0 0xe6e32000 0 0x8&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 523&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#pwm-cells = &lt;2&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm3: pwm@e6e33000 {</div><div class='add'>+			compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar";</div><div class='add'>+			reg = &lt;0 0xe6e33000 0 0x8&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 523&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#pwm-cells = &lt;2&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm4: pwm@e6e34000 {</div><div class='add'>+			compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar";</div><div class='add'>+			reg = &lt;0 0xe6e34000 0 0x8&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 523&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#pwm-cells = &lt;2&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm5: pwm@e6e35000 {</div><div class='add'>+			compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar";</div><div class='add'>+			reg = &lt;0 0xe6e35000 0 0x8&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 523&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#pwm-cells = &lt;2&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwm6: pwm@e6e36000 {</div><div class='add'>+			compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar";</div><div class='add'>+			reg = &lt;0 0xe6e36000 0 0x8&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 523&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#pwm-cells = &lt;2&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		rcar_sound: sound@ec500000 {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * #sound-dai-cells is required</div><div class='hunk'>@@ -909,6 +993,8 @@</div><div class='ctx'> 				 &lt;&amp;cpg CPG_MOD 1026&gt;, &lt;&amp;cpg CPG_MOD 1027&gt;,</div><div class='ctx'> 				 &lt;&amp;cpg CPG_MOD 1028&gt;, &lt;&amp;cpg CPG_MOD 1029&gt;,</div><div class='ctx'> 				 &lt;&amp;cpg CPG_MOD 1030&gt;, &lt;&amp;cpg CPG_MOD 1031&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_MOD 1020&gt;, &lt;&amp;cpg CPG_MOD 1021&gt;,</div><div class='add'>+				 &lt;&amp;cpg CPG_MOD 1020&gt;, &lt;&amp;cpg CPG_MOD 1021&gt;,</div><div class='ctx'> 				 &lt;&amp;cpg CPG_MOD 1019&gt;, &lt;&amp;cpg CPG_MOD 1018&gt;,</div><div class='ctx'> 				 &lt;&amp;audio_clk_a&gt;, &lt;&amp;audio_clk_b&gt;,</div><div class='ctx'> 				 &lt;&amp;audio_clk_c&gt;,</div><div class='hunk'>@@ -920,6 +1006,8 @@</div><div class='ctx'> 				      "src.9", "src.8", "src.7", "src.6",</div><div class='ctx'> 				      "src.5", "src.4", "src.3", "src.2",</div><div class='ctx'> 				      "src.1", "src.0",</div><div class='add'>+				      "mix.1", "mix.0",</div><div class='add'>+				      "ctu.1", "ctu.0",</div><div class='ctx'> 				      "dvc.0", "dvc.1",</div><div class='ctx'> 				      "clk_a", "clk_b", "clk_c", "clk_i";</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='hunk'>@@ -936,6 +1024,22 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='add'>+			rcar_sound,mix {</div><div class='add'>+				mix0: mix-0 { };</div><div class='add'>+				mix1: mix-1 { };</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			rcar_sound,ctu {</div><div class='add'>+				ctu00: ctu-0 { };</div><div class='add'>+				ctu01: ctu-1 { };</div><div class='add'>+				ctu02: ctu-2 { };</div><div class='add'>+				ctu03: ctu-3 { };</div><div class='add'>+				ctu10: ctu-4 { };</div><div class='add'>+				ctu11: ctu-5 { };</div><div class='add'>+				ctu12: ctu-6 { };</div><div class='add'>+				ctu13: ctu-7 { };</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			rcar_sound,src {</div><div class='ctx'> 				src0: src-0 {</div><div class='ctx'> 					interrupts = &lt;GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='hunk'>@@ -1048,6 +1152,7 @@</div><div class='ctx'> 			reg = &lt;0 0xee300000 0 0x1fff&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 815&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -1136,7 +1241,8 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		usb2_phy0: usb-phy@ee080200 {</div><div class='del'>-			compatible = "renesas,usb2-phy-r8a7795";</div><div class='add'>+			compatible = "renesas,usb2-phy-r8a7795",</div><div class='add'>+				     "renesas,rcar-gen3-usb2-phy";</div><div class='ctx'> 			reg = &lt;0 0xee080200 0 0x700&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 703&gt;;</div><div class='hunk'>@@ -1146,7 +1252,8 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		usb2_phy1: usb-phy@ee0a0200 {</div><div class='del'>-			compatible = "renesas,usb2-phy-r8a7795";</div><div class='add'>+			compatible = "renesas,usb2-phy-r8a7795",</div><div class='add'>+				     "renesas,rcar-gen3-usb2-phy";</div><div class='ctx'> 			reg = &lt;0 0xee0a0200 0 0x700&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 702&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='hunk'>@@ -1155,7 +1262,8 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		usb2_phy2: usb-phy@ee0c0200 {</div><div class='del'>-			compatible = "renesas,usb2-phy-r8a7795";</div><div class='add'>+			compatible = "renesas,usb2-phy-r8a7795",</div><div class='add'>+				     "renesas,rcar-gen3-usb2-phy";</div><div class='ctx'> 			reg = &lt;0 0xee0c0200 0 0x700&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 701&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='hunk'>@@ -1246,7 +1354,8 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pciec0: pcie@fe000000 {</div><div class='del'>-			compatible = "renesas,pcie-r8a7795";</div><div class='add'>+			compatible = "renesas,pcie-r8a7795",</div><div class='add'>+				     "renesas,pcie-rcar-gen3";</div><div class='ctx'> 			reg = &lt;0 0xfe000000 0 0x80000&gt;;</div><div class='ctx'> 			#address-cells = &lt;3&gt;;</div><div class='ctx'> 			#size-cells = &lt;2&gt;;</div><div class='hunk'>@@ -1271,7 +1380,8 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		pciec1: pcie@ee800000 {</div><div class='del'>-			compatible = "renesas,pcie-r8a7795";</div><div class='add'>+			compatible = "renesas,pcie-r8a7795",</div><div class='add'>+				     "renesas,pcie-rcar-gen3";</div><div class='ctx'> 			reg = &lt;0 0xee800000 0 0x80000&gt;;</div><div class='ctx'> 			#address-cells = &lt;3&gt;;</div><div class='ctx'> 			#size-cells = &lt;2&gt;;</div><div class='hunk'>@@ -1306,28 +1416,28 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpvb1: fcp@fe92f000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";</div><div class='add'>+			compatible = "renesas,fcpv";</div><div class='ctx'> 			reg = &lt;0 0xfe92f000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 606&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_A3VP&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpf0: fcp@fe950000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpf", "renesas,fcpf";</div><div class='add'>+			compatible = "renesas,fcpf";</div><div class='ctx'> 			reg = &lt;0 0xfe950000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 615&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_A3VP&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpf1: fcp@fe951000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpf", "renesas,fcpf";</div><div class='add'>+			compatible = "renesas,fcpf";</div><div class='ctx'> 			reg = &lt;0 0xfe951000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 614&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_A3VP&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpf2: fcp@fe952000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpf", "renesas,fcpf";</div><div class='add'>+			compatible = "renesas,fcpf";</div><div class='ctx'> 			reg = &lt;0 0xfe952000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 613&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_A3VP&gt;;</div><div class='hunk'>@@ -1344,7 +1454,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpvb0: fcp@fe96f000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";</div><div class='add'>+			compatible = "renesas,fcpv";</div><div class='ctx'> 			reg = &lt;0 0xfe96f000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 607&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_A3VP&gt;;</div><div class='hunk'>@@ -1361,7 +1471,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpvi0: fcp@fe9af000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";</div><div class='add'>+			compatible = "renesas,fcpv";</div><div class='ctx'> 			reg = &lt;0 0xfe9af000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 611&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_A3VP&gt;;</div><div class='hunk'>@@ -1378,7 +1488,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpvi1: fcp@fe9bf000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";</div><div class='add'>+			compatible = "renesas,fcpv";</div><div class='ctx'> 			reg = &lt;0 0xfe9bf000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 610&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_A3VP&gt;;</div><div class='hunk'>@@ -1395,7 +1505,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpvi2: fcp@fe9cf000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";</div><div class='add'>+			compatible = "renesas,fcpv";</div><div class='ctx'> 			reg = &lt;0 0xfe9cf000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 609&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_A3VP&gt;;</div><div class='hunk'>@@ -1412,7 +1522,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpvd0: fcp@fea27000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";</div><div class='add'>+			compatible = "renesas,fcpv";</div><div class='ctx'> 			reg = &lt;0 0xfea27000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 603&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='hunk'>@@ -1429,7 +1539,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpvd1: fcp@fea2f000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";</div><div class='add'>+			compatible = "renesas,fcpv";</div><div class='ctx'> 			reg = &lt;0 0xfea2f000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 602&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='hunk'>@@ -1446,7 +1556,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpvd2: fcp@fea37000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";</div><div class='add'>+			compatible = "renesas,fcpv";</div><div class='ctx'> 			reg = &lt;0 0xfea37000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 601&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='hunk'>@@ -1463,7 +1573,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		fcpvd3: fcp@fea3f000 {</div><div class='del'>-			compatible = "renesas,r8a7795-fcpv", "renesas,fcpv";</div><div class='add'>+			compatible = "renesas,fcpv";</div><div class='ctx'> 			reg = &lt;0 0xfea3f000 0 0x200&gt;;</div><div class='ctx'> 			clocks = &lt;&amp;cpg CPG_MOD 600&gt;;</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='hunk'>@@ -1541,5 +1651,63 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		tsc: thermal@e6198000 {</div><div class='add'>+			compatible = "renesas,r8a7795-thermal";</div><div class='add'>+			reg = &lt;0 0xe6198000 0 0x68&gt;,</div><div class='add'>+			      &lt;0 0xe61a0000 0 0x5c&gt;,</div><div class='add'>+			      &lt;0 0xe61a8000 0 0x5c&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 522&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7795_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#thermal-sensor-cells = &lt;1&gt;;</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		thermal-zones {</div><div class='add'>+			sensor_thermal1: sensor-thermal1 {</div><div class='add'>+				polling-delay-passive = &lt;250&gt;;</div><div class='add'>+				polling-delay = &lt;1000&gt;;</div><div class='add'>+				thermal-sensors = &lt;&amp;tsc 0&gt;;</div><div class='add'>+</div><div class='add'>+				trips {</div><div class='add'>+					sensor1_crit: sensor1-crit {</div><div class='add'>+						temperature = &lt;120000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "critical";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sensor_thermal2: sensor-thermal2 {</div><div class='add'>+				polling-delay-passive = &lt;250&gt;;</div><div class='add'>+				polling-delay = &lt;1000&gt;;</div><div class='add'>+				thermal-sensors = &lt;&amp;tsc 1&gt;;</div><div class='add'>+</div><div class='add'>+				trips {</div><div class='add'>+					sensor2_crit: sensor2-crit {</div><div class='add'>+						temperature = &lt;120000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "critical";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sensor_thermal3: sensor-thermal3 {</div><div class='add'>+				polling-delay-passive = &lt;250&gt;;</div><div class='add'>+				polling-delay = &lt;1000&gt;;</div><div class='add'>+				thermal-sensors = &lt;&amp;tsc 2&gt;;</div><div class='add'>+</div><div class='add'>+				trips {</div><div class='add'>+					sensor3_crit: sensor3-crit {</div><div class='add'>+						temperature = &lt;120000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "critical";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts<br/>new file mode 100644<br/>index 000000000000..c3f064ac2cb4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts</a></div><div class='hunk'>@@ -0,0 +1,189 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for the M3ULCB (R-Car Starter Kit Pro) board</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Renesas Electronics Corp.</div><div class='add'>+ * Copyright (C) 2016 Cogent Embedded, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2.  This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "r8a7796.dtsi"</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Renesas M3ULCB board based on r8a7796";</div><div class='add'>+	compatible = "renesas,m3ulcb", "renesas,r8a7796";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;scif2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial0:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@48000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		/* first 128MB is reserved for secure area. */</div><div class='add'>+		reg = &lt;0x0 0x48000000 0x0 0x38000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "gpio-leds";</div><div class='add'>+</div><div class='add'>+		led5 {</div><div class='add'>+			gpios = &lt;&amp;gpio6 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+		led6 {</div><div class='add'>+			gpios = &lt;&amp;gpio6 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	keyboard {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+</div><div class='add'>+		key-1 {</div><div class='add'>+			linux,code = &lt;KEY_1&gt;;</div><div class='add'>+			label = "SW3";</div><div class='add'>+			wakeup-source;</div><div class='add'>+			debounce-interval = &lt;20&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio6 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_1p8v: regulator0 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "fixed-1.8V";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3p3v: regulator1 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "fixed-3.3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_sdhi0: regulator-vcc-sdhi0 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+</div><div class='add'>+		regulator-name = "SDHI0 Vcc";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+</div><div class='add'>+		gpio = &lt;&amp;gpio5 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vccq_sdhi0: regulator-vccq-sdhi0 {</div><div class='add'>+		compatible = "regulator-gpio";</div><div class='add'>+</div><div class='add'>+		regulator-name = "SDHI0 VccQ";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+</div><div class='add'>+		gpios = &lt;&amp;gpio5 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpios-states = &lt;1&gt;;</div><div class='add'>+		states = &lt;3300000 1</div><div class='add'>+			  1800000 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;extal_clk {</div><div class='add'>+	clock-frequency = &lt;16666666&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;extalr_clk {</div><div class='add'>+	clock-frequency = &lt;32768&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pfc {</div><div class='add'>+	pinctrl-0 = &lt;&amp;scif_clk_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	scif2_pins: scif2 {</div><div class='add'>+		groups = "scif2_data_a";</div><div class='add'>+		function = "scif2";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	scif_clk_pins: scif_clk {</div><div class='add'>+		groups = "scif_clk_a";</div><div class='add'>+		function = "scif_clk";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi0_pins: sd0 {</div><div class='add'>+		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='add'>+		function = "sdhi0";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi0_pins_uhs: sd0_uhs {</div><div class='add'>+		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='add'>+		function = "sdhi0";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi2_pins: sd2 {</div><div class='add'>+		groups = "sdhi2_data8", "sdhi2_ctrl";</div><div class='add'>+		function = "sdhi2";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi2_pins_uhs: sd2_uhs {</div><div class='add'>+		groups = "sdhi2_data8", "sdhi2_ctrl";</div><div class='add'>+		function = "sdhi2";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdhi0 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdhi0_pins&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi0_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_sdhi0&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vccq_sdhi0&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio3 12 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	sd-uhs-sdr50;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdhi2 {</div><div class='add'>+	/* used for on-board 8bit eMMC */</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdhi2_pins&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi2_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;reg_1p8v&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;scif2 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;scif2_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;scif_clk {</div><div class='add'>+	clock-frequency = &lt;14745600&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;wdt0 {</div><div class='add'>+	timeout-sec = &lt;60&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts<br/>index 13db7d61c26c..c7f40f8f3169 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> /dts-v1/;</div><div class='ctx'> #include "r8a7796.dtsi"</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "Renesas Salvator-X board based on r8a7796";</div><div class='hunk'>@@ -17,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		serial0 = &amp;scif2;</div><div class='add'>+		ethernet0 = &amp;avb;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='hunk'>@@ -29,12 +31,88 @@</div><div class='ctx'> 		/* first 128MB is reserved for secure area. */</div><div class='ctx'> 		reg = &lt;0x0 0x48000000 0x0 0x78000000&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	memory@600000000 {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x6 0x00000000 0x0 0x80000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_1p8v: regulator0 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "fixed-1.8V";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_3p3v: regulator1 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "fixed-3.3V";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_sdhi0: regulator-vcc-sdhi0 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+</div><div class='add'>+		regulator-name = "SDHI0 Vcc";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+</div><div class='add'>+		gpio = &lt;&amp;gpio5 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vccq_sdhi0: regulator-vccq-sdhi0 {</div><div class='add'>+		compatible = "regulator-gpio";</div><div class='add'>+</div><div class='add'>+		regulator-name = "SDHI0 VccQ";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+</div><div class='add'>+		gpios = &lt;&amp;gpio5 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpios-states = &lt;1&gt;;</div><div class='add'>+		states = &lt;3300000 1</div><div class='add'>+			  1800000 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_sdhi3: regulator-vcc-sdhi3 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+</div><div class='add'>+		regulator-name = "SDHI3 Vcc";</div><div class='add'>+		regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+</div><div class='add'>+		gpio = &lt;&amp;gpio3 15 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vccq_sdhi3: regulator-vccq-sdhi3 {</div><div class='add'>+		compatible = "regulator-gpio";</div><div class='add'>+</div><div class='add'>+		regulator-name = "SDHI3 VccQ";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+</div><div class='add'>+		gpios = &lt;&amp;gpio3 14 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpios-states = &lt;1&gt;;</div><div class='add'>+		states = &lt;3300000 1</div><div class='add'>+			  1800000 0&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;pfc {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;scif_clk_pins&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> </div><div class='add'>+	avb_pins: avb {</div><div class='add'>+		groups = "avb_mdc";</div><div class='add'>+		function = "avb";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	scif2_pins: scif2 {</div><div class='ctx'> 		groups = "scif2_data_a";</div><div class='ctx'> 		function = "scif2";</div><div class='hunk'>@@ -43,12 +121,124 @@</div><div class='ctx'> 		groups = "scif_clk_a";</div><div class='ctx'> 		function = "scif_clk";</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	i2c2_pins: i2c2 {</div><div class='add'>+		groups = "i2c2_a";</div><div class='add'>+		function = "i2c2";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi0_pins: sd0 {</div><div class='add'>+		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='add'>+		function = "sdhi0";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi0_pins_uhs: sd0_uhs {</div><div class='add'>+		groups = "sdhi0_data4", "sdhi0_ctrl";</div><div class='add'>+		function = "sdhi0";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi2_pins: sd2 {</div><div class='add'>+		groups = "sdhi2_data8", "sdhi2_ctrl";</div><div class='add'>+		function = "sdhi2";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi2_pins_uhs: sd2_uhs {</div><div class='add'>+		groups = "sdhi2_data8", "sdhi2_ctrl";</div><div class='add'>+		function = "sdhi2";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi3_pins: sd3 {</div><div class='add'>+		groups = "sdhi3_data4", "sdhi3_ctrl";</div><div class='add'>+		function = "sdhi3";</div><div class='add'>+		power-source = &lt;3300&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhi3_pins_uhs: sd3_uhs {</div><div class='add'>+		groups = "sdhi3_data4", "sdhi3_ctrl";</div><div class='add'>+		function = "sdhi3";</div><div class='add'>+		power-source = &lt;1800&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;avb {</div><div class='add'>+	pinctrl-0 = &lt;&amp;avb_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	renesas,no-ether-link;</div><div class='add'>+	phy-handle = &lt;&amp;phy0&gt;;</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	phy0: ethernet-phy@0 {</div><div class='add'>+		rxc-skew-ps = &lt;900&gt;;</div><div class='add'>+		rxdv-skew-ps = &lt;0&gt;;</div><div class='add'>+		rxd0-skew-ps = &lt;0&gt;;</div><div class='add'>+		rxd1-skew-ps = &lt;0&gt;;</div><div class='add'>+		rxd2-skew-ps = &lt;0&gt;;</div><div class='add'>+		rxd3-skew-ps = &lt;0&gt;;</div><div class='add'>+		txc-skew-ps = &lt;900&gt;;</div><div class='add'>+		txen-skew-ps = &lt;0&gt;;</div><div class='add'>+		txd0-skew-ps = &lt;0&gt;;</div><div class='add'>+		txd1-skew-ps = &lt;0&gt;;</div><div class='add'>+		txd2-skew-ps = &lt;0&gt;;</div><div class='add'>+		txd3-skew-ps = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio2&gt;;</div><div class='add'>+		interrupts = &lt;11 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;extal_clk {</div><div class='ctx'> 	clock-frequency = &lt;16666666&gt;;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;extalr_clk {</div><div class='add'>+	clock-frequency = &lt;32768&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdhi0 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdhi0_pins&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi0_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_sdhi0&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vccq_sdhi0&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio3 12 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	wp-gpios = &lt;&amp;gpio3 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	sd-uhs-sdr50;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdhi2 {</div><div class='add'>+	/* used for on-board 8bit eMMC */</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdhi2_pins&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi2_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;reg_3p3v&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;reg_1p8v&gt;;</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	non-removable;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdhi3 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdhi3_pins&gt;;</div><div class='add'>+	pinctrl-1 = &lt;&amp;sdhi3_pins_uhs&gt;;</div><div class='add'>+	pinctrl-names = "default", "state_uhs";</div><div class='add'>+</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_sdhi3&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vccq_sdhi3&gt;;</div><div class='add'>+	cd-gpios = &lt;&amp;gpio4 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	wp-gpios = &lt;&amp;gpio4 16 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	sd-uhs-sdr50;</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;scif2 {</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;scif2_pins&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='hunk'>@@ -60,6 +250,13 @@</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	pinctrl-0 = &lt;&amp;i2c2_pins&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;wdt0 {</div><div class='ctx'> 	timeout-sec = &lt;60&gt;;</div><div class='ctx'> 	status = "okay";</div><div class='head'>diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi<br/>index 9217da983525..f7120cdedd0d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/r8a7796.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/renesas/r8a7796.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/renesas/r8a7796.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/renesas/r8a7796.dtsi</a></div><div class='hunk'>@@ -17,6 +17,16 @@</div><div class='ctx'> 	#address-cells = &lt;2&gt;;</div><div class='ctx'> 	#size-cells = &lt;2&gt;;</div><div class='ctx'> </div><div class='add'>+	aliases {</div><div class='add'>+		i2c0 = &amp;i2c0;</div><div class='add'>+		i2c1 = &amp;i2c1;</div><div class='add'>+		i2c2 = &amp;i2c2;</div><div class='add'>+		i2c3 = &amp;i2c3;</div><div class='add'>+		i2c4 = &amp;i2c4;</div><div class='add'>+		i2c5 = &amp;i2c5;</div><div class='add'>+		i2c6 = &amp;i2c6;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	psci {</div><div class='ctx'> 		compatible = "arm,psci-0.2";</div><div class='ctx'> 		method = "smc";</div><div class='hunk'>@@ -59,6 +69,13 @@</div><div class='ctx'> 		clock-frequency = &lt;0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/* External CAN clock - to be overridden by boards that provide it */</div><div class='add'>+	can_clk: can {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	/* External SCIF clock - to be overridden by boards that provide it */</div><div class='ctx'> 	scif_clk: scif {</div><div class='ctx'> 		compatible = "fixed-clock";</div><div class='hunk'>@@ -84,6 +101,9 @@</div><div class='ctx'> 			      &lt;0x0 0xf1060000 0 0x20000&gt;;</div><div class='ctx'> 			interrupts = &lt;GIC_PPI 9</div><div class='ctx'> 					(GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 408&gt;;</div><div class='add'>+			clock-names = "clk";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		timer {</div><div class='hunk'>@@ -233,12 +253,228 @@</div><div class='ctx'> 			#power-domain-cells = &lt;0&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		rst: reset-controller@e6160000 {</div><div class='add'>+			compatible = "renesas,r8a7796-rst";</div><div class='add'>+			reg = &lt;0 0xe6160000 0 0x0200&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		prr: chipid@fff00044 {</div><div class='add'>+			compatible = "renesas,prr";</div><div class='add'>+			reg = &lt;0 0xfff00044 0 4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		sysc: system-controller@e6180000 {</div><div class='ctx'> 			compatible = "renesas,r8a7796-sysc";</div><div class='ctx'> 			reg = &lt;0 0xe6180000 0 0x0400&gt;;</div><div class='ctx'> 			#power-domain-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		i2c0: i2c@e6500000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "renesas,i2c-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='add'>+			reg = &lt;0 0xe6500000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 931&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac1 0x91&gt;, &lt;&amp;dmac1 0x90&gt;,</div><div class='add'>+			       &lt;&amp;dmac2 0x91&gt;, &lt;&amp;dmac2 0x90&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			i2c-scl-internal-delay-ns = &lt;110&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c1: i2c@e6508000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "renesas,i2c-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='add'>+			reg = &lt;0 0xe6508000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 930&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac1 0x93&gt;, &lt;&amp;dmac1 0x92&gt;,</div><div class='add'>+			       &lt;&amp;dmac2 0x93&gt;, &lt;&amp;dmac2 0x92&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			i2c-scl-internal-delay-ns = &lt;6&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c2: i2c@e6510000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "renesas,i2c-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='add'>+			reg = &lt;0 0xe6510000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 929&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac1 0x95&gt;, &lt;&amp;dmac1 0x94&gt;,</div><div class='add'>+			       &lt;&amp;dmac2 0x95&gt;, &lt;&amp;dmac2 0x94&gt;;</div><div class='add'>+			dma-names = "tx", "rx", "tx", "rx";</div><div class='add'>+			i2c-scl-internal-delay-ns = &lt;6&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c3: i2c@e66d0000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "renesas,i2c-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='add'>+			reg = &lt;0 0xe66d0000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 928&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x97&gt;, &lt;&amp;dmac0 0x96&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			i2c-scl-internal-delay-ns = &lt;110&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c4: i2c@e66d8000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "renesas,i2c-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='add'>+			reg = &lt;0 0xe66d8000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 927&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x99&gt;, &lt;&amp;dmac0 0x98&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			i2c-scl-internal-delay-ns = &lt;110&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c5: i2c@e66e0000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "renesas,i2c-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='add'>+			reg = &lt;0 0xe66e0000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 919&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x9b&gt;, &lt;&amp;dmac0 0x9a&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			i2c-scl-internal-delay-ns = &lt;110&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c6: i2c@e66e8000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "renesas,i2c-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-i2c";</div><div class='add'>+			reg = &lt;0 0xe66e8000 0 0x40&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 918&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x9d&gt;, &lt;&amp;dmac0 0x9c&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			i2c-scl-internal-delay-ns = &lt;6&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		can0: can@e6c30000 {</div><div class='add'>+			compatible = "renesas,can-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-can";</div><div class='add'>+			reg = &lt;0 0xe6c30000 0 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 916&gt;,</div><div class='add'>+			       &lt;&amp;cpg CPG_CORE R8A7796_CLK_CANFD&gt;,</div><div class='add'>+			       &lt;&amp;can_clk&gt;;</div><div class='add'>+			clock-names = "clkp1", "clkp2", "can_clk";</div><div class='add'>+			assigned-clocks = &lt;&amp;cpg CPG_CORE R8A7796_CLK_CANFD&gt;;</div><div class='add'>+			assigned-clock-rates = &lt;40000000&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		can1: can@e6c38000 {</div><div class='add'>+			compatible = "renesas,can-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-can";</div><div class='add'>+			reg = &lt;0 0xe6c38000 0 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 915&gt;,</div><div class='add'>+			       &lt;&amp;cpg CPG_CORE R8A7796_CLK_CANFD&gt;,</div><div class='add'>+			       &lt;&amp;can_clk&gt;;</div><div class='add'>+			clock-names = "clkp1", "clkp2", "can_clk";</div><div class='add'>+			assigned-clocks = &lt;&amp;cpg CPG_CORE R8A7796_CLK_CANFD&gt;;</div><div class='add'>+			assigned-clock-rates = &lt;40000000&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		canfd: can@e66c0000 {</div><div class='add'>+			compatible = "renesas,r8a7796-canfd",</div><div class='add'>+				     "renesas,rcar-gen3-canfd";</div><div class='add'>+			reg = &lt;0 0xe66c0000 0 0x8000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				   &lt;GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 914&gt;,</div><div class='add'>+			       &lt;&amp;cpg CPG_CORE R8A7796_CLK_CANFD&gt;,</div><div class='add'>+			       &lt;&amp;can_clk&gt;;</div><div class='add'>+			clock-names = "fck", "canfd", "can_clk";</div><div class='add'>+			assigned-clocks = &lt;&amp;cpg CPG_CORE R8A7796_CLK_CANFD&gt;;</div><div class='add'>+			assigned-clock-rates = &lt;40000000&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+</div><div class='add'>+			channel0 {</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			channel1 {</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		avb: ethernet@e6800000 {</div><div class='add'>+			compatible = "renesas,etheravb-r8a7796",</div><div class='add'>+				     "renesas,etheravb-rcar-gen3";</div><div class='add'>+			reg = &lt;0 0xe6800000 0 0x800&gt;, &lt;0 0xe6a00000 0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "ch0", "ch1", "ch2", "ch3",</div><div class='add'>+					  "ch4", "ch5", "ch6", "ch7",</div><div class='add'>+					  "ch8", "ch9", "ch10", "ch11",</div><div class='add'>+					  "ch12", "ch13", "ch14", "ch15",</div><div class='add'>+					  "ch16", "ch17", "ch18", "ch19",</div><div class='add'>+					  "ch20", "ch21", "ch22", "ch23",</div><div class='add'>+					  "ch24";</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 812&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			phy-mode = "rgmii-id";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		scif2: serial@e6e88000 {</div><div class='ctx'> 			compatible = "renesas,scif-r8a7796",</div><div class='ctx'> 				     "renesas,rcar-gen3-scif", "renesas,scif";</div><div class='hunk'>@@ -251,5 +487,260 @@</div><div class='ctx'> 			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		msiof0: spi@e6e90000 {</div><div class='add'>+			compatible = "renesas,msiof-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-msiof";</div><div class='add'>+			reg = &lt;0 0xe6e90000 0 0x0064&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 211&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac1 0x41&gt;, &lt;&amp;dmac1 0x40&gt;,</div><div class='add'>+			       &lt;&amp;dmac2 0x41&gt;, &lt;&amp;dmac2 0x40&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		msiof1: spi@e6ea0000 {</div><div class='add'>+			compatible = "renesas,msiof-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-msiof";</div><div class='add'>+			reg = &lt;0 0xe6ea0000 0 0x0064&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 210&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac1 0x43&gt;, &lt;&amp;dmac1 0x42&gt;,</div><div class='add'>+			       &lt;&amp;dmac2 0x43&gt;, &lt;&amp;dmac2 0x42&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		msiof2: spi@e6c00000 {</div><div class='add'>+			compatible = "renesas,msiof-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-msiof";</div><div class='add'>+			reg = &lt;0 0xe6c00000 0 0x0064&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 209&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x45&gt;, &lt;&amp;dmac0 0x44&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		msiof3: spi@e6c10000 {</div><div class='add'>+			compatible = "renesas,msiof-r8a7796",</div><div class='add'>+				     "renesas,rcar-gen3-msiof";</div><div class='add'>+			reg = &lt;0 0xe6c10000 0 0x0064&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 208&gt;;</div><div class='add'>+			dmas = &lt;&amp;dmac0 0x47&gt;, &lt;&amp;dmac0 0x46&gt;;</div><div class='add'>+			dma-names = "tx", "rx";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dmac0: dma-controller@e6700000 {</div><div class='add'>+			compatible = "renesas,dmac-r8a7796",</div><div class='add'>+				     "renesas,rcar-dmac";</div><div class='add'>+			reg = &lt;0 0xe6700000 0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "error",</div><div class='add'>+					"ch0", "ch1", "ch2", "ch3",</div><div class='add'>+					"ch4", "ch5", "ch6", "ch7",</div><div class='add'>+					"ch8", "ch9", "ch10", "ch11",</div><div class='add'>+					"ch12", "ch13", "ch14", "ch15";</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 219&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			dma-channels = &lt;16&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dmac1: dma-controller@e7300000 {</div><div class='add'>+			compatible = "renesas,dmac-r8a7796",</div><div class='add'>+				     "renesas,rcar-dmac";</div><div class='add'>+			reg = &lt;0 0xe7300000 0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "error",</div><div class='add'>+					"ch0", "ch1", "ch2", "ch3",</div><div class='add'>+					"ch4", "ch5", "ch6", "ch7",</div><div class='add'>+					"ch8", "ch9", "ch10", "ch11",</div><div class='add'>+					"ch12", "ch13", "ch14", "ch15";</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 218&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			dma-channels = &lt;16&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dmac2: dma-controller@e7310000 {</div><div class='add'>+			compatible = "renesas,dmac-r8a7796",</div><div class='add'>+				     "renesas,rcar-dmac";</div><div class='add'>+			reg = &lt;0 0xe7310000 0 0x10000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH</div><div class='add'>+				      GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			interrupt-names = "error",</div><div class='add'>+					"ch0", "ch1", "ch2", "ch3",</div><div class='add'>+					"ch4", "ch5", "ch6", "ch7",</div><div class='add'>+					"ch8", "ch9", "ch10", "ch11",</div><div class='add'>+					"ch12", "ch13", "ch14", "ch15";</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 217&gt;;</div><div class='add'>+			clock-names = "fck";</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#dma-cells = &lt;1&gt;;</div><div class='add'>+			dma-channels = &lt;16&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdhi0: sd@ee100000 {</div><div class='add'>+			compatible = "renesas,sdhi-r8a7796";</div><div class='add'>+			reg = &lt;0 0xee100000 0 0x2000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 314&gt;;</div><div class='add'>+			max-frequency = &lt;200000000&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdhi1: sd@ee120000 {</div><div class='add'>+			compatible = "renesas,sdhi-r8a7796";</div><div class='add'>+			reg = &lt;0 0xee120000 0 0x2000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 313&gt;;</div><div class='add'>+			max-frequency = &lt;200000000&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdhi2: sd@ee140000 {</div><div class='add'>+			compatible = "renesas,sdhi-r8a7796";</div><div class='add'>+			reg = &lt;0 0xee140000 0 0x2000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 312&gt;;</div><div class='add'>+			max-frequency = &lt;200000000&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdhi3: sd@ee160000 {</div><div class='add'>+			compatible = "renesas,sdhi-r8a7796";</div><div class='add'>+			reg = &lt;0 0xee160000 0 0x2000&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 311&gt;;</div><div class='add'>+			max-frequency = &lt;200000000&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tsc: thermal@e6198000 {</div><div class='add'>+			compatible = "renesas,r8a7796-thermal";</div><div class='add'>+			reg = &lt;0 0xe6198000 0 0x68&gt;,</div><div class='add'>+			      &lt;0 0xe61a0000 0 0x5c&gt;,</div><div class='add'>+			      &lt;0 0xe61a8000 0 0x5c&gt;;</div><div class='add'>+			interrupts = &lt;GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+				     &lt;GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+			clocks = &lt;&amp;cpg CPG_MOD 522&gt;;</div><div class='add'>+			power-domains = &lt;&amp;sysc R8A7796_PD_ALWAYS_ON&gt;;</div><div class='add'>+			#thermal-sensor-cells = &lt;1&gt;;</div><div class='add'>+			status = "okay";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		thermal-zones {</div><div class='add'>+			sensor_thermal1: sensor-thermal1 {</div><div class='add'>+				polling-delay-passive = &lt;250&gt;;</div><div class='add'>+				polling-delay = &lt;1000&gt;;</div><div class='add'>+				thermal-sensors = &lt;&amp;tsc 0&gt;;</div><div class='add'>+</div><div class='add'>+				trips {</div><div class='add'>+					sensor1_crit: sensor1-crit {</div><div class='add'>+						temperature = &lt;120000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "critical";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sensor_thermal2: sensor-thermal2 {</div><div class='add'>+				polling-delay-passive = &lt;250&gt;;</div><div class='add'>+				polling-delay = &lt;1000&gt;;</div><div class='add'>+				thermal-sensors = &lt;&amp;tsc 1&gt;;</div><div class='add'>+</div><div class='add'>+				trips {</div><div class='add'>+					sensor2_crit: sensor2-crit {</div><div class='add'>+						temperature = &lt;120000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "critical";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sensor_thermal3: sensor-thermal3 {</div><div class='add'>+				polling-delay-passive = &lt;250&gt;;</div><div class='add'>+				polling-delay = &lt;1000&gt;;</div><div class='add'>+				thermal-sensors = &lt;&amp;tsc 2&gt;;</div><div class='add'>+</div><div class='add'>+				trips {</div><div class='add'>+					sensor3_crit: sensor3-crit {</div><div class='add'>+						temperature = &lt;120000&gt;;</div><div class='add'>+						hysteresis = &lt;2000&gt;;</div><div class='add'>+						type = "critical";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile<br/>index 87669f656454..3a862894ea44 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/rockchip/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/Makefile</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb</div><div class='ctx'> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi<br/>index fff8b1931f26..4772917c5f7e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi</a></div><div class='hunk'>@@ -90,7 +90,7 @@</div><div class='ctx'> 			240 241 242 243 244 245 246 247</div><div class='ctx'> 			248 249 250 251 252 253 254 255&gt;;</div><div class='ctx'> 		default-brightness-level = &lt;128&gt;;</div><div class='del'>-		enable-gpios = &lt;&amp;gpio0 20 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		enable-gpios = &lt;&amp;gpio0 RK_PC4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;bl_en&gt;;</div><div class='ctx'> 		pwms = &lt;&amp;pwm0 0 1000000 PWM_POLARITY_INVERTED&gt;;</div><div class='hunk'>@@ -101,7 +101,7 @@</div><div class='ctx'> 		compatible = "mmc-pwrseq-emmc";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;emmc_reset&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='del'>-		reset-gpios = &lt;&amp;gpio2 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio2 RK_PA3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	keys: gpio-keys {</div><div class='hunk'>@@ -111,7 +111,7 @@</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='ctx'> 			wakeup-source;</div><div class='del'>-			gpios = &lt;&amp;gpio0 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA2 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "GPIO Power";</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -121,7 +121,7 @@</div><div class='ctx'> 	vcc_host: vcc-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PA4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_host";</div><div class='hunk'>@@ -166,7 +166,7 @@</div><div class='ctx'> 	phy-supply = &lt;&amp;vcc_lan&gt;;</div><div class='ctx'> 	phy-mode = "rmii";</div><div class='ctx'> 	clock_in_out = "output";</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio3 12 0&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio3 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts<br/>index e5eeca2c2456..e631d424f08e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts</a></div><div class='hunk'>@@ -66,7 +66,7 @@</div><div class='ctx'> </div><div class='ctx'> 	ir: ir-receiver {</div><div class='ctx'> 		compatible = "gpio-ir-receiver";</div><div class='del'>-		gpios = &lt;&amp;gpio3 30 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio3 RK_PD6 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;ir_int&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -77,7 +77,7 @@</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pwr_key&gt;;</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='del'>-			gpios = &lt;&amp;gpio0 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA2 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "GPIO Power";</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 			wakeup-source;</div><div class='hunk'>@@ -88,13 +88,13 @@</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> </div><div class='ctx'> 		blue {</div><div class='del'>-			gpios = &lt;&amp;gpio2 2 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio2 RK_PA2 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			label = "geekbox:blue:led";</div><div class='ctx'> 			default-state = "on";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		red {</div><div class='del'>-			gpios = &lt;&amp;gpio2 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio2 RK_PA3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			label = "geekbox:red:led";</div><div class='ctx'> 			default-state = "off";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -146,7 +146,7 @@</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;pmic_int&gt;, &lt;&amp;pmic_sleep&gt;;</div><div class='ctx'> 		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='del'>-		interrupts = &lt;5 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA5 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='ctx'> 		rockchip,system-power-controller;</div><div class='ctx'> 		vcc1-supply = &lt;&amp;vcc_sys&gt;;</div><div class='ctx'> 		vcc2-supply = &lt;&amp;vcc_sys&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts<br/>index ea0a8eceefd4..fac116acc12f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts</a></div><div class='hunk'>@@ -61,7 +61,7 @@</div><div class='ctx'> 		compatible = "mmc-pwrseq-emmc";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;emmc_reset&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='del'>-		reset-gpios = &lt;&amp;gpio2 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio2 RK_PA3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	ext_gmac: external-gmac-clock {</div><div class='hunk'>@@ -78,7 +78,7 @@</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='ctx'> 			wakeup-source;</div><div class='del'>-			gpios = &lt;&amp;gpio0 5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			label = "GPIO Power";</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -88,7 +88,7 @@</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> </div><div class='ctx'> 		red {</div><div class='del'>-			gpios = &lt;&amp;gpio3 29 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio3 RK_PD5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			label = "orion:red:led";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='ctx'> 			pinctrl-0 = &lt;&amp;led_ctl&gt;;</div><div class='hunk'>@@ -96,7 +96,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		blue {</div><div class='del'>-			gpios = &lt;&amp;gpio0 12 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			label = "orion:blue:led";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='ctx'> 			pinctrl-0 = &lt;&amp;stby_pwren&gt;;</div><div class='hunk'>@@ -117,7 +117,7 @@</div><div class='ctx'> 	/* supplies both host and otg */</div><div class='ctx'> 	vcc_host: vcc-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='del'>-		gpio = &lt;&amp;gpio0 4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PA4 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_host";</div><div class='hunk'>@@ -149,7 +149,7 @@</div><div class='ctx'> 	vcc_sd: vcc-sd-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		regulator-name = "vcc_sd";</div><div class='del'>-		gpio = &lt;&amp;gpio3 11 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio3 RK_PB3 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='ctx'> 		regulator-max-microvolt = &lt;3300000&gt;;</div><div class='ctx'> 		vin-supply = &lt;&amp;vcc_io&gt;;</div><div class='hunk'>@@ -217,7 +217,7 @@</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;rgmii_pins&gt;;</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio3 12 0&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio3 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='ctx'> 	tx_delay = &lt;0x30&gt;;</div><div class='hunk'>@@ -344,7 +344,7 @@</div><div class='ctx'> &amp;sdmmc {</div><div class='ctx'> 	bus-width = &lt;4&gt;;</div><div class='ctx'> 	clock-frequency = &lt;50000000&gt;;</div><div class='del'>-	clock-freq-min-max = &lt;400000 50000000&gt;;</div><div class='add'>+	max-frequency = &lt;50000000&gt;;</div><div class='ctx'> 	cap-sd-highspeed;</div><div class='ctx'> 	card-detect-delay = &lt;200&gt;;</div><div class='ctx'> 	num-slots = &lt;1&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts<br/>new file mode 100644<br/>index 000000000000..8cdb3bff9c55<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts</a></div><div class='hunk'>@@ -0,0 +1,314 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd</div><div class='add'>+ *</div><div class='add'>+ * This file is dual-licensed: you can use it either under the terms</div><div class='add'>+ * of the GPL or the X11 license, at your option. Note that this dual</div><div class='add'>+ * licensing only applies to this file, and not this project as a</div><div class='add'>+ * whole.</div><div class='add'>+ *</div><div class='add'>+ *  a) This file is free software; you can redistribute it and/or</div><div class='add'>+ *     modify it under the terms of the GNU General Public License as</div><div class='add'>+ *     published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ *     License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *     This file is distributed in the hope that it will be useful,</div><div class='add'>+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *     GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Or, alternatively,</div><div class='add'>+ *</div><div class='add'>+ *  b) Permission is hereby granted, free of charge, to any person</div><div class='add'>+ *     obtaining a copy of this software and associated documentation</div><div class='add'>+ *     files (the "Software"), to deal in the Software without</div><div class='add'>+ *     restriction, including without limitation the rights to use,</div><div class='add'>+ *     copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='add'>+ *     sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ *     Software is furnished to do so, subject to the following</div><div class='add'>+ *     conditions:</div><div class='add'>+ *</div><div class='add'>+ *     The above copyright notice and this permission notice shall be</div><div class='add'>+ *     included in all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES</div><div class='add'>+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT</div><div class='add'>+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</div><div class='add'>+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+#include "rk3368.dtsi"</div><div class='add'>+#include &lt;dt-bindings/input/input.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Rockchip PX5 EVB";</div><div class='add'>+	compatible = "rockchip,px5-evb", "rockchip,px5", "rockchip,rk3368";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		stdout-path = "serial4:115200n8";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory@0 {</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x80000000&gt;;</div><div class='add'>+		device_type = "memory";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	keys: gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pwr_key&gt;;</div><div class='add'>+</div><div class='add'>+		power {</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			label = "GPIO Power";</div><div class='add'>+			linux,code = &lt;KEY_POWER&gt;;</div><div class='add'>+			wakeup-source;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vcc_sys: vcc-sys-regulator {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "vcc_sys";</div><div class='add'>+		regulator-min-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;5000000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;emmc {</div><div class='add'>+	status = "okay";</div><div class='add'>+	bus-width = &lt;8&gt;;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	clock-frequency = &lt;150000000&gt;;</div><div class='add'>+	disable-wp;</div><div class='add'>+	keep-power-in-suspend;</div><div class='add'>+	mmc-hs200-1_8v;</div><div class='add'>+	no-sdio;</div><div class='add'>+	no-sd;</div><div class='add'>+	non-removable;</div><div class='add'>+	num-slots = &lt;1&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;emmc_clk&gt;, &lt;&amp;emmc_cmd&gt;, &lt;&amp;emmc_bus8&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_io&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vcc18_flash&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	rk808: pmic@1b {</div><div class='add'>+		compatible = "rockchip,rk808";</div><div class='add'>+		reg = &lt;0x1b&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+		interrupts = &lt;RK_PA5 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;pmic_int&gt;, &lt;&amp;pmic_sleep&gt;;</div><div class='add'>+		rockchip,system-power-controller;</div><div class='add'>+		vcc1-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc2-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc3-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc4-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc6-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc7-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc8-supply = &lt;&amp;vcc_io&gt;;</div><div class='add'>+		vcc9-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc10-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc11-supply = &lt;&amp;vcc_sys&gt;;</div><div class='add'>+		vcc12-supply = &lt;&amp;vcc_io&gt;;</div><div class='add'>+		clock-output-names = "xin32k", "rk808-clkout2";</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			vdd_cpu: DCDC_REG1 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;700000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1500000&gt;;</div><div class='add'>+				regulator-name = "vdd_cpu";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vdd_log: DCDC_REG2 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;700000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1500000&gt;;</div><div class='add'>+				regulator-name = "vdd_log";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc_ddr: DCDC_REG3 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-name = "vcc_ddr";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc_io: DCDC_REG4 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-name = "vcc_io";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc18_flash: LDO_REG1 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-name = "vcc18_flash";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcca_33: LDO_REG2 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-name = "vcca_33";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vdd_10: LDO_REG3 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-name = "vdd_10";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			avdd_33: LDO_REG4 {</div><div class='add'>+				regulator-min-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-name = "avdd_33";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vccio_sd: LDO_REG5 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;3300000&gt;;</div><div class='add'>+				regulator-name = "vccio_sd";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vdd10_lcd: LDO_REG6 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1000000&gt;;</div><div class='add'>+				regulator-name = "vdd10_lcd";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc_18: LDO_REG7 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-name = "vcc_18";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc18_lcd: LDO_REG8 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+				regulator-name = "vcc18_lcd";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc_sd: SWITCH_REG1 {</div><div class='add'>+				regulator-name = "vcc_sd";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			vcc33_lcd: SWITCH_REG2 {</div><div class='add'>+				regulator-always-on;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-name = "vcc33_lcd";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	accelerometer@18 {</div><div class='add'>+		compatible = "bosch,bma250";</div><div class='add'>+		reg = &lt;0x18&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio2&gt;;</div><div class='add'>+		interrupts = &lt;RK_PC1 IRQ_TYPE_LEVEL_LOW&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	gsl1680: touchscreen@40 {</div><div class='add'>+		compatible = "silead,gsl1680";</div><div class='add'>+		reg = &lt;0x40&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio3&gt;;</div><div class='add'>+		interrupts = &lt;RK_PD4 IRQ_TYPE_EDGE_FALLING&gt;;</div><div class='add'>+		power-gpios = &lt;&amp;gpio3 RK_PB7 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		touchscreen-size-x = &lt;800&gt;;</div><div class='add'>+		touchscreen-size-y = &lt;1280&gt;;</div><div class='add'>+		silead,max-fingers = &lt;5&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pinctrl {</div><div class='add'>+	keys {</div><div class='add'>+		pwr_key: pwr-key {</div><div class='add'>+			rockchip,pins = &lt;0 2 RK_FUNC_GPIO &amp;pcfg_pull_none&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pmic {</div><div class='add'>+		pmic_sleep: pmic-sleep {</div><div class='add'>+			rockchip,pins = &lt;0 0 RK_FUNC_2 &amp;pcfg_pull_none&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pmic_int: pmic-int {</div><div class='add'>+			rockchip,pins = &lt;0 5 RK_FUNC_GPIO &amp;pcfg_pull_up&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdmmc {</div><div class='add'>+	status = "okay";</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	cap-mmc-highspeed;</div><div class='add'>+	cap-sd-highspeed;</div><div class='add'>+	card-detect-delay = &lt;200&gt;;</div><div class='add'>+	no-emmc;</div><div class='add'>+	no-sdio;</div><div class='add'>+	num-slots = &lt;1&gt;;</div><div class='add'>+	sd-uhs-sdr12;</div><div class='add'>+	sd-uhs-sdr25;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	pinctrl-0 = &lt;&amp;sdmmc_clk&gt;, &lt;&amp;sdmmc_cmd&gt;, &lt;&amp;sdmmc_bus4&gt;, &lt;&amp;sdmmc_cd&gt;;</div><div class='add'>+	rockchip,default-sample-phase = &lt;90&gt;;</div><div class='add'>+	vmmc-supply = &lt;&amp;vcc_sd&gt;;</div><div class='add'>+	vqmmc-supply = &lt;&amp;vccio_sd&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;tsadc {</div><div class='add'>+	status = "okay";</div><div class='add'>+	rockchip,hw-tshut-mode = &lt;0&gt;; /* CRU */</div><div class='add'>+	rockchip,hw-tshut-polarity = &lt;1&gt;; /* high */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart4 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_host0_ehci {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb_otg {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;wdt {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts<br/>index eed1ef6669ff..7134181f1dc2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3368-r88.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/rockchip/rk3368-r88.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3368-r88.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368-r88.dts</a></div><div class='hunk'>@@ -61,7 +61,7 @@</div><div class='ctx'> 		compatible = "mmc-pwrseq-emmc";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;emmc_reset&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='del'>-		reset-gpios = &lt;&amp;gpio2 3 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		reset-gpios = &lt;&amp;gpio2 RK_PA3 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	keys: gpio-keys {</div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='ctx'> 			wakeup-source;</div><div class='del'>-			gpios = &lt;&amp;gpio0 2 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio0 RK_PA2 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 			label = "GPIO Power";</div><div class='ctx'> 			linux,code = &lt;KEY_POWER&gt;;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -81,7 +81,7 @@</div><div class='ctx'> 		compatible = "gpio-leds";</div><div class='ctx'> </div><div class='ctx'> 		work {</div><div class='del'>-			gpios = &lt;&amp;gpio3 29 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio3 RK_PD5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 			label = "r88:green:led";</div><div class='ctx'> 			pinctrl-names = "default";</div><div class='ctx'> 			pinctrl-0 = &lt;&amp;led_ctl&gt;;</div><div class='hunk'>@@ -90,7 +90,7 @@</div><div class='ctx'> </div><div class='ctx'> 	ir: ir-receiver {</div><div class='ctx'> 		compatible = "gpio-ir-receiver";</div><div class='del'>-		gpios = &lt;&amp;gpio3 30 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpio3 RK_PD6 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;ir_int&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -104,10 +104,10 @@</div><div class='ctx'> </div><div class='ctx'> 		reset-gpios =</div><div class='ctx'> 			/* BT_RST_N */</div><div class='del'>-			&lt;&amp;gpio3 5 GPIO_ACTIVE_LOW&gt;,</div><div class='add'>+			&lt;&amp;gpio3 RK_PA5 GPIO_ACTIVE_LOW&gt;,</div><div class='ctx'> </div><div class='ctx'> 			/* WL_REG_ON */</div><div class='del'>-			&lt;&amp;gpio3 4 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+			&lt;&amp;gpio3 RK_PA4 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	vcc_18: vcc18-regulator {</div><div class='hunk'>@@ -124,7 +124,7 @@</div><div class='ctx'> 	vcc_host: vcc-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio0 4 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio0 RK_PA4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;host_vbus_drv&gt;;</div><div class='ctx'> 		regulator-name = "vcc_host";</div><div class='hunk'>@@ -199,7 +199,7 @@</div><div class='ctx'> 	phy-supply = &lt;&amp;vcc_lan&gt;;</div><div class='ctx'> 	phy-mode = "rmii";</div><div class='ctx'> 	clock_in_out = "output";</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio3 12 0&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio3 RK_PB4 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 1000000&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi<br/>index 0fcb2147c9f9..a635adc47e74 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3368.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/rockchip/rk3368.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3368.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3368.dtsi</a></div><div class='hunk'>@@ -231,7 +231,7 @@</div><div class='ctx'> 	sdmmc: dwmmc@ff0c0000 {</div><div class='ctx'> 		compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc";</div><div class='ctx'> 		reg = &lt;0x0 0xff0c0000 0x0 0x4000&gt;;</div><div class='del'>-		clock-freq-min-max = &lt;400000 150000000&gt;;</div><div class='add'>+		max-frequency = &lt;150000000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_SDMMC&gt;, &lt;&amp;cru SCLK_SDMMC&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_SDMMC_DRV&gt;, &lt;&amp;cru SCLK_SDMMC_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";</div><div class='hunk'>@@ -243,7 +243,7 @@</div><div class='ctx'> 	sdio0: dwmmc@ff0d0000 {</div><div class='ctx'> 		compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc";</div><div class='ctx'> 		reg = &lt;0x0 0xff0d0000 0x0 0x4000&gt;;</div><div class='del'>-		clock-freq-min-max = &lt;400000 150000000&gt;;</div><div class='add'>+		max-frequency = &lt;150000000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_SDIO0&gt;, &lt;&amp;cru SCLK_SDIO0&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_SDIO0_DRV&gt;, &lt;&amp;cru SCLK_SDIO0_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";</div><div class='hunk'>@@ -255,7 +255,7 @@</div><div class='ctx'> 	emmc: dwmmc@ff0f0000 {</div><div class='ctx'> 		compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc";</div><div class='ctx'> 		reg = &lt;0x0 0xff0f0000 0x0 0x4000&gt;;</div><div class='del'>-		clock-freq-min-max = &lt;400000 150000000&gt;;</div><div class='add'>+		max-frequency = &lt;150000000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_EMMC&gt;, &lt;&amp;cru SCLK_EMMC&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_EMMC_DRV&gt;, &lt;&amp;cru SCLK_EMMC_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";</div><div class='hunk'>@@ -315,16 +315,16 @@</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	i2c1: i2c@ff140000 {</div><div class='add'>+	i2c2: i2c@ff140000 {</div><div class='ctx'> 		compatible = "rockchip,rk3368-i2c", "rockchip,rk3288-i2c";</div><div class='ctx'> 		reg = &lt;0x0 0xff140000 0x0 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		clock-names = "i2c";</div><div class='del'>-		clocks = &lt;&amp;cru PCLK_I2C1&gt;;</div><div class='add'>+		clocks = &lt;&amp;cru PCLK_I2C2&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;i2c1_xfer&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;i2c2_xfer&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -537,7 +537,6 @@</div><div class='ctx'> 		g-np-tx-fifo-size = &lt;16&gt;;</div><div class='ctx'> 		g-rx-fifo-size = &lt;275&gt;;</div><div class='ctx'> 		g-tx-fifo-size = &lt;256 128 128 64 64 32&gt;;</div><div class='del'>-		g-use-dma;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -554,16 +553,16 @@</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	i2c2: i2c@ff660000 {</div><div class='add'>+	i2c1: i2c@ff660000 {</div><div class='ctx'> 		compatible = "rockchip,rk3368-i2c", "rockchip,rk3288-i2c";</div><div class='ctx'> 		reg = &lt;0x0 0xff660000 0x0 0x1000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		clock-names = "i2c";</div><div class='del'>-		clocks = &lt;&amp;cru PCLK_I2C2&gt;;</div><div class='add'>+		clocks = &lt;&amp;cru PCLK_I2C1&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='del'>-		pinctrl-0 = &lt;&amp;i2c2_xfer&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;i2c1_xfer&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts<br/>index 8e82497925fe..42033bcc614c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3399-evb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/rockchip/rk3399-evb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3399-evb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3399-evb.dts</a></div><div class='hunk'>@@ -49,6 +49,46 @@</div><div class='ctx'> 	compatible = "rockchip,rk3399-evb", "rockchip,rk3399",</div><div class='ctx'> 		     "google,rk3399evb-rev2";</div><div class='ctx'> </div><div class='add'>+	backlight: backlight {</div><div class='add'>+		compatible = "pwm-backlight";</div><div class='add'>+		brightness-levels = &lt;</div><div class='add'>+			  0   1   2   3   4   5   6   7</div><div class='add'>+			  8   9  10  11  12  13  14  15</div><div class='add'>+			 16  17  18  19  20  21  22  23</div><div class='add'>+			 24  25  26  27  28  29  30  31</div><div class='add'>+			 32  33  34  35  36  37  38  39</div><div class='add'>+			 40  41  42  43  44  45  46  47</div><div class='add'>+			 48  49  50  51  52  53  54  55</div><div class='add'>+			 56  57  58  59  60  61  62  63</div><div class='add'>+			 64  65  66  67  68  69  70  71</div><div class='add'>+			 72  73  74  75  76  77  78  79</div><div class='add'>+			 80  81  82  83  84  85  86  87</div><div class='add'>+			 88  89  90  91  92  93  94  95</div><div class='add'>+			 96  97  98  99 100 101 102 103</div><div class='add'>+			104 105 106 107 108 109 110 111</div><div class='add'>+			112 113 114 115 116 117 118 119</div><div class='add'>+			120 121 122 123 124 125 126 127</div><div class='add'>+			128 129 130 131 132 133 134 135</div><div class='add'>+			136 137 138 139 140 141 142 143</div><div class='add'>+			144 145 146 147 148 149 150 151</div><div class='add'>+			152 153 154 155 156 157 158 159</div><div class='add'>+			160 161 162 163 164 165 166 167</div><div class='add'>+			168 169 170 171 172 173 174 175</div><div class='add'>+			176 177 178 179 180 181 182 183</div><div class='add'>+			184 185 186 187 188 189 190 191</div><div class='add'>+			192 193 194 195 196 197 198 199</div><div class='add'>+			200 201 202 203 204 205 206 207</div><div class='add'>+			208 209 210 211 212 213 214 215</div><div class='add'>+			216 217 218 219 220 221 222 223</div><div class='add'>+			224 225 226 227 228 229 230 231</div><div class='add'>+			232 233 234 235 236 237 238 239</div><div class='add'>+			240 241 242 243 244 245 246 247</div><div class='add'>+			248 249 250 251 252 253 254 255&gt;;</div><div class='add'>+		default-brightness-level = &lt;200&gt;;</div><div class='add'>+		enable-gpios = &lt;&amp;gpio1 RK_PB5 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		pwms = &lt;&amp;pwm0 0 25000 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	clkin_gmac: external-gmac-clock {</div><div class='ctx'> 		compatible = "fixed-clock";</div><div class='ctx'> 		clock-frequency = &lt;125000000&gt;;</div><div class='hunk'>@@ -88,7 +128,7 @@</div><div class='ctx'> 	vcc5v0_host: vcc5v0-host-regulator {</div><div class='ctx'> 		compatible = "regulator-fixed";</div><div class='ctx'> 		enable-active-high;</div><div class='del'>-		gpio = &lt;&amp;gpio4 25 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio4 RK_PD1 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 		pinctrl-names = "default";</div><div class='ctx'> 		pinctrl-0 = &lt;&amp;vcc5v0_host_en&gt;;</div><div class='ctx'> 		regulator-name = "vcc5v0_host";</div><div class='hunk'>@@ -123,7 +163,7 @@</div><div class='ctx'> 	phy-mode = "rgmii";</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;rgmii_pins&gt;;</div><div class='del'>-	snps,reset-gpio = &lt;&amp;gpio3 15 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+	snps,reset-gpio = &lt;&amp;gpio3 RK_PB7 GPIO_ACTIVE_LOW&gt;;</div><div class='ctx'> 	snps,reset-active-low;</div><div class='ctx'> 	snps,reset-delays-us = &lt;0 10000 50000&gt;;</div><div class='ctx'> 	tx_delay = &lt;0x28&gt;;</div><div class='hunk'>@@ -156,7 +196,7 @@</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;pcie0 {</div><div class='del'>-	ep-gpios = &lt;&amp;gpio3 13 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+	ep-gpios = &lt;&amp;gpio3 RK_PB5 GPIO_ACTIVE_HIGH&gt;;</div><div class='ctx'> 	num-lanes = &lt;4&gt;;</div><div class='ctx'> 	pinctrl-names = "default";</div><div class='ctx'> 	pinctrl-0 = &lt;&amp;pcie_clkreqn&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi<br/>index 7afbfb0f96a3..8e6d1bdeb9c3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3399.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/rockchip/rk3399.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/rockchip/rk3399.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/rockchip/rk3399.dtsi</a></div><div class='hunk'>@@ -174,6 +174,7 @@</div><div class='ctx'> 			     &lt;GIC_PPI 14 IRQ_TYPE_LEVEL_LOW 0&gt;,</div><div class='ctx'> 			     &lt;GIC_PPI 11 IRQ_TYPE_LEVEL_LOW 0&gt;,</div><div class='ctx'> 			     &lt;GIC_PPI 10 IRQ_TYPE_LEVEL_LOW 0&gt;;</div><div class='add'>+		arm,no-tick-in-suspend;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	xin24m: xin24m {</div><div class='hunk'>@@ -235,7 +236,7 @@</div><div class='ctx'> 			     "rockchip,rk3288-dw-mshc";</div><div class='ctx'> 		reg = &lt;0x0 0xfe310000 0x0 0x4000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH 0&gt;;</div><div class='del'>-		clock-freq-min-max = &lt;400000 150000000&gt;;</div><div class='add'>+		max-frequency = &lt;150000000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_SDIO&gt;, &lt;&amp;cru SCLK_SDIO&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_SDIO_DRV&gt;, &lt;&amp;cru SCLK_SDIO_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";</div><div class='hunk'>@@ -248,11 +249,12 @@</div><div class='ctx'> 			     "rockchip,rk3288-dw-mshc";</div><div class='ctx'> 		reg = &lt;0x0 0xfe320000 0x0 0x4000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH 0&gt;;</div><div class='del'>-		clock-freq-min-max = &lt;400000 150000000&gt;;</div><div class='add'>+		max-frequency = &lt;150000000&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru HCLK_SDMMC&gt;, &lt;&amp;cru SCLK_SDMMC&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SCLK_SDMMC_DRV&gt;, &lt;&amp;cru SCLK_SDMMC_SAMPLE&gt;;</div><div class='ctx'> 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";</div><div class='ctx'> 		fifo-depth = &lt;0x100&gt;;</div><div class='add'>+		power-domains = &lt;&amp;power RK3399_PD_SD&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -269,6 +271,7 @@</div><div class='ctx'> 		#clock-cells = &lt;0&gt;;</div><div class='ctx'> 		phys = &lt;&amp;emmc_phy&gt;;</div><div class='ctx'> 		phy-names = "phy_arasan";</div><div class='add'>+		power-domains = &lt;&amp;power RK3399_PD_EMMC&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -280,6 +283,7 @@</div><div class='ctx'> 		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='ctx'> 		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		aspm-no-l0s;</div><div class='ctx'> 		bus-range = &lt;0x0 0x1&gt;;</div><div class='ctx'> 		clocks = &lt;&amp;cru ACLK_PCIE&gt;, &lt;&amp;cru ACLK_PERF_PCIE&gt;,</div><div class='ctx'> 			 &lt;&amp;cru PCLK_PCIE&gt;, &lt;&amp;cru SCLK_PCIE_PM&gt;;</div><div class='hunk'>@@ -294,6 +298,7 @@</div><div class='ctx'> 				&lt;0 0 0 2 &amp;pcie0_intc 1&gt;,</div><div class='ctx'> 				&lt;0 0 0 3 &amp;pcie0_intc 2&gt;,</div><div class='ctx'> 				&lt;0 0 0 4 &amp;pcie0_intc 3&gt;;</div><div class='add'>+		max-link-speed = &lt;1&gt;;</div><div class='ctx'> 		msi-map = &lt;0x0 &amp;its 0x0 0x1000&gt;;</div><div class='ctx'> 		phys = &lt;&amp;pcie_phy&gt;;</div><div class='ctx'> 		phy-names = "pcie-phy";</div><div class='hunk'>@@ -318,8 +323,10 @@</div><div class='ctx'> 		compatible = "generic-ehci";</div><div class='ctx'> 		reg = &lt;0x0 0xfe380000 0x0 0x20000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH 0&gt;;</div><div class='del'>-		clocks = &lt;&amp;cru HCLK_HOST0&gt;, &lt;&amp;cru HCLK_HOST0_ARB&gt;;</div><div class='del'>-		clock-names = "hclk_host0", "hclk_host0_arb";</div><div class='add'>+		clocks = &lt;&amp;cru HCLK_HOST0&gt;, &lt;&amp;cru HCLK_HOST0_ARB&gt;,</div><div class='add'>+			 &lt;&amp;u2phy0&gt;;</div><div class='add'>+		clock-names = "usbhost", "arbiter",</div><div class='add'>+			      "utmi";</div><div class='ctx'> 		phys = &lt;&amp;u2phy0_host&gt;;</div><div class='ctx'> 		phy-names = "usb";</div><div class='ctx'> 		status = "disabled";</div><div class='hunk'>@@ -329,8 +336,12 @@</div><div class='ctx'> 		compatible = "generic-ohci";</div><div class='ctx'> 		reg = &lt;0x0 0xfe3a0000 0x0 0x20000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH 0&gt;;</div><div class='del'>-		clocks = &lt;&amp;cru HCLK_HOST0&gt;, &lt;&amp;cru HCLK_HOST0_ARB&gt;;</div><div class='del'>-		clock-names = "hclk_host0", "hclk_host0_arb";</div><div class='add'>+		clocks = &lt;&amp;cru HCLK_HOST0&gt;, &lt;&amp;cru HCLK_HOST0_ARB&gt;,</div><div class='add'>+			 &lt;&amp;u2phy0&gt;;</div><div class='add'>+		clock-names = "usbhost", "arbiter",</div><div class='add'>+			      "utmi";</div><div class='add'>+		phys = &lt;&amp;u2phy0_host&gt;;</div><div class='add'>+		phy-names = "usb";</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -338,8 +349,10 @@</div><div class='ctx'> 		compatible = "generic-ehci";</div><div class='ctx'> 		reg = &lt;0x0 0xfe3c0000 0x0 0x20000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH 0&gt;;</div><div class='del'>-		clocks = &lt;&amp;cru HCLK_HOST1&gt;, &lt;&amp;cru HCLK_HOST1_ARB&gt;;</div><div class='del'>-		clock-names = "hclk_host1", "hclk_host1_arb";</div><div class='add'>+		clocks = &lt;&amp;cru HCLK_HOST1&gt;, &lt;&amp;cru HCLK_HOST1_ARB&gt;,</div><div class='add'>+			 &lt;&amp;u2phy1&gt;;</div><div class='add'>+		clock-names = "usbhost", "arbiter",</div><div class='add'>+			      "utmi";</div><div class='ctx'> 		phys = &lt;&amp;u2phy1_host&gt;;</div><div class='ctx'> 		phy-names = "usb";</div><div class='ctx'> 		status = "disabled";</div><div class='hunk'>@@ -349,8 +362,12 @@</div><div class='ctx'> 		compatible = "generic-ohci";</div><div class='ctx'> 		reg = &lt;0x0 0xfe3e0000 0x0 0x20000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0&gt;;</div><div class='del'>-		clocks = &lt;&amp;cru HCLK_HOST1&gt;, &lt;&amp;cru HCLK_HOST1_ARB&gt;;</div><div class='del'>-		clock-names = "hclk_host1", "hclk_host1_arb";</div><div class='add'>+		clocks = &lt;&amp;cru HCLK_HOST1&gt;, &lt;&amp;cru HCLK_HOST1_ARB&gt;,</div><div class='add'>+			 &lt;&amp;u2phy1&gt;;</div><div class='add'>+		clock-names = "usbhost", "arbiter",</div><div class='add'>+			      "utmi";</div><div class='add'>+		phys = &lt;&amp;u2phy1_host&gt;;</div><div class='add'>+		phy-names = "usb";</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -604,7 +621,7 @@</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	thermal-zones {</div><div class='add'>+	thermal_zones: thermal-zones {</div><div class='ctx'> 		cpu_thermal: cpu {</div><div class='ctx'> 			polling-delay-passive = &lt;100&gt;;</div><div class='ctx'> 			polling-delay = &lt;1000&gt;;</div><div class='hunk'>@@ -693,6 +710,16 @@</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	qos_sd: qos@ffa74000 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0x0 0xffa74000 0x0 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qos_emmc: qos@ffa58000 {</div><div class='add'>+		compatible = "syscon";</div><div class='add'>+		reg = &lt;0x0 0xffa58000 0x0 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	qos_gmac: qos@ffa5c000 {</div><div class='ctx'> 		compatible = "syscon";</div><div class='ctx'> 		reg = &lt;0x0 0xffa5c000 0x0 0x20&gt;;</div><div class='hunk'>@@ -826,11 +853,23 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			/* These power domains are grouped by VD_LOGIC */</div><div class='add'>+			pd_emmc@RK3399_PD_EMMC {</div><div class='add'>+				reg = &lt;RK3399_PD_EMMC&gt;;</div><div class='add'>+				clocks = &lt;&amp;cru ACLK_EMMC&gt;;</div><div class='add'>+				pm_qos = &lt;&amp;qos_emmc&gt;;</div><div class='add'>+			};</div><div class='ctx'> 			pd_gmac@RK3399_PD_GMAC {</div><div class='ctx'> 				reg = &lt;RK3399_PD_GMAC&gt;;</div><div class='del'>-				clocks = &lt;&amp;cru ACLK_GMAC&gt;;</div><div class='add'>+				clocks = &lt;&amp;cru ACLK_GMAC&gt;,</div><div class='add'>+					 &lt;&amp;cru PCLK_GMAC&gt;;</div><div class='ctx'> 				pm_qos = &lt;&amp;qos_gmac&gt;;</div><div class='ctx'> 			};</div><div class='add'>+			pd_sd@RK3399_PD_SD {</div><div class='add'>+				reg = &lt;RK3399_PD_SD&gt;;</div><div class='add'>+				clocks = &lt;&amp;cru HCLK_SDMMC&gt;,</div><div class='add'>+					 &lt;&amp;cru SCLK_SDMMC&gt;;</div><div class='add'>+				pm_qos = &lt;&amp;qos_sd&gt;;</div><div class='add'>+			};</div><div class='ctx'> 			pd_vio@RK3399_PD_VIO {</div><div class='ctx'> 				reg = &lt;RK3399_PD_VIO&gt;;</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -1026,6 +1065,9 @@</div><div class='ctx'> 		clock-names = "pclk_efuse";</div><div class='ctx'> </div><div class='ctx'> 		/* Data cells */</div><div class='add'>+		cpu_id: cpu-id@7 {</div><div class='add'>+			reg = &lt;0x07 0x10&gt;;</div><div class='add'>+		};</div><div class='ctx'> 		cpub_leakage: cpu-leakage@17 {</div><div class='ctx'> 			reg = &lt;0x17 0x1&gt;;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -1049,6 +1091,7 @@</div><div class='ctx'> 	pmucru: pmu-clock-controller@ff750000 {</div><div class='ctx'> 		compatible = "rockchip,rk3399-pmucru";</div><div class='ctx'> 		reg = &lt;0x0 0xff750000 0x0 0x1000&gt;;</div><div class='add'>+		rockchip,grf = &lt;&amp;pmugrf&gt;;</div><div class='ctx'> 		#clock-cells = &lt;1&gt;;</div><div class='ctx'> 		#reset-cells = &lt;1&gt;;</div><div class='ctx'> 		assigned-clocks = &lt;&amp;pmucru PLL_PPLL&gt;;</div><div class='hunk'>@@ -1058,6 +1101,7 @@</div><div class='ctx'> 	cru: clock-controller@ff760000 {</div><div class='ctx'> 		compatible = "rockchip,rk3399-cru";</div><div class='ctx'> 		reg = &lt;0x0 0xff760000 0x0 0x1000&gt;;</div><div class='add'>+		rockchip,grf = &lt;&amp;grf&gt;;</div><div class='ctx'> 		#clock-cells = &lt;1&gt;;</div><div class='ctx'> 		#reset-cells = &lt;1&gt;;</div><div class='ctx'> 		assigned-clocks =</div><div class='hunk'>@@ -1104,6 +1148,16 @@</div><div class='ctx'> 				interrupt-names = "linestate";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			u2phy0_otg: otg-port {</div><div class='add'>+				#phy-cells = &lt;0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH 0&gt;,</div><div class='add'>+					     &lt;GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH 0&gt;,</div><div class='add'>+					     &lt;GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH 0&gt;;</div><div class='add'>+				interrupt-names = "otg-bvalid", "otg-id",</div><div class='add'>+						  "linestate";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		u2phy1: usb2-phy@e460 {</div><div class='hunk'>@@ -1121,6 +1175,16 @@</div><div class='ctx'> 				interrupt-names = "linestate";</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			u2phy1_otg: otg-port {</div><div class='add'>+				#phy-cells = &lt;0&gt;;</div><div class='add'>+				interrupts = &lt;GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH 0&gt;,</div><div class='add'>+					     &lt;GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH 0&gt;,</div><div class='add'>+					     &lt;GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH 0&gt;;</div><div class='add'>+				interrupt-names = "otg-bvalid", "otg-id",</div><div class='add'>+						  "linestate";</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		emmc_phy: phy@f780 {</div><div class='hunk'>@@ -1151,6 +1215,7 @@</div><div class='ctx'> 		clock-names = "tcpdcore", "tcpdphy-ref";</div><div class='ctx'> 		assigned-clocks = &lt;&amp;cru SCLK_UPHY0_TCPDCORE&gt;;</div><div class='ctx'> 		assigned-clock-rates = &lt;50000000&gt;;</div><div class='add'>+		power-domains = &lt;&amp;power RK3399_PD_TCPD0&gt;;</div><div class='ctx'> 		resets = &lt;&amp;cru SRST_UPHY0&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SRST_UPHY0_PIPE_L00&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SRST_P_UPHY0_TCPHY&gt;;</div><div class='hunk'>@@ -1179,6 +1244,7 @@</div><div class='ctx'> 		clock-names = "tcpdcore", "tcpdphy-ref";</div><div class='ctx'> 		assigned-clocks = &lt;&amp;cru SCLK_UPHY1_TCPDCORE&gt;;</div><div class='ctx'> 		assigned-clock-rates = &lt;50000000&gt;;</div><div class='add'>+		power-domains = &lt;&amp;power RK3399_PD_TCPD1&gt;;</div><div class='ctx'> 		resets = &lt;&amp;cru SRST_UPHY1&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SRST_UPHY1_PIPE_L00&gt;,</div><div class='ctx'> 			 &lt;&amp;cru SRST_P_UPHY1_TCPHY&gt;;</div><div class='hunk'>@@ -1386,6 +1452,13 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		edp {</div><div class='add'>+			edp_hpd: edp-hpd {</div><div class='add'>+				rockchip,pins =</div><div class='add'>+					&lt;4 23 RK_FUNC_2 &amp;pcfg_pull_none&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		gmac {</div><div class='ctx'> 			rgmii_pins: rgmii-pins {</div><div class='ctx'> 				rockchip,pins =</div><div class='head'>diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi<br/>index 3eb4c42ce7b9..da881f5b6ed4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/memreserve/ 0x80000000 0x00000008;	/* cpu-release-addr */</div><div class='add'>+/memreserve/ 0x80000000 0x00080000;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "socionext,uniphier-ld11";</div><div class='hunk'>@@ -70,19 +70,60 @@</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='ctx'> 			reg = &lt;0 0x000&gt;;</div><div class='del'>-			enable-method = "spin-table";</div><div class='del'>-			cpu-release-addr = &lt;0 0x80000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 33&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster0_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu1: cpu@1 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='ctx'> 			reg = &lt;0 0x001&gt;;</div><div class='del'>-			enable-method = "spin-table";</div><div class='del'>-			cpu-release-addr = &lt;0 0x80000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 33&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster0_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	cluster0_opp: opp_table {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@245000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;245000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@250000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;250000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@490000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;490000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@500000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;500000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@653334000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;653334000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@666667000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;666667000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@980000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;980000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-1.0";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	clocks {</div><div class='ctx'> 		refclk: ref {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='hunk'>@@ -232,8 +273,19 @@</div><div class='ctx'> 			reg = &lt;0x59801000 0x400&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		sdctrl@59810000 {</div><div class='add'>+			compatible = "socionext,uniphier-ld11-sdctrl",</div><div class='add'>+				     "simple-mfd", "syscon";</div><div class='add'>+			reg = &lt;0x59810000 0x400&gt;;</div><div class='add'>+</div><div class='add'>+			sd_rst: reset {</div><div class='add'>+				compatible = "socionext,uniphier-ld11-sd-reset";</div><div class='add'>+				#reset-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		perictrl@59820000 {</div><div class='del'>-			compatible = "socionext,uniphier-perictrl",</div><div class='add'>+			compatible = "socionext,uniphier-ld11-perictrl",</div><div class='ctx'> 				     "simple-mfd", "syscon";</div><div class='ctx'> 			reg = &lt;0x59820000 0x200&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -248,6 +300,16 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		emmc: sdhc@5a000000 {</div><div class='add'>+			compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";</div><div class='add'>+			reg = &lt;0x5a000000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;0 78 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 4&gt;;</div><div class='add'>+			bus-width = &lt;8&gt;;</div><div class='add'>+			mmc-ddr-1_8v;</div><div class='add'>+			mmc-hs200-1_8v;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		usb0: usb@5a800100 {</div><div class='ctx'> 			compatible = "socionext,uniphier-ehci", "generic-ehci";</div><div class='ctx'> 			status = "disabled";</div><div class='hunk'>@@ -282,7 +344,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		mioctrl@5b3e0000 {</div><div class='del'>-			compatible = "socionext,uniphier-mioctrl",</div><div class='add'>+			compatible = "socionext,uniphier-ld11-mioctrl",</div><div class='ctx'> 				     "simple-mfd", "syscon";</div><div class='ctx'> 			reg = &lt;0x5b3e0000 0x800&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -299,7 +361,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		soc-glue@5f800000 {</div><div class='del'>-			compatible = "socionext,uniphier-soc-glue",</div><div class='add'>+			compatible = "socionext,uniphier-ld11-soc-glue",</div><div class='ctx'> 				     "simple-mfd", "syscon";</div><div class='ctx'> 			reg = &lt;0x5f800000 0x2000&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -320,7 +382,7 @@</div><div class='ctx'> 		sysctrl@61840000 {</div><div class='ctx'> 			compatible = "socionext,uniphier-ld11-sysctrl",</div><div class='ctx'> 				     "simple-mfd", "syscon";</div><div class='del'>-			reg = &lt;0x61840000 0x4000&gt;;</div><div class='add'>+			reg = &lt;0x61840000 0x10000&gt;;</div><div class='ctx'> </div><div class='ctx'> 			sys_clk: clock {</div><div class='ctx'> 				compatible = "socionext,uniphier-ld11-clock";</div><div class='head'>diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi<br/>index 56a1b2e92cf3..a6b3a70dae83 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'>  *     OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/memreserve/ 0x80000000 0x00000008;	/* cpu-release-addr */</div><div class='add'>+/memreserve/ 0x80000000 0x00080000;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "socionext,uniphier-ld20";</div><div class='hunk'>@@ -79,35 +79,120 @@</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='ctx'> 			reg = &lt;0 0x000&gt;;</div><div class='del'>-			enable-method = "spin-table";</div><div class='del'>-			cpu-release-addr = &lt;0 0x80000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 32&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster0_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu1: cpu@1 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a72", "arm,armv8";</div><div class='ctx'> 			reg = &lt;0 0x001&gt;;</div><div class='del'>-			enable-method = "spin-table";</div><div class='del'>-			cpu-release-addr = &lt;0 0x80000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 32&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster0_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu2: cpu@100 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='ctx'> 			reg = &lt;0 0x100&gt;;</div><div class='del'>-			enable-method = "spin-table";</div><div class='del'>-			cpu-release-addr = &lt;0 0x80000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 33&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster1_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu3: cpu@101 {</div><div class='ctx'> 			device_type = "cpu";</div><div class='ctx'> 			compatible = "arm,cortex-a53", "arm,armv8";</div><div class='ctx'> 			reg = &lt;0 0x101&gt;;</div><div class='del'>-			enable-method = "spin-table";</div><div class='del'>-			cpu-release-addr = &lt;0 0x80000000&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 33&gt;;</div><div class='add'>+			enable-method = "psci";</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster1_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	cluster0_opp: opp_table0 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@250000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;250000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@275000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;275000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@500000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;500000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@550000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;550000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@666667000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;666667000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@733334000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;733334000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1000000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1100000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cluster1_opp: opp_table1 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@250000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;250000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@275000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;275000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@500000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;500000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@550000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;550000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@666667000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;666667000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@733334000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;733334000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1000000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+		opp@1100000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1100000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;300&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	psci {</div><div class='add'>+		compatible = "arm,psci-1.0";</div><div class='add'>+		method = "smc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	clocks {</div><div class='ctx'> 		refclk: ref {</div><div class='ctx'> 			compatible = "fixed-clock";</div><div class='hunk'>@@ -274,7 +359,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		perictrl@59820000 {</div><div class='del'>-			compatible = "socionext,uniphier-perictrl",</div><div class='add'>+			compatible = "socionext,uniphier-ld20-perictrl",</div><div class='ctx'> 				     "simple-mfd", "syscon";</div><div class='ctx'> 			reg = &lt;0x59820000 0x200&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -289,8 +374,18 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		emmc: sdhc@5a000000 {</div><div class='add'>+			compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";</div><div class='add'>+			reg = &lt;0x5a000000 0x400&gt;;</div><div class='add'>+			interrupts = &lt;0 78 4&gt;;</div><div class='add'>+			clocks = &lt;&amp;sys_clk 4&gt;;</div><div class='add'>+			bus-width = &lt;8&gt;;</div><div class='add'>+			mmc-ddr-1_8v;</div><div class='add'>+			mmc-hs200-1_8v;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		soc-glue@5f800000 {</div><div class='del'>-			compatible = "socionext,uniphier-soc-glue",</div><div class='add'>+			compatible = "socionext,uniphier-ld20-soc-glue",</div><div class='ctx'> 				     "simple-mfd", "syscon";</div><div class='ctx'> 			reg = &lt;0x5f800000 0x2000&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -309,9 +404,9 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sysctrl@61840000 {</div><div class='del'>-			compatible = "socionext,uniphier-sysctrl",</div><div class='add'>+			compatible = "socionext,uniphier-ld20-sysctrl",</div><div class='ctx'> 				     "simple-mfd", "syscon";</div><div class='del'>-			reg = &lt;0x61840000 0x4000&gt;;</div><div class='add'>+			reg = &lt;0x61840000 0x10000&gt;;</div><div class='ctx'> </div><div class='ctx'> 			sys_clk: clock {</div><div class='ctx'> 				compatible = "socionext,uniphier-ld20-clock";</div><div class='head'>diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts<br/>index 358089687a69..ef1b9e573af0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> 		stdout-path = "serial0:115200n8";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='add'>+	memory@0 {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x0 0x0 0x0 0x40000000&gt;;</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi<br/>index 68a908334c7b..54dc28351c8c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/xilinx/zynqmp.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/xilinx/zynqmp.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/xilinx/zynqmp.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/xilinx/zynqmp.dtsi</a></div><div class='hunk'>@@ -72,7 +72,7 @@</div><div class='ctx'> 			     &lt;1 10 0xf08&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	amba_apu {</div><div class='add'>+	amba_apu: amba_apu@0 {</div><div class='ctx'> 		compatible = "simple-bus";</div><div class='ctx'> 		#address-cells = &lt;2&gt;;</div><div class='ctx'> 		#size-cells = &lt;1&gt;;</div><div class='hunk'>@@ -175,7 +175,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c0: i2c@ff020000 {</div><div class='del'>-			compatible = "cdns,i2c-r1p10";</div><div class='add'>+			compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 			interrupts = &lt;0 17 4&gt;;</div><div class='hunk'>@@ -185,7 +185,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c1: i2c@ff030000 {</div><div class='del'>-			compatible = "cdns,i2c-r1p10";</div><div class='add'>+			compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> 			interrupts = &lt;0 18 4&gt;;</div><div class='head'>diff --git a/arch/arm64/boot/dts/zte/zx296718.dtsi b/arch/arm64/boot/dts/zte/zx296718.dtsi<br/>index a223066f24ce..b850b2cd0adc 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/boot/dts/zte/zx296718.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/boot/dts/zte/zx296718.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/boot/dts/zte/zx296718.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/boot/dts/zte/zx296718.dtsi</a></div><div class='hunk'>@@ -44,6 +44,7 @@</div><div class='ctx'> #include &lt;dt-bindings/input/input.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/interrupt-controller/arm-gic.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/zx296718-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "zte,zx296718";</div><div class='hunk'>@@ -81,6 +82,8 @@</div><div class='ctx'> 			compatible = "arm,cortex-a53","arm,armv8";</div><div class='ctx'> 			reg = &lt;0x0 0x0&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='add'>+			clocks = &lt;&amp;topcrm A53_GATE&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster0_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu1: cpu@1 {</div><div class='hunk'>@@ -88,6 +91,8 @@</div><div class='ctx'> 			compatible = "arm,cortex-a53","arm,armv8";</div><div class='ctx'> 			reg = &lt;0x0 0x1&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='add'>+			clocks = &lt;&amp;topcrm A53_GATE&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster0_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu2: cpu@2 {</div><div class='hunk'>@@ -95,6 +100,8 @@</div><div class='ctx'> 			compatible = "arm,cortex-a53","arm,armv8";</div><div class='ctx'> 			reg = &lt;0x0 0x2&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='add'>+			clocks = &lt;&amp;topcrm A53_GATE&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster0_opp&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		cpu3: cpu@3 {</div><div class='hunk'>@@ -102,6 +109,38 @@</div><div class='ctx'> 			compatible = "arm,cortex-a53","arm,armv8";</div><div class='ctx'> 			reg = &lt;0x0 0x3&gt;;</div><div class='ctx'> 			enable-method = "psci";</div><div class='add'>+			clocks = &lt;&amp;topcrm A53_GATE&gt;;</div><div class='add'>+			operating-points-v2 = &lt;&amp;cluster0_opp&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cluster0_opp: opp-table0 {</div><div class='add'>+		compatible = "operating-points-v2";</div><div class='add'>+		opp-shared;</div><div class='add'>+</div><div class='add'>+		opp@500000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;500000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;500000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		opp@648000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;648000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;500000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		opp@800000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;800000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;500000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		opp@1000000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1000000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;500000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		opp@1188000000 {</div><div class='add'>+			opp-hz = /bits/ 64 &lt;1188000000&gt;;</div><div class='add'>+			clock-latency-ns = &lt;500000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -239,16 +278,9 @@</div><div class='ctx'> 		compatible = "arm,gic-v3";</div><div class='ctx'> 		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		#address-cells = &lt;0&gt;;</div><div class='del'>-		#redistributor-regions = &lt;6&gt;;</div><div class='del'>-		redistributor-stride = &lt;0x0 0x40000&gt;;</div><div class='ctx'> 		interrupt-controller;</div><div class='ctx'> 		reg = &lt;0x02a00000 0x10000&gt;,</div><div class='del'>-		      &lt;0x02b00000 0x20000&gt;,</div><div class='del'>-		      &lt;0x02b20000 0x20000&gt;,</div><div class='del'>-		      &lt;0x02b40000 0x20000&gt;,</div><div class='del'>-		      &lt;0x02b60000 0x20000&gt;,</div><div class='del'>-		      &lt;0x02b80000 0x20000&gt;,</div><div class='del'>-		      &lt;0x02ba0000 0x20000&gt;;</div><div class='add'>+		      &lt;0x02b00000 0xc0000&gt;;</div><div class='ctx'> 		interrupts = &lt;GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -284,9 +316,33 @@</div><div class='ctx'> 			dma-requests = &lt;32&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		lsp0crm: clock-controller@1420000 {</div><div class='add'>+			compatible = "zte,zx296718-lsp0crm";</div><div class='add'>+			reg = &lt;0x01420000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lsp1crm: clock-controller@1430000 {</div><div class='add'>+			compatible = "zte,zx296718-lsp1crm";</div><div class='add'>+			reg = &lt;0x01430000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		topcrm: clock-controller@1461000 {</div><div class='add'>+			compatible = "zte,zx296718-topcrm";</div><div class='add'>+			reg = &lt;0x01461000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		sysctrl: sysctrl@1463000 {</div><div class='ctx'> 			compatible = "zte,zx296718-sysctrl", "syscon";</div><div class='ctx'> 			reg = &lt;0x1463000 0x1000&gt;;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		audiocrm: clock-controller@1480000 {</div><div class='add'>+			compatible = "zte,zx296718-audiocrm";</div><div class='add'>+			reg = &lt;0x01480000 0x1000&gt;;</div><div class='add'>+			#clock-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig<br/>index dab2cb0c1f1c..7c48028ec64a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/configs/defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/configs/defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/configs/defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/configs/defconfig</a></div><div class='hunk'>@@ -11,7 +11,7 @@ CONFIG_TASK_XACCT=y</div><div class='ctx'> CONFIG_TASK_IO_ACCOUNTING=y</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_NUMA_BALANCING=y</div><div class='ctx'> CONFIG_MEMCG=y</div><div class='ctx'> CONFIG_MEMCG_SWAP=y</div><div class='ctx'> CONFIG_BLK_CGROUP=y</div><div class='hunk'>@@ -34,6 +34,7 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> CONFIG_ARCH_SUNXI=y</div><div class='ctx'> CONFIG_ARCH_ALPINE=y</div><div class='add'>+CONFIG_ARCH_BCM2835=y</div><div class='ctx'> CONFIG_ARCH_BCM_IPROC=y</div><div class='ctx'> CONFIG_ARCH_BERLIN=y</div><div class='ctx'> CONFIG_ARCH_EXYNOS=y</div><div class='hunk'>@@ -53,6 +54,7 @@ CONFIG_ARCH_STRATIX10=y</div><div class='ctx'> CONFIG_ARCH_TEGRA=y</div><div class='ctx'> CONFIG_ARCH_SPRD=y</div><div class='ctx'> CONFIG_ARCH_THUNDER=y</div><div class='add'>+CONFIG_ARCH_THUNDER2=y</div><div class='ctx'> CONFIG_ARCH_UNIPHIER=y</div><div class='ctx'> CONFIG_ARCH_VEXPRESS=y</div><div class='ctx'> CONFIG_ARCH_VULCAN=y</div><div class='hunk'>@@ -72,6 +74,7 @@ CONFIG_PCIE_QCOM=y</div><div class='ctx'> CONFIG_PCIE_ARMADA_8K=y</div><div class='ctx'> CONFIG_ARM64_VA_BITS_48=y</div><div class='ctx'> CONFIG_SCHED_MC=y</div><div class='add'>+CONFIG_NUMA=y</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='ctx'> CONFIG_KSM=y</div><div class='ctx'> CONFIG_TRANSPARENT_HUGEPAGE=y</div><div class='hunk'>@@ -82,6 +85,7 @@ CONFIG_KEXEC=y</div><div class='ctx'> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='ctx'> CONFIG_COMPAT=y</div><div class='ctx'> CONFIG_CPU_IDLE=y</div><div class='add'>+CONFIG_HIBERNATION=y</div><div class='ctx'> CONFIG_ARM_CPUIDLE=y</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='ctx'> CONFIG_CPUFREQ_DT=y</div><div class='hunk'>@@ -142,11 +146,15 @@ CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> CONFIG_DMA_CMA=y</div><div class='ctx'> CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='ctx'> CONFIG_MTD_M25P80=y</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+CONFIG_MTD_NAND_DENALI_DT=y</div><div class='ctx'> CONFIG_MTD_SPI_NOR=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_NBD=m</div><div class='ctx'> CONFIG_VIRTIO_BLK=y</div><div class='add'>+CONFIG_EEPROM_AT25=m</div><div class='ctx'> CONFIG_SRAM=y</div><div class='ctx'> # CONFIG_SCSI_PROC_FS is not set</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='hunk'>@@ -183,7 +191,10 @@ CONFIG_SMC91X=y</div><div class='ctx'> CONFIG_SMSC911X=y</div><div class='ctx'> CONFIG_STMMAC_ETH=m</div><div class='ctx'> CONFIG_REALTEK_PHY=m</div><div class='add'>+CONFIG_MESON_GXL_PHY=m</div><div class='ctx'> CONFIG_MICREL_PHY=y</div><div class='add'>+CONFIG_MDIO_BUS_MUX=y</div><div class='add'>+CONFIG_MDIO_BUS_MUX_MMIOREG=y</div><div class='ctx'> CONFIG_USB_PEGASUS=m</div><div class='ctx'> CONFIG_USB_RTL8150=m</div><div class='ctx'> CONFIG_USB_RTL8152=m</div><div class='hunk'>@@ -194,6 +205,7 @@ CONFIG_USB_NET_SMSC75XX=m</div><div class='ctx'> CONFIG_USB_NET_SMSC95XX=m</div><div class='ctx'> CONFIG_USB_NET_PLUSB=m</div><div class='ctx'> CONFIG_USB_NET_MCS7830=m</div><div class='add'>+CONFIG_BRCMFMAC=m</div><div class='ctx'> CONFIG_WL18XX=m</div><div class='ctx'> CONFIG_WLCORE_SDIO=m</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='hunk'>@@ -206,6 +218,9 @@ CONFIG_SERIO_AMBAKMI=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=16</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_BCM2835AUX=y</div><div class='ctx'> CONFIG_SERIAL_8250_DW=y</div><div class='ctx'> CONFIG_SERIAL_8250_MT6577=y</div><div class='ctx'> CONFIG_SERIAL_8250_UNIPHIER=y</div><div class='hunk'>@@ -229,17 +244,21 @@ CONFIG_VIRTIO_CONSOLE=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_MUX=y</div><div class='ctx'> CONFIG_I2C_MUX_PCA954x=y</div><div class='add'>+CONFIG_I2C_BCM2835=m</div><div class='ctx'> CONFIG_I2C_DESIGNWARE_PLATFORM=y</div><div class='ctx'> CONFIG_I2C_IMX=y</div><div class='ctx'> CONFIG_I2C_MESON=y</div><div class='ctx'> CONFIG_I2C_MV64XXX=y</div><div class='ctx'> CONFIG_I2C_QUP=y</div><div class='add'>+CONFIG_I2C_RK3X=y</div><div class='ctx'> CONFIG_I2C_TEGRA=y</div><div class='ctx'> CONFIG_I2C_UNIPHIER_F=y</div><div class='ctx'> CONFIG_I2C_RCAR=y</div><div class='ctx'> CONFIG_I2C_CROS_EC_TUNNEL=y</div><div class='ctx'> CONFIG_SPI=y</div><div class='ctx'> CONFIG_SPI_MESON_SPIFC=m</div><div class='add'>+CONFIG_SPI_BCM2835=m</div><div class='add'>+CONFIG_SPI_BCM2835AUX=m</div><div class='ctx'> CONFIG_SPI_ORION=y</div><div class='ctx'> CONFIG_SPI_PL022=y</div><div class='ctx'> CONFIG_SPI_QUP=y</div><div class='hunk'>@@ -249,14 +268,15 @@ CONFIG_SPMI=y</div><div class='ctx'> CONFIG_PINCTRL_SINGLE=y</div><div class='ctx'> CONFIG_PINCTRL_MAX77620=y</div><div class='ctx'> CONFIG_PINCTRL_MSM8916=y</div><div class='add'>+CONFIG_PINCTRL_MSM8994=y</div><div class='ctx'> CONFIG_PINCTRL_MSM8996=y</div><div class='ctx'> CONFIG_PINCTRL_QDF2XXX=y</div><div class='ctx'> CONFIG_PINCTRL_QCOM_SPMI_PMIC=y</div><div class='del'>-CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_GPIO_DWAPB=y</div><div class='ctx'> CONFIG_GPIO_PL061=y</div><div class='ctx'> CONFIG_GPIO_RCAR=y</div><div class='ctx'> CONFIG_GPIO_XGENE=y</div><div class='add'>+CONFIG_GPIO_XGENE_SB=y</div><div class='ctx'> CONFIG_GPIO_PCA953X=y</div><div class='ctx'> CONFIG_GPIO_PCA953X_IRQ=y</div><div class='ctx'> CONFIG_GPIO_MAX77620=y</div><div class='hunk'>@@ -271,13 +291,16 @@ CONFIG_THERMAL=y</div><div class='ctx'> CONFIG_THERMAL_EMULATION=y</div><div class='ctx'> CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y</div><div class='ctx'> CONFIG_CPU_THERMAL=y</div><div class='add'>+CONFIG_BCM2835_THERMAL=y</div><div class='ctx'> CONFIG_EXYNOS_THERMAL=y</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_BCM2835_WDT=y</div><div class='ctx'> CONFIG_RENESAS_WDT=y</div><div class='ctx'> CONFIG_S3C2410_WATCHDOG=y</div><div class='ctx'> CONFIG_MESON_GXBB_WATCHDOG=m</div><div class='ctx'> CONFIG_MESON_WATCHDOG=m</div><div class='ctx'> CONFIG_MFD_MAX77620=y</div><div class='add'>+CONFIG_MFD_RK808=y</div><div class='ctx'> CONFIG_MFD_SPMI_PMIC=y</div><div class='ctx'> CONFIG_MFD_SEC_CORE=y</div><div class='ctx'> CONFIG_MFD_HI655X_PMIC=y</div><div class='hunk'>@@ -291,13 +314,30 @@ CONFIG_REGULATOR_MAX77620=y</div><div class='ctx'> CONFIG_REGULATOR_PWM=y</div><div class='ctx'> CONFIG_REGULATOR_QCOM_SMD_RPM=y</div><div class='ctx'> CONFIG_REGULATOR_QCOM_SPMI=y</div><div class='add'>+CONFIG_REGULATOR_RK808=y</div><div class='ctx'> CONFIG_REGULATOR_S2MPS11=y</div><div class='add'>+CONFIG_MEDIA_SUPPORT=m</div><div class='add'>+CONFIG_MEDIA_CAMERA_SUPPORT=y</div><div class='add'>+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y</div><div class='add'>+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y</div><div class='add'>+CONFIG_MEDIA_CONTROLLER=y</div><div class='add'>+CONFIG_VIDEO_V4L2_SUBDEV_API=y</div><div class='add'>+# CONFIG_DVB_NET is not set</div><div class='add'>+CONFIG_V4L_MEM2MEM_DRIVERS=y</div><div class='add'>+CONFIG_VIDEO_RENESAS_FCP=m</div><div class='add'>+CONFIG_VIDEO_RENESAS_VSP1=m</div><div class='ctx'> CONFIG_DRM=m</div><div class='ctx'> CONFIG_DRM_NOUVEAU=m</div><div class='add'>+CONFIG_DRM_RCAR_DU=m</div><div class='add'>+CONFIG_DRM_RCAR_HDMI=y</div><div class='add'>+CONFIG_DRM_RCAR_LVDS=y</div><div class='add'>+CONFIG_DRM_RCAR_VSP=y</div><div class='ctx'> CONFIG_DRM_TEGRA=m</div><div class='add'>+CONFIG_DRM_VC4=m</div><div class='ctx'> CONFIG_DRM_PANEL_SIMPLE=m</div><div class='ctx'> CONFIG_DRM_I2C_ADV7511=m</div><div class='ctx'> CONFIG_DRM_HISI_KIRIN=m</div><div class='add'>+CONFIG_DRM_MESON=m</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FB_ARMCLCD=y</div><div class='ctx'> CONFIG_BACKLIGHT_GENERIC=m</div><div class='hunk'>@@ -309,6 +349,7 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_SOUND=y</div><div class='ctx'> CONFIG_SND=y</div><div class='ctx'> CONFIG_SND_SOC=y</div><div class='add'>+CONFIG_SND_BCM2835_SOC_I2S=m</div><div class='ctx'> CONFIG_SND_SOC_RCAR=y</div><div class='ctx'> CONFIG_SND_SOC_SAMSUNG=y</div><div class='ctx'> CONFIG_SND_SOC_AK4613=y</div><div class='hunk'>@@ -341,10 +382,13 @@ CONFIG_USB_RENESAS_USBHS_UDC=m</div><div class='ctx'> CONFIG_MMC=y</div><div class='ctx'> CONFIG_MMC_BLOCK_MINORS=32</div><div class='ctx'> CONFIG_MMC_ARMMMCI=y</div><div class='add'>+CONFIG_MMC_MESON_GX=y</div><div class='ctx'> CONFIG_MMC_SDHCI=y</div><div class='ctx'> CONFIG_MMC_SDHCI_ACPI=y</div><div class='ctx'> CONFIG_MMC_SDHCI_PLTFM=y</div><div class='add'>+CONFIG_MMC_SDHCI_OF_ARASAN=y</div><div class='ctx'> CONFIG_MMC_SDHCI_OF_ESDHC=y</div><div class='add'>+CONFIG_MMC_SDHCI_CADENCE=y</div><div class='ctx'> CONFIG_MMC_SDHCI_TEGRA=y</div><div class='ctx'> CONFIG_MMC_SDHCI_MSM=y</div><div class='ctx'> CONFIG_MMC_SPI=y</div><div class='hunk'>@@ -352,6 +396,7 @@ CONFIG_MMC_SDHI=y</div><div class='ctx'> CONFIG_MMC_DW=y</div><div class='ctx'> CONFIG_MMC_DW_EXYNOS=y</div><div class='ctx'> CONFIG_MMC_DW_K3=y</div><div class='add'>+CONFIG_MMC_DW_ROCKCHIP=y</div><div class='ctx'> CONFIG_MMC_SUNXI=y</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='ctx'> CONFIG_LEDS_CLASS=y</div><div class='hunk'>@@ -367,11 +412,14 @@ CONFIG_RTC_DRV_DS3232=y</div><div class='ctx'> CONFIG_RTC_DRV_EFI=y</div><div class='ctx'> CONFIG_RTC_DRV_PL031=y</div><div class='ctx'> CONFIG_RTC_DRV_SUN6I=y</div><div class='add'>+CONFIG_RTC_DRV_RK808=m</div><div class='ctx'> CONFIG_RTC_DRV_TEGRA=y</div><div class='ctx'> CONFIG_RTC_DRV_XGENE=y</div><div class='ctx'> CONFIG_RTC_DRV_S3C=y</div><div class='ctx'> CONFIG_DMADEVICES=y</div><div class='add'>+CONFIG_MV_XOR_V2=y</div><div class='ctx'> CONFIG_PL330_DMA=y</div><div class='add'>+CONFIG_DMA_BCM2835=m</div><div class='ctx'> CONFIG_TEGRA20_APB_DMA=y</div><div class='ctx'> CONFIG_QCOM_BAM_DMA=y</div><div class='ctx'> CONFIG_QCOM_HIDMA_MGMT=y</div><div class='hunk'>@@ -387,26 +435,40 @@ CONFIG_XEN_GRANT_DEV_ALLOC=y</div><div class='ctx'> CONFIG_COMMON_CLK_SCPI=y</div><div class='ctx'> CONFIG_COMMON_CLK_CS2000_CP=y</div><div class='ctx'> CONFIG_COMMON_CLK_S2MPS11=y</div><div class='add'>+CONFIG_COMMON_CLK_PWM=y</div><div class='add'>+CONFIG_COMMON_CLK_RK808=y</div><div class='ctx'> CONFIG_CLK_QORIQ=y</div><div class='ctx'> CONFIG_COMMON_CLK_QCOM=y</div><div class='ctx'> CONFIG_MSM_GCC_8916=y</div><div class='add'>+CONFIG_MSM_GCC_8994=y</div><div class='ctx'> CONFIG_MSM_MMCC_8996=y</div><div class='ctx'> CONFIG_HWSPINLOCK_QCOM=y</div><div class='ctx'> CONFIG_MAILBOX=y</div><div class='ctx'> CONFIG_ARM_MHU=y</div><div class='add'>+CONFIG_PLATFORM_MHU=y</div><div class='add'>+CONFIG_BCM2835_MBOX=y</div><div class='ctx'> CONFIG_HI6220_MBOX=y</div><div class='ctx'> CONFIG_ARM_SMMU=y</div><div class='add'>+CONFIG_ARM_SMMU_V3=y</div><div class='add'>+CONFIG_RASPBERRYPI_POWER=y</div><div class='ctx'> CONFIG_QCOM_SMEM=y</div><div class='ctx'> CONFIG_QCOM_SMD=y</div><div class='ctx'> CONFIG_QCOM_SMD_RPM=y</div><div class='add'>+CONFIG_ROCKCHIP_PM_DOMAINS=y</div><div class='ctx'> CONFIG_ARCH_TEGRA_132_SOC=y</div><div class='ctx'> CONFIG_ARCH_TEGRA_210_SOC=y</div><div class='add'>+CONFIG_ARCH_TEGRA_186_SOC=y</div><div class='ctx'> CONFIG_EXTCON_USB_GPIO=y</div><div class='ctx'> CONFIG_PWM=y</div><div class='add'>+CONFIG_PWM_BCM2835=m</div><div class='add'>+CONFIG_PWM_ROCKCHIP=y</div><div class='ctx'> CONFIG_PWM_TEGRA=m</div><div class='add'>+CONFIG_PWM_MESON=m</div><div class='ctx'> CONFIG_COMMON_RESET_HI6220=y</div><div class='ctx'> CONFIG_PHY_RCAR_GEN3_USB2=y</div><div class='ctx'> CONFIG_PHY_HI6220_USB=y</div><div class='add'>+CONFIG_PHY_ROCKCHIP_INNO_USB2=y</div><div class='add'>+CONFIG_PHY_ROCKCHIP_EMMC=y</div><div class='ctx'> CONFIG_PHY_XGENE=y</div><div class='ctx'> CONFIG_PHY_TEGRA_XUSB=y</div><div class='ctx'> CONFIG_ARM_SCPI_PROTOCOL=y</div><div class='hunk'>@@ -414,6 +476,7 @@ CONFIG_ACPI=y</div><div class='ctx'> CONFIG_IIO=y</div><div class='ctx'> CONFIG_EXYNOS_ADC=y</div><div class='ctx'> CONFIG_PWM_SAMSUNG=y</div><div class='add'>+CONFIG_RASPBERRYPI_FIRMWARE=y</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='ctx'> CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='hunk'>@@ -462,4 +525,3 @@ CONFIG_CRYPTO_GHASH_ARM64_CE=y</div><div class='ctx'> CONFIG_CRYPTO_AES_ARM64_CE_CCM=y</div><div class='ctx'> CONFIG_CRYPTO_AES_ARM64_CE_BLK=y</div><div class='ctx'> # CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set</div><div class='del'>-CONFIG_CRYPTO_CRC32_ARM64=y</div><div class='head'>diff --git a/arch/arm64/crypto/.gitignore b/arch/arm64/crypto/.gitignore<br/>new file mode 100644<br/>index 000000000000..879df8781ed5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/.gitignore</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+sha256-core.S</div><div class='add'>+sha512-core.S</div><div class='head'>diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig<br/>index 2cf32e9887e1..d92293747d63 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/Kconfig</a></div><div class='hunk'>@@ -8,6 +8,14 @@ menuconfig ARM64_CRYPTO</div><div class='ctx'> </div><div class='ctx'> if ARM64_CRYPTO</div><div class='ctx'> </div><div class='add'>+config CRYPTO_SHA256_ARM64</div><div class='add'>+	tristate "SHA-224/SHA-256 digest algorithm for arm64"</div><div class='add'>+	select CRYPTO_HASH</div><div class='add'>+</div><div class='add'>+config CRYPTO_SHA512_ARM64</div><div class='add'>+	tristate "SHA-384/SHA-512 digest algorithm for arm64"</div><div class='add'>+	select CRYPTO_HASH</div><div class='add'>+</div><div class='ctx'> config CRYPTO_SHA1_ARM64_CE</div><div class='ctx'> 	tristate "SHA-1 digest algorithm (ARMv8 Crypto Extensions)"</div><div class='ctx'> 	depends on ARM64 &amp;&amp; KERNEL_MODE_NEON</div><div class='hunk'>@@ -23,6 +31,20 @@ config CRYPTO_GHASH_ARM64_CE</div><div class='ctx'> 	depends on ARM64 &amp;&amp; KERNEL_MODE_NEON</div><div class='ctx'> 	select CRYPTO_HASH</div><div class='ctx'> </div><div class='add'>+config CRYPTO_CRCT10DIF_ARM64_CE</div><div class='add'>+	tristate "CRCT10DIF digest algorithm using PMULL instructions"</div><div class='add'>+	depends on KERNEL_MODE_NEON &amp;&amp; CRC_T10DIF</div><div class='add'>+	select CRYPTO_HASH</div><div class='add'>+</div><div class='add'>+config CRYPTO_CRC32_ARM64_CE</div><div class='add'>+	tristate "CRC32 and CRC32C digest algorithms using ARMv8 extensions"</div><div class='add'>+	depends on CRC32</div><div class='add'>+	select CRYPTO_HASH</div><div class='add'>+</div><div class='add'>+config CRYPTO_AES_ARM64</div><div class='add'>+	tristate "AES core cipher using scalar instructions"</div><div class='add'>+	select CRYPTO_AES</div><div class='add'>+</div><div class='ctx'> config CRYPTO_AES_ARM64_CE</div><div class='ctx'> 	tristate "AES core cipher using ARMv8 Crypto Extensions"</div><div class='ctx'> 	depends on ARM64 &amp;&amp; KERNEL_MODE_NEON</div><div class='hunk'>@@ -40,17 +62,26 @@ config CRYPTO_AES_ARM64_CE_BLK</div><div class='ctx'> 	depends on ARM64 &amp;&amp; KERNEL_MODE_NEON</div><div class='ctx'> 	select CRYPTO_BLKCIPHER</div><div class='ctx'> 	select CRYPTO_AES_ARM64_CE</div><div class='del'>-	select CRYPTO_ABLK_HELPER</div><div class='add'>+	select CRYPTO_SIMD</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_AES_ARM64_NEON_BLK</div><div class='ctx'> 	tristate "AES in ECB/CBC/CTR/XTS modes using NEON instructions"</div><div class='ctx'> 	depends on ARM64 &amp;&amp; KERNEL_MODE_NEON</div><div class='ctx'> 	select CRYPTO_BLKCIPHER</div><div class='ctx'> 	select CRYPTO_AES</div><div class='del'>-	select CRYPTO_ABLK_HELPER</div><div class='add'>+	select CRYPTO_SIMD</div><div class='add'>+</div><div class='add'>+config CRYPTO_CHACHA20_NEON</div><div class='add'>+	tristate "NEON accelerated ChaCha20 symmetric cipher"</div><div class='add'>+	depends on KERNEL_MODE_NEON</div><div class='add'>+	select CRYPTO_BLKCIPHER</div><div class='add'>+	select CRYPTO_CHACHA20</div><div class='add'>+</div><div class='add'>+config CRYPTO_AES_ARM64_BS</div><div class='add'>+	tristate "AES in ECB/CBC/CTR/XTS modes using bit-sliced NEON algorithm"</div><div class='add'>+	depends on KERNEL_MODE_NEON</div><div class='add'>+	select CRYPTO_BLKCIPHER</div><div class='add'>+	select CRYPTO_AES_ARM64_NEON_BLK</div><div class='add'>+	select CRYPTO_SIMD</div><div class='ctx'> </div><div class='del'>-config CRYPTO_CRC32_ARM64</div><div class='del'>-	tristate "CRC32 and CRC32C using optional ARMv8 instructions"</div><div class='del'>-	depends on ARM64</div><div class='del'>-	select CRYPTO_HASH</div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile<br/>index abb79b3cfcfe..b5edc5918c28 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/Makefile</a></div><div class='hunk'>@@ -17,6 +17,12 @@ sha2-ce-y := sha2-ce-glue.o sha2-ce-core.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_GHASH_ARM64_CE) += ghash-ce.o</div><div class='ctx'> ghash-ce-y := ghash-ce-glue.o ghash-ce-core.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_CRYPTO_CRCT10DIF_ARM64_CE) += crct10dif-ce.o</div><div class='add'>+crct10dif-ce-y := crct10dif-ce-core.o crct10dif-ce-glue.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CRYPTO_CRC32_ARM64_CE) += crc32-ce.o</div><div class='add'>+crc32-ce-y:= crc32-ce-core.o crc32-ce-glue.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_CRYPTO_AES_ARM64_CE) += aes-ce-cipher.o</div><div class='ctx'> CFLAGS_aes-ce-cipher.o += -march=armv8-a+crypto</div><div class='ctx'> </div><div class='hunk'>@@ -29,14 +35,36 @@ aes-ce-blk-y := aes-glue-ce.o aes-ce.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_AES_ARM64_NEON_BLK) += aes-neon-blk.o</div><div class='ctx'> aes-neon-blk-y := aes-glue-neon.o aes-neon.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_CRYPTO_SHA256_ARM64) += sha256-arm64.o</div><div class='add'>+sha256-arm64-y := sha256-glue.o sha256-core.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CRYPTO_SHA512_ARM64) += sha512-arm64.o</div><div class='add'>+sha512-arm64-y := sha512-glue.o sha512-core.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha20-neon.o</div><div class='add'>+chacha20-neon-y := chacha20-neon-core.o chacha20-neon-glue.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CRYPTO_AES_ARM64) += aes-arm64.o</div><div class='add'>+aes-arm64-y := aes-cipher-core.o aes-cipher-glue.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CRYPTO_AES_ARM64_BS) += aes-neon-bs.o</div><div class='add'>+aes-neon-bs-y := aes-neonbs-core.o aes-neonbs-glue.o</div><div class='add'>+</div><div class='ctx'> AFLAGS_aes-ce.o		:= -DINTERLEAVE=4</div><div class='ctx'> AFLAGS_aes-neon.o	:= -DINTERLEAVE=4</div><div class='ctx'> </div><div class='ctx'> CFLAGS_aes-glue-ce.o	:= -DUSE_V8_CRYPTO_EXTENSIONS</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_CRYPTO_CRC32_ARM64) += crc32-arm64.o</div><div class='del'>-</div><div class='del'>-CFLAGS_crc32-arm64.o	:= -mcpu=generic+crc</div><div class='del'>-</div><div class='ctx'> $(obj)/aes-glue-%.o: $(src)/aes-glue.c FORCE</div><div class='ctx'> 	$(call if_changed_rule,cc_o_c)</div><div class='add'>+</div><div class='add'>+quiet_cmd_perlasm = PERLASM $@</div><div class='add'>+      cmd_perlasm = $(PERL) $(&lt;) void $(@)</div><div class='add'>+</div><div class='add'>+$(src)/sha256-core.S_shipped: $(src)/sha512-armv8.pl</div><div class='add'>+	$(call cmd,perlasm)</div><div class='add'>+</div><div class='add'>+$(src)/sha512-core.S_shipped: $(src)/sha512-armv8.pl</div><div class='add'>+	$(call cmd,perlasm)</div><div class='add'>+</div><div class='add'>+.PRECIOUS: $(obj)/sha256-core.S $(obj)/sha512-core.S</div><div class='head'>diff --git a/arch/arm64/crypto/aes-ce-ccm-core.S b/arch/arm64/crypto/aes-ce-ccm-core.S<br/>index a2a7fbcacc14..3363560c79b7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/aes-ce-ccm-core.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/aes-ce-ccm-core.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/aes-ce-ccm-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-ce-ccm-core.S</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> 	.arch	armv8-a+crypto</div><div class='hunk'>@@ -19,7 +20,7 @@</div><div class='ctx'> 	 */</div><div class='ctx'> ENTRY(ce_aes_ccm_auth_data)</div><div class='ctx'> 	ldr	w8, [x3]			/* leftover from prev round? */</div><div class='del'>-	ld1	{v0.2d}, [x0]			/* load mac */</div><div class='add'>+	ld1	{v0.16b}, [x0]			/* load mac */</div><div class='ctx'> 	cbz	w8, 1f</div><div class='ctx'> 	sub	w8, w8, #16</div><div class='ctx'> 	eor	v1.16b, v1.16b, v1.16b</div><div class='hunk'>@@ -31,7 +32,7 @@ ENTRY(ce_aes_ccm_auth_data)</div><div class='ctx'> 	beq	8f				/* out of input? */</div><div class='ctx'> 	cbnz	w8, 0b</div><div class='ctx'> 	eor	v0.16b, v0.16b, v1.16b</div><div class='del'>-1:	ld1	{v3.2d}, [x4]			/* load first round key */</div><div class='add'>+1:	ld1	{v3.16b}, [x4]			/* load first round key */</div><div class='ctx'> 	prfm	pldl1strm, [x1]</div><div class='ctx'> 	cmp	w5, #12				/* which key size? */</div><div class='ctx'> 	add	x6, x4, #16</div><div class='hunk'>@@ -41,17 +42,17 @@ ENTRY(ce_aes_ccm_auth_data)</div><div class='ctx'> 	mov	v5.16b, v3.16b</div><div class='ctx'> 	b	4f</div><div class='ctx'> 2:	mov	v4.16b, v3.16b</div><div class='del'>-	ld1	{v5.2d}, [x6], #16		/* load 2nd round key */</div><div class='add'>+	ld1	{v5.16b}, [x6], #16		/* load 2nd round key */</div><div class='ctx'> 3:	aese	v0.16b, v4.16b</div><div class='ctx'> 	aesmc	v0.16b, v0.16b</div><div class='del'>-4:	ld1	{v3.2d}, [x6], #16		/* load next round key */</div><div class='add'>+4:	ld1	{v3.16b}, [x6], #16		/* load next round key */</div><div class='ctx'> 	aese	v0.16b, v5.16b</div><div class='ctx'> 	aesmc	v0.16b, v0.16b</div><div class='del'>-5:	ld1	{v4.2d}, [x6], #16		/* load next round key */</div><div class='add'>+5:	ld1	{v4.16b}, [x6], #16		/* load next round key */</div><div class='ctx'> 	subs	w7, w7, #3</div><div class='ctx'> 	aese	v0.16b, v3.16b</div><div class='ctx'> 	aesmc	v0.16b, v0.16b</div><div class='del'>-	ld1	{v5.2d}, [x6], #16		/* load next round key */</div><div class='add'>+	ld1	{v5.16b}, [x6], #16		/* load next round key */</div><div class='ctx'> 	bpl	3b</div><div class='ctx'> 	aese	v0.16b, v4.16b</div><div class='ctx'> 	subs	w2, w2, #16			/* last data? */</div><div class='hunk'>@@ -60,7 +61,7 @@ ENTRY(ce_aes_ccm_auth_data)</div><div class='ctx'> 	ld1	{v1.16b}, [x1], #16		/* load next input block */</div><div class='ctx'> 	eor	v0.16b, v0.16b, v1.16b		/* xor with mac */</div><div class='ctx'> 	bne	1b</div><div class='del'>-6:	st1	{v0.2d}, [x0]			/* store mac */</div><div class='add'>+6:	st1	{v0.16b}, [x0]			/* store mac */</div><div class='ctx'> 	beq	10f</div><div class='ctx'> 	adds	w2, w2, #16</div><div class='ctx'> 	beq	10f</div><div class='hunk'>@@ -79,7 +80,7 @@ ENTRY(ce_aes_ccm_auth_data)</div><div class='ctx'> 	adds	w7, w7, #1</div><div class='ctx'> 	bne	9b</div><div class='ctx'> 	eor	v0.16b, v0.16b, v1.16b</div><div class='del'>-	st1	{v0.2d}, [x0]</div><div class='add'>+	st1	{v0.16b}, [x0]</div><div class='ctx'> 10:	str	w8, [x3]</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(ce_aes_ccm_auth_data)</div><div class='hunk'>@@ -89,27 +90,27 @@ ENDPROC(ce_aes_ccm_auth_data)</div><div class='ctx'> 	 * 			 u32 rounds);</div><div class='ctx'> 	 */</div><div class='ctx'> ENTRY(ce_aes_ccm_final)</div><div class='del'>-	ld1	{v3.2d}, [x2], #16		/* load first round key */</div><div class='del'>-	ld1	{v0.2d}, [x0]			/* load mac */</div><div class='add'>+	ld1	{v3.16b}, [x2], #16		/* load first round key */</div><div class='add'>+	ld1	{v0.16b}, [x0]			/* load mac */</div><div class='ctx'> 	cmp	w3, #12				/* which key size? */</div><div class='ctx'> 	sub	w3, w3, #2			/* modified # of rounds */</div><div class='del'>-	ld1	{v1.2d}, [x1]			/* load 1st ctriv */</div><div class='add'>+	ld1	{v1.16b}, [x1]			/* load 1st ctriv */</div><div class='ctx'> 	bmi	0f</div><div class='ctx'> 	bne	3f</div><div class='ctx'> 	mov	v5.16b, v3.16b</div><div class='ctx'> 	b	2f</div><div class='ctx'> 0:	mov	v4.16b, v3.16b</div><div class='del'>-1:	ld1	{v5.2d}, [x2], #16		/* load next round key */</div><div class='add'>+1:	ld1	{v5.16b}, [x2], #16		/* load next round key */</div><div class='ctx'> 	aese	v0.16b, v4.16b</div><div class='ctx'> 	aesmc	v0.16b, v0.16b</div><div class='ctx'> 	aese	v1.16b, v4.16b</div><div class='ctx'> 	aesmc	v1.16b, v1.16b</div><div class='del'>-2:	ld1	{v3.2d}, [x2], #16		/* load next round key */</div><div class='add'>+2:	ld1	{v3.16b}, [x2], #16		/* load next round key */</div><div class='ctx'> 	aese	v0.16b, v5.16b</div><div class='ctx'> 	aesmc	v0.16b, v0.16b</div><div class='ctx'> 	aese	v1.16b, v5.16b</div><div class='ctx'> 	aesmc	v1.16b, v1.16b</div><div class='del'>-3:	ld1	{v4.2d}, [x2], #16		/* load next round key */</div><div class='add'>+3:	ld1	{v4.16b}, [x2], #16		/* load next round key */</div><div class='ctx'> 	subs	w3, w3, #3</div><div class='ctx'> 	aese	v0.16b, v3.16b</div><div class='ctx'> 	aesmc	v0.16b, v0.16b</div><div class='hunk'>@@ -120,47 +121,47 @@ ENTRY(ce_aes_ccm_final)</div><div class='ctx'> 	aese	v1.16b, v4.16b</div><div class='ctx'> 	/* final round key cancels out */</div><div class='ctx'> 	eor	v0.16b, v0.16b, v1.16b		/* en-/decrypt the mac */</div><div class='del'>-	st1	{v0.2d}, [x0]			/* store result */</div><div class='add'>+	st1	{v0.16b}, [x0]			/* store result */</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(ce_aes_ccm_final)</div><div class='ctx'> </div><div class='ctx'> 	.macro	aes_ccm_do_crypt,enc</div><div class='ctx'> 	ldr	x8, [x6, #8]			/* load lower ctr */</div><div class='del'>-	ld1	{v0.2d}, [x5]			/* load mac */</div><div class='del'>-	rev	x8, x8				/* keep swabbed ctr in reg */</div><div class='add'>+	ld1	{v0.16b}, [x5]			/* load mac */</div><div class='add'>+CPU_LE(	rev	x8, x8			)	/* keep swabbed ctr in reg */</div><div class='ctx'> 0:	/* outer loop */</div><div class='del'>-	ld1	{v1.1d}, [x6]			/* load upper ctr */</div><div class='add'>+	ld1	{v1.8b}, [x6]			/* load upper ctr */</div><div class='ctx'> 	prfm	pldl1strm, [x1]</div><div class='ctx'> 	add	x8, x8, #1</div><div class='ctx'> 	rev	x9, x8</div><div class='ctx'> 	cmp	w4, #12				/* which key size? */</div><div class='ctx'> 	sub	w7, w4, #2			/* get modified # of rounds */</div><div class='ctx'> 	ins	v1.d[1], x9			/* no carry in lower ctr */</div><div class='del'>-	ld1	{v3.2d}, [x3]			/* load first round key */</div><div class='add'>+	ld1	{v3.16b}, [x3]			/* load first round key */</div><div class='ctx'> 	add	x10, x3, #16</div><div class='ctx'> 	bmi	1f</div><div class='ctx'> 	bne	4f</div><div class='ctx'> 	mov	v5.16b, v3.16b</div><div class='ctx'> 	b	3f</div><div class='ctx'> 1:	mov	v4.16b, v3.16b</div><div class='del'>-	ld1	{v5.2d}, [x10], #16		/* load 2nd round key */</div><div class='add'>+	ld1	{v5.16b}, [x10], #16		/* load 2nd round key */</div><div class='ctx'> 2:	/* inner loop: 3 rounds, 2x interleaved */</div><div class='ctx'> 	aese	v0.16b, v4.16b</div><div class='ctx'> 	aesmc	v0.16b, v0.16b</div><div class='ctx'> 	aese	v1.16b, v4.16b</div><div class='ctx'> 	aesmc	v1.16b, v1.16b</div><div class='del'>-3:	ld1	{v3.2d}, [x10], #16		/* load next round key */</div><div class='add'>+3:	ld1	{v3.16b}, [x10], #16		/* load next round key */</div><div class='ctx'> 	aese	v0.16b, v5.16b</div><div class='ctx'> 	aesmc	v0.16b, v0.16b</div><div class='ctx'> 	aese	v1.16b, v5.16b</div><div class='ctx'> 	aesmc	v1.16b, v1.16b</div><div class='del'>-4:	ld1	{v4.2d}, [x10], #16		/* load next round key */</div><div class='add'>+4:	ld1	{v4.16b}, [x10], #16		/* load next round key */</div><div class='ctx'> 	subs	w7, w7, #3</div><div class='ctx'> 	aese	v0.16b, v3.16b</div><div class='ctx'> 	aesmc	v0.16b, v0.16b</div><div class='ctx'> 	aese	v1.16b, v3.16b</div><div class='ctx'> 	aesmc	v1.16b, v1.16b</div><div class='del'>-	ld1	{v5.2d}, [x10], #16		/* load next round key */</div><div class='add'>+	ld1	{v5.16b}, [x10], #16		/* load next round key */</div><div class='ctx'> 	bpl	2b</div><div class='ctx'> 	aese	v0.16b, v4.16b</div><div class='ctx'> 	aese	v1.16b, v4.16b</div><div class='hunk'>@@ -177,14 +178,14 @@ ENDPROC(ce_aes_ccm_final)</div><div class='ctx'> 	eor	v0.16b, v0.16b, v2.16b		/* xor mac with pt ^ rk[last] */</div><div class='ctx'> 	st1	{v1.16b}, [x0], #16		/* write output block */</div><div class='ctx'> 	bne	0b</div><div class='del'>-	rev	x8, x8</div><div class='del'>-	st1	{v0.2d}, [x5]			/* store mac */</div><div class='add'>+CPU_LE(	rev	x8, x8			)</div><div class='add'>+	st1	{v0.16b}, [x5]			/* store mac */</div><div class='ctx'> 	str	x8, [x6, #8]			/* store lsb end of ctr (BE) */</div><div class='ctx'> 5:	ret</div><div class='ctx'> </div><div class='ctx'> 6:	eor	v0.16b, v0.16b, v5.16b		/* final round mac */</div><div class='ctx'> 	eor	v1.16b, v1.16b, v5.16b		/* final round enc */</div><div class='del'>-	st1	{v0.2d}, [x5]			/* store mac */</div><div class='add'>+	st1	{v0.16b}, [x5]			/* store mac */</div><div class='ctx'> 	add	w2, w2, #16			/* process partial tail block */</div><div class='ctx'> 7:	ldrb	w9, [x1], #1			/* get 1 byte of input */</div><div class='ctx'> 	umov	w6, v1.b[0]			/* get top crypted ctr byte */</div><div class='head'>diff --git a/arch/arm64/crypto/aes-ce-ccm-glue.c b/arch/arm64/crypto/aes-ce-ccm-glue.c<br/>index f4bf2f2a014c..6a7dbc7c83a6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/aes-ce-ccm-glue.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/aes-ce-ccm-glue.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/aes-ce-ccm-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-ce-ccm-glue.c</a></div><div class='hunk'>@@ -11,9 +11,9 @@</div><div class='ctx'> #include &lt;asm/neon.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "aes-ce-setkey.h"</div><div class='hunk'>@@ -149,12 +149,7 @@ static int ccm_encrypt(struct aead_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='ctx'> 	struct crypto_aes_ctx *ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct blkcipher_desc desc = { .info = req-&gt;iv };</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='del'>-	struct scatterlist srcbuf[2];</div><div class='del'>-	struct scatterlist dstbuf[2];</div><div class='del'>-	struct scatterlist *src;</div><div class='del'>-	struct scatterlist *dst;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	u8 __aligned(8) mac[AES_BLOCK_SIZE];</div><div class='ctx'> 	u8 buf[AES_BLOCK_SIZE];</div><div class='ctx'> 	u32 len = req-&gt;cryptlen;</div><div class='hunk'>@@ -172,27 +167,19 @@ static int ccm_encrypt(struct aead_request *req)</div><div class='ctx'> 	/* preserve the original iv for the final round */</div><div class='ctx'> 	memcpy(buf, req-&gt;iv, AES_BLOCK_SIZE);</div><div class='ctx'> </div><div class='del'>-	src = scatterwalk_ffwd(srcbuf, req-&gt;src, req-&gt;assoclen);</div><div class='del'>-	dst = src;</div><div class='del'>-	if (req-&gt;src != req-&gt;dst)</div><div class='del'>-		dst = scatterwalk_ffwd(dstbuf, req-&gt;dst, req-&gt;assoclen);</div><div class='del'>-</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, len);</div><div class='del'>-	err = blkcipher_aead_walk_virt_block(&amp;desc, &amp;walk, aead,</div><div class='del'>-					     AES_BLOCK_SIZE);</div><div class='add'>+	err = skcipher_walk_aead_encrypt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	while (walk.nbytes) {</div><div class='ctx'> 		u32 tail = walk.nbytes % AES_BLOCK_SIZE;</div><div class='ctx'> </div><div class='del'>-		if (walk.nbytes == len)</div><div class='add'>+		if (walk.nbytes == walk.total)</div><div class='ctx'> 			tail = 0;</div><div class='ctx'> </div><div class='ctx'> 		ce_aes_ccm_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				   walk.nbytes - tail, ctx-&gt;key_enc,</div><div class='ctx'> 				   num_rounds(ctx), mac, walk.iv);</div><div class='ctx'> </div><div class='del'>-		len -= walk.nbytes - tail;</div><div class='del'>-		err = blkcipher_walk_done(&amp;desc, &amp;walk, tail);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, tail);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		ce_aes_ccm_final(mac, buf, ctx-&gt;key_enc, num_rounds(ctx));</div><div class='hunk'>@@ -203,7 +190,7 @@ static int ccm_encrypt(struct aead_request *req)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* copy authtag to end of dst */</div><div class='del'>-	scatterwalk_map_and_copy(mac, dst, req-&gt;cryptlen,</div><div class='add'>+	scatterwalk_map_and_copy(mac, req-&gt;dst, req-&gt;assoclen + req-&gt;cryptlen,</div><div class='ctx'> 				 crypto_aead_authsize(aead), 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -214,12 +201,7 @@ static int ccm_decrypt(struct aead_request *req)</div><div class='ctx'> 	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='ctx'> 	struct crypto_aes_ctx *ctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	unsigned int authsize = crypto_aead_authsize(aead);</div><div class='del'>-	struct blkcipher_desc desc = { .info = req-&gt;iv };</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='del'>-	struct scatterlist srcbuf[2];</div><div class='del'>-	struct scatterlist dstbuf[2];</div><div class='del'>-	struct scatterlist *src;</div><div class='del'>-	struct scatterlist *dst;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	u8 __aligned(8) mac[AES_BLOCK_SIZE];</div><div class='ctx'> 	u8 buf[AES_BLOCK_SIZE];</div><div class='ctx'> 	u32 len = req-&gt;cryptlen - authsize;</div><div class='hunk'>@@ -237,27 +219,19 @@ static int ccm_decrypt(struct aead_request *req)</div><div class='ctx'> 	/* preserve the original iv for the final round */</div><div class='ctx'> 	memcpy(buf, req-&gt;iv, AES_BLOCK_SIZE);</div><div class='ctx'> </div><div class='del'>-	src = scatterwalk_ffwd(srcbuf, req-&gt;src, req-&gt;assoclen);</div><div class='del'>-	dst = src;</div><div class='del'>-	if (req-&gt;src != req-&gt;dst)</div><div class='del'>-		dst = scatterwalk_ffwd(dstbuf, req-&gt;dst, req-&gt;assoclen);</div><div class='del'>-</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, len);</div><div class='del'>-	err = blkcipher_aead_walk_virt_block(&amp;desc, &amp;walk, aead,</div><div class='del'>-					     AES_BLOCK_SIZE);</div><div class='add'>+	err = skcipher_walk_aead_decrypt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	while (walk.nbytes) {</div><div class='ctx'> 		u32 tail = walk.nbytes % AES_BLOCK_SIZE;</div><div class='ctx'> </div><div class='del'>-		if (walk.nbytes == len)</div><div class='add'>+		if (walk.nbytes == walk.total)</div><div class='ctx'> 			tail = 0;</div><div class='ctx'> </div><div class='ctx'> 		ce_aes_ccm_decrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				   walk.nbytes - tail, ctx-&gt;key_enc,</div><div class='ctx'> 				   num_rounds(ctx), mac, walk.iv);</div><div class='ctx'> </div><div class='del'>-		len -= walk.nbytes - tail;</div><div class='del'>-		err = blkcipher_walk_done(&amp;desc, &amp;walk, tail);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, tail);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		ce_aes_ccm_final(mac, buf, ctx-&gt;key_enc, num_rounds(ctx));</div><div class='hunk'>@@ -268,7 +242,8 @@ static int ccm_decrypt(struct aead_request *req)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* compare calculated auth tag with the stored one */</div><div class='del'>-	scatterwalk_map_and_copy(buf, src, req-&gt;cryptlen - authsize,</div><div class='add'>+	scatterwalk_map_and_copy(buf, req-&gt;src,</div><div class='add'>+				 req-&gt;assoclen + req-&gt;cryptlen - authsize,</div><div class='ctx'> 				 authsize, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (crypto_memneq(mac, buf, authsize))</div><div class='hunk'>@@ -283,10 +258,10 @@ static struct aead_alg ccm_aes_alg = {</div><div class='ctx'> 		.cra_priority		= 300,</div><div class='ctx'> 		.cra_blocksize		= 1,</div><div class='ctx'> 		.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='del'>-		.cra_alignmask		= 7,</div><div class='ctx'> 		.cra_module		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.chunksize	= AES_BLOCK_SIZE,</div><div class='ctx'> 	.maxauthsize	= AES_BLOCK_SIZE,</div><div class='ctx'> 	.setkey		= ccm_setkey,</div><div class='ctx'> 	.setauthsize	= ccm_setauthsize,</div><div class='head'>diff --git a/arch/arm64/crypto/aes-ce-cipher.c b/arch/arm64/crypto/aes-ce-cipher.c<br/>index f7bd9bf0bbb3..50d9fe11d0c8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/aes-ce-cipher.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/aes-ce-cipher.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/aes-ce-cipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-ce-cipher.c</a></div><div class='hunk'>@@ -47,24 +47,24 @@ static void aes_cipher_encrypt(struct crypto_tfm *tfm, u8 dst[], u8 const src[])</div><div class='ctx'> 	kernel_neon_begin_partial(4);</div><div class='ctx'> </div><div class='ctx'> 	__asm__("	ld1	{v0.16b}, %[in]			;"</div><div class='del'>-		"	ld1	{v1.2d}, [%[key]], #16		;"</div><div class='add'>+		"	ld1	{v1.16b}, [%[key]], #16		;"</div><div class='ctx'> 		"	cmp	%w[rounds], #10			;"</div><div class='ctx'> 		"	bmi	0f				;"</div><div class='ctx'> 		"	bne	3f				;"</div><div class='ctx'> 		"	mov	v3.16b, v1.16b			;"</div><div class='ctx'> 		"	b	2f				;"</div><div class='ctx'> 		"0:	mov	v2.16b, v1.16b			;"</div><div class='del'>-		"	ld1	{v3.2d}, [%[key]], #16		;"</div><div class='add'>+		"	ld1	{v3.16b}, [%[key]], #16		;"</div><div class='ctx'> 		"1:	aese	v0.16b, v2.16b			;"</div><div class='ctx'> 		"	aesmc	v0.16b, v0.16b			;"</div><div class='del'>-		"2:	ld1	{v1.2d}, [%[key]], #16		;"</div><div class='add'>+		"2:	ld1	{v1.16b}, [%[key]], #16		;"</div><div class='ctx'> 		"	aese	v0.16b, v3.16b			;"</div><div class='ctx'> 		"	aesmc	v0.16b, v0.16b			;"</div><div class='del'>-		"3:	ld1	{v2.2d}, [%[key]], #16		;"</div><div class='add'>+		"3:	ld1	{v2.16b}, [%[key]], #16		;"</div><div class='ctx'> 		"	subs	%w[rounds], %w[rounds], #3	;"</div><div class='ctx'> 		"	aese	v0.16b, v1.16b			;"</div><div class='ctx'> 		"	aesmc	v0.16b, v0.16b			;"</div><div class='del'>-		"	ld1	{v3.2d}, [%[key]], #16		;"</div><div class='add'>+		"	ld1	{v3.16b}, [%[key]], #16		;"</div><div class='ctx'> 		"	bpl	1b				;"</div><div class='ctx'> 		"	aese	v0.16b, v2.16b			;"</div><div class='ctx'> 		"	eor	v0.16b, v0.16b, v3.16b		;"</div><div class='hunk'>@@ -92,24 +92,24 @@ static void aes_cipher_decrypt(struct crypto_tfm *tfm, u8 dst[], u8 const src[])</div><div class='ctx'> 	kernel_neon_begin_partial(4);</div><div class='ctx'> </div><div class='ctx'> 	__asm__("	ld1	{v0.16b}, %[in]			;"</div><div class='del'>-		"	ld1	{v1.2d}, [%[key]], #16		;"</div><div class='add'>+		"	ld1	{v1.16b}, [%[key]], #16		;"</div><div class='ctx'> 		"	cmp	%w[rounds], #10			;"</div><div class='ctx'> 		"	bmi	0f				;"</div><div class='ctx'> 		"	bne	3f				;"</div><div class='ctx'> 		"	mov	v3.16b, v1.16b			;"</div><div class='ctx'> 		"	b	2f				;"</div><div class='ctx'> 		"0:	mov	v2.16b, v1.16b			;"</div><div class='del'>-		"	ld1	{v3.2d}, [%[key]], #16		;"</div><div class='add'>+		"	ld1	{v3.16b}, [%[key]], #16		;"</div><div class='ctx'> 		"1:	aesd	v0.16b, v2.16b			;"</div><div class='ctx'> 		"	aesimc	v0.16b, v0.16b			;"</div><div class='del'>-		"2:	ld1	{v1.2d}, [%[key]], #16		;"</div><div class='add'>+		"2:	ld1	{v1.16b}, [%[key]], #16		;"</div><div class='ctx'> 		"	aesd	v0.16b, v3.16b			;"</div><div class='ctx'> 		"	aesimc	v0.16b, v0.16b			;"</div><div class='del'>-		"3:	ld1	{v2.2d}, [%[key]], #16		;"</div><div class='add'>+		"3:	ld1	{v2.16b}, [%[key]], #16		;"</div><div class='ctx'> 		"	subs	%w[rounds], %w[rounds], #3	;"</div><div class='ctx'> 		"	aesd	v0.16b, v1.16b			;"</div><div class='ctx'> 		"	aesimc	v0.16b, v0.16b			;"</div><div class='del'>-		"	ld1	{v3.2d}, [%[key]], #16		;"</div><div class='add'>+		"	ld1	{v3.16b}, [%[key]], #16		;"</div><div class='ctx'> 		"	bpl	1b				;"</div><div class='ctx'> 		"	aesd	v0.16b, v2.16b			;"</div><div class='ctx'> 		"	eor	v0.16b, v0.16b, v3.16b		;"</div><div class='hunk'>@@ -173,7 +173,12 @@ int ce_aes_expandkey(struct crypto_aes_ctx *ctx, const u8 *in_key,</div><div class='ctx'> 		u32 *rki = ctx-&gt;key_enc + (i * kwords);</div><div class='ctx'> 		u32 *rko = rki + kwords;</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_CPU_BIG_ENDIAN</div><div class='ctx'> 		rko[0] = ror32(aes_sub(rki[kwords - 1]), 8) ^ rcon[i] ^ rki[0];</div><div class='add'>+#else</div><div class='add'>+		rko[0] = rol32(aes_sub(rki[kwords - 1]), 8) ^ (rcon[i] &lt;&lt; 24) ^</div><div class='add'>+			 rki[0];</div><div class='add'>+#endif</div><div class='ctx'> 		rko[1] = rko[0] ^ rki[1];</div><div class='ctx'> 		rko[2] = rko[1] ^ rki[2];</div><div class='ctx'> 		rko[3] = rko[2] ^ rki[3];</div><div class='head'>diff --git a/arch/arm64/crypto/aes-ce.S b/arch/arm64/crypto/aes-ce.S<br/>index 78f3cfe92c08..b46093d567e5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/aes-ce.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/aes-ce.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/aes-ce.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-ce.S</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define AES_ENTRY(func)		ENTRY(ce_ ## func)</div><div class='ctx'> #define AES_ENDPROC(func)	ENDPROC(ce_ ## func)</div><div class='head'>diff --git a/arch/arm64/crypto/aes-cipher-core.S b/arch/arm64/crypto/aes-cipher-core.S<br/>new file mode 100644<br/>index 000000000000..f2f9cc519309<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/aes-cipher-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-cipher-core.S</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+/*</div><div class='add'>+ * Scalar AES core transform</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+	rk		.req	x0</div><div class='add'>+	out		.req	x1</div><div class='add'>+	in		.req	x2</div><div class='add'>+	rounds		.req	x3</div><div class='add'>+	tt		.req	x4</div><div class='add'>+	lt		.req	x2</div><div class='add'>+</div><div class='add'>+	.macro		__pair, enc, reg0, reg1, in0, in1e, in1d, shift</div><div class='add'>+	ubfx		\reg0, \in0, #\shift, #8</div><div class='add'>+	.if		\enc</div><div class='add'>+	ubfx		\reg1, \in1e, #\shift, #8</div><div class='add'>+	.else</div><div class='add'>+	ubfx		\reg1, \in1d, #\shift, #8</div><div class='add'>+	.endif</div><div class='add'>+	ldr		\reg0, [tt, \reg0, uxtw #2]</div><div class='add'>+	ldr		\reg1, [tt, \reg1, uxtw #2]</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		__hround, out0, out1, in0, in1, in2, in3, t0, t1, enc</div><div class='add'>+	ldp		\out0, \out1, [rk], #8</div><div class='add'>+</div><div class='add'>+	__pair		\enc, w13, w14, \in0, \in1, \in3, 0</div><div class='add'>+	__pair		\enc, w15, w16, \in1, \in2, \in0, 8</div><div class='add'>+	__pair		\enc, w17, w18, \in2, \in3, \in1, 16</div><div class='add'>+	__pair		\enc, \t0, \t1, \in3, \in0, \in2, 24</div><div class='add'>+</div><div class='add'>+	eor		\out0, \out0, w13</div><div class='add'>+	eor		\out1, \out1, w14</div><div class='add'>+	eor		\out0, \out0, w15, ror #24</div><div class='add'>+	eor		\out1, \out1, w16, ror #24</div><div class='add'>+	eor		\out0, \out0, w17, ror #16</div><div class='add'>+	eor		\out1, \out1, w18, ror #16</div><div class='add'>+	eor		\out0, \out0, \t0, ror #8</div><div class='add'>+	eor		\out1, \out1, \t1, ror #8</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		fround, out0, out1, out2, out3, in0, in1, in2, in3</div><div class='add'>+	__hround	\out0, \out1, \in0, \in1, \in2, \in3, \out2, \out3, 1</div><div class='add'>+	__hround	\out2, \out3, \in2, \in3, \in0, \in1, \in1, \in2, 1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		iround, out0, out1, out2, out3, in0, in1, in2, in3</div><div class='add'>+	__hround	\out0, \out1, \in0, \in3, \in2, \in1, \out2, \out3, 0</div><div class='add'>+	__hround	\out2, \out3, \in2, \in1, \in0, \in3, \in1, \in0, 0</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		do_crypt, round, ttab, ltab</div><div class='add'>+	ldp		w5, w6, [in]</div><div class='add'>+	ldp		w7, w8, [in, #8]</div><div class='add'>+	ldp		w9, w10, [rk], #16</div><div class='add'>+	ldp		w11, w12, [rk, #-8]</div><div class='add'>+</div><div class='add'>+CPU_BE(	rev		w5, w5		)</div><div class='add'>+CPU_BE(	rev		w6, w6		)</div><div class='add'>+CPU_BE(	rev		w7, w7		)</div><div class='add'>+CPU_BE(	rev		w8, w8		)</div><div class='add'>+</div><div class='add'>+	eor		w5, w5, w9</div><div class='add'>+	eor		w6, w6, w10</div><div class='add'>+	eor		w7, w7, w11</div><div class='add'>+	eor		w8, w8, w12</div><div class='add'>+</div><div class='add'>+	adr_l		tt, \ttab</div><div class='add'>+	adr_l		lt, \ltab</div><div class='add'>+</div><div class='add'>+	tbnz		rounds, #1, 1f</div><div class='add'>+</div><div class='add'>+0:	\round		w9, w10, w11, w12, w5, w6, w7, w8</div><div class='add'>+	\round		w5, w6, w7, w8, w9, w10, w11, w12</div><div class='add'>+</div><div class='add'>+1:	subs		rounds, rounds, #4</div><div class='add'>+	\round		w9, w10, w11, w12, w5, w6, w7, w8</div><div class='add'>+	csel		tt, tt, lt, hi</div><div class='add'>+	\round		w5, w6, w7, w8, w9, w10, w11, w12</div><div class='add'>+	b.hi		0b</div><div class='add'>+</div><div class='add'>+CPU_BE(	rev		w5, w5		)</div><div class='add'>+CPU_BE(	rev		w6, w6		)</div><div class='add'>+CPU_BE(	rev		w7, w7		)</div><div class='add'>+CPU_BE(	rev		w8, w8		)</div><div class='add'>+</div><div class='add'>+	stp		w5, w6, [out]</div><div class='add'>+	stp		w7, w8, [out, #8]</div><div class='add'>+	ret</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.align		5</div><div class='add'>+ENTRY(__aes_arm64_encrypt)</div><div class='add'>+	do_crypt	fround, crypto_ft_tab, crypto_fl_tab</div><div class='add'>+ENDPROC(__aes_arm64_encrypt)</div><div class='add'>+</div><div class='add'>+	.align		5</div><div class='add'>+ENTRY(__aes_arm64_decrypt)</div><div class='add'>+	do_crypt	iround, crypto_it_tab, crypto_il_tab</div><div class='add'>+ENDPROC(__aes_arm64_decrypt)</div><div class='head'>diff --git a/arch/arm64/crypto/aes-cipher-glue.c b/arch/arm64/crypto/aes-cipher-glue.c<br/>new file mode 100644<br/>index 000000000000..7288e7cbebff<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/aes-cipher-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-cipher-glue.c</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/*</div><div class='add'>+ * Scalar AES core transform</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+asmlinkage void __aes_arm64_encrypt(u32 *rk, u8 *out, const u8 *in, int rounds);</div><div class='add'>+EXPORT_SYMBOL(__aes_arm64_encrypt);</div><div class='add'>+</div><div class='add'>+asmlinkage void __aes_arm64_decrypt(u32 *rk, u8 *out, const u8 *in, int rounds);</div><div class='add'>+EXPORT_SYMBOL(__aes_arm64_decrypt);</div><div class='add'>+</div><div class='add'>+static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	int rounds = 6 + ctx-&gt;key_length / 4;</div><div class='add'>+</div><div class='add'>+	__aes_arm64_encrypt(ctx-&gt;key_enc, out, in, rounds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	int rounds = 6 + ctx-&gt;key_length / 4;</div><div class='add'>+</div><div class='add'>+	__aes_arm64_decrypt(ctx-&gt;key_dec, out, in, rounds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg aes_alg = {</div><div class='add'>+	.cra_name			= "aes",</div><div class='add'>+	.cra_driver_name		= "aes-arm64",</div><div class='add'>+	.cra_priority			= 200,</div><div class='add'>+	.cra_flags			= CRYPTO_ALG_TYPE_CIPHER,</div><div class='add'>+	.cra_blocksize			= AES_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize			= sizeof(struct crypto_aes_ctx),</div><div class='add'>+	.cra_module			= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.cra_cipher.cia_min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+	.cra_cipher.cia_max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+	.cra_cipher.cia_setkey		= crypto_aes_set_key,</div><div class='add'>+	.cra_cipher.cia_encrypt		= aes_encrypt,</div><div class='add'>+	.cra_cipher.cia_decrypt		= aes_decrypt</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init aes_init(void)</div><div class='add'>+{</div><div class='add'>+	return crypto_register_alg(&amp;aes_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit aes_fini(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_alg(&amp;aes_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(aes_init);</div><div class='add'>+module_exit(aes_fini);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Scalar AES cipher for arm64");</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS_CRYPTO("aes");</div><div class='head'>diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c<br/>index 6b2aa0fd6cd0..bcf596b0197e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/aes-glue.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/aes-glue.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/aes-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-glue.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * linux/arch/arm64/crypto/aes-glue.c - wrapper code for ARMv8 AES</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2013 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ * Copyright (C) 2013 - 2017 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -11,8 +11,9 @@</div><div class='ctx'> #include &lt;asm/neon.h&gt;</div><div class='ctx'> #include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='del'>-#include &lt;crypto/ablk_helper.h&gt;</div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='ctx'> #include &lt;crypto/xts.h&gt;</div><div class='hunk'>@@ -31,6 +32,7 @@</div><div class='ctx'> #define aes_ctr_encrypt		ce_aes_ctr_encrypt</div><div class='ctx'> #define aes_xts_encrypt		ce_aes_xts_encrypt</div><div class='ctx'> #define aes_xts_decrypt		ce_aes_xts_decrypt</div><div class='add'>+#define aes_mac_update		ce_aes_mac_update</div><div class='ctx'> MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 Crypto Extensions");</div><div class='ctx'> #else</div><div class='ctx'> #define MODE			"neon"</div><div class='hunk'>@@ -44,11 +46,15 @@ MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 Crypto Extensions");</div><div class='ctx'> #define aes_ctr_encrypt		neon_aes_ctr_encrypt</div><div class='ctx'> #define aes_xts_encrypt		neon_aes_xts_encrypt</div><div class='ctx'> #define aes_xts_decrypt		neon_aes_xts_decrypt</div><div class='add'>+#define aes_mac_update		neon_aes_mac_update</div><div class='ctx'> MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 NEON");</div><div class='ctx'> MODULE_ALIAS_CRYPTO("ecb(aes)");</div><div class='ctx'> MODULE_ALIAS_CRYPTO("cbc(aes)");</div><div class='ctx'> MODULE_ALIAS_CRYPTO("ctr(aes)");</div><div class='ctx'> MODULE_ALIAS_CRYPTO("xts(aes)");</div><div class='add'>+MODULE_ALIAS_CRYPTO("cmac(aes)");</div><div class='add'>+MODULE_ALIAS_CRYPTO("xcbc(aes)");</div><div class='add'>+MODULE_ALIAS_CRYPTO("cbcmac(aes)");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='hunk'>@@ -75,18 +81,38 @@ asmlinkage void aes_xts_decrypt(u8 out[], u8 const in[], u8 const rk1[],</div><div class='ctx'> 				int rounds, int blocks, u8 const rk2[], u8 iv[],</div><div class='ctx'> 				int first);</div><div class='ctx'> </div><div class='add'>+asmlinkage void aes_mac_update(u8 const in[], u32 const rk[], int rounds,</div><div class='add'>+			       int blocks, u8 dg[], int enc_before,</div><div class='add'>+			       int enc_after);</div><div class='add'>+</div><div class='ctx'> struct crypto_aes_xts_ctx {</div><div class='ctx'> 	struct crypto_aes_ctx key1;</div><div class='ctx'> 	struct crypto_aes_ctx __aligned(8) key2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int xts_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+struct mac_tfm_ctx {</div><div class='add'>+	struct crypto_aes_ctx key;</div><div class='add'>+	u8 __aligned(8) consts[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mac_desc_ctx {</div><div class='add'>+	unsigned int len;</div><div class='add'>+	u8 dg[AES_BLOCK_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int skcipher_aes_setkey(struct crypto_skcipher *tfm, const u8 *in_key,</div><div class='add'>+			       unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	return aes_setkey(crypto_skcipher_tfm(tfm), in_key, key_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_set_key(struct crypto_skcipher *tfm, const u8 *in_key,</div><div class='ctx'> 		       unsigned int key_len)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct crypto_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = xts_check_key(tfm, in_key, key_len);</div><div class='add'>+	ret = xts_verify_key(tfm, in_key, key_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -97,111 +123,101 @@ static int xts_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='add'>+	crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ecb_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int ecb_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int err, first, rounds = 6 + ctx-&gt;key_length / 4;</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {</div><div class='ctx'> 		aes_ecb_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				(u8 *)ctx-&gt;key_enc, rounds, blocks, first);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int ecb_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int err, first, rounds = 6 + ctx-&gt;key_length / 4;</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {</div><div class='ctx'> 		aes_ecb_decrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				(u8 *)ctx-&gt;key_dec, rounds, blocks, first);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cbc_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int cbc_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int err, first, rounds = 6 + ctx-&gt;key_length / 4;</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {</div><div class='ctx'> 		aes_cbc_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				(u8 *)ctx-&gt;key_enc, rounds, blocks, walk.iv,</div><div class='ctx'> 				first);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int cbc_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int err, first, rounds = 6 + ctx-&gt;key_length / 4;</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {</div><div class='ctx'> 		aes_cbc_decrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				(u8 *)ctx-&gt;key_dec, rounds, blocks, walk.iv,</div><div class='ctx'> 				first);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ctr_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int ctr_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int err, first, rounds = 6 + ctx-&gt;key_length / 4;</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	int blocks;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt_block(desc, &amp;walk, AES_BLOCK_SIZE);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	first = 1;</div><div class='ctx'> 	kernel_neon_begin();</div><div class='hunk'>@@ -209,253 +225,429 @@ static int ctr_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='ctx'> 		aes_ctr_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				(u8 *)ctx-&gt;key_enc, rounds, blocks, walk.iv,</div><div class='ctx'> 				first);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 		first = 0;</div><div class='del'>-		nbytes -= blocks * AES_BLOCK_SIZE;</div><div class='del'>-		if (nbytes &amp;&amp; nbytes == walk.nbytes % AES_BLOCK_SIZE)</div><div class='del'>-			break;</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk,</div><div class='del'>-					  walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='del'>-	if (walk.nbytes % AES_BLOCK_SIZE) {</div><div class='del'>-		u8 *tdst = walk.dst.virt.addr + blocks * AES_BLOCK_SIZE;</div><div class='del'>-		u8 *tsrc = walk.src.virt.addr + blocks * AES_BLOCK_SIZE;</div><div class='add'>+	if (walk.nbytes) {</div><div class='ctx'> 		u8 __aligned(8) tail[AES_BLOCK_SIZE];</div><div class='add'>+		unsigned int nbytes = walk.nbytes;</div><div class='add'>+		u8 *tdst = walk.dst.virt.addr;</div><div class='add'>+		u8 *tsrc = walk.src.virt.addr;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Minimum alignment is 8 bytes, so if nbytes is &lt;= 8, we need</div><div class='del'>-		 * to tell aes_ctr_encrypt() to only read half a block.</div><div class='add'>+		 * Tell aes_ctr_encrypt() to process a tail block.</div><div class='ctx'> 		 */</div><div class='del'>-		blocks = (nbytes &lt;= 8) ? -1 : 1;</div><div class='add'>+		blocks = -1;</div><div class='ctx'> </div><div class='del'>-		aes_ctr_encrypt(tail, tsrc, (u8 *)ctx-&gt;key_enc, rounds,</div><div class='add'>+		aes_ctr_encrypt(tail, NULL, (u8 *)ctx-&gt;key_enc, rounds,</div><div class='ctx'> 				blocks, walk.iv, first);</div><div class='del'>-		memcpy(tdst, tail, nbytes);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, 0);</div><div class='add'>+		if (tdst != tsrc)</div><div class='add'>+			memcpy(tdst, tsrc, nbytes);</div><div class='add'>+		crypto_xor(tdst, tail, nbytes);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int xts_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int err, first, rounds = 6 + ctx-&gt;key1.key_length / 4;</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {</div><div class='ctx'> 		aes_xts_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				(u8 *)ctx-&gt;key1.key_enc, rounds, blocks,</div><div class='ctx'> 				(u8 *)ctx-&gt;key2.key_enc, walk.iv, first);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int xts_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int err, first, rounds = 6 + ctx-&gt;key1.key_length / 4;</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_neon_begin();</div><div class='ctx'> 	for (first = 1; (blocks = (walk.nbytes / AES_BLOCK_SIZE)); first = 0) {</div><div class='ctx'> 		aes_xts_decrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				(u8 *)ctx-&gt;key1.key_dec, rounds, blocks,</div><div class='ctx'> 				(u8 *)ctx-&gt;key2.key_enc, walk.iv, first);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_neon_end();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct crypto_alg aes_algs[] = { {</div><div class='del'>-	.cra_name		= "__ecb-aes-" MODE,</div><div class='del'>-	.cra_driver_name	= "__driver-ecb-aes-" MODE,</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_blkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= 0,</div><div class='del'>-		.setkey		= aes_setkey,</div><div class='del'>-		.encrypt	= ecb_encrypt,</div><div class='del'>-		.decrypt	= ecb_decrypt,</div><div class='add'>+static struct skcipher_alg aes_algs[] = { {</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "__ecb(aes)",</div><div class='add'>+		.cra_driver_name	= "__ecb-aes-" MODE,</div><div class='add'>+		.cra_priority		= PRIO,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+		.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='add'>+	.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+	.setkey		= skcipher_aes_setkey,</div><div class='add'>+	.encrypt	= ecb_encrypt,</div><div class='add'>+	.decrypt	= ecb_decrypt,</div><div class='ctx'> }, {</div><div class='del'>-	.cra_name		= "__cbc-aes-" MODE,</div><div class='del'>-	.cra_driver_name	= "__driver-cbc-aes-" MODE,</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_blkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= aes_setkey,</div><div class='del'>-		.encrypt	= cbc_encrypt,</div><div class='del'>-		.decrypt	= cbc_decrypt,</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "__cbc(aes)",</div><div class='add'>+		.cra_driver_name	= "__cbc-aes-" MODE,</div><div class='add'>+		.cra_priority		= PRIO,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+		.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='add'>+	.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey		= skcipher_aes_setkey,</div><div class='add'>+	.encrypt	= cbc_encrypt,</div><div class='add'>+	.decrypt	= cbc_decrypt,</div><div class='ctx'> }, {</div><div class='del'>-	.cra_name		= "__ctr-aes-" MODE,</div><div class='del'>-	.cra_driver_name	= "__driver-ctr-aes-" MODE,</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= 1,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_blkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= aes_setkey,</div><div class='del'>-		.encrypt	= ctr_encrypt,</div><div class='del'>-		.decrypt	= ctr_encrypt,</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "__ctr(aes)",</div><div class='add'>+		.cra_driver_name	= "__ctr-aes-" MODE,</div><div class='add'>+		.cra_priority		= PRIO,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+		.cra_blocksize		= 1,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='add'>+	.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.chunksize	= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey		= skcipher_aes_setkey,</div><div class='add'>+	.encrypt	= ctr_encrypt,</div><div class='add'>+	.decrypt	= ctr_encrypt,</div><div class='ctx'> }, {</div><div class='del'>-	.cra_name		= "__xts-aes-" MODE,</div><div class='del'>-	.cra_driver_name	= "__driver-xts-aes-" MODE,</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_xts_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_blkcipher = {</div><div class='del'>-		.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= xts_set_key,</div><div class='del'>-		.encrypt	= xts_encrypt,</div><div class='del'>-		.decrypt	= xts_decrypt,</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "ctr(aes)",</div><div class='add'>+		.cra_driver_name	= "ctr-aes-" MODE,</div><div class='add'>+		.cra_priority		= PRIO - 1,</div><div class='add'>+		.cra_blocksize		= 1,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct crypto_aes_ctx),</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='add'>+	.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.chunksize	= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey		= skcipher_aes_setkey,</div><div class='add'>+	.encrypt	= ctr_encrypt,</div><div class='add'>+	.decrypt	= ctr_encrypt,</div><div class='ctx'> }, {</div><div class='del'>-	.cra_name		= "ecb(aes)",</div><div class='del'>-	.cra_driver_name	= "ecb-aes-" MODE,</div><div class='del'>-	.cra_priority		= PRIO,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER|CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_ablkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= 0,</div><div class='del'>-		.setkey		= ablk_set_key,</div><div class='del'>-		.encrypt	= ablk_encrypt,</div><div class='del'>-		.decrypt	= ablk_decrypt,</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "__xts(aes)",</div><div class='add'>+		.cra_driver_name	= "__xts-aes-" MODE,</div><div class='add'>+		.cra_priority		= PRIO,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+		.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct crypto_aes_xts_ctx),</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey		= xts_set_key,</div><div class='add'>+	.encrypt	= xts_encrypt,</div><div class='add'>+	.decrypt	= xts_decrypt,</div><div class='add'>+} };</div><div class='add'>+</div><div class='add'>+static int cbcmac_setkey(struct crypto_shash *tfm, const u8 *in_key,</div><div class='add'>+			 unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct mac_tfm_ctx *ctx = crypto_shash_ctx(tfm);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = aes_expandkey(&amp;ctx-&gt;key, in_key, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		crypto_shash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cmac_gf128_mul_by_x(be128 *y, const be128 *x)</div><div class='add'>+{</div><div class='add'>+	u64 a = be64_to_cpu(x-&gt;a);</div><div class='add'>+	u64 b = be64_to_cpu(x-&gt;b);</div><div class='add'>+</div><div class='add'>+	y-&gt;a = cpu_to_be64((a &lt;&lt; 1) | (b &gt;&gt; 63));</div><div class='add'>+	y-&gt;b = cpu_to_be64((b &lt;&lt; 1) ^ ((a &gt;&gt; 63) ? 0x87 : 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmac_setkey(struct crypto_shash *tfm, const u8 *in_key,</div><div class='add'>+		       unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct mac_tfm_ctx *ctx = crypto_shash_ctx(tfm);</div><div class='add'>+	be128 *consts = (be128 *)ctx-&gt;consts;</div><div class='add'>+	u8 *rk = (u8 *)ctx-&gt;key.key_enc;</div><div class='add'>+	int rounds = 6 + key_len / 4;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = cbcmac_setkey(tfm, in_key, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* encrypt the zero vector */</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	aes_ecb_encrypt(ctx-&gt;consts, (u8[AES_BLOCK_SIZE]){}, rk, rounds, 1, 1);</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	cmac_gf128_mul_by_x(consts, consts);</div><div class='add'>+	cmac_gf128_mul_by_x(consts + 1, consts);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xcbc_setkey(struct crypto_shash *tfm, const u8 *in_key,</div><div class='add'>+		       unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	static u8 const ks[3][AES_BLOCK_SIZE] = {</div><div class='add'>+		{ [0 ... AES_BLOCK_SIZE - 1] = 0x1 },</div><div class='add'>+		{ [0 ... AES_BLOCK_SIZE - 1] = 0x2 },</div><div class='add'>+		{ [0 ... AES_BLOCK_SIZE - 1] = 0x3 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	struct mac_tfm_ctx *ctx = crypto_shash_ctx(tfm);</div><div class='add'>+	u8 *rk = (u8 *)ctx-&gt;key.key_enc;</div><div class='add'>+	int rounds = 6 + key_len / 4;</div><div class='add'>+	u8 key[AES_BLOCK_SIZE];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = cbcmac_setkey(tfm, in_key, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	aes_ecb_encrypt(key, ks[0], rk, rounds, 1, 1);</div><div class='add'>+	aes_ecb_encrypt(ctx-&gt;consts, ks[1], rk, rounds, 2, 0);</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return cbcmac_setkey(tfm, key, sizeof(key));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mac_init(struct shash_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct mac_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	memset(ctx-&gt;dg, 0, AES_BLOCK_SIZE);</div><div class='add'>+	ctx-&gt;len = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mac_update(struct shash_desc *desc, const u8 *p, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct mac_tfm_ctx *tctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='add'>+	struct mac_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='add'>+	int rounds = 6 + tctx-&gt;key.key_length / 4;</div><div class='add'>+</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+		unsigned int l;</div><div class='add'>+</div><div class='add'>+		if ((ctx-&gt;len % AES_BLOCK_SIZE) == 0 &amp;&amp;</div><div class='add'>+		    (ctx-&gt;len + len) &gt; AES_BLOCK_SIZE) {</div><div class='add'>+</div><div class='add'>+			int blocks = len / AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+			len %= AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+			kernel_neon_begin();</div><div class='add'>+			aes_mac_update(p, tctx-&gt;key.key_enc, rounds, blocks,</div><div class='add'>+				       ctx-&gt;dg, (ctx-&gt;len != 0), (len != 0));</div><div class='add'>+			kernel_neon_end();</div><div class='add'>+</div><div class='add'>+			p += blocks * AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+			if (!len) {</div><div class='add'>+				ctx-&gt;len = AES_BLOCK_SIZE;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			ctx-&gt;len = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		l = min(len, AES_BLOCK_SIZE - ctx-&gt;len);</div><div class='add'>+</div><div class='add'>+		if (l &lt;= AES_BLOCK_SIZE) {</div><div class='add'>+			crypto_xor(ctx-&gt;dg + ctx-&gt;len, p, l);</div><div class='add'>+			ctx-&gt;len += l;</div><div class='add'>+			len -= l;</div><div class='add'>+			p += l;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "cbc(aes)",</div><div class='del'>-	.cra_driver_name	= "cbc-aes-" MODE,</div><div class='del'>-	.cra_priority		= PRIO,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER|CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_ablkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= ablk_set_key,</div><div class='del'>-		.encrypt	= ablk_encrypt,</div><div class='del'>-		.decrypt	= ablk_decrypt,</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbcmac_final(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	struct mac_tfm_ctx *tctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='add'>+	struct mac_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='add'>+	int rounds = 6 + tctx-&gt;key.key_length / 4;</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	aes_mac_update(NULL, tctx-&gt;key.key_enc, rounds, 0, ctx-&gt;dg, 1, 0);</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	memcpy(out, ctx-&gt;dg, AES_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmac_final(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	struct mac_tfm_ctx *tctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='add'>+	struct mac_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='add'>+	int rounds = 6 + tctx-&gt;key.key_length / 4;</div><div class='add'>+	u8 *consts = tctx-&gt;consts;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;len != AES_BLOCK_SIZE) {</div><div class='add'>+		ctx-&gt;dg[ctx-&gt;len] ^= 0x80;</div><div class='add'>+		consts += AES_BLOCK_SIZE;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	aes_mac_update(consts, tctx-&gt;key.key_enc, rounds, 1, ctx-&gt;dg, 0, 1);</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	memcpy(out, ctx-&gt;dg, AES_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct shash_alg mac_algs[] = { {</div><div class='add'>+	.base.cra_name		= "cmac(aes)",</div><div class='add'>+	.base.cra_driver_name	= "cmac-aes-" MODE,</div><div class='add'>+	.base.cra_priority	= PRIO,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_TYPE_SHASH,</div><div class='add'>+	.base.cra_blocksize	= AES_BLOCK_SIZE,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct mac_tfm_ctx) +</div><div class='add'>+				  2 * AES_BLOCK_SIZE,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.digestsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.init			= mac_init,</div><div class='add'>+	.update			= mac_update,</div><div class='add'>+	.final			= cmac_final,</div><div class='add'>+	.setkey			= cmac_setkey,</div><div class='add'>+	.descsize		= sizeof(struct mac_desc_ctx),</div><div class='ctx'> }, {</div><div class='del'>-	.cra_name		= "ctr(aes)",</div><div class='del'>-	.cra_driver_name	= "ctr-aes-" MODE,</div><div class='del'>-	.cra_priority		= PRIO,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER|CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= 1,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_ablkcipher = {</div><div class='del'>-		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= ablk_set_key,</div><div class='del'>-		.encrypt	= ablk_encrypt,</div><div class='del'>-		.decrypt	= ablk_decrypt,</div><div class='del'>-	}</div><div class='add'>+	.base.cra_name		= "xcbc(aes)",</div><div class='add'>+	.base.cra_driver_name	= "xcbc-aes-" MODE,</div><div class='add'>+	.base.cra_priority	= PRIO,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_TYPE_SHASH,</div><div class='add'>+	.base.cra_blocksize	= AES_BLOCK_SIZE,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct mac_tfm_ctx) +</div><div class='add'>+				  2 * AES_BLOCK_SIZE,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.digestsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.init			= mac_init,</div><div class='add'>+	.update			= mac_update,</div><div class='add'>+	.final			= cmac_final,</div><div class='add'>+	.setkey			= xcbc_setkey,</div><div class='add'>+	.descsize		= sizeof(struct mac_desc_ctx),</div><div class='ctx'> }, {</div><div class='del'>-	.cra_name		= "xts(aes)",</div><div class='del'>-	.cra_driver_name	= "xts-aes-" MODE,</div><div class='del'>-	.cra_priority		= PRIO,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER|CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 7,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_ablkcipher = {</div><div class='del'>-		.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='del'>-		.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='del'>-		.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-		.setkey		= ablk_set_key,</div><div class='del'>-		.encrypt	= ablk_encrypt,</div><div class='del'>-		.decrypt	= ablk_decrypt,</div><div class='del'>-	}</div><div class='add'>+	.base.cra_name		= "cbcmac(aes)",</div><div class='add'>+	.base.cra_driver_name	= "cbcmac-aes-" MODE,</div><div class='add'>+	.base.cra_priority	= PRIO,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_TYPE_SHASH,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct mac_tfm_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.digestsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.init			= mac_init,</div><div class='add'>+	.update			= mac_update,</div><div class='add'>+	.final			= cbcmac_final,</div><div class='add'>+	.setkey			= cbcmac_setkey,</div><div class='add'>+	.descsize		= sizeof(struct mac_desc_ctx),</div><div class='ctx'> } };</div><div class='ctx'> </div><div class='del'>-static int __init aes_init(void)</div><div class='add'>+static struct simd_skcipher_alg *aes_simd_algs[ARRAY_SIZE(aes_algs)];</div><div class='add'>+</div><div class='add'>+static void aes_exit(void)</div><div class='ctx'> {</div><div class='del'>-	return crypto_register_algs(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aes_simd_algs); i++)</div><div class='add'>+		if (aes_simd_algs[i])</div><div class='add'>+			simd_skcipher_free(aes_simd_algs[i]);</div><div class='add'>+</div><div class='add'>+	crypto_unregister_shashes(mac_algs, ARRAY_SIZE(mac_algs));</div><div class='add'>+	crypto_unregister_skciphers(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit aes_exit(void)</div><div class='add'>+static int __init aes_init(void)</div><div class='ctx'> {</div><div class='del'>-	crypto_unregister_algs(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='add'>+	struct simd_skcipher_alg *simd;</div><div class='add'>+	const char *basename;</div><div class='add'>+	const char *algname;</div><div class='add'>+	const char *drvname;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_skciphers(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_shashes(mac_algs, ARRAY_SIZE(mac_algs));</div><div class='add'>+	if (err)</div><div class='add'>+		goto unregister_ciphers;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aes_algs); i++) {</div><div class='add'>+		if (!(aes_algs[i].base.cra_flags &amp; CRYPTO_ALG_INTERNAL))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		algname = aes_algs[i].base.cra_name + 2;</div><div class='add'>+		drvname = aes_algs[i].base.cra_driver_name + 2;</div><div class='add'>+		basename = aes_algs[i].base.cra_driver_name;</div><div class='add'>+		simd = simd_skcipher_create_compat(algname, drvname, basename);</div><div class='add'>+		err = PTR_ERR(simd);</div><div class='add'>+		if (IS_ERR(simd))</div><div class='add'>+			goto unregister_simds;</div><div class='add'>+</div><div class='add'>+		aes_simd_algs[i] = simd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unregister_simds:</div><div class='add'>+	aes_exit();</div><div class='add'>+unregister_ciphers:</div><div class='add'>+	crypto_unregister_skciphers(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_V8_CRYPTO_EXTENSIONS</div><div class='ctx'> module_cpu_feature_match(AES, aes_init);</div><div class='ctx'> #else</div><div class='ctx'> module_init(aes_init);</div><div class='add'>+EXPORT_SYMBOL(neon_aes_ecb_encrypt);</div><div class='add'>+EXPORT_SYMBOL(neon_aes_cbc_encrypt);</div><div class='ctx'> #endif</div><div class='ctx'> module_exit(aes_exit);</div><div class='head'>diff --git a/arch/arm64/crypto/aes-modes.S b/arch/arm64/crypto/aes-modes.S<br/>index f6e372c528eb..2674d43d1384 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/aes-modes.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/aes-modes.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/aes-modes.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-modes.S</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * linux/arch/arm64/crypto/aes-modes.S - chaining mode wrappers for AES</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2013 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ * Copyright (C) 2013 - 2017 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -193,15 +193,16 @@ AES_ENTRY(aes_cbc_encrypt)</div><div class='ctx'> 	cbz		w6, .Lcbcencloop</div><div class='ctx'> </div><div class='ctx'> 	ld1		{v0.16b}, [x5]			/* get iv */</div><div class='del'>-	enc_prepare	w3, x2, x5</div><div class='add'>+	enc_prepare	w3, x2, x6</div><div class='ctx'> </div><div class='ctx'> .Lcbcencloop:</div><div class='ctx'> 	ld1		{v1.16b}, [x1], #16		/* get next pt block */</div><div class='ctx'> 	eor		v0.16b, v0.16b, v1.16b		/* ..and xor with iv */</div><div class='del'>-	encrypt_block	v0, w3, x2, x5, w6</div><div class='add'>+	encrypt_block	v0, w3, x2, x6, w7</div><div class='ctx'> 	st1		{v0.16b}, [x0], #16</div><div class='ctx'> 	subs		w4, w4, #1</div><div class='ctx'> 	bne		.Lcbcencloop</div><div class='add'>+	st1		{v0.16b}, [x5]			/* return iv */</div><div class='ctx'> 	ret</div><div class='ctx'> AES_ENDPROC(aes_cbc_encrypt)</div><div class='ctx'> </div><div class='hunk'>@@ -211,7 +212,7 @@ AES_ENTRY(aes_cbc_decrypt)</div><div class='ctx'> 	cbz		w6, .LcbcdecloopNx</div><div class='ctx'> </div><div class='ctx'> 	ld1		{v7.16b}, [x5]			/* get iv */</div><div class='del'>-	dec_prepare	w3, x2, x5</div><div class='add'>+	dec_prepare	w3, x2, x6</div><div class='ctx'> </div><div class='ctx'> .LcbcdecloopNx:</div><div class='ctx'> #if INTERLEAVE &gt;= 2</div><div class='hunk'>@@ -248,7 +249,7 @@ AES_ENTRY(aes_cbc_decrypt)</div><div class='ctx'> .Lcbcdecloop:</div><div class='ctx'> 	ld1		{v1.16b}, [x1], #16		/* get next ct block */</div><div class='ctx'> 	mov		v0.16b, v1.16b			/* ...and copy to v0 */</div><div class='del'>-	decrypt_block	v0, w3, x2, x5, w6</div><div class='add'>+	decrypt_block	v0, w3, x2, x6, w7</div><div class='ctx'> 	eor		v0.16b, v0.16b, v7.16b		/* xor with iv =&gt; pt */</div><div class='ctx'> 	mov		v7.16b, v1.16b			/* ct is next iv */</div><div class='ctx'> 	st1		{v0.16b}, [x0], #16</div><div class='hunk'>@@ -256,6 +257,7 @@ AES_ENTRY(aes_cbc_decrypt)</div><div class='ctx'> 	bne		.Lcbcdecloop</div><div class='ctx'> .Lcbcdecout:</div><div class='ctx'> 	FRAME_POP</div><div class='add'>+	st1		{v7.16b}, [x5]			/* return iv */</div><div class='ctx'> 	ret</div><div class='ctx'> AES_ENDPROC(aes_cbc_decrypt)</div><div class='ctx'> </div><div class='hunk'>@@ -267,24 +269,15 @@ AES_ENDPROC(aes_cbc_decrypt)</div><div class='ctx'> </div><div class='ctx'> AES_ENTRY(aes_ctr_encrypt)</div><div class='ctx'> 	FRAME_PUSH</div><div class='del'>-	cbnz		w6, .Lctrfirst		/* 1st time around? */</div><div class='del'>-	umov		x5, v4.d[1]		/* keep swabbed ctr in reg */</div><div class='del'>-	rev		x5, x5</div><div class='del'>-#if INTERLEAVE &gt;= 2</div><div class='del'>-	cmn		w5, w4			/* 32 bit overflow? */</div><div class='del'>-	bcs		.Lctrinc</div><div class='del'>-	add		x5, x5, #1		/* increment BE ctr */</div><div class='del'>-	b		.LctrincNx</div><div class='del'>-#else</div><div class='del'>-	b		.Lctrinc</div><div class='del'>-#endif</div><div class='del'>-.Lctrfirst:</div><div class='add'>+	cbz		w6, .Lctrnotfirst	/* 1st time around? */</div><div class='ctx'> 	enc_prepare	w3, x2, x6</div><div class='ctx'> 	ld1		{v4.16b}, [x5]</div><div class='del'>-	umov		x5, v4.d[1]		/* keep swabbed ctr in reg */</div><div class='del'>-	rev		x5, x5</div><div class='add'>+</div><div class='add'>+.Lctrnotfirst:</div><div class='add'>+	umov		x8, v4.d[1]		/* keep swabbed ctr in reg */</div><div class='add'>+	rev		x8, x8</div><div class='ctx'> #if INTERLEAVE &gt;= 2</div><div class='del'>-	cmn		w5, w4			/* 32 bit overflow? */</div><div class='add'>+	cmn		w8, w4			/* 32 bit overflow? */</div><div class='ctx'> 	bcs		.Lctrloop</div><div class='ctx'> .LctrloopNx:</div><div class='ctx'> 	subs		w4, w4, #INTERLEAVE</div><div class='hunk'>@@ -292,11 +285,11 @@ AES_ENTRY(aes_ctr_encrypt)</div><div class='ctx'> #if INTERLEAVE == 2</div><div class='ctx'> 	mov		v0.8b, v4.8b</div><div class='ctx'> 	mov		v1.8b, v4.8b</div><div class='del'>-	rev		x7, x5</div><div class='del'>-	add		x5, x5, #1</div><div class='add'>+	rev		x7, x8</div><div class='add'>+	add		x8, x8, #1</div><div class='ctx'> 	ins		v0.d[1], x7</div><div class='del'>-	rev		x7, x5</div><div class='del'>-	add		x5, x5, #1</div><div class='add'>+	rev		x7, x8</div><div class='add'>+	add		x8, x8, #1</div><div class='ctx'> 	ins		v1.d[1], x7</div><div class='ctx'> 	ld1		{v2.16b-v3.16b}, [x1], #32	/* get 2 input blocks */</div><div class='ctx'> 	do_encrypt_block2x</div><div class='hunk'>@@ -305,7 +298,7 @@ AES_ENTRY(aes_ctr_encrypt)</div><div class='ctx'> 	st1		{v0.16b-v1.16b}, [x0], #32</div><div class='ctx'> #else</div><div class='ctx'> 	ldr		q8, =0x30000000200000001	/* addends 1,2,3[,0] */</div><div class='del'>-	dup		v7.4s, w5</div><div class='add'>+	dup		v7.4s, w8</div><div class='ctx'> 	mov		v0.16b, v4.16b</div><div class='ctx'> 	add		v7.4s, v7.4s, v8.4s</div><div class='ctx'> 	mov		v1.16b, v4.16b</div><div class='hunk'>@@ -323,18 +316,12 @@ AES_ENTRY(aes_ctr_encrypt)</div><div class='ctx'> 	eor		v2.16b, v7.16b, v2.16b</div><div class='ctx'> 	eor		v3.16b, v5.16b, v3.16b</div><div class='ctx'> 	st1		{v0.16b-v3.16b}, [x0], #64</div><div class='del'>-	add		x5, x5, #INTERLEAVE</div><div class='add'>+	add		x8, x8, #INTERLEAVE</div><div class='ctx'> #endif</div><div class='del'>-	cbz		w4, .LctroutNx</div><div class='del'>-.LctrincNx:</div><div class='del'>-	rev		x7, x5</div><div class='add'>+	rev		x7, x8</div><div class='ctx'> 	ins		v4.d[1], x7</div><div class='add'>+	cbz		w4, .Lctrout</div><div class='ctx'> 	b		.LctrloopNx</div><div class='del'>-.LctroutNx:</div><div class='del'>-	sub		x5, x5, #1</div><div class='del'>-	rev		x7, x5</div><div class='del'>-	ins		v4.d[1], x7</div><div class='del'>-	b		.Lctrout</div><div class='ctx'> .Lctr1x:</div><div class='ctx'> 	adds		w4, w4, #INTERLEAVE</div><div class='ctx'> 	beq		.Lctrout</div><div class='hunk'>@@ -342,30 +329,37 @@ AES_ENTRY(aes_ctr_encrypt)</div><div class='ctx'> .Lctrloop:</div><div class='ctx'> 	mov		v0.16b, v4.16b</div><div class='ctx'> 	encrypt_block	v0, w3, x2, x6, w7</div><div class='add'>+</div><div class='add'>+	adds		x8, x8, #1		/* increment BE ctr */</div><div class='add'>+	rev		x7, x8</div><div class='add'>+	ins		v4.d[1], x7</div><div class='add'>+	bcs		.Lctrcarry		/* overflow? */</div><div class='add'>+</div><div class='add'>+.Lctrcarrydone:</div><div class='ctx'> 	subs		w4, w4, #1</div><div class='del'>-	bmi		.Lctrhalfblock		/* blocks &lt; 0 means 1/2 block */</div><div class='add'>+	bmi		.Lctrtailblock		/* blocks &lt;0 means tail block */</div><div class='ctx'> 	ld1		{v3.16b}, [x1], #16</div><div class='ctx'> 	eor		v3.16b, v0.16b, v3.16b</div><div class='ctx'> 	st1		{v3.16b}, [x0], #16</div><div class='del'>-	beq		.Lctrout</div><div class='del'>-.Lctrinc:</div><div class='del'>-	adds		x5, x5, #1		/* increment BE ctr */</div><div class='del'>-	rev		x7, x5</div><div class='del'>-	ins		v4.d[1], x7</div><div class='del'>-	bcc		.Lctrloop		/* no overflow? */</div><div class='add'>+	bne		.Lctrloop</div><div class='add'>+</div><div class='add'>+.Lctrout:</div><div class='add'>+	st1		{v4.16b}, [x5]		/* return next CTR value */</div><div class='add'>+	FRAME_POP</div><div class='add'>+	ret</div><div class='add'>+</div><div class='add'>+.Lctrtailblock:</div><div class='add'>+	st1		{v0.16b}, [x0]</div><div class='add'>+	FRAME_POP</div><div class='add'>+	ret</div><div class='add'>+</div><div class='add'>+.Lctrcarry:</div><div class='ctx'> 	umov		x7, v4.d[0]		/* load upper word of ctr  */</div><div class='ctx'> 	rev		x7, x7			/* ... to handle the carry */</div><div class='ctx'> 	add		x7, x7, #1</div><div class='ctx'> 	rev		x7, x7</div><div class='ctx'> 	ins		v4.d[0], x7</div><div class='del'>-	b		.Lctrloop</div><div class='del'>-.Lctrhalfblock:</div><div class='del'>-	ld1		{v3.8b}, [x1]</div><div class='del'>-	eor		v3.8b, v0.8b, v3.8b</div><div class='del'>-	st1		{v3.8b}, [x0]</div><div class='del'>-.Lctrout:</div><div class='del'>-	FRAME_POP</div><div class='del'>-	ret</div><div class='add'>+	b		.Lctrcarrydone</div><div class='ctx'> AES_ENDPROC(aes_ctr_encrypt)</div><div class='ctx'> 	.ltorg</div><div class='ctx'> </div><div class='hunk'>@@ -386,7 +380,8 @@ AES_ENDPROC(aes_ctr_encrypt)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> .Lxts_mul_x:</div><div class='del'>-	.word		1, 0, 0x87, 0</div><div class='add'>+CPU_LE(	.quad		1, 0x87		)</div><div class='add'>+CPU_BE(	.quad		0x87, 1		)</div><div class='ctx'> </div><div class='ctx'> AES_ENTRY(aes_xts_encrypt)</div><div class='ctx'> 	FRAME_PUSH</div><div class='hunk'>@@ -530,3 +525,30 @@ AES_ENTRY(aes_xts_decrypt)</div><div class='ctx'> 	FRAME_POP</div><div class='ctx'> 	ret</div><div class='ctx'> AES_ENDPROC(aes_xts_decrypt)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * aes_mac_update(u8 const in[], u32 const rk[], int rounds,</div><div class='add'>+	 *		  int blocks, u8 dg[], int enc_before, int enc_after)</div><div class='add'>+	 */</div><div class='add'>+AES_ENTRY(aes_mac_update)</div><div class='add'>+	ld1		{v0.16b}, [x4]			/* get dg */</div><div class='add'>+	enc_prepare	w2, x1, x7</div><div class='add'>+	cbnz		w5, .Lmacenc</div><div class='add'>+</div><div class='add'>+.Lmacloop:</div><div class='add'>+	cbz		w3, .Lmacout</div><div class='add'>+	ld1		{v1.16b}, [x0], #16		/* get next pt block */</div><div class='add'>+	eor		v0.16b, v0.16b, v1.16b		/* ..and xor with dg */</div><div class='add'>+</div><div class='add'>+	subs		w3, w3, #1</div><div class='add'>+	csinv		x5, x6, xzr, eq</div><div class='add'>+	cbz		w5, .Lmacout</div><div class='add'>+</div><div class='add'>+.Lmacenc:</div><div class='add'>+	encrypt_block	v0, w2, x1, x7, w8</div><div class='add'>+	b		.Lmacloop</div><div class='add'>+</div><div class='add'>+.Lmacout:</div><div class='add'>+	st1		{v0.16b}, [x4]			/* return dg */</div><div class='add'>+	ret</div><div class='add'>+AES_ENDPROC(aes_mac_update)</div><div class='head'>diff --git a/arch/arm64/crypto/aes-neon.S b/arch/arm64/crypto/aes-neon.S<br/>index b93170e1cc93..f1e3aa2732f9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/aes-neon.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/aes-neon.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/aes-neon.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-neon.S</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * linux/arch/arm64/crypto/aes-neon.S - AES cipher for ARMv8 NEON</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2013 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ * Copyright (C) 2013 - 2017 Linaro Ltd. &lt;ard.biesheuvel@linaro.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define AES_ENTRY(func)		ENTRY(neon_ ## func)</div><div class='ctx'> #define AES_ENDPROC(func)	ENDPROC(neon_ ## func)</div><div class='hunk'>@@ -16,17 +17,25 @@</div><div class='ctx'> 	/* multiply by polynomial 'x' in GF(2^8) */</div><div class='ctx'> 	.macro		mul_by_x, out, in, temp, const</div><div class='ctx'> 	sshr		\temp, \in, #7</div><div class='del'>-	add		\out, \in, \in</div><div class='add'>+	shl		\out, \in, #1</div><div class='ctx'> 	and		\temp, \temp, \const</div><div class='ctx'> 	eor		\out, \out, \temp</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='add'>+	/* multiply by polynomial 'x^2' in GF(2^8) */</div><div class='add'>+	.macro		mul_by_x2, out, in, temp, const</div><div class='add'>+	ushr		\temp, \in, #6</div><div class='add'>+	shl		\out, \in, #2</div><div class='add'>+	pmul		\temp, \temp, \const</div><div class='add'>+	eor		\out, \out, \temp</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='ctx'> 	/* preload the entire Sbox */</div><div class='ctx'> 	.macro		prepare, sbox, shiftrows, temp</div><div class='ctx'> 	adr		\temp, \sbox</div><div class='del'>-	movi		v12.16b, #0x40</div><div class='add'>+	movi		v12.16b, #0x1b</div><div class='ctx'> 	ldr		q13, \shiftrows</div><div class='del'>-	movi		v14.16b, #0x1b</div><div class='add'>+	ldr		q14, .Lror32by8</div><div class='ctx'> 	ld1		{v16.16b-v19.16b}, [\temp], #64</div><div class='ctx'> 	ld1		{v20.16b-v23.16b}, [\temp], #64</div><div class='ctx'> 	ld1		{v24.16b-v27.16b}, [\temp], #64</div><div class='hunk'>@@ -49,54 +58,45 @@</div><div class='ctx'> </div><div class='ctx'> 	/* apply SubBytes transformation using the the preloaded Sbox */</div><div class='ctx'> 	.macro		sub_bytes, in</div><div class='del'>-	sub		v9.16b, \in\().16b, v12.16b</div><div class='add'>+	sub		v9.16b, \in\().16b, v15.16b</div><div class='ctx'> 	tbl		\in\().16b, {v16.16b-v19.16b}, \in\().16b</div><div class='del'>-	sub		v10.16b, v9.16b, v12.16b</div><div class='add'>+	sub		v10.16b, v9.16b, v15.16b</div><div class='ctx'> 	tbx		\in\().16b, {v20.16b-v23.16b}, v9.16b</div><div class='del'>-	sub		v11.16b, v10.16b, v12.16b</div><div class='add'>+	sub		v11.16b, v10.16b, v15.16b</div><div class='ctx'> 	tbx		\in\().16b, {v24.16b-v27.16b}, v10.16b</div><div class='ctx'> 	tbx		\in\().16b, {v28.16b-v31.16b}, v11.16b</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	/* apply MixColumns transformation */</div><div class='del'>-	.macro		mix_columns, in</div><div class='del'>-	mul_by_x	v10.16b, \in\().16b, v9.16b, v14.16b</div><div class='del'>-	rev32		v8.8h, \in\().8h</div><div class='del'>-	eor		\in\().16b, v10.16b, \in\().16b</div><div class='del'>-	shl		v9.4s, v8.4s, #24</div><div class='del'>-	shl		v11.4s, \in\().4s, #24</div><div class='del'>-	sri		v9.4s, v8.4s, #8</div><div class='del'>-	sri		v11.4s, \in\().4s, #8</div><div class='del'>-	eor		v9.16b, v9.16b, v8.16b</div><div class='del'>-	eor		v10.16b, v10.16b, v9.16b</div><div class='del'>-	eor		\in\().16b, v10.16b, v11.16b</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='add'>+	.macro		mix_columns, in, enc</div><div class='add'>+	.if		\enc == 0</div><div class='ctx'> 	/* Inverse MixColumns: pre-multiply by { 5, 0, 4, 0 } */</div><div class='del'>-	.macro		inv_mix_columns, in</div><div class='del'>-	mul_by_x	v11.16b, \in\().16b, v10.16b, v14.16b</div><div class='del'>-	mul_by_x	v11.16b, v11.16b, v10.16b, v14.16b</div><div class='del'>-	eor		\in\().16b, \in\().16b, v11.16b</div><div class='del'>-	rev32		v11.8h, v11.8h</div><div class='del'>-	eor		\in\().16b, \in\().16b, v11.16b</div><div class='del'>-	mix_columns	\in</div><div class='add'>+	mul_by_x2	v8.16b, \in\().16b, v9.16b, v12.16b</div><div class='add'>+	eor		\in\().16b, \in\().16b, v8.16b</div><div class='add'>+	rev32		v8.8h, v8.8h</div><div class='add'>+	eor		\in\().16b, \in\().16b, v8.16b</div><div class='add'>+	.endif</div><div class='add'>+</div><div class='add'>+	mul_by_x	v9.16b, \in\().16b, v8.16b, v12.16b</div><div class='add'>+	rev32		v8.8h, \in\().8h</div><div class='add'>+	eor		v8.16b, v8.16b, v9.16b</div><div class='add'>+	eor		\in\().16b, \in\().16b, v8.16b</div><div class='add'>+	tbl		\in\().16b, {\in\().16b}, v14.16b</div><div class='add'>+	eor		\in\().16b, \in\().16b, v8.16b</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro		do_block, enc, in, rounds, rk, rkp, i</div><div class='del'>-	ld1		{v15.16b}, [\rk]</div><div class='add'>+	ld1		{v15.4s}, [\rk]</div><div class='ctx'> 	add		\rkp, \rk, #16</div><div class='ctx'> 	mov		\i, \rounds</div><div class='ctx'> 1111:	eor		\in\().16b, \in\().16b, v15.16b		/* ^round key */</div><div class='add'>+	movi		v15.16b, #0x40</div><div class='ctx'> 	tbl		\in\().16b, {\in\().16b}, v13.16b	/* ShiftRows */</div><div class='ctx'> 	sub_bytes	\in</div><div class='del'>-	ld1		{v15.16b}, [\rkp], #16</div><div class='ctx'> 	subs		\i, \i, #1</div><div class='add'>+	ld1		{v15.4s}, [\rkp], #16</div><div class='ctx'> 	beq		2222f</div><div class='del'>-	.if		\enc == 1</div><div class='del'>-	mix_columns	\in</div><div class='del'>-	.else</div><div class='del'>-	inv_mix_columns	\in</div><div class='del'>-	.endif</div><div class='add'>+	mix_columns	\in, \enc</div><div class='ctx'> 	b		1111b</div><div class='ctx'> 2222:	eor		\in\().16b, \in\().16b, v15.16b		/* ^round key */</div><div class='ctx'> 	.endm</div><div class='hunk'>@@ -115,169 +115,138 @@</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	.macro		sub_bytes_2x, in0, in1</div><div class='del'>-	sub		v8.16b, \in0\().16b, v12.16b</div><div class='del'>-	sub		v9.16b, \in1\().16b, v12.16b</div><div class='add'>+	sub		v8.16b, \in0\().16b, v15.16b</div><div class='ctx'> 	tbl		\in0\().16b, {v16.16b-v19.16b}, \in0\().16b</div><div class='add'>+	sub		v9.16b, \in1\().16b, v15.16b</div><div class='ctx'> 	tbl		\in1\().16b, {v16.16b-v19.16b}, \in1\().16b</div><div class='del'>-	sub		v10.16b, v8.16b, v12.16b</div><div class='del'>-	sub		v11.16b, v9.16b, v12.16b</div><div class='add'>+	sub		v10.16b, v8.16b, v15.16b</div><div class='ctx'> 	tbx		\in0\().16b, {v20.16b-v23.16b}, v8.16b</div><div class='add'>+	sub		v11.16b, v9.16b, v15.16b</div><div class='ctx'> 	tbx		\in1\().16b, {v20.16b-v23.16b}, v9.16b</div><div class='del'>-	sub		v8.16b, v10.16b, v12.16b</div><div class='del'>-	sub		v9.16b, v11.16b, v12.16b</div><div class='add'>+	sub		v8.16b, v10.16b, v15.16b</div><div class='ctx'> 	tbx		\in0\().16b, {v24.16b-v27.16b}, v10.16b</div><div class='add'>+	sub		v9.16b, v11.16b, v15.16b</div><div class='ctx'> 	tbx		\in1\().16b, {v24.16b-v27.16b}, v11.16b</div><div class='ctx'> 	tbx		\in0\().16b, {v28.16b-v31.16b}, v8.16b</div><div class='ctx'> 	tbx		\in1\().16b, {v28.16b-v31.16b}, v9.16b</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro		sub_bytes_4x, in0, in1, in2, in3</div><div class='del'>-	sub		v8.16b, \in0\().16b, v12.16b</div><div class='add'>+	sub		v8.16b, \in0\().16b, v15.16b</div><div class='ctx'> 	tbl		\in0\().16b, {v16.16b-v19.16b}, \in0\().16b</div><div class='del'>-	sub		v9.16b, \in1\().16b, v12.16b</div><div class='add'>+	sub		v9.16b, \in1\().16b, v15.16b</div><div class='ctx'> 	tbl		\in1\().16b, {v16.16b-v19.16b}, \in1\().16b</div><div class='del'>-	sub		v10.16b, \in2\().16b, v12.16b</div><div class='add'>+	sub		v10.16b, \in2\().16b, v15.16b</div><div class='ctx'> 	tbl		\in2\().16b, {v16.16b-v19.16b}, \in2\().16b</div><div class='del'>-	sub		v11.16b, \in3\().16b, v12.16b</div><div class='add'>+	sub		v11.16b, \in3\().16b, v15.16b</div><div class='ctx'> 	tbl		\in3\().16b, {v16.16b-v19.16b}, \in3\().16b</div><div class='ctx'> 	tbx		\in0\().16b, {v20.16b-v23.16b}, v8.16b</div><div class='ctx'> 	tbx		\in1\().16b, {v20.16b-v23.16b}, v9.16b</div><div class='del'>-	sub		v8.16b, v8.16b, v12.16b</div><div class='add'>+	sub		v8.16b, v8.16b, v15.16b</div><div class='ctx'> 	tbx		\in2\().16b, {v20.16b-v23.16b}, v10.16b</div><div class='del'>-	sub		v9.16b, v9.16b, v12.16b</div><div class='add'>+	sub		v9.16b, v9.16b, v15.16b</div><div class='ctx'> 	tbx		\in3\().16b, {v20.16b-v23.16b}, v11.16b</div><div class='del'>-	sub		v10.16b, v10.16b, v12.16b</div><div class='add'>+	sub		v10.16b, v10.16b, v15.16b</div><div class='ctx'> 	tbx		\in0\().16b, {v24.16b-v27.16b}, v8.16b</div><div class='del'>-	sub		v11.16b, v11.16b, v12.16b</div><div class='add'>+	sub		v11.16b, v11.16b, v15.16b</div><div class='ctx'> 	tbx		\in1\().16b, {v24.16b-v27.16b}, v9.16b</div><div class='del'>-	sub		v8.16b, v8.16b, v12.16b</div><div class='add'>+	sub		v8.16b, v8.16b, v15.16b</div><div class='ctx'> 	tbx		\in2\().16b, {v24.16b-v27.16b}, v10.16b</div><div class='del'>-	sub		v9.16b, v9.16b, v12.16b</div><div class='add'>+	sub		v9.16b, v9.16b, v15.16b</div><div class='ctx'> 	tbx		\in3\().16b, {v24.16b-v27.16b}, v11.16b</div><div class='del'>-	sub		v10.16b, v10.16b, v12.16b</div><div class='add'>+	sub		v10.16b, v10.16b, v15.16b</div><div class='ctx'> 	tbx		\in0\().16b, {v28.16b-v31.16b}, v8.16b</div><div class='del'>-	sub		v11.16b, v11.16b, v12.16b</div><div class='add'>+	sub		v11.16b, v11.16b, v15.16b</div><div class='ctx'> 	tbx		\in1\().16b, {v28.16b-v31.16b}, v9.16b</div><div class='ctx'> 	tbx		\in2\().16b, {v28.16b-v31.16b}, v10.16b</div><div class='ctx'> 	tbx		\in3\().16b, {v28.16b-v31.16b}, v11.16b</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro		mul_by_x_2x, out0, out1, in0, in1, tmp0, tmp1, const</div><div class='del'>-	sshr		\tmp0\().16b, \in0\().16b,  #7</div><div class='del'>-	add		\out0\().16b, \in0\().16b,  \in0\().16b</div><div class='del'>-	sshr		\tmp1\().16b, \in1\().16b,  #7</div><div class='add'>+	sshr		\tmp0\().16b, \in0\().16b, #7</div><div class='add'>+	shl		\out0\().16b, \in0\().16b, #1</div><div class='add'>+	sshr		\tmp1\().16b, \in1\().16b, #7</div><div class='ctx'> 	and		\tmp0\().16b, \tmp0\().16b, \const\().16b</div><div class='del'>-	add		\out1\().16b, \in1\().16b,  \in1\().16b</div><div class='add'>+	shl		\out1\().16b, \in1\().16b, #1</div><div class='ctx'> 	and		\tmp1\().16b, \tmp1\().16b, \const\().16b</div><div class='ctx'> 	eor		\out0\().16b, \out0\().16b, \tmp0\().16b</div><div class='ctx'> 	eor		\out1\().16b, \out1\().16b, \tmp1\().16b</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro		mix_columns_2x, in0, in1</div><div class='del'>-	mul_by_x_2x	v8, v9, \in0, \in1, v10, v11, v14</div><div class='del'>-	rev32		v10.8h, \in0\().8h</div><div class='del'>-	rev32		v11.8h, \in1\().8h</div><div class='del'>-	eor		\in0\().16b, v8.16b, \in0\().16b</div><div class='del'>-	eor		\in1\().16b, v9.16b, \in1\().16b</div><div class='del'>-	shl		v12.4s, v10.4s, #24</div><div class='del'>-	shl		v13.4s, v11.4s, #24</div><div class='del'>-	eor		v8.16b, v8.16b, v10.16b</div><div class='del'>-	sri		v12.4s, v10.4s, #8</div><div class='del'>-	shl		v10.4s, \in0\().4s, #24</div><div class='del'>-	eor		v9.16b, v9.16b, v11.16b</div><div class='del'>-	sri		v13.4s, v11.4s, #8</div><div class='del'>-	shl		v11.4s, \in1\().4s, #24</div><div class='del'>-	sri		v10.4s, \in0\().4s, #8</div><div class='del'>-	eor		\in0\().16b, v8.16b, v12.16b</div><div class='del'>-	sri		v11.4s, \in1\().4s, #8</div><div class='del'>-	eor		\in1\().16b, v9.16b, v13.16b</div><div class='del'>-	eor		\in0\().16b, v10.16b, \in0\().16b</div><div class='del'>-	eor		\in1\().16b, v11.16b, \in1\().16b</div><div class='add'>+	.macro		mul_by_x2_2x, out0, out1, in0, in1, tmp0, tmp1, const</div><div class='add'>+	ushr		\tmp0\().16b, \in0\().16b, #6</div><div class='add'>+	shl		\out0\().16b, \in0\().16b, #2</div><div class='add'>+	ushr		\tmp1\().16b, \in1\().16b, #6</div><div class='add'>+	pmul		\tmp0\().16b, \tmp0\().16b, \const\().16b</div><div class='add'>+	shl		\out1\().16b, \in1\().16b, #2</div><div class='add'>+	pmul		\tmp1\().16b, \tmp1\().16b, \const\().16b</div><div class='add'>+	eor		\out0\().16b, \out0\().16b, \tmp0\().16b</div><div class='add'>+	eor		\out1\().16b, \out1\().16b, \tmp1\().16b</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro		inv_mix_cols_2x, in0, in1</div><div class='del'>-	mul_by_x_2x	v8, v9, \in0, \in1, v10, v11, v14</div><div class='del'>-	mul_by_x_2x	v8, v9, v8, v9, v10, v11, v14</div><div class='add'>+	.macro		mix_columns_2x, in0, in1, enc</div><div class='add'>+	.if		\enc == 0</div><div class='add'>+	/* Inverse MixColumns: pre-multiply by { 5, 0, 4, 0 } */</div><div class='add'>+	mul_by_x2_2x	v8, v9, \in0, \in1, v10, v11, v12</div><div class='ctx'> 	eor		\in0\().16b, \in0\().16b, v8.16b</div><div class='del'>-	eor		\in1\().16b, \in1\().16b, v9.16b</div><div class='ctx'> 	rev32		v8.8h, v8.8h</div><div class='del'>-	rev32		v9.8h, v9.8h</div><div class='del'>-	eor		\in0\().16b, \in0\().16b, v8.16b</div><div class='ctx'> 	eor		\in1\().16b, \in1\().16b, v9.16b</div><div class='del'>-	mix_columns_2x	\in0, \in1</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro		inv_mix_cols_4x, in0, in1, in2, in3</div><div class='del'>-	mul_by_x_2x	v8, v9, \in0, \in1, v10, v11, v14</div><div class='del'>-	mul_by_x_2x	v10, v11, \in2, \in3, v12, v13, v14</div><div class='del'>-	mul_by_x_2x	v8, v9, v8, v9, v12, v13, v14</div><div class='del'>-	mul_by_x_2x	v10, v11, v10, v11, v12, v13, v14</div><div class='del'>-	eor		\in0\().16b, \in0\().16b, v8.16b</div><div class='del'>-	eor		\in1\().16b, \in1\().16b, v9.16b</div><div class='del'>-	eor		\in2\().16b, \in2\().16b, v10.16b</div><div class='del'>-	eor		\in3\().16b, \in3\().16b, v11.16b</div><div class='del'>-	rev32		v8.8h, v8.8h</div><div class='ctx'> 	rev32		v9.8h, v9.8h</div><div class='del'>-	rev32		v10.8h, v10.8h</div><div class='del'>-	rev32		v11.8h, v11.8h</div><div class='ctx'> 	eor		\in0\().16b, \in0\().16b, v8.16b</div><div class='ctx'> 	eor		\in1\().16b, \in1\().16b, v9.16b</div><div class='del'>-	eor		\in2\().16b, \in2\().16b, v10.16b</div><div class='del'>-	eor		\in3\().16b, \in3\().16b, v11.16b</div><div class='del'>-	mix_columns_2x	\in0, \in1</div><div class='del'>-	mix_columns_2x	\in2, \in3</div><div class='add'>+	.endif</div><div class='add'>+</div><div class='add'>+	mul_by_x_2x	v8, v9, \in0, \in1, v10, v11, v12</div><div class='add'>+	rev32		v10.8h, \in0\().8h</div><div class='add'>+	rev32		v11.8h, \in1\().8h</div><div class='add'>+	eor		v10.16b, v10.16b, v8.16b</div><div class='add'>+	eor		v11.16b, v11.16b, v9.16b</div><div class='add'>+	eor		\in0\().16b, \in0\().16b, v10.16b</div><div class='add'>+	eor		\in1\().16b, \in1\().16b, v11.16b</div><div class='add'>+	tbl		\in0\().16b, {\in0\().16b}, v14.16b</div><div class='add'>+	tbl		\in1\().16b, {\in1\().16b}, v14.16b</div><div class='add'>+	eor		\in0\().16b, \in0\().16b, v10.16b</div><div class='add'>+	eor		\in1\().16b, \in1\().16b, v11.16b</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro		do_block_2x, enc, in0, in1 rounds, rk, rkp, i</div><div class='del'>-	ld1		{v15.16b}, [\rk]</div><div class='add'>+	.macro		do_block_2x, enc, in0, in1, rounds, rk, rkp, i</div><div class='add'>+	ld1		{v15.4s}, [\rk]</div><div class='ctx'> 	add		\rkp, \rk, #16</div><div class='ctx'> 	mov		\i, \rounds</div><div class='ctx'> 1111:	eor		\in0\().16b, \in0\().16b, v15.16b	/* ^round key */</div><div class='ctx'> 	eor		\in1\().16b, \in1\().16b, v15.16b	/* ^round key */</div><div class='del'>-	sub_bytes_2x	\in0, \in1</div><div class='add'>+	movi		v15.16b, #0x40</div><div class='ctx'> 	tbl		\in0\().16b, {\in0\().16b}, v13.16b	/* ShiftRows */</div><div class='ctx'> 	tbl		\in1\().16b, {\in1\().16b}, v13.16b	/* ShiftRows */</div><div class='del'>-	ld1		{v15.16b}, [\rkp], #16</div><div class='add'>+	sub_bytes_2x	\in0, \in1</div><div class='ctx'> 	subs		\i, \i, #1</div><div class='add'>+	ld1		{v15.4s}, [\rkp], #16</div><div class='ctx'> 	beq		2222f</div><div class='del'>-	.if		\enc == 1</div><div class='del'>-	mix_columns_2x	\in0, \in1</div><div class='del'>-	ldr		q13, .LForward_ShiftRows</div><div class='del'>-	.else</div><div class='del'>-	inv_mix_cols_2x	\in0, \in1</div><div class='del'>-	ldr		q13, .LReverse_ShiftRows</div><div class='del'>-	.endif</div><div class='del'>-	movi		v12.16b, #0x40</div><div class='add'>+	mix_columns_2x	\in0, \in1, \enc</div><div class='ctx'> 	b		1111b</div><div class='ctx'> 2222:	eor		\in0\().16b, \in0\().16b, v15.16b	/* ^round key */</div><div class='ctx'> 	eor		\in1\().16b, \in1\().16b, v15.16b	/* ^round key */</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro		do_block_4x, enc, in0, in1, in2, in3, rounds, rk, rkp, i</div><div class='del'>-	ld1		{v15.16b}, [\rk]</div><div class='add'>+	ld1		{v15.4s}, [\rk]</div><div class='ctx'> 	add		\rkp, \rk, #16</div><div class='ctx'> 	mov		\i, \rounds</div><div class='ctx'> 1111:	eor		\in0\().16b, \in0\().16b, v15.16b	/* ^round key */</div><div class='ctx'> 	eor		\in1\().16b, \in1\().16b, v15.16b	/* ^round key */</div><div class='ctx'> 	eor		\in2\().16b, \in2\().16b, v15.16b	/* ^round key */</div><div class='ctx'> 	eor		\in3\().16b, \in3\().16b, v15.16b	/* ^round key */</div><div class='del'>-	sub_bytes_4x	\in0, \in1, \in2, \in3</div><div class='add'>+	movi		v15.16b, #0x40</div><div class='ctx'> 	tbl		\in0\().16b, {\in0\().16b}, v13.16b	/* ShiftRows */</div><div class='ctx'> 	tbl		\in1\().16b, {\in1\().16b}, v13.16b	/* ShiftRows */</div><div class='ctx'> 	tbl		\in2\().16b, {\in2\().16b}, v13.16b	/* ShiftRows */</div><div class='ctx'> 	tbl		\in3\().16b, {\in3\().16b}, v13.16b	/* ShiftRows */</div><div class='del'>-	ld1		{v15.16b}, [\rkp], #16</div><div class='add'>+	sub_bytes_4x	\in0, \in1, \in2, \in3</div><div class='ctx'> 	subs		\i, \i, #1</div><div class='add'>+	ld1		{v15.4s}, [\rkp], #16</div><div class='ctx'> 	beq		2222f</div><div class='del'>-	.if		\enc == 1</div><div class='del'>-	mix_columns_2x	\in0, \in1</div><div class='del'>-	mix_columns_2x	\in2, \in3</div><div class='del'>-	ldr		q13, .LForward_ShiftRows</div><div class='del'>-	.else</div><div class='del'>-	inv_mix_cols_4x	\in0, \in1, \in2, \in3</div><div class='del'>-	ldr		q13, .LReverse_ShiftRows</div><div class='del'>-	.endif</div><div class='del'>-	movi		v12.16b, #0x40</div><div class='add'>+	mix_columns_2x	\in0, \in1, \enc</div><div class='add'>+	mix_columns_2x	\in2, \in3, \enc</div><div class='ctx'> 	b		1111b</div><div class='ctx'> 2222:	eor		\in0\().16b, \in0\().16b, v15.16b	/* ^round key */</div><div class='ctx'> 	eor		\in1\().16b, \in1\().16b, v15.16b	/* ^round key */</div><div class='hunk'>@@ -304,15 +273,7 @@</div><div class='ctx'> #include "aes-modes.S"</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='del'>-	.align		4</div><div class='del'>-.LForward_ShiftRows:</div><div class='del'>-	.byte		0x0, 0x5, 0xa, 0xf, 0x4, 0x9, 0xe, 0x3</div><div class='del'>-	.byte		0x8, 0xd, 0x2, 0x7, 0xc, 0x1, 0x6, 0xb</div><div class='del'>-</div><div class='del'>-.LReverse_ShiftRows:</div><div class='del'>-	.byte		0x0, 0xd, 0xa, 0x7, 0x4, 0x1, 0xe, 0xb</div><div class='del'>-	.byte		0x8, 0x5, 0x2, 0xf, 0xc, 0x9, 0x6, 0x3</div><div class='del'>-</div><div class='add'>+	.align		6</div><div class='ctx'> .LForward_Sbox:</div><div class='ctx'> 	.byte		0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5</div><div class='ctx'> 	.byte		0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76</div><div class='hunk'>@@ -380,3 +341,12 @@</div><div class='ctx'> 	.byte		0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61</div><div class='ctx'> 	.byte		0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26</div><div class='ctx'> 	.byte		0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d</div><div class='add'>+</div><div class='add'>+.LForward_ShiftRows:</div><div class='add'>+	.octa		0x0b06010c07020d08030e09040f0a0500</div><div class='add'>+</div><div class='add'>+.LReverse_ShiftRows:</div><div class='add'>+	.octa		0x0306090c0f0205080b0e0104070a0d00</div><div class='add'>+</div><div class='add'>+.Lror32by8:</div><div class='add'>+	.octa		0x0c0f0e0d080b0a090407060500030201</div><div class='head'>diff --git a/arch/arm64/crypto/aes-neonbs-core.S b/arch/arm64/crypto/aes-neonbs-core.S<br/>new file mode 100644<br/>index 000000000000..ca0472500433<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/aes-neonbs-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-neonbs-core.S</a></div><div class='hunk'>@@ -0,0 +1,972 @@</div><div class='add'>+/*</div><div class='add'>+ * Bit sliced AES using NEON instructions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The algorithm implemented here is described in detail by the paper</div><div class='add'>+ * 'Faster and Timing-Attack Resistant AES-GCM' by Emilia Kaesper and</div><div class='add'>+ * Peter Schwabe (https://eprint.iacr.org/2009/129.pdf)</div><div class='add'>+ *</div><div class='add'>+ * This implementation is based primarily on the OpenSSL implementation</div><div class='add'>+ * for 32-bit ARM written by Andy Polyakov &lt;appro@openssl.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+	rounds		.req	x11</div><div class='add'>+	bskey		.req	x12</div><div class='add'>+</div><div class='add'>+	.macro		in_bs_ch, b0, b1, b2, b3, b4, b5, b6, b7</div><div class='add'>+	eor		\b2, \b2, \b1</div><div class='add'>+	eor		\b5, \b5, \b6</div><div class='add'>+	eor		\b3, \b3, \b0</div><div class='add'>+	eor		\b6, \b6, \b2</div><div class='add'>+	eor		\b5, \b5, \b0</div><div class='add'>+	eor		\b6, \b6, \b3</div><div class='add'>+	eor		\b3, \b3, \b7</div><div class='add'>+	eor		\b7, \b7, \b5</div><div class='add'>+	eor		\b3, \b3, \b4</div><div class='add'>+	eor		\b4, \b4, \b5</div><div class='add'>+	eor		\b2, \b2, \b7</div><div class='add'>+	eor		\b3, \b3, \b1</div><div class='add'>+	eor		\b1, \b1, \b5</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		out_bs_ch, b0, b1, b2, b3, b4, b5, b6, b7</div><div class='add'>+	eor		\b0, \b0, \b6</div><div class='add'>+	eor		\b1, \b1, \b4</div><div class='add'>+	eor		\b4, \b4, \b6</div><div class='add'>+	eor		\b2, \b2, \b0</div><div class='add'>+	eor		\b6, \b6, \b1</div><div class='add'>+	eor		\b1, \b1, \b5</div><div class='add'>+	eor		\b5, \b5, \b3</div><div class='add'>+	eor		\b3, \b3, \b7</div><div class='add'>+	eor		\b7, \b7, \b5</div><div class='add'>+	eor		\b2, \b2, \b5</div><div class='add'>+	eor		\b4, \b4, \b7</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		inv_in_bs_ch, b6, b1, b2, b4, b7, b0, b3, b5</div><div class='add'>+	eor		\b1, \b1, \b7</div><div class='add'>+	eor		\b4, \b4, \b7</div><div class='add'>+	eor		\b7, \b7, \b5</div><div class='add'>+	eor		\b1, \b1, \b3</div><div class='add'>+	eor		\b2, \b2, \b5</div><div class='add'>+	eor		\b3, \b3, \b7</div><div class='add'>+	eor		\b6, \b6, \b1</div><div class='add'>+	eor		\b2, \b2, \b0</div><div class='add'>+	eor		\b5, \b5, \b3</div><div class='add'>+	eor		\b4, \b4, \b6</div><div class='add'>+	eor		\b0, \b0, \b6</div><div class='add'>+	eor		\b1, \b1, \b4</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		inv_out_bs_ch, b6, b5, b0, b3, b7, b1, b4, b2</div><div class='add'>+	eor		\b1, \b1, \b5</div><div class='add'>+	eor		\b2, \b2, \b7</div><div class='add'>+	eor		\b3, \b3, \b1</div><div class='add'>+	eor		\b4, \b4, \b5</div><div class='add'>+	eor		\b7, \b7, \b5</div><div class='add'>+	eor		\b3, \b3, \b4</div><div class='add'>+	eor 		\b5, \b5, \b0</div><div class='add'>+	eor		\b3, \b3, \b7</div><div class='add'>+	eor		\b6, \b6, \b2</div><div class='add'>+	eor		\b2, \b2, \b1</div><div class='add'>+	eor		\b6, \b6, \b3</div><div class='add'>+	eor		\b3, \b3, \b0</div><div class='add'>+	eor		\b5, \b5, \b6</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		mul_gf4, x0, x1, y0, y1, t0, t1</div><div class='add'>+	eor 		\t0, \y0, \y1</div><div class='add'>+	and		\t0, \t0, \x0</div><div class='add'>+	eor		\x0, \x0, \x1</div><div class='add'>+	and		\t1, \x1, \y0</div><div class='add'>+	and		\x0, \x0, \y1</div><div class='add'>+	eor		\x1, \t1, \t0</div><div class='add'>+	eor		\x0, \x0, \t1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		mul_gf4_n_gf4, x0, x1, y0, y1, t0, x2, x3, y2, y3, t1</div><div class='add'>+	eor		\t0, \y0, \y1</div><div class='add'>+	eor 		\t1, \y2, \y3</div><div class='add'>+	and		\t0, \t0, \x0</div><div class='add'>+	and		\t1, \t1, \x2</div><div class='add'>+	eor		\x0, \x0, \x1</div><div class='add'>+	eor		\x2, \x2, \x3</div><div class='add'>+	and		\x1, \x1, \y0</div><div class='add'>+	and		\x3, \x3, \y2</div><div class='add'>+	and		\x0, \x0, \y1</div><div class='add'>+	and		\x2, \x2, \y3</div><div class='add'>+	eor		\x1, \x1, \x0</div><div class='add'>+	eor		\x2, \x2, \x3</div><div class='add'>+	eor		\x0, \x0, \t0</div><div class='add'>+	eor		\x3, \x3, \t1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		mul_gf16_2, x0, x1, x2, x3, x4, x5, x6, x7, \</div><div class='add'>+				    y0, y1, y2, y3, t0, t1, t2, t3</div><div class='add'>+	eor		\t0, \x0, \x2</div><div class='add'>+	eor		\t1, \x1, \x3</div><div class='add'>+	mul_gf4  	\x0, \x1, \y0, \y1, \t2, \t3</div><div class='add'>+	eor		\y0, \y0, \y2</div><div class='add'>+	eor		\y1, \y1, \y3</div><div class='add'>+	mul_gf4_n_gf4	\t0, \t1, \y0, \y1, \t3, \x2, \x3, \y2, \y3, \t2</div><div class='add'>+	eor		\x0, \x0, \t0</div><div class='add'>+	eor		\x2, \x2, \t0</div><div class='add'>+	eor		\x1, \x1, \t1</div><div class='add'>+	eor		\x3, \x3, \t1</div><div class='add'>+	eor		\t0, \x4, \x6</div><div class='add'>+	eor		\t1, \x5, \x7</div><div class='add'>+	mul_gf4_n_gf4	\t0, \t1, \y0, \y1, \t3, \x6, \x7, \y2, \y3, \t2</div><div class='add'>+	eor		\y0, \y0, \y2</div><div class='add'>+	eor		\y1, \y1, \y3</div><div class='add'>+	mul_gf4  	\x4, \x5, \y0, \y1, \t2, \t3</div><div class='add'>+	eor		\x4, \x4, \t0</div><div class='add'>+	eor		\x6, \x6, \t0</div><div class='add'>+	eor		\x5, \x5, \t1</div><div class='add'>+	eor		\x7, \x7, \t1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		inv_gf256, x0, x1, x2, x3, x4, x5, x6, x7, \</div><div class='add'>+				   t0, t1, t2, t3, s0, s1, s2, s3</div><div class='add'>+	eor		\t3, \x4, \x6</div><div class='add'>+	eor		\t0, \x5, \x7</div><div class='add'>+	eor		\t1, \x1, \x3</div><div class='add'>+	eor		\s1, \x7, \x6</div><div class='add'>+	eor		\s0, \x0, \x2</div><div class='add'>+	eor		\s3, \t3, \t0</div><div class='add'>+	orr		\t2, \t0, \t1</div><div class='add'>+	and		\s2, \t3, \s0</div><div class='add'>+	orr		\t3, \t3, \s0</div><div class='add'>+	eor		\s0, \s0, \t1</div><div class='add'>+	and		\t0, \t0, \t1</div><div class='add'>+	eor		\t1, \x3, \x2</div><div class='add'>+	and		\s3, \s3, \s0</div><div class='add'>+	and		\s1, \s1, \t1</div><div class='add'>+	eor		\t1, \x4, \x5</div><div class='add'>+	eor		\s0, \x1, \x0</div><div class='add'>+	eor		\t3, \t3, \s1</div><div class='add'>+	eor		\t2, \t2, \s1</div><div class='add'>+	and		\s1, \t1, \s0</div><div class='add'>+	orr		\t1, \t1, \s0</div><div class='add'>+	eor		\t3, \t3, \s3</div><div class='add'>+	eor		\t0, \t0, \s1</div><div class='add'>+	eor		\t2, \t2, \s2</div><div class='add'>+	eor		\t1, \t1, \s3</div><div class='add'>+	eor		\t0, \t0, \s2</div><div class='add'>+	and		\s0, \x7, \x3</div><div class='add'>+	eor		\t1, \t1, \s2</div><div class='add'>+	and		\s1, \x6, \x2</div><div class='add'>+	and		\s2, \x5, \x1</div><div class='add'>+	orr		\s3, \x4, \x0</div><div class='add'>+	eor		\t3, \t3, \s0</div><div class='add'>+	eor		\t1, \t1, \s2</div><div class='add'>+	eor		\s0, \t0, \s3</div><div class='add'>+	eor		\t2, \t2, \s1</div><div class='add'>+	and		\s2, \t3, \t1</div><div class='add'>+	eor		\s1, \t2, \s2</div><div class='add'>+	eor		\s3, \s0, \s2</div><div class='add'>+	bsl		\s1, \t1, \s0</div><div class='add'>+	not		\t0, \s0</div><div class='add'>+	bsl		\s0, \s1, \s3</div><div class='add'>+	bsl		\t0, \s1, \s3</div><div class='add'>+	bsl		\s3, \t3, \t2</div><div class='add'>+	eor		\t3, \t3, \t2</div><div class='add'>+	and		\s2, \s0, \s3</div><div class='add'>+	eor		\t1, \t1, \t0</div><div class='add'>+	eor		\s2, \s2, \t3</div><div class='add'>+	mul_gf16_2	\x0, \x1, \x2, \x3, \x4, \x5, \x6, \x7, \</div><div class='add'>+			\s3, \s2, \s1, \t1, \s0, \t0, \t2, \t3</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		sbox, b0, b1, b2, b3, b4, b5, b6, b7, \</div><div class='add'>+			      t0, t1, t2, t3, s0, s1, s2, s3</div><div class='add'>+	in_bs_ch	\b0\().16b, \b1\().16b, \b2\().16b, \b3\().16b, \</div><div class='add'>+			\b4\().16b, \b5\().16b, \b6\().16b, \b7\().16b</div><div class='add'>+	inv_gf256	\b6\().16b, \b5\().16b, \b0\().16b, \b3\().16b, \</div><div class='add'>+			\b7\().16b, \b1\().16b, \b4\().16b, \b2\().16b, \</div><div class='add'>+			\t0\().16b, \t1\().16b, \t2\().16b, \t3\().16b, \</div><div class='add'>+			\s0\().16b, \s1\().16b, \s2\().16b, \s3\().16b</div><div class='add'>+	out_bs_ch	\b7\().16b, \b1\().16b, \b4\().16b, \b2\().16b, \</div><div class='add'>+			\b6\().16b, \b5\().16b, \b0\().16b, \b3\().16b</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		inv_sbox, b0, b1, b2, b3, b4, b5, b6, b7, \</div><div class='add'>+				  t0, t1, t2, t3, s0, s1, s2, s3</div><div class='add'>+	inv_in_bs_ch	\b0\().16b, \b1\().16b, \b2\().16b, \b3\().16b, \</div><div class='add'>+			\b4\().16b, \b5\().16b, \b6\().16b, \b7\().16b</div><div class='add'>+	inv_gf256	\b5\().16b, \b1\().16b, \b2\().16b, \b6\().16b, \</div><div class='add'>+			\b3\().16b, \b7\().16b, \b0\().16b, \b4\().16b, \</div><div class='add'>+			\t0\().16b, \t1\().16b, \t2\().16b, \t3\().16b, \</div><div class='add'>+			\s0\().16b, \s1\().16b, \s2\().16b, \s3\().16b</div><div class='add'>+	inv_out_bs_ch	\b3\().16b, \b7\().16b, \b0\().16b, \b4\().16b, \</div><div class='add'>+			\b5\().16b, \b1\().16b, \b2\().16b, \b6\().16b</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		enc_next_rk</div><div class='add'>+	ldp		q16, q17, [bskey], #128</div><div class='add'>+	ldp		q18, q19, [bskey, #-96]</div><div class='add'>+	ldp		q20, q21, [bskey, #-64]</div><div class='add'>+	ldp		q22, q23, [bskey, #-32]</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		dec_next_rk</div><div class='add'>+	ldp		q16, q17, [bskey, #-128]!</div><div class='add'>+	ldp		q18, q19, [bskey, #32]</div><div class='add'>+	ldp		q20, q21, [bskey, #64]</div><div class='add'>+	ldp		q22, q23, [bskey, #96]</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		add_round_key, x0, x1, x2, x3, x4, x5, x6, x7</div><div class='add'>+	eor		\x0\().16b, \x0\().16b, v16.16b</div><div class='add'>+	eor		\x1\().16b, \x1\().16b, v17.16b</div><div class='add'>+	eor		\x2\().16b, \x2\().16b, v18.16b</div><div class='add'>+	eor		\x3\().16b, \x3\().16b, v19.16b</div><div class='add'>+	eor		\x4\().16b, \x4\().16b, v20.16b</div><div class='add'>+	eor		\x5\().16b, \x5\().16b, v21.16b</div><div class='add'>+	eor		\x6\().16b, \x6\().16b, v22.16b</div><div class='add'>+	eor		\x7\().16b, \x7\().16b, v23.16b</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		shift_rows, x0, x1, x2, x3, x4, x5, x6, x7, mask</div><div class='add'>+	tbl		\x0\().16b, {\x0\().16b}, \mask\().16b</div><div class='add'>+	tbl		\x1\().16b, {\x1\().16b}, \mask\().16b</div><div class='add'>+	tbl		\x2\().16b, {\x2\().16b}, \mask\().16b</div><div class='add'>+	tbl		\x3\().16b, {\x3\().16b}, \mask\().16b</div><div class='add'>+	tbl		\x4\().16b, {\x4\().16b}, \mask\().16b</div><div class='add'>+	tbl		\x5\().16b, {\x5\().16b}, \mask\().16b</div><div class='add'>+	tbl		\x6\().16b, {\x6\().16b}, \mask\().16b</div><div class='add'>+	tbl		\x7\().16b, {\x7\().16b}, \mask\().16b</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		mix_cols, x0, x1, x2, x3, x4, x5, x6, x7, \</div><div class='add'>+				  t0, t1, t2, t3, t4, t5, t6, t7, inv</div><div class='add'>+	ext		\t0\().16b, \x0\().16b, \x0\().16b, #12</div><div class='add'>+	ext		\t1\().16b, \x1\().16b, \x1\().16b, #12</div><div class='add'>+	eor		\x0\().16b, \x0\().16b, \t0\().16b</div><div class='add'>+	ext		\t2\().16b, \x2\().16b, \x2\().16b, #12</div><div class='add'>+	eor		\x1\().16b, \x1\().16b, \t1\().16b</div><div class='add'>+	ext		\t3\().16b, \x3\().16b, \x3\().16b, #12</div><div class='add'>+	eor		\x2\().16b, \x2\().16b, \t2\().16b</div><div class='add'>+	ext		\t4\().16b, \x4\().16b, \x4\().16b, #12</div><div class='add'>+	eor		\x3\().16b, \x3\().16b, \t3\().16b</div><div class='add'>+	ext		\t5\().16b, \x5\().16b, \x5\().16b, #12</div><div class='add'>+	eor		\x4\().16b, \x4\().16b, \t4\().16b</div><div class='add'>+	ext		\t6\().16b, \x6\().16b, \x6\().16b, #12</div><div class='add'>+	eor		\x5\().16b, \x5\().16b, \t5\().16b</div><div class='add'>+	ext		\t7\().16b, \x7\().16b, \x7\().16b, #12</div><div class='add'>+	eor		\x6\().16b, \x6\().16b, \t6\().16b</div><div class='add'>+	eor		\t1\().16b, \t1\().16b, \x0\().16b</div><div class='add'>+	eor		\x7\().16b, \x7\().16b, \t7\().16b</div><div class='add'>+	ext		\x0\().16b, \x0\().16b, \x0\().16b, #8</div><div class='add'>+	eor		\t2\().16b, \t2\().16b, \x1\().16b</div><div class='add'>+	eor		\t0\().16b, \t0\().16b, \x7\().16b</div><div class='add'>+	eor		\t1\().16b, \t1\().16b, \x7\().16b</div><div class='add'>+	ext		\x1\().16b, \x1\().16b, \x1\().16b, #8</div><div class='add'>+	eor		\t5\().16b, \t5\().16b, \x4\().16b</div><div class='add'>+	eor		\x0\().16b, \x0\().16b, \t0\().16b</div><div class='add'>+	eor		\t6\().16b, \t6\().16b, \x5\().16b</div><div class='add'>+	eor		\x1\().16b, \x1\().16b, \t1\().16b</div><div class='add'>+	ext		\t0\().16b, \x4\().16b, \x4\().16b, #8</div><div class='add'>+	eor		\t4\().16b, \t4\().16b, \x3\().16b</div><div class='add'>+	ext		\t1\().16b, \x5\().16b, \x5\().16b, #8</div><div class='add'>+	eor		\t7\().16b, \t7\().16b, \x6\().16b</div><div class='add'>+	ext		\x4\().16b, \x3\().16b, \x3\().16b, #8</div><div class='add'>+	eor		\t3\().16b, \t3\().16b, \x2\().16b</div><div class='add'>+	ext		\x5\().16b, \x7\().16b, \x7\().16b, #8</div><div class='add'>+	eor		\t4\().16b, \t4\().16b, \x7\().16b</div><div class='add'>+	ext		\x3\().16b, \x6\().16b, \x6\().16b, #8</div><div class='add'>+	eor		\t3\().16b, \t3\().16b, \x7\().16b</div><div class='add'>+	ext		\x6\().16b, \x2\().16b, \x2\().16b, #8</div><div class='add'>+	eor		\x7\().16b, \t1\().16b, \t5\().16b</div><div class='add'>+	.ifb		\inv</div><div class='add'>+	eor		\x2\().16b, \t0\().16b, \t4\().16b</div><div class='add'>+	eor		\x4\().16b, \x4\().16b, \t3\().16b</div><div class='add'>+	eor		\x5\().16b, \x5\().16b, \t7\().16b</div><div class='add'>+	eor		\x3\().16b, \x3\().16b, \t6\().16b</div><div class='add'>+	eor		\x6\().16b, \x6\().16b, \t2\().16b</div><div class='add'>+	.else</div><div class='add'>+	eor		\t3\().16b, \t3\().16b, \x4\().16b</div><div class='add'>+	eor		\x5\().16b, \x5\().16b, \t7\().16b</div><div class='add'>+	eor		\x2\().16b, \x3\().16b, \t6\().16b</div><div class='add'>+	eor		\x3\().16b, \t0\().16b, \t4\().16b</div><div class='add'>+	eor		\x4\().16b, \x6\().16b, \t2\().16b</div><div class='add'>+	mov		\x6\().16b, \t3\().16b</div><div class='add'>+	.endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		inv_mix_cols, x0, x1, x2, x3, x4, x5, x6, x7, \</div><div class='add'>+				      t0, t1, t2, t3, t4, t5, t6, t7</div><div class='add'>+	ext		\t0\().16b, \x0\().16b, \x0\().16b, #8</div><div class='add'>+	ext		\t6\().16b, \x6\().16b, \x6\().16b, #8</div><div class='add'>+	ext		\t7\().16b, \x7\().16b, \x7\().16b, #8</div><div class='add'>+	eor		\t0\().16b, \t0\().16b, \x0\().16b</div><div class='add'>+	ext		\t1\().16b, \x1\().16b, \x1\().16b, #8</div><div class='add'>+	eor		\t6\().16b, \t6\().16b, \x6\().16b</div><div class='add'>+	ext		\t2\().16b, \x2\().16b, \x2\().16b, #8</div><div class='add'>+	eor		\t7\().16b, \t7\().16b, \x7\().16b</div><div class='add'>+	ext		\t3\().16b, \x3\().16b, \x3\().16b, #8</div><div class='add'>+	eor		\t1\().16b, \t1\().16b, \x1\().16b</div><div class='add'>+	ext		\t4\().16b, \x4\().16b, \x4\().16b, #8</div><div class='add'>+	eor		\t2\().16b, \t2\().16b, \x2\().16b</div><div class='add'>+	ext		\t5\().16b, \x5\().16b, \x5\().16b, #8</div><div class='add'>+	eor		\t3\().16b, \t3\().16b, \x3\().16b</div><div class='add'>+	eor		\t4\().16b, \t4\().16b, \x4\().16b</div><div class='add'>+	eor		\t5\().16b, \t5\().16b, \x5\().16b</div><div class='add'>+	eor		\x0\().16b, \x0\().16b, \t6\().16b</div><div class='add'>+	eor		\x1\().16b, \x1\().16b, \t6\().16b</div><div class='add'>+	eor		\x2\().16b, \x2\().16b, \t0\().16b</div><div class='add'>+	eor		\x4\().16b, \x4\().16b, \t2\().16b</div><div class='add'>+	eor		\x3\().16b, \x3\().16b, \t1\().16b</div><div class='add'>+	eor		\x1\().16b, \x1\().16b, \t7\().16b</div><div class='add'>+	eor		\x2\().16b, \x2\().16b, \t7\().16b</div><div class='add'>+	eor		\x4\().16b, \x4\().16b, \t6\().16b</div><div class='add'>+	eor		\x5\().16b, \x5\().16b, \t3\().16b</div><div class='add'>+	eor		\x3\().16b, \x3\().16b, \t6\().16b</div><div class='add'>+	eor		\x6\().16b, \x6\().16b, \t4\().16b</div><div class='add'>+	eor		\x4\().16b, \x4\().16b, \t7\().16b</div><div class='add'>+	eor		\x5\().16b, \x5\().16b, \t7\().16b</div><div class='add'>+	eor		\x7\().16b, \x7\().16b, \t5\().16b</div><div class='add'>+	mix_cols	\x0, \x1, \x2, \x3, \x4, \x5, \x6, \x7, \</div><div class='add'>+			\t0, \t1, \t2, \t3, \t4, \t5, \t6, \t7, 1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		swapmove_2x, a0, b0, a1, b1, n, mask, t0, t1</div><div class='add'>+	ushr		\t0\().2d, \b0\().2d, #\n</div><div class='add'>+	ushr		\t1\().2d, \b1\().2d, #\n</div><div class='add'>+	eor		\t0\().16b, \t0\().16b, \a0\().16b</div><div class='add'>+	eor		\t1\().16b, \t1\().16b, \a1\().16b</div><div class='add'>+	and		\t0\().16b, \t0\().16b, \mask\().16b</div><div class='add'>+	and		\t1\().16b, \t1\().16b, \mask\().16b</div><div class='add'>+	eor		\a0\().16b, \a0\().16b, \t0\().16b</div><div class='add'>+	shl		\t0\().2d, \t0\().2d, #\n</div><div class='add'>+	eor		\a1\().16b, \a1\().16b, \t1\().16b</div><div class='add'>+	shl		\t1\().2d, \t1\().2d, #\n</div><div class='add'>+	eor		\b0\().16b, \b0\().16b, \t0\().16b</div><div class='add'>+	eor		\b1\().16b, \b1\().16b, \t1\().16b</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro		bitslice, x7, x6, x5, x4, x3, x2, x1, x0, t0, t1, t2, t3</div><div class='add'>+	movi		\t0\().16b, #0x55</div><div class='add'>+	movi		\t1\().16b, #0x33</div><div class='add'>+	swapmove_2x	\x0, \x1, \x2, \x3, 1, \t0, \t2, \t3</div><div class='add'>+	swapmove_2x	\x4, \x5, \x6, \x7, 1, \t0, \t2, \t3</div><div class='add'>+	movi		\t0\().16b, #0x0f</div><div class='add'>+	swapmove_2x	\x0, \x2, \x1, \x3, 2, \t1, \t2, \t3</div><div class='add'>+	swapmove_2x	\x4, \x6, \x5, \x7, 2, \t1, \t2, \t3</div><div class='add'>+	swapmove_2x	\x0, \x4, \x1, \x5, 4, \t0, \t2, \t3</div><div class='add'>+	swapmove_2x	\x2, \x6, \x3, \x7, 4, \t0, \t2, \t3</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	.align		6</div><div class='add'>+M0:	.octa		0x0004080c0105090d02060a0e03070b0f</div><div class='add'>+</div><div class='add'>+M0SR:	.octa		0x0004080c05090d010a0e02060f03070b</div><div class='add'>+SR:	.octa		0x0f0e0d0c0a09080b0504070600030201</div><div class='add'>+SRM0:	.octa		0x01060b0c0207080d0304090e00050a0f</div><div class='add'>+</div><div class='add'>+M0ISR:	.octa		0x0004080c0d0105090a0e0206070b0f03</div><div class='add'>+ISR:	.octa		0x0f0e0d0c080b0a090504070602010003</div><div class='add'>+ISRM0:	.octa		0x0306090c00070a0d01040b0e0205080f</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * void aesbs_convert_key(u8 out[], u32 const rk[], int rounds)</div><div class='add'>+	 */</div><div class='add'>+ENTRY(aesbs_convert_key)</div><div class='add'>+	ld1		{v7.4s}, [x1], #16		// load round 0 key</div><div class='add'>+	ld1		{v17.4s}, [x1], #16		// load round 1 key</div><div class='add'>+</div><div class='add'>+	movi		v8.16b,  #0x01			// bit masks</div><div class='add'>+	movi		v9.16b,  #0x02</div><div class='add'>+	movi		v10.16b, #0x04</div><div class='add'>+	movi		v11.16b, #0x08</div><div class='add'>+	movi		v12.16b, #0x10</div><div class='add'>+	movi		v13.16b, #0x20</div><div class='add'>+	movi		v14.16b, #0x40</div><div class='add'>+	movi		v15.16b, #0x80</div><div class='add'>+	ldr		q16, M0</div><div class='add'>+</div><div class='add'>+	sub		x2, x2, #1</div><div class='add'>+	str		q7, [x0], #16		// save round 0 key</div><div class='add'>+</div><div class='add'>+.Lkey_loop:</div><div class='add'>+	tbl		v7.16b ,{v17.16b}, v16.16b</div><div class='add'>+	ld1		{v17.4s}, [x1], #16		// load next round key</div><div class='add'>+</div><div class='add'>+	cmtst		v0.16b, v7.16b, v8.16b</div><div class='add'>+	cmtst		v1.16b, v7.16b, v9.16b</div><div class='add'>+	cmtst		v2.16b, v7.16b, v10.16b</div><div class='add'>+	cmtst		v3.16b, v7.16b, v11.16b</div><div class='add'>+	cmtst		v4.16b, v7.16b, v12.16b</div><div class='add'>+	cmtst		v5.16b, v7.16b, v13.16b</div><div class='add'>+	cmtst		v6.16b, v7.16b, v14.16b</div><div class='add'>+	cmtst		v7.16b, v7.16b, v15.16b</div><div class='add'>+	not		v0.16b, v0.16b</div><div class='add'>+	not		v1.16b, v1.16b</div><div class='add'>+	not		v5.16b, v5.16b</div><div class='add'>+	not		v6.16b, v6.16b</div><div class='add'>+</div><div class='add'>+	subs		x2, x2, #1</div><div class='add'>+	stp		q0, q1, [x0], #128</div><div class='add'>+	stp		q2, q3, [x0, #-96]</div><div class='add'>+	stp		q4, q5, [x0, #-64]</div><div class='add'>+	stp		q6, q7, [x0, #-32]</div><div class='add'>+	b.ne		.Lkey_loop</div><div class='add'>+</div><div class='add'>+	movi		v7.16b, #0x63			// compose .L63</div><div class='add'>+	eor		v17.16b, v17.16b, v7.16b</div><div class='add'>+	str		q17, [x0]</div><div class='add'>+	ret</div><div class='add'>+ENDPROC(aesbs_convert_key)</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+aesbs_encrypt8:</div><div class='add'>+	ldr		q9, [bskey], #16		// round 0 key</div><div class='add'>+	ldr		q8, M0SR</div><div class='add'>+	ldr		q24, SR</div><div class='add'>+</div><div class='add'>+	eor		v10.16b, v0.16b, v9.16b		// xor with round0 key</div><div class='add'>+	eor		v11.16b, v1.16b, v9.16b</div><div class='add'>+	tbl		v0.16b, {v10.16b}, v8.16b</div><div class='add'>+	eor		v12.16b, v2.16b, v9.16b</div><div class='add'>+	tbl		v1.16b, {v11.16b}, v8.16b</div><div class='add'>+	eor		v13.16b, v3.16b, v9.16b</div><div class='add'>+	tbl		v2.16b, {v12.16b}, v8.16b</div><div class='add'>+	eor		v14.16b, v4.16b, v9.16b</div><div class='add'>+	tbl		v3.16b, {v13.16b}, v8.16b</div><div class='add'>+	eor		v15.16b, v5.16b, v9.16b</div><div class='add'>+	tbl		v4.16b, {v14.16b}, v8.16b</div><div class='add'>+	eor		v10.16b, v6.16b, v9.16b</div><div class='add'>+	tbl		v5.16b, {v15.16b}, v8.16b</div><div class='add'>+	eor		v11.16b, v7.16b, v9.16b</div><div class='add'>+	tbl		v6.16b, {v10.16b}, v8.16b</div><div class='add'>+	tbl		v7.16b, {v11.16b}, v8.16b</div><div class='add'>+</div><div class='add'>+	bitslice	v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11</div><div class='add'>+</div><div class='add'>+	sub		rounds, rounds, #1</div><div class='add'>+	b		.Lenc_sbox</div><div class='add'>+</div><div class='add'>+.Lenc_loop:</div><div class='add'>+	shift_rows	v0, v1, v2, v3, v4, v5, v6, v7, v24</div><div class='add'>+.Lenc_sbox:</div><div class='add'>+	sbox		v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, \</div><div class='add'>+								v13, v14, v15</div><div class='add'>+	subs		rounds, rounds, #1</div><div class='add'>+	b.cc		.Lenc_done</div><div class='add'>+</div><div class='add'>+	enc_next_rk</div><div class='add'>+</div><div class='add'>+	mix_cols	v0, v1, v4, v6, v3, v7, v2, v5, v8, v9, v10, v11, v12, \</div><div class='add'>+								v13, v14, v15</div><div class='add'>+</div><div class='add'>+	add_round_key	v0, v1, v2, v3, v4, v5, v6, v7</div><div class='add'>+</div><div class='add'>+	b.ne		.Lenc_loop</div><div class='add'>+	ldr		q24, SRM0</div><div class='add'>+	b		.Lenc_loop</div><div class='add'>+</div><div class='add'>+.Lenc_done:</div><div class='add'>+	ldr		q12, [bskey]			// last round key</div><div class='add'>+</div><div class='add'>+	bitslice	v0, v1, v4, v6, v3, v7, v2, v5, v8, v9, v10, v11</div><div class='add'>+</div><div class='add'>+	eor		v0.16b, v0.16b, v12.16b</div><div class='add'>+	eor		v1.16b, v1.16b, v12.16b</div><div class='add'>+	eor		v4.16b, v4.16b, v12.16b</div><div class='add'>+	eor		v6.16b, v6.16b, v12.16b</div><div class='add'>+	eor		v3.16b, v3.16b, v12.16b</div><div class='add'>+	eor		v7.16b, v7.16b, v12.16b</div><div class='add'>+	eor		v2.16b, v2.16b, v12.16b</div><div class='add'>+	eor		v5.16b, v5.16b, v12.16b</div><div class='add'>+	ret</div><div class='add'>+ENDPROC(aesbs_encrypt8)</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+aesbs_decrypt8:</div><div class='add'>+	lsl		x9, rounds, #7</div><div class='add'>+	add		bskey, bskey, x9</div><div class='add'>+</div><div class='add'>+	ldr		q9, [bskey, #-112]!		// round 0 key</div><div class='add'>+	ldr		q8, M0ISR</div><div class='add'>+	ldr		q24, ISR</div><div class='add'>+</div><div class='add'>+	eor		v10.16b, v0.16b, v9.16b		// xor with round0 key</div><div class='add'>+	eor		v11.16b, v1.16b, v9.16b</div><div class='add'>+	tbl		v0.16b, {v10.16b}, v8.16b</div><div class='add'>+	eor		v12.16b, v2.16b, v9.16b</div><div class='add'>+	tbl		v1.16b, {v11.16b}, v8.16b</div><div class='add'>+	eor		v13.16b, v3.16b, v9.16b</div><div class='add'>+	tbl		v2.16b, {v12.16b}, v8.16b</div><div class='add'>+	eor		v14.16b, v4.16b, v9.16b</div><div class='add'>+	tbl		v3.16b, {v13.16b}, v8.16b</div><div class='add'>+	eor		v15.16b, v5.16b, v9.16b</div><div class='add'>+	tbl		v4.16b, {v14.16b}, v8.16b</div><div class='add'>+	eor		v10.16b, v6.16b, v9.16b</div><div class='add'>+	tbl		v5.16b, {v15.16b}, v8.16b</div><div class='add'>+	eor		v11.16b, v7.16b, v9.16b</div><div class='add'>+	tbl		v6.16b, {v10.16b}, v8.16b</div><div class='add'>+	tbl		v7.16b, {v11.16b}, v8.16b</div><div class='add'>+</div><div class='add'>+	bitslice	v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11</div><div class='add'>+</div><div class='add'>+	sub		rounds, rounds, #1</div><div class='add'>+	b		.Ldec_sbox</div><div class='add'>+</div><div class='add'>+.Ldec_loop:</div><div class='add'>+	shift_rows	v0, v1, v2, v3, v4, v5, v6, v7, v24</div><div class='add'>+.Ldec_sbox:</div><div class='add'>+	inv_sbox	v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, \</div><div class='add'>+								v13, v14, v15</div><div class='add'>+	subs		rounds, rounds, #1</div><div class='add'>+	b.cc		.Ldec_done</div><div class='add'>+</div><div class='add'>+	dec_next_rk</div><div class='add'>+</div><div class='add'>+	add_round_key	v0, v1, v6, v4, v2, v7, v3, v5</div><div class='add'>+</div><div class='add'>+	inv_mix_cols	v0, v1, v6, v4, v2, v7, v3, v5, v8, v9, v10, v11, v12, \</div><div class='add'>+								v13, v14, v15</div><div class='add'>+</div><div class='add'>+	b.ne		.Ldec_loop</div><div class='add'>+	ldr		q24, ISRM0</div><div class='add'>+	b		.Ldec_loop</div><div class='add'>+.Ldec_done:</div><div class='add'>+	ldr		q12, [bskey, #-16]		// last round key</div><div class='add'>+</div><div class='add'>+	bitslice	v0, v1, v6, v4, v2, v7, v3, v5, v8, v9, v10, v11</div><div class='add'>+</div><div class='add'>+	eor		v0.16b, v0.16b, v12.16b</div><div class='add'>+	eor		v1.16b, v1.16b, v12.16b</div><div class='add'>+	eor		v6.16b, v6.16b, v12.16b</div><div class='add'>+	eor		v4.16b, v4.16b, v12.16b</div><div class='add'>+	eor		v2.16b, v2.16b, v12.16b</div><div class='add'>+	eor		v7.16b, v7.16b, v12.16b</div><div class='add'>+	eor		v3.16b, v3.16b, v12.16b</div><div class='add'>+	eor		v5.16b, v5.16b, v12.16b</div><div class='add'>+	ret</div><div class='add'>+ENDPROC(aesbs_decrypt8)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * aesbs_ecb_encrypt(u8 out[], u8 const in[], u8 const rk[], int rounds,</div><div class='add'>+	 *		     int blocks)</div><div class='add'>+	 * aesbs_ecb_decrypt(u8 out[], u8 const in[], u8 const rk[], int rounds,</div><div class='add'>+	 *		     int blocks)</div><div class='add'>+	 */</div><div class='add'>+	.macro		__ecb_crypt, do8, o0, o1, o2, o3, o4, o5, o6, o7</div><div class='add'>+	stp		x29, x30, [sp, #-16]!</div><div class='add'>+	mov		x29, sp</div><div class='add'>+</div><div class='add'>+99:	mov		x5, #1</div><div class='add'>+	lsl		x5, x5, x4</div><div class='add'>+	subs		w4, w4, #8</div><div class='add'>+	csel		x4, x4, xzr, pl</div><div class='add'>+	csel		x5, x5, xzr, mi</div><div class='add'>+</div><div class='add'>+	ld1		{v0.16b}, [x1], #16</div><div class='add'>+	tbnz		x5, #1, 0f</div><div class='add'>+	ld1		{v1.16b}, [x1], #16</div><div class='add'>+	tbnz		x5, #2, 0f</div><div class='add'>+	ld1		{v2.16b}, [x1], #16</div><div class='add'>+	tbnz		x5, #3, 0f</div><div class='add'>+	ld1		{v3.16b}, [x1], #16</div><div class='add'>+	tbnz		x5, #4, 0f</div><div class='add'>+	ld1		{v4.16b}, [x1], #16</div><div class='add'>+	tbnz		x5, #5, 0f</div><div class='add'>+	ld1		{v5.16b}, [x1], #16</div><div class='add'>+	tbnz		x5, #6, 0f</div><div class='add'>+	ld1		{v6.16b}, [x1], #16</div><div class='add'>+	tbnz		x5, #7, 0f</div><div class='add'>+	ld1		{v7.16b}, [x1], #16</div><div class='add'>+</div><div class='add'>+0:	mov		bskey, x2</div><div class='add'>+	mov		rounds, x3</div><div class='add'>+	bl		\do8</div><div class='add'>+</div><div class='add'>+	st1		{\o0\().16b}, [x0], #16</div><div class='add'>+	tbnz		x5, #1, 1f</div><div class='add'>+	st1		{\o1\().16b}, [x0], #16</div><div class='add'>+	tbnz		x5, #2, 1f</div><div class='add'>+	st1		{\o2\().16b}, [x0], #16</div><div class='add'>+	tbnz		x5, #3, 1f</div><div class='add'>+	st1		{\o3\().16b}, [x0], #16</div><div class='add'>+	tbnz		x5, #4, 1f</div><div class='add'>+	st1		{\o4\().16b}, [x0], #16</div><div class='add'>+	tbnz		x5, #5, 1f</div><div class='add'>+	st1		{\o5\().16b}, [x0], #16</div><div class='add'>+	tbnz		x5, #6, 1f</div><div class='add'>+	st1		{\o6\().16b}, [x0], #16</div><div class='add'>+	tbnz		x5, #7, 1f</div><div class='add'>+	st1		{\o7\().16b}, [x0], #16</div><div class='add'>+</div><div class='add'>+	cbnz		x4, 99b</div><div class='add'>+</div><div class='add'>+1:	ldp		x29, x30, [sp], #16</div><div class='add'>+	ret</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+ENTRY(aesbs_ecb_encrypt)</div><div class='add'>+	__ecb_crypt	aesbs_encrypt8, v0, v1, v4, v6, v3, v7, v2, v5</div><div class='add'>+ENDPROC(aesbs_ecb_encrypt)</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+ENTRY(aesbs_ecb_decrypt)</div><div class='add'>+	__ecb_crypt	aesbs_decrypt8, v0, v1, v6, v4, v2, v7, v3, v5</div><div class='add'>+ENDPROC(aesbs_ecb_decrypt)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * aesbs_cbc_decrypt(u8 out[], u8 const in[], u8 const rk[], int rounds,</div><div class='add'>+	 *		     int blocks, u8 iv[])</div><div class='add'>+	 */</div><div class='add'>+	.align		4</div><div class='add'>+ENTRY(aesbs_cbc_decrypt)</div><div class='add'>+	stp		x29, x30, [sp, #-16]!</div><div class='add'>+	mov		x29, sp</div><div class='add'>+</div><div class='add'>+99:	mov		x6, #1</div><div class='add'>+	lsl		x6, x6, x4</div><div class='add'>+	subs		w4, w4, #8</div><div class='add'>+	csel		x4, x4, xzr, pl</div><div class='add'>+	csel		x6, x6, xzr, mi</div><div class='add'>+</div><div class='add'>+	ld1		{v0.16b}, [x1], #16</div><div class='add'>+	mov		v25.16b, v0.16b</div><div class='add'>+	tbnz		x6, #1, 0f</div><div class='add'>+	ld1		{v1.16b}, [x1], #16</div><div class='add'>+	mov		v26.16b, v1.16b</div><div class='add'>+	tbnz		x6, #2, 0f</div><div class='add'>+	ld1		{v2.16b}, [x1], #16</div><div class='add'>+	mov		v27.16b, v2.16b</div><div class='add'>+	tbnz		x6, #3, 0f</div><div class='add'>+	ld1		{v3.16b}, [x1], #16</div><div class='add'>+	mov		v28.16b, v3.16b</div><div class='add'>+	tbnz		x6, #4, 0f</div><div class='add'>+	ld1		{v4.16b}, [x1], #16</div><div class='add'>+	mov		v29.16b, v4.16b</div><div class='add'>+	tbnz		x6, #5, 0f</div><div class='add'>+	ld1		{v5.16b}, [x1], #16</div><div class='add'>+	mov		v30.16b, v5.16b</div><div class='add'>+	tbnz		x6, #6, 0f</div><div class='add'>+	ld1		{v6.16b}, [x1], #16</div><div class='add'>+	mov		v31.16b, v6.16b</div><div class='add'>+	tbnz		x6, #7, 0f</div><div class='add'>+	ld1		{v7.16b}, [x1]</div><div class='add'>+</div><div class='add'>+0:	mov		bskey, x2</div><div class='add'>+	mov		rounds, x3</div><div class='add'>+	bl		aesbs_decrypt8</div><div class='add'>+</div><div class='add'>+	ld1		{v24.16b}, [x5]			// load IV</div><div class='add'>+</div><div class='add'>+	eor		v1.16b, v1.16b, v25.16b</div><div class='add'>+	eor		v6.16b, v6.16b, v26.16b</div><div class='add'>+	eor		v4.16b, v4.16b, v27.16b</div><div class='add'>+	eor		v2.16b, v2.16b, v28.16b</div><div class='add'>+	eor		v7.16b, v7.16b, v29.16b</div><div class='add'>+	eor		v0.16b, v0.16b, v24.16b</div><div class='add'>+	eor		v3.16b, v3.16b, v30.16b</div><div class='add'>+	eor		v5.16b, v5.16b, v31.16b</div><div class='add'>+</div><div class='add'>+	st1		{v0.16b}, [x0], #16</div><div class='add'>+	mov		v24.16b, v25.16b</div><div class='add'>+	tbnz		x6, #1, 1f</div><div class='add'>+	st1		{v1.16b}, [x0], #16</div><div class='add'>+	mov		v24.16b, v26.16b</div><div class='add'>+	tbnz		x6, #2, 1f</div><div class='add'>+	st1		{v6.16b}, [x0], #16</div><div class='add'>+	mov		v24.16b, v27.16b</div><div class='add'>+	tbnz		x6, #3, 1f</div><div class='add'>+	st1		{v4.16b}, [x0], #16</div><div class='add'>+	mov		v24.16b, v28.16b</div><div class='add'>+	tbnz		x6, #4, 1f</div><div class='add'>+	st1		{v2.16b}, [x0], #16</div><div class='add'>+	mov		v24.16b, v29.16b</div><div class='add'>+	tbnz		x6, #5, 1f</div><div class='add'>+	st1		{v7.16b}, [x0], #16</div><div class='add'>+	mov		v24.16b, v30.16b</div><div class='add'>+	tbnz		x6, #6, 1f</div><div class='add'>+	st1		{v3.16b}, [x0], #16</div><div class='add'>+	mov		v24.16b, v31.16b</div><div class='add'>+	tbnz		x6, #7, 1f</div><div class='add'>+	ld1		{v24.16b}, [x1], #16</div><div class='add'>+	st1		{v5.16b}, [x0], #16</div><div class='add'>+1:	st1		{v24.16b}, [x5]			// store IV</div><div class='add'>+</div><div class='add'>+	cbnz		x4, 99b</div><div class='add'>+</div><div class='add'>+	ldp		x29, x30, [sp], #16</div><div class='add'>+	ret</div><div class='add'>+ENDPROC(aesbs_cbc_decrypt)</div><div class='add'>+</div><div class='add'>+	.macro		next_tweak, out, in, const, tmp</div><div class='add'>+	sshr		\tmp\().2d,  \in\().2d,   #63</div><div class='add'>+	and		\tmp\().16b, \tmp\().16b, \const\().16b</div><div class='add'>+	add		\out\().2d,  \in\().2d,   \in\().2d</div><div class='add'>+	ext		\tmp\().16b, \tmp\().16b, \tmp\().16b, #8</div><div class='add'>+	eor		\out\().16b, \out\().16b, \tmp\().16b</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.align		4</div><div class='add'>+.Lxts_mul_x:</div><div class='add'>+CPU_LE(	.quad		1, 0x87		)</div><div class='add'>+CPU_BE(	.quad		0x87, 1		)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * aesbs_xts_encrypt(u8 out[], u8 const in[], u8 const rk[], int rounds,</div><div class='add'>+	 *		     int blocks, u8 iv[])</div><div class='add'>+	 * aesbs_xts_decrypt(u8 out[], u8 const in[], u8 const rk[], int rounds,</div><div class='add'>+	 *		     int blocks, u8 iv[])</div><div class='add'>+	 */</div><div class='add'>+__xts_crypt8:</div><div class='add'>+	mov		x6, #1</div><div class='add'>+	lsl		x6, x6, x4</div><div class='add'>+	subs		w4, w4, #8</div><div class='add'>+	csel		x4, x4, xzr, pl</div><div class='add'>+	csel		x6, x6, xzr, mi</div><div class='add'>+</div><div class='add'>+	ld1		{v0.16b}, [x1], #16</div><div class='add'>+	next_tweak	v26, v25, v30, v31</div><div class='add'>+	eor		v0.16b, v0.16b, v25.16b</div><div class='add'>+	tbnz		x6, #1, 0f</div><div class='add'>+</div><div class='add'>+	ld1		{v1.16b}, [x1], #16</div><div class='add'>+	next_tweak	v27, v26, v30, v31</div><div class='add'>+	eor		v1.16b, v1.16b, v26.16b</div><div class='add'>+	tbnz		x6, #2, 0f</div><div class='add'>+</div><div class='add'>+	ld1		{v2.16b}, [x1], #16</div><div class='add'>+	next_tweak	v28, v27, v30, v31</div><div class='add'>+	eor		v2.16b, v2.16b, v27.16b</div><div class='add'>+	tbnz		x6, #3, 0f</div><div class='add'>+</div><div class='add'>+	ld1		{v3.16b}, [x1], #16</div><div class='add'>+	next_tweak	v29, v28, v30, v31</div><div class='add'>+	eor		v3.16b, v3.16b, v28.16b</div><div class='add'>+	tbnz		x6, #4, 0f</div><div class='add'>+</div><div class='add'>+	ld1		{v4.16b}, [x1], #16</div><div class='add'>+	str		q29, [sp, #16]</div><div class='add'>+	eor		v4.16b, v4.16b, v29.16b</div><div class='add'>+	next_tweak	v29, v29, v30, v31</div><div class='add'>+	tbnz		x6, #5, 0f</div><div class='add'>+</div><div class='add'>+	ld1		{v5.16b}, [x1], #16</div><div class='add'>+	str		q29, [sp, #32]</div><div class='add'>+	eor		v5.16b, v5.16b, v29.16b</div><div class='add'>+	next_tweak	v29, v29, v30, v31</div><div class='add'>+	tbnz		x6, #6, 0f</div><div class='add'>+</div><div class='add'>+	ld1		{v6.16b}, [x1], #16</div><div class='add'>+	str		q29, [sp, #48]</div><div class='add'>+	eor		v6.16b, v6.16b, v29.16b</div><div class='add'>+	next_tweak	v29, v29, v30, v31</div><div class='add'>+	tbnz		x6, #7, 0f</div><div class='add'>+</div><div class='add'>+	ld1		{v7.16b}, [x1], #16</div><div class='add'>+	str		q29, [sp, #64]</div><div class='add'>+	eor		v7.16b, v7.16b, v29.16b</div><div class='add'>+	next_tweak	v29, v29, v30, v31</div><div class='add'>+</div><div class='add'>+0:	mov		bskey, x2</div><div class='add'>+	mov		rounds, x3</div><div class='add'>+	br		x7</div><div class='add'>+ENDPROC(__xts_crypt8)</div><div class='add'>+</div><div class='add'>+	.macro		__xts_crypt, do8, o0, o1, o2, o3, o4, o5, o6, o7</div><div class='add'>+	stp		x29, x30, [sp, #-80]!</div><div class='add'>+	mov		x29, sp</div><div class='add'>+</div><div class='add'>+	ldr		q30, .Lxts_mul_x</div><div class='add'>+	ld1		{v25.16b}, [x5]</div><div class='add'>+</div><div class='add'>+99:	adr		x7, \do8</div><div class='add'>+	bl		__xts_crypt8</div><div class='add'>+</div><div class='add'>+	ldp		q16, q17, [sp, #16]</div><div class='add'>+	ldp		q18, q19, [sp, #48]</div><div class='add'>+</div><div class='add'>+	eor		\o0\().16b, \o0\().16b, v25.16b</div><div class='add'>+	eor		\o1\().16b, \o1\().16b, v26.16b</div><div class='add'>+	eor		\o2\().16b, \o2\().16b, v27.16b</div><div class='add'>+	eor		\o3\().16b, \o3\().16b, v28.16b</div><div class='add'>+</div><div class='add'>+	st1		{\o0\().16b}, [x0], #16</div><div class='add'>+	mov		v25.16b, v26.16b</div><div class='add'>+	tbnz		x6, #1, 1f</div><div class='add'>+	st1		{\o1\().16b}, [x0], #16</div><div class='add'>+	mov		v25.16b, v27.16b</div><div class='add'>+	tbnz		x6, #2, 1f</div><div class='add'>+	st1		{\o2\().16b}, [x0], #16</div><div class='add'>+	mov		v25.16b, v28.16b</div><div class='add'>+	tbnz		x6, #3, 1f</div><div class='add'>+	st1		{\o3\().16b}, [x0], #16</div><div class='add'>+	mov		v25.16b, v29.16b</div><div class='add'>+	tbnz		x6, #4, 1f</div><div class='add'>+</div><div class='add'>+	eor		\o4\().16b, \o4\().16b, v16.16b</div><div class='add'>+	eor		\o5\().16b, \o5\().16b, v17.16b</div><div class='add'>+	eor		\o6\().16b, \o6\().16b, v18.16b</div><div class='add'>+	eor		\o7\().16b, \o7\().16b, v19.16b</div><div class='add'>+</div><div class='add'>+	st1		{\o4\().16b}, [x0], #16</div><div class='add'>+	tbnz		x6, #5, 1f</div><div class='add'>+	st1		{\o5\().16b}, [x0], #16</div><div class='add'>+	tbnz		x6, #6, 1f</div><div class='add'>+	st1		{\o6\().16b}, [x0], #16</div><div class='add'>+	tbnz		x6, #7, 1f</div><div class='add'>+	st1		{\o7\().16b}, [x0], #16</div><div class='add'>+</div><div class='add'>+	cbnz		x4, 99b</div><div class='add'>+</div><div class='add'>+1:	st1		{v25.16b}, [x5]</div><div class='add'>+	ldp		x29, x30, [sp], #80</div><div class='add'>+	ret</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+ENTRY(aesbs_xts_encrypt)</div><div class='add'>+	__xts_crypt	aesbs_encrypt8, v0, v1, v4, v6, v3, v7, v2, v5</div><div class='add'>+ENDPROC(aesbs_xts_encrypt)</div><div class='add'>+</div><div class='add'>+ENTRY(aesbs_xts_decrypt)</div><div class='add'>+	__xts_crypt	aesbs_decrypt8, v0, v1, v6, v4, v2, v7, v3, v5</div><div class='add'>+ENDPROC(aesbs_xts_decrypt)</div><div class='add'>+</div><div class='add'>+	.macro		next_ctr, v</div><div class='add'>+	mov		\v\().d[1], x8</div><div class='add'>+	adds		x8, x8, #1</div><div class='add'>+	mov		\v\().d[0], x7</div><div class='add'>+	adc		x7, x7, xzr</div><div class='add'>+	rev64		\v\().16b, \v\().16b</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * aesbs_ctr_encrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+	 *		     int rounds, int blocks, u8 iv[], u8 final[])</div><div class='add'>+	 */</div><div class='add'>+ENTRY(aesbs_ctr_encrypt)</div><div class='add'>+	stp		x29, x30, [sp, #-16]!</div><div class='add'>+	mov		x29, sp</div><div class='add'>+</div><div class='add'>+	cmp		x6, #0</div><div class='add'>+	cset		x10, ne</div><div class='add'>+	add		x4, x4, x10		// do one extra block if final</div><div class='add'>+</div><div class='add'>+	ldp		x7, x8, [x5]</div><div class='add'>+	ld1		{v0.16b}, [x5]</div><div class='add'>+CPU_LE(	rev		x7, x7		)</div><div class='add'>+CPU_LE(	rev		x8, x8		)</div><div class='add'>+	adds		x8, x8, #1</div><div class='add'>+	adc		x7, x7, xzr</div><div class='add'>+</div><div class='add'>+99:	mov		x9, #1</div><div class='add'>+	lsl		x9, x9, x4</div><div class='add'>+	subs		w4, w4, #8</div><div class='add'>+	csel		x4, x4, xzr, pl</div><div class='add'>+	csel		x9, x9, xzr, le</div><div class='add'>+</div><div class='add'>+	tbnz		x9, #1, 0f</div><div class='add'>+	next_ctr	v1</div><div class='add'>+	tbnz		x9, #2, 0f</div><div class='add'>+	next_ctr	v2</div><div class='add'>+	tbnz		x9, #3, 0f</div><div class='add'>+	next_ctr	v3</div><div class='add'>+	tbnz		x9, #4, 0f</div><div class='add'>+	next_ctr	v4</div><div class='add'>+	tbnz		x9, #5, 0f</div><div class='add'>+	next_ctr	v5</div><div class='add'>+	tbnz		x9, #6, 0f</div><div class='add'>+	next_ctr	v6</div><div class='add'>+	tbnz		x9, #7, 0f</div><div class='add'>+	next_ctr	v7</div><div class='add'>+</div><div class='add'>+0:	mov		bskey, x2</div><div class='add'>+	mov		rounds, x3</div><div class='add'>+	bl		aesbs_encrypt8</div><div class='add'>+</div><div class='add'>+	lsr		x9, x9, x10		// disregard the extra block</div><div class='add'>+	tbnz		x9, #0, 0f</div><div class='add'>+</div><div class='add'>+	ld1		{v8.16b}, [x1], #16</div><div class='add'>+	eor		v0.16b, v0.16b, v8.16b</div><div class='add'>+	st1		{v0.16b}, [x0], #16</div><div class='add'>+	tbnz		x9, #1, 1f</div><div class='add'>+</div><div class='add'>+	ld1		{v9.16b}, [x1], #16</div><div class='add'>+	eor		v1.16b, v1.16b, v9.16b</div><div class='add'>+	st1		{v1.16b}, [x0], #16</div><div class='add'>+	tbnz		x9, #2, 2f</div><div class='add'>+</div><div class='add'>+	ld1		{v10.16b}, [x1], #16</div><div class='add'>+	eor		v4.16b, v4.16b, v10.16b</div><div class='add'>+	st1		{v4.16b}, [x0], #16</div><div class='add'>+	tbnz		x9, #3, 3f</div><div class='add'>+</div><div class='add'>+	ld1		{v11.16b}, [x1], #16</div><div class='add'>+	eor		v6.16b, v6.16b, v11.16b</div><div class='add'>+	st1		{v6.16b}, [x0], #16</div><div class='add'>+	tbnz		x9, #4, 4f</div><div class='add'>+</div><div class='add'>+	ld1		{v12.16b}, [x1], #16</div><div class='add'>+	eor		v3.16b, v3.16b, v12.16b</div><div class='add'>+	st1		{v3.16b}, [x0], #16</div><div class='add'>+	tbnz		x9, #5, 5f</div><div class='add'>+</div><div class='add'>+	ld1		{v13.16b}, [x1], #16</div><div class='add'>+	eor		v7.16b, v7.16b, v13.16b</div><div class='add'>+	st1		{v7.16b}, [x0], #16</div><div class='add'>+	tbnz		x9, #6, 6f</div><div class='add'>+</div><div class='add'>+	ld1		{v14.16b}, [x1], #16</div><div class='add'>+	eor		v2.16b, v2.16b, v14.16b</div><div class='add'>+	st1		{v2.16b}, [x0], #16</div><div class='add'>+	tbnz		x9, #7, 7f</div><div class='add'>+</div><div class='add'>+	ld1		{v15.16b}, [x1], #16</div><div class='add'>+	eor		v5.16b, v5.16b, v15.16b</div><div class='add'>+	st1		{v5.16b}, [x0], #16</div><div class='add'>+</div><div class='add'>+8:	next_ctr	v0</div><div class='add'>+	cbnz		x4, 99b</div><div class='add'>+</div><div class='add'>+0:	st1		{v0.16b}, [x5]</div><div class='add'>+	ldp		x29, x30, [sp], #16</div><div class='add'>+	ret</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are handling the tail of the input (x6 != NULL), return the</div><div class='add'>+	 * final keystream block back to the caller.</div><div class='add'>+	 */</div><div class='add'>+1:	cbz		x6, 8b</div><div class='add'>+	st1		{v1.16b}, [x6]</div><div class='add'>+	b		8b</div><div class='add'>+2:	cbz		x6, 8b</div><div class='add'>+	st1		{v4.16b}, [x6]</div><div class='add'>+	b		8b</div><div class='add'>+3:	cbz		x6, 8b</div><div class='add'>+	st1		{v6.16b}, [x6]</div><div class='add'>+	b		8b</div><div class='add'>+4:	cbz		x6, 8b</div><div class='add'>+	st1		{v3.16b}, [x6]</div><div class='add'>+	b		8b</div><div class='add'>+5:	cbz		x6, 8b</div><div class='add'>+	st1		{v7.16b}, [x6]</div><div class='add'>+	b		8b</div><div class='add'>+6:	cbz		x6, 8b</div><div class='add'>+	st1		{v2.16b}, [x6]</div><div class='add'>+	b		8b</div><div class='add'>+7:	cbz		x6, 8b</div><div class='add'>+	st1		{v5.16b}, [x6]</div><div class='add'>+	b		8b</div><div class='add'>+ENDPROC(aesbs_ctr_encrypt)</div><div class='head'>diff --git a/arch/arm64/crypto/aes-neonbs-glue.c b/arch/arm64/crypto/aes-neonbs-glue.c<br/>new file mode 100644<br/>index 000000000000..db2501d93550<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/aes-neonbs-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/aes-neonbs-glue.c</a></div><div class='hunk'>@@ -0,0 +1,439 @@</div><div class='add'>+/*</div><div class='add'>+ * Bit sliced AES using NEON instructions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/neon.h&gt;</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/xts.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS_CRYPTO("ecb(aes)");</div><div class='add'>+MODULE_ALIAS_CRYPTO("cbc(aes)");</div><div class='add'>+MODULE_ALIAS_CRYPTO("ctr(aes)");</div><div class='add'>+MODULE_ALIAS_CRYPTO("xts(aes)");</div><div class='add'>+</div><div class='add'>+asmlinkage void aesbs_convert_key(u8 out[], u32 const rk[], int rounds);</div><div class='add'>+</div><div class='add'>+asmlinkage void aesbs_ecb_encrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks);</div><div class='add'>+asmlinkage void aesbs_ecb_decrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks);</div><div class='add'>+</div><div class='add'>+asmlinkage void aesbs_cbc_decrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks, u8 iv[]);</div><div class='add'>+</div><div class='add'>+asmlinkage void aesbs_ctr_encrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks, u8 iv[], u8 final[]);</div><div class='add'>+</div><div class='add'>+asmlinkage void aesbs_xts_encrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks, u8 iv[]);</div><div class='add'>+asmlinkage void aesbs_xts_decrypt(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks, u8 iv[]);</div><div class='add'>+</div><div class='add'>+/* borrowed from aes-neon-blk.ko */</div><div class='add'>+asmlinkage void neon_aes_ecb_encrypt(u8 out[], u8 const in[], u32 const rk[],</div><div class='add'>+				     int rounds, int blocks, int first);</div><div class='add'>+asmlinkage void neon_aes_cbc_encrypt(u8 out[], u8 const in[], u32 const rk[],</div><div class='add'>+				     int rounds, int blocks, u8 iv[],</div><div class='add'>+				     int first);</div><div class='add'>+</div><div class='add'>+struct aesbs_ctx {</div><div class='add'>+	u8	rk[13 * (8 * AES_BLOCK_SIZE) + 32];</div><div class='add'>+	int	rounds;</div><div class='add'>+} __aligned(AES_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+struct aesbs_cbc_ctx {</div><div class='add'>+	struct aesbs_ctx	key;</div><div class='add'>+	u32			enc[AES_MAX_KEYLENGTH_U32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aesbs_xts_ctx {</div><div class='add'>+	struct aesbs_ctx	key;</div><div class='add'>+	u32			twkey[AES_MAX_KEYLENGTH_U32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int aesbs_setkey(struct crypto_skcipher *tfm, const u8 *in_key,</div><div class='add'>+			unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct aesbs_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_aes_ctx rk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_aes_expand_key(&amp;rk, in_key, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;rounds = 6 + key_len / 4;</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	aesbs_convert_key(ctx-&gt;rk, rk.key_enc, ctx-&gt;rounds);</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ecb_crypt(struct skcipher_request *req,</div><div class='add'>+		       void (*fn)(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks))</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct aesbs_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	while (walk.nbytes &gt;= AES_BLOCK_SIZE) {</div><div class='add'>+		unsigned int blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+		if (walk.nbytes &lt; walk.total)</div><div class='add'>+			blocks = round_down(blocks,</div><div class='add'>+					    walk.stride / AES_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+		fn(walk.dst.virt.addr, walk.src.virt.addr, ctx-&gt;rk,</div><div class='add'>+		   ctx-&gt;rounds, blocks);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk,</div><div class='add'>+					 walk.nbytes - blocks * AES_BLOCK_SIZE);</div><div class='add'>+	}</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_encrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return __ecb_crypt(req, aesbs_ecb_encrypt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_decrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return __ecb_crypt(req, aesbs_ecb_decrypt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aesbs_cbc_setkey(struct crypto_skcipher *tfm, const u8 *in_key,</div><div class='add'>+			    unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_aes_ctx rk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_aes_expand_key(&amp;rk, in_key, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;key.rounds = 6 + key_len / 4;</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;enc, rk.key_enc, sizeof(ctx-&gt;enc));</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	aesbs_convert_key(ctx-&gt;key.rk, rk.key_enc, ctx-&gt;key.rounds);</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbc_encrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	int err, first = 1;</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	while (walk.nbytes &gt;= AES_BLOCK_SIZE) {</div><div class='add'>+		unsigned int blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+		/* fall back to the non-bitsliced NEON implementation */</div><div class='add'>+		neon_aes_cbc_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='add'>+				     ctx-&gt;enc, ctx-&gt;key.rounds, blocks, walk.iv,</div><div class='add'>+				     first);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes % AES_BLOCK_SIZE);</div><div class='add'>+		first = 0;</div><div class='add'>+	}</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbc_decrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	while (walk.nbytes &gt;= AES_BLOCK_SIZE) {</div><div class='add'>+		unsigned int blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+		if (walk.nbytes &lt; walk.total)</div><div class='add'>+			blocks = round_down(blocks,</div><div class='add'>+					    walk.stride / AES_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+		aesbs_cbc_decrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='add'>+				  ctx-&gt;key.rk, ctx-&gt;key.rounds, blocks,</div><div class='add'>+				  walk.iv);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk,</div><div class='add'>+					 walk.nbytes - blocks * AES_BLOCK_SIZE);</div><div class='add'>+	}</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctr_encrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct aesbs_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	u8 buf[AES_BLOCK_SIZE];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	while (walk.nbytes &gt; 0) {</div><div class='add'>+		unsigned int blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='add'>+		u8 *final = (walk.total % AES_BLOCK_SIZE) ? buf : NULL;</div><div class='add'>+</div><div class='add'>+		if (walk.nbytes &lt; walk.total) {</div><div class='add'>+			blocks = round_down(blocks,</div><div class='add'>+					    walk.stride / AES_BLOCK_SIZE);</div><div class='add'>+			final = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		aesbs_ctr_encrypt(walk.dst.virt.addr, walk.src.virt.addr,</div><div class='add'>+				  ctx-&gt;rk, ctx-&gt;rounds, blocks, walk.iv, final);</div><div class='add'>+</div><div class='add'>+		if (final) {</div><div class='add'>+			u8 *dst = walk.dst.virt.addr + blocks * AES_BLOCK_SIZE;</div><div class='add'>+			u8 *src = walk.src.virt.addr + blocks * AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+			if (dst != src)</div><div class='add'>+				memcpy(dst, src, walk.total % AES_BLOCK_SIZE);</div><div class='add'>+			crypto_xor(dst, final, walk.total % AES_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+			err = skcipher_walk_done(&amp;walk, 0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		err = skcipher_walk_done(&amp;walk,</div><div class='add'>+					 walk.nbytes - blocks * AES_BLOCK_SIZE);</div><div class='add'>+	}</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,</div><div class='add'>+			    unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct aesbs_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_aes_ctx rk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = xts_verify_key(tfm, in_key, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	key_len /= 2;</div><div class='add'>+	err = crypto_aes_expand_key(&amp;rk, in_key + key_len, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;twkey, rk.key_enc, sizeof(ctx-&gt;twkey));</div><div class='add'>+</div><div class='add'>+	return aesbs_setkey(tfm, in_key, key_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __xts_crypt(struct skcipher_request *req,</div><div class='add'>+		       void (*fn)(u8 out[], u8 const in[], u8 const rk[],</div><div class='add'>+				  int rounds, int blocks, u8 iv[]))</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct aesbs_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+</div><div class='add'>+	neon_aes_ecb_encrypt(walk.iv, walk.iv, ctx-&gt;twkey,</div><div class='add'>+			     ctx-&gt;key.rounds, 1, 1);</div><div class='add'>+</div><div class='add'>+	while (walk.nbytes &gt;= AES_BLOCK_SIZE) {</div><div class='add'>+		unsigned int blocks = walk.nbytes / AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+		if (walk.nbytes &lt; walk.total)</div><div class='add'>+			blocks = round_down(blocks,</div><div class='add'>+					    walk.stride / AES_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+		fn(walk.dst.virt.addr, walk.src.virt.addr, ctx-&gt;key.rk,</div><div class='add'>+		   ctx-&gt;key.rounds, blocks, walk.iv);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk,</div><div class='add'>+					 walk.nbytes - blocks * AES_BLOCK_SIZE);</div><div class='add'>+	}</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_encrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return __xts_crypt(req, aesbs_xts_encrypt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_decrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return __xts_crypt(req, aesbs_xts_decrypt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct skcipher_alg aes_algs[] = { {</div><div class='add'>+	.base.cra_name		= "__ecb(aes)",</div><div class='add'>+	.base.cra_driver_name	= "__ecb-aes-neonbs",</div><div class='add'>+	.base.cra_priority	= 250,</div><div class='add'>+	.base.cra_blocksize	= AES_BLOCK_SIZE,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct aesbs_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize		= AES_MAX_KEY_SIZE,</div><div class='add'>+	.walksize		= 8 * AES_BLOCK_SIZE,</div><div class='add'>+	.setkey			= aesbs_setkey,</div><div class='add'>+	.encrypt		= ecb_encrypt,</div><div class='add'>+	.decrypt		= ecb_decrypt,</div><div class='add'>+}, {</div><div class='add'>+	.base.cra_name		= "__cbc(aes)",</div><div class='add'>+	.base.cra_driver_name	= "__cbc-aes-neonbs",</div><div class='add'>+	.base.cra_priority	= 250,</div><div class='add'>+	.base.cra_blocksize	= AES_BLOCK_SIZE,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct aesbs_cbc_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize		= AES_MAX_KEY_SIZE,</div><div class='add'>+	.walksize		= 8 * AES_BLOCK_SIZE,</div><div class='add'>+	.ivsize			= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey			= aesbs_cbc_setkey,</div><div class='add'>+	.encrypt		= cbc_encrypt,</div><div class='add'>+	.decrypt		= cbc_decrypt,</div><div class='add'>+}, {</div><div class='add'>+	.base.cra_name		= "__ctr(aes)",</div><div class='add'>+	.base.cra_driver_name	= "__ctr-aes-neonbs",</div><div class='add'>+	.base.cra_priority	= 250,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct aesbs_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize		= AES_MAX_KEY_SIZE,</div><div class='add'>+	.chunksize		= AES_BLOCK_SIZE,</div><div class='add'>+	.walksize		= 8 * AES_BLOCK_SIZE,</div><div class='add'>+	.ivsize			= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey			= aesbs_setkey,</div><div class='add'>+	.encrypt		= ctr_encrypt,</div><div class='add'>+	.decrypt		= ctr_encrypt,</div><div class='add'>+}, {</div><div class='add'>+	.base.cra_name		= "ctr(aes)",</div><div class='add'>+	.base.cra_driver_name	= "ctr-aes-neonbs",</div><div class='add'>+	.base.cra_priority	= 250 - 1,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct aesbs_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize		= AES_MAX_KEY_SIZE,</div><div class='add'>+	.chunksize		= AES_BLOCK_SIZE,</div><div class='add'>+	.walksize		= 8 * AES_BLOCK_SIZE,</div><div class='add'>+	.ivsize			= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey			= aesbs_setkey,</div><div class='add'>+	.encrypt		= ctr_encrypt,</div><div class='add'>+	.decrypt		= ctr_encrypt,</div><div class='add'>+}, {</div><div class='add'>+	.base.cra_name		= "__xts(aes)",</div><div class='add'>+	.base.cra_driver_name	= "__xts-aes-neonbs",</div><div class='add'>+	.base.cra_priority	= 250,</div><div class='add'>+	.base.cra_blocksize	= AES_BLOCK_SIZE,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct aesbs_xts_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= 2 * AES_MIN_KEY_SIZE,</div><div class='add'>+	.max_keysize		= 2 * AES_MAX_KEY_SIZE,</div><div class='add'>+	.walksize		= 8 * AES_BLOCK_SIZE,</div><div class='add'>+	.ivsize			= AES_BLOCK_SIZE,</div><div class='add'>+	.setkey			= aesbs_xts_setkey,</div><div class='add'>+	.encrypt		= xts_encrypt,</div><div class='add'>+	.decrypt		= xts_decrypt,</div><div class='add'>+} };</div><div class='add'>+</div><div class='add'>+static struct simd_skcipher_alg *aes_simd_algs[ARRAY_SIZE(aes_algs)];</div><div class='add'>+</div><div class='add'>+static void aes_exit(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aes_simd_algs); i++)</div><div class='add'>+		if (aes_simd_algs[i])</div><div class='add'>+			simd_skcipher_free(aes_simd_algs[i]);</div><div class='add'>+</div><div class='add'>+	crypto_unregister_skciphers(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init aes_init(void)</div><div class='add'>+{</div><div class='add'>+	struct simd_skcipher_alg *simd;</div><div class='add'>+	const char *basename;</div><div class='add'>+	const char *algname;</div><div class='add'>+	const char *drvname;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!(elf_hwcap &amp; HWCAP_ASIMD))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_skciphers(aes_algs, ARRAY_SIZE(aes_algs));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aes_algs); i++) {</div><div class='add'>+		if (!(aes_algs[i].base.cra_flags &amp; CRYPTO_ALG_INTERNAL))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		algname = aes_algs[i].base.cra_name + 2;</div><div class='add'>+		drvname = aes_algs[i].base.cra_driver_name + 2;</div><div class='add'>+		basename = aes_algs[i].base.cra_driver_name;</div><div class='add'>+		simd = simd_skcipher_create_compat(algname, drvname, basename);</div><div class='add'>+		err = PTR_ERR(simd);</div><div class='add'>+		if (IS_ERR(simd))</div><div class='add'>+			goto unregister_simds;</div><div class='add'>+</div><div class='add'>+		aes_simd_algs[i] = simd;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unregister_simds:</div><div class='add'>+	aes_exit();</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(aes_init);</div><div class='add'>+module_exit(aes_exit);</div><div class='head'>diff --git a/arch/arm64/crypto/chacha20-neon-core.S b/arch/arm64/crypto/chacha20-neon-core.S<br/>new file mode 100644<br/>index 000000000000..13c85e272c2a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/chacha20-neon-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/chacha20-neon-core.S</a></div><div class='hunk'>@@ -0,0 +1,450 @@</div><div class='add'>+/*</div><div class='add'>+ * ChaCha20 256-bit cipher algorithm, RFC7539, arm64 NEON functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro, Ltd. &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Based on:</div><div class='add'>+ * ChaCha20 256-bit cipher algorithm, RFC7539, x64 SSSE3 functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015 Martin Willi</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+	.align		6</div><div class='add'>+</div><div class='add'>+ENTRY(chacha20_block_xor_neon)</div><div class='add'>+	// x0: Input state matrix, s</div><div class='add'>+	// x1: 1 data block output, o</div><div class='add'>+	// x2: 1 data block input, i</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// This function encrypts one ChaCha20 block by loading the state matrix</div><div class='add'>+	// in four NEON registers. It performs matrix operation on four words in</div><div class='add'>+	// parallel, but requires shuffling to rearrange the words after each</div><div class='add'>+	// round.</div><div class='add'>+	//</div><div class='add'>+</div><div class='add'>+	// x0..3 = s0..3</div><div class='add'>+	adr		x3, ROT8</div><div class='add'>+	ld1		{v0.4s-v3.4s}, [x0]</div><div class='add'>+	ld1		{v8.4s-v11.4s}, [x0]</div><div class='add'>+	ld1		{v12.4s}, [x3]</div><div class='add'>+</div><div class='add'>+	mov		x3, #10</div><div class='add'>+</div><div class='add'>+.Ldoubleround:</div><div class='add'>+	// x0 += x1, x3 = rotl32(x3 ^ x0, 16)</div><div class='add'>+	add		v0.4s, v0.4s, v1.4s</div><div class='add'>+	eor		v3.16b, v3.16b, v0.16b</div><div class='add'>+	rev32		v3.8h, v3.8h</div><div class='add'>+</div><div class='add'>+	// x2 += x3, x1 = rotl32(x1 ^ x2, 12)</div><div class='add'>+	add		v2.4s, v2.4s, v3.4s</div><div class='add'>+	eor		v4.16b, v1.16b, v2.16b</div><div class='add'>+	shl		v1.4s, v4.4s, #12</div><div class='add'>+	sri		v1.4s, v4.4s, #20</div><div class='add'>+</div><div class='add'>+	// x0 += x1, x3 = rotl32(x3 ^ x0, 8)</div><div class='add'>+	add		v0.4s, v0.4s, v1.4s</div><div class='add'>+	eor		v3.16b, v3.16b, v0.16b</div><div class='add'>+	tbl		v3.16b, {v3.16b}, v12.16b</div><div class='add'>+</div><div class='add'>+	// x2 += x3, x1 = rotl32(x1 ^ x2, 7)</div><div class='add'>+	add		v2.4s, v2.4s, v3.4s</div><div class='add'>+	eor		v4.16b, v1.16b, v2.16b</div><div class='add'>+	shl		v1.4s, v4.4s, #7</div><div class='add'>+	sri		v1.4s, v4.4s, #25</div><div class='add'>+</div><div class='add'>+	// x1 = shuffle32(x1, MASK(0, 3, 2, 1))</div><div class='add'>+	ext		v1.16b, v1.16b, v1.16b, #4</div><div class='add'>+	// x2 = shuffle32(x2, MASK(1, 0, 3, 2))</div><div class='add'>+	ext		v2.16b, v2.16b, v2.16b, #8</div><div class='add'>+	// x3 = shuffle32(x3, MASK(2, 1, 0, 3))</div><div class='add'>+	ext		v3.16b, v3.16b, v3.16b, #12</div><div class='add'>+</div><div class='add'>+	// x0 += x1, x3 = rotl32(x3 ^ x0, 16)</div><div class='add'>+	add		v0.4s, v0.4s, v1.4s</div><div class='add'>+	eor		v3.16b, v3.16b, v0.16b</div><div class='add'>+	rev32		v3.8h, v3.8h</div><div class='add'>+</div><div class='add'>+	// x2 += x3, x1 = rotl32(x1 ^ x2, 12)</div><div class='add'>+	add		v2.4s, v2.4s, v3.4s</div><div class='add'>+	eor		v4.16b, v1.16b, v2.16b</div><div class='add'>+	shl		v1.4s, v4.4s, #12</div><div class='add'>+	sri		v1.4s, v4.4s, #20</div><div class='add'>+</div><div class='add'>+	// x0 += x1, x3 = rotl32(x3 ^ x0, 8)</div><div class='add'>+	add		v0.4s, v0.4s, v1.4s</div><div class='add'>+	eor		v3.16b, v3.16b, v0.16b</div><div class='add'>+	tbl		v3.16b, {v3.16b}, v12.16b</div><div class='add'>+</div><div class='add'>+	// x2 += x3, x1 = rotl32(x1 ^ x2, 7)</div><div class='add'>+	add		v2.4s, v2.4s, v3.4s</div><div class='add'>+	eor		v4.16b, v1.16b, v2.16b</div><div class='add'>+	shl		v1.4s, v4.4s, #7</div><div class='add'>+	sri		v1.4s, v4.4s, #25</div><div class='add'>+</div><div class='add'>+	// x1 = shuffle32(x1, MASK(2, 1, 0, 3))</div><div class='add'>+	ext		v1.16b, v1.16b, v1.16b, #12</div><div class='add'>+	// x2 = shuffle32(x2, MASK(1, 0, 3, 2))</div><div class='add'>+	ext		v2.16b, v2.16b, v2.16b, #8</div><div class='add'>+	// x3 = shuffle32(x3, MASK(0, 3, 2, 1))</div><div class='add'>+	ext		v3.16b, v3.16b, v3.16b, #4</div><div class='add'>+</div><div class='add'>+	subs		x3, x3, #1</div><div class='add'>+	b.ne		.Ldoubleround</div><div class='add'>+</div><div class='add'>+	ld1		{v4.16b-v7.16b}, [x2]</div><div class='add'>+</div><div class='add'>+	// o0 = i0 ^ (x0 + s0)</div><div class='add'>+	add		v0.4s, v0.4s, v8.4s</div><div class='add'>+	eor		v0.16b, v0.16b, v4.16b</div><div class='add'>+</div><div class='add'>+	// o1 = i1 ^ (x1 + s1)</div><div class='add'>+	add		v1.4s, v1.4s, v9.4s</div><div class='add'>+	eor		v1.16b, v1.16b, v5.16b</div><div class='add'>+</div><div class='add'>+	// o2 = i2 ^ (x2 + s2)</div><div class='add'>+	add		v2.4s, v2.4s, v10.4s</div><div class='add'>+	eor		v2.16b, v2.16b, v6.16b</div><div class='add'>+</div><div class='add'>+	// o3 = i3 ^ (x3 + s3)</div><div class='add'>+	add		v3.4s, v3.4s, v11.4s</div><div class='add'>+	eor		v3.16b, v3.16b, v7.16b</div><div class='add'>+</div><div class='add'>+	st1		{v0.16b-v3.16b}, [x1]</div><div class='add'>+</div><div class='add'>+	ret</div><div class='add'>+ENDPROC(chacha20_block_xor_neon)</div><div class='add'>+</div><div class='add'>+	.align		6</div><div class='add'>+ENTRY(chacha20_4block_xor_neon)</div><div class='add'>+	// x0: Input state matrix, s</div><div class='add'>+	// x1: 4 data blocks output, o</div><div class='add'>+	// x2: 4 data blocks input, i</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// This function encrypts four consecutive ChaCha20 blocks by loading</div><div class='add'>+	// the state matrix in NEON registers four times. The algorithm performs</div><div class='add'>+	// each operation on the corresponding word of each state matrix, hence</div><div class='add'>+	// requires no word shuffling. For final XORing step we transpose the</div><div class='add'>+	// matrix by interleaving 32- and then 64-bit words, which allows us to</div><div class='add'>+	// do XOR in NEON registers.</div><div class='add'>+	//</div><div class='add'>+	adr		x3, CTRINC		// ... and ROT8</div><div class='add'>+	ld1		{v30.4s-v31.4s}, [x3]</div><div class='add'>+</div><div class='add'>+	// x0..15[0-3] = s0..3[0..3]</div><div class='add'>+	mov		x4, x0</div><div class='add'>+	ld4r		{ v0.4s- v3.4s}, [x4], #16</div><div class='add'>+	ld4r		{ v4.4s- v7.4s}, [x4], #16</div><div class='add'>+	ld4r		{ v8.4s-v11.4s}, [x4], #16</div><div class='add'>+	ld4r		{v12.4s-v15.4s}, [x4]</div><div class='add'>+</div><div class='add'>+	// x12 += counter values 0-3</div><div class='add'>+	add		v12.4s, v12.4s, v30.4s</div><div class='add'>+</div><div class='add'>+	mov		x3, #10</div><div class='add'>+</div><div class='add'>+.Ldoubleround4:</div><div class='add'>+	// x0 += x4, x12 = rotl32(x12 ^ x0, 16)</div><div class='add'>+	// x1 += x5, x13 = rotl32(x13 ^ x1, 16)</div><div class='add'>+	// x2 += x6, x14 = rotl32(x14 ^ x2, 16)</div><div class='add'>+	// x3 += x7, x15 = rotl32(x15 ^ x3, 16)</div><div class='add'>+	add		v0.4s, v0.4s, v4.4s</div><div class='add'>+	add		v1.4s, v1.4s, v5.4s</div><div class='add'>+	add		v2.4s, v2.4s, v6.4s</div><div class='add'>+	add		v3.4s, v3.4s, v7.4s</div><div class='add'>+</div><div class='add'>+	eor		v12.16b, v12.16b, v0.16b</div><div class='add'>+	eor		v13.16b, v13.16b, v1.16b</div><div class='add'>+	eor		v14.16b, v14.16b, v2.16b</div><div class='add'>+	eor		v15.16b, v15.16b, v3.16b</div><div class='add'>+</div><div class='add'>+	rev32		v12.8h, v12.8h</div><div class='add'>+	rev32		v13.8h, v13.8h</div><div class='add'>+	rev32		v14.8h, v14.8h</div><div class='add'>+	rev32		v15.8h, v15.8h</div><div class='add'>+</div><div class='add'>+	// x8 += x12, x4 = rotl32(x4 ^ x8, 12)</div><div class='add'>+	// x9 += x13, x5 = rotl32(x5 ^ x9, 12)</div><div class='add'>+	// x10 += x14, x6 = rotl32(x6 ^ x10, 12)</div><div class='add'>+	// x11 += x15, x7 = rotl32(x7 ^ x11, 12)</div><div class='add'>+	add		v8.4s, v8.4s, v12.4s</div><div class='add'>+	add		v9.4s, v9.4s, v13.4s</div><div class='add'>+	add		v10.4s, v10.4s, v14.4s</div><div class='add'>+	add		v11.4s, v11.4s, v15.4s</div><div class='add'>+</div><div class='add'>+	eor		v16.16b, v4.16b, v8.16b</div><div class='add'>+	eor		v17.16b, v5.16b, v9.16b</div><div class='add'>+	eor		v18.16b, v6.16b, v10.16b</div><div class='add'>+	eor		v19.16b, v7.16b, v11.16b</div><div class='add'>+</div><div class='add'>+	shl		v4.4s, v16.4s, #12</div><div class='add'>+	shl		v5.4s, v17.4s, #12</div><div class='add'>+	shl		v6.4s, v18.4s, #12</div><div class='add'>+	shl		v7.4s, v19.4s, #12</div><div class='add'>+</div><div class='add'>+	sri		v4.4s, v16.4s, #20</div><div class='add'>+	sri		v5.4s, v17.4s, #20</div><div class='add'>+	sri		v6.4s, v18.4s, #20</div><div class='add'>+	sri		v7.4s, v19.4s, #20</div><div class='add'>+</div><div class='add'>+	// x0 += x4, x12 = rotl32(x12 ^ x0, 8)</div><div class='add'>+	// x1 += x5, x13 = rotl32(x13 ^ x1, 8)</div><div class='add'>+	// x2 += x6, x14 = rotl32(x14 ^ x2, 8)</div><div class='add'>+	// x3 += x7, x15 = rotl32(x15 ^ x3, 8)</div><div class='add'>+	add		v0.4s, v0.4s, v4.4s</div><div class='add'>+	add		v1.4s, v1.4s, v5.4s</div><div class='add'>+	add		v2.4s, v2.4s, v6.4s</div><div class='add'>+	add		v3.4s, v3.4s, v7.4s</div><div class='add'>+</div><div class='add'>+	eor		v12.16b, v12.16b, v0.16b</div><div class='add'>+	eor		v13.16b, v13.16b, v1.16b</div><div class='add'>+	eor		v14.16b, v14.16b, v2.16b</div><div class='add'>+	eor		v15.16b, v15.16b, v3.16b</div><div class='add'>+</div><div class='add'>+	tbl		v12.16b, {v12.16b}, v31.16b</div><div class='add'>+	tbl		v13.16b, {v13.16b}, v31.16b</div><div class='add'>+	tbl		v14.16b, {v14.16b}, v31.16b</div><div class='add'>+	tbl		v15.16b, {v15.16b}, v31.16b</div><div class='add'>+</div><div class='add'>+	// x8 += x12, x4 = rotl32(x4 ^ x8, 7)</div><div class='add'>+	// x9 += x13, x5 = rotl32(x5 ^ x9, 7)</div><div class='add'>+	// x10 += x14, x6 = rotl32(x6 ^ x10, 7)</div><div class='add'>+	// x11 += x15, x7 = rotl32(x7 ^ x11, 7)</div><div class='add'>+	add		v8.4s, v8.4s, v12.4s</div><div class='add'>+	add		v9.4s, v9.4s, v13.4s</div><div class='add'>+	add		v10.4s, v10.4s, v14.4s</div><div class='add'>+	add		v11.4s, v11.4s, v15.4s</div><div class='add'>+</div><div class='add'>+	eor		v16.16b, v4.16b, v8.16b</div><div class='add'>+	eor		v17.16b, v5.16b, v9.16b</div><div class='add'>+	eor		v18.16b, v6.16b, v10.16b</div><div class='add'>+	eor		v19.16b, v7.16b, v11.16b</div><div class='add'>+</div><div class='add'>+	shl		v4.4s, v16.4s, #7</div><div class='add'>+	shl		v5.4s, v17.4s, #7</div><div class='add'>+	shl		v6.4s, v18.4s, #7</div><div class='add'>+	shl		v7.4s, v19.4s, #7</div><div class='add'>+</div><div class='add'>+	sri		v4.4s, v16.4s, #25</div><div class='add'>+	sri		v5.4s, v17.4s, #25</div><div class='add'>+	sri		v6.4s, v18.4s, #25</div><div class='add'>+	sri		v7.4s, v19.4s, #25</div><div class='add'>+</div><div class='add'>+	// x0 += x5, x15 = rotl32(x15 ^ x0, 16)</div><div class='add'>+	// x1 += x6, x12 = rotl32(x12 ^ x1, 16)</div><div class='add'>+	// x2 += x7, x13 = rotl32(x13 ^ x2, 16)</div><div class='add'>+	// x3 += x4, x14 = rotl32(x14 ^ x3, 16)</div><div class='add'>+	add		v0.4s, v0.4s, v5.4s</div><div class='add'>+	add		v1.4s, v1.4s, v6.4s</div><div class='add'>+	add		v2.4s, v2.4s, v7.4s</div><div class='add'>+	add		v3.4s, v3.4s, v4.4s</div><div class='add'>+</div><div class='add'>+	eor		v15.16b, v15.16b, v0.16b</div><div class='add'>+	eor		v12.16b, v12.16b, v1.16b</div><div class='add'>+	eor		v13.16b, v13.16b, v2.16b</div><div class='add'>+	eor		v14.16b, v14.16b, v3.16b</div><div class='add'>+</div><div class='add'>+	rev32		v15.8h, v15.8h</div><div class='add'>+	rev32		v12.8h, v12.8h</div><div class='add'>+	rev32		v13.8h, v13.8h</div><div class='add'>+	rev32		v14.8h, v14.8h</div><div class='add'>+</div><div class='add'>+	// x10 += x15, x5 = rotl32(x5 ^ x10, 12)</div><div class='add'>+	// x11 += x12, x6 = rotl32(x6 ^ x11, 12)</div><div class='add'>+	// x8 += x13, x7 = rotl32(x7 ^ x8, 12)</div><div class='add'>+	// x9 += x14, x4 = rotl32(x4 ^ x9, 12)</div><div class='add'>+	add		v10.4s, v10.4s, v15.4s</div><div class='add'>+	add		v11.4s, v11.4s, v12.4s</div><div class='add'>+	add		v8.4s, v8.4s, v13.4s</div><div class='add'>+	add		v9.4s, v9.4s, v14.4s</div><div class='add'>+</div><div class='add'>+	eor		v16.16b, v5.16b, v10.16b</div><div class='add'>+	eor		v17.16b, v6.16b, v11.16b</div><div class='add'>+	eor		v18.16b, v7.16b, v8.16b</div><div class='add'>+	eor		v19.16b, v4.16b, v9.16b</div><div class='add'>+</div><div class='add'>+	shl		v5.4s, v16.4s, #12</div><div class='add'>+	shl		v6.4s, v17.4s, #12</div><div class='add'>+	shl		v7.4s, v18.4s, #12</div><div class='add'>+	shl		v4.4s, v19.4s, #12</div><div class='add'>+</div><div class='add'>+	sri		v5.4s, v16.4s, #20</div><div class='add'>+	sri		v6.4s, v17.4s, #20</div><div class='add'>+	sri		v7.4s, v18.4s, #20</div><div class='add'>+	sri		v4.4s, v19.4s, #20</div><div class='add'>+</div><div class='add'>+	// x0 += x5, x15 = rotl32(x15 ^ x0, 8)</div><div class='add'>+	// x1 += x6, x12 = rotl32(x12 ^ x1, 8)</div><div class='add'>+	// x2 += x7, x13 = rotl32(x13 ^ x2, 8)</div><div class='add'>+	// x3 += x4, x14 = rotl32(x14 ^ x3, 8)</div><div class='add'>+	add		v0.4s, v0.4s, v5.4s</div><div class='add'>+	add		v1.4s, v1.4s, v6.4s</div><div class='add'>+	add		v2.4s, v2.4s, v7.4s</div><div class='add'>+	add		v3.4s, v3.4s, v4.4s</div><div class='add'>+</div><div class='add'>+	eor		v15.16b, v15.16b, v0.16b</div><div class='add'>+	eor		v12.16b, v12.16b, v1.16b</div><div class='add'>+	eor		v13.16b, v13.16b, v2.16b</div><div class='add'>+	eor		v14.16b, v14.16b, v3.16b</div><div class='add'>+</div><div class='add'>+	tbl		v15.16b, {v15.16b}, v31.16b</div><div class='add'>+	tbl		v12.16b, {v12.16b}, v31.16b</div><div class='add'>+	tbl		v13.16b, {v13.16b}, v31.16b</div><div class='add'>+	tbl		v14.16b, {v14.16b}, v31.16b</div><div class='add'>+</div><div class='add'>+	// x10 += x15, x5 = rotl32(x5 ^ x10, 7)</div><div class='add'>+	// x11 += x12, x6 = rotl32(x6 ^ x11, 7)</div><div class='add'>+	// x8 += x13, x7 = rotl32(x7 ^ x8, 7)</div><div class='add'>+	// x9 += x14, x4 = rotl32(x4 ^ x9, 7)</div><div class='add'>+	add		v10.4s, v10.4s, v15.4s</div><div class='add'>+	add		v11.4s, v11.4s, v12.4s</div><div class='add'>+	add		v8.4s, v8.4s, v13.4s</div><div class='add'>+	add		v9.4s, v9.4s, v14.4s</div><div class='add'>+</div><div class='add'>+	eor		v16.16b, v5.16b, v10.16b</div><div class='add'>+	eor		v17.16b, v6.16b, v11.16b</div><div class='add'>+	eor		v18.16b, v7.16b, v8.16b</div><div class='add'>+	eor		v19.16b, v4.16b, v9.16b</div><div class='add'>+</div><div class='add'>+	shl		v5.4s, v16.4s, #7</div><div class='add'>+	shl		v6.4s, v17.4s, #7</div><div class='add'>+	shl		v7.4s, v18.4s, #7</div><div class='add'>+	shl		v4.4s, v19.4s, #7</div><div class='add'>+</div><div class='add'>+	sri		v5.4s, v16.4s, #25</div><div class='add'>+	sri		v6.4s, v17.4s, #25</div><div class='add'>+	sri		v7.4s, v18.4s, #25</div><div class='add'>+	sri		v4.4s, v19.4s, #25</div><div class='add'>+</div><div class='add'>+	subs		x3, x3, #1</div><div class='add'>+	b.ne		.Ldoubleround4</div><div class='add'>+</div><div class='add'>+	ld4r		{v16.4s-v19.4s}, [x0], #16</div><div class='add'>+	ld4r		{v20.4s-v23.4s}, [x0], #16</div><div class='add'>+</div><div class='add'>+	// x12 += counter values 0-3</div><div class='add'>+	add		v12.4s, v12.4s, v30.4s</div><div class='add'>+</div><div class='add'>+	// x0[0-3] += s0[0]</div><div class='add'>+	// x1[0-3] += s0[1]</div><div class='add'>+	// x2[0-3] += s0[2]</div><div class='add'>+	// x3[0-3] += s0[3]</div><div class='add'>+	add		v0.4s, v0.4s, v16.4s</div><div class='add'>+	add		v1.4s, v1.4s, v17.4s</div><div class='add'>+	add		v2.4s, v2.4s, v18.4s</div><div class='add'>+	add		v3.4s, v3.4s, v19.4s</div><div class='add'>+</div><div class='add'>+	ld4r		{v24.4s-v27.4s}, [x0], #16</div><div class='add'>+	ld4r		{v28.4s-v31.4s}, [x0]</div><div class='add'>+</div><div class='add'>+	// x4[0-3] += s1[0]</div><div class='add'>+	// x5[0-3] += s1[1]</div><div class='add'>+	// x6[0-3] += s1[2]</div><div class='add'>+	// x7[0-3] += s1[3]</div><div class='add'>+	add		v4.4s, v4.4s, v20.4s</div><div class='add'>+	add		v5.4s, v5.4s, v21.4s</div><div class='add'>+	add		v6.4s, v6.4s, v22.4s</div><div class='add'>+	add		v7.4s, v7.4s, v23.4s</div><div class='add'>+</div><div class='add'>+	// x8[0-3] += s2[0]</div><div class='add'>+	// x9[0-3] += s2[1]</div><div class='add'>+	// x10[0-3] += s2[2]</div><div class='add'>+	// x11[0-3] += s2[3]</div><div class='add'>+	add		v8.4s, v8.4s, v24.4s</div><div class='add'>+	add		v9.4s, v9.4s, v25.4s</div><div class='add'>+	add		v10.4s, v10.4s, v26.4s</div><div class='add'>+	add		v11.4s, v11.4s, v27.4s</div><div class='add'>+</div><div class='add'>+	// x12[0-3] += s3[0]</div><div class='add'>+	// x13[0-3] += s3[1]</div><div class='add'>+	// x14[0-3] += s3[2]</div><div class='add'>+	// x15[0-3] += s3[3]</div><div class='add'>+	add		v12.4s, v12.4s, v28.4s</div><div class='add'>+	add		v13.4s, v13.4s, v29.4s</div><div class='add'>+	add		v14.4s, v14.4s, v30.4s</div><div class='add'>+	add		v15.4s, v15.4s, v31.4s</div><div class='add'>+</div><div class='add'>+	// interleave 32-bit words in state n, n+1</div><div class='add'>+	zip1		v16.4s, v0.4s, v1.4s</div><div class='add'>+	zip2		v17.4s, v0.4s, v1.4s</div><div class='add'>+	zip1		v18.4s, v2.4s, v3.4s</div><div class='add'>+	zip2		v19.4s, v2.4s, v3.4s</div><div class='add'>+	zip1		v20.4s, v4.4s, v5.4s</div><div class='add'>+	zip2		v21.4s, v4.4s, v5.4s</div><div class='add'>+	zip1		v22.4s, v6.4s, v7.4s</div><div class='add'>+	zip2		v23.4s, v6.4s, v7.4s</div><div class='add'>+	zip1		v24.4s, v8.4s, v9.4s</div><div class='add'>+	zip2		v25.4s, v8.4s, v9.4s</div><div class='add'>+	zip1		v26.4s, v10.4s, v11.4s</div><div class='add'>+	zip2		v27.4s, v10.4s, v11.4s</div><div class='add'>+	zip1		v28.4s, v12.4s, v13.4s</div><div class='add'>+	zip2		v29.4s, v12.4s, v13.4s</div><div class='add'>+	zip1		v30.4s, v14.4s, v15.4s</div><div class='add'>+	zip2		v31.4s, v14.4s, v15.4s</div><div class='add'>+</div><div class='add'>+	// interleave 64-bit words in state n, n+2</div><div class='add'>+	zip1		v0.2d, v16.2d, v18.2d</div><div class='add'>+	zip2		v4.2d, v16.2d, v18.2d</div><div class='add'>+	zip1		v8.2d, v17.2d, v19.2d</div><div class='add'>+	zip2		v12.2d, v17.2d, v19.2d</div><div class='add'>+	ld1		{v16.16b-v19.16b}, [x2], #64</div><div class='add'>+</div><div class='add'>+	zip1		v1.2d, v20.2d, v22.2d</div><div class='add'>+	zip2		v5.2d, v20.2d, v22.2d</div><div class='add'>+	zip1		v9.2d, v21.2d, v23.2d</div><div class='add'>+	zip2		v13.2d, v21.2d, v23.2d</div><div class='add'>+	ld1		{v20.16b-v23.16b}, [x2], #64</div><div class='add'>+</div><div class='add'>+	zip1		v2.2d, v24.2d, v26.2d</div><div class='add'>+	zip2		v6.2d, v24.2d, v26.2d</div><div class='add'>+	zip1		v10.2d, v25.2d, v27.2d</div><div class='add'>+	zip2		v14.2d, v25.2d, v27.2d</div><div class='add'>+	ld1		{v24.16b-v27.16b}, [x2], #64</div><div class='add'>+</div><div class='add'>+	zip1		v3.2d, v28.2d, v30.2d</div><div class='add'>+	zip2		v7.2d, v28.2d, v30.2d</div><div class='add'>+	zip1		v11.2d, v29.2d, v31.2d</div><div class='add'>+	zip2		v15.2d, v29.2d, v31.2d</div><div class='add'>+	ld1		{v28.16b-v31.16b}, [x2]</div><div class='add'>+</div><div class='add'>+	// xor with corresponding input, write to output</div><div class='add'>+	eor		v16.16b, v16.16b, v0.16b</div><div class='add'>+	eor		v17.16b, v17.16b, v1.16b</div><div class='add'>+	eor		v18.16b, v18.16b, v2.16b</div><div class='add'>+	eor		v19.16b, v19.16b, v3.16b</div><div class='add'>+	eor		v20.16b, v20.16b, v4.16b</div><div class='add'>+	eor		v21.16b, v21.16b, v5.16b</div><div class='add'>+	st1		{v16.16b-v19.16b}, [x1], #64</div><div class='add'>+	eor		v22.16b, v22.16b, v6.16b</div><div class='add'>+	eor		v23.16b, v23.16b, v7.16b</div><div class='add'>+	eor		v24.16b, v24.16b, v8.16b</div><div class='add'>+	eor		v25.16b, v25.16b, v9.16b</div><div class='add'>+	st1		{v20.16b-v23.16b}, [x1], #64</div><div class='add'>+	eor		v26.16b, v26.16b, v10.16b</div><div class='add'>+	eor		v27.16b, v27.16b, v11.16b</div><div class='add'>+	eor		v28.16b, v28.16b, v12.16b</div><div class='add'>+	st1		{v24.16b-v27.16b}, [x1], #64</div><div class='add'>+	eor		v29.16b, v29.16b, v13.16b</div><div class='add'>+	eor		v30.16b, v30.16b, v14.16b</div><div class='add'>+	eor		v31.16b, v31.16b, v15.16b</div><div class='add'>+	st1		{v28.16b-v31.16b}, [x1]</div><div class='add'>+</div><div class='add'>+	ret</div><div class='add'>+ENDPROC(chacha20_4block_xor_neon)</div><div class='add'>+</div><div class='add'>+CTRINC:	.word		0, 1, 2, 3</div><div class='add'>+ROT8:	.word		0x02010003, 0x06050407, 0x0a09080b, 0x0e0d0c0f</div><div class='head'>diff --git a/arch/arm64/crypto/chacha20-neon-glue.c b/arch/arm64/crypto/chacha20-neon-glue.c<br/>new file mode 100644<br/>index 000000000000..a7cd575ea223<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/chacha20-neon-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/chacha20-neon-glue.c</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+/*</div><div class='add'>+ * ChaCha20 256-bit cipher algorithm, RFC7539, arm64 NEON functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro, Ltd. &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Based on:</div><div class='add'>+ * ChaCha20 256-bit cipher algorithm, RFC7539, SIMD glue code</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015 Martin Willi</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/chacha20.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='add'>+#include &lt;asm/neon.h&gt;</div><div class='add'>+</div><div class='add'>+asmlinkage void chacha20_block_xor_neon(u32 *state, u8 *dst, const u8 *src);</div><div class='add'>+asmlinkage void chacha20_4block_xor_neon(u32 *state, u8 *dst, const u8 *src);</div><div class='add'>+</div><div class='add'>+static void chacha20_doneon(u32 *state, u8 *dst, const u8 *src,</div><div class='add'>+			    unsigned int bytes)</div><div class='add'>+{</div><div class='add'>+	u8 buf[CHACHA20_BLOCK_SIZE];</div><div class='add'>+</div><div class='add'>+	while (bytes &gt;= CHACHA20_BLOCK_SIZE * 4) {</div><div class='add'>+		chacha20_4block_xor_neon(state, dst, src);</div><div class='add'>+		bytes -= CHACHA20_BLOCK_SIZE * 4;</div><div class='add'>+		src += CHACHA20_BLOCK_SIZE * 4;</div><div class='add'>+		dst += CHACHA20_BLOCK_SIZE * 4;</div><div class='add'>+		state[12] += 4;</div><div class='add'>+	}</div><div class='add'>+	while (bytes &gt;= CHACHA20_BLOCK_SIZE) {</div><div class='add'>+		chacha20_block_xor_neon(state, dst, src);</div><div class='add'>+		bytes -= CHACHA20_BLOCK_SIZE;</div><div class='add'>+		src += CHACHA20_BLOCK_SIZE;</div><div class='add'>+		dst += CHACHA20_BLOCK_SIZE;</div><div class='add'>+		state[12]++;</div><div class='add'>+	}</div><div class='add'>+	if (bytes) {</div><div class='add'>+		memcpy(buf, src, bytes);</div><div class='add'>+		chacha20_block_xor_neon(state, buf, buf);</div><div class='add'>+		memcpy(dst, buf, bytes);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chacha20_neon(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct chacha20_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	u32 state[16];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;cryptlen &lt;= CHACHA20_BLOCK_SIZE)</div><div class='add'>+		return crypto_chacha20_crypt(req);</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='add'>+</div><div class='add'>+	crypto_chacha20_init(state, ctx, walk.iv);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	while (walk.nbytes &gt; 0) {</div><div class='add'>+		unsigned int nbytes = walk.nbytes;</div><div class='add'>+</div><div class='add'>+		if (nbytes &lt; walk.total)</div><div class='add'>+			nbytes = round_down(nbytes, walk.stride);</div><div class='add'>+</div><div class='add'>+		chacha20_doneon(state, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='add'>+				nbytes);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, walk.nbytes - nbytes);</div><div class='add'>+	}</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct skcipher_alg alg = {</div><div class='add'>+	.base.cra_name		= "chacha20",</div><div class='add'>+	.base.cra_driver_name	= "chacha20-neon",</div><div class='add'>+	.base.cra_priority	= 300,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct chacha20_ctx),</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= CHACHA20_KEY_SIZE,</div><div class='add'>+	.max_keysize		= CHACHA20_KEY_SIZE,</div><div class='add'>+	.ivsize			= CHACHA20_IV_SIZE,</div><div class='add'>+	.chunksize		= CHACHA20_BLOCK_SIZE,</div><div class='add'>+	.walksize		= 4 * CHACHA20_BLOCK_SIZE,</div><div class='add'>+	.setkey			= crypto_chacha20_setkey,</div><div class='add'>+	.encrypt		= chacha20_neon,</div><div class='add'>+	.decrypt		= chacha20_neon,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init chacha20_simd_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	if (!(elf_hwcap &amp; HWCAP_ASIMD))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return crypto_register_skcipher(&amp;alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit chacha20_simd_mod_fini(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_skcipher(&amp;alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(chacha20_simd_mod_init);</div><div class='add'>+module_exit(chacha20_simd_mod_fini);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS_CRYPTO("chacha20");</div><div class='head'>diff --git a/arch/arm64/crypto/crc32-arm64.c b/arch/arm64/crypto/crc32-arm64.c<br/>deleted file mode 100644<br/>index 6a37c3c6b11d..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/crc32-arm64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/crc32-arm64.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,290 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * crc32-arm64.c - CRC32 and CRC32C using optional ARMv8 instructions</div><div class='del'>- *</div><div class='del'>- * Module based on crypto/crc32c_generic.c</div><div class='del'>- *</div><div class='del'>- * CRC32 loop taken from Ed Nevill's Hadoop CRC patch</div><div class='del'>- * http://mail-archives.apache.org/mod_mbox/hadoop-common-dev/201406.mbox/%3C1403687030.3355.19.camel%40localhost.localdomain%3E</div><div class='del'>- *</div><div class='del'>- * Using inline assembly instead of intrinsics in order to be backwards</div><div class='del'>- * compatible with older compilers.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2014 Linaro Ltd &lt;yazen.ghannam@linaro.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/unaligned/access_ok.h&gt;</div><div class='del'>-#include &lt;linux/cpufeature.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;crypto/internal/hash.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Yazen Ghannam &lt;yazen.ghannam@linaro.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("CRC32 and CRC32C using optional ARMv8 instructions");</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='del'>-</div><div class='del'>-#define CRC32X(crc, value) __asm__("crc32x %w[c], %w[c], %x[v]":[c]"+r"(crc):[v]"r"(value))</div><div class='del'>-#define CRC32W(crc, value) __asm__("crc32w %w[c], %w[c], %w[v]":[c]"+r"(crc):[v]"r"(value))</div><div class='del'>-#define CRC32H(crc, value) __asm__("crc32h %w[c], %w[c], %w[v]":[c]"+r"(crc):[v]"r"(value))</div><div class='del'>-#define CRC32B(crc, value) __asm__("crc32b %w[c], %w[c], %w[v]":[c]"+r"(crc):[v]"r"(value))</div><div class='del'>-#define CRC32CX(crc, value) __asm__("crc32cx %w[c], %w[c], %x[v]":[c]"+r"(crc):[v]"r"(value))</div><div class='del'>-#define CRC32CW(crc, value) __asm__("crc32cw %w[c], %w[c], %w[v]":[c]"+r"(crc):[v]"r"(value))</div><div class='del'>-#define CRC32CH(crc, value) __asm__("crc32ch %w[c], %w[c], %w[v]":[c]"+r"(crc):[v]"r"(value))</div><div class='del'>-#define CRC32CB(crc, value) __asm__("crc32cb %w[c], %w[c], %w[v]":[c]"+r"(crc):[v]"r"(value))</div><div class='del'>-</div><div class='del'>-static u32 crc32_arm64_le_hw(u32 crc, const u8 *p, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	s64 length = len;</div><div class='del'>-</div><div class='del'>-	while ((length -= sizeof(u64)) &gt;= 0) {</div><div class='del'>-		CRC32X(crc, get_unaligned_le64(p));</div><div class='del'>-		p += sizeof(u64);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The following is more efficient than the straight loop */</div><div class='del'>-	if (length &amp; sizeof(u32)) {</div><div class='del'>-		CRC32W(crc, get_unaligned_le32(p));</div><div class='del'>-		p += sizeof(u32);</div><div class='del'>-	}</div><div class='del'>-	if (length &amp; sizeof(u16)) {</div><div class='del'>-		CRC32H(crc, get_unaligned_le16(p));</div><div class='del'>-		p += sizeof(u16);</div><div class='del'>-	}</div><div class='del'>-	if (length &amp; sizeof(u8))</div><div class='del'>-		CRC32B(crc, *p);</div><div class='del'>-</div><div class='del'>-	return crc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 crc32c_arm64_le_hw(u32 crc, const u8 *p, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	s64 length = len;</div><div class='del'>-</div><div class='del'>-	while ((length -= sizeof(u64)) &gt;= 0) {</div><div class='del'>-		CRC32CX(crc, get_unaligned_le64(p));</div><div class='del'>-		p += sizeof(u64);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The following is more efficient than the straight loop */</div><div class='del'>-	if (length &amp; sizeof(u32)) {</div><div class='del'>-		CRC32CW(crc, get_unaligned_le32(p));</div><div class='del'>-		p += sizeof(u32);</div><div class='del'>-	}</div><div class='del'>-	if (length &amp; sizeof(u16)) {</div><div class='del'>-		CRC32CH(crc, get_unaligned_le16(p));</div><div class='del'>-		p += sizeof(u16);</div><div class='del'>-	}</div><div class='del'>-	if (length &amp; sizeof(u8))</div><div class='del'>-		CRC32CB(crc, *p);</div><div class='del'>-</div><div class='del'>-	return crc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define CHKSUM_BLOCK_SIZE	1</div><div class='del'>-#define CHKSUM_DIGEST_SIZE	4</div><div class='del'>-</div><div class='del'>-struct chksum_ctx {</div><div class='del'>-	u32 key;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct chksum_desc_ctx {</div><div class='del'>-	u32 crc;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int chksum_init(struct shash_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct chksum_ctx *mctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='del'>-	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;crc = mctx-&gt;key;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Setting the seed allows arbitrary accumulators and flexible XOR policy</div><div class='del'>- * If your algorithm starts with ~0, then XOR with ~0 before you set</div><div class='del'>- * the seed.</div><div class='del'>- */</div><div class='del'>-static int chksum_setkey(struct crypto_shash *tfm, const u8 *key,</div><div class='del'>-			 unsigned int keylen)</div><div class='del'>-{</div><div class='del'>-	struct chksum_ctx *mctx = crypto_shash_ctx(tfm);</div><div class='del'>-</div><div class='del'>-	if (keylen != sizeof(mctx-&gt;key)) {</div><div class='del'>-		crypto_shash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	mctx-&gt;key = get_unaligned_le32(key);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int chksum_update(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			 unsigned int length)</div><div class='del'>-{</div><div class='del'>-	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;crc = crc32_arm64_le_hw(ctx-&gt;crc, data, length);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int chksumc_update(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			 unsigned int length)</div><div class='del'>-{</div><div class='del'>-	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;crc = crc32c_arm64_le_hw(ctx-&gt;crc, data, length);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int chksum_final(struct shash_desc *desc, u8 *out)</div><div class='del'>-{</div><div class='del'>-	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	put_unaligned_le32(ctx-&gt;crc, out);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int chksumc_final(struct shash_desc *desc, u8 *out)</div><div class='del'>-{</div><div class='del'>-	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	put_unaligned_le32(~ctx-&gt;crc, out);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __chksum_finup(u32 crc, const u8 *data, unsigned int len, u8 *out)</div><div class='del'>-{</div><div class='del'>-	put_unaligned_le32(crc32_arm64_le_hw(crc, data, len), out);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __chksumc_finup(u32 crc, const u8 *data, unsigned int len, u8 *out)</div><div class='del'>-{</div><div class='del'>-	put_unaligned_le32(~crc32c_arm64_le_hw(crc, data, len), out);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int chksum_finup(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			unsigned int len, u8 *out)</div><div class='del'>-{</div><div class='del'>-	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	return __chksum_finup(ctx-&gt;crc, data, len, out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int chksumc_finup(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			unsigned int len, u8 *out)</div><div class='del'>-{</div><div class='del'>-	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	return __chksumc_finup(ctx-&gt;crc, data, len, out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int chksum_digest(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			 unsigned int length, u8 *out)</div><div class='del'>-{</div><div class='del'>-	struct chksum_ctx *mctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='del'>-</div><div class='del'>-	return __chksum_finup(mctx-&gt;key, data, length, out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int chksumc_digest(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			 unsigned int length, u8 *out)</div><div class='del'>-{</div><div class='del'>-	struct chksum_ctx *mctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='del'>-</div><div class='del'>-	return __chksumc_finup(mctx-&gt;key, data, length, out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int crc32_cra_init(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-	struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='del'>-</div><div class='del'>-	mctx-&gt;key = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int crc32c_cra_init(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-	struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='del'>-</div><div class='del'>-	mctx-&gt;key = ~0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct shash_alg crc32_alg = {</div><div class='del'>-	.digestsize		=	CHKSUM_DIGEST_SIZE,</div><div class='del'>-	.setkey			=	chksum_setkey,</div><div class='del'>-	.init			=	chksum_init,</div><div class='del'>-	.update			=	chksum_update,</div><div class='del'>-	.final			=	chksum_final,</div><div class='del'>-	.finup			=	chksum_finup,</div><div class='del'>-	.digest			=	chksum_digest,</div><div class='del'>-	.descsize		=	sizeof(struct chksum_desc_ctx),</div><div class='del'>-	.base			=	{</div><div class='del'>-		.cra_name		=	"crc32",</div><div class='del'>-		.cra_driver_name	=	"crc32-arm64-hw",</div><div class='del'>-		.cra_priority		=	300,</div><div class='del'>-		.cra_blocksize		=	CHKSUM_BLOCK_SIZE,</div><div class='del'>-		.cra_alignmask		=	0,</div><div class='del'>-		.cra_ctxsize		=	sizeof(struct chksum_ctx),</div><div class='del'>-		.cra_module		=	THIS_MODULE,</div><div class='del'>-		.cra_init		=	crc32_cra_init,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct shash_alg crc32c_alg = {</div><div class='del'>-	.digestsize		=	CHKSUM_DIGEST_SIZE,</div><div class='del'>-	.setkey			=	chksum_setkey,</div><div class='del'>-	.init			=	chksum_init,</div><div class='del'>-	.update			=	chksumc_update,</div><div class='del'>-	.final			=	chksumc_final,</div><div class='del'>-	.finup			=	chksumc_finup,</div><div class='del'>-	.digest			=	chksumc_digest,</div><div class='del'>-	.descsize		=	sizeof(struct chksum_desc_ctx),</div><div class='del'>-	.base			=	{</div><div class='del'>-		.cra_name		=	"crc32c",</div><div class='del'>-		.cra_driver_name	=	"crc32c-arm64-hw",</div><div class='del'>-		.cra_priority		=	300,</div><div class='del'>-		.cra_blocksize		=	CHKSUM_BLOCK_SIZE,</div><div class='del'>-		.cra_alignmask		=	0,</div><div class='del'>-		.cra_ctxsize		=	sizeof(struct chksum_ctx),</div><div class='del'>-		.cra_module		=	THIS_MODULE,</div><div class='del'>-		.cra_init		=	crc32c_cra_init,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init crc32_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = crypto_register_shash(&amp;crc32_alg);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = crypto_register_shash(&amp;crc32c_alg);</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		crypto_unregister_shash(&amp;crc32_alg);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit crc32_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	crypto_unregister_shash(&amp;crc32_alg);</div><div class='del'>-	crypto_unregister_shash(&amp;crc32c_alg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_cpu_feature_match(CRC32, crc32_mod_init);</div><div class='del'>-module_exit(crc32_mod_exit);</div><div class='head'>diff --git a/arch/arm64/crypto/crc32-ce-core.S b/arch/arm64/crypto/crc32-ce-core.S<br/>new file mode 100644<br/>index 000000000000..18f5a8442276<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/crc32-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/crc32-ce-core.S</a></div><div class='hunk'>@@ -0,0 +1,266 @@</div><div class='add'>+/*</div><div class='add'>+ * Accelerated CRC32(C) using arm64 CRC, NEON and Crypto Extensions instructions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* GPL HEADER START</div><div class='add'>+ *</div><div class='add'>+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 only,</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License version 2 for more details (a copy is included</div><div class='add'>+ * in the LICENSE file that accompanied this code).</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * version 2 along with this program; If not, see http://www.gnu.org/licenses</div><div class='add'>+ *</div><div class='add'>+ * Please  visit http://www.xyratex.com/contact if you need additional</div><div class='add'>+ * information or have any questions.</div><div class='add'>+ *</div><div class='add'>+ * GPL HEADER END</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2012 Xyratex Technology Limited</div><div class='add'>+ *</div><div class='add'>+ * Using hardware provided PCLMULQDQ instruction to accelerate the CRC32</div><div class='add'>+ * calculation.</div><div class='add'>+ * CRC32 polynomial:0x04c11db7(BE)/0xEDB88320(LE)</div><div class='add'>+ * PCLMULQDQ is a new instruction in Intel SSE4.2, the reference can be found</div><div class='add'>+ * at:</div><div class='add'>+ * http://www.intel.com/products/processor/manuals/</div><div class='add'>+ * Intel(R) 64 and IA-32 Architectures Software Developer's Manual</div><div class='add'>+ * Volume 2B: Instruction Set Reference, N-Z</div><div class='add'>+ *</div><div class='add'>+ * Authors:   Gregory Prestas &lt;Gregory_Prestas@us.xyratex.com&gt;</div><div class='add'>+ *	      Alexander Boyko &lt;Alexander_Boyko@xyratex.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+	.align		6</div><div class='add'>+	.cpu		generic+crypto+crc</div><div class='add'>+</div><div class='add'>+.Lcrc32_constants:</div><div class='add'>+	/*</div><div class='add'>+	 * [x4*128+32 mod P(x) &lt;&lt; 32)]'  &lt;&lt; 1   = 0x154442bd4</div><div class='add'>+	 * #define CONSTANT_R1  0x154442bd4LL</div><div class='add'>+	 *</div><div class='add'>+	 * [(x4*128-32 mod P(x) &lt;&lt; 32)]' &lt;&lt; 1   = 0x1c6e41596</div><div class='add'>+	 * #define CONSTANT_R2  0x1c6e41596LL</div><div class='add'>+	 */</div><div class='add'>+	.octa		0x00000001c6e415960000000154442bd4</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * [(x128+32 mod P(x) &lt;&lt; 32)]'   &lt;&lt; 1   = 0x1751997d0</div><div class='add'>+	 * #define CONSTANT_R3  0x1751997d0LL</div><div class='add'>+	 *</div><div class='add'>+	 * [(x128-32 mod P(x) &lt;&lt; 32)]'   &lt;&lt; 1   = 0x0ccaa009e</div><div class='add'>+	 * #define CONSTANT_R4  0x0ccaa009eLL</div><div class='add'>+	 */</div><div class='add'>+	.octa		0x00000000ccaa009e00000001751997d0</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * [(x64 mod P(x) &lt;&lt; 32)]'       &lt;&lt; 1   = 0x163cd6124</div><div class='add'>+	 * #define CONSTANT_R5  0x163cd6124LL</div><div class='add'>+	 */</div><div class='add'>+	.quad		0x0000000163cd6124</div><div class='add'>+	.quad		0x00000000FFFFFFFF</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * #define CRCPOLY_TRUE_LE_FULL 0x1DB710641LL</div><div class='add'>+	 *</div><div class='add'>+	 * Barrett Reduction constant (u64`) = u` = (x**64 / P(x))`</div><div class='add'>+	 *                                                      = 0x1F7011641LL</div><div class='add'>+	 * #define CONSTANT_RU  0x1F7011641LL</div><div class='add'>+	 */</div><div class='add'>+	.octa		0x00000001F701164100000001DB710641</div><div class='add'>+</div><div class='add'>+.Lcrc32c_constants:</div><div class='add'>+	.octa		0x000000009e4addf800000000740eef02</div><div class='add'>+	.octa		0x000000014cd00bd600000000f20c0dfe</div><div class='add'>+	.quad		0x00000000dd45aab8</div><div class='add'>+	.quad		0x00000000FFFFFFFF</div><div class='add'>+	.octa		0x00000000dea713f10000000105ec76f0</div><div class='add'>+</div><div class='add'>+	vCONSTANT	.req	v0</div><div class='add'>+	dCONSTANT	.req	d0</div><div class='add'>+	qCONSTANT	.req	q0</div><div class='add'>+</div><div class='add'>+	BUF		.req	x0</div><div class='add'>+	LEN		.req	x1</div><div class='add'>+	CRC		.req	x2</div><div class='add'>+</div><div class='add'>+	vzr		.req	v9</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * Calculate crc32</div><div class='add'>+	 * BUF - buffer</div><div class='add'>+	 * LEN - sizeof buffer (multiple of 16 bytes), LEN should be &gt; 63</div><div class='add'>+	 * CRC - initial crc32</div><div class='add'>+	 * return %eax crc32</div><div class='add'>+	 * uint crc32_pmull_le(unsigned char const *buffer,</div><div class='add'>+	 *                     size_t len, uint crc32)</div><div class='add'>+	 */</div><div class='add'>+ENTRY(crc32_pmull_le)</div><div class='add'>+	adr		x3, .Lcrc32_constants</div><div class='add'>+	b		0f</div><div class='add'>+</div><div class='add'>+ENTRY(crc32c_pmull_le)</div><div class='add'>+	adr		x3, .Lcrc32c_constants</div><div class='add'>+</div><div class='add'>+0:	bic		LEN, LEN, #15</div><div class='add'>+	ld1		{v1.16b-v4.16b}, [BUF], #0x40</div><div class='add'>+	movi		vzr.16b, #0</div><div class='add'>+	fmov		dCONSTANT, CRC</div><div class='add'>+	eor		v1.16b, v1.16b, vCONSTANT.16b</div><div class='add'>+	sub		LEN, LEN, #0x40</div><div class='add'>+	cmp		LEN, #0x40</div><div class='add'>+	b.lt		less_64</div><div class='add'>+</div><div class='add'>+	ldr		qCONSTANT, [x3]</div><div class='add'>+</div><div class='add'>+loop_64:		/* 64 bytes Full cache line folding */</div><div class='add'>+	sub		LEN, LEN, #0x40</div><div class='add'>+</div><div class='add'>+	pmull2		v5.1q, v1.2d, vCONSTANT.2d</div><div class='add'>+	pmull2		v6.1q, v2.2d, vCONSTANT.2d</div><div class='add'>+	pmull2		v7.1q, v3.2d, vCONSTANT.2d</div><div class='add'>+	pmull2		v8.1q, v4.2d, vCONSTANT.2d</div><div class='add'>+</div><div class='add'>+	pmull		v1.1q, v1.1d, vCONSTANT.1d</div><div class='add'>+	pmull		v2.1q, v2.1d, vCONSTANT.1d</div><div class='add'>+	pmull		v3.1q, v3.1d, vCONSTANT.1d</div><div class='add'>+	pmull		v4.1q, v4.1d, vCONSTANT.1d</div><div class='add'>+</div><div class='add'>+	eor		v1.16b, v1.16b, v5.16b</div><div class='add'>+	ld1		{v5.16b}, [BUF], #0x10</div><div class='add'>+	eor		v2.16b, v2.16b, v6.16b</div><div class='add'>+	ld1		{v6.16b}, [BUF], #0x10</div><div class='add'>+	eor		v3.16b, v3.16b, v7.16b</div><div class='add'>+	ld1		{v7.16b}, [BUF], #0x10</div><div class='add'>+	eor		v4.16b, v4.16b, v8.16b</div><div class='add'>+	ld1		{v8.16b}, [BUF], #0x10</div><div class='add'>+</div><div class='add'>+	eor		v1.16b, v1.16b, v5.16b</div><div class='add'>+	eor		v2.16b, v2.16b, v6.16b</div><div class='add'>+	eor		v3.16b, v3.16b, v7.16b</div><div class='add'>+	eor		v4.16b, v4.16b, v8.16b</div><div class='add'>+</div><div class='add'>+	cmp		LEN, #0x40</div><div class='add'>+	b.ge		loop_64</div><div class='add'>+</div><div class='add'>+less_64:		/* Folding cache line into 128bit */</div><div class='add'>+	ldr		qCONSTANT, [x3, #16]</div><div class='add'>+</div><div class='add'>+	pmull2		v5.1q, v1.2d, vCONSTANT.2d</div><div class='add'>+	pmull		v1.1q, v1.1d, vCONSTANT.1d</div><div class='add'>+	eor		v1.16b, v1.16b, v5.16b</div><div class='add'>+	eor		v1.16b, v1.16b, v2.16b</div><div class='add'>+</div><div class='add'>+	pmull2		v5.1q, v1.2d, vCONSTANT.2d</div><div class='add'>+	pmull		v1.1q, v1.1d, vCONSTANT.1d</div><div class='add'>+	eor		v1.16b, v1.16b, v5.16b</div><div class='add'>+	eor		v1.16b, v1.16b, v3.16b</div><div class='add'>+</div><div class='add'>+	pmull2		v5.1q, v1.2d, vCONSTANT.2d</div><div class='add'>+	pmull		v1.1q, v1.1d, vCONSTANT.1d</div><div class='add'>+	eor		v1.16b, v1.16b, v5.16b</div><div class='add'>+	eor		v1.16b, v1.16b, v4.16b</div><div class='add'>+</div><div class='add'>+	cbz		LEN, fold_64</div><div class='add'>+</div><div class='add'>+loop_16:		/* Folding rest buffer into 128bit */</div><div class='add'>+	subs		LEN, LEN, #0x10</div><div class='add'>+</div><div class='add'>+	ld1		{v2.16b}, [BUF], #0x10</div><div class='add'>+	pmull2		v5.1q, v1.2d, vCONSTANT.2d</div><div class='add'>+	pmull		v1.1q, v1.1d, vCONSTANT.1d</div><div class='add'>+	eor		v1.16b, v1.16b, v5.16b</div><div class='add'>+	eor		v1.16b, v1.16b, v2.16b</div><div class='add'>+</div><div class='add'>+	b.ne		loop_16</div><div class='add'>+</div><div class='add'>+fold_64:</div><div class='add'>+	/* perform the last 64 bit fold, also adds 32 zeroes</div><div class='add'>+	 * to the input stream */</div><div class='add'>+	ext		v2.16b, v1.16b, v1.16b, #8</div><div class='add'>+	pmull2		v2.1q, v2.2d, vCONSTANT.2d</div><div class='add'>+	ext		v1.16b, v1.16b, vzr.16b, #8</div><div class='add'>+	eor		v1.16b, v1.16b, v2.16b</div><div class='add'>+</div><div class='add'>+	/* final 32-bit fold */</div><div class='add'>+	ldr		dCONSTANT, [x3, #32]</div><div class='add'>+	ldr		d3, [x3, #40]</div><div class='add'>+</div><div class='add'>+	ext		v2.16b, v1.16b, vzr.16b, #4</div><div class='add'>+	and		v1.16b, v1.16b, v3.16b</div><div class='add'>+	pmull		v1.1q, v1.1d, vCONSTANT.1d</div><div class='add'>+	eor		v1.16b, v1.16b, v2.16b</div><div class='add'>+</div><div class='add'>+	/* Finish up with the bit-reversed barrett reduction 64 ==&gt; 32 bits */</div><div class='add'>+	ldr		qCONSTANT, [x3, #48]</div><div class='add'>+</div><div class='add'>+	and		v2.16b, v1.16b, v3.16b</div><div class='add'>+	ext		v2.16b, vzr.16b, v2.16b, #8</div><div class='add'>+	pmull2		v2.1q, v2.2d, vCONSTANT.2d</div><div class='add'>+	and		v2.16b, v2.16b, v3.16b</div><div class='add'>+	pmull		v2.1q, v2.1d, vCONSTANT.1d</div><div class='add'>+	eor		v1.16b, v1.16b, v2.16b</div><div class='add'>+	mov		w0, v1.s[1]</div><div class='add'>+</div><div class='add'>+	ret</div><div class='add'>+ENDPROC(crc32_pmull_le)</div><div class='add'>+ENDPROC(crc32c_pmull_le)</div><div class='add'>+</div><div class='add'>+	.macro		__crc32, c</div><div class='add'>+0:	subs		x2, x2, #16</div><div class='add'>+	b.mi		8f</div><div class='add'>+	ldp		x3, x4, [x1], #16</div><div class='add'>+CPU_BE(	rev		x3, x3		)</div><div class='add'>+CPU_BE(	rev		x4, x4		)</div><div class='add'>+	crc32\c\()x	w0, w0, x3</div><div class='add'>+	crc32\c\()x	w0, w0, x4</div><div class='add'>+	b.ne		0b</div><div class='add'>+	ret</div><div class='add'>+</div><div class='add'>+8:	tbz		x2, #3, 4f</div><div class='add'>+	ldr		x3, [x1], #8</div><div class='add'>+CPU_BE(	rev		x3, x3		)</div><div class='add'>+	crc32\c\()x	w0, w0, x3</div><div class='add'>+4:	tbz		x2, #2, 2f</div><div class='add'>+	ldr		w3, [x1], #4</div><div class='add'>+CPU_BE(	rev		w3, w3		)</div><div class='add'>+	crc32\c\()w	w0, w0, w3</div><div class='add'>+2:	tbz		x2, #1, 1f</div><div class='add'>+	ldrh		w3, [x1], #2</div><div class='add'>+CPU_BE(	rev16		w3, w3		)</div><div class='add'>+	crc32\c\()h	w0, w0, w3</div><div class='add'>+1:	tbz		x2, #0, 0f</div><div class='add'>+	ldrb		w3, [x1]</div><div class='add'>+	crc32\c\()b	w0, w0, w3</div><div class='add'>+0:	ret</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.align		5</div><div class='add'>+ENTRY(crc32_armv8_le)</div><div class='add'>+	__crc32</div><div class='add'>+ENDPROC(crc32_armv8_le)</div><div class='add'>+</div><div class='add'>+	.align		5</div><div class='add'>+ENTRY(crc32c_armv8_le)</div><div class='add'>+	__crc32		c</div><div class='add'>+ENDPROC(crc32c_armv8_le)</div><div class='head'>diff --git a/arch/arm64/crypto/crc32-ce-glue.c b/arch/arm64/crypto/crc32-ce-glue.c<br/>new file mode 100644<br/>index 000000000000..eccb1ae90064<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/crc32-ce-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/crc32-ce-glue.c</a></div><div class='hunk'>@@ -0,0 +1,241 @@</div><div class='add'>+/*</div><div class='add'>+ * Accelerated CRC32(C) using arm64 NEON and Crypto Extensions instructions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cpufeature.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='add'>+#include &lt;asm/neon.h&gt;</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+#define PMULL_MIN_LEN		64L	/* minimum size of buffer</div><div class='add'>+					 * for crc32_pmull_le_16 */</div><div class='add'>+#define SCALE_F			16L	/* size of NEON register */</div><div class='add'>+</div><div class='add'>+asmlinkage u32 crc32_pmull_le(const u8 buf[], u64 len, u32 init_crc);</div><div class='add'>+asmlinkage u32 crc32_armv8_le(u32 init_crc, const u8 buf[], size_t len);</div><div class='add'>+</div><div class='add'>+asmlinkage u32 crc32c_pmull_le(const u8 buf[], u64 len, u32 init_crc);</div><div class='add'>+asmlinkage u32 crc32c_armv8_le(u32 init_crc, const u8 buf[], size_t len);</div><div class='add'>+</div><div class='add'>+static u32 (*fallback_crc32)(u32 init_crc, const u8 buf[], size_t len);</div><div class='add'>+static u32 (*fallback_crc32c)(u32 init_crc, const u8 buf[], size_t len);</div><div class='add'>+</div><div class='add'>+static int crc32_pmull_cra_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	u32 *key = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	*key = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_pmull_cra_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	u32 *key = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	*key = ~0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32_pmull_setkey(struct crypto_shash *hash, const u8 *key,</div><div class='add'>+			      unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	u32 *mctx = crypto_shash_ctx(hash);</div><div class='add'>+</div><div class='add'>+	if (keylen != sizeof(u32)) {</div><div class='add'>+		crypto_shash_set_flags(hash, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	*mctx = le32_to_cpup((__le32 *)key);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32_pmull_init(struct shash_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u32 *mctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	*crc = *mctx;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			unsigned int length)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	*crc = crc32_armv8_le(*crc, data, length);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			 unsigned int length)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	*crc = crc32c_armv8_le(*crc, data, length);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32_pmull_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			 unsigned int length)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+	unsigned int l;</div><div class='add'>+</div><div class='add'>+	if ((u64)data % SCALE_F) {</div><div class='add'>+		l = min_t(u32, length, SCALE_F - ((u64)data % SCALE_F));</div><div class='add'>+</div><div class='add'>+		*crc = fallback_crc32(*crc, data, l);</div><div class='add'>+</div><div class='add'>+		data += l;</div><div class='add'>+		length -= l;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (length &gt;= PMULL_MIN_LEN) {</div><div class='add'>+		l = round_down(length, SCALE_F);</div><div class='add'>+</div><div class='add'>+		kernel_neon_begin_partial(10);</div><div class='add'>+		*crc = crc32_pmull_le(data, l, *crc);</div><div class='add'>+		kernel_neon_end();</div><div class='add'>+</div><div class='add'>+		data += l;</div><div class='add'>+		length -= l;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (length &gt; 0)</div><div class='add'>+		*crc = fallback_crc32(*crc, data, length);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_pmull_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			 unsigned int length)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+	unsigned int l;</div><div class='add'>+</div><div class='add'>+	if ((u64)data % SCALE_F) {</div><div class='add'>+		l = min_t(u32, length, SCALE_F - ((u64)data % SCALE_F));</div><div class='add'>+</div><div class='add'>+		*crc = fallback_crc32c(*crc, data, l);</div><div class='add'>+</div><div class='add'>+		data += l;</div><div class='add'>+		length -= l;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (length &gt;= PMULL_MIN_LEN) {</div><div class='add'>+		l = round_down(length, SCALE_F);</div><div class='add'>+</div><div class='add'>+		kernel_neon_begin_partial(10);</div><div class='add'>+		*crc = crc32c_pmull_le(data, l, *crc);</div><div class='add'>+		kernel_neon_end();</div><div class='add'>+</div><div class='add'>+		data += l;</div><div class='add'>+		length -= l;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (length &gt; 0) {</div><div class='add'>+		*crc = fallback_crc32c(*crc, data, length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32_pmull_final(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(*crc, out);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crc32c_pmull_final(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	u32 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(~*crc, out);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct shash_alg crc32_pmull_algs[] = { {</div><div class='add'>+	.setkey			= crc32_pmull_setkey,</div><div class='add'>+	.init			= crc32_pmull_init,</div><div class='add'>+	.update			= crc32_update,</div><div class='add'>+	.final			= crc32_pmull_final,</div><div class='add'>+	.descsize		= sizeof(u32),</div><div class='add'>+	.digestsize		= sizeof(u32),</div><div class='add'>+</div><div class='add'>+	.base.cra_ctxsize	= sizeof(u32),</div><div class='add'>+	.base.cra_init		= crc32_pmull_cra_init,</div><div class='add'>+	.base.cra_name		= "crc32",</div><div class='add'>+	.base.cra_driver_name	= "crc32-arm64-ce",</div><div class='add'>+	.base.cra_priority	= 200,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+}, {</div><div class='add'>+	.setkey			= crc32_pmull_setkey,</div><div class='add'>+	.init			= crc32_pmull_init,</div><div class='add'>+	.update			= crc32c_update,</div><div class='add'>+	.final			= crc32c_pmull_final,</div><div class='add'>+	.descsize		= sizeof(u32),</div><div class='add'>+	.digestsize		= sizeof(u32),</div><div class='add'>+</div><div class='add'>+	.base.cra_ctxsize	= sizeof(u32),</div><div class='add'>+	.base.cra_init		= crc32c_pmull_cra_init,</div><div class='add'>+	.base.cra_name		= "crc32c",</div><div class='add'>+	.base.cra_driver_name	= "crc32c-arm64-ce",</div><div class='add'>+	.base.cra_priority	= 200,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+} };</div><div class='add'>+</div><div class='add'>+static int __init crc32_pmull_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) &amp;&amp; (elf_hwcap &amp; HWCAP_PMULL)) {</div><div class='add'>+		crc32_pmull_algs[0].update = crc32_pmull_update;</div><div class='add'>+		crc32_pmull_algs[1].update = crc32c_pmull_update;</div><div class='add'>+</div><div class='add'>+		if (elf_hwcap &amp; HWCAP_CRC32) {</div><div class='add'>+			fallback_crc32 = crc32_armv8_le;</div><div class='add'>+			fallback_crc32c = crc32c_armv8_le;</div><div class='add'>+		} else {</div><div class='add'>+			fallback_crc32 = crc32_le;</div><div class='add'>+			fallback_crc32c = __crc32c_le;</div><div class='add'>+		}</div><div class='add'>+	} else if (!(elf_hwcap &amp; HWCAP_CRC32)) {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	return crypto_register_shashes(crc32_pmull_algs,</div><div class='add'>+				       ARRAY_SIZE(crc32_pmull_algs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit crc32_pmull_mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_shashes(crc32_pmull_algs,</div><div class='add'>+				  ARRAY_SIZE(crc32_pmull_algs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct cpu_feature crc32_cpu_feature[] = {</div><div class='add'>+	{ cpu_feature(CRC32) }, { cpu_feature(PMULL) }, { }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(cpu, crc32_cpu_feature);</div><div class='add'>+</div><div class='add'>+module_init(crc32_pmull_mod_init);</div><div class='add'>+module_exit(crc32_pmull_mod_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/arch/arm64/crypto/crct10dif-ce-core.S b/arch/arm64/crypto/crct10dif-ce-core.S<br/>new file mode 100644<br/>index 000000000000..d5b5a8c038c8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/crct10dif-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/crct10dif-ce-core.S</a></div><div class='hunk'>@@ -0,0 +1,392 @@</div><div class='add'>+//</div><div class='add'>+// Accelerated CRC-T10DIF using arm64 NEON and Crypto Extensions instructions</div><div class='add'>+//</div><div class='add'>+// Copyright (C) 2016 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+//</div><div class='add'>+// This program is free software; you can redistribute it and/or modify</div><div class='add'>+// it under the terms of the GNU General Public License version 2 as</div><div class='add'>+// published by the Free Software Foundation.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+// Implement fast CRC-T10DIF computation with SSE and PCLMULQDQ instructions</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2013, Intel Corporation</div><div class='add'>+//</div><div class='add'>+// Authors:</div><div class='add'>+//     Erdinc Ozturk &lt;erdinc.ozturk@intel.com&gt;</div><div class='add'>+//     Vinodh Gopal &lt;vinodh.gopal@intel.com&gt;</div><div class='add'>+//     James Guilford &lt;james.guilford@intel.com&gt;</div><div class='add'>+//     Tim Chen &lt;tim.c.chen@linux.intel.com&gt;</div><div class='add'>+//</div><div class='add'>+// This software is available to you under a choice of one of two</div><div class='add'>+// licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+// General Public License (GPL) Version 2, available from the file</div><div class='add'>+// COPYING in the main directory of this source tree, or the</div><div class='add'>+// OpenIB.org BSD license below:</div><div class='add'>+//</div><div class='add'>+// Redistribution and use in source and binary forms, with or without</div><div class='add'>+// modification, are permitted provided that the following conditions are</div><div class='add'>+// met:</div><div class='add'>+//</div><div class='add'>+// * Redistributions of source code must retain the above copyright</div><div class='add'>+//   notice, this list of conditions and the following disclaimer.</div><div class='add'>+//</div><div class='add'>+// * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+//   notice, this list of conditions and the following disclaimer in the</div><div class='add'>+//   documentation and/or other materials provided with the</div><div class='add'>+//   distribution.</div><div class='add'>+//</div><div class='add'>+// * Neither the name of the Intel Corporation nor the names of its</div><div class='add'>+//   contributors may be used to endorse or promote products derived from</div><div class='add'>+//   this software without specific prior written permission.</div><div class='add'>+//</div><div class='add'>+//</div><div class='add'>+// THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION ""AS IS"" AND ANY</div><div class='add'>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</div><div class='add'>+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION OR</div><div class='add'>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,</div><div class='add'>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,</div><div class='add'>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR</div><div class='add'>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF</div><div class='add'>+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING</div><div class='add'>+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+//</div><div class='add'>+//       Function API:</div><div class='add'>+//       UINT16 crc_t10dif_pcl(</div><div class='add'>+//               UINT16 init_crc, //initial CRC value, 16 bits</div><div class='add'>+//               const unsigned char *buf, //buffer pointer to calculate CRC on</div><div class='add'>+//               UINT64 len //buffer length in bytes (64-bit data)</div><div class='add'>+//       );</div><div class='add'>+//</div><div class='add'>+//       Reference paper titled "Fast CRC Computation for Generic</div><div class='add'>+//	Polynomials Using PCLMULQDQ Instruction"</div><div class='add'>+//       URL: http://www.intel.com/content/dam/www/public/us/en/documents</div><div class='add'>+//  /white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf</div><div class='add'>+//</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+	.cpu		generic+crypto</div><div class='add'>+</div><div class='add'>+	arg1_low32	.req	w0</div><div class='add'>+	arg2		.req	x1</div><div class='add'>+	arg3		.req	x2</div><div class='add'>+</div><div class='add'>+	vzr		.req	v13</div><div class='add'>+</div><div class='add'>+ENTRY(crc_t10dif_pmull)</div><div class='add'>+	movi		vzr.16b, #0		// init zero register</div><div class='add'>+</div><div class='add'>+	// adjust the 16-bit initial_crc value, scale it to 32 bits</div><div class='add'>+	lsl		arg1_low32, arg1_low32, #16</div><div class='add'>+</div><div class='add'>+	// check if smaller than 256</div><div class='add'>+	cmp		arg3, #256</div><div class='add'>+</div><div class='add'>+	// for sizes less than 128, we can't fold 64B at a time...</div><div class='add'>+	b.lt		_less_than_128</div><div class='add'>+</div><div class='add'>+	// load the initial crc value</div><div class='add'>+	// crc value does not need to be byte-reflected, but it needs</div><div class='add'>+	// to be moved to the high part of the register.</div><div class='add'>+	// because data will be byte-reflected and will align with</div><div class='add'>+	// initial crc at correct place.</div><div class='add'>+	movi		v10.16b, #0</div><div class='add'>+	mov		v10.s[3], arg1_low32		// initial crc</div><div class='add'>+</div><div class='add'>+	// receive the initial 64B data, xor the initial crc value</div><div class='add'>+	ldp		q0, q1, [arg2]</div><div class='add'>+	ldp		q2, q3, [arg2, #0x20]</div><div class='add'>+	ldp		q4, q5, [arg2, #0x40]</div><div class='add'>+	ldp		q6, q7, [arg2, #0x60]</div><div class='add'>+	add		arg2, arg2, #0x80</div><div class='add'>+</div><div class='add'>+CPU_LE(	rev64		v0.16b, v0.16b			)</div><div class='add'>+CPU_LE(	rev64		v1.16b, v1.16b			)</div><div class='add'>+CPU_LE(	rev64		v2.16b, v2.16b			)</div><div class='add'>+CPU_LE(	rev64		v3.16b, v3.16b			)</div><div class='add'>+CPU_LE(	rev64		v4.16b, v4.16b			)</div><div class='add'>+CPU_LE(	rev64		v5.16b, v5.16b			)</div><div class='add'>+CPU_LE(	rev64		v6.16b, v6.16b			)</div><div class='add'>+CPU_LE(	rev64		v7.16b, v7.16b			)</div><div class='add'>+</div><div class='add'>+CPU_LE(	ext		v0.16b, v0.16b, v0.16b, #8	)</div><div class='add'>+CPU_LE(	ext		v1.16b, v1.16b, v1.16b, #8	)</div><div class='add'>+CPU_LE(	ext		v2.16b, v2.16b, v2.16b, #8	)</div><div class='add'>+CPU_LE(	ext		v3.16b, v3.16b, v3.16b, #8	)</div><div class='add'>+CPU_LE(	ext		v4.16b, v4.16b, v4.16b, #8	)</div><div class='add'>+CPU_LE(	ext		v5.16b, v5.16b, v5.16b, #8	)</div><div class='add'>+CPU_LE(	ext		v6.16b, v6.16b, v6.16b, #8	)</div><div class='add'>+CPU_LE(	ext		v7.16b, v7.16b, v7.16b, #8	)</div><div class='add'>+</div><div class='add'>+	// XOR the initial_crc value</div><div class='add'>+	eor		v0.16b, v0.16b, v10.16b</div><div class='add'>+</div><div class='add'>+	ldr		q10, rk3	// xmm10 has rk3 and rk4</div><div class='add'>+					// type of pmull instruction</div><div class='add'>+					// will determine which constant to use</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// we subtract 256 instead of 128 to save one instruction from the loop</div><div class='add'>+	//</div><div class='add'>+	sub		arg3, arg3, #256</div><div class='add'>+</div><div class='add'>+	// at this section of the code, there is 64*x+y (0&lt;=y&lt;64) bytes of</div><div class='add'>+	// buffer. The _fold_64_B_loop will fold 64B at a time</div><div class='add'>+	// until we have 64+y Bytes of buffer</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	// fold 64B at a time. This section of the code folds 4 vector</div><div class='add'>+	// registers in parallel</div><div class='add'>+_fold_64_B_loop:</div><div class='add'>+</div><div class='add'>+	.macro		fold64, reg1, reg2</div><div class='add'>+	ldp		q11, q12, [arg2], #0x20</div><div class='add'>+</div><div class='add'>+	pmull2		v8.1q, \reg1\().2d, v10.2d</div><div class='add'>+	pmull		\reg1\().1q, \reg1\().1d, v10.1d</div><div class='add'>+</div><div class='add'>+CPU_LE(	rev64		v11.16b, v11.16b		)</div><div class='add'>+CPU_LE(	rev64		v12.16b, v12.16b		)</div><div class='add'>+</div><div class='add'>+	pmull2		v9.1q, \reg2\().2d, v10.2d</div><div class='add'>+	pmull		\reg2\().1q, \reg2\().1d, v10.1d</div><div class='add'>+</div><div class='add'>+CPU_LE(	ext		v11.16b, v11.16b, v11.16b, #8	)</div><div class='add'>+CPU_LE(	ext		v12.16b, v12.16b, v12.16b, #8	)</div><div class='add'>+</div><div class='add'>+	eor		\reg1\().16b, \reg1\().16b, v8.16b</div><div class='add'>+	eor		\reg2\().16b, \reg2\().16b, v9.16b</div><div class='add'>+	eor		\reg1\().16b, \reg1\().16b, v11.16b</div><div class='add'>+	eor		\reg2\().16b, \reg2\().16b, v12.16b</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	fold64		v0, v1</div><div class='add'>+	fold64		v2, v3</div><div class='add'>+	fold64		v4, v5</div><div class='add'>+	fold64		v6, v7</div><div class='add'>+</div><div class='add'>+	subs		arg3, arg3, #128</div><div class='add'>+</div><div class='add'>+	// check if there is another 64B in the buffer to be able to fold</div><div class='add'>+	b.ge		_fold_64_B_loop</div><div class='add'>+</div><div class='add'>+	// at this point, the buffer pointer is pointing at the last y Bytes</div><div class='add'>+	// of the buffer the 64B of folded data is in 4 of the vector</div><div class='add'>+	// registers: v0, v1, v2, v3</div><div class='add'>+</div><div class='add'>+	// fold the 8 vector registers to 1 vector register with different</div><div class='add'>+	// constants</div><div class='add'>+</div><div class='add'>+	ldr		q10, rk9</div><div class='add'>+</div><div class='add'>+	.macro		fold16, reg, rk</div><div class='add'>+	pmull		v8.1q, \reg\().1d, v10.1d</div><div class='add'>+	pmull2		\reg\().1q, \reg\().2d, v10.2d</div><div class='add'>+	.ifnb		\rk</div><div class='add'>+	ldr		q10, \rk</div><div class='add'>+	.endif</div><div class='add'>+	eor		v7.16b, v7.16b, v8.16b</div><div class='add'>+	eor		v7.16b, v7.16b, \reg\().16b</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	fold16		v0, rk11</div><div class='add'>+	fold16		v1, rk13</div><div class='add'>+	fold16		v2, rk15</div><div class='add'>+	fold16		v3, rk17</div><div class='add'>+	fold16		v4, rk19</div><div class='add'>+	fold16		v5, rk1</div><div class='add'>+	fold16		v6</div><div class='add'>+</div><div class='add'>+	// instead of 64, we add 48 to the loop counter to save 1 instruction</div><div class='add'>+	// from the loop instead of a cmp instruction, we use the negative</div><div class='add'>+	// flag with the jl instruction</div><div class='add'>+	adds		arg3, arg3, #(128-16)</div><div class='add'>+	b.lt		_final_reduction_for_128</div><div class='add'>+</div><div class='add'>+	// now we have 16+y bytes left to reduce. 16 Bytes is in register v7</div><div class='add'>+	// and the rest is in memory. We can fold 16 bytes at a time if y&gt;=16</div><div class='add'>+	// continue folding 16B at a time</div><div class='add'>+</div><div class='add'>+_16B_reduction_loop:</div><div class='add'>+	pmull		v8.1q, v7.1d, v10.1d</div><div class='add'>+	pmull2		v7.1q, v7.2d, v10.2d</div><div class='add'>+	eor		v7.16b, v7.16b, v8.16b</div><div class='add'>+</div><div class='add'>+	ldr		q0, [arg2], #16</div><div class='add'>+CPU_LE(	rev64		v0.16b, v0.16b			)</div><div class='add'>+CPU_LE(	ext		v0.16b, v0.16b, v0.16b, #8	)</div><div class='add'>+	eor		v7.16b, v7.16b, v0.16b</div><div class='add'>+	subs		arg3, arg3, #16</div><div class='add'>+</div><div class='add'>+	// instead of a cmp instruction, we utilize the flags with the</div><div class='add'>+	// jge instruction equivalent of: cmp arg3, 16-16</div><div class='add'>+	// check if there is any more 16B in the buffer to be able to fold</div><div class='add'>+	b.ge		_16B_reduction_loop</div><div class='add'>+</div><div class='add'>+	// now we have 16+z bytes left to reduce, where 0&lt;= z &lt; 16.</div><div class='add'>+	// first, we reduce the data in the xmm7 register</div><div class='add'>+</div><div class='add'>+_final_reduction_for_128:</div><div class='add'>+	// check if any more data to fold. If not, compute the CRC of</div><div class='add'>+	// the final 128 bits</div><div class='add'>+	adds		arg3, arg3, #16</div><div class='add'>+	b.eq		_128_done</div><div class='add'>+</div><div class='add'>+	// here we are getting data that is less than 16 bytes.</div><div class='add'>+	// since we know that there was data before the pointer, we can</div><div class='add'>+	// offset the input pointer before the actual point, to receive</div><div class='add'>+	// exactly 16 bytes. after that the registers need to be adjusted.</div><div class='add'>+_get_last_two_regs:</div><div class='add'>+	add		arg2, arg2, arg3</div><div class='add'>+	ldr		q1, [arg2, #-16]</div><div class='add'>+CPU_LE(	rev64		v1.16b, v1.16b			)</div><div class='add'>+CPU_LE(	ext		v1.16b, v1.16b, v1.16b, #8	)</div><div class='add'>+</div><div class='add'>+	// get rid of the extra data that was loaded before</div><div class='add'>+	// load the shift constant</div><div class='add'>+	adr		x4, tbl_shf_table + 16</div><div class='add'>+	sub		x4, x4, arg3</div><div class='add'>+	ld1		{v0.16b}, [x4]</div><div class='add'>+</div><div class='add'>+	// shift v2 to the left by arg3 bytes</div><div class='add'>+	tbl		v2.16b, {v7.16b}, v0.16b</div><div class='add'>+</div><div class='add'>+	// shift v7 to the right by 16-arg3 bytes</div><div class='add'>+	movi		v9.16b, #0x80</div><div class='add'>+	eor		v0.16b, v0.16b, v9.16b</div><div class='add'>+	tbl		v7.16b, {v7.16b}, v0.16b</div><div class='add'>+</div><div class='add'>+	// blend</div><div class='add'>+	sshr		v0.16b, v0.16b, #7	// convert to 8-bit mask</div><div class='add'>+	bsl		v0.16b, v2.16b, v1.16b</div><div class='add'>+</div><div class='add'>+	// fold 16 Bytes</div><div class='add'>+	pmull		v8.1q, v7.1d, v10.1d</div><div class='add'>+	pmull2		v7.1q, v7.2d, v10.2d</div><div class='add'>+	eor		v7.16b, v7.16b, v8.16b</div><div class='add'>+	eor		v7.16b, v7.16b, v0.16b</div><div class='add'>+</div><div class='add'>+_128_done:</div><div class='add'>+	// compute crc of a 128-bit value</div><div class='add'>+	ldr		q10, rk5		// rk5 and rk6 in xmm10</div><div class='add'>+</div><div class='add'>+	// 64b fold</div><div class='add'>+	ext		v0.16b, vzr.16b, v7.16b, #8</div><div class='add'>+	mov		v7.d[0], v7.d[1]</div><div class='add'>+	pmull		v7.1q, v7.1d, v10.1d</div><div class='add'>+	eor		v7.16b, v7.16b, v0.16b</div><div class='add'>+</div><div class='add'>+	// 32b fold</div><div class='add'>+	ext		v0.16b, v7.16b, vzr.16b, #4</div><div class='add'>+	mov		v7.s[3], vzr.s[0]</div><div class='add'>+	pmull2		v0.1q, v0.2d, v10.2d</div><div class='add'>+	eor		v7.16b, v7.16b, v0.16b</div><div class='add'>+</div><div class='add'>+	// barrett reduction</div><div class='add'>+_barrett:</div><div class='add'>+	ldr		q10, rk7</div><div class='add'>+	mov		v0.d[0], v7.d[1]</div><div class='add'>+</div><div class='add'>+	pmull		v0.1q, v0.1d, v10.1d</div><div class='add'>+	ext		v0.16b, vzr.16b, v0.16b, #12</div><div class='add'>+	pmull2		v0.1q, v0.2d, v10.2d</div><div class='add'>+	ext		v0.16b, vzr.16b, v0.16b, #12</div><div class='add'>+	eor		v7.16b, v7.16b, v0.16b</div><div class='add'>+	mov		w0, v7.s[1]</div><div class='add'>+</div><div class='add'>+_cleanup:</div><div class='add'>+	// scale the result back to 16 bits</div><div class='add'>+	lsr		x0, x0, #16</div><div class='add'>+	ret</div><div class='add'>+</div><div class='add'>+_less_than_128:</div><div class='add'>+	cbz		arg3, _cleanup</div><div class='add'>+</div><div class='add'>+	movi		v0.16b, #0</div><div class='add'>+	mov		v0.s[3], arg1_low32	// get the initial crc value</div><div class='add'>+</div><div class='add'>+	ldr		q7, [arg2], #0x10</div><div class='add'>+CPU_LE(	rev64		v7.16b, v7.16b			)</div><div class='add'>+CPU_LE(	ext		v7.16b, v7.16b, v7.16b, #8	)</div><div class='add'>+	eor		v7.16b, v7.16b, v0.16b	// xor the initial crc value</div><div class='add'>+</div><div class='add'>+	cmp		arg3, #16</div><div class='add'>+	b.eq		_128_done		// exactly 16 left</div><div class='add'>+	b.lt		_less_than_16_left</div><div class='add'>+</div><div class='add'>+	ldr		q10, rk1		// rk1 and rk2 in xmm10</div><div class='add'>+</div><div class='add'>+	// update the counter. subtract 32 instead of 16 to save one</div><div class='add'>+	// instruction from the loop</div><div class='add'>+	subs		arg3, arg3, #32</div><div class='add'>+	b.ge		_16B_reduction_loop</div><div class='add'>+</div><div class='add'>+	add		arg3, arg3, #16</div><div class='add'>+	b		_get_last_two_regs</div><div class='add'>+</div><div class='add'>+_less_than_16_left:</div><div class='add'>+	// shl r9, 4</div><div class='add'>+	adr		x0, tbl_shf_table + 16</div><div class='add'>+	sub		x0, x0, arg3</div><div class='add'>+	ld1		{v0.16b}, [x0]</div><div class='add'>+	movi		v9.16b, #0x80</div><div class='add'>+	eor		v0.16b, v0.16b, v9.16b</div><div class='add'>+	tbl		v7.16b, {v7.16b}, v0.16b</div><div class='add'>+	b		_128_done</div><div class='add'>+ENDPROC(crc_t10dif_pmull)</div><div class='add'>+</div><div class='add'>+// precomputed constants</div><div class='add'>+// these constants are precomputed from the poly:</div><div class='add'>+// 0x8bb70000 (0x8bb7 scaled to 32 bits)</div><div class='add'>+	.align		4</div><div class='add'>+// Q = 0x18BB70000</div><div class='add'>+// rk1 = 2^(32*3) mod Q &lt;&lt; 32</div><div class='add'>+// rk2 = 2^(32*5) mod Q &lt;&lt; 32</div><div class='add'>+// rk3 = 2^(32*15) mod Q &lt;&lt; 32</div><div class='add'>+// rk4 = 2^(32*17) mod Q &lt;&lt; 32</div><div class='add'>+// rk5 = 2^(32*3) mod Q &lt;&lt; 32</div><div class='add'>+// rk6 = 2^(32*2) mod Q &lt;&lt; 32</div><div class='add'>+// rk7 = floor(2^64/Q)</div><div class='add'>+// rk8 = Q</div><div class='add'>+</div><div class='add'>+rk1:	.octa		0x06df0000000000002d56000000000000</div><div class='add'>+rk3:	.octa		0x7cf50000000000009d9d000000000000</div><div class='add'>+rk5:	.octa		0x13680000000000002d56000000000000</div><div class='add'>+rk7:	.octa		0x000000018bb7000000000001f65a57f8</div><div class='add'>+rk9:	.octa		0xbfd6000000000000ceae000000000000</div><div class='add'>+rk11:	.octa		0x713c0000000000001e16000000000000</div><div class='add'>+rk13:	.octa		0x80a6000000000000f7f9000000000000</div><div class='add'>+rk15:	.octa		0xe658000000000000044c000000000000</div><div class='add'>+rk17:	.octa		0xa497000000000000ad18000000000000</div><div class='add'>+rk19:	.octa		0xe7b50000000000006ee3000000000000</div><div class='add'>+</div><div class='add'>+tbl_shf_table:</div><div class='add'>+// use these values for shift constants for the tbl/tbx instruction</div><div class='add'>+// different alignments result in values as shown:</div><div class='add'>+//	DDQ 0x008f8e8d8c8b8a898887868584838281 # shl 15 (16-1) / shr1</div><div class='add'>+//	DDQ 0x01008f8e8d8c8b8a8988878685848382 # shl 14 (16-3) / shr2</div><div class='add'>+//	DDQ 0x0201008f8e8d8c8b8a89888786858483 # shl 13 (16-4) / shr3</div><div class='add'>+//	DDQ 0x030201008f8e8d8c8b8a898887868584 # shl 12 (16-4) / shr4</div><div class='add'>+//	DDQ 0x04030201008f8e8d8c8b8a8988878685 # shl 11 (16-5) / shr5</div><div class='add'>+//	DDQ 0x0504030201008f8e8d8c8b8a89888786 # shl 10 (16-6) / shr6</div><div class='add'>+//	DDQ 0x060504030201008f8e8d8c8b8a898887 # shl 9  (16-7) / shr7</div><div class='add'>+//	DDQ 0x07060504030201008f8e8d8c8b8a8988 # shl 8  (16-8) / shr8</div><div class='add'>+//	DDQ 0x0807060504030201008f8e8d8c8b8a89 # shl 7  (16-9) / shr9</div><div class='add'>+//	DDQ 0x090807060504030201008f8e8d8c8b8a # shl 6  (16-10) / shr10</div><div class='add'>+//	DDQ 0x0a090807060504030201008f8e8d8c8b # shl 5  (16-11) / shr11</div><div class='add'>+//	DDQ 0x0b0a090807060504030201008f8e8d8c # shl 4  (16-12) / shr12</div><div class='add'>+//	DDQ 0x0c0b0a090807060504030201008f8e8d # shl 3  (16-13) / shr13</div><div class='add'>+//	DDQ 0x0d0c0b0a090807060504030201008f8e # shl 2  (16-14) / shr14</div><div class='add'>+//	DDQ 0x0e0d0c0b0a090807060504030201008f # shl 1  (16-15) / shr15</div><div class='add'>+</div><div class='add'>+	.byte		 0x0, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87</div><div class='add'>+	.byte		0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f</div><div class='add'>+	.byte		 0x0,  0x1,  0x2,  0x3,  0x4,  0x5,  0x6,  0x7</div><div class='add'>+	.byte		 0x8,  0x9,  0xa,  0xb,  0xc,  0xd,  0xe , 0x0</div><div class='head'>diff --git a/arch/arm64/crypto/crct10dif-ce-glue.c b/arch/arm64/crypto/crct10dif-ce-glue.c<br/>new file mode 100644<br/>index 000000000000..60cb590c2590<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/crct10dif-ce-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/crct10dif-ce-glue.c</a></div><div class='hunk'>@@ -0,0 +1,95 @@</div><div class='add'>+/*</div><div class='add'>+ * Accelerated CRC-T10DIF using arm64 NEON and Crypto Extensions instructions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cpufeature.h&gt;</div><div class='add'>+#include &lt;linux/crc-t10dif.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/neon.h&gt;</div><div class='add'>+</div><div class='add'>+#define CRC_T10DIF_PMULL_CHUNK_SIZE	16U</div><div class='add'>+</div><div class='add'>+asmlinkage u16 crc_t10dif_pmull(u16 init_crc, const u8 buf[], u64 len);</div><div class='add'>+</div><div class='add'>+static int crct10dif_init(struct shash_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u16 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	*crc = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crct10dif_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			    unsigned int length)</div><div class='add'>+{</div><div class='add'>+	u16 *crc = shash_desc_ctx(desc);</div><div class='add'>+	unsigned int l;</div><div class='add'>+</div><div class='add'>+	if (unlikely((u64)data % CRC_T10DIF_PMULL_CHUNK_SIZE)) {</div><div class='add'>+		l = min_t(u32, length, CRC_T10DIF_PMULL_CHUNK_SIZE -</div><div class='add'>+			  ((u64)data % CRC_T10DIF_PMULL_CHUNK_SIZE));</div><div class='add'>+</div><div class='add'>+		*crc = crc_t10dif_generic(*crc, data, l);</div><div class='add'>+</div><div class='add'>+		length -= l;</div><div class='add'>+		data += l;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (length &gt; 0) {</div><div class='add'>+		kernel_neon_begin_partial(14);</div><div class='add'>+		*crc = crc_t10dif_pmull(*crc, data, length);</div><div class='add'>+		kernel_neon_end();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crct10dif_final(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	u16 *crc = shash_desc_ctx(desc);</div><div class='add'>+</div><div class='add'>+	*(u16 *)out = *crc;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct shash_alg crc_t10dif_alg = {</div><div class='add'>+	.digestsize		= CRC_T10DIF_DIGEST_SIZE,</div><div class='add'>+	.init			= crct10dif_init,</div><div class='add'>+	.update			= crct10dif_update,</div><div class='add'>+	.final			= crct10dif_final,</div><div class='add'>+	.descsize		= CRC_T10DIF_DIGEST_SIZE,</div><div class='add'>+</div><div class='add'>+	.base.cra_name		= "crct10dif",</div><div class='add'>+	.base.cra_driver_name	= "crct10dif-arm64-ce",</div><div class='add'>+	.base.cra_priority	= 200,</div><div class='add'>+	.base.cra_blocksize	= CRC_T10DIF_BLOCK_SIZE,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init crc_t10dif_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	return crypto_register_shash(&amp;crc_t10dif_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit crc_t10dif_mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_shash(&amp;crc_t10dif_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_cpu_feature_match(PMULL, crc_t10dif_mod_init);</div><div class='add'>+module_exit(crc_t10dif_mod_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/arch/arm64/crypto/ghash-ce-core.S b/arch/arm64/crypto/ghash-ce-core.S<br/>index dc457015884e..f0bb9f0b524f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/ghash-ce-core.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/ghash-ce-core.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/ghash-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/ghash-ce-core.S</a></div><div class='hunk'>@@ -29,8 +29,8 @@</div><div class='ctx'> 	 *			   struct ghash_key const *k, const char *head)</div><div class='ctx'> 	 */</div><div class='ctx'> ENTRY(pmull_ghash_update)</div><div class='del'>-	ld1		{SHASH.16b}, [x3]</div><div class='del'>-	ld1		{XL.16b}, [x1]</div><div class='add'>+	ld1		{SHASH.2d}, [x3]</div><div class='add'>+	ld1		{XL.2d}, [x1]</div><div class='ctx'> 	movi		MASK.16b, #0xe1</div><div class='ctx'> 	ext		SHASH2.16b, SHASH.16b, SHASH.16b, #8</div><div class='ctx'> 	shl		MASK.2d, MASK.2d, #57</div><div class='hunk'>@@ -74,6 +74,6 @@ CPU_LE(	rev64		T1.16b, T1.16b	)</div><div class='ctx'> </div><div class='ctx'> 	cbnz		w0, 0b</div><div class='ctx'> </div><div class='del'>-	st1		{XL.16b}, [x1]</div><div class='add'>+	st1		{XL.2d}, [x1]</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(pmull_ghash_update)</div><div class='head'>diff --git a/arch/arm64/crypto/sha1-ce-core.S b/arch/arm64/crypto/sha1-ce-core.S<br/>index 033aae6d732a..c98e7e849f06 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/sha1-ce-core.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/sha1-ce-core.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/sha1-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha1-ce-core.S</a></div><div class='hunk'>@@ -78,7 +78,7 @@ ENTRY(sha1_ce_transform)</div><div class='ctx'> 	ld1r		{k3.4s}, [x6]</div><div class='ctx'> </div><div class='ctx'> 	/* load state */</div><div class='del'>-	ldr		dga, [x0]</div><div class='add'>+	ld1		{dgav.4s}, [x0]</div><div class='ctx'> 	ldr		dgb, [x0, #16]</div><div class='ctx'> </div><div class='ctx'> 	/* load sha1_ce_state::finalize */</div><div class='hunk'>@@ -144,7 +144,7 @@ CPU_LE(	rev32		v11.16b, v11.16b	)</div><div class='ctx'> 	b		1b</div><div class='ctx'> </div><div class='ctx'> 	/* store new state */</div><div class='del'>-3:	str		dga, [x0]</div><div class='add'>+3:	st1		{dgav.4s}, [x0]</div><div class='ctx'> 	str		dgb, [x0, #16]</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(sha1_ce_transform)</div><div class='head'>diff --git a/arch/arm64/crypto/sha2-ce-core.S b/arch/arm64/crypto/sha2-ce-core.S<br/>index 5df9d9d470ad..01cfee066837 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/crypto/sha2-ce-core.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/crypto/sha2-ce-core.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/sha2-ce-core.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha2-ce-core.S</a></div><div class='hunk'>@@ -85,7 +85,7 @@ ENTRY(sha2_ce_transform)</div><div class='ctx'> 	ld1		{v12.4s-v15.4s}, [x8]</div><div class='ctx'> </div><div class='ctx'> 	/* load state */</div><div class='del'>-	ldp		dga, dgb, [x0]</div><div class='add'>+	ld1		{dgav.4s, dgbv.4s}, [x0]</div><div class='ctx'> </div><div class='ctx'> 	/* load sha256_ce_state::finalize */</div><div class='ctx'> 	ldr		w4, [x0, #:lo12:sha256_ce_offsetof_finalize]</div><div class='hunk'>@@ -148,6 +148,6 @@ CPU_LE(	rev32		v19.16b, v19.16b	)</div><div class='ctx'> 	b		1b</div><div class='ctx'> </div><div class='ctx'> 	/* store new state */</div><div class='del'>-3:	stp		dga, dgb, [x0]</div><div class='add'>+3:	st1		{dgav.4s, dgbv.4s}, [x0]</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(sha2_ce_transform)</div><div class='head'>diff --git a/arch/arm64/crypto/sha256-core.S_shipped b/arch/arm64/crypto/sha256-core.S_shipped<br/>new file mode 100644<br/>index 000000000000..3ce82cc860bc<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/sha256-core.S_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha256-core.S_shipped</a></div><div class='hunk'>@@ -0,0 +1,2061 @@</div><div class='add'>+// Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.</div><div class='add'>+//</div><div class='add'>+// Licensed under the OpenSSL license (the "License").  You may not use</div><div class='add'>+// this file except in compliance with the License.  You can obtain a copy</div><div class='add'>+// in the file LICENSE in the source distribution or at</div><div class='add'>+// https://www.openssl.org/source/license.html</div><div class='add'>+</div><div class='add'>+// ====================================================================</div><div class='add'>+// Written by Andy Polyakov &lt;appro@openssl.org&gt; for the OpenSSL</div><div class='add'>+// project. The module is, however, dual licensed under OpenSSL and</div><div class='add'>+// CRYPTOGAMS licenses depending on where you obtain it. For further</div><div class='add'>+// details see http://www.openssl.org/~appro/cryptogams/.</div><div class='add'>+//</div><div class='add'>+// Permission to use under GPLv2 terms is granted.</div><div class='add'>+// ====================================================================</div><div class='add'>+//</div><div class='add'>+// SHA256/512 for ARMv8.</div><div class='add'>+//</div><div class='add'>+// Performance in cycles per processed byte and improvement coefficient</div><div class='add'>+// over code generated with "default" compiler:</div><div class='add'>+//</div><div class='add'>+//		SHA256-hw	SHA256(*)	SHA512</div><div class='add'>+// Apple A7	1.97		10.5 (+33%)	6.73 (-1%(**))</div><div class='add'>+// Cortex-A53	2.38		15.5 (+115%)	10.0 (+150%(***))</div><div class='add'>+// Cortex-A57	2.31		11.6 (+86%)	7.51 (+260%(***))</div><div class='add'>+// Denver	2.01		10.5 (+26%)	6.70 (+8%)</div><div class='add'>+// X-Gene			20.0 (+100%)	12.8 (+300%(***))</div><div class='add'>+// Mongoose	2.36		13.0 (+50%)	8.36 (+33%)</div><div class='add'>+//</div><div class='add'>+// (*)	Software SHA256 results are of lesser relevance, presented</div><div class='add'>+//	mostly for informational purposes.</div><div class='add'>+// (**)	The result is a trade-off: it's possible to improve it by</div><div class='add'>+//	10% (or by 1 cycle per round), but at the cost of 20% loss</div><div class='add'>+//	on Cortex-A53 (or by 4 cycles per round).</div><div class='add'>+// (***)	Super-impressive coefficients over gcc-generated code are</div><div class='add'>+//	indication of some compiler "pathology", most notably code</div><div class='add'>+//	generated with -mgeneral-regs-only is significanty faster</div><div class='add'>+//	and the gap is only 40-90%.</div><div class='add'>+//</div><div class='add'>+// October 2016.</div><div class='add'>+//</div><div class='add'>+// Originally it was reckoned that it makes no sense to implement NEON</div><div class='add'>+// version of SHA256 for 64-bit processors. This is because performance</div><div class='add'>+// improvement on most wide-spread Cortex-A5x processors was observed</div><div class='add'>+// to be marginal, same on Cortex-A53 and ~10% on A57. But then it was</div><div class='add'>+// observed that 32-bit NEON SHA256 performs significantly better than</div><div class='add'>+// 64-bit scalar version on *some* of the more recent processors. As</div><div class='add'>+// result 64-bit NEON version of SHA256 was added to provide best</div><div class='add'>+// all-round performance. For example it executes ~30% faster on X-Gene</div><div class='add'>+// and Mongoose. [For reference, NEON version of SHA512 is bound to</div><div class='add'>+// deliver much less improvement, likely *negative* on Cortex-A5x.</div><div class='add'>+// Which is why NEON support is limited to SHA256.]</div><div class='add'>+</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+# include "arm_arch.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+.text</div><div class='add'>+</div><div class='add'>+.extern	OPENSSL_armcap_P</div><div class='add'>+.globl	sha256_block_data_order</div><div class='add'>+.type	sha256_block_data_order,%function</div><div class='add'>+.align	6</div><div class='add'>+sha256_block_data_order:</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+# ifdef	__ILP32__</div><div class='add'>+	ldrsw	x16,.LOPENSSL_armcap_P</div><div class='add'>+# else</div><div class='add'>+	ldr	x16,.LOPENSSL_armcap_P</div><div class='add'>+# endif</div><div class='add'>+	adr	x17,.LOPENSSL_armcap_P</div><div class='add'>+	add	x16,x16,x17</div><div class='add'>+	ldr	w16,[x16]</div><div class='add'>+	tst	w16,#ARMV8_SHA256</div><div class='add'>+	b.ne	.Lv8_entry</div><div class='add'>+	tst	w16,#ARMV7_NEON</div><div class='add'>+	b.ne	.Lneon_entry</div><div class='add'>+#endif</div><div class='add'>+	stp	x29,x30,[sp,#-128]!</div><div class='add'>+	add	x29,sp,#0</div><div class='add'>+</div><div class='add'>+	stp	x19,x20,[sp,#16]</div><div class='add'>+	stp	x21,x22,[sp,#32]</div><div class='add'>+	stp	x23,x24,[sp,#48]</div><div class='add'>+	stp	x25,x26,[sp,#64]</div><div class='add'>+	stp	x27,x28,[sp,#80]</div><div class='add'>+	sub	sp,sp,#4*4</div><div class='add'>+</div><div class='add'>+	ldp	w20,w21,[x0]				// load context</div><div class='add'>+	ldp	w22,w23,[x0,#2*4]</div><div class='add'>+	ldp	w24,w25,[x0,#4*4]</div><div class='add'>+	add	x2,x1,x2,lsl#6	// end of input</div><div class='add'>+	ldp	w26,w27,[x0,#6*4]</div><div class='add'>+	adr	x30,.LK256</div><div class='add'>+	stp	x0,x2,[x29,#96]</div><div class='add'>+</div><div class='add'>+.Loop:</div><div class='add'>+	ldp	w3,w4,[x1],#2*4</div><div class='add'>+	ldr	w19,[x30],#4			// *K++</div><div class='add'>+	eor	w28,w21,w22				// magic seed</div><div class='add'>+	str	x1,[x29,#112]</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w3,w3			// 0</div><div class='add'>+#endif</div><div class='add'>+	ror	w16,w24,#6</div><div class='add'>+	add	w27,w27,w19			// h+=K[i]</div><div class='add'>+	eor	w6,w24,w24,ror#14</div><div class='add'>+	and	w17,w25,w24</div><div class='add'>+	bic	w19,w26,w24</div><div class='add'>+	add	w27,w27,w3			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w20,w21			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w6,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w6,w20,#2</div><div class='add'>+	add	w27,w27,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w20,w20,ror#9</div><div class='add'>+	add	w27,w27,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w23,w23,w27			// d+=h</div><div class='add'>+	eor	w28,w28,w21			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w6,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w27,w27,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	//add	w27,w27,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w4,w4			// 1</div><div class='add'>+#endif</div><div class='add'>+	ldp	w5,w6,[x1],#2*4</div><div class='add'>+	add	w27,w27,w17			// h+=Sigma0(a)</div><div class='add'>+	ror	w16,w23,#6</div><div class='add'>+	add	w26,w26,w28			// h+=K[i]</div><div class='add'>+	eor	w7,w23,w23,ror#14</div><div class='add'>+	and	w17,w24,w23</div><div class='add'>+	bic	w28,w25,w23</div><div class='add'>+	add	w26,w26,w4			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w27,w20			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w7,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w7,w27,#2</div><div class='add'>+	add	w26,w26,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w27,w27,ror#9</div><div class='add'>+	add	w26,w26,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w22,w22,w26			// d+=h</div><div class='add'>+	eor	w19,w19,w20			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w7,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w26,w26,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	//add	w26,w26,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w5,w5			// 2</div><div class='add'>+#endif</div><div class='add'>+	add	w26,w26,w17			// h+=Sigma0(a)</div><div class='add'>+	ror	w16,w22,#6</div><div class='add'>+	add	w25,w25,w19			// h+=K[i]</div><div class='add'>+	eor	w8,w22,w22,ror#14</div><div class='add'>+	and	w17,w23,w22</div><div class='add'>+	bic	w19,w24,w22</div><div class='add'>+	add	w25,w25,w5			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w26,w27			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w8,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w8,w26,#2</div><div class='add'>+	add	w25,w25,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w26,w26,ror#9</div><div class='add'>+	add	w25,w25,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w21,w21,w25			// d+=h</div><div class='add'>+	eor	w28,w28,w27			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w8,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w25,w25,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	//add	w25,w25,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w6,w6			// 3</div><div class='add'>+#endif</div><div class='add'>+	ldp	w7,w8,[x1],#2*4</div><div class='add'>+	add	w25,w25,w17			// h+=Sigma0(a)</div><div class='add'>+	ror	w16,w21,#6</div><div class='add'>+	add	w24,w24,w28			// h+=K[i]</div><div class='add'>+	eor	w9,w21,w21,ror#14</div><div class='add'>+	and	w17,w22,w21</div><div class='add'>+	bic	w28,w23,w21</div><div class='add'>+	add	w24,w24,w6			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w25,w26			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w9,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w9,w25,#2</div><div class='add'>+	add	w24,w24,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w25,w25,ror#9</div><div class='add'>+	add	w24,w24,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w20,w20,w24			// d+=h</div><div class='add'>+	eor	w19,w19,w26			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w9,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w24,w24,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	//add	w24,w24,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w7,w7			// 4</div><div class='add'>+#endif</div><div class='add'>+	add	w24,w24,w17			// h+=Sigma0(a)</div><div class='add'>+	ror	w16,w20,#6</div><div class='add'>+	add	w23,w23,w19			// h+=K[i]</div><div class='add'>+	eor	w10,w20,w20,ror#14</div><div class='add'>+	and	w17,w21,w20</div><div class='add'>+	bic	w19,w22,w20</div><div class='add'>+	add	w23,w23,w7			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w24,w25			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w10,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w10,w24,#2</div><div class='add'>+	add	w23,w23,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w24,w24,ror#9</div><div class='add'>+	add	w23,w23,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w27,w27,w23			// d+=h</div><div class='add'>+	eor	w28,w28,w25			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w10,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w23,w23,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	//add	w23,w23,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w8,w8			// 5</div><div class='add'>+#endif</div><div class='add'>+	ldp	w9,w10,[x1],#2*4</div><div class='add'>+	add	w23,w23,w17			// h+=Sigma0(a)</div><div class='add'>+	ror	w16,w27,#6</div><div class='add'>+	add	w22,w22,w28			// h+=K[i]</div><div class='add'>+	eor	w11,w27,w27,ror#14</div><div class='add'>+	and	w17,w20,w27</div><div class='add'>+	bic	w28,w21,w27</div><div class='add'>+	add	w22,w22,w8			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w23,w24			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w11,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w11,w23,#2</div><div class='add'>+	add	w22,w22,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w23,w23,ror#9</div><div class='add'>+	add	w22,w22,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w26,w26,w22			// d+=h</div><div class='add'>+	eor	w19,w19,w24			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w11,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w22,w22,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	//add	w22,w22,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w9,w9			// 6</div><div class='add'>+#endif</div><div class='add'>+	add	w22,w22,w17			// h+=Sigma0(a)</div><div class='add'>+	ror	w16,w26,#6</div><div class='add'>+	add	w21,w21,w19			// h+=K[i]</div><div class='add'>+	eor	w12,w26,w26,ror#14</div><div class='add'>+	and	w17,w27,w26</div><div class='add'>+	bic	w19,w20,w26</div><div class='add'>+	add	w21,w21,w9			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w22,w23			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w12,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w12,w22,#2</div><div class='add'>+	add	w21,w21,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w22,w22,ror#9</div><div class='add'>+	add	w21,w21,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w25,w25,w21			// d+=h</div><div class='add'>+	eor	w28,w28,w23			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w12,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w21,w21,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	//add	w21,w21,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w10,w10			// 7</div><div class='add'>+#endif</div><div class='add'>+	ldp	w11,w12,[x1],#2*4</div><div class='add'>+	add	w21,w21,w17			// h+=Sigma0(a)</div><div class='add'>+	ror	w16,w25,#6</div><div class='add'>+	add	w20,w20,w28			// h+=K[i]</div><div class='add'>+	eor	w13,w25,w25,ror#14</div><div class='add'>+	and	w17,w26,w25</div><div class='add'>+	bic	w28,w27,w25</div><div class='add'>+	add	w20,w20,w10			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w21,w22			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w13,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w13,w21,#2</div><div class='add'>+	add	w20,w20,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w21,w21,ror#9</div><div class='add'>+	add	w20,w20,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w24,w24,w20			// d+=h</div><div class='add'>+	eor	w19,w19,w22			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w13,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w20,w20,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	//add	w20,w20,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w11,w11			// 8</div><div class='add'>+#endif</div><div class='add'>+	add	w20,w20,w17			// h+=Sigma0(a)</div><div class='add'>+	ror	w16,w24,#6</div><div class='add'>+	add	w27,w27,w19			// h+=K[i]</div><div class='add'>+	eor	w14,w24,w24,ror#14</div><div class='add'>+	and	w17,w25,w24</div><div class='add'>+	bic	w19,w26,w24</div><div class='add'>+	add	w27,w27,w11			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w20,w21			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w14,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w14,w20,#2</div><div class='add'>+	add	w27,w27,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w20,w20,ror#9</div><div class='add'>+	add	w27,w27,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w23,w23,w27			// d+=h</div><div class='add'>+	eor	w28,w28,w21			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w14,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w27,w27,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	//add	w27,w27,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w12,w12			// 9</div><div class='add'>+#endif</div><div class='add'>+	ldp	w13,w14,[x1],#2*4</div><div class='add'>+	add	w27,w27,w17			// h+=Sigma0(a)</div><div class='add'>+	ror	w16,w23,#6</div><div class='add'>+	add	w26,w26,w28			// h+=K[i]</div><div class='add'>+	eor	w15,w23,w23,ror#14</div><div class='add'>+	and	w17,w24,w23</div><div class='add'>+	bic	w28,w25,w23</div><div class='add'>+	add	w26,w26,w12			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w27,w20			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w15,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w15,w27,#2</div><div class='add'>+	add	w26,w26,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w27,w27,ror#9</div><div class='add'>+	add	w26,w26,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w22,w22,w26			// d+=h</div><div class='add'>+	eor	w19,w19,w20			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w15,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w26,w26,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	//add	w26,w26,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w13,w13			// 10</div><div class='add'>+#endif</div><div class='add'>+	add	w26,w26,w17			// h+=Sigma0(a)</div><div class='add'>+	ror	w16,w22,#6</div><div class='add'>+	add	w25,w25,w19			// h+=K[i]</div><div class='add'>+	eor	w0,w22,w22,ror#14</div><div class='add'>+	and	w17,w23,w22</div><div class='add'>+	bic	w19,w24,w22</div><div class='add'>+	add	w25,w25,w13			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w26,w27			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w0,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w0,w26,#2</div><div class='add'>+	add	w25,w25,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w26,w26,ror#9</div><div class='add'>+	add	w25,w25,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w21,w21,w25			// d+=h</div><div class='add'>+	eor	w28,w28,w27			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w0,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w25,w25,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	//add	w25,w25,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w14,w14			// 11</div><div class='add'>+#endif</div><div class='add'>+	ldp	w15,w0,[x1],#2*4</div><div class='add'>+	add	w25,w25,w17			// h+=Sigma0(a)</div><div class='add'>+	str	w6,[sp,#12]</div><div class='add'>+	ror	w16,w21,#6</div><div class='add'>+	add	w24,w24,w28			// h+=K[i]</div><div class='add'>+	eor	w6,w21,w21,ror#14</div><div class='add'>+	and	w17,w22,w21</div><div class='add'>+	bic	w28,w23,w21</div><div class='add'>+	add	w24,w24,w14			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w25,w26			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w6,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w6,w25,#2</div><div class='add'>+	add	w24,w24,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w25,w25,ror#9</div><div class='add'>+	add	w24,w24,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w20,w20,w24			// d+=h</div><div class='add'>+	eor	w19,w19,w26			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w6,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w24,w24,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	//add	w24,w24,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w15,w15			// 12</div><div class='add'>+#endif</div><div class='add'>+	add	w24,w24,w17			// h+=Sigma0(a)</div><div class='add'>+	str	w7,[sp,#0]</div><div class='add'>+	ror	w16,w20,#6</div><div class='add'>+	add	w23,w23,w19			// h+=K[i]</div><div class='add'>+	eor	w7,w20,w20,ror#14</div><div class='add'>+	and	w17,w21,w20</div><div class='add'>+	bic	w19,w22,w20</div><div class='add'>+	add	w23,w23,w15			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w24,w25			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w7,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w7,w24,#2</div><div class='add'>+	add	w23,w23,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w24,w24,ror#9</div><div class='add'>+	add	w23,w23,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w27,w27,w23			// d+=h</div><div class='add'>+	eor	w28,w28,w25			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w7,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w23,w23,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	//add	w23,w23,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w0,w0			// 13</div><div class='add'>+#endif</div><div class='add'>+	ldp	w1,w2,[x1]</div><div class='add'>+	add	w23,w23,w17			// h+=Sigma0(a)</div><div class='add'>+	str	w8,[sp,#4]</div><div class='add'>+	ror	w16,w27,#6</div><div class='add'>+	add	w22,w22,w28			// h+=K[i]</div><div class='add'>+	eor	w8,w27,w27,ror#14</div><div class='add'>+	and	w17,w20,w27</div><div class='add'>+	bic	w28,w21,w27</div><div class='add'>+	add	w22,w22,w0			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w23,w24			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w8,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w8,w23,#2</div><div class='add'>+	add	w22,w22,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w23,w23,ror#9</div><div class='add'>+	add	w22,w22,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w26,w26,w22			// d+=h</div><div class='add'>+	eor	w19,w19,w24			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w8,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w22,w22,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	//add	w22,w22,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w1,w1			// 14</div><div class='add'>+#endif</div><div class='add'>+	ldr	w6,[sp,#12]</div><div class='add'>+	add	w22,w22,w17			// h+=Sigma0(a)</div><div class='add'>+	str	w9,[sp,#8]</div><div class='add'>+	ror	w16,w26,#6</div><div class='add'>+	add	w21,w21,w19			// h+=K[i]</div><div class='add'>+	eor	w9,w26,w26,ror#14</div><div class='add'>+	and	w17,w27,w26</div><div class='add'>+	bic	w19,w20,w26</div><div class='add'>+	add	w21,w21,w1			// h+=X[i]</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w22,w23			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w9,ror#11	// Sigma1(e)</div><div class='add'>+	ror	w9,w22,#2</div><div class='add'>+	add	w21,w21,w17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	w17,w22,w22,ror#9</div><div class='add'>+	add	w21,w21,w16			// h+=Sigma1(e)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	w25,w25,w21			// d+=h</div><div class='add'>+	eor	w28,w28,w23			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w9,w17,ror#13	// Sigma0(a)</div><div class='add'>+	add	w21,w21,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	//add	w21,w21,w17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	w2,w2			// 15</div><div class='add'>+#endif</div><div class='add'>+	ldr	w7,[sp,#0]</div><div class='add'>+	add	w21,w21,w17			// h+=Sigma0(a)</div><div class='add'>+	str	w10,[sp,#12]</div><div class='add'>+	ror	w16,w25,#6</div><div class='add'>+	add	w20,w20,w28			// h+=K[i]</div><div class='add'>+	ror	w9,w4,#7</div><div class='add'>+	and	w17,w26,w25</div><div class='add'>+	ror	w8,w1,#17</div><div class='add'>+	bic	w28,w27,w25</div><div class='add'>+	ror	w10,w21,#2</div><div class='add'>+	add	w20,w20,w2			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w25,ror#11</div><div class='add'>+	eor	w9,w9,w4,ror#18</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w21,w22			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w25,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w10,w10,w21,ror#13</div><div class='add'>+	add	w20,w20,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w8,w8,w1,ror#19</div><div class='add'>+	eor	w9,w9,w4,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w20,w20,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w19,w19,w22			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w10,w21,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w8,w8,w1,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w3,w3,w12</div><div class='add'>+	add	w24,w24,w20			// d+=h</div><div class='add'>+	add	w20,w20,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	add	w3,w3,w9</div><div class='add'>+	add	w20,w20,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w3,w3,w8</div><div class='add'>+.Loop_16_xx:</div><div class='add'>+	ldr	w8,[sp,#4]</div><div class='add'>+	str	w11,[sp,#0]</div><div class='add'>+	ror	w16,w24,#6</div><div class='add'>+	add	w27,w27,w19			// h+=K[i]</div><div class='add'>+	ror	w10,w5,#7</div><div class='add'>+	and	w17,w25,w24</div><div class='add'>+	ror	w9,w2,#17</div><div class='add'>+	bic	w19,w26,w24</div><div class='add'>+	ror	w11,w20,#2</div><div class='add'>+	add	w27,w27,w3			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w24,ror#11</div><div class='add'>+	eor	w10,w10,w5,ror#18</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w20,w21			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w24,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w11,w11,w20,ror#13</div><div class='add'>+	add	w27,w27,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w9,w9,w2,ror#19</div><div class='add'>+	eor	w10,w10,w5,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w27,w27,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w28,w28,w21			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w11,w20,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w9,w9,w2,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w4,w4,w13</div><div class='add'>+	add	w23,w23,w27			// d+=h</div><div class='add'>+	add	w27,w27,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	add	w4,w4,w10</div><div class='add'>+	add	w27,w27,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w4,w4,w9</div><div class='add'>+	ldr	w9,[sp,#8]</div><div class='add'>+	str	w12,[sp,#4]</div><div class='add'>+	ror	w16,w23,#6</div><div class='add'>+	add	w26,w26,w28			// h+=K[i]</div><div class='add'>+	ror	w11,w6,#7</div><div class='add'>+	and	w17,w24,w23</div><div class='add'>+	ror	w10,w3,#17</div><div class='add'>+	bic	w28,w25,w23</div><div class='add'>+	ror	w12,w27,#2</div><div class='add'>+	add	w26,w26,w4			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w23,ror#11</div><div class='add'>+	eor	w11,w11,w6,ror#18</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w27,w20			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w23,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w12,w12,w27,ror#13</div><div class='add'>+	add	w26,w26,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w10,w10,w3,ror#19</div><div class='add'>+	eor	w11,w11,w6,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w26,w26,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w19,w19,w20			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w12,w27,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w10,w10,w3,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w5,w5,w14</div><div class='add'>+	add	w22,w22,w26			// d+=h</div><div class='add'>+	add	w26,w26,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	add	w5,w5,w11</div><div class='add'>+	add	w26,w26,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w5,w5,w10</div><div class='add'>+	ldr	w10,[sp,#12]</div><div class='add'>+	str	w13,[sp,#8]</div><div class='add'>+	ror	w16,w22,#6</div><div class='add'>+	add	w25,w25,w19			// h+=K[i]</div><div class='add'>+	ror	w12,w7,#7</div><div class='add'>+	and	w17,w23,w22</div><div class='add'>+	ror	w11,w4,#17</div><div class='add'>+	bic	w19,w24,w22</div><div class='add'>+	ror	w13,w26,#2</div><div class='add'>+	add	w25,w25,w5			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w22,ror#11</div><div class='add'>+	eor	w12,w12,w7,ror#18</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w26,w27			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w22,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w13,w13,w26,ror#13</div><div class='add'>+	add	w25,w25,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w11,w11,w4,ror#19</div><div class='add'>+	eor	w12,w12,w7,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w25,w25,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w28,w28,w27			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w13,w26,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w11,w11,w4,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w6,w6,w15</div><div class='add'>+	add	w21,w21,w25			// d+=h</div><div class='add'>+	add	w25,w25,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	add	w6,w6,w12</div><div class='add'>+	add	w25,w25,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w6,w6,w11</div><div class='add'>+	ldr	w11,[sp,#0]</div><div class='add'>+	str	w14,[sp,#12]</div><div class='add'>+	ror	w16,w21,#6</div><div class='add'>+	add	w24,w24,w28			// h+=K[i]</div><div class='add'>+	ror	w13,w8,#7</div><div class='add'>+	and	w17,w22,w21</div><div class='add'>+	ror	w12,w5,#17</div><div class='add'>+	bic	w28,w23,w21</div><div class='add'>+	ror	w14,w25,#2</div><div class='add'>+	add	w24,w24,w6			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w21,ror#11</div><div class='add'>+	eor	w13,w13,w8,ror#18</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w25,w26			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w21,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w14,w14,w25,ror#13</div><div class='add'>+	add	w24,w24,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w12,w12,w5,ror#19</div><div class='add'>+	eor	w13,w13,w8,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w24,w24,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w19,w19,w26			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w14,w25,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w12,w12,w5,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w7,w7,w0</div><div class='add'>+	add	w20,w20,w24			// d+=h</div><div class='add'>+	add	w24,w24,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	add	w7,w7,w13</div><div class='add'>+	add	w24,w24,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w7,w7,w12</div><div class='add'>+	ldr	w12,[sp,#4]</div><div class='add'>+	str	w15,[sp,#0]</div><div class='add'>+	ror	w16,w20,#6</div><div class='add'>+	add	w23,w23,w19			// h+=K[i]</div><div class='add'>+	ror	w14,w9,#7</div><div class='add'>+	and	w17,w21,w20</div><div class='add'>+	ror	w13,w6,#17</div><div class='add'>+	bic	w19,w22,w20</div><div class='add'>+	ror	w15,w24,#2</div><div class='add'>+	add	w23,w23,w7			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w20,ror#11</div><div class='add'>+	eor	w14,w14,w9,ror#18</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w24,w25			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w20,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w15,w15,w24,ror#13</div><div class='add'>+	add	w23,w23,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w13,w13,w6,ror#19</div><div class='add'>+	eor	w14,w14,w9,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w23,w23,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w28,w28,w25			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w15,w24,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w13,w13,w6,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w8,w8,w1</div><div class='add'>+	add	w27,w27,w23			// d+=h</div><div class='add'>+	add	w23,w23,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	add	w8,w8,w14</div><div class='add'>+	add	w23,w23,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w8,w8,w13</div><div class='add'>+	ldr	w13,[sp,#8]</div><div class='add'>+	str	w0,[sp,#4]</div><div class='add'>+	ror	w16,w27,#6</div><div class='add'>+	add	w22,w22,w28			// h+=K[i]</div><div class='add'>+	ror	w15,w10,#7</div><div class='add'>+	and	w17,w20,w27</div><div class='add'>+	ror	w14,w7,#17</div><div class='add'>+	bic	w28,w21,w27</div><div class='add'>+	ror	w0,w23,#2</div><div class='add'>+	add	w22,w22,w8			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w27,ror#11</div><div class='add'>+	eor	w15,w15,w10,ror#18</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w23,w24			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w27,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w0,w0,w23,ror#13</div><div class='add'>+	add	w22,w22,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w14,w14,w7,ror#19</div><div class='add'>+	eor	w15,w15,w10,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w22,w22,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w19,w19,w24			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w0,w23,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w14,w14,w7,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w9,w9,w2</div><div class='add'>+	add	w26,w26,w22			// d+=h</div><div class='add'>+	add	w22,w22,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	add	w9,w9,w15</div><div class='add'>+	add	w22,w22,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w9,w9,w14</div><div class='add'>+	ldr	w14,[sp,#12]</div><div class='add'>+	str	w1,[sp,#8]</div><div class='add'>+	ror	w16,w26,#6</div><div class='add'>+	add	w21,w21,w19			// h+=K[i]</div><div class='add'>+	ror	w0,w11,#7</div><div class='add'>+	and	w17,w27,w26</div><div class='add'>+	ror	w15,w8,#17</div><div class='add'>+	bic	w19,w20,w26</div><div class='add'>+	ror	w1,w22,#2</div><div class='add'>+	add	w21,w21,w9			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w26,ror#11</div><div class='add'>+	eor	w0,w0,w11,ror#18</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w22,w23			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w26,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w1,w1,w22,ror#13</div><div class='add'>+	add	w21,w21,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w15,w15,w8,ror#19</div><div class='add'>+	eor	w0,w0,w11,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w21,w21,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w28,w28,w23			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w1,w22,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w15,w15,w8,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w10,w10,w3</div><div class='add'>+	add	w25,w25,w21			// d+=h</div><div class='add'>+	add	w21,w21,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	add	w10,w10,w0</div><div class='add'>+	add	w21,w21,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w10,w10,w15</div><div class='add'>+	ldr	w15,[sp,#0]</div><div class='add'>+	str	w2,[sp,#12]</div><div class='add'>+	ror	w16,w25,#6</div><div class='add'>+	add	w20,w20,w28			// h+=K[i]</div><div class='add'>+	ror	w1,w12,#7</div><div class='add'>+	and	w17,w26,w25</div><div class='add'>+	ror	w0,w9,#17</div><div class='add'>+	bic	w28,w27,w25</div><div class='add'>+	ror	w2,w21,#2</div><div class='add'>+	add	w20,w20,w10			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w25,ror#11</div><div class='add'>+	eor	w1,w1,w12,ror#18</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w21,w22			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w25,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w2,w2,w21,ror#13</div><div class='add'>+	add	w20,w20,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w0,w0,w9,ror#19</div><div class='add'>+	eor	w1,w1,w12,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w20,w20,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w19,w19,w22			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w2,w21,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w0,w0,w9,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w11,w11,w4</div><div class='add'>+	add	w24,w24,w20			// d+=h</div><div class='add'>+	add	w20,w20,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	add	w11,w11,w1</div><div class='add'>+	add	w20,w20,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w11,w11,w0</div><div class='add'>+	ldr	w0,[sp,#4]</div><div class='add'>+	str	w3,[sp,#0]</div><div class='add'>+	ror	w16,w24,#6</div><div class='add'>+	add	w27,w27,w19			// h+=K[i]</div><div class='add'>+	ror	w2,w13,#7</div><div class='add'>+	and	w17,w25,w24</div><div class='add'>+	ror	w1,w10,#17</div><div class='add'>+	bic	w19,w26,w24</div><div class='add'>+	ror	w3,w20,#2</div><div class='add'>+	add	w27,w27,w11			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w24,ror#11</div><div class='add'>+	eor	w2,w2,w13,ror#18</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w20,w21			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w24,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w3,w3,w20,ror#13</div><div class='add'>+	add	w27,w27,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w1,w1,w10,ror#19</div><div class='add'>+	eor	w2,w2,w13,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w27,w27,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w28,w28,w21			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w3,w20,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w1,w1,w10,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w12,w12,w5</div><div class='add'>+	add	w23,w23,w27			// d+=h</div><div class='add'>+	add	w27,w27,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	add	w12,w12,w2</div><div class='add'>+	add	w27,w27,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w12,w12,w1</div><div class='add'>+	ldr	w1,[sp,#8]</div><div class='add'>+	str	w4,[sp,#4]</div><div class='add'>+	ror	w16,w23,#6</div><div class='add'>+	add	w26,w26,w28			// h+=K[i]</div><div class='add'>+	ror	w3,w14,#7</div><div class='add'>+	and	w17,w24,w23</div><div class='add'>+	ror	w2,w11,#17</div><div class='add'>+	bic	w28,w25,w23</div><div class='add'>+	ror	w4,w27,#2</div><div class='add'>+	add	w26,w26,w12			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w23,ror#11</div><div class='add'>+	eor	w3,w3,w14,ror#18</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w27,w20			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w23,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w4,w4,w27,ror#13</div><div class='add'>+	add	w26,w26,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w2,w2,w11,ror#19</div><div class='add'>+	eor	w3,w3,w14,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w26,w26,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w19,w19,w20			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w4,w27,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w2,w2,w11,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w13,w13,w6</div><div class='add'>+	add	w22,w22,w26			// d+=h</div><div class='add'>+	add	w26,w26,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	add	w13,w13,w3</div><div class='add'>+	add	w26,w26,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w13,w13,w2</div><div class='add'>+	ldr	w2,[sp,#12]</div><div class='add'>+	str	w5,[sp,#8]</div><div class='add'>+	ror	w16,w22,#6</div><div class='add'>+	add	w25,w25,w19			// h+=K[i]</div><div class='add'>+	ror	w4,w15,#7</div><div class='add'>+	and	w17,w23,w22</div><div class='add'>+	ror	w3,w12,#17</div><div class='add'>+	bic	w19,w24,w22</div><div class='add'>+	ror	w5,w26,#2</div><div class='add'>+	add	w25,w25,w13			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w22,ror#11</div><div class='add'>+	eor	w4,w4,w15,ror#18</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w26,w27			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w22,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w5,w5,w26,ror#13</div><div class='add'>+	add	w25,w25,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w3,w3,w12,ror#19</div><div class='add'>+	eor	w4,w4,w15,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w25,w25,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w28,w28,w27			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w5,w26,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w3,w3,w12,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w14,w14,w7</div><div class='add'>+	add	w21,w21,w25			// d+=h</div><div class='add'>+	add	w25,w25,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	add	w14,w14,w4</div><div class='add'>+	add	w25,w25,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w14,w14,w3</div><div class='add'>+	ldr	w3,[sp,#0]</div><div class='add'>+	str	w6,[sp,#12]</div><div class='add'>+	ror	w16,w21,#6</div><div class='add'>+	add	w24,w24,w28			// h+=K[i]</div><div class='add'>+	ror	w5,w0,#7</div><div class='add'>+	and	w17,w22,w21</div><div class='add'>+	ror	w4,w13,#17</div><div class='add'>+	bic	w28,w23,w21</div><div class='add'>+	ror	w6,w25,#2</div><div class='add'>+	add	w24,w24,w14			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w21,ror#11</div><div class='add'>+	eor	w5,w5,w0,ror#18</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w25,w26			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w21,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w6,w6,w25,ror#13</div><div class='add'>+	add	w24,w24,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w4,w4,w13,ror#19</div><div class='add'>+	eor	w5,w5,w0,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w24,w24,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w19,w19,w26			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w6,w25,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w4,w4,w13,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w15,w15,w8</div><div class='add'>+	add	w20,w20,w24			// d+=h</div><div class='add'>+	add	w24,w24,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	add	w15,w15,w5</div><div class='add'>+	add	w24,w24,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w15,w15,w4</div><div class='add'>+	ldr	w4,[sp,#4]</div><div class='add'>+	str	w7,[sp,#0]</div><div class='add'>+	ror	w16,w20,#6</div><div class='add'>+	add	w23,w23,w19			// h+=K[i]</div><div class='add'>+	ror	w6,w1,#7</div><div class='add'>+	and	w17,w21,w20</div><div class='add'>+	ror	w5,w14,#17</div><div class='add'>+	bic	w19,w22,w20</div><div class='add'>+	ror	w7,w24,#2</div><div class='add'>+	add	w23,w23,w15			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w20,ror#11</div><div class='add'>+	eor	w6,w6,w1,ror#18</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w24,w25			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w20,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w7,w7,w24,ror#13</div><div class='add'>+	add	w23,w23,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w5,w5,w14,ror#19</div><div class='add'>+	eor	w6,w6,w1,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w23,w23,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w28,w28,w25			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w7,w24,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w5,w5,w14,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w0,w0,w9</div><div class='add'>+	add	w27,w27,w23			// d+=h</div><div class='add'>+	add	w23,w23,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	add	w0,w0,w6</div><div class='add'>+	add	w23,w23,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w0,w0,w5</div><div class='add'>+	ldr	w5,[sp,#8]</div><div class='add'>+	str	w8,[sp,#4]</div><div class='add'>+	ror	w16,w27,#6</div><div class='add'>+	add	w22,w22,w28			// h+=K[i]</div><div class='add'>+	ror	w7,w2,#7</div><div class='add'>+	and	w17,w20,w27</div><div class='add'>+	ror	w6,w15,#17</div><div class='add'>+	bic	w28,w21,w27</div><div class='add'>+	ror	w8,w23,#2</div><div class='add'>+	add	w22,w22,w0			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w27,ror#11</div><div class='add'>+	eor	w7,w7,w2,ror#18</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w23,w24			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w27,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w8,w8,w23,ror#13</div><div class='add'>+	add	w22,w22,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w6,w6,w15,ror#19</div><div class='add'>+	eor	w7,w7,w2,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w22,w22,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w19,w19,w24			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w8,w23,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w6,w6,w15,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w1,w1,w10</div><div class='add'>+	add	w26,w26,w22			// d+=h</div><div class='add'>+	add	w22,w22,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	add	w1,w1,w7</div><div class='add'>+	add	w22,w22,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w1,w1,w6</div><div class='add'>+	ldr	w6,[sp,#12]</div><div class='add'>+	str	w9,[sp,#8]</div><div class='add'>+	ror	w16,w26,#6</div><div class='add'>+	add	w21,w21,w19			// h+=K[i]</div><div class='add'>+	ror	w8,w3,#7</div><div class='add'>+	and	w17,w27,w26</div><div class='add'>+	ror	w7,w0,#17</div><div class='add'>+	bic	w19,w20,w26</div><div class='add'>+	ror	w9,w22,#2</div><div class='add'>+	add	w21,w21,w1			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w26,ror#11</div><div class='add'>+	eor	w8,w8,w3,ror#18</div><div class='add'>+	orr	w17,w17,w19			// Ch(e,f,g)</div><div class='add'>+	eor	w19,w22,w23			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w26,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w9,w9,w22,ror#13</div><div class='add'>+	add	w21,w21,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w28,w28,w19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w7,w7,w0,ror#19</div><div class='add'>+	eor	w8,w8,w3,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w21,w21,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w28,w28,w23			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w9,w22,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w7,w7,w0,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w2,w2,w11</div><div class='add'>+	add	w25,w25,w21			// d+=h</div><div class='add'>+	add	w21,w21,w28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w28,[x30],#4		// *K++, w19 in next round</div><div class='add'>+	add	w2,w2,w8</div><div class='add'>+	add	w21,w21,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w2,w2,w7</div><div class='add'>+	ldr	w7,[sp,#0]</div><div class='add'>+	str	w10,[sp,#12]</div><div class='add'>+	ror	w16,w25,#6</div><div class='add'>+	add	w20,w20,w28			// h+=K[i]</div><div class='add'>+	ror	w9,w4,#7</div><div class='add'>+	and	w17,w26,w25</div><div class='add'>+	ror	w8,w1,#17</div><div class='add'>+	bic	w28,w27,w25</div><div class='add'>+	ror	w10,w21,#2</div><div class='add'>+	add	w20,w20,w2			// h+=X[i]</div><div class='add'>+	eor	w16,w16,w25,ror#11</div><div class='add'>+	eor	w9,w9,w4,ror#18</div><div class='add'>+	orr	w17,w17,w28			// Ch(e,f,g)</div><div class='add'>+	eor	w28,w21,w22			// a^b, b^c in next round</div><div class='add'>+	eor	w16,w16,w25,ror#25	// Sigma1(e)</div><div class='add'>+	eor	w10,w10,w21,ror#13</div><div class='add'>+	add	w20,w20,w17			// h+=Ch(e,f,g)</div><div class='add'>+	and	w19,w19,w28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	w8,w8,w1,ror#19</div><div class='add'>+	eor	w9,w9,w4,lsr#3	// sigma0(X[i+1])</div><div class='add'>+	add	w20,w20,w16			// h+=Sigma1(e)</div><div class='add'>+	eor	w19,w19,w22			// Maj(a,b,c)</div><div class='add'>+	eor	w17,w10,w21,ror#22	// Sigma0(a)</div><div class='add'>+	eor	w8,w8,w1,lsr#10	// sigma1(X[i+14])</div><div class='add'>+	add	w3,w3,w12</div><div class='add'>+	add	w24,w24,w20			// d+=h</div><div class='add'>+	add	w20,w20,w19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	w19,[x30],#4		// *K++, w28 in next round</div><div class='add'>+	add	w3,w3,w9</div><div class='add'>+	add	w20,w20,w17			// h+=Sigma0(a)</div><div class='add'>+	add	w3,w3,w8</div><div class='add'>+	cbnz	w19,.Loop_16_xx</div><div class='add'>+</div><div class='add'>+	ldp	x0,x2,[x29,#96]</div><div class='add'>+	ldr	x1,[x29,#112]</div><div class='add'>+	sub	x30,x30,#260		// rewind</div><div class='add'>+</div><div class='add'>+	ldp	w3,w4,[x0]</div><div class='add'>+	ldp	w5,w6,[x0,#2*4]</div><div class='add'>+	add	x1,x1,#14*4			// advance input pointer</div><div class='add'>+	ldp	w7,w8,[x0,#4*4]</div><div class='add'>+	add	w20,w20,w3</div><div class='add'>+	ldp	w9,w10,[x0,#6*4]</div><div class='add'>+	add	w21,w21,w4</div><div class='add'>+	add	w22,w22,w5</div><div class='add'>+	add	w23,w23,w6</div><div class='add'>+	stp	w20,w21,[x0]</div><div class='add'>+	add	w24,w24,w7</div><div class='add'>+	add	w25,w25,w8</div><div class='add'>+	stp	w22,w23,[x0,#2*4]</div><div class='add'>+	add	w26,w26,w9</div><div class='add'>+	add	w27,w27,w10</div><div class='add'>+	cmp	x1,x2</div><div class='add'>+	stp	w24,w25,[x0,#4*4]</div><div class='add'>+	stp	w26,w27,[x0,#6*4]</div><div class='add'>+	b.ne	.Loop</div><div class='add'>+</div><div class='add'>+	ldp	x19,x20,[x29,#16]</div><div class='add'>+	add	sp,sp,#4*4</div><div class='add'>+	ldp	x21,x22,[x29,#32]</div><div class='add'>+	ldp	x23,x24,[x29,#48]</div><div class='add'>+	ldp	x25,x26,[x29,#64]</div><div class='add'>+	ldp	x27,x28,[x29,#80]</div><div class='add'>+	ldp	x29,x30,[sp],#128</div><div class='add'>+	ret</div><div class='add'>+.size	sha256_block_data_order,.-sha256_block_data_order</div><div class='add'>+</div><div class='add'>+.align	6</div><div class='add'>+.type	.LK256,%object</div><div class='add'>+.LK256:</div><div class='add'>+	.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5</div><div class='add'>+	.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5</div><div class='add'>+	.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3</div><div class='add'>+	.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174</div><div class='add'>+	.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc</div><div class='add'>+	.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da</div><div class='add'>+	.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7</div><div class='add'>+	.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967</div><div class='add'>+	.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13</div><div class='add'>+	.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85</div><div class='add'>+	.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3</div><div class='add'>+	.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070</div><div class='add'>+	.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5</div><div class='add'>+	.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3</div><div class='add'>+	.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208</div><div class='add'>+	.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2</div><div class='add'>+	.long	0	//terminator</div><div class='add'>+.size	.LK256,.-.LK256</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+.align	3</div><div class='add'>+.LOPENSSL_armcap_P:</div><div class='add'>+# ifdef	__ILP32__</div><div class='add'>+	.long	OPENSSL_armcap_P-.</div><div class='add'>+# else</div><div class='add'>+	.quad	OPENSSL_armcap_P-.</div><div class='add'>+# endif</div><div class='add'>+#endif</div><div class='add'>+.asciz	"SHA256 block transform for ARMv8, CRYPTOGAMS by &lt;appro@openssl.org&gt;"</div><div class='add'>+.align	2</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+.type	sha256_block_armv8,%function</div><div class='add'>+.align	6</div><div class='add'>+sha256_block_armv8:</div><div class='add'>+.Lv8_entry:</div><div class='add'>+	stp		x29,x30,[sp,#-16]!</div><div class='add'>+	add		x29,sp,#0</div><div class='add'>+</div><div class='add'>+	ld1		{v0.4s,v1.4s},[x0]</div><div class='add'>+	adr		x3,.LK256</div><div class='add'>+</div><div class='add'>+.Loop_hw:</div><div class='add'>+	ld1		{v4.16b-v7.16b},[x1],#64</div><div class='add'>+	sub		x2,x2,#1</div><div class='add'>+	ld1		{v16.4s},[x3],#16</div><div class='add'>+	rev32		v4.16b,v4.16b</div><div class='add'>+	rev32		v5.16b,v5.16b</div><div class='add'>+	rev32		v6.16b,v6.16b</div><div class='add'>+	rev32		v7.16b,v7.16b</div><div class='add'>+	orr		v18.16b,v0.16b,v0.16b		// offload</div><div class='add'>+	orr		v19.16b,v1.16b,v1.16b</div><div class='add'>+	ld1		{v17.4s},[x3],#16</div><div class='add'>+	add		v16.4s,v16.4s,v4.4s</div><div class='add'>+	.inst	0x5e2828a4	//sha256su0 v4.16b,v5.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e104020	//sha256h v0.16b,v1.16b,v16.4s</div><div class='add'>+	.inst	0x5e105041	//sha256h2 v1.16b,v2.16b,v16.4s</div><div class='add'>+	.inst	0x5e0760c4	//sha256su1 v4.16b,v6.16b,v7.16b</div><div class='add'>+	ld1		{v16.4s},[x3],#16</div><div class='add'>+	add		v17.4s,v17.4s,v5.4s</div><div class='add'>+	.inst	0x5e2828c5	//sha256su0 v5.16b,v6.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e114020	//sha256h v0.16b,v1.16b,v17.4s</div><div class='add'>+	.inst	0x5e115041	//sha256h2 v1.16b,v2.16b,v17.4s</div><div class='add'>+	.inst	0x5e0460e5	//sha256su1 v5.16b,v7.16b,v4.16b</div><div class='add'>+	ld1		{v17.4s},[x3],#16</div><div class='add'>+	add		v16.4s,v16.4s,v6.4s</div><div class='add'>+	.inst	0x5e2828e6	//sha256su0 v6.16b,v7.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e104020	//sha256h v0.16b,v1.16b,v16.4s</div><div class='add'>+	.inst	0x5e105041	//sha256h2 v1.16b,v2.16b,v16.4s</div><div class='add'>+	.inst	0x5e056086	//sha256su1 v6.16b,v4.16b,v5.16b</div><div class='add'>+	ld1		{v16.4s},[x3],#16</div><div class='add'>+	add		v17.4s,v17.4s,v7.4s</div><div class='add'>+	.inst	0x5e282887	//sha256su0 v7.16b,v4.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e114020	//sha256h v0.16b,v1.16b,v17.4s</div><div class='add'>+	.inst	0x5e115041	//sha256h2 v1.16b,v2.16b,v17.4s</div><div class='add'>+	.inst	0x5e0660a7	//sha256su1 v7.16b,v5.16b,v6.16b</div><div class='add'>+	ld1		{v17.4s},[x3],#16</div><div class='add'>+	add		v16.4s,v16.4s,v4.4s</div><div class='add'>+	.inst	0x5e2828a4	//sha256su0 v4.16b,v5.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e104020	//sha256h v0.16b,v1.16b,v16.4s</div><div class='add'>+	.inst	0x5e105041	//sha256h2 v1.16b,v2.16b,v16.4s</div><div class='add'>+	.inst	0x5e0760c4	//sha256su1 v4.16b,v6.16b,v7.16b</div><div class='add'>+	ld1		{v16.4s},[x3],#16</div><div class='add'>+	add		v17.4s,v17.4s,v5.4s</div><div class='add'>+	.inst	0x5e2828c5	//sha256su0 v5.16b,v6.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e114020	//sha256h v0.16b,v1.16b,v17.4s</div><div class='add'>+	.inst	0x5e115041	//sha256h2 v1.16b,v2.16b,v17.4s</div><div class='add'>+	.inst	0x5e0460e5	//sha256su1 v5.16b,v7.16b,v4.16b</div><div class='add'>+	ld1		{v17.4s},[x3],#16</div><div class='add'>+	add		v16.4s,v16.4s,v6.4s</div><div class='add'>+	.inst	0x5e2828e6	//sha256su0 v6.16b,v7.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e104020	//sha256h v0.16b,v1.16b,v16.4s</div><div class='add'>+	.inst	0x5e105041	//sha256h2 v1.16b,v2.16b,v16.4s</div><div class='add'>+	.inst	0x5e056086	//sha256su1 v6.16b,v4.16b,v5.16b</div><div class='add'>+	ld1		{v16.4s},[x3],#16</div><div class='add'>+	add		v17.4s,v17.4s,v7.4s</div><div class='add'>+	.inst	0x5e282887	//sha256su0 v7.16b,v4.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e114020	//sha256h v0.16b,v1.16b,v17.4s</div><div class='add'>+	.inst	0x5e115041	//sha256h2 v1.16b,v2.16b,v17.4s</div><div class='add'>+	.inst	0x5e0660a7	//sha256su1 v7.16b,v5.16b,v6.16b</div><div class='add'>+	ld1		{v17.4s},[x3],#16</div><div class='add'>+	add		v16.4s,v16.4s,v4.4s</div><div class='add'>+	.inst	0x5e2828a4	//sha256su0 v4.16b,v5.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e104020	//sha256h v0.16b,v1.16b,v16.4s</div><div class='add'>+	.inst	0x5e105041	//sha256h2 v1.16b,v2.16b,v16.4s</div><div class='add'>+	.inst	0x5e0760c4	//sha256su1 v4.16b,v6.16b,v7.16b</div><div class='add'>+	ld1		{v16.4s},[x3],#16</div><div class='add'>+	add		v17.4s,v17.4s,v5.4s</div><div class='add'>+	.inst	0x5e2828c5	//sha256su0 v5.16b,v6.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e114020	//sha256h v0.16b,v1.16b,v17.4s</div><div class='add'>+	.inst	0x5e115041	//sha256h2 v1.16b,v2.16b,v17.4s</div><div class='add'>+	.inst	0x5e0460e5	//sha256su1 v5.16b,v7.16b,v4.16b</div><div class='add'>+	ld1		{v17.4s},[x3],#16</div><div class='add'>+	add		v16.4s,v16.4s,v6.4s</div><div class='add'>+	.inst	0x5e2828e6	//sha256su0 v6.16b,v7.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e104020	//sha256h v0.16b,v1.16b,v16.4s</div><div class='add'>+	.inst	0x5e105041	//sha256h2 v1.16b,v2.16b,v16.4s</div><div class='add'>+	.inst	0x5e056086	//sha256su1 v6.16b,v4.16b,v5.16b</div><div class='add'>+	ld1		{v16.4s},[x3],#16</div><div class='add'>+	add		v17.4s,v17.4s,v7.4s</div><div class='add'>+	.inst	0x5e282887	//sha256su0 v7.16b,v4.16b</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e114020	//sha256h v0.16b,v1.16b,v17.4s</div><div class='add'>+	.inst	0x5e115041	//sha256h2 v1.16b,v2.16b,v17.4s</div><div class='add'>+	.inst	0x5e0660a7	//sha256su1 v7.16b,v5.16b,v6.16b</div><div class='add'>+	ld1		{v17.4s},[x3],#16</div><div class='add'>+	add		v16.4s,v16.4s,v4.4s</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e104020	//sha256h v0.16b,v1.16b,v16.4s</div><div class='add'>+	.inst	0x5e105041	//sha256h2 v1.16b,v2.16b,v16.4s</div><div class='add'>+</div><div class='add'>+	ld1		{v16.4s},[x3],#16</div><div class='add'>+	add		v17.4s,v17.4s,v5.4s</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e114020	//sha256h v0.16b,v1.16b,v17.4s</div><div class='add'>+	.inst	0x5e115041	//sha256h2 v1.16b,v2.16b,v17.4s</div><div class='add'>+</div><div class='add'>+	ld1		{v17.4s},[x3]</div><div class='add'>+	add		v16.4s,v16.4s,v6.4s</div><div class='add'>+	sub		x3,x3,#64*4-16	// rewind</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e104020	//sha256h v0.16b,v1.16b,v16.4s</div><div class='add'>+	.inst	0x5e105041	//sha256h2 v1.16b,v2.16b,v16.4s</div><div class='add'>+</div><div class='add'>+	add		v17.4s,v17.4s,v7.4s</div><div class='add'>+	orr		v2.16b,v0.16b,v0.16b</div><div class='add'>+	.inst	0x5e114020	//sha256h v0.16b,v1.16b,v17.4s</div><div class='add'>+	.inst	0x5e115041	//sha256h2 v1.16b,v2.16b,v17.4s</div><div class='add'>+</div><div class='add'>+	add		v0.4s,v0.4s,v18.4s</div><div class='add'>+	add		v1.4s,v1.4s,v19.4s</div><div class='add'>+</div><div class='add'>+	cbnz		x2,.Loop_hw</div><div class='add'>+</div><div class='add'>+	st1		{v0.4s,v1.4s},[x0]</div><div class='add'>+</div><div class='add'>+	ldr		x29,[sp],#16</div><div class='add'>+	ret</div><div class='add'>+.size	sha256_block_armv8,.-sha256_block_armv8</div><div class='add'>+#endif</div><div class='add'>+#ifdef	__KERNEL__</div><div class='add'>+.globl	sha256_block_neon</div><div class='add'>+#endif</div><div class='add'>+.type	sha256_block_neon,%function</div><div class='add'>+.align	4</div><div class='add'>+sha256_block_neon:</div><div class='add'>+.Lneon_entry:</div><div class='add'>+	stp	x29, x30, [sp, #-16]!</div><div class='add'>+	mov	x29, sp</div><div class='add'>+	sub	sp,sp,#16*4</div><div class='add'>+</div><div class='add'>+	adr	x16,.LK256</div><div class='add'>+	add	x2,x1,x2,lsl#6	// len to point at the end of inp</div><div class='add'>+</div><div class='add'>+	ld1	{v0.16b},[x1], #16</div><div class='add'>+	ld1	{v1.16b},[x1], #16</div><div class='add'>+	ld1	{v2.16b},[x1], #16</div><div class='add'>+	ld1	{v3.16b},[x1], #16</div><div class='add'>+	ld1	{v4.4s},[x16], #16</div><div class='add'>+	ld1	{v5.4s},[x16], #16</div><div class='add'>+	ld1	{v6.4s},[x16], #16</div><div class='add'>+	ld1	{v7.4s},[x16], #16</div><div class='add'>+	rev32	v0.16b,v0.16b		// yes, even on</div><div class='add'>+	rev32	v1.16b,v1.16b		// big-endian</div><div class='add'>+	rev32	v2.16b,v2.16b</div><div class='add'>+	rev32	v3.16b,v3.16b</div><div class='add'>+	mov	x17,sp</div><div class='add'>+	add	v4.4s,v4.4s,v0.4s</div><div class='add'>+	add	v5.4s,v5.4s,v1.4s</div><div class='add'>+	add	v6.4s,v6.4s,v2.4s</div><div class='add'>+	st1	{v4.4s-v5.4s},[x17], #32</div><div class='add'>+	add	v7.4s,v7.4s,v3.4s</div><div class='add'>+	st1	{v6.4s-v7.4s},[x17]</div><div class='add'>+	sub	x17,x17,#32</div><div class='add'>+</div><div class='add'>+	ldp	w3,w4,[x0]</div><div class='add'>+	ldp	w5,w6,[x0,#8]</div><div class='add'>+	ldp	w7,w8,[x0,#16]</div><div class='add'>+	ldp	w9,w10,[x0,#24]</div><div class='add'>+	ldr	w12,[sp,#0]</div><div class='add'>+	mov	w13,wzr</div><div class='add'>+	eor	w14,w4,w5</div><div class='add'>+	mov	w15,wzr</div><div class='add'>+	b	.L_00_48</div><div class='add'>+</div><div class='add'>+.align	4</div><div class='add'>+.L_00_48:</div><div class='add'>+	ext	v4.16b,v0.16b,v1.16b,#4</div><div class='add'>+	add	w10,w10,w12</div><div class='add'>+	add	w3,w3,w15</div><div class='add'>+	and	w12,w8,w7</div><div class='add'>+	bic	w15,w9,w7</div><div class='add'>+	ext	v7.16b,v2.16b,v3.16b,#4</div><div class='add'>+	eor	w11,w7,w7,ror#5</div><div class='add'>+	add	w3,w3,w13</div><div class='add'>+	mov	d19,v3.d[1]</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w7,ror#19</div><div class='add'>+	ushr	v6.4s,v4.4s,#7</div><div class='add'>+	eor	w15,w3,w3,ror#11</div><div class='add'>+	ushr	v5.4s,v4.4s,#3</div><div class='add'>+	add	w10,w10,w12</div><div class='add'>+	add	v0.4s,v0.4s,v7.4s</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	sli	v6.4s,v4.4s,#25</div><div class='add'>+	eor	w13,w3,w4</div><div class='add'>+	eor	w15,w15,w3,ror#20</div><div class='add'>+	ushr	v7.4s,v4.4s,#18</div><div class='add'>+	add	w10,w10,w11</div><div class='add'>+	ldr	w12,[sp,#4]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	eor	v5.16b,v5.16b,v6.16b</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w6,w6,w10</div><div class='add'>+	sli	v7.4s,v4.4s,#14</div><div class='add'>+	eor	w14,w14,w4</div><div class='add'>+	ushr	v16.4s,v19.4s,#17</div><div class='add'>+	add	w9,w9,w12</div><div class='add'>+	add	w10,w10,w15</div><div class='add'>+	and	w12,w7,w6</div><div class='add'>+	eor	v5.16b,v5.16b,v7.16b</div><div class='add'>+	bic	w15,w8,w6</div><div class='add'>+	eor	w11,w6,w6,ror#5</div><div class='add'>+	sli	v16.4s,v19.4s,#15</div><div class='add'>+	add	w10,w10,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	ushr	v17.4s,v19.4s,#10</div><div class='add'>+	eor	w11,w11,w6,ror#19</div><div class='add'>+	eor	w15,w10,w10,ror#11</div><div class='add'>+	ushr	v7.4s,v19.4s,#19</div><div class='add'>+	add	w9,w9,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	add	v0.4s,v0.4s,v5.4s</div><div class='add'>+	eor	w14,w10,w3</div><div class='add'>+	eor	w15,w15,w10,ror#20</div><div class='add'>+	sli	v7.4s,v19.4s,#13</div><div class='add'>+	add	w9,w9,w11</div><div class='add'>+	ldr	w12,[sp,#8]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	eor	v17.16b,v17.16b,v16.16b</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w5,w5,w9</div><div class='add'>+	eor	w13,w13,w3</div><div class='add'>+	eor	v17.16b,v17.16b,v7.16b</div><div class='add'>+	add	w8,w8,w12</div><div class='add'>+	add	w9,w9,w15</div><div class='add'>+	and	w12,w6,w5</div><div class='add'>+	add	v0.4s,v0.4s,v17.4s</div><div class='add'>+	bic	w15,w7,w5</div><div class='add'>+	eor	w11,w5,w5,ror#5</div><div class='add'>+	add	w9,w9,w13</div><div class='add'>+	ushr	v18.4s,v0.4s,#17</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	ushr	v19.4s,v0.4s,#10</div><div class='add'>+	eor	w11,w11,w5,ror#19</div><div class='add'>+	eor	w15,w9,w9,ror#11</div><div class='add'>+	sli	v18.4s,v0.4s,#15</div><div class='add'>+	add	w8,w8,w12</div><div class='add'>+	ushr	v17.4s,v0.4s,#19</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w9,w10</div><div class='add'>+	eor	v19.16b,v19.16b,v18.16b</div><div class='add'>+	eor	w15,w15,w9,ror#20</div><div class='add'>+	add	w8,w8,w11</div><div class='add'>+	sli	v17.4s,v0.4s,#13</div><div class='add'>+	ldr	w12,[sp,#12]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	ld1	{v4.4s},[x16], #16</div><div class='add'>+	add	w4,w4,w8</div><div class='add'>+	eor	v19.16b,v19.16b,v17.16b</div><div class='add'>+	eor	w14,w14,w10</div><div class='add'>+	eor	v17.16b,v17.16b,v17.16b</div><div class='add'>+	add	w7,w7,w12</div><div class='add'>+	add	w8,w8,w15</div><div class='add'>+	and	w12,w5,w4</div><div class='add'>+	mov	v17.d[1],v19.d[0]</div><div class='add'>+	bic	w15,w6,w4</div><div class='add'>+	eor	w11,w4,w4,ror#5</div><div class='add'>+	add	w8,w8,w14</div><div class='add'>+	add	v0.4s,v0.4s,v17.4s</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w4,ror#19</div><div class='add'>+	eor	w15,w8,w8,ror#11</div><div class='add'>+	add	v4.4s,v4.4s,v0.4s</div><div class='add'>+	add	w7,w7,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w8,w9</div><div class='add'>+	eor	w15,w15,w8,ror#20</div><div class='add'>+	add	w7,w7,w11</div><div class='add'>+	ldr	w12,[sp,#16]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w3,w3,w7</div><div class='add'>+	eor	w13,w13,w9</div><div class='add'>+	st1	{v4.4s},[x17], #16</div><div class='add'>+	ext	v4.16b,v1.16b,v2.16b,#4</div><div class='add'>+	add	w6,w6,w12</div><div class='add'>+	add	w7,w7,w15</div><div class='add'>+	and	w12,w4,w3</div><div class='add'>+	bic	w15,w5,w3</div><div class='add'>+	ext	v7.16b,v3.16b,v0.16b,#4</div><div class='add'>+	eor	w11,w3,w3,ror#5</div><div class='add'>+	add	w7,w7,w13</div><div class='add'>+	mov	d19,v0.d[1]</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w3,ror#19</div><div class='add'>+	ushr	v6.4s,v4.4s,#7</div><div class='add'>+	eor	w15,w7,w7,ror#11</div><div class='add'>+	ushr	v5.4s,v4.4s,#3</div><div class='add'>+	add	w6,w6,w12</div><div class='add'>+	add	v1.4s,v1.4s,v7.4s</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	sli	v6.4s,v4.4s,#25</div><div class='add'>+	eor	w13,w7,w8</div><div class='add'>+	eor	w15,w15,w7,ror#20</div><div class='add'>+	ushr	v7.4s,v4.4s,#18</div><div class='add'>+	add	w6,w6,w11</div><div class='add'>+	ldr	w12,[sp,#20]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	eor	v5.16b,v5.16b,v6.16b</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w10,w10,w6</div><div class='add'>+	sli	v7.4s,v4.4s,#14</div><div class='add'>+	eor	w14,w14,w8</div><div class='add'>+	ushr	v16.4s,v19.4s,#17</div><div class='add'>+	add	w5,w5,w12</div><div class='add'>+	add	w6,w6,w15</div><div class='add'>+	and	w12,w3,w10</div><div class='add'>+	eor	v5.16b,v5.16b,v7.16b</div><div class='add'>+	bic	w15,w4,w10</div><div class='add'>+	eor	w11,w10,w10,ror#5</div><div class='add'>+	sli	v16.4s,v19.4s,#15</div><div class='add'>+	add	w6,w6,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	ushr	v17.4s,v19.4s,#10</div><div class='add'>+	eor	w11,w11,w10,ror#19</div><div class='add'>+	eor	w15,w6,w6,ror#11</div><div class='add'>+	ushr	v7.4s,v19.4s,#19</div><div class='add'>+	add	w5,w5,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	add	v1.4s,v1.4s,v5.4s</div><div class='add'>+	eor	w14,w6,w7</div><div class='add'>+	eor	w15,w15,w6,ror#20</div><div class='add'>+	sli	v7.4s,v19.4s,#13</div><div class='add'>+	add	w5,w5,w11</div><div class='add'>+	ldr	w12,[sp,#24]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	eor	v17.16b,v17.16b,v16.16b</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w9,w9,w5</div><div class='add'>+	eor	w13,w13,w7</div><div class='add'>+	eor	v17.16b,v17.16b,v7.16b</div><div class='add'>+	add	w4,w4,w12</div><div class='add'>+	add	w5,w5,w15</div><div class='add'>+	and	w12,w10,w9</div><div class='add'>+	add	v1.4s,v1.4s,v17.4s</div><div class='add'>+	bic	w15,w3,w9</div><div class='add'>+	eor	w11,w9,w9,ror#5</div><div class='add'>+	add	w5,w5,w13</div><div class='add'>+	ushr	v18.4s,v1.4s,#17</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	ushr	v19.4s,v1.4s,#10</div><div class='add'>+	eor	w11,w11,w9,ror#19</div><div class='add'>+	eor	w15,w5,w5,ror#11</div><div class='add'>+	sli	v18.4s,v1.4s,#15</div><div class='add'>+	add	w4,w4,w12</div><div class='add'>+	ushr	v17.4s,v1.4s,#19</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w5,w6</div><div class='add'>+	eor	v19.16b,v19.16b,v18.16b</div><div class='add'>+	eor	w15,w15,w5,ror#20</div><div class='add'>+	add	w4,w4,w11</div><div class='add'>+	sli	v17.4s,v1.4s,#13</div><div class='add'>+	ldr	w12,[sp,#28]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	ld1	{v4.4s},[x16], #16</div><div class='add'>+	add	w8,w8,w4</div><div class='add'>+	eor	v19.16b,v19.16b,v17.16b</div><div class='add'>+	eor	w14,w14,w6</div><div class='add'>+	eor	v17.16b,v17.16b,v17.16b</div><div class='add'>+	add	w3,w3,w12</div><div class='add'>+	add	w4,w4,w15</div><div class='add'>+	and	w12,w9,w8</div><div class='add'>+	mov	v17.d[1],v19.d[0]</div><div class='add'>+	bic	w15,w10,w8</div><div class='add'>+	eor	w11,w8,w8,ror#5</div><div class='add'>+	add	w4,w4,w14</div><div class='add'>+	add	v1.4s,v1.4s,v17.4s</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w8,ror#19</div><div class='add'>+	eor	w15,w4,w4,ror#11</div><div class='add'>+	add	v4.4s,v4.4s,v1.4s</div><div class='add'>+	add	w3,w3,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w4,w5</div><div class='add'>+	eor	w15,w15,w4,ror#20</div><div class='add'>+	add	w3,w3,w11</div><div class='add'>+	ldr	w12,[sp,#32]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w7,w7,w3</div><div class='add'>+	eor	w13,w13,w5</div><div class='add'>+	st1	{v4.4s},[x17], #16</div><div class='add'>+	ext	v4.16b,v2.16b,v3.16b,#4</div><div class='add'>+	add	w10,w10,w12</div><div class='add'>+	add	w3,w3,w15</div><div class='add'>+	and	w12,w8,w7</div><div class='add'>+	bic	w15,w9,w7</div><div class='add'>+	ext	v7.16b,v0.16b,v1.16b,#4</div><div class='add'>+	eor	w11,w7,w7,ror#5</div><div class='add'>+	add	w3,w3,w13</div><div class='add'>+	mov	d19,v1.d[1]</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w7,ror#19</div><div class='add'>+	ushr	v6.4s,v4.4s,#7</div><div class='add'>+	eor	w15,w3,w3,ror#11</div><div class='add'>+	ushr	v5.4s,v4.4s,#3</div><div class='add'>+	add	w10,w10,w12</div><div class='add'>+	add	v2.4s,v2.4s,v7.4s</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	sli	v6.4s,v4.4s,#25</div><div class='add'>+	eor	w13,w3,w4</div><div class='add'>+	eor	w15,w15,w3,ror#20</div><div class='add'>+	ushr	v7.4s,v4.4s,#18</div><div class='add'>+	add	w10,w10,w11</div><div class='add'>+	ldr	w12,[sp,#36]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	eor	v5.16b,v5.16b,v6.16b</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w6,w6,w10</div><div class='add'>+	sli	v7.4s,v4.4s,#14</div><div class='add'>+	eor	w14,w14,w4</div><div class='add'>+	ushr	v16.4s,v19.4s,#17</div><div class='add'>+	add	w9,w9,w12</div><div class='add'>+	add	w10,w10,w15</div><div class='add'>+	and	w12,w7,w6</div><div class='add'>+	eor	v5.16b,v5.16b,v7.16b</div><div class='add'>+	bic	w15,w8,w6</div><div class='add'>+	eor	w11,w6,w6,ror#5</div><div class='add'>+	sli	v16.4s,v19.4s,#15</div><div class='add'>+	add	w10,w10,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	ushr	v17.4s,v19.4s,#10</div><div class='add'>+	eor	w11,w11,w6,ror#19</div><div class='add'>+	eor	w15,w10,w10,ror#11</div><div class='add'>+	ushr	v7.4s,v19.4s,#19</div><div class='add'>+	add	w9,w9,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	add	v2.4s,v2.4s,v5.4s</div><div class='add'>+	eor	w14,w10,w3</div><div class='add'>+	eor	w15,w15,w10,ror#20</div><div class='add'>+	sli	v7.4s,v19.4s,#13</div><div class='add'>+	add	w9,w9,w11</div><div class='add'>+	ldr	w12,[sp,#40]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	eor	v17.16b,v17.16b,v16.16b</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w5,w5,w9</div><div class='add'>+	eor	w13,w13,w3</div><div class='add'>+	eor	v17.16b,v17.16b,v7.16b</div><div class='add'>+	add	w8,w8,w12</div><div class='add'>+	add	w9,w9,w15</div><div class='add'>+	and	w12,w6,w5</div><div class='add'>+	add	v2.4s,v2.4s,v17.4s</div><div class='add'>+	bic	w15,w7,w5</div><div class='add'>+	eor	w11,w5,w5,ror#5</div><div class='add'>+	add	w9,w9,w13</div><div class='add'>+	ushr	v18.4s,v2.4s,#17</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	ushr	v19.4s,v2.4s,#10</div><div class='add'>+	eor	w11,w11,w5,ror#19</div><div class='add'>+	eor	w15,w9,w9,ror#11</div><div class='add'>+	sli	v18.4s,v2.4s,#15</div><div class='add'>+	add	w8,w8,w12</div><div class='add'>+	ushr	v17.4s,v2.4s,#19</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w9,w10</div><div class='add'>+	eor	v19.16b,v19.16b,v18.16b</div><div class='add'>+	eor	w15,w15,w9,ror#20</div><div class='add'>+	add	w8,w8,w11</div><div class='add'>+	sli	v17.4s,v2.4s,#13</div><div class='add'>+	ldr	w12,[sp,#44]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	ld1	{v4.4s},[x16], #16</div><div class='add'>+	add	w4,w4,w8</div><div class='add'>+	eor	v19.16b,v19.16b,v17.16b</div><div class='add'>+	eor	w14,w14,w10</div><div class='add'>+	eor	v17.16b,v17.16b,v17.16b</div><div class='add'>+	add	w7,w7,w12</div><div class='add'>+	add	w8,w8,w15</div><div class='add'>+	and	w12,w5,w4</div><div class='add'>+	mov	v17.d[1],v19.d[0]</div><div class='add'>+	bic	w15,w6,w4</div><div class='add'>+	eor	w11,w4,w4,ror#5</div><div class='add'>+	add	w8,w8,w14</div><div class='add'>+	add	v2.4s,v2.4s,v17.4s</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w4,ror#19</div><div class='add'>+	eor	w15,w8,w8,ror#11</div><div class='add'>+	add	v4.4s,v4.4s,v2.4s</div><div class='add'>+	add	w7,w7,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w8,w9</div><div class='add'>+	eor	w15,w15,w8,ror#20</div><div class='add'>+	add	w7,w7,w11</div><div class='add'>+	ldr	w12,[sp,#48]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w3,w3,w7</div><div class='add'>+	eor	w13,w13,w9</div><div class='add'>+	st1	{v4.4s},[x17], #16</div><div class='add'>+	ext	v4.16b,v3.16b,v0.16b,#4</div><div class='add'>+	add	w6,w6,w12</div><div class='add'>+	add	w7,w7,w15</div><div class='add'>+	and	w12,w4,w3</div><div class='add'>+	bic	w15,w5,w3</div><div class='add'>+	ext	v7.16b,v1.16b,v2.16b,#4</div><div class='add'>+	eor	w11,w3,w3,ror#5</div><div class='add'>+	add	w7,w7,w13</div><div class='add'>+	mov	d19,v2.d[1]</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w3,ror#19</div><div class='add'>+	ushr	v6.4s,v4.4s,#7</div><div class='add'>+	eor	w15,w7,w7,ror#11</div><div class='add'>+	ushr	v5.4s,v4.4s,#3</div><div class='add'>+	add	w6,w6,w12</div><div class='add'>+	add	v3.4s,v3.4s,v7.4s</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	sli	v6.4s,v4.4s,#25</div><div class='add'>+	eor	w13,w7,w8</div><div class='add'>+	eor	w15,w15,w7,ror#20</div><div class='add'>+	ushr	v7.4s,v4.4s,#18</div><div class='add'>+	add	w6,w6,w11</div><div class='add'>+	ldr	w12,[sp,#52]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	eor	v5.16b,v5.16b,v6.16b</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w10,w10,w6</div><div class='add'>+	sli	v7.4s,v4.4s,#14</div><div class='add'>+	eor	w14,w14,w8</div><div class='add'>+	ushr	v16.4s,v19.4s,#17</div><div class='add'>+	add	w5,w5,w12</div><div class='add'>+	add	w6,w6,w15</div><div class='add'>+	and	w12,w3,w10</div><div class='add'>+	eor	v5.16b,v5.16b,v7.16b</div><div class='add'>+	bic	w15,w4,w10</div><div class='add'>+	eor	w11,w10,w10,ror#5</div><div class='add'>+	sli	v16.4s,v19.4s,#15</div><div class='add'>+	add	w6,w6,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	ushr	v17.4s,v19.4s,#10</div><div class='add'>+	eor	w11,w11,w10,ror#19</div><div class='add'>+	eor	w15,w6,w6,ror#11</div><div class='add'>+	ushr	v7.4s,v19.4s,#19</div><div class='add'>+	add	w5,w5,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	add	v3.4s,v3.4s,v5.4s</div><div class='add'>+	eor	w14,w6,w7</div><div class='add'>+	eor	w15,w15,w6,ror#20</div><div class='add'>+	sli	v7.4s,v19.4s,#13</div><div class='add'>+	add	w5,w5,w11</div><div class='add'>+	ldr	w12,[sp,#56]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	eor	v17.16b,v17.16b,v16.16b</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w9,w9,w5</div><div class='add'>+	eor	w13,w13,w7</div><div class='add'>+	eor	v17.16b,v17.16b,v7.16b</div><div class='add'>+	add	w4,w4,w12</div><div class='add'>+	add	w5,w5,w15</div><div class='add'>+	and	w12,w10,w9</div><div class='add'>+	add	v3.4s,v3.4s,v17.4s</div><div class='add'>+	bic	w15,w3,w9</div><div class='add'>+	eor	w11,w9,w9,ror#5</div><div class='add'>+	add	w5,w5,w13</div><div class='add'>+	ushr	v18.4s,v3.4s,#17</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	ushr	v19.4s,v3.4s,#10</div><div class='add'>+	eor	w11,w11,w9,ror#19</div><div class='add'>+	eor	w15,w5,w5,ror#11</div><div class='add'>+	sli	v18.4s,v3.4s,#15</div><div class='add'>+	add	w4,w4,w12</div><div class='add'>+	ushr	v17.4s,v3.4s,#19</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w5,w6</div><div class='add'>+	eor	v19.16b,v19.16b,v18.16b</div><div class='add'>+	eor	w15,w15,w5,ror#20</div><div class='add'>+	add	w4,w4,w11</div><div class='add'>+	sli	v17.4s,v3.4s,#13</div><div class='add'>+	ldr	w12,[sp,#60]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	ld1	{v4.4s},[x16], #16</div><div class='add'>+	add	w8,w8,w4</div><div class='add'>+	eor	v19.16b,v19.16b,v17.16b</div><div class='add'>+	eor	w14,w14,w6</div><div class='add'>+	eor	v17.16b,v17.16b,v17.16b</div><div class='add'>+	add	w3,w3,w12</div><div class='add'>+	add	w4,w4,w15</div><div class='add'>+	and	w12,w9,w8</div><div class='add'>+	mov	v17.d[1],v19.d[0]</div><div class='add'>+	bic	w15,w10,w8</div><div class='add'>+	eor	w11,w8,w8,ror#5</div><div class='add'>+	add	w4,w4,w14</div><div class='add'>+	add	v3.4s,v3.4s,v17.4s</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w8,ror#19</div><div class='add'>+	eor	w15,w4,w4,ror#11</div><div class='add'>+	add	v4.4s,v4.4s,v3.4s</div><div class='add'>+	add	w3,w3,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w4,w5</div><div class='add'>+	eor	w15,w15,w4,ror#20</div><div class='add'>+	add	w3,w3,w11</div><div class='add'>+	ldr	w12,[x16]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w7,w7,w3</div><div class='add'>+	eor	w13,w13,w5</div><div class='add'>+	st1	{v4.4s},[x17], #16</div><div class='add'>+	cmp	w12,#0				// check for K256 terminator</div><div class='add'>+	ldr	w12,[sp,#0]</div><div class='add'>+	sub	x17,x17,#64</div><div class='add'>+	bne	.L_00_48</div><div class='add'>+</div><div class='add'>+	sub	x16,x16,#256		// rewind x16</div><div class='add'>+	cmp	x1,x2</div><div class='add'>+	mov	x17, #64</div><div class='add'>+	csel	x17, x17, xzr, eq</div><div class='add'>+	sub	x1,x1,x17			// avoid SEGV</div><div class='add'>+	mov	x17,sp</div><div class='add'>+	add	w10,w10,w12</div><div class='add'>+	add	w3,w3,w15</div><div class='add'>+	and	w12,w8,w7</div><div class='add'>+	ld1	{v0.16b},[x1],#16</div><div class='add'>+	bic	w15,w9,w7</div><div class='add'>+	eor	w11,w7,w7,ror#5</div><div class='add'>+	ld1	{v4.4s},[x16],#16</div><div class='add'>+	add	w3,w3,w13</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w7,ror#19</div><div class='add'>+	eor	w15,w3,w3,ror#11</div><div class='add'>+	rev32	v0.16b,v0.16b</div><div class='add'>+	add	w10,w10,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w3,w4</div><div class='add'>+	eor	w15,w15,w3,ror#20</div><div class='add'>+	add	v4.4s,v4.4s,v0.4s</div><div class='add'>+	add	w10,w10,w11</div><div class='add'>+	ldr	w12,[sp,#4]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w6,w6,w10</div><div class='add'>+	eor	w14,w14,w4</div><div class='add'>+	add	w9,w9,w12</div><div class='add'>+	add	w10,w10,w15</div><div class='add'>+	and	w12,w7,w6</div><div class='add'>+	bic	w15,w8,w6</div><div class='add'>+	eor	w11,w6,w6,ror#5</div><div class='add'>+	add	w10,w10,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w6,ror#19</div><div class='add'>+	eor	w15,w10,w10,ror#11</div><div class='add'>+	add	w9,w9,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w10,w3</div><div class='add'>+	eor	w15,w15,w10,ror#20</div><div class='add'>+	add	w9,w9,w11</div><div class='add'>+	ldr	w12,[sp,#8]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w5,w5,w9</div><div class='add'>+	eor	w13,w13,w3</div><div class='add'>+	add	w8,w8,w12</div><div class='add'>+	add	w9,w9,w15</div><div class='add'>+	and	w12,w6,w5</div><div class='add'>+	bic	w15,w7,w5</div><div class='add'>+	eor	w11,w5,w5,ror#5</div><div class='add'>+	add	w9,w9,w13</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w5,ror#19</div><div class='add'>+	eor	w15,w9,w9,ror#11</div><div class='add'>+	add	w8,w8,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w9,w10</div><div class='add'>+	eor	w15,w15,w9,ror#20</div><div class='add'>+	add	w8,w8,w11</div><div class='add'>+	ldr	w12,[sp,#12]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w4,w4,w8</div><div class='add'>+	eor	w14,w14,w10</div><div class='add'>+	add	w7,w7,w12</div><div class='add'>+	add	w8,w8,w15</div><div class='add'>+	and	w12,w5,w4</div><div class='add'>+	bic	w15,w6,w4</div><div class='add'>+	eor	w11,w4,w4,ror#5</div><div class='add'>+	add	w8,w8,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w4,ror#19</div><div class='add'>+	eor	w15,w8,w8,ror#11</div><div class='add'>+	add	w7,w7,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w8,w9</div><div class='add'>+	eor	w15,w15,w8,ror#20</div><div class='add'>+	add	w7,w7,w11</div><div class='add'>+	ldr	w12,[sp,#16]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w3,w3,w7</div><div class='add'>+	eor	w13,w13,w9</div><div class='add'>+	st1	{v4.4s},[x17], #16</div><div class='add'>+	add	w6,w6,w12</div><div class='add'>+	add	w7,w7,w15</div><div class='add'>+	and	w12,w4,w3</div><div class='add'>+	ld1	{v1.16b},[x1],#16</div><div class='add'>+	bic	w15,w5,w3</div><div class='add'>+	eor	w11,w3,w3,ror#5</div><div class='add'>+	ld1	{v4.4s},[x16],#16</div><div class='add'>+	add	w7,w7,w13</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w3,ror#19</div><div class='add'>+	eor	w15,w7,w7,ror#11</div><div class='add'>+	rev32	v1.16b,v1.16b</div><div class='add'>+	add	w6,w6,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w7,w8</div><div class='add'>+	eor	w15,w15,w7,ror#20</div><div class='add'>+	add	v4.4s,v4.4s,v1.4s</div><div class='add'>+	add	w6,w6,w11</div><div class='add'>+	ldr	w12,[sp,#20]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w10,w10,w6</div><div class='add'>+	eor	w14,w14,w8</div><div class='add'>+	add	w5,w5,w12</div><div class='add'>+	add	w6,w6,w15</div><div class='add'>+	and	w12,w3,w10</div><div class='add'>+	bic	w15,w4,w10</div><div class='add'>+	eor	w11,w10,w10,ror#5</div><div class='add'>+	add	w6,w6,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w10,ror#19</div><div class='add'>+	eor	w15,w6,w6,ror#11</div><div class='add'>+	add	w5,w5,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w6,w7</div><div class='add'>+	eor	w15,w15,w6,ror#20</div><div class='add'>+	add	w5,w5,w11</div><div class='add'>+	ldr	w12,[sp,#24]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w9,w9,w5</div><div class='add'>+	eor	w13,w13,w7</div><div class='add'>+	add	w4,w4,w12</div><div class='add'>+	add	w5,w5,w15</div><div class='add'>+	and	w12,w10,w9</div><div class='add'>+	bic	w15,w3,w9</div><div class='add'>+	eor	w11,w9,w9,ror#5</div><div class='add'>+	add	w5,w5,w13</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w9,ror#19</div><div class='add'>+	eor	w15,w5,w5,ror#11</div><div class='add'>+	add	w4,w4,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w5,w6</div><div class='add'>+	eor	w15,w15,w5,ror#20</div><div class='add'>+	add	w4,w4,w11</div><div class='add'>+	ldr	w12,[sp,#28]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w8,w8,w4</div><div class='add'>+	eor	w14,w14,w6</div><div class='add'>+	add	w3,w3,w12</div><div class='add'>+	add	w4,w4,w15</div><div class='add'>+	and	w12,w9,w8</div><div class='add'>+	bic	w15,w10,w8</div><div class='add'>+	eor	w11,w8,w8,ror#5</div><div class='add'>+	add	w4,w4,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w8,ror#19</div><div class='add'>+	eor	w15,w4,w4,ror#11</div><div class='add'>+	add	w3,w3,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w4,w5</div><div class='add'>+	eor	w15,w15,w4,ror#20</div><div class='add'>+	add	w3,w3,w11</div><div class='add'>+	ldr	w12,[sp,#32]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w7,w7,w3</div><div class='add'>+	eor	w13,w13,w5</div><div class='add'>+	st1	{v4.4s},[x17], #16</div><div class='add'>+	add	w10,w10,w12</div><div class='add'>+	add	w3,w3,w15</div><div class='add'>+	and	w12,w8,w7</div><div class='add'>+	ld1	{v2.16b},[x1],#16</div><div class='add'>+	bic	w15,w9,w7</div><div class='add'>+	eor	w11,w7,w7,ror#5</div><div class='add'>+	ld1	{v4.4s},[x16],#16</div><div class='add'>+	add	w3,w3,w13</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w7,ror#19</div><div class='add'>+	eor	w15,w3,w3,ror#11</div><div class='add'>+	rev32	v2.16b,v2.16b</div><div class='add'>+	add	w10,w10,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w3,w4</div><div class='add'>+	eor	w15,w15,w3,ror#20</div><div class='add'>+	add	v4.4s,v4.4s,v2.4s</div><div class='add'>+	add	w10,w10,w11</div><div class='add'>+	ldr	w12,[sp,#36]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w6,w6,w10</div><div class='add'>+	eor	w14,w14,w4</div><div class='add'>+	add	w9,w9,w12</div><div class='add'>+	add	w10,w10,w15</div><div class='add'>+	and	w12,w7,w6</div><div class='add'>+	bic	w15,w8,w6</div><div class='add'>+	eor	w11,w6,w6,ror#5</div><div class='add'>+	add	w10,w10,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w6,ror#19</div><div class='add'>+	eor	w15,w10,w10,ror#11</div><div class='add'>+	add	w9,w9,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w10,w3</div><div class='add'>+	eor	w15,w15,w10,ror#20</div><div class='add'>+	add	w9,w9,w11</div><div class='add'>+	ldr	w12,[sp,#40]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w5,w5,w9</div><div class='add'>+	eor	w13,w13,w3</div><div class='add'>+	add	w8,w8,w12</div><div class='add'>+	add	w9,w9,w15</div><div class='add'>+	and	w12,w6,w5</div><div class='add'>+	bic	w15,w7,w5</div><div class='add'>+	eor	w11,w5,w5,ror#5</div><div class='add'>+	add	w9,w9,w13</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w5,ror#19</div><div class='add'>+	eor	w15,w9,w9,ror#11</div><div class='add'>+	add	w8,w8,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w9,w10</div><div class='add'>+	eor	w15,w15,w9,ror#20</div><div class='add'>+	add	w8,w8,w11</div><div class='add'>+	ldr	w12,[sp,#44]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w4,w4,w8</div><div class='add'>+	eor	w14,w14,w10</div><div class='add'>+	add	w7,w7,w12</div><div class='add'>+	add	w8,w8,w15</div><div class='add'>+	and	w12,w5,w4</div><div class='add'>+	bic	w15,w6,w4</div><div class='add'>+	eor	w11,w4,w4,ror#5</div><div class='add'>+	add	w8,w8,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w4,ror#19</div><div class='add'>+	eor	w15,w8,w8,ror#11</div><div class='add'>+	add	w7,w7,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w8,w9</div><div class='add'>+	eor	w15,w15,w8,ror#20</div><div class='add'>+	add	w7,w7,w11</div><div class='add'>+	ldr	w12,[sp,#48]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w3,w3,w7</div><div class='add'>+	eor	w13,w13,w9</div><div class='add'>+	st1	{v4.4s},[x17], #16</div><div class='add'>+	add	w6,w6,w12</div><div class='add'>+	add	w7,w7,w15</div><div class='add'>+	and	w12,w4,w3</div><div class='add'>+	ld1	{v3.16b},[x1],#16</div><div class='add'>+	bic	w15,w5,w3</div><div class='add'>+	eor	w11,w3,w3,ror#5</div><div class='add'>+	ld1	{v4.4s},[x16],#16</div><div class='add'>+	add	w7,w7,w13</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w3,ror#19</div><div class='add'>+	eor	w15,w7,w7,ror#11</div><div class='add'>+	rev32	v3.16b,v3.16b</div><div class='add'>+	add	w6,w6,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w7,w8</div><div class='add'>+	eor	w15,w15,w7,ror#20</div><div class='add'>+	add	v4.4s,v4.4s,v3.4s</div><div class='add'>+	add	w6,w6,w11</div><div class='add'>+	ldr	w12,[sp,#52]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w10,w10,w6</div><div class='add'>+	eor	w14,w14,w8</div><div class='add'>+	add	w5,w5,w12</div><div class='add'>+	add	w6,w6,w15</div><div class='add'>+	and	w12,w3,w10</div><div class='add'>+	bic	w15,w4,w10</div><div class='add'>+	eor	w11,w10,w10,ror#5</div><div class='add'>+	add	w6,w6,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w10,ror#19</div><div class='add'>+	eor	w15,w6,w6,ror#11</div><div class='add'>+	add	w5,w5,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w6,w7</div><div class='add'>+	eor	w15,w15,w6,ror#20</div><div class='add'>+	add	w5,w5,w11</div><div class='add'>+	ldr	w12,[sp,#56]</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w9,w9,w5</div><div class='add'>+	eor	w13,w13,w7</div><div class='add'>+	add	w4,w4,w12</div><div class='add'>+	add	w5,w5,w15</div><div class='add'>+	and	w12,w10,w9</div><div class='add'>+	bic	w15,w3,w9</div><div class='add'>+	eor	w11,w9,w9,ror#5</div><div class='add'>+	add	w5,w5,w13</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w9,ror#19</div><div class='add'>+	eor	w15,w5,w5,ror#11</div><div class='add'>+	add	w4,w4,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w13,w5,w6</div><div class='add'>+	eor	w15,w15,w5,ror#20</div><div class='add'>+	add	w4,w4,w11</div><div class='add'>+	ldr	w12,[sp,#60]</div><div class='add'>+	and	w14,w14,w13</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w8,w8,w4</div><div class='add'>+	eor	w14,w14,w6</div><div class='add'>+	add	w3,w3,w12</div><div class='add'>+	add	w4,w4,w15</div><div class='add'>+	and	w12,w9,w8</div><div class='add'>+	bic	w15,w10,w8</div><div class='add'>+	eor	w11,w8,w8,ror#5</div><div class='add'>+	add	w4,w4,w14</div><div class='add'>+	orr	w12,w12,w15</div><div class='add'>+	eor	w11,w11,w8,ror#19</div><div class='add'>+	eor	w15,w4,w4,ror#11</div><div class='add'>+	add	w3,w3,w12</div><div class='add'>+	ror	w11,w11,#6</div><div class='add'>+	eor	w14,w4,w5</div><div class='add'>+	eor	w15,w15,w4,ror#20</div><div class='add'>+	add	w3,w3,w11</div><div class='add'>+	and	w13,w13,w14</div><div class='add'>+	ror	w15,w15,#2</div><div class='add'>+	add	w7,w7,w3</div><div class='add'>+	eor	w13,w13,w5</div><div class='add'>+	st1	{v4.4s},[x17], #16</div><div class='add'>+	add	w3,w3,w15			// h+=Sigma0(a) from the past</div><div class='add'>+	ldp	w11,w12,[x0,#0]</div><div class='add'>+	add	w3,w3,w13			// h+=Maj(a,b,c) from the past</div><div class='add'>+	ldp	w13,w14,[x0,#8]</div><div class='add'>+	add	w3,w3,w11			// accumulate</div><div class='add'>+	add	w4,w4,w12</div><div class='add'>+	ldp	w11,w12,[x0,#16]</div><div class='add'>+	add	w5,w5,w13</div><div class='add'>+	add	w6,w6,w14</div><div class='add'>+	ldp	w13,w14,[x0,#24]</div><div class='add'>+	add	w7,w7,w11</div><div class='add'>+	add	w8,w8,w12</div><div class='add'>+	 ldr	w12,[sp,#0]</div><div class='add'>+	stp	w3,w4,[x0,#0]</div><div class='add'>+	add	w9,w9,w13</div><div class='add'>+	 mov	w13,wzr</div><div class='add'>+	stp	w5,w6,[x0,#8]</div><div class='add'>+	add	w10,w10,w14</div><div class='add'>+	stp	w7,w8,[x0,#16]</div><div class='add'>+	 eor	w14,w4,w5</div><div class='add'>+	stp	w9,w10,[x0,#24]</div><div class='add'>+	 mov	w15,wzr</div><div class='add'>+	 mov	x17,sp</div><div class='add'>+	b.ne	.L_00_48</div><div class='add'>+</div><div class='add'>+	ldr	x29,[x29]</div><div class='add'>+	add	sp,sp,#16*4+16</div><div class='add'>+	ret</div><div class='add'>+.size	sha256_block_neon,.-sha256_block_neon</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+.comm	OPENSSL_armcap_P,4,4</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm64/crypto/sha256-glue.c b/arch/arm64/crypto/sha256-glue.c<br/>new file mode 100644<br/>index 000000000000..a2226f841960<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/sha256-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha256-glue.c</a></div><div class='hunk'>@@ -0,0 +1,185 @@</div><div class='add'>+/*</div><div class='add'>+ * Linux/arm64 port of the OpenSSL SHA256 implementation for AArch64</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Linaro Ltd. &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='add'>+#include &lt;asm/neon.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/sha.h&gt;</div><div class='add'>+#include &lt;crypto/sha256_base.h&gt;</div><div class='add'>+#include &lt;linux/cryptohash.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("SHA-224/SHA-256 secure hash for arm64");</div><div class='add'>+MODULE_AUTHOR("Andy Polyakov &lt;appro@openssl.org&gt;");</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS_CRYPTO("sha224");</div><div class='add'>+MODULE_ALIAS_CRYPTO("sha256");</div><div class='add'>+</div><div class='add'>+asmlinkage void sha256_block_data_order(u32 *digest, const void *data,</div><div class='add'>+					unsigned int num_blks);</div><div class='add'>+</div><div class='add'>+asmlinkage void sha256_block_neon(u32 *digest, const void *data,</div><div class='add'>+				  unsigned int num_blks);</div><div class='add'>+</div><div class='add'>+static int sha256_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			 unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return sha256_base_do_update(desc, data, len,</div><div class='add'>+				(sha256_block_fn *)sha256_block_data_order);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sha256_finup(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			unsigned int len, u8 *out)</div><div class='add'>+{</div><div class='add'>+	if (len)</div><div class='add'>+		sha256_base_do_update(desc, data, len,</div><div class='add'>+				(sha256_block_fn *)sha256_block_data_order);</div><div class='add'>+	sha256_base_do_finalize(desc,</div><div class='add'>+				(sha256_block_fn *)sha256_block_data_order);</div><div class='add'>+</div><div class='add'>+	return sha256_base_finish(desc, out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sha256_final(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	return sha256_finup(desc, NULL, 0, out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct shash_alg algs[] = { {</div><div class='add'>+	.digestsize		= SHA256_DIGEST_SIZE,</div><div class='add'>+	.init			= sha256_base_init,</div><div class='add'>+	.update			= sha256_update,</div><div class='add'>+	.final			= sha256_final,</div><div class='add'>+	.finup			= sha256_finup,</div><div class='add'>+	.descsize		= sizeof(struct sha256_state),</div><div class='add'>+	.base.cra_name		= "sha256",</div><div class='add'>+	.base.cra_driver_name	= "sha256-arm64",</div><div class='add'>+	.base.cra_priority	= 100,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_TYPE_SHASH,</div><div class='add'>+	.base.cra_blocksize	= SHA256_BLOCK_SIZE,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+}, {</div><div class='add'>+	.digestsize		= SHA224_DIGEST_SIZE,</div><div class='add'>+	.init			= sha224_base_init,</div><div class='add'>+	.update			= sha256_update,</div><div class='add'>+	.final			= sha256_final,</div><div class='add'>+	.finup			= sha256_finup,</div><div class='add'>+	.descsize		= sizeof(struct sha256_state),</div><div class='add'>+	.base.cra_name		= "sha224",</div><div class='add'>+	.base.cra_driver_name	= "sha224-arm64",</div><div class='add'>+	.base.cra_priority	= 100,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_TYPE_SHASH,</div><div class='add'>+	.base.cra_blocksize	= SHA224_BLOCK_SIZE,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+} };</div><div class='add'>+</div><div class='add'>+static int sha256_update_neon(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			      unsigned int len)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Stacking and unstacking a substantial slice of the NEON register</div><div class='add'>+	 * file may significantly affect performance for small updates when</div><div class='add'>+	 * executing in interrupt context, so fall back to the scalar code</div><div class='add'>+	 * in that case.</div><div class='add'>+	 */</div><div class='add'>+	if (!may_use_simd())</div><div class='add'>+		return sha256_base_do_update(desc, data, len,</div><div class='add'>+				(sha256_block_fn *)sha256_block_data_order);</div><div class='add'>+</div><div class='add'>+	kernel_neon_begin();</div><div class='add'>+	sha256_base_do_update(desc, data, len,</div><div class='add'>+				(sha256_block_fn *)sha256_block_neon);</div><div class='add'>+	kernel_neon_end();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sha256_finup_neon(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			     unsigned int len, u8 *out)</div><div class='add'>+{</div><div class='add'>+	if (!may_use_simd()) {</div><div class='add'>+		if (len)</div><div class='add'>+			sha256_base_do_update(desc, data, len,</div><div class='add'>+				(sha256_block_fn *)sha256_block_data_order);</div><div class='add'>+		sha256_base_do_finalize(desc,</div><div class='add'>+				(sha256_block_fn *)sha256_block_data_order);</div><div class='add'>+	} else {</div><div class='add'>+		kernel_neon_begin();</div><div class='add'>+		if (len)</div><div class='add'>+			sha256_base_do_update(desc, data, len,</div><div class='add'>+				(sha256_block_fn *)sha256_block_neon);</div><div class='add'>+		sha256_base_do_finalize(desc,</div><div class='add'>+				(sha256_block_fn *)sha256_block_neon);</div><div class='add'>+		kernel_neon_end();</div><div class='add'>+	}</div><div class='add'>+	return sha256_base_finish(desc, out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sha256_final_neon(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	return sha256_finup_neon(desc, NULL, 0, out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct shash_alg neon_algs[] = { {</div><div class='add'>+	.digestsize		= SHA256_DIGEST_SIZE,</div><div class='add'>+	.init			= sha256_base_init,</div><div class='add'>+	.update			= sha256_update_neon,</div><div class='add'>+	.final			= sha256_final_neon,</div><div class='add'>+	.finup			= sha256_finup_neon,</div><div class='add'>+	.descsize		= sizeof(struct sha256_state),</div><div class='add'>+	.base.cra_name		= "sha256",</div><div class='add'>+	.base.cra_driver_name	= "sha256-arm64-neon",</div><div class='add'>+	.base.cra_priority	= 150,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_TYPE_SHASH,</div><div class='add'>+	.base.cra_blocksize	= SHA256_BLOCK_SIZE,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+}, {</div><div class='add'>+	.digestsize		= SHA224_DIGEST_SIZE,</div><div class='add'>+	.init			= sha224_base_init,</div><div class='add'>+	.update			= sha256_update_neon,</div><div class='add'>+	.final			= sha256_final_neon,</div><div class='add'>+	.finup			= sha256_finup_neon,</div><div class='add'>+	.descsize		= sizeof(struct sha256_state),</div><div class='add'>+	.base.cra_name		= "sha224",</div><div class='add'>+	.base.cra_driver_name	= "sha224-arm64-neon",</div><div class='add'>+	.base.cra_priority	= 150,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_TYPE_SHASH,</div><div class='add'>+	.base.cra_blocksize	= SHA224_BLOCK_SIZE,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+} };</div><div class='add'>+</div><div class='add'>+static int __init sha256_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret = crypto_register_shashes(algs, ARRAY_SIZE(algs));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (elf_hwcap &amp; HWCAP_ASIMD) {</div><div class='add'>+		ret = crypto_register_shashes(neon_algs, ARRAY_SIZE(neon_algs));</div><div class='add'>+		if (ret)</div><div class='add'>+			crypto_unregister_shashes(algs, ARRAY_SIZE(algs));</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit sha256_mod_fini(void)</div><div class='add'>+{</div><div class='add'>+	if (elf_hwcap &amp; HWCAP_ASIMD)</div><div class='add'>+		crypto_unregister_shashes(neon_algs, ARRAY_SIZE(neon_algs));</div><div class='add'>+	crypto_unregister_shashes(algs, ARRAY_SIZE(algs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(sha256_mod_init);</div><div class='add'>+module_exit(sha256_mod_fini);</div><div class='head'>diff --git a/arch/arm64/crypto/sha512-armv8.pl b/arch/arm64/crypto/sha512-armv8.pl<br/>new file mode 100644<br/>index 000000000000..c55efb308544<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/sha512-armv8.pl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha512-armv8.pl</a></div><div class='hunk'>@@ -0,0 +1,778 @@</div><div class='add'>+#! /usr/bin/env perl</div><div class='add'>+# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.</div><div class='add'>+#</div><div class='add'>+# Licensed under the OpenSSL license (the "License").  You may not use</div><div class='add'>+# this file except in compliance with the License.  You can obtain a copy</div><div class='add'>+# in the file LICENSE in the source distribution or at</div><div class='add'>+# https://www.openssl.org/source/license.html</div><div class='add'>+</div><div class='add'>+# ====================================================================</div><div class='add'>+# Written by Andy Polyakov &lt;appro@openssl.org&gt; for the OpenSSL</div><div class='add'>+# project. The module is, however, dual licensed under OpenSSL and</div><div class='add'>+# CRYPTOGAMS licenses depending on where you obtain it. For further</div><div class='add'>+# details see http://www.openssl.org/~appro/cryptogams/.</div><div class='add'>+#</div><div class='add'>+# Permission to use under GPLv2 terms is granted.</div><div class='add'>+# ====================================================================</div><div class='add'>+#</div><div class='add'>+# SHA256/512 for ARMv8.</div><div class='add'>+#</div><div class='add'>+# Performance in cycles per processed byte and improvement coefficient</div><div class='add'>+# over code generated with "default" compiler:</div><div class='add'>+#</div><div class='add'>+#		SHA256-hw	SHA256(*)	SHA512</div><div class='add'>+# Apple A7	1.97		10.5 (+33%)	6.73 (-1%(**))</div><div class='add'>+# Cortex-A53	2.38		15.5 (+115%)	10.0 (+150%(***))</div><div class='add'>+# Cortex-A57	2.31		11.6 (+86%)	7.51 (+260%(***))</div><div class='add'>+# Denver	2.01		10.5 (+26%)	6.70 (+8%)</div><div class='add'>+# X-Gene			20.0 (+100%)	12.8 (+300%(***))</div><div class='add'>+# Mongoose	2.36		13.0 (+50%)	8.36 (+33%)</div><div class='add'>+#</div><div class='add'>+# (*)	Software SHA256 results are of lesser relevance, presented</div><div class='add'>+#	mostly for informational purposes.</div><div class='add'>+# (**)	The result is a trade-off: it's possible to improve it by</div><div class='add'>+#	10% (or by 1 cycle per round), but at the cost of 20% loss</div><div class='add'>+#	on Cortex-A53 (or by 4 cycles per round).</div><div class='add'>+# (***)	Super-impressive coefficients over gcc-generated code are</div><div class='add'>+#	indication of some compiler "pathology", most notably code</div><div class='add'>+#	generated with -mgeneral-regs-only is significanty faster</div><div class='add'>+#	and the gap is only 40-90%.</div><div class='add'>+#</div><div class='add'>+# October 2016.</div><div class='add'>+#</div><div class='add'>+# Originally it was reckoned that it makes no sense to implement NEON</div><div class='add'>+# version of SHA256 for 64-bit processors. This is because performance</div><div class='add'>+# improvement on most wide-spread Cortex-A5x processors was observed</div><div class='add'>+# to be marginal, same on Cortex-A53 and ~10% on A57. But then it was</div><div class='add'>+# observed that 32-bit NEON SHA256 performs significantly better than</div><div class='add'>+# 64-bit scalar version on *some* of the more recent processors. As</div><div class='add'>+# result 64-bit NEON version of SHA256 was added to provide best</div><div class='add'>+# all-round performance. For example it executes ~30% faster on X-Gene</div><div class='add'>+# and Mongoose. [For reference, NEON version of SHA512 is bound to</div><div class='add'>+# deliver much less improvement, likely *negative* on Cortex-A5x.</div><div class='add'>+# Which is why NEON support is limited to SHA256.]</div><div class='add'>+</div><div class='add'>+$output=pop;</div><div class='add'>+$flavour=pop;</div><div class='add'>+</div><div class='add'>+if ($flavour &amp;&amp; $flavour ne "void") {</div><div class='add'>+    $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;</div><div class='add'>+    ( $xlate="${dir}arm-xlate.pl" and -f $xlate ) or</div><div class='add'>+    ( $xlate="${dir}../../perlasm/arm-xlate.pl" and -f $xlate) or</div><div class='add'>+    die "can't locate arm-xlate.pl";</div><div class='add'>+</div><div class='add'>+    open OUT,"| \"$^X\" $xlate $flavour $output";</div><div class='add'>+    *STDOUT=*OUT;</div><div class='add'>+} else {</div><div class='add'>+    open STDOUT,"&gt;$output";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+if ($output =~ /512/) {</div><div class='add'>+	$BITS=512;</div><div class='add'>+	$SZ=8;</div><div class='add'>+	@Sigma0=(28,34,39);</div><div class='add'>+	@Sigma1=(14,18,41);</div><div class='add'>+	@sigma0=(1,  8, 7);</div><div class='add'>+	@sigma1=(19,61, 6);</div><div class='add'>+	$rounds=80;</div><div class='add'>+	$reg_t="x";</div><div class='add'>+} else {</div><div class='add'>+	$BITS=256;</div><div class='add'>+	$SZ=4;</div><div class='add'>+	@Sigma0=( 2,13,22);</div><div class='add'>+	@Sigma1=( 6,11,25);</div><div class='add'>+	@sigma0=( 7,18, 3);</div><div class='add'>+	@sigma1=(17,19,10);</div><div class='add'>+	$rounds=64;</div><div class='add'>+	$reg_t="w";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+$func="sha${BITS}_block_data_order";</div><div class='add'>+</div><div class='add'>+($ctx,$inp,$num,$Ktbl)=map("x$_",(0..2,30));</div><div class='add'>+</div><div class='add'>+@X=map("$reg_t$_",(3..15,0..2));</div><div class='add'>+@V=($A,$B,$C,$D,$E,$F,$G,$H)=map("$reg_t$_",(20..27));</div><div class='add'>+($t0,$t1,$t2,$t3)=map("$reg_t$_",(16,17,19,28));</div><div class='add'>+</div><div class='add'>+sub BODY_00_xx {</div><div class='add'>+my ($i,$a,$b,$c,$d,$e,$f,$g,$h)=@_;</div><div class='add'>+my $j=($i+1)&amp;15;</div><div class='add'>+my ($T0,$T1,$T2)=(@X[($i-8)&amp;15],@X[($i-9)&amp;15],@X[($i-10)&amp;15]);</div><div class='add'>+   $T0=@X[$i+3] if ($i&lt;11);</div><div class='add'>+</div><div class='add'>+$code.=&lt;&lt;___	if ($i&lt;16);</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	@X[$i],@X[$i]			// $i</div><div class='add'>+#endif</div><div class='add'>+___</div><div class='add'>+$code.=&lt;&lt;___	if ($i&lt;13 &amp;&amp; ($i&amp;1));</div><div class='add'>+	ldp	@X[$i+1],@X[$i+2],[$inp],#2*$SZ</div><div class='add'>+___</div><div class='add'>+$code.=&lt;&lt;___	if ($i==13);</div><div class='add'>+	ldp	@X[14],@X[15],[$inp]</div><div class='add'>+___</div><div class='add'>+$code.=&lt;&lt;___	if ($i&gt;=14);</div><div class='add'>+	ldr	@X[($i-11)&amp;15],[sp,#`$SZ*(($i-11)%4)`]</div><div class='add'>+___</div><div class='add'>+$code.=&lt;&lt;___	if ($i&gt;0 &amp;&amp; $i&lt;16);</div><div class='add'>+	add	$a,$a,$t1			// h+=Sigma0(a)</div><div class='add'>+___</div><div class='add'>+$code.=&lt;&lt;___	if ($i&gt;=11);</div><div class='add'>+	str	@X[($i-8)&amp;15],[sp,#`$SZ*(($i-8)%4)`]</div><div class='add'>+___</div><div class='add'>+# While ARMv8 specifies merged rotate-n-logical operation such as</div><div class='add'>+# 'eor x,y,z,ror#n', it was found to negatively affect performance</div><div class='add'>+# on Apple A7. The reason seems to be that it requires even 'y' to</div><div class='add'>+# be available earlier. This means that such merged instruction is</div><div class='add'>+# not necessarily best choice on critical path... On the other hand</div><div class='add'>+# Cortex-A5x handles merged instructions much better than disjoint</div><div class='add'>+# rotate and logical... See (**) footnote above.</div><div class='add'>+$code.=&lt;&lt;___	if ($i&lt;15);</div><div class='add'>+	ror	$t0,$e,#$Sigma1[0]</div><div class='add'>+	add	$h,$h,$t2			// h+=K[i]</div><div class='add'>+	eor	$T0,$e,$e,ror#`$Sigma1[2]-$Sigma1[1]`</div><div class='add'>+	and	$t1,$f,$e</div><div class='add'>+	bic	$t2,$g,$e</div><div class='add'>+	add	$h,$h,@X[$i&amp;15]			// h+=X[i]</div><div class='add'>+	orr	$t1,$t1,$t2			// Ch(e,f,g)</div><div class='add'>+	eor	$t2,$a,$b			// a^b, b^c in next round</div><div class='add'>+	eor	$t0,$t0,$T0,ror#$Sigma1[1]	// Sigma1(e)</div><div class='add'>+	ror	$T0,$a,#$Sigma0[0]</div><div class='add'>+	add	$h,$h,$t1			// h+=Ch(e,f,g)</div><div class='add'>+	eor	$t1,$a,$a,ror#`$Sigma0[2]-$Sigma0[1]`</div><div class='add'>+	add	$h,$h,$t0			// h+=Sigma1(e)</div><div class='add'>+	and	$t3,$t3,$t2			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	$d,$d,$h			// d+=h</div><div class='add'>+	eor	$t3,$t3,$b			// Maj(a,b,c)</div><div class='add'>+	eor	$t1,$T0,$t1,ror#$Sigma0[1]	// Sigma0(a)</div><div class='add'>+	add	$h,$h,$t3			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	$t3,[$Ktbl],#$SZ		// *K++, $t2 in next round</div><div class='add'>+	//add	$h,$h,$t1			// h+=Sigma0(a)</div><div class='add'>+___</div><div class='add'>+$code.=&lt;&lt;___	if ($i&gt;=15);</div><div class='add'>+	ror	$t0,$e,#$Sigma1[0]</div><div class='add'>+	add	$h,$h,$t2			// h+=K[i]</div><div class='add'>+	ror	$T1,@X[($j+1)&amp;15],#$sigma0[0]</div><div class='add'>+	and	$t1,$f,$e</div><div class='add'>+	ror	$T2,@X[($j+14)&amp;15],#$sigma1[0]</div><div class='add'>+	bic	$t2,$g,$e</div><div class='add'>+	ror	$T0,$a,#$Sigma0[0]</div><div class='add'>+	add	$h,$h,@X[$i&amp;15]			// h+=X[i]</div><div class='add'>+	eor	$t0,$t0,$e,ror#$Sigma1[1]</div><div class='add'>+	eor	$T1,$T1,@X[($j+1)&amp;15],ror#$sigma0[1]</div><div class='add'>+	orr	$t1,$t1,$t2			// Ch(e,f,g)</div><div class='add'>+	eor	$t2,$a,$b			// a^b, b^c in next round</div><div class='add'>+	eor	$t0,$t0,$e,ror#$Sigma1[2]	// Sigma1(e)</div><div class='add'>+	eor	$T0,$T0,$a,ror#$Sigma0[1]</div><div class='add'>+	add	$h,$h,$t1			// h+=Ch(e,f,g)</div><div class='add'>+	and	$t3,$t3,$t2			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	$T2,$T2,@X[($j+14)&amp;15],ror#$sigma1[1]</div><div class='add'>+	eor	$T1,$T1,@X[($j+1)&amp;15],lsr#$sigma0[2]	// sigma0(X[i+1])</div><div class='add'>+	add	$h,$h,$t0			// h+=Sigma1(e)</div><div class='add'>+	eor	$t3,$t3,$b			// Maj(a,b,c)</div><div class='add'>+	eor	$t1,$T0,$a,ror#$Sigma0[2]	// Sigma0(a)</div><div class='add'>+	eor	$T2,$T2,@X[($j+14)&amp;15],lsr#$sigma1[2]	// sigma1(X[i+14])</div><div class='add'>+	add	@X[$j],@X[$j],@X[($j+9)&amp;15]</div><div class='add'>+	add	$d,$d,$h			// d+=h</div><div class='add'>+	add	$h,$h,$t3			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	$t3,[$Ktbl],#$SZ		// *K++, $t2 in next round</div><div class='add'>+	add	@X[$j],@X[$j],$T1</div><div class='add'>+	add	$h,$h,$t1			// h+=Sigma0(a)</div><div class='add'>+	add	@X[$j],@X[$j],$T2</div><div class='add'>+___</div><div class='add'>+	($t2,$t3)=($t3,$t2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+$code.=&lt;&lt;___;</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+# include "arm_arch.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+.text</div><div class='add'>+</div><div class='add'>+.extern	OPENSSL_armcap_P</div><div class='add'>+.globl	$func</div><div class='add'>+.type	$func,%function</div><div class='add'>+.align	6</div><div class='add'>+$func:</div><div class='add'>+___</div><div class='add'>+$code.=&lt;&lt;___	if ($SZ==4);</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+# ifdef	__ILP32__</div><div class='add'>+	ldrsw	x16,.LOPENSSL_armcap_P</div><div class='add'>+# else</div><div class='add'>+	ldr	x16,.LOPENSSL_armcap_P</div><div class='add'>+# endif</div><div class='add'>+	adr	x17,.LOPENSSL_armcap_P</div><div class='add'>+	add	x16,x16,x17</div><div class='add'>+	ldr	w16,[x16]</div><div class='add'>+	tst	w16,#ARMV8_SHA256</div><div class='add'>+	b.ne	.Lv8_entry</div><div class='add'>+	tst	w16,#ARMV7_NEON</div><div class='add'>+	b.ne	.Lneon_entry</div><div class='add'>+#endif</div><div class='add'>+___</div><div class='add'>+$code.=&lt;&lt;___;</div><div class='add'>+	stp	x29,x30,[sp,#-128]!</div><div class='add'>+	add	x29,sp,#0</div><div class='add'>+</div><div class='add'>+	stp	x19,x20,[sp,#16]</div><div class='add'>+	stp	x21,x22,[sp,#32]</div><div class='add'>+	stp	x23,x24,[sp,#48]</div><div class='add'>+	stp	x25,x26,[sp,#64]</div><div class='add'>+	stp	x27,x28,[sp,#80]</div><div class='add'>+	sub	sp,sp,#4*$SZ</div><div class='add'>+</div><div class='add'>+	ldp	$A,$B,[$ctx]				// load context</div><div class='add'>+	ldp	$C,$D,[$ctx,#2*$SZ]</div><div class='add'>+	ldp	$E,$F,[$ctx,#4*$SZ]</div><div class='add'>+	add	$num,$inp,$num,lsl#`log(16*$SZ)/log(2)`	// end of input</div><div class='add'>+	ldp	$G,$H,[$ctx,#6*$SZ]</div><div class='add'>+	adr	$Ktbl,.LK$BITS</div><div class='add'>+	stp	$ctx,$num,[x29,#96]</div><div class='add'>+</div><div class='add'>+.Loop:</div><div class='add'>+	ldp	@X[0],@X[1],[$inp],#2*$SZ</div><div class='add'>+	ldr	$t2,[$Ktbl],#$SZ			// *K++</div><div class='add'>+	eor	$t3,$B,$C				// magic seed</div><div class='add'>+	str	$inp,[x29,#112]</div><div class='add'>+___</div><div class='add'>+for ($i=0;$i&lt;16;$i++)	{ &amp;BODY_00_xx($i,@V); unshift(@V,pop(@V)); }</div><div class='add'>+$code.=".Loop_16_xx:\n";</div><div class='add'>+for (;$i&lt;32;$i++)	{ &amp;BODY_00_xx($i,@V); unshift(@V,pop(@V)); }</div><div class='add'>+$code.=&lt;&lt;___;</div><div class='add'>+	cbnz	$t2,.Loop_16_xx</div><div class='add'>+</div><div class='add'>+	ldp	$ctx,$num,[x29,#96]</div><div class='add'>+	ldr	$inp,[x29,#112]</div><div class='add'>+	sub	$Ktbl,$Ktbl,#`$SZ*($rounds+1)`		// rewind</div><div class='add'>+</div><div class='add'>+	ldp	@X[0],@X[1],[$ctx]</div><div class='add'>+	ldp	@X[2],@X[3],[$ctx,#2*$SZ]</div><div class='add'>+	add	$inp,$inp,#14*$SZ			// advance input pointer</div><div class='add'>+	ldp	@X[4],@X[5],[$ctx,#4*$SZ]</div><div class='add'>+	add	$A,$A,@X[0]</div><div class='add'>+	ldp	@X[6],@X[7],[$ctx,#6*$SZ]</div><div class='add'>+	add	$B,$B,@X[1]</div><div class='add'>+	add	$C,$C,@X[2]</div><div class='add'>+	add	$D,$D,@X[3]</div><div class='add'>+	stp	$A,$B,[$ctx]</div><div class='add'>+	add	$E,$E,@X[4]</div><div class='add'>+	add	$F,$F,@X[5]</div><div class='add'>+	stp	$C,$D,[$ctx,#2*$SZ]</div><div class='add'>+	add	$G,$G,@X[6]</div><div class='add'>+	add	$H,$H,@X[7]</div><div class='add'>+	cmp	$inp,$num</div><div class='add'>+	stp	$E,$F,[$ctx,#4*$SZ]</div><div class='add'>+	stp	$G,$H,[$ctx,#6*$SZ]</div><div class='add'>+	b.ne	.Loop</div><div class='add'>+</div><div class='add'>+	ldp	x19,x20,[x29,#16]</div><div class='add'>+	add	sp,sp,#4*$SZ</div><div class='add'>+	ldp	x21,x22,[x29,#32]</div><div class='add'>+	ldp	x23,x24,[x29,#48]</div><div class='add'>+	ldp	x25,x26,[x29,#64]</div><div class='add'>+	ldp	x27,x28,[x29,#80]</div><div class='add'>+	ldp	x29,x30,[sp],#128</div><div class='add'>+	ret</div><div class='add'>+.size	$func,.-$func</div><div class='add'>+</div><div class='add'>+.align	6</div><div class='add'>+.type	.LK$BITS,%object</div><div class='add'>+.LK$BITS:</div><div class='add'>+___</div><div class='add'>+$code.=&lt;&lt;___ if ($SZ==8);</div><div class='add'>+	.quad	0x428a2f98d728ae22,0x7137449123ef65cd</div><div class='add'>+	.quad	0xb5c0fbcfec4d3b2f,0xe9b5dba58189dbbc</div><div class='add'>+	.quad	0x3956c25bf348b538,0x59f111f1b605d019</div><div class='add'>+	.quad	0x923f82a4af194f9b,0xab1c5ed5da6d8118</div><div class='add'>+	.quad	0xd807aa98a3030242,0x12835b0145706fbe</div><div class='add'>+	.quad	0x243185be4ee4b28c,0x550c7dc3d5ffb4e2</div><div class='add'>+	.quad	0x72be5d74f27b896f,0x80deb1fe3b1696b1</div><div class='add'>+	.quad	0x9bdc06a725c71235,0xc19bf174cf692694</div><div class='add'>+	.quad	0xe49b69c19ef14ad2,0xefbe4786384f25e3</div><div class='add'>+	.quad	0x0fc19dc68b8cd5b5,0x240ca1cc77ac9c65</div><div class='add'>+	.quad	0x2de92c6f592b0275,0x4a7484aa6ea6e483</div><div class='add'>+	.quad	0x5cb0a9dcbd41fbd4,0x76f988da831153b5</div><div class='add'>+	.quad	0x983e5152ee66dfab,0xa831c66d2db43210</div><div class='add'>+	.quad	0xb00327c898fb213f,0xbf597fc7beef0ee4</div><div class='add'>+	.quad	0xc6e00bf33da88fc2,0xd5a79147930aa725</div><div class='add'>+	.quad	0x06ca6351e003826f,0x142929670a0e6e70</div><div class='add'>+	.quad	0x27b70a8546d22ffc,0x2e1b21385c26c926</div><div class='add'>+	.quad	0x4d2c6dfc5ac42aed,0x53380d139d95b3df</div><div class='add'>+	.quad	0x650a73548baf63de,0x766a0abb3c77b2a8</div><div class='add'>+	.quad	0x81c2c92e47edaee6,0x92722c851482353b</div><div class='add'>+	.quad	0xa2bfe8a14cf10364,0xa81a664bbc423001</div><div class='add'>+	.quad	0xc24b8b70d0f89791,0xc76c51a30654be30</div><div class='add'>+	.quad	0xd192e819d6ef5218,0xd69906245565a910</div><div class='add'>+	.quad	0xf40e35855771202a,0x106aa07032bbd1b8</div><div class='add'>+	.quad	0x19a4c116b8d2d0c8,0x1e376c085141ab53</div><div class='add'>+	.quad	0x2748774cdf8eeb99,0x34b0bcb5e19b48a8</div><div class='add'>+	.quad	0x391c0cb3c5c95a63,0x4ed8aa4ae3418acb</div><div class='add'>+	.quad	0x5b9cca4f7763e373,0x682e6ff3d6b2b8a3</div><div class='add'>+	.quad	0x748f82ee5defb2fc,0x78a5636f43172f60</div><div class='add'>+	.quad	0x84c87814a1f0ab72,0x8cc702081a6439ec</div><div class='add'>+	.quad	0x90befffa23631e28,0xa4506cebde82bde9</div><div class='add'>+	.quad	0xbef9a3f7b2c67915,0xc67178f2e372532b</div><div class='add'>+	.quad	0xca273eceea26619c,0xd186b8c721c0c207</div><div class='add'>+	.quad	0xeada7dd6cde0eb1e,0xf57d4f7fee6ed178</div><div class='add'>+	.quad	0x06f067aa72176fba,0x0a637dc5a2c898a6</div><div class='add'>+	.quad	0x113f9804bef90dae,0x1b710b35131c471b</div><div class='add'>+	.quad	0x28db77f523047d84,0x32caab7b40c72493</div><div class='add'>+	.quad	0x3c9ebe0a15c9bebc,0x431d67c49c100d4c</div><div class='add'>+	.quad	0x4cc5d4becb3e42b6,0x597f299cfc657e2a</div><div class='add'>+	.quad	0x5fcb6fab3ad6faec,0x6c44198c4a475817</div><div class='add'>+	.quad	0	// terminator</div><div class='add'>+___</div><div class='add'>+$code.=&lt;&lt;___ if ($SZ==4);</div><div class='add'>+	.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5</div><div class='add'>+	.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5</div><div class='add'>+	.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3</div><div class='add'>+	.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174</div><div class='add'>+	.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc</div><div class='add'>+	.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da</div><div class='add'>+	.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7</div><div class='add'>+	.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967</div><div class='add'>+	.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13</div><div class='add'>+	.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85</div><div class='add'>+	.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3</div><div class='add'>+	.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070</div><div class='add'>+	.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5</div><div class='add'>+	.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3</div><div class='add'>+	.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208</div><div class='add'>+	.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2</div><div class='add'>+	.long	0	//terminator</div><div class='add'>+___</div><div class='add'>+$code.=&lt;&lt;___;</div><div class='add'>+.size	.LK$BITS,.-.LK$BITS</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+.align	3</div><div class='add'>+.LOPENSSL_armcap_P:</div><div class='add'>+# ifdef	__ILP32__</div><div class='add'>+	.long	OPENSSL_armcap_P-.</div><div class='add'>+# else</div><div class='add'>+	.quad	OPENSSL_armcap_P-.</div><div class='add'>+# endif</div><div class='add'>+#endif</div><div class='add'>+.asciz	"SHA$BITS block transform for ARMv8, CRYPTOGAMS by &lt;appro\@openssl.org&gt;"</div><div class='add'>+.align	2</div><div class='add'>+___</div><div class='add'>+</div><div class='add'>+if ($SZ==4) {</div><div class='add'>+my $Ktbl="x3";</div><div class='add'>+</div><div class='add'>+my ($ABCD,$EFGH,$abcd)=map("v$_.16b",(0..2));</div><div class='add'>+my @MSG=map("v$_.16b",(4..7));</div><div class='add'>+my ($W0,$W1)=("v16.4s","v17.4s");</div><div class='add'>+my ($ABCD_SAVE,$EFGH_SAVE)=("v18.16b","v19.16b");</div><div class='add'>+</div><div class='add'>+$code.=&lt;&lt;___;</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+.type	sha256_block_armv8,%function</div><div class='add'>+.align	6</div><div class='add'>+sha256_block_armv8:</div><div class='add'>+.Lv8_entry:</div><div class='add'>+	stp		x29,x30,[sp,#-16]!</div><div class='add'>+	add		x29,sp,#0</div><div class='add'>+</div><div class='add'>+	ld1.32		{$ABCD,$EFGH},[$ctx]</div><div class='add'>+	adr		$Ktbl,.LK256</div><div class='add'>+</div><div class='add'>+.Loop_hw:</div><div class='add'>+	ld1		{@MSG[0]-@MSG[3]},[$inp],#64</div><div class='add'>+	sub		$num,$num,#1</div><div class='add'>+	ld1.32		{$W0},[$Ktbl],#16</div><div class='add'>+	rev32		@MSG[0],@MSG[0]</div><div class='add'>+	rev32		@MSG[1],@MSG[1]</div><div class='add'>+	rev32		@MSG[2],@MSG[2]</div><div class='add'>+	rev32		@MSG[3],@MSG[3]</div><div class='add'>+	orr		$ABCD_SAVE,$ABCD,$ABCD		// offload</div><div class='add'>+	orr		$EFGH_SAVE,$EFGH,$EFGH</div><div class='add'>+___</div><div class='add'>+for($i=0;$i&lt;12;$i++) {</div><div class='add'>+$code.=&lt;&lt;___;</div><div class='add'>+	ld1.32		{$W1},[$Ktbl],#16</div><div class='add'>+	add.i32		$W0,$W0,@MSG[0]</div><div class='add'>+	sha256su0	@MSG[0],@MSG[1]</div><div class='add'>+	orr		$abcd,$ABCD,$ABCD</div><div class='add'>+	sha256h		$ABCD,$EFGH,$W0</div><div class='add'>+	sha256h2	$EFGH,$abcd,$W0</div><div class='add'>+	sha256su1	@MSG[0],@MSG[2],@MSG[3]</div><div class='add'>+___</div><div class='add'>+	($W0,$W1)=($W1,$W0);	push(@MSG,shift(@MSG));</div><div class='add'>+}</div><div class='add'>+$code.=&lt;&lt;___;</div><div class='add'>+	ld1.32		{$W1},[$Ktbl],#16</div><div class='add'>+	add.i32		$W0,$W0,@MSG[0]</div><div class='add'>+	orr		$abcd,$ABCD,$ABCD</div><div class='add'>+	sha256h		$ABCD,$EFGH,$W0</div><div class='add'>+	sha256h2	$EFGH,$abcd,$W0</div><div class='add'>+</div><div class='add'>+	ld1.32		{$W0},[$Ktbl],#16</div><div class='add'>+	add.i32		$W1,$W1,@MSG[1]</div><div class='add'>+	orr		$abcd,$ABCD,$ABCD</div><div class='add'>+	sha256h		$ABCD,$EFGH,$W1</div><div class='add'>+	sha256h2	$EFGH,$abcd,$W1</div><div class='add'>+</div><div class='add'>+	ld1.32		{$W1},[$Ktbl]</div><div class='add'>+	add.i32		$W0,$W0,@MSG[2]</div><div class='add'>+	sub		$Ktbl,$Ktbl,#$rounds*$SZ-16	// rewind</div><div class='add'>+	orr		$abcd,$ABCD,$ABCD</div><div class='add'>+	sha256h		$ABCD,$EFGH,$W0</div><div class='add'>+	sha256h2	$EFGH,$abcd,$W0</div><div class='add'>+</div><div class='add'>+	add.i32		$W1,$W1,@MSG[3]</div><div class='add'>+	orr		$abcd,$ABCD,$ABCD</div><div class='add'>+	sha256h		$ABCD,$EFGH,$W1</div><div class='add'>+	sha256h2	$EFGH,$abcd,$W1</div><div class='add'>+</div><div class='add'>+	add.i32		$ABCD,$ABCD,$ABCD_SAVE</div><div class='add'>+	add.i32		$EFGH,$EFGH,$EFGH_SAVE</div><div class='add'>+</div><div class='add'>+	cbnz		$num,.Loop_hw</div><div class='add'>+</div><div class='add'>+	st1.32		{$ABCD,$EFGH},[$ctx]</div><div class='add'>+</div><div class='add'>+	ldr		x29,[sp],#16</div><div class='add'>+	ret</div><div class='add'>+.size	sha256_block_armv8,.-sha256_block_armv8</div><div class='add'>+#endif</div><div class='add'>+___</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+if ($SZ==4) {	######################################### NEON stuff #</div><div class='add'>+# You'll surely note a lot of similarities with sha256-armv4 module,</div><div class='add'>+# and of course it's not a coincidence. sha256-armv4 was used as</div><div class='add'>+# initial template, but was adapted for ARMv8 instruction set and</div><div class='add'>+# extensively re-tuned for all-round performance.</div><div class='add'>+</div><div class='add'>+my @V = ($A,$B,$C,$D,$E,$F,$G,$H) = map("w$_",(3..10));</div><div class='add'>+my ($t0,$t1,$t2,$t3,$t4) = map("w$_",(11..15));</div><div class='add'>+my $Ktbl="x16";</div><div class='add'>+my $Xfer="x17";</div><div class='add'>+my @X = map("q$_",(0..3));</div><div class='add'>+my ($T0,$T1,$T2,$T3,$T4,$T5,$T6,$T7) = map("q$_",(4..7,16..19));</div><div class='add'>+my $j=0;</div><div class='add'>+</div><div class='add'>+sub AUTOLOAD()          # thunk [simplified] x86-style perlasm</div><div class='add'>+{ my $opcode = $AUTOLOAD; $opcode =~ s/.*:://; $opcode =~ s/_/\./;</div><div class='add'>+  my $arg = pop;</div><div class='add'>+    $arg = "#$arg" if ($arg*1 eq $arg);</div><div class='add'>+    $code .= "\t$opcode\t".join(',',@_,$arg)."\n";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+sub Dscalar { shift =~ m|[qv]([0-9]+)|?"d$1":""; }</div><div class='add'>+sub Dlo     { shift =~ m|[qv]([0-9]+)|?"v$1.d[0]":""; }</div><div class='add'>+sub Dhi     { shift =~ m|[qv]([0-9]+)|?"v$1.d[1]":""; }</div><div class='add'>+</div><div class='add'>+sub Xupdate()</div><div class='add'>+{ use integer;</div><div class='add'>+  my $body = shift;</div><div class='add'>+  my @insns = (&amp;$body,&amp;$body,&amp;$body,&amp;$body);</div><div class='add'>+  my ($a,$b,$c,$d,$e,$f,$g,$h);</div><div class='add'>+</div><div class='add'>+	&amp;ext_8		($T0,@X[0],@X[1],4);	# X[1..4]</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;ext_8		($T3,@X[2],@X[3],4);	# X[9..12]</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;mov		(&amp;Dscalar($T7),&amp;Dhi(@X[3]));	# X[14..15]</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;ushr_32	($T2,$T0,$sigma0[0]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;ushr_32	($T1,$T0,$sigma0[2]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;add_32 	(@X[0],@X[0],$T3);	# X[0..3] += X[9..12]</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;sli_32		($T2,$T0,32-$sigma0[0]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;ushr_32	($T3,$T0,$sigma0[1]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;eor_8		($T1,$T1,$T2);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;sli_32		($T3,$T0,32-$sigma0[1]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;ushr_32	($T4,$T7,$sigma1[0]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;eor_8		($T1,$T1,$T3);		# sigma0(X[1..4])</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;sli_32	($T4,$T7,32-$sigma1[0]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;ushr_32	($T5,$T7,$sigma1[2]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;ushr_32	($T3,$T7,$sigma1[1]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;add_32		(@X[0],@X[0],$T1);	# X[0..3] += sigma0(X[1..4])</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;sli_u32	($T3,$T7,32-$sigma1[1]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;eor_8	($T5,$T5,$T4);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;eor_8	($T5,$T5,$T3);		# sigma1(X[14..15])</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;add_32		(@X[0],@X[0],$T5);	# X[0..1] += sigma1(X[14..15])</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;ushr_32	($T6,@X[0],$sigma1[0]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;ushr_32	($T7,@X[0],$sigma1[2]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;sli_32	($T6,@X[0],32-$sigma1[0]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;ushr_32	($T5,@X[0],$sigma1[1]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;eor_8	($T7,$T7,$T6);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;sli_32	($T5,@X[0],32-$sigma1[1]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;ld1_32		("{$T0}","[$Ktbl], #16");</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	  &amp;eor_8	($T7,$T7,$T5);		# sigma1(X[16..17])</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;eor_8		($T5,$T5,$T5);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;mov		(&amp;Dhi($T5), &amp;Dlo($T7));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;add_32		(@X[0],@X[0],$T5);	# X[2..3] += sigma1(X[16..17])</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;add_32		($T0,$T0,@X[0]);</div><div class='add'>+	 while($#insns&gt;=1) { eval(shift(@insns)); }</div><div class='add'>+	&amp;st1_32		("{$T0}","[$Xfer], #16");</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+</div><div class='add'>+	push(@X,shift(@X));		# "rotate" X[]</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+sub Xpreload()</div><div class='add'>+{ use integer;</div><div class='add'>+  my $body = shift;</div><div class='add'>+  my @insns = (&amp;$body,&amp;$body,&amp;$body,&amp;$body);</div><div class='add'>+  my ($a,$b,$c,$d,$e,$f,$g,$h);</div><div class='add'>+</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;ld1_8		("{@X[0]}","[$inp],#16");</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;ld1_32		("{$T0}","[$Ktbl],#16");</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;rev32		(@X[0],@X[0]);</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	 eval(shift(@insns));</div><div class='add'>+	&amp;add_32		($T0,$T0,@X[0]);</div><div class='add'>+	 foreach (@insns) { eval; }	# remaining instructions</div><div class='add'>+	&amp;st1_32		("{$T0}","[$Xfer], #16");</div><div class='add'>+</div><div class='add'>+	push(@X,shift(@X));		# "rotate" X[]</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+sub body_00_15 () {</div><div class='add'>+	(</div><div class='add'>+	'($a,$b,$c,$d,$e,$f,$g,$h)=@V;'.</div><div class='add'>+	'&amp;add	($h,$h,$t1)',			# h+=X[i]+K[i]</div><div class='add'>+	'&amp;add	($a,$a,$t4);'.			# h+=Sigma0(a) from the past</div><div class='add'>+	'&amp;and	($t1,$f,$e)',</div><div class='add'>+	'&amp;bic	($t4,$g,$e)',</div><div class='add'>+	'&amp;eor	($t0,$e,$e,"ror#".($Sigma1[1]-$Sigma1[0]))',</div><div class='add'>+	'&amp;add	($a,$a,$t2)',			# h+=Maj(a,b,c) from the past</div><div class='add'>+	'&amp;orr	($t1,$t1,$t4)',			# Ch(e,f,g)</div><div class='add'>+	'&amp;eor	($t0,$t0,$e,"ror#".($Sigma1[2]-$Sigma1[0]))',	# Sigma1(e)</div><div class='add'>+	'&amp;eor	($t4,$a,$a,"ror#".($Sigma0[1]-$Sigma0[0]))',</div><div class='add'>+	'&amp;add	($h,$h,$t1)',			# h+=Ch(e,f,g)</div><div class='add'>+	'&amp;ror	($t0,$t0,"#$Sigma1[0]")',</div><div class='add'>+	'&amp;eor	($t2,$a,$b)',			# a^b, b^c in next round</div><div class='add'>+	'&amp;eor	($t4,$t4,$a,"ror#".($Sigma0[2]-$Sigma0[0]))',	# Sigma0(a)</div><div class='add'>+	'&amp;add	($h,$h,$t0)',			# h+=Sigma1(e)</div><div class='add'>+	'&amp;ldr	($t1,sprintf "[sp,#%d]",4*(($j+1)&amp;15))	if (($j&amp;15)!=15);'.</div><div class='add'>+	'&amp;ldr	($t1,"[$Ktbl]")				if ($j==15);'.</div><div class='add'>+	'&amp;and	($t3,$t3,$t2)',			# (b^c)&amp;=(a^b)</div><div class='add'>+	'&amp;ror	($t4,$t4,"#$Sigma0[0]")',</div><div class='add'>+	'&amp;add	($d,$d,$h)',			# d+=h</div><div class='add'>+	'&amp;eor	($t3,$t3,$b)',			# Maj(a,b,c)</div><div class='add'>+	'$j++;	unshift(@V,pop(@V)); ($t2,$t3)=($t3,$t2);'</div><div class='add'>+	)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+$code.=&lt;&lt;___;</div><div class='add'>+#ifdef	__KERNEL__</div><div class='add'>+.globl	sha256_block_neon</div><div class='add'>+#endif</div><div class='add'>+.type	sha256_block_neon,%function</div><div class='add'>+.align	4</div><div class='add'>+sha256_block_neon:</div><div class='add'>+.Lneon_entry:</div><div class='add'>+	stp	x29, x30, [sp, #-16]!</div><div class='add'>+	mov	x29, sp</div><div class='add'>+	sub	sp,sp,#16*4</div><div class='add'>+</div><div class='add'>+	adr	$Ktbl,.LK256</div><div class='add'>+	add	$num,$inp,$num,lsl#6	// len to point at the end of inp</div><div class='add'>+</div><div class='add'>+	ld1.8	{@X[0]},[$inp], #16</div><div class='add'>+	ld1.8	{@X[1]},[$inp], #16</div><div class='add'>+	ld1.8	{@X[2]},[$inp], #16</div><div class='add'>+	ld1.8	{@X[3]},[$inp], #16</div><div class='add'>+	ld1.32	{$T0},[$Ktbl], #16</div><div class='add'>+	ld1.32	{$T1},[$Ktbl], #16</div><div class='add'>+	ld1.32	{$T2},[$Ktbl], #16</div><div class='add'>+	ld1.32	{$T3},[$Ktbl], #16</div><div class='add'>+	rev32	@X[0],@X[0]		// yes, even on</div><div class='add'>+	rev32	@X[1],@X[1]		// big-endian</div><div class='add'>+	rev32	@X[2],@X[2]</div><div class='add'>+	rev32	@X[3],@X[3]</div><div class='add'>+	mov	$Xfer,sp</div><div class='add'>+	add.32	$T0,$T0,@X[0]</div><div class='add'>+	add.32	$T1,$T1,@X[1]</div><div class='add'>+	add.32	$T2,$T2,@X[2]</div><div class='add'>+	st1.32	{$T0-$T1},[$Xfer], #32</div><div class='add'>+	add.32	$T3,$T3,@X[3]</div><div class='add'>+	st1.32	{$T2-$T3},[$Xfer]</div><div class='add'>+	sub	$Xfer,$Xfer,#32</div><div class='add'>+</div><div class='add'>+	ldp	$A,$B,[$ctx]</div><div class='add'>+	ldp	$C,$D,[$ctx,#8]</div><div class='add'>+	ldp	$E,$F,[$ctx,#16]</div><div class='add'>+	ldp	$G,$H,[$ctx,#24]</div><div class='add'>+	ldr	$t1,[sp,#0]</div><div class='add'>+	mov	$t2,wzr</div><div class='add'>+	eor	$t3,$B,$C</div><div class='add'>+	mov	$t4,wzr</div><div class='add'>+	b	.L_00_48</div><div class='add'>+</div><div class='add'>+.align	4</div><div class='add'>+.L_00_48:</div><div class='add'>+___</div><div class='add'>+	&amp;Xupdate(\&amp;body_00_15);</div><div class='add'>+	&amp;Xupdate(\&amp;body_00_15);</div><div class='add'>+	&amp;Xupdate(\&amp;body_00_15);</div><div class='add'>+	&amp;Xupdate(\&amp;body_00_15);</div><div class='add'>+$code.=&lt;&lt;___;</div><div class='add'>+	cmp	$t1,#0				// check for K256 terminator</div><div class='add'>+	ldr	$t1,[sp,#0]</div><div class='add'>+	sub	$Xfer,$Xfer,#64</div><div class='add'>+	bne	.L_00_48</div><div class='add'>+</div><div class='add'>+	sub	$Ktbl,$Ktbl,#256		// rewind $Ktbl</div><div class='add'>+	cmp	$inp,$num</div><div class='add'>+	mov	$Xfer, #64</div><div class='add'>+	csel	$Xfer, $Xfer, xzr, eq</div><div class='add'>+	sub	$inp,$inp,$Xfer			// avoid SEGV</div><div class='add'>+	mov	$Xfer,sp</div><div class='add'>+___</div><div class='add'>+	&amp;Xpreload(\&amp;body_00_15);</div><div class='add'>+	&amp;Xpreload(\&amp;body_00_15);</div><div class='add'>+	&amp;Xpreload(\&amp;body_00_15);</div><div class='add'>+	&amp;Xpreload(\&amp;body_00_15);</div><div class='add'>+$code.=&lt;&lt;___;</div><div class='add'>+	add	$A,$A,$t4			// h+=Sigma0(a) from the past</div><div class='add'>+	ldp	$t0,$t1,[$ctx,#0]</div><div class='add'>+	add	$A,$A,$t2			// h+=Maj(a,b,c) from the past</div><div class='add'>+	ldp	$t2,$t3,[$ctx,#8]</div><div class='add'>+	add	$A,$A,$t0			// accumulate</div><div class='add'>+	add	$B,$B,$t1</div><div class='add'>+	ldp	$t0,$t1,[$ctx,#16]</div><div class='add'>+	add	$C,$C,$t2</div><div class='add'>+	add	$D,$D,$t3</div><div class='add'>+	ldp	$t2,$t3,[$ctx,#24]</div><div class='add'>+	add	$E,$E,$t0</div><div class='add'>+	add	$F,$F,$t1</div><div class='add'>+	 ldr	$t1,[sp,#0]</div><div class='add'>+	stp	$A,$B,[$ctx,#0]</div><div class='add'>+	add	$G,$G,$t2</div><div class='add'>+	 mov	$t2,wzr</div><div class='add'>+	stp	$C,$D,[$ctx,#8]</div><div class='add'>+	add	$H,$H,$t3</div><div class='add'>+	stp	$E,$F,[$ctx,#16]</div><div class='add'>+	 eor	$t3,$B,$C</div><div class='add'>+	stp	$G,$H,[$ctx,#24]</div><div class='add'>+	 mov	$t4,wzr</div><div class='add'>+	 mov	$Xfer,sp</div><div class='add'>+	b.ne	.L_00_48</div><div class='add'>+</div><div class='add'>+	ldr	x29,[x29]</div><div class='add'>+	add	sp,sp,#16*4+16</div><div class='add'>+	ret</div><div class='add'>+.size	sha256_block_neon,.-sha256_block_neon</div><div class='add'>+___</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+$code.=&lt;&lt;___;</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+.comm	OPENSSL_armcap_P,4,4</div><div class='add'>+#endif</div><div class='add'>+___</div><div class='add'>+</div><div class='add'>+{   my  %opcode = (</div><div class='add'>+	"sha256h"	=&gt; 0x5e004000,	"sha256h2"	=&gt; 0x5e005000,</div><div class='add'>+	"sha256su0"	=&gt; 0x5e282800,	"sha256su1"	=&gt; 0x5e006000	);</div><div class='add'>+</div><div class='add'>+    sub unsha256 {</div><div class='add'>+	my ($mnemonic,$arg)=@_;</div><div class='add'>+</div><div class='add'>+	$arg =~ m/[qv]([0-9]+)[^,]*,\s*[qv]([0-9]+)[^,]*(?:,\s*[qv]([0-9]+))?/o</div><div class='add'>+	&amp;&amp;</div><div class='add'>+	sprintf ".inst\t0x%08x\t//%s %s",</div><div class='add'>+			$opcode{$mnemonic}|$1|($2&lt;&lt;5)|($3&lt;&lt;16),</div><div class='add'>+			$mnemonic,$arg;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+open SELF,$0;</div><div class='add'>+while(&lt;SELF&gt;) {</div><div class='add'>+        next if (/^#!/);</div><div class='add'>+        last if (!s/^#/\/\// and !/^$/);</div><div class='add'>+        print;</div><div class='add'>+}</div><div class='add'>+close SELF;</div><div class='add'>+</div><div class='add'>+foreach(split("\n",$code)) {</div><div class='add'>+</div><div class='add'>+	s/\`([^\`]*)\`/eval($1)/ge;</div><div class='add'>+</div><div class='add'>+	s/\b(sha256\w+)\s+([qv].*)/unsha256($1,$2)/ge;</div><div class='add'>+</div><div class='add'>+	s/\bq([0-9]+)\b/v$1.16b/g;		# old-&gt;new registers</div><div class='add'>+</div><div class='add'>+	s/\.[ui]?8(\s)/$1/;</div><div class='add'>+	s/\.\w?32\b//		and s/\.16b/\.4s/g;</div><div class='add'>+	m/(ld|st)1[^\[]+\[0\]/	and s/\.4s/\.s/g;</div><div class='add'>+</div><div class='add'>+	print $_,"\n";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+close STDOUT;</div><div class='head'>diff --git a/arch/arm64/crypto/sha512-core.S_shipped b/arch/arm64/crypto/sha512-core.S_shipped<br/>new file mode 100644<br/>index 000000000000..bd0f59f06c9d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/sha512-core.S_shipped?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha512-core.S_shipped</a></div><div class='hunk'>@@ -0,0 +1,1085 @@</div><div class='add'>+// Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.</div><div class='add'>+//</div><div class='add'>+// Licensed under the OpenSSL license (the "License").  You may not use</div><div class='add'>+// this file except in compliance with the License.  You can obtain a copy</div><div class='add'>+// in the file LICENSE in the source distribution or at</div><div class='add'>+// https://www.openssl.org/source/license.html</div><div class='add'>+</div><div class='add'>+// ====================================================================</div><div class='add'>+// Written by Andy Polyakov &lt;appro@openssl.org&gt; for the OpenSSL</div><div class='add'>+// project. The module is, however, dual licensed under OpenSSL and</div><div class='add'>+// CRYPTOGAMS licenses depending on where you obtain it. For further</div><div class='add'>+// details see http://www.openssl.org/~appro/cryptogams/.</div><div class='add'>+//</div><div class='add'>+// Permission to use under GPLv2 terms is granted.</div><div class='add'>+// ====================================================================</div><div class='add'>+//</div><div class='add'>+// SHA256/512 for ARMv8.</div><div class='add'>+//</div><div class='add'>+// Performance in cycles per processed byte and improvement coefficient</div><div class='add'>+// over code generated with "default" compiler:</div><div class='add'>+//</div><div class='add'>+//		SHA256-hw	SHA256(*)	SHA512</div><div class='add'>+// Apple A7	1.97		10.5 (+33%)	6.73 (-1%(**))</div><div class='add'>+// Cortex-A53	2.38		15.5 (+115%)	10.0 (+150%(***))</div><div class='add'>+// Cortex-A57	2.31		11.6 (+86%)	7.51 (+260%(***))</div><div class='add'>+// Denver	2.01		10.5 (+26%)	6.70 (+8%)</div><div class='add'>+// X-Gene			20.0 (+100%)	12.8 (+300%(***))</div><div class='add'>+// Mongoose	2.36		13.0 (+50%)	8.36 (+33%)</div><div class='add'>+//</div><div class='add'>+// (*)	Software SHA256 results are of lesser relevance, presented</div><div class='add'>+//	mostly for informational purposes.</div><div class='add'>+// (**)	The result is a trade-off: it's possible to improve it by</div><div class='add'>+//	10% (or by 1 cycle per round), but at the cost of 20% loss</div><div class='add'>+//	on Cortex-A53 (or by 4 cycles per round).</div><div class='add'>+// (***)	Super-impressive coefficients over gcc-generated code are</div><div class='add'>+//	indication of some compiler "pathology", most notably code</div><div class='add'>+//	generated with -mgeneral-regs-only is significanty faster</div><div class='add'>+//	and the gap is only 40-90%.</div><div class='add'>+//</div><div class='add'>+// October 2016.</div><div class='add'>+//</div><div class='add'>+// Originally it was reckoned that it makes no sense to implement NEON</div><div class='add'>+// version of SHA256 for 64-bit processors. This is because performance</div><div class='add'>+// improvement on most wide-spread Cortex-A5x processors was observed</div><div class='add'>+// to be marginal, same on Cortex-A53 and ~10% on A57. But then it was</div><div class='add'>+// observed that 32-bit NEON SHA256 performs significantly better than</div><div class='add'>+// 64-bit scalar version on *some* of the more recent processors. As</div><div class='add'>+// result 64-bit NEON version of SHA256 was added to provide best</div><div class='add'>+// all-round performance. For example it executes ~30% faster on X-Gene</div><div class='add'>+// and Mongoose. [For reference, NEON version of SHA512 is bound to</div><div class='add'>+// deliver much less improvement, likely *negative* on Cortex-A5x.</div><div class='add'>+// Which is why NEON support is limited to SHA256.]</div><div class='add'>+</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+# include "arm_arch.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+.text</div><div class='add'>+</div><div class='add'>+.extern	OPENSSL_armcap_P</div><div class='add'>+.globl	sha512_block_data_order</div><div class='add'>+.type	sha512_block_data_order,%function</div><div class='add'>+.align	6</div><div class='add'>+sha512_block_data_order:</div><div class='add'>+	stp	x29,x30,[sp,#-128]!</div><div class='add'>+	add	x29,sp,#0</div><div class='add'>+</div><div class='add'>+	stp	x19,x20,[sp,#16]</div><div class='add'>+	stp	x21,x22,[sp,#32]</div><div class='add'>+	stp	x23,x24,[sp,#48]</div><div class='add'>+	stp	x25,x26,[sp,#64]</div><div class='add'>+	stp	x27,x28,[sp,#80]</div><div class='add'>+	sub	sp,sp,#4*8</div><div class='add'>+</div><div class='add'>+	ldp	x20,x21,[x0]				// load context</div><div class='add'>+	ldp	x22,x23,[x0,#2*8]</div><div class='add'>+	ldp	x24,x25,[x0,#4*8]</div><div class='add'>+	add	x2,x1,x2,lsl#7	// end of input</div><div class='add'>+	ldp	x26,x27,[x0,#6*8]</div><div class='add'>+	adr	x30,.LK512</div><div class='add'>+	stp	x0,x2,[x29,#96]</div><div class='add'>+</div><div class='add'>+.Loop:</div><div class='add'>+	ldp	x3,x4,[x1],#2*8</div><div class='add'>+	ldr	x19,[x30],#8			// *K++</div><div class='add'>+	eor	x28,x21,x22				// magic seed</div><div class='add'>+	str	x1,[x29,#112]</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x3,x3			// 0</div><div class='add'>+#endif</div><div class='add'>+	ror	x16,x24,#14</div><div class='add'>+	add	x27,x27,x19			// h+=K[i]</div><div class='add'>+	eor	x6,x24,x24,ror#23</div><div class='add'>+	and	x17,x25,x24</div><div class='add'>+	bic	x19,x26,x24</div><div class='add'>+	add	x27,x27,x3			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x20,x21			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x6,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x6,x20,#28</div><div class='add'>+	add	x27,x27,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x20,x20,ror#5</div><div class='add'>+	add	x27,x27,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x23,x23,x27			// d+=h</div><div class='add'>+	eor	x28,x28,x21			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x6,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x27,x27,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	//add	x27,x27,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x4,x4			// 1</div><div class='add'>+#endif</div><div class='add'>+	ldp	x5,x6,[x1],#2*8</div><div class='add'>+	add	x27,x27,x17			// h+=Sigma0(a)</div><div class='add'>+	ror	x16,x23,#14</div><div class='add'>+	add	x26,x26,x28			// h+=K[i]</div><div class='add'>+	eor	x7,x23,x23,ror#23</div><div class='add'>+	and	x17,x24,x23</div><div class='add'>+	bic	x28,x25,x23</div><div class='add'>+	add	x26,x26,x4			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x27,x20			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x7,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x7,x27,#28</div><div class='add'>+	add	x26,x26,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x27,x27,ror#5</div><div class='add'>+	add	x26,x26,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x22,x22,x26			// d+=h</div><div class='add'>+	eor	x19,x19,x20			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x7,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x26,x26,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	//add	x26,x26,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x5,x5			// 2</div><div class='add'>+#endif</div><div class='add'>+	add	x26,x26,x17			// h+=Sigma0(a)</div><div class='add'>+	ror	x16,x22,#14</div><div class='add'>+	add	x25,x25,x19			// h+=K[i]</div><div class='add'>+	eor	x8,x22,x22,ror#23</div><div class='add'>+	and	x17,x23,x22</div><div class='add'>+	bic	x19,x24,x22</div><div class='add'>+	add	x25,x25,x5			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x26,x27			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x8,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x8,x26,#28</div><div class='add'>+	add	x25,x25,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x26,x26,ror#5</div><div class='add'>+	add	x25,x25,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x21,x21,x25			// d+=h</div><div class='add'>+	eor	x28,x28,x27			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x8,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x25,x25,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	//add	x25,x25,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x6,x6			// 3</div><div class='add'>+#endif</div><div class='add'>+	ldp	x7,x8,[x1],#2*8</div><div class='add'>+	add	x25,x25,x17			// h+=Sigma0(a)</div><div class='add'>+	ror	x16,x21,#14</div><div class='add'>+	add	x24,x24,x28			// h+=K[i]</div><div class='add'>+	eor	x9,x21,x21,ror#23</div><div class='add'>+	and	x17,x22,x21</div><div class='add'>+	bic	x28,x23,x21</div><div class='add'>+	add	x24,x24,x6			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x25,x26			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x9,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x9,x25,#28</div><div class='add'>+	add	x24,x24,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x25,x25,ror#5</div><div class='add'>+	add	x24,x24,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x20,x20,x24			// d+=h</div><div class='add'>+	eor	x19,x19,x26			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x9,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x24,x24,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	//add	x24,x24,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x7,x7			// 4</div><div class='add'>+#endif</div><div class='add'>+	add	x24,x24,x17			// h+=Sigma0(a)</div><div class='add'>+	ror	x16,x20,#14</div><div class='add'>+	add	x23,x23,x19			// h+=K[i]</div><div class='add'>+	eor	x10,x20,x20,ror#23</div><div class='add'>+	and	x17,x21,x20</div><div class='add'>+	bic	x19,x22,x20</div><div class='add'>+	add	x23,x23,x7			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x24,x25			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x10,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x10,x24,#28</div><div class='add'>+	add	x23,x23,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x24,x24,ror#5</div><div class='add'>+	add	x23,x23,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x27,x27,x23			// d+=h</div><div class='add'>+	eor	x28,x28,x25			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x10,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x23,x23,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	//add	x23,x23,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x8,x8			// 5</div><div class='add'>+#endif</div><div class='add'>+	ldp	x9,x10,[x1],#2*8</div><div class='add'>+	add	x23,x23,x17			// h+=Sigma0(a)</div><div class='add'>+	ror	x16,x27,#14</div><div class='add'>+	add	x22,x22,x28			// h+=K[i]</div><div class='add'>+	eor	x11,x27,x27,ror#23</div><div class='add'>+	and	x17,x20,x27</div><div class='add'>+	bic	x28,x21,x27</div><div class='add'>+	add	x22,x22,x8			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x23,x24			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x11,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x11,x23,#28</div><div class='add'>+	add	x22,x22,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x23,x23,ror#5</div><div class='add'>+	add	x22,x22,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x26,x26,x22			// d+=h</div><div class='add'>+	eor	x19,x19,x24			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x11,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x22,x22,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	//add	x22,x22,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x9,x9			// 6</div><div class='add'>+#endif</div><div class='add'>+	add	x22,x22,x17			// h+=Sigma0(a)</div><div class='add'>+	ror	x16,x26,#14</div><div class='add'>+	add	x21,x21,x19			// h+=K[i]</div><div class='add'>+	eor	x12,x26,x26,ror#23</div><div class='add'>+	and	x17,x27,x26</div><div class='add'>+	bic	x19,x20,x26</div><div class='add'>+	add	x21,x21,x9			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x22,x23			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x12,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x12,x22,#28</div><div class='add'>+	add	x21,x21,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x22,x22,ror#5</div><div class='add'>+	add	x21,x21,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x25,x25,x21			// d+=h</div><div class='add'>+	eor	x28,x28,x23			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x12,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x21,x21,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	//add	x21,x21,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x10,x10			// 7</div><div class='add'>+#endif</div><div class='add'>+	ldp	x11,x12,[x1],#2*8</div><div class='add'>+	add	x21,x21,x17			// h+=Sigma0(a)</div><div class='add'>+	ror	x16,x25,#14</div><div class='add'>+	add	x20,x20,x28			// h+=K[i]</div><div class='add'>+	eor	x13,x25,x25,ror#23</div><div class='add'>+	and	x17,x26,x25</div><div class='add'>+	bic	x28,x27,x25</div><div class='add'>+	add	x20,x20,x10			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x21,x22			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x13,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x13,x21,#28</div><div class='add'>+	add	x20,x20,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x21,x21,ror#5</div><div class='add'>+	add	x20,x20,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x24,x24,x20			// d+=h</div><div class='add'>+	eor	x19,x19,x22			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x13,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x20,x20,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	//add	x20,x20,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x11,x11			// 8</div><div class='add'>+#endif</div><div class='add'>+	add	x20,x20,x17			// h+=Sigma0(a)</div><div class='add'>+	ror	x16,x24,#14</div><div class='add'>+	add	x27,x27,x19			// h+=K[i]</div><div class='add'>+	eor	x14,x24,x24,ror#23</div><div class='add'>+	and	x17,x25,x24</div><div class='add'>+	bic	x19,x26,x24</div><div class='add'>+	add	x27,x27,x11			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x20,x21			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x14,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x14,x20,#28</div><div class='add'>+	add	x27,x27,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x20,x20,ror#5</div><div class='add'>+	add	x27,x27,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x23,x23,x27			// d+=h</div><div class='add'>+	eor	x28,x28,x21			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x14,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x27,x27,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	//add	x27,x27,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x12,x12			// 9</div><div class='add'>+#endif</div><div class='add'>+	ldp	x13,x14,[x1],#2*8</div><div class='add'>+	add	x27,x27,x17			// h+=Sigma0(a)</div><div class='add'>+	ror	x16,x23,#14</div><div class='add'>+	add	x26,x26,x28			// h+=K[i]</div><div class='add'>+	eor	x15,x23,x23,ror#23</div><div class='add'>+	and	x17,x24,x23</div><div class='add'>+	bic	x28,x25,x23</div><div class='add'>+	add	x26,x26,x12			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x27,x20			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x15,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x15,x27,#28</div><div class='add'>+	add	x26,x26,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x27,x27,ror#5</div><div class='add'>+	add	x26,x26,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x22,x22,x26			// d+=h</div><div class='add'>+	eor	x19,x19,x20			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x15,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x26,x26,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	//add	x26,x26,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x13,x13			// 10</div><div class='add'>+#endif</div><div class='add'>+	add	x26,x26,x17			// h+=Sigma0(a)</div><div class='add'>+	ror	x16,x22,#14</div><div class='add'>+	add	x25,x25,x19			// h+=K[i]</div><div class='add'>+	eor	x0,x22,x22,ror#23</div><div class='add'>+	and	x17,x23,x22</div><div class='add'>+	bic	x19,x24,x22</div><div class='add'>+	add	x25,x25,x13			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x26,x27			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x0,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x0,x26,#28</div><div class='add'>+	add	x25,x25,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x26,x26,ror#5</div><div class='add'>+	add	x25,x25,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x21,x21,x25			// d+=h</div><div class='add'>+	eor	x28,x28,x27			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x0,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x25,x25,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	//add	x25,x25,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x14,x14			// 11</div><div class='add'>+#endif</div><div class='add'>+	ldp	x15,x0,[x1],#2*8</div><div class='add'>+	add	x25,x25,x17			// h+=Sigma0(a)</div><div class='add'>+	str	x6,[sp,#24]</div><div class='add'>+	ror	x16,x21,#14</div><div class='add'>+	add	x24,x24,x28			// h+=K[i]</div><div class='add'>+	eor	x6,x21,x21,ror#23</div><div class='add'>+	and	x17,x22,x21</div><div class='add'>+	bic	x28,x23,x21</div><div class='add'>+	add	x24,x24,x14			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x25,x26			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x6,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x6,x25,#28</div><div class='add'>+	add	x24,x24,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x25,x25,ror#5</div><div class='add'>+	add	x24,x24,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x20,x20,x24			// d+=h</div><div class='add'>+	eor	x19,x19,x26			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x6,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x24,x24,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	//add	x24,x24,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x15,x15			// 12</div><div class='add'>+#endif</div><div class='add'>+	add	x24,x24,x17			// h+=Sigma0(a)</div><div class='add'>+	str	x7,[sp,#0]</div><div class='add'>+	ror	x16,x20,#14</div><div class='add'>+	add	x23,x23,x19			// h+=K[i]</div><div class='add'>+	eor	x7,x20,x20,ror#23</div><div class='add'>+	and	x17,x21,x20</div><div class='add'>+	bic	x19,x22,x20</div><div class='add'>+	add	x23,x23,x15			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x24,x25			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x7,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x7,x24,#28</div><div class='add'>+	add	x23,x23,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x24,x24,ror#5</div><div class='add'>+	add	x23,x23,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x27,x27,x23			// d+=h</div><div class='add'>+	eor	x28,x28,x25			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x7,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x23,x23,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	//add	x23,x23,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x0,x0			// 13</div><div class='add'>+#endif</div><div class='add'>+	ldp	x1,x2,[x1]</div><div class='add'>+	add	x23,x23,x17			// h+=Sigma0(a)</div><div class='add'>+	str	x8,[sp,#8]</div><div class='add'>+	ror	x16,x27,#14</div><div class='add'>+	add	x22,x22,x28			// h+=K[i]</div><div class='add'>+	eor	x8,x27,x27,ror#23</div><div class='add'>+	and	x17,x20,x27</div><div class='add'>+	bic	x28,x21,x27</div><div class='add'>+	add	x22,x22,x0			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x23,x24			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x8,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x8,x23,#28</div><div class='add'>+	add	x22,x22,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x23,x23,ror#5</div><div class='add'>+	add	x22,x22,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x26,x26,x22			// d+=h</div><div class='add'>+	eor	x19,x19,x24			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x8,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x22,x22,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	//add	x22,x22,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x1,x1			// 14</div><div class='add'>+#endif</div><div class='add'>+	ldr	x6,[sp,#24]</div><div class='add'>+	add	x22,x22,x17			// h+=Sigma0(a)</div><div class='add'>+	str	x9,[sp,#16]</div><div class='add'>+	ror	x16,x26,#14</div><div class='add'>+	add	x21,x21,x19			// h+=K[i]</div><div class='add'>+	eor	x9,x26,x26,ror#23</div><div class='add'>+	and	x17,x27,x26</div><div class='add'>+	bic	x19,x20,x26</div><div class='add'>+	add	x21,x21,x1			// h+=X[i]</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x22,x23			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x9,ror#18	// Sigma1(e)</div><div class='add'>+	ror	x9,x22,#28</div><div class='add'>+	add	x21,x21,x17			// h+=Ch(e,f,g)</div><div class='add'>+	eor	x17,x22,x22,ror#5</div><div class='add'>+	add	x21,x21,x16			// h+=Sigma1(e)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	add	x25,x25,x21			// d+=h</div><div class='add'>+	eor	x28,x28,x23			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x9,x17,ror#34	// Sigma0(a)</div><div class='add'>+	add	x21,x21,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	//add	x21,x21,x17			// h+=Sigma0(a)</div><div class='add'>+#ifndef	__AARCH64EB__</div><div class='add'>+	rev	x2,x2			// 15</div><div class='add'>+#endif</div><div class='add'>+	ldr	x7,[sp,#0]</div><div class='add'>+	add	x21,x21,x17			// h+=Sigma0(a)</div><div class='add'>+	str	x10,[sp,#24]</div><div class='add'>+	ror	x16,x25,#14</div><div class='add'>+	add	x20,x20,x28			// h+=K[i]</div><div class='add'>+	ror	x9,x4,#1</div><div class='add'>+	and	x17,x26,x25</div><div class='add'>+	ror	x8,x1,#19</div><div class='add'>+	bic	x28,x27,x25</div><div class='add'>+	ror	x10,x21,#28</div><div class='add'>+	add	x20,x20,x2			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x25,ror#18</div><div class='add'>+	eor	x9,x9,x4,ror#8</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x21,x22			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x25,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x10,x10,x21,ror#34</div><div class='add'>+	add	x20,x20,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x8,x8,x1,ror#61</div><div class='add'>+	eor	x9,x9,x4,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x20,x20,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x19,x19,x22			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x10,x21,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x8,x8,x1,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x3,x3,x12</div><div class='add'>+	add	x24,x24,x20			// d+=h</div><div class='add'>+	add	x20,x20,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	add	x3,x3,x9</div><div class='add'>+	add	x20,x20,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x3,x3,x8</div><div class='add'>+.Loop_16_xx:</div><div class='add'>+	ldr	x8,[sp,#8]</div><div class='add'>+	str	x11,[sp,#0]</div><div class='add'>+	ror	x16,x24,#14</div><div class='add'>+	add	x27,x27,x19			// h+=K[i]</div><div class='add'>+	ror	x10,x5,#1</div><div class='add'>+	and	x17,x25,x24</div><div class='add'>+	ror	x9,x2,#19</div><div class='add'>+	bic	x19,x26,x24</div><div class='add'>+	ror	x11,x20,#28</div><div class='add'>+	add	x27,x27,x3			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x24,ror#18</div><div class='add'>+	eor	x10,x10,x5,ror#8</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x20,x21			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x24,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x11,x11,x20,ror#34</div><div class='add'>+	add	x27,x27,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x9,x9,x2,ror#61</div><div class='add'>+	eor	x10,x10,x5,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x27,x27,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x28,x28,x21			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x11,x20,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x9,x9,x2,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x4,x4,x13</div><div class='add'>+	add	x23,x23,x27			// d+=h</div><div class='add'>+	add	x27,x27,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	add	x4,x4,x10</div><div class='add'>+	add	x27,x27,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x4,x4,x9</div><div class='add'>+	ldr	x9,[sp,#16]</div><div class='add'>+	str	x12,[sp,#8]</div><div class='add'>+	ror	x16,x23,#14</div><div class='add'>+	add	x26,x26,x28			// h+=K[i]</div><div class='add'>+	ror	x11,x6,#1</div><div class='add'>+	and	x17,x24,x23</div><div class='add'>+	ror	x10,x3,#19</div><div class='add'>+	bic	x28,x25,x23</div><div class='add'>+	ror	x12,x27,#28</div><div class='add'>+	add	x26,x26,x4			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x23,ror#18</div><div class='add'>+	eor	x11,x11,x6,ror#8</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x27,x20			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x23,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x12,x12,x27,ror#34</div><div class='add'>+	add	x26,x26,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x10,x10,x3,ror#61</div><div class='add'>+	eor	x11,x11,x6,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x26,x26,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x19,x19,x20			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x12,x27,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x10,x10,x3,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x5,x5,x14</div><div class='add'>+	add	x22,x22,x26			// d+=h</div><div class='add'>+	add	x26,x26,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	add	x5,x5,x11</div><div class='add'>+	add	x26,x26,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x5,x5,x10</div><div class='add'>+	ldr	x10,[sp,#24]</div><div class='add'>+	str	x13,[sp,#16]</div><div class='add'>+	ror	x16,x22,#14</div><div class='add'>+	add	x25,x25,x19			// h+=K[i]</div><div class='add'>+	ror	x12,x7,#1</div><div class='add'>+	and	x17,x23,x22</div><div class='add'>+	ror	x11,x4,#19</div><div class='add'>+	bic	x19,x24,x22</div><div class='add'>+	ror	x13,x26,#28</div><div class='add'>+	add	x25,x25,x5			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x22,ror#18</div><div class='add'>+	eor	x12,x12,x7,ror#8</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x26,x27			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x22,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x13,x13,x26,ror#34</div><div class='add'>+	add	x25,x25,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x11,x11,x4,ror#61</div><div class='add'>+	eor	x12,x12,x7,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x25,x25,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x28,x28,x27			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x13,x26,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x11,x11,x4,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x6,x6,x15</div><div class='add'>+	add	x21,x21,x25			// d+=h</div><div class='add'>+	add	x25,x25,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	add	x6,x6,x12</div><div class='add'>+	add	x25,x25,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x6,x6,x11</div><div class='add'>+	ldr	x11,[sp,#0]</div><div class='add'>+	str	x14,[sp,#24]</div><div class='add'>+	ror	x16,x21,#14</div><div class='add'>+	add	x24,x24,x28			// h+=K[i]</div><div class='add'>+	ror	x13,x8,#1</div><div class='add'>+	and	x17,x22,x21</div><div class='add'>+	ror	x12,x5,#19</div><div class='add'>+	bic	x28,x23,x21</div><div class='add'>+	ror	x14,x25,#28</div><div class='add'>+	add	x24,x24,x6			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x21,ror#18</div><div class='add'>+	eor	x13,x13,x8,ror#8</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x25,x26			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x21,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x14,x14,x25,ror#34</div><div class='add'>+	add	x24,x24,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x12,x12,x5,ror#61</div><div class='add'>+	eor	x13,x13,x8,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x24,x24,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x19,x19,x26			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x14,x25,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x12,x12,x5,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x7,x7,x0</div><div class='add'>+	add	x20,x20,x24			// d+=h</div><div class='add'>+	add	x24,x24,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	add	x7,x7,x13</div><div class='add'>+	add	x24,x24,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x7,x7,x12</div><div class='add'>+	ldr	x12,[sp,#8]</div><div class='add'>+	str	x15,[sp,#0]</div><div class='add'>+	ror	x16,x20,#14</div><div class='add'>+	add	x23,x23,x19			// h+=K[i]</div><div class='add'>+	ror	x14,x9,#1</div><div class='add'>+	and	x17,x21,x20</div><div class='add'>+	ror	x13,x6,#19</div><div class='add'>+	bic	x19,x22,x20</div><div class='add'>+	ror	x15,x24,#28</div><div class='add'>+	add	x23,x23,x7			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x20,ror#18</div><div class='add'>+	eor	x14,x14,x9,ror#8</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x24,x25			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x20,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x15,x15,x24,ror#34</div><div class='add'>+	add	x23,x23,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x13,x13,x6,ror#61</div><div class='add'>+	eor	x14,x14,x9,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x23,x23,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x28,x28,x25			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x15,x24,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x13,x13,x6,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x8,x8,x1</div><div class='add'>+	add	x27,x27,x23			// d+=h</div><div class='add'>+	add	x23,x23,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	add	x8,x8,x14</div><div class='add'>+	add	x23,x23,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x8,x8,x13</div><div class='add'>+	ldr	x13,[sp,#16]</div><div class='add'>+	str	x0,[sp,#8]</div><div class='add'>+	ror	x16,x27,#14</div><div class='add'>+	add	x22,x22,x28			// h+=K[i]</div><div class='add'>+	ror	x15,x10,#1</div><div class='add'>+	and	x17,x20,x27</div><div class='add'>+	ror	x14,x7,#19</div><div class='add'>+	bic	x28,x21,x27</div><div class='add'>+	ror	x0,x23,#28</div><div class='add'>+	add	x22,x22,x8			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x27,ror#18</div><div class='add'>+	eor	x15,x15,x10,ror#8</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x23,x24			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x27,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x0,x0,x23,ror#34</div><div class='add'>+	add	x22,x22,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x14,x14,x7,ror#61</div><div class='add'>+	eor	x15,x15,x10,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x22,x22,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x19,x19,x24			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x0,x23,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x14,x14,x7,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x9,x9,x2</div><div class='add'>+	add	x26,x26,x22			// d+=h</div><div class='add'>+	add	x22,x22,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	add	x9,x9,x15</div><div class='add'>+	add	x22,x22,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x9,x9,x14</div><div class='add'>+	ldr	x14,[sp,#24]</div><div class='add'>+	str	x1,[sp,#16]</div><div class='add'>+	ror	x16,x26,#14</div><div class='add'>+	add	x21,x21,x19			// h+=K[i]</div><div class='add'>+	ror	x0,x11,#1</div><div class='add'>+	and	x17,x27,x26</div><div class='add'>+	ror	x15,x8,#19</div><div class='add'>+	bic	x19,x20,x26</div><div class='add'>+	ror	x1,x22,#28</div><div class='add'>+	add	x21,x21,x9			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x26,ror#18</div><div class='add'>+	eor	x0,x0,x11,ror#8</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x22,x23			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x26,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x1,x1,x22,ror#34</div><div class='add'>+	add	x21,x21,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x15,x15,x8,ror#61</div><div class='add'>+	eor	x0,x0,x11,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x21,x21,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x28,x28,x23			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x1,x22,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x15,x15,x8,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x10,x10,x3</div><div class='add'>+	add	x25,x25,x21			// d+=h</div><div class='add'>+	add	x21,x21,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	add	x10,x10,x0</div><div class='add'>+	add	x21,x21,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x10,x10,x15</div><div class='add'>+	ldr	x15,[sp,#0]</div><div class='add'>+	str	x2,[sp,#24]</div><div class='add'>+	ror	x16,x25,#14</div><div class='add'>+	add	x20,x20,x28			// h+=K[i]</div><div class='add'>+	ror	x1,x12,#1</div><div class='add'>+	and	x17,x26,x25</div><div class='add'>+	ror	x0,x9,#19</div><div class='add'>+	bic	x28,x27,x25</div><div class='add'>+	ror	x2,x21,#28</div><div class='add'>+	add	x20,x20,x10			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x25,ror#18</div><div class='add'>+	eor	x1,x1,x12,ror#8</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x21,x22			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x25,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x2,x2,x21,ror#34</div><div class='add'>+	add	x20,x20,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x0,x0,x9,ror#61</div><div class='add'>+	eor	x1,x1,x12,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x20,x20,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x19,x19,x22			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x2,x21,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x0,x0,x9,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x11,x11,x4</div><div class='add'>+	add	x24,x24,x20			// d+=h</div><div class='add'>+	add	x20,x20,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	add	x11,x11,x1</div><div class='add'>+	add	x20,x20,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x11,x11,x0</div><div class='add'>+	ldr	x0,[sp,#8]</div><div class='add'>+	str	x3,[sp,#0]</div><div class='add'>+	ror	x16,x24,#14</div><div class='add'>+	add	x27,x27,x19			// h+=K[i]</div><div class='add'>+	ror	x2,x13,#1</div><div class='add'>+	and	x17,x25,x24</div><div class='add'>+	ror	x1,x10,#19</div><div class='add'>+	bic	x19,x26,x24</div><div class='add'>+	ror	x3,x20,#28</div><div class='add'>+	add	x27,x27,x11			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x24,ror#18</div><div class='add'>+	eor	x2,x2,x13,ror#8</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x20,x21			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x24,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x3,x3,x20,ror#34</div><div class='add'>+	add	x27,x27,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x1,x1,x10,ror#61</div><div class='add'>+	eor	x2,x2,x13,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x27,x27,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x28,x28,x21			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x3,x20,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x1,x1,x10,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x12,x12,x5</div><div class='add'>+	add	x23,x23,x27			// d+=h</div><div class='add'>+	add	x27,x27,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	add	x12,x12,x2</div><div class='add'>+	add	x27,x27,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x12,x12,x1</div><div class='add'>+	ldr	x1,[sp,#16]</div><div class='add'>+	str	x4,[sp,#8]</div><div class='add'>+	ror	x16,x23,#14</div><div class='add'>+	add	x26,x26,x28			// h+=K[i]</div><div class='add'>+	ror	x3,x14,#1</div><div class='add'>+	and	x17,x24,x23</div><div class='add'>+	ror	x2,x11,#19</div><div class='add'>+	bic	x28,x25,x23</div><div class='add'>+	ror	x4,x27,#28</div><div class='add'>+	add	x26,x26,x12			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x23,ror#18</div><div class='add'>+	eor	x3,x3,x14,ror#8</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x27,x20			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x23,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x4,x4,x27,ror#34</div><div class='add'>+	add	x26,x26,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x2,x2,x11,ror#61</div><div class='add'>+	eor	x3,x3,x14,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x26,x26,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x19,x19,x20			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x4,x27,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x2,x2,x11,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x13,x13,x6</div><div class='add'>+	add	x22,x22,x26			// d+=h</div><div class='add'>+	add	x26,x26,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	add	x13,x13,x3</div><div class='add'>+	add	x26,x26,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x13,x13,x2</div><div class='add'>+	ldr	x2,[sp,#24]</div><div class='add'>+	str	x5,[sp,#16]</div><div class='add'>+	ror	x16,x22,#14</div><div class='add'>+	add	x25,x25,x19			// h+=K[i]</div><div class='add'>+	ror	x4,x15,#1</div><div class='add'>+	and	x17,x23,x22</div><div class='add'>+	ror	x3,x12,#19</div><div class='add'>+	bic	x19,x24,x22</div><div class='add'>+	ror	x5,x26,#28</div><div class='add'>+	add	x25,x25,x13			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x22,ror#18</div><div class='add'>+	eor	x4,x4,x15,ror#8</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x26,x27			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x22,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x5,x5,x26,ror#34</div><div class='add'>+	add	x25,x25,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x3,x3,x12,ror#61</div><div class='add'>+	eor	x4,x4,x15,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x25,x25,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x28,x28,x27			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x5,x26,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x3,x3,x12,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x14,x14,x7</div><div class='add'>+	add	x21,x21,x25			// d+=h</div><div class='add'>+	add	x25,x25,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	add	x14,x14,x4</div><div class='add'>+	add	x25,x25,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x14,x14,x3</div><div class='add'>+	ldr	x3,[sp,#0]</div><div class='add'>+	str	x6,[sp,#24]</div><div class='add'>+	ror	x16,x21,#14</div><div class='add'>+	add	x24,x24,x28			// h+=K[i]</div><div class='add'>+	ror	x5,x0,#1</div><div class='add'>+	and	x17,x22,x21</div><div class='add'>+	ror	x4,x13,#19</div><div class='add'>+	bic	x28,x23,x21</div><div class='add'>+	ror	x6,x25,#28</div><div class='add'>+	add	x24,x24,x14			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x21,ror#18</div><div class='add'>+	eor	x5,x5,x0,ror#8</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x25,x26			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x21,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x6,x6,x25,ror#34</div><div class='add'>+	add	x24,x24,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x4,x4,x13,ror#61</div><div class='add'>+	eor	x5,x5,x0,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x24,x24,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x19,x19,x26			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x6,x25,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x4,x4,x13,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x15,x15,x8</div><div class='add'>+	add	x20,x20,x24			// d+=h</div><div class='add'>+	add	x24,x24,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	add	x15,x15,x5</div><div class='add'>+	add	x24,x24,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x15,x15,x4</div><div class='add'>+	ldr	x4,[sp,#8]</div><div class='add'>+	str	x7,[sp,#0]</div><div class='add'>+	ror	x16,x20,#14</div><div class='add'>+	add	x23,x23,x19			// h+=K[i]</div><div class='add'>+	ror	x6,x1,#1</div><div class='add'>+	and	x17,x21,x20</div><div class='add'>+	ror	x5,x14,#19</div><div class='add'>+	bic	x19,x22,x20</div><div class='add'>+	ror	x7,x24,#28</div><div class='add'>+	add	x23,x23,x15			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x20,ror#18</div><div class='add'>+	eor	x6,x6,x1,ror#8</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x24,x25			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x20,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x7,x7,x24,ror#34</div><div class='add'>+	add	x23,x23,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x5,x5,x14,ror#61</div><div class='add'>+	eor	x6,x6,x1,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x23,x23,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x28,x28,x25			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x7,x24,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x5,x5,x14,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x0,x0,x9</div><div class='add'>+	add	x27,x27,x23			// d+=h</div><div class='add'>+	add	x23,x23,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	add	x0,x0,x6</div><div class='add'>+	add	x23,x23,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x0,x0,x5</div><div class='add'>+	ldr	x5,[sp,#16]</div><div class='add'>+	str	x8,[sp,#8]</div><div class='add'>+	ror	x16,x27,#14</div><div class='add'>+	add	x22,x22,x28			// h+=K[i]</div><div class='add'>+	ror	x7,x2,#1</div><div class='add'>+	and	x17,x20,x27</div><div class='add'>+	ror	x6,x15,#19</div><div class='add'>+	bic	x28,x21,x27</div><div class='add'>+	ror	x8,x23,#28</div><div class='add'>+	add	x22,x22,x0			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x27,ror#18</div><div class='add'>+	eor	x7,x7,x2,ror#8</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x23,x24			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x27,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x8,x8,x23,ror#34</div><div class='add'>+	add	x22,x22,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x6,x6,x15,ror#61</div><div class='add'>+	eor	x7,x7,x2,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x22,x22,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x19,x19,x24			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x8,x23,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x6,x6,x15,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x1,x1,x10</div><div class='add'>+	add	x26,x26,x22			// d+=h</div><div class='add'>+	add	x22,x22,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	add	x1,x1,x7</div><div class='add'>+	add	x22,x22,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x1,x1,x6</div><div class='add'>+	ldr	x6,[sp,#24]</div><div class='add'>+	str	x9,[sp,#16]</div><div class='add'>+	ror	x16,x26,#14</div><div class='add'>+	add	x21,x21,x19			// h+=K[i]</div><div class='add'>+	ror	x8,x3,#1</div><div class='add'>+	and	x17,x27,x26</div><div class='add'>+	ror	x7,x0,#19</div><div class='add'>+	bic	x19,x20,x26</div><div class='add'>+	ror	x9,x22,#28</div><div class='add'>+	add	x21,x21,x1			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x26,ror#18</div><div class='add'>+	eor	x8,x8,x3,ror#8</div><div class='add'>+	orr	x17,x17,x19			// Ch(e,f,g)</div><div class='add'>+	eor	x19,x22,x23			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x26,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x9,x9,x22,ror#34</div><div class='add'>+	add	x21,x21,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x28,x28,x19			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x7,x7,x0,ror#61</div><div class='add'>+	eor	x8,x8,x3,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x21,x21,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x28,x28,x23			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x9,x22,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x7,x7,x0,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x2,x2,x11</div><div class='add'>+	add	x25,x25,x21			// d+=h</div><div class='add'>+	add	x21,x21,x28			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x28,[x30],#8		// *K++, x19 in next round</div><div class='add'>+	add	x2,x2,x8</div><div class='add'>+	add	x21,x21,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x2,x2,x7</div><div class='add'>+	ldr	x7,[sp,#0]</div><div class='add'>+	str	x10,[sp,#24]</div><div class='add'>+	ror	x16,x25,#14</div><div class='add'>+	add	x20,x20,x28			// h+=K[i]</div><div class='add'>+	ror	x9,x4,#1</div><div class='add'>+	and	x17,x26,x25</div><div class='add'>+	ror	x8,x1,#19</div><div class='add'>+	bic	x28,x27,x25</div><div class='add'>+	ror	x10,x21,#28</div><div class='add'>+	add	x20,x20,x2			// h+=X[i]</div><div class='add'>+	eor	x16,x16,x25,ror#18</div><div class='add'>+	eor	x9,x9,x4,ror#8</div><div class='add'>+	orr	x17,x17,x28			// Ch(e,f,g)</div><div class='add'>+	eor	x28,x21,x22			// a^b, b^c in next round</div><div class='add'>+	eor	x16,x16,x25,ror#41	// Sigma1(e)</div><div class='add'>+	eor	x10,x10,x21,ror#34</div><div class='add'>+	add	x20,x20,x17			// h+=Ch(e,f,g)</div><div class='add'>+	and	x19,x19,x28			// (b^c)&amp;=(a^b)</div><div class='add'>+	eor	x8,x8,x1,ror#61</div><div class='add'>+	eor	x9,x9,x4,lsr#7	// sigma0(X[i+1])</div><div class='add'>+	add	x20,x20,x16			// h+=Sigma1(e)</div><div class='add'>+	eor	x19,x19,x22			// Maj(a,b,c)</div><div class='add'>+	eor	x17,x10,x21,ror#39	// Sigma0(a)</div><div class='add'>+	eor	x8,x8,x1,lsr#6	// sigma1(X[i+14])</div><div class='add'>+	add	x3,x3,x12</div><div class='add'>+	add	x24,x24,x20			// d+=h</div><div class='add'>+	add	x20,x20,x19			// h+=Maj(a,b,c)</div><div class='add'>+	ldr	x19,[x30],#8		// *K++, x28 in next round</div><div class='add'>+	add	x3,x3,x9</div><div class='add'>+	add	x20,x20,x17			// h+=Sigma0(a)</div><div class='add'>+	add	x3,x3,x8</div><div class='add'>+	cbnz	x19,.Loop_16_xx</div><div class='add'>+</div><div class='add'>+	ldp	x0,x2,[x29,#96]</div><div class='add'>+	ldr	x1,[x29,#112]</div><div class='add'>+	sub	x30,x30,#648		// rewind</div><div class='add'>+</div><div class='add'>+	ldp	x3,x4,[x0]</div><div class='add'>+	ldp	x5,x6,[x0,#2*8]</div><div class='add'>+	add	x1,x1,#14*8			// advance input pointer</div><div class='add'>+	ldp	x7,x8,[x0,#4*8]</div><div class='add'>+	add	x20,x20,x3</div><div class='add'>+	ldp	x9,x10,[x0,#6*8]</div><div class='add'>+	add	x21,x21,x4</div><div class='add'>+	add	x22,x22,x5</div><div class='add'>+	add	x23,x23,x6</div><div class='add'>+	stp	x20,x21,[x0]</div><div class='add'>+	add	x24,x24,x7</div><div class='add'>+	add	x25,x25,x8</div><div class='add'>+	stp	x22,x23,[x0,#2*8]</div><div class='add'>+	add	x26,x26,x9</div><div class='add'>+	add	x27,x27,x10</div><div class='add'>+	cmp	x1,x2</div><div class='add'>+	stp	x24,x25,[x0,#4*8]</div><div class='add'>+	stp	x26,x27,[x0,#6*8]</div><div class='add'>+	b.ne	.Loop</div><div class='add'>+</div><div class='add'>+	ldp	x19,x20,[x29,#16]</div><div class='add'>+	add	sp,sp,#4*8</div><div class='add'>+	ldp	x21,x22,[x29,#32]</div><div class='add'>+	ldp	x23,x24,[x29,#48]</div><div class='add'>+	ldp	x25,x26,[x29,#64]</div><div class='add'>+	ldp	x27,x28,[x29,#80]</div><div class='add'>+	ldp	x29,x30,[sp],#128</div><div class='add'>+	ret</div><div class='add'>+.size	sha512_block_data_order,.-sha512_block_data_order</div><div class='add'>+</div><div class='add'>+.align	6</div><div class='add'>+.type	.LK512,%object</div><div class='add'>+.LK512:</div><div class='add'>+	.quad	0x428a2f98d728ae22,0x7137449123ef65cd</div><div class='add'>+	.quad	0xb5c0fbcfec4d3b2f,0xe9b5dba58189dbbc</div><div class='add'>+	.quad	0x3956c25bf348b538,0x59f111f1b605d019</div><div class='add'>+	.quad	0x923f82a4af194f9b,0xab1c5ed5da6d8118</div><div class='add'>+	.quad	0xd807aa98a3030242,0x12835b0145706fbe</div><div class='add'>+	.quad	0x243185be4ee4b28c,0x550c7dc3d5ffb4e2</div><div class='add'>+	.quad	0x72be5d74f27b896f,0x80deb1fe3b1696b1</div><div class='add'>+	.quad	0x9bdc06a725c71235,0xc19bf174cf692694</div><div class='add'>+	.quad	0xe49b69c19ef14ad2,0xefbe4786384f25e3</div><div class='add'>+	.quad	0x0fc19dc68b8cd5b5,0x240ca1cc77ac9c65</div><div class='add'>+	.quad	0x2de92c6f592b0275,0x4a7484aa6ea6e483</div><div class='add'>+	.quad	0x5cb0a9dcbd41fbd4,0x76f988da831153b5</div><div class='add'>+	.quad	0x983e5152ee66dfab,0xa831c66d2db43210</div><div class='add'>+	.quad	0xb00327c898fb213f,0xbf597fc7beef0ee4</div><div class='add'>+	.quad	0xc6e00bf33da88fc2,0xd5a79147930aa725</div><div class='add'>+	.quad	0x06ca6351e003826f,0x142929670a0e6e70</div><div class='add'>+	.quad	0x27b70a8546d22ffc,0x2e1b21385c26c926</div><div class='add'>+	.quad	0x4d2c6dfc5ac42aed,0x53380d139d95b3df</div><div class='add'>+	.quad	0x650a73548baf63de,0x766a0abb3c77b2a8</div><div class='add'>+	.quad	0x81c2c92e47edaee6,0x92722c851482353b</div><div class='add'>+	.quad	0xa2bfe8a14cf10364,0xa81a664bbc423001</div><div class='add'>+	.quad	0xc24b8b70d0f89791,0xc76c51a30654be30</div><div class='add'>+	.quad	0xd192e819d6ef5218,0xd69906245565a910</div><div class='add'>+	.quad	0xf40e35855771202a,0x106aa07032bbd1b8</div><div class='add'>+	.quad	0x19a4c116b8d2d0c8,0x1e376c085141ab53</div><div class='add'>+	.quad	0x2748774cdf8eeb99,0x34b0bcb5e19b48a8</div><div class='add'>+	.quad	0x391c0cb3c5c95a63,0x4ed8aa4ae3418acb</div><div class='add'>+	.quad	0x5b9cca4f7763e373,0x682e6ff3d6b2b8a3</div><div class='add'>+	.quad	0x748f82ee5defb2fc,0x78a5636f43172f60</div><div class='add'>+	.quad	0x84c87814a1f0ab72,0x8cc702081a6439ec</div><div class='add'>+	.quad	0x90befffa23631e28,0xa4506cebde82bde9</div><div class='add'>+	.quad	0xbef9a3f7b2c67915,0xc67178f2e372532b</div><div class='add'>+	.quad	0xca273eceea26619c,0xd186b8c721c0c207</div><div class='add'>+	.quad	0xeada7dd6cde0eb1e,0xf57d4f7fee6ed178</div><div class='add'>+	.quad	0x06f067aa72176fba,0x0a637dc5a2c898a6</div><div class='add'>+	.quad	0x113f9804bef90dae,0x1b710b35131c471b</div><div class='add'>+	.quad	0x28db77f523047d84,0x32caab7b40c72493</div><div class='add'>+	.quad	0x3c9ebe0a15c9bebc,0x431d67c49c100d4c</div><div class='add'>+	.quad	0x4cc5d4becb3e42b6,0x597f299cfc657e2a</div><div class='add'>+	.quad	0x5fcb6fab3ad6faec,0x6c44198c4a475817</div><div class='add'>+	.quad	0	// terminator</div><div class='add'>+.size	.LK512,.-.LK512</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+.align	3</div><div class='add'>+.LOPENSSL_armcap_P:</div><div class='add'>+# ifdef	__ILP32__</div><div class='add'>+	.long	OPENSSL_armcap_P-.</div><div class='add'>+# else</div><div class='add'>+	.quad	OPENSSL_armcap_P-.</div><div class='add'>+# endif</div><div class='add'>+#endif</div><div class='add'>+.asciz	"SHA512 block transform for ARMv8, CRYPTOGAMS by &lt;appro@openssl.org&gt;"</div><div class='add'>+.align	2</div><div class='add'>+#ifndef	__KERNEL__</div><div class='add'>+.comm	OPENSSL_armcap_P,4,4</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm64/crypto/sha512-glue.c b/arch/arm64/crypto/sha512-glue.c<br/>new file mode 100644<br/>index 000000000000..aff35c9992a4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/crypto/sha512-glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/crypto/sha512-glue.c</a></div><div class='hunk'>@@ -0,0 +1,94 @@</div><div class='add'>+/*</div><div class='add'>+ * Linux/arm64 port of the OpenSSL SHA512 implementation for AArch64</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Linaro Ltd. &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;linux/cryptohash.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;crypto/sha.h&gt;</div><div class='add'>+#include &lt;crypto/sha512_base.h&gt;</div><div class='add'>+#include &lt;asm/neon.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("SHA-384/SHA-512 secure hash for arm64");</div><div class='add'>+MODULE_AUTHOR("Andy Polyakov &lt;appro@openssl.org&gt;");</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS_CRYPTO("sha384");</div><div class='add'>+MODULE_ALIAS_CRYPTO("sha512");</div><div class='add'>+</div><div class='add'>+asmlinkage void sha512_block_data_order(u32 *digest, const void *data,</div><div class='add'>+					unsigned int num_blks);</div><div class='add'>+</div><div class='add'>+static int sha512_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			 unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return sha512_base_do_update(desc, data, len,</div><div class='add'>+			(sha512_block_fn *)sha512_block_data_order);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sha512_finup(struct shash_desc *desc, const u8 *data,</div><div class='add'>+			unsigned int len, u8 *out)</div><div class='add'>+{</div><div class='add'>+	if (len)</div><div class='add'>+		sha512_base_do_update(desc, data, len,</div><div class='add'>+			(sha512_block_fn *)sha512_block_data_order);</div><div class='add'>+	sha512_base_do_finalize(desc,</div><div class='add'>+			(sha512_block_fn *)sha512_block_data_order);</div><div class='add'>+</div><div class='add'>+	return sha512_base_finish(desc, out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sha512_final(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	return sha512_finup(desc, NULL, 0, out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct shash_alg algs[] = { {</div><div class='add'>+	.digestsize		= SHA512_DIGEST_SIZE,</div><div class='add'>+	.init			= sha512_base_init,</div><div class='add'>+	.update			= sha512_update,</div><div class='add'>+	.final			= sha512_final,</div><div class='add'>+	.finup			= sha512_finup,</div><div class='add'>+	.descsize		= sizeof(struct sha512_state),</div><div class='add'>+	.base.cra_name		= "sha512",</div><div class='add'>+	.base.cra_driver_name	= "sha512-arm64",</div><div class='add'>+	.base.cra_priority	= 150,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_TYPE_SHASH,</div><div class='add'>+	.base.cra_blocksize	= SHA512_BLOCK_SIZE,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+}, {</div><div class='add'>+	.digestsize		= SHA384_DIGEST_SIZE,</div><div class='add'>+	.init			= sha384_base_init,</div><div class='add'>+	.update			= sha512_update,</div><div class='add'>+	.final			= sha512_final,</div><div class='add'>+	.finup			= sha512_finup,</div><div class='add'>+	.descsize		= sizeof(struct sha512_state),</div><div class='add'>+	.base.cra_name		= "sha384",</div><div class='add'>+	.base.cra_driver_name	= "sha384-arm64",</div><div class='add'>+	.base.cra_priority	= 150,</div><div class='add'>+	.base.cra_flags		= CRYPTO_ALG_TYPE_SHASH,</div><div class='add'>+	.base.cra_blocksize	= SHA384_BLOCK_SIZE,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+} };</div><div class='add'>+</div><div class='add'>+static int __init sha512_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	return crypto_register_shashes(algs, ARRAY_SIZE(algs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit sha512_mod_fini(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_shashes(algs, ARRAY_SIZE(algs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(sha512_mod_init);</div><div class='add'>+module_exit(sha512_mod_fini);</div><div class='head'>diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild<br/>index 44e1d7f10add..a12f1afc95a3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,7 +1,5 @@</div><div class='ctx'> generic-y += bugs.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='del'>-generic-y += current.h</div><div class='ctx'> generic-y += delay.h</div><div class='ctx'> generic-y += div64.h</div><div class='ctx'> generic-y += dma.h</div><div class='hunk'>@@ -24,7 +22,6 @@ generic-y += mm-arch-hooks.h</div><div class='ctx'> generic-y += mman.h</div><div class='ctx'> generic-y += msgbuf.h</div><div class='ctx'> generic-y += msi.h</div><div class='del'>-generic-y += mutex.h</div><div class='ctx'> generic-y += poll.h</div><div class='ctx'> generic-y += preempt.h</div><div class='ctx'> generic-y += resource.h</div><div class='head'>diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h<br/>index e517088d635f..c1976c0adca7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/acpi.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/acpi.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/acpi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/acpi.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/smp_plat.h&gt;</div><div class='add'>+#include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Macros for consistency checks of the GICC subtable of MADT */</div><div class='ctx'> #define ACPI_MADT_GICC_LENGTH	\</div><div class='hunk'>@@ -28,7 +29,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Basic configuration for ACPI */</div><div class='ctx'> #ifdef	CONFIG_ACPI</div><div class='del'>-/* ACPI table mapping after acpi_gbl_permanent_mmap is set */</div><div class='add'>+/* ACPI table mapping after acpi_permanent_mmap is set */</div><div class='ctx'> static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,</div><div class='ctx'> 					    acpi_size size)</div><div class='ctx'> {</div><div class='hunk'>@@ -114,8 +115,28 @@ static inline const char *acpi_get_enable_method(int cpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_ACPI_APEI</div><div class='add'>+/*</div><div class='add'>+ * acpi_disable_cmcff is used in drivers/acpi/apei/hest.c for disabling</div><div class='add'>+ * IA-32 Architecture Corrected Machine Check (CMC) Firmware-First mode</div><div class='add'>+ * with a kernel command line parameter "acpi=nocmcoff". But we don't</div><div class='add'>+ * have this IA-32 specific feature on ARM64, this definition is only</div><div class='add'>+ * for compatibility.</div><div class='add'>+ */</div><div class='add'>+#define acpi_disable_cmcff 1</div><div class='ctx'> pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Despite its name, this function must still broadcast the TLB</div><div class='add'>+ * invalidation in order to ensure other CPUs don't end up with junk</div><div class='add'>+ * entries as a result of speculation. Unusually, its also called in</div><div class='add'>+ * IRQ context (ghes_iounmap_irq) so if we ever need to use IPIs for</div><div class='add'>+ * TLB broadcasting, then we're in trouble here.</div><div class='add'>+ */</div><div class='add'>+static inline void arch_apei_flush_tlb_one(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	flush_tlb_kernel_range(addr, addr + PAGE_SIZE);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_ACPI_APEI */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI_NUMA</div><div class='ctx'> int arm64_acpi_numa_init(void);</div><div class='head'>diff --git a/arch/arm64/include/asm/arch_gicv3.h b/arch/arm64/include/asm/arch_gicv3.h<br/>index f8ae6d6e4767..f37e3a21f6e7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/arch_gicv3.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/arch_gicv3.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/arch_gicv3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/arch_gicv3.h</a></div><div class='hunk'>@@ -79,19 +79,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;asm/barrier.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='del'>-#define read_gicreg(r)							\</div><div class='del'>-	({								\</div><div class='del'>-		u64 reg;						\</div><div class='del'>-		asm volatile("mrs_s %0, " __stringify(r) : "=r" (reg));	\</div><div class='del'>-		reg;							\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#define write_gicreg(v,r)						\</div><div class='del'>-	do {								\</div><div class='del'>-		u64 __val = (v);					\</div><div class='del'>-		asm volatile("msr_s " __stringify(r) ", %0" : : "r" (__val));\</div><div class='del'>-	} while (0)</div><div class='add'>+#define read_gicreg			read_sysreg_s</div><div class='add'>+#define write_gicreg			write_sysreg_s</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Low-level accessors</div><div class='hunk'>@@ -102,13 +93,13 @@</div><div class='ctx'> </div><div class='ctx'> static inline void gic_write_eoir(u32 irq)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("msr_s " __stringify(ICC_EOIR1_EL1) ", %0" : : "r" ((u64)irq));</div><div class='add'>+	write_sysreg_s(irq, ICC_EOIR1_EL1);</div><div class='ctx'> 	isb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void gic_write_dir(u32 irq)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("msr_s " __stringify(ICC_DIR_EL1) ", %0" : : "r" ((u64)irq));</div><div class='add'>+	write_sysreg_s(irq, ICC_DIR_EL1);</div><div class='ctx'> 	isb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +107,7 @@ static inline u64 gic_read_iar_common(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 irqstat;</div><div class='ctx'> </div><div class='del'>-	asm volatile("mrs_s %0, " __stringify(ICC_IAR1_EL1) : "=r" (irqstat));</div><div class='add'>+	irqstat = read_sysreg_s(ICC_IAR1_EL1);</div><div class='ctx'> 	dsb(sy);</div><div class='ctx'> 	return irqstat;</div><div class='ctx'> }</div><div class='hunk'>@@ -132,12 +123,9 @@ static inline u64 gic_read_iar_cavium_thunderx(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 irqstat;</div><div class='ctx'> </div><div class='del'>-	asm volatile(</div><div class='del'>-		"nop;nop;nop;nop\n\t"</div><div class='del'>-		"nop;nop;nop;nop\n\t"</div><div class='del'>-		"mrs_s %0, " __stringify(ICC_IAR1_EL1) "\n\t"</div><div class='del'>-		"nop;nop;nop;nop"</div><div class='del'>-		: "=r" (irqstat));</div><div class='add'>+	nops(8);</div><div class='add'>+	irqstat = read_sysreg_s(ICC_IAR1_EL1);</div><div class='add'>+	nops(4);</div><div class='ctx'> 	mb();</div><div class='ctx'> </div><div class='ctx'> 	return irqstat;</div><div class='hunk'>@@ -145,37 +133,34 @@ static inline u64 gic_read_iar_cavium_thunderx(void)</div><div class='ctx'> </div><div class='ctx'> static inline void gic_write_pmr(u32 val)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("msr_s " __stringify(ICC_PMR_EL1) ", %0" : : "r" ((u64)val));</div><div class='add'>+	write_sysreg_s(val, ICC_PMR_EL1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void gic_write_ctlr(u32 val)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("msr_s " __stringify(ICC_CTLR_EL1) ", %0" : : "r" ((u64)val));</div><div class='add'>+	write_sysreg_s(val, ICC_CTLR_EL1);</div><div class='ctx'> 	isb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void gic_write_grpen1(u32 val)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("msr_s " __stringify(ICC_GRPEN1_EL1) ", %0" : : "r" ((u64)val));</div><div class='add'>+	write_sysreg_s(val, ICC_GRPEN1_EL1);</div><div class='ctx'> 	isb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void gic_write_sgi1r(u64 val)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("msr_s " __stringify(ICC_SGI1R_EL1) ", %0" : : "r" (val));</div><div class='add'>+	write_sysreg_s(val, ICC_SGI1R_EL1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32 gic_read_sre(void)</div><div class='ctx'> {</div><div class='del'>-	u64 val;</div><div class='del'>-</div><div class='del'>-	asm volatile("mrs_s %0, " __stringify(ICC_SRE_EL1) : "=r" (val));</div><div class='del'>-	return val;</div><div class='add'>+	return read_sysreg_s(ICC_SRE_EL1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void gic_write_sre(u32 val)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("msr_s " __stringify(ICC_SRE_EL1) ", %0" : : "r" ((u64)val));</div><div class='add'>+	write_sysreg_s(val, ICC_SRE_EL1);</div><div class='ctx'> 	isb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -187,5 +172,21 @@ static inline void gic_write_bpr1(u32 val)</div><div class='ctx'> #define gic_read_typer(c)		readq_relaxed(c)</div><div class='ctx'> #define gic_write_irouter(v, c)		writeq_relaxed(v, c)</div><div class='ctx'> </div><div class='add'>+#define gic_flush_dcache_to_poc(a,l)	__flush_dcache_area((a), (l))</div><div class='add'>+</div><div class='add'>+#define gits_read_baser(c)		readq_relaxed(c)</div><div class='add'>+#define gits_write_baser(v, c)		writeq_relaxed(v, c)</div><div class='add'>+</div><div class='add'>+#define gits_read_cbaser(c)		readq_relaxed(c)</div><div class='add'>+#define gits_write_cbaser(v, c)		writeq_relaxed(v, c)</div><div class='add'>+</div><div class='add'>+#define gits_write_cwriter(v, c)	writeq_relaxed(v, c)</div><div class='add'>+</div><div class='add'>+#define gicr_read_propbaser(c)		readq_relaxed(c)</div><div class='add'>+#define gicr_write_propbaser(v, c)	writeq_relaxed(v, c)</div><div class='add'>+</div><div class='add'>+#define gicr_write_pendbaser(v, c)	writeq_relaxed(v, c)</div><div class='add'>+#define gicr_read_pendbaser(c)		readq_relaxed(c)</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* __ASM_ARCH_GICV3_H */</div><div class='head'>diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h<br/>index eaa5bbe3fa87..b4b34004a21e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/arch_timer.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/arch_timer.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/arch_timer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/arch_timer.h</a></div><div class='hunk'>@@ -29,41 +29,29 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;clocksource/arm_arch_timer.h&gt;</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_FSL_ERRATUM_A008585)</div><div class='add'>+#if IS_ENABLED(CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND)</div><div class='ctx'> extern struct static_key_false arch_timer_read_ool_enabled;</div><div class='del'>-#define needs_fsl_a008585_workaround() \</div><div class='add'>+#define needs_unstable_timer_counter_workaround() \</div><div class='ctx'> 	static_branch_unlikely(&amp;arch_timer_read_ool_enabled)</div><div class='ctx'> #else</div><div class='del'>-#define needs_fsl_a008585_workaround()  false</div><div class='add'>+#define needs_unstable_timer_counter_workaround()  false</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-u32 __fsl_a008585_read_cntp_tval_el0(void);</div><div class='del'>-u32 __fsl_a008585_read_cntv_tval_el0(void);</div><div class='del'>-u64 __fsl_a008585_read_cntvct_el0(void);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The number of retries is an arbitrary value well beyond the highest number</div><div class='del'>- * of iterations the loop has been observed to take.</div><div class='del'>- */</div><div class='del'>-#define __fsl_a008585_read_reg(reg) ({			\</div><div class='del'>-	u64 _old, _new;					\</div><div class='del'>-	int _retries = 200;				\</div><div class='del'>-							\</div><div class='del'>-	do {						\</div><div class='del'>-		_old = read_sysreg(reg);		\</div><div class='del'>-		_new = read_sysreg(reg);		\</div><div class='del'>-		_retries--;				\</div><div class='del'>-	} while (unlikely(_old != _new) &amp;&amp; _retries);	\</div><div class='del'>-							\</div><div class='del'>-	WARN_ON_ONCE(!_retries);			\</div><div class='del'>-	_new;						\</div><div class='del'>-})</div><div class='add'>+struct arch_timer_erratum_workaround {</div><div class='add'>+	const char *id;		/* Indicate the Erratum ID */</div><div class='add'>+	u32 (*read_cntp_tval_el0)(void);</div><div class='add'>+	u32 (*read_cntv_tval_el0)(void);</div><div class='add'>+	u64 (*read_cntvct_el0)(void);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct arch_timer_erratum_workaround *timer_unstable_counter_workaround;</div><div class='ctx'> </div><div class='ctx'> #define arch_timer_reg_read_stable(reg) 		\</div><div class='ctx'> ({							\</div><div class='ctx'> 	u64 _val;					\</div><div class='del'>-	if (needs_fsl_a008585_workaround())		\</div><div class='del'>-		_val = __fsl_a008585_read_##reg();	\</div><div class='add'>+	if (needs_unstable_timer_counter_workaround())		\</div><div class='add'>+		_val = timer_unstable_counter_workaround-&gt;read_##reg();\</div><div class='ctx'> 	else						\</div><div class='ctx'> 		_val = read_sysreg(reg);		\</div><div class='ctx'> 	_val;						\</div><div class='head'>diff --git a/arch/arm64/include/asm/asm-uaccess.h b/arch/arm64/include/asm/asm-uaccess.h<br/>new file mode 100644<br/>index 000000000000..df411f3e083c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/asm-uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/asm-uaccess.h</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+#ifndef __ASM_ASM_UACCESS_H</div><div class='add'>+#define __ASM_ASM_UACCESS_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/alternative.h&gt;</div><div class='add'>+#include &lt;asm/kernel-pgtable.h&gt;</div><div class='add'>+#include &lt;asm/sysreg.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * User access enabling/disabling macros.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_ARM64_SW_TTBR0_PAN</div><div class='add'>+	.macro	__uaccess_ttbr0_disable, tmp1</div><div class='add'>+	mrs	\tmp1, ttbr1_el1		// swapper_pg_dir</div><div class='add'>+	add	\tmp1, \tmp1, #SWAPPER_DIR_SIZE	// reserved_ttbr0 at the end of swapper_pg_dir</div><div class='add'>+	msr	ttbr0_el1, \tmp1		// set reserved TTBR0_EL1</div><div class='add'>+	isb</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	__uaccess_ttbr0_enable, tmp1</div><div class='add'>+	get_thread_info \tmp1</div><div class='add'>+	ldr	\tmp1, [\tmp1, #TSK_TI_TTBR0]	// load saved TTBR0_EL1</div><div class='add'>+	msr	ttbr0_el1, \tmp1		// set the non-PAN TTBR0_EL1</div><div class='add'>+	isb</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	uaccess_ttbr0_disable, tmp1</div><div class='add'>+alternative_if_not ARM64_HAS_PAN</div><div class='add'>+	__uaccess_ttbr0_disable \tmp1</div><div class='add'>+alternative_else_nop_endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	uaccess_ttbr0_enable, tmp1, tmp2</div><div class='add'>+alternative_if_not ARM64_HAS_PAN</div><div class='add'>+	save_and_disable_irq \tmp2		// avoid preemption</div><div class='add'>+	__uaccess_ttbr0_enable \tmp1</div><div class='add'>+	restore_irq \tmp2</div><div class='add'>+alternative_else_nop_endif</div><div class='add'>+	.endm</div><div class='add'>+#else</div><div class='add'>+	.macro	uaccess_ttbr0_disable, tmp1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	uaccess_ttbr0_enable, tmp1, tmp2</div><div class='add'>+	.endm</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These macros are no-ops when UAO is present.</div><div class='add'>+ */</div><div class='add'>+	.macro	uaccess_disable_not_uao, tmp1</div><div class='add'>+	uaccess_ttbr0_disable \tmp1</div><div class='add'>+alternative_if ARM64_ALT_PAN_NOT_UAO</div><div class='add'>+	SET_PSTATE_PAN(1)</div><div class='add'>+alternative_else_nop_endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	uaccess_enable_not_uao, tmp1, tmp2</div><div class='add'>+	uaccess_ttbr0_enable \tmp1, \tmp2</div><div class='add'>+alternative_if ARM64_ALT_PAN_NOT_UAO</div><div class='add'>+	SET_PSTATE_PAN(0)</div><div class='add'>+alternative_else_nop_endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h<br/>index 28bfe6132eb6..1b67c3782d00 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/assembler.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/assembler.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/assembler.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/assembler.h</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='add'>+#include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -41,6 +42,15 @@</div><div class='ctx'> 	msr	daifclr, #2</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='add'>+	.macro	save_and_disable_irq, flags</div><div class='add'>+	mrs	\flags, daif</div><div class='add'>+	msr	daifset, #2</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	restore_irq, flags</div><div class='add'>+	msr	daif, \flags</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Enable and disable debug exceptions.</div><div class='ctx'>  */</div><div class='hunk'>@@ -155,22 +165,25 @@ lr	.req	x30		// link register</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Pseudo-ops for PC-relative adr/ldr/str &lt;reg&gt;, &lt;symbol&gt; where</div><div class='del'>- * &lt;symbol&gt; is within the range +/- 4 GB of the PC.</div><div class='add'>+ * &lt;symbol&gt; is within the range +/- 4 GB of the PC when running</div><div class='add'>+ * in core kernel context. In module context, a movz/movk sequence</div><div class='add'>+ * is used, since modules may be loaded far away from the kernel</div><div class='add'>+ * when KASLR is in effect.</div><div class='ctx'>  */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * @dst: destination register (64 bit wide)</div><div class='ctx'> 	 * @sym: name of the symbol</div><div class='del'>-	 * @tmp: optional scratch register to be used if &lt;dst&gt; == sp, which</div><div class='del'>-	 *       is not allowed in an adrp instruction</div><div class='ctx'> 	 */</div><div class='del'>-	.macro	adr_l, dst, sym, tmp=</div><div class='del'>-	.ifb	\tmp</div><div class='add'>+	.macro	adr_l, dst, sym</div><div class='add'>+#ifndef MODULE</div><div class='ctx'> 	adrp	\dst, \sym</div><div class='ctx'> 	add	\dst, \dst, :lo12:\sym</div><div class='del'>-	.else</div><div class='del'>-	adrp	\tmp, \sym</div><div class='del'>-	add	\dst, \tmp, :lo12:\sym</div><div class='del'>-	.endif</div><div class='add'>+#else</div><div class='add'>+	movz	\dst, #:abs_g3:\sym</div><div class='add'>+	movk	\dst, #:abs_g2_nc:\sym</div><div class='add'>+	movk	\dst, #:abs_g1_nc:\sym</div><div class='add'>+	movk	\dst, #:abs_g0_nc:\sym</div><div class='add'>+#endif</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -181,6 +194,7 @@ lr	.req	x30		// link register</div><div class='ctx'> 	 *       the address</div><div class='ctx'> 	 */</div><div class='ctx'> 	.macro	ldr_l, dst, sym, tmp=</div><div class='add'>+#ifndef MODULE</div><div class='ctx'> 	.ifb	\tmp</div><div class='ctx'> 	adrp	\dst, \sym</div><div class='ctx'> 	ldr	\dst, [\dst, :lo12:\sym]</div><div class='hunk'>@@ -188,6 +202,15 @@ lr	.req	x30		// link register</div><div class='ctx'> 	adrp	\tmp, \sym</div><div class='ctx'> 	ldr	\dst, [\tmp, :lo12:\sym]</div><div class='ctx'> 	.endif</div><div class='add'>+#else</div><div class='add'>+	.ifb	\tmp</div><div class='add'>+	adr_l	\dst, \sym</div><div class='add'>+	ldr	\dst, [\dst]</div><div class='add'>+	.else</div><div class='add'>+	adr_l	\tmp, \sym</div><div class='add'>+	ldr	\dst, [\tmp]</div><div class='add'>+	.endif</div><div class='add'>+#endif</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -197,19 +220,35 @@ lr	.req	x30		// link register</div><div class='ctx'> 	 *       while &lt;src&gt; needs to be preserved.</div><div class='ctx'> 	 */</div><div class='ctx'> 	.macro	str_l, src, sym, tmp</div><div class='add'>+#ifndef MODULE</div><div class='ctx'> 	adrp	\tmp, \sym</div><div class='ctx'> 	str	\src, [\tmp, :lo12:\sym]</div><div class='add'>+#else</div><div class='add'>+	adr_l	\tmp, \sym</div><div class='add'>+	str	\src, [\tmp]</div><div class='add'>+#endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * @dst: Result of per_cpu(sym, smp_processor_id())</div><div class='add'>+	 * @sym: The name of the per-cpu variable</div><div class='add'>+	 * @tmp: scratch register</div><div class='add'>+	 */</div><div class='add'>+	.macro adr_this_cpu, dst, sym, tmp</div><div class='add'>+	adr_l	\dst, \sym</div><div class='add'>+	mrs	\tmp, tpidr_el1</div><div class='add'>+	add	\dst, \dst, \tmp</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * @dst: Result of READ_ONCE(per_cpu(sym, smp_processor_id()))</div><div class='ctx'> 	 * @sym: The name of the per-cpu variable</div><div class='del'>-	 * @reg: Result of per_cpu(sym, smp_processor_id())</div><div class='ctx'> 	 * @tmp: scratch register</div><div class='ctx'> 	 */</div><div class='del'>-	.macro this_cpu_ptr, sym, reg, tmp</div><div class='del'>-	adr_l	\reg, \sym</div><div class='add'>+	.macro ldr_this_cpu dst, sym, tmp</div><div class='add'>+	adr_l	\dst, \sym</div><div class='ctx'> 	mrs	\tmp, tpidr_el1</div><div class='del'>-	add	\reg, \reg, \tmp</div><div class='add'>+	ldr	\dst, [\dst, \tmp]</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -395,4 +434,46 @@ alternative_endif</div><div class='ctx'> 	movk	\reg, :abs_g0_nc:\val</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Return the current thread_info.</div><div class='add'>+ */</div><div class='add'>+	.macro	get_thread_info, rd</div><div class='add'>+	mrs	\rd, sp_el0</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Errata workaround prior to TTBR0_EL1 update</div><div class='add'>+ *</div><div class='add'>+ * 	val:	TTBR value with new BADDR, preserved</div><div class='add'>+ * 	tmp0:	temporary register, clobbered</div><div class='add'>+ * 	tmp1:	other temporary register, clobbered</div><div class='add'>+ */</div><div class='add'>+	.macro	pre_ttbr0_update_workaround, val, tmp0, tmp1</div><div class='add'>+#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003</div><div class='add'>+alternative_if ARM64_WORKAROUND_QCOM_FALKOR_E1003</div><div class='add'>+	mrs	\tmp0, ttbr0_el1</div><div class='add'>+	mov	\tmp1, #FALKOR_RESERVED_ASID</div><div class='add'>+	bfi	\tmp0, \tmp1, #48, #16		// reserved ASID + old BADDR</div><div class='add'>+	msr	ttbr0_el1, \tmp0</div><div class='add'>+	isb</div><div class='add'>+	bfi	\tmp0, \val, #0, #48		// reserved ASID + new BADDR</div><div class='add'>+	msr	ttbr0_el1, \tmp0</div><div class='add'>+	isb</div><div class='add'>+alternative_else_nop_endif</div><div class='add'>+#endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Errata workaround post TTBR0_EL1 update.</div><div class='add'>+ */</div><div class='add'>+	.macro	post_ttbr0_update_workaround</div><div class='add'>+#ifdef CONFIG_CAVIUM_ERRATUM_27456</div><div class='add'>+alternative_if ARM64_WORKAROUND_CAVIUM_27456</div><div class='add'>+	ic	iallu</div><div class='add'>+	dsb	nsh</div><div class='add'>+	isb</div><div class='add'>+alternative_else_nop_endif</div><div class='add'>+#endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='ctx'> #endif	/* __ASM_ASSEMBLER_H */</div><div class='head'>diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h<br/>index 2e5fb976a572..5a2a6ee65f65 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/cacheflush.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/cacheflush.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/cacheflush.h</a></div><div class='hunk'>@@ -65,12 +65,12 @@</div><div class='ctx'>  *		- kaddr  - page address</div><div class='ctx'>  *		- size   - region size</div><div class='ctx'>  */</div><div class='del'>-extern void flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end);</div><div class='ctx'> extern void flush_icache_range(unsigned long start, unsigned long end);</div><div class='ctx'> extern void __flush_dcache_area(void *addr, size_t len);</div><div class='ctx'> extern void __clean_dcache_area_poc(void *addr, size_t len);</div><div class='ctx'> extern void __clean_dcache_area_pou(void *addr, size_t len);</div><div class='ctx'> extern long __flush_cache_user_range(unsigned long start, unsigned long end);</div><div class='add'>+extern void sync_icache_aliases(void *kaddr, unsigned long len);</div><div class='ctx'> </div><div class='ctx'> static inline void flush_cache_mm(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='hunk'>@@ -81,6 +81,11 @@ static inline void flush_cache_page(struct vm_area_struct *vma,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void flush_cache_range(struct vm_area_struct *vma,</div><div class='add'>+				     unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Cache maintenance functions used by the DMA API. No to be used directly.</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h<br/>index eb8432bb82b8..e39d487bf724 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/compat.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/compat.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/compat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/compat.h</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define COMPAT_USER_HZ		100</div><div class='ctx'> #ifdef __AARCH64EB__</div><div class='head'>diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h<br/>index 87b446535185..fb78a5d3b60b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/cpucaps.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/cpucaps.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/cpucaps.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/cpucaps.h</a></div><div class='hunk'>@@ -34,7 +34,10 @@</div><div class='ctx'> #define ARM64_HAS_32BIT_EL0			13</div><div class='ctx'> #define ARM64_HYP_OFFSET_LOW			14</div><div class='ctx'> #define ARM64_MISMATCHED_CACHE_LINE_SIZE	15</div><div class='add'>+#define ARM64_HAS_NO_FPSIMD			16</div><div class='add'>+#define ARM64_WORKAROUND_REPEAT_TLBI		17</div><div class='add'>+#define ARM64_WORKAROUND_QCOM_FALKOR_E1003	18</div><div class='ctx'> </div><div class='del'>-#define ARM64_NCAPS				16</div><div class='add'>+#define ARM64_NCAPS				19</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_CPUCAPS_H */</div><div class='head'>diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h<br/>index 0bc0b1de90c4..05310ad8c5ab 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/cpufeature.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/cpufeature.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/cpufeature.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/cpufeature.h</a></div><div class='hunk'>@@ -9,8 +9,6 @@</div><div class='ctx'> #ifndef __ASM_CPUFEATURE_H</div><div class='ctx'> #define __ASM_CPUFEATURE_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/jump_label.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/cpucaps.h&gt;</div><div class='ctx'> #include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;asm/sysreg.h&gt;</div><div class='hunk'>@@ -27,9 +25,24 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/jump_label.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='del'>-/* CPU feature register tracking */</div><div class='add'>+/*</div><div class='add'>+ * CPU feature register tracking</div><div class='add'>+ *</div><div class='add'>+ * The safe value of a CPUID feature field is dependent on the implications</div><div class='add'>+ * of the values assigned to it by the architecture. Based on the relationship</div><div class='add'>+ * between the values, the features are classified into 3 types - LOWER_SAFE,</div><div class='add'>+ * HIGHER_SAFE and EXACT.</div><div class='add'>+ *</div><div class='add'>+ * The lowest value of all the CPUs is chosen for LOWER_SAFE and highest</div><div class='add'>+ * for HIGHER_SAFE. It is expected that all CPUs have the same value for</div><div class='add'>+ * a field when EXACT is specified, failing which, the safe value specified</div><div class='add'>+ * in the table is chosen.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> enum ftr_type {</div><div class='ctx'> 	FTR_EXACT,	/* Use a predefined safe value */</div><div class='ctx'> 	FTR_LOWER_SAFE,	/* Smaller value is safe */</div><div class='hunk'>@@ -42,8 +55,12 @@ enum ftr_type {</div><div class='ctx'> #define FTR_SIGNED	true	/* Value should be treated as signed */</div><div class='ctx'> #define FTR_UNSIGNED	false	/* Value should be treated as unsigned */</div><div class='ctx'> </div><div class='add'>+#define FTR_VISIBLE	true	/* Feature visible to the user space */</div><div class='add'>+#define FTR_HIDDEN	false	/* Feature is hidden from the user */</div><div class='add'>+</div><div class='ctx'> struct arm64_ftr_bits {</div><div class='ctx'> 	bool		sign;	/* Value is signed ? */</div><div class='add'>+	bool		visible;</div><div class='ctx'> 	bool		strict;	/* CPU Sanity check: strict matching required ? */</div><div class='ctx'> 	enum ftr_type	type;</div><div class='ctx'> 	u8		shift;</div><div class='hunk'>@@ -59,7 +76,9 @@ struct arm64_ftr_bits {</div><div class='ctx'> struct arm64_ftr_reg {</div><div class='ctx'> 	const char			*name;</div><div class='ctx'> 	u64				strict_mask;</div><div class='add'>+	u64				user_mask;</div><div class='ctx'> 	u64				sys_val;</div><div class='add'>+	u64				user_val;</div><div class='ctx'> 	const struct arm64_ftr_bits	*ftr_bits;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -104,14 +123,19 @@ static inline bool cpu_have_feature(unsigned int num)</div><div class='ctx'> 	return elf_hwcap &amp; (1UL &lt;&lt; num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* System capability check for constant caps */</div><div class='add'>+static inline bool cpus_have_const_cap(int num)</div><div class='add'>+{</div><div class='add'>+	if (num &gt;= ARM64_NCAPS)</div><div class='add'>+		return false;</div><div class='add'>+	return static_branch_unlikely(&amp;cpu_hwcap_keys[num]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool cpus_have_cap(unsigned int num)</div><div class='ctx'> {</div><div class='ctx'> 	if (num &gt;= ARM64_NCAPS)</div><div class='ctx'> 		return false;</div><div class='del'>-	if (__builtin_constant_p(num))</div><div class='del'>-		return static_branch_unlikely(&amp;cpu_hwcap_keys[num]);</div><div class='del'>-	else</div><div class='del'>-		return test_bit(num, cpu_hwcaps);</div><div class='add'>+	return test_bit(num, cpu_hwcaps);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void cpus_set_cap(unsigned int num)</div><div class='hunk'>@@ -154,17 +178,28 @@ static inline u64 arm64_ftr_mask(const struct arm64_ftr_bits *ftrp)</div><div class='ctx'> 	return (u64)GENMASK(ftrp-&gt;shift + ftrp-&gt;width - 1, ftrp-&gt;shift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u64 arm64_ftr_reg_user_value(const struct arm64_ftr_reg *reg)</div><div class='add'>+{</div><div class='add'>+	return (reg-&gt;user_val | (reg-&gt;sys_val &amp; reg-&gt;user_mask));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int __attribute_const__</div><div class='del'>-cpuid_feature_extract_field(u64 features, int field, bool sign)</div><div class='add'>+cpuid_feature_extract_field_width(u64 features, int field, int width, bool sign)</div><div class='ctx'> {</div><div class='ctx'> 	return (sign) ?</div><div class='del'>-		cpuid_feature_extract_signed_field(features, field) :</div><div class='del'>-		cpuid_feature_extract_unsigned_field(features, field);</div><div class='add'>+		cpuid_feature_extract_signed_field_width(features, field, width) :</div><div class='add'>+		cpuid_feature_extract_unsigned_field_width(features, field, width);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __attribute_const__</div><div class='add'>+cpuid_feature_extract_field(u64 features, int field, bool sign)</div><div class='add'>+{</div><div class='add'>+	return cpuid_feature_extract_field_width(features, field, 4, sign);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline s64 arm64_ftr_value(const struct arm64_ftr_bits *ftrp, u64 val)</div><div class='ctx'> {</div><div class='del'>-	return (s64)cpuid_feature_extract_field(val, ftrp-&gt;shift, ftrp-&gt;sign);</div><div class='add'>+	return (s64)cpuid_feature_extract_field_width(val, ftrp-&gt;shift, ftrp-&gt;width, ftrp-&gt;sign);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool id_aa64mmfr0_mixed_endian_el0(u64 mmfr0)</div><div class='hunk'>@@ -200,7 +235,7 @@ static inline bool cpu_supports_mixed_endian_el0(void)</div><div class='ctx'> </div><div class='ctx'> static inline bool system_supports_32bit_el0(void)</div><div class='ctx'> {</div><div class='del'>-	return cpus_have_cap(ARM64_HAS_32BIT_EL0);</div><div class='add'>+	return cpus_have_const_cap(ARM64_HAS_32BIT_EL0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool system_supports_mixed_endian_el0(void)</div><div class='hunk'>@@ -208,6 +243,17 @@ static inline bool system_supports_mixed_endian_el0(void)</div><div class='ctx'> 	return id_aa64mmfr0_mixed_endian_el0(read_system_reg(SYS_ID_AA64MMFR0_EL1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool system_supports_fpsimd(void)</div><div class='add'>+{</div><div class='add'>+	return !cpus_have_const_cap(ARM64_HAS_NO_FPSIMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool system_uses_ttbr0_pan(void)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_ARM64_SW_TTBR0_PAN) &amp;&amp;</div><div class='add'>+		!cpus_have_cap(ARM64_HAS_PAN);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h<br/>index 26a68ddb11c1..fc502713ab37 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/cputype.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/cputype.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/cputype.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/cputype.h</a></div><div class='hunk'>@@ -56,6 +56,9 @@</div><div class='ctx'> 	(0xf			&lt;&lt; MIDR_ARCHITECTURE_SHIFT) | \</div><div class='ctx'> 	((partnum)		&lt;&lt; MIDR_PARTNUM_SHIFT))</div><div class='ctx'> </div><div class='add'>+#define MIDR_CPU_VAR_REV(var, rev) \</div><div class='add'>+	(((var)	&lt;&lt; MIDR_VARIANT_SHIFT) | (rev))</div><div class='add'>+</div><div class='ctx'> #define MIDR_CPU_MODEL_MASK (MIDR_IMPLEMENTOR_MASK | MIDR_PARTNUM_MASK | \</div><div class='ctx'> 			     MIDR_ARCHITECTURE_MASK)</div><div class='ctx'> </div><div class='hunk'>@@ -71,6 +74,7 @@</div><div class='ctx'> #define ARM_CPU_IMP_APM			0x50</div><div class='ctx'> #define ARM_CPU_IMP_CAVIUM		0x43</div><div class='ctx'> #define ARM_CPU_IMP_BRCM		0x42</div><div class='add'>+#define ARM_CPU_IMP_QCOM		0x51</div><div class='ctx'> </div><div class='ctx'> #define ARM_CPU_PART_AEM_V8		0xD0F</div><div class='ctx'> #define ARM_CPU_PART_FOUNDATION		0xD00</div><div class='hunk'>@@ -84,10 +88,13 @@</div><div class='ctx'> </div><div class='ctx'> #define BRCM_CPU_PART_VULCAN		0x516</div><div class='ctx'> </div><div class='add'>+#define QCOM_CPU_PART_FALKOR_V1		0x800</div><div class='add'>+</div><div class='ctx'> #define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)</div><div class='ctx'> #define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)</div><div class='ctx'> #define MIDR_THUNDERX	MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)</div><div class='ctx'> #define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX)</div><div class='add'>+#define MIDR_QCOM_FALKOR_V1 MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_FALKOR_V1)</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/current.h b/arch/arm64/include/asm/current.h<br/>new file mode 100644<br/>index 000000000000..86c404171305<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/current.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/current.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+#ifndef __ASM_CURRENT_H</div><div class='add'>+#define __ASM_CURRENT_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/sysreg.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+struct task_struct;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We don't use read_sysreg() as we want the compiler to cache the value where</div><div class='add'>+ * possible.</div><div class='add'>+ */</div><div class='add'>+static __always_inline struct task_struct *get_current(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long sp_el0;</div><div class='add'>+</div><div class='add'>+	asm ("mrs %0, sp_el0" : "=r" (sp_el0));</div><div class='add'>+</div><div class='add'>+	return (struct task_struct *)sp_el0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define current get_current()</div><div class='add'>+</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_CURRENT_H */</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h<br/>index b71420a12f26..a44cf5225429 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/debug-monitors.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/debug-monitors.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/debug-monitors.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/debug-monitors.h</a></div><div class='hunk'>@@ -68,6 +68,9 @@</div><div class='ctx'> #define BRK64_ESR_MASK		0xFFFF</div><div class='ctx'> #define BRK64_ESR_KPROBES	0x0004</div><div class='ctx'> #define BRK64_OPCODE_KPROBES	(AARCH64_BREAK_MON | (BRK64_ESR_KPROBES &lt;&lt; 5))</div><div class='add'>+/* uprobes BRK opcodes with ESR encoding  */</div><div class='add'>+#define BRK64_ESR_UPROBES	0x0005</div><div class='add'>+#define BRK64_OPCODE_UPROBES	(AARCH64_BREAK_MON | (BRK64_ESR_UPROBES &lt;&lt; 5))</div><div class='ctx'> </div><div class='ctx'> /* AArch32 */</div><div class='ctx'> #define DBG_ESR_EVT_BKPT	0x4</div><div class='head'>diff --git a/arch/arm64/include/asm/device.h b/arch/arm64/include/asm/device.h<br/>index 243ef256b8c9..73d5bab015eb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/device.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/device.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/device.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #define __ASM_DEVICE_H</div><div class='ctx'> </div><div class='ctx'> struct dev_archdata {</div><div class='del'>-	struct dma_map_ops *dma_ops;</div><div class='ctx'> #ifdef CONFIG_IOMMU_API</div><div class='ctx'> 	void *iommu;			/* private IOMMU data */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h<br/>index ccea82c2b089..505756cdc67a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -25,12 +25,12 @@</div><div class='ctx'> #include &lt;asm/xen/hypervisor.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DMA_ERROR_CODE	(~(dma_addr_t)0)</div><div class='del'>-extern struct dma_map_ops dummy_dma_ops;</div><div class='add'>+extern const struct dma_map_ops dummy_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *__generic_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *__generic_dma_ops(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	if (dev &amp;&amp; dev-&gt;archdata.dma_ops)</div><div class='del'>-		return dev-&gt;archdata.dma_ops;</div><div class='add'>+	if (dev &amp;&amp; dev-&gt;dma_ops)</div><div class='add'>+		return dev-&gt;dma_ops;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We expect no ISA devices, and all other DMA masters are expected to</div><div class='hunk'>@@ -39,12 +39,12 @@ static inline struct dma_map_ops *__generic_dma_ops(struct device *dev)</div><div class='ctx'> 	return &amp;dummy_dma_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	if (xen_initial_domain())</div><div class='ctx'> 		return xen_dma_ops;</div><div class='ctx'> 	else</div><div class='del'>-		return __generic_dma_ops(dev);</div><div class='add'>+		return __generic_dma_ops(NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,</div><div class='head'>diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h<br/>index a9e54aad15ef..e7445281e534 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/efi.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/efi.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/efi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/efi.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> #ifndef _ASM_EFI_H</div><div class='ctx'> #define _ASM_EFI_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/neon.h&gt;</div><div class='hunk'>@@ -49,8 +50,12 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);</div><div class='ctx'> </div><div class='ctx'> #define efi_call_early(f, ...)		sys_table_arg-&gt;boottime-&gt;f(__VA_ARGS__)</div><div class='ctx'> #define __efi_call_early(f, ...)	f(__VA_ARGS__)</div><div class='add'>+#define efi_call_runtime(f, ...)	sys_table_arg-&gt;runtime-&gt;f(__VA_ARGS__)</div><div class='ctx'> #define efi_is_64bit()			(true)</div><div class='ctx'> </div><div class='add'>+#define efi_call_proto(protocol, f, instance, ...)			\</div><div class='add'>+	((protocol##_t *)instance)-&gt;f(instance, ##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> #define alloc_screen_info(x...)		&amp;screen_info</div><div class='ctx'> #define free_screen_info(x...)</div><div class='ctx'> </div><div class='hunk'>@@ -75,7 +80,30 @@ static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt)</div><div class='ctx'> </div><div class='ctx'> static inline void efi_set_pgd(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	switch_mm(NULL, mm, NULL);</div><div class='add'>+	__switch_mm(mm);</div><div class='add'>+</div><div class='add'>+	if (system_uses_ttbr0_pan()) {</div><div class='add'>+		if (mm != current-&gt;active_mm) {</div><div class='add'>+			/*</div><div class='add'>+			 * Update the current thread's saved ttbr0 since it is</div><div class='add'>+			 * restored as part of a return from exception. Set</div><div class='add'>+			 * the hardware TTBR0_EL1 using cpu_switch_mm()</div><div class='add'>+			 * directly to enable potential errata workarounds.</div><div class='add'>+			 */</div><div class='add'>+			update_saved_ttbr0(current, mm);</div><div class='add'>+			cpu_switch_mm(mm-&gt;pgd, mm);</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * Defer the switch to the current thread's TTBR0_EL1</div><div class='add'>+			 * until uaccess_enable(). Restore the current</div><div class='add'>+			 * thread's saved ttbr0 corresponding to its active_mm</div><div class='add'>+			 * (if different from init_mm).</div><div class='add'>+			 */</div><div class='add'>+			cpu_set_reserved_ttbr0();</div><div class='add'>+			if (current-&gt;active_mm != &amp;init_mm)</div><div class='add'>+				update_saved_ttbr0(current, current-&gt;active_mm);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void efi_virtmap_load(void);</div><div class='head'>diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h<br/>index a55384f4a5d7..5d1700425efe 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/elf.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/elf.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/elf.h</a></div><div class='hunk'>@@ -138,7 +138,11 @@ typedef struct user_fpsimd_state elf_fpregset_t;</div><div class='ctx'>  */</div><div class='ctx'> #define ELF_PLAT_INIT(_r, load_addr)	(_r)-&gt;regs[0] = 0</div><div class='ctx'> </div><div class='del'>-#define SET_PERSONALITY(ex)		clear_thread_flag(TIF_32BIT);</div><div class='add'>+#define SET_PERSONALITY(ex)						\</div><div class='add'>+({									\</div><div class='add'>+	clear_bit(TIF_32BIT, &amp;current-&gt;mm-&gt;context.flags);		\</div><div class='add'>+	clear_thread_flag(TIF_32BIT);					\</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> /* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */</div><div class='ctx'> #define ARCH_DLINFO							\</div><div class='hunk'>@@ -183,7 +187,11 @@ typedef compat_elf_greg_t		compat_elf_gregset_t[COMPAT_ELF_NGREG];</div><div class='ctx'> 					 ((x)-&gt;e_flags &amp; EF_ARM_EABI_MASK))</div><div class='ctx'> </div><div class='ctx'> #define compat_start_thread		compat_start_thread</div><div class='del'>-#define COMPAT_SET_PERSONALITY(ex)	set_thread_flag(TIF_32BIT);</div><div class='add'>+#define COMPAT_SET_PERSONALITY(ex)					\</div><div class='add'>+({									\</div><div class='add'>+	set_bit(TIF_32BIT, &amp;current-&gt;mm-&gt;context.flags);		\</div><div class='add'>+	set_thread_flag(TIF_32BIT);					\</div><div class='add'>+ })</div><div class='ctx'> #define COMPAT_ARCH_DLINFO</div><div class='ctx'> extern int aarch32_setup_vectors_page(struct linux_binprm *bprm,</div><div class='ctx'> 				      int uses_interp);</div><div class='head'>diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h<br/>index f2585cdd32c2..85c4a8981d47 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/futex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/futex.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/futex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/futex.h</a></div><div class='hunk'>@@ -21,15 +21,12 @@</div><div class='ctx'> #include &lt;linux/futex.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/alternative.h&gt;</div><div class='del'>-#include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='del'>-#include &lt;asm/sysreg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __futex_atomic_op(insn, ret, oldval, uaddr, tmp, oparg)		\</div><div class='add'>+do {									\</div><div class='add'>+	uaccess_enable();						\</div><div class='ctx'> 	asm volatile(							\</div><div class='del'>-	ALTERNATIVE("nop", SET_PSTATE_PAN(0), ARM64_HAS_PAN,		\</div><div class='del'>-		    CONFIG_ARM64_PAN)					\</div><div class='ctx'> "	prfm	pstl1strm, %2\n"					\</div><div class='ctx'> "1:	ldxr	%w1, %2\n"						\</div><div class='ctx'> 	insn "\n"							\</div><div class='hunk'>@@ -44,11 +41,11 @@</div><div class='ctx'> "	.popsection\n"							\</div><div class='ctx'> 	_ASM_EXTABLE(1b, 4b)						\</div><div class='ctx'> 	_ASM_EXTABLE(2b, 4b)						\</div><div class='del'>-	ALTERNATIVE("nop", SET_PSTATE_PAN(1), ARM64_HAS_PAN,		\</div><div class='del'>-		    CONFIG_ARM64_PAN)					\</div><div class='ctx'> 	: "=&amp;r" (ret), "=&amp;r" (oldval), "+Q" (*uaddr), "=&amp;r" (tmp)	\</div><div class='ctx'> 	: "r" (oparg), "Ir" (-EFAULT)					\</div><div class='del'>-	: "memory")</div><div class='add'>+	: "memory");							\</div><div class='add'>+	uaccess_disable();						\</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)</div><div class='hunk'>@@ -118,8 +115,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,</div><div class='ctx'> 	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='add'>+	uaccess_enable();</div><div class='ctx'> 	asm volatile("// futex_atomic_cmpxchg_inatomic\n"</div><div class='del'>-ALTERNATIVE("nop", SET_PSTATE_PAN(0), ARM64_HAS_PAN, CONFIG_ARM64_PAN)</div><div class='ctx'> "	prfm	pstl1strm, %2\n"</div><div class='ctx'> "1:	ldxr	%w1, %2\n"</div><div class='ctx'> "	sub	%w3, %w1, %w4\n"</div><div class='hunk'>@@ -134,10 +131,10 @@ ALTERNATIVE("nop", SET_PSTATE_PAN(0), ARM64_HAS_PAN, CONFIG_ARM64_PAN)</div><div class='ctx'> "	.popsection\n"</div><div class='ctx'> 	_ASM_EXTABLE(1b, 4b)</div><div class='ctx'> 	_ASM_EXTABLE(2b, 4b)</div><div class='del'>-ALTERNATIVE("nop", SET_PSTATE_PAN(1), ARM64_HAS_PAN, CONFIG_ARM64_PAN)</div><div class='ctx'> 	: "+r" (ret), "=&amp;r" (val), "+Q" (*uaddr), "=&amp;r" (tmp)</div><div class='ctx'> 	: "r" (oldval), "r" (newval), "Ir" (-EFAULT)</div><div class='ctx'> 	: "memory");</div><div class='add'>+	uaccess_disable();</div><div class='ctx'> </div><div class='ctx'> 	*uval = val;</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/arch/arm64/include/asm/hw_breakpoint.h b/arch/arm64/include/asm/hw_breakpoint.h<br/>index 9510ace570e2..b6b167ac082b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/hw_breakpoint.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/hw_breakpoint.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/hw_breakpoint.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/hw_breakpoint.h</a></div><div class='hunk'>@@ -77,7 +77,11 @@ static inline void decode_ctrl_reg(u32 reg,</div><div class='ctx'> /* Lengths */</div><div class='ctx'> #define ARM_BREAKPOINT_LEN_1	0x1</div><div class='ctx'> #define ARM_BREAKPOINT_LEN_2	0x3</div><div class='add'>+#define ARM_BREAKPOINT_LEN_3	0x7</div><div class='ctx'> #define ARM_BREAKPOINT_LEN_4	0xf</div><div class='add'>+#define ARM_BREAKPOINT_LEN_5	0x1f</div><div class='add'>+#define ARM_BREAKPOINT_LEN_6	0x3f</div><div class='add'>+#define ARM_BREAKPOINT_LEN_7	0x7f</div><div class='ctx'> #define ARM_BREAKPOINT_LEN_8	0xff</div><div class='ctx'> </div><div class='ctx'> /* Kernel stepping */</div><div class='hunk'>@@ -119,7 +123,7 @@ struct perf_event;</div><div class='ctx'> struct pmu;</div><div class='ctx'> </div><div class='ctx'> extern int arch_bp_generic_fields(struct arch_hw_breakpoint_ctrl ctrl,</div><div class='del'>-				  int *gen_len, int *gen_type);</div><div class='add'>+				  int *gen_len, int *gen_type, int *offset);</div><div class='ctx'> extern int arch_check_bp_in_kernelspace(struct perf_event *bp);</div><div class='ctx'> extern int arch_validate_hwbkpt_settings(struct perf_event *bp);</div><div class='ctx'> extern int hw_breakpoint_exceptions_notify(struct notifier_block *unused,</div><div class='head'>diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h<br/>index bc853663dd51..aecc07e09a18 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/insn.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/insn.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/insn.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/insn.h</a></div><div class='hunk'>@@ -332,6 +332,8 @@ bool aarch64_insn_is_branch(u32 insn);</div><div class='ctx'> u64 aarch64_insn_decode_immediate(enum aarch64_insn_imm_type type, u32 insn);</div><div class='ctx'> u32 aarch64_insn_encode_immediate(enum aarch64_insn_imm_type type,</div><div class='ctx'> 				  u32 insn, u64 imm);</div><div class='add'>+u32 aarch64_insn_decode_register(enum aarch64_insn_register_type type,</div><div class='add'>+					 u32 insn);</div><div class='ctx'> u32 aarch64_insn_gen_branch_imm(unsigned long pc, unsigned long addr,</div><div class='ctx'> 				enum aarch64_insn_branch_type type);</div><div class='ctx'> u32 aarch64_insn_gen_comp_branch_imm(unsigned long pc, unsigned long addr,</div><div class='head'>diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h<br/>index 0bba427bb4c2..0c00c87bb9dd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/io.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/io.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/io.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/blk_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/barrier.h&gt;</div><div class='head'>diff --git a/arch/arm64/include/asm/kernel-pgtable.h b/arch/arm64/include/asm/kernel-pgtable.h<br/>index 7e51d1b57c0c..7803343e5881 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/kernel-pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/kernel-pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/kernel-pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/kernel-pgtable.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #ifndef __ASM_KERNEL_PGTABLE_H</div><div class='ctx'> #define __ASM_KERNEL_PGTABLE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/sparsemem.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -54,6 +55,12 @@</div><div class='ctx'> #define SWAPPER_DIR_SIZE	(SWAPPER_PGTABLE_LEVELS * PAGE_SIZE)</div><div class='ctx'> #define IDMAP_DIR_SIZE		(IDMAP_PGTABLE_LEVELS * PAGE_SIZE)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM64_SW_TTBR0_PAN</div><div class='add'>+#define RESERVED_TTBR0_SIZE	(PAGE_SIZE)</div><div class='add'>+#else</div><div class='add'>+#define RESERVED_TTBR0_SIZE	(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Initial memory map size */</div><div class='ctx'> #if ARM64_SWAPPER_USES_SECTION_MAPS</div><div class='ctx'> #define SWAPPER_BLOCK_SHIFT	SECTION_SHIFT</div><div class='head'>diff --git a/arch/arm64/include/asm/kprobes.h b/arch/arm64/include/asm/kprobes.h<br/>index 1737aecfcc5e..6deb8d726041 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/kprobes.h</a></div><div class='hunk'>@@ -16,6 +16,9 @@</div><div class='ctx'> #ifndef _ARM_KPROBES_H</div><div class='ctx'> #define _ARM_KPROBES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='hunk'>@@ -57,4 +60,5 @@ int kprobe_single_step_handler(struct pt_regs *regs, unsigned int esr);</div><div class='ctx'> void kretprobe_trampoline(void);</div><div class='ctx'> void __kprobes *trampoline_probe_handler(struct pt_regs *regs);</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='ctx'> #endif /* _ARM_KPROBES_H */</div><div class='head'>diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h<br/>index 2a2752b5b6aa..6e99978e83bd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/kvm_arm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/kvm_arm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/kvm_arm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/kvm_arm.h</a></div><div class='hunk'>@@ -188,6 +188,9 @@</div><div class='ctx'> #define CPTR_EL2_DEFAULT	0x000033ff</div><div class='ctx'> </div><div class='ctx'> /* Hyp Debug Configuration Register bits */</div><div class='add'>+#define MDCR_EL2_TPMS		(1 &lt;&lt; 14)</div><div class='add'>+#define MDCR_EL2_E2PB_MASK	(UL(0x3))</div><div class='add'>+#define MDCR_EL2_E2PB_SHIFT	(UL(12))</div><div class='ctx'> #define MDCR_EL2_TDRA		(1 &lt;&lt; 11)</div><div class='ctx'> #define MDCR_EL2_TDOSA		(1 &lt;&lt; 10)</div><div class='ctx'> #define MDCR_EL2_TDA		(1 &lt;&lt; 9)</div><div class='head'>diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h<br/>index e5050388e062..f21fd3894370 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/kvm_host.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/kvm_host.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/kvm_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/kvm_host.h</a></div><div class='hunk'>@@ -70,9 +70,6 @@ struct kvm_arch {</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt controller */</div><div class='ctx'> 	struct vgic_dist	vgic;</div><div class='del'>-</div><div class='del'>-	/* Timer */</div><div class='del'>-	struct arch_timer_kvm	timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define KVM_NR_MEM_OBJS     40</div><div class='hunk'>@@ -229,7 +226,12 @@ struct kvm_vcpu_arch {</div><div class='ctx'> </div><div class='ctx'> 	/* Pointer to host CPU context */</div><div class='ctx'> 	kvm_cpu_context_t *host_cpu_context;</div><div class='del'>-	struct kvm_guest_debug_arch host_debug_state;</div><div class='add'>+	struct {</div><div class='add'>+		/* {Break,watch}point registers */</div><div class='add'>+		struct kvm_guest_debug_arch regs;</div><div class='add'>+		/* Statistical profiling extension */</div><div class='add'>+		u64 pmscr_el1;</div><div class='add'>+	} host_debug_state;</div><div class='ctx'> </div><div class='ctx'> 	/* VGIC state */</div><div class='ctx'> 	struct vgic_cpu vgic_cpu;</div><div class='head'>diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h<br/>index 6f72fe8b0e3e..ed1246014901 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/kvm_mmu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/kvm_mmu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/kvm_mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/kvm_mmu.h</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'>  * If the page is in the bottom half, we have to use the top half. If</div><div class='ctx'>  * the page is in the top half, we have to use the bottom half:</div><div class='ctx'>  *</div><div class='del'>- * T = __virt_to_phys(__hyp_idmap_text_start)</div><div class='add'>+ * T = __pa_symbol(__hyp_idmap_text_start)</div><div class='ctx'>  * if (T &amp; BIT(VA_BITS - 1))</div><div class='ctx'>  *	HYP_VA_MIN = 0  //idmap in upper half</div><div class='ctx'>  * else</div><div class='hunk'>@@ -236,13 +236,11 @@ static inline bool vcpu_has_cache_enabled(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> static inline void __coherent_cache_guest_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					       kvm_pfn_t pfn,</div><div class='del'>-					       unsigned long size,</div><div class='del'>-					       bool ipa_uncached)</div><div class='add'>+					       unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	void *va = page_address(pfn_to_page(pfn));</div><div class='ctx'> </div><div class='del'>-	if (!vcpu_has_cache_enabled(vcpu) || ipa_uncached)</div><div class='del'>-		kvm_flush_dcache_to_poc(va, size);</div><div class='add'>+	kvm_flush_dcache_to_poc(va, size);</div><div class='ctx'> </div><div class='ctx'> 	if (!icache_is_aliasing()) {		/* PIPT */</div><div class='ctx'> 		flush_icache_range((unsigned long)va,</div><div class='hunk'>@@ -271,7 +269,7 @@ static inline void __kvm_flush_dcache_pud(pud_t pud)</div><div class='ctx'> 	kvm_flush_dcache_to_poc(page_address(page), PUD_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define kvm_virt_to_phys(x)		__virt_to_phys((unsigned long)(x))</div><div class='add'>+#define kvm_virt_to_phys(x)		__pa_symbol(x)</div><div class='ctx'> </div><div class='ctx'> void kvm_set_way_flush(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_toggle_cache(struct kvm_vcpu *vcpu, bool was_enabled);</div><div class='head'>diff --git a/arch/arm64/include/asm/lse.h b/arch/arm64/include/asm/lse.h<br/>index fc756e22c84c..606b20910a5c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/lse.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/lse.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/lse.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/lse.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> __asm__(".arch_extension	lse");</div><div class='ctx'> </div><div class='ctx'> /* Move the ll/sc atomics out-of-line */</div><div class='del'>-#define __LL_SC_INLINE</div><div class='add'>+#define __LL_SC_INLINE		notrace</div><div class='ctx'> #define __LL_SC_PREFIX(x)	__ll_sc_##x</div><div class='ctx'> #define __LL_SC_EXPORT(x)	EXPORT_SYMBOL(__LL_SC_PREFIX(x))</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h<br/>index b71086d25195..32f82723338a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/memory.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/memory.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/memory.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/memory.h</a></div><div class='hunk'>@@ -102,25 +102,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Physical vs virtual RAM address space conversion.  These are</div><div class='del'>- * private definitions which should NOT be used outside memory.h</div><div class='del'>- * files.  Use virt_to_phys/phys_to_virt/__pa/__va instead.</div><div class='del'>- */</div><div class='del'>-#define __virt_to_phys(x) ({						\</div><div class='del'>-	phys_addr_t __x = (phys_addr_t)(x);				\</div><div class='del'>-	__x &amp; BIT(VA_BITS - 1) ? (__x &amp; ~PAGE_OFFSET) + PHYS_OFFSET :	\</div><div class='del'>-				 (__x - kimage_voffset); })</div><div class='del'>-</div><div class='del'>-#define __phys_to_virt(x)	((unsigned long)((x) - PHYS_OFFSET) | PAGE_OFFSET)</div><div class='del'>-#define __phys_to_kimg(x)	((unsigned long)((x) + kimage_voffset))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert a page to/from a physical address</div><div class='del'>- */</div><div class='del'>-#define page_to_phys(page)	(__pfn_to_phys(page_to_pfn(page)))</div><div class='del'>-#define phys_to_page(phys)	(pfn_to_page(__phys_to_pfn(phys)))</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Memory types available.</div><div class='ctx'>  */</div><div class='ctx'> #define MT_DEVICE_nGnRnE	0</div><div class='hunk'>@@ -165,6 +146,11 @@ extern u64			kimage_vaddr;</div><div class='ctx'> /* the offset between the kernel virtual and physical mappings */</div><div class='ctx'> extern u64			kimage_voffset;</div><div class='ctx'> </div><div class='add'>+static inline unsigned long kaslr_offset(void)</div><div class='add'>+{</div><div class='add'>+	return kimage_vaddr - KIMAGE_VADDR;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Allow all memory at the discovery stage. We will clip it later.</div><div class='ctx'>  */</div><div class='hunk'>@@ -182,6 +168,48 @@ extern u64			kimage_voffset;</div><div class='ctx'> #define PHYS_PFN_OFFSET	(PHYS_OFFSET &gt;&gt; PAGE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Physical vs virtual RAM address space conversion.  These are</div><div class='add'>+ * private definitions which should NOT be used outside memory.h</div><div class='add'>+ * files.  Use virt_to_phys/phys_to_virt/__pa/__va instead.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The linear kernel range starts in the middle of the virtual adddress</div><div class='add'>+ * space. Testing the top bit for the start of the region is a</div><div class='add'>+ * sufficient check.</div><div class='add'>+ */</div><div class='add'>+#define __is_lm_address(addr)	(!!((addr) &amp; BIT(VA_BITS - 1)))</div><div class='add'>+</div><div class='add'>+#define __lm_to_phys(addr)	(((addr) &amp; ~PAGE_OFFSET) + PHYS_OFFSET)</div><div class='add'>+#define __kimg_to_phys(addr)	((addr) - kimage_voffset)</div><div class='add'>+</div><div class='add'>+#define __virt_to_phys_nodebug(x) ({					\</div><div class='add'>+	phys_addr_t __x = (phys_addr_t)(x);				\</div><div class='add'>+	__is_lm_address(__x) ? __lm_to_phys(__x) :			\</div><div class='add'>+			       __kimg_to_phys(__x);			\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define __pa_symbol_nodebug(x)	__kimg_to_phys((phys_addr_t)(x))</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_VIRTUAL</div><div class='add'>+extern phys_addr_t __virt_to_phys(unsigned long x);</div><div class='add'>+extern phys_addr_t __phys_addr_symbol(unsigned long x);</div><div class='add'>+#else</div><div class='add'>+#define __virt_to_phys(x)	__virt_to_phys_nodebug(x)</div><div class='add'>+#define __phys_addr_symbol(x)	__pa_symbol_nodebug(x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define __phys_to_virt(x)	((unsigned long)((x) - PHYS_OFFSET) | PAGE_OFFSET)</div><div class='add'>+#define __phys_to_kimg(x)	((unsigned long)((x) + kimage_voffset))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert a page to/from a physical address</div><div class='add'>+ */</div><div class='add'>+#define page_to_phys(page)	(__pfn_to_phys(page_to_pfn(page)))</div><div class='add'>+#define phys_to_page(phys)	(pfn_to_page(__phys_to_pfn(phys)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Note: Drivers should NOT use these.  They are the wrong</div><div class='ctx'>  * translation for translating DMA addresses.  Use the driver</div><div class='ctx'>  * DMA support - see dma-mapping.h.</div><div class='hunk'>@@ -202,9 +230,12 @@ static inline void *phys_to_virt(phys_addr_t x)</div><div class='ctx'>  * Drivers should NOT use these either.</div><div class='ctx'>  */</div><div class='ctx'> #define __pa(x)			__virt_to_phys((unsigned long)(x))</div><div class='add'>+#define __pa_symbol(x)		__phys_addr_symbol(RELOC_HIDE((unsigned long)(x), 0))</div><div class='add'>+#define __pa_nodebug(x)		__virt_to_phys_nodebug((unsigned long)(x))</div><div class='ctx'> #define __va(x)			((void *)__phys_to_virt((phys_addr_t)(x)))</div><div class='ctx'> #define pfn_to_kaddr(pfn)	__va((pfn) &lt;&lt; PAGE_SHIFT)</div><div class='del'>-#define virt_to_pfn(x)      __phys_to_pfn(__virt_to_phys(x))</div><div class='add'>+#define virt_to_pfn(x)      __phys_to_pfn(__virt_to_phys((unsigned long)(x)))</div><div class='add'>+#define sym_to_pfn(x)	    __phys_to_pfn(__pa_symbol(x))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  virt_to_page(k)	convert a _valid_ virtual address to struct page *</div><div class='hunk'>@@ -217,7 +248,7 @@ static inline void *phys_to_virt(phys_addr_t x)</div><div class='ctx'> #define _virt_addr_valid(kaddr)	pfn_valid(__pa(kaddr) &gt;&gt; PAGE_SHIFT)</div><div class='ctx'> #else</div><div class='ctx'> #define __virt_to_pgoff(kaddr)	(((u64)(kaddr) &amp; ~PAGE_OFFSET) / PAGE_SIZE * sizeof(struct page))</div><div class='del'>-#define __page_to_voff(page)	(((u64)(page) &amp; ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))</div><div class='add'>+#define __page_to_voff(kaddr)	(((u64)(kaddr) &amp; ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))</div><div class='ctx'> </div><div class='ctx'> #define page_to_virt(page)	((void *)((__page_to_voff(page)) | PAGE_OFFSET))</div><div class='ctx'> #define virt_to_page(vaddr)	((struct page *)((__virt_to_pgoff(vaddr)) | VMEMMAP_START))</div><div class='head'>diff --git a/arch/arm64/include/asm/mmu.h b/arch/arm64/include/asm/mmu.h<br/>index 8d9fce037b2f..47619411f0ff 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/mmu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/mmu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/mmu.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> typedef struct {</div><div class='ctx'> 	atomic64_t	id;</div><div class='ctx'> 	void		*vdso;</div><div class='add'>+	unsigned long	flags;</div><div class='ctx'> } mm_context_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -34,7 +35,7 @@ extern void __iomem *early_io_map(phys_addr_t phys, unsigned long virt);</div><div class='ctx'> extern void init_mem_pgprot(void);</div><div class='ctx'> extern void create_pgd_mapping(struct mm_struct *mm, phys_addr_t phys,</div><div class='ctx'> 			       unsigned long virt, phys_addr_t size,</div><div class='del'>-			       pgprot_t prot, bool allow_block_mappings);</div><div class='add'>+			       pgprot_t prot, bool page_mappings_only);</div><div class='ctx'> extern void *fixmap_remap_fdt(phys_addr_t dt_phys);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h<br/>index a50185375f09..3257895a9b5e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -19,10 +19,17 @@</div><div class='ctx'> #ifndef __ASM_MMU_CONTEXT_H</div><div class='ctx'> #define __ASM_MMU_CONTEXT_H</div><div class='ctx'> </div><div class='add'>+#define FALKOR_RESERVED_ASID	1</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='hunk'>@@ -44,7 +51,7 @@ static inline void contextidr_thread_switch(struct task_struct *next)</div><div class='ctx'>  */</div><div class='ctx'> static inline void cpu_set_reserved_ttbr0(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long ttbr = virt_to_phys(empty_zero_page);</div><div class='add'>+	unsigned long ttbr = __pa_symbol(empty_zero_page);</div><div class='ctx'> </div><div class='ctx'> 	write_sysreg(ttbr, ttbr0_el1);</div><div class='ctx'> 	isb();</div><div class='hunk'>@@ -103,7 +110,7 @@ static inline void cpu_uninstall_idmap(void)</div><div class='ctx'> 	local_flush_tlb_all();</div><div class='ctx'> 	cpu_set_default_tcr_t0sz();</div><div class='ctx'> </div><div class='del'>-	if (mm != &amp;init_mm)</div><div class='add'>+	if (mm != &amp;init_mm &amp;&amp; !system_uses_ttbr0_pan())</div><div class='ctx'> 		cpu_switch_mm(mm-&gt;pgd, mm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +120,7 @@ static inline void cpu_install_idmap(void)</div><div class='ctx'> 	local_flush_tlb_all();</div><div class='ctx'> 	cpu_set_idmap_tcr_t0sz();</div><div class='ctx'> </div><div class='del'>-	cpu_switch_mm(idmap_pg_dir, &amp;init_mm);</div><div class='add'>+	cpu_switch_mm(lm_alias(idmap_pg_dir), &amp;init_mm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -128,7 +135,7 @@ static inline void cpu_replace_ttbr1(pgd_t *pgd)</div><div class='ctx'> </div><div class='ctx'> 	phys_addr_t pgd_phys = virt_to_phys(pgd);</div><div class='ctx'> </div><div class='del'>-	replace_phys = (void *)virt_to_phys(idmap_cpu_replace_ttbr1);</div><div class='add'>+	replace_phys = (void *)__pa_symbol(idmap_cpu_replace_ttbr1);</div><div class='ctx'> </div><div class='ctx'> 	cpu_install_idmap();</div><div class='ctx'> 	replace_phys(pgd_phys);</div><div class='hunk'>@@ -163,20 +170,26 @@ enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is the actual mm switch as far as the scheduler</div><div class='del'>- * is concerned.  No registers are touched.  We avoid</div><div class='del'>- * calling the CPU specific function when the mm hasn't</div><div class='del'>- * actually changed.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-switch_mm(struct mm_struct *prev, struct mm_struct *next,</div><div class='del'>-	  struct task_struct *tsk)</div><div class='add'>+#ifdef CONFIG_ARM64_SW_TTBR0_PAN</div><div class='add'>+static inline void update_saved_ttbr0(struct task_struct *tsk,</div><div class='add'>+				      struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = smp_processor_id();</div><div class='add'>+	if (system_uses_ttbr0_pan()) {</div><div class='add'>+		BUG_ON(mm-&gt;pgd == swapper_pg_dir);</div><div class='add'>+		task_thread_info(tsk)-&gt;ttbr0 =</div><div class='add'>+			virt_to_phys(mm-&gt;pgd) | ASID(mm) &lt;&lt; 48;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void update_saved_ttbr0(struct task_struct *tsk,</div><div class='add'>+				      struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	if (prev == next)</div><div class='del'>-		return;</div><div class='add'>+static inline void __switch_mm(struct mm_struct *next)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * init_mm.pgd does not contain any user mappings and it is always</div><div class='hunk'>@@ -190,9 +203,29 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,</div><div class='ctx'> 	check_and_switch_context(next, cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void</div><div class='add'>+switch_mm(struct mm_struct *prev, struct mm_struct *next,</div><div class='add'>+	  struct task_struct *tsk)</div><div class='add'>+{</div><div class='add'>+	if (prev != next)</div><div class='add'>+		__switch_mm(next);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Update the saved TTBR0_EL1 of the scheduled-in task as the previous</div><div class='add'>+	 * value may have not been initialised yet (activate_mm caller) or the</div><div class='add'>+	 * ASID has changed since the last run (following the context switch</div><div class='add'>+	 * of another thread of the same process). Avoid setting the reserved</div><div class='add'>+	 * TTBR0_EL1 to swapper_pg_dir (init_mm; e.g. via idle_task_exit).</div><div class='add'>+	 */</div><div class='add'>+	if (next != &amp;init_mm)</div><div class='add'>+		update_saved_ttbr0(tsk, next);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define deactivate_mm(tsk,mm)	do { } while (0)</div><div class='del'>-#define activate_mm(prev,next)	switch_mm(prev, next, NULL)</div><div class='add'>+#define activate_mm(prev,next)	switch_mm(prev, next, current)</div><div class='ctx'> </div><div class='ctx'> void verify_cpu_asid_bits(void);</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#endif /* !__ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+#endif /* !__ASM_MMU_CONTEXT_H */</div><div class='head'>diff --git a/arch/arm64/include/asm/neon.h b/arch/arm64/include/asm/neon.h<br/>index 13ce4cc18e26..ad4cdc966c0f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/neon.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/neon.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/neon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/neon.h</a></div><div class='hunk'>@@ -9,8 +9,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;asm/fpsimd.h&gt;</div><div class='ctx'> </div><div class='del'>-#define cpu_has_neon()		(1)</div><div class='add'>+#define cpu_has_neon()		system_supports_fpsimd()</div><div class='ctx'> </div><div class='ctx'> #define kernel_neon_begin()	kernel_neon_begin_partial(32)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h<br/>index 600887e491fd..bf466d1876e3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/numa.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/numa.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/numa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/numa.h</a></div><div class='hunk'>@@ -15,6 +15,8 @@ int __node_distance(int from, int to);</div><div class='ctx'> </div><div class='ctx'> extern nodemask_t numa_nodes_parsed __initdata;</div><div class='ctx'> </div><div class='add'>+extern bool numa_off;</div><div class='add'>+</div><div class='ctx'> /* Mappings between node number and cpus on that node. */</div><div class='ctx'> extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];</div><div class='ctx'> void numa_clear_node(unsigned int cpu);</div><div class='head'>diff --git a/arch/arm64/include/asm/opcodes.h b/arch/arm64/include/asm/opcodes.h<br/>deleted file mode 100644<br/>index 123f45d92cd1..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/opcodes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/opcodes.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='del'>-#define CONFIG_CPU_ENDIAN_BE8 CONFIG_CPU_BIG_ENDIAN</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;../../arm/include/asm/opcodes.h&gt;</div><div class='head'>diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h<br/>index 5394c8405e66..3bd498e4de4c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/percpu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/percpu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/percpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/percpu.h</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'> #ifndef __ASM_PERCPU_H</div><div class='ctx'> #define __ASM_PERCPU_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/stack_pointer.h&gt;</div><div class='add'>+</div><div class='ctx'> static inline void set_my_cpu_offset(unsigned long off)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile("msr tpidr_el1, %0" :: "r" (off) : "memory");</div><div class='hunk'>@@ -101,16 +103,16 @@ static inline unsigned long __percpu_read(void *ptr, int size)</div><div class='ctx'> </div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		ret = ACCESS_ONCE(*(u8 *)ptr);</div><div class='add'>+		ret = READ_ONCE(*(u8 *)ptr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		ret = ACCESS_ONCE(*(u16 *)ptr);</div><div class='add'>+		ret = READ_ONCE(*(u16 *)ptr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		ret = ACCESS_ONCE(*(u32 *)ptr);</div><div class='add'>+		ret = READ_ONCE(*(u32 *)ptr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 8:</div><div class='del'>-		ret = ACCESS_ONCE(*(u64 *)ptr);</div><div class='add'>+		ret = READ_ONCE(*(u64 *)ptr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUILD_BUG();</div><div class='hunk'>@@ -123,16 +125,16 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)</div><div class='ctx'> {</div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		ACCESS_ONCE(*(u8 *)ptr) = (u8)val;</div><div class='add'>+		WRITE_ONCE(*(u8 *)ptr, (u8)val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		ACCESS_ONCE(*(u16 *)ptr) = (u16)val;</div><div class='add'>+		WRITE_ONCE(*(u16 *)ptr, (u16)val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		ACCESS_ONCE(*(u32 *)ptr) = (u32)val;</div><div class='add'>+		WRITE_ONCE(*(u32 *)ptr, (u32)val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 8:</div><div class='del'>-		ACCESS_ONCE(*(u64 *)ptr) = (u64)val;</div><div class='add'>+		WRITE_ONCE(*(u64 *)ptr, (u64)val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUILD_BUG();</div><div class='head'>diff --git a/arch/arm64/include/asm/perf_event.h b/arch/arm64/include/asm/perf_event.h<br/>index 38b6a2b49d68..8d5cbec17d80 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/perf_event.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/perf_event.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/perf_event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/perf_event.h</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> #ifndef __ASM_PERF_EVENT_H</div><div class='ctx'> #define __ASM_PERF_EVENT_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/stack_pointer.h&gt;</div><div class='add'>+</div><div class='ctx'> #define	ARMV8_PMU_MAX_COUNTERS	32</div><div class='ctx'> #define	ARMV8_PMU_COUNTER_MASK	(ARMV8_PMU_MAX_COUNTERS - 1)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h<br/>index ffbb9a520563..0eef6064bf3b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/pgtable.h</a></div><div class='hunk'>@@ -52,7 +52,7 @@ extern void __pgd_error(const char *file, int line, unsigned long val);</div><div class='ctx'>  * for zero-mapped memory areas etc..</div><div class='ctx'>  */</div><div class='ctx'> extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];</div><div class='del'>-#define ZERO_PAGE(vaddr)	pfn_to_page(PHYS_PFN(__pa(empty_zero_page)))</div><div class='add'>+#define ZERO_PAGE(vaddr)	phys_to_page(__pa_symbol(empty_zero_page))</div><div class='ctx'> </div><div class='ctx'> #define pte_ERROR(pte)		__pte_error(__FILE__, __LINE__, pte_val(pte))</div><div class='ctx'> </div><div class='hunk'>@@ -71,9 +71,8 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];</div><div class='ctx'> #define pte_young(pte)		(!!(pte_val(pte) &amp; PTE_AF))</div><div class='ctx'> #define pte_special(pte)	(!!(pte_val(pte) &amp; PTE_SPECIAL))</div><div class='ctx'> #define pte_write(pte)		(!!(pte_val(pte) &amp; PTE_WRITE))</div><div class='del'>-#define pte_exec(pte)		(!(pte_val(pte) &amp; PTE_UXN))</div><div class='add'>+#define pte_user_exec(pte)	(!(pte_val(pte) &amp; PTE_UXN))</div><div class='ctx'> #define pte_cont(pte)		(!!(pte_val(pte) &amp; PTE_CONT))</div><div class='del'>-#define pte_ng(pte)		(!!(pte_val(pte) &amp; PTE_NG))</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARM64_HW_AFDBM</div><div class='ctx'> #define pte_hw_dirty(pte)	(pte_write(pte) &amp;&amp; !(pte_val(pte) &amp; PTE_RDONLY))</div><div class='hunk'>@@ -84,8 +83,12 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];</div><div class='ctx'> #define pte_dirty(pte)		(pte_sw_dirty(pte) || pte_hw_dirty(pte))</div><div class='ctx'> </div><div class='ctx'> #define pte_valid(pte)		(!!(pte_val(pte) &amp; PTE_VALID))</div><div class='del'>-#define pte_valid_global(pte) \</div><div class='del'>-	((pte_val(pte) &amp; (PTE_VALID | PTE_NG)) == PTE_VALID)</div><div class='add'>+/*</div><div class='add'>+ * Execute-only user mappings do not have the PTE_USER bit set. All valid</div><div class='add'>+ * kernel mappings have the PTE_UXN bit set.</div><div class='add'>+ */</div><div class='add'>+#define pte_valid_not_user(pte) \</div><div class='add'>+	((pte_val(pte) &amp; (PTE_VALID | PTE_USER | PTE_UXN)) == (PTE_VALID | PTE_UXN))</div><div class='ctx'> #define pte_valid_young(pte) \</div><div class='ctx'> 	((pte_val(pte) &amp; (PTE_VALID | PTE_AF)) == (PTE_VALID | PTE_AF))</div><div class='ctx'> </div><div class='hunk'>@@ -178,7 +181,7 @@ static inline void set_pte(pte_t *ptep, pte_t pte)</div><div class='ctx'> 	 * Only if the new pte is valid and kernel, otherwise TLB maintenance</div><div class='ctx'> 	 * or update_mmu_cache() have the necessary barriers.</div><div class='ctx'> 	 */</div><div class='del'>-	if (pte_valid_global(pte)) {</div><div class='add'>+	if (pte_valid_not_user(pte)) {</div><div class='ctx'> 		dsb(ishst);</div><div class='ctx'> 		isb();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -212,7 +215,7 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 			pte_val(pte) &amp;= ~PTE_RDONLY;</div><div class='ctx'> 		else</div><div class='ctx'> 			pte_val(pte) |= PTE_RDONLY;</div><div class='del'>-		if (pte_ng(pte) &amp;&amp; pte_exec(pte) &amp;&amp; !pte_special(pte))</div><div class='add'>+		if (pte_user_exec(pte) &amp;&amp; !pte_special(pte))</div><div class='ctx'> 			__sync_icache_dcache(pte, addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/probes.h b/arch/arm64/include/asm/probes.h<br/>index 5af574d632fa..6a5b28904c33 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/probes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/probes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/probes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/probes.h</a></div><div class='hunk'>@@ -15,21 +15,22 @@</div><div class='ctx'> #ifndef _ARM_PROBES_H</div><div class='ctx'> #define _ARM_PROBES_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/opcodes.h&gt;</div><div class='del'>-</div><div class='del'>-struct kprobe;</div><div class='del'>-struct arch_specific_insn;</div><div class='del'>-</div><div class='del'>-typedef u32 kprobe_opcode_t;</div><div class='del'>-typedef void (kprobes_handler_t) (u32 opcode, long addr, struct pt_regs *);</div><div class='add'>+typedef u32 probe_opcode_t;</div><div class='add'>+typedef void (probes_handler_t) (u32 opcode, long addr, struct pt_regs *);</div><div class='ctx'> </div><div class='ctx'> /* architecture specific copy of original instruction */</div><div class='del'>-struct arch_specific_insn {</div><div class='del'>-	kprobe_opcode_t *insn;</div><div class='add'>+struct arch_probe_insn {</div><div class='add'>+	probe_opcode_t *insn;</div><div class='ctx'> 	pstate_check_t *pstate_cc;</div><div class='del'>-	kprobes_handler_t *handler;</div><div class='add'>+	probes_handler_t *handler;</div><div class='ctx'> 	/* restore address after step xol */</div><div class='ctx'> 	unsigned long restore;</div><div class='ctx'> };</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+typedef u32 kprobe_opcode_t;</div><div class='add'>+struct arch_specific_insn {</div><div class='add'>+	struct arch_probe_insn api;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h<br/>index 60e34824e18c..c97b8bd2acba 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/processor.h</a></div><div class='hunk'>@@ -149,8 +149,6 @@ static inline void cpu_relax(void)</div><div class='ctx'> 	asm volatile("yield" ::: "memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define cpu_relax_lowlatency()                cpu_relax()</div><div class='del'>-</div><div class='ctx'> /* Thread switching */</div><div class='ctx'> extern struct task_struct *cpu_switch_to(struct task_struct *prev,</div><div class='ctx'> 					 struct task_struct *next);</div><div class='hunk'>@@ -189,7 +187,6 @@ static inline void spin_lock_prefetch(const void *ptr)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int cpu_enable_pan(void *__unused);</div><div class='del'>-int cpu_enable_uao(void *__unused);</div><div class='ctx'> int cpu_enable_cache_maint_trap(void *__unused);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_PROCESSOR_H */</div><div class='head'>diff --git a/arch/arm64/include/asm/ptdump.h b/arch/arm64/include/asm/ptdump.h<br/>index 07b8ed037dee..6afd8476c60c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/ptdump.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/ptdump.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/ptdump.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/ptdump.h</a></div><div class='hunk'>@@ -16,9 +16,10 @@</div><div class='ctx'> #ifndef __ASM_PTDUMP_H</div><div class='ctx'> #define __ASM_PTDUMP_H</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARM64_PTDUMP</div><div class='add'>+#ifdef CONFIG_ARM64_PTDUMP_CORE</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm_types.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct addr_marker {</div><div class='ctx'> 	unsigned long start_address;</div><div class='hunk'>@@ -29,16 +30,25 @@ struct ptdump_info {</div><div class='ctx'> 	struct mm_struct		*mm;</div><div class='ctx'> 	const struct addr_marker	*markers;</div><div class='ctx'> 	unsigned long			base_addr;</div><div class='del'>-	unsigned long			max_addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int ptdump_register(struct ptdump_info *info, const char *name);</div><div class='del'>-</div><div class='add'>+void ptdump_walk_pgd(struct seq_file *s, struct ptdump_info *info);</div><div class='add'>+#ifdef CONFIG_ARM64_PTDUMP_DEBUGFS</div><div class='add'>+int ptdump_debugfs_register(struct ptdump_info *info, const char *name);</div><div class='ctx'> #else</div><div class='del'>-static inline int ptdump_register(struct ptdump_info *info, const char *name)</div><div class='add'>+static inline int ptdump_debugfs_register(struct ptdump_info *info,</div><div class='add'>+					const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_ARM64_PTDUMP */</div><div class='add'>+#endif</div><div class='add'>+void ptdump_check_wx(void);</div><div class='add'>+#endif /* CONFIG_ARM64_PTDUMP_CORE */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_WX</div><div class='add'>+#define debug_checkwx()	ptdump_check_wx()</div><div class='add'>+#else</div><div class='add'>+#define debug_checkwx()	do { } while (0)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_PTDUMP_H */</div><div class='head'>diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h<br/>index ada08b5b036d..11403fdd0a50 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/ptrace.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/ptrace.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/ptrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/ptrace.h</a></div><div class='hunk'>@@ -194,6 +194,26 @@ static inline u64 regs_get_register(struct pt_regs *regs, unsigned int offset)</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Read a register given an architectural register index r.</div><div class='add'>+ * This handles the common case where 31 means XZR, not SP.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long pt_regs_read_reg(const struct pt_regs *regs, int r)</div><div class='add'>+{</div><div class='add'>+	return (r == 31) ? 0 : regs-&gt;regs[r];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write a register given an architectural register index r.</div><div class='add'>+ * This handles the common case where 31 means XZR, not SP.</div><div class='add'>+ */</div><div class='add'>+static inline void pt_regs_write_reg(struct pt_regs *regs, int r,</div><div class='add'>+				     unsigned long val)</div><div class='add'>+{</div><div class='add'>+	if (r != 31)</div><div class='add'>+		regs-&gt;regs[r] = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Valid only for Kernel mode traps. */</div><div class='ctx'> static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -217,6 +237,14 @@ int valid_user_regs(struct user_pt_regs *regs, struct task_struct *task);</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/ptrace.h&gt;</div><div class='ctx'> </div><div class='add'>+#define procedure_link_pointer(regs)	((regs)-&gt;regs[30])</div><div class='add'>+</div><div class='add'>+static inline void procedure_link_pointer_set(struct pt_regs *regs,</div><div class='add'>+					   unsigned long val)</div><div class='add'>+{</div><div class='add'>+	procedure_link_pointer(regs) = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #undef profile_pc</div><div class='ctx'> extern unsigned long profile_pc(struct pt_regs *regs);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h<br/>index 022644704a93..d050d720a1b4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/smp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/smp.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/smp.h</a></div><div class='hunk'>@@ -29,11 +29,22 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/percpu.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> </div><div class='del'>-#define raw_smp_processor_id() (current_thread_info()-&gt;cpu)</div><div class='add'>+DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We don't use this_cpu_read(cpu_number) as that has implicit writes to</div><div class='add'>+ * preempt_count, and associated (compiler) barriers, that we'd like to avoid</div><div class='add'>+ * the expense of. If we're preemptible, the value can be stale at use anyway.</div><div class='add'>+ * And we can't use this_cpu_ptr() either, as that winds up recursing back</div><div class='add'>+ * here under CONFIG_DEBUG_PREEMPT=y.</div><div class='add'>+ */</div><div class='add'>+#define raw_smp_processor_id() (*raw_cpu_ptr(&amp;cpu_number))</div><div class='ctx'> </div><div class='ctx'> struct seq_file;</div><div class='ctx'> </div><div class='hunk'>@@ -73,6 +84,7 @@ asmlinkage void secondary_start_kernel(void);</div><div class='ctx'>  */</div><div class='ctx'> struct secondary_data {</div><div class='ctx'> 	void *stack;</div><div class='add'>+	struct task_struct *task;</div><div class='ctx'> 	long status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/stack_pointer.h b/arch/arm64/include/asm/stack_pointer.h<br/>new file mode 100644<br/>index 000000000000..ffcdf742cddf<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/stack_pointer.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/stack_pointer.h</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+#ifndef __ASM_STACK_POINTER_H</div><div class='add'>+#define __ASM_STACK_POINTER_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * how to get the current stack pointer from C</div><div class='add'>+ */</div><div class='add'>+register unsigned long current_stack_pointer asm ("sp");</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_STACK_POINTER_H */</div><div class='head'>diff --git a/arch/arm64/include/asm/suspend.h b/arch/arm64/include/asm/suspend.h<br/>index b8a313fd7a09..de5600f40adf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/suspend.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/suspend.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/suspend.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/suspend.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #ifndef __ASM_SUSPEND_H</div><div class='ctx'> #define __ASM_SUSPEND_H</div><div class='ctx'> </div><div class='del'>-#define NR_CTX_REGS 10</div><div class='add'>+#define NR_CTX_REGS 12</div><div class='ctx'> #define NR_CALLEE_SAVED_REGS 12</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h<br/>index 6c80b3699cb8..ac24b6e798b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/sysreg.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/sysreg.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/sysreg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/sysreg.h</a></div><div class='hunk'>@@ -22,8 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/opcodes.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * ARMv8 ARM reserves the following encoding for system registers:</div><div class='ctx'>  * (Ref: ARMv8 ARM, Section: "System instruction class encoding overview",</div><div class='hunk'>@@ -34,8 +32,54 @@</div><div class='ctx'>  *	[11-8]  : CRm</div><div class='ctx'>  *	[7-5]   : Op2</div><div class='ctx'>  */</div><div class='add'>+#define Op0_shift	19</div><div class='add'>+#define Op0_mask	0x3</div><div class='add'>+#define Op1_shift	16</div><div class='add'>+#define Op1_mask	0x7</div><div class='add'>+#define CRn_shift	12</div><div class='add'>+#define CRn_mask	0xf</div><div class='add'>+#define CRm_shift	8</div><div class='add'>+#define CRm_mask	0xf</div><div class='add'>+#define Op2_shift	5</div><div class='add'>+#define Op2_mask	0x7</div><div class='add'>+</div><div class='ctx'> #define sys_reg(op0, op1, crn, crm, op2) \</div><div class='del'>-	((((op0)&amp;3)&lt;&lt;19)|((op1)&lt;&lt;16)|((crn)&lt;&lt;12)|((crm)&lt;&lt;8)|((op2)&lt;&lt;5))</div><div class='add'>+	(((op0) &lt;&lt; Op0_shift) | ((op1) &lt;&lt; Op1_shift) | \</div><div class='add'>+	 ((crn) &lt;&lt; CRn_shift) | ((crm) &lt;&lt; CRm_shift) | \</div><div class='add'>+	 ((op2) &lt;&lt; Op2_shift))</div><div class='add'>+</div><div class='add'>+#define sys_reg_Op0(id)	(((id) &gt;&gt; Op0_shift) &amp; Op0_mask)</div><div class='add'>+#define sys_reg_Op1(id)	(((id) &gt;&gt; Op1_shift) &amp; Op1_mask)</div><div class='add'>+#define sys_reg_CRn(id)	(((id) &gt;&gt; CRn_shift) &amp; CRn_mask)</div><div class='add'>+#define sys_reg_CRm(id)	(((id) &gt;&gt; CRm_shift) &amp; CRm_mask)</div><div class='add'>+#define sys_reg_Op2(id)	(((id) &gt;&gt; Op2_shift) &amp; Op2_mask)</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_BROKEN_GAS_INST</div><div class='add'>+</div><div class='add'>+#ifdef __ASSEMBLY__</div><div class='add'>+#define __emit_inst(x)			.inst (x)</div><div class='add'>+#else</div><div class='add'>+#define __emit_inst(x)			".inst " __stringify((x)) "\n\t"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#else  /* CONFIG_BROKEN_GAS_INST */</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+#define __INSTR_BSWAP(x)		(x)</div><div class='add'>+#else  /* CONFIG_CPU_BIG_ENDIAN */</div><div class='add'>+#define __INSTR_BSWAP(x)		((((x) &lt;&lt; 24) &amp; 0xff000000)	| \</div><div class='add'>+					 (((x) &lt;&lt;  8) &amp; 0x00ff0000)	| \</div><div class='add'>+					 (((x) &gt;&gt;  8) &amp; 0x0000ff00)	| \</div><div class='add'>+					 (((x) &gt;&gt; 24) &amp; 0x000000ff))</div><div class='add'>+#endif	/* CONFIG_CPU_BIG_ENDIAN */</div><div class='add'>+</div><div class='add'>+#ifdef __ASSEMBLY__</div><div class='add'>+#define __emit_inst(x)			.long __INSTR_BSWAP(x)</div><div class='add'>+#else  /* __ASSEMBLY__ */</div><div class='add'>+#define __emit_inst(x)			".long " __stringify(__INSTR_BSWAP(x)) "\n\t"</div><div class='add'>+#endif	/* __ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+#endif	/* CONFIG_BROKEN_GAS_INST */</div><div class='ctx'> </div><div class='ctx'> #define SYS_MIDR_EL1			sys_reg(3, 0, 0, 0, 0)</div><div class='ctx'> #define SYS_MPIDR_EL1			sys_reg(3, 0, 0, 0, 5)</div><div class='hunk'>@@ -81,10 +125,10 @@</div><div class='ctx'> #define REG_PSTATE_PAN_IMM		sys_reg(0, 0, 4, 0, 4)</div><div class='ctx'> #define REG_PSTATE_UAO_IMM		sys_reg(0, 0, 4, 0, 3)</div><div class='ctx'> </div><div class='del'>-#define SET_PSTATE_PAN(x) __inst_arm(0xd5000000 | REG_PSTATE_PAN_IMM |\</div><div class='del'>-				     (!!x)&lt;&lt;8 | 0x1f)</div><div class='del'>-#define SET_PSTATE_UAO(x) __inst_arm(0xd5000000 | REG_PSTATE_UAO_IMM |\</div><div class='del'>-				     (!!x)&lt;&lt;8 | 0x1f)</div><div class='add'>+#define SET_PSTATE_PAN(x) __emit_inst(0xd5000000 | REG_PSTATE_PAN_IMM |	\</div><div class='add'>+				      (!!x)&lt;&lt;8 | 0x1f)</div><div class='add'>+#define SET_PSTATE_UAO(x) __emit_inst(0xd5000000 | REG_PSTATE_UAO_IMM |	\</div><div class='add'>+				      (!!x)&lt;&lt;8 | 0x1f)</div><div class='ctx'> </div><div class='ctx'> /* Common SCTLR_ELx flags. */</div><div class='ctx'> #define SCTLR_ELx_EE    (1 &lt;&lt; 25)</div><div class='hunk'>@@ -165,6 +209,7 @@</div><div class='ctx'> #define ID_AA64MMFR2_CNP_SHIFT		0</div><div class='ctx'> </div><div class='ctx'> /* id_aa64dfr0 */</div><div class='add'>+#define ID_AA64DFR0_PMSVER_SHIFT	32</div><div class='ctx'> #define ID_AA64DFR0_CTX_CMPS_SHIFT	28</div><div class='ctx'> #define ID_AA64DFR0_WRPS_SHIFT		20</div><div class='ctx'> #define ID_AA64DFR0_BRPS_SHIFT		12</div><div class='hunk'>@@ -220,6 +265,10 @@</div><div class='ctx'> #define ID_AA64MMFR0_TGRAN_SUPPORTED	ID_AA64MMFR0_TGRAN64_SUPPORTED</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* Safe value for MPIDR_EL1: Bit31:RES1, Bit30:U:0, Bit24:MT:0 */</div><div class='add'>+#define SYS_MPIDR_SAFE_VAL		(1UL &lt;&lt; 31)</div><div class='add'>+</div><div class='ctx'> #ifdef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> 	.irp	num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30</div><div class='hunk'>@@ -228,11 +277,11 @@</div><div class='ctx'> 	.equ	.L__reg_num_xzr, 31</div><div class='ctx'> </div><div class='ctx'> 	.macro	mrs_s, rt, sreg</div><div class='del'>-	.inst	0xd5200000|(\sreg)|(.L__reg_num_\rt)</div><div class='add'>+	 __emit_inst(0xd5200000|(\sreg)|(.L__reg_num_\rt))</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	msr_s, sreg, rt</div><div class='del'>-	.inst	0xd5000000|(\sreg)|(.L__reg_num_\rt)</div><div class='add'>+	__emit_inst(0xd5000000|(\sreg)|(.L__reg_num_\rt))</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -246,11 +295,11 @@ asm(</div><div class='ctx'> "	.equ	.L__reg_num_xzr, 31\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "	.macro	mrs_s, rt, sreg\n"</div><div class='del'>-"	.inst	0xd5200000|(\\sreg)|(.L__reg_num_\\rt)\n"</div><div class='add'>+	__emit_inst(0xd5200000|(\\sreg)|(.L__reg_num_\\rt))</div><div class='ctx'> "	.endm\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "	.macro	msr_s, sreg, rt\n"</div><div class='del'>-"	.inst	0xd5000000|(\\sreg)|(.L__reg_num_\\rt)\n"</div><div class='add'>+	__emit_inst(0xd5000000|(\\sreg)|(.L__reg_num_\\rt))</div><div class='ctx'> "	.endm\n"</div><div class='ctx'> );</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h<br/>index e9ea5a6bd449..46c3b93cf865 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/thread_info.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/thread_info.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/thread_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/thread_info.h</a></div><div class='hunk'>@@ -36,58 +36,31 @@</div><div class='ctx'> </div><div class='ctx'> struct task_struct;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/stack_pointer.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef unsigned long mm_segment_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * low level task data that entry.S needs immediate access to.</div><div class='del'>- * __switch_to() assumes cpu_context follows immediately after cpu_domain.</div><div class='ctx'>  */</div><div class='ctx'> struct thread_info {</div><div class='ctx'> 	unsigned long		flags;		/* low level flags */</div><div class='ctx'> 	mm_segment_t		addr_limit;	/* address limit */</div><div class='del'>-	struct task_struct	*task;		/* main task structure */</div><div class='add'>+#ifdef CONFIG_ARM64_SW_TTBR0_PAN</div><div class='add'>+	u64			ttbr0;		/* saved TTBR0_EL1 */</div><div class='add'>+#endif</div><div class='ctx'> 	int			preempt_count;	/* 0 =&gt; preemptable, &lt;0 =&gt; bug */</div><div class='del'>-	int			cpu;		/* cpu */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define INIT_THREAD_INFO(tsk)						\</div><div class='ctx'> {									\</div><div class='del'>-	.task		= &amp;tsk,						\</div><div class='del'>-	.flags		= 0,						\</div><div class='ctx'> 	.preempt_count	= INIT_PREEMPT_COUNT,				\</div><div class='ctx'> 	.addr_limit	= KERNEL_DS,					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define init_thread_info	(init_thread_union.thread_info)</div><div class='ctx'> #define init_stack		(init_thread_union.stack)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * how to get the current stack pointer from C</div><div class='del'>- */</div><div class='del'>-register unsigned long current_stack_pointer asm ("sp");</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * how to get the thread information struct from C</div><div class='del'>- */</div><div class='del'>-static inline struct thread_info *current_thread_info(void) __attribute_const__;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * struct thread_info can be accessed directly via sp_el0.</div><div class='del'>- *</div><div class='del'>- * We don't use read_sysreg() as we want the compiler to cache the value where</div><div class='del'>- * possible.</div><div class='del'>- */</div><div class='del'>-static inline struct thread_info *current_thread_info(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long sp_el0;</div><div class='del'>-</div><div class='del'>-	asm ("mrs %0, sp_el0" : "=r" (sp_el0));</div><div class='del'>-</div><div class='del'>-	return (struct thread_info *)sp_el0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define thread_saved_pc(tsk)	\</div><div class='ctx'> 	((unsigned long)(tsk-&gt;thread.cpu_context.pc))</div><div class='ctx'> #define thread_saved_sp(tsk)	\</div><div class='hunk'>@@ -112,6 +85,7 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_NEED_RESCHED	1</div><div class='ctx'> #define TIF_NOTIFY_RESUME	2	/* callback before returning to user */</div><div class='ctx'> #define TIF_FOREIGN_FPSTATE	3	/* CPU's FP state is not current's */</div><div class='add'>+#define TIF_UPROBE		4	/* uprobe breakpoint or singlestep */</div><div class='ctx'> #define TIF_NOHZ		7</div><div class='ctx'> #define TIF_SYSCALL_TRACE	8</div><div class='ctx'> #define TIF_SYSCALL_AUDIT	9</div><div class='hunk'>@@ -132,10 +106,12 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define _TIF_SYSCALL_AUDIT	(1 &lt;&lt; TIF_SYSCALL_AUDIT)</div><div class='ctx'> #define _TIF_SYSCALL_TRACEPOINT	(1 &lt;&lt; TIF_SYSCALL_TRACEPOINT)</div><div class='ctx'> #define _TIF_SECCOMP		(1 &lt;&lt; TIF_SECCOMP)</div><div class='add'>+#define _TIF_UPROBE		(1 &lt;&lt; TIF_UPROBE)</div><div class='ctx'> #define _TIF_32BIT		(1 &lt;&lt; TIF_32BIT)</div><div class='ctx'> </div><div class='ctx'> #define _TIF_WORK_MASK		(_TIF_NEED_RESCHED | _TIF_SIGPENDING | \</div><div class='del'>-				 _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE)</div><div class='add'>+				 _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \</div><div class='add'>+				 _TIF_UPROBE)</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_WORK	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \</div><div class='ctx'> 				 _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \</div><div class='head'>diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h<br/>index deab52374119..af1c76981911 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/tlbflush.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/tlbflush.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/tlbflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/tlbflush.h</a></div><div class='hunk'>@@ -36,9 +36,21 @@</div><div class='ctx'>  * not. The macros handles invoking the asm with or without the</div><div class='ctx'>  * register argument as appropriate.</div><div class='ctx'>  */</div><div class='del'>-#define __TLBI_0(op, arg)		asm ("tlbi " #op)</div><div class='del'>-#define __TLBI_1(op, arg)		asm ("tlbi " #op ", %0" : : "r" (arg))</div><div class='del'>-#define __TLBI_N(op, arg, n, ...)	__TLBI_##n(op, arg)</div><div class='add'>+#define __TLBI_0(op, arg) asm ("tlbi " #op "\n"				       \</div><div class='add'>+		   ALTERNATIVE("nop\n			nop",		       \</div><div class='add'>+			       "dsb ish\n		tlbi " #op,	       \</div><div class='add'>+			       ARM64_WORKAROUND_REPEAT_TLBI,		       \</div><div class='add'>+			       CONFIG_QCOM_FALKOR_ERRATUM_1009)		       \</div><div class='add'>+			    : : )</div><div class='add'>+</div><div class='add'>+#define __TLBI_1(op, arg) asm ("tlbi " #op ", %0\n"			       \</div><div class='add'>+		   ALTERNATIVE("nop\n			nop",		       \</div><div class='add'>+			       "dsb ish\n		tlbi " #op ", %0",     \</div><div class='add'>+			       ARM64_WORKAROUND_REPEAT_TLBI,		       \</div><div class='add'>+			       CONFIG_QCOM_FALKOR_ERRATUM_1009)		       \</div><div class='add'>+			    : : "r" (arg))</div><div class='add'>+</div><div class='add'>+#define __TLBI_N(op, arg, n, ...) __TLBI_##n(op, arg)</div><div class='ctx'> </div><div class='ctx'> #define __tlbi(op, ...)		__TLBI_N(op, ##__VA_ARGS__, 1, 0)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h<br/>index 55d0adbf6509..5308d696311b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/uaccess.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/uaccess.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/uaccess.h</a></div><div class='hunk'>@@ -18,6 +18,10 @@</div><div class='ctx'> #ifndef __ASM_UACCESS_H</div><div class='ctx'> #define __ASM_UACCESS_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/alternative.h&gt;</div><div class='add'>+#include &lt;asm/kernel-pgtable.h&gt;</div><div class='add'>+#include &lt;asm/sysreg.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * User space memory access functions</div><div class='ctx'>  */</div><div class='hunk'>@@ -26,10 +30,8 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/alternative.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/sysreg.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/compiler.h&gt;</div><div class='hunk'>@@ -120,6 +122,99 @@ static inline void set_fs(mm_segment_t fs)</div><div class='ctx'> 	"	.popsection\n"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * User access enabling/disabling.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_ARM64_SW_TTBR0_PAN</div><div class='add'>+static inline void __uaccess_ttbr0_disable(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long ttbr;</div><div class='add'>+</div><div class='add'>+	/* reserved_ttbr0 placed at the end of swapper_pg_dir */</div><div class='add'>+	ttbr = read_sysreg(ttbr1_el1) + SWAPPER_DIR_SIZE;</div><div class='add'>+	write_sysreg(ttbr, ttbr0_el1);</div><div class='add'>+	isb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __uaccess_ttbr0_enable(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable interrupts to avoid preemption between reading the 'ttbr0'</div><div class='add'>+	 * variable and the MSR. A context switch could trigger an ASID</div><div class='add'>+	 * roll-over and an update of 'ttbr0'.</div><div class='add'>+	 */</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	write_sysreg(current_thread_info()-&gt;ttbr0, ttbr0_el1);</div><div class='add'>+	isb();</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool uaccess_ttbr0_disable(void)</div><div class='add'>+{</div><div class='add'>+	if (!system_uses_ttbr0_pan())</div><div class='add'>+		return false;</div><div class='add'>+	__uaccess_ttbr0_disable();</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool uaccess_ttbr0_enable(void)</div><div class='add'>+{</div><div class='add'>+	if (!system_uses_ttbr0_pan())</div><div class='add'>+		return false;</div><div class='add'>+	__uaccess_ttbr0_enable();</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline bool uaccess_ttbr0_disable(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool uaccess_ttbr0_enable(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define __uaccess_disable(alt)						\</div><div class='add'>+do {									\</div><div class='add'>+	if (!uaccess_ttbr0_disable())					\</div><div class='add'>+		asm(ALTERNATIVE("nop", SET_PSTATE_PAN(1), alt,		\</div><div class='add'>+				CONFIG_ARM64_PAN));			\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define __uaccess_enable(alt)						\</div><div class='add'>+do {									\</div><div class='add'>+	if (!uaccess_ttbr0_enable())					\</div><div class='add'>+		asm(ALTERNATIVE("nop", SET_PSTATE_PAN(0), alt,		\</div><div class='add'>+				CONFIG_ARM64_PAN));			\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static inline void uaccess_disable(void)</div><div class='add'>+{</div><div class='add'>+	__uaccess_disable(ARM64_HAS_PAN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void uaccess_enable(void)</div><div class='add'>+{</div><div class='add'>+	__uaccess_enable(ARM64_HAS_PAN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These functions are no-ops when UAO is present.</div><div class='add'>+ */</div><div class='add'>+static inline void uaccess_disable_not_uao(void)</div><div class='add'>+{</div><div class='add'>+	__uaccess_disable(ARM64_ALT_PAN_NOT_UAO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void uaccess_enable_not_uao(void)</div><div class='add'>+{</div><div class='add'>+	__uaccess_enable(ARM64_ALT_PAN_NOT_UAO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * The "__xxx" versions of the user access functions do not verify the address</div><div class='ctx'>  * space - it must have been done previously with a separate "access_ok()"</div><div class='ctx'>  * call.</div><div class='hunk'>@@ -146,8 +241,7 @@ static inline void set_fs(mm_segment_t fs)</div><div class='ctx'> do {									\</div><div class='ctx'> 	unsigned long __gu_val;						\</div><div class='ctx'> 	__chk_user_ptr(ptr);						\</div><div class='del'>-	asm(ALTERNATIVE("nop", SET_PSTATE_PAN(0), ARM64_ALT_PAN_NOT_UAO,\</div><div class='del'>-			CONFIG_ARM64_PAN));				\</div><div class='add'>+	uaccess_enable_not_uao();					\</div><div class='ctx'> 	switch (sizeof(*(ptr))) {					\</div><div class='ctx'> 	case 1:								\</div><div class='ctx'> 		__get_user_asm("ldrb", "ldtrb", "%w", __gu_val, (ptr),  \</div><div class='hunk'>@@ -168,9 +262,8 @@ do {									\</div><div class='ctx'> 	default:							\</div><div class='ctx'> 		BUILD_BUG();						\</div><div class='ctx'> 	}								\</div><div class='add'>+	uaccess_disable_not_uao();					\</div><div class='ctx'> 	(x) = (__force __typeof__(*(ptr)))__gu_val;			\</div><div class='del'>-	asm(ALTERNATIVE("nop", SET_PSTATE_PAN(1), ARM64_ALT_PAN_NOT_UAO,\</div><div class='del'>-			CONFIG_ARM64_PAN));				\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #define __get_user(x, ptr)						\</div><div class='hunk'>@@ -215,8 +308,7 @@ do {									\</div><div class='ctx'> do {									\</div><div class='ctx'> 	__typeof__(*(ptr)) __pu_val = (x);				\</div><div class='ctx'> 	__chk_user_ptr(ptr);						\</div><div class='del'>-	asm(ALTERNATIVE("nop", SET_PSTATE_PAN(0), ARM64_ALT_PAN_NOT_UAO,\</div><div class='del'>-			CONFIG_ARM64_PAN));				\</div><div class='add'>+	uaccess_enable_not_uao();					\</div><div class='ctx'> 	switch (sizeof(*(ptr))) {					\</div><div class='ctx'> 	case 1:								\</div><div class='ctx'> 		__put_user_asm("strb", "sttrb", "%w", __pu_val, (ptr),	\</div><div class='hunk'>@@ -237,8 +329,7 @@ do {									\</div><div class='ctx'> 	default:							\</div><div class='ctx'> 		BUILD_BUG();						\</div><div class='ctx'> 	}								\</div><div class='del'>-	asm(ALTERNATIVE("nop", SET_PSTATE_PAN(1), ARM64_ALT_PAN_NOT_UAO,\</div><div class='del'>-			CONFIG_ARM64_PAN));				\</div><div class='add'>+	uaccess_disable_not_uao();					\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #define __put_user(x, ptr)						\</div><div class='hunk'>@@ -288,9 +379,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long res = n;</div><div class='ctx'> 	kasan_check_write(to, n);</div><div class='add'>+	check_object_size(to, n, false);</div><div class='ctx'> </div><div class='ctx'> 	if (access_ok(VERIFY_READ, from, n)) {</div><div class='del'>-		check_object_size(to, n, false);</div><div class='ctx'> 		res = __arch_copy_from_user(to, from, n);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(res))</div><div class='hunk'>@@ -301,9 +392,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u</div><div class='ctx'> static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> 	kasan_check_read(from, n);</div><div class='add'>+	check_object_size(from, n, true);</div><div class='ctx'> </div><div class='ctx'> 	if (access_ok(VERIFY_WRITE, to, n)) {</div><div class='del'>-		check_object_size(from, n, true);</div><div class='ctx'> 		n = __arch_copy_to_user(to, from, n);</div><div class='ctx'> 	}</div><div class='ctx'> 	return n;</div><div class='head'>diff --git a/arch/arm64/include/asm/uprobes.h b/arch/arm64/include/asm/uprobes.h<br/>new file mode 100644<br/>index 000000000000..8d004073d0e8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/uprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/uprobes.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2014-2016 Pratyush Anand &lt;panand@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ASM_UPROBES_H</div><div class='add'>+#define _ASM_UPROBES_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/debug-monitors.h&gt;</div><div class='add'>+#include &lt;asm/insn.h&gt;</div><div class='add'>+#include &lt;asm/probes.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX_UINSN_BYTES		AARCH64_INSN_SIZE</div><div class='add'>+</div><div class='add'>+#define UPROBE_SWBP_INSN	BRK64_OPCODE_UPROBES</div><div class='add'>+#define UPROBE_SWBP_INSN_SIZE	AARCH64_INSN_SIZE</div><div class='add'>+#define UPROBE_XOL_SLOT_BYTES	MAX_UINSN_BYTES</div><div class='add'>+</div><div class='add'>+typedef u32 uprobe_opcode_t;</div><div class='add'>+</div><div class='add'>+struct arch_uprobe_task {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct arch_uprobe {</div><div class='add'>+	union {</div><div class='add'>+		u8 insn[MAX_UINSN_BYTES];</div><div class='add'>+		u8 ixol[MAX_UINSN_BYTES];</div><div class='add'>+	};</div><div class='add'>+	struct arch_probe_insn api;</div><div class='add'>+	bool simulate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h<br/>index fea10736b11f..439f6b5d31f6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/virt.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/virt.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/virt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/virt.h</a></div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/sysreg.h&gt;</div><div class='add'>+#include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * __boot_cpu_mode records what mode CPUs were booted in.</div><div class='hunk'>@@ -80,6 +81,14 @@ static inline bool is_kernel_in_hyp_mode(void)</div><div class='ctx'> 	return read_sysreg(CurrentEL) == CurrentEL_EL2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool has_vhe(void)</div><div class='add'>+{</div><div class='add'>+	if (cpus_have_const_cap(ARM64_HAS_VIRT_HOST_EXTN))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ARM64_VHE</div><div class='ctx'> extern void verify_cpu_run_el(void);</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/arm64/include/asm/word-at-a-time.h b/arch/arm64/include/asm/word-at-a-time.h<br/>index 2b79b8a89457..b0d708ff7f4e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/word-at-a-time.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/word-at-a-time.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/word-at-a-time.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/word-at-a-time.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #ifndef __ASM_WORD_AT_A_TIME_H</div><div class='ctx'> #define __ASM_WORD_AT_A_TIME_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef __AARCH64EB__</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/include/asm/xen/hypercall.h b/arch/arm64/include/asm/xen/hypercall.h<br/>index 74b0c423ff5b..3522cbaed316 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/xen/hypercall.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/xen/hypercall.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/xen/hypercall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/xen/hypercall.h</a></div><div class='hunk'>@@ -1 +1 @@</div><div class='del'>-#include &lt;../../arm/include/asm/xen/hypercall.h&gt;</div><div class='add'>+#include &lt;xen/arm/hypercall.h&gt;</div><div class='head'>diff --git a/arch/arm64/include/asm/xen/hypervisor.h b/arch/arm64/include/asm/xen/hypervisor.h<br/>index f263da8e8769..d6e7709d0688 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/xen/hypervisor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/xen/hypervisor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/xen/hypervisor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/xen/hypervisor.h</a></div><div class='hunk'>@@ -1 +1 @@</div><div class='del'>-#include &lt;../../arm/include/asm/xen/hypervisor.h&gt;</div><div class='add'>+#include &lt;xen/arm/hypervisor.h&gt;</div><div class='head'>diff --git a/arch/arm64/include/asm/xen/interface.h b/arch/arm64/include/asm/xen/interface.h<br/>index 44457aebeed4..88c0d75da190 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/xen/interface.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/xen/interface.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/xen/interface.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/xen/interface.h</a></div><div class='hunk'>@@ -1 +1 @@</div><div class='del'>-#include &lt;../../arm/include/asm/xen/interface.h&gt;</div><div class='add'>+#include &lt;xen/arm/interface.h&gt;</div><div class='head'>diff --git a/arch/arm64/include/asm/xen/page-coherent.h b/arch/arm64/include/asm/xen/page-coherent.h<br/>index 2052102b4e02..b3ef061d8b74 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/xen/page-coherent.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/xen/page-coherent.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/xen/page-coherent.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/xen/page-coherent.h</a></div><div class='hunk'>@@ -1 +1 @@</div><div class='del'>-#include &lt;../../arm/include/asm/xen/page-coherent.h&gt;</div><div class='add'>+#include &lt;xen/arm/page-coherent.h&gt;</div><div class='head'>diff --git a/arch/arm64/include/asm/xen/page.h b/arch/arm64/include/asm/xen/page.h<br/>index bed87ec36780..31bbc803cecb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/asm/xen/page.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/asm/xen/page.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/asm/xen/page.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/asm/xen/page.h</a></div><div class='hunk'>@@ -1 +1 @@</div><div class='del'>-#include &lt;../../arm/include/asm/xen/page.h&gt;</div><div class='add'>+#include &lt;xen/arm/page.h&gt;</div><div class='head'>diff --git a/arch/arm64/include/uapi/asm/hwcap.h b/arch/arm64/include/uapi/asm/hwcap.h<br/>index a739287ef6a3..61c263cba272 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/uapi/asm/hwcap.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/uapi/asm/hwcap.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/uapi/asm/hwcap.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/uapi/asm/hwcap.h</a></div><div class='hunk'>@@ -30,5 +30,7 @@</div><div class='ctx'> #define HWCAP_ATOMICS		(1 &lt;&lt; 8)</div><div class='ctx'> #define HWCAP_FPHP		(1 &lt;&lt; 9)</div><div class='ctx'> #define HWCAP_ASIMDHP		(1 &lt;&lt; 10)</div><div class='add'>+#define HWCAP_CPUID		(1 &lt;&lt; 11)</div><div class='add'>+#define HWCAP_ASIMDRDM		(1 &lt;&lt; 12)</div><div class='ctx'> </div><div class='ctx'> #endif /* _UAPI__ASM_HWCAP_H */</div><div class='head'>diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h<br/>index 3051f86a9b5f..c2860358ae3e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/uapi/asm/kvm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/uapi/asm/kvm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/uapi/asm/kvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/uapi/asm/kvm.h</a></div><div class='hunk'>@@ -201,10 +201,23 @@ struct kvm_arch_memory_slot {</div><div class='ctx'> #define KVM_DEV_ARM_VGIC_GRP_CPU_REGS	2</div><div class='ctx'> #define   KVM_DEV_ARM_VGIC_CPUID_SHIFT	32</div><div class='ctx'> #define   KVM_DEV_ARM_VGIC_CPUID_MASK	(0xffULL &lt;&lt; KVM_DEV_ARM_VGIC_CPUID_SHIFT)</div><div class='add'>+#define   KVM_DEV_ARM_VGIC_V3_MPIDR_SHIFT 32</div><div class='add'>+#define   KVM_DEV_ARM_VGIC_V3_MPIDR_MASK \</div><div class='add'>+			(0xffffffffULL &lt;&lt; KVM_DEV_ARM_VGIC_V3_MPIDR_SHIFT)</div><div class='ctx'> #define   KVM_DEV_ARM_VGIC_OFFSET_SHIFT	0</div><div class='ctx'> #define   KVM_DEV_ARM_VGIC_OFFSET_MASK	(0xffffffffULL &lt;&lt; KVM_DEV_ARM_VGIC_OFFSET_SHIFT)</div><div class='add'>+#define   KVM_DEV_ARM_VGIC_SYSREG_INSTR_MASK (0xffff)</div><div class='ctx'> #define KVM_DEV_ARM_VGIC_GRP_NR_IRQS	3</div><div class='ctx'> #define KVM_DEV_ARM_VGIC_GRP_CTRL	4</div><div class='add'>+#define KVM_DEV_ARM_VGIC_GRP_REDIST_REGS 5</div><div class='add'>+#define KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS 6</div><div class='add'>+#define KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO  7</div><div class='add'>+#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT	10</div><div class='add'>+#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_MASK \</div><div class='add'>+			(0x3fffffULL &lt;&lt; KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT)</div><div class='add'>+#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INTID_MASK	0x3ff</div><div class='add'>+#define VGIC_LEVEL_INFO_LINE_LEVEL	0</div><div class='add'>+</div><div class='ctx'> #define   KVM_DEV_ARM_VGIC_CTRL_INIT	0</div><div class='ctx'> </div><div class='ctx'> /* Device Control API on vcpu fd */</div><div class='head'>diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h<br/>index b5c3933ed441..d1ff83dfe5de 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/include/uapi/asm/ptrace.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/include/uapi/asm/ptrace.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/include/uapi/asm/ptrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/include/uapi/asm/ptrace.h</a></div><div class='hunk'>@@ -77,6 +77,7 @@ struct user_fpsimd_state {</div><div class='ctx'> 	__uint128_t	vregs[32];</div><div class='ctx'> 	__u32		fpsr;</div><div class='ctx'> 	__u32		fpcr;</div><div class='add'>+	__u32		__reserved[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct user_hwdebug_state {</div><div class='head'>diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile<br/>index 7d66bbaafc0c..1606c6b2a280 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/Makefile</a></div><div class='hunk'>@@ -55,3 +55,7 @@ obj-y					+= $(arm64-obj-y) vdso/ probes/</div><div class='ctx'> obj-m					+= $(arm64-obj-m)</div><div class='ctx'> head-y					:= head.o</div><div class='ctx'> extra-y					+= $(head-y) vmlinux.lds</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_DEBUG_EFI),y)</div><div class='add'>+AFLAGS_head.o += -DVMLINUX_PATH="\"$(realpath $(objtree)/vmlinux)\""</div><div class='add'>+endif</div><div class='head'>diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c<br/>index 252a6d9c1da5..64d9cbd61678 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/acpi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/acpi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/acpi.c</a></div><div class='hunk'>@@ -132,14 +132,13 @@ static int __init acpi_fadt_sanity_check(void)</div><div class='ctx'> 	struct acpi_table_header *table;</div><div class='ctx'> 	struct acpi_table_fadt *fadt;</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	acpi_size tbl_size;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FADT is required on arm64; retrieve it to check its presence</div><div class='ctx'> 	 * and carry out revision and ACPI HW reduced compliancy tests</div><div class='ctx'> 	 */</div><div class='del'>-	status = acpi_get_table_with_size(ACPI_SIG_FADT, 0, &amp;table, &amp;tbl_size);</div><div class='add'>+	status = acpi_get_table(ACPI_SIG_FADT, 0, &amp;table);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		const char *msg = acpi_format_exception(status);</div><div class='ctx'> </div><div class='hunk'>@@ -170,10 +169,10 @@ static int __init acpi_fadt_sanity_check(void)</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	/*</div><div class='del'>-	 * acpi_get_table_with_size() creates FADT table mapping that</div><div class='add'>+	 * acpi_get_table() creates FADT table mapping that</div><div class='ctx'> 	 * should be released after parsing and before resuming boot</div><div class='ctx'> 	 */</div><div class='del'>-	early_acpi_os_unmap_memory(table, tbl_size);</div><div class='add'>+	acpi_put_table(table);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/acpi_parking_protocol.c b/arch/arm64/kernel/acpi_parking_protocol.c<br/>index a32b4011d711..1f5655cd9cc9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/acpi_parking_protocol.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/acpi_parking_protocol.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/acpi_parking_protocol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/acpi_parking_protocol.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'>  * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpu_ops.h&gt;</div><div class='hunk'>@@ -109,7 +110,7 @@ static int acpi_parking_protocol_cpu_boot(unsigned int cpu)</div><div class='ctx'> 	 * that read this address need to convert this address to the</div><div class='ctx'> 	 * Boot-Loader's endianness before jumping.</div><div class='ctx'> 	 */</div><div class='del'>-	writeq_relaxed(__pa(secondary_entry), &amp;mailbox-&gt;entry_point);</div><div class='add'>+	writeq_relaxed(__pa_symbol(secondary_entry), &amp;mailbox-&gt;entry_point);</div><div class='ctx'> 	writel_relaxed(cpu_entry-&gt;gic_cpu_id, &amp;mailbox-&gt;cpu_id);</div><div class='ctx'> </div><div class='ctx'> 	arch_send_wakeup_ipi_mask(cpumask_of(cpu));</div><div class='head'>diff --git a/arch/arm64/kernel/arm64ksyms.c b/arch/arm64/kernel/arm64ksyms.c<br/>index 78f368039c79..e9c4dc9e0ada 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/arm64ksyms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/arm64ksyms.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/arm64ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/arm64ksyms.c</a></div><div class='hunk'>@@ -73,5 +73,5 @@ NOKPROBE_SYMBOL(_mcount);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* arm-smccc */</div><div class='del'>-EXPORT_SYMBOL(arm_smccc_smc);</div><div class='del'>-EXPORT_SYMBOL(arm_smccc_hvc);</div><div class='add'>+EXPORT_SYMBOL(__arm_smccc_smc);</div><div class='add'>+EXPORT_SYMBOL(__arm_smccc_hvc);</div><div class='head'>diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c<br/>index b0988bb1bf64..657977e77ec8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/armv8_deprecated.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/armv8_deprecated.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/armv8_deprecated.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/armv8_deprecated.c</a></div><div class='hunk'>@@ -14,14 +14,13 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/alternative.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/insn.h&gt;</div><div class='del'>-#include &lt;asm/opcodes.h&gt;</div><div class='ctx'> #include &lt;asm/sysreg.h&gt;</div><div class='ctx'> #include &lt;asm/system_misc.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='hunk'>@@ -285,10 +284,10 @@ static void __init register_insn_emulation_sysctl(struct ctl_table *table)</div><div class='ctx'> #define __SWP_LL_SC_LOOPS	4</div><div class='ctx'> </div><div class='ctx'> #define __user_swpX_asm(data, addr, res, temp, temp2, B)	\</div><div class='add'>+do {								\</div><div class='add'>+	uaccess_enable();					\</div><div class='ctx'> 	__asm__ __volatile__(					\</div><div class='ctx'> 	"	mov		%w3, %w7\n"			\</div><div class='del'>-	ALTERNATIVE("nop", SET_PSTATE_PAN(0), ARM64_HAS_PAN,	\</div><div class='del'>-		    CONFIG_ARM64_PAN)				\</div><div class='ctx'> 	"0:	ldxr"B"		%w2, [%4]\n"			\</div><div class='ctx'> 	"1:	stxr"B"		%w0, %w1, [%4]\n"		\</div><div class='ctx'> 	"	cbz		%w0, 2f\n"			\</div><div class='hunk'>@@ -306,12 +305,12 @@ static void __init register_insn_emulation_sysctl(struct ctl_table *table)</div><div class='ctx'> 	"	.popsection"					\</div><div class='ctx'> 	_ASM_EXTABLE(0b, 4b)					\</div><div class='ctx'> 	_ASM_EXTABLE(1b, 4b)					\</div><div class='del'>-	ALTERNATIVE("nop", SET_PSTATE_PAN(1), ARM64_HAS_PAN,	\</div><div class='del'>-		CONFIG_ARM64_PAN)				\</div><div class='ctx'> 	: "=&amp;r" (res), "+r" (data), "=&amp;r" (temp), "=&amp;r" (temp2)	\</div><div class='ctx'> 	: "r" (addr), "i" (-EAGAIN), "i" (-EFAULT),		\</div><div class='ctx'> 	  "i" (__SWP_LL_SC_LOOPS)				\</div><div class='del'>-	: "memory")</div><div class='add'>+	: "memory");						\</div><div class='add'>+	uaccess_disable();					\</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='ctx'> #define __user_swp_asm(data, addr, res, temp, temp2) \</div><div class='ctx'> 	__user_swpX_asm(data, addr, res, temp, temp2, "")</div><div class='hunk'>@@ -352,6 +351,10 @@ static int emulate_swpX(unsigned int address, unsigned int *data,</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define ARM_OPCODE_CONDTEST_FAIL   0</div><div class='add'>+#define ARM_OPCODE_CONDTEST_PASS   1</div><div class='add'>+#define ARM_OPCODE_CONDTEST_UNCOND 2</div><div class='add'>+</div><div class='ctx'> #define	ARM_OPCODE_CONDITION_UNCOND	0xf</div><div class='ctx'> </div><div class='ctx'> static unsigned int __kprobes aarch32_check_condition(u32 opcode, u32 psr)</div><div class='hunk'>@@ -634,11 +637,11 @@ static int __init armv8_deprecated_init(void)</div><div class='ctx'> 		if(system_supports_mixed_endian_el0())</div><div class='ctx'> 			register_insn_emulation(&amp;setend_ops);</div><div class='ctx'> 		else</div><div class='del'>-			pr_info("setend instruction emulation is not supported on the system");</div><div class='add'>+			pr_info("setend instruction emulation is not supported on this system\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpuhp_setup_state_nocalls(CPUHP_AP_ARM64_ISNDEP_STARTING,</div><div class='del'>-				  "AP_ARM64_ISNDEP_STARTING",</div><div class='add'>+				  "arm64/isndep:starting",</div><div class='ctx'> 				  run_all_insn_set_hw_mode, NULL);</div><div class='ctx'> 	register_insn_emulation_sysctl(ctl_abi);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c<br/>index 4a2f0f0fef32..b3bb7ef97bc8 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/asm-offsets.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/asm-offsets.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -36,11 +36,13 @@ int main(void)</div><div class='ctx'> {</div><div class='ctx'>   DEFINE(TSK_ACTIVE_MM,		offsetof(struct task_struct, active_mm));</div><div class='ctx'>   BLANK();</div><div class='del'>-  DEFINE(TI_FLAGS,		offsetof(struct thread_info, flags));</div><div class='del'>-  DEFINE(TI_PREEMPT,		offsetof(struct thread_info, preempt_count));</div><div class='del'>-  DEFINE(TI_ADDR_LIMIT,		offsetof(struct thread_info, addr_limit));</div><div class='del'>-  DEFINE(TI_TASK,		offsetof(struct thread_info, task));</div><div class='del'>-  DEFINE(TI_CPU,		offsetof(struct thread_info, cpu));</div><div class='add'>+  DEFINE(TSK_TI_FLAGS,		offsetof(struct task_struct, thread_info.flags));</div><div class='add'>+  DEFINE(TSK_TI_PREEMPT,	offsetof(struct task_struct, thread_info.preempt_count));</div><div class='add'>+  DEFINE(TSK_TI_ADDR_LIMIT,	offsetof(struct task_struct, thread_info.addr_limit));</div><div class='add'>+#ifdef CONFIG_ARM64_SW_TTBR0_PAN</div><div class='add'>+  DEFINE(TSK_TI_TTBR0,		offsetof(struct task_struct, thread_info.ttbr0));</div><div class='add'>+#endif</div><div class='add'>+  DEFINE(TSK_STACK,		offsetof(struct task_struct, stack));</div><div class='ctx'>   BLANK();</div><div class='ctx'>   DEFINE(THREAD_CPU_CONTEXT,	offsetof(struct task_struct, thread.cpu_context));</div><div class='ctx'>   BLANK();</div><div class='hunk'>@@ -123,6 +125,7 @@ int main(void)</div><div class='ctx'>   DEFINE(TZ_DSTTIME,		offsetof(struct timezone, tz_dsttime));</div><div class='ctx'>   BLANK();</div><div class='ctx'>   DEFINE(CPU_BOOT_STACK,	offsetof(struct secondary_data, stack));</div><div class='add'>+  DEFINE(CPU_BOOT_TASK,		offsetof(struct secondary_data, task));</div><div class='ctx'>   BLANK();</div><div class='ctx'> #ifdef CONFIG_KVM_ARM_HOST</div><div class='ctx'>   DEFINE(VCPU_CONTEXT,		offsetof(struct kvm_vcpu, arch.ctxt));</div><div class='hunk'>@@ -140,8 +143,11 @@ int main(void)</div><div class='ctx'>   DEFINE(SLEEP_STACK_DATA_SYSTEM_REGS,	offsetof(struct sleep_stack_data, system_regs));</div><div class='ctx'>   DEFINE(SLEEP_STACK_DATA_CALLEE_REGS,	offsetof(struct sleep_stack_data, callee_saved_regs));</div><div class='ctx'> #endif</div><div class='del'>-  DEFINE(ARM_SMCCC_RES_X0_OFFS,	offsetof(struct arm_smccc_res, a0));</div><div class='del'>-  DEFINE(ARM_SMCCC_RES_X2_OFFS,	offsetof(struct arm_smccc_res, a2));</div><div class='add'>+  DEFINE(ARM_SMCCC_RES_X0_OFFS,		offsetof(struct arm_smccc_res, a0));</div><div class='add'>+  DEFINE(ARM_SMCCC_RES_X2_OFFS,		offsetof(struct arm_smccc_res, a2));</div><div class='add'>+  DEFINE(ARM_SMCCC_QUIRK_ID_OFFS,	offsetof(struct arm_smccc_quirk, id));</div><div class='add'>+  DEFINE(ARM_SMCCC_QUIRK_STATE_OFFS,	offsetof(struct arm_smccc_quirk, state));</div><div class='add'>+</div><div class='ctx'>   BLANK();</div><div class='ctx'>   DEFINE(HIBERN_PBE_ORIG,	offsetof(struct pbe, orig_address));</div><div class='ctx'>   DEFINE(HIBERN_PBE_ADDR,	offsetof(struct pbe, address));</div><div class='head'>diff --git a/arch/arm64/kernel/cacheinfo.c b/arch/arm64/kernel/cacheinfo.c<br/>index 9617301f76b5..3f2250fc391b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/cacheinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/cacheinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/cacheinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/cacheinfo.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ static void ci_leaf_init(struct cacheinfo *this_leaf,</div><div class='ctx'> </div><div class='ctx'> static int __init_cache_level(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int ctype, level, leaves;</div><div class='add'>+	unsigned int ctype, level, leaves, of_level;</div><div class='ctx'> 	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);</div><div class='ctx'> </div><div class='ctx'> 	for (level = 1, leaves = 0; level &lt;= MAX_CACHE_LEVEL; level++) {</div><div class='hunk'>@@ -97,6 +97,17 @@ static int __init_cache_level(unsigned int cpu)</div><div class='ctx'> 		leaves += (ctype == CACHE_TYPE_SEPARATE) ? 2 : 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	of_level = of_find_last_cache_level(cpu);</div><div class='add'>+	if (level &lt; of_level) {</div><div class='add'>+		/*</div><div class='add'>+		 * some external caches not specified in CLIDR_EL1</div><div class='add'>+		 * the information may be available in the device tree</div><div class='add'>+		 * only unified external caches are considered here</div><div class='add'>+		 */</div><div class='add'>+		leaves += (of_level - level);</div><div class='add'>+		level = of_level;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	this_cpu_ci-&gt;num_levels = level;</div><div class='ctx'> 	this_cpu_ci-&gt;num_leaves = leaves;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/arm64/kernel/cpu-reset.h b/arch/arm64/kernel/cpu-reset.h<br/>index d4e9ecb264f0..6c2b1b4f57c9 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/cpu-reset.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/cpu-reset.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/cpu-reset.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/cpu-reset.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@ static inline void __noreturn cpu_soft_restart(unsigned long el2_switch,</div><div class='ctx'> </div><div class='ctx'> 	el2_switch = el2_switch &amp;&amp; !is_kernel_in_hyp_mode() &amp;&amp;</div><div class='ctx'> 		is_hyp_mode_available();</div><div class='del'>-	restart = (void *)virt_to_phys(__cpu_soft_restart);</div><div class='add'>+	restart = (void *)__pa_symbol(__cpu_soft_restart);</div><div class='ctx'> </div><div class='ctx'> 	cpu_install_idmap();</div><div class='ctx'> 	restart(el2_switch, entry, arg0, arg1, arg2);</div><div class='head'>diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c<br/>index b75e917aac46..f6cc67e7626e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/cpu_errata.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/cpu_errata.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/cpu_errata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/cpu_errata.c</a></div><div class='hunk'>@@ -79,8 +79,9 @@ const struct arm64_cpu_capabilities arm64_errata[] = {</div><div class='ctx'> 	/* Cortex-A57 r0p0 - r1p2 */</div><div class='ctx'> 		.desc = "ARM erratum 832075",</div><div class='ctx'> 		.capability = ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE,</div><div class='del'>-		MIDR_RANGE(MIDR_CORTEX_A57, 0x00,</div><div class='del'>-			   (1 &lt;&lt; MIDR_VARIANT_SHIFT) | 2),</div><div class='add'>+		MIDR_RANGE(MIDR_CORTEX_A57,</div><div class='add'>+			   MIDR_CPU_VAR_REV(0, 0),</div><div class='add'>+			   MIDR_CPU_VAR_REV(1, 2)),</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ARM64_ERRATUM_834220</div><div class='hunk'>@@ -88,8 +89,9 @@ const struct arm64_cpu_capabilities arm64_errata[] = {</div><div class='ctx'> 	/* Cortex-A57 r0p0 - r1p2 */</div><div class='ctx'> 		.desc = "ARM erratum 834220",</div><div class='ctx'> 		.capability = ARM64_WORKAROUND_834220,</div><div class='del'>-		MIDR_RANGE(MIDR_CORTEX_A57, 0x00,</div><div class='del'>-			   (1 &lt;&lt; MIDR_VARIANT_SHIFT) | 2),</div><div class='add'>+		MIDR_RANGE(MIDR_CORTEX_A57,</div><div class='add'>+			   MIDR_CPU_VAR_REV(0, 0),</div><div class='add'>+			   MIDR_CPU_VAR_REV(1, 2)),</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ARM64_ERRATUM_845719</div><div class='hunk'>@@ -113,8 +115,9 @@ const struct arm64_cpu_capabilities arm64_errata[] = {</div><div class='ctx'> 	/* Cavium ThunderX, T88 pass 1.x - 2.1 */</div><div class='ctx'> 		.desc = "Cavium erratum 27456",</div><div class='ctx'> 		.capability = ARM64_WORKAROUND_CAVIUM_27456,</div><div class='del'>-		MIDR_RANGE(MIDR_THUNDERX, 0x00,</div><div class='del'>-			   (1 &lt;&lt; MIDR_VARIANT_SHIFT) | 1),</div><div class='add'>+		MIDR_RANGE(MIDR_THUNDERX,</div><div class='add'>+			   MIDR_CPU_VAR_REV(0, 0),</div><div class='add'>+			   MIDR_CPU_VAR_REV(1, 1)),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 	/* Cavium ThunderX, T81 pass 1.0 */</div><div class='hunk'>@@ -130,6 +133,24 @@ const struct arm64_cpu_capabilities arm64_errata[] = {</div><div class='ctx'> 		.def_scope = SCOPE_LOCAL_CPU,</div><div class='ctx'> 		.enable = cpu_enable_trap_ctr_access,</div><div class='ctx'> 	},</div><div class='add'>+#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003</div><div class='add'>+	{</div><div class='add'>+		.desc = "Qualcomm Technologies Falkor erratum 1003",</div><div class='add'>+		.capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003,</div><div class='add'>+		MIDR_RANGE(MIDR_QCOM_FALKOR_V1,</div><div class='add'>+			   MIDR_CPU_VAR_REV(0, 0),</div><div class='add'>+			   MIDR_CPU_VAR_REV(0, 0)),</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1009</div><div class='add'>+	{</div><div class='add'>+		.desc = "Qualcomm Technologies Falkor erratum 1009",</div><div class='add'>+		.capability = ARM64_WORKAROUND_REPEAT_TLBI,</div><div class='add'>+		MIDR_RANGE(MIDR_QCOM_FALKOR_V1,</div><div class='add'>+			   MIDR_CPU_VAR_REV(0, 0),</div><div class='add'>+			   MIDR_CPU_VAR_REV(0, 0)),</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='ctx'> 	{</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c<br/>index c02504ea304b..abda8e861865 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/cpufeature.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/cpufeature.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/cpufeature.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/cpufeature.c</a></div><div class='hunk'>@@ -23,12 +23,14 @@</div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='ctx'> #include &lt;linux/stop_machine.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_ops.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/sysreg.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/virt.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long elf_hwcap __read_mostly;</div><div class='hunk'>@@ -47,13 +49,15 @@ unsigned int compat_elf_hwcap2 __read_mostly;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> DECLARE_BITMAP(cpu_hwcaps, ARM64_NCAPS);</div><div class='add'>+EXPORT_SYMBOL(cpu_hwcaps);</div><div class='ctx'> </div><div class='ctx'> DEFINE_STATIC_KEY_ARRAY_FALSE(cpu_hwcap_keys, ARM64_NCAPS);</div><div class='ctx'> EXPORT_SYMBOL(cpu_hwcap_keys);</div><div class='ctx'> </div><div class='del'>-#define __ARM64_FTR_BITS(SIGNED, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL) \</div><div class='add'>+#define __ARM64_FTR_BITS(SIGNED, VISIBLE, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL) \</div><div class='ctx'> 	{						\</div><div class='ctx'> 		.sign = SIGNED,				\</div><div class='add'>+		.visible = VISIBLE,			\</div><div class='ctx'> 		.strict = STRICT,			\</div><div class='ctx'> 		.type = TYPE,				\</div><div class='ctx'> 		.shift = SHIFT,				\</div><div class='hunk'>@@ -62,12 +66,12 @@ EXPORT_SYMBOL(cpu_hwcap_keys);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /* Define a feature with unsigned values */</div><div class='del'>-#define ARM64_FTR_BITS(STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL) \</div><div class='del'>-	__ARM64_FTR_BITS(FTR_UNSIGNED, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL)</div><div class='add'>+#define ARM64_FTR_BITS(VISIBLE, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL) \</div><div class='add'>+	__ARM64_FTR_BITS(FTR_UNSIGNED, VISIBLE, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL)</div><div class='ctx'> </div><div class='ctx'> /* Define a feature with a signed value */</div><div class='del'>-#define S_ARM64_FTR_BITS(STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL) \</div><div class='del'>-	__ARM64_FTR_BITS(FTR_SIGNED, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL)</div><div class='add'>+#define S_ARM64_FTR_BITS(VISIBLE, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL) \</div><div class='add'>+	__ARM64_FTR_BITS(FTR_SIGNED, VISIBLE, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL)</div><div class='ctx'> </div><div class='ctx'> #define ARM64_FTR_END					\</div><div class='ctx'> 	{						\</div><div class='hunk'>@@ -79,85 +83,80 @@ static bool __maybe_unused</div><div class='ctx'> cpufeature_pan_not_uao(const struct arm64_cpu_capabilities *entry, int __unused);</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * NOTE: Any changes to the visibility of features should be kept in</div><div class='add'>+ * sync with the documentation of the CPU feature register ABI.</div><div class='add'>+ */</div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_aa64isar0[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 32, 32, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64ISAR0_RDM_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 24, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_ATOMICS_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_CRC32_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_SHA2_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_SHA1_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_AES_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 0, 4, 0),	/* RAZ */</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, ID_AA64ISAR0_RDM_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_ATOMICS_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_CRC32_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_SHA2_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_SHA1_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_AES_SHIFT, 4, 0),</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_aa64pfr0[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 32, 32, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 28, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64PFR0_GIC_SHIFT, 4, 0),</div><div class='del'>-	S_ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_ASIMD_SHIFT, 4, ID_AA64PFR0_ASIMD_NI),</div><div class='del'>-	S_ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_FP_SHIFT, 4, ID_AA64PFR0_FP_NI),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64PFR0_GIC_SHIFT, 4, 0),</div><div class='add'>+	S_ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_ASIMD_SHIFT, 4, ID_AA64PFR0_ASIMD_NI),</div><div class='add'>+	S_ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_FP_SHIFT, 4, ID_AA64PFR0_FP_NI),</div><div class='ctx'> 	/* Linux doesn't care about the EL3 */</div><div class='del'>-	ARM64_FTR_BITS(FTR_NONSTRICT, FTR_EXACT, ID_AA64PFR0_EL3_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64PFR0_EL2_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64PFR0_EL1_SHIFT, 4, ID_AA64PFR0_EL1_64BIT_ONLY),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64PFR0_EL0_SHIFT, 4, ID_AA64PFR0_EL0_64BIT_ONLY),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64PFR0_EL3_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64PFR0_EL2_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64PFR0_EL1_SHIFT, 4, ID_AA64PFR0_EL1_64BIT_ONLY),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64PFR0_EL0_SHIFT, 4, ID_AA64PFR0_EL0_64BIT_ONLY),</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 32, 32, 0),</div><div class='del'>-	S_ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN4_SHIFT, 4, ID_AA64MMFR0_TGRAN4_NI),</div><div class='del'>-	S_ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN64_SHIFT, 4, ID_AA64MMFR0_TGRAN64_NI),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN16_SHIFT, 4, ID_AA64MMFR0_TGRAN16_NI),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_BIGENDEL0_SHIFT, 4, 0),</div><div class='add'>+	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN4_SHIFT, 4, ID_AA64MMFR0_TGRAN4_NI),</div><div class='add'>+	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN64_SHIFT, 4, ID_AA64MMFR0_TGRAN64_NI),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN16_SHIFT, 4, ID_AA64MMFR0_TGRAN16_NI),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_BIGENDEL0_SHIFT, 4, 0),</div><div class='ctx'> 	/* Linux shouldn't care about secure memory */</div><div class='del'>-	ARM64_FTR_BITS(FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_SNSMEM_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_BIGENDEL_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_ASID_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_SNSMEM_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_BIGENDEL_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_ASID_SHIFT, 4, 0),</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Differing PARange is fine as long as all peripherals and memory are mapped</div><div class='ctx'> 	 * within the minimum PARange of all CPUs</div><div class='ctx'> 	 */</div><div class='del'>-	ARM64_FTR_BITS(FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_PARANGE_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_PARANGE_SHIFT, 4, 0),</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_aa64mmfr1[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 32, 32, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_PAN_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR1_LOR_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR1_HPD_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR1_VHE_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR1_VMIDBITS_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR1_HADBS_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_PAN_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR1_LOR_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR1_HPD_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR1_VHE_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR1_VMIDBITS_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR1_HADBS_SHIFT, 4, 0),</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_LVA_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_IESB_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_LSM_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_UAO_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_CNP_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_LVA_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_IESB_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_LSM_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_UAO_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64MMFR2_CNP_SHIFT, 4, 0),</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_ctr[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 31, 1, 1),	/* RAO */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 28, 3, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_HIGHER_SAFE, 24, 4, 0),	/* CWG */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 20, 4, 0),	/* ERG */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 16, 4, 1),	/* DminLine */</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, 31, 1, 1),	/* RAO */</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_HIGHER_SAFE, 24, 4, 0),	/* CWG */</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 20, 4, 0),	/* ERG */</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 16, 4, 1),	/* DminLine */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Linux can handle differing I-cache policies. Userspace JITs will</div><div class='ctx'> 	 * make use of *minLine.</div><div class='ctx'> 	 * If we have differing I-cache policies, report it as the weakest - AIVIVT.</div><div class='ctx'> 	 */</div><div class='del'>-	ARM64_FTR_BITS(FTR_NONSTRICT, FTR_EXACT, 14, 2, ICACHE_POLICY_AIVIVT),	/* L1Ip */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 4, 10, 0),	/* RAZ */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 0, 4, 0),	/* IminLine */</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_EXACT, 14, 2, ICACHE_POLICY_AIVIVT),	/* L1Ip */</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 0, 4, 0),	/* IminLine */</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -167,79 +166,78 @@ struct arm64_ftr_reg arm64_ftr_reg_ctrel0 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_mmfr0[] = {</div><div class='del'>-	S_ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 28, 4, 0xf),	/* InnerShr */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 24, 4, 0),	/* FCSE */</div><div class='del'>-	ARM64_FTR_BITS(FTR_NONSTRICT, FTR_LOWER_SAFE, 20, 4, 0),	/* AuxReg */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 16, 4, 0),	/* TCM */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 12, 4, 0),	/* ShareLvl */</div><div class='del'>-	S_ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 8, 4, 0xf),	/* OuterShr */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 4, 4, 0),	/* PMSA */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 0, 4, 0),	/* VMSA */</div><div class='add'>+	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 28, 4, 0xf),	/* InnerShr */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 24, 4, 0),	/* FCSE */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, 20, 4, 0),	/* AuxReg */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 16, 4, 0),	/* TCM */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 12, 4, 0),	/* ShareLvl */</div><div class='add'>+	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 8, 4, 0xf),	/* OuterShr */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 4, 4, 0),	/* PMSA */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 0, 4, 0),	/* VMSA */</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_aa64dfr0[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 32, 32, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_CTX_CMPS_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_WRPS_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_BRPS_SHIFT, 4, 0),</div><div class='del'>-	S_ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64DFR0_PMUVER_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64DFR0_TRACEVER_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64DFR0_DEBUGVER_SHIFT, 4, 0x6),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 36, 28, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64DFR0_PMSVER_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_CTX_CMPS_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_WRPS_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_BRPS_SHIFT, 4, 0),</div><div class='add'>+	/*</div><div class='add'>+	 * We can instantiate multiple PMU instances with different levels</div><div class='add'>+	 * of support.</div><div class='add'>+	 */</div><div class='add'>+	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64DFR0_PMUVER_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64DFR0_TRACEVER_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64DFR0_DEBUGVER_SHIFT, 4, 0x6),</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_mvfr2[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 8, 24, 0),	/* RAZ */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 4, 4, 0),		/* FPMisc */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 0, 4, 0),		/* SIMDMisc */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 4, 4, 0),		/* FPMisc */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 0, 4, 0),		/* SIMDMisc */</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_dczid[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 5, 27, 0),	/* RAZ */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 4, 1, 1),		/* DZP */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 0, 4, 0),	/* BS */</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, 4, 1, 1),		/* DZP */</div><div class='add'>+	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 0, 4, 0),	/* BS */</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_isar5[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_ISAR5_RDM_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 20, 4, 0),	/* RAZ */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_ISAR5_CRC32_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_ISAR5_SHA2_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_ISAR5_SHA1_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_ISAR5_AES_SHIFT, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_ISAR5_SEVL_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_ISAR5_RDM_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_ISAR5_CRC32_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_ISAR5_SHA2_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_ISAR5_SHA1_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_ISAR5_AES_SHIFT, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_ISAR5_SEVL_SHIFT, 4, 0),</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_mmfr4[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 8, 24, 0),	/* RAZ */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 4, 4, 0),		/* ac2 */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 0, 4, 0),		/* RAZ */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 4, 4, 0),		/* ac2 */</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_pfr0[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 16, 16, 0),	/* RAZ */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 12, 4, 0),	/* State3 */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 8, 4, 0),		/* State2 */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 4, 4, 0),		/* State1 */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 0, 4, 0),		/* State0 */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 12, 4, 0),	/* State3 */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 8, 4, 0),		/* State2 */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 4, 4, 0),		/* State1 */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 0, 4, 0),		/* State0 */</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct arm64_ftr_bits ftr_id_dfr0[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 28, 4, 0),</div><div class='del'>-	S_ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 24, 4, 0xf),	/* PerfMon */</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 20, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 16, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 12, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 8, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 4, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 0, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 28, 4, 0),</div><div class='add'>+	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 24, 4, 0xf),	/* PerfMon */</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 20, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 16, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 12, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 8, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 4, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 0, 4, 0),</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -250,29 +248,24 @@ static const struct arm64_ftr_bits ftr_id_dfr0[] = {</div><div class='ctx'>  * id_isar[0-4], id_mmfr[1-3], id_pfr1, mvfr[0-1]</div><div class='ctx'>  */</div><div class='ctx'> static const struct arm64_ftr_bits ftr_generic_32bits[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 28, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 24, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 20, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 16, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 12, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 8, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 4, 4, 0),</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 0, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 28, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 24, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 20, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 16, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 12, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 8, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 4, 4, 0),</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 0, 4, 0),</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct arm64_ftr_bits ftr_generic[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 0, 64, 0),</div><div class='add'>+/* Table for a single 32bit feature value */</div><div class='add'>+static const struct arm64_ftr_bits ftr_single32[] = {</div><div class='add'>+	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, 0, 32, 0),</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct arm64_ftr_bits ftr_generic32[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 0, 32, 0),</div><div class='del'>-	ARM64_FTR_END,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct arm64_ftr_bits ftr_aa64raz[] = {</div><div class='del'>-	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 0, 64, 0),</div><div class='add'>+static const struct arm64_ftr_bits ftr_raz[] = {</div><div class='ctx'> 	ARM64_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -313,15 +306,15 @@ static const struct __ftr_reg_entry {</div><div class='ctx'> </div><div class='ctx'> 	/* Op1 = 0, CRn = 0, CRm = 4 */</div><div class='ctx'> 	ARM64_FTR_REG(SYS_ID_AA64PFR0_EL1, ftr_id_aa64pfr0),</div><div class='del'>-	ARM64_FTR_REG(SYS_ID_AA64PFR1_EL1, ftr_aa64raz),</div><div class='add'>+	ARM64_FTR_REG(SYS_ID_AA64PFR1_EL1, ftr_raz),</div><div class='ctx'> </div><div class='ctx'> 	/* Op1 = 0, CRn = 0, CRm = 5 */</div><div class='ctx'> 	ARM64_FTR_REG(SYS_ID_AA64DFR0_EL1, ftr_id_aa64dfr0),</div><div class='del'>-	ARM64_FTR_REG(SYS_ID_AA64DFR1_EL1, ftr_generic),</div><div class='add'>+	ARM64_FTR_REG(SYS_ID_AA64DFR1_EL1, ftr_raz),</div><div class='ctx'> </div><div class='ctx'> 	/* Op1 = 0, CRn = 0, CRm = 6 */</div><div class='ctx'> 	ARM64_FTR_REG(SYS_ID_AA64ISAR0_EL1, ftr_id_aa64isar0),</div><div class='del'>-	ARM64_FTR_REG(SYS_ID_AA64ISAR1_EL1, ftr_aa64raz),</div><div class='add'>+	ARM64_FTR_REG(SYS_ID_AA64ISAR1_EL1, ftr_raz),</div><div class='ctx'> </div><div class='ctx'> 	/* Op1 = 0, CRn = 0, CRm = 7 */</div><div class='ctx'> 	ARM64_FTR_REG(SYS_ID_AA64MMFR0_EL1, ftr_id_aa64mmfr0),</div><div class='hunk'>@@ -333,7 +326,7 @@ static const struct __ftr_reg_entry {</div><div class='ctx'> 	ARM64_FTR_REG(SYS_DCZID_EL0, ftr_dczid),</div><div class='ctx'> </div><div class='ctx'> 	/* Op1 = 3, CRn = 14, CRm = 0 */</div><div class='del'>-	ARM64_FTR_REG(SYS_CNTFRQ_EL0, ftr_generic32),</div><div class='add'>+	ARM64_FTR_REG(SYS_CNTFRQ_EL0, ftr_single32),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int search_cmp_ftr_reg(const void *id, const void *regp)</div><div class='hunk'>@@ -409,25 +402,43 @@ static void __init sort_ftr_regs(void)</div><div class='ctx'> /*</div><div class='ctx'>  * Initialise the CPU feature register from Boot CPU values.</div><div class='ctx'>  * Also initiliases the strict_mask for the register.</div><div class='add'>+ * Any bits that are not covered by an arm64_ftr_bits entry are considered</div><div class='add'>+ * RES0 for the system-wide value, and must strictly match.</div><div class='ctx'>  */</div><div class='ctx'> static void __init init_cpu_ftr_reg(u32 sys_reg, u64 new)</div><div class='ctx'> {</div><div class='ctx'> 	u64 val = 0;</div><div class='ctx'> 	u64 strict_mask = ~0x0ULL;</div><div class='add'>+	u64 user_mask = 0;</div><div class='add'>+	u64 valid_mask = 0;</div><div class='add'>+</div><div class='ctx'> 	const struct arm64_ftr_bits *ftrp;</div><div class='ctx'> 	struct arm64_ftr_reg *reg = get_arm64_ftr_reg(sys_reg);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!reg);</div><div class='ctx'> </div><div class='ctx'> 	for (ftrp  = reg-&gt;ftr_bits; ftrp-&gt;width; ftrp++) {</div><div class='add'>+		u64 ftr_mask = arm64_ftr_mask(ftrp);</div><div class='ctx'> 		s64 ftr_new = arm64_ftr_value(ftrp, new);</div><div class='ctx'> </div><div class='ctx'> 		val = arm64_ftr_set_value(ftrp, val, ftr_new);</div><div class='add'>+</div><div class='add'>+		valid_mask |= ftr_mask;</div><div class='ctx'> 		if (!ftrp-&gt;strict)</div><div class='del'>-			strict_mask &amp;= ~arm64_ftr_mask(ftrp);</div><div class='add'>+			strict_mask &amp;= ~ftr_mask;</div><div class='add'>+		if (ftrp-&gt;visible)</div><div class='add'>+			user_mask |= ftr_mask;</div><div class='add'>+		else</div><div class='add'>+			reg-&gt;user_val = arm64_ftr_set_value(ftrp,</div><div class='add'>+							    reg-&gt;user_val,</div><div class='add'>+							    ftrp-&gt;safe_val);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	val &amp;= valid_mask;</div><div class='add'>+</div><div class='ctx'> 	reg-&gt;sys_val = val;</div><div class='ctx'> 	reg-&gt;strict_mask = strict_mask;</div><div class='add'>+	reg-&gt;user_mask = user_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init init_cpu_features(struct cpuinfo_arm64 *info)</div><div class='hunk'>@@ -634,6 +645,9 @@ u64 read_system_reg(u32 id)</div><div class='ctx'> 	return regp-&gt;sys_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define read_sysreg_case(r)	\</div><div class='add'>+	case r:		return read_sysreg_s(r)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * __raw_read_system_reg() - Used by a STARTING cpu before cpuinfo is populated.</div><div class='ctx'>  * Read the system register on the current CPU</div><div class='hunk'>@@ -641,36 +655,37 @@ u64 read_system_reg(u32 id)</div><div class='ctx'> static u64 __raw_read_system_reg(u32 sys_id)</div><div class='ctx'> {</div><div class='ctx'> 	switch (sys_id) {</div><div class='del'>-	case SYS_ID_PFR0_EL1:		return read_cpuid(ID_PFR0_EL1);</div><div class='del'>-	case SYS_ID_PFR1_EL1:		return read_cpuid(ID_PFR1_EL1);</div><div class='del'>-	case SYS_ID_DFR0_EL1:		return read_cpuid(ID_DFR0_EL1);</div><div class='del'>-	case SYS_ID_MMFR0_EL1:		return read_cpuid(ID_MMFR0_EL1);</div><div class='del'>-	case SYS_ID_MMFR1_EL1:		return read_cpuid(ID_MMFR1_EL1);</div><div class='del'>-	case SYS_ID_MMFR2_EL1:		return read_cpuid(ID_MMFR2_EL1);</div><div class='del'>-	case SYS_ID_MMFR3_EL1:		return read_cpuid(ID_MMFR3_EL1);</div><div class='del'>-	case SYS_ID_ISAR0_EL1:		return read_cpuid(ID_ISAR0_EL1);</div><div class='del'>-	case SYS_ID_ISAR1_EL1:		return read_cpuid(ID_ISAR1_EL1);</div><div class='del'>-	case SYS_ID_ISAR2_EL1:		return read_cpuid(ID_ISAR2_EL1);</div><div class='del'>-	case SYS_ID_ISAR3_EL1:		return read_cpuid(ID_ISAR3_EL1);</div><div class='del'>-	case SYS_ID_ISAR4_EL1:		return read_cpuid(ID_ISAR4_EL1);</div><div class='del'>-	case SYS_ID_ISAR5_EL1:		return read_cpuid(ID_ISAR4_EL1);</div><div class='del'>-	case SYS_MVFR0_EL1:		return read_cpuid(MVFR0_EL1);</div><div class='del'>-	case SYS_MVFR1_EL1:		return read_cpuid(MVFR1_EL1);</div><div class='del'>-	case SYS_MVFR2_EL1:		return read_cpuid(MVFR2_EL1);</div><div class='del'>-</div><div class='del'>-	case SYS_ID_AA64PFR0_EL1:	return read_cpuid(ID_AA64PFR0_EL1);</div><div class='del'>-	case SYS_ID_AA64PFR1_EL1:	return read_cpuid(ID_AA64PFR0_EL1);</div><div class='del'>-	case SYS_ID_AA64DFR0_EL1:	return read_cpuid(ID_AA64DFR0_EL1);</div><div class='del'>-	case SYS_ID_AA64DFR1_EL1:	return read_cpuid(ID_AA64DFR0_EL1);</div><div class='del'>-	case SYS_ID_AA64MMFR0_EL1:	return read_cpuid(ID_AA64MMFR0_EL1);</div><div class='del'>-	case SYS_ID_AA64MMFR1_EL1:	return read_cpuid(ID_AA64MMFR1_EL1);</div><div class='del'>-	case SYS_ID_AA64MMFR2_EL1:	return read_cpuid(ID_AA64MMFR2_EL1);</div><div class='del'>-	case SYS_ID_AA64ISAR0_EL1:	return read_cpuid(ID_AA64ISAR0_EL1);</div><div class='del'>-	case SYS_ID_AA64ISAR1_EL1:	return read_cpuid(ID_AA64ISAR1_EL1);</div><div class='del'>-</div><div class='del'>-	case SYS_CNTFRQ_EL0:		return read_cpuid(CNTFRQ_EL0);</div><div class='del'>-	case SYS_CTR_EL0:		return read_cpuid(CTR_EL0);</div><div class='del'>-	case SYS_DCZID_EL0:		return read_cpuid(DCZID_EL0);</div><div class='add'>+	read_sysreg_case(SYS_ID_PFR0_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_PFR1_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_DFR0_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_MMFR0_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_MMFR1_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_MMFR2_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_MMFR3_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_ISAR0_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_ISAR1_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_ISAR2_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_ISAR3_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_ISAR4_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_ISAR5_EL1);</div><div class='add'>+	read_sysreg_case(SYS_MVFR0_EL1);</div><div class='add'>+	read_sysreg_case(SYS_MVFR1_EL1);</div><div class='add'>+	read_sysreg_case(SYS_MVFR2_EL1);</div><div class='add'>+</div><div class='add'>+	read_sysreg_case(SYS_ID_AA64PFR0_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_AA64PFR1_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_AA64DFR0_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_AA64DFR1_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_AA64MMFR0_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_AA64MMFR1_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_AA64MMFR2_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_AA64ISAR0_EL1);</div><div class='add'>+	read_sysreg_case(SYS_ID_AA64ISAR1_EL1);</div><div class='add'>+</div><div class='add'>+	read_sysreg_case(SYS_CNTFRQ_EL0);</div><div class='add'>+	read_sysreg_case(SYS_CTR_EL0);</div><div class='add'>+	read_sysreg_case(SYS_DCZID_EL0);</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUG();</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -719,13 +734,11 @@ static bool has_useable_gicv3_cpuif(const struct arm64_cpu_capabilities *entry,</div><div class='ctx'> static bool has_no_hw_prefetch(const struct arm64_cpu_capabilities *entry, int __unused)</div><div class='ctx'> {</div><div class='ctx'> 	u32 midr = read_cpuid_id();</div><div class='del'>-	u32 rv_min, rv_max;</div><div class='ctx'> </div><div class='ctx'> 	/* Cavium ThunderX pass 1.x and 2.x */</div><div class='del'>-	rv_min = 0;</div><div class='del'>-	rv_max = (1 &lt;&lt; MIDR_VARIANT_SHIFT) | MIDR_REVISION_MASK;</div><div class='del'>-</div><div class='del'>-	return MIDR_IS_CPU_MODEL_RANGE(midr, MIDR_THUNDERX, rv_min, rv_max);</div><div class='add'>+	return MIDR_IS_CPU_MODEL_RANGE(midr, MIDR_THUNDERX,</div><div class='add'>+		MIDR_CPU_VAR_REV(0, 0),</div><div class='add'>+		MIDR_CPU_VAR_REV(1, MIDR_REVISION_MASK));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool runs_at_el2(const struct arm64_cpu_capabilities *entry, int __unused)</div><div class='hunk'>@@ -736,7 +749,7 @@ static bool runs_at_el2(const struct arm64_cpu_capabilities *entry, int __unused</div><div class='ctx'> static bool hyp_offset_low(const struct arm64_cpu_capabilities *entry,</div><div class='ctx'> 			   int __unused)</div><div class='ctx'> {</div><div class='del'>-	phys_addr_t idmap_addr = virt_to_phys(__hyp_idmap_text_start);</div><div class='add'>+	phys_addr_t idmap_addr = __pa_symbol(__hyp_idmap_text_start);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Activate the lower HYP offset only if:</div><div class='hunk'>@@ -746,6 +759,14 @@ static bool hyp_offset_low(const struct arm64_cpu_capabilities *entry,</div><div class='ctx'> 	return idmap_addr &gt; GENMASK(VA_BITS - 2, 0) &amp;&amp; !is_kernel_in_hyp_mode();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool has_no_fpsimd(const struct arm64_cpu_capabilities *entry, int __unused)</div><div class='add'>+{</div><div class='add'>+	u64 pfr0 = read_system_reg(SYS_ID_AA64PFR0_EL1);</div><div class='add'>+</div><div class='add'>+	return cpuid_feature_extract_signed_field(pfr0,</div><div class='add'>+					ID_AA64PFR0_FP_SHIFT) &lt; 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct arm64_cpu_capabilities arm64_features[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.desc = "GIC system register CPU interface",</div><div class='hunk'>@@ -797,7 +818,10 @@ static const struct arm64_cpu_capabilities arm64_features[] = {</div><div class='ctx'> 		.sys_reg = SYS_ID_AA64MMFR2_EL1,</div><div class='ctx'> 		.field_pos = ID_AA64MMFR2_UAO_SHIFT,</div><div class='ctx'> 		.min_field_value = 1,</div><div class='del'>-		.enable = cpu_enable_uao,</div><div class='add'>+		/*</div><div class='add'>+		 * We rely on stop_machine() calling uao_thread_switch() to set</div><div class='add'>+		 * UAO immediately after patching.</div><div class='add'>+		 */</div><div class='ctx'> 	},</div><div class='ctx'> #endif /* CONFIG_ARM64_UAO */</div><div class='ctx'> #ifdef CONFIG_ARM64_PAN</div><div class='hunk'>@@ -829,6 +853,13 @@ static const struct arm64_cpu_capabilities arm64_features[] = {</div><div class='ctx'> 		.def_scope = SCOPE_SYSTEM,</div><div class='ctx'> 		.matches = hyp_offset_low,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		/* FP/SIMD is not implemented */</div><div class='add'>+		.capability = ARM64_HAS_NO_FPSIMD,</div><div class='add'>+		.def_scope = SCOPE_SYSTEM,</div><div class='add'>+		.min_field_value = 0,</div><div class='add'>+		.matches = has_no_fpsimd,</div><div class='add'>+	},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -852,6 +883,7 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = {</div><div class='ctx'> 	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA2_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SHA2),</div><div class='ctx'> 	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_CRC32_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_CRC32),</div><div class='ctx'> 	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_ATOMICS_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, HWCAP_ATOMICS),</div><div class='add'>+	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_RDM_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_ASIMDRDM),</div><div class='ctx'> 	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_FP_SHIFT, FTR_SIGNED, 0, CAP_HWCAP, HWCAP_FP),</div><div class='ctx'> 	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_FP_SHIFT, FTR_SIGNED, 1, CAP_HWCAP, HWCAP_FPHP),</div><div class='ctx'> 	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_ASIMD_SHIFT, FTR_SIGNED, 0, CAP_HWCAP, HWCAP_ASIMD),</div><div class='hunk'>@@ -917,6 +949,8 @@ static bool cpus_have_elf_hwcap(const struct arm64_cpu_capabilities *cap)</div><div class='ctx'> </div><div class='ctx'> static void __init setup_elf_hwcaps(const struct arm64_cpu_capabilities *hwcaps)</div><div class='ctx'> {</div><div class='add'>+	/* We support emulation of accesses to CPU ID feature registers */</div><div class='add'>+	elf_hwcap |= HWCAP_CPUID;</div><div class='ctx'> 	for (; hwcaps-&gt;matches; hwcaps++)</div><div class='ctx'> 		if (hwcaps-&gt;matches(hwcaps, hwcaps-&gt;def_scope))</div><div class='ctx'> 			cap_set_elf_hwcap(hwcaps);</div><div class='hunk'>@@ -1102,5 +1136,103 @@ void __init setup_cpu_features(void)</div><div class='ctx'> static bool __maybe_unused</div><div class='ctx'> cpufeature_pan_not_uao(const struct arm64_cpu_capabilities *entry, int __unused)</div><div class='ctx'> {</div><div class='del'>-	return (cpus_have_cap(ARM64_HAS_PAN) &amp;&amp; !cpus_have_cap(ARM64_HAS_UAO));</div><div class='add'>+	return (cpus_have_const_cap(ARM64_HAS_PAN) &amp;&amp; !cpus_have_const_cap(ARM64_HAS_UAO));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We emulate only the following system register space.</div><div class='add'>+ * Op0 = 0x3, CRn = 0x0, Op1 = 0x0, CRm = [0, 4 - 7]</div><div class='add'>+ * See Table C5-6 System instruction encodings for System register accesses,</div><div class='add'>+ * ARMv8 ARM(ARM DDI 0487A.f) for more details.</div><div class='add'>+ */</div><div class='add'>+static inline bool __attribute_const__ is_emulated(u32 id)</div><div class='add'>+{</div><div class='add'>+	return (sys_reg_Op0(id) == 0x3 &amp;&amp;</div><div class='add'>+		sys_reg_CRn(id) == 0x0 &amp;&amp;</div><div class='add'>+		sys_reg_Op1(id) == 0x0 &amp;&amp;</div><div class='add'>+		(sys_reg_CRm(id) == 0 ||</div><div class='add'>+		 ((sys_reg_CRm(id) &gt;= 4) &amp;&amp; (sys_reg_CRm(id) &lt;= 7))));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * With CRm == 0, reg should be one of :</div><div class='add'>+ * MIDR_EL1, MPIDR_EL1 or REVIDR_EL1.</div><div class='add'>+ */</div><div class='add'>+static inline int emulate_id_reg(u32 id, u64 *valp)</div><div class='add'>+{</div><div class='add'>+	switch (id) {</div><div class='add'>+	case SYS_MIDR_EL1:</div><div class='add'>+		*valp = read_cpuid_id();</div><div class='add'>+		break;</div><div class='add'>+	case SYS_MPIDR_EL1:</div><div class='add'>+		*valp = SYS_MPIDR_SAFE_VAL;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_REVIDR_EL1:</div><div class='add'>+		/* IMPLEMENTATION DEFINED values are emulated with 0 */</div><div class='add'>+		*valp = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int emulate_sys_reg(u32 id, u64 *valp)</div><div class='add'>+{</div><div class='add'>+	struct arm64_ftr_reg *regp;</div><div class='add'>+</div><div class='add'>+	if (!is_emulated(id))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (sys_reg_CRm(id) == 0)</div><div class='add'>+		return emulate_id_reg(id, valp);</div><div class='add'>+</div><div class='add'>+	regp = get_arm64_ftr_reg(id);</div><div class='add'>+	if (regp)</div><div class='add'>+		*valp = arm64_ftr_reg_user_value(regp);</div><div class='add'>+	else</div><div class='add'>+		/*</div><div class='add'>+		 * The untracked registers are either IMPLEMENTATION DEFINED</div><div class='add'>+		 * (e.g, ID_AFR0_EL1) or reserved RAZ.</div><div class='add'>+		 */</div><div class='add'>+		*valp = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int emulate_mrs(struct pt_regs *regs, u32 insn)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	u32 sys_reg, dst;</div><div class='add'>+	u64 val;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * sys_reg values are defined as used in mrs/msr instruction.</div><div class='add'>+	 * shift the imm value to get the encoding.</div><div class='add'>+	 */</div><div class='add'>+	sys_reg = (u32)aarch64_insn_decode_immediate(AARCH64_INSN_IMM_16, insn) &lt;&lt; 5;</div><div class='add'>+	rc = emulate_sys_reg(sys_reg, &amp;val);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		dst = aarch64_insn_decode_register(AARCH64_INSN_REGTYPE_RT, insn);</div><div class='add'>+		pt_regs_write_reg(regs, dst, val);</div><div class='add'>+		regs-&gt;pc += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct undef_hook mrs_hook = {</div><div class='add'>+	.instr_mask = 0xfff00000,</div><div class='add'>+	.instr_val  = 0xd5300000,</div><div class='add'>+	.pstate_mask = COMPAT_PSR_MODE_MASK,</div><div class='add'>+	.pstate_val = PSR_MODE_EL0t,</div><div class='add'>+	.fn = emulate_mrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init enable_mrs_emulation(void)</div><div class='add'>+{</div><div class='add'>+	register_undef_hook(&amp;mrs_hook);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+late_initcall(enable_mrs_emulation);</div><div class='head'>diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c<br/>index b3d5b3e8fbcb..5b22c687f02a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/cpuinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/cpuinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/cpuinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/cpuinfo.c</a></div><div class='hunk'>@@ -63,6 +63,8 @@ static const char *const hwcap_str[] = {</div><div class='ctx'> 	"atomics",</div><div class='ctx'> 	"fphp",</div><div class='ctx'> 	"asimdhp",</div><div class='add'>+	"cpuid",</div><div class='add'>+	"asimdrdm",</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -227,7 +229,7 @@ static struct attribute_group cpuregs_attr_group = {</div><div class='ctx'> 	.name = "identification"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int cpuid_add_regs(int cpu)</div><div class='add'>+static int cpuid_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct device *dev;</div><div class='hunk'>@@ -248,7 +250,7 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cpuid_remove_regs(int cpu)</div><div class='add'>+static int cpuid_cpu_offline(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct cpuinfo_arm64 *info = &amp;per_cpu(cpu_data, cpu);</div><div class='hunk'>@@ -264,40 +266,22 @@ static int cpuid_remove_regs(int cpu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cpuid_callback(struct notifier_block *nb,</div><div class='del'>-			 unsigned long action, void *hcpu)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-	unsigned long cpu = (unsigned long)hcpu;</div><div class='del'>-</div><div class='del'>-	switch (action &amp; ~CPU_TASKS_FROZEN) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-		rc = cpuid_add_regs(cpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-		rc = cpuid_remove_regs(cpu);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return notifier_from_errno(rc);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init cpuinfo_regs_init(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_begin();</div><div class='add'>+	int cpu, ret;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		struct cpuinfo_arm64 *info = &amp;per_cpu(cpu_data, cpu);</div><div class='ctx'> </div><div class='ctx'> 		kobject_init(&amp;info-&gt;kobj, &amp;cpuregs_kobj_type);</div><div class='del'>-		if (cpu_online(cpu))</div><div class='del'>-			cpuid_add_regs(cpu);</div><div class='ctx'> 	}</div><div class='del'>-	__hotcpu_notifier(cpuid_callback, 0);</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_done();</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "arm64/cpuinfo:online",</div><div class='add'>+				cpuid_cpu_online, cpuid_cpu_offline);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("cpuinfo: failed to register hotplug callbacks.\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info)</div><div class='head'>diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c<br/>index 73ae90ef434c..32913567da08 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/debug-monitors.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/debug-monitors.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/debug-monitors.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/debug-monitors.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='hunk'>@@ -140,7 +141,7 @@ static int clear_os_lock(unsigned int cpu)</div><div class='ctx'> static int debug_monitors_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return cpuhp_setup_state(CPUHP_AP_ARM64_DEBUG_MONITORS_STARTING,</div><div class='del'>-				 "CPUHP_AP_ARM64_DEBUG_MONITORS_STARTING",</div><div class='add'>+				 "arm64/debug_monitors:starting",</div><div class='ctx'> 				 clear_os_lock, NULL);</div><div class='ctx'> }</div><div class='ctx'> postcore_initcall(debug_monitors_init);</div><div class='hunk'>@@ -226,6 +227,8 @@ static void send_user_sigtrap(int si_code)</div><div class='ctx'> static int single_step_handler(unsigned long addr, unsigned int esr,</div><div class='ctx'> 			       struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	bool handler_found = false;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are stepping a pending breakpoint, call the hw_breakpoint</div><div class='ctx'> 	 * handler first.</div><div class='hunk'>@@ -233,7 +236,14 @@ static int single_step_handler(unsigned long addr, unsigned int esr,</div><div class='ctx'> 	if (!reinstall_suspended_bps(regs))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (user_mode(regs)) {</div><div class='add'>+#ifdef	CONFIG_KPROBES</div><div class='add'>+	if (kprobe_single_step_handler(regs, esr) == DBG_HOOK_HANDLED)</div><div class='add'>+		handler_found = true;</div><div class='add'>+#endif</div><div class='add'>+	if (!handler_found &amp;&amp; call_step_hook(regs, esr) == DBG_HOOK_HANDLED)</div><div class='add'>+		handler_found = true;</div><div class='add'>+</div><div class='add'>+	if (!handler_found &amp;&amp; user_mode(regs)) {</div><div class='ctx'> 		send_user_sigtrap(TRAP_TRACE);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -243,15 +253,8 @@ static int single_step_handler(unsigned long addr, unsigned int esr,</div><div class='ctx'> 		 * to the active-not-pending state).</div><div class='ctx'> 		 */</div><div class='ctx'> 		user_rewind_single_step(current);</div><div class='del'>-	} else {</div><div class='del'>-#ifdef	CONFIG_KPROBES</div><div class='del'>-		if (kprobe_single_step_handler(regs, esr) == DBG_HOOK_HANDLED)</div><div class='del'>-			return 0;</div><div class='del'>-#endif</div><div class='del'>-		if (call_step_hook(regs, esr) == DBG_HOOK_HANDLED)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		pr_warning("Unexpected kernel single-step exception at EL1\n");</div><div class='add'>+	} else if (!handler_found) {</div><div class='add'>+		pr_warn("Unexpected kernel single-step exception at EL1\n");</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Re-enable stepping since we know that we will be</div><div class='ctx'> 		 * returning to regs.</div><div class='hunk'>@@ -304,16 +307,20 @@ NOKPROBE_SYMBOL(call_break_hook);</div><div class='ctx'> static int brk_handler(unsigned long addr, unsigned int esr,</div><div class='ctx'> 		       struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	if (user_mode(regs)) {</div><div class='del'>-		send_user_sigtrap(TRAP_BRKPT);</div><div class='del'>-	}</div><div class='add'>+	bool handler_found = false;</div><div class='add'>+</div><div class='ctx'> #ifdef	CONFIG_KPROBES</div><div class='del'>-	else if ((esr &amp; BRK64_ESR_MASK) == BRK64_ESR_KPROBES) {</div><div class='del'>-		if (kprobe_breakpoint_handler(regs, esr) != DBG_HOOK_HANDLED)</div><div class='del'>-			return -EFAULT;</div><div class='add'>+	if ((esr &amp; BRK64_ESR_MASK) == BRK64_ESR_KPROBES) {</div><div class='add'>+		if (kprobe_breakpoint_handler(regs, esr) == DBG_HOOK_HANDLED)</div><div class='add'>+			handler_found = true;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	else if (call_break_hook(regs, esr) != DBG_HOOK_HANDLED) {</div><div class='add'>+	if (!handler_found &amp;&amp; call_break_hook(regs, esr) == DBG_HOOK_HANDLED)</div><div class='add'>+		handler_found = true;</div><div class='add'>+</div><div class='add'>+	if (!handler_found &amp;&amp; user_mode(regs)) {</div><div class='add'>+		send_user_sigtrap(TRAP_BRKPT);</div><div class='add'>+	} else if (!handler_found) {</div><div class='ctx'> 		pr_warn("Unexpected kernel BRK exception at EL1\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm64/kernel/efi-entry.S b/arch/arm64/kernel/efi-entry.S<br/>index e88c064b845c..4e6ad355bd05 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/efi-entry.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/efi-entry.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/efi-entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/efi-entry.S</a></div><div class='hunk'>@@ -46,8 +46,7 @@ ENTRY(entry)</div><div class='ctx'> 	 *                         efi_system_table_t *sys_table,</div><div class='ctx'> 	 *                         unsigned long *image_addr) ;</div><div class='ctx'> 	 */</div><div class='del'>-	adrp	x8, _text</div><div class='del'>-	add	x8, x8, #:lo12:_text</div><div class='add'>+	adr_l	x8, _text</div><div class='ctx'> 	add	x2, sp, 16</div><div class='ctx'> 	str	x8, [x2]</div><div class='ctx'> 	bl	efi_entry</div><div class='hunk'>@@ -68,10 +67,8 @@ ENTRY(entry)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Calculate size of the kernel Image (same for original and copy).</div><div class='ctx'> 	 */</div><div class='del'>-	adrp	x1, _text</div><div class='del'>-	add	x1, x1, #:lo12:_text</div><div class='del'>-	adrp	x2, _edata</div><div class='del'>-	add	x2, x2, #:lo12:_edata</div><div class='add'>+	adr_l	x1, _text</div><div class='add'>+	adr_l	x2, _edata</div><div class='ctx'> 	sub	x1, x2, x1</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c<br/>index ba9bee389fd5..5d17f377d905 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/efi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/efi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/efi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/efi.c</a></div><div class='hunk'>@@ -62,8 +62,8 @@ struct screen_info screen_info __section(.data);</div><div class='ctx'> int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md)</div><div class='ctx'> {</div><div class='ctx'> 	pteval_t prot_val = create_mapping_protection(md);</div><div class='del'>-	bool allow_block_mappings = (md-&gt;type != EFI_RUNTIME_SERVICES_CODE &amp;&amp;</div><div class='del'>-				     md-&gt;type != EFI_RUNTIME_SERVICES_DATA);</div><div class='add'>+	bool page_mappings_only = (md-&gt;type == EFI_RUNTIME_SERVICES_CODE ||</div><div class='add'>+				   md-&gt;type == EFI_RUNTIME_SERVICES_DATA);</div><div class='ctx'> </div><div class='ctx'> 	if (!PAGE_ALIGNED(md-&gt;phys_addr) ||</div><div class='ctx'> 	    !PAGE_ALIGNED(md-&gt;num_pages &lt;&lt; EFI_PAGE_SHIFT)) {</div><div class='hunk'>@@ -76,12 +76,12 @@ int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md)</div><div class='ctx'> 		 * from the MMU routines. So avoid block mappings altogether in</div><div class='ctx'> 		 * that case.</div><div class='ctx'> 		 */</div><div class='del'>-		allow_block_mappings = false;</div><div class='add'>+		page_mappings_only = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	create_pgd_mapping(mm, md-&gt;phys_addr, md-&gt;virt_addr,</div><div class='ctx'> 			   md-&gt;num_pages &lt;&lt; EFI_PAGE_SHIFT,</div><div class='del'>-			   __pgprot(prot_val | PTE_NG), allow_block_mappings);</div><div class='add'>+			   __pgprot(prot_val | PTE_NG), page_mappings_only);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S<br/>index aef02d2af3b5..e1be42e11ff5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/entry-ftrace.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/entry-ftrace.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/entry-ftrace.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/entry-ftrace.S</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/ftrace.h&gt;</div><div class='ctx'> #include &lt;asm/insn.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -98,8 +99,7 @@</div><div class='ctx'> ENTRY(_mcount)</div><div class='ctx'> 	mcount_enter</div><div class='ctx'> </div><div class='del'>-	adrp	x0, ftrace_trace_function</div><div class='del'>-	ldr	x2, [x0, #:lo12:ftrace_trace_function]</div><div class='add'>+	ldr_l	x2, ftrace_trace_function</div><div class='ctx'> 	adr	x0, ftrace_stub</div><div class='ctx'> 	cmp	x0, x2			// if (ftrace_trace_function</div><div class='ctx'> 	b.eq	skip_ftrace_call	//     != ftrace_stub) {</div><div class='hunk'>@@ -115,15 +115,12 @@ skip_ftrace_call:			//   return;</div><div class='ctx'> 	mcount_exit			//   return;</div><div class='ctx'> 					// }</div><div class='ctx'> skip_ftrace_call:</div><div class='del'>-	adrp	x1, ftrace_graph_return</div><div class='del'>-	ldr	x2, [x1, #:lo12:ftrace_graph_return]</div><div class='add'>+	ldr_l	x2, ftrace_graph_return</div><div class='ctx'> 	cmp	x0, x2			//   if ((ftrace_graph_return</div><div class='ctx'> 	b.ne	ftrace_graph_caller	//        != ftrace_stub)</div><div class='ctx'> </div><div class='del'>-	adrp	x1, ftrace_graph_entry	//     || (ftrace_graph_entry</div><div class='del'>-	adrp	x0, ftrace_graph_entry_stub //     != ftrace_graph_entry_stub))</div><div class='del'>-	ldr	x2, [x1, #:lo12:ftrace_graph_entry]</div><div class='del'>-	add	x0, x0, #:lo12:ftrace_graph_entry_stub</div><div class='add'>+	ldr_l	x2, ftrace_graph_entry	//     || (ftrace_graph_entry</div><div class='add'>+	adr_l	x0, ftrace_graph_entry_stub //     != ftrace_graph_entry_stub))</div><div class='ctx'> 	cmp	x0, x2</div><div class='ctx'> 	b.ne	ftrace_graph_caller	//     ftrace_graph_caller();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S<br/>index 223d54a4d66b..43512d4d7df2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/entry.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/entry.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/entry.S</a></div><div class='hunk'>@@ -29,7 +29,9 @@</div><div class='ctx'> #include &lt;asm/esr.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='add'>+#include &lt;asm/asm-uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -90,9 +92,8 @@</div><div class='ctx'> </div><div class='ctx'> 	.if	\el == 0</div><div class='ctx'> 	mrs	x21, sp_el0</div><div class='del'>-	mov	tsk, sp</div><div class='del'>-	and	tsk, tsk, #~(THREAD_SIZE - 1)	// Ensure MDSCR_EL1.SS is clear,</div><div class='del'>-	ldr	x19, [tsk, #TI_FLAGS]		// since we can unmask debug</div><div class='add'>+	ldr_this_cpu	tsk, __entry_task, x20	// Ensure MDSCR_EL1.SS is clear,</div><div class='add'>+	ldr	x19, [tsk, #TSK_TI_FLAGS]	// since we can unmask debug</div><div class='ctx'> 	disable_step_tsk x19, x20		// exceptions when scheduling.</div><div class='ctx'> </div><div class='ctx'> 	mov	x29, xzr			// fp pointed to user-space</div><div class='hunk'>@@ -100,15 +101,41 @@</div><div class='ctx'> 	add	x21, sp, #S_FRAME_SIZE</div><div class='ctx'> 	get_thread_info tsk</div><div class='ctx'> 	/* Save the task's original addr_limit and set USER_DS (TASK_SIZE_64) */</div><div class='del'>-	ldr	x20, [tsk, #TI_ADDR_LIMIT]</div><div class='add'>+	ldr	x20, [tsk, #TSK_TI_ADDR_LIMIT]</div><div class='ctx'> 	str	x20, [sp, #S_ORIG_ADDR_LIMIT]</div><div class='ctx'> 	mov	x20, #TASK_SIZE_64</div><div class='del'>-	str	x20, [tsk, #TI_ADDR_LIMIT]</div><div class='add'>+	str	x20, [tsk, #TSK_TI_ADDR_LIMIT]</div><div class='ctx'> 	/* No need to reset PSTATE.UAO, hardware's already set it to 0 for us */</div><div class='ctx'> 	.endif /* \el == 0 */</div><div class='ctx'> 	mrs	x22, elr_el1</div><div class='ctx'> 	mrs	x23, spsr_el1</div><div class='ctx'> 	stp	lr, x21, [sp, #S_LR]</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARM64_SW_TTBR0_PAN</div><div class='add'>+	/*</div><div class='add'>+	 * Set the TTBR0 PAN bit in SPSR. When the exception is taken from</div><div class='add'>+	 * EL0, there is no need to check the state of TTBR0_EL1 since</div><div class='add'>+	 * accesses are always enabled.</div><div class='add'>+	 * Note that the meaning of this bit differs from the ARMv8.1 PAN</div><div class='add'>+	 * feature as all TTBR0_EL1 accesses are disabled, not just those to</div><div class='add'>+	 * user mappings.</div><div class='add'>+	 */</div><div class='add'>+alternative_if ARM64_HAS_PAN</div><div class='add'>+	b	1f				// skip TTBR0 PAN</div><div class='add'>+alternative_else_nop_endif</div><div class='add'>+</div><div class='add'>+	.if	\el != 0</div><div class='add'>+	mrs	x21, ttbr0_el1</div><div class='add'>+	tst	x21, #0xffff &lt;&lt; 48		// Check for the reserved ASID</div><div class='add'>+	orr	x23, x23, #PSR_PAN_BIT		// Set the emulated PAN in the saved SPSR</div><div class='add'>+	b.eq	1f				// TTBR0 access already disabled</div><div class='add'>+	and	x23, x23, #~PSR_PAN_BIT		// Clear the emulated PAN in the saved SPSR</div><div class='add'>+	.endif</div><div class='add'>+</div><div class='add'>+	__uaccess_ttbr0_disable x21</div><div class='add'>+1:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	stp	x22, x23, [sp, #S_PC]</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -139,7 +166,7 @@</div><div class='ctx'> 	.if	\el != 0</div><div class='ctx'> 	/* Restore the task's original addr_limit. */</div><div class='ctx'> 	ldr	x20, [sp, #S_ORIG_ADDR_LIMIT]</div><div class='del'>-	str	x20, [tsk, #TI_ADDR_LIMIT]</div><div class='add'>+	str	x20, [tsk, #TSK_TI_ADDR_LIMIT]</div><div class='ctx'> </div><div class='ctx'> 	/* No need to restore UAO, it will be restored from SPSR_EL1 */</div><div class='ctx'> 	.endif</div><div class='hunk'>@@ -147,6 +174,40 @@</div><div class='ctx'> 	ldp	x21, x22, [sp, #S_PC]		// load ELR, SPSR</div><div class='ctx'> 	.if	\el == 0</div><div class='ctx'> 	ct_user_enter</div><div class='add'>+	.endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARM64_SW_TTBR0_PAN</div><div class='add'>+	/*</div><div class='add'>+	 * Restore access to TTBR0_EL1. If returning to EL0, no need for SPSR</div><div class='add'>+	 * PAN bit checking.</div><div class='add'>+	 */</div><div class='add'>+alternative_if ARM64_HAS_PAN</div><div class='add'>+	b	2f				// skip TTBR0 PAN</div><div class='add'>+alternative_else_nop_endif</div><div class='add'>+</div><div class='add'>+	.if	\el != 0</div><div class='add'>+	tbnz	x22, #22, 1f			// Skip re-enabling TTBR0 access if the PSR_PAN_BIT is set</div><div class='add'>+	.endif</div><div class='add'>+</div><div class='add'>+	__uaccess_ttbr0_enable x0</div><div class='add'>+</div><div class='add'>+	.if	\el == 0</div><div class='add'>+	/*</div><div class='add'>+	 * Enable errata workarounds only if returning to user. The only</div><div class='add'>+	 * workaround currently required for TTBR0_EL1 changes are for the</div><div class='add'>+	 * Cavium erratum 27456 (broadcast TLBI instructions may cause I-cache</div><div class='add'>+	 * corruption).</div><div class='add'>+	 */</div><div class='add'>+	post_ttbr0_update_workaround</div><div class='add'>+	.endif</div><div class='add'>+1:</div><div class='add'>+	.if	\el != 0</div><div class='add'>+	and	x22, x22, #~PSR_PAN_BIT		// ARMv8.0 CPUs do not understand this bit</div><div class='add'>+	.endif</div><div class='add'>+2:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	.if	\el == 0</div><div class='ctx'> 	ldr	x23, [sp, #S_SP]		// load return stack pointer</div><div class='ctx'> 	msr	sp_el0, x23</div><div class='ctx'> #ifdef CONFIG_ARM64_ERRATUM_845719</div><div class='hunk'>@@ -162,6 +223,7 @@ alternative_if ARM64_WORKAROUND_845719</div><div class='ctx'> alternative_else_nop_endif</div><div class='ctx'> #endif</div><div class='ctx'> 	.endif</div><div class='add'>+</div><div class='ctx'> 	msr	elr_el1, x21			// set up the return data</div><div class='ctx'> 	msr	spsr_el1, x22</div><div class='ctx'> 	ldp	x0, x1, [sp, #16 * 0]</div><div class='hunk'>@@ -184,23 +246,20 @@ alternative_else_nop_endif</div><div class='ctx'> 	eret					// return to kernel</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	get_thread_info, rd</div><div class='del'>-	mrs	\rd, sp_el0</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> 	.macro	irq_stack_entry</div><div class='ctx'> 	mov	x19, sp			// preserve the original sp</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Compare sp with the current thread_info, if the top</div><div class='del'>-	 * ~(THREAD_SIZE - 1) bits match, we are on a task stack, and</div><div class='del'>-	 * should switch to the irq stack.</div><div class='add'>+	 * Compare sp with the base of the task stack.</div><div class='add'>+	 * If the top ~(THREAD_SIZE - 1) bits match, we are on a task stack,</div><div class='add'>+	 * and should switch to the irq stack.</div><div class='ctx'> 	 */</div><div class='del'>-	and	x25, x19, #~(THREAD_SIZE - 1)</div><div class='del'>-	cmp	x25, tsk</div><div class='del'>-	b.ne	9998f</div><div class='add'>+	ldr	x25, [tsk, TSK_STACK]</div><div class='add'>+	eor	x25, x25, x19</div><div class='add'>+	and	x25, x25, #~(THREAD_SIZE - 1)</div><div class='add'>+	cbnz	x25, 9998f</div><div class='ctx'> </div><div class='del'>-	this_cpu_ptr irq_stack, x25, x26</div><div class='add'>+	adr_this_cpu x25, irq_stack, x26</div><div class='ctx'> 	mov	x26, #IRQ_STACK_START_SP</div><div class='ctx'> 	add	x26, x25, x26</div><div class='ctx'> </div><div class='hunk'>@@ -427,9 +486,9 @@ el1_irq:</div><div class='ctx'> 	irq_handler</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='del'>-	ldr	w24, [tsk, #TI_PREEMPT]		// get preempt count</div><div class='add'>+	ldr	w24, [tsk, #TSK_TI_PREEMPT]	// get preempt count</div><div class='ctx'> 	cbnz	w24, 1f				// preempt count != 0</div><div class='del'>-	ldr	x0, [tsk, #TI_FLAGS]		// get flags</div><div class='add'>+	ldr	x0, [tsk, #TSK_TI_FLAGS]	// get flags</div><div class='ctx'> 	tbz	x0, #TIF_NEED_RESCHED, 1f	// needs rescheduling?</div><div class='ctx'> 	bl	el1_preempt</div><div class='ctx'> 1:</div><div class='hunk'>@@ -444,7 +503,7 @@ ENDPROC(el1_irq)</div><div class='ctx'> el1_preempt:</div><div class='ctx'> 	mov	x24, lr</div><div class='ctx'> 1:	bl	preempt_schedule_irq		// irq en/disable is done inside</div><div class='del'>-	ldr	x0, [tsk, #TI_FLAGS]		// get new tasks TI_FLAGS</div><div class='add'>+	ldr	x0, [tsk, #TSK_TI_FLAGS]	// get new tasks TI_FLAGS</div><div class='ctx'> 	tbnz	x0, #TIF_NEED_RESCHED, 1b	// needs rescheduling?</div><div class='ctx'> 	ret	x24</div><div class='ctx'> #endif</div><div class='hunk'>@@ -624,7 +683,7 @@ el0_inv:</div><div class='ctx'> 	mov	x0, sp</div><div class='ctx'> 	mov	x1, #BAD_SYNC</div><div class='ctx'> 	mov	x2, x25</div><div class='del'>-	bl	bad_mode</div><div class='add'>+	bl	bad_el0_sync</div><div class='ctx'> 	b	ret_to_user</div><div class='ctx'> ENDPROC(el0_sync)</div><div class='ctx'> </div><div class='hunk'>@@ -674,8 +733,7 @@ ENTRY(cpu_switch_to)</div><div class='ctx'> 	ldp	x29, x9, [x8], #16</div><div class='ctx'> 	ldr	lr, [x8]</div><div class='ctx'> 	mov	sp, x9</div><div class='del'>-	and	x9, x9, #~(THREAD_SIZE - 1)</div><div class='del'>-	msr	sp_el0, x9</div><div class='add'>+	msr	sp_el0, x1</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(cpu_switch_to)</div><div class='ctx'> </div><div class='hunk'>@@ -686,7 +744,7 @@ ENDPROC(cpu_switch_to)</div><div class='ctx'> ret_fast_syscall:</div><div class='ctx'> 	disable_irq				// disable interrupts</div><div class='ctx'> 	str	x0, [sp, #S_X0]			// returned x0</div><div class='del'>-	ldr	x1, [tsk, #TI_FLAGS]		// re-check for syscall tracing</div><div class='add'>+	ldr	x1, [tsk, #TSK_TI_FLAGS]	// re-check for syscall tracing</div><div class='ctx'> 	and	x2, x1, #_TIF_SYSCALL_WORK</div><div class='ctx'> 	cbnz	x2, ret_fast_syscall_trace</div><div class='ctx'> 	and	x2, x1, #_TIF_WORK_MASK</div><div class='hunk'>@@ -706,14 +764,14 @@ work_pending:</div><div class='ctx'> #ifdef CONFIG_TRACE_IRQFLAGS</div><div class='ctx'> 	bl	trace_hardirqs_on		// enabled while in userspace</div><div class='ctx'> #endif</div><div class='del'>-	ldr	x1, [tsk, #TI_FLAGS]		// re-check for single-step</div><div class='add'>+	ldr	x1, [tsk, #TSK_TI_FLAGS]	// re-check for single-step</div><div class='ctx'> 	b	finish_ret_to_user</div><div class='ctx'> /*</div><div class='ctx'>  * "slow" syscall return path.</div><div class='ctx'>  */</div><div class='ctx'> ret_to_user:</div><div class='ctx'> 	disable_irq				// disable interrupts</div><div class='del'>-	ldr	x1, [tsk, #TI_FLAGS]</div><div class='add'>+	ldr	x1, [tsk, #TSK_TI_FLAGS]</div><div class='ctx'> 	and	x2, x1, #_TIF_WORK_MASK</div><div class='ctx'> 	cbnz	x2, work_pending</div><div class='ctx'> finish_ret_to_user:</div><div class='hunk'>@@ -746,7 +804,7 @@ el0_svc_naked:					// compat entry point</div><div class='ctx'> 	enable_dbg_and_irq</div><div class='ctx'> 	ct_user_exit 1</div><div class='ctx'> </div><div class='del'>-	ldr	x16, [tsk, #TI_FLAGS]		// check for syscall hooks</div><div class='add'>+	ldr	x16, [tsk, #TSK_TI_FLAGS]	// check for syscall hooks</div><div class='ctx'> 	tst	x16, #_TIF_SYSCALL_WORK</div><div class='ctx'> 	b.ne	__sys_trace</div><div class='ctx'> 	cmp     scno, sc_nr                     // check upper syscall limit</div><div class='head'>diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c<br/>index 394c61db5566..06da8ea16bbe 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/fpsimd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/fpsimd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/fpsimd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/fpsimd.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/cpu_pm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -127,6 +127,8 @@ void do_fpsimd_exc(unsigned int esr, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> void fpsimd_thread_switch(struct task_struct *next)</div><div class='ctx'> {</div><div class='add'>+	if (!system_supports_fpsimd())</div><div class='add'>+		return;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Save the current FPSIMD state to memory, but only if whatever is in</div><div class='ctx'> 	 * the registers is in fact the most recent userland FPSIMD state of</div><div class='hunk'>@@ -157,6 +159,8 @@ void fpsimd_thread_switch(struct task_struct *next)</div><div class='ctx'> </div><div class='ctx'> void fpsimd_flush_thread(void)</div><div class='ctx'> {</div><div class='add'>+	if (!system_supports_fpsimd())</div><div class='add'>+		return;</div><div class='ctx'> 	memset(&amp;current-&gt;thread.fpsimd_state, 0, sizeof(struct fpsimd_state));</div><div class='ctx'> 	fpsimd_flush_task_state(current);</div><div class='ctx'> 	set_thread_flag(TIF_FOREIGN_FPSTATE);</div><div class='hunk'>@@ -168,6 +172,8 @@ void fpsimd_flush_thread(void)</div><div class='ctx'>  */</div><div class='ctx'> void fpsimd_preserve_current_state(void)</div><div class='ctx'> {</div><div class='add'>+	if (!system_supports_fpsimd())</div><div class='add'>+		return;</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	if (!test_thread_flag(TIF_FOREIGN_FPSTATE))</div><div class='ctx'> 		fpsimd_save_state(&amp;current-&gt;thread.fpsimd_state);</div><div class='hunk'>@@ -181,6 +187,8 @@ void fpsimd_preserve_current_state(void)</div><div class='ctx'>  */</div><div class='ctx'> void fpsimd_restore_current_state(void)</div><div class='ctx'> {</div><div class='add'>+	if (!system_supports_fpsimd())</div><div class='add'>+		return;</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	if (test_and_clear_thread_flag(TIF_FOREIGN_FPSTATE)) {</div><div class='ctx'> 		struct fpsimd_state *st = &amp;current-&gt;thread.fpsimd_state;</div><div class='hunk'>@@ -199,6 +207,8 @@ void fpsimd_restore_current_state(void)</div><div class='ctx'>  */</div><div class='ctx'> void fpsimd_update_current_state(struct fpsimd_state *state)</div><div class='ctx'> {</div><div class='add'>+	if (!system_supports_fpsimd())</div><div class='add'>+		return;</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	fpsimd_load_state(state);</div><div class='ctx'> 	if (test_and_clear_thread_flag(TIF_FOREIGN_FPSTATE)) {</div><div class='hunk'>@@ -228,6 +238,8 @@ static DEFINE_PER_CPU(struct fpsimd_partial_state, softirq_fpsimdstate);</div><div class='ctx'>  */</div><div class='ctx'> void kernel_neon_begin_partial(u32 num_regs)</div><div class='ctx'> {</div><div class='add'>+	if (WARN_ON(!system_supports_fpsimd()))</div><div class='add'>+		return;</div><div class='ctx'> 	if (in_interrupt()) {</div><div class='ctx'> 		struct fpsimd_partial_state *s = this_cpu_ptr(</div><div class='ctx'> 			in_irq() ? &amp;hardirq_fpsimdstate : &amp;softirq_fpsimdstate);</div><div class='hunk'>@@ -252,6 +264,8 @@ EXPORT_SYMBOL(kernel_neon_begin_partial);</div><div class='ctx'> </div><div class='ctx'> void kernel_neon_end(void)</div><div class='ctx'> {</div><div class='add'>+	if (!system_supports_fpsimd())</div><div class='add'>+		return;</div><div class='ctx'> 	if (in_interrupt()) {</div><div class='ctx'> 		struct fpsimd_partial_state *s = this_cpu_ptr(</div><div class='ctx'> 			in_irq() ? &amp;hardirq_fpsimdstate : &amp;softirq_fpsimdstate);</div><div class='head'>diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S<br/>index 332e33193ccf..4fb6ccd886d1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/head.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/head.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/head.S</a></div><div class='hunk'>@@ -149,7 +149,7 @@ extra_header_fields:</div><div class='ctx'> 	.quad	0				// SizeOfHeapReserve</div><div class='ctx'> 	.quad	0				// SizeOfHeapCommit</div><div class='ctx'> 	.long	0				// LoaderFlags</div><div class='del'>-	.long	0x6				// NumberOfRvaAndSizes</div><div class='add'>+	.long	(section_table - .) / 8		// NumberOfRvaAndSizes</div><div class='ctx'> </div><div class='ctx'> 	.quad	0				// ExportTable</div><div class='ctx'> 	.quad	0				// ImportTable</div><div class='hunk'>@@ -158,6 +158,11 @@ extra_header_fields:</div><div class='ctx'> 	.quad	0				// CertificationTable</div><div class='ctx'> 	.quad	0				// BaseRelocationTable</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_EFI</div><div class='add'>+	.long	efi_debug_table - _head		// DebugTable</div><div class='add'>+	.long	efi_debug_table_size</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	// Section table</div><div class='ctx'> section_table:</div><div class='ctx'> </div><div class='hunk'>@@ -195,6 +200,46 @@ section_table:</div><div class='ctx'> 	.short	0		// NumberOfLineNumbers  (0 for executables)</div><div class='ctx'> 	.long	0xe0500020	// Characteristics (section flags)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_EFI</div><div class='add'>+	/*</div><div class='add'>+	 * The debug table is referenced via its Relative Virtual Address (RVA),</div><div class='add'>+	 * which is only defined for those parts of the image that are covered</div><div class='add'>+	 * by a section declaration. Since this header is not covered by any</div><div class='add'>+	 * section, the debug table must be emitted elsewhere. So stick it in</div><div class='add'>+	 * the .init.rodata section instead.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that the EFI debug entry itself may legally have a zero RVA,</div><div class='add'>+	 * which means we can simply put it right after the section headers.</div><div class='add'>+	 */</div><div class='add'>+	__INITRODATA</div><div class='add'>+</div><div class='add'>+	.align	2</div><div class='add'>+efi_debug_table:</div><div class='add'>+	// EFI_IMAGE_DEBUG_DIRECTORY_ENTRY</div><div class='add'>+	.long	0			// Characteristics</div><div class='add'>+	.long	0			// TimeDateStamp</div><div class='add'>+	.short	0			// MajorVersion</div><div class='add'>+	.short	0			// MinorVersion</div><div class='add'>+	.long	2			// Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW</div><div class='add'>+	.long	efi_debug_entry_size	// SizeOfData</div><div class='add'>+	.long	0			// RVA</div><div class='add'>+	.long	efi_debug_entry - _head	// FileOffset</div><div class='add'>+</div><div class='add'>+	.set	efi_debug_table_size, . - efi_debug_table</div><div class='add'>+	.previous</div><div class='add'>+</div><div class='add'>+efi_debug_entry:</div><div class='add'>+	// EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY</div><div class='add'>+	.ascii	"NB10"			// Signature</div><div class='add'>+	.long	0			// Unknown</div><div class='add'>+	.long	0			// Unknown2</div><div class='add'>+	.long	0			// Unknown3</div><div class='add'>+</div><div class='add'>+	.asciz	VMLINUX_PATH</div><div class='add'>+</div><div class='add'>+	.set	efi_debug_entry_size, . - efi_debug_entry</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * EFI will load .text onwards at the 4k section alignment</div><div class='ctx'> 	 * described in the PE/COFF header. To ensure that instruction</div><div class='hunk'>@@ -326,14 +371,14 @@ __create_page_tables:</div><div class='ctx'> 	 * dirty cache lines being evicted.</div><div class='ctx'> 	 */</div><div class='ctx'> 	adrp	x0, idmap_pg_dir</div><div class='del'>-	adrp	x1, swapper_pg_dir + SWAPPER_DIR_SIZE</div><div class='add'>+	adrp	x1, swapper_pg_dir + SWAPPER_DIR_SIZE + RESERVED_TTBR0_SIZE</div><div class='ctx'> 	bl	__inval_cache_range</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear the idmap and swapper page tables.</div><div class='ctx'> 	 */</div><div class='ctx'> 	adrp	x0, idmap_pg_dir</div><div class='del'>-	adrp	x6, swapper_pg_dir + SWAPPER_DIR_SIZE</div><div class='add'>+	adrp	x6, swapper_pg_dir + SWAPPER_DIR_SIZE + RESERVED_TTBR0_SIZE</div><div class='ctx'> 1:	stp	xzr, xzr, [x0], #16</div><div class='ctx'> 	stp	xzr, xzr, [x0], #16</div><div class='ctx'> 	stp	xzr, xzr, [x0], #16</div><div class='hunk'>@@ -412,7 +457,7 @@ __create_page_tables:</div><div class='ctx'> 	 * tables again to remove any speculatively loaded cache lines.</div><div class='ctx'> 	 */</div><div class='ctx'> 	adrp	x0, idmap_pg_dir</div><div class='del'>-	adrp	x1, swapper_pg_dir + SWAPPER_DIR_SIZE</div><div class='add'>+	adrp	x1, swapper_pg_dir + SWAPPER_DIR_SIZE + RESERVED_TTBR0_SIZE</div><div class='ctx'> 	dmb	sy</div><div class='ctx'> 	bl	__inval_cache_range</div><div class='ctx'> </div><div class='hunk'>@@ -428,7 +473,8 @@ ENDPROC(__create_page_tables)</div><div class='ctx'> __primary_switched:</div><div class='ctx'> 	adrp	x4, init_thread_union</div><div class='ctx'> 	add	sp, x4, #THREAD_SIZE</div><div class='del'>-	msr	sp_el0, x4			// Save thread_info</div><div class='add'>+	adr_l	x5, init_task</div><div class='add'>+	msr	sp_el0, x5			// Save thread_info</div><div class='ctx'> </div><div class='ctx'> 	adr_l	x8, vectors			// load VBAR_EL1 with virtual</div><div class='ctx'> 	msr	vbar_el1, x8			// vector table address</div><div class='hunk'>@@ -482,7 +528,7 @@ ENTRY(kimage_vaddr)</div><div class='ctx'>  * If we're fortunate enough to boot at EL2, ensure that the world is</div><div class='ctx'>  * sane before dropping to EL1.</div><div class='ctx'>  *</div><div class='del'>- * Returns either BOOT_CPU_MODE_EL1 or BOOT_CPU_MODE_EL2 in x20 if</div><div class='add'>+ * Returns either BOOT_CPU_MODE_EL1 or BOOT_CPU_MODE_EL2 in w0 if</div><div class='ctx'>  * booted in EL1 or EL2 respectively.</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(el2_setup)</div><div class='hunk'>@@ -524,10 +570,21 @@ set_hcr:</div><div class='ctx'> 	msr	hcr_el2, x0</div><div class='ctx'> 	isb</div><div class='ctx'> </div><div class='del'>-	/* Generic timers. */</div><div class='add'>+	/*</div><div class='add'>+	 * Allow Non-secure EL1 and EL0 to access physical timer and counter.</div><div class='add'>+	 * This is not necessary for VHE, since the host kernel runs in EL2,</div><div class='add'>+	 * and EL0 accesses are configured in the later stage of boot process.</div><div class='add'>+	 * Note that when HCR_EL2.E2H == 1, CNTHCTL_EL2 has the same bit layout</div><div class='add'>+	 * as CNTKCTL_EL1, and CNTKCTL_EL1 accessing instructions are redefined</div><div class='add'>+	 * to access CNTHCTL_EL2. This allows the kernel designed to run at EL1</div><div class='add'>+	 * to transparently mess with the EL0 bits via CNTKCTL_EL1 access in</div><div class='add'>+	 * EL2.</div><div class='add'>+	 */</div><div class='add'>+	cbnz	x2, 1f</div><div class='ctx'> 	mrs	x0, cnthctl_el2</div><div class='ctx'> 	orr	x0, x0, #3			// Enable EL1 physical timers</div><div class='ctx'> 	msr	cnthctl_el2, x0</div><div class='add'>+1:</div><div class='ctx'> 	msr	cntvoff_el2, xzr		// Clear virtual offset</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARM_GIC_V3</div><div class='hunk'>@@ -580,15 +637,26 @@ CPU_LE(	movk	x0, #0x30d0, lsl #16	)	// Clear EE and E0E on LE systems</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* EL2 debug */</div><div class='del'>-	mrs	x0, id_aa64dfr0_el1		// Check ID_AA64DFR0_EL1 PMUVer</div><div class='del'>-	sbfx	x0, x0, #8, #4</div><div class='add'>+	mrs	x1, id_aa64dfr0_el1		// Check ID_AA64DFR0_EL1 PMUVer</div><div class='add'>+	sbfx	x0, x1, #8, #4</div><div class='ctx'> 	cmp	x0, #1</div><div class='ctx'> 	b.lt	4f				// Skip if no PMU present</div><div class='ctx'> 	mrs	x0, pmcr_el0			// Disable debug access traps</div><div class='ctx'> 	ubfx	x0, x0, #11, #5			// to EL2 and allow access to</div><div class='ctx'> 4:</div><div class='del'>-	csel	x0, xzr, x0, lt			// all PMU counters from EL1</div><div class='del'>-	msr	mdcr_el2, x0			// (if they exist)</div><div class='add'>+	csel	x3, xzr, x0, lt			// all PMU counters from EL1</div><div class='add'>+</div><div class='add'>+	/* Statistical profiling */</div><div class='add'>+	ubfx	x0, x1, #32, #4			// Check ID_AA64DFR0_EL1 PMSVer</div><div class='add'>+	cbz	x0, 6f				// Skip if SPE not present</div><div class='add'>+	cbnz	x2, 5f				// VHE?</div><div class='add'>+	mov	x1, #(MDCR_EL2_E2PB_MASK &lt;&lt; MDCR_EL2_E2PB_SHIFT)</div><div class='add'>+	orr	x3, x3, x1			// If we don't have VHE, then</div><div class='add'>+	b	6f				// use EL1&amp;0 translation.</div><div class='add'>+5:						// For VHE, use EL2 translation</div><div class='add'>+	orr	x3, x3, #MDCR_EL2_TPMS		// and disable access from EL1</div><div class='add'>+6:</div><div class='add'>+	msr	mdcr_el2, x3			// Configure debug traps</div><div class='ctx'> </div><div class='ctx'> 	/* Stage-2 translation */</div><div class='ctx'> 	msr	vttbr_el2, xzr</div><div class='hunk'>@@ -601,8 +669,7 @@ CPU_LE(	movk	x0, #0x30d0, lsl #16	)	// Clear EE and E0E on LE systems</div><div class='ctx'> </div><div class='ctx'> install_el2_stub:</div><div class='ctx'> 	/* Hypervisor stub */</div><div class='del'>-	adrp	x0, __hyp_stub_vectors</div><div class='del'>-	add	x0, x0, #:lo12:__hyp_stub_vectors</div><div class='add'>+	adr_l	x0, __hyp_stub_vectors</div><div class='ctx'> 	msr	vbar_el2, x0</div><div class='ctx'> </div><div class='ctx'> 	/* spsr */</div><div class='hunk'>@@ -616,7 +683,7 @@ ENDPROC(el2_setup)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Sets the __boot_cpu_mode flag depending on the CPU boot mode passed</div><div class='del'>- * in x20. See arch/arm64/include/asm/virt.h for more info.</div><div class='add'>+ * in w0. See arch/arm64/include/asm/virt.h for more info.</div><div class='ctx'>  */</div><div class='ctx'> set_cpu_boot_mode_flag:</div><div class='ctx'> 	adr_l	x1, __boot_cpu_mode</div><div class='hunk'>@@ -699,10 +766,10 @@ __secondary_switched:</div><div class='ctx'> 	isb</div><div class='ctx'> </div><div class='ctx'> 	adr_l	x0, secondary_data</div><div class='del'>-	ldr	x0, [x0, #CPU_BOOT_STACK]	// get secondary_data.stack</div><div class='del'>-	mov	sp, x0</div><div class='del'>-	and	x0, x0, #~(THREAD_SIZE - 1)</div><div class='del'>-	msr	sp_el0, x0			// save thread_info</div><div class='add'>+	ldr	x1, [x0, #CPU_BOOT_STACK]	// get secondary_data.stack</div><div class='add'>+	mov	sp, x1</div><div class='add'>+	ldr	x2, [x0, #CPU_BOOT_TASK]</div><div class='add'>+	msr	sp_el0, x2</div><div class='ctx'> 	mov	x29, #0</div><div class='ctx'> 	b	secondary_start_kernel</div><div class='ctx'> ENDPROC(__secondary_switched)</div><div class='head'>diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c<br/>index d55a7b09959b..97a7384100f3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/hibernate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/hibernate.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/hibernate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/hibernate.c</a></div><div class='hunk'>@@ -50,9 +50,6 @@</div><div class='ctx'>  */</div><div class='ctx'> extern int in_suspend;</div><div class='ctx'> </div><div class='del'>-/* Find a symbols alias in the linear map */</div><div class='del'>-#define LMADDR(x)	phys_to_virt(virt_to_phys(x))</div><div class='del'>-</div><div class='ctx'> /* Do we need to reset el2? */</div><div class='ctx'> #define el2_reset_needed() (is_hyp_mode_available() &amp;&amp; !is_kernel_in_hyp_mode())</div><div class='ctx'> </div><div class='hunk'>@@ -102,8 +99,8 @@ static inline void arch_hdr_invariants(struct arch_hibernate_hdr_invariants *i)</div><div class='ctx'> </div><div class='ctx'> int pfn_is_nosave(unsigned long pfn)</div><div class='ctx'> {</div><div class='del'>-	unsigned long nosave_begin_pfn = virt_to_pfn(&amp;__nosave_begin);</div><div class='del'>-	unsigned long nosave_end_pfn = virt_to_pfn(&amp;__nosave_end - 1);</div><div class='add'>+	unsigned long nosave_begin_pfn = sym_to_pfn(&amp;__nosave_begin);</div><div class='add'>+	unsigned long nosave_end_pfn = sym_to_pfn(&amp;__nosave_end - 1);</div><div class='ctx'> </div><div class='ctx'> 	return (pfn &gt;= nosave_begin_pfn) &amp;&amp; (pfn &lt;= nosave_end_pfn);</div><div class='ctx'> }</div><div class='hunk'>@@ -125,18 +122,18 @@ int arch_hibernation_header_save(void *addr, unsigned int max_size)</div><div class='ctx'> 		return -EOVERFLOW;</div><div class='ctx'> </div><div class='ctx'> 	arch_hdr_invariants(&amp;hdr-&gt;invariants);</div><div class='del'>-	hdr-&gt;ttbr1_el1		= virt_to_phys(swapper_pg_dir);</div><div class='add'>+	hdr-&gt;ttbr1_el1		= __pa_symbol(swapper_pg_dir);</div><div class='ctx'> 	hdr-&gt;reenter_kernel	= _cpu_resume;</div><div class='ctx'> </div><div class='ctx'> 	/* We can't use __hyp_get_vectors() because kvm may still be loaded */</div><div class='ctx'> 	if (el2_reset_needed())</div><div class='del'>-		hdr-&gt;__hyp_stub_vectors = virt_to_phys(__hyp_stub_vectors);</div><div class='add'>+		hdr-&gt;__hyp_stub_vectors = __pa_symbol(__hyp_stub_vectors);</div><div class='ctx'> 	else</div><div class='ctx'> 		hdr-&gt;__hyp_stub_vectors = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Save the mpidr of the cpu we called cpu_suspend() on... */</div><div class='ctx'> 	if (sleep_cpu &lt; 0) {</div><div class='del'>-		pr_err("Failing to hibernate on an unkown CPU.\n");</div><div class='add'>+		pr_err("Failing to hibernate on an unknown CPU.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	hdr-&gt;sleep_cpu_mpidr = cpu_logical_map(sleep_cpu);</div><div class='hunk'>@@ -460,7 +457,6 @@ int swsusp_arch_resume(void)</div><div class='ctx'> 	void *zero_page;</div><div class='ctx'> 	size_t exit_size;</div><div class='ctx'> 	pgd_t *tmp_pg_dir;</div><div class='del'>-	void *lm_restore_pblist;</div><div class='ctx'> 	phys_addr_t phys_hibernate_exit;</div><div class='ctx'> 	void __noreturn (*hibernate_exit)(phys_addr_t, phys_addr_t, void *,</div><div class='ctx'> 					  void *, phys_addr_t, phys_addr_t);</div><div class='hunk'>@@ -472,7 +468,7 @@ int swsusp_arch_resume(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	tmp_pg_dir = (pgd_t *)get_safe_page(GFP_ATOMIC);</div><div class='ctx'> 	if (!tmp_pg_dir) {</div><div class='del'>-		pr_err("Failed to allocate memory for temporary page tables.");</div><div class='add'>+		pr_err("Failed to allocate memory for temporary page tables.\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -481,18 +477,12 @@ int swsusp_arch_resume(void)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Since we only copied the linear map, we need to find restore_pblist's</div><div class='del'>-	 * linear map address.</div><div class='del'>-	 */</div><div class='del'>-	lm_restore_pblist = LMADDR(restore_pblist);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * We need a zero page that is zero before &amp; after resume in order to</div><div class='ctx'> 	 * to break before make on the ttbr1 page tables.</div><div class='ctx'> 	 */</div><div class='ctx'> 	zero_page = (void *)get_safe_page(GFP_ATOMIC);</div><div class='ctx'> 	if (!zero_page) {</div><div class='del'>-		pr_err("Failed to allocate zero page.");</div><div class='add'>+		pr_err("Failed to allocate zero page.\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -512,7 +502,7 @@ int swsusp_arch_resume(void)</div><div class='ctx'> 				   &amp;phys_hibernate_exit,</div><div class='ctx'> 				   (void *)get_safe_page, GFP_ATOMIC);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		pr_err("Failed to create safe executable page for hibernate_exit code.");</div><div class='add'>+		pr_err("Failed to create safe executable page for hibernate_exit code.\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -537,7 +527,7 @@ int swsusp_arch_resume(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hibernate_exit(virt_to_phys(tmp_pg_dir), resume_hdr.ttbr1_el1,</div><div class='del'>-		       resume_hdr.reenter_kernel, lm_restore_pblist,</div><div class='add'>+		       resume_hdr.reenter_kernel, restore_pblist,</div><div class='ctx'> 		       resume_hdr.__hyp_stub_vectors, virt_to_phys(zero_page));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -547,7 +537,7 @@ out:</div><div class='ctx'> int hibernate_resume_nonboot_cpu_disable(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (sleep_cpu &lt; 0) {</div><div class='del'>-		pr_err("Failing to resume from hibernate on an unkown CPU.\n");</div><div class='add'>+		pr_err("Failing to resume from hibernate on an unknown CPU.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c<br/>index 948b73148d56..0296e7924240 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/hw_breakpoint.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/hw_breakpoint.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/hw_breakpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/hw_breakpoint.c</a></div><div class='hunk'>@@ -317,9 +317,21 @@ static int get_hbp_len(u8 hbp_len)</div><div class='ctx'> 	case ARM_BREAKPOINT_LEN_2:</div><div class='ctx'> 		len_in_bytes = 2;</div><div class='ctx'> 		break;</div><div class='add'>+	case ARM_BREAKPOINT_LEN_3:</div><div class='add'>+		len_in_bytes = 3;</div><div class='add'>+		break;</div><div class='ctx'> 	case ARM_BREAKPOINT_LEN_4:</div><div class='ctx'> 		len_in_bytes = 4;</div><div class='ctx'> 		break;</div><div class='add'>+	case ARM_BREAKPOINT_LEN_5:</div><div class='add'>+		len_in_bytes = 5;</div><div class='add'>+		break;</div><div class='add'>+	case ARM_BREAKPOINT_LEN_6:</div><div class='add'>+		len_in_bytes = 6;</div><div class='add'>+		break;</div><div class='add'>+	case ARM_BREAKPOINT_LEN_7:</div><div class='add'>+		len_in_bytes = 7;</div><div class='add'>+		break;</div><div class='ctx'> 	case ARM_BREAKPOINT_LEN_8:</div><div class='ctx'> 		len_in_bytes = 8;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -349,7 +361,7 @@ int arch_check_bp_in_kernelspace(struct perf_event *bp)</div><div class='ctx'>  * to generic breakpoint descriptions.</div><div class='ctx'>  */</div><div class='ctx'> int arch_bp_generic_fields(struct arch_hw_breakpoint_ctrl ctrl,</div><div class='del'>-			   int *gen_len, int *gen_type)</div><div class='add'>+			   int *gen_len, int *gen_type, int *offset)</div><div class='ctx'> {</div><div class='ctx'> 	/* Type */</div><div class='ctx'> 	switch (ctrl.type) {</div><div class='hunk'>@@ -369,17 +381,33 @@ int arch_bp_generic_fields(struct arch_hw_breakpoint_ctrl ctrl,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!ctrl.len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*offset = __ffs(ctrl.len);</div><div class='add'>+</div><div class='ctx'> 	/* Len */</div><div class='del'>-	switch (ctrl.len) {</div><div class='add'>+	switch (ctrl.len &gt;&gt; *offset) {</div><div class='ctx'> 	case ARM_BREAKPOINT_LEN_1:</div><div class='ctx'> 		*gen_len = HW_BREAKPOINT_LEN_1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ARM_BREAKPOINT_LEN_2:</div><div class='ctx'> 		*gen_len = HW_BREAKPOINT_LEN_2;</div><div class='ctx'> 		break;</div><div class='add'>+	case ARM_BREAKPOINT_LEN_3:</div><div class='add'>+		*gen_len = HW_BREAKPOINT_LEN_3;</div><div class='add'>+		break;</div><div class='ctx'> 	case ARM_BREAKPOINT_LEN_4:</div><div class='ctx'> 		*gen_len = HW_BREAKPOINT_LEN_4;</div><div class='ctx'> 		break;</div><div class='add'>+	case ARM_BREAKPOINT_LEN_5:</div><div class='add'>+		*gen_len = HW_BREAKPOINT_LEN_5;</div><div class='add'>+		break;</div><div class='add'>+	case ARM_BREAKPOINT_LEN_6:</div><div class='add'>+		*gen_len = HW_BREAKPOINT_LEN_6;</div><div class='add'>+		break;</div><div class='add'>+	case ARM_BREAKPOINT_LEN_7:</div><div class='add'>+		*gen_len = HW_BREAKPOINT_LEN_7;</div><div class='add'>+		break;</div><div class='ctx'> 	case ARM_BREAKPOINT_LEN_8:</div><div class='ctx'> 		*gen_len = HW_BREAKPOINT_LEN_8;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -423,9 +451,21 @@ static int arch_build_bp_info(struct perf_event *bp)</div><div class='ctx'> 	case HW_BREAKPOINT_LEN_2:</div><div class='ctx'> 		info-&gt;ctrl.len = ARM_BREAKPOINT_LEN_2;</div><div class='ctx'> 		break;</div><div class='add'>+	case HW_BREAKPOINT_LEN_3:</div><div class='add'>+		info-&gt;ctrl.len = ARM_BREAKPOINT_LEN_3;</div><div class='add'>+		break;</div><div class='ctx'> 	case HW_BREAKPOINT_LEN_4:</div><div class='ctx'> 		info-&gt;ctrl.len = ARM_BREAKPOINT_LEN_4;</div><div class='ctx'> 		break;</div><div class='add'>+	case HW_BREAKPOINT_LEN_5:</div><div class='add'>+		info-&gt;ctrl.len = ARM_BREAKPOINT_LEN_5;</div><div class='add'>+		break;</div><div class='add'>+	case HW_BREAKPOINT_LEN_6:</div><div class='add'>+		info-&gt;ctrl.len = ARM_BREAKPOINT_LEN_6;</div><div class='add'>+		break;</div><div class='add'>+	case HW_BREAKPOINT_LEN_7:</div><div class='add'>+		info-&gt;ctrl.len = ARM_BREAKPOINT_LEN_7;</div><div class='add'>+		break;</div><div class='ctx'> 	case HW_BREAKPOINT_LEN_8:</div><div class='ctx'> 		info-&gt;ctrl.len = ARM_BREAKPOINT_LEN_8;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -517,18 +557,17 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		info-&gt;address &amp;= ~alignment_mask;</div><div class='del'>-		info-&gt;ctrl.len &lt;&lt;= offset;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (info-&gt;ctrl.type == ARM_BREAKPOINT_EXECUTE)</div><div class='ctx'> 			alignment_mask = 0x3;</div><div class='ctx'> 		else</div><div class='ctx'> 			alignment_mask = 0x7;</div><div class='del'>-		if (info-&gt;address &amp; alignment_mask)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		offset = info-&gt;address &amp; alignment_mask;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	info-&gt;address &amp;= ~alignment_mask;</div><div class='add'>+	info-&gt;ctrl.len &lt;&lt;= offset;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disallow per-task kernel breakpoints since these would</div><div class='ctx'> 	 * complicate the stepping code.</div><div class='hunk'>@@ -661,12 +700,47 @@ unlock:</div><div class='ctx'> }</div><div class='ctx'> NOKPROBE_SYMBOL(breakpoint_handler);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Arm64 hardware does not always report a watchpoint hit address that matches</div><div class='add'>+ * one of the watchpoints set. It can also report an address "near" the</div><div class='add'>+ * watchpoint if a single instruction access both watched and unwatched</div><div class='add'>+ * addresses. There is no straight-forward way, short of disassembling the</div><div class='add'>+ * offending instruction, to map that address back to the watchpoint. This</div><div class='add'>+ * function computes the distance of the memory access from the watchpoint as a</div><div class='add'>+ * heuristic for the likelyhood that a given access triggered the watchpoint.</div><div class='add'>+ *</div><div class='add'>+ * See Section D2.10.5 "Determining the memory location that caused a Watchpoint</div><div class='add'>+ * exception" of ARMv8 Architecture Reference Manual for details.</div><div class='add'>+ *</div><div class='add'>+ * The function returns the distance of the address from the bytes watched by</div><div class='add'>+ * the watchpoint. In case of an exact match, it returns 0.</div><div class='add'>+ */</div><div class='add'>+static u64 get_distance_from_watchpoint(unsigned long addr, u64 val,</div><div class='add'>+					struct arch_hw_breakpoint_ctrl *ctrl)</div><div class='add'>+{</div><div class='add'>+	u64 wp_low, wp_high;</div><div class='add'>+	u32 lens, lene;</div><div class='add'>+</div><div class='add'>+	lens = __ffs(ctrl-&gt;len);</div><div class='add'>+	lene = __fls(ctrl-&gt;len);</div><div class='add'>+</div><div class='add'>+	wp_low = val + lens;</div><div class='add'>+	wp_high = val + lene;</div><div class='add'>+	if (addr &lt; wp_low)</div><div class='add'>+		return wp_low - addr;</div><div class='add'>+	else if (addr &gt; wp_high)</div><div class='add'>+		return addr - wp_high;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int watchpoint_handler(unsigned long addr, unsigned int esr,</div><div class='ctx'> 			      struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	int i, step = 0, *kernel_step, access;</div><div class='add'>+	int i, step = 0, *kernel_step, access, closest_match = 0;</div><div class='add'>+	u64 min_dist = -1, dist;</div><div class='ctx'> 	u32 ctrl_reg;</div><div class='del'>-	u64 val, alignment_mask;</div><div class='add'>+	u64 val;</div><div class='ctx'> 	struct perf_event *wp, **slots;</div><div class='ctx'> 	struct debug_info *debug_info;</div><div class='ctx'> 	struct arch_hw_breakpoint *info;</div><div class='hunk'>@@ -675,35 +749,15 @@ static int watchpoint_handler(unsigned long addr, unsigned int esr,</div><div class='ctx'> 	slots = this_cpu_ptr(wp_on_reg);</div><div class='ctx'> 	debug_info = &amp;current-&gt;thread.debug;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Find all watchpoints that match the reported address. If no exact</div><div class='add'>+	 * match is found. Attribute the hit to the closest watchpoint.</div><div class='add'>+	 */</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	for (i = 0; i &lt; core_num_wrps; ++i) {</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-</div><div class='ctx'> 		wp = slots[i];</div><div class='del'>-</div><div class='ctx'> 		if (wp == NULL)</div><div class='del'>-			goto unlock;</div><div class='del'>-</div><div class='del'>-		info = counter_arch_bp(wp);</div><div class='del'>-		/* AArch32 watchpoints are either 4 or 8 bytes aligned. */</div><div class='del'>-		if (is_compat_task()) {</div><div class='del'>-			if (info-&gt;ctrl.len == ARM_BREAKPOINT_LEN_8)</div><div class='del'>-				alignment_mask = 0x7;</div><div class='del'>-			else</div><div class='del'>-				alignment_mask = 0x3;</div><div class='del'>-		} else {</div><div class='del'>-			alignment_mask = 0x7;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check if the watchpoint value matches. */</div><div class='del'>-		val = read_wb_reg(AARCH64_DBG_REG_WVR, i);</div><div class='del'>-		if (val != (addr &amp; ~alignment_mask))</div><div class='del'>-			goto unlock;</div><div class='del'>-</div><div class='del'>-		/* Possible match, check the byte address select to confirm. */</div><div class='del'>-		ctrl_reg = read_wb_reg(AARCH64_DBG_REG_WCR, i);</div><div class='del'>-		decode_ctrl_reg(ctrl_reg, &amp;ctrl);</div><div class='del'>-		if (!((1 &lt;&lt; (addr &amp; alignment_mask)) &amp; ctrl.len))</div><div class='del'>-			goto unlock;</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Check that the access type matches.</div><div class='hunk'>@@ -712,18 +766,41 @@ static int watchpoint_handler(unsigned long addr, unsigned int esr,</div><div class='ctx'> 		access = (esr &amp; AARCH64_ESR_ACCESS_MASK) ? HW_BREAKPOINT_W :</div><div class='ctx'> 			 HW_BREAKPOINT_R;</div><div class='ctx'> 		if (!(access &amp; hw_breakpoint_type(wp)))</div><div class='del'>-			goto unlock;</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='add'>+		/* Check if the watchpoint value and byte select match. */</div><div class='add'>+		val = read_wb_reg(AARCH64_DBG_REG_WVR, i);</div><div class='add'>+		ctrl_reg = read_wb_reg(AARCH64_DBG_REG_WCR, i);</div><div class='add'>+		decode_ctrl_reg(ctrl_reg, &amp;ctrl);</div><div class='add'>+		dist = get_distance_from_watchpoint(addr, val, &amp;ctrl);</div><div class='add'>+		if (dist &lt; min_dist) {</div><div class='add'>+			min_dist = dist;</div><div class='add'>+			closest_match = i;</div><div class='add'>+		}</div><div class='add'>+		/* Is this an exact match? */</div><div class='add'>+		if (dist != 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		info = counter_arch_bp(wp);</div><div class='ctx'> 		info-&gt;trigger = addr;</div><div class='ctx'> 		perf_bp_event(wp, regs);</div><div class='ctx'> </div><div class='ctx'> 		/* Do we need to handle the stepping? */</div><div class='ctx'> 		if (is_default_overflow_handler(wp))</div><div class='ctx'> 			step = 1;</div><div class='add'>+	}</div><div class='add'>+	if (min_dist &gt; 0 &amp;&amp; min_dist != -1) {</div><div class='add'>+		/* No exact match found. */</div><div class='add'>+		wp = slots[closest_match];</div><div class='add'>+		info = counter_arch_bp(wp);</div><div class='add'>+		info-&gt;trigger = addr;</div><div class='add'>+		perf_bp_event(wp, regs);</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+		/* Do we need to handle the stepping? */</div><div class='add'>+		if (is_default_overflow_handler(wp))</div><div class='add'>+			step = 1;</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (!step)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -924,7 +1001,7 @@ static int __init arch_hw_breakpoint_init(void)</div><div class='ctx'> 	 * debugger will leave the world in a nice state for us.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = cpuhp_setup_state(CPUHP_AP_PERF_ARM_HW_BREAKPOINT_STARTING,</div><div class='del'>-			  "CPUHP_AP_PERF_ARM_HW_BREAKPOINT_STARTING",</div><div class='add'>+			  "perf/arm64/hw_breakpoint:starting",</div><div class='ctx'> 			  hw_breakpoint_reset, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		pr_err("failed to register CPU hotplug notifier: %d\n", ret);</div><div class='head'>diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c<br/>index 6f2ac4fc66ca..3a63954a8b14 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/insn.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/insn.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/insn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/insn.c</a></div><div class='hunk'>@@ -30,8 +30,8 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/debug-monitors.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='del'>-#include &lt;asm/opcodes.h&gt;</div><div class='ctx'> #include &lt;asm/insn.h&gt;</div><div class='add'>+#include &lt;asm/kprobes.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define AARCH64_INSN_SF_BIT	BIT(31)</div><div class='ctx'> #define AARCH64_INSN_N_BIT	BIT(22)</div><div class='hunk'>@@ -94,10 +94,10 @@ static void __kprobes *patch_map(void *addr, int fixmap)</div><div class='ctx'> 	bool module = !core_kernel_text(uintaddr);</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='del'>-	if (module &amp;&amp; IS_ENABLED(CONFIG_DEBUG_SET_MODULE_RONX))</div><div class='add'>+	if (module &amp;&amp; IS_ENABLED(CONFIG_STRICT_MODULE_RWX))</div><div class='ctx'> 		page = vmalloc_to_page(addr);</div><div class='ctx'> 	else if (!module)</div><div class='del'>-		page = pfn_to_page(PHYS_PFN(__pa(addr)));</div><div class='add'>+		page = phys_to_page(__pa_symbol(addr));</div><div class='ctx'> 	else</div><div class='ctx'> 		return addr;</div><div class='ctx'> </div><div class='hunk'>@@ -418,6 +418,35 @@ u32 __kprobes aarch64_insn_encode_immediate(enum aarch64_insn_imm_type type,</div><div class='ctx'> 	return insn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 aarch64_insn_decode_register(enum aarch64_insn_register_type type,</div><div class='add'>+					u32 insn)</div><div class='add'>+{</div><div class='add'>+	int shift;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case AARCH64_INSN_REGTYPE_RT:</div><div class='add'>+	case AARCH64_INSN_REGTYPE_RD:</div><div class='add'>+		shift = 0;</div><div class='add'>+		break;</div><div class='add'>+	case AARCH64_INSN_REGTYPE_RN:</div><div class='add'>+		shift = 5;</div><div class='add'>+		break;</div><div class='add'>+	case AARCH64_INSN_REGTYPE_RT2:</div><div class='add'>+	case AARCH64_INSN_REGTYPE_RA:</div><div class='add'>+		shift = 10;</div><div class='add'>+		break;</div><div class='add'>+	case AARCH64_INSN_REGTYPE_RM:</div><div class='add'>+		shift = 16;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("%s: unknown register type encoding %d\n", __func__,</div><div class='add'>+		       type);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (insn &gt;&gt; shift) &amp; GENMASK(4, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 aarch64_insn_encode_register(enum aarch64_insn_register_type type,</div><div class='ctx'> 					u32 insn,</div><div class='ctx'> 					enum aarch64_insn_register reg)</div><div class='head'>diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c<br/>index e017a9493b92..2122cd187f19 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/kgdb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/kgdb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/kgdb.c</a></div><div class='hunk'>@@ -24,6 +24,8 @@</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/kgdb.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/debug-monitors.h&gt;</div><div class='ctx'> #include &lt;asm/insn.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='hunk'>@@ -247,6 +249,9 @@ NOKPROBE_SYMBOL(kgdb_compiled_brk_fn);</div><div class='ctx'> </div><div class='ctx'> static int kgdb_step_brk_fn(struct pt_regs *regs, unsigned int esr)</div><div class='ctx'> {</div><div class='add'>+	if (!kgdb_single_step)</div><div class='add'>+		return DBG_HOOK_ERROR;</div><div class='add'>+</div><div class='ctx'> 	kgdb_handle_exception(1, SIGTRAP, 0, regs);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c<br/>index acf38722457b..4f0e3ebfea4b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/pci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/pci.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/pci.c</a></div><div class='hunk'>@@ -114,6 +114,19 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pci_acpi_root_prepare_resources(struct acpi_pci_root_info *ci)</div><div class='add'>+{</div><div class='add'>+	struct resource_entry *entry, *tmp;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = acpi_pci_probe_root_resources(ci);</div><div class='add'>+	resource_list_for_each_entry_safe(entry, tmp, &amp;ci-&gt;resources) {</div><div class='add'>+		if (!(entry-&gt;res-&gt;flags &amp; IORESOURCE_WINDOW))</div><div class='add'>+			resource_list_destroy_entry(entry);</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Lookup the bus range for the domain in MCFG, and set up config space</div><div class='ctx'>  * mapping.</div><div class='hunk'>@@ -121,31 +134,33 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)</div><div class='ctx'> static struct pci_config_window *</div><div class='ctx'> pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;root-&gt;device-&gt;dev;</div><div class='ctx'> 	struct resource *bus_res = &amp;root-&gt;secondary;</div><div class='ctx'> 	u16 seg = root-&gt;segment;</div><div class='del'>-	struct pci_config_window *cfg;</div><div class='add'>+	struct pci_ecam_ops *ecam_ops;</div><div class='ctx'> 	struct resource cfgres;</div><div class='del'>-	unsigned int bsz;</div><div class='del'>-</div><div class='del'>-	/* Use address from _CBA if present, otherwise lookup MCFG */</div><div class='del'>-	if (!root-&gt;mcfg_addr)</div><div class='del'>-		root-&gt;mcfg_addr = pci_mcfg_lookup(seg, bus_res);</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+	struct pci_config_window *cfg;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!root-&gt;mcfg_addr) {</div><div class='del'>-		dev_err(&amp;root-&gt;device-&gt;dev, "%04x:%pR ECAM region not found\n",</div><div class='del'>-			seg, bus_res);</div><div class='add'>+	ret = pci_mcfg_lookup(root, &amp;cfgres, &amp;ecam_ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "%04x:%pR ECAM region not found\n", seg, bus_res);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bsz = 1 &lt;&lt; pci_generic_ecam_ops.bus_shift;</div><div class='del'>-	cfgres.start = root-&gt;mcfg_addr + bus_res-&gt;start * bsz;</div><div class='del'>-	cfgres.end = cfgres.start + resource_size(bus_res) * bsz - 1;</div><div class='del'>-	cfgres.flags = IORESOURCE_MEM;</div><div class='del'>-	cfg = pci_ecam_create(&amp;root-&gt;device-&gt;dev, &amp;cfgres, bus_res,</div><div class='del'>-			      &amp;pci_generic_ecam_ops);</div><div class='add'>+	adev = acpi_resource_consumer(&amp;cfgres);</div><div class='add'>+	if (adev)</div><div class='add'>+		dev_info(dev, "ECAM area %pR reserved by %s\n", &amp;cfgres,</div><div class='add'>+			 dev_name(&amp;adev-&gt;dev));</div><div class='add'>+	else</div><div class='add'>+		dev_warn(dev, FW_BUG "ECAM area %pR not reserved in ACPI namespace\n",</div><div class='add'>+			 &amp;cfgres);</div><div class='add'>+</div><div class='add'>+	cfg = pci_ecam_create(dev, &amp;cfgres, bus_res, ecam_ops);</div><div class='ctx'> 	if (IS_ERR(cfg)) {</div><div class='del'>-		dev_err(&amp;root-&gt;device-&gt;dev, "%04x:%pR error %ld mapping ECAM\n",</div><div class='del'>-			seg, bus_res, PTR_ERR(cfg));</div><div class='add'>+		dev_err(dev, "%04x:%pR error %ld mapping ECAM\n", seg, bus_res,</div><div class='add'>+			PTR_ERR(cfg));</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -159,33 +174,37 @@ static void pci_acpi_generic_release_info(struct acpi_pci_root_info *ci)</div><div class='ctx'> </div><div class='ctx'> 	ri = container_of(ci, struct acpi_pci_generic_root_info, common);</div><div class='ctx'> 	pci_ecam_free(ri-&gt;cfg);</div><div class='add'>+	kfree(ci-&gt;ops);</div><div class='ctx'> 	kfree(ri);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct acpi_pci_root_ops acpi_pci_root_ops = {</div><div class='del'>-	.release_info = pci_acpi_generic_release_info,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Interface called from ACPI code to setup PCI host controller */</div><div class='ctx'> struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	int node = acpi_get_node(root-&gt;device-&gt;handle);</div><div class='ctx'> 	struct acpi_pci_generic_root_info *ri;</div><div class='ctx'> 	struct pci_bus *bus, *child;</div><div class='add'>+	struct acpi_pci_root_ops *root_ops;</div><div class='ctx'> </div><div class='ctx'> 	ri = kzalloc_node(sizeof(*ri), GFP_KERNEL, node);</div><div class='ctx'> 	if (!ri)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	root_ops = kzalloc_node(sizeof(*root_ops), GFP_KERNEL, node);</div><div class='add'>+	if (!root_ops)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	ri-&gt;cfg = pci_acpi_setup_ecam_mapping(root);</div><div class='ctx'> 	if (!ri-&gt;cfg) {</div><div class='ctx'> 		kfree(ri);</div><div class='add'>+		kfree(root_ops);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acpi_pci_root_ops.pci_ops = &amp;ri-&gt;cfg-&gt;ops-&gt;pci_ops;</div><div class='del'>-	bus = acpi_pci_root_create(root, &amp;acpi_pci_root_ops, &amp;ri-&gt;common,</div><div class='del'>-				   ri-&gt;cfg);</div><div class='add'>+	root_ops-&gt;release_info = pci_acpi_generic_release_info;</div><div class='add'>+	root_ops-&gt;prepare_resources = pci_acpi_root_prepare_resources;</div><div class='add'>+	root_ops-&gt;pci_ops = &amp;ri-&gt;cfg-&gt;ops-&gt;pci_ops;</div><div class='add'>+	bus = acpi_pci_root_create(root, root_ops, &amp;ri-&gt;common, ri-&gt;cfg);</div><div class='ctx'> 	if (!bus)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/perf_regs.c b/arch/arm64/kernel/perf_regs.c<br/>index 3f62b35fb6f1..bd1b74c2436f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/perf_regs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/perf_regs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/perf_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/perf_regs.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/compat.h&gt;</div><div class='ctx'> #include &lt;asm/perf_regs.h&gt;</div><div class='head'>diff --git a/arch/arm64/kernel/probes/Makefile b/arch/arm64/kernel/probes/Makefile<br/>index ce06312e3d34..89b6df613dde 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/probes/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/probes/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/probes/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/Makefile</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='ctx'> obj-$(CONFIG_KPROBES)		+= kprobes.o decode-insn.o	\</div><div class='ctx'> 				   kprobes_trampoline.o		\</div><div class='ctx'> 				   simulate-insn.o</div><div class='add'>+obj-$(CONFIG_UPROBES)		+= uprobes.o decode-insn.o	\</div><div class='add'>+				   simulate-insn.o</div><div class='head'>diff --git a/arch/arm64/kernel/probes/decode-insn.c b/arch/arm64/kernel/probes/decode-insn.c<br/>index d1731bf977ef..6bf6657a5a52 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/probes/decode-insn.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/probes/decode-insn.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/probes/decode-insn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/decode-insn.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='del'>-#include &lt;asm/kprobes.h&gt;</div><div class='ctx'> #include &lt;asm/insn.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -78,8 +77,8 @@ static bool __kprobes aarch64_insn_is_steppable(u32 insn)</div><div class='ctx'>  *   INSN_GOOD         If instruction is supported and uses instruction slot,</div><div class='ctx'>  *   INSN_GOOD_NO_SLOT If instruction is supported but doesn't use its slot.</div><div class='ctx'>  */</div><div class='del'>-static enum kprobe_insn __kprobes</div><div class='del'>-arm_probe_decode_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi)</div><div class='add'>+enum probe_insn __kprobes</div><div class='add'>+arm_probe_decode_insn(probe_opcode_t insn, struct arch_probe_insn *api)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Instructions reading or modifying the PC won't work from the XOL</div><div class='hunk'>@@ -89,26 +88,26 @@ arm_probe_decode_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi)</div><div class='ctx'> 		return INSN_GOOD;</div><div class='ctx'> </div><div class='ctx'> 	if (aarch64_insn_is_bcond(insn)) {</div><div class='del'>-		asi-&gt;handler = simulate_b_cond;</div><div class='add'>+		api-&gt;handler = simulate_b_cond;</div><div class='ctx'> 	} else if (aarch64_insn_is_cbz(insn) ||</div><div class='ctx'> 	    aarch64_insn_is_cbnz(insn)) {</div><div class='del'>-		asi-&gt;handler = simulate_cbz_cbnz;</div><div class='add'>+		api-&gt;handler = simulate_cbz_cbnz;</div><div class='ctx'> 	} else if (aarch64_insn_is_tbz(insn) ||</div><div class='ctx'> 	    aarch64_insn_is_tbnz(insn)) {</div><div class='del'>-		asi-&gt;handler = simulate_tbz_tbnz;</div><div class='add'>+		api-&gt;handler = simulate_tbz_tbnz;</div><div class='ctx'> 	} else if (aarch64_insn_is_adr_adrp(insn)) {</div><div class='del'>-		asi-&gt;handler = simulate_adr_adrp;</div><div class='add'>+		api-&gt;handler = simulate_adr_adrp;</div><div class='ctx'> 	} else if (aarch64_insn_is_b(insn) ||</div><div class='ctx'> 	    aarch64_insn_is_bl(insn)) {</div><div class='del'>-		asi-&gt;handler = simulate_b_bl;</div><div class='add'>+		api-&gt;handler = simulate_b_bl;</div><div class='ctx'> 	} else if (aarch64_insn_is_br(insn) ||</div><div class='ctx'> 	    aarch64_insn_is_blr(insn) ||</div><div class='ctx'> 	    aarch64_insn_is_ret(insn)) {</div><div class='del'>-		asi-&gt;handler = simulate_br_blr_ret;</div><div class='add'>+		api-&gt;handler = simulate_br_blr_ret;</div><div class='ctx'> 	} else if (aarch64_insn_is_ldr_lit(insn)) {</div><div class='del'>-		asi-&gt;handler = simulate_ldr_literal;</div><div class='add'>+		api-&gt;handler = simulate_ldr_literal;</div><div class='ctx'> 	} else if (aarch64_insn_is_ldrsw_lit(insn)) {</div><div class='del'>-		asi-&gt;handler = simulate_ldrsw_literal;</div><div class='add'>+		api-&gt;handler = simulate_ldrsw_literal;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Instruction cannot be stepped out-of-line and we don't</div><div class='hunk'>@@ -120,6 +119,7 @@ arm_probe_decode_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi)</div><div class='ctx'> 	return INSN_GOOD_NO_SLOT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> static bool __kprobes</div><div class='ctx'> is_probed_address_atomic(kprobe_opcode_t *scan_start, kprobe_opcode_t *scan_end)</div><div class='ctx'> {</div><div class='hunk'>@@ -138,12 +138,12 @@ is_probed_address_atomic(kprobe_opcode_t *scan_start, kprobe_opcode_t *scan_end)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum kprobe_insn __kprobes</div><div class='add'>+enum probe_insn __kprobes</div><div class='ctx'> arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)</div><div class='ctx'> {</div><div class='del'>-	enum kprobe_insn decoded;</div><div class='del'>-	kprobe_opcode_t insn = le32_to_cpu(*addr);</div><div class='del'>-	kprobe_opcode_t *scan_end = NULL;</div><div class='add'>+	enum probe_insn decoded;</div><div class='add'>+	probe_opcode_t insn = le32_to_cpu(*addr);</div><div class='add'>+	probe_opcode_t *scan_end = NULL;</div><div class='ctx'> 	unsigned long size = 0, offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -162,7 +162,7 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)</div><div class='ctx'> 		else</div><div class='ctx'> 			scan_end = addr - MAX_ATOMIC_CONTEXT_SIZE;</div><div class='ctx'> 	}</div><div class='del'>-	decoded = arm_probe_decode_insn(insn, asi);</div><div class='add'>+	decoded = arm_probe_decode_insn(insn, &amp;asi-&gt;api);</div><div class='ctx'> </div><div class='ctx'> 	if (decoded != INSN_REJECTED &amp;&amp; scan_end)</div><div class='ctx'> 		if (is_probed_address_atomic(addr - 1, scan_end))</div><div class='hunk'>@@ -170,3 +170,4 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)</div><div class='ctx'> </div><div class='ctx'> 	return decoded;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm64/kernel/probes/decode-insn.h b/arch/arm64/kernel/probes/decode-insn.h<br/>index d438289646a6..192ab007bacb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/probes/decode-insn.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/probes/decode-insn.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/probes/decode-insn.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/decode-insn.h</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'> #ifndef _ARM_KERNEL_KPROBES_ARM64_H</div><div class='ctx'> #define _ARM_KERNEL_KPROBES_ARM64_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/kprobes.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * ARM strongly recommends a limit of 128 bytes between LoadExcl and</div><div class='ctx'>  * StoreExcl instructions in a single thread of execution. So keep the</div><div class='hunk'>@@ -23,13 +25,17 @@</div><div class='ctx'>  */</div><div class='ctx'> #define MAX_ATOMIC_CONTEXT_SIZE	(128 / sizeof(kprobe_opcode_t))</div><div class='ctx'> </div><div class='del'>-enum kprobe_insn {</div><div class='add'>+enum probe_insn {</div><div class='ctx'> 	INSN_REJECTED,</div><div class='ctx'> 	INSN_GOOD_NO_SLOT,</div><div class='ctx'> 	INSN_GOOD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum kprobe_insn __kprobes</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+enum probe_insn __kprobes</div><div class='ctx'> arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi);</div><div class='add'>+#endif</div><div class='add'>+enum probe_insn __kprobes</div><div class='add'>+arm_probe_decode_insn(probe_opcode_t insn, struct arch_probe_insn *asi);</div><div class='ctx'> </div><div class='ctx'> #endif /* _ARM_KERNEL_KPROBES_ARM64_H */</div><div class='head'>diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c<br/>index f5077ea7af6d..2a07aae5b8a2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/probes/kprobes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/probes/kprobes.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/probes/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/kprobes.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/stop_machine.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -29,7 +30,7 @@</div><div class='ctx'> #include &lt;asm/debug-monitors.h&gt;</div><div class='ctx'> #include &lt;asm/system_misc.h&gt;</div><div class='ctx'> #include &lt;asm/insn.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -44,31 +45,31 @@ post_kprobe_handler(struct kprobe_ctlblk *, struct pt_regs *);</div><div class='ctx'> static void __kprobes arch_prepare_ss_slot(struct kprobe *p)</div><div class='ctx'> {</div><div class='ctx'> 	/* prepare insn slot */</div><div class='del'>-	p-&gt;ainsn.insn[0] = cpu_to_le32(p-&gt;opcode);</div><div class='add'>+	p-&gt;ainsn.api.insn[0] = cpu_to_le32(p-&gt;opcode);</div><div class='ctx'> </div><div class='del'>-	flush_icache_range((uintptr_t) (p-&gt;ainsn.insn),</div><div class='del'>-			   (uintptr_t) (p-&gt;ainsn.insn) +</div><div class='add'>+	flush_icache_range((uintptr_t) (p-&gt;ainsn.api.insn),</div><div class='add'>+			   (uintptr_t) (p-&gt;ainsn.api.insn) +</div><div class='ctx'> 			   MAX_INSN_SIZE * sizeof(kprobe_opcode_t));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Needs restoring of return address after stepping xol.</div><div class='ctx'> 	 */</div><div class='del'>-	p-&gt;ainsn.restore = (unsigned long) p-&gt;addr +</div><div class='add'>+	p-&gt;ainsn.api.restore = (unsigned long) p-&gt;addr +</div><div class='ctx'> 	  sizeof(kprobe_opcode_t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __kprobes arch_prepare_simulate(struct kprobe *p)</div><div class='ctx'> {</div><div class='ctx'> 	/* This instructions is not executed xol. No need to adjust the PC */</div><div class='del'>-	p-&gt;ainsn.restore = 0;</div><div class='add'>+	p-&gt;ainsn.api.restore = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __kprobes arch_simulate_insn(struct kprobe *p, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;ainsn.handler)</div><div class='del'>-		p-&gt;ainsn.handler((u32)p-&gt;opcode, (long)p-&gt;addr, regs);</div><div class='add'>+	if (p-&gt;ainsn.api.handler)</div><div class='add'>+		p-&gt;ainsn.api.handler((u32)p-&gt;opcode, (long)p-&gt;addr, regs);</div><div class='ctx'> </div><div class='ctx'> 	/* single step simulated, now go for post processing */</div><div class='ctx'> 	post_kprobe_handler(kcb, regs);</div><div class='hunk'>@@ -98,18 +99,18 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	case INSN_GOOD_NO_SLOT:	/* insn need simulation */</div><div class='del'>-		p-&gt;ainsn.insn = NULL;</div><div class='add'>+		p-&gt;ainsn.api.insn = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case INSN_GOOD:	/* instruction uses slot */</div><div class='del'>-		p-&gt;ainsn.insn = get_insn_slot();</div><div class='del'>-		if (!p-&gt;ainsn.insn)</div><div class='add'>+		p-&gt;ainsn.api.insn = get_insn_slot();</div><div class='add'>+		if (!p-&gt;ainsn.api.insn)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		break;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* prepare the instruction */</div><div class='del'>-	if (p-&gt;ainsn.insn)</div><div class='add'>+	if (p-&gt;ainsn.api.insn)</div><div class='ctx'> 		arch_prepare_ss_slot(p);</div><div class='ctx'> 	else</div><div class='ctx'> 		arch_prepare_simulate(p);</div><div class='hunk'>@@ -142,9 +143,9 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)</div><div class='ctx'> </div><div class='ctx'> void __kprobes arch_remove_kprobe(struct kprobe *p)</div><div class='ctx'> {</div><div class='del'>-	if (p-&gt;ainsn.insn) {</div><div class='del'>-		free_insn_slot(p-&gt;ainsn.insn, 0);</div><div class='del'>-		p-&gt;ainsn.insn = NULL;</div><div class='add'>+	if (p-&gt;ainsn.api.insn) {</div><div class='add'>+		free_insn_slot(p-&gt;ainsn.api.insn, 0);</div><div class='add'>+		p-&gt;ainsn.api.insn = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -244,9 +245,9 @@ static void __kprobes setup_singlestep(struct kprobe *p,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if (p-&gt;ainsn.insn) {</div><div class='add'>+	if (p-&gt;ainsn.api.insn) {</div><div class='ctx'> 		/* prepare for single stepping */</div><div class='del'>-		slot = (unsigned long)p-&gt;ainsn.insn;</div><div class='add'>+		slot = (unsigned long)p-&gt;ainsn.api.insn;</div><div class='ctx'> </div><div class='ctx'> 		set_ss_context(kcb, slot);	/* mark pending ss */</div><div class='ctx'> </div><div class='hunk'>@@ -295,8 +296,8 @@ post_kprobe_handler(struct kprobe_ctlblk *kcb, struct pt_regs *regs)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* return addr restore if non-branching insn */</div><div class='del'>-	if (cur-&gt;ainsn.restore != 0)</div><div class='del'>-		instruction_pointer_set(regs, cur-&gt;ainsn.restore);</div><div class='add'>+	if (cur-&gt;ainsn.api.restore != 0)</div><div class='add'>+		instruction_pointer_set(regs, cur-&gt;ainsn.api.restore);</div><div class='ctx'> </div><div class='ctx'> 	/* restore back original saved kprobe variables and continue */</div><div class='ctx'> 	if (kcb-&gt;kprobe_status == KPROBE_REENTER) {</div><div class='head'>diff --git a/arch/arm64/kernel/probes/simulate-insn.c b/arch/arm64/kernel/probes/simulate-insn.c<br/>index 8977ce9d009d..be05868418ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/probes/simulate-insn.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/probes/simulate-insn.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/probes/simulate-insn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/simulate-insn.c</a></div><div class='hunk'>@@ -13,55 +13,47 @@</div><div class='ctx'>  * General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "simulate-insn.h"</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='del'>-#define sign_extend(x, signbit)		\</div><div class='del'>-	((x) | (0 - ((x) &amp; (1 &lt;&lt; (signbit)))))</div><div class='add'>+#include "simulate-insn.h"</div><div class='ctx'> </div><div class='ctx'> #define bbl_displacement(insn)		\</div><div class='del'>-	sign_extend(((insn) &amp; 0x3ffffff) &lt;&lt; 2, 27)</div><div class='add'>+	sign_extend32(((insn) &amp; 0x3ffffff) &lt;&lt; 2, 27)</div><div class='ctx'> </div><div class='ctx'> #define bcond_displacement(insn)	\</div><div class='del'>-	sign_extend(((insn &gt;&gt; 5) &amp; 0x7ffff) &lt;&lt; 2, 20)</div><div class='add'>+	sign_extend32(((insn &gt;&gt; 5) &amp; 0x7ffff) &lt;&lt; 2, 20)</div><div class='ctx'> </div><div class='ctx'> #define cbz_displacement(insn)	\</div><div class='del'>-	sign_extend(((insn &gt;&gt; 5) &amp; 0x7ffff) &lt;&lt; 2, 20)</div><div class='add'>+	sign_extend32(((insn &gt;&gt; 5) &amp; 0x7ffff) &lt;&lt; 2, 20)</div><div class='ctx'> </div><div class='ctx'> #define tbz_displacement(insn)	\</div><div class='del'>-	sign_extend(((insn &gt;&gt; 5) &amp; 0x3fff) &lt;&lt; 2, 15)</div><div class='add'>+	sign_extend32(((insn &gt;&gt; 5) &amp; 0x3fff) &lt;&lt; 2, 15)</div><div class='ctx'> </div><div class='ctx'> #define ldr_displacement(insn)	\</div><div class='del'>-	sign_extend(((insn &gt;&gt; 5) &amp; 0x7ffff) &lt;&lt; 2, 20)</div><div class='add'>+	sign_extend32(((insn &gt;&gt; 5) &amp; 0x7ffff) &lt;&lt; 2, 20)</div><div class='ctx'> </div><div class='ctx'> static inline void set_x_reg(struct pt_regs *regs, int reg, u64 val)</div><div class='ctx'> {</div><div class='del'>-	if (reg &lt; 31)</div><div class='del'>-		regs-&gt;regs[reg] = val;</div><div class='add'>+	pt_regs_write_reg(regs, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void set_w_reg(struct pt_regs *regs, int reg, u64 val)</div><div class='ctx'> {</div><div class='del'>-	if (reg &lt; 31)</div><div class='del'>-		regs-&gt;regs[reg] = lower_32_bits(val);</div><div class='add'>+	pt_regs_write_reg(regs, reg, lower_32_bits(val));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u64 get_x_reg(struct pt_regs *regs, int reg)</div><div class='ctx'> {</div><div class='del'>-	if (reg &lt; 31)</div><div class='del'>-		return regs-&gt;regs[reg];</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='add'>+	return pt_regs_read_reg(regs, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32 get_w_reg(struct pt_regs *regs, int reg)</div><div class='ctx'> {</div><div class='del'>-	if (reg &lt; 31)</div><div class='del'>-		return lower_32_bits(regs-&gt;regs[reg]);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='add'>+	return lower_32_bits(pt_regs_read_reg(regs, reg));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool __kprobes check_cbz(u32 opcode, struct pt_regs *regs)</div><div class='hunk'>@@ -106,7 +98,7 @@ simulate_adr_adrp(u32 opcode, long addr, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	xn = opcode &amp; 0x1f;</div><div class='ctx'> 	imm = ((opcode &gt;&gt; 3) &amp; 0x1ffffc) | ((opcode &gt;&gt; 29) &amp; 0x3);</div><div class='del'>-	imm = sign_extend(imm, 20);</div><div class='add'>+	imm = sign_extend64(imm, 20);</div><div class='ctx'> 	if (opcode &amp; 0x80000000)</div><div class='ctx'> 		val = (imm&lt;&lt;12) + (addr &amp; 0xfffffffffffff000);</div><div class='ctx'> 	else</div><div class='head'>diff --git a/arch/arm64/kernel/probes/uprobes.c b/arch/arm64/kernel/probes/uprobes.c<br/>new file mode 100644<br/>index 000000000000..26c998534dca<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/probes/uprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/probes/uprobes.c</a></div><div class='hunk'>@@ -0,0 +1,216 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2014-2016 Pratyush Anand &lt;panand@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/uprobes.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+</div><div class='add'>+#include "decode-insn.h"</div><div class='add'>+</div><div class='add'>+#define UPROBE_INV_FAULT_CODE	UINT_MAX</div><div class='add'>+</div><div class='add'>+void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,</div><div class='add'>+		void *src, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	void *xol_page_kaddr = kmap_atomic(page);</div><div class='add'>+	void *dst = xol_page_kaddr + (vaddr &amp; ~PAGE_MASK);</div><div class='add'>+</div><div class='add'>+	/* Initialize the slot */</div><div class='add'>+	memcpy(dst, src, len);</div><div class='add'>+</div><div class='add'>+	/* flush caches (dcache/icache) */</div><div class='add'>+	sync_icache_aliases(dst, len);</div><div class='add'>+</div><div class='add'>+	kunmap_atomic(xol_page_kaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long uprobe_get_swbp_addr(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return instruction_pointer(regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm,</div><div class='add'>+		unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	probe_opcode_t insn;</div><div class='add'>+</div><div class='add'>+	/* TODO: Currently we do not support AARCH32 instruction probing */</div><div class='add'>+	if (test_bit(TIF_32BIT, &amp;mm-&gt;context.flags))</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	else if (!IS_ALIGNED(addr, AARCH64_INSN_SIZE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	insn = *(probe_opcode_t *)(&amp;auprobe-&gt;insn[0]);</div><div class='add'>+</div><div class='add'>+	switch (arm_probe_decode_insn(insn, &amp;auprobe-&gt;api)) {</div><div class='add'>+	case INSN_REJECTED:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	case INSN_GOOD_NO_SLOT:</div><div class='add'>+		auprobe-&gt;simulate = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_uprobe_pre_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct uprobe_task *utask = current-&gt;utask;</div><div class='add'>+</div><div class='add'>+	/* Initialize with an invalid fault code to detect if ol insn trapped */</div><div class='add'>+	current-&gt;thread.fault_code = UPROBE_INV_FAULT_CODE;</div><div class='add'>+</div><div class='add'>+	/* Instruction points to execute ol */</div><div class='add'>+	instruction_pointer_set(regs, utask-&gt;xol_vaddr);</div><div class='add'>+</div><div class='add'>+	user_enable_single_step(current);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct uprobe_task *utask = current-&gt;utask;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(current-&gt;thread.fault_code != UPROBE_INV_FAULT_CODE);</div><div class='add'>+</div><div class='add'>+	/* Instruction points to execute next to breakpoint address */</div><div class='add'>+	instruction_pointer_set(regs, utask-&gt;vaddr + 4);</div><div class='add'>+</div><div class='add'>+	user_disable_single_step(current);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+bool arch_uprobe_xol_was_trapped(struct task_struct *t)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Between arch_uprobe_pre_xol and arch_uprobe_post_xol, if an xol</div><div class='add'>+	 * insn itself is trapped, then detect the case with the help of</div><div class='add'>+	 * invalid fault code which is being set in arch_uprobe_pre_xol</div><div class='add'>+	 */</div><div class='add'>+	if (t-&gt;thread.fault_code != UPROBE_INV_FAULT_CODE)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	probe_opcode_t insn;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+	if (!auprobe-&gt;simulate)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	insn = *(probe_opcode_t *)(&amp;auprobe-&gt;insn[0]);</div><div class='add'>+	addr = instruction_pointer(regs);</div><div class='add'>+</div><div class='add'>+	if (auprobe-&gt;api.handler)</div><div class='add'>+		auprobe-&gt;api.handler(insn, addr, regs);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct uprobe_task *utask = current-&gt;utask;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Task has received a fatal signal, so reset back to probbed</div><div class='add'>+	 * address.</div><div class='add'>+	 */</div><div class='add'>+	instruction_pointer_set(regs, utask-&gt;vaddr);</div><div class='add'>+</div><div class='add'>+	user_disable_single_step(current);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool arch_uretprobe_is_alive(struct return_instance *ret, enum rp_check ctx,</div><div class='add'>+		struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * If a simple branch instruction (B) was called for retprobed</div><div class='add'>+	 * assembly label then return true even when regs-&gt;sp and ret-&gt;stack</div><div class='add'>+	 * are same. It will ensure that cleanup and reporting of return</div><div class='add'>+	 * instances corresponding to callee label is done when</div><div class='add'>+	 * handle_trampoline for called function is executed.</div><div class='add'>+	 */</div><div class='add'>+	if (ctx == RP_CHECK_CHAIN_CALL)</div><div class='add'>+		return regs-&gt;sp &lt;= ret-&gt;stack;</div><div class='add'>+	else</div><div class='add'>+		return regs-&gt;sp &lt; ret-&gt;stack;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long</div><div class='add'>+arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr,</div><div class='add'>+				  struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long orig_ret_vaddr;</div><div class='add'>+</div><div class='add'>+	orig_ret_vaddr = procedure_link_pointer(regs);</div><div class='add'>+	/* Replace the return addr with trampoline addr */</div><div class='add'>+	procedure_link_pointer_set(regs, trampoline_vaddr);</div><div class='add'>+</div><div class='add'>+	return orig_ret_vaddr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_uprobe_exception_notify(struct notifier_block *self,</div><div class='add'>+				 unsigned long val, void *data)</div><div class='add'>+{</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int uprobe_breakpoint_handler(struct pt_regs *regs,</div><div class='add'>+		unsigned int esr)</div><div class='add'>+{</div><div class='add'>+	if (user_mode(regs) &amp;&amp; uprobe_pre_sstep_notifier(regs))</div><div class='add'>+		return DBG_HOOK_HANDLED;</div><div class='add'>+</div><div class='add'>+	return DBG_HOOK_ERROR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int uprobe_single_step_handler(struct pt_regs *regs,</div><div class='add'>+		unsigned int esr)</div><div class='add'>+{</div><div class='add'>+	struct uprobe_task *utask = current-&gt;utask;</div><div class='add'>+</div><div class='add'>+	if (user_mode(regs)) {</div><div class='add'>+		WARN_ON(utask &amp;&amp;</div><div class='add'>+			(instruction_pointer(regs) != utask-&gt;xol_vaddr + 4));</div><div class='add'>+</div><div class='add'>+		if (uprobe_post_sstep_notifier(regs))</div><div class='add'>+			return DBG_HOOK_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return DBG_HOOK_ERROR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* uprobe breakpoint handler hook */</div><div class='add'>+static struct break_hook uprobes_break_hook = {</div><div class='add'>+	.esr_mask = BRK64_ESR_MASK,</div><div class='add'>+	.esr_val = BRK64_ESR_UPROBES,</div><div class='add'>+	.fn = uprobe_breakpoint_handler,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* uprobe single step handler hook */</div><div class='add'>+static struct step_hook uprobes_step_hook = {</div><div class='add'>+	.fn = uprobe_single_step_handler,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init arch_init_uprobes(void)</div><div class='add'>+{</div><div class='add'>+	register_break_hook(&amp;uprobes_break_hook);</div><div class='add'>+	register_step_hook(&amp;uprobes_step_hook);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(arch_init_uprobes);</div><div class='head'>diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c<br/>index 01753cd7d3f0..043d373b8369 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/process.c</a></div><div class='hunk'>@@ -24,6 +24,9 @@</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='hunk'>@@ -45,6 +48,7 @@</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;trace/events/power.h&gt;</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/alternative.h&gt;</div><div class='ctx'> #include &lt;asm/compat.h&gt;</div><div class='hunk'>@@ -282,7 +286,7 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start,</div><div class='ctx'> 		memset(childregs, 0, sizeof(struct pt_regs));</div><div class='ctx'> 		childregs-&gt;pstate = PSR_MODE_EL1h;</div><div class='ctx'> 		if (IS_ENABLED(CONFIG_ARM64_UAO) &amp;&amp;</div><div class='del'>-		    cpus_have_cap(ARM64_HAS_UAO))</div><div class='add'>+		    cpus_have_const_cap(ARM64_HAS_UAO))</div><div class='ctx'> 			childregs-&gt;pstate |= PSR_UAO_BIT;</div><div class='ctx'> 		p-&gt;thread.cpu_context.x19 = stack_start;</div><div class='ctx'> 		p-&gt;thread.cpu_context.x20 = stk_sz;</div><div class='hunk'>@@ -322,9 +326,23 @@ void uao_thread_switch(struct task_struct *next)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * We store our current task in sp_el0, which is clobbered by userspace. Keep a</div><div class='add'>+ * shadow copy so that we can restore this upon entry from userspace.</div><div class='add'>+ *</div><div class='add'>+ * This is *only* for exception entry from EL0, and is not valid until we</div><div class='add'>+ * __switch_to() a user task.</div><div class='add'>+ */</div><div class='add'>+DEFINE_PER_CPU(struct task_struct *, __entry_task);</div><div class='add'>+</div><div class='add'>+static void entry_task_switch(struct task_struct *next)</div><div class='add'>+{</div><div class='add'>+	__this_cpu_write(__entry_task, next);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Thread switching.</div><div class='ctx'>  */</div><div class='del'>-struct task_struct *__switch_to(struct task_struct *prev,</div><div class='add'>+__notrace_funcgraph struct task_struct *__switch_to(struct task_struct *prev,</div><div class='ctx'> 				struct task_struct *next)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *last;</div><div class='hunk'>@@ -333,6 +351,7 @@ struct task_struct *__switch_to(struct task_struct *prev,</div><div class='ctx'> 	tls_thread_switch(next);</div><div class='ctx'> 	hw_breakpoint_thread_switch(next);</div><div class='ctx'> 	contextidr_thread_switch(next);</div><div class='add'>+	entry_task_switch(next);</div><div class='ctx'> 	uao_thread_switch(next);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -350,27 +369,35 @@ struct task_struct *__switch_to(struct task_struct *prev,</div><div class='ctx'> unsigned long get_wchan(struct task_struct *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct stackframe frame;</div><div class='del'>-	unsigned long stack_page;</div><div class='add'>+	unsigned long stack_page, ret = 0;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> 	if (!p || p == current || p-&gt;state == TASK_RUNNING)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	stack_page = (unsigned long)try_get_task_stack(p);</div><div class='add'>+	if (!stack_page)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	frame.fp = thread_saved_fp(p);</div><div class='ctx'> 	frame.sp = thread_saved_sp(p);</div><div class='ctx'> 	frame.pc = thread_saved_pc(p);</div><div class='ctx'> #ifdef CONFIG_FUNCTION_GRAPH_TRACER</div><div class='ctx'> 	frame.graph = p-&gt;curr_ret_stack;</div><div class='ctx'> #endif</div><div class='del'>-	stack_page = (unsigned long)task_stack_page(p);</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (frame.sp &lt; stack_page ||</div><div class='ctx'> 		    frame.sp &gt;= stack_page + THREAD_SIZE ||</div><div class='ctx'> 		    unwind_frame(p, &amp;frame))</div><div class='del'>-			return 0;</div><div class='del'>-		if (!in_sched_functions(frame.pc))</div><div class='del'>-			return frame.pc;</div><div class='add'>+			goto out;</div><div class='add'>+		if (!in_sched_functions(frame.pc)) {</div><div class='add'>+			ret = frame.pc;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	} while (count ++ &lt; 16);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	put_task_stack(p);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long arch_align_stack(unsigned long sp)</div><div class='hunk'>@@ -383,7 +410,7 @@ unsigned long arch_align_stack(unsigned long sp)</div><div class='ctx'> unsigned long arch_randomize_brk(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	if (is_compat_task())</div><div class='del'>-		return randomize_page(mm-&gt;brk, 0x02000000);</div><div class='add'>+		return randomize_page(mm-&gt;brk, SZ_32M);</div><div class='ctx'> 	else</div><div class='del'>-		return randomize_page(mm-&gt;brk, 0x40000000);</div><div class='add'>+		return randomize_page(mm-&gt;brk, SZ_1G);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c<br/>index 42816bebb1e0..e8edbf13302a 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/psci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/psci.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/psci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/psci.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/psci.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/psci.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -45,7 +46,7 @@ static int __init cpu_psci_cpu_prepare(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> static int cpu_psci_cpu_boot(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	int err = psci_ops.cpu_on(cpu_logical_map(cpu), __pa(secondary_entry));</div><div class='add'>+	int err = psci_ops.cpu_on(cpu_logical_map(cpu), __pa_symbol(secondary_entry));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		pr_err("failed to boot CPU%d (%d)\n", cpu, err);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c<br/>index e0c81da60f76..c142459a88f3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/ptrace.c</a></div><div class='hunk'>@@ -22,7 +22,8 @@</div><div class='ctx'> #include &lt;linux/audit.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='hunk'>@@ -327,13 +328,13 @@ static int ptrace_hbp_fill_attr_ctrl(unsigned int note_type,</div><div class='ctx'> 				     struct arch_hw_breakpoint_ctrl ctrl,</div><div class='ctx'> 				     struct perf_event_attr *attr)</div><div class='ctx'> {</div><div class='del'>-	int err, len, type, disabled = !ctrl.enabled;</div><div class='add'>+	int err, len, type, offset, disabled = !ctrl.enabled;</div><div class='ctx'> </div><div class='ctx'> 	attr-&gt;disabled = disabled;</div><div class='ctx'> 	if (disabled)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	err = arch_bp_generic_fields(ctrl, &amp;len, &amp;type);</div><div class='add'>+	err = arch_bp_generic_fields(ctrl, &amp;len, &amp;type, &amp;offset);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -352,6 +353,7 @@ static int ptrace_hbp_fill_attr_ctrl(unsigned int note_type,</div><div class='ctx'> </div><div class='ctx'> 	attr-&gt;bp_len	= len;</div><div class='ctx'> 	attr-&gt;bp_type	= type;</div><div class='add'>+	attr-&gt;bp_addr	+= offset;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -404,7 +406,7 @@ static int ptrace_hbp_get_addr(unsigned int note_type,</div><div class='ctx'> 	if (IS_ERR(bp))</div><div class='ctx'> 		return PTR_ERR(bp);</div><div class='ctx'> </div><div class='del'>-	*addr = bp ? bp-&gt;attr.bp_addr : 0;</div><div class='add'>+	*addr = bp ? counter_arch_bp(bp)-&gt;address : 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -550,6 +552,8 @@ static int hw_break_set(struct task_struct *target,</div><div class='ctx'> 	/* (address, ctrl) registers */</div><div class='ctx'> 	limit = regset-&gt;n * regset-&gt;size;</div><div class='ctx'> 	while (count &amp;&amp; offset &lt; limit) {</div><div class='add'>+		if (count &lt; PTRACE_HBP_ADDR_SZ)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, &amp;addr,</div><div class='ctx'> 					 offset, offset + PTRACE_HBP_ADDR_SZ);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -559,6 +563,8 @@ static int hw_break_set(struct task_struct *target,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		offset += PTRACE_HBP_ADDR_SZ;</div><div class='ctx'> </div><div class='add'>+		if (!count)</div><div class='add'>+			break;</div><div class='ctx'> 		ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, &amp;ctrl,</div><div class='ctx'> 					 offset, offset + PTRACE_HBP_CTRL_SZ);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -595,7 +601,7 @@ static int gpr_set(struct task_struct *target, const struct user_regset *regset,</div><div class='ctx'> 		   const void *kbuf, const void __user *ubuf)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct user_pt_regs newregs;</div><div class='add'>+	struct user_pt_regs newregs = task_pt_regs(target)-&gt;user_regs;</div><div class='ctx'> </div><div class='ctx'> 	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, &amp;newregs, 0, -1);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -625,7 +631,8 @@ static int fpr_set(struct task_struct *target, const struct user_regset *regset,</div><div class='ctx'> 		   const void *kbuf, const void __user *ubuf)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct user_fpsimd_state newstate;</div><div class='add'>+	struct user_fpsimd_state newstate =</div><div class='add'>+		target-&gt;thread.fpsimd_state.user_fpsimd;</div><div class='ctx'> </div><div class='ctx'> 	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, &amp;newstate, 0, -1);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -649,7 +656,7 @@ static int tls_set(struct task_struct *target, const struct user_regset *regset,</div><div class='ctx'> 		   const void *kbuf, const void __user *ubuf)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	unsigned long tls;</div><div class='add'>+	unsigned long tls = target-&gt;thread.tp_value;</div><div class='ctx'> </div><div class='ctx'> 	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, &amp;tls, 0, -1);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -675,7 +682,8 @@ static int system_call_set(struct task_struct *target,</div><div class='ctx'> 			   unsigned int pos, unsigned int count,</div><div class='ctx'> 			   const void *kbuf, const void __user *ubuf)</div><div class='ctx'> {</div><div class='del'>-	int syscallno, ret;</div><div class='add'>+	int syscallno = task_pt_regs(target)-&gt;syscallno;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, &amp;syscallno, 0, -1);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -947,7 +955,7 @@ static int compat_tls_set(struct task_struct *target,</div><div class='ctx'> 			  const void __user *ubuf)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	compat_ulong_t tls;</div><div class='add'>+	compat_ulong_t tls = target-&gt;thread.tp_value;</div><div class='ctx'> </div><div class='ctx'> 	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, &amp;tls, 0, -1);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/arch/arm64/kernel/return_address.c b/arch/arm64/kernel/return_address.c<br/>index 1718706fde83..12a87f2600f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/return_address.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/return_address.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/return_address.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/return_address.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/stack_pointer.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct return_address_data {</div><div class='head'>diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c<br/>index f534f492a268..42274bda0ccb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/setup.c</a></div><div class='hunk'>@@ -42,6 +42,8 @@</div><div class='ctx'> #include &lt;linux/of_fdt.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> #include &lt;linux/psci.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/acpi.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='hunk'>@@ -199,16 +201,16 @@ static void __init request_standard_resources(void)</div><div class='ctx'> 	struct memblock_region *region;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> </div><div class='del'>-	kernel_code.start   = virt_to_phys(_text);</div><div class='del'>-	kernel_code.end     = virt_to_phys(__init_begin - 1);</div><div class='del'>-	kernel_data.start   = virt_to_phys(_sdata);</div><div class='del'>-	kernel_data.end     = virt_to_phys(_end - 1);</div><div class='add'>+	kernel_code.start   = __pa_symbol(_text);</div><div class='add'>+	kernel_code.end     = __pa_symbol(__init_begin - 1);</div><div class='add'>+	kernel_data.start   = __pa_symbol(_sdata);</div><div class='add'>+	kernel_data.end     = __pa_symbol(_end - 1);</div><div class='ctx'> </div><div class='ctx'> 	for_each_memblock(memory, region) {</div><div class='ctx'> 		res = alloc_bootmem_low(sizeof(*res));</div><div class='ctx'> 		if (memblock_is_nomap(region)) {</div><div class='ctx'> 			res-&gt;name  = "reserved";</div><div class='del'>-			res-&gt;flags = IORESOURCE_MEM | IORESOURCE_BUSY;</div><div class='add'>+			res-&gt;flags = IORESOURCE_MEM;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			res-&gt;name  = "System RAM";</div><div class='ctx'> 			res-&gt;flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;</div><div class='hunk'>@@ -291,6 +293,15 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	smp_init_cpus();</div><div class='ctx'> 	smp_build_mpidr_hash();</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM64_SW_TTBR0_PAN</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure init_thread_info.ttbr0 always generates translation</div><div class='add'>+	 * faults in case uaccess_enable() is inadvertently called by the init</div><div class='add'>+	 * thread.</div><div class='add'>+	 */</div><div class='add'>+	init_task.thread_info.ttbr0 = __pa_symbol(empty_zero_page);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_VT</div><div class='ctx'> #if defined(CONFIG_VGA_CONSOLE)</div><div class='ctx'> 	conswitchp = &amp;vga_con;</div><div class='hunk'>@@ -329,11 +340,11 @@ subsys_initcall(topology_init);</div><div class='ctx'> static int dump_kernel_offset(struct notifier_block *self, unsigned long v,</div><div class='ctx'> 			      void *p)</div><div class='ctx'> {</div><div class='del'>-	u64 const kaslr_offset = kimage_vaddr - KIMAGE_VADDR;</div><div class='add'>+	const unsigned long offset = kaslr_offset();</div><div class='ctx'> </div><div class='del'>-	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) &amp;&amp; kaslr_offset &gt; 0) {</div><div class='del'>-		pr_emerg("Kernel Offset: 0x%llx from 0x%lx\n",</div><div class='del'>-			 kaslr_offset, KIMAGE_VADDR);</div><div class='add'>+	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) &amp;&amp; offset &gt; 0) {</div><div class='add'>+		pr_emerg("Kernel Offset: 0x%lx from 0x%lx\n",</div><div class='add'>+			 offset, KIMAGE_VADDR);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_emerg("Kernel Offset: disabled\n");</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c<br/>index 404dd67080b9..c7b6de62f9d3 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/signal.c</a></div><div class='hunk'>@@ -414,6 +414,9 @@ asmlinkage void do_notify_resume(struct pt_regs *regs,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			local_irq_enable();</div><div class='ctx'> </div><div class='add'>+			if (thread_flags &amp; _TIF_UPROBE)</div><div class='add'>+				uprobe_notify_resume(regs);</div><div class='add'>+</div><div class='ctx'> 			if (thread_flags &amp; _TIF_SIGPENDING)</div><div class='ctx'> 				do_signal(regs);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c<br/>index b7063de792f7..c747a0fc5d7d 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/signal32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/signal32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/signal32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/signal32.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;asm/esr.h&gt;</div><div class='ctx'> #include &lt;asm/fpsimd.h&gt;</div><div class='ctx'> #include &lt;asm/signal32.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct compat_sigcontext {</div><div class='head'>diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S<br/>index 1bec41b5fda3..df67652e46f0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/sleep.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/sleep.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/sleep.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/sleep.S</a></div><div class='hunk'>@@ -125,9 +125,6 @@ ENTRY(_cpu_resume)</div><div class='ctx'> 	/* load sp from context */</div><div class='ctx'> 	ldr	x2, [x0, #CPU_CTX_SP]</div><div class='ctx'> 	mov	sp, x2</div><div class='del'>-	/* save thread_info */</div><div class='del'>-	and	x2, x2, #~(THREAD_SIZE - 1)</div><div class='del'>-	msr	sp_el0, x2</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * cpu_do_resume expects x0 to contain context address pointer</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/arm64/kernel/smccc-call.S b/arch/arm64/kernel/smccc-call.S<br/>index ae0496fa4235..62522342e1e4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/smccc-call.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/smccc-call.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/smccc-call.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/smccc-call.S</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/arm-smccc.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro SMCCC instr</div><div class='hunk'>@@ -20,24 +21,32 @@</div><div class='ctx'> 	ldr	x4, [sp]</div><div class='ctx'> 	stp	x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS]</div><div class='ctx'> 	stp	x2, x3, [x4, #ARM_SMCCC_RES_X2_OFFS]</div><div class='del'>-	ret</div><div class='add'>+	ldr	x4, [sp, #8]</div><div class='add'>+	cbz	x4, 1f /* no quirk structure */</div><div class='add'>+	ldr	x9, [x4, #ARM_SMCCC_QUIRK_ID_OFFS]</div><div class='add'>+	cmp	x9, #ARM_SMCCC_QUIRK_QCOM_A6</div><div class='add'>+	b.ne	1f</div><div class='add'>+	str	x6, [x4, ARM_SMCCC_QUIRK_STATE_OFFS]</div><div class='add'>+1:	ret</div><div class='ctx'> 	.cfi_endproc</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * void arm_smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2,</div><div class='ctx'>  *		  unsigned long a3, unsigned long a4, unsigned long a5,</div><div class='del'>- *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res)</div><div class='add'>+ *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res,</div><div class='add'>+ *		  struct arm_smccc_quirk *quirk)</div><div class='ctx'>  */</div><div class='del'>-ENTRY(arm_smccc_smc)</div><div class='add'>+ENTRY(__arm_smccc_smc)</div><div class='ctx'> 	SMCCC	smc</div><div class='del'>-ENDPROC(arm_smccc_smc)</div><div class='add'>+ENDPROC(__arm_smccc_smc)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * void arm_smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2,</div><div class='ctx'>  *		  unsigned long a3, unsigned long a4, unsigned long a5,</div><div class='del'>- *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res)</div><div class='add'>+ *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res,</div><div class='add'>+ *		  struct arm_smccc_quirk *quirk)</div><div class='ctx'>  */</div><div class='del'>-ENTRY(arm_smccc_hvc)</div><div class='add'>+ENTRY(__arm_smccc_hvc)</div><div class='ctx'> 	SMCCC	hvc</div><div class='del'>-ENDPROC(arm_smccc_hvc)</div><div class='add'>+ENDPROC(__arm_smccc_hvc)</div><div class='head'>diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c<br/>index 8507703dabe4..ef1caae02110 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/smp.c</a></div><div class='hunk'>@@ -21,7 +21,9 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='hunk'>@@ -58,6 +60,9 @@</div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include &lt;trace/events/ipi.h&gt;</div><div class='ctx'> </div><div class='add'>+DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);</div><div class='add'>+EXPORT_PER_CPU_SYMBOL(cpu_number);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * as from 2.5, kernels no longer have an init_tasks structure</div><div class='ctx'>  * so we need some other way of telling a new secondary core</div><div class='hunk'>@@ -146,6 +151,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> 	 * We need to tell the secondary core where to find its stack and the</div><div class='ctx'> 	 * page tables.</div><div class='ctx'> 	 */</div><div class='add'>+	secondary_data.task = idle;</div><div class='ctx'> 	secondary_data.stack = task_stack_page(idle) + THREAD_START_SP;</div><div class='ctx'> 	update_cpu_boot_status(CPU_MMU_OFF);</div><div class='ctx'> 	__flush_dcache_area(&amp;secondary_data, sizeof(secondary_data));</div><div class='hunk'>@@ -170,6 +176,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> 		pr_err("CPU%u: failed to boot: %d\n", cpu, ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	secondary_data.task = NULL;</div><div class='ctx'> 	secondary_data.stack = NULL;</div><div class='ctx'> 	status = READ_ONCE(secondary_data.status);</div><div class='ctx'> 	if (ret &amp;&amp; status) {</div><div class='hunk'>@@ -208,17 +215,18 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> asmlinkage void secondary_start_kernel(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_struct *mm = &amp;init_mm;</div><div class='del'>-	unsigned int cpu = smp_processor_id();</div><div class='add'>+	unsigned int cpu;</div><div class='add'>+</div><div class='add'>+	cpu = task_cpu(current);</div><div class='add'>+	set_my_cpu_offset(per_cpu_offset(cpu));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * All kernel threads share the same mm context; grab a</div><div class='ctx'> 	 * reference and switch to it.</div><div class='ctx'> 	 */</div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_count);</div><div class='add'>+	mmgrab(mm);</div><div class='ctx'> 	current-&gt;active_mm = mm;</div><div class='ctx'> </div><div class='del'>-	set_my_cpu_offset(per_cpu_offset(smp_processor_id()));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TTBR0 is only used for the identity mapping at this stage. Make it</div><div class='ctx'> 	 * point to zero page to avoid speculatively fetching new entries.</div><div class='hunk'>@@ -597,9 +605,9 @@ acpi_parse_gic_cpu_interface(struct acpi_subtable_header *header,</div><div class='ctx'>  */</div><div class='ctx'> static void __init of_parse_and_init_cpus(void)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *dn = NULL;</div><div class='add'>+	struct device_node *dn;</div><div class='ctx'> </div><div class='del'>-	while ((dn = of_find_node_by_type(dn, "cpu"))) {</div><div class='add'>+	for_each_node_by_type(dn, "cpu") {</div><div class='ctx'> 		u64 hwid = of_get_cpu_mpidr(dn);</div><div class='ctx'> </div><div class='ctx'> 		if (hwid == INVALID_HWID)</div><div class='hunk'>@@ -718,6 +726,8 @@ void __init smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> </div><div class='add'>+		per_cpu(cpu_number, cpu) = cpu;</div><div class='add'>+</div><div class='ctx'> 		if (cpu == smp_processor_id())</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/smp_spin_table.c b/arch/arm64/kernel/smp_spin_table.c<br/>index 9a00eee9acc8..93034651c87e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/smp_spin_table.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/smp_spin_table.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/smp_spin_table.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/smp_spin_table.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_ops.h&gt;</div><div class='hunk'>@@ -98,7 +99,7 @@ static int smp_spin_table_cpu_prepare(unsigned int cpu)</div><div class='ctx'> 	 * boot-loader's endianess before jumping. This is mandated by</div><div class='ctx'> 	 * the boot protocol.</div><div class='ctx'> 	 */</div><div class='del'>-	writeq_relaxed(__pa(secondary_holding_pen), release_addr);</div><div class='add'>+	writeq_relaxed(__pa_symbol(secondary_holding_pen), release_addr);</div><div class='ctx'> 	__flush_dcache_area((__force void *)release_addr,</div><div class='ctx'> 			    sizeof(*release_addr));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c<br/>index c2efddfca18c..feac80c22f61 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/stacktrace.c</a></div><div class='hunk'>@@ -19,9 +19,12 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/stack_pointer.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -128,7 +131,6 @@ void notrace walk_stackframe(struct task_struct *tsk, struct stackframe *frame,</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(walk_stackframe);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_STACKTRACE</div><div class='ctx'> struct stack_trace_data {</div><div class='hunk'>@@ -181,6 +183,9 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)</div><div class='ctx'> 	struct stack_trace_data data;</div><div class='ctx'> 	struct stackframe frame;</div><div class='ctx'> </div><div class='add'>+	if (!try_get_task_stack(tsk))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	data.trace = trace;</div><div class='ctx'> 	data.skip = trace-&gt;skip;</div><div class='ctx'> </div><div class='hunk'>@@ -202,6 +207,8 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)</div><div class='ctx'> 	walk_stackframe(tsk, &amp;frame, save_trace, &amp;data);</div><div class='ctx'> 	if (trace-&gt;nr_entries &lt; trace-&gt;max_entries)</div><div class='ctx'> 		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='add'>+</div><div class='add'>+	put_task_stack(tsk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void save_stack_trace(struct stack_trace *trace)</div><div class='head'>diff --git a/arch/arm64/kernel/suspend.c b/arch/arm64/kernel/suspend.c<br/>index bb0cd787a9d3..1e3be9064cfa 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/suspend.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/suspend.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/suspend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/suspend.c</a></div><div class='hunk'>@@ -47,12 +47,6 @@ void notrace __cpu_suspend_exit(void)</div><div class='ctx'> 	cpu_uninstall_idmap();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Restore per-cpu offset before any kernel</div><div class='del'>-	 * subsystem relying on it has a chance to run.</div><div class='del'>-	 */</div><div class='del'>-	set_my_cpu_offset(per_cpu_offset(cpu));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * PSTATE was not saved over suspend/resume, re-enable any detected</div><div class='ctx'> 	 * features that might not have been set correctly.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/arm64/kernel/sys_compat.c b/arch/arm64/kernel/sys_compat.c<br/>index abaf582fc7a8..8b8bbd3eaa52 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/sys_compat.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/sys_compat.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/sys_compat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/sys_compat.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='head'>diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c<br/>index 694f6deedbab..08243533e5ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/topology.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/topology.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/topology.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -19,10 +20,230 @@</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/topology.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/topology.h&gt;</div><div class='ctx'> </div><div class='add'>+static DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;</div><div class='add'>+static DEFINE_MUTEX(cpu_scale_mutex);</div><div class='add'>+</div><div class='add'>+unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu)</div><div class='add'>+{</div><div class='add'>+	return per_cpu(cpu_scale, cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_capacity_scale(unsigned int cpu, unsigned long capacity)</div><div class='add'>+{</div><div class='add'>+	per_cpu(cpu_scale, cpu) = capacity;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t cpu_capacity_show(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr,</div><div class='add'>+				 char *buf)</div><div class='add'>+{</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%lu\n",</div><div class='add'>+			arch_scale_cpu_capacity(NULL, cpu-&gt;dev.id));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t cpu_capacity_store(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr,</div><div class='add'>+				  const char *buf,</div><div class='add'>+				  size_t count)</div><div class='add'>+{</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev);</div><div class='add'>+	int this_cpu = cpu-&gt;dev.id, i;</div><div class='add'>+	unsigned long new_capacity;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	if (count) {</div><div class='add'>+		ret = kstrtoul(buf, 0, &amp;new_capacity);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		if (new_capacity &gt; SCHED_CAPACITY_SCALE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;cpu_scale_mutex);</div><div class='add'>+		for_each_cpu(i, &amp;cpu_topology[this_cpu].core_sibling)</div><div class='add'>+			set_capacity_scale(i, new_capacity);</div><div class='add'>+		mutex_unlock(&amp;cpu_scale_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR_RW(cpu_capacity);</div><div class='add'>+</div><div class='add'>+static int register_cpu_capacity_sysctl(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct device *cpu;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		cpu = get_cpu_device(i);</div><div class='add'>+		if (!cpu) {</div><div class='add'>+			pr_err("%s: too early to get CPU%d device!\n",</div><div class='add'>+			       __func__, i);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		device_create_file(cpu, &amp;dev_attr_cpu_capacity);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(register_cpu_capacity_sysctl);</div><div class='add'>+</div><div class='add'>+static u32 capacity_scale;</div><div class='add'>+static u32 *raw_capacity;</div><div class='add'>+static bool cap_parsing_failed;</div><div class='add'>+</div><div class='add'>+static void __init parse_cpu_capacity(struct device_node *cpu_node, int cpu)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 cpu_capacity;</div><div class='add'>+</div><div class='add'>+	if (cap_parsing_failed)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_u32(cpu_node,</div><div class='add'>+				   "capacity-dmips-mhz",</div><div class='add'>+				   &amp;cpu_capacity);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!raw_capacity) {</div><div class='add'>+			raw_capacity = kcalloc(num_possible_cpus(),</div><div class='add'>+					       sizeof(*raw_capacity),</div><div class='add'>+					       GFP_KERNEL);</div><div class='add'>+			if (!raw_capacity) {</div><div class='add'>+				pr_err("cpu_capacity: failed to allocate memory for raw capacities\n");</div><div class='add'>+				cap_parsing_failed = true;</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		capacity_scale = max(cpu_capacity, capacity_scale);</div><div class='add'>+		raw_capacity[cpu] = cpu_capacity;</div><div class='add'>+		pr_debug("cpu_capacity: %s cpu_capacity=%u (raw)\n",</div><div class='add'>+			cpu_node-&gt;full_name, raw_capacity[cpu]);</div><div class='add'>+	} else {</div><div class='add'>+		if (raw_capacity) {</div><div class='add'>+			pr_err("cpu_capacity: missing %s raw capacity\n",</div><div class='add'>+				cpu_node-&gt;full_name);</div><div class='add'>+			pr_err("cpu_capacity: partial information: fallback to 1024 for all CPUs\n");</div><div class='add'>+		}</div><div class='add'>+		cap_parsing_failed = true;</div><div class='add'>+		kfree(raw_capacity);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void normalize_cpu_capacity(void)</div><div class='add'>+{</div><div class='add'>+	u64 capacity;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	if (!raw_capacity || cap_parsing_failed)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pr_debug("cpu_capacity: capacity_scale=%u\n", capacity_scale);</div><div class='add'>+	mutex_lock(&amp;cpu_scale_mutex);</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		pr_debug("cpu_capacity: cpu=%d raw_capacity=%u\n",</div><div class='add'>+			 cpu, raw_capacity[cpu]);</div><div class='add'>+		capacity = (raw_capacity[cpu] &lt;&lt; SCHED_CAPACITY_SHIFT)</div><div class='add'>+			/ capacity_scale;</div><div class='add'>+		set_capacity_scale(cpu, capacity);</div><div class='add'>+		pr_debug("cpu_capacity: CPU%d cpu_capacity=%lu\n",</div><div class='add'>+			cpu, arch_scale_cpu_capacity(NULL, cpu));</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;cpu_scale_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_FREQ</div><div class='add'>+static cpumask_var_t cpus_to_visit;</div><div class='add'>+static bool cap_parsing_done;</div><div class='add'>+static void parsing_done_workfn(struct work_struct *work);</div><div class='add'>+static DECLARE_WORK(parsing_done_work, parsing_done_workfn);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+init_cpu_capacity_callback(struct notifier_block *nb,</div><div class='add'>+			   unsigned long val,</div><div class='add'>+			   void *data)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_policy *policy = data;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	if (cap_parsing_failed || cap_parsing_done)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (val) {</div><div class='add'>+	case CPUFREQ_NOTIFY:</div><div class='add'>+		pr_debug("cpu_capacity: init cpu capacity for CPUs [%*pbl] (to_visit=%*pbl)\n",</div><div class='add'>+				cpumask_pr_args(policy-&gt;related_cpus),</div><div class='add'>+				cpumask_pr_args(cpus_to_visit));</div><div class='add'>+		cpumask_andnot(cpus_to_visit,</div><div class='add'>+			       cpus_to_visit,</div><div class='add'>+			       policy-&gt;related_cpus);</div><div class='add'>+		for_each_cpu(cpu, policy-&gt;related_cpus) {</div><div class='add'>+			raw_capacity[cpu] = arch_scale_cpu_capacity(NULL, cpu) *</div><div class='add'>+					    policy-&gt;cpuinfo.max_freq / 1000UL;</div><div class='add'>+			capacity_scale = max(raw_capacity[cpu], capacity_scale);</div><div class='add'>+		}</div><div class='add'>+		if (cpumask_empty(cpus_to_visit)) {</div><div class='add'>+			normalize_cpu_capacity();</div><div class='add'>+			kfree(raw_capacity);</div><div class='add'>+			pr_debug("cpu_capacity: parsing done\n");</div><div class='add'>+			cap_parsing_done = true;</div><div class='add'>+			schedule_work(&amp;parsing_done_work);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block init_cpu_capacity_notifier = {</div><div class='add'>+	.notifier_call = init_cpu_capacity_callback,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init register_cpufreq_notifier(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * on ACPI-based systems we need to use the default cpu capacity</div><div class='add'>+	 * until we have the necessary code to parse the cpu capacity, so</div><div class='add'>+	 * skip registering cpufreq notifier.</div><div class='add'>+	 */</div><div class='add'>+	if (!acpi_disabled || cap_parsing_failed)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!alloc_cpumask_var(&amp;cpus_to_visit, GFP_KERNEL)) {</div><div class='add'>+		pr_err("cpu_capacity: failed to allocate memory for cpus_to_visit\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	cpumask_copy(cpus_to_visit, cpu_possible_mask);</div><div class='add'>+</div><div class='add'>+	return cpufreq_register_notifier(&amp;init_cpu_capacity_notifier,</div><div class='add'>+					 CPUFREQ_POLICY_NOTIFIER);</div><div class='add'>+}</div><div class='add'>+core_initcall(register_cpufreq_notifier);</div><div class='add'>+</div><div class='add'>+static void parsing_done_workfn(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	cpufreq_unregister_notifier(&amp;init_cpu_capacity_notifier,</div><div class='add'>+					 CPUFREQ_POLICY_NOTIFIER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static int __init free_raw_capacity(void)</div><div class='add'>+{</div><div class='add'>+	kfree(raw_capacity);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+core_initcall(free_raw_capacity);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int __init get_cpu_for_node(struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *cpu_node;</div><div class='hunk'>@@ -34,6 +255,7 @@ static int __init get_cpu_for_node(struct device_node *node)</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		if (of_get_cpu_node(cpu, NULL) == cpu_node) {</div><div class='add'>+			parse_cpu_capacity(cpu_node, cpu);</div><div class='ctx'> 			of_node_put(cpu_node);</div><div class='ctx'> 			return cpu;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -178,13 +400,17 @@ static int __init parse_dt_topology(void)</div><div class='ctx'> 	 * cluster with restricted subnodes.</div><div class='ctx'> 	 */</div><div class='ctx'> 	map = of_get_child_by_name(cn, "cpu-map");</div><div class='del'>-	if (!map)</div><div class='add'>+	if (!map) {</div><div class='add'>+		cap_parsing_failed = true;</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = parse_cluster(map, 0);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto out_map;</div><div class='ctx'> </div><div class='add'>+	normalize_cpu_capacity();</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check that all cores are in the topology; the SMP code will</div><div class='ctx'> 	 * only mark cores described in the DT as possible.</div><div class='head'>diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c<br/>index c9986b3e0a96..e52be6aa44ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/traps.c</a></div><div class='hunk'>@@ -29,8 +29,11 @@</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/bug.h&gt;</div><div class='hunk'>@@ -38,6 +41,7 @@</div><div class='ctx'> #include &lt;asm/esr.h&gt;</div><div class='ctx'> #include &lt;asm/insn.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='add'>+#include &lt;asm/stack_pointer.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include &lt;asm/exception.h&gt;</div><div class='ctx'> #include &lt;asm/system_misc.h&gt;</div><div class='hunk'>@@ -147,6 +151,9 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)</div><div class='ctx'> 	if (!tsk)</div><div class='ctx'> 		tsk = current;</div><div class='ctx'> </div><div class='add'>+	if (!try_get_task_stack(tsk))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Switching between stacks is valid when tracing current and in</div><div class='ctx'> 	 * non-preemptible context.</div><div class='hunk'>@@ -212,6 +219,8 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)</div><div class='ctx'> 				 stack + sizeof(struct pt_regs));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	put_task_stack(tsk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void show_stack(struct task_struct *tsk, unsigned long *sp)</div><div class='hunk'>@@ -227,10 +236,9 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)</div><div class='ctx'> #endif</div><div class='ctx'> #define S_SMP " SMP"</div><div class='ctx'> </div><div class='del'>-static int __die(const char *str, int err, struct thread_info *thread,</div><div class='del'>-		 struct pt_regs *regs)</div><div class='add'>+static int __die(const char *str, int err, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	struct task_struct *tsk = thread-&gt;task;</div><div class='add'>+	struct task_struct *tsk = current;</div><div class='ctx'> 	static int die_counter;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -245,7 +253,8 @@ static int __die(const char *str, int err, struct thread_info *thread,</div><div class='ctx'> 	print_modules();</div><div class='ctx'> 	__show_regs(regs);</div><div class='ctx'> 	pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n",</div><div class='del'>-		 TASK_COMM_LEN, tsk-&gt;comm, task_pid_nr(tsk), thread + 1);</div><div class='add'>+		 TASK_COMM_LEN, tsk-&gt;comm, task_pid_nr(tsk),</div><div class='add'>+		 end_of_stack(tsk));</div><div class='ctx'> </div><div class='ctx'> 	if (!user_mode(regs)) {</div><div class='ctx'> 		dump_mem(KERN_EMERG, "Stack: ", regs-&gt;sp,</div><div class='hunk'>@@ -264,7 +273,6 @@ static DEFINE_RAW_SPINLOCK(die_lock);</div><div class='ctx'>  */</div><div class='ctx'> void die(const char *str, struct pt_regs *regs, int err)</div><div class='ctx'> {</div><div class='del'>-	struct thread_info *thread = current_thread_info();</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	oops_enter();</div><div class='hunk'>@@ -272,9 +280,9 @@ void die(const char *str, struct pt_regs *regs, int err)</div><div class='ctx'> 	raw_spin_lock_irq(&amp;die_lock);</div><div class='ctx'> 	console_verbose();</div><div class='ctx'> 	bust_spinlocks(1);</div><div class='del'>-	ret = __die(str, err, thread, regs);</div><div class='add'>+	ret = __die(str, err, regs);</div><div class='ctx'> </div><div class='del'>-	if (regs &amp;&amp; kexec_should_crash(thread-&gt;task))</div><div class='add'>+	if (regs &amp;&amp; kexec_should_crash(current))</div><div class='ctx'> 		crash_kexec(regs);</div><div class='ctx'> </div><div class='ctx'> 	bust_spinlocks(0);</div><div class='hunk'>@@ -435,9 +443,10 @@ int cpu_enable_cache_maint_trap(void *__unused)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define __user_cache_maint(insn, address, res)			\</div><div class='del'>-	if (untagged_addr(address) &gt;= user_addr_max())		\</div><div class='add'>+	if (untagged_addr(address) &gt;= user_addr_max()) {	\</div><div class='ctx'> 		res = -EFAULT;					\</div><div class='del'>-	else							\</div><div class='add'>+	} else {						\</div><div class='add'>+		uaccess_ttbr0_enable();				\</div><div class='ctx'> 		asm volatile (					\</div><div class='ctx'> 			"1:	" insn ", %1\n"			\</div><div class='ctx'> 			"	mov	%w0, #0\n"		\</div><div class='hunk'>@@ -449,7 +458,9 @@ int cpu_enable_cache_maint_trap(void *__unused)</div><div class='ctx'> 			"	.popsection\n"			\</div><div class='ctx'> 			_ASM_EXTABLE(1b, 3b)			\</div><div class='ctx'> 			: "=r" (res)				\</div><div class='del'>-			: "r" (address), "i" (-EFAULT) )</div><div class='add'>+			: "r" (address), "i" (-EFAULT));	\</div><div class='add'>+		uaccess_ttbr0_disable();			\</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> static void user_cache_maint_handler(unsigned int esr, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -458,7 +469,7 @@ static void user_cache_maint_handler(unsigned int esr, struct pt_regs *regs)</div><div class='ctx'> 	int crm = (esr &amp; ESR_ELx_SYS64_ISS_CRM_MASK) &gt;&gt; ESR_ELx_SYS64_ISS_CRM_SHIFT;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	address = (rt == 31) ? 0 : regs-&gt;regs[rt];</div><div class='add'>+	address = pt_regs_read_reg(regs, rt);</div><div class='ctx'> </div><div class='ctx'> 	switch (crm) {</div><div class='ctx'> 	case ESR_ELx_SYS64_ISS_CRM_DC_CVAU:	/* DC CVAU, gets promoted */</div><div class='hunk'>@@ -487,8 +498,10 @@ static void user_cache_maint_handler(unsigned int esr, struct pt_regs *regs)</div><div class='ctx'> static void ctr_read_handler(unsigned int esr, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int rt = (esr &amp; ESR_ELx_SYS64_ISS_RT_MASK) &gt;&gt; ESR_ELx_SYS64_ISS_RT_SHIFT;</div><div class='add'>+	unsigned long val = arm64_ftr_reg_user_value(&amp;arm64_ftr_reg_ctrel0);</div><div class='add'>+</div><div class='add'>+	pt_regs_write_reg(regs, rt, val);</div><div class='ctx'> </div><div class='del'>-	regs-&gt;regs[rt] = arm64_ftr_reg_ctrel0.sys_val;</div><div class='ctx'> 	regs-&gt;pc += 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -523,7 +536,12 @@ asmlinkage void __exception do_sysinstr(unsigned int esr, struct pt_regs *regs)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	force_signal_inject(SIGILL, ILL_ILLOPC, regs, 0);</div><div class='add'>+	/*</div><div class='add'>+	 * New SYS instructions may previously have been undefined at EL0. Fall</div><div class='add'>+	 * back to our usual undefined instruction handler so that we handle</div><div class='add'>+	 * these consistently.</div><div class='add'>+	 */</div><div class='add'>+	do_undefinstr(regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> long compat_arm_syscall(struct pt_regs *regs);</div><div class='hunk'>@@ -596,17 +614,34 @@ const char *esr_get_class_string(u32 esr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * bad_mode handles the impossible case in the exception vector.</div><div class='add'>+ * bad_mode handles the impossible case in the exception vector. This is always</div><div class='add'>+ * fatal.</div><div class='ctx'>  */</div><div class='ctx'> asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr)</div><div class='ctx'> {</div><div class='del'>-	siginfo_t info;</div><div class='del'>-	void __user *pc = (void __user *)instruction_pointer(regs);</div><div class='ctx'> 	console_verbose();</div><div class='ctx'> </div><div class='ctx'> 	pr_crit("Bad mode in %s handler detected on CPU%d, code 0x%08x -- %s\n",</div><div class='ctx'> 		handler[reason], smp_processor_id(), esr,</div><div class='ctx'> 		esr_get_class_string(esr));</div><div class='add'>+</div><div class='add'>+	die("Oops - bad mode", regs, 0);</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	panic("bad mode");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * bad_el0_sync handles unexpected, but potentially recoverable synchronous</div><div class='add'>+ * exceptions taken from EL0. Unlike bad_mode, this returns.</div><div class='add'>+ */</div><div class='add'>+asmlinkage void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr)</div><div class='add'>+{</div><div class='add'>+	siginfo_t info;</div><div class='add'>+	void __user *pc = (void __user *)instruction_pointer(regs);</div><div class='add'>+	console_verbose();</div><div class='add'>+</div><div class='add'>+	pr_crit("Bad EL0 synchronous exception detected on CPU%d, code 0x%08x -- %s\n",</div><div class='add'>+		smp_processor_id(), esr, esr_get_class_string(esr));</div><div class='ctx'> 	__show_regs(regs);</div><div class='ctx'> </div><div class='ctx'> 	info.si_signo = SIGILL;</div><div class='hunk'>@@ -614,7 +649,10 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr)</div><div class='ctx'> 	info.si_code  = ILL_ILLOPC;</div><div class='ctx'> 	info.si_addr  = pc;</div><div class='ctx'> </div><div class='del'>-	arm64_notify_die("Oops - bad mode", regs, &amp;info, 0);</div><div class='add'>+	current-&gt;thread.fault_address = 0;</div><div class='add'>+	current-&gt;thread.fault_code = 0;</div><div class='add'>+</div><div class='add'>+	force_sig_info(info.si_signo, &amp;info, current);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __pte_error(const char *file, int line, unsigned long val)</div><div class='head'>diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c<br/>index a2c2478e7d78..41b6e31f8f55 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/vdso.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/vdso.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/vdso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/vdso.c</a></div><div class='hunk'>@@ -123,6 +123,7 @@ static int __init vdso_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct page **vdso_pagelist;</div><div class='add'>+	unsigned long pfn;</div><div class='ctx'> </div><div class='ctx'> 	if (memcmp(&amp;vdso_start, "\177ELF", 4)) {</div><div class='ctx'> 		pr_err("vDSO is not a valid ELF object!\n");</div><div class='hunk'>@@ -140,11 +141,14 @@ static int __init vdso_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Grab the vDSO data page. */</div><div class='del'>-	vdso_pagelist[0] = pfn_to_page(PHYS_PFN(__pa(vdso_data)));</div><div class='add'>+	vdso_pagelist[0] = phys_to_page(__pa_symbol(vdso_data));</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	/* Grab the vDSO code pages. */</div><div class='add'>+	pfn = sym_to_pfn(&amp;vdso_start);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; vdso_pages; i++)</div><div class='del'>-		vdso_pagelist[i + 1] = pfn_to_page(PHYS_PFN(__pa(&amp;vdso_start)) + i);</div><div class='add'>+		vdso_pagelist[i + 1] = pfn_to_page(pfn + i);</div><div class='ctx'> </div><div class='ctx'> 	vdso_spec[0].pages = &amp;vdso_pagelist[0];</div><div class='ctx'> 	vdso_spec[1].pages = &amp;vdso_pagelist[1];</div><div class='head'>diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S<br/>index 1105aab1e6d6..b8deffa9e1bf 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kernel/vmlinux.lds.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -216,6 +216,11 @@ SECTIONS</div><div class='ctx'> 	swapper_pg_dir = .;</div><div class='ctx'> 	. += SWAPPER_DIR_SIZE;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM64_SW_TTBR0_PAN</div><div class='add'>+	reserved_ttbr0 = .;</div><div class='add'>+	. += RESERVED_TTBR0_SIZE;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	_end = .;</div><div class='ctx'> </div><div class='ctx'> 	STABS_DEBUG</div><div class='head'>diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig<br/>index 6eaf12c1d627..52cb7ad9b2fd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/Kconfig</a></div><div class='hunk'>@@ -16,9 +16,6 @@ menuconfig VIRTUALIZATION</div><div class='ctx'> </div><div class='ctx'> if VIRTUALIZATION</div><div class='ctx'> </div><div class='del'>-config KVM_ARM_VGIC_V3_ITS</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> config KVM</div><div class='ctx'> 	bool "Kernel-based Virtual Machine (KVM) support"</div><div class='ctx'> 	depends on OF</div><div class='hunk'>@@ -34,7 +31,6 @@ config KVM</div><div class='ctx'> 	select KVM_VFIO</div><div class='ctx'> 	select HAVE_KVM_EVENTFD</div><div class='ctx'> 	select HAVE_KVM_IRQFD</div><div class='del'>-	select KVM_ARM_VGIC_V3_ITS</div><div class='ctx'> 	select KVM_ARM_PMU if HW_PERF_EVENTS</div><div class='ctx'> 	select HAVE_KVM_MSI</div><div class='ctx'> 	select HAVE_KVM_IRQCHIP</div><div class='head'>diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile<br/>index d50a82a16ff6..afd51bebb9c5 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/Makefile</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # Makefile for Kernel-based Virtual Machine module</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-ccflags-y += -Iarch/arm64/kvm</div><div class='add'>+ccflags-y += -Iarch/arm64/kvm -Ivirt/kvm/arm/vgic</div><div class='ctx'> CFLAGS_arm.o := -I.</div><div class='ctx'> CFLAGS_mmu.o := -I.</div><div class='ctx'> </div><div class='hunk'>@@ -19,6 +19,7 @@ kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/psci.o $(ARM)/perf.o</div><div class='ctx'> kvm-$(CONFIG_KVM_ARM_HOST) += inject_fault.o regmap.o</div><div class='ctx'> kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o</div><div class='ctx'> kvm-$(CONFIG_KVM_ARM_HOST) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o</div><div class='add'>+kvm-$(CONFIG_KVM_ARM_HOST) += vgic-sys-reg-v3.o</div><div class='ctx'> kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/aarch32.o</div><div class='ctx'> </div><div class='ctx'> kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic.o</div><div class='hunk'>@@ -31,6 +32,7 @@ kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v2.o</div><div class='ctx'> kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v3.o</div><div class='ctx'> kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-kvm-device.o</div><div class='ctx'> kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-its.o</div><div class='add'>+kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-debug.o</div><div class='ctx'> kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/irqchip.o</div><div class='ctx'> kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/arch_timer.o</div><div class='ctx'> kvm-$(CONFIG_KVM_ARM_PMU) += $(KVM)/arm/pmu.o</div><div class='head'>diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c<br/>index 47e5f0feaee8..dbadfaf850a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/debug.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/debug.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/debug.c</a></div><div class='hunk'>@@ -95,6 +95,7 @@ void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu)</div><div class='ctx'>  *  - Performance monitors (MDCR_EL2_TPM/MDCR_EL2_TPMCR)</div><div class='ctx'>  *  - Debug ROM Address (MDCR_EL2_TDRA)</div><div class='ctx'>  *  - OS related registers (MDCR_EL2_TDOSA)</div><div class='add'>+ *  - Statistical profiler (MDCR_EL2_TPMS/MDCR_EL2_E2PB)</div><div class='ctx'>  *</div><div class='ctx'>  * Additionally, KVM only traps guest accesses to the debug registers if</div><div class='ctx'>  * the guest is not actively using them (see the KVM_ARM64_DEBUG_DIRTY</div><div class='hunk'>@@ -110,8 +111,13 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	trace_kvm_arm_setup_debug(vcpu, vcpu-&gt;guest_debug);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * This also clears MDCR_EL2_E2PB_MASK to disable guest access</div><div class='add'>+	 * to the profiling buffer.</div><div class='add'>+	 */</div><div class='ctx'> 	vcpu-&gt;arch.mdcr_el2 = __this_cpu_read(mdcr_el2) &amp; MDCR_EL2_HPMN_MASK;</div><div class='ctx'> 	vcpu-&gt;arch.mdcr_el2 |= (MDCR_EL2_TPM |</div><div class='add'>+				MDCR_EL2_TPMS |</div><div class='ctx'> 				MDCR_EL2_TPMCR |</div><div class='ctx'> 				MDCR_EL2_TDRA |</div><div class='ctx'> 				MDCR_EL2_TDOSA);</div><div class='head'>diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c<br/>index 3f9e15722473..b37446a8ffdb 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/guest.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/guest.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/guest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/guest.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/kvm.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_emulate.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_coproc.h&gt;</div><div class='head'>diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c<br/>index a204adf29f0a..1bfe30dfbfe7 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/handle_exit.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/handle_exit.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/handle_exit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/handle_exit.c</a></div><div class='hunk'>@@ -57,6 +57,16 @@ static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Guest access to FP/ASIMD registers are routed to this handler only</div><div class='add'>+ * when the system doesn't support FP/ASIMD.</div><div class='add'>+ */</div><div class='add'>+static int handle_no_fpsimd(struct kvm_vcpu *vcpu, struct kvm_run *run)</div><div class='add'>+{</div><div class='add'>+	kvm_inject_undefined(vcpu);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * kvm_handle_wfx - handle a wait-for-interrupts or wait-for-event</div><div class='ctx'>  *		    instruction executed by a guest</div><div class='hunk'>@@ -144,6 +154,7 @@ static exit_handle_fn arm_exit_handlers[] = {</div><div class='ctx'> 	[ESR_ELx_EC_BREAKPT_LOW]= kvm_handle_guest_debug,</div><div class='ctx'> 	[ESR_ELx_EC_BKPT32]	= kvm_handle_guest_debug,</div><div class='ctx'> 	[ESR_ELx_EC_BRK64]	= kvm_handle_guest_debug,</div><div class='add'>+	[ESR_ELx_EC_FP_ASIMD]	= handle_no_fpsimd,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu)</div><div class='head'>diff --git a/arch/arm64/kvm/hyp/debug-sr.c b/arch/arm64/kvm/hyp/debug-sr.c<br/>index 4ba5c9095d03..f5154ed3da6c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/hyp/debug-sr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/hyp/debug-sr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/hyp/debug-sr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/hyp/debug-sr.c</a></div><div class='hunk'>@@ -65,6 +65,66 @@</div><div class='ctx'> 	default:	write_debug(ptr[0], reg, 0);			\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define PMSCR_EL1		sys_reg(3, 0, 9, 9, 0)</div><div class='add'>+</div><div class='add'>+#define PMBLIMITR_EL1		sys_reg(3, 0, 9, 10, 0)</div><div class='add'>+#define PMBLIMITR_EL1_E		BIT(0)</div><div class='add'>+</div><div class='add'>+#define PMBIDR_EL1		sys_reg(3, 0, 9, 10, 7)</div><div class='add'>+#define PMBIDR_EL1_P		BIT(4)</div><div class='add'>+</div><div class='add'>+#define psb_csync()		asm volatile("hint #17")</div><div class='add'>+</div><div class='add'>+static void __hyp_text __debug_save_spe_vhe(u64 *pmscr_el1)</div><div class='add'>+{</div><div class='add'>+	/* The vcpu can run. but it can't hide. */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __hyp_text __debug_save_spe_nvhe(u64 *pmscr_el1)</div><div class='add'>+{</div><div class='add'>+	u64 reg;</div><div class='add'>+</div><div class='add'>+	/* SPE present on this CPU? */</div><div class='add'>+	if (!cpuid_feature_extract_unsigned_field(read_sysreg(id_aa64dfr0_el1),</div><div class='add'>+						  ID_AA64DFR0_PMSVER_SHIFT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Yes; is it owned by EL3? */</div><div class='add'>+	reg = read_sysreg_s(PMBIDR_EL1);</div><div class='add'>+	if (reg &amp; PMBIDR_EL1_P)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* No; is the host actually using the thing? */</div><div class='add'>+	reg = read_sysreg_s(PMBLIMITR_EL1);</div><div class='add'>+	if (!(reg &amp; PMBLIMITR_EL1_E))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Yes; save the control register and disable data generation */</div><div class='add'>+	*pmscr_el1 = read_sysreg_s(PMSCR_EL1);</div><div class='add'>+	write_sysreg_s(0, PMSCR_EL1);</div><div class='add'>+	isb();</div><div class='add'>+</div><div class='add'>+	/* Now drain all buffered data to memory */</div><div class='add'>+	psb_csync();</div><div class='add'>+	dsb(nsh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static hyp_alternate_select(__debug_save_spe,</div><div class='add'>+			    __debug_save_spe_nvhe, __debug_save_spe_vhe,</div><div class='add'>+			    ARM64_HAS_VIRT_HOST_EXTN);</div><div class='add'>+</div><div class='add'>+static void __hyp_text __debug_restore_spe(u64 pmscr_el1)</div><div class='add'>+{</div><div class='add'>+	if (!pmscr_el1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* The host page table is installed, but not yet synchronised */</div><div class='add'>+	isb();</div><div class='add'>+</div><div class='add'>+	/* Re-enable data generation */</div><div class='add'>+	write_sysreg_s(pmscr_el1, PMSCR_EL1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __hyp_text __debug_save_state(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				   struct kvm_guest_debug_arch *dbg,</div><div class='ctx'> 				   struct kvm_cpu_context *ctxt)</div><div class='hunk'>@@ -118,13 +178,15 @@ void __hyp_text __debug_cond_save_host_state(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	    (vcpu-&gt;arch.ctxt.sys_regs[MDSCR_EL1] &amp; DBG_MDSCR_MDE))</div><div class='ctx'> 		vcpu-&gt;arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY;</div><div class='ctx'> </div><div class='del'>-	__debug_save_state(vcpu, &amp;vcpu-&gt;arch.host_debug_state,</div><div class='add'>+	__debug_save_state(vcpu, &amp;vcpu-&gt;arch.host_debug_state.regs,</div><div class='ctx'> 			   kern_hyp_va(vcpu-&gt;arch.host_cpu_context));</div><div class='add'>+	__debug_save_spe()(&amp;vcpu-&gt;arch.host_debug_state.pmscr_el1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __hyp_text __debug_cond_restore_host_state(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	__debug_restore_state(vcpu, &amp;vcpu-&gt;arch.host_debug_state,</div><div class='add'>+	__debug_restore_spe(vcpu-&gt;arch.host_debug_state.pmscr_el1);</div><div class='add'>+	__debug_restore_state(vcpu, &amp;vcpu-&gt;arch.host_debug_state.regs,</div><div class='ctx'> 			      kern_hyp_va(vcpu-&gt;arch.host_cpu_context));</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;arch.debug_flags &amp; KVM_ARM64_DEBUG_DIRTY)</div><div class='head'>diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S<br/>index 4e92399f7105..5e9052f087f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/hyp/hyp-entry.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/hyp/hyp-entry.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/hyp/hyp-entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/hyp/hyp-entry.S</a></div><div class='hunk'>@@ -106,9 +106,16 @@ el1_trap:</div><div class='ctx'> 	 * x0: ESR_EC</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/* Guest accessed VFP/SIMD registers, save host, restore Guest */</div><div class='add'>+	/*</div><div class='add'>+	 * We trap the first access to the FP/SIMD to save the host context</div><div class='add'>+	 * and restore the guest context lazily.</div><div class='add'>+	 * If FP/SIMD is not implemented, handle the trap and inject an</div><div class='add'>+	 * undefined instruction exception to the guest.</div><div class='add'>+	 */</div><div class='add'>+alternative_if_not ARM64_HAS_NO_FPSIMD</div><div class='ctx'> 	cmp	x0, #ESR_ELx_EC_FP_ASIMD</div><div class='ctx'> 	b.eq	__fpsimd_guest_restore</div><div class='add'>+alternative_else_nop_endif</div><div class='ctx'> </div><div class='ctx'> 	mrs	x1, tpidr_el2</div><div class='ctx'> 	mov	x0, #ARM_EXCEPTION_TRAP</div><div class='head'>diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c<br/>index 83037cd62d01..aede1658aeda 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/hyp/switch.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/hyp/switch.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/hyp/switch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/hyp/switch.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;asm/kvm_asm.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_emulate.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_hyp.h&gt;</div><div class='add'>+#include &lt;asm/fpsimd.h&gt;</div><div class='ctx'> </div><div class='ctx'> static bool __hyp_text __fpsimd_enabled_nvhe(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -76,16 +77,24 @@ static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	 * traps are only taken to EL2 if the operation would not otherwise</div><div class='ctx'> 	 * trap to EL1.  Therefore, always make sure that for 32-bit guests,</div><div class='ctx'> 	 * we set FPEXC.EN to prevent traps to EL1, when setting the TFP bit.</div><div class='add'>+	 * If FP/ASIMD is not implemented, FPEXC is UNDEFINED and any access to</div><div class='add'>+	 * it will cause an exception.</div><div class='ctx'> 	 */</div><div class='ctx'> 	val = vcpu-&gt;arch.hcr_el2;</div><div class='del'>-	if (!(val &amp; HCR_RW)) {</div><div class='add'>+	if (!(val &amp; HCR_RW) &amp;&amp; system_supports_fpsimd()) {</div><div class='ctx'> 		write_sysreg(1 &lt;&lt; 30, fpexc32_el2);</div><div class='ctx'> 		isb();</div><div class='ctx'> 	}</div><div class='ctx'> 	write_sysreg(val, hcr_el2);</div><div class='ctx'> 	/* Trap on AArch32 cp15 c15 accesses (EL1 or EL0) */</div><div class='ctx'> 	write_sysreg(1 &lt;&lt; 15, hstr_el2);</div><div class='del'>-	/* Make sure we trap PMU access from EL0 to EL2 */</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure we trap PMU access from EL0 to EL2. Also sanitize</div><div class='add'>+	 * PMSELR_EL0 to make sure it never contains the cycle</div><div class='add'>+	 * counter, which could make a PMXEVCNTR_EL0 access UNDEF at</div><div class='add'>+	 * EL1 instead of being trapped to EL2.</div><div class='add'>+	 */</div><div class='add'>+	write_sysreg(0, pmselr_el0);</div><div class='ctx'> 	write_sysreg(ARMV8_PMU_USERENR_MASK, pmuserenr_el0);</div><div class='ctx'> 	write_sysreg(vcpu-&gt;arch.mdcr_el2, mdcr_el2);</div><div class='ctx'> 	__activate_traps_arch()();</div><div class='hunk'>@@ -94,7 +103,13 @@ static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu)</div><div class='ctx'> static void __hyp_text __deactivate_traps_vhe(void)</div><div class='ctx'> {</div><div class='ctx'> 	extern char vectors[];	/* kernel exception vectors */</div><div class='add'>+	u64 mdcr_el2 = read_sysreg(mdcr_el2);</div><div class='ctx'> </div><div class='add'>+	mdcr_el2 &amp;= MDCR_EL2_HPMN_MASK |</div><div class='add'>+		    MDCR_EL2_E2PB_MASK &lt;&lt; MDCR_EL2_E2PB_SHIFT |</div><div class='add'>+		    MDCR_EL2_TPMS;</div><div class='add'>+</div><div class='add'>+	write_sysreg(mdcr_el2, mdcr_el2);</div><div class='ctx'> 	write_sysreg(HCR_HOST_VHE_FLAGS, hcr_el2);</div><div class='ctx'> 	write_sysreg(CPACR_EL1_FPEN, cpacr_el1);</div><div class='ctx'> 	write_sysreg(vectors, vbar_el1);</div><div class='hunk'>@@ -102,6 +117,12 @@ static void __hyp_text __deactivate_traps_vhe(void)</div><div class='ctx'> </div><div class='ctx'> static void __hyp_text __deactivate_traps_nvhe(void)</div><div class='ctx'> {</div><div class='add'>+	u64 mdcr_el2 = read_sysreg(mdcr_el2);</div><div class='add'>+</div><div class='add'>+	mdcr_el2 &amp;= MDCR_EL2_HPMN_MASK;</div><div class='add'>+	mdcr_el2 |= MDCR_EL2_E2PB_MASK &lt;&lt; MDCR_EL2_E2PB_SHIFT;</div><div class='add'>+</div><div class='add'>+	write_sysreg(mdcr_el2, mdcr_el2);</div><div class='ctx'> 	write_sysreg(HCR_RW, hcr_el2);</div><div class='ctx'> 	write_sysreg(CPTR_EL2_DEFAULT, cptr_el2);</div><div class='ctx'> }</div><div class='hunk'>@@ -123,7 +144,6 @@ static void __hyp_text __deactivate_traps(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	__deactivate_traps_arch()();</div><div class='ctx'> 	write_sysreg(0, hstr_el2);</div><div class='del'>-	write_sysreg(read_sysreg(mdcr_el2) &amp; MDCR_EL2_HPMN_MASK, mdcr_el2);</div><div class='ctx'> 	write_sysreg(0, pmuserenr_el0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -348,6 +368,10 @@ again:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	__debug_save_state(vcpu, kern_hyp_va(vcpu-&gt;arch.debug_ptr), guest_ctxt);</div><div class='add'>+	/*</div><div class='add'>+	 * This must come after restoring the host sysregs, since a non-VHE</div><div class='add'>+	 * system may enable SPE here and make use of the TTBRs.</div><div class='add'>+	 */</div><div class='ctx'> 	__debug_cond_restore_host_state(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	return exit_code;</div><div class='head'>diff --git a/arch/arm64/kvm/hyp/tlb.c b/arch/arm64/kvm/hyp/tlb.c<br/>index 88e2f2b938f0..e8e7ba2bc11f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/hyp/tlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/hyp/tlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/hyp/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/hyp/tlb.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/kvm_hyp.h&gt;</div><div class='add'>+#include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> void __hyp_text __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)</div><div class='ctx'> {</div><div class='hunk'>@@ -32,7 +33,7 @@ void __hyp_text __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)</div><div class='ctx'> 	 * whole of Stage-1. Weep...</div><div class='ctx'> 	 */</div><div class='ctx'> 	ipa &gt;&gt;= 12;</div><div class='del'>-	asm volatile("tlbi ipas2e1is, %0" : : "r" (ipa));</div><div class='add'>+	__tlbi(ipas2e1is, ipa);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have to ensure completion of the invalidation at Stage-2,</div><div class='hunk'>@@ -41,7 +42,7 @@ void __hyp_text __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)</div><div class='ctx'> 	 * the Stage-1 invalidation happened first.</div><div class='ctx'> 	 */</div><div class='ctx'> 	dsb(ish);</div><div class='del'>-	asm volatile("tlbi vmalle1is" : : );</div><div class='add'>+	__tlbi(vmalle1is);</div><div class='ctx'> 	dsb(ish);</div><div class='ctx'> 	isb();</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +58,7 @@ void __hyp_text __kvm_tlb_flush_vmid(struct kvm *kvm)</div><div class='ctx'> 	write_sysreg(kvm-&gt;arch.vttbr, vttbr_el2);</div><div class='ctx'> 	isb();</div><div class='ctx'> </div><div class='del'>-	asm volatile("tlbi vmalls12e1is" : : );</div><div class='add'>+	__tlbi(vmalls12e1is);</div><div class='ctx'> 	dsb(ish);</div><div class='ctx'> 	isb();</div><div class='ctx'> </div><div class='hunk'>@@ -72,7 +73,7 @@ void __hyp_text __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	write_sysreg(kvm-&gt;arch.vttbr, vttbr_el2);</div><div class='ctx'> 	isb();</div><div class='ctx'> </div><div class='del'>-	asm volatile("tlbi vmalle1" : : );</div><div class='add'>+	__tlbi(vmalle1);</div><div class='ctx'> 	dsb(nsh);</div><div class='ctx'> 	isb();</div><div class='ctx'> </div><div class='hunk'>@@ -82,7 +83,7 @@ void __hyp_text __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu)</div><div class='ctx'> void __hyp_text __kvm_flush_vm_context(void)</div><div class='ctx'> {</div><div class='ctx'> 	dsb(ishst);</div><div class='del'>-	asm volatile("tlbi alle1is	\n"</div><div class='del'>-		     "ic ialluis	  ": : );</div><div class='add'>+	__tlbi(alle1is);</div><div class='add'>+	asm volatile("ic ialluis" : : );</div><div class='ctx'> 	dsb(ish);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c<br/>index 5bc460884639..d9e9697de1b2 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/reset.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/reset.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/reset.c</a></div><div class='hunk'>@@ -46,6 +46,11 @@ static const struct kvm_regs default_regs_reset32 = {</div><div class='ctx'> 			COMPAT_PSR_I_BIT | COMPAT_PSR_F_BIT),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct kvm_irq_level default_ptimer_irq = {</div><div class='add'>+	.irq	= 30,</div><div class='add'>+	.level	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct kvm_irq_level default_vtimer_irq = {</div><div class='ctx'> 	.irq	= 27,</div><div class='ctx'> 	.level	= 1,</div><div class='hunk'>@@ -86,12 +91,6 @@ int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> 	case KVM_CAP_VCPU_ATTRIBUTES:</div><div class='ctx'> 		r = 1;</div><div class='ctx'> 		break;</div><div class='del'>-	case KVM_CAP_MSI_DEVID:</div><div class='del'>-		if (!kvm)</div><div class='del'>-			r = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			r = kvm-&gt;arch.vgic.msis_require_devid;</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		r = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -110,6 +109,7 @@ int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> int kvm_reset_vcpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	const struct kvm_irq_level *cpu_vtimer_irq;</div><div class='add'>+	const struct kvm_irq_level *cpu_ptimer_irq;</div><div class='ctx'> 	const struct kvm_regs *cpu_reset;</div><div class='ctx'> </div><div class='ctx'> 	switch (vcpu-&gt;arch.target) {</div><div class='hunk'>@@ -123,6 +123,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		cpu_vtimer_irq = &amp;default_vtimer_irq;</div><div class='add'>+		cpu_ptimer_irq = &amp;default_ptimer_irq;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -136,5 +137,5 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	kvm_pmu_vcpu_reset(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset timer */</div><div class='del'>-	return kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq);</div><div class='add'>+	return kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq, cpu_ptimer_irq);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c<br/>index 87e7e6608cd8..0e26f8c2b56f 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/sys_regs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/sys_regs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/sys_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/sys_regs.c</a></div><div class='hunk'>@@ -820,6 +820,61 @@ static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,</div><div class='ctx'> 	  CRm((0b1100 | (((n) &gt;&gt; 3) &amp; 0x3))), Op2(((n) &amp; 0x7)),		\</div><div class='ctx'> 	  access_pmu_evtyper, reset_unknown, (PMEVTYPER0_EL0 + n), }</div><div class='ctx'> </div><div class='add'>+static bool access_cntp_tval(struct kvm_vcpu *vcpu,</div><div class='add'>+		struct sys_reg_params *p,</div><div class='add'>+		const struct sys_reg_desc *r)</div><div class='add'>+{</div><div class='add'>+	struct arch_timer_context *ptimer = vcpu_ptimer(vcpu);</div><div class='add'>+	u64 now = kvm_phys_timer_read();</div><div class='add'>+</div><div class='add'>+	if (p-&gt;is_write)</div><div class='add'>+		ptimer-&gt;cnt_cval = p-&gt;regval + now;</div><div class='add'>+	else</div><div class='add'>+		p-&gt;regval = ptimer-&gt;cnt_cval - now;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool access_cntp_ctl(struct kvm_vcpu *vcpu,</div><div class='add'>+		struct sys_reg_params *p,</div><div class='add'>+		const struct sys_reg_desc *r)</div><div class='add'>+{</div><div class='add'>+	struct arch_timer_context *ptimer = vcpu_ptimer(vcpu);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;is_write) {</div><div class='add'>+		/* ISTATUS bit is read-only */</div><div class='add'>+		ptimer-&gt;cnt_ctl = p-&gt;regval &amp; ~ARCH_TIMER_CTRL_IT_STAT;</div><div class='add'>+	} else {</div><div class='add'>+		u64 now = kvm_phys_timer_read();</div><div class='add'>+</div><div class='add'>+		p-&gt;regval = ptimer-&gt;cnt_ctl;</div><div class='add'>+		/*</div><div class='add'>+		 * Set ISTATUS bit if it's expired.</div><div class='add'>+		 * Note that according to ARMv8 ARM Issue A.k, ISTATUS bit is</div><div class='add'>+		 * UNKNOWN when ENABLE bit is 0, so we chose to set ISTATUS bit</div><div class='add'>+		 * regardless of ENABLE bit for our implementation convenience.</div><div class='add'>+		 */</div><div class='add'>+		if (ptimer-&gt;cnt_cval &lt;= now)</div><div class='add'>+			p-&gt;regval |= ARCH_TIMER_CTRL_IT_STAT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool access_cntp_cval(struct kvm_vcpu *vcpu,</div><div class='add'>+		struct sys_reg_params *p,</div><div class='add'>+		const struct sys_reg_desc *r)</div><div class='add'>+{</div><div class='add'>+	struct arch_timer_context *ptimer = vcpu_ptimer(vcpu);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;is_write)</div><div class='add'>+		ptimer-&gt;cnt_cval = p-&gt;regval;</div><div class='add'>+	else</div><div class='add'>+		p-&gt;regval = ptimer-&gt;cnt_cval;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Architected system registers.</div><div class='ctx'>  * Important: Must be sorted ascending by Op0, Op1, CRn, CRm, Op2</div><div class='hunk'>@@ -1029,6 +1084,16 @@ static const struct sys_reg_desc sys_reg_descs[] = {</div><div class='ctx'> 	{ Op0(0b11), Op1(0b011), CRn(0b1101), CRm(0b0000), Op2(0b011),</div><div class='ctx'> 	  NULL, reset_unknown, TPIDRRO_EL0 },</div><div class='ctx'> </div><div class='add'>+	/* CNTP_TVAL_EL0 */</div><div class='add'>+	{ Op0(0b11), Op1(0b011), CRn(0b1110), CRm(0b0010), Op2(0b000),</div><div class='add'>+	  access_cntp_tval },</div><div class='add'>+	/* CNTP_CTL_EL0 */</div><div class='add'>+	{ Op0(0b11), Op1(0b011), CRn(0b1110), CRm(0b0010), Op2(0b001),</div><div class='add'>+	  access_cntp_ctl },</div><div class='add'>+	/* CNTP_CVAL_EL0 */</div><div class='add'>+	{ Op0(0b11), Op1(0b011), CRn(0b1110), CRm(0b0010), Op2(0b010),</div><div class='add'>+	  access_cntp_cval },</div><div class='add'>+</div><div class='ctx'> 	/* PMEVCNTRn_EL0 */</div><div class='ctx'> 	PMU_PMEVCNTR_EL0(0),</div><div class='ctx'> 	PMU_PMEVCNTR_EL0(1),</div><div class='hunk'>@@ -1795,6 +1860,17 @@ static bool index_to_params(u64 id, struct sys_reg_params *params)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const struct sys_reg_desc *find_reg_by_id(u64 id,</div><div class='add'>+					  struct sys_reg_params *params,</div><div class='add'>+					  const struct sys_reg_desc table[],</div><div class='add'>+					  unsigned int num)</div><div class='add'>+{</div><div class='add'>+	if (!index_to_params(id, params))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return find_reg(params, table, num);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Decode an index value, and find the sys_reg_desc entry. */</div><div class='ctx'> static const struct sys_reg_desc *index_to_sys_reg_desc(struct kvm_vcpu *vcpu,</div><div class='ctx'> 						    u64 id)</div><div class='hunk'>@@ -1807,11 +1883,8 @@ static const struct sys_reg_desc *index_to_sys_reg_desc(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	if ((id &amp; KVM_REG_ARM_COPROC_MASK) != KVM_REG_ARM64_SYSREG)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (!index_to_params(id, &amp;params))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='ctx'> 	table = get_target_table(vcpu-&gt;arch.target, true, &amp;num);</div><div class='del'>-	r = find_reg(&amp;params, table, num);</div><div class='add'>+	r = find_reg_by_id(id, &amp;params, table, num);</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		r = find_reg(&amp;params, sys_reg_descs, ARRAY_SIZE(sys_reg_descs));</div><div class='ctx'> </div><div class='hunk'>@@ -1918,10 +1991,8 @@ static int get_invariant_sys_reg(u64 id, void __user *uaddr)</div><div class='ctx'> 	struct sys_reg_params params;</div><div class='ctx'> 	const struct sys_reg_desc *r;</div><div class='ctx'> </div><div class='del'>-	if (!index_to_params(id, &amp;params))</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	r = find_reg(&amp;params, invariant_sys_regs, ARRAY_SIZE(invariant_sys_regs));</div><div class='add'>+	r = find_reg_by_id(id, &amp;params, invariant_sys_regs,</div><div class='add'>+			   ARRAY_SIZE(invariant_sys_regs));</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='hunk'>@@ -1935,9 +2006,8 @@ static int set_invariant_sys_reg(u64 id, void __user *uaddr)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u64 val = 0; /* Make sure high bits are 0 for 32-bit regs */</div><div class='ctx'> </div><div class='del'>-	if (!index_to_params(id, &amp;params))</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	r = find_reg(&amp;params, invariant_sys_regs, ARRAY_SIZE(invariant_sys_regs));</div><div class='add'>+	r = find_reg_by_id(id, &amp;params, invariant_sys_regs,</div><div class='add'>+			   ARRAY_SIZE(invariant_sys_regs));</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h<br/>index dbbb01cfbee9..9c6ffd0f0196 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/kvm/sys_regs.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/kvm/sys_regs.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/sys_regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/sys_regs.h</a></div><div class='hunk'>@@ -136,6 +136,10 @@ static inline int cmp_sys_reg(const struct sys_reg_desc *i1,</div><div class='ctx'> 	return i1-&gt;Op2 - i2-&gt;Op2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const struct sys_reg_desc *find_reg_by_id(u64 id,</div><div class='add'>+					  struct sys_reg_params *params,</div><div class='add'>+					  const struct sys_reg_desc table[],</div><div class='add'>+					  unsigned int num);</div><div class='ctx'> </div><div class='ctx'> #define Op0(_x) 	.Op0 = _x</div><div class='ctx'> #define Op1(_x) 	.Op1 = _x</div><div class='head'>diff --git a/arch/arm64/kvm/vgic-sys-reg-v3.c b/arch/arm64/kvm/vgic-sys-reg-v3.c<br/>new file mode 100644<br/>index 000000000000..79f37e37d367<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/kvm/vgic-sys-reg-v3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/kvm/vgic-sys-reg-v3.c</a></div><div class='hunk'>@@ -0,0 +1,346 @@</div><div class='add'>+/*</div><div class='add'>+ * VGIC system registers handling functions for AArch64 mode</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/irqchip/arm-gic-v3.h&gt;</div><div class='add'>+#include &lt;linux/kvm.h&gt;</div><div class='add'>+#include &lt;linux/kvm_host.h&gt;</div><div class='add'>+#include &lt;asm/kvm_emulate.h&gt;</div><div class='add'>+#include "vgic.h"</div><div class='add'>+#include "sys_regs.h"</div><div class='add'>+</div><div class='add'>+static bool access_gic_ctlr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,</div><div class='add'>+			    const struct sys_reg_desc *r)</div><div class='add'>+{</div><div class='add'>+	u32 host_pri_bits, host_id_bits, host_seis, host_a3v, seis, a3v;</div><div class='add'>+	struct vgic_cpu *vgic_v3_cpu = &amp;vcpu-&gt;arch.vgic_cpu;</div><div class='add'>+	struct vgic_vmcr vmcr;</div><div class='add'>+	u64 val;</div><div class='add'>+</div><div class='add'>+	vgic_get_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+	if (p-&gt;is_write) {</div><div class='add'>+		val = p-&gt;regval;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Disallow restoring VM state if not supported by this</div><div class='add'>+		 * hardware.</div><div class='add'>+		 */</div><div class='add'>+		host_pri_bits = ((val &amp; ICC_CTLR_EL1_PRI_BITS_MASK) &gt;&gt;</div><div class='add'>+				 ICC_CTLR_EL1_PRI_BITS_SHIFT) + 1;</div><div class='add'>+		if (host_pri_bits &gt; vgic_v3_cpu-&gt;num_pri_bits)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		vgic_v3_cpu-&gt;num_pri_bits = host_pri_bits;</div><div class='add'>+</div><div class='add'>+		host_id_bits = (val &amp; ICC_CTLR_EL1_ID_BITS_MASK) &gt;&gt;</div><div class='add'>+				ICC_CTLR_EL1_ID_BITS_SHIFT;</div><div class='add'>+		if (host_id_bits &gt; vgic_v3_cpu-&gt;num_id_bits)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		vgic_v3_cpu-&gt;num_id_bits = host_id_bits;</div><div class='add'>+</div><div class='add'>+		host_seis = ((kvm_vgic_global_state.ich_vtr_el2 &amp;</div><div class='add'>+			     ICH_VTR_SEIS_MASK) &gt;&gt; ICH_VTR_SEIS_SHIFT);</div><div class='add'>+		seis = (val &amp; ICC_CTLR_EL1_SEIS_MASK) &gt;&gt;</div><div class='add'>+			ICC_CTLR_EL1_SEIS_SHIFT;</div><div class='add'>+		if (host_seis != seis)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		host_a3v = ((kvm_vgic_global_state.ich_vtr_el2 &amp;</div><div class='add'>+			    ICH_VTR_A3V_MASK) &gt;&gt; ICH_VTR_A3V_SHIFT);</div><div class='add'>+		a3v = (val &amp; ICC_CTLR_EL1_A3V_MASK) &gt;&gt; ICC_CTLR_EL1_A3V_SHIFT;</div><div class='add'>+		if (host_a3v != a3v)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Here set VMCR.CTLR in ICC_CTLR_EL1 layout.</div><div class='add'>+		 * The vgic_set_vmcr() will convert to ICH_VMCR layout.</div><div class='add'>+		 */</div><div class='add'>+		vmcr.ctlr = val &amp; ICC_CTLR_EL1_CBPR_MASK;</div><div class='add'>+		vmcr.ctlr |= val &amp; ICC_CTLR_EL1_EOImode_MASK;</div><div class='add'>+		vgic_set_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+	} else {</div><div class='add'>+		val = 0;</div><div class='add'>+		val |= (vgic_v3_cpu-&gt;num_pri_bits - 1) &lt;&lt;</div><div class='add'>+			ICC_CTLR_EL1_PRI_BITS_SHIFT;</div><div class='add'>+		val |= vgic_v3_cpu-&gt;num_id_bits &lt;&lt; ICC_CTLR_EL1_ID_BITS_SHIFT;</div><div class='add'>+		val |= ((kvm_vgic_global_state.ich_vtr_el2 &amp;</div><div class='add'>+			ICH_VTR_SEIS_MASK) &gt;&gt; ICH_VTR_SEIS_SHIFT) &lt;&lt;</div><div class='add'>+			ICC_CTLR_EL1_SEIS_SHIFT;</div><div class='add'>+		val |= ((kvm_vgic_global_state.ich_vtr_el2 &amp;</div><div class='add'>+			ICH_VTR_A3V_MASK) &gt;&gt; ICH_VTR_A3V_SHIFT) &lt;&lt;</div><div class='add'>+			ICC_CTLR_EL1_A3V_SHIFT;</div><div class='add'>+		/*</div><div class='add'>+		 * The VMCR.CTLR value is in ICC_CTLR_EL1 layout.</div><div class='add'>+		 * Extract it directly using ICC_CTLR_EL1 reg definitions.</div><div class='add'>+		 */</div><div class='add'>+		val |= vmcr.ctlr &amp; ICC_CTLR_EL1_CBPR_MASK;</div><div class='add'>+		val |= vmcr.ctlr &amp; ICC_CTLR_EL1_EOImode_MASK;</div><div class='add'>+</div><div class='add'>+		p-&gt;regval = val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool access_gic_pmr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,</div><div class='add'>+			   const struct sys_reg_desc *r)</div><div class='add'>+{</div><div class='add'>+	struct vgic_vmcr vmcr;</div><div class='add'>+</div><div class='add'>+	vgic_get_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+	if (p-&gt;is_write) {</div><div class='add'>+		vmcr.pmr = (p-&gt;regval &amp; ICC_PMR_EL1_MASK) &gt;&gt; ICC_PMR_EL1_SHIFT;</div><div class='add'>+		vgic_set_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+	} else {</div><div class='add'>+		p-&gt;regval = (vmcr.pmr &lt;&lt; ICC_PMR_EL1_SHIFT) &amp; ICC_PMR_EL1_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool access_gic_bpr0(struct kvm_vcpu *vcpu, struct sys_reg_params *p,</div><div class='add'>+			    const struct sys_reg_desc *r)</div><div class='add'>+{</div><div class='add'>+	struct vgic_vmcr vmcr;</div><div class='add'>+</div><div class='add'>+	vgic_get_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+	if (p-&gt;is_write) {</div><div class='add'>+		vmcr.bpr = (p-&gt;regval &amp; ICC_BPR0_EL1_MASK) &gt;&gt;</div><div class='add'>+			    ICC_BPR0_EL1_SHIFT;</div><div class='add'>+		vgic_set_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+	} else {</div><div class='add'>+		p-&gt;regval = (vmcr.bpr &lt;&lt; ICC_BPR0_EL1_SHIFT) &amp;</div><div class='add'>+			     ICC_BPR0_EL1_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool access_gic_bpr1(struct kvm_vcpu *vcpu, struct sys_reg_params *p,</div><div class='add'>+			    const struct sys_reg_desc *r)</div><div class='add'>+{</div><div class='add'>+	struct vgic_vmcr vmcr;</div><div class='add'>+</div><div class='add'>+	if (!p-&gt;is_write)</div><div class='add'>+		p-&gt;regval = 0;</div><div class='add'>+</div><div class='add'>+	vgic_get_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+	if (!((vmcr.ctlr &amp; ICH_VMCR_CBPR_MASK) &gt;&gt; ICH_VMCR_CBPR_SHIFT)) {</div><div class='add'>+		if (p-&gt;is_write) {</div><div class='add'>+			vmcr.abpr = (p-&gt;regval &amp; ICC_BPR1_EL1_MASK) &gt;&gt;</div><div class='add'>+				     ICC_BPR1_EL1_SHIFT;</div><div class='add'>+			vgic_set_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+		} else {</div><div class='add'>+			p-&gt;regval = (vmcr.abpr &lt;&lt; ICC_BPR1_EL1_SHIFT) &amp;</div><div class='add'>+				     ICC_BPR1_EL1_MASK;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (!p-&gt;is_write)</div><div class='add'>+			p-&gt;regval = min((vmcr.bpr + 1), 7U);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool access_gic_grpen0(struct kvm_vcpu *vcpu, struct sys_reg_params *p,</div><div class='add'>+			      const struct sys_reg_desc *r)</div><div class='add'>+{</div><div class='add'>+	struct vgic_vmcr vmcr;</div><div class='add'>+</div><div class='add'>+	vgic_get_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+	if (p-&gt;is_write) {</div><div class='add'>+		vmcr.grpen0 = (p-&gt;regval &amp; ICC_IGRPEN0_EL1_MASK) &gt;&gt;</div><div class='add'>+			       ICC_IGRPEN0_EL1_SHIFT;</div><div class='add'>+		vgic_set_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+	} else {</div><div class='add'>+		p-&gt;regval = (vmcr.grpen0 &lt;&lt; ICC_IGRPEN0_EL1_SHIFT) &amp;</div><div class='add'>+			     ICC_IGRPEN0_EL1_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool access_gic_grpen1(struct kvm_vcpu *vcpu, struct sys_reg_params *p,</div><div class='add'>+			      const struct sys_reg_desc *r)</div><div class='add'>+{</div><div class='add'>+	struct vgic_vmcr vmcr;</div><div class='add'>+</div><div class='add'>+	vgic_get_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+	if (p-&gt;is_write) {</div><div class='add'>+		vmcr.grpen1 = (p-&gt;regval &amp; ICC_IGRPEN1_EL1_MASK) &gt;&gt;</div><div class='add'>+			       ICC_IGRPEN1_EL1_SHIFT;</div><div class='add'>+		vgic_set_vmcr(vcpu, &amp;vmcr);</div><div class='add'>+	} else {</div><div class='add'>+		p-&gt;regval = (vmcr.grpen1 &lt;&lt; ICC_IGRPEN1_EL1_SHIFT) &amp;</div><div class='add'>+			     ICC_IGRPEN1_EL1_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vgic_v3_access_apr_reg(struct kvm_vcpu *vcpu,</div><div class='add'>+				   struct sys_reg_params *p, u8 apr, u8 idx)</div><div class='add'>+{</div><div class='add'>+	struct vgic_v3_cpu_if *vgicv3 = &amp;vcpu-&gt;arch.vgic_cpu.vgic_v3;</div><div class='add'>+	uint32_t *ap_reg;</div><div class='add'>+</div><div class='add'>+	if (apr)</div><div class='add'>+		ap_reg = &amp;vgicv3-&gt;vgic_ap1r[idx];</div><div class='add'>+	else</div><div class='add'>+		ap_reg = &amp;vgicv3-&gt;vgic_ap0r[idx];</div><div class='add'>+</div><div class='add'>+	if (p-&gt;is_write)</div><div class='add'>+		*ap_reg = p-&gt;regval;</div><div class='add'>+	else</div><div class='add'>+		p-&gt;regval = *ap_reg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool access_gic_aprn(struct kvm_vcpu *vcpu, struct sys_reg_params *p,</div><div class='add'>+			    const struct sys_reg_desc *r, u8 apr)</div><div class='add'>+{</div><div class='add'>+	struct vgic_cpu *vgic_v3_cpu = &amp;vcpu-&gt;arch.vgic_cpu;</div><div class='add'>+	u8 idx = r-&gt;Op2 &amp; 3;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * num_pri_bits are initialized with HW supported values.</div><div class='add'>+	 * We can rely safely on num_pri_bits even if VM has not</div><div class='add'>+	 * restored ICC_CTLR_EL1 before restoring APnR registers.</div><div class='add'>+	 */</div><div class='add'>+	switch (vgic_v3_cpu-&gt;num_pri_bits) {</div><div class='add'>+	case 7:</div><div class='add'>+		vgic_v3_access_apr_reg(vcpu, p, apr, idx);</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		if (idx &gt; 1)</div><div class='add'>+			goto err;</div><div class='add'>+		vgic_v3_access_apr_reg(vcpu, p, apr, idx);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (idx &gt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+		vgic_v3_access_apr_reg(vcpu, p, apr, idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+err:</div><div class='add'>+	if (!p-&gt;is_write)</div><div class='add'>+		p-&gt;regval = 0;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool access_gic_ap0r(struct kvm_vcpu *vcpu, struct sys_reg_params *p,</div><div class='add'>+			    const struct sys_reg_desc *r)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	return access_gic_aprn(vcpu, p, r, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool access_gic_ap1r(struct kvm_vcpu *vcpu, struct sys_reg_params *p,</div><div class='add'>+			    const struct sys_reg_desc *r)</div><div class='add'>+{</div><div class='add'>+	return access_gic_aprn(vcpu, p, r, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool access_gic_sre(struct kvm_vcpu *vcpu, struct sys_reg_params *p,</div><div class='add'>+			   const struct sys_reg_desc *r)</div><div class='add'>+{</div><div class='add'>+	struct vgic_v3_cpu_if *vgicv3 = &amp;vcpu-&gt;arch.vgic_cpu.vgic_v3;</div><div class='add'>+</div><div class='add'>+	/* Validate SRE bit */</div><div class='add'>+	if (p-&gt;is_write) {</div><div class='add'>+		if (!(p-&gt;regval &amp; ICC_SRE_EL1_SRE))</div><div class='add'>+			return false;</div><div class='add'>+	} else {</div><div class='add'>+		p-&gt;regval = vgicv3-&gt;vgic_sre;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+static const struct sys_reg_desc gic_v3_icc_reg_descs[] = {</div><div class='add'>+	/* ICC_PMR_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(4), CRm(6), Op2(0), access_gic_pmr },</div><div class='add'>+	/* ICC_BPR0_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(8), Op2(3), access_gic_bpr0 },</div><div class='add'>+	/* ICC_AP0R0_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(8), Op2(4), access_gic_ap0r },</div><div class='add'>+	/* ICC_AP0R1_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(8), Op2(5), access_gic_ap0r },</div><div class='add'>+	/* ICC_AP0R2_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(8), Op2(6), access_gic_ap0r },</div><div class='add'>+	/* ICC_AP0R3_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(8), Op2(7), access_gic_ap0r },</div><div class='add'>+	/* ICC_AP1R0_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(9), Op2(0), access_gic_ap1r },</div><div class='add'>+	/* ICC_AP1R1_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(9), Op2(1), access_gic_ap1r },</div><div class='add'>+	/* ICC_AP1R2_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(9), Op2(2), access_gic_ap1r },</div><div class='add'>+	/* ICC_AP1R3_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(9), Op2(3), access_gic_ap1r },</div><div class='add'>+	/* ICC_BPR1_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(12), Op2(3), access_gic_bpr1 },</div><div class='add'>+	/* ICC_CTLR_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(12), Op2(4), access_gic_ctlr },</div><div class='add'>+	/* ICC_SRE_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(12), Op2(5), access_gic_sre },</div><div class='add'>+	/* ICC_IGRPEN0_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(12), Op2(6), access_gic_grpen0 },</div><div class='add'>+	/* ICC_GRPEN1_EL1 */</div><div class='add'>+	{ Op0(3), Op1(0), CRn(12), CRm(12), Op2(7), access_gic_grpen1 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int vgic_v3_has_cpu_sysregs_attr(struct kvm_vcpu *vcpu, bool is_write, u64 id,</div><div class='add'>+				u64 *reg)</div><div class='add'>+{</div><div class='add'>+	struct sys_reg_params params;</div><div class='add'>+	u64 sysreg = (id &amp; KVM_DEV_ARM_VGIC_SYSREG_MASK) | KVM_REG_SIZE_U64;</div><div class='add'>+</div><div class='add'>+	params.regval = *reg;</div><div class='add'>+	params.is_write = is_write;</div><div class='add'>+	params.is_aarch32 = false;</div><div class='add'>+	params.is_32bit = false;</div><div class='add'>+</div><div class='add'>+	if (find_reg_by_id(sysreg, &amp;params, gic_v3_icc_reg_descs,</div><div class='add'>+			      ARRAY_SIZE(gic_v3_icc_reg_descs)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vgic_v3_cpu_sysregs_uaccess(struct kvm_vcpu *vcpu, bool is_write, u64 id,</div><div class='add'>+				u64 *reg)</div><div class='add'>+{</div><div class='add'>+	struct sys_reg_params params;</div><div class='add'>+	const struct sys_reg_desc *r;</div><div class='add'>+	u64 sysreg = (id &amp; KVM_DEV_ARM_VGIC_SYSREG_MASK) | KVM_REG_SIZE_U64;</div><div class='add'>+</div><div class='add'>+	if (is_write)</div><div class='add'>+		params.regval = *reg;</div><div class='add'>+	params.is_write = is_write;</div><div class='add'>+	params.is_aarch32 = false;</div><div class='add'>+	params.is_32bit = false;</div><div class='add'>+</div><div class='add'>+	r = find_reg_by_id(sysreg, &amp;params, gic_v3_icc_reg_descs,</div><div class='add'>+			   ARRAY_SIZE(gic_v3_icc_reg_descs));</div><div class='add'>+	if (!r)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;access(vcpu, &amp;params, r))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!is_write)</div><div class='add'>+		*reg = params.regval;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S<br/>index 5d1cad3ce6d6..e88fb99c1561 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/lib/clear_user.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/lib/clear_user.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/lib/clear_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/lib/clear_user.S</a></div><div class='hunk'>@@ -17,10 +17,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/alternative.h&gt;</div><div class='del'>-#include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/cpufeature.h&gt;</div><div class='del'>-#include &lt;asm/sysreg.h&gt;</div><div class='add'>+#include &lt;asm/asm-uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> </div><div class='hunk'>@@ -33,8 +30,7 @@</div><div class='ctx'>  * Alignment fixed up by hardware.</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(__clear_user)</div><div class='del'>-ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(0)), ARM64_ALT_PAN_NOT_UAO, \</div><div class='del'>-	    CONFIG_ARM64_PAN)</div><div class='add'>+	uaccess_enable_not_uao x2, x3</div><div class='ctx'> 	mov	x2, x1			// save the size for fixup return</div><div class='ctx'> 	subs	x1, x1, #8</div><div class='ctx'> 	b.mi	2f</div><div class='hunk'>@@ -54,8 +50,7 @@ uao_user_alternative 9f, strh, sttrh, wzr, x0, 2</div><div class='ctx'> 	b.mi	5f</div><div class='ctx'> uao_user_alternative 9f, strb, sttrb, wzr, x0, 0</div><div class='ctx'> 5:	mov	x0, #0</div><div class='del'>-ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(1)), ARM64_ALT_PAN_NOT_UAO, \</div><div class='del'>-	    CONFIG_ARM64_PAN)</div><div class='add'>+	uaccess_disable_not_uao x2</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(__clear_user)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S<br/>index 4fd67ea03bb0..4b5d826895ff 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/lib/copy_from_user.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/lib/copy_from_user.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/lib/copy_from_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/lib/copy_from_user.S</a></div><div class='hunk'>@@ -16,11 +16,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/alternative.h&gt;</div><div class='del'>-#include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='del'>-#include &lt;asm/cpufeature.h&gt;</div><div class='del'>-#include &lt;asm/sysreg.h&gt;</div><div class='add'>+#include &lt;asm/asm-uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Copy from user space to a kernel buffer (alignment handled by the hardware)</div><div class='hunk'>@@ -67,12 +64,10 @@</div><div class='ctx'> </div><div class='ctx'> end	.req	x5</div><div class='ctx'> ENTRY(__arch_copy_from_user)</div><div class='del'>-ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(0)), ARM64_ALT_PAN_NOT_UAO, \</div><div class='del'>-	    CONFIG_ARM64_PAN)</div><div class='add'>+	uaccess_enable_not_uao x3, x4</div><div class='ctx'> 	add	end, x0, x2</div><div class='ctx'> #include "copy_template.S"</div><div class='del'>-ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(1)), ARM64_ALT_PAN_NOT_UAO, \</div><div class='del'>-	    CONFIG_ARM64_PAN)</div><div class='add'>+	uaccess_disable_not_uao x3</div><div class='ctx'> 	mov	x0, #0				// Nothing to copy</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(__arch_copy_from_user)</div><div class='head'>diff --git a/arch/arm64/lib/copy_in_user.S b/arch/arm64/lib/copy_in_user.S<br/>index f7292dd08c84..47184c3a97da 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/lib/copy_in_user.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/lib/copy_in_user.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/lib/copy_in_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/lib/copy_in_user.S</a></div><div class='hunk'>@@ -18,11 +18,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/alternative.h&gt;</div><div class='del'>-#include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='del'>-#include &lt;asm/cpufeature.h&gt;</div><div class='del'>-#include &lt;asm/sysreg.h&gt;</div><div class='add'>+#include &lt;asm/asm-uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Copy from user space to user space (alignment handled by the hardware)</div><div class='hunk'>@@ -68,12 +65,10 @@</div><div class='ctx'> </div><div class='ctx'> end	.req	x5</div><div class='ctx'> ENTRY(__copy_in_user)</div><div class='del'>-ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(0)), ARM64_ALT_PAN_NOT_UAO, \</div><div class='del'>-	    CONFIG_ARM64_PAN)</div><div class='add'>+	uaccess_enable_not_uao x3, x4</div><div class='ctx'> 	add	end, x0, x2</div><div class='ctx'> #include "copy_template.S"</div><div class='del'>-ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(1)), ARM64_ALT_PAN_NOT_UAO, \</div><div class='del'>-	    CONFIG_ARM64_PAN)</div><div class='add'>+	uaccess_disable_not_uao x3</div><div class='ctx'> 	mov	x0, #0</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(__copy_in_user)</div><div class='head'>diff --git a/arch/arm64/lib/copy_template.S b/arch/arm64/lib/copy_template.S<br/>index 410fbdb8163f..f5b9210f1c83 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/lib/copy_template.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/lib/copy_template.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/lib/copy_template.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/lib/copy_template.S</a></div><div class='hunk'>@@ -62,7 +62,7 @@ D_h	.req	x14</div><div class='ctx'> 	sub	count, count, tmp2</div><div class='ctx'> 	/*</div><div class='ctx'> 	* Copy the leading memory data from src to dst in an increasing</div><div class='del'>-	* address order.By this way,the risk of overwritting the source</div><div class='add'>+	* address order.By this way,the risk of overwriting the source</div><div class='ctx'> 	* memory data is eliminated when the distance between src and</div><div class='ctx'> 	* dst is less than 16. The memory accesses here are alignment.</div><div class='ctx'> 	*/</div><div class='head'>diff --git a/arch/arm64/lib/copy_to_user.S b/arch/arm64/lib/copy_to_user.S<br/>index 7a7efe255034..351f0766f7a6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/lib/copy_to_user.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/lib/copy_to_user.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/lib/copy_to_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/lib/copy_to_user.S</a></div><div class='hunk'>@@ -16,11 +16,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/alternative.h&gt;</div><div class='del'>-#include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='del'>-#include &lt;asm/cpufeature.h&gt;</div><div class='del'>-#include &lt;asm/sysreg.h&gt;</div><div class='add'>+#include &lt;asm/asm-uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Copy to user space from a kernel buffer (alignment handled by the hardware)</div><div class='hunk'>@@ -66,12 +63,10 @@</div><div class='ctx'> </div><div class='ctx'> end	.req	x5</div><div class='ctx'> ENTRY(__arch_copy_to_user)</div><div class='del'>-ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(0)), ARM64_ALT_PAN_NOT_UAO, \</div><div class='del'>-	    CONFIG_ARM64_PAN)</div><div class='add'>+	uaccess_enable_not_uao x3, x4</div><div class='ctx'> 	add	end, x0, x2</div><div class='ctx'> #include "copy_template.S"</div><div class='del'>-ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(1)), ARM64_ALT_PAN_NOT_UAO, \</div><div class='del'>-	    CONFIG_ARM64_PAN)</div><div class='add'>+	uaccess_disable_not_uao x3</div><div class='ctx'> 	mov	x0, #0</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(__arch_copy_to_user)</div><div class='head'>diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile<br/>index 54bb209cae8e..9b0ba191e48e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/Makefile</a></div><div class='hunk'>@@ -3,8 +3,11 @@ obj-y				:= dma-mapping.o extable.o fault.o init.o \</div><div class='ctx'> 				   ioremap.o mmap.o pgd.o mmu.o \</div><div class='ctx'> 				   context.o proc.o pageattr.o</div><div class='ctx'> obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o</div><div class='del'>-obj-$(CONFIG_ARM64_PTDUMP)	+= dump.o</div><div class='add'>+obj-$(CONFIG_ARM64_PTDUMP_CORE)	+= dump.o</div><div class='add'>+obj-$(CONFIG_ARM64_PTDUMP_DEBUGFS)	+= ptdump_debugfs.o</div><div class='ctx'> obj-$(CONFIG_NUMA)		+= numa.o</div><div class='add'>+obj-$(CONFIG_DEBUG_VIRTUAL)	+= physaddr.o</div><div class='add'>+KASAN_SANITIZE_physaddr.o	+= n</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_KASAN)		+= kasan_init.o</div><div class='ctx'> KASAN_SANITIZE_kasan_init.o	:= n</div><div class='head'>diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S<br/>index 58b5a906ff78..83c27b6e6dca 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/cache.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/cache.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/cache.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/cache.S</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/alternative.h&gt;</div><div class='add'>+#include &lt;asm/asm-uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	flush_icache_range(start,end)</div><div class='hunk'>@@ -48,6 +49,7 @@ ENTRY(flush_icache_range)</div><div class='ctx'>  *	- end     - virtual end address of region</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(__flush_cache_user_range)</div><div class='add'>+	uaccess_ttbr0_enable x2, x3</div><div class='ctx'> 	dcache_line_size x2, x3</div><div class='ctx'> 	sub	x3, x2, #1</div><div class='ctx'> 	bic	x4, x0, x3</div><div class='hunk'>@@ -69,10 +71,12 @@ USER(9f, ic	ivau, x4	)		// invalidate I line PoU</div><div class='ctx'> 	dsb	ish</div><div class='ctx'> 	isb</div><div class='ctx'> 	mov	x0, #0</div><div class='add'>+1:</div><div class='add'>+	uaccess_ttbr0_disable x1</div><div class='ctx'> 	ret</div><div class='ctx'> 9:</div><div class='ctx'> 	mov	x0, #-EFAULT</div><div class='del'>-	ret</div><div class='add'>+	b	1b</div><div class='ctx'> ENDPROC(flush_icache_range)</div><div class='ctx'> ENDPROC(__flush_cache_user_range)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/mm/context.c b/arch/arm64/mm/context.c<br/>index efcf1f7ef1e4..68634c630cdd 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/context.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/context.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/context.c</a></div><div class='hunk'>@@ -79,6 +79,13 @@ void verify_cpu_asid_bits(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void set_reserved_asid_bits(void)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_QCOM_FALKOR_ERRATUM_1003) &amp;&amp;</div><div class='add'>+	    cpus_have_const_cap(ARM64_WORKAROUND_QCOM_FALKOR_E1003))</div><div class='add'>+		__set_bit(FALKOR_RESERVED_ASID, asid_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void flush_context(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -87,6 +94,8 @@ static void flush_context(unsigned int cpu)</div><div class='ctx'> 	/* Update the list of reserved ASIDs and the ASID bitmap. */</div><div class='ctx'> 	bitmap_clear(asid_map, 0, NUM_USER_ASIDS);</div><div class='ctx'> </div><div class='add'>+	set_reserved_asid_bits();</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ensure the generation bump is observed before we xchg the</div><div class='ctx'> 	 * active_asids.</div><div class='hunk'>@@ -221,7 +230,12 @@ void check_and_switch_context(struct mm_struct *mm, unsigned int cpu)</div><div class='ctx'> 	raw_spin_unlock_irqrestore(&amp;cpu_asid_lock, flags);</div><div class='ctx'> </div><div class='ctx'> switch_mm_fastpath:</div><div class='del'>-	cpu_switch_mm(mm-&gt;pgd, mm);</div><div class='add'>+	/*</div><div class='add'>+	 * Defer TTBR0_EL1 setting for user threads to uaccess_enable() when</div><div class='add'>+	 * emulating PAN.</div><div class='add'>+	 */</div><div class='add'>+	if (!system_uses_ttbr0_pan())</div><div class='add'>+		cpu_switch_mm(mm-&gt;pgd, mm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int asids_init(void)</div><div class='hunk'>@@ -239,6 +253,8 @@ static int asids_init(void)</div><div class='ctx'> 		panic("Failed to allocate bitmap for %lu ASIDs\n",</div><div class='ctx'> 		      NUM_USER_ASIDS);</div><div class='ctx'> </div><div class='add'>+	set_reserved_asid_bits();</div><div class='add'>+</div><div class='ctx'> 	pr_info("ASID allocator initialised with %lu entries\n", NUM_USER_ASIDS);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c<br/>index 3f74d0d98de6..81cdb2e844ed 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/dma-mapping.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/dma-mapping.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/dma-mapping.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 		void *addr;</div><div class='ctx'> </div><div class='ctx'> 		page = dma_alloc_from_contiguous(dev, size &gt;&gt; PAGE_SHIFT,</div><div class='del'>-							get_order(size));</div><div class='add'>+						 get_order(size), flags);</div><div class='ctx'> 		if (!page)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -211,7 +211,8 @@ static dma_addr_t __swiotlb_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 	dma_addr_t dev_addr;</div><div class='ctx'> </div><div class='ctx'> 	dev_addr = swiotlb_map_page(dev, page, offset, size, dir, attrs);</div><div class='del'>-	if (!is_device_dma_coherent(dev))</div><div class='add'>+	if (!is_device_dma_coherent(dev) &amp;&amp;</div><div class='add'>+	    (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC) == 0)</div><div class='ctx'> 		__dma_map_area(phys_to_virt(dma_to_phys(dev, dev_addr)), size, dir);</div><div class='ctx'> </div><div class='ctx'> 	return dev_addr;</div><div class='hunk'>@@ -222,7 +223,8 @@ static void __swiotlb_unmap_page(struct device *dev, dma_addr_t dev_addr,</div><div class='ctx'> 				 size_t size, enum dma_data_direction dir,</div><div class='ctx'> 				 unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	if (!is_device_dma_coherent(dev))</div><div class='add'>+	if (!is_device_dma_coherent(dev) &amp;&amp;</div><div class='add'>+	    (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC) == 0)</div><div class='ctx'> 		__dma_unmap_area(phys_to_virt(dma_to_phys(dev, dev_addr)), size, dir);</div><div class='ctx'> 	swiotlb_unmap_page(dev, dev_addr, size, dir, attrs);</div><div class='ctx'> }</div><div class='hunk'>@@ -235,7 +237,8 @@ static int __swiotlb_map_sg_attrs(struct device *dev, struct scatterlist *sgl,</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = swiotlb_map_sg_attrs(dev, sgl, nelems, dir, attrs);</div><div class='del'>-	if (!is_device_dma_coherent(dev))</div><div class='add'>+	if (!is_device_dma_coherent(dev) &amp;&amp;</div><div class='add'>+	    (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC) == 0)</div><div class='ctx'> 		for_each_sg(sgl, sg, ret, i)</div><div class='ctx'> 			__dma_map_area(phys_to_virt(dma_to_phys(dev, sg-&gt;dma_address)),</div><div class='ctx'> 				       sg-&gt;length, dir);</div><div class='hunk'>@@ -251,7 +254,8 @@ static void __swiotlb_unmap_sg_attrs(struct device *dev,</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!is_device_dma_coherent(dev))</div><div class='add'>+	if (!is_device_dma_coherent(dev) &amp;&amp;</div><div class='add'>+	    (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC) == 0)</div><div class='ctx'> 		for_each_sg(sgl, sg, nelems, i)</div><div class='ctx'> 			__dma_unmap_area(phys_to_virt(dma_to_phys(dev, sg-&gt;dma_address)),</div><div class='ctx'> 					 sg-&gt;length, dir);</div><div class='hunk'>@@ -352,7 +356,14 @@ static int __swiotlb_dma_supported(struct device *hwdev, u64 mask)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops swiotlb_dma_ops = {</div><div class='add'>+static int __swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	if (swiotlb)</div><div class='add'>+		return swiotlb_dma_mapping_error(hwdev, addr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dma_map_ops swiotlb_dma_ops = {</div><div class='ctx'> 	.alloc = __dma_alloc,</div><div class='ctx'> 	.free = __dma_free,</div><div class='ctx'> 	.mmap = __swiotlb_mmap,</div><div class='hunk'>@@ -366,7 +377,7 @@ static struct dma_map_ops swiotlb_dma_ops = {</div><div class='ctx'> 	.sync_sg_for_cpu = __swiotlb_sync_sg_for_cpu,</div><div class='ctx'> 	.sync_sg_for_device = __swiotlb_sync_sg_for_device,</div><div class='ctx'> 	.dma_supported = __swiotlb_dma_supported,</div><div class='del'>-	.mapping_error = swiotlb_dma_mapping_error,</div><div class='add'>+	.mapping_error = __swiotlb_dma_mapping_error,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init atomic_pool_init(void)</div><div class='hunk'>@@ -379,7 +390,7 @@ static int __init atomic_pool_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (dev_get_cma_area(NULL))</div><div class='ctx'> 		page = dma_alloc_from_contiguous(NULL, nr_pages,</div><div class='del'>-							pool_size_order);</div><div class='add'>+						 pool_size_order, GFP_KERNEL);</div><div class='ctx'> 	else</div><div class='ctx'> 		page = alloc_pages(GFP_DMA, pool_size_order);</div><div class='ctx'> </div><div class='hunk'>@@ -505,7 +516,7 @@ static int __dummy_dma_supported(struct device *hwdev, u64 mask)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops dummy_dma_ops = {</div><div class='add'>+const struct dma_map_ops dummy_dma_ops = {</div><div class='ctx'> 	.alloc                  = __dummy_alloc,</div><div class='ctx'> 	.free                   = __dummy_free,</div><div class='ctx'> 	.mmap                   = __dummy_mmap,</div><div class='hunk'>@@ -524,7 +535,8 @@ EXPORT_SYMBOL(dummy_dma_ops);</div><div class='ctx'> </div><div class='ctx'> static int __init arm64_dma_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (swiotlb_force || max_pfn &gt; (arm64_dma_phys_limit &gt;&gt; PAGE_SHIFT))</div><div class='add'>+	if (swiotlb_force == SWIOTLB_FORCE ||</div><div class='add'>+	    max_pfn &gt; (arm64_dma_phys_limit &gt;&gt; PAGE_SHIFT))</div><div class='ctx'> 		swiotlb = 1;</div><div class='ctx'> </div><div class='ctx'> 	return atomic_pool_init();</div><div class='hunk'>@@ -557,7 +569,7 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size,</div><div class='ctx'> 				 unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> 	bool coherent = is_device_dma_coherent(dev);</div><div class='del'>-	int ioprot = dma_direction_to_prot(DMA_BIDIRECTIONAL, coherent);</div><div class='add'>+	int ioprot = dma_info_to_prot(DMA_BIDIRECTIONAL, coherent, attrs);</div><div class='ctx'> 	size_t iosize = size;</div><div class='ctx'> 	void *addr;</div><div class='ctx'> </div><div class='hunk'>@@ -711,7 +723,7 @@ static dma_addr_t __iommu_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 				   unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> 	bool coherent = is_device_dma_coherent(dev);</div><div class='del'>-	int prot = dma_direction_to_prot(dir, coherent);</div><div class='add'>+	int prot = dma_info_to_prot(dir, coherent, attrs);</div><div class='ctx'> 	dma_addr_t dev_addr = iommu_dma_map_page(dev, page, offset, size, prot);</div><div class='ctx'> </div><div class='ctx'> 	if (!iommu_dma_mapping_error(dev, dev_addr) &amp;&amp;</div><div class='hunk'>@@ -769,7 +781,7 @@ static int __iommu_map_sg_attrs(struct device *dev, struct scatterlist *sgl,</div><div class='ctx'> 		__iommu_sync_sg_for_device(dev, sgl, nelems, dir);</div><div class='ctx'> </div><div class='ctx'> 	return iommu_dma_map_sg(dev, sgl, nelems,</div><div class='del'>-			dma_direction_to_prot(dir, coherent));</div><div class='add'>+				dma_info_to_prot(dir, coherent, attrs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __iommu_unmap_sg_attrs(struct device *dev,</div><div class='hunk'>@@ -783,7 +795,7 @@ static void __iommu_unmap_sg_attrs(struct device *dev,</div><div class='ctx'> 	iommu_dma_unmap_sg(dev, sgl, nelems, dir, attrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops iommu_dma_ops = {</div><div class='add'>+static const struct dma_map_ops iommu_dma_ops = {</div><div class='ctx'> 	.alloc = __iommu_alloc_attrs,</div><div class='ctx'> 	.free = __iommu_free_attrs,</div><div class='ctx'> 	.mmap = __iommu_mmap_attrs,</div><div class='hunk'>@@ -796,7 +808,8 @@ static struct dma_map_ops iommu_dma_ops = {</div><div class='ctx'> 	.sync_single_for_device = __iommu_sync_single_for_device,</div><div class='ctx'> 	.sync_sg_for_cpu = __iommu_sync_sg_for_cpu,</div><div class='ctx'> 	.sync_sg_for_device = __iommu_sync_sg_for_device,</div><div class='del'>-	.dma_supported = iommu_dma_supported,</div><div class='add'>+	.map_resource = iommu_dma_map_resource,</div><div class='add'>+	.unmap_resource = iommu_dma_unmap_resource,</div><div class='ctx'> 	.mapping_error = iommu_dma_mapping_error,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -828,14 +841,21 @@ static bool do_iommu_attach(struct device *dev, const struct iommu_ops *ops,</div><div class='ctx'> 	 * then the IOMMU core will have already configured a group for this</div><div class='ctx'> 	 * device, and allocated the default domain for that group.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!domain || iommu_dma_init_domain(domain, dma_base, size, dev)) {</div><div class='del'>-		pr_warn("Failed to set up IOMMU for device %s; retaining platform DMA ops\n",</div><div class='del'>-			dev_name(dev));</div><div class='del'>-		return false;</div><div class='add'>+	if (!domain)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	if (domain-&gt;type == IOMMU_DOMAIN_DMA) {</div><div class='add'>+		if (iommu_dma_init_domain(domain, dma_base, size, dev))</div><div class='add'>+			goto out_err;</div><div class='add'>+</div><div class='add'>+		dev-&gt;dma_ops = &amp;iommu_dma_ops;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;archdata.dma_ops = &amp;iommu_dma_ops;</div><div class='ctx'> 	return true;</div><div class='add'>+out_err:</div><div class='add'>+	pr_warn("Failed to set up IOMMU for device %s; retaining platform DMA ops\n",</div><div class='add'>+		 dev_name(dev));</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void queue_iommu_attach(struct device *dev, const struct iommu_ops *ops,</div><div class='hunk'>@@ -938,12 +958,7 @@ static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,</div><div class='ctx'> </div><div class='ctx'> void arch_teardown_dma_ops(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct iommu_domain *domain = iommu_get_domain_for_dev(dev);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(domain))</div><div class='del'>-		iommu_detach_device(domain, dev);</div><div class='del'>-</div><div class='del'>-	dev-&gt;archdata.dma_ops = NULL;</div><div class='add'>+	dev-&gt;dma_ops = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -957,8 +972,8 @@ static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,</div><div class='ctx'> void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,</div><div class='ctx'> 			const struct iommu_ops *iommu, bool coherent)</div><div class='ctx'> {</div><div class='del'>-	if (!dev-&gt;archdata.dma_ops)</div><div class='del'>-		dev-&gt;archdata.dma_ops = &amp;swiotlb_dma_ops;</div><div class='add'>+	if (!dev-&gt;dma_ops)</div><div class='add'>+		dev-&gt;dma_ops = &amp;swiotlb_dma_ops;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;archdata.dma_coherent = coherent;</div><div class='ctx'> 	__iommu_setup_dma_ops(dev, dma_base, size, iommu);</div><div class='head'>diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c<br/>index 9c3e75df2180..ca74a2aace42 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/dump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/dump.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/dump.c</a></div><div class='hunk'>@@ -50,6 +50,18 @@ static const struct addr_marker address_markers[] = {</div><div class='ctx'> 	{ -1,				NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define pt_dump_seq_printf(m, fmt, args...)	\</div><div class='add'>+({						\</div><div class='add'>+	if (m)					\</div><div class='add'>+		seq_printf(m, fmt, ##args);	\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define pt_dump_seq_puts(m, fmt)	\</div><div class='add'>+({					\</div><div class='add'>+	if (m)				\</div><div class='add'>+		seq_printf(m, fmt);	\</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The page dumper groups page table entries of the same type into a single</div><div class='ctx'>  * description. It uses pg_state to track the range information while</div><div class='hunk'>@@ -62,6 +74,9 @@ struct pg_state {</div><div class='ctx'> 	unsigned long start_address;</div><div class='ctx'> 	unsigned level;</div><div class='ctx'> 	u64 current_prot;</div><div class='add'>+	bool check_wx;</div><div class='add'>+	unsigned long wx_pages;</div><div class='add'>+	unsigned long uxn_pages;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct prot_bits {</div><div class='hunk'>@@ -186,10 +201,39 @@ static void dump_prot(struct pg_state *st, const struct prot_bits *bits,</div><div class='ctx'> 			s = bits-&gt;clear;</div><div class='ctx'> </div><div class='ctx'> 		if (s)</div><div class='del'>-			seq_printf(st-&gt;seq, " %s", s);</div><div class='add'>+			pt_dump_seq_printf(st-&gt;seq, " %s", s);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void note_prot_uxn(struct pg_state *st, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	if (!st-&gt;check_wx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if ((st-&gt;current_prot &amp; PTE_UXN) == PTE_UXN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(1, "arm64/mm: Found non-UXN mapping at address %p/%pS\n",</div><div class='add'>+		  (void *)st-&gt;start_address, (void *)st-&gt;start_address);</div><div class='add'>+</div><div class='add'>+	st-&gt;uxn_pages += (addr - st-&gt;start_address) / PAGE_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void note_prot_wx(struct pg_state *st, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	if (!st-&gt;check_wx)</div><div class='add'>+		return;</div><div class='add'>+	if ((st-&gt;current_prot &amp; PTE_RDONLY) == PTE_RDONLY)</div><div class='add'>+		return;</div><div class='add'>+	if ((st-&gt;current_prot &amp; PTE_PXN) == PTE_PXN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(1, "arm64/mm: Found insecure W+X mapping at address %p/%pS\n",</div><div class='add'>+		  (void *)st-&gt;start_address, (void *)st-&gt;start_address);</div><div class='add'>+</div><div class='add'>+	st-&gt;wx_pages += (addr - st-&gt;start_address) / PAGE_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void note_page(struct pg_state *st, unsigned long addr, unsigned level,</div><div class='ctx'> 				u64 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -200,14 +244,16 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level,</div><div class='ctx'> 		st-&gt;level = level;</div><div class='ctx'> 		st-&gt;current_prot = prot;</div><div class='ctx'> 		st-&gt;start_address = addr;</div><div class='del'>-		seq_printf(st-&gt;seq, "---[ %s ]---\n", st-&gt;marker-&gt;name);</div><div class='add'>+		pt_dump_seq_printf(st-&gt;seq, "---[ %s ]---\n", st-&gt;marker-&gt;name);</div><div class='ctx'> 	} else if (prot != st-&gt;current_prot || level != st-&gt;level ||</div><div class='ctx'> 		   addr &gt;= st-&gt;marker[1].start_address) {</div><div class='ctx'> 		const char *unit = units;</div><div class='ctx'> 		unsigned long delta;</div><div class='ctx'> </div><div class='ctx'> 		if (st-&gt;current_prot) {</div><div class='del'>-			seq_printf(st-&gt;seq, "0x%016lx-0x%016lx   ",</div><div class='add'>+			note_prot_uxn(st, addr);</div><div class='add'>+			note_prot_wx(st, addr);</div><div class='add'>+			pt_dump_seq_printf(st-&gt;seq, "0x%016lx-0x%016lx   ",</div><div class='ctx'> 				   st-&gt;start_address, addr);</div><div class='ctx'> </div><div class='ctx'> 			delta = (addr - st-&gt;start_address) &gt;&gt; 10;</div><div class='hunk'>@@ -215,17 +261,17 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level,</div><div class='ctx'> 				delta &gt;&gt;= 10;</div><div class='ctx'> 				unit++;</div><div class='ctx'> 			}</div><div class='del'>-			seq_printf(st-&gt;seq, "%9lu%c %s", delta, *unit,</div><div class='add'>+			pt_dump_seq_printf(st-&gt;seq, "%9lu%c %s", delta, *unit,</div><div class='ctx'> 				   pg_level[st-&gt;level].name);</div><div class='ctx'> 			if (pg_level[st-&gt;level].bits)</div><div class='ctx'> 				dump_prot(st, pg_level[st-&gt;level].bits,</div><div class='ctx'> 					  pg_level[st-&gt;level].num);</div><div class='del'>-			seq_puts(st-&gt;seq, "\n");</div><div class='add'>+			pt_dump_seq_puts(st-&gt;seq, "\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (addr &gt;= st-&gt;marker[1].start_address) {</div><div class='ctx'> 			st-&gt;marker++;</div><div class='del'>-			seq_printf(st-&gt;seq, "---[ %s ]---\n", st-&gt;marker-&gt;name);</div><div class='add'>+			pt_dump_seq_printf(st-&gt;seq, "---[ %s ]---\n", st-&gt;marker-&gt;name);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		st-&gt;start_address = addr;</div><div class='hunk'>@@ -235,7 +281,7 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level,</div><div class='ctx'> </div><div class='ctx'> 	if (addr &gt;= st-&gt;marker[1].start_address) {</div><div class='ctx'> 		st-&gt;marker++;</div><div class='del'>-		seq_printf(st-&gt;seq, "---[ %s ]---\n", st-&gt;marker-&gt;name);</div><div class='add'>+		pt_dump_seq_printf(st-&gt;seq, "---[ %s ]---\n", st-&gt;marker-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -304,9 +350,8 @@ static void walk_pgd(struct pg_state *st, struct mm_struct *mm,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ptdump_show(struct seq_file *m, void *v)</div><div class='add'>+void ptdump_walk_pgd(struct seq_file *m, struct ptdump_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct ptdump_info *info = m-&gt;private;</div><div class='ctx'> 	struct pg_state st = {</div><div class='ctx'> 		.seq = m,</div><div class='ctx'> 		.marker = info-&gt;markers,</div><div class='hunk'>@@ -315,33 +360,16 @@ static int ptdump_show(struct seq_file *m, void *v)</div><div class='ctx'> 	walk_pgd(&amp;st, info-&gt;mm, info-&gt;base_addr);</div><div class='ctx'> </div><div class='ctx'> 	note_page(&amp;st, 0, 0, 0);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ptdump_open(struct inode *inode, struct file *file)</div><div class='add'>+static void ptdump_initialize(void)</div><div class='ctx'> {</div><div class='del'>-	return single_open(file, ptdump_show, inode-&gt;i_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations ptdump_fops = {</div><div class='del'>-	.open		= ptdump_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int ptdump_register(struct ptdump_info *info, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct dentry *pe;</div><div class='ctx'> 	unsigned i, j;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(pg_level); i++)</div><div class='ctx'> 		if (pg_level[i].bits)</div><div class='ctx'> 			for (j = 0; j &lt; pg_level[i].num; j++)</div><div class='ctx'> 				pg_level[i].mask |= pg_level[i].bits[j].mask;</div><div class='del'>-</div><div class='del'>-	pe = debugfs_create_file(name, 0400, NULL, info, &amp;ptdump_fops);</div><div class='del'>-	return pe ? 0 : -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ptdump_info kernel_ptdump_info = {</div><div class='hunk'>@@ -350,8 +378,30 @@ static struct ptdump_info kernel_ptdump_info = {</div><div class='ctx'> 	.base_addr	= VA_START,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void ptdump_check_wx(void)</div><div class='add'>+{</div><div class='add'>+	struct pg_state st = {</div><div class='add'>+		.seq = NULL,</div><div class='add'>+		.marker = (struct addr_marker[]) {</div><div class='add'>+			{ 0, NULL},</div><div class='add'>+			{ -1, NULL},</div><div class='add'>+		},</div><div class='add'>+		.check_wx = true,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	walk_pgd(&amp;st, &amp;init_mm, 0);</div><div class='add'>+	note_page(&amp;st, 0, 0, 0);</div><div class='add'>+	if (st.wx_pages || st.uxn_pages)</div><div class='add'>+		pr_warn("Checked W+X mappings: FAILED, %lu W+X pages found, %lu non-UXN pages found\n",</div><div class='add'>+			st.wx_pages, st.uxn_pages);</div><div class='add'>+	else</div><div class='add'>+		pr_info("Checked W+X mappings: passed, no W+X pages found\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ptdump_init(void)</div><div class='ctx'> {</div><div class='del'>-	return ptdump_register(&amp;kernel_ptdump_info, "kernel_page_tables");</div><div class='add'>+	ptdump_initialize();</div><div class='add'>+	return ptdump_debugfs_register(&amp;kernel_ptdump_info,</div><div class='add'>+					"kernel_page_tables");</div><div class='ctx'> }</div><div class='ctx'> device_initcall(ptdump_init);</div><div class='head'>diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c<br/>index 0f8788374815..4bf899fb451b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/fault.c</a></div><div class='hunk'>@@ -26,7 +26,8 @@</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/page-flags.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='hunk'>@@ -88,21 +89,21 @@ void show_pte(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		pud = pud_offset(pgd, addr);</div><div class='del'>-		printk(", *pud=%016llx", pud_val(*pud));</div><div class='add'>+		pr_cont(", *pud=%016llx", pud_val(*pud));</div><div class='ctx'> 		if (pud_none(*pud) || pud_bad(*pud))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		pmd = pmd_offset(pud, addr);</div><div class='del'>-		printk(", *pmd=%016llx", pmd_val(*pmd));</div><div class='add'>+		pr_cont(", *pmd=%016llx", pmd_val(*pmd));</div><div class='ctx'> 		if (pmd_none(*pmd) || pmd_bad(*pmd))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		pte = pte_offset_map(pmd, addr);</div><div class='del'>-		printk(", *pte=%016llx", pte_val(*pte));</div><div class='add'>+		pr_cont(", *pte=%016llx", pte_val(*pte));</div><div class='ctx'> 		pte_unmap(pte);</div><div class='ctx'> 	} while(0);</div><div class='ctx'> </div><div class='del'>-	printk("\n");</div><div class='add'>+	pr_cont("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARM64_HW_AFDBM</div><div class='hunk'>@@ -269,13 +270,19 @@ out:</div><div class='ctx'> 	return fault;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_permission_fault(unsigned int esr)</div><div class='add'>+static inline bool is_permission_fault(unsigned int esr, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ec       = ESR_ELx_EC(esr);</div><div class='ctx'> 	unsigned int fsc_type = esr &amp; ESR_ELx_FSC_TYPE;</div><div class='ctx'> </div><div class='del'>-	return (ec == ESR_ELx_EC_DABT_CUR &amp;&amp; fsc_type == ESR_ELx_FSC_PERM) ||</div><div class='del'>-	       (ec == ESR_ELx_EC_IABT_CUR &amp;&amp; fsc_type == ESR_ELx_FSC_PERM);</div><div class='add'>+	if (ec != ESR_ELx_EC_DABT_CUR &amp;&amp; ec != ESR_ELx_EC_IABT_CUR)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (system_uses_ttbr0_pan())</div><div class='add'>+		return fsc_type == ESR_ELx_FSC_FAULT &amp;&amp;</div><div class='add'>+			(regs-&gt;pstate &amp; PSR_PAN_BIT);</div><div class='add'>+	else</div><div class='add'>+		return fsc_type == ESR_ELx_FSC_PERM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool is_el0_instruction_abort(unsigned int esr)</div><div class='hunk'>@@ -315,7 +322,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,</div><div class='ctx'> 		mm_flags |= FAULT_FLAG_WRITE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_permission_fault(esr) &amp;&amp; (addr &lt; USER_DS)) {</div><div class='add'>+	if (addr &lt; USER_DS &amp;&amp; is_permission_fault(esr, regs)) {</div><div class='ctx'> 		/* regs-&gt;orig_addr_limit may be 0 if we entered from EL0 */</div><div class='ctx'> 		if (regs-&gt;orig_addr_limit == KERNEL_DS)</div><div class='ctx'> 			die("Accessing user space memory with fs=KERNEL_DS", regs, esr);</div><div class='hunk'>@@ -507,10 +514,10 @@ static const struct fault_info {</div><div class='ctx'> 	{ do_bad,		SIGBUS,  0,		"unknown 17"			},</div><div class='ctx'> 	{ do_bad,		SIGBUS,  0,		"unknown 18"			},</div><div class='ctx'> 	{ do_bad,		SIGBUS,  0,		"unknown 19"			},</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous external abort (translation table walk)" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous external abort (translation table walk)" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous external abort (translation table walk)" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous external abort (translation table walk)" },</div><div class='ctx'> 	{ do_bad,		SIGBUS,  0,		"synchronous parity error"	},</div><div class='ctx'> 	{ do_bad,		SIGBUS,  0,		"unknown 25"			},</div><div class='ctx'> 	{ do_bad,		SIGBUS,  0,		"unknown 26"			},</div><div class='hunk'>@@ -685,17 +692,3 @@ int cpu_enable_pan(void *__unused)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_ARM64_PAN */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARM64_UAO</div><div class='del'>-/*</div><div class='del'>- * Kernel threads have fs=KERNEL_DS by default, and don't need to call</div><div class='del'>- * set_fs(), devtmpfs in particular relies on this behaviour.</div><div class='del'>- * We need to enable the feature at runtime (instead of adding it to</div><div class='del'>- * PSR_MODE_EL1h) as the feature may not be implemented by the cpu.</div><div class='del'>- */</div><div class='del'>-int cpu_enable_uao(void *__unused)</div><div class='del'>-{</div><div class='del'>-	asm(SET_PSTATE_UAO(1));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_ARM64_UAO */</div><div class='head'>diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c<br/>index 8377329d8c97..554a2558c12e 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/flush.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/flush.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/flush.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/flush.c</a></div><div class='hunk'>@@ -25,14 +25,7 @@</div><div class='ctx'> #include &lt;asm/cachetype.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='del'>-void flush_cache_range(struct vm_area_struct *vma, unsigned long start,</div><div class='del'>-		       unsigned long end)</div><div class='del'>-{</div><div class='del'>-	if (vma-&gt;vm_flags &amp; VM_EXEC)</div><div class='del'>-		__flush_icache_all();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sync_icache_aliases(void *kaddr, unsigned long len)</div><div class='add'>+void sync_icache_aliases(void *kaddr, unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr = (unsigned long)kaddr;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c<br/>index 2e49bd252fe7..e25584d72396 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/hugetlbpage.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/hugetlbpage.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -51,20 +51,8 @@ static int find_num_contig(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 	*pgsize = PAGE_SIZE;</div><div class='ctx'> 	if (!pte_cont(pte))</div><div class='ctx'> 		return 1;</div><div class='del'>-	if (!pgd_present(*pgd)) {</div><div class='del'>-		VM_BUG_ON(!pgd_present(*pgd));</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='ctx'> 	pud = pud_offset(pgd, addr);</div><div class='del'>-	if (!pud_present(*pud)) {</div><div class='del'>-		VM_BUG_ON(!pud_present(*pud));</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='ctx'> 	pmd = pmd_offset(pud, addr);</div><div class='del'>-	if (!pmd_present(*pmd)) {</div><div class='del'>-		VM_BUG_ON(!pmd_present(*pmd));</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='ctx'> 	if ((pte_t *)pmd == ptep) {</div><div class='ctx'> 		*pgsize = PMD_SIZE;</div><div class='ctx'> 		return CONT_PMDS;</div><div class='hunk'>@@ -212,7 +200,7 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm,</div><div class='ctx'> 		ncontig = find_num_contig(mm, addr, cpte, *cpte, &amp;pgsize);</div><div class='ctx'> 		/* save the 1st pte to return */</div><div class='ctx'> 		pte = ptep_get_and_clear(mm, addr, cpte);</div><div class='del'>-		for (i = 1; i &lt; ncontig; ++i) {</div><div class='add'>+		for (i = 1, addr += pgsize; i &lt; ncontig; ++i, addr += pgsize) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If HW_AFDBM is enabled, then the HW could</div><div class='ctx'> 			 * turn on the dirty bit for any of the page</div><div class='hunk'>@@ -250,8 +238,8 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma,</div><div class='ctx'> 		pfn = pte_pfn(*cpte);</div><div class='ctx'> 		ncontig = find_num_contig(vma-&gt;vm_mm, addr, cpte,</div><div class='ctx'> 					  *cpte, &amp;pgsize);</div><div class='del'>-		for (i = 0; i &lt; ncontig; ++i, ++cpte) {</div><div class='del'>-			changed = ptep_set_access_flags(vma, addr, cpte,</div><div class='add'>+		for (i = 0; i &lt; ncontig; ++i, ++cpte, addr += pgsize) {</div><div class='add'>+			changed |= ptep_set_access_flags(vma, addr, cpte,</div><div class='ctx'> 							pfn_pte(pfn,</div><div class='ctx'> 								hugeprot),</div><div class='ctx'> 							dirty);</div><div class='hunk'>@@ -273,7 +261,7 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm,</div><div class='ctx'> </div><div class='ctx'> 		cpte = huge_pte_offset(mm, addr);</div><div class='ctx'> 		ncontig = find_num_contig(mm, addr, cpte, *cpte, &amp;pgsize);</div><div class='del'>-		for (i = 0; i &lt; ncontig; ++i, ++cpte)</div><div class='add'>+		for (i = 0; i &lt; ncontig; ++i, ++cpte, addr += pgsize)</div><div class='ctx'> 			ptep_set_wrprotect(mm, addr, cpte);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ptep_set_wrprotect(mm, addr, ptep);</div><div class='hunk'>@@ -291,7 +279,7 @@ void huge_ptep_clear_flush(struct vm_area_struct *vma,</div><div class='ctx'> 		cpte = huge_pte_offset(vma-&gt;vm_mm, addr);</div><div class='ctx'> 		ncontig = find_num_contig(vma-&gt;vm_mm, addr, cpte,</div><div class='ctx'> 					  *cpte, &amp;pgsize);</div><div class='del'>-		for (i = 0; i &lt; ncontig; ++i, ++cpte)</div><div class='add'>+		for (i = 0; i &lt; ncontig; ++i, ++cpte, addr += pgsize)</div><div class='ctx'> 			ptep_clear_flush(vma, addr, cpte);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ptep_clear_flush(vma, addr, ptep);</div><div class='hunk'>@@ -323,7 +311,7 @@ __setup("hugepagesz=", setup_hugepagesz);</div><div class='ctx'> static __init int add_default_hugepagesz(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (size_to_hstate(CONT_PTES * PAGE_SIZE) == NULL)</div><div class='del'>-		hugetlb_add_hstate(CONT_PMD_SHIFT);</div><div class='add'>+		hugetlb_add_hstate(CONT_PTE_SHIFT);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> arch_initcall(add_default_hugepagesz);</div><div class='head'>diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c<br/>index 212c4d1e2f26..e19e06593e37 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/init.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> #include &lt;linux/swiotlb.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/boot.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='hunk'>@@ -209,8 +210,8 @@ void __init arm64_memblock_init(void)</div><div class='ctx'> 	 * linear mapping. Take care not to clip the kernel which may be</div><div class='ctx'> 	 * high in memory.</div><div class='ctx'> 	 */</div><div class='del'>-	memblock_remove(max_t(u64, memstart_addr + linear_region_size, __pa(_end)),</div><div class='del'>-			ULLONG_MAX);</div><div class='add'>+	memblock_remove(max_t(u64, memstart_addr + linear_region_size,</div><div class='add'>+			__pa_symbol(_end)), ULLONG_MAX);</div><div class='ctx'> 	if (memstart_addr + linear_region_size &lt; memblock_end_of_DRAM()) {</div><div class='ctx'> 		/* ensure that memstart_addr remains sufficiently aligned */</div><div class='ctx'> 		memstart_addr = round_up(memblock_end_of_DRAM() - linear_region_size,</div><div class='hunk'>@@ -225,7 +226,7 @@ void __init arm64_memblock_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (memory_limit != (phys_addr_t)ULLONG_MAX) {</div><div class='ctx'> 		memblock_mem_limit_remove_map(memory_limit);</div><div class='del'>-		memblock_add(__pa(_text), (u64)(_end - _text));</div><div class='add'>+		memblock_add(__pa_symbol(_text), (u64)(_end - _text));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) &amp;&amp; initrd_start) {</div><div class='hunk'>@@ -278,7 +279,7 @@ void __init arm64_memblock_init(void)</div><div class='ctx'> 	 * Register the kernel text, kernel data, initrd, and initial</div><div class='ctx'> 	 * pagetables with memblock.</div><div class='ctx'> 	 */</div><div class='del'>-	memblock_reserve(__pa(_text), _end - _text);</div><div class='add'>+	memblock_reserve(__pa_symbol(_text), _end - _text);</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='ctx'> 	if (initrd_start) {</div><div class='ctx'> 		memblock_reserve(initrd_start, initrd_end - initrd_start);</div><div class='hunk'>@@ -401,8 +402,11 @@ static void __init free_unused_memmap(void)</div><div class='ctx'>  */</div><div class='ctx'> void __init mem_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (swiotlb_force || max_pfn &gt; (arm64_dma_phys_limit &gt;&gt; PAGE_SHIFT))</div><div class='add'>+	if (swiotlb_force == SWIOTLB_FORCE ||</div><div class='add'>+	    max_pfn &gt; (arm64_dma_phys_limit &gt;&gt; PAGE_SHIFT))</div><div class='ctx'> 		swiotlb_init(1);</div><div class='add'>+	else</div><div class='add'>+		swiotlb_force = SWIOTLB_NO_FORCE;</div><div class='ctx'> </div><div class='ctx'> 	set_max_mapnr(pfn_to_page(max_pfn) - mem_map);</div><div class='ctx'> </div><div class='hunk'>@@ -483,7 +487,8 @@ void __init mem_init(void)</div><div class='ctx'> </div><div class='ctx'> void free_initmem(void)</div><div class='ctx'> {</div><div class='del'>-	free_reserved_area(__va(__pa(__init_begin)), __va(__pa(__init_end)),</div><div class='add'>+	free_reserved_area(lm_alias(__init_begin),</div><div class='add'>+			   lm_alias(__init_end),</div><div class='ctx'> 			   0, "unused kernel");</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Unmap the __init region but leave the VM area in place. This</div><div class='head'>diff --git a/arch/arm64/mm/ioremap.c b/arch/arm64/mm/ioremap.c<br/>index 01e88c8bcab0..c4c8cd4c31d4 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/ioremap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/ioremap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/ioremap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/ioremap.c</a></div><div class='hunk'>@@ -88,7 +88,7 @@ void __iounmap(volatile void __iomem *io_addr)</div><div class='ctx'> 	 * We could get an address outside vmalloc range in case</div><div class='ctx'> 	 * of ioremap_cache() reusing a RAM mapping.</div><div class='ctx'> 	 */</div><div class='del'>-	if (VMALLOC_START &lt;= addr &amp;&amp; addr &lt; VMALLOC_END)</div><div class='add'>+	if (is_vmalloc_addr((void *)addr))</div><div class='ctx'> 		vunmap((void *)addr);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__iounmap);</div><div class='head'>diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c<br/>index 757009daa9ed..55d1e9205543 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/kasan_init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/kasan_init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/kasan_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/kasan_init.c</a></div><div class='hunk'>@@ -13,8 +13,10 @@</div><div class='ctx'> #define pr_fmt(fmt) "kasan: " fmt</div><div class='ctx'> #include &lt;linux/kasan.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/start_kernel.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/kernel-pgtable.h&gt;</div><div class='hunk'>@@ -26,6 +28,13 @@</div><div class='ctx'> </div><div class='ctx'> static pgd_t tmp_pg_dir[PTRS_PER_PGD] __initdata __aligned(PGD_SIZE);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The p*d_populate functions call virt_to_phys implicitly so they can't be used</div><div class='add'>+ * directly on kernel symbols (bm_p*d). All the early functions are called too</div><div class='add'>+ * early to use lm_alias so __p*d_populate functions must be used to populate</div><div class='add'>+ * with the physical address from __pa_symbol.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> static void __init kasan_early_pte_populate(pmd_t *pmd, unsigned long addr,</div><div class='ctx'> 					unsigned long end)</div><div class='ctx'> {</div><div class='hunk'>@@ -33,12 +42,12 @@ static void __init kasan_early_pte_populate(pmd_t *pmd, unsigned long addr,</div><div class='ctx'> 	unsigned long next;</div><div class='ctx'> </div><div class='ctx'> 	if (pmd_none(*pmd))</div><div class='del'>-		pmd_populate_kernel(&amp;init_mm, pmd, kasan_zero_pte);</div><div class='add'>+		__pmd_populate(pmd, __pa_symbol(kasan_zero_pte), PMD_TYPE_TABLE);</div><div class='ctx'> </div><div class='ctx'> 	pte = pte_offset_kimg(pmd, addr);</div><div class='ctx'> 	do {</div><div class='ctx'> 		next = addr + PAGE_SIZE;</div><div class='del'>-		set_pte(pte, pfn_pte(virt_to_pfn(kasan_zero_page),</div><div class='add'>+		set_pte(pte, pfn_pte(sym_to_pfn(kasan_zero_page),</div><div class='ctx'> 					PAGE_KERNEL));</div><div class='ctx'> 	} while (pte++, addr = next, addr != end &amp;&amp; pte_none(*pte));</div><div class='ctx'> }</div><div class='hunk'>@@ -51,7 +60,7 @@ static void __init kasan_early_pmd_populate(pud_t *pud,</div><div class='ctx'> 	unsigned long next;</div><div class='ctx'> </div><div class='ctx'> 	if (pud_none(*pud))</div><div class='del'>-		pud_populate(&amp;init_mm, pud, kasan_zero_pmd);</div><div class='add'>+		__pud_populate(pud, __pa_symbol(kasan_zero_pmd), PMD_TYPE_TABLE);</div><div class='ctx'> </div><div class='ctx'> 	pmd = pmd_offset_kimg(pud, addr);</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -68,7 +77,7 @@ static void __init kasan_early_pud_populate(pgd_t *pgd,</div><div class='ctx'> 	unsigned long next;</div><div class='ctx'> </div><div class='ctx'> 	if (pgd_none(*pgd))</div><div class='del'>-		pgd_populate(&amp;init_mm, pgd, kasan_zero_pud);</div><div class='add'>+		__pgd_populate(pgd, __pa_symbol(kasan_zero_pud), PUD_TYPE_TABLE);</div><div class='ctx'> </div><div class='ctx'> 	pud = pud_offset_kimg(pgd, addr);</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -148,7 +157,7 @@ void __init kasan_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	memcpy(tmp_pg_dir, swapper_pg_dir, sizeof(tmp_pg_dir));</div><div class='ctx'> 	dsb(ishst);</div><div class='del'>-	cpu_replace_ttbr1(tmp_pg_dir);</div><div class='add'>+	cpu_replace_ttbr1(lm_alias(tmp_pg_dir));</div><div class='ctx'> </div><div class='ctx'> 	clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END);</div><div class='ctx'> </div><div class='hunk'>@@ -199,10 +208,10 @@ void __init kasan_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; PTRS_PER_PTE; i++)</div><div class='ctx'> 		set_pte(&amp;kasan_zero_pte[i],</div><div class='del'>-			pfn_pte(virt_to_pfn(kasan_zero_page), PAGE_KERNEL_RO));</div><div class='add'>+			pfn_pte(sym_to_pfn(kasan_zero_page), PAGE_KERNEL_RO));</div><div class='ctx'> </div><div class='ctx'> 	memset(kasan_zero_page, 0, PAGE_SIZE);</div><div class='del'>-	cpu_replace_ttbr1(swapper_pg_dir);</div><div class='add'>+	cpu_replace_ttbr1(lm_alias(swapper_pg_dir));</div><div class='ctx'> </div><div class='ctx'> 	/* At this point kasan is fully initialized. Enable error messages */</div><div class='ctx'> 	init_task.kasan_depth = 0;</div><div class='head'>diff --git a/arch/arm64/mm/mmap.c b/arch/arm64/mm/mmap.c<br/>index 01c171723bb3..7b0d55756eb1 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/mmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/mmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/mmap.c</a></div><div class='hunk'>@@ -22,7 +22,8 @@</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/shm.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='head'>diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c<br/>index 05615a3fdc6f..d28dbcf596b6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/mmu.c</a></div><div class='hunk'>@@ -28,8 +28,7 @@</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/stop_machine.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/barrier.h&gt;</div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='hunk'>@@ -42,6 +41,7 @@</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/memblock.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='add'>+#include &lt;asm/ptdump.h&gt;</div><div class='ctx'> </div><div class='ctx'> u64 idmap_t0sz = TCR_T0SZ(VA_BITS);</div><div class='ctx'> </div><div class='hunk'>@@ -95,6 +95,17 @@ static phys_addr_t __init early_pgtable_alloc(void)</div><div class='ctx'> 	return phys;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool pgattr_change_is_safe(u64 old, u64 new)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The following mapping attributes may be updated in live</div><div class='add'>+	 * kernel mappings without the need for break-before-make.</div><div class='add'>+	 */</div><div class='add'>+	static const pteval_t mask = PTE_PXN | PTE_RDONLY | PTE_WRITE;</div><div class='add'>+</div><div class='add'>+	return old  == 0 || new  == 0 || ((old ^ new) &amp; ~mask) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void alloc_init_pte(pmd_t *pmd, unsigned long addr,</div><div class='ctx'> 				  unsigned long end, unsigned long pfn,</div><div class='ctx'> 				  pgprot_t prot,</div><div class='hunk'>@@ -115,8 +126,17 @@ static void alloc_init_pte(pmd_t *pmd, unsigned long addr,</div><div class='ctx'> </div><div class='ctx'> 	pte = pte_set_fixmap_offset(pmd, addr);</div><div class='ctx'> 	do {</div><div class='add'>+		pte_t old_pte = *pte;</div><div class='add'>+</div><div class='ctx'> 		set_pte(pte, pfn_pte(pfn, prot));</div><div class='ctx'> 		pfn++;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * After the PTE entry has been populated once, we</div><div class='add'>+		 * only allow updates to the permission attributes.</div><div class='add'>+		 */</div><div class='add'>+		BUG_ON(!pgattr_change_is_safe(pte_val(old_pte), pte_val(*pte)));</div><div class='add'>+</div><div class='ctx'> 	} while (pte++, addr += PAGE_SIZE, addr != end);</div><div class='ctx'> </div><div class='ctx'> 	pte_clear_fixmap();</div><div class='hunk'>@@ -125,7 +145,7 @@ static void alloc_init_pte(pmd_t *pmd, unsigned long addr,</div><div class='ctx'> static void alloc_init_pmd(pud_t *pud, unsigned long addr, unsigned long end,</div><div class='ctx'> 				  phys_addr_t phys, pgprot_t prot,</div><div class='ctx'> 				  phys_addr_t (*pgtable_alloc)(void),</div><div class='del'>-				  bool allow_block_mappings)</div><div class='add'>+				  bool page_mappings_only)</div><div class='ctx'> {</div><div class='ctx'> 	pmd_t *pmd;</div><div class='ctx'> 	unsigned long next;</div><div class='hunk'>@@ -146,27 +166,27 @@ static void alloc_init_pmd(pud_t *pud, unsigned long addr, unsigned long end,</div><div class='ctx'> </div><div class='ctx'> 	pmd = pmd_set_fixmap_offset(pud, addr);</div><div class='ctx'> 	do {</div><div class='add'>+		pmd_t old_pmd = *pmd;</div><div class='add'>+</div><div class='ctx'> 		next = pmd_addr_end(addr, end);</div><div class='add'>+</div><div class='ctx'> 		/* try section mapping first */</div><div class='ctx'> 		if (((addr | next | phys) &amp; ~SECTION_MASK) == 0 &amp;&amp;</div><div class='del'>-		      allow_block_mappings) {</div><div class='del'>-			pmd_t old_pmd =*pmd;</div><div class='add'>+		      !page_mappings_only) {</div><div class='ctx'> 			pmd_set_huge(pmd, phys, prot);</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='del'>-			 * Check for previous table entries created during</div><div class='del'>-			 * boot (__create_page_tables) and flush them.</div><div class='add'>+			 * After the PMD entry has been populated once, we</div><div class='add'>+			 * only allow updates to the permission attributes.</div><div class='ctx'> 			 */</div><div class='del'>-			if (!pmd_none(old_pmd)) {</div><div class='del'>-				flush_tlb_all();</div><div class='del'>-				if (pmd_table(old_pmd)) {</div><div class='del'>-					phys_addr_t table = pmd_page_paddr(old_pmd);</div><div class='del'>-					if (!WARN_ON_ONCE(slab_is_available()))</div><div class='del'>-						memblock_free(table, PAGE_SIZE);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+			BUG_ON(!pgattr_change_is_safe(pmd_val(old_pmd),</div><div class='add'>+						      pmd_val(*pmd)));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			alloc_init_pte(pmd, addr, next, __phys_to_pfn(phys),</div><div class='ctx'> 				       prot, pgtable_alloc);</div><div class='add'>+</div><div class='add'>+			BUG_ON(pmd_val(old_pmd) != 0 &amp;&amp;</div><div class='add'>+			       pmd_val(old_pmd) != pmd_val(*pmd));</div><div class='ctx'> 		}</div><div class='ctx'> 		phys += next - addr;</div><div class='ctx'> 	} while (pmd++, addr = next, addr != end);</div><div class='hunk'>@@ -189,7 +209,7 @@ static inline bool use_1G_block(unsigned long addr, unsigned long next,</div><div class='ctx'> static void alloc_init_pud(pgd_t *pgd, unsigned long addr, unsigned long end,</div><div class='ctx'> 				  phys_addr_t phys, pgprot_t prot,</div><div class='ctx'> 				  phys_addr_t (*pgtable_alloc)(void),</div><div class='del'>-				  bool allow_block_mappings)</div><div class='add'>+				  bool page_mappings_only)</div><div class='ctx'> {</div><div class='ctx'> 	pud_t *pud;</div><div class='ctx'> 	unsigned long next;</div><div class='hunk'>@@ -204,33 +224,28 @@ static void alloc_init_pud(pgd_t *pgd, unsigned long addr, unsigned long end,</div><div class='ctx'> </div><div class='ctx'> 	pud = pud_set_fixmap_offset(pgd, addr);</div><div class='ctx'> 	do {</div><div class='add'>+		pud_t old_pud = *pud;</div><div class='add'>+</div><div class='ctx'> 		next = pud_addr_end(addr, end);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For 4K granule only, attempt to put down a 1GB block</div><div class='ctx'> 		 */</div><div class='del'>-		if (use_1G_block(addr, next, phys) &amp;&amp; allow_block_mappings) {</div><div class='del'>-			pud_t old_pud = *pud;</div><div class='add'>+		if (use_1G_block(addr, next, phys) &amp;&amp; !page_mappings_only) {</div><div class='ctx'> 			pud_set_huge(pud, phys, prot);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			 * If we have an old value for a pud, it will</div><div class='del'>-			 * be pointing to a pmd table that we no longer</div><div class='del'>-			 * need (from swapper_pg_dir).</div><div class='del'>-			 *</div><div class='del'>-			 * Look up the old pmd table and free it.</div><div class='add'>+			 * After the PUD entry has been populated once, we</div><div class='add'>+			 * only allow updates to the permission attributes.</div><div class='ctx'> 			 */</div><div class='del'>-			if (!pud_none(old_pud)) {</div><div class='del'>-				flush_tlb_all();</div><div class='del'>-				if (pud_table(old_pud)) {</div><div class='del'>-					phys_addr_t table = pud_page_paddr(old_pud);</div><div class='del'>-					if (!WARN_ON_ONCE(slab_is_available()))</div><div class='del'>-						memblock_free(table, PAGE_SIZE);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+			BUG_ON(!pgattr_change_is_safe(pud_val(old_pud),</div><div class='add'>+						      pud_val(*pud)));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			alloc_init_pmd(pud, addr, next, phys, prot,</div><div class='del'>-				       pgtable_alloc, allow_block_mappings);</div><div class='add'>+				       pgtable_alloc, page_mappings_only);</div><div class='add'>+</div><div class='add'>+			BUG_ON(pud_val(old_pud) != 0 &amp;&amp;</div><div class='add'>+			       pud_val(old_pud) != pud_val(*pud));</div><div class='ctx'> 		}</div><div class='ctx'> 		phys += next - addr;</div><div class='ctx'> 	} while (pud++, addr = next, addr != end);</div><div class='hunk'>@@ -242,7 +257,7 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys,</div><div class='ctx'> 				 unsigned long virt, phys_addr_t size,</div><div class='ctx'> 				 pgprot_t prot,</div><div class='ctx'> 				 phys_addr_t (*pgtable_alloc)(void),</div><div class='del'>-				 bool allow_block_mappings)</div><div class='add'>+				 bool page_mappings_only)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr, length, end, next;</div><div class='ctx'> 	pgd_t *pgd = pgd_offset_raw(pgdir, virt);</div><div class='hunk'>@@ -262,7 +277,7 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys,</div><div class='ctx'> 	do {</div><div class='ctx'> 		next = pgd_addr_end(addr, end);</div><div class='ctx'> 		alloc_init_pud(pgd, addr, next, phys, prot, pgtable_alloc,</div><div class='del'>-			       allow_block_mappings);</div><div class='add'>+			       page_mappings_only);</div><div class='ctx'> 		phys += next - addr;</div><div class='ctx'> 	} while (pgd++, addr = next, addr != end);</div><div class='ctx'> }</div><div class='hunk'>@@ -291,17 +306,17 @@ static void __init create_mapping_noalloc(phys_addr_t phys, unsigned long virt,</div><div class='ctx'> 			&amp;phys, virt);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	__create_pgd_mapping(init_mm.pgd, phys, virt, size, prot, NULL, true);</div><div class='add'>+	__create_pgd_mapping(init_mm.pgd, phys, virt, size, prot, NULL, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init create_pgd_mapping(struct mm_struct *mm, phys_addr_t phys,</div><div class='ctx'> 			       unsigned long virt, phys_addr_t size,</div><div class='del'>-			       pgprot_t prot, bool allow_block_mappings)</div><div class='add'>+			       pgprot_t prot, bool page_mappings_only)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(mm == &amp;init_mm);</div><div class='ctx'> </div><div class='ctx'> 	__create_pgd_mapping(mm-&gt;pgd, phys, virt, size, prot,</div><div class='del'>-			     pgd_pgtable_alloc, allow_block_mappings);</div><div class='add'>+			     pgd_pgtable_alloc, page_mappings_only);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void create_mapping_late(phys_addr_t phys, unsigned long virt,</div><div class='hunk'>@@ -314,13 +329,13 @@ static void create_mapping_late(phys_addr_t phys, unsigned long virt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	__create_pgd_mapping(init_mm.pgd, phys, virt, size, prot,</div><div class='del'>-			     NULL, !debug_pagealloc_enabled());</div><div class='add'>+			     NULL, debug_pagealloc_enabled());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init __map_memblock(pgd_t *pgd, phys_addr_t start, phys_addr_t end)</div><div class='ctx'> {</div><div class='del'>-	unsigned long kernel_start = __pa(_text);</div><div class='del'>-	unsigned long kernel_end = __pa(__init_begin);</div><div class='add'>+	phys_addr_t kernel_start = __pa_symbol(_text);</div><div class='add'>+	phys_addr_t kernel_end = __pa_symbol(__init_begin);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Take care not to create a writable alias for the</div><div class='hunk'>@@ -332,7 +347,7 @@ static void __init __map_memblock(pgd_t *pgd, phys_addr_t start, phys_addr_t end</div><div class='ctx'> 		__create_pgd_mapping(pgd, start, __phys_to_virt(start),</div><div class='ctx'> 				     end - start, PAGE_KERNEL,</div><div class='ctx'> 				     early_pgtable_alloc,</div><div class='del'>-				     !debug_pagealloc_enabled());</div><div class='add'>+				     debug_pagealloc_enabled());</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -345,13 +360,13 @@ static void __init __map_memblock(pgd_t *pgd, phys_addr_t start, phys_addr_t end</div><div class='ctx'> 				     __phys_to_virt(start),</div><div class='ctx'> 				     kernel_start - start, PAGE_KERNEL,</div><div class='ctx'> 				     early_pgtable_alloc,</div><div class='del'>-				     !debug_pagealloc_enabled());</div><div class='add'>+				     debug_pagealloc_enabled());</div><div class='ctx'> 	if (kernel_end &lt; end)</div><div class='ctx'> 		__create_pgd_mapping(pgd, kernel_end,</div><div class='ctx'> 				     __phys_to_virt(kernel_end),</div><div class='ctx'> 				     end - kernel_end, PAGE_KERNEL,</div><div class='ctx'> 				     early_pgtable_alloc,</div><div class='del'>-				     !debug_pagealloc_enabled());</div><div class='add'>+				     debug_pagealloc_enabled());</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Map the linear alias of the [_text, __init_begin) interval as</div><div class='hunk'>@@ -361,7 +376,7 @@ static void __init __map_memblock(pgd_t *pgd, phys_addr_t start, phys_addr_t end</div><div class='ctx'> 	 */</div><div class='ctx'> 	__create_pgd_mapping(pgd, kernel_start, __phys_to_virt(kernel_start),</div><div class='ctx'> 			     kernel_end - kernel_start, PAGE_KERNEL_RO,</div><div class='del'>-			     early_pgtable_alloc, !debug_pagealloc_enabled());</div><div class='add'>+			     early_pgtable_alloc, debug_pagealloc_enabled());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init map_mem(pgd_t *pgd)</div><div class='hunk'>@@ -387,28 +402,33 @@ void mark_rodata_ro(void)</div><div class='ctx'> 	unsigned long section_size;</div><div class='ctx'> </div><div class='ctx'> 	section_size = (unsigned long)_etext - (unsigned long)_text;</div><div class='del'>-	create_mapping_late(__pa(_text), (unsigned long)_text,</div><div class='add'>+	create_mapping_late(__pa_symbol(_text), (unsigned long)_text,</div><div class='ctx'> 			    section_size, PAGE_KERNEL_ROX);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * mark .rodata as read only. Use __init_begin rather than __end_rodata</div><div class='ctx'> 	 * to cover NOTES and EXCEPTION_TABLE.</div><div class='ctx'> 	 */</div><div class='ctx'> 	section_size = (unsigned long)__init_begin - (unsigned long)__start_rodata;</div><div class='del'>-	create_mapping_late(__pa(__start_rodata), (unsigned long)__start_rodata,</div><div class='add'>+	create_mapping_late(__pa_symbol(__start_rodata), (unsigned long)__start_rodata,</div><div class='ctx'> 			    section_size, PAGE_KERNEL_RO);</div><div class='add'>+</div><div class='add'>+	/* flush the TLBs after updating live kernel mappings */</div><div class='add'>+	flush_tlb_all();</div><div class='add'>+</div><div class='add'>+	debug_checkwx();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init map_kernel_segment(pgd_t *pgd, void *va_start, void *va_end,</div><div class='ctx'> 				      pgprot_t prot, struct vm_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	phys_addr_t pa_start = __pa(va_start);</div><div class='add'>+	phys_addr_t pa_start = __pa_symbol(va_start);</div><div class='ctx'> 	unsigned long size = va_end - va_start;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!PAGE_ALIGNED(pa_start));</div><div class='ctx'> 	BUG_ON(!PAGE_ALIGNED(size));</div><div class='ctx'> </div><div class='ctx'> 	__create_pgd_mapping(pgd, pa_start, (unsigned long)va_start, size, prot,</div><div class='del'>-			     early_pgtable_alloc, !debug_pagealloc_enabled());</div><div class='add'>+			     early_pgtable_alloc, debug_pagealloc_enabled());</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;addr	= va_start;</div><div class='ctx'> 	vma-&gt;phys_addr	= pa_start;</div><div class='hunk'>@@ -449,7 +469,7 @@ static void __init map_kernel(pgd_t *pgd)</div><div class='ctx'> 		 */</div><div class='ctx'> 		BUG_ON(!IS_ENABLED(CONFIG_ARM64_16K_PAGES));</div><div class='ctx'> 		set_pud(pud_set_fixmap_offset(pgd, FIXADDR_START),</div><div class='del'>-			__pud(__pa(bm_pmd) | PUD_TYPE_TABLE));</div><div class='add'>+			__pud(__pa_symbol(bm_pmd) | PUD_TYPE_TABLE));</div><div class='ctx'> 		pud_clear_fixmap();</div><div class='ctx'> 	} else {</div><div class='ctx'> 		BUG();</div><div class='hunk'>@@ -479,8 +499,8 @@ void __init paging_init(void)</div><div class='ctx'> 	 * To do this we need to go via a temporary pgd.</div><div class='ctx'> 	 */</div><div class='ctx'> 	cpu_replace_ttbr1(__va(pgd_phys));</div><div class='del'>-	memcpy(swapper_pg_dir, pgd, PAGE_SIZE);</div><div class='del'>-	cpu_replace_ttbr1(swapper_pg_dir);</div><div class='add'>+	memcpy(swapper_pg_dir, pgd, PGD_SIZE);</div><div class='add'>+	cpu_replace_ttbr1(lm_alias(swapper_pg_dir));</div><div class='ctx'> </div><div class='ctx'> 	pgd_clear_fixmap();</div><div class='ctx'> 	memblock_free(pgd_phys, PAGE_SIZE);</div><div class='hunk'>@@ -489,7 +509,7 @@ void __init paging_init(void)</div><div class='ctx'> 	 * We only reuse the PGD from the swapper_pg_dir, not the pud + pmd</div><div class='ctx'> 	 * allocated with it.</div><div class='ctx'> 	 */</div><div class='del'>-	memblock_free(__pa(swapper_pg_dir) + PAGE_SIZE,</div><div class='add'>+	memblock_free(__pa_symbol(swapper_pg_dir) + PAGE_SIZE,</div><div class='ctx'> 		      SWAPPER_DIR_SIZE - PAGE_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -600,6 +620,12 @@ static inline pte_t * fixmap_pte(unsigned long addr)</div><div class='ctx'> 	return &amp;bm_pte[pte_index(addr)];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The p*d_populate functions call virt_to_phys implicitly so they can't be used</div><div class='add'>+ * directly on kernel symbols (bm_p*d). This function is called too early to use</div><div class='add'>+ * lm_alias so __p*d_populate functions must be used to populate with the</div><div class='add'>+ * physical address from __pa_symbol.</div><div class='add'>+ */</div><div class='ctx'> void __init early_fixmap_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	pgd_t *pgd;</div><div class='hunk'>@@ -609,7 +635,7 @@ void __init early_fixmap_init(void)</div><div class='ctx'> </div><div class='ctx'> 	pgd = pgd_offset_k(addr);</div><div class='ctx'> 	if (CONFIG_PGTABLE_LEVELS &gt; 3 &amp;&amp;</div><div class='del'>-	    !(pgd_none(*pgd) || pgd_page_paddr(*pgd) == __pa(bm_pud))) {</div><div class='add'>+	    !(pgd_none(*pgd) || pgd_page_paddr(*pgd) == __pa_symbol(bm_pud))) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We only end up here if the kernel mapping and the fixmap</div><div class='ctx'> 		 * share the top level pgd entry, which should only happen on</div><div class='hunk'>@@ -618,12 +644,14 @@ void __init early_fixmap_init(void)</div><div class='ctx'> 		BUG_ON(!IS_ENABLED(CONFIG_ARM64_16K_PAGES));</div><div class='ctx'> 		pud = pud_offset_kimg(pgd, addr);</div><div class='ctx'> 	} else {</div><div class='del'>-		pgd_populate(&amp;init_mm, pgd, bm_pud);</div><div class='add'>+		if (pgd_none(*pgd))</div><div class='add'>+			__pgd_populate(pgd, __pa_symbol(bm_pud), PUD_TYPE_TABLE);</div><div class='ctx'> 		pud = fixmap_pud(addr);</div><div class='ctx'> 	}</div><div class='del'>-	pud_populate(&amp;init_mm, pud, bm_pmd);</div><div class='add'>+	if (pud_none(*pud))</div><div class='add'>+		__pud_populate(pud, __pa_symbol(bm_pmd), PMD_TYPE_TABLE);</div><div class='ctx'> 	pmd = fixmap_pmd(addr);</div><div class='del'>-	pmd_populate_kernel(&amp;init_mm, pmd, bm_pte);</div><div class='add'>+	__pmd_populate(pmd, __pa_symbol(bm_pte), PMD_TYPE_TABLE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The boot-ioremap range spans multiple pmds, for which</div><div class='head'>diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c<br/>index 4b32168cf91a..b388a99fea7b 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/numa.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/numa.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/numa.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@ static int cpu_to_node_map[NR_CPUS] = { [0 ... NR_CPUS-1] = NUMA_NO_NODE };</div><div class='ctx'> </div><div class='ctx'> static int numa_distance_cnt;</div><div class='ctx'> static u8 *numa_distance;</div><div class='del'>-static bool numa_off;</div><div class='add'>+bool numa_off;</div><div class='ctx'> </div><div class='ctx'> static __init int numa_parse_early_param(char *opt)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm64/mm/physaddr.c b/arch/arm64/mm/physaddr.c<br/>new file mode 100644<br/>index 000000000000..91371daf397c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/physaddr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/physaddr.c</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mmdebug.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/memory.h&gt;</div><div class='add'>+</div><div class='add'>+phys_addr_t __virt_to_phys(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	WARN(!__is_lm_address(x),</div><div class='add'>+	     "virt_to_phys used for non-linear address: %pK (%pS)\n",</div><div class='add'>+	      (void *)x,</div><div class='add'>+	      (void *)x);</div><div class='add'>+</div><div class='add'>+	return __virt_to_phys_nodebug(x);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__virt_to_phys);</div><div class='add'>+</div><div class='add'>+phys_addr_t __phys_addr_symbol(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * This is bounds checking against the kernel image only.</div><div class='add'>+	 * __pa_symbol should only be used on kernel symbol addresses.</div><div class='add'>+	 */</div><div class='add'>+	VIRTUAL_BUG_ON(x &lt; (unsigned long) KERNEL_START ||</div><div class='add'>+		       x &gt; (unsigned long) KERNEL_END);</div><div class='add'>+	return __pa_symbol_nodebug(x);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__phys_addr_symbol);</div><div class='head'>diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S<br/>index 352c73b6a59e..877d42fb0df6 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/mm/proc.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/mm/proc.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/proc.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/proc.S</a></div><div class='hunk'>@@ -70,11 +70,14 @@ ENTRY(cpu_do_suspend)</div><div class='ctx'> 	mrs	x8, mdscr_el1</div><div class='ctx'> 	mrs	x9, oslsr_el1</div><div class='ctx'> 	mrs	x10, sctlr_el1</div><div class='add'>+	mrs	x11, tpidr_el1</div><div class='add'>+	mrs	x12, sp_el0</div><div class='ctx'> 	stp	x2, x3, [x0]</div><div class='ctx'> 	stp	x4, xzr, [x0, #16]</div><div class='ctx'> 	stp	x5, x6, [x0, #32]</div><div class='ctx'> 	stp	x7, x8, [x0, #48]</div><div class='ctx'> 	stp	x9, x10, [x0, #64]</div><div class='add'>+	stp	x11, x12, [x0, #80]</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(cpu_do_suspend)</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +93,7 @@ ENTRY(cpu_do_resume)</div><div class='ctx'> 	ldp	x6, x8, [x0, #32]</div><div class='ctx'> 	ldp	x9, x10, [x0, #48]</div><div class='ctx'> 	ldp	x11, x12, [x0, #64]</div><div class='add'>+	ldp	x13, x14, [x0, #80]</div><div class='ctx'> 	msr	tpidr_el0, x2</div><div class='ctx'> 	msr	tpidrro_el0, x3</div><div class='ctx'> 	msr	contextidr_el1, x4</div><div class='hunk'>@@ -112,6 +116,8 @@ ENTRY(cpu_do_resume)</div><div class='ctx'> 	msr	mdscr_el1, x10</div><div class='ctx'> </div><div class='ctx'> 	msr	sctlr_el1, x12</div><div class='add'>+	msr	tpidr_el1, x13</div><div class='add'>+	msr	sp_el0, x14</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Restore oslsr_el1 by writing oslar_el1</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -132,15 +138,12 @@ ENDPROC(cpu_do_resume)</div><div class='ctx'>  *	- pgd_phys - physical address of new TTB</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(cpu_do_switch_mm)</div><div class='add'>+	pre_ttbr0_update_workaround x0, x2, x3</div><div class='ctx'> 	mmid	x1, x1				// get mm-&gt;context.id</div><div class='ctx'> 	bfi	x0, x1, #48, #16		// set the ASID</div><div class='ctx'> 	msr	ttbr0_el1, x0			// set TTBR0</div><div class='ctx'> 	isb</div><div class='del'>-alternative_if ARM64_WORKAROUND_CAVIUM_27456</div><div class='del'>-	ic	iallu</div><div class='del'>-	dsb	nsh</div><div class='del'>-	isb</div><div class='del'>-alternative_else_nop_endif</div><div class='add'>+	post_ttbr0_update_workaround</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(cpu_do_switch_mm)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm64/mm/ptdump_debugfs.c b/arch/arm64/mm/ptdump_debugfs.c<br/>new file mode 100644<br/>index 000000000000..eee4d864350c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/arm64/mm/ptdump_debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/mm/ptdump_debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ptdump.h&gt;</div><div class='add'>+</div><div class='add'>+static int ptdump_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct ptdump_info *info = m-&gt;private;</div><div class='add'>+	ptdump_walk_pgd(m, info);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ptdump_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, ptdump_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations ptdump_fops = {</div><div class='add'>+	.open		= ptdump_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ptdump_debugfs_register(struct ptdump_info *info, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct dentry *pe;</div><div class='add'>+	pe = debugfs_create_file(name, 0400, NULL, info, &amp;ptdump_fops);</div><div class='add'>+	return pe ? 0 : -ENOMEM;</div><div class='add'>+</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c<br/>index b2fc97a2c56c..a785554916c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/net/bpf_jit_comp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/net/bpf_jit_comp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/net/bpf_jit_comp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/net/bpf_jit_comp.c</a></div><div class='hunk'>@@ -813,11 +813,6 @@ static inline void bpf_flush_icache(void *start, void *end)</div><div class='ctx'> 	flush_icache_range((unsigned long)start, (unsigned long)end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bpf_jit_compile(struct bpf_prog *prog)</div><div class='del'>-{</div><div class='del'>-	/* Nothing to do here. We support Internal BPF. */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_prog *tmp, *orig_prog = prog;</div><div class='hunk'>@@ -903,7 +898,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)</div><div class='ctx'> </div><div class='ctx'> 	bpf_flush_icache(header, ctx.image + ctx.idx);</div><div class='ctx'> </div><div class='del'>-	set_memory_ro((unsigned long)header, header-&gt;pages);</div><div class='add'>+	bpf_jit_binary_lock_ro(header);</div><div class='ctx'> 	prog-&gt;bpf_func = (void *)ctx.image;</div><div class='ctx'> 	prog-&gt;jited = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -915,18 +910,3 @@ out:</div><div class='ctx'> 					   tmp : orig_prog);</div><div class='ctx'> 	return prog;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void bpf_jit_free(struct bpf_prog *prog)</div><div class='del'>-{</div><div class='del'>-	unsigned long addr = (unsigned long)prog-&gt;bpf_func &amp; PAGE_MASK;</div><div class='del'>-	struct bpf_binary_header *header = (void *)addr;</div><div class='del'>-</div><div class='del'>-	if (!prog-&gt;jited)</div><div class='del'>-		goto free_filter;</div><div class='del'>-</div><div class='del'>-	set_memory_rw(addr, header-&gt;pages);</div><div class='del'>-	bpf_jit_binary_free(header);</div><div class='del'>-</div><div class='del'>-free_filter:</div><div class='del'>-	bpf_prog_unlock_free(prog);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S<br/>index 329c8027b0a9..401ceb71540c 100644<br/>--- a/<a href='/drm-misc/tree/arch/arm64/xen/hypercall.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/arm64/xen/hypercall.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/arm64/xen/hypercall.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/arm64/xen/hypercall.S</a></div><div class='hunk'>@@ -49,6 +49,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='add'>+#include &lt;asm/asm-uaccess.h&gt;</div><div class='ctx'> #include &lt;xen/interface/xen.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -83,6 +84,7 @@ HYPERCALL1(tmem_op);</div><div class='ctx'> HYPERCALL1(platform_op_raw);</div><div class='ctx'> HYPERCALL2(multicall);</div><div class='ctx'> HYPERCALL2(vm_assist);</div><div class='add'>+HYPERCALL3(dm_op);</div><div class='ctx'> </div><div class='ctx'> ENTRY(privcmd_call)</div><div class='ctx'> 	mov x16, x0</div><div class='hunk'>@@ -91,6 +93,20 @@ ENTRY(privcmd_call)</div><div class='ctx'> 	mov x2, x3</div><div class='ctx'> 	mov x3, x4</div><div class='ctx'> 	mov x4, x5</div><div class='add'>+	/*</div><div class='add'>+	 * Privcmd calls are issued by the userspace. The kernel needs to</div><div class='add'>+	 * enable access to TTBR0_EL1 as the hypervisor would issue stage 1</div><div class='add'>+	 * translations to user memory via AT instructions. Since AT</div><div class='add'>+	 * instructions are not affected by the PAN bit (ARMv8.1), we only</div><div class='add'>+	 * need the explicit uaccess_enable/disable if the TTBR0 PAN emulation</div><div class='add'>+	 * is enabled (it implies that hardware UAO and PAN disabled).</div><div class='add'>+	 */</div><div class='add'>+	uaccess_ttbr0_enable x6, x7</div><div class='ctx'> 	hvc XEN_IMM</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable userspace access from kernel once the hyp call completed.</div><div class='add'>+	 */</div><div class='add'>+	uaccess_ttbr0_disable x6</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(privcmd_call);</div><div class='head'>diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild<br/>index 241b9b9729d8..3d7ef2c17a7c 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> </div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += delay.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += div64.h</div><div class='head'>diff --git a/arch/avr32/include/asm/dma-mapping.h b/arch/avr32/include/asm/dma-mapping.h<br/>index 1115f2a645d1..7388451f9905 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -4,9 +4,9 @@</div><div class='ctx'> extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size,</div><div class='ctx'> 	int direction);</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops avr32_dma_ops;</div><div class='add'>+extern const struct dma_map_ops avr32_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;avr32_dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/avr32/include/asm/kprobes.h b/arch/avr32/include/asm/kprobes.h<br/>index 45f563ed73fd..28dfc61ad384 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/asm/kprobes.h</a></div><div class='hunk'>@@ -11,10 +11,14 @@</div><div class='ctx'> #ifndef __ASM_AVR32_KPROBES_H</div><div class='ctx'> #define __ASM_AVR32_KPROBES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='add'>+#define BREAKPOINT_INSTRUCTION	0xd673	/* breakpoint */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef u16	kprobe_opcode_t;</div><div class='del'>-#define BREAKPOINT_INSTRUCTION	0xd673	/* breakpoint */</div><div class='ctx'> #define MAX_INSN_SIZE		2</div><div class='ctx'> #define MAX_STACK_SIZE		64	/* 32 would probably be OK */</div><div class='ctx'> </div><div class='hunk'>@@ -46,4 +50,5 @@ extern int kprobe_exceptions_notify(struct notifier_block *self,</div><div class='ctx'> </div><div class='ctx'> #define flush_insn_slot(p)	do { } while (0)</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='ctx'> #endif /* __ASM_AVR32_KPROBES_H */</div><div class='head'>diff --git a/arch/avr32/include/asm/mmu_context.h b/arch/avr32/include/asm/mmu_context.h<br/>index 27ff23407100..cd87abba8db7 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #ifndef __ASM_AVR32_MMU_CONTEXT_H</div><div class='ctx'> #define __ASM_AVR32_MMU_CONTEXT_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/sysreg.h&gt;</div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='head'>diff --git a/arch/avr32/include/asm/mutex.h b/arch/avr32/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 458c1f7fbc18..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/avr32/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pull in the generic implementation for the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='head'>diff --git a/arch/avr32/include/asm/processor.h b/arch/avr32/include/asm/processor.h<br/>index 941593c7d9f3..972adcc1e8f4 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/asm/processor.h</a></div><div class='hunk'>@@ -92,7 +92,6 @@ extern struct avr32_cpuinfo boot_cpu_data;</div><div class='ctx'> #define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()		barrier()</div><div class='del'>-#define cpu_relax_lowlatency()        cpu_relax()</div><div class='ctx'> #define cpu_sync_pipeline()	asm volatile("sub pc, -2" : : : "memory")</div><div class='ctx'> </div><div class='ctx'> struct cpu_context {</div><div class='head'>diff --git a/arch/avr32/include/uapi/asm/socket.h b/arch/avr32/include/uapi/asm/socket.h<br/>index 1fd147f09a38..5a650426f357 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -90,4 +90,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		53</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	54</div><div class='add'>+</div><div class='ctx'> #endif /* _UAPI__ASM_AVR32_SOCKET_H */</div><div class='head'>diff --git a/arch/avr32/include/uapi/asm/unistd.h b/arch/avr32/include/uapi/asm/unistd.h<br/>index 2c8a0d2b6c30..236505d889d0 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/include/uapi/asm/unistd.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/include/uapi/asm/unistd.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/include/uapi/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/include/uapi/asm/unistd.h</a></div><div class='hunk'>@@ -340,5 +340,8 @@</div><div class='ctx'> #define __NR_copy_file_range    325</div><div class='ctx'> #define __NR_preadv2            326</div><div class='ctx'> #define __NR_pwritev2           327</div><div class='add'>+#define __NR_pkey_mprotect      328</div><div class='add'>+#define __NR_pkey_alloc         329</div><div class='add'>+#define __NR_pkey_free          330</div><div class='ctx'> </div><div class='ctx'> #endif /* _UAPI__ASM_AVR32_UNISTD_H */</div><div class='head'>diff --git a/arch/avr32/kernel/avr32_ksyms.c b/arch/avr32/kernel/avr32_ksyms.c<br/>index 7c6cf14f0985..0d05fd095468 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/kernel/avr32_ksyms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/kernel/avr32_ksyms.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/kernel/avr32_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/avr32_ksyms.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * GCC functions</div><div class='head'>diff --git a/arch/avr32/kernel/nmi_debug.c b/arch/avr32/kernel/nmi_debug.c<br/>index 3414b8566c29..25823049bb99 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/kernel/nmi_debug.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/kernel/nmi_debug.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/kernel/nmi_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/nmi_debug.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c<br/>index 68e5b9dac059..ad0dfccedb79 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/process.c</a></div><div class='hunk'>@@ -6,6 +6,9 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/avr32/kernel/ptrace.c b/arch/avr32/kernel/ptrace.c<br/>index 4aedcab7cd4b..41a14e96a1db 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/ptrace.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -17,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ocd.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='head'>diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c<br/>index 8f1c63b9b983..b5fcc4914fe4 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/signal.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/kernel/stacktrace.c b/arch/avr32/kernel/stacktrace.c<br/>index c09f0d8dd679..f8cc995cf0e0 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/stacktrace.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S<br/>index 7b348ba70e41..774ce57f4948 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/kernel/syscall_table.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/kernel/syscall_table.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/kernel/syscall_table.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/syscall_table.S</a></div><div class='hunk'>@@ -341,4 +341,7 @@ sys_call_table:</div><div class='ctx'> 	.long __sys_copy_file_range</div><div class='ctx'> 	.long __sys_preadv2</div><div class='ctx'> 	.long __sys_pwritev2</div><div class='add'>+	.long sys_pkey_mprotect</div><div class='add'>+	.long sys_pkey_alloc</div><div class='add'>+	.long sys_pkey_free /* 330 */</div><div class='ctx'> 	.long sys_ni_syscall /* r8 is saturated at nr_syscalls */</div><div class='head'>diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c<br/>index a124c55733db..4d9b69615979 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/time.c</a></div><div class='hunk'>@@ -20,9 +20,9 @@</div><div class='ctx'> </div><div class='ctx'> static bool disable_cpu_idle_poll;</div><div class='ctx'> </div><div class='del'>-static cycle_t read_cycle_count(struct clocksource *cs)</div><div class='add'>+static u64 read_cycle_count(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)sysreg_read(COUNT);</div><div class='add'>+	return (u64)sysreg_read(COUNT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c<br/>index eb4a3fcfbaff..50b541325025 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/kernel/traps.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;	/* print_modules */</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c<br/>index 52c179bec0cc..fdf1caecb7b9 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/mach-at32ap/clock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/mach-at32ap/clock.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/mach-at32ap/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/mach-at32ap/clock.c</a></div><div class='hunk'>@@ -242,7 +242,7 @@ dump_clock(struct clk *parent, struct clkinf *r)</div><div class='ctx'> 		clk_get_rate(parent));</div><div class='ctx'> 	if (parent-&gt;dev)</div><div class='ctx'> 		seq_printf(r-&gt;s, ", for %s", dev_name(parent-&gt;dev));</div><div class='del'>-	seq_printf(r-&gt;s, "\n");</div><div class='add'>+	seq_putc(r-&gt;s, '\n');</div><div class='ctx'> </div><div class='ctx'> 	/* cost of this scan is small, but not linear... */</div><div class='ctx'> 	r-&gt;nest = nest + NEST_DELTA;</div><div class='hunk'>@@ -261,23 +261,32 @@ static int clk_show(struct seq_file *s, void *unused)</div><div class='ctx'> 	struct clk 	*clk;</div><div class='ctx'> </div><div class='ctx'> 	/* show all the power manager registers */</div><div class='del'>-	seq_printf(s, "MCCTRL  = %8x\n", pm_readl(MCCTRL));</div><div class='del'>-	seq_printf(s, "CKSEL   = %8x\n", pm_readl(CKSEL));</div><div class='del'>-	seq_printf(s, "CPUMASK = %8x\n", pm_readl(CPU_MASK));</div><div class='del'>-	seq_printf(s, "HSBMASK = %8x\n", pm_readl(HSB_MASK));</div><div class='del'>-	seq_printf(s, "PBAMASK = %8x\n", pm_readl(PBA_MASK));</div><div class='del'>-	seq_printf(s, "PBBMASK = %8x\n", pm_readl(PBB_MASK));</div><div class='del'>-	seq_printf(s, "PLL0    = %8x\n", pm_readl(PLL0));</div><div class='del'>-	seq_printf(s, "PLL1    = %8x\n", pm_readl(PLL1));</div><div class='del'>-	seq_printf(s, "IMR     = %8x\n", pm_readl(IMR));</div><div class='add'>+	seq_printf(s,</div><div class='add'>+		   "MCCTRL  = %8x\n"</div><div class='add'>+		   "CKSEL   = %8x\n"</div><div class='add'>+		   "CPUMASK = %8x\n"</div><div class='add'>+		   "HSBMASK = %8x\n"</div><div class='add'>+		   "PBAMASK = %8x\n"</div><div class='add'>+		   "PBBMASK = %8x\n"</div><div class='add'>+		   "PLL0    = %8x\n"</div><div class='add'>+		   "PLL1    = %8x\n"</div><div class='add'>+		   "IMR     = %8x\n",</div><div class='add'>+		   pm_readl(MCCTRL),</div><div class='add'>+		   pm_readl(CKSEL),</div><div class='add'>+		   pm_readl(CPU_MASK),</div><div class='add'>+		   pm_readl(HSB_MASK),</div><div class='add'>+		   pm_readl(PBA_MASK),</div><div class='add'>+		   pm_readl(PBB_MASK),</div><div class='add'>+		   pm_readl(PLL0),</div><div class='add'>+		   pm_readl(PLL1),</div><div class='add'>+		   pm_readl(IMR));</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='ctx'> 		if (i == 5)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		seq_printf(s, "GCCTRL%d = %8x\n", i, pm_readl(GCCTRL(i)));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	seq_printf(s, "\n");</div><div class='del'>-</div><div class='add'>+	seq_putc(s, '\n');</div><div class='ctx'> 	r.s = s;</div><div class='ctx'> 	r.nest = 0;</div><div class='ctx'> 	/* protected from changes on the list while dumping */</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c<br/>index 13d3fc4270b7..7fae6ec7e8ec 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/mach-at32ap/pio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/mach-at32ap/pio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/mach-at32ap/pio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/mach-at32ap/pio.c</a></div><div class='hunk'>@@ -367,13 +367,13 @@ static void pio_bank_show(struct seq_file *s, struct gpio_chip *chip)</div><div class='ctx'> 			(mask &amp; pdsr) ? "hi" : "lo",</div><div class='ctx'> 			(mask &amp; pusr) ? "  " : "up");</div><div class='ctx'> 		if (ifsr &amp; mask)</div><div class='del'>-			seq_printf(s, " deglitch");</div><div class='add'>+			seq_puts(s, " deglitch");</div><div class='ctx'> 		if ((osr &amp; mdsr) &amp; mask)</div><div class='del'>-			seq_printf(s, " open-drain");</div><div class='add'>+			seq_puts(s, " open-drain");</div><div class='ctx'> 		if (imr &amp; mask)</div><div class='ctx'> 			seq_printf(s, " irq-%d edge-both",</div><div class='ctx'> 				gpio_to_irq(chip-&gt;base + i));</div><div class='del'>-		seq_printf(s, "\n");</div><div class='add'>+		seq_putc(s, '\n');</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/mm/cache.c b/arch/avr32/mm/cache.c<br/>index 85d635cd7b28..d9476825fc43 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/mm/cache.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/mm/cache.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/mm/cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/mm/cache.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/cachectl.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/avr32/mm/dma-coherent.c b/arch/avr32/mm/dma-coherent.c<br/>index 58610d0df7ed..555222d4f414 100644<br/>--- a/<a href='/drm-misc/tree/arch/avr32/mm/dma-coherent.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/avr32/mm/dma-coherent.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/avr32/mm/dma-coherent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/avr32/mm/dma-coherent.c</a></div><div class='hunk'>@@ -146,7 +146,8 @@ static dma_addr_t avr32_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> {</div><div class='ctx'> 	void *cpu_addr = page_address(page) + offset;</div><div class='ctx'> </div><div class='del'>-	dma_cache_sync(dev, cpu_addr, size, direction);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		dma_cache_sync(dev, cpu_addr, size, direction);</div><div class='ctx'> 	return virt_to_bus(cpu_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -162,6 +163,10 @@ static int avr32_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 		sg-&gt;dma_address = page_to_bus(sg_page(sg)) + sg-&gt;offset;</div><div class='ctx'> 		virt = sg_virt(sg);</div><div class='add'>+</div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		dma_cache_sync(dev, virt, sg-&gt;length, direction);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -186,7 +191,7 @@ static void avr32_dma_sync_sg_for_device(struct device *dev,</div><div class='ctx'> 		dma_cache_sync(dev, sg_virt(sg), sg-&gt;length, direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops avr32_dma_ops = {</div><div class='add'>+const struct dma_map_ops avr32_dma_ops = {</div><div class='ctx'> 	.alloc			= avr32_dma_alloc,</div><div class='ctx'> 	.free			= avr32_dma_free,</div><div class='ctx'> 	.map_page		= avr32_dma_map_page,</div><div class='head'>diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild<br/>index 91d49c0a3118..625db8ac815e 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/include/asm/Kbuild</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> generic-y += auxvec.h</div><div class='ctx'> generic-y += bitsperlong.h</div><div class='ctx'> generic-y += bugs.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += div64.h</div><div class='hunk'>@@ -24,7 +23,6 @@ generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='ctx'> generic-y += mman.h</div><div class='ctx'> generic-y += msgbuf.h</div><div class='del'>-generic-y += mutex.h</div><div class='ctx'> generic-y += param.h</div><div class='ctx'> generic-y += percpu.h</div><div class='ctx'> generic-y += pgalloc.h</div><div class='hunk'>@@ -48,3 +46,4 @@ generic-y += unaligned.h</div><div class='ctx'> generic-y += user.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/blackfin/include/asm/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h<br/>index 3490570aaa82..04254ac36bed 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -36,9 +36,9 @@ _dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir)</div><div class='ctx'> 		__dma_sync(addr, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops bfin_dma_ops;</div><div class='add'>+extern const struct dma_map_ops bfin_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;bfin_dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/blackfin/include/asm/mmu_context.h b/arch/blackfin/include/asm/mmu_context.h<br/>index 15b16d3e8de8..0ce6de873b27 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='head'>diff --git a/arch/blackfin/include/asm/processor.h b/arch/blackfin/include/asm/processor.h<br/>index 0c265aba94ad..85d4af97c986 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/include/asm/processor.h</a></div><div class='hunk'>@@ -92,7 +92,6 @@ unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define	KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)-&gt;thread.usp)</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()    	smp_mb()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> /* Get the Silicon Revision of the chip */</div><div class='ctx'> static inline uint32_t __pure bfin_revid(void)</div><div class='head'>diff --git a/arch/blackfin/include/asm/vga.h b/arch/blackfin/include/asm/vga.h<br/>new file mode 100644<br/>index 000000000000..89d82fd8fcf1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/include/asm/vga.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/include/asm/vga.h</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+#include &lt;asm-generic/vga.h&gt;</div><div class='head'>diff --git a/arch/blackfin/kernel/bfin_dma.c b/arch/blackfin/kernel/bfin_dma.c<br/>index 4a32f2dd5ddc..9d3eb0cf8ccc 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/bfin_dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/bfin_dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/bfin_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/bfin_dma.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/early_printk.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/blackfin/kernel/dma-mapping.c b/arch/blackfin/kernel/dma-mapping.c<br/>index 53fbbb61aa86..477bb29a7987 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/dma-mapping.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/dma-mapping.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/dma-mapping.c</a></div><div class='hunk'>@@ -118,6 +118,10 @@ static int bfin_dma_map_sg(struct device *dev, struct scatterlist *sg_list,</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(sg_list, sg, nents, i) {</div><div class='ctx'> 		sg-&gt;dma_address = (dma_addr_t) sg_virt(sg);</div><div class='add'>+</div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		__dma_sync(sg_dma_address(sg), sg_dma_len(sg), direction);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -143,7 +147,9 @@ static dma_addr_t bfin_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t handle = (dma_addr_t)(page_address(page) + offset);</div><div class='ctx'> </div><div class='del'>-	_dma_sync(handle, size, dir);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		_dma_sync(handle, size, dir);</div><div class='add'>+</div><div class='ctx'> 	return handle;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -153,7 +159,7 @@ static inline void bfin_dma_sync_single_for_device(struct device *dev,</div><div class='ctx'> 	_dma_sync(handle, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops bfin_dma_ops = {</div><div class='add'>+const struct dma_map_ops bfin_dma_ops = {</div><div class='ctx'> 	.alloc			= bfin_dma_alloc,</div><div class='ctx'> 	.free			= bfin_dma_free,</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/kernel/dumpstack.c b/arch/blackfin/kernel/dumpstack.c<br/>index 95ba6d9e9a3d..3c992c1f8ef2 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/dumpstack.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/dumpstack.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/dumpstack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/dumpstack.c</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/trace.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c<br/>index 61fbd2de993d..4b89af9243d3 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/early_printk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/early_printk.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/early_printk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/early_printk.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='head'>diff --git a/arch/blackfin/kernel/flat.c b/arch/blackfin/kernel/flat.c<br/>index a88daddbf074..b5b658449616 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/flat.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/flat.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/flat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/flat.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/flat.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define FLAT_BFIN_RELOC_TYPE_16_BIT 0</div><div class='head'>diff --git a/arch/blackfin/kernel/kgdb_test.c b/arch/blackfin/kernel/kgdb_test.c<br/>index 18ab004aea1c..b8b785dc4e3b 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/kgdb_test.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/kgdb_test.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/kgdb_test.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/kgdb_test.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/kernel/module.c b/arch/blackfin/kernel/module.c<br/>index 4489efc52883..0188c933b155 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/module.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/module.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/module.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Transfer the section to the L1 memory */</div><div class='ctx'> int</div><div class='head'>diff --git a/arch/blackfin/kernel/nmi.c b/arch/blackfin/kernel/nmi.c<br/>index 9919d29287dc..633c37083e87 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/nmi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/nmi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/nmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/nmi.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='head'>diff --git a/arch/blackfin/kernel/perf_event.c b/arch/blackfin/kernel/perf_event.c<br/>index 6355e97d22b9..6a9524ad04a5 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/perf_event.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/perf_event.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/perf_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/perf_event.c</a></div><div class='hunk'>@@ -475,7 +475,7 @@ static int __init bfin_pmu_init(void)</div><div class='ctx'> </div><div class='ctx'> 	ret = perf_pmu_register(&amp;pmu, "cpu", PERF_TYPE_RAW);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		cpuhp_setup_state(CPUHP_PERF_BFIN, "PERF_BFIN",</div><div class='add'>+		cpuhp_setup_state(CPUHP_PERF_BFIN,"perf/bfin:starting",</div><div class='ctx'> 				  bfin_pmu_prepare_cpu, NULL);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c<br/>index 4aa5545c4fde..89d5162d4ca6 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/process.c</a></div><div class='hunk'>@@ -12,6 +12,10 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='head'>diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c<br/>index 8d79286ee4e8..a6827095b99a 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/ptrace.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='hunk'>@@ -270,7 +271,7 @@ long arch_ptrace(struct task_struct *child, long request,</div><div class='ctx'> 			switch (bfin_mem_access_type(addr, to_copy)) {</div><div class='ctx'> 			case BFIN_MEM_ACCESS_CORE:</div><div class='ctx'> 			case BFIN_MEM_ACCESS_CORE_ONLY:</div><div class='del'>-				copied = access_process_vm(child, addr, &amp;tmp,</div><div class='add'>+				copied = ptrace_access_vm(child, addr, &amp;tmp,</div><div class='ctx'> 							   to_copy, FOLL_FORCE);</div><div class='ctx'> 				if (copied)</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -323,7 +324,7 @@ long arch_ptrace(struct task_struct *child, long request,</div><div class='ctx'> 			switch (bfin_mem_access_type(addr, to_copy)) {</div><div class='ctx'> 			case BFIN_MEM_ACCESS_CORE:</div><div class='ctx'> 			case BFIN_MEM_ACCESS_CORE_ONLY:</div><div class='del'>-				copied = access_process_vm(child, addr, &amp;data,</div><div class='add'>+				copied = ptrace_access_vm(child, addr, &amp;data,</div><div class='ctx'> 				                           to_copy,</div><div class='ctx'> 							   FOLL_FORCE | FOLL_WRITE);</div><div class='ctx'> 				break;</div><div class='head'>diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c<br/>index ea570db598e5..5f5172779204 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/signal.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/binfmts.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='head'>diff --git a/arch/blackfin/kernel/stacktrace.c b/arch/blackfin/kernel/stacktrace.c<br/>index 30301e1eace5..17198f3650b6 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/stacktrace.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c<br/>index fb9e95f1b719..0e9fcf841d67 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/time-ts.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/time-ts.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/time-ts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/time-ts.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_CYCLES_CLOCKSOURCE)</div><div class='ctx'> </div><div class='del'>-static notrace cycle_t bfin_read_cycles(struct clocksource *cs)</div><div class='add'>+static notrace u64 bfin_read_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_CPU_FREQ</div><div class='ctx'> 	return __bfin_cycles_off + (get_cycles() &lt;&lt; __bfin_cycles_mod);</div><div class='hunk'>@@ -80,7 +80,7 @@ void __init setup_gptimer0(void)</div><div class='ctx'> 	enable_gptimers(TIMER0bit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t bfin_read_gptimer0(struct clocksource *cs)</div><div class='add'>+static u64 bfin_read_gptimer0(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return bfin_read_TIMER0_COUNTER();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/blackfin/kernel/trace.c b/arch/blackfin/kernel/trace.c<br/>index 719dd796c12c..151f22196ab6 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/trace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/trace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/trace.c</a></div><div class='hunk'>@@ -11,7 +11,9 @@</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/oom.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='head'>diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c<br/>index 1ed85ddadc0d..a323a40a46e9 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/kernel/traps.c</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/cplb.h&gt;</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='head'>diff --git a/arch/blackfin/mach-bf561/coreb.c b/arch/blackfin/mach-bf561/coreb.c<br/>index 8a2543c654b3..cf27554e76bf 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/mach-bf561/coreb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/mach-bf561/coreb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/mach-bf561/coreb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/mach-bf561/coreb.c</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> /* Load firmware into Core B on a BF561</div><div class='ctx'>  *</div><div class='add'>+ * Author: Bas Vermeulen &lt;bvermeul@blackstar.xs4all.nl&gt;</div><div class='add'>+ *</div><div class='ctx'>  * Copyright 2004-2009 Analog Devices Inc.</div><div class='ctx'>  * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='hunk'>@@ -14,9 +16,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CMD_COREB_START		_IO('b', 0)</div><div class='ctx'> #define CMD_COREB_STOP		_IO('b', 1)</div><div class='hunk'>@@ -59,8 +61,4 @@ static struct miscdevice coreb_dev = {</div><div class='ctx'> 	.name  = "coreb",</div><div class='ctx'> 	.fops  = &amp;coreb_fops,</div><div class='ctx'> };</div><div class='del'>-module_misc_device(coreb_dev);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Bas Vermeulen &lt;bvermeul@blackstar.xs4all.nl&gt;");</div><div class='del'>-MODULE_DESCRIPTION("BF561 Core B Support");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='add'>+builtin_misc_device(coreb_dev);</div><div class='head'>diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c<br/>index 4986b4fbcee9..13e94bf9d8ba 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/mach-common/ints-priority.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/mach-common/ints-priority.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/mach-common/ints-priority.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/mach-common/ints-priority.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='head'>diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c<br/>index 23c4ef5f8bdc..b32ddab7966c 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/mach-common/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/mach-common/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/mach-common/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/mach-common/smp.c</a></div><div class='hunk'>@@ -11,7 +11,8 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='hunk'>@@ -307,8 +308,8 @@ void secondary_start_kernel(void)</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> </div><div class='ctx'> 	/* Attach the new idle task to the global mm. */</div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_users);</div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_count);</div><div class='add'>+	mmget(mm);</div><div class='add'>+	mmgrab(mm);</div><div class='ctx'> 	current-&gt;active_mm = mm;</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable();</div><div class='head'>diff --git a/arch/blackfin/mm/isram-driver.c b/arch/blackfin/mm/isram-driver.c<br/>index 7e2e674ed444..aaa1e64b753b 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/mm/isram-driver.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/mm/isram-driver.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/mm/isram-driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/mm/isram-driver.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='head'>diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c<br/>index 1f3b3ef3e103..d2a96c2c02a3 100644<br/>--- a/<a href='/drm-misc/tree/arch/blackfin/mm/sram-alloc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/blackfin/mm/sram-alloc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/blackfin/mm/sram-alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/blackfin/mm/sram-alloc.c</a></div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> #include &lt;asm/mem_map.h&gt;</div><div class='ctx'> #include "blackfin_sram.h"</div><div class='head'>diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild<br/>index 64465e7e2245..82619c32d25b 100644<br/>--- a/<a href='/drm-misc/tree/arch/c6x/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/c6x/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/c6x/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/include/asm/Kbuild</a></div><div class='hunk'>@@ -5,7 +5,6 @@ generic-y += barrier.h</div><div class='ctx'> generic-y += bitsperlong.h</div><div class='ctx'> generic-y += bugs.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += div64.h</div><div class='hunk'>@@ -62,3 +61,4 @@ generic-y += user.h</div><div class='ctx'> generic-y += vga.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/c6x/include/asm/dma-mapping.h b/arch/c6x/include/asm/dma-mapping.h<br/>index 5717b1e52d96..aca9f755e4f8 100644<br/>--- a/<a href='/drm-misc/tree/arch/c6x/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/c6x/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/c6x/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -17,9 +17,9 @@</div><div class='ctx'>  */</div><div class='ctx'> #define DMA_ERROR_CODE ~0</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops c6x_dma_ops;</div><div class='add'>+extern const struct dma_map_ops c6x_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;c6x_dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/c6x/include/asm/mutex.h b/arch/c6x/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 7a7248e0462d..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/c6x/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/c6x/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-#ifndef _ASM_C6X_MUTEX_H</div><div class='del'>-#define _ASM_C6X_MUTEX_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/mutex-null.h&gt;</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_C6X_MUTEX_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/processor.h b/arch/c6x/include/asm/processor.h<br/>index f2ef31be2f8b..b9eb3da7f278 100644<br/>--- a/<a href='/drm-misc/tree/arch/c6x/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/c6x/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/c6x/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/include/asm/processor.h</a></div><div class='hunk'>@@ -121,7 +121,6 @@ extern unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define KSTK_ESP(task)	(task_pt_regs(task)-&gt;sp)</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()		do { } while (0)</div><div class='del'>-#define cpu_relax_lowlatency()        cpu_relax()</div><div class='ctx'> </div><div class='ctx'> extern const struct seq_operations cpuinfo_op;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/c6x/kernel/dma.c b/arch/c6x/kernel/dma.c<br/>index db4a6a301f5e..9fff8be75f58 100644<br/>--- a/<a href='/drm-misc/tree/arch/c6x/kernel/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/c6x/kernel/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/c6x/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/kernel/dma.c</a></div><div class='hunk'>@@ -42,14 +42,17 @@ static dma_addr_t c6x_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t handle = virt_to_phys(page_address(page) + offset);</div><div class='ctx'> </div><div class='del'>-	c6x_dma_sync(handle, size, dir);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		c6x_dma_sync(handle, size, dir);</div><div class='add'>+</div><div class='ctx'> 	return handle;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void c6x_dma_unmap_page(struct device *dev, dma_addr_t handle,</div><div class='ctx'> 		size_t size, enum dma_data_direction dir, unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	c6x_dma_sync(handle, size, dir);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		c6x_dma_sync(handle, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int c6x_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='hunk'>@@ -60,7 +63,8 @@ static int c6x_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(sglist, sg, nents, i) {</div><div class='ctx'> 		sg-&gt;dma_address = sg_phys(sg);</div><div class='del'>-		c6x_dma_sync(sg-&gt;dma_address, sg-&gt;length, dir);</div><div class='add'>+		if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+			c6x_dma_sync(sg-&gt;dma_address, sg-&gt;length, dir);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return nents;</div><div class='hunk'>@@ -72,9 +76,11 @@ static void c6x_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	for_each_sg(sglist, sg, nents, i)</div><div class='ctx'> 		c6x_dma_sync(sg_dma_address(sg), sg-&gt;length, dir);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void c6x_dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle,</div><div class='hunk'>@@ -117,7 +123,7 @@ static void c6x_dma_sync_sg_for_device(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops c6x_dma_ops = {</div><div class='add'>+const struct dma_map_ops c6x_dma_ops = {</div><div class='ctx'> 	.alloc			= c6x_dma_alloc,</div><div class='ctx'> 	.free			= c6x_dma_free,</div><div class='ctx'> 	.map_page		= c6x_dma_map_page,</div><div class='head'>diff --git a/arch/c6x/kernel/process.c b/arch/c6x/kernel/process.c<br/>index 0ee7686a78f3..c4ecb24c2d5c 100644<br/>--- a/<a href='/drm-misc/tree/arch/c6x/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/c6x/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/c6x/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/kernel/process.c</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> #include &lt;linux/mqueue.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/c6x/kernel/ptrace.c b/arch/c6x/kernel/ptrace.c<br/>index 3c494e84444d..a27e1f02ce18 100644<br/>--- a/<a href='/drm-misc/tree/arch/c6x/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/c6x/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/c6x/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/kernel/ptrace.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;linux/regset.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/c6x/kernel/time.c b/arch/c6x/kernel/time.c<br/>index 04845aaf5985..6a8e00a1f6d5 100644<br/>--- a/<a href='/drm-misc/tree/arch/c6x/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/c6x/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/c6x/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/kernel/time.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> static u32 sched_clock_multiplier;</div><div class='ctx'> #define SCHED_CLOCK_SHIFT 16</div><div class='ctx'> </div><div class='del'>-static cycle_t tsc_read(struct clocksource *cs)</div><div class='add'>+static u64 tsc_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return get_cycles();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/c6x/kernel/traps.c b/arch/c6x/kernel/traps.c<br/>index dcc2c2f6d67c..09b8a40d5680 100644<br/>--- a/<a href='/drm-misc/tree/arch/c6x/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/c6x/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/c6x/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/kernel/traps.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c<br/>index 63f5560d6eb2..4cc72b0d1c1d 100644<br/>--- a/<a href='/drm-misc/tree/arch/c6x/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/c6x/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/c6x/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/c6x/mm/init.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ZERO_PAGE is a special page that is used for zero-initialized</div><div class='head'>diff --git a/arch/cris/arch-v10/drivers/eeprom.c b/arch/cris/arch-v10/drivers/eeprom.c<br/>index c903a9e53a47..33558d270a53 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v10/drivers/eeprom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v10/drivers/eeprom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v10/drivers/eeprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/drivers/eeprom.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include "i2c.h"</div><div class='ctx'> </div><div class='ctx'> #define D(x)</div><div class='head'>diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c<br/>index 0f3983241e60..cc62572c1b94 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v10/drivers/sync_serial.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v10/drivers/sync_serial.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v10/drivers/sync_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/drivers/sync_serial.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;arch/svinto.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/sync_serial.h&gt;</div><div class='ctx'> #include &lt;arch/io_interface_mux.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c<br/>index 96e5afef6b47..e299d30105b5 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v10/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v10/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v10/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/kernel/process.c</a></div><div class='hunk'>@@ -11,6 +11,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/ptrace.c b/arch/cris/arch-v10/kernel/ptrace.c<br/>index bfddfb99401f..c2f2b9b83cc4 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v10/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v10/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v10/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/kernel/ptrace.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -12,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c<br/>index 7122d9773b13..bab4a8dd6bfd 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v10/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v10/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v10/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/kernel/signal.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -26,7 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;arch/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEBUG_SIG 0</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/traps.c b/arch/cris/arch-v10/kernel/traps.c<br/>index 7001beda716c..c0a501f29bd8 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v10/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v10/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v10/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/kernel/traps.c</a></div><div class='hunk'>@@ -9,7 +9,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;arch/sv_addr_ag.h&gt;</div><div class='ctx'> #include &lt;arch/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v10/lib/usercopy.c b/arch/cris/arch-v10/lib/usercopy.c<br/>index b964c667aced..1ba7cc000dfc 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v10/lib/usercopy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v10/lib/usercopy.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v10/lib/usercopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/lib/usercopy.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Pieces used from memcpy, originally by Kenny Ranerup long time ago.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Asm:s have been tweaked (within the domain of correctness) to give</div><div class='ctx'>    satisfactory results for "gcc version 2.96 20000427 (experimental)".</div><div class='head'>diff --git a/arch/cris/arch-v10/mm/fault.c b/arch/cris/arch-v10/mm/fault.c<br/>index ed60588f8467..75210cbe61ce 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v10/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v10/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v10/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/mm/fault.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;arch/svinto.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/mm/tlb.c b/arch/cris/arch-v10/mm/tlb.c<br/>index 21d78c599bab..3225d38bdaea 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v10/mm/tlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v10/mm/tlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v10/mm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v10/mm/tlb.c</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;arch/svinto.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c<br/>index 0068fd411a84..ae6903d7fdbe 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v32/drivers/cryptocop.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v32/drivers/cryptocop.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v32/drivers/cryptocop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/drivers/cryptocop.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/drivers/pci/dma.c b/arch/cris/arch-v32/drivers/pci/dma.c<br/>index 1f0636793f0c..7072341995ff 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v32/drivers/pci/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v32/drivers/pci/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v32/drivers/pci/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/drivers/pci/dma.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ static inline int v32_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops v32_dma_ops = {</div><div class='add'>+const struct dma_map_ops v32_dma_ops = {</div><div class='ctx'> 	.alloc			= v32_dma_alloc,</div><div class='ctx'> 	.free			= v32_dma_free,</div><div class='ctx'> 	.map_page		= v32_dma_map_page,</div><div class='head'>diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c<br/>index ef515af1a377..8efcc1a899a8 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v32/drivers/sync_serial.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v32/drivers/sync_serial.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v32/drivers/sync_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/drivers/sync_serial.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c<br/>index 4d1afa9f9fd3..c530a8fa87ce 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v32/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v32/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v32/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/kernel/process.c</a></div><div class='hunk'>@@ -9,6 +9,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/ptrace.c b/arch/cris/arch-v32/kernel/ptrace.c<br/>index f0df654ac6fc..0461e95bbb62 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v32/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v32/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v32/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/kernel/ptrace.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -12,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -147,7 +148,7 @@ long arch_ptrace(struct task_struct *child, long request,</div><div class='ctx'> 				/* The trampoline page is globally mapped, no page table to traverse.*/</div><div class='ctx'> 				tmp = *(unsigned long*)addr;</div><div class='ctx'> 			} else {</div><div class='del'>-				copied = access_process_vm(child, addr, &amp;tmp, sizeof(tmp), FOLL_FORCE);</div><div class='add'>+				copied = ptrace_access_vm(child, addr, &amp;tmp, sizeof(tmp), FOLL_FORCE);</div><div class='ctx'> </div><div class='ctx'> 				if (copied != sizeof(tmp))</div><div class='ctx'> 					break;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c<br/>index 150d1d76c29d..ea2e8e1398e8 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v32/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v32/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v32/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/kernel/signal.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -18,7 +19,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;arch/hwregs/cpu_vect.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long cris_signal_return_page;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/traps.c b/arch/cris/arch-v32/kernel/traps.c<br/>index 8bbe09c93132..a34256515036 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v32/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v32/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v32/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/kernel/traps.c</a></div><div class='hunk'>@@ -3,8 +3,10 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;hwregs/supp_reg.h&gt;</div><div class='ctx'> #include &lt;hwregs/intr_vect_defs.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/lib/usercopy.c b/arch/cris/arch-v32/lib/usercopy.c<br/>index f0f335d8aa79..05e58dab800d 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v32/lib/usercopy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v32/lib/usercopy.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v32/lib/usercopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/lib/usercopy.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Pieces used from memcpy, originally by Kenny Ranerup long time ago.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Asm:s have been tweaked (within the domain of correctness) to give</div><div class='ctx'>    satisfactory results for "gcc version 3.2.1 Axis release R53/1.53-v32".</div><div class='head'>diff --git a/arch/cris/arch-v32/mm/tlb.c b/arch/cris/arch-v32/mm/tlb.c<br/>index c030d020660a..bc3de5b5e27c 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/arch-v32/mm/tlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/arch-v32/mm/tlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/arch-v32/mm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/arch-v32/mm/tlb.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  * Authors:   Bjorn Wesen &lt;bjornw@axis.com&gt;</div><div class='ctx'>  *            Tobias Anderberg &lt;tobiasa@axis.com&gt;, CRISv32 port.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='head'>diff --git a/arch/cris/boot/compressed/Makefile b/arch/cris/boot/compressed/Makefile<br/>index 8fe9338c1775..e4ba0be0e782 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/boot/compressed/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/boot/compressed/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/boot/compressed/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/boot/compressed/Makefile</a></div><div class='hunk'>@@ -2,9 +2,6 @@</div><div class='ctx'> # arch/cris/boot/compressed/Makefile</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-asflags-y += $(LINUXINCLUDE)</div><div class='del'>-ccflags-y += -O2 $(LINUXINCLUDE)</div><div class='del'>-</div><div class='ctx'> # asflags-$(CONFIG_ETRAX_ARCH_V32) += -I$(srctree)/include/asm/mach \</div><div class='ctx'> # 				    -I$(srctree)/include/asm/arch</div><div class='ctx'> # ccflags-$(CONFIG_ETRAX_ARCH_V32) += -O2 -I$(srctree)/include/asm/mach</div><div class='head'>diff --git a/arch/cris/boot/rescue/Makefile b/arch/cris/boot/rescue/Makefile<br/>index 52bd0bd1dd22..a82025940006 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/boot/rescue/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/boot/rescue/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/boot/rescue/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/boot/rescue/Makefile</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'> # asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch</div><div class='ctx'> # LD = gcc-cris -mlinux -march=v32 -nostdlib</div><div class='ctx'> </div><div class='del'>-asflags-y += $(LINUXINCLUDE)</div><div class='del'>-ccflags-y += -O2 $(LINUXINCLUDE)</div><div class='add'>+ifdef CONFIG_ETRAX_AXISFLASHMAP</div><div class='add'>+</div><div class='ctx'> arch-$(CONFIG_ETRAX_ARCH_V10) = v10</div><div class='ctx'> arch-$(CONFIG_ETRAX_ARCH_V32) = v32</div><div class='ctx'> </div><div class='hunk'>@@ -28,6 +28,11 @@ $(obj)/rescue.bin: $(obj)/rescue.o FORCE</div><div class='ctx'> 	$(call if_changed,objcopy)</div><div class='ctx'> 	cp -p $(obj)/rescue.bin $(objtree)</div><div class='ctx'> </div><div class='add'>+else</div><div class='add'>+$(obj)/rescue.bin:</div><div class='add'>+</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> $(obj)/testrescue.bin: $(obj)/testrescue.o</div><div class='ctx'> 	$(OBJCOPY) $(OBJCOPYFLAGS) $(obj)/testrescue.o tr.bin</div><div class='ctx'> # Pad it to 784 bytes</div><div class='head'>diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild<br/>index 1778805f6380..0f5132b08896 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/include/asm/Kbuild</a></div><div class='hunk'>@@ -4,7 +4,7 @@ generic-y += barrier.h</div><div class='ctx'> generic-y += bitsperlong.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='ctx'> generic-y += cmpxchg.h</div><div class='del'>-generic-y += cputime.h</div><div class='add'>+generic-y += current.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += div64.h</div><div class='ctx'> generic-y += errno.h</div><div class='hunk'>@@ -45,3 +45,4 @@ generic-y += types.h</div><div class='ctx'> generic-y += vga.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/cris/include/asm/current.h b/arch/cris/include/asm/current.h<br/>deleted file mode 100644<br/>index 5f5c0efd00be..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/cris/include/asm/current.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/include/asm/current.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-#ifndef _CRIS_CURRENT_H</div><div class='del'>-#define _CRIS_CURRENT_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/thread_info.h&gt;</div><div class='del'>-</div><div class='del'>-struct task_struct;</div><div class='del'>-</div><div class='del'>-static inline struct task_struct * get_current(void)</div><div class='del'>-{</div><div class='del'>-        return current_thread_info()-&gt;task;</div><div class='del'>-}</div><div class='del'>- </div><div class='del'>-#define current get_current()</div><div class='del'>-</div><div class='del'>-#endif /* !(_CRIS_CURRENT_H) */</div><div class='head'>diff --git a/arch/cris/include/asm/dma-mapping.h b/arch/cris/include/asm/dma-mapping.h<br/>index 5a370178a0e9..256169de3743 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -2,14 +2,14 @@</div><div class='ctx'> #define _ASM_CRIS_DMA_MAPPING_H</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-extern struct dma_map_ops v32_dma_ops;</div><div class='add'>+extern const struct dma_map_ops v32_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;v32_dma_ops;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	BUG();</div><div class='ctx'> 	return NULL;</div><div class='head'>diff --git a/arch/cris/include/asm/mutex.h b/arch/cris/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 458c1f7fbc18..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/cris/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pull in the generic implementation for the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='head'>diff --git a/arch/cris/include/asm/pgtable.h b/arch/cris/include/asm/pgtable.h<br/>index ceefc314d64d..2a3210ba4c72 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/include/asm/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/include/asm/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/include/asm/pgtable.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;asm-generic/pgtable-nopmd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;arch/pgtable.h&gt;</div><div class='head'>diff --git a/arch/cris/include/asm/processor.h b/arch/cris/include/asm/processor.h<br/>index 862126b58116..15b815df29c1 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/include/asm/processor.h</a></div><div class='hunk'>@@ -63,7 +63,6 @@ static inline void release_thread(struct task_struct *dead_task)</div><div class='ctx'> #define init_stack      (init_thread_union.stack)</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()     barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> void default_idle(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/kernel/crisksyms.c b/arch/cris/kernel/crisksyms.c<br/>index 31b4bd288cad..3166d1cf2f84 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/kernel/crisksyms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/kernel/crisksyms.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/kernel/crisksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/crisksyms.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='head'>diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c<br/>index 694850e8f077..09b864f46f8a 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/irq.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='head'>diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c<br/>index b78498eb079b..0bbd3a0c3d70 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/process.c</a></div><div class='hunk'>@@ -14,12 +14,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/init_task.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='head'>diff --git a/arch/cris/kernel/profile.c b/arch/cris/kernel/profile.c<br/>index cd9f15b92f8f..ad56b37f8e11 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/kernel/profile.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/kernel/profile.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/kernel/profile.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/profile.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SAMPLE_BUFFER_SIZE 8192</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/kernel/ptrace.c b/arch/cris/kernel/ptrace.c<br/>index fd3427e563c5..806b764059d5 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/ptrace.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/cris/kernel/stacktrace.c b/arch/cris/kernel/stacktrace.c<br/>index 99838c74456d..f1cc3aaacd8d 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/stacktrace.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/stacktrace.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/kernel/sys_cris.c b/arch/cris/kernel/sys_cris.c<br/>index 7aa036ec78ff..8febb032fdd7 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/kernel/sys_cris.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/kernel/sys_cris.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/kernel/sys_cris.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/sys_cris.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/ipc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='ctx'> </div><div class='ctx'> asmlinkage long</div><div class='head'>diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c<br/>index 2dda6da71521..bc562cf511a6 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/time.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;	/* just for sched_clock() - funny that */</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define D(x)</div><div class='head'>diff --git a/arch/cris/kernel/traps.c b/arch/cris/kernel/traps.c<br/>index da4c72401e27..a01636a12a6e 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/kernel/traps.c</a></div><div class='hunk'>@@ -15,12 +15,13 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #ifdef CONFIG_KALLSYMS</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;arch/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void arch_enable_nmi(void);</div><div class='head'>diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c<br/>index 94183d3639ef..1fca464f1b9e 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/mm/fault.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;arch/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/mm/tlb.c b/arch/cris/mm/tlb.c<br/>index b7f8de576777..8413741cfa0f 100644<br/>--- a/<a href='/drm-misc/tree/arch/cris/mm/tlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/cris/mm/tlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/cris/mm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/cris/mm/tlb.c</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define D(x)</div><div class='head'>diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild<br/>index 1fa084cf1a43..c33b46715f65 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> </div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += exec.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='hunk'>@@ -8,3 +7,4 @@ generic-y += mm-arch-hooks.h</div><div class='ctx'> generic-y += preempt.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h<br/>index 1c2a5e264fc7..e93c9494503a 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/include/asm/atomic.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/include/asm/atomic.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/include/asm/atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/asm/atomic.h</a></div><div class='hunk'>@@ -139,7 +139,7 @@ static inline void atomic64_dec(atomic64_t *v)</div><div class='ctx'> #define atomic64_sub_and_test(i,v)	(atomic64_sub_return((i), (v)) == 0)</div><div class='ctx'> #define atomic64_dec_and_test(v)	(atomic64_dec_return((v)) == 0)</div><div class='ctx'> #define atomic64_inc_and_test(v)	(atomic64_inc_return((v)) == 0)</div><div class='del'>-</div><div class='add'>+#define atomic64_inc_not_zero(v)	atomic64_add_unless((v), 1, 0)</div><div class='ctx'> </div><div class='ctx'> #define atomic_cmpxchg(v, old, new)	(cmpxchg(&amp;(v)-&gt;counter, old, new))</div><div class='ctx'> #define atomic_xchg(v, new)		(xchg(&amp;(v)-&gt;counter, new))</div><div class='hunk'>@@ -161,6 +161,39 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)</div><div class='ctx'> 	return c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int atomic64_add_unless(atomic64_t *v, long long i, long long u)</div><div class='add'>+{</div><div class='add'>+	long long c, old;</div><div class='add'>+</div><div class='add'>+	c = atomic64_read(v);</div><div class='add'>+	for (;;) {</div><div class='add'>+		if (unlikely(c == u))</div><div class='add'>+			break;</div><div class='add'>+		old = atomic64_cmpxchg(v, c, c + i);</div><div class='add'>+		if (likely(old == c))</div><div class='add'>+			break;</div><div class='add'>+		c = old;</div><div class='add'>+	}</div><div class='add'>+	return c != u;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long long atomic64_dec_if_positive(atomic64_t *v)</div><div class='add'>+{</div><div class='add'>+	long long c, old, dec;</div><div class='add'>+</div><div class='add'>+	c = atomic64_read(v);</div><div class='add'>+	for (;;) {</div><div class='add'>+		dec = c - 1;</div><div class='add'>+		if (unlikely(dec &lt; 0))</div><div class='add'>+			break;</div><div class='add'>+		old = atomic64_cmpxchg((v), c, dec);</div><div class='add'>+		if (likely(old == c))</div><div class='add'>+			break;</div><div class='add'>+		c = old;</div><div class='add'>+	}</div><div class='add'>+		return dec;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define ATOMIC_OP(op)							\</div><div class='ctx'> static inline int atomic_fetch_##op(int i, atomic_t *v)			\</div><div class='ctx'> {									\</div><div class='head'>diff --git a/arch/frv/include/asm/dma-mapping.h b/arch/frv/include/asm/dma-mapping.h<br/>index 9a82bfa4303b..354900917585 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -7,9 +7,9 @@</div><div class='ctx'> extern unsigned long __nongprelbss dma_coherent_mem_start;</div><div class='ctx'> extern unsigned long __nongprelbss dma_coherent_mem_end;</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops frv_dma_ops;</div><div class='add'>+extern const struct dma_map_ops frv_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;frv_dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/frv/include/asm/futex.h b/arch/frv/include/asm/futex.h<br/>index 4bea27f50a7a..2e1da71e27a4 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/include/asm/futex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/include/asm/futex.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/include/asm/futex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/asm/futex.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/futex.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/include/asm/mutex.h b/arch/frv/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 458c1f7fbc18..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/frv/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pull in the generic implementation for the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='head'>diff --git a/arch/frv/include/asm/processor.h b/arch/frv/include/asm/processor.h<br/>index 73f0a79ad8e6..ddaeb9cc9143 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/asm/processor.h</a></div><div class='hunk'>@@ -107,7 +107,6 @@ unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define	KSTK_ESP(tsk)	((tsk)-&gt;thread.frame0-&gt;sp)</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax() barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> /* data cache prefetch */</div><div class='ctx'> #define ARCH_HAS_PREFETCH</div><div class='head'>diff --git a/arch/frv/include/uapi/asm/socket.h b/arch/frv/include/uapi/asm/socket.h<br/>index afbc98f02d27..81e03530ed39 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -90,5 +90,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		53</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	54</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_SOCKET_H */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c<br/>index 2239346fa3db..93513e4ccd2b 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/irq.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/pm-mb93093.c b/arch/frv/kernel/pm-mb93093.c<br/>index eaa7b582ef52..8358e34a3fad 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/kernel/pm-mb93093.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/kernel/pm-mb93093.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/kernel/pm-mb93093.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/pm-mb93093.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mb86943a.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c<br/>index ac767d94a880..051ccecbf7f1 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/kernel/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/kernel/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/kernel/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/pm.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mb86943a.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c<br/>index 5d40aeb7712e..5a4c92abc99e 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/process.c</a></div><div class='hunk'>@@ -13,6 +13,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -28,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/ptrace.c b/arch/frv/kernel/ptrace.c<br/>index 3987ff88dab0..49768401ce0f 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/ptrace.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c<br/>index 82d5e914dc15..bf6e07a7a1b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/signal.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEBUG_SIG 0</div><div class='head'>diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c<br/>index 9c4980825bbb..f80cc8b9bd45 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/kernel/sys_frv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/kernel/sys_frv.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/kernel/sys_frv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/sys_frv.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/ipc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,</div><div class='ctx'> 			  unsigned long prot, unsigned long flags,</div><div class='head'>diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c<br/>index f4dfae2c75ad..b54a64971cf1 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/kernel/sysctl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/kernel/sysctl.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/kernel/sysctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/sysctl.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const char frv_cache_wback[] = "wback";</div><div class='ctx'> static const char frv_cache_wthru[] = "wthru";</div><div class='head'>diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c<br/>index a6d105d61b26..ce29991e4219 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/traps.c</a></div><div class='hunk'>@@ -9,7 +9,8 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -23,7 +24,7 @@</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/siginfo.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/uaccess.c b/arch/frv/kernel/uaccess.c<br/>index 374f88d6cc00..8b360b4222a5 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/kernel/uaccess.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/kernel/uaccess.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/kernel/uaccess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/kernel/uaccess.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-dma-nommu.c b/arch/frv/mb93090-mb00/pci-dma-nommu.c<br/>index 90f2e4cb33d6..4a96de7f0af4 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/mb93090-mb00/pci-dma-nommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/mb93090-mb00/pci-dma-nommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/mb93090-mb00/pci-dma-nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mb93090-mb00/pci-dma-nommu.c</a></div><div class='hunk'>@@ -109,16 +109,19 @@ static int frv_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 		int nents, enum dma_data_direction direction,</div><div class='ctx'> 		unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	BUG_ON(direction == DMA_NONE);</div><div class='add'>+</div><div class='add'>+	if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+		return nents;</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(sglist, sg, nents, i) {</div><div class='ctx'> 		frv_cache_wback_inv(sg_dma_address(sg),</div><div class='ctx'> 				    sg_dma_address(sg) + sg_dma_len(sg));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BUG_ON(direction == DMA_NONE);</div><div class='del'>-</div><div class='ctx'> 	return nents;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -127,7 +130,10 @@ static dma_addr_t frv_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 		enum dma_data_direction direction, unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(direction == DMA_NONE);</div><div class='del'>-	flush_dcache_page(page);</div><div class='add'>+</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		flush_dcache_page(page);</div><div class='add'>+</div><div class='ctx'> 	return (dma_addr_t) page_to_phys(page) + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +164,7 @@ static int frv_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops frv_dma_ops = {</div><div class='add'>+const struct dma_map_ops frv_dma_ops = {</div><div class='ctx'> 	.alloc			= frv_dma_alloc,</div><div class='ctx'> 	.free			= frv_dma_free,</div><div class='ctx'> 	.map_page		= frv_dma_map_page,</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-dma.c b/arch/frv/mb93090-mb00/pci-dma.c<br/>index f585745b1abc..e7130abc0dae 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/mb93090-mb00/pci-dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/mb93090-mb00/pci-dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/mb93090-mb00/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mb93090-mb00/pci-dma.c</a></div><div class='hunk'>@@ -40,13 +40,16 @@ static int frv_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 		int nents, enum dma_data_direction direction,</div><div class='ctx'> 		unsigned long attrs)</div><div class='ctx'> {</div><div class='add'>+	struct scatterlist *sg;</div><div class='ctx'> 	unsigned long dampr2;</div><div class='ctx'> 	void *vaddr;</div><div class='ctx'> 	int i;</div><div class='del'>-	struct scatterlist *sg;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(direction == DMA_NONE);</div><div class='ctx'> </div><div class='add'>+	if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+		return nents;</div><div class='add'>+</div><div class='ctx'> 	dampr2 = __get_DAMPR(2);</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(sglist, sg, nents, i) {</div><div class='hunk'>@@ -70,7 +73,9 @@ static dma_addr_t frv_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 		unsigned long offset, size_t size,</div><div class='ctx'> 		enum dma_data_direction direction, unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	flush_dcache_page(page);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		flush_dcache_page(page);</div><div class='add'>+</div><div class='ctx'> 	return (dma_addr_t) page_to_phys(page) + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +106,7 @@ static int frv_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops frv_dma_ops = {</div><div class='add'>+const struct dma_map_ops frv_dma_ops = {</div><div class='ctx'> 	.alloc			= frv_dma_alloc,</div><div class='ctx'> 	.free			= frv_dma_free,</div><div class='ctx'> 	.map_page		= frv_dma_map_page,</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c<br/>index 34bb4b13e079..c452ddb5620f 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/mb93090-mb00/pci-frv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/mb93090-mb00/pci-frv.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/mb93090-mb00/pci-frv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mb93090-mb00/pci-frv.c</a></div><div class='hunk'>@@ -147,7 +147,7 @@ static void __init pcibios_allocate_resources(int pass)</div><div class='ctx'> static void __init pcibios_assign_resources(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = NULL;</div><div class='del'>-	int idx;</div><div class='add'>+	int idx, err;</div><div class='ctx'> 	struct resource *r;</div><div class='ctx'> </div><div class='ctx'> 	for_each_pci_dev(dev) {</div><div class='hunk'>@@ -172,8 +172,13 @@ static void __init pcibios_assign_resources(void)</div><div class='ctx'> 			 *  the BIOS forgot to do so or because we have decided the old</div><div class='ctx'> 			 *  address was unusable for some reason.</div><div class='ctx'> 			 */</div><div class='del'>-			if (!r-&gt;start &amp;&amp; r-&gt;end)</div><div class='del'>-				pci_assign_resource(dev, idx);</div><div class='add'>+			if (!r-&gt;start &amp;&amp; r-&gt;end) {</div><div class='add'>+				err = pci_assign_resource(dev, idx);</div><div class='add'>+				if (err)</div><div class='add'>+					dev_err(&amp;dev-&gt;dev,</div><div class='add'>+						"Failed to assign new address to %d\n",</div><div class='add'>+						idx);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/frv/mm/dma-alloc.c b/arch/frv/mm/dma-alloc.c<br/>index 7a73aaeae3ac..e701aa9e6a14 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/mm/dma-alloc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/mm/dma-alloc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/mm/dma-alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mm/dma-alloc.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int map_page(unsigned long va, unsigned long pa, pgprot_t prot)</div><div class='head'>diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c<br/>index 836f14707a62..da82c25301e7 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/mm/elf-fdpic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/mm/elf-fdpic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/mm/elf-fdpic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mm/elf-fdpic.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/elf-fdpic.h&gt;</div><div class='head'>diff --git a/arch/frv/mm/extable.c b/arch/frv/mm/extable.c<br/>index 8863d6c1df6e..a0e8b3e03e4c 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mm/extable.c</a></div><div class='hunk'>@@ -2,9 +2,9 @@</div><div class='ctx'>  * linux/arch/frv/mm/extable.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern const void __memset_end, __memset_user_error_lr, __memset_user_error_handler;</div><div class='ctx'> extern const void __memcpy_end, __memcpy_user_error_lr, __memcpy_user_error_handler;</div><div class='head'>diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c<br/>index 88a159743528..328f0a292316 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mm/init.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='head'>diff --git a/arch/frv/mm/mmu-context.c b/arch/frv/mm/mmu-context.c<br/>index 81757d55a5b5..16946a58f64d 100644<br/>--- a/<a href='/drm-misc/tree/arch/frv/mm/mmu-context.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/frv/mm/mmu-context.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/frv/mm/mmu-context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/frv/mm/mmu-context.c</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -188,7 +190,7 @@ int cxn_pin_by_pid(pid_t pid)</div><div class='ctx'> 		task_lock(tsk);</div><div class='ctx'> 		if (tsk-&gt;mm) {</div><div class='ctx'> 			mm = tsk-&gt;mm;</div><div class='del'>-			atomic_inc(&amp;mm-&gt;mm_users);</div><div class='add'>+			mmget(mm);</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		task_unlock(tsk);</div><div class='head'>diff --git a/arch/h8300/boot/compressed/misc.c b/arch/h8300/boot/compressed/misc.c<br/>index 9f64fe8f29ff..a947dbb4fd91 100644<br/>--- a/<a href='/drm-misc/tree/arch/h8300/boot/compressed/misc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/h8300/boot/compressed/misc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/h8300/boot/compressed/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/boot/compressed/misc.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * Adapted for h8300 by Yoshinori Sato 2006</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * gzip declarations</div><div class='head'>diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild<br/>index 373cb23301e3..341740c3581c 100644<br/>--- a/<a href='/drm-misc/tree/arch/h8300/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/h8300/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/h8300/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/include/asm/Kbuild</a></div><div class='hunk'>@@ -5,7 +5,6 @@ generic-y += bugs.h</div><div class='ctx'> generic-y += cacheflush.h</div><div class='ctx'> generic-y += checksum.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += delay.h</div><div class='ctx'> generic-y += device.h</div><div class='hunk'>@@ -75,3 +74,4 @@ generic-y += unaligned.h</div><div class='ctx'> generic-y += vga.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/h8300/include/asm/dma-mapping.h b/arch/h8300/include/asm/dma-mapping.h<br/>index 7ac7fadffed0..847c7562e046 100644<br/>--- a/<a href='/drm-misc/tree/arch/h8300/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/h8300/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/h8300/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> #ifndef _H8300_DMA_MAPPING_H</div><div class='ctx'> #define _H8300_DMA_MAPPING_H</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops h8300_dma_map_ops;</div><div class='add'>+extern const struct dma_map_ops h8300_dma_map_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;h8300_dma_map_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/h8300/include/asm/mutex.h b/arch/h8300/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 458c1f7fbc18..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/h8300/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/h8300/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pull in the generic implementation for the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='head'>diff --git a/arch/h8300/include/asm/processor.h b/arch/h8300/include/asm/processor.h<br/>index 111df7397ac7..65132d7ae9e5 100644<br/>--- a/<a href='/drm-misc/tree/arch/h8300/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/h8300/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/h8300/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/include/asm/processor.h</a></div><div class='hunk'>@@ -127,7 +127,6 @@ unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define	KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)-&gt;thread.usp)</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()    barrier()</div><div class='del'>-#define cpu_relax_lowlatency()	cpu_relax()</div><div class='ctx'> </div><div class='ctx'> #define HARD_RESET_NOW() ({		\</div><div class='ctx'> 	local_irq_disable();		\</div><div class='head'>diff --git a/arch/h8300/kernel/dma.c b/arch/h8300/kernel/dma.c<br/>index 3651da045806..225dd0a188dc 100644<br/>--- a/<a href='/drm-misc/tree/arch/h8300/kernel/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/h8300/kernel/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/h8300/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/kernel/dma.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@ static int map_sg(struct device *dev, struct scatterlist *sgl,</div><div class='ctx'> 	return nents;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops h8300_dma_map_ops = {</div><div class='add'>+const struct dma_map_ops h8300_dma_map_ops = {</div><div class='ctx'> 	.alloc = dma_alloc,</div><div class='ctx'> 	.free = dma_free,</div><div class='ctx'> 	.map_page = map_page,</div><div class='head'>diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c<br/>index dee41256922c..0f5db5bb561b 100644<br/>--- a/<a href='/drm-misc/tree/arch/h8300/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/h8300/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/h8300/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/kernel/process.c</a></div><div class='hunk'>@@ -25,6 +25,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -38,7 +41,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/h8300/kernel/ptrace_s.c b/arch/h8300/kernel/ptrace_s.c<br/>index ef5a9c13e76d..c0af930052c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/h8300/kernel/ptrace_s.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/h8300/kernel/ptrace_s.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/h8300/kernel/ptrace_s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/kernel/ptrace_s.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c<br/>index 7138303cbbf2..1e8070d08770 100644<br/>--- a/<a href='/drm-misc/tree/arch/h8300/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/h8300/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/h8300/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/kernel/signal.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -41,7 +42,7 @@</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='head'>diff --git a/arch/h8300/kernel/traps.c b/arch/h8300/kernel/traps.c<br/>index 044a36125846..e47a9e0dc278 100644<br/>--- a/<a href='/drm-misc/tree/arch/h8300/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/h8300/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/h8300/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/h8300/kernel/traps.c</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild<br/>index db8ddabc6bd2..797b64a4b80b 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/include/asm/Kbuild</a></div><div class='hunk'>@@ -6,7 +6,6 @@ generic-y += barrier.h</div><div class='ctx'> generic-y += bug.h</div><div class='ctx'> generic-y += bugs.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += div64.h</div><div class='hunk'>@@ -60,3 +59,4 @@ generic-y += unaligned.h</div><div class='ctx'> generic-y += vga.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/hexagon/include/asm/dma-mapping.h b/arch/hexagon/include/asm/dma-mapping.h<br/>index 7ef58df909fc..d3a87bd9b686 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -32,13 +32,10 @@ struct device;</div><div class='ctx'> extern int bad_dma_address;</div><div class='ctx'> #define DMA_ERROR_CODE bad_dma_address</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops *dma_ops;</div><div class='add'>+extern const struct dma_map_ops *dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(dev == NULL))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='ctx'> 	return dma_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/hexagon/include/asm/mmu_context.h b/arch/hexagon/include/asm/mmu_context.h<br/>index d423d2e73c30..d8a071afdd1d 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -21,6 +21,8 @@</div><div class='ctx'> #ifndef _ASM_MMU_CONTEXT_H</div><div class='ctx'> #define _ASM_MMU_CONTEXT_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='head'>diff --git a/arch/hexagon/include/asm/mutex.h b/arch/hexagon/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 58b52de1bc22..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pull in the generic implementation for the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-#include &lt;asm-generic/mutex-xchg.h&gt;</div><div class='head'>diff --git a/arch/hexagon/include/asm/processor.h b/arch/hexagon/include/asm/processor.h<br/>index d8501137c8d0..45a825402f63 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/include/asm/processor.h</a></div><div class='hunk'>@@ -56,7 +56,6 @@ struct thread_struct {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax() __vmyield()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Decides where the kernel will search for a free chunk of vm space during</div><div class='head'>diff --git a/arch/hexagon/kernel/dma.c b/arch/hexagon/kernel/dma.c<br/>index b9017785fb71..e74b65009587 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/kernel/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/kernel/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/dma.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *dma_ops;</div><div class='add'>+const struct dma_map_ops *dma_ops;</div><div class='ctx'> EXPORT_SYMBOL(dma_ops);</div><div class='ctx'> </div><div class='ctx'> int bad_dma_address;  /*  globals are automatically initialized to zero  */</div><div class='hunk'>@@ -119,6 +119,9 @@ static int hexagon_map_sg(struct device *hwdev, struct scatterlist *sg,</div><div class='ctx'> </div><div class='ctx'> 		s-&gt;dma_length = s-&gt;length;</div><div class='ctx'> </div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		flush_dcache_range(dma_addr_to_virt(s-&gt;dma_address),</div><div class='ctx'> 				   dma_addr_to_virt(s-&gt;dma_address + s-&gt;length));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -180,7 +183,8 @@ static dma_addr_t hexagon_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 	if (!check_addr("map_single", dev, bus, size))</div><div class='ctx'> 		return bad_dma_address;</div><div class='ctx'> </div><div class='del'>-	dma_sync(dma_addr_to_virt(bus), size, dir);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		dma_sync(dma_addr_to_virt(bus), size, dir);</div><div class='ctx'> </div><div class='ctx'> 	return bus;</div><div class='ctx'> }</div><div class='hunk'>@@ -199,7 +203,7 @@ static void hexagon_sync_single_for_device(struct device *dev,</div><div class='ctx'> 	dma_sync(dma_addr_to_virt(dma_handle), size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops hexagon_dma_ops = {</div><div class='add'>+const struct dma_map_ops hexagon_dma_ops = {</div><div class='ctx'> 	.alloc		= hexagon_dma_alloc_coherent,</div><div class='ctx'> 	.free		= hexagon_free_coherent,</div><div class='ctx'> 	.map_sg		= hexagon_map_sg,</div><div class='head'>diff --git a/arch/hexagon/kernel/hexagon_ksyms.c b/arch/hexagon/kernel/hexagon_ksyms.c<br/>index c041d8ecb1e2..af9dec4c28eb 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/kernel/hexagon_ksyms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/kernel/hexagon_ksyms.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/kernel/hexagon_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/hexagon_ksyms.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;asm/hexagon_vm.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Additional functions */</div><div class='ctx'> EXPORT_SYMBOL(__clear_user_hexagon);</div><div class='head'>diff --git a/arch/hexagon/kernel/kgdb.c b/arch/hexagon/kernel/kgdb.c<br/>index 62dece3ad827..16c24b22d0b2 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/kernel/kgdb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/kernel/kgdb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/kgdb.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/kgdb.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/hexagon/kernel/process.c b/arch/hexagon/kernel/process.c<br/>index d9edfd3fc52a..de715bab7956 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/process.c</a></div><div class='hunk'>@@ -19,6 +19,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='head'>diff --git a/arch/hexagon/kernel/ptrace.c b/arch/hexagon/kernel/ptrace.c<br/>index 390a9ad14ca1..ecd75e2e8eb3 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/ptrace.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/hexagon/kernel/signal.c b/arch/hexagon/kernel/signal.c<br/>index b039a624c170..78aa7304a5c9 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/signal.c</a></div><div class='hunk'>@@ -21,10 +21,12 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/registers.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='head'>diff --git a/arch/hexagon/kernel/smp.c b/arch/hexagon/kernel/smp.c<br/>index 983bae7d2665..5dbc15549e01 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/smp.c</a></div><div class='hunk'>@@ -25,10 +25,11 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/time.h&gt;    /*  timer_interrupt  */</div><div class='ctx'> #include &lt;asm/hexagon_vm.h&gt;</div><div class='hunk'>@@ -162,7 +163,7 @@ void start_secondary(void)</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='ctx'> 	/*  Set the memory struct  */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> </div><div class='ctx'> 	cpu = smp_processor_id();</div><div class='head'>diff --git a/arch/hexagon/kernel/stacktrace.c b/arch/hexagon/kernel/stacktrace.c<br/>index f94918b449a8..41866a06adf7 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/stacktrace.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/hexagon/kernel/time.c b/arch/hexagon/kernel/time.c<br/>index a6a1d1f8309a..ff4e9bf995e9 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/time.c</a></div><div class='hunk'>@@ -72,9 +72,9 @@ struct adsp_hw_timer_struct {</div><div class='ctx'> /*  Look for "TCX0" for related constants.  */</div><div class='ctx'> static __iomem struct adsp_hw_timer_struct *rtos_timer;</div><div class='ctx'> </div><div class='del'>-static cycle_t timer_get_cycles(struct clocksource *cs)</div><div class='add'>+static u64 timer_get_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t) __vmgettime();</div><div class='add'>+	return (u64) __vmgettime();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource hexagon_clocksource = {</div><div class='head'>diff --git a/arch/hexagon/kernel/traps.c b/arch/hexagon/kernel/traps.c<br/>index 110dab152f82..2942a9204a9a 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/traps.c</a></div><div class='hunk'>@@ -19,7 +19,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='head'>diff --git a/arch/hexagon/kernel/vm_events.c b/arch/hexagon/kernel/vm_events.c<br/>index 741aaa917cda..04f57ef22009 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/kernel/vm_events.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/kernel/vm_events.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/kernel/vm_events.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/kernel/vm_events.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;asm/registers.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='head'>diff --git a/arch/hexagon/mm/uaccess.c b/arch/hexagon/mm/uaccess.c<br/>index 34127261c2b7..ec90afdb3ad0 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/mm/uaccess.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/mm/uaccess.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/mm/uaccess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/mm/uaccess.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'>  * we implement here as subroutines.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/hexagon/mm/vm_fault.c b/arch/hexagon/mm/vm_fault.c<br/>index bd7c251e2bce..3eec33c5cfd7 100644<br/>--- a/<a href='/drm-misc/tree/arch/hexagon/mm/vm_fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/hexagon/mm/vm_fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/hexagon/mm/vm_fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/hexagon/mm/vm_fault.c</a></div><div class='hunk'>@@ -26,10 +26,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c<br/>index 1e4cae5ae053..0310078a95f8 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/hp/common/hwsw_iommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/hp/common/hwsw_iommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/hp/common/hwsw_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/hp/common/hwsw_iommu.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;</div><div class='add'>+extern const struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;</div><div class='ctx'> </div><div class='ctx'> /* swiotlb declarations &amp; definitions: */</div><div class='ctx'> extern int swiotlb_late_init_with_default_size (size_t size);</div><div class='hunk'>@@ -34,7 +34,7 @@ static inline int use_swiotlb(struct device *dev)</div><div class='ctx'> 		!sba_dma_ops.dma_supported(dev, *dev-&gt;dma_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)</div><div class='add'>+const struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (use_swiotlb(dev))</div><div class='ctx'> 		return &amp;swiotlb_dma_ops;</div><div class='head'>diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c<br/>index 630ee8073899..aec4a3354abe 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/hp/common/sba_iommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/hp/common/sba_iommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/hp/common/sba_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/hp/common/sba_iommu.c</a></div><div class='hunk'>@@ -2096,7 +2096,7 @@ static int __init acpi_sba_ioc_init_acpi(void)</div><div class='ctx'> /* This has to run before acpi_scan_init(). */</div><div class='ctx'> arch_initcall(acpi_sba_ioc_init_acpi);</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops swiotlb_dma_ops;</div><div class='add'>+extern const struct dma_map_ops swiotlb_dma_ops;</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='ctx'> sba_init(void)</div><div class='hunk'>@@ -2216,7 +2216,7 @@ sba_page_override(char *str)</div><div class='ctx'> </div><div class='ctx'> __setup("sbapagesize=",sba_page_override);</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops sba_dma_ops = {</div><div class='add'>+const struct dma_map_ops sba_dma_ops = {</div><div class='ctx'> 	.alloc			= sba_alloc_coherent,</div><div class='ctx'> 	.free			= sba_free_coherent,</div><div class='ctx'> 	.map_page		= sba_map_page,</div><div class='head'>diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c<br/>index 21fd50def270..de8cba121013 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/hp/sim/simserial.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/hp/sim/simserial.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/hp/sim/simserial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/hp/sim/simserial.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/tty_flip.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='head'>diff --git a/arch/ia64/include/asm/cputime.h b/arch/ia64/include/asm/cputime.h<br/>index e2d3f5baf265..3d665c0627a8 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/cputime.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/cputime.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/cputime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/cputime.h</a></div><div class='hunk'>@@ -18,11 +18,7 @@</div><div class='ctx'> #ifndef __IA64_CPUTIME_H</div><div class='ctx'> #define __IA64_CPUTIME_H</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE</div><div class='del'>-# include &lt;asm-generic/cputime.h&gt;</div><div class='del'>-#else</div><div class='del'>-# include &lt;asm/processor.h&gt;</div><div class='del'>-# include &lt;asm-generic/cputime_nsecs.h&gt;</div><div class='add'>+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE</div><div class='ctx'> extern void arch_vtime_task_switch(struct task_struct *tsk);</div><div class='ctx'> #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h<br/>index d472805edfa9..73ec3c6f4cfe 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DMA_ERROR_CODE 0</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops *dma_ops;</div><div class='add'>+extern const struct dma_map_ops *dma_ops;</div><div class='ctx'> extern struct ia64_machine_vector ia64_mv;</div><div class='ctx'> extern void set_iommu_machvec(void);</div><div class='ctx'> </div><div class='hunk'>@@ -23,7 +23,10 @@ extern void machvec_dma_sync_single(struct device *, dma_addr_t, size_t,</div><div class='ctx'> extern void machvec_dma_sync_sg(struct device *, struct scatterlist *, int,</div><div class='ctx'> 				enum dma_data_direction);</div><div class='ctx'> </div><div class='del'>-#define get_dma_ops(dev) platform_dma_get_ops(dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='add'>+{</div><div class='add'>+	return platform_dma_get_ops(NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/ia64/include/asm/exception.h b/arch/ia64/include/asm/exception.h<br/>new file mode 100644<br/>index 000000000000..6bb246dcdaeb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/exception.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/exception.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+#ifndef __ASM_EXCEPTION_H</div><div class='add'>+#define __ASM_EXCEPTION_H</div><div class='add'>+</div><div class='add'>+struct pt_regs;</div><div class='add'>+struct exception_table_entry;</div><div class='add'>+</div><div class='add'>+extern void ia64_handle_exception(struct pt_regs *regs,</div><div class='add'>+				  const struct exception_table_entry *e);</div><div class='add'>+</div><div class='add'>+#define ia64_done_with_exception(regs)					  \</div><div class='add'>+({									  \</div><div class='add'>+	int __ex_ret = 0;						  \</div><div class='add'>+	const struct exception_table_entry *e;				  \</div><div class='add'>+	e = search_exception_tables((regs)-&gt;cr_iip + ia64_psr(regs)-&gt;ri); \</div><div class='add'>+	if (e) {							  \</div><div class='add'>+		ia64_handle_exception(regs, e);				  \</div><div class='add'>+		__ex_ret = 1;						  \</div><div class='add'>+	}								  \</div><div class='add'>+	__ex_ret;							  \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#endif	/* __ASM_EXCEPTION_H */</div><div class='head'>diff --git a/arch/ia64/include/asm/kprobes.h b/arch/ia64/include/asm/kprobes.h<br/>index d5505d6f2382..0302b3664789 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/kprobes.h</a></div><div class='hunk'>@@ -23,14 +23,19 @@</div><div class='ctx'>  * 2005-Apr     Rusty Lynch &lt;rusty.lynch@intel.com&gt; and Anil S Keshavamurthy</div><div class='ctx'>  *              &lt;anil.s.keshavamurthy@intel.com&gt; adapted from i386</div><div class='ctx'>  */</div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+#include &lt;asm/break.h&gt;</div><div class='add'>+</div><div class='add'>+#define BREAK_INST	(long)(__IA64_BREAK_KPROBE &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;asm/break.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __ARCH_WANT_KPROBES_INSN_SLOT</div><div class='ctx'> #define MAX_INSN_SIZE   2	/* last half is for kprobe-booster */</div><div class='del'>-#define BREAK_INST	(long)(__IA64_BREAK_KPROBE &lt;&lt; 6)</div><div class='ctx'> #define NOP_M_INST	(long)(1&lt;&lt;27)</div><div class='ctx'> #define BRL_INST(i1, i2) ((long)((0xcL &lt;&lt; 37) |	/* brl */ \</div><div class='ctx'> 				(0x1L &lt;&lt; 12) |	/* many */ \</div><div class='hunk'>@@ -124,4 +129,5 @@ extern void invalidate_stacked_regs(void);</div><div class='ctx'> extern void flush_register_stack(void);</div><div class='ctx'> extern void arch_remove_kprobe(struct kprobe *p);</div><div class='ctx'> </div><div class='del'>-#endif				/* _ASM_KPROBES_H */</div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='add'>+#endif /* _ASM_KPROBES_H */</div><div class='head'>diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h<br/>index ed7f09089f12..af285c423e1e 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/machvec.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/machvec.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/machvec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/machvec.h</a></div><div class='hunk'>@@ -44,7 +44,7 @@ typedef void ia64_mv_kernel_launch_event_t(void);</div><div class='ctx'> /* DMA-mapping interface: */</div><div class='ctx'> typedef void ia64_mv_dma_init (void);</div><div class='ctx'> typedef u64 ia64_mv_dma_get_required_mask (struct device *);</div><div class='del'>-typedef struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);</div><div class='add'>+typedef const struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * WARNING: The legacy I/O space is _architected_.  Platforms are</div><div class='hunk'>@@ -248,7 +248,7 @@ extern void machvec_init_from_cmdline(const char *cmdline);</div><div class='ctx'> # endif /* CONFIG_IA64_GENERIC */</div><div class='ctx'> </div><div class='ctx'> extern void swiotlb_dma_init(void);</div><div class='del'>-extern struct dma_map_ops *dma_get_ops(struct device *);</div><div class='add'>+extern const struct dma_map_ops *dma_get_ops(struct device *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Define default versions so we can extend machvec for new platforms without having</div><div class='head'>diff --git a/arch/ia64/include/asm/mmu_context.h b/arch/ia64/include/asm/mmu_context.h<br/>index 7f2a456603cb..9b99368633b5 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/ia64/include/asm/mutex.h b/arch/ia64/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 28cb819e0ff9..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,90 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * ia64 implementation of the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2006 Ken Chen &lt;kenneth.w.chen@intel.com&gt;</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ASM_MUTEX_H</div><div class='del'>-#define _ASM_MUTEX_H</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  __mutex_fastpath_lock - try to take the lock by moving the count</div><div class='del'>- *                          from 1 to a 0 value</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *  @fail_fn: function to call if the original value was not 1</div><div class='del'>- *</div><div class='del'>- * Change the count from 1 to a value lower than 1, and call &lt;fail_fn&gt; if</div><div class='del'>- * it wasn't 1 originally. This function MUST leave the value lower than</div><div class='del'>- * 1 even when the "1" assertion wasn't true.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-__mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	if (unlikely(ia64_fetchadd4_acq(count, -1) != 1))</div><div class='del'>-		fail_fn(count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  __mutex_fastpath_lock_retval - try to take the lock by moving the count</div><div class='del'>- *                                 from 1 to a 0 value</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *</div><div class='del'>- * Change the count from 1 to a value lower than 1. This function returns 0</div><div class='del'>- * if the fastpath succeeds, or -1 otherwise.</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-__mutex_fastpath_lock_retval(atomic_t *count)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(ia64_fetchadd4_acq(count, -1) != 1))</div><div class='del'>-		return -1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  __mutex_fastpath_unlock - try to promote the count from 0 to 1</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *  @fail_fn: function to call if the original value was not 0</div><div class='del'>- *</div><div class='del'>- * Try to promote the count from 0 to 1. If it wasn't 0, call &lt;fail_fn&gt;.</div><div class='del'>- * In the failure case, this function is allowed to either set the value to</div><div class='del'>- * 1, or to set it to a value lower than 1.</div><div class='del'>- *</div><div class='del'>- * If the implementation sets it to a value of lower than 1, then the</div><div class='del'>- * __mutex_slowpath_needs_to_unlock() macro needs to return 1, it needs</div><div class='del'>- * to return 0 otherwise.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-__mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	int ret = ia64_fetchadd4_rel(count, 1);</div><div class='del'>-	if (unlikely(ret &lt; 0))</div><div class='del'>-		fail_fn(count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define __mutex_slowpath_needs_to_unlock()		1</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __mutex_fastpath_trylock - try to acquire the mutex, without waiting</div><div class='del'>- *</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *  @fail_fn: fallback function</div><div class='del'>- *</div><div class='del'>- * Change the count from 1 to a value lower than 1, and return 0 (failure)</div><div class='del'>- * if it wasn't 1 originally, or return 1 (success) otherwise. This function</div><div class='del'>- * MUST leave the value lower than 1 even when the "1" assertion wasn't true.</div><div class='del'>- * Additionally, if the value was &lt; 0 originally, this function must not leave</div><div class='del'>- * it to 0 on failure.</div><div class='del'>- *</div><div class='del'>- * If the architecture has no effective trylock variant, it should call the</div><div class='del'>- * &lt;fail_fn&gt; spinlock-based trylock variant unconditionally.</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-__mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	if (atomic_read(count) == 1 &amp;&amp; cmpxchg_acq(count, 1, 0) == 1)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/ia64/include/asm/numa.h b/arch/ia64/include/asm/numa.h<br/>index 2db0a6c6daa5..ebef7f40aabb 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/numa.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/numa.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/numa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/numa.h</a></div><div class='hunk'>@@ -65,6 +65,8 @@ extern int paddr_to_nid(unsigned long paddr);</div><div class='ctx'> </div><div class='ctx'> #define local_nodeid (cpu_to_node_map[smp_processor_id()])</div><div class='ctx'> </div><div class='add'>+#define numa_off     0</div><div class='add'>+</div><div class='ctx'> extern void map_cpu_to_node(int cpu, int nid);</div><div class='ctx'> extern void unmap_cpu_from_node(int cpu, int nid);</div><div class='ctx'> extern void numa_clear_node(int cpu);</div><div class='head'>diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h<br/>index 9f3ed9ee8f13..384794e665fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/pgtable.h</a></div><div class='hunk'>@@ -147,7 +147,7 @@</div><div class='ctx'> </div><div class='ctx'> # ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;	/* for mm_struct */</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;	/* for mm_struct */</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='head'>diff --git a/arch/ia64/include/asm/processor.h b/arch/ia64/include/asm/processor.h<br/>index ce53c50d0ba4..26a63d69c599 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/processor.h</a></div><div class='hunk'>@@ -19,8 +19,6 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/ustack.h&gt;</div><div class='ctx'> </div><div class='del'>-#define ARCH_HAS_PREFETCH_SWITCH_STACK</div><div class='del'>-</div><div class='ctx'> #define IA64_NUM_PHYS_STACK_REG	96</div><div class='ctx'> #define IA64_NUM_DBG_REGS	8</div><div class='ctx'> </div><div class='hunk'>@@ -547,7 +545,6 @@ ia64_eoi (void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()	ia64_hint(ia64_hint_pause)</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> ia64_get_irr(unsigned int vector)</div><div class='head'>diff --git a/arch/ia64/include/asm/thread_info.h b/arch/ia64/include/asm/thread_info.h<br/>index c7026429816b..8742d741d19a 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/thread_info.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/thread_info.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/thread_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/thread_info.h</a></div><div class='hunk'>@@ -27,6 +27,12 @@ struct thread_info {</div><div class='ctx'> 	mm_segment_t addr_limit;	/* user-level address space limit */</div><div class='ctx'> 	int preempt_count;		/* 0=premptable, &lt;0=BUG; will also serve as bh-counter */</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE</div><div class='add'>+	__u64 utime;</div><div class='add'>+	__u64 stime;</div><div class='add'>+	__u64 gtime;</div><div class='add'>+	__u64 hardirq_time;</div><div class='add'>+	__u64 softirq_time;</div><div class='add'>+	__u64 idle_time;</div><div class='ctx'> 	__u64 ac_stamp;</div><div class='ctx'> 	__u64 ac_leave;</div><div class='ctx'> 	__u64 ac_stime;</div><div class='head'>diff --git a/arch/ia64/include/asm/tlb.h b/arch/ia64/include/asm/tlb.h<br/>index 77e541cf0e5d..fced197b9626 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/tlb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/tlb.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/tlb.h</a></div><div class='hunk'>@@ -207,15 +207,15 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)</div><div class='ctx'>  */</div><div class='ctx'> static inline bool __tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='ctx'> {</div><div class='del'>-	if (tlb-&gt;nr == tlb-&gt;max)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='ctx'> 	tlb-&gt;need_flush = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (!tlb-&gt;nr &amp;&amp; tlb-&gt;pages == tlb-&gt;local)</div><div class='ctx'> 		__tlb_alloc_page(tlb);</div><div class='ctx'> </div><div class='ctx'> 	tlb-&gt;pages[tlb-&gt;nr++] = page;</div><div class='add'>+	VM_WARN_ON(tlb-&gt;nr &gt; tlb-&gt;max);</div><div class='add'>+	if (tlb-&gt;nr == tlb-&gt;max)</div><div class='add'>+		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -236,10 +236,8 @@ static inline void tlb_flush_mmu(struct mmu_gather *tlb)</div><div class='ctx'> </div><div class='ctx'> static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='ctx'> {</div><div class='del'>-	if (__tlb_remove_page(tlb, page)) {</div><div class='add'>+	if (__tlb_remove_page(tlb, page))</div><div class='ctx'> 		tlb_flush_mmu(tlb);</div><div class='del'>-		__tlb_remove_page(tlb, page);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='hunk'>@@ -248,12 +246,6 @@ static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 	return __tlb_remove_page(tlb, page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool __tlb_remove_pte_page(struct mmu_gather *tlb,</div><div class='del'>-					 struct page *page)</div><div class='del'>-{</div><div class='del'>-	return __tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 					struct page *page, int page_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -283,6 +275,15 @@ do {							\</div><div class='ctx'> 	__tlb_remove_tlb_entry(tlb, ptep, addr);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\</div><div class='add'>+	tlb_remove_tlb_entry(tlb, ptep, address)</div><div class='add'>+</div><div class='add'>+#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='add'>+static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='add'>+						     unsigned int page_size)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define pte_free_tlb(tlb, ptep, address)		\</div><div class='ctx'> do {							\</div><div class='ctx'> 	tlb-&gt;need_flush = 1;				\</div><div class='head'>diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h<br/>index bfe13196f770..471044be2a3b 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/asm/uaccess.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/asm/uaccess.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/asm/uaccess.h</a></div><div class='hunk'>@@ -353,21 +353,6 @@ struct exception_table_entry {</div><div class='ctx'> 	int fixup;	/* location-relative continuation addr.; if bit 2 is set, r9 is set to 0 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern void ia64_handle_exception (struct pt_regs *regs, const struct exception_table_entry *e);</div><div class='del'>-extern const struct exception_table_entry *search_exception_tables (unsigned long addr);</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-ia64_done_with_exception (struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	const struct exception_table_entry *e;</div><div class='del'>-	e = search_exception_tables(regs-&gt;cr_iip + ia64_psr(regs)-&gt;ri);</div><div class='del'>-	if (e) {</div><div class='del'>-		ia64_handle_exception(regs, e);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define ARCH_HAS_TRANSLATE_MEM_PTR	1</div><div class='ctx'> static __inline__ void *</div><div class='ctx'> xlate_dev_mem_ptr(phys_addr_t p)</div><div class='head'>diff --git a/arch/ia64/include/uapi/asm/socket.h b/arch/ia64/include/uapi/asm/socket.h<br/>index 0018fad9039f..57feb0c1f7d7 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -99,4 +99,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		53</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	54</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_IA64_SOCKET_H */</div><div class='head'>diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c<br/>index 9273e034b730..7508c306aa9e 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/acpi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/acpi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/acpi.c</a></div><div class='hunk'>@@ -887,7 +887,8 @@ static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* wrapper to silence section mismatch warning */</div><div class='del'>-int __ref acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu)</div><div class='add'>+int __ref acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id,</div><div class='add'>+		       int *pcpu)</div><div class='ctx'> {</div><div class='ctx'> 	return _acpi_map_lsapic(handle, physid, pcpu);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c<br/>index 60ef83e6db71..8786c8b4f187 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/asm-offsets.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/asm-offsets.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #define ASM_OFFSETS_C 1</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/pid.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/kbuild.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/brl_emu.c b/arch/ia64/kernel/brl_emu.c<br/>index 0b286ca164f9..987b11be0021 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/brl_emu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/brl_emu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/brl_emu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/brl_emu.c</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern char ia64_set_b1, ia64_set_b2, ia64_set_b3, ia64_set_b4, ia64_set_b5;</div><div class='head'>diff --git a/arch/ia64/kernel/crash_dump.c b/arch/ia64/kernel/crash_dump.c<br/>index c8c9298666fb..9c12b794e774 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/crash_dump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/crash_dump.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/crash_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/crash_dump.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * copy_oldmem_page - copy one page from "oldmem"</div><div class='head'>diff --git a/arch/ia64/kernel/cyclone.c b/arch/ia64/kernel/cyclone.c<br/>index 5fa3848ba224..ee1a4afbf9da 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/cyclone.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/cyclone.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/cyclone.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/cyclone.c</a></div><div class='hunk'>@@ -21,9 +21,9 @@ void __init cyclone_setup(void)</div><div class='ctx'> </div><div class='ctx'> static void __iomem *cyclone_mc;</div><div class='ctx'> </div><div class='del'>-static cycle_t read_cyclone(struct clocksource *cs)</div><div class='add'>+static u64 read_cyclone(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)readq((void __iomem *)cyclone_mc);</div><div class='add'>+	return (u64)readq((void __iomem *)cyclone_mc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource clocksource_cyclone = {</div><div class='head'>diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c<br/>index 7f7916238208..e0dd97f4eb69 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/dma-mapping.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/dma-mapping.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/dma-mapping.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> /* Set this to 1 if there is a HW IOMMU in the system */</div><div class='ctx'> int iommu_detected __read_mostly;</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *dma_ops;</div><div class='add'>+const struct dma_map_ops *dma_ops;</div><div class='ctx'> EXPORT_SYMBOL(dma_ops);</div><div class='ctx'> </div><div class='ctx'> #define PREALLOC_DMA_DEBUG_ENTRIES (1 &lt;&lt; 16)</div><div class='hunk'>@@ -17,7 +17,7 @@ static int __init dma_init(void)</div><div class='ctx'> }</div><div class='ctx'> fs_initcall(dma_init);</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *dma_get_ops(struct device *dev)</div><div class='add'>+const struct dma_map_ops *dma_get_ops(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S<br/>index 6f27a663177c..e7a716b09350 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/entry.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/entry.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/entry.S</a></div><div class='hunk'>@@ -455,29 +455,6 @@ GLOBAL_ENTRY(load_switch_stack)</div><div class='ctx'> 	br.cond.sptk.many b7</div><div class='ctx'> END(load_switch_stack)</div><div class='ctx'> </div><div class='del'>-GLOBAL_ENTRY(prefetch_stack)</div><div class='del'>-	add r14 = -IA64_SWITCH_STACK_SIZE, sp</div><div class='del'>-	add r15 = IA64_TASK_THREAD_KSP_OFFSET, in0</div><div class='del'>-	;;</div><div class='del'>-	ld8 r16 = [r15]				// load next's stack pointer</div><div class='del'>-	lfetch.fault.excl [r14], 128</div><div class='del'>-	;;</div><div class='del'>-	lfetch.fault.excl [r14], 128</div><div class='del'>-	lfetch.fault [r16], 128</div><div class='del'>-	;;</div><div class='del'>-	lfetch.fault.excl [r14], 128</div><div class='del'>-	lfetch.fault [r16], 128</div><div class='del'>-	;;</div><div class='del'>-	lfetch.fault.excl [r14], 128</div><div class='del'>-	lfetch.fault [r16], 128</div><div class='del'>-	;;</div><div class='del'>-	lfetch.fault.excl [r14], 128</div><div class='del'>-	lfetch.fault [r16], 128</div><div class='del'>-	;;</div><div class='del'>-	lfetch.fault [r16], 128</div><div class='del'>-	br.ret.sptk.many rp</div><div class='del'>-END(prefetch_stack)</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Invoke a system call, but do some tracing before and after the call.</div><div class='ctx'> 	 * We MUST preserve the current register frame throughout this routine</div><div class='head'>diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c<br/>index 5ed0ea92c5bf..85bba43e7d5d 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/err_inject.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/err_inject.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/err_inject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/err_inject.c</a></div><div class='hunk'>@@ -224,85 +224,45 @@ static struct attribute_group err_inject_attr_group = {</div><div class='ctx'> 	.name = "err_inject"</div><div class='ctx'> };</div><div class='ctx'> /* Add/Remove err_inject interface for CPU device */</div><div class='del'>-static int err_inject_add_dev(struct device *sys_dev)</div><div class='add'>+static int err_inject_add_dev(unsigned int cpu)</div><div class='ctx'> {</div><div class='add'>+	struct device *sys_dev = get_cpu_device(cpu);</div><div class='add'>+</div><div class='ctx'> 	return sysfs_create_group(&amp;sys_dev-&gt;kobj, &amp;err_inject_attr_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int err_inject_remove_dev(struct device *sys_dev)</div><div class='add'>+static int err_inject_remove_dev(unsigned int cpu)</div><div class='ctx'> {</div><div class='add'>+	struct device *sys_dev = get_cpu_device(cpu);</div><div class='add'>+</div><div class='ctx'> 	sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;err_inject_attr_group);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static int err_inject_cpu_callback(struct notifier_block *nfb,</div><div class='del'>-		unsigned long action, void *hcpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	struct device *sys_dev;</div><div class='del'>-</div><div class='del'>-	sys_dev = get_cpu_device(cpu);</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-	case CPU_ONLINE_FROZEN:</div><div class='del'>-		err_inject_add_dev(sys_dev);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-	case CPU_DEAD_FROZEN:</div><div class='del'>-		err_inject_remove_dev(sys_dev);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NOTIFY_OK;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static struct notifier_block err_inject_cpu_notifier =</div><div class='del'>-{</div><div class='del'>-	.notifier_call = err_inject_cpu_callback,</div><div class='del'>-};</div><div class='add'>+static enum cpuhp_state hp_online;</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='del'>-err_inject_init(void)</div><div class='add'>+static int __init err_inject_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='add'>+	int ret;</div><div class='ctx'> #ifdef ERR_INJ_DEBUG</div><div class='ctx'> 	printk(KERN_INFO "Enter error injection driver.\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='del'>-	for_each_online_cpu(i) {</div><div class='del'>-		err_inject_cpu_callback(&amp;err_inject_cpu_notifier, CPU_ONLINE,</div><div class='del'>-				(void *)(long)i);</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "ia64/err_inj:online",</div><div class='add'>+				err_inject_add_dev, err_inject_remove_dev);</div><div class='add'>+	if (ret &gt;= 0) {</div><div class='add'>+		hp_online = ret;</div><div class='add'>+		ret = 0;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	__register_hotcpu_notifier(&amp;err_inject_cpu_notifier);</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit</div><div class='del'>-err_inject_exit(void)</div><div class='add'>+static void __exit err_inject_exit(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	struct device *sys_dev;</div><div class='del'>-</div><div class='ctx'> #ifdef ERR_INJ_DEBUG</div><div class='ctx'> 	printk(KERN_INFO "Exit error injection driver.\n");</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='del'>-	for_each_online_cpu(i) {</div><div class='del'>-		sys_dev = get_cpu_device(i);</div><div class='del'>-		sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;err_inject_attr_group);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__unregister_hotcpu_notifier(&amp;err_inject_cpu_notifier);</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_done();</div><div class='add'>+	cpuhp_remove_state(hp_online);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(err_inject_init);</div><div class='head'>diff --git a/arch/ia64/kernel/fsyscall_gtod_data.h b/arch/ia64/kernel/fsyscall_gtod_data.h<br/>index 146b15b5fec3..dcc514917731 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/fsyscall_gtod_data.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/fsyscall_gtod_data.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/fsyscall_gtod_data.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/fsyscall_gtod_data.h</a></div><div class='hunk'>@@ -9,15 +9,15 @@ struct fsyscall_gtod_data_t {</div><div class='ctx'> 	seqcount_t	seq;</div><div class='ctx'> 	struct timespec	wall_time;</div><div class='ctx'> 	struct timespec monotonic_time;</div><div class='del'>-	cycle_t		clk_mask;</div><div class='add'>+	u64		clk_mask;</div><div class='ctx'> 	u32		clk_mult;</div><div class='ctx'> 	u32		clk_shift;</div><div class='ctx'> 	void		*clk_fsys_mmio;</div><div class='del'>-	cycle_t		clk_cycle_last;</div><div class='add'>+	u64		clk_cycle_last;</div><div class='ctx'> } ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> struct itc_jitter_data_t {</div><div class='ctx'> 	int		itc_jitter;</div><div class='del'>-	cycle_t		itc_lastcycle;</div><div class='add'>+	u64		itc_lastcycle;</div><div class='ctx'> } ____cacheline_aligned;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S<br/>index c9b5e942f671..3204fddc439c 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/head.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/head.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/head.S</a></div><div class='hunk'>@@ -1031,7 +1031,7 @@ GLOBAL_ENTRY(ia64_native_sched_clock)</div><div class='ctx'> END(ia64_native_sched_clock)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE</div><div class='del'>-GLOBAL_ENTRY(cycle_to_cputime)</div><div class='add'>+GLOBAL_ENTRY(cycle_to_nsec)</div><div class='ctx'> 	alloc r16=ar.pfs,1,0,0,0</div><div class='ctx'> 	addl r8=THIS_CPU(ia64_cpu_info) + IA64_CPUINFO_NSEC_PER_CYC_OFFSET,r0</div><div class='ctx'> 	;;</div><div class='hunk'>@@ -1047,7 +1047,7 @@ GLOBAL_ENTRY(cycle_to_cputime)</div><div class='ctx'> 	;;</div><div class='ctx'> 	shrp r8=r9,r8,IA64_NSEC_PER_CYC_SHIFT</div><div class='ctx'> 	br.ret.sptk.many rp</div><div class='del'>-END(cycle_to_cputime)</div><div class='add'>+END(cycle_to_nsec)</div><div class='ctx'> #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IA64_BRL_EMU</div><div class='head'>diff --git a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c<br/>index 0eaa89f3defd..fa8ee64adac2 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/init_task.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/init_task.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/init_task.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/init_task.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/init_task.h&gt;</div><div class='ctx'> #include &lt;linux/mqueue.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct signal_struct init_signals = INIT_SIGNALS(init_signals);</div><div class='head'>diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c<br/>index de4fc00dea98..2ff1df7b14ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/irq.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c<br/>index c7c51445c3be..f5f3a5e6fcd1 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/kprobes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/kprobes.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/kprobes.c</a></div><div class='hunk'>@@ -28,12 +28,12 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='del'>-#include &lt;linux/moduleloader.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/exception.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void jprobe_inst_return(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c<br/>index 9509cc73b9c6..79c7c46d7dc1 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/mca.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/mca.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/mca.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/mca.c</a></div><div class='hunk'>@@ -72,7 +72,9 @@</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c<br/>index c39c3cd3ac34..b6e597860888 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/palinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/palinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/palinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/palinfo.c</a></div><div class='hunk'>@@ -932,8 +932,7 @@ static const struct file_operations proc_palinfo_fops = {</div><div class='ctx'> 	.release	= single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-create_palinfo_proc_entries(unsigned int cpu)</div><div class='add'>+static int palinfo_add_proc(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	pal_func_cpu_u_t f;</div><div class='ctx'> 	struct proc_dir_entry *cpu_dir;</div><div class='hunk'>@@ -943,7 +942,7 @@ create_palinfo_proc_entries(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> 	cpu_dir = proc_mkdir(cpustr, palinfo_dir);</div><div class='ctx'> 	if (!cpu_dir)</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	f.req_cpu = cpu;</div><div class='ctx'> </div><div class='hunk'>@@ -952,42 +951,21 @@ create_palinfo_proc_entries(unsigned int cpu)</div><div class='ctx'> 		proc_create_data(palinfo_entries[j].name, 0, cpu_dir,</div><div class='ctx'> 				 &amp;proc_palinfo_fops, (void *)f.value);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-remove_palinfo_proc_entries(unsigned int hcpu)</div><div class='add'>+static int palinfo_del_proc(unsigned int hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	char cpustr[3+4+1];	/* cpu numbers are up to 4095 on itanic */</div><div class='add'>+</div><div class='ctx'> 	sprintf(cpustr, "cpu%d", hcpu);</div><div class='ctx'> 	remove_proc_subtree(cpustr, palinfo_dir);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int palinfo_cpu_callback(struct notifier_block *nfb,</div><div class='del'>-					unsigned long action, void *hcpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int hotcpu = (unsigned long)hcpu;</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-	case CPU_ONLINE_FROZEN:</div><div class='del'>-		create_palinfo_proc_entries(hotcpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-	case CPU_DEAD_FROZEN:</div><div class='del'>-		remove_palinfo_proc_entries(hotcpu);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return NOTIFY_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block __refdata palinfo_cpu_notifier =</div><div class='del'>-{</div><div class='del'>-	.notifier_call = palinfo_cpu_callback,</div><div class='del'>-	.priority = 0,</div><div class='del'>-};</div><div class='add'>+static enum cpuhp_state hp_online;</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='del'>-palinfo_init(void)</div><div class='add'>+static int __init palinfo_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -996,25 +974,19 @@ palinfo_init(void)</div><div class='ctx'> 	if (!palinfo_dir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='del'>-	/* Create palinfo dirs in /proc for all online cpus */</div><div class='del'>-	for_each_online_cpu(i) {</div><div class='del'>-		create_palinfo_proc_entries(i);</div><div class='add'>+	i = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "ia64/palinfo:online",</div><div class='add'>+			      palinfo_add_proc, palinfo_del_proc);</div><div class='add'>+	if (i &lt; 0) {</div><div class='add'>+		remove_proc_subtree("pal", NULL);</div><div class='add'>+		return i;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Register for future delivery via notify registration */</div><div class='del'>-	__register_hotcpu_notifier(&amp;palinfo_cpu_notifier);</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-</div><div class='add'>+	hp_online = i;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit</div><div class='del'>-palinfo_exit(void)</div><div class='add'>+static void __exit palinfo_exit(void)</div><div class='ctx'> {</div><div class='del'>-	unregister_hotcpu_notifier(&amp;palinfo_cpu_notifier);</div><div class='add'>+	cpuhp_remove_state(hp_online);</div><div class='ctx'> 	remove_proc_subtree("pal", NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c<br/>index 992c1098c522..9094a73f996f 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/pci-dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/pci-dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/pci-dma.c</a></div><div class='hunk'>@@ -90,11 +90,11 @@ void __init pci_iommu_alloc(void)</div><div class='ctx'> {</div><div class='ctx'> 	dma_ops = &amp;intel_dma_ops;</div><div class='ctx'> </div><div class='del'>-	dma_ops-&gt;sync_single_for_cpu = machvec_dma_sync_single;</div><div class='del'>-	dma_ops-&gt;sync_sg_for_cpu = machvec_dma_sync_sg;</div><div class='del'>-	dma_ops-&gt;sync_single_for_device = machvec_dma_sync_single;</div><div class='del'>-	dma_ops-&gt;sync_sg_for_device = machvec_dma_sync_sg;</div><div class='del'>-	dma_ops-&gt;dma_supported = iommu_dma_supported;</div><div class='add'>+	intel_dma_ops.sync_single_for_cpu = machvec_dma_sync_single;</div><div class='add'>+	intel_dma_ops.sync_sg_for_cpu = machvec_dma_sync_sg;</div><div class='add'>+	intel_dma_ops.sync_single_for_device = machvec_dma_sync_single;</div><div class='add'>+	intel_dma_ops.sync_sg_for_device = machvec_dma_sync_sg;</div><div class='add'>+	intel_dma_ops.dma_supported = iommu_dma_supported;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The order of these functions is important for</div><div class='head'>diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c<br/>index 2933208c0285..a14989dacded 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/pci-swiotlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/pci-swiotlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/pci-swiotlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/pci-swiotlb.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ static void ia64_swiotlb_free_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	swiotlb_free_coherent(dev, size, vaddr, dma_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops swiotlb_dma_ops = {</div><div class='add'>+const struct dma_map_ops swiotlb_dma_ops = {</div><div class='ctx'> 	.alloc = ia64_swiotlb_alloc_coherent,</div><div class='ctx'> 	.free = ia64_swiotlb_free_coherent,</div><div class='ctx'> 	.map_page = swiotlb_map_page,</div><div class='head'>diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c<br/>index 2436ad5f92c1..09f86ebfcc7b 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/perfmon.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/perfmon.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/perfmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/perfmon.c</a></div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='hunk'>@@ -50,7 +52,7 @@</div><div class='ctx'> #include &lt;asm/perfmon.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PERFMON</div><div class='head'>diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c<br/>index aae6c4dc7ae7..d344d0d691aa 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/process.c</a></div><div class='hunk'>@@ -20,6 +20,10 @@</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='hunk'>@@ -41,7 +45,7 @@</div><div class='ctx'> #include &lt;asm/sal.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unwind.h&gt;</div><div class='ctx'> #include &lt;asm/user.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c<br/>index 31aa8c0f68e1..3f8293378a83 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/ptrace.c</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='hunk'>@@ -26,7 +28,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace_offsets.h&gt;</div><div class='ctx'> #include &lt;asm/rse.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unwind.h&gt;</div><div class='ctx'> #ifdef CONFIG_PERFMON</div><div class='ctx'> #include &lt;asm/perfmon.h&gt;</div><div class='hunk'>@@ -1159,7 +1161,7 @@ arch_ptrace (struct task_struct *child, long request,</div><div class='ctx'> 	case PTRACE_PEEKTEXT:</div><div class='ctx'> 	case PTRACE_PEEKDATA:</div><div class='ctx'> 		/* read word at location addr */</div><div class='del'>-		if (access_process_vm(child, addr, &amp;data, sizeof(data),</div><div class='add'>+		if (ptrace_access_vm(child, addr, &amp;data, sizeof(data),</div><div class='ctx'> 				FOLL_FORCE)</div><div class='ctx'> 		    != sizeof(data))</div><div class='ctx'> 			return -EIO;</div><div class='head'>diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c<br/>index 5313007d5423..d194d5c83d32 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/salinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/salinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/salinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/salinfo.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> #include &lt;linux/semaphore.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sal.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jesse Barnes &lt;jbarnes@sgi.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("/proc interface to IA-64 SAL features");</div><div class='hunk'>@@ -550,52 +550,40 @@ static const struct file_operations salinfo_data_fops = {</div><div class='ctx'> 	.llseek  = default_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)</div><div class='add'>+static int salinfo_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i, cpu = (unsigned long)hcpu;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	unsigned int i, end = ARRAY_SIZE(salinfo_data);</div><div class='ctx'> 	struct salinfo_data *data;</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-	case CPU_ONLINE_FROZEN:</div><div class='del'>-		spin_lock_irqsave(&amp;data_saved_lock, flags);</div><div class='del'>-		for (i = 0, data = salinfo_data;</div><div class='del'>-		     i &lt; ARRAY_SIZE(salinfo_data);</div><div class='del'>-		     ++i, ++data) {</div><div class='del'>-			cpumask_set_cpu(cpu, &amp;data-&gt;cpu_event);</div><div class='del'>-			wake_up_interruptible(&amp;data-&gt;read_wait);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;data_saved_lock, flags);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-	case CPU_DEAD_FROZEN:</div><div class='del'>-		spin_lock_irqsave(&amp;data_saved_lock, flags);</div><div class='del'>-		for (i = 0, data = salinfo_data;</div><div class='del'>-		     i &lt; ARRAY_SIZE(salinfo_data);</div><div class='del'>-		     ++i, ++data) {</div><div class='del'>-			struct salinfo_data_saved *data_saved;</div><div class='del'>-			int j;</div><div class='del'>-			for (j = ARRAY_SIZE(data-&gt;data_saved) - 1, data_saved = data-&gt;data_saved + j;</div><div class='del'>-			     j &gt;= 0;</div><div class='del'>-			     --j, --data_saved) {</div><div class='del'>-				if (data_saved-&gt;buffer &amp;&amp; data_saved-&gt;cpu == cpu) {</div><div class='del'>-					shift1_data_saved(data, j);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			cpumask_clear_cpu(cpu, &amp;data-&gt;cpu_event);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;data_saved_lock, flags);</div><div class='del'>-		break;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;data_saved_lock);</div><div class='add'>+	for (i = 0, data = salinfo_data; i &lt; end; ++i, ++data) {</div><div class='add'>+		cpumask_set_cpu(cpu, &amp;data-&gt;cpu_event);</div><div class='add'>+		wake_up_interruptible(&amp;data-&gt;read_wait);</div><div class='ctx'> 	}</div><div class='del'>-	return NOTIFY_OK;</div><div class='add'>+	spin_unlock_irq(&amp;data_saved_lock);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block salinfo_cpu_notifier =</div><div class='add'>+static int salinfo_cpu_pre_down(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	.notifier_call = salinfo_cpu_callback,</div><div class='del'>-	.priority = 0,</div><div class='del'>-};</div><div class='add'>+	unsigned int i, end = ARRAY_SIZE(salinfo_data);</div><div class='add'>+	struct salinfo_data *data;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;data_saved_lock);</div><div class='add'>+	for (i = 0, data = salinfo_data; i &lt; end; ++i, ++data) {</div><div class='add'>+		struct salinfo_data_saved *data_saved;</div><div class='add'>+		int j = ARRAY_SIZE(data-&gt;data_saved) - 1;</div><div class='add'>+</div><div class='add'>+		for (data_saved = data-&gt;data_saved + j; j &gt;= 0;</div><div class='add'>+		     --j, --data_saved) {</div><div class='add'>+			if (data_saved-&gt;buffer &amp;&amp; data_saved-&gt;cpu == cpu)</div><div class='add'>+				shift1_data_saved(data, j);</div><div class='add'>+		}</div><div class='add'>+		cpumask_clear_cpu(cpu, &amp;data-&gt;cpu_event);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;data_saved_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='ctx'> salinfo_init(void)</div><div class='hunk'>@@ -604,7 +592,7 @@ salinfo_init(void)</div><div class='ctx'> 	struct proc_dir_entry **sdir = salinfo_proc_entries; /* keeps track of every entry */</div><div class='ctx'> 	struct proc_dir_entry *dir, *entry;</div><div class='ctx'> 	struct salinfo_data *data;</div><div class='del'>-	int i, j;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	salinfo_dir = proc_mkdir("sal", NULL);</div><div class='ctx'> 	if (!salinfo_dir)</div><div class='hunk'>@@ -617,8 +605,6 @@ salinfo_init(void)</div><div class='ctx'> 					   (void *)salinfo_entries[i].feature);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(salinfo_log_name); i++) {</div><div class='ctx'> 		data = salinfo_data + i;</div><div class='ctx'> 		data-&gt;type = i;</div><div class='hunk'>@@ -639,10 +625,6 @@ salinfo_init(void)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		*sdir++ = entry;</div><div class='ctx'> </div><div class='del'>-		/* we missed any events before now */</div><div class='del'>-		for_each_online_cpu(j)</div><div class='del'>-			cpumask_set_cpu(j, &amp;data-&gt;cpu_event);</div><div class='del'>-</div><div class='ctx'> 		*sdir++ = dir;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -653,10 +635,9 @@ salinfo_init(void)</div><div class='ctx'> 	salinfo_timer.function = &amp;salinfo_timeout;</div><div class='ctx'> 	add_timer(&amp;salinfo_timer);</div><div class='ctx'> </div><div class='del'>-	__register_hotcpu_notifier(&amp;salinfo_cpu_notifier);</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-</div><div class='add'>+	i = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "ia64/salinfo:online",</div><div class='add'>+			      salinfo_cpu_online, salinfo_cpu_pre_down);</div><div class='add'>+	WARN_ON(i &lt; 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c<br/>index 7ec7acc844c2..23e3fd61e335 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/setup.c</a></div><div class='hunk'>@@ -29,9 +29,12 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='hunk'>@@ -619,6 +622,8 @@ setup_arch (char **cmdline_p)</div><div class='ctx'> 	check_sal_cache_flush();</div><div class='ctx'> #endif</div><div class='ctx'> 	paging_init();</div><div class='add'>+</div><div class='add'>+	clear_sched_clock_stable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -992,7 +997,7 @@ cpu_init (void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ia64_setreg(_IA64_REG_CR_DCR,  (  IA64_DCR_DP | IA64_DCR_DK | IA64_DCR_DX | IA64_DCR_DR</div><div class='ctx'> 					| IA64_DCR_DA | IA64_DCR_DD | IA64_DCR_LC));</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> 	BUG_ON(current-&gt;mm);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c<br/>index b3a124da71e5..5db52c6813c4 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/signal.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/intrinsics.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/rse.h&gt;</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c<br/>index 41e33f84c185..5ce927c854a6 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/sys_ia64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/sys_ia64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/sys_ia64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/sys_ia64.c</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/shm.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;		/* doh, must come after sched.h... */</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -18,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/shmparam.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long</div><div class='ctx'> arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len,</div><div class='head'>diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c<br/>index 6f892b94e906..aa7be020a904 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/time.c</a></div><div class='hunk'>@@ -16,11 +16,13 @@</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/timekeeper_internal.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/sched/cputime.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='hunk'>@@ -31,7 +33,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "fsyscall_gtod_data.h"</div><div class='ctx'> </div><div class='del'>-static cycle_t itc_get_cycles(struct clocksource *cs);</div><div class='add'>+static u64 itc_get_cycles(struct clocksource *cs);</div><div class='ctx'> </div><div class='ctx'> struct fsyscall_gtod_data_t fsyscall_gtod_data;</div><div class='ctx'> </div><div class='hunk'>@@ -59,18 +61,43 @@ static struct clocksource *itc_clocksource;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> </div><div class='del'>-extern cputime_t cycle_to_cputime(u64 cyc);</div><div class='add'>+extern u64 cycle_to_nsec(u64 cyc);</div><div class='ctx'> </div><div class='del'>-void vtime_account_user(struct task_struct *tsk)</div><div class='add'>+void vtime_flush(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='del'>-	cputime_t delta_utime;</div><div class='ctx'> 	struct thread_info *ti = task_thread_info(tsk);</div><div class='add'>+	u64 delta;</div><div class='ctx'> </div><div class='del'>-	if (ti-&gt;ac_utime) {</div><div class='del'>-		delta_utime = cycle_to_cputime(ti-&gt;ac_utime);</div><div class='del'>-		account_user_time(tsk, delta_utime, delta_utime);</div><div class='del'>-		ti-&gt;ac_utime = 0;</div><div class='add'>+	if (ti-&gt;utime)</div><div class='add'>+		account_user_time(tsk, cycle_to_nsec(ti-&gt;utime));</div><div class='add'>+</div><div class='add'>+	if (ti-&gt;gtime)</div><div class='add'>+		account_guest_time(tsk, cycle_to_nsec(ti-&gt;gtime));</div><div class='add'>+</div><div class='add'>+	if (ti-&gt;idle_time)</div><div class='add'>+		account_idle_time(cycle_to_nsec(ti-&gt;idle_time));</div><div class='add'>+</div><div class='add'>+	if (ti-&gt;stime) {</div><div class='add'>+		delta = cycle_to_nsec(ti-&gt;stime);</div><div class='add'>+		account_system_index_time(tsk, delta, CPUTIME_SYSTEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ti-&gt;hardirq_time) {</div><div class='add'>+		delta = cycle_to_nsec(ti-&gt;hardirq_time);</div><div class='add'>+		account_system_index_time(tsk, delta, CPUTIME_IRQ);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ti-&gt;softirq_time) {</div><div class='add'>+		delta = cycle_to_nsec(ti-&gt;softirq_time));</div><div class='add'>+		account_system_index_time(tsk, delta, CPUTIME_SOFTIRQ);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ti-&gt;utime = 0;</div><div class='add'>+	ti-&gt;gtime = 0;</div><div class='add'>+	ti-&gt;idle_time = 0;</div><div class='add'>+	ti-&gt;stime = 0;</div><div class='add'>+	ti-&gt;hardirq_time = 0;</div><div class='add'>+	ti-&gt;softirq_time = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -83,7 +110,7 @@ void arch_vtime_task_switch(struct task_struct *prev)</div><div class='ctx'> 	struct thread_info *pi = task_thread_info(prev);</div><div class='ctx'> 	struct thread_info *ni = task_thread_info(current);</div><div class='ctx'> </div><div class='del'>-	pi-&gt;ac_stamp = ni-&gt;ac_stamp;</div><div class='add'>+	ni-&gt;ac_stamp = pi-&gt;ac_stamp;</div><div class='ctx'> 	ni-&gt;ac_stime = ni-&gt;ac_utime = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -91,18 +118,15 @@ void arch_vtime_task_switch(struct task_struct *prev)</div><div class='ctx'>  * Account time for a transition between system, hard irq or soft irq state.</div><div class='ctx'>  * Note that this function is called with interrupts enabled.</div><div class='ctx'>  */</div><div class='del'>-static cputime_t vtime_delta(struct task_struct *tsk)</div><div class='add'>+static __u64 vtime_delta(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='ctx'> 	struct thread_info *ti = task_thread_info(tsk);</div><div class='del'>-	cputime_t delta_stime;</div><div class='del'>-	__u64 now;</div><div class='add'>+	__u64 now, delta_stime;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(!irqs_disabled());</div><div class='ctx'> </div><div class='ctx'> 	now = ia64_get_itc();</div><div class='del'>-</div><div class='del'>-	delta_stime = cycle_to_cputime(ti-&gt;ac_stime + (now - ti-&gt;ac_stamp));</div><div class='del'>-	ti-&gt;ac_stime = 0;</div><div class='add'>+	delta_stime = now - ti-&gt;ac_stamp;</div><div class='ctx'> 	ti-&gt;ac_stamp = now;</div><div class='ctx'> </div><div class='ctx'> 	return delta_stime;</div><div class='hunk'>@@ -110,15 +134,25 @@ static cputime_t vtime_delta(struct task_struct *tsk)</div><div class='ctx'> </div><div class='ctx'> void vtime_account_system(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='del'>-	cputime_t delta = vtime_delta(tsk);</div><div class='del'>-</div><div class='del'>-	account_system_time(tsk, 0, delta, delta);</div><div class='add'>+	struct thread_info *ti = task_thread_info(tsk);</div><div class='add'>+	__u64 stime = vtime_delta(tsk);</div><div class='add'>+</div><div class='add'>+	if ((tsk-&gt;flags &amp; PF_VCPU) &amp;&amp; !irq_count())</div><div class='add'>+		ti-&gt;gtime += stime;</div><div class='add'>+	else if (hardirq_count())</div><div class='add'>+		ti-&gt;hardirq_time += stime;</div><div class='add'>+	else if (in_serving_softirq())</div><div class='add'>+		ti-&gt;softirq_time += stime;</div><div class='add'>+	else</div><div class='add'>+		ti-&gt;stime += stime;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vtime_account_system);</div><div class='ctx'> </div><div class='ctx'> void vtime_account_idle(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='del'>-	account_idle_time(vtime_delta(tsk));</div><div class='add'>+	struct thread_info *ti = task_thread_info(tsk);</div><div class='add'>+</div><div class='add'>+	ti-&gt;idle_time += vtime_delta(tsk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */</div><div class='hunk'>@@ -323,7 +357,7 @@ void ia64_init_itm(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t itc_get_cycles(struct clocksource *cs)</div><div class='add'>+static u64 itc_get_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long lcycle, now, ret;</div><div class='ctx'> </div><div class='hunk'>@@ -397,7 +431,7 @@ void update_vsyscall_tz(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,</div><div class='del'>-			 struct clocksource *c, u32 mult, cycle_t cycle_last)</div><div class='add'>+			 struct clocksource *c, u32 mult, u64 cycle_last)</div><div class='ctx'> {</div><div class='ctx'> 	write_seqcount_begin(&amp;fsyscall_gtod_data.seq);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c<br/>index c01fe8991244..1a68f012a6dc 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/topology.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/topology.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/topology.c</a></div><div class='hunk'>@@ -349,9 +349,9 @@ static int cpu_cache_sysfs_init(unsigned int cpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Add cache interface for CPU device */</div><div class='del'>-static int cache_add_dev(struct device *sys_dev)</div><div class='add'>+static int cache_add_dev(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = sys_dev-&gt;id;</div><div class='add'>+	struct device *sys_dev = get_cpu_device(cpu);</div><div class='ctx'> 	unsigned long i, j;</div><div class='ctx'> 	struct cache_info *this_object;</div><div class='ctx'> 	int retval = 0;</div><div class='hunk'>@@ -399,9 +399,8 @@ static int cache_add_dev(struct device *sys_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Remove cache interface for CPU device */</div><div class='del'>-static int cache_remove_dev(struct device *sys_dev)</div><div class='add'>+static int cache_remove_dev(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = sys_dev-&gt;id;</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; all_cpu_cache_info[cpu].num_cache_leaves; i++)</div><div class='hunk'>@@ -419,52 +418,13 @@ static int cache_remove_dev(struct device *sys_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * When a cpu is hot-plugged, do a check and initiate</div><div class='del'>- * cache kobject if necessary</div><div class='del'>- */</div><div class='del'>-static int cache_cpu_callback(struct notifier_block *nfb,</div><div class='del'>-		unsigned long action, void *hcpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	struct device *sys_dev;</div><div class='del'>-</div><div class='del'>-	sys_dev = get_cpu_device(cpu);</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-	case CPU_ONLINE_FROZEN:</div><div class='del'>-		cache_add_dev(sys_dev);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-	case CPU_DEAD_FROZEN:</div><div class='del'>-		cache_remove_dev(sys_dev);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return NOTIFY_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block cache_cpu_notifier =</div><div class='del'>-{</div><div class='del'>-	.notifier_call = cache_cpu_callback</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int __init cache_sysfs_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='del'>-	for_each_online_cpu(i) {</div><div class='del'>-		struct device *sys_dev = get_cpu_device((unsigned int)i);</div><div class='del'>-		cache_add_dev(sys_dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__register_hotcpu_notifier(&amp;cache_cpu_notifier);</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_done();</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "ia64/topology:online",</div><div class='add'>+				cache_add_dev, cache_remove_dev);</div><div class='add'>+	WARN_ON(ret &lt; 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> device_initcall(cache_sysfs_init);</div><div class='del'>-</div><div class='head'>diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c<br/>index 77edd68c5161..7b1fe9462158 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/traps.c</a></div><div class='hunk'>@@ -9,19 +9,22 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;		/* For unblank_screen() */</div><div class='del'>-#include &lt;linux/module.h&gt;       /* for EXPORT_SYMBOL */</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;		/* for ssleep() */</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/fpswa.h&gt;</div><div class='ctx'> #include &lt;asm/intrinsics.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/exception.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> fpswa_interface_t *fpswa_interface;</div><div class='head'>diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c<br/>index 7f0d31656b4d..a13680ca1e61 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/unaligned.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/unaligned.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/unaligned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/unaligned.c</a></div><div class='hunk'>@@ -15,14 +15,16 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/intrinsics.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/rse.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/exception.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int die_if_kernel(char *str, struct pt_regs *regs, long err);</div><div class='head'>diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c<br/>index f3976da36721..583f7ff6b589 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/uncached.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/uncached.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/uncached.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/uncached.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='add'>+#include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;linux/genalloc.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c<br/>index 8f66195999e7..9704e2cd9878 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/kernel/unwind.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/kernel/unwind.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/kernel/unwind.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/kernel/unwind.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #include &lt;asm/ptrace_offsets.h&gt;</div><div class='ctx'> #include &lt;asm/rse.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "entry.h"</div><div class='ctx'> #include "unwind_i.h"</div><div class='head'>diff --git a/arch/ia64/lib/csum_partial_copy.c b/arch/ia64/lib/csum_partial_copy.c<br/>index 118daf5a0632..42f7678ef6ad 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/lib/csum_partial_copy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/lib/csum_partial_copy.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/lib/csum_partial_copy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/lib/csum_partial_copy.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * XXX Fixme: those 2 inlines are meant for debugging and will go away</div><div class='head'>diff --git a/arch/ia64/mm/extable.c b/arch/ia64/mm/extable.c<br/>index 8f70bb2d0c37..4edb816aba9a 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/mm/extable.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> ia64_handle_exception (struct pt_regs *regs, const struct exception_table_entry *e)</div><div class='head'>diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c<br/>index fa6ad95e992e..15f09cfff335 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/mm/fault.c</a></div><div class='hunk'>@@ -4,9 +4,10 @@</div><div class='ctx'>  * Copyright (C) 1998-2002 Hewlett-Packard Co</div><div class='ctx'>  *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='hunk'>@@ -15,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/exception.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int die(char *, struct pt_regs *, long);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c<br/>index 1841ef69183d..8f3efa682ee8 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/mm/init.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='hunk'>@@ -31,7 +32,7 @@</div><div class='ctx'> #include &lt;asm/sal.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/mca.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -684,51 +685,3 @@ int arch_remove_memory(u64 start, u64 size)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * show_mem - give short summary of memory stats</div><div class='del'>- *</div><div class='del'>- * Shows a simple page count of reserved and used pages in the system.</div><div class='del'>- * For discontig machines, it does this on a per-pgdat basis.</div><div class='del'>- */</div><div class='del'>-void show_mem(unsigned int filter)</div><div class='del'>-{</div><div class='del'>-	int total_reserved = 0;</div><div class='del'>-	unsigned long total_present = 0;</div><div class='del'>-	pg_data_t *pgdat;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Mem-info:\n");</div><div class='del'>-	show_free_areas(filter);</div><div class='del'>-	printk(KERN_INFO "Node memory in pages:\n");</div><div class='del'>-	for_each_online_pgdat(pgdat) {</div><div class='del'>-		unsigned long present;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		int reserved = 0;</div><div class='del'>-		int nid = pgdat-&gt;node_id;</div><div class='del'>-		int zoneid;</div><div class='del'>-</div><div class='del'>-		if (skip_free_areas_node(filter, nid))</div><div class='del'>-			continue;</div><div class='del'>-		pgdat_resize_lock(pgdat, &amp;flags);</div><div class='del'>-</div><div class='del'>-		for (zoneid = 0; zoneid &lt; MAX_NR_ZONES; zoneid++) {</div><div class='del'>-			struct zone *zone = &amp;pgdat-&gt;node_zones[zoneid];</div><div class='del'>-			if (!populated_zone(zone))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			reserved += zone-&gt;present_pages - zone-&gt;managed_pages;</div><div class='del'>-		}</div><div class='del'>-		present = pgdat-&gt;node_present_pages;</div><div class='del'>-</div><div class='del'>-		pgdat_resize_unlock(pgdat, &amp;flags);</div><div class='del'>-		total_present += present;</div><div class='del'>-		total_reserved += reserved;</div><div class='del'>-		printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, ",</div><div class='del'>-		       nid, present, reserved);</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_INFO "%ld pages of RAM\n", total_present);</div><div class='del'>-	printk(KERN_INFO "%d reserved pages\n", total_reserved);</div><div class='del'>-	printk(KERN_INFO "Total of %ld pages in page table cache\n",</div><div class='del'>-	       quicklist_total_size());</div><div class='del'>-	printk(KERN_INFO "%ld free buffer pages\n", nr_free_buffer_pages());</div><div class='del'>-}</div><div class='head'>diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c<br/>index c98dc965fe82..b73b0ebf8214 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/sn/kernel/sn2/sn2_smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/sn/kernel/sn2/sn2_smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/sn/kernel/sn2/sn2_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/sn/kernel/sn2/sn2_smp.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='head'>diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c<br/>index b9992571c036..52704f199dd6 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/sn/kernel/sn2/sn_hwperf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/sn/kernel/sn2/sn_hwperf.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/sn/kernel/sn2/sn_hwperf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/sn/kernel/sn2/sn_hwperf.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/topology.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/sal.h&gt;</div><div class='ctx'> #include &lt;asm/sn/io.h&gt;</div><div class='ctx'> #include &lt;asm/sn/sn_sal.h&gt;</div><div class='hunk'>@@ -525,7 +525,7 @@ static int sn_topology_show(struct seq_file *s, void *d)</div><div class='ctx'> 				/* both ends local to this partition */</div><div class='ctx'> 				seq_puts(s, " local");</div><div class='ctx'> 			else if (SN_HWPERF_FOREIGN(p))</div><div class='del'>-				/* both ends of the link in foreign partiton */</div><div class='add'>+				/* both ends of the link in foreign partition */</div><div class='ctx'> 				seq_puts(s, " foreign");</div><div class='ctx'> 			else</div><div class='ctx'> 				/* link straddles a partition */</div><div class='head'>diff --git a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c<br/>index 7aab87f48060..29cf8f8c08e9 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/sn/kernel/sn2/sn_proc_fs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/sn/kernel/sn2/sn_proc_fs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/sn/kernel/sn2/sn_proc_fs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/sn/kernel/sn2/sn_proc_fs.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/sn/sn_sal.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int partition_id_show(struct seq_file *s, void *p)</div><div class='head'>diff --git a/arch/ia64/sn/kernel/sn2/timer.c b/arch/ia64/sn/kernel/sn2/timer.c<br/>index abab8f99e913..66edc36426ed 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/sn/kernel/sn2/timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/sn/kernel/sn2/timer.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/sn/kernel/sn2/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/sn/kernel/sn2/timer.c</a></div><div class='hunk'>@@ -22,9 +22,9 @@</div><div class='ctx'> </div><div class='ctx'> extern unsigned long sn_rtc_cycles_per_second;</div><div class='ctx'> </div><div class='del'>-static cycle_t read_sn2(struct clocksource *cs)</div><div class='add'>+static u64 read_sn2(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)readq(RTC_COUNTER_ADDR);</div><div class='add'>+	return (u64)readq(RTC_COUNTER_ADDR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource clocksource_sn2 = {</div><div class='head'>diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c<br/>index e35f6485c1fd..32d0380eb72e 100644<br/>--- a/<a href='/drm-misc/tree/arch/ia64/sn/kernel/tiocx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/ia64/sn/kernel/tiocx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/ia64/sn/kernel/tiocx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/ia64/sn/kernel/tiocx.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/sn/sn_sal.h&gt;</div><div class='ctx'> #include &lt;asm/sn/addrs.h&gt;</div><div class='ctx'> #include &lt;asm/sn/io.h&gt;</div><div class='head'>diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig<br/>index 3cc8498fe0fe..95474460b367 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/Kconfig</a></div><div class='hunk'>@@ -18,6 +18,7 @@ config M32R</div><div class='ctx'> 	select MODULES_USE_ELF_RELA</div><div class='ctx'> 	select HAVE_DEBUG_STACKOVERFLOW</div><div class='ctx'> 	select CPU_NO_EFFICIENT_FFS</div><div class='add'>+	select DMA_NOOP_OPS</div><div class='ctx'> </div><div class='ctx'> config SBUS</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -34,7 +35,7 @@ config NO_IOPORT_MAP</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='ctx'> config NO_DMA</div><div class='del'>-	def_bool y</div><div class='add'>+	def_bool n</div><div class='ctx'> </div><div class='ctx'> config HZ</div><div class='ctx'> 	int</div><div class='head'>diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild<br/>index 860e440611c9..deb298777df2 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> </div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='add'>+generic-y += current.h</div><div class='ctx'> generic-y += exec.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='ctx'> generic-y += kvm_para.h</div><div class='hunk'>@@ -11,3 +11,4 @@ generic-y += preempt.h</div><div class='ctx'> generic-y += sections.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/m32r/include/asm/cmpxchg.h b/arch/m32r/include/asm/cmpxchg.h<br/>index 14bf9b739dd2..23c9d0537201 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/include/asm/cmpxchg.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/include/asm/cmpxchg.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/include/asm/cmpxchg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/cmpxchg.h</a></div><div class='hunk'>@@ -64,8 +64,10 @@ __xchg(unsigned long x, volatile void *ptr, int size)</div><div class='ctx'> 	return (tmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define xchg(ptr, x)							\</div><div class='del'>-	((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))</div><div class='add'>+#define xchg(ptr, x) ({							\</div><div class='add'>+	((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr),		\</div><div class='add'>+				    sizeof(*(ptr))));			\</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> static __always_inline unsigned long</div><div class='ctx'> __xchg_local(unsigned long x, volatile void *ptr, int size)</div><div class='hunk'>@@ -187,9 +189,12 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)</div><div class='ctx'> 	return old;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define cmpxchg(ptr, o, n)						 \</div><div class='del'>-	((__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)(o),	 \</div><div class='del'>-			(unsigned long)(n), sizeof(*(ptr))))</div><div class='add'>+#define cmpxchg(ptr, o, n) ({				\</div><div class='add'>+	((__typeof__(*(ptr)))				\</div><div class='add'>+		 __cmpxchg((ptr), (unsigned long)(o),	\</div><div class='add'>+			   (unsigned long)(n),		\</div><div class='add'>+			   sizeof(*(ptr))));		\</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/cmpxchg-local.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m32r/include/asm/current.h b/arch/m32r/include/asm/current.h<br/>deleted file mode 100644<br/>index 7859d864f2c2..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/m32r/include/asm/current.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/include/asm/current.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-#ifndef _ASM_M32R_CURRENT_H</div><div class='del'>-#define _ASM_M32R_CURRENT_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/thread_info.h&gt;</div><div class='del'>-</div><div class='del'>-struct task_struct;</div><div class='del'>-</div><div class='del'>-static __inline__ struct task_struct *get_current(void)</div><div class='del'>-{</div><div class='del'>-	return current_thread_info()-&gt;task;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define current	(get_current())</div><div class='del'>-</div><div class='del'>-#endif	/* _ASM_M32R_CURRENT_H */</div><div class='head'>diff --git a/arch/m32r/include/asm/device.h b/arch/m32r/include/asm/device.h<br/>index d8f9872b0e2d..5203fc87f080 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/include/asm/device.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/include/asm/device.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/device.h</a></div><div class='hunk'>@@ -3,5 +3,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * This file is released under the GPLv2</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm-generic/device.h&gt;</div><div class='add'>+struct dev_archdata {</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+struct pdev_archdata {</div><div class='add'>+};</div><div class='head'>diff --git a/arch/m32r/include/asm/dma-mapping.h b/arch/m32r/include/asm/dma-mapping.h<br/>new file mode 100644<br/>index 000000000000..c01d9f52d228<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/m32r/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+#ifndef _ASM_M32R_DMA_MAPPING_H</div><div class='add'>+#define _ASM_M32R_DMA_MAPPING_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/dma-debug.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define DMA_ERROR_CODE (~(dma_addr_t)0x0)</div><div class='add'>+</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='add'>+{</div><div class='add'>+	return &amp;dma_noop_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,</div><div class='add'>+				  enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;dma_mask)</div><div class='add'>+		return false;</div><div class='add'>+	return addr + size - 1 &lt;= *dev-&gt;dma_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_M32R_DMA_MAPPING_H */</div><div class='head'>diff --git a/arch/m32r/include/asm/mmu_context.h b/arch/m32r/include/asm/mmu_context.h<br/>index 9fc78fc44445..1230b7050d8e 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='head'>diff --git a/arch/m32r/include/asm/mutex.h b/arch/m32r/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 458c1f7fbc18..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/m32r/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pull in the generic implementation for the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='head'>diff --git a/arch/m32r/include/asm/processor.h b/arch/m32r/include/asm/processor.h<br/>index 9f8fd9bef70f..5767367550c6 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/asm/processor.h</a></div><div class='hunk'>@@ -133,6 +133,5 @@ unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define KSTK_ESP(tsk)  ((tsk)-&gt;thread.sp)</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()	barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_M32R_PROCESSOR_H */</div><div class='head'>diff --git a/arch/m32r/include/uapi/asm/socket.h b/arch/m32r/include/uapi/asm/socket.h<br/>index 5fe42fc7b6c5..5853f8e92c20 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -90,4 +90,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		53</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	54</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_M32R_SOCKET_H */</div><div class='head'>diff --git a/arch/m32r/kernel/align.c b/arch/m32r/kernel/align.c<br/>index ab871ccd33f8..ec51e5b34860 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/kernel/align.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/kernel/align.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/kernel/align.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/align.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int get_reg(struct pt_regs *regs, int nr)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c<br/>index c7272b894283..5537f7397297 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/irq.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * do_IRQ handles all normal device IRQs (the special</div><div class='head'>diff --git a/arch/m32r/kernel/m32r_ksyms.c b/arch/m32r/kernel/m32r_ksyms.c<br/>index 23f26f4adfff..d763f0bd2106 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/kernel/m32r_ksyms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/kernel/m32r_ksyms.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/kernel/m32r_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/m32r_ksyms.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c<br/>index a88b1f01e91f..d8ffcfec599c 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/process.c</a></div><div class='hunk'>@@ -22,6 +22,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='hunk'>@@ -29,7 +32,7 @@</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c<br/>index c145605a981f..2d887400e30e 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/ptrace.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -27,7 +28,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c<br/>index 136c69f1fb8a..1a9e977287e6 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/setup.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='hunk'>@@ -403,7 +403,7 @@ void __init cpu_init (void)</div><div class='ctx'> 	printk(KERN_INFO "Initializing CPU#%d\n", cpu_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up and load the per-CPU TSS and LDT */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> 	if (current-&gt;mm)</div><div class='ctx'> 		BUG();</div><div class='head'>diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c<br/>index 1c81e24fd006..1ed597041fba 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/signal.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEBUG_SIG 0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c<br/>index f98d2f6519d6..a7d04684d2c7 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/kernel/smpboot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/kernel/smpboot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/kernel/smpboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/smpboot.c</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c<br/>index c3fdd632fba7..f34957032504 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/kernel/sys_m32r.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/kernel/sys_m32r.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/kernel/sys_m32r.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/sys_m32r.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/ipc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cachectl.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/syscall.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c<br/>index a7a424f852e4..647dd94a0c39 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/kernel/traps.c</a></div><div class='hunk'>@@ -14,11 +14,15 @@</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m32r/lib/csum_partial_copy.c b/arch/m32r/lib/csum_partial_copy.c<br/>index 5596f3df833f..b3cd59c12b8e 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/lib/csum_partial_copy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/lib/csum_partial_copy.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/lib/csum_partial_copy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/lib/csum_partial_copy.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Copy while checksumming, otherwise like csum_partial</div><div class='head'>diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c<br/>index 82abd159dbef..fd03f2731f20 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/lib/usercopy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/lib/usercopy.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/lib/usercopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/lib/usercopy.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long</div><div class='ctx'> __generic_copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='head'>diff --git a/arch/m32r/mm/extable.c b/arch/m32r/mm/extable.c<br/>index 1743f23d49a3..8ac8ba6ef60c 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/mm/extable.c</a></div><div class='hunk'>@@ -2,8 +2,8 @@</div><div class='ctx'>  * linux/arch/m32r/mm/extable.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/m32r/mm/fault-nommu.c b/arch/m32r/mm/fault-nommu.c<br/>index 80f18cc6f547..e22d5ddae5cb 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/mm/fault-nommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/mm/fault-nommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/mm/fault-nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/mm/fault-nommu.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;              /* For unblank_screen() */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/hardirq.h&gt;</div><div class='head'>diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c<br/>index a3785d3644c2..a05dc3184594 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/mm/fault.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;		/* For unblank_screen() */</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='head'>diff --git a/arch/m32r/platforms/m32700ut/setup.c b/arch/m32r/platforms/m32700ut/setup.c<br/>index 9a4ba8a8589d..349eb341752c 100644<br/>--- a/<a href='/drm-misc/tree/arch/m32r/platforms/m32700ut/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m32r/platforms/m32700ut/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m32r/platforms/m32700ut/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m32r/platforms/m32700ut/setup.c</a></div><div class='hunk'>@@ -201,6 +201,7 @@ static struct irq_chip m32700ut_lanpld_irq_type =</div><div class='ctx'> #define lcdpldirq2port(x)	(unsigned long)((int)M32700UT_LCD_ICUCR1 + \</div><div class='ctx'> 				 (((x) - 1) * sizeof(unsigned short)))</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_USB</div><div class='ctx'> static pld_icu_data_t lcdpld_icu_data[M32700UT_NUM_LCD_PLD_IRQ];</div><div class='ctx'> </div><div class='ctx'> static void disable_m32700ut_lcdpld_irq(unsigned int irq)</div><div class='hunk'>@@ -253,6 +254,7 @@ static struct irq_chip m32700ut_lcdpld_irq_type =</div><div class='ctx'> 	.irq_mask	= mask_m32700ut_lcdpld,</div><div class='ctx'> 	.irq_unmask	= unmask_m32700ut_lcdpld,</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void __init init_IRQ(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/m68k/68000/bootlogo-vz.h b/arch/m68k/68000/bootlogo-vz.h<br/>index b38e2b255142..6ff09beba1ba 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/68000/bootlogo-vz.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/68000/bootlogo-vz.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/68000/bootlogo-vz.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/bootlogo-vz.h</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+</div><div class='ctx'> #define splash_width 640</div><div class='ctx'> #define splash_height 480</div><div class='del'>-unsigned char __attribute__ ((aligned(16))) bootlogo_bits[] = {</div><div class='add'>+unsigned char __aligned(16) bootlogo_bits[] = {</div><div class='ctx'>   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='ctx'>   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='ctx'>   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='head'>diff --git a/arch/m68k/68000/bootlogo.h b/arch/m68k/68000/bootlogo.h<br/>index b896c933fafc..c466db3ca3a8 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/68000/bootlogo.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/68000/bootlogo.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/68000/bootlogo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/bootlogo.h</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+</div><div class='ctx'> #define bootlogo_width 160</div><div class='ctx'> #define bootlogo_height 160</div><div class='del'>-unsigned char __attribute__ ((aligned(16))) bootlogo_bits[] = {</div><div class='add'>+unsigned char __aligned(16) bootlogo_bits[] = {</div><div class='ctx'>   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00, 0x00,</div><div class='ctx'>   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='ctx'>   0x00, 0x00, 0x40, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='head'>diff --git a/arch/m68k/68000/m68328.c b/arch/m68k/68000/m68328.c<br/>index e53caf4c3bfb..419751b15ec8 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/68000/m68328.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/68000/m68328.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/68000/m68328.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/m68328.c</a></div><div class='hunk'>@@ -45,9 +45,9 @@ void m68328_reset (void)</div><div class='ctx'> </div><div class='ctx'> void __init config_BSP(char *command, int len)</div><div class='ctx'> {</div><div class='del'>-  printk(KERN_INFO "\n68328 support D. Jeff Dionne &lt;jeff@uclinux.org&gt;\n");</div><div class='del'>-  printk(KERN_INFO "68328 support Kenneth Albanowski &lt;kjahds@kjshds.com&gt;\n");</div><div class='del'>-  printk(KERN_INFO "68328/Pilot support Bernhard Kuhn &lt;kuhn@lpr.e-technik.tu-muenchen.de&gt;\n");</div><div class='add'>+  pr_info("68328 support D. Jeff Dionne &lt;jeff@uclinux.org&gt;\n");</div><div class='add'>+  pr_info("68328 support Kenneth Albanowski &lt;kjahds@kjshds.com&gt;\n");</div><div class='add'>+  pr_info("68328/Pilot support Bernhard Kuhn &lt;kuhn@lpr.e-technik.tu-muenchen.de&gt;\n");</div><div class='ctx'> </div><div class='ctx'>   mach_hwclk = m68328_hwclk;</div><div class='ctx'>   mach_reset = m68328_reset;</div><div class='head'>diff --git a/arch/m68k/68000/m68EZ328.c b/arch/m68k/68000/m68EZ328.c<br/>index e6ab321f93f8..6a309a3cfbfc 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/68000/m68EZ328.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/68000/m68EZ328.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/68000/m68EZ328.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/m68EZ328.c</a></div><div class='hunk'>@@ -57,12 +57,12 @@ void __init config_BSP(char *command, int len)</div><div class='ctx'> {</div><div class='ctx'>   unsigned char *p;</div><div class='ctx'> </div><div class='del'>-  printk(KERN_INFO "\n68EZ328 DragonBallEZ support (C) 1999 Rt-Control, Inc\n");</div><div class='add'>+  pr_info("68EZ328 DragonBallEZ support (C) 1999 Rt-Control, Inc\n");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_UCSIMM</div><div class='del'>-  printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum());</div><div class='add'>+  pr_info("uCsimm serial string [%s]\n", getserialnum());</div><div class='ctx'>   p = cs8900a_hwaddr = gethwaddr(0);</div><div class='del'>-  printk(KERN_INFO "uCsimm hwaddr %pM\n", p);</div><div class='add'>+  pr_info("uCsimm hwaddr %pM\n", p);</div><div class='ctx'> </div><div class='ctx'>   p = getbenv("APPEND");</div><div class='ctx'>   if (p) strcpy(p,command);</div><div class='head'>diff --git a/arch/m68k/68000/m68VZ328.c b/arch/m68k/68000/m68VZ328.c<br/>index 1154bdb220a0..81b5491685a4 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/68000/m68VZ328.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/68000/m68VZ328.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/68000/m68VZ328.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/m68VZ328.c</a></div><div class='hunk'>@@ -150,9 +150,9 @@ static void __init init_hardware(char *command, int size)</div><div class='ctx'> {</div><div class='ctx'> 	char *p;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum());</div><div class='add'>+	pr_info("uCdimm serial string [%s]\n", getserialnum());</div><div class='ctx'> 	p = cs8900a_hwaddr = gethwaddr(0);</div><div class='del'>-	printk(KERN_INFO "uCdimm hwaddr %pM\n", p);</div><div class='add'>+	pr_info("uCdimm hwaddr %pM\n", p);</div><div class='ctx'> 	p = getbenv("APPEND");</div><div class='ctx'> 	if (p)</div><div class='ctx'> 		strcpy(p, command);</div><div class='hunk'>@@ -177,7 +177,7 @@ static void __init init_hardware(char *command, int size)</div><div class='ctx'> </div><div class='ctx'> void __init config_BSP(char *command, int size)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_INFO "68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");</div><div class='add'>+	pr_info("68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");</div><div class='ctx'> </div><div class='ctx'> 	init_hardware(command, size);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/68000/timers.c b/arch/m68k/68000/timers.c<br/>index 99a98698bc95..252455bce144 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/68000/timers.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/68000/timers.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/68000/timers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/68000/timers.c</a></div><div class='hunk'>@@ -76,7 +76,7 @@ static struct irqaction m68328_timer_irq = {</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-static cycle_t m68328_read_clk(struct clocksource *cs)</div><div class='add'>+static u64 m68328_read_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 cycles;</div><div class='head'>diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine<br/>index 2a5c7abb2896..9225b4ad9aeb 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/Kconfig.machine?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/Kconfig.machine</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/Kconfig.machine?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/Kconfig.machine</a></div><div class='hunk'>@@ -259,6 +259,12 @@ config M5407C3</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the Motorola M5407C3 board.</div><div class='ctx'> </div><div class='add'>+config AMCORE</div><div class='add'>+	bool "Sysam AMCORE board support"</div><div class='add'>+	depends on M5307</div><div class='add'>+	help</div><div class='add'>+	  Support for the Sysam AMCORE open-hardware generic board.</div><div class='add'>+</div><div class='ctx'> config FIREBEE</div><div class='ctx'> 	bool "FireBee board support"</div><div class='ctx'> 	depends on M547x</div><div class='head'>diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c<br/>index ddb8192a3661..65f63a457130 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/amiga/config.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/amiga/config.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/amiga/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/amiga/config.c</a></div><div class='hunk'>@@ -786,8 +786,7 @@ static void amiga_get_hardware_list(struct seq_file *m)</div><div class='ctx'> 	if (AMIGAHW_PRESENT(name))			\</div><div class='ctx'> 		seq_printf (m, "\t%s\n", str)</div><div class='ctx'> </div><div class='del'>-	seq_printf (m, "Detected hardware:\n");</div><div class='del'>-</div><div class='add'>+	seq_puts(m, "Detected hardware:\n");</div><div class='ctx'> 	AMIGAHW_ANNOUNCE(AMI_VIDEO, "Amiga Video");</div><div class='ctx'> 	AMIGAHW_ANNOUNCE(AMI_BLITTER, "Blitter");</div><div class='ctx'> 	AMIGAHW_ANNOUNCE(AMBER_FF, "Amber Flicker Fixer");</div><div class='head'>diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c<br/>index 264db1126803..37091898adb3 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/atari/atakeyb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/atari/atakeyb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/atari/atakeyb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/atari/atakeyb.c</a></div><div class='hunk'>@@ -149,7 +149,7 @@ repeat:</div><div class='ctx'> 	if (acia_stat &amp; ACIA_OVRN) {</div><div class='ctx'> 		/* a very fast typist or a slow system, give a warning */</div><div class='ctx'> 		/* ...happens often if interrupts were disabled for too long */</div><div class='del'>-		printk(KERN_DEBUG "Keyboard overrun\n");</div><div class='add'>+		pr_debug("Keyboard overrun\n");</div><div class='ctx'> 		scancode = acia.key_data;</div><div class='ctx'> 		if (ikbd_self_test)</div><div class='ctx'> 			/* During self test, don't do resyncing, just process the code */</div><div class='hunk'>@@ -228,14 +228,14 @@ repeat:</div><div class='ctx'> 					keytyp = KTYP(keyval) - 0xf0;</div><div class='ctx'> 					keyval = KVAL(keyval);</div><div class='ctx'> </div><div class='del'>-					printk(KERN_WARNING "Key with scancode %d ", scancode);</div><div class='add'>+					pr_warn("Key with scancode %d ", scancode);</div><div class='ctx'> 					if (keytyp == KT_LATIN || keytyp == KT_LETTER) {</div><div class='ctx'> 						if (keyval &lt; ' ')</div><div class='del'>-							printk("('^%c') ", keyval + '@');</div><div class='add'>+							pr_cont("('^%c') ", keyval + '@');</div><div class='ctx'> 						else</div><div class='del'>-							printk("('%c') ", keyval);</div><div class='add'>+							pr_cont("('%c') ", keyval);</div><div class='ctx'> 					}</div><div class='del'>-					printk("is broken -- will be ignored.\n");</div><div class='add'>+					pr_cont("is broken -- will be ignored.\n");</div><div class='ctx'> 					break;</div><div class='ctx'> 				} else if (test_bit(scancode, broken_keys))</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -299,7 +299,7 @@ repeat:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (acia_stat &amp; (ACIA_FE | ACIA_PE)) {</div><div class='del'>-		printk("Error in keyboard communication\n");</div><div class='add'>+		pr_err("Error in keyboard communication\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* handle_scancode() can take a lot of time, so check again if</div><div class='hunk'>@@ -553,7 +553,7 @@ int atari_keyb_init(void)</div><div class='ctx'> 		barrier();</div><div class='ctx'> 	/* if not incremented: no 0xf1 received */</div><div class='ctx'> 	if (ikbd_self_test == 1)</div><div class='del'>-		printk(KERN_ERR "WARNING: keyboard self test failed!\n");</div><div class='add'>+		pr_err("Keyboard self test failed!\n");</div><div class='ctx'> 	ikbd_self_test = 0;</div><div class='ctx'> </div><div class='ctx'> 	ikbd_mouse_disable();</div><div class='head'>diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c<br/>index 97a3c38cd1f5..565c6f06ab0b 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/atari/config.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/atari/config.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/atari/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/atari/config.c</a></div><div class='hunk'>@@ -234,44 +234,44 @@ void __init config_atari(void)</div><div class='ctx'> 	 * Determine hardware present</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	printk("Atari hardware found: ");</div><div class='add'>+	pr_info("Atari hardware found:");</div><div class='ctx'> 	if (MACH_IS_MEDUSA) {</div><div class='ctx'> 		/* There's no Atari video hardware on the Medusa, but all the</div><div class='ctx'> 		 * addresses below generate a DTACK so no bus error occurs! */</div><div class='ctx'> 	} else if (hwreg_present(f030_xreg)) {</div><div class='ctx'> 		ATARIHW_SET(VIDEL_SHIFTER);</div><div class='del'>-		printk("VIDEL ");</div><div class='add'>+		pr_cont(" VIDEL");</div><div class='ctx'> 		/* This is a temporary hack: If there is Falcon video</div><div class='ctx'> 		 * hardware, we assume that the ST-DMA serves SCSI instead of</div><div class='ctx'> 		 * ACSI. In the future, there should be a better method for</div><div class='ctx'> 		 * this...</div><div class='ctx'> 		 */</div><div class='ctx'> 		ATARIHW_SET(ST_SCSI);</div><div class='del'>-		printk("STDMA-SCSI ");</div><div class='add'>+		pr_cont(" STDMA-SCSI");</div><div class='ctx'> 	} else if (hwreg_present(tt_palette)) {</div><div class='ctx'> 		ATARIHW_SET(TT_SHIFTER);</div><div class='del'>-		printk("TT_SHIFTER ");</div><div class='add'>+		pr_cont(" TT_SHIFTER");</div><div class='ctx'> 	} else if (hwreg_present(&amp;shifter.bas_hi)) {</div><div class='ctx'> 		if (hwreg_present(&amp;shifter.bas_lo) &amp;&amp;</div><div class='ctx'> 		    (shifter.bas_lo = 0x0aau, shifter.bas_lo == 0x0aau)) {</div><div class='ctx'> 			ATARIHW_SET(EXTD_SHIFTER);</div><div class='del'>-			printk("EXTD_SHIFTER ");</div><div class='add'>+			pr_cont(" EXTD_SHIFTER");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ATARIHW_SET(STND_SHIFTER);</div><div class='del'>-			printk("STND_SHIFTER ");</div><div class='add'>+			pr_cont(" STND_SHIFTER");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present(&amp;st_mfp.par_dt_reg)) {</div><div class='ctx'> 		ATARIHW_SET(ST_MFP);</div><div class='del'>-		printk("ST_MFP ");</div><div class='add'>+		pr_cont(" ST_MFP");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present(&amp;tt_mfp.par_dt_reg)) {</div><div class='ctx'> 		ATARIHW_SET(TT_MFP);</div><div class='del'>-		printk("TT_MFP ");</div><div class='add'>+		pr_cont(" TT_MFP");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present(&amp;tt_scsi_dma.dma_addr_hi)) {</div><div class='ctx'> 		ATARIHW_SET(SCSI_DMA);</div><div class='del'>-		printk("TT_SCSI_DMA ");</div><div class='add'>+		pr_cont(" TT_SCSI_DMA");</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The ST-DMA address registers aren't readable</div><div class='hunk'>@@ -284,27 +284,27 @@ void __init config_atari(void)</div><div class='ctx'> 	     (st_dma.dma_vhi = 0xaa) &amp;&amp; (st_dma.dma_hi = 0x55) &amp;&amp;</div><div class='ctx'> 	     st_dma.dma_vhi == 0xaa &amp;&amp; st_dma.dma_hi == 0x55)) {</div><div class='ctx'> 		ATARIHW_SET(EXTD_DMA);</div><div class='del'>-		printk("EXTD_DMA ");</div><div class='add'>+		pr_cont(" EXTD_DMA");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present(&amp;tt_scsi.scsi_data)) {</div><div class='ctx'> 		ATARIHW_SET(TT_SCSI);</div><div class='del'>-		printk("TT_SCSI ");</div><div class='add'>+		pr_cont(" TT_SCSI");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present(&amp;sound_ym.rd_data_reg_sel)) {</div><div class='ctx'> 		ATARIHW_SET(YM_2149);</div><div class='del'>-		printk("YM2149 ");</div><div class='add'>+		pr_cont(" YM2149");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!MACH_IS_MEDUSA &amp;&amp; hwreg_present(&amp;tt_dmasnd.ctrl)) {</div><div class='ctx'> 		ATARIHW_SET(PCM_8BIT);</div><div class='del'>-		printk("PCM ");</div><div class='add'>+		pr_cont(" PCM");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present(&amp;falcon_codec.unused5)) {</div><div class='ctx'> 		ATARIHW_SET(CODEC);</div><div class='del'>-		printk("CODEC ");</div><div class='add'>+		pr_cont(" CODEC");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present(&amp;dsp56k_host_interface.icr)) {</div><div class='ctx'> 		ATARIHW_SET(DSP56K);</div><div class='del'>-		printk("DSP56K ");</div><div class='add'>+		pr_cont(" DSP56K");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present(&amp;tt_scc_dma.dma_ctrl) &amp;&amp;</div><div class='ctx'> #if 0</div><div class='hunk'>@@ -316,33 +316,33 @@ void __init config_atari(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	    ) {</div><div class='ctx'> 		ATARIHW_SET(SCC_DMA);</div><div class='del'>-		printk("SCC_DMA ");</div><div class='add'>+		pr_cont(" SCC_DMA");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (scc_test(&amp;atari_scc.cha_a_ctrl)) {</div><div class='ctx'> 		ATARIHW_SET(SCC);</div><div class='del'>-		printk("SCC ");</div><div class='add'>+		pr_cont(" SCC");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (scc_test(&amp;st_escc.cha_b_ctrl)) {</div><div class='ctx'> 		ATARIHW_SET(ST_ESCC);</div><div class='del'>-		printk("ST_ESCC ");</div><div class='add'>+		pr_cont(" ST_ESCC");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present(&amp;tt_scu.sys_mask)) {</div><div class='ctx'> 		ATARIHW_SET(SCU);</div><div class='ctx'> 		/* Assume a VME bus if there's a SCU */</div><div class='ctx'> 		ATARIHW_SET(VME);</div><div class='del'>-		printk("VME SCU ");</div><div class='add'>+		pr_cont(" VME SCU");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present((void *)(0xffff9210))) {</div><div class='ctx'> 		ATARIHW_SET(ANALOG_JOY);</div><div class='del'>-		printk("ANALOG_JOY ");</div><div class='add'>+		pr_cont(" ANALOG_JOY");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present(blitter.halftone)) {</div><div class='ctx'> 		ATARIHW_SET(BLITTER);</div><div class='del'>-		printk("BLITTER ");</div><div class='add'>+		pr_cont(" BLITTER");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present((void *)0xfff00039)) {</div><div class='ctx'> 		ATARIHW_SET(IDE);</div><div class='del'>-		printk("IDE ");</div><div class='add'>+		pr_cont(" IDE");</div><div class='ctx'> 	}</div><div class='ctx'> #if 1 /* This maybe wrong */</div><div class='ctx'> 	if (!MACH_IS_MEDUSA &amp;&amp; hwreg_present(&amp;tt_microwire.data) &amp;&amp;</div><div class='hunk'>@@ -355,31 +355,31 @@ void __init config_atari(void)</div><div class='ctx'> 		ATARIHW_SET(MICROWIRE);</div><div class='ctx'> 		while (tt_microwire.mask != 0x7ff)</div><div class='ctx'> 			;</div><div class='del'>-		printk("MICROWIRE ");</div><div class='add'>+		pr_cont(" MICROWIRE");</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (hwreg_present(&amp;tt_rtc.regsel)) {</div><div class='ctx'> 		ATARIHW_SET(TT_CLK);</div><div class='del'>-		printk("TT_CLK ");</div><div class='add'>+		pr_cont(" TT_CLK");</div><div class='ctx'> 		mach_hwclk = atari_tt_hwclk;</div><div class='ctx'> 		mach_set_clock_mmss = atari_tt_set_clock_mmss;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hwreg_present(&amp;mste_rtc.sec_ones)) {</div><div class='ctx'> 		ATARIHW_SET(MSTE_CLK);</div><div class='del'>-		printk("MSTE_CLK ");</div><div class='add'>+		pr_cont(" MSTE_CLK");</div><div class='ctx'> 		mach_hwclk = atari_mste_hwclk;</div><div class='ctx'> 		mach_set_clock_mmss = atari_mste_set_clock_mmss;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!MACH_IS_MEDUSA &amp;&amp; hwreg_present(&amp;dma_wd.fdc_speed) &amp;&amp;</div><div class='ctx'> 	    hwreg_write(&amp;dma_wd.fdc_speed, 0)) {</div><div class='ctx'> 		ATARIHW_SET(FDCSPEED);</div><div class='del'>-		printk("FDC_SPEED ");</div><div class='add'>+		pr_cont(" FDC_SPEED");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!ATARIHW_PRESENT(ST_SCSI)) {</div><div class='ctx'> 		ATARIHW_SET(ACSI);</div><div class='del'>-		printk("ACSI ");</div><div class='add'>+		pr_cont(" ACSI");</div><div class='ctx'> 	}</div><div class='del'>-	printk("\n");</div><div class='add'>+	pr_cont("\n");</div><div class='ctx'> </div><div class='ctx'> 	if (CPU_IS_040_OR_060)</div><div class='ctx'> 		/* Now it seems to be safe to turn of the tt0 transparent</div><div class='hunk'>@@ -629,7 +629,7 @@ static void atari_get_hardware_list(struct seq_file *m)</div><div class='ctx'> 	if (ATARIHW_PRESENT(name))			\</div><div class='ctx'> 		seq_printf(m, "\t%s\n", str)</div><div class='ctx'> </div><div class='del'>-	seq_printf(m, "Detected hardware:\n");</div><div class='add'>+	seq_puts(m, "Detected hardware:\n");</div><div class='ctx'> 	ATARIHW_ANNOUNCE(STND_SHIFTER, "ST Shifter");</div><div class='ctx'> 	ATARIHW_ANNOUNCE(EXTD_SHIFTER, "STe Shifter");</div><div class='ctx'> 	ATARIHW_ANNOUNCE(TT_SHIFTER, "TT Shifter");</div><div class='head'>diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c<br/>index 611d4d9ea2bd..2cfff4765040 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/bvme6000/config.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/bvme6000/config.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/bvme6000/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/bvme6000/config.c</a></div><div class='hunk'>@@ -63,8 +63,8 @@ void bvme6000_reset(void)</div><div class='ctx'> {</div><div class='ctx'> 	volatile PitRegsPtr pit = (PitRegsPtr)BVME_PIT_BASE;</div><div class='ctx'> </div><div class='del'>-	printk ("\r\n\nCalled bvme6000_reset\r\n"</div><div class='del'>-			"\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r");</div><div class='add'>+	pr_info("\r\n\nCalled bvme6000_reset\r\n"</div><div class='add'>+		"\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r");</div><div class='ctx'> 	/* The string of returns is to delay the reset until the whole</div><div class='ctx'> 	 * message is output. */</div><div class='ctx'> 	/* Enable the watchdog, via PIT port C bit 4 */</div><div class='hunk'>@@ -117,8 +117,8 @@ void __init config_bvme6000(void)</div><div class='ctx'>     mach_reset		 = bvme6000_reset;</div><div class='ctx'>     mach_get_model       = bvme6000_get_model;</div><div class='ctx'> </div><div class='del'>-    printk ("Board is %sconfigured as a System Controller\n",</div><div class='del'>-		*config_reg_ptr &amp; BVME_CONFIG_SW1 ? "" : "not ");</div><div class='add'>+    pr_info("Board is %sconfigured as a System Controller\n",</div><div class='add'>+	    *config_reg_ptr &amp; BVME_CONFIG_SW1 ? "" : "not ");</div><div class='ctx'> </div><div class='ctx'>     /* Now do the PIT configuration */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c<br/>index f7984f44ff0f..e4f1faffe32b 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/bvme6000/rtc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/bvme6000/rtc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/bvme6000/rtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/bvme6000/rtc.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;asm/bvme6000hw.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -168,7 +168,7 @@ static int __init rtc_DP8570A_init(void)</div><div class='ctx'> 	if (!MACH_IS_BVME6000)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "DP8570A Real Time Clock Driver v%s\n", RTC_VERSION);</div><div class='add'>+	pr_info("DP8570A Real Time Clock Driver v%s\n", RTC_VERSION);</div><div class='ctx'> 	return misc_register(&amp;rtc_dev);</div><div class='ctx'> }</div><div class='ctx'> module_init(rtc_DP8570A_init);</div><div class='head'>diff --git a/arch/m68k/coldfire/Makefile b/arch/m68k/coldfire/Makefile<br/>index 68f0fac60099..4aa2c57afc35 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/Makefile</a></div><div class='hunk'>@@ -34,6 +34,7 @@ obj-$(CONFIG_NETtel)	+= nettel.o</div><div class='ctx'> obj-$(CONFIG_CLEOPATRA)	+= nettel.o</div><div class='ctx'> obj-$(CONFIG_FIREBEE)	+= firebee.o</div><div class='ctx'> obj-$(CONFIG_MCF8390)	+= mcf8390.o</div><div class='add'>+obj-$(CONFIG_AMCORE)    += amcore.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PCI)	+= pci.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/coldfire/amcore.c b/arch/m68k/coldfire/amcore.c<br/>new file mode 100644<br/>index 000000000000..c6cb1a5cc1a5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/amcore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/amcore.c</a></div><div class='hunk'>@@ -0,0 +1,156 @@</div><div class='add'>+/*</div><div class='add'>+ * amcore.c -- Support for Sysam AMCORE open board</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright 2016, Angelo Dureghello &lt;angelo@sysam.it&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file COPYING in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/dm9000.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/map.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/coldfire.h&gt;</div><div class='add'>+#include &lt;asm/mcfsim.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_DM9000)</div><div class='add'>+</div><div class='add'>+#define DM9000_IRQ	25</div><div class='add'>+#define DM9000_ADDR	0x30000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DEVICES and related device RESOURCES</div><div class='add'>+ */</div><div class='add'>+static struct resource dm9000_resources[] = {</div><div class='add'>+	/* physical address of the address register (CMD [A2] to 0)*/</div><div class='add'>+	[0] = {</div><div class='add'>+		.start  = DM9000_ADDR,</div><div class='add'>+		.end    = DM9000_ADDR,</div><div class='add'>+		.flags  = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	/*</div><div class='add'>+	 * physical address of the data register (CMD [A2] to 1),</div><div class='add'>+	 * driver wants a range &gt;=4 to assume a 32bit data bus</div><div class='add'>+	 */</div><div class='add'>+	[1] = {</div><div class='add'>+		.start  = DM9000_ADDR + 4,</div><div class='add'>+		.end    = DM9000_ADDR + 7,</div><div class='add'>+		.flags  = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	/* IRQ line the device's interrupt pin is connected to */</div><div class='add'>+	[2] = {</div><div class='add'>+		.start  = DM9000_IRQ,</div><div class='add'>+		.end    = DM9000_IRQ,</div><div class='add'>+		.flags  = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dm9000_plat_data dm9000_platdata = {</div><div class='add'>+	.flags		= DM9000_PLATF_32BITONLY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device dm9000_device = {</div><div class='add'>+	.name           = "dm9000",</div><div class='add'>+	.id             = 0,</div><div class='add'>+	.num_resources  = ARRAY_SIZE(dm9000_resources),</div><div class='add'>+	.resource       = dm9000_resources,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;dm9000_platdata,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __init dm9000_pre_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Set the dm9000 interrupt to be auto-vectored */</div><div class='add'>+	mcf_autovector(DM9000_IRQ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Partitioning of parallel NOR flash (39VF3201B)</div><div class='add'>+ */</div><div class='add'>+static struct mtd_partition amcore_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "U-Boot (128K)",</div><div class='add'>+		.size	= 0x20000,</div><div class='add'>+		.offset	= 0x0</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "Kernel+ROMfs (2994K)",</div><div class='add'>+		.size	= 0x2E0000,</div><div class='add'>+		.offset	= MTDPART_OFS_APPEND</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "Flash Free Space (1024K)",</div><div class='add'>+		.size	= MTDPART_SIZ_FULL,</div><div class='add'>+		.offset	= MTDPART_OFS_APPEND</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data flash_data = {</div><div class='add'>+	.parts		= amcore_partitions,</div><div class='add'>+	.nr_parts	= ARRAY_SIZE(amcore_partitions),</div><div class='add'>+	.width		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource flash_resource = {</div><div class='add'>+	.start		= 0xffc00000,</div><div class='add'>+	.end		= 0xffffffff,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device flash_device = {</div><div class='add'>+	.name		= "physmap-flash",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.resource	= &amp;flash_resource,</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;flash_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device rtc_device = {</div><div class='add'>+	.name	= "rtc-ds1307",</div><div class='add'>+	.id	= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info amcore_i2c_info[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		I2C_BOARD_INFO("ds1338", 0x68),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *amcore_devices[] __initdata = {</div><div class='add'>+#if IS_ENABLED(CONFIG_DM9000)</div><div class='add'>+	&amp;dm9000_device,</div><div class='add'>+#endif</div><div class='add'>+	&amp;flash_device,</div><div class='add'>+	&amp;rtc_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init init_amcore(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_DM9000)</div><div class='add'>+	dm9000_pre_init();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Add i2c RTC Dallas chip supprt */</div><div class='add'>+	i2c_register_board_info(0, amcore_i2c_info,</div><div class='add'>+				ARRAY_SIZE(amcore_i2c_info));</div><div class='add'>+</div><div class='add'>+	platform_add_devices(amcore_devices, ARRAY_SIZE(amcore_devices));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(init_amcore);</div><div class='head'>diff --git a/arch/m68k/coldfire/device.c b/arch/m68k/coldfire/device.c<br/>index a0fc0c192427..84938fdbbada 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/device.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/device.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/device.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/device.c</a></div><div class='hunk'>@@ -327,6 +327,147 @@ static struct platform_device mcf_qspi = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+static struct resource mcf_i2c0_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start          = MCFI2C_BASE0,</div><div class='add'>+		.end            = MCFI2C_BASE0 + MCFI2C_SIZE0 - 1,</div><div class='add'>+		.flags          = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start          = MCF_IRQ_I2C0,</div><div class='add'>+		.end            = MCF_IRQ_I2C0,</div><div class='add'>+		.flags          = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device mcf_i2c0 = {</div><div class='add'>+	.name                   = "imx1-i2c",</div><div class='add'>+	.id                     = 0,</div><div class='add'>+	.num_resources          = ARRAY_SIZE(mcf_i2c0_resources),</div><div class='add'>+	.resource               = mcf_i2c0_resources,</div><div class='add'>+};</div><div class='add'>+#ifdef MCFI2C_BASE1</div><div class='add'>+</div><div class='add'>+static struct resource mcf_i2c1_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start          = MCFI2C_BASE1,</div><div class='add'>+		.end            = MCFI2C_BASE1 + MCFI2C_SIZE1 - 1,</div><div class='add'>+		.flags          = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start          = MCF_IRQ_I2C1,</div><div class='add'>+		.end            = MCF_IRQ_I2C1,</div><div class='add'>+		.flags          = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device mcf_i2c1 = {</div><div class='add'>+	.name                   = "imx1-i2c",</div><div class='add'>+	.id                     = 1,</div><div class='add'>+	.num_resources          = ARRAY_SIZE(mcf_i2c1_resources),</div><div class='add'>+	.resource               = mcf_i2c1_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* MCFI2C_BASE1 */</div><div class='add'>+</div><div class='add'>+#ifdef MCFI2C_BASE2</div><div class='add'>+</div><div class='add'>+static struct resource mcf_i2c2_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start          = MCFI2C_BASE2,</div><div class='add'>+		.end            = MCFI2C_BASE2 + MCFI2C_SIZE2 - 1,</div><div class='add'>+		.flags          = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start          = MCF_IRQ_I2C2,</div><div class='add'>+		.end            = MCF_IRQ_I2C2,</div><div class='add'>+		.flags          = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device mcf_i2c2 = {</div><div class='add'>+	.name                   = "imx1-i2c",</div><div class='add'>+	.id                     = 2,</div><div class='add'>+	.num_resources          = ARRAY_SIZE(mcf_i2c2_resources),</div><div class='add'>+	.resource               = mcf_i2c2_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* MCFI2C_BASE2 */</div><div class='add'>+</div><div class='add'>+#ifdef MCFI2C_BASE3</div><div class='add'>+</div><div class='add'>+static struct resource mcf_i2c3_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start          = MCFI2C_BASE3,</div><div class='add'>+		.end            = MCFI2C_BASE3 + MCFI2C_SIZE3 - 1,</div><div class='add'>+		.flags          = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start          = MCF_IRQ_I2C3,</div><div class='add'>+		.end            = MCF_IRQ_I2C3,</div><div class='add'>+		.flags          = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device mcf_i2c3 = {</div><div class='add'>+	.name                   = "imx1-i2c",</div><div class='add'>+	.id                     = 3,</div><div class='add'>+	.num_resources          = ARRAY_SIZE(mcf_i2c3_resources),</div><div class='add'>+	.resource               = mcf_i2c3_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* MCFI2C_BASE3 */</div><div class='add'>+</div><div class='add'>+#ifdef MCFI2C_BASE4</div><div class='add'>+</div><div class='add'>+static struct resource mcf_i2c4_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start          = MCFI2C_BASE4,</div><div class='add'>+		.end            = MCFI2C_BASE4 + MCFI2C_SIZE4 - 1,</div><div class='add'>+		.flags          = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start          = MCF_IRQ_I2C4,</div><div class='add'>+		.end            = MCF_IRQ_I2C4,</div><div class='add'>+		.flags          = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device mcf_i2c4 = {</div><div class='add'>+	.name                   = "imx1-i2c",</div><div class='add'>+	.id                     = 4,</div><div class='add'>+	.num_resources          = ARRAY_SIZE(mcf_i2c4_resources),</div><div class='add'>+	.resource               = mcf_i2c4_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* MCFI2C_BASE4 */</div><div class='add'>+</div><div class='add'>+#ifdef MCFI2C_BASE5</div><div class='add'>+</div><div class='add'>+static struct resource mcf_i2c5_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start          = MCFI2C_BASE5,</div><div class='add'>+		.end            = MCFI2C_BASE5 + MCFI2C_SIZE5 - 1,</div><div class='add'>+		.flags          = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start          = MCF_IRQ_I2C5,</div><div class='add'>+		.end            = MCF_IRQ_I2C5,</div><div class='add'>+		.flags          = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device mcf_i2c5 = {</div><div class='add'>+	.name                   = "imx1-i2c",</div><div class='add'>+	.id                     = 5,</div><div class='add'>+	.num_resources          = ARRAY_SIZE(mcf_i2c5_resources),</div><div class='add'>+	.resource               = mcf_i2c5_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* MCFI2C_BASE5 */</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_I2C_IMX) */</div><div class='add'>+</div><div class='ctx'> static struct platform_device *mcf_devices[] __initdata = {</div><div class='ctx'> 	&amp;mcf_uart,</div><div class='ctx'> #if IS_ENABLED(CONFIG_FEC)</div><div class='hunk'>@@ -338,6 +479,24 @@ static struct platform_device *mcf_devices[] __initdata = {</div><div class='ctx'> #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)</div><div class='ctx'> 	&amp;mcf_qspi,</div><div class='ctx'> #endif</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+	&amp;mcf_i2c0,</div><div class='add'>+#ifdef MCFI2C_BASE1</div><div class='add'>+	&amp;mcf_i2c1,</div><div class='add'>+#endif</div><div class='add'>+#ifdef MCFI2C_BASE2</div><div class='add'>+	&amp;mcf_i2c2,</div><div class='add'>+#endif</div><div class='add'>+#ifdef MCFI2C_BASE3</div><div class='add'>+	&amp;mcf_i2c3,</div><div class='add'>+#endif</div><div class='add'>+#ifdef MCFI2C_BASE4</div><div class='add'>+	&amp;mcf_i2c4,</div><div class='add'>+#endif</div><div class='add'>+#ifdef MCFI2C_BASE5</div><div class='add'>+	&amp;mcf_i2c5,</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/m68k/coldfire/dma_timer.c b/arch/m68k/coldfire/dma_timer.c<br/>index 235ad57c4707..8273eea57874 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/dma_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/dma_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/dma_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/dma_timer.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #define DMA_DTMR_CLK_DIV_16	(2 &lt;&lt; 1)</div><div class='ctx'> #define DMA_DTMR_ENABLE		(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='del'>-static cycle_t cf_dt_get_cycles(struct clocksource *cs)</div><div class='add'>+static u64 cf_dt_get_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return __raw_readl(DTCN0);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/coldfire/m5206.c b/arch/m68k/coldfire/m5206.c<br/>index 8945f5e7b39c..a3bcf0883f98 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m5206.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m5206.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m5206.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m5206.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@ DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);</div><div class='add'>+DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);</div><div class='ctx'> </div><div class='ctx'> struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_pll,</div><div class='hunk'>@@ -34,11 +35,21 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_mcftmr1,</div><div class='ctx'> 	&amp;clk_mcfuart0,</div><div class='ctx'> 	&amp;clk_mcfuart1,</div><div class='add'>+	&amp;clk_mcfi2c0,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+static void __init m5206_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+	writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL5 | MCFSIM_ICR_PRI0,</div><div class='add'>+	       MCFSIM_I2CICR);</div><div class='add'>+	mcf_mapirq2imr(MCF_IRQ_I2C0, MCFINTC_I2C);</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_I2C_IMX) */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init config_BSP(char *commandp, int size)</div><div class='ctx'> {</div><div class='ctx'> #if defined(CONFIG_NETtel)</div><div class='hunk'>@@ -53,6 +64,7 @@ void __init config_BSP(char *commandp, int size)</div><div class='ctx'> 	mcf_mapirq2imr(25, MCFINTC_EINT1);</div><div class='ctx'> 	mcf_mapirq2imr(28, MCFINTC_EINT4);</div><div class='ctx'> 	mcf_mapirq2imr(31, MCFINTC_EINT7);</div><div class='add'>+	m5206_i2c_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='head'>diff --git a/arch/m68k/coldfire/m520x.c b/arch/m68k/coldfire/m520x.c<br/>index 173834f251eb..5ba69217ce6c 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m520x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m520x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m520x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m520x.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@ DEFINE_CLK(0, "fec.0", 12, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "edma", 17, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "intc.0", 18, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "iack.0", 21, MCF_CLK);</div><div class='del'>-DEFINE_CLK(0, "mcfi2c.0", 22, MCF_CLK);</div><div class='add'>+DEFINE_CLK(0, "imx1-i2c.0", 22, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfqspi.0", 23, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfuart.0", 24, MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfuart.1", 25, MCF_BUSCLK);</div><div class='hunk'>@@ -53,7 +53,7 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;__clk_0_17, /* edma */</div><div class='ctx'> 	&amp;__clk_0_18, /* intc.0 */</div><div class='ctx'> 	&amp;__clk_0_21, /* iack.0 */</div><div class='del'>-	&amp;__clk_0_22, /* mcfi2c.0 */</div><div class='add'>+	&amp;__clk_0_22, /* imx1-i2c.0 */</div><div class='ctx'> 	&amp;__clk_0_23, /* mcfqspi.0 */</div><div class='ctx'> 	&amp;__clk_0_24, /* mcfuart.0 */</div><div class='ctx'> 	&amp;__clk_0_25, /* mcfuart.1 */</div><div class='hunk'>@@ -71,7 +71,7 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;__clk_0_40, /* sys.0 */</div><div class='ctx'> 	&amp;__clk_0_41, /* gpio.0 */</div><div class='ctx'> 	&amp;__clk_0_42, /* sdram.0 */</div><div class='del'>-NULL,</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk * const enable_clks[] __initconst = {</div><div class='hunk'>@@ -94,7 +94,7 @@ static struct clk * const enable_clks[] __initconst = {</div><div class='ctx'> static struct clk * const disable_clks[] __initconst = {</div><div class='ctx'> 	&amp;__clk_0_12, /* fec.0 */</div><div class='ctx'> 	&amp;__clk_0_17, /* edma */</div><div class='del'>-	&amp;__clk_0_22, /* mcfi2c.0 */</div><div class='add'>+	&amp;__clk_0_22, /* imx1-i2c.0 */</div><div class='ctx'> 	&amp;__clk_0_23, /* mcfqspi.0 */</div><div class='ctx'> 	&amp;__clk_0_28, /* mcftmr.0 */</div><div class='ctx'> 	&amp;__clk_0_29, /* mcftmr.1 */</div><div class='hunk'>@@ -133,6 +133,21 @@ static void __init m520x_qspi_init(void)</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+static void __init m520x_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+	u8 par;</div><div class='add'>+</div><div class='add'>+	/* setup Port FECI2C Pin Assignment Register for I2C */</div><div class='add'>+	/*  set PAR_SCL to SCL and PAR_SDA to SDA */</div><div class='add'>+	par = readb(MCF_GPIO_PAR_FECI2C);</div><div class='add'>+	par |= 0x0f;</div><div class='add'>+	writeb(par, MCF_GPIO_PAR_FECI2C);</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_I2C_IMX) */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='ctx'> static void __init m520x_uarts_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	u16 par;</div><div class='hunk'>@@ -175,6 +190,7 @@ void __init config_BSP(char *commandp, int size)</div><div class='ctx'> 	m520x_uarts_init();</div><div class='ctx'> 	m520x_fec_init();</div><div class='ctx'> 	m520x_qspi_init();</div><div class='add'>+	m520x_i2c_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='head'>diff --git a/arch/m68k/coldfire/m523x.c b/arch/m68k/coldfire/m523x.c<br/>index a191a467eff2..f7a0fcc5618c 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m523x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m523x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m523x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m523x.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@ DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart2, "mcfuart.2", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(fec0, "fec.0", MCF_BUSCLK);</div><div class='add'>+DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);</div><div class='ctx'> </div><div class='ctx'> struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_pll,</div><div class='hunk'>@@ -47,6 +48,7 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_mcfuart2,</div><div class='ctx'> 	&amp;clk_mcfqspi0,</div><div class='ctx'> 	&amp;clk_fec0,</div><div class='add'>+	&amp;clk_mcfi2c0,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -68,6 +70,21 @@ static void __init m523x_qspi_init(void)</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+static void __init m523x_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+	u8 par;</div><div class='add'>+</div><div class='add'>+	/* setup Port AS Pin Assignment Register for I2C */</div><div class='add'>+	/*  set PASPA0 to SCL and PASPA1 to SDA */</div><div class='add'>+	par = readb(MCFGPIO_PAR_FECI2C);</div><div class='add'>+	par |= 0x0f;</div><div class='add'>+	writeb(par, MCFGPIO_PAR_FECI2C);</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_I2C_IMX) */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='ctx'> static void __init m523x_fec_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Set multi-function pins to ethernet use */</div><div class='hunk'>@@ -81,6 +98,7 @@ void __init config_BSP(char *commandp, int size)</div><div class='ctx'> 	mach_sched_init = hw_timer_init;</div><div class='ctx'> 	m523x_fec_init();</div><div class='ctx'> 	m523x_qspi_init();</div><div class='add'>+	m523x_i2c_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='head'>diff --git a/arch/m68k/coldfire/m5249.c b/arch/m68k/coldfire/m5249.c<br/>index e48f55adc447..b16cf9b4580c 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m5249.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m5249.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m5249.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m5249.c</a></div><div class='hunk'>@@ -27,6 +27,8 @@ DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK);</div><div class='add'>+DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);</div><div class='add'>+DEFINE_CLK(mcfi2c1, "imx1-i2c.1", MCF_BUSCLK);</div><div class='ctx'> </div><div class='ctx'> struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_pll,</div><div class='hunk'>@@ -36,6 +38,8 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_mcfuart0,</div><div class='ctx'> 	&amp;clk_mcfuart1,</div><div class='ctx'> 	&amp;clk_mcfqspi0,</div><div class='add'>+	&amp;clk_mcfi2c0,</div><div class='add'>+	&amp;clk_mcfi2c1,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -85,6 +89,26 @@ static void __init m5249_qspi_init(void)</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+static void __init m5249_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+	u32 r;</div><div class='add'>+</div><div class='add'>+	/* first I2C controller uses regular irq setup */</div><div class='add'>+	writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL5 | MCFSIM_ICR_PRI0,</div><div class='add'>+	       MCFSIM_I2CICR);</div><div class='add'>+	mcf_mapirq2imr(MCF_IRQ_I2C0, MCFINTC_I2C);</div><div class='add'>+</div><div class='add'>+	/* second I2C controller is completely different */</div><div class='add'>+	r = readl(MCFINTC2_INTPRI_REG(MCF_IRQ_I2C1));</div><div class='add'>+	r &amp;= ~MCFINTC2_INTPRI_BITS(0xf, MCF_IRQ_I2C1);</div><div class='add'>+	r |= MCFINTC2_INTPRI_BITS(0x5, MCF_IRQ_I2C1);</div><div class='add'>+	writel(r, MCFINTC2_INTPRI_REG(MCF_IRQ_I2C1));</div><div class='add'>+#endif /* CONFIG_I2C_IMX */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_M5249C3</div><div class='ctx'> </div><div class='ctx'> static void __init m5249_smc91x_init(void)</div><div class='hunk'>@@ -111,6 +135,7 @@ void __init config_BSP(char *commandp, int size)</div><div class='ctx'> 	m5249_smc91x_init();</div><div class='ctx'> #endif</div><div class='ctx'> 	m5249_qspi_init();</div><div class='add'>+	m5249_i2c_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='head'>diff --git a/arch/m68k/coldfire/m525x.c b/arch/m68k/coldfire/m525x.c<br/>index 3d8583e2187c..110e2cd34e62 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m525x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m525x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m525x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m525x.c</a></div><div class='hunk'>@@ -27,6 +27,8 @@ DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK);</div><div class='add'>+DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);</div><div class='add'>+DEFINE_CLK(mcfi2c1, "imx1-i2c.1", MCF_BUSCLK);</div><div class='ctx'> </div><div class='ctx'> struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_pll,</div><div class='hunk'>@@ -36,6 +38,8 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_mcfuart0,</div><div class='ctx'> 	&amp;clk_mcfuart1,</div><div class='ctx'> 	&amp;clk_mcfqspi0,</div><div class='add'>+	&amp;clk_mcfi2c0,</div><div class='add'>+	&amp;clk_mcfi2c1,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -59,12 +63,12 @@ static void __init m525x_qspi_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __init m525x_i2c_init(void)</div><div class='ctx'> {</div><div class='del'>-#if IS_ENABLED(CONFIG_I2C_COLDFIRE)</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='ctx'> 	u32 r;</div><div class='ctx'> </div><div class='ctx'> 	/* first I2C controller uses regular irq setup */</div><div class='ctx'> 	writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL5 | MCFSIM_ICR_PRI0,</div><div class='del'>-		MCFSIM_I2CICR);</div><div class='add'>+	       MCFSIM_I2CICR);</div><div class='ctx'> 	mcf_mapirq2imr(MCF_IRQ_I2C0, MCFINTC_I2C);</div><div class='ctx'> </div><div class='ctx'> 	/* second I2C controller is completely different */</div><div class='hunk'>@@ -72,7 +76,7 @@ static void __init m525x_i2c_init(void)</div><div class='ctx'> 	r &amp;= ~MCFINTC2_INTPRI_BITS(0xf, MCF_IRQ_I2C1);</div><div class='ctx'> 	r |= MCFINTC2_INTPRI_BITS(0x5, MCF_IRQ_I2C1);</div><div class='ctx'> 	writel(r, MCFINTC2_INTPRI_REG(MCF_IRQ_I2C1));</div><div class='del'>-#endif /* IS_ENABLED(CONFIG_I2C_COLDFIRE) */</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_I2C_IMX) */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='head'>diff --git a/arch/m68k/coldfire/m527x.c b/arch/m68k/coldfire/m527x.c<br/>index c0b3e28f91df..b10b436b5a31 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m527x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m527x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m527x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m527x.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@ DEFINE_CLK(mcfuart2, "mcfuart.2", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(fec0, "fec.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(fec1, "fec.1", MCF_BUSCLK);</div><div class='add'>+DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);</div><div class='ctx'> </div><div class='ctx'> struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_pll,</div><div class='hunk'>@@ -50,6 +51,7 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_mcfqspi0,</div><div class='ctx'> 	&amp;clk_fec0,</div><div class='ctx'> 	&amp;clk_fec1,</div><div class='add'>+	&amp;clk_mcfi2c0,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -76,6 +78,31 @@ static void __init m527x_qspi_init(void)</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+static void __init m527x_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+#if defined(CONFIG_M5271)</div><div class='add'>+	u8 par;</div><div class='add'>+</div><div class='add'>+	/* setup Port FECI2C Pin Assignment Register for I2C */</div><div class='add'>+	/*  set PAR_SCL to SCL and PAR_SDA to SDA */</div><div class='add'>+	par = readb(MCFGPIO_PAR_FECI2C);</div><div class='add'>+	par |= 0x0f;</div><div class='add'>+	writeb(par, MCFGPIO_PAR_FECI2C);</div><div class='add'>+#elif defined(CONFIG_M5275)</div><div class='add'>+	u16 par;</div><div class='add'>+</div><div class='add'>+	/* setup Port FECI2C Pin Assignment Register for I2C */</div><div class='add'>+	/*  set PAR_SCL to SCL and PAR_SDA to SDA */</div><div class='add'>+	par = readw(MCFGPIO_PAR_FECI2C);</div><div class='add'>+	par |= 0x0f;</div><div class='add'>+	writew(par, MCFGPIO_PAR_FECI2C);</div><div class='add'>+#endif</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_I2C_IMX) */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='ctx'> static void __init m527x_uarts_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	u16 sepmask;</div><div class='hunk'>@@ -122,6 +149,7 @@ void __init config_BSP(char *commandp, int size)</div><div class='ctx'> 	m527x_uarts_init();</div><div class='ctx'> 	m527x_fec_init();</div><div class='ctx'> 	m527x_qspi_init();</div><div class='add'>+	m527x_i2c_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='head'>diff --git a/arch/m68k/coldfire/m528x.c b/arch/m68k/coldfire/m528x.c<br/>index 12f9e370d8dd..ea76998d5ab9 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m528x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m528x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m528x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m528x.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@ DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart2, "mcfuart.2", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfqspi0, "mcfqspi.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(fec0, "fec.0", MCF_BUSCLK);</div><div class='add'>+DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);</div><div class='ctx'> </div><div class='ctx'> struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_pll,</div><div class='hunk'>@@ -49,6 +50,7 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_mcfuart2,</div><div class='ctx'> 	&amp;clk_mcfqspi0,</div><div class='ctx'> 	&amp;clk_fec0,</div><div class='add'>+	&amp;clk_mcfi2c0,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -64,6 +66,21 @@ static void __init m528x_qspi_init(void)</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+static void __init m528x_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+	u16 paspar;</div><div class='add'>+</div><div class='add'>+	/* setup Port AS Pin Assignment Register for I2C */</div><div class='add'>+	/*  set PASPA0 to SCL and PASPA1 to SDA */</div><div class='add'>+	paspar = readw(MCFGPIO_PASPAR);</div><div class='add'>+	paspar |= 0xF;</div><div class='add'>+	writew(paspar, MCFGPIO_PASPAR);</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_I2C_IMX) */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='ctx'> static void __init m528x_uarts_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	u8 port;</div><div class='hunk'>@@ -127,6 +144,7 @@ void __init config_BSP(char *commandp, int size)</div><div class='ctx'> 	m528x_uarts_init();</div><div class='ctx'> 	m528x_fec_init();</div><div class='ctx'> 	m528x_qspi_init();</div><div class='add'>+	m528x_i2c_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='head'>diff --git a/arch/m68k/coldfire/m5307.c b/arch/m68k/coldfire/m5307.c<br/>index 2da1d146e344..cc5e8a50a423 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m5307.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m5307.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m5307.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m5307.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@ DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);</div><div class='add'>+DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);</div><div class='ctx'> </div><div class='ctx'> struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_pll,</div><div class='hunk'>@@ -43,11 +44,23 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_mcftmr1,</div><div class='ctx'> 	&amp;clk_mcfuart0,</div><div class='ctx'> 	&amp;clk_mcfuart1,</div><div class='add'>+	&amp;clk_mcfi2c0,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+static void __init m5307_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+	writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL5 | MCFSIM_ICR_PRI0,</div><div class='add'>+	       MCFSIM_I2CICR);</div><div class='add'>+	mcf_mapirq2imr(MCF_IRQ_I2C0, MCFINTC_I2C);</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_I2C_IMX) */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='ctx'> void __init config_BSP(char *commandp, int size)</div><div class='ctx'> {</div><div class='ctx'> #if defined(CONFIG_NETtel) || \</div><div class='hunk'>@@ -73,6 +86,7 @@ void __init config_BSP(char *commandp, int size)</div><div class='ctx'> 	 */</div><div class='ctx'> 	wdebug(MCFDEBUG_CSR, MCFDEBUG_CSR_PSTCLK);</div><div class='ctx'> #endif</div><div class='add'>+	m5307_i2c_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='head'>diff --git a/arch/m68k/coldfire/m53xx.c b/arch/m68k/coldfire/m53xx.c<br/>index 2502f63960bc..cf1917934b8a 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m53xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m53xx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m53xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m53xx.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@ DEFINE_CLK(0, "edma", 17, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "intc.0", 18, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "intc.1", 19, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "iack.0", 21, MCF_CLK);</div><div class='del'>-DEFINE_CLK(0, "mcfi2c.0", 22, MCF_CLK);</div><div class='add'>+DEFINE_CLK(0, "imx1-i2c.0", 22, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfqspi.0", 23, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfuart.0", 24, MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfuart.1", 25, MCF_BUSCLK);</div><div class='hunk'>@@ -77,7 +77,7 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;__clk_0_18,	/* intc.0 */</div><div class='ctx'> 	&amp;__clk_0_19,	/* intc.1 */</div><div class='ctx'> 	&amp;__clk_0_21,	/* iack.0 */</div><div class='del'>-	&amp;__clk_0_22,	/* mcfi2c.0 */</div><div class='add'>+	&amp;__clk_0_22,	/* imx1-i2c.0 */</div><div class='ctx'> 	&amp;__clk_0_23,	/* mcfqspi.0 */</div><div class='ctx'> 	&amp;__clk_0_24,	/* mcfuart.0 */</div><div class='ctx'> 	&amp;__clk_0_25,	/* mcfuart.1 */</div><div class='hunk'>@@ -133,7 +133,7 @@ static struct clk * const disable_clks[] __initconst = {</div><div class='ctx'> 	&amp;__clk_0_8,	/* mcfcan.0 */</div><div class='ctx'> 	&amp;__clk_0_12,	/* fec.0 */</div><div class='ctx'> 	&amp;__clk_0_17,	/* edma */</div><div class='del'>-	&amp;__clk_0_22,	/* mcfi2c.0 */</div><div class='add'>+	&amp;__clk_0_22,	/* imx1-i2c.0 */</div><div class='ctx'> 	&amp;__clk_0_23,	/* mcfqspi.0 */</div><div class='ctx'> 	&amp;__clk_0_30,	/* mcftmr.2 */</div><div class='ctx'> 	&amp;__clk_0_31,	/* mcftmr.3 */</div><div class='hunk'>@@ -176,6 +176,19 @@ static void __init m53xx_qspi_init(void)</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+static void __init m53xx_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+	/* setup Port AS Pin Assignment Register for I2C */</div><div class='add'>+	/*  set PASPA0 to SCL and PASPA1 to SDA */</div><div class='add'>+	u8 r = readb(MCFGPIO_PAR_FECI2C);</div><div class='add'>+	r |= 0x0f;</div><div class='add'>+	writeb(r, MCFGPIO_PAR_FECI2C);</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_I2C_IMX) */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='ctx'> static void __init m53xx_uarts_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* UART GPIO initialization */</div><div class='hunk'>@@ -218,6 +231,7 @@ void __init config_BSP(char *commandp, int size)</div><div class='ctx'> 	m53xx_uarts_init();</div><div class='ctx'> 	m53xx_fec_init();</div><div class='ctx'> 	m53xx_qspi_init();</div><div class='add'>+	m53xx_i2c_init();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BDM_DISABLE</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/m68k/coldfire/m5407.c b/arch/m68k/coldfire/m5407.c<br/>index 738eba6be40e..38863ddbeab0 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m5407.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m5407.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m5407.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m5407.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@ DEFINE_CLK(mcftmr0, "mcftmr.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcftmr1, "mcftmr.1", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);</div><div class='add'>+DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);</div><div class='ctx'> </div><div class='ctx'> struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_pll,</div><div class='hunk'>@@ -34,11 +35,23 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_mcftmr1,</div><div class='ctx'> 	&amp;clk_mcfuart0,</div><div class='ctx'> 	&amp;clk_mcfuart1,</div><div class='add'>+	&amp;clk_mcfi2c0,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+static void __init m5407_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+	writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL5 | MCFSIM_ICR_PRI0,</div><div class='add'>+	       MCFSIM_I2CICR);</div><div class='add'>+	mcf_mapirq2imr(MCF_IRQ_I2C0, MCFINTC_I2C);</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_I2C_IMX) */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='ctx'> void __init config_BSP(char *commandp, int size)</div><div class='ctx'> {</div><div class='ctx'> 	mach_sched_init = hw_timer_init;</div><div class='hunk'>@@ -48,6 +61,7 @@ void __init config_BSP(char *commandp, int size)</div><div class='ctx'> 	mcf_mapirq2imr(27, MCFINTC_EINT3);</div><div class='ctx'> 	mcf_mapirq2imr(29, MCFINTC_EINT5);</div><div class='ctx'> 	mcf_mapirq2imr(31, MCFINTC_EINT7);</div><div class='add'>+	m5407_i2c_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='head'>diff --git a/arch/m68k/coldfire/m5441x.c b/arch/m68k/coldfire/m5441x.c<br/>index 98a13cce93d8..dc589b039b62 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m5441x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m5441x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m5441x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m5441x.c</a></div><div class='hunk'>@@ -19,13 +19,13 @@</div><div class='ctx'> DEFINE_CLK(0, "flexbus", 2, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfcan.0", 8, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfcan.1", 9, MCF_CLK);</div><div class='del'>-DEFINE_CLK(0, "mcfi2c.1", 14, MCF_CLK);</div><div class='add'>+DEFINE_CLK(0, "imx1-i2c.1", 14, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfdspi.1", 15, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "edma", 17, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "intc.0", 18, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "intc.1", 19, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "intc.2", 20, MCF_CLK);</div><div class='del'>-DEFINE_CLK(0, "mcfi2c.0", 22, MCF_CLK);</div><div class='add'>+DEFINE_CLK(0, "imx1-i2c.0", 22, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfdspi.0", 23, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfuart.0", 24, MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(0, "mcfuart.1", 25, MCF_BUSCLK);</div><div class='hunk'>@@ -59,10 +59,10 @@ DEFINE_CLK(0, "switch.1", 56, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(0, "nand.0", 63, MCF_CLK);</div><div class='ctx'> </div><div class='ctx'> DEFINE_CLK(1, "mcfow.0", 2, MCF_CLK);</div><div class='del'>-DEFINE_CLK(1, "mcfi2c.2", 4, MCF_CLK);</div><div class='del'>-DEFINE_CLK(1, "mcfi2c.3", 5, MCF_CLK);</div><div class='del'>-DEFINE_CLK(1, "mcfi2c.4", 6, MCF_CLK);</div><div class='del'>-DEFINE_CLK(1, "mcfi2c.5", 7, MCF_CLK);</div><div class='add'>+DEFINE_CLK(1, "imx1-i2c.2", 4, MCF_CLK);</div><div class='add'>+DEFINE_CLK(1, "imx1-i2c.3", 5, MCF_CLK);</div><div class='add'>+DEFINE_CLK(1, "imx1-i2c.4", 6, MCF_CLK);</div><div class='add'>+DEFINE_CLK(1, "imx1-i2c.5", 7, MCF_CLK);</div><div class='ctx'> DEFINE_CLK(1, "mcfuart.4", 24, MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(1, "mcfuart.5", 25, MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(1, "mcfuart.6", 26, MCF_BUSCLK);</div><div class='head'>diff --git a/arch/m68k/coldfire/m54xx.c b/arch/m68k/coldfire/m54xx.c<br/>index 386df3b68cdf..c552851ec617 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/m54xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/m54xx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/m54xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/m54xx.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@ DEFINE_CLK(mcfuart0, "mcfuart.0", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart1, "mcfuart.1", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart2, "mcfuart.2", MCF_BUSCLK);</div><div class='ctx'> DEFINE_CLK(mcfuart3, "mcfuart.3", MCF_BUSCLK);</div><div class='add'>+DEFINE_CLK(mcfi2c0, "imx1-i2c.0", MCF_BUSCLK);</div><div class='ctx'> </div><div class='ctx'> struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_pll,</div><div class='hunk'>@@ -47,6 +48,7 @@ struct clk *mcf_clks[] = {</div><div class='ctx'> 	&amp;clk_mcfuart1,</div><div class='ctx'> 	&amp;clk_mcfuart2,</div><div class='ctx'> 	&amp;clk_mcfuart3,</div><div class='add'>+	&amp;clk_mcfi2c0,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -65,6 +67,20 @@ static void __init m54xx_uarts_init(void)</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+static void __init m54xx_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_I2C_IMX)</div><div class='add'>+	u32 r;</div><div class='add'>+</div><div class='add'>+	/* set the fec/i2c/irq pin assignment register for i2c */</div><div class='add'>+	r = readl(MCF_PAR_FECI2CIRQ);</div><div class='add'>+	r |= MCF_PAR_FECI2CIRQ_SDA | MCF_PAR_FECI2CIRQ_SCL;</div><div class='add'>+	writel(r, MCF_PAR_FECI2CIRQ);</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_I2C_IMX) */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='ctx'> static void mcf54xx_reset(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* disable interrupts and enable the watchdog */</div><div class='hunk'>@@ -86,6 +102,7 @@ void __init config_BSP(char *commandp, int size)</div><div class='ctx'> 	mach_reset = mcf54xx_reset;</div><div class='ctx'> 	mach_sched_init = hw_timer_init;</div><div class='ctx'> 	m54xx_uarts_init();</div><div class='add'>+	m54xx_i2c_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='head'>diff --git a/arch/m68k/coldfire/pit.c b/arch/m68k/coldfire/pit.c<br/>index d86a9ffb3f13..175553d5b8ed 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/pit.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/pit.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/pit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/pit.c</a></div><div class='hunk'>@@ -118,7 +118,7 @@ static struct irqaction pit_irq = {</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-static cycle_t pit_read_clk(struct clocksource *cs)</div><div class='add'>+static u64 pit_read_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 cycles;</div><div class='head'>diff --git a/arch/m68k/coldfire/sltimers.c b/arch/m68k/coldfire/sltimers.c<br/>index 831a08cf6f40..3292c0d68b18 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/sltimers.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/sltimers.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/sltimers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/sltimers.c</a></div><div class='hunk'>@@ -97,7 +97,7 @@ static struct irqaction mcfslt_timer_irq = {</div><div class='ctx'> 	.handler = mcfslt_tick,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static cycle_t mcfslt_read_clk(struct clocksource *cs)</div><div class='add'>+static u64 mcfslt_read_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 cycles, scnt;</div><div class='head'>diff --git a/arch/m68k/coldfire/timers.c b/arch/m68k/coldfire/timers.c<br/>index cd496a20fcc7..2dc7a58204f6 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/coldfire/timers.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/coldfire/timers.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/coldfire/timers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/coldfire/timers.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ static struct irqaction mcftmr_timer_irq = {</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-static cycle_t mcftmr_read_clk(struct clocksource *cs)</div><div class='add'>+static u64 mcftmr_read_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 cycles;</div><div class='head'>diff --git a/arch/m68k/configs/amcore_defconfig b/arch/m68k/configs/amcore_defconfig<br/>new file mode 100644<br/>index 000000000000..131b4101ae5d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/amcore_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/amcore_defconfig</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+CONFIG_LOCALVERSION="amcore-002"</div><div class='add'>+CONFIG_DEFAULT_HOSTNAME="amcore"</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_FHANDLE is not set</div><div class='add'>+# CONFIG_USELIB is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+# CONFIG_AIO is not set</div><div class='add'>+# CONFIG_ADVISE_SYSCALLS is not set</div><div class='add'>+# CONFIG_MEMBARRIER is not set</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+# CONFIG_VM_EVENT_COUNTERS is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG is not set</div><div class='add'>+# CONFIG_COMPAT_BRK is not set</div><div class='add'>+# CONFIG_LBDAF is not set</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+# CONFIG_MMU is not set</div><div class='add'>+CONFIG_M5307=y</div><div class='add'>+CONFIG_AMCORE=y</div><div class='add'>+CONFIG_UBOOT=y</div><div class='add'>+CONFIG_RAMSIZE=0x1000000</div><div class='add'>+CONFIG_KERNELBASE=0x20000</div><div class='add'>+CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0</div><div class='add'>+CONFIG_BINFMT_FLAT=y</div><div class='add'>+# CONFIG_COREDUMP is not set</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_WIRELESS is not set</div><div class='add'>+# CONFIG_UEVENT_HELPER is not set</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_ALLOW_DEV_COREDUMP is not set</div><div class='add'>+CONFIG_CONNECTOR=y</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+CONFIG_MTD_JEDECPROBE=y</div><div class='add'>+CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='add'>+CONFIG_MTD_CFI_LE_BYTE_SWAP=y</div><div class='add'>+CONFIG_MTD_CFI_GEOMETRY=y</div><div class='add'>+# CONFIG_MTD_CFI_I2 is not set</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+CONFIG_MTD_CFI_STAA=y</div><div class='add'>+CONFIG_MTD_ROM=y</div><div class='add'>+CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='add'>+CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_UCLINUX=y</div><div class='add'>+CONFIG_MTD_PLATRAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NET_VENDOR_AMAZON is not set</div><div class='add'>+# CONFIG_NET_VENDOR_ARC is not set</div><div class='add'>+# CONFIG_NET_CADENCE is not set</div><div class='add'>+# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='add'>+CONFIG_DM9000=y</div><div class='add'>+# CONFIG_NET_VENDOR_EZCHIP is not set</div><div class='add'>+# CONFIG_NET_VENDOR_INTEL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MARVELL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MICREL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NETRONOME is not set</div><div class='add'>+# CONFIG_NET_VENDOR_QUALCOMM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_RENESAS is not set</div><div class='add'>+# CONFIG_NET_VENDOR_ROCKER is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SMSC is not set</div><div class='add'>+# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='add'>+# CONFIG_NET_VENDOR_VIA is not set</div><div class='add'>+# CONFIG_NET_VENDOR_WIZNET is not set</div><div class='add'>+# CONFIG_WLAN is not set</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_UNIX98_PTYS is not set</div><div class='add'>+# CONFIG_DEVMEM is not set</div><div class='add'>+# CONFIG_DEVKMEM is not set</div><div class='add'>+CONFIG_SERIAL_MCF=y</div><div class='add'>+CONFIG_SERIAL_MCF_BAUDRATE=115200</div><div class='add'>+CONFIG_SERIAL_MCF_CONSOLE=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+# CONFIG_I2C_COMPAT is not set</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+# CONFIG_I2C_HELPER_AUTO is not set</div><div class='add'>+CONFIG_I2C_IMX=y</div><div class='add'>+CONFIG_GPIO_SYSFS=y</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+# CONFIG_RTC_SYSTOHC is not set</div><div class='add'>+CONFIG_RTC_DRV_DS1307=y</div><div class='add'>+# CONFIG_FILE_LOCKING is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+# CONFIG_INOTIFY_USER is not set</div><div class='add'>+CONFIG_FSCACHE=y</div><div class='add'>+# CONFIG_PROC_SYSCTL is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_ROMFS_FS=y</div><div class='add'>+CONFIG_ROMFS_BACKED_BY_BOTH=y</div><div class='add'>+# CONFIG_NETWORK_FILESYSTEMS is not set</div><div class='add'>+CONFIG_PRINTK_TIME=y</div><div class='add'>+# CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='add'>+# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set</div><div class='add'>+CONFIG_PANIC_ON_OOPS=y</div><div class='add'>+# CONFIG_SCHED_DEBUG is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_CRYPTO_ECHAINIV is not set</div><div class='add'>+CONFIG_CRYPTO_ANSI_CPRNG=y</div><div class='add'>+# CONFIG_CRYPTO_HW is not set</div><div class='add'>+CONFIG_CRC16=y</div><div class='head'>diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig<br/>index b98acd15ca22..048bf076f7df 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/amiga_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/amiga_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/amiga_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/amiga_defconfig</a></div><div class='hunk'>@@ -66,6 +66,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -76,10 +77,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -95,6 +96,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -105,11 +107,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -176,6 +180,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -184,8 +189,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -212,8 +219,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -294,6 +303,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_PARPORT=m</div><div class='ctx'> CONFIG_PARPORT_AMIGA=m</div><div class='hunk'>@@ -369,6 +379,7 @@ CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='ctx'> # CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> CONFIG_A2065=y</div><div class='ctx'> CONFIG_ARIADNE=y</div><div class='hunk'>@@ -390,6 +401,7 @@ CONFIG_ZORRO8390=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SMSC is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='hunk'>@@ -421,7 +433,6 @@ CONFIG_INPUT_MISC=y</div><div class='ctx'> CONFIG_INPUT_M68K_BEEP=m</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> CONFIG_PRINTER=m</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_NTP_PPS=y</div><div class='hunk'>@@ -569,6 +580,7 @@ CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig<br/>index f80dc57e6374..d4de24963f5f 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/apollo_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/apollo_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/apollo_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/apollo_defconfig</a></div><div class='hunk'>@@ -64,6 +64,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -74,10 +75,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -93,6 +94,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -103,11 +105,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -174,6 +178,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -182,8 +187,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -210,8 +217,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -292,6 +301,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='hunk'>@@ -350,6 +360,7 @@ CONFIG_MACSEC=m</div><div class='ctx'> CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='ctx'> # CONFIG_NET_CADENCE is not set</div><div class='hunk'>@@ -365,6 +376,7 @@ CONFIG_VETH=m</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_VIA is not set</div><div class='hunk'>@@ -391,7 +403,6 @@ CONFIG_MOUSE_SERIAL=m</div><div class='ctx'> CONFIG_SERIO=m</div><div class='ctx'> CONFIG_USERIO=m</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_NTP_PPS=y</div><div class='ctx'> CONFIG_PPS_CLIENT_LDISC=m</div><div class='hunk'>@@ -528,6 +539,7 @@ CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig<br/>index 4e16b1821fbb..fc0fd3f871f3 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/atari_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/atari_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/atari_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/atari_defconfig</a></div><div class='hunk'>@@ -64,6 +64,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -74,10 +75,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -93,6 +94,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -103,11 +105,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -174,6 +178,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -182,8 +187,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -210,8 +217,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -292,6 +301,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_PARPORT=m</div><div class='ctx'> CONFIG_PARPORT_ATARI=m</div><div class='hunk'>@@ -359,6 +369,7 @@ CONFIG_MACSEC=m</div><div class='ctx'> CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> CONFIG_ATARILANCE=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='hunk'>@@ -375,6 +386,7 @@ CONFIG_NE2000=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> CONFIG_SMC91X=y</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='hunk'>@@ -404,7 +416,6 @@ CONFIG_INPUT_MISC=y</div><div class='ctx'> CONFIG_INPUT_M68K_BEEP=m</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> CONFIG_PRINTER=m</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_NTP_PPS=y</div><div class='hunk'>@@ -549,6 +560,7 @@ CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig<br/>index 2767bbf5ad61..52e984a0aa69 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/bvme6000_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/bvme6000_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/bvme6000_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/bvme6000_defconfig</a></div><div class='hunk'>@@ -62,6 +62,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -72,10 +73,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -91,6 +92,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -101,11 +103,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -172,6 +176,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -180,8 +185,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -208,8 +215,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -290,6 +299,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='hunk'>@@ -349,6 +359,7 @@ CONFIG_MACSEC=m</div><div class='ctx'> CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='ctx'> # CONFIG_NET_CADENCE is not set</div><div class='hunk'>@@ -364,6 +375,7 @@ CONFIG_BVME6000_NET=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_VIA is not set</div><div class='hunk'>@@ -389,7 +401,6 @@ CONFIG_INPUT_EVDEV=m</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_NTP_PPS=y</div><div class='ctx'> CONFIG_PPS_CLIENT_LDISC=m</div><div class='hunk'>@@ -520,6 +531,7 @@ CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig<br/>index d13ba309265e..aaeed4422cc9 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/hp300_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/hp300_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/hp300_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/hp300_defconfig</a></div><div class='hunk'>@@ -64,6 +64,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -74,10 +75,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -93,6 +94,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -103,11 +105,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -174,6 +178,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -182,8 +187,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -210,8 +217,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -292,6 +301,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='hunk'>@@ -350,6 +360,7 @@ CONFIG_MACSEC=m</div><div class='ctx'> CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> CONFIG_HPLANCE=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='hunk'>@@ -366,6 +377,7 @@ CONFIG_HPLANCE=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_VIA is not set</div><div class='hunk'>@@ -394,7 +406,6 @@ CONFIG_HP_SDC_RTC=m</div><div class='ctx'> CONFIG_SERIO_SERPORT=m</div><div class='ctx'> CONFIG_USERIO=m</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_NTP_PPS=y</div><div class='ctx'> CONFIG_PPS_CLIENT_LDISC=m</div><div class='hunk'>@@ -530,6 +541,7 @@ CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig<br/>index 78b5101c1aa6..3bbc9b2f0dac 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/mac_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/mac_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/mac_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/mac_defconfig</a></div><div class='hunk'>@@ -63,6 +63,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -73,10 +74,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -92,6 +93,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -102,11 +104,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -173,6 +177,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -181,8 +186,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -209,8 +216,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -294,6 +303,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_BLK_DEV_SWIM=m</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='hunk'>@@ -366,6 +376,7 @@ CONFIG_MACSEC=m</div><div class='ctx'> CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> CONFIG_MACMACE=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='hunk'>@@ -384,6 +395,7 @@ CONFIG_MAC8390=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SMSC is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='hunk'>@@ -413,7 +425,6 @@ CONFIG_INPUT_M68K_BEEP=m</div><div class='ctx'> CONFIG_SERIO=m</div><div class='ctx'> CONFIG_USERIO=m</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> CONFIG_SERIAL_PMACZILOG=y</div><div class='ctx'> CONFIG_SERIAL_PMACZILOG_TTYS=y</div><div class='ctx'> CONFIG_SERIAL_PMACZILOG_CONSOLE=y</div><div class='hunk'>@@ -552,6 +563,7 @@ CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig<br/>index 38e5bcbd0d62..8f2c0decb2f8 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/multi_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/multi_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/multi_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/multi_defconfig</a></div><div class='hunk'>@@ -73,6 +73,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -83,10 +84,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -102,6 +103,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -112,11 +114,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -183,6 +187,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -191,8 +196,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -219,8 +226,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -304,6 +313,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_PARPORT=m</div><div class='ctx'> CONFIG_PARPORT_PC=m</div><div class='hunk'>@@ -400,6 +410,7 @@ CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='ctx'> # CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> CONFIG_A2065=y</div><div class='ctx'> CONFIG_ARIADNE=y</div><div class='hunk'>@@ -430,6 +441,7 @@ CONFIG_ZORRO8390=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> CONFIG_SMC91X=y</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='hunk'>@@ -468,7 +480,6 @@ CONFIG_HP_SDC_RTC=m</div><div class='ctx'> CONFIG_SERIO_Q40KBD=y</div><div class='ctx'> CONFIG_USERIO=m</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> CONFIG_SERIAL_PMACZILOG=y</div><div class='ctx'> CONFIG_SERIAL_PMACZILOG_TTYS=y</div><div class='ctx'> CONFIG_SERIAL_PMACZILOG_CONSOLE=y</div><div class='hunk'>@@ -632,6 +643,7 @@ CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig<br/>index 28687192b68e..c743dd22e96f 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/mvme147_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/mvme147_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/mvme147_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/mvme147_defconfig</a></div><div class='hunk'>@@ -61,6 +61,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -71,10 +72,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -90,6 +91,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -100,11 +102,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -171,6 +175,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -179,8 +184,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -207,8 +214,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -289,6 +298,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='hunk'>@@ -348,6 +358,7 @@ CONFIG_MACSEC=m</div><div class='ctx'> CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> CONFIG_MVME147_NET=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='hunk'>@@ -364,6 +375,7 @@ CONFIG_MVME147_NET=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_VIA is not set</div><div class='hunk'>@@ -389,7 +401,6 @@ CONFIG_INPUT_EVDEV=m</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_NTP_PPS=y</div><div class='ctx'> CONFIG_PPS_CLIENT_LDISC=m</div><div class='hunk'>@@ -520,6 +531,7 @@ CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig<br/>index 5a5f109ab3cd..2ccaca858f05 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/mvme16x_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/mvme16x_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/mvme16x_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/mvme16x_defconfig</a></div><div class='hunk'>@@ -62,6 +62,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -72,10 +73,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -91,6 +92,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -101,11 +103,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -172,6 +176,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -180,8 +185,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -208,8 +215,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -290,6 +299,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='hunk'>@@ -349,6 +359,7 @@ CONFIG_MACSEC=m</div><div class='ctx'> CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='ctx'> # CONFIG_NET_CADENCE is not set</div><div class='hunk'>@@ -364,6 +375,7 @@ CONFIG_MVME16x_NET=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_VIA is not set</div><div class='hunk'>@@ -389,7 +401,6 @@ CONFIG_INPUT_EVDEV=m</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='ctx'> CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_NTP_PPS=y</div><div class='ctx'> CONFIG_PPS_CLIENT_LDISC=m</div><div class='hunk'>@@ -520,6 +531,7 @@ CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig<br/>index e557c9de3fbc..5599f3fd5fcd 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/q40_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/q40_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/q40_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/q40_defconfig</a></div><div class='hunk'>@@ -62,6 +62,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -72,10 +73,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -91,6 +92,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -101,11 +103,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -172,6 +176,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -180,8 +185,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -208,8 +215,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -290,6 +299,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_PARPORT=m</div><div class='ctx'> CONFIG_PARPORT_PC=m</div><div class='hunk'>@@ -356,6 +366,7 @@ CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='ctx'> # CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMD is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='hunk'>@@ -374,6 +385,7 @@ CONFIG_NE2000=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SMSC is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='hunk'>@@ -404,7 +416,6 @@ CONFIG_INPUT_M68K_BEEP=m</div><div class='ctx'> CONFIG_SERIO_Q40KBD=y</div><div class='ctx'> CONFIG_USERIO=m</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> CONFIG_PRINTER=m</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_NTP_PPS=y</div><div class='hunk'>@@ -543,6 +554,7 @@ CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig<br/>index c6a748a36daf..313bf0a562ad 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/sun3_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/sun3_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/sun3_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/sun3_defconfig</a></div><div class='hunk'>@@ -59,6 +59,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -69,10 +70,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -88,6 +89,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -98,11 +100,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -169,6 +173,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -177,8 +182,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -205,8 +212,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -287,6 +296,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='hunk'>@@ -346,6 +356,7 @@ CONFIG_MACSEC=m</div><div class='ctx'> CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> CONFIG_SUN3LANCE=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='hunk'>@@ -361,6 +372,7 @@ CONFIG_SUN3_82586=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SUN is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='hunk'>@@ -388,7 +400,6 @@ CONFIG_KEYBOARD_SUNKBD=y</div><div class='ctx'> CONFIG_MOUSE_SERIAL=m</div><div class='ctx'> CONFIG_USERIO=m</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_NTP_PPS=y</div><div class='ctx'> CONFIG_PPS_CLIENT_LDISC=m</div><div class='hunk'>@@ -521,6 +532,7 @@ CONFIG_TEST_BPF=m</div><div class='ctx'> CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig<br/>index 10d60857b9a6..38b61365f769 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/configs/sun3x_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/configs/sun3x_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/configs/sun3x_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/configs/sun3x_defconfig</a></div><div class='hunk'>@@ -59,6 +59,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_XFRM_MODE_BEET=m</div><div class='ctx'> CONFIG_INET_DIAG=m</div><div class='ctx'> CONFIG_INET_UDP_DIAG=m</div><div class='add'>+CONFIG_INET_RAW_DIAG=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='ctx'> CONFIG_INET6_AH=m</div><div class='hunk'>@@ -69,10 +70,10 @@ CONFIG_IPV6_VTI=m</div><div class='ctx'> CONFIG_IPV6_GRE=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_LOG_NETDEV=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_ZONES=y</div><div class='ctx'> # CONFIG_NF_CONNTRACK_PROCFS is not set</div><div class='ctx'> # CONFIG_NF_CT_PROTO_DCCP is not set</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -88,6 +89,7 @@ CONFIG_NF_TABLES_INET=m</div><div class='ctx'> CONFIG_NF_TABLES_NETDEV=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='add'>+CONFIG_NFT_RT=m</div><div class='ctx'> CONFIG_NFT_NUMGEN=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='ctx'> CONFIG_NFT_SET_RBTREE=m</div><div class='hunk'>@@ -98,11 +100,13 @@ CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_MASQ=m</div><div class='ctx'> CONFIG_NFT_REDIR=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='add'>+CONFIG_NFT_OBJREF=m</div><div class='ctx'> CONFIG_NFT_QUEUE=m</div><div class='ctx'> CONFIG_NFT_QUOTA=m</div><div class='ctx'> CONFIG_NFT_REJECT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='ctx'> CONFIG_NFT_HASH=m</div><div class='add'>+CONFIG_NFT_FIB_INET=m</div><div class='ctx'> CONFIG_NFT_DUP_NETDEV=m</div><div class='ctx'> CONFIG_NFT_FWD_NETDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='hunk'>@@ -169,6 +173,7 @@ CONFIG_IP_SET_HASH_IPMARK=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTIP=m</div><div class='ctx'> CONFIG_IP_SET_HASH_IPPORTNET=m</div><div class='add'>+CONFIG_IP_SET_HASH_IPMAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_MAC=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETPORTNET=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NET=m</div><div class='hunk'>@@ -177,8 +182,10 @@ CONFIG_IP_SET_HASH_NETPORT=m</div><div class='ctx'> CONFIG_IP_SET_HASH_NETIFACE=m</div><div class='ctx'> CONFIG_IP_SET_LIST_SET=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV4=m</div><div class='add'>+CONFIG_NFT_FIB_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='ctx'> CONFIG_NF_LOG_ARP=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV4=m</div><div class='hunk'>@@ -205,8 +212,10 @@ CONFIG_IP_NF_ARPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_ARPFILTER=m</div><div class='ctx'> CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_NF_SOCKET_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV6=m</div><div class='ctx'> CONFIG_NFT_DUP_IPV6=m</div><div class='add'>+CONFIG_NFT_FIB_IPV6=m</div><div class='ctx'> CONFIG_NFT_CHAIN_NAT_IPV6=m</div><div class='ctx'> CONFIG_NFT_MASQ_IPV6=m</div><div class='ctx'> CONFIG_NFT_REDIR_IPV6=m</div><div class='hunk'>@@ -287,6 +296,7 @@ CONFIG_NET_DEVLINK=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_TEST_ASYNC_DRIVER_PROBE=m</div><div class='ctx'> CONFIG_CONNECTOR=m</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='hunk'>@@ -346,6 +356,7 @@ CONFIG_MACSEC=m</div><div class='ctx'> CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_VETH=m</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_AMAZON is not set</div><div class='ctx'> CONFIG_SUN3LANCE=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='hunk'>@@ -362,6 +373,7 @@ CONFIG_SUN3LANCE=y</div><div class='ctx'> # CONFIG_NET_VENDOR_ROCKER is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_VIA is not set</div><div class='hunk'>@@ -388,7 +400,6 @@ CONFIG_KEYBOARD_SUNKBD=y</div><div class='ctx'> CONFIG_MOUSE_SERIAL=m</div><div class='ctx'> CONFIG_USERIO=m</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_NTP_PPS=y</div><div class='ctx'> CONFIG_PPS_CLIENT_LDISC=m</div><div class='hunk'>@@ -522,6 +533,7 @@ CONFIG_TEST_FIRMWARE=m</div><div class='ctx'> CONFIG_TEST_UDELAY=m</div><div class='ctx'> CONFIG_TEST_STATIC_KEYS=m</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_CRYPTO_RSA=m</div><div class='ctx'> CONFIG_CRYPTO_DH=m</div><div class='ctx'> CONFIG_CRYPTO_ECDH=m</div><div class='head'>diff --git a/arch/m68k/emu/nfeth.c b/arch/m68k/emu/nfeth.c<br/>index a0985fd088d1..e45ce4243aaa 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/emu/nfeth.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/emu/nfeth.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/emu/nfeth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/emu/nfeth.c</a></div><div class='hunk'>@@ -124,7 +124,6 @@ static inline void recv_packet(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='ctx'> 	netif_rx(skb);</div><div class='del'>-	dev-&gt;last_rx = jiffies;</div><div class='ctx'> 	dev-&gt;stats.rx_packets++;</div><div class='ctx'> 	dev-&gt;stats.rx_bytes += pktlen;</div><div class='ctx'> </div><div class='hunk'>@@ -184,7 +183,6 @@ static const struct net_device_ops nfeth_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= nfeth_xmit,</div><div class='ctx'> 	.ndo_tx_timeout		= nfeth_tx_timeout,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_change_mtu		= eth_change_mtu,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/ifpsp060/src/isp.S b/arch/m68k/ifpsp060/src/isp.S<br/>index 6dccda766e22..b865c1a052ba 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/ifpsp060/src/isp.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/ifpsp060/src/isp.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/ifpsp060/src/isp.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/ifpsp060/src/isp.S</a></div><div class='hunk'>@@ -3814,7 +3814,7 @@ CAS2W2_FILLER:</div><div class='ctx'> #	(3) Save current DFC/SFC (ASSUMED TO BE EQUAL!!!); Then set	#</div><div class='ctx'> #	    SFC/DFC according to whether exception occurred in user or	#</div><div class='ctx'> #	    supervisor mode.						#</div><div class='del'>-#	(4) Use "plpaw" instruction to pre-load ATC with efective	#</div><div class='add'>+#	(4) Use "plpaw" instruction to pre-load ATC with effective	#</div><div class='ctx'> #	    address page(s). THIS SHOULD NOT FAULT!!! The relevant	#</div><div class='ctx'> #	    page(s) should have been made resident prior to entering	#</div><div class='ctx'> #	    this routine.						#</div><div class='head'>diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild<br/>index eb85bd9c6180..d4f9ccbfa85c 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> generic-y += barrier.h</div><div class='ctx'> generic-y += bitsperlong.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += emergency-restart.h</div><div class='ctx'> generic-y += errno.h</div><div class='hunk'>@@ -20,7 +19,6 @@ generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='ctx'> generic-y += mman.h</div><div class='del'>-generic-y += mutex.h</div><div class='ctx'> generic-y += percpu.h</div><div class='ctx'> generic-y += preempt.h</div><div class='ctx'> generic-y += resource.h</div><div class='hunk'>@@ -35,3 +33,4 @@ generic-y += trace_clock.h</div><div class='ctx'> generic-y += types.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/m68k/include/asm/MC68328.h b/arch/m68k/include/asm/MC68328.h<br/>index 1a8080c4cc40..b61230e74e63 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/MC68328.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/MC68328.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/MC68328.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/MC68328.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  * Copyright (C) 1998  Kenneth Albanowski &lt;kjahds@kjahds.com&gt;,</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef _MC68328_H_</div><div class='ctx'> #define _MC68328_H_</div><div class='hunk'>@@ -993,7 +994,7 @@ typedef volatile struct {</div><div class='ctx'>   volatile unsigned short int pad1;</div><div class='ctx'>   volatile unsigned short int pad2;</div><div class='ctx'>   volatile unsigned short int pad3;</div><div class='del'>-} __attribute__((packed)) m68328_uart;</div><div class='add'>+} __packed m68328_uart;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**********</div><div class='head'>diff --git a/arch/m68k/include/asm/MC68EZ328.h b/arch/m68k/include/asm/MC68EZ328.h<br/>index fedac87c5d13..703331ece328 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/MC68EZ328.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/MC68EZ328.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/MC68EZ328.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/MC68EZ328.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  *                     The Silver Hammer Group, Ltd.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef _MC68EZ328_H_</div><div class='ctx'> #define _MC68EZ328_H_</div><div class='hunk'>@@ -815,7 +816,7 @@ typedef volatile struct {</div><div class='ctx'>   volatile unsigned short int nipr;</div><div class='ctx'>   volatile unsigned short int pad1;</div><div class='ctx'>   volatile unsigned short int pad2;</div><div class='del'>-} __attribute__((packed)) m68328_uart;</div><div class='add'>+} __packed m68328_uart;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**********</div><div class='head'>diff --git a/arch/m68k/include/asm/MC68VZ328.h b/arch/m68k/include/asm/MC68VZ328.h<br/>index 34a51b2c784f..fbaed7ddfb41 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/MC68VZ328.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/MC68VZ328.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/MC68VZ328.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/MC68VZ328.h</a></div><div class='hunk'>@@ -909,7 +909,7 @@ typedef struct {</div><div class='ctx'>   volatile unsigned short int nipr;</div><div class='ctx'>   volatile unsigned short int hmark;</div><div class='ctx'>   volatile unsigned short int unused;</div><div class='del'>-} __attribute__((packed)) m68328_uart;</div><div class='add'>+} __packed m68328_uart;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/include/asm/a.out-core.h b/arch/m68k/include/asm/a.out-core.h<br/>index f6bfc1d63ff6..ae91ea6bb303 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/a.out-core.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/a.out-core.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/a.out-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/a.out-core.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * fill in the user structure for an a.out core dump</div><div class='head'>diff --git a/arch/m68k/include/asm/bug.h b/arch/m68k/include/asm/bug.h<br/>index ef9a2e47352f..5bc8d91d68d4 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/bug.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/bug.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/bug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/bug.h</a></div><div class='hunk'>@@ -6,12 +6,12 @@</div><div class='ctx'> #ifdef CONFIG_DEBUG_BUGVERBOSE</div><div class='ctx'> #ifndef CONFIG_SUN3</div><div class='ctx'> #define BUG() do { \</div><div class='del'>-	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \</div><div class='add'>+	pr_crit("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \</div><div class='ctx'> 	__builtin_trap(); \</div><div class='ctx'> } while (0)</div><div class='ctx'> #else</div><div class='ctx'> #define BUG() do { \</div><div class='del'>-	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \</div><div class='add'>+	pr_crit("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \</div><div class='ctx'> 	panic("BUG!"); \</div><div class='ctx'> } while (0)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/m68k/include/asm/dma-mapping.h b/arch/m68k/include/asm/dma-mapping.h<br/>index 96c536194287..9210e470771b 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> #ifndef _M68K_DMA_MAPPING_H</div><div class='ctx'> #define _M68K_DMA_MAPPING_H</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops m68k_dma_ops;</div><div class='add'>+extern const struct dma_map_ops m68k_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'>         return &amp;m68k_dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/include/asm/floppy.h b/arch/m68k/include/asm/floppy.h<br/>index 47365b1ccbec..c3b9ad6732fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/floppy.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/floppy.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/floppy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/floppy.h</a></div><div class='hunk'>@@ -234,9 +234,9 @@ asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id)</div><div class='ctx'> 		virtual_dma_residue += virtual_dma_count;</div><div class='ctx'> 		virtual_dma_count=0;</div><div class='ctx'> #ifdef TRACE_FLPY_INT</div><div class='del'>-		printk("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n",</div><div class='del'>-		       virtual_dma_count, virtual_dma_residue, calls, bytes,</div><div class='del'>-		       dma_wait);</div><div class='add'>+		pr_info("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n",</div><div class='add'>+			virtual_dma_count, virtual_dma_residue, calls, bytes,</div><div class='add'>+			dma_wait);</div><div class='ctx'> 		calls = 0;</div><div class='ctx'> 		dma_wait=0;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/m68k/include/asm/m5206sim.h b/arch/m68k/include/asm/m5206sim.h<br/>index 4cf864f5ea7a..0ddf3efbcae9 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/m5206sim.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/m5206sim.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/m5206sim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m5206sim.h</a></div><div class='hunk'>@@ -110,6 +110,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *	Define system peripheral IRQ usage.</div><div class='ctx'>  */</div><div class='add'>+#define	MCF_IRQ_I2C0		29		/* I2C, Level 5 */</div><div class='ctx'> #define	MCF_IRQ_TIMER		30		/* Timer0, Level 6 */</div><div class='ctx'> #define	MCF_IRQ_PROFILER	31		/* Timer1, Level 7 */</div><div class='ctx'> #define	MCF_IRQ_UART0		73		/* UART0 */</div><div class='hunk'>@@ -138,6 +139,7 @@</div><div class='ctx'> #define	MCFSIM_SWDICR		MCFSIM_ICR8	/* Watchdog timer ICR */</div><div class='ctx'> #define	MCFSIM_TIMER1ICR	MCFSIM_ICR9	/* Timer 1 ICR */</div><div class='ctx'> #define	MCFSIM_TIMER2ICR	MCFSIM_ICR10	/* Timer 2 ICR */</div><div class='add'>+#define	MCFSIM_I2CICR		MCFSIM_ICR11	/* I2C ICR */</div><div class='ctx'> #define	MCFSIM_UART1ICR		MCFSIM_ICR12	/* UART 1 ICR */</div><div class='ctx'> #define	MCFSIM_UART2ICR		MCFSIM_ICR13	/* UART 2 ICR */</div><div class='ctx'> #ifdef CONFIG_M5206e</div><div class='hunk'>@@ -145,5 +147,11 @@</div><div class='ctx'> #define	MCFSIM_DMA2ICR		MCFSIM_ICR15	/* DMA 2 ICR */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * I2C Controller</div><div class='add'>+*/</div><div class='add'>+#define MCFI2C_BASE0		(MCF_MBAR + 0x1e0)</div><div class='add'>+#define MCFI2C_SIZE0		0x40</div><div class='add'>+</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> #endif	/* m5206sim_h */</div><div class='head'>diff --git a/arch/m68k/include/asm/m520xsim.h b/arch/m68k/include/asm/m520xsim.h<br/>index db3f8ee4a6c6..6d50cefa76c3 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/m520xsim.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/m520xsim.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/m520xsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m520xsim.h</a></div><div class='hunk'>@@ -50,6 +50,7 @@</div><div class='ctx'> #define MCFINT_UART0        26          /* Interrupt number for UART0 */</div><div class='ctx'> #define MCFINT_UART1        27          /* Interrupt number for UART1 */</div><div class='ctx'> #define MCFINT_UART2        28          /* Interrupt number for UART2 */</div><div class='add'>+#define MCFINT_I2C0         30          /* Interrupt number for I2C */</div><div class='ctx'> #define MCFINT_QSPI         31          /* Interrupt number for QSPI */</div><div class='ctx'> #define MCFINT_FECRX0	    36		/* Interrupt number for FEC RX */</div><div class='ctx'> #define MCFINT_FECTX0	    40		/* Interrupt number for FEC RX */</div><div class='hunk'>@@ -67,6 +68,7 @@</div><div class='ctx'> #define	MCF_IRQ_QSPI	    (MCFINT_VECBASE + MCFINT_QSPI)</div><div class='ctx'> #define MCF_IRQ_PIT1        (MCFINT_VECBASE + MCFINT_PIT1)</div><div class='ctx'> </div><div class='add'>+#define MCF_IRQ_I2C0        (MCFINT_VECBASE + MCFINT_I2C0)</div><div class='ctx'> /*</div><div class='ctx'>  *  SDRAM configuration registers.</div><div class='ctx'>  */</div><div class='hunk'>@@ -200,5 +202,11 @@</div><div class='ctx'> #define MCFPM_PPMLR0		0xfc040034</div><div class='ctx'> #define MCFPM_LPCR		0xfc0a0007</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * I2C module.</div><div class='add'>+ */</div><div class='add'>+#define MCFI2C_BASE0		0xFC058000</div><div class='add'>+#define MCFI2C_SIZE0		0x40</div><div class='add'>+</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> #endif  /* m520xsim_h */</div><div class='head'>diff --git a/arch/m68k/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h<br/>index 5e06b4eb57f3..d43f6ab1edc9 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/m523xsim.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/m523xsim.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/m523xsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m523xsim.h</a></div><div class='hunk'>@@ -37,7 +37,8 @@</div><div class='ctx'> #define	MCFINT_UART0		13		/* Interrupt number for UART0 */</div><div class='ctx'> #define	MCFINT_UART1		14		/* Interrupt number for UART1 */</div><div class='ctx'> #define	MCFINT_UART2		15		/* Interrupt number for UART2 */</div><div class='del'>-#define MCFINT_QSPI		18		/* Interrupt number for QSPI */</div><div class='add'>+#define	MCFINT_I2C0		17		/* Interrupt number for I2C */</div><div class='add'>+#define	MCFINT_QSPI		18		/* Interrupt number for QSPI */</div><div class='ctx'> #define	MCFINT_FECRX0		23		/* Interrupt number for FEC */</div><div class='ctx'> #define	MCFINT_FECTX0		27		/* Interrupt number for FEC */</div><div class='ctx'> #define	MCFINT_FECENTC0		29		/* Interrupt number for FEC */</div><div class='hunk'>@@ -53,6 +54,7 @@</div><div class='ctx'> </div><div class='ctx'> #define	MCF_IRQ_QSPI		(MCFINT_VECBASE + MCFINT_QSPI)</div><div class='ctx'> #define MCF_IRQ_PIT1		(MCFINT_VECBASE + MCFINT_PIT1)</div><div class='add'>+#define	MCF_IRQ_I2C0		(MCFINT_VECBASE + MCFINT_I2C0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	SDRAM configuration registers.</div><div class='hunk'>@@ -208,5 +210,11 @@</div><div class='ctx'> #define	MCFDMA_BASE2		(MCF_IPSBAR + 0x180)</div><div class='ctx'> #define	MCFDMA_BASE3		(MCF_IPSBAR + 0x1C0)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * I2C module.</div><div class='add'>+ */</div><div class='add'>+#define	MCFI2C_BASE0		(MCF_IPSBAR + 0x300)</div><div class='add'>+#define	MCFI2C_SIZE0		0x40</div><div class='add'>+</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> #endif	/* m523xsim_h */</div><div class='head'>diff --git a/arch/m68k/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h<br/>index 2c648a043f24..35f6fbc89b92 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/m527xsim.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/m527xsim.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/m527xsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m527xsim.h</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> #define	MCFINT_UART0		13		/* Interrupt number for UART0 */</div><div class='ctx'> #define	MCFINT_UART1		14		/* Interrupt number for UART1 */</div><div class='ctx'> #define	MCFINT_UART2		15		/* Interrupt number for UART2 */</div><div class='add'>+#define	MCFINT_I2C0		17		/* Interrupt number for I2C */</div><div class='ctx'> #define	MCFINT_QSPI		18		/* Interrupt number for QSPI */</div><div class='ctx'> #define	MCFINT_FECRX0		23		/* Interrupt number for FEC0 */</div><div class='ctx'> #define	MCFINT_FECTX0		27		/* Interrupt number for FEC0 */</div><div class='hunk'>@@ -61,6 +62,7 @@</div><div class='ctx'> </div><div class='ctx'> #define	MCF_IRQ_QSPI		(MCFINT_VECBASE + MCFINT_QSPI)</div><div class='ctx'> #define MCF_IRQ_PIT1		(MCFINT_VECBASE + MCFINT_PIT1)</div><div class='add'>+#define	MCF_IRQ_I2C0		(MCFINT_VECBASE + MCFINT_I2C0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	SDRAM configuration registers.</div><div class='hunk'>@@ -353,5 +355,11 @@</div><div class='ctx'> #define	MCF_RCR_SWRESET		0x80		/* Software reset bit */</div><div class='ctx'> #define	MCF_RCR_FRCSTOUT	0x40		/* Force external reset */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * I2C module.</div><div class='add'>+ */</div><div class='add'>+#define	MCFI2C_BASE0		(MCF_IPSBAR + 0x300)</div><div class='add'>+#define	MCFI2C_SIZE0		0x40</div><div class='add'>+</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> #endif	/* m527xsim_h */</div><div class='head'>diff --git a/arch/m68k/include/asm/m528xsim.h b/arch/m68k/include/asm/m528xsim.h<br/>index cf68ca0ac3a5..67f6182d10a4 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/m528xsim.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/m528xsim.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/m528xsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m528xsim.h</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> #define	MCFINT_UART0		13		/* Interrupt number for UART0 */</div><div class='ctx'> #define	MCFINT_UART1		14		/* Interrupt number for UART1 */</div><div class='ctx'> #define	MCFINT_UART2		15		/* Interrupt number for UART2 */</div><div class='add'>+#define	MCFINT_I2C0		17		/* Interrupt number for I2C */</div><div class='ctx'> #define	MCFINT_QSPI		18		/* Interrupt number for QSPI */</div><div class='ctx'> #define	MCFINT_FECRX0		23		/* Interrupt number for FEC */</div><div class='ctx'> #define	MCFINT_FECTX0		27		/* Interrupt number for FEC */</div><div class='hunk'>@@ -53,6 +54,8 @@</div><div class='ctx'> </div><div class='ctx'> #define	MCF_IRQ_QSPI		(MCFINT_VECBASE + MCFINT_QSPI)</div><div class='ctx'> #define MCF_IRQ_PIT1		(MCFINT_VECBASE + MCFINT_PIT1)</div><div class='add'>+#define	MCF_IRQ_I2C0		(MCFINT_VECBASE + MCFINT_I2C0)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	SDRAM configuration registers.</div><div class='ctx'>  */</div><div class='hunk'>@@ -242,5 +245,11 @@</div><div class='ctx'> #define	MCF_RCR_SWRESET		0x80		/* Software reset bit */</div><div class='ctx'> #define	MCF_RCR_FRCSTOUT	0x40		/* Force external reset */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * I2C module</div><div class='add'>+ */</div><div class='add'>+#define	MCFI2C_BASE0		(MCF_IPSBAR + 0x300)</div><div class='add'>+#define	MCFI2C_SIZE0		0x40</div><div class='add'>+</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> #endif	/* m528xsim_h */</div><div class='head'>diff --git a/arch/m68k/include/asm/m5307sim.h b/arch/m68k/include/asm/m5307sim.h<br/>index 5d0bb7ec31f8..d2595e04eb1d 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/m5307sim.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/m5307sim.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/m5307sim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m5307sim.h</a></div><div class='hunk'>@@ -148,6 +148,7 @@</div><div class='ctx'> #define	MCFSIM_SWDICR		MCFSIM_ICR0	/* Watchdog timer ICR */</div><div class='ctx'> #define	MCFSIM_TIMER1ICR	MCFSIM_ICR1	/* Timer 1 ICR */</div><div class='ctx'> #define	MCFSIM_TIMER2ICR	MCFSIM_ICR2	/* Timer 2 ICR */</div><div class='add'>+#define	MCFSIM_I2CICR		MCFSIM_ICR3	/* I2C ICR */</div><div class='ctx'> #define	MCFSIM_UART1ICR		MCFSIM_ICR4	/* UART 1 ICR */</div><div class='ctx'> #define	MCFSIM_UART2ICR		MCFSIM_ICR5	/* UART 2 ICR */</div><div class='ctx'> #define	MCFSIM_DMA0ICR		MCFSIM_ICR6	/* DMA 0 ICR */</div><div class='hunk'>@@ -155,7 +156,6 @@</div><div class='ctx'> #define	MCFSIM_DMA2ICR		MCFSIM_ICR8	/* DMA 2 ICR */</div><div class='ctx'> #define	MCFSIM_DMA3ICR		MCFSIM_ICR9	/* DMA 3 ICR */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Some symbol defines for the Parallel Port Pin Assignment Register</div><div class='ctx'>  */</div><div class='hunk'>@@ -174,10 +174,17 @@</div><div class='ctx'> /*</div><div class='ctx'>  *	Define system peripheral IRQ usage.</div><div class='ctx'>  */</div><div class='add'>+#define	MCF_IRQ_I2C0		29		/* I2C, Level 5 */</div><div class='ctx'> #define	MCF_IRQ_TIMER		30		/* Timer0, Level 6 */</div><div class='ctx'> #define	MCF_IRQ_PROFILER	31		/* Timer1, Level 7 */</div><div class='ctx'> #define	MCF_IRQ_UART0		73		/* UART0 */</div><div class='ctx'> #define	MCF_IRQ_UART1		74		/* UART1 */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * I2C module</div><div class='add'>+ */</div><div class='add'>+#define	MCFI2C_BASE0		(MCF_MBAR + 0x280)</div><div class='add'>+#define	MCFI2C_SIZE0		0x40</div><div class='add'>+</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> #endif	/* m5307sim_h */</div><div class='head'>diff --git a/arch/m68k/include/asm/m53xxsim.h b/arch/m68k/include/asm/m53xxsim.h<br/>index faa1a2133bfd..53329ae4d3e3 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/m53xxsim.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/m53xxsim.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/m53xxsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m53xxsim.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #define MCFINT_UART0        26          /* Interrupt number for UART0 */</div><div class='ctx'> #define MCFINT_UART1        27          /* Interrupt number for UART1 */</div><div class='ctx'> #define MCFINT_UART2        28          /* Interrupt number for UART2 */</div><div class='add'>+#define MCFINT_I2C0         30		/* Interrupt number for I2C */</div><div class='ctx'> #define MCFINT_QSPI         31          /* Interrupt number for QSPI */</div><div class='ctx'> #define MCFINT_FECRX0	    36		/* Interrupt number for FEC */</div><div class='ctx'> #define MCFINT_FECTX0	    40		/* Interrupt number for FEC */</div><div class='hunk'>@@ -32,6 +33,7 @@</div><div class='ctx'> #define MCF_IRQ_FECTX0	    (MCFINT_VECBASE + MCFINT_FECTX0)</div><div class='ctx'> #define MCF_IRQ_FECENTC0    (MCFINT_VECBASE + MCFINT_FECENTC0)</div><div class='ctx'> </div><div class='add'>+#define	MCF_IRQ_I2C0	    (MCFINT_VECBASE + MCFINT_I2C0)</div><div class='ctx'> #define	MCF_IRQ_QSPI	    (MCFINT_VECBASE + MCFINT_QSPI)</div><div class='ctx'> </div><div class='ctx'> #define MCF_WTM_WCR		0xFC098000</div><div class='hunk'>@@ -1237,5 +1239,11 @@</div><div class='ctx'> #define MCFEPORT_EPPDR                (0xFC094005)</div><div class='ctx'> #define MCFEPORT_EPFR                 (0xFC094006)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * I2C Module</div><div class='add'>+ */</div><div class='add'>+#define	MCFI2C_BASE0			(0xFc058000)</div><div class='add'>+#define	MCFI2C_SIZE0			0x40</div><div class='add'>+</div><div class='ctx'> /********************************************************************/</div><div class='ctx'> #endif	/* m53xxsim_h */</div><div class='head'>diff --git a/arch/m68k/include/asm/m5407sim.h b/arch/m68k/include/asm/m5407sim.h<br/>index a7550bc5cd1e..ab40c16ba989 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/m5407sim.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/m5407sim.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/m5407sim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m5407sim.h</a></div><div class='hunk'>@@ -112,6 +112,7 @@</div><div class='ctx'> #define	MCFSIM_SWDICR		MCFSIM_ICR0	/* Watchdog timer ICR */</div><div class='ctx'> #define	MCFSIM_TIMER1ICR	MCFSIM_ICR1	/* Timer 1 ICR */</div><div class='ctx'> #define	MCFSIM_TIMER2ICR	MCFSIM_ICR2	/* Timer 2 ICR */</div><div class='add'>+#define	MCFSIM_I2CICR		MCFSIM_ICR3	/* I2C ICR */</div><div class='ctx'> #define	MCFSIM_UART1ICR		MCFSIM_ICR4	/* UART 1 ICR */</div><div class='ctx'> #define	MCFSIM_UART2ICR		MCFSIM_ICR5	/* UART 2 ICR */</div><div class='ctx'> #define	MCFSIM_DMA0ICR		MCFSIM_ICR6	/* DMA 0 ICR */</div><div class='hunk'>@@ -137,10 +138,17 @@</div><div class='ctx'> /*</div><div class='ctx'>  *	Define system peripheral IRQ usage.</div><div class='ctx'>  */</div><div class='add'>+#define	MCF_IRQ_I2C0		29		/* I2C, Level 5 */</div><div class='ctx'> #define	MCF_IRQ_TIMER		30		/* Timer0, Level 6 */</div><div class='ctx'> #define	MCF_IRQ_PROFILER	31		/* Timer1, Level 7 */</div><div class='ctx'> #define	MCF_IRQ_UART0		73		/* UART0 */</div><div class='ctx'> #define	MCF_IRQ_UART1		74		/* UART1 */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * I2C module</div><div class='add'>+ */</div><div class='add'>+#define	MCFI2C_BASE0		(MCF_MBAR + 0x280)</div><div class='add'>+#define	MCFI2C_SIZE0		0x40</div><div class='add'>+</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> #endif	/* m5407sim_h */</div><div class='head'>diff --git a/arch/m68k/include/asm/m54xxsim.h b/arch/m68k/include/asm/m54xxsim.h<br/>index 73d937ff36eb..7758d0a1a84d 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/m54xxsim.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/m54xxsim.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/m54xxsim.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/m54xxsim.h</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define MCF_IRQ_TIMER		(MCFINT_VECBASE + 54)	/* Slice Timer 0 */</div><div class='ctx'> #define MCF_IRQ_PROFILER	(MCFINT_VECBASE + 53)	/* Slice Timer 1 */</div><div class='add'>+#define MCF_IRQ_I2C0		(MCFINT_VECBASE + 40)</div><div class='ctx'> #define MCF_IRQ_UART0		(MCFINT_VECBASE + 35)</div><div class='ctx'> #define MCF_IRQ_UART1		(MCFINT_VECBASE + 34)</div><div class='ctx'> #define MCF_IRQ_UART2		(MCFINT_VECBASE + 33)</div><div class='hunk'>@@ -107,4 +108,14 @@</div><div class='ctx'> #define MCF_PAR_PSC_RTS_RTS	(0x30)</div><div class='ctx'> #define MCF_PAR_PSC_CANRX	(0x40)</div><div class='ctx'> </div><div class='add'>+#define MCF_PAR_FECI2CIRQ	(MCF_MBAR + 0x00000a44)	/* FEC/I2C/IRQ */</div><div class='add'>+#define MCF_PAR_FECI2CIRQ_SDA	(1 &lt;&lt; 3)</div><div class='add'>+#define MCF_PAR_FECI2CIRQ_SCL	(1 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * I2C module.</div><div class='add'>+ */</div><div class='add'>+#define MCFI2C_BASE0		(MCF_MBAR + 0x8f00)</div><div class='add'>+#define MCFI2C_SIZE0		0x40</div><div class='add'>+</div><div class='ctx'> #endif	/* m54xxsim_h */</div><div class='head'>diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h<br/>index 42235e7fbeed..5b81ab188aa5 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/macintosh.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/macintosh.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/macintosh.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/macintosh.h</a></div><div class='hunk'>@@ -38,7 +38,7 @@ struct mac_model</div><div class='ctx'> </div><div class='ctx'> #define MAC_ADB_NONE		0</div><div class='ctx'> #define MAC_ADB_II		1</div><div class='del'>-#define MAC_ADB_IISI		2</div><div class='add'>+#define MAC_ADB_EGRET		2</div><div class='ctx'> #define MAC_ADB_CUDA		3</div><div class='ctx'> #define MAC_ADB_PB1		4</div><div class='ctx'> #define MAC_ADB_PB2		5</div><div class='head'>diff --git a/arch/m68k/include/asm/macints.h b/arch/m68k/include/asm/macints.h<br/>index 92aa8a4c2d03..cddb2d3ea49b 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/macints.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/macints.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/macints.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/macints.h</a></div><div class='hunk'>@@ -14,22 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Setting this prints debugging info for unclaimed interrupts */</div><div class='del'>-</div><div class='del'>-#define DEBUG_SPURIOUS</div><div class='del'>-</div><div class='del'>-/* Setting this prints debugging info on each autovector interrupt */</div><div class='del'>-</div><div class='del'>-/* #define DEBUG_IRQS */</div><div class='del'>-</div><div class='del'>-/* Setting this prints debugging info on each Nubus interrupt */</div><div class='del'>-</div><div class='del'>-/* #define DEBUG_NUBUS_INT */</div><div class='del'>-</div><div class='del'>-/* Setting this prints debugging info on irqs as they enabled and disabled. */</div><div class='del'>-</div><div class='del'>-/* #define DEBUG_IRQUSE */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Base IRQ number for all Mac68K interrupt sources. Each source</div><div class='ctx'>  * has eight indexes (base -&gt; base+7).</div><div class='head'>diff --git a/arch/m68k/include/asm/math-emu.h b/arch/m68k/include/asm/math-emu.h<br/>index 5e9249b0014c..b062696d5a0d 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/math-emu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/math-emu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/math-emu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/math-emu.h</a></div><div class='hunk'>@@ -105,21 +105,21 @@ struct fp_data {</div><div class='ctx'> #ifdef FPU_EMU_DEBUG</div><div class='ctx'> extern unsigned int fp_debugprint;</div><div class='ctx'> </div><div class='del'>-#define dprint(bit, fmt, args...) ({			\</div><div class='add'>+#define dprint(bit, fmt, ...) ({			\</div><div class='ctx'> 	if (fp_debugprint &amp; (1 &lt;&lt; (bit)))		\</div><div class='del'>-		printk(fmt, ## args);			\</div><div class='add'>+		pr_info(fmt, ##__VA_ARGS__);		\</div><div class='ctx'> })</div><div class='ctx'> #else</div><div class='del'>-#define dprint(bit, fmt, args...)</div><div class='add'>+#define dprint(bit, fmt, ...)	no_printk(fmt, ##__VA_ARGS__)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define uprint(str) ({					\</div><div class='ctx'> 	static int __count = 3;				\</div><div class='ctx'> 							\</div><div class='ctx'> 	if (__count &gt; 0) {				\</div><div class='del'>-		printk("You just hit an unimplemented "	\</div><div class='add'>+		pr_err("You just hit an unimplemented "	\</div><div class='ctx'> 		       "fpu instruction (%s)\n", str);	\</div><div class='del'>-		printk("Please report this to ....\n");	\</div><div class='add'>+		pr_err("Please report this to ....\n");	\</div><div class='ctx'> 		__count--;				\</div><div class='ctx'> 	}						\</div><div class='ctx'> })</div><div class='head'>diff --git a/arch/m68k/include/asm/mmu_context.h b/arch/m68k/include/asm/mmu_context.h<br/>index dc3be991d634..4a6ae6dffa34 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #define __M68K_MMU_CONTEXT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/m68k/include/asm/natfeat.h b/arch/m68k/include/asm/natfeat.h<br/>index a3521b80c3b9..2d2424de1d65 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/natfeat.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/natfeat.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/natfeat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/natfeat.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  * This software may be used and distributed according to the terms of</div><div class='ctx'>  * the GNU General Public License (GPL), incorporated herein by reference.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef _NATFEAT_H</div><div class='ctx'> #define _NATFEAT_H</div><div class='hunk'>@@ -17,6 +18,6 @@ void nf_init(void);</div><div class='ctx'> void nf_shutdown(void);</div><div class='ctx'> </div><div class='ctx'> void nfprint(const char *fmt, ...)</div><div class='del'>-	__attribute__ ((format (printf, 1, 2)));</div><div class='add'>+	__printf(1, 2);</div><div class='ctx'> </div><div class='ctx'> # endif /* _NATFEAT_H */</div><div class='head'>diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h<br/>index c84a2183b3f0..f5f790c31bf8 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/processor.h</a></div><div class='hunk'>@@ -156,6 +156,5 @@ unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define task_pt_regs(tsk)	((struct pt_regs *) ((tsk)-&gt;thread.esp0))</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()	barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/m68k/include/asm/sun3_pgtable.h b/arch/m68k/include/asm/sun3_pgtable.h<br/>index 48657f9fdece..d5104a7b5388 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/sun3_pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/sun3_pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/sun3_pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/sun3_pgtable.h</a></div><div class='hunk'>@@ -151,11 +151,11 @@ static inline void pgd_clear (pgd_t *pgdp) {}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define pte_ERROR(e) \</div><div class='del'>-	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))</div><div class='add'>+	pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))</div><div class='ctx'> #define pmd_ERROR(e) \</div><div class='del'>-	printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))</div><div class='add'>+	pr_err("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))</div><div class='ctx'> #define pgd_ERROR(e) \</div><div class='del'>-	printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))</div><div class='add'>+	pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/m68k/include/asm/sun3xflop.h b/arch/m68k/include/asm/sun3xflop.h<br/>index a02ea3a7bb20..159269b7f2e8 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/include/asm/sun3xflop.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/include/asm/sun3xflop.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/include/asm/sun3xflop.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/include/asm/sun3xflop.h</a></div><div class='hunk'>@@ -48,7 +48,7 @@ static unsigned char sun3x_82072_fd_inb(int port)</div><div class='ctx'> //	udelay(5);</div><div class='ctx'> 	switch(port &amp; 7) {</div><div class='ctx'> 	default:</div><div class='del'>-		printk("floppy: Asked to read unknown port %d\n", port);</div><div class='add'>+		pr_crit("floppy: Asked to read unknown port %d\n", port);</div><div class='ctx'> 		panic("floppy: Port bolixed.");</div><div class='ctx'> 	case 4: /* FD_STATUS */</div><div class='ctx'> 		return (*sun3x_fdc.status_r) &amp; ~STATUS_DMA;</div><div class='hunk'>@@ -70,7 +70,7 @@ static void sun3x_82072_fd_outb(unsigned char value, int port)</div><div class='ctx'> //	udelay(5);</div><div class='ctx'> 	switch(port &amp; 7) {</div><div class='ctx'> 	default:</div><div class='del'>-		printk("floppy: Asked to write to unknown port %d\n", port);</div><div class='add'>+		pr_crit("floppy: Asked to write to unknown port %d\n", port);</div><div class='ctx'> 		panic("floppy: Port bolixed.");</div><div class='ctx'> 	case 2: /* FD_DOR */</div><div class='ctx'> 		/* Oh geese, 82072 on the Sun has no DOR register,</div><div class='hunk'>@@ -127,7 +127,7 @@ asmlinkage irqreturn_t sun3xflop_hardint(int irq, void *dev_id)</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-//	printk("doing pdma\n");// st %x\n", sun_fdc-&gt;status_82072);</div><div class='add'>+//	pr_info("doing pdma\n");// st %x\n", sun_fdc-&gt;status_82072);</div><div class='ctx'> </div><div class='ctx'> #ifdef TRACE_FLPY_INT</div><div class='ctx'> 	if(!calls)</div><div class='hunk'>@@ -171,7 +171,7 @@ asmlinkage irqreturn_t sun3xflop_hardint(int irq, void *dev_id)</div><div class='ctx'> #ifdef TRACE_FLPY_INT</div><div class='ctx'> 	calls++;</div><div class='ctx'> #endif</div><div class='del'>-//	printk("st=%02x\n", st);</div><div class='add'>+//	pr_info("st=%02x\n", st);</div><div class='ctx'> 	if(st == 0x20)</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	if(!(st &amp; 0x20)) {</div><div class='hunk'>@@ -180,9 +180,9 @@ asmlinkage irqreturn_t sun3xflop_hardint(int irq, void *dev_id)</div><div class='ctx'> 		doing_pdma = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef TRACE_FLPY_INT</div><div class='del'>-		printk("count=%x, residue=%x calls=%d bytes=%x dma_wait=%d\n",</div><div class='del'>-		       virtual_dma_count, virtual_dma_residue, calls, bytes,</div><div class='del'>-		       dma_wait);</div><div class='add'>+		pr_info("count=%x, residue=%x calls=%d bytes=%x dma_wait=%d\n",</div><div class='add'>+			virtual_dma_count, virtual_dma_residue, calls, bytes,</div><div class='add'>+			dma_wait);</div><div class='ctx'> 		calls = 0;</div><div class='ctx'> 		dma_wait=0;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c<br/>index 8cf97cbadc91..87ef73a93856 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/kernel/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/kernel/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/dma.c</a></div><div class='hunk'>@@ -110,8 +110,8 @@ static void m68k_dma_sync_single_for_device(struct device *dev,</div><div class='ctx'> 		cache_clear(handle, size);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		if (printk_ratelimit())</div><div class='del'>-			printk("dma_sync_single_for_device: unsupported dir %u\n", dir);</div><div class='add'>+		pr_err_ratelimited("dma_sync_single_for_device: unsupported dir %u\n",</div><div class='add'>+				   dir);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -134,7 +134,9 @@ static dma_addr_t m68k_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t handle = page_to_phys(page) + offset;</div><div class='ctx'> </div><div class='del'>-	dma_sync_single_for_device(dev, handle, size, dir);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		dma_sync_single_for_device(dev, handle, size, dir);</div><div class='add'>+</div><div class='ctx'> 	return handle;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -146,13 +148,17 @@ static int m68k_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(sglist, sg, nents, i) {</div><div class='ctx'> 		sg-&gt;dma_address = sg_phys(sg);</div><div class='add'>+</div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		dma_sync_single_for_device(dev, sg-&gt;dma_address, sg-&gt;length,</div><div class='ctx'> 					   dir);</div><div class='ctx'> 	}</div><div class='ctx'> 	return nents;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops m68k_dma_ops = {</div><div class='add'>+const struct dma_map_ops m68k_dma_ops = {</div><div class='ctx'> 	.alloc			= m68k_dma_alloc,</div><div class='ctx'> 	.free			= m68k_dma_free,</div><div class='ctx'> 	.map_page		= m68k_dma_map_page,</div><div class='head'>diff --git a/arch/m68k/kernel/module.c b/arch/m68k/kernel/module.c<br/>index eb46fd6038ca..aaac2da318ff 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/kernel/module.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/kernel/module.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/module.c</a></div><div class='hunk'>@@ -12,9 +12,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-#define DEBUGP printk</div><div class='add'>+#define DEBUGP(fmt, ...) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)</div><div class='ctx'> #else</div><div class='del'>-#define DEBUGP(fmt...)</div><div class='add'>+#define DEBUGP(fmt, ...) no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MODULES</div><div class='hunk'>@@ -51,8 +51,8 @@ int apply_relocate(Elf32_Shdr *sechdrs,</div><div class='ctx'> 			*location += sym-&gt;st_value - (uint32_t)location;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk(KERN_ERR "module %s: Unknown relocation: %u\n",</div><div class='del'>-			       me-&gt;name, ELF32_R_TYPE(rel[i].r_info));</div><div class='add'>+			pr_err("module %s: Unknown relocation: %u\n", me-&gt;name,</div><div class='add'>+			       ELF32_R_TYPE(rel[i].r_info));</div><div class='ctx'> 			return -ENOEXEC;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -91,8 +91,8 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,</div><div class='ctx'> 			*location = rel[i].r_addend + sym-&gt;st_value - (uint32_t)location;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk(KERN_ERR "module %s: Unknown relocation: %u\n",</div><div class='del'>-			       me-&gt;name, ELF32_R_TYPE(rel[i].r_info));</div><div class='add'>+			pr_err("module %s: Unknown relocation: %u\n", me-&gt;name,</div><div class='add'>+			       ELF32_R_TYPE(rel[i].r_info));</div><div class='ctx'> 			return -ENOEXEC;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c<br/>index 4ba1ae7345c3..e475c945c8b2 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/process.c</a></div><div class='hunk'>@@ -13,6 +13,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -27,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/mqueue.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -87,17 +90,17 @@ EXPORT_SYMBOL(pm_power_off);</div><div class='ctx'> </div><div class='ctx'> void show_regs(struct pt_regs * regs)</div><div class='ctx'> {</div><div class='del'>-	printk("\n");</div><div class='del'>-	printk("Format %02x  Vector: %04x  PC: %08lx  Status: %04x    %s\n",</div><div class='del'>-	       regs-&gt;format, regs-&gt;vector, regs-&gt;pc, regs-&gt;sr, print_tainted());</div><div class='del'>-	printk("ORIG_D0: %08lx  D0: %08lx  A2: %08lx  A1: %08lx\n",</div><div class='del'>-	       regs-&gt;orig_d0, regs-&gt;d0, regs-&gt;a2, regs-&gt;a1);</div><div class='del'>-	printk("A0: %08lx  D5: %08lx  D4: %08lx\n",</div><div class='del'>-	       regs-&gt;a0, regs-&gt;d5, regs-&gt;d4);</div><div class='del'>-	printk("D3: %08lx  D2: %08lx  D1: %08lx\n",</div><div class='del'>-	       regs-&gt;d3, regs-&gt;d2, regs-&gt;d1);</div><div class='add'>+	pr_info("Format %02x  Vector: %04x  PC: %08lx  Status: %04x    %s\n",</div><div class='add'>+		regs-&gt;format, regs-&gt;vector, regs-&gt;pc, regs-&gt;sr,</div><div class='add'>+		print_tainted());</div><div class='add'>+	pr_info("ORIG_D0: %08lx  D0: %08lx  A2: %08lx  A1: %08lx\n",</div><div class='add'>+		regs-&gt;orig_d0, regs-&gt;d0, regs-&gt;a2, regs-&gt;a1);</div><div class='add'>+	pr_info("A0: %08lx  D5: %08lx  D4: %08lx\n", regs-&gt;a0, regs-&gt;d5,</div><div class='add'>+		regs-&gt;d4);</div><div class='add'>+	pr_info("D3: %08lx  D2: %08lx  D1: %08lx\n", regs-&gt;d3, regs-&gt;d2,</div><div class='add'>+		regs-&gt;d1);</div><div class='ctx'> 	if (!(regs-&gt;sr &amp; PS_S))</div><div class='del'>-		printk("USP: %08lx\n", rdusp());</div><div class='add'>+		pr_info("USP: %08lx\n", rdusp());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void flush_thread(void)</div><div class='head'>diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c<br/>index 1bc10e62b9af..748c63bd0081 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/ptrace.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -20,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c<br/>index 58507edbdf1d..093b7c42fb85 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/signal.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='hunk'>@@ -598,9 +598,7 @@ static int mangle_kernel_stack(struct pt_regs *regs, int formatvec,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * user process trying to return with weird frame format</div><div class='ctx'> 		 */</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-		printk("user process returning with weird frame format\n");</div><div class='del'>-#endif</div><div class='add'>+		pr_debug("user process returning with weird frame format\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!fsize) {</div><div class='hunk'>@@ -846,10 +844,8 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,</div><div class='ctx'> 	int err = 0, sig = ksig-&gt;sig;</div><div class='ctx'> </div><div class='ctx'> 	if (fsize &lt; 0) {</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-		printk ("setup_frame: Unknown frame format %#x\n",</div><div class='del'>-			regs-&gt;format);</div><div class='del'>-#endif</div><div class='add'>+		pr_debug("setup_frame: Unknown frame format %#x\n",</div><div class='add'>+			 regs-&gt;format);</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -905,9 +901,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,</div><div class='ctx'> 	if (regs-&gt;stkadj) {</div><div class='ctx'> 		struct pt_regs *tregs =</div><div class='ctx'> 			(struct pt_regs *)((ulong)regs + regs-&gt;stkadj);</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-		printk("Performing stackadjust=%04x\n", regs-&gt;stkadj);</div><div class='del'>-#endif</div><div class='add'>+		pr_debug("Performing stackadjust=%04lx\n", regs-&gt;stkadj);</div><div class='ctx'> 		/* This must be copied with decreasing addresses to</div><div class='ctx'>                    handle overlaps.  */</div><div class='ctx'> 		tregs-&gt;vector = 0;</div><div class='hunk'>@@ -926,10 +920,8 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,</div><div class='ctx'> 	int err = 0, sig = ksig-&gt;sig;</div><div class='ctx'> </div><div class='ctx'> 	if (fsize &lt; 0) {</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-		printk ("setup_frame: Unknown frame format %#x\n",</div><div class='del'>-			regs-&gt;format);</div><div class='del'>-#endif</div><div class='add'>+		pr_debug("setup_frame: Unknown frame format %#x\n",</div><div class='add'>+			 regs-&gt;format);</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -993,9 +985,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,</div><div class='ctx'> 	if (regs-&gt;stkadj) {</div><div class='ctx'> 		struct pt_regs *tregs =</div><div class='ctx'> 			(struct pt_regs *)((ulong)regs + regs-&gt;stkadj);</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-		printk("Performing stackadjust=%04x\n", regs-&gt;stkadj);</div><div class='del'>-#endif</div><div class='add'>+		pr_debug("Performing stackadjust=%04lx\n", regs-&gt;stkadj);</div><div class='ctx'> 		/* This must be copied with decreasing addresses to</div><div class='ctx'>                    handle overlaps.  */</div><div class='ctx'> 		tregs-&gt;vector = 0;</div><div class='head'>diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c<br/>index 9aa01adb407f..933e4815dac8 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/kernel/sys_m68k.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/kernel/sys_m68k.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/kernel/sys_m68k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/sys_m68k.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/ipc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cachectl.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -398,7 +398,6 @@ sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)</div><div class='ctx'> 		 * Verify that the specified address region actually belongs</div><div class='ctx'> 		 * to this process.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = -EINVAL;</div><div class='ctx'> 		down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 		vma = find_vma(current-&gt;mm, addr);</div><div class='ctx'> 		if (!vma || addr &lt; vma-&gt;vm_start || addr + len &gt; vma-&gt;vm_end)</div><div class='head'>diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c<br/>index 4e5aa2f4f522..87160b4415fb 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/time.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/loadavg.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c<br/>index 6c9ca24830e9..a926d2c88898 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/traps.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -32,7 +33,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='head'>diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c<br/>index b3536a82a262..b29c3b241e1b 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/kernel/uboot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/kernel/uboot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/kernel/uboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/kernel/uboot.c</a></div><div class='hunk'>@@ -83,8 +83,7 @@ static void __init parse_uboot_commandline(char *commandp, int size)</div><div class='ctx'> 		initrd_start = uboot_initrd_start;</div><div class='ctx'> 		initrd_end = uboot_initrd_end;</div><div class='ctx'> 		ROOT_DEV = Root_RAM0;</div><div class='del'>-		printk(KERN_INFO "initrd at 0x%lx:0x%lx\n",</div><div class='del'>-			initrd_start, initrd_end);</div><div class='add'>+		pr_info("initrd at 0x%lx:0x%lx\n", initrd_start, initrd_end);</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* if defined(CONFIG_BLK_DEV_INITRD) */</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/lib/ashldi3.c b/arch/m68k/lib/ashldi3.c<br/>index 8dffd36ec4f2..ac08f8141390 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/lib/ashldi3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/lib/ashldi3.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/lib/ashldi3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/lib/ashldi3.c</a></div><div class='hunk'>@@ -18,10 +18,10 @@ GNU General Public License for more details. */</div><div class='ctx'> </div><div class='ctx'> #define BITS_PER_UNIT 8</div><div class='ctx'> </div><div class='del'>-typedef		 int SItype	__attribute__ ((mode (SI)));</div><div class='del'>-typedef unsigned int USItype	__attribute__ ((mode (SI)));</div><div class='del'>-typedef		 int DItype	__attribute__ ((mode (DI)));</div><div class='del'>-typedef int word_type __attribute__ ((mode (__word__)));</div><div class='add'>+typedef		 int SItype	__mode(SI);</div><div class='add'>+typedef unsigned int USItype	__mode(SI);</div><div class='add'>+typedef		 int DItype	__mode(DI);</div><div class='add'>+typedef int word_type           __mode(__word__);</div><div class='ctx'> </div><div class='ctx'> struct DIstruct {SItype high, low;};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/lib/ashrdi3.c b/arch/m68k/lib/ashrdi3.c<br/>index e6565a3ee2c3..5837b1dd3334 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/lib/ashrdi3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/lib/ashrdi3.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/lib/ashrdi3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/lib/ashrdi3.c</a></div><div class='hunk'>@@ -18,10 +18,10 @@ GNU General Public License for more details. */</div><div class='ctx'> </div><div class='ctx'> #define BITS_PER_UNIT 8</div><div class='ctx'> </div><div class='del'>-typedef		 int SItype	__attribute__ ((mode (SI)));</div><div class='del'>-typedef unsigned int USItype	__attribute__ ((mode (SI)));</div><div class='del'>-typedef		 int DItype	__attribute__ ((mode (DI)));</div><div class='del'>-typedef int word_type __attribute__ ((mode (__word__)));</div><div class='add'>+typedef		 int SItype	__mode(SI);</div><div class='add'>+typedef unsigned int USItype	__mode(SI);</div><div class='add'>+typedef		 int DItype	__mode(DI);</div><div class='add'>+typedef int word_type           __mode(__word__);</div><div class='ctx'> </div><div class='ctx'> struct DIstruct {SItype high, low;};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/lib/lshrdi3.c b/arch/m68k/lib/lshrdi3.c<br/>index 039779737c7d..7f40566be6c8 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/lib/lshrdi3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/lib/lshrdi3.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/lib/lshrdi3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/lib/lshrdi3.c</a></div><div class='hunk'>@@ -18,10 +18,10 @@ GNU General Public License for more details. */</div><div class='ctx'> </div><div class='ctx'> #define BITS_PER_UNIT 8</div><div class='ctx'> </div><div class='del'>-typedef		 int SItype	__attribute__ ((mode (SI)));</div><div class='del'>-typedef unsigned int USItype	__attribute__ ((mode (SI)));</div><div class='del'>-typedef		 int DItype	__attribute__ ((mode (DI)));</div><div class='del'>-typedef int word_type __attribute__ ((mode (__word__)));</div><div class='add'>+typedef		 int SItype	__mode(SI);</div><div class='add'>+typedef unsigned int USItype	__mode(SI);</div><div class='add'>+typedef		 int DItype	__mode(DI);</div><div class='add'>+typedef int word_type           __mode(__word__);</div><div class='ctx'> </div><div class='ctx'> struct DIstruct {SItype high, low;};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/lib/muldi3.c b/arch/m68k/lib/muldi3.c<br/>index 6459af5b2af0..3fb05c698c41 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/lib/muldi3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/lib/muldi3.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/lib/muldi3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/lib/muldi3.c</a></div><div class='hunk'>@@ -65,10 +65,10 @@ GNU General Public License for more details. */</div><div class='ctx'>     umul_ppmm (__w.s.high, __w.s.low, u, v);				\</div><div class='ctx'>     __w.ll; })</div><div class='ctx'> </div><div class='del'>-typedef 	 int SItype	__attribute__ ((mode (SI)));</div><div class='del'>-typedef unsigned int USItype	__attribute__ ((mode (SI)));</div><div class='del'>-typedef		 int DItype	__attribute__ ((mode (DI)));</div><div class='del'>-typedef int word_type __attribute__ ((mode (__word__)));</div><div class='add'>+typedef 	 int SItype	__mode(SI);</div><div class='add'>+typedef unsigned int USItype	__mode(SI);</div><div class='add'>+typedef		 int DItype	__mode(DI);</div><div class='add'>+typedef int word_type           __mode(__word__);</div><div class='ctx'> </div><div class='ctx'> struct DIstruct {SItype high, low;};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/lib/uaccess.c b/arch/m68k/lib/uaccess.c<br/>index 35d1442dee89..a76b73abaf64 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/lib/uaccess.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/lib/uaccess.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/lib/uaccess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/lib/uaccess.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long __generic_copy_from_user(void *to, const void __user *from,</div><div class='ctx'> 				       unsigned long n)</div><div class='head'>diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c<br/>index f6f7d42713ec..514acde3cd40 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mac/baboon.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mac/baboon.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mac/baboon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/baboon.c</a></div><div class='hunk'>@@ -14,8 +14,6 @@</div><div class='ctx'> #include &lt;asm/macints.h&gt;</div><div class='ctx'> #include &lt;asm/mac_baboon.h&gt;</div><div class='ctx'> </div><div class='del'>-/* #define DEBUG_IRQS */</div><div class='del'>-</div><div class='ctx'> int baboon_present;</div><div class='ctx'> static volatile struct baboon *baboon;</div><div class='ctx'> </div><div class='hunk'>@@ -50,12 +48,6 @@ static void baboon_irq(struct irq_desc *desc)</div><div class='ctx'> 	int irq_bit, irq_num;</div><div class='ctx'> 	unsigned char events;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_IRQS</div><div class='del'>-	printk("baboon_irq: mb_control %02X mb_ifr %02X mb_status %02X\n",</div><div class='del'>-		(uint) baboon-&gt;mb_control, (uint) baboon-&gt;mb_ifr,</div><div class='del'>-		(uint) baboon-&gt;mb_status);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	events = baboon-&gt;mb_ifr &amp; 0x07;</div><div class='ctx'> 	if (!events)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -97,18 +89,10 @@ void __init baboon_register_interrupts(void)</div><div class='ctx'> </div><div class='ctx'> void baboon_irq_enable(int irq)</div><div class='ctx'> {</div><div class='del'>-#ifdef DEBUG_IRQUSE</div><div class='del'>-	printk("baboon_irq_enable(%d)\n", irq);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	mac_irq_enable(irq_get_irq_data(IRQ_NUBUS_C));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void baboon_irq_disable(int irq)</div><div class='ctx'> {</div><div class='del'>-#ifdef DEBUG_IRQUSE</div><div class='del'>-	printk("baboon_irq_disable(%d)\n", irq);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	mac_irq_disable(irq_get_irq_data(IRQ_NUBUS_C));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c<br/>index e46895316eb0..9dc65a4c28d2 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mac/config.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mac/config.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mac/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/config.c</a></div><div class='hunk'>@@ -286,7 +286,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.ident		= MAC_MODEL_IISI,</div><div class='ctx'> 		.name		= "IIsi",</div><div class='del'>-		.adb_type	= MAC_ADB_IISI,</div><div class='add'>+		.adb_type	= MAC_ADB_EGRET,</div><div class='ctx'> 		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='hunk'>@@ -295,7 +295,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.ident		= MAC_MODEL_IIVI,</div><div class='ctx'> 		.name		= "IIvi",</div><div class='del'>-		.adb_type	= MAC_ADB_IISI,</div><div class='add'>+		.adb_type	= MAC_ADB_EGRET,</div><div class='ctx'> 		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_LC,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='hunk'>@@ -304,7 +304,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.ident		= MAC_MODEL_IIVX,</div><div class='ctx'> 		.name		= "IIvx",</div><div class='del'>-		.adb_type	= MAC_ADB_IISI,</div><div class='add'>+		.adb_type	= MAC_ADB_EGRET,</div><div class='ctx'> 		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_LC,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='hunk'>@@ -319,7 +319,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.ident		= MAC_MODEL_CLII,</div><div class='ctx'> 		.name		= "Classic II",</div><div class='del'>-		.adb_type	= MAC_ADB_IISI,</div><div class='add'>+		.adb_type	= MAC_ADB_EGRET,</div><div class='ctx'> 		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_LC,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='hunk'>@@ -352,7 +352,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.ident		= MAC_MODEL_LC,</div><div class='ctx'> 		.name		= "LC",</div><div class='del'>-		.adb_type	= MAC_ADB_IISI,</div><div class='add'>+		.adb_type	= MAC_ADB_EGRET,</div><div class='ctx'> 		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_LC,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='hunk'>@@ -361,7 +361,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.ident		= MAC_MODEL_LCII,</div><div class='ctx'> 		.name		= "LC II",</div><div class='del'>-		.adb_type	= MAC_ADB_IISI,</div><div class='add'>+		.adb_type	= MAC_ADB_EGRET,</div><div class='ctx'> 		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_LC,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='hunk'>@@ -370,7 +370,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.ident		= MAC_MODEL_LCIII,</div><div class='ctx'> 		.name		= "LC III",</div><div class='del'>-		.adb_type	= MAC_ADB_IISI,</div><div class='add'>+		.adb_type	= MAC_ADB_EGRET,</div><div class='ctx'> 		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_LC,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='hunk'>@@ -498,7 +498,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.ident		= MAC_MODEL_P460,</div><div class='ctx'> 		.name		= "Performa 460",</div><div class='del'>-		.adb_type	= MAC_ADB_IISI,</div><div class='add'>+		.adb_type	= MAC_ADB_EGRET,</div><div class='ctx'> 		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_LC,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='hunk'>@@ -575,7 +575,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.ident		= MAC_MODEL_P600,</div><div class='ctx'> 		.name		= "Performa 600",</div><div class='del'>-		.adb_type	= MAC_ADB_IISI,</div><div class='add'>+		.adb_type	= MAC_ADB_EGRET,</div><div class='ctx'> 		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_LC,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='head'>diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c<br/>index 9f98c0871901..9637dee90dac 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mac/macints.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mac/macints.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mac/macints.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/macints.c</a></div><div class='hunk'>@@ -110,6 +110,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -125,16 +126,9 @@</div><div class='ctx'> #include &lt;asm/hwtest.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='ctx'> </div><div class='del'>-#define SHUTUP_SONIC</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * console_loglevel determines NMI handler function</div><div class='del'>- */</div><div class='add'>+extern void show_registers(struct pt_regs *);</div><div class='ctx'> </div><div class='ctx'> irqreturn_t mac_nmi_handler(int, void *);</div><div class='del'>-irqreturn_t mac_debug_handler(int, void *);</div><div class='del'>-</div><div class='del'>-/* #define DEBUG_MACINTS */</div><div class='ctx'> </div><div class='ctx'> static unsigned int mac_irq_startup(struct irq_data *);</div><div class='ctx'> static void mac_irq_shutdown(struct irq_data *);</div><div class='hunk'>@@ -149,21 +143,8 @@ static struct irq_chip mac_irq_chip = {</div><div class='ctx'> </div><div class='ctx'> void __init mac_init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef DEBUG_MACINTS</div><div class='del'>-	printk("mac_init_IRQ(): Setting things up...\n");</div><div class='del'>-#endif</div><div class='ctx'> 	m68k_setup_irq_controller(&amp;mac_irq_chip, handle_simple_irq, IRQ_USER,</div><div class='ctx'> 				  NUM_MAC_SOURCES - IRQ_USER);</div><div class='del'>-	/* Make sure the SONIC interrupt is cleared or things get ugly */</div><div class='del'>-#ifdef SHUTUP_SONIC</div><div class='del'>-	printk("Killing onboard sonic... ");</div><div class='del'>-	/* This address should hopefully be mapped already */</div><div class='del'>-	if (hwreg_present((void*)(0x50f0a000))) {</div><div class='del'>-		*(long *)(0x50f0a014) = 0x7fffL;</div><div class='del'>-		*(long *)(0x50f0a010) = 0L;</div><div class='del'>-	}</div><div class='del'>-	printk("Done.\n");</div><div class='del'>-#endif /* SHUTUP_SONIC */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now register the handlers for the master IRQ handlers</div><div class='hunk'>@@ -182,9 +163,6 @@ void __init mac_init_IRQ(void)</div><div class='ctx'> 	if (request_irq(IRQ_AUTO_7, mac_nmi_handler, 0, "NMI",</div><div class='ctx'> 			mac_nmi_handler))</div><div class='ctx'> 		pr_err("Couldn't register NMI\n");</div><div class='del'>-#ifdef DEBUG_MACINTS</div><div class='del'>-	printk("mac_init_IRQ(): Done!\n");</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -276,65 +254,17 @@ static void mac_irq_shutdown(struct irq_data *data)</div><div class='ctx'> 		mac_irq_disable(data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int num_debug[8];</div><div class='del'>-</div><div class='del'>-irqreturn_t mac_debug_handler(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	if (num_debug[irq] &lt; 10) {</div><div class='del'>-		printk("DEBUG: Unexpected IRQ %d\n", irq);</div><div class='del'>-		num_debug[irq]++;</div><div class='del'>-	}</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int in_nmi;</div><div class='del'>-static volatile int nmi_hold;</div><div class='add'>+static volatile int in_nmi;</div><div class='ctx'> </div><div class='ctx'> irqreturn_t mac_nmi_handler(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	/*</div><div class='del'>-	 * generate debug output on NMI switch if 'debug' kernel option given</div><div class='del'>-	 * (only works with Penguin!)</div><div class='del'>-	 */</div><div class='add'>+	if (in_nmi)</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	in_nmi = 1;</div><div class='ctx'> </div><div class='del'>-	in_nmi++;</div><div class='del'>-	for (i=0; i&lt;100; i++)</div><div class='del'>-		udelay(1000);</div><div class='del'>-</div><div class='del'>-	if (in_nmi == 1) {</div><div class='del'>-		nmi_hold = 1;</div><div class='del'>-		printk("... pausing, press NMI to resume ...");</div><div class='del'>-	} else {</div><div class='del'>-		printk(" ok!\n");</div><div class='del'>-		nmi_hold = 0;</div><div class='del'>-	}</div><div class='add'>+	pr_info("Non-Maskable Interrupt\n");</div><div class='add'>+	show_registers(get_irq_regs());</div><div class='ctx'> </div><div class='del'>-	barrier();</div><div class='del'>-</div><div class='del'>-	while (nmi_hold == 1)</div><div class='del'>-		udelay(1000);</div><div class='del'>-</div><div class='del'>-	if (console_loglevel &gt;= 8) {</div><div class='del'>-#if 0</div><div class='del'>-		struct pt_regs *fp = get_irq_regs();</div><div class='del'>-		show_state();</div><div class='del'>-		printk("PC: %08lx\nSR: %04x  SP: %p\n", fp-&gt;pc, fp-&gt;sr, fp);</div><div class='del'>-		printk("d0: %08lx    d1: %08lx    d2: %08lx    d3: %08lx\n",</div><div class='del'>-		       fp-&gt;d0, fp-&gt;d1, fp-&gt;d2, fp-&gt;d3);</div><div class='del'>-		printk("d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",</div><div class='del'>-		       fp-&gt;d4, fp-&gt;d5, fp-&gt;a0, fp-&gt;a1);</div><div class='del'>-</div><div class='del'>-		if (STACK_MAGIC != *(unsigned long *)current-&gt;kernel_stack_page)</div><div class='del'>-			printk("Corrupted stack page\n");</div><div class='del'>-		printk("Process %s (pid: %d, stackpage=%08lx)\n",</div><div class='del'>-			current-&gt;comm, current-&gt;pid, current-&gt;kernel_stack_page);</div><div class='del'>-		if (intr_count == 1)</div><div class='del'>-			dump_stack((struct frame *)fp);</div><div class='del'>-#else</div><div class='del'>-		/* printk("NMI "); */</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	in_nmi--;</div><div class='add'>+	in_nmi = 0;</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c<br/>index 0fb54a90eac2..5b01704c85eb 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mac/misc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mac/misc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mac/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/misc.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -16,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/cuda.h&gt;</div><div class='ctx'> #include &lt;linux/pmu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -142,54 +141,6 @@ static void pmu_write_pram(int offset, __u8 data)</div><div class='ctx'> #define pmu_write_pram NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if 0 /* def CONFIG_ADB_MACIISI */</div><div class='del'>-extern int maciisi_request(struct adb_request *req,</div><div class='del'>-			void (*done)(struct adb_request *), int nbytes, ...);</div><div class='del'>-</div><div class='del'>-static long maciisi_read_time(void)</div><div class='del'>-{</div><div class='del'>-	struct adb_request req;</div><div class='del'>-	long time;</div><div class='del'>-</div><div class='del'>-	if (maciisi_request(&amp;req, NULL, 2, CUDA_PACKET, CUDA_GET_TIME))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	time = (req.reply[3] &lt;&lt; 24) | (req.reply[4] &lt;&lt; 16)</div><div class='del'>-		| (req.reply[5] &lt;&lt; 8) | req.reply[6];</div><div class='del'>-	return time - RTC_OFFSET;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void maciisi_write_time(long data)</div><div class='del'>-{</div><div class='del'>-	struct adb_request req;</div><div class='del'>-	data += RTC_OFFSET;</div><div class='del'>-	maciisi_request(&amp;req, NULL, 6, CUDA_PACKET, CUDA_SET_TIME,</div><div class='del'>-			(data &gt;&gt; 24) &amp; 0xFF, (data &gt;&gt; 16) &amp; 0xFF,</div><div class='del'>-			(data &gt;&gt; 8) &amp; 0xFF, data &amp; 0xFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __u8 maciisi_read_pram(int offset)</div><div class='del'>-{</div><div class='del'>-	struct adb_request req;</div><div class='del'>-	if (maciisi_request(&amp;req, NULL, 4, CUDA_PACKET, CUDA_GET_PRAM,</div><div class='del'>-			(offset &gt;&gt; 8) &amp; 0xFF, offset &amp; 0xFF))</div><div class='del'>-		return 0;</div><div class='del'>-	return req.reply[3];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void maciisi_write_pram(int offset, __u8 data)</div><div class='del'>-{</div><div class='del'>-	struct adb_request req;</div><div class='del'>-	maciisi_request(&amp;req, NULL, 5, CUDA_PACKET, CUDA_SET_PRAM,</div><div class='del'>-			(offset &gt;&gt; 8) &amp; 0xFF, offset &amp; 0xFF, data);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define maciisi_read_time() 0</div><div class='del'>-#define maciisi_write_time(n)</div><div class='del'>-#define maciisi_read_pram NULL</div><div class='del'>-#define maciisi_write_pram NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * VIA PRAM/RTC access routines</div><div class='ctx'>  *</div><div class='hunk'>@@ -458,11 +409,10 @@ void mac_pram_read(int offset, __u8 *buffer, int len)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch(macintosh_config-&gt;adb_type) {</div><div class='del'>-	case MAC_ADB_IISI:</div><div class='del'>-		func = maciisi_read_pram; break;</div><div class='ctx'> 	case MAC_ADB_PB1:</div><div class='ctx'> 	case MAC_ADB_PB2:</div><div class='ctx'> 		func = pmu_read_pram; break;</div><div class='add'>+	case MAC_ADB_EGRET:</div><div class='ctx'> 	case MAC_ADB_CUDA:</div><div class='ctx'> 		func = cuda_read_pram; break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -481,11 +431,10 @@ void mac_pram_write(int offset, __u8 *buffer, int len)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch(macintosh_config-&gt;adb_type) {</div><div class='del'>-	case MAC_ADB_IISI:</div><div class='del'>-		func = maciisi_write_pram; break;</div><div class='ctx'> 	case MAC_ADB_PB1:</div><div class='ctx'> 	case MAC_ADB_PB2:</div><div class='ctx'> 		func = pmu_write_pram; break;</div><div class='add'>+	case MAC_ADB_EGRET:</div><div class='ctx'> 	case MAC_ADB_CUDA:</div><div class='ctx'> 		func = cuda_write_pram; break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -500,17 +449,13 @@ void mac_pram_write(int offset, __u8 *buffer, int len)</div><div class='ctx'> </div><div class='ctx'> void mac_poweroff(void)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * MAC_ADB_IISI may need to be moved up here if it doesn't actually</div><div class='del'>-	 * work using the ADB packet method.  --David Kilzer</div><div class='del'>-	 */</div><div class='del'>-</div><div class='ctx'> 	if (oss_present) {</div><div class='ctx'> 		oss_shutdown();</div><div class='ctx'> 	} else if (macintosh_config-&gt;adb_type == MAC_ADB_II) {</div><div class='ctx'> 		via_shutdown();</div><div class='ctx'> #ifdef CONFIG_ADB_CUDA</div><div class='del'>-	} else if (macintosh_config-&gt;adb_type == MAC_ADB_CUDA) {</div><div class='add'>+	} else if (macintosh_config-&gt;adb_type == MAC_ADB_EGRET ||</div><div class='add'>+	           macintosh_config-&gt;adb_type == MAC_ADB_CUDA) {</div><div class='ctx'> 		cuda_shutdown();</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ADB_PMU68K</div><div class='hunk'>@@ -550,7 +495,8 @@ void mac_reset(void)</div><div class='ctx'> 			local_irq_restore(flags);</div><div class='ctx'> 		}</div><div class='ctx'> #ifdef CONFIG_ADB_CUDA</div><div class='del'>-	} else if (macintosh_config-&gt;adb_type == MAC_ADB_CUDA) {</div><div class='add'>+	} else if (macintosh_config-&gt;adb_type == MAC_ADB_EGRET ||</div><div class='add'>+	           macintosh_config-&gt;adb_type == MAC_ADB_CUDA) {</div><div class='ctx'> 		cuda_restart();</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ADB_PMU68K</div><div class='hunk'>@@ -699,13 +645,11 @@ int mac_hwclk(int op, struct rtc_time *t)</div><div class='ctx'> 		case MAC_ADB_IOP:</div><div class='ctx'> 			now = via_read_time();</div><div class='ctx'> 			break;</div><div class='del'>-		case MAC_ADB_IISI:</div><div class='del'>-			now = maciisi_read_time();</div><div class='del'>-			break;</div><div class='ctx'> 		case MAC_ADB_PB1:</div><div class='ctx'> 		case MAC_ADB_PB2:</div><div class='ctx'> 			now = pmu_read_time();</div><div class='ctx'> 			break;</div><div class='add'>+		case MAC_ADB_EGRET:</div><div class='ctx'> 		case MAC_ADB_CUDA:</div><div class='ctx'> 			now = cuda_read_time();</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -737,6 +681,7 @@ int mac_hwclk(int op, struct rtc_time *t)</div><div class='ctx'> 		case MAC_ADB_IOP:</div><div class='ctx'> 			via_write_time(now);</div><div class='ctx'> 			break;</div><div class='add'>+		case MAC_ADB_EGRET:</div><div class='ctx'> 		case MAC_ADB_CUDA:</div><div class='ctx'> 			cuda_write_time(now);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -744,8 +689,6 @@ int mac_hwclk(int op, struct rtc_time *t)</div><div class='ctx'> 		case MAC_ADB_PB2:</div><div class='ctx'> 			pmu_write_time(now);</div><div class='ctx'> 			break;</div><div class='del'>-		case MAC_ADB_IISI:</div><div class='del'>-			maciisi_write_time(now);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c<br/>index 55d6592783f5..ca84dcf41fc9 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mac/oss.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mac/oss.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mac/oss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/oss.c</a></div><div class='hunk'>@@ -68,15 +68,6 @@ static void oss_irq(struct irq_desc *desc)</div><div class='ctx'> 	int events = oss-&gt;irq_pending &amp;</div><div class='ctx'> 		(OSS_IP_IOPSCC | OSS_IP_SCSI | OSS_IP_IOPISM);</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_IRQS</div><div class='del'>-	if ((console_loglevel == 10) &amp;&amp; !(events &amp; OSS_IP_SCSI)) {</div><div class='del'>-		unsigned int irq = irq_desc_get_irq(desc);</div><div class='del'>-</div><div class='del'>-		printk("oss_irq: irq %u events = 0x%04X\n", irq,</div><div class='del'>-			(int) oss-&gt;irq_pending);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (events &amp; OSS_IP_IOPSCC) {</div><div class='ctx'> 		oss-&gt;irq_pending &amp;= ~OSS_IP_IOPSCC;</div><div class='ctx'> 		generic_handle_irq(IRQ_MAC_SCC);</div><div class='hunk'>@@ -107,11 +98,6 @@ static void oss_nubus_irq(struct irq_desc *desc)</div><div class='ctx'> 	if (!events)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_NUBUS_INT</div><div class='del'>-	if (console_loglevel &gt; 7) {</div><div class='del'>-		printk("oss_nubus_irq: events = 0x%04X\n", events);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> 	/* There are only six slots on the OSS, not seven */</div><div class='ctx'> </div><div class='ctx'> 	i = 6;</div><div class='hunk'>@@ -163,9 +149,6 @@ void __init oss_register_interrupts(void)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void oss_irq_enable(int irq) {</div><div class='del'>-#ifdef DEBUG_IRQUSE</div><div class='del'>-	printk("oss_irq_enable(%d)\n", irq);</div><div class='del'>-#endif</div><div class='ctx'> 	switch(irq) {</div><div class='ctx'> 		case IRQ_MAC_SCC:</div><div class='ctx'> 			oss-&gt;irq_level[OSS_IOPSCC] = OSS_IRQLEV_IOPSCC;</div><div class='hunk'>@@ -199,9 +182,6 @@ void oss_irq_enable(int irq) {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void oss_irq_disable(int irq) {</div><div class='del'>-#ifdef DEBUG_IRQUSE</div><div class='del'>-	printk("oss_irq_disable(%d)\n", irq);</div><div class='del'>-#endif</div><div class='ctx'> 	switch(irq) {</div><div class='ctx'> 		case IRQ_MAC_SCC:</div><div class='ctx'> 			oss-&gt;irq_level[OSS_IOPSCC] = 0;</div><div class='head'>diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c<br/>index cb2b1a3a2b62..439a2a2e5874 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mac/psc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mac/psc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mac/psc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/psc.c</a></div><div class='hunk'>@@ -122,11 +122,6 @@ static void psc_irq(struct irq_desc *desc)</div><div class='ctx'> 	int irq_num;</div><div class='ctx'> 	unsigned char irq_bit, events;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_IRQS</div><div class='del'>-	printk("psc_irq: irq %u pIFR = 0x%02X pIER = 0x%02X\n",</div><div class='del'>-		irq, (int) psc_read_byte(pIFR), (int) psc_read_byte(pIER));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	events = psc_read_byte(pIFR) &amp; psc_read_byte(pIER) &amp; 0xF;</div><div class='ctx'> 	if (!events)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -160,9 +155,6 @@ void psc_irq_enable(int irq) {</div><div class='ctx'> 	int irq_idx	= IRQ_IDX(irq);</div><div class='ctx'> 	int pIER	= pIERbase + (irq_src &lt;&lt; 4);</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_IRQUSE</div><div class='del'>-	printk("psc_irq_enable(%d)\n", irq);</div><div class='del'>-#endif</div><div class='ctx'> 	psc_write_byte(pIER, (1 &lt;&lt; irq_idx) | 0x80);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -171,8 +163,5 @@ void psc_irq_disable(int irq) {</div><div class='ctx'> 	int irq_idx	= IRQ_IDX(irq);</div><div class='ctx'> 	int pIER	= pIERbase + (irq_src &lt;&lt; 4);</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_IRQUSE</div><div class='del'>-	printk("psc_irq_disable(%d)\n", irq);</div><div class='del'>-#endif</div><div class='ctx'> 	psc_write_byte(pIER, 1 &lt;&lt; irq_idx);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c<br/>index 920ff63d4a81..16629e91feba 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mac/via.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mac/via.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mac/via.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mac/via.c</a></div><div class='hunk'>@@ -550,10 +550,6 @@ void via_irq_enable(int irq) {</div><div class='ctx'> 	int irq_src	= IRQ_SRC(irq);</div><div class='ctx'> 	int irq_idx	= IRQ_IDX(irq);</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_IRQUSE</div><div class='del'>-	printk(KERN_DEBUG "via_irq_enable(%d)\n", irq);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (irq_src == 1) {</div><div class='ctx'> 		via1[vIER] = IER_SET_BIT(irq_idx);</div><div class='ctx'> 	} else if (irq_src == 2) {</div><div class='hunk'>@@ -582,10 +578,6 @@ void via_irq_disable(int irq) {</div><div class='ctx'> 	int irq_src	= IRQ_SRC(irq);</div><div class='ctx'> 	int irq_idx	= IRQ_IDX(irq);</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_IRQUSE</div><div class='del'>-	printk(KERN_DEBUG "via_irq_disable(%d)\n", irq);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (irq_src == 1) {</div><div class='ctx'> 		via1[vIER] = IER_CLR_BIT(irq_idx);</div><div class='ctx'> 	} else if (irq_src == 2) {</div><div class='head'>diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c<br/>index b09a3cb29b68..a6ffead9bef5 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mm/init.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='hunk'>@@ -66,7 +66,7 @@ void __init m68k_setup_node(int node)</div><div class='ctx'> 	end = (unsigned long)phys_to_virt(info-&gt;addr + info-&gt;size - 1) &gt;&gt; __virt_to_node_shift();</div><div class='ctx'> 	for (; i &lt;= end; i++) {</div><div class='ctx'> 		if (pg_data_table[i])</div><div class='del'>-			printk("overlap at %u for chunk %u\n", i, node);</div><div class='add'>+			pr_warn("overlap at %u for chunk %u\n", i, node);</div><div class='ctx'> 		pg_data_table[i] = pg_data_map + node;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c<br/>index 51bc9d258ede..4902b681a9fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mm/memory.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mm/memory.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mm/memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mm/memory.c</a></div><div class='hunk'>@@ -47,9 +47,7 @@ void __init init_pointer_table(unsigned long ptable)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	PD_MARKBITS(dp) &amp;= ~mask;</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));</div><div class='ctx'> </div><div class='ctx'> 	/* unreserve the page so it's possible to free that page */</div><div class='ctx'> 	PD_PAGE(dp)-&gt;flags &amp;= ~(1 &lt;&lt; PG_reserved);</div><div class='head'>diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c<br/>index 8f37fdd80be9..7cb72dbc2eaa 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mm/motorola.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mm/motorola.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mm/motorola.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mm/motorola.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='head'>diff --git a/arch/m68k/mm/sun3kmap.c b/arch/m68k/mm/sun3kmap.c<br/>index 3dc41158c05e..ae03555449b8 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mm/sun3kmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mm/sun3kmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mm/sun3kmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mm/sun3kmap.c</a></div><div class='hunk'>@@ -40,6 +40,7 @@ static inline void do_page_mapin(unsigned long phys, unsigned long virt,</div><div class='ctx'> 	sun3_put_pte(virt, pte);</div><div class='ctx'> </div><div class='ctx'> #ifdef SUN3_KMAP_DEBUG</div><div class='add'>+	pr_info("mapin:");</div><div class='ctx'> 	print_pte_vaddr(virt);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -80,8 +81,8 @@ void __iomem *sun3_ioremap(unsigned long phys, unsigned long size,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> #ifdef SUN3_KMAP_DEBUG</div><div class='del'>-	printk("ioremap: got virt %p size %lx(%lx)\n",</div><div class='del'>-	       area-&gt;addr, size, area-&gt;size);</div><div class='add'>+	pr_info("ioremap: got virt %p size %lx(%lx)\n", area-&gt;addr, size,</div><div class='add'>+		area-&gt;size);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	pages = size / PAGE_SIZE;</div><div class='head'>diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c<br/>index 269f81158a33..177d776de1a0 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mm/sun3mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mm/sun3mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mm/sun3mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mm/sun3mmu.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='hunk'>@@ -44,9 +44,6 @@ void __init paging_init(void)</div><div class='ctx'> 	unsigned long zones_size[MAX_NR_ZONES] = { 0, };</div><div class='ctx'> 	unsigned long size;</div><div class='ctx'> </div><div class='del'>-#ifdef TEST_VERIFY_AREA</div><div class='del'>-	wp_works_ok = 0;</div><div class='del'>-#endif</div><div class='ctx'> 	empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	address = PAGE_OFFSET;</div><div class='head'>diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c<br/>index c11d38dfad08..8778612d1f31 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mvme147/config.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mvme147/config.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mvme147/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mvme147/config.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ int __init mvme147_parse_bootinfo(const struct bi_record *bi)</div><div class='ctx'> </div><div class='ctx'> void mvme147_reset(void)</div><div class='ctx'> {</div><div class='del'>-	printk ("\r\n\nCalled mvme147_reset\r\n");</div><div class='add'>+	pr_info("\r\n\nCalled mvme147_reset\r\n");</div><div class='ctx'> 	m147_pcc-&gt;watchdog = 0x0a;	/* Clear timer */</div><div class='ctx'> 	m147_pcc-&gt;watchdog = 0xa5;	/* Enable watchdog - 100ms to reset */</div><div class='ctx'> 	while (1)</div><div class='head'>diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c<br/>index 58e240939d26..6fa06d4d16bf 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mvme16x/config.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mvme16x/config.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mvme16x/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mvme16x/config.c</a></div><div class='hunk'>@@ -72,8 +72,8 @@ int __init mvme16x_parse_bootinfo(const struct bi_record *bi)</div><div class='ctx'> </div><div class='ctx'> void mvme16x_reset(void)</div><div class='ctx'> {</div><div class='del'>-	printk ("\r\n\nCalled mvme16x_reset\r\n"</div><div class='del'>-			"\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r");</div><div class='add'>+	pr_info("\r\n\nCalled mvme16x_reset\r\n"</div><div class='add'>+		"\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r");</div><div class='ctx'> 	/* The string of returns is to delay the reset until the whole</div><div class='ctx'> 	 * message is output.  Assert reset bit in GCSR */</div><div class='ctx'> 	*(volatile char *)0xfff40107 = 0x80;</div><div class='hunk'>@@ -289,7 +289,7 @@ void __init config_mvme16x(void)</div><div class='ctx'> </div><div class='ctx'>     if (strncmp("BDID", p-&gt;bdid, 4))</div><div class='ctx'>     {</div><div class='del'>-	printk ("\n\nBug call .BRD_ID returned garbage - giving up\n\n");</div><div class='add'>+	pr_crit("Bug call .BRD_ID returned garbage - giving up\n");</div><div class='ctx'> 	while (1)</div><div class='ctx'> 		;</div><div class='ctx'>     }</div><div class='hunk'>@@ -298,25 +298,25 @@ void __init config_mvme16x(void)</div><div class='ctx'> 	vme_brdtype = brdno;</div><div class='ctx'> </div><div class='ctx'>     mvme16x_get_model(id);</div><div class='del'>-    printk ("\nBRD_ID: %s   BUG %x.%x %02x/%02x/%02x\n", id, p-&gt;rev&gt;&gt;4,</div><div class='del'>-					p-&gt;rev&amp;0xf, p-&gt;yr, p-&gt;mth, p-&gt;day);</div><div class='add'>+    pr_info("BRD_ID: %s   BUG %x.%x %02x/%02x/%02x\n", id, p-&gt;rev &gt;&gt; 4,</div><div class='add'>+	    p-&gt;rev &amp; 0xf, p-&gt;yr, p-&gt;mth, p-&gt;day);</div><div class='ctx'>     if (brdno == 0x0162 || brdno == 0x172)</div><div class='ctx'>     {</div><div class='ctx'> 	unsigned char rev = *(unsigned char *)MVME162_VERSION_REG;</div><div class='ctx'> </div><div class='ctx'> 	mvme16x_config = rev | MVME16x_CONFIG_GOT_SCCA;</div><div class='ctx'> </div><div class='del'>-	printk ("MVME%x Hardware status:\n", brdno);</div><div class='del'>-	printk ("    CPU Type           68%s040\n",</div><div class='del'>-			rev &amp; MVME16x_CONFIG_GOT_FPU ? "" : "LC");</div><div class='del'>-	printk ("    CPU clock          %dMHz\n",</div><div class='del'>-			rev &amp; MVME16x_CONFIG_SPEED_32 ? 32 : 25);</div><div class='del'>-	printk ("    VMEchip2           %spresent\n",</div><div class='del'>-			rev &amp; MVME16x_CONFIG_NO_VMECHIP2 ? "NOT " : "");</div><div class='del'>-	printk ("    SCSI interface     %spresent\n",</div><div class='del'>-			rev &amp; MVME16x_CONFIG_NO_SCSICHIP ? "NOT " : "");</div><div class='del'>-	printk ("    Ethernet interface %spresent\n",</div><div class='del'>-			rev &amp; MVME16x_CONFIG_NO_ETHERNET ? "NOT " : "");</div><div class='add'>+	pr_info("MVME%x Hardware status:\n", brdno);</div><div class='add'>+	pr_info("    CPU Type           68%s040\n",</div><div class='add'>+		rev &amp; MVME16x_CONFIG_GOT_FPU ? "" : "LC");</div><div class='add'>+	pr_info("    CPU clock          %dMHz\n",</div><div class='add'>+		rev &amp; MVME16x_CONFIG_SPEED_32 ? 32 : 25);</div><div class='add'>+	pr_info("    VMEchip2           %spresent\n",</div><div class='add'>+		rev &amp; MVME16x_CONFIG_NO_VMECHIP2 ? "NOT " : "");</div><div class='add'>+	pr_info("    SCSI interface     %spresent\n",</div><div class='add'>+		rev &amp; MVME16x_CONFIG_NO_SCSICHIP ? "NOT " : "");</div><div class='add'>+	pr_info("    Ethernet interface %spresent\n",</div><div class='add'>+		rev &amp; MVME16x_CONFIG_NO_ETHERNET ? "NOT " : "");</div><div class='ctx'>     }</div><div class='ctx'>     else</div><div class='ctx'>     {</div><div class='head'>diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c<br/>index 1cdc73268188..7b24577a7bd0 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/mvme16x/rtc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/mvme16x/rtc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/mvme16x/rtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/mvme16x/rtc.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;asm/mvme16xhw.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -158,7 +158,7 @@ static int __init rtc_MK48T08_init(void)</div><div class='ctx'> 	if (!MACH_IS_MVME16x)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "MK48T08 Real Time Clock Driver v%s\n", RTC_VERSION);</div><div class='add'>+	pr_info("MK48T08 Real Time Clock Driver v%s\n", RTC_VERSION);</div><div class='ctx'> 	return misc_register(&amp;rtc_dev);</div><div class='ctx'> }</div><div class='ctx'> device_initcall(rtc_MK48T08_init);</div><div class='head'>diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c<br/>index ea89a24f4600..71c0867ecf20 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/q40/config.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/q40/config.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/q40/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/q40/config.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ static int __init q40_debug_setup(char *arg)</div><div class='ctx'> {</div><div class='ctx'> 	/* useful for early debugging stages - writes kernel messages into SRAM */</div><div class='ctx'> 	if (MACH_IS_Q40 &amp;&amp; !strncmp(arg, "mem", 3)) {</div><div class='del'>-		/*printk("using NVRAM debug, q40_mem_cptr=%p\n",q40_mem_cptr);*/</div><div class='add'>+		/*pr_info("using NVRAM debug, q40_mem_cptr=%p\n",q40_mem_cptr);*/</div><div class='ctx'> 		_cpleft = 2000 - ((long)q40_mem_cptr-0xff020000) / 4;</div><div class='ctx'> 		register_console(&amp;q40_console_driver);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -124,8 +124,8 @@ static void q40_heartbeat(int on)</div><div class='ctx'> </div><div class='ctx'> static void q40_reset(void)</div><div class='ctx'> {</div><div class='del'>-        halted = 1;</div><div class='del'>-        printk("\n\n*******************************************\n"</div><div class='add'>+	halted = 1;</div><div class='add'>+	pr_info("*******************************************\n"</div><div class='ctx'> 		"Called q40_reset : press the RESET button!!\n"</div><div class='ctx'> 		"*******************************************\n");</div><div class='ctx'> 	Q40_LED_ON();</div><div class='hunk'>@@ -135,10 +135,10 @@ static void q40_reset(void)</div><div class='ctx'> </div><div class='ctx'> static void q40_halt(void)</div><div class='ctx'> {</div><div class='del'>-        halted = 1;</div><div class='del'>-        printk("\n\n*******************\n"</div><div class='del'>-		   "  Called q40_halt\n"</div><div class='del'>-		   "*******************\n");</div><div class='add'>+	halted = 1;</div><div class='add'>+	pr_info("*******************\n"</div><div class='add'>+		"  Called q40_halt\n"</div><div class='add'>+		"*******************\n");</div><div class='ctx'> 	Q40_LED_ON();</div><div class='ctx'> 	while (1)</div><div class='ctx'> 		;</div><div class='head'>diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c<br/>index 513f9bb17b9c..3e7603202977 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/q40/q40ints.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/q40/q40ints.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/q40/q40ints.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/q40/q40ints.c</a></div><div class='hunk'>@@ -48,7 +48,8 @@ static unsigned int q40_irq_startup(struct irq_data *data)</div><div class='ctx'> 	switch (irq) {</div><div class='ctx'> 	case 1: case 2: case 8: case 9:</div><div class='ctx'> 	case 11: case 12: case 13:</div><div class='del'>-		printk("%s: ISA IRQ %d not implemented by HW\n", __func__, irq);</div><div class='add'>+		pr_warn("%s: ISA IRQ %d not implemented by HW\n", __func__,</div><div class='add'>+			irq);</div><div class='ctx'> 		/* FIXME return -ENXIO; */</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -250,7 +251,7 @@ static void q40_irq_handler(unsigned int irq, struct pt_regs *fp)</div><div class='ctx'> 					disable_irq(irq);</div><div class='ctx'> 					disabled = 1;</div><div class='ctx'> #else</div><div class='del'>-					/*printk("IRQ_INPROGRESS detected for irq %d, disabling - %s disabled\n",</div><div class='add'>+					/*pr_warn("IRQ_INPROGRESS detected for irq %d, disabling - %s disabled\n",</div><div class='ctx'> 						irq, disabled ? "already" : "not yet"); */</div><div class='ctx'> 					fp-&gt;sr = (((fp-&gt;sr) &amp; (~0x700))+0x200);</div><div class='ctx'> 					disabled = 1;</div><div class='hunk'>@@ -273,7 +274,7 @@ static void q40_irq_handler(unsigned int irq, struct pt_regs *fp)</div><div class='ctx'> 					}</div><div class='ctx'> #else</div><div class='ctx'> 					disabled = 0;</div><div class='del'>-					/*printk("reenabling irq %d\n", irq); */</div><div class='add'>+					/*pr_info("reenabling irq %d\n", irq); */</div><div class='ctx'> #endif</div><div class='ctx'> 				}</div><div class='ctx'> // used to do 'goto repeat;' here, this delayed bh processing too long</div><div class='hunk'>@@ -281,7 +282,8 @@ static void q40_irq_handler(unsigned int irq, struct pt_regs *fp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (mer &amp;&amp; ccleirq &gt; 0 &amp;&amp; !aliased_irq) {</div><div class='del'>-			printk("ISA interrupt from unknown source? EIRQ_REG = %x\n",mer);</div><div class='add'>+			pr_warn("ISA interrupt from unknown source? EIRQ_REG = %x\n",</div><div class='add'>+				mer);</div><div class='ctx'> 			ccleirq--;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -301,7 +303,7 @@ void q40_irq_enable(struct irq_data *data)</div><div class='ctx'> 	if (irq &gt;= 5 &amp;&amp; irq &lt;= 15) {</div><div class='ctx'> 		mext_disabled--;</div><div class='ctx'> 		if (mext_disabled &gt; 0)</div><div class='del'>-			printk("q40_irq_enable : nested disable/enable\n");</div><div class='add'>+			pr_warn("q40_irq_enable : nested disable/enable\n");</div><div class='ctx'> 		if (mext_disabled == 0)</div><div class='ctx'> 			master_outb(1, EXT_ENABLE_REG);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -321,6 +323,7 @@ void q40_irq_disable(struct irq_data *data)</div><div class='ctx'> 		master_outb(0, EXT_ENABLE_REG);</div><div class='ctx'> 		mext_disabled++;</div><div class='ctx'> 		if (mext_disabled &gt; 1)</div><div class='del'>-			printk("disable_irq nesting count %d\n",mext_disabled);</div><div class='add'>+			pr_info("disable_irq nesting count %d\n",</div><div class='add'>+				mext_disabled);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c<br/>index 3af34fa3a344..1d28d380e8cc 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/sun3/config.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/sun3/config.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/sun3/config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/config.c</a></div><div class='hunk'>@@ -134,7 +134,7 @@ void __init config_sun3(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long memory_start, memory_end;</div><div class='ctx'> </div><div class='del'>-	printk("ARCH: SUN3\n");</div><div class='add'>+	pr_info("ARCH: SUN3\n");</div><div class='ctx'> 	idprom_init();</div><div class='ctx'> </div><div class='ctx'> 	/* Subtract kernel memory from available memory */</div><div class='head'>diff --git a/arch/m68k/sun3/dvma.c b/arch/m68k/sun3/dvma.c<br/>index d95506e06c2a..ca02ee25894c 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/sun3/dvma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/sun3/dvma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/sun3/dvma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/dvma.c</a></div><div class='hunk'>@@ -31,8 +31,7 @@ static unsigned long dvma_page(unsigned long kaddr, unsigned long vaddr)</div><div class='ctx'> </div><div class='ctx'> 	ptep = pfn_pte(virt_to_pfn(kaddr), PAGE_KERNEL);</div><div class='ctx'> 	pte = pte_val(ptep);</div><div class='del'>-//		printk("dvma_remap: addr %lx -&gt; %lx pte %08lx len %x\n",</div><div class='del'>-//		       kaddr, vaddr, pte, len);</div><div class='add'>+//	pr_info("dvma_remap: addr %lx -&gt; %lx pte %08lx\n", kaddr, vaddr, pte);</div><div class='ctx'> 	if(ptelist[(vaddr &amp; 0xff000) &gt;&gt; PAGE_SHIFT] != pte) {</div><div class='ctx'> 		sun3_put_pte(vaddr, pte);</div><div class='ctx'> 		ptelist[(vaddr &amp; 0xff000) &gt;&gt; PAGE_SHIFT] = pte;</div><div class='head'>diff --git a/arch/m68k/sun3/idprom.c b/arch/m68k/sun3/idprom.c<br/>index cfe9aa422343..9c23f506d60d 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/sun3/idprom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/sun3/idprom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/sun3/idprom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/idprom.c</a></div><div class='hunk'>@@ -64,12 +64,14 @@ static void __init display_system_type(unsigned char machtype)</div><div class='ctx'> 	for (i = 0; i &lt; NUM_SUN_MACHINES; i++) {</div><div class='ctx'> 		if(Sun_Machines[i].id_machtype == machtype) {</div><div class='ctx'> 			if (machtype != (SM_SUN4M_OBP | 0x00))</div><div class='del'>-				printk("TYPE: %s\n", Sun_Machines[i].name);</div><div class='add'>+				pr_info("TYPE: %s\n", Sun_Machines[i].name);</div><div class='ctx'> 			else {</div><div class='ctx'> #if 0</div><div class='add'>+				char sysname[128];</div><div class='add'>+</div><div class='ctx'> 				prom_getproperty(prom_root_node, "banner-name",</div><div class='ctx'> 						 sysname, sizeof(sysname));</div><div class='del'>-				printk("TYPE: %s\n", sysname);</div><div class='add'>+				pr_info("TYPE: %s\n", sysname);</div><div class='ctx'> #endif</div><div class='ctx'> 			}</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -125,5 +127,5 @@ void __init idprom_init(void)</div><div class='ctx'> </div><div class='ctx'> 	display_system_type(idprom-&gt;id_machtype);</div><div class='ctx'> </div><div class='del'>-	printk("Ethernet address: %pM\n", idprom-&gt;id_ethaddr);</div><div class='add'>+	pr_info("Ethernet address: %pM\n", idprom-&gt;id_ethaddr);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c<br/>index 3f258e230ba5..7fdc61525e0b 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/sun3/mmu_emu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/sun3/mmu_emu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/sun3/mmu_emu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/mmu_emu.c</a></div><div class='hunk'>@@ -15,10 +15,11 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/sun3mmu.h&gt;</div><div class='hunk'>@@ -72,21 +73,21 @@ void print_pte (pte_t pte)</div><div class='ctx'> #if 0</div><div class='ctx'> 	/* Verbose version. */</div><div class='ctx'> 	unsigned long val = pte_val (pte);</div><div class='del'>-	printk (" pte=%lx [addr=%lx",</div><div class='add'>+	pr_cont(" pte=%lx [addr=%lx",</div><div class='ctx'> 		val, (val &amp; SUN3_PAGE_PGNUM_MASK) &lt;&lt; PAGE_SHIFT);</div><div class='del'>-	if (val &amp; SUN3_PAGE_VALID)	printk (" valid");</div><div class='del'>-	if (val &amp; SUN3_PAGE_WRITEABLE)	printk (" write");</div><div class='del'>-	if (val &amp; SUN3_PAGE_SYSTEM)	printk (" sys");</div><div class='del'>-	if (val &amp; SUN3_PAGE_NOCACHE)	printk (" nocache");</div><div class='del'>-	if (val &amp; SUN3_PAGE_ACCESSED)	printk (" accessed");</div><div class='del'>-	if (val &amp; SUN3_PAGE_MODIFIED)	printk (" modified");</div><div class='add'>+	if (val &amp; SUN3_PAGE_VALID)	pr_cont(" valid");</div><div class='add'>+	if (val &amp; SUN3_PAGE_WRITEABLE)	pr_cont(" write");</div><div class='add'>+	if (val &amp; SUN3_PAGE_SYSTEM)	pr_cont(" sys");</div><div class='add'>+	if (val &amp; SUN3_PAGE_NOCACHE)	pr_cont(" nocache");</div><div class='add'>+	if (val &amp; SUN3_PAGE_ACCESSED)	pr_cont(" accessed");</div><div class='add'>+	if (val &amp; SUN3_PAGE_MODIFIED)	pr_cont(" modified");</div><div class='ctx'> 	switch (val &amp; SUN3_PAGE_TYPE_MASK) {</div><div class='del'>-		case SUN3_PAGE_TYPE_MEMORY: printk (" memory"); break;</div><div class='del'>-		case SUN3_PAGE_TYPE_IO:     printk (" io");     break;</div><div class='del'>-		case SUN3_PAGE_TYPE_VME16:  printk (" vme16");  break;</div><div class='del'>-		case SUN3_PAGE_TYPE_VME32:  printk (" vme32");  break;</div><div class='add'>+		case SUN3_PAGE_TYPE_MEMORY: pr_cont(" memory"); break;</div><div class='add'>+		case SUN3_PAGE_TYPE_IO:     pr_cont(" io");     break;</div><div class='add'>+		case SUN3_PAGE_TYPE_VME16:  pr_cont(" vme16");  break;</div><div class='add'>+		case SUN3_PAGE_TYPE_VME32:  pr_cont(" vme32");  break;</div><div class='ctx'> 	}</div><div class='del'>-	printk ("]\n");</div><div class='add'>+	pr_cont("]\n");</div><div class='ctx'> #else</div><div class='ctx'> 	/* Terse version. More likely to fit on a line. */</div><div class='ctx'> 	unsigned long val = pte_val (pte);</div><div class='hunk'>@@ -108,7 +109,7 @@ void print_pte (pte_t pte)</div><div class='ctx'> 		default: type = "unknown?"; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk (" pte=%08lx [%07lx %s %s]\n",</div><div class='add'>+	pr_cont(" pte=%08lx [%07lx %s %s]\n",</div><div class='ctx'> 		val, (val &amp; SUN3_PAGE_PGNUM_MASK) &lt;&lt; PAGE_SHIFT, flags, type);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -116,7 +117,7 @@ void print_pte (pte_t pte)</div><div class='ctx'> /* Print the PTE value for a given virtual address. For debugging. */</div><div class='ctx'> void print_pte_vaddr (unsigned long vaddr)</div><div class='ctx'> {</div><div class='del'>-	printk (" vaddr=%lx [%02lx]", vaddr, sun3_get_segmap (vaddr));</div><div class='add'>+	pr_cont(" vaddr=%lx [%02lx]", vaddr, sun3_get_segmap (vaddr));</div><div class='ctx'> 	print_pte (__pte (sun3_get_pte (vaddr)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -153,7 +154,7 @@ void __init mmu_emu_init(unsigned long bootmem_end)</div><div class='ctx'> </div><div class='ctx'> 		if(!pmeg_alloc[i]) {</div><div class='ctx'> #ifdef DEBUG_MMU_EMU</div><div class='del'>-			printk("freed: ");</div><div class='add'>+			pr_info("freed:");</div><div class='ctx'> 			print_pte_vaddr (seg);</div><div class='ctx'> #endif</div><div class='ctx'> 			sun3_put_segmap(seg, SUN3_INVALID_PMEG);</div><div class='hunk'>@@ -165,7 +166,7 @@ void __init mmu_emu_init(unsigned long bootmem_end)</div><div class='ctx'> 		if (sun3_get_segmap (seg) != SUN3_INVALID_PMEG) {</div><div class='ctx'> #ifdef DEBUG_PROM_MAPS</div><div class='ctx'> 			for(i = 0; i &lt; 16; i++) {</div><div class='del'>-				printk ("mapped:");</div><div class='add'>+				pr_info("mapped:");</div><div class='ctx'> 				print_pte_vaddr (seg + (i*PAGE_SIZE));</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -293,8 +294,8 @@ inline void mmu_emu_map_pmeg (int context, int vaddr)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_MMU_EMU</div><div class='del'>-printk("mmu_emu_map_pmeg: pmeg %x to context %d vaddr %x\n",</div><div class='del'>-       curr_pmeg, context, vaddr);</div><div class='add'>+	pr_info("mmu_emu_map_pmeg: pmeg %x to context %d vaddr %x\n",</div><div class='add'>+		curr_pmeg, context, vaddr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Invalidate old mapping for the pmeg, if any */</div><div class='hunk'>@@ -370,7 +371,7 @@ int mmu_emu_handle_fault (unsigned long vaddr, int read_flag, int kernel_fault)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_MMU_EMU</div><div class='del'>-	printk ("mmu_emu_handle_fault: vaddr=%lx type=%s crp=%p\n",</div><div class='add'>+	pr_info("mmu_emu_handle_fault: vaddr=%lx type=%s crp=%p\n",</div><div class='ctx'> 		vaddr, read_flag ? "read" : "write", crp);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -378,14 +379,15 @@ int mmu_emu_handle_fault (unsigned long vaddr, int read_flag, int kernel_fault)</div><div class='ctx'> 	offset  = (vaddr &gt;&gt; SUN3_PTE_SIZE_BITS) &amp; 0xF;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_MMU_EMU</div><div class='del'>-	printk ("mmu_emu_handle_fault: segment=%lx offset=%lx\n", segment, offset);</div><div class='add'>+	pr_info("mmu_emu_handle_fault: segment=%lx offset=%lx\n", segment,</div><div class='add'>+		offset);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	pte = (pte_t *) pgd_val (*(crp + segment));</div><div class='ctx'> </div><div class='ctx'> //todo: next line should check for valid pmd properly.</div><div class='ctx'> 	if (!pte) {</div><div class='del'>-//                printk ("mmu_emu_handle_fault: invalid pmd\n");</div><div class='add'>+//                pr_info("mmu_emu_handle_fault: invalid pmd\n");</div><div class='ctx'>                 return 0;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='hunk'>@@ -417,9 +419,9 @@ int mmu_emu_handle_fault (unsigned long vaddr, int read_flag, int kernel_fault)</div><div class='ctx'> 		pte_val (*pte) |= SUN3_PAGE_ACCESSED;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_MMU_EMU</div><div class='del'>-	printk ("seg:%d crp:%p -&gt;", get_fs().seg, crp);</div><div class='add'>+	pr_info("seg:%ld crp:%p -&gt;", get_fs().seg, crp);</div><div class='ctx'> 	print_pte_vaddr (vaddr);</div><div class='del'>-	printk ("\n");</div><div class='add'>+	pr_cont("\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/arch/m68k/sun3/prom/printf.c b/arch/m68k/sun3/prom/printf.c<br/>index df85018f487a..5b82bea03493 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/sun3/prom/printf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/sun3/prom/printf.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/sun3/prom/printf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/prom/printf.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@ prom_printf(char *fmt, ...)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='ctx'> 	if (kgdb_initialized) {</div><div class='del'>-		printk("kgdb_initialized = %d\n", kgdb_initialized);</div><div class='add'>+		pr_info("kgdb_initialized = %d\n", kgdb_initialized);</div><div class='ctx'> 		putpacket(bptr, 1);</div><div class='ctx'> 	} else</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c<br/>index b37521a5259d..d36bd15f9fdc 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/sun3/sun3dvma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/sun3/sun3dvma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/sun3/sun3dvma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3/sun3dvma.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ static void print_use(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int j = 0;</div><div class='ctx'> </div><div class='del'>-	printk("dvma entry usage:\n");</div><div class='add'>+	pr_info("dvma entry usage:\n");</div><div class='ctx'> </div><div class='ctx'> 	for(i = 0; i &lt; IOMMU_TOTAL_ENTRIES; i++) {</div><div class='ctx'> 		if(!iommu_use[i])</div><div class='hunk'>@@ -70,16 +70,15 @@ static void print_use(void)</div><div class='ctx'> </div><div class='ctx'> 		j++;</div><div class='ctx'> </div><div class='del'>-		printk("dvma entry: %08lx len %08lx\n",</div><div class='del'>-		       ( i &lt;&lt; DVMA_PAGE_SHIFT) + DVMA_START,</div><div class='del'>-		       iommu_use[i]);</div><div class='add'>+		pr_info("dvma entry: %08x len %08lx\n",</div><div class='add'>+			(i &lt;&lt; DVMA_PAGE_SHIFT) + DVMA_START, iommu_use[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("%d entries in use total\n", j);</div><div class='add'>+	pr_info("%d entries in use total\n", j);</div><div class='ctx'> </div><div class='del'>-	printk("allocation/free calls: %lu/%lu\n", dvma_allocs, dvma_frees);</div><div class='del'>-	printk("allocation/free bytes: %Lx/%Lx\n", dvma_alloc_bytes,</div><div class='del'>-	       dvma_free_bytes);</div><div class='add'>+	pr_info("allocation/free calls: %lu/%lu\n", dvma_allocs, dvma_frees);</div><div class='add'>+	pr_info("allocation/free bytes: %Lx/%Lx\n", dvma_alloc_bytes,</div><div class='add'>+		dvma_free_bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void print_holes(struct list_head *holes)</div><div class='hunk'>@@ -88,18 +87,18 @@ static void print_holes(struct list_head *holes)</div><div class='ctx'> 	struct list_head *cur;</div><div class='ctx'> 	struct hole *hole;</div><div class='ctx'> </div><div class='del'>-	printk("listing dvma holes\n");</div><div class='add'>+	pr_info("listing dvma holes\n");</div><div class='ctx'> 	list_for_each(cur, holes) {</div><div class='ctx'> 		hole = list_entry(cur, struct hole, list);</div><div class='ctx'> </div><div class='ctx'> 		if((hole-&gt;start == 0) &amp;&amp; (hole-&gt;end == 0) &amp;&amp; (hole-&gt;size == 0))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		printk("hole: start %08lx end %08lx size %08lx\n", hole-&gt;start, hole-&gt;end, hole-&gt;size);</div><div class='add'>+		pr_info("hole: start %08lx end %08lx size %08lx\n",</div><div class='add'>+			hole-&gt;start, hole-&gt;end, hole-&gt;size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("end of hole listing...\n");</div><div class='del'>-</div><div class='add'>+	pr_info("end of hole listing...\n");</div><div class='ctx'> }</div><div class='ctx'> #endif /* DVMA_DEBUG */</div><div class='ctx'> </div><div class='hunk'>@@ -137,7 +136,7 @@ static inline struct hole *rmcache(void)</div><div class='ctx'> </div><div class='ctx'> 	if(list_empty(&amp;hole_cache)) {</div><div class='ctx'> 		if(!refill()) {</div><div class='del'>-			printk("out of dvma hole cache!\n");</div><div class='add'>+			pr_crit("out of dvma hole cache!\n");</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -157,7 +156,7 @@ static inline unsigned long get_baddr(int len, unsigned long align)</div><div class='ctx'> </div><div class='ctx'> 	if(list_empty(&amp;hole_list)) {</div><div class='ctx'> #ifdef DVMA_DEBUG</div><div class='del'>-		printk("out of dvma holes! (printing hole cache)\n");</div><div class='add'>+		pr_crit("out of dvma holes! (printing hole cache)\n");</div><div class='ctx'> 		print_holes(&amp;hole_cache);</div><div class='ctx'> 		print_use();</div><div class='ctx'> #endif</div><div class='hunk'>@@ -195,7 +194,7 @@ static inline unsigned long get_baddr(int len, unsigned long align)</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("unable to find dvma hole!\n");</div><div class='add'>+	pr_crit("unable to find dvma hole!\n");</div><div class='ctx'> 	BUG();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -287,15 +286,12 @@ unsigned long dvma_map_align(unsigned long kaddr, int len, int align)</div><div class='ctx'> 		len = 0x800;</div><div class='ctx'> </div><div class='ctx'> 	if(!kaddr || !len) {</div><div class='del'>-//		printk("error: kaddr %lx len %x\n", kaddr, len);</div><div class='add'>+//		pr_err("error: kaddr %lx len %x\n", kaddr, len);</div><div class='ctx'> //		*(int *)4 = 0;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("dvma_map request %08lx bytes from %08lx\n",</div><div class='del'>-	       len, kaddr);</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("dvma_map request %08x bytes from %08lx\n", len, kaddr);</div><div class='ctx'> 	off = kaddr &amp; ~DVMA_PAGE_MASK;</div><div class='ctx'> 	kaddr &amp;= PAGE_MASK;</div><div class='ctx'> 	len += off;</div><div class='hunk'>@@ -307,12 +303,13 @@ unsigned long dvma_map_align(unsigned long kaddr, int len, int align)</div><div class='ctx'> 		align = ((align + (DVMA_PAGE_SIZE-1)) &amp; DVMA_PAGE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	baddr = get_baddr(len, align);</div><div class='del'>-//	printk("using baddr %lx\n", baddr);</div><div class='add'>+//	pr_info("using baddr %lx\n", baddr);</div><div class='ctx'> </div><div class='ctx'> 	if(!dvma_map_iommu(kaddr, baddr, len))</div><div class='ctx'> 		return (baddr + off);</div><div class='ctx'> </div><div class='del'>-	printk("dvma_map failed kaddr %lx baddr %lx len %x\n", kaddr, baddr, len);</div><div class='add'>+	pr_crit("dvma_map failed kaddr %lx baddr %lx len %x\n", kaddr, baddr,</div><div class='add'>+	len);</div><div class='ctx'> 	BUG();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -343,9 +340,7 @@ void *dvma_malloc_align(unsigned long len, unsigned long align)</div><div class='ctx'> 	if(!len)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("dvma_malloc request %lx bytes\n", len);</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("dvma_malloc request %lx bytes\n", len);</div><div class='ctx'> 	len = ((len + (DVMA_PAGE_SIZE-1)) &amp; DVMA_PAGE_MASK);</div><div class='ctx'> </div><div class='ctx'>         if((kaddr = __get_free_pages(GFP_ATOMIC, get_order(len))) == 0)</div><div class='hunk'>@@ -364,10 +359,8 @@ void *dvma_malloc_align(unsigned long len, unsigned long align)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("mapped %08lx bytes %08lx kern -&gt; %08lx bus\n",</div><div class='del'>-	       len, kaddr, baddr);</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("mapped %08lx bytes %08lx kern -&gt; %08lx bus\n", len, kaddr,</div><div class='add'>+		 baddr);</div><div class='ctx'> </div><div class='ctx'> 	return (void *)vaddr;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/sun3x/dvma.c b/arch/m68k/sun3x/dvma.c<br/>index d5ddcdaa2347..9413c8724b0d 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/sun3x/dvma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/sun3x/dvma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/sun3x/dvma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3x/dvma.c</a></div><div class='hunk'>@@ -58,21 +58,17 @@ static volatile unsigned long *iommu_pte = (unsigned long *)SUN3X_IOMMU;</div><div class='ctx'> 					 ((addr &amp; 0x03c00000) &gt;&gt;     \</div><div class='ctx'> 						(DVMA_PAGE_SHIFT+4)))</div><div class='ctx'> </div><div class='del'>-#undef DEBUG</div><div class='del'>-</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> /* code to print out a dvma mapping for debugging purposes */</div><div class='ctx'> void dvma_print (unsigned long dvma_addr)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-        unsigned long index;</div><div class='del'>-</div><div class='del'>-        index = dvma_addr &gt;&gt; DVMA_PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-        printk("idx %lx dvma_addr %08lx paddr %08lx\n", index, dvma_addr,</div><div class='del'>-               dvma_entry_paddr(index));</div><div class='add'>+	unsigned long index;</div><div class='ctx'> </div><div class='add'>+	index = dvma_addr &gt;&gt; DVMA_PAGE_SHIFT;</div><div class='ctx'> </div><div class='add'>+	pr_info("idx %lx dvma_addr %08lx paddr %08lx\n", index, dvma_addr,</div><div class='add'>+		dvma_entry_paddr(index));</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -91,10 +87,7 @@ inline int dvma_map_cpu(unsigned long kaddr,</div><div class='ctx'> </div><div class='ctx'> 	end = PAGE_ALIGN(vaddr + len);</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("dvma: mapping kern %08lx to virt %08lx\n",</div><div class='del'>-	       kaddr, vaddr);</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("dvma: mapping kern %08lx to virt %08lx\n", kaddr, vaddr);</div><div class='ctx'> 	pgd = pgd_offset_k(vaddr);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='hunk'>@@ -126,10 +119,8 @@ inline int dvma_map_cpu(unsigned long kaddr,</div><div class='ctx'> 				end3 = end2;</div><div class='ctx'> </div><div class='ctx'> 			do {</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-				printk("mapping %08lx phys to %08lx\n",</div><div class='del'>-				       __pa(kaddr), vaddr);</div><div class='del'>-#endif</div><div class='add'>+				pr_debug("mapping %08lx phys to %08lx\n",</div><div class='add'>+					 __pa(kaddr), vaddr);</div><div class='ctx'> 				set_pte(pte, pfn_pte(virt_to_pfn(kaddr),</div><div class='ctx'> 						     PAGE_KERNEL));</div><div class='ctx'> 				pte++;</div><div class='hunk'>@@ -162,7 +153,8 @@ inline int dvma_map_iommu(unsigned long kaddr, unsigned long baddr,</div><div class='ctx'> 	for(; index &lt; end ; index++) {</div><div class='ctx'> //		if(dvma_entry_use(index))</div><div class='ctx'> //			BUG();</div><div class='del'>-//		printk("mapping pa %lx to ba %lx\n", __pa(kaddr), index &lt;&lt; DVMA_PAGE_SHIFT);</div><div class='add'>+//		pr_info("mapping pa %lx to ba %lx\n", __pa(kaddr),</div><div class='add'>+//			index &lt;&lt; DVMA_PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 		dvma_entry_set(index, __pa(kaddr));</div><div class='ctx'> </div><div class='hunk'>@@ -190,13 +182,12 @@ void dvma_unmap_iommu(unsigned long baddr, int len)</div><div class='ctx'> 	end = (DVMA_PAGE_ALIGN(baddr+len) &gt;&gt; DVMA_PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	for(; index &lt; end ; index++) {</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-		printk("freeing bus mapping %08x\n", index &lt;&lt; DVMA_PAGE_SHIFT);</div><div class='del'>-#endif</div><div class='add'>+		pr_debug("freeing bus mapping %08x\n",</div><div class='add'>+			 index &lt;&lt; DVMA_PAGE_SHIFT);</div><div class='ctx'> #if 0</div><div class='ctx'> 		if(!dvma_entry_use(index))</div><div class='del'>-			printk("dvma_unmap freeing unused entry %04x\n",</div><div class='del'>-			       index);</div><div class='add'>+			pr_info("dvma_unmap freeing unused entry %04x\n",</div><div class='add'>+				index);</div><div class='ctx'> 		else</div><div class='ctx'> 			dvma_entry_dec(index);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/m68k/sun3x/prom.c b/arch/m68k/sun3x/prom.c<br/>index 0898c3f81508..5d60e65c1ee5 100644<br/>--- a/<a href='/drm-misc/tree/arch/m68k/sun3x/prom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/m68k/sun3x/prom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/m68k/sun3x/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/m68k/sun3x/prom.c</a></div><div class='hunk'>@@ -106,9 +106,9 @@ void __init sun3x_prom_init(void)</div><div class='ctx'> 	idprom_init();</div><div class='ctx'> </div><div class='ctx'> 	if (!((idprom-&gt;id_machtype &amp; SM_ARCH_MASK) == SM_SUN3X)) {</div><div class='del'>-		printk("Warning: machine reports strange type %02x\n",</div><div class='add'>+		pr_warn("Machine reports strange type %02x\n",</div><div class='ctx'> 			idprom-&gt;id_machtype);</div><div class='del'>-		printk("Pretending it's a 3/80, but very afraid...\n");</div><div class='add'>+		pr_warn("Pretending it's a 3/80, but very afraid...\n");</div><div class='ctx'> 		idprom-&gt;id_machtype = SM_SUN3X | SM_3_80;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/metag/include/asm/Kbuild b/arch/metag/include/asm/Kbuild<br/>index 29acb89daaaa..f9b9df5d6de9 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/include/asm/Kbuild</a></div><div class='hunk'>@@ -2,7 +2,6 @@ generic-y += auxvec.h</div><div class='ctx'> generic-y += bitsperlong.h</div><div class='ctx'> generic-y += bugs.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += dma.h</div><div class='hunk'>@@ -27,7 +26,6 @@ generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='ctx'> generic-y += msgbuf.h</div><div class='del'>-generic-y += mutex.h</div><div class='ctx'> generic-y += param.h</div><div class='ctx'> generic-y += pci.h</div><div class='ctx'> generic-y += percpu.h</div><div class='hunk'>@@ -56,3 +54,4 @@ generic-y += user.h</div><div class='ctx'> generic-y += vga.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/metag/include/asm/dma-mapping.h b/arch/metag/include/asm/dma-mapping.h<br/>index 27af5d479ce6..fad3dc3cb210 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> #ifndef _ASM_METAG_DMA_MAPPING_H</div><div class='ctx'> #define _ASM_METAG_DMA_MAPPING_H</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops metag_dma_ops;</div><div class='add'>+extern const struct dma_map_ops metag_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;metag_dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/metag/include/asm/mmu_context.h b/arch/metag/include/asm/mmu_context.h<br/>index ae2a71b5e0be..2e0312748197 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void enter_lazy_tlb(struct mm_struct *mm,</div><div class='ctx'> 				  struct task_struct *tsk)</div><div class='head'>diff --git a/arch/metag/include/asm/processor.h b/arch/metag/include/asm/processor.h<br/>index a0333ebcac35..ec6a49076980 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/include/asm/processor.h</a></div><div class='hunk'>@@ -152,7 +152,6 @@ unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define user_stack_pointer(regs)        ((regs)-&gt;ctx.AX[0].U0)</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()     barrier()</div><div class='del'>-#define cpu_relax_lowlatency()  cpu_relax()</div><div class='ctx'> </div><div class='ctx'> extern void setup_priv(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/metag/kernel/dma.c b/arch/metag/kernel/dma.c<br/>index 0db31e24c541..f0ab3a498328 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/kernel/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/kernel/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/dma.c</a></div><div class='hunk'>@@ -484,8 +484,9 @@ static dma_addr_t metag_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 		unsigned long offset, size_t size,</div><div class='ctx'> 		enum dma_data_direction direction, unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	dma_sync_for_device((void *)(page_to_phys(page) + offset), size,</div><div class='del'>-			    direction);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		dma_sync_for_device((void *)(page_to_phys(page) + offset),</div><div class='add'>+				    size, direction);</div><div class='ctx'> 	return page_to_phys(page) + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -493,7 +494,8 @@ static void metag_dma_unmap_page(struct device *dev, dma_addr_t dma_address,</div><div class='ctx'> 		size_t size, enum dma_data_direction direction,</div><div class='ctx'> 		unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	dma_sync_for_cpu(phys_to_virt(dma_address), size, direction);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		dma_sync_for_cpu(phys_to_virt(dma_address), size, direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int metag_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='hunk'>@@ -507,6 +509,10 @@ static int metag_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 		BUG_ON(!sg_page(sg));</div><div class='ctx'> </div><div class='ctx'> 		sg-&gt;dma_address = sg_phys(sg);</div><div class='add'>+</div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		dma_sync_for_device(sg_virt(sg), sg-&gt;length, direction);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -525,6 +531,10 @@ static void metag_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 		BUG_ON(!sg_page(sg));</div><div class='ctx'> </div><div class='ctx'> 		sg-&gt;dma_address = sg_phys(sg);</div><div class='add'>+</div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		dma_sync_for_cpu(sg_virt(sg), sg-&gt;length, direction);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -565,7 +575,7 @@ static void metag_dma_sync_sg_for_device(struct device *dev,</div><div class='ctx'> 		dma_sync_for_device(sg_virt(sg), sg-&gt;length, direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops metag_dma_ops = {</div><div class='add'>+const struct dma_map_ops metag_dma_ops = {</div><div class='ctx'> 	.alloc			= metag_dma_alloc,</div><div class='ctx'> 	.free			= metag_dma_free,</div><div class='ctx'> 	.map_page		= metag_dma_map_page,</div><div class='head'>diff --git a/arch/metag/kernel/irq.c b/arch/metag/kernel/irq.c<br/>index 3074b64793e6..c9939604a38f 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/irq.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/core_reg.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_4KSTACKS</div><div class='ctx'> union irq_ctx {</div><div class='head'>diff --git a/arch/metag/kernel/perf/perf_event.c b/arch/metag/kernel/perf/perf_event.c<br/>index 052cba23708c..7e793eb0c1fe 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/kernel/perf/perf_event.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/kernel/perf/perf_event.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/kernel/perf/perf_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/perf/perf_event.c</a></div><div class='hunk'>@@ -868,7 +868,7 @@ static int __init init_hw_perf_events(void)</div><div class='ctx'> 	metag_out32(0, PERF_COUNT(1));</div><div class='ctx'> </div><div class='ctx'> 	cpuhp_setup_state(CPUHP_AP_PERF_METAG_STARTING,</div><div class='del'>-			  "AP_PERF_METAG_STARTING", metag_pmu_starting_cpu,</div><div class='add'>+			  "perf/metag:starting", metag_pmu_starting_cpu,</div><div class='ctx'> 			  NULL);</div><div class='ctx'> </div><div class='ctx'> 	ret = perf_pmu_register(&amp;pmu, metag_pmu-&gt;name, PERF_TYPE_RAW);</div><div class='head'>diff --git a/arch/metag/kernel/process.c b/arch/metag/kernel/process.c<br/>index 35062796edf2..c4606ce743d2 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/process.c</a></div><div class='hunk'>@@ -8,6 +8,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='head'>diff --git a/arch/metag/kernel/ptrace.c b/arch/metag/kernel/ptrace.c<br/>index 7563628822bd..5fd16ee5280c 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/ptrace.c</a></div><div class='hunk'>@@ -15,6 +15,8 @@</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;trace/syscall.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='head'>diff --git a/arch/metag/kernel/signal.c b/arch/metag/kernel/signal.c<br/>index ce49d429c74a..338925d808e6 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/signal.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/metag/kernel/smp.c b/arch/metag/kernel/smp.c<br/>index bad13232de51..232a12bf3f99 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/smp.c</a></div><div class='hunk'>@@ -12,7 +12,9 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='hunk'>@@ -344,8 +346,8 @@ asmlinkage void secondary_start_kernel(void)</div><div class='ctx'> 	 * All kernel threads share the same mm context; grab a</div><div class='ctx'> 	 * reference and switch to it.</div><div class='ctx'> 	 */</div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_users);</div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_count);</div><div class='add'>+	mmget(mm);</div><div class='add'>+	mmgrab(mm);</div><div class='ctx'> 	current-&gt;active_mm = mm;</div><div class='ctx'> 	cpumask_set_cpu(cpu, mm_cpumask(mm));</div><div class='ctx'> 	enter_lazy_tlb(mm, current);</div><div class='head'>diff --git a/arch/metag/kernel/stacktrace.c b/arch/metag/kernel/stacktrace.c<br/>index 5510361d5bea..91ffc4b75c33 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/stacktrace.c</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='head'>diff --git a/arch/metag/kernel/traps.c b/arch/metag/kernel/traps.c<br/>index 17b2e2e38d5a..444851e510d5 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/kernel/traps.c</a></div><div class='hunk'>@@ -10,6 +10,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/metag/mm/extable.c b/arch/metag/mm/extable.c<br/>index 2a21eaebe84d..3aa90b78b43d 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/mm/extable.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs)</div><div class='head'>diff --git a/arch/metag/mm/fault.c b/arch/metag/mm/fault.c<br/>index c765b3621b9b..5055477486b6 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/mm/fault.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/metag/mm/init.c b/arch/metag/mm/init.c<br/>index c0ec116b3993..188d4d9fbed4 100644<br/>--- a/<a href='/drm-misc/tree/arch/metag/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/metag/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/metag/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/metag/mm/init.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig<br/>index 86f65721e629..85885a501dce 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/Kconfig</a></div><div class='hunk'>@@ -27,6 +27,7 @@ config MICROBLAZE</div><div class='ctx'> 	select HAVE_MEMBLOCK_NODE_MAP</div><div class='ctx'> 	select HAVE_OPROFILE</div><div class='ctx'> 	select IRQ_DOMAIN</div><div class='add'>+	select XILINX_INTC</div><div class='ctx'> 	select MODULES_USE_ELF_RELA</div><div class='ctx'> 	select OF</div><div class='ctx'> 	select OF_EARLY_FLATTREE</div><div class='head'>diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild<br/>index b0ae88c9fed9..1732ec13b211 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> </div><div class='ctx'> generic-y += barrier.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += exec.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='hunk'>@@ -11,3 +10,4 @@ generic-y += preempt.h</div><div class='ctx'> generic-y += syscalls.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h<br/>index 1768d4bdc8d3..3fad5e722a66 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -36,9 +36,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Available generic sets of operations</div><div class='ctx'>  */</div><div class='del'>-extern struct dma_map_ops dma_direct_ops;</div><div class='add'>+extern const struct dma_map_ops dma_direct_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;dma_direct_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/microblaze/include/asm/irq.h b/arch/microblaze/include/asm/irq.h<br/>index bab3b1393ad4..d785defeeed5 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/include/asm/irq.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/include/asm/irq.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/include/asm/irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/irq.h</a></div><div class='hunk'>@@ -16,6 +16,6 @@ struct pt_regs;</div><div class='ctx'> extern void do_IRQ(struct pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> /* should be defined in each interrupt controller driver */</div><div class='del'>-extern unsigned int get_irq(void);</div><div class='add'>+extern unsigned int xintc_get_irq(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_MICROBLAZE_IRQ_H */</div><div class='head'>diff --git a/arch/microblaze/include/asm/mmu_context_mm.h b/arch/microblaze/include/asm/mmu_context_mm.h<br/>index d68647746448..99472d2ca340 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/include/asm/mmu_context_mm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/include/asm/mmu_context_mm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/include/asm/mmu_context_mm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/mmu_context_mm.h</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #define _ASM_MICROBLAZE_MMU_CONTEXT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/bitops.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='head'>diff --git a/arch/microblaze/include/asm/mutex.h b/arch/microblaze/include/asm/mutex.h<br/>deleted file mode 100644<br/>index ff6101aa2c71..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='head'>diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h<br/>index c38d0dd91134..37ef196e4519 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/processor.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> extern const struct seq_operations cpuinfo_op;</div><div class='ctx'> </div><div class='ctx'> # define cpu_relax()		barrier()</div><div class='del'>-# define cpu_relax_lowlatency()	cpu_relax()</div><div class='ctx'> </div><div class='ctx'> #define task_pt_regs(tsk) \</div><div class='ctx'> 		(((struct pt_regs *)(THREAD_SIZE + task_stack_page(tsk))) - 1)</div><div class='head'>diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h<br/>index 805ae5d712e8..032fed71223f 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/include/asm/unistd.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/include/asm/unistd.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/include/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/asm/unistd.h</a></div><div class='hunk'>@@ -38,6 +38,6 @@</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='del'>-#define __NR_syscalls         392</div><div class='add'>+#define __NR_syscalls         398</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_MICROBLAZE_UNISTD_H */</div><div class='head'>diff --git a/arch/microblaze/include/uapi/asm/unistd.h b/arch/microblaze/include/uapi/asm/unistd.h<br/>index a8bd3fa28bc7..d8086159d996 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/include/uapi/asm/unistd.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/include/uapi/asm/unistd.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/include/uapi/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/include/uapi/asm/unistd.h</a></div><div class='hunk'>@@ -407,5 +407,11 @@</div><div class='ctx'> #define __NR_userfaultfd	389</div><div class='ctx'> #define __NR_membarrier		390</div><div class='ctx'> #define __NR_mlock2		391</div><div class='add'>+#define __NR_copy_file_range	392</div><div class='add'>+#define __NR_preadv2		393</div><div class='add'>+#define __NR_pwritev2		394</div><div class='add'>+#define __NR_pkey_mprotect	395</div><div class='add'>+#define __NR_pkey_alloc		396</div><div class='add'>+#define __NR_pkey_free		397</div><div class='ctx'> </div><div class='ctx'> #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */</div><div class='head'>diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile<br/>index f08bacaf8a95..e098381af928 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/Makefile</a></div><div class='hunk'>@@ -15,7 +15,7 @@ endif</div><div class='ctx'> extra-y := head.o vmlinux.lds</div><div class='ctx'> </div><div class='ctx'> obj-y += dma.o exceptions.o \</div><div class='del'>-	hw_exception_handler.o intc.o irq.o \</div><div class='add'>+	hw_exception_handler.o irq.o \</div><div class='ctx'> 	platform.o process.o prom.o ptrace.o \</div><div class='ctx'> 	reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c<br/>index b70bb538f001..96b3f26d16be 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/cpu/cpuinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/cpu/cpuinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/cpu/cpuinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/cpu/cpuinfo.c</a></div><div class='hunk'>@@ -49,6 +49,8 @@ const struct cpu_ver_key cpu_ver_lookup[] = {</div><div class='ctx'> 	{"9.3", 0x20},</div><div class='ctx'> 	{"9.4", 0x21},</div><div class='ctx'> 	{"9.5", 0x22},</div><div class='add'>+	{"9.6", 0x23},</div><div class='add'>+	{"10.0", 0x24},</div><div class='ctx'> 	{NULL, 0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -75,6 +77,10 @@ const struct family_string_key family_string_lookup[] = {</div><div class='ctx'> 	{"zynq7000", 0x12},</div><div class='ctx'> 	{"UltraScale Virtex", 0x13},</div><div class='ctx'> 	{"UltraScale Kintex", 0x14},</div><div class='add'>+	{"UltraScale+ Zynq", 0x15},</div><div class='add'>+	{"UltraScale+ Virtex", 0x16},</div><div class='add'>+	{"UltraScale+ Kintex", 0x17},</div><div class='add'>+	{"Spartan7", 0x18},</div><div class='ctx'> 	{NULL, 0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c<br/>index ec04dc1e2527..12e093a03e60 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/dma.c</a></div><div class='hunk'>@@ -61,6 +61,10 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,</div><div class='ctx'> 	/* FIXME this part of code is untested */</div><div class='ctx'> 	for_each_sg(sgl, sg, nents, i) {</div><div class='ctx'> 		sg-&gt;dma_address = sg_phys(sg);</div><div class='add'>+</div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		__dma_sync(page_to_phys(sg_page(sg)) + sg-&gt;offset,</div><div class='ctx'> 							sg-&gt;length, direction);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -80,7 +84,8 @@ static inline dma_addr_t dma_direct_map_page(struct device *dev,</div><div class='ctx'> 					     enum dma_data_direction direction,</div><div class='ctx'> 					     unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	__dma_sync(page_to_phys(page) + offset, size, direction);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		__dma_sync(page_to_phys(page) + offset, size, direction);</div><div class='ctx'> 	return page_to_phys(page) + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -95,7 +100,8 @@ static inline void dma_direct_unmap_page(struct device *dev,</div><div class='ctx'>  * phys_to_virt is here because in __dma_sync_page is __virt_to_phys and</div><div class='ctx'>  * dma_address is physical address</div><div class='ctx'>  */</div><div class='del'>-	__dma_sync(dma_address, size, direction);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		__dma_sync(dma_address, size, direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -181,7 +187,7 @@ int dma_direct_mmap_coherent(struct device *dev, struct vm_area_struct *vma,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops dma_direct_ops = {</div><div class='add'>+const struct dma_map_ops dma_direct_ops = {</div><div class='ctx'> 	.alloc		= dma_direct_alloc_coherent,</div><div class='ctx'> 	.free		= dma_direct_free_coherent,</div><div class='ctx'> 	.mmap		= dma_direct_mmap_coherent,</div><div class='head'>diff --git a/arch/microblaze/kernel/exceptions.c b/arch/microblaze/kernel/exceptions.c<br/>index 42dd12a62ff5..e6f338d0496b 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/exceptions.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/exceptions.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/exceptions.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/exceptions.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/exceptions.h&gt;</div><div class='head'>diff --git a/arch/microblaze/kernel/heartbeat.c b/arch/microblaze/kernel/heartbeat.c<br/>index 4643e3ab9414..2022130139d2 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/heartbeat.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/heartbeat.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/heartbeat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/heartbeat.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/loadavg.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='head'>diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c<br/>deleted file mode 100644<br/>index 90bec7d71f85..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/intc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/intc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,196 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2007-2013 Michal Simek &lt;monstr@monstr.eu&gt;</div><div class='del'>- * Copyright (C) 2012-2013 Xilinx, Inc.</div><div class='del'>- * Copyright (C) 2007-2009 PetaLogix</div><div class='del'>- * Copyright (C) 2006 Atmark Techno, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- * License. See the file "COPYING" in the main directory of this archive</div><div class='del'>- * for more details.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/irqdomain.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/irqchip.h&gt;</div><div class='del'>-#include &lt;linux/of_address.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='del'>-</div><div class='del'>-static void __iomem *intc_baseaddr;</div><div class='del'>-</div><div class='del'>-/* No one else should require these constants, so define them locally here. */</div><div class='del'>-#define ISR 0x00			/* Interrupt Status Register */</div><div class='del'>-#define IPR 0x04			/* Interrupt Pending Register */</div><div class='del'>-#define IER 0x08			/* Interrupt Enable Register */</div><div class='del'>-#define IAR 0x0c			/* Interrupt Acknowledge Register */</div><div class='del'>-#define SIE 0x10			/* Set Interrupt Enable bits */</div><div class='del'>-#define CIE 0x14			/* Clear Interrupt Enable bits */</div><div class='del'>-#define IVR 0x18			/* Interrupt Vector Register */</div><div class='del'>-#define MER 0x1c			/* Master Enable Register */</div><div class='del'>-</div><div class='del'>-#define MER_ME (1&lt;&lt;0)</div><div class='del'>-#define MER_HIE (1&lt;&lt;1)</div><div class='del'>-</div><div class='del'>-static unsigned int (*read_fn)(void __iomem *);</div><div class='del'>-static void (*write_fn)(u32, void __iomem *);</div><div class='del'>-</div><div class='del'>-static void intc_write32(u32 val, void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	iowrite32(val, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int intc_read32(void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	return ioread32(addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void intc_write32_be(u32 val, void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	iowrite32be(val, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int intc_read32_be(void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	return ioread32be(addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void intc_enable_or_unmask(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	unsigned long mask = 1 &lt;&lt; d-&gt;hwirq;</div><div class='del'>-</div><div class='del'>-	pr_debug("enable_or_unmask: %ld\n", d-&gt;hwirq);</div><div class='del'>-</div><div class='del'>-	/* ack level irqs because they can't be acked during</div><div class='del'>-	 * ack function since the handle_level_irq function</div><div class='del'>-	 * acks the irq before calling the interrupt handler</div><div class='del'>-	 */</div><div class='del'>-	if (irqd_is_level_type(d))</div><div class='del'>-		write_fn(mask, intc_baseaddr + IAR);</div><div class='del'>-</div><div class='del'>-	write_fn(mask, intc_baseaddr + SIE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void intc_disable_or_mask(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	pr_debug("disable: %ld\n", d-&gt;hwirq);</div><div class='del'>-	write_fn(1 &lt;&lt; d-&gt;hwirq, intc_baseaddr + CIE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void intc_ack(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	pr_debug("ack: %ld\n", d-&gt;hwirq);</div><div class='del'>-	write_fn(1 &lt;&lt; d-&gt;hwirq, intc_baseaddr + IAR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void intc_mask_ack(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	unsigned long mask = 1 &lt;&lt; d-&gt;hwirq;</div><div class='del'>-</div><div class='del'>-	pr_debug("disable_and_ack: %ld\n", d-&gt;hwirq);</div><div class='del'>-	write_fn(mask, intc_baseaddr + CIE);</div><div class='del'>-	write_fn(mask, intc_baseaddr + IAR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irq_chip intc_dev = {</div><div class='del'>-	.name = "Xilinx INTC",</div><div class='del'>-	.irq_unmask = intc_enable_or_unmask,</div><div class='del'>-	.irq_mask = intc_disable_or_mask,</div><div class='del'>-	.irq_ack = intc_ack,</div><div class='del'>-	.irq_mask_ack = intc_mask_ack,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct irq_domain *root_domain;</div><div class='del'>-</div><div class='del'>-unsigned int get_irq(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int hwirq, irq = -1;</div><div class='del'>-</div><div class='del'>-	hwirq = read_fn(intc_baseaddr + IVR);</div><div class='del'>-	if (hwirq != -1U)</div><div class='del'>-		irq = irq_find_mapping(root_domain, hwirq);</div><div class='del'>-</div><div class='del'>-	pr_debug("get_irq: hwirq=%d, irq=%d\n", hwirq, irq);</div><div class='del'>-</div><div class='del'>-	return irq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xintc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)</div><div class='del'>-{</div><div class='del'>-	u32 intr_mask = (u32)d-&gt;host_data;</div><div class='del'>-</div><div class='del'>-	if (intr_mask &amp; (1 &lt;&lt; hw)) {</div><div class='del'>-		irq_set_chip_and_handler_name(irq, &amp;intc_dev,</div><div class='del'>-						handle_edge_irq, "edge");</div><div class='del'>-		irq_clear_status_flags(irq, IRQ_LEVEL);</div><div class='del'>-	} else {</div><div class='del'>-		irq_set_chip_and_handler_name(irq, &amp;intc_dev,</div><div class='del'>-						handle_level_irq, "level");</div><div class='del'>-		irq_set_status_flags(irq, IRQ_LEVEL);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct irq_domain_ops xintc_irq_domain_ops = {</div><div class='del'>-	.xlate = irq_domain_xlate_onetwocell,</div><div class='del'>-	.map = xintc_map,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init xilinx_intc_of_init(struct device_node *intc,</div><div class='del'>-					     struct device_node *parent)</div><div class='del'>-{</div><div class='del'>-	u32 nr_irq, intr_mask;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	intc_baseaddr = of_iomap(intc, 0);</div><div class='del'>-	BUG_ON(!intc_baseaddr);</div><div class='del'>-</div><div class='del'>-	ret = of_property_read_u32(intc, "xlnx,num-intr-inputs", &amp;nr_irq);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_err("%s: unable to read xlnx,num-intr-inputs\n", __func__);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = of_property_read_u32(intc, "xlnx,kind-of-intr", &amp;intr_mask);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pr_err("%s: unable to read xlnx,kind-of-intr\n", __func__);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (intr_mask &gt;&gt; nr_irq)</div><div class='del'>-		pr_warn("%s: mismatch in kind-of-intr param\n", __func__);</div><div class='del'>-</div><div class='del'>-	pr_info("%s: num_irq=%d, edge=0x%x\n",</div><div class='del'>-		intc-&gt;full_name, nr_irq, intr_mask);</div><div class='del'>-</div><div class='del'>-	write_fn = intc_write32;</div><div class='del'>-	read_fn = intc_read32;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disable all external interrupts until they are</div><div class='del'>-	 * explicity requested.</div><div class='del'>-	 */</div><div class='del'>-	write_fn(0, intc_baseaddr + IER);</div><div class='del'>-</div><div class='del'>-	/* Acknowledge any pending interrupts just in case. */</div><div class='del'>-	write_fn(0xffffffff, intc_baseaddr + IAR);</div><div class='del'>-</div><div class='del'>-	/* Turn on the Master Enable. */</div><div class='del'>-	write_fn(MER_HIE | MER_ME, intc_baseaddr + MER);</div><div class='del'>-	if (!(read_fn(intc_baseaddr + MER) &amp; (MER_HIE | MER_ME))) {</div><div class='del'>-		write_fn = intc_write32_be;</div><div class='del'>-		read_fn = intc_read32_be;</div><div class='del'>-		write_fn(MER_HIE | MER_ME, intc_baseaddr + MER);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Yeah, okay, casting the intr_mask to a void* is butt-ugly, but I'm</div><div class='del'>-	 * lazy and Michal can clean it up to something nicer when he tests</div><div class='del'>-	 * and commits this patch.  ~~gcl */</div><div class='del'>-	root_domain = irq_domain_add_linear(intc, nr_irq, &amp;xintc_irq_domain_ops,</div><div class='del'>-							(void *)intr_mask);</div><div class='del'>-</div><div class='del'>-	irq_set_default_host(root_domain);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-IRQCHIP_DECLARE(xilinx_intc, "xlnx,xps-intc-1.00.a", xilinx_intc_of_init);</div><div class='head'>diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c<br/>index 11e24de91aa4..903dad822fad 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/irq.c</a></div><div class='hunk'>@@ -29,12 +29,12 @@ void __irq_entry do_IRQ(struct pt_regs *regs)</div><div class='ctx'> 	trace_hardirqs_off();</div><div class='ctx'> </div><div class='ctx'> 	irq_enter();</div><div class='del'>-	irq = get_irq();</div><div class='add'>+	irq = xintc_get_irq();</div><div class='ctx'> next_irq:</div><div class='ctx'> 	BUG_ON(!irq);</div><div class='ctx'> 	generic_handle_irq(irq);</div><div class='ctx'> </div><div class='del'>-	irq = get_irq();</div><div class='add'>+	irq = xintc_get_irq();</div><div class='ctx'> 	if (irq != -1U) {</div><div class='ctx'> 		pr_debug("next irq: %d\n", irq);</div><div class='ctx'> 		++concurrent_irq;</div><div class='head'>diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c<br/>index b2dd37196b3b..e92a817e645f 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/process.c</a></div><div class='hunk'>@@ -11,6 +11,9 @@</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='head'>diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrace.c<br/>index 8cfa98cadf3d..badd286882ae 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/ptrace.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='head'>diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S<br/>index 6b3dd99126d7..6841c2df14d9 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/syscall_table.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/syscall_table.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/syscall_table.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/syscall_table.S</a></div><div class='hunk'>@@ -392,3 +392,9 @@ ENTRY(sys_call_table)</div><div class='ctx'> 	.long sys_userfaultfd</div><div class='ctx'> 	.long sys_membarrier		/* 390 */</div><div class='ctx'> 	.long sys_mlock2</div><div class='add'>+	.long sys_copy_file_range</div><div class='add'>+	.long sys_preadv2</div><div class='add'>+	.long sys_pwritev2</div><div class='add'>+	.long sys_pkey_mprotect		/* 395 */</div><div class='add'>+	.long sys_pkey_alloc</div><div class='add'>+	.long sys_pkey_free</div><div class='head'>diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c<br/>index 5bbf38b916ef..999066192715 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/timer.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/timer.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/sched_clock.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='hunk'>@@ -190,17 +191,17 @@ static u64 xilinx_clock_read(void)</div><div class='ctx'> 	return read_fn(timer_baseaddr + TCR1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t xilinx_read(struct clocksource *cs)</div><div class='add'>+static u64 xilinx_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	/* reading actual value of timer 1 */</div><div class='del'>-	return (cycle_t)xilinx_clock_read();</div><div class='add'>+	return (u64)xilinx_clock_read();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct timecounter xilinx_tc = {</div><div class='ctx'> 	.cc = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static cycle_t xilinx_cc_read(const struct cyclecounter *cc)</div><div class='add'>+static u64 xilinx_cc_read(const struct cyclecounter *cc)</div><div class='ctx'> {</div><div class='ctx'> 	return xilinx_read(NULL);</div><div class='ctx'> }</div><div class='hunk'>@@ -259,7 +260,7 @@ static int __init xilinx_timer_init(struct device_node *timer)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (initialized)</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	initialized = 1;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/microblaze/kernel/traps.c b/arch/microblaze/kernel/traps.c<br/>index cb619533a192..45bbba9d919f 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/traps.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/debug_locks.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/exceptions.h&gt;</div><div class='head'>diff --git a/arch/microblaze/kernel/unwind.c b/arch/microblaze/kernel/unwind.c<br/>index 61c04eed14d5..34c270cb11fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/kernel/unwind.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/kernel/unwind.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/kernel/unwind.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/kernel/unwind.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c<br/>index abb678ccde6f..f91b30f8aaa8 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/mm/fault.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c<br/>index cc732fe357ad..4c0599239915 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/mm/pgtable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/mm/pgtable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/mm/pgtable.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='head'>diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c<br/>index 7f696f97f9dd..13bc93242c0c 100644<br/>--- a/<a href='/drm-misc/tree/arch/microblaze/pci/pci-common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/microblaze/pci/pci-common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/microblaze/pci/pci-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/microblaze/pci/pci-common.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/shmem_fs.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='head'>diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig<br/>index b3c5bde43d34..a008a9f03072 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/Kconfig</a></div><div class='hunk'>@@ -9,10 +9,13 @@ config MIPS</div><div class='ctx'> 	select HAVE_CONTEXT_TRACKING</div><div class='ctx'> 	select HAVE_GENERIC_DMA_COHERENT</div><div class='ctx'> 	select HAVE_IDE</div><div class='add'>+	select HAVE_IRQ_EXIT_ON_IRQ_STACK</div><div class='ctx'> 	select HAVE_OPROFILE</div><div class='ctx'> 	select HAVE_PERF_EVENTS</div><div class='ctx'> 	select PERF_USE_VMALLOC</div><div class='ctx'> 	select HAVE_ARCH_KGDB</div><div class='add'>+	select HAVE_ARCH_MMAP_RND_BITS if MMU</div><div class='add'>+	select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU &amp;&amp; COMPAT</div><div class='ctx'> 	select HAVE_ARCH_SECCOMP_FILTER</div><div class='ctx'> 	select HAVE_ARCH_TRACEHOOK</div><div class='ctx'> 	select HAVE_CBPF_JIT if !CPU_MICROMIPS</div><div class='hunk'>@@ -94,6 +97,7 @@ config MIPS_GENERIC</div><div class='ctx'> 	select PCI_DRIVERS_GENERIC</div><div class='ctx'> 	select PINCTRL</div><div class='ctx'> 	select SMP_UP if SMP</div><div class='add'>+	select SWAP_IO_SPACE</div><div class='ctx'> 	select SYS_HAS_CPU_MIPS32_R1</div><div class='ctx'> 	select SYS_HAS_CPU_MIPS32_R2</div><div class='ctx'> 	select SYS_HAS_CPU_MIPS32_R6</div><div class='hunk'>@@ -478,6 +482,7 @@ config MACH_XILFPGA</div><div class='ctx'> 	select SYS_SUPPORTS_ZBOOT_UART16550</div><div class='ctx'> 	select USE_OF</div><div class='ctx'> 	select USE_GENERIC_EARLY_PRINTK_8250</div><div class='add'>+	select XILINX_INTC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for the IMG University Program MIPSfpga platform.</div><div class='ctx'> </div><div class='hunk'>@@ -909,6 +914,7 @@ config CAVIUM_OCTEON_SOC</div><div class='ctx'> 	select NR_CPUS_DEFAULT_16</div><div class='ctx'> 	select BUILTIN_DTB</div><div class='ctx'> 	select MTD_COMPLEX_MAPPINGS</div><div class='add'>+	select SYS_SUPPORTS_RELOCATABLE</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option supports all of the Octeon reference boards from Cavium</div><div class='ctx'> 	  Networks. It builds a kernel that dynamically determines the Octeon</div><div class='hunk'>@@ -1427,7 +1433,6 @@ config CPU_LOONGSON1C</div><div class='ctx'> 	bool "Loongson 1C"</div><div class='ctx'> 	depends on SYS_HAS_CPU_LOONGSON1C</div><div class='ctx'> 	select CPU_LOONGSON1</div><div class='del'>-	select ARCH_WANT_OPTIONAL_GPIOLIB</div><div class='ctx'> 	select LEDS_GPIO_REGISTER</div><div class='ctx'> 	help</div><div class='ctx'> 	  The Loongson 1C is a 32-bit SoC, which implements the MIPS32</div><div class='hunk'>@@ -1703,6 +1708,8 @@ config CPU_BMIPS</div><div class='ctx'> 	select WEAK_ORDERING</div><div class='ctx'> 	select CPU_SUPPORTS_HIGHMEM</div><div class='ctx'> 	select CPU_HAS_PREFETCH</div><div class='add'>+	select CPU_SUPPORTS_CPUFREQ</div><div class='add'>+	select MIPS_EXTERNAL_TIMER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for BMIPS32/3300/4350/4380 and BMIPS5000 processors.</div><div class='ctx'> </div><div class='hunk'>@@ -2286,7 +2293,7 @@ config MIPS_MT_FPAFF</div><div class='ctx'> </div><div class='ctx'> config MIPSR2_TO_R6_EMULATOR</div><div class='ctx'> 	bool "MIPS R2-to-R6 emulator"</div><div class='del'>-	depends on CPU_MIPSR6 &amp;&amp; !SMP</div><div class='add'>+	depends on CPU_MIPSR6</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Choose this option if you want to run non-R6 MIPS userland code.</div><div class='hunk'>@@ -2294,8 +2301,6 @@ config MIPSR2_TO_R6_EMULATOR</div><div class='ctx'> 	  default. You can enable it using the 'mipsr2emu' kernel option.</div><div class='ctx'> 	  The only reason this is a build-time option is to save ~14K from the</div><div class='ctx'> 	  final kernel image.</div><div class='del'>-comment "MIPS R2-to-R6 emulator is only available for UP kernels"</div><div class='del'>-	depends on SMP &amp;&amp; CPU_MIPSR6</div><div class='ctx'> </div><div class='ctx'> config MIPS_VPE_LOADER</div><div class='ctx'> 	bool "VPE loader support."</div><div class='hunk'>@@ -2570,7 +2575,7 @@ config SYS_SUPPORTS_NUMA</div><div class='ctx'> </div><div class='ctx'> config RELOCATABLE</div><div class='ctx'> 	bool "Relocatable kernel"</div><div class='del'>-	depends on SYS_SUPPORTS_RELOCATABLE &amp;&amp; (CPU_MIPS32_R2 || CPU_MIPS64_R2 || CPU_MIPS32_R6 || CPU_MIPS64_R6)</div><div class='add'>+	depends on SYS_SUPPORTS_RELOCATABLE &amp;&amp; (CPU_MIPS32_R2 || CPU_MIPS64_R2 || CPU_MIPS32_R6 || CPU_MIPS64_R6 || CAVIUM_OCTEON_SOC)</div><div class='ctx'> 	help</div><div class='ctx'> 	  This builds a kernel image that retains relocation information</div><div class='ctx'> 	  so it can be loaded someplace besides the default 1MB.</div><div class='hunk'>@@ -2826,8 +2831,8 @@ config KEXEC</div><div class='ctx'> 	  made.</div><div class='ctx'> </div><div class='ctx'> config CRASH_DUMP</div><div class='del'>-	  bool "Kernel crash dumps"</div><div class='del'>-	  help</div><div class='add'>+	bool "Kernel crash dumps"</div><div class='add'>+	help</div><div class='ctx'> 	  Generate crash dump after being started by kexec.</div><div class='ctx'> 	  This should be normally only set in special crash dump kernels</div><div class='ctx'> 	  which are loaded in the main kernel with kexec-tools into</div><div class='hunk'>@@ -2837,11 +2842,11 @@ config CRASH_DUMP</div><div class='ctx'> 	  PHYSICAL_START.</div><div class='ctx'> </div><div class='ctx'> config PHYSICAL_START</div><div class='del'>-	  hex "Physical address where the kernel is loaded"</div><div class='del'>-	  default "0xffffffff84000000" if 64BIT</div><div class='del'>-	  default "0x84000000" if 32BIT</div><div class='del'>-	  depends on CRASH_DUMP</div><div class='del'>-	  help</div><div class='add'>+	hex "Physical address where the kernel is loaded"</div><div class='add'>+	default "0xffffffff84000000" if 64BIT</div><div class='add'>+	default "0x84000000" if 32BIT</div><div class='add'>+	depends on CRASH_DUMP</div><div class='add'>+	help</div><div class='ctx'> 	  This gives the CKSEG0 or KSEG0 address where the kernel is loaded.</div><div class='ctx'> 	  If you plan to use kernel for capturing the crash dump change</div><div class='ctx'> 	  this value to start of the reserved region (the "X" value as</div><div class='hunk'>@@ -3073,6 +3078,20 @@ config MMU</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config ARCH_MMAP_RND_BITS_MIN</div><div class='add'>+	default 12 if 64BIT</div><div class='add'>+	default 8</div><div class='add'>+</div><div class='add'>+config ARCH_MMAP_RND_BITS_MAX</div><div class='add'>+	default 18 if 64BIT</div><div class='add'>+	default 15</div><div class='add'>+</div><div class='add'>+config ARCH_MMAP_RND_COMPAT_BITS_MIN</div><div class='add'>+       default 8</div><div class='add'>+</div><div class='add'>+config ARCH_MMAP_RND_COMPAT_BITS_MAX</div><div class='add'>+       default 15</div><div class='add'>+</div><div class='ctx'> config I8253</div><div class='ctx'> 	bool</div><div class='ctx'> 	select CLKSRC_I8253</div><div class='head'>diff --git a/arch/mips/Makefile b/arch/mips/Makefile<br/>index 1a6bac7b076f..8ef9c02747fa 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/Makefile</a></div><div class='hunk'>@@ -131,6 +131,21 @@ cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= $(shell $(CC) -dumpmachine |grep -q 'mips.</div><div class='ctx'> </div><div class='ctx'> cflags-$(CONFIG_SB1XXX_CORELIS)	+= $(call cc-option,-mno-sched-prolog) \</div><div class='ctx'> 				   -fno-omit-frame-pointer</div><div class='add'>+</div><div class='add'>+# Some distribution-specific toolchains might pass the -fstack-check</div><div class='add'>+# option during the build, which adds a simple stack-probe at the beginning</div><div class='add'>+# of every function.  This stack probe is to ensure that there is enough</div><div class='add'>+# stack space, else a SEGV is generated.  This is not desirable for MIPS</div><div class='add'>+# as kernel stacks are small, placed in unmapped virtual memory, and do not</div><div class='add'>+# grow when overflowed.  Especially on SGI IP27 platforms, this check will</div><div class='add'>+# lead to a NULL pointer dereference in _raw_spin_lock_irq.</div><div class='add'>+#</div><div class='add'>+# In disassembly, this stack probe appears at the top of a function as:</div><div class='add'>+#    sd		zero,&lt;offset&gt;(sp)</div><div class='add'>+# Where &lt;offset&gt; is a negative value.</div><div class='add'>+#</div><div class='add'>+cflags-y += -fno-stack-check</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # CPU-dependent compiler/assembler options for optimization.</div><div class='ctx'> #</div><div class='hunk'>@@ -320,6 +335,9 @@ bootz-y			:= vmlinuz</div><div class='ctx'> bootz-y			+= vmlinuz.bin</div><div class='ctx'> bootz-y			+= vmlinuz.ecoff</div><div class='ctx'> bootz-y			+= vmlinuz.srec</div><div class='add'>+ifeq ($(shell expr $(zload-y) \&lt; 0xffffffff80000000 2&gt; /dev/null), 0)</div><div class='add'>+bootz-y			+= uzImage.bin</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_LASAT</div><div class='ctx'> rom.bin rom.sw: vmlinux</div><div class='hunk'>@@ -327,10 +345,6 @@ rom.bin rom.sw: vmlinux</div><div class='ctx'> 		$(bootvars-y) $@</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-CMD_RELOCS = arch/mips/boot/tools/relocs</div><div class='del'>-quiet_cmd_relocs = RELOCS  $&lt;</div><div class='del'>-      cmd_relocs = $(CMD_RELOCS) $&lt;</div><div class='del'>-</div><div class='ctx'> #</div><div class='ctx'> # Some machines like the Indy need 32-bit ELF binaries for booting purposes.</div><div class='ctx'> # Other need ECOFF, so we build a 32-bit ELF binary for them which we then</div><div class='hunk'>@@ -339,11 +353,6 @@ quiet_cmd_relocs = RELOCS  $&lt;</div><div class='ctx'> quiet_cmd_32 = OBJCOPY $@</div><div class='ctx'> 	cmd_32 = $(OBJCOPY) -O $(32bit-bfd) $(OBJCOPYFLAGS) $&lt; $@</div><div class='ctx'> vmlinux.32: vmlinux</div><div class='del'>-ifeq ($(CONFIG_RELOCATABLE)$(CONFIG_64BIT),yy)</div><div class='del'>-# Currently, objcopy fails to handle the relocations in the elf64</div><div class='del'>-# So the relocs tool must be run here to remove them first</div><div class='del'>-	$(call cmd,relocs)</div><div class='del'>-endif</div><div class='ctx'> 	$(call cmd,32)</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -359,9 +368,6 @@ all:	$(all-y)</div><div class='ctx'> </div><div class='ctx'> # boot</div><div class='ctx'> $(boot-y): $(vmlinux-32) FORCE</div><div class='del'>-ifeq ($(CONFIG_RELOCATABLE)$(CONFIG_32BIT),yy)</div><div class='del'>-	$(call cmd,relocs)</div><div class='del'>-endif</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) \</div><div class='ctx'> 		$(bootvars-y) arch/mips/boot/$@</div><div class='ctx'> </div><div class='hunk'>@@ -395,11 +401,11 @@ dtbs_install:</div><div class='ctx'> </div><div class='ctx'> archprepare:</div><div class='ctx'> ifdef CONFIG_MIPS32_N32</div><div class='del'>-	@echo '  Checking missing-syscalls for N32'</div><div class='add'>+	@$(kecho) '  Checking missing-syscalls for N32'</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=. missing-syscalls missing_syscalls_flags="-mabi=n32"</div><div class='ctx'> endif</div><div class='ctx'> ifdef CONFIG_MIPS32_O32</div><div class='del'>-	@echo '  Checking missing-syscalls for O32'</div><div class='add'>+	@$(kecho) '  Checking missing-syscalls for O32'</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=. missing-syscalls missing_syscalls_flags="-mabi=32"</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='hunk'>@@ -433,6 +439,7 @@ define archhelp</div><div class='ctx'> 	echo '  uImage.gz            - U-Boot image (gzip)'</div><div class='ctx'> 	echo '  uImage.lzma          - U-Boot image (lzma)'</div><div class='ctx'> 	echo '  uImage.lzo           - U-Boot image (lzo)'</div><div class='add'>+	echo '  uzImage.bin          - U-Boot image (self-extracting)'</div><div class='ctx'> 	echo '  dtbs                 - Device-tree blobs for enabled boards'</div><div class='ctx'> 	echo '  dtbs_install         - Install dtbs to $(INSTALL_DTBS_PATH)'</div><div class='ctx'> 	echo</div><div class='head'>diff --git a/arch/mips/Makefile.postlink b/arch/mips/Makefile.postlink<br/>new file mode 100644<br/>index 000000000000..4b7f5a648c79<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/mips/Makefile.postlink?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/Makefile.postlink</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+# ===========================================================================</div><div class='add'>+# Post-link MIPS pass</div><div class='add'>+# ===========================================================================</div><div class='add'>+#</div><div class='add'>+# 1. Insert relocations into vmlinux</div><div class='add'>+</div><div class='add'>+PHONY := __archpost</div><div class='add'>+__archpost:</div><div class='add'>+</div><div class='add'>+-include include/config/auto.conf</div><div class='add'>+include scripts/Kbuild.include</div><div class='add'>+</div><div class='add'>+CMD_RELOCS = arch/mips/boot/tools/relocs</div><div class='add'>+quiet_cmd_relocs = RELOCS $@</div><div class='add'>+      cmd_relocs = $(CMD_RELOCS) $@</div><div class='add'>+</div><div class='add'>+# `@true` prevents complaint when there is nothing to be done</div><div class='add'>+</div><div class='add'>+vmlinux: FORCE</div><div class='add'>+	@true</div><div class='add'>+ifeq ($(CONFIG_RELOCATABLE),y)</div><div class='add'>+	$(call if_changed,relocs)</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+%.ko: FORCE</div><div class='add'>+	@true</div><div class='add'>+</div><div class='add'>+clean:</div><div class='add'>+	@true</div><div class='add'>+</div><div class='add'>+PHONY += FORCE clean</div><div class='add'>+</div><div class='add'>+FORCE:</div><div class='add'>+</div><div class='add'>+.PHONY: $(PHONY)</div><div class='head'>diff --git a/arch/mips/alchemy/board-gpr.c b/arch/mips/alchemy/board-gpr.c<br/>index 79efe4c6e636..6fb6b3faa158 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/alchemy/board-gpr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/alchemy/board-gpr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/alchemy/board-gpr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/board-gpr.c</a></div><div class='hunk'>@@ -236,7 +236,6 @@ static struct platform_device gpr_i2c_device = {</div><div class='ctx'> static struct i2c_board_info gpr_i2c_info[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		I2C_BOARD_INFO("lm83", 0x18),</div><div class='del'>-		.type = "lm83"</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c<br/>index f2f264b5aafe..fc482d900ddd 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/alchemy/common/dbdma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/alchemy/common/dbdma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/alchemy/common/dbdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/dbdma.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1xxx_dbdma.h&gt;</div><div class='head'>diff --git a/arch/mips/alchemy/common/dma.c b/arch/mips/alchemy/common/dma.c<br/>index 4fb6207b883b..973049b5bd61 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/alchemy/common/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/alchemy/common/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/alchemy/common/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/dma.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='head'>diff --git a/arch/mips/alchemy/common/gpiolib.c b/arch/mips/alchemy/common/gpiolib.c<br/>index e6b90e72c23f..7d5da5edd74d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/alchemy/common/gpiolib.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/alchemy/common/gpiolib.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/alchemy/common/gpiolib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/gpiolib.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/gpio-au1000.h&gt;</div><div class='head'>diff --git a/arch/mips/alchemy/common/power.c b/arch/mips/alchemy/common/power.c<br/>index 921ed30b440c..303257b697c2 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/alchemy/common/power.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/alchemy/common/power.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/alchemy/common/power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/power.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/mips/alchemy/common/prom.c b/arch/mips/alchemy/common/prom.c<br/>index 534021059629..af312b5e33f6 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/alchemy/common/prom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/alchemy/common/prom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/alchemy/common/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/prom.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c<br/>index f99d3ec17a45..e1bec5a77c39 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/alchemy/common/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/alchemy/common/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/alchemy/common/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/time.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> /* 32kHz clock enabled and detected */</div><div class='ctx'> #define CNTR_OK (SYS_CNTRL_E0 | SYS_CNTRL_32S)</div><div class='ctx'> </div><div class='del'>-static cycle_t au1x_counter1_read(struct clocksource *cs)</div><div class='add'>+static u64 au1x_counter1_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return alchemy_rdsys(AU1000_SYS_RTCREAD);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/alchemy/common/usb.c b/arch/mips/alchemy/common/usb.c<br/>index 297805ade849..634edd3ded38 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/alchemy/common/usb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/alchemy/common/usb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/alchemy/common/usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/usb.c</a></div><div class='hunk'>@@ -10,9 +10,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='head'>diff --git a/arch/mips/alchemy/common/vss.c b/arch/mips/alchemy/common/vss.c<br/>index d23b1444d365..a7bd32e9831b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/alchemy/common/vss.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/alchemy/common/vss.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/alchemy/common/vss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/common/vss.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * for various media blocks are enabled/disabled.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/alchemy/devboards/bcsr.c b/arch/mips/alchemy/devboards/bcsr.c<br/>index faeddf119fd4..c1a2daaf300a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/alchemy/devboards/bcsr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/alchemy/devboards/bcsr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/alchemy/devboards/bcsr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/devboards/bcsr.c</a></div><div class='hunk'>@@ -9,7 +9,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irqchip/chained_irq.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c<br/>index d3c087f59f1a..a5504f57cb00 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/alchemy/devboards/db1300.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/alchemy/devboards/db1300.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/alchemy/devboards/db1300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/alchemy/devboards/db1300.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/mips/ar7/clock.c b/arch/mips/ar7/clock.c<br/>index 2460f9d23f1b..dda422a0f36c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ar7/clock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ar7/clock.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ar7/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ar7/clock.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/gcd.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='head'>diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c<br/>index ed5b3d297caf..4eee7e9e26ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ar7/gpio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ar7/gpio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ar7/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ar7/gpio.c</a></div><div class='hunk'>@@ -18,7 +18,8 @@</div><div class='ctx'>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-ar7/ar7.h&gt;</div><div class='head'>diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c<br/>index 92dfa481205b..0332f0514d05 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ar7/memory.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ar7/memory.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ar7/memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ar7/memory.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pfn.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c<br/>index 58fca9ad5fcc..df7acea3747a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ar7/platform.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ar7/platform.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ar7/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ar7/platform.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c<br/>index a23adc49d50f..4fd83336131a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ar7/prom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ar7/prom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ar7/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ar7/prom.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='head'>diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c<br/>index cc3a1e33a600..fa845953f736 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ath79/clock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ath79/clock.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ath79/clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ath79/clock.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='hunk'>@@ -45,7 +44,7 @@ static struct clk *__init ath79_add_sys_clkdev(</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	clk = clk_register_fixed_rate(NULL, id, NULL, 0, rate);</div><div class='del'>-	if (!clk)</div><div class='add'>+	if (IS_ERR(clk))</div><div class='ctx'> 		panic("failed to allocate %s clock structure", id);</div><div class='ctx'> </div><div class='ctx'> 	err = clk_register_clkdev(clk, id, NULL);</div><div class='hunk'>@@ -508,16 +507,19 @@ static void __init ath79_clocks_init_dt_ng(struct device_node *np)</div><div class='ctx'> 		ar9330_clk_init(ref_clk, pll_base);</div><div class='ctx'> 	else {</div><div class='ctx'> 		pr_err("%s: could not find any appropriate clk_init()\n", dnfn);</div><div class='del'>-		goto err_clk;</div><div class='add'>+		goto err_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (of_clk_add_provider(np, of_clk_src_onecell_get, &amp;clk_data)) {</div><div class='ctx'> 		pr_err("%s: could not register clk provider\n", dnfn);</div><div class='del'>-		goto err_clk;</div><div class='add'>+		goto err_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='add'>+err_iounmap:</div><div class='add'>+	iounmap(pll_base);</div><div class='add'>+</div><div class='ctx'> err_clk:</div><div class='ctx'> 	clk_put(ref_clk);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c<br/>index d071a3a0f876..10a405d593df 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ath79/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ath79/common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ath79/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ath79/common.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c<br/>index a88975a55c4d..8cbe60cc51d4 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/bcm47xx/board.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/bcm47xx/board.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/bcm47xx/board.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm47xx/board.c</a></div><div class='hunk'>@@ -149,6 +149,15 @@ struct bcm47xx_board_type_list2 bcm47xx_board_list_boot_hw[] __initconst = {</div><div class='ctx'> /* board_id */</div><div class='ctx'> static const</div><div class='ctx'> struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {</div><div class='add'>+	{{BCM47XX_BOARD_LUXUL_ABR_4400_V1, "Luxul ABR-4400 V1"}, "luxul_abr4400_v1"},</div><div class='add'>+	{{BCM47XX_BOARD_LUXUL_XAP_310_V1, "Luxul XAP-310 V1"}, "luxul_xap310_v1"},</div><div class='add'>+	{{BCM47XX_BOARD_LUXUL_XAP_1210_V1, "Luxul XAP-1210 V1"}, "luxul_xap1210_v1"},</div><div class='add'>+	{{BCM47XX_BOARD_LUXUL_XAP_1230_V1, "Luxul XAP-1230 V1"}, "luxul_xap1230_v1"},</div><div class='add'>+	{{BCM47XX_BOARD_LUXUL_XAP_1240_V1, "Luxul XAP-1240 V1"}, "luxul_xap1240_v1"},</div><div class='add'>+	{{BCM47XX_BOARD_LUXUL_XAP_1500_V1, "Luxul XAP-1500 V1"}, "luxul_xap1500_v1"},</div><div class='add'>+	{{BCM47XX_BOARD_LUXUL_XBR_4400_V1, "Luxul XBR-4400 V1"}, "luxul_xbr4400_v1"},</div><div class='add'>+	{{BCM47XX_BOARD_LUXUL_XVW_P30_V1, "Luxul XVW-P30 V1"}, "luxul_xvwp30_v1"},</div><div class='add'>+	{{BCM47XX_BOARD_LUXUL_XWR_600_V1, "Luxul XWR-600 V1"}, "luxul_xwr600_v1"},</div><div class='ctx'> 	{{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"},</div><div class='ctx'> 	{{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},</div><div class='ctx'> 	{{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},</div><div class='head'>diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c<br/>index 52caa75bfe4e..8a760d801895 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/bcm47xx/buttons.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/bcm47xx/buttons.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/bcm47xx/buttons.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm47xx/buttons.c</a></div><div class='hunk'>@@ -17,6 +17,12 @@</div><div class='ctx'> 		.active_low	= 1,					\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define BCM47XX_GPIO_KEY_H(_gpio, _code)				\</div><div class='add'>+	{								\</div><div class='add'>+		.code		= _code,				\</div><div class='add'>+		.gpio		= _gpio,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> /* Asus */</div><div class='ctx'> </div><div class='ctx'> static const struct gpio_keys_button</div><div class='hunk'>@@ -79,8 +85,8 @@ bcm47xx_buttons_asus_wl500gpv2[] __initconst = {</div><div class='ctx'> </div><div class='ctx'> static const struct gpio_keys_button</div><div class='ctx'> bcm47xx_buttons_asus_wl500w[] __initconst = {</div><div class='del'>-	BCM47XX_GPIO_KEY(6, KEY_RESTART),</div><div class='del'>-	BCM47XX_GPIO_KEY(7, KEY_WPS_BUTTON),</div><div class='add'>+	BCM47XX_GPIO_KEY_H(6, KEY_RESTART),</div><div class='add'>+	BCM47XX_GPIO_KEY_H(7, KEY_WPS_BUTTON),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct gpio_keys_button</div><div class='hunk'>@@ -302,6 +308,51 @@ bcm47xx_buttons_linksys_wrtsl54gs[] __initconst = {</div><div class='ctx'> /* Luxul */</div><div class='ctx'> </div><div class='ctx'> static const struct gpio_keys_button</div><div class='add'>+bcm47xx_buttons_luxul_abr_4400_v1[] = {</div><div class='add'>+	BCM47XX_GPIO_KEY(14, KEY_RESTART),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_keys_button</div><div class='add'>+bcm47xx_buttons_luxul_xap_310_v1[] = {</div><div class='add'>+	BCM47XX_GPIO_KEY(20, KEY_RESTART),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_keys_button</div><div class='add'>+bcm47xx_buttons_luxul_xap_1210_v1[] = {</div><div class='add'>+	BCM47XX_GPIO_KEY(8, KEY_RESTART),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_keys_button</div><div class='add'>+bcm47xx_buttons_luxul_xap_1230_v1[] = {</div><div class='add'>+	BCM47XX_GPIO_KEY(8, KEY_RESTART),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_keys_button</div><div class='add'>+bcm47xx_buttons_luxul_xap_1240_v1[] = {</div><div class='add'>+	BCM47XX_GPIO_KEY(8, KEY_RESTART),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_keys_button</div><div class='add'>+bcm47xx_buttons_luxul_xap_1500_v1[] = {</div><div class='add'>+	BCM47XX_GPIO_KEY(14, KEY_RESTART),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_keys_button</div><div class='add'>+bcm47xx_buttons_luxul_xbr_4400_v1[] = {</div><div class='add'>+	BCM47XX_GPIO_KEY(14, KEY_RESTART),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_keys_button</div><div class='add'>+bcm47xx_buttons_luxul_xvw_p30_v1[] = {</div><div class='add'>+	BCM47XX_GPIO_KEY(20, KEY_RESTART),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_keys_button</div><div class='add'>+bcm47xx_buttons_luxul_xwr_600_v1[] = {</div><div class='add'>+	BCM47XX_GPIO_KEY(8, KEY_RESTART),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_keys_button</div><div class='ctx'> bcm47xx_buttons_luxul_xwr_1750_v1[] = {</div><div class='ctx'> 	BCM47XX_GPIO_KEY(14, BTN_TASK),</div><div class='ctx'> };</div><div class='hunk'>@@ -561,6 +612,33 @@ int __init bcm47xx_buttons_register(void)</div><div class='ctx'> 		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrtsl54gs);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case BCM47XX_BOARD_LUXUL_ABR_4400_V1:</div><div class='add'>+		err = bcm47xx_copy_bdata(bcm47xx_buttons_luxul_abr_4400_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XAP_310_V1:</div><div class='add'>+		err = bcm47xx_copy_bdata(bcm47xx_buttons_luxul_xap_310_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XAP_1210_V1:</div><div class='add'>+		err = bcm47xx_copy_bdata(bcm47xx_buttons_luxul_xap_1210_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XAP_1230_V1:</div><div class='add'>+		err = bcm47xx_copy_bdata(bcm47xx_buttons_luxul_xap_1230_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XAP_1240_V1:</div><div class='add'>+		err = bcm47xx_copy_bdata(bcm47xx_buttons_luxul_xap_1240_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XAP_1500_V1:</div><div class='add'>+		err = bcm47xx_copy_bdata(bcm47xx_buttons_luxul_xap_1500_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XBR_4400_V1:</div><div class='add'>+		err = bcm47xx_copy_bdata(bcm47xx_buttons_luxul_xbr_4400_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XVW_P30_V1:</div><div class='add'>+		err = bcm47xx_copy_bdata(bcm47xx_buttons_luxul_xvw_p30_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XWR_600_V1:</div><div class='add'>+		err = bcm47xx_copy_bdata(bcm47xx_buttons_luxul_xwr_600_v1);</div><div class='add'>+		break;</div><div class='ctx'> 	case BCM47XX_BOARD_LUXUL_XWR_1750_V1:</div><div class='ctx'> 		err = bcm47xx_copy_bdata(bcm47xx_buttons_luxul_xwr_1750_v1);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/arch/mips/bcm47xx/leds.c b/arch/mips/bcm47xx/leds.c<br/>index d20ae63eb3c2..a35f1d5cde9f 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/bcm47xx/leds.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/bcm47xx/leds.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/bcm47xx/leds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm47xx/leds.c</a></div><div class='hunk'>@@ -373,6 +373,60 @@ bcm47xx_leds_linksys_wrtsl54gs[] __initconst = {</div><div class='ctx'> /* Luxul */</div><div class='ctx'> </div><div class='ctx'> static const struct gpio_led</div><div class='add'>+bcm47xx_leds_luxul_abr_4400_v1[] __initconst = {</div><div class='add'>+	BCM47XX_GPIO_LED(12, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),</div><div class='add'>+	BCM47XX_GPIO_LED_TRIGGER(15, "green", "status", 0, "timer"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_led</div><div class='add'>+bcm47xx_leds_luxul_xap_310_v1[] __initconst = {</div><div class='add'>+	BCM47XX_GPIO_LED_TRIGGER(6, "green", "status", 1, "timer"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_led</div><div class='add'>+bcm47xx_leds_luxul_xap_1210_v1[] __initconst = {</div><div class='add'>+	BCM47XX_GPIO_LED_TRIGGER(6, "green", "status", 1, "timer"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_led</div><div class='add'>+bcm47xx_leds_luxul_xap_1230_v1[] __initconst = {</div><div class='add'>+	BCM47XX_GPIO_LED(3, "blue", "2ghz", 0, LEDS_GPIO_DEFSTATE_OFF),</div><div class='add'>+	BCM47XX_GPIO_LED(4, "green", "bridge", 0, LEDS_GPIO_DEFSTATE_OFF),</div><div class='add'>+	BCM47XX_GPIO_LED_TRIGGER(6, "green", "status", 1, "timer"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_led</div><div class='add'>+bcm47xx_leds_luxul_xap_1240_v1[] __initconst = {</div><div class='add'>+	BCM47XX_GPIO_LED(3, "blue", "2ghz", 0, LEDS_GPIO_DEFSTATE_OFF),</div><div class='add'>+	BCM47XX_GPIO_LED(4, "green", "bridge", 0, LEDS_GPIO_DEFSTATE_OFF),</div><div class='add'>+	BCM47XX_GPIO_LED_TRIGGER(6, "green", "status", 1, "timer"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_led</div><div class='add'>+bcm47xx_leds_luxul_xap_1500_v1[] __initconst = {</div><div class='add'>+	BCM47XX_GPIO_LED_TRIGGER(13, "green", "status", 1, "timer"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_led</div><div class='add'>+bcm47xx_leds_luxul_xbr_4400_v1[] __initconst = {</div><div class='add'>+	BCM47XX_GPIO_LED(12, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),</div><div class='add'>+	BCM47XX_GPIO_LED_TRIGGER(15, "green", "status", 0, "timer"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_led</div><div class='add'>+bcm47xx_leds_luxul_xvw_p30_v1[] __initconst = {</div><div class='add'>+	BCM47XX_GPIO_LED_TRIGGER(0, "blue", "status", 1, "timer"),</div><div class='add'>+	BCM47XX_GPIO_LED(1, "green", "link", 1, LEDS_GPIO_DEFSTATE_OFF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_led</div><div class='add'>+bcm47xx_leds_luxul_xwr_600_v1[] __initconst = {</div><div class='add'>+	BCM47XX_GPIO_LED(3, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),</div><div class='add'>+	BCM47XX_GPIO_LED_TRIGGER(6, "green", "status", 1, "timer"),</div><div class='add'>+	BCM47XX_GPIO_LED(9, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gpio_led</div><div class='ctx'> bcm47xx_leds_luxul_xwr_1750_v1[] __initconst = {</div><div class='ctx'> 	BCM47XX_GPIO_LED(5, "green", "5ghz", 0, LEDS_GPIO_DEFSTATE_OFF),</div><div class='ctx'> 	BCM47XX_GPIO_LED(12, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),</div><div class='hunk'>@@ -633,6 +687,33 @@ void __init bcm47xx_leds_register(void)</div><div class='ctx'> 		bcm47xx_set_pdata(bcm47xx_leds_linksys_wrtsl54gs);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case BCM47XX_BOARD_LUXUL_ABR_4400_V1:</div><div class='add'>+		bcm47xx_set_pdata(bcm47xx_leds_luxul_abr_4400_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XAP_310_V1:</div><div class='add'>+		bcm47xx_set_pdata(bcm47xx_leds_luxul_xap_310_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XAP_1210_V1:</div><div class='add'>+		bcm47xx_set_pdata(bcm47xx_leds_luxul_xap_1210_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XAP_1230_V1:</div><div class='add'>+		bcm47xx_set_pdata(bcm47xx_leds_luxul_xap_1230_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XAP_1240_V1:</div><div class='add'>+		bcm47xx_set_pdata(bcm47xx_leds_luxul_xap_1240_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XAP_1500_V1:</div><div class='add'>+		bcm47xx_set_pdata(bcm47xx_leds_luxul_xap_1500_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XBR_4400_V1:</div><div class='add'>+		bcm47xx_set_pdata(bcm47xx_leds_luxul_xbr_4400_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XVW_P30_V1:</div><div class='add'>+		bcm47xx_set_pdata(bcm47xx_leds_luxul_xvw_p30_v1);</div><div class='add'>+		break;</div><div class='add'>+	case BCM47XX_BOARD_LUXUL_XWR_600_V1:</div><div class='add'>+		bcm47xx_set_pdata(bcm47xx_leds_luxul_xwr_600_v1);</div><div class='add'>+		break;</div><div class='ctx'> 	case BCM47XX_BOARD_LUXUL_XWR_1750_V1:</div><div class='ctx'> 		bcm47xx_set_pdata(bcm47xx_leds_luxul_xwr_1750_v1);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c<br/>index b49fc9cb9cad..73626040e4d6 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/bcm63xx/clk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/bcm63xx/clk.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/bcm63xx/clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/clk.c</a></div><div class='hunk'>@@ -6,7 +6,8 @@</div><div class='ctx'>  * Copyright (C) 2008 Maxime Bizon &lt;mbizon@freebox.fr&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='head'>diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c<br/>index 1c7c3fbfa1f3..f61c16f57a97 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/bcm63xx/cpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/bcm63xx/cpu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/bcm63xx/cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/cpu.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/cpu-info.h&gt;</div><div class='head'>diff --git a/arch/mips/bcm63xx/cs.c b/arch/mips/bcm63xx/cs.c<br/>index 50d8190bbf7b..29205badcf67 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/bcm63xx/cs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/bcm63xx/cs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/bcm63xx/cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/cs.c</a></div><div class='hunk'>@@ -7,7 +7,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='ctx'> #include &lt;bcm63xx_cpu.h&gt;</div><div class='head'>diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c<br/>index 7c256dadb166..16f353ac3441 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/bcm63xx/gpio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/bcm63xx/gpio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/bcm63xx/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/gpio.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/gpio/driver.h&gt;</div><div class='head'>diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c<br/>index c96139097ae2..ec694b9628c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/bcm63xx/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/bcm63xx/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/bcm63xx/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/irq.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/irq_cpu.h&gt;</div><div class='head'>diff --git a/arch/mips/bcm63xx/reset.c b/arch/mips/bcm63xx/reset.c<br/>index d1fe51edf5e6..a2af38cf28a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/bcm63xx/reset.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/bcm63xx/reset.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/bcm63xx/reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/reset.c</a></div><div class='hunk'>@@ -6,7 +6,8 @@</div><div class='ctx'>  * Copyright (C) 2012 Jonas Gorski &lt;jonas.gorski@gmail.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='head'>diff --git a/arch/mips/bcm63xx/timer.c b/arch/mips/bcm63xx/timer.c<br/>index 2110359c00e5..a86065854c0c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/bcm63xx/timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/bcm63xx/timer.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/bcm63xx/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/bcm63xx/timer.c</a></div><div class='hunk'>@@ -8,7 +8,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='head'>diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile<br/>index 90aca95fe314..c675eece389a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/compressed/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/compressed/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/compressed/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/compressed/Makefile</a></div><div class='hunk'>@@ -18,14 +18,14 @@ include $(srctree)/arch/mips/Kbuild.platforms</div><div class='ctx'> BOOT_HEAP_SIZE := 0x400000</div><div class='ctx'> </div><div class='ctx'> # Disable Function Tracer</div><div class='del'>-KBUILD_CFLAGS := $(shell echo $(KBUILD_CFLAGS) | sed -e "s/-pg//")</div><div class='add'>+KBUILD_CFLAGS := $(filter-out -pg, $(KBUILD_CFLAGS))</div><div class='ctx'> </div><div class='ctx'> KBUILD_CFLAGS := $(filter-out -fstack-protector, $(KBUILD_CFLAGS))</div><div class='ctx'> </div><div class='del'>-KBUILD_CFLAGS := $(LINUXINCLUDE) $(KBUILD_CFLAGS) -D__KERNEL__ \</div><div class='add'>+KBUILD_CFLAGS := $(KBUILD_CFLAGS) -D__KERNEL__ \</div><div class='ctx'> 	-DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull"</div><div class='ctx'> </div><div class='del'>-KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \</div><div class='add'>+KBUILD_AFLAGS := $(KBUILD_AFLAGS) -D__ASSEMBLY__ \</div><div class='ctx'> 	-DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \</div><div class='ctx'> 	-DKERNEL_ENTRY=$(VMLINUX_ENTRY_ADDRESS)</div><div class='ctx'> </div><div class='hunk'>@@ -84,6 +84,7 @@ else</div><div class='ctx'> VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \</div><div class='ctx'> 		$(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS))</div><div class='ctx'> endif</div><div class='add'>+UIMAGE_LOADADDR = $(VMLINUZ_LOAD_ADDRESS)</div><div class='ctx'> </div><div class='ctx'> vmlinuzobjs-y += $(obj)/piggy.o</div><div class='ctx'> </div><div class='hunk'>@@ -129,4 +130,7 @@ OBJCOPYFLAGS_vmlinuz.srec := $(OBJCOPYFLAGS) -S -O srec</div><div class='ctx'> vmlinuz.srec: vmlinuz</div><div class='ctx'> 	$(call cmd,objcopy)</div><div class='ctx'> </div><div class='add'>+uzImage.bin: vmlinuz.bin FORCE</div><div class='add'>+	$(call if_changed,uimage,none)</div><div class='add'>+</div><div class='ctx'> clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec}</div><div class='head'>diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile<br/>index fc7a0a98e9bf..b9db49203e0c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/Makefile</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> dts-dirs	+= brcm</div><div class='ctx'> dts-dirs	+= cavium-octeon</div><div class='add'>+dts-dirs	+= img</div><div class='ctx'> dts-dirs	+= ingenic</div><div class='ctx'> dts-dirs	+= lantiq</div><div class='ctx'> dts-dirs	+= mti</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm7125.dtsi b/arch/mips/boot/dts/brcm/bcm7125.dtsi<br/>index bbd00f65ce39..79f838ed96c5 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7125.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm7125.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7125.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7125.dtsi</a></div><div class='hunk'>@@ -91,15 +91,15 @@</div><div class='ctx'> 			compatible = "brcm,bcm7120-l2-intc";</div><div class='ctx'> 			reg = &lt;0x406780 0x8&gt;;</div><div class='ctx'> </div><div class='del'>-			brcm,int-map-mask = &lt;0x44&gt;, &lt;0xf000000&gt;;</div><div class='add'>+			brcm,int-map-mask = &lt;0x44&gt;, &lt;0xf000000&gt;, &lt;0x100000&gt;;</div><div class='ctx'> 			brcm,int-fwd-mask = &lt;0x70000&gt;;</div><div class='ctx'> </div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 			interrupt-parent = &lt;&amp;periph_intc&gt;;</div><div class='del'>-			interrupts = &lt;18&gt;, &lt;19&gt;;</div><div class='del'>-			interrupt-names = "upg_main", "upg_bsc";</div><div class='add'>+			interrupts = &lt;18&gt;, &lt;19&gt;, &lt;20&gt;;</div><div class='add'>+			interrupt-names = "upg_main", "upg_bsc", "upg_spi";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sun_top_ctrl: syscon@404000 {</div><div class='hunk'>@@ -226,5 +226,48 @@</div><div class='ctx'> 			interrupts = &lt;61&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		spi_l2_intc: interrupt-controller@411d00 {</div><div class='add'>+			compatible = "brcm,l2-intc";</div><div class='add'>+			reg = &lt;0x411d00 0x30&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;periph_intc&gt;;</div><div class='add'>+			interrupts = &lt;79&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qspi: spi@443000 {</div><div class='add'>+			#address-cells = &lt;0x1&gt;;</div><div class='add'>+			#size-cells = &lt;0x0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-qspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x440920 0x4 0x443200 0x188 0x443000 0x50&gt;;</div><div class='add'>+			reg-names = "cs_reg", "hif_mspi", "bspi";</div><div class='add'>+			interrupts = &lt;0x0 0x1 0x2 0x3 0x4 0x5 0x6&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;spi_l2_intc&gt;;</div><div class='add'>+			interrupt-names = "spi_lr_fullness_reached",</div><div class='add'>+					  "spi_lr_session_aborted",</div><div class='add'>+					  "spi_lr_impatient",</div><div class='add'>+					  "spi_lr_session_done",</div><div class='add'>+					  "spi_lr_overread",</div><div class='add'>+					  "mspi_done",</div><div class='add'>+					  "mspi_halted";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mspi: spi@406400 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-mspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x406400 0x180&gt;;</div><div class='add'>+			reg-names = "mspi";</div><div class='add'>+			interrupts = &lt;0x14&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;upg_irq0_intc&gt;;</div><div class='add'>+			interrupt-names = "mspi_done";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm7346.dtsi b/arch/mips/boot/dts/brcm/bcm7346.dtsi<br/>index 4bbcc95f1c15..da7bfa45a57d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7346.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm7346.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7346.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7346.dtsi</a></div><div class='hunk'>@@ -439,5 +439,48 @@</div><div class='ctx'> 			interrupts = &lt;85&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		spi_l2_intc: interrupt-controller@411d00 {</div><div class='add'>+			compatible = "brcm,l2-intc";</div><div class='add'>+			reg = &lt;0x411d00 0x30&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;periph_intc&gt;;</div><div class='add'>+			interrupts = &lt;31&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qspi: spi@413000 {</div><div class='add'>+			#address-cells = &lt;0x1&gt;;</div><div class='add'>+			#size-cells = &lt;0x0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-qspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x410920 0x4 0x413200 0x188 0x413000 0x50&gt;;</div><div class='add'>+			reg-names = "cs_reg", "hif_mspi", "bspi";</div><div class='add'>+			interrupts = &lt;0x0 0x1 0x2 0x3 0x4 0x5 0x6&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;spi_l2_intc&gt;;</div><div class='add'>+			interrupt-names = "spi_lr_fullness_reached",</div><div class='add'>+					  "spi_lr_session_aborted",</div><div class='add'>+					  "spi_lr_impatient",</div><div class='add'>+					  "spi_lr_session_done",</div><div class='add'>+					  "spi_lr_overread",</div><div class='add'>+					  "mspi_done",</div><div class='add'>+					  "mspi_halted";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mspi: spi@408a00 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-mspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x408a00 0x180&gt;;</div><div class='add'>+			reg-names = "mspi";</div><div class='add'>+			interrupts = &lt;0x14&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;upg_aon_irq0_intc&gt;;</div><div class='add'>+			interrupt-names = "mspi_done";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm7358.dtsi b/arch/mips/boot/dts/brcm/bcm7358.dtsi<br/>index 3e42535c8d29..9b05760453f0 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7358.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm7358.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7358.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7358.dtsi</a></div><div class='hunk'>@@ -318,5 +318,48 @@</div><div class='ctx'> 			interrupts = &lt;24&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		spi_l2_intc: interrupt-controller@411d00 {</div><div class='add'>+			compatible = "brcm,l2-intc";</div><div class='add'>+			reg = &lt;0x411d00 0x30&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;periph_intc&gt;;</div><div class='add'>+			interrupts = &lt;31&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qspi: spi@413000 {</div><div class='add'>+			#address-cells = &lt;0x1&gt;;</div><div class='add'>+			#size-cells = &lt;0x0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-qspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x410920 0x4 0x413200 0x188 0x413000 0x50&gt;;</div><div class='add'>+			reg-names = "cs_reg", "hif_mspi", "bspi";</div><div class='add'>+			interrupts = &lt;0x0 0x1 0x2 0x3 0x4 0x5 0x6&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;spi_l2_intc&gt;;</div><div class='add'>+			interrupt-names = "spi_lr_fullness_reached",</div><div class='add'>+					  "spi_lr_session_aborted",</div><div class='add'>+					  "spi_lr_impatient",</div><div class='add'>+					  "spi_lr_session_done",</div><div class='add'>+					  "spi_lr_overread",</div><div class='add'>+					  "mspi_done",</div><div class='add'>+					  "mspi_halted";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mspi: spi@408a00 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-mspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x408a00 0x180&gt;;</div><div class='add'>+			reg-names = "mspi";</div><div class='add'>+			interrupts = &lt;0x14&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;upg_aon_irq0_intc&gt;;</div><div class='add'>+			interrupt-names = "mspi_done";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm7360.dtsi b/arch/mips/boot/dts/brcm/bcm7360.dtsi<br/>index 112a5571c596..57b613c6acf2 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7360.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm7360.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7360.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7360.dtsi</a></div><div class='hunk'>@@ -358,5 +358,48 @@</div><div class='ctx'> 			interrupts = &lt;82&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		spi_l2_intc: interrupt-controller@411d00 {</div><div class='add'>+			compatible = "brcm,l2-intc";</div><div class='add'>+			reg = &lt;0x411d00 0x30&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;periph_intc&gt;;</div><div class='add'>+			interrupts = &lt;31&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qspi: spi@413000 {</div><div class='add'>+			#address-cells = &lt;0x1&gt;;</div><div class='add'>+			#size-cells = &lt;0x0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-qspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x410920 0x4 0x413200 0x188 0x413000 0x50&gt;;</div><div class='add'>+			reg-names = "cs_reg", "hif_mspi", "bspi";</div><div class='add'>+			interrupts = &lt;0x0 0x1 0x2 0x3 0x4 0x5 0x6&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;spi_l2_intc&gt;;</div><div class='add'>+			interrupt-names = "spi_lr_fullness_reached",</div><div class='add'>+					  "spi_lr_session_aborted",</div><div class='add'>+					  "spi_lr_impatient",</div><div class='add'>+					  "spi_lr_session_done",</div><div class='add'>+					  "spi_lr_overread",</div><div class='add'>+					  "mspi_done",</div><div class='add'>+					  "mspi_halted";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mspi: spi@408a00 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-mspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x408a00 0x180&gt;;</div><div class='add'>+			reg-names = "mspi";</div><div class='add'>+			interrupts = &lt;0x14&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;upg_aon_irq0_intc&gt;;</div><div class='add'>+			interrupt-names = "mspi_done";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm7362.dtsi b/arch/mips/boot/dts/brcm/bcm7362.dtsi<br/>index 34abfb0b07e7..c2a2843aaa9a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7362.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm7362.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7362.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7362.dtsi</a></div><div class='hunk'>@@ -354,5 +354,48 @@</div><div class='ctx'> 			interrupts = &lt;82&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		spi_l2_intc: interrupt-controller@411d00 {</div><div class='add'>+			compatible = "brcm,l2-intc";</div><div class='add'>+			reg = &lt;0x411d00 0x30&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;periph_intc&gt;;</div><div class='add'>+			interrupts = &lt;31&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qspi: spi@413000 {</div><div class='add'>+			#address-cells = &lt;0x1&gt;;</div><div class='add'>+			#size-cells = &lt;0x0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-qspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x410920 0x4 0x413200 0x188 0x413000 0x50&gt;;</div><div class='add'>+			reg-names = "cs_reg", "hif_mspi", "bspi";</div><div class='add'>+			interrupts = &lt;0x0 0x1 0x2 0x3 0x4 0x5 0x6&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;spi_l2_intc&gt;;</div><div class='add'>+			interrupt-names = "spi_lr_fullness_reached",</div><div class='add'>+					  "spi_lr_session_aborted",</div><div class='add'>+					  "spi_lr_impatient",</div><div class='add'>+					  "spi_lr_session_done",</div><div class='add'>+					  "spi_lr_overread",</div><div class='add'>+					  "mspi_done",</div><div class='add'>+					  "mspi_halted";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mspi: spi@408a00 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-mspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x408a00 0x180&gt;;</div><div class='add'>+			reg-names = "mspi";</div><div class='add'>+			interrupts = &lt;0x14&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;upg_aon_irq0_intc&gt;;</div><div class='add'>+			interrupt-names = "mspi_done";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm7420.dtsi b/arch/mips/boot/dts/brcm/bcm7420.dtsi<br/>index b143723c674e..532fc8a15796 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7420.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm7420.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7420.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7420.dtsi</a></div><div class='hunk'>@@ -92,15 +92,15 @@</div><div class='ctx'> 			compatible = "brcm,bcm7120-l2-intc";</div><div class='ctx'> 			reg = &lt;0x406780 0x8&gt;;</div><div class='ctx'> </div><div class='del'>-			brcm,int-map-mask = &lt;0x44&gt;, &lt;0x1f000000&gt;;</div><div class='add'>+			brcm,int-map-mask = &lt;0x44&gt;, &lt;0x1f000000&gt;, &lt;0x100000&gt;;</div><div class='ctx'> 			brcm,int-fwd-mask = &lt;0x70000&gt;;</div><div class='ctx'> </div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 			interrupt-parent = &lt;&amp;periph_intc&gt;;</div><div class='del'>-			interrupts = &lt;18&gt;, &lt;19&gt;;</div><div class='del'>-			interrupt-names = "upg_main", "upg_bsc";</div><div class='add'>+			interrupts = &lt;18&gt;, &lt;19&gt;, &lt;20&gt;;</div><div class='add'>+			interrupt-names = "upg_main", "upg_bsc", "upg_spi";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		sun_top_ctrl: syscon@404000 {</div><div class='hunk'>@@ -287,5 +287,48 @@</div><div class='ctx'> 			interrupts = &lt;62&gt;;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		spi_l2_intc: interrupt-controller@411d00 {</div><div class='add'>+			compatible = "brcm,l2-intc";</div><div class='add'>+			reg = &lt;0x411d00 0x30&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;periph_intc&gt;;</div><div class='add'>+			interrupts = &lt;78&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qspi: spi@443000 {</div><div class='add'>+			#address-cells = &lt;0x1&gt;;</div><div class='add'>+			#size-cells = &lt;0x0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-qspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x440920 0x4 0x443200 0x188 0x443000 0x50&gt;;</div><div class='add'>+			reg-names = "cs_reg", "hif_mspi", "bspi";</div><div class='add'>+			interrupts = &lt;0x0 0x1 0x2 0x3 0x4 0x5 0x6&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;spi_l2_intc&gt;;</div><div class='add'>+			interrupt-names = "spi_lr_fullness_reached",</div><div class='add'>+					  "spi_lr_session_aborted",</div><div class='add'>+					  "spi_lr_impatient",</div><div class='add'>+					  "spi_lr_session_done",</div><div class='add'>+					  "spi_lr_overread",</div><div class='add'>+					  "mspi_done",</div><div class='add'>+					  "mspi_halted";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mspi: spi@406400 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-mspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x406400 0x180&gt;;</div><div class='add'>+			reg-names = "mspi";</div><div class='add'>+			interrupts = &lt;0x14&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;upg_irq0_intc&gt;;</div><div class='add'>+			interrupt-names = "mspi_done";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm7425.dtsi b/arch/mips/boot/dts/brcm/bcm7425.dtsi<br/>index 2488d2f61f60..f56fb25f2e6b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7425.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm7425.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7425.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7425.dtsi</a></div><div class='hunk'>@@ -450,5 +450,48 @@</div><div class='ctx'> 			mmc-hs200-1_8v;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		spi_l2_intc: interrupt-controller@41ad00 {</div><div class='add'>+			compatible = "brcm,l2-intc";</div><div class='add'>+			reg = &lt;0x41ad00 0x30&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;periph_intc&gt;;</div><div class='add'>+			interrupts = &lt;25&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qspi: spi@41c000 {</div><div class='add'>+			#address-cells = &lt;0x1&gt;;</div><div class='add'>+			#size-cells = &lt;0x0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-qspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x419920 0x4 0x41c200 0x188 0x41c000 0x50&gt;;</div><div class='add'>+			reg-names = "cs_reg", "hif_mspi", "bspi";</div><div class='add'>+			interrupts = &lt;0x0 0x1 0x2 0x3 0x4 0x5 0x6&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;spi_l2_intc&gt;;</div><div class='add'>+			interrupt-names = "spi_lr_fullness_reached",</div><div class='add'>+					  "spi_lr_session_aborted",</div><div class='add'>+					  "spi_lr_impatient",</div><div class='add'>+					  "spi_lr_session_done",</div><div class='add'>+					  "spi_lr_overread",</div><div class='add'>+					  "mspi_done",</div><div class='add'>+					  "mspi_halted";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mspi: spi@409200 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-mspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x409200 0x180&gt;;</div><div class='add'>+			reg-names = "mspi";</div><div class='add'>+			interrupts = &lt;0x14&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;upg_aon_irq0_intc&gt;;</div><div class='add'>+			interrupt-names = "mspi_done";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm7435.dtsi b/arch/mips/boot/dts/brcm/bcm7435.dtsi<br/>index 19fa259b968b..f2cead2eae5c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7435.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm7435.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm7435.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm7435.dtsi</a></div><div class='hunk'>@@ -465,5 +465,48 @@</div><div class='ctx'> 			mmc-hs200-1_8v;</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		spi_l2_intc: interrupt-controller@41bd00 {</div><div class='add'>+			compatible = "brcm,l2-intc";</div><div class='add'>+			reg = &lt;0x41bd00 0x30&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;periph_intc&gt;;</div><div class='add'>+			interrupts = &lt;25&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qspi: spi@41d200 {</div><div class='add'>+			#address-cells = &lt;0x1&gt;;</div><div class='add'>+			#size-cells = &lt;0x0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-qspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x41a920 0x4 0x41d400 0x188 0x41d200 0x50&gt;;</div><div class='add'>+			reg-names = "cs_reg", "hif_mspi", "bspi";</div><div class='add'>+			interrupts = &lt;0x0 0x1 0x2 0x3 0x4 0x5 0x6&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;spi_l2_intc&gt;;</div><div class='add'>+			interrupt-names = "spi_lr_fullness_reached",</div><div class='add'>+					  "spi_lr_session_aborted",</div><div class='add'>+					  "spi_lr_impatient",</div><div class='add'>+					  "spi_lr_session_done",</div><div class='add'>+					  "spi_lr_overread",</div><div class='add'>+					  "mspi_done",</div><div class='add'>+					  "mspi_halted";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		mspi: spi@409200 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			compatible = "brcm,spi-bcm-qspi",</div><div class='add'>+				     "brcm,spi-brcmstb-mspi";</div><div class='add'>+			clocks = &lt;&amp;upg_clk&gt;;</div><div class='add'>+			reg = &lt;0x409200 0x180&gt;;</div><div class='add'>+			reg-names = "mspi";</div><div class='add'>+			interrupts = &lt;0x14&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;upg_aon_irq0_intc&gt;;</div><div class='add'>+			interrupt-names = "mspi_done";</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm97125cbmb.dts b/arch/mips/boot/dts/brcm/bcm97125cbmb.dts<br/>index 5c24eacd72dd..d72bc423ceaa 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97125cbmb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm97125cbmb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97125cbmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97125cbmb.dts</a></div><div class='hunk'>@@ -57,3 +57,7 @@</div><div class='ctx'> &amp;ohci0 {</div><div class='ctx'> 	status = "disabled";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;mspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts b/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts<br/>index e67eaf30de3d..ea52d7b5772f 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm97346dbsmb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97346dbsmb.dts</a></div><div class='hunk'>@@ -109,3 +109,7 @@</div><div class='ctx'> &amp;sdhci0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;mspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm97358svmb.dts b/arch/mips/boot/dts/brcm/bcm97358svmb.dts<br/>index ee4607fae47a..71357fdc19af 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97358svmb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm97358svmb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97358svmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97358svmb.dts</a></div><div class='hunk'>@@ -69,3 +69,39 @@</div><div class='ctx'> &amp;nand {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	m25p80@0 {</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;40000000&gt;;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+		use-bspi;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+</div><div class='add'>+		partitions {</div><div class='add'>+			compatible = "fixed-partitions";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			flash0.cfe@0 {</div><div class='add'>+				reg = &lt;0x0 0x200000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			flash0.mac@200000 {</div><div class='add'>+				reg = &lt;0x200000 0x40000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			flash0.nvram@240000 {</div><div class='add'>+				reg = &lt;0x240000 0x10000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm97360svmb.dts b/arch/mips/boot/dts/brcm/bcm97360svmb.dts<br/>index bed821b03013..e2fed406c6ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97360svmb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm97360svmb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97360svmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97360svmb.dts</a></div><div class='hunk'>@@ -72,3 +72,39 @@</div><div class='ctx'> &amp;sdhci0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	m25p80@0 {</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;40000000&gt;;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+		use-bspi;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+</div><div class='add'>+		partitions {</div><div class='add'>+			compatible = "fixed-partitions";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			flash0.cfe@0 {</div><div class='add'>+				reg = &lt;0x0 0x200000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			flash0.mac@200000 {</div><div class='add'>+				reg = &lt;0x200000 0x40000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			flash0.nvram@240000 {</div><div class='add'>+				reg = &lt;0x240000 0x10000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm97362svmb.dts b/arch/mips/boot/dts/brcm/bcm97362svmb.dts<br/>index 68fd823868e0..78bffdf11872 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97362svmb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm97362svmb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97362svmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97362svmb.dts</a></div><div class='hunk'>@@ -73,3 +73,7 @@</div><div class='ctx'> &amp;sdhci0 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;mspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm97420c.dts b/arch/mips/boot/dts/brcm/bcm97420c.dts<br/>index e66271af055e..d62b448a152d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97420c.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm97420c.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97420c.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97420c.dts</a></div><div class='hunk'>@@ -79,3 +79,7 @@</div><div class='ctx'> &amp;ohci1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;mspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm97425svmb.dts b/arch/mips/boot/dts/brcm/bcm97425svmb.dts<br/>index f95ba1bf3e58..73aa006bd9ce 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97425svmb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm97425svmb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97425svmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97425svmb.dts</a></div><div class='hunk'>@@ -107,3 +107,39 @@</div><div class='ctx'> &amp;sdhci1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;qspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	m25p80@0 {</div><div class='add'>+		compatible = "m25p80";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;40000000&gt;;</div><div class='add'>+		spi-cpol;</div><div class='add'>+		spi-cpha;</div><div class='add'>+		use-bspi;</div><div class='add'>+		m25p,fast-read;</div><div class='add'>+</div><div class='add'>+		partitions {</div><div class='add'>+			compatible = "fixed-partitions";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+			flash0.cfe@0 {</div><div class='add'>+				reg = &lt;0x0 0x200000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			flash0.mac@200000 {</div><div class='add'>+				reg = &lt;0x200000 0x40000&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			flash0.nvram@240000 {</div><div class='add'>+				reg = &lt;0x240000 0x10000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;mspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/boot/dts/brcm/bcm97435svmb.dts b/arch/mips/boot/dts/brcm/bcm97435svmb.dts<br/>index fb37b7111bf4..0a915f3feab6 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97435svmb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/brcm/bcm97435svmb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/brcm/bcm97435svmb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/brcm/bcm97435svmb.dts</a></div><div class='hunk'>@@ -115,3 +115,7 @@</div><div class='ctx'> &amp;sdhci1 {</div><div class='ctx'> 	status = "okay";</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;mspi {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/boot/dts/img/Makefile b/arch/mips/boot/dts/img/Makefile<br/>new file mode 100644<br/>index 000000000000..69a65f0f82d2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/img/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/img/Makefile</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+dtb-$(CONFIG_MACH_PISTACHIO)	+= pistachio_marduk.dtb</div><div class='add'>+</div><div class='add'>+obj-y				+= $(patsubst %.dtb, %.dtb.o, $(dtb-y))</div><div class='add'>+</div><div class='add'>+# Force kbuild to make empty built-in.o if necessary</div><div class='add'>+obj-				+= dummy.o</div><div class='add'>+</div><div class='add'>+always				:= $(dtb-y)</div><div class='add'>+clean-files			:= *.dtb *.dtb.S</div><div class='head'>diff --git a/arch/mips/boot/dts/img/pistachio.dtsi b/arch/mips/boot/dts/img/pistachio.dtsi<br/>new file mode 100644<br/>index 000000000000..57809f6a5864<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/img/pistachio.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/img/pistachio.dtsi</a></div><div class='hunk'>@@ -0,0 +1,924 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015, 2016 Imagination Technologies Ltd.</div><div class='add'>+ * Copyright (C) 2015 Google, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/pistachio-clk.h&gt;</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</div><div class='add'>+#include &lt;dt-bindings/interrupt-controller/mips-gic.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/pistachio-resets.h&gt;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "img,pistachio";</div><div class='add'>+</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		cpu0: cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			compatible = "mti,interaptiv";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			clocks = &lt;&amp;clk_core CLK_MIPS_PLL&gt;;</div><div class='add'>+			clock-names = "cpu";</div><div class='add'>+			clock-latency = &lt;1000&gt;;</div><div class='add'>+			operating-points = &lt;</div><div class='add'>+				/* kHz    uV(dummy) */</div><div class='add'>+				546000 1150000</div><div class='add'>+				520000 1100000</div><div class='add'>+				494000 1000000</div><div class='add'>+				468000 950000</div><div class='add'>+				442000 900000</div><div class='add'>+				416000 800000</div><div class='add'>+			&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c0: i2c@18100000 {</div><div class='add'>+		compatible = "img,scb-i2c";</div><div class='add'>+		reg = &lt;0x18100000 0x200&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 2 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_periph PERIPH_CLK_I2C0&gt;,</div><div class='add'>+			 &lt;&amp;cr_periph SYS_CLK_I2C0&gt;;</div><div class='add'>+		clock-names = "scb", "sys";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_periph PERIPH_CLK_I2C0_PRE_DIV&gt;,</div><div class='add'>+				  &lt;&amp;clk_periph PERIPH_CLK_I2C0_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;100000000&gt;, &lt;33333334&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;i2c0_pins&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c1: i2c@18100200 {</div><div class='add'>+		compatible = "img,scb-i2c";</div><div class='add'>+		reg = &lt;0x18100200 0x200&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 3 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_periph PERIPH_CLK_I2C1&gt;,</div><div class='add'>+			 &lt;&amp;cr_periph SYS_CLK_I2C1&gt;;</div><div class='add'>+		clock-names = "scb", "sys";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_periph PERIPH_CLK_I2C1_PRE_DIV&gt;,</div><div class='add'>+				  &lt;&amp;clk_periph PERIPH_CLK_I2C1_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;100000000&gt;, &lt;33333334&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;i2c1_pins&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c2: i2c@18100400 {</div><div class='add'>+		compatible = "img,scb-i2c";</div><div class='add'>+		reg = &lt;0x18100400 0x200&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 4 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_periph PERIPH_CLK_I2C2&gt;,</div><div class='add'>+			 &lt;&amp;cr_periph SYS_CLK_I2C2&gt;;</div><div class='add'>+		clock-names = "scb", "sys";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_periph PERIPH_CLK_I2C2_PRE_DIV&gt;,</div><div class='add'>+				  &lt;&amp;clk_periph PERIPH_CLK_I2C2_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;100000000&gt;, &lt;33333334&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;i2c2_pins&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c3: i2c@18100600 {</div><div class='add'>+		compatible = "img,scb-i2c";</div><div class='add'>+		reg = &lt;0x18100600 0x200&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 5 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_periph PERIPH_CLK_I2C3&gt;,</div><div class='add'>+			 &lt;&amp;cr_periph SYS_CLK_I2C3&gt;;</div><div class='add'>+		clock-names = "scb", "sys";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_periph PERIPH_CLK_I2C3_PRE_DIV&gt;,</div><div class='add'>+				  &lt;&amp;clk_periph PERIPH_CLK_I2C3_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;100000000&gt;, &lt;33333334&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;i2c3_pins&gt;;</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2s_in: i2s-in@18100800 {</div><div class='add'>+		compatible = "img,i2s-in";</div><div class='add'>+		reg = &lt;0x18100800 0x200&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 7 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		dmas = &lt;&amp;mdc 30 0xffffffff 0&gt;;</div><div class='add'>+		dma-names = "rx";</div><div class='add'>+		clocks = &lt;&amp;cr_periph SYS_CLK_I2S_IN&gt;;</div><div class='add'>+		clock-names = "sys";</div><div class='add'>+		img,i2s-channels = &lt;6&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;i2s_in_pins&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2s_out: i2s-out@18100a00 {</div><div class='add'>+		compatible = "img,i2s-out";</div><div class='add'>+		reg = &lt;0x18100a00 0x200&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 13 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		dmas = &lt;&amp;mdc 23 0xffffffff 0&gt;;</div><div class='add'>+		dma-names = "tx";</div><div class='add'>+		clocks = &lt;&amp;cr_periph SYS_CLK_I2S_OUT&gt;,</div><div class='add'>+			 &lt;&amp;clk_core CLK_I2S&gt;;</div><div class='add'>+		clock-names = "sys", "ref";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_core CLK_I2S_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;12288000&gt;;</div><div class='add'>+		img,i2s-channels = &lt;6&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;i2s_out_pins&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+		resets = &lt;&amp;pistachio_reset PISTACHIO_RESET_I2S_OUT&gt;;</div><div class='add'>+		reset-names = "rst";</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	parallel_out: parallel-audio-out@18100c00 {</div><div class='add'>+		compatible = "img,parallel-out";</div><div class='add'>+		reg = &lt;0x18100c00 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 19 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		dmas = &lt;&amp;mdc 16 0xffffffff 0&gt;;</div><div class='add'>+		dma-names = "tx";</div><div class='add'>+		clocks = &lt;&amp;cr_periph SYS_CLK_PAUD_OUT&gt;,</div><div class='add'>+			 &lt;&amp;clk_core CLK_AUDIO_DAC&gt;;</div><div class='add'>+		clock-names = "sys", "ref";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_core CLK_AUDIO_DAC_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;12288000&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+		resets = &lt;&amp;pistachio_reset PISTACHIO_RESET_PRL_OUT&gt;;</div><div class='add'>+		reset-names = "rst";</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spdif_out: spdif-out@18100d00 {</div><div class='add'>+		compatible = "img,spdif-out";</div><div class='add'>+		reg = &lt;0x18100d00 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 21 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		dmas = &lt;&amp;mdc 14 0xffffffff 0&gt;;</div><div class='add'>+		dma-names = "tx";</div><div class='add'>+		clocks = &lt;&amp;cr_periph SYS_CLK_SPDIF_OUT&gt;,</div><div class='add'>+			 &lt;&amp;clk_core CLK_SPDIF&gt;;</div><div class='add'>+		clock-names = "sys", "ref";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_core CLK_SPDIF_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;12288000&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;spdif_out_pin&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+		resets = &lt;&amp;pistachio_reset PISTACHIO_RESET_SPDIF_OUT&gt;;</div><div class='add'>+		reset-names = "rst";</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spdif_in: spdif-in@18100e00 {</div><div class='add'>+		compatible = "img,spdif-in";</div><div class='add'>+		reg = &lt;0x18100e00 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 20 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		dmas = &lt;&amp;mdc 15 0xffffffff 0&gt;;</div><div class='add'>+		dma-names = "rx";</div><div class='add'>+		clocks = &lt;&amp;cr_periph SYS_CLK_SPDIF_IN&gt;;</div><div class='add'>+		clock-names = "sys";</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		pinctrl-0 = &lt;&amp;spdif_in_pin&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	internal_dac: internal-dac {</div><div class='add'>+		compatible = "img,pistachio-internal-dac";</div><div class='add'>+		img,cr-top = &lt;&amp;cr_top&gt;;</div><div class='add'>+		img,voltage-select = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		#sound-dai-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spfi0: spi@18100f00 {</div><div class='add'>+		compatible = "img,spfi";</div><div class='add'>+		reg = &lt;0x18100f00 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 22 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_core CLK_SPI0&gt;, &lt;&amp;cr_periph SYS_CLK_SPI0_MASTER&gt;;</div><div class='add'>+		clock-names = "sys", "spfi";</div><div class='add'>+		dmas = &lt;&amp;mdc 9 0xffffffff 0&gt;, &lt;&amp;mdc 10 0xffffffff 0&gt;;</div><div class='add'>+		dma-names = "rx", "tx";</div><div class='add'>+		spfi-max-frequency = &lt;50000000&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spfi1: spi@18101000 {</div><div class='add'>+		compatible = "img,spfi";</div><div class='add'>+		reg = &lt;0x18101000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 26 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_core CLK_SPI1&gt;, &lt;&amp;cr_periph SYS_CLK_SPI1&gt;;</div><div class='add'>+		clock-names = "sys", "spfi";</div><div class='add'>+		dmas = &lt;&amp;mdc 1 0xffffffff 0&gt;, &lt;&amp;mdc 2 0xffffffff 0&gt;;</div><div class='add'>+		dma-names = "rx", "tx";</div><div class='add'>+		img,supports-quad-mode;</div><div class='add'>+		spfi-max-frequency = &lt;50000000&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pwm: pwm@18101300 {</div><div class='add'>+		compatible = "img,pistachio-pwm";</div><div class='add'>+		reg = &lt;0x18101300 0x100&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_periph PERIPH_CLK_PWM&gt;,</div><div class='add'>+			 &lt;&amp;cr_periph SYS_CLK_PWM&gt;;</div><div class='add'>+		clock-names = "pwm", "sys";</div><div class='add'>+		img,cr-periph = &lt;&amp;cr_periph&gt;;</div><div class='add'>+		#pwm-cells = &lt;2&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart0: uart@18101400 {</div><div class='add'>+		compatible = "snps,dw-apb-uart";</div><div class='add'>+		reg = &lt;0x18101400 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_core CLK_UART0&gt;, &lt;&amp;cr_periph SYS_CLK_UART0&gt;;</div><div class='add'>+		clock-names = "baudclk", "apb_pclk";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_core CLK_UART0_INTERNAL_DIV&gt;,</div><div class='add'>+				  &lt;&amp;clk_core CLK_UART0_DIV&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		reg-io-width = &lt;4&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;uart0_pins&gt;, &lt;&amp;uart0_rts_cts_pins&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	uart1: uart@18101500 {</div><div class='add'>+		compatible = "snps,dw-apb-uart";</div><div class='add'>+		reg = &lt;0x18101500 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_core CLK_UART1&gt;, &lt;&amp;cr_periph SYS_CLK_UART1&gt;;</div><div class='add'>+		clock-names = "baudclk", "apb_pclk";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_core CLK_UART1_INTERNAL_DIV&gt;,</div><div class='add'>+				  &lt;&amp;clk_core CLK_UART1_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;114278400&gt;, &lt;1843200&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		reg-io-width = &lt;4&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;uart1_pins&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	adc: adc@18101600 {</div><div class='add'>+		compatible = "cosmic,10001-adc";</div><div class='add'>+		reg = &lt;0x18101600 0x24&gt;;</div><div class='add'>+		adc-reserved-channels = &lt;0x30&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_core CLK_AUX_ADC&gt;;</div><div class='add'>+		clock-names = "adc";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_core CLK_AUX_ADC_INTERNAL_DIV&gt;,</div><div class='add'>+				  &lt;&amp;clk_core CLK_AUX_ADC_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;100000000&gt;, &lt;1000000&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+</div><div class='add'>+		#io-channel-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinctrl: pinctrl@18101c00 {</div><div class='add'>+		compatible = "img,pistachio-system-pinctrl";</div><div class='add'>+		reg = &lt;0x18101c00 0x400&gt;;</div><div class='add'>+</div><div class='add'>+		gpio0: gpio0 {</div><div class='add'>+			interrupts = &lt;GIC_SHARED 71 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			gpio-ranges = &lt;&amp;pinctrl 0 0 16&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio1: gpio1 {</div><div class='add'>+			interrupts = &lt;GIC_SHARED 72 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			gpio-ranges = &lt;&amp;pinctrl 0 16 16&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio2: gpio2 {</div><div class='add'>+			interrupts = &lt;GIC_SHARED 73 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			gpio-ranges = &lt;&amp;pinctrl 0 32 16&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio3: gpio3 {</div><div class='add'>+			interrupts = &lt;GIC_SHARED 74 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			gpio-ranges = &lt;&amp;pinctrl 0 48 16&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio4: gpio4 {</div><div class='add'>+			interrupts = &lt;GIC_SHARED 75 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			gpio-ranges = &lt;&amp;pinctrl 0 64 16&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpio5: gpio5 {</div><div class='add'>+			interrupts = &lt;GIC_SHARED 76 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+			gpio-controller;</div><div class='add'>+			#gpio-cells = &lt;2&gt;;</div><div class='add'>+			gpio-ranges = &lt;&amp;pinctrl 0 80 10&gt;;</div><div class='add'>+</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c0_pins: i2c0-pins {</div><div class='add'>+			pin_i2c0: i2c0 {</div><div class='add'>+				pins = "mfio28", "mfio29";</div><div class='add'>+				function = "i2c0";</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c1_pins: i2c1-pins {</div><div class='add'>+			pin_i2c1: i2c1 {</div><div class='add'>+				pins = "mfio30", "mfio31";</div><div class='add'>+				function = "i2c1";</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c2_pins: i2c2-pins {</div><div class='add'>+			pin_i2c2: i2c2 {</div><div class='add'>+				pins = "mfio32", "mfio33";</div><div class='add'>+				function = "i2c2";</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c3_pins: i2c3-pins {</div><div class='add'>+			pin_i2c3: i2c3 {</div><div class='add'>+				pins = "mfio34", "mfio35";</div><div class='add'>+				function = "i2c3";</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim0_pins: spim0-pins {</div><div class='add'>+			pin_spim0: spim0 {</div><div class='add'>+				pins = "mfio9", "mfio10";</div><div class='add'>+				function = "spim0";</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+			spim0_clk: spim0-clk {</div><div class='add'>+				pins = "mfio8";</div><div class='add'>+				function = "spim0";</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim0_cs0_alt_pin: spim0-cs0-alt-pin {</div><div class='add'>+			spim0-cs0 {</div><div class='add'>+				pins = "mfio2";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim0_cs1_pin: spim0-cs1-pin {</div><div class='add'>+			spim0-cs1 {</div><div class='add'>+				pins = "mfio1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim0_cs2_pin: spim0-cs2-pin {</div><div class='add'>+			spim0-cs2 {</div><div class='add'>+				pins = "mfio55";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim0_cs2_alt_pin: spim0-cs2-alt-pin {</div><div class='add'>+			spim0-cs2 {</div><div class='add'>+				pins = "mfio28";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim0_cs3_pin: spim0-cs3-pin {</div><div class='add'>+			spim0-cs3 {</div><div class='add'>+				pins = "mfio56";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim0_cs3_alt_pin: spim0-cs3-alt-pin {</div><div class='add'>+			spim0-cs3 {</div><div class='add'>+				pins = "mfio29";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim0_cs4_pin: spim0-cs4-pin {</div><div class='add'>+			spim0-cs4 {</div><div class='add'>+				pins = "mfio57";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim0_cs4_alt_pin: spim0-cs4-alt-pin {</div><div class='add'>+			spim0-cs4 {</div><div class='add'>+				pins = "mfio30";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim1_pins: spim1-pins {</div><div class='add'>+			spim1 {</div><div class='add'>+				pins = "mfio3", "mfio4", "mfio5";</div><div class='add'>+				function = "spim1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim1_quad_pins: spim1-quad-pins {</div><div class='add'>+			spim1-quad {</div><div class='add'>+				pins = "mfio6", "mfio7";</div><div class='add'>+				function = "spim1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim1_cs0_pin: spim1-cs0-pins {</div><div class='add'>+			spim1-cs0 {</div><div class='add'>+				pins = "mfio0";</div><div class='add'>+				function = "spim1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim1_cs1_pin: spim1-cs1-pin {</div><div class='add'>+			spim1-cs1 {</div><div class='add'>+				pins = "mfio1";</div><div class='add'>+				function = "spim1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim1_cs1_alt_pin: spim1-cs1-alt-pin {</div><div class='add'>+			spim1-cs1 {</div><div class='add'>+				pins = "mfio58";</div><div class='add'>+				function = "spim1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim1_cs2_pin: spim1-cs2-pin {</div><div class='add'>+			spim1-cs2 {</div><div class='add'>+				pins = "mfio2";</div><div class='add'>+				function = "spim1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim1_cs2_alt0_pin: spim1-cs2-alt0-pin {</div><div class='add'>+			spim1-cs2 {</div><div class='add'>+				pins = "mfio31";</div><div class='add'>+				function = "spim1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim1_cs2_alt1_pin: spim1-cs2-alt1-pin {</div><div class='add'>+			spim1-cs2 {</div><div class='add'>+				pins = "mfio55";</div><div class='add'>+				function = "spim1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim1_cs3_pin: spim1-cs3-pin {</div><div class='add'>+			spim1-cs3 {</div><div class='add'>+				pins = "mfio56";</div><div class='add'>+				function = "spim1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spim1_cs4_pin: spim1-cs4-pin {</div><div class='add'>+			spim1-cs4 {</div><div class='add'>+				pins = "mfio57";</div><div class='add'>+				function = "spim1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart0_pins: uart0-pins {</div><div class='add'>+			uart0 {</div><div class='add'>+				pins = "mfio55", "mfio56";</div><div class='add'>+				function = "uart0";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart0_rts_cts_pins: uart0-rts-cts-pins {</div><div class='add'>+			uart0-rts-cts {</div><div class='add'>+				pins = "mfio57", "mfio58";</div><div class='add'>+				function = "uart0";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart1_pins: uart1-pins {</div><div class='add'>+			uart1 {</div><div class='add'>+				pins = "mfio59", "mfio60";</div><div class='add'>+				function = "uart1";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart1_rts_cts_pins: uart1-rts-cts-pins {</div><div class='add'>+			uart1-rts-cts {</div><div class='add'>+				  pins = "mfio1", "mfio2";</div><div class='add'>+				  function = "uart1";</div><div class='add'>+				  drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		enet_pins: enet-pins {</div><div class='add'>+			pin_enet: enet {</div><div class='add'>+				pins = "mfio63", "mfio64", "mfio65", "mfio66",</div><div class='add'>+				       "mfio67", "mfio68", "mfio69", "mfio70";</div><div class='add'>+				function = "eth";</div><div class='add'>+				slew-rate = &lt;1&gt;;</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+			pin_enet_phy_clk: enet-phy-clk {</div><div class='add'>+				pins = "mfio71";</div><div class='add'>+				function = "eth";</div><div class='add'>+				slew-rate = &lt;1&gt;;</div><div class='add'>+				drive-strength = &lt;8&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdhost_pins: sdhost-pins {</div><div class='add'>+			pin_sdhost_clk: sdhost-clk {</div><div class='add'>+				pins = "mfio15";</div><div class='add'>+				function = "sdhost";</div><div class='add'>+				slew-rate = &lt;1&gt;;</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+			pin_sdhost_cmd: sdhost-cmd {</div><div class='add'>+				pins = "mfio16";</div><div class='add'>+				function = "sdhost";</div><div class='add'>+				slew-rate = &lt;1&gt;;</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+			pin_sdhost_data: sdhost-data {</div><div class='add'>+				pins = "mfio17", "mfio18", "mfio19", "mfio20",</div><div class='add'>+				       "mfio21", "mfio22", "mfio23", "mfio24";</div><div class='add'>+				function = "sdhost";</div><div class='add'>+				slew-rate = &lt;1&gt;;</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+			pin_sdhost_power_select: sdhost-power-select {</div><div class='add'>+				pins = "mfio25";</div><div class='add'>+				function = "sdhost";</div><div class='add'>+				slew-rate = &lt;1&gt;;</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+			pin_sdhost_card_detect: sdhost-card-detect {</div><div class='add'>+				pins = "mfio26";</div><div class='add'>+				function = "sdhost";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+			pin_sdhost_write_protect: sdhost-write-protect {</div><div class='add'>+				pins = "mfio27";</div><div class='add'>+				function = "sdhost";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ir_pin: ir-pin {</div><div class='add'>+			ir-data {</div><div class='add'>+				pins = "mfio72";</div><div class='add'>+				function = "ir";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwmpdm0_pin: pwmpdm0-pin {</div><div class='add'>+			pwmpdm0 {</div><div class='add'>+				pins = "mfio73";</div><div class='add'>+				function = "pwmpdm";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwmpdm1_pin: pwmpdm1-pin {</div><div class='add'>+			pwmpdm1 {</div><div class='add'>+				pins = "mfio74";</div><div class='add'>+				function = "pwmpdm";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwmpdm2_pin: pwmpdm2-pin {</div><div class='add'>+			pwmpdm2 {</div><div class='add'>+				pins = "mfio75";</div><div class='add'>+				function = "pwmpdm";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pwmpdm3_pin: pwmpdm3-pin {</div><div class='add'>+			pwmpdm3 {</div><div class='add'>+				pins = "mfio76";</div><div class='add'>+				function = "pwmpdm";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dac_clk_pin: dac-clk-pin {</div><div class='add'>+			pin_dac_clk: dac-clk {</div><div class='add'>+				pins = "mfio45";</div><div class='add'>+				function = "i2s_dac_clk";</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2s_mclk_pin: i2s-mclk-pin {</div><div class='add'>+			pin_i2s_mclk: i2s-mclk {</div><div class='add'>+				pins = "mfio36";</div><div class='add'>+				function = "i2s_out";</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spdif_out_pin: spdif-out-pin {</div><div class='add'>+			spdif-out {</div><div class='add'>+				pins = "mfio61";</div><div class='add'>+				function = "spdif_out";</div><div class='add'>+				slew-rate = &lt;1&gt;;</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		spdif_in_pin: spdif-in-pin {</div><div class='add'>+			spdif-in {</div><div class='add'>+				pins = "mfio62";</div><div class='add'>+				function = "spdif_in";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2s_out_pins: i2s-out-pins {</div><div class='add'>+			pins_i2s_out_clk: i2s-out-clk {</div><div class='add'>+				pins = "mfio37", "mfio38";</div><div class='add'>+				function = "i2s_out";</div><div class='add'>+				drive-strength = &lt;4&gt;;</div><div class='add'>+			};</div><div class='add'>+			pins_i2s_out: i2s-out {</div><div class='add'>+				pins = "mfio39", "mfio40",</div><div class='add'>+				       "mfio41", "mfio42",</div><div class='add'>+				       "mfio43", "mfio44";</div><div class='add'>+				function = "i2s_out";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2s_in_pins: i2s-in-pins {</div><div class='add'>+			i2s-in {</div><div class='add'>+				pins = "mfio47", "mfio48", "mfio49",</div><div class='add'>+				       "mfio50", "mfio51", "mfio52",</div><div class='add'>+				       "mfio53", "mfio54";</div><div class='add'>+				function = "i2s_in";</div><div class='add'>+				drive-strength = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer: timer@18102000 {</div><div class='add'>+		compatible = "img,pistachio-gptimer";</div><div class='add'>+		reg = &lt;0x18102000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 60 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_periph PERIPH_CLK_COUNTER_FAST&gt;,</div><div class='add'>+			 &lt;&amp;cr_periph SYS_CLK_TIMER&gt;;</div><div class='add'>+		clock-names = "fast", "sys";</div><div class='add'>+		img,cr-periph = &lt;&amp;cr_periph&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	wdt: watchdog@18102100 {</div><div class='add'>+		compatible = "img,pdc-wdt";</div><div class='add'>+		reg = &lt;0x18102100 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 52 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_periph PERIPH_CLK_WD&gt;, &lt;&amp;cr_periph SYS_CLK_WD&gt;;</div><div class='add'>+		clock-names = "wdt", "sys";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_periph PERIPH_CLK_WD_PRE_DIV&gt;,</div><div class='add'>+				  &lt;&amp;clk_periph PERIPH_CLK_WD_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;4000000&gt;, &lt;32768&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ir: ir@18102200 {</div><div class='add'>+		compatible = "img,ir-rev1";</div><div class='add'>+		reg = &lt;0x18102200 0x100&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 51 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_periph PERIPH_CLK_IR&gt;, &lt;&amp;cr_periph SYS_CLK_IR&gt;;</div><div class='add'>+		clock-names = "core", "sys";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_periph PERIPH_CLK_IR_PRE_DIV&gt;,</div><div class='add'>+				  &lt;&amp;clk_periph PERIPH_CLK_IR_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;4000000&gt;, &lt;32768&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;ir_pin&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb: usb@18120000 {</div><div class='add'>+		compatible = "snps,dwc2";</div><div class='add'>+		reg = &lt;0x18120000 0x1c000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 49 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		phys = &lt;&amp;usb_phy&gt;;</div><div class='add'>+		phy-names = "usb2-phy";</div><div class='add'>+		g-tx-fifo-size = &lt;256 256 256 256&gt;;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet: ethernet@18140000 {</div><div class='add'>+		compatible = "snps,dwmac";</div><div class='add'>+		reg = &lt;0x18140000 0x2000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 50 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		interrupt-names = "macirq";</div><div class='add'>+		clocks = &lt;&amp;clk_core CLK_ENET&gt;, &lt;&amp;cr_periph SYS_CLK_ENET&gt;;</div><div class='add'>+		clock-names = "stmmaceth", "pclk";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_core CLK_ENET_MUX&gt;,</div><div class='add'>+				  &lt;&amp;clk_core CLK_ENET_DIV&gt;;</div><div class='add'>+		assigned-clock-parents = &lt;&amp;clk_core CLK_SYS_INTERNAL_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;0&gt;, &lt;50000000&gt;;</div><div class='add'>+		pinctrl-0 = &lt;&amp;enet_pins&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		phy-mode = "rmii";</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhost: mmc@18142000 {</div><div class='add'>+		compatible = "img,pistachio-dw-mshc";</div><div class='add'>+		reg = &lt;0x18142000 0x400&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 39 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_core CLK_SD_HOST&gt;, &lt;&amp;cr_periph SYS_CLK_SD_HOST&gt;;</div><div class='add'>+		clock-names = "ciu", "biu";</div><div class='add'>+		pinctrl-0 = &lt;&amp;sdhost_pins&gt;;</div><div class='add'>+		pinctrl-names = "default";</div><div class='add'>+		fifo-depth = &lt;0x20&gt;;</div><div class='add'>+		num-slots = &lt;1&gt;;</div><div class='add'>+		clock-frequency = &lt;50000000&gt;;</div><div class='add'>+		bus-width = &lt;8&gt;;</div><div class='add'>+		cap-mmc-highspeed;</div><div class='add'>+		cap-sd-highspeed;</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sram: sram@1b000000 {</div><div class='add'>+		compatible = "mmio-sram";</div><div class='add'>+		reg = &lt;0x1b000000 0x10000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdc: dma-controller@18143000 {</div><div class='add'>+		compatible = "img,pistachio-mdc-dma";</div><div class='add'>+		reg = &lt;0x18143000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 27 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SHARED 28 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SHARED 29 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SHARED 30 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SHARED 31 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SHARED 32 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SHARED 33 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SHARED 34 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SHARED 35 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SHARED 36 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SHARED 37 IRQ_TYPE_LEVEL_HIGH&gt;,</div><div class='add'>+			     &lt;GIC_SHARED 38 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		clocks = &lt;&amp;cr_periph SYS_CLK_MDC&gt;;</div><div class='add'>+		clock-names = "sys";</div><div class='add'>+</div><div class='add'>+		img,max-burst-multiplier = &lt;16&gt;;</div><div class='add'>+		img,cr-periph = &lt;&amp;cr_periph&gt;;</div><div class='add'>+</div><div class='add'>+		#dma-cells = &lt;3&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clk_core: clk@18144000 {</div><div class='add'>+		compatible = "img,pistachio-clk", "syscon";</div><div class='add'>+		clocks = &lt;&amp;xtal&gt;, &lt;&amp;cr_top EXT_CLK_AUDIO_IN&gt;,</div><div class='add'>+			 &lt;&amp;cr_top EXT_CLK_ENET_IN&gt;;</div><div class='add'>+		clock-names = "xtal", "audio_refclk_ext_gate",</div><div class='add'>+			      "ext_enet_in_gate";</div><div class='add'>+		reg = &lt;0x18144000 0x800&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clk_periph: clk@18144800 {</div><div class='add'>+		compatible = "img,pistachio-clk-periph";</div><div class='add'>+		reg = &lt;0x18144800 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_core CLK_PERIPH_SYS&gt;;</div><div class='add'>+		clock-names = "periph_sys_core";</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cr_periph: clk@18148000 {</div><div class='add'>+		compatible = "img,pistachio-cr-periph", "syscon", "simple-bus";</div><div class='add'>+		reg = &lt;0x18148000 0x1000&gt;;</div><div class='add'>+		clocks = &lt;&amp;clk_periph PERIPH_CLK_SYS&gt;;</div><div class='add'>+		clock-names = "sys";</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		pistachio_reset: reset-controller {</div><div class='add'>+			compatible = "img,pistachio-reset";</div><div class='add'>+			#reset-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cr_top: clk@18149000 {</div><div class='add'>+		compatible = "img,pistachio-cr-top", "syscon";</div><div class='add'>+		reg = &lt;0x18149000 0x200&gt;;</div><div class='add'>+		#clock-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	hash: hash@18149600 {</div><div class='add'>+		compatible = "img,hash-accelerator";</div><div class='add'>+		reg = &lt;0x18149600 0x100&gt;, &lt;0x18101100 0x4&gt;;</div><div class='add'>+		interrupts = &lt;GIC_SHARED 59 IRQ_TYPE_LEVEL_HIGH&gt;;</div><div class='add'>+		dmas = &lt;&amp;mdc 8 0xffffffff 0&gt;;</div><div class='add'>+		dma-names = "tx";</div><div class='add'>+		clocks = &lt;&amp;cr_periph SYS_CLK_HASH&gt;,</div><div class='add'>+			 &lt;&amp;clk_periph PERIPH_CLK_ROM&gt;;</div><div class='add'>+		clock-names = "sys", "hash";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gic: interrupt-controller@1bdc0000 {</div><div class='add'>+		compatible = "mti,gic";</div><div class='add'>+		reg = &lt;0x1bdc0000 0x20000&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;3&gt;;</div><div class='add'>+</div><div class='add'>+		timer {</div><div class='add'>+			compatible = "mti,gic-timer";</div><div class='add'>+			interrupts = &lt;GIC_LOCAL 1 IRQ_TYPE_NONE&gt;;</div><div class='add'>+			clocks = &lt;&amp;clk_core CLK_MIPS&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb_phy: usb-phy {</div><div class='add'>+		compatible = "img,pistachio-usb-phy";</div><div class='add'>+		clocks = &lt;&amp;clk_core CLK_USB_PHY&gt;;</div><div class='add'>+		clock-names = "usb_phy";</div><div class='add'>+		assigned-clocks = &lt;&amp;clk_core CLK_USB_PHY_DIV&gt;;</div><div class='add'>+		assigned-clock-rates = &lt;50000000&gt;;</div><div class='add'>+		img,refclk = &lt;0x2&gt;;</div><div class='add'>+		img,cr-top = &lt;&amp;cr_top&gt;;</div><div class='add'>+		#phy-cells = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	xtal: xtal {</div><div class='add'>+		compatible = "fixed-clock";</div><div class='add'>+		#clock-cells = &lt;0&gt;;</div><div class='add'>+		clock-frequency = &lt;52000000&gt;;</div><div class='add'>+		clock-output-names = "xtal";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/boot/dts/img/pistachio_marduk.dts b/arch/mips/boot/dts/img/pistachio_marduk.dts<br/>new file mode 100644<br/>index 000000000000..cf9cebd52294<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/img/pistachio_marduk.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/img/pistachio_marduk.dts</a></div><div class='hunk'>@@ -0,0 +1,163 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015, 2016 Imagination Technologies Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * IMG Marduk board is also known as Creator Ci40.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+#include "pistachio.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "IMG Marduk (Creator Ci40)";</div><div class='add'>+	compatible = "img,pistachio-marduk", "img,pistachio";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart0;</div><div class='add'>+		serial1 = &amp;uart1;</div><div class='add'>+		ethernet0 = &amp;enet;</div><div class='add'>+		spi0 = &amp;spfi0;</div><div class='add'>+		spi1 = &amp;spfi1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "root=/dev/sda1 rootwait ro lpj=723968";</div><div class='add'>+		stdout-path = "serial1:115200";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg =  &lt;0x00000000 0x10000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reg_1v8: fixed-regulator {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "aux_adc_vref";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-boot-on;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	internal_dac_supply: internal-dac-supply {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "internal_dac_supply";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	leds {</div><div class='add'>+		compatible = "pwm-leds";</div><div class='add'>+		heartbeat {</div><div class='add'>+			label = "marduk:red:heartbeat";</div><div class='add'>+			pwms = &lt;&amp;pwm 3 300000&gt;;</div><div class='add'>+			max-brightness = &lt;255&gt;;</div><div class='add'>+			linux,default-trigger = "heartbeat";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+		button@1 {</div><div class='add'>+			label = "Button 1";</div><div class='add'>+			linux,code = &lt;0x101&gt;; /* BTN_1 */</div><div class='add'>+			gpios = &lt;&amp;gpio3 6 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+		button@2 {</div><div class='add'>+			label = "Button 2";</div><div class='add'>+			linux,code = &lt;0x102&gt;; /* BTN_2 */</div><div class='add'>+			gpios = &lt;&amp;gpio2 14 GPIO_ACTIVE_LOW&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;internal_dac {</div><div class='add'>+	VDD-supply = &lt;&amp;internal_dac_supply&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;spfi1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pinctrl-0 = &lt;&amp;spim1_pins&gt;, &lt;&amp;spim1_quad_pins&gt;, &lt;&amp;spim1_cs0_pin&gt;,</div><div class='add'>+		    &lt;&amp;spim1_cs1_pin&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+	cs-gpios = &lt;&amp;gpio0 0 GPIO_ACTIVE_HIGH&gt;, &lt;&amp;gpio0 1 GPIO_ACTIVE_HIGH&gt;;</div><div class='add'>+</div><div class='add'>+	flash@0 {</div><div class='add'>+		compatible = "spansion,s25fl016k", "jedec,spi-nor";</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		spi-max-frequency = &lt;50000000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart0 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	assigned-clock-rates = &lt;114278400&gt;, &lt;1843200&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;uart1 {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;usb {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;enet {</div><div class='add'>+	status = "okay";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pin_enet {</div><div class='add'>+	drive-strength = &lt;2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pin_enet_phy_clk {</div><div class='add'>+	drive-strength = &lt;2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;sdhost {</div><div class='add'>+	status = "okay";</div><div class='add'>+	bus-width = &lt;4&gt;;</div><div class='add'>+	disable-wp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pin_sdhost_cmd {</div><div class='add'>+	drive-strength = &lt;2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pin_sdhost_data {</div><div class='add'>+	drive-strength = &lt;2&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;pwm {</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pinctrl-0 = &lt;&amp;pwmpdm0_pin&gt;, &lt;&amp;pwmpdm1_pin&gt;, &lt;&amp;pwmpdm2_pin&gt;,</div><div class='add'>+		    &lt;&amp;pwmpdm3_pin&gt;;</div><div class='add'>+	pinctrl-names = "default";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;adc {</div><div class='add'>+	status = "okay";</div><div class='add'>+	vref-supply = &lt;&amp;reg_1v8&gt;;</div><div class='add'>+	adc-reserved-channels = &lt;0x10&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c2 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	clock-frequency = &lt;400000&gt;;</div><div class='add'>+</div><div class='add'>+	tpm@20 {</div><div class='add'>+		compatible = "infineon,slb9645tt";</div><div class='add'>+		reg = &lt;0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;i2c3 {</div><div class='add'>+	status = "okay";</div><div class='add'>+	clock-frequency = &lt;400000&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi<br/>index f6ae6ed9c4b1..3e1587f1f77a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/ingenic/jz4740.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/ingenic/jz4740.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/ingenic/jz4740.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/ingenic/jz4740.dtsi</a></div><div class='hunk'>@@ -44,6 +44,17 @@</div><div class='ctx'> 		#clock-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	rtc_dev: rtc@10003000 {</div><div class='add'>+		compatible = "ingenic,jz4740-rtc";</div><div class='add'>+		reg = &lt;0x10003000 0x40&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+		interrupts = &lt;15&gt;;</div><div class='add'>+</div><div class='add'>+		clocks = &lt;&amp;cgu JZ4740_CLK_RTC&gt;;</div><div class='add'>+		clock-names = "rtc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	uart0: serial@10030000 {</div><div class='ctx'> 		compatible = "ingenic,jz4740-uart";</div><div class='ctx'> 		reg = &lt;0x10030000 0x100&gt;;</div><div class='head'>diff --git a/arch/mips/boot/dts/ingenic/qi_lb60.dts b/arch/mips/boot/dts/ingenic/qi_lb60.dts<br/>index 2414d63ae818..be1a7d3a3e1b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/ingenic/qi_lb60.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/ingenic/qi_lb60.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/ingenic/qi_lb60.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/ingenic/qi_lb60.dts</a></div><div class='hunk'>@@ -13,3 +13,7 @@</div><div class='ctx'> &amp;ext {</div><div class='ctx'> 	clock-frequency = &lt;12000000&gt;;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+&amp;rtc_dev {</div><div class='add'>+	system-power-controller;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/boot/dts/xilfpga/nexys4ddr.dts b/arch/mips/boot/dts/xilfpga/nexys4ddr.dts<br/>index 48d21127c3f3..09a62f2e2f8f 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/boot/dts/xilfpga/nexys4ddr.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/boot/dts/xilfpga/nexys4ddr.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/boot/dts/xilfpga/nexys4ddr.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/boot/dts/xilfpga/nexys4ddr.dts</a></div><div class='hunk'>@@ -17,6 +17,18 @@</div><div class='ctx'> 		compatible = "mti,cpu-interrupt-controller";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	axi_intc: interrupt-controller@10200000 {</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "xlnx,xps-intc-1.00.a";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		reg = &lt;0x10200000 0x10000&gt;;</div><div class='add'>+		xlnx,kind-of-intr = &lt;0x0&gt;;</div><div class='add'>+		xlnx,num-intr-inputs = &lt;0x6&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-parent = &lt;&amp;cpuintc&gt;;</div><div class='add'>+		interrupts = &lt;6&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	axi_gpio: gpio@10600000 {</div><div class='ctx'> 		#gpio-cells = &lt;1&gt;;</div><div class='ctx'> 		compatible = "xlnx,xps-gpio-1.00.a";</div><div class='hunk'>@@ -30,6 +42,32 @@</div><div class='ctx'> 		xlnx,tri-default = &lt;0xffffffff&gt;;</div><div class='ctx'> 	} ;</div><div class='ctx'> </div><div class='add'>+	axi_ethernetlite: ethernet@10e00000 {</div><div class='add'>+		compatible = "xlnx,xps-ethernetlite-3.00.a";</div><div class='add'>+		device_type = "network";</div><div class='add'>+		interrupt-parent = &lt;&amp;axi_intc&gt;;</div><div class='add'>+		interrupts = &lt;1&gt;;</div><div class='add'>+		phy-handle = &lt;&amp;phy0&gt;;</div><div class='add'>+		reg = &lt;0x10e00000 0x10000&gt;;</div><div class='add'>+		xlnx,duplex = &lt;0x1&gt;;</div><div class='add'>+		xlnx,include-global-buffers = &lt;0x1&gt;;</div><div class='add'>+		xlnx,include-internal-loopback = &lt;0x0&gt;;</div><div class='add'>+		xlnx,include-mdio = &lt;0x1&gt;;</div><div class='add'>+		xlnx,instance = "axi_ethernetlite_inst";</div><div class='add'>+		xlnx,rx-ping-pong = &lt;0x1&gt;;</div><div class='add'>+		xlnx,s-axi-id-width = &lt;0x1&gt;;</div><div class='add'>+		xlnx,tx-ping-pong = &lt;0x1&gt;;</div><div class='add'>+		xlnx,use-internal = &lt;0x0&gt;;</div><div class='add'>+		mdio {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			phy0: phy@1 {</div><div class='add'>+				device_type = "ethernet-phy";</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	axi_uart16550: serial@10400000 {</div><div class='ctx'> 		compatible = "ns16550a";</div><div class='ctx'> 		reg = &lt;0x10400000 0x10000&gt;;</div><div class='hunk'>@@ -38,7 +76,32 @@</div><div class='ctx'> 		reg-offset = &lt;0x1000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		clocks	= &lt;&amp;ext&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-parent = &lt;&amp;axi_intc&gt;;</div><div class='add'>+		interrupts = &lt;0&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	axi_i2c: i2c@10A00000 {</div><div class='add'>+	    compatible = "xlnx,xps-iic-2.00.a";</div><div class='add'>+	    interrupt-parent = &lt;&amp;axi_intc&gt;;</div><div class='add'>+	    interrupts = &lt;4&gt;;</div><div class='add'>+	    reg = &lt; 0x10A00000 0x10000 &gt;;</div><div class='add'>+	    clocks = &lt;&amp;ext&gt;;</div><div class='add'>+	    xlnx,clk-freq = &lt;0x5f5e100&gt;;</div><div class='add'>+	    xlnx,family = "Artix7";</div><div class='add'>+	    xlnx,gpo-width = &lt;0x1&gt;;</div><div class='add'>+	    xlnx,iic-freq = &lt;0x186a0&gt;;</div><div class='add'>+	    xlnx,scl-inertial-delay = &lt;0x0&gt;;</div><div class='add'>+	    xlnx,sda-inertial-delay = &lt;0x0&gt;;</div><div class='add'>+	    xlnx,ten-bit-adr = &lt;0x0&gt;;</div><div class='add'>+	    #address-cells = &lt;1&gt;;</div><div class='add'>+	    #size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+	    ad7420@4B {</div><div class='add'>+		compatible = "adi,adt7420";</div><div class='add'>+		reg = &lt;0x4B&gt;;</div><div class='add'>+	    };</div><div class='add'>+	} ;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> &amp;ext {</div><div class='head'>diff --git a/arch/mips/cavium-octeon/Makefile b/arch/mips/cavium-octeon/Makefile<br/>index 2a5926578841..7c02e542959a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/Makefile</a></div><div class='hunk'>@@ -18,3 +18,4 @@ obj-y += crypto/</div><div class='ctx'> obj-$(CONFIG_MTD)		      += flash_setup.o</div><div class='ctx'> obj-$(CONFIG_SMP)		      += smp.o</div><div class='ctx'> obj-$(CONFIG_OCTEON_ILM)	      += oct_ilm.o</div><div class='add'>+obj-$(CONFIG_USB)		      += octeon-usb.o</div><div class='head'>diff --git a/arch/mips/cavium-octeon/crypto/octeon-crypto.c b/arch/mips/cavium-octeon/crypto/octeon-crypto.c<br/>index f66bd1adc7ff..4d22365844af 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/crypto/octeon-crypto.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/crypto/octeon-crypto.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/crypto/octeon-crypto.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/crypto/octeon-crypto.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cop2.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "octeon-crypto.h"</div><div class='head'>diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c<br/>index 23c2344a3552..39f153fe0022 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/csrc-octeon.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/csrc-octeon.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/csrc-octeon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/csrc-octeon.c</a></div><div class='hunk'>@@ -98,7 +98,7 @@ void octeon_init_cvmcount(void)</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t octeon_cvmcount_read(struct clocksource *cs)</div><div class='add'>+static u64 octeon_cvmcount_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return read_c0_cvmcount();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c<br/>index fd69528b24fb..c64bd87f0b6e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/dma-octeon.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/dma-octeon.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/dma-octeon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/dma-octeon.c</a></div><div class='hunk'>@@ -164,19 +164,14 @@ static void *octeon_dma_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	/* ignore region specifiers */</div><div class='ctx'> 	gfp &amp;= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ZONE_DMA</div><div class='del'>-	if (dev == NULL)</div><div class='add'>+	if (IS_ENABLED(CONFIG_ZONE_DMA) &amp;&amp; dev == NULL)</div><div class='ctx'> 		gfp |= __GFP_DMA;</div><div class='del'>-	else if (dev-&gt;coherent_dma_mask &lt;= DMA_BIT_MASK(24))</div><div class='add'>+	else if (IS_ENABLED(CONFIG_ZONE_DMA) &amp;&amp;</div><div class='add'>+		 dev-&gt;coherent_dma_mask &lt;= DMA_BIT_MASK(24))</div><div class='ctx'> 		gfp |= __GFP_DMA;</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ZONE_DMA32</div><div class='del'>-	     if (dev-&gt;coherent_dma_mask &lt;= DMA_BIT_MASK(32))</div><div class='add'>+	else if (IS_ENABLED(CONFIG_ZONE_DMA32) &amp;&amp;</div><div class='add'>+		 dev-&gt;coherent_dma_mask &lt;= DMA_BIT_MASK(32))</div><div class='ctx'> 		gfp |= __GFP_DMA32;</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-		;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't invoke OOM killer */</div><div class='ctx'> 	gfp |= __GFP_NORETRY;</div><div class='hunk'>@@ -205,7 +200,7 @@ static phys_addr_t octeon_unity_dma_to_phys(struct device *dev, dma_addr_t daddr</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct octeon_dma_map_ops {</div><div class='del'>-	struct dma_map_ops dma_map_ops;</div><div class='add'>+	const struct dma_map_ops dma_map_ops;</div><div class='ctx'> 	dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);</div><div class='ctx'> 	phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);</div><div class='ctx'> };</div><div class='hunk'>@@ -333,7 +328,7 @@ static struct octeon_dma_map_ops _octeon_pci_dma_map_ops = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *octeon_pci_dma_map_ops;</div><div class='add'>+const struct dma_map_ops *octeon_pci_dma_map_ops;</div><div class='ctx'> </div><div class='ctx'> void __init octeon_pci_dma_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c<br/>index b65a6c1ac016..8d54d774933c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-bootmem.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/executive/cvmx-bootmem.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-bootmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-bootmem.c</a></div><div class='hunk'>@@ -30,8 +30,8 @@</div><div class='ctx'>  * application start time.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/cvmx.h&gt;</div><div class='ctx'> #include &lt;asm/octeon/cvmx-spinlock.h&gt;</div><div class='head'>diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c<br/>index 868659e64d4a..4b26fedecf46 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/executive/cvmx-helper-errata.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper-errata.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'>  * these functions directly.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c b/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c<br/>index 671ab1db2727..ba4753c23b03 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c</a></div><div class='hunk'>@@ -287,8 +287,7 @@ cvmx_helper_link_info_t __cvmx_helper_rgmii_link_get(int ipd_port)</div><div class='ctx'>  * Configure an IPD/PKO port for the specified link state. This</div><div class='ctx'>  * function does not influence auto negotiation at the PHY level.</div><div class='ctx'>  * The passed link state must always match the link state returned</div><div class='del'>- * by cvmx_helper_link_get(). It is normally best to use</div><div class='del'>- * cvmx_helper_link_autoconf() instead.</div><div class='add'>+ * by cvmx_helper_link_get().</div><div class='ctx'>  *</div><div class='ctx'>  * @ipd_port:  IPD/PKO port to configure</div><div class='ctx'>  * @link_info: The new link state</div><div class='head'>diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c b/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c<br/>index 54375340afe8..578283350776 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c</a></div><div class='hunk'>@@ -500,8 +500,7 @@ cvmx_helper_link_info_t __cvmx_helper_sgmii_link_get(int ipd_port)</div><div class='ctx'>  * Configure an IPD/PKO port for the specified link state. This</div><div class='ctx'>  * function does not influence auto negotiation at the PHY level.</div><div class='ctx'>  * The passed link state must always match the link state returned</div><div class='del'>- * by cvmx_helper_link_get(). It is normally best to use</div><div class='del'>- * cvmx_helper_link_autoconf() instead.</div><div class='add'>+ * by cvmx_helper_link_get().</div><div class='ctx'>  *</div><div class='ctx'>  * @ipd_port:  IPD/PKO port to configure</div><div class='ctx'>  * @link_info: The new link state</div><div class='head'>diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c b/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c<br/>index 1f3030c72d88..ef16aa00167b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/executive/cvmx-helper-spi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper-spi.c</a></div><div class='hunk'>@@ -188,8 +188,7 @@ cvmx_helper_link_info_t __cvmx_helper_spi_link_get(int ipd_port)</div><div class='ctx'>  * Configure an IPD/PKO port for the specified link state. This</div><div class='ctx'>  * function does not influence auto negotiation at the PHY level.</div><div class='ctx'>  * The passed link state must always match the link state returned</div><div class='del'>- * by cvmx_helper_link_get(). It is normally best to use</div><div class='del'>- * cvmx_helper_link_autoconf() instead.</div><div class='add'>+ * by cvmx_helper_link_get().</div><div class='ctx'>  *</div><div class='ctx'>  * @ipd_port:  IPD/PKO port to configure</div><div class='ctx'>  * @link_info: The new link state</div><div class='head'>diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c b/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c<br/>index d347fe13b666..19d54e02c185 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c</a></div><div class='hunk'>@@ -295,8 +295,7 @@ cvmx_helper_link_info_t __cvmx_helper_xaui_link_get(int ipd_port)</div><div class='ctx'>  * Configure an IPD/PKO port for the specified link state. This</div><div class='ctx'>  * function does not influence auto negotiation at the PHY level.</div><div class='ctx'>  * The passed link state must always match the link state returned</div><div class='del'>- * by cvmx_helper_link_get(). It is normally best to use</div><div class='del'>- * cvmx_helper_link_autoconf() instead.</div><div class='add'>+ * by cvmx_helper_link_get().</div><div class='ctx'>  *</div><div class='ctx'>  * @ipd_port:  IPD/PKO port to configure</div><div class='ctx'>  * @link_info: The new link state</div><div class='head'>diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c<br/>index 6456af642471..f24be0b5db50 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/executive/cvmx-helper.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-helper.c</a></div><div class='hunk'>@@ -69,10 +69,6 @@ void (*cvmx_override_ipd_port_setup) (int ipd_port);</div><div class='ctx'> /* Port count per interface */</div><div class='ctx'> static int interface_port_count[5];</div><div class='ctx'> </div><div class='del'>-/* Port last configured link info index by IPD/PKO port */</div><div class='del'>-static cvmx_helper_link_info_t</div><div class='del'>-    port_link_info[CVMX_PIP_NUM_INPUT_PORTS];</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * Return the number of interfaces the chip has. Each interface</div><div class='ctx'>  * may have multiple ports. Most chips support two interfaces,</div><div class='hunk'>@@ -1136,41 +1132,6 @@ int cvmx_helper_initialize_packet_io_local(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Auto configure an IPD/PKO port link state and speed. This</div><div class='del'>- * function basically does the equivalent of:</div><div class='del'>- * cvmx_helper_link_set(ipd_port, cvmx_helper_link_get(ipd_port));</div><div class='del'>- *</div><div class='del'>- * @ipd_port: IPD/PKO port to auto configure</div><div class='del'>- *</div><div class='del'>- * Returns Link state after configure</div><div class='del'>- */</div><div class='del'>-cvmx_helper_link_info_t cvmx_helper_link_autoconf(int ipd_port)</div><div class='del'>-{</div><div class='del'>-	cvmx_helper_link_info_t link_info;</div><div class='del'>-	int interface = cvmx_helper_get_interface_num(ipd_port);</div><div class='del'>-	int index = cvmx_helper_get_interface_index_num(ipd_port);</div><div class='del'>-</div><div class='del'>-	if (index &gt;= cvmx_helper_ports_on_interface(interface)) {</div><div class='del'>-		link_info.u64 = 0;</div><div class='del'>-		return link_info;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	link_info = cvmx_helper_link_get(ipd_port);</div><div class='del'>-	if (link_info.u64 == port_link_info[ipd_port].u64)</div><div class='del'>-		return link_info;</div><div class='del'>-</div><div class='del'>-	/* If we fail to set the link speed, port_link_info will not change */</div><div class='del'>-	cvmx_helper_link_set(ipd_port, link_info);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * port_link_info should be the current value, which will be</div><div class='del'>-	 * different than expect if cvmx_helper_link_set() failed.</div><div class='del'>-	 */</div><div class='del'>-	return port_link_info[ipd_port];</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(cvmx_helper_link_autoconf);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * Return the link state of an IPD/PKO port as returned by</div><div class='ctx'>  * auto negotiation. The result of this function may not match</div><div class='ctx'>  * Octeon's link config if auto negotiation has changed since</div><div class='hunk'>@@ -1233,8 +1194,7 @@ EXPORT_SYMBOL_GPL(cvmx_helper_link_get);</div><div class='ctx'>  * Configure an IPD/PKO port for the specified link state. This</div><div class='ctx'>  * function does not influence auto negotiation at the PHY level.</div><div class='ctx'>  * The passed link state must always match the link state returned</div><div class='del'>- * by cvmx_helper_link_get(). It is normally best to use</div><div class='del'>- * cvmx_helper_link_autoconf() instead.</div><div class='add'>+ * by cvmx_helper_link_get().</div><div class='ctx'>  *</div><div class='ctx'>  * @ipd_port:  IPD/PKO port to configure</div><div class='ctx'>  * @link_info: The new link state</div><div class='hunk'>@@ -1276,11 +1236,6 @@ int cvmx_helper_link_set(int ipd_port, cvmx_helper_link_info_t link_info)</div><div class='ctx'> 	case CVMX_HELPER_INTERFACE_MODE_LOOP:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	/* Set the port_link_info here so that the link status is updated</div><div class='del'>-	   no matter how cvmx_helper_link_set is called. We don't change</div><div class='del'>-	   the value if link_set failed */</div><div class='del'>-	if (result == 0)</div><div class='del'>-		port_link_info[ipd_port].u64 = link_info.u64;</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(cvmx_helper_link_set);</div><div class='head'>diff --git a/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c b/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c<br/>index cc1b1d2a6fa1..30ecba134e09 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/executive/cvmx-sysinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/executive/cvmx-sysinfo.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'>  * This module provides system/board/application information obtained</div><div class='ctx'>  * by the bootloader.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/cvmx.h&gt;</div><div class='ctx'> #include &lt;asm/octeon/cvmx-sysinfo.h&gt;</div><div class='head'>diff --git a/arch/mips/cavium-octeon/octeon-memcpy.S b/arch/mips/cavium-octeon/octeon-memcpy.S<br/>index 64e08df51d65..cfd97f6448bb 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/octeon-memcpy.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/octeon-memcpy.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/octeon-memcpy.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/octeon-memcpy.S</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/export.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define dst a0</div><div class='hunk'>@@ -142,6 +143,7 @@</div><div class='ctx'>  * t7 is used as a flag to note inatomic mode.</div><div class='ctx'>  */</div><div class='ctx'> LEAF(__copy_user_inatomic)</div><div class='add'>+EXPORT_SYMBOL(__copy_user_inatomic)</div><div class='ctx'> 	b	__copy_user_common</div><div class='ctx'> 	 li	t7, 1</div><div class='ctx'> 	END(__copy_user_inatomic)</div><div class='hunk'>@@ -154,9 +156,11 @@ LEAF(__copy_user_inatomic)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> LEAF(memcpy)					/* a0=dst a1=src a2=len */</div><div class='add'>+EXPORT_SYMBOL(memcpy)</div><div class='ctx'> 	move	v0, dst				/* return value */</div><div class='ctx'> __memcpy:</div><div class='ctx'> FEXPORT(__copy_user)</div><div class='add'>+EXPORT_SYMBOL(__copy_user)</div><div class='ctx'> 	li	t7, 0				/* not inatomic */</div><div class='ctx'> __copy_user_common:</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -208,18 +212,18 @@ EXC(	STORE	t2, UNIT(6)(dst),	s_exc_p10u)</div><div class='ctx'> 	ADD	src, src, 16*NBYTES</div><div class='ctx'> EXC(	STORE	t3, UNIT(7)(dst),	s_exc_p9u)</div><div class='ctx'> 	ADD	dst, dst, 16*NBYTES</div><div class='del'>-EXC(	LOAD	t0, UNIT(-8)(src),	l_exc_copy)</div><div class='del'>-EXC(	LOAD	t1, UNIT(-7)(src),	l_exc_copy)</div><div class='del'>-EXC(	LOAD	t2, UNIT(-6)(src),	l_exc_copy)</div><div class='del'>-EXC(	LOAD	t3, UNIT(-5)(src),	l_exc_copy)</div><div class='add'>+EXC(	LOAD	t0, UNIT(-8)(src),	l_exc_copy_rewind16)</div><div class='add'>+EXC(	LOAD	t1, UNIT(-7)(src),	l_exc_copy_rewind16)</div><div class='add'>+EXC(	LOAD	t2, UNIT(-6)(src),	l_exc_copy_rewind16)</div><div class='add'>+EXC(	LOAD	t3, UNIT(-5)(src),	l_exc_copy_rewind16)</div><div class='ctx'> EXC(	STORE	t0, UNIT(-8)(dst),	s_exc_p8u)</div><div class='ctx'> EXC(	STORE	t1, UNIT(-7)(dst),	s_exc_p7u)</div><div class='ctx'> EXC(	STORE	t2, UNIT(-6)(dst),	s_exc_p6u)</div><div class='ctx'> EXC(	STORE	t3, UNIT(-5)(dst),	s_exc_p5u)</div><div class='del'>-EXC(	LOAD	t0, UNIT(-4)(src),	l_exc_copy)</div><div class='del'>-EXC(	LOAD	t1, UNIT(-3)(src),	l_exc_copy)</div><div class='del'>-EXC(	LOAD	t2, UNIT(-2)(src),	l_exc_copy)</div><div class='del'>-EXC(	LOAD	t3, UNIT(-1)(src),	l_exc_copy)</div><div class='add'>+EXC(	LOAD	t0, UNIT(-4)(src),	l_exc_copy_rewind16)</div><div class='add'>+EXC(	LOAD	t1, UNIT(-3)(src),	l_exc_copy_rewind16)</div><div class='add'>+EXC(	LOAD	t2, UNIT(-2)(src),	l_exc_copy_rewind16)</div><div class='add'>+EXC(	LOAD	t3, UNIT(-1)(src),	l_exc_copy_rewind16)</div><div class='ctx'> EXC(	STORE	t0, UNIT(-4)(dst),	s_exc_p4u)</div><div class='ctx'> EXC(	STORE	t1, UNIT(-3)(dst),	s_exc_p3u)</div><div class='ctx'> EXC(	STORE	t2, UNIT(-2)(dst),	s_exc_p2u)</div><div class='hunk'>@@ -383,6 +387,10 @@ done:</div><div class='ctx'> 	 nop</div><div class='ctx'> 	END(memcpy)</div><div class='ctx'> </div><div class='add'>+l_exc_copy_rewind16:</div><div class='add'>+	/* Rewind src and dst by 16*NBYTES for l_exc_copy */</div><div class='add'>+	SUB	src, src, 16*NBYTES</div><div class='add'>+	SUB	dst, dst, 16*NBYTES</div><div class='ctx'> l_exc_copy:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Copy bytes from src until faulting load address (or until a</div><div class='hunk'>@@ -459,6 +467,7 @@ s_exc:</div><div class='ctx'> </div><div class='ctx'> 	.align	5</div><div class='ctx'> LEAF(memmove)</div><div class='add'>+EXPORT_SYMBOL(memmove)</div><div class='ctx'> 	ADD	t0, a0, a2</div><div class='ctx'> 	ADD	t1, a1, a2</div><div class='ctx'> 	sltu	t0, a1, t0			# dst + len &lt;= src -&gt; memcpy</div><div class='head'>diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c<br/>index 37a932d9148c..3375e61daa19 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/octeon-platform.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/octeon-platform.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/octeon-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/octeon-platform.c</a></div><div class='hunk'>@@ -448,6 +448,7 @@ static struct of_device_id __initdata octeon_ids[] = {</div><div class='ctx'> 	{ .compatible = "cavium,octeon-3860-bootbus", },</div><div class='ctx'> 	{ .compatible = "cavium,mdio-mux", },</div><div class='ctx'> 	{ .compatible = "gpio-leds", },</div><div class='add'>+	{ .compatible = "cavium,octeon-7130-usb-uctl", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1060,7 +1061,3 @@ static int __init octeon_publish_devices(void)</div><div class='ctx'> 	return of_platform_bus_probe(NULL, octeon_ids, NULL);</div><div class='ctx'> }</div><div class='ctx'> arch_initcall(octeon_publish_devices);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("David Daney &lt;ddaney@caviumnetworks.com&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Platform driver for Octeon SOC");</div><div class='head'>diff --git a/arch/mips/cavium-octeon/octeon-usb.c b/arch/mips/cavium-octeon/octeon-usb.c<br/>new file mode 100644<br/>index 000000000000..542be1cd0f32<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/octeon-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/octeon-usb.c</a></div><div class='hunk'>@@ -0,0 +1,552 @@</div><div class='add'>+/*</div><div class='add'>+ * XHCI HCD glue for Cavium Octeon III SOCs.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2010-2017 Cavium Networks</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/octeon/octeon.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-gpio-defs.h&gt;</div><div class='add'>+</div><div class='add'>+/* USB Control Register */</div><div class='add'>+union cvm_usbdrd_uctl_ctl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvm_usbdrd_uctl_ctl_s {</div><div class='add'>+	/* 1 = BIST and set all USB RAMs to 0x0, 0 = BIST */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t clear_bist:1,</div><div class='add'>+	/* 1 = Start BIST and cleared by hardware */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t start_bist:1,</div><div class='add'>+	/* Reference clock select for SuperSpeed and HighSpeed PLLs:</div><div class='add'>+	 *	0x0 = Both PLLs use DLMC_REF_CLK0 for reference clock</div><div class='add'>+	 *	0x1 = Both PLLs use DLMC_REF_CLK1 for reference clock</div><div class='add'>+	 *	0x2 = SuperSpeed PLL uses DLMC_REF_CLK0 for reference clock &amp;</div><div class='add'>+	 *	      HighSpeed PLL uses PLL_REF_CLK for reference clck</div><div class='add'>+	 *	0x3 = SuperSpeed PLL uses DLMC_REF_CLK1 for reference clock &amp;</div><div class='add'>+	 *	      HighSpeed PLL uses PLL_REF_CLK for reference clck</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t ref_clk_sel:2,</div><div class='add'>+	/* 1 = Spread-spectrum clock enable, 0 = SS clock disable */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t ssc_en:1,</div><div class='add'>+	/* Spread-spectrum clock modulation range:</div><div class='add'>+	 *	0x0 = -4980 ppm downspread</div><div class='add'>+	 *	0x1 = -4492 ppm downspread</div><div class='add'>+	 *	0x2 = -4003 ppm downspread</div><div class='add'>+	 *	0x3 - 0x7 = Reserved</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t ssc_range:3,</div><div class='add'>+	/* Enable non-standard oscillator frequencies:</div><div class='add'>+	 *	[55:53] = modules -1</div><div class='add'>+	 *	[52:47] = 2's complement push amount, 0 = Feature disabled</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t ssc_ref_clk_sel:9,</div><div class='add'>+	/* Reference clock multiplier for non-standard frequencies:</div><div class='add'>+	 *	0x19 = 100MHz on DLMC_REF_CLK* if REF_CLK_SEL = 0x0 or 0x1</div><div class='add'>+	 *	0x28 = 125MHz on DLMC_REF_CLK* if REF_CLK_SEL = 0x0 or 0x1</div><div class='add'>+	 *	0x32 =  50MHz on DLMC_REF_CLK* if REF_CLK_SEL = 0x0 or 0x1</div><div class='add'>+	 *	Other Values = Reserved</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t mpll_multiplier:7,</div><div class='add'>+	/* Enable reference clock to prescaler for SuperSpeed functionality.</div><div class='add'>+	 * Should always be set to "1"</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t ref_ssp_en:1,</div><div class='add'>+	/* Divide the reference clock by 2 before entering the</div><div class='add'>+	 * REF_CLK_FSEL divider:</div><div class='add'>+	 *	If REF_CLK_SEL = 0x0 or 0x1, then only 0x0 is legal</div><div class='add'>+	 *	If REF_CLK_SEL = 0x2 or 0x3, then:</div><div class='add'>+	 *		0x1 = DLMC_REF_CLK* is 125MHz</div><div class='add'>+	 *		0x0 = DLMC_REF_CLK* is another supported frequency</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t ref_clk_div2:1,</div><div class='add'>+	/* Select reference clock freqnuency for both PLL blocks:</div><div class='add'>+	 *	0x27 = REF_CLK_SEL is 0x0 or 0x1</div><div class='add'>+	 *	0x07 = REF_CLK_SEL is 0x2 or 0x3</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t ref_clk_fsel:6,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_31_31:1,</div><div class='add'>+	/* Controller clock enable. */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t h_clk_en:1,</div><div class='add'>+	/* Select bypass input to controller clock divider:</div><div class='add'>+	 *	0x0 = Use divided coprocessor clock from H_CLKDIV</div><div class='add'>+	 *	0x1 = Use clock from GPIO pins</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t h_clk_byp_sel:1,</div><div class='add'>+	/* Reset controller clock divider. */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t h_clkdiv_rst:1,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_27_27:1,</div><div class='add'>+	/* Clock divider select:</div><div class='add'>+	 *	0x0 = divide by 1</div><div class='add'>+	 *	0x1 = divide by 2</div><div class='add'>+	 *	0x2 = divide by 4</div><div class='add'>+	 *	0x3 = divide by 6</div><div class='add'>+	 *	0x4 = divide by 8</div><div class='add'>+	 *	0x5 = divide by 16</div><div class='add'>+	 *	0x6 = divide by 24</div><div class='add'>+	 *	0x7 = divide by 32</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t h_clkdiv_sel:3,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_22_23:2,</div><div class='add'>+	/* USB3 port permanently attached: 0x0 = No, 0x1 = Yes */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t usb3_port_perm_attach:1,</div><div class='add'>+	/* USB2 port permanently attached: 0x0 = No, 0x1 = Yes */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t usb2_port_perm_attach:1,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_19_19:1,</div><div class='add'>+	/* Disable SuperSpeed PHY: 0x0 = No, 0x1 = Yes */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t usb3_port_disable:1,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_17_17:1,</div><div class='add'>+	/* Disable HighSpeed PHY: 0x0 = No, 0x1 = Yes */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t usb2_port_disable:1,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_15_15:1,</div><div class='add'>+	/* Enable PHY SuperSpeed block power: 0x0 = No, 0x1 = Yes */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t ss_power_en:1,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_13_13:1,</div><div class='add'>+	/* Enable PHY HighSpeed block power: 0x0 = No, 0x1 = Yes */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t hs_power_en:1,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_5_11:7,</div><div class='add'>+	/* Enable USB UCTL interface clock: 0xx = No, 0x1 = Yes */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t csclk_en:1,</div><div class='add'>+	/* Controller mode: 0x0 = Host, 0x1 = Device */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t drd_mode:1,</div><div class='add'>+	/* PHY reset */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t uphy_rst:1,</div><div class='add'>+	/* Software reset UAHC */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t uahc_rst:1,</div><div class='add'>+	/* Software resets UCTL */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t uctl_rst:1,</div><div class='add'>+	;)))))))))))))))))))))))))))))))))</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* UAHC Configuration Register */</div><div class='add'>+union cvm_usbdrd_uctl_host_cfg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvm_usbdrd_uctl_host_cfg_s {</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_60_63:4,</div><div class='add'>+	/* Indicates minimum value of all received BELT values */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t host_current_belt:12,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_38_47:10,</div><div class='add'>+	/* HS jitter adjustment */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t fla:6,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_29_31:3,</div><div class='add'>+	/* Bus-master enable: 0x0 = Disabled (stall DMAs), 0x1 = enabled */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t bme:1,</div><div class='add'>+	/* Overcurrent protection enable: 0x0 = unavailable, 0x1 = available */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t oci_en:1,</div><div class='add'>+	/* Overcurrent sene selection:</div><div class='add'>+	 *	0x0 = Overcurrent indication from off-chip is active-low</div><div class='add'>+	 *	0x1 = Overcurrent indication from off-chip is active-high</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t oci_active_high_en:1,</div><div class='add'>+	/* Port power control enable: 0x0 = unavailable, 0x1 = available */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t ppc_en:1,</div><div class='add'>+	/* Port power control sense selection:</div><div class='add'>+	 *	0x0 = Port power to off-chip is active-low</div><div class='add'>+	 *	0x1 = Port power to off-chip is active-high</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t ppc_active_high_en:1,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_0_23:24,</div><div class='add'>+	;)))))))))))</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* UCTL Shim Features Register */</div><div class='add'>+union cvm_usbdrd_uctl_shim_cfg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvm_usbdrd_uctl_shim_cfg_s {</div><div class='add'>+	/* Out-of-bound UAHC register access: 0 = read, 1 = write */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t xs_ncb_oob_wrn:1,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_60_62:3,</div><div class='add'>+	/* SRCID error log for out-of-bound UAHC register access:</div><div class='add'>+	 *	[59:58] = chipID</div><div class='add'>+	 *	[57] = Request source: 0 = core, 1 = NCB-device</div><div class='add'>+	 *	[56:51] = Core/NCB-device number, [56] always 0 for NCB devices</div><div class='add'>+	 *	[50:48] = SubID</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t xs_ncb_oob_osrc:12,</div><div class='add'>+	/* Error log for bad UAHC DMA access: 0 = Read log, 1 = Write log */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t xm_bad_dma_wrn:1,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_44_46:3,</div><div class='add'>+	/* Encoded error type for bad UAHC DMA */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t xm_bad_dma_type:4,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_13_39:27,</div><div class='add'>+	/* Select the IOI read command used by DMA accesses */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t dma_read_cmd:1,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_10_11:2,</div><div class='add'>+	/* Select endian format for DMA accesses to the L2c:</div><div class='add'>+	 *	0x0 = Little endian</div><div class='add'>+	 *`	0x1 = Big endian</div><div class='add'>+	 *	0x2 = Reserved</div><div class='add'>+	 *	0x3 = Reserved</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t dma_endian_mode:2,</div><div class='add'>+	/* Reserved */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t reserved_2_7:6,</div><div class='add'>+	/* Select endian format for IOI CSR access to UAHC:</div><div class='add'>+	 *	0x0 = Little endian</div><div class='add'>+	 *`	0x1 = Big endian</div><div class='add'>+	 *	0x2 = Reserved</div><div class='add'>+	 *	0x3 = Reserved</div><div class='add'>+	 */</div><div class='add'>+	__BITFIELD_FIELD(uint64_t csr_endian_mode:2,</div><div class='add'>+	;))))))))))))</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define OCTEON_H_CLKDIV_SEL		8</div><div class='add'>+#define OCTEON_MIN_H_CLK_RATE		150000000</div><div class='add'>+#define OCTEON_MAX_H_CLK_RATE		300000000</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(dwc3_octeon_clocks_mutex);</div><div class='add'>+static uint8_t clk_div[OCTEON_H_CLKDIV_SEL] = {1, 2, 4, 6, 8, 16, 24, 32};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int dwc3_octeon_config_power(struct device *dev, u64 base)</div><div class='add'>+{</div><div class='add'>+#define UCTL_HOST_CFG	0xe0</div><div class='add'>+	union cvm_usbdrd_uctl_host_cfg uctl_host_cfg;</div><div class='add'>+	union cvmx_gpio_bit_cfgx gpio_bit;</div><div class='add'>+	uint32_t gpio_pwr[3];</div><div class='add'>+	int gpio, len, power_active_low;</div><div class='add'>+	struct device_node *node = dev-&gt;of_node;</div><div class='add'>+	int index = (base &gt;&gt; 24) &amp; 1;</div><div class='add'>+</div><div class='add'>+	if (of_find_property(node, "power", &amp;len) != NULL) {</div><div class='add'>+		if (len == 12) {</div><div class='add'>+			of_property_read_u32_array(node, "power", gpio_pwr, 3);</div><div class='add'>+			power_active_low = gpio_pwr[2] &amp; 0x01;</div><div class='add'>+			gpio = gpio_pwr[1];</div><div class='add'>+		} else if (len == 8) {</div><div class='add'>+			of_property_read_u32_array(node, "power", gpio_pwr, 2);</div><div class='add'>+			power_active_low = 0;</div><div class='add'>+			gpio = gpio_pwr[1];</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(dev, "dwc3 controller clock init failure.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if ((OCTEON_IS_MODEL(OCTEON_CN73XX) ||</div><div class='add'>+		    OCTEON_IS_MODEL(OCTEON_CNF75XX))</div><div class='add'>+		    &amp;&amp; gpio &lt;= 31) {</div><div class='add'>+			gpio_bit.u64 = cvmx_read_csr(CVMX_GPIO_BIT_CFGX(gpio));</div><div class='add'>+			gpio_bit.s.tx_oe = 1;</div><div class='add'>+			gpio_bit.cn73xx.output_sel = (index == 0 ? 0x14 : 0x15);</div><div class='add'>+			cvmx_write_csr(CVMX_GPIO_BIT_CFGX(gpio), gpio_bit.u64);</div><div class='add'>+		} else if (gpio &lt;= 15) {</div><div class='add'>+			gpio_bit.u64 = cvmx_read_csr(CVMX_GPIO_BIT_CFGX(gpio));</div><div class='add'>+			gpio_bit.s.tx_oe = 1;</div><div class='add'>+			gpio_bit.cn70xx.output_sel = (index == 0 ? 0x14 : 0x19);</div><div class='add'>+			cvmx_write_csr(CVMX_GPIO_BIT_CFGX(gpio), gpio_bit.u64);</div><div class='add'>+		} else {</div><div class='add'>+			gpio_bit.u64 = cvmx_read_csr(CVMX_GPIO_XBIT_CFGX(gpio));</div><div class='add'>+			gpio_bit.s.tx_oe = 1;</div><div class='add'>+			gpio_bit.cn70xx.output_sel = (index == 0 ? 0x14 : 0x19);</div><div class='add'>+			cvmx_write_csr(CVMX_GPIO_XBIT_CFGX(gpio), gpio_bit.u64);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable XHCI power control and set if active high or low. */</div><div class='add'>+		uctl_host_cfg.u64 = cvmx_read_csr(base + UCTL_HOST_CFG);</div><div class='add'>+		uctl_host_cfg.s.ppc_en = 1;</div><div class='add'>+		uctl_host_cfg.s.ppc_active_high_en = !power_active_low;</div><div class='add'>+		cvmx_write_csr(base + UCTL_HOST_CFG, uctl_host_cfg.u64);</div><div class='add'>+	} else {</div><div class='add'>+		/* Disable XHCI power control and set if active high. */</div><div class='add'>+		uctl_host_cfg.u64 = cvmx_read_csr(base + UCTL_HOST_CFG);</div><div class='add'>+		uctl_host_cfg.s.ppc_en = 0;</div><div class='add'>+		uctl_host_cfg.s.ppc_active_high_en = 0;</div><div class='add'>+		cvmx_write_csr(base + UCTL_HOST_CFG, uctl_host_cfg.u64);</div><div class='add'>+		dev_warn(dev, "dwc3 controller clock init failure.\n");</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dwc3_octeon_clocks_start(struct device *dev, u64 base)</div><div class='add'>+{</div><div class='add'>+	union cvm_usbdrd_uctl_ctl uctl_ctl;</div><div class='add'>+	int ref_clk_sel = 2;</div><div class='add'>+	u64 div;</div><div class='add'>+	u32 clock_rate;</div><div class='add'>+	int mpll_mul;</div><div class='add'>+	int i;</div><div class='add'>+	u64 h_clk_rate;</div><div class='add'>+	u64 uctl_ctl_reg = base;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;of_node) {</div><div class='add'>+		const char *ss_clock_type;</div><div class='add'>+		const char *hs_clock_type;</div><div class='add'>+</div><div class='add'>+		i = of_property_read_u32(dev-&gt;of_node,</div><div class='add'>+					 "refclk-frequency", &amp;clock_rate);</div><div class='add'>+		if (i) {</div><div class='add'>+			pr_err("No UCTL \"refclk-frequency\"\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		i = of_property_read_string(dev-&gt;of_node,</div><div class='add'>+					    "refclk-type-ss", &amp;ss_clock_type);</div><div class='add'>+		if (i) {</div><div class='add'>+			pr_err("No UCTL \"refclk-type-ss\"\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		i = of_property_read_string(dev-&gt;of_node,</div><div class='add'>+					    "refclk-type-hs", &amp;hs_clock_type);</div><div class='add'>+		if (i) {</div><div class='add'>+			pr_err("No UCTL \"refclk-type-hs\"\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (strcmp("dlmc_ref_clk0", ss_clock_type) == 0) {</div><div class='add'>+			if (strcmp(hs_clock_type, "dlmc_ref_clk0") == 0)</div><div class='add'>+				ref_clk_sel = 0;</div><div class='add'>+			else if (strcmp(hs_clock_type, "pll_ref_clk") == 0)</div><div class='add'>+				ref_clk_sel = 2;</div><div class='add'>+			else</div><div class='add'>+				pr_err("Invalid HS clock type %s, using  pll_ref_clk instead\n",</div><div class='add'>+				       hs_clock_type);</div><div class='add'>+		} else if (strcmp(ss_clock_type, "dlmc_ref_clk1") == 0) {</div><div class='add'>+			if (strcmp(hs_clock_type, "dlmc_ref_clk1") == 0)</div><div class='add'>+				ref_clk_sel = 1;</div><div class='add'>+			else if (strcmp(hs_clock_type, "pll_ref_clk") == 0)</div><div class='add'>+				ref_clk_sel = 3;</div><div class='add'>+			else {</div><div class='add'>+				pr_err("Invalid HS clock type %s, using  pll_ref_clk instead\n",</div><div class='add'>+				       hs_clock_type);</div><div class='add'>+				ref_clk_sel = 3;</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			pr_err("Invalid SS clock type %s, using  dlmc_ref_clk0 instead\n",</div><div class='add'>+			       ss_clock_type);</div><div class='add'>+</div><div class='add'>+		if ((ref_clk_sel == 0 || ref_clk_sel == 1) &amp;&amp;</div><div class='add'>+				  (clock_rate != 100000000))</div><div class='add'>+			pr_err("Invalid UCTL clock rate of %u, using 100000000 instead\n",</div><div class='add'>+			       clock_rate);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		pr_err("No USB UCTL device node\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Step 1: Wait for all voltages to be stable...that surely</div><div class='add'>+	 *         happened before starting the kernel. SKIP</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Step 2: Select GPIO for overcurrent indication, if desired. SKIP */</div><div class='add'>+</div><div class='add'>+	/* Step 3: Assert all resets. */</div><div class='add'>+	uctl_ctl.u64 = cvmx_read_csr(uctl_ctl_reg);</div><div class='add'>+	uctl_ctl.s.uphy_rst = 1;</div><div class='add'>+	uctl_ctl.s.uahc_rst = 1;</div><div class='add'>+	uctl_ctl.s.uctl_rst = 1;</div><div class='add'>+	cvmx_write_csr(uctl_ctl_reg, uctl_ctl.u64);</div><div class='add'>+</div><div class='add'>+	/* Step 4a: Reset the clock dividers. */</div><div class='add'>+	uctl_ctl.u64 = cvmx_read_csr(uctl_ctl_reg);</div><div class='add'>+	uctl_ctl.s.h_clkdiv_rst = 1;</div><div class='add'>+	cvmx_write_csr(uctl_ctl_reg, uctl_ctl.u64);</div><div class='add'>+</div><div class='add'>+	/* Step 4b: Select controller clock frequency. */</div><div class='add'>+	for (div = 0; div &lt; OCTEON_H_CLKDIV_SEL; div++) {</div><div class='add'>+		h_clk_rate = octeon_get_io_clock_rate() / clk_div[div];</div><div class='add'>+		if (h_clk_rate &lt;= OCTEON_MAX_H_CLK_RATE &amp;&amp;</div><div class='add'>+				 h_clk_rate &gt;= OCTEON_MIN_H_CLK_RATE)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	uctl_ctl.u64 = cvmx_read_csr(uctl_ctl_reg);</div><div class='add'>+	uctl_ctl.s.h_clkdiv_sel = div;</div><div class='add'>+	uctl_ctl.s.h_clk_en = 1;</div><div class='add'>+	cvmx_write_csr(uctl_ctl_reg, uctl_ctl.u64);</div><div class='add'>+	uctl_ctl.u64 = cvmx_read_csr(uctl_ctl_reg);</div><div class='add'>+	if ((div != uctl_ctl.s.h_clkdiv_sel) || (!uctl_ctl.s.h_clk_en)) {</div><div class='add'>+		dev_err(dev, "dwc3 controller clock init failure.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Step 4c: Deassert the controller clock divider reset. */</div><div class='add'>+	uctl_ctl.u64 = cvmx_read_csr(uctl_ctl_reg);</div><div class='add'>+	uctl_ctl.s.h_clkdiv_rst = 0;</div><div class='add'>+	cvmx_write_csr(uctl_ctl_reg, uctl_ctl.u64);</div><div class='add'>+</div><div class='add'>+	/* Step 5a: Reference clock configuration. */</div><div class='add'>+	uctl_ctl.u64 = cvmx_read_csr(uctl_ctl_reg);</div><div class='add'>+	uctl_ctl.s.ref_clk_sel = ref_clk_sel;</div><div class='add'>+	uctl_ctl.s.ref_clk_fsel = 0x07;</div><div class='add'>+	uctl_ctl.s.ref_clk_div2 = 0;</div><div class='add'>+	switch (clock_rate) {</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev, "Invalid ref_clk %u, using 100000000 instead\n",</div><div class='add'>+			clock_rate);</div><div class='add'>+	case 100000000:</div><div class='add'>+		mpll_mul = 0x19;</div><div class='add'>+		if (ref_clk_sel &lt; 2)</div><div class='add'>+			uctl_ctl.s.ref_clk_fsel = 0x27;</div><div class='add'>+		break;</div><div class='add'>+	case 50000000:</div><div class='add'>+		mpll_mul = 0x32;</div><div class='add'>+		break;</div><div class='add'>+	case 125000000:</div><div class='add'>+		mpll_mul = 0x28;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	uctl_ctl.s.mpll_multiplier = mpll_mul;</div><div class='add'>+</div><div class='add'>+	/* Step 5b: Configure and enable spread-spectrum for SuperSpeed. */</div><div class='add'>+	uctl_ctl.s.ssc_en = 1;</div><div class='add'>+</div><div class='add'>+	/* Step 5c: Enable SuperSpeed. */</div><div class='add'>+	uctl_ctl.s.ref_ssp_en = 1;</div><div class='add'>+</div><div class='add'>+	/* Step 5d: Cofngiure PHYs. SKIP */</div><div class='add'>+</div><div class='add'>+	/* Step 6a &amp; 6b: Power up PHYs. */</div><div class='add'>+	uctl_ctl.s.hs_power_en = 1;</div><div class='add'>+	uctl_ctl.s.ss_power_en = 1;</div><div class='add'>+	cvmx_write_csr(uctl_ctl_reg, uctl_ctl.u64);</div><div class='add'>+</div><div class='add'>+	/* Step 7: Wait 10 controller-clock cycles to take effect. */</div><div class='add'>+	udelay(10);</div><div class='add'>+</div><div class='add'>+	/* Step 8a: Deassert UCTL reset signal. */</div><div class='add'>+	uctl_ctl.u64 = cvmx_read_csr(uctl_ctl_reg);</div><div class='add'>+	uctl_ctl.s.uctl_rst = 0;</div><div class='add'>+	cvmx_write_csr(uctl_ctl_reg, uctl_ctl.u64);</div><div class='add'>+</div><div class='add'>+	/* Step 8b: Wait 10 controller-clock cycles. */</div><div class='add'>+	udelay(10);</div><div class='add'>+</div><div class='add'>+	/* Steo 8c: Setup power-power control. */</div><div class='add'>+	if (dwc3_octeon_config_power(dev, base)) {</div><div class='add'>+		dev_err(dev, "Error configuring power.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Step 8d: Deassert UAHC reset signal. */</div><div class='add'>+	uctl_ctl.u64 = cvmx_read_csr(uctl_ctl_reg);</div><div class='add'>+	uctl_ctl.s.uahc_rst = 0;</div><div class='add'>+	cvmx_write_csr(uctl_ctl_reg, uctl_ctl.u64);</div><div class='add'>+</div><div class='add'>+	/* Step 8e: Wait 10 controller-clock cycles. */</div><div class='add'>+	udelay(10);</div><div class='add'>+</div><div class='add'>+	/* Step 9: Enable conditional coprocessor clock of UCTL. */</div><div class='add'>+	uctl_ctl.u64 = cvmx_read_csr(uctl_ctl_reg);</div><div class='add'>+	uctl_ctl.s.csclk_en = 1;</div><div class='add'>+	cvmx_write_csr(uctl_ctl_reg, uctl_ctl.u64);</div><div class='add'>+</div><div class='add'>+	/*Step 10: Set for host mode only. */</div><div class='add'>+	uctl_ctl.u64 = cvmx_read_csr(uctl_ctl_reg);</div><div class='add'>+	uctl_ctl.s.drd_mode = 0;</div><div class='add'>+	cvmx_write_csr(uctl_ctl_reg, uctl_ctl.u64);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dwc3_octeon_set_endian_mode(u64 base)</div><div class='add'>+{</div><div class='add'>+#define UCTL_SHIM_CFG	0xe8</div><div class='add'>+	union cvm_usbdrd_uctl_shim_cfg shim_cfg;</div><div class='add'>+</div><div class='add'>+	shim_cfg.u64 = cvmx_read_csr(base + UCTL_SHIM_CFG);</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='add'>+	shim_cfg.s.dma_endian_mode = 1;</div><div class='add'>+	shim_cfg.s.csr_endian_mode = 1;</div><div class='add'>+#else</div><div class='add'>+	shim_cfg.s.dma_endian_mode = 0;</div><div class='add'>+	shim_cfg.s.csr_endian_mode = 0;</div><div class='add'>+#endif</div><div class='add'>+	cvmx_write_csr(base + UCTL_SHIM_CFG, shim_cfg.u64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CVMX_USBDRDX_UCTL_CTL(index)				\</div><div class='add'>+		(CVMX_ADD_IO_SEG(0x0001180068000000ull) +	\</div><div class='add'>+		((index &amp; 1) * 0x1000000ull))</div><div class='add'>+static void __init dwc3_octeon_phy_reset(u64 base)</div><div class='add'>+{</div><div class='add'>+	union cvm_usbdrd_uctl_ctl uctl_ctl;</div><div class='add'>+	int index = (base &gt;&gt; 24) &amp; 1;</div><div class='add'>+</div><div class='add'>+	uctl_ctl.u64 = cvmx_read_csr(CVMX_USBDRDX_UCTL_CTL(index));</div><div class='add'>+	uctl_ctl.s.uphy_rst = 0;</div><div class='add'>+	cvmx_write_csr(CVMX_USBDRDX_UCTL_CTL(index), uctl_ctl.u64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init dwc3_octeon_device_init(void)</div><div class='add'>+{</div><div class='add'>+	const char compat_node_name[] = "cavium,octeon-7130-usb-uctl";</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	struct device_node *node;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There should only be three universal controllers, "uctl"</div><div class='add'>+	 * in the device tree. Two USB and a SATA, which we ignore.</div><div class='add'>+	 */</div><div class='add'>+	node = NULL;</div><div class='add'>+	do {</div><div class='add'>+		node = of_find_node_by_name(node, "uctl");</div><div class='add'>+		if (!node)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		if (of_device_is_compatible(node, compat_node_name)) {</div><div class='add'>+			pdev = of_find_device_by_node(node);</div><div class='add'>+			if (!pdev)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+</div><div class='add'>+			res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+			if (res == NULL) {</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "No memory resources\n");</div><div class='add'>+				return -ENXIO;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * The code below maps in the registers necessary for</div><div class='add'>+			 * setting up the clocks and reseting PHYs. We must</div><div class='add'>+			 * release the resources so the dwc3 subsystem doesn't</div><div class='add'>+			 * know the difference.</div><div class='add'>+			 */</div><div class='add'>+			base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+			if (IS_ERR(base))</div><div class='add'>+				return PTR_ERR(base);</div><div class='add'>+</div><div class='add'>+			mutex_lock(&amp;dwc3_octeon_clocks_mutex);</div><div class='add'>+			dwc3_octeon_clocks_start(&amp;pdev-&gt;dev, (u64)base);</div><div class='add'>+			dwc3_octeon_set_endian_mode((u64)base);</div><div class='add'>+			dwc3_octeon_phy_reset((u64)base);</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev, "clocks initialized.\n");</div><div class='add'>+			mutex_unlock(&amp;dwc3_octeon_clocks_mutex);</div><div class='add'>+			devm_iounmap(&amp;pdev-&gt;dev, base);</div><div class='add'>+			devm_release_mem_region(&amp;pdev-&gt;dev, res-&gt;start,</div><div class='add'>+						resource_size(res));</div><div class='add'>+		}</div><div class='add'>+	} while (node != NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+device_initcall(dwc3_octeon_device_init);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David Daney &lt;david.daney@cavium.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("USB driver for OCTEON III SoC");</div><div class='head'>diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c<br/>index 9a2db1c013d9..d9dbeb0b165b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/setup.c</a></div><div class='hunk'>@@ -949,6 +949,29 @@ static __init void memory_exclude_page(u64 addr, u64 *mem, u64 *size)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_CRASH_DUMP */</div><div class='ctx'> </div><div class='add'>+void __init fw_init_cmdline(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	octeon_boot_desc_ptr = (struct octeon_boot_descriptor *)fw_arg3;</div><div class='add'>+	for (i = 0; i &lt; octeon_boot_desc_ptr-&gt;argc; i++) {</div><div class='add'>+		const char *arg =</div><div class='add'>+			cvmx_phys_to_ptr(octeon_boot_desc_ptr-&gt;argv[i]);</div><div class='add'>+		if (strlen(arcs_cmdline) + strlen(arg) + 1 &lt;</div><div class='add'>+			   sizeof(arcs_cmdline) - 1) {</div><div class='add'>+			strcat(arcs_cmdline, " ");</div><div class='add'>+			strcat(arcs_cmdline, arg);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init *plat_get_fdt(void)</div><div class='add'>+{</div><div class='add'>+	octeon_bootinfo =</div><div class='add'>+		cvmx_phys_to_ptr(octeon_boot_desc_ptr-&gt;cvmx_desc_vaddr);</div><div class='add'>+	return phys_to_virt(octeon_bootinfo-&gt;fdt_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t mem_alloc_size;</div><div class='head'>diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c<br/>index 256fe6f65cf2..4b94b7fbafa3 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/cavium-octeon/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/cavium-octeon/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/cavium-octeon/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/cavium-octeon/smp.c</a></div><div class='hunk'>@@ -11,7 +11,9 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='hunk'>@@ -24,12 +26,17 @@</div><div class='ctx'> volatile unsigned long octeon_processor_boot = 0xff;</div><div class='ctx'> volatile unsigned long octeon_processor_sp;</div><div class='ctx'> volatile unsigned long octeon_processor_gp;</div><div class='add'>+#ifdef CONFIG_RELOCATABLE</div><div class='add'>+volatile unsigned long octeon_processor_relocated_kernel_entry;</div><div class='add'>+#endif /* CONFIG_RELOCATABLE */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> uint64_t octeon_bootloader_entry_addr;</div><div class='ctx'> EXPORT_SYMBOL(octeon_bootloader_entry_addr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+extern void kernel_entry(unsigned long arg1, ...);</div><div class='add'>+</div><div class='ctx'> static void octeon_icache_flush(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("synci 0($0)\n");</div><div class='hunk'>@@ -180,6 +187,19 @@ static void __init octeon_smp_setup(void)</div><div class='ctx'> 	octeon_smp_hotplug_setup();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RELOCATABLE</div><div class='add'>+int plat_post_relocation(long offset)</div><div class='add'>+{</div><div class='add'>+	unsigned long entry = (unsigned long)kernel_entry;</div><div class='add'>+</div><div class='add'>+	/* Send secondaries into relocated kernel */</div><div class='add'>+	octeon_processor_relocated_kernel_entry = entry + offset;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_RELOCATABLE */</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * Firmware CPU startup hook</div><div class='ctx'>  *</div><div class='hunk'>@@ -272,7 +292,6 @@ static int octeon_cpu_disable(void)</div><div class='ctx'> </div><div class='ctx'> 	set_cpu_online(cpu, false);</div><div class='ctx'> 	calculate_cpu_foreign_map();</div><div class='del'>-	cpumask_clear_cpu(cpu, &amp;cpu_callin_map);</div><div class='ctx'> 	octeon_fixup_irqs();</div><div class='ctx'> </div><div class='ctx'> 	__flush_cache_all();</div><div class='hunk'>@@ -333,8 +352,6 @@ void play_dead(void)</div><div class='ctx'> 		;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void kernel_entry(unsigned long arg1, ...);</div><div class='del'>-</div><div class='ctx'> static void start_after_reset(void)</div><div class='ctx'> {</div><div class='ctx'> 	kernel_entry(0, 0, 0);	/* set a2 = 0 for secondary core */</div><div class='head'>diff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig<br/>index 4eb5d6e9cf8f..3cefa6bc01dd 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/bmips_stb_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/bmips_stb_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/bmips_stb_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/bmips_stb_defconfig</a></div><div class='hunk'>@@ -9,13 +9,20 @@ CONFIG_MIPS_O32_FP64_SUPPORT=y</div><div class='ctx'> # CONFIG_SWAP is not set</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='del'>-CONFIG_RD_GZIP=y</div><div class='ctx'> CONFIG_EXPERT=y</div><div class='ctx'> # CONFIG_VM_EVENT_COUNTERS is not set</div><div class='ctx'> # CONFIG_SLUB_DEBUG is not set</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_CPU_FREQ=y</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='add'>+CONFIG_CPU_FREQ_GOV_POWERSAVE=y</div><div class='add'>+CONFIG_CPU_FREQ_GOV_USERSPACE=y</div><div class='add'>+CONFIG_CPU_FREQ_GOV_ONDEMAND=y</div><div class='add'>+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y</div><div class='add'>+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y</div><div class='add'>+CONFIG_BMIPS_CPUFREQ=y</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_PACKET_DIAG=y</div><div class='hunk'>@@ -24,7 +31,6 @@ CONFIG_INET=y</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='del'>-# CONFIG_INET_LRO is not set</div><div class='ctx'> # CONFIG_INET_DIAG is not set</div><div class='ctx'> CONFIG_CFG80211=y</div><div class='ctx'> CONFIG_NL80211_TESTMODE=y</div><div class='hunk'>@@ -34,8 +40,6 @@ CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_STANDALONE is not set</div><div class='ctx'> # CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='del'>-CONFIG_PRINTK_TIME=y</div><div class='del'>-CONFIG_BRCMSTB_GISB_ARB=y</div><div class='ctx'> CONFIG_MTD=y</div><div class='ctx'> CONFIG_MTD_CFI=y</div><div class='ctx'> CONFIG_MTD_CFI_INTELEXT=y</div><div class='hunk'>@@ -51,16 +55,15 @@ CONFIG_USB_USBNET=y</div><div class='ctx'> # CONFIG_INPUT is not set</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='ctx'> # CONFIG_VT is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_OF_PLATFORM=y</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='del'>-CONFIG_POWER_SUPPLY=y</div><div class='ctx'> CONFIG_POWER_RESET=y</div><div class='ctx'> CONFIG_POWER_RESET_BRCMSTB=y</div><div class='ctx'> CONFIG_POWER_RESET_SYSCON=y</div><div class='add'>+CONFIG_POWER_SUPPLY=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='hunk'>@@ -82,6 +85,7 @@ CONFIG_CIFS=y</div><div class='ctx'> CONFIG_NLS_CODEPAGE_437=y</div><div class='ctx'> CONFIG_NLS_ASCII=y</div><div class='ctx'> CONFIG_NLS_ISO8859_1=y</div><div class='add'>+CONFIG_PRINTK_TIME=y</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='head'>diff --git a/arch/mips/configs/cavium_octeon_defconfig b/arch/mips/configs/cavium_octeon_defconfig<br/>index d470d08362c0..31e3c4d9adb0 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/cavium_octeon_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/cavium_octeon_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/cavium_octeon_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/cavium_octeon_defconfig</a></div><div class='hunk'>@@ -45,6 +45,7 @@ CONFIG_SYN_COOKIES=y</div><div class='ctx'> # CONFIG_INET_LRO is not set</div><div class='ctx'> CONFIG_IPV6=y</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_DEVTMPFS=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> CONFIG_MTD=y</div><div class='ctx'> # CONFIG_MTD_OF_PARTS is not set</div><div class='head'>diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig<br/>index 5d83ff755547..ec8e9684296d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/ip22_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/ip22_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/ip22_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/ip22_defconfig</a></div><div class='hunk'>@@ -67,8 +67,8 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='del'>-CONFIG_NF_CT_PROTO_DCCP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CT_PROTO_DCCP=y</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='head'>diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig<br/>index 2b74aee320a1..e582069b44fd 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/ip27_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/ip27_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/ip27_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/ip27_defconfig</a></div><div class='hunk'>@@ -133,7 +133,7 @@ CONFIG_LIBFC=m</div><div class='ctx'> CONFIG_SCSI_QLOGIC_1280=y</div><div class='ctx'> CONFIG_SCSI_PMCRAID=m</div><div class='ctx'> CONFIG_SCSI_BFA_FC=m</div><div class='del'>-CONFIG_SCSI_DH=m</div><div class='add'>+CONFIG_SCSI_DH=y</div><div class='ctx'> CONFIG_SCSI_DH_RDAC=m</div><div class='ctx'> CONFIG_SCSI_DH_HP_SW=m</div><div class='ctx'> CONFIG_SCSI_DH_EMC=m</div><div class='hunk'>@@ -205,7 +205,6 @@ CONFIG_MLX4_EN=m</div><div class='ctx'> # CONFIG_MLX4_DEBUG is not set</div><div class='ctx'> CONFIG_TEHUTI=m</div><div class='ctx'> CONFIG_BNX2X=m</div><div class='del'>-CONFIG_QLGE=m</div><div class='ctx'> CONFIG_SFC=m</div><div class='ctx'> CONFIG_BE2NET=m</div><div class='ctx'> CONFIG_LIBERTAS_THINFIRM=m</div><div class='head'>diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig<br/>index 5da76e0e120f..8df80c6383f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/lemote2f_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/lemote2f_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/lemote2f_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/lemote2f_defconfig</a></div><div class='hunk'>@@ -39,8 +39,7 @@ CONFIG_HIBERNATION=y</div><div class='ctx'> CONFIG_PM_STD_PARTITION="/dev/hda3"</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='ctx'> CONFIG_CPU_FREQ_DEBUG=y</div><div class='del'>-CONFIG_CPU_FREQ_STAT=m</div><div class='del'>-CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='ctx'> CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_POWERSAVE=m</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_USERSPACE=m</div><div class='head'>diff --git a/arch/mips/configs/loongson1b_defconfig b/arch/mips/configs/loongson1b_defconfig<br/>index c442f27685f4..914c867887bd 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/loongson1b_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/loongson1b_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/loongson1b_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/loongson1b_defconfig</a></div><div class='hunk'>@@ -74,6 +74,10 @@ CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_LOONGSON1=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='add'>+CONFIG_WATCHDOG_SYSFS=y</div><div class='add'>+CONFIG_LOONGSON1_WDT=y</div><div class='ctx'> # CONFIG_VGA_CONSOLE is not set</div><div class='ctx'> CONFIG_HID_GENERIC=m</div><div class='ctx'> CONFIG_USB_HID=m</div><div class='head'>diff --git a/arch/mips/configs/loongson1c_defconfig b/arch/mips/configs/loongson1c_defconfig<br/>index 2304d4165773..68e42eff908e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/loongson1c_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/loongson1c_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/loongson1c_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/loongson1c_defconfig</a></div><div class='hunk'>@@ -75,6 +75,10 @@ CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_LOONGSON1=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='add'>+CONFIG_WATCHDOG_SYSFS=y</div><div class='add'>+CONFIG_LOONGSON1_WDT=y</div><div class='ctx'> # CONFIG_VGA_CONSOLE is not set</div><div class='ctx'> CONFIG_HID_GENERIC=m</div><div class='ctx'> CONFIG_USB_HID=m</div><div class='head'>diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig<br/>index 58d43f3c348d..078ecac071ab 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/malta_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/malta_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/malta_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/malta_defconfig</a></div><div class='hunk'>@@ -59,8 +59,8 @@ CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='del'>-CONFIG_NF_CT_PROTO_DCCP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CT_PROTO_DCCP=y</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='head'>diff --git a/arch/mips/configs/malta_kvm_defconfig b/arch/mips/configs/malta_kvm_defconfig<br/>index c8f7e2835840..e233f878afef 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/malta_kvm_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/malta_kvm_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/malta_kvm_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/malta_kvm_defconfig</a></div><div class='hunk'>@@ -60,8 +60,8 @@ CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='del'>-CONFIG_NF_CT_PROTO_DCCP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CT_PROTO_DCCP=y</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='head'>diff --git a/arch/mips/configs/malta_kvm_guest_defconfig b/arch/mips/configs/malta_kvm_guest_defconfig<br/>index d2f54e55356c..fbe085c328ab 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/malta_kvm_guest_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/malta_kvm_guest_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/malta_kvm_guest_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/malta_kvm_guest_defconfig</a></div><div class='hunk'>@@ -59,8 +59,8 @@ CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='del'>-CONFIG_NF_CT_PROTO_DCCP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CT_PROTO_DCCP=y</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='head'>diff --git a/arch/mips/configs/maltaup_xpa_defconfig b/arch/mips/configs/maltaup_xpa_defconfig<br/>index 3d0d9cb9673f..2942610e4082 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/maltaup_xpa_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/maltaup_xpa_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/maltaup_xpa_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/maltaup_xpa_defconfig</a></div><div class='hunk'>@@ -61,8 +61,8 @@ CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='del'>-CONFIG_NF_CT_PROTO_DCCP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CT_PROTO_DCCP=y</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='head'>diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig<br/>index b496c25fced6..07d01827a973 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/nlm_xlp_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/nlm_xlp_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/nlm_xlp_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/nlm_xlp_defconfig</a></div><div class='hunk'>@@ -110,7 +110,7 @@ CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='head'>diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig<br/>index 8e99ad807a57..f59969acb724 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/nlm_xlr_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/nlm_xlr_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/nlm_xlr_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/nlm_xlr_defconfig</a></div><div class='hunk'>@@ -90,7 +90,7 @@ CONFIG_NETFILTER=y</div><div class='ctx'> CONFIG_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='head'>diff --git a/arch/mips/configs/xilfpga_defconfig b/arch/mips/configs/xilfpga_defconfig<br/>index ed1dce348320..829c637be3fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/xilfpga_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/xilfpga_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/xilfpga_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/xilfpga_defconfig</a></div><div class='hunk'>@@ -7,6 +7,12 @@ CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_BLOCK is not set</div><div class='ctx'> # CONFIG_SUSPEND is not set</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_WIRELESS is not set</div><div class='ctx'> # CONFIG_UEVENT_HELPER is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -14,6 +20,30 @@ CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> # CONFIG_ALLOW_DEV_COREDUMP is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NET_CORE is not set</div><div class='add'>+# CONFIG_NET_VENDOR_ARC is not set</div><div class='add'>+# CONFIG_NET_CADENCE is not set</div><div class='add'>+# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_EZCHIP is not set</div><div class='add'>+# CONFIG_NET_VENDOR_INTEL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MARVELL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MICREL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NETRONOME is not set</div><div class='add'>+# CONFIG_NET_VENDOR_QUALCOMM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_RENESAS is not set</div><div class='add'>+# CONFIG_NET_VENDOR_ROCKER is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SAMSUNG is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SMSC is not set</div><div class='add'>+# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SYNOPSYS is not set</div><div class='add'>+# CONFIG_NET_VENDOR_VIA is not set</div><div class='add'>+# CONFIG_NET_VENDOR_WIZNET is not set</div><div class='add'>+CONFIG_XILINX_EMACLITE=y</div><div class='add'>+CONFIG_SMSC_PHY=y</div><div class='add'>+# CONFIG_WLAN is not set</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> # CONFIG_INPUT_KEYBOARD is not set</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='hunk'>@@ -25,13 +55,18 @@ CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_OF_PLATFORM=y</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+# CONFIG_I2C_HELPER_AUTO is not set</div><div class='add'>+CONFIG_I2C_XILINX=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_GPIO_XILINX=y</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_SENSORS_ADT7410=y</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> # CONFIG_MIPS_PLATFORM_DEVICES is not set</div><div class='ctx'> # CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> # CONFIG_PROC_PAGE_MONITOR is not set</div><div class='add'>+CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_MISC_FILESYSTEMS is not set</div><div class='ctx'> CONFIG_PANIC_ON_OOPS=y</div><div class='ctx'> # CONFIG_SCHED_DEBUG is not set</div><div class='head'>diff --git a/arch/mips/configs/xway_defconfig b/arch/mips/configs/xway_defconfig<br/>index 8987846240f7..4365108bef77 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/configs/xway_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/configs/xway_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/configs/xway_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/configs/xway_defconfig</a></div><div class='hunk'>@@ -1,12 +1,16 @@</div><div class='ctx'> CONFIG_LANTIQ=y</div><div class='add'>+CONFIG_PCI_LANTIQ=y</div><div class='ctx'> CONFIG_XRX200_PHY_FW=y</div><div class='ctx'> CONFIG_CPU_MIPS32_R2=y</div><div class='add'>+CONFIG_MIPS_MT_SMP=y</div><div class='add'>+CONFIG_MIPS_VPE_LOADER=y</div><div class='ctx'> # CONFIG_COMPACTION is not set</div><div class='del'>-# CONFIG_CROSS_MEMORY_ATTACH is not set</div><div class='add'>+CONFIG_NR_CPUS=2</div><div class='ctx'> CONFIG_HZ_100=y</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> # CONFIG_LOCALVERSION_AUTO is not set</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_CROSS_MEMORY_ATTACH is not set</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='ctx'> # CONFIG_RD_GZIP is not set</div><div class='hunk'>@@ -22,8 +26,8 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_BLK_DEV_BSG is not set</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_PCI=y</div><div class='ctx'> # CONFIG_COREDUMP is not set</div><div class='del'>-# CONFIG_SUSPEND is not set</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='hunk'>@@ -35,12 +39,10 @@ CONFIG_IP_ROUTE_MULTIPATH=y</div><div class='ctx'> CONFIG_IP_ROUTE_VERBOSE=y</div><div class='ctx'> CONFIG_IP_MROUTE=y</div><div class='ctx'> CONFIG_IP_MROUTE_MULTIPLE_TABLES=y</div><div class='del'>-CONFIG_ARPD=y</div><div class='ctx'> CONFIG_SYN_COOKIES=y</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='del'>-# CONFIG_INET_LRO is not set</div><div class='ctx'> # CONFIG_INET_DIAG is not set</div><div class='ctx'> CONFIG_TCP_CONG_ADVANCED=y</div><div class='ctx'> # CONFIG_TCP_CONG_BIC is not set</div><div class='hunk'>@@ -62,7 +64,6 @@ CONFIG_NETFILTER_XT_MATCH_MAC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='del'>-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_FILTER=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_REJECT=m</div><div class='hunk'>@@ -84,6 +85,8 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='ctx'> CONFIG_MTD_PHYSMAP=y</div><div class='ctx'> CONFIG_MTD_PHYSMAP_OF=y</div><div class='ctx'> CONFIG_MTD_LANTIQ=y</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+CONFIG_MTD_NAND_XWAY=y</div><div class='ctx'> CONFIG_EEPROM_93CX6=m</div><div class='ctx'> CONFIG_SCSI=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='hunk'>@@ -91,6 +94,7 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_LANTIQ_ETOP=y</div><div class='ctx'> # CONFIG_NET_VENDOR_WIZNET is not set</div><div class='ctx'> CONFIG_PHYLIB=y</div><div class='add'>+CONFIG_INTEL_XWAY_PHY=y</div><div class='ctx'> CONFIG_PPP=m</div><div class='ctx'> CONFIG_PPP_FILTER=y</div><div class='ctx'> CONFIG_PPP_MULTILINK=y</div><div class='hunk'>@@ -111,17 +115,21 @@ CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_8250_RUNTIME_UARTS=2</div><div class='ctx'> CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+CONFIG_SERIAL_LANTIQ=y</div><div class='ctx'> CONFIG_SPI=y</div><div class='ctx'> CONFIG_GPIO_MM_LANTIQ=y</div><div class='ctx'> CONFIG_GPIO_STP_XWAY=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_LANTIQ_WDT=y</div><div class='ctx'> # CONFIG_HID is not set</div><div class='ctx'> # CONFIG_USB_HID is not set</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> CONFIG_USB_ANNOUNCE_NEW_DEVICES=y</div><div class='ctx'> CONFIG_USB_STORAGE=y</div><div class='ctx'> CONFIG_USB_STORAGE_DEBUG=y</div><div class='add'>+CONFIG_USB_DWC2=y</div><div class='add'>+CONFIG_USB_DWC2_PCI=y</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='ctx'> CONFIG_LEDS_CLASS=y</div><div class='ctx'> CONFIG_LEDS_TRIGGERS=y</div><div class='hunk'>@@ -151,9 +159,6 @@ CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> # CONFIG_SCHED_DEBUG is not set</div><div class='ctx'> # CONFIG_FTRACE is not set</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='del'>-CONFIG_CRYPTO_MANAGER=m</div><div class='ctx'> CONFIG_CRYPTO_ARC4=m</div><div class='del'>-# CONFIG_CRYPTO_ANSI_CPRNG is not set</div><div class='ctx'> CONFIG_CRC_ITU_T=m</div><div class='ctx'> CONFIG_CRC32_SARWATE=y</div><div class='del'>-CONFIG_AVERAGE=y</div><div class='head'>diff --git a/arch/mips/dec/kn01-berr.c b/arch/mips/dec/kn01-berr.c<br/>index 44d8a87a8a68..e9d2db480aeb 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/dec/kn01-berr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/dec/kn01-berr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/dec/kn01-berr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/dec/kn01-berr.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dec/kn01.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/dec/prom/identify.c b/arch/mips/dec/prom/identify.c<br/>index 95e26f4bb38f..0c14a9d6a84a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/dec/prom/identify.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/dec/prom/identify.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/dec/prom/identify.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/dec/prom/identify.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mc146818rtc.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c<br/>index 1c3bf9fe926f..61a0bf13e308 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/dec/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/dec/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/dec/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/dec/setup.c</a></div><div class='hunk'>@@ -9,12 +9,12 @@</div><div class='ctx'>  * Copyright (C) 2000, 2001, 2002, 2003, 2005  Maciej W. Rozycki</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/irqnr.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/percpu-defs.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/mips/dec/wbflush.c b/arch/mips/dec/wbflush.c<br/>index 56bda4a396b5..dad64d1789b2 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/dec/wbflush.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/dec/wbflush.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/dec/wbflush.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/dec/wbflush.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  * Copyright (C) 2002 Maciej W. Rozycki</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='hunk'>@@ -88,7 +89,4 @@ static void wbflush_mips(void)</div><div class='ctx'> {</div><div class='ctx'> 	__fast_iob();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(__wbflush);</div><div class='head'>diff --git a/arch/mips/emma/markeins/setup.c b/arch/mips/emma/markeins/setup.c<br/>index 9100122e5cef..44ff64a80255 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/emma/markeins/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/emma/markeins/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/emma/markeins/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/emma/markeins/setup.c</a></div><div class='hunk'>@@ -90,7 +90,7 @@ void __init plat_time_init(void)</div><div class='ctx'> static void markeins_board_init(void);</div><div class='ctx'> extern void markeins_irq_setup(void);</div><div class='ctx'> </div><div class='del'>-static void inline __init markeins_sio_setup(void)</div><div class='add'>+static inline void __init markeins_sio_setup(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/generic/Makefile b/arch/mips/generic/Makefile<br/>index 7c66494151db..acb9b6d62b16 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/generic/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/generic/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/generic/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/generic/Makefile</a></div><div class='hunk'>@@ -13,3 +13,4 @@ obj-y += irq.o</div><div class='ctx'> obj-y += proc.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_LEGACY_BOARD_SEAD3)	+= board-sead3.o</div><div class='add'>+obj-$(CONFIG_KEXEC)			+= kexec.o</div><div class='head'>diff --git a/arch/mips/generic/init.c b/arch/mips/generic/init.c<br/>index d493ccbf274a..4af619215410 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/generic/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/generic/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/generic/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/generic/init.c</a></div><div class='hunk'>@@ -88,6 +88,19 @@ void __init *plat_get_fdt(void)</div><div class='ctx'> 	return (void *)fdt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __init plat_fdt_relocated(void *new_location)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * reset fdt as the cached value would point to the location</div><div class='add'>+	 * before relocations happened and update the location argument</div><div class='add'>+	 * if it was passed using UHI</div><div class='add'>+	 */</div><div class='add'>+	fdt = NULL;</div><div class='add'>+</div><div class='add'>+	if (fw_arg0 == -2)</div><div class='add'>+		fw_arg1 = (unsigned long)new_location;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (mach &amp;&amp; mach-&gt;fixup_fdt)</div><div class='head'>diff --git a/arch/mips/generic/kexec.c b/arch/mips/generic/kexec.c<br/>new file mode 100644<br/>index 000000000000..e9fb735299e3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/mips/generic/kexec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/generic/kexec.c</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Imagination Technologies</div><div class='add'>+ * Author: Marcin Nowakowski &lt;marcin.nowakowski@imgtec.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/libfdt.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+static int generic_kexec_prepare(struct kimage *image)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; image-&gt;nr_segments; i++) {</div><div class='add'>+		struct fdt_header fdt;</div><div class='add'>+</div><div class='add'>+		if (image-&gt;segment[i].memsz &lt;= sizeof(fdt))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(&amp;fdt, image-&gt;segment[i].buf, sizeof(fdt)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (fdt_check_header(&amp;fdt))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		kexec_args[0] = -2;</div><div class='add'>+		kexec_args[1] = (unsigned long)</div><div class='add'>+			phys_to_virt((unsigned long)image-&gt;segment[i].mem);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init register_generic_kexec(void)</div><div class='add'>+{</div><div class='add'>+	_machine_kexec_prepare = generic_kexec_prepare;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+arch_initcall(register_generic_kexec);</div><div class='head'>diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild<br/>index 9740066cc631..2535c7b4c482 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,15 +1,14 @@</div><div class='ctx'> # MIPS headers</div><div class='ctx'> generic-(CONFIG_GENERIC_CSUM) += checksum.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += dma-contiguous.h</div><div class='ctx'> generic-y += emergency-restart.h</div><div class='add'>+generic-y += export.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='del'>-generic-y += mutex.h</div><div class='ctx'> generic-y += parport.h</div><div class='ctx'> generic-y += percpu.h</div><div class='ctx'> generic-y += preempt.h</div><div class='hunk'>@@ -17,6 +16,7 @@ generic-y += sections.h</div><div class='ctx'> generic-y += segment.h</div><div class='ctx'> generic-y += serial.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='add'>+generic-y += unaligned.h</div><div class='ctx'> generic-y += user.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='head'>diff --git a/arch/mips/include/asm/abi.h b/arch/mips/include/asm/abi.h<br/>index 940760844e2f..dba7f4b6bebf 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/abi.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/abi.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/abi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/abi.h</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> #ifndef _ASM_ABI_H</div><div class='ctx'> #define _ASM_ABI_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/signal_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='ctx'> #include &lt;asm/siginfo.h&gt;</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='head'>diff --git a/arch/mips/include/asm/asm-prototypes.h b/arch/mips/include/asm/asm-prototypes.h<br/>new file mode 100644<br/>index 000000000000..a160cf69bb92<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/asm-prototypes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/asm-prototypes.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+#include &lt;asm/checksum.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/fpu.h&gt;</div><div class='add'>+#include &lt;asm-generic/asm-prototypes.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h<br/>index 7c26b28bf252..859cf7048347 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/asm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/asm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/asm.h</a></div><div class='hunk'>@@ -54,7 +54,8 @@</div><div class='ctx'> 		.align	2;				\</div><div class='ctx'> 		.type	symbol, @function;		\</div><div class='ctx'> 		.ent	symbol, 0;			\</div><div class='del'>-symbol:		.frame	sp, 0, ra</div><div class='add'>+symbol:		.frame	sp, 0, ra;			\</div><div class='add'>+		.insn</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * NESTED - declare nested routine entry point</div><div class='hunk'>@@ -63,8 +64,9 @@ symbol:		.frame	sp, 0, ra</div><div class='ctx'> 		.globl	symbol;				\</div><div class='ctx'> 		.align	2;				\</div><div class='ctx'> 		.type	symbol, @function;		\</div><div class='del'>-		.ent	symbol, 0;			 \</div><div class='del'>-symbol:		.frame	sp, framesize, rpc</div><div class='add'>+		.ent	symbol, 0;			\</div><div class='add'>+symbol:		.frame	sp, framesize, rpc;		\</div><div class='add'>+		.insn</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * END - mark end of function</div><div class='hunk'>@@ -86,7 +88,7 @@ symbol:</div><div class='ctx'> #define FEXPORT(symbol)					\</div><div class='ctx'> 		.globl	symbol;				\</div><div class='ctx'> 		.type	symbol, @function;		\</div><div class='del'>-symbol:</div><div class='add'>+symbol:		.insn</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ABS - export absolute symbol</div><div class='head'>diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h<br/>index ee9f5f2d18fc..e26a093bb17a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/bootinfo.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/bootinfo.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/bootinfo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/bootinfo.h</a></div><div class='hunk'>@@ -164,6 +164,19 @@ static inline void plat_swiotlb_setup(void) {}</div><div class='ctx'>  * Return: Pointer to the flattened device tree blob.</div><div class='ctx'>  */</div><div class='ctx'> extern void *plat_get_fdt(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RELOCATABLE</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * plat_fdt_relocated() - Update platform's information about relocated dtb</div><div class='add'>+ *</div><div class='add'>+ * This function provides a platform-independent API to set platform's</div><div class='add'>+ * information about relocated DTB if it needs to be moved due to kernel</div><div class='add'>+ * relocation occurring at boot.</div><div class='add'>+ */</div><div class='add'>+void plat_fdt_relocated(void *new_location);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_RELOCATABLE */</div><div class='ctx'> #endif /* CONFIG_USE_OF */</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_BOOTINFO_H */</div><div class='head'>diff --git a/arch/mips/include/asm/checksum.h b/arch/mips/include/asm/checksum.h<br/>index bce1ce53149a..c8b574f7e0cc 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/checksum.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/checksum.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/checksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/checksum.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * computes the checksum of a memory block at buff, length len,</div><div class='hunk'>@@ -186,7 +186,9 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,</div><div class='ctx'> 	"	daddu	%0, %4		\n"</div><div class='ctx'> 	"	dsll32	$1, %0, 0	\n"</div><div class='ctx'> 	"	daddu	%0, $1		\n"</div><div class='add'>+	"	sltu	$1, %0, $1	\n"</div><div class='ctx'> 	"	dsra32	%0, %0, 0	\n"</div><div class='add'>+	"	addu	%0, $1		\n"</div><div class='ctx'> #endif</div><div class='ctx'> 	"	.set	pop"</div><div class='ctx'> 	: "=r" (sum)</div><div class='head'>diff --git a/arch/mips/include/asm/compat-signal.h b/arch/mips/include/asm/compat-signal.h<br/>index 64e0b9343b8c..4c6176467146 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/compat-signal.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/compat-signal.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/compat-signal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/compat-signal.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='ctx'> #include &lt;asm/siginfo.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int __copy_conv_sigset_to_user(compat_sigset_t __user *d,</div><div class='ctx'> 	const sigset_t *s)</div><div class='head'>diff --git a/arch/mips/include/asm/device.h b/arch/mips/include/asm/device.h<br/>index 21c2082a0dfb..6aa796f1081a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/device.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/device.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/device.h</a></div><div class='hunk'>@@ -6,12 +6,7 @@</div><div class='ctx'> #ifndef _ASM_MIPS_DEVICE_H</div><div class='ctx'> #define _ASM_MIPS_DEVICE_H</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops;</div><div class='del'>-</div><div class='ctx'> struct dev_archdata {</div><div class='del'>-	/* DMA operations on that device */</div><div class='del'>-	struct dma_map_ops *dma_ops;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_DMA_PERDEV_COHERENT</div><div class='ctx'> 	/* Non-zero if DMA is coherent with CPU caches */</div><div class='ctx'> 	bool dma_coherent;</div><div class='head'>diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h<br/>index 7aa71b9b0258..aba71385f9d1 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -9,14 +9,11 @@</div><div class='ctx'> #include &lt;dma-coherence.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops *mips_dma_map_ops;</div><div class='add'>+extern const struct dma_map_ops *mips_dma_map_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='del'>-	if (dev &amp;&amp; dev-&gt;archdata.dma_ops)</div><div class='del'>-		return dev-&gt;archdata.dma_ops;</div><div class='del'>-	else</div><div class='del'>-		return mips_dma_map_ops;</div><div class='add'>+	return mips_dma_map_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)</div><div class='head'>diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h<br/>index 2b3dc2973670..0eb1a75be105 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/elf.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/elf.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/elf.h</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/auxvec.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;uapi/linux/elf.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='hunk'>@@ -210,6 +212,9 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];</div><div class='ctx'> typedef double elf_fpreg_t;</div><div class='ctx'> typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];</div><div class='ctx'> </div><div class='add'>+void mips_dump_regs32(u32 *uregs, const struct pt_regs *regs);</div><div class='add'>+void mips_dump_regs64(u64 *uregs, const struct pt_regs *regs);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_32BIT</div><div class='ctx'> /*</div><div class='ctx'>  * This is used to ensure we don't load something for the wrong architecture.</div><div class='hunk'>@@ -221,6 +226,9 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];</div><div class='ctx'>  */</div><div class='ctx'> #define ELF_CLASS	ELFCLASS32</div><div class='ctx'> </div><div class='add'>+#define ELF_CORE_COPY_REGS(dest, regs) \</div><div class='add'>+	mips_dump_regs32((u32 *)&amp;(dest), (regs));</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_32BIT */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='hunk'>@@ -234,6 +242,9 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];</div><div class='ctx'>  */</div><div class='ctx'> #define ELF_CLASS	ELFCLASS64</div><div class='ctx'> </div><div class='add'>+#define ELF_CORE_COPY_REGS(dest, regs) \</div><div class='add'>+	mips_dump_regs64((u64 *)&amp;(dest), (regs));</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_64BIT */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/mips/include/asm/fpu.h b/arch/mips/include/asm/fpu.h<br/>index f06f97bd62df..321752bcbab6 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/fpu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/fpu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/fpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/fpu.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #define _ASM_FPU_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/include/asm/highmem.h b/arch/mips/include/asm/highmem.h<br/>index 64f2500d891b..d34536e7653f 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/highmem.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/highmem.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/highmem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/highmem.h</a></div><div class='hunk'>@@ -25,9 +25,6 @@</div><div class='ctx'> #include &lt;asm/cpu-features.h&gt;</div><div class='ctx'> #include &lt;asm/kmap_types.h&gt;</div><div class='ctx'> </div><div class='del'>-/* undef for production */</div><div class='del'>-#define HIGHMEM_DEBUG 1</div><div class='del'>-</div><div class='ctx'> /* declarations for highmem.c */</div><div class='ctx'> extern unsigned long highstart_pfn, highend_pfn;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/include/asm/i8259.h b/arch/mips/include/asm/i8259.h<br/>index 32229c77906a..47543d56438a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/i8259.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/i8259.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/i8259.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/i8259.h</a></div><div class='hunk'>@@ -40,7 +40,6 @@ extern raw_spinlock_t i8259A_lock;</div><div class='ctx'> extern void make_8259A_irq(unsigned int irq);</div><div class='ctx'> </div><div class='ctx'> extern void init_i8259_irqs(void);</div><div class='del'>-extern int i8259_of_init(struct device_node *node, struct device_node *parent);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * i8159_set_poll() - Override the i8259 polling function</div><div class='head'>diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h<br/>index 6bf10e796553..956db6e201d1 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/irq.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/irq.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/irq.h</a></div><div class='hunk'>@@ -17,6 +17,18 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#define IRQ_STACK_SIZE			THREAD_SIZE</div><div class='add'>+</div><div class='add'>+extern void *irq_stack[NR_CPUS];</div><div class='add'>+</div><div class='add'>+static inline bool on_irq_stack(int cpu, unsigned long sp)</div><div class='add'>+{</div><div class='add'>+	unsigned long low = (unsigned long)irq_stack[cpu];</div><div class='add'>+	unsigned long high = low + IRQ_STACK_SIZE;</div><div class='add'>+</div><div class='add'>+	return (low &lt;= sp &amp;&amp; sp &lt;= high);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_I8259</div><div class='ctx'> static inline int irq_canonicalize(int irq)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/include/asm/kprobes.h b/arch/mips/include/asm/kprobes.h<br/>index daba1f9a4f79..291846d9ba83 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/kprobes.h</a></div><div class='hunk'>@@ -22,6 +22,9 @@</div><div class='ctx'> #ifndef _ASM_KPROBES_H</div><div class='ctx'> #define _ASM_KPROBES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -94,4 +97,5 @@ struct kprobe_ctlblk {</div><div class='ctx'> extern int kprobe_exceptions_notify(struct notifier_block *self,</div><div class='ctx'> 				    unsigned long val, void *data);</div><div class='ctx'> </div><div class='del'>-#endif				/* _ASM_KPROBES_H */</div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='add'>+#endif /* _ASM_KPROBES_H */</div><div class='head'>diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h<br/>index bebec370324f..05e785fc061d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/kvm_host.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/kvm_host.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/kvm_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/kvm_host.h</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> #define KVM_REG_MIPS_CP0_ENTRYHI	MIPS_CP0_64(10, 0)</div><div class='ctx'> #define KVM_REG_MIPS_CP0_COMPARE	MIPS_CP0_32(11, 0)</div><div class='ctx'> #define KVM_REG_MIPS_CP0_STATUS		MIPS_CP0_32(12, 0)</div><div class='add'>+#define KVM_REG_MIPS_CP0_INTCTL		MIPS_CP0_32(12, 1)</div><div class='ctx'> #define KVM_REG_MIPS_CP0_CAUSE		MIPS_CP0_32(13, 0)</div><div class='ctx'> #define KVM_REG_MIPS_CP0_EPC		MIPS_CP0_64(14, 0)</div><div class='ctx'> #define KVM_REG_MIPS_CP0_PRID		MIPS_CP0_32(15, 0)</div><div class='hunk'>@@ -64,7 +65,7 @@</div><div class='ctx'> #define KVM_REG_MIPS_CP0_KSCRATCH6	MIPS_CP0_64(31, 7)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define KVM_MAX_VCPUS		1</div><div class='add'>+#define KVM_MAX_VCPUS		8</div><div class='ctx'> #define KVM_USER_MEM_SLOTS	8</div><div class='ctx'> /* memory slots that does not exposed to userspace */</div><div class='ctx'> #define KVM_PRIVATE_MEM_SLOTS	0</div><div class='hunk'>@@ -88,6 +89,7 @@</div><div class='ctx'> </div><div class='ctx'> #define KVM_GUEST_KUSEG			0x00000000UL</div><div class='ctx'> #define KVM_GUEST_KSEG0			0x40000000UL</div><div class='add'>+#define KVM_GUEST_KSEG1			0x40000000UL</div><div class='ctx'> #define KVM_GUEST_KSEG23		0x60000000UL</div><div class='ctx'> #define KVM_GUEST_KSEGX(a)		((_ACAST32_(a)) &amp; 0xe0000000)</div><div class='ctx'> #define KVM_GUEST_CPHYSADDR(a)		((_ACAST32_(a)) &amp; 0x1fffffff)</div><div class='hunk'>@@ -104,7 +106,6 @@</div><div class='ctx'> #define KVM_GUEST_KSEG23ADDR(a)		(KVM_GUEST_CPHYSADDR(a) | KVM_GUEST_KSEG23)</div><div class='ctx'> </div><div class='ctx'> #define KVM_INVALID_PAGE		0xdeadbeef</div><div class='del'>-#define KVM_INVALID_INST		0xdeadbeef</div><div class='ctx'> #define KVM_INVALID_ADDR		0xdeadbeef</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -121,8 +122,6 @@ static inline bool kvm_is_error_hva(unsigned long addr)</div><div class='ctx'> 	return IS_ERR_VALUE(addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern atomic_t kvm_mips_instance;</div><div class='del'>-</div><div class='ctx'> struct kvm_vm_stat {</div><div class='ctx'> 	ulong remote_tlb_flush;</div><div class='ctx'> };</div><div class='hunk'>@@ -156,12 +155,8 @@ struct kvm_arch_memory_slot {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_arch {</div><div class='del'>-	/* Guest GVA-&gt;HPA page table */</div><div class='del'>-	unsigned long *guest_pmap;</div><div class='del'>-	unsigned long guest_pmap_npages;</div><div class='del'>-</div><div class='del'>-	/* Wired host TLB used for the commpage */</div><div class='del'>-	int commpage_tlb;</div><div class='add'>+	/* Guest physical mm */</div><div class='add'>+	struct mm_struct gpa_mm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define N_MIPS_COPROC_REGS	32</div><div class='hunk'>@@ -233,6 +228,7 @@ enum emulation_result {</div><div class='ctx'> 	EMULATE_FAIL,		/* can't emulate this instruction */</div><div class='ctx'> 	EMULATE_WAIT,		/* WAIT instruction */</div><div class='ctx'> 	EMULATE_PRIV_FAIL,</div><div class='add'>+	EMULATE_EXCEPT,		/* A guest exception has been generated */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define mips3_paddr_to_tlbpfn(x) \</div><div class='hunk'>@@ -250,6 +246,7 @@ enum emulation_result {</div><div class='ctx'> #define TLB_ASID(x)		((x).tlb_hi &amp; KVM_ENTRYHI_ASID)</div><div class='ctx'> #define TLB_LO_IDX(x, va)	(((va) &gt;&gt; PAGE_SHIFT) &amp; 1)</div><div class='ctx'> #define TLB_IS_VALID(x, va)	((x).tlb_lo[TLB_LO_IDX(x, va)] &amp; ENTRYLO_V)</div><div class='add'>+#define TLB_IS_DIRTY(x, va)	((x).tlb_lo[TLB_LO_IDX(x, va)] &amp; ENTRYLO_D)</div><div class='ctx'> #define TLB_HI_VPN2_HIT(x, y)	((TLB_VPN2(x) &amp; ~(x).tlb_mask) ==	\</div><div class='ctx'> 				 ((y) &amp; VPN2_MASK &amp; ~(x).tlb_mask))</div><div class='ctx'> #define TLB_HI_ASID_HIT(x, y)	(TLB_IS_GLOBAL(x) ||			\</div><div class='hunk'>@@ -261,6 +258,17 @@ struct kvm_mips_tlb {</div><div class='ctx'> 	long tlb_lo[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define KVM_NR_MEM_OBJS     4</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We don't want allocation failures within the mmu code, so we preallocate</div><div class='add'>+ * enough memory for a single page fault in a cache.</div><div class='add'>+ */</div><div class='add'>+struct kvm_mmu_memory_cache {</div><div class='add'>+	int nobjs;</div><div class='add'>+	void *objects[KVM_NR_MEM_OBJS];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define KVM_MIPS_AUX_FPU	0x1</div><div class='ctx'> #define KVM_MIPS_AUX_MSA	0x2</div><div class='ctx'> </div><div class='hunk'>@@ -275,6 +283,8 @@ struct kvm_vcpu_arch {</div><div class='ctx'> 	unsigned long host_cp0_badvaddr;</div><div class='ctx'> 	unsigned long host_cp0_epc;</div><div class='ctx'> 	u32 host_cp0_cause;</div><div class='add'>+	u32 host_cp0_badinstr;</div><div class='add'>+	u32 host_cp0_badinstrp;</div><div class='ctx'> </div><div class='ctx'> 	/* GPRS */</div><div class='ctx'> 	unsigned long gprs[32];</div><div class='hunk'>@@ -318,20 +328,18 @@ struct kvm_vcpu_arch {</div><div class='ctx'> 	/* Bitmask of pending exceptions to be cleared */</div><div class='ctx'> 	unsigned long pending_exceptions_clr;</div><div class='ctx'> </div><div class='del'>-	/* Save/Restore the entryhi register when are are preempted/scheduled back in */</div><div class='del'>-	unsigned long preempt_entryhi;</div><div class='del'>-</div><div class='ctx'> 	/* S/W Based TLB for guest */</div><div class='ctx'> 	struct kvm_mips_tlb guest_tlb[KVM_MIPS_GUEST_TLB_SIZE];</div><div class='ctx'> </div><div class='del'>-	/* Cached guest kernel/user ASIDs */</div><div class='del'>-	u32 guest_user_asid[NR_CPUS];</div><div class='del'>-	u32 guest_kernel_asid[NR_CPUS];</div><div class='add'>+	/* Guest kernel/user [partial] mm */</div><div class='ctx'> 	struct mm_struct guest_kernel_mm, guest_user_mm;</div><div class='ctx'> </div><div class='ctx'> 	/* Guest ASID of last user mode execution */</div><div class='ctx'> 	unsigned int last_user_gasid;</div><div class='ctx'> </div><div class='add'>+	/* Cache some mmu pages needed inside spinlock regions */</div><div class='add'>+	struct kvm_mmu_memory_cache mmu_page_cache;</div><div class='add'>+</div><div class='ctx'> 	int last_sched_cpu;</div><div class='ctx'> </div><div class='ctx'> 	/* WAIT executed */</div><div class='hunk'>@@ -339,14 +347,15 @@ struct kvm_vcpu_arch {</div><div class='ctx'> </div><div class='ctx'> 	u8 fpu_enabled;</div><div class='ctx'> 	u8 msa_enabled;</div><div class='del'>-	u8 kscratch_enabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define kvm_read_c0_guest_index(cop0)		(cop0-&gt;reg[MIPS_CP0_TLB_INDEX][0])</div><div class='ctx'> #define kvm_write_c0_guest_index(cop0, val)	(cop0-&gt;reg[MIPS_CP0_TLB_INDEX][0] = val)</div><div class='ctx'> #define kvm_read_c0_guest_entrylo0(cop0)	(cop0-&gt;reg[MIPS_CP0_TLB_LO0][0])</div><div class='add'>+#define kvm_write_c0_guest_entrylo0(cop0, val)	(cop0-&gt;reg[MIPS_CP0_TLB_LO0][0] = (val))</div><div class='ctx'> #define kvm_read_c0_guest_entrylo1(cop0)	(cop0-&gt;reg[MIPS_CP0_TLB_LO1][0])</div><div class='add'>+#define kvm_write_c0_guest_entrylo1(cop0, val)	(cop0-&gt;reg[MIPS_CP0_TLB_LO1][0] = (val))</div><div class='ctx'> #define kvm_read_c0_guest_context(cop0)		(cop0-&gt;reg[MIPS_CP0_TLB_CONTEXT][0])</div><div class='ctx'> #define kvm_write_c0_guest_context(cop0, val)	(cop0-&gt;reg[MIPS_CP0_TLB_CONTEXT][0] = (val))</div><div class='ctx'> #define kvm_read_c0_guest_userlocal(cop0)	(cop0-&gt;reg[MIPS_CP0_TLB_CONTEXT][2])</div><div class='hunk'>@@ -522,9 +531,17 @@ struct kvm_mips_callbacks {</div><div class='ctx'> 	int (*handle_msa_fpe)(struct kvm_vcpu *vcpu);</div><div class='ctx'> 	int (*handle_fpe)(struct kvm_vcpu *vcpu);</div><div class='ctx'> 	int (*handle_msa_disabled)(struct kvm_vcpu *vcpu);</div><div class='del'>-	int (*vm_init)(struct kvm *kvm);</div><div class='ctx'> 	int (*vcpu_init)(struct kvm_vcpu *vcpu);</div><div class='add'>+	void (*vcpu_uninit)(struct kvm_vcpu *vcpu);</div><div class='ctx'> 	int (*vcpu_setup)(struct kvm_vcpu *vcpu);</div><div class='add'>+	void (*flush_shadow_all)(struct kvm *kvm);</div><div class='add'>+	/*</div><div class='add'>+	 * Must take care of flushing any cached GPA PTEs (e.g. guest entries in</div><div class='add'>+	 * VZ root TLB, or T&amp;E GVA page tables and corresponding root TLB</div><div class='add'>+	 * mappings).</div><div class='add'>+	 */</div><div class='add'>+	void (*flush_shadow_memslot)(struct kvm *kvm,</div><div class='add'>+				     const struct kvm_memory_slot *slot);</div><div class='ctx'> 	gpa_t (*gva_to_gpa)(gva_t gva);</div><div class='ctx'> 	void (*queue_timer_int)(struct kvm_vcpu *vcpu);</div><div class='ctx'> 	void (*dequeue_timer_int)(struct kvm_vcpu *vcpu);</div><div class='hunk'>@@ -542,8 +559,10 @@ struct kvm_mips_callbacks {</div><div class='ctx'> 			   const struct kvm_one_reg *reg, s64 *v);</div><div class='ctx'> 	int (*set_one_reg)(struct kvm_vcpu *vcpu,</div><div class='ctx'> 			   const struct kvm_one_reg *reg, s64 v);</div><div class='del'>-	int (*vcpu_get_regs)(struct kvm_vcpu *vcpu);</div><div class='del'>-	int (*vcpu_set_regs)(struct kvm_vcpu *vcpu);</div><div class='add'>+	int (*vcpu_load)(struct kvm_vcpu *vcpu, int cpu);</div><div class='add'>+	int (*vcpu_put)(struct kvm_vcpu *vcpu, int cpu);</div><div class='add'>+	int (*vcpu_run)(struct kvm_run *run, struct kvm_vcpu *vcpu);</div><div class='add'>+	void (*vcpu_reenter)(struct kvm_run *run, struct kvm_vcpu *vcpu);</div><div class='ctx'> };</div><div class='ctx'> extern struct kvm_mips_callbacks *kvm_mips_callbacks;</div><div class='ctx'> int kvm_mips_emulation_init(struct kvm_mips_callbacks **install_callbacks);</div><div class='hunk'>@@ -556,6 +575,7 @@ extern int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu);</div><div class='ctx'> /* Building of entry/exception code */</div><div class='ctx'> int kvm_mips_entry_setup(void);</div><div class='ctx'> void *kvm_mips_build_vcpu_run(void *addr);</div><div class='add'>+void *kvm_mips_build_tlb_refill_exception(void *addr, void *handler);</div><div class='ctx'> void *kvm_mips_build_exception(void *addr, void *handler);</div><div class='ctx'> void *kvm_mips_build_exit(void *addr);</div><div class='ctx'> </div><div class='hunk'>@@ -580,54 +600,125 @@ u32 kvm_get_user_asid(struct kvm_vcpu *vcpu);</div><div class='ctx'> u32 kvm_get_commpage_asid (struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> extern int kvm_mips_handle_kseg0_tlb_fault(unsigned long badbaddr,</div><div class='del'>-					   struct kvm_vcpu *vcpu);</div><div class='add'>+					   struct kvm_vcpu *vcpu,</div><div class='add'>+					   bool write_fault);</div><div class='ctx'> </div><div class='ctx'> extern int kvm_mips_handle_commpage_tlb_fault(unsigned long badvaddr,</div><div class='ctx'> 					      struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> extern int kvm_mips_handle_mapped_seg_tlb_fault(struct kvm_vcpu *vcpu,</div><div class='del'>-						struct kvm_mips_tlb *tlb);</div><div class='add'>+						struct kvm_mips_tlb *tlb,</div><div class='add'>+						unsigned long gva,</div><div class='add'>+						bool write_fault);</div><div class='ctx'> </div><div class='ctx'> extern enum emulation_result kvm_mips_handle_tlbmiss(u32 cause,</div><div class='ctx'> 						     u32 *opc,</div><div class='ctx'> 						     struct kvm_run *run,</div><div class='del'>-						     struct kvm_vcpu *vcpu);</div><div class='del'>-</div><div class='del'>-extern enum emulation_result kvm_mips_handle_tlbmod(u32 cause,</div><div class='del'>-						    u32 *opc,</div><div class='del'>-						    struct kvm_run *run,</div><div class='del'>-						    struct kvm_vcpu *vcpu);</div><div class='add'>+						     struct kvm_vcpu *vcpu,</div><div class='add'>+						     bool write_fault);</div><div class='ctx'> </div><div class='ctx'> extern void kvm_mips_dump_host_tlbs(void);</div><div class='ctx'> extern void kvm_mips_dump_guest_tlbs(struct kvm_vcpu *vcpu);</div><div class='del'>-extern int kvm_mips_host_tlb_write(struct kvm_vcpu *vcpu, unsigned long entryhi,</div><div class='del'>-				   unsigned long entrylo0,</div><div class='del'>-				   unsigned long entrylo1,</div><div class='del'>-				   int flush_dcache_mask);</div><div class='del'>-extern void kvm_mips_flush_host_tlb(int skip_kseg0);</div><div class='del'>-extern int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long entryhi);</div><div class='add'>+extern int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long entryhi,</div><div class='add'>+				 bool user, bool kernel);</div><div class='ctx'> </div><div class='ctx'> extern int kvm_mips_guest_tlb_lookup(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				     unsigned long entryhi);</div><div class='del'>-extern int kvm_mips_host_tlb_lookup(struct kvm_vcpu *vcpu, unsigned long vaddr);</div><div class='del'>-extern unsigned long kvm_mips_translate_guest_kseg0_to_hpa(struct kvm_vcpu *vcpu,</div><div class='del'>-						   unsigned long gva);</div><div class='del'>-extern void kvm_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu,</div><div class='del'>-				    struct kvm_vcpu *vcpu);</div><div class='del'>-extern void kvm_local_flush_tlb_all(void);</div><div class='del'>-extern void kvm_mips_alloc_new_mmu_context(struct kvm_vcpu *vcpu);</div><div class='del'>-extern void kvm_mips_vcpu_load(struct kvm_vcpu *vcpu, int cpu);</div><div class='del'>-extern void kvm_mips_vcpu_put(struct kvm_vcpu *vcpu);</div><div class='add'>+</div><div class='add'>+void kvm_mips_suspend_mm(int cpu);</div><div class='add'>+void kvm_mips_resume_mm(int cpu);</div><div class='add'>+</div><div class='add'>+/* MMU handling */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum kvm_mips_flush - Types of MMU flushes.</div><div class='add'>+ * @KMF_USER:	Flush guest user virtual memory mappings.</div><div class='add'>+ *		Guest USeg only.</div><div class='add'>+ * @KMF_KERN:	Flush guest kernel virtual memory mappings.</div><div class='add'>+ *		Guest USeg and KSeg2/3.</div><div class='add'>+ * @KMF_GPA:	Flush guest physical memory mappings.</div><div class='add'>+ *		Also includes KSeg0 if KMF_KERN is set.</div><div class='add'>+ */</div><div class='add'>+enum kvm_mips_flush {</div><div class='add'>+	KMF_USER	= 0x0,</div><div class='add'>+	KMF_KERN	= 0x1,</div><div class='add'>+	KMF_GPA		= 0x2,</div><div class='add'>+};</div><div class='add'>+void kvm_mips_flush_gva_pt(pgd_t *pgd, enum kvm_mips_flush flags);</div><div class='add'>+bool kvm_mips_flush_gpa_pt(struct kvm *kvm, gfn_t start_gfn, gfn_t end_gfn);</div><div class='add'>+int kvm_mips_mkclean_gpa_pt(struct kvm *kvm, gfn_t start_gfn, gfn_t end_gfn);</div><div class='add'>+pgd_t *kvm_pgd_alloc(void);</div><div class='add'>+void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu);</div><div class='add'>+void kvm_trap_emul_invalidate_gva(struct kvm_vcpu *vcpu, unsigned long addr,</div><div class='add'>+				  bool user);</div><div class='add'>+void kvm_trap_emul_gva_lockless_begin(struct kvm_vcpu *vcpu);</div><div class='add'>+void kvm_trap_emul_gva_lockless_end(struct kvm_vcpu *vcpu);</div><div class='add'>+</div><div class='add'>+enum kvm_mips_fault_result {</div><div class='add'>+	KVM_MIPS_MAPPED = 0,</div><div class='add'>+	KVM_MIPS_GVA,</div><div class='add'>+	KVM_MIPS_GPA,</div><div class='add'>+	KVM_MIPS_TLB,</div><div class='add'>+	KVM_MIPS_TLBINV,</div><div class='add'>+	KVM_MIPS_TLBMOD,</div><div class='add'>+};</div><div class='add'>+enum kvm_mips_fault_result kvm_trap_emul_gva_fault(struct kvm_vcpu *vcpu,</div><div class='add'>+						   unsigned long gva,</div><div class='add'>+						   bool write);</div><div class='add'>+</div><div class='add'>+#define KVM_ARCH_WANT_MMU_NOTIFIER</div><div class='add'>+int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);</div><div class='add'>+int kvm_unmap_hva_range(struct kvm *kvm,</div><div class='add'>+			unsigned long start, unsigned long end);</div><div class='add'>+void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);</div><div class='add'>+int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);</div><div class='add'>+int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);</div><div class='add'>+</div><div class='add'>+static inline void kvm_arch_mmu_notifier_invalidate_page(struct kvm *kvm,</div><div class='add'>+							 unsigned long address)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Emulation */</div><div class='del'>-u32 kvm_get_inst(u32 *opc, struct kvm_vcpu *vcpu);</div><div class='add'>+int kvm_get_inst(u32 *opc, struct kvm_vcpu *vcpu, u32 *out);</div><div class='ctx'> enum emulation_result update_pc(struct kvm_vcpu *vcpu, u32 cause);</div><div class='add'>+int kvm_get_badinstr(u32 *opc, struct kvm_vcpu *vcpu, u32 *out);</div><div class='add'>+int kvm_get_badinstrp(u32 *opc, struct kvm_vcpu *vcpu, u32 *out);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_is_ifetch_fault() - Find whether a TLBL exception is due to ifetch fault.</div><div class='add'>+ * @vcpu:	Virtual CPU.</div><div class='add'>+ *</div><div class='add'>+ * Returns:	Whether the TLBL exception was likely due to an instruction</div><div class='add'>+ *		fetch fault rather than a data load fault.</div><div class='add'>+ */</div><div class='add'>+static inline bool kvm_is_ifetch_fault(struct kvm_vcpu_arch *vcpu)</div><div class='add'>+{</div><div class='add'>+	unsigned long badvaddr = vcpu-&gt;host_cp0_badvaddr;</div><div class='add'>+	unsigned long epc = msk_isa16_mode(vcpu-&gt;pc);</div><div class='add'>+	u32 cause = vcpu-&gt;host_cp0_cause;</div><div class='add'>+</div><div class='add'>+	if (epc == badvaddr)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Branches may be 32-bit or 16-bit instructions.</div><div class='add'>+	 * This isn't exact, but we don't really support MIPS16 or microMIPS yet</div><div class='add'>+	 * in KVM anyway.</div><div class='add'>+	 */</div><div class='add'>+	if ((cause &amp; CAUSEF_BD) &amp;&amp; badvaddr - epc &lt;= 4)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> extern enum emulation_result kvm_mips_emulate_inst(u32 cause,</div><div class='ctx'> 						   u32 *opc,</div><div class='ctx'> 						   struct kvm_run *run,</div><div class='ctx'> 						   struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='add'>+long kvm_mips_guest_exception_base(struct kvm_vcpu *vcpu);</div><div class='add'>+</div><div class='ctx'> extern enum emulation_result kvm_mips_emulate_syscall(u32 cause,</div><div class='ctx'> 						      u32 *opc,</div><div class='ctx'> 						      struct kvm_run *run,</div><div class='hunk'>@@ -761,10 +852,6 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {}</div><div class='ctx'> static inline void kvm_arch_free_memslot(struct kvm *kvm,</div><div class='ctx'> 		struct kvm_memory_slot *free, struct kvm_memory_slot *dont) {}</div><div class='ctx'> static inline void kvm_arch_memslots_updated(struct kvm *kvm, struct kvm_memslots *slots) {}</div><div class='del'>-static inline void kvm_arch_flush_shadow_all(struct kvm *kvm) {}</div><div class='del'>-static inline void kvm_arch_flush_shadow_memslot(struct kvm *kvm,</div><div class='del'>-		struct kvm_memory_slot *slot) {}</div><div class='del'>-static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {}</div><div class='ctx'> static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}</div><div class='ctx'> static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {}</div><div class='ctx'> static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {}</div><div class='head'>diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h<br/>index 2afb84072ad0..ee3d4fe515a0 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h</a></div><div class='hunk'>@@ -80,6 +80,15 @@ enum bcm47xx_board {</div><div class='ctx'> 	BCM47XX_BOARD_LINKSYS_WRT610NV2,</div><div class='ctx'> 	BCM47XX_BOARD_LINKSYS_WRTSL54GS,</div><div class='ctx'> </div><div class='add'>+	BCM47XX_BOARD_LUXUL_ABR_4400_V1,</div><div class='add'>+	BCM47XX_BOARD_LUXUL_XAP_310_V1,</div><div class='add'>+	BCM47XX_BOARD_LUXUL_XAP_1210_V1,</div><div class='add'>+	BCM47XX_BOARD_LUXUL_XAP_1230_V1,</div><div class='add'>+	BCM47XX_BOARD_LUXUL_XAP_1240_V1,</div><div class='add'>+	BCM47XX_BOARD_LUXUL_XAP_1500_V1,</div><div class='add'>+	BCM47XX_BOARD_LUXUL_XBR_4400_V1,</div><div class='add'>+	BCM47XX_BOARD_LUXUL_XVW_P30_V1,</div><div class='add'>+	BCM47XX_BOARD_LUXUL_XWR_600_V1,</div><div class='ctx'> 	BCM47XX_BOARD_LUXUL_XWR_1750_V1,</div><div class='ctx'> </div><div class='ctx'> 	BCM47XX_BOARD_MICROSOFT_MN700,</div><div class='head'>diff --git a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h<br/>index 460042ee5d6f..9110988b92a1 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h</a></div><div class='hunk'>@@ -65,7 +65,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);</div><div class='ctx'> phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);</div><div class='ctx'> </div><div class='ctx'> struct dma_map_ops;</div><div class='del'>-extern struct dma_map_ops *octeon_pci_dma_map_ops;</div><div class='add'>+extern const struct dma_map_ops *octeon_pci_dma_map_ops;</div><div class='ctx'> extern char *octeon_swiotlb;</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h b/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h<br/>index c4873e8594ef..c38b38ce5a3d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h</a></div><div class='hunk'>@@ -99,9 +99,20 @@</div><div class='ctx'> 	# to begin</div><div class='ctx'> 	#</div><div class='ctx'> </div><div class='del'>-	# This is the variable where the next core to boot os stored</div><div class='del'>-	PTR_LA	t0, octeon_processor_boot</div><div class='ctx'> octeon_spin_wait_boot:</div><div class='add'>+#ifdef CONFIG_RELOCATABLE</div><div class='add'>+	PTR_LA	t0, octeon_processor_relocated_kernel_entry</div><div class='add'>+	LONG_L	t0, (t0)</div><div class='add'>+	beq	zero, t0, 1f</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+	jr	t0</div><div class='add'>+	nop</div><div class='add'>+1:</div><div class='add'>+#endif /* CONFIG_RELOCATABLE */</div><div class='add'>+</div><div class='add'>+	# This is the variable where the next core to boot is stored</div><div class='add'>+	PTR_LA	t0, octeon_processor_boot</div><div class='ctx'> 	# Get the core id of the next to be booted</div><div class='ctx'> 	LONG_L	t1, (t0)</div><div class='ctx'> 	# Keep looping if it isn't me</div><div class='head'>diff --git a/arch/mips/include/asm/mach-ip27/spaces.h b/arch/mips/include/asm/mach-ip27/spaces.h<br/>index 4775a1136a5b..24d5e31bcfa6 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/mach-ip27/spaces.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/mach-ip27/spaces.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mach-ip27/spaces.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-ip27/spaces.h</a></div><div class='hunk'>@@ -12,14 +12,16 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IP27 uses the R10000's uncached attribute feature.  Attribute 3 selects</div><div class='del'>- * uncached memory addressing.</div><div class='add'>+ * uncached memory addressing. Hide the definitions on 32-bit compilation</div><div class='add'>+ * of the compat-vdso code.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='ctx'> #define HSPEC_BASE		0x9000000000000000</div><div class='ctx'> #define IO_BASE			0x9200000000000000</div><div class='ctx'> #define MSPEC_BASE		0x9400000000000000</div><div class='ctx'> #define UNCAC_BASE		0x9600000000000000</div><div class='ctx'> #define CAC_BASE		0xa800000000000000</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define TO_MSPEC(x)		(MSPEC_BASE | ((x) &amp; TO_PHYS_MASK))</div><div class='ctx'> #define TO_HSPEC(x)		(HSPEC_BASE | ((x) &amp; TO_PHYS_MASK))</div><div class='head'>diff --git a/arch/mips/include/asm/mach-jz4740/platform.h b/arch/mips/include/asm/mach-jz4740/platform.h<br/>index 073b8bfbb3b3..3645974b7f65 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/mach-jz4740/platform.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/mach-jz4740/platform.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mach-jz4740/platform.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-jz4740/platform.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> extern struct platform_device jz4740_udc_device;</div><div class='ctx'> extern struct platform_device jz4740_udc_xceiv_device;</div><div class='ctx'> extern struct platform_device jz4740_mmc_device;</div><div class='del'>-extern struct platform_device jz4740_rtc_device;</div><div class='ctx'> extern struct platform_device jz4740_i2c_device;</div><div class='ctx'> extern struct platform_device jz4740_nand_device;</div><div class='ctx'> extern struct platform_device jz4740_framebuffer_device;</div><div class='head'>diff --git a/arch/mips/include/asm/mach-loongson32/loongson1.h b/arch/mips/include/asm/mach-loongson32/loongson1.h<br/>index 3584c40caf79..84c28a8995ae 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/mach-loongson32/loongson1.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/mach-loongson32/loongson1.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mach-loongson32/loongson1.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-loongson32/loongson1.h</a></div><div class='hunk'>@@ -3,9 +3,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Register mappings for Loongson 1</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute	it and/or modify it</div><div class='del'>- * under  the terms of	the GNU General	 Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #define __ASM_MACH_LOONGSON32_LOONGSON1_H</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_LOONGSON1_LS1B)</div><div class='del'>-#define DEFAULT_MEMSIZE			256	/* If no memsize provided */</div><div class='add'>+#define DEFAULT_MEMSIZE			64	/* If no memsize provided */</div><div class='ctx'> #elif defined(CONFIG_LOONGSON1_LS1C)</div><div class='ctx'> #define DEFAULT_MEMSIZE			32</div><div class='ctx'> #endif</div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> #include &lt;regs-clk.h&gt;</div><div class='ctx'> #include &lt;regs-mux.h&gt;</div><div class='ctx'> #include &lt;regs-pwm.h&gt;</div><div class='add'>+#include &lt;regs-rtc.h&gt;</div><div class='ctx'> #include &lt;regs-wdt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_MACH_LOONGSON32_LOONGSON1_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-loongson32/platform.h b/arch/mips/include/asm/mach-loongson32/platform.h<br/>index 7adc31364939..8f8fa43ba095 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/mach-loongson32/platform.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/mach-loongson32/platform.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mach-loongson32/platform.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-loongson32/platform.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2011 Zhang, Keguang &lt;keguang.zhang@gmail.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute	it and/or modify it</div><div class='del'>- * under  the terms of	the GNU General	 Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -25,11 +25,12 @@ extern struct platform_device ls1x_gpio0_pdev;</div><div class='ctx'> extern struct platform_device ls1x_gpio1_pdev;</div><div class='ctx'> extern struct platform_device ls1x_nand_pdev;</div><div class='ctx'> extern struct platform_device ls1x_rtc_pdev;</div><div class='add'>+extern struct platform_device ls1x_wdt_pdev;</div><div class='ctx'> </div><div class='ctx'> void __init ls1x_clk_init(void);</div><div class='ctx'> void __init ls1x_dma_set_platdata(struct plat_ls1x_dma *pdata);</div><div class='ctx'> void __init ls1x_nand_set_platdata(struct plat_ls1x_nand *pdata);</div><div class='del'>-void __init ls1x_serial_set_uartclk(struct platform_device *pdev);</div><div class='ctx'> void __init ls1x_rtc_set_extclk(struct platform_device *pdev);</div><div class='add'>+void __init ls1x_serial_set_uartclk(struct platform_device *pdev);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_MACH_LOONGSON32_PLATFORM_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-loongson32/regs-rtc.h b/arch/mips/include/asm/mach-loongson32/regs-rtc.h<br/>new file mode 100644<br/>index 000000000000..e67fda24cf6f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mach-loongson32/regs-rtc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-loongson32/regs-rtc.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Yang Ling &lt;gnaygnil@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Loongson 1 RTC timer Register Definitions.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_MACH_LOONGSON32_REGS_RTC_H</div><div class='add'>+#define __ASM_MACH_LOONGSON32_REGS_RTC_H</div><div class='add'>+</div><div class='add'>+#define LS1X_RTC_REG(x) \</div><div class='add'>+		((void __iomem *)KSEG1ADDR(LS1X_RTC_BASE + (x)))</div><div class='add'>+</div><div class='add'>+#define LS1X_RTC_CTRL	LS1X_RTC_REG(0x40)</div><div class='add'>+</div><div class='add'>+#define RTC_EXTCLK_OK	(BIT(5) | BIT(8))</div><div class='add'>+#define RTC_EXTCLK_EN	BIT(8)</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_MACH_LOONGSON32_REGS_RTC_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h<br/>index a73350b07fdf..66af4ccb5c6c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/mach-ralink/mt7620.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/mach-ralink/mt7620.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mach-ralink/mt7620.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mach-ralink/mt7620.h</a></div><div class='hunk'>@@ -115,9 +115,14 @@</div><div class='ctx'> #define MT7620_GPIO_MODE_WDT_MASK	0x3</div><div class='ctx'> #define MT7620_GPIO_MODE_WDT_SHIFT	21</div><div class='ctx'> </div><div class='add'>+#define MT7620_GPIO_MODE_MDIO		0</div><div class='add'>+#define MT7620_GPIO_MODE_MDIO_REFCLK	1</div><div class='add'>+#define MT7620_GPIO_MODE_MDIO_GPIO	2</div><div class='add'>+#define MT7620_GPIO_MODE_MDIO_MASK	0x3</div><div class='add'>+#define MT7620_GPIO_MODE_MDIO_SHIFT	7</div><div class='add'>+</div><div class='ctx'> #define MT7620_GPIO_MODE_I2C		0</div><div class='ctx'> #define MT7620_GPIO_MODE_UART1		5</div><div class='del'>-#define MT7620_GPIO_MODE_MDIO		8</div><div class='ctx'> #define MT7620_GPIO_MODE_RGMII1		9</div><div class='ctx'> #define MT7620_GPIO_MODE_RGMII2		10</div><div class='ctx'> #define MT7620_GPIO_MODE_SPI		11</div><div class='head'>diff --git a/arch/mips/include/asm/mips-cm.h b/arch/mips/include/asm/mips-cm.h<br/>index 2e4180797b21..cfdbab015769 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/mips-cm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/mips-cm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mips-cm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mips-cm.h</a></div><div class='hunk'>@@ -187,6 +187,7 @@ BUILD_CM_R_(config,		MIPS_CM_GCB_OFS + 0x00)</div><div class='ctx'> BUILD_CM_RW(base,		MIPS_CM_GCB_OFS + 0x08)</div><div class='ctx'> BUILD_CM_RW(access,		MIPS_CM_GCB_OFS + 0x20)</div><div class='ctx'> BUILD_CM_R_(rev,		MIPS_CM_GCB_OFS + 0x30)</div><div class='add'>+BUILD_CM_RW(err_control,	MIPS_CM_GCB_OFS + 0x38)</div><div class='ctx'> BUILD_CM_RW(error_mask,		MIPS_CM_GCB_OFS + 0x40)</div><div class='ctx'> BUILD_CM_RW(error_cause,	MIPS_CM_GCB_OFS + 0x48)</div><div class='ctx'> BUILD_CM_RW(error_addr,		MIPS_CM_GCB_OFS + 0x50)</div><div class='hunk'>@@ -266,6 +267,12 @@ BUILD_CM_Cx_R_(tcid_8_priority,	0x80)</div><div class='ctx'> #define CM_REV_CM2_5				CM_ENCODE_REV(7, 0)</div><div class='ctx'> #define CM_REV_CM3				CM_ENCODE_REV(8, 0)</div><div class='ctx'> </div><div class='add'>+/* GCR_ERR_CONTROL register fields */</div><div class='add'>+#define CM_GCR_ERR_CONTROL_L2_ECC_EN_SHF	1</div><div class='add'>+#define CM_GCR_ERR_CONTROL_L2_ECC_EN_MSK	(_ULCAST_(0x1) &lt;&lt; 1)</div><div class='add'>+#define CM_GCR_ERR_CONTROL_L2_ECC_SUPPORT_SHF	0</div><div class='add'>+#define CM_GCR_ERR_CONTROL_L2_ECC_SUPPORT_MSK	(_ULCAST_(0x1) &lt;&lt; 0)</div><div class='add'>+</div><div class='ctx'> /* GCR_ERROR_CAUSE register fields */</div><div class='ctx'> #define CM_GCR_ERROR_CAUSE_ERRTYPE_SHF		27</div><div class='ctx'> #define CM_GCR_ERROR_CAUSE_ERRTYPE_MSK		(_ULCAST_(0x1f) &lt;&lt; 27)</div><div class='head'>diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h<br/>index df78b2ca70eb..f8d1d2f1d80d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/mipsregs.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/mipsregs.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mipsregs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mipsregs.h</a></div><div class='hunk'>@@ -685,6 +685,39 @@</div><div class='ctx'> #define MIPS_WATCHHI_W		(_ULCAST_(1) &lt;&lt; 0)</div><div class='ctx'> #define MIPS_WATCHHI_IRW	(_ULCAST_(0x7) &lt;&lt; 0)</div><div class='ctx'> </div><div class='add'>+/* PerfCnt control register definitions */</div><div class='add'>+#define MIPS_PERFCTRL_EXL	(_ULCAST_(1) &lt;&lt; 0)</div><div class='add'>+#define MIPS_PERFCTRL_K		(_ULCAST_(1) &lt;&lt; 1)</div><div class='add'>+#define MIPS_PERFCTRL_S		(_ULCAST_(1) &lt;&lt; 2)</div><div class='add'>+#define MIPS_PERFCTRL_U		(_ULCAST_(1) &lt;&lt; 3)</div><div class='add'>+#define MIPS_PERFCTRL_IE	(_ULCAST_(1) &lt;&lt; 4)</div><div class='add'>+#define MIPS_PERFCTRL_EVENT_S	5</div><div class='add'>+#define MIPS_PERFCTRL_EVENT	(_ULCAST_(0x3ff) &lt;&lt; MIPS_PERFCTRL_EVENT_S)</div><div class='add'>+#define MIPS_PERFCTRL_PCTD	(_ULCAST_(1) &lt;&lt; 15)</div><div class='add'>+#define MIPS_PERFCTRL_EC	(_ULCAST_(0x3) &lt;&lt; 23)</div><div class='add'>+#define MIPS_PERFCTRL_EC_R	(_ULCAST_(0) &lt;&lt; 23)</div><div class='add'>+#define MIPS_PERFCTRL_EC_RI	(_ULCAST_(1) &lt;&lt; 23)</div><div class='add'>+#define MIPS_PERFCTRL_EC_G	(_ULCAST_(2) &lt;&lt; 23)</div><div class='add'>+#define MIPS_PERFCTRL_EC_GRI	(_ULCAST_(3) &lt;&lt; 23)</div><div class='add'>+#define MIPS_PERFCTRL_W		(_ULCAST_(1) &lt;&lt; 30)</div><div class='add'>+#define MIPS_PERFCTRL_M		(_ULCAST_(1) &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+/* PerfCnt control register MT extensions used by MIPS cores */</div><div class='add'>+#define MIPS_PERFCTRL_VPEID_S	16</div><div class='add'>+#define MIPS_PERFCTRL_VPEID	(_ULCAST_(0xf) &lt;&lt; MIPS_PERFCTRL_VPEID_S)</div><div class='add'>+#define MIPS_PERFCTRL_TCID_S	22</div><div class='add'>+#define MIPS_PERFCTRL_TCID	(_ULCAST_(0xff) &lt;&lt; MIPS_PERFCTRL_TCID_S)</div><div class='add'>+#define MIPS_PERFCTRL_MT_EN	(_ULCAST_(0x3) &lt;&lt; 20)</div><div class='add'>+#define MIPS_PERFCTRL_MT_EN_ALL	(_ULCAST_(0) &lt;&lt; 20)</div><div class='add'>+#define MIPS_PERFCTRL_MT_EN_VPE	(_ULCAST_(1) &lt;&lt; 20)</div><div class='add'>+#define MIPS_PERFCTRL_MT_EN_TC	(_ULCAST_(2) &lt;&lt; 20)</div><div class='add'>+</div><div class='add'>+/* PerfCnt control register MT extensions used by BMIPS5000 */</div><div class='add'>+#define BRCM_PERFCTRL_TC	(_ULCAST_(1) &lt;&lt; 30)</div><div class='add'>+</div><div class='add'>+/* PerfCnt control register MT extensions used by Netlogic XLR */</div><div class='add'>+#define XLR_PERFCTRL_ALLTHREADS	(_ULCAST_(1) &lt;&lt; 13)</div><div class='add'>+</div><div class='ctx'> /* MAAR bit definitions */</div><div class='ctx'> #define MIPS_MAAR_ADDR		((BIT_ULL(BITS_PER_LONG - 12) - 1) &lt;&lt; 12)</div><div class='ctx'> #define MIPS_MAAR_ADDR_SHIFT	12</div><div class='head'>diff --git a/arch/mips/include/asm/mmu_context.h b/arch/mips/include/asm/mmu_context.h<br/>index ddd57ade1aa8..da2004cef2d5 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -13,8 +13,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/dsemul.h&gt;</div><div class='ctx'> #include &lt;asm/hazards.h&gt;</div><div class='hunk'>@@ -29,9 +31,11 @@ do {									\</div><div class='ctx'> 	}								\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+extern void tlbmiss_handler_setup_pgd(unsigned long);</div><div class='add'>+</div><div class='add'>+/* Note: This is also implemented with uasm in arch/mips/kvm/entry.c */</div><div class='ctx'> #define TLBMISS_HANDLER_SETUP_PGD(pgd)					\</div><div class='ctx'> do {									\</div><div class='del'>-	extern void tlbmiss_handler_setup_pgd(unsigned long);		\</div><div class='ctx'> 	tlbmiss_handler_setup_pgd((unsigned long)(pgd));		\</div><div class='ctx'> 	htw_set_pwbase((unsigned long)pgd);				\</div><div class='ctx'> } while (0)</div><div class='hunk'>@@ -97,17 +101,12 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)</div><div class='ctx'> static inline void</div><div class='ctx'> get_new_mmu_context(struct mm_struct *mm, unsigned long cpu)</div><div class='ctx'> {</div><div class='del'>-	extern void kvm_local_flush_tlb_all(void);</div><div class='ctx'> 	unsigned long asid = asid_cache(cpu);</div><div class='ctx'> </div><div class='ctx'> 	if (!((asid += cpu_asid_inc()) &amp; cpu_asid_mask(&amp;cpu_data[cpu]))) {</div><div class='ctx'> 		if (cpu_has_vtag_icache)</div><div class='ctx'> 			flush_icache_all();</div><div class='del'>-#ifdef CONFIG_KVM</div><div class='del'>-		kvm_local_flush_tlb_all();      /* start new asid cycle */</div><div class='del'>-#else</div><div class='ctx'> 		local_flush_tlb_all();	/* start new asid cycle */</div><div class='del'>-#endif</div><div class='ctx'> 		if (!asid)		/* fix version if needed */</div><div class='ctx'> 			asid = asid_first_version(cpu);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/common.h b/arch/mips/include/asm/netlogic/common.h<br/>index be52c2125d71..e0717d10e650 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/netlogic/common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/netlogic/common.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/netlogic/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/netlogic/common.h</a></div><div class='hunk'>@@ -88,7 +88,7 @@ extern struct plat_smp_ops nlm_smp_ops;</div><div class='ctx'> extern char nlm_reset_entry[], nlm_reset_entry_end[];</div><div class='ctx'> </div><div class='ctx'> /* SWIOTLB */</div><div class='del'>-extern struct dma_map_ops nlm_swiotlb_dma_ops;</div><div class='add'>+extern const struct dma_map_ops nlm_swiotlb_dma_ops;</div><div class='ctx'> </div><div class='ctx'> extern unsigned int nlm_threads_per_core;</div><div class='ctx'> extern cpumask_t nlm_cpumask;</div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-gpio-defs.h b/arch/mips/include/asm/octeon/cvmx-gpio-defs.h<br/>index 4719fcfa8865..8123b8209369 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-gpio-defs.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/octeon/cvmx-gpio-defs.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-gpio-defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-gpio-defs.h</a></div><div class='hunk'>@@ -46,7 +46,8 @@ union cvmx_gpio_bit_cfgx {</div><div class='ctx'> 	uint64_t u64;</div><div class='ctx'> 	struct cvmx_gpio_bit_cfgx_s {</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='del'>-		uint64_t reserved_17_63:47;</div><div class='add'>+		uint64_t reserved_21_63:42;</div><div class='add'>+		uint64_t output_sel:5;</div><div class='ctx'> 		uint64_t synce_sel:2;</div><div class='ctx'> 		uint64_t clk_gen:1;</div><div class='ctx'> 		uint64_t clk_sel:2;</div><div class='hunk'>@@ -66,7 +67,8 @@ union cvmx_gpio_bit_cfgx {</div><div class='ctx'> 		uint64_t clk_sel:2;</div><div class='ctx'> 		uint64_t clk_gen:1;</div><div class='ctx'> 		uint64_t synce_sel:2;</div><div class='del'>-		uint64_t reserved_17_63:47;</div><div class='add'>+		uint64_t output_sel:5;</div><div class='add'>+		uint64_t reserved_21_63:42;</div><div class='ctx'> #endif</div><div class='ctx'> 	} s;</div><div class='ctx'> 	struct cvmx_gpio_bit_cfgx_cn30xx {</div><div class='hunk'>@@ -126,6 +128,8 @@ union cvmx_gpio_bit_cfgx {</div><div class='ctx'> 	struct cvmx_gpio_bit_cfgx_s cn66xx;</div><div class='ctx'> 	struct cvmx_gpio_bit_cfgx_s cn68xx;</div><div class='ctx'> 	struct cvmx_gpio_bit_cfgx_s cn68xxp1;</div><div class='add'>+	struct cvmx_gpio_bit_cfgx_s cn70xx;</div><div class='add'>+	struct cvmx_gpio_bit_cfgx_s cn73xx;</div><div class='ctx'> 	struct cvmx_gpio_bit_cfgx_s cnf71xx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h b/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h<br/>index 4d7a3db3a9f6..f89775be7654 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/octeon/cvmx-helper-rgmii.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-helper-rgmii.h</a></div><div class='hunk'>@@ -80,8 +80,7 @@ extern cvmx_helper_link_info_t __cvmx_helper_rgmii_link_get(int ipd_port);</div><div class='ctx'>  * Configure an IPD/PKO port for the specified link state. This</div><div class='ctx'>  * function does not influence auto negotiation at the PHY level.</div><div class='ctx'>  * The passed link state must always match the link state returned</div><div class='del'>- * by cvmx_helper_link_get(). It is normally best to use</div><div class='del'>- * cvmx_helper_link_autoconf() instead.</div><div class='add'>+ * by cvmx_helper_link_get().</div><div class='ctx'>  *</div><div class='ctx'>  * @ipd_port:  IPD/PKO port to configure</div><div class='ctx'>  * @link_info: The new link state</div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h b/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h<br/>index 4debb1c5153d..63fd21335e4b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/octeon/cvmx-helper-sgmii.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-helper-sgmii.h</a></div><div class='hunk'>@@ -74,8 +74,7 @@ extern cvmx_helper_link_info_t __cvmx_helper_sgmii_link_get(int ipd_port);</div><div class='ctx'>  * Configure an IPD/PKO port for the specified link state. This</div><div class='ctx'>  * function does not influence auto negotiation at the PHY level.</div><div class='ctx'>  * The passed link state must always match the link state returned</div><div class='del'>- * by cvmx_helper_link_get(). It is normally best to use</div><div class='del'>- * cvmx_helper_link_autoconf() instead.</div><div class='add'>+ * by cvmx_helper_link_get().</div><div class='ctx'>  *</div><div class='ctx'>  * @ipd_port:  IPD/PKO port to configure</div><div class='ctx'>  * @link_info: The new link state</div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-helper-spi.h b/arch/mips/include/asm/octeon/cvmx-helper-spi.h<br/>index 9f1c6b968f91..d5adf8592773 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-helper-spi.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/octeon/cvmx-helper-spi.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-helper-spi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-helper-spi.h</a></div><div class='hunk'>@@ -71,8 +71,7 @@ extern cvmx_helper_link_info_t __cvmx_helper_spi_link_get(int ipd_port);</div><div class='ctx'>  * Configure an IPD/PKO port for the specified link state. This</div><div class='ctx'>  * function does not influence auto negotiation at the PHY level.</div><div class='ctx'>  * The passed link state must always match the link state returned</div><div class='del'>- * by cvmx_helper_link_get(). It is normally best to use</div><div class='del'>- * cvmx_helper_link_autoconf() instead.</div><div class='add'>+ * by cvmx_helper_link_get().</div><div class='ctx'>  *</div><div class='ctx'>  * @ipd_port:  IPD/PKO port to configure</div><div class='ctx'>  * @link_info: The new link state</div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-helper-xaui.h b/arch/mips/include/asm/octeon/cvmx-helper-xaui.h<br/>index 5e89ed703eaa..f8ce53f6f28f 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-helper-xaui.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/octeon/cvmx-helper-xaui.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-helper-xaui.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-helper-xaui.h</a></div><div class='hunk'>@@ -74,8 +74,7 @@ extern cvmx_helper_link_info_t __cvmx_helper_xaui_link_get(int ipd_port);</div><div class='ctx'>  * Configure an IPD/PKO port for the specified link state. This</div><div class='ctx'>  * function does not influence auto negotiation at the PHY level.</div><div class='ctx'>  * The passed link state must always match the link state returned</div><div class='del'>- * by cvmx_helper_link_get(). It is normally best to use</div><div class='del'>- * cvmx_helper_link_autoconf() instead.</div><div class='add'>+ * by cvmx_helper_link_get().</div><div class='ctx'>  *</div><div class='ctx'>  * @ipd_port:  IPD/PKO port to configure</div><div class='ctx'>  * @link_info: The new link state</div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-helper.h b/arch/mips/include/asm/octeon/cvmx-helper.h<br/>index 5a3090dc6f2f..0ed87cb67e7f 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-helper.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/octeon/cvmx-helper.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/octeon/cvmx-helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/octeon/cvmx-helper.h</a></div><div class='hunk'>@@ -156,17 +156,6 @@ extern cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int</div><div class='ctx'> 								   interface);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Auto configure an IPD/PKO port link state and speed. This</div><div class='del'>- * function basically does the equivalent of:</div><div class='del'>- * cvmx_helper_link_set(ipd_port, cvmx_helper_link_get(ipd_port));</div><div class='del'>- *</div><div class='del'>- * @ipd_port: IPD/PKO port to auto configure</div><div class='del'>- *</div><div class='del'>- * Returns Link state after configure</div><div class='del'>- */</div><div class='del'>-extern cvmx_helper_link_info_t cvmx_helper_link_autoconf(int ipd_port);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * Return the link state of an IPD/PKO port as returned by</div><div class='ctx'>  * auto negotiation. The result of this function may not match</div><div class='ctx'>  * Octeon's link config if auto negotiation has changed since</div><div class='hunk'>@@ -182,8 +171,7 @@ extern cvmx_helper_link_info_t cvmx_helper_link_get(int ipd_port);</div><div class='ctx'>  * Configure an IPD/PKO port for the specified link state. This</div><div class='ctx'>  * function does not influence auto negotiation at the PHY level.</div><div class='ctx'>  * The passed link state must always match the link state returned</div><div class='del'>- * by cvmx_helper_link_get(). It is normally best to use</div><div class='del'>- * cvmx_helper_link_autoconf() instead.</div><div class='add'>+ * by cvmx_helper_link_get().</div><div class='ctx'>  *</div><div class='ctx'>  * @ipd_port:  IPD/PKO port to configure</div><div class='ctx'>  * @link_info: The new link state</div><div class='head'>diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h<br/>index a03e86969f78..a8705f6c8180 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/pgalloc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/pgalloc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/pgalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/pgalloc.h</a></div><div class='hunk'>@@ -43,21 +43,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)</div><div class='ctx'>  * Initialize a new pgd / pmd table with invalid pointers.</div><div class='ctx'>  */</div><div class='ctx'> extern void pgd_init(unsigned long page);</div><div class='del'>-</div><div class='del'>-static inline pgd_t *pgd_alloc(struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	pgd_t *ret, *init;</div><div class='del'>-</div><div class='del'>-	ret = (pgd_t *) __get_free_pages(GFP_KERNEL, PGD_ORDER);</div><div class='del'>-	if (ret) {</div><div class='del'>-		init = pgd_offset(&amp;init_mm, 0UL);</div><div class='del'>-		pgd_init((unsigned long)ret);</div><div class='del'>-		memcpy(ret + USER_PTRS_PER_PGD, init + USER_PTRS_PER_PGD,</div><div class='del'>-		       (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+extern pgd_t *pgd_alloc(struct mm_struct *mm);</div><div class='ctx'> </div><div class='ctx'> static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h<br/>index 0d36c87acbe2..95b8c471f572 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/processor.h</a></div><div class='hunk'>@@ -389,7 +389,6 @@ unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define KSTK_STATUS(tsk) (task_pt_regs(tsk)-&gt;cp0_status)</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()	barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return_address is a replacement for __builtin_return_address(count)</div><div class='head'>diff --git a/arch/mips/include/asm/r4kcache.h b/arch/mips/include/asm/r4kcache.h<br/>index 667ca3c467b7..55fd94e6cd0b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/r4kcache.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/r4kcache.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/r4kcache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/r4kcache.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;asm/cpu-features.h&gt;</div><div class='ctx'> #include &lt;asm/cpu-type.h&gt;</div><div class='ctx'> #include &lt;asm/mipsmtregs.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt; /* for segment_eq() */</div><div class='add'>+#include &lt;linux/uaccess.h&gt; /* for segment_eq() */</div><div class='ctx'> </div><div class='ctx'> extern void (*r4k_blast_dcache)(void);</div><div class='ctx'> extern void (*r4k_blast_icache)(void);</div><div class='hunk'>@@ -147,49 +147,66 @@ static inline void flush_scache_line(unsigned long addr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define protected_cache_op(op,addr)				\</div><div class='add'>+({								\</div><div class='add'>+	int __err = 0;						\</div><div class='ctx'> 	__asm__ __volatile__(					\</div><div class='ctx'> 	"	.set	push			\n"		\</div><div class='ctx'> 	"	.set	noreorder		\n"		\</div><div class='ctx'> 	"	.set "MIPS_ISA_ARCH_LEVEL"	\n"		\</div><div class='del'>-	"1:	cache	%0, (%1)		\n"		\</div><div class='del'>-	"2:	.set	pop			\n"		\</div><div class='add'>+	"1:	cache	%1, (%2)		\n"		\</div><div class='add'>+	"2:	.insn				\n"		\</div><div class='add'>+	"	.set	pop			\n"		\</div><div class='add'>+	"	.section .fixup,\"ax\"		\n"		\</div><div class='add'>+	"3:	li	%0, %3			\n"		\</div><div class='add'>+	"	j	2b			\n"		\</div><div class='add'>+	"	.previous			\n"		\</div><div class='ctx'> 	"	.section __ex_table,\"a\"	\n"		\</div><div class='del'>-	"	"STR(PTR)" 1b, 2b		\n"		\</div><div class='add'>+	"	"STR(PTR)" 1b, 3b		\n"		\</div><div class='ctx'> 	"	.previous"					\</div><div class='del'>-	:							\</div><div class='del'>-	: "i" (op), "r" (addr))</div><div class='add'>+	: "+r" (__err)						\</div><div class='add'>+	: "i" (op), "r" (addr), "i" (-EFAULT));			\</div><div class='add'>+	__err;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #define protected_cachee_op(op,addr)				\</div><div class='add'>+({								\</div><div class='add'>+	int __err = 0;						\</div><div class='ctx'> 	__asm__ __volatile__(					\</div><div class='ctx'> 	"	.set	push			\n"		\</div><div class='ctx'> 	"	.set	noreorder		\n"		\</div><div class='ctx'> 	"	.set	mips0			\n"		\</div><div class='ctx'> 	"	.set	eva			\n"		\</div><div class='del'>-	"1:	cachee	%0, (%1)		\n"		\</div><div class='del'>-	"2:	.set	pop			\n"		\</div><div class='add'>+	"1:	cachee	%1, (%2)		\n"		\</div><div class='add'>+	"2:	.insn				\n"		\</div><div class='add'>+	"	.set	pop			\n"		\</div><div class='add'>+	"	.section .fixup,\"ax\"		\n"		\</div><div class='add'>+	"3:	li	%0, %3			\n"		\</div><div class='add'>+	"	j	2b			\n"		\</div><div class='add'>+	"	.previous			\n"		\</div><div class='ctx'> 	"	.section __ex_table,\"a\"	\n"		\</div><div class='del'>-	"	"STR(PTR)" 1b, 2b		\n"		\</div><div class='add'>+	"	"STR(PTR)" 1b, 3b		\n"		\</div><div class='ctx'> 	"	.previous"					\</div><div class='del'>-	:							\</div><div class='del'>-	: "i" (op), "r" (addr))</div><div class='add'>+	: "+r" (__err)						\</div><div class='add'>+	: "i" (op), "r" (addr), "i" (-EFAULT));			\</div><div class='add'>+	__err;							\</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The next two are for badland addresses like signal trampolines.</div><div class='ctx'>  */</div><div class='del'>-static inline void protected_flush_icache_line(unsigned long addr)</div><div class='add'>+static inline int protected_flush_icache_line(unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	switch (boot_cpu_type()) {</div><div class='ctx'> 	case CPU_LOONGSON2:</div><div class='del'>-		protected_cache_op(Hit_Invalidate_I_Loongson2, addr);</div><div class='del'>-		break;</div><div class='add'>+		return protected_cache_op(Hit_Invalidate_I_Loongson2, addr);</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> #ifdef CONFIG_EVA</div><div class='del'>-		protected_cachee_op(Hit_Invalidate_I, addr);</div><div class='add'>+		return protected_cachee_op(Hit_Invalidate_I, addr);</div><div class='ctx'> #else</div><div class='del'>-		protected_cache_op(Hit_Invalidate_I, addr);</div><div class='add'>+		return protected_cache_op(Hit_Invalidate_I, addr);</div><div class='ctx'> #endif</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -199,21 +216,21 @@ static inline void protected_flush_icache_line(unsigned long addr)</div><div class='ctx'>  * caches.  We're talking about one cacheline unnecessarily getting invalidated</div><div class='ctx'>  * here so the penalty isn't overly hard.</div><div class='ctx'>  */</div><div class='del'>-static inline void protected_writeback_dcache_line(unsigned long addr)</div><div class='add'>+static inline int protected_writeback_dcache_line(unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_EVA</div><div class='del'>-	protected_cachee_op(Hit_Writeback_Inv_D, addr);</div><div class='add'>+	return protected_cachee_op(Hit_Writeback_Inv_D, addr);</div><div class='ctx'> #else</div><div class='del'>-	protected_cache_op(Hit_Writeback_Inv_D, addr);</div><div class='add'>+	return protected_cache_op(Hit_Writeback_Inv_D, addr);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void protected_writeback_scache_line(unsigned long addr)</div><div class='add'>+static inline int protected_writeback_scache_line(unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_EVA</div><div class='del'>-	protected_cachee_op(Hit_Writeback_Inv_SD, addr);</div><div class='add'>+	return protected_cachee_op(Hit_Writeback_Inv_SD, addr);</div><div class='ctx'> #else</div><div class='del'>-	protected_cache_op(Hit_Writeback_Inv_SD, addr);</div><div class='add'>+	return protected_cache_op(Hit_Writeback_Inv_SD, addr);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h<br/>index 060f23ff1817..98a117a05fbc 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/smp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/smp.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/smp.h</a></div><div class='hunk'>@@ -42,11 +42,7 @@ extern int __cpu_logical_map[NR_CPUS];</div><div class='ctx'> #define SMP_CALL_FUNCTION	0x2</div><div class='ctx'> /* Octeon - Tell another core to flush its icache */</div><div class='ctx'> #define SMP_ICACHE_FLUSH	0x4</div><div class='del'>-/* Used by kexec crashdump to save all cpu's state */</div><div class='del'>-#define SMP_DUMP		0x8</div><div class='del'>-#define SMP_ASK_C0COUNT		0x10</div><div class='del'>-</div><div class='del'>-extern cpumask_t cpu_callin_map;</div><div class='add'>+#define SMP_ASK_C0COUNT		0x8</div><div class='ctx'> </div><div class='ctx'> /* Mask of CPUs which are currently definitely operating coherently */</div><div class='ctx'> extern cpumask_t cpu_coherent_mask;</div><div class='hunk'>@@ -113,8 +109,4 @@ static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask)</div><div class='ctx'> 	mp_ops-&gt;send_ipi_mask(mask, SMP_CALL_FUNCTION);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_KEXEC)</div><div class='del'>-extern void (*dump_ipi_function_ptr)(void *);</div><div class='del'>-void dump_send_ipi(void (*dump_ipi_callback)(void *));</div><div class='del'>-#endif</div><div class='ctx'> #endif /* __ASM_SMP_H */</div><div class='head'>diff --git a/arch/mips/include/asm/stackframe.h b/arch/mips/include/asm/stackframe.h<br/>index eebf39549606..eaa5a4d7d5e5 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/stackframe.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/stackframe.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/stackframe.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/stackframe.h</a></div><div class='hunk'>@@ -216,12 +216,19 @@</div><div class='ctx'> 		LONG_S	$25, PT_R25(sp)</div><div class='ctx'> 		LONG_S	$28, PT_R28(sp)</div><div class='ctx'> 		LONG_S	$31, PT_R31(sp)</div><div class='add'>+</div><div class='add'>+		/* Set thread_info if we're coming from user mode */</div><div class='add'>+		mfc0	k0, CP0_STATUS</div><div class='add'>+		sll	k0, 3		/* extract cu0 bit */</div><div class='add'>+		bltz	k0, 9f</div><div class='add'>+</div><div class='ctx'> 		ori	$28, sp, _THREAD_MASK</div><div class='ctx'> 		xori	$28, _THREAD_MASK</div><div class='ctx'> #ifdef CONFIG_CPU_CAVIUM_OCTEON</div><div class='ctx'> 		.set    mips64</div><div class='ctx'> 		pref    0, 0($28)       /* Prefetch the current pointer */</div><div class='ctx'> #endif</div><div class='add'>+9:</div><div class='ctx'> 		.set	pop</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='hunk'>@@ -357,9 +364,13 @@</div><div class='ctx'> </div><div class='ctx'> 		.macro	RESTORE_SP_AND_RET</div><div class='ctx'> 		LONG_L	sp, PT_R29(sp)</div><div class='add'>+#ifdef CONFIG_CPU_MIPSR6</div><div class='add'>+		eretnc</div><div class='add'>+#else</div><div class='ctx'> 		.set	arch=r4000</div><div class='ctx'> 		eret</div><div class='ctx'> 		.set	mips0</div><div class='add'>+#endif</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -376,14 +387,6 @@</div><div class='ctx'> 		RESTORE_SP</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='del'>-		.macro	RESTORE_ALL_AND_RET</div><div class='del'>-		RESTORE_TEMP</div><div class='del'>-		RESTORE_STATIC</div><div class='del'>-		RESTORE_AT</div><div class='del'>-		RESTORE_SOME</div><div class='del'>-		RESTORE_SP_AND_RET</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Move to kernel mode and disable interrupts.</div><div class='ctx'>  * Set cp0 enable bit as sign that we're running on the kernel stack</div><div class='head'>diff --git a/arch/mips/include/asm/switch_to.h b/arch/mips/include/asm/switch_to.h<br/>index c0ae27971e31..e610473d61b8 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/switch_to.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/switch_to.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/switch_to.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/switch_to.h</a></div><div class='hunk'>@@ -66,13 +66,18 @@ do {									\</div><div class='ctx'> #define __mips_mt_fpaff_switch_to(prev) do { (void) (prev); } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define __clear_software_ll_bit()					\</div><div class='del'>-do {	if (cpu_has_rw_llb) {						\</div><div class='add'>+/*</div><div class='add'>+ * Clear LLBit during context switches on MIPSr6 such that eretnc can be used</div><div class='add'>+ * unconditionally when returning to userland in entry.S.</div><div class='add'>+ */</div><div class='add'>+#define __clear_r6_hw_ll_bit() do {					\</div><div class='add'>+	if (cpu_has_mips_r6)						\</div><div class='ctx'> 		write_c0_lladdr(0);					\</div><div class='del'>-	} else {							\</div><div class='del'>-		if (!__builtin_constant_p(cpu_has_llsc) || !cpu_has_llsc)\</div><div class='del'>-			ll_bit = 0;					\</div><div class='del'>-	}								\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define __clear_software_ll_bit() do {					\</div><div class='add'>+	if (!__builtin_constant_p(cpu_has_llsc) || !cpu_has_llsc)	\</div><div class='add'>+		ll_bit = 0;						\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -120,6 +125,7 @@ do {									\</div><div class='ctx'> 		}							\</div><div class='ctx'> 		clear_c0_status(ST0_CU2);				\</div><div class='ctx'> 	}								\</div><div class='add'>+	__clear_r6_hw_ll_bit();						\</div><div class='ctx'> 	__clear_software_ll_bit();					\</div><div class='ctx'> 	if (cpu_has_userlocal)						\</div><div class='ctx'> 		write_c0_userlocal(task_thread_info(next)-&gt;tp_value);	\</div><div class='head'>diff --git a/arch/mips/include/asm/termios.h b/arch/mips/include/asm/termios.h<br/>index 6245b68a69a8..ce2d72e34274 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/termios.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/termios.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/termios.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/termios.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #ifndef _ASM_TERMIOS_H</div><div class='ctx'> #define _ASM_TERMIOS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;uapi/asm/termios.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h<br/>index e309d8fcb516..b439e512792b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/thread_info.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/thread_info.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/thread_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/thread_info.h</a></div><div class='hunk'>@@ -27,7 +27,6 @@ struct thread_info {</div><div class='ctx'> 	unsigned long		tp_value;	/* thread pointer */</div><div class='ctx'> 	__u32			cpu;		/* current CPU */</div><div class='ctx'> 	int			preempt_count;	/* 0 =&gt; preemptable, &lt;0 =&gt; BUG */</div><div class='del'>-	int			r2_emul_return; /* 1 =&gt; Returning from R2 emulator */</div><div class='ctx'> 	mm_segment_t		addr_limit;	/*</div><div class='ctx'> 						 * thread address space limit:</div><div class='ctx'> 						 * 0x7fffffff for user-thead</div><div class='head'>diff --git a/arch/mips/include/asm/tlbex.h b/arch/mips/include/asm/tlbex.h<br/>new file mode 100644<br/>index 000000000000..53050e9dd2c9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/tlbex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/tlbex.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+#ifndef __ASM_TLBEX_H</div><div class='add'>+#define __ASM_TLBEX_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/uasm.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write random or indexed TLB entry, and care about the hazards from</div><div class='add'>+ * the preceding mtc0 and for the following eret.</div><div class='add'>+ */</div><div class='add'>+enum tlb_write_entry {</div><div class='add'>+	tlb_random,</div><div class='add'>+	tlb_indexed</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int pgd_reg;</div><div class='add'>+</div><div class='add'>+void build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r,</div><div class='add'>+		      unsigned int tmp, unsigned int ptr);</div><div class='add'>+void build_get_pgde32(u32 **p, unsigned int tmp, unsigned int ptr);</div><div class='add'>+void build_get_ptep(u32 **p, unsigned int tmp, unsigned int ptr);</div><div class='add'>+void build_update_entries(u32 **p, unsigned int tmp, unsigned int ptep);</div><div class='add'>+void build_tlb_write_entry(u32 **p, struct uasm_label **l,</div><div class='add'>+			   struct uasm_reloc **r,</div><div class='add'>+			   enum tlb_write_entry wmode);</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_TLBEX_H */</div><div class='head'>diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h<br/>index 89fa5c0b1579..5347cfe15af2 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/uaccess.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/uaccess.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/uaccess.h</a></div><div class='hunk'>@@ -1241,6 +1241,9 @@ extern size_t __copy_in_user_eva(void *__to, const void *__from, size_t __n);</div><div class='ctx'> 	__cu_len;							\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+extern __kernel_size_t __bzero_kernel(void __user *addr, __kernel_size_t size);</div><div class='add'>+extern __kernel_size_t __bzero(void __user *addr, __kernel_size_t size);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * __clear_user: - Zero a block of memory in user space, with less checking.</div><div class='ctx'>  * @to:	  Destination address, in user space.</div><div class='hunk'>@@ -1293,6 +1296,9 @@ __clear_user(void __user *addr, __kernel_size_t size)</div><div class='ctx'> 	__cl_size;							\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+extern long __strncpy_from_kernel_nocheck_asm(char *__to, const char __user *__from, long __len);</div><div class='add'>+extern long __strncpy_from_user_nocheck_asm(char *__to, const char __user *__from, long __len);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * __strncpy_from_user: - Copy a NUL terminated string from userspace, with less checking.</div><div class='ctx'>  * @dst:   Destination address, in kernel space.  This buffer must be at</div><div class='hunk'>@@ -1344,6 +1350,9 @@ __strncpy_from_user(char *__to, const char __user *__from, long __len)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern long __strncpy_from_kernel_asm(char *__to, const char __user *__from, long __len);</div><div class='add'>+extern long __strncpy_from_user_asm(char *__to, const char __user *__from, long __len);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * strncpy_from_user: - Copy a NUL terminated string from userspace.</div><div class='ctx'>  * @dst:   Destination address, in kernel space.  This buffer must be at</div><div class='hunk'>@@ -1393,6 +1402,9 @@ strncpy_from_user(char *__to, const char __user *__from, long __len)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern long __strlen_kernel_asm(const char __user *s);</div><div class='add'>+extern long __strlen_user_asm(const char __user *s);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * strlen_user: - Get the size of a string in user space.</div><div class='ctx'>  * @str: The string to measure.</div><div class='hunk'>@@ -1434,6 +1446,9 @@ static inline long strlen_user(const char __user *s)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern long __strnlen_kernel_nocheck_asm(const char __user *s, long n);</div><div class='add'>+extern long __strnlen_user_nocheck_asm(const char __user *s, long n);</div><div class='add'>+</div><div class='ctx'> /* Returns: 0 if bad, string length+1 (memory size) of string if ok */</div><div class='ctx'> static inline long __strnlen_user(const char __user *s, long n)</div><div class='ctx'> {</div><div class='hunk'>@@ -1463,6 +1478,9 @@ static inline long __strnlen_user(const char __user *s, long n)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern long __strnlen_kernel_asm(const char __user *s, long n);</div><div class='add'>+extern long __strnlen_user_asm(const char __user *s, long n);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * strnlen_user: - Get the size of a string in user space.</div><div class='ctx'>  * @str: The string to measure.</div><div class='head'>diff --git a/arch/mips/include/asm/uasm.h b/arch/mips/include/asm/uasm.h<br/>index f7929f65f7ca..e9a9e2ade1d2 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/uasm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/uasm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/asm/uasm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/asm/uasm.h</a></div><div class='hunk'>@@ -9,6 +9,9 @@</div><div class='ctx'>  * Copyright (C) 2012, 2013  MIPS Technologies, Inc.  All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#ifndef __ASM_UASM_H</div><div class='add'>+#define __ASM_UASM_H</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EXPORT_UASM</div><div class='hunk'>@@ -309,3 +312,5 @@ void uasm_il_bltz(u32 **p, struct uasm_reloc **r, unsigned int reg, int lid);</div><div class='ctx'> void uasm_il_bne(u32 **p, struct uasm_reloc **r, unsigned int reg1,</div><div class='ctx'> 		 unsigned int reg2, int lid);</div><div class='ctx'> void uasm_il_bnez(u32 **p, struct uasm_reloc **r, unsigned int reg, int lid);</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_UASM_H */</div><div class='head'>diff --git a/arch/mips/include/asm/unaligned.h b/arch/mips/include/asm/unaligned.h<br/>deleted file mode 100644<br/>index 42f66c311473..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/asm/unaligned.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/asm/unaligned.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- * License.  See the file "COPYING" in the main directory of this archive</div><div class='del'>- * for more details.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)</div><div class='del'>- */</div><div class='del'>-#ifndef _ASM_MIPS_UNALIGNED_H</div><div class='del'>-#define _ASM_MIPS_UNALIGNED_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#if defined(__MIPSEB__)</div><div class='del'>-# include &lt;linux/unaligned/be_struct.h&gt;</div><div class='del'>-# include &lt;linux/unaligned/le_byteshift.h&gt;</div><div class='del'>-# define get_unaligned	__get_unaligned_be</div><div class='del'>-# define put_unaligned	__put_unaligned_be</div><div class='del'>-#elif defined(__MIPSEL__)</div><div class='del'>-# include &lt;linux/unaligned/le_struct.h&gt;</div><div class='del'>-# include &lt;linux/unaligned/be_byteshift.h&gt;</div><div class='del'>-# define get_unaligned	__get_unaligned_le</div><div class='del'>-# define put_unaligned	__put_unaligned_le</div><div class='del'>-#else</div><div class='del'>-#  error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-# include &lt;linux/unaligned/generic.h&gt;</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_MIPS_UNALIGNED_H */</div><div class='head'>diff --git a/arch/mips/include/uapi/asm/kvm.h b/arch/mips/include/uapi/asm/kvm.h<br/>index 6985eb59b085..a8a0199bf760 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/uapi/asm/kvm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/uapi/asm/kvm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/uapi/asm/kvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/uapi/asm/kvm.h</a></div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'>  * Some parts derived from the x86 version of this file.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define __KVM_HAVE_READONLY_MEM</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * for KVM_GET_REGS and KVM_SET_REGS</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h<br/>index 2027240aafbb..566ecdcb5b4b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -108,4 +108,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		53</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	54</div><div class='add'>+</div><div class='ctx'> #endif /* _UAPI_ASM_SOCKET_H */</div><div class='head'>diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c<br/>index db6f5afff4ff..11172fdaeffc 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/jazz/jazzdma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/jazz/jazzdma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/jazz/jazzdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jazz/jazzdma.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/jazz.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/jazzdma.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c<br/>index 258fd03c9ef5..a5bd94b95263 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/jz4740/board-qi_lb60.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/jz4740/board-qi_lb60.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/jz4740/board-qi_lb60.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/board-qi_lb60.c</a></div><div class='hunk'>@@ -438,7 +438,6 @@ static struct platform_device *jz_platform_devices[] __initdata = {</div><div class='ctx'> 	&amp;jz4740_pcm_device,</div><div class='ctx'> 	&amp;jz4740_i2s_device,</div><div class='ctx'> 	&amp;jz4740_codec_device,</div><div class='del'>-	&amp;jz4740_rtc_device,</div><div class='ctx'> 	&amp;jz4740_adc_device,</div><div class='ctx'> 	&amp;jz4740_pwm_device,</div><div class='ctx'> 	&amp;jz4740_dma_device,</div><div class='head'>diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c<br/>index b765773ab8aa..cac1ccde2214 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/jz4740/gpio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/jz4740/gpio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/jz4740/gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/gpio.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='head'>diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c<br/>index 2f1dab35c061..5b7cdd67a9d9 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/jz4740/platform.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/jz4740/platform.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/jz4740/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/platform.c</a></div><div class='hunk'>@@ -88,27 +88,6 @@ struct platform_device jz4740_mmc_device = {</div><div class='ctx'> 	.resource	= jz4740_mmc_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* RTC controller */</div><div class='del'>-static struct resource jz4740_rtc_resources[] = {</div><div class='del'>-	{</div><div class='del'>-		.start	= JZ4740_RTC_BASE_ADDR,</div><div class='del'>-		.end	= JZ4740_RTC_BASE_ADDR + 0x38 - 1,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.start	= JZ4740_IRQ_RTC,</div><div class='del'>-		.end	= JZ4740_IRQ_RTC,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct platform_device jz4740_rtc_device = {</div><div class='del'>-	.name		= "jz4740-rtc",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(jz4740_rtc_resources),</div><div class='del'>-	.resource	= jz4740_rtc_resources,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* I2C controller */</div><div class='ctx'> static struct resource jz4740_i2c_resources[] = {</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/mips/jz4740/prom.c b/arch/mips/jz4740/prom.c<br/>index 6984683c90d0..47e857194ce6 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/jz4740/prom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/jz4740/prom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/jz4740/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/prom.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/mips/jz4740/reset.c b/arch/mips/jz4740/reset.c<br/>index 954e669c9e6b..67780c4b6573 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/jz4740/reset.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/jz4740/reset.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/jz4740/reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/reset.c</a></div><div class='hunk'>@@ -57,71 +57,8 @@ static void jz4740_restart(char *command)</div><div class='ctx'> 	jz4740_halt();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define JZ_REG_RTC_CTRL			0x00</div><div class='del'>-#define JZ_REG_RTC_HIBERNATE		0x20</div><div class='del'>-#define JZ_REG_RTC_WAKEUP_FILTER	0x24</div><div class='del'>-#define JZ_REG_RTC_RESET_COUNTER	0x28</div><div class='del'>-</div><div class='del'>-#define JZ_RTC_CTRL_WRDY		BIT(7)</div><div class='del'>-#define JZ_RTC_WAKEUP_FILTER_MASK	0x0000FFE0</div><div class='del'>-#define JZ_RTC_RESET_COUNTER_MASK	0x00000FE0</div><div class='del'>-</div><div class='del'>-static inline void jz4740_rtc_wait_ready(void __iomem *rtc_base)</div><div class='del'>-{</div><div class='del'>-	uint32_t ctrl;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		ctrl = readl(rtc_base + JZ_REG_RTC_CTRL);</div><div class='del'>-	} while (!(ctrl &amp; JZ_RTC_CTRL_WRDY));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void jz4740_power_off(void)</div><div class='del'>-{</div><div class='del'>-	void __iomem *rtc_base = ioremap(JZ4740_RTC_BASE_ADDR, 0x38);</div><div class='del'>-	unsigned long wakeup_filter_ticks;</div><div class='del'>-	unsigned long reset_counter_ticks;</div><div class='del'>-	struct clk *rtc_clk;</div><div class='del'>-	unsigned long rtc_rate;</div><div class='del'>-</div><div class='del'>-	rtc_clk = clk_get(NULL, "rtc");</div><div class='del'>-	if (IS_ERR(rtc_clk))</div><div class='del'>-		panic("unable to get RTC clock");</div><div class='del'>-	rtc_rate = clk_get_rate(rtc_clk);</div><div class='del'>-	clk_put(rtc_clk);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set minimum wakeup pin assertion time: 100 ms.</div><div class='del'>-	 * Range is 0 to 2 sec if RTC is clocked at 32 kHz.</div><div class='del'>-	 */</div><div class='del'>-	wakeup_filter_ticks = (100 * rtc_rate) / 1000;</div><div class='del'>-	if (wakeup_filter_ticks &lt; JZ_RTC_WAKEUP_FILTER_MASK)</div><div class='del'>-		wakeup_filter_ticks &amp;= JZ_RTC_WAKEUP_FILTER_MASK;</div><div class='del'>-	else</div><div class='del'>-		wakeup_filter_ticks = JZ_RTC_WAKEUP_FILTER_MASK;</div><div class='del'>-	jz4740_rtc_wait_ready(rtc_base);</div><div class='del'>-	writel(wakeup_filter_ticks, rtc_base + JZ_REG_RTC_WAKEUP_FILTER);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set reset pin low-level assertion time after wakeup: 60 ms.</div><div class='del'>-	 * Range is 0 to 125 ms if RTC is clocked at 32 kHz.</div><div class='del'>-	 */</div><div class='del'>-	reset_counter_ticks = (60 * rtc_rate) / 1000;</div><div class='del'>-	if (reset_counter_ticks &lt; JZ_RTC_RESET_COUNTER_MASK)</div><div class='del'>-		reset_counter_ticks &amp;= JZ_RTC_RESET_COUNTER_MASK;</div><div class='del'>-	else</div><div class='del'>-		reset_counter_ticks = JZ_RTC_RESET_COUNTER_MASK;</div><div class='del'>-	jz4740_rtc_wait_ready(rtc_base);</div><div class='del'>-	writel(reset_counter_ticks, rtc_base + JZ_REG_RTC_RESET_COUNTER);</div><div class='del'>-</div><div class='del'>-	jz4740_rtc_wait_ready(rtc_base);</div><div class='del'>-	writel(1, rtc_base + JZ_REG_RTC_HIBERNATE);</div><div class='del'>-</div><div class='del'>-	jz4740_halt();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void jz4740_reset_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	_machine_restart = jz4740_restart;</div><div class='ctx'> 	_machine_halt = jz4740_halt;</div><div class='del'>-	pm_power_off = jz4740_power_off;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c<br/>index 1f7ca2c9f262..bcf8f8c62737 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/jz4740/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/jz4740/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/jz4740/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/time.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> </div><div class='ctx'> static uint16_t jz4740_jiffies_per_tick;</div><div class='ctx'> </div><div class='del'>-static cycle_t jz4740_clocksource_read(struct clocksource *cs)</div><div class='add'>+static u64 jz4740_clocksource_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return jz4740_timer_get_count(TIMER_CLOCKSOURCE);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/jz4740/timer.c b/arch/mips/jz4740/timer.c<br/>index 4992461787aa..777877feef71 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/jz4740/timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/jz4740/timer.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/jz4740/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/jz4740/timer.c</a></div><div class='hunk'>@@ -13,9 +13,10 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-jz4740/base.h&gt;</div><div class='ctx'> #include &lt;asm/mach-jz4740/timer.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile<br/>index 4a603a3ea657..9a0e37b92ce0 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/Makefile</a></div><div class='hunk'>@@ -7,7 +7,7 @@ extra-y		:= head.o vmlinux.lds</div><div class='ctx'> obj-y		+= cpu-probe.o branch.o elf.o entry.o genex.o idle.o irq.o \</div><div class='ctx'> 		   process.o prom.o ptrace.o reset.o setup.o signal.o \</div><div class='ctx'> 		   syscall.o time.o topology.o traps.o unaligned.o watch.o \</div><div class='del'>-		   vdso.o</div><div class='add'>+		   vdso.o cacheinfo.o</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_FUNCTION_TRACER</div><div class='ctx'> CFLAGS_REMOVE_ftrace.o = -pg</div><div class='hunk'>@@ -30,7 +30,7 @@ obj-$(CONFIG_SYNC_R4K)		+= sync-r4k.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_DEBUG_FS)		+= segment.o</div><div class='ctx'> obj-$(CONFIG_STACKTRACE)	+= stacktrace.o</div><div class='del'>-obj-$(CONFIG_MODULES)		+= mips_ksyms.o module.o</div><div class='add'>+obj-$(CONFIG_MODULES)		+= module.o</div><div class='ctx'> obj-$(CONFIG_MODULES_USE_ELF_RELA) += module-rela.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o</div><div class='head'>diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c<br/>index fae2f9447792..bb5c5d34ba81 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/asm-offsets.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/asm-offsets.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -97,11 +97,11 @@ void output_thread_info_defines(void)</div><div class='ctx'> 	OFFSET(TI_TP_VALUE, thread_info, tp_value);</div><div class='ctx'> 	OFFSET(TI_CPU, thread_info, cpu);</div><div class='ctx'> 	OFFSET(TI_PRE_COUNT, thread_info, preempt_count);</div><div class='del'>-	OFFSET(TI_R2_EMUL_RET, thread_info, r2_emul_return);</div><div class='ctx'> 	OFFSET(TI_ADDR_LIMIT, thread_info, addr_limit);</div><div class='ctx'> 	OFFSET(TI_REGS, thread_info, regs);</div><div class='ctx'> 	DEFINE(_THREAD_SIZE, THREAD_SIZE);</div><div class='ctx'> 	DEFINE(_THREAD_MASK, THREAD_MASK);</div><div class='add'>+	DEFINE(_IRQ_STACK_SIZE, IRQ_STACK_SIZE);</div><div class='ctx'> 	BLANK();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -341,7 +341,7 @@ void output_pm_defines(void)</div><div class='ctx'> </div><div class='ctx'> void output_kvm_defines(void)</div><div class='ctx'> {</div><div class='del'>-	COMMENT(" KVM/MIPS Specfic offsets. ");</div><div class='add'>+	COMMENT(" KVM/MIPS Specific offsets. ");</div><div class='ctx'> </div><div class='ctx'> 	OFFSET(VCPU_FPR0, kvm_vcpu_arch, fpu.fpr[0]);</div><div class='ctx'> 	OFFSET(VCPU_FPR1, kvm_vcpu_arch, fpu.fpr[1]);</div><div class='head'>diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c<br/>index 9c7f3e136d50..4a2ff3953b99 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/binfmt_elfn32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/binfmt_elfn32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/binfmt_elfn32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/binfmt_elfn32.c</a></div><div class='hunk'>@@ -99,15 +99,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)</div><div class='ctx'> #undef TASK_SIZE</div><div class='ctx'> #define TASK_SIZE TASK_SIZE32</div><div class='ctx'> </div><div class='del'>-#undef cputime_to_timeval</div><div class='del'>-#define cputime_to_timeval cputime_to_compat_timeval</div><div class='del'>-static __inline__ void</div><div class='del'>-cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)</div><div class='del'>-{</div><div class='del'>-	unsigned long jiffies = cputime_to_jiffies(cputime);</div><div class='del'>-</div><div class='del'>-	value-&gt;tv_usec = (jiffies % HZ) * (1000000L / HZ);</div><div class='del'>-	value-&gt;tv_sec = jiffies / HZ;</div><div class='del'>-}</div><div class='add'>+#undef ns_to_timeval</div><div class='add'>+#define ns_to_timeval ns_to_compat_timeval</div><div class='ctx'> </div><div class='ctx'> #include "../../../fs/binfmt_elf.c"</div><div class='head'>diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c<br/>index 1ab34322dd97..3916404e7fd1 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/binfmt_elfo32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/binfmt_elfo32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/binfmt_elfo32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/binfmt_elfo32.c</a></div><div class='hunk'>@@ -102,15 +102,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)</div><div class='ctx'> #undef TASK_SIZE</div><div class='ctx'> #define TASK_SIZE TASK_SIZE32</div><div class='ctx'> </div><div class='del'>-#undef cputime_to_timeval</div><div class='del'>-#define cputime_to_timeval cputime_to_compat_timeval</div><div class='del'>-static __inline__ void</div><div class='del'>-cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)</div><div class='del'>-{</div><div class='del'>-	unsigned long jiffies = cputime_to_jiffies(cputime);</div><div class='del'>-</div><div class='del'>-	value-&gt;tv_usec = (jiffies % HZ) * (1000000L / HZ);</div><div class='del'>-	value-&gt;tv_sec = jiffies / HZ;</div><div class='del'>-}</div><div class='add'>+#undef ns_to_timeval</div><div class='add'>+#define ns_to_timeval ns_to_compat_timeval</div><div class='ctx'> </div><div class='ctx'> #include "../../../fs/binfmt_elf.c"</div><div class='head'>diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c<br/>index 12c718181e5e..b11facd11c9d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/branch.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/branch.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/branch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/branch.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * Copyright (C) 2001 MIPS Technologies, Inc.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/branch.h&gt;</div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/inst.h&gt;</div><div class='ctx'> #include &lt;asm/mips-r2-to-r6-emul.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Calculate and return exception PC in case of branch delay slot</div><div class='head'>diff --git a/arch/mips/kernel/cacheinfo.c b/arch/mips/kernel/cacheinfo.c<br/>new file mode 100644<br/>index 000000000000..97d5239ca47b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/cacheinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/cacheinfo.c</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+/*</div><div class='add'>+ * MIPS cacheinfo support</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any</div><div class='add'>+ * kind, whether express or implied; without even the implied warranty</div><div class='add'>+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/cacheinfo.h&gt;</div><div class='add'>+</div><div class='add'>+/* Populates leaf and increments to next leaf */</div><div class='add'>+#define populate_cache(cache, leaf, c_level, c_type)		\</div><div class='add'>+do {								\</div><div class='add'>+	leaf-&gt;type = c_type;					\</div><div class='add'>+	leaf-&gt;level = c_level;					\</div><div class='add'>+	leaf-&gt;coherency_line_size = c-&gt;cache.linesz;		\</div><div class='add'>+	leaf-&gt;number_of_sets = c-&gt;cache.sets;			\</div><div class='add'>+	leaf-&gt;ways_of_associativity = c-&gt;cache.ways;		\</div><div class='add'>+	leaf-&gt;size = c-&gt;cache.linesz * c-&gt;cache.sets *		\</div><div class='add'>+		c-&gt;cache.ways;					\</div><div class='add'>+	leaf++;							\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static int __init_cache_level(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct cpuinfo_mips *c = &amp;current_cpu_data;</div><div class='add'>+	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);</div><div class='add'>+	int levels = 0, leaves = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If Dcache is not set, we assume the cache structures</div><div class='add'>+	 * are not properly initialized.</div><div class='add'>+	 */</div><div class='add'>+	if (c-&gt;dcache.waysize)</div><div class='add'>+		levels += 1;</div><div class='add'>+	else</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	leaves += (c-&gt;icache.waysize) ? 2 : 1;</div><div class='add'>+</div><div class='add'>+	if (c-&gt;scache.waysize) {</div><div class='add'>+		levels++;</div><div class='add'>+		leaves++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (c-&gt;tcache.waysize) {</div><div class='add'>+		levels++;</div><div class='add'>+		leaves++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	this_cpu_ci-&gt;num_levels = levels;</div><div class='add'>+	this_cpu_ci-&gt;num_leaves = leaves;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __populate_cache_leaves(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct cpuinfo_mips *c = &amp;current_cpu_data;</div><div class='add'>+	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);</div><div class='add'>+	struct cacheinfo *this_leaf = this_cpu_ci-&gt;info_list;</div><div class='add'>+</div><div class='add'>+	if (c-&gt;icache.waysize) {</div><div class='add'>+		populate_cache(dcache, this_leaf, 1, CACHE_TYPE_DATA);</div><div class='add'>+		populate_cache(icache, this_leaf, 1, CACHE_TYPE_INST);</div><div class='add'>+	} else {</div><div class='add'>+		populate_cache(dcache, this_leaf, 1, CACHE_TYPE_UNIFIED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (c-&gt;scache.waysize)</div><div class='add'>+		populate_cache(scache, this_leaf, 2, CACHE_TYPE_UNIFIED);</div><div class='add'>+</div><div class='add'>+	if (c-&gt;tcache.waysize)</div><div class='add'>+		populate_cache(tcache, this_leaf, 3, CACHE_TYPE_UNIFIED);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_SMP_CALL_CACHE_FUNCTION(init_cache_level)</div><div class='add'>+DEFINE_SMP_CALL_CACHE_FUNCTION(populate_cache_leaves)</div><div class='head'>diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c<br/>index 537eefdf838f..aaca60d6ffc3 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/cevt-txx9.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/cevt-txx9.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/cevt-txx9.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/cevt-txx9.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ struct txx9_clocksource {</div><div class='ctx'> 	struct txx9_tmr_reg __iomem *tmrptr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static cycle_t txx9_cs_read(struct clocksource *cs)</div><div class='add'>+static u64 txx9_cs_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct txx9_clocksource *txx9_cs =</div><div class='ctx'> 		container_of(cs, struct txx9_clocksource, cs);</div><div class='head'>diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c<br/>index a378e44688f5..c9e8622b5a16 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/cpu-bugs64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/cpu-bugs64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/cpu-bugs64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/cpu-bugs64.c</a></div><div class='hunk'>@@ -148,11 +148,11 @@ static inline void check_mult_sh(void)</div><div class='ctx'> 			bug = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (bug == 0) {</div><div class='del'>-		printk("no.\n");</div><div class='add'>+		pr_cont("no.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("yes, workaround... ");</div><div class='add'>+	pr_cont("yes, workaround... ");</div><div class='ctx'> </div><div class='ctx'> 	fix = 1;</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='hunk'>@@ -160,11 +160,11 @@ static inline void check_mult_sh(void)</div><div class='ctx'> 			fix = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (fix == 1) {</div><div class='del'>-		printk("yes.\n");</div><div class='add'>+		pr_cont("yes.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("no.\n");</div><div class='add'>+	pr_cont("no.\n");</div><div class='ctx'> 	panic(bug64hit, !R4000_WAR ? r4kwar : nowar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -218,11 +218,11 @@ static inline void check_daddi(void)</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 	if (daddi_ov) {</div><div class='del'>-		printk("no.\n");</div><div class='add'>+		pr_cont("no.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("yes, workaround... ");</div><div class='add'>+	pr_cont("yes, workaround... ");</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	handler = set_except_vector(EXCCODE_OV, handle_daddi_ov);</div><div class='hunk'>@@ -236,11 +236,11 @@ static inline void check_daddi(void)</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 	if (daddi_ov) {</div><div class='del'>-		printk("yes.\n");</div><div class='add'>+		pr_cont("yes.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("no.\n");</div><div class='add'>+	pr_cont("no.\n");</div><div class='ctx'> 	panic(bug64hit, !DADDI_WAR ? daddiwar : nowar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -288,11 +288,11 @@ static inline void check_daddiu(void)</div><div class='ctx'> 	daddiu_bug = v != w;</div><div class='ctx'> </div><div class='ctx'> 	if (!daddiu_bug) {</div><div class='del'>-		printk("no.\n");</div><div class='add'>+		pr_cont("no.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("yes, workaround... ");</div><div class='add'>+	pr_cont("yes, workaround... ");</div><div class='ctx'> </div><div class='ctx'> 	asm volatile(</div><div class='ctx'> 		"addiu	%2, $0, %3\n\t"</div><div class='hunk'>@@ -304,11 +304,11 @@ static inline void check_daddiu(void)</div><div class='ctx'> 		: "I" (0xffffffffffffdb9aUL), "I" (0x1234));</div><div class='ctx'> </div><div class='ctx'> 	if (v == w) {</div><div class='del'>-		printk("yes.\n");</div><div class='add'>+		pr_cont("yes.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("no.\n");</div><div class='add'>+	pr_cont("no.\n");</div><div class='ctx'> 	panic(bug64hit, !DADDI_WAR ? daddiwar : nowar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c<br/>index dd3175442c9e..07718bb5fc9d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/cpu-probe.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/cpu-probe.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/cpu-probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/cpu-probe.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-bits.h&gt;</div><div class='ctx'> #include &lt;asm/spram.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Hardware capabilities */</div><div class='ctx'> unsigned int elf_hwcap __read_mostly;</div><div class='head'>diff --git a/arch/mips/kernel/crash.c b/arch/mips/kernel/crash.c<br/>index 1723b1762297..ca25cd393b1c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/crash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/crash.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/crash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/crash.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* This keeps a track of which one is crashing cpu. */</div><div class='ctx'> static int crashing_cpu = -1;</div><div class='hunk'>@@ -56,7 +57,7 @@ static void crash_kexec_prepare_cpus(void)</div><div class='ctx'> </div><div class='ctx'> 	ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */</div><div class='ctx'> </div><div class='del'>-	dump_send_ipi(crash_shutdown_secondary);</div><div class='add'>+	smp_call_function(crash_shutdown_secondary, NULL, 0);</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/mips/kernel/crash_dump.c b/arch/mips/kernel/crash_dump.c<br/>index 6fe7790e5868..77ee99a2d0aa 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/crash_dump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/crash_dump.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/crash_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/crash_dump.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void *kdump_buf_page;</div><div class='head'>diff --git a/arch/mips/kernel/csrc-bcm1480.c b/arch/mips/kernel/csrc-bcm1480.c<br/>index 7f65b53d1b24..f011261e9506 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/csrc-bcm1480.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/csrc-bcm1480.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/csrc-bcm1480.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/csrc-bcm1480.c</a></div><div class='hunk'>@@ -25,9 +25,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sibyte/sb1250.h&gt;</div><div class='ctx'> </div><div class='del'>-static cycle_t bcm1480_hpt_read(struct clocksource *cs)</div><div class='add'>+static u64 bcm1480_hpt_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t) __raw_readq(IOADDR(A_SCD_ZBBUS_CYCLE_COUNT));</div><div class='add'>+	return (u64) __raw_readq(IOADDR(A_SCD_ZBBUS_CYCLE_COUNT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct clocksource bcm1480_clocksource = {</div><div class='head'>diff --git a/arch/mips/kernel/csrc-ioasic.c b/arch/mips/kernel/csrc-ioasic.c<br/>index 722f5589cd1d..f6acd1e58c26 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/csrc-ioasic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/csrc-ioasic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/csrc-ioasic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/csrc-ioasic.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;asm/dec/ioasic.h&gt;</div><div class='ctx'> #include &lt;asm/dec/ioasic_addrs.h&gt;</div><div class='ctx'> </div><div class='del'>-static cycle_t dec_ioasic_hpt_read(struct clocksource *cs)</div><div class='add'>+static u64 dec_ioasic_hpt_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return ioasic_read(IO_REG_FCTR);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c<br/>index d76275da54cb..eed099f35bf1 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/csrc-r4k.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/csrc-r4k.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/csrc-r4k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/csrc-r4k.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> </div><div class='del'>-static cycle_t c0_hpt_read(struct clocksource *cs)</div><div class='add'>+static u64 c0_hpt_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return read_c0_count();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/csrc-sb1250.c b/arch/mips/kernel/csrc-sb1250.c<br/>index d915652b4d56..b07b7310d3f4 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/csrc-sb1250.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/csrc-sb1250.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/csrc-sb1250.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/csrc-sb1250.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'>  * The HPT is free running from SB1250_HPT_VALUE down to 0 then starts over</div><div class='ctx'>  * again.</div><div class='ctx'>  */</div><div class='del'>-static inline cycle_t sb1250_hpt_get_cycles(void)</div><div class='add'>+static inline u64 sb1250_hpt_get_cycles(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int count;</div><div class='ctx'> 	void __iomem *addr;</div><div class='hunk'>@@ -41,7 +41,7 @@ static inline cycle_t sb1250_hpt_get_cycles(void)</div><div class='ctx'> 	return SB1250_HPT_VALUE - count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t sb1250_hpt_read(struct clocksource *cs)</div><div class='add'>+static u64 sb1250_hpt_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return sb1250_hpt_get_cycles();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S<br/>index 7791840cf22c..8d83fc2a96b7 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/entry.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/entry.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/entry.S</a></div><div class='hunk'>@@ -47,11 +47,6 @@ resume_userspace:</div><div class='ctx'> 	local_irq_disable		# make sure we dont miss an</div><div class='ctx'> 					# interrupt setting need_resched</div><div class='ctx'> 					# between sampling and return</div><div class='del'>-#ifdef CONFIG_MIPSR2_TO_R6_EMULATOR</div><div class='del'>-	lw	k0, TI_R2_EMUL_RET($28)</div><div class='del'>-	bnez	k0, restore_all_from_r2_emul</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	LONG_L	a2, TI_FLAGS($28)	# current-&gt;work</div><div class='ctx'> 	andi	t0, a2, _TIF_WORK_MASK	# (ignoring syscall_trace)</div><div class='ctx'> 	bnez	t0, work_pending</div><div class='hunk'>@@ -120,19 +115,6 @@ restore_partial:		# restore partial frame</div><div class='ctx'> 	RESTORE_SP_AND_RET</div><div class='ctx'> 	.set	at</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MIPSR2_TO_R6_EMULATOR</div><div class='del'>-restore_all_from_r2_emul:			# restore full frame</div><div class='del'>-	.set	noat</div><div class='del'>-	sw	zero, TI_R2_EMUL_RET($28)	# reset it</div><div class='del'>-	RESTORE_TEMP</div><div class='del'>-	RESTORE_AT</div><div class='del'>-	RESTORE_STATIC</div><div class='del'>-	RESTORE_SOME</div><div class='del'>-	LONG_L	sp, PT_R29(sp)</div><div class='del'>-	eretnc</div><div class='del'>-	.set	at</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> work_pending:</div><div class='ctx'> 	andi	t0, a2, _TIF_NEED_RESCHED # a2 is preloaded with TI_FLAGS</div><div class='ctx'> 	beqz	t0, work_notifysig</div><div class='head'>diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S<br/>index dc0b29612891..7ec9612cb007 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/genex.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/genex.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/genex.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/genex.S</a></div><div class='hunk'>@@ -187,9 +187,44 @@ NESTED(handle_int, PT_SIZE, sp)</div><div class='ctx'> </div><div class='ctx'> 	LONG_L	s0, TI_REGS($28)</div><div class='ctx'> 	LONG_S	sp, TI_REGS($28)</div><div class='del'>-	PTR_LA	ra, ret_from_irq</div><div class='del'>-	PTR_LA	v0, plat_irq_dispatch</div><div class='del'>-	jr	v0</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SAVE_ALL ensures we are using a valid kernel stack for the thread.</div><div class='add'>+	 * Check if we are already using the IRQ stack.</div><div class='add'>+	 */</div><div class='add'>+	move	s1, sp # Preserve the sp</div><div class='add'>+</div><div class='add'>+	/* Get IRQ stack for this CPU */</div><div class='add'>+	ASM_CPUID_MFC0	k0, ASM_SMP_CPUID_REG</div><div class='add'>+#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32)</div><div class='add'>+	lui	k1, %hi(irq_stack)</div><div class='add'>+#else</div><div class='add'>+	lui	k1, %highest(irq_stack)</div><div class='add'>+	daddiu	k1, %higher(irq_stack)</div><div class='add'>+	dsll	k1, 16</div><div class='add'>+	daddiu	k1, %hi(irq_stack)</div><div class='add'>+	dsll	k1, 16</div><div class='add'>+#endif</div><div class='add'>+	LONG_SRL	k0, SMP_CPUID_PTRSHIFT</div><div class='add'>+	LONG_ADDU	k1, k0</div><div class='add'>+	LONG_L	t0, %lo(irq_stack)(k1)</div><div class='add'>+</div><div class='add'>+	# Check if already on IRQ stack</div><div class='add'>+	PTR_LI	t1, ~(_THREAD_SIZE-1)</div><div class='add'>+	and	t1, t1, sp</div><div class='add'>+	beq	t0, t1, 2f</div><div class='add'>+</div><div class='add'>+	/* Switch to IRQ stack */</div><div class='add'>+	li	t1, _IRQ_STACK_SIZE</div><div class='add'>+	PTR_ADD sp, t0, t1</div><div class='add'>+</div><div class='add'>+2:</div><div class='add'>+	jal	plat_irq_dispatch</div><div class='add'>+</div><div class='add'>+	/* Restore sp */</div><div class='add'>+	move	sp, s1</div><div class='add'>+</div><div class='add'>+	j	ret_from_irq</div><div class='ctx'> #ifdef CONFIG_CPU_MICROMIPS</div><div class='ctx'> 	nop</div><div class='ctx'> #endif</div><div class='hunk'>@@ -262,8 +297,44 @@ NESTED(except_vec_vi_handler, 0, sp)</div><div class='ctx'> </div><div class='ctx'> 	LONG_L	s0, TI_REGS($28)</div><div class='ctx'> 	LONG_S	sp, TI_REGS($28)</div><div class='del'>-	PTR_LA	ra, ret_from_irq</div><div class='del'>-	jr	v0</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SAVE_ALL ensures we are using a valid kernel stack for the thread.</div><div class='add'>+	 * Check if we are already using the IRQ stack.</div><div class='add'>+	 */</div><div class='add'>+	move	s1, sp # Preserve the sp</div><div class='add'>+</div><div class='add'>+	/* Get IRQ stack for this CPU */</div><div class='add'>+	ASM_CPUID_MFC0	k0, ASM_SMP_CPUID_REG</div><div class='add'>+#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32)</div><div class='add'>+	lui	k1, %hi(irq_stack)</div><div class='add'>+#else</div><div class='add'>+	lui	k1, %highest(irq_stack)</div><div class='add'>+	daddiu	k1, %higher(irq_stack)</div><div class='add'>+	dsll	k1, 16</div><div class='add'>+	daddiu	k1, %hi(irq_stack)</div><div class='add'>+	dsll	k1, 16</div><div class='add'>+#endif</div><div class='add'>+	LONG_SRL	k0, SMP_CPUID_PTRSHIFT</div><div class='add'>+	LONG_ADDU	k1, k0</div><div class='add'>+	LONG_L	t0, %lo(irq_stack)(k1)</div><div class='add'>+</div><div class='add'>+	# Check if already on IRQ stack</div><div class='add'>+	PTR_LI	t1, ~(_THREAD_SIZE-1)</div><div class='add'>+	and	t1, t1, sp</div><div class='add'>+	beq	t0, t1, 2f</div><div class='add'>+</div><div class='add'>+	/* Switch to IRQ stack */</div><div class='add'>+	li	t1, _IRQ_STACK_SIZE</div><div class='add'>+	PTR_ADD sp, t0, t1</div><div class='add'>+</div><div class='add'>+2:</div><div class='add'>+	jalr	v0</div><div class='add'>+</div><div class='add'>+	/* Restore sp */</div><div class='add'>+	move	sp, s1</div><div class='add'>+</div><div class='add'>+	j	ret_from_irq</div><div class='ctx'> 	END(except_vec_vi_handler)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c<br/>index f25f7eab7307..ba150c755fcc 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/irq.c</a></div><div class='hunk'>@@ -23,7 +23,9 @@</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+void *irq_stack[NR_CPUS];</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 'what should we do if we get a hw irq event on an illegal vector'.</div><div class='hunk'>@@ -58,6 +60,15 @@ void __init init_IRQ(void)</div><div class='ctx'> 		clear_c0_status(ST0_IM);</div><div class='ctx'> </div><div class='ctx'> 	arch_init_irq();</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		int irq_pages = IRQ_STACK_SIZE / PAGE_SIZE;</div><div class='add'>+		void *s = (void *)__get_free_pages(GFP_KERNEL, irq_pages);</div><div class='add'>+</div><div class='add'>+		irq_stack[i] = s;</div><div class='add'>+		pr_debug("CPU%d IRQ stack at 0x%p - 0x%p\n", i,</div><div class='add'>+			irq_stack[i], irq_stack[i] + IRQ_STACK_SIZE);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_STACKOVERFLOW</div><div class='head'>diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c<br/>index de63d36af895..1f4bd222ba76 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/kgdb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/kgdb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/kgdb.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct hard_trap_info {</div><div class='ctx'> 	unsigned char tt;	/* Trap type code for MIPS R3xxx and R4xxx */</div><div class='head'>diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c<br/>index 50fb62544df7..b01bdef101a8 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/linux32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/linux32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/linux32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/linux32.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/compat-signal.h&gt;</div><div class='ctx'> #include &lt;asm/sim.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/mman.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -64,15 +64,10 @@ SYSCALL_DEFINE6(32_mmap2, unsigned long, addr, unsigned long, len,</div><div class='ctx'> 	unsigned long, prot, unsigned long, flags, unsigned long, fd,</div><div class='ctx'> 	unsigned long, pgoff)</div><div class='ctx'> {</div><div class='del'>-	unsigned long error;</div><div class='del'>-</div><div class='del'>-	error = -EINVAL;</div><div class='ctx'> 	if (pgoff &amp; (~PAGE_MASK &gt;&gt; 12))</div><div class='del'>-		goto out;</div><div class='del'>-	error = sys_mmap_pgoff(addr, len, prot, flags, fd,</div><div class='del'>-			       pgoff &gt;&gt; (PAGE_SHIFT-12));</div><div class='del'>-out:</div><div class='del'>-	return error;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return sys_mmap_pgoff(addr, len, prot, flags, fd,</div><div class='add'>+			      pgoff &gt;&gt; (PAGE_SHIFT-12));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define RLIM_INFINITY32 0x7fffffff</div><div class='head'>diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c<br/>index 59725204105c..8b574bcd39ba 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/machine_kexec.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/machine_kexec.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/machine_kexec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -28,9 +28,31 @@ atomic_t kexec_ready_to_reboot = ATOMIC_INIT(0);</div><div class='ctx'> void (*_crash_smp_send_stop)(void) = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void kexec_image_info(const struct kimage *kimage)</div><div class='add'>+{</div><div class='add'>+	unsigned long i;</div><div class='add'>+</div><div class='add'>+	pr_debug("kexec kimage info:\n");</div><div class='add'>+	pr_debug("  type:        %d\n", kimage-&gt;type);</div><div class='add'>+	pr_debug("  start:       %lx\n", kimage-&gt;start);</div><div class='add'>+	pr_debug("  head:        %lx\n", kimage-&gt;head);</div><div class='add'>+	pr_debug("  nr_segments: %lu\n", kimage-&gt;nr_segments);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; kimage-&gt;nr_segments; i++) {</div><div class='add'>+		pr_debug("    segment[%lu]: %016lx - %016lx, 0x%lx bytes, %lu pages\n",</div><div class='add'>+			i,</div><div class='add'>+			kimage-&gt;segment[i].mem,</div><div class='add'>+			kimage-&gt;segment[i].mem + kimage-&gt;segment[i].memsz,</div><div class='add'>+			(unsigned long)kimage-&gt;segment[i].memsz,</div><div class='add'>+			(unsigned long)kimage-&gt;segment[i].memsz /  PAGE_SIZE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> machine_kexec_prepare(struct kimage *kimage)</div><div class='ctx'> {</div><div class='add'>+	kexec_image_info(kimage);</div><div class='add'>+</div><div class='ctx'> 	if (_machine_kexec_prepare)</div><div class='ctx'> 		return _machine_kexec_prepare(kimage);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S<br/>index 2f7c734771f4..f2ee7e1e3342 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/mcount.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/mcount.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/mcount.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/mcount.S</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  * Author: Wu Zhangjin &lt;wuzhangjin@gmail.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/export.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> #include &lt;asm/stackframe.h&gt;</div><div class='ctx'> #include &lt;asm/ftrace.h&gt;</div><div class='hunk'>@@ -66,6 +67,7 @@</div><div class='ctx'> NESTED(ftrace_caller, PT_SIZE, ra)</div><div class='ctx'> 	.globl _mcount</div><div class='ctx'> _mcount:</div><div class='add'>+EXPORT_SYMBOL(_mcount)</div><div class='ctx'> 	b	ftrace_stub</div><div class='ctx'> #ifdef CONFIG_32BIT</div><div class='ctx'> 	 addiu sp,sp,8</div><div class='hunk'>@@ -114,6 +116,7 @@ ftrace_stub:</div><div class='ctx'> #else	/* ! CONFIG_DYNAMIC_FTRACE */</div><div class='ctx'> </div><div class='ctx'> NESTED(_mcount, PT_SIZE, ra)</div><div class='add'>+EXPORT_SYMBOL(_mcount)</div><div class='ctx'> 	PTR_LA	t1, ftrace_stub</div><div class='ctx'> 	PTR_L	t2, ftrace_trace_function /* Prepare t2 for (1) */</div><div class='ctx'> 	bne	t1, t2, static_trace</div><div class='head'>diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c<br/>index 789d7bf4fef3..8cab633e0e5a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/mips-mt-fpaff.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/mips-mt-fpaff.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/mips-mt-fpaff.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/mips-mt-fpaff.c</a></div><div class='hunk'>@@ -9,9 +9,11 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/cred.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * CPU mask used to set process affinity for MT VPEs/TCs with FPUs</div><div class='hunk'>@@ -99,9 +101,10 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='ctx'> 		goto out_free_new_mask;</div><div class='ctx'> 	}</div><div class='del'>-	retval = -EPERM;</div><div class='del'>-	if (!check_same_owner(p) &amp;&amp; !capable(CAP_SYS_NICE))</div><div class='add'>+	if (!check_same_owner(p) &amp;&amp; !capable(CAP_SYS_NICE)) {</div><div class='add'>+		retval = -EPERM;</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	retval = security_task_setscheduler(p);</div><div class='ctx'> 	if (retval)</div><div class='head'>diff --git a/arch/mips/kernel/mips-r2-to-r6-emul.c b/arch/mips/kernel/mips-r2-to-r6-emul.c<br/>index bd09853aecdf..d8f1cf1ec370 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/mips-r2-to-r6-emul.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/mips-r2-to-r6-emul.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/mips-r2-to-r6-emul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/mips-r2-to-r6-emul.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;asm/local.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='ctx'> #define ADDIU	"daddiu "</div><div class='hunk'>@@ -433,8 +433,8 @@ static int multu_func(struct pt_regs *regs, u32 ir)</div><div class='ctx'> 	rs = regs-&gt;regs[MIPSInst_RS(ir)];</div><div class='ctx'> 	res = (u64)rt * (u64)rs;</div><div class='ctx'> 	rt = res;</div><div class='del'>-	regs-&gt;lo = (s64)rt;</div><div class='del'>-	regs-&gt;hi = (s64)(res &gt;&gt; 32);</div><div class='add'>+	regs-&gt;lo = (s64)(s32)rt;</div><div class='add'>+	regs-&gt;hi = (s64)(s32)(res &gt;&gt; 32);</div><div class='ctx'> </div><div class='ctx'> 	MIPS_R2_STATS(muls);</div><div class='ctx'> </div><div class='hunk'>@@ -670,9 +670,9 @@ static int maddu_func(struct pt_regs *regs, u32 ir)</div><div class='ctx'> 	res += ((((s64)rt) &lt;&lt; 32) | (u32)rs);</div><div class='ctx'> </div><div class='ctx'> 	rt = res;</div><div class='del'>-	regs-&gt;lo = (s64)rt;</div><div class='add'>+	regs-&gt;lo = (s64)(s32)rt;</div><div class='ctx'> 	rs = res &gt;&gt; 32;</div><div class='del'>-	regs-&gt;hi = (s64)rs;</div><div class='add'>+	regs-&gt;hi = (s64)(s32)rs;</div><div class='ctx'> </div><div class='ctx'> 	MIPS_R2_STATS(dsps);</div><div class='ctx'> </div><div class='hunk'>@@ -728,9 +728,9 @@ static int msubu_func(struct pt_regs *regs, u32 ir)</div><div class='ctx'> 	res = ((((s64)rt) &lt;&lt; 32) | (u32)rs) - res;</div><div class='ctx'> </div><div class='ctx'> 	rt = res;</div><div class='del'>-	regs-&gt;lo = (s64)rt;</div><div class='add'>+	regs-&gt;lo = (s64)(s32)rt;</div><div class='ctx'> 	rs = res &gt;&gt; 32;</div><div class='del'>-	regs-&gt;hi = (s64)rs;</div><div class='add'>+	regs-&gt;hi = (s64)(s32)rs;</div><div class='ctx'> </div><div class='ctx'> 	MIPS_R2_STATS(dsps);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c<br/>deleted file mode 100644<br/>index e2b6ab74643d..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/mips_ksyms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/mips_ksyms.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Export MIPS-specific functions needed for loadable modules.</div><div class='del'>- *</div><div class='del'>- * This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- * License.  See the file "COPYING" in the main directory of this archive</div><div class='del'>- * for more details.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1996, 97, 98, 99, 2000, 01, 03, 04, 05, 12 by Ralf Baechle</div><div class='del'>- * Copyright (C) 1999, 2000, 01 Silicon Graphics, Inc.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;asm/checksum.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/ftrace.h&gt;</div><div class='del'>-#include &lt;asm/fpu.h&gt;</div><div class='del'>-#include &lt;asm/msa.h&gt;</div><div class='del'>-</div><div class='del'>-extern void *__bzero_kernel(void *__s, size_t __count);</div><div class='del'>-extern void *__bzero(void *__s, size_t __count);</div><div class='del'>-extern long __strncpy_from_kernel_nocheck_asm(char *__to,</div><div class='del'>-					      const char *__from, long __len);</div><div class='del'>-extern long __strncpy_from_kernel_asm(char *__to, const char *__from,</div><div class='del'>-				      long __len);</div><div class='del'>-extern long __strncpy_from_user_nocheck_asm(char *__to,</div><div class='del'>-					    const char *__from, long __len);</div><div class='del'>-extern long __strncpy_from_user_asm(char *__to, const char *__from,</div><div class='del'>-				    long __len);</div><div class='del'>-extern long __strlen_kernel_asm(const char *s);</div><div class='del'>-extern long __strlen_user_asm(const char *s);</div><div class='del'>-extern long __strnlen_kernel_nocheck_asm(const char *s);</div><div class='del'>-extern long __strnlen_kernel_asm(const char *s);</div><div class='del'>-extern long __strnlen_user_nocheck_asm(const char *s);</div><div class='del'>-extern long __strnlen_user_asm(const char *s);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Core architecture code</div><div class='del'>- */</div><div class='del'>-EXPORT_SYMBOL_GPL(_save_fp);</div><div class='del'>-#ifdef CONFIG_CPU_HAS_MSA</div><div class='del'>-EXPORT_SYMBOL_GPL(_save_msa);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * String functions</div><div class='del'>- */</div><div class='del'>-EXPORT_SYMBOL(memset);</div><div class='del'>-EXPORT_SYMBOL(memcpy);</div><div class='del'>-EXPORT_SYMBOL(memmove);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Functions that operate on entire pages.  Mostly used by memory management.</div><div class='del'>- */</div><div class='del'>-EXPORT_SYMBOL(clear_page);</div><div class='del'>-EXPORT_SYMBOL(copy_page);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Userspace access stuff.</div><div class='del'>- */</div><div class='del'>-EXPORT_SYMBOL(__copy_user);</div><div class='del'>-EXPORT_SYMBOL(__copy_user_inatomic);</div><div class='del'>-#ifdef CONFIG_EVA</div><div class='del'>-EXPORT_SYMBOL(__copy_from_user_eva);</div><div class='del'>-EXPORT_SYMBOL(__copy_in_user_eva);</div><div class='del'>-EXPORT_SYMBOL(__copy_to_user_eva);</div><div class='del'>-EXPORT_SYMBOL(__copy_user_inatomic_eva);</div><div class='del'>-EXPORT_SYMBOL(__bzero_kernel);</div><div class='del'>-#endif</div><div class='del'>-EXPORT_SYMBOL(__bzero);</div><div class='del'>-EXPORT_SYMBOL(__strncpy_from_kernel_nocheck_asm);</div><div class='del'>-EXPORT_SYMBOL(__strncpy_from_kernel_asm);</div><div class='del'>-EXPORT_SYMBOL(__strncpy_from_user_nocheck_asm);</div><div class='del'>-EXPORT_SYMBOL(__strncpy_from_user_asm);</div><div class='del'>-EXPORT_SYMBOL(__strlen_kernel_asm);</div><div class='del'>-EXPORT_SYMBOL(__strlen_user_asm);</div><div class='del'>-EXPORT_SYMBOL(__strnlen_kernel_nocheck_asm);</div><div class='del'>-EXPORT_SYMBOL(__strnlen_kernel_asm);</div><div class='del'>-EXPORT_SYMBOL(__strnlen_user_nocheck_asm);</div><div class='del'>-EXPORT_SYMBOL(__strnlen_user_asm);</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_CPU_MIPSR6</div><div class='del'>-EXPORT_SYMBOL(csum_partial);</div><div class='del'>-EXPORT_SYMBOL(csum_partial_copy_nocheck);</div><div class='del'>-EXPORT_SYMBOL(__csum_partial_copy_kernel);</div><div class='del'>-EXPORT_SYMBOL(__csum_partial_copy_to_user);</div><div class='del'>-EXPORT_SYMBOL(__csum_partial_copy_from_user);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(invalid_pte_table);</div><div class='del'>-#ifdef CONFIG_FUNCTION_TRACER</div><div class='del'>-/* _mcount is defined in arch/mips/kernel/mcount.S */</div><div class='del'>-EXPORT_SYMBOL(_mcount);</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/mips/kernel/perf_event.c b/arch/mips/kernel/perf_event.c<br/>index d64056e0bb56..f298eb2ff6c2 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/perf_event.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/perf_event.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/perf_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/perf_event.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c<br/>index d3ba9f4105b5..8c35b3152e1e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/perf_event_mipsxx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/perf_event_mipsxx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/perf_event_mipsxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/perf_event_mipsxx.c</a></div><div class='hunk'>@@ -101,40 +101,31 @@ struct mips_pmu {</div><div class='ctx'> </div><div class='ctx'> static struct mips_pmu mipspmu;</div><div class='ctx'> </div><div class='del'>-#define M_PERFCTL_EXL			(1	&lt;&lt;  0)</div><div class='del'>-#define M_PERFCTL_KERNEL		(1	&lt;&lt;  1)</div><div class='del'>-#define M_PERFCTL_SUPERVISOR		(1	&lt;&lt;  2)</div><div class='del'>-#define M_PERFCTL_USER			(1	&lt;&lt;  3)</div><div class='del'>-#define M_PERFCTL_INTERRUPT_ENABLE	(1	&lt;&lt;  4)</div><div class='del'>-#define M_PERFCTL_EVENT(event)		(((event) &amp; 0x3ff)  &lt;&lt; 5)</div><div class='del'>-#define M_PERFCTL_VPEID(vpe)		((vpe)	  &lt;&lt; 16)</div><div class='add'>+#define M_PERFCTL_EVENT(event)		(((event) &lt;&lt; MIPS_PERFCTRL_EVENT_S) &amp; \</div><div class='add'>+					 MIPS_PERFCTRL_EVENT)</div><div class='add'>+#define M_PERFCTL_VPEID(vpe)		((vpe)	  &lt;&lt; MIPS_PERFCTRL_VPEID_S)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_BMIPS5000</div><div class='ctx'> #define M_PERFCTL_MT_EN(filter)		0</div><div class='ctx'> #else /* !CONFIG_CPU_BMIPS5000 */</div><div class='del'>-#define M_PERFCTL_MT_EN(filter)		((filter) &lt;&lt; 20)</div><div class='add'>+#define M_PERFCTL_MT_EN(filter)		(filter)</div><div class='ctx'> #endif /* CONFIG_CPU_BMIPS5000 */</div><div class='ctx'> </div><div class='del'>-#define	   M_TC_EN_ALL			M_PERFCTL_MT_EN(0)</div><div class='del'>-#define	   M_TC_EN_VPE			M_PERFCTL_MT_EN(1)</div><div class='del'>-#define	   M_TC_EN_TC			M_PERFCTL_MT_EN(2)</div><div class='del'>-#define M_PERFCTL_TCID(tcid)		((tcid)	  &lt;&lt; 22)</div><div class='del'>-#define M_PERFCTL_WIDE			(1	&lt;&lt; 30)</div><div class='del'>-#define M_PERFCTL_MORE			(1	&lt;&lt; 31)</div><div class='del'>-#define M_PERFCTL_TC			(1	&lt;&lt; 30)</div><div class='add'>+#define	   M_TC_EN_ALL			M_PERFCTL_MT_EN(MIPS_PERFCTRL_MT_EN_ALL)</div><div class='add'>+#define	   M_TC_EN_VPE			M_PERFCTL_MT_EN(MIPS_PERFCTRL_MT_EN_VPE)</div><div class='add'>+#define	   M_TC_EN_TC			M_PERFCTL_MT_EN(MIPS_PERFCTRL_MT_EN_TC)</div><div class='ctx'> </div><div class='del'>-#define M_PERFCTL_COUNT_EVENT_WHENEVER	(M_PERFCTL_EXL |		\</div><div class='del'>-					M_PERFCTL_KERNEL |		\</div><div class='del'>-					M_PERFCTL_USER |		\</div><div class='del'>-					M_PERFCTL_SUPERVISOR |		\</div><div class='del'>-					M_PERFCTL_INTERRUPT_ENABLE)</div><div class='add'>+#define M_PERFCTL_COUNT_EVENT_WHENEVER	(MIPS_PERFCTRL_EXL |		\</div><div class='add'>+					 MIPS_PERFCTRL_K |		\</div><div class='add'>+					 MIPS_PERFCTRL_U |		\</div><div class='add'>+					 MIPS_PERFCTRL_S |		\</div><div class='add'>+					 MIPS_PERFCTRL_IE)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MIPS_MT_SMP</div><div class='ctx'> #define M_PERFCTL_CONFIG_MASK		0x3fff801f</div><div class='ctx'> #else</div><div class='ctx'> #define M_PERFCTL_CONFIG_MASK		0x1f</div><div class='ctx'> #endif</div><div class='del'>-#define M_PERFCTL_EVENT_MASK		0xfe0</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS</div><div class='hunk'>@@ -345,11 +336,11 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx)</div><div class='ctx'> 	cpuc-&gt;saved_ctrl[idx] = M_PERFCTL_EVENT(evt-&gt;event_base &amp; 0xff) |</div><div class='ctx'> 		(evt-&gt;config_base &amp; M_PERFCTL_CONFIG_MASK) |</div><div class='ctx'> 		/* Make sure interrupt enabled. */</div><div class='del'>-		M_PERFCTL_INTERRUPT_ENABLE;</div><div class='add'>+		MIPS_PERFCTRL_IE;</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_CPU_BMIPS5000))</div><div class='ctx'> 		/* enable the counter for the calling thread */</div><div class='ctx'> 		cpuc-&gt;saved_ctrl[idx] |=</div><div class='del'>-			(1 &lt;&lt; (12 + vpe_id())) | M_PERFCTL_TC;</div><div class='add'>+			(1 &lt;&lt; (12 + vpe_id())) | BRCM_PERFCTRL_TC;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We do not actually let the counter run. Leave it until start().</div><div class='hunk'>@@ -754,11 +745,11 @@ static int __n_counters(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!cpu_has_perf)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (!(read_c0_perfctrl0() &amp; M_PERFCTL_MORE))</div><div class='add'>+	if (!(read_c0_perfctrl0() &amp; MIPS_PERFCTRL_M))</div><div class='ctx'> 		return 1;</div><div class='del'>-	if (!(read_c0_perfctrl1() &amp; M_PERFCTL_MORE))</div><div class='add'>+	if (!(read_c0_perfctrl1() &amp; MIPS_PERFCTRL_M))</div><div class='ctx'> 		return 2;</div><div class='del'>-	if (!(read_c0_perfctrl2() &amp; M_PERFCTL_MORE))</div><div class='add'>+	if (!(read_c0_perfctrl2() &amp; MIPS_PERFCTRL_M))</div><div class='ctx'> 		return 3;</div><div class='ctx'> </div><div class='ctx'> 	return 4;</div><div class='hunk'>@@ -1339,7 +1330,7 @@ static int __hw_perf_event_init(struct perf_event *event)</div><div class='ctx'> 	 * We allow max flexibility on how each individual counter shared</div><div class='ctx'> 	 * by the single CPU operates (the mode exclusion and the range).</div><div class='ctx'> 	 */</div><div class='del'>-	hwc-&gt;config_base = M_PERFCTL_INTERRUPT_ENABLE;</div><div class='add'>+	hwc-&gt;config_base = MIPS_PERFCTRL_IE;</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate range bits and validate it. */</div><div class='ctx'> 	if (num_possible_cpus() &gt; 1)</div><div class='hunk'>@@ -1350,14 +1341,14 @@ static int __hw_perf_event_init(struct perf_event *event)</div><div class='ctx'> 		mutex_unlock(&amp;raw_event_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!attr-&gt;exclude_user)</div><div class='del'>-		hwc-&gt;config_base |= M_PERFCTL_USER;</div><div class='add'>+		hwc-&gt;config_base |= MIPS_PERFCTRL_U;</div><div class='ctx'> 	if (!attr-&gt;exclude_kernel) {</div><div class='del'>-		hwc-&gt;config_base |= M_PERFCTL_KERNEL;</div><div class='add'>+		hwc-&gt;config_base |= MIPS_PERFCTRL_K;</div><div class='ctx'> 		/* MIPS kernel mode: KSU == 00b || EXL == 1 || ERL == 1 */</div><div class='del'>-		hwc-&gt;config_base |= M_PERFCTL_EXL;</div><div class='add'>+		hwc-&gt;config_base |= MIPS_PERFCTRL_EXL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!attr-&gt;exclude_hv)</div><div class='del'>-		hwc-&gt;config_base |= M_PERFCTL_SUPERVISOR;</div><div class='add'>+		hwc-&gt;config_base |= MIPS_PERFCTRL_S;</div><div class='ctx'> </div><div class='ctx'> 	hwc-&gt;config_base &amp;= M_PERFCTL_CONFIG_MASK;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1830,7 +1821,7 @@ init_hw_perf_events(void)</div><div class='ctx'> 	mipspmu.num_counters = counters;</div><div class='ctx'> 	mipspmu.irq = irq;</div><div class='ctx'> </div><div class='del'>-	if (read_c0_perfctrl0() &amp; M_PERFCTL_WIDE) {</div><div class='add'>+	if (read_c0_perfctrl0() &amp; MIPS_PERFCTRL_W) {</div><div class='ctx'> 		mipspmu.max_period = (1ULL &lt;&lt; 63) - 1;</div><div class='ctx'> 		mipspmu.valid_count = (1ULL &lt;&lt; 63) - 1;</div><div class='ctx'> 		mipspmu.overflow = 1ULL &lt;&lt; 63;</div><div class='head'>diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c<br/>index 7cf653e21423..5f928c34c148 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/pm-cps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/pm-cps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/pm-cps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/pm-cps.c</a></div><div class='hunk'>@@ -713,7 +713,7 @@ static int __init cps_pm_init(void)</div><div class='ctx'> 		pr_warn("pm-cps: no CPC, clock &amp; power gating unavailable\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "AP_PM_CPS_CPU_ONLINE",</div><div class='add'>+	return cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "mips/cps_pm:online",</div><div class='ctx'> 				 cps_pm_online_cpu, NULL);</div><div class='ctx'> }</div><div class='ctx'> arch_initcall(cps_pm_init);</div><div class='head'>diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c<br/>index 9514e5f2209f..fb6b6b650719 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/process.c</a></div><div class='hunk'>@@ -11,6 +11,9 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -33,12 +36,13 @@</div><div class='ctx'> #include &lt;asm/dsemul.h&gt;</div><div class='ctx'> #include &lt;asm/dsp.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/msa.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> #include &lt;asm/isadep.h&gt;</div><div class='hunk'>@@ -49,9 +53,7 @@</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> void arch_cpu_idle_dead(void)</div><div class='ctx'> {</div><div class='del'>-	/* What the heck is this check doing ? */</div><div class='del'>-	if (!cpumask_test_cpu(smp_processor_id(), &amp;cpu_callin_map))</div><div class='del'>-		play_dead();</div><div class='add'>+	play_dead();</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -195,11 +197,9 @@ struct mips_frame_info {</div><div class='ctx'> #define J_TARGET(pc,target)	\</div><div class='ctx'> 		(((unsigned long)(pc) &amp; 0xf0000000) | ((target) &lt;&lt; 2))</div><div class='ctx'> </div><div class='del'>-static inline int is_ra_save_ins(union mips_instruction *ip)</div><div class='add'>+static inline int is_ra_save_ins(union mips_instruction *ip, int *poff)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_CPU_MICROMIPS</div><div class='del'>-	union mips_instruction mmi;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * swsp ra,offset</div><div class='ctx'> 	 * swm16 reglist,offset(sp)</div><div class='hunk'>@@ -209,29 +209,71 @@ static inline int is_ra_save_ins(union mips_instruction *ip)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * microMIPS is way more fun...</div><div class='ctx'> 	 */</div><div class='del'>-	if (mm_insn_16bit(ip-&gt;halfword[0])) {</div><div class='del'>-		mmi.word = (ip-&gt;halfword[0] &lt;&lt; 16);</div><div class='del'>-		return (mmi.mm16_r5_format.opcode == mm_swsp16_op &amp;&amp;</div><div class='del'>-			mmi.mm16_r5_format.rt == 31) ||</div><div class='del'>-		       (mmi.mm16_m_format.opcode == mm_pool16c_op &amp;&amp;</div><div class='del'>-			mmi.mm16_m_format.func == mm_swm16_op);</div><div class='add'>+	if (mm_insn_16bit(ip-&gt;halfword[1])) {</div><div class='add'>+		switch (ip-&gt;mm16_r5_format.opcode) {</div><div class='add'>+		case mm_swsp16_op:</div><div class='add'>+			if (ip-&gt;mm16_r5_format.rt != 31)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			*poff = ip-&gt;mm16_r5_format.simmediate;</div><div class='add'>+			*poff = (*poff &lt;&lt; 2) / sizeof(ulong);</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		case mm_pool16c_op:</div><div class='add'>+			switch (ip-&gt;mm16_m_format.func) {</div><div class='add'>+			case mm_swm16_op:</div><div class='add'>+				*poff = ip-&gt;mm16_m_format.imm;</div><div class='add'>+				*poff += 1 + ip-&gt;mm16_m_format.rlist;</div><div class='add'>+				*poff = (*poff &lt;&lt; 2) / sizeof(ulong);</div><div class='add'>+				return 1;</div><div class='add'>+</div><div class='add'>+			default:</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	else {</div><div class='del'>-		mmi.halfword[0] = ip-&gt;halfword[1];</div><div class='del'>-		mmi.halfword[1] = ip-&gt;halfword[0];</div><div class='del'>-		return (mmi.mm_m_format.opcode == mm_pool32b_op &amp;&amp;</div><div class='del'>-			mmi.mm_m_format.rd &gt; 9 &amp;&amp;</div><div class='del'>-			mmi.mm_m_format.base == 29 &amp;&amp;</div><div class='del'>-			mmi.mm_m_format.func == mm_swm32_func) ||</div><div class='del'>-		       (mmi.i_format.opcode == mm_sw32_op &amp;&amp;</div><div class='del'>-			mmi.i_format.rs == 29 &amp;&amp;</div><div class='del'>-			mmi.i_format.rt == 31);</div><div class='add'>+</div><div class='add'>+	switch (ip-&gt;i_format.opcode) {</div><div class='add'>+	case mm_sw32_op:</div><div class='add'>+		if (ip-&gt;i_format.rs != 29)</div><div class='add'>+			return 0;</div><div class='add'>+		if (ip-&gt;i_format.rt != 31)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		*poff = ip-&gt;i_format.simmediate / sizeof(ulong);</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	case mm_pool32b_op:</div><div class='add'>+		switch (ip-&gt;mm_m_format.func) {</div><div class='add'>+		case mm_swm32_func:</div><div class='add'>+			if (ip-&gt;mm_m_format.rd &lt; 0x10)</div><div class='add'>+				return 0;</div><div class='add'>+			if (ip-&gt;mm_m_format.base != 29)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			*poff = ip-&gt;mm_m_format.simmediate;</div><div class='add'>+			*poff += (ip-&gt;mm_m_format.rd &amp; 0xf) * sizeof(u32);</div><div class='add'>+			*poff /= sizeof(ulong);</div><div class='add'>+			return 1;</div><div class='add'>+		default:</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='ctx'> 	/* sw / sd $ra, offset($sp) */</div><div class='del'>-	return (ip-&gt;i_format.opcode == sw_op || ip-&gt;i_format.opcode == sd_op) &amp;&amp;</div><div class='del'>-		ip-&gt;i_format.rs == 29 &amp;&amp;</div><div class='del'>-		ip-&gt;i_format.rt == 31;</div><div class='add'>+	if ((ip-&gt;i_format.opcode == sw_op || ip-&gt;i_format.opcode == sd_op) &amp;&amp;</div><div class='add'>+		ip-&gt;i_format.rs == 29 &amp;&amp; ip-&gt;i_format.rt == 31) {</div><div class='add'>+		*poff = ip-&gt;i_format.simmediate / sizeof(ulong);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -246,13 +288,16 @@ static inline int is_jump_ins(union mips_instruction *ip)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * microMIPS is kind of more fun...</div><div class='ctx'> 	 */</div><div class='del'>-	union mips_instruction mmi;</div><div class='del'>-</div><div class='del'>-	mmi.word = (ip-&gt;halfword[0] &lt;&lt; 16);</div><div class='add'>+	if (mm_insn_16bit(ip-&gt;halfword[1])) {</div><div class='add'>+		if ((ip-&gt;mm16_r5_format.opcode == mm_pool16c_op &amp;&amp;</div><div class='add'>+		    (ip-&gt;mm16_r5_format.rt &amp; mm_jr16_op) == mm_jr16_op))</div><div class='add'>+			return 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if ((mmi.mm16_r5_format.opcode == mm_pool16c_op &amp;&amp;</div><div class='del'>-	    (mmi.mm16_r5_format.rt &amp; mm_jr16_op) == mm_jr16_op) ||</div><div class='del'>-	    ip-&gt;j_format.opcode == mm_jal32_op)</div><div class='add'>+	if (ip-&gt;j_format.opcode == mm_j32_op)</div><div class='add'>+		return 1;</div><div class='add'>+	if (ip-&gt;j_format.opcode == mm_jal32_op)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	if (ip-&gt;r_format.opcode != mm_pool32a_op ||</div><div class='ctx'> 			ip-&gt;r_format.func != mm_pool32axf_op)</div><div class='hunk'>@@ -280,15 +325,13 @@ static inline int is_sp_move_ins(union mips_instruction *ip)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * microMIPS is not more fun...</div><div class='ctx'> 	 */</div><div class='del'>-	if (mm_insn_16bit(ip-&gt;halfword[0])) {</div><div class='del'>-		union mips_instruction mmi;</div><div class='del'>-</div><div class='del'>-		mmi.word = (ip-&gt;halfword[0] &lt;&lt; 16);</div><div class='del'>-		return (mmi.mm16_r3_format.opcode == mm_pool16d_op &amp;&amp;</div><div class='del'>-			mmi.mm16_r3_format.simmediate &amp;&amp; mm_addiusp_func) ||</div><div class='del'>-		       (mmi.mm16_r5_format.opcode == mm_pool16d_op &amp;&amp;</div><div class='del'>-			mmi.mm16_r5_format.rt == 29);</div><div class='add'>+	if (mm_insn_16bit(ip-&gt;halfword[1])) {</div><div class='add'>+		return (ip-&gt;mm16_r3_format.opcode == mm_pool16d_op &amp;&amp;</div><div class='add'>+			ip-&gt;mm16_r3_format.simmediate &amp;&amp; mm_addiusp_func) ||</div><div class='add'>+		       (ip-&gt;mm16_r5_format.opcode == mm_pool16d_op &amp;&amp;</div><div class='add'>+			ip-&gt;mm16_r5_format.rt == 29);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return ip-&gt;mm_i_format.opcode == mm_addiu32_op &amp;&amp;</div><div class='ctx'> 	       ip-&gt;mm_i_format.rt == 29 &amp;&amp; ip-&gt;mm_i_format.rs == 29;</div><div class='ctx'> #else</div><div class='hunk'>@@ -303,30 +346,36 @@ static inline int is_sp_move_ins(union mips_instruction *ip)</div><div class='ctx'> </div><div class='ctx'> static int get_frame_info(struct mips_frame_info *info)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_CPU_MICROMIPS</div><div class='del'>-	union mips_instruction *ip = (void *) (((char *) info-&gt;func) - 1);</div><div class='del'>-#else</div><div class='del'>-	union mips_instruction *ip = info-&gt;func;</div><div class='del'>-#endif</div><div class='del'>-	unsigned max_insns = info-&gt;func_size / sizeof(union mips_instruction);</div><div class='del'>-	unsigned i;</div><div class='add'>+	bool is_mmips = IS_ENABLED(CONFIG_CPU_MICROMIPS);</div><div class='add'>+	union mips_instruction insn, *ip, *ip_end;</div><div class='add'>+	const unsigned int max_insns = 128;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;pc_offset = -1;</div><div class='ctx'> 	info-&gt;frame_size = 0;</div><div class='ctx'> </div><div class='add'>+	ip = (void *)msk_isa16_mode((ulong)info-&gt;func);</div><div class='ctx'> 	if (!ip)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	if (max_insns == 0)</div><div class='del'>-		max_insns = 128U;	/* unknown function size */</div><div class='del'>-	max_insns = min(128U, max_insns);</div><div class='add'>+	ip_end = (void *)ip + info-&gt;func_size;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; max_insns; i++, ip++) {</div><div class='add'>+	for (i = 0; i &lt; max_insns &amp;&amp; ip &lt; ip_end; i++, ip++) {</div><div class='add'>+		if (is_mmips &amp;&amp; mm_insn_16bit(ip-&gt;halfword[0])) {</div><div class='add'>+			insn.halfword[0] = 0;</div><div class='add'>+			insn.halfword[1] = ip-&gt;halfword[0];</div><div class='add'>+		} else if (is_mmips) {</div><div class='add'>+			insn.halfword[0] = ip-&gt;halfword[1];</div><div class='add'>+			insn.halfword[1] = ip-&gt;halfword[0];</div><div class='add'>+		} else {</div><div class='add'>+			insn.word = ip-&gt;word;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (is_jump_ins(ip))</div><div class='add'>+		if (is_jump_ins(&amp;insn))</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='ctx'> 		if (!info-&gt;frame_size) {</div><div class='del'>-			if (is_sp_move_ins(ip))</div><div class='add'>+			if (is_sp_move_ins(&amp;insn))</div><div class='ctx'> 			{</div><div class='ctx'> #ifdef CONFIG_CPU_MICROMIPS</div><div class='ctx'> 				if (mm_insn_16bit(ip-&gt;halfword[0]))</div><div class='hunk'>@@ -349,11 +398,9 @@ static int get_frame_info(struct mips_frame_info *info)</div><div class='ctx'> 			}</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (info-&gt;pc_offset == -1 &amp;&amp; is_ra_save_ins(ip)) {</div><div class='del'>-			info-&gt;pc_offset =</div><div class='del'>-				ip-&gt;i_format.simmediate / sizeof(long);</div><div class='add'>+		if (info-&gt;pc_offset == -1 &amp;&amp;</div><div class='add'>+		    is_ra_save_ins(&amp;insn, &amp;info-&gt;pc_offset))</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;frame_size &amp;&amp; info-&gt;pc_offset &gt;= 0) /* nested */</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -511,7 +558,19 @@ EXPORT_SYMBOL(unwind_stack_by_address);</div><div class='ctx'> unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,</div><div class='ctx'> 			   unsigned long pc, unsigned long *ra)</div><div class='ctx'> {</div><div class='del'>-	unsigned long stack_page = (unsigned long)task_stack_page(task);</div><div class='add'>+	unsigned long stack_page = 0;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		if (on_irq_stack(cpu, *sp)) {</div><div class='add'>+			stack_page = (unsigned long)irq_stack[cpu];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!stack_page)</div><div class='add'>+		stack_page = (unsigned long)task_stack_page(task);</div><div class='add'>+</div><div class='ctx'> 	return unwind_stack_by_address(stack_page, sp, pc, ra);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -673,3 +732,47 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_32BIT) || defined(CONFIG_MIPS32_O32)</div><div class='add'>+void mips_dump_regs32(u32 *uregs, const struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = MIPS32_EF_R1; i &lt;= MIPS32_EF_R31; i++) {</div><div class='add'>+		/* k0/k1 are copied as zero. */</div><div class='add'>+		if (i == MIPS32_EF_R26 || i == MIPS32_EF_R27)</div><div class='add'>+			uregs[i] = 0;</div><div class='add'>+		else</div><div class='add'>+			uregs[i] = regs-&gt;regs[i - MIPS32_EF_R0];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uregs[MIPS32_EF_LO] = regs-&gt;lo;</div><div class='add'>+	uregs[MIPS32_EF_HI] = regs-&gt;hi;</div><div class='add'>+	uregs[MIPS32_EF_CP0_EPC] = regs-&gt;cp0_epc;</div><div class='add'>+	uregs[MIPS32_EF_CP0_BADVADDR] = regs-&gt;cp0_badvaddr;</div><div class='add'>+	uregs[MIPS32_EF_CP0_STATUS] = regs-&gt;cp0_status;</div><div class='add'>+	uregs[MIPS32_EF_CP0_CAUSE] = regs-&gt;cp0_cause;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_32BIT || CONFIG_MIPS32_O32 */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+void mips_dump_regs64(u64 *uregs, const struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = MIPS64_EF_R1; i &lt;= MIPS64_EF_R31; i++) {</div><div class='add'>+		/* k0/k1 are copied as zero. */</div><div class='add'>+		if (i == MIPS64_EF_R26 || i == MIPS64_EF_R27)</div><div class='add'>+			uregs[i] = 0;</div><div class='add'>+		else</div><div class='add'>+			uregs[i] = regs-&gt;regs[i - MIPS64_EF_R0];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uregs[MIPS64_EF_LO] = regs-&gt;lo;</div><div class='add'>+	uregs[MIPS64_EF_HI] = regs-&gt;hi;</div><div class='add'>+	uregs[MIPS64_EF_CP0_EPC] = regs-&gt;cp0_epc;</div><div class='add'>+	uregs[MIPS64_EF_CP0_BADVADDR] = regs-&gt;cp0_badvaddr;</div><div class='add'>+	uregs[MIPS64_EF_CP0_STATUS] = regs-&gt;cp0_status;</div><div class='add'>+	uregs[MIPS64_EF_CP0_CAUSE] = regs-&gt;cp0_cause;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_64BIT */</div><div class='head'>diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c<br/>index 5fcec3032f38..0dbcd152a1a9 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/prom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/prom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/prom.c</a></div><div class='hunk'>@@ -49,6 +49,13 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)</div><div class='ctx'> 	return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int __init early_init_dt_reserve_memory_arch(phys_addr_t base,</div><div class='add'>+					phys_addr_t size, bool nomap)</div><div class='add'>+{</div><div class='add'>+	add_memory_region(base, size, BOOT_MEM_RESERVED);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init __dt_setup_arch(void *bph)</div><div class='ctx'> {</div><div class='ctx'> 	if (!early_init_dt_scan(bph))</div><div class='head'>diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c<br/>index a92994d60e91..339601267265 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/ptrace.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='hunk'>@@ -41,7 +42,7 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/syscall.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -294,23 +295,8 @@ static int gpr32_get(struct task_struct *target,</div><div class='ctx'> {</div><div class='ctx'> 	struct pt_regs *regs = task_pt_regs(target);</div><div class='ctx'> 	u32 uregs[ELF_NGREG] = {};</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = MIPS32_EF_R1; i &lt;= MIPS32_EF_R31; i++) {</div><div class='del'>-		/* k0/k1 are copied as zero. */</div><div class='del'>-		if (i == MIPS32_EF_R26 || i == MIPS32_EF_R27)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		uregs[i] = regs-&gt;regs[i - MIPS32_EF_R0];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	uregs[MIPS32_EF_LO] = regs-&gt;lo;</div><div class='del'>-	uregs[MIPS32_EF_HI] = regs-&gt;hi;</div><div class='del'>-	uregs[MIPS32_EF_CP0_EPC] = regs-&gt;cp0_epc;</div><div class='del'>-	uregs[MIPS32_EF_CP0_BADVADDR] = regs-&gt;cp0_badvaddr;</div><div class='del'>-	uregs[MIPS32_EF_CP0_STATUS] = regs-&gt;cp0_status;</div><div class='del'>-	uregs[MIPS32_EF_CP0_CAUSE] = regs-&gt;cp0_cause;</div><div class='ctx'> </div><div class='add'>+	mips_dump_regs32(uregs, regs);</div><div class='ctx'> 	return user_regset_copyout(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, uregs, 0,</div><div class='ctx'> 				   sizeof(uregs));</div><div class='ctx'> }</div><div class='hunk'>@@ -373,23 +359,8 @@ static int gpr64_get(struct task_struct *target,</div><div class='ctx'> {</div><div class='ctx'> 	struct pt_regs *regs = task_pt_regs(target);</div><div class='ctx'> 	u64 uregs[ELF_NGREG] = {};</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = MIPS64_EF_R1; i &lt;= MIPS64_EF_R31; i++) {</div><div class='del'>-		/* k0/k1 are copied as zero. */</div><div class='del'>-		if (i == MIPS64_EF_R26 || i == MIPS64_EF_R27)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		uregs[i] = regs-&gt;regs[i - MIPS64_EF_R0];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	uregs[MIPS64_EF_LO] = regs-&gt;lo;</div><div class='del'>-	uregs[MIPS64_EF_HI] = regs-&gt;hi;</div><div class='del'>-	uregs[MIPS64_EF_CP0_EPC] = regs-&gt;cp0_epc;</div><div class='del'>-	uregs[MIPS64_EF_CP0_BADVADDR] = regs-&gt;cp0_badvaddr;</div><div class='del'>-	uregs[MIPS64_EF_CP0_STATUS] = regs-&gt;cp0_status;</div><div class='del'>-	uregs[MIPS64_EF_CP0_CAUSE] = regs-&gt;cp0_cause;</div><div class='ctx'> </div><div class='add'>+	mips_dump_regs64(uregs, regs);</div><div class='ctx'> 	return user_regset_copyout(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, uregs, 0,</div><div class='ctx'> 				   sizeof(uregs));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c<br/>index 7e71a4e0281b..40e212d6b26b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/ptrace32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/ptrace32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/ptrace32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/ptrace32.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='hunk'>@@ -32,7 +33,7 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -69,7 +70,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,</div><div class='ctx'> 		if (get_user(addrOthers, (u32 __user * __user *) (unsigned long) addr) != 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		copied = access_process_vm(child, (u64)addrOthers, &amp;tmp,</div><div class='add'>+		copied = ptrace_access_vm(child, (u64)addrOthers, &amp;tmp,</div><div class='ctx'> 				sizeof(tmp), FOLL_FORCE);</div><div class='ctx'> 		if (copied != sizeof(tmp))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -178,7 +179,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,</div><div class='ctx'> 		if (get_user(addrOthers, (u32 __user * __user *) (unsigned long) addr) != 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		ret = 0;</div><div class='del'>-		if (access_process_vm(child, (u64)addrOthers, &amp;data,</div><div class='add'>+		if (ptrace_access_vm(child, (u64)addrOthers, &amp;data,</div><div class='ctx'> 					sizeof(data),</div><div class='ctx'> 					FOLL_FORCE | FOLL_WRITE) == sizeof(data))</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S<br/>index ac27ef7d4d0e..1049eeafd97d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/r2300_switch.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/r2300_switch.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/r2300_switch.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/r2300_switch.S</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/cachectl.h&gt;</div><div class='add'>+#include &lt;asm/export.h&gt;</div><div class='ctx'> #include &lt;asm/fpregdef.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -72,6 +73,7 @@ LEAF(resume)</div><div class='ctx'>  * Save a thread's fp context.</div><div class='ctx'>  */</div><div class='ctx'> LEAF(_save_fp)</div><div class='add'>+EXPORT_SYMBOL(_save_fp)</div><div class='ctx'> 	fpu_save_single a0, t1			# clobbers t1</div><div class='ctx'> 	jr	ra</div><div class='ctx'> 	END(_save_fp)</div><div class='head'>diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S<br/>index 2f0a3b223c97..758577861523 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/r4k_switch.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/r4k_switch.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/r4k_switch.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/r4k_switch.S</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/cachectl.h&gt;</div><div class='add'>+#include &lt;asm/export.h&gt;</div><div class='ctx'> #include &lt;asm/fpregdef.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -75,6 +76,7 @@</div><div class='ctx'>  * Save a thread's fp context.</div><div class='ctx'>  */</div><div class='ctx'> LEAF(_save_fp)</div><div class='add'>+EXPORT_SYMBOL(_save_fp)</div><div class='ctx'> #if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2) || \</div><div class='ctx'> 		defined(CONFIG_CPU_MIPS32_R6)</div><div class='ctx'> 	mfc0	t0, CP0_STATUS</div><div class='hunk'>@@ -101,6 +103,7 @@ LEAF(_restore_fp)</div><div class='ctx'>  * Save a thread's MSA vector context.</div><div class='ctx'>  */</div><div class='ctx'> LEAF(_save_msa)</div><div class='add'>+EXPORT_SYMBOL(_save_msa)</div><div class='ctx'> 	msa_save_all	a0</div><div class='ctx'> 	jr	ra</div><div class='ctx'> 	END(_save_msa)</div><div class='head'>diff --git a/arch/mips/kernel/relocate.c b/arch/mips/kernel/relocate.c<br/>index 1958910b75c0..9103bebc9a8e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/relocate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/relocate.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/relocate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/relocate.c</a></div><div class='hunk'>@@ -31,6 +31,18 @@ extern u32 _relocation_end[];	/* End relocation table */</div><div class='ctx'> extern long __start___ex_table;	/* Start exception table */</div><div class='ctx'> extern long __stop___ex_table;	/* End exception table */</div><div class='ctx'> </div><div class='add'>+extern void __weak plat_fdt_relocated(void *new_location);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function may be defined for a platform to perform any post-relocation</div><div class='add'>+ * fixup necessary.</div><div class='add'>+ * Return non-zero to abort relocation</div><div class='add'>+ */</div><div class='add'>+int __weak plat_post_relocation(long offset)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u32 __init get_synci_step(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 res;</div><div class='hunk'>@@ -291,12 +303,14 @@ void *__init relocate_kernel(void)</div><div class='ctx'> 	int res = 1;</div><div class='ctx'> 	/* Default to original kernel entry point */</div><div class='ctx'> 	void *kernel_entry = start_kernel;</div><div class='add'>+	void *fdt = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the command line */</div><div class='ctx'> 	fw_init_cmdline();</div><div class='ctx'> #if defined(CONFIG_USE_OF)</div><div class='ctx'> 	/* Deal with the device tree */</div><div class='del'>-	early_init_dt_scan(plat_get_fdt());</div><div class='add'>+	fdt = plat_get_fdt();</div><div class='add'>+	early_init_dt_scan(fdt);</div><div class='ctx'> 	if (boot_command_line[0]) {</div><div class='ctx'> 		/* Boot command line was passed in device tree */</div><div class='ctx'> 		strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);</div><div class='hunk'>@@ -316,6 +330,29 @@ void *__init relocate_kernel(void)</div><div class='ctx'> 	arcs_cmdline[0] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	if (offset) {</div><div class='add'>+		void (*fdt_relocated_)(void *) = NULL;</div><div class='add'>+#if defined(CONFIG_USE_OF)</div><div class='add'>+		unsigned long fdt_phys = virt_to_phys(fdt);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If built-in dtb is used then it will have been relocated</div><div class='add'>+		 * during kernel _text relocation. If appended DTB is used</div><div class='add'>+		 * then it will not be relocated, but it should remain</div><div class='add'>+		 * intact in the original location. If dtb is loaded by</div><div class='add'>+		 * the bootloader then it may need to be moved if it crosses</div><div class='add'>+		 * the target memory area</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (fdt_phys &gt;= virt_to_phys(RELOCATED(&amp;_text)) &amp;&amp;</div><div class='add'>+			fdt_phys &lt;= virt_to_phys(RELOCATED(&amp;_end))) {</div><div class='add'>+			void *fdt_relocated =</div><div class='add'>+				RELOCATED(ALIGN((long)&amp;_end, PAGE_SIZE));</div><div class='add'>+			memcpy(fdt_relocated, fdt, fdt_totalsize(fdt));</div><div class='add'>+			fdt = fdt_relocated;</div><div class='add'>+			fdt_relocated_ = RELOCATED(&amp;plat_fdt_relocated);</div><div class='add'>+		}</div><div class='add'>+#endif /* CONFIG_USE_OF */</div><div class='add'>+</div><div class='ctx'> 		/* Copy the kernel to it's new location */</div><div class='ctx'> 		memcpy(loc_new, &amp;_text, kernel_length);</div><div class='ctx'> </div><div class='hunk'>@@ -338,6 +375,23 @@ void *__init relocate_kernel(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		memcpy(RELOCATED(&amp;__bss_start), &amp;__bss_start, bss_length);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * If fdt was stored outside of the kernel image and</div><div class='add'>+		 * had to be moved then update platform's state data</div><div class='add'>+		 * with the new fdt location</div><div class='add'>+		 */</div><div class='add'>+		if (fdt_relocated_)</div><div class='add'>+			fdt_relocated_(fdt);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Last chance for the platform to abort relocation.</div><div class='add'>+		 * This may also be used by the platform to perform any</div><div class='add'>+		 * initialisation required now that the new kernel is</div><div class='add'>+		 * resident in memory and ready to be executed.</div><div class='add'>+		 */</div><div class='add'>+		if (plat_post_relocation(offset))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='ctx'> 		/* The current thread is now within the relocated image */</div><div class='ctx'> 		__current_thread_info = RELOCATED(&amp;init_thread_union);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c<br/>index c5c4fd54d797..b80dd8b17a76 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/rtlx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/rtlx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/rtlx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/rtlx.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/moduleloader.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/mipsmtregs.h&gt;</div><div class='ctx'> #include &lt;asm/mips_mt.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c<br/>index f66e5ce505b2..01d1dbde5fbf 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/setup.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-contiguous.h&gt;</div><div class='ctx'> #include &lt;linux/decompress/generic.h&gt;</div><div class='add'>+#include &lt;linux/of_fdt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='hunk'>@@ -153,6 +154,35 @@ void __init detect_memory_region(phys_addr_t start, phys_addr_t sz_min, phys_add</div><div class='ctx'> 	add_memory_region(start, size, BOOT_MEM_RAM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool __init memory_region_available(phys_addr_t start, phys_addr_t size)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	bool in_ram = false, free = true;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; boot_mem_map.nr_map; i++) {</div><div class='add'>+		phys_addr_t start_, end_;</div><div class='add'>+</div><div class='add'>+		start_ = boot_mem_map.map[i].addr;</div><div class='add'>+		end_ = boot_mem_map.map[i].addr + boot_mem_map.map[i].size;</div><div class='add'>+</div><div class='add'>+		switch (boot_mem_map.map[i].type) {</div><div class='add'>+		case BOOT_MEM_RAM:</div><div class='add'>+			if (start &gt;= start_ &amp;&amp; start + size &lt;= end_)</div><div class='add'>+				in_ram = true;</div><div class='add'>+			break;</div><div class='add'>+		case BOOT_MEM_RESERVED:</div><div class='add'>+			if ((start &gt;= start_ &amp;&amp; start &lt; end_) ||</div><div class='add'>+			    (start &lt; start_ &amp;&amp; start + size &gt;= start_))</div><div class='add'>+				free = false;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return in_ram &amp;&amp; free;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init print_memory_map(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -332,11 +362,19 @@ static void __init bootmem_init(void)</div><div class='ctx'> </div><div class='ctx'> #else  /* !CONFIG_SGI_IP27 */</div><div class='ctx'> </div><div class='add'>+static unsigned long __init bootmap_bytes(unsigned long pages)</div><div class='add'>+{</div><div class='add'>+	unsigned long bytes = DIV_ROUND_UP(pages, 8);</div><div class='add'>+</div><div class='add'>+	return ALIGN(bytes, sizeof(long));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init bootmem_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long reserved_end;</div><div class='ctx'> 	unsigned long mapstart = ~0UL;</div><div class='ctx'> 	unsigned long bootmap_size;</div><div class='add'>+	bool bootmap_valid = false;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -430,11 +468,42 @@ static void __init bootmem_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Initialize the boot-time allocator with low memory only.</div><div class='add'>+	 * check that mapstart doesn't overlap with any of</div><div class='add'>+	 * memory regions that have been reserved through eg. DTB</div><div class='ctx'> 	 */</div><div class='del'>-	bootmap_size = init_bootmem_node(NODE_DATA(0), mapstart,</div><div class='del'>-					 min_low_pfn, max_low_pfn);</div><div class='add'>+	bootmap_size = bootmap_bytes(max_low_pfn - min_low_pfn);</div><div class='ctx'> </div><div class='add'>+	bootmap_valid = memory_region_available(PFN_PHYS(mapstart),</div><div class='add'>+						bootmap_size);</div><div class='add'>+	for (i = 0; i &lt; boot_mem_map.nr_map &amp;&amp; !bootmap_valid; i++) {</div><div class='add'>+		unsigned long mapstart_addr;</div><div class='add'>+</div><div class='add'>+		switch (boot_mem_map.map[i].type) {</div><div class='add'>+		case BOOT_MEM_RESERVED:</div><div class='add'>+			mapstart_addr = PFN_ALIGN(boot_mem_map.map[i].addr +</div><div class='add'>+						boot_mem_map.map[i].size);</div><div class='add'>+			if (PHYS_PFN(mapstart_addr) &lt; mapstart)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			bootmap_valid = memory_region_available(mapstart_addr,</div><div class='add'>+								bootmap_size);</div><div class='add'>+			if (bootmap_valid)</div><div class='add'>+				mapstart = PHYS_PFN(mapstart_addr);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!bootmap_valid)</div><div class='add'>+		panic("No memory area to place a bootmap bitmap");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initialize the boot-time allocator with low memory only.</div><div class='add'>+	 */</div><div class='add'>+	if (bootmap_size != init_bootmem_node(NODE_DATA(0), mapstart,</div><div class='add'>+					 min_low_pfn, max_low_pfn))</div><div class='add'>+		panic("Unexpected memory size required for bootmap");</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; boot_mem_map.nr_map; i++) {</div><div class='ctx'> 		unsigned long start, end;</div><div class='hunk'>@@ -483,6 +552,10 @@ static void __init bootmem_init(void)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* Not usable memory */</div><div class='add'>+			if (start &gt; min_low_pfn &amp;&amp; end &lt; max_low_pfn)</div><div class='add'>+				reserve_bootmem(boot_mem_map.map[i].addr,</div><div class='add'>+						boot_mem_map.map[i].size,</div><div class='add'>+						BOOTMEM_DEFAULT);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -589,6 +662,10 @@ static int __init early_parse_mem(char *p)</div><div class='ctx'> 		start = memparse(p + 1, &amp;p);</div><div class='ctx'> </div><div class='ctx'> 	add_memory_region(start, size, BOOT_MEM_RAM);</div><div class='add'>+</div><div class='add'>+	if (start &amp;&amp; start &gt; PHYS_OFFSET)</div><div class='add'>+		add_memory_region(PHYS_OFFSET, start - PHYS_OFFSET,</div><div class='add'>+				BOOT_MEM_RESERVED);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> early_param("mem", early_parse_mem);</div><div class='hunk'>@@ -664,6 +741,11 @@ static void __init mips_parse_crashkernel(void)</div><div class='ctx'> 	if (ret != 0 || crash_size &lt;= 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (!memory_region_available(crash_base, crash_size)) {</div><div class='add'>+		pr_warn("Invalid memory region reserved for crash kernel\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	crashk_res.start = crash_base;</div><div class='ctx'> 	crashk_res.end	 = crash_base + crash_size - 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -672,6 +754,9 @@ static void __init request_crashkernel(struct resource *res)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (crashk_res.start == crashk_res.end)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	ret = request_resource(res, &amp;crashk_res);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		pr_info("Reserving %ldMB of memory at %ldMB for crashkernel\n",</div><div class='hunk'>@@ -757,6 +842,9 @@ static void __init arch_mem_init(char **cmdline_p)</div><div class='ctx'> 		print_memory_map();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	early_init_fdt_reserve_self();</div><div class='add'>+	early_init_fdt_scan_reserved_mem();</div><div class='add'>+</div><div class='ctx'> 	bootmem_init();</div><div class='ctx'> #ifdef CONFIG_PROC_VMCORE</div><div class='ctx'> 	if (setup_elfcorehdr &amp;&amp; setup_elfcorehdr_size) {</div><div class='head'>diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c<br/>index 97b7c51b8251..84165f2b31ff 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/signal32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/signal32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/signal32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/signal32.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/compat.h&gt;</div><div class='ctx'> #include &lt;asm/compat-signal.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "signal-common.h"</div><div class='head'>diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c<br/>index a7bc38430500..b672cebb4a1a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/signal_n32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/signal_n32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/signal_n32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/signal_n32.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/compat-signal.h&gt;</div><div class='ctx'> #include &lt;asm/sim.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/cpu-features.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/signal_o32.c b/arch/mips/kernel/signal_o32.c<br/>index 5e169fc5ca5c..2b3572fb5f1b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/signal_o32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/signal_o32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/signal_o32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/signal_o32.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/abi.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c<br/>index 6d0f1321e084..3daa2cae50b0 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/smp-bmips.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/smp-bmips.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/smp-bmips.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/smp-bmips.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -364,7 +365,7 @@ static int bmips_cpu_disable(void)</div><div class='ctx'> </div><div class='ctx'> 	set_cpu_online(cpu, false);</div><div class='ctx'> 	calculate_cpu_foreign_map();</div><div class='del'>-	cpumask_clear_cpu(cpu, &amp;cpu_callin_map);</div><div class='add'>+	irq_cpu_offline();</div><div class='ctx'> 	clear_c0_status(IE_IRQ5);</div><div class='ctx'> </div><div class='ctx'> 	local_flush_tlb_all();</div><div class='head'>diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c<br/>index 6183ad84cc73..6d45f05538c8 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/smp-cps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/smp-cps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/smp-cps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/smp-cps.c</a></div><div class='hunk'>@@ -11,7 +11,8 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/irqchip/mips-gic.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -326,7 +327,11 @@ static void cps_boot_secondary(int cpu, struct task_struct *idle)</div><div class='ctx'> 			if (cpu_online(remote))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		BUG_ON(remote &gt;= NR_CPUS);</div><div class='add'>+		if (remote &gt;= NR_CPUS) {</div><div class='add'>+			pr_crit("No online CPU in core %u to start CPU%d\n",</div><div class='add'>+				core, cpu);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		err = smp_call_function_single(remote, remote_vpe_boot,</div><div class='ctx'> 					       NULL, 1);</div><div class='hunk'>@@ -399,7 +404,6 @@ static int cps_cpu_disable(void)</div><div class='ctx'> 	smp_mb__after_atomic();</div><div class='ctx'> 	set_cpu_online(cpu, false);</div><div class='ctx'> 	calculate_cpu_foreign_map();</div><div class='del'>-	cpumask_clear_cpu(cpu, &amp;cpu_callin_map);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c<br/>index 7ebb1918e2ac..6e71130549ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/smp.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -48,8 +48,6 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/maar.h&gt;</div><div class='ctx'> </div><div class='del'>-cpumask_t cpu_callin_map;		/* Bitmask of started secondaries */</div><div class='del'>-</div><div class='ctx'> int __cpu_number_map[NR_CPUS];		/* Map physical to logical */</div><div class='ctx'> EXPORT_SYMBOL(__cpu_number_map);</div><div class='ctx'> </div><div class='hunk'>@@ -68,6 +66,8 @@ EXPORT_SYMBOL(cpu_sibling_map);</div><div class='ctx'> cpumask_t cpu_core_map[NR_CPUS] __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(cpu_core_map);</div><div class='ctx'> </div><div class='add'>+static DECLARE_COMPLETION(cpu_running);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * A logcal cpu mask containing only one VPE per core to</div><div class='ctx'>  * reduce the number of IPIs on large MT systems.</div><div class='hunk'>@@ -369,7 +369,7 @@ asmlinkage void start_secondary(void)</div><div class='ctx'> 	cpumask_set_cpu(cpu, &amp;cpu_coherent_mask);</div><div class='ctx'> 	notify_cpu_starting(cpu);</div><div class='ctx'> </div><div class='del'>-	cpumask_set_cpu(cpu, &amp;cpu_callin_map);</div><div class='add'>+	complete(&amp;cpu_running);</div><div class='ctx'> 	synchronise_count_slave(cpu);</div><div class='ctx'> </div><div class='ctx'> 	set_cpu_online(cpu, true);</div><div class='hunk'>@@ -430,7 +430,6 @@ void smp_prepare_boot_cpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	set_cpu_possible(0, true);</div><div class='ctx'> 	set_cpu_online(0, true);</div><div class='del'>-	cpumask_set_cpu(0, &amp;cpu_callin_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __cpu_up(unsigned int cpu, struct task_struct *tidle)</div><div class='hunk'>@@ -438,11 +437,13 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle)</div><div class='ctx'> 	mp_ops-&gt;boot_secondary(cpu, tidle);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Trust is futile.  We should really have timeouts ...</div><div class='add'>+	 * We must check for timeout here, as the CPU will not be marked</div><div class='add'>+	 * online until the counters are synchronised.</div><div class='ctx'> 	 */</div><div class='del'>-	while (!cpumask_test_cpu(cpu, &amp;cpu_callin_map)) {</div><div class='del'>-		udelay(100);</div><div class='del'>-		schedule();</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;cpu_running,</div><div class='add'>+					 msecs_to_jiffies(1000))) {</div><div class='add'>+		pr_crit("CPU%u: failed to start\n", cpu);</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	synchronise_count_master(cpu);</div><div class='hunk'>@@ -637,23 +638,6 @@ void flush_tlb_one(unsigned long vaddr)</div><div class='ctx'> EXPORT_SYMBOL(flush_tlb_page);</div><div class='ctx'> EXPORT_SYMBOL(flush_tlb_one);</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_KEXEC)</div><div class='del'>-void (*dump_ipi_function_ptr)(void *) = NULL;</div><div class='del'>-void dump_send_ipi(void (*dump_ipi_callback)(void *))</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	dump_ipi_function_ptr = dump_ipi_callback;</div><div class='del'>-	smp_mb();</div><div class='del'>-	for_each_online_cpu(i)</div><div class='del'>-		if (i != cpu)</div><div class='del'>-			mp_ops-&gt;send_ipi_single(i, SMP_DUMP);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dump_send_ipi);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(atomic_t, tick_broadcast_count);</div><div class='head'>diff --git a/arch/mips/kernel/stacktrace.c b/arch/mips/kernel/stacktrace.c<br/>index 506021f62549..7c7c902249f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/stacktrace.c</a></div><div class='hunk'>@@ -4,6 +4,8 @@</div><div class='ctx'>  *  Copyright (C) 2006 Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c<br/>index 4472a7f98577..1df1160b6a47 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/sync-r4k.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/sync-r4k.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/sync-r4k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/sync-r4k.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@ void synchronise_count_master(int cpu)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Synchronize counters for CPU %u: ", cpu);</div><div class='add'>+	pr_info("Synchronize counters for CPU %u: ", cpu);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='hunk'>@@ -83,7 +83,7 @@ void synchronise_count_master(int cpu)</div><div class='ctx'> 	 * count registers were almost certainly out of sync</div><div class='ctx'> 	 * so no point in alarming people</div><div class='ctx'> 	 */</div><div class='del'>-	printk("done.\n");</div><div class='add'>+	pr_cont("done.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void synchronise_count_slave(int cpu)</div><div class='head'>diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c<br/>index 53a7ef9a8f32..f1d17ece4181 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/syscall.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/syscall.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/syscall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/syscall.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/branch.h&gt;</div><div class='hunk'>@@ -36,7 +37,6 @@</div><div class='ctx'> #include &lt;asm/sim.h&gt;</div><div class='ctx'> #include &lt;asm/shmparam.h&gt;</div><div class='ctx'> #include &lt;asm/sysmips.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -60,16 +60,9 @@ SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,</div><div class='ctx'> 	unsigned long, prot, unsigned long, flags, unsigned long,</div><div class='ctx'> 	fd, off_t, offset)</div><div class='ctx'> {</div><div class='del'>-	unsigned long result;</div><div class='del'>-</div><div class='del'>-	result = -EINVAL;</div><div class='ctx'> 	if (offset &amp; ~PAGE_MASK)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	result = sys_mmap_pgoff(addr, len, prot, flags, fd, offset &gt;&gt; PAGE_SHIFT);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return result;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return sys_mmap_pgoff(addr, len, prot, flags, fd, offset &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE6(mips_mmap2, unsigned long, addr, unsigned long, len,</div><div class='head'>diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c<br/>index 3905003dfe2b..c7d17cfb32f6 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/traps.c</a></div><div class='hunk'>@@ -23,7 +23,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='hunk'>@@ -51,6 +52,7 @@</div><div class='ctx'> #include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/mips-cm.h&gt;</div><div class='ctx'> #include &lt;asm/mips-r2-to-r6-emul.h&gt;</div><div class='add'>+#include &lt;asm/mips-cm.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/mipsmtregs.h&gt;</div><div class='ctx'> #include &lt;asm/module.h&gt;</div><div class='hunk'>@@ -61,7 +63,7 @@</div><div class='ctx'> #include &lt;asm/siginfo.h&gt;</div><div class='ctx'> #include &lt;asm/tlbdebug.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/watch.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='hunk'>@@ -1107,7 +1109,6 @@ asmlinkage void do_ri(struct pt_regs *regs)</div><div class='ctx'> 		switch (status) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 		case SIGEMT:</div><div class='del'>-			task_thread_info(current)-&gt;r2_emul_return = 1;</div><div class='ctx'> 			return;</div><div class='ctx'> 		case SIGILL:</div><div class='ctx'> 			goto no_r2_instr;</div><div class='hunk'>@@ -1115,7 +1116,6 @@ asmlinkage void do_ri(struct pt_regs *regs)</div><div class='ctx'> 			process_fpemu_return(status,</div><div class='ctx'> 					     &amp;current-&gt;thread.cp0_baduaddr,</div><div class='ctx'> 					     fcr31);</div><div class='del'>-			task_thread_info(current)-&gt;r2_emul_return = 1;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1644,6 +1644,65 @@ __setup("nol2par", nol2parity);</div><div class='ctx'>  */</div><div class='ctx'> static inline void parity_protection_init(void)</div><div class='ctx'> {</div><div class='add'>+#define ERRCTL_PE	0x80000000</div><div class='add'>+#define ERRCTL_L2P	0x00800000</div><div class='add'>+</div><div class='add'>+	if (mips_cm_revision() &gt;= CM_REV_CM3) {</div><div class='add'>+		ulong gcr_ectl, cp0_ectl;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * With CM3 systems we need to ensure that the L1 &amp; L2</div><div class='add'>+		 * parity enables are set to the same value, since this</div><div class='add'>+		 * is presumed by the hardware engineers.</div><div class='add'>+		 *</div><div class='add'>+		 * If the user disabled either of L1 or L2 ECC checking,</div><div class='add'>+		 * disable both.</div><div class='add'>+		 */</div><div class='add'>+		l1parity &amp;= l2parity;</div><div class='add'>+		l2parity &amp;= l1parity;</div><div class='add'>+</div><div class='add'>+		/* Probe L1 ECC support */</div><div class='add'>+		cp0_ectl = read_c0_ecc();</div><div class='add'>+		write_c0_ecc(cp0_ectl | ERRCTL_PE);</div><div class='add'>+		back_to_back_c0_hazard();</div><div class='add'>+		cp0_ectl = read_c0_ecc();</div><div class='add'>+</div><div class='add'>+		/* Probe L2 ECC support */</div><div class='add'>+		gcr_ectl = read_gcr_err_control();</div><div class='add'>+</div><div class='add'>+		if (!(gcr_ectl &amp; CM_GCR_ERR_CONTROL_L2_ECC_SUPPORT_MSK) ||</div><div class='add'>+		    !(cp0_ectl &amp; ERRCTL_PE)) {</div><div class='add'>+			/*</div><div class='add'>+			 * One of L1 or L2 ECC checking isn't supported,</div><div class='add'>+			 * so we cannot enable either.</div><div class='add'>+			 */</div><div class='add'>+			l1parity = l2parity = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Configure L1 ECC checking */</div><div class='add'>+		if (l1parity)</div><div class='add'>+			cp0_ectl |= ERRCTL_PE;</div><div class='add'>+		else</div><div class='add'>+			cp0_ectl &amp;= ~ERRCTL_PE;</div><div class='add'>+		write_c0_ecc(cp0_ectl);</div><div class='add'>+		back_to_back_c0_hazard();</div><div class='add'>+		WARN_ON(!!(read_c0_ecc() &amp; ERRCTL_PE) != l1parity);</div><div class='add'>+</div><div class='add'>+		/* Configure L2 ECC checking */</div><div class='add'>+		if (l2parity)</div><div class='add'>+			gcr_ectl |= CM_GCR_ERR_CONTROL_L2_ECC_EN_MSK;</div><div class='add'>+		else</div><div class='add'>+			gcr_ectl &amp;= ~CM_GCR_ERR_CONTROL_L2_ECC_EN_MSK;</div><div class='add'>+		write_gcr_err_control(gcr_ectl);</div><div class='add'>+		gcr_ectl = read_gcr_err_control();</div><div class='add'>+		gcr_ectl &amp;= CM_GCR_ERR_CONTROL_L2_ECC_EN_MSK;</div><div class='add'>+		WARN_ON(!!gcr_ectl != l2parity);</div><div class='add'>+</div><div class='add'>+		pr_info("Cache parity protection %sabled\n",</div><div class='add'>+			l1parity ? "en" : "dis");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (current_cpu_type()) {</div><div class='ctx'> 	case CPU_24K:</div><div class='ctx'> 	case CPU_34K:</div><div class='hunk'>@@ -1654,11 +1713,8 @@ static inline void parity_protection_init(void)</div><div class='ctx'> 	case CPU_PROAPTIV:</div><div class='ctx'> 	case CPU_P5600:</div><div class='ctx'> 	case CPU_QEMU_GENERIC:</div><div class='del'>-	case CPU_I6400:</div><div class='ctx'> 	case CPU_P6600:</div><div class='ctx'> 		{</div><div class='del'>-#define ERRCTL_PE	0x80000000</div><div class='del'>-#define ERRCTL_L2P	0x00800000</div><div class='ctx'> 			unsigned long errctl;</div><div class='ctx'> 			unsigned int l1parity_present, l2parity_present;</div><div class='ctx'> </div><div class='hunk'>@@ -2177,7 +2233,7 @@ void per_cpu_trap_init(bool is_boot_cpu)</div><div class='ctx'> 	if (!cpu_data[cpu].asid_cache)</div><div class='ctx'> 		cpu_data[cpu].asid_cache = asid_first_version(cpu);</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> 	BUG_ON(current-&gt;mm);</div><div class='ctx'> 	enter_lazy_tlb(&amp;init_mm, current);</div><div class='head'>diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c<br/>index f1c308dbbc4a..7ed98354fe9d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/unaligned.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/unaligned.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/unaligned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/unaligned.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/fpu_emulator.h&gt;</div><div class='ctx'> #include &lt;asm/inst.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define STR(x)	__STR(x)</div><div class='ctx'> #define __STR(x)  #x</div><div class='head'>diff --git a/arch/mips/kernel/uprobes.c b/arch/mips/kernel/uprobes.c<br/>index dbb917403131..e99e3fae5326 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/uprobes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/uprobes.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/uprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/uprobes.c</a></div><div class='hunk'>@@ -226,7 +226,7 @@ int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm,</div><div class='ctx'> 	return uprobe_write_opcode(mm, vaddr, UPROBE_SWBP_INSN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __weak arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,</div><div class='add'>+void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,</div><div class='ctx'> 				  void *src, unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long kaddr, kstart;</div><div class='head'>diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c<br/>index f9dbfb14af33..093517e85a6c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/vdso.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/vdso.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/vdso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/vdso.c</a></div><div class='hunk'>@@ -111,7 +111,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)</div><div class='ctx'> 	base = mmap_region(NULL, STACK_TOP, PAGE_SIZE,</div><div class='ctx'> 			   VM_READ|VM_WRITE|VM_EXEC|</div><div class='ctx'> 			   VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,</div><div class='del'>-			   0);</div><div class='add'>+			   0, NULL);</div><div class='ctx'> 	if (IS_ERR_VALUE(base)) {</div><div class='ctx'> 		ret = base;</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S<br/>index d5de67591735..f0a0e6d62be3 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kernel/vmlinux.lds.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -182,7 +182,7 @@ SECTIONS</div><div class='ctx'> 	 * Force .bss to 64K alignment so that .bss..swapper_pg_dir</div><div class='ctx'> 	 * gets that alignment.	 .sbss should be empty, so there will be</div><div class='ctx'> 	 * no holes after __init_end. */</div><div class='del'>-	BSS_SECTION(0, 0x10000, 0)</div><div class='add'>+	BSS_SECTION(0, 0x10000, 8)</div><div class='ctx'> </div><div class='ctx'> 	_end = . ;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig<br/>index 7c56d6b124d1..65067327db12 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kvm/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kvm/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kvm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/Kconfig</a></div><div class='hunk'>@@ -20,7 +20,9 @@ config KVM</div><div class='ctx'> 	select EXPORT_UASM</div><div class='ctx'> 	select PREEMPT_NOTIFIERS</div><div class='ctx'> 	select ANON_INODES</div><div class='add'>+	select KVM_GENERIC_DIRTYLOG_READ_PROTECT</div><div class='ctx'> 	select KVM_MMIO</div><div class='add'>+	select MMU_NOTIFIER</div><div class='ctx'> 	select SRCU</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Support for hosting Guest kernels.</div><div class='head'>diff --git a/arch/mips/kvm/dyntrans.c b/arch/mips/kvm/dyntrans.c<br/>index 010cef240688..f8e772564d74 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kvm/dyntrans.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kvm/dyntrans.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kvm/dyntrans.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/dyntrans.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='hunk'>@@ -29,28 +30,37 @@</div><div class='ctx'> static int kvm_mips_trans_replace(struct kvm_vcpu *vcpu, u32 *opc,</div><div class='ctx'> 				  union mips_instruction replace)</div><div class='ctx'> {</div><div class='del'>-	unsigned long paddr, flags;</div><div class='del'>-	void *vaddr;</div><div class='del'>-</div><div class='del'>-	if (KVM_GUEST_KSEGX((unsigned long)opc) == KVM_GUEST_KSEG0) {</div><div class='del'>-		paddr = kvm_mips_translate_guest_kseg0_to_hpa(vcpu,</div><div class='del'>-							    (unsigned long)opc);</div><div class='del'>-		vaddr = kmap_atomic(pfn_to_page(PHYS_PFN(paddr)));</div><div class='del'>-		vaddr += paddr &amp; ~PAGE_MASK;</div><div class='del'>-		memcpy(vaddr, (void *)&amp;replace, sizeof(u32));</div><div class='del'>-		local_flush_icache_range((unsigned long)vaddr,</div><div class='del'>-					 (unsigned long)vaddr + 32);</div><div class='del'>-		kunmap_atomic(vaddr);</div><div class='del'>-	} else if (KVM_GUEST_KSEGX((unsigned long) opc) == KVM_GUEST_KSEG23) {</div><div class='del'>-		local_irq_save(flags);</div><div class='del'>-		memcpy((void *)opc, (void *)&amp;replace, sizeof(u32));</div><div class='del'>-		__local_flush_icache_user_range((unsigned long)opc,</div><div class='del'>-						(unsigned long)opc + 32);</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-	} else {</div><div class='del'>-		kvm_err("%s: Invalid address: %p\n", __func__, opc);</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	unsigned long vaddr = (unsigned long)opc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	/* The GVA page table is still active so use the Linux TLB handlers */</div><div class='add'>+	kvm_trap_emul_gva_lockless_begin(vcpu);</div><div class='add'>+	err = put_user(replace.word, opc);</div><div class='add'>+	kvm_trap_emul_gva_lockless_end(vcpu);</div><div class='add'>+</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		/*</div><div class='add'>+		 * We write protect clean pages in GVA page table so normal</div><div class='add'>+		 * Linux TLB mod handler doesn't silently dirty the page.</div><div class='add'>+		 * Its also possible we raced with a GVA invalidation.</div><div class='add'>+		 * Try to force the page to become dirty.</div><div class='add'>+		 */</div><div class='add'>+		err = kvm_trap_emul_gva_fault(vcpu, vaddr, true);</div><div class='add'>+		if (unlikely(err)) {</div><div class='add'>+			kvm_info("%s: Address unwriteable: %p\n",</div><div class='add'>+				 __func__, opc);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Try again. This will likely trigger a TLB refill, which will</div><div class='add'>+		 * fetch the new dirty entry from the GVA page table, which</div><div class='add'>+		 * should then succeed.</div><div class='add'>+		 */</div><div class='add'>+		goto retry;</div><div class='ctx'> 	}</div><div class='add'>+	__local_flush_icache_user_range(vaddr, vaddr + 4);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c<br/>index aa0937423e28..d40cfaad4529 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kvm/emulate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kvm/emulate.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kvm/emulate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/emulate.c</a></div><div class='hunk'>@@ -38,23 +38,25 @@</div><div class='ctx'>  * Compute the return address and do emulate branch simulation, if required.</div><div class='ctx'>  * This function should be called only in branch delay slot active.</div><div class='ctx'>  */</div><div class='del'>-unsigned long kvm_compute_return_epc(struct kvm_vcpu *vcpu,</div><div class='del'>-	unsigned long instpc)</div><div class='add'>+static int kvm_compute_return_epc(struct kvm_vcpu *vcpu, unsigned long instpc,</div><div class='add'>+				  unsigned long *out)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int dspcontrol;</div><div class='ctx'> 	union mips_instruction insn;</div><div class='ctx'> 	struct kvm_vcpu_arch *arch = &amp;vcpu-&gt;arch;</div><div class='ctx'> 	long epc = instpc;</div><div class='del'>-	long nextpc = KVM_INVALID_INST;</div><div class='add'>+	long nextpc;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (epc &amp; 3)</div><div class='del'>-		goto unaligned;</div><div class='add'>+	if (epc &amp; 3) {</div><div class='add'>+		kvm_err("%s: unaligned epc\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read the instruction */</div><div class='del'>-	insn.word = kvm_get_inst((u32 *) epc, vcpu);</div><div class='del'>-</div><div class='del'>-	if (insn.word == KVM_INVALID_INST)</div><div class='del'>-		return KVM_INVALID_INST;</div><div class='add'>+	err = kvm_get_badinstrp((u32 *)epc, vcpu, &amp;insn.word);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	switch (insn.i_format.opcode) {</div><div class='ctx'> 		/* jr and jalr are in r_format format. */</div><div class='hunk'>@@ -66,6 +68,8 @@ unsigned long kvm_compute_return_epc(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		case jr_op:</div><div class='ctx'> 			nextpc = arch-&gt;gprs[insn.r_format.rs];</div><div class='ctx'> 			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -114,8 +118,11 @@ unsigned long kvm_compute_return_epc(struct kvm_vcpu *vcpu,</div><div class='ctx'> 			nextpc = epc;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case bposge32_op:</div><div class='del'>-			if (!cpu_has_dsp)</div><div class='del'>-				goto sigill;</div><div class='add'>+			if (!cpu_has_dsp) {</div><div class='add'>+				kvm_err("%s: DSP branch but not DSP ASE\n",</div><div class='add'>+					__func__);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			dspcontrol = rddsp(0x01);</div><div class='ctx'> </div><div class='hunk'>@@ -125,6 +132,8 @@ unsigned long kvm_compute_return_epc(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				epc += 8;</div><div class='ctx'> 			nextpc = epc;</div><div class='ctx'> 			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -189,7 +198,7 @@ unsigned long kvm_compute_return_epc(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		/* And now the FPA/cp1 branch instructions. */</div><div class='ctx'> 	case cop1_op:</div><div class='ctx'> 		kvm_err("%s: unsupported cop1_op\n", __func__);</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_MIPSR6</div><div class='ctx'> 	/* R6 added the following compact branches with forbidden slots */</div><div class='hunk'>@@ -198,19 +207,19 @@ unsigned long kvm_compute_return_epc(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		/* only rt == 0 isn't compact branch */</div><div class='ctx'> 		if (insn.i_format.rt != 0)</div><div class='ctx'> 			goto compact_branch;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	case pop10_op:</div><div class='ctx'> 	case pop30_op:</div><div class='ctx'> 		/* only rs == rt == 0 is reserved, rest are compact branches */</div><div class='ctx'> 		if (insn.i_format.rs != 0 || insn.i_format.rt != 0)</div><div class='ctx'> 			goto compact_branch;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	case pop66_op:</div><div class='ctx'> 	case pop76_op:</div><div class='ctx'> 		/* only rs == 0 isn't compact branch */</div><div class='ctx'> 		if (insn.i_format.rs != 0)</div><div class='ctx'> 			goto compact_branch;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> compact_branch:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we've hit an exception on the forbidden slot, then</div><div class='hunk'>@@ -221,42 +230,74 @@ compact_branch:</div><div class='ctx'> 		break;</div><div class='ctx'> #else</div><div class='ctx'> compact_branch:</div><div class='del'>-		/* Compact branches not supported before R6 */</div><div class='del'>-		break;</div><div class='add'>+		/* Fall through - Compact branches not supported before R6 */</div><div class='ctx'> #endif</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return nextpc;</div><div class='del'>-</div><div class='del'>-unaligned:</div><div class='del'>-	kvm_err("%s: unaligned epc\n", __func__);</div><div class='del'>-	return nextpc;</div><div class='del'>-</div><div class='del'>-sigill:</div><div class='del'>-	kvm_err("%s: DSP branch but not DSP ASE\n", __func__);</div><div class='del'>-	return nextpc;</div><div class='add'>+	*out = nextpc;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum emulation_result update_pc(struct kvm_vcpu *vcpu, u32 cause)</div><div class='ctx'> {</div><div class='del'>-	unsigned long branch_pc;</div><div class='del'>-	enum emulation_result er = EMULATE_DONE;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (cause &amp; CAUSEF_BD) {</div><div class='del'>-		branch_pc = kvm_compute_return_epc(vcpu, vcpu-&gt;arch.pc);</div><div class='del'>-		if (branch_pc == KVM_INVALID_INST) {</div><div class='del'>-			er = EMULATE_FAIL;</div><div class='del'>-		} else {</div><div class='del'>-			vcpu-&gt;arch.pc = branch_pc;</div><div class='del'>-			kvm_debug("BD update_pc(): New PC: %#lx\n",</div><div class='del'>-				  vcpu-&gt;arch.pc);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='add'>+		err = kvm_compute_return_epc(vcpu, vcpu-&gt;arch.pc,</div><div class='add'>+					     &amp;vcpu-&gt;arch.pc);</div><div class='add'>+		if (err)</div><div class='add'>+			return EMULATE_FAIL;</div><div class='add'>+	} else {</div><div class='ctx'> 		vcpu-&gt;arch.pc += 4;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	kvm_debug("update_pc(): New PC: %#lx\n", vcpu-&gt;arch.pc);</div><div class='ctx'> </div><div class='del'>-	return er;</div><div class='add'>+	return EMULATE_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_get_badinstr() - Get bad instruction encoding.</div><div class='add'>+ * @opc:	Guest pointer to faulting instruction.</div><div class='add'>+ * @vcpu:	KVM VCPU information.</div><div class='add'>+ *</div><div class='add'>+ * Gets the instruction encoding of the faulting instruction, using the saved</div><div class='add'>+ * BadInstr register value if it exists, otherwise falling back to reading guest</div><div class='add'>+ * memory at @opc.</div><div class='add'>+ *</div><div class='add'>+ * Returns:	The instruction encoding of the faulting instruction.</div><div class='add'>+ */</div><div class='add'>+int kvm_get_badinstr(u32 *opc, struct kvm_vcpu *vcpu, u32 *out)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has_badinstr) {</div><div class='add'>+		*out = vcpu-&gt;arch.host_cp0_badinstr;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return kvm_get_inst(opc, vcpu, out);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_get_badinstrp() - Get bad prior instruction encoding.</div><div class='add'>+ * @opc:	Guest pointer to prior faulting instruction.</div><div class='add'>+ * @vcpu:	KVM VCPU information.</div><div class='add'>+ *</div><div class='add'>+ * Gets the instruction encoding of the prior faulting instruction (the branch</div><div class='add'>+ * containing the delay slot which faulted), using the saved BadInstrP register</div><div class='add'>+ * value if it exists, otherwise falling back to reading guest memory at @opc.</div><div class='add'>+ *</div><div class='add'>+ * Returns:	The instruction encoding of the prior faulting instruction.</div><div class='add'>+ */</div><div class='add'>+int kvm_get_badinstrp(u32 *opc, struct kvm_vcpu *vcpu, u32 *out)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has_badinstrp) {</div><div class='add'>+		*out = vcpu-&gt;arch.host_cp0_badinstrp;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return kvm_get_inst(opc, vcpu, out);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -856,22 +897,30 @@ enum emulation_result kvm_mips_emul_tlbr(struct kvm_vcpu *vcpu)</div><div class='ctx'> static void kvm_mips_invalidate_guest_tlb(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					  struct kvm_mips_tlb *tlb)</div><div class='ctx'> {</div><div class='add'>+	struct mm_struct *kern_mm = &amp;vcpu-&gt;arch.guest_kernel_mm;</div><div class='add'>+	struct mm_struct *user_mm = &amp;vcpu-&gt;arch.guest_user_mm;</div><div class='ctx'> 	int cpu, i;</div><div class='ctx'> 	bool user;</div><div class='ctx'> </div><div class='ctx'> 	/* No need to flush for entries which are already invalid */</div><div class='ctx'> 	if (!((tlb-&gt;tlb_lo[0] | tlb-&gt;tlb_lo[1]) &amp; ENTRYLO_V))</div><div class='ctx'> 		return;</div><div class='add'>+	/* Don't touch host kernel page tables or TLB mappings */</div><div class='add'>+	if ((unsigned long)tlb-&gt;tlb_hi &gt; 0x7fffffff)</div><div class='add'>+		return;</div><div class='ctx'> 	/* User address space doesn't need flushing for KSeg2/3 changes */</div><div class='ctx'> 	user = tlb-&gt;tlb_hi &lt; KVM_GUEST_KSEG0;</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> </div><div class='add'>+	/* Invalidate page table entries */</div><div class='add'>+	kvm_trap_emul_invalidate_gva(vcpu, tlb-&gt;tlb_hi &amp; VPN2_MASK, user);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Probe the shadow host TLB for the entry being overwritten, if one</div><div class='ctx'> 	 * matches, invalidate it</div><div class='ctx'> 	 */</div><div class='del'>-	kvm_mips_host_tlb_inv(vcpu, tlb-&gt;tlb_hi);</div><div class='add'>+	kvm_mips_host_tlb_inv(vcpu, tlb-&gt;tlb_hi, user, true);</div><div class='ctx'> </div><div class='ctx'> 	/* Invalidate the whole ASID on other CPUs */</div><div class='ctx'> 	cpu = smp_processor_id();</div><div class='hunk'>@@ -879,8 +928,8 @@ static void kvm_mips_invalidate_guest_tlb(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		if (i == cpu)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (user)</div><div class='del'>-			vcpu-&gt;arch.guest_user_asid[i] = 0;</div><div class='del'>-		vcpu-&gt;arch.guest_kernel_asid[i] = 0;</div><div class='add'>+			cpu_context(i, user_mm) = 0;</div><div class='add'>+		cpu_context(i, kern_mm) = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	preempt_enable();</div><div class='hunk'>@@ -1017,7 +1066,7 @@ unsigned int kvm_mips_config4_wrmask(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	unsigned int mask = MIPS_CONF_M;</div><div class='ctx'> </div><div class='ctx'> 	/* KScrExist */</div><div class='del'>-	mask |= (unsigned int)vcpu-&gt;arch.kscratch_enabled &lt;&lt; 16;</div><div class='add'>+	mask |= 0xfc &lt;&lt; MIPS_CONF4_KSCREXIST_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='hunk'>@@ -1056,6 +1105,7 @@ enum emulation_result kvm_mips_emulate_CP0(union mips_instruction inst,</div><div class='ctx'> 					   struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct mips_coproc *cop0 = vcpu-&gt;arch.cop0;</div><div class='add'>+	struct mm_struct *kern_mm = &amp;vcpu-&gt;arch.guest_kernel_mm;</div><div class='ctx'> 	enum emulation_result er = EMULATE_DONE;</div><div class='ctx'> 	u32 rt, rd, sel;</div><div class='ctx'> 	unsigned long curr_pc;</div><div class='hunk'>@@ -1150,14 +1200,13 @@ enum emulation_result kvm_mips_emulate_CP0(union mips_instruction inst,</div><div class='ctx'> 				er = EMULATE_FAIL;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-#define C0_EBASE_CORE_MASK 0xff</div><div class='ctx'> 			if ((rd == MIPS_CP0_PRID) &amp;&amp; (sel == 1)) {</div><div class='del'>-				/* Preserve CORE number */</div><div class='del'>-				kvm_change_c0_guest_ebase(cop0,</div><div class='del'>-							  ~(C0_EBASE_CORE_MASK),</div><div class='add'>+				/*</div><div class='add'>+				 * Preserve core number, and keep the exception</div><div class='add'>+				 * base in guest KSeg0.</div><div class='add'>+				 */</div><div class='add'>+				kvm_change_c0_guest_ebase(cop0, 0x1ffff000,</div><div class='ctx'> 							  vcpu-&gt;arch.gprs[rt]);</div><div class='del'>-				kvm_err("MTCz, cop0-&gt;reg[EBASE]: %#lx\n",</div><div class='del'>-					kvm_read_c0_guest_ebase(cop0));</div><div class='ctx'> 			} else if (rd == MIPS_CP0_TLB_HI &amp;&amp; sel == 0) {</div><div class='ctx'> 				u32 nasid =</div><div class='ctx'> 					vcpu-&gt;arch.gprs[rt] &amp; KVM_ENTRYHI_ASID;</div><div class='hunk'>@@ -1169,6 +1218,17 @@ enum emulation_result kvm_mips_emulate_CP0(union mips_instruction inst,</div><div class='ctx'> 						nasid);</div><div class='ctx'> </div><div class='ctx'> 					/*</div><div class='add'>+					 * Flush entries from the GVA page</div><div class='add'>+					 * tables.</div><div class='add'>+					 * Guest user page table will get</div><div class='add'>+					 * flushed lazily on re-entry to guest</div><div class='add'>+					 * user if the guest ASID actually</div><div class='add'>+					 * changes.</div><div class='add'>+					 */</div><div class='add'>+					kvm_mips_flush_gva_pt(kern_mm-&gt;pgd,</div><div class='add'>+							      KMF_KERN);</div><div class='add'>+</div><div class='add'>+					/*</div><div class='ctx'> 					 * Regenerate/invalidate kernel MMU</div><div class='ctx'> 					 * context.</div><div class='ctx'> 					 * The user MMU context will be</div><div class='hunk'>@@ -1178,13 +1238,10 @@ enum emulation_result kvm_mips_emulate_CP0(union mips_instruction inst,</div><div class='ctx'> 					 */</div><div class='ctx'> 					preempt_disable();</div><div class='ctx'> 					cpu = smp_processor_id();</div><div class='del'>-					kvm_get_new_mmu_context(&amp;vcpu-&gt;arch.guest_kernel_mm,</div><div class='del'>-								cpu, vcpu);</div><div class='del'>-					vcpu-&gt;arch.guest_kernel_asid[cpu] =</div><div class='del'>-						vcpu-&gt;arch.guest_kernel_mm.context.asid[cpu];</div><div class='add'>+					get_new_mmu_context(kern_mm, cpu);</div><div class='ctx'> 					for_each_possible_cpu(i)</div><div class='ctx'> 						if (i != cpu)</div><div class='del'>-							vcpu-&gt;arch.guest_kernel_asid[i] = 0;</div><div class='add'>+							cpu_context(i, kern_mm) = 0;</div><div class='ctx'> 					preempt_enable();</div><div class='ctx'> 				}</div><div class='ctx'> 				kvm_write_c0_guest_entryhi(cop0,</div><div class='hunk'>@@ -1639,12 +1696,56 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst,</div><div class='ctx'> 	return er;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static enum emulation_result kvm_mips_guest_cache_op(int (*fn)(unsigned long),</div><div class='add'>+						     unsigned long curr_pc,</div><div class='add'>+						     unsigned long addr,</div><div class='add'>+						     struct kvm_run *run,</div><div class='add'>+						     struct kvm_vcpu *vcpu,</div><div class='add'>+						     u32 cause)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		/* Carefully attempt the cache operation */</div><div class='add'>+		kvm_trap_emul_gva_lockless_begin(vcpu);</div><div class='add'>+		err = fn(addr);</div><div class='add'>+		kvm_trap_emul_gva_lockless_end(vcpu);</div><div class='add'>+</div><div class='add'>+		if (likely(!err))</div><div class='add'>+			return EMULATE_DONE;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Try to handle the fault and retry, maybe we just raced with a</div><div class='add'>+		 * GVA invalidation.</div><div class='add'>+		 */</div><div class='add'>+		switch (kvm_trap_emul_gva_fault(vcpu, addr, false)) {</div><div class='add'>+		case KVM_MIPS_GVA:</div><div class='add'>+		case KVM_MIPS_GPA:</div><div class='add'>+			/* bad virtual or physical address */</div><div class='add'>+			return EMULATE_FAIL;</div><div class='add'>+		case KVM_MIPS_TLB:</div><div class='add'>+			/* no matching guest TLB */</div><div class='add'>+			vcpu-&gt;arch.host_cp0_badvaddr = addr;</div><div class='add'>+			vcpu-&gt;arch.pc = curr_pc;</div><div class='add'>+			kvm_mips_emulate_tlbmiss_ld(cause, NULL, run, vcpu);</div><div class='add'>+			return EMULATE_EXCEPT;</div><div class='add'>+		case KVM_MIPS_TLBINV:</div><div class='add'>+			/* invalid matching guest TLB */</div><div class='add'>+			vcpu-&gt;arch.host_cp0_badvaddr = addr;</div><div class='add'>+			vcpu-&gt;arch.pc = curr_pc;</div><div class='add'>+			kvm_mips_emulate_tlbinv_ld(cause, NULL, run, vcpu);</div><div class='add'>+			return EMULATE_EXCEPT;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		};</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> enum emulation_result kvm_mips_emulate_cache(union mips_instruction inst,</div><div class='ctx'> 					     u32 *opc, u32 cause,</div><div class='ctx'> 					     struct kvm_run *run,</div><div class='ctx'> 					     struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	struct mips_coproc *cop0 = vcpu-&gt;arch.cop0;</div><div class='ctx'> 	enum emulation_result er = EMULATE_DONE;</div><div class='ctx'> 	u32 cache, op_inst, op, base;</div><div class='ctx'> 	s16 offset;</div><div class='hunk'>@@ -1701,80 +1802,16 @@ enum emulation_result kvm_mips_emulate_cache(union mips_instruction inst,</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	preempt_disable();</div><div class='del'>-	if (KVM_GUEST_KSEGX(va) == KVM_GUEST_KSEG0) {</div><div class='del'>-		if (kvm_mips_host_tlb_lookup(vcpu, va) &lt; 0 &amp;&amp;</div><div class='del'>-		    kvm_mips_handle_kseg0_tlb_fault(va, vcpu)) {</div><div class='del'>-			kvm_err("%s: handling mapped kseg0 tlb fault for %lx, vcpu: %p, ASID: %#lx\n",</div><div class='del'>-				__func__, va, vcpu, read_c0_entryhi());</div><div class='del'>-			er = EMULATE_FAIL;</div><div class='del'>-			preempt_enable();</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	} else if ((KVM_GUEST_KSEGX(va) &lt; KVM_GUEST_KSEG0) ||</div><div class='del'>-		   KVM_GUEST_KSEGX(va) == KVM_GUEST_KSEG23) {</div><div class='del'>-		int index;</div><div class='del'>-</div><div class='del'>-		/* If an entry already exists then skip */</div><div class='del'>-		if (kvm_mips_host_tlb_lookup(vcpu, va) &gt;= 0)</div><div class='del'>-			goto skip_fault;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If address not in the guest TLB, then give the guest a fault,</div><div class='del'>-		 * the resulting handler will do the right thing</div><div class='del'>-		 */</div><div class='del'>-		index = kvm_mips_guest_tlb_lookup(vcpu, (va &amp; VPN2_MASK) |</div><div class='del'>-						  (kvm_read_c0_guest_entryhi</div><div class='del'>-						   (cop0) &amp; KVM_ENTRYHI_ASID));</div><div class='del'>-</div><div class='del'>-		if (index &lt; 0) {</div><div class='del'>-			vcpu-&gt;arch.host_cp0_badvaddr = va;</div><div class='del'>-			vcpu-&gt;arch.pc = curr_pc;</div><div class='del'>-			er = kvm_mips_emulate_tlbmiss_ld(cause, NULL, run,</div><div class='del'>-							 vcpu);</div><div class='del'>-			preempt_enable();</div><div class='del'>-			goto dont_update_pc;</div><div class='del'>-		} else {</div><div class='del'>-			struct kvm_mips_tlb *tlb = &amp;vcpu-&gt;arch.guest_tlb[index];</div><div class='del'>-			/*</div><div class='del'>-			 * Check if the entry is valid, if not then setup a TLB</div><div class='del'>-			 * invalid exception to the guest</div><div class='del'>-			 */</div><div class='del'>-			if (!TLB_IS_VALID(*tlb, va)) {</div><div class='del'>-				vcpu-&gt;arch.host_cp0_badvaddr = va;</div><div class='del'>-				vcpu-&gt;arch.pc = curr_pc;</div><div class='del'>-				er = kvm_mips_emulate_tlbinv_ld(cause, NULL,</div><div class='del'>-								run, vcpu);</div><div class='del'>-				preempt_enable();</div><div class='del'>-				goto dont_update_pc;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * We fault an entry from the guest tlb to the</div><div class='del'>-			 * shadow host TLB</div><div class='del'>-			 */</div><div class='del'>-			if (kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb)) {</div><div class='del'>-				kvm_err("%s: handling mapped seg tlb fault for %lx, index: %u, vcpu: %p, ASID: %#lx\n",</div><div class='del'>-					__func__, va, index, vcpu,</div><div class='del'>-					read_c0_entryhi());</div><div class='del'>-				er = EMULATE_FAIL;</div><div class='del'>-				preempt_enable();</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		kvm_err("INVALID CACHE INDEX/ADDRESS (cache: %#x, op: %#x, base[%d]: %#lx, offset: %#x\n",</div><div class='del'>-			cache, op, base, arch-&gt;gprs[base], offset);</div><div class='del'>-		er = EMULATE_FAIL;</div><div class='del'>-		preempt_enable();</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-skip_fault:</div><div class='ctx'> 	/* XXXKYMA: Only a subset of cache ops are supported, used by Linux */</div><div class='ctx'> 	if (op_inst == Hit_Writeback_Inv_D || op_inst == Hit_Invalidate_D) {</div><div class='del'>-		flush_dcache_line(va);</div><div class='del'>-</div><div class='add'>+		/*</div><div class='add'>+		 * Perform the dcache part of icache synchronisation on the</div><div class='add'>+		 * guest's behalf.</div><div class='add'>+		 */</div><div class='add'>+		er = kvm_mips_guest_cache_op(protected_writeback_dcache_line,</div><div class='add'>+					     curr_pc, va, run, vcpu, cause);</div><div class='add'>+		if (er != EMULATE_DONE)</div><div class='add'>+			goto done;</div><div class='ctx'> #ifdef CONFIG_KVM_MIPS_DYN_TRANS</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Replace the CACHE instruction, with a SYNCI, not the same,</div><div class='hunk'>@@ -1783,8 +1820,15 @@ skip_fault:</div><div class='ctx'> 		kvm_mips_trans_cache_va(inst, opc, vcpu);</div><div class='ctx'> #endif</div><div class='ctx'> 	} else if (op_inst == Hit_Invalidate_I) {</div><div class='del'>-		flush_dcache_line(va);</div><div class='del'>-		flush_icache_line(va);</div><div class='add'>+		/* Perform the icache synchronisation on the guest's behalf */</div><div class='add'>+		er = kvm_mips_guest_cache_op(protected_writeback_dcache_line,</div><div class='add'>+					     curr_pc, va, run, vcpu, cause);</div><div class='add'>+		if (er != EMULATE_DONE)</div><div class='add'>+			goto done;</div><div class='add'>+		er = kvm_mips_guest_cache_op(protected_flush_icache_line,</div><div class='add'>+					     curr_pc, va, run, vcpu, cause);</div><div class='add'>+		if (er != EMULATE_DONE)</div><div class='add'>+			goto done;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_MIPS_DYN_TRANS</div><div class='ctx'> 		/* Replace the CACHE instruction, with a SYNCI */</div><div class='hunk'>@@ -1796,17 +1840,13 @@ skip_fault:</div><div class='ctx'> 		er = EMULATE_FAIL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	preempt_enable();</div><div class='ctx'> done:</div><div class='ctx'> 	/* Rollback PC only if emulation was unsuccessful */</div><div class='ctx'> 	if (er == EMULATE_FAIL)</div><div class='ctx'> 		vcpu-&gt;arch.pc = curr_pc;</div><div class='del'>-</div><div class='del'>-dont_update_pc:</div><div class='del'>-	/*</div><div class='del'>-	 * This is for exceptions whose emulation updates the PC, so do not</div><div class='del'>-	 * overwrite the PC under any circumstances</div><div class='del'>-	 */</div><div class='add'>+	/* Guest exception needs guest to resume */</div><div class='add'>+	if (er == EMULATE_EXCEPT)</div><div class='add'>+		er = EMULATE_DONE;</div><div class='ctx'> </div><div class='ctx'> 	return er;</div><div class='ctx'> }</div><div class='hunk'>@@ -1817,12 +1857,14 @@ enum emulation_result kvm_mips_emulate_inst(u32 cause, u32 *opc,</div><div class='ctx'> {</div><div class='ctx'> 	union mips_instruction inst;</div><div class='ctx'> 	enum emulation_result er = EMULATE_DONE;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Fetch the instruction. */</div><div class='ctx'> 	if (cause &amp; CAUSEF_BD)</div><div class='ctx'> 		opc += 1;</div><div class='del'>-</div><div class='del'>-	inst.word = kvm_get_inst(opc, vcpu);</div><div class='add'>+	err = kvm_get_badinstr(opc, vcpu, &amp;inst.word);</div><div class='add'>+	if (err)</div><div class='add'>+		return EMULATE_FAIL;</div><div class='ctx'> </div><div class='ctx'> 	switch (inst.r_format.opcode) {</div><div class='ctx'> 	case cop0_op:</div><div class='hunk'>@@ -1874,6 +1916,22 @@ unknown:</div><div class='ctx'> 	return er;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * kvm_mips_guest_exception_base() - Find guest exception vector base address.</div><div class='add'>+ *</div><div class='add'>+ * Returns:	The base address of the current guest exception vector, taking</div><div class='add'>+ *		both Guest.CP0_Status.BEV and Guest.CP0_EBase into account.</div><div class='add'>+ */</div><div class='add'>+long kvm_mips_guest_exception_base(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct mips_coproc *cop0 = vcpu-&gt;arch.cop0;</div><div class='add'>+</div><div class='add'>+	if (kvm_read_c0_guest_status(cop0) &amp; ST0_BEV)</div><div class='add'>+		return KVM_GUEST_CKSEG1ADDR(0x1fc00200);</div><div class='add'>+	else</div><div class='add'>+		return kvm_read_c0_guest_ebase(cop0) &amp; MIPS_EBASE_BASE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> enum emulation_result kvm_mips_emulate_syscall(u32 cause,</div><div class='ctx'> 					       u32 *opc,</div><div class='ctx'> 					       struct kvm_run *run,</div><div class='hunk'>@@ -1899,7 +1957,7 @@ enum emulation_result kvm_mips_emulate_syscall(u32 cause,</div><div class='ctx'> 					  (EXCCODE_SYS &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='ctx'> 		/* Set PC to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_err("Trying to deliver SYSCALL when EXL is already set\n");</div><div class='hunk'>@@ -1933,13 +1991,13 @@ enum emulation_result kvm_mips_emulate_tlbmiss_ld(u32 cause,</div><div class='ctx'> 			  arch-&gt;pc);</div><div class='ctx'> </div><div class='ctx'> 		/* set pc to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x0;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x0;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_debug("[EXL == 1] delivering TLB MISS @ pc %#lx\n",</div><div class='ctx'> 			  arch-&gt;pc);</div><div class='ctx'> </div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kvm_change_c0_guest_cause(cop0, (0xff),</div><div class='hunk'>@@ -1949,8 +2007,6 @@ enum emulation_result kvm_mips_emulate_tlbmiss_ld(u32 cause,</div><div class='ctx'> 	kvm_write_c0_guest_badvaddr(cop0, vcpu-&gt;arch.host_cp0_badvaddr);</div><div class='ctx'> 	/* XXXKYMA: is the context register used by linux??? */</div><div class='ctx'> 	kvm_write_c0_guest_entryhi(cop0, entryhi);</div><div class='del'>-	/* Blow away the shadow host TLBs */</div><div class='del'>-	kvm_mips_flush_host_tlb(1);</div><div class='ctx'> </div><div class='ctx'> 	return EMULATE_DONE;</div><div class='ctx'> }</div><div class='hunk'>@@ -1978,16 +2034,14 @@ enum emulation_result kvm_mips_emulate_tlbinv_ld(u32 cause,</div><div class='ctx'> </div><div class='ctx'> 		kvm_debug("[EXL == 0] delivering TLB INV @ pc %#lx\n",</div><div class='ctx'> 			  arch-&gt;pc);</div><div class='del'>-</div><div class='del'>-		/* set pc to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='del'>-</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_debug("[EXL == 1] delivering TLB MISS @ pc %#lx\n",</div><div class='ctx'> 			  arch-&gt;pc);</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* set pc to the exception entry point */</div><div class='add'>+	arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='add'>+</div><div class='ctx'> 	kvm_change_c0_guest_cause(cop0, (0xff),</div><div class='ctx'> 				  (EXCCODE_TLBL &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='hunk'>@@ -1995,8 +2049,6 @@ enum emulation_result kvm_mips_emulate_tlbinv_ld(u32 cause,</div><div class='ctx'> 	kvm_write_c0_guest_badvaddr(cop0, vcpu-&gt;arch.host_cp0_badvaddr);</div><div class='ctx'> 	/* XXXKYMA: is the context register used by linux??? */</div><div class='ctx'> 	kvm_write_c0_guest_entryhi(cop0, entryhi);</div><div class='del'>-	/* Blow away the shadow host TLBs */</div><div class='del'>-	kvm_mips_flush_host_tlb(1);</div><div class='ctx'> </div><div class='ctx'> 	return EMULATE_DONE;</div><div class='ctx'> }</div><div class='hunk'>@@ -2025,11 +2077,11 @@ enum emulation_result kvm_mips_emulate_tlbmiss_st(u32 cause,</div><div class='ctx'> 			  arch-&gt;pc);</div><div class='ctx'> </div><div class='ctx'> 		/* Set PC to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x0;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_debug("[EXL == 1] Delivering TLB MISS @ pc %#lx\n",</div><div class='ctx'> 			  arch-&gt;pc);</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kvm_change_c0_guest_cause(cop0, (0xff),</div><div class='hunk'>@@ -2039,8 +2091,6 @@ enum emulation_result kvm_mips_emulate_tlbmiss_st(u32 cause,</div><div class='ctx'> 	kvm_write_c0_guest_badvaddr(cop0, vcpu-&gt;arch.host_cp0_badvaddr);</div><div class='ctx'> 	/* XXXKYMA: is the context register used by linux??? */</div><div class='ctx'> 	kvm_write_c0_guest_entryhi(cop0, entryhi);</div><div class='del'>-	/* Blow away the shadow host TLBs */</div><div class='del'>-	kvm_mips_flush_host_tlb(1);</div><div class='ctx'> </div><div class='ctx'> 	return EMULATE_DONE;</div><div class='ctx'> }</div><div class='hunk'>@@ -2067,15 +2117,14 @@ enum emulation_result kvm_mips_emulate_tlbinv_st(u32 cause,</div><div class='ctx'> </div><div class='ctx'> 		kvm_debug("[EXL == 0] Delivering TLB MISS @ pc %#lx\n",</div><div class='ctx'> 			  arch-&gt;pc);</div><div class='del'>-</div><div class='del'>-		/* Set PC to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_debug("[EXL == 1] Delivering TLB MISS @ pc %#lx\n",</div><div class='ctx'> 			  arch-&gt;pc);</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Set PC to the exception entry point */</div><div class='add'>+	arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='add'>+</div><div class='ctx'> 	kvm_change_c0_guest_cause(cop0, (0xff),</div><div class='ctx'> 				  (EXCCODE_TLBS &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='hunk'>@@ -2083,41 +2132,10 @@ enum emulation_result kvm_mips_emulate_tlbinv_st(u32 cause,</div><div class='ctx'> 	kvm_write_c0_guest_badvaddr(cop0, vcpu-&gt;arch.host_cp0_badvaddr);</div><div class='ctx'> 	/* XXXKYMA: is the context register used by linux??? */</div><div class='ctx'> 	kvm_write_c0_guest_entryhi(cop0, entryhi);</div><div class='del'>-	/* Blow away the shadow host TLBs */</div><div class='del'>-	kvm_mips_flush_host_tlb(1);</div><div class='ctx'> </div><div class='ctx'> 	return EMULATE_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* TLBMOD: store into address matching TLB with Dirty bit off */</div><div class='del'>-enum emulation_result kvm_mips_handle_tlbmod(u32 cause, u32 *opc,</div><div class='del'>-					     struct kvm_run *run,</div><div class='del'>-					     struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	enum emulation_result er = EMULATE_DONE;</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	struct mips_coproc *cop0 = vcpu-&gt;arch.cop0;</div><div class='del'>-	unsigned long entryhi = (vcpu-&gt;arch.host_cp0_badvaddr &amp; VPN2_MASK) |</div><div class='del'>-			(kvm_read_c0_guest_entryhi(cop0) &amp; KVM_ENTRYHI_ASID);</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	/* If address not in the guest TLB, then we are in trouble */</div><div class='del'>-	index = kvm_mips_guest_tlb_lookup(vcpu, entryhi);</div><div class='del'>-	if (index &lt; 0) {</div><div class='del'>-		/* XXXKYMA Invalidate and retry */</div><div class='del'>-		kvm_mips_host_tlb_inv(vcpu, vcpu-&gt;arch.host_cp0_badvaddr);</div><div class='del'>-		kvm_err("%s: host got TLBMOD for %#lx but entry not present in Guest TLB\n",</div><div class='del'>-		     __func__, entryhi);</div><div class='del'>-		kvm_mips_dump_guest_tlbs(vcpu);</div><div class='del'>-		kvm_mips_dump_host_tlbs();</div><div class='del'>-		return EMULATE_FAIL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	er = kvm_mips_emulate_tlbmod(cause, opc, run, vcpu);</div><div class='del'>-	return er;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> enum emulation_result kvm_mips_emulate_tlbmod(u32 cause,</div><div class='ctx'> 					      u32 *opc,</div><div class='ctx'> 					      struct kvm_run *run,</div><div class='hunk'>@@ -2140,14 +2158,13 @@ enum emulation_result kvm_mips_emulate_tlbmod(u32 cause,</div><div class='ctx'> </div><div class='ctx'> 		kvm_debug("[EXL == 0] Delivering TLB MOD @ pc %#lx\n",</div><div class='ctx'> 			  arch-&gt;pc);</div><div class='del'>-</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_debug("[EXL == 1] Delivering TLB MOD @ pc %#lx\n",</div><div class='ctx'> 			  arch-&gt;pc);</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='add'>+</div><div class='ctx'> 	kvm_change_c0_guest_cause(cop0, (0xff),</div><div class='ctx'> 				  (EXCCODE_MOD &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='hunk'>@@ -2155,8 +2172,6 @@ enum emulation_result kvm_mips_emulate_tlbmod(u32 cause,</div><div class='ctx'> 	kvm_write_c0_guest_badvaddr(cop0, vcpu-&gt;arch.host_cp0_badvaddr);</div><div class='ctx'> 	/* XXXKYMA: is the context register used by linux??? */</div><div class='ctx'> 	kvm_write_c0_guest_entryhi(cop0, entryhi);</div><div class='del'>-	/* Blow away the shadow host TLBs */</div><div class='del'>-	kvm_mips_flush_host_tlb(1);</div><div class='ctx'> </div><div class='ctx'> 	return EMULATE_DONE;</div><div class='ctx'> }</div><div class='hunk'>@@ -2181,7 +2196,7 @@ enum emulation_result kvm_mips_emulate_fpu_exc(u32 cause,</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+	arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='ctx'> </div><div class='ctx'> 	kvm_change_c0_guest_cause(cop0, (0xff),</div><div class='ctx'> 				  (EXCCODE_CPU &lt;&lt; CAUSEB_EXCCODE));</div><div class='hunk'>@@ -2215,7 +2230,7 @@ enum emulation_result kvm_mips_emulate_ri_exc(u32 cause,</div><div class='ctx'> 					  (EXCCODE_RI &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='ctx'> 		/* Set PC to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_err("Trying to deliver RI when EXL is already set\n");</div><div class='hunk'>@@ -2250,7 +2265,7 @@ enum emulation_result kvm_mips_emulate_bp_exc(u32 cause,</div><div class='ctx'> 					  (EXCCODE_BP &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='ctx'> 		/* Set PC to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_err("Trying to deliver BP when EXL is already set\n");</div><div class='hunk'>@@ -2285,7 +2300,7 @@ enum emulation_result kvm_mips_emulate_trap_exc(u32 cause,</div><div class='ctx'> 					  (EXCCODE_TR &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='ctx'> 		/* Set PC to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_err("Trying to deliver TRAP when EXL is already set\n");</div><div class='hunk'>@@ -2320,7 +2335,7 @@ enum emulation_result kvm_mips_emulate_msafpe_exc(u32 cause,</div><div class='ctx'> 					  (EXCCODE_MSAFPE &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='ctx'> 		/* Set PC to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_err("Trying to deliver MSAFPE when EXL is already set\n");</div><div class='hunk'>@@ -2355,7 +2370,7 @@ enum emulation_result kvm_mips_emulate_fpe_exc(u32 cause,</div><div class='ctx'> 					  (EXCCODE_FPE &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='ctx'> 		/* Set PC to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_err("Trying to deliver FPE when EXL is already set\n");</div><div class='hunk'>@@ -2390,7 +2405,7 @@ enum emulation_result kvm_mips_emulate_msadis_exc(u32 cause,</div><div class='ctx'> 					  (EXCCODE_MSADIS &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='ctx'> 		/* Set PC to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_err("Trying to deliver MSADIS when EXL is already set\n");</div><div class='hunk'>@@ -2409,6 +2424,7 @@ enum emulation_result kvm_mips_handle_ri(u32 cause, u32 *opc,</div><div class='ctx'> 	enum emulation_result er = EMULATE_DONE;</div><div class='ctx'> 	unsigned long curr_pc;</div><div class='ctx'> 	union mips_instruction inst;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Update PC and hold onto current PC in case there is</div><div class='hunk'>@@ -2422,11 +2438,9 @@ enum emulation_result kvm_mips_handle_ri(u32 cause, u32 *opc,</div><div class='ctx'> 	/* Fetch the instruction. */</div><div class='ctx'> 	if (cause &amp; CAUSEF_BD)</div><div class='ctx'> 		opc += 1;</div><div class='del'>-</div><div class='del'>-	inst.word = kvm_get_inst(opc, vcpu);</div><div class='del'>-</div><div class='del'>-	if (inst.word == KVM_INVALID_INST) {</div><div class='del'>-		kvm_err("%s: Cannot get inst @ %p\n", __func__, opc);</div><div class='add'>+	err = kvm_get_badinstr(opc, vcpu, &amp;inst.word);</div><div class='add'>+	if (err) {</div><div class='add'>+		kvm_err("%s: Cannot get inst @ %p (%d)\n", __func__, opc, err);</div><div class='ctx'> 		return EMULATE_FAIL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2557,7 +2571,7 @@ static enum emulation_result kvm_mips_emulate_exc(u32 cause,</div><div class='ctx'> 					  (exccode &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='ctx'> 		/* Set PC to the exception entry point */</div><div class='del'>-		arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu) + 0x180;</div><div class='ctx'> 		kvm_write_c0_guest_badvaddr(cop0, vcpu-&gt;arch.host_cp0_badvaddr);</div><div class='ctx'> </div><div class='ctx'> 		kvm_debug("Delivering EXC %d @ pc %#lx, badVaddr: %#lx\n",</div><div class='hunk'>@@ -2670,7 +2684,8 @@ enum emulation_result kvm_mips_check_privilege(u32 cause,</div><div class='ctx'> enum emulation_result kvm_mips_handle_tlbmiss(u32 cause,</div><div class='ctx'> 					      u32 *opc,</div><div class='ctx'> 					      struct kvm_run *run,</div><div class='del'>-					      struct kvm_vcpu *vcpu)</div><div class='add'>+					      struct kvm_vcpu *vcpu,</div><div class='add'>+					      bool write_fault)</div><div class='ctx'> {</div><div class='ctx'> 	enum emulation_result er = EMULATE_DONE;</div><div class='ctx'> 	u32 exccode = (cause &gt;&gt; CAUSEB_EXCCODE) &amp; 0x1f;</div><div class='hunk'>@@ -2726,7 +2741,8 @@ enum emulation_result kvm_mips_handle_tlbmiss(u32 cause,</div><div class='ctx'> 			 * OK we have a Guest TLB entry, now inject it into the</div><div class='ctx'> 			 * shadow host TLB</div><div class='ctx'> 			 */</div><div class='del'>-			if (kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb)) {</div><div class='add'>+			if (kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb, va,</div><div class='add'>+								 write_fault)) {</div><div class='ctx'> 				kvm_err("%s: handling mapped seg tlb fault for %lx, index: %u, vcpu: %p, ASID: %#lx\n",</div><div class='ctx'> 					__func__, va, index, vcpu,</div><div class='ctx'> 					read_c0_entryhi());</div><div class='head'>diff --git a/arch/mips/kvm/entry.c b/arch/mips/kvm/entry.c<br/>index 6a02b3a3fa65..c5b254c4d0da 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kvm/entry.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kvm/entry.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kvm/entry.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/entry.c</a></div><div class='hunk'>@@ -12,8 +12,11 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='add'>+#include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/msa.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/tlbex.h&gt;</div><div class='ctx'> #include &lt;asm/uasm.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Register names */</div><div class='hunk'>@@ -50,6 +53,8 @@</div><div class='ctx'> /* Some CP0 registers */</div><div class='ctx'> #define C0_HWRENA	7, 0</div><div class='ctx'> #define C0_BADVADDR	8, 0</div><div class='add'>+#define C0_BADINSTR	8, 1</div><div class='add'>+#define C0_BADINSTRP	8, 2</div><div class='ctx'> #define C0_ENTRYHI	10, 0</div><div class='ctx'> #define C0_STATUS	12, 0</div><div class='ctx'> #define C0_CAUSE	13, 0</div><div class='hunk'>@@ -89,6 +94,21 @@ static void *kvm_mips_build_ret_from_exit(void *addr);</div><div class='ctx'> static void *kvm_mips_build_ret_to_guest(void *addr);</div><div class='ctx'> static void *kvm_mips_build_ret_to_host(void *addr);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The version of this function in tlbex.c uses current_cpu_type(), but for KVM</div><div class='add'>+ * we assume symmetry.</div><div class='add'>+ */</div><div class='add'>+static int c0_kscratch(void)</div><div class='add'>+{</div><div class='add'>+	switch (boot_cpu_type()) {</div><div class='add'>+	case CPU_XLP:</div><div class='add'>+	case CPU_XLR:</div><div class='add'>+		return 22;</div><div class='add'>+	default:</div><div class='add'>+		return 31;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * kvm_mips_entry_setup() - Perform global setup for entry code.</div><div class='ctx'>  *</div><div class='hunk'>@@ -103,18 +123,21 @@ int kvm_mips_entry_setup(void)</div><div class='ctx'> 	 * We prefer to use KScratchN registers if they are available over the</div><div class='ctx'> 	 * defaults above, which may not work on all cores.</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned int kscratch_mask = cpu_data[0].kscratch_mask &amp; 0xfc;</div><div class='add'>+	unsigned int kscratch_mask = cpu_data[0].kscratch_mask;</div><div class='add'>+</div><div class='add'>+	if (pgd_reg != -1)</div><div class='add'>+		kscratch_mask &amp;= ~BIT(pgd_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Pick a scratch register for storing VCPU */</div><div class='ctx'> 	if (kscratch_mask) {</div><div class='del'>-		scratch_vcpu[0] = 31;</div><div class='add'>+		scratch_vcpu[0] = c0_kscratch();</div><div class='ctx'> 		scratch_vcpu[1] = ffs(kscratch_mask) - 1;</div><div class='ctx'> 		kscratch_mask &amp;= ~BIT(scratch_vcpu[1]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Pick a scratch register to use as a temp for saving state */</div><div class='ctx'> 	if (kscratch_mask) {</div><div class='del'>-		scratch_tmp[0] = 31;</div><div class='add'>+		scratch_tmp[0] = c0_kscratch();</div><div class='ctx'> 		scratch_tmp[1] = ffs(kscratch_mask) - 1;</div><div class='ctx'> 		kscratch_mask &amp;= ~BIT(scratch_tmp[1]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -130,7 +153,7 @@ static void kvm_mips_build_save_scratch(u32 **p, unsigned int tmp,</div><div class='ctx'> 	UASM_i_SW(p, tmp, offsetof(struct pt_regs, cp0_epc), frame);</div><div class='ctx'> </div><div class='ctx'> 	/* Save the temp scratch register value in cp0_cause of stack frame */</div><div class='del'>-	if (scratch_tmp[0] == 31) {</div><div class='add'>+	if (scratch_tmp[0] == c0_kscratch()) {</div><div class='ctx'> 		UASM_i_MFC0(p, tmp, scratch_tmp[0], scratch_tmp[1]);</div><div class='ctx'> 		UASM_i_SW(p, tmp, offsetof(struct pt_regs, cp0_cause), frame);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -146,7 +169,7 @@ static void kvm_mips_build_restore_scratch(u32 **p, unsigned int tmp,</div><div class='ctx'> 	UASM_i_LW(p, tmp, offsetof(struct pt_regs, cp0_epc), frame);</div><div class='ctx'> 	UASM_i_MTC0(p, tmp, scratch_vcpu[0], scratch_vcpu[1]);</div><div class='ctx'> </div><div class='del'>-	if (scratch_tmp[0] == 31) {</div><div class='add'>+	if (scratch_tmp[0] == c0_kscratch()) {</div><div class='ctx'> 		UASM_i_LW(p, tmp, offsetof(struct pt_regs, cp0_cause), frame);</div><div class='ctx'> 		UASM_i_MTC0(p, tmp, scratch_tmp[0], scratch_tmp[1]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -286,23 +309,26 @@ static void *kvm_mips_build_enter_guest(void *addr)</div><div class='ctx'> 	uasm_i_andi(&amp;p, T0, T0, KSU_USER | ST0_ERL | ST0_EXL);</div><div class='ctx'> 	uasm_i_xori(&amp;p, T0, T0, KSU_USER);</div><div class='ctx'> 	uasm_il_bnez(&amp;p, &amp;r, T0, label_kernel_asid);</div><div class='del'>-	 UASM_i_ADDIU(&amp;p, T1, K1,</div><div class='del'>-		      offsetof(struct kvm_vcpu_arch, guest_kernel_asid));</div><div class='add'>+	 UASM_i_ADDIU(&amp;p, T1, K1, offsetof(struct kvm_vcpu_arch,</div><div class='add'>+					   guest_kernel_mm.context.asid));</div><div class='ctx'> 	/* else user */</div><div class='del'>-	UASM_i_ADDIU(&amp;p, T1, K1,</div><div class='del'>-		     offsetof(struct kvm_vcpu_arch, guest_user_asid));</div><div class='add'>+	UASM_i_ADDIU(&amp;p, T1, K1, offsetof(struct kvm_vcpu_arch,</div><div class='add'>+					  guest_user_mm.context.asid));</div><div class='ctx'> 	uasm_l_kernel_asid(&amp;l, p);</div><div class='ctx'> </div><div class='ctx'> 	/* t1: contains the base of the ASID array, need to get the cpu id  */</div><div class='ctx'> 	/* smp_processor_id */</div><div class='ctx'> 	uasm_i_lw(&amp;p, T2, offsetof(struct thread_info, cpu), GP);</div><div class='del'>-	/* x4 */</div><div class='del'>-	uasm_i_sll(&amp;p, T2, T2, 2);</div><div class='add'>+	/* index the ASID array */</div><div class='add'>+	uasm_i_sll(&amp;p, T2, T2, ilog2(sizeof(long)));</div><div class='ctx'> 	UASM_i_ADDU(&amp;p, T3, T1, T2);</div><div class='del'>-	uasm_i_lw(&amp;p, K0, 0, T3);</div><div class='add'>+	UASM_i_LW(&amp;p, K0, 0, T3);</div><div class='ctx'> #ifdef CONFIG_MIPS_ASID_BITS_VARIABLE</div><div class='del'>-	/* x sizeof(struct cpuinfo_mips)/4 */</div><div class='del'>-	uasm_i_addiu(&amp;p, T3, ZERO, sizeof(struct cpuinfo_mips)/4);</div><div class='add'>+	/*</div><div class='add'>+	 * reuse ASID array offset</div><div class='add'>+	 * cpuinfo_mips is a multiple of sizeof(long)</div><div class='add'>+	 */</div><div class='add'>+	uasm_i_addiu(&amp;p, T3, ZERO, sizeof(struct cpuinfo_mips)/sizeof(long));</div><div class='ctx'> 	uasm_i_mul(&amp;p, T2, T2, T3);</div><div class='ctx'> </div><div class='ctx'> 	UASM_i_LA_mostly(&amp;p, AT, (long)&amp;cpu_data[0].asid_mask);</div><div class='hunk'>@@ -312,7 +338,20 @@ static void *kvm_mips_build_enter_guest(void *addr)</div><div class='ctx'> #else</div><div class='ctx'> 	uasm_i_andi(&amp;p, K0, K0, MIPS_ENTRYHI_ASID);</div><div class='ctx'> #endif</div><div class='del'>-	uasm_i_mtc0(&amp;p, K0, C0_ENTRYHI);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up KVM T&amp;E GVA pgd.</div><div class='add'>+	 * This does roughly the same as TLBMISS_HANDLER_SETUP_PGD():</div><div class='add'>+	 * - call tlbmiss_handler_setup_pgd(mm-&gt;pgd)</div><div class='add'>+	 * - but skips write into CP0_PWBase for now</div><div class='add'>+	 */</div><div class='add'>+	UASM_i_LW(&amp;p, A0, (int)offsetof(struct mm_struct, pgd) -</div><div class='add'>+			  (int)offsetof(struct mm_struct, context.asid), T1);</div><div class='add'>+</div><div class='add'>+	UASM_i_LA(&amp;p, T9, (unsigned long)tlbmiss_handler_setup_pgd);</div><div class='add'>+	uasm_i_jalr(&amp;p, RA, T9);</div><div class='add'>+	 uasm_i_mtc0(&amp;p, K0, C0_ENTRYHI);</div><div class='add'>+</div><div class='ctx'> 	uasm_i_ehb(&amp;p);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable RDHWR access */</div><div class='hunk'>@@ -348,6 +387,80 @@ static void *kvm_mips_build_enter_guest(void *addr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * kvm_mips_build_tlb_refill_exception() - Assemble TLB refill handler.</div><div class='add'>+ * @addr:	Address to start writing code.</div><div class='add'>+ * @handler:	Address of common handler (within range of @addr).</div><div class='add'>+ *</div><div class='add'>+ * Assemble TLB refill exception fast path handler for guest execution.</div><div class='add'>+ *</div><div class='add'>+ * Returns:	Next address after end of written function.</div><div class='add'>+ */</div><div class='add'>+void *kvm_mips_build_tlb_refill_exception(void *addr, void *handler)</div><div class='add'>+{</div><div class='add'>+	u32 *p = addr;</div><div class='add'>+	struct uasm_label labels[2];</div><div class='add'>+	struct uasm_reloc relocs[2];</div><div class='add'>+	struct uasm_label *l = labels;</div><div class='add'>+	struct uasm_reloc *r = relocs;</div><div class='add'>+</div><div class='add'>+	memset(labels, 0, sizeof(labels));</div><div class='add'>+	memset(relocs, 0, sizeof(relocs));</div><div class='add'>+</div><div class='add'>+	/* Save guest k1 into scratch register */</div><div class='add'>+	UASM_i_MTC0(&amp;p, K1, scratch_tmp[0], scratch_tmp[1]);</div><div class='add'>+</div><div class='add'>+	/* Get the VCPU pointer from the VCPU scratch register */</div><div class='add'>+	UASM_i_MFC0(&amp;p, K1, scratch_vcpu[0], scratch_vcpu[1]);</div><div class='add'>+</div><div class='add'>+	/* Save guest k0 into VCPU structure */</div><div class='add'>+	UASM_i_SW(&amp;p, K0, offsetof(struct kvm_vcpu, arch.gprs[K0]), K1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some of the common tlbex code uses current_cpu_type(). For KVM we</div><div class='add'>+	 * assume symmetry and just disable preemption to silence the warning.</div><div class='add'>+	 */</div><div class='add'>+	preempt_disable();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now for the actual refill bit. A lot of this can be common with the</div><div class='add'>+	 * Linux TLB refill handler, however we don't need to handle so many</div><div class='add'>+	 * cases. We only need to handle user mode refills, and user mode runs</div><div class='add'>+	 * with 32-bit addressing.</div><div class='add'>+	 *</div><div class='add'>+	 * Therefore the branch to label_vmalloc generated by build_get_pmde64()</div><div class='add'>+	 * that isn't resolved should never actually get taken and is harmless</div><div class='add'>+	 * to leave in place for now.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+	build_get_pmde64(&amp;p, &amp;l, &amp;r, K0, K1); /* get pmd in K1 */</div><div class='add'>+#else</div><div class='add'>+	build_get_pgde32(&amp;p, K0, K1); /* get pgd in K1 */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* we don't support huge pages yet */</div><div class='add'>+</div><div class='add'>+	build_get_ptep(&amp;p, K0, K1);</div><div class='add'>+	build_update_entries(&amp;p, K0, K1);</div><div class='add'>+	build_tlb_write_entry(&amp;p, &amp;l, &amp;r, tlb_random);</div><div class='add'>+</div><div class='add'>+	preempt_enable();</div><div class='add'>+</div><div class='add'>+	/* Get the VCPU pointer from the VCPU scratch register again */</div><div class='add'>+	UASM_i_MFC0(&amp;p, K1, scratch_vcpu[0], scratch_vcpu[1]);</div><div class='add'>+</div><div class='add'>+	/* Restore the guest's k0/k1 registers */</div><div class='add'>+	UASM_i_LW(&amp;p, K0, offsetof(struct kvm_vcpu, arch.gprs[K0]), K1);</div><div class='add'>+	uasm_i_ehb(&amp;p);</div><div class='add'>+	UASM_i_MFC0(&amp;p, K1, scratch_tmp[0], scratch_tmp[1]);</div><div class='add'>+</div><div class='add'>+	/* Jump to guest */</div><div class='add'>+	uasm_i_eret(&amp;p);</div><div class='add'>+</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * kvm_mips_build_exception() - Assemble first level guest exception handler.</div><div class='ctx'>  * @addr:	Address to start writing code.</div><div class='ctx'>  * @handler:	Address of common handler (within range of @addr).</div><div class='hunk'>@@ -468,6 +581,18 @@ void *kvm_mips_build_exit(void *addr)</div><div class='ctx'> 	uasm_i_mfc0(&amp;p, K0, C0_CAUSE);</div><div class='ctx'> 	uasm_i_sw(&amp;p, K0, offsetof(struct kvm_vcpu_arch, host_cp0_cause), K1);</div><div class='ctx'> </div><div class='add'>+	if (cpu_has_badinstr) {</div><div class='add'>+		uasm_i_mfc0(&amp;p, K0, C0_BADINSTR);</div><div class='add'>+		uasm_i_sw(&amp;p, K0, offsetof(struct kvm_vcpu_arch,</div><div class='add'>+					   host_cp0_badinstr), K1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpu_has_badinstrp) {</div><div class='add'>+		uasm_i_mfc0(&amp;p, K0, C0_BADINSTRP);</div><div class='add'>+		uasm_i_sw(&amp;p, K0, offsetof(struct kvm_vcpu_arch,</div><div class='add'>+					   host_cp0_badinstrp), K1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Now restore the host state just enough to run the handlers */</div><div class='ctx'> </div><div class='ctx'> 	/* Switch EBASE to the one used by Linux */</div><div class='hunk'>@@ -521,6 +646,9 @@ void *kvm_mips_build_exit(void *addr)</div><div class='ctx'> 	uasm_i_and(&amp;p, V0, V0, AT);</div><div class='ctx'> 	uasm_i_lui(&amp;p, AT, ST0_CU0 &gt;&gt; 16);</div><div class='ctx'> 	uasm_i_or(&amp;p, V0, V0, AT);</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+	uasm_i_ori(&amp;p, V0, V0, ST0_SX | ST0_UX);</div><div class='add'>+#endif</div><div class='ctx'> 	uasm_i_mtc0(&amp;p, V0, C0_STATUS);</div><div class='ctx'> 	uasm_i_ehb(&amp;p);</div><div class='ctx'> </div><div class='hunk'>@@ -643,7 +771,7 @@ static void *kvm_mips_build_ret_to_guest(void *addr)</div><div class='ctx'> </div><div class='ctx'> 	/* Setup status register for running guest in UM */</div><div class='ctx'> 	uasm_i_ori(&amp;p, V1, V1, ST0_EXL | KSU_USER | ST0_IE);</div><div class='del'>-	UASM_i_LA(&amp;p, AT, ~(ST0_CU0 | ST0_MX));</div><div class='add'>+	UASM_i_LA(&amp;p, AT, ~(ST0_CU0 | ST0_MX | ST0_SX | ST0_UX));</div><div class='ctx'> 	uasm_i_and(&amp;p, V1, V1, AT);</div><div class='ctx'> 	uasm_i_mtc0(&amp;p, V1, C0_STATUS);</div><div class='ctx'> 	uasm_i_ehb(&amp;p);</div><div class='head'>diff --git a/arch/mips/kvm/interrupt.c b/arch/mips/kvm/interrupt.c<br/>index e88403b3dcdd..aa0a1a00faf6 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kvm/interrupt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kvm/interrupt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kvm/interrupt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/interrupt.c</a></div><div class='hunk'>@@ -183,10 +183,11 @@ int kvm_mips_irq_deliver_cb(struct kvm_vcpu *vcpu, unsigned int priority,</div><div class='ctx'> 					  (exccode &lt;&lt; CAUSEB_EXCCODE));</div><div class='ctx'> </div><div class='ctx'> 		/* XXXSL Set PC to the interrupt exception entry point */</div><div class='add'>+		arch-&gt;pc = kvm_mips_guest_exception_base(vcpu);</div><div class='ctx'> 		if (kvm_read_c0_guest_cause(cop0) &amp; CAUSEF_IV)</div><div class='del'>-			arch-&gt;pc = KVM_GUEST_KSEG0 + 0x200;</div><div class='add'>+			arch-&gt;pc += 0x200;</div><div class='ctx'> 		else</div><div class='del'>-			arch-&gt;pc = KVM_GUEST_KSEG0 + 0x180;</div><div class='add'>+			arch-&gt;pc += 0x180;</div><div class='ctx'> </div><div class='ctx'> 		clear_bit(priority, &amp;vcpu-&gt;arch.pending_exceptions);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c<br/>index 06a60b19acfb..15a1b1716c2e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kvm/mips.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kvm/mips.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kvm/mips.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/mips.c</a></div><div class='hunk'>@@ -16,12 +16,15 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='hunk'>@@ -63,18 +66,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {</div><div class='ctx'> 	{NULL}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int kvm_mips_reset_vcpu(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(i) {</div><div class='del'>-		vcpu-&gt;arch.guest_kernel_asid[i] = 0;</div><div class='del'>-		vcpu-&gt;arch.guest_user_asid[i] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * XXXKYMA: We are simulatoring a processor that has the WII bit set in</div><div class='ctx'>  * Config7, so we are "runnable" if interrupts are pending</div><div class='hunk'>@@ -104,39 +95,12 @@ void kvm_arch_check_processor_compat(void *rtn)</div><div class='ctx'> 	*(int *)rtn = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kvm_mips_init_tlbs(struct kvm *kvm)</div><div class='del'>-{</div><div class='del'>-	unsigned long wired;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Add a wired entry to the TLB, it is used to map the commpage to</div><div class='del'>-	 * the Guest kernel</div><div class='del'>-	 */</div><div class='del'>-	wired = read_c0_wired();</div><div class='del'>-	write_c0_wired(wired + 1);</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='del'>-	kvm-&gt;arch.commpage_tlb = wired;</div><div class='del'>-</div><div class='del'>-	kvm_debug("[%d] commpage TLB: %d\n", smp_processor_id(),</div><div class='del'>-		  kvm-&gt;arch.commpage_tlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void kvm_mips_init_vm_percpu(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct kvm *kvm = (struct kvm *)arg;</div><div class='del'>-</div><div class='del'>-	kvm_mips_init_tlbs(kvm);</div><div class='del'>-	kvm_mips_callbacks-&gt;vm_init(kvm);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_inc_return(&amp;kvm_mips_instance) == 1) {</div><div class='del'>-		kvm_debug("%s: 1st KVM instance, setup host TLB parameters\n",</div><div class='del'>-			  __func__);</div><div class='del'>-		on_each_cpu(kvm_mips_init_vm_percpu, kvm, 1);</div><div class='del'>-	}</div><div class='add'>+	/* Allocate page table to map GPA -&gt; RPA */</div><div class='add'>+	kvm-&gt;arch.gpa_mm.pgd = kvm_pgd_alloc();</div><div class='add'>+	if (!kvm-&gt;arch.gpa_mm.pgd)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -156,13 +120,6 @@ void kvm_mips_free_vcpus(struct kvm *kvm)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> </div><div class='del'>-	/* Put the pages we reserved for the guest pmap */</div><div class='del'>-	for (i = 0; i &lt; kvm-&gt;arch.guest_pmap_npages; i++) {</div><div class='del'>-		if (kvm-&gt;arch.guest_pmap[i] != KVM_INVALID_PAGE)</div><div class='del'>-			kvm_release_pfn_clean(kvm-&gt;arch.guest_pmap[i]);</div><div class='del'>-	}</div><div class='del'>-	kfree(kvm-&gt;arch.guest_pmap);</div><div class='del'>-</div><div class='ctx'> 	kvm_for_each_vcpu(i, vcpu, kvm) {</div><div class='ctx'> 		kvm_arch_vcpu_free(vcpu);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -177,25 +134,17 @@ void kvm_mips_free_vcpus(struct kvm *kvm)</div><div class='ctx'> 	mutex_unlock(&amp;kvm-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kvm_mips_uninit_tlbs(void *arg)</div><div class='add'>+static void kvm_mips_free_gpa_pt(struct kvm *kvm)</div><div class='ctx'> {</div><div class='del'>-	/* Restore wired count */</div><div class='del'>-	write_c0_wired(0);</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='del'>-	/* Clear out all the TLBs */</div><div class='del'>-	kvm_local_flush_tlb_all();</div><div class='add'>+	/* It should always be safe to remove after flushing the whole range */</div><div class='add'>+	WARN_ON(!kvm_mips_flush_gpa_pt(kvm, 0, ~0));</div><div class='add'>+	pgd_free(NULL, kvm-&gt;arch.gpa_mm.pgd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvm_arch_destroy_vm(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	kvm_mips_free_vcpus(kvm);</div><div class='del'>-</div><div class='del'>-	/* If this is the last instance, restore wired count */</div><div class='del'>-	if (atomic_dec_return(&amp;kvm_mips_instance) == 0) {</div><div class='del'>-		kvm_debug("%s: last KVM instance, restoring TLB parameters\n",</div><div class='del'>-			  __func__);</div><div class='del'>-		on_each_cpu(kvm_mips_uninit_tlbs, NULL, 1);</div><div class='del'>-	}</div><div class='add'>+	kvm_mips_free_gpa_pt(kvm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> long kvm_arch_dev_ioctl(struct file *filp, unsigned int ioctl,</div><div class='hunk'>@@ -210,6 +159,32 @@ int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void kvm_arch_flush_shadow_all(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	/* Flush whole GPA */</div><div class='add'>+	kvm_mips_flush_gpa_pt(kvm, 0, ~0);</div><div class='add'>+</div><div class='add'>+	/* Let implementation do the rest */</div><div class='add'>+	kvm_mips_callbacks-&gt;flush_shadow_all(kvm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_arch_flush_shadow_memslot(struct kvm *kvm,</div><div class='add'>+				   struct kvm_memory_slot *slot)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The slot has been made invalid (ready for moving or deletion), so we</div><div class='add'>+	 * need to ensure that it can no longer be accessed by any guest VCPUs.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+	/* Flush slot from GPA */</div><div class='add'>+	kvm_mips_flush_gpa_pt(kvm, slot-&gt;base_gfn,</div><div class='add'>+			      slot-&gt;base_gfn + slot-&gt;npages - 1);</div><div class='add'>+	/* Let implementation do the rest */</div><div class='add'>+	kvm_mips_callbacks-&gt;flush_shadow_memslot(kvm, slot);</div><div class='add'>+	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int kvm_arch_prepare_memory_region(struct kvm *kvm,</div><div class='ctx'> 				   struct kvm_memory_slot *memslot,</div><div class='ctx'> 				   const struct kvm_userspace_memory_region *mem,</div><div class='hunk'>@@ -224,35 +199,32 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,</div><div class='ctx'> 				   const struct kvm_memory_slot *new,</div><div class='ctx'> 				   enum kvm_mr_change change)</div><div class='ctx'> {</div><div class='del'>-	unsigned long npages = 0;</div><div class='del'>-	int i;</div><div class='add'>+	int needs_flush;</div><div class='ctx'> </div><div class='ctx'> 	kvm_debug("%s: kvm: %p slot: %d, GPA: %llx, size: %llx, QVA: %llx\n",</div><div class='ctx'> 		  __func__, kvm, mem-&gt;slot, mem-&gt;guest_phys_addr,</div><div class='ctx'> 		  mem-&gt;memory_size, mem-&gt;userspace_addr);</div><div class='ctx'> </div><div class='del'>-	/* Setup Guest PMAP table */</div><div class='del'>-	if (!kvm-&gt;arch.guest_pmap) {</div><div class='del'>-		if (mem-&gt;slot == 0)</div><div class='del'>-			npages = mem-&gt;memory_size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-		if (npages) {</div><div class='del'>-			kvm-&gt;arch.guest_pmap_npages = npages;</div><div class='del'>-			kvm-&gt;arch.guest_pmap =</div><div class='del'>-			    kzalloc(npages * sizeof(unsigned long), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-			if (!kvm-&gt;arch.guest_pmap) {</div><div class='del'>-				kvm_err("Failed to allocate guest PMAP\n");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			kvm_debug("Allocated space for Guest PMAP Table (%ld pages) @ %p\n",</div><div class='del'>-				  npages, kvm-&gt;arch.guest_pmap);</div><div class='del'>-</div><div class='del'>-			/* Now setup the page table */</div><div class='del'>-			for (i = 0; i &lt; npages; i++)</div><div class='del'>-				kvm-&gt;arch.guest_pmap[i] = KVM_INVALID_PAGE;</div><div class='del'>-		}</div><div class='add'>+	/*</div><div class='add'>+	 * If dirty page logging is enabled, write protect all pages in the slot</div><div class='add'>+	 * ready for dirty logging.</div><div class='add'>+	 *</div><div class='add'>+	 * There is no need to do this in any of the following cases:</div><div class='add'>+	 * CREATE:	No dirty mappings will already exist.</div><div class='add'>+	 * MOVE/DELETE:	The old mappings will already have been cleaned up by</div><div class='add'>+	 *		kvm_arch_flush_shadow_memslot()</div><div class='add'>+	 */</div><div class='add'>+	if (change == KVM_MR_FLAGS_ONLY &amp;&amp;</div><div class='add'>+	    (!(old-&gt;flags &amp; KVM_MEM_LOG_DIRTY_PAGES) &amp;&amp;</div><div class='add'>+	     new-&gt;flags &amp; KVM_MEM_LOG_DIRTY_PAGES)) {</div><div class='add'>+		spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+		/* Write protect GPA page table entries */</div><div class='add'>+		needs_flush = kvm_mips_mkclean_gpa_pt(kvm, new-&gt;base_gfn,</div><div class='add'>+					new-&gt;base_gfn + new-&gt;npages - 1);</div><div class='add'>+		/* Let implementation do the rest */</div><div class='add'>+		if (needs_flush)</div><div class='add'>+			kvm_mips_callbacks-&gt;flush_shadow_memslot(kvm, new);</div><div class='add'>+		spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +248,7 @@ static inline void dump_handler(const char *symbol, void *start, void *end)</div><div class='ctx'> struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)</div><div class='ctx'> {</div><div class='ctx'> 	int err, size;</div><div class='del'>-	void *gebase, *p, *handler;</div><div class='add'>+	void *gebase, *p, *handler, *refill_start, *refill_end;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	struct kvm_vcpu *vcpu = kzalloc(sizeof(struct kvm_vcpu), GFP_KERNEL);</div><div class='hunk'>@@ -329,8 +301,9 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)</div><div class='ctx'> 	/* Build guest exception vectors dynamically in unmapped memory */</div><div class='ctx'> 	handler = gebase + 0x2000;</div><div class='ctx'> </div><div class='del'>-	/* TLB Refill, EXL = 0 */</div><div class='del'>-	kvm_mips_build_exception(gebase, handler);</div><div class='add'>+	/* TLB refill */</div><div class='add'>+	refill_start = gebase;</div><div class='add'>+	refill_end = kvm_mips_build_tlb_refill_exception(refill_start, handler);</div><div class='ctx'> </div><div class='ctx'> 	/* General Exception Entry point */</div><div class='ctx'> 	kvm_mips_build_exception(gebase + 0x180, handler);</div><div class='hunk'>@@ -356,12 +329,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)</div><div class='ctx'> 	pr_debug("#include &lt;asm/regdef.h&gt;\n");</div><div class='ctx'> 	pr_debug("\n");</div><div class='ctx'> 	dump_handler("kvm_vcpu_run", vcpu-&gt;arch.vcpu_run, p);</div><div class='add'>+	dump_handler("kvm_tlb_refill", refill_start, refill_end);</div><div class='ctx'> 	dump_handler("kvm_gen_exc", gebase + 0x180, gebase + 0x200);</div><div class='ctx'> 	dump_handler("kvm_exit", gebase + 0x2000, vcpu-&gt;arch.vcpu_run);</div><div class='ctx'> </div><div class='ctx'> 	/* Invalidate the icache for these ranges */</div><div class='del'>-	local_flush_icache_range((unsigned long)gebase,</div><div class='del'>-				(unsigned long)gebase + ALIGN(size, PAGE_SIZE));</div><div class='add'>+	flush_icache_range((unsigned long)gebase,</div><div class='add'>+			   (unsigned long)gebase + ALIGN(size, PAGE_SIZE));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate comm page for guest kernel, a TLB will be reserved for</div><div class='hunk'>@@ -406,6 +380,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	kvm_mips_dump_stats(vcpu);</div><div class='ctx'> </div><div class='add'>+	kvm_mmu_free_memory_caches(vcpu);</div><div class='ctx'> 	kfree(vcpu-&gt;arch.guest_ebase);</div><div class='ctx'> 	kfree(vcpu-&gt;arch.kseg0_commpage);</div><div class='ctx'> 	kfree(vcpu);</div><div class='hunk'>@@ -422,37 +397,9 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Must be called with preemption disabled, just before entering guest */</div><div class='del'>-static void kvm_mips_check_asids(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct mips_coproc *cop0 = vcpu-&gt;arch.cop0;</div><div class='del'>-	int i, cpu = smp_processor_id();</div><div class='del'>-	unsigned int gasid;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Lazy host ASID regeneration for guest user mode.</div><div class='del'>-	 * If the guest ASID has changed since the last guest usermode</div><div class='del'>-	 * execution, regenerate the host ASID so as to invalidate stale TLB</div><div class='del'>-	 * entries.</div><div class='del'>-	 */</div><div class='del'>-	if (!KVM_GUEST_KERNEL_MODE(vcpu)) {</div><div class='del'>-		gasid = kvm_read_c0_guest_entryhi(cop0) &amp; KVM_ENTRYHI_ASID;</div><div class='del'>-		if (gasid != vcpu-&gt;arch.last_user_gasid) {</div><div class='del'>-			kvm_get_new_mmu_context(&amp;vcpu-&gt;arch.guest_user_mm, cpu,</div><div class='del'>-						vcpu);</div><div class='del'>-			vcpu-&gt;arch.guest_user_asid[cpu] =</div><div class='del'>-				vcpu-&gt;arch.guest_user_mm.context.asid[cpu];</div><div class='del'>-			for_each_possible_cpu(i)</div><div class='del'>-				if (i != cpu)</div><div class='del'>-					vcpu-&gt;arch.guest_user_asid[cpu] = 0;</div><div class='del'>-			vcpu-&gt;arch.last_user_gasid = gasid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)</div><div class='ctx'> {</div><div class='del'>-	int r = 0;</div><div class='add'>+	int r = -EINTR;</div><div class='ctx'> 	sigset_t sigsaved;</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;sigset_active)</div><div class='hunk'>@@ -464,31 +411,30 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)</div><div class='ctx'> 		vcpu-&gt;mmio_needed = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (run-&gt;immediate_exit)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	lose_fpu(1);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_disable();</div><div class='del'>-	/* Check if we have any exceptions/interrupts pending */</div><div class='del'>-	kvm_mips_deliver_interrupts(vcpu,</div><div class='del'>-				    kvm_read_c0_guest_cause(vcpu-&gt;arch.cop0));</div><div class='del'>-</div><div class='ctx'> 	guest_enter_irqoff();</div><div class='del'>-</div><div class='del'>-	/* Disable hardware page table walking while in guest */</div><div class='del'>-	htw_stop();</div><div class='del'>-</div><div class='ctx'> 	trace_kvm_enter(vcpu);</div><div class='ctx'> </div><div class='del'>-	kvm_mips_check_asids(vcpu);</div><div class='del'>-</div><div class='del'>-	r = vcpu-&gt;arch.vcpu_run(run, vcpu);</div><div class='del'>-	trace_kvm_out(vcpu);</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the read of VCPU requests in vcpu_run() callback is not</div><div class='add'>+	 * reordered ahead of the write to vcpu-&gt;mode, or we could miss a TLB</div><div class='add'>+	 * flush request while the requester sees the VCPU as outside of guest</div><div class='add'>+	 * mode and not needing an IPI.</div><div class='add'>+	 */</div><div class='add'>+	smp_store_mb(vcpu-&gt;mode, IN_GUEST_MODE);</div><div class='ctx'> </div><div class='del'>-	/* Re-enable HTW before enabling interrupts */</div><div class='del'>-	htw_start();</div><div class='add'>+	r = kvm_mips_callbacks-&gt;vcpu_run(run, vcpu);</div><div class='ctx'> </div><div class='add'>+	trace_kvm_out(vcpu);</div><div class='ctx'> 	guest_exit_irqoff();</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	if (vcpu-&gt;sigset_active)</div><div class='ctx'> 		sigprocmask(SIG_SETMASK, &amp;sigsaved, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -580,33 +526,6 @@ static u64 kvm_mips_get_one_regs[] = {</div><div class='ctx'> 	KVM_REG_MIPS_LO,</div><div class='ctx'> #endif</div><div class='ctx'> 	KVM_REG_MIPS_PC,</div><div class='del'>-</div><div class='del'>-	KVM_REG_MIPS_CP0_INDEX,</div><div class='del'>-	KVM_REG_MIPS_CP0_CONTEXT,</div><div class='del'>-	KVM_REG_MIPS_CP0_USERLOCAL,</div><div class='del'>-	KVM_REG_MIPS_CP0_PAGEMASK,</div><div class='del'>-	KVM_REG_MIPS_CP0_WIRED,</div><div class='del'>-	KVM_REG_MIPS_CP0_HWRENA,</div><div class='del'>-	KVM_REG_MIPS_CP0_BADVADDR,</div><div class='del'>-	KVM_REG_MIPS_CP0_COUNT,</div><div class='del'>-	KVM_REG_MIPS_CP0_ENTRYHI,</div><div class='del'>-	KVM_REG_MIPS_CP0_COMPARE,</div><div class='del'>-	KVM_REG_MIPS_CP0_STATUS,</div><div class='del'>-	KVM_REG_MIPS_CP0_CAUSE,</div><div class='del'>-	KVM_REG_MIPS_CP0_EPC,</div><div class='del'>-	KVM_REG_MIPS_CP0_PRID,</div><div class='del'>-	KVM_REG_MIPS_CP0_CONFIG,</div><div class='del'>-	KVM_REG_MIPS_CP0_CONFIG1,</div><div class='del'>-	KVM_REG_MIPS_CP0_CONFIG2,</div><div class='del'>-	KVM_REG_MIPS_CP0_CONFIG3,</div><div class='del'>-	KVM_REG_MIPS_CP0_CONFIG4,</div><div class='del'>-	KVM_REG_MIPS_CP0_CONFIG5,</div><div class='del'>-	KVM_REG_MIPS_CP0_CONFIG7,</div><div class='del'>-	KVM_REG_MIPS_CP0_ERROREPC,</div><div class='del'>-</div><div class='del'>-	KVM_REG_MIPS_COUNT_CTL,</div><div class='del'>-	KVM_REG_MIPS_COUNT_RESUME,</div><div class='del'>-	KVM_REG_MIPS_COUNT_HZ,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u64 kvm_mips_get_one_regs_fpu[] = {</div><div class='hunk'>@@ -619,15 +538,6 @@ static u64 kvm_mips_get_one_regs_msa[] = {</div><div class='ctx'> 	KVM_REG_MIPS_MSA_CSR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u64 kvm_mips_get_one_regs_kscratch[] = {</div><div class='del'>-	KVM_REG_MIPS_CP0_KSCRATCH1,</div><div class='del'>-	KVM_REG_MIPS_CP0_KSCRATCH2,</div><div class='del'>-	KVM_REG_MIPS_CP0_KSCRATCH3,</div><div class='del'>-	KVM_REG_MIPS_CP0_KSCRATCH4,</div><div class='del'>-	KVM_REG_MIPS_CP0_KSCRATCH5,</div><div class='del'>-	KVM_REG_MIPS_CP0_KSCRATCH6,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static unsigned long kvm_mips_num_regs(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ret;</div><div class='hunk'>@@ -641,7 +551,6 @@ static unsigned long kvm_mips_num_regs(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (kvm_mips_guest_can_have_msa(&amp;vcpu-&gt;arch))</div><div class='ctx'> 		ret += ARRAY_SIZE(kvm_mips_get_one_regs_msa) + 32;</div><div class='del'>-	ret += __arch_hweight8(vcpu-&gt;arch.kscratch_enabled);</div><div class='ctx'> 	ret += kvm_mips_callbacks-&gt;num_regs(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -694,16 +603,6 @@ static int kvm_mips_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 6; ++i) {</div><div class='del'>-		if (!(vcpu-&gt;arch.kscratch_enabled &amp; BIT(i + 2)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (copy_to_user(indices, &amp;kvm_mips_get_one_regs_kscratch[i],</div><div class='del'>-				 sizeof(kvm_mips_get_one_regs_kscratch[i])))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		++indices;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return kvm_mips_callbacks-&gt;copy_reg_indices(vcpu, indices);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -794,95 +693,6 @@ static int kvm_mips_get_reg(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		v = fpu-&gt;msacsr;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	/* Co-processor 0 registers */</div><div class='del'>-	case KVM_REG_MIPS_CP0_INDEX:</div><div class='del'>-		v = (long)kvm_read_c0_guest_index(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_CONTEXT:</div><div class='del'>-		v = (long)kvm_read_c0_guest_context(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_USERLOCAL:</div><div class='del'>-		v = (long)kvm_read_c0_guest_userlocal(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_PAGEMASK:</div><div class='del'>-		v = (long)kvm_read_c0_guest_pagemask(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_WIRED:</div><div class='del'>-		v = (long)kvm_read_c0_guest_wired(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_HWRENA:</div><div class='del'>-		v = (long)kvm_read_c0_guest_hwrena(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_BADVADDR:</div><div class='del'>-		v = (long)kvm_read_c0_guest_badvaddr(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_ENTRYHI:</div><div class='del'>-		v = (long)kvm_read_c0_guest_entryhi(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_COMPARE:</div><div class='del'>-		v = (long)kvm_read_c0_guest_compare(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_STATUS:</div><div class='del'>-		v = (long)kvm_read_c0_guest_status(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_CAUSE:</div><div class='del'>-		v = (long)kvm_read_c0_guest_cause(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_EPC:</div><div class='del'>-		v = (long)kvm_read_c0_guest_epc(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_PRID:</div><div class='del'>-		v = (long)kvm_read_c0_guest_prid(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_CONFIG:</div><div class='del'>-		v = (long)kvm_read_c0_guest_config(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_CONFIG1:</div><div class='del'>-		v = (long)kvm_read_c0_guest_config1(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_CONFIG2:</div><div class='del'>-		v = (long)kvm_read_c0_guest_config2(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_CONFIG3:</div><div class='del'>-		v = (long)kvm_read_c0_guest_config3(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_CONFIG4:</div><div class='del'>-		v = (long)kvm_read_c0_guest_config4(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_CONFIG5:</div><div class='del'>-		v = (long)kvm_read_c0_guest_config5(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_CONFIG7:</div><div class='del'>-		v = (long)kvm_read_c0_guest_config7(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_ERROREPC:</div><div class='del'>-		v = (long)kvm_read_c0_guest_errorepc(cop0);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_KSCRATCH1 ... KVM_REG_MIPS_CP0_KSCRATCH6:</div><div class='del'>-		idx = reg-&gt;id - KVM_REG_MIPS_CP0_KSCRATCH1 + 2;</div><div class='del'>-		if (!(vcpu-&gt;arch.kscratch_enabled &amp; BIT(idx)))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		switch (idx) {</div><div class='del'>-		case 2:</div><div class='del'>-			v = (long)kvm_read_c0_guest_kscratch1(cop0);</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			v = (long)kvm_read_c0_guest_kscratch2(cop0);</div><div class='del'>-			break;</div><div class='del'>-		case 4:</div><div class='del'>-			v = (long)kvm_read_c0_guest_kscratch3(cop0);</div><div class='del'>-			break;</div><div class='del'>-		case 5:</div><div class='del'>-			v = (long)kvm_read_c0_guest_kscratch4(cop0);</div><div class='del'>-			break;</div><div class='del'>-		case 6:</div><div class='del'>-			v = (long)kvm_read_c0_guest_kscratch5(cop0);</div><div class='del'>-			break;</div><div class='del'>-		case 7:</div><div class='del'>-			v = (long)kvm_read_c0_guest_kscratch6(cop0);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='ctx'> 	/* registers to be handled specially */</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = kvm_mips_callbacks-&gt;get_one_reg(vcpu, reg, &amp;v);</div><div class='hunk'>@@ -1014,68 +824,6 @@ static int kvm_mips_set_reg(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		fpu-&gt;msacsr = v;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	/* Co-processor 0 registers */</div><div class='del'>-	case KVM_REG_MIPS_CP0_INDEX:</div><div class='del'>-		kvm_write_c0_guest_index(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_CONTEXT:</div><div class='del'>-		kvm_write_c0_guest_context(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_USERLOCAL:</div><div class='del'>-		kvm_write_c0_guest_userlocal(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_PAGEMASK:</div><div class='del'>-		kvm_write_c0_guest_pagemask(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_WIRED:</div><div class='del'>-		kvm_write_c0_guest_wired(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_HWRENA:</div><div class='del'>-		kvm_write_c0_guest_hwrena(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_BADVADDR:</div><div class='del'>-		kvm_write_c0_guest_badvaddr(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_ENTRYHI:</div><div class='del'>-		kvm_write_c0_guest_entryhi(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_STATUS:</div><div class='del'>-		kvm_write_c0_guest_status(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_EPC:</div><div class='del'>-		kvm_write_c0_guest_epc(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_PRID:</div><div class='del'>-		kvm_write_c0_guest_prid(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_ERROREPC:</div><div class='del'>-		kvm_write_c0_guest_errorepc(cop0, v);</div><div class='del'>-		break;</div><div class='del'>-	case KVM_REG_MIPS_CP0_KSCRATCH1 ... KVM_REG_MIPS_CP0_KSCRATCH6:</div><div class='del'>-		idx = reg-&gt;id - KVM_REG_MIPS_CP0_KSCRATCH1 + 2;</div><div class='del'>-		if (!(vcpu-&gt;arch.kscratch_enabled &amp; BIT(idx)))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		switch (idx) {</div><div class='del'>-		case 2:</div><div class='del'>-			kvm_write_c0_guest_kscratch1(cop0, v);</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			kvm_write_c0_guest_kscratch2(cop0, v);</div><div class='del'>-			break;</div><div class='del'>-		case 4:</div><div class='del'>-			kvm_write_c0_guest_kscratch3(cop0, v);</div><div class='del'>-			break;</div><div class='del'>-		case 5:</div><div class='del'>-			kvm_write_c0_guest_kscratch4(cop0, v);</div><div class='del'>-			break;</div><div class='del'>-		case 6:</div><div class='del'>-			kvm_write_c0_guest_kscratch5(cop0, v);</div><div class='del'>-			break;</div><div class='del'>-		case 7:</div><div class='del'>-			kvm_write_c0_guest_kscratch6(cop0, v);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='ctx'> 	/* registers to be handled specially */</div><div class='ctx'> 	default:</div><div class='ctx'> 		return kvm_mips_callbacks-&gt;set_one_reg(vcpu, reg, v);</div><div class='hunk'>@@ -1144,18 +892,12 @@ long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl,</div><div class='ctx'> 			return -E2BIG;</div><div class='ctx'> 		return kvm_mips_copy_reg_indices(vcpu, user_list-&gt;reg);</div><div class='ctx'> 	}</div><div class='del'>-	case KVM_NMI:</div><div class='del'>-		/* Treat the NMI as a CPU reset */</div><div class='del'>-		r = kvm_mips_reset_vcpu(vcpu);</div><div class='del'>-		break;</div><div class='ctx'> 	case KVM_INTERRUPT:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct kvm_mips_interrupt irq;</div><div class='ctx'> </div><div class='del'>-			r = -EFAULT;</div><div class='ctx'> 			if (copy_from_user(&amp;irq, argp, sizeof(irq)))</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='add'>+				return -EFAULT;</div><div class='ctx'> 			kvm_debug("[%d] %s: irq: %d\n", vcpu-&gt;vcpu_id, __func__,</div><div class='ctx'> 				  irq.irq);</div><div class='ctx'> </div><div class='hunk'>@@ -1165,56 +907,57 @@ long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl,</div><div class='ctx'> 	case KVM_ENABLE_CAP: {</div><div class='ctx'> 		struct kvm_enable_cap cap;</div><div class='ctx'> </div><div class='del'>-		r = -EFAULT;</div><div class='ctx'> 		if (copy_from_user(&amp;cap, argp, sizeof(cap)))</div><div class='del'>-			goto out;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		r = kvm_vcpu_ioctl_enable_cap(vcpu, &amp;cap);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	default:</div><div class='ctx'> 		r = -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Get (and clear) the dirty memory log for a memory slot. */</div><div class='add'>+/**</div><div class='add'>+ * kvm_vm_ioctl_get_dirty_log - get and clear the log of dirty pages in a slot</div><div class='add'>+ * @kvm: kvm instance</div><div class='add'>+ * @log: slot id and address to which we copy the log</div><div class='add'>+ *</div><div class='add'>+ * Steps 1-4 below provide general overview of dirty page logging. See</div><div class='add'>+ * kvm_get_dirty_log_protect() function description for additional details.</div><div class='add'>+ *</div><div class='add'>+ * We call kvm_get_dirty_log_protect() to handle steps 1-3, upon return we</div><div class='add'>+ * always flush the TLB (step 4) even if previous step failed  and the dirty</div><div class='add'>+ * bitmap may be corrupt. Regardless of previous outcome the KVM logging API</div><div class='add'>+ * does not preclude user space subsequent dirty log read. Flushing TLB ensures</div><div class='add'>+ * writes will be marked dirty for next log read.</div><div class='add'>+ *</div><div class='add'>+ *   1. Take a snapshot of the bit and clear it if needed.</div><div class='add'>+ *   2. Write protect the corresponding page.</div><div class='add'>+ *   3. Copy the snapshot to the userspace.</div><div class='add'>+ *   4. Flush TLB's if needed.</div><div class='add'>+ */</div><div class='ctx'> int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_memslots *slots;</div><div class='ctx'> 	struct kvm_memory_slot *memslot;</div><div class='del'>-	unsigned long ga, ga_end;</div><div class='del'>-	int is_dirty = 0;</div><div class='add'>+	bool is_dirty = false;</div><div class='ctx'> 	int r;</div><div class='del'>-	unsigned long n;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;kvm-&gt;slots_lock);</div><div class='ctx'> </div><div class='del'>-	r = kvm_get_dirty_log(kvm, log, &amp;is_dirty);</div><div class='del'>-	if (r)</div><div class='del'>-		goto out;</div><div class='add'>+	r = kvm_get_dirty_log_protect(kvm, log, &amp;is_dirty);</div><div class='ctx'> </div><div class='del'>-	/* If nothing is dirty, don't bother messing with page tables. */</div><div class='ctx'> 	if (is_dirty) {</div><div class='ctx'> 		slots = kvm_memslots(kvm);</div><div class='ctx'> 		memslot = id_to_memslot(slots, log-&gt;slot);</div><div class='ctx'> </div><div class='del'>-		ga = memslot-&gt;base_gfn &lt;&lt; PAGE_SHIFT;</div><div class='del'>-		ga_end = ga + (memslot-&gt;npages &lt;&lt; PAGE_SHIFT);</div><div class='del'>-</div><div class='del'>-		kvm_info("%s: dirty, ga: %#lx, ga_end %#lx\n", __func__, ga,</div><div class='del'>-			 ga_end);</div><div class='del'>-</div><div class='del'>-		n = kvm_dirty_bitmap_bytes(memslot);</div><div class='del'>-		memset(memslot-&gt;dirty_bitmap, 0, n);</div><div class='add'>+		/* Let implementation handle TLB/GVA invalidation */</div><div class='add'>+		kvm_mips_callbacks-&gt;flush_shadow_memslot(kvm, memslot);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = 0;</div><div class='del'>-out:</div><div class='ctx'> 	mutex_unlock(&amp;kvm-&gt;slots_lock);</div><div class='ctx'> 	return r;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)</div><div class='hunk'>@@ -1282,11 +1025,20 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> 	switch (ext) {</div><div class='ctx'> 	case KVM_CAP_ONE_REG:</div><div class='ctx'> 	case KVM_CAP_ENABLE_CAP:</div><div class='add'>+	case KVM_CAP_READONLY_MEM:</div><div class='add'>+	case KVM_CAP_SYNC_MMU:</div><div class='add'>+	case KVM_CAP_IMMEDIATE_EXIT:</div><div class='ctx'> 		r = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KVM_CAP_COALESCED_MMIO:</div><div class='ctx'> 		r = KVM_COALESCED_MMIO_PAGE_OFFSET;</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_CAP_NR_VCPUS:</div><div class='add'>+		r = num_online_cpus();</div><div class='add'>+		break;</div><div class='add'>+	case KVM_CAP_MAX_VCPUS:</div><div class='add'>+		r = KVM_MAX_VCPUS;</div><div class='add'>+		break;</div><div class='ctx'> 	case KVM_CAP_MIPS_FPU:</div><div class='ctx'> 		/* We don't handle systems with inconsistent cpu_has_fpu */</div><div class='ctx'> 		r = !!raw_cpu_has_fpu;</div><div class='hunk'>@@ -1400,13 +1152,23 @@ static enum hrtimer_restart kvm_mips_comparecount_wakeup(struct hrtimer *timer)</div><div class='ctx'> </div><div class='ctx'> int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	kvm_mips_callbacks-&gt;vcpu_init(vcpu);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kvm_mips_callbacks-&gt;vcpu_init(vcpu);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	hrtimer_init(&amp;vcpu-&gt;arch.comparecount_timer, CLOCK_MONOTONIC,</div><div class='ctx'> 		     HRTIMER_MODE_REL);</div><div class='ctx'> 	vcpu-&gt;arch.comparecount_timer.function = kvm_mips_comparecount_wakeup;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	kvm_mips_callbacks-&gt;vcpu_uninit(vcpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				  struct kvm_translation *tr)</div><div class='ctx'> {</div><div class='hunk'>@@ -1440,8 +1202,11 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u32 __user *opc = (u32 __user *) vcpu-&gt;arch.pc;</div><div class='ctx'> 	unsigned long badvaddr = vcpu-&gt;arch.host_cp0_badvaddr;</div><div class='ctx'> 	enum emulation_result er = EMULATE_DONE;</div><div class='add'>+	u32 inst;</div><div class='ctx'> 	int ret = RESUME_GUEST;</div><div class='ctx'> </div><div class='add'>+	vcpu-&gt;mode = OUTSIDE_GUEST_MODE;</div><div class='add'>+</div><div class='ctx'> 	/* re-enable HTW before enabling interrupts */</div><div class='ctx'> 	htw_start();</div><div class='ctx'> </div><div class='hunk'>@@ -1564,8 +1329,12 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='add'>+		if (cause &amp; CAUSEF_BD)</div><div class='add'>+			opc += 1;</div><div class='add'>+		inst = 0;</div><div class='add'>+		kvm_get_badinstr(opc, vcpu, &amp;inst);</div><div class='ctx'> 		kvm_err("Exception Code: %d, not yet handled, @ PC: %p, inst: 0x%08x  BadVaddr: %#lx Status: %#lx\n",</div><div class='del'>-			exccode, opc, kvm_get_inst(opc, vcpu), badvaddr,</div><div class='add'>+			exccode, opc, inst, badvaddr,</div><div class='ctx'> 			kvm_read_c0_guest_status(vcpu-&gt;arch.cop0));</div><div class='ctx'> 		kvm_arch_vcpu_dump_regs(vcpu);</div><div class='ctx'> 		run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='hunk'>@@ -1593,7 +1362,15 @@ skip_emul:</div><div class='ctx'> 	if (ret == RESUME_GUEST) {</div><div class='ctx'> 		trace_kvm_reenter(vcpu);</div><div class='ctx'> </div><div class='del'>-		kvm_mips_check_asids(vcpu);</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure the read of VCPU requests in vcpu_reenter()</div><div class='add'>+		 * callback is not reordered ahead of the write to vcpu-&gt;mode,</div><div class='add'>+		 * or we could miss a TLB flush request while the requester sees</div><div class='add'>+		 * the VCPU as outside of guest mode and not needing an IPI.</div><div class='add'>+		 */</div><div class='add'>+		smp_store_mb(vcpu-&gt;mode, IN_GUEST_MODE);</div><div class='add'>+</div><div class='add'>+		kvm_mips_callbacks-&gt;vcpu_reenter(run, vcpu);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If FPU / MSA are enabled (i.e. the guest's FPU / MSA context</div><div class='head'>diff --git a/arch/mips/kvm/mmu.c b/arch/mips/kvm/mmu.c<br/>index 3b677c851be0..cb0faade311e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kvm/mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kvm/mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kvm/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/mmu.c</a></div><div class='hunk'>@@ -11,86 +11,995 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> </div><div class='del'>-static u32 kvm_mips_get_kernel_asid(struct kvm_vcpu *vcpu)</div><div class='add'>+/*</div><div class='add'>+ * KVM_MMU_CACHE_MIN_PAGES is the number of GPA page table translation levels</div><div class='add'>+ * for which pages need to be cached.</div><div class='add'>+ */</div><div class='add'>+#if defined(__PAGETABLE_PMD_FOLDED)</div><div class='add'>+#define KVM_MMU_CACHE_MIN_PAGES 1</div><div class='add'>+#else</div><div class='add'>+#define KVM_MMU_CACHE_MIN_PAGES 2</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache,</div><div class='add'>+				  int min, int max)</div><div class='ctx'> {</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='add'>+	void *page;</div><div class='add'>+</div><div class='add'>+	BUG_ON(max &gt; KVM_NR_MEM_OBJS);</div><div class='add'>+	if (cache-&gt;nobjs &gt;= min)</div><div class='add'>+		return 0;</div><div class='add'>+	while (cache-&gt;nobjs &lt; max) {</div><div class='add'>+		page = (void *)__get_free_page(GFP_KERNEL);</div><div class='add'>+		if (!page)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		cache-&gt;objects[cache-&gt;nobjs++] = page;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return vcpu-&gt;arch.guest_kernel_asid[cpu] &amp;</div><div class='del'>-			cpu_asid_mask(&amp;cpu_data[cpu]);</div><div class='add'>+static void mmu_free_memory_cache(struct kvm_mmu_memory_cache *mc)</div><div class='add'>+{</div><div class='add'>+	while (mc-&gt;nobjs)</div><div class='add'>+		free_page((unsigned long)mc-&gt;objects[--mc-&gt;nobjs]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 kvm_mips_get_user_asid(struct kvm_vcpu *vcpu)</div><div class='add'>+static void *mmu_memory_cache_alloc(struct kvm_mmu_memory_cache *mc)</div><div class='ctx'> {</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='add'>+	void *p;</div><div class='ctx'> </div><div class='del'>-	return vcpu-&gt;arch.guest_user_asid[cpu] &amp;</div><div class='del'>-			cpu_asid_mask(&amp;cpu_data[cpu]);</div><div class='add'>+	BUG_ON(!mc || !mc-&gt;nobjs);</div><div class='add'>+	p = mc-&gt;objects[--mc-&gt;nobjs];</div><div class='add'>+	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_mips_map_page(struct kvm *kvm, gfn_t gfn)</div><div class='add'>+void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	int srcu_idx, err = 0;</div><div class='del'>-	kvm_pfn_t pfn;</div><div class='add'>+	mmu_free_memory_cache(&amp;vcpu-&gt;arch.mmu_page_cache);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_pgd_init() - Initialise KVM GPA page directory.</div><div class='add'>+ * @page:	Pointer to page directory (PGD) for KVM GPA.</div><div class='add'>+ *</div><div class='add'>+ * Initialise a KVM GPA page directory with pointers to the invalid table, i.e.</div><div class='add'>+ * representing no mappings. This is similar to pgd_init(), however it</div><div class='add'>+ * initialises all the page directory pointers, not just the ones corresponding</div><div class='add'>+ * to the userland address space (since it is for the guest physical address</div><div class='add'>+ * space rather than a virtual address space).</div><div class='add'>+ */</div><div class='add'>+static void kvm_pgd_init(void *page)</div><div class='add'>+{</div><div class='add'>+	unsigned long *p, *end;</div><div class='add'>+	unsigned long entry;</div><div class='add'>+</div><div class='add'>+#ifdef __PAGETABLE_PMD_FOLDED</div><div class='add'>+	entry = (unsigned long)invalid_pte_table;</div><div class='add'>+#else</div><div class='add'>+	entry = (unsigned long)invalid_pmd_table;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	p = (unsigned long *)page;</div><div class='add'>+	end = p + PTRS_PER_PGD;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		p[0] = entry;</div><div class='add'>+		p[1] = entry;</div><div class='add'>+		p[2] = entry;</div><div class='add'>+		p[3] = entry;</div><div class='add'>+		p[4] = entry;</div><div class='add'>+		p += 8;</div><div class='add'>+		p[-3] = entry;</div><div class='add'>+		p[-2] = entry;</div><div class='add'>+		p[-1] = entry;</div><div class='add'>+	} while (p != end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_pgd_alloc() - Allocate and initialise a KVM GPA page directory.</div><div class='add'>+ *</div><div class='add'>+ * Allocate a blank KVM GPA page directory (PGD) for representing guest physical</div><div class='add'>+ * to host physical page mappings.</div><div class='add'>+ *</div><div class='add'>+ * Returns:	Pointer to new KVM GPA page directory.</div><div class='add'>+ *		NULL on allocation failure.</div><div class='add'>+ */</div><div class='add'>+pgd_t *kvm_pgd_alloc(void)</div><div class='add'>+{</div><div class='add'>+	pgd_t *ret;</div><div class='add'>+</div><div class='add'>+	ret = (pgd_t *)__get_free_pages(GFP_KERNEL, PGD_ORDER);</div><div class='add'>+	if (ret)</div><div class='add'>+		kvm_pgd_init(ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_mips_walk_pgd() - Walk page table with optional allocation.</div><div class='add'>+ * @pgd:	Page directory pointer.</div><div class='add'>+ * @addr:	Address to index page table using.</div><div class='add'>+ * @cache:	MMU page cache to allocate new page tables from, or NULL.</div><div class='add'>+ *</div><div class='add'>+ * Walk the page tables pointed to by @pgd to find the PTE corresponding to the</div><div class='add'>+ * address @addr. If page tables don't exist for @addr, they will be created</div><div class='add'>+ * from the MMU cache if @cache is not NULL.</div><div class='add'>+ *</div><div class='add'>+ * Returns:	Pointer to pte_t corresponding to @addr.</div><div class='add'>+ *		NULL if a page table doesn't exist for @addr and !@cache.</div><div class='add'>+ *		NULL if a page table allocation failed.</div><div class='add'>+ */</div><div class='add'>+static pte_t *kvm_mips_walk_pgd(pgd_t *pgd, struct kvm_mmu_memory_cache *cache,</div><div class='add'>+				unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	pud_t *pud;</div><div class='add'>+	pmd_t *pmd;</div><div class='add'>+</div><div class='add'>+	pgd += pgd_index(addr);</div><div class='add'>+	if (pgd_none(*pgd)) {</div><div class='add'>+		/* Not used on MIPS yet */</div><div class='add'>+		BUG();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	pud = pud_offset(pgd, addr);</div><div class='add'>+	if (pud_none(*pud)) {</div><div class='add'>+		pmd_t *new_pmd;</div><div class='add'>+</div><div class='add'>+		if (!cache)</div><div class='add'>+			return NULL;</div><div class='add'>+		new_pmd = mmu_memory_cache_alloc(cache);</div><div class='add'>+		pmd_init((unsigned long)new_pmd,</div><div class='add'>+			 (unsigned long)invalid_pte_table);</div><div class='add'>+		pud_populate(NULL, pud, new_pmd);</div><div class='add'>+	}</div><div class='add'>+	pmd = pmd_offset(pud, addr);</div><div class='add'>+	if (pmd_none(*pmd)) {</div><div class='add'>+		pte_t *new_pte;</div><div class='add'>+</div><div class='add'>+		if (!cache)</div><div class='add'>+			return NULL;</div><div class='add'>+		new_pte = mmu_memory_cache_alloc(cache);</div><div class='add'>+		clear_page(new_pte);</div><div class='add'>+		pmd_populate_kernel(NULL, pmd, new_pte);</div><div class='add'>+	}</div><div class='add'>+	return pte_offset(pmd, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Caller must hold kvm-&gt;mm_lock */</div><div class='add'>+static pte_t *kvm_mips_pte_for_gpa(struct kvm *kvm,</div><div class='add'>+				   struct kvm_mmu_memory_cache *cache,</div><div class='add'>+				   unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return kvm_mips_walk_pgd(kvm-&gt;arch.gpa_mm.pgd, cache, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * kvm_mips_flush_gpa_{pte,pmd,pud,pgd,pt}.</div><div class='add'>+ * Flush a range of guest physical address space from the VM's GPA page tables.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static bool kvm_mips_flush_gpa_pte(pte_t *pte, unsigned long start_gpa,</div><div class='add'>+				   unsigned long end_gpa)</div><div class='add'>+{</div><div class='add'>+	int i_min = __pte_offset(start_gpa);</div><div class='add'>+	int i_max = __pte_offset(end_gpa);</div><div class='add'>+	bool safe_to_remove = (i_min == 0 &amp;&amp; i_max == PTRS_PER_PTE - 1);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i) {</div><div class='add'>+		if (!pte_present(pte[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		set_pte(pte + i, __pte(0));</div><div class='add'>+	}</div><div class='add'>+	return safe_to_remove;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool kvm_mips_flush_gpa_pmd(pmd_t *pmd, unsigned long start_gpa,</div><div class='add'>+				   unsigned long end_gpa)</div><div class='add'>+{</div><div class='add'>+	pte_t *pte;</div><div class='add'>+	unsigned long end = ~0ul;</div><div class='add'>+	int i_min = __pmd_offset(start_gpa);</div><div class='add'>+	int i_max = __pmd_offset(end_gpa);</div><div class='add'>+	bool safe_to_remove = (i_min == 0 &amp;&amp; i_max == PTRS_PER_PMD - 1);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i, start_gpa = 0) {</div><div class='add'>+		if (!pmd_present(pmd[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pte = pte_offset(pmd + i, 0);</div><div class='add'>+		if (i == i_max)</div><div class='add'>+			end = end_gpa;</div><div class='add'>+</div><div class='add'>+		if (kvm_mips_flush_gpa_pte(pte, start_gpa, end)) {</div><div class='add'>+			pmd_clear(pmd + i);</div><div class='add'>+			pte_free_kernel(NULL, pte);</div><div class='add'>+		} else {</div><div class='add'>+			safe_to_remove = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return safe_to_remove;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool kvm_mips_flush_gpa_pud(pud_t *pud, unsigned long start_gpa,</div><div class='add'>+				   unsigned long end_gpa)</div><div class='add'>+{</div><div class='add'>+	pmd_t *pmd;</div><div class='add'>+	unsigned long end = ~0ul;</div><div class='add'>+	int i_min = __pud_offset(start_gpa);</div><div class='add'>+	int i_max = __pud_offset(end_gpa);</div><div class='add'>+	bool safe_to_remove = (i_min == 0 &amp;&amp; i_max == PTRS_PER_PUD - 1);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i, start_gpa = 0) {</div><div class='add'>+		if (!pud_present(pud[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pmd = pmd_offset(pud + i, 0);</div><div class='add'>+		if (i == i_max)</div><div class='add'>+			end = end_gpa;</div><div class='add'>+</div><div class='add'>+		if (kvm_mips_flush_gpa_pmd(pmd, start_gpa, end)) {</div><div class='add'>+			pud_clear(pud + i);</div><div class='add'>+			pmd_free(NULL, pmd);</div><div class='add'>+		} else {</div><div class='add'>+			safe_to_remove = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return safe_to_remove;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool kvm_mips_flush_gpa_pgd(pgd_t *pgd, unsigned long start_gpa,</div><div class='add'>+				   unsigned long end_gpa)</div><div class='add'>+{</div><div class='add'>+	pud_t *pud;</div><div class='add'>+	unsigned long end = ~0ul;</div><div class='add'>+	int i_min = pgd_index(start_gpa);</div><div class='add'>+	int i_max = pgd_index(end_gpa);</div><div class='add'>+	bool safe_to_remove = (i_min == 0 &amp;&amp; i_max == PTRS_PER_PGD - 1);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i, start_gpa = 0) {</div><div class='add'>+		if (!pgd_present(pgd[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pud = pud_offset(pgd + i, 0);</div><div class='add'>+		if (i == i_max)</div><div class='add'>+			end = end_gpa;</div><div class='add'>+</div><div class='add'>+		if (kvm_mips_flush_gpa_pud(pud, start_gpa, end)) {</div><div class='add'>+			pgd_clear(pgd + i);</div><div class='add'>+			pud_free(NULL, pud);</div><div class='add'>+		} else {</div><div class='add'>+			safe_to_remove = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return safe_to_remove;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_mips_flush_gpa_pt() - Flush a range of guest physical addresses.</div><div class='add'>+ * @kvm:	KVM pointer.</div><div class='add'>+ * @start_gfn:	Guest frame number of first page in GPA range to flush.</div><div class='add'>+ * @end_gfn:	Guest frame number of last page in GPA range to flush.</div><div class='add'>+ *</div><div class='add'>+ * Flushes a range of GPA mappings from the GPA page tables.</div><div class='add'>+ *</div><div class='add'>+ * The caller must hold the @kvm-&gt;mmu_lock spinlock.</div><div class='add'>+ *</div><div class='add'>+ * Returns:	Whether its safe to remove the top level page directory because</div><div class='add'>+ *		all lower levels have been removed.</div><div class='add'>+ */</div><div class='add'>+bool kvm_mips_flush_gpa_pt(struct kvm *kvm, gfn_t start_gfn, gfn_t end_gfn)</div><div class='add'>+{</div><div class='add'>+	return kvm_mips_flush_gpa_pgd(kvm-&gt;arch.gpa_mm.pgd,</div><div class='add'>+				      start_gfn &lt;&lt; PAGE_SHIFT,</div><div class='add'>+				      end_gfn &lt;&lt; PAGE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BUILD_PTE_RANGE_OP(name, op)					\</div><div class='add'>+static int kvm_mips_##name##_pte(pte_t *pte, unsigned long start,	\</div><div class='add'>+				 unsigned long end)			\</div><div class='add'>+{									\</div><div class='add'>+	int ret = 0;							\</div><div class='add'>+	int i_min = __pte_offset(start);				\</div><div class='add'>+	int i_max = __pte_offset(end);					\</div><div class='add'>+	int i;								\</div><div class='add'>+	pte_t old, new;							\</div><div class='add'>+									\</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i) {				\</div><div class='add'>+		if (!pte_present(pte[i]))				\</div><div class='add'>+			continue;					\</div><div class='add'>+									\</div><div class='add'>+		old = pte[i];						\</div><div class='add'>+		new = op(old);						\</div><div class='add'>+		if (pte_val(new) == pte_val(old))			\</div><div class='add'>+			continue;					\</div><div class='add'>+		set_pte(pte + i, new);					\</div><div class='add'>+		ret = 1;						\</div><div class='add'>+	}								\</div><div class='add'>+	return ret;							\</div><div class='add'>+}									\</div><div class='add'>+									\</div><div class='add'>+/* returns true if anything was done */					\</div><div class='add'>+static int kvm_mips_##name##_pmd(pmd_t *pmd, unsigned long start,	\</div><div class='add'>+				 unsigned long end)			\</div><div class='add'>+{									\</div><div class='add'>+	int ret = 0;							\</div><div class='add'>+	pte_t *pte;							\</div><div class='add'>+	unsigned long cur_end = ~0ul;					\</div><div class='add'>+	int i_min = __pmd_offset(start);				\</div><div class='add'>+	int i_max = __pmd_offset(end);					\</div><div class='add'>+	int i;								\</div><div class='add'>+									\</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i, start = 0) {			\</div><div class='add'>+		if (!pmd_present(pmd[i]))				\</div><div class='add'>+			continue;					\</div><div class='add'>+									\</div><div class='add'>+		pte = pte_offset(pmd + i, 0);				\</div><div class='add'>+		if (i == i_max)						\</div><div class='add'>+			cur_end = end;					\</div><div class='add'>+									\</div><div class='add'>+		ret |= kvm_mips_##name##_pte(pte, start, cur_end);	\</div><div class='add'>+	}								\</div><div class='add'>+	return ret;							\</div><div class='add'>+}									\</div><div class='add'>+									\</div><div class='add'>+static int kvm_mips_##name##_pud(pud_t *pud, unsigned long start,	\</div><div class='add'>+				 unsigned long end)			\</div><div class='add'>+{									\</div><div class='add'>+	int ret = 0;							\</div><div class='add'>+	pmd_t *pmd;							\</div><div class='add'>+	unsigned long cur_end = ~0ul;					\</div><div class='add'>+	int i_min = __pud_offset(start);				\</div><div class='add'>+	int i_max = __pud_offset(end);					\</div><div class='add'>+	int i;								\</div><div class='add'>+									\</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i, start = 0) {			\</div><div class='add'>+		if (!pud_present(pud[i]))				\</div><div class='add'>+			continue;					\</div><div class='add'>+									\</div><div class='add'>+		pmd = pmd_offset(pud + i, 0);				\</div><div class='add'>+		if (i == i_max)						\</div><div class='add'>+			cur_end = end;					\</div><div class='add'>+									\</div><div class='add'>+		ret |= kvm_mips_##name##_pmd(pmd, start, cur_end);	\</div><div class='add'>+	}								\</div><div class='add'>+	return ret;							\</div><div class='add'>+}									\</div><div class='add'>+									\</div><div class='add'>+static int kvm_mips_##name##_pgd(pgd_t *pgd, unsigned long start,	\</div><div class='add'>+				 unsigned long end)			\</div><div class='add'>+{									\</div><div class='add'>+	int ret = 0;							\</div><div class='add'>+	pud_t *pud;							\</div><div class='add'>+	unsigned long cur_end = ~0ul;					\</div><div class='add'>+	int i_min = pgd_index(start);					\</div><div class='add'>+	int i_max = pgd_index(end);					\</div><div class='add'>+	int i;								\</div><div class='add'>+									\</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i, start = 0) {			\</div><div class='add'>+		if (!pgd_present(pgd[i]))				\</div><div class='add'>+			continue;					\</div><div class='add'>+									\</div><div class='add'>+		pud = pud_offset(pgd + i, 0);				\</div><div class='add'>+		if (i == i_max)						\</div><div class='add'>+			cur_end = end;					\</div><div class='add'>+									\</div><div class='add'>+		ret |= kvm_mips_##name##_pud(pud, start, cur_end);	\</div><div class='add'>+	}								\</div><div class='add'>+	return ret;							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * kvm_mips_mkclean_gpa_pt.</div><div class='add'>+ * Mark a range of guest physical address space clean (writes fault) in the VM's</div><div class='add'>+ * GPA page table to allow dirty page tracking.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-	if (kvm-&gt;arch.guest_pmap[gfn] != KVM_INVALID_PAGE)</div><div class='add'>+BUILD_PTE_RANGE_OP(mkclean, pte_mkclean)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_mips_mkclean_gpa_pt() - Make a range of guest physical addresses clean.</div><div class='add'>+ * @kvm:	KVM pointer.</div><div class='add'>+ * @start_gfn:	Guest frame number of first page in GPA range to flush.</div><div class='add'>+ * @end_gfn:	Guest frame number of last page in GPA range to flush.</div><div class='add'>+ *</div><div class='add'>+ * Make a range of GPA mappings clean so that guest writes will fault and</div><div class='add'>+ * trigger dirty page logging.</div><div class='add'>+ *</div><div class='add'>+ * The caller must hold the @kvm-&gt;mmu_lock spinlock.</div><div class='add'>+ *</div><div class='add'>+ * Returns:	Whether any GPA mappings were modified, which would require</div><div class='add'>+ *		derived mappings (GVA page tables &amp; TLB enties) to be</div><div class='add'>+ *		invalidated.</div><div class='add'>+ */</div><div class='add'>+int kvm_mips_mkclean_gpa_pt(struct kvm *kvm, gfn_t start_gfn, gfn_t end_gfn)</div><div class='add'>+{</div><div class='add'>+	return kvm_mips_mkclean_pgd(kvm-&gt;arch.gpa_mm.pgd,</div><div class='add'>+				    start_gfn &lt;&lt; PAGE_SHIFT,</div><div class='add'>+				    end_gfn &lt;&lt; PAGE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_arch_mmu_enable_log_dirty_pt_masked() - write protect dirty pages</div><div class='add'>+ * @kvm:	The KVM pointer</div><div class='add'>+ * @slot:	The memory slot associated with mask</div><div class='add'>+ * @gfn_offset:	The gfn offset in memory slot</div><div class='add'>+ * @mask:	The mask of dirty pages at offset 'gfn_offset' in this memory</div><div class='add'>+ *		slot to be write protected</div><div class='add'>+ *</div><div class='add'>+ * Walks bits set in mask write protects the associated pte's. Caller must</div><div class='add'>+ * acquire @kvm-&gt;mmu_lock.</div><div class='add'>+ */</div><div class='add'>+void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm,</div><div class='add'>+		struct kvm_memory_slot *slot,</div><div class='add'>+		gfn_t gfn_offset, unsigned long mask)</div><div class='add'>+{</div><div class='add'>+	gfn_t base_gfn = slot-&gt;base_gfn + gfn_offset;</div><div class='add'>+	gfn_t start = base_gfn +  __ffs(mask);</div><div class='add'>+	gfn_t end = base_gfn + __fls(mask);</div><div class='add'>+</div><div class='add'>+	kvm_mips_mkclean_gpa_pt(kvm, start, end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * kvm_mips_mkold_gpa_pt.</div><div class='add'>+ * Mark a range of guest physical address space old (all accesses fault) in the</div><div class='add'>+ * VM's GPA page table to allow detection of commonly used pages.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+BUILD_PTE_RANGE_OP(mkold, pte_mkold)</div><div class='add'>+</div><div class='add'>+static int kvm_mips_mkold_gpa_pt(struct kvm *kvm, gfn_t start_gfn,</div><div class='add'>+				 gfn_t end_gfn)</div><div class='add'>+{</div><div class='add'>+	return kvm_mips_mkold_pgd(kvm-&gt;arch.gpa_mm.pgd,</div><div class='add'>+				  start_gfn &lt;&lt; PAGE_SHIFT,</div><div class='add'>+				  end_gfn &lt;&lt; PAGE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int handle_hva_to_gpa(struct kvm *kvm,</div><div class='add'>+			     unsigned long start,</div><div class='add'>+			     unsigned long end,</div><div class='add'>+			     int (*handler)(struct kvm *kvm, gfn_t gfn,</div><div class='add'>+					    gpa_t gfn_end,</div><div class='add'>+					    struct kvm_memory_slot *memslot,</div><div class='add'>+					    void *data),</div><div class='add'>+			     void *data)</div><div class='add'>+{</div><div class='add'>+	struct kvm_memslots *slots;</div><div class='add'>+	struct kvm_memory_slot *memslot;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	slots = kvm_memslots(kvm);</div><div class='add'>+</div><div class='add'>+	/* we only care about the pages that the guest sees */</div><div class='add'>+	kvm_for_each_memslot(memslot, slots) {</div><div class='add'>+		unsigned long hva_start, hva_end;</div><div class='add'>+		gfn_t gfn, gfn_end;</div><div class='add'>+</div><div class='add'>+		hva_start = max(start, memslot-&gt;userspace_addr);</div><div class='add'>+		hva_end = min(end, memslot-&gt;userspace_addr +</div><div class='add'>+					(memslot-&gt;npages &lt;&lt; PAGE_SHIFT));</div><div class='add'>+		if (hva_start &gt;= hva_end)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * {gfn(page) | page intersects with [hva_start, hva_end)} =</div><div class='add'>+		 * {gfn_start, gfn_start+1, ..., gfn_end-1}.</div><div class='add'>+		 */</div><div class='add'>+		gfn = hva_to_gfn_memslot(hva_start, memslot);</div><div class='add'>+		gfn_end = hva_to_gfn_memslot(hva_end + PAGE_SIZE - 1, memslot);</div><div class='add'>+</div><div class='add'>+		ret |= handler(kvm, gfn, gfn_end, memslot, data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int kvm_unmap_hva_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end,</div><div class='add'>+				 struct kvm_memory_slot *memslot, void *data)</div><div class='add'>+{</div><div class='add'>+	kvm_mips_flush_gpa_pt(kvm, gfn, gfn_end);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)</div><div class='add'>+{</div><div class='add'>+	unsigned long end = hva + PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	handle_hva_to_gpa(kvm, hva, end, &amp;kvm_unmap_hva_handler, NULL);</div><div class='add'>+</div><div class='add'>+	kvm_mips_callbacks-&gt;flush_shadow_all(kvm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	handle_hva_to_gpa(kvm, start, end, &amp;kvm_unmap_hva_handler, NULL);</div><div class='add'>+</div><div class='add'>+	kvm_mips_callbacks-&gt;flush_shadow_all(kvm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvm_set_spte_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end,</div><div class='add'>+				struct kvm_memory_slot *memslot, void *data)</div><div class='add'>+{</div><div class='add'>+	gpa_t gpa = gfn &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	pte_t hva_pte = *(pte_t *)data;</div><div class='add'>+	pte_t *gpa_pte = kvm_mips_pte_for_gpa(kvm, NULL, gpa);</div><div class='add'>+	pte_t old_pte;</div><div class='add'>+</div><div class='add'>+	if (!gpa_pte)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Mapping may need adjusting depending on memslot flags */</div><div class='add'>+	old_pte = *gpa_pte;</div><div class='add'>+	if (memslot-&gt;flags &amp; KVM_MEM_LOG_DIRTY_PAGES &amp;&amp; !pte_dirty(old_pte))</div><div class='add'>+		hva_pte = pte_mkclean(hva_pte);</div><div class='add'>+	else if (memslot-&gt;flags &amp; KVM_MEM_READONLY)</div><div class='add'>+		hva_pte = pte_wrprotect(hva_pte);</div><div class='add'>+</div><div class='add'>+	set_pte(gpa_pte, hva_pte);</div><div class='add'>+</div><div class='add'>+	/* Replacing an absent or old page doesn't need flushes */</div><div class='add'>+	if (!pte_present(old_pte) || !pte_young(old_pte))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* Pages swapped, aged, moved, or cleaned require flushes */</div><div class='add'>+	return !pte_present(hva_pte) ||</div><div class='add'>+	       !pte_young(hva_pte) ||</div><div class='add'>+	       pte_pfn(old_pte) != pte_pfn(hva_pte) ||</div><div class='add'>+	       (pte_dirty(old_pte) &amp;&amp; !pte_dirty(hva_pte));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte)</div><div class='add'>+{</div><div class='add'>+	unsigned long end = hva + PAGE_SIZE;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = handle_hva_to_gpa(kvm, hva, end, &amp;kvm_set_spte_handler, &amp;pte);</div><div class='add'>+	if (ret)</div><div class='add'>+		kvm_mips_callbacks-&gt;flush_shadow_all(kvm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvm_age_hva_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end,</div><div class='add'>+			       struct kvm_memory_slot *memslot, void *data)</div><div class='add'>+{</div><div class='add'>+	return kvm_mips_mkold_gpa_pt(kvm, gfn, gfn_end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvm_test_age_hva_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end,</div><div class='add'>+				    struct kvm_memory_slot *memslot, void *data)</div><div class='add'>+{</div><div class='add'>+	gpa_t gpa = gfn &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	pte_t *gpa_pte = kvm_mips_pte_for_gpa(kvm, NULL, gpa);</div><div class='add'>+</div><div class='add'>+	if (!gpa_pte)</div><div class='add'>+		return 0;</div><div class='add'>+	return pte_young(*gpa_pte);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	return handle_hva_to_gpa(kvm, start, end, kvm_age_hva_handler, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_test_age_hva(struct kvm *kvm, unsigned long hva)</div><div class='add'>+{</div><div class='add'>+	return handle_hva_to_gpa(kvm, hva, hva, kvm_test_age_hva_handler, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * _kvm_mips_map_page_fast() - Fast path GPA fault handler.</div><div class='add'>+ * @vcpu:		VCPU pointer.</div><div class='add'>+ * @gpa:		Guest physical address of fault.</div><div class='add'>+ * @write_fault:	Whether the fault was due to a write.</div><div class='add'>+ * @out_entry:		New PTE for @gpa (written on success unless NULL).</div><div class='add'>+ * @out_buddy:		New PTE for @gpa's buddy (written on success unless</div><div class='add'>+ *			NULL).</div><div class='add'>+ *</div><div class='add'>+ * Perform fast path GPA fault handling, doing all that can be done without</div><div class='add'>+ * calling into KVM. This handles marking old pages young (for idle page</div><div class='add'>+ * tracking), and dirtying of clean pages (for dirty page logging).</div><div class='add'>+ *</div><div class='add'>+ * Returns:	0 on success, in which case we can update derived mappings and</div><div class='add'>+ *		resume guest execution.</div><div class='add'>+ *		-EFAULT on failure due to absent GPA mapping or write to</div><div class='add'>+ *		read-only page, in which case KVM must be consulted.</div><div class='add'>+ */</div><div class='add'>+static int _kvm_mips_map_page_fast(struct kvm_vcpu *vcpu, unsigned long gpa,</div><div class='add'>+				   bool write_fault,</div><div class='add'>+				   pte_t *out_entry, pte_t *out_buddy)</div><div class='add'>+{</div><div class='add'>+	struct kvm *kvm = vcpu-&gt;kvm;</div><div class='add'>+	gfn_t gfn = gpa &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+	kvm_pfn_t pfn = 0;	/* silence bogus GCC warning */</div><div class='add'>+	bool pfn_valid = false;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+</div><div class='add'>+	/* Fast path - just check GPA page table for an existing entry */</div><div class='add'>+	ptep = kvm_mips_pte_for_gpa(kvm, NULL, gpa);</div><div class='add'>+	if (!ptep || !pte_present(*ptep)) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Track access to pages marked old */</div><div class='add'>+	if (!pte_young(*ptep)) {</div><div class='add'>+		set_pte(ptep, pte_mkyoung(*ptep));</div><div class='add'>+		pfn = pte_pfn(*ptep);</div><div class='add'>+		pfn_valid = true;</div><div class='add'>+		/* call kvm_set_pfn_accessed() after unlock */</div><div class='add'>+	}</div><div class='add'>+	if (write_fault &amp;&amp; !pte_dirty(*ptep)) {</div><div class='add'>+		if (!pte_write(*ptep)) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Track dirtying of writeable pages */</div><div class='add'>+		set_pte(ptep, pte_mkdirty(*ptep));</div><div class='add'>+		pfn = pte_pfn(*ptep);</div><div class='add'>+		mark_page_dirty(kvm, gfn);</div><div class='add'>+		kvm_set_pfn_dirty(pfn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (out_entry)</div><div class='add'>+		*out_entry = *ptep;</div><div class='add'>+	if (out_buddy)</div><div class='add'>+		*out_buddy = *ptep_buddy(ptep);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+	if (pfn_valid)</div><div class='add'>+		kvm_set_pfn_accessed(pfn);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_mips_map_page() - Map a guest physical page.</div><div class='add'>+ * @vcpu:		VCPU pointer.</div><div class='add'>+ * @gpa:		Guest physical address of fault.</div><div class='add'>+ * @write_fault:	Whether the fault was due to a write.</div><div class='add'>+ * @out_entry:		New PTE for @gpa (written on success unless NULL).</div><div class='add'>+ * @out_buddy:		New PTE for @gpa's buddy (written on success unless</div><div class='add'>+ *			NULL).</div><div class='add'>+ *</div><div class='add'>+ * Handle GPA faults by creating a new GPA mapping (or updating an existing</div><div class='add'>+ * one).</div><div class='add'>+ *</div><div class='add'>+ * This takes care of marking pages young or dirty (idle/dirty page tracking),</div><div class='add'>+ * asking KVM for the corresponding PFN, and creating a mapping in the GPA page</div><div class='add'>+ * tables. Derived mappings (GVA page tables and TLBs) must be handled by the</div><div class='add'>+ * caller.</div><div class='add'>+ *</div><div class='add'>+ * Returns:	0 on success, in which case the caller may use the @out_entry</div><div class='add'>+ *		and @out_buddy PTEs to update derived mappings and resume guest</div><div class='add'>+ *		execution.</div><div class='add'>+ *		-EFAULT if there is no memory region at @gpa or a write was</div><div class='add'>+ *		attempted to a read-only memory region. This is usually handled</div><div class='add'>+ *		as an MMIO access.</div><div class='add'>+ */</div><div class='add'>+static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa,</div><div class='add'>+			     bool write_fault,</div><div class='add'>+			     pte_t *out_entry, pte_t *out_buddy)</div><div class='add'>+{</div><div class='add'>+	struct kvm *kvm = vcpu-&gt;kvm;</div><div class='add'>+	struct kvm_mmu_memory_cache *memcache = &amp;vcpu-&gt;arch.mmu_page_cache;</div><div class='add'>+	gfn_t gfn = gpa &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	int srcu_idx, err;</div><div class='add'>+	kvm_pfn_t pfn;</div><div class='add'>+	pte_t *ptep, entry, old_pte;</div><div class='add'>+	bool writeable;</div><div class='add'>+	unsigned long prot_bits;</div><div class='add'>+	unsigned long mmu_seq;</div><div class='add'>+</div><div class='add'>+	/* Try the fast path to handle old / clean pages */</div><div class='ctx'> 	srcu_idx = srcu_read_lock(&amp;kvm-&gt;srcu);</div><div class='del'>-	pfn = gfn_to_pfn(kvm, gfn);</div><div class='add'>+	err = _kvm_mips_map_page_fast(vcpu, gpa, write_fault, out_entry,</div><div class='add'>+				      out_buddy);</div><div class='add'>+	if (!err)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='add'>+	/* We need a minimum of cached pages ready for page table creation */</div><div class='add'>+	err = mmu_topup_memory_cache(memcache, KVM_MMU_CACHE_MIN_PAGES,</div><div class='add'>+				     KVM_NR_MEM_OBJS);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	/*</div><div class='add'>+	 * Used to check for invalidations in progress, of the pfn that is</div><div class='add'>+	 * returned by pfn_to_pfn_prot below.</div><div class='add'>+	 */</div><div class='add'>+	mmu_seq = kvm-&gt;mmu_notifier_seq;</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure the read of mmu_notifier_seq isn't reordered with PTE reads in</div><div class='add'>+	 * gfn_to_pfn_prot() (which calls get_user_pages()), so that we don't</div><div class='add'>+	 * risk the page we get a reference to getting unmapped before we have a</div><div class='add'>+	 * chance to grab the mmu_lock without mmu_notifier_retry() noticing.</div><div class='add'>+	 *</div><div class='add'>+	 * This smp_rmb() pairs with the effective smp_wmb() of the combination</div><div class='add'>+	 * of the pte_unmap_unlock() after the PTE is zapped, and the</div><div class='add'>+	 * spin_lock() in kvm_mmu_notifier_invalidate_&lt;page|range_end&gt;() before</div><div class='add'>+	 * mmu_notifier_seq is incremented.</div><div class='add'>+	 */</div><div class='add'>+	smp_rmb();</div><div class='add'>+</div><div class='add'>+	/* Slow path - ask KVM core whether we can access this GPA */</div><div class='add'>+	pfn = gfn_to_pfn_prot(kvm, gfn, write_fault, &amp;writeable);</div><div class='ctx'> 	if (is_error_noslot_pfn(pfn)) {</div><div class='del'>-		kvm_err("Couldn't get pfn for gfn %#llx!\n", gfn);</div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kvm-&gt;arch.guest_pmap[gfn] = pfn;</div><div class='add'>+	spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+	/* Check if an invalidation has taken place since we got pfn */</div><div class='add'>+	if (mmu_notifier_retry(kvm, mmu_seq)) {</div><div class='add'>+		/*</div><div class='add'>+		 * This can happen when mappings are changed asynchronously, but</div><div class='add'>+		 * also synchronously if a COW is triggered by</div><div class='add'>+		 * gfn_to_pfn_prot().</div><div class='add'>+		 */</div><div class='add'>+		spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+		kvm_release_pfn_clean(pfn);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure page tables are allocated */</div><div class='add'>+	ptep = kvm_mips_pte_for_gpa(kvm, memcache, gpa);</div><div class='add'>+</div><div class='add'>+	/* Set up the PTE */</div><div class='add'>+	prot_bits = _PAGE_PRESENT | __READABLE | _page_cachable_default;</div><div class='add'>+	if (writeable) {</div><div class='add'>+		prot_bits |= _PAGE_WRITE;</div><div class='add'>+		if (write_fault) {</div><div class='add'>+			prot_bits |= __WRITEABLE;</div><div class='add'>+			mark_page_dirty(kvm, gfn);</div><div class='add'>+			kvm_set_pfn_dirty(pfn);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	entry = pfn_pte(pfn, __pgprot(prot_bits));</div><div class='add'>+</div><div class='add'>+	/* Write the PTE */</div><div class='add'>+	old_pte = *ptep;</div><div class='add'>+	set_pte(ptep, entry);</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	if (out_entry)</div><div class='add'>+		*out_entry = *ptep;</div><div class='add'>+	if (out_buddy)</div><div class='add'>+		*out_buddy = *ptep_buddy(ptep);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+	kvm_release_pfn_clean(pfn);</div><div class='add'>+	kvm_set_pfn_accessed(pfn);</div><div class='ctx'> out:</div><div class='ctx'> 	srcu_read_unlock(&amp;kvm-&gt;srcu, srcu_idx);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Translate guest KSEG0 addresses to Host PA */</div><div class='del'>-unsigned long kvm_mips_translate_guest_kseg0_to_hpa(struct kvm_vcpu *vcpu,</div><div class='del'>-						    unsigned long gva)</div><div class='add'>+static pte_t *kvm_trap_emul_pte_for_gva(struct kvm_vcpu *vcpu,</div><div class='add'>+					unsigned long addr)</div><div class='ctx'> {</div><div class='del'>-	gfn_t gfn;</div><div class='del'>-	unsigned long offset = gva &amp; ~PAGE_MASK;</div><div class='del'>-	struct kvm *kvm = vcpu-&gt;kvm;</div><div class='add'>+	struct kvm_mmu_memory_cache *memcache = &amp;vcpu-&gt;arch.mmu_page_cache;</div><div class='add'>+	pgd_t *pgdp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* We need a minimum of cached pages ready for page table creation */</div><div class='add'>+	ret = mmu_topup_memory_cache(memcache, KVM_MMU_CACHE_MIN_PAGES,</div><div class='add'>+				     KVM_NR_MEM_OBJS);</div><div class='add'>+	if (ret)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (KVM_GUEST_KERNEL_MODE(vcpu))</div><div class='add'>+		pgdp = vcpu-&gt;arch.guest_kernel_mm.pgd;</div><div class='add'>+	else</div><div class='add'>+		pgdp = vcpu-&gt;arch.guest_user_mm.pgd;</div><div class='add'>+</div><div class='add'>+	return kvm_mips_walk_pgd(pgdp, memcache, addr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (KVM_GUEST_KSEGX(gva) != KVM_GUEST_KSEG0) {</div><div class='del'>-		kvm_err("%s/%p: Invalid gva: %#lx\n", __func__,</div><div class='del'>-			__builtin_return_address(0), gva);</div><div class='del'>-		return KVM_INVALID_PAGE;</div><div class='add'>+void kvm_trap_emul_invalidate_gva(struct kvm_vcpu *vcpu, unsigned long addr,</div><div class='add'>+				  bool user)</div><div class='add'>+{</div><div class='add'>+	pgd_t *pgdp;</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+</div><div class='add'>+	addr &amp;= PAGE_MASK &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	pgdp = vcpu-&gt;arch.guest_kernel_mm.pgd;</div><div class='add'>+	ptep = kvm_mips_walk_pgd(pgdp, NULL, addr);</div><div class='add'>+	if (ptep) {</div><div class='add'>+		ptep[0] = pfn_pte(0, __pgprot(0));</div><div class='add'>+		ptep[1] = pfn_pte(0, __pgprot(0));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (user) {</div><div class='add'>+		pgdp = vcpu-&gt;arch.guest_user_mm.pgd;</div><div class='add'>+		ptep = kvm_mips_walk_pgd(pgdp, NULL, addr);</div><div class='add'>+		if (ptep) {</div><div class='add'>+			ptep[0] = pfn_pte(0, __pgprot(0));</div><div class='add'>+			ptep[1] = pfn_pte(0, __pgprot(0));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	gfn = (KVM_GUEST_CPHYSADDR(gva) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+/*</div><div class='add'>+ * kvm_mips_flush_gva_{pte,pmd,pud,pgd,pt}.</div><div class='add'>+ * Flush a range of guest physical address space from the VM's GPA page tables.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-	if (gfn &gt;= kvm-&gt;arch.guest_pmap_npages) {</div><div class='del'>-		kvm_err("%s: Invalid gfn: %#llx, GVA: %#lx\n", __func__, gfn,</div><div class='del'>-			gva);</div><div class='del'>-		return KVM_INVALID_PAGE;</div><div class='add'>+static bool kvm_mips_flush_gva_pte(pte_t *pte, unsigned long start_gva,</div><div class='add'>+				   unsigned long end_gva)</div><div class='add'>+{</div><div class='add'>+	int i_min = __pte_offset(start_gva);</div><div class='add'>+	int i_max = __pte_offset(end_gva);</div><div class='add'>+	bool safe_to_remove = (i_min == 0 &amp;&amp; i_max == PTRS_PER_PTE - 1);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There's no freeing to do, so there's no point clearing individual</div><div class='add'>+	 * entries unless only part of the last level page table needs flushing.</div><div class='add'>+	 */</div><div class='add'>+	if (safe_to_remove)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i) {</div><div class='add'>+		if (!pte_present(pte[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		set_pte(pte + i, __pte(0));</div><div class='ctx'> 	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (kvm_mips_map_page(vcpu-&gt;kvm, gfn) &lt; 0)</div><div class='del'>-		return KVM_INVALID_ADDR;</div><div class='add'>+static bool kvm_mips_flush_gva_pmd(pmd_t *pmd, unsigned long start_gva,</div><div class='add'>+				   unsigned long end_gva)</div><div class='add'>+{</div><div class='add'>+	pte_t *pte;</div><div class='add'>+	unsigned long end = ~0ul;</div><div class='add'>+	int i_min = __pmd_offset(start_gva);</div><div class='add'>+	int i_max = __pmd_offset(end_gva);</div><div class='add'>+	bool safe_to_remove = (i_min == 0 &amp;&amp; i_max == PTRS_PER_PMD - 1);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i, start_gva = 0) {</div><div class='add'>+		if (!pmd_present(pmd[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pte = pte_offset(pmd + i, 0);</div><div class='add'>+		if (i == i_max)</div><div class='add'>+			end = end_gva;</div><div class='add'>+</div><div class='add'>+		if (kvm_mips_flush_gva_pte(pte, start_gva, end)) {</div><div class='add'>+			pmd_clear(pmd + i);</div><div class='add'>+			pte_free_kernel(NULL, pte);</div><div class='add'>+		} else {</div><div class='add'>+			safe_to_remove = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return safe_to_remove;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return (kvm-&gt;arch.guest_pmap[gfn] &lt;&lt; PAGE_SHIFT) + offset;</div><div class='add'>+static bool kvm_mips_flush_gva_pud(pud_t *pud, unsigned long start_gva,</div><div class='add'>+				   unsigned long end_gva)</div><div class='add'>+{</div><div class='add'>+	pmd_t *pmd;</div><div class='add'>+	unsigned long end = ~0ul;</div><div class='add'>+	int i_min = __pud_offset(start_gva);</div><div class='add'>+	int i_max = __pud_offset(end_gva);</div><div class='add'>+	bool safe_to_remove = (i_min == 0 &amp;&amp; i_max == PTRS_PER_PUD - 1);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i, start_gva = 0) {</div><div class='add'>+		if (!pud_present(pud[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pmd = pmd_offset(pud + i, 0);</div><div class='add'>+		if (i == i_max)</div><div class='add'>+			end = end_gva;</div><div class='add'>+</div><div class='add'>+		if (kvm_mips_flush_gva_pmd(pmd, start_gva, end)) {</div><div class='add'>+			pud_clear(pud + i);</div><div class='add'>+			pmd_free(NULL, pmd);</div><div class='add'>+		} else {</div><div class='add'>+			safe_to_remove = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return safe_to_remove;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool kvm_mips_flush_gva_pgd(pgd_t *pgd, unsigned long start_gva,</div><div class='add'>+				   unsigned long end_gva)</div><div class='add'>+{</div><div class='add'>+	pud_t *pud;</div><div class='add'>+	unsigned long end = ~0ul;</div><div class='add'>+	int i_min = pgd_index(start_gva);</div><div class='add'>+	int i_max = pgd_index(end_gva);</div><div class='add'>+	bool safe_to_remove = (i_min == 0 &amp;&amp; i_max == PTRS_PER_PGD - 1);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = i_min; i &lt;= i_max; ++i, start_gva = 0) {</div><div class='add'>+		if (!pgd_present(pgd[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pud = pud_offset(pgd + i, 0);</div><div class='add'>+		if (i == i_max)</div><div class='add'>+			end = end_gva;</div><div class='add'>+</div><div class='add'>+		if (kvm_mips_flush_gva_pud(pud, start_gva, end)) {</div><div class='add'>+			pgd_clear(pgd + i);</div><div class='add'>+			pud_free(NULL, pud);</div><div class='add'>+		} else {</div><div class='add'>+			safe_to_remove = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return safe_to_remove;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_mips_flush_gva_pt(pgd_t *pgd, enum kvm_mips_flush flags)</div><div class='add'>+{</div><div class='add'>+	if (flags &amp; KMF_GPA) {</div><div class='add'>+		/* all of guest virtual address space could be affected */</div><div class='add'>+		if (flags &amp; KMF_KERN)</div><div class='add'>+			/* useg, kseg0, seg2/3 */</div><div class='add'>+			kvm_mips_flush_gva_pgd(pgd, 0, 0x7fffffff);</div><div class='add'>+		else</div><div class='add'>+			/* useg */</div><div class='add'>+			kvm_mips_flush_gva_pgd(pgd, 0, 0x3fffffff);</div><div class='add'>+	} else {</div><div class='add'>+		/* useg */</div><div class='add'>+		kvm_mips_flush_gva_pgd(pgd, 0, 0x3fffffff);</div><div class='add'>+</div><div class='add'>+		/* kseg2/3 */</div><div class='add'>+		if (flags &amp; KMF_KERN)</div><div class='add'>+			kvm_mips_flush_gva_pgd(pgd, 0x60000000, 0x7fffffff);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static pte_t kvm_mips_gpa_pte_to_gva_unmapped(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Don't leak writeable but clean entries from GPA page tables. We don't</div><div class='add'>+	 * want the normal Linux tlbmod handler to handle dirtying when KVM</div><div class='add'>+	 * accesses guest memory.</div><div class='add'>+	 */</div><div class='add'>+	if (!pte_dirty(pte))</div><div class='add'>+		pte = pte_wrprotect(pte);</div><div class='add'>+</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static pte_t kvm_mips_gpa_pte_to_gva_mapped(pte_t pte, long entrylo)</div><div class='add'>+{</div><div class='add'>+	/* Guest EntryLo overrides host EntryLo */</div><div class='add'>+	if (!(entrylo &amp; ENTRYLO_D))</div><div class='add'>+		pte = pte_mkclean(pte);</div><div class='add'>+</div><div class='add'>+	return kvm_mips_gpa_pte_to_gva_unmapped(pte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* XXXKYMA: Must be called with interrupts disabled */</div><div class='ctx'> int kvm_mips_handle_kseg0_tlb_fault(unsigned long badvaddr,</div><div class='del'>-				    struct kvm_vcpu *vcpu)</div><div class='add'>+				    struct kvm_vcpu *vcpu,</div><div class='add'>+				    bool write_fault)</div><div class='ctx'> {</div><div class='del'>-	gfn_t gfn;</div><div class='del'>-	kvm_pfn_t pfn0, pfn1;</div><div class='del'>-	unsigned long vaddr = 0;</div><div class='del'>-	unsigned long entryhi = 0, entrylo0 = 0, entrylo1 = 0;</div><div class='del'>-	struct kvm *kvm = vcpu-&gt;kvm;</div><div class='del'>-	const int flush_dcache_mask = 0;</div><div class='del'>-	int ret;</div><div class='add'>+	unsigned long gpa;</div><div class='add'>+	pte_t pte_gpa[2], *ptep_gva;</div><div class='add'>+	int idx;</div><div class='ctx'> </div><div class='ctx'> 	if (KVM_GUEST_KSEGX(badvaddr) != KVM_GUEST_KSEG0) {</div><div class='ctx'> 		kvm_err("%s: Invalid BadVaddr: %#lx\n", __func__, badvaddr);</div><div class='hunk'>@@ -98,49 +1007,39 @@ int kvm_mips_handle_kseg0_tlb_fault(unsigned long badvaddr,</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	gfn = (KVM_GUEST_CPHYSADDR(badvaddr) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	if ((gfn | 1) &gt;= kvm-&gt;arch.guest_pmap_npages) {</div><div class='del'>-		kvm_err("%s: Invalid gfn: %#llx, BadVaddr: %#lx\n", __func__,</div><div class='del'>-			gfn, badvaddr);</div><div class='del'>-		kvm_mips_dump_host_tlbs();</div><div class='add'>+	/* Get the GPA page table entry */</div><div class='add'>+	gpa = KVM_GUEST_CPHYSADDR(badvaddr);</div><div class='add'>+	idx = (badvaddr &gt;&gt; PAGE_SHIFT) &amp; 1;</div><div class='add'>+	if (kvm_mips_map_page(vcpu, gpa, write_fault, &amp;pte_gpa[idx],</div><div class='add'>+			      &amp;pte_gpa[!idx]) &lt; 0)</div><div class='ctx'> 		return -1;</div><div class='del'>-	}</div><div class='del'>-	vaddr = badvaddr &amp; (PAGE_MASK &lt;&lt; 1);</div><div class='ctx'> </div><div class='del'>-	if (kvm_mips_map_page(vcpu-&gt;kvm, gfn) &lt; 0)</div><div class='add'>+	/* Get the GVA page table entry */</div><div class='add'>+	ptep_gva = kvm_trap_emul_pte_for_gva(vcpu, badvaddr &amp; ~PAGE_SIZE);</div><div class='add'>+	if (!ptep_gva) {</div><div class='add'>+		kvm_err("No ptep for gva %lx\n", badvaddr);</div><div class='ctx'> 		return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (kvm_mips_map_page(vcpu-&gt;kvm, gfn ^ 0x1) &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	pfn0 = kvm-&gt;arch.guest_pmap[gfn &amp; ~0x1];</div><div class='del'>-	pfn1 = kvm-&gt;arch.guest_pmap[gfn | 0x1];</div><div class='del'>-</div><div class='del'>-	entrylo0 = mips3_paddr_to_tlbpfn(pfn0 &lt;&lt; PAGE_SHIFT) |</div><div class='del'>-		((_page_cachable_default &gt;&gt; _CACHE_SHIFT) &lt;&lt; ENTRYLO_C_SHIFT) |</div><div class='del'>-		ENTRYLO_D | ENTRYLO_V;</div><div class='del'>-	entrylo1 = mips3_paddr_to_tlbpfn(pfn1 &lt;&lt; PAGE_SHIFT) |</div><div class='del'>-		((_page_cachable_default &gt;&gt; _CACHE_SHIFT) &lt;&lt; ENTRYLO_C_SHIFT) |</div><div class='del'>-		ENTRYLO_D | ENTRYLO_V;</div><div class='del'>-</div><div class='del'>-	preempt_disable();</div><div class='del'>-	entryhi = (vaddr | kvm_mips_get_kernel_asid(vcpu));</div><div class='del'>-	ret = kvm_mips_host_tlb_write(vcpu, entryhi, entrylo0, entrylo1,</div><div class='del'>-				      flush_dcache_mask);</div><div class='del'>-	preempt_enable();</div><div class='add'>+	/* Copy a pair of entries from GPA page table to GVA page table */</div><div class='add'>+	ptep_gva[0] = kvm_mips_gpa_pte_to_gva_unmapped(pte_gpa[0]);</div><div class='add'>+	ptep_gva[1] = kvm_mips_gpa_pte_to_gva_unmapped(pte_gpa[1]);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	/* Invalidate this entry in the TLB, guest kernel ASID only */</div><div class='add'>+	kvm_mips_host_tlb_inv(vcpu, badvaddr, false, true);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int kvm_mips_handle_mapped_seg_tlb_fault(struct kvm_vcpu *vcpu,</div><div class='del'>-					 struct kvm_mips_tlb *tlb)</div><div class='add'>+					 struct kvm_mips_tlb *tlb,</div><div class='add'>+					 unsigned long gva,</div><div class='add'>+					 bool write_fault)</div><div class='ctx'> {</div><div class='del'>-	unsigned long entryhi = 0, entrylo0 = 0, entrylo1 = 0;</div><div class='ctx'> 	struct kvm *kvm = vcpu-&gt;kvm;</div><div class='del'>-	kvm_pfn_t pfn0, pfn1;</div><div class='del'>-	gfn_t gfn0, gfn1;</div><div class='ctx'> 	long tlb_lo[2];</div><div class='del'>-	int ret;</div><div class='add'>+	pte_t pte_gpa[2], *ptep_buddy, *ptep_gva;</div><div class='add'>+	unsigned int idx = TLB_LO_IDX(*tlb, gva);</div><div class='add'>+	bool kernel = KVM_GUEST_KERNEL_MODE(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	tlb_lo[0] = tlb-&gt;tlb_lo[0];</div><div class='ctx'> 	tlb_lo[1] = tlb-&gt;tlb_lo[1];</div><div class='hunk'>@@ -149,70 +1048,64 @@ int kvm_mips_handle_mapped_seg_tlb_fault(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	 * The commpage address must not be mapped to anything else if the guest</div><div class='ctx'> 	 * TLB contains entries nearby, or commpage accesses will break.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!((tlb-&gt;tlb_hi ^ KVM_GUEST_COMMPAGE_ADDR) &amp;</div><div class='del'>-			VPN2_MASK &amp; (PAGE_MASK &lt;&lt; 1)))</div><div class='del'>-		tlb_lo[(KVM_GUEST_COMMPAGE_ADDR &gt;&gt; PAGE_SHIFT) &amp; 1] = 0;</div><div class='del'>-</div><div class='del'>-	gfn0 = mips3_tlbpfn_to_paddr(tlb_lo[0]) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	gfn1 = mips3_tlbpfn_to_paddr(tlb_lo[1]) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	if (gfn0 &gt;= kvm-&gt;arch.guest_pmap_npages ||</div><div class='del'>-	    gfn1 &gt;= kvm-&gt;arch.guest_pmap_npages) {</div><div class='del'>-		kvm_err("%s: Invalid gfn: [%#llx, %#llx], EHi: %#lx\n",</div><div class='del'>-			__func__, gfn0, gfn1, tlb-&gt;tlb_hi);</div><div class='del'>-		kvm_mips_dump_guest_tlbs(vcpu);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	if (!((gva ^ KVM_GUEST_COMMPAGE_ADDR) &amp; VPN2_MASK &amp; (PAGE_MASK &lt;&lt; 1)))</div><div class='add'>+		tlb_lo[TLB_LO_IDX(*tlb, KVM_GUEST_COMMPAGE_ADDR)] = 0;</div><div class='ctx'> </div><div class='del'>-	if (kvm_mips_map_page(kvm, gfn0) &lt; 0)</div><div class='add'>+	/* Get the GPA page table entry */</div><div class='add'>+	if (kvm_mips_map_page(vcpu, mips3_tlbpfn_to_paddr(tlb_lo[idx]),</div><div class='add'>+			      write_fault, &amp;pte_gpa[idx], NULL) &lt; 0)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (kvm_mips_map_page(kvm, gfn1) &lt; 0)</div><div class='add'>+	/* And its GVA buddy's GPA page table entry if it also exists */</div><div class='add'>+	pte_gpa[!idx] = pfn_pte(0, __pgprot(0));</div><div class='add'>+	if (tlb_lo[!idx] &amp; ENTRYLO_V) {</div><div class='add'>+		spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+		ptep_buddy = kvm_mips_pte_for_gpa(kvm, NULL,</div><div class='add'>+					mips3_tlbpfn_to_paddr(tlb_lo[!idx]));</div><div class='add'>+		if (ptep_buddy)</div><div class='add'>+			pte_gpa[!idx] = *ptep_buddy;</div><div class='add'>+		spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the GVA page table entry pair */</div><div class='add'>+	ptep_gva = kvm_trap_emul_pte_for_gva(vcpu, gva &amp; ~PAGE_SIZE);</div><div class='add'>+	if (!ptep_gva) {</div><div class='add'>+		kvm_err("No ptep for gva %lx\n", gva);</div><div class='ctx'> 		return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	pfn0 = kvm-&gt;arch.guest_pmap[gfn0];</div><div class='del'>-	pfn1 = kvm-&gt;arch.guest_pmap[gfn1];</div><div class='add'>+	/* Copy a pair of entries from GPA page table to GVA page table */</div><div class='add'>+	ptep_gva[0] = kvm_mips_gpa_pte_to_gva_mapped(pte_gpa[0], tlb_lo[0]);</div><div class='add'>+	ptep_gva[1] = kvm_mips_gpa_pte_to_gva_mapped(pte_gpa[1], tlb_lo[1]);</div><div class='ctx'> </div><div class='del'>-	/* Get attributes from the Guest TLB */</div><div class='del'>-	entrylo0 = mips3_paddr_to_tlbpfn(pfn0 &lt;&lt; PAGE_SHIFT) |</div><div class='del'>-		((_page_cachable_default &gt;&gt; _CACHE_SHIFT) &lt;&lt; ENTRYLO_C_SHIFT) |</div><div class='del'>-		(tlb_lo[0] &amp; ENTRYLO_D) |</div><div class='del'>-		(tlb_lo[0] &amp; ENTRYLO_V);</div><div class='del'>-	entrylo1 = mips3_paddr_to_tlbpfn(pfn1 &lt;&lt; PAGE_SHIFT) |</div><div class='del'>-		((_page_cachable_default &gt;&gt; _CACHE_SHIFT) &lt;&lt; ENTRYLO_C_SHIFT) |</div><div class='del'>-		(tlb_lo[1] &amp; ENTRYLO_D) |</div><div class='del'>-		(tlb_lo[1] &amp; ENTRYLO_V);</div><div class='add'>+	/* Invalidate this entry in the TLB, current guest mode ASID only */</div><div class='add'>+	kvm_mips_host_tlb_inv(vcpu, gva, !kernel, kernel);</div><div class='ctx'> </div><div class='ctx'> 	kvm_debug("@ %#lx tlb_lo0: 0x%08lx tlb_lo1: 0x%08lx\n", vcpu-&gt;arch.pc,</div><div class='ctx'> 		  tlb-&gt;tlb_lo[0], tlb-&gt;tlb_lo[1]);</div><div class='ctx'> </div><div class='del'>-	preempt_disable();</div><div class='del'>-	entryhi = (tlb-&gt;tlb_hi &amp; VPN2_MASK) | (KVM_GUEST_KERNEL_MODE(vcpu) ?</div><div class='del'>-					       kvm_mips_get_kernel_asid(vcpu) :</div><div class='del'>-					       kvm_mips_get_user_asid(vcpu));</div><div class='del'>-	ret = kvm_mips_host_tlb_write(vcpu, entryhi, entrylo0, entrylo1,</div><div class='del'>-				      tlb-&gt;tlb_mask);</div><div class='del'>-	preempt_enable();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void kvm_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu,</div><div class='del'>-			     struct kvm_vcpu *vcpu)</div><div class='add'>+int kvm_mips_handle_commpage_tlb_fault(unsigned long badvaddr,</div><div class='add'>+				       struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned long asid = asid_cache(cpu);</div><div class='del'>-</div><div class='del'>-	asid += cpu_asid_inc();</div><div class='del'>-	if (!(asid &amp; cpu_asid_mask(&amp;cpu_data[cpu]))) {</div><div class='del'>-		if (cpu_has_vtag_icache)</div><div class='del'>-			flush_icache_all();</div><div class='del'>-</div><div class='del'>-		kvm_local_flush_tlb_all();      /* start new asid cycle */</div><div class='add'>+	kvm_pfn_t pfn;</div><div class='add'>+	pte_t *ptep;</div><div class='ctx'> </div><div class='del'>-		if (!asid)      /* fix version if needed */</div><div class='del'>-			asid = asid_first_version(cpu);</div><div class='add'>+	ptep = kvm_trap_emul_pte_for_gva(vcpu, badvaddr);</div><div class='add'>+	if (!ptep) {</div><div class='add'>+		kvm_err("No ptep for commpage %lx\n", badvaddr);</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cpu_context(cpu, mm) = asid_cache(cpu) = asid;</div><div class='add'>+	pfn = PFN_DOWN(virt_to_phys(vcpu-&gt;arch.kseg0_commpage));</div><div class='add'>+	/* Also set valid and dirty, so refill handler doesn't have to */</div><div class='add'>+	*ptep = pte_mkyoung(pte_mkdirty(pfn_pte(pfn, PAGE_SHARED)));</div><div class='add'>+</div><div class='add'>+	/* Invalidate this entry in the TLB, guest kernel ASID only */</div><div class='add'>+	kvm_mips_host_tlb_inv(vcpu, badvaddr, false, true);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -235,42 +1128,13 @@ static void kvm_mips_migrate_count(struct kvm_vcpu *vcpu)</div><div class='ctx'> /* Restore ASID once we are scheduled back after preemption */</div><div class='ctx'> void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned long asid_mask = cpu_asid_mask(&amp;cpu_data[cpu]);</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int newasid = 0;</div><div class='ctx'> </div><div class='ctx'> 	kvm_debug("%s: vcpu %p, cpu: %d\n", __func__, vcpu, cpu);</div><div class='ctx'> </div><div class='del'>-	/* Allocate new kernel and user ASIDs if needed */</div><div class='del'>-</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='del'>-	if ((vcpu-&gt;arch.guest_kernel_asid[cpu] ^ asid_cache(cpu)) &amp;</div><div class='del'>-						asid_version_mask(cpu)) {</div><div class='del'>-		kvm_get_new_mmu_context(&amp;vcpu-&gt;arch.guest_kernel_mm, cpu, vcpu);</div><div class='del'>-		vcpu-&gt;arch.guest_kernel_asid[cpu] =</div><div class='del'>-		    vcpu-&gt;arch.guest_kernel_mm.context.asid[cpu];</div><div class='del'>-		newasid++;</div><div class='del'>-</div><div class='del'>-		kvm_debug("[%d]: cpu_context: %#lx\n", cpu,</div><div class='del'>-			  cpu_context(cpu, current-&gt;mm));</div><div class='del'>-		kvm_debug("[%d]: Allocated new ASID for Guest Kernel: %#x\n",</div><div class='del'>-			  cpu, vcpu-&gt;arch.guest_kernel_asid[cpu]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((vcpu-&gt;arch.guest_user_asid[cpu] ^ asid_cache(cpu)) &amp;</div><div class='del'>-						asid_version_mask(cpu)) {</div><div class='del'>-		kvm_get_new_mmu_context(&amp;vcpu-&gt;arch.guest_user_mm, cpu, vcpu);</div><div class='del'>-		vcpu-&gt;arch.guest_user_asid[cpu] =</div><div class='del'>-		    vcpu-&gt;arch.guest_user_mm.context.asid[cpu];</div><div class='del'>-		newasid++;</div><div class='del'>-</div><div class='del'>-		kvm_debug("[%d]: cpu_context: %#lx\n", cpu,</div><div class='del'>-			  cpu_context(cpu, current-&gt;mm));</div><div class='del'>-		kvm_debug("[%d]: Allocated new ASID for Guest User: %#x\n", cpu,</div><div class='del'>-			  vcpu-&gt;arch.guest_user_asid[cpu]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	vcpu-&gt;cpu = cpu;</div><div class='ctx'> 	if (vcpu-&gt;arch.last_sched_cpu != cpu) {</div><div class='ctx'> 		kvm_debug("[%d-&gt;%d]KVM VCPU[%d] switch\n",</div><div class='ctx'> 			  vcpu-&gt;arch.last_sched_cpu, cpu, vcpu-&gt;vcpu_id);</div><div class='hunk'>@@ -282,42 +1146,10 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)</div><div class='ctx'> 		kvm_mips_migrate_count(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!newasid) {</div><div class='del'>-		/*</div><div class='del'>-		 * If we preempted while the guest was executing, then reload</div><div class='del'>-		 * the pre-empted ASID</div><div class='del'>-		 */</div><div class='del'>-		if (current-&gt;flags &amp; PF_VCPU) {</div><div class='del'>-			write_c0_entryhi(vcpu-&gt;arch.</div><div class='del'>-					 preempt_entryhi &amp; asid_mask);</div><div class='del'>-			ehb();</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* New ASIDs were allocated for the VM */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Were we in guest context? If so then the pre-empted ASID is</div><div class='del'>-		 * no longer valid, we need to set it to what it should be based</div><div class='del'>-		 * on the mode of the Guest (Kernel/User)</div><div class='del'>-		 */</div><div class='del'>-		if (current-&gt;flags &amp; PF_VCPU) {</div><div class='del'>-			if (KVM_GUEST_KERNEL_MODE(vcpu))</div><div class='del'>-				write_c0_entryhi(vcpu-&gt;arch.</div><div class='del'>-						 guest_kernel_asid[cpu] &amp;</div><div class='del'>-						 asid_mask);</div><div class='del'>-			else</div><div class='del'>-				write_c0_entryhi(vcpu-&gt;arch.</div><div class='del'>-						 guest_user_asid[cpu] &amp;</div><div class='del'>-						 asid_mask);</div><div class='del'>-			ehb();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* restore guest state to registers */</div><div class='del'>-	kvm_mips_callbacks-&gt;vcpu_set_regs(vcpu);</div><div class='add'>+	kvm_mips_callbacks-&gt;vcpu_load(vcpu, cpu);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ASID can change if another task is scheduled during preemption */</div><div class='hunk'>@@ -329,75 +1161,90 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	vcpu-&gt;arch.preempt_entryhi = read_c0_entryhi();</div><div class='ctx'> 	vcpu-&gt;arch.last_sched_cpu = cpu;</div><div class='add'>+	vcpu-&gt;cpu = -1;</div><div class='ctx'> </div><div class='ctx'> 	/* save guest state in registers */</div><div class='del'>-	kvm_mips_callbacks-&gt;vcpu_get_regs(vcpu);</div><div class='del'>-</div><div class='del'>-	if (((cpu_context(cpu, current-&gt;mm) ^ asid_cache(cpu)) &amp;</div><div class='del'>-	     asid_version_mask(cpu))) {</div><div class='del'>-		kvm_debug("%s: Dropping MMU Context:  %#lx\n", __func__,</div><div class='del'>-			  cpu_context(cpu, current-&gt;mm));</div><div class='del'>-		drop_mmu_context(current-&gt;mm, cpu);</div><div class='del'>-	}</div><div class='del'>-	write_c0_entryhi(cpu_asid(cpu, current-&gt;mm));</div><div class='del'>-	ehb();</div><div class='add'>+	kvm_mips_callbacks-&gt;vcpu_put(vcpu, cpu);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 kvm_get_inst(u32 *opc, struct kvm_vcpu *vcpu)</div><div class='add'>+/**</div><div class='add'>+ * kvm_trap_emul_gva_fault() - Safely attempt to handle a GVA access fault.</div><div class='add'>+ * @vcpu:	Virtual CPU.</div><div class='add'>+ * @gva:	Guest virtual address to be accessed.</div><div class='add'>+ * @write:	True if write attempted (must be dirtied and made writable).</div><div class='add'>+ *</div><div class='add'>+ * Safely attempt to handle a GVA fault, mapping GVA pages if necessary, and</div><div class='add'>+ * dirtying the page if @write so that guest instructions can be modified.</div><div class='add'>+ *</div><div class='add'>+ * Returns:	KVM_MIPS_MAPPED on success.</div><div class='add'>+ *		KVM_MIPS_GVA if bad guest virtual address.</div><div class='add'>+ *		KVM_MIPS_GPA if bad guest physical address.</div><div class='add'>+ *		KVM_MIPS_TLB if guest TLB not present.</div><div class='add'>+ *		KVM_MIPS_TLBINV if guest TLB present but not valid.</div><div class='add'>+ *		KVM_MIPS_TLBMOD if guest TLB read only.</div><div class='add'>+ */</div><div class='add'>+enum kvm_mips_fault_result kvm_trap_emul_gva_fault(struct kvm_vcpu *vcpu,</div><div class='add'>+						   unsigned long gva,</div><div class='add'>+						   bool write)</div><div class='ctx'> {</div><div class='ctx'> 	struct mips_coproc *cop0 = vcpu-&gt;arch.cop0;</div><div class='del'>-	unsigned long paddr, flags, vpn2, asid;</div><div class='del'>-	unsigned long va = (unsigned long)opc;</div><div class='del'>-	void *vaddr;</div><div class='del'>-	u32 inst;</div><div class='add'>+	struct kvm_mips_tlb *tlb;</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='del'>-	if (KVM_GUEST_KSEGX(va) &lt; KVM_GUEST_KSEG0 ||</div><div class='del'>-	    KVM_GUEST_KSEGX(va) == KVM_GUEST_KSEG23) {</div><div class='del'>-		local_irq_save(flags);</div><div class='del'>-		index = kvm_mips_host_tlb_lookup(vcpu, va);</div><div class='del'>-		if (index &gt;= 0) {</div><div class='del'>-			inst = *(opc);</div><div class='del'>-		} else {</div><div class='del'>-			vpn2 = va &amp; VPN2_MASK;</div><div class='del'>-			asid = kvm_read_c0_guest_entryhi(cop0) &amp;</div><div class='del'>-						KVM_ENTRYHI_ASID;</div><div class='del'>-			index = kvm_mips_guest_tlb_lookup(vcpu, vpn2 | asid);</div><div class='del'>-			if (index &lt; 0) {</div><div class='del'>-				kvm_err("%s: get_user_failed for %p, vcpu: %p, ASID: %#lx\n",</div><div class='del'>-					__func__, opc, vcpu, read_c0_entryhi());</div><div class='del'>-				kvm_mips_dump_host_tlbs();</div><div class='del'>-				kvm_mips_dump_guest_tlbs(vcpu);</div><div class='del'>-				local_irq_restore(flags);</div><div class='del'>-				return KVM_INVALID_INST;</div><div class='del'>-			}</div><div class='del'>-			if (kvm_mips_handle_mapped_seg_tlb_fault(vcpu,</div><div class='del'>-						&amp;vcpu-&gt;arch.guest_tlb[index])) {</div><div class='del'>-				kvm_err("%s: handling mapped seg tlb fault failed for %p, index: %u, vcpu: %p, ASID: %#lx\n",</div><div class='del'>-					__func__, opc, index, vcpu,</div><div class='del'>-					read_c0_entryhi());</div><div class='del'>-				kvm_mips_dump_guest_tlbs(vcpu);</div><div class='del'>-				local_irq_restore(flags);</div><div class='del'>-				return KVM_INVALID_INST;</div><div class='del'>-			}</div><div class='del'>-			inst = *(opc);</div><div class='del'>-		}</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-	} else if (KVM_GUEST_KSEGX(va) == KVM_GUEST_KSEG0) {</div><div class='del'>-		paddr = kvm_mips_translate_guest_kseg0_to_hpa(vcpu, va);</div><div class='del'>-		vaddr = kmap_atomic(pfn_to_page(PHYS_PFN(paddr)));</div><div class='del'>-		vaddr += paddr &amp; ~PAGE_MASK;</div><div class='del'>-		inst = *(u32 *)vaddr;</div><div class='del'>-		kunmap_atomic(vaddr);</div><div class='add'>+	if (KVM_GUEST_KSEGX(gva) == KVM_GUEST_KSEG0) {</div><div class='add'>+		if (kvm_mips_handle_kseg0_tlb_fault(gva, vcpu, write) &lt; 0)</div><div class='add'>+			return KVM_MIPS_GPA;</div><div class='add'>+	} else if ((KVM_GUEST_KSEGX(gva) &lt; KVM_GUEST_KSEG0) ||</div><div class='add'>+		   KVM_GUEST_KSEGX(gva) == KVM_GUEST_KSEG23) {</div><div class='add'>+		/* Address should be in the guest TLB */</div><div class='add'>+		index = kvm_mips_guest_tlb_lookup(vcpu, (gva &amp; VPN2_MASK) |</div><div class='add'>+			  (kvm_read_c0_guest_entryhi(cop0) &amp; KVM_ENTRYHI_ASID));</div><div class='add'>+		if (index &lt; 0)</div><div class='add'>+			return KVM_MIPS_TLB;</div><div class='add'>+		tlb = &amp;vcpu-&gt;arch.guest_tlb[index];</div><div class='add'>+</div><div class='add'>+		/* Entry should be valid, and dirty for writes */</div><div class='add'>+		if (!TLB_IS_VALID(*tlb, gva))</div><div class='add'>+			return KVM_MIPS_TLBINV;</div><div class='add'>+		if (write &amp;&amp; !TLB_IS_DIRTY(*tlb, gva))</div><div class='add'>+			return KVM_MIPS_TLBMOD;</div><div class='add'>+</div><div class='add'>+		if (kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb, gva, write))</div><div class='add'>+			return KVM_MIPS_GPA;</div><div class='ctx'> 	} else {</div><div class='del'>-		kvm_err("%s: illegal address: %p\n", __func__, opc);</div><div class='del'>-		return KVM_INVALID_INST;</div><div class='add'>+		return KVM_MIPS_GVA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return inst;</div><div class='add'>+	return KVM_MIPS_MAPPED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_get_inst(u32 *opc, struct kvm_vcpu *vcpu, u32 *out)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	kvm_trap_emul_gva_lockless_begin(vcpu);</div><div class='add'>+	err = get_user(*out, opc);</div><div class='add'>+	kvm_trap_emul_gva_lockless_end(vcpu);</div><div class='add'>+</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Try to handle the fault, maybe we just raced with a GVA</div><div class='add'>+		 * invalidation.</div><div class='add'>+		 */</div><div class='add'>+		err = kvm_trap_emul_gva_fault(vcpu, (unsigned long)opc,</div><div class='add'>+					      false);</div><div class='add'>+		if (unlikely(err)) {</div><div class='add'>+			kvm_err("%s: illegal address: %p\n",</div><div class='add'>+				__func__, opc);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Hopefully it'll work now */</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kvm/tlb.c b/arch/mips/kvm/tlb.c<br/>index 254377d8e0b9..2819eb793345 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kvm/tlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kvm/tlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kvm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/tlb.c</a></div><div class='hunk'>@@ -33,28 +33,20 @@</div><div class='ctx'> #define KVM_GUEST_PC_TLB    0</div><div class='ctx'> #define KVM_GUEST_SP_TLB    1</div><div class='ctx'> </div><div class='del'>-atomic_t kvm_mips_instance;</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_mips_instance);</div><div class='del'>-</div><div class='ctx'> static u32 kvm_mips_get_kernel_asid(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='add'>+	struct mm_struct *kern_mm = &amp;vcpu-&gt;arch.guest_kernel_mm;</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='del'>-	return vcpu-&gt;arch.guest_kernel_asid[cpu] &amp;</div><div class='del'>-			cpu_asid_mask(&amp;cpu_data[cpu]);</div><div class='add'>+	return cpu_asid(cpu, kern_mm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 kvm_mips_get_user_asid(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='add'>+	struct mm_struct *user_mm = &amp;vcpu-&gt;arch.guest_user_mm;</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='del'>-	return vcpu-&gt;arch.guest_user_asid[cpu] &amp;</div><div class='del'>-			cpu_asid_mask(&amp;cpu_data[cpu]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline u32 kvm_mips_get_commpage_asid(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	return vcpu-&gt;kvm-&gt;arch.commpage_tlb;</div><div class='add'>+	return cpu_asid(cpu, user_mm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Structure defining an tlb entry data set. */</div><div class='hunk'>@@ -104,109 +96,6 @@ void kvm_mips_dump_guest_tlbs(struct kvm_vcpu *vcpu)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_mips_dump_guest_tlbs);</div><div class='ctx'> </div><div class='del'>-/* XXXKYMA: Must be called with interrupts disabled */</div><div class='del'>-/* set flush_dcache_mask == 0 if no dcache flush required */</div><div class='del'>-int kvm_mips_host_tlb_write(struct kvm_vcpu *vcpu, unsigned long entryhi,</div><div class='del'>-			    unsigned long entrylo0, unsigned long entrylo1,</div><div class='del'>-			    int flush_dcache_mask)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned long old_entryhi;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	old_entryhi = read_c0_entryhi();</div><div class='del'>-	write_c0_entryhi(entryhi);</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='del'>-</div><div class='del'>-	tlb_probe();</div><div class='del'>-	tlb_probe_hazard();</div><div class='del'>-	idx = read_c0_index();</div><div class='del'>-</div><div class='del'>-	if (idx &gt; current_cpu_data.tlbsize) {</div><div class='del'>-		kvm_err("%s: Invalid Index: %d\n", __func__, idx);</div><div class='del'>-		kvm_mips_dump_host_tlbs();</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	write_c0_entrylo0(entrylo0);</div><div class='del'>-	write_c0_entrylo1(entrylo1);</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='del'>-</div><div class='del'>-	if (idx &lt; 0)</div><div class='del'>-		tlb_write_random();</div><div class='del'>-	else</div><div class='del'>-		tlb_write_indexed();</div><div class='del'>-	tlbw_use_hazard();</div><div class='del'>-</div><div class='del'>-	kvm_debug("@ %#lx idx: %2d [entryhi(R): %#lx] entrylo0(R): 0x%08lx, entrylo1(R): 0x%08lx\n",</div><div class='del'>-		  vcpu-&gt;arch.pc, idx, read_c0_entryhi(),</div><div class='del'>-		  read_c0_entrylo0(), read_c0_entrylo1());</div><div class='del'>-</div><div class='del'>-	/* Flush D-cache */</div><div class='del'>-	if (flush_dcache_mask) {</div><div class='del'>-		if (entrylo0 &amp; ENTRYLO_V) {</div><div class='del'>-			++vcpu-&gt;stat.flush_dcache_exits;</div><div class='del'>-			flush_data_cache_page((entryhi &amp; VPN2_MASK) &amp;</div><div class='del'>-					      ~flush_dcache_mask);</div><div class='del'>-		}</div><div class='del'>-		if (entrylo1 &amp; ENTRYLO_V) {</div><div class='del'>-			++vcpu-&gt;stat.flush_dcache_exits;</div><div class='del'>-			flush_data_cache_page(((entryhi &amp; VPN2_MASK) &amp;</div><div class='del'>-					       ~flush_dcache_mask) |</div><div class='del'>-					      (0x1 &lt;&lt; PAGE_SHIFT));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Restore old ASID */</div><div class='del'>-	write_c0_entryhi(old_entryhi);</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_mips_host_tlb_write);</div><div class='del'>-</div><div class='del'>-int kvm_mips_handle_commpage_tlb_fault(unsigned long badvaddr,</div><div class='del'>-	struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	kvm_pfn_t pfn;</div><div class='del'>-	unsigned long flags, old_entryhi = 0, vaddr = 0;</div><div class='del'>-	unsigned long entrylo[2] = { 0, 0 };</div><div class='del'>-	unsigned int pair_idx;</div><div class='del'>-</div><div class='del'>-	pfn = PFN_DOWN(virt_to_phys(vcpu-&gt;arch.kseg0_commpage));</div><div class='del'>-	pair_idx = (badvaddr &gt;&gt; PAGE_SHIFT) &amp; 1;</div><div class='del'>-	entrylo[pair_idx] = mips3_paddr_to_tlbpfn(pfn &lt;&lt; PAGE_SHIFT) |</div><div class='del'>-		((_page_cachable_default &gt;&gt; _CACHE_SHIFT) &lt;&lt; ENTRYLO_C_SHIFT) |</div><div class='del'>-		ENTRYLO_D | ENTRYLO_V;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	old_entryhi = read_c0_entryhi();</div><div class='del'>-	vaddr = badvaddr &amp; (PAGE_MASK &lt;&lt; 1);</div><div class='del'>-	write_c0_entryhi(vaddr | kvm_mips_get_kernel_asid(vcpu));</div><div class='del'>-	write_c0_entrylo0(entrylo[0]);</div><div class='del'>-	write_c0_entrylo1(entrylo[1]);</div><div class='del'>-	write_c0_index(kvm_mips_get_commpage_asid(vcpu));</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='del'>-	tlb_write_indexed();</div><div class='del'>-	tlbw_use_hazard();</div><div class='del'>-</div><div class='del'>-	kvm_debug("@ %#lx idx: %2d [entryhi(R): %#lx] entrylo0 (R): 0x%08lx, entrylo1(R): 0x%08lx\n",</div><div class='del'>-		  vcpu-&gt;arch.pc, read_c0_index(), read_c0_entryhi(),</div><div class='del'>-		  read_c0_entrylo0(), read_c0_entrylo1());</div><div class='del'>-</div><div class='del'>-	/* Restore old ASID */</div><div class='del'>-	write_c0_entryhi(old_entryhi);</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_mips_handle_commpage_tlb_fault);</div><div class='del'>-</div><div class='ctx'> int kvm_mips_guest_tlb_lookup(struct kvm_vcpu *vcpu, unsigned long entryhi)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -228,51 +117,11 @@ int kvm_mips_guest_tlb_lookup(struct kvm_vcpu *vcpu, unsigned long entryhi)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_mips_guest_tlb_lookup);</div><div class='ctx'> </div><div class='del'>-int kvm_mips_host_tlb_lookup(struct kvm_vcpu *vcpu, unsigned long vaddr)</div><div class='del'>-{</div><div class='del'>-	unsigned long old_entryhi, flags;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	old_entryhi = read_c0_entryhi();</div><div class='del'>-</div><div class='del'>-	if (KVM_GUEST_KERNEL_MODE(vcpu))</div><div class='del'>-		write_c0_entryhi((vaddr &amp; VPN2_MASK) |</div><div class='del'>-				 kvm_mips_get_kernel_asid(vcpu));</div><div class='del'>-	else {</div><div class='del'>-		write_c0_entryhi((vaddr &amp; VPN2_MASK) |</div><div class='del'>-				 kvm_mips_get_user_asid(vcpu));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='del'>-</div><div class='del'>-	tlb_probe();</div><div class='del'>-	tlb_probe_hazard();</div><div class='del'>-	idx = read_c0_index();</div><div class='del'>-</div><div class='del'>-	/* Restore old ASID */</div><div class='del'>-	write_c0_entryhi(old_entryhi);</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	kvm_debug("Host TLB lookup, %#lx, idx: %2d\n", vaddr, idx);</div><div class='del'>-</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_mips_host_tlb_lookup);</div><div class='del'>-</div><div class='del'>-int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long va)</div><div class='add'>+static int _kvm_mips_host_tlb_inv(unsigned long entryhi)</div><div class='ctx'> {</div><div class='ctx'> 	int idx;</div><div class='del'>-	unsigned long flags, old_entryhi;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	old_entryhi = read_c0_entryhi();</div><div class='ctx'> </div><div class='del'>-	write_c0_entryhi((va &amp; VPN2_MASK) | kvm_mips_get_user_asid(vcpu));</div><div class='add'>+	write_c0_entryhi(entryhi);</div><div class='ctx'> 	mtc0_tlbw_hazard();</div><div class='ctx'> </div><div class='ctx'> 	tlb_probe();</div><div class='hunk'>@@ -282,7 +131,7 @@ int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long va)</div><div class='ctx'> 	if (idx &gt;= current_cpu_data.tlbsize)</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='del'>-	if (idx &gt; 0) {</div><div class='add'>+	if (idx &gt;= 0) {</div><div class='ctx'> 		write_c0_entryhi(UNIQUE_ENTRYHI(idx));</div><div class='ctx'> 		write_c0_entrylo0(0);</div><div class='ctx'> 		write_c0_entrylo1(0);</div><div class='hunk'>@@ -292,93 +141,75 @@ int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long va)</div><div class='ctx'> 		tlbw_use_hazard();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_c0_entryhi(old_entryhi);</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	if (idx &gt; 0)</div><div class='del'>-		kvm_debug("%s: Invalidated entryhi %#lx @ idx %d\n", __func__,</div><div class='del'>-			  (va &amp; VPN2_MASK) | kvm_mips_get_user_asid(vcpu), idx);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return idx;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_mips_host_tlb_inv);</div><div class='ctx'> </div><div class='del'>-void kvm_mips_flush_host_tlb(int skip_kseg0)</div><div class='add'>+int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long va,</div><div class='add'>+			  bool user, bool kernel)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned long old_entryhi, entryhi;</div><div class='del'>-	unsigned long old_pagemask;</div><div class='del'>-	int entry = 0;</div><div class='del'>-	int maxentry = current_cpu_data.tlbsize;</div><div class='add'>+	int idx_user, idx_kernel;</div><div class='add'>+	unsigned long flags, old_entryhi;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	old_entryhi = read_c0_entryhi();</div><div class='del'>-	old_pagemask = read_c0_pagemask();</div><div class='del'>-</div><div class='del'>-	/* Blast 'em all away. */</div><div class='del'>-	for (entry = 0; entry &lt; maxentry; entry++) {</div><div class='del'>-		write_c0_index(entry);</div><div class='del'>-</div><div class='del'>-		if (skip_kseg0) {</div><div class='del'>-			mtc0_tlbr_hazard();</div><div class='del'>-			tlb_read();</div><div class='del'>-			tlb_read_hazard();</div><div class='del'>-</div><div class='del'>-			entryhi = read_c0_entryhi();</div><div class='ctx'> </div><div class='del'>-			/* Don't blow away guest kernel entries */</div><div class='del'>-			if (KVM_GUEST_KSEGX(entryhi) == KVM_GUEST_KSEG0)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			write_c0_pagemask(old_pagemask);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Make sure all entries differ. */</div><div class='del'>-		write_c0_entryhi(UNIQUE_ENTRYHI(entry));</div><div class='del'>-		write_c0_entrylo0(0);</div><div class='del'>-		write_c0_entrylo1(0);</div><div class='del'>-		mtc0_tlbw_hazard();</div><div class='del'>-</div><div class='del'>-		tlb_write_indexed();</div><div class='del'>-		tlbw_use_hazard();</div><div class='del'>-	}</div><div class='add'>+	if (user)</div><div class='add'>+		idx_user = _kvm_mips_host_tlb_inv((va &amp; VPN2_MASK) |</div><div class='add'>+						  kvm_mips_get_user_asid(vcpu));</div><div class='add'>+	if (kernel)</div><div class='add'>+		idx_kernel = _kvm_mips_host_tlb_inv((va &amp; VPN2_MASK) |</div><div class='add'>+						kvm_mips_get_kernel_asid(vcpu));</div><div class='ctx'> </div><div class='ctx'> 	write_c0_entryhi(old_entryhi);</div><div class='del'>-	write_c0_pagemask(old_pagemask);</div><div class='ctx'> 	mtc0_tlbw_hazard();</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	if (user &amp;&amp; idx_user &gt;= 0)</div><div class='add'>+		kvm_debug("%s: Invalidated guest user entryhi %#lx @ idx %d\n",</div><div class='add'>+			  __func__, (va &amp; VPN2_MASK) |</div><div class='add'>+				    kvm_mips_get_user_asid(vcpu), idx_user);</div><div class='add'>+	if (kernel &amp;&amp; idx_kernel &gt;= 0)</div><div class='add'>+		kvm_debug("%s: Invalidated guest kernel entryhi %#lx @ idx %d\n",</div><div class='add'>+			  __func__, (va &amp; VPN2_MASK) |</div><div class='add'>+				    kvm_mips_get_kernel_asid(vcpu), idx_kernel);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_mips_flush_host_tlb);</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_mips_host_tlb_inv);</div><div class='ctx'> </div><div class='del'>-void kvm_local_flush_tlb_all(void)</div><div class='add'>+/**</div><div class='add'>+ * kvm_mips_suspend_mm() - Suspend the active mm.</div><div class='add'>+ * @cpu		The CPU we're running on.</div><div class='add'>+ *</div><div class='add'>+ * Suspend the active_mm, ready for a switch to a KVM guest virtual address</div><div class='add'>+ * space. This is left active for the duration of guest context, including time</div><div class='add'>+ * with interrupts enabled, so we need to be careful not to confuse e.g. cache</div><div class='add'>+ * management IPIs.</div><div class='add'>+ *</div><div class='add'>+ * kvm_mips_resume_mm() should be called before context switching to a different</div><div class='add'>+ * process so we don't need to worry about reference counting.</div><div class='add'>+ *</div><div class='add'>+ * This needs to be in static kernel code to avoid exporting init_mm.</div><div class='add'>+ */</div><div class='add'>+void kvm_mips_suspend_mm(int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned long old_ctx;</div><div class='del'>-	int entry = 0;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	/* Save old context and create impossible VPN2 value */</div><div class='del'>-	old_ctx = read_c0_entryhi();</div><div class='del'>-	write_c0_entrylo0(0);</div><div class='del'>-	write_c0_entrylo1(0);</div><div class='del'>-</div><div class='del'>-	/* Blast 'em all away. */</div><div class='del'>-	while (entry &lt; current_cpu_data.tlbsize) {</div><div class='del'>-		/* Make sure all entries differ. */</div><div class='del'>-		write_c0_entryhi(UNIQUE_ENTRYHI(entry));</div><div class='del'>-		write_c0_index(entry);</div><div class='del'>-		mtc0_tlbw_hazard();</div><div class='del'>-		tlb_write_indexed();</div><div class='del'>-		tlbw_use_hazard();</div><div class='del'>-		entry++;</div><div class='del'>-	}</div><div class='del'>-	write_c0_entryhi(old_ctx);</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='add'>+	cpumask_clear_cpu(cpu, mm_cpumask(current-&gt;active_mm));</div><div class='add'>+	current-&gt;active_mm = &amp;init_mm;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_mips_suspend_mm);</div><div class='ctx'> </div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+/**</div><div class='add'>+ * kvm_mips_resume_mm() - Resume the current process mm.</div><div class='add'>+ * @cpu		The CPU we're running on.</div><div class='add'>+ *</div><div class='add'>+ * Resume the mm of the current process, after a switch back from a KVM guest</div><div class='add'>+ * virtual address space (see kvm_mips_suspend_mm()).</div><div class='add'>+ */</div><div class='add'>+void kvm_mips_resume_mm(int cpu)</div><div class='add'>+{</div><div class='add'>+	cpumask_set_cpu(cpu, mm_cpumask(current-&gt;mm));</div><div class='add'>+	current-&gt;active_mm = current-&gt;mm;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_local_flush_tlb_all);</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_mips_resume_mm);</div><div class='head'>diff --git a/arch/mips/kvm/trap_emul.c b/arch/mips/kvm/trap_emul.c<br/>index 3b20441f2beb..b1fa53b252ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/kvm/trap_emul.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/kvm/trap_emul.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/kvm/trap_emul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/kvm/trap_emul.c</a></div><div class='hunk'>@@ -11,9 +11,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;asm/mmu_context.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "interrupt.h"</div><div class='ctx'> </div><div class='hunk'>@@ -21,9 +23,12 @@ static gpa_t kvm_trap_emul_gva_to_gpa_cb(gva_t gva)</div><div class='ctx'> {</div><div class='ctx'> 	gpa_t gpa;</div><div class='ctx'> 	gva_t kseg = KSEGX(gva);</div><div class='add'>+	gva_t gkseg = KVM_GUEST_KSEGX(gva);</div><div class='ctx'> </div><div class='ctx'> 	if ((kseg == CKSEG0) || (kseg == CKSEG1))</div><div class='ctx'> 		gpa = CPHYSADDR(gva);</div><div class='add'>+	else if (gkseg == KVM_GUEST_KSEG0)</div><div class='add'>+		gpa = KVM_GUEST_CPHYSADDR(gva);</div><div class='ctx'> 	else {</div><div class='ctx'> 		kvm_err("%s: cannot find GPA for GVA: %#lx\n", __func__, gva);</div><div class='ctx'> 		kvm_mips_dump_host_tlbs();</div><div class='hunk'>@@ -83,48 +88,134 @@ static int kvm_trap_emul_handle_cop_unusable(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvm_mips_bad_load(u32 cause, u32 *opc, struct kvm_run *run,</div><div class='add'>+			     struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	enum emulation_result er;</div><div class='add'>+	union mips_instruction inst;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* A code fetch fault doesn't count as an MMIO */</div><div class='add'>+	if (kvm_is_ifetch_fault(&amp;vcpu-&gt;arch)) {</div><div class='add'>+		run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='add'>+		return RESUME_HOST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fetch the instruction. */</div><div class='add'>+	if (cause &amp; CAUSEF_BD)</div><div class='add'>+		opc += 1;</div><div class='add'>+	err = kvm_get_badinstr(opc, vcpu, &amp;inst.word);</div><div class='add'>+	if (err) {</div><div class='add'>+		run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='add'>+		return RESUME_HOST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Emulate the load */</div><div class='add'>+	er = kvm_mips_emulate_load(inst, cause, run, vcpu);</div><div class='add'>+	if (er == EMULATE_FAIL) {</div><div class='add'>+		kvm_err("Emulate load from MMIO space failed\n");</div><div class='add'>+		run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='add'>+	} else {</div><div class='add'>+		run-&gt;exit_reason = KVM_EXIT_MMIO;</div><div class='add'>+	}</div><div class='add'>+	return RESUME_HOST;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvm_mips_bad_store(u32 cause, u32 *opc, struct kvm_run *run,</div><div class='add'>+			      struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	enum emulation_result er;</div><div class='add'>+	union mips_instruction inst;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Fetch the instruction. */</div><div class='add'>+	if (cause &amp; CAUSEF_BD)</div><div class='add'>+		opc += 1;</div><div class='add'>+	err = kvm_get_badinstr(opc, vcpu, &amp;inst.word);</div><div class='add'>+	if (err) {</div><div class='add'>+		run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='add'>+		return RESUME_HOST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Emulate the store */</div><div class='add'>+	er = kvm_mips_emulate_store(inst, cause, run, vcpu);</div><div class='add'>+	if (er == EMULATE_FAIL) {</div><div class='add'>+		kvm_err("Emulate store to MMIO space failed\n");</div><div class='add'>+		run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='add'>+	} else {</div><div class='add'>+		run-&gt;exit_reason = KVM_EXIT_MMIO;</div><div class='add'>+	}</div><div class='add'>+	return RESUME_HOST;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvm_mips_bad_access(u32 cause, u32 *opc, struct kvm_run *run,</div><div class='add'>+			       struct kvm_vcpu *vcpu, bool store)</div><div class='add'>+{</div><div class='add'>+	if (store)</div><div class='add'>+		return kvm_mips_bad_store(cause, opc, run, vcpu);</div><div class='add'>+	else</div><div class='add'>+		return kvm_mips_bad_load(cause, opc, run, vcpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int kvm_trap_emul_handle_tlb_mod(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='add'>+	struct mips_coproc *cop0 = vcpu-&gt;arch.cop0;</div><div class='ctx'> 	struct kvm_run *run = vcpu-&gt;run;</div><div class='ctx'> 	u32 __user *opc = (u32 __user *) vcpu-&gt;arch.pc;</div><div class='ctx'> 	unsigned long badvaddr = vcpu-&gt;arch.host_cp0_badvaddr;</div><div class='ctx'> 	u32 cause = vcpu-&gt;arch.host_cp0_cause;</div><div class='del'>-	enum emulation_result er = EMULATE_DONE;</div><div class='del'>-	int ret = RESUME_GUEST;</div><div class='add'>+	struct kvm_mips_tlb *tlb;</div><div class='add'>+	unsigned long entryhi;</div><div class='add'>+	int index;</div><div class='ctx'> </div><div class='ctx'> 	if (KVM_GUEST_KSEGX(badvaddr) &lt; KVM_GUEST_KSEG0</div><div class='ctx'> 	    || KVM_GUEST_KSEGX(badvaddr) == KVM_GUEST_KSEG23) {</div><div class='del'>-		kvm_debug("USER/KSEG23 ADDR TLB MOD fault: cause %#x, PC: %p, BadVaddr: %#lx\n",</div><div class='del'>-			  cause, opc, badvaddr);</div><div class='del'>-		er = kvm_mips_handle_tlbmod(cause, opc, run, vcpu);</div><div class='add'>+		/*</div><div class='add'>+		 * First find the mapping in the guest TLB. If the failure to</div><div class='add'>+		 * write was due to the guest TLB, it should be up to the guest</div><div class='add'>+		 * to handle it.</div><div class='add'>+		 */</div><div class='add'>+		entryhi = (badvaddr &amp; VPN2_MASK) |</div><div class='add'>+			  (kvm_read_c0_guest_entryhi(cop0) &amp; KVM_ENTRYHI_ASID);</div><div class='add'>+		index = kvm_mips_guest_tlb_lookup(vcpu, entryhi);</div><div class='ctx'> </div><div class='del'>-		if (er == EMULATE_DONE)</div><div class='del'>-			ret = RESUME_GUEST;</div><div class='del'>-		else {</div><div class='add'>+		/*</div><div class='add'>+		 * These should never happen.</div><div class='add'>+		 * They would indicate stale host TLB entries.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(index &lt; 0)) {</div><div class='ctx'> 			run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='del'>-			ret = RESUME_HOST;</div><div class='add'>+			return RESUME_HOST;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (KVM_GUEST_KSEGX(badvaddr) == KVM_GUEST_KSEG0) {</div><div class='add'>+		tlb = vcpu-&gt;arch.guest_tlb + index;</div><div class='add'>+		if (unlikely(!TLB_IS_VALID(*tlb, badvaddr))) {</div><div class='add'>+			run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='add'>+			return RESUME_HOST;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='del'>-		 * XXXKYMA: The guest kernel does not expect to get this fault</div><div class='del'>-		 * when we are not using HIGHMEM. Need to address this in a</div><div class='del'>-		 * HIGHMEM kernel</div><div class='add'>+		 * Guest entry not dirty? That would explain the TLB modified</div><div class='add'>+		 * exception. Relay that on to the guest so it can handle it.</div><div class='ctx'> 		 */</div><div class='del'>-		kvm_err("TLB MOD fault not handled, cause %#x, PC: %p, BadVaddr: %#lx\n",</div><div class='del'>-			cause, opc, badvaddr);</div><div class='del'>-		kvm_mips_dump_host_tlbs();</div><div class='del'>-		kvm_arch_vcpu_dump_regs(vcpu);</div><div class='del'>-		run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='del'>-		ret = RESUME_HOST;</div><div class='add'>+		if (!TLB_IS_DIRTY(*tlb, badvaddr)) {</div><div class='add'>+			kvm_mips_emulate_tlbmod(cause, opc, run, vcpu);</div><div class='add'>+			return RESUME_GUEST;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb, badvaddr,</div><div class='add'>+							 true))</div><div class='add'>+			/* Not writable, needs handling as MMIO */</div><div class='add'>+			return kvm_mips_bad_store(cause, opc, run, vcpu);</div><div class='add'>+		return RESUME_GUEST;</div><div class='add'>+	} else if (KVM_GUEST_KSEGX(badvaddr) == KVM_GUEST_KSEG0) {</div><div class='add'>+		if (kvm_mips_handle_kseg0_tlb_fault(badvaddr, vcpu, true) &lt; 0)</div><div class='add'>+			/* Not writable, needs handling as MMIO */</div><div class='add'>+			return kvm_mips_bad_store(cause, opc, run, vcpu);</div><div class='add'>+		return RESUME_GUEST;</div><div class='ctx'> 	} else {</div><div class='del'>-		kvm_err("Illegal TLB Mod fault address , cause %#x, PC: %p, BadVaddr: %#lx\n",</div><div class='del'>-			cause, opc, badvaddr);</div><div class='del'>-		kvm_mips_dump_host_tlbs();</div><div class='del'>-		kvm_arch_vcpu_dump_regs(vcpu);</div><div class='del'>-		run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='del'>-		ret = RESUME_HOST;</div><div class='add'>+		/* host kernel addresses are all handled as MMIO */</div><div class='add'>+		return kvm_mips_bad_store(cause, opc, run, vcpu);</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvm_trap_emul_handle_tlb_miss(struct kvm_vcpu *vcpu, bool store)</div><div class='hunk'>@@ -157,7 +248,7 @@ static int kvm_trap_emul_handle_tlb_miss(struct kvm_vcpu *vcpu, bool store)</div><div class='ctx'> 		 *     into the shadow host TLB</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		er = kvm_mips_handle_tlbmiss(cause, opc, run, vcpu);</div><div class='add'>+		er = kvm_mips_handle_tlbmiss(cause, opc, run, vcpu, store);</div><div class='ctx'> 		if (er == EMULATE_DONE)</div><div class='ctx'> 			ret = RESUME_GUEST;</div><div class='ctx'> 		else {</div><div class='hunk'>@@ -169,29 +260,15 @@ static int kvm_trap_emul_handle_tlb_miss(struct kvm_vcpu *vcpu, bool store)</div><div class='ctx'> 		 * All KSEG0 faults are handled by KVM, as the guest kernel does</div><div class='ctx'> 		 * not expect to ever get them</div><div class='ctx'> 		 */</div><div class='del'>-		if (kvm_mips_handle_kseg0_tlb_fault</div><div class='del'>-		    (vcpu-&gt;arch.host_cp0_badvaddr, vcpu) &lt; 0) {</div><div class='del'>-			run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='del'>-			ret = RESUME_HOST;</div><div class='del'>-		}</div><div class='add'>+		if (kvm_mips_handle_kseg0_tlb_fault(badvaddr, vcpu, store) &lt; 0)</div><div class='add'>+			ret = kvm_mips_bad_access(cause, opc, run, vcpu, store);</div><div class='ctx'> 	} else if (KVM_GUEST_KERNEL_MODE(vcpu)</div><div class='ctx'> 		   &amp;&amp; (KSEGX(badvaddr) == CKSEG0 || KSEGX(badvaddr) == CKSEG1)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * With EVA we may get a TLB exception instead of an address</div><div class='ctx'> 		 * error when the guest performs MMIO to KSeg1 addresses.</div><div class='ctx'> 		 */</div><div class='del'>-		kvm_debug("Emulate %s MMIO space\n",</div><div class='del'>-			  store ? "Store to" : "Load from");</div><div class='del'>-		er = kvm_mips_emulate_inst(cause, opc, run, vcpu);</div><div class='del'>-		if (er == EMULATE_FAIL) {</div><div class='del'>-			kvm_err("Emulate %s MMIO space failed\n",</div><div class='del'>-				store ? "Store to" : "Load from");</div><div class='del'>-			run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='del'>-			ret = RESUME_HOST;</div><div class='del'>-		} else {</div><div class='del'>-			run-&gt;exit_reason = KVM_EXIT_MMIO;</div><div class='del'>-			ret = RESUME_HOST;</div><div class='del'>-		}</div><div class='add'>+		ret = kvm_mips_bad_access(cause, opc, run, vcpu, store);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_err("Illegal TLB %s fault address , cause %#x, PC: %p, BadVaddr: %#lx\n",</div><div class='ctx'> 			store ? "ST" : "LD", cause, opc, badvaddr);</div><div class='hunk'>@@ -219,21 +296,11 @@ static int kvm_trap_emul_handle_addr_err_st(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u32 __user *opc = (u32 __user *) vcpu-&gt;arch.pc;</div><div class='ctx'> 	unsigned long badvaddr = vcpu-&gt;arch.host_cp0_badvaddr;</div><div class='ctx'> 	u32 cause = vcpu-&gt;arch.host_cp0_cause;</div><div class='del'>-	enum emulation_result er = EMULATE_DONE;</div><div class='ctx'> 	int ret = RESUME_GUEST;</div><div class='ctx'> </div><div class='ctx'> 	if (KVM_GUEST_KERNEL_MODE(vcpu)</div><div class='ctx'> 	    &amp;&amp; (KSEGX(badvaddr) == CKSEG0 || KSEGX(badvaddr) == CKSEG1)) {</div><div class='del'>-		kvm_debug("Emulate Store to MMIO space\n");</div><div class='del'>-		er = kvm_mips_emulate_inst(cause, opc, run, vcpu);</div><div class='del'>-		if (er == EMULATE_FAIL) {</div><div class='del'>-			kvm_err("Emulate Store to MMIO space failed\n");</div><div class='del'>-			run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='del'>-			ret = RESUME_HOST;</div><div class='del'>-		} else {</div><div class='del'>-			run-&gt;exit_reason = KVM_EXIT_MMIO;</div><div class='del'>-			ret = RESUME_HOST;</div><div class='del'>-		}</div><div class='add'>+		ret = kvm_mips_bad_store(cause, opc, run, vcpu);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_err("Address Error (STORE): cause %#x, PC: %p, BadVaddr: %#lx\n",</div><div class='ctx'> 			cause, opc, badvaddr);</div><div class='hunk'>@@ -249,26 +316,15 @@ static int kvm_trap_emul_handle_addr_err_ld(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u32 __user *opc = (u32 __user *) vcpu-&gt;arch.pc;</div><div class='ctx'> 	unsigned long badvaddr = vcpu-&gt;arch.host_cp0_badvaddr;</div><div class='ctx'> 	u32 cause = vcpu-&gt;arch.host_cp0_cause;</div><div class='del'>-	enum emulation_result er = EMULATE_DONE;</div><div class='ctx'> 	int ret = RESUME_GUEST;</div><div class='ctx'> </div><div class='ctx'> 	if (KSEGX(badvaddr) == CKSEG0 || KSEGX(badvaddr) == CKSEG1) {</div><div class='del'>-		kvm_debug("Emulate Load from MMIO space @ %#lx\n", badvaddr);</div><div class='del'>-		er = kvm_mips_emulate_inst(cause, opc, run, vcpu);</div><div class='del'>-		if (er == EMULATE_FAIL) {</div><div class='del'>-			kvm_err("Emulate Load from MMIO space failed\n");</div><div class='del'>-			run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='del'>-			ret = RESUME_HOST;</div><div class='del'>-		} else {</div><div class='del'>-			run-&gt;exit_reason = KVM_EXIT_MMIO;</div><div class='del'>-			ret = RESUME_HOST;</div><div class='del'>-		}</div><div class='add'>+		ret = kvm_mips_bad_load(cause, opc, run, vcpu);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_err("Address Error (LOAD): cause %#x, PC: %p, BadVaddr: %#lx\n",</div><div class='ctx'> 			cause, opc, badvaddr);</div><div class='ctx'> 		run-&gt;exit_reason = KVM_EXIT_INTERNAL_ERROR;</div><div class='ctx'> 		ret = RESUME_HOST;</div><div class='del'>-		er = EMULATE_FAIL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -428,16 +484,75 @@ static int kvm_trap_emul_handle_msa_disabled(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_trap_emul_vm_init(struct kvm *kvm)</div><div class='add'>+static int kvm_trap_emul_vcpu_init(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='add'>+	struct mm_struct *kern_mm = &amp;vcpu-&gt;arch.guest_kernel_mm;</div><div class='add'>+	struct mm_struct *user_mm = &amp;vcpu-&gt;arch.guest_user_mm;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate GVA -&gt; HPA page tables.</div><div class='add'>+	 * MIPS doesn't use the mm_struct pointer argument.</div><div class='add'>+	 */</div><div class='add'>+	kern_mm-&gt;pgd = pgd_alloc(kern_mm);</div><div class='add'>+	if (!kern_mm-&gt;pgd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	user_mm-&gt;pgd = pgd_alloc(user_mm);</div><div class='add'>+	if (!user_mm-&gt;pgd) {</div><div class='add'>+		pgd_free(kern_mm, kern_mm-&gt;pgd);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_trap_emul_vcpu_init(struct kvm_vcpu *vcpu)</div><div class='add'>+static void kvm_mips_emul_free_gva_pt(pgd_t *pgd)</div><div class='ctx'> {</div><div class='del'>-	vcpu-&gt;arch.kscratch_enabled = 0xfc;</div><div class='add'>+	/* Don't free host kernel page tables copied from init_mm.pgd */</div><div class='add'>+	const unsigned long end = 0x80000000;</div><div class='add'>+	unsigned long pgd_va, pud_va, pmd_va;</div><div class='add'>+	pud_t *pud;</div><div class='add'>+	pmd_t *pmd;</div><div class='add'>+	pte_t *pte;</div><div class='add'>+	int i, j, k;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; USER_PTRS_PER_PGD; i++) {</div><div class='add'>+		if (pgd_none(pgd[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pgd_va = (unsigned long)i &lt;&lt; PGDIR_SHIFT;</div><div class='add'>+		if (pgd_va &gt;= end)</div><div class='add'>+			break;</div><div class='add'>+		pud = pud_offset(pgd + i, 0);</div><div class='add'>+		for (j = 0; j &lt; PTRS_PER_PUD; j++) {</div><div class='add'>+			if (pud_none(pud[j]))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			pud_va = pgd_va | ((unsigned long)j &lt;&lt; PUD_SHIFT);</div><div class='add'>+			if (pud_va &gt;= end)</div><div class='add'>+				break;</div><div class='add'>+			pmd = pmd_offset(pud + j, 0);</div><div class='add'>+			for (k = 0; k &lt; PTRS_PER_PMD; k++) {</div><div class='add'>+				if (pmd_none(pmd[k]))</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				pmd_va = pud_va | (k &lt;&lt; PMD_SHIFT);</div><div class='add'>+				if (pmd_va &gt;= end)</div><div class='add'>+					break;</div><div class='add'>+				pte = pte_offset(pmd + k, 0);</div><div class='add'>+				pte_free_kernel(NULL, pte);</div><div class='add'>+			}</div><div class='add'>+			pmd_free(NULL, pmd);</div><div class='add'>+		}</div><div class='add'>+		pud_free(NULL, pud);</div><div class='add'>+	}</div><div class='add'>+	pgd_free(NULL, pgd);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static void kvm_trap_emul_vcpu_uninit(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	kvm_mips_emul_free_gva_pt(vcpu-&gt;arch.guest_kernel_mm.pgd);</div><div class='add'>+	kvm_mips_emul_free_gva_pt(vcpu-&gt;arch.guest_user_mm.pgd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvm_trap_emul_vcpu_setup(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -499,6 +614,9 @@ static int kvm_trap_emul_vcpu_setup(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	/* Set Wait IE/IXMT Ignore in Config7, IAR, AR */</div><div class='ctx'> 	kvm_write_c0_guest_config7(cop0, (MIPS_CONF7_WII) | (1 &lt;&lt; 10));</div><div class='ctx'> </div><div class='add'>+	/* Status */</div><div class='add'>+	kvm_write_c0_guest_status(cop0, ST0_BEV | ST0_ERL);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup IntCtl defaults, compatibility mode for timer interrupts (HW5)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -508,17 +626,76 @@ static int kvm_trap_emul_vcpu_setup(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	kvm_write_c0_guest_ebase(cop0, KVM_GUEST_KSEG0 |</div><div class='ctx'> 				       (vcpu_id &amp; MIPS_EBASE_CPUNUM));</div><div class='ctx'> </div><div class='add'>+	/* Put PC at guest reset vector */</div><div class='add'>+	vcpu-&gt;arch.pc = KVM_GUEST_CKSEG1ADDR(0x1fc00000);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvm_trap_emul_flush_shadow_all(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	/* Flush GVA page tables and invalidate GVA ASIDs on all VCPUs */</div><div class='add'>+	kvm_flush_remote_tlbs(kvm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvm_trap_emul_flush_shadow_memslot(struct kvm *kvm,</div><div class='add'>+					const struct kvm_memory_slot *slot)</div><div class='add'>+{</div><div class='add'>+	kvm_trap_emul_flush_shadow_all(kvm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 kvm_trap_emul_get_one_regs[] = {</div><div class='add'>+	KVM_REG_MIPS_CP0_INDEX,</div><div class='add'>+	KVM_REG_MIPS_CP0_ENTRYLO0,</div><div class='add'>+	KVM_REG_MIPS_CP0_ENTRYLO1,</div><div class='add'>+	KVM_REG_MIPS_CP0_CONTEXT,</div><div class='add'>+	KVM_REG_MIPS_CP0_USERLOCAL,</div><div class='add'>+	KVM_REG_MIPS_CP0_PAGEMASK,</div><div class='add'>+	KVM_REG_MIPS_CP0_WIRED,</div><div class='add'>+	KVM_REG_MIPS_CP0_HWRENA,</div><div class='add'>+	KVM_REG_MIPS_CP0_BADVADDR,</div><div class='add'>+	KVM_REG_MIPS_CP0_COUNT,</div><div class='add'>+	KVM_REG_MIPS_CP0_ENTRYHI,</div><div class='add'>+	KVM_REG_MIPS_CP0_COMPARE,</div><div class='add'>+	KVM_REG_MIPS_CP0_STATUS,</div><div class='add'>+	KVM_REG_MIPS_CP0_INTCTL,</div><div class='add'>+	KVM_REG_MIPS_CP0_CAUSE,</div><div class='add'>+	KVM_REG_MIPS_CP0_EPC,</div><div class='add'>+	KVM_REG_MIPS_CP0_PRID,</div><div class='add'>+	KVM_REG_MIPS_CP0_EBASE,</div><div class='add'>+	KVM_REG_MIPS_CP0_CONFIG,</div><div class='add'>+	KVM_REG_MIPS_CP0_CONFIG1,</div><div class='add'>+	KVM_REG_MIPS_CP0_CONFIG2,</div><div class='add'>+	KVM_REG_MIPS_CP0_CONFIG3,</div><div class='add'>+	KVM_REG_MIPS_CP0_CONFIG4,</div><div class='add'>+	KVM_REG_MIPS_CP0_CONFIG5,</div><div class='add'>+	KVM_REG_MIPS_CP0_CONFIG7,</div><div class='add'>+	KVM_REG_MIPS_CP0_ERROREPC,</div><div class='add'>+	KVM_REG_MIPS_CP0_KSCRATCH1,</div><div class='add'>+	KVM_REG_MIPS_CP0_KSCRATCH2,</div><div class='add'>+	KVM_REG_MIPS_CP0_KSCRATCH3,</div><div class='add'>+	KVM_REG_MIPS_CP0_KSCRATCH4,</div><div class='add'>+	KVM_REG_MIPS_CP0_KSCRATCH5,</div><div class='add'>+	KVM_REG_MIPS_CP0_KSCRATCH6,</div><div class='add'>+</div><div class='add'>+	KVM_REG_MIPS_COUNT_CTL,</div><div class='add'>+	KVM_REG_MIPS_COUNT_RESUME,</div><div class='add'>+	KVM_REG_MIPS_COUNT_HZ,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static unsigned long kvm_trap_emul_num_regs(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return ARRAY_SIZE(kvm_trap_emul_get_one_regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvm_trap_emul_copy_reg_indices(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					  u64 __user *indices)</div><div class='ctx'> {</div><div class='add'>+	if (copy_to_user(indices, kvm_trap_emul_get_one_regs,</div><div class='add'>+			 sizeof(kvm_trap_emul_get_one_regs)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	indices += ARRAY_SIZE(kvm_trap_emul_get_one_regs);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -526,7 +703,81 @@ static int kvm_trap_emul_get_one_reg(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				     const struct kvm_one_reg *reg,</div><div class='ctx'> 				     s64 *v)</div><div class='ctx'> {</div><div class='add'>+	struct mips_coproc *cop0 = vcpu-&gt;arch.cop0;</div><div class='add'>+</div><div class='ctx'> 	switch (reg-&gt;id) {</div><div class='add'>+	case KVM_REG_MIPS_CP0_INDEX:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_index(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_ENTRYLO0:</div><div class='add'>+		*v = kvm_read_c0_guest_entrylo0(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_ENTRYLO1:</div><div class='add'>+		*v = kvm_read_c0_guest_entrylo1(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_CONTEXT:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_context(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_USERLOCAL:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_userlocal(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_PAGEMASK:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_pagemask(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_WIRED:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_wired(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_HWRENA:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_hwrena(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_BADVADDR:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_badvaddr(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_ENTRYHI:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_entryhi(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_COMPARE:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_compare(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_STATUS:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_status(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_INTCTL:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_intctl(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_CAUSE:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_cause(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_EPC:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_epc(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_PRID:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_prid(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_EBASE:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_ebase(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_CONFIG:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_config(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_CONFIG1:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_config1(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_CONFIG2:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_config2(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_CONFIG3:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_config3(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_CONFIG4:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_config4(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_CONFIG5:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_config5(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_CONFIG7:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_config7(cop0);</div><div class='add'>+		break;</div><div class='ctx'> 	case KVM_REG_MIPS_CP0_COUNT:</div><div class='ctx'> 		*v = kvm_mips_read_count(vcpu);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -539,6 +790,27 @@ static int kvm_trap_emul_get_one_reg(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	case KVM_REG_MIPS_COUNT_HZ:</div><div class='ctx'> 		*v = vcpu-&gt;arch.count_hz;</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_ERROREPC:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_errorepc(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH1:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_kscratch1(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH2:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_kscratch2(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH3:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_kscratch3(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH4:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_kscratch4(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH5:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_kscratch5(cop0);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH6:</div><div class='add'>+		*v = (long)kvm_read_c0_guest_kscratch6(cop0);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -554,6 +826,56 @@ static int kvm_trap_emul_set_one_reg(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	unsigned int cur, change;</div><div class='ctx'> </div><div class='ctx'> 	switch (reg-&gt;id) {</div><div class='add'>+	case KVM_REG_MIPS_CP0_INDEX:</div><div class='add'>+		kvm_write_c0_guest_index(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_ENTRYLO0:</div><div class='add'>+		kvm_write_c0_guest_entrylo0(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_ENTRYLO1:</div><div class='add'>+		kvm_write_c0_guest_entrylo1(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_CONTEXT:</div><div class='add'>+		kvm_write_c0_guest_context(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_USERLOCAL:</div><div class='add'>+		kvm_write_c0_guest_userlocal(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_PAGEMASK:</div><div class='add'>+		kvm_write_c0_guest_pagemask(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_WIRED:</div><div class='add'>+		kvm_write_c0_guest_wired(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_HWRENA:</div><div class='add'>+		kvm_write_c0_guest_hwrena(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_BADVADDR:</div><div class='add'>+		kvm_write_c0_guest_badvaddr(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_ENTRYHI:</div><div class='add'>+		kvm_write_c0_guest_entryhi(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_STATUS:</div><div class='add'>+		kvm_write_c0_guest_status(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_INTCTL:</div><div class='add'>+		/* No VInt, so no VS, read-only for now */</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_EPC:</div><div class='add'>+		kvm_write_c0_guest_epc(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_PRID:</div><div class='add'>+		kvm_write_c0_guest_prid(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_EBASE:</div><div class='add'>+		/*</div><div class='add'>+		 * Allow core number to be written, but the exception base must</div><div class='add'>+		 * remain in guest KSeg0.</div><div class='add'>+		 */</div><div class='add'>+		kvm_change_c0_guest_ebase(cop0, 0x1ffff000 | MIPS_EBASE_CPUNUM,</div><div class='add'>+					  v);</div><div class='add'>+		break;</div><div class='ctx'> 	case KVM_REG_MIPS_CP0_COUNT:</div><div class='ctx'> 		kvm_mips_write_count(vcpu, v);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -618,6 +940,9 @@ static int kvm_trap_emul_set_one_reg(struct kvm_vcpu *vcpu,</div><div class='ctx'> 			kvm_write_c0_guest_config5(cop0, v);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_CONFIG7:</div><div class='add'>+		/* writes ignored */</div><div class='add'>+		break;</div><div class='ctx'> 	case KVM_REG_MIPS_COUNT_CTL:</div><div class='ctx'> 		ret = kvm_mips_set_count_ctl(vcpu, v);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -627,24 +952,269 @@ static int kvm_trap_emul_set_one_reg(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	case KVM_REG_MIPS_COUNT_HZ:</div><div class='ctx'> 		ret = kvm_mips_set_count_hz(vcpu, v);</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_ERROREPC:</div><div class='add'>+		kvm_write_c0_guest_errorepc(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH1:</div><div class='add'>+		kvm_write_c0_guest_kscratch1(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH2:</div><div class='add'>+		kvm_write_c0_guest_kscratch2(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH3:</div><div class='add'>+		kvm_write_c0_guest_kscratch3(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH4:</div><div class='add'>+		kvm_write_c0_guest_kscratch4(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH5:</div><div class='add'>+		kvm_write_c0_guest_kscratch5(cop0, v);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_MIPS_CP0_KSCRATCH6:</div><div class='add'>+		kvm_write_c0_guest_kscratch6(cop0, v);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_trap_emul_vcpu_get_regs(struct kvm_vcpu *vcpu)</div><div class='add'>+static int kvm_trap_emul_vcpu_load(struct kvm_vcpu *vcpu, int cpu)</div><div class='ctx'> {</div><div class='del'>-	kvm_lose_fpu(vcpu);</div><div class='add'>+	struct mm_struct *kern_mm = &amp;vcpu-&gt;arch.guest_kernel_mm;</div><div class='add'>+	struct mm_struct *user_mm = &amp;vcpu-&gt;arch.guest_user_mm;</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Were we in guest context? If so, restore the appropriate ASID based</div><div class='add'>+	 * on the mode of the Guest (Kernel/User).</div><div class='add'>+	 */</div><div class='add'>+	if (current-&gt;flags &amp; PF_VCPU) {</div><div class='add'>+		mm = KVM_GUEST_KERNEL_MODE(vcpu) ? kern_mm : user_mm;</div><div class='add'>+		if ((cpu_context(cpu, mm) ^ asid_cache(cpu)) &amp;</div><div class='add'>+		    asid_version_mask(cpu))</div><div class='add'>+			get_new_mmu_context(mm, cpu);</div><div class='add'>+		write_c0_entryhi(cpu_asid(cpu, mm));</div><div class='add'>+		TLBMISS_HANDLER_SETUP_PGD(mm-&gt;pgd);</div><div class='add'>+		kvm_mips_suspend_mm(cpu);</div><div class='add'>+		ehb();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_trap_emul_vcpu_set_regs(struct kvm_vcpu *vcpu)</div><div class='add'>+static int kvm_trap_emul_vcpu_put(struct kvm_vcpu *vcpu, int cpu)</div><div class='ctx'> {</div><div class='add'>+	kvm_lose_fpu(vcpu);</div><div class='add'>+</div><div class='add'>+	if (current-&gt;flags &amp; PF_VCPU) {</div><div class='add'>+		/* Restore normal Linux process memory map */</div><div class='add'>+		if (((cpu_context(cpu, current-&gt;mm) ^ asid_cache(cpu)) &amp;</div><div class='add'>+		     asid_version_mask(cpu)))</div><div class='add'>+			get_new_mmu_context(current-&gt;mm, cpu);</div><div class='add'>+		write_c0_entryhi(cpu_asid(cpu, current-&gt;mm));</div><div class='add'>+		TLBMISS_HANDLER_SETUP_PGD(current-&gt;mm-&gt;pgd);</div><div class='add'>+		kvm_mips_resume_mm(cpu);</div><div class='add'>+		ehb();</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvm_trap_emul_check_requests(struct kvm_vcpu *vcpu, int cpu,</div><div class='add'>+					 bool reload_asid)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *kern_mm = &amp;vcpu-&gt;arch.guest_kernel_mm;</div><div class='add'>+	struct mm_struct *user_mm = &amp;vcpu-&gt;arch.guest_user_mm;</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (likely(!vcpu-&gt;requests))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Both kernel &amp; user GVA mappings must be invalidated. The</div><div class='add'>+		 * caller is just about to check whether the ASID is stale</div><div class='add'>+		 * anyway so no need to reload it here.</div><div class='add'>+		 */</div><div class='add'>+		kvm_mips_flush_gva_pt(kern_mm-&gt;pgd, KMF_GPA | KMF_KERN);</div><div class='add'>+		kvm_mips_flush_gva_pt(user_mm-&gt;pgd, KMF_GPA | KMF_USER);</div><div class='add'>+		for_each_possible_cpu(i) {</div><div class='add'>+			cpu_context(i, kern_mm) = 0;</div><div class='add'>+			cpu_context(i, user_mm) = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Generate new ASID for current mode */</div><div class='add'>+		if (reload_asid) {</div><div class='add'>+			mm = KVM_GUEST_KERNEL_MODE(vcpu) ? kern_mm : user_mm;</div><div class='add'>+			get_new_mmu_context(mm, cpu);</div><div class='add'>+			htw_stop();</div><div class='add'>+			write_c0_entryhi(cpu_asid(cpu, mm));</div><div class='add'>+			TLBMISS_HANDLER_SETUP_PGD(mm-&gt;pgd);</div><div class='add'>+			htw_start();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_trap_emul_gva_lockless_begin() - Begin lockless access to GVA space.</div><div class='add'>+ * @vcpu:	VCPU pointer.</div><div class='add'>+ *</div><div class='add'>+ * Call before a GVA space access outside of guest mode, to ensure that</div><div class='add'>+ * asynchronous TLB flush requests are handled or delayed until completion of</div><div class='add'>+ * the GVA access (as indicated by a matching kvm_trap_emul_gva_lockless_end()).</div><div class='add'>+ *</div><div class='add'>+ * Should be called with IRQs already enabled.</div><div class='add'>+ */</div><div class='add'>+void kvm_trap_emul_gva_lockless_begin(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	/* We re-enable IRQs in kvm_trap_emul_gva_lockless_end() */</div><div class='add'>+	WARN_ON_ONCE(irqs_disabled());</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The caller is about to access the GVA space, so we set the mode to</div><div class='add'>+	 * force TLB flush requests to send an IPI, and also disable IRQs to</div><div class='add'>+	 * delay IPI handling until kvm_trap_emul_gva_lockless_end().</div><div class='add'>+	 */</div><div class='add'>+	local_irq_disable();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the read of VCPU requests is not reordered ahead of the</div><div class='add'>+	 * write to vcpu-&gt;mode, or we could miss a TLB flush request while</div><div class='add'>+	 * the requester sees the VCPU as outside of guest mode and not needing</div><div class='add'>+	 * an IPI.</div><div class='add'>+	 */</div><div class='add'>+	smp_store_mb(vcpu-&gt;mode, READING_SHADOW_PAGE_TABLES);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If a TLB flush has been requested (potentially while</div><div class='add'>+	 * OUTSIDE_GUEST_MODE and assumed immediately effective), perform it</div><div class='add'>+	 * before accessing the GVA space, and be sure to reload the ASID if</div><div class='add'>+	 * necessary as it'll be immediately used.</div><div class='add'>+	 *</div><div class='add'>+	 * TLB flush requests after this check will trigger an IPI due to the</div><div class='add'>+	 * mode change above, which will be delayed due to IRQs disabled.</div><div class='add'>+	 */</div><div class='add'>+	kvm_trap_emul_check_requests(vcpu, smp_processor_id(), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kvm_trap_emul_gva_lockless_end() - End lockless access to GVA space.</div><div class='add'>+ * @vcpu:	VCPU pointer.</div><div class='add'>+ *</div><div class='add'>+ * Called after a GVA space access outside of guest mode. Should have a matching</div><div class='add'>+ * call to kvm_trap_emul_gva_lockless_begin().</div><div class='add'>+ */</div><div class='add'>+void kvm_trap_emul_gva_lockless_end(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the write to vcpu-&gt;mode is not reordered in front of GVA</div><div class='add'>+	 * accesses, or a TLB flush requester may not think it necessary to send</div><div class='add'>+	 * an IPI.</div><div class='add'>+	 */</div><div class='add'>+	smp_store_release(&amp;vcpu-&gt;mode, OUTSIDE_GUEST_MODE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now that the access to GVA space is complete, its safe for pending</div><div class='add'>+	 * TLB flush request IPIs to be handled (which indicates completion).</div><div class='add'>+	 */</div><div class='add'>+	local_irq_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvm_trap_emul_vcpu_reenter(struct kvm_run *run,</div><div class='add'>+				       struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *kern_mm = &amp;vcpu-&gt;arch.guest_kernel_mm;</div><div class='add'>+	struct mm_struct *user_mm = &amp;vcpu-&gt;arch.guest_user_mm;</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+	struct mips_coproc *cop0 = vcpu-&gt;arch.cop0;</div><div class='add'>+	int i, cpu = smp_processor_id();</div><div class='add'>+	unsigned int gasid;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No need to reload ASID, IRQs are disabled already so there's no rush,</div><div class='add'>+	 * and we'll check if we need to regenerate below anyway before</div><div class='add'>+	 * re-entering the guest.</div><div class='add'>+	 */</div><div class='add'>+	kvm_trap_emul_check_requests(vcpu, cpu, false);</div><div class='add'>+</div><div class='add'>+	if (KVM_GUEST_KERNEL_MODE(vcpu)) {</div><div class='add'>+		mm = kern_mm;</div><div class='add'>+	} else {</div><div class='add'>+		mm = user_mm;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Lazy host ASID regeneration / PT flush for guest user mode.</div><div class='add'>+		 * If the guest ASID has changed since the last guest usermode</div><div class='add'>+		 * execution, invalidate the stale TLB entries and flush GVA PT</div><div class='add'>+		 * entries too.</div><div class='add'>+		 */</div><div class='add'>+		gasid = kvm_read_c0_guest_entryhi(cop0) &amp; KVM_ENTRYHI_ASID;</div><div class='add'>+		if (gasid != vcpu-&gt;arch.last_user_gasid) {</div><div class='add'>+			kvm_mips_flush_gva_pt(user_mm-&gt;pgd, KMF_USER);</div><div class='add'>+			for_each_possible_cpu(i)</div><div class='add'>+				cpu_context(i, user_mm) = 0;</div><div class='add'>+			vcpu-&gt;arch.last_user_gasid = gasid;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if ASID is stale. This may happen due to a TLB flush request or</div><div class='add'>+	 * a lazy user MM invalidation.</div><div class='add'>+	 */</div><div class='add'>+	if ((cpu_context(cpu, mm) ^ asid_cache(cpu)) &amp;</div><div class='add'>+	    asid_version_mask(cpu))</div><div class='add'>+		get_new_mmu_context(mm, cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvm_trap_emul_vcpu_run(struct kvm_run *run, struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	/* Check if we have any exceptions/interrupts pending */</div><div class='add'>+	kvm_mips_deliver_interrupts(vcpu,</div><div class='add'>+				    kvm_read_c0_guest_cause(vcpu-&gt;arch.cop0));</div><div class='add'>+</div><div class='add'>+	kvm_trap_emul_vcpu_reenter(run, vcpu);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We use user accessors to access guest memory, but we don't want to</div><div class='add'>+	 * invoke Linux page faulting.</div><div class='add'>+	 */</div><div class='add'>+	pagefault_disable();</div><div class='add'>+</div><div class='add'>+	/* Disable hardware page table walking while in guest */</div><div class='add'>+	htw_stop();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * While in guest context we're in the guest's address space, not the</div><div class='add'>+	 * host process address space, so we need to be careful not to confuse</div><div class='add'>+	 * e.g. cache management IPIs.</div><div class='add'>+	 */</div><div class='add'>+	kvm_mips_suspend_mm(cpu);</div><div class='add'>+</div><div class='add'>+	r = vcpu-&gt;arch.vcpu_run(run, vcpu);</div><div class='add'>+</div><div class='add'>+	/* We may have migrated while handling guest exits */</div><div class='add'>+	cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	/* Restore normal Linux process memory map */</div><div class='add'>+	if (((cpu_context(cpu, current-&gt;mm) ^ asid_cache(cpu)) &amp;</div><div class='add'>+	     asid_version_mask(cpu)))</div><div class='add'>+		get_new_mmu_context(current-&gt;mm, cpu);</div><div class='add'>+	write_c0_entryhi(cpu_asid(cpu, current-&gt;mm));</div><div class='add'>+	TLBMISS_HANDLER_SETUP_PGD(current-&gt;mm-&gt;pgd);</div><div class='add'>+	kvm_mips_resume_mm(cpu);</div><div class='add'>+</div><div class='add'>+	htw_start();</div><div class='add'>+</div><div class='add'>+	pagefault_enable();</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct kvm_mips_callbacks kvm_trap_emul_callbacks = {</div><div class='ctx'> 	/* exit handlers */</div><div class='ctx'> 	.handle_cop_unusable = kvm_trap_emul_handle_cop_unusable,</div><div class='hunk'>@@ -661,9 +1231,11 @@ static struct kvm_mips_callbacks kvm_trap_emul_callbacks = {</div><div class='ctx'> 	.handle_fpe = kvm_trap_emul_handle_fpe,</div><div class='ctx'> 	.handle_msa_disabled = kvm_trap_emul_handle_msa_disabled,</div><div class='ctx'> </div><div class='del'>-	.vm_init = kvm_trap_emul_vm_init,</div><div class='ctx'> 	.vcpu_init = kvm_trap_emul_vcpu_init,</div><div class='add'>+	.vcpu_uninit = kvm_trap_emul_vcpu_uninit,</div><div class='ctx'> 	.vcpu_setup = kvm_trap_emul_vcpu_setup,</div><div class='add'>+	.flush_shadow_all = kvm_trap_emul_flush_shadow_all,</div><div class='add'>+	.flush_shadow_memslot = kvm_trap_emul_flush_shadow_memslot,</div><div class='ctx'> 	.gva_to_gpa = kvm_trap_emul_gva_to_gpa_cb,</div><div class='ctx'> 	.queue_timer_int = kvm_mips_queue_timer_int_cb,</div><div class='ctx'> 	.dequeue_timer_int = kvm_mips_dequeue_timer_int_cb,</div><div class='hunk'>@@ -675,8 +1247,10 @@ static struct kvm_mips_callbacks kvm_trap_emul_callbacks = {</div><div class='ctx'> 	.copy_reg_indices = kvm_trap_emul_copy_reg_indices,</div><div class='ctx'> 	.get_one_reg = kvm_trap_emul_get_one_reg,</div><div class='ctx'> 	.set_one_reg = kvm_trap_emul_set_one_reg,</div><div class='del'>-	.vcpu_get_regs = kvm_trap_emul_vcpu_get_regs,</div><div class='del'>-	.vcpu_set_regs = kvm_trap_emul_vcpu_set_regs,</div><div class='add'>+	.vcpu_load = kvm_trap_emul_vcpu_load,</div><div class='add'>+	.vcpu_put = kvm_trap_emul_vcpu_put,</div><div class='add'>+	.vcpu_run = kvm_trap_emul_vcpu_run,</div><div class='add'>+	.vcpu_reenter = kvm_trap_emul_vcpu_reenter,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int kvm_mips_emulation_init(struct kvm_mips_callbacks **install_callbacks)</div><div class='head'>diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c<br/>index 8ac0e5994ed2..0ddf3698b85d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lantiq/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lantiq/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lantiq/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lantiq/irq.c</a></div><div class='hunk'>@@ -269,6 +269,11 @@ static void ltq_hw5_irqdispatch(void)</div><div class='ctx'> DEFINE_HWx_IRQDISPATCH(5)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void ltq_hw_irq_handler(struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	ltq_hw_irqdispatch(irq_desc_get_irq(desc) - 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MIPS_MT_SMP</div><div class='ctx'> void __init arch_init_ipiirq(int irq, struct irqaction *action)</div><div class='ctx'> {</div><div class='hunk'>@@ -313,23 +318,19 @@ static struct irqaction irq_call = {</div><div class='ctx'> asmlinkage void plat_irq_dispatch(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int pending = read_c0_status() &amp; read_c0_cause() &amp; ST0_IM;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	if ((MIPS_CPU_TIMER_IRQ == 7) &amp;&amp; (pending &amp; CAUSEF_IP7)) {</div><div class='del'>-		do_IRQ(MIPS_CPU_TIMER_IRQ);</div><div class='del'>-		goto out;</div><div class='del'>-	} else {</div><div class='del'>-		for (i = 0; i &lt; MAX_IM; i++) {</div><div class='del'>-			if (pending &amp; (CAUSEF_IP2 &lt;&lt; i)) {</div><div class='del'>-				ltq_hw_irqdispatch(i);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	if (!pending) {</div><div class='add'>+		spurious_interrupt();</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	pr_alert("Spurious IRQ: CAUSE=0x%08x\n", read_c0_status());</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return;</div><div class='add'>+	pending &gt;&gt;= CAUSEB_IP;</div><div class='add'>+	while (pending) {</div><div class='add'>+		irq = fls(pending) - 1;</div><div class='add'>+		do_IRQ(MIPS_CPU_IRQ_BASE + irq);</div><div class='add'>+		pending &amp;= ~BIT(irq);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int icu_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)</div><div class='hunk'>@@ -354,11 +355,6 @@ static const struct irq_domain_ops irq_domain_ops = {</div><div class='ctx'> 	.map = icu_map,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct irqaction cascade = {</div><div class='del'>-	.handler = no_action,</div><div class='del'>-	.name = "cascade",</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int __init icu_of_init(struct device_node *node, struct device_node *parent)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *eiu_node;</div><div class='hunk'>@@ -390,7 +386,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)</div><div class='ctx'> 	mips_cpu_irq_init();</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_IM; i++)</div><div class='del'>-		setup_irq(i + 2, &amp;cascade);</div><div class='add'>+		irq_set_chained_handler(i + 2, ltq_hw_irq_handler);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_vint) {</div><div class='ctx'> 		pr_info("Setting up vectored interrupts\n");</div><div class='head'>diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c<br/>index 4cbb000e778e..96773bed8a8a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lantiq/prom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lantiq/prom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lantiq/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lantiq/prom.c</a></div><div class='hunk'>@@ -26,6 +26,12 @@ DEFINE_SPINLOCK(ebu_lock);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ebu_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * This is needed by the VPE loader code, just set it to 0 and assume</div><div class='add'>+ * that the firmware hardcodes this value to something useful.</div><div class='add'>+ */</div><div class='add'>+unsigned long physical_memsize = 0L;</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * this struct is filled by the soc specific detection code and holds</div><div class='ctx'>  * information about the specific soc type, revision and name</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c<br/>index cef811755123..805b3a6ab2d6 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lantiq/xway/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lantiq/xway/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lantiq/xway/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lantiq/xway/dma.c</a></div><div class='hunk'>@@ -19,7 +19,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -59,16 +60,17 @@</div><div class='ctx'> 						ltq_dma_membase + (z))</div><div class='ctx'> </div><div class='ctx'> static void __iomem *ltq_dma_membase;</div><div class='add'>+static DEFINE_SPINLOCK(ltq_dma_lock);</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> ltq_dma_enable_irq(struct ltq_dma_channel *ch)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+	spin_lock_irqsave(&amp;ltq_dma_lock, flags);</div><div class='ctx'> 	ltq_dma_w32(ch-&gt;nr, LTQ_DMA_CS);</div><div class='ctx'> 	ltq_dma_w32_mask(0, 1 &lt;&lt; ch-&gt;nr, LTQ_DMA_IRNEN);</div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ltq_dma_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ltq_dma_enable_irq);</div><div class='ctx'> </div><div class='hunk'>@@ -77,10 +79,10 @@ ltq_dma_disable_irq(struct ltq_dma_channel *ch)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+	spin_lock_irqsave(&amp;ltq_dma_lock, flags);</div><div class='ctx'> 	ltq_dma_w32(ch-&gt;nr, LTQ_DMA_CS);</div><div class='ctx'> 	ltq_dma_w32_mask(1 &lt;&lt; ch-&gt;nr, 0, LTQ_DMA_IRNEN);</div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ltq_dma_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ltq_dma_disable_irq);</div><div class='ctx'> </div><div class='hunk'>@@ -89,10 +91,10 @@ ltq_dma_ack_irq(struct ltq_dma_channel *ch)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+	spin_lock_irqsave(&amp;ltq_dma_lock, flags);</div><div class='ctx'> 	ltq_dma_w32(ch-&gt;nr, LTQ_DMA_CS);</div><div class='ctx'> 	ltq_dma_w32(DMA_IRQ_ACK, LTQ_DMA_CIS);</div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ltq_dma_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ltq_dma_ack_irq);</div><div class='ctx'> </div><div class='hunk'>@@ -101,11 +103,11 @@ ltq_dma_open(struct ltq_dma_channel *ch)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flag;</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flag);</div><div class='add'>+	spin_lock_irqsave(&amp;ltq_dma_lock, flag);</div><div class='ctx'> 	ltq_dma_w32(ch-&gt;nr, LTQ_DMA_CS);</div><div class='ctx'> 	ltq_dma_w32_mask(0, DMA_CHAN_ON, LTQ_DMA_CCTRL);</div><div class='del'>-	ltq_dma_enable_irq(ch);</div><div class='del'>-	local_irq_restore(flag);</div><div class='add'>+	ltq_dma_w32_mask(0, 1 &lt;&lt; ch-&gt;nr, LTQ_DMA_IRNEN);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ltq_dma_lock, flag);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ltq_dma_open);</div><div class='ctx'> </div><div class='hunk'>@@ -114,11 +116,11 @@ ltq_dma_close(struct ltq_dma_channel *ch)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flag;</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flag);</div><div class='add'>+	spin_lock_irqsave(&amp;ltq_dma_lock, flag);</div><div class='ctx'> 	ltq_dma_w32(ch-&gt;nr, LTQ_DMA_CS);</div><div class='ctx'> 	ltq_dma_w32_mask(DMA_CHAN_ON, 0, LTQ_DMA_CCTRL);</div><div class='del'>-	ltq_dma_disable_irq(ch);</div><div class='del'>-	local_irq_restore(flag);</div><div class='add'>+	ltq_dma_w32_mask(1 &lt;&lt; ch-&gt;nr, 0, LTQ_DMA_IRNEN);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ltq_dma_lock, flag);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ltq_dma_close);</div><div class='ctx'> </div><div class='hunk'>@@ -133,7 +135,7 @@ ltq_dma_alloc(struct ltq_dma_channel *ch)</div><div class='ctx'> 				&amp;ch-&gt;phys, GFP_ATOMIC);</div><div class='ctx'> 	memset(ch-&gt;desc_base, 0, LTQ_DESC_NUM * LTQ_DESC_SIZE);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+	spin_lock_irqsave(&amp;ltq_dma_lock, flags);</div><div class='ctx'> 	ltq_dma_w32(ch-&gt;nr, LTQ_DMA_CS);</div><div class='ctx'> 	ltq_dma_w32(ch-&gt;phys, LTQ_DMA_CDBA);</div><div class='ctx'> 	ltq_dma_w32(LTQ_DESC_NUM, LTQ_DMA_CDLEN);</div><div class='hunk'>@@ -142,7 +144,7 @@ ltq_dma_alloc(struct ltq_dma_channel *ch)</div><div class='ctx'> 	ltq_dma_w32_mask(0, DMA_CHAN_RST, LTQ_DMA_CCTRL);</div><div class='ctx'> 	while (ltq_dma_r32(LTQ_DMA_CCTRL) &amp; DMA_CHAN_RST)</div><div class='ctx'> 		;</div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ltq_dma_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -152,11 +154,11 @@ ltq_dma_alloc_tx(struct ltq_dma_channel *ch)</div><div class='ctx'> </div><div class='ctx'> 	ltq_dma_alloc(ch);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+	spin_lock_irqsave(&amp;ltq_dma_lock, flags);</div><div class='ctx'> 	ltq_dma_w32(DMA_DESCPT, LTQ_DMA_CIE);</div><div class='ctx'> 	ltq_dma_w32_mask(0, 1 &lt;&lt; ch-&gt;nr, LTQ_DMA_IRNEN);</div><div class='ctx'> 	ltq_dma_w32(DMA_WEIGHT | DMA_TX, LTQ_DMA_CCTRL);</div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ltq_dma_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ltq_dma_alloc_tx);</div><div class='ctx'> </div><div class='hunk'>@@ -167,11 +169,11 @@ ltq_dma_alloc_rx(struct ltq_dma_channel *ch)</div><div class='ctx'> </div><div class='ctx'> 	ltq_dma_alloc(ch);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+	spin_lock_irqsave(&amp;ltq_dma_lock, flags);</div><div class='ctx'> 	ltq_dma_w32(DMA_DESCPT, LTQ_DMA_CIE);</div><div class='ctx'> 	ltq_dma_w32_mask(0, 1 &lt;&lt; ch-&gt;nr, LTQ_DMA_IRNEN);</div><div class='ctx'> 	ltq_dma_w32(DMA_WEIGHT, LTQ_DMA_CCTRL);</div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ltq_dma_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(ltq_dma_alloc_rx);</div><div class='ctx'> </div><div class='hunk'>@@ -255,7 +257,6 @@ static const struct of_device_id dma_match[] = {</div><div class='ctx'> 	{ .compatible = "lantiq,dma-xway" },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='del'>-MODULE_DEVICE_TABLE(of, dma_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver dma_driver = {</div><div class='ctx'> 	.probe = ltq_dma_init,</div><div class='head'>diff --git a/arch/mips/lantiq/xway/gptu.c b/arch/mips/lantiq/xway/gptu.c<br/>index 0f1bbea1a816..e304aabd6678 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lantiq/xway/gptu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lantiq/xway/gptu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lantiq/xway/gptu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lantiq/xway/gptu.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -187,7 +187,6 @@ static const struct of_device_id gptu_match[] = {</div><div class='ctx'> 	{ .compatible = "lantiq,gptu-xway" },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='del'>-MODULE_DEVICE_TABLE(of, dma_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver dma_driver = {</div><div class='ctx'> 	.probe = gptu_probe,</div><div class='head'>diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c<br/>index 236193b5210b..3c3aa05891dd 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lantiq/xway/sysctrl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lantiq/xway/sysctrl.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lantiq/xway/sysctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lantiq/xway/sysctrl.c</a></div><div class='hunk'>@@ -469,8 +469,8 @@ void __init ltq_soc_init(void)</div><div class='ctx'> 			panic("Failed to load xbar nodes from devicetree");</div><div class='ctx'> 		if (of_address_to_resource(np_pmu, 0, &amp;res_xbar))</div><div class='ctx'> 			panic("Failed to get xbar resources");</div><div class='del'>-		if (request_mem_region(res_xbar.start, resource_size(&amp;res_xbar),</div><div class='del'>-			res_xbar.name) &lt; 0)</div><div class='add'>+		if (!request_mem_region(res_xbar.start, resource_size(&amp;res_xbar),</div><div class='add'>+			res_xbar.name))</div><div class='ctx'> 			panic("Failed to get xbar resources");</div><div class='ctx'> </div><div class='ctx'> 		ltq_xbar_membase = ioremap_nocache(res_xbar.start,</div><div class='hunk'>@@ -545,7 +545,7 @@ void __init ltq_soc_init(void)</div><div class='ctx'> 		clkdev_add_pmu("1a800000.pcie", "msi", 1, 1, PMU1_PCIE2_MSI);</div><div class='ctx'> 		clkdev_add_pmu("1a800000.pcie", "pdi", 1, 1, PMU1_PCIE2_PDI);</div><div class='ctx'> 		clkdev_add_pmu("1a800000.pcie", "ctl", 1, 1, PMU1_PCIE2_CTL);</div><div class='del'>-		clkdev_add_pmu("1e108000.eth", NULL, 1, 0, PMU_SWITCH | PMU_PPE_DP);</div><div class='add'>+		clkdev_add_pmu("1e108000.eth", NULL, 0, 0, PMU_SWITCH | PMU_PPE_DP);</div><div class='ctx'> 		clkdev_add_pmu("1da00000.usif", "NULL", 1, 0, PMU_USIF);</div><div class='ctx'> 		clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);</div><div class='ctx'> 	} else if (of_machine_is_compatible("lantiq,ar10")) {</div><div class='hunk'>@@ -553,7 +553,7 @@ void __init ltq_soc_init(void)</div><div class='ctx'> 				  ltq_ar10_fpi_hz(), ltq_ar10_pp32_hz());</div><div class='ctx'> 		clkdev_add_pmu("1e101000.usb", "ctl", 1, 0, PMU_USB0);</div><div class='ctx'> 		clkdev_add_pmu("1e106000.usb", "ctl", 1, 0, PMU_USB1);</div><div class='del'>-		clkdev_add_pmu("1e108000.eth", NULL, 1, 0, PMU_SWITCH |</div><div class='add'>+		clkdev_add_pmu("1e108000.eth", NULL, 0, 0, PMU_SWITCH |</div><div class='ctx'> 			       PMU_PPE_DP | PMU_PPE_TC);</div><div class='ctx'> 		clkdev_add_pmu("1da00000.usif", "NULL", 1, 0, PMU_USIF);</div><div class='ctx'> 		clkdev_add_pmu("1f203000.rcu", "gphy", 1, 0, PMU_GPHY);</div><div class='hunk'>@@ -575,11 +575,11 @@ void __init ltq_soc_init(void)</div><div class='ctx'> 		clkdev_add_pmu(NULL, "ahb", 1, 0, PMU_AHBM | PMU_AHBS);</div><div class='ctx'> </div><div class='ctx'> 		clkdev_add_pmu("1da00000.usif", "NULL", 1, 0, PMU_USIF);</div><div class='del'>-		clkdev_add_pmu("1e108000.eth", NULL, 1, 0,</div><div class='add'>+		clkdev_add_pmu("1e108000.eth", NULL, 0, 0,</div><div class='ctx'> 				PMU_SWITCH | PMU_PPE_DPLUS | PMU_PPE_DPLUM |</div><div class='ctx'> 				PMU_PPE_EMA | PMU_PPE_TC | PMU_PPE_SLL01 |</div><div class='ctx'> 				PMU_PPE_QSB | PMU_PPE_TOP);</div><div class='del'>-		clkdev_add_pmu("1f203000.rcu", "gphy", 1, 0, PMU_GPHY);</div><div class='add'>+		clkdev_add_pmu("1f203000.rcu", "gphy", 0, 0, PMU_GPHY);</div><div class='ctx'> 		clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);</div><div class='ctx'> 		clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);</div><div class='ctx'> 		clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);</div><div class='head'>diff --git a/arch/mips/lasat/at93c.c b/arch/mips/lasat/at93c.c<br/>index 942f32b91d12..4e272a2622a4 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lasat/at93c.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lasat/at93c.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lasat/at93c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lasat/at93c.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/lasat/lasat.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "at93c.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c<br/>index c710d969938d..6f7422400f32 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lasat/sysctl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lasat/sysctl.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lasat/sysctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lasat/sysctl.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/lasat/lasat.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/mips/lib/csum_partial.S b/arch/mips/lib/csum_partial.S<br/>index ed88647b57e2..2ff84f4b1717 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lib/csum_partial.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lib/csum_partial.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lib/csum_partial.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/csum_partial.S</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/export.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='hunk'>@@ -103,6 +104,7 @@</div><div class='ctx'> 	.set	noreorder</div><div class='ctx'> 	.align	5</div><div class='ctx'> LEAF(csum_partial)</div><div class='add'>+EXPORT_SYMBOL(csum_partial)</div><div class='ctx'> 	move	sum, zero</div><div class='ctx'> 	move	t7, zero</div><div class='ctx'> </div><div class='hunk'>@@ -460,6 +462,7 @@ LEAF(csum_partial)</div><div class='ctx'> #endif</div><div class='ctx'> 	.if \__nocheck == 1</div><div class='ctx'> 	FEXPORT(csum_partial_copy_nocheck)</div><div class='add'>+	EXPORT_SYMBOL(csum_partial_copy_nocheck)</div><div class='ctx'> 	.endif</div><div class='ctx'> 	move	sum, zero</div><div class='ctx'> 	move	odd, zero</div><div class='hunk'>@@ -823,9 +826,12 @@ LEAF(csum_partial)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> LEAF(__csum_partial_copy_kernel)</div><div class='add'>+EXPORT_SYMBOL(__csum_partial_copy_kernel)</div><div class='ctx'> #ifndef CONFIG_EVA</div><div class='ctx'> FEXPORT(__csum_partial_copy_to_user)</div><div class='add'>+EXPORT_SYMBOL(__csum_partial_copy_to_user)</div><div class='ctx'> FEXPORT(__csum_partial_copy_from_user)</div><div class='add'>+EXPORT_SYMBOL(__csum_partial_copy_from_user)</div><div class='ctx'> #endif</div><div class='ctx'> __BUILD_CSUM_PARTIAL_COPY_USER LEGACY_MODE USEROP USEROP 1</div><div class='ctx'> END(__csum_partial_copy_kernel)</div><div class='head'>diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S<br/>index 6c303a94a196..c3031f18c572 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lib/memcpy.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lib/memcpy.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lib/memcpy.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/memcpy.S</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/export.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define dst a0</div><div class='hunk'>@@ -622,6 +623,7 @@ SEXC(1)</div><div class='ctx'> </div><div class='ctx'> 	.align	5</div><div class='ctx'> LEAF(memmove)</div><div class='add'>+EXPORT_SYMBOL(memmove)</div><div class='ctx'> 	ADD	t0, a0, a2</div><div class='ctx'> 	ADD	t1, a1, a2</div><div class='ctx'> 	sltu	t0, a1, t0			# dst + len &lt;= src -&gt; memcpy</div><div class='hunk'>@@ -674,6 +676,7 @@ LEAF(__rmemcpy)					/* a0=dst a1=src a2=len */</div><div class='ctx'>  * t6 is used as a flag to note inatomic mode.</div><div class='ctx'>  */</div><div class='ctx'> LEAF(__copy_user_inatomic)</div><div class='add'>+EXPORT_SYMBOL(__copy_user_inatomic)</div><div class='ctx'> 	b	__copy_user_common</div><div class='ctx'> 	li	t6, 1</div><div class='ctx'> 	END(__copy_user_inatomic)</div><div class='hunk'>@@ -686,9 +689,11 @@ LEAF(__copy_user_inatomic)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> LEAF(memcpy)					/* a0=dst a1=src a2=len */</div><div class='add'>+EXPORT_SYMBOL(memcpy)</div><div class='ctx'> 	move	v0, dst				/* return value */</div><div class='ctx'> .L__memcpy:</div><div class='ctx'> FEXPORT(__copy_user)</div><div class='add'>+EXPORT_SYMBOL(__copy_user)</div><div class='ctx'> 	li	t6, 0	/* not inatomic */</div><div class='ctx'> __copy_user_common:</div><div class='ctx'> 	/* Legacy Mode, user &lt;-&gt; user */</div><div class='hunk'>@@ -704,6 +709,7 @@ __copy_user_common:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> LEAF(__copy_user_inatomic_eva)</div><div class='add'>+EXPORT_SYMBOL(__copy_user_inatomic_eva)</div><div class='ctx'> 	b       __copy_from_user_common</div><div class='ctx'> 	li	t6, 1</div><div class='ctx'> 	END(__copy_user_inatomic_eva)</div><div class='hunk'>@@ -713,6 +719,7 @@ LEAF(__copy_user_inatomic_eva)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> LEAF(__copy_from_user_eva)</div><div class='add'>+EXPORT_SYMBOL(__copy_from_user_eva)</div><div class='ctx'> 	li	t6, 0	/* not inatomic */</div><div class='ctx'> __copy_from_user_common:</div><div class='ctx'> 	__BUILD_COPY_USER EVA_MODE USEROP KERNELOP</div><div class='hunk'>@@ -725,6 +732,7 @@ END(__copy_from_user_eva)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> LEAF(__copy_to_user_eva)</div><div class='add'>+EXPORT_SYMBOL(__copy_to_user_eva)</div><div class='ctx'> __BUILD_COPY_USER EVA_MODE KERNELOP USEROP</div><div class='ctx'> END(__copy_to_user_eva)</div><div class='ctx'> </div><div class='hunk'>@@ -733,6 +741,7 @@ END(__copy_to_user_eva)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> LEAF(__copy_in_user_eva)</div><div class='add'>+EXPORT_SYMBOL(__copy_in_user_eva)</div><div class='ctx'> __BUILD_COPY_USER EVA_MODE USEROP USEROP</div><div class='ctx'> END(__copy_in_user_eva)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/lib/memset.S b/arch/mips/lib/memset.S<br/>index 18a1ccd4d134..a1456664d6c2 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lib/memset.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lib/memset.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lib/memset.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/memset.S</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/export.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if LONGSIZE == 4</div><div class='hunk'>@@ -270,6 +271,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> LEAF(memset)</div><div class='add'>+EXPORT_SYMBOL(memset)</div><div class='ctx'> 	beqz		a1, 1f</div><div class='ctx'> 	move		v0, a0			/* result */</div><div class='ctx'> </div><div class='hunk'>@@ -285,13 +287,16 @@ LEAF(memset)</div><div class='ctx'> 1:</div><div class='ctx'> #ifndef CONFIG_EVA</div><div class='ctx'> FEXPORT(__bzero)</div><div class='add'>+EXPORT_SYMBOL(__bzero)</div><div class='ctx'> #else</div><div class='ctx'> FEXPORT(__bzero_kernel)</div><div class='add'>+EXPORT_SYMBOL(__bzero_kernel)</div><div class='ctx'> #endif</div><div class='ctx'> 	__BUILD_BZERO LEGACY_MODE</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EVA</div><div class='ctx'> LEAF(__bzero)</div><div class='add'>+EXPORT_SYMBOL(__bzero)</div><div class='ctx'> 	__BUILD_BZERO EVA_MODE</div><div class='ctx'> END(__bzero)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/mips/lib/strlen_user.S b/arch/mips/lib/strlen_user.S<br/>index 929bbacd697e..40be22625bc5 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lib/strlen_user.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lib/strlen_user.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lib/strlen_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/strlen_user.S</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/export.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define EX(insn,reg,addr,handler)			\</div><div class='hunk'>@@ -48,9 +49,11 @@ LEAF(__strlen_\func\()_asm)</div><div class='ctx'> 	/* Set aliases */</div><div class='ctx'> 	.global __strlen_user_asm</div><div class='ctx'> 	.set __strlen_user_asm, __strlen_kernel_asm</div><div class='add'>+EXPORT_SYMBOL(__strlen_user_asm)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> __BUILD_STRLEN_ASM kernel</div><div class='add'>+EXPORT_SYMBOL(__strlen_kernel_asm)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EVA</div><div class='ctx'> </div><div class='hunk'>@@ -58,4 +61,5 @@ __BUILD_STRLEN_ASM kernel</div><div class='ctx'> 	.set eva</div><div class='ctx'> __BUILD_STRLEN_ASM user</div><div class='ctx'> 	.set pop</div><div class='add'>+EXPORT_SYMBOL(__strlen_user_asm)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/mips/lib/strncpy_user.S b/arch/mips/lib/strncpy_user.S<br/>index 3c32baf8b494..5267ca800b84 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lib/strncpy_user.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lib/strncpy_user.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lib/strncpy_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/strncpy_user.S</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/export.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define EX(insn,reg,addr,handler)			\</div><div class='hunk'>@@ -72,13 +73,19 @@ FEXPORT(__strncpy_from_\func\()_nocheck_asm)</div><div class='ctx'> 	.global __strncpy_from_user_nocheck_asm</div><div class='ctx'> 	.set __strncpy_from_user_asm, __strncpy_from_kernel_asm</div><div class='ctx'> 	.set __strncpy_from_user_nocheck_asm, __strncpy_from_kernel_nocheck_asm</div><div class='add'>+EXPORT_SYMBOL(__strncpy_from_user_asm)</div><div class='add'>+EXPORT_SYMBOL(__strncpy_from_user_nocheck_asm)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> __BUILD_STRNCPY_ASM kernel</div><div class='add'>+EXPORT_SYMBOL(__strncpy_from_kernel_asm)</div><div class='add'>+EXPORT_SYMBOL(__strncpy_from_kernel_nocheck_asm)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EVA</div><div class='ctx'> 	.set push</div><div class='ctx'> 	.set eva</div><div class='ctx'> __BUILD_STRNCPY_ASM user</div><div class='ctx'> 	.set pop</div><div class='add'>+EXPORT_SYMBOL(__strncpy_from_user_asm)</div><div class='add'>+EXPORT_SYMBOL(__strncpy_from_user_nocheck_asm)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/mips/lib/strnlen_user.S b/arch/mips/lib/strnlen_user.S<br/>index 77e64942f004..860ea99fd70c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/lib/strnlen_user.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/lib/strnlen_user.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/lib/strnlen_user.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/lib/strnlen_user.S</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/export.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define EX(insn,reg,addr,handler)			\</div><div class='hunk'>@@ -70,9 +71,13 @@ FEXPORT(__strnlen_\func\()_nocheck_asm)</div><div class='ctx'> 	.global __strnlen_user_nocheck_asm</div><div class='ctx'> 	.set __strnlen_user_asm, __strnlen_kernel_asm</div><div class='ctx'> 	.set __strnlen_user_nocheck_asm, __strnlen_kernel_nocheck_asm</div><div class='add'>+EXPORT_SYMBOL(__strnlen_user_asm)</div><div class='add'>+EXPORT_SYMBOL(__strnlen_user_nocheck_asm)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> __BUILD_STRNLEN_ASM kernel</div><div class='add'>+EXPORT_SYMBOL(__strnlen_kernel_asm)</div><div class='add'>+EXPORT_SYMBOL(__strnlen_kernel_nocheck_asm)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EVA</div><div class='ctx'> </div><div class='hunk'>@@ -80,4 +85,6 @@ __BUILD_STRNLEN_ASM kernel</div><div class='ctx'> 	.set eva</div><div class='ctx'> __BUILD_STRNLEN_ASM user</div><div class='ctx'> 	.set pop</div><div class='add'>+EXPORT_SYMBOL(__strnlen_user_asm)</div><div class='add'>+EXPORT_SYMBOL(__strnlen_user_nocheck_asm)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/mips/loongson32/common/platform.c b/arch/mips/loongson32/common/platform.c<br/>index beff0852c6a4..100f23dfa438 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson32/common/platform.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson32/common/platform.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson32/common/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson32/common/platform.c</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2011-2016 Zhang, Keguang &lt;keguang.zhang@gmail.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute	it and/or modify it</div><div class='del'>- * under  the terms of	the GNU General	 Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -23,10 +23,6 @@</div><div class='ctx'> #include &lt;dma.h&gt;</div><div class='ctx'> #include &lt;nand.h&gt;</div><div class='ctx'> </div><div class='del'>-#define LS1X_RTC_CTRL	((void __iomem *)KSEG1ADDR(LS1X_RTC_BASE + 0x40))</div><div class='del'>-#define RTC_EXTCLK_OK	(BIT(5) | BIT(8))</div><div class='del'>-#define RTC_EXTCLK_EN	BIT(8)</div><div class='del'>-</div><div class='ctx'> /* 8250/16550 compatible UART */</div><div class='ctx'> #define LS1X_UART(_id)						\</div><div class='ctx'> 	{							\</div><div class='hunk'>@@ -70,19 +66,10 @@ void __init ls1x_serial_set_uartclk(struct platform_device *pdev)</div><div class='ctx'> 		p-&gt;uartclk = clk_get_rate(clk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init ls1x_rtc_set_extclk(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	val = __raw_readl(LS1X_RTC_CTRL);</div><div class='del'>-	if (!(val &amp; RTC_EXTCLK_OK))</div><div class='del'>-		__raw_writel(val | RTC_EXTCLK_EN, LS1X_RTC_CTRL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* CPUFreq */</div><div class='ctx'> static struct plat_ls1x_cpufreq ls1x_cpufreq_pdata = {</div><div class='ctx'> 	.clk_name	= "cpu_clk",</div><div class='del'>-	.osc_clk_name	= "osc_33m_clk",</div><div class='add'>+	.osc_clk_name	= "osc_clk",</div><div class='ctx'> 	.max_freq	= 266 * 1000,</div><div class='ctx'> 	.min_freq	= 33 * 1000,</div><div class='ctx'> };</div><div class='hunk'>@@ -357,7 +344,31 @@ struct platform_device ls1x_ehci_pdev = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Real Time Clock */</div><div class='add'>+void __init ls1x_rtc_set_extclk(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	u32 val = __raw_readl(LS1X_RTC_CTRL);</div><div class='add'>+</div><div class='add'>+	if (!(val &amp; RTC_EXTCLK_OK))</div><div class='add'>+		__raw_writel(val | RTC_EXTCLK_EN, LS1X_RTC_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct platform_device ls1x_rtc_pdev = {</div><div class='ctx'> 	.name		= "ls1x-rtc",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* Watchdog */</div><div class='add'>+static struct resource ls1x_wdt_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= LS1X_WDT_BASE,</div><div class='add'>+		.end	= LS1X_WDT_BASE + SZ_16 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device ls1x_wdt_pdev = {</div><div class='add'>+	.name		= "ls1x-wdt",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(ls1x_wdt_resources),</div><div class='add'>+	.resource	= ls1x_wdt_resources,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/loongson32/common/time.c b/arch/mips/loongson32/common/time.c<br/>index ff224f0020e5..e6f972d35252 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson32/common/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson32/common/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson32/common/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson32/common/time.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ void __init ls1x_pwmtimer_init(void)</div><div class='ctx'> 	ls1x_pwmtimer_restart();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t ls1x_clocksource_read(struct clocksource *cs)</div><div class='add'>+static u64 ls1x_clocksource_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int count;</div><div class='hunk'>@@ -107,7 +107,7 @@ static cycle_t ls1x_clocksource_read(struct clocksource *cs)</div><div class='ctx'> </div><div class='ctx'> 	raw_spin_unlock_irqrestore(&amp;ls1x_timer_lock, flags);</div><div class='ctx'> </div><div class='del'>-	return (cycle_t) (jifs * ls1x_jiffies_per_tick) + count;</div><div class='add'>+	return (u64) (jifs * ls1x_jiffies_per_tick) + count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource ls1x_clocksource = {</div><div class='head'>diff --git a/arch/mips/loongson32/ls1b/board.c b/arch/mips/loongson32/ls1b/board.c<br/>index 38a1d404be1b..01aceaace314 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson32/ls1b/board.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson32/ls1b/board.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson32/ls1b/board.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson32/ls1b/board.c</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2011-2016 Zhang, Keguang &lt;keguang.zhang@gmail.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute	it and/or modify it</div><div class='del'>- * under  the terms of	the GNU General	 Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -72,6 +72,7 @@ static struct platform_device *ls1b_platform_devices[] __initdata = {</div><div class='ctx'> 	&amp;ls1x_gpio1_pdev,</div><div class='ctx'> 	&amp;ls1x_nand_pdev,</div><div class='ctx'> 	&amp;ls1x_rtc_pdev,</div><div class='add'>+	&amp;ls1x_wdt_pdev,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ls1b_platform_init(void)</div><div class='head'>diff --git a/arch/mips/loongson32/ls1c/board.c b/arch/mips/loongson32/ls1c/board.c<br/>index a96bed5e3ea6..eb2d913c694f 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson32/ls1c/board.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson32/ls1c/board.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson32/ls1c/board.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson32/ls1c/board.c</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2016 Yang Ling &lt;gnaygnil@gmail.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute	it and/or modify it</div><div class='del'>- * under  the terms of	the GNU General	 Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -13,6 +13,7 @@ static struct platform_device *ls1c_platform_devices[] __initdata = {</div><div class='ctx'> 	&amp;ls1x_uart_pdev,</div><div class='ctx'> 	&amp;ls1x_eth0_pdev,</div><div class='ctx'> 	&amp;ls1x_rtc_pdev,</div><div class='add'>+	&amp;ls1x_wdt_pdev,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ls1c_platform_init(void)</div><div class='head'>diff --git a/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c b/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c<br/>index da77d412514c..b817d6d3a060 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -144,7 +144,7 @@ void __init setup_mfgpt0_timer(void)</div><div class='ctx'>  * to just read by itself. So use jiffies to emulate a free</div><div class='ctx'>  * running counter:</div><div class='ctx'>  */</div><div class='del'>-static cycle_t mfgpt_read(struct clocksource *cs)</div><div class='add'>+static u64 mfgpt_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int count;</div><div class='hunk'>@@ -188,7 +188,7 @@ static cycle_t mfgpt_read(struct clocksource *cs)</div><div class='ctx'> </div><div class='ctx'> 	raw_spin_unlock_irqrestore(&amp;mfgpt_lock, flags);</div><div class='ctx'> </div><div class='del'>-	return (cycle_t) (jifs * COMPARE) + count;</div><div class='add'>+	return (u64) (jifs * COMPARE) + count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource clocksource_mfgpt = {</div><div class='head'>diff --git a/arch/mips/loongson64/common/dma-swiotlb.c b/arch/mips/loongson64/common/dma-swiotlb.c<br/>index 1a80b6f73ab2..178ca17a5667 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/common/dma-swiotlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/common/dma-swiotlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/common/dma-swiotlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/common/dma-swiotlb.c</a></div><div class='hunk'>@@ -17,22 +17,14 @@ static void *loongson_dma_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	/* ignore region specifiers */</div><div class='ctx'> 	gfp &amp;= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ISA</div><div class='del'>-	if (dev == NULL)</div><div class='add'>+	if ((IS_ENABLED(CONFIG_ISA) &amp;&amp; dev == NULL) ||</div><div class='add'>+	    (IS_ENABLED(CONFIG_ZONE_DMA) &amp;&amp;</div><div class='add'>+	     dev-&gt;coherent_dma_mask &lt; DMA_BIT_MASK(32)))</div><div class='ctx'> 		gfp |= __GFP_DMA;</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ZONE_DMA</div><div class='del'>-	if (dev-&gt;coherent_dma_mask &lt; DMA_BIT_MASK(32))</div><div class='del'>-		gfp |= __GFP_DMA;</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ZONE_DMA32</div><div class='del'>-	if (dev-&gt;coherent_dma_mask &lt; DMA_BIT_MASK(40))</div><div class='add'>+	else if (IS_ENABLED(CONFIG_ZONE_DMA32) &amp;&amp;</div><div class='add'>+		 dev-&gt;coherent_dma_mask &lt; DMA_BIT_MASK(40))</div><div class='ctx'> 		gfp |= __GFP_DMA32;</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-	;</div><div class='add'>+</div><div class='ctx'> 	gfp |= __GFP_NORETRY;</div><div class='ctx'> </div><div class='ctx'> 	ret = swiotlb_alloc_coherent(dev, size, dma_handle, gfp);</div><div class='hunk'>@@ -61,7 +53,7 @@ static int loongson_dma_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 				int nents, enum dma_data_direction dir,</div><div class='ctx'> 				unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	int r = swiotlb_map_sg_attrs(dev, sg, nents, dir, 0);</div><div class='add'>+	int r = swiotlb_map_sg_attrs(dev, sg, nents, dir, attrs);</div><div class='ctx'> 	mb();</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='hunk'>@@ -122,7 +114,7 @@ phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)</div><div class='ctx'> 	return daddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops loongson_dma_map_ops = {</div><div class='add'>+static const struct dma_map_ops loongson_dma_map_ops = {</div><div class='ctx'> 	.alloc = loongson_dma_alloc_coherent,</div><div class='ctx'> 	.free = loongson_dma_free_coherent,</div><div class='ctx'> 	.map_page = loongson_dma_map_page,</div><div class='head'>diff --git a/arch/mips/loongson64/common/env.c b/arch/mips/loongson64/common/env.c<br/>index 57d590ac8004..6afa21850267 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/common/env.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/common/env.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/common/env.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/common/env.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'>  * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;loongson.h&gt;</div><div class='ctx'> #include &lt;boot_param.h&gt;</div><div class='head'>diff --git a/arch/mips/loongson64/common/setup.c b/arch/mips/loongson64/common/setup.c<br/>index 2dc5122f0e09..332387678f3e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/common/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/common/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/common/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/common/setup.c</a></div><div class='hunk'>@@ -7,7 +7,8 @@</div><div class='ctx'>  *  Free Software Foundation;  either version 2 of the	License, or (at your</div><div class='ctx'>  *  option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/wbflush.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='head'>diff --git a/arch/mips/loongson64/common/uart_base.c b/arch/mips/loongson64/common/uart_base.c<br/>index 9de559d58e1f..d27c41b237a0 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/common/uart_base.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/common/uart_base.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/common/uart_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/common/uart_base.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;loongson.h&gt;</div><div class='head'>diff --git a/arch/mips/loongson64/lemote-2f/ec_kb3310b.c b/arch/mips/loongson64/lemote-2f/ec_kb3310b.c<br/>index 2b666d3a3947..321822997e76 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/lemote-2f/ec_kb3310b.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/lemote-2f/ec_kb3310b.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/lemote-2f/ec_kb3310b.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/lemote-2f/ec_kb3310b.c</a></div><div class='hunk'>@@ -10,7 +10,8 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/loongson64/lemote-2f/irq.c b/arch/mips/loongson64/lemote-2f/irq.c<br/>index cab5f43e0e29..9e33e45aa17c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/lemote-2f/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/lemote-2f/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/lemote-2f/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/lemote-2f/irq.c</a></div><div class='hunk'>@@ -8,8 +8,9 @@</div><div class='ctx'>  *  option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq_cpu.h&gt;</div><div class='ctx'> #include &lt;asm/i8259.h&gt;</div><div class='head'>diff --git a/arch/mips/loongson64/lemote-2f/pm.c b/arch/mips/loongson64/lemote-2f/pm.c<br/>index cac4d382ea73..6859e934862d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/lemote-2f/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/lemote-2f/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/lemote-2f/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/lemote-2f/pm.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/i8042.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/i8259.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='head'>diff --git a/arch/mips/loongson64/loongson-3/hpet.c b/arch/mips/loongson64/loongson-3/hpet.c<br/>index 4788bea62a6a..24afe364637b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/loongson-3/hpet.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/loongson-3/hpet.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/loongson-3/hpet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/loongson-3/hpet.c</a></div><div class='hunk'>@@ -248,9 +248,9 @@ void __init setup_hpet_timer(void)</div><div class='ctx'> 	pr_info("hpet clock event device register\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t hpet_read_counter(struct clocksource *cs)</div><div class='add'>+static u64 hpet_read_counter(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)hpet_read(HPET_COUNTER);</div><div class='add'>+	return (u64)hpet_read(HPET_COUNTER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hpet_suspend(struct clocksource *cs)</div><div class='head'>diff --git a/arch/mips/loongson64/loongson-3/irq.c b/arch/mips/loongson64/loongson-3/irq.c<br/>index 8e7649088353..548f759454dc 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/loongson-3/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/loongson-3/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/loongson-3/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/loongson-3/irq.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #include &lt;loongson.h&gt;</div><div class='ctx'> #include &lt;irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq_cpu.h&gt;</div><div class='ctx'> #include &lt;asm/i8259.h&gt;</div><div class='head'>diff --git a/arch/mips/loongson64/loongson-3/numa.c b/arch/mips/loongson64/loongson-3/numa.c<br/>index 282c5a8c2fcd..f17ef520799a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/loongson-3/numa.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/loongson-3/numa.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/loongson-3/numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/loongson-3/numa.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='head'>diff --git a/arch/mips/loongson64/loongson-3/smp.c b/arch/mips/loongson64/loongson-3/smp.c<br/>index 99aab9f85904..64659fc73940 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/loongson64/loongson-3/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/loongson64/loongson-3/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/loongson64/loongson-3/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/loongson64/loongson-3/smp.c</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -418,7 +420,6 @@ static int loongson3_cpu_disable(void)</div><div class='ctx'> </div><div class='ctx'> 	set_cpu_online(cpu, false);</div><div class='ctx'> 	calculate_cpu_foreign_map();</div><div class='del'>-	cpumask_clear_cpu(cpu, &amp;cpu_callin_map);</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	fixup_irqs();</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='head'>diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c<br/>index f8b7bf836437..a298ac93edcc 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/math-emu/cp1emu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/math-emu/cp1emu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/math-emu/cp1emu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/math-emu/cp1emu.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> #include &lt;asm/inst.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpu-info.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c<br/>index 4a094f7acb3d..b6bfd3625369 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/math-emu/dsemul.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/math-emu/dsemul.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/math-emu/dsemul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/math-emu/dsemul.c</a></div><div class='hunk'>@@ -1,12 +1,14 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/branch.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/fpu_emulator.h&gt;</div><div class='ctx'> #include &lt;asm/inst.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct emuframe - The 'emulation' frame structure</div><div class='head'>diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile<br/>index b4c64bd3f723..b4cc8811a664 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> obj-y				+= cache.o dma-default.o extable.o fault.o \</div><div class='ctx'> 				   gup.o init.o mmap.o page.o page-funcs.o \</div><div class='del'>-				   tlbex.o tlbex-fault.o tlb-funcs.o</div><div class='add'>+				   pgtable.o tlbex.o tlbex-fault.o tlb-funcs.o</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_CPU_MICROMIPS</div><div class='ctx'> obj-y				+= uasm-micromips.o</div><div class='head'>diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c<br/>index 88cfaf81c958..e7f798d55fbc 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/c-r4k.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/c-r4k.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/c-r4k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/c-r4k.c</a></div><div class='hunk'>@@ -1452,6 +1452,7 @@ static void probe_pcache(void)</div><div class='ctx'> 	switch (current_cpu_type()) {</div><div class='ctx'> 	case CPU_20KC:</div><div class='ctx'> 	case CPU_25KF:</div><div class='add'>+	case CPU_I6400:</div><div class='ctx'> 	case CPU_SB1:</div><div class='ctx'> 	case CPU_SB1A:</div><div class='ctx'> 	case CPU_XLR:</div><div class='hunk'>@@ -1478,7 +1479,6 @@ static void probe_pcache(void)</div><div class='ctx'> 	case CPU_PROAPTIV:</div><div class='ctx'> 	case CPU_M5150:</div><div class='ctx'> 	case CPU_QEMU_GENERIC:</div><div class='del'>-	case CPU_I6400:</div><div class='ctx'> 	case CPU_P6600:</div><div class='ctx'> 	case CPU_M6250:</div><div class='ctx'> 		if (!(read_c0_config7() &amp; MIPS_CONF7_IAR) &amp;&amp;</div><div class='hunk'>@@ -1497,6 +1497,10 @@ static void probe_pcache(void)</div><div class='ctx'> 			c-&gt;dcache.flags |= MIPS_CACHE_ALIASES;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Physically indexed caches don't suffer from virtual aliasing */</div><div class='add'>+	if (c-&gt;dcache.flags &amp; MIPS_CACHE_PINDEX)</div><div class='add'>+		c-&gt;dcache.flags &amp;= ~MIPS_CACHE_ALIASES;</div><div class='add'>+</div><div class='ctx'> 	switch (current_cpu_type()) {</div><div class='ctx'> 	case CPU_20KC:</div><div class='ctx'> 		/*</div><div class='head'>diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c<br/>index 46d5696c4f27..fe8df14b6169 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/dma-default.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/dma-default.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/dma-default.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/dma-default.c</a></div><div class='hunk'>@@ -148,8 +148,8 @@ static void *mips_dma_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	gfp = massage_gfp_flags(dev, gfp);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ENABLED(CONFIG_DMA_CMA) &amp;&amp; gfpflags_allow_blocking(gfp))</div><div class='del'>-		page = dma_alloc_from_contiguous(dev,</div><div class='del'>-					count, get_order(size));</div><div class='add'>+		page = dma_alloc_from_contiguous(dev, count, get_order(size),</div><div class='add'>+						 gfp);</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		page = alloc_pages(gfp, get_order(size));</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +293,7 @@ static inline void __dma_sync(struct page *page,</div><div class='ctx'> static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,</div><div class='ctx'> 	size_t size, enum dma_data_direction direction, unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_needs_post_dma_flush(dev))</div><div class='add'>+	if (cpu_needs_post_dma_flush(dev) &amp;&amp; !(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='ctx'> 		__dma_sync(dma_addr_to_page(dev, dma_addr),</div><div class='ctx'> 			   dma_addr &amp; ~PAGE_MASK, size, direction);</div><div class='ctx'> 	plat_post_dma_flush(dev);</div><div class='hunk'>@@ -307,7 +307,8 @@ static int mips_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(sglist, sg, nents, i) {</div><div class='del'>-		if (!plat_device_is_coherent(dev))</div><div class='add'>+		if (!plat_device_is_coherent(dev) &amp;&amp;</div><div class='add'>+		    !(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='ctx'> 			__dma_sync(sg_page(sg), sg-&gt;offset, sg-&gt;length,</div><div class='ctx'> 				   direction);</div><div class='ctx'> #ifdef CONFIG_NEED_SG_DMA_LENGTH</div><div class='hunk'>@@ -324,7 +325,7 @@ static dma_addr_t mips_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 	unsigned long offset, size_t size, enum dma_data_direction direction,</div><div class='ctx'> 	unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	if (!plat_device_is_coherent(dev))</div><div class='add'>+	if (!plat_device_is_coherent(dev) &amp;&amp; !(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='ctx'> 		__dma_sync(page, offset, size, direction);</div><div class='ctx'> </div><div class='ctx'> 	return plat_map_dma_mem_page(dev, page) + offset;</div><div class='hunk'>@@ -339,6 +340,7 @@ static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(sglist, sg, nhwentries, i) {</div><div class='ctx'> 		if (!plat_device_is_coherent(dev) &amp;&amp;</div><div class='add'>+		    !(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC) &amp;&amp;</div><div class='ctx'> 		    direction != DMA_TO_DEVICE)</div><div class='ctx'> 			__dma_sync(sg_page(sg), sg-&gt;offset, sg-&gt;length,</div><div class='ctx'> 				   direction);</div><div class='hunk'>@@ -415,7 +417,7 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dma_cache_sync);</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops mips_default_dma_map_ops = {</div><div class='add'>+static const struct dma_map_ops mips_default_dma_map_ops = {</div><div class='ctx'> 	.alloc = mips_dma_alloc_coherent,</div><div class='ctx'> 	.free = mips_dma_free_coherent,</div><div class='ctx'> 	.mmap = mips_dma_mmap,</div><div class='hunk'>@@ -431,7 +433,7 @@ static struct dma_map_ops mips_default_dma_map_ops = {</div><div class='ctx'> 	.dma_supported = mips_dma_supported</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *mips_dma_map_ops = &amp;mips_default_dma_map_ops;</div><div class='add'>+const struct dma_map_ops *mips_dma_map_ops = &amp;mips_default_dma_map_ops;</div><div class='ctx'> EXPORT_SYMBOL(mips_dma_map_ops);</div><div class='ctx'> </div><div class='ctx'> #define PREALLOC_DMA_DEBUG_ENTRIES (1 &lt;&lt; 16)</div><div class='head'>diff --git a/arch/mips/mm/extable.c b/arch/mips/mm/extable.c<br/>index e474fa2efed4..81bc8a34a83f 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/extable.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/branch.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c<br/>index e86ebcf5c071..aa75849c36bc 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/init.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/kcore.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='hunk'>@@ -538,5 +539,7 @@ unsigned long pgd_current[NR_CPUS];</div><div class='ctx'> pgd_t swapper_pg_dir[_PTRS_PER_PGD] __section(.bss..swapper_pg_dir);</div><div class='ctx'> #ifndef __PAGETABLE_PMD_FOLDED</div><div class='ctx'> pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned_bss;</div><div class='add'>+EXPORT_SYMBOL_GPL(invalid_pmd_table);</div><div class='ctx'> #endif</div><div class='ctx'> pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned_bss;</div><div class='add'>+EXPORT_SYMBOL(invalid_pte_table);</div><div class='head'>diff --git a/arch/mips/mm/ioremap.c b/arch/mips/mm/ioremap.c<br/>index 1f189627440f..1986e09fb457 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/ioremap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/ioremap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/ioremap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/ioremap.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='head'>diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c<br/>index d08ea3ff0f53..64dd8bdd92c3 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/mmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/mmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/mmap.c</a></div><div class='hunk'>@@ -13,7 +13,8 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long shm_align_mask = PAGE_SIZE - 1;	/* Sane caches */</div><div class='ctx'> EXPORT_SYMBOL(shm_align_mask);</div><div class='hunk'>@@ -146,14 +147,14 @@ unsigned long arch_mmap_rnd(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long rnd;</div><div class='ctx'> </div><div class='del'>-	rnd = get_random_long();</div><div class='del'>-	rnd &lt;&lt;= PAGE_SHIFT;</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='ctx'> 	if (TASK_IS_32BIT_ADDR)</div><div class='del'>-		rnd &amp;= 0xfffffful;</div><div class='add'>+		rnd = get_random_long() &amp; ((1UL &lt;&lt; mmap_rnd_compat_bits) - 1);</div><div class='ctx'> 	else</div><div class='del'>-		rnd &amp;= 0xffffffful;</div><div class='add'>+#endif /* CONFIG_COMPAT */</div><div class='add'>+		rnd = get_random_long() &amp; ((1UL &lt;&lt; mmap_rnd_bits) - 1);</div><div class='ctx'> </div><div class='del'>-	return rnd;</div><div class='add'>+	return rnd &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void arch_pick_mmap_layout(struct mm_struct *mm)</div><div class='head'>diff --git a/arch/mips/mm/page-funcs.S b/arch/mips/mm/page-funcs.S<br/>index 48a6b38ff13e..43181ac0a1af 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/page-funcs.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/page-funcs.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/page-funcs.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/page-funcs.S</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  * Copyright (C) 2012  Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='add'>+#include &lt;asm/export.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SIBYTE_DMA_PAGEOPS</div><div class='hunk'>@@ -29,6 +30,7 @@</div><div class='ctx'>  */</div><div class='ctx'> EXPORT(__clear_page_start)</div><div class='ctx'> LEAF(cpu_clear_page_function_name)</div><div class='add'>+EXPORT_SYMBOL(cpu_clear_page_function_name)</div><div class='ctx'> 1:	j	1b		/* Dummy, will be replaced. */</div><div class='ctx'> 	.space 288</div><div class='ctx'> END(cpu_clear_page_function_name)</div><div class='hunk'>@@ -44,6 +46,7 @@ EXPORT(__clear_page_end)</div><div class='ctx'>  */</div><div class='ctx'> EXPORT(__copy_page_start)</div><div class='ctx'> LEAF(cpu_copy_page_function_name)</div><div class='add'>+EXPORT_SYMBOL(cpu_copy_page_function_name)</div><div class='ctx'> 1:	j	1b		/* Dummy, will be replaced. */</div><div class='ctx'> 	.space 1344</div><div class='ctx'> END(cpu_copy_page_function_name)</div><div class='head'>diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c<br/>index 6f804f5960ab..d5d02993aa21 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/page.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/page.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/page.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/page.c</a></div><div class='hunk'>@@ -661,6 +661,7 @@ void clear_page(void *page)</div><div class='ctx'> 		;</div><div class='ctx'> 	__raw_readq(IOADDR(A_DM_REGISTER(cpu, R_DM_DSCR_BASE)));</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(clear_page);</div><div class='ctx'> </div><div class='ctx'> void copy_page(void *to, void *from)</div><div class='ctx'> {</div><div class='hunk'>@@ -687,5 +688,6 @@ void copy_page(void *to, void *from)</div><div class='ctx'> 		;</div><div class='ctx'> 	__raw_readq(IOADDR(A_DM_REGISTER(cpu, R_DM_DSCR_BASE)));</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(copy_page);</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_SIBYTE_DMA_PAGEOPS */</div><div class='head'>diff --git a/arch/mips/mm/pgtable-64.c b/arch/mips/mm/pgtable-64.c<br/>index ce4473e7c0d2..0ae7b28b4db5 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/pgtable-64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/pgtable-64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/pgtable-64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/pgtable-64.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  * Copyright (C) 1999, 2000 by Silicon Graphics</div><div class='ctx'>  * Copyright (C) 2003 by Ralf Baechle</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='hunk'>@@ -60,6 +61,7 @@ void pmd_init(unsigned long addr, unsigned long pagetable)</div><div class='ctx'> 		p[-1] = pagetable;</div><div class='ctx'> 	} while (p != end);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(pmd_init);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> pmd_t mk_pmd(struct page *page, pgprot_t prot)</div><div class='head'>diff --git a/arch/mips/mm/pgtable.c b/arch/mips/mm/pgtable.c<br/>new file mode 100644<br/>index 000000000000..05560b042d82<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/pgtable.c</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='add'>+</div><div class='add'>+pgd_t *pgd_alloc(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	pgd_t *ret, *init;</div><div class='add'>+</div><div class='add'>+	ret = (pgd_t *) __get_free_pages(GFP_KERNEL, PGD_ORDER);</div><div class='add'>+	if (ret) {</div><div class='add'>+		init = pgd_offset(&amp;init_mm, 0UL);</div><div class='add'>+		pgd_init((unsigned long)ret);</div><div class='add'>+		memcpy(ret + USER_PTRS_PER_PGD, init + USER_PTRS_PER_PGD,</div><div class='add'>+		       (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pgd_alloc);</div><div class='head'>diff --git a/arch/mips/mm/sc-debugfs.c b/arch/mips/mm/sc-debugfs.c<br/>index 01f1154cdb0c..7e945e310b44 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/sc-debugfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/sc-debugfs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/sc-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/sc-debugfs.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bcache.h&gt;</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/mm/sc-ip22.c b/arch/mips/mm/sc-ip22.c<br/>index 026cb59a914d..f293a97cb885 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/sc-ip22.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/sc-ip22.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/sc-ip22.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/sc-ip22.c</a></div><div class='hunk'>@@ -31,26 +31,40 @@ static inline void indy_sc_wipe(unsigned long first, unsigned long last)</div><div class='ctx'> 	unsigned long tmp;</div><div class='ctx'> </div><div class='ctx'> 	__asm__ __volatile__(</div><div class='del'>-	".set\tpush\t\t\t# indy_sc_wipe\n\t"</div><div class='del'>-	".set\tnoreorder\n\t"</div><div class='del'>-	".set\tmips3\n\t"</div><div class='del'>-	".set\tnoat\n\t"</div><div class='del'>-	"mfc0\t%2, $12\n\t"</div><div class='del'>-	"li\t$1, 0x80\t\t\t# Go 64 bit\n\t"</div><div class='del'>-	"mtc0\t$1, $12\n\t"</div><div class='del'>-</div><div class='del'>-	"dli\t$1, 0x9000000080000000\n\t"</div><div class='del'>-	"or\t%0, $1\t\t\t# first line to flush\n\t"</div><div class='del'>-	"or\t%1, $1\t\t\t# last line to flush\n\t"</div><div class='del'>-	".set\tat\n\t"</div><div class='del'>-</div><div class='del'>-	"1:\tsw\t$0, 0(%0)\n\t"</div><div class='del'>-	"bne\t%0, %1, 1b\n\t"</div><div class='del'>-	" daddu\t%0, 32\n\t"</div><div class='del'>-</div><div class='del'>-	"mtc0\t%2, $12\t\t\t# Back to 32 bit\n\t"</div><div class='del'>-	"nop; nop; nop; nop;\n\t"</div><div class='del'>-	".set\tpop"</div><div class='add'>+	"	.set	push			# indy_sc_wipe		\n"</div><div class='add'>+	"	.set	noreorder					\n"</div><div class='add'>+	"	.set	mips3						\n"</div><div class='add'>+	"	.set	noat						\n"</div><div class='add'>+	"	mfc0	%2, $12						\n"</div><div class='add'>+	"	li	$1, 0x80		# Go 64 bit		\n"</div><div class='add'>+	"	mtc0	$1, $12						\n"</div><div class='add'>+	"								\n"</div><div class='add'>+	"	#							\n"</div><div class='add'>+	"	# Open code a dli $1, 0x9000000080000000		\n"</div><div class='add'>+	"	#							\n"</div><div class='add'>+	"	# Required because binutils 2.25 will happily accept	\n"</div><div class='add'>+	"	# 64 bit instructions in .set mips3 mode but puke on	\n"</div><div class='add'>+	"	# 64 bit constants when generating 32 bit ELF		\n"</div><div class='add'>+	"	#							\n"</div><div class='add'>+	"	lui	$1,0x9000					\n"</div><div class='add'>+	"	dsll	$1,$1,0x10					\n"</div><div class='add'>+	"	ori	$1,$1,0x8000					\n"</div><div class='add'>+	"	dsll	$1,$1,0x10					\n"</div><div class='add'>+	"								\n"</div><div class='add'>+	"	or	%0, $1			# first line to flush	\n"</div><div class='add'>+	"	or	%1, $1			# last line to flush	\n"</div><div class='add'>+	"	.set	at						\n"</div><div class='add'>+	"								\n"</div><div class='add'>+	"1:	sw	$0, 0(%0)					\n"</div><div class='add'>+	"	bne	%0, %1, 1b					\n"</div><div class='add'>+	"	 daddu	%0, 32						\n"</div><div class='add'>+	"								\n"</div><div class='add'>+	"	mtc0	%2, $12			# Back to 32 bit	\n"</div><div class='add'>+	"	nop				# pipeline hazard	\n"</div><div class='add'>+	"	nop							\n"</div><div class='add'>+	"	nop							\n"</div><div class='add'>+	"	nop							\n"</div><div class='add'>+	"	.set	pop						\n"</div><div class='ctx'> 	: "=r" (first), "=r" (last), "=&amp;r" (tmp)</div><div class='ctx'> 	: "0" (first), "1" (last));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c<br/>index 286a4d5a1884..c909c3342729 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/sc-mips.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/sc-mips.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/sc-mips.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/sc-mips.c</a></div><div class='hunk'>@@ -181,6 +181,7 @@ static int __init mips_sc_probe_cm3(void)</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;scache.linesz) {</div><div class='ctx'> 		c-&gt;scache.flags &amp;= ~MIPS_CACHE_NOT_PRESENT;</div><div class='add'>+		c-&gt;options |= MIPS_CPU_INCLUSIVE_CACHES;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c<br/>index 55ce39606cb8..9bfee8988eaf 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mm/tlbex.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mm/tlbex.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mm/tlbex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mm/tlbex.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -34,6 +35,7 @@</div><div class='ctx'> #include &lt;asm/war.h&gt;</div><div class='ctx'> #include &lt;asm/uasm.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/tlbex.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int mips_xpa_disabled;</div><div class='ctx'> </div><div class='hunk'>@@ -344,7 +346,8 @@ static int allocate_kscratch(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int scratch_reg;</div><div class='del'>-static int pgd_reg;</div><div class='add'>+int pgd_reg;</div><div class='add'>+EXPORT_SYMBOL_GPL(pgd_reg);</div><div class='ctx'> enum vmalloc64_mode {not_refill, refill_scratch, refill_noscratch};</div><div class='ctx'> </div><div class='ctx'> static struct work_registers build_get_work_registers(u32 **p)</div><div class='hunk'>@@ -496,15 +499,9 @@ static void __maybe_unused build_tlb_probe_entry(u32 **p)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Write random or indexed TLB entry, and care about the hazards from</div><div class='del'>- * the preceding mtc0 and for the following eret.</div><div class='del'>- */</div><div class='del'>-enum tlb_write_entry { tlb_random, tlb_indexed };</div><div class='del'>-</div><div class='del'>-static void build_tlb_write_entry(u32 **p, struct uasm_label **l,</div><div class='del'>-				  struct uasm_reloc **r,</div><div class='del'>-				  enum tlb_write_entry wmode)</div><div class='add'>+void build_tlb_write_entry(u32 **p, struct uasm_label **l,</div><div class='add'>+			   struct uasm_reloc **r,</div><div class='add'>+			   enum tlb_write_entry wmode)</div><div class='ctx'> {</div><div class='ctx'> 	void(*tlbw)(u32 **) = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -627,6 +624,7 @@ static void build_tlb_write_entry(u32 **p, struct uasm_label **l,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(build_tlb_write_entry);</div><div class='ctx'> </div><div class='ctx'> static __maybe_unused void build_convert_pte_to_entrylo(u32 **p,</div><div class='ctx'> 							unsigned int reg)</div><div class='hunk'>@@ -781,9 +779,8 @@ static void build_huge_handler_tail(u32 **p, struct uasm_reloc **r,</div><div class='ctx'>  * TMP and PTR are scratch.</div><div class='ctx'>  * TMP will be clobbered, PTR will hold the pmd entry.</div><div class='ctx'>  */</div><div class='del'>-static void</div><div class='del'>-build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r,</div><div class='del'>-		 unsigned int tmp, unsigned int ptr)</div><div class='add'>+void build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r,</div><div class='add'>+		      unsigned int tmp, unsigned int ptr)</div><div class='ctx'> {</div><div class='ctx'> #ifndef CONFIG_MIPS_PGD_C0_CONTEXT</div><div class='ctx'> 	long pgdc = (long)pgd_current;</div><div class='hunk'>@@ -859,6 +856,7 @@ build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r,</div><div class='ctx'> 	uasm_i_daddu(p, ptr, ptr, tmp); /* add in pmd offset */</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(build_get_pmde64);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * BVADDR is the faulting address, PTR is scratch.</div><div class='hunk'>@@ -934,8 +932,7 @@ build_get_pgd_vmalloc64(u32 **p, struct uasm_label **l, struct uasm_reloc **r,</div><div class='ctx'>  * TMP and PTR are scratch.</div><div class='ctx'>  * TMP will be clobbered, PTR will hold the pgd entry.</div><div class='ctx'>  */</div><div class='del'>-static void __maybe_unused</div><div class='del'>-build_get_pgde32(u32 **p, unsigned int tmp, unsigned int ptr)</div><div class='add'>+void build_get_pgde32(u32 **p, unsigned int tmp, unsigned int ptr)</div><div class='ctx'> {</div><div class='ctx'> 	if (pgd_reg != -1) {</div><div class='ctx'> 		/* pgd is in pgd_reg */</div><div class='hunk'>@@ -960,6 +957,7 @@ build_get_pgde32(u32 **p, unsigned int tmp, unsigned int ptr)</div><div class='ctx'> 	uasm_i_sll(p, tmp, tmp, PGD_T_LOG2);</div><div class='ctx'> 	uasm_i_addu(p, ptr, ptr, tmp); /* add in pgd offset */</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(build_get_pgde32);</div><div class='ctx'> </div><div class='ctx'> #endif /* !CONFIG_64BIT */</div><div class='ctx'> </div><div class='hunk'>@@ -989,7 +987,7 @@ static void build_adjust_context(u32 **p, unsigned int ctx)</div><div class='ctx'> 	uasm_i_andi(p, ctx, ctx, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void build_get_ptep(u32 **p, unsigned int tmp, unsigned int ptr)</div><div class='add'>+void build_get_ptep(u32 **p, unsigned int tmp, unsigned int ptr)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Bug workaround for the Nevada. It seems as if under certain</div><div class='hunk'>@@ -1013,8 +1011,9 @@ static void build_get_ptep(u32 **p, unsigned int tmp, unsigned int ptr)</div><div class='ctx'> 	build_adjust_context(p, tmp);</div><div class='ctx'> 	UASM_i_ADDU(p, ptr, ptr, tmp); /* add in offset */</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(build_get_ptep);</div><div class='ctx'> </div><div class='del'>-static void build_update_entries(u32 **p, unsigned int tmp, unsigned int ptep)</div><div class='add'>+void build_update_entries(u32 **p, unsigned int tmp, unsigned int ptep)</div><div class='ctx'> {</div><div class='ctx'> 	int pte_off_even = 0;</div><div class='ctx'> 	int pte_off_odd = sizeof(pte_t);</div><div class='hunk'>@@ -1063,6 +1062,7 @@ static void build_update_entries(u32 **p, unsigned int tmp, unsigned int ptep)</div><div class='ctx'> 		UASM_i_MTC0(p, 0, C0_ENTRYLO1);</div><div class='ctx'> 	UASM_i_MTC0(p, ptep, C0_ENTRYLO1); /* load it */</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(build_update_entries);</div><div class='ctx'> </div><div class='ctx'> struct mips_huge_tlb_info {</div><div class='ctx'> 	int huge_pte;</div><div class='hunk'>@@ -1536,7 +1536,9 @@ static void build_loongson3_tlb_refill_handler(void)</div><div class='ctx'> extern u32 handle_tlbl[], handle_tlbl_end[];</div><div class='ctx'> extern u32 handle_tlbs[], handle_tlbs_end[];</div><div class='ctx'> extern u32 handle_tlbm[], handle_tlbm_end[];</div><div class='del'>-extern u32 tlbmiss_handler_setup_pgd_start[], tlbmiss_handler_setup_pgd[];</div><div class='add'>+extern u32 tlbmiss_handler_setup_pgd_start[];</div><div class='add'>+extern u32 tlbmiss_handler_setup_pgd[];</div><div class='add'>+EXPORT_SYMBOL_GPL(tlbmiss_handler_setup_pgd);</div><div class='ctx'> extern u32 tlbmiss_handler_setup_pgd_end[];</div><div class='ctx'> </div><div class='ctx'> static void build_setup_pgd(void)</div><div class='hunk'>@@ -2041,7 +2043,7 @@ build_r4000_tlbchange_handler_tail(u32 **p, struct uasm_label **l,</div><div class='ctx'> </div><div class='ctx'> static void build_r4000_tlb_load_handler(void)</div><div class='ctx'> {</div><div class='del'>-	u32 *p = handle_tlbl;</div><div class='add'>+	u32 *p = (u32 *)msk_isa16_mode((ulong)handle_tlbl);</div><div class='ctx'> 	const int handle_tlbl_size = handle_tlbl_end - handle_tlbl;</div><div class='ctx'> 	struct uasm_label *l = labels;</div><div class='ctx'> 	struct uasm_reloc *r = relocs;</div><div class='hunk'>@@ -2224,7 +2226,7 @@ static void build_r4000_tlb_load_handler(void)</div><div class='ctx'> </div><div class='ctx'> static void build_r4000_tlb_store_handler(void)</div><div class='ctx'> {</div><div class='del'>-	u32 *p = handle_tlbs;</div><div class='add'>+	u32 *p = (u32 *)msk_isa16_mode((ulong)handle_tlbs);</div><div class='ctx'> 	const int handle_tlbs_size = handle_tlbs_end - handle_tlbs;</div><div class='ctx'> 	struct uasm_label *l = labels;</div><div class='ctx'> 	struct uasm_reloc *r = relocs;</div><div class='hunk'>@@ -2279,7 +2281,7 @@ static void build_r4000_tlb_store_handler(void)</div><div class='ctx'> </div><div class='ctx'> static void build_r4000_tlb_modify_handler(void)</div><div class='ctx'> {</div><div class='del'>-	u32 *p = handle_tlbm;</div><div class='add'>+	u32 *p = (u32 *)msk_isa16_mode((ulong)handle_tlbm);</div><div class='ctx'> 	const int handle_tlbm_size = handle_tlbm_end - handle_tlbm;</div><div class='ctx'> 	struct uasm_label *l = labels;</div><div class='ctx'> 	struct uasm_reloc *r = relocs;</div><div class='head'>diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c<br/>index 516e1233d771..11e9527c6e44 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mti-malta/malta-platform.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mti-malta/malta-platform.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mti-malta/malta-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mti-malta/malta-platform.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/mips-boards/maltaint.h&gt;</div><div class='head'>diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c<br/>index 7407da04f8d6..1829a9031eec 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/mti-malta/malta-time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/mti-malta/malta-time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/mti-malta/malta-time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/mti-malta/malta-time.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ static void __init estimate_frequencies(void)</div><div class='ctx'> 	unsigned int count, start;</div><div class='ctx'> 	unsigned char secs1, secs2, ctrl;</div><div class='ctx'> 	int secs;</div><div class='del'>-	cycle_t giccount = 0, gicstart = 0;</div><div class='add'>+	u64 giccount = 0, gicstart = 0;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_KVM_GUEST) &amp;&amp; CONFIG_KVM_GUEST_TIMER_FREQ</div><div class='ctx'> 	mips_hpt_frequency = CONFIG_KVM_GUEST_TIMER_FREQ * 1000000;</div><div class='head'>diff --git a/arch/mips/netlogic/common/irq.c b/arch/mips/netlogic/common/irq.c<br/>index 3660dc67d544..f4961bc9a61d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/netlogic/common/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/netlogic/common/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/netlogic/common/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/netlogic/common/irq.c</a></div><div class='hunk'>@@ -275,7 +275,7 @@ asmlinkage void plat_irq_dispatch(void)</div><div class='ctx'> 	do_IRQ(nlm_irq_to_xirq(node, i));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_OF</div><div class='add'>+#ifdef CONFIG_CPU_XLP</div><div class='ctx'> static const struct irq_domain_ops xlp_pic_irq_domain_ops = {</div><div class='ctx'> 	.xlate = irq_domain_xlate_onetwocell,</div><div class='ctx'> };</div><div class='hunk'>@@ -348,7 +348,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> #if defined(CONFIG_CPU_XLR)</div><div class='ctx'> 	nlm_setup_fmn_irq();</div><div class='ctx'> #endif</div><div class='del'>-#if defined(CONFIG_OF)</div><div class='add'>+#ifdef CONFIG_CPU_XLP</div><div class='ctx'> 	of_irq_init(xlp_pic_irq_ids);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/netlogic/common/nlm-dma.c b/arch/mips/netlogic/common/nlm-dma.c<br/>index 0630693bec2a..0ec9d9da6d51 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/netlogic/common/nlm-dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/netlogic/common/nlm-dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/netlogic/common/nlm-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/netlogic/common/nlm-dma.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ static void nlm_dma_free_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	swiotlb_free_coherent(dev, size, vaddr, dma_handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops nlm_swiotlb_dma_ops = {</div><div class='add'>+const struct dma_map_ops nlm_swiotlb_dma_ops = {</div><div class='ctx'> 	.alloc = nlm_dma_alloc_coherent,</div><div class='ctx'> 	.free = nlm_dma_free_coherent,</div><div class='ctx'> 	.map_page = swiotlb_map_page,</div><div class='head'>diff --git a/arch/mips/netlogic/common/smpboot.S b/arch/mips/netlogic/common/smpboot.S<br/>index f0cc4c9de2bb..509c1a7e7c05 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/netlogic/common/smpboot.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/netlogic/common/smpboot.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/netlogic/common/smpboot.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/netlogic/common/smpboot.S</a></div><div class='hunk'>@@ -59,8 +59,8 @@ NESTED(xlp_boot_core0_siblings, PT_SIZE, sp)</div><div class='ctx'> 	sync</div><div class='ctx'> 	/* find the location to which nlm_boot_siblings was relocated */</div><div class='ctx'> 	li	t0, CKSEG1ADDR(RESET_VEC_PHYS)</div><div class='del'>-	dla	t1, nlm_reset_entry</div><div class='del'>-	dla	t2, nlm_boot_siblings</div><div class='add'>+	PTR_LA	t1, nlm_reset_entry</div><div class='add'>+	PTR_LA	t2, nlm_boot_siblings</div><div class='ctx'> 	dsubu	t2, t1</div><div class='ctx'> 	daddu	t2, t0</div><div class='ctx'> 	/* call it */</div><div class='head'>diff --git a/arch/mips/netlogic/common/time.c b/arch/mips/netlogic/common/time.c<br/>index 5873c83e65be..cbbf0d48216b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/netlogic/common/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/netlogic/common/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/netlogic/common/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/netlogic/common/time.c</a></div><div class='hunk'>@@ -59,14 +59,14 @@ unsigned int get_c0_compare_int(void)</div><div class='ctx'> 	return IRQ_TIMER;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t nlm_get_pic_timer(struct clocksource *cs)</div><div class='add'>+static u64 nlm_get_pic_timer(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t picbase = nlm_get_node(0)-&gt;picbase;</div><div class='ctx'> </div><div class='ctx'> 	return ~nlm_pic_read_timer(picbase, PIC_CLOCK_TIMER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t nlm_get_pic_timer32(struct clocksource *cs)</div><div class='add'>+static u64 nlm_get_pic_timer32(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t picbase = nlm_get_node(0)-&gt;picbase;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/netlogic/xlp/wakeup.c b/arch/mips/netlogic/xlp/wakeup.c<br/>index 87d7846af2d0..d61004dd71b4 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/netlogic/xlp/wakeup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/netlogic/xlp/wakeup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/netlogic/xlp/wakeup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/netlogic/xlp/wakeup.c</a></div><div class='hunk'>@@ -197,7 +197,7 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void xlp_wakeup_secondary_cpus()</div><div class='add'>+void xlp_wakeup_secondary_cpus(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In case of u-boot, the secondaries are in reset</div><div class='head'>diff --git a/arch/mips/oprofile/op_model_loongson3.c b/arch/mips/oprofile/op_model_loongson3.c<br/>index 85f3ee4ab456..436b1fc99f2c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/oprofile/op_model_loongson3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/oprofile/op_model_loongson3.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/oprofile/op_model_loongson3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/oprofile/op_model_loongson3.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/oprofile.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;irq.h&gt;</div><div class='ctx'> #include &lt;loongson.h&gt;</div><div class='ctx'> #include "op_impl.h"</div><div class='hunk'>@@ -186,7 +186,7 @@ static int __init loongson3_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	on_each_cpu(reset_counters, NULL, 1);</div><div class='ctx'> 	cpuhp_setup_state_nocalls(CPUHP_AP_MIPS_OP_LOONGSON3_STARTING,</div><div class='del'>-				  "AP_MIPS_OP_LOONGSON3_STARTING",</div><div class='add'>+				  "mips/oprofile/loongson3:starting",</div><div class='ctx'> 				  loongson3_starting_cpu, loongson3_dying_cpu);</div><div class='ctx'> 	save_perf_irq = perf_irq;</div><div class='ctx'> 	perf_irq = loongson3_perfcount_handler;</div><div class='head'>diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c<br/>index 45cb27469fba..c57da6f13929 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/oprofile/op_model_mipsxx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/oprofile/op_model_mipsxx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/oprofile/op_model_mipsxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/oprofile/op_model_mipsxx.c</a></div><div class='hunk'>@@ -15,26 +15,12 @@</div><div class='ctx'> </div><div class='ctx'> #include "op_impl.h"</div><div class='ctx'> </div><div class='del'>-#define M_PERFCTL_EXL			(1UL	  &lt;&lt;  0)</div><div class='del'>-#define M_PERFCTL_KERNEL		(1UL	  &lt;&lt;  1)</div><div class='del'>-#define M_PERFCTL_SUPERVISOR		(1UL	  &lt;&lt;  2)</div><div class='del'>-#define M_PERFCTL_USER			(1UL	  &lt;&lt;  3)</div><div class='del'>-#define M_PERFCTL_INTERRUPT_ENABLE	(1UL	  &lt;&lt;  4)</div><div class='del'>-#define M_PERFCTL_EVENT(event)		(((event) &amp; 0x3ff)  &lt;&lt; 5)</div><div class='del'>-#define M_PERFCTL_VPEID(vpe)		((vpe)	  &lt;&lt; 16)</div><div class='del'>-#define M_PERFCTL_MT_EN(filter)		((filter) &lt;&lt; 20)</div><div class='del'>-#define	   M_TC_EN_ALL			M_PERFCTL_MT_EN(0)</div><div class='del'>-#define	   M_TC_EN_VPE			M_PERFCTL_MT_EN(1)</div><div class='del'>-#define	   M_TC_EN_TC			M_PERFCTL_MT_EN(2)</div><div class='del'>-#define M_PERFCTL_TCID(tcid)		((tcid)	  &lt;&lt; 22)</div><div class='del'>-#define M_PERFCTL_WIDE			(1UL	  &lt;&lt; 30)</div><div class='del'>-#define M_PERFCTL_MORE			(1UL	  &lt;&lt; 31)</div><div class='add'>+#define M_PERFCTL_EVENT(event)		(((event) &lt;&lt; MIPS_PERFCTRL_EVENT_S) &amp; \</div><div class='add'>+					 MIPS_PERFCTRL_EVENT)</div><div class='add'>+#define M_PERFCTL_VPEID(vpe)		((vpe)	  &lt;&lt; MIPS_PERFCTRL_VPEID_S)</div><div class='ctx'> </div><div class='ctx'> #define M_COUNTER_OVERFLOW		(1UL	  &lt;&lt; 31)</div><div class='ctx'> </div><div class='del'>-/* Netlogic XLR specific, count events in all threads in a core */</div><div class='del'>-#define M_PERFCTL_COUNT_ALL_THREADS	(1UL	  &lt;&lt; 13)</div><div class='del'>-</div><div class='ctx'> static int (*save_perf_irq)(void);</div><div class='ctx'> static int perfcount_irq;</div><div class='ctx'> </div><div class='hunk'>@@ -51,7 +37,7 @@ static int perfcount_irq;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MIPS_MT_SMP</div><div class='ctx'> static int cpu_has_mipsmt_pertccounters;</div><div class='del'>-#define WHAT		(M_TC_EN_VPE | \</div><div class='add'>+#define WHAT		(MIPS_PERFCTRL_MT_EN_VPE | \</div><div class='ctx'> 			 M_PERFCTL_VPEID(cpu_data[smp_processor_id()].vpe_id))</div><div class='ctx'> #define vpe_id()	(cpu_has_mipsmt_pertccounters ? \</div><div class='ctx'> 			0 : cpu_data[smp_processor_id()].vpe_id)</div><div class='hunk'>@@ -161,15 +147,15 @@ static void mipsxx_reg_setup(struct op_counter_config *ctr)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		reg.control[i] = M_PERFCTL_EVENT(ctr[i].event) |</div><div class='del'>-				 M_PERFCTL_INTERRUPT_ENABLE;</div><div class='add'>+				 MIPS_PERFCTRL_IE;</div><div class='ctx'> 		if (ctr[i].kernel)</div><div class='del'>-			reg.control[i] |= M_PERFCTL_KERNEL;</div><div class='add'>+			reg.control[i] |= MIPS_PERFCTRL_K;</div><div class='ctx'> 		if (ctr[i].user)</div><div class='del'>-			reg.control[i] |= M_PERFCTL_USER;</div><div class='add'>+			reg.control[i] |= MIPS_PERFCTRL_U;</div><div class='ctx'> 		if (ctr[i].exl)</div><div class='del'>-			reg.control[i] |= M_PERFCTL_EXL;</div><div class='add'>+			reg.control[i] |= MIPS_PERFCTRL_EXL;</div><div class='ctx'> 		if (boot_cpu_type() == CPU_XLR)</div><div class='del'>-			reg.control[i] |= M_PERFCTL_COUNT_ALL_THREADS;</div><div class='add'>+			reg.control[i] |= XLR_PERFCTRL_ALLTHREADS;</div><div class='ctx'> 		reg.counter[i] = 0x80000000 - ctr[i].count;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -254,7 +240,7 @@ static int mipsxx_perfcount_handler(void)</div><div class='ctx'> 	case n + 1:							\</div><div class='ctx'> 		control = r_c0_perfctrl ## n();				\</div><div class='ctx'> 		counter = r_c0_perfcntr ## n();				\</div><div class='del'>-		if ((control &amp; M_PERFCTL_INTERRUPT_ENABLE) &amp;&amp;		\</div><div class='add'>+		if ((control &amp; MIPS_PERFCTRL_IE) &amp;&amp;			\</div><div class='ctx'> 		    (counter &amp; M_COUNTER_OVERFLOW)) {			\</div><div class='ctx'> 			oprofile_add_sample(get_irq_regs(), n);		\</div><div class='ctx'> 			w_c0_perfcntr ## n(reg.counter[n]);		\</div><div class='hunk'>@@ -273,11 +259,11 @@ static inline int __n_counters(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!cpu_has_perf)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (!(read_c0_perfctrl0() &amp; M_PERFCTL_MORE))</div><div class='add'>+	if (!(read_c0_perfctrl0() &amp; MIPS_PERFCTRL_M))</div><div class='ctx'> 		return 1;</div><div class='del'>-	if (!(read_c0_perfctrl1() &amp; M_PERFCTL_MORE))</div><div class='add'>+	if (!(read_c0_perfctrl1() &amp; MIPS_PERFCTRL_M))</div><div class='ctx'> 		return 2;</div><div class='del'>-	if (!(read_c0_perfctrl2() &amp; M_PERFCTL_MORE))</div><div class='add'>+	if (!(read_c0_perfctrl2() &amp; MIPS_PERFCTRL_M))</div><div class='ctx'> 		return 3;</div><div class='ctx'> </div><div class='ctx'> 	return 4;</div><div class='head'>diff --git a/arch/mips/paravirt/paravirt-smp.c b/arch/mips/paravirt/paravirt-smp.c<br/>index f8d3e081b2eb..72eb1a56c645 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/paravirt/paravirt-smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/paravirt/paravirt-smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/paravirt/paravirt-smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/paravirt/paravirt-smp.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='head'>diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c<br/>index 308d051fc45c..9ee01936862e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/pci/pci-octeon.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/pci/pci-octeon.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/pci/pci-octeon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pci/pci-octeon.c</a></div><div class='hunk'>@@ -167,7 +167,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)</div><div class='ctx'> 		pci_write_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, dconfig);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dev.archdata.dma_ops = octeon_pci_dma_map_ops;</div><div class='add'>+	dev-&gt;dev.dma_ops = octeon_pci_dma_map_ops;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/pci/pci-tx4927.c b/arch/mips/pci/pci-tx4927.c<br/>index a032ae0a533d..9b3301d19a63 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/pci/pci-tx4927.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/pci/pci-tx4927.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/pci/pci-tx4927.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pci/pci-tx4927.c</a></div><div class='hunk'>@@ -21,9 +21,9 @@ int __init tx4927_report_pciclk(void)</div><div class='ctx'> {</div><div class='ctx'> 	int pciclk = 0;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "PCIC --%s PCICLK:",</div><div class='del'>-	       (__raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg) &amp; TX4927_CCFG_PCI66) ?</div><div class='del'>-	       " PCI66" : "");</div><div class='add'>+	pr_info("PCIC --%s PCICLK:",</div><div class='add'>+		(__raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg) &amp; TX4927_CCFG_PCI66) ?</div><div class='add'>+		" PCI66" : "");</div><div class='ctx'> 	if (__raw_readq(&amp;tx4927_ccfgptr-&gt;pcfg) &amp; TX4927_PCFG_PCICLKEN_ALL) {</div><div class='ctx'> 		u64 ccfg = __raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg);</div><div class='ctx'> 		switch ((unsigned long)ccfg &amp;</div><div class='hunk'>@@ -37,14 +37,14 @@ int __init tx4927_report_pciclk(void)</div><div class='ctx'> 		case TX4927_CCFG_PCIDIVMODE_6:</div><div class='ctx'> 			pciclk = txx9_cpu_clock / 6; break;</div><div class='ctx'> 		}</div><div class='del'>-		printk("Internal(%u.%uMHz)",</div><div class='del'>-		       (pciclk + 50000) / 1000000,</div><div class='del'>-		       ((pciclk + 50000) / 100000) % 10);</div><div class='add'>+		pr_cont("Internal(%u.%uMHz)",</div><div class='add'>+			(pciclk + 50000) / 1000000,</div><div class='add'>+			((pciclk + 50000) / 100000) % 10);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk("External");</div><div class='add'>+		pr_cont("External");</div><div class='ctx'> 		pciclk = -1;</div><div class='ctx'> 	}</div><div class='del'>-	printk("\n");</div><div class='add'>+	pr_cont("\n");</div><div class='ctx'> 	return pciclk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -74,8 +74,8 @@ int __init tx4927_pciclk66_setup(void)</div><div class='ctx'> 		}</div><div class='ctx'> 		tx4927_ccfg_change(TX4927_CCFG_PCIDIVMODE_MASK,</div><div class='ctx'> 				   pcidivmode);</div><div class='del'>-		printk(KERN_DEBUG "PCICLK: ccfg:%08lx\n",</div><div class='del'>-		       (unsigned long)__raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg));</div><div class='add'>+		pr_debug("PCICLK: ccfg:%08lx\n",</div><div class='add'>+			 (unsigned long)__raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg));</div><div class='ctx'> 	} else</div><div class='ctx'> 		pciclk = -1;</div><div class='ctx'> 	return pciclk;</div><div class='hunk'>@@ -87,5 +87,5 @@ void __init tx4927_setup_pcierr_irq(void)</div><div class='ctx'> 			tx4927_pcierr_interrupt,</div><div class='ctx'> 			0, "PCI error",</div><div class='ctx'> 			(void *)TX4927_PCIC_REG))</div><div class='del'>-		printk(KERN_WARNING "Failed to request irq for PCIERR\n");</div><div class='add'>+		pr_warn("Failed to request irq for PCIERR\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/pci/pci-tx4938.c b/arch/mips/pci/pci-tx4938.c<br/>index 141bba562488..000c0e1f9ef8 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/pci/pci-tx4938.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/pci/pci-tx4938.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/pci/pci-tx4938.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pci/pci-tx4938.c</a></div><div class='hunk'>@@ -21,9 +21,9 @@ int __init tx4938_report_pciclk(void)</div><div class='ctx'> {</div><div class='ctx'> 	int pciclk = 0;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "PCIC --%s PCICLK:",</div><div class='del'>-	       (__raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg) &amp; TX4938_CCFG_PCI66) ?</div><div class='del'>-	       " PCI66" : "");</div><div class='add'>+	pr_info("PCIC --%s PCICLK:",</div><div class='add'>+		(__raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg) &amp; TX4938_CCFG_PCI66) ?</div><div class='add'>+		" PCI66" : "");</div><div class='ctx'> 	if (__raw_readq(&amp;tx4938_ccfgptr-&gt;pcfg) &amp; TX4938_PCFG_PCICLKEN_ALL) {</div><div class='ctx'> 		u64 ccfg = __raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg);</div><div class='ctx'> 		switch ((unsigned long)ccfg &amp;</div><div class='hunk'>@@ -45,14 +45,14 @@ int __init tx4938_report_pciclk(void)</div><div class='ctx'> 		case TX4938_CCFG_PCIDIVMODE_11:</div><div class='ctx'> 			pciclk = txx9_cpu_clock / 11; break;</div><div class='ctx'> 		}</div><div class='del'>-		printk("Internal(%u.%uMHz)",</div><div class='del'>-		       (pciclk + 50000) / 1000000,</div><div class='del'>-		       ((pciclk + 50000) / 100000) % 10);</div><div class='add'>+		pr_cont("Internal(%u.%uMHz)",</div><div class='add'>+			(pciclk + 50000) / 1000000,</div><div class='add'>+			((pciclk + 50000) / 100000) % 10);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk("External");</div><div class='add'>+		pr_cont("External");</div><div class='ctx'> 		pciclk = -1;</div><div class='ctx'> 	}</div><div class='del'>-	printk("\n");</div><div class='add'>+	pr_cont("\n");</div><div class='ctx'> 	return pciclk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -62,10 +62,10 @@ void __init tx4938_report_pci1clk(void)</div><div class='ctx'> 	unsigned int pciclk =</div><div class='ctx'> 		txx9_gbus_clock / ((ccfg &amp; TX4938_CCFG_PCI1DMD) ? 4 : 2);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "PCIC1 -- %sPCICLK:%u.%uMHz\n",</div><div class='del'>-	       (ccfg &amp; TX4938_CCFG_PCI1_66) ? "PCI66 " : "",</div><div class='del'>-	       (pciclk + 50000) / 1000000,</div><div class='del'>-	       ((pciclk + 50000) / 100000) % 10);</div><div class='add'>+	pr_info("PCIC1 -- %sPCICLK:%u.%uMHz\n",</div><div class='add'>+		(ccfg &amp; TX4938_CCFG_PCI1_66) ? "PCI66 " : "",</div><div class='add'>+		(pciclk + 50000) / 1000000,</div><div class='add'>+		((pciclk + 50000) / 100000) % 10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init tx4938_pciclk66_setup(void)</div><div class='hunk'>@@ -105,8 +105,8 @@ int __init tx4938_pciclk66_setup(void)</div><div class='ctx'> 		}</div><div class='ctx'> 		tx4938_ccfg_change(TX4938_CCFG_PCIDIVMODE_MASK,</div><div class='ctx'> 				   pcidivmode);</div><div class='del'>-		printk(KERN_DEBUG "PCICLK: ccfg:%08lx\n",</div><div class='del'>-		       (unsigned long)__raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg));</div><div class='add'>+		pr_debug("PCICLK: ccfg:%08lx\n",</div><div class='add'>+			 (unsigned long)__raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg));</div><div class='ctx'> 	} else</div><div class='ctx'> 		pciclk = -1;</div><div class='ctx'> 	return pciclk;</div><div class='hunk'>@@ -138,5 +138,5 @@ void __init tx4938_setup_pcierr_irq(void)</div><div class='ctx'> 			tx4927_pcierr_interrupt,</div><div class='ctx'> 			0, "PCI error",</div><div class='ctx'> 			(void *)TX4927_PCIC_REG))</div><div class='del'>-		printk(KERN_WARNING "Failed to request irq for PCIERR\n");</div><div class='add'>+		pr_warn("Failed to request irq for PCIERR\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/pci/pci-tx4939.c b/arch/mips/pci/pci-tx4939.c<br/>index cd8ed09c4f53..9d6acc00f348 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/pci/pci-tx4939.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/pci/pci-tx4939.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/pci/pci-tx4939.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pci/pci-tx4939.c</a></div><div class='hunk'>@@ -28,14 +28,14 @@ int __init tx4939_report_pciclk(void)</div><div class='ctx'> 		pciclk = txx9_master_clock * 20 / 6;</div><div class='ctx'> 		if (!(__raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg) &amp; TX4939_CCFG_PCI66))</div><div class='ctx'> 			pciclk /= 2;</div><div class='del'>-		printk(KERN_CONT "Internal(%u.%uMHz)",</div><div class='del'>-		       (pciclk + 50000) / 1000000,</div><div class='del'>-		       ((pciclk + 50000) / 100000) % 10);</div><div class='add'>+		pr_cont("Internal(%u.%uMHz)",</div><div class='add'>+			(pciclk + 50000) / 1000000,</div><div class='add'>+			((pciclk + 50000) / 100000) % 10);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_CONT "External");</div><div class='add'>+		pr_cont("External");</div><div class='ctx'> 		pciclk = -1;</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_CONT "\n");</div><div class='add'>+	pr_cont("\n");</div><div class='ctx'> 	return pciclk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pic32/pic32mzda/Makefile b/arch/mips/pic32/pic32mzda/Makefile<br/>index 4a4c2728c027..c28649615c6c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/pic32/pic32mzda/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/pic32/pic32mzda/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/pic32/pic32mzda/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pic32/pic32mzda/Makefile</a></div><div class='hunk'>@@ -2,8 +2,7 @@</div><div class='ctx'> # Joshua Henderson, &lt;joshua.henderson@microchip.com&gt;</div><div class='ctx'> # Copyright (C) 2015 Microchip Technology, Inc.  All rights reserved.</div><div class='ctx'> #</div><div class='del'>-obj-y			:= init.o time.o config.o</div><div class='add'>+obj-y			:= config.o early_clk.o init.o time.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_EARLY_PRINTK)	+= early_console.o      \</div><div class='del'>-				   early_pin.o		\</div><div class='del'>-				   early_clk.o</div><div class='add'>+				   early_pin.o</div><div class='head'>diff --git a/arch/mips/pmcs-msp71xx/msp_prom.c b/arch/mips/pmcs-msp71xx/msp_prom.c<br/>index ef620a4c82a5..6fdcb3d6fbb5 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/pmcs-msp71xx/msp_prom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/pmcs-msp71xx/msp_prom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/pmcs-msp71xx/msp_prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pmcs-msp71xx/msp_prom.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/mips/pmcs-msp71xx/msp_time.c b/arch/mips/pmcs-msp71xx/msp_time.c<br/>index fea917be0ff1..b4c020a80fd7 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/pmcs-msp71xx/msp_time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/pmcs-msp71xx/msp_time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/pmcs-msp71xx/msp_time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/pmcs-msp71xx/msp_time.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cevt-r4k.h&gt;</div><div class='head'>diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig<br/>index 813826a456ca..9825dee10bc1 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ralink/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ralink/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ralink/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/Kconfig</a></div><div class='hunk'>@@ -46,6 +46,7 @@ choice</div><div class='ctx'> 		select SYS_SUPPORTS_MULTITHREADING</div><div class='ctx'> 		select SYS_SUPPORTS_SMP</div><div class='ctx'> 		select SYS_SUPPORTS_MIPS_CPS</div><div class='add'>+		select SYS_SUPPORTS_HIGHMEM</div><div class='ctx'> 		select MIPS_GIC</div><div class='ctx'> 		select COMMON_CLK</div><div class='ctx'> 		select CLKSRC_MIPS_GIC</div><div class='head'>diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c<br/>index ebaa7cc0e995..df795885eace 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ralink/clk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ralink/clk.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ralink/clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/clk.c</a></div><div class='hunk'>@@ -8,7 +8,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/clkdev.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -62,6 +63,12 @@ int clk_set_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(clk_set_rate);</div><div class='ctx'> </div><div class='add'>+long clk_round_rate(struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(clk_round_rate);</div><div class='add'>+</div><div class='ctx'> void __init plat_time_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *clk;</div><div class='head'>diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c<br/>index 4911c1445f1a..9b478c95aaf5 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ralink/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ralink/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ralink/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/irq.c</a></div><div class='hunk'>@@ -163,8 +163,8 @@ static int __init intc_of_init(struct device_node *node,</div><div class='ctx'> 	if (of_address_to_resource(node, 0, &amp;res))</div><div class='ctx'> 		panic("Failed to get intc memory range");</div><div class='ctx'> </div><div class='del'>-	if (request_mem_region(res.start, resource_size(&amp;res),</div><div class='del'>-				res.name) &lt; 0)</div><div class='add'>+	if (!request_mem_region(res.start, resource_size(&amp;res),</div><div class='add'>+				res.name))</div><div class='ctx'> 		pr_err("Failed to request intc memory");</div><div class='ctx'> </div><div class='ctx'> 	rt_intc_membase = ioremap_nocache(res.start,</div><div class='head'>diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c<br/>index 3c7c9bf57bf3..094a0ee4af46 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ralink/mt7620.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ralink/mt7620.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ralink/mt7620.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/mt7620.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/mach-ralink/ralink_regs.h&gt;</div><div class='hunk'>@@ -55,7 +54,10 @@ static int dram_type;</div><div class='ctx'> static struct rt2880_pmx_func i2c_grp[] =  { FUNC("i2c", 0, 1, 2) };</div><div class='ctx'> static struct rt2880_pmx_func spi_grp[] = { FUNC("spi", 0, 3, 4) };</div><div class='ctx'> static struct rt2880_pmx_func uartlite_grp[] = { FUNC("uartlite", 0, 15, 2) };</div><div class='del'>-static struct rt2880_pmx_func mdio_grp[] = { FUNC("mdio", 0, 22, 2) };</div><div class='add'>+static struct rt2880_pmx_func mdio_grp[] = {</div><div class='add'>+	FUNC("mdio", MT7620_GPIO_MODE_MDIO, 22, 2),</div><div class='add'>+	FUNC("refclk", MT7620_GPIO_MODE_MDIO_REFCLK, 22, 2),</div><div class='add'>+};</div><div class='ctx'> static struct rt2880_pmx_func rgmii1_grp[] = { FUNC("rgmii1", 0, 24, 12) };</div><div class='ctx'> static struct rt2880_pmx_func refclk_grp[] = { FUNC("spi refclk", 0, 37, 3) };</div><div class='ctx'> static struct rt2880_pmx_func ephy_grp[] = { FUNC("ephy", 0, 40, 5) };</div><div class='hunk'>@@ -92,7 +94,8 @@ static struct rt2880_pmx_group mt7620a_pinmux_data[] = {</div><div class='ctx'> 	GRP("uartlite", uartlite_grp, 1, MT7620_GPIO_MODE_UART1),</div><div class='ctx'> 	GRP_G("wdt", wdt_grp, MT7620_GPIO_MODE_WDT_MASK,</div><div class='ctx'> 		MT7620_GPIO_MODE_WDT_GPIO, MT7620_GPIO_MODE_WDT_SHIFT),</div><div class='del'>-	GRP("mdio", mdio_grp, 1, MT7620_GPIO_MODE_MDIO),</div><div class='add'>+	GRP_G("mdio", mdio_grp, MT7620_GPIO_MODE_MDIO_MASK,</div><div class='add'>+		MT7620_GPIO_MODE_MDIO_GPIO, MT7620_GPIO_MODE_MDIO_SHIFT),</div><div class='ctx'> 	GRP("rgmii1", rgmii1_grp, 1, MT7620_GPIO_MODE_RGMII1),</div><div class='ctx'> 	GRP("spi refclk", refclk_grp, 1, MT7620_GPIO_MODE_SPI_REF_CLK),</div><div class='ctx'> 	GRP_G("pcie", pcie_rst_grp, MT7620_GPIO_MODE_PCIE_MASK,</div><div class='hunk'>@@ -176,7 +179,7 @@ static struct rt2880_pmx_func spi_cs1_grp_mt7628[] = {</div><div class='ctx'> </div><div class='ctx'> static struct rt2880_pmx_func spis_grp_mt7628[] = {</div><div class='ctx'> 	FUNC("pwm_uart2", 3, 14, 4),</div><div class='del'>-	FUNC("util", 2, 14, 4),</div><div class='add'>+	FUNC("utif", 2, 14, 4),</div><div class='ctx'> 	FUNC("gpio", 1, 14, 4),</div><div class='ctx'> 	FUNC("spis", 0, 14, 4),</div><div class='ctx'> };</div><div class='hunk'>@@ -190,28 +193,28 @@ static struct rt2880_pmx_func gpio_grp_mt7628[] = {</div><div class='ctx'> </div><div class='ctx'> static struct rt2880_pmx_func p4led_kn_grp_mt7628[] = {</div><div class='ctx'> 	FUNC("jtag", 3, 30, 1),</div><div class='del'>-	FUNC("util", 2, 30, 1),</div><div class='add'>+	FUNC("utif", 2, 30, 1),</div><div class='ctx'> 	FUNC("gpio", 1, 30, 1),</div><div class='ctx'> 	FUNC("p4led_kn", 0, 30, 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct rt2880_pmx_func p3led_kn_grp_mt7628[] = {</div><div class='ctx'> 	FUNC("jtag", 3, 31, 1),</div><div class='del'>-	FUNC("util", 2, 31, 1),</div><div class='add'>+	FUNC("utif", 2, 31, 1),</div><div class='ctx'> 	FUNC("gpio", 1, 31, 1),</div><div class='ctx'> 	FUNC("p3led_kn", 0, 31, 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct rt2880_pmx_func p2led_kn_grp_mt7628[] = {</div><div class='ctx'> 	FUNC("jtag", 3, 32, 1),</div><div class='del'>-	FUNC("util", 2, 32, 1),</div><div class='add'>+	FUNC("utif", 2, 32, 1),</div><div class='ctx'> 	FUNC("gpio", 1, 32, 1),</div><div class='ctx'> 	FUNC("p2led_kn", 0, 32, 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct rt2880_pmx_func p1led_kn_grp_mt7628[] = {</div><div class='ctx'> 	FUNC("jtag", 3, 33, 1),</div><div class='del'>-	FUNC("util", 2, 33, 1),</div><div class='add'>+	FUNC("utif", 2, 33, 1),</div><div class='ctx'> 	FUNC("gpio", 1, 33, 1),</div><div class='ctx'> 	FUNC("p1led_kn", 0, 33, 1),</div><div class='ctx'> };</div><div class='hunk'>@@ -232,28 +235,28 @@ static struct rt2880_pmx_func wled_kn_grp_mt7628[] = {</div><div class='ctx'> </div><div class='ctx'> static struct rt2880_pmx_func p4led_an_grp_mt7628[] = {</div><div class='ctx'> 	FUNC("jtag", 3, 39, 1),</div><div class='del'>-	FUNC("util", 2, 39, 1),</div><div class='add'>+	FUNC("utif", 2, 39, 1),</div><div class='ctx'> 	FUNC("gpio", 1, 39, 1),</div><div class='ctx'> 	FUNC("p4led_an", 0, 39, 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct rt2880_pmx_func p3led_an_grp_mt7628[] = {</div><div class='ctx'> 	FUNC("jtag", 3, 40, 1),</div><div class='del'>-	FUNC("util", 2, 40, 1),</div><div class='add'>+	FUNC("utif", 2, 40, 1),</div><div class='ctx'> 	FUNC("gpio", 1, 40, 1),</div><div class='ctx'> 	FUNC("p3led_an", 0, 40, 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct rt2880_pmx_func p2led_an_grp_mt7628[] = {</div><div class='ctx'> 	FUNC("jtag", 3, 41, 1),</div><div class='del'>-	FUNC("util", 2, 41, 1),</div><div class='add'>+	FUNC("utif", 2, 41, 1),</div><div class='ctx'> 	FUNC("gpio", 1, 41, 1),</div><div class='ctx'> 	FUNC("p2led_an", 0, 41, 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct rt2880_pmx_func p1led_an_grp_mt7628[] = {</div><div class='ctx'> 	FUNC("jtag", 3, 42, 1),</div><div class='del'>-	FUNC("util", 2, 42, 1),</div><div class='add'>+	FUNC("utif", 2, 42, 1),</div><div class='ctx'> 	FUNC("gpio", 1, 42, 1),</div><div class='ctx'> 	FUNC("p1led_an", 0, 42, 1),</div><div class='ctx'> };</div><div class='hunk'>@@ -509,6 +512,7 @@ void __init ralink_clk_init(void)</div><div class='ctx'> 	unsigned long sys_rate;</div><div class='ctx'> 	unsigned long dram_rate;</div><div class='ctx'> 	unsigned long periph_rate;</div><div class='add'>+	unsigned long pcmi2s_rate;</div><div class='ctx'> </div><div class='ctx'> 	xtal_rate = mt7620_get_xtal_rate();</div><div class='ctx'> </div><div class='hunk'>@@ -523,6 +527,7 @@ void __init ralink_clk_init(void)</div><div class='ctx'> 			cpu_rate = MHZ(575);</div><div class='ctx'> 		dram_rate = sys_rate = cpu_rate / 3;</div><div class='ctx'> 		periph_rate = MHZ(40);</div><div class='add'>+		pcmi2s_rate = MHZ(480);</div><div class='ctx'> </div><div class='ctx'> 		ralink_clk_add("10000d00.uartlite", periph_rate);</div><div class='ctx'> 		ralink_clk_add("10000e00.uartlite", periph_rate);</div><div class='hunk'>@@ -534,6 +539,7 @@ void __init ralink_clk_init(void)</div><div class='ctx'> 		dram_rate = mt7620_get_dram_rate(pll_rate);</div><div class='ctx'> 		sys_rate = mt7620_get_sys_rate(cpu_rate);</div><div class='ctx'> 		periph_rate = mt7620_get_periph_rate(xtal_rate);</div><div class='add'>+		pcmi2s_rate = periph_rate;</div><div class='ctx'> </div><div class='ctx'> 		pr_debug(RFMT("XTAL") RFMT("CPU_PLL") RFMT("PLL"),</div><div class='ctx'> 			 RINT(xtal_rate), RFRAC(xtal_rate),</div><div class='hunk'>@@ -555,6 +561,8 @@ void __init ralink_clk_init(void)</div><div class='ctx'> 	ralink_clk_add("cpu", cpu_rate);</div><div class='ctx'> 	ralink_clk_add("10000100.timer", periph_rate);</div><div class='ctx'> 	ralink_clk_add("10000120.watchdog", periph_rate);</div><div class='add'>+	ralink_clk_add("10000900.i2c", periph_rate);</div><div class='add'>+	ralink_clk_add("10000a00.i2s", pcmi2s_rate);</div><div class='ctx'> 	ralink_clk_add("10000b00.spi", sys_rate);</div><div class='ctx'> 	ralink_clk_add("10000b40.spi", sys_rate);</div><div class='ctx'> 	ralink_clk_add("10000c00.uartlite", periph_rate);</div><div class='head'>diff --git a/arch/mips/ralink/mt7621.c b/arch/mips/ralink/mt7621.c<br/>index a45bbbe97ac5..0695c2d64e49 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ralink/mt7621.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ralink/mt7621.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ralink/mt7621.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/mt7621.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/smp-ops.h&gt;</div><div class='hunk'>@@ -181,7 +180,7 @@ void prom_soc_init(struct ralink_soc_info *soc_info)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		panic("mt7621: unknown SoC, n0:%08x n1:%08x\n", n0, n1);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	ralink_soc = MT762X_SOC_MT7621AT;</div><div class='ctx'> 	rev = __raw_readl(sysc + SYSC_REG_CHIP_REV);</div><div class='ctx'> </div><div class='ctx'> 	snprintf(soc_info-&gt;sys_type, RAMIPS_SYS_TYPE_LEN,</div><div class='head'>diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c<br/>index 0aa67a2d0ae6..1ada8492733b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ralink/of.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ralink/of.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ralink/of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/of.c</a></div><div class='hunk'>@@ -40,9 +40,9 @@ __iomem void *plat_of_remap_node(const char *node)</div><div class='ctx'> 	if (of_address_to_resource(np, 0, &amp;res))</div><div class='ctx'> 		panic("Failed to get resource for %s", node);</div><div class='ctx'> </div><div class='del'>-	if ((request_mem_region(res.start,</div><div class='add'>+	if (!request_mem_region(res.start,</div><div class='ctx'> 				resource_size(&amp;res),</div><div class='del'>-				res.name) &lt; 0))</div><div class='add'>+				res.name))</div><div class='ctx'> 		panic("Failed to request resources for %s", node);</div><div class='ctx'> </div><div class='ctx'> 	return ioremap_nocache(res.start, resource_size(&amp;res));</div><div class='hunk'>@@ -66,13 +66,21 @@ static int __init early_init_dt_find_memory(unsigned long node,</div><div class='ctx'> </div><div class='ctx'> void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='add'>+	void *dtb = NULL;</div><div class='add'>+</div><div class='ctx'> 	set_io_port_base(KSEG1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Load the builtin devicetree. This causes the chosen node to be</div><div class='del'>-	 * parsed resulting in our memory appearing</div><div class='add'>+	 * parsed resulting in our memory appearing. fw_passed_dtb is used</div><div class='add'>+	 * by CONFIG_MIPS_APPENDED_RAW_DTB as well.</div><div class='ctx'> 	 */</div><div class='del'>-	__dt_setup_arch(__dtb_start);</div><div class='add'>+	if (fw_passed_dtb)</div><div class='add'>+		dtb = (void *)fw_passed_dtb;</div><div class='add'>+	else if (__dtb_start != __dtb_end)</div><div class='add'>+		dtb = (void *)__dtb_start;</div><div class='add'>+</div><div class='add'>+	__dt_setup_arch(dtb);</div><div class='ctx'> </div><div class='ctx'> 	of_scan_flat_dt(early_init_dt_find_memory, NULL);</div><div class='ctx'> 	if (memory_dtb)</div><div class='head'>diff --git a/arch/mips/ralink/prom.c b/arch/mips/ralink/prom.c<br/>index 5a73c5e14221..23198c9050e5 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ralink/prom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ralink/prom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ralink/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/prom.c</a></div><div class='hunk'>@@ -30,8 +30,10 @@ const char *get_system_type(void)</div><div class='ctx'> 	return soc_info.sys_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __init void prom_init_cmdline(int argc, char **argv)</div><div class='add'>+static __init void prom_init_cmdline(void)</div><div class='ctx'> {</div><div class='add'>+	int argc;</div><div class='add'>+	char **argv;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("prom: fw_arg0=%08x fw_arg1=%08x fw_arg2=%08x fw_arg3=%08x\n",</div><div class='hunk'>@@ -60,14 +62,11 @@ static __init void prom_init_cmdline(int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> void __init prom_init(void)</div><div class='ctx'> {</div><div class='del'>-	int argc;</div><div class='del'>-	char **argv;</div><div class='del'>-</div><div class='ctx'> 	prom_soc_init(&amp;soc_info);</div><div class='ctx'> </div><div class='ctx'> 	pr_info("SoC Type: %s\n", get_system_type());</div><div class='ctx'> </div><div class='del'>-	prom_init_cmdline(argc, argv);</div><div class='add'>+	prom_init_cmdline();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init prom_free_prom_memory(void)</div><div class='head'>diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c<br/>index 285796e6d75c..60e44cc8d2c9 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ralink/rt288x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ralink/rt288x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ralink/rt288x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/rt288x.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/mach-ralink/ralink_regs.h&gt;</div><div class='hunk'>@@ -40,16 +39,6 @@ static struct rt2880_pmx_group rt2880_pinmux_data_act[] = {</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void rt288x_wdt_reset(void)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	/* enable WDT reset output on pin SRAM_CS_N */</div><div class='del'>-	t = rt_sysc_r32(SYSC_REG_CLKCFG);</div><div class='del'>-	t |= CLKCFG_SRAM_CS_N_WDT;</div><div class='del'>-	rt_sysc_w32(t, SYSC_REG_CLKCFG);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init ralink_clk_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cpu_rate, wmac_rate = 40000000;</div><div class='hunk'>@@ -75,6 +64,7 @@ void __init ralink_clk_init(void)</div><div class='ctx'> 	ralink_clk_add("300100.timer", cpu_rate / 2);</div><div class='ctx'> 	ralink_clk_add("300120.watchdog", cpu_rate / 2);</div><div class='ctx'> 	ralink_clk_add("300500.uart", cpu_rate / 2);</div><div class='add'>+	ralink_clk_add("300900.i2c", cpu_rate / 2);</div><div class='ctx'> 	ralink_clk_add("300c00.uartlite", cpu_rate / 2);</div><div class='ctx'> 	ralink_clk_add("400000.ethernet", cpu_rate / 2);</div><div class='ctx'> 	ralink_clk_add("480000.wmac", wmac_rate);</div><div class='head'>diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c<br/>index c8a28c4bf29e..93d472c60ce4 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ralink/rt305x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ralink/rt305x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ralink/rt305x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/rt305x.c</a></div><div class='hunk'>@@ -12,8 +12,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/mach-ralink/ralink_regs.h&gt;</div><div class='ctx'> #include &lt;asm/mach-ralink/rt305x.h&gt;</div><div class='hunk'>@@ -89,17 +90,6 @@ static struct rt2880_pmx_group rt5350_pinmux_data[] = {</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void rt305x_wdt_reset(void)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	/* enable WDT reset output on pin SRAM_CS_N */</div><div class='del'>-	t = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG);</div><div class='del'>-	t |= RT305X_SYSCFG_SRAM_CS0_MODE_WDT &lt;&lt;</div><div class='del'>-		RT305X_SYSCFG_SRAM_CS0_MODE_SHIFT;</div><div class='del'>-	rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned long rt5350_get_mem_size(void)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);</div><div class='hunk'>@@ -200,6 +190,8 @@ void __init ralink_clk_init(void)</div><div class='ctx'> </div><div class='ctx'> 	ralink_clk_add("cpu", cpu_rate);</div><div class='ctx'> 	ralink_clk_add("sys", sys_rate);</div><div class='add'>+	ralink_clk_add("10000900.i2c", uart_rate);</div><div class='add'>+	ralink_clk_add("10000a00.i2s", uart_rate);</div><div class='ctx'> 	ralink_clk_add("10000b00.spi", sys_rate);</div><div class='ctx'> 	ralink_clk_add("10000b40.spi", sys_rate);</div><div class='ctx'> 	ralink_clk_add("10000100.timer", wdt_rate);</div><div class='head'>diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c<br/>index 4cef9162bd9b..c4ffd43d3996 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ralink/rt3883.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ralink/rt3883.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ralink/rt3883.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/rt3883.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/mach-ralink/ralink_regs.h&gt;</div><div class='hunk'>@@ -63,16 +62,6 @@ static struct rt2880_pmx_group rt3883_pinmux_data[] = {</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void rt3883_wdt_reset(void)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	/* enable WDT reset output on GPIO 2 */</div><div class='del'>-	t = rt_sysc_r32(RT3883_SYSC_REG_SYSCFG1);</div><div class='del'>-	t |= RT3883_SYSCFG1_GPIO2_AS_WDT_OUT;</div><div class='del'>-	rt_sysc_w32(t, RT3883_SYSC_REG_SYSCFG1);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init ralink_clk_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cpu_rate, sys_rate;</div><div class='hunk'>@@ -108,6 +97,8 @@ void __init ralink_clk_init(void)</div><div class='ctx'> 	ralink_clk_add("10000100.timer", sys_rate);</div><div class='ctx'> 	ralink_clk_add("10000120.watchdog", sys_rate);</div><div class='ctx'> 	ralink_clk_add("10000500.uart", 40000000);</div><div class='add'>+	ralink_clk_add("10000900.i2c", 40000000);</div><div class='add'>+	ralink_clk_add("10000a00.i2s", 40000000);</div><div class='ctx'> 	ralink_clk_add("10000b00.spi", sys_rate);</div><div class='ctx'> 	ralink_clk_add("10000b40.spi", sys_rate);</div><div class='ctx'> 	ralink_clk_add("10000c00.uartlite", 40000000);</div><div class='hunk'>@@ -155,5 +146,5 @@ void prom_soc_init(struct ralink_soc_info *soc_info)</div><div class='ctx'> </div><div class='ctx'> 	rt2880_pinmux_data = rt3883_pinmux_data;</div><div class='ctx'> </div><div class='del'>-	ralink_soc == RT3883_SOC;</div><div class='add'>+	ralink_soc = RT3883_SOC;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c<br/>index 8077ff39bdea..d4469b20d176 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/ralink/timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/ralink/timer.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/ralink/timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/ralink/timer.c</a></div><div class='hunk'>@@ -71,11 +71,6 @@ static int rt_timer_request(struct rt_timer *rt)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rt_timer_free(struct rt_timer *rt)</div><div class='del'>-{</div><div class='del'>-	free_irq(rt-&gt;irq, rt);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int rt_timer_config(struct rt_timer *rt, unsigned long divisor)</div><div class='ctx'> {</div><div class='ctx'> 	if (rt-&gt;timer_freq &lt; divisor)</div><div class='hunk'>@@ -101,15 +96,6 @@ static int rt_timer_enable(struct rt_timer *rt)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rt_timer_disable(struct rt_timer *rt)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	t = rt_timer_r32(rt, TIMER_REG_TMR0CTL);</div><div class='del'>-	t &amp;= ~TMR0CTL_ENABLE;</div><div class='del'>-	rt_timer_w32(rt, TIMER_REG_TMR0CTL, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int rt_timer_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='head'>diff --git a/arch/mips/rb532/irq.c b/arch/mips/rb532/irq.c<br/>index 3a431e802bbc..25cc250f2d34 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/rb532/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/rb532/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/rb532/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/rb532/irq.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c<br/>index 657210e767c2..6484e4a4597b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/rb532/prom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/rb532/prom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/rb532/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/rb532/prom.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip22/Platform b/arch/mips/sgi-ip22/Platform<br/>index b7a4b7e04c38..e8f6b3a42a48 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip22/Platform?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip22/Platform</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip22/Platform?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/Platform</a></div><div class='hunk'>@@ -25,7 +25,7 @@ endif</div><div class='ctx'> # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys</div><div class='ctx'> #</div><div class='ctx'> ifdef CONFIG_SGI_IP28</div><div class='del'>-  ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n)</div><div class='add'>+  ifeq ($(call cc-option-yn,-march=r10000 -mr10k-cache-barrier=store), n)</div><div class='ctx'>       $(error gcc doesn't support needed option -mr10k-cache-barrier=store)</div><div class='ctx'>   endif</div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-berr.c b/arch/mips/sgi-ip22/ip22-berr.c<br/>index 3f6ccd53c15d..ff8e1935c873 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-berr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip22/ip22-berr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-berr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-berr.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-hpc.c b/arch/mips/sgi-ip22/ip22-hpc.c<br/>index bb70589b5f74..396956e07307 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-hpc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip22/ip22-hpc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-hpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-hpc.c</a></div><div class='hunk'>@@ -5,8 +5,8 @@</div><div class='ctx'>  * Copyright (C) 1998 Ralf Baechle</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c<br/>index 6b009c45abed..db5a64026443 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-mc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip22/ip22-mc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-mc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-mc.c</a></div><div class='hunk'>@@ -8,8 +8,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-nvram.c b/arch/mips/sgi-ip22/ip22-nvram.c<br/>index e077036a676a..cc6133bb57ca 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-nvram.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip22/ip22-nvram.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-nvram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-nvram.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2003 Ladislav Michl (ladis@linux-mips.org)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sgi/hpc3.h&gt;</div><div class='ctx'> #include &lt;asm/sgi/ip22.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c<br/>index 2f45b0357021..03a39ac5ead9 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-reset.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip22/ip22-reset.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-reset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-reset.c</a></div><div class='hunk'>@@ -8,10 +8,9 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/rtc/ds1286.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c<br/>index c7bdfe43df5b..872159970935 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip22/ip22-setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip22-setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip22-setup.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip28-berr.c b/arch/mips/sgi-ip22/ip28-berr.c<br/>index 712cc0f6a58d..1f2a5bc4779e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip28-berr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip22/ip28-berr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip22/ip28-berr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip22/ip28-berr.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='hunk'>@@ -19,7 +20,7 @@</div><div class='ctx'> #include &lt;asm/sgi/ioc.h&gt;</div><div class='ctx'> #include &lt;asm/sgi/ip22.h&gt;</div><div class='ctx'> #include &lt;asm/r4kcache.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned int count_be_is_fixup;</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-berr.c b/arch/mips/sgi-ip27/ip27-berr.c<br/>index 692778da9e76..d12879eb2b1f 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-berr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip27/ip27-berr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-berr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-berr.c</a></div><div class='hunk'>@@ -9,17 +9,16 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;	/* for SIGBUS */</div><div class='ctx'> #include &lt;linux/sched.h&gt;	/* schow_regs(), force_sig() */</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/module.h&gt;</div><div class='ctx'> #include &lt;asm/sn/addrs.h&gt;</div><div class='ctx'> #include &lt;asm/sn/arch.h&gt;</div><div class='ctx'> #include &lt;asm/sn/sn0/hub.h&gt;</div><div class='ctx'> #include &lt;asm/tlbdebug.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void dump_hub_information(unsigned long errst0, unsigned long errst1)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c<br/>index 570098bfdf87..e501c43c02db 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip27/ip27-init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-init.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-klnuma.c b/arch/mips/sgi-ip27/ip27-klnuma.c<br/>index bda90cf87e8c..2beb03907d09 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-klnuma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip27/ip27-klnuma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-klnuma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-klnuma.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ static __init void copy_kernel(nasid_t dest_nasid)</div><div class='ctx'> 	memcpy((void *)dest_kern_start, (void *)source_start, kern_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init replicate_kernel_text()</div><div class='add'>+void __init replicate_kernel_text(void)</div><div class='ctx'> {</div><div class='ctx'> 	cnodeid_t cnode;</div><div class='ctx'> 	nasid_t client_nasid;</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c<br/>index f1f88291451e..59133d0abc83 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-memory.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip27/ip27-memory.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-memory.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c<br/>index f9ae6a8fa7c7..f5ed45e8f442 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip27/ip27-smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-smp.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/topology.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c<br/>index 42d6cb9f956e..695c51bdd7dc 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip27/ip27-timer.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip27/ip27-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip27/ip27-timer.c</a></div><div class='hunk'>@@ -140,7 +140,7 @@ static void __init hub_rt_clock_event_global_init(void)</div><div class='ctx'> 	setup_irq(irq, &amp;hub_rt_irqaction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t hub_rt_read(struct clocksource *cs)</div><div class='add'>+static u64 hub_rt_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return REMOTE_HUB_L(cputonasid(0), PI_RT_COUNT);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/sgi-ip32/crime.c b/arch/mips/sgi-ip32/crime.c<br/>index 563c614ad021..a8e0c776ca6c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip32/crime.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip32/crime.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip32/crime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip32/crime.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip32/ip32-berr.c b/arch/mips/sgi-ip32/ip32-berr.c<br/>index afc1cadbba37..57d8c7486fe6 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip32/ip32-berr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip32/ip32-berr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip32/ip32-berr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip32/ip32-berr.c</a></div><div class='hunk'>@@ -10,8 +10,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/tlbdebug.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c<br/>index e0c7d9e142fa..a6a0ff7f5aed 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sgi-ip32/ip32-irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sgi-ip32/ip32-irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sgi-ip32/ip32-irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sgi-ip32/ip32-irq.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq_cpu.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='hunk'>@@ -28,12 +29,12 @@</div><div class='ctx'> #include &lt;asm/ip32/ip32_ints.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* issue a PIO read to make sure no PIO writes are pending */</div><div class='del'>-static void inline flush_crime_bus(void)</div><div class='add'>+static inline void flush_crime_bus(void)</div><div class='ctx'> {</div><div class='ctx'> 	crime-&gt;control;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void inline flush_mace_bus(void)</div><div class='add'>+static inline void flush_mace_bus(void)</div><div class='ctx'> {</div><div class='ctx'> 	mace-&gt;perif.ctrl.misc;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/sibyte/bcm1480/setup.c b/arch/mips/sibyte/bcm1480/setup.c<br/>index 8e2e04f77870..a05246cbf54c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sibyte/bcm1480/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sibyte/bcm1480/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sibyte/bcm1480/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sibyte/bcm1480/setup.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c<br/>index 4c71aea25663..d0e94ffcc1b8 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sibyte/bcm1480/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sibyte/bcm1480/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sibyte/bcm1480/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sibyte/bcm1480/smp.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/mips/sibyte/common/sb_tbprof.c b/arch/mips/sibyte/common/sb_tbprof.c<br/>index 059e28c8fd97..99c720be72d2 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sibyte/common/sb_tbprof.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sibyte/common/sb_tbprof.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sibyte/common/sb_tbprof.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sibyte/common/sb_tbprof.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@</div><div class='ctx'> #define K_INT_PERF_CNT K_BCM1480_INT_PERF_CNT</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SBPROF_TB_MAJOR 240</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c<br/>index 9d3c24efdf4a..90e43782342b 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sibyte/sb1250/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sibyte/sb1250/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sibyte/sb1250/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sibyte/sb1250/setup.c</a></div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c<br/>index 1cf66f5ff23d..0a4a2c3982d8 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/sibyte/sb1250/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/sibyte/sb1250/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/sibyte/sb1250/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/sibyte/sb1250/smp.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/mips/txx9/generic/7segled.c b/arch/mips/txx9/generic/7segled.c<br/>index 566c58bd44d0..2203c2548cb4 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/txx9/generic/7segled.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/txx9/generic/7segled.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/txx9/generic/7segled.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/7segled.c</a></div><div class='hunk'>@@ -55,8 +55,8 @@ static ssize_t raw_store(struct device *dev,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(ascii, 0200, NULL, ascii_store);</div><div class='del'>-static DEVICE_ATTR(raw, 0200, NULL, raw_store);</div><div class='add'>+static DEVICE_ATTR_WO(ascii);</div><div class='add'>+static DEVICE_ATTR_WO(raw);</div><div class='ctx'> </div><div class='ctx'> static ssize_t map_seg7_show(struct device *dev,</div><div class='ctx'> 			     struct device_attribute *attr,</div><div class='head'>diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c<br/>index 285d84e5c7b9..0bd2a1e1ff9a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/txx9/generic/pci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/txx9/generic/pci.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/txx9/generic/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/pci.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ int __init txx9_pci66_check(struct pci_controller *hose, int top_bus,</div><div class='ctx'> 	/* It seems SLC90E66 needs some time after PCI reset... */</div><div class='ctx'> 	mdelay(80);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "PCI: Checking 66MHz capabilities...\n");</div><div class='add'>+	pr_info("PCI: Checking 66MHz capabilities...\n");</div><div class='ctx'> </div><div class='ctx'> 	for (pci_devfn = 0; pci_devfn &lt; 0xff; pci_devfn++) {</div><div class='ctx'> 		if (PCI_FUNC(pci_devfn))</div><div class='hunk'>@@ -74,9 +74,8 @@ int __init txx9_pci66_check(struct pci_controller *hose, int top_bus,</div><div class='ctx'> 			early_read_config_word(hose, top_bus, current_bus,</div><div class='ctx'> 					       pci_devfn, PCI_STATUS, &amp;stat);</div><div class='ctx'> 			if (!(stat &amp; PCI_STATUS_66MHZ)) {</div><div class='del'>-				printk(KERN_DEBUG</div><div class='del'>-				       "PCI: %02x:%02x not 66MHz capable.\n",</div><div class='del'>-				       current_bus, pci_devfn);</div><div class='add'>+				pr_debug("PCI: %02x:%02x not 66MHz capable.\n",</div><div class='add'>+					 current_bus, pci_devfn);</div><div class='ctx'> 				cap66 = 0;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -209,8 +208,8 @@ txx9_alloc_pci_controller(struct pci_controller *pcic,</div><div class='ctx'> </div><div class='ctx'> 	pcic-&gt;mem_offset = 0;	/* busaddr == physaddr */</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "PCI: IO %pR MEM %pR\n",</div><div class='del'>-	       &amp;pcic-&gt;mem_resource[1], &amp;pcic-&gt;mem_resource[0]);</div><div class='add'>+	pr_info("PCI: IO %pR MEM %pR\n", &amp;pcic-&gt;mem_resource[1],</div><div class='add'>+		&amp;pcic-&gt;mem_resource[0]);</div><div class='ctx'> </div><div class='ctx'> 	/* register_pci_controller() will request MEM resource */</div><div class='ctx'> 	release_resource(&amp;pcic-&gt;mem_resource[0]);</div><div class='hunk'>@@ -219,7 +218,7 @@ txx9_alloc_pci_controller(struct pci_controller *pcic,</div><div class='ctx'> 	release_resource(&amp;pcic-&gt;mem_resource[0]);</div><div class='ctx'>  free_and_exit:</div><div class='ctx'> 	kfree(new);</div><div class='del'>-	printk(KERN_ERR "PCI: Failed to allocate resources.\n");</div><div class='add'>+	pr_err("PCI: Failed to allocate resources.\n");</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -260,7 +259,7 @@ static int txx9_i8259_irq_setup(int irq)</div><div class='ctx'> 	err = request_irq(irq, &amp;i8259_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  "cascade(i8259)", (void *)(long)irq);</div><div class='ctx'> 	if (!err)</div><div class='del'>-		printk(KERN_INFO "PCI-ISA bridge PIC (irq %d)\n", irq);</div><div class='add'>+		pr_info("PCI-ISA bridge PIC (irq %d)\n", irq);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -308,13 +307,13 @@ static void quirk_slc90e66_ide(struct pci_dev *dev)</div><div class='ctx'> 	/* SMSC SLC90E66 IDE uses irq 14, 15 (default) */</div><div class='ctx'> 	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 14);</div><div class='ctx'> 	pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &amp;dat);</div><div class='del'>-	printk(KERN_INFO "PCI: %s: IRQ %02x", pci_name(dev), dat);</div><div class='add'>+	pr_info("PCI: %s: IRQ %02x", pci_name(dev), dat);</div><div class='ctx'> 	/* enable SMSC SLC90E66 IDE */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(regs); i++) {</div><div class='ctx'> 		pci_read_config_byte(dev, regs[i], &amp;dat);</div><div class='ctx'> 		pci_write_config_byte(dev, regs[i], dat | 0x80);</div><div class='ctx'> 		pci_read_config_byte(dev, regs[i], &amp;dat);</div><div class='del'>-		printk(KERN_CONT " IDETIM%d %02x", i, dat);</div><div class='add'>+		pr_cont(" IDETIM%d %02x", i, dat);</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_read_config_byte(dev, 0x5c, &amp;dat);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -329,8 +328,7 @@ static void quirk_slc90e66_ide(struct pci_dev *dev)</div><div class='ctx'> 	dat |= 0x01;</div><div class='ctx'> 	pci_write_config_byte(dev, 0x5c, dat);</div><div class='ctx'> 	pci_read_config_byte(dev, 0x5c, &amp;dat);</div><div class='del'>-	printk(KERN_CONT " REG5C %02x", dat);</div><div class='del'>-	printk(KERN_CONT "\n");</div><div class='add'>+	pr_cont(" REG5C %02x\n", dat);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_TOSHIBA_FPCIB0 */</div><div class='ctx'> </div><div class='hunk'>@@ -352,7 +350,7 @@ static void final_fixup(struct pci_dev *dev)</div><div class='ctx'> 	    (bist &amp; PCI_BIST_CAPABLE)) {</div><div class='ctx'> 		unsigned long timeout;</div><div class='ctx'> 		pci_set_power_state(dev, PCI_D0);</div><div class='del'>-		printk(KERN_INFO "PCI: %s BIST...", pci_name(dev));</div><div class='add'>+		pr_info("PCI: %s BIST...", pci_name(dev));</div><div class='ctx'> 		pci_write_config_byte(dev, PCI_BIST, PCI_BIST_START);</div><div class='ctx'> 		timeout = jiffies + HZ * 2;	/* timeout after 2 sec */</div><div class='ctx'> 		do {</div><div class='hunk'>@@ -361,9 +359,9 @@ static void final_fixup(struct pci_dev *dev)</div><div class='ctx'> 				break;</div><div class='ctx'> 		} while (bist &amp; PCI_BIST_START);</div><div class='ctx'> 		if (bist &amp; (PCI_BIST_CODE_MASK | PCI_BIST_START))</div><div class='del'>-			printk(KERN_CONT "failed. (0x%x)\n", bist);</div><div class='add'>+			pr_cont("failed. (0x%x)\n", bist);</div><div class='ctx'> 		else</div><div class='del'>-			printk(KERN_CONT "OK.\n");</div><div class='add'>+			pr_cont("OK.\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c<br/>index a1d98b5c8fd6..1791a44ee570 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/txx9/generic/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/txx9/generic/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/txx9/generic/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/setup.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/clkdev.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx3927.c b/arch/mips/txx9/generic/setup_tx3927.c<br/>index d3b83a92cf26..33f7a7253963 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/txx9/generic/setup_tx3927.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/txx9/generic/setup_tx3927.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/txx9/generic/setup_tx3927.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/setup_tx3927.c</a></div><div class='hunk'>@@ -67,9 +67,9 @@ void __init tx3927_setup(void)</div><div class='ctx'> 	/* do reset on watchdog */</div><div class='ctx'> 	tx3927_ccfgptr-&gt;ccfg |= TX3927_CCFG_WR;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "TX3927 -- CRIR:%08lx CCFG:%08lx PCFG:%08lx\n",</div><div class='del'>-	       tx3927_ccfgptr-&gt;crir,</div><div class='del'>-	       tx3927_ccfgptr-&gt;ccfg, tx3927_ccfgptr-&gt;pcfg);</div><div class='add'>+	pr_info("TX3927 -- CRIR:%08lx CCFG:%08lx PCFG:%08lx\n",</div><div class='add'>+		tx3927_ccfgptr-&gt;crir, tx3927_ccfgptr-&gt;ccfg,</div><div class='add'>+		tx3927_ccfgptr-&gt;pcfg);</div><div class='ctx'> </div><div class='ctx'> 	/* TMR */</div><div class='ctx'> 	for (i = 0; i &lt; TX3927_NR_TMR; i++)</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx4927.c b/arch/mips/txx9/generic/setup_tx4927.c<br/>index 8d8011570b1d..46e9c4101386 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/txx9/generic/setup_tx4927.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/txx9/generic/setup_tx4927.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/txx9/generic/setup_tx4927.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/setup_tx4927.c</a></div><div class='hunk'>@@ -183,15 +183,14 @@ void __init tx4927_setup(void)</div><div class='ctx'> 	if (!(____raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg) &amp; TX4927_CCFG_PCIARB))</div><div class='ctx'> 		txx9_clear64(&amp;tx4927_ccfgptr-&gt;pcfg, TX4927_PCFG_PCICLKEN_ALL);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s -- %dMHz(M%dMHz) CRIR:%08x CCFG:%llx PCFG:%llx\n",</div><div class='del'>-	       txx9_pcode_str,</div><div class='del'>-	       (cpuclk + 500000) / 1000000,</div><div class='del'>-	       (txx9_master_clock + 500000) / 1000000,</div><div class='del'>-	       (__u32)____raw_readq(&amp;tx4927_ccfgptr-&gt;crir),</div><div class='del'>-	       (unsigned long long)____raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg),</div><div class='del'>-	       (unsigned long long)____raw_readq(&amp;tx4927_ccfgptr-&gt;pcfg));</div><div class='add'>+	pr_info("%s -- %dMHz(M%dMHz) CRIR:%08x CCFG:%llx PCFG:%llx\n",</div><div class='add'>+		txx9_pcode_str, (cpuclk + 500000) / 1000000,</div><div class='add'>+		(txx9_master_clock + 500000) / 1000000,</div><div class='add'>+		(__u32)____raw_readq(&amp;tx4927_ccfgptr-&gt;crir),</div><div class='add'>+		____raw_readq(&amp;tx4927_ccfgptr-&gt;ccfg),</div><div class='add'>+		____raw_readq(&amp;tx4927_ccfgptr-&gt;pcfg));</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s SDRAMC --", txx9_pcode_str);</div><div class='add'>+	pr_info("%s SDRAMC --", txx9_pcode_str);</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		__u64 cr = TX4927_SDRAMC_CR(i);</div><div class='ctx'> 		unsigned long base, size;</div><div class='hunk'>@@ -199,15 +198,14 @@ void __init tx4927_setup(void)</div><div class='ctx'> 			continue;	/* disabled */</div><div class='ctx'> 		base = (unsigned long)(cr &gt;&gt; 49) &lt;&lt; 21;</div><div class='ctx'> 		size = (((unsigned long)(cr &gt;&gt; 33) &amp; 0x7fff) + 1) &lt;&lt; 21;</div><div class='del'>-		printk(" CR%d:%016llx", i, (unsigned long long)cr);</div><div class='add'>+		pr_cont(" CR%d:%016llx", i, cr);</div><div class='ctx'> 		tx4927_sdram_resource[i].name = "SDRAM";</div><div class='ctx'> 		tx4927_sdram_resource[i].start = base;</div><div class='ctx'> 		tx4927_sdram_resource[i].end = base + size - 1;</div><div class='ctx'> 		tx4927_sdram_resource[i].flags = IORESOURCE_MEM;</div><div class='ctx'> 		request_resource(&amp;iomem_resource, &amp;tx4927_sdram_resource[i]);</div><div class='ctx'> 	}</div><div class='del'>-	printk(" TR:%09llx\n",</div><div class='del'>-	       (unsigned long long)____raw_readq(&amp;tx4927_sdramcptr-&gt;tr));</div><div class='add'>+	pr_cont(" TR:%09llx\n", ____raw_readq(&amp;tx4927_sdramcptr-&gt;tr));</div><div class='ctx'> </div><div class='ctx'> 	/* TMR */</div><div class='ctx'> 	/* disable all timers */</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx4938.c b/arch/mips/txx9/generic/setup_tx4938.c<br/>index ba265bf1fd06..85d1795652da 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/txx9/generic/setup_tx4938.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/txx9/generic/setup_tx4938.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/txx9/generic/setup_tx4938.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/setup_tx4938.c</a></div><div class='hunk'>@@ -196,15 +196,14 @@ void __init tx4938_setup(void)</div><div class='ctx'> 	if (!(____raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg) &amp; TX4938_CCFG_PCIARB))</div><div class='ctx'> 		txx9_clear64(&amp;tx4938_ccfgptr-&gt;pcfg, TX4938_PCFG_PCICLKEN_ALL);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s -- %dMHz(M%dMHz) CRIR:%08x CCFG:%llx PCFG:%llx\n",</div><div class='del'>-	       txx9_pcode_str,</div><div class='del'>-	       (cpuclk + 500000) / 1000000,</div><div class='del'>-	       (txx9_master_clock + 500000) / 1000000,</div><div class='del'>-	       (__u32)____raw_readq(&amp;tx4938_ccfgptr-&gt;crir),</div><div class='del'>-	       (unsigned long long)____raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg),</div><div class='del'>-	       (unsigned long long)____raw_readq(&amp;tx4938_ccfgptr-&gt;pcfg));</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s SDRAMC --", txx9_pcode_str);</div><div class='add'>+	pr_info("%s -- %dMHz(M%dMHz) CRIR:%08x CCFG:%llx PCFG:%llx\n",</div><div class='add'>+		txx9_pcode_str, (cpuclk + 500000) / 1000000,</div><div class='add'>+		(txx9_master_clock + 500000) / 1000000,</div><div class='add'>+		(__u32)____raw_readq(&amp;tx4938_ccfgptr-&gt;crir),</div><div class='add'>+		____raw_readq(&amp;tx4938_ccfgptr-&gt;ccfg),</div><div class='add'>+		____raw_readq(&amp;tx4938_ccfgptr-&gt;pcfg));</div><div class='add'>+</div><div class='add'>+	pr_info("%s SDRAMC --", txx9_pcode_str);</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		__u64 cr = TX4938_SDRAMC_CR(i);</div><div class='ctx'> 		unsigned long base, size;</div><div class='hunk'>@@ -212,15 +211,14 @@ void __init tx4938_setup(void)</div><div class='ctx'> 			continue;	/* disabled */</div><div class='ctx'> 		base = (unsigned long)(cr &gt;&gt; 49) &lt;&lt; 21;</div><div class='ctx'> 		size = (((unsigned long)(cr &gt;&gt; 33) &amp; 0x7fff) + 1) &lt;&lt; 21;</div><div class='del'>-		printk(" CR%d:%016llx", i, (unsigned long long)cr);</div><div class='add'>+		pr_cont(" CR%d:%016llx", i, cr);</div><div class='ctx'> 		tx4938_sdram_resource[i].name = "SDRAM";</div><div class='ctx'> 		tx4938_sdram_resource[i].start = base;</div><div class='ctx'> 		tx4938_sdram_resource[i].end = base + size - 1;</div><div class='ctx'> 		tx4938_sdram_resource[i].flags = IORESOURCE_MEM;</div><div class='ctx'> 		request_resource(&amp;iomem_resource, &amp;tx4938_sdram_resource[i]);</div><div class='ctx'> 	}</div><div class='del'>-	printk(" TR:%09llx\n",</div><div class='del'>-	       (unsigned long long)____raw_readq(&amp;tx4938_sdramcptr-&gt;tr));</div><div class='add'>+	pr_cont(" TR:%09llx\n", ____raw_readq(&amp;tx4938_sdramcptr-&gt;tr));</div><div class='ctx'> </div><div class='ctx'> 	/* SRAM */</div><div class='ctx'> 	if (txx9_pcode == 0x4938 &amp;&amp; ____raw_readq(&amp;tx4938_sramcptr-&gt;cr) &amp; 1) {</div><div class='hunk'>@@ -254,20 +252,20 @@ void __init tx4938_setup(void)</div><div class='ctx'> 			txx9_clear64(&amp;tx4938_ccfgptr-&gt;clkctr,</div><div class='ctx'> 				     TX4938_CLKCTR_PCIC1RST);</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(KERN_INFO "%s: stop PCIC1\n", txx9_pcode_str);</div><div class='add'>+			pr_info("%s: stop PCIC1\n", txx9_pcode_str);</div><div class='ctx'> 			/* stop PCIC1 */</div><div class='ctx'> 			txx9_set64(&amp;tx4938_ccfgptr-&gt;clkctr,</div><div class='ctx'> 				   TX4938_CLKCTR_PCIC1CKD);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!(pcfg &amp; TX4938_PCFG_ETH0_SEL)) {</div><div class='del'>-			printk(KERN_INFO "%s: stop ETH0\n", txx9_pcode_str);</div><div class='add'>+			pr_info("%s: stop ETH0\n", txx9_pcode_str);</div><div class='ctx'> 			txx9_set64(&amp;tx4938_ccfgptr-&gt;clkctr,</div><div class='ctx'> 				   TX4938_CLKCTR_ETH0RST);</div><div class='ctx'> 			txx9_set64(&amp;tx4938_ccfgptr-&gt;clkctr,</div><div class='ctx'> 				   TX4938_CLKCTR_ETH0CKD);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!(pcfg &amp; TX4938_PCFG_ETH1_SEL)) {</div><div class='del'>-			printk(KERN_INFO "%s: stop ETH1\n", txx9_pcode_str);</div><div class='add'>+			pr_info("%s: stop ETH1\n", txx9_pcode_str);</div><div class='ctx'> 			txx9_set64(&amp;tx4938_ccfgptr-&gt;clkctr,</div><div class='ctx'> 				   TX4938_CLKCTR_ETH1RST);</div><div class='ctx'> 			txx9_set64(&amp;tx4938_ccfgptr-&gt;clkctr,</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c<br/>index 402ac2ec7e83..274928987a21 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/txx9/generic/setup_tx4939.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/txx9/generic/setup_tx4939.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/txx9/generic/setup_tx4939.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/setup_tx4939.c</a></div><div class='hunk'>@@ -221,8 +221,8 @@ void __init tx4939_setup(void)</div><div class='ctx'> 		(txx9_master_clock + 500000) / 1000000,</div><div class='ctx'> 		(txx9_gbus_clock + 500000) / 1000000,</div><div class='ctx'> 		(__u32)____raw_readq(&amp;tx4939_ccfgptr-&gt;crir),</div><div class='del'>-		(unsigned long long)____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg),</div><div class='del'>-		(unsigned long long)____raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg));</div><div class='add'>+		____raw_readq(&amp;tx4939_ccfgptr-&gt;ccfg),</div><div class='add'>+		____raw_readq(&amp;tx4939_ccfgptr-&gt;pcfg));</div><div class='ctx'> </div><div class='ctx'> 	pr_info("%s DDRC -- EN:%08x", txx9_pcode_str,</div><div class='ctx'> 		(__u32)____raw_readq(&amp;tx4939_ddrcptr-&gt;winen));</div><div class='hunk'>@@ -230,7 +230,7 @@ void __init tx4939_setup(void)</div><div class='ctx'> 		__u64 win = ____raw_readq(&amp;tx4939_ddrcptr-&gt;win[i]);</div><div class='ctx'> 		if (!((__u32)____raw_readq(&amp;tx4939_ddrcptr-&gt;winen) &amp; (1 &lt;&lt; i)))</div><div class='ctx'> 			continue;	/* disabled */</div><div class='del'>-		printk(KERN_CONT " #%d:%016llx", i, (unsigned long long)win);</div><div class='add'>+		pr_cont(" #%d:%016llx", i, win);</div><div class='ctx'> 		tx4939_sdram_resource[i].name = "DDR SDRAM";</div><div class='ctx'> 		tx4939_sdram_resource[i].start =</div><div class='ctx'> 			(unsigned long)(win &gt;&gt; 48) &lt;&lt; 20;</div><div class='hunk'>@@ -240,7 +240,7 @@ void __init tx4939_setup(void)</div><div class='ctx'> 		tx4939_sdram_resource[i].flags = IORESOURCE_MEM;</div><div class='ctx'> 		request_resource(&amp;iomem_resource, &amp;tx4939_sdram_resource[i]);</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_CONT "\n");</div><div class='add'>+	pr_cont("\n");</div><div class='ctx'> </div><div class='ctx'> 	/* SRAM */</div><div class='ctx'> 	if (____raw_readq(&amp;tx4939_sramcptr-&gt;cr) &amp; 1) {</div><div class='head'>diff --git a/arch/mips/txx9/generic/smsc_fdc37m81x.c b/arch/mips/txx9/generic/smsc_fdc37m81x.c<br/>index f98baa6263d2..40f4098d3ae1 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/txx9/generic/smsc_fdc37m81x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/txx9/generic/smsc_fdc37m81x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/txx9/generic/smsc_fdc37m81x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/generic/smsc_fdc37m81x.c</a></div><div class='hunk'>@@ -105,9 +105,8 @@ unsigned long __init smsc_fdc37m81x_init(unsigned long port)</div><div class='ctx'> 	u8 chip_id;</div><div class='ctx'> </div><div class='ctx'> 	if (g_smsc_fdc37m81x_base)</div><div class='del'>-		printk(KERN_WARNING "%s: stepping on old base=0x%0*lx\n",</div><div class='del'>-		       __func__,</div><div class='del'>-		       field, g_smsc_fdc37m81x_base);</div><div class='add'>+		pr_warn("%s: stepping on old base=0x%0*lx\n", __func__, field,</div><div class='add'>+			g_smsc_fdc37m81x_base);</div><div class='ctx'> </div><div class='ctx'> 	g_smsc_fdc37m81x_base = port;</div><div class='ctx'> </div><div class='hunk'>@@ -117,8 +116,7 @@ unsigned long __init smsc_fdc37m81x_init(unsigned long port)</div><div class='ctx'> 	if (chip_id == SMSC_FDC37M81X_CHIP_ID)</div><div class='ctx'> 		smsc_fdc37m81x_config_end();</div><div class='ctx'> 	else {</div><div class='del'>-		printk(KERN_WARNING "%s: unknown chip id 0x%02x\n", __func__,</div><div class='del'>-		       chip_id);</div><div class='add'>+		pr_warn("%s: unknown chip id 0x%02x\n", __func__, chip_id);</div><div class='ctx'> 		g_smsc_fdc37m81x_base = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -128,9 +126,8 @@ unsigned long __init smsc_fdc37m81x_init(unsigned long port)</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> static void smsc_fdc37m81x_config_dump_one(const char *key, u8 dev, u8 reg)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_INFO "%s: dev=0x%02x reg=0x%02x val=0x%02x\n",</div><div class='del'>-	       key, dev, reg,</div><div class='del'>-	       smsc_fdc37m81x_rd(reg));</div><div class='add'>+	pr_info("%s: dev=0x%02x reg=0x%02x val=0x%02x\n", key, dev, reg,</div><div class='add'>+		smsc_fdc37m81x_rd(reg));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void smsc_fdc37m81x_config_dump(void)</div><div class='hunk'>@@ -142,7 +139,7 @@ void smsc_fdc37m81x_config_dump(void)</div><div class='ctx'> </div><div class='ctx'> 	orig = smsc_fdc37m81x_rd(SMSC_FDC37M81X_DNUM);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: common\n", fname);</div><div class='add'>+	pr_info("%s: common\n", fname);</div><div class='ctx'> 	smsc_fdc37m81x_config_dump_one(fname, SMSC_FDC37M81X_NONE,</div><div class='ctx'> 				       SMSC_FDC37M81X_DNUM);</div><div class='ctx'> 	smsc_fdc37m81x_config_dump_one(fname, SMSC_FDC37M81X_NONE,</div><div class='hunk'>@@ -154,7 +151,7 @@ void smsc_fdc37m81x_config_dump(void)</div><div class='ctx'> 	smsc_fdc37m81x_config_dump_one(fname, SMSC_FDC37M81X_NONE,</div><div class='ctx'> 				       SMSC_FDC37M81X_PMGT);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: keyboard\n", fname);</div><div class='add'>+	pr_info("%s: keyboard\n", fname);</div><div class='ctx'> 	smsc_dc37m81x_wr(SMSC_FDC37M81X_DNUM, SMSC_FDC37M81X_KBD);</div><div class='ctx'> 	smsc_fdc37m81x_config_dump_one(fname, SMSC_FDC37M81X_KBD,</div><div class='ctx'> 				       SMSC_FDC37M81X_ACTIVE);</div><div class='head'>diff --git a/arch/mips/txx9/jmr3927/prom.c b/arch/mips/txx9/jmr3927/prom.c<br/>index c899c0c087a0..68a96473c134 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/txx9/jmr3927/prom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/txx9/jmr3927/prom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/txx9/jmr3927/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/jmr3927/prom.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@ void __init jmr3927_prom_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* CCFG */</div><div class='ctx'> 	if ((tx3927_ccfgptr-&gt;ccfg &amp; TX3927_CCFG_TLBOFF) == 0)</div><div class='del'>-		printk(KERN_ERR "TX3927 TLB off\n");</div><div class='add'>+		pr_err("TX3927 TLB off\n");</div><div class='ctx'> </div><div class='ctx'> 	add_memory_region(0, JMR3927_SDRAM_SIZE, BOOT_MEM_RAM);</div><div class='ctx'> 	txx9_sio_putchar_init(TX3927_SIO_REG(1));</div><div class='head'>diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c<br/>index a455166dc6d4..613943886e34 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/txx9/jmr3927/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/txx9/jmr3927/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/txx9/jmr3927/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/jmr3927/setup.c</a></div><div class='hunk'>@@ -150,12 +150,11 @@ static void __init jmr3927_board_init(void)</div><div class='ctx'> </div><div class='ctx'> 	jmr3927_led_set(0);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-	       "JMR-TX3927 (Rev %d) --- IOC(Rev %d) DIPSW:%d,%d,%d,%d\n",</div><div class='del'>-	       jmr3927_ioc_reg_in(JMR3927_IOC_BREV_ADDR) &amp; JMR3927_REV_MASK,</div><div class='del'>-	       jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR) &amp; JMR3927_REV_MASK,</div><div class='del'>-	       jmr3927_dipsw1(), jmr3927_dipsw2(),</div><div class='del'>-	       jmr3927_dipsw3(), jmr3927_dipsw4());</div><div class='add'>+	pr_info("JMR-TX3927 (Rev %d) --- IOC(Rev %d) DIPSW:%d,%d,%d,%d\n",</div><div class='add'>+		jmr3927_ioc_reg_in(JMR3927_IOC_BREV_ADDR) &amp; JMR3927_REV_MASK,</div><div class='add'>+		jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR) &amp; JMR3927_REV_MASK,</div><div class='add'>+		jmr3927_dipsw1(), jmr3927_dipsw2(),</div><div class='add'>+		jmr3927_dipsw3(), jmr3927_dipsw4());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This trick makes rtc-ds1742 driver usable as is. */</div><div class='head'>diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c<br/>index 07939ed6b22f..e68eb2e7ce0c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/txx9/rbtx4938/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/txx9/rbtx4938/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/txx9/rbtx4938/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/txx9/rbtx4938/setup.c</a></div><div class='hunk'>@@ -123,15 +123,15 @@ static int __init rbtx4938_ethaddr_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* 0-3: "MAC\0", 4-9:eth0, 10-15:eth1, 16:sum */</div><div class='ctx'> 	if (spi_eeprom_read(SPI_BUSNO, SEEPROM1_CS, 0, dat, sizeof(dat))) {</div><div class='del'>-		printk(KERN_ERR "seeprom: read error.\n");</div><div class='add'>+		pr_err("seeprom: read error.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (strcmp(dat, "MAC") != 0)</div><div class='del'>-			printk(KERN_WARNING "seeprom: bad signature.\n");</div><div class='add'>+			pr_warn("seeprom: bad signature.\n");</div><div class='ctx'> 		for (i = 0, sum = 0; i &lt; sizeof(dat); i++)</div><div class='ctx'> 			sum += dat[i];</div><div class='ctx'> 		if (sum)</div><div class='del'>-			printk(KERN_WARNING "seeprom: bad checksum.\n");</div><div class='add'>+			pr_warn("seeprom: bad checksum.\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	tx4938_ethaddr_init(&amp;dat[4], &amp;dat[4 + 6]);</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='hunk'>@@ -214,14 +214,14 @@ static void __init rbtx4938_mem_setup(void)</div><div class='ctx'> 	rbtx4938_fpga_resource.end = CPHYSADDR(RBTX4938_FPGA_REG_ADDR) + 0xffff;</div><div class='ctx'> 	rbtx4938_fpga_resource.flags = IORESOURCE_MEM | IORESOURCE_BUSY;</div><div class='ctx'> 	if (request_resource(&amp;txx9_ce_res[2], &amp;rbtx4938_fpga_resource))</div><div class='del'>-		printk(KERN_ERR "request resource for fpga failed\n");</div><div class='add'>+		pr_err("request resource for fpga failed\n");</div><div class='ctx'> </div><div class='ctx'> 	_machine_restart = rbtx4938_machine_restart;</div><div class='ctx'> </div><div class='ctx'> 	writeb(0xff, rbtx4938_led_addr);</div><div class='del'>-	printk(KERN_INFO "RBTX4938 --- FPGA(Rev %02x) DIPSW:%02x,%02x\n",</div><div class='del'>-	       readb(rbtx4938_fpga_rev_addr),</div><div class='del'>-	       readb(rbtx4938_dipsw_addr), readb(rbtx4938_bdipsw_addr));</div><div class='add'>+	pr_info("RBTX4938 --- FPGA(Rev %02x) DIPSW:%02x,%02x\n",</div><div class='add'>+		readb(rbtx4938_fpga_rev_addr),</div><div class='add'>+		readb(rbtx4938_dipsw_addr), readb(rbtx4938_bdipsw_addr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init rbtx4938_ne_init(void)</div><div class='head'>diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile<br/>index c3dc12a8b7d9..b47d2a45dbf4 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/vdso/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/vdso/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/vdso/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/vdso/Makefile</a></div><div class='hunk'>@@ -11,6 +11,7 @@ cflags-vdso := $(ccflags-vdso) \</div><div class='ctx'> 	$(filter -W%,$(filter-out -Wa$(comma)%,$(KBUILD_CFLAGS))) \</div><div class='ctx'> 	-O2 -g -fPIC -fno-strict-aliasing -fno-common -fno-builtin -G 0 \</div><div class='ctx'> 	-DDISABLE_BRANCH_PROFILING \</div><div class='add'>+	$(call cc-option, -fno-asynchronous-unwind-tables) \</div><div class='ctx'> 	$(call cc-option, -fno-stack-protector)</div><div class='ctx'> aflags-vdso := $(ccflags-vdso) \</div><div class='ctx'> 	-D__ASSEMBLY__ -Wa,-gdwarf-2</div><div class='hunk'>@@ -50,6 +51,9 @@ quiet_cmd_vdsold = VDSO    $@</div><div class='ctx'>       cmd_vdsold = $(CC) $(c_flags) $(VDSO_LDFLAGS) \</div><div class='ctx'>                    -Wl,-T $(filter %.lds,$^) $(filter %.o,$^) -o $@</div><div class='ctx'> </div><div class='add'>+quiet_cmd_vdsoas_o_S = AS       $@</div><div class='add'>+      cmd_vdsoas_o_S = $(CC) $(a_flags) -c -o $@ $&lt;</div><div class='add'>+</div><div class='ctx'> # Strip rule for the raw .so files</div><div class='ctx'> $(obj)/%.so.raw: OBJCOPYFLAGS := -S</div><div class='ctx'> $(obj)/%.so.raw: $(obj)/%.so.dbg.raw FORCE</div><div class='hunk'>@@ -110,7 +114,7 @@ $(obj-vdso-o32): KBUILD_CFLAGS := $(cflags-vdso) -mabi=32</div><div class='ctx'> $(obj-vdso-o32): KBUILD_AFLAGS := $(aflags-vdso) -mabi=32</div><div class='ctx'> </div><div class='ctx'> $(obj)/%-o32.o: $(src)/%.S FORCE</div><div class='del'>-	$(call if_changed_dep,as_o_S)</div><div class='add'>+	$(call if_changed_dep,vdsoas_o_S)</div><div class='ctx'> </div><div class='ctx'> $(obj)/%-o32.o: $(src)/%.c FORCE</div><div class='ctx'> 	$(call cmd,force_checksrc)</div><div class='hunk'>@@ -150,7 +154,7 @@ $(obj-vdso-n32): KBUILD_CFLAGS := $(cflags-vdso) -mabi=n32</div><div class='ctx'> $(obj-vdso-n32): KBUILD_AFLAGS := $(aflags-vdso) -mabi=n32</div><div class='ctx'> </div><div class='ctx'> $(obj)/%-n32.o: $(src)/%.S FORCE</div><div class='del'>-	$(call if_changed_dep,as_o_S)</div><div class='add'>+	$(call if_changed_dep,vdsoas_o_S)</div><div class='ctx'> </div><div class='ctx'> $(obj)/%-n32.o: $(src)/%.c FORCE</div><div class='ctx'> 	$(call cmd,force_checksrc)</div><div class='head'>diff --git a/arch/mips/vr41xx/common/bcu.c b/arch/mips/vr41xx/common/bcu.c<br/>index ff7d1c66cf82..82906722272d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/vr41xx/common/bcu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/vr41xx/common/bcu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/vr41xx/common/bcu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/vr41xx/common/bcu.c</a></div><div class='hunk'>@@ -28,11 +28,12 @@</div><div class='ctx'>  *  Yoichi Yuasa &lt;yuasa@linux-mips.org&gt;</div><div class='ctx'>  *  - Added support for NEC VR4133.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/cpu-type.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/vr41xx/common/cmu.c b/arch/mips/vr41xx/common/cmu.c<br/>index 89bac9885695..1534b354d75d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/vr41xx/common/cmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/vr41xx/common/cmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/vr41xx/common/cmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/vr41xx/common/cmu.c</a></div><div class='hunk'>@@ -28,9 +28,9 @@</div><div class='ctx'>  *  Yoichi Yuasa &lt;yuasa@linux-mips.org&gt;</div><div class='ctx'>  *  - Added support for NEC VR4133.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c<br/>index 41e873bc8474..745b7b436961 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/vr41xx/common/icu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/vr41xx/common/icu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/vr41xx/common/icu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/vr41xx/common/icu.c</a></div><div class='hunk'>@@ -29,10 +29,10 @@</div><div class='ctx'>  *  - Coped with INTASSIGN of NEC VR4133.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c<br/>index ae0e4ee6c617..28211f3ee329 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/vr41xx/common/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/vr41xx/common/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/vr41xx/common/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/vr41xx/common/irq.c</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'>  *  along with this program; if not, write to the Free Software</div><div class='ctx'>  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq_cpu.h&gt;</div><div class='head'>diff --git a/arch/mips/xilfpga/intc.c b/arch/mips/xilfpga/intc.c<br/>index c4d1a716b347..a127cca3ae8c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mips/xilfpga/intc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mips/xilfpga/intc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mips/xilfpga/intc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mips/xilfpga/intc.c</a></div><div class='hunk'>@@ -11,15 +11,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/irqchip.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq_cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct of_device_id of_irq_ids[] __initdata = {</div><div class='del'>-	{ .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_irq_of_init },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> void __init arch_init_irq(void)</div><div class='ctx'> {</div><div class='del'>-	of_irq_init(of_irq_ids);</div><div class='add'>+	irqchip_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild<br/>index 1c8dd0f5cd5d..97f64c723a0c 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> </div><div class='ctx'> generic-y += barrier.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += exec.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='head'>diff --git a/arch/mn10300/include/asm/dma-mapping.h b/arch/mn10300/include/asm/dma-mapping.h<br/>index 1dcd44757f32..737ef574b3ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -14,9 +14,9 @@</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops mn10300_dma_ops;</div><div class='add'>+extern const struct dma_map_ops mn10300_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;mn10300_dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mn10300/include/asm/kprobes.h b/arch/mn10300/include/asm/kprobes.h<br/>index c800b590183a..7abea0bdb549 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/kprobes.h</a></div><div class='hunk'>@@ -21,13 +21,17 @@</div><div class='ctx'> #ifndef _ASM_KPROBES_H</div><div class='ctx'> #define _ASM_KPROBES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='add'>+#define BREAKPOINT_INSTRUCTION	0xff</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct kprobe;</div><div class='ctx'> </div><div class='ctx'> typedef unsigned char kprobe_opcode_t;</div><div class='del'>-#define BREAKPOINT_INSTRUCTION	0xff</div><div class='ctx'> #define MAX_INSN_SIZE 8</div><div class='ctx'> #define MAX_STACK_SIZE 128</div><div class='ctx'> </div><div class='hunk'>@@ -47,4 +51,5 @@ extern int kprobe_exceptions_notify(struct notifier_block *self,</div><div class='ctx'> </div><div class='ctx'> extern void arch_remove_kprobe(struct kprobe *p);</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='ctx'> #endif /* _ASM_KPROBES_H */</div><div class='head'>diff --git a/arch/mn10300/include/asm/mmu_context.h b/arch/mn10300/include/asm/mmu_context.h<br/>index 75dbe696f830..d2034f5e6eda 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -23,6 +23,8 @@</div><div class='ctx'> #define _ASM_MMU_CONTEXT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='head'>diff --git a/arch/mn10300/include/asm/mutex.h b/arch/mn10300/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 84f5490c6fb4..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-/* MN10300 Mutex fastpath</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.</div><div class='del'>- * Written by David Howells (dhowells@redhat.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public Licence</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the Licence, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-#include &lt;asm-generic/mutex-null.h&gt;</div><div class='head'>diff --git a/arch/mn10300/include/asm/processor.h b/arch/mn10300/include/asm/processor.h<br/>index b10ba121c849..18e17abf7664 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/processor.h</a></div><div class='hunk'>@@ -69,7 +69,6 @@ extern void print_cpu_info(struct mn10300_cpuinfo *);</div><div class='ctx'> extern void dodgy_tsc(void);</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax() barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * User space process size: 1.75GB (default).</div><div class='head'>diff --git a/arch/mn10300/include/asm/switch_to.h b/arch/mn10300/include/asm/switch_to.h<br/>index 393d311735c8..67e333aa7629 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/include/asm/switch_to.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/include/asm/switch_to.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/include/asm/switch_to.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/asm/switch_to.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> struct task_struct;</div><div class='ctx'> struct thread_struct;</div><div class='ctx'> </div><div class='del'>-#if !defined(CONFIG_LAZY_SAVE_FPU)</div><div class='add'>+#if defined(CONFIG_FPU) &amp;&amp; !defined(CONFIG_LAZY_SAVE_FPU)</div><div class='ctx'> struct fpu_state_struct;</div><div class='ctx'> extern asmlinkage void fpu_save(struct fpu_state_struct *);</div><div class='ctx'> #define switch_fpu(prev, next)						\</div><div class='head'>diff --git a/arch/mn10300/include/uapi/asm/socket.h b/arch/mn10300/include/uapi/asm/socket.h<br/>index 5129f23a9ee1..0e12527c4b0e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -90,4 +90,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		53</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	54</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_SOCKET_H */</div><div class='head'>diff --git a/arch/mn10300/kernel/csrc-mn10300.c b/arch/mn10300/kernel/csrc-mn10300.c<br/>index 45644cf18c41..6b74df3661f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/kernel/csrc-mn10300.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/kernel/csrc-mn10300.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/kernel/csrc-mn10300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/csrc-mn10300.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;asm/timex.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-static cycle_t mn10300_read(struct clocksource *cs)</div><div class='add'>+static u64 mn10300_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return read_timestamp_counter();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mn10300/kernel/fpu.c b/arch/mn10300/kernel/fpu.c<br/>index 064fa194de2b..50ce7b447fed 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/kernel/fpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/kernel/fpu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/kernel/fpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/fpu.c</a></div><div class='hunk'>@@ -8,7 +8,9 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the Licence, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> #include &lt;asm/exceptions.h&gt;</div><div class='head'>diff --git a/arch/mn10300/kernel/mn10300_ksyms.c b/arch/mn10300/kernel/mn10300_ksyms.c<br/>index f9eb9753a404..ec6c4f8f93a6 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/kernel/mn10300_ksyms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/kernel/mn10300_ksyms.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/kernel/mn10300_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/mn10300_ksyms.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * 2 of the Licence, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c<br/>index cbede4e88dee..c9fa42619c6a 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/process.c</a></div><div class='hunk'>@@ -11,6 +11,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -26,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/mn10300/kernel/ptrace.c b/arch/mn10300/kernel/ptrace.c<br/>index 5bd58514e739..8009876a7ac4 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/ptrace.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -19,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/regset.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='head'>diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c<br/>index 2ad7f32fa122..1b3d80d8a171 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/setup.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='head'>diff --git a/arch/mn10300/kernel/signal.c b/arch/mn10300/kernel/signal.c<br/>index cd8cb1d1176b..2f3cb5734235 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/signal.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> #include "sigframe.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c<br/>index 426173c4b0b9..35d2c3fe6f76 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/smp.c</a></div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='hunk'>@@ -589,7 +590,7 @@ static void __init smp_cpu_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_INFO "Initializing CPU#%d\n", cpu_id);</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> 	BUG_ON(current-&gt;mm);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mn10300/kernel/sys_mn10300.c b/arch/mn10300/kernel/sys_mn10300.c<br/>index 815f1355fad4..f999981e55c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/kernel/sys_mn10300.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/kernel/sys_mn10300.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/kernel/sys_mn10300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/sys_mn10300.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> asmlinkage long old_mmap(unsigned long addr, unsigned long len,</div><div class='ctx'> 			 unsigned long prot, unsigned long flags,</div><div class='head'>diff --git a/arch/mn10300/kernel/time.c b/arch/mn10300/kernel/time.c<br/>index 67c6416a58f8..06b83b17c5f1 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/time.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  * 2 of the Licence, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='head'>diff --git a/arch/mn10300/kernel/traps.c b/arch/mn10300/kernel/traps.c<br/>index a7a987c7954f..800fd0801969 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/kernel/traps.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  * 2 of the Licence, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/mn10300/lib/checksum.c b/arch/mn10300/lib/checksum.c<br/>index b6580f5d89ee..0f569151ef11 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/lib/checksum.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/lib/checksum.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/lib/checksum.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/lib/checksum.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mn10300/mm/cache-smp.c b/arch/mn10300/mm/cache-smp.c<br/>index 2d23b9eeee62..e80996064d3d 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/mm/cache-smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/mm/cache-smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/mm/cache-smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/cache-smp.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include "cache-smp.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mn10300/mm/cache.c b/arch/mn10300/mm/cache.c<br/>index 0a1f0aa92ebc..0b925cce2b83 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/mm/cache.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/mm/cache.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/mm/cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/cache.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include "cache-smp.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mn10300/mm/dma-alloc.c b/arch/mn10300/mm/dma-alloc.c<br/>index 4f4b9029f0ea..86108d2496b3 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/mm/dma-alloc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/mm/dma-alloc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/mm/dma-alloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/dma-alloc.c</a></div><div class='hunk'>@@ -121,7 +121,7 @@ static int mn10300_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops mn10300_dma_ops = {</div><div class='add'>+const struct dma_map_ops mn10300_dma_ops = {</div><div class='ctx'> 	.alloc			= mn10300_dma_alloc,</div><div class='ctx'> 	.free			= mn10300_dma_free,</div><div class='ctx'> 	.map_page		= mn10300_dma_map_page,</div><div class='head'>diff --git a/arch/mn10300/mm/extable.c b/arch/mn10300/mm/extable.c<br/>index 25e5485ab87d..045a903ee6b9 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/extable.c</a></div><div class='hunk'>@@ -8,9 +8,9 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the Licence, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mn10300/mm/init.c b/arch/mn10300/mm/init.c<br/>index 97a1ec0beeec..8ce677d5575e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/init.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='head'>diff --git a/arch/mn10300/mm/misalignment.c b/arch/mn10300/mm/misalignment.c<br/>index b9920b1edd5a..b39a388825ae 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/mm/misalignment.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/mm/misalignment.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/mm/misalignment.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/misalignment.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the Licence, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='head'>diff --git a/arch/mn10300/mm/tlb-smp.c b/arch/mn10300/mm/tlb-smp.c<br/>index 9a39ea9031d4..085f2bb691ac 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/mm/tlb-smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/mm/tlb-smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/mm/tlb-smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/mm/tlb-smp.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='head'>diff --git a/arch/mn10300/proc-mn2ws0050/proc-init.c b/arch/mn10300/proc-mn2ws0050/proc-init.c<br/>index 950cc8dbb284..25b1b453c515 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/proc-mn2ws0050/proc-init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/proc-mn2ws0050/proc-init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/proc-mn2ws0050/proc-init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/proc-mn2ws0050/proc-init.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='head'>diff --git a/arch/mn10300/unit-asb2303/include/unit/smc91111.h b/arch/mn10300/unit-asb2303/include/unit/smc91111.h<br/>index dd456e9c513f..dd4e2946438e 100644<br/>--- a/<a href='/drm-misc/tree/arch/mn10300/unit-asb2303/include/unit/smc91111.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/mn10300/unit-asb2303/include/unit/smc91111.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/mn10300/unit-asb2303/include/unit/smc91111.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/mn10300/unit-asb2303/include/unit/smc91111.h</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #if SMC_CAN_USE_16BIT</div><div class='ctx'> #define SMC_inw(a, r)		inw((unsigned long) ((a) + (r)))</div><div class='del'>-#define SMC_outw(v, a, r)	outw(v, (unsigned long) ((a) + (r)))</div><div class='add'>+#define SMC_outw(lp, v, a, r)	outw(v, (unsigned long) ((a) + (r)))</div><div class='ctx'> #define SMC_insw(a, r, p, l)	insw((unsigned long) ((a) + (r)), (p), (l))</div><div class='ctx'> #define SMC_outsw(a, r, p, l)	outsw((unsigned long) ((a) + (r)), (p), (l))</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/nios2/boot/dts/10m50_devboard.dts b/arch/nios2/boot/dts/10m50_devboard.dts<br/>index f362b2224ee7..f362b2224ee7 100755..100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/boot/dts/10m50_devboard.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/boot/dts/10m50_devboard.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/boot/dts/10m50_devboard.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/boot/dts/10m50_devboard.dts</a></div><div class='head'>diff --git a/arch/nios2/configs/10m50_defconfig b/arch/nios2/configs/10m50_defconfig<br/>index 8b2a30b3b34f..8b2a30b3b34f 100755..100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/configs/10m50_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/configs/10m50_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/configs/10m50_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/configs/10m50_defconfig</a></div><div class='head'>diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild<br/>index d63330e88379..aaa3c218b56c 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/include/asm/Kbuild</a></div><div class='hunk'>@@ -6,7 +6,6 @@ generic-y += bitsperlong.h</div><div class='ctx'> generic-y += bug.h</div><div class='ctx'> generic-y += bugs.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += div64.h</div><div class='hunk'>@@ -63,3 +62,4 @@ generic-y += user.h</div><div class='ctx'> generic-y += vga.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/nios2/include/asm/dma-mapping.h b/arch/nios2/include/asm/dma-mapping.h<br/>index bec8ac8e6ad2..7b3c6f280293 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -10,9 +10,9 @@</div><div class='ctx'> #ifndef _ASM_NIOS2_DMA_MAPPING_H</div><div class='ctx'> #define _ASM_NIOS2_DMA_MAPPING_H</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops nios2_dma_ops;</div><div class='add'>+extern const struct dma_map_ops nios2_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;nios2_dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/nios2/include/asm/mmu_context.h b/arch/nios2/include/asm/mmu_context.h<br/>index 294b4b1f81d4..78ab3dacf579 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -13,6 +13,8 @@</div><div class='ctx'> #ifndef _ASM_NIOS2_MMU_CONTEXT_H</div><div class='ctx'> #define _ASM_NIOS2_MMU_CONTEXT_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void mmu_context_init(void);</div><div class='head'>diff --git a/arch/nios2/include/asm/mutex.h b/arch/nios2/include/asm/mutex.h<br/>deleted file mode 100644<br/>index ff6101aa2c71..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/nios2/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='head'>diff --git a/arch/nios2/include/asm/page.h b/arch/nios2/include/asm/page.h<br/>index c1683f51ad0f..f1fbdc47bdaf 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/include/asm/page.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/include/asm/page.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/include/asm/page.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/include/asm/page.h</a></div><div class='hunk'>@@ -76,8 +76,6 @@ extern unsigned long memory_size;</div><div class='ctx'> </div><div class='ctx'> extern struct page *mem_map;</div><div class='ctx'> </div><div class='del'>-#endif /* !__ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> # define __pa(x)		\</div><div class='ctx'> 	((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)</div><div class='ctx'> # define __va(x)		\</div><div class='hunk'>@@ -87,8 +85,15 @@ extern struct page *mem_map;</div><div class='ctx'> 	((void *)(((page) - mem_map) &lt;&lt; PAGE_SHIFT) + PAGE_OFFSET)</div><div class='ctx'> </div><div class='ctx'> # define pfn_to_kaddr(pfn)	__va((pfn) &lt;&lt; PAGE_SHIFT)</div><div class='del'>-# define pfn_valid(pfn)		((pfn) &gt;= ARCH_PFN_OFFSET &amp;&amp;	\</div><div class='del'>-					(pfn) &lt; max_mapnr)</div><div class='add'>+</div><div class='add'>+static inline bool pfn_valid(unsigned long pfn)</div><div class='add'>+{</div><div class='add'>+	/* avoid &lt;linux/mm.h&gt; include hell */</div><div class='add'>+	extern unsigned long max_mapnr;</div><div class='add'>+	unsigned long pfn_offset = ARCH_PFN_OFFSET;</div><div class='add'>+</div><div class='add'>+	return pfn &gt;= pfn_offset &amp;&amp; pfn &lt; max_mapnr;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> # define virt_to_page(vaddr)	pfn_to_page(PFN_DOWN(virt_to_phys(vaddr)))</div><div class='ctx'> # define virt_addr_valid(vaddr)	pfn_valid(PFN_DOWN(virt_to_phys(vaddr)))</div><div class='hunk'>@@ -106,4 +111,6 @@ extern struct page *mem_map;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/getorder.h&gt;</div><div class='ctx'> </div><div class='add'>+#endif /* !__ASSEMBLY__ */</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_NIOS2_PAGE_H */</div><div class='head'>diff --git a/arch/nios2/include/asm/processor.h b/arch/nios2/include/asm/processor.h<br/>index 1c953f0cadbf..3bbbc3d798e5 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/include/asm/processor.h</a></div><div class='hunk'>@@ -88,7 +88,6 @@ extern unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define KSTK_ESP(tsk)	((tsk)-&gt;thread.kregs-&gt;sp)</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()	barrier()</div><div class='del'>-#define cpu_relax_lowlatency()  cpu_relax()</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/nios2/kernel/process.c b/arch/nios2/kernel/process.c<br/>index 2f8c74f93e70..509e7855e8dc 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/kernel/process.c</a></div><div class='hunk'>@@ -14,6 +14,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/nios2/kernel/ptrace.c b/arch/nios2/kernel/ptrace.c<br/>index 681dda92eff1..de97bcb7dd44 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/kernel/ptrace.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/regset.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='head'>diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c<br/>index a4ff86d58d5c..6e57ffa5db27 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/kernel/setup.c</a></div><div class='hunk'>@@ -14,10 +14,12 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> #include &lt;linux/of_fdt.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='hunk'>@@ -36,6 +38,10 @@ static struct pt_regs fake_regs = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 					0, 0, 0, 0, 0, 0,</div><div class='ctx'> 					0};</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_VT</div><div class='add'>+struct screen_info screen_info;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Copy a short hook instruction sequence to the exception address */</div><div class='ctx'> static inline void copy_exception_handler(unsigned int addr)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/nios2/kernel/time.c b/arch/nios2/kernel/time.c<br/>index 746bf5caaffc..6e2bdc9b8530 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/kernel/time.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ static inline unsigned long read_timersnapshot(struct nios2_timer *timer)</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t nios2_timer_read(struct clocksource *cs)</div><div class='add'>+static u64 nios2_timer_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct nios2_clocksource *nios2_cs = to_nios2_clksource(cs);</div><div class='ctx'> 	unsigned long flags;</div><div class='head'>diff --git a/arch/nios2/kernel/traps.c b/arch/nios2/kernel/traps.c<br/>index 81f7da7b1d55..8184e7d6b385 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/kernel/traps.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='hunk'>@@ -19,7 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(die_lock);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/nios2/mm/dma-mapping.c b/arch/nios2/mm/dma-mapping.c<br/>index d800fad87896..7040c1adbb5e 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/mm/dma-mapping.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/mm/dma-mapping.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/mm/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/mm/dma-mapping.c</a></div><div class='hunk'>@@ -98,13 +98,17 @@ static int nios2_dma_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(sg, sg, nents, i) {</div><div class='del'>-		void *addr;</div><div class='add'>+		void *addr = sg_virt(sg);</div><div class='ctx'> </div><div class='del'>-		addr = sg_virt(sg);</div><div class='del'>-		if (addr) {</div><div class='del'>-			__dma_sync_for_device(addr, sg-&gt;length, direction);</div><div class='del'>-			sg-&gt;dma_address = sg_phys(sg);</div><div class='del'>-		}</div><div class='add'>+		if (!addr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sg-&gt;dma_address = sg_phys(sg);</div><div class='add'>+</div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		__dma_sync_for_device(addr, sg-&gt;length, direction);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return nents;</div><div class='hunk'>@@ -117,7 +121,9 @@ static dma_addr_t nios2_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> {</div><div class='ctx'> 	void *addr = page_address(page) + offset;</div><div class='ctx'> </div><div class='del'>-	__dma_sync_for_device(addr, size, direction);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		__dma_sync_for_device(addr, size, direction);</div><div class='add'>+</div><div class='ctx'> 	return page_to_phys(page) + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -125,7 +131,8 @@ static void nios2_dma_unmap_page(struct device *dev, dma_addr_t dma_address,</div><div class='ctx'> 		size_t size, enum dma_data_direction direction,</div><div class='ctx'> 		unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	__dma_sync_for_cpu(phys_to_virt(dma_address), size, direction);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		__dma_sync_for_cpu(phys_to_virt(dma_address), size, direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nios2_dma_unmap_sg(struct device *dev, struct scatterlist *sg,</div><div class='hunk'>@@ -138,6 +145,9 @@ static void nios2_dma_unmap_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 	if (direction == DMA_TO_DEVICE)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	for_each_sg(sg, sg, nhwentries, i) {</div><div class='ctx'> 		addr = sg_virt(sg);</div><div class='ctx'> 		if (addr)</div><div class='hunk'>@@ -182,7 +192,7 @@ static void nios2_dma_sync_sg_for_device(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops nios2_dma_ops = {</div><div class='add'>+const struct dma_map_ops nios2_dma_ops = {</div><div class='ctx'> 	.alloc			= nios2_dma_alloc,</div><div class='ctx'> 	.free			= nios2_dma_free,</div><div class='ctx'> 	.map_page		= nios2_dma_map_page,</div><div class='head'>diff --git a/arch/nios2/mm/extable.c b/arch/nios2/mm/extable.c<br/>index 4d2fc5a589d0..2574dba0407d 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/mm/extable.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs)</div><div class='head'>diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c<br/>index affc4eb3f89e..b804dd06ea1c 100644<br/>--- a/<a href='/drm-misc/tree/arch/nios2/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/nios2/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/nios2/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/nios2/mm/fault.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -21,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig<br/>index 489e7f909286..1e95920b0737 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/Kconfig</a></div><div class='hunk'>@@ -12,6 +12,7 @@ config OPENRISC</div><div class='ctx'> 	select HAVE_MEMBLOCK</div><div class='ctx'> 	select GPIOLIB</div><div class='ctx'>         select HAVE_ARCH_TRACEHOOK</div><div class='add'>+	select SPARSE_IRQ</div><div class='ctx'> 	select GENERIC_IRQ_CHIP</div><div class='ctx'> 	select GENERIC_IRQ_PROBE</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='hunk'>@@ -26,6 +27,7 @@ config OPENRISC</div><div class='ctx'> 	select HAVE_DEBUG_STACKOVERFLOW</div><div class='ctx'> 	select OR1K_PIC</div><div class='ctx'> 	select CPU_NO_EFFICIENT_FFS if !OPENRISC_HAVE_INST_FF1</div><div class='add'>+	select NO_BOOTMEM</div><div class='ctx'> </div><div class='ctx'> config MMU</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -98,6 +100,9 @@ config OPENRISC_HAVE_INST_DIV</div><div class='ctx'> 	  Select this if your implementation has a hardware divide instruction</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='add'>+config NR_CPUS</div><div class='add'>+	int</div><div class='add'>+	default "1"</div><div class='ctx'> </div><div class='ctx'> source kernel/Kconfig.hz</div><div class='ctx'> source kernel/Kconfig.preempt</div><div class='head'>diff --git a/arch/openrisc/README.openrisc b/arch/openrisc/README.openrisc<br/>index c9f7edf2b9a2..072069ab5100 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/README.openrisc?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/README.openrisc</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/README.openrisc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/README.openrisc</a></div><div class='hunk'>@@ -6,7 +6,7 @@ target architecture, specifically, is the 32-bit OpenRISC 1000 family (or1k).</div><div class='ctx'> </div><div class='ctx'> For information about OpenRISC processors and ongoing development:</div><div class='ctx'> </div><div class='del'>-	website		http://openrisc.net</div><div class='add'>+	website		http://openrisc.io</div><div class='ctx'> </div><div class='ctx'> For more information about Linux on OpenRISC, please contact South Pole AB.</div><div class='ctx'> </div><div class='hunk'>@@ -24,17 +24,17 @@ In order to build and run Linux for OpenRISC, you'll need at least a basic</div><div class='ctx'> toolchain and, perhaps, the architectural simulator.  Steps to get these bits</div><div class='ctx'> in place are outlined here.</div><div class='ctx'> </div><div class='del'>-1)  The toolchain can be obtained from openrisc.net.  Instructions for building</div><div class='add'>+1)  The toolchain can be obtained from openrisc.io.  Instructions for building</div><div class='ctx'> a toolchain can be found at:</div><div class='ctx'> </div><div class='del'>-http://openrisc.net/toolchain-build.html</div><div class='add'>+https://github.com/openrisc/tutorials</div><div class='ctx'> </div><div class='ctx'> 2) or1ksim (optional)</div><div class='ctx'> </div><div class='ctx'> or1ksim is the architectural simulator which will allow you to actually run</div><div class='ctx'> your OpenRISC Linux kernel if you don't have an OpenRISC processor at hand.</div><div class='ctx'> </div><div class='del'>-	git clone git://openrisc.net/jonas/or1ksim-svn</div><div class='add'>+	git clone https://github.com/openrisc/or1ksim.git</div><div class='ctx'> </div><div class='ctx'> 	cd or1ksim</div><div class='ctx'> 	./configure --prefix=$OPENRISC_PREFIX</div><div class='head'>diff --git a/arch/openrisc/TODO.openrisc b/arch/openrisc/TODO.openrisc<br/>index acfeef9c58e3..c43d4e1d14eb 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/TODO.openrisc?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/TODO.openrisc</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/TODO.openrisc?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/TODO.openrisc</a></div><div class='hunk'>@@ -5,12 +5,8 @@ that are due for investigation shortly, i.e. our TODO list:</div><div class='ctx'> </div><div class='ctx'> -- Implement the rest of the DMA API... dma_map_sg, etc.</div><div class='ctx'> </div><div class='del'>--- Consolidate usage of memblock and bootmem... move everything over to</div><div class='del'>-   memblock.</div><div class='del'>-</div><div class='ctx'> -- Finish the renaming cleanup... there are references to or32 in the code</div><div class='ctx'>    which was an older name for the architecture.  The name we've settled on is</div><div class='ctx'>    or1k and this change is slowly trickling through the stack.  For the time</div><div class='ctx'>    being, or32 is equivalent to or1k.</div><div class='ctx'> </div><div class='del'>--- Implement optimized version of memcpy and memset</div><div class='head'>diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild<br/>index 2832f031fb11..fb01873a5aad 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> </div><div class='ctx'> header-y += ucontext.h</div><div class='ctx'> </div><div class='del'>-generic-y += atomic.h</div><div class='ctx'> generic-y += auxvec.h</div><div class='ctx'> generic-y += barrier.h</div><div class='ctx'> generic-y += bitsperlong.h</div><div class='hunk'>@@ -10,9 +9,6 @@ generic-y += bugs.h</div><div class='ctx'> generic-y += cacheflush.h</div><div class='ctx'> generic-y += checksum.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cmpxchg-local.h</div><div class='del'>-generic-y += cmpxchg.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += div64.h</div><div class='hunk'>@@ -23,12 +19,12 @@ generic-y += exec.h</div><div class='ctx'> generic-y += fb.h</div><div class='ctx'> generic-y += fcntl.h</div><div class='ctx'> generic-y += ftrace.h</div><div class='del'>-generic-y += futex.h</div><div class='ctx'> generic-y += hardirq.h</div><div class='ctx'> generic-y += hw_irq.h</div><div class='ctx'> generic-y += ioctl.h</div><div class='ctx'> generic-y += ioctls.h</div><div class='ctx'> generic-y += ipcbuf.h</div><div class='add'>+generic-y += irq.h</div><div class='ctx'> generic-y += irq_regs.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='hunk'>@@ -71,3 +67,4 @@ generic-y += user.h</div><div class='ctx'> generic-y += vga.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/openrisc/include/asm/atomic.h b/arch/openrisc/include/asm/atomic.h<br/>new file mode 100644<br/>index 000000000000..146e1660f00e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/atomic.h</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2014 Stefan Kristiansson &lt;stefan.kristiansson@saunalahti.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2.  This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_OPENRISC_ATOMIC_H</div><div class='add'>+#define __ASM_OPENRISC_ATOMIC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* Atomically perform op with v-&gt;counter and i */</div><div class='add'>+#define ATOMIC_OP(op)							\</div><div class='add'>+static inline void atomic_##op(int i, atomic_t *v)			\</div><div class='add'>+{									\</div><div class='add'>+	int tmp;							\</div><div class='add'>+									\</div><div class='add'>+	__asm__ __volatile__(						\</div><div class='add'>+		"1:	l.lwa	%0,0(%1)	\n"			\</div><div class='add'>+		"	l." #op " %0,%0,%2	\n"			\</div><div class='add'>+		"	l.swa	0(%1),%0	\n"			\</div><div class='add'>+		"	l.bnf	1b		\n"			\</div><div class='add'>+		"	 l.nop			\n"			\</div><div class='add'>+		: "=&amp;r"(tmp)						\</div><div class='add'>+		: "r"(&amp;v-&gt;counter), "r"(i)				\</div><div class='add'>+		: "cc", "memory");					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Atomically perform op with v-&gt;counter and i, return the result */</div><div class='add'>+#define ATOMIC_OP_RETURN(op)						\</div><div class='add'>+static inline int atomic_##op##_return(int i, atomic_t *v)		\</div><div class='add'>+{									\</div><div class='add'>+	int tmp;							\</div><div class='add'>+									\</div><div class='add'>+	__asm__ __volatile__(						\</div><div class='add'>+		"1:	l.lwa	%0,0(%1)	\n"			\</div><div class='add'>+		"	l." #op " %0,%0,%2	\n"			\</div><div class='add'>+		"	l.swa	0(%1),%0	\n"			\</div><div class='add'>+		"	l.bnf	1b		\n"			\</div><div class='add'>+		"	 l.nop			\n"			\</div><div class='add'>+		: "=&amp;r"(tmp)						\</div><div class='add'>+		: "r"(&amp;v-&gt;counter), "r"(i)				\</div><div class='add'>+		: "cc", "memory");					\</div><div class='add'>+									\</div><div class='add'>+	return tmp;							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Atomically perform op with v-&gt;counter and i, return orig v-&gt;counter */</div><div class='add'>+#define ATOMIC_FETCH_OP(op)						\</div><div class='add'>+static inline int atomic_fetch_##op(int i, atomic_t *v)			\</div><div class='add'>+{									\</div><div class='add'>+	int tmp, old;							\</div><div class='add'>+									\</div><div class='add'>+	__asm__ __volatile__(						\</div><div class='add'>+		"1:	l.lwa	%0,0(%2)	\n"			\</div><div class='add'>+		"	l." #op " %1,%0,%3	\n"			\</div><div class='add'>+		"	l.swa	0(%2),%1	\n"			\</div><div class='add'>+		"	l.bnf	1b		\n"			\</div><div class='add'>+		"	 l.nop			\n"			\</div><div class='add'>+		: "=&amp;r"(old), "=&amp;r"(tmp)				\</div><div class='add'>+		: "r"(&amp;v-&gt;counter), "r"(i)				\</div><div class='add'>+		: "cc", "memory");					\</div><div class='add'>+									\</div><div class='add'>+	return old;							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ATOMIC_OP_RETURN(add)</div><div class='add'>+ATOMIC_OP_RETURN(sub)</div><div class='add'>+</div><div class='add'>+ATOMIC_FETCH_OP(add)</div><div class='add'>+ATOMIC_FETCH_OP(sub)</div><div class='add'>+ATOMIC_FETCH_OP(and)</div><div class='add'>+ATOMIC_FETCH_OP(or)</div><div class='add'>+ATOMIC_FETCH_OP(xor)</div><div class='add'>+</div><div class='add'>+ATOMIC_OP(and)</div><div class='add'>+ATOMIC_OP(or)</div><div class='add'>+ATOMIC_OP(xor)</div><div class='add'>+</div><div class='add'>+#undef ATOMIC_FETCH_OP</div><div class='add'>+#undef ATOMIC_OP_RETURN</div><div class='add'>+#undef ATOMIC_OP</div><div class='add'>+</div><div class='add'>+#define atomic_add_return	atomic_add_return</div><div class='add'>+#define atomic_sub_return	atomic_sub_return</div><div class='add'>+#define atomic_fetch_add	atomic_fetch_add</div><div class='add'>+#define atomic_fetch_sub	atomic_fetch_sub</div><div class='add'>+#define atomic_fetch_and	atomic_fetch_and</div><div class='add'>+#define atomic_fetch_or		atomic_fetch_or</div><div class='add'>+#define atomic_fetch_xor	atomic_fetch_xor</div><div class='add'>+#define atomic_and	atomic_and</div><div class='add'>+#define atomic_or	atomic_or</div><div class='add'>+#define atomic_xor	atomic_xor</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Atomically add a to v-&gt;counter as long as v is not already u.</div><div class='add'>+ * Returns the original value at v-&gt;counter.</div><div class='add'>+ *</div><div class='add'>+ * This is often used through atomic_inc_not_zero()</div><div class='add'>+ */</div><div class='add'>+static inline int __atomic_add_unless(atomic_t *v, int a, int u)</div><div class='add'>+{</div><div class='add'>+	int old, tmp;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"1:	l.lwa %0, 0(%2)		\n"</div><div class='add'>+		"	l.sfeq %0, %4		\n"</div><div class='add'>+		"	l.bf 2f			\n"</div><div class='add'>+		"	 l.add %1, %0, %3	\n"</div><div class='add'>+		"	l.swa 0(%2), %1		\n"</div><div class='add'>+		"	l.bnf 1b		\n"</div><div class='add'>+		"	 l.nop			\n"</div><div class='add'>+		"2:				\n"</div><div class='add'>+		: "=&amp;r"(old), "=&amp;r" (tmp)</div><div class='add'>+		: "r"(&amp;v-&gt;counter), "r"(a), "r"(u)</div><div class='add'>+		: "cc", "memory");</div><div class='add'>+</div><div class='add'>+	return old;</div><div class='add'>+}</div><div class='add'>+#define __atomic_add_unless	__atomic_add_unless</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/atomic.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_OPENRISC_ATOMIC_H */</div><div class='head'>diff --git a/arch/openrisc/include/asm/bitops.h b/arch/openrisc/include/asm/bitops.h<br/>index 3003cdad561b..689f56819d53 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/include/asm/bitops.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/include/asm/bitops.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/bitops.h</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> #include &lt;asm-generic/bitops/hweight.h&gt;</div><div class='ctx'> #include &lt;asm-generic/bitops/lock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm-generic/bitops/atomic.h&gt;</div><div class='add'>+#include &lt;asm/bitops/atomic.h&gt;</div><div class='ctx'> #include &lt;asm-generic/bitops/non-atomic.h&gt;</div><div class='ctx'> #include &lt;asm-generic/bitops/le.h&gt;</div><div class='ctx'> #include &lt;asm-generic/bitops/ext2-atomic.h&gt;</div><div class='head'>diff --git a/arch/openrisc/include/asm/bitops/atomic.h b/arch/openrisc/include/asm/bitops/atomic.h<br/>new file mode 100644<br/>index 000000000000..35fb85f61b4a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/bitops/atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/bitops/atomic.h</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2014 Stefan Kristiansson &lt;stefan.kristiansson@saunalahti.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2.  This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_OPENRISC_BITOPS_ATOMIC_H</div><div class='add'>+#define __ASM_OPENRISC_BITOPS_ATOMIC_H</div><div class='add'>+</div><div class='add'>+static inline void set_bit(int nr, volatile unsigned long *addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long mask = BIT_MASK(nr);</div><div class='add'>+	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"1:	l.lwa	%0,0(%1)	\n"</div><div class='add'>+		"	l.or	%0,%0,%2	\n"</div><div class='add'>+		"	l.swa	0(%1),%0	\n"</div><div class='add'>+		"	l.bnf	1b		\n"</div><div class='add'>+		"	 l.nop			\n"</div><div class='add'>+		: "=&amp;r"(tmp)</div><div class='add'>+		: "r"(p), "r"(mask)</div><div class='add'>+		: "cc", "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void clear_bit(int nr, volatile unsigned long *addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long mask = BIT_MASK(nr);</div><div class='add'>+	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"1:	l.lwa	%0,0(%1)	\n"</div><div class='add'>+		"	l.and	%0,%0,%2	\n"</div><div class='add'>+		"	l.swa	0(%1),%0	\n"</div><div class='add'>+		"	l.bnf	1b		\n"</div><div class='add'>+		"	 l.nop			\n"</div><div class='add'>+		: "=&amp;r"(tmp)</div><div class='add'>+		: "r"(p), "r"(~mask)</div><div class='add'>+		: "cc", "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void change_bit(int nr, volatile unsigned long *addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long mask = BIT_MASK(nr);</div><div class='add'>+	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"1:	l.lwa	%0,0(%1)	\n"</div><div class='add'>+		"	l.xor	%0,%0,%2	\n"</div><div class='add'>+		"	l.swa	0(%1),%0	\n"</div><div class='add'>+		"	l.bnf	1b		\n"</div><div class='add'>+		"	 l.nop			\n"</div><div class='add'>+		: "=&amp;r"(tmp)</div><div class='add'>+		: "r"(p), "r"(mask)</div><div class='add'>+		: "cc", "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int test_and_set_bit(int nr, volatile unsigned long *addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long mask = BIT_MASK(nr);</div><div class='add'>+	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);</div><div class='add'>+	unsigned long old;</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"1:	l.lwa	%0,0(%2)	\n"</div><div class='add'>+		"	l.or	%1,%0,%3	\n"</div><div class='add'>+		"	l.swa	0(%2),%1	\n"</div><div class='add'>+		"	l.bnf	1b		\n"</div><div class='add'>+		"	 l.nop			\n"</div><div class='add'>+		: "=&amp;r"(old), "=&amp;r"(tmp)</div><div class='add'>+		: "r"(p), "r"(mask)</div><div class='add'>+		: "cc", "memory");</div><div class='add'>+</div><div class='add'>+	return (old &amp; mask) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int test_and_clear_bit(int nr, volatile unsigned long *addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long mask = BIT_MASK(nr);</div><div class='add'>+	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);</div><div class='add'>+	unsigned long old;</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"1:	l.lwa	%0,0(%2)	\n"</div><div class='add'>+		"	l.and	%1,%0,%3	\n"</div><div class='add'>+		"	l.swa	0(%2),%1	\n"</div><div class='add'>+		"	l.bnf	1b		\n"</div><div class='add'>+		"	 l.nop			\n"</div><div class='add'>+		: "=&amp;r"(old), "=&amp;r"(tmp)</div><div class='add'>+		: "r"(p), "r"(~mask)</div><div class='add'>+		: "cc", "memory");</div><div class='add'>+</div><div class='add'>+	return (old &amp; mask) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int test_and_change_bit(int nr, volatile unsigned long *addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long mask = BIT_MASK(nr);</div><div class='add'>+	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);</div><div class='add'>+	unsigned long old;</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"1:	l.lwa	%0,0(%2)	\n"</div><div class='add'>+		"	l.xor	%1,%0,%3	\n"</div><div class='add'>+		"	l.swa	0(%2),%1	\n"</div><div class='add'>+		"	l.bnf	1b		\n"</div><div class='add'>+		"	 l.nop			\n"</div><div class='add'>+		: "=&amp;r"(old), "=&amp;r"(tmp)</div><div class='add'>+		: "r"(p), "r"(mask)</div><div class='add'>+		: "cc", "memory");</div><div class='add'>+</div><div class='add'>+	return (old &amp; mask) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_OPENRISC_BITOPS_ATOMIC_H */</div><div class='head'>diff --git a/arch/openrisc/include/asm/cmpxchg.h b/arch/openrisc/include/asm/cmpxchg.h<br/>new file mode 100644<br/>index 000000000000..5fcb9ac72693<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/cmpxchg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/cmpxchg.h</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2014 Stefan Kristiansson &lt;stefan.kristiansson@saunalahti.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2.  This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_OPENRISC_CMPXCHG_H</div><div class='add'>+#define __ASM_OPENRISC_CMPXCHG_H</div><div class='add'>+</div><div class='add'>+#include  &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function doesn't exist, so you'll get a linker error</div><div class='add'>+ * if something tries to do an invalid cmpxchg().</div><div class='add'>+ */</div><div class='add'>+extern void __cmpxchg_called_with_bad_pointer(void);</div><div class='add'>+</div><div class='add'>+#define __HAVE_ARCH_CMPXCHG 1</div><div class='add'>+</div><div class='add'>+static inline unsigned long</div><div class='add'>+__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)</div><div class='add'>+{</div><div class='add'>+	if (size != 4) {</div><div class='add'>+		__cmpxchg_called_with_bad_pointer();</div><div class='add'>+		return old;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"1:	l.lwa %0, 0(%1)		\n"</div><div class='add'>+		"	l.sfeq %0, %2		\n"</div><div class='add'>+		"	l.bnf 2f		\n"</div><div class='add'>+		"	 l.nop			\n"</div><div class='add'>+		"	l.swa 0(%1), %3		\n"</div><div class='add'>+		"	l.bnf 1b		\n"</div><div class='add'>+		"	 l.nop			\n"</div><div class='add'>+		"2:				\n"</div><div class='add'>+		: "=&amp;r"(old)</div><div class='add'>+		: "r"(ptr), "r"(old), "r"(new)</div><div class='add'>+		: "cc", "memory");</div><div class='add'>+</div><div class='add'>+	return old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define cmpxchg(ptr, o, n)						\</div><div class='add'>+	({								\</div><div class='add'>+		(__typeof__(*(ptr))) __cmpxchg((ptr),			\</div><div class='add'>+					       (unsigned long)(o),	\</div><div class='add'>+					       (unsigned long)(n),	\</div><div class='add'>+					       sizeof(*(ptr)));		\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function doesn't exist, so you'll get a linker error if</div><div class='add'>+ * something tries to do an invalidly-sized xchg().</div><div class='add'>+ */</div><div class='add'>+extern void __xchg_called_with_bad_pointer(void);</div><div class='add'>+</div><div class='add'>+static inline unsigned long __xchg(unsigned long val, volatile void *ptr,</div><div class='add'>+				   int size)</div><div class='add'>+{</div><div class='add'>+	if (size != 4) {</div><div class='add'>+		__xchg_called_with_bad_pointer();</div><div class='add'>+		return val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"1:	l.lwa %0, 0(%1)		\n"</div><div class='add'>+		"	l.swa 0(%1), %2		\n"</div><div class='add'>+		"	l.bnf 1b		\n"</div><div class='add'>+		"	 l.nop			\n"</div><div class='add'>+		: "=&amp;r"(val)</div><div class='add'>+		: "r"(ptr), "r"(val)</div><div class='add'>+		: "cc", "memory");</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define xchg(ptr, with) \</div><div class='add'>+	((typeof(*(ptr)))__xchg((unsigned long)(with), (ptr), sizeof(*(ptr))))</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_OPENRISC_CMPXCHG_H */</div><div class='head'>diff --git a/arch/openrisc/include/asm/cpuinfo.h b/arch/openrisc/include/asm/cpuinfo.h<br/>index 917318b6a970..ec10679d6429 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/include/asm/cpuinfo.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/include/asm/cpuinfo.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/cpuinfo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/cpuinfo.h</a></div><div class='hunk'>@@ -24,9 +24,11 @@ struct cpuinfo {</div><div class='ctx'> </div><div class='ctx'> 	u32 icache_size;</div><div class='ctx'> 	u32 icache_block_size;</div><div class='add'>+	u32 icache_ways;</div><div class='ctx'> </div><div class='ctx'> 	u32 dcache_size;</div><div class='ctx'> 	u32 dcache_block_size;</div><div class='add'>+	u32 dcache_ways;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct cpuinfo cpuinfo;</div><div class='head'>diff --git a/arch/openrisc/include/asm/dma-mapping.h b/arch/openrisc/include/asm/dma-mapping.h<br/>index 1f260bccb368..0c0075f17145 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -28,9 +28,9 @@</div><div class='ctx'> </div><div class='ctx'> #define DMA_ERROR_CODE		(~(dma_addr_t)0x0)</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops or1k_dma_map_ops;</div><div class='add'>+extern const struct dma_map_ops or1k_dma_map_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;or1k_dma_map_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/openrisc/include/asm/futex.h b/arch/openrisc/include/asm/futex.h<br/>new file mode 100644<br/>index 000000000000..778087341977<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/futex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/futex.h</a></div><div class='hunk'>@@ -0,0 +1,135 @@</div><div class='add'>+#ifndef __ASM_OPENRISC_FUTEX_H</div><div class='add'>+#define __ASM_OPENRISC_FUTEX_H</div><div class='add'>+</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/futex.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/errno.h&gt;</div><div class='add'>+</div><div class='add'>+#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \</div><div class='add'>+({								\</div><div class='add'>+	__asm__ __volatile__ (					\</div><div class='add'>+		"1:	l.lwa	%0, %2			\n"	\</div><div class='add'>+			insn				"\n"	\</div><div class='add'>+		"2:	l.swa	%2, %1			\n"	\</div><div class='add'>+		"	l.bnf	1b			\n"	\</div><div class='add'>+		"	 l.ori	%1, r0, 0		\n"	\</div><div class='add'>+		"3:					\n"	\</div><div class='add'>+		".section .fixup,\"ax\"			\n"	\</div><div class='add'>+		"4:	l.j	3b			\n"	\</div><div class='add'>+		"	 l.addi	%1, r0, %3		\n"	\</div><div class='add'>+		".previous				\n"	\</div><div class='add'>+		".section __ex_table,\"a\"		\n"	\</div><div class='add'>+		".word	1b,4b,2b,4b			\n"	\</div><div class='add'>+		".previous				\n"	\</div><div class='add'>+		: "=&amp;r" (oldval), "=&amp;r" (ret), "+m" (*uaddr)	\</div><div class='add'>+		: "i" (-EFAULT), "r" (oparg)			\</div><div class='add'>+		: "cc", "memory"				\</div><div class='add'>+		);						\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)</div><div class='add'>+{</div><div class='add'>+	int op = (encoded_op &gt;&gt; 28) &amp; 7;</div><div class='add'>+	int cmp = (encoded_op &gt;&gt; 24) &amp; 15;</div><div class='add'>+	int oparg = (encoded_op &lt;&lt; 8) &gt;&gt; 20;</div><div class='add'>+	int cmparg = (encoded_op &lt;&lt; 20) &gt;&gt; 20;</div><div class='add'>+	int oldval = 0, ret;</div><div class='add'>+</div><div class='add'>+	if (encoded_op &amp; (FUTEX_OP_OPARG_SHIFT &lt;&lt; 28))</div><div class='add'>+		oparg = 1 &lt;&lt; oparg;</div><div class='add'>+</div><div class='add'>+	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	pagefault_disable();</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case FUTEX_OP_SET:</div><div class='add'>+		__futex_atomic_op("l.or %1,%4,%4", ret, oldval, uaddr, oparg);</div><div class='add'>+		break;</div><div class='add'>+	case FUTEX_OP_ADD:</div><div class='add'>+		__futex_atomic_op("l.add %1,%0,%4", ret, oldval, uaddr, oparg);</div><div class='add'>+		break;</div><div class='add'>+	case FUTEX_OP_OR:</div><div class='add'>+		__futex_atomic_op("l.or %1,%0,%4", ret, oldval, uaddr, oparg);</div><div class='add'>+		break;</div><div class='add'>+	case FUTEX_OP_ANDN:</div><div class='add'>+		__futex_atomic_op("l.and %1,%0,%4", ret, oldval, uaddr, ~oparg);</div><div class='add'>+		break;</div><div class='add'>+	case FUTEX_OP_XOR:</div><div class='add'>+		__futex_atomic_op("l.xor %1,%0,%4", ret, oldval, uaddr, oparg);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENOSYS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pagefault_enable();</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		switch (cmp) {</div><div class='add'>+		case FUTEX_OP_CMP_EQ:</div><div class='add'>+			ret = (oldval == cmparg);</div><div class='add'>+			break;</div><div class='add'>+		case FUTEX_OP_CMP_NE:</div><div class='add'>+			ret = (oldval != cmparg);</div><div class='add'>+			break;</div><div class='add'>+		case FUTEX_OP_CMP_LT:</div><div class='add'>+			ret = (oldval &lt; cmparg);</div><div class='add'>+			break;</div><div class='add'>+		case FUTEX_OP_CMP_GE:</div><div class='add'>+			ret = (oldval &gt;= cmparg);</div><div class='add'>+			break;</div><div class='add'>+		case FUTEX_OP_CMP_LE:</div><div class='add'>+			ret = (oldval &lt;= cmparg);</div><div class='add'>+			break;</div><div class='add'>+		case FUTEX_OP_CMP_GT:</div><div class='add'>+			ret = (oldval &gt; cmparg);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -ENOSYS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,</div><div class='add'>+			      u32 oldval, u32 newval)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 prev;</div><div class='add'>+</div><div class='add'>+	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__ (				\</div><div class='add'>+		"1:	l.lwa	%1, %2		\n"	\</div><div class='add'>+		"	l.sfeq	%1, %3		\n"	\</div><div class='add'>+		"	l.bnf	3f		\n"	\</div><div class='add'>+		"	 l.nop			\n"	\</div><div class='add'>+		"2:	l.swa	%2, %4		\n"	\</div><div class='add'>+		"	l.bnf	1b		\n"	\</div><div class='add'>+		"	 l.nop			\n"	\</div><div class='add'>+		"3:				\n"	\</div><div class='add'>+		".section .fixup,\"ax\"		\n"	\</div><div class='add'>+		"4:	l.j	3b		\n"	\</div><div class='add'>+		"	 l.addi	%0, r0, %5	\n"	\</div><div class='add'>+		".previous			\n"	\</div><div class='add'>+		".section __ex_table,\"a\"	\n"	\</div><div class='add'>+		".word	1b,4b,2b,4b		\n"	\</div><div class='add'>+		".previous			\n"	\</div><div class='add'>+		: "+r" (ret), "=&amp;r" (prev), "+m" (*uaddr) \</div><div class='add'>+		: "r" (oldval), "r" (newval), "i" (-EFAULT) \</div><div class='add'>+		: "cc",	"memory"			\</div><div class='add'>+		);</div><div class='add'>+</div><div class='add'>+	*uval = prev;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __KERNEL__ */</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_OPENRISC_FUTEX_H */</div><div class='head'>diff --git a/arch/openrisc/include/asm/mutex.h b/arch/openrisc/include/asm/mutex.h<br/>deleted file mode 100644<br/>index b85a0cfa9fc9..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * OpenRISC Linux</div><div class='del'>- *</div><div class='del'>- * Linux architectural port borrowing liberally from similar works of</div><div class='del'>- * others.  All original copyrights apply as per the original source</div><div class='del'>- * declaration.</div><div class='del'>- *</div><div class='del'>- * OpenRISC implementation:</div><div class='del'>- * Copyright (C) 2003 Matjaz Breskvar &lt;phoenix@bsemi.com&gt;</div><div class='del'>- * Copyright (C) 2010-2011 Jonas Bonn &lt;jonas@southpole.se&gt;</div><div class='del'>- * et al.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Pull in the generic implementation for the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='head'>diff --git a/arch/openrisc/include/asm/pgalloc.h b/arch/openrisc/include/asm/pgalloc.h<br/>index 87eebd185089..3e1a46615120 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/include/asm/pgalloc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/include/asm/pgalloc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/pgalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/pgalloc.h</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int mem_init_done;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/openrisc/include/asm/pgtable.h b/arch/openrisc/include/asm/pgtable.h<br/>index 69c7df0e1420..3567aa7be555 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/include/asm/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/include/asm/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/pgtable.h</a></div><div class='hunk'>@@ -69,7 +69,7 @@ extern void paging_init(void);</div><div class='ctx'>  */</div><div class='ctx'> #define PTRS_PER_PTE	(1UL &lt;&lt; (PAGE_SHIFT-2))</div><div class='ctx'> </div><div class='del'>-#define PTRS_PER_PGD	(1UL &lt;&lt; (PAGE_SHIFT-2))</div><div class='add'>+#define PTRS_PER_PGD	(1UL &lt;&lt; (32-PGDIR_SHIFT))</div><div class='ctx'> </div><div class='ctx'> /* calculate how many PGD entries a user-level program can use</div><div class='ctx'>  * the first mappable virtual address is 0</div><div class='head'>diff --git a/arch/openrisc/include/asm/processor.h b/arch/openrisc/include/asm/processor.h<br/>index 70334c9f7d24..a908e6c30a00 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/processor.h</a></div><div class='hunk'>@@ -92,7 +92,6 @@ extern unsigned long thread_saved_pc(struct task_struct *t);</div><div class='ctx'> #define init_stack      (init_thread_union.stack)</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()     barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* __ASM_OPENRISC_PROCESSOR_H */</div><div class='head'>diff --git a/arch/openrisc/include/asm/spr_defs.h b/arch/openrisc/include/asm/spr_defs.h<br/>index 5dbc668865c4..367dac70326a 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/include/asm/spr_defs.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/include/asm/spr_defs.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/spr_defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/spr_defs.h</a></div><div class='hunk'>@@ -152,8 +152,8 @@</div><div class='ctx'> #define SPR_UPR_MP	   0x00000020  /* MAC present */</div><div class='ctx'> #define SPR_UPR_DUP	   0x00000040  /* Debug unit present */</div><div class='ctx'> #define SPR_UPR_PCUP	   0x00000080  /* Performance counters unit present */</div><div class='del'>-#define SPR_UPR_PMP	   0x00000100  /* Power management present */</div><div class='del'>-#define SPR_UPR_PICP	   0x00000200  /* PIC present */</div><div class='add'>+#define SPR_UPR_PICP	   0x00000100  /* PIC present */</div><div class='add'>+#define SPR_UPR_PMP	   0x00000200  /* Power management present */</div><div class='ctx'> #define SPR_UPR_TTP	   0x00000400  /* Tick timer present */</div><div class='ctx'> #define SPR_UPR_RES	   0x00fe0000  /* Reserved */</div><div class='ctx'> #define SPR_UPR_CUP	   0xff000000  /* Context units present */</div><div class='head'>diff --git a/arch/openrisc/include/asm/string.h b/arch/openrisc/include/asm/string.h<br/>new file mode 100644<br/>index 000000000000..64939ccd7531<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/include/asm/string.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/include/asm/string.h</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+#ifndef __ASM_OPENRISC_STRING_H</div><div class='add'>+#define __ASM_OPENRISC_STRING_H</div><div class='add'>+</div><div class='add'>+#define __HAVE_ARCH_MEMSET</div><div class='add'>+extern void *memset(void *s, int c, __kernel_size_t n);</div><div class='add'>+</div><div class='add'>+#define __HAVE_ARCH_MEMCPY</div><div class='add'>+extern void *memcpy(void *dest, __const void *src, __kernel_size_t n);</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_OPENRISC_STRING_H */</div><div class='head'>diff --git a/arch/openrisc/kernel/.gitignore b/arch/openrisc/kernel/.gitignore<br/>new file mode 100644<br/>index 000000000000..c5f676c3c224<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/.gitignore</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+vmlinux.lds</div><div class='head'>diff --git a/arch/openrisc/kernel/dma.c b/arch/openrisc/kernel/dma.c<br/>index 140c99140649..b10369b7e31b 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/kernel/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/kernel/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/dma.c</a></div><div class='hunk'>@@ -141,6 +141,9 @@ or1k_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 	unsigned long cl;</div><div class='ctx'> 	dma_addr_t addr = page_to_phys(page) + offset;</div><div class='ctx'> </div><div class='add'>+	if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+		return addr;</div><div class='add'>+</div><div class='ctx'> 	switch (dir) {</div><div class='ctx'> 	case DMA_TO_DEVICE:</div><div class='ctx'> 		/* Flush the dcache for the requested range */</div><div class='hunk'>@@ -229,7 +232,7 @@ or1k_sync_single_for_device(struct device *dev,</div><div class='ctx'> 		mtspr(SPR_DCBFR, cl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops or1k_dma_map_ops = {</div><div class='add'>+const struct dma_map_ops or1k_dma_map_ops = {</div><div class='ctx'> 	.alloc = or1k_dma_alloc,</div><div class='ctx'> 	.free = or1k_dma_free,</div><div class='ctx'> 	.map_page = or1k_map_page,</div><div class='head'>diff --git a/arch/openrisc/kernel/entry.S b/arch/openrisc/kernel/entry.S<br/>index fec8bf97d806..1b7160c79646 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/kernel/entry.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/kernel/entry.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/entry.S</a></div><div class='hunk'>@@ -173,6 +173,11 @@ handler:							;\</div><div class='ctx'> 	l.j	_ret_from_exception				;\</div><div class='ctx'> 	 l.nop</div><div class='ctx'> </div><div class='add'>+/* clobbers 'reg' */</div><div class='add'>+#define CLEAR_LWA_FLAG(reg)		\</div><div class='add'>+	l.movhi	reg,hi(lwa_flag)	;\</div><div class='add'>+	l.ori	reg,reg,lo(lwa_flag)	;\</div><div class='add'>+	l.sw	0(reg),r0</div><div class='ctx'> /*</div><div class='ctx'>  * NOTE: one should never assume that SPR_EPC, SPR_ESR, SPR_EEAR</div><div class='ctx'>  *       contain the same values as when exception we're handling</div><div class='hunk'>@@ -193,6 +198,7 @@ EXCEPTION_ENTRY(_tng_kernel_start)</div><div class='ctx'> /* ---[ 0x200: BUS exception ]------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> EXCEPTION_ENTRY(_bus_fault_handler)</div><div class='add'>+	CLEAR_LWA_FLAG(r3)</div><div class='ctx'> 	/* r4: EA of fault (set by EXCEPTION_HANDLE) */</div><div class='ctx'> 	l.jal   do_bus_fault</div><div class='ctx'> 	 l.addi  r3,r1,0 /* pt_regs */</div><div class='hunk'>@@ -202,11 +208,13 @@ EXCEPTION_ENTRY(_bus_fault_handler)</div><div class='ctx'> </div><div class='ctx'> /* ---[ 0x300: Data Page Fault exception ]------------------------------- */</div><div class='ctx'> EXCEPTION_ENTRY(_dtlb_miss_page_fault_handler)</div><div class='add'>+	CLEAR_LWA_FLAG(r3)</div><div class='ctx'> 	l.and	r5,r5,r0</div><div class='ctx'> 	l.j	1f</div><div class='ctx'> 	 l.nop</div><div class='ctx'> </div><div class='ctx'> EXCEPTION_ENTRY(_data_page_fault_handler)</div><div class='add'>+	CLEAR_LWA_FLAG(r3)</div><div class='ctx'> 	/* set up parameters for do_page_fault */</div><div class='ctx'> 	l.ori	r5,r0,0x300		   // exception vector</div><div class='ctx'> 1:</div><div class='hunk'>@@ -220,7 +228,7 @@ EXCEPTION_ENTRY(_data_page_fault_handler)</div><div class='ctx'> 	 * DTLB miss handler in the CONFIG_GUARD_PROTECTED_CORE part</div><div class='ctx'> 	 */</div><div class='ctx'> #ifdef CONFIG_OPENRISC_NO_SPR_SR_DSX</div><div class='del'>-	l.lwz   r6,PT_PC(r3)                  // address of an offending insn</div><div class='add'>+	l.lwz   r6,PT_PC(r3)               // address of an offending insn</div><div class='ctx'> 	l.lwz   r6,0(r6)                   // instruction that caused pf</div><div class='ctx'> </div><div class='ctx'> 	l.srli  r6,r6,26                   // check opcode for jump insn</div><div class='hunk'>@@ -236,57 +244,57 @@ EXCEPTION_ENTRY(_data_page_fault_handler)</div><div class='ctx'> 	l.bf    8f</div><div class='ctx'> 	l.sfeqi r6,0x12                    // l.jalr</div><div class='ctx'> 	l.bf    8f</div><div class='del'>-</div><div class='del'>-	l.nop</div><div class='add'>+	 l.nop</div><div class='ctx'> </div><div class='ctx'> 	l.j     9f</div><div class='del'>-	l.nop</div><div class='del'>-8:</div><div class='add'>+	 l.nop</div><div class='ctx'> </div><div class='del'>-	l.lwz   r6,PT_PC(r3)                  // address of an offending insn</div><div class='add'>+8: // offending insn is in delay slot</div><div class='add'>+	l.lwz   r6,PT_PC(r3)               // address of an offending insn</div><div class='ctx'> 	l.addi  r6,r6,4</div><div class='ctx'> 	l.lwz   r6,0(r6)                   // instruction that caused pf</div><div class='ctx'> 	l.srli  r6,r6,26                   // get opcode</div><div class='del'>-9:</div><div class='add'>+9: // offending instruction opcode loaded in r6</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-	l.mfspr r6,r0,SPR_SR		   // SR</div><div class='del'>-//	l.lwz	r6,PT_SR(r3)		   // ESR</div><div class='del'>-	l.andi	r6,r6,SPR_SR_DSX	   // check for delay slot exception</div><div class='del'>-	l.sfeqi	r6,0x1			   // exception happened in delay slot</div><div class='del'>-	l.bnf	7f</div><div class='del'>-	l.lwz	r6,PT_PC(r3)		   // address of an offending insn</div><div class='add'>+	l.lwz   r6,PT_SR(r3)               // SR</div><div class='add'>+	l.andi  r6,r6,SPR_SR_DSX           // check for delay slot exception</div><div class='add'>+	l.sfne  r6,r0                      // exception happened in delay slot</div><div class='add'>+	l.bnf   7f</div><div class='add'>+	 l.lwz  r6,PT_PC(r3)               // address of an offending insn</div><div class='ctx'> </div><div class='del'>-	l.addi	r6,r6,4			   // offending insn is in delay slot</div><div class='add'>+	l.addi	r6,r6,4                    // offending insn is in delay slot</div><div class='ctx'> 7:</div><div class='ctx'> 	l.lwz   r6,0(r6)                   // instruction that caused pf</div><div class='ctx'> 	l.srli  r6,r6,26                   // check opcode for write access</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	l.sfgeui r6,0x34		   // check opcode for write access</div><div class='add'>+	l.sfgeui r6,0x33                   // check opcode for write access</div><div class='ctx'> 	l.bnf   1f</div><div class='ctx'> 	l.sfleui r6,0x37</div><div class='ctx'> 	l.bnf   1f</div><div class='ctx'> 	l.ori   r6,r0,0x1                  // write access</div><div class='ctx'> 	l.j     2f</div><div class='del'>-	l.nop</div><div class='add'>+	 l.nop</div><div class='ctx'> 1:	l.ori   r6,r0,0x0                  // !write access</div><div class='ctx'> 2:</div><div class='ctx'> </div><div class='ctx'> 	/* call fault.c handler in or32/mm/fault.c */</div><div class='ctx'> 	l.jal   do_page_fault</div><div class='del'>-	l.nop</div><div class='add'>+	 l.nop</div><div class='ctx'> 	l.j     _ret_from_exception</div><div class='del'>-	l.nop</div><div class='add'>+	 l.nop</div><div class='ctx'> </div><div class='ctx'> /* ---[ 0x400: Insn Page Fault exception ]------------------------------- */</div><div class='ctx'> EXCEPTION_ENTRY(_itlb_miss_page_fault_handler)</div><div class='add'>+	CLEAR_LWA_FLAG(r3)</div><div class='ctx'> 	l.and	r5,r5,r0</div><div class='ctx'> 	l.j	1f</div><div class='ctx'> 	 l.nop</div><div class='ctx'> </div><div class='ctx'> EXCEPTION_ENTRY(_insn_page_fault_handler)</div><div class='add'>+	CLEAR_LWA_FLAG(r3)</div><div class='ctx'> 	/* set up parameters for do_page_fault */</div><div class='ctx'> 	l.ori	r5,r0,0x400		   // exception vector</div><div class='ctx'> 1:</div><div class='hunk'>@@ -296,23 +304,25 @@ EXCEPTION_ENTRY(_insn_page_fault_handler)</div><div class='ctx'> </div><div class='ctx'> 	/* call fault.c handler in or32/mm/fault.c */</div><div class='ctx'> 	l.jal   do_page_fault</div><div class='del'>-	l.nop</div><div class='add'>+	 l.nop</div><div class='ctx'> 	l.j     _ret_from_exception</div><div class='del'>-	l.nop</div><div class='add'>+	 l.nop</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* ---[ 0x500: Timer exception ]----------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> EXCEPTION_ENTRY(_timer_handler)</div><div class='add'>+	CLEAR_LWA_FLAG(r3)</div><div class='ctx'> 	l.jal	timer_interrupt</div><div class='ctx'> 	 l.addi r3,r1,0 /* pt_regs */</div><div class='ctx'> </div><div class='ctx'> 	l.j    _ret_from_intr</div><div class='ctx'> 	 l.nop</div><div class='ctx'> </div><div class='del'>-/* ---[ 0x600: Aligment exception ]-------------------------------------- */</div><div class='add'>+/* ---[ 0x600: Alignment exception ]-------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> EXCEPTION_ENTRY(_alignment_handler)</div><div class='add'>+	CLEAR_LWA_FLAG(r3)</div><div class='ctx'> 	/* r4: EA of fault (set by EXCEPTION_HANDLE) */</div><div class='ctx'> 	l.jal   do_unaligned_access</div><div class='ctx'> 	 l.addi  r3,r1,0 /* pt_regs */</div><div class='hunk'>@@ -321,8 +331,8 @@ EXCEPTION_ENTRY(_alignment_handler)</div><div class='ctx'> 	 l.nop</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-EXCEPTION_ENTRY(_aligment_handler)</div><div class='del'>-//        l.mfspr r2,r0,SPR_EEAR_BASE     /* Load the efective addres */</div><div class='add'>+EXCEPTION_ENTRY(_alignment_handler)</div><div class='add'>+//        l.mfspr r2,r0,SPR_EEAR_BASE     /* Load the effective address */</div><div class='ctx'> 	l.addi	r2,r4,0</div><div class='ctx'> //        l.mfspr r5,r0,SPR_EPCR_BASE     /* Load the insn address */</div><div class='ctx'> 	l.lwz   r5,PT_PC(r1)</div><div class='hunk'>@@ -509,6 +519,7 @@ EXCEPTION_ENTRY(_external_irq_handler)</div><div class='ctx'> //	l.sw	PT_SR(r1),r4</div><div class='ctx'> 1:</div><div class='ctx'> #endif</div><div class='add'>+	CLEAR_LWA_FLAG(r3)</div><div class='ctx'> 	l.addi	r3,r1,0</div><div class='ctx'> 	l.movhi	r8,hi(do_IRQ)</div><div class='ctx'> 	l.ori	r8,r8,lo(do_IRQ)</div><div class='hunk'>@@ -556,8 +567,12 @@ ENTRY(_sys_call_handler)</div><div class='ctx'> 	 * they should be clobbered, otherwise</div><div class='ctx'> 	 */</div><div class='ctx'> 	l.sw    PT_GPR3(r1),r3</div><div class='del'>-	/* r4 already saved */</div><div class='del'>-	/* r4 holds the EEAR address of the fault, load the original r4 */</div><div class='add'>+	/*</div><div class='add'>+	 * r4 already saved</div><div class='add'>+	 * r4 holds the EEAR address of the fault, use it as screatch reg and</div><div class='add'>+	 * then load the original r4</div><div class='add'>+	 */</div><div class='add'>+	CLEAR_LWA_FLAG(r4)</div><div class='ctx'> 	l.lwz	r4,PT_GPR4(r1)</div><div class='ctx'> 	l.sw    PT_GPR5(r1),r5</div><div class='ctx'> 	l.sw    PT_GPR6(r1),r6</div><div class='hunk'>@@ -776,6 +791,7 @@ UNHANDLED_EXCEPTION(_vector_0xd00,0xd00)</div><div class='ctx'> /* ---[ 0xe00: Trap exception ]------------------------------------------ */</div><div class='ctx'> </div><div class='ctx'> EXCEPTION_ENTRY(_trap_handler)</div><div class='add'>+	CLEAR_LWA_FLAG(r3)</div><div class='ctx'> 	/* r4: EA of fault (set by EXCEPTION_HANDLE) */</div><div class='ctx'> 	l.jal   do_trap</div><div class='ctx'> 	 l.addi  r3,r1,0 /* pt_regs */</div><div class='hunk'>@@ -1101,8 +1117,16 @@ ENTRY(__sys_fork)</div><div class='ctx'> 	 l.addi	r3,r1,0</div><div class='ctx'> </div><div class='ctx'> ENTRY(sys_rt_sigreturn)</div><div class='del'>-	l.j	_sys_rt_sigreturn</div><div class='add'>+	l.jal	_sys_rt_sigreturn</div><div class='ctx'> 	 l.addi	r3,r1,0</div><div class='add'>+	l.sfne	r30,r0</div><div class='add'>+	l.bnf	_no_syscall_trace</div><div class='add'>+	 l.nop</div><div class='add'>+	l.jal	do_syscall_trace_leave</div><div class='add'>+	 l.addi	r3,r1,0</div><div class='add'>+_no_syscall_trace:</div><div class='add'>+	l.j	_resume_userspace</div><div class='add'>+	 l.nop</div><div class='ctx'> </div><div class='ctx'> /* This is a catch-all syscall for atomic instructions for the OpenRISC 1000.</div><div class='ctx'>  * The functions takes a variable number of parameters depending on which</div><div class='head'>diff --git a/arch/openrisc/kernel/head.S b/arch/openrisc/kernel/head.S<br/>index f14793306b03..1e87913576e3 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/kernel/head.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/kernel/head.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/head.S</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/spr_defs.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -34,7 +35,7 @@</div><div class='ctx'> 	l.add	rd,rd,rs</div><div class='ctx'> </div><div class='ctx'> #define CLEAR_GPR(gpr)				\</div><div class='del'>-	l.or    gpr,r0,r0</div><div class='add'>+	l.movhi	gpr,0x0</div><div class='ctx'> </div><div class='ctx'> #define LOAD_SYMBOL_2_GPR(gpr,symbol)		\</div><div class='ctx'> 	l.movhi gpr,hi(symbol)			;\</div><div class='hunk'>@@ -324,7 +325,7 @@ _dispatch_do_ipage_fault:</div><div class='ctx'>     .org 0x500</div><div class='ctx'> 	EXCEPTION_HANDLE(_timer_handler)</div><div class='ctx'> </div><div class='del'>-/* ---[ 0x600: Aligment exception ]-------------------------------------- */</div><div class='add'>+/* ---[ 0x600: Alignment exception ]-------------------------------------- */</div><div class='ctx'>     .org 0x600</div><div class='ctx'> 	EXCEPTION_HANDLE(_alignment_handler)</div><div class='ctx'> </div><div class='hunk'>@@ -442,6 +443,9 @@ _dispatch_do_ipage_fault:</div><div class='ctx'> 	__HEAD</div><div class='ctx'> 	.global _start</div><div class='ctx'> _start:</div><div class='add'>+	/* Init r0 to zero as per spec */</div><div class='add'>+	CLEAR_GPR(r0)</div><div class='add'>+</div><div class='ctx'> 	/* save kernel parameters */</div><div class='ctx'> 	l.or	r25,r0,r3	/* pointer to fdt */</div><div class='ctx'> </div><div class='hunk'>@@ -486,7 +490,8 @@ _start:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * set up initial ksp and current</div><div class='ctx'> 	 */</div><div class='del'>-	LOAD_SYMBOL_2_GPR(r1,init_thread_union+0x2000)	// setup kernel stack</div><div class='add'>+	/* setup kernel stack */</div><div class='add'>+	LOAD_SYMBOL_2_GPR(r1,init_thread_union + THREAD_SIZE)</div><div class='ctx'> 	LOAD_SYMBOL_2_GPR(r10,init_thread_union)	// setup current</div><div class='ctx'> 	tophys	(r31,r10)</div><div class='ctx'> 	l.sw	TI_KSP(r31), r1</div><div class='hunk'>@@ -520,22 +525,8 @@ enable_dc:</div><div class='ctx'> 	 l.nop</div><div class='ctx'> </div><div class='ctx'> flush_tlb:</div><div class='del'>-	/*</div><div class='del'>-	 *  I N V A L I D A T E   T L B   e n t r i e s</div><div class='del'>-	 */</div><div class='del'>-	LOAD_SYMBOL_2_GPR(r5,SPR_DTLBMR_BASE(0))</div><div class='del'>-	LOAD_SYMBOL_2_GPR(r6,SPR_ITLBMR_BASE(0))</div><div class='del'>-	l.addi	r7,r0,128 /* Maximum number of sets */</div><div class='del'>-1:</div><div class='del'>-	l.mtspr	r5,r0,0x0</div><div class='del'>-	l.mtspr	r6,r0,0x0</div><div class='del'>-</div><div class='del'>-	l.addi	r5,r5,1</div><div class='del'>-	l.addi	r6,r6,1</div><div class='del'>-	l.sfeq	r7,r0</div><div class='del'>-	l.bnf	1b</div><div class='del'>-	 l.addi	r7,r7,-1</div><div class='del'>-</div><div class='add'>+	l.jal	_flush_tlb</div><div class='add'>+	 l.nop</div><div class='ctx'> </div><div class='ctx'> /* The MMU needs to be enabled before or32_early_setup is called */</div><div class='ctx'> </div><div class='hunk'>@@ -627,10 +618,30 @@ jump_start_kernel:</div><div class='ctx'> 	l.jr    r30</div><div class='ctx'> 	 l.nop</div><div class='ctx'> </div><div class='add'>+_flush_tlb:</div><div class='add'>+	/*</div><div class='add'>+	 *  I N V A L I D A T E   T L B   e n t r i e s</div><div class='add'>+	 */</div><div class='add'>+	LOAD_SYMBOL_2_GPR(r5,SPR_DTLBMR_BASE(0))</div><div class='add'>+	LOAD_SYMBOL_2_GPR(r6,SPR_ITLBMR_BASE(0))</div><div class='add'>+	l.addi	r7,r0,128 /* Maximum number of sets */</div><div class='add'>+1:</div><div class='add'>+	l.mtspr	r5,r0,0x0</div><div class='add'>+	l.mtspr	r6,r0,0x0</div><div class='add'>+</div><div class='add'>+	l.addi	r5,r5,1</div><div class='add'>+	l.addi	r6,r6,1</div><div class='add'>+	l.sfeq	r7,r0</div><div class='add'>+	l.bnf	1b</div><div class='add'>+	 l.addi	r7,r7,-1</div><div class='add'>+</div><div class='add'>+	l.jr	r9</div><div class='add'>+	 l.nop</div><div class='add'>+</div><div class='ctx'> /* ========================================[ cache ]=== */</div><div class='ctx'> </div><div class='del'>-	/* aligment here so we don't change memory offsets with</div><div class='del'>-	 * memory controler defined</div><div class='add'>+	/* alignment here so we don't change memory offsets with</div><div class='add'>+	 * memory controller defined</div><div class='ctx'> 	 */</div><div class='ctx'> 	.align 0x2000</div><div class='ctx'> </div><div class='hunk'>@@ -971,8 +982,6 @@ ENTRY(dtlb_miss_handler)</div><div class='ctx'> 	EXCEPTION_STORE_GPR2</div><div class='ctx'> 	EXCEPTION_STORE_GPR3</div><div class='ctx'> 	EXCEPTION_STORE_GPR4</div><div class='del'>-	EXCEPTION_STORE_GPR5</div><div class='del'>-	EXCEPTION_STORE_GPR6</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * get EA of the miss</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -980,91 +989,70 @@ ENTRY(dtlb_miss_handler)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * pmd = (pmd_t *)(current_pgd + pgd_index(daddr));</div><div class='ctx'> 	 */</div><div class='del'>-	GET_CURRENT_PGD(r3,r5)		// r3 is current_pgd, r5 is temp</div><div class='add'>+	GET_CURRENT_PGD(r3,r4)		// r3 is current_pgd, r4 is temp</div><div class='ctx'> 	l.srli	r4,r2,0x18		// &gt;&gt; PAGE_SHIFT + (PAGE_SHIFT - 2)</div><div class='ctx'> 	l.slli	r4,r4,0x2		// to get address &lt;&lt; 2</div><div class='del'>-	l.add	r5,r4,r3		// r4 is pgd_index(daddr)</div><div class='add'>+	l.add	r3,r4,r3		// r4 is pgd_index(daddr)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if (pmd_none(*pmd))</div><div class='ctx'> 	 *   goto pmd_none:</div><div class='ctx'> 	 */</div><div class='del'>-	tophys	(r4,r5)</div><div class='add'>+	tophys	(r4,r3)</div><div class='ctx'> 	l.lwz	r3,0x0(r4)		// get *pmd value</div><div class='ctx'> 	l.sfne	r3,r0</div><div class='ctx'> 	l.bnf	d_pmd_none</div><div class='del'>-	 l.andi	r3,r3,~PAGE_MASK //0x1fff		// ~PAGE_MASK</div><div class='del'>-	/*</div><div class='del'>-	 * if (pmd_bad(*pmd))</div><div class='del'>-	 *   pmd_clear(pmd)</div><div class='del'>-	 *   goto pmd_bad:</div><div class='del'>-	 */</div><div class='del'>-//	l.sfeq	r3,r0			// check *pmd value</div><div class='del'>-//	l.bf	d_pmd_good</div><div class='del'>-	l.addi	r3,r0,0xffffe000	// PAGE_MASK</div><div class='del'>-//	l.j	d_pmd_bad</div><div class='del'>-//	l.sw	0x0(r4),r0		// clear pmd</div><div class='add'>+	 l.addi	r3,r0,0xffffe000	// PAGE_MASK</div><div class='add'>+</div><div class='ctx'> d_pmd_good:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * pte = *pte_offset(pmd, daddr);</div><div class='ctx'> 	 */</div><div class='ctx'> 	l.lwz	r4,0x0(r4)		// get **pmd value</div><div class='ctx'> 	l.and	r4,r4,r3		// &amp; PAGE_MASK</div><div class='del'>-	l.srli	r5,r2,0xd		// &gt;&gt; PAGE_SHIFT, r2 == EEAR</div><div class='del'>-	l.andi	r3,r5,0x7ff		// (1UL &lt;&lt; PAGE_SHIFT - 2) - 1</div><div class='add'>+	l.srli	r2,r2,0xd		// &gt;&gt; PAGE_SHIFT, r2 == EEAR</div><div class='add'>+	l.andi	r3,r2,0x7ff		// (1UL &lt;&lt; PAGE_SHIFT - 2) - 1</div><div class='ctx'> 	l.slli	r3,r3,0x2		// to get address &lt;&lt; 2</div><div class='ctx'> 	l.add	r3,r3,r4</div><div class='del'>-	l.lwz	r2,0x0(r3)		// this is pte at last</div><div class='add'>+	l.lwz	r3,0x0(r3)		// this is pte at last</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if (!pte_present(pte))</div><div class='ctx'> 	 */</div><div class='del'>-	l.andi	r4,r2,0x1</div><div class='add'>+	l.andi	r4,r3,0x1</div><div class='ctx'> 	l.sfne	r4,r0			// is pte present</div><div class='ctx'> 	l.bnf	d_pte_not_present</div><div class='del'>-	l.addi	r3,r0,0xffffe3fa	// PAGE_MASK | DTLB_UP_CONVERT_MASK</div><div class='add'>+	l.addi	r4,r0,0xffffe3fa	// PAGE_MASK | DTLB_UP_CONVERT_MASK</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * fill DTLB TR register</div><div class='ctx'> 	 */</div><div class='del'>-	l.and	r4,r2,r3		// apply the mask</div><div class='add'>+	l.and	r4,r3,r4		// apply the mask</div><div class='ctx'> 	// Determine number of DMMU sets</div><div class='del'>-	l.mfspr r6, r0, SPR_DMMUCFGR</div><div class='del'>-	l.andi	r6, r6, SPR_DMMUCFGR_NTS</div><div class='del'>-	l.srli	r6, r6, SPR_DMMUCFGR_NTS_OFF</div><div class='add'>+	l.mfspr r2, r0, SPR_DMMUCFGR</div><div class='add'>+	l.andi	r2, r2, SPR_DMMUCFGR_NTS</div><div class='add'>+	l.srli	r2, r2, SPR_DMMUCFGR_NTS_OFF</div><div class='ctx'> 	l.ori	r3, r0, 0x1</div><div class='del'>-	l.sll	r3, r3, r6 	// r3 = number DMMU sets DMMUCFGR</div><div class='del'>-	l.addi	r6, r3, -1  	// r6 = nsets mask</div><div class='del'>-	l.and	r5, r5, r6	// calc offset:	 &amp; (NUM_TLB_ENTRIES-1)</div><div class='add'>+	l.sll	r3, r3, r2 	// r3 = number DMMU sets DMMUCFGR</div><div class='add'>+	l.addi	r2, r3, -1  	// r2 = nsets mask</div><div class='add'>+	l.mfspr	r3, r0, SPR_EEAR_BASE</div><div class='add'>+	l.srli	r3, r3, 0xd	// &gt;&gt; PAGE_SHIFT</div><div class='add'>+	l.and	r2, r3, r2	// calc offset:	 &amp; (NUM_TLB_ENTRIES-1)</div><div class='ctx'> 	                                                   //NUM_TLB_ENTRIES</div><div class='del'>-	l.mtspr	r5,r4,SPR_DTLBTR_BASE(0)</div><div class='add'>+	l.mtspr	r2,r4,SPR_DTLBTR_BASE(0)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * fill DTLB MR register</div><div class='ctx'> 	 */</div><div class='del'>-	l.mfspr	r2,r0,SPR_EEAR_BASE</div><div class='del'>-	l.addi	r3,r0,0xffffe000	// PAGE_MASK</div><div class='del'>-	l.and	r4,r2,r3		// apply PAGE_MASK to EA (__PHX__ do we really need this?)</div><div class='del'>-	l.ori	r4,r4,0x1		// set hardware valid bit: DTBL_MR entry</div><div class='del'>-	l.mtspr	r5,r4,SPR_DTLBMR_BASE(0)</div><div class='add'>+	l.slli	r3, r3, 0xd		/* &lt;&lt; PAGE_SHIFT =&gt; EA &amp; PAGE_MASK */</div><div class='add'>+	l.ori	r4,r3,0x1		// set hardware valid bit: DTBL_MR entry</div><div class='add'>+	l.mtspr	r2,r4,SPR_DTLBMR_BASE(0)</div><div class='ctx'> </div><div class='ctx'> 	EXCEPTION_LOAD_GPR2</div><div class='ctx'> 	EXCEPTION_LOAD_GPR3</div><div class='ctx'> 	EXCEPTION_LOAD_GPR4</div><div class='del'>-	EXCEPTION_LOAD_GPR5</div><div class='del'>-	EXCEPTION_LOAD_GPR6</div><div class='del'>-	l.rfe</div><div class='del'>-d_pmd_bad:</div><div class='del'>-	l.nop	1</div><div class='del'>-	EXCEPTION_LOAD_GPR2</div><div class='del'>-	EXCEPTION_LOAD_GPR3</div><div class='del'>-	EXCEPTION_LOAD_GPR4</div><div class='del'>-	EXCEPTION_LOAD_GPR5</div><div class='del'>-	EXCEPTION_LOAD_GPR6</div><div class='ctx'> 	l.rfe</div><div class='ctx'> d_pmd_none:</div><div class='ctx'> d_pte_not_present:</div><div class='ctx'> 	EXCEPTION_LOAD_GPR2</div><div class='ctx'> 	EXCEPTION_LOAD_GPR3</div><div class='ctx'> 	EXCEPTION_LOAD_GPR4</div><div class='del'>-	EXCEPTION_LOAD_GPR5</div><div class='del'>-	EXCEPTION_LOAD_GPR6</div><div class='ctx'> 	EXCEPTION_HANDLE(_dtlb_miss_page_fault_handler)</div><div class='ctx'> </div><div class='ctx'> /* ==============================================[ ITLB miss handler ]=== */</div><div class='hunk'>@@ -1072,8 +1060,6 @@ ENTRY(itlb_miss_handler)</div><div class='ctx'> 	EXCEPTION_STORE_GPR2</div><div class='ctx'> 	EXCEPTION_STORE_GPR3</div><div class='ctx'> 	EXCEPTION_STORE_GPR4</div><div class='del'>-	EXCEPTION_STORE_GPR5</div><div class='del'>-	EXCEPTION_STORE_GPR6</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * get EA of the miss</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1083,30 +1069,19 @@ ENTRY(itlb_miss_handler)</div><div class='ctx'> 	 * pmd = (pmd_t *)(current_pgd + pgd_index(daddr));</div><div class='ctx'> 	 *</div><div class='ctx'> 	 */</div><div class='del'>-	GET_CURRENT_PGD(r3,r5)		// r3 is current_pgd, r5 is temp</div><div class='add'>+	GET_CURRENT_PGD(r3,r4)		// r3 is current_pgd, r5 is temp</div><div class='ctx'> 	l.srli	r4,r2,0x18		// &gt;&gt; PAGE_SHIFT + (PAGE_SHIFT - 2)</div><div class='ctx'> 	l.slli	r4,r4,0x2		// to get address &lt;&lt; 2</div><div class='del'>-	l.add	r5,r4,r3		// r4 is pgd_index(daddr)</div><div class='add'>+	l.add	r3,r4,r3		// r4 is pgd_index(daddr)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if (pmd_none(*pmd))</div><div class='ctx'> 	 *   goto pmd_none:</div><div class='ctx'> 	 */</div><div class='del'>-	tophys	(r4,r5)</div><div class='add'>+	tophys	(r4,r3)</div><div class='ctx'> 	l.lwz	r3,0x0(r4)		// get *pmd value</div><div class='ctx'> 	l.sfne	r3,r0</div><div class='ctx'> 	l.bnf	i_pmd_none</div><div class='del'>-	l.andi	r3,r3,0x1fff		// ~PAGE_MASK</div><div class='del'>-	/*</div><div class='del'>-	 * if (pmd_bad(*pmd))</div><div class='del'>-	 *   pmd_clear(pmd)</div><div class='del'>-	 *   goto pmd_bad:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-//	l.sfeq	r3,r0			// check *pmd value</div><div class='del'>-//	l.bf	i_pmd_good</div><div class='del'>-	l.addi	r3,r0,0xffffe000	// PAGE_MASK</div><div class='del'>-//	l.j	i_pmd_bad</div><div class='del'>-//	l.sw	0x0(r4),r0		// clear pmd</div><div class='add'>+	 l.addi	r3,r0,0xffffe000	// PAGE_MASK</div><div class='ctx'> </div><div class='ctx'> i_pmd_good:</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1115,35 +1090,36 @@ i_pmd_good:</div><div class='ctx'> 	 */</div><div class='ctx'> 	l.lwz	r4,0x0(r4)		// get **pmd value</div><div class='ctx'> 	l.and	r4,r4,r3		// &amp; PAGE_MASK</div><div class='del'>-	l.srli	r5,r2,0xd		// &gt;&gt; PAGE_SHIFT, r2 == EEAR</div><div class='del'>-	l.andi	r3,r5,0x7ff		// (1UL &lt;&lt; PAGE_SHIFT - 2) - 1</div><div class='add'>+	l.srli	r2,r2,0xd		// &gt;&gt; PAGE_SHIFT, r2 == EEAR</div><div class='add'>+	l.andi	r3,r2,0x7ff		// (1UL &lt;&lt; PAGE_SHIFT - 2) - 1</div><div class='ctx'> 	l.slli	r3,r3,0x2		// to get address &lt;&lt; 2</div><div class='ctx'> 	l.add	r3,r3,r4</div><div class='del'>-	l.lwz	r2,0x0(r3)		// this is pte at last</div><div class='add'>+	l.lwz	r3,0x0(r3)		// this is pte at last</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if (!pte_present(pte))</div><div class='ctx'> 	 *</div><div class='ctx'> 	 */</div><div class='del'>-	l.andi	r4,r2,0x1</div><div class='add'>+	l.andi	r4,r3,0x1</div><div class='ctx'> 	l.sfne	r4,r0			// is pte present</div><div class='ctx'> 	l.bnf	i_pte_not_present</div><div class='del'>-	l.addi	r3,r0,0xffffe03a	// PAGE_MASK | ITLB_UP_CONVERT_MASK</div><div class='add'>+	 l.addi	r4,r0,0xffffe03a	// PAGE_MASK | ITLB_UP_CONVERT_MASK</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * fill ITLB TR register</div><div class='ctx'> 	 */</div><div class='del'>-	l.and	r4,r2,r3		// apply the mask</div><div class='del'>-	l.andi	r3,r2,0x7c0		// _PAGE_EXEC | _PAGE_SRE | _PAGE_SWE |  _PAGE_URE | _PAGE_UWE</div><div class='del'>-//	l.andi	r3,r2,0x400		// _PAGE_EXEC</div><div class='add'>+	l.and	r4,r3,r4		// apply the mask</div><div class='add'>+	l.andi	r3,r3,0x7c0		// _PAGE_EXEC | _PAGE_SRE | _PAGE_SWE |  _PAGE_URE | _PAGE_UWE</div><div class='ctx'> 	l.sfeq	r3,r0</div><div class='ctx'> 	l.bf	itlb_tr_fill //_workaround</div><div class='ctx'> 	// Determine number of IMMU sets</div><div class='del'>-	l.mfspr r6, r0, SPR_IMMUCFGR</div><div class='del'>-	l.andi	r6, r6, SPR_IMMUCFGR_NTS</div><div class='del'>-	l.srli	r6, r6, SPR_IMMUCFGR_NTS_OFF</div><div class='add'>+	l.mfspr r2, r0, SPR_IMMUCFGR</div><div class='add'>+	l.andi	r2, r2, SPR_IMMUCFGR_NTS</div><div class='add'>+	l.srli	r2, r2, SPR_IMMUCFGR_NTS_OFF</div><div class='ctx'> 	l.ori	r3, r0, 0x1</div><div class='del'>-	l.sll	r3, r3, r6 	// r3 = number IMMU sets IMMUCFGR</div><div class='del'>-	l.addi	r6, r3, -1  	// r6 = nsets mask</div><div class='del'>-	l.and	r5, r5, r6	// calc offset:	 &amp; (NUM_TLB_ENTRIES-1)</div><div class='add'>+	l.sll	r3, r3, r2 	// r3 = number IMMU sets IMMUCFGR</div><div class='add'>+	l.addi	r2, r3, -1  	// r2 = nsets mask</div><div class='add'>+	l.mfspr	r3, r0, SPR_EEAR_BASE</div><div class='add'>+	l.srli	r3, r3, 0xd	// &gt;&gt; PAGE_SHIFT</div><div class='add'>+	l.and	r2, r3, r2	// calc offset:	 &amp; (NUM_TLB_ENTRIES-1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * __PHX__ :: fixme</div><div class='hunk'>@@ -1155,38 +1131,24 @@ i_pmd_good:</div><div class='ctx'> itlb_tr_fill_workaround:</div><div class='ctx'> 	l.ori	r4,r4,0xc0		// | (SPR_ITLBTR_UXE | ITLBTR_SXE)</div><div class='ctx'> itlb_tr_fill:</div><div class='del'>-	l.mtspr	r5,r4,SPR_ITLBTR_BASE(0)</div><div class='add'>+	l.mtspr	r2,r4,SPR_ITLBTR_BASE(0)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * fill DTLB MR register</div><div class='ctx'> 	 */</div><div class='del'>-	l.mfspr	r2,r0,SPR_EEAR_BASE</div><div class='del'>-	l.addi	r3,r0,0xffffe000	// PAGE_MASK</div><div class='del'>-	l.and	r4,r2,r3		// apply PAGE_MASK to EA (__PHX__ do we really need this?)</div><div class='del'>-	l.ori	r4,r4,0x1		// set hardware valid bit: DTBL_MR entry</div><div class='del'>-	l.mtspr	r5,r4,SPR_ITLBMR_BASE(0)</div><div class='add'>+	l.slli	r3, r3, 0xd		/* &lt;&lt; PAGE_SHIFT =&gt; EA &amp; PAGE_MASK */</div><div class='add'>+	l.ori	r4,r3,0x1		// set hardware valid bit: ITBL_MR entry</div><div class='add'>+	l.mtspr	r2,r4,SPR_ITLBMR_BASE(0)</div><div class='ctx'> </div><div class='ctx'> 	EXCEPTION_LOAD_GPR2</div><div class='ctx'> 	EXCEPTION_LOAD_GPR3</div><div class='ctx'> 	EXCEPTION_LOAD_GPR4</div><div class='del'>-	EXCEPTION_LOAD_GPR5</div><div class='del'>-	EXCEPTION_LOAD_GPR6</div><div class='ctx'> 	l.rfe</div><div class='ctx'> </div><div class='del'>-i_pmd_bad:</div><div class='del'>-	l.nop	1</div><div class='del'>-	EXCEPTION_LOAD_GPR2</div><div class='del'>-	EXCEPTION_LOAD_GPR3</div><div class='del'>-	EXCEPTION_LOAD_GPR4</div><div class='del'>-	EXCEPTION_LOAD_GPR5</div><div class='del'>-	EXCEPTION_LOAD_GPR6</div><div class='del'>-	l.rfe</div><div class='ctx'> i_pmd_none:</div><div class='ctx'> i_pte_not_present:</div><div class='ctx'> 	EXCEPTION_LOAD_GPR2</div><div class='ctx'> 	EXCEPTION_LOAD_GPR3</div><div class='ctx'> 	EXCEPTION_LOAD_GPR4</div><div class='del'>-	EXCEPTION_LOAD_GPR5</div><div class='del'>-	EXCEPTION_LOAD_GPR6</div><div class='ctx'> 	EXCEPTION_HANDLE(_itlb_miss_page_fault_handler)</div><div class='ctx'> </div><div class='ctx'> /* ==============================================[ boot tlb handlers ]=== */</div><div class='hunk'>@@ -1571,12 +1533,7 @@ ENTRY(_early_uart_init)</div><div class='ctx'> 	l.jr	r9</div><div class='ctx'> 	l.nop</div><div class='ctx'> </div><div class='del'>-_string_copying_linux:</div><div class='del'>-	.string "\n\n\n\n\n\rCopying Linux... \0"</div><div class='del'>-</div><div class='del'>-_string_ok_booting:</div><div class='del'>-	.string "Ok, booting the kernel.\n\r\0"</div><div class='del'>-</div><div class='add'>+	.section .rodata</div><div class='ctx'> _string_unhandled_exception:</div><div class='ctx'> 	.string "\n\rRunarunaround: Unhandled exception 0x\0"</div><div class='ctx'> </div><div class='hunk'>@@ -1586,11 +1543,6 @@ _string_epc_prefix:</div><div class='ctx'> _string_nl:</div><div class='ctx'> 	.string "\n\r\0"</div><div class='ctx'> </div><div class='del'>-	.global	_string_esr_irq_bug</div><div class='del'>-_string_esr_irq_bug:</div><div class='del'>-	.string "\n\rESR external interrupt bug, for details look into entry.S\n\r\0"</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /* ========================================[ page aligned structures ]=== */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/openrisc/kernel/or32_ksyms.c b/arch/openrisc/kernel/or32_ksyms.c<br/>index 83ccf7c0c58d..5c4695d13542 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/kernel/or32_ksyms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/kernel/or32_ksyms.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/or32_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/or32_ksyms.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/semaphore.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardirq.h&gt;</div><div class='hunk'>@@ -44,3 +44,4 @@ DECLARE_EXPORT(__ashldi3);</div><div class='ctx'> DECLARE_EXPORT(__lshrdi3);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(__copy_tofrom_user);</div><div class='add'>+EXPORT_SYMBOL(memset);</div><div class='head'>diff --git a/arch/openrisc/kernel/process.c b/arch/openrisc/kernel/process.c<br/>index 7095dfe7666b..828a29110459 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/process.c</a></div><div class='hunk'>@@ -22,6 +22,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -36,7 +39,7 @@</div><div class='ctx'> #include &lt;linux/mqueue.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -75,6 +78,17 @@ void machine_power_off(void)</div><div class='ctx'> 	__asm__("l.nop 1");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Send the doze signal to the cpu if available.</div><div class='add'>+ * Make sure, that all interrupts are enabled</div><div class='add'>+ */</div><div class='add'>+void arch_cpu_idle(void)</div><div class='add'>+{</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	if (mfspr(SPR_UPR) &amp; SPR_UPR_PMP)</div><div class='add'>+		mtspr(SPR_PMR, mfspr(SPR_PMR) | SPR_PMR_DME);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void (*pm_power_off) (void) = machine_power_off;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -173,6 +187,19 @@ copy_thread(unsigned long clone_flags, unsigned long usp,</div><div class='ctx'> </div><div class='ctx'> 		if (usp)</div><div class='ctx'> 			userregs-&gt;sp = usp;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * For CLONE_SETTLS set "tp" (r10) to the TLS pointer passed to sys_clone.</div><div class='add'>+		 *</div><div class='add'>+		 * The kernel entry is:</div><div class='add'>+		 *	int clone (long flags, void *child_stack, int *parent_tid,</div><div class='add'>+		 *		int *child_tid, struct void *tls)</div><div class='add'>+		 *</div><div class='add'>+		 * This makes the source r7 in the kernel registers.</div><div class='add'>+		 */</div><div class='add'>+		if (clone_flags &amp; CLONE_SETTLS)</div><div class='add'>+			userregs-&gt;gpr[10] = userregs-&gt;gpr[7];</div><div class='add'>+</div><div class='ctx'> 		userregs-&gt;gpr[11] = 0;	/* Result from fork() */</div><div class='ctx'> </div><div class='ctx'> 		kregs-&gt;gpr[20] = 0;	/* Userspace thread */</div><div class='hunk'>@@ -213,6 +240,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t * fpu)</div><div class='ctx'> </div><div class='ctx'> extern struct thread_info *_switch(struct thread_info *old_ti,</div><div class='ctx'> 				   struct thread_info *new_ti);</div><div class='add'>+extern int lwa_flag;</div><div class='ctx'> </div><div class='ctx'> struct task_struct *__switch_to(struct task_struct *old,</div><div class='ctx'> 				struct task_struct *new)</div><div class='hunk'>@@ -230,6 +258,8 @@ struct task_struct *__switch_to(struct task_struct *old,</div><div class='ctx'> 	new_ti = new-&gt;stack;</div><div class='ctx'> 	old_ti = old-&gt;stack;</div><div class='ctx'> </div><div class='add'>+	lwa_flag = 0;</div><div class='add'>+</div><div class='ctx'> 	current_thread_info_set[smp_processor_id()] = new_ti;</div><div class='ctx'> 	last = (_switch(old_ti, new_ti))-&gt;task;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/openrisc/kernel/ptrace.c b/arch/openrisc/kernel/ptrace.c<br/>index 4f59fa4e34e5..eb97a8e7c8aa 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/ptrace.c</a></div><div class='hunk'>@@ -16,9 +16,9 @@</div><div class='ctx'>  *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c<br/>index b4ed8b36e078..dbf5ee95a0d5 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/setup.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='hunk'>@@ -51,18 +50,16 @@</div><div class='ctx'> </div><div class='ctx'> #include "vmlinux.h"</div><div class='ctx'> </div><div class='del'>-static unsigned long __init setup_memory(void)</div><div class='add'>+static void __init setup_memory(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long bootmap_size;</div><div class='ctx'> 	unsigned long ram_start_pfn;</div><div class='del'>-	unsigned long free_ram_start_pfn;</div><div class='ctx'> 	unsigned long ram_end_pfn;</div><div class='ctx'> 	phys_addr_t memory_start, memory_end;</div><div class='ctx'> 	struct memblock_region *region;</div><div class='ctx'> </div><div class='ctx'> 	memory_end = memory_start = 0;</div><div class='ctx'> </div><div class='del'>-	/* Find main memory where is the kernel */</div><div class='add'>+	/* Find main memory where is the kernel, we assume its the only one */</div><div class='ctx'> 	for_each_memblock(memory, region) {</div><div class='ctx'> 		memory_start = region-&gt;base;</div><div class='ctx'> 		memory_end = region-&gt;base + region-&gt;size;</div><div class='hunk'>@@ -75,10 +72,11 @@ static unsigned long __init setup_memory(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ram_start_pfn = PFN_UP(memory_start);</div><div class='del'>-	/* free_ram_start_pfn is first page after kernel */</div><div class='del'>-	free_ram_start_pfn = PFN_UP(__pa(_end));</div><div class='ctx'> 	ram_end_pfn = PFN_DOWN(memblock_end_of_DRAM());</div><div class='ctx'> </div><div class='add'>+	/* setup bootmem globals (we use no_bootmem, but mm still depends on this) */</div><div class='add'>+	min_low_pfn = ram_start_pfn;</div><div class='add'>+	max_low_pfn = ram_end_pfn;</div><div class='ctx'> 	max_pfn = ram_end_pfn;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -86,22 +84,13 @@ static unsigned long __init setup_memory(void)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This makes the memory from the end of the kernel to the end of</div><div class='ctx'> 	 * RAM usable.</div><div class='del'>-	 * init_bootmem sets the global values min_low_pfn, max_low_pfn.</div><div class='ctx'> 	 */</div><div class='del'>-	bootmap_size = init_bootmem(free_ram_start_pfn,</div><div class='del'>-				    ram_end_pfn - ram_start_pfn);</div><div class='del'>-	free_bootmem(PFN_PHYS(free_ram_start_pfn),</div><div class='del'>-		     (ram_end_pfn - free_ram_start_pfn) &lt;&lt; PAGE_SHIFT);</div><div class='del'>-	reserve_bootmem(PFN_PHYS(free_ram_start_pfn), bootmap_size,</div><div class='del'>-			BOOTMEM_DEFAULT);</div><div class='del'>-</div><div class='del'>-	for_each_memblock(reserved, region) {</div><div class='del'>-		printk(KERN_INFO "Reserved - 0x%08x-0x%08x\n",</div><div class='del'>-		       (u32) region-&gt;base, (u32) region-&gt;size);</div><div class='del'>-		reserve_bootmem(region-&gt;base, region-&gt;size, BOOTMEM_DEFAULT);</div><div class='del'>-	}</div><div class='add'>+	memblock_reserve(__pa(_stext), _end - _stext);</div><div class='add'>+</div><div class='add'>+	early_init_fdt_reserve_self();</div><div class='add'>+	early_init_fdt_scan_reserved_mem();</div><div class='ctx'> </div><div class='del'>-	return ram_end_pfn;</div><div class='add'>+	memblock_dump_all();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct cpuinfo cpuinfo;</div><div class='hunk'>@@ -128,13 +117,15 @@ static void print_cpuinfo(void)</div><div class='ctx'> 	if (upr &amp; SPR_UPR_DCP)</div><div class='ctx'> 		printk(KERN_INFO</div><div class='ctx'> 		       "-- dcache: %4d bytes total, %2d bytes/line, %d way(s)\n",</div><div class='del'>-		       cpuinfo.dcache_size, cpuinfo.dcache_block_size, 1);</div><div class='add'>+		       cpuinfo.dcache_size, cpuinfo.dcache_block_size,</div><div class='add'>+		       cpuinfo.dcache_ways);</div><div class='ctx'> 	else</div><div class='ctx'> 		printk(KERN_INFO "-- dcache disabled\n");</div><div class='ctx'> 	if (upr &amp; SPR_UPR_ICP)</div><div class='ctx'> 		printk(KERN_INFO</div><div class='ctx'> 		       "-- icache: %4d bytes total, %2d bytes/line, %d way(s)\n",</div><div class='del'>-		       cpuinfo.icache_size, cpuinfo.icache_block_size, 1);</div><div class='add'>+		       cpuinfo.icache_size, cpuinfo.icache_block_size,</div><div class='add'>+		       cpuinfo.icache_ways);</div><div class='ctx'> 	else</div><div class='ctx'> 		printk(KERN_INFO "-- icache disabled\n");</div><div class='ctx'> </div><div class='hunk'>@@ -166,25 +157,25 @@ void __init setup_cpuinfo(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *cpu;</div><div class='ctx'> 	unsigned long iccfgr, dccfgr;</div><div class='del'>-	unsigned long cache_set_size, cache_ways;</div><div class='add'>+	unsigned long cache_set_size;</div><div class='ctx'> </div><div class='ctx'> 	cpu = of_find_compatible_node(NULL, NULL, "opencores,or1200-rtlsvn481");</div><div class='ctx'> 	if (!cpu)</div><div class='ctx'> 		panic("No compatible CPU found in device tree...\n");</div><div class='ctx'> </div><div class='ctx'> 	iccfgr = mfspr(SPR_ICCFGR);</div><div class='del'>-	cache_ways = 1 &lt;&lt; (iccfgr &amp; SPR_ICCFGR_NCW);</div><div class='add'>+	cpuinfo.icache_ways = 1 &lt;&lt; (iccfgr &amp; SPR_ICCFGR_NCW);</div><div class='ctx'> 	cache_set_size = 1 &lt;&lt; ((iccfgr &amp; SPR_ICCFGR_NCS) &gt;&gt; 3);</div><div class='ctx'> 	cpuinfo.icache_block_size = 16 &lt;&lt; ((iccfgr &amp; SPR_ICCFGR_CBS) &gt;&gt; 7);</div><div class='ctx'> 	cpuinfo.icache_size =</div><div class='del'>-	    cache_set_size * cache_ways * cpuinfo.icache_block_size;</div><div class='add'>+	    cache_set_size * cpuinfo.icache_ways * cpuinfo.icache_block_size;</div><div class='ctx'> </div><div class='ctx'> 	dccfgr = mfspr(SPR_DCCFGR);</div><div class='del'>-	cache_ways = 1 &lt;&lt; (dccfgr &amp; SPR_DCCFGR_NCW);</div><div class='add'>+	cpuinfo.dcache_ways = 1 &lt;&lt; (dccfgr &amp; SPR_DCCFGR_NCW);</div><div class='ctx'> 	cache_set_size = 1 &lt;&lt; ((dccfgr &amp; SPR_DCCFGR_NCS) &gt;&gt; 3);</div><div class='ctx'> 	cpuinfo.dcache_block_size = 16 &lt;&lt; ((dccfgr &amp; SPR_DCCFGR_CBS) &gt;&gt; 7);</div><div class='ctx'> 	cpuinfo.dcache_size =</div><div class='del'>-	    cache_set_size * cache_ways * cpuinfo.dcache_block_size;</div><div class='add'>+	    cache_set_size * cpuinfo.dcache_ways * cpuinfo.dcache_block_size;</div><div class='ctx'> </div><div class='ctx'> 	if (of_property_read_u32(cpu, "clock-frequency",</div><div class='ctx'> 				 &amp;cpuinfo.clock_frequency)) {</div><div class='hunk'>@@ -219,15 +210,6 @@ void __init or32_early_setup(void *fdt)</div><div class='ctx'> 	early_init_devtree(fdt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init openrisc_device_probe(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_populate(NULL, NULL, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-device_initcall(openrisc_device_probe);</div><div class='del'>-</div><div class='ctx'> static inline unsigned long extract_value_bits(unsigned long reg,</div><div class='ctx'> 					       short bit_nr, short width)</div><div class='ctx'> {</div><div class='hunk'>@@ -282,8 +264,6 @@ void calibrate_delay(void)</div><div class='ctx'> </div><div class='ctx'> void __init setup_arch(char **cmdline_p)</div><div class='ctx'> {</div><div class='del'>-	unsigned long max_low_pfn;</div><div class='del'>-</div><div class='ctx'> 	unflatten_and_copy_device_tree();</div><div class='ctx'> </div><div class='ctx'> 	setup_cpuinfo();</div><div class='hunk'>@@ -304,8 +284,8 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	initrd_below_start_ok = 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* setup bootmem allocator */</div><div class='del'>-	max_low_pfn = setup_memory();</div><div class='add'>+	/* setup memblock allocator */</div><div class='add'>+	setup_memory();</div><div class='ctx'> </div><div class='ctx'> 	/* paging_init() sets up the MMU and marks all pages as reserved */</div><div class='ctx'> 	paging_init();</div><div class='hunk'>@@ -317,7 +297,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> </div><div class='ctx'> 	*cmdline_p = boot_command_line;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "OpenRISC Linux -- http://openrisc.net\n");</div><div class='add'>+	printk(KERN_INFO "OpenRISC Linux -- http://openrisc.io\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='hunk'>@@ -330,30 +310,33 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 	revision = vr &amp; SPR_VR_REV;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m,</div><div class='del'>-		   "cpu\t\t: OpenRISC-%x\n"</div><div class='del'>-		   "revision\t: %d\n"</div><div class='del'>-		   "frequency\t: %ld\n"</div><div class='del'>-		   "dcache size\t: %d bytes\n"</div><div class='del'>-		   "dcache block size\t: %d bytes\n"</div><div class='del'>-		   "icache size\t: %d bytes\n"</div><div class='del'>-		   "icache block size\t: %d bytes\n"</div><div class='del'>-		   "immu\t\t: %d entries, %lu ways\n"</div><div class='del'>-		   "dmmu\t\t: %d entries, %lu ways\n"</div><div class='del'>-		   "bogomips\t: %lu.%02lu\n",</div><div class='del'>-		   version,</div><div class='del'>-		   revision,</div><div class='del'>-		   loops_per_jiffy * HZ,</div><div class='del'>-		   cpuinfo.dcache_size,</div><div class='del'>-		   cpuinfo.dcache_block_size,</div><div class='del'>-		   cpuinfo.icache_size,</div><div class='del'>-		   cpuinfo.icache_block_size,</div><div class='del'>-		   1 &lt;&lt; ((mfspr(SPR_DMMUCFGR) &amp; SPR_DMMUCFGR_NTS) &gt;&gt; 2),</div><div class='del'>-		   1 + (mfspr(SPR_DMMUCFGR) &amp; SPR_DMMUCFGR_NTW),</div><div class='del'>-		   1 &lt;&lt; ((mfspr(SPR_IMMUCFGR) &amp; SPR_IMMUCFGR_NTS) &gt;&gt; 2),</div><div class='del'>-		   1 + (mfspr(SPR_IMMUCFGR) &amp; SPR_IMMUCFGR_NTW),</div><div class='del'>-		   (loops_per_jiffy * HZ) / 500000,</div><div class='del'>-		   ((loops_per_jiffy * HZ) / 5000) % 100);</div><div class='del'>-</div><div class='add'>+		  "cpu\t\t: OpenRISC-%x\n"</div><div class='add'>+		  "revision\t: %d\n"</div><div class='add'>+		  "frequency\t: %ld\n"</div><div class='add'>+		  "dcache size\t: %d bytes\n"</div><div class='add'>+		  "dcache block size\t: %d bytes\n"</div><div class='add'>+		  "dcache ways\t: %d\n"</div><div class='add'>+		  "icache size\t: %d bytes\n"</div><div class='add'>+		  "icache block size\t: %d bytes\n"</div><div class='add'>+		  "icache ways\t: %d\n"</div><div class='add'>+		  "immu\t\t: %d entries, %lu ways\n"</div><div class='add'>+		  "dmmu\t\t: %d entries, %lu ways\n"</div><div class='add'>+		  "bogomips\t: %lu.%02lu\n",</div><div class='add'>+		  version,</div><div class='add'>+		  revision,</div><div class='add'>+		  loops_per_jiffy * HZ,</div><div class='add'>+		  cpuinfo.dcache_size,</div><div class='add'>+		  cpuinfo.dcache_block_size,</div><div class='add'>+		  cpuinfo.dcache_ways,</div><div class='add'>+		  cpuinfo.icache_size,</div><div class='add'>+		  cpuinfo.icache_block_size,</div><div class='add'>+		  cpuinfo.icache_ways,</div><div class='add'>+		  1 &lt;&lt; ((mfspr(SPR_DMMUCFGR) &amp; SPR_DMMUCFGR_NTS) &gt;&gt; 2),</div><div class='add'>+		  1 + (mfspr(SPR_DMMUCFGR) &amp; SPR_DMMUCFGR_NTW),</div><div class='add'>+		  1 &lt;&lt; ((mfspr(SPR_IMMUCFGR) &amp; SPR_IMMUCFGR_NTS) &gt;&gt; 2),</div><div class='add'>+		  1 + (mfspr(SPR_IMMUCFGR) &amp; SPR_IMMUCFGR_NTW),</div><div class='add'>+		  (loops_per_jiffy * HZ) / 500000,</div><div class='add'>+		  ((loops_per_jiffy * HZ) / 5000) % 100);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/openrisc/kernel/signal.c b/arch/openrisc/kernel/signal.c<br/>index c82be69b43c6..265f10fb3930 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/signal.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/syscall.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEBUG_SIG 0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/openrisc/kernel/time.c b/arch/openrisc/kernel/time.c<br/>index 50e970183dcd..687c11d048d7 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/time.c</a></div><div class='hunk'>@@ -117,9 +117,9 @@ static __init void openrisc_clockevent_init(void)</div><div class='ctx'>  * is 32 bits wide and runs at the CPU clock frequency.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static cycle_t openrisc_timer_read(struct clocksource *cs)</div><div class='add'>+static u64 openrisc_timer_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t) mfspr(SPR_TTCR);</div><div class='add'>+	return (u64) mfspr(SPR_TTCR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource openrisc_timer = {</div><div class='head'>diff --git a/arch/openrisc/kernel/traps.c b/arch/openrisc/kernel/traps.c<br/>index 3d3f6062f49c..803e9e756f77 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/traps.c</a></div><div class='hunk'>@@ -22,8 +22,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -31,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -40,6 +42,8 @@</div><div class='ctx'> extern char _etext, _stext;</div><div class='ctx'> </div><div class='ctx'> int kstack_depth_to_print = 0x180;</div><div class='add'>+int lwa_flag;</div><div class='add'>+unsigned long __user *lwa_addr;</div><div class='ctx'> </div><div class='ctx'> static inline int valid_stack_ptr(struct thread_info *tinfo, void *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -334,10 +338,191 @@ asmlinkage void do_bus_fault(struct pt_regs *regs, unsigned long address)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int in_delay_slot(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_OPENRISC_NO_SPR_SR_DSX</div><div class='add'>+	/* No delay slot flag, do the old way */</div><div class='add'>+	unsigned int op, insn;</div><div class='add'>+</div><div class='add'>+	insn = *((unsigned int *)regs-&gt;pc);</div><div class='add'>+	op = insn &gt;&gt; 26;</div><div class='add'>+	switch (op) {</div><div class='add'>+	case 0x00: /* l.j */</div><div class='add'>+	case 0x01: /* l.jal */</div><div class='add'>+	case 0x03: /* l.bnf */</div><div class='add'>+	case 0x04: /* l.bf */</div><div class='add'>+	case 0x11: /* l.jr */</div><div class='add'>+	case 0x12: /* l.jalr */</div><div class='add'>+		return 1;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	return regs-&gt;sr &amp; SPR_SR_DSX;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void adjust_pc(struct pt_regs *regs, unsigned long address)</div><div class='add'>+{</div><div class='add'>+	int displacement;</div><div class='add'>+	unsigned int rb, op, jmp;</div><div class='add'>+</div><div class='add'>+	if (unlikely(in_delay_slot(regs))) {</div><div class='add'>+		/* In delay slot, instruction at pc is a branch, simulate it */</div><div class='add'>+		jmp = *((unsigned int *)regs-&gt;pc);</div><div class='add'>+</div><div class='add'>+		displacement = sign_extend32(((jmp) &amp; 0x3ffffff) &lt;&lt; 2, 27);</div><div class='add'>+		rb = (jmp &amp; 0x0000ffff) &gt;&gt; 11;</div><div class='add'>+		op = jmp &gt;&gt; 26;</div><div class='add'>+</div><div class='add'>+		switch (op) {</div><div class='add'>+		case 0x00: /* l.j */</div><div class='add'>+			regs-&gt;pc += displacement;</div><div class='add'>+			return;</div><div class='add'>+		case 0x01: /* l.jal */</div><div class='add'>+			regs-&gt;pc += displacement;</div><div class='add'>+			regs-&gt;gpr[9] = regs-&gt;pc + 8;</div><div class='add'>+			return;</div><div class='add'>+		case 0x03: /* l.bnf */</div><div class='add'>+			if (regs-&gt;sr &amp; SPR_SR_F)</div><div class='add'>+				regs-&gt;pc += 8;</div><div class='add'>+			else</div><div class='add'>+				regs-&gt;pc += displacement;</div><div class='add'>+			return;</div><div class='add'>+		case 0x04: /* l.bf */</div><div class='add'>+			if (regs-&gt;sr &amp; SPR_SR_F)</div><div class='add'>+				regs-&gt;pc += displacement;</div><div class='add'>+			else</div><div class='add'>+				regs-&gt;pc += 8;</div><div class='add'>+			return;</div><div class='add'>+		case 0x11: /* l.jr */</div><div class='add'>+			regs-&gt;pc = regs-&gt;gpr[rb];</div><div class='add'>+			return;</div><div class='add'>+		case 0x12: /* l.jalr */</div><div class='add'>+			regs-&gt;pc = regs-&gt;gpr[rb];</div><div class='add'>+			regs-&gt;gpr[9] = regs-&gt;pc + 8;</div><div class='add'>+			return;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		regs-&gt;pc += 4;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void simulate_lwa(struct pt_regs *regs, unsigned long address,</div><div class='add'>+				unsigned int insn)</div><div class='add'>+{</div><div class='add'>+	unsigned int ra, rd;</div><div class='add'>+	unsigned long value;</div><div class='add'>+	unsigned long orig_pc;</div><div class='add'>+	long imm;</div><div class='add'>+</div><div class='add'>+	const struct exception_table_entry *entry;</div><div class='add'>+</div><div class='add'>+	orig_pc = regs-&gt;pc;</div><div class='add'>+	adjust_pc(regs, address);</div><div class='add'>+</div><div class='add'>+	ra = (insn &gt;&gt; 16) &amp; 0x1f;</div><div class='add'>+	rd = (insn &gt;&gt; 21) &amp; 0x1f;</div><div class='add'>+	imm = (short)insn;</div><div class='add'>+	lwa_addr = (unsigned long __user *)(regs-&gt;gpr[ra] + imm);</div><div class='add'>+</div><div class='add'>+	if ((unsigned long)lwa_addr &amp; 0x3) {</div><div class='add'>+		do_unaligned_access(regs, address);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (get_user(value, lwa_addr)) {</div><div class='add'>+		if (user_mode(regs)) {</div><div class='add'>+			force_sig(SIGSEGV, current);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((entry = search_exception_tables(orig_pc))) {</div><div class='add'>+			regs-&gt;pc = entry-&gt;fixup;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* kernel access in kernel space, load it directly */</div><div class='add'>+		value = *((unsigned long *)lwa_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lwa_flag = 1;</div><div class='add'>+	regs-&gt;gpr[rd] = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void simulate_swa(struct pt_regs *regs, unsigned long address,</div><div class='add'>+				unsigned int insn)</div><div class='add'>+{</div><div class='add'>+	unsigned long __user *vaddr;</div><div class='add'>+	unsigned long orig_pc;</div><div class='add'>+	unsigned int ra, rb;</div><div class='add'>+	long imm;</div><div class='add'>+</div><div class='add'>+	const struct exception_table_entry *entry;</div><div class='add'>+</div><div class='add'>+	orig_pc = regs-&gt;pc;</div><div class='add'>+	adjust_pc(regs, address);</div><div class='add'>+</div><div class='add'>+	ra = (insn &gt;&gt; 16) &amp; 0x1f;</div><div class='add'>+	rb = (insn &gt;&gt; 11) &amp; 0x1f;</div><div class='add'>+	imm = (short)(((insn &amp; 0x2200000) &gt;&gt; 10) | (insn &amp; 0x7ff));</div><div class='add'>+	vaddr = (unsigned long __user *)(regs-&gt;gpr[ra] + imm);</div><div class='add'>+</div><div class='add'>+	if (!lwa_flag || vaddr != lwa_addr) {</div><div class='add'>+		regs-&gt;sr &amp;= ~SPR_SR_F;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((unsigned long)vaddr &amp; 0x3) {</div><div class='add'>+		do_unaligned_access(regs, address);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (put_user(regs-&gt;gpr[rb], vaddr)) {</div><div class='add'>+		if (user_mode(regs)) {</div><div class='add'>+			force_sig(SIGSEGV, current);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((entry = search_exception_tables(orig_pc))) {</div><div class='add'>+			regs-&gt;pc = entry-&gt;fixup;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* kernel access in kernel space, store it directly */</div><div class='add'>+		*((unsigned long *)vaddr) = regs-&gt;gpr[rb];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lwa_flag = 0;</div><div class='add'>+	regs-&gt;sr |= SPR_SR_F;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define INSN_LWA	0x1b</div><div class='add'>+#define INSN_SWA	0x33</div><div class='add'>+</div><div class='ctx'> asmlinkage void do_illegal_instruction(struct pt_regs *regs,</div><div class='ctx'> 				       unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> 	siginfo_t info;</div><div class='add'>+	unsigned int op;</div><div class='add'>+	unsigned int insn = *((unsigned int *)address);</div><div class='add'>+</div><div class='add'>+	op = insn &gt;&gt; 26;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case INSN_LWA:</div><div class='add'>+		simulate_lwa(regs, address, insn);</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case INSN_SWA:</div><div class='add'>+		simulate_swa(regs, address, insn);</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (user_mode(regs)) {</div><div class='ctx'> 		/* Send a SIGILL */</div><div class='head'>diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S<br/>index d68b9ede8423..00ddb7804be4 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/kernel/vmlinux.lds.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -19,8 +19,8 @@</div><div class='ctx'> </div><div class='ctx'> /* TODO</div><div class='ctx'>  *		- clean up __offset &amp; stuff</div><div class='del'>- *		- change all 8192 aligment to PAGE !!!</div><div class='del'>- *		- recheck if all aligments are really needed</div><div class='add'>+ *		- change all 8192 alignment to PAGE !!!</div><div class='add'>+ *		- recheck if all alignments are really needed</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #  define LOAD_OFFSET  PAGE_OFFSET</div><div class='hunk'>@@ -30,7 +30,13 @@</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> </div><div class='del'>-OUTPUT_FORMAT("elf32-or32", "elf32-or32", "elf32-or32")</div><div class='add'>+#ifdef __OR1K__</div><div class='add'>+#define __OUTPUT_FORMAT        "elf32-or1k"</div><div class='add'>+#else</div><div class='add'>+#define __OUTPUT_FORMAT        "elf32-or32"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+OUTPUT_FORMAT(__OUTPUT_FORMAT, __OUTPUT_FORMAT, __OUTPUT_FORMAT)</div><div class='ctx'> jiffies = jiffies_64 + 4;</div><div class='ctx'> </div><div class='ctx'> SECTIONS</div><div class='hunk'>@@ -38,6 +44,8 @@ SECTIONS</div><div class='ctx'>         /* Read-only sections, merged into text segment: */</div><div class='ctx'>         . = LOAD_BASE ;</div><div class='ctx'> </div><div class='add'>+	_text = .;</div><div class='add'>+</div><div class='ctx'> 	/* _s_kernel_ro must be page aligned */</div><div class='ctx'> 	. = ALIGN(PAGE_SIZE);</div><div class='ctx'> 	_s_kernel_ro = .;</div><div class='head'>diff --git a/arch/openrisc/lib/Makefile b/arch/openrisc/lib/Makefile<br/>index 966f65dbc6f0..17d9d37f32d2 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/lib/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/lib/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/lib/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/lib/Makefile</a></div><div class='hunk'>@@ -2,4 +2,4 @@</div><div class='ctx'> # Makefile for or32 specific library files..</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y  = string.o delay.o</div><div class='add'>+obj-y	:= delay.o string.o memset.o memcpy.o</div><div class='head'>diff --git a/arch/openrisc/lib/memcpy.c b/arch/openrisc/lib/memcpy.c<br/>new file mode 100644<br/>index 000000000000..669887a60e27<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/lib/memcpy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/lib/memcpy.c</a></div><div class='hunk'>@@ -0,0 +1,124 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/openrisc/lib/memcpy.c</div><div class='add'>+ *</div><div class='add'>+ * Optimized memory copy routines for openrisc.  These are mostly copied</div><div class='add'>+ * from ohter sources but slightly entended based on ideas discuassed in</div><div class='add'>+ * #openrisc.</div><div class='add'>+ *</div><div class='add'>+ * The word unroll implementation is an extension to the arm byte</div><div class='add'>+ * unrolled implementation, but using word copies (if things are</div><div class='add'>+ * properly aligned)</div><div class='add'>+ *</div><div class='add'>+ * The great arm loop unroll algorithm can be found at:</div><div class='add'>+ *  arch/arm/boot/compressed/string.c</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OR1K_1200</div><div class='add'>+/*</div><div class='add'>+ * Do memcpy with word copies and loop unrolling. This gives the</div><div class='add'>+ * best performance on the OR1200 and MOR1KX archirectures</div><div class='add'>+ */</div><div class='add'>+void *memcpy(void *dest, __const void *src, __kernel_size_t n)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+	unsigned char *d, *s;</div><div class='add'>+	uint32_t *dest_w = (uint32_t *)dest, *src_w = (uint32_t *)src;</div><div class='add'>+</div><div class='add'>+	/* If both source and dest are word aligned copy words */</div><div class='add'>+	if (!((unsigned int)dest_w &amp; 3) &amp;&amp; !((unsigned int)src_w &amp; 3)) {</div><div class='add'>+		/* Copy 32 bytes per loop */</div><div class='add'>+		for (i = n &gt;&gt; 5; i &gt; 0; i--) {</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (n &amp; 1 &lt;&lt; 4) {</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (n &amp; 1 &lt;&lt; 3) {</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (n &amp; 1 &lt;&lt; 2)</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+</div><div class='add'>+		d = (unsigned char *)dest_w;</div><div class='add'>+		s = (unsigned char *)src_w;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		d = (unsigned char *)dest_w;</div><div class='add'>+		s = (unsigned char *)src_w;</div><div class='add'>+</div><div class='add'>+		for (i = n &gt;&gt; 3; i &gt; 0; i--) {</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (n &amp; 1 &lt;&lt; 2) {</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+			*d++ = *s++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (n &amp; 1 &lt;&lt; 1) {</div><div class='add'>+		*d++ = *s++;</div><div class='add'>+		*d++ = *s++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (n &amp; 1)</div><div class='add'>+		*d++ = *s++;</div><div class='add'>+</div><div class='add'>+	return dest;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+/*</div><div class='add'>+ * Use word copies but no loop unrolling as we cannot assume there</div><div class='add'>+ * will be benefits on the archirecture</div><div class='add'>+ */</div><div class='add'>+void *memcpy(void *dest, __const void *src, __kernel_size_t n)</div><div class='add'>+{</div><div class='add'>+	unsigned char *d = (unsigned char *)dest, *s = (unsigned char *)src;</div><div class='add'>+	uint32_t *dest_w = (uint32_t *)dest, *src_w = (uint32_t *)src;</div><div class='add'>+</div><div class='add'>+	/* If both source and dest are word aligned copy words */</div><div class='add'>+	if (!((unsigned int)dest_w &amp; 3) &amp;&amp; !((unsigned int)src_w &amp; 3)) {</div><div class='add'>+		for (; n &gt;= 4; n -= 4)</div><div class='add'>+			*dest_w++ = *src_w++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	d = (unsigned char *)dest_w;</div><div class='add'>+	s = (unsigned char *)src_w;</div><div class='add'>+</div><div class='add'>+	/* For remaining or if not aligned, copy bytes */</div><div class='add'>+	for (; n &gt;= 1; n -= 1)</div><div class='add'>+		*d++ = *s++;</div><div class='add'>+</div><div class='add'>+	return dest;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(memcpy);</div><div class='head'>diff --git a/arch/openrisc/lib/memset.S b/arch/openrisc/lib/memset.S<br/>new file mode 100644<br/>index 000000000000..92cc2eac26fa<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/lib/memset.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/lib/memset.S</a></div><div class='hunk'>@@ -0,0 +1,98 @@</div><div class='add'>+/*</div><div class='add'>+ * OpenRISC memset.S</div><div class='add'>+ *</div><div class='add'>+ * Hand-optimized assembler version of memset for OpenRISC.</div><div class='add'>+ * Algorithm inspired by several other arch-specific memset routines</div><div class='add'>+ * in the kernel tree</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015 Olof Kindgren &lt;olof.kindgren@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *      This program is free software; you can redistribute it and/or</div><div class='add'>+ *      modify it under the terms of the GNU General Public License</div><div class='add'>+ *      as published by the Free Software Foundation; either version</div><div class='add'>+ *      2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+	.global memset</div><div class='add'>+	.type	memset, @function</div><div class='add'>+memset:</div><div class='add'>+	/* arguments:</div><div class='add'>+	 * r3 = *s</div><div class='add'>+	 * r4 = c</div><div class='add'>+	 * r5 = n</div><div class='add'>+	 * r13, r15, r17, r19 used as temp regs</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	/* Exit if n == 0 */</div><div class='add'>+	l.sfeqi		r5, 0</div><div class='add'>+	l.bf		4f</div><div class='add'>+</div><div class='add'>+	/* Truncate c to char */</div><div class='add'>+	l.andi  	r13, r4, 0xff</div><div class='add'>+</div><div class='add'>+	/* Skip word extension if c is 0 */</div><div class='add'>+	l.sfeqi		r13, 0</div><div class='add'>+	l.bf		1f</div><div class='add'>+	/* Check for at least two whole words (8 bytes) */</div><div class='add'>+	 l.sfleui	r5, 7</div><div class='add'>+</div><div class='add'>+	/* Extend char c to 32-bit word cccc in r13 */</div><div class='add'>+	l.slli		r15, r13, 16  // r13 = 000c, r15 = 0c00</div><div class='add'>+	l.or		r13, r13, r15 // r13 = 0c0c, r15 = 0c00</div><div class='add'>+	l.slli		r15, r13, 8   // r13 = 0c0c, r15 = c0c0</div><div class='add'>+	l.or		r13, r13, r15 // r13 = cccc, r15 = c0c0</div><div class='add'>+</div><div class='add'>+1:	l.addi		r19, r3, 0 // Set r19 = src</div><div class='add'>+	/* Jump to byte copy loop if less than two words */</div><div class='add'>+	l.bf		3f</div><div class='add'>+	 l.or		r17, r5, r0 // Set r17 = n</div><div class='add'>+</div><div class='add'>+	/* Mask out two LSBs to check alignment */</div><div class='add'>+	l.andi		r15, r3, 0x3</div><div class='add'>+</div><div class='add'>+	/* lsb == 00, jump to word copy loop */</div><div class='add'>+	l.sfeqi		r15, 0</div><div class='add'>+	l.bf		2f</div><div class='add'>+	 l.addi		r19, r3, 0 // Set r19 = src</div><div class='add'>+</div><div class='add'>+	/* lsb == 01,10 or 11 */</div><div class='add'>+	l.sb		0(r3), r13   // *src = c</div><div class='add'>+	l.addi		r17, r17, -1 // Decrease n</div><div class='add'>+</div><div class='add'>+	l.sfeqi		r15, 3</div><div class='add'>+	l.bf		2f</div><div class='add'>+	 l.addi		r19, r3, 1  // src += 1</div><div class='add'>+</div><div class='add'>+	/* lsb == 01 or 10 */</div><div class='add'>+	l.sb		1(r3), r13   // *(src+1) = c</div><div class='add'>+	l.addi		r17, r17, -1 // Decrease n</div><div class='add'>+</div><div class='add'>+	l.sfeqi		r15, 2</div><div class='add'>+	l.bf		2f</div><div class='add'>+	 l.addi		r19, r3, 2  // src += 2</div><div class='add'>+</div><div class='add'>+	/* lsb == 01 */</div><div class='add'>+	l.sb		2(r3), r13   // *(src+2) = c</div><div class='add'>+	l.addi		r17, r17, -1 // Decrease n</div><div class='add'>+	l.addi		r19, r3, 3   // src += 3</div><div class='add'>+</div><div class='add'>+	/* Word copy loop */</div><div class='add'>+2:	l.sw		0(r19), r13  // *src = cccc</div><div class='add'>+	l.addi		r17, r17, -4 // Decrease n</div><div class='add'>+	l.sfgeui	r17, 4</div><div class='add'>+	l.bf		2b</div><div class='add'>+	 l.addi		r19, r19, 4  // Increase src</div><div class='add'>+</div><div class='add'>+	/* When n &gt; 0, copy the remaining bytes, otherwise jump to exit */</div><div class='add'>+	l.sfeqi		r17, 0</div><div class='add'>+	l.bf		4f</div><div class='add'>+</div><div class='add'>+	/* Byte copy loop */</div><div class='add'>+3:	l.addi		r17, r17, -1 // Decrease n</div><div class='add'>+	l.sb		0(r19), r13  // *src = cccc</div><div class='add'>+	l.sfnei		r17, 0</div><div class='add'>+	l.bf		3b</div><div class='add'>+	 l.addi		r19, r19, 1  // Increase src</div><div class='add'>+</div><div class='add'>+4:	l.jr		r9</div><div class='add'>+	 l.ori		r11, r3, 0</div><div class='head'>diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c<br/>index e94cd225e816..e310ab499385 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/mm/fault.c</a></div><div class='hunk'>@@ -17,10 +17,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/siginfo.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c<br/>index 7f94652311d7..f67d82b9d22f 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/mm/init.c</a></div><div class='hunk'>@@ -106,11 +106,11 @@ static void __init map_ram(void)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Alloc one page for holding PTE's... */</div><div class='del'>-			pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);</div><div class='add'>+			pte = (pte_t *) __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE));</div><div class='ctx'> 			set_pmd(pme, __pmd(_KERNPG_TABLE + __pa(pte)));</div><div class='ctx'> </div><div class='ctx'> 			/* Fill the newly allocated page with PTE'S */</div><div class='del'>-			for (j = 0; p &lt; e &amp;&amp; j &lt; PTRS_PER_PGD;</div><div class='add'>+			for (j = 0; p &lt; e &amp;&amp; j &lt; PTRS_PER_PTE;</div><div class='ctx'> 			     v += PAGE_SIZE, p += PAGE_SIZE, j++, pte++) {</div><div class='ctx'> 				if (v &gt;= (u32) _e_kernel_ro ||</div><div class='ctx'> 				    v &lt; (u32) _s_kernel_ro)</div><div class='head'>diff --git a/arch/openrisc/mm/ioremap.c b/arch/openrisc/mm/ioremap.c<br/>index fa60b81aee3e..2175e4bfd9fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/openrisc/mm/ioremap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/openrisc/mm/ioremap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/openrisc/mm/ioremap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/openrisc/mm/ioremap.c</a></div><div class='hunk'>@@ -80,6 +80,7 @@ __ioremap(phys_addr_t addr, unsigned long size, pgprot_t prot)</div><div class='ctx'> </div><div class='ctx'> 	return (void __iomem *)(offset + (char *)v);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__ioremap);</div><div class='ctx'> </div><div class='ctx'> void iounmap(void *addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -106,6 +107,7 @@ void iounmap(void *addr)</div><div class='ctx'> </div><div class='ctx'> 	return vfree((void *)(PAGE_MASK &amp; (unsigned long)addr));</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(iounmap);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * OK, this one's a bit tricky... ioremap can get called before memory is</div><div class='hunk'>@@ -124,11 +126,7 @@ pte_t __ref *pte_alloc_one_kernel(struct mm_struct *mm,</div><div class='ctx'> 	if (likely(mem_init_done)) {</div><div class='ctx'> 		pte = (pte_t *) __get_free_page(GFP_KERNEL);</div><div class='ctx'> 	} else {</div><div class='del'>-		pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);</div><div class='del'>-#if 0</div><div class='del'>-		/* FIXME: use memblock... */</div><div class='ctx'> 		pte = (pte_t *) __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE));</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pte)</div><div class='head'>diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig<br/>index a14b86587013..ad294b3fb90b 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/Kconfig</a></div><div class='hunk'>@@ -7,6 +7,8 @@ config PARISC</div><div class='ctx'> 	select HAVE_FUNCTION_GRAPH_TRACER</div><div class='ctx'> 	select HAVE_SYSCALL_TRACEPOINTS</div><div class='ctx'> 	select ARCH_WANT_FRAME_POINTERS</div><div class='add'>+	select ARCH_HAS_ELF_RANDOMIZE</div><div class='add'>+	select ARCH_HAS_STRICT_KERNEL_RWX</div><div class='ctx'> 	select RTC_CLASS</div><div class='ctx'> 	select RTC_DRV_GENERIC</div><div class='ctx'> 	select INIT_ALL_POSSIBLE</div><div class='head'>diff --git a/arch/parisc/Kconfig.debug b/arch/parisc/Kconfig.debug<br/>index 68b7cbd0810a..0d856b94c9b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/Kconfig.debug?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/Kconfig.debug</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/Kconfig.debug</a></div><div class='hunk'>@@ -5,15 +5,4 @@ source "lib/Kconfig.debug"</div><div class='ctx'> config TRACE_IRQFLAGS_SUPPORT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config DEBUG_RODATA</div><div class='del'>-       bool "Write protect kernel read-only data structures"</div><div class='del'>-       depends on DEBUG_KERNEL</div><div class='del'>-       default y</div><div class='del'>-       help</div><div class='del'>-         Mark the kernel read-only data as write-protected in the pagetables,</div><div class='del'>-         in order to catch accidental (and incorrect) writes to such const</div><div class='del'>-         data. This option may have a slight performance impact because a</div><div class='del'>-         portion of the kernel code won't be covered by a TLB anymore.</div><div class='del'>-         If in doubt, say "N".</div><div class='del'>-</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/parisc/configs/712_defconfig b/arch/parisc/configs/712_defconfig<br/>index db8f56bf3883..143d02652792 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/configs/712_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/configs/712_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/configs/712_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/configs/712_defconfig</a></div><div class='hunk'>@@ -182,7 +182,6 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_RCU_CPU_STALL_DETECTOR is not set</div><div class='del'>-CONFIG_DEBUG_RODATA=y</div><div class='ctx'> CONFIG_CRYPTO_NULL=m</div><div class='ctx'> CONFIG_CRYPTO_TEST=m</div><div class='ctx'> CONFIG_CRYPTO_HMAC=y</div><div class='head'>diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig<br/>index fb92b8920785..8e8f0e34f817 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/configs/c3000_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/configs/c3000_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/configs/c3000_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/configs/c3000_defconfig</a></div><div class='hunk'>@@ -166,7 +166,6 @@ CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='ctx'> # CONFIG_RCU_CPU_STALL_DETECTOR is not set</div><div class='del'>-CONFIG_DEBUG_RODATA=y</div><div class='ctx'> CONFIG_CRYPTO_NULL=m</div><div class='ctx'> CONFIG_CRYPTO_TEST=m</div><div class='ctx'> CONFIG_CRYPTO_MD5=m</div><div class='head'>diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild<br/>index f9b3a81aefcd..a9909c2d04c5 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/Kbuild</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> generic-y += auxvec.h</div><div class='ctx'> generic-y += barrier.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='add'>+generic-y += current.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += div64.h</div><div class='ctx'> generic-y += emergency-restart.h</div><div class='hunk'>@@ -16,7 +16,6 @@ generic-y += local.h</div><div class='ctx'> generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='del'>-generic-y += mutex.h</div><div class='ctx'> generic-y += param.h</div><div class='ctx'> generic-y += percpu.h</div><div class='ctx'> generic-y += poll.h</div><div class='hunk'>@@ -29,3 +28,4 @@ generic-y += user.h</div><div class='ctx'> generic-y += vga.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/parisc/include/asm/bitops.h b/arch/parisc/include/asm/bitops.h<br/>index 3f9406d9b9d6..da87943328a5 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/asm/bitops.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/asm/bitops.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/asm/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/bitops.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;asm/types.h&gt;		/* for BITS_PER_LONG/SHIFT_PER_LONG */</div><div class='add'>+#include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/barrier.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='hunk'>@@ -17,6 +17,12 @@</div><div class='ctx'>  * to include/asm-i386/bitops.h or kerneldoc</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#if __BITS_PER_LONG == 64</div><div class='add'>+#define SHIFT_PER_LONG 6</div><div class='add'>+#else</div><div class='add'>+#define SHIFT_PER_LONG 5</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define CHOP_SHIFTCOUNT(x) (((unsigned long) (x)) &amp; (BITS_PER_LONG - 1))</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h<br/>index 7bd69bd43a01..19c9c3c5f267 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/asm/cacheflush.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/asm/cacheflush.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/cacheflush.h</a></div><div class='hunk'>@@ -27,8 +27,6 @@ void flush_user_dcache_range_asm(unsigned long, unsigned long);</div><div class='ctx'> void flush_kernel_dcache_range_asm(unsigned long, unsigned long);</div><div class='ctx'> void flush_kernel_dcache_page_asm(void *);</div><div class='ctx'> void flush_kernel_icache_page(void *);</div><div class='del'>-void flush_user_dcache_range(unsigned long, unsigned long);</div><div class='del'>-void flush_user_icache_range(unsigned long, unsigned long);</div><div class='ctx'> </div><div class='ctx'> /* Cache flush operations */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/include/asm/current.h b/arch/parisc/include/asm/current.h<br/>deleted file mode 100644<br/>index 0fb9338e3bf2..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/asm/current.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/asm/current.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-#ifndef _PARISC_CURRENT_H</div><div class='del'>-#define _PARISC_CURRENT_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/thread_info.h&gt;</div><div class='del'>-</div><div class='del'>-struct task_struct;</div><div class='del'>-</div><div class='del'>-static inline struct task_struct * get_current(void)</div><div class='del'>-{</div><div class='del'>-	return current_thread_info()-&gt;task;</div><div class='del'>-}</div><div class='del'>- </div><div class='del'>-#define current get_current()</div><div class='del'>-</div><div class='del'>-#endif /* !(_PARISC_CURRENT_H) */</div><div class='head'>diff --git a/arch/parisc/include/asm/dma-mapping.h b/arch/parisc/include/asm/dma-mapping.h<br/>index 16e024602737..5404c6a726b2 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -21,13 +21,13 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PA11</div><div class='del'>-extern struct dma_map_ops pcxl_dma_ops;</div><div class='del'>-extern struct dma_map_ops pcx_dma_ops;</div><div class='add'>+extern const struct dma_map_ops pcxl_dma_ops;</div><div class='add'>+extern const struct dma_map_ops pcx_dma_ops;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops *hppa_dma_ops;</div><div class='add'>+extern const struct dma_map_ops *hppa_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return hppa_dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h<br/>index 78c9fd32c554..a6b2a421571e 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/asm/elf.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/asm/elf.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/elf.h</a></div><div class='hunk'>@@ -348,9 +348,10 @@ struct pt_regs;	/* forward declaration... */</div><div class='ctx'> </div><div class='ctx'> #define ELF_HWCAP	0</div><div class='ctx'> </div><div class='del'>-#define STACK_RND_MASK	(is_32bit_task() ? \</div><div class='del'>-				0x7ff &gt;&gt; (PAGE_SHIFT - 12) : \</div><div class='del'>-				0x3ffff &gt;&gt; (PAGE_SHIFT - 12))</div><div class='add'>+/* Masks for stack and mmap randomization */</div><div class='add'>+#define BRK_RND_MASK	(is_32bit_task() ? 0x07ffUL : 0x3ffffUL)</div><div class='add'>+#define MMAP_RND_MASK	(is_32bit_task() ? 0x1fffUL : 0x3ffffUL)</div><div class='add'>+#define STACK_RND_MASK	MMAP_RND_MASK</div><div class='ctx'> </div><div class='ctx'> struct mm_struct;</div><div class='ctx'> extern unsigned long arch_randomize_brk(struct mm_struct *);</div><div class='head'>diff --git a/arch/parisc/include/asm/pdcpat.h b/arch/parisc/include/asm/pdcpat.h<br/>index 47539f117958..e1d289092705 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/asm/pdcpat.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/asm/pdcpat.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/asm/pdcpat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/pdcpat.h</a></div><div class='hunk'>@@ -289,7 +289,7 @@ extern int pdc_pat_cell_get_number(struct pdc_pat_cell_num *cell_info);</div><div class='ctx'> extern int pdc_pat_cell_module(unsigned long *actcnt, unsigned long ploc, unsigned long mod, unsigned long view_type, void *mem_addr);</div><div class='ctx'> extern int pdc_pat_cell_num_to_loc(void *, unsigned long);</div><div class='ctx'> </div><div class='del'>-extern int pdc_pat_cpu_get_number(struct pdc_pat_cpu_num *cpu_info, void *hpa);</div><div class='add'>+extern int pdc_pat_cpu_get_number(struct pdc_pat_cpu_num *cpu_info, unsigned long hpa);</div><div class='ctx'> </div><div class='ctx'> extern int pdc_pat_pd_get_addr_map(unsigned long *actual_len, void *mem_addr, unsigned long count, unsigned long offset);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h<br/>index 2e674e13e005..a3661ee6b060 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/processor.h</a></div><div class='hunk'>@@ -93,9 +93,7 @@ struct system_cpuinfo_parisc {</div><div class='ctx'> /* Per CPU data structure - ie varies per CPU.  */</div><div class='ctx'> struct cpuinfo_parisc {</div><div class='ctx'> 	unsigned long it_value;     /* Interval Timer at last timer Intr */</div><div class='del'>-	unsigned long it_delta;     /* Interval delta (tic_10ms / HZ * 100) */</div><div class='ctx'> 	unsigned long irq_count;    /* number of IRQ's since boot */</div><div class='del'>-	unsigned long irq_max_cr16; /* longest time to handle a single IRQ */</div><div class='ctx'> 	unsigned long cpuid;        /* aka slot_number or set to NO_PROC_ID */</div><div class='ctx'> 	unsigned long hpa;          /* Host Physical address */</div><div class='ctx'> 	unsigned long txn_addr;     /* MMIO addr of EIR or id_eid */</div><div class='hunk'>@@ -103,8 +101,6 @@ struct cpuinfo_parisc {</div><div class='ctx'> 	unsigned long pending_ipi;  /* bitmap of type ipi_message_type */</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned long bh_count;     /* number of times bh was invoked */</div><div class='del'>-	unsigned long prof_counter; /* per CPU profiling support */</div><div class='del'>-	unsigned long prof_multiplier;	/* per CPU profiling support */</div><div class='ctx'> 	unsigned long fp_rev;</div><div class='ctx'> 	unsigned long fp_model;</div><div class='ctx'> 	unsigned int state;</div><div class='hunk'>@@ -309,7 +305,6 @@ extern unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define KSTK_ESP(tsk)	((tsk)-&gt;thread.regs.gr[30])</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()	barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * parisc_requires_coherency() is used to identify the combined VIPT/PIPT</div><div class='head'>diff --git a/arch/parisc/include/asm/thread_info.h b/arch/parisc/include/asm/thread_info.h<br/>index 7581330ea35b..88fe0aad4390 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/asm/thread_info.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/asm/thread_info.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/asm/thread_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/thread_info.h</a></div><div class='hunk'>@@ -49,7 +49,6 @@ struct thread_info {</div><div class='ctx'> #define TIF_POLLING_NRFLAG	3	/* true if poll_idle() is polling TIF_NEED_RESCHED */</div><div class='ctx'> #define TIF_32BIT               4       /* 32 bit binary */</div><div class='ctx'> #define TIF_MEMDIE		5	/* is terminating due to OOM killer */</div><div class='del'>-#define TIF_RESTORE_SIGMASK	6	/* restore saved signal mask */</div><div class='ctx'> #define TIF_SYSCALL_AUDIT	7	/* syscall auditing active */</div><div class='ctx'> #define TIF_NOTIFY_RESUME	8	/* callback before returning to user */</div><div class='ctx'> #define TIF_SINGLESTEP		9	/* single stepping? */</div><div class='head'>diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h<br/>index 9a2aee1b90fc..fb4382c28259 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/asm/uaccess.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/asm/uaccess.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/asm/uaccess.h</a></div><div class='hunk'>@@ -32,11 +32,7 @@</div><div class='ctx'>  * that put_user is the same as __put_user, etc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static inline long access_ok(int type, const void __user * addr,</div><div class='del'>-		unsigned long size)</div><div class='del'>-{</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='add'>+#define access_ok(type, uaddr, size) (1)</div><div class='ctx'> </div><div class='ctx'> #define put_user __put_user</div><div class='ctx'> #define get_user __get_user</div><div class='head'>diff --git a/arch/parisc/include/uapi/asm/bitsperlong.h b/arch/parisc/include/uapi/asm/bitsperlong.h<br/>index e0a23c7bdd43..07fa7e50bdc0 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/uapi/asm/bitsperlong.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/uapi/asm/bitsperlong.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/uapi/asm/bitsperlong.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/uapi/asm/bitsperlong.h</a></div><div class='hunk'>@@ -3,10 +3,8 @@</div><div class='ctx'> </div><div class='ctx'> #if defined(__LP64__)</div><div class='ctx'> #define __BITS_PER_LONG 64</div><div class='del'>-#define SHIFT_PER_LONG 6</div><div class='ctx'> #else</div><div class='ctx'> #define __BITS_PER_LONG 32</div><div class='del'>-#define SHIFT_PER_LONG 5</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/bitsperlong.h&gt;</div><div class='head'>diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h<br/>index 9c935d717df9..7a109b73ddf7 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -89,4 +89,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		0x402E</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	0x402F</div><div class='add'>+</div><div class='ctx'> #endif /* _UAPI_ASM_SOCKET_H */</div><div class='head'>diff --git a/arch/parisc/include/uapi/asm/swab.h b/arch/parisc/include/uapi/asm/swab.h<br/>index e78403b129ef..928e1bbac98f 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/include/uapi/asm/swab.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/include/uapi/asm/swab.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/include/uapi/asm/swab.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/include/uapi/asm/swab.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> #ifndef _PARISC_SWAB_H</div><div class='ctx'> #define _PARISC_SWAB_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/bitsperlong.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +39,7 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x)</div><div class='ctx'> }</div><div class='ctx'> #define __arch_swab32 __arch_swab32</div><div class='ctx'> </div><div class='del'>-#if BITS_PER_LONG &gt; 32</div><div class='add'>+#if __BITS_PER_LONG &gt; 32</div><div class='ctx'> /*</div><div class='ctx'> ** From "PA-RISC 2.0 Architecture", HP Professional Books.</div><div class='ctx'> ** See Appendix I page 8 , "Endian Byte Swapping".</div><div class='hunk'>@@ -61,6 +62,6 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 x)</div><div class='ctx'> 	return x;</div><div class='ctx'> }</div><div class='ctx'> #define __arch_swab64 __arch_swab64</div><div class='del'>-#endif /* BITS_PER_LONG &gt; 32 */</div><div class='add'>+#endif /* __BITS_PER_LONG &gt; 32 */</div><div class='ctx'> </div><div class='ctx'> #endif /* _PARISC_SWAB_H */</div><div class='head'>diff --git a/arch/parisc/kernel/asm-offsets.c b/arch/parisc/kernel/asm-offsets.c<br/>index 78d30d2ea2d8..1c4fe61a592b 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/asm-offsets.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/asm-offsets.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/pdc.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='ctx'> #define FRAME_SIZE	128</div><div class='head'>diff --git a/arch/parisc/kernel/binfmt_elf32.c b/arch/parisc/kernel/binfmt_elf32.c<br/>index 00dc66f9c2ba..f2adcf33f8f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/binfmt_elf32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/binfmt_elf32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/binfmt_elf32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/binfmt_elf32.c</a></div><div class='hunk'>@@ -91,14 +91,7 @@ struct elf_prpsinfo32</div><div class='ctx'> 	current-&gt;thread.map_base = DEFAULT_MAP_BASE32; \</div><div class='ctx'> 	current-&gt;thread.task_size = DEFAULT_TASK_SIZE32 \</div><div class='ctx'> </div><div class='del'>-#undef cputime_to_timeval</div><div class='del'>-#define cputime_to_timeval cputime_to_compat_timeval</div><div class='del'>-static __inline__ void</div><div class='del'>-cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)</div><div class='del'>-{</div><div class='del'>-	unsigned long jiffies = cputime_to_jiffies(cputime);</div><div class='del'>-	value-&gt;tv_usec = (jiffies % HZ) * (1000000L / HZ);</div><div class='del'>-	value-&gt;tv_sec = jiffies / HZ;</div><div class='del'>-}</div><div class='add'>+#undef ns_to_timeval</div><div class='add'>+#define ns_to_timeval ns_to_compat_timeval</div><div class='ctx'> </div><div class='ctx'> #include "../../../fs/binfmt_elf.c"</div><div class='head'>diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c<br/>index 977f0a4f5ecf..0dc72d5de861 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/cache.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/cache.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/cache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/cache.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;asm/pdc.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='hunk'>@@ -573,24 +574,6 @@ void flush_cache_mm(struct mm_struct *mm)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-flush_user_dcache_range(unsigned long start, unsigned long end)</div><div class='del'>-{</div><div class='del'>-	if ((end - start) &lt; parisc_cache_flush_threshold)</div><div class='del'>-		flush_user_dcache_range_asm(start,end);</div><div class='del'>-	else</div><div class='del'>-		flush_data_cache();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-flush_user_icache_range(unsigned long start, unsigned long end)</div><div class='del'>-{</div><div class='del'>-	if ((end - start) &lt; parisc_cache_flush_threshold)</div><div class='del'>-		flush_user_icache_range_asm(start,end);</div><div class='del'>-	else</div><div class='del'>-		flush_instruction_cache();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void flush_cache_range(struct vm_area_struct *vma,</div><div class='ctx'> 		unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c<br/>index 700e2d2da096..fa78419100c8 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/drivers.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/drivers.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/drivers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/drivers.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> #include &lt;asm/parisc-device.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* See comments in include/asm-parisc/pci.h */</div><div class='del'>-struct dma_map_ops *hppa_dma_ops __read_mostly;</div><div class='add'>+const struct dma_map_ops *hppa_dma_ops __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(hppa_dma_ops);</div><div class='ctx'> </div><div class='ctx'> static struct device root = {</div><div class='head'>diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S<br/>index 4fcff2dcc9c3..ad4cb1613c57 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/entry.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/entry.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/entry.S</a></div><div class='hunk'>@@ -878,6 +878,9 @@ ENTRY_CFI(syscall_exit_rfi)</div><div class='ctx'> 	STREG   %r19,PT_SR7(%r16)</div><div class='ctx'> </div><div class='ctx'> intr_return:</div><div class='add'>+	/* NOTE: Need to enable interrupts incase we schedule. */</div><div class='add'>+	ssm     PSW_SM_I, %r0</div><div class='add'>+</div><div class='ctx'> 	/* check for reschedule */</div><div class='ctx'> 	mfctl   %cr30,%r1</div><div class='ctx'> 	LDREG   TI_FLAGS(%r1),%r19	/* sched.h: TIF_NEED_RESCHED */</div><div class='hunk'>@@ -904,11 +907,6 @@ intr_check_sig:</div><div class='ctx'> 	LDREG	PT_IASQ1(%r16), %r20</div><div class='ctx'> 	cmpib,COND(=),n 0,%r20,intr_restore /* backward */</div><div class='ctx'> </div><div class='del'>-	/* NOTE: We need to enable interrupts if we have to deliver</div><div class='del'>-	 * signals. We used to do this earlier but it caused kernel</div><div class='del'>-	 * stack overflows. */</div><div class='del'>-	ssm     PSW_SM_I, %r0</div><div class='del'>-</div><div class='ctx'> 	copy	%r0, %r25			/* long in_syscall = 0 */</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='ctx'> 	ldo	-16(%r30),%r29			/* Reference param save area */</div><div class='hunk'>@@ -960,10 +958,6 @@ intr_do_resched:</div><div class='ctx'> 	cmpib,COND(=)	0, %r20, intr_do_preempt</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='del'>-	/* NOTE: We need to enable interrupts if we schedule.  We used</div><div class='del'>-	 * to do this earlier but it caused kernel stack overflows. */</div><div class='del'>-	ssm     PSW_SM_I, %r0</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='ctx'> 	ldo	-16(%r30),%r29		/* Reference param save area */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c<br/>index e5d71905cad5..9d797ae4fa22 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/firmware.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/firmware.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/firmware.c</a></div><div class='hunk'>@@ -1258,7 +1258,7 @@ int pdc_pat_cell_module(unsigned long *actcnt, unsigned long ploc, unsigned long</div><div class='ctx'>  *</div><div class='ctx'>  * Retrieve the cpu number for the cpu at the specified HPA.</div><div class='ctx'>  */</div><div class='del'>-int pdc_pat_cpu_get_number(struct pdc_pat_cpu_num *cpu_info, void *hpa)</div><div class='add'>+int pdc_pat_cpu_get_number(struct pdc_pat_cpu_num *cpu_info, unsigned long hpa)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	unsigned long flags;</div><div class='head'>diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c<br/>index c05d1876d27c..c9789d9c73b4 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/inventory.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/inventory.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/inventory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/inventory.c</a></div><div class='hunk'>@@ -216,9 +216,9 @@ pat_query_module(ulong pcell_loc, ulong mod_index)</div><div class='ctx'> 	register_parisc_device(dev);	/* advertise device */</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_PAT</div><div class='del'>-	pdc_pat_cell_mod_maddr_block_t io_pdc_cell;</div><div class='ctx'> 	/* dump what we see so far... */</div><div class='ctx'> 	switch (PAT_GET_ENTITY(dev-&gt;mod_info)) {</div><div class='add'>+		pdc_pat_cell_mod_maddr_block_t io_pdc_cell;</div><div class='ctx'> 		unsigned long i;</div><div class='ctx'> </div><div class='ctx'> 	case PAT_ENTITY_PROC:</div><div class='hunk'>@@ -259,9 +259,9 @@ pat_query_module(ulong pcell_loc, ulong mod_index)</div><div class='ctx'> 				pa_pdc_cell-&gt;mod[4 + i * 3]);	/* finish (ie end) */</div><div class='ctx'> 			printk(KERN_DEBUG </div><div class='ctx'> 				"  IO_VIEW %ld: 0x%016lx 0x%016lx 0x%016lx\n", </div><div class='del'>-				i, io_pdc_cell-&gt;mod[2 + i * 3],	/* type */</div><div class='del'>-				io_pdc_cell-&gt;mod[3 + i * 3],	/* start */</div><div class='del'>-				io_pdc_cell-&gt;mod[4 + i * 3]);	/* finish (ie end) */</div><div class='add'>+				i, io_pdc_cell.mod[2 + i * 3],	/* type */</div><div class='add'>+				io_pdc_cell.mod[3 + i * 3],	/* start */</div><div class='add'>+				io_pdc_cell.mod[4 + i * 3]);	/* finish (ie end) */</div><div class='ctx'> 		}</div><div class='ctx'> 		printk(KERN_DEBUG "\n");</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/arch/parisc/kernel/pa7300lc.c b/arch/parisc/kernel/pa7300lc.c<br/>index 8a89780223aa..9b245fc67560 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/pa7300lc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/pa7300lc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/pa7300lc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/pa7300lc.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>  *   Copyright (C) 2000 Philipp Rumpf */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c<br/>index 3cad8aadc69e..7484b3d11e0d 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/parisc_ksyms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/parisc_ksyms.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/parisc_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/parisc_ksyms.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ EXPORT_SYMBOL(__xchg64);</div><div class='ctx'> EXPORT_SYMBOL(__cmpxchg_u64);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> EXPORT_SYMBOL(lclear_user);</div><div class='ctx'> EXPORT_SYMBOL(lstrnlen_user);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c<br/>index 494ff6e8c88a..5f0067a62738 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/pci-dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/pci-dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/pci-dma.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;	/* get_order */</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;	/* for purge_tlb_*() macros */</div><div class='ctx'> </div><div class='ctx'> static struct proc_dir_entry * proc_gsc_root __read_mostly = NULL;</div><div class='hunk'>@@ -459,7 +459,9 @@ static dma_addr_t pa11_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 	void *addr = page_address(page) + offset;</div><div class='ctx'> 	BUG_ON(direction == DMA_NONE);</div><div class='ctx'> </div><div class='del'>-	flush_kernel_dcache_range((unsigned long) addr, size);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		flush_kernel_dcache_range((unsigned long) addr, size);</div><div class='add'>+</div><div class='ctx'> 	return virt_to_phys(addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -469,8 +471,11 @@ static void pa11_dma_unmap_page(struct device *dev, dma_addr_t dma_handle,</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(direction == DMA_NONE);</div><div class='ctx'> </div><div class='add'>+	if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (direction == DMA_TO_DEVICE)</div><div class='del'>-	    return;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For PCI_DMA_FROMDEVICE this flush is not necessary for the</div><div class='hunk'>@@ -479,7 +484,6 @@ static void pa11_dma_unmap_page(struct device *dev, dma_addr_t dma_handle,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	flush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle), size);</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pa11_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='hunk'>@@ -496,6 +500,10 @@ static int pa11_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 		sg_dma_address(sg) = (dma_addr_t) virt_to_phys(vaddr);</div><div class='ctx'> 		sg_dma_len(sg) = sg-&gt;length;</div><div class='add'>+</div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		flush_kernel_dcache_range(vaddr, sg-&gt;length);</div><div class='ctx'> 	}</div><div class='ctx'> 	return nents;</div><div class='hunk'>@@ -510,14 +518,16 @@ static void pa11_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(direction == DMA_NONE);</div><div class='ctx'> </div><div class='add'>+	if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (direction == DMA_TO_DEVICE)</div><div class='del'>-	    return;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(sglist, sg, nents, i)</div><div class='ctx'> 		flush_kernel_vmap_range(sg_virt(sg), sg-&gt;length);</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pa11_dma_sync_single_for_cpu(struct device *dev,</div><div class='hunk'>@@ -562,7 +572,7 @@ static void pa11_dma_sync_sg_for_device(struct device *dev, struct scatterlist *</div><div class='ctx'> 		flush_kernel_vmap_range(sg_virt(sg), sg-&gt;length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops pcxl_dma_ops = {</div><div class='add'>+const struct dma_map_ops pcxl_dma_ops = {</div><div class='ctx'> 	.dma_supported =	pa11_dma_supported,</div><div class='ctx'> 	.alloc =		pa11_dma_alloc,</div><div class='ctx'> 	.free =			pa11_dma_free,</div><div class='hunk'>@@ -598,7 +608,7 @@ static void pcx_dma_free(struct device *dev, size_t size, void *vaddr,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops pcx_dma_ops = {</div><div class='add'>+const struct dma_map_ops pcx_dma_ops = {</div><div class='ctx'> 	.dma_supported =	pa11_dma_supported,</div><div class='ctx'> 	.alloc =		pcx_dma_alloc,</div><div class='ctx'> 	.free =			pcx_dma_free,</div><div class='head'>diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c<br/>index 518f4f5f1f43..e282a5131d77 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/perf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/perf.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/perf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/perf.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/perf.h&gt;</div><div class='ctx'> #include &lt;asm/parisc-device.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -301,7 +301,6 @@ static ssize_t perf_read(struct file *file, char __user *buf, size_t cnt, loff_t</div><div class='ctx'> static ssize_t perf_write(struct file *file, const char __user *buf, size_t count, </div><div class='ctx'> 	loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	size_t image_size;</div><div class='ctx'> 	uint32_t image_type;</div><div class='ctx'> 	uint32_t interface_type;</div><div class='hunk'>@@ -320,8 +319,8 @@ static ssize_t perf_write(struct file *file, const char __user *buf, size_t coun</div><div class='ctx'> 	if (count != sizeof(uint32_t))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if ((err = copy_from_user(&amp;image_type, buf, sizeof(uint32_t))) != 0) </div><div class='del'>-		return err;</div><div class='add'>+	if (copy_from_user(&amp;image_type, buf, sizeof(uint32_t)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the interface type and test type */</div><div class='ctx'>    	interface_type = (image_type &gt;&gt; 16) &amp; 0xffff;</div><div class='head'>diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c<br/>index 40639439d8b3..06f7ca7fe70b 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/process.c</a></div><div class='hunk'>@@ -43,6 +43,9 @@</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='hunk'>@@ -276,11 +279,7 @@ void *dereference_function_descriptor(void *ptr)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long brk_rnd(void)</div><div class='ctx'> {</div><div class='del'>-	/* 8MB for 32bit, 1GB for 64bit */</div><div class='del'>-	if (is_32bit_task())</div><div class='del'>-		return (get_random_int() &amp; 0x7ffUL) &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	else</div><div class='del'>-		return (get_random_int() &amp; 0x3ffffUL) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	return (get_random_int() &amp; BRK_RND_MASK) &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long arch_randomize_brk(struct mm_struct *mm)</div><div class='head'>diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c<br/>index 0c2a94a0f751..85de47f4eb59 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/processor.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/processor.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/processor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/processor.c</a></div><div class='hunk'>@@ -78,11 +78,6 @@ DEFINE_PER_CPU(struct cpuinfo_parisc, cpu_data);</div><div class='ctx'> static void</div><div class='ctx'> init_percpu_prof(unsigned long cpunum)</div><div class='ctx'> {</div><div class='del'>-	struct cpuinfo_parisc *p;</div><div class='del'>-</div><div class='del'>-	p = &amp;per_cpu(cpu_data, cpunum);</div><div class='del'>-	p-&gt;prof_counter = 1;</div><div class='del'>-	p-&gt;prof_multiplier = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -99,6 +94,7 @@ static int processor_probe(struct parisc_device *dev)</div><div class='ctx'> 	unsigned long txn_addr;</div><div class='ctx'> 	unsigned long cpuid;</div><div class='ctx'> 	struct cpuinfo_parisc *p;</div><div class='add'>+	struct pdc_pat_cpu_num cpu_info __maybe_unused;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	if (num_online_cpus() &gt;= nr_cpu_ids) {</div><div class='hunk'>@@ -123,10 +119,6 @@ static int processor_probe(struct parisc_device *dev)</div><div class='ctx'> 		ulong status;</div><div class='ctx'> 		unsigned long bytecnt;</div><div class='ctx'> 	        pdc_pat_cell_mod_maddr_block_t *pa_pdc_cell;</div><div class='del'>-#undef USE_PAT_CPUID</div><div class='del'>-#ifdef USE_PAT_CPUID</div><div class='del'>-		struct pdc_pat_cpu_num cpu_info;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 		pa_pdc_cell = kmalloc(sizeof (*pa_pdc_cell), GFP_KERNEL);</div><div class='ctx'> 		if (!pa_pdc_cell)</div><div class='hunk'>@@ -145,22 +137,27 @@ static int processor_probe(struct parisc_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		kfree(pa_pdc_cell);</div><div class='ctx'> </div><div class='add'>+		/* get the cpu number */</div><div class='add'>+		status = pdc_pat_cpu_get_number(&amp;cpu_info, dev-&gt;hpa.start);</div><div class='add'>+		BUG_ON(PDC_OK != status);</div><div class='add'>+</div><div class='add'>+		pr_info("Logical CPU #%lu is physical cpu #%lu at location "</div><div class='add'>+			"0x%lx with hpa %pa\n",</div><div class='add'>+			cpuid, cpu_info.cpu_num, cpu_info.cpu_loc,</div><div class='add'>+			&amp;dev-&gt;hpa.start);</div><div class='add'>+</div><div class='add'>+#undef USE_PAT_CPUID</div><div class='ctx'> #ifdef USE_PAT_CPUID</div><div class='ctx'> /* We need contiguous numbers for cpuid. Firmware's notion</div><div class='ctx'>  * of cpuid is for physical CPUs and we just don't care yet.</div><div class='ctx'>  * We'll care when we need to query PAT PDC about a CPU *after*</div><div class='ctx'>  * boot time (ie shutdown a CPU from an OS perspective).</div><div class='ctx'>  */</div><div class='del'>-		/* get the cpu number */</div><div class='del'>-		status = pdc_pat_cpu_get_number(&amp;cpu_info, dev-&gt;hpa.start);</div><div class='del'>-</div><div class='del'>-		BUG_ON(PDC_OK != status);</div><div class='del'>-</div><div class='ctx'> 		if (cpu_info.cpu_num &gt;= NR_CPUS) {</div><div class='del'>-			printk(KERN_WARNING "IGNORING CPU at 0x%x,"</div><div class='add'>+			printk(KERN_WARNING "IGNORING CPU at %pa,"</div><div class='ctx'> 				" cpu_slot_id &gt; NR_CPUS"</div><div class='ctx'> 				" (%ld &gt; %d)\n",</div><div class='del'>-				dev-&gt;hpa.start, cpu_info.cpu_num, NR_CPUS);</div><div class='add'>+				&amp;dev-&gt;hpa.start, cpu_info.cpu_num, NR_CPUS);</div><div class='ctx'> 			/* Ignore CPU since it will only crash */</div><div class='ctx'> 			boot_cpu_data.cpu_count--;</div><div class='ctx'> 			return 1;</div><div class='head'>diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c<br/>index e02d7b4d2b69..f8b6959d2d97 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/ptrace.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/audit.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='head'>diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c<br/>index 2e66a887788e..dee6f9d6a153 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/setup.c</a></div><div class='hunk'>@@ -36,6 +36,8 @@</div><div class='ctx'> #undef PCI_DEBUG</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='hunk'>@@ -176,6 +178,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	conswitchp = &amp;dummy_con;	/* we use do_take_over_console() later ! */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	clear_sched_clock_stable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c<br/>index 2264f68f3c2f..26f12f45b4bb 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/signal.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -27,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='ctx'> #include &lt;asm/rt_sigframe.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -232,6 +233,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs,</div><div class='ctx'> 	struct rt_sigframe __user *frame;</div><div class='ctx'> 	unsigned long rp, usp;</div><div class='ctx'> 	unsigned long haddr, sigframe_size;</div><div class='add'>+	unsigned long start, end;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='ctx'> 	struct compat_rt_sigframe __user * compat_frame;</div><div class='hunk'>@@ -299,10 +301,10 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	flush_user_dcache_range((unsigned long) &amp;frame-&gt;tramp[0],</div><div class='del'>-			   (unsigned long) &amp;frame-&gt;tramp[TRAMP_SIZE]);</div><div class='del'>-	flush_user_icache_range((unsigned long) &amp;frame-&gt;tramp[0],</div><div class='del'>-			   (unsigned long) &amp;frame-&gt;tramp[TRAMP_SIZE]);</div><div class='add'>+	start = (unsigned long) &amp;frame-&gt;tramp[0];</div><div class='add'>+	end = (unsigned long) &amp;frame-&gt;tramp[TRAMP_SIZE];</div><div class='add'>+	flush_user_dcache_range_asm(start, end);</div><div class='add'>+	flush_user_icache_range_asm(start, end);</div><div class='ctx'> </div><div class='ctx'> 	/* TRAMP Words 0-4, Length 5 = SIGRESTARTBLOCK_TRAMP</div><div class='ctx'> 	 * TRAMP Words 5-9, Length 4 = SIGRETURN_TRAMP</div><div class='hunk'>@@ -548,8 +550,8 @@ insert_restart_trampoline(struct pt_regs *regs)</div><div class='ctx'> 		WARN_ON(err);</div><div class='ctx'> </div><div class='ctx'> 		/* flush data/instruction cache for new insns */</div><div class='del'>-		flush_user_dcache_range(start, end);</div><div class='del'>-		flush_user_icache_range(start, end);</div><div class='add'>+		flush_user_dcache_range_asm(start, end);</div><div class='add'>+		flush_user_icache_range_asm(start, end);</div><div class='ctx'> </div><div class='ctx'> 		regs-&gt;gr[31] = regs-&gt;gr[30] + 8;</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/arch/parisc/kernel/signal32.c b/arch/parisc/kernel/signal32.c<br/>index c342b2e17492..70aaabb8b3cb 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/signal32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/signal32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/signal32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/signal32.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "signal32.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c<br/>index 75dab2871346..63365106ea19 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/smp.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -279,7 +279,7 @@ smp_cpu_init(int cpunum)</div><div class='ctx'> 	set_cpu_online(cpunum, true);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialise the idle task for this CPU */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> 	BUG_ON(current-&gt;mm);</div><div class='ctx'> 	enter_lazy_tlb(&amp;init_mm, current);</div><div class='head'>diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c<br/>index 0a393a04e891..e5288638a1d9 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/sys_parisc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/sys_parisc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/sys_parisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/sys_parisc.c</a></div><div class='hunk'>@@ -23,13 +23,15 @@</div><div class='ctx'>  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/shm.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='hunk'>@@ -225,19 +227,17 @@ static unsigned long mmap_rnd(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long rnd = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	*  8 bits of randomness in 32bit mmaps, 20 address space bits</div><div class='del'>-	* 28 bits of randomness in 64bit mmaps, 40 address space bits</div><div class='del'>-	*/</div><div class='del'>-	if (current-&gt;flags &amp; PF_RANDOMIZE) {</div><div class='del'>-		if (is_32bit_task())</div><div class='del'>-			rnd = get_random_int() % (1&lt;&lt;8);</div><div class='del'>-		else</div><div class='del'>-			rnd = get_random_int() % (1&lt;&lt;28);</div><div class='del'>-	}</div><div class='add'>+	if (current-&gt;flags &amp; PF_RANDOMIZE)</div><div class='add'>+		rnd = get_random_int() &amp; MMAP_RND_MASK;</div><div class='add'>+</div><div class='ctx'> 	return rnd &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+unsigned long arch_mmap_rnd(void)</div><div class='add'>+{</div><div class='add'>+	return (get_random_int() &amp; MMAP_RND_MASK) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static unsigned long mmap_legacy_base(void)</div><div class='ctx'> {</div><div class='ctx'> 	return TASK_UNMAPPED_BASE + mmap_rnd();</div><div class='head'>diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c<br/>index 325f30d82b64..89421df70160 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/time.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/sched_clock.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='hunk'>@@ -28,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -59,10 +60,9 @@ static unsigned long clocktick __read_mostly;	/* timer cycles per tick */</div><div class='ctx'>  */</div><div class='ctx'> irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	unsigned long now, now2;</div><div class='add'>+	unsigned long now;</div><div class='ctx'> 	unsigned long next_tick;</div><div class='del'>-	unsigned long cycles_elapsed, ticks_elapsed = 1;</div><div class='del'>-	unsigned long cycles_remainder;</div><div class='add'>+	unsigned long ticks_elapsed = 0;</div><div class='ctx'> 	unsigned int cpu = smp_processor_id();</div><div class='ctx'> 	struct cpuinfo_parisc *cpuinfo = &amp;per_cpu(cpu_data, cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -71,102 +71,49 @@ irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	profile_tick(CPU_PROFILING);</div><div class='ctx'> </div><div class='del'>-	/* Initialize next_tick to the expected tick time. */</div><div class='add'>+	/* Initialize next_tick to the old expected tick time. */</div><div class='ctx'> 	next_tick = cpuinfo-&gt;it_value;</div><div class='ctx'> </div><div class='del'>-	/* Get current cycle counter (Control Register 16). */</div><div class='del'>-	now = mfctl(16);</div><div class='del'>-</div><div class='del'>-	cycles_elapsed = now - next_tick;</div><div class='del'>-</div><div class='del'>-	if ((cycles_elapsed &gt;&gt; 6) &lt; cpt) {</div><div class='del'>-		/* use "cheap" math (add/subtract) instead</div><div class='del'>-		 * of the more expensive div/mul method</div><div class='del'>-		 */</div><div class='del'>-		cycles_remainder = cycles_elapsed;</div><div class='del'>-		while (cycles_remainder &gt; cpt) {</div><div class='del'>-			cycles_remainder -= cpt;</div><div class='del'>-			ticks_elapsed++;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* TODO: Reduce this to one fdiv op */</div><div class='del'>-		cycles_remainder = cycles_elapsed % cpt;</div><div class='del'>-		ticks_elapsed += cycles_elapsed / cpt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* convert from "division remainder" to "remainder of clock tick" */</div><div class='del'>-	cycles_remainder = cpt - cycles_remainder;</div><div class='del'>-</div><div class='del'>-	/* Determine when (in CR16 cycles) next IT interrupt will fire.</div><div class='del'>-	 * We want IT to fire modulo clocktick even if we miss/skip some.</div><div class='del'>-	 * But those interrupts don't in fact get delivered that regularly.</div><div class='del'>-	 */</div><div class='del'>-	next_tick = now + cycles_remainder;</div><div class='add'>+	/* Calculate how many ticks have elapsed. */</div><div class='add'>+	do {</div><div class='add'>+		++ticks_elapsed;</div><div class='add'>+		next_tick += cpt;</div><div class='add'>+		now = mfctl(16);</div><div class='add'>+	} while (next_tick - now &gt; cpt);</div><div class='ctx'> </div><div class='add'>+	/* Store (in CR16 cycles) up to when we are accounting right now. */</div><div class='ctx'> 	cpuinfo-&gt;it_value = next_tick;</div><div class='ctx'> </div><div class='del'>-	/* Program the IT when to deliver the next interrupt.</div><div class='del'>-	 * Only bottom 32-bits of next_tick are writable in CR16!</div><div class='del'>-	 */</div><div class='del'>-	mtctl(next_tick, 16);</div><div class='add'>+	/* Go do system house keeping. */</div><div class='add'>+	if (cpu == 0)</div><div class='add'>+		xtime_update(ticks_elapsed);</div><div class='ctx'> </div><div class='del'>-	/* Skip one clocktick on purpose if we missed next_tick.</div><div class='add'>+	update_process_times(user_mode(get_irq_regs()));</div><div class='add'>+</div><div class='add'>+	/* Skip clockticks on purpose if we know we would miss those.</div><div class='ctx'> 	 * The new CR16 must be "later" than current CR16 otherwise</div><div class='ctx'> 	 * itimer would not fire until CR16 wrapped - e.g 4 seconds</div><div class='ctx'> 	 * later on a 1Ghz processor. We'll account for the missed</div><div class='del'>-	 * tick on the next timer interrupt.</div><div class='add'>+	 * ticks on the next timer interrupt.</div><div class='add'>+	 * We want IT to fire modulo clocktick even if we miss/skip some.</div><div class='add'>+	 * But those interrupts don't in fact get delivered that regularly.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * "next_tick - now" will always give the difference regardless</div><div class='ctx'> 	 * if one or the other wrapped. If "now" is "bigger" we'll end up</div><div class='ctx'> 	 * with a very large unsigned number.</div><div class='ctx'> 	 */</div><div class='del'>-	now2 = mfctl(16);</div><div class='del'>-	if (next_tick - now2 &gt; cpt)</div><div class='del'>-		mtctl(next_tick+cpt, 16);</div><div class='add'>+	while (next_tick - mfctl(16) &gt; cpt)</div><div class='add'>+		next_tick += cpt;</div><div class='ctx'> </div><div class='del'>-#if 1</div><div class='del'>-/*</div><div class='del'>- * GGG: DEBUG code for how many cycles programming CR16 used.</div><div class='del'>- */</div><div class='del'>-	if (unlikely(now2 - now &gt; 0x3000)) 	/* 12K cycles */</div><div class='del'>-		printk (KERN_CRIT "timer_interrupt(CPU %d): SLOW! 0x%lx cycles!"</div><div class='del'>-			" cyc %lX rem %lX "</div><div class='del'>-			" next/now %lX/%lX\n",</div><div class='del'>-			cpu, now2 - now, cycles_elapsed, cycles_remainder,</div><div class='del'>-			next_tick, now );</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Can we differentiate between "early CR16" (aka Scenario 1) and</div><div class='del'>-	 * "long delay" (aka Scenario 3)? I don't think so.</div><div class='del'>-	 *</div><div class='del'>-	 * Timer_interrupt will be delivered at least a few hundred cycles</div><div class='del'>-	 * after the IT fires. But it's arbitrary how much time passes</div><div class='del'>-	 * before we call it "late". I've picked one second.</div><div class='del'>-	 *</div><div class='del'>-	 * It's important NO printk's are between reading CR16 and</div><div class='del'>-	 * setting up the next value. May introduce huge variance.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(ticks_elapsed &gt; HZ)) {</div><div class='del'>-		/* Scenario 3: very long delay?  bad in any case */</div><div class='del'>-		printk (KERN_CRIT "timer_interrupt(CPU %d): delayed!"</div><div class='del'>-			" cycles %lX rem %lX "</div><div class='del'>-			" next/now %lX/%lX\n",</div><div class='del'>-			cpu,</div><div class='del'>-			cycles_elapsed, cycles_remainder,</div><div class='del'>-			next_tick, now );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Done mucking with unreliable delivery of interrupts.</div><div class='del'>-	 * Go do system house keeping.</div><div class='add'>+	/* Program the IT when to deliver the next interrupt.</div><div class='add'>+	 * Only bottom 32-bits of next_tick are writable in CR16!</div><div class='add'>+	 * Timer interrupt will be delivered at least a few hundred cycles</div><div class='add'>+	 * after the IT fires, so if we are too close (&lt;= 500 cycles) to the</div><div class='add'>+	 * next cycle, simply skip it.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	if (!--cpuinfo-&gt;prof_counter) {</div><div class='del'>-		cpuinfo-&gt;prof_counter = cpuinfo-&gt;prof_multiplier;</div><div class='del'>-		update_process_times(user_mode(get_irq_regs()));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cpu == 0)</div><div class='del'>-		xtime_update(ticks_elapsed);</div><div class='add'>+	if (next_tick - mfctl(16) &lt;= 500)</div><div class='add'>+		next_tick += cpt;</div><div class='add'>+	mtctl(next_tick, 16);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -191,7 +138,7 @@ EXPORT_SYMBOL(profile_pc);</div><div class='ctx'> </div><div class='ctx'> /* clock source code */</div><div class='ctx'> </div><div class='del'>-static cycle_t notrace read_cr16(struct clocksource *cs)</div><div class='add'>+static u64 notrace read_cr16(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return get_cycles();</div><div class='ctx'> }</div><div class='hunk'>@@ -289,9 +236,26 @@ void __init time_init(void)</div><div class='ctx'> </div><div class='ctx'> 	cr16_hz = 100 * PAGE0-&gt;mem_10msec;  /* Hz */</div><div class='ctx'> </div><div class='del'>-	/* register at clocksource framework */</div><div class='del'>-	clocksource_register_hz(&amp;clocksource_cr16, cr16_hz);</div><div class='del'>-</div><div class='ctx'> 	/* register as sched_clock source */</div><div class='ctx'> 	sched_clock_register(read_cr16_sched_clock, BITS_PER_LONG, cr16_hz);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int __init init_cr16_clocksource(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The cr16 interval timers are not syncronized across CPUs, so mark</div><div class='add'>+	 * them unstable and lower rating on SMP systems.</div><div class='add'>+	 */</div><div class='add'>+	if (num_online_cpus() &gt; 1) {</div><div class='add'>+		clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;</div><div class='add'>+		clocksource_cr16.rating = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* register at clocksource framework */</div><div class='add'>+	clocksource_register_hz(&amp;clocksource_cr16,</div><div class='add'>+		100 * PAGE0-&gt;mem_10msec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(init_cr16_clocksource);</div><div class='head'>diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c<br/>index 378df9207406..991654c88eec 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/traps.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c<br/>index 2b65c0177778..e36f7b75ab07 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/unaligned.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/unaligned.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/unaligned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/unaligned.c</a></div><div class='hunk'>@@ -23,10 +23,11 @@</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/hardirq.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c<br/>index e278a87f43cc..1b73690477c5 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/kernel/unwind.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/kernel/unwind.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/kernel/unwind.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/kernel/unwind.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/assembly.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/parisc/lib/checksum.c b/arch/parisc/lib/checksum.c<br/>index ae66d31f9ecf..ba6384da6ade 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/lib/checksum.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/lib/checksum.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/lib/checksum.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/lib/checksum.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/string.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define addc(_t,_r)                     \</div><div class='ctx'> 	__asm__ __volatile__ (          \</div><div class='head'>diff --git a/arch/parisc/math-emu/driver.c b/arch/parisc/math-emu/driver.c<br/>index 09ef4136c693..2fb59d2e2b29 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/math-emu/driver.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/math-emu/driver.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/math-emu/driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/math-emu/driver.c</a></div><div class='hunk'>@@ -27,7 +27,8 @@</div><div class='ctx'>  *  Copyright (C) 2001	      Hewlett-Packard &lt;bame@debian.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "float.h"</div><div class='ctx'> #include "math-emu.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c<br/>index 8ff9253930af..deab89a8915a 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/mm/fault.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -234,12 +235,12 @@ show_signal_msg(struct pt_regs *regs, unsigned long code,</div><div class='ctx'> 	    tsk-&gt;comm, code, address);</div><div class='ctx'> 	print_vma_addr(KERN_CONT " in ", regs-&gt;iaoq[0]);</div><div class='ctx'> </div><div class='del'>-	pr_cont(" trap #%lu: %s%c", code, trap_name(code),</div><div class='add'>+	pr_cont("\ntrap #%lu: %s%c", code, trap_name(code),</div><div class='ctx'> 		vma ? ',':'\n');</div><div class='ctx'> </div><div class='ctx'> 	if (vma)</div><div class='del'>-		pr_warn(KERN_CONT " vm_start = 0x%08lx, vm_end = 0x%08lx\n",</div><div class='del'>-				vma-&gt;vm_start, vma-&gt;vm_end);</div><div class='add'>+		pr_cont(" vm_start = 0x%08lx, vm_end = 0x%08lx\n",</div><div class='add'>+			vma-&gt;vm_start, vma-&gt;vm_end);</div><div class='ctx'> </div><div class='ctx'> 	show_regs(regs);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/parisc/mm/hugetlbpage.c b/arch/parisc/mm/hugetlbpage.c<br/>index 5d6eea925cf4..aa50ac090e9b 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/mm/hugetlbpage.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/mm/hugetlbpage.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='head'>diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c<br/>index e02ada312be8..66f3a6345105 100644<br/>--- a/<a href='/drm-misc/tree/arch/parisc/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/parisc/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/parisc/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/parisc/mm/init.c</a></div><div class='hunk'>@@ -545,7 +545,7 @@ void free_initmem(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_RODATA</div><div class='add'>+#ifdef CONFIG_STRICT_KERNEL_RWX</div><div class='ctx'> void mark_rodata_ro(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* rodata memory was already mapped with KERNEL_RO access rights by</div><div class='hunk'>@@ -653,55 +653,6 @@ void __init mem_init(void)</div><div class='ctx'> unsigned long *empty_zero_page __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(empty_zero_page);</div><div class='ctx'> </div><div class='del'>-void show_mem(unsigned int filter)</div><div class='del'>-{</div><div class='del'>-	int total = 0,reserved = 0;</div><div class='del'>-	pg_data_t *pgdat;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Mem-info:\n");</div><div class='del'>-	show_free_areas(filter);</div><div class='del'>-</div><div class='del'>-	for_each_online_pgdat(pgdat) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		int zoneid;</div><div class='del'>-</div><div class='del'>-		pgdat_resize_lock(pgdat, &amp;flags);</div><div class='del'>-		for (zoneid = 0; zoneid &lt; MAX_NR_ZONES; zoneid++) {</div><div class='del'>-			struct zone *zone = &amp;pgdat-&gt;node_zones[zoneid];</div><div class='del'>-			if (!populated_zone(zone))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			total += zone-&gt;present_pages;</div><div class='del'>-			reserved = zone-&gt;present_pages - zone-&gt;managed_pages;</div><div class='del'>-		}</div><div class='del'>-		pgdat_resize_unlock(pgdat, &amp;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%d pages of RAM\n", total);</div><div class='del'>-	printk(KERN_INFO "%d reserved pages\n", reserved);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DISCONTIGMEM</div><div class='del'>-	{</div><div class='del'>-		struct zonelist *zl;</div><div class='del'>-		int i, j;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; npmem_ranges; i++) {</div><div class='del'>-			zl = node_zonelist(i, 0);</div><div class='del'>-			for (j = 0; j &lt; MAX_NR_ZONES; j++) {</div><div class='del'>-				struct zoneref *z;</div><div class='del'>-				struct zone *zone;</div><div class='del'>-</div><div class='del'>-				printk("Zone list for zone %d on node %d: ", j, i);</div><div class='del'>-				for_each_zone_zonelist(zone, z, zl, j)</div><div class='del'>-					printk("[%d/%s] ", zone_to_nid(zone),</div><div class='del'>-								zone-&gt;name);</div><div class='del'>-				printk("\n");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * pagetable_init() sets up the page tables</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig<br/>index 65fba4c34cd7..494091762bd7 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/Kconfig</a></div><div class='hunk'>@@ -80,6 +80,7 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK</div><div class='ctx'> config PPC</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='add'>+	select BUILDTIME_EXTABLE_SORT</div><div class='ctx'> 	select ARCH_MIGHT_HAVE_PC_PARPORT</div><div class='ctx'> 	select ARCH_MIGHT_HAVE_PC_SERIO</div><div class='ctx'> 	select BINFMT_ELF</div><div class='hunk'>@@ -92,12 +93,14 @@ config PPC</div><div class='ctx'> 	select HAVE_DYNAMIC_FTRACE_WITH_REGS if MPROFILE_KERNEL</div><div class='ctx'> 	select HAVE_FUNCTION_TRACER</div><div class='ctx'> 	select HAVE_FUNCTION_GRAPH_TRACER</div><div class='add'>+	select HAVE_GCC_PLUGINS</div><div class='ctx'> 	select SYSCTL_EXCEPTION_TRACE</div><div class='ctx'> 	select VIRT_TO_BUS if !PPC64</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select HAVE_IOREMAP_PROT</div><div class='ctx'> 	select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN &amp;&amp; POWER7_CPU)</div><div class='ctx'> 	select HAVE_KPROBES</div><div class='add'>+	select HAVE_OPTPROBES if PPC64</div><div class='ctx'> 	select HAVE_ARCH_KGDB</div><div class='ctx'> 	select HAVE_KRETPROBES</div><div class='ctx'> 	select HAVE_ARCH_TRACEHOOK</div><div class='hunk'>@@ -112,7 +115,7 @@ config PPC</div><div class='ctx'> 	select HAVE_PERF_REGS</div><div class='ctx'> 	select HAVE_PERF_USER_STACK_DUMP</div><div class='ctx'> 	select HAVE_REGS_AND_STACK_ACCESS_API</div><div class='del'>-	select HAVE_HW_BREAKPOINT if PERF_EVENTS &amp;&amp; PPC_BOOK3S_64</div><div class='add'>+	select HAVE_HW_BREAKPOINT if PERF_EVENTS &amp;&amp; (PPC_BOOK3S || PPC_8xx)</div><div class='ctx'> 	select ARCH_WANT_IPC_PARSE_VERSION</div><div class='ctx'> 	select SPARSE_IRQ</div><div class='ctx'> 	select IRQ_DOMAIN</div><div class='hunk'>@@ -160,11 +163,13 @@ config PPC</div><div class='ctx'> 	select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS</div><div class='ctx'> 	select GENERIC_CPU_AUTOPROBE</div><div class='ctx'> 	select HAVE_VIRT_CPU_ACCOUNTING</div><div class='add'>+	select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE</div><div class='ctx'> 	select HAVE_ARCH_HARDENED_USERCOPY</div><div class='ctx'> 	select HAVE_KERNEL_GZIP</div><div class='add'>+	select HAVE_CONTEXT_TRACKING if PPC64</div><div class='ctx'> </div><div class='ctx'> config GENERIC_CSUM</div><div class='del'>-	def_bool CPU_LITTLE_ENDIAN</div><div class='add'>+	def_bool n</div><div class='ctx'> </div><div class='ctx'> config EARLY_PRINTK</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -388,13 +393,21 @@ config DISABLE_MPROFILE_KERNEL</div><div class='ctx'> 	  be disabled also.</div><div class='ctx'> </div><div class='ctx'> 	  If you have a toolchain which supports mprofile-kernel, then you can</div><div class='del'>-	  enable this. Otherwise leave it disabled. If you're not sure, say</div><div class='del'>-	  "N".</div><div class='add'>+	  disable this. Otherwise leave it enabled. If you're not sure, say</div><div class='add'>+	  "Y".</div><div class='ctx'> </div><div class='ctx'> config MPROFILE_KERNEL</div><div class='ctx'> 	depends on PPC64 &amp;&amp; CPU_LITTLE_ENDIAN</div><div class='ctx'> 	def_bool !DISABLE_MPROFILE_KERNEL</div><div class='ctx'> </div><div class='add'>+config USE_THIN_ARCHIVES</div><div class='add'>+	bool "Build the kernel using thin archives"</div><div class='add'>+	default n</div><div class='add'>+	select THIN_ARCHIVES</div><div class='add'>+	help</div><div class='add'>+	  Build the kernel using thin archives.</div><div class='add'>+	  If you're unsure say N.</div><div class='add'>+</div><div class='ctx'> config IOMMU_HELPER</div><div class='ctx'> 	def_bool PPC64</div><div class='ctx'> </div><div class='hunk'>@@ -455,10 +468,25 @@ config KEXEC</div><div class='ctx'> 	  interface is strongly in flux, so no good recommendation can be</div><div class='ctx'> 	  made.</div><div class='ctx'> </div><div class='add'>+config KEXEC_FILE</div><div class='add'>+	bool "kexec file based system call"</div><div class='add'>+	select KEXEC_CORE</div><div class='add'>+	select HAVE_IMA_KEXEC</div><div class='add'>+	select BUILD_BIN2C</div><div class='add'>+	depends on PPC64</div><div class='add'>+	depends on CRYPTO=y</div><div class='add'>+	depends on CRYPTO_SHA256=y</div><div class='add'>+	help</div><div class='add'>+	  This is a new version of the kexec system call. This call is</div><div class='add'>+	  file based and takes in file descriptors as system call arguments</div><div class='add'>+	  for kernel and initramfs as opposed to a list of segments as is the</div><div class='add'>+	  case for the older kexec call.</div><div class='add'>+</div><div class='ctx'> config RELOCATABLE</div><div class='ctx'> 	bool "Build a relocatable kernel"</div><div class='ctx'> 	depends on (PPC64 &amp;&amp; !COMPILE_TEST) || (FLATMEM &amp;&amp; (44x || FSL_BOOKE))</div><div class='ctx'> 	select NONSTATIC_KERNEL</div><div class='add'>+	select MODULE_REL_CRCS if MODVERSIONS</div><div class='ctx'> 	help</div><div class='ctx'> 	  This builds a kernel image that is capable of running at the</div><div class='ctx'> 	  location the kernel is loaded at. For ppc32, there is no any</div><div class='hunk'>@@ -478,6 +506,15 @@ config RELOCATABLE</div><div class='ctx'> 	  setting can still be useful to bootwrappers that need to know the</div><div class='ctx'> 	  load address of the kernel (eg. u-boot/mkimage).</div><div class='ctx'> </div><div class='add'>+config RELOCATABLE_TEST</div><div class='add'>+	bool "Test relocatable kernel"</div><div class='add'>+	depends on (PPC64 &amp;&amp; RELOCATABLE)</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  This runs the relocatable kernel at the address it was initially</div><div class='add'>+	  loaded at, which tends to be non-zero and therefore test the</div><div class='add'>+	  relocation code.</div><div class='add'>+</div><div class='ctx'> config CRASH_DUMP</div><div class='ctx'> 	bool "Build a kdump crash kernel"</div><div class='ctx'> 	depends on PPC64 || 6xx || FSL_BOOKE || (44x &amp;&amp; !SMP)</div><div class='hunk'>@@ -489,7 +526,7 @@ config CRASH_DUMP</div><div class='ctx'> </div><div class='ctx'> config FA_DUMP</div><div class='ctx'> 	bool "Firmware-assisted dump"</div><div class='del'>-	depends on PPC64 &amp;&amp; PPC_RTAS &amp;&amp; CRASH_DUMP &amp;&amp; KEXEC</div><div class='add'>+	depends on PPC64 &amp;&amp; PPC_RTAS &amp;&amp; CRASH_DUMP &amp;&amp; KEXEC_CORE</div><div class='ctx'> 	help</div><div class='ctx'> 	  A robust mechanism to get reliable kernel crash dump with</div><div class='ctx'> 	  assistance from firmware. This approach does not use kexec,</div><div class='hunk'>@@ -548,6 +585,13 @@ config ARCH_SPARSEMEM_DEFAULT</div><div class='ctx'> config SYS_SUPPORTS_HUGETLBFS</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config ILLEGAL_POINTER_VALUE</div><div class='add'>+	hex</div><div class='add'>+	# This is roughly half way between the top of user space and the bottom</div><div class='add'>+	# of kernel space, which seems about as good as we can get.</div><div class='add'>+	default 0x5deadbeef0000000 if PPC64</div><div class='add'>+	default 0</div><div class='add'>+</div><div class='ctx'> source "mm/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config ARCH_MEMORY_PROBE</div><div class='head'>diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug<br/>index 63292f64b25a..c86df246339e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/Kconfig.debug?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/Kconfig.debug</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/Kconfig.debug</a></div><div class='hunk'>@@ -354,4 +354,19 @@ config FAIL_IOMMU</div><div class='ctx'> </div><div class='ctx'> 	  If you are unsure, say N.</div><div class='ctx'> </div><div class='add'>+config PPC_PTDUMP</div><div class='add'>+        bool "Export kernel pagetable layout to userspace via debugfs"</div><div class='add'>+        depends on DEBUG_KERNEL &amp;&amp; DEBUG_FS</div><div class='add'>+        help</div><div class='add'>+	  This option exports the state of the kernel pagetables to a</div><div class='add'>+	  debugfs file. This is only useful for kernel developers who are</div><div class='add'>+	  working in architecture specific areas of the kernel - probably</div><div class='add'>+	  not a good idea to enable this feature in a production kernel.</div><div class='add'>+</div><div class='add'>+	  If you are unsure, say N.</div><div class='add'>+</div><div class='add'>+config PPC_HTDUMP</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on PPC_PTDUMP &amp;&amp; PPC_BOOK3S</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile<br/>index 617dece67924..31286fa7873c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/Makefile</a></div><div class='hunk'>@@ -23,7 +23,7 @@ CROSS32AR		:= $(CROSS32_COMPILE)ar</div><div class='ctx'> ifeq ($(HAS_BIARCH),y)</div><div class='ctx'> ifeq ($(CROSS32_COMPILE),)</div><div class='ctx'> CROSS32CC	:= $(CC) -m32</div><div class='del'>-CROSS32AR	:= GNUTARGET=elf32-powerpc $(AR)</div><div class='add'>+KBUILD_ARFLAGS	+= --target=elf32-powerpc</div><div class='ctx'> endif</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +85,7 @@ ifeq ($(HAS_BIARCH),y)</div><div class='ctx'> override AS	+= -a$(BITS)</div><div class='ctx'> override LD	+= -m elf$(BITS)$(LDEMULATION)</div><div class='ctx'> override CC	+= -m$(BITS)</div><div class='del'>-override AR	:= GNUTARGET=elf$(BITS)-$(GNUTARGET) $(AR)</div><div class='add'>+KBUILD_ARFLAGS	+= --target=elf$(BITS)-$(GNUTARGET)</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> LDFLAGS_vmlinux-y := -Bstatic</div><div class='hunk'>@@ -121,6 +121,7 @@ CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 $(MULTIPLEWORD)</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_PPC_BOOK3S_64),y)</div><div class='ctx'> CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,-mtune=power4)</div><div class='add'>+CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power4</div><div class='ctx'> else</div><div class='ctx'> CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64</div><div class='ctx'> endif</div><div class='hunk'>@@ -249,6 +250,7 @@ core-y				+= arch/powerpc/kernel/ \</div><div class='ctx'> core-$(CONFIG_XMON)		+= arch/powerpc/xmon/</div><div class='ctx'> core-$(CONFIG_KVM) 		+= arch/powerpc/kvm/</div><div class='ctx'> core-$(CONFIG_PERF_EVENTS)	+= arch/powerpc/perf/</div><div class='add'>+core-$(CONFIG_KEXEC_FILE)	+= arch/powerpc/purgatory/</div><div class='ctx'> </div><div class='ctx'> drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/</div><div class='ctx'> </div><div class='hunk'>@@ -275,16 +277,16 @@ zImage: relocs_check</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> $(BOOT_TARGETS1): vmlinux</div><div class='del'>-	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)</div><div class='add'>+	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)</div><div class='ctx'> $(BOOT_TARGETS2): vmlinux</div><div class='del'>-	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)</div><div class='add'>+	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> bootwrapper_install:</div><div class='del'>-	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)</div><div class='add'>+	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)</div><div class='ctx'> </div><div class='ctx'> %.dtb: scripts</div><div class='del'>-	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)</div><div class='add'>+	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)</div><div class='ctx'> </div><div class='ctx'> # Used to create 'merged defconfigs'</div><div class='ctx'> # To use it $(call) it with the first argument as the base defconfig</div><div class='head'>diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore<br/>index d61c03525777..84774ccba1c2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/.gitignore?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/.gitignore</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/.gitignore</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> addnote</div><div class='add'>+decompress_inflate.c</div><div class='ctx'> empty.c</div><div class='ctx'> hack-coff</div><div class='ctx'> inffast.c</div><div class='hunk'>@@ -13,11 +14,13 @@ infutil.h</div><div class='ctx'> kernel-vmlinux.strip.c</div><div class='ctx'> kernel-vmlinux.strip.gz</div><div class='ctx'> mktree</div><div class='add'>+otheros.bld</div><div class='ctx'> uImage</div><div class='ctx'> cuImage.*</div><div class='ctx'> dtbImage.*</div><div class='ctx'> *.dtb</div><div class='ctx'> treeImage.*</div><div class='add'>+vmlinux.strip</div><div class='ctx'> zImage</div><div class='ctx'> zImage.initrd</div><div class='ctx'> zImage.bin.*</div><div class='hunk'>@@ -26,6 +29,7 @@ zImage.coff</div><div class='ctx'> zImage.epapr</div><div class='ctx'> zImage.holly</div><div class='ctx'> zImage.*lds</div><div class='add'>+zImage.maple</div><div class='ctx'> zImage.miboot</div><div class='ctx'> zImage.pmac</div><div class='ctx'> zImage.pseries</div><div class='head'>diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile<br/>index 9d47f2efa830..e82f333cc84a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/Makefile</a></div><div class='hunk'>@@ -172,10 +172,6 @@ $(addprefix $(obj)/,$(libfdt) $(libfdtheader)): $(obj)/%: $(srctree)/scripts/dtc</div><div class='ctx'> $(obj)/empty.c:</div><div class='ctx'> 	$(Q)touch $@</div><div class='ctx'> </div><div class='del'>-$(obj)/zImage.lds: $(obj)/%: $(srctree)/$(src)/%.S</div><div class='del'>-	$(CROSS32CC) $(cpp_flags) -E -Wp,-MD,$(depfile) -P -Upowerpc \</div><div class='del'>-		-D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $&lt;</div><div class='del'>-</div><div class='ctx'> $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds : $(obj)/%: $(srctree)/$(src)/%.S</div><div class='ctx'> 	$(Q)cp $&lt; $@</div><div class='ctx'> </div><div class='hunk'>@@ -357,17 +353,17 @@ $(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz</div><div class='ctx'> # Don't put the ramdisk on the pattern rule; when its missing make will try</div><div class='ctx'> # the pattern rule with less dependencies that also matches (even with the</div><div class='ctx'> # hard dependency listed).</div><div class='del'>-$(obj)/zImage.initrd.%: vmlinux $(wrapperbits)</div><div class='add'>+$(obj)/zImage.initrd.%: vmlinux $(wrapperbits) FORCE</div><div class='ctx'> 	$(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz)</div><div class='ctx'> </div><div class='del'>-$(addprefix $(obj)/, $(sort $(filter zImage.%, $(image-y)))): vmlinux $(wrapperbits)</div><div class='add'>+$(addprefix $(obj)/, $(sort $(filter zImage.%, $(image-y)))): vmlinux $(wrapperbits) FORCE</div><div class='ctx'> 	$(call if_changed,wrap,$(subst $(obj)/zImage.,,$@))</div><div class='ctx'> </div><div class='ctx'> # dtbImage% - a dtbImage is a zImage with an embedded device tree blob</div><div class='del'>-$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb</div><div class='add'>+$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb FORCE</div><div class='ctx'> 	$(call if_changed,wrap,$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)</div><div class='ctx'> </div><div class='del'>-$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb</div><div class='add'>+$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb FORCE</div><div class='ctx'> 	$(call if_changed,wrap,$*,,$(obj)/$*.dtb)</div><div class='ctx'> </div><div class='ctx'> # This cannot be in the root of $(src) as the zImage rule always adds a $(obj)</div><div class='hunk'>@@ -375,31 +371,31 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb</div><div class='ctx'> $(obj)/vmlinux.strip: vmlinux</div><div class='ctx'> 	$(STRIP) -s -R .comment $&lt; -o $@</div><div class='ctx'> </div><div class='del'>-$(obj)/uImage: vmlinux $(wrapperbits)</div><div class='add'>+$(obj)/uImage: vmlinux $(wrapperbits) FORCE</div><div class='ctx'> 	$(call if_changed,wrap,uboot)</div><div class='ctx'> </div><div class='del'>-$(obj)/uImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='add'>+$(obj)/uImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE</div><div class='ctx'> 	$(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)</div><div class='ctx'> </div><div class='del'>-$(obj)/uImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='add'>+$(obj)/uImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE</div><div class='ctx'> 	$(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb)</div><div class='ctx'> </div><div class='del'>-$(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='add'>+$(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE</div><div class='ctx'> 	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)</div><div class='ctx'> </div><div class='del'>-$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='add'>+$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE</div><div class='ctx'> 	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)</div><div class='ctx'> </div><div class='del'>-$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='add'>+$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE</div><div class='ctx'> 	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)</div><div class='ctx'> </div><div class='del'>-$(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='add'>+$(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE</div><div class='ctx'> 	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb)</div><div class='ctx'> </div><div class='del'>-$(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='add'>+$(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE</div><div class='ctx'> 	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)</div><div class='ctx'> </div><div class='del'>-$(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='add'>+$(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE</div><div class='ctx'> 	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)</div><div class='ctx'> </div><div class='ctx'> # Rule to build device tree blobs</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/kmcent2.dts b/arch/powerpc/boot/dts/fsl/kmcent2.dts<br/>new file mode 100644<br/>index 000000000000..47afa438602e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/kmcent2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/kmcent2.dts</a></div><div class='hunk'>@@ -0,0 +1,303 @@</div><div class='add'>+/*</div><div class='add'>+ * Keymile kmcent2 Device Tree Source, based on T1040RDB DTS</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright 2016</div><div class='add'>+ * Valentin Longchamp, Keymile AG, valentin.longchamp@keymile.com</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2014 - 2015 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/include/ "t104xsi-pre.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "keymile,kmcent2";</div><div class='add'>+	compatible = "keymile,kmcent2";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		front_phy = &amp;front_phy;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		bman_fbpr: bman-fbpr {</div><div class='add'>+			size = &lt;0 0x1000000&gt;;</div><div class='add'>+			alignment = &lt;0 0x1000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		qman_fqd: qman-fqd {</div><div class='add'>+			size = &lt;0 0x400000&gt;;</div><div class='add'>+			alignment = &lt;0 0x400000&gt;;</div><div class='add'>+		};</div><div class='add'>+		qman_pfdr: qman-pfdr {</div><div class='add'>+			size = &lt;0 0x2000000&gt;;</div><div class='add'>+			alignment = &lt;0 0x2000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ifc: localbus@ffe124000 {</div><div class='add'>+		reg = &lt;0xf 0xfe124000 0 0x2000&gt;;</div><div class='add'>+		ranges = &lt;0 0 0xf 0xe8000000 0x04000000</div><div class='add'>+			  1 0 0xf 0xfa000000 0x00010000</div><div class='add'>+			  2 0 0xf 0xfb000000 0x00010000</div><div class='add'>+			  4 0 0xf 0xc0000000 0x08000000</div><div class='add'>+			  6 0 0xf 0xd0000000 0x08000000</div><div class='add'>+			  7 0 0xf 0xd8000000 0x08000000&gt;;</div><div class='add'>+</div><div class='add'>+		nor@0,0 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "cfi-flash";</div><div class='add'>+			reg = &lt;0x0 0x0 0x04000000&gt;;</div><div class='add'>+			bank-width = &lt;2&gt;;</div><div class='add'>+			device-width = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		nand@1,0 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "fsl,ifc-nand";</div><div class='add'>+			reg = &lt;0x1 0x0 0x10000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		board-control@2,0 {</div><div class='add'>+			compatible = "keymile,qriox";</div><div class='add'>+			reg = &lt;0x2 0x0 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		chassis-mgmt@6,0 {</div><div class='add'>+			compatible = "keymile,bfticu";</div><div class='add'>+			reg = &lt;6 0 0x100&gt;;</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			interrupts = &lt;11 1 0 0&gt;;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dcsr: dcsr@f00000000 {</div><div class='add'>+		ranges = &lt;0x00000000 0xf 0x00000000 0x01072000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bportals: bman-portals@ff4000000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xf4000000 0x2000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qportals: qman-portals@ff6000000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xf6000000 0x2000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc: soc@ffe000000 {</div><div class='add'>+		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='add'>+		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='add'>+</div><div class='add'>+		spi@110000 {</div><div class='add'>+			network-clock@1 {</div><div class='add'>+				compatible = "zarlink,zl30364";</div><div class='add'>+				reg = &lt;1&gt;;</div><div class='add'>+				spi-max-frequency = &lt;1000000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sdhc@114000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@118000 {</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+</div><div class='add'>+			mux@70 {</div><div class='add'>+				compatible = "nxp,pca9547";</div><div class='add'>+				reg = &lt;0x70&gt;;</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				i2c-mux-idle-disconnect;</div><div class='add'>+</div><div class='add'>+				i2c@0 {</div><div class='add'>+					reg = &lt;0&gt;;</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+					eeprom@54 {</div><div class='add'>+						compatible = "24c02";</div><div class='add'>+						reg = &lt;0x54&gt;;</div><div class='add'>+						pagesize = &lt;2&gt;;</div><div class='add'>+						read-only;</div><div class='add'>+						label = "ddr3-spd";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				i2c@7 {</div><div class='add'>+					reg = &lt;7&gt;;</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+					temp-sensor@48 {</div><div class='add'>+						compatible = "national,lm75";</div><div class='add'>+						reg = &lt;0x48&gt;;</div><div class='add'>+						label = "SENSOR_0";</div><div class='add'>+					};</div><div class='add'>+					temp-sensor@4a {</div><div class='add'>+						compatible = "national,lm75";</div><div class='add'>+						reg = &lt;0x4a&gt;;</div><div class='add'>+						label = "SENSOR_2";</div><div class='add'>+					};</div><div class='add'>+					temp-sensor@4b {</div><div class='add'>+						compatible = "national,lm75";</div><div class='add'>+						reg = &lt;0x4b&gt;;</div><div class='add'>+						label = "SENSOR_3";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@118100 {</div><div class='add'>+			clock-frequency = &lt;100000&gt;;</div><div class='add'>+</div><div class='add'>+			eeprom@50 {</div><div class='add'>+				compatible = "atmel,24c08";</div><div class='add'>+				reg = &lt;0x50&gt;;</div><div class='add'>+				pagesize = &lt;16&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			eeprom@54 {</div><div class='add'>+				compatible = "atmel,24c08";</div><div class='add'>+				reg = &lt;0x54&gt;;</div><div class='add'>+				pagesize = &lt;16&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@119000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		i2c@119100 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		serial2: serial@11d500 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		serial3: serial@11d600 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		usb0: usb@210000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		usb1: usb@211000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		display@180000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sata@220000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		sata@221000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		fman@400000 {</div><div class='add'>+			ethernet@e0000 {</div><div class='add'>+				fixed-link = &lt;0 1 1000 0 0&gt;;</div><div class='add'>+				phy-connection-type = "sgmii";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ethernet@e2000 {</div><div class='add'>+				fixed-link = &lt;1 1 1000 0 0&gt;;</div><div class='add'>+				phy-connection-type = "sgmii";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ethernet@e4000 {</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ethernet@e6000 {</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ethernet@e8000 {</div><div class='add'>+				phy-handle = &lt;&amp;front_phy&gt;;</div><div class='add'>+				phy-connection-type = "rgmii";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mdio0: mdio@fc000 {</div><div class='add'>+				front_phy: ethernet-phy@11 {</div><div class='add'>+					reg = &lt;0x11&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	pci0: pcie@ffe240000 {</div><div class='add'>+		reg = &lt;0xf 0xfe240000 0 0x10000&gt;;</div><div class='add'>+		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000</div><div class='add'>+			  0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000&gt;;</div><div class='add'>+		pcie@0 {</div><div class='add'>+			ranges = &lt;0x02000000 0 0xe0000000</div><div class='add'>+				  0x02000000 0 0xe0000000</div><div class='add'>+				  0 0x20000000</div><div class='add'>+</div><div class='add'>+				  0x01000000 0 0x00000000</div><div class='add'>+				  0x01000000 0 0x00000000</div><div class='add'>+				  0 0x00010000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pci1: pcie@ffe250000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pci2: pcie@ffe260000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pci3: pcie@ffe270000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qe: qe@ffe140000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xfe140000 0x40000&gt;;</div><div class='add'>+		reg = &lt;0xf 0xfe140000 0 0x480&gt;;</div><div class='add'>+		brg-frequency = &lt;0&gt;;</div><div class='add'>+		bus-frequency = &lt;0&gt;;</div><div class='add'>+</div><div class='add'>+		si1: si@700 {</div><div class='add'>+			compatible = "fsl,t1040-qe-si";</div><div class='add'>+			reg = &lt;0x700 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		siram1: siram@1000 {</div><div class='add'>+			compatible = "fsl,t1040-qe-siram";</div><div class='add'>+			reg = &lt;0x1000 0x800&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ucc_hdlc: ucc@2000 {</div><div class='add'>+			device_type = "hdlc";</div><div class='add'>+			compatible = "fsl,ucc-hdlc";</div><div class='add'>+			rx-clock-name = "clk9";</div><div class='add'>+			tx-clock-name = "clk9";</div><div class='add'>+			fsl,tx-timeslot-mask = &lt;0xfffffffe&gt;;</div><div class='add'>+			fsl,rx-timeslot-mask = &lt;0xfffffffe&gt;;</div><div class='add'>+			fsl,siram-entry-id = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#include "t1040si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/kmcoge4.dts b/arch/powerpc/boot/dts/fsl/kmcoge4.dts<br/>index ae70a24094b0..e103c0f3f650 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/kmcoge4.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/dts/fsl/kmcoge4.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/kmcoge4.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/kmcoge4.dts</a></div><div class='hunk'>@@ -83,6 +83,10 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		sdhc@114000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		i2c@119000 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8569mds.dts b/arch/powerpc/boot/dts/fsl/mpc8569mds.dts<br/>index 8e94448f296c..76b2bd6f7742 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/mpc8569mds.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/dts/fsl/mpc8569mds.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/mpc8569mds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/mpc8569mds.dts</a></div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> 				label = "kernel";</div><div class='ctx'> 				reg = &lt;0x01c00000 0x002e0000&gt;;</div><div class='ctx'> 			};</div><div class='del'>-			partiton@1ee0000 {</div><div class='add'>+			partition@1ee0000 {</div><div class='ctx'> 				label = "dtb";</div><div class='ctx'> 				reg = &lt;0x01ee0000 0x00020000&gt;;</div><div class='ctx'> 			};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/t1023rdb.dts b/arch/powerpc/boot/dts/fsl/t1023rdb.dts<br/>index 29757623e5ba..5ba6fbfca274 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1023rdb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/dts/fsl/t1023rdb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1023rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1023rdb.dts</a></div><div class='hunk'>@@ -41,6 +41,27 @@</div><div class='ctx'> 	#size-cells = &lt;2&gt;;</div><div class='ctx'> 	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> </div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		bman_fbpr: bman-fbpr {</div><div class='add'>+			size = &lt;0 0x1000000&gt;;</div><div class='add'>+			alignment = &lt;0 0x1000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qman_fqd: qman-fqd {</div><div class='add'>+			size = &lt;0 0x400000&gt;;</div><div class='add'>+			alignment = &lt;0 0x400000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qman_pfdr: qman-pfdr {</div><div class='add'>+			size = &lt;0 0x2000000&gt;;</div><div class='add'>+			alignment = &lt;0 0x2000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	ifc: localbus@ffe124000 {</div><div class='ctx'> 		reg = &lt;0xf 0xfe124000 0 0x2000&gt;;</div><div class='ctx'> 		ranges = &lt;0 0 0xf 0xe8000000 0x08000000</div><div class='hunk'>@@ -72,6 +93,14 @@</div><div class='ctx'> 		ranges = &lt;0x00000000 0xf 0x00000000 0x01072000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	bportals: bman-portals@ff4000000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xf4000000 0x2000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qportals: qman-portals@ff6000000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xf6000000 0x2000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	soc: soc@ffe000000 {</div><div class='ctx'> 		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='ctx'> 		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi<br/>index 6e0b4892a740..4908af501098 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/dts/fsl/t1023si-post.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1023si-post.dtsi</a></div><div class='hunk'>@@ -34,6 +34,21 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/thermal/thermal.h&gt;</div><div class='ctx'> </div><div class='add'>+&amp;bman_fbpr {</div><div class='add'>+	compatible = "fsl,bman-fbpr";</div><div class='add'>+	alloc-ranges = &lt;0 0 0x10000 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qman_fqd {</div><div class='add'>+	compatible = "fsl,qman-fqd";</div><div class='add'>+	alloc-ranges = &lt;0 0 0x10000 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qman_pfdr {</div><div class='add'>+	compatible = "fsl,qman-pfdr";</div><div class='add'>+	alloc-ranges = &lt;0 0 0x10000 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;ifc {</div><div class='ctx'> 	#address-cells = &lt;2&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='hunk'>@@ -180,6 +195,92 @@</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+&amp;bportals {</div><div class='add'>+	#address-cells = &lt;0x1&gt;;</div><div class='add'>+	#size-cells = &lt;0x1&gt;;</div><div class='add'>+	compatible = "simple-bus";</div><div class='add'>+</div><div class='add'>+	bman-portal@0 {</div><div class='add'>+		cell-index = &lt;0x0&gt;;</div><div class='add'>+		compatible = "fsl,bman-portal";</div><div class='add'>+		reg = &lt;0x0 0x4000&gt;, &lt;0x1000000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;105 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	bman-portal@4000 {</div><div class='add'>+		cell-index = &lt;0x1&gt;;</div><div class='add'>+		compatible = "fsl,bman-portal";</div><div class='add'>+		reg = &lt;0x4000 0x4000&gt;, &lt;0x1001000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;107 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	bman-portal@8000 {</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+		compatible = "fsl,bman-portal";</div><div class='add'>+		reg = &lt;0x8000 0x4000&gt;, &lt;0x1002000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;109 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	bman-portal@c000 {</div><div class='add'>+		cell-index = &lt;0x3&gt;;</div><div class='add'>+		compatible = "fsl,bman-portal";</div><div class='add'>+		reg = &lt;0xc000 0x4000&gt;, &lt;0x1003000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;111 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	bman-portal@10000 {</div><div class='add'>+		cell-index = &lt;0x4&gt;;</div><div class='add'>+		compatible = "fsl,bman-portal";</div><div class='add'>+		reg = &lt;0x10000 0x4000&gt;, &lt;0x1004000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;113 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	bman-portal@14000 {</div><div class='add'>+		cell-index = &lt;0x5&gt;;</div><div class='add'>+		compatible = "fsl,bman-portal";</div><div class='add'>+		reg = &lt;0x14000 0x4000&gt;, &lt;0x1005000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;115 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qportals {</div><div class='add'>+	#address-cells = &lt;0x1&gt;;</div><div class='add'>+	#size-cells = &lt;0x1&gt;;</div><div class='add'>+	compatible = "simple-bus";</div><div class='add'>+</div><div class='add'>+	qportal0: qman-portal@0 {</div><div class='add'>+		compatible = "fsl,qman-portal";</div><div class='add'>+		reg = &lt;0x0 0x4000&gt;, &lt;0x1000000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;104 0x2 0 0&gt;;</div><div class='add'>+		cell-index = &lt;0x0&gt;;</div><div class='add'>+	};</div><div class='add'>+	qportal1: qman-portal@4000 {</div><div class='add'>+		compatible = "fsl,qman-portal";</div><div class='add'>+		reg = &lt;0x4000 0x4000&gt;, &lt;0x1001000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;106 0x2 0 0&gt;;</div><div class='add'>+		cell-index = &lt;0x1&gt;;</div><div class='add'>+	};</div><div class='add'>+	qportal2: qman-portal@8000 {</div><div class='add'>+		compatible = "fsl,qman-portal";</div><div class='add'>+		reg = &lt;0x8000 0x4000&gt;, &lt;0x1002000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;108 0x2 0 0&gt;;</div><div class='add'>+		cell-index = &lt;0x2&gt;;</div><div class='add'>+	};</div><div class='add'>+	qportal3: qman-portal@c000 {</div><div class='add'>+		compatible = "fsl,qman-portal";</div><div class='add'>+		reg = &lt;0xc000 0x4000&gt;, &lt;0x1003000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;110 0x2 0 0&gt;;</div><div class='add'>+		cell-index = &lt;0x3&gt;;</div><div class='add'>+	};</div><div class='add'>+	qportal4: qman-portal@10000 {</div><div class='add'>+		compatible = "fsl,qman-portal";</div><div class='add'>+		reg = &lt;0x10000 0x4000&gt;, &lt;0x1004000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;112 0x2 0 0&gt;;</div><div class='add'>+		cell-index = &lt;0x4&gt;;</div><div class='add'>+	};</div><div class='add'>+	qportal5: qman-portal@14000 {</div><div class='add'>+		compatible = "fsl,qman-portal";</div><div class='add'>+		reg = &lt;0x14000 0x4000&gt;, &lt;0x1005000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;114 0x2 0 0&gt;;</div><div class='add'>+		cell-index = &lt;0x5&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> &amp;soc {</div><div class='ctx'> 	#address-cells = &lt;1&gt;;</div><div class='ctx'> 	#size-cells = &lt;1&gt;;</div><div class='hunk'>@@ -321,7 +422,7 @@</div><div class='ctx'> 				       0x00030001 0x0000000d</div><div class='ctx'> 				       0x00030002 0x00000019</div><div class='ctx'> 				       0x00030003 0x00000024&gt;;</div><div class='del'>-		#thermal-sensor-cells = &lt;0&gt;;</div><div class='add'>+		#thermal-sensor-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	thermal-zones {</div><div class='hunk'>@@ -329,7 +430,7 @@</div><div class='ctx'> 			polling-delay-passive = &lt;1000&gt;;</div><div class='ctx'> 			polling-delay = &lt;5000&gt;;</div><div class='ctx'> </div><div class='del'>-			thermal-sensors = &lt;&amp;tmu&gt;;</div><div class='add'>+			thermal-sensors = &lt;&amp;tmu 0&gt;;</div><div class='ctx'> </div><div class='ctx'> 			trips {</div><div class='ctx'> 				cpu_alert: cpu-alert {</div><div class='hunk'>@@ -413,6 +514,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> /include/ "qoriq-sec5.0-0.dtsi"</div><div class='add'>+/include/ "qoriq-qman3.dtsi"</div><div class='add'>+/include/ "qoriq-bman1.dtsi"</div><div class='ctx'> </div><div class='ctx'> /include/ "qoriq-fman3l-0.dtsi"</div><div class='ctx'> /include/ "qoriq-fman3-0-10g-0-best-effort.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/t1024qds.dts b/arch/powerpc/boot/dts/fsl/t1024qds.dts<br/>index 772143da367f..d6858b7cd93f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1024qds.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/dts/fsl/t1024qds.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1024qds.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1024qds.dts</a></div><div class='hunk'>@@ -41,6 +41,27 @@</div><div class='ctx'> 	#size-cells = &lt;2&gt;;</div><div class='ctx'> 	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> </div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		bman_fbpr: bman-fbpr {</div><div class='add'>+			size = &lt;0 0x1000000&gt;;</div><div class='add'>+			alignment = &lt;0 0x1000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qman_fqd: qman-fqd {</div><div class='add'>+			size = &lt;0 0x400000&gt;;</div><div class='add'>+			alignment = &lt;0 0x400000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qman_pfdr: qman-pfdr {</div><div class='add'>+			size = &lt;0 0x2000000&gt;;</div><div class='add'>+			alignment = &lt;0 0x2000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	ifc: localbus@ffe124000 {</div><div class='ctx'> 		reg = &lt;0xf 0xfe124000 0 0x2000&gt;;</div><div class='ctx'> 		ranges = &lt;0 0 0xf 0xe8000000 0x08000000</div><div class='hunk'>@@ -80,6 +101,14 @@</div><div class='ctx'> 		ranges = &lt;0x00000000 0xf 0x00000000 0x01072000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	bportals: bman-portals@ff4000000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xf4000000 0x2000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qportals: qman-portals@ff6000000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xf6000000 0x2000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	soc: soc@ffe000000 {</div><div class='ctx'> 		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='ctx'> 		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/t1024rdb.dts b/arch/powerpc/boot/dts/fsl/t1024rdb.dts<br/>index 302cdd22b4bb..73a645324bc1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1024rdb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/dts/fsl/t1024rdb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1024rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1024rdb.dts</a></div><div class='hunk'>@@ -41,6 +41,31 @@</div><div class='ctx'> 	#size-cells = &lt;2&gt;;</div><div class='ctx'> 	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> </div><div class='add'>+	aliases {</div><div class='add'>+		sg_2500_aqr105_phy4 = &amp;sg_2500_aqr105_phy4;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		bman_fbpr: bman-fbpr {</div><div class='add'>+			size = &lt;0 0x1000000&gt;;</div><div class='add'>+			alignment = &lt;0 0x1000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qman_fqd: qman-fqd {</div><div class='add'>+			size = &lt;0 0x400000&gt;;</div><div class='add'>+			alignment = &lt;0 0x400000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		qman_pfdr: qman-pfdr {</div><div class='add'>+			size = &lt;0 0x2000000&gt;;</div><div class='add'>+			alignment = &lt;0 0x2000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	ifc: localbus@ffe124000 {</div><div class='ctx'> 		reg = &lt;0xf 0xfe124000 0 0x2000&gt;;</div><div class='ctx'> 		ranges = &lt;0 0 0xf 0xe8000000 0x08000000</div><div class='hunk'>@@ -82,6 +107,14 @@</div><div class='ctx'> 		ranges = &lt;0x00000000 0xf 0x00000000 0x01072000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	bportals: bman-portals@ff4000000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xf4000000 0x2000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	qportals: qman-portals@ff6000000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xf6000000 0x2000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	soc: soc@ffe000000 {</div><div class='ctx'> 		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='ctx'> 		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi<br/>index 44e399b17f6f..145c7f43b5b6 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/dts/fsl/t1040si-post.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1040si-post.dtsi</a></div><div class='hunk'>@@ -526,7 +526,7 @@</div><div class='ctx'> </div><div class='ctx'> 				       0x00030000 0x00000012</div><div class='ctx'> 				       0x00030001 0x0000001d&gt;;</div><div class='del'>-		#thermal-sensor-cells = &lt;0&gt;;</div><div class='add'>+		#thermal-sensor-cells = &lt;1&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	thermal-zones {</div><div class='hunk'>@@ -534,7 +534,7 @@</div><div class='ctx'> 			polling-delay-passive = &lt;1000&gt;;</div><div class='ctx'> 			polling-delay = &lt;5000&gt;;</div><div class='ctx'> </div><div class='del'>-			thermal-sensors = &lt;&amp;tmu&gt;;</div><div class='add'>+			thermal-sensors = &lt;&amp;tmu 2&gt;;</div><div class='ctx'> </div><div class='ctx'> 			trips {</div><div class='ctx'> 				cpu_alert: cpu-alert {</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts b/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts<br/>index 2a5a90dd272e..fcd2aeb5b8ac 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/dts/fsl/t1042d4rdb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t1042d4rdb.dts</a></div><div class='hunk'>@@ -48,6 +48,58 @@</div><div class='ctx'> 					"fsl,deepsleep-cpld";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	soc: soc@ffe000000 {</div><div class='add'>+		fman0: fman@400000 {</div><div class='add'>+			ethernet@e0000 {</div><div class='add'>+				phy-handle = &lt;&amp;phy_sgmii_0&gt;;</div><div class='add'>+				phy-connection-type = "sgmii";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ethernet@e2000 {</div><div class='add'>+				phy-handle = &lt;&amp;phy_sgmii_1&gt;;</div><div class='add'>+				phy-connection-type = "sgmii";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ethernet@e4000 {</div><div class='add'>+				phy-handle = &lt;&amp;phy_sgmii_2&gt;;</div><div class='add'>+				phy-connection-type = "sgmii";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ethernet@e6000 {</div><div class='add'>+				phy-handle = &lt;&amp;phy_rgmii_0&gt;;</div><div class='add'>+				phy-connection-type = "rgmii";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ethernet@e8000 {</div><div class='add'>+				phy-handle = &lt;&amp;phy_rgmii_1&gt;;</div><div class='add'>+				phy-connection-type = "rgmii";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			mdio0: mdio@fc000 {</div><div class='add'>+				phy_sgmii_0: ethernet-phy@02 {</div><div class='add'>+					reg = &lt;0x02&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				phy_sgmii_1: ethernet-phy@03 {</div><div class='add'>+					reg = &lt;0x03&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				phy_sgmii_2: ethernet-phy@01 {</div><div class='add'>+					reg = &lt;0x01&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				phy_rgmii_0: ethernet-phy@04 {</div><div class='add'>+					reg = &lt;0x04&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				phy_rgmii_1: ethernet-phy@05 {</div><div class='add'>+					reg = &lt;0x05&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #include "t1042si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi<br/>index c744569a20e1..a97296c64eb2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/dts/fsl/t2081si-post.dtsi</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t2081si-post.dtsi</a></div><div class='hunk'>@@ -678,5 +678,6 @@</div><div class='ctx'> 		compatible = "fsl,t2080-l2-cache-controller";</div><div class='ctx'> 		reg = &lt;0xc20000 0x40000&gt;;</div><div class='ctx'> 		next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 9&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/t4240rdb.dts b/arch/powerpc/boot/dts/fsl/t4240rdb.dts<br/>index cc0a264b8acb..8166c660712a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t4240rdb.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/dts/fsl/t4240rdb.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/dts/fsl/t4240rdb.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/dts/fsl/t4240rdb.dts</a></div><div class='hunk'>@@ -125,6 +125,10 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c@118000 {</div><div class='add'>+			hwmon@2f {</div><div class='add'>+				compatible = "winbond,w83793";</div><div class='add'>+				reg = &lt;0x2f&gt;;</div><div class='add'>+			};</div><div class='ctx'> 			eeprom@52 {</div><div class='ctx'> 				compatible = "at24,24c256";</div><div class='ctx'> 				reg = &lt;0x52&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/ps3-head.S b/arch/powerpc/boot/ps3-head.S<br/>index b6fcbaf5027b..3dc44b05fb97 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/ps3-head.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/ps3-head.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/ps3-head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/ps3-head.S</a></div><div class='hunk'>@@ -57,11 +57,6 @@ __system_reset_overlay:</div><div class='ctx'> 	bctr</div><div class='ctx'> </div><div class='ctx'> 1:</div><div class='del'>-	/* Save the value at addr zero for a null pointer write check later. */</div><div class='del'>-</div><div class='del'>-	li	r4, 0</div><div class='del'>-	lwz	r3, 0(r4)</div><div class='del'>-</div><div class='ctx'> 	/* Primary delays then goes to _zimage_start in wrapper. */</div><div class='ctx'> </div><div class='ctx'> 	or	31, 31, 31 /* db16cyc */</div><div class='head'>diff --git a/arch/powerpc/boot/ps3.c b/arch/powerpc/boot/ps3.c<br/>index 4ec2d86d3c50..a05558a7e51a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/ps3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/ps3.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/ps3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/ps3.c</a></div><div class='hunk'>@@ -119,13 +119,12 @@ void ps3_copy_vectors(void)</div><div class='ctx'> 	flush_cache((void *)0x100, 512);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void platform_init(unsigned long null_check)</div><div class='add'>+void platform_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 heapsize = 0x1000000 - (u32)_end; /* 16MiB */</div><div class='ctx'> 	void *chosen;</div><div class='ctx'> 	unsigned long ft_addr;</div><div class='ctx'> 	u64 rm_size;</div><div class='del'>-	unsigned long val;</div><div class='ctx'> </div><div class='ctx'> 	console_ops.write = ps3_console_write;</div><div class='ctx'> 	platform_ops.exit = ps3_exit;</div><div class='hunk'>@@ -153,11 +152,6 @@ void platform_init(unsigned long null_check)</div><div class='ctx'> </div><div class='ctx'> 	printf(" flat tree at 0x%lx\n\r", ft_addr);</div><div class='ctx'> </div><div class='del'>-	val = *(unsigned long *)0;</div><div class='del'>-</div><div class='del'>-	if (val != null_check)</div><div class='del'>-		printf("null check failed: %lx != %lx\n\r", val, null_check);</div><div class='del'>-</div><div class='ctx'> 	((kernel_entry_t)0)(ft_addr, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	ps3_exit();</div><div class='head'>diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper<br/>index 404b3aabdb4d..76fe3ccfd381 100755<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/boot/wrapper?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/boot/wrapper</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/boot/wrapper?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/boot/wrapper</a></div><div class='hunk'>@@ -181,6 +181,28 @@ case "$elfformat" in</div><div class='ctx'>     elf32-powerpc)	format=elf32ppc	;;</div><div class='ctx'> esac</div><div class='ctx'> </div><div class='add'>+ld_version()</div><div class='add'>+{</div><div class='add'>+    # Poached from scripts/ld-version.sh, but we don't want to call that because</div><div class='add'>+    # this script (wrapper) is distributed separately from the kernel source.</div><div class='add'>+    # Extract linker version number from stdin and turn into single number.</div><div class='add'>+    awk '{</div><div class='add'>+	gsub(".*\\)", "");</div><div class='add'>+	gsub(".*version ", "");</div><div class='add'>+	gsub("-.*", "");</div><div class='add'>+	split($1,a, ".");</div><div class='add'>+	print a[1]*100000000 + a[2]*1000000 + a[3]*10000;</div><div class='add'>+	exit</div><div class='add'>+    }'</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Do not include PT_INTERP segment when linking pie. Non-pie linking</div><div class='add'>+# just ignores this option.</div><div class='add'>+LD_VERSION=$(${CROSS}ld --version | ld_version)</div><div class='add'>+LD_NO_DL_MIN_VERSION=$(echo 2.26 | ld_version)</div><div class='add'>+if [ "$LD_VERSION" -ge "$LD_NO_DL_MIN_VERSION" ] ; then</div><div class='add'>+	nodl="--no-dynamic-linker"</div><div class='add'>+fi</div><div class='ctx'> </div><div class='ctx'> platformo=$object/"$platform".o</div><div class='ctx'> lds=$object/zImage.lds</div><div class='hunk'>@@ -446,7 +468,7 @@ if [ "$platform" != "miboot" ]; then</div><div class='ctx'>         text_start="-Ttext $link_address"</div><div class='ctx'>     fi</div><div class='ctx'> #link everything</div><div class='del'>-    ${CROSS}ld -m $format -T $lds $text_start $pie -o "$ofile" \</div><div class='add'>+    ${CROSS}ld -m $format -T $lds $text_start $pie $nodl -o "$ofile" \</div><div class='ctx'> 	$platformo $tmp $object/wrapper.a</div><div class='ctx'>     rm $tmp</div><div class='ctx'> fi</div><div class='head'>diff --git a/arch/powerpc/configs/85xx/kmp204x_defconfig b/arch/powerpc/configs/85xx/kmp204x_defconfig<br/>deleted file mode 100644<br/>index aaaaa609cd24..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/85xx/kmp204x_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/85xx/kmp204x_defconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,220 +0,0 @@</div><div class='del'>-CONFIG_PPC_85xx=y</div><div class='del'>-CONFIG_SMP=y</div><div class='del'>-CONFIG_NR_CPUS=8</div><div class='del'>-CONFIG_SYSVIPC=y</div><div class='del'>-CONFIG_POSIX_MQUEUE=y</div><div class='del'>-CONFIG_AUDIT=y</div><div class='del'>-CONFIG_NO_HZ=y</div><div class='del'>-CONFIG_HIGH_RES_TIMERS=y</div><div class='del'>-CONFIG_BSD_PROCESS_ACCT=y</div><div class='del'>-CONFIG_IKCONFIG=y</div><div class='del'>-CONFIG_IKCONFIG_PROC=y</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='del'>-CONFIG_CGROUPS=y</div><div class='del'>-CONFIG_CGROUP_SCHED=y</div><div class='del'>-CONFIG_RELAY=y</div><div class='del'>-CONFIG_BLK_DEV_INITRD=y</div><div class='del'>-CONFIG_KALLSYMS_ALL=y</div><div class='del'>-CONFIG_EMBEDDED=y</div><div class='del'>-CONFIG_PERF_EVENTS=y</div><div class='del'>-CONFIG_SLAB=y</div><div class='del'>-CONFIG_MODULES=y</div><div class='del'>-CONFIG_MODULE_UNLOAD=y</div><div class='del'>-CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='del'>-CONFIG_MODVERSIONS=y</div><div class='del'>-# CONFIG_BLK_DEV_BSG is not set</div><div class='del'>-CONFIG_PARTITION_ADVANCED=y</div><div class='del'>-CONFIG_MAC_PARTITION=y</div><div class='del'>-CONFIG_CORENET_GENERIC=y</div><div class='del'>-CONFIG_MPIC_MSGR=y</div><div class='del'>-CONFIG_HIGHMEM=y</div><div class='del'>-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='del'>-CONFIG_BINFMT_MISC=m</div><div class='del'>-CONFIG_KEXEC=y</div><div class='del'>-CONFIG_FORCE_MAX_ZONEORDER=13</div><div class='del'>-CONFIG_PCI=y</div><div class='del'>-CONFIG_PCIEPORTBUS=y</div><div class='del'>-# CONFIG_PCIEASPM is not set</div><div class='del'>-CONFIG_PCI_MSI=y</div><div class='del'>-CONFIG_ADVANCED_OPTIONS=y</div><div class='del'>-CONFIG_LOWMEM_SIZE_BOOL=y</div><div class='del'>-CONFIG_LOWMEM_SIZE=0x20000000</div><div class='del'>-CONFIG_NET=y</div><div class='del'>-CONFIG_PACKET=y</div><div class='del'>-CONFIG_UNIX=y</div><div class='del'>-CONFIG_XFRM_USER=y</div><div class='del'>-CONFIG_XFRM_SUB_POLICY=y</div><div class='del'>-CONFIG_XFRM_STATISTICS=y</div><div class='del'>-CONFIG_NET_KEY=y</div><div class='del'>-CONFIG_NET_KEY_MIGRATE=y</div><div class='del'>-CONFIG_INET=y</div><div class='del'>-CONFIG_IP_MULTICAST=y</div><div class='del'>-CONFIG_IP_ADVANCED_ROUTER=y</div><div class='del'>-CONFIG_IP_MULTIPLE_TABLES=y</div><div class='del'>-CONFIG_IP_ROUTE_MULTIPATH=y</div><div class='del'>-CONFIG_IP_ROUTE_VERBOSE=y</div><div class='del'>-CONFIG_IP_PNP=y</div><div class='del'>-CONFIG_IP_PNP_DHCP=y</div><div class='del'>-CONFIG_IP_PNP_BOOTP=y</div><div class='del'>-CONFIG_IP_PNP_RARP=y</div><div class='del'>-CONFIG_NET_IPIP=y</div><div class='del'>-CONFIG_IP_MROUTE=y</div><div class='del'>-CONFIG_IP_PIMSM_V1=y</div><div class='del'>-CONFIG_IP_PIMSM_V2=y</div><div class='del'>-CONFIG_INET_AH=y</div><div class='del'>-CONFIG_INET_ESP=y</div><div class='del'>-CONFIG_INET_IPCOMP=y</div><div class='del'>-CONFIG_IPV6=y</div><div class='del'>-CONFIG_IP_SCTP=m</div><div class='del'>-CONFIG_TIPC=y</div><div class='del'>-CONFIG_NET_SCHED=y</div><div class='del'>-CONFIG_NET_SCH_CBQ=y</div><div class='del'>-CONFIG_NET_SCH_HTB=y</div><div class='del'>-CONFIG_NET_SCH_HFSC=y</div><div class='del'>-CONFIG_NET_SCH_PRIO=y</div><div class='del'>-CONFIG_NET_SCH_MULTIQ=y</div><div class='del'>-CONFIG_NET_SCH_RED=y</div><div class='del'>-CONFIG_NET_SCH_SFQ=y</div><div class='del'>-CONFIG_NET_SCH_TEQL=y</div><div class='del'>-CONFIG_NET_SCH_TBF=y</div><div class='del'>-CONFIG_NET_SCH_GRED=y</div><div class='del'>-CONFIG_NET_CLS_BASIC=y</div><div class='del'>-CONFIG_NET_CLS_TCINDEX=y</div><div class='del'>-CONFIG_NET_CLS_U32=y</div><div class='del'>-CONFIG_CLS_U32_PERF=y</div><div class='del'>-CONFIG_CLS_U32_MARK=y</div><div class='del'>-CONFIG_NET_CLS_FLOW=y</div><div class='del'>-CONFIG_NET_CLS_CGROUP=y</div><div class='del'>-CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"</div><div class='del'>-CONFIG_DEVTMPFS=y</div><div class='del'>-CONFIG_MTD=y</div><div class='del'>-CONFIG_MTD_CMDLINE_PARTS=y</div><div class='del'>-CONFIG_MTD_BLOCK=y</div><div class='del'>-CONFIG_MTD_CFI=y</div><div class='del'>-CONFIG_MTD_CFI_AMDSTD=y</div><div class='del'>-CONFIG_MTD_PHYSMAP_OF=y</div><div class='del'>-CONFIG_MTD_PHRAM=y</div><div class='del'>-CONFIG_MTD_NAND=y</div><div class='del'>-CONFIG_MTD_NAND_ECC_BCH=y</div><div class='del'>-CONFIG_MTD_NAND_FSL_ELBC=y</div><div class='del'>-CONFIG_MTD_UBI=y</div><div class='del'>-CONFIG_MTD_UBI_GLUEBI=y</div><div class='del'>-CONFIG_BLK_DEV_LOOP=y</div><div class='del'>-CONFIG_BLK_DEV_RAM=y</div><div class='del'>-CONFIG_BLK_DEV_RAM_COUNT=2</div><div class='del'>-CONFIG_BLK_DEV_RAM_SIZE=2048</div><div class='del'>-CONFIG_EEPROM_AT24=y</div><div class='del'>-CONFIG_SCSI=y</div><div class='del'>-CONFIG_BLK_DEV_SD=y</div><div class='del'>-CONFIG_CHR_DEV_ST=y</div><div class='del'>-CONFIG_BLK_DEV_SR=y</div><div class='del'>-CONFIG_CHR_DEV_SG=y</div><div class='del'>-CONFIG_SCSI_LOGGING=y</div><div class='del'>-CONFIG_SCSI_SYM53C8XX_2=y</div><div class='del'>-CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_NET_VENDOR_3COM is not set</div><div class='del'>-# CONFIG_NET_VENDOR_ADAPTEC is not set</div><div class='del'>-# CONFIG_NET_VENDOR_ALTEON is not set</div><div class='del'>-# CONFIG_NET_VENDOR_AMD is not set</div><div class='del'>-# CONFIG_NET_VENDOR_ATHEROS is not set</div><div class='del'>-# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='del'>-# CONFIG_NET_VENDOR_BROCADE is not set</div><div class='del'>-# CONFIG_NET_VENDOR_CHELSIO is not set</div><div class='del'>-# CONFIG_NET_VENDOR_CISCO is not set</div><div class='del'>-# CONFIG_NET_VENDOR_DEC is not set</div><div class='del'>-# CONFIG_NET_VENDOR_DLINK is not set</div><div class='del'>-# CONFIG_NET_VENDOR_EMULEX is not set</div><div class='del'>-# CONFIG_NET_VENDOR_EXAR is not set</div><div class='del'>-CONFIG_FSL_PQ_MDIO=y</div><div class='del'>-CONFIG_FSL_XGMAC_MDIO=y</div><div class='del'>-# CONFIG_NET_VENDOR_HP is not set</div><div class='del'>-# CONFIG_NET_VENDOR_INTEL is not set</div><div class='del'>-# CONFIG_NET_VENDOR_MARVELL is not set</div><div class='del'>-# CONFIG_NET_VENDOR_MELLANOX is not set</div><div class='del'>-# CONFIG_NET_VENDOR_MICREL is not set</div><div class='del'>-# CONFIG_NET_VENDOR_MICROCHIP is not set</div><div class='del'>-# CONFIG_NET_VENDOR_MYRI is not set</div><div class='del'>-# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='del'>-# CONFIG_NET_VENDOR_NVIDIA is not set</div><div class='del'>-# CONFIG_NET_VENDOR_OKI is not set</div><div class='del'>-# CONFIG_NET_PACKET_ENGINE is not set</div><div class='del'>-# CONFIG_NET_VENDOR_QLOGIC is not set</div><div class='del'>-# CONFIG_NET_VENDOR_REALTEK is not set</div><div class='del'>-# CONFIG_NET_VENDOR_RDC is not set</div><div class='del'>-# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='del'>-# CONFIG_NET_VENDOR_SILAN is not set</div><div class='del'>-# CONFIG_NET_VENDOR_SIS is not set</div><div class='del'>-# CONFIG_NET_VENDOR_SMSC is not set</div><div class='del'>-# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='del'>-# CONFIG_NET_VENDOR_SUN is not set</div><div class='del'>-# CONFIG_NET_VENDOR_TEHUTI is not set</div><div class='del'>-# CONFIG_NET_VENDOR_TI is not set</div><div class='del'>-# CONFIG_NET_VENDOR_VIA is not set</div><div class='del'>-# CONFIG_NET_VENDOR_WIZNET is not set</div><div class='del'>-# CONFIG_NET_VENDOR_XILINX is not set</div><div class='del'>-CONFIG_MARVELL_PHY=y</div><div class='del'>-CONFIG_VITESSE_PHY=y</div><div class='del'>-CONFIG_FIXED_PHY=y</div><div class='del'>-# CONFIG_WLAN is not set</div><div class='del'>-# CONFIG_INPUT_MOUSEDEV is not set</div><div class='del'>-# CONFIG_INPUT_KEYBOARD is not set</div><div class='del'>-# CONFIG_INPUT_MOUSE is not set</div><div class='del'>-CONFIG_SERIO_LIBPS2=y</div><div class='del'>-# CONFIG_LEGACY_PTYS is not set</div><div class='del'>-CONFIG_PPC_EPAPR_HV_BYTECHAN=y</div><div class='del'>-CONFIG_SERIAL_8250=y</div><div class='del'>-CONFIG_SERIAL_8250_CONSOLE=y</div><div class='del'>-CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='del'>-CONFIG_SERIAL_8250_DETECT_IRQ=y</div><div class='del'>-CONFIG_SERIAL_8250_RSA=y</div><div class='del'>-CONFIG_NVRAM=y</div><div class='del'>-CONFIG_I2C=y</div><div class='del'>-CONFIG_I2C_CHARDEV=y</div><div class='del'>-CONFIG_I2C_MUX=y</div><div class='del'>-CONFIG_I2C_MUX_PCA954x=y</div><div class='del'>-CONFIG_I2C_MPC=y</div><div class='del'>-CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_FSL_SPI=y</div><div class='del'>-CONFIG_SPI_FSL_ESPI=y</div><div class='del'>-CONFIG_SPI_SPIDEV=m</div><div class='del'>-CONFIG_PTP_1588_CLOCK=y</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='del'>-# CONFIG_USB_SUPPORT is not set</div><div class='del'>-CONFIG_EDAC=y</div><div class='del'>-CONFIG_EDAC_MM_EDAC=y</div><div class='del'>-CONFIG_EDAC_MPC85XX=y</div><div class='del'>-CONFIG_RTC_CLASS=y</div><div class='del'>-CONFIG_RTC_DRV_DS3232=y</div><div class='del'>-CONFIG_RTC_DRV_CMOS=y</div><div class='del'>-CONFIG_UIO=y</div><div class='del'>-CONFIG_STAGING=y</div><div class='del'>-CONFIG_CLK_QORIQ=y</div><div class='del'>-CONFIG_EXT2_FS=y</div><div class='del'>-CONFIG_NTFS_FS=y</div><div class='del'>-CONFIG_PROC_KCORE=y</div><div class='del'>-CONFIG_TMPFS=y</div><div class='del'>-CONFIG_JFFS2_FS=y</div><div class='del'>-CONFIG_UBIFS_FS=y</div><div class='del'>-CONFIG_CRAMFS=y</div><div class='del'>-CONFIG_SQUASHFS=y</div><div class='del'>-CONFIG_SQUASHFS_XZ=y</div><div class='del'>-CONFIG_NFS_FS=y</div><div class='del'>-CONFIG_NFS_V4=y</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='del'>-CONFIG_NLS_ISO8859_1=y</div><div class='del'>-CONFIG_NLS_UTF8=m</div><div class='del'>-CONFIG_CRC_ITU_T=m</div><div class='del'>-CONFIG_DEBUG_INFO=y</div><div class='del'>-CONFIG_MAGIC_SYSRQ=y</div><div class='del'>-CONFIG_DEBUG_SHIRQ=y</div><div class='del'>-CONFIG_DETECT_HUNG_TASK=y</div><div class='del'>-CONFIG_SCHEDSTATS=y</div><div class='del'>-CONFIG_RCU_TRACE=y</div><div class='del'>-CONFIG_UPROBE_EVENT=y</div><div class='del'>-CONFIG_CRYPTO_NULL=y</div><div class='del'>-CONFIG_CRYPTO_PCBC=m</div><div class='del'>-CONFIG_CRYPTO_MD4=y</div><div class='del'>-CONFIG_CRYPTO_SHA256=y</div><div class='del'>-CONFIG_CRYPTO_SHA512=y</div><div class='del'>-# CONFIG_CRYPTO_ANSI_CPRNG is not set</div><div class='del'>-CONFIG_CRYPTO_DEV_FSL_CAAM=y</div><div class='head'>diff --git a/arch/powerpc/configs/amigaone_defconfig b/arch/powerpc/configs/amigaone_defconfig<br/>index 8b83ce8a01e7..8d3e3c41258d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/amigaone_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/amigaone_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/amigaone_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/amigaone_defconfig</a></div><div class='hunk'>@@ -45,12 +45,6 @@ CONFIG_PARPORT_PC_FIFO=y</div><div class='ctx'> CONFIG_BLK_DEV_FD=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-# CONFIG_IDEPCI_PCIBUS_ORDER is not set</div><div class='del'>-CONFIG_BLK_DEV_GENERIC=y</div><div class='del'>-CONFIG_BLK_DEV_SIIMAGE=y</div><div class='del'>-CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='ctx'> CONFIG_SCSI=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=y</div><div class='hunk'>@@ -61,6 +55,10 @@ CONFIG_SCSI_CONSTANTS=y</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_2=y</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0</div><div class='ctx'> # CONFIG_SCSI_SYM53C8XX_MMIO is not set</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_SIL680=y</div><div class='add'>+CONFIG_PATA_VIA=y</div><div class='add'>+CONFIG_ATA_GENERIC=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_VORTEX=y</div><div class='ctx'> CONFIG_8139CP=y</div><div class='head'>diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig<br/>index 7b6f30dece34..2d7fcbe047ac 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/cell_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/cell_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/cell_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/cell_defconfig</a></div><div class='hunk'>@@ -108,16 +108,15 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_GENERIC=y</div><div class='del'>-CONFIG_BLK_DEV_AEC62XX=y</div><div class='del'>-CONFIG_BLK_DEV_SIIMAGE=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_BLK_DEV_SR=m</div><div class='ctx'> CONFIG_CHR_DEV_SG=y</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> CONFIG_SATA_PROMISE=y</div><div class='add'>+CONFIG_PATA_ARTOP=y</div><div class='ctx'> CONFIG_PATA_PDC2027X=m</div><div class='add'>+CONFIG_PATA_SIL680=y</div><div class='add'>+CONFIG_ATA_GENERIC=y</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='head'>diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig<br/>index ac9a50da2dc6..1f6f90cd8aff 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/chrp32_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/chrp32_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/chrp32_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/chrp32_defconfig</a></div><div class='hunk'>@@ -42,12 +42,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_BLK_DEV_FD=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-CONFIG_BLK_DEV_GENERIC=y</div><div class='del'>-CONFIG_BLK_DEV_SL82C105=y</div><div class='del'>-CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='del'>-CONFIG_SCSI=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=y</div><div class='ctx'> CONFIG_BLK_DEV_SR=y</div><div class='hunk'>@@ -56,6 +50,10 @@ CONFIG_CHR_DEV_SG=y</div><div class='ctx'> CONFIG_SCSI_CONSTANTS=y</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_2=y</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_VIA=y</div><div class='add'>+CONFIG_PATA_WINBOND=y</div><div class='add'>+CONFIG_ATA_GENERIC=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_PCNET32=y</div><div class='ctx'> CONFIG_NET_TULIP=y</div><div class='head'>diff --git a/arch/powerpc/configs/dpaa.config b/arch/powerpc/configs/dpaa.config<br/>index efa99c048543..2fe76f5e938a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/dpaa.config?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/dpaa.config</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/dpaa.config?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/dpaa.config</a></div><div class='hunk'>@@ -1 +1,4 @@</div><div class='ctx'> CONFIG_FSL_DPAA=y</div><div class='add'>+CONFIG_FSL_PAMU=y</div><div class='add'>+CONFIG_FSL_FMAN=y</div><div class='add'>+CONFIG_FSL_DPAA_ETH=y</div><div class='head'>diff --git a/arch/powerpc/configs/fsl-emb-nonhw.config b/arch/powerpc/configs/fsl-emb-nonhw.config<br/>index 1a61e81ab0cd..cc49c95494da 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/fsl-emb-nonhw.config?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/fsl-emb-nonhw.config</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/fsl-emb-nonhw.config?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/fsl-emb-nonhw.config</a></div><div class='hunk'>@@ -44,6 +44,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13</div><div class='ctx'> CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='ctx'> CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_FTL=y</div><div class='add'>+CONFIG_GPIO_GENERIC_PLATFORM=y</div><div class='ctx'> CONFIG_HFS_FS=m</div><div class='ctx'> CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='hunk'>@@ -104,8 +105,13 @@ CONFIG_PACKET=y</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> CONFIG_PERF_EVENTS=y</div><div class='ctx'> CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_POWER_SUPPLY=y</div><div class='add'>+CONFIG_POWER_RESET=y</div><div class='add'>+CONFIG_POWER_RESET_GPIO=y</div><div class='add'>+CONFIG_POWER_RESET_GPIO_RESTART=y</div><div class='ctx'> CONFIG_QNX4FS_FS=m</div><div class='ctx'> CONFIG_RCU_TRACE=y</div><div class='add'>+CONFIG_RESET_CONTROLLER=y</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_SYSV_FS=m</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='head'>diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig<br/>index 3b2511c090d8..e18f2e06553f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/g5_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/g5_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/g5_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/g5_defconfig</a></div><div class='hunk'>@@ -60,10 +60,6 @@ CONFIG_BLK_DEV_NBD=m</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=65536</div><div class='ctx'> CONFIG_CDROM_PKTCDVD=m</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-CONFIG_BLK_DEV_IDE_PMAC=y</div><div class='del'>-CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=y</div><div class='ctx'> CONFIG_BLK_DEV_SR=y</div><div class='hunk'>@@ -73,6 +69,7 @@ CONFIG_SCSI_CONSTANTS=y</div><div class='ctx'> CONFIG_SCSI_SPI_ATTRS=y</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> CONFIG_SATA_SVW=y</div><div class='add'>+CONFIG_PATA_MACIO=y</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='ctx'> CONFIG_MD_LINEAR=y</div><div class='head'>diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig<br/>index 27abfab31219..c4018179e219 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/maple_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/maple_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/maple_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/maple_defconfig</a></div><div class='hunk'>@@ -39,16 +39,15 @@ CONFIG_IP_PNP_DHCP=y</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-CONFIG_IDE_TASK_IOCTL=y</div><div class='del'>-CONFIG_BLK_DEV_GENERIC=y</div><div class='del'>-CONFIG_BLK_DEV_AMD74XX=y</div><div class='ctx'> # CONFIG_SCSI_PROC_FS is not set</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_BLK_DEV_SR=y</div><div class='add'>+CONFIG_BLK_DEV_SR_VENDOR=y</div><div class='ctx'> CONFIG_CHR_DEV_SG=y</div><div class='ctx'> CONFIG_SCSI_IPR=y</div><div class='ctx'> CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_AMD=y</div><div class='add'>+CONFIG_ATA_GENERIC=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_AMD8111_ETH=y</div><div class='ctx'> CONFIG_TIGON3=y</div><div class='head'>diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig<br/>index 76f4edd441d3..5553c5ce4274 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/pasemi_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/pasemi_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/pasemi_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/pasemi_defconfig</a></div><div class='hunk'>@@ -58,9 +58,6 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=16384</div><div class='ctx'> CONFIG_EEPROM_LEGACY=y</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-CONFIG_IDE_TASK_IOCTL=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=y</div><div class='ctx'> CONFIG_CHR_DEV_OSST=y</div><div class='head'>diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig<br/>index e5a674d4a716..fc1e7a7388b8 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/pmac32_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/pmac32_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/pmac32_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/pmac32_defconfig</a></div><div class='hunk'>@@ -117,15 +117,6 @@ CONFIG_CONNECTOR=y</div><div class='ctx'> CONFIG_MAC_FLOPPY=m</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECS=m</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-CONFIG_BLK_DEV_GENERIC=y</div><div class='del'>-CONFIG_BLK_DEV_PDC202XX_NEW=y</div><div class='del'>-CONFIG_BLK_DEV_SL82C105=y</div><div class='del'>-CONFIG_BLK_DEV_IDE_PMAC=y</div><div class='del'>-CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y</div><div class='del'>-CONFIG_SCSI=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=y</div><div class='ctx'> CONFIG_BLK_DEV_SR=y</div><div class='hunk'>@@ -140,6 +131,12 @@ CONFIG_SCSI_SYM53C8XX_2=y</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0</div><div class='ctx'> CONFIG_SCSI_MESH=y</div><div class='ctx'> CONFIG_SCSI_MAC53C94=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_MACIO=y</div><div class='add'>+CONFIG_PATA_PDC2027X=y</div><div class='add'>+CONFIG_PATA_WINBOND=y</div><div class='add'>+CONFIG_PATA_PCMCIA=m</div><div class='add'>+CONFIG_ATA_GENERIC=y</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='head'>diff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/powernv_defconfig<br/>index d98b6eb3254f..ac8b8332ed82 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/powernv_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/powernv_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/powernv_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/powernv_defconfig</a></div><div class='hunk'>@@ -26,9 +26,11 @@ CONFIG_CGROUP_FREEZER=y</div><div class='ctx'> CONFIG_CPUSETS=y</div><div class='ctx'> CONFIG_CGROUP_DEVICE=y</div><div class='ctx'> CONFIG_CGROUP_CPUACCT=y</div><div class='add'>+CONFIG_CGROUP_BPF=y</div><div class='ctx'> CONFIG_CGROUP_PERF=y</div><div class='ctx'> CONFIG_USER_NS=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_BPF_SYSCALL=y</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='ctx'> CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='hunk'>@@ -49,6 +51,7 @@ CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_PPC_TRANSACTIONAL_MEM=y</div><div class='ctx'> CONFIG_HOTPLUG_CPU=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='add'>+CONFIG_KEXEC_FILE=y</div><div class='ctx'> CONFIG_IRQ_ALL_CPUS=y</div><div class='ctx'> CONFIG_NUMA=y</div><div class='ctx'> CONFIG_MEMORY_HOTPLUG=y</div><div class='hunk'>@@ -78,6 +81,11 @@ CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_ADVANCED is not set</div><div class='ctx'> CONFIG_BRIDGE=m</div><div class='ctx'> CONFIG_VLAN_8021Q=m</div><div class='add'>+CONFIG_NET_SCHED=y</div><div class='add'>+CONFIG_NET_CLS_BPF=m</div><div class='add'>+CONFIG_NET_CLS_ACT=y</div><div class='add'>+CONFIG_NET_ACT_BPF=m</div><div class='add'>+CONFIG_BPF_JIT=y</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -212,10 +220,11 @@ CONFIG_HID_SUNPLUS=y</div><div class='ctx'> CONFIG_USB_HIDDEV=y</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> CONFIG_USB_MON=m</div><div class='add'>+CONFIG_USB_XHCI_HCD=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_EHCI_HCD_PPC_OF is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='del'>-CONFIG_USB_STORAGE=m</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='ctx'> CONFIG_NEW_LEDS=y</div><div class='ctx'> CONFIG_LEDS_CLASS=m</div><div class='ctx'> CONFIG_LEDS_POWERNV=m</div><div class='hunk'>@@ -241,10 +250,6 @@ CONFIG_EXT2_FS_SECURITY=y</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_EXT4_FS_SECURITY=y</div><div class='del'>-CONFIG_REISERFS_FS=m</div><div class='del'>-CONFIG_REISERFS_FS_XATTR=y</div><div class='del'>-CONFIG_REISERFS_FS_POSIX_ACL=y</div><div class='del'>-CONFIG_REISERFS_FS_SECURITY=y</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_JFS_POSIX_ACL=y</div><div class='ctx'> CONFIG_JFS_SECURITY=y</div><div class='hunk'>@@ -292,6 +297,7 @@ CONFIG_LOCKUP_DETECTOR=y</div><div class='ctx'> CONFIG_LATENCYTOP=y</div><div class='ctx'> CONFIG_SCHED_TRACER=y</div><div class='ctx'> CONFIG_BLK_DEV_IO_TRACE=y</div><div class='add'>+CONFIG_UPROBE_EVENT=y</div><div class='ctx'> CONFIG_CODE_PATCHING_SELFTEST=y</div><div class='ctx'> CONFIG_FTR_FIXUP_SELFTEST=y</div><div class='ctx'> CONFIG_MSI_BITMAP_SELFTEST=y</div><div class='hunk'>@@ -300,7 +306,10 @@ CONFIG_CRYPTO_TEST=m</div><div class='ctx'> CONFIG_CRYPTO_CCM=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> CONFIG_CRYPTO_HMAC=y</div><div class='add'>+CONFIG_CRYPT_CRC32C_VPMSUM=m</div><div class='add'>+CONFIG_CRYPTO_MD5_PPC=m</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_SHA256=y</div><div class='ctx'> CONFIG_CRYPTO_TGR192=m</div><div class='ctx'> CONFIG_CRYPTO_WP512=m</div><div class='ctx'> CONFIG_CRYPTO_ANUBIS=m</div><div class='hunk'>@@ -308,6 +317,7 @@ CONFIG_CRYPTO_BLOWFISH=m</div><div class='ctx'> CONFIG_CRYPTO_CAST6=m</div><div class='ctx'> CONFIG_CRYPTO_KHAZAD=m</div><div class='ctx'> CONFIG_CRYPTO_SALSA20=m</div><div class='add'>+CONFIG_CRYPTO_SHA1_PPC=m</div><div class='ctx'> CONFIG_CRYPTO_SERPENT=m</div><div class='ctx'> CONFIG_CRYPTO_TEA=m</div><div class='ctx'> CONFIG_CRYPTO_TWOFISH=m</div><div class='head'>diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig<br/>index 58a98d40086f..4f1288b04303 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/ppc64_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/ppc64_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/ppc64_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/ppc64_defconfig</a></div><div class='hunk'>@@ -14,7 +14,9 @@ CONFIG_LOG_BUF_SHIFT=18</div><div class='ctx'> CONFIG_LOG_CPU_MAX_BUF_SHIFT=13</div><div class='ctx'> CONFIG_CGROUPS=y</div><div class='ctx'> CONFIG_CPUSETS=y</div><div class='add'>+CONFIG_CGROUP_BPF=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_BPF_SYSCALL=y</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='ctx'> CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='hunk'>@@ -46,6 +48,7 @@ CONFIG_HZ_100=y</div><div class='ctx'> CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_PPC_TRANSACTIONAL_MEM=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='add'>+CONFIG_KEXEC_FILE=y</div><div class='ctx'> CONFIG_CRASH_DUMP=y</div><div class='ctx'> CONFIG_IRQ_ALL_CPUS=y</div><div class='ctx'> CONFIG_MEMORY_HOTREMOVE=y</div><div class='hunk'>@@ -75,6 +78,10 @@ CONFIG_INET_IPCOMP=m</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_ADVANCED is not set</div><div class='ctx'> CONFIG_BRIDGE=m</div><div class='add'>+CONFIG_NET_SCHED=y</div><div class='add'>+CONFIG_NET_CLS_BPF=m</div><div class='add'>+CONFIG_NET_CLS_ACT=y</div><div class='add'>+CONFIG_NET_ACT_BPF=m</div><div class='ctx'> CONFIG_BPF_JIT=y</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='hunk'>@@ -85,12 +92,6 @@ CONFIG_BLK_DEV_NBD=m</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=65536</div><div class='ctx'> CONFIG_VIRTIO_BLK=m</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-CONFIG_BLK_DEV_GENERIC=y</div><div class='del'>-CONFIG_BLK_DEV_AMD74XX=y</div><div class='del'>-CONFIG_BLK_DEV_IDE_PMAC=y</div><div class='del'>-CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=m</div><div class='ctx'> CONFIG_BLK_DEV_SR=y</div><div class='hunk'>@@ -120,6 +121,9 @@ CONFIG_SATA_AHCI=y</div><div class='ctx'> CONFIG_SATA_SIL24=y</div><div class='ctx'> CONFIG_SATA_MV=y</div><div class='ctx'> CONFIG_SATA_SVW=y</div><div class='add'>+CONFIG_PATA_AMD=y</div><div class='add'>+CONFIG_PATA_MACIO=y</div><div class='add'>+CONFIG_ATA_GENERIC=y</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='ctx'> CONFIG_MD_LINEAR=y</div><div class='hunk'>@@ -326,6 +330,7 @@ CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> CONFIG_LATENCYTOP=y</div><div class='ctx'> CONFIG_SCHED_TRACER=y</div><div class='ctx'> CONFIG_BLK_DEV_IO_TRACE=y</div><div class='add'>+CONFIG_UPROBE_EVENT=y</div><div class='ctx'> CONFIG_CODE_PATCHING_SELFTEST=y</div><div class='ctx'> CONFIG_FTR_FIXUP_SELFTEST=y</div><div class='ctx'> CONFIG_MSI_BITMAP_SELFTEST=y</div><div class='hunk'>@@ -335,7 +340,10 @@ CONFIG_PPC_EARLY_DEBUG=y</div><div class='ctx'> CONFIG_CRYPTO_TEST=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> CONFIG_CRYPTO_HMAC=y</div><div class='add'>+CONFIG_CRYPT_CRC32C_VPMSUM=m</div><div class='add'>+CONFIG_CRYPTO_MD5_PPC=m</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_SHA256=y</div><div class='ctx'> CONFIG_CRYPTO_TGR192=m</div><div class='ctx'> CONFIG_CRYPTO_WP512=m</div><div class='ctx'> CONFIG_CRYPTO_ANUBIS=m</div><div class='hunk'>@@ -343,6 +351,7 @@ CONFIG_CRYPTO_BLOWFISH=m</div><div class='ctx'> CONFIG_CRYPTO_CAST6=m</div><div class='ctx'> CONFIG_CRYPTO_KHAZAD=m</div><div class='ctx'> CONFIG_CRYPTO_SALSA20=m</div><div class='add'>+CONFIG_CRYPTO_SHA1_PPC=m</div><div class='ctx'> CONFIG_CRYPTO_SERPENT=m</div><div class='ctx'> CONFIG_CRYPTO_TEA=m</div><div class='ctx'> CONFIG_CRYPTO_TWOFISH=m</div><div class='head'>diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig<br/>index fd2edd650c20..11a3473f9e2e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/ppc64e_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/ppc64e_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/ppc64e_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/ppc64e_defconfig</a></div><div class='hunk'>@@ -59,10 +59,6 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_NBD=m</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=65536</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-CONFIG_BLK_DEV_GENERIC=y</div><div class='del'>-CONFIG_BLK_DEV_AMD74XX=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=y</div><div class='ctx'> CONFIG_BLK_DEV_SR=y</div><div class='hunk'>@@ -79,6 +75,8 @@ CONFIG_SCSI_DEBUG=m</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> CONFIG_SATA_SIL24=y</div><div class='ctx'> CONFIG_SATA_SVW=y</div><div class='add'>+CONFIG_PATA_AMD=y</div><div class='add'>+CONFIG_ATA_GENERIC=y</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='ctx'> CONFIG_MD_LINEAR=y</div><div class='head'>diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig<br/>index 8fbf49801233..1d2d69dd6409 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/ppc6xx_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/ppc6xx_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/ppc6xx_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/ppc6xx_defconfig</a></div><div class='hunk'>@@ -62,7 +62,6 @@ CONFIG_MPC8610_HPCD=y</div><div class='ctx'> CONFIG_GEF_SBC610=y</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='ctx'> CONFIG_CPU_FREQ_STAT=m</div><div class='del'>-CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='ctx'> CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_PERFORMANCE=y</div><div class='ctx'> CONFIG_CPU_FREQ_GOV_POWERSAVE=m</div><div class='hunk'>@@ -378,13 +377,6 @@ CONFIG_EEPROM_AT24=m</div><div class='ctx'> CONFIG_EEPROM_LEGACY=m</div><div class='ctx'> CONFIG_EEPROM_MAX6875=m</div><div class='ctx'> CONFIG_EEPROM_93CX6=m</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=m</div><div class='del'>-CONFIG_IDE_TASK_IOCTL=y</div><div class='del'>-# CONFIG_IDEPCI_PCIBUS_ORDER is not set</div><div class='del'>-CONFIG_BLK_DEV_GENERIC=y</div><div class='del'>-CONFIG_BLK_DEV_IDE_PMAC=y</div><div class='del'>-CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y</div><div class='ctx'> CONFIG_RAID_ATTRS=m</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=m</div><div class='hunk'>@@ -411,13 +403,14 @@ CONFIG_ATA=y</div><div class='ctx'> CONFIG_SATA_FSL=m</div><div class='ctx'> CONFIG_PDC_ADMA=m</div><div class='ctx'> CONFIG_ATA_PIIX=m</div><div class='add'>+CONFIG_PATA_MACIO=y</div><div class='ctx'> CONFIG_PATA_MPC52xx=m</div><div class='ctx'> CONFIG_PATA_OPTIDMA=m</div><div class='ctx'> CONFIG_PATA_SCH=m</div><div class='ctx'> CONFIG_PATA_VIA=m</div><div class='ctx'> CONFIG_PATA_PLATFORM=m</div><div class='ctx'> CONFIG_PATA_OF_PLATFORM=m</div><div class='del'>-CONFIG_ATA_GENERIC=m</div><div class='add'>+CONFIG_ATA_GENERIC=y</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='head'>diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig<br/>index 8a3bc016b732..4ff68b752618 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/pseries_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/pseries_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/pseries_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/pseries_defconfig</a></div><div class='hunk'>@@ -24,12 +24,14 @@ CONFIG_CGROUP_FREEZER=y</div><div class='ctx'> CONFIG_CGROUP_DEVICE=y</div><div class='ctx'> CONFIG_CPUSETS=y</div><div class='ctx'> CONFIG_CGROUP_CPUACCT=y</div><div class='add'>+CONFIG_CGROUP_BPF=y</div><div class='ctx'> CONFIG_MEMCG=y</div><div class='ctx'> CONFIG_MEMCG_SWAP=y</div><div class='ctx'> CONFIG_CGROUP_PERF=y</div><div class='ctx'> CONFIG_CGROUP_SCHED=y</div><div class='ctx'> CONFIG_USER_NS=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_BPF_SYSCALL=y</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='ctx'> CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='hunk'>@@ -52,10 +54,10 @@ CONFIG_HZ_100=y</div><div class='ctx'> CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_PPC_TRANSACTIONAL_MEM=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='add'>+CONFIG_KEXEC_FILE=y</div><div class='ctx'> CONFIG_IRQ_ALL_CPUS=y</div><div class='ctx'> CONFIG_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_MEMORY_HOTREMOVE=y</div><div class='del'>-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y</div><div class='ctx'> CONFIG_KSM=y</div><div class='ctx'> CONFIG_TRANSPARENT_HUGEPAGE=y</div><div class='ctx'> CONFIG_PPC_64K_PAGES=y</div><div class='hunk'>@@ -81,6 +83,11 @@ CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_ADVANCED is not set</div><div class='ctx'> CONFIG_BRIDGE=m</div><div class='ctx'> CONFIG_VLAN_8021Q=m</div><div class='add'>+CONFIG_NET_SCHED=y</div><div class='add'>+CONFIG_NET_CLS_BPF=m</div><div class='add'>+CONFIG_NET_CLS_ACT=y</div><div class='add'>+CONFIG_NET_ACT_BPF=m</div><div class='add'>+CONFIG_BPF_JIT=y</div><div class='ctx'> CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='hunk'>@@ -92,10 +99,6 @@ CONFIG_BLK_DEV_NBD=m</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=65536</div><div class='ctx'> CONFIG_VIRTIO_BLK=m</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-CONFIG_BLK_DEV_GENERIC=y</div><div class='del'>-CONFIG_BLK_DEV_AMD74XX=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_CHR_DEV_ST=m</div><div class='ctx'> CONFIG_BLK_DEV_SR=y</div><div class='hunk'>@@ -122,7 +125,8 @@ CONFIG_SCSI_DH_RDAC=m</div><div class='ctx'> CONFIG_SCSI_DH_ALUA=m</div><div class='ctx'> CONFIG_ATA=y</div><div class='ctx'> CONFIG_SATA_AHCI=y</div><div class='del'>-# CONFIG_ATA_SFF is not set</div><div class='add'>+CONFIG_PATA_AMD=y</div><div class='add'>+CONFIG_ATA_GENERIC=y</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='ctx'> CONFIG_MD_LINEAR=y</div><div class='hunk'>@@ -244,10 +248,6 @@ CONFIG_EXT2_FS_SECURITY=y</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_EXT4_FS_SECURITY=y</div><div class='del'>-CONFIG_REISERFS_FS=m</div><div class='del'>-CONFIG_REISERFS_FS_XATTR=y</div><div class='del'>-CONFIG_REISERFS_FS_POSIX_ACL=y</div><div class='del'>-CONFIG_REISERFS_FS_SECURITY=y</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_JFS_POSIX_ACL=y</div><div class='ctx'> CONFIG_JFS_SECURITY=y</div><div class='hunk'>@@ -295,6 +295,7 @@ CONFIG_LOCKUP_DETECTOR=y</div><div class='ctx'> CONFIG_LATENCYTOP=y</div><div class='ctx'> CONFIG_SCHED_TRACER=y</div><div class='ctx'> CONFIG_BLK_DEV_IO_TRACE=y</div><div class='add'>+CONFIG_UPROBE_EVENT=y</div><div class='ctx'> CONFIG_CODE_PATCHING_SELFTEST=y</div><div class='ctx'> CONFIG_FTR_FIXUP_SELFTEST=y</div><div class='ctx'> CONFIG_MSI_BITMAP_SELFTEST=y</div><div class='hunk'>@@ -302,7 +303,10 @@ CONFIG_XMON=y</div><div class='ctx'> CONFIG_CRYPTO_TEST=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='ctx'> CONFIG_CRYPTO_HMAC=y</div><div class='add'>+CONFIG_CRYPT_CRC32C_VPMSUM=m</div><div class='add'>+CONFIG_CRYPTO_MD5_PPC=m</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_SHA256=y</div><div class='ctx'> CONFIG_CRYPTO_TGR192=m</div><div class='ctx'> CONFIG_CRYPTO_WP512=m</div><div class='ctx'> CONFIG_CRYPTO_ANUBIS=m</div><div class='hunk'>@@ -310,6 +314,7 @@ CONFIG_CRYPTO_BLOWFISH=m</div><div class='ctx'> CONFIG_CRYPTO_CAST6=m</div><div class='ctx'> CONFIG_CRYPTO_KHAZAD=m</div><div class='ctx'> CONFIG_CRYPTO_SALSA20=m</div><div class='add'>+CONFIG_CRYPTO_SHA1_PPC=m</div><div class='ctx'> CONFIG_CRYPTO_SERPENT=m</div><div class='ctx'> CONFIG_CRYPTO_TEA=m</div><div class='ctx'> CONFIG_CRYPTO_TWOFISH=m</div><div class='head'>diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig<br/>index e9122b15e5fd..74bca2eccd0f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/configs/storcenter_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/configs/storcenter_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/configs/storcenter_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/configs/storcenter_defconfig</a></div><div class='hunk'>@@ -36,12 +36,11 @@ CONFIG_NFTL_RW=y</div><div class='ctx'> CONFIG_MTD_CFI=y</div><div class='ctx'> CONFIG_MTD_CFI_AMDSTD=y</div><div class='ctx'> CONFIG_MTD_PHYSMAP=y</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='del'>-CONFIG_SCSI=y</div><div class='ctx'> CONFIG_BLK_DEV_SD=y</div><div class='ctx'> CONFIG_BLK_DEV_SR=y</div><div class='ctx'> CONFIG_SCSI_SPI_ATTRS=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_PATA_VIA=y</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_MD=y</div><div class='ctx'> CONFIG_MD_LINEAR=y</div><div class='head'>diff --git a/arch/powerpc/crypto/Makefile b/arch/powerpc/crypto/Makefile<br/>index 7998c177f0a2..87f40454bad3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/crypto/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/crypto/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/crypto/Makefile</a></div><div class='hunk'>@@ -9,7 +9,7 @@ obj-$(CONFIG_CRYPTO_MD5_PPC) += md5-ppc.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SHA1_PPC_SPE) += sha1-ppc-spe.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SHA256_PPC_SPE) += sha256-ppc-spe.o</div><div class='del'>-obj-$(CONFIG_CRYPT_CRC32C_VPMSUM) += crc32c-vpmsum.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_CRC32C_VPMSUM) += crc32c-vpmsum.o</div><div class='ctx'> </div><div class='ctx'> aes-ppc-spe-y := aes-spe-core.o aes-spe-keys.o aes-tab-4k.o aes-spe-modes.o aes-spe-glue.o</div><div class='ctx'> md5-ppc-y := md5-asm.o md5-glue.o</div><div class='head'>diff --git a/arch/powerpc/include/asm/accounting.h b/arch/powerpc/include/asm/accounting.h<br/>index c133246df467..3abcf98ed2e0 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/accounting.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/accounting.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/accounting.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/accounting.h</a></div><div class='hunk'>@@ -12,9 +12,17 @@</div><div class='ctx'> </div><div class='ctx'> /* Stuff for accurate time accounting */</div><div class='ctx'> struct cpu_accounting_data {</div><div class='del'>-	unsigned long user_time;	/* accumulated usermode TB ticks */</div><div class='del'>-	unsigned long system_time;	/* accumulated system TB ticks */</div><div class='del'>-	unsigned long user_time_scaled;	/* accumulated usermode SPURR ticks */</div><div class='add'>+	/* Accumulated cputime values to flush on ticks*/</div><div class='add'>+	unsigned long utime;</div><div class='add'>+	unsigned long stime;</div><div class='add'>+	unsigned long utime_scaled;</div><div class='add'>+	unsigned long stime_scaled;</div><div class='add'>+	unsigned long gtime;</div><div class='add'>+	unsigned long hardirq_time;</div><div class='add'>+	unsigned long softirq_time;</div><div class='add'>+	unsigned long steal_time;</div><div class='add'>+	unsigned long idle_time;</div><div class='add'>+	/* Internal counters */</div><div class='ctx'> 	unsigned long starttime;	/* TB value snapshot */</div><div class='ctx'> 	unsigned long starttime_user;	/* TB value on exit to usermode */</div><div class='ctx'> 	unsigned long startspurr;	/* SPURR value snapshot */</div><div class='head'>diff --git a/arch/powerpc/include/asm/asm-prototypes.h b/arch/powerpc/include/asm/asm-prototypes.h<br/>index e0baba1535e6..f6c5264287e5 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/asm-prototypes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/asm-prototypes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/asm-prototypes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/asm-prototypes.h</a></div><div class='hunk'>@@ -13,10 +13,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='del'>-#include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/epapr_hcalls.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/asm/ucontext.h&gt;</div><div class='hunk'>@@ -121,4 +120,6 @@ extern s64 __ashrdi3(s64, int);</div><div class='ctx'> extern int __cmpdi2(s64, s64);</div><div class='ctx'> extern int __ucmpdi2(u64, u64);</div><div class='ctx'> </div><div class='add'>+void _mcount(void);</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_POWERPC_ASM_PROTOTYPES_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h<br/>index 59abc620f8e8..73eb794d6163 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/bitops.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/bitops.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/bitops.h</a></div><div class='hunk'>@@ -154,6 +154,34 @@ static __inline__ int test_and_change_bit(unsigned long nr,</div><div class='ctx'> 	return test_and_change_bits(BIT_MASK(nr), addr + BIT_WORD(nr)) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='add'>+static __inline__ unsigned long clear_bit_unlock_return_word(int nr,</div><div class='add'>+						volatile unsigned long *addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long old, t;</div><div class='add'>+	unsigned long *p = (unsigned long *)addr + BIT_WORD(nr);</div><div class='add'>+	unsigned long mask = BIT_MASK(nr);</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__ (</div><div class='add'>+	PPC_RELEASE_BARRIER</div><div class='add'>+"1:"	PPC_LLARX(%0,0,%3,0) "\n"</div><div class='add'>+	"andc %1,%0,%2\n"</div><div class='add'>+	PPC405_ERR77(0,%3)</div><div class='add'>+	PPC_STLCX "%1,0,%3\n"</div><div class='add'>+	"bne- 1b\n"</div><div class='add'>+	: "=&amp;r" (old), "=&amp;r" (t)</div><div class='add'>+	: "r" (mask), "r" (p)</div><div class='add'>+	: "cc", "memory");</div><div class='add'>+</div><div class='add'>+	return old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is a special function for mm/filemap.c */</div><div class='add'>+#define clear_bit_unlock_is_negative_byte(nr, addr)			\</div><div class='add'>+	(clear_bit_unlock_return_word(nr, addr) &amp; BIT_MASK(PG_waiters))</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PPC64 */</div><div class='add'>+</div><div class='ctx'> #include &lt;asm-generic/bitops/non-atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> static __inline__ void __clear_bit_unlock(int nr, volatile unsigned long *addr)</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/32/pgalloc.h b/arch/powerpc/include/asm/book3s/32/pgalloc.h<br/>index 8e21bb492dca..d310546e5d9d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/32/pgalloc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/32/pgalloc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/32/pgalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/32/pgalloc.h</a></div><div class='hunk'>@@ -2,14 +2,42 @@</div><div class='ctx'> #define _ASM_POWERPC_BOOK3S_32_PGALLOC_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-/* For 32-bit, all levels of page tables are just drawn from get_free_page() */</div><div class='del'>-#define MAX_PGTABLE_INDEX_SIZE	0</div><div class='add'>+/*</div><div class='add'>+ * Functions that deal with pagetables that could be at any level of</div><div class='add'>+ * the table need to be passed an "index_size" so they know how to</div><div class='add'>+ * handle allocation.  For PTE pages (which are linked to a struct</div><div class='add'>+ * page for now, and drawn from the main get_free_pages() pool), the</div><div class='add'>+ * allocation size will be (2^index_size * sizeof(pointer)) and</div><div class='add'>+ * allocations are drawn from the kmem_cache in PGT_CACHE(index_size).</div><div class='add'>+ *</div><div class='add'>+ * The maximum index size needs to be big enough to allow any</div><div class='add'>+ * pagetable sizes we need, but small enough to fit in the low bits of</div><div class='add'>+ * any page table pointer.  In other words all pagetables, even tiny</div><div class='add'>+ * ones, must be aligned to allow at least enough low 0 bits to</div><div class='add'>+ * contain this value.  This value is also used as a mask, so it must</div><div class='add'>+ * be one less than a power of two.</div><div class='add'>+ */</div><div class='add'>+#define MAX_PGTABLE_INDEX_SIZE	0xf</div><div class='ctx'> </div><div class='ctx'> extern void __bad_pte(pmd_t *pmd);</div><div class='ctx'> </div><div class='del'>-extern pgd_t *pgd_alloc(struct mm_struct *mm);</div><div class='del'>-extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);</div><div class='add'>+extern struct kmem_cache *pgtable_cache[];</div><div class='add'>+#define PGT_CACHE(shift) ({				\</div><div class='add'>+			BUG_ON(!(shift));		\</div><div class='add'>+			pgtable_cache[(shift) - 1];	\</div><div class='add'>+		})</div><div class='add'>+</div><div class='add'>+static inline pgd_t *pgd_alloc(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	return kmem_cache_alloc(PGT_CACHE(PGD_INDEX_SIZE), GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)</div><div class='add'>+{</div><div class='add'>+	kmem_cache_free(PGT_CACHE(PGD_INDEX_SIZE), pgd);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We don't have any real pmd's, and this code never triggers because</div><div class='hunk'>@@ -68,8 +96,12 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage)</div><div class='ctx'> </div><div class='ctx'> static inline void pgtable_free(void *table, unsigned index_size)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(index_size); /* 32-bit doesn't use this */</div><div class='del'>-	free_page((unsigned long)table);</div><div class='add'>+	if (!index_size) {</div><div class='add'>+		free_page((unsigned long)table);</div><div class='add'>+	} else {</div><div class='add'>+		BUG_ON(index_size &gt; MAX_PGTABLE_INDEX_SIZE);</div><div class='add'>+		kmem_cache_free(PGT_CACHE(index_size), table);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define check_pgt_cache()	do { } while (0)</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h<br/>index 6b8b2d57fdc8..012223638815 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/32/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/32/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/32/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/32/pgtable.h</a></div><div class='hunk'>@@ -8,6 +8,23 @@</div><div class='ctx'> /* And here we include common definitions */</div><div class='ctx'> #include &lt;asm/pte-common.h&gt;</div><div class='ctx'> </div><div class='add'>+#define PTE_INDEX_SIZE	PTE_SHIFT</div><div class='add'>+#define PMD_INDEX_SIZE	0</div><div class='add'>+#define PUD_INDEX_SIZE	0</div><div class='add'>+#define PGD_INDEX_SIZE	(32 - PGDIR_SHIFT)</div><div class='add'>+</div><div class='add'>+#define PMD_CACHE_INDEX	PMD_INDEX_SIZE</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+#define PTE_TABLE_SIZE	(sizeof(pte_t) &lt;&lt; PTE_INDEX_SIZE)</div><div class='add'>+#define PMD_TABLE_SIZE	0</div><div class='add'>+#define PUD_TABLE_SIZE	0</div><div class='add'>+#define PGD_TABLE_SIZE	(sizeof(pgd_t) &lt;&lt; PGD_INDEX_SIZE)</div><div class='add'>+#endif	/* __ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+#define PTRS_PER_PTE	(1 &lt;&lt; PTE_INDEX_SIZE)</div><div class='add'>+#define PTRS_PER_PGD	(1 &lt;&lt; PGD_INDEX_SIZE)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The normal case is that PTEs are 32-bits and we have a 1-page</div><div class='ctx'>  * 1024-entry pgdir pointing to 1-page 1024-entry PTE pages.  -- paulus</div><div class='hunk'>@@ -19,14 +36,10 @@</div><div class='ctx'>  * -Matt</div><div class='ctx'>  */</div><div class='ctx'> /* PGDIR_SHIFT determines what a top-level page table entry can map */</div><div class='del'>-#define PGDIR_SHIFT	(PAGE_SHIFT + PTE_SHIFT)</div><div class='add'>+#define PGDIR_SHIFT	(PAGE_SHIFT + PTE_INDEX_SIZE)</div><div class='ctx'> #define PGDIR_SIZE	(1UL &lt;&lt; PGDIR_SHIFT)</div><div class='ctx'> #define PGDIR_MASK	(~(PGDIR_SIZE-1))</div><div class='ctx'> </div><div class='del'>-#define PTRS_PER_PTE	(1 &lt;&lt; PTE_SHIFT)</div><div class='del'>-#define PTRS_PER_PMD	1</div><div class='del'>-#define PTRS_PER_PGD	(1 &lt;&lt; (32 - PGDIR_SHIFT))</div><div class='del'>-</div><div class='ctx'> #define USER_PTRS_PER_PGD	(TASK_SIZE / PGDIR_SIZE)</div><div class='ctx'> /*</div><div class='ctx'>  * This is the bottom of the PKMAP area with HIGHMEM or an arbitrary</div><div class='hunk'>@@ -82,12 +95,8 @@</div><div class='ctx'> </div><div class='ctx'> extern unsigned long ioremap_bot;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * entries per page directory level: our page-table tree is two-level, so</div><div class='del'>- * we don't really have any PMD directory.</div><div class='del'>- */</div><div class='del'>-#define PTE_TABLE_SIZE	(sizeof(pte_t) &lt;&lt; PTE_SHIFT)</div><div class='del'>-#define PGD_TABLE_SIZE	(sizeof(pgd_t) &lt;&lt; (32 - PGDIR_SHIFT))</div><div class='add'>+/* Bits to mask out from a PGD to get to the PUD page */</div><div class='add'>+#define PGD_MASKED_BITS		0</div><div class='ctx'> </div><div class='ctx'> #define pte_ERROR(e) \</div><div class='ctx'> 	pr_err("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \</div><div class='hunk'>@@ -224,7 +233,8 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static inline void __ptep_set_access_flags(struct mm_struct *mm,</div><div class='del'>-					   pte_t *ptep, pte_t entry)</div><div class='add'>+					   pte_t *ptep, pte_t entry,</div><div class='add'>+					   unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long set = pte_val(entry) &amp;</div><div class='ctx'> 		(_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC);</div><div class='hunk'>@@ -283,15 +293,6 @@ static inline void __ptep_set_access_flags(struct mm_struct *mm,</div><div class='ctx'> #define __pte_to_swp_entry(pte)		((swp_entry_t) { pte_val(pte) &gt;&gt; 3 })</div><div class='ctx'> #define __swp_entry_to_pte(x)		((pte_t) { (x).val &lt;&lt; 3 })</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_PPC_4K_PAGES</div><div class='del'>-void pgtable_cache_init(void);</div><div class='del'>-#else</div><div class='del'>-/*</div><div class='del'>- * No page table caches to initialise</div><div class='del'>- */</div><div class='del'>-#define pgtable_cache_init()	do { } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep,</div><div class='ctx'> 		      pmd_t **pmdp);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/hash-4k.h b/arch/powerpc/include/asm/book3s/64/hash-4k.h<br/>index 1af837c561ba..0c4e470571ca 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/hash-4k.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/64/hash-4k.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/hash-4k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/hash-4k.h</a></div><div class='hunk'>@@ -16,9 +16,6 @@</div><div class='ctx'> #define H_PUD_TABLE_SIZE	(sizeof(pud_t) &lt;&lt; H_PUD_INDEX_SIZE)</div><div class='ctx'> #define H_PGD_TABLE_SIZE	(sizeof(pgd_t) &lt;&lt; H_PGD_INDEX_SIZE)</div><div class='ctx'> </div><div class='del'>-/* With 4k base page size, hugepage PTEs go at the PMD level */</div><div class='del'>-#define MIN_HUGEPTE_SHIFT	PMD_SHIFT</div><div class='del'>-</div><div class='ctx'> /* PTE flags to conserve for HPTE identification */</div><div class='ctx'> #define _PAGE_HPTEFLAGS (H_PAGE_BUSY | H_PAGE_HASHPTE | \</div><div class='ctx'> 			 H_PAGE_F_SECOND | H_PAGE_F_GIX)</div><div class='hunk'>@@ -39,12 +36,13 @@</div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> static inline int hash__hugepd_ok(hugepd_t hpd)</div><div class='ctx'> {</div><div class='add'>+	unsigned long hpdval = hpd_val(hpd);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if it is not a pte and have hugepd shift mask</div><div class='ctx'> 	 * set, then it is a hugepd directory pointer</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(hpd.pd &amp; _PAGE_PTE) &amp;&amp;</div><div class='del'>-	    ((hpd.pd &amp; HUGEPD_SHIFT_MASK) != 0))</div><div class='add'>+	if (!(hpdval &amp; _PAGE_PTE) &amp;&amp;</div><div class='add'>+	    ((hpdval &amp; HUGEPD_SHIFT_MASK) != 0))</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/hash-64k.h b/arch/powerpc/include/asm/book3s/64/hash-64k.h<br/>index 5aae4f530c21..f3dd21efa2ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/hash-64k.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/64/hash-64k.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/hash-64k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/hash-64k.h</a></div><div class='hunk'>@@ -6,9 +6,6 @@</div><div class='ctx'> #define H_PUD_INDEX_SIZE  5</div><div class='ctx'> #define H_PGD_INDEX_SIZE  12</div><div class='ctx'> </div><div class='del'>-/* With 4k base page size, hugepage PTEs go at the PMD level */</div><div class='del'>-#define MIN_HUGEPTE_SHIFT	PAGE_SHIFT</div><div class='del'>-</div><div class='ctx'> #define H_PAGE_COMBO	0x00001000 /* this is a combo 4k page */</div><div class='ctx'> #define H_PAGE_4K_PFN	0x00002000 /* PFN is for a single 4k page */</div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h<br/>index f61cad3de4e6..f7b721bbf918 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/hash.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/64/hash.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/hash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/hash.h</a></div><div class='hunk'>@@ -33,9 +33,9 @@</div><div class='ctx'> 				 H_PUD_INDEX_SIZE + H_PGD_INDEX_SIZE + PAGE_SHIFT)</div><div class='ctx'> #define H_PGTABLE_RANGE		(ASM_CONST(1) &lt;&lt; H_PGTABLE_EADDR_SIZE)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='add'>+#if defined(CONFIG_TRANSPARENT_HUGEPAGE) &amp;&amp;  defined(CONFIG_PPC_64K_PAGES)</div><div class='ctx'> /*</div><div class='del'>- * only with hash we need to use the second half of pmd page table</div><div class='add'>+ * only with hash 64k we need to use the second half of pmd page table</div><div class='ctx'>  * to store pointer to deposited pgtable_t</div><div class='ctx'>  */</div><div class='ctx'> #define H_PMD_CACHE_INDEX	(H_PMD_INDEX_SIZE + 1)</div><div class='hunk'>@@ -201,6 +201,10 @@ extern int __meminit hash__vmemmap_create_mapping(unsigned long start,</div><div class='ctx'> 					      unsigned long phys);</div><div class='ctx'> extern void hash__vmemmap_remove_mapping(unsigned long start,</div><div class='ctx'> 				     unsigned long page_size);</div><div class='add'>+</div><div class='add'>+int hash__create_section_mapping(unsigned long start, unsigned long end);</div><div class='add'>+int hash__remove_section_mapping(unsigned long start, unsigned long end);</div><div class='add'>+</div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* _ASM_POWERPC_BOOK3S_64_HASH_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/hugetlb-radix.h b/arch/powerpc/include/asm/book3s/64/hugetlb-radix.h<br/>deleted file mode 100644<br/>index c45189aa7476..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/hugetlb-radix.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/64/hugetlb-radix.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-#ifndef _ASM_POWERPC_BOOK3S_64_HUGETLB_RADIX_H</div><div class='del'>-#define _ASM_POWERPC_BOOK3S_64_HUGETLB_RADIX_H</div><div class='del'>-/*</div><div class='del'>- * For radix we want generic code to handle hugetlb. But then if we want</div><div class='del'>- * both hash and radix to be enabled together we need to workaround the</div><div class='del'>- * limitations.</div><div class='del'>- */</div><div class='del'>-void radix__flush_hugetlb_page(struct vm_area_struct *vma, unsigned long vmaddr);</div><div class='del'>-void radix__local_flush_hugetlb_page(struct vm_area_struct *vma, unsigned long vmaddr);</div><div class='del'>-extern unsigned long</div><div class='del'>-radix__hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='del'>-				unsigned long len, unsigned long pgoff,</div><div class='del'>-				unsigned long flags);</div><div class='del'>-</div><div class='del'>-static inline int hstate_get_psize(struct hstate *hstate)</div><div class='del'>-{</div><div class='del'>-	unsigned long shift;</div><div class='del'>-</div><div class='del'>-	shift = huge_page_shift(hstate);</div><div class='del'>-	if (shift == mmu_psize_defs[MMU_PAGE_2M].shift)</div><div class='del'>-		return MMU_PAGE_2M;</div><div class='del'>-	else if (shift == mmu_psize_defs[MMU_PAGE_1G].shift)</div><div class='del'>-		return MMU_PAGE_1G;</div><div class='del'>-	else {</div><div class='del'>-		WARN(1, "Wrong huge page shift\n");</div><div class='del'>-		return mmu_virtual_psize;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/hugetlb.h b/arch/powerpc/include/asm/book3s/64/hugetlb.h<br/>new file mode 100644<br/>index 000000000000..c62f14d0bec1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/hugetlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/hugetlb.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+#ifndef _ASM_POWERPC_BOOK3S_64_HUGETLB_H</div><div class='add'>+#define _ASM_POWERPC_BOOK3S_64_HUGETLB_H</div><div class='add'>+/*</div><div class='add'>+ * For radix we want generic code to handle hugetlb. But then if we want</div><div class='add'>+ * both hash and radix to be enabled together we need to workaround the</div><div class='add'>+ * limitations.</div><div class='add'>+ */</div><div class='add'>+void radix__flush_hugetlb_page(struct vm_area_struct *vma, unsigned long vmaddr);</div><div class='add'>+void radix__local_flush_hugetlb_page(struct vm_area_struct *vma, unsigned long vmaddr);</div><div class='add'>+extern unsigned long</div><div class='add'>+radix__hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='add'>+				unsigned long len, unsigned long pgoff,</div><div class='add'>+				unsigned long flags);</div><div class='add'>+</div><div class='add'>+static inline int hstate_get_psize(struct hstate *hstate)</div><div class='add'>+{</div><div class='add'>+	unsigned long shift;</div><div class='add'>+</div><div class='add'>+	shift = huge_page_shift(hstate);</div><div class='add'>+	if (shift == mmu_psize_defs[MMU_PAGE_2M].shift)</div><div class='add'>+		return MMU_PAGE_2M;</div><div class='add'>+	else if (shift == mmu_psize_defs[MMU_PAGE_1G].shift)</div><div class='add'>+		return MMU_PAGE_1G;</div><div class='add'>+	else if (shift == mmu_psize_defs[MMU_PAGE_16M].shift)</div><div class='add'>+		return MMU_PAGE_16M;</div><div class='add'>+	else if (shift == mmu_psize_defs[MMU_PAGE_16G].shift)</div><div class='add'>+		return MMU_PAGE_16G;</div><div class='add'>+	else {</div><div class='add'>+		WARN(1, "Wrong huge page shift\n");</div><div class='add'>+		return mmu_virtual_psize;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define arch_make_huge_pte arch_make_huge_pte</div><div class='add'>+static inline pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma,</div><div class='add'>+				       struct page *page, int writable)</div><div class='add'>+{</div><div class='add'>+	unsigned long page_shift;</div><div class='add'>+</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='add'>+		return entry;</div><div class='add'>+</div><div class='add'>+	page_shift = huge_page_shift(hstate_vma(vma));</div><div class='add'>+	/*</div><div class='add'>+	 * We don't support 1G hugetlb pages yet.</div><div class='add'>+	 */</div><div class='add'>+	VM_WARN_ON(page_shift == mmu_psize_defs[MMU_PAGE_1G].shift);</div><div class='add'>+	if (page_shift == mmu_psize_defs[MMU_PAGE_2M].shift)</div><div class='add'>+		return __pte(pte_val(entry) | _PAGE_LARGE);</div><div class='add'>+	else</div><div class='add'>+		return entry;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h<br/>index e407af2b7333..52d8d1e4b772 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/mmu-hash.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/64/mmu-hash.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/mmu-hash.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/mmu-hash.h</a></div><div class='hunk'>@@ -70,7 +70,9 @@</div><div class='ctx'> </div><div class='ctx'> #define HPTE_V_SSIZE_SHIFT	62</div><div class='ctx'> #define HPTE_V_AVPN_SHIFT	7</div><div class='add'>+#define HPTE_V_COMMON_BITS	ASM_CONST(0x000fffffffffffff)</div><div class='ctx'> #define HPTE_V_AVPN		ASM_CONST(0x3fffffffffffff80)</div><div class='add'>+#define HPTE_V_AVPN_3_0		ASM_CONST(0x000fffffffffff80)</div><div class='ctx'> #define HPTE_V_AVPN_VAL(x)	(((x) &amp; HPTE_V_AVPN) &gt;&gt; HPTE_V_AVPN_SHIFT)</div><div class='ctx'> #define HPTE_V_COMPARE(x,y)	(!(((x) ^ (y)) &amp; 0xffffffffffffff80UL))</div><div class='ctx'> #define HPTE_V_BOLTED		ASM_CONST(0x0000000000000010)</div><div class='hunk'>@@ -80,14 +82,16 @@</div><div class='ctx'> #define HPTE_V_VALID		ASM_CONST(0x0000000000000001)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ISA 3.0 have a different HPTE format.</div><div class='add'>+ * ISA 3.0 has a different HPTE format.</div><div class='ctx'>  */</div><div class='ctx'> #define HPTE_R_3_0_SSIZE_SHIFT	58</div><div class='add'>+#define HPTE_R_3_0_SSIZE_MASK	(3ull &lt;&lt; HPTE_R_3_0_SSIZE_SHIFT)</div><div class='ctx'> #define HPTE_R_PP0		ASM_CONST(0x8000000000000000)</div><div class='ctx'> #define HPTE_R_TS		ASM_CONST(0x4000000000000000)</div><div class='ctx'> #define HPTE_R_KEY_HI		ASM_CONST(0x3000000000000000)</div><div class='ctx'> #define HPTE_R_RPN_SHIFT	12</div><div class='ctx'> #define HPTE_R_RPN		ASM_CONST(0x0ffffffffffff000)</div><div class='add'>+#define HPTE_R_RPN_3_0		ASM_CONST(0x01fffffffffff000)</div><div class='ctx'> #define HPTE_R_PP		ASM_CONST(0x0000000000000003)</div><div class='ctx'> #define HPTE_R_PPP		ASM_CONST(0x8000000000000003)</div><div class='ctx'> #define HPTE_R_N		ASM_CONST(0x0000000000000004)</div><div class='hunk'>@@ -153,6 +157,7 @@ struct mmu_hash_ops {</div><div class='ctx'> 					       unsigned long addr,</div><div class='ctx'> 					       unsigned char *hpte_slot_array,</div><div class='ctx'> 					       int psize, int ssize, int local);</div><div class='add'>+	int		(*resize_hpt)(unsigned long shift);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Special for kexec.</div><div class='ctx'> 	 * To be called in real mode with interrupts disabled. No locks are</div><div class='hunk'>@@ -316,12 +321,43 @@ static inline unsigned long hpte_encode_avpn(unsigned long vpn, int psize,</div><div class='ctx'> 	 */</div><div class='ctx'> 	v = (vpn &gt;&gt; (23 - VPN_SHIFT)) &amp; ~(mmu_psize_defs[psize].avpnm);</div><div class='ctx'> 	v &lt;&lt;= HPTE_V_AVPN_SHIFT;</div><div class='del'>-	if (!cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='del'>-		v |= ((unsigned long) ssize) &lt;&lt; HPTE_V_SSIZE_SHIFT;</div><div class='add'>+	v |= ((unsigned long) ssize) &lt;&lt; HPTE_V_SSIZE_SHIFT;</div><div class='ctx'> 	return v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * ISA v3.0 defines a new HPTE format, which differs from the old</div><div class='add'>+ * format in having smaller AVPN and ARPN fields, and the B field</div><div class='add'>+ * in the second dword instead of the first.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long hpte_old_to_new_v(unsigned long v)</div><div class='add'>+{</div><div class='add'>+	/* trim AVPN, drop B */</div><div class='add'>+	return v &amp; HPTE_V_COMMON_BITS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long hpte_old_to_new_r(unsigned long v, unsigned long r)</div><div class='add'>+{</div><div class='add'>+	/* move B field from 1st to 2nd dword, trim ARPN */</div><div class='add'>+	return (r &amp; ~HPTE_R_3_0_SSIZE_MASK) |</div><div class='add'>+		(((v) &gt;&gt; HPTE_V_SSIZE_SHIFT) &lt;&lt; HPTE_R_3_0_SSIZE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long hpte_new_to_old_v(unsigned long v, unsigned long r)</div><div class='add'>+{</div><div class='add'>+	/* insert B field */</div><div class='add'>+	return (v &amp; HPTE_V_COMMON_BITS) |</div><div class='add'>+		((r &amp; HPTE_R_3_0_SSIZE_MASK) &lt;&lt;</div><div class='add'>+		 (HPTE_V_SSIZE_SHIFT - HPTE_R_3_0_SSIZE_SHIFT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long hpte_new_to_old_r(unsigned long r)</div><div class='add'>+{</div><div class='add'>+	/* clear out B field */</div><div class='add'>+	return r &amp; ~HPTE_R_3_0_SSIZE_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * This function sets the AVPN and L fields of the HPTE  appropriately</div><div class='ctx'>  * using the base page size and actual page size.</div><div class='ctx'>  */</div><div class='hunk'>@@ -341,12 +377,8 @@ static inline unsigned long hpte_encode_v(unsigned long vpn, int base_psize,</div><div class='ctx'>  * aligned for the requested page size</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned long hpte_encode_r(unsigned long pa, int base_psize,</div><div class='del'>-					  int actual_psize, int ssize)</div><div class='add'>+					  int actual_psize)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='del'>-		pa |= ((unsigned long) ssize) &lt;&lt; HPTE_R_3_0_SSIZE_SHIFT;</div><div class='del'>-</div><div class='ctx'> 	/* A 4K page needs no special encoding */</div><div class='ctx'> 	if (actual_psize == MMU_PAGE_4K)</div><div class='ctx'> 		return pa &amp; HPTE_R_RPN;</div><div class='hunk'>@@ -494,6 +526,9 @@ extern void slb_set_size(u16 size);</div><div class='ctx'> #define ESID_BITS		18</div><div class='ctx'> #define ESID_BITS_1T		6</div><div class='ctx'> </div><div class='add'>+#define ESID_BITS_MASK		((1 &lt;&lt; ESID_BITS) - 1)</div><div class='add'>+#define ESID_BITS_1T_MASK	((1 &lt;&lt; ESID_BITS_1T) - 1)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * 256MB segment</div><div class='ctx'>  * The proto-VSID space has 2^(CONTEX_BITS + ESID_BITS) - 1 segments</div><div class='hunk'>@@ -629,9 +664,9 @@ static inline unsigned long get_vsid(unsigned long context, unsigned long ea,</div><div class='ctx'> </div><div class='ctx'> 	if (ssize == MMU_SEGSIZE_256M)</div><div class='ctx'> 		return vsid_scramble((context &lt;&lt; ESID_BITS)</div><div class='del'>-				     | (ea &gt;&gt; SID_SHIFT), 256M);</div><div class='add'>+				     | ((ea &gt;&gt; SID_SHIFT) &amp; ESID_BITS_MASK), 256M);</div><div class='ctx'> 	return vsid_scramble((context &lt;&lt; ESID_BITS_1T)</div><div class='del'>-			     | (ea &gt;&gt; SID_SHIFT_1T), 1T);</div><div class='add'>+			     | ((ea &gt;&gt; SID_SHIFT_1T) &amp; ESID_BITS_1T_MASK), 1T);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h b/arch/powerpc/include/asm/book3s/64/mmu.h<br/>index 8afb0e00f7d9..805d4105e9bb 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/mmu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/64/mmu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/mmu.h</a></div><div class='hunk'>@@ -30,7 +30,7 @@ extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> /*</div><div class='del'>- * ISA 3.0 partiton and process table entry format</div><div class='add'>+ * ISA 3.0 partition and process table entry format</div><div class='ctx'>  */</div><div class='ctx'> struct prtb_entry {</div><div class='ctx'> 	__be64 prtb0;</div><div class='hunk'>@@ -44,10 +44,21 @@ struct patb_entry {</div><div class='ctx'> };</div><div class='ctx'> extern struct patb_entry *partition_tb;</div><div class='ctx'> </div><div class='add'>+/* Bits in patb0 field */</div><div class='ctx'> #define PATB_HR		(1UL &lt;&lt; 63)</div><div class='del'>-#define PATB_GR		(1UL &lt;&lt; 63)</div><div class='del'>-#define RPDB_MASK	0x0ffffffffffff00fUL</div><div class='add'>+#define RPDB_MASK	0x0fffffffffffff00UL</div><div class='ctx'> #define RPDB_SHIFT	(1UL &lt;&lt; 8)</div><div class='add'>+#define RTS1_SHIFT	61		/* top 2 bits of radix tree size */</div><div class='add'>+#define RTS1_MASK	(3UL &lt;&lt; RTS1_SHIFT)</div><div class='add'>+#define RTS2_SHIFT	5		/* bottom 3 bits of radix tree size */</div><div class='add'>+#define RTS2_MASK	(7UL &lt;&lt; RTS2_SHIFT)</div><div class='add'>+#define RPDS_MASK	0x1f		/* root page dir. size field */</div><div class='add'>+</div><div class='add'>+/* Bits in patb1 field */</div><div class='add'>+#define PATB_GR		(1UL &lt;&lt; 63)	/* guest uses radix; must match HR */</div><div class='add'>+#define PRTS_MASK	0x1f		/* process table size field */</div><div class='add'>+#define PRTB_MASK	0x0ffffffffffff000UL</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Limit process table to PAGE_SIZE table. This</div><div class='ctx'>  * also limit the max pid we can support.</div><div class='hunk'>@@ -138,5 +149,11 @@ static inline void setup_initial_memory_limit(phys_addr_t first_memblock_base,</div><div class='ctx'> extern int (*register_process_table)(unsigned long base, unsigned long page_size,</div><div class='ctx'> 				     unsigned long tbl_size);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_PSERIES</div><div class='add'>+extern void radix_init_pseries(void);</div><div class='add'>+#else</div><div class='add'>+static inline void radix_init_pseries(void) { };</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* _ASM_POWERPC_BOOK3S_64_MMU_H_ */</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h<br/>index 9db83b4e017d..8708a0239a56 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/pgtable-4k.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/64/pgtable-4k.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/pgtable-4k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/pgtable-4k.h</a></div><div class='hunk'>@@ -47,7 +47,12 @@ static inline int hugepd_ok(hugepd_t hpd)</div><div class='ctx'> 	return hash__hugepd_ok(hpd);</div><div class='ctx'> }</div><div class='ctx'> #define is_hugepd(hpd)		(hugepd_ok(hpd))</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_HUGETLB_PAGE */</div><div class='add'>+static inline int pmd_huge(pmd_t pmd) { return 0; }</div><div class='add'>+static inline int pud_huge(pud_t pud) { return 0; }</div><div class='ctx'> #endif /* CONFIG_HUGETLB_PAGE */</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #endif /*_ASM_POWERPC_BOOK3S_64_PGTABLE_4K_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/pgtable-64k.h b/arch/powerpc/include/asm/book3s/64/pgtable-64k.h<br/>index 0d2845b44763..2ce4209399ed 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/pgtable-64k.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/64/pgtable-64k.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/pgtable-64k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/pgtable-64k.h</a></div><div class='hunk'>@@ -35,10 +35,6 @@ static inline int pgd_huge(pgd_t pgd)</div><div class='ctx'> }</div><div class='ctx'> #define pgd_huge pgd_huge</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_VM</div><div class='del'>-extern int hugepd_ok(hugepd_t hpd);</div><div class='del'>-#define is_hugepd(hpd)               (hugepd_ok(hpd))</div><div class='del'>-#else</div><div class='ctx'> /*</div><div class='ctx'>  * With 64k page size, we have hugepage ptes in the pgd and pmd entries. We don't</div><div class='ctx'>  * need to setup hugepage directory for them. Our pte and page directory format</div><div class='hunk'>@@ -49,8 +45,10 @@ static inline int hugepd_ok(hugepd_t hpd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #define is_hugepd(pdep)			0</div><div class='del'>-#endif /* CONFIG_DEBUG_VM */</div><div class='ctx'> </div><div class='add'>+#else /* !CONFIG_HUGETLB_PAGE */</div><div class='add'>+static inline int pmd_huge(pmd_t pmd) { return 0; }</div><div class='add'>+static inline int pud_huge(pud_t pud) { return 0; }</div><div class='ctx'> #endif /* CONFIG_HUGETLB_PAGE */</div><div class='ctx'> </div><div class='ctx'> static inline int remap_4k_pfn(struct vm_area_struct *vma, unsigned long addr,</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h<br/>index 9fd77f8794a0..1eeeb72c7015 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/64/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/pgtable.h</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> #ifndef _ASM_POWERPC_BOOK3S_64_PGTABLE_H_</div><div class='ctx'> #define _ASM_POWERPC_BOOK3S_64_PGTABLE_H_</div><div class='ctx'> </div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+#include &lt;linux/mmdebug.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> /*</div><div class='ctx'>  * Common bits between hash and Radix page table</div><div class='ctx'>  */</div><div class='hunk'>@@ -26,6 +29,11 @@</div><div class='ctx'> #define _RPAGE_SW1		0x00800</div><div class='ctx'> #define _RPAGE_SW2		0x00400</div><div class='ctx'> #define _RPAGE_SW3		0x00200</div><div class='add'>+#define _RPAGE_RSV1		0x1000000000000000UL</div><div class='add'>+#define _RPAGE_RSV2		0x0800000000000000UL</div><div class='add'>+#define _RPAGE_RSV3		0x0400000000000000UL</div><div class='add'>+#define _RPAGE_RSV4		0x0200000000000000UL</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MEM_SOFT_DIRTY</div><div class='ctx'> #define _PAGE_SOFT_DIRTY	_RPAGE_SW3 /* software: software dirty tracking */</div><div class='ctx'> #else</div><div class='hunk'>@@ -33,6 +41,11 @@</div><div class='ctx'> #endif</div><div class='ctx'> #define _PAGE_SPECIAL		_RPAGE_SW2 /* software: special page */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * For P9 DD1 only, we need to track whether the pte's huge.</div><div class='add'>+ */</div><div class='add'>+#define _PAGE_LARGE	_RPAGE_RSV1</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #define _PAGE_PTE		(1ul &lt;&lt; 62)	/* distinguishes PTEs from pointers */</div><div class='ctx'> #define _PAGE_PRESENT		(1ul &lt;&lt; 63)	/* pte contains a translation */</div><div class='hunk'>@@ -361,6 +374,23 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,</div><div class='ctx'> 	return __pte(old);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL</div><div class='add'>+static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,</div><div class='add'>+					    unsigned long addr,</div><div class='add'>+					    pte_t *ptep, int full)</div><div class='add'>+{</div><div class='add'>+	if (full &amp;&amp; radix_enabled()) {</div><div class='add'>+		/*</div><div class='add'>+		 * Let's skip the DD1 style pte update here. We know that</div><div class='add'>+		 * this is a full mm pte clear and hence can be sure there is</div><div class='add'>+		 * no parallel set_pte.</div><div class='add'>+		 */</div><div class='add'>+		return radix__ptep_get_and_clear_full(mm, addr, ptep, full);</div><div class='add'>+	}</div><div class='add'>+	return ptep_get_and_clear(mm, addr, ptep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static inline void pte_clear(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 			     pte_t * ptep)</div><div class='ctx'> {</div><div class='hunk'>@@ -407,15 +437,47 @@ static inline pte_t pte_clear_soft_dirty(pte_t pte)</div><div class='ctx'> #endif /* CONFIG_HAVE_ARCH_SOFT_DIRTY */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA_BALANCING</div><div class='del'>-/*</div><div class='del'>- * These work without NUMA balancing but the kernel does not care. See the</div><div class='del'>- * comment in include/asm-generic/pgtable.h . On powerpc, this will only</div><div class='del'>- * work for user pages and always return true for kernel pages.</div><div class='del'>- */</div><div class='ctx'> static inline int pte_protnone(pte_t pte)</div><div class='ctx'> {</div><div class='del'>-	return (pte_raw(pte) &amp; cpu_to_be64(_PAGE_PRESENT | _PAGE_PRIVILEGED)) ==</div><div class='del'>-		cpu_to_be64(_PAGE_PRESENT | _PAGE_PRIVILEGED);</div><div class='add'>+	return (pte_raw(pte) &amp; cpu_to_be64(_PAGE_PRESENT | _PAGE_PTE | _PAGE_RWX)) ==</div><div class='add'>+		cpu_to_be64(_PAGE_PRESENT | _PAGE_PTE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define pte_mk_savedwrite pte_mk_savedwrite</div><div class='add'>+static inline pte_t pte_mk_savedwrite(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Used by Autonuma subsystem to preserve the write bit</div><div class='add'>+	 * while marking the pte PROT_NONE. Only allow this</div><div class='add'>+	 * on PROT_NONE pte</div><div class='add'>+	 */</div><div class='add'>+	VM_BUG_ON((pte_raw(pte) &amp; cpu_to_be64(_PAGE_PRESENT | _PAGE_RWX | _PAGE_PRIVILEGED)) !=</div><div class='add'>+		  cpu_to_be64(_PAGE_PRESENT | _PAGE_PRIVILEGED));</div><div class='add'>+	return __pte(pte_val(pte) &amp; ~_PAGE_PRIVILEGED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define pte_clear_savedwrite pte_clear_savedwrite</div><div class='add'>+static inline pte_t pte_clear_savedwrite(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Used by KSM subsystem to make a protnone pte readonly.</div><div class='add'>+	 */</div><div class='add'>+	VM_BUG_ON(!pte_protnone(pte));</div><div class='add'>+	return __pte(pte_val(pte) | _PAGE_PRIVILEGED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define pte_savedwrite pte_savedwrite</div><div class='add'>+static inline bool pte_savedwrite(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Saved write ptes are prot none ptes that doesn't have</div><div class='add'>+	 * privileged bit sit. We mark prot none as one which has</div><div class='add'>+	 * present and pviliged bit set and RWX cleared. To mark</div><div class='add'>+	 * protnone which used to have _PAGE_WRITE set we clear</div><div class='add'>+	 * the privileged bit.</div><div class='add'>+	 */</div><div class='add'>+	VM_BUG_ON(!pte_protnone(pte));</div><div class='add'>+	return !(pte_raw(pte) &amp; cpu_to_be64(_PAGE_RWX | _PAGE_PRIVILEGED));</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_NUMA_BALANCING */</div><div class='ctx'> </div><div class='hunk'>@@ -568,10 +630,11 @@ static inline bool check_pte_access(unsigned long access, unsigned long ptev)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static inline void __ptep_set_access_flags(struct mm_struct *mm,</div><div class='del'>-					   pte_t *ptep, pte_t entry)</div><div class='add'>+					   pte_t *ptep, pte_t entry,</div><div class='add'>+					   unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> 	if (radix_enabled())</div><div class='del'>-		return radix__ptep_set_access_flags(mm, ptep, entry);</div><div class='add'>+		return radix__ptep_set_access_flags(mm, ptep, entry, address);</div><div class='ctx'> 	return hash__ptep_set_access_flags(ptep, entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -789,9 +852,6 @@ extern struct page *pgd_page(pgd_t pgd);</div><div class='ctx'> #define pgd_ERROR(e) \</div><div class='ctx'> 	pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))</div><div class='ctx'> </div><div class='del'>-void pgtable_cache_add(unsigned shift, void (*ctor)(void *));</div><div class='del'>-void pgtable_cache_init(void);</div><div class='del'>-</div><div class='ctx'> static inline int map_kernel_page(unsigned long ea, unsigned long pa,</div><div class='ctx'> 				  unsigned long flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -848,6 +908,8 @@ static inline pte_t *pmdp_ptep(pmd_t *pmd)</div><div class='ctx'> #define pmd_mkclean(pmd)	pte_pmd(pte_mkclean(pmd_pte(pmd)))</div><div class='ctx'> #define pmd_mkyoung(pmd)	pte_pmd(pte_mkyoung(pmd_pte(pmd)))</div><div class='ctx'> #define pmd_mkwrite(pmd)	pte_pmd(pte_mkwrite(pmd_pte(pmd)))</div><div class='add'>+#define pmd_mk_savedwrite(pmd)	pte_pmd(pte_mk_savedwrite(pmd_pte(pmd)))</div><div class='add'>+#define pmd_clear_savedwrite(pmd)	pte_pmd(pte_clear_savedwrite(pmd_pte(pmd)))</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY</div><div class='ctx'> #define pmd_soft_dirty(pmd)    pte_soft_dirty(pmd_pte(pmd))</div><div class='hunk'>@@ -864,6 +926,7 @@ static inline int pmd_protnone(pmd_t pmd)</div><div class='ctx'> </div><div class='ctx'> #define __HAVE_ARCH_PMD_WRITE</div><div class='ctx'> #define pmd_write(pmd)		pte_write(pmd_pte(pmd))</div><div class='add'>+#define pmd_savedwrite(pmd)	pte_savedwrite(pmd_pte(pmd))</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='ctx'> extern pmd_t pfn_pmd(unsigned long pfn, pgprot_t pgprot);</div><div class='hunk'>@@ -1009,7 +1072,8 @@ static inline void pmdp_huge_split_prepare(struct vm_area_struct *vma,</div><div class='ctx'> #define pmd_move_must_withdraw pmd_move_must_withdraw</div><div class='ctx'> struct spinlock;</div><div class='ctx'> static inline int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,</div><div class='del'>-					 struct spinlock *old_pmd_ptl)</div><div class='add'>+					 struct spinlock *old_pmd_ptl,</div><div class='add'>+					 struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	if (radix_enabled())</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -1020,6 +1084,16 @@ static inline int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,</div><div class='ctx'> 	 */</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define arch_needs_pgtable_deposit arch_needs_pgtable_deposit</div><div class='add'>+static inline bool arch_needs_pgtable_deposit(void)</div><div class='add'>+{</div><div class='add'>+	if (radix_enabled())</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ */</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/radix.h b/arch/powerpc/include/asm/book3s/64/radix.h<br/>index 2a46dea8e1b1..9e0bb7cd6e22 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/radix.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/64/radix.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/radix.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/radix.h</a></div><div class='hunk'>@@ -139,35 +139,50 @@ static inline unsigned long radix__pte_update(struct mm_struct *mm,</div><div class='ctx'> </div><div class='ctx'> 		unsigned long new_pte;</div><div class='ctx'> </div><div class='del'>-		old_pte = __radix_pte_update(ptep, ~0, 0);</div><div class='del'>-		asm volatile("ptesync" : : : "memory");</div><div class='add'>+		old_pte = __radix_pte_update(ptep, ~0ul, 0);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * new value of pte</div><div class='ctx'> 		 */</div><div class='ctx'> 		new_pte = (old_pte | set) &amp; ~clr;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * For now let's do heavy pid flush</div><div class='del'>-		 * radix__flush_tlb_page_psize(mm, addr, mmu_virtual_psize);</div><div class='del'>-		 */</div><div class='del'>-		radix__flush_tlb_mm(mm);</div><div class='del'>-</div><div class='del'>-		__radix_pte_update(ptep, 0, new_pte);</div><div class='add'>+		radix__flush_tlb_pte_p9_dd1(old_pte, mm, addr);</div><div class='add'>+		if (new_pte)</div><div class='add'>+			__radix_pte_update(ptep, 0, new_pte);</div><div class='ctx'> 	} else</div><div class='ctx'> 		old_pte = __radix_pte_update(ptep, clr, set);</div><div class='del'>-	asm volatile("ptesync" : : : "memory");</div><div class='ctx'> 	if (!huge)</div><div class='ctx'> 		assert_pte_locked(mm, addr);</div><div class='ctx'> </div><div class='ctx'> 	return old_pte;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline pte_t radix__ptep_get_and_clear_full(struct mm_struct *mm,</div><div class='add'>+						   unsigned long addr,</div><div class='add'>+						   pte_t *ptep, int full)</div><div class='add'>+{</div><div class='add'>+	unsigned long old_pte;</div><div class='add'>+</div><div class='add'>+	if (full) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we are trying to clear the pte, we can skip</div><div class='add'>+		 * the DD1 pte update sequence and batch the tlb flush. The</div><div class='add'>+		 * tlb flush batching is done by mmu gather code. We</div><div class='add'>+		 * still keep the cmp_xchg update to make sure we get</div><div class='add'>+		 * correct R/C bit which might be updated via Nest MMU.</div><div class='add'>+		 */</div><div class='add'>+		old_pte = __radix_pte_update(ptep, ~0ul, 0);</div><div class='add'>+	} else</div><div class='add'>+		old_pte = radix__pte_update(mm, addr, ptep, ~0ul, 0, 0);</div><div class='add'>+</div><div class='add'>+	return __pte(old_pte);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Set the dirty and/or accessed bits atomically in a linux PTE, this</div><div class='ctx'>  * function doesn't need to invalidate tlb.</div><div class='ctx'>  */</div><div class='ctx'> static inline void radix__ptep_set_access_flags(struct mm_struct *mm,</div><div class='del'>-						pte_t *ptep, pte_t entry)</div><div class='add'>+						pte_t *ptep, pte_t entry,</div><div class='add'>+						unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	unsigned long set = pte_val(entry) &amp; (_PAGE_DIRTY | _PAGE_ACCESSED |</div><div class='hunk'>@@ -178,18 +193,11 @@ static inline void radix__ptep_set_access_flags(struct mm_struct *mm,</div><div class='ctx'> 		unsigned long old_pte, new_pte;</div><div class='ctx'> </div><div class='ctx'> 		old_pte = __radix_pte_update(ptep, ~0, 0);</div><div class='del'>-		asm volatile("ptesync" : : : "memory");</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * new value of pte</div><div class='ctx'> 		 */</div><div class='ctx'> 		new_pte = old_pte | set;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * For now let's do heavy pid flush</div><div class='del'>-		 * radix__flush_tlb_page_psize(mm, addr, mmu_virtual_psize);</div><div class='del'>-		 */</div><div class='del'>-		radix__flush_tlb_mm(mm);</div><div class='del'>-</div><div class='add'>+		radix__flush_tlb_pte_p9_dd1(old_pte, mm, address);</div><div class='ctx'> 		__radix_pte_update(ptep, 0, new_pte);</div><div class='ctx'> 	} else</div><div class='ctx'> 		__radix_pte_update(ptep, 0, set);</div><div class='hunk'>@@ -243,6 +251,8 @@ static inline int radix__pmd_trans_huge(pmd_t pmd)</div><div class='ctx'> </div><div class='ctx'> static inline pmd_t radix__pmd_mkhuge(pmd_t pmd)</div><div class='ctx'> {</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='add'>+		return __pmd(pmd_val(pmd) | _PAGE_PTE | _PAGE_LARGE);</div><div class='ctx'> 	return __pmd(pmd_val(pmd) | _PAGE_PTE);</div><div class='ctx'> }</div><div class='ctx'> static inline void radix__pmdp_huge_split_prepare(struct vm_area_struct *vma,</div><div class='hunk'>@@ -293,5 +303,10 @@ static inline unsigned long radix__get_tree_size(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	return rts_field;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEMORY_HOTPLUG</div><div class='add'>+int radix__create_section_mapping(unsigned long start, unsigned long end);</div><div class='add'>+int radix__remove_section_mapping(unsigned long start, unsigned long end);</div><div class='add'>+#endif /* CONFIG_MEMORY_HOTPLUG */</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h b/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h<br/>index a9e19cb2f7c5..cc7fbde4f53c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/book3s/64/tlbflush-radix.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/book3s/64/tlbflush-radix.h</a></div><div class='hunk'>@@ -42,4 +42,6 @@ extern void radix__flush_tlb_lpid_va(unsigned long lpid, unsigned long gpa,</div><div class='ctx'> 				     unsigned long page_size);</div><div class='ctx'> extern void radix__flush_tlb_lpid(unsigned long lpid);</div><div class='ctx'> extern void radix__flush_tlb_all(void);</div><div class='add'>+extern void radix__flush_tlb_pte_p9_dd1(unsigned long old_pte, struct mm_struct *mm,</div><div class='add'>+					unsigned long address);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h<br/>index ffbafbf76b19..5a90292afbad 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/cache.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/cache.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/cache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/cache.h</a></div><div class='hunk'>@@ -20,22 +20,32 @@</div><div class='ctx'> #endif</div><div class='ctx'> #else /* CONFIG_PPC64 */</div><div class='ctx'> #define L1_CACHE_SHIFT		7</div><div class='add'>+#define IFETCH_ALIGN_SHIFT	4 /* POWER8,9 */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define	L1_CACHE_BYTES		(1 &lt;&lt; L1_CACHE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define	SMP_CACHE_BYTES		L1_CACHE_BYTES</div><div class='ctx'> </div><div class='add'>+#define IFETCH_ALIGN_BYTES	(1 &lt;&lt; IFETCH_ALIGN_SHIFT)</div><div class='add'>+</div><div class='ctx'> #if defined(__powerpc64__) &amp;&amp; !defined(__ASSEMBLY__)</div><div class='add'>+</div><div class='add'>+struct ppc_cache_info {</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 line_size;</div><div class='add'>+	u32 block_size;	/* L1 only */</div><div class='add'>+	u32 log_block_size;</div><div class='add'>+	u32 blocks_per_page;</div><div class='add'>+	u32 sets;</div><div class='add'>+	u32 assoc;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ppc64_caches {</div><div class='del'>-	u32	dsize;			/* L1 d-cache size */</div><div class='del'>-	u32	dline_size;		/* L1 d-cache line size	*/</div><div class='del'>-	u32	log_dline_size;</div><div class='del'>-	u32	dlines_per_page;</div><div class='del'>-	u32	isize;			/* L1 i-cache size */</div><div class='del'>-	u32	iline_size;		/* L1 i-cache line size	*/</div><div class='del'>-	u32	log_iline_size;</div><div class='del'>-	u32	ilines_per_page;</div><div class='add'>+	struct ppc_cache_info l1d;</div><div class='add'>+	struct ppc_cache_info l1i;</div><div class='add'>+	struct ppc_cache_info l2;</div><div class='add'>+	struct ppc_cache_info l3;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct ppc64_caches ppc64_caches;</div><div class='head'>diff --git a/arch/powerpc/include/asm/checksum.h b/arch/powerpc/include/asm/checksum.h<br/>index 1e8fceb308a5..4e63787dc3be 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/checksum.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/checksum.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/checksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/checksum.h</a></div><div class='hunk'>@@ -53,17 +53,29 @@ static inline __sum16 csum_fold(__wsum sum)</div><div class='ctx'> 	return (__force __sum16)(~((__force u32)sum + tmp) &gt;&gt; 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u32 from64to32(u64 x)</div><div class='add'>+{</div><div class='add'>+	/* add up 32-bit and 32-bit for 32+c bit */</div><div class='add'>+	x = (x &amp; 0xffffffff) + (x &gt;&gt; 32);</div><div class='add'>+	/* add up carry.. */</div><div class='add'>+	x = (x &amp; 0xffffffff) + (x &gt;&gt; 32);</div><div class='add'>+	return (u32)x;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,</div><div class='ctx'> 					__u8 proto, __wsum sum)</div><div class='ctx'> {</div><div class='ctx'> #ifdef __powerpc64__</div><div class='del'>-	unsigned long s = (__force u32)sum;</div><div class='add'>+	u64 s = (__force u32)sum;</div><div class='ctx'> </div><div class='ctx'> 	s += (__force u32)saddr;</div><div class='ctx'> 	s += (__force u32)daddr;</div><div class='add'>+#ifdef __BIG_ENDIAN__</div><div class='ctx'> 	s += proto + len;</div><div class='del'>-	s += (s &gt;&gt; 32);</div><div class='del'>-	return (__force __wsum) s;</div><div class='add'>+#else</div><div class='add'>+	s += (proto + len) &lt;&lt; 8;</div><div class='add'>+#endif</div><div class='add'>+	return (__force __wsum) from64to32(s);</div><div class='ctx'> #else</div><div class='ctx'>     __asm__("\n\</div><div class='ctx'> 	addc %0,%0,%1 \n\</div><div class='hunk'>@@ -123,8 +135,7 @@ static inline __wsum ip_fast_csum_nofold(const void *iph, unsigned int ihl)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ihl - 1; i++, ptr++)</div><div class='ctx'> 		s += *ptr;</div><div class='del'>-	s += (s &gt;&gt; 32);</div><div class='del'>-	return (__force __wsum)s;</div><div class='add'>+	return (__force __wsum)from64to32(s);</div><div class='ctx'> #else</div><div class='ctx'> 	__wsum sum, tmp;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/cmpxchg.h b/arch/powerpc/include/asm/cmpxchg.h<br/>index 44efe739b6b9..fc46b664c49e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/cmpxchg.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/cmpxchg.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/cmpxchg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/cmpxchg.h</a></div><div class='hunk'>@@ -7,6 +7,71 @@</div><div class='ctx'> #include &lt;asm/asm-compat.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='add'>+#define BITOFF_CAL(size, off)	((sizeof(u32) - size - off) * BITS_PER_BYTE)</div><div class='add'>+#else</div><div class='add'>+#define BITOFF_CAL(size, off)	(off * BITS_PER_BYTE)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define XCHG_GEN(type, sfx, cl)				\</div><div class='add'>+static inline u32 __xchg_##type##sfx(volatile void *p, u32 val)	\</div><div class='add'>+{								\</div><div class='add'>+	unsigned int prev, prev_mask, tmp, bitoff, off;		\</div><div class='add'>+								\</div><div class='add'>+	off = (unsigned long)p % sizeof(u32);			\</div><div class='add'>+	bitoff = BITOFF_CAL(sizeof(type), off);			\</div><div class='add'>+	p -= off;						\</div><div class='add'>+	val &lt;&lt;= bitoff;						\</div><div class='add'>+	prev_mask = (u32)(type)-1 &lt;&lt; bitoff;			\</div><div class='add'>+								\</div><div class='add'>+	__asm__ __volatile__(					\</div><div class='add'>+"1:	lwarx   %0,0,%3\n"					\</div><div class='add'>+"	andc	%1,%0,%5\n"					\</div><div class='add'>+"	or	%1,%1,%4\n"					\</div><div class='add'>+	PPC405_ERR77(0,%3)					\</div><div class='add'>+"	stwcx.	%1,0,%3\n"					\</div><div class='add'>+"	bne-	1b\n"						\</div><div class='add'>+	: "=&amp;r" (prev), "=&amp;r" (tmp), "+m" (*(u32*)p)		\</div><div class='add'>+	: "r" (p), "r" (val), "r" (prev_mask)			\</div><div class='add'>+	: "cc", cl);						\</div><div class='add'>+								\</div><div class='add'>+	return prev &gt;&gt; bitoff;					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMPXCHG_GEN(type, sfx, br, br2, cl)			\</div><div class='add'>+static inline							\</div><div class='add'>+u32 __cmpxchg_##type##sfx(volatile void *p, u32 old, u32 new)	\</div><div class='add'>+{								\</div><div class='add'>+	unsigned int prev, prev_mask, tmp, bitoff, off;		\</div><div class='add'>+								\</div><div class='add'>+	off = (unsigned long)p % sizeof(u32);			\</div><div class='add'>+	bitoff = BITOFF_CAL(sizeof(type), off);			\</div><div class='add'>+	p -= off;						\</div><div class='add'>+	old &lt;&lt;= bitoff;						\</div><div class='add'>+	new &lt;&lt;= bitoff;						\</div><div class='add'>+	prev_mask = (u32)(type)-1 &lt;&lt; bitoff;			\</div><div class='add'>+								\</div><div class='add'>+	__asm__ __volatile__(					\</div><div class='add'>+	br							\</div><div class='add'>+"1:	lwarx   %0,0,%3\n"					\</div><div class='add'>+"	and	%1,%0,%6\n"					\</div><div class='add'>+"	cmpw	0,%1,%4\n"					\</div><div class='add'>+"	bne-	2f\n"						\</div><div class='add'>+"	andc	%1,%0,%6\n"					\</div><div class='add'>+"	or	%1,%1,%5\n"					\</div><div class='add'>+	PPC405_ERR77(0,%3)					\</div><div class='add'>+"	stwcx.  %1,0,%3\n"					\</div><div class='add'>+"	bne-    1b\n"						\</div><div class='add'>+	br2							\</div><div class='add'>+	"\n"							\</div><div class='add'>+"2:"								\</div><div class='add'>+	: "=&amp;r" (prev), "=&amp;r" (tmp), "+m" (*(u32*)p)		\</div><div class='add'>+	: "r" (p), "r" (old), "r" (new), "r" (prev_mask)	\</div><div class='add'>+	: "cc", cl);						\</div><div class='add'>+								\</div><div class='add'>+	return prev &gt;&gt; bitoff;					\</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Atomic exchange</div><div class='ctx'>  *</div><div class='hunk'>@@ -14,6 +79,11 @@</div><div class='ctx'>  * the previous value stored there.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+XCHG_GEN(u8, _local, "memory");</div><div class='add'>+XCHG_GEN(u8, _relaxed, "cc");</div><div class='add'>+XCHG_GEN(u16, _local, "memory");</div><div class='add'>+XCHG_GEN(u16, _relaxed, "cc");</div><div class='add'>+</div><div class='ctx'> static __always_inline unsigned long</div><div class='ctx'> __xchg_u32_local(volatile void *p, unsigned long val)</div><div class='ctx'> {</div><div class='hunk'>@@ -85,9 +155,13 @@ __xchg_u64_relaxed(u64 *p, unsigned long val)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static __always_inline unsigned long</div><div class='del'>-__xchg_local(volatile void *ptr, unsigned long x, unsigned int size)</div><div class='add'>+__xchg_local(void *ptr, unsigned long x, unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		return __xchg_u8_local(ptr, x);</div><div class='add'>+	case 2:</div><div class='add'>+		return __xchg_u16_local(ptr, x);</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		return __xchg_u32_local(ptr, x);</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='hunk'>@@ -103,6 +177,10 @@ static __always_inline unsigned long</div><div class='ctx'> __xchg_relaxed(void *ptr, unsigned long x, unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		return __xchg_u8_relaxed(ptr, x);</div><div class='add'>+	case 2:</div><div class='add'>+		return __xchg_u16_relaxed(ptr, x);</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		return __xchg_u32_relaxed(ptr, x);</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='hunk'>@@ -131,6 +209,15 @@ __xchg_relaxed(void *ptr, unsigned long x, unsigned int size)</div><div class='ctx'>  * and return the old value of *p.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+CMPXCHG_GEN(u8, , PPC_ATOMIC_ENTRY_BARRIER, PPC_ATOMIC_EXIT_BARRIER, "memory");</div><div class='add'>+CMPXCHG_GEN(u8, _local, , , "memory");</div><div class='add'>+CMPXCHG_GEN(u8, _acquire, , PPC_ACQUIRE_BARRIER, "memory");</div><div class='add'>+CMPXCHG_GEN(u8, _relaxed, , , "cc");</div><div class='add'>+CMPXCHG_GEN(u16, , PPC_ATOMIC_ENTRY_BARRIER, PPC_ATOMIC_EXIT_BARRIER, "memory");</div><div class='add'>+CMPXCHG_GEN(u16, _local, , , "memory");</div><div class='add'>+CMPXCHG_GEN(u16, _acquire, , PPC_ACQUIRE_BARRIER, "memory");</div><div class='add'>+CMPXCHG_GEN(u16, _relaxed, , , "cc");</div><div class='add'>+</div><div class='ctx'> static __always_inline unsigned long</div><div class='ctx'> __cmpxchg_u32(volatile unsigned int *p, unsigned long old, unsigned long new)</div><div class='ctx'> {</div><div class='hunk'>@@ -316,6 +403,10 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new,</div><div class='ctx'> 	  unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		return __cmpxchg_u8(ptr, old, new);</div><div class='add'>+	case 2:</div><div class='add'>+		return __cmpxchg_u16(ptr, old, new);</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		return __cmpxchg_u32(ptr, old, new);</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='hunk'>@@ -328,10 +419,14 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline unsigned long</div><div class='del'>-__cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,</div><div class='add'>+__cmpxchg_local(void *ptr, unsigned long old, unsigned long new,</div><div class='ctx'> 	  unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		return __cmpxchg_u8_local(ptr, old, new);</div><div class='add'>+	case 2:</div><div class='add'>+		return __cmpxchg_u16_local(ptr, old, new);</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		return __cmpxchg_u32_local(ptr, old, new);</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='hunk'>@@ -348,6 +443,10 @@ __cmpxchg_relaxed(void *ptr, unsigned long old, unsigned long new,</div><div class='ctx'> 		  unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		return __cmpxchg_u8_relaxed(ptr, old, new);</div><div class='add'>+	case 2:</div><div class='add'>+		return __cmpxchg_u16_relaxed(ptr, old, new);</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		return __cmpxchg_u32_relaxed(ptr, old, new);</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='hunk'>@@ -364,6 +463,10 @@ __cmpxchg_acquire(void *ptr, unsigned long old, unsigned long new,</div><div class='ctx'> 		  unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		return __cmpxchg_u8_acquire(ptr, old, new);</div><div class='add'>+	case 2:</div><div class='add'>+		return __cmpxchg_u16_acquire(ptr, old, new);</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		return __cmpxchg_u32_acquire(ptr, old, new);</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='head'>diff --git a/arch/powerpc/include/asm/code-patching.h b/arch/powerpc/include/asm/code-patching.h<br/>index 2015b072422c..8ab937771068 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/code-patching.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/code-patching.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/code-patching.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/code-patching.h</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #define BRANCH_SET_LINK	0x1</div><div class='ctx'> #define BRANCH_ABSOLUTE	0x2</div><div class='ctx'> </div><div class='add'>+bool is_offset_in_branch_range(long offset);</div><div class='ctx'> unsigned int create_branch(const unsigned int *addr,</div><div class='ctx'> 			   unsigned long target, int flags);</div><div class='ctx'> unsigned int create_cond_branch(const unsigned int *addr,</div><div class='hunk'>@@ -34,6 +35,7 @@ int instr_is_branch_to_addr(const unsigned int *instr, unsigned long addr);</div><div class='ctx'> unsigned long branch_target(const unsigned int *instr);</div><div class='ctx'> unsigned int translate_branch(const unsigned int *dest,</div><div class='ctx'> 			      const unsigned int *src);</div><div class='add'>+extern bool is_conditional_branch(unsigned int instr);</div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3E_64</div><div class='ctx'> void __patch_exception(int exc, unsigned long addr);</div><div class='ctx'> #define patch_exception(exc, name) do { \</div><div class='head'>diff --git a/arch/powerpc/include/asm/cpu_has_feature.h b/arch/powerpc/include/asm/cpu_has_feature.h<br/>index b312b152461b..6e834caa3720 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/cpu_has_feature.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/cpu_has_feature.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/cpu_has_feature.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/cpu_has_feature.h</a></div><div class='hunk'>@@ -23,7 +23,9 @@ static __always_inline bool cpu_has_feature(unsigned long feature)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+#ifndef __clang__ /* clang can't cope with this */</div><div class='ctx'> 	BUILD_BUG_ON(!__builtin_constant_p(feature));</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG</div><div class='ctx'> 	if (!static_key_initialized) {</div><div class='head'>diff --git a/arch/powerpc/include/asm/cpuidle.h b/arch/powerpc/include/asm/cpuidle.h<br/>index 3919332965af..fd321eb423cb 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/cpuidle.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/cpuidle.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/cpuidle.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/cpuidle.h</a></div><div class='hunk'>@@ -10,18 +10,62 @@</div><div class='ctx'> #define PNV_CORE_IDLE_LOCK_BIT          0x100</div><div class='ctx'> #define PNV_CORE_IDLE_THREAD_BITS       0x0FF</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * ============================ NOTE =================================</div><div class='add'>+ * The older firmware populates only the RL field in the psscr_val and</div><div class='add'>+ * sets the psscr_mask to 0xf. On such a firmware, the kernel sets the</div><div class='add'>+ * remaining PSSCR fields to default values as follows:</div><div class='add'>+ *</div><div class='add'>+ * - ESL and EC bits are to 1. So wakeup from any stop state will be</div><div class='add'>+ *   at vector 0x100.</div><div class='add'>+ *</div><div class='add'>+ * - MTL and PSLL are set to the maximum allowed value as per the ISA,</div><div class='add'>+ *    i.e. 15.</div><div class='add'>+ *</div><div class='add'>+ * - The Transition Rate, TR is set to the Maximum value 3.</div><div class='add'>+ */</div><div class='add'>+#define PSSCR_HV_DEFAULT_VAL    (PSSCR_ESL | PSSCR_EC |		    \</div><div class='add'>+				PSSCR_PSLL_MASK | PSSCR_TR_MASK |   \</div><div class='add'>+				PSSCR_MTL_MASK)</div><div class='add'>+</div><div class='add'>+#define PSSCR_HV_DEFAULT_MASK   (PSSCR_ESL | PSSCR_EC |		    \</div><div class='add'>+				PSSCR_PSLL_MASK | PSSCR_TR_MASK |   \</div><div class='add'>+				PSSCR_MTL_MASK | PSSCR_RL_MASK)</div><div class='add'>+#define PSSCR_EC_SHIFT    20</div><div class='add'>+#define PSSCR_ESL_SHIFT   21</div><div class='add'>+#define GET_PSSCR_EC(x)   (((x) &amp; PSSCR_EC) &gt;&gt; PSSCR_EC_SHIFT)</div><div class='add'>+#define GET_PSSCR_ESL(x)  (((x) &amp; PSSCR_ESL) &gt;&gt; PSSCR_ESL_SHIFT)</div><div class='add'>+#define GET_PSSCR_RL(x)   ((x) &amp; PSSCR_RL_MASK)</div><div class='add'>+</div><div class='add'>+#define ERR_EC_ESL_MISMATCH		-1</div><div class='add'>+#define ERR_DEEP_STATE_ESL_MISMATCH	-2</div><div class='add'>+</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> extern u32 pnv_fastsleep_workaround_at_entry[];</div><div class='ctx'> extern u32 pnv_fastsleep_workaround_at_exit[];</div><div class='ctx'> </div><div class='ctx'> extern u64 pnv_first_deep_stop_state;</div><div class='add'>+</div><div class='add'>+int validate_psscr_val_mask(u64 *psscr_val, u64 *psscr_mask, u32 flags);</div><div class='add'>+static inline void report_invalid_psscr_val(u64 psscr_val, int err)</div><div class='add'>+{</div><div class='add'>+	switch (err) {</div><div class='add'>+	case ERR_EC_ESL_MISMATCH:</div><div class='add'>+		pr_warn("Invalid psscr 0x%016llx : ESL,EC bits unequal",</div><div class='add'>+			psscr_val);</div><div class='add'>+		break;</div><div class='add'>+	case ERR_DEEP_STATE_ESL_MISMATCH:</div><div class='add'>+		pr_warn("Invalid psscr 0x%016llx : ESL cleared for deep stop-state",</div><div class='add'>+			psscr_val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Idle state entry routines */</div><div class='ctx'> #ifdef	CONFIG_PPC_P7_NAP</div><div class='del'>-#define	IDLE_STATE_ENTER_SEQ(IDLE_INST)				\</div><div class='add'>+#define IDLE_STATE_ENTER_SEQ(IDLE_INST)                         \</div><div class='ctx'> 	/* Magic NAP/SLEEP/WINKLE mode enter sequence */	\</div><div class='ctx'> 	std	r0,0(r1);					\</div><div class='ctx'> 	ptesync;						\</div><div class='hunk'>@@ -29,6 +73,9 @@ extern u64 pnv_first_deep_stop_state;</div><div class='ctx'> 1:	cmpd	cr0,r0,r0;					\</div><div class='ctx'> 	bne	1b;						\</div><div class='ctx'> 	IDLE_INST;						\</div><div class='add'>+</div><div class='add'>+#define	IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST)			\</div><div class='add'>+	IDLE_STATE_ENTER_SEQ(IDLE_INST)                         \</div><div class='ctx'> 	b	.</div><div class='ctx'> #endif /* CONFIG_PPC_P7_NAP */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/cputime.h b/arch/powerpc/include/asm/cputime.h<br/>index 4f60db074725..99b541865d8d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/cputime.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/cputime.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/cputime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/cputime.h</a></div><div class='hunk'>@@ -16,12 +16,7 @@</div><div class='ctx'> #ifndef __POWERPC_CPUTIME_H</div><div class='ctx'> #define __POWERPC_CPUTIME_H</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE</div><div class='del'>-#include &lt;asm-generic/cputime.h&gt;</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-static inline void setup_cputime_one_jiffy(void) { }</div><div class='del'>-#endif</div><div class='del'>-#else</div><div class='add'>+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -36,79 +31,6 @@ typedef u64 __nocast cputime64_t;</div><div class='ctx'> #define cmpxchg_cputime(ptr, old, new) cmpxchg(ptr, old, new)</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * One jiffy in timebase units computed during initialization</div><div class='del'>- */</div><div class='del'>-extern cputime_t cputime_one_jiffy;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert cputime &lt;-&gt; jiffies</div><div class='del'>- */</div><div class='del'>-extern u64 __cputime_jiffies_factor;</div><div class='del'>-DECLARE_PER_CPU(unsigned long, cputime_last_delta);</div><div class='del'>-DECLARE_PER_CPU(unsigned long, cputime_scaled_last_delta);</div><div class='del'>-</div><div class='del'>-static inline unsigned long cputime_to_jiffies(const cputime_t ct)</div><div class='del'>-{</div><div class='del'>-	return mulhdu((__force u64) ct, __cputime_jiffies_factor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Estimate the scaled cputime by scaling the real cputime based on</div><div class='del'>- * the last scaled to real ratio */</div><div class='del'>-static inline cputime_t cputime_to_scaled(const cputime_t ct)</div><div class='del'>-{</div><div class='del'>-	if (cpu_has_feature(CPU_FTR_SPURR) &amp;&amp;</div><div class='del'>-	    __this_cpu_read(cputime_last_delta))</div><div class='del'>-		return (__force u64) ct *</div><div class='del'>-			__this_cpu_read(cputime_scaled_last_delta) /</div><div class='del'>-			__this_cpu_read(cputime_last_delta);</div><div class='del'>-	return ct;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline cputime_t jiffies_to_cputime(const unsigned long jif)</div><div class='del'>-{</div><div class='del'>-	u64 ct;</div><div class='del'>-	unsigned long sec;</div><div class='del'>-</div><div class='del'>-	/* have to be a little careful about overflow */</div><div class='del'>-	ct = jif % HZ;</div><div class='del'>-	sec = jif / HZ;</div><div class='del'>-	if (ct) {</div><div class='del'>-		ct *= tb_ticks_per_sec;</div><div class='del'>-		do_div(ct, HZ);</div><div class='del'>-	}</div><div class='del'>-	if (sec)</div><div class='del'>-		ct += (cputime_t) sec * tb_ticks_per_sec;</div><div class='del'>-	return (__force cputime_t) ct;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void setup_cputime_one_jiffy(void)</div><div class='del'>-{</div><div class='del'>-	cputime_one_jiffy = jiffies_to_cputime(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline cputime64_t jiffies64_to_cputime64(const u64 jif)</div><div class='del'>-{</div><div class='del'>-	u64 ct;</div><div class='del'>-	u64 sec = jif;</div><div class='del'>-</div><div class='del'>-	/* have to be a little careful about overflow */</div><div class='del'>-	ct = do_div(sec, HZ);</div><div class='del'>-	if (ct) {</div><div class='del'>-		ct *= tb_ticks_per_sec;</div><div class='del'>-		do_div(ct, HZ);</div><div class='del'>-	}</div><div class='del'>-	if (sec)</div><div class='del'>-		ct += (u64) sec * tb_ticks_per_sec;</div><div class='del'>-	return (__force cputime64_t) ct;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 cputime64_to_jiffies64(const cputime_t ct)</div><div class='del'>-{</div><div class='del'>-	return mulhdu((__force u64) ct, __cputime_jiffies_factor);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Convert cputime &lt;-&gt; microseconds</div><div class='ctx'>  */</div><div class='hunk'>@@ -119,117 +41,6 @@ static inline unsigned long cputime_to_usecs(const cputime_t ct)</div><div class='ctx'> 	return mulhdu((__force u64) ct, __cputime_usec_factor);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline cputime_t usecs_to_cputime(const unsigned long us)</div><div class='del'>-{</div><div class='del'>-	u64 ct;</div><div class='del'>-	unsigned long sec;</div><div class='del'>-</div><div class='del'>-	/* have to be a little careful about overflow */</div><div class='del'>-	ct = us % 1000000;</div><div class='del'>-	sec = us / 1000000;</div><div class='del'>-	if (ct) {</div><div class='del'>-		ct *= tb_ticks_per_sec;</div><div class='del'>-		do_div(ct, 1000000);</div><div class='del'>-	}</div><div class='del'>-	if (sec)</div><div class='del'>-		ct += (cputime_t) sec * tb_ticks_per_sec;</div><div class='del'>-	return (__force cputime_t) ct;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define usecs_to_cputime64(us)		usecs_to_cputime(us)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert cputime &lt;-&gt; seconds</div><div class='del'>- */</div><div class='del'>-extern u64 __cputime_sec_factor;</div><div class='del'>-</div><div class='del'>-static inline unsigned long cputime_to_secs(const cputime_t ct)</div><div class='del'>-{</div><div class='del'>-	return mulhdu((__force u64) ct, __cputime_sec_factor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline cputime_t secs_to_cputime(const unsigned long sec)</div><div class='del'>-{</div><div class='del'>-	return (__force cputime_t)((u64) sec * tb_ticks_per_sec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert cputime &lt;-&gt; timespec</div><div class='del'>- */</div><div class='del'>-static inline void cputime_to_timespec(const cputime_t ct, struct timespec *p)</div><div class='del'>-{</div><div class='del'>-	u64 x = (__force u64) ct;</div><div class='del'>-	unsigned int frac;</div><div class='del'>-</div><div class='del'>-	frac = do_div(x, tb_ticks_per_sec);</div><div class='del'>-	p-&gt;tv_sec = x;</div><div class='del'>-	x = (u64) frac * 1000000000;</div><div class='del'>-	do_div(x, tb_ticks_per_sec);</div><div class='del'>-	p-&gt;tv_nsec = x;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline cputime_t timespec_to_cputime(const struct timespec *p)</div><div class='del'>-{</div><div class='del'>-	u64 ct;</div><div class='del'>-</div><div class='del'>-	ct = (u64) p-&gt;tv_nsec * tb_ticks_per_sec;</div><div class='del'>-	do_div(ct, 1000000000);</div><div class='del'>-	return (__force cputime_t)(ct + (u64) p-&gt;tv_sec * tb_ticks_per_sec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert cputime &lt;-&gt; timeval</div><div class='del'>- */</div><div class='del'>-static inline void cputime_to_timeval(const cputime_t ct, struct timeval *p)</div><div class='del'>-{</div><div class='del'>-	u64 x = (__force u64) ct;</div><div class='del'>-	unsigned int frac;</div><div class='del'>-</div><div class='del'>-	frac = do_div(x, tb_ticks_per_sec);</div><div class='del'>-	p-&gt;tv_sec = x;</div><div class='del'>-	x = (u64) frac * 1000000;</div><div class='del'>-	do_div(x, tb_ticks_per_sec);</div><div class='del'>-	p-&gt;tv_usec = x;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline cputime_t timeval_to_cputime(const struct timeval *p)</div><div class='del'>-{</div><div class='del'>-	u64 ct;</div><div class='del'>-</div><div class='del'>-	ct = (u64) p-&gt;tv_usec * tb_ticks_per_sec;</div><div class='del'>-	do_div(ct, 1000000);</div><div class='del'>-	return (__force cputime_t)(ct + (u64) p-&gt;tv_sec * tb_ticks_per_sec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert cputime &lt;-&gt; clock_t (units of 1/USER_HZ seconds)</div><div class='del'>- */</div><div class='del'>-extern u64 __cputime_clockt_factor;</div><div class='del'>-</div><div class='del'>-static inline unsigned long cputime_to_clock_t(const cputime_t ct)</div><div class='del'>-{</div><div class='del'>-	return mulhdu((__force u64) ct, __cputime_clockt_factor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline cputime_t clock_t_to_cputime(const unsigned long clk)</div><div class='del'>-{</div><div class='del'>-	u64 ct;</div><div class='del'>-	unsigned long sec;</div><div class='del'>-</div><div class='del'>-	/* have to be a little careful about overflow */</div><div class='del'>-	ct = clk % USER_HZ;</div><div class='del'>-	sec = clk / USER_HZ;</div><div class='del'>-	if (ct) {</div><div class='del'>-		ct *= tb_ticks_per_sec;</div><div class='del'>-		do_div(ct, USER_HZ);</div><div class='del'>-	}</div><div class='del'>-	if (sec)</div><div class='del'>-		ct += (u64) sec * tb_ticks_per_sec;</div><div class='del'>-	return (__force cputime_t) ct;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define cputime64_to_clock_t(ct)	cputime_to_clock_t((cputime_t)(ct))</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * PPC64 uses PACA which is task independent for storing accounting data while</div><div class='ctx'>  * PPC32 uses struct thread_info, therefore at task switch the accounting data</div><div class='head'>diff --git a/arch/powerpc/include/asm/debug.h b/arch/powerpc/include/asm/debug.h<br/>index a954e4975049..86308f177f2d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/debug.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/debug.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/debug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/debug.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@ struct pt_regs;</div><div class='ctx'> </div><div class='ctx'> extern struct dentry *powerpc_debugfs_root;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)</div><div class='add'>+#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE)</div><div class='ctx'> </div><div class='ctx'> extern int (*__debugger)(struct pt_regs *regs);</div><div class='ctx'> extern int (*__debugger_ipi)(struct pt_regs *regs);</div><div class='head'>diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h<br/>index 406c2b1ff82d..0245bfcaac32 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/device.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/device.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/device.h</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> #ifndef _ASM_POWERPC_DEVICE_H</div><div class='ctx'> #define _ASM_POWERPC_DEVICE_H</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops;</div><div class='ctx'> struct device_node;</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> struct pci_dn;</div><div class='hunk'>@@ -20,9 +19,6 @@ struct iommu_table;</div><div class='ctx'>  * drivers/macintosh/macio_asic.c</div><div class='ctx'>  */</div><div class='ctx'> struct dev_archdata {</div><div class='del'>-	/* DMA operations on that device */</div><div class='del'>-	struct dma_map_ops	*dma_ops;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * These two used to be a union. However, with the hybrid ops we need</div><div class='ctx'> 	 * both so here we store both a DMA offset for direct mappings and</div><div class='head'>diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h<br/>index 84e3f8dd5e4f..181a095468e4 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -76,24 +76,16 @@ static inline unsigned long device_to_mask(struct device *dev)</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> extern struct dma_map_ops dma_iommu_ops;</div><div class='ctx'> #endif</div><div class='del'>-extern struct dma_map_ops dma_direct_ops;</div><div class='add'>+extern const struct dma_map_ops dma_direct_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't handle the NULL dev case for ISA for now. We could</div><div class='ctx'> 	 * do it via an out of line call but it is not needed for now. The</div><div class='ctx'> 	 * only ISA DMA device we support is the floppy and we have a hack</div><div class='ctx'> 	 * in the floppy driver directly to get a device for us.</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(dev == NULL))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return dev-&gt;archdata.dma_ops;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;archdata.dma_ops = ops;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h<br/>index ee46ffef608e..93b9b84568e8 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/elf.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/elf.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/elf.h</a></div><div class='hunk'>@@ -136,4 +136,46 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_SPU_BASE */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='add'>+</div><div class='add'>+#define get_cache_geometry(level) \</div><div class='add'>+	(ppc64_caches.level.assoc &lt;&lt; 16 | ppc64_caches.level.line_size)</div><div class='add'>+</div><div class='add'>+#define ARCH_DLINFO_CACHE_GEOMETRY					\</div><div class='add'>+	NEW_AUX_ENT(AT_L1I_CACHESIZE, ppc64_caches.l1i.size);		\</div><div class='add'>+	NEW_AUX_ENT(AT_L1I_CACHEGEOMETRY, get_cache_geometry(l1i));	\</div><div class='add'>+	NEW_AUX_ENT(AT_L1D_CACHESIZE, ppc64_caches.l1i.size);		\</div><div class='add'>+	NEW_AUX_ENT(AT_L1D_CACHEGEOMETRY, get_cache_geometry(l1i));	\</div><div class='add'>+	NEW_AUX_ENT(AT_L2_CACHESIZE, ppc64_caches.l2.size);		\</div><div class='add'>+	NEW_AUX_ENT(AT_L2_CACHEGEOMETRY, get_cache_geometry(l2));	\</div><div class='add'>+	NEW_AUX_ENT(AT_L3_CACHESIZE, ppc64_caches.l3.size);		\</div><div class='add'>+	NEW_AUX_ENT(AT_L3_CACHEGEOMETRY, get_cache_geometry(l3))</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define ARCH_DLINFO_CACHE_GEOMETRY</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The requirements here are:</div><div class='add'>+ * - keep the final alignment of sp (sp &amp; 0xf)</div><div class='add'>+ * - make sure the 32-bit value at the first 16 byte aligned position of</div><div class='add'>+ *   AUXV is greater than 16 for glibc compatibility.</div><div class='add'>+ *   AT_IGNOREPPC is used for that.</div><div class='add'>+ * - for compatibility with glibc ARCH_DLINFO must always be defined on PPC,</div><div class='add'>+ *   even if DLINFO_ARCH_ITEMS goes to zero or is undefined.</div><div class='add'>+ * update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes</div><div class='add'>+ */</div><div class='add'>+#define ARCH_DLINFO							\</div><div class='add'>+do {									\</div><div class='add'>+	/* Handle glibc compatibility. */				\</div><div class='add'>+	NEW_AUX_ENT(AT_IGNOREPPC, AT_IGNOREPPC);			\</div><div class='add'>+	NEW_AUX_ENT(AT_IGNOREPPC, AT_IGNOREPPC);			\</div><div class='add'>+	/* Cache size items */						\</div><div class='add'>+	NEW_AUX_ENT(AT_DCACHEBSIZE, dcache_bsize);			\</div><div class='add'>+	NEW_AUX_ENT(AT_ICACHEBSIZE, icache_bsize);			\</div><div class='add'>+	NEW_AUX_ENT(AT_UCACHEBSIZE, ucache_bsize);			\</div><div class='add'>+	VDSO_AUX_ENT(AT_SYSINFO_EHDR, current-&gt;mm-&gt;context.vdso_base);	\</div><div class='add'>+	ARCH_DLINFO_CACHE_GEOMETRY;					\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_POWERPC_ELF_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h<br/>index 9a3eee661297..14752eee3d0c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/exception-64s.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/exception-64s.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/exception-64s.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/exception-64s.h</a></div><div class='hunk'>@@ -97,6 +97,15 @@</div><div class='ctx'> 	ld	reg,PACAKBASE(r13);					\</div><div class='ctx'> 	ori	reg,reg,(ABS_ADDR(label))@l;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Branches from unrelocated code (e.g., interrupts) to labels outside</div><div class='add'>+ * head-y require &gt;64K offsets.</div><div class='add'>+ */</div><div class='add'>+#define __LOAD_FAR_HANDLER(reg, label)					\</div><div class='add'>+	ld	reg,PACAKBASE(r13);					\</div><div class='add'>+	ori	reg,reg,(ABS_ADDR(label))@l;				\</div><div class='add'>+	addis	reg,reg,(ABS_ADDR(label))@h;</div><div class='add'>+</div><div class='ctx'> /* Exception register prefixes */</div><div class='ctx'> #define EXC_HV	H</div><div class='ctx'> #define EXC_STD</div><div class='hunk'>@@ -227,13 +236,49 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)</div><div class='ctx'> 	mtctr	reg;							\</div><div class='ctx'> 	bctr</div><div class='ctx'> </div><div class='add'>+#define BRANCH_LINK_TO_FAR(reg, label)					\</div><div class='add'>+	__LOAD_FAR_HANDLER(reg, label);					\</div><div class='add'>+	mtctr	reg;							\</div><div class='add'>+	bctrl</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * KVM requires __LOAD_FAR_HANDLER.</div><div class='add'>+ *</div><div class='add'>+ * __BRANCH_TO_KVM_EXIT branches are also a special case because they</div><div class='add'>+ * explicitly use r9 then reload it from PACA before branching. Hence</div><div class='add'>+ * the double-underscore.</div><div class='add'>+ */</div><div class='add'>+#define __BRANCH_TO_KVM_EXIT(area, label)				\</div><div class='add'>+	mfctr	r9;							\</div><div class='add'>+	std	r9,HSTATE_SCRATCH1(r13);				\</div><div class='add'>+	__LOAD_FAR_HANDLER(r9, label);					\</div><div class='add'>+	mtctr	r9;							\</div><div class='add'>+	ld	r9,area+EX_R9(r13);					\</div><div class='add'>+	bctr</div><div class='add'>+</div><div class='add'>+#define BRANCH_TO_KVM(reg, label)					\</div><div class='add'>+	__LOAD_FAR_HANDLER(reg, label);					\</div><div class='add'>+	mtctr	reg;							\</div><div class='add'>+	bctr</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> #define BRANCH_TO_COMMON(reg, label)					\</div><div class='ctx'> 	b	label</div><div class='ctx'> </div><div class='add'>+#define BRANCH_LINK_TO_FAR(reg, label)					\</div><div class='add'>+	bl	label</div><div class='add'>+</div><div class='add'>+#define BRANCH_TO_KVM(reg, label)					\</div><div class='add'>+	b	label</div><div class='add'>+</div><div class='add'>+#define __BRANCH_TO_KVM_EXIT(area, label)				\</div><div class='add'>+	ld	r9,area+EX_R9(r13);					\</div><div class='add'>+	b	label</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define __KVM_HANDLER_PROLOG(area, n)					\</div><div class='add'>+</div><div class='add'>+#define __KVM_HANDLER(area, h, n)					\</div><div class='ctx'> 	BEGIN_FTR_SECTION_NESTED(947)					\</div><div class='ctx'> 	ld	r10,area+EX_CFAR(r13);					\</div><div class='ctx'> 	std	r10,HSTATE_CFAR(r13);					\</div><div class='hunk'>@@ -243,30 +288,28 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)</div><div class='ctx'> 	std	r10,HSTATE_PPR(r13);					\</div><div class='ctx'> 	END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948);	\</div><div class='ctx'> 	ld	r10,area+EX_R10(r13);					\</div><div class='del'>-	stw	r9,HSTATE_SCRATCH1(r13);				\</div><div class='del'>-	ld	r9,area+EX_R9(r13);					\</div><div class='ctx'> 	std	r12,HSTATE_SCRATCH0(r13);				\</div><div class='del'>-</div><div class='del'>-#define __KVM_HANDLER(area, h, n)					\</div><div class='del'>-	__KVM_HANDLER_PROLOG(area, n)					\</div><div class='del'>-	li	r12,n;							\</div><div class='del'>-	b	kvmppc_interrupt</div><div class='add'>+	sldi	r12,r9,32;						\</div><div class='add'>+	ori	r12,r12,(n);						\</div><div class='add'>+	/* This reloads r9 before branching to kvmppc_interrupt */	\</div><div class='add'>+	__BRANCH_TO_KVM_EXIT(area, kvmppc_interrupt)</div><div class='ctx'> </div><div class='ctx'> #define __KVM_HANDLER_SKIP(area, h, n)					\</div><div class='ctx'> 	cmpwi	r10,KVM_GUEST_MODE_SKIP;				\</div><div class='del'>-	ld	r10,area+EX_R10(r13);					\</div><div class='ctx'> 	beq	89f;							\</div><div class='del'>-	stw	r9,HSTATE_SCRATCH1(r13);				\</div><div class='ctx'> 	BEGIN_FTR_SECTION_NESTED(948)					\</div><div class='del'>-	ld	r9,area+EX_PPR(r13);					\</div><div class='del'>-	std	r9,HSTATE_PPR(r13);					\</div><div class='add'>+	ld	r10,area+EX_PPR(r13);					\</div><div class='add'>+	std	r10,HSTATE_PPR(r13);					\</div><div class='ctx'> 	END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948);	\</div><div class='del'>-	ld	r9,area+EX_R9(r13);					\</div><div class='add'>+	ld	r10,area+EX_R10(r13);					\</div><div class='ctx'> 	std	r12,HSTATE_SCRATCH0(r13);				\</div><div class='del'>-	li	r12,n;							\</div><div class='del'>-	b	kvmppc_interrupt;					\</div><div class='add'>+	sldi	r12,r9,32;						\</div><div class='add'>+	ori	r12,r12,(n);						\</div><div class='add'>+	/* This reloads r9 before branching to kvmppc_interrupt */	\</div><div class='add'>+	__BRANCH_TO_KVM_EXIT(area, kvmppc_interrupt);			\</div><div class='ctx'> 89:	mtocrf	0x80,r9;						\</div><div class='ctx'> 	ld	r9,area+EX_R9(r13);					\</div><div class='add'>+	ld	r10,area+EX_R10(r13);					\</div><div class='ctx'> 	b	kvmppc_skip_##h##interrupt</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_64_HANDLER</div><div class='hunk'>@@ -393,12 +436,12 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)</div><div class='ctx'> 	EXCEPTION_RELON_PROLOG_PSERIES_1(label, EXC_STD)</div><div class='ctx'> </div><div class='ctx'> #define STD_RELON_EXCEPTION_HV(loc, vec, label)		\</div><div class='del'>-	/* No guest interrupts come through here */	\</div><div class='ctx'> 	SET_SCRATCH0(r13);	/* save r13 */		\</div><div class='del'>-	EXCEPTION_RELON_PROLOG_PSERIES(PACA_EXGEN, label, EXC_HV, NOTEST, vec);</div><div class='add'>+	EXCEPTION_RELON_PROLOG_PSERIES(PACA_EXGEN, label,	\</div><div class='add'>+				       EXC_HV, KVMTEST_HV, vec);</div><div class='ctx'> </div><div class='ctx'> #define STD_RELON_EXCEPTION_HV_OOL(vec, label)			\</div><div class='del'>-	EXCEPTION_PROLOG_1(PACA_EXGEN, NOTEST, vec);		\</div><div class='add'>+	EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST_HV, vec);	\</div><div class='ctx'> 	EXCEPTION_RELON_PROLOG_PSERIES_1(label, EXC_HV)</div><div class='ctx'> </div><div class='ctx'> /* This associate vector numbers with bits in paca-&gt;irq_happened */</div><div class='hunk'>@@ -475,10 +518,10 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)</div><div class='ctx'> </div><div class='ctx'> #define MASKABLE_RELON_EXCEPTION_HV(loc, vec, label)			\</div><div class='ctx'> 	_MASKABLE_RELON_EXCEPTION_PSERIES(vec, label,			\</div><div class='del'>-					  EXC_HV, SOFTEN_NOTEST_HV)</div><div class='add'>+					  EXC_HV, SOFTEN_TEST_HV)</div><div class='ctx'> </div><div class='ctx'> #define MASKABLE_RELON_EXCEPTION_HV_OOL(vec, label)			\</div><div class='del'>-	EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_NOTEST_HV, vec);		\</div><div class='add'>+	EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_HV, vec);		\</div><div class='ctx'> 	EXCEPTION_PROLOG_PSERIES_1(label, EXC_HV)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/powerpc/include/asm/firmware.h b/arch/powerpc/include/asm/firmware.h<br/>index 1e0b5a5d660a..8645897472b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/firmware.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/firmware.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/firmware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/firmware.h</a></div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> #define FW_FEATURE_SPLPAR	ASM_CONST(0x0000000000100000)</div><div class='ctx'> #define FW_FEATURE_LPAR		ASM_CONST(0x0000000000400000)</div><div class='ctx'> #define FW_FEATURE_PS3_LV1	ASM_CONST(0x0000000000800000)</div><div class='del'>-/* Free				ASM_CONST(0x0000000001000000) */</div><div class='add'>+#define FW_FEATURE_HPT_RESIZE	ASM_CONST(0x0000000001000000)</div><div class='ctx'> #define FW_FEATURE_CMO		ASM_CONST(0x0000000002000000)</div><div class='ctx'> #define FW_FEATURE_VPHN		ASM_CONST(0x0000000004000000)</div><div class='ctx'> #define FW_FEATURE_XCMO		ASM_CONST(0x0000000008000000)</div><div class='hunk'>@@ -66,7 +66,8 @@ enum {</div><div class='ctx'> 		FW_FEATURE_MULTITCE | FW_FEATURE_SPLPAR | FW_FEATURE_LPAR |</div><div class='ctx'> 		FW_FEATURE_CMO | FW_FEATURE_VPHN | FW_FEATURE_XCMO |</div><div class='ctx'> 		FW_FEATURE_SET_MODE | FW_FEATURE_BEST_ENERGY |</div><div class='del'>-		FW_FEATURE_TYPE1_AFFINITY | FW_FEATURE_PRRN,</div><div class='add'>+		FW_FEATURE_TYPE1_AFFINITY | FW_FEATURE_PRRN |</div><div class='add'>+		FW_FEATURE_HPT_RESIZE,</div><div class='ctx'> 	FW_FEATURE_PSERIES_ALWAYS = 0,</div><div class='ctx'> 	FW_FEATURE_POWERNV_POSSIBLE = FW_FEATURE_OPAL,</div><div class='ctx'> 	FW_FEATURE_POWERNV_ALWAYS = 0,</div><div class='head'>diff --git a/arch/powerpc/include/asm/fsl_hcalls.h b/arch/powerpc/include/asm/fsl_hcalls.h<br/>index 3abb58394da4..b889d13547fd 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/fsl_hcalls.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/fsl_hcalls.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/fsl_hcalls.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/fsl_hcalls.h</a></div><div class='hunk'>@@ -109,7 +109,7 @@ static inline unsigned int fh_send_nmi(unsigned int vcpu_mask)</div><div class='ctx'> #define FH_DTPROP_MAX_PROPLEN 32768</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fh_partiton_get_dtprop - get a property from a guest device tree.</div><div class='add'>+ * fh_partition_get_dtprop - get a property from a guest device tree.</div><div class='ctx'>  * @handle: handle of partition whose device tree is to be accessed</div><div class='ctx'>  * @dtpath_addr: physical address of device tree path to access</div><div class='ctx'>  * @propname_addr: physical address of name of property</div><div class='head'>diff --git a/arch/powerpc/include/asm/futex.h b/arch/powerpc/include/asm/futex.h<br/>index 2a9cf845473b..eaada6c92344 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/futex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/futex.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/futex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/futex.h</a></div><div class='hunk'>@@ -23,10 +23,8 @@</div><div class='ctx'> "4:	li	%1,%3\n" \</div><div class='ctx'> 	"b	3b\n" \</div><div class='ctx'> 	".previous\n" \</div><div class='del'>-	".section __ex_table,\"a\"\n" \</div><div class='del'>-	".align 3\n" \</div><div class='del'>-	PPC_LONG "1b,4b,2b,4b\n" \</div><div class='del'>-	".previous" \</div><div class='add'>+	EX_TABLE(1b, 4b) \</div><div class='add'>+	EX_TABLE(2b, 4b) \</div><div class='ctx'> 	: "=&amp;r" (oldval), "=&amp;r" (ret) \</div><div class='ctx'> 	: "b" (uaddr), "i" (-EFAULT), "r" (oparg) \</div><div class='ctx'> 	: "cr0", "memory")</div><div class='hunk'>@@ -104,11 +102,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,</div><div class='ctx'> "3:	.section .fixup,\"ax\"\n\</div><div class='ctx'> 4:	li	%0,%6\n\</div><div class='ctx'> 	b	3b\n\</div><div class='del'>-	.previous\n\</div><div class='del'>-	.section __ex_table,\"a\"\n\</div><div class='del'>-	.align 3\n\</div><div class='del'>-	" PPC_LONG "1b,4b,2b,4b\n\</div><div class='del'>-	.previous" \</div><div class='add'>+	.previous\n"</div><div class='add'>+	EX_TABLE(1b, 4b)</div><div class='add'>+	EX_TABLE(2b, 4b)</div><div class='ctx'>         : "+r" (ret), "=&amp;r" (prev), "+m" (*uaddr)</div><div class='ctx'>         : "r" (uaddr), "r" (oldval), "r" (newval), "i" (-EFAULT)</div><div class='ctx'>         : "cc", "memory");</div><div class='head'>diff --git a/arch/powerpc/include/asm/head-64.h b/arch/powerpc/include/asm/head-64.h<br/>index ab90c2fa1ea6..5067048daad4 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/head-64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/head-64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/head-64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/head-64.h</a></div><div class='hunk'>@@ -38,8 +38,8 @@</div><div class='ctx'>  *     li  r10,128</div><div class='ctx'>  *     mv  r11,r10</div><div class='ctx'> </div><div class='del'>- * FIXED_SECTION_ENTRY_BEGIN_LOCATION(section_name, label2, start_address)</div><div class='del'>- * FIXED_SECTION_ENTRY_END_LOCATION(section_name, label2, end_address)</div><div class='add'>+ * FIXED_SECTION_ENTRY_BEGIN_LOCATION(section_name, label2, start_address, size)</div><div class='add'>+ * FIXED_SECTION_ENTRY_END_LOCATION(section_name, label2, start_address, size)</div><div class='ctx'>  * CLOSE_FIXED_SECTION(section_name)</div><div class='ctx'>  *</div><div class='ctx'>  * ZERO_FIXED_SECTION can be used to emit zeroed data.</div><div class='hunk'>@@ -95,16 +95,22 @@ end_##sname:</div><div class='ctx'> </div><div class='ctx'> #define __FIXED_SECTION_ENTRY_BEGIN(sname, name, __align)	\</div><div class='ctx'> 	USE_FIXED_SECTION(sname);				\</div><div class='del'>-	.align __align;						\</div><div class='add'>+	.balign __align;					\</div><div class='ctx'> 	.global name;						\</div><div class='ctx'> name:</div><div class='ctx'> </div><div class='ctx'> #define FIXED_SECTION_ENTRY_BEGIN(sname, name)			\</div><div class='del'>-	__FIXED_SECTION_ENTRY_BEGIN(sname, name, 0)</div><div class='add'>+	__FIXED_SECTION_ENTRY_BEGIN(sname, name, IFETCH_ALIGN_BYTES)</div><div class='ctx'> </div><div class='del'>-#define FIXED_SECTION_ENTRY_BEGIN_LOCATION(sname, name, start)		\</div><div class='add'>+#define FIXED_SECTION_ENTRY_BEGIN_LOCATION(sname, name, start, size) \</div><div class='ctx'> 	USE_FIXED_SECTION(sname);				\</div><div class='ctx'> 	name##_start = (start);					\</div><div class='add'>+	.if ((start) % (size) != 0);				\</div><div class='add'>+	.error "Fixed section exception vector misalignment";	\</div><div class='add'>+	.endif;							\</div><div class='add'>+	.if ((size) != 0x20) &amp;&amp; ((size) != 0x80) &amp;&amp; ((size) != 0x100); \</div><div class='add'>+	.error "Fixed section exception vector bad size";	\</div><div class='add'>+	.endif;							\</div><div class='ctx'> 	.if (start) &lt; sname##_start;				\</div><div class='ctx'> 	.error "Fixed section underflow";			\</div><div class='ctx'> 	.abort;							\</div><div class='hunk'>@@ -113,16 +119,16 @@ name:</div><div class='ctx'> 	.global name;						\</div><div class='ctx'> name:</div><div class='ctx'> </div><div class='del'>-#define FIXED_SECTION_ENTRY_END_LOCATION(sname, name, end)		\</div><div class='del'>-	.if (end) &gt; sname##_end;				\</div><div class='add'>+#define FIXED_SECTION_ENTRY_END_LOCATION(sname, name, start, size) \</div><div class='add'>+	.if (start) + (size) &gt; sname##_end;			\</div><div class='ctx'> 	.error "Fixed section overflow";			\</div><div class='ctx'> 	.abort;							\</div><div class='ctx'> 	.endif;							\</div><div class='del'>-	.if (. - name &gt; end - name##_start);			\</div><div class='add'>+	.if (. - name &gt; (start) + (size) - name##_start);	\</div><div class='ctx'> 	.error "Fixed entry overflow";				\</div><div class='ctx'> 	.abort;							\</div><div class='ctx'> 	.endif;							\</div><div class='del'>-	. = ((end) - sname##_start);				\</div><div class='add'>+	. = ((start) + (size) - sname##_start);			\</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -147,12 +153,12 @@ name:</div><div class='ctx'>  * Following are the BOOK3S exception handler helper macros.</div><div class='ctx'>  * Handlers come in a number of types, and each type has a number of varieties.</div><div class='ctx'>  *</div><div class='del'>- * EXC_REAL_*        - real, unrelocated exception vectors</div><div class='del'>- * EXC_VIRT_*        - virt (AIL), unrelocated exception vectors</div><div class='add'>+ * EXC_REAL_*     - real, unrelocated exception vectors</div><div class='add'>+ * EXC_VIRT_*     - virt (AIL), unrelocated exception vectors</div><div class='ctx'>  * TRAMP_REAL_*   - real, unrelocated helpers (virt can call these)</div><div class='del'>- * TRAMP_VIRT_*  - virt, unreloc helpers (in practice, real can use)</div><div class='del'>- * TRAMP_KVM         - KVM handlers that get put into real, unrelocated</div><div class='del'>- * EXC_COMMON_*  - virt, relocated common handlers</div><div class='add'>+ * TRAMP_VIRT_*   - virt, unreloc helpers (in practice, real can use)</div><div class='add'>+ * TRAMP_KVM      - KVM handlers that get put into real, unrelocated</div><div class='add'>+ * EXC_COMMON_*   - virt, relocated common handlers</div><div class='ctx'>  *</div><div class='ctx'>  * The EXC handlers are given a name, and branch to name_common, or the</div><div class='ctx'>  * appropriate KVM or masking function. Vector handler verieties are as</div><div class='hunk'>@@ -191,23 +197,23 @@ name:</div><div class='ctx'>  * and OOL handlers are implemented as types of TRAMP and TRAMP_VIRT handlers.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define EXC_REAL_BEGIN(name, start, end)			\</div><div class='del'>-	FIXED_SECTION_ENTRY_BEGIN_LOCATION(real_vectors, exc_real_##start##_##name, start)</div><div class='add'>+#define EXC_REAL_BEGIN(name, start, size)			\</div><div class='add'>+	FIXED_SECTION_ENTRY_BEGIN_LOCATION(real_vectors, exc_real_##start##_##name, start, size)</div><div class='ctx'> </div><div class='del'>-#define EXC_REAL_END(name, start, end)			\</div><div class='del'>-	FIXED_SECTION_ENTRY_END_LOCATION(real_vectors, exc_real_##start##_##name, end)</div><div class='add'>+#define EXC_REAL_END(name, start, size)				\</div><div class='add'>+	FIXED_SECTION_ENTRY_END_LOCATION(real_vectors, exc_real_##start##_##name, start, size)</div><div class='ctx'> </div><div class='del'>-#define EXC_VIRT_BEGIN(name, start, end)			\</div><div class='del'>-	FIXED_SECTION_ENTRY_BEGIN_LOCATION(virt_vectors, exc_virt_##start##_##name, start)</div><div class='add'>+#define EXC_VIRT_BEGIN(name, start, size)			\</div><div class='add'>+	FIXED_SECTION_ENTRY_BEGIN_LOCATION(virt_vectors, exc_virt_##start##_##name, start, size)</div><div class='ctx'> </div><div class='del'>-#define EXC_VIRT_END(name, start, end)			\</div><div class='del'>-	FIXED_SECTION_ENTRY_END_LOCATION(virt_vectors, exc_virt_##start##_##name, end)</div><div class='add'>+#define EXC_VIRT_END(name, start, size)				\</div><div class='add'>+	FIXED_SECTION_ENTRY_END_LOCATION(virt_vectors, exc_virt_##start##_##name, start, size)</div><div class='ctx'> </div><div class='ctx'> #define EXC_COMMON_BEGIN(name)					\</div><div class='del'>-	USE_TEXT_SECTION();						\</div><div class='del'>-	.align	7;							\</div><div class='del'>-	.global name;							\</div><div class='del'>-	DEFINE_FIXED_SYMBOL(name);					\</div><div class='add'>+	USE_TEXT_SECTION();					\</div><div class='add'>+	.balign IFETCH_ALIGN_BYTES;				\</div><div class='add'>+	.global name;						\</div><div class='add'>+	DEFINE_FIXED_SYMBOL(name);				\</div><div class='ctx'> name:</div><div class='ctx'> </div><div class='ctx'> #define TRAMP_REAL_BEGIN(name)					\</div><div class='hunk'>@@ -217,147 +223,147 @@ name:</div><div class='ctx'> 	FIXED_SECTION_ENTRY_BEGIN(virt_trampolines, name)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_64_HANDLER</div><div class='del'>-#define TRAMP_KVM_BEGIN(name)						\</div><div class='del'>-	TRAMP_REAL_BEGIN(name)</div><div class='add'>+#define TRAMP_KVM_BEGIN(name)					\</div><div class='add'>+	TRAMP_VIRT_BEGIN(name)</div><div class='ctx'> #else</div><div class='ctx'> #define TRAMP_KVM_BEGIN(name)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define EXC_REAL_NONE(start, end)				\</div><div class='del'>-	FIXED_SECTION_ENTRY_BEGIN_LOCATION(real_vectors, exc_real_##start##_##unused, start); \</div><div class='del'>-	FIXED_SECTION_ENTRY_END_LOCATION(real_vectors, exc_real_##start##_##unused, end)</div><div class='add'>+#define EXC_REAL_NONE(start, size)				\</div><div class='add'>+	FIXED_SECTION_ENTRY_BEGIN_LOCATION(real_vectors, exc_real_##start##_##unused, start, size); \</div><div class='add'>+	FIXED_SECTION_ENTRY_END_LOCATION(real_vectors, exc_real_##start##_##unused, start, size)</div><div class='ctx'> </div><div class='del'>-#define EXC_VIRT_NONE(start, end)				\</div><div class='del'>-	FIXED_SECTION_ENTRY_BEGIN_LOCATION(virt_vectors, exc_virt_##start##_##unused, start); \</div><div class='del'>-	FIXED_SECTION_ENTRY_END_LOCATION(virt_vectors, exc_virt_##start##_##unused, end);</div><div class='add'>+#define EXC_VIRT_NONE(start, size)				\</div><div class='add'>+	FIXED_SECTION_ENTRY_BEGIN_LOCATION(virt_vectors, exc_virt_##start##_##unused, start, size); \</div><div class='add'>+	FIXED_SECTION_ENTRY_END_LOCATION(virt_vectors, exc_virt_##start##_##unused, start, size);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define EXC_REAL(name, start, end)				\</div><div class='del'>-	EXC_REAL_BEGIN(name, start, end);			\</div><div class='add'>+#define EXC_REAL(name, start, size)					\</div><div class='add'>+	EXC_REAL_BEGIN(name, start, size);				\</div><div class='ctx'> 	STD_EXCEPTION_PSERIES(start, name##_common);			\</div><div class='del'>-	EXC_REAL_END(name, start, end);</div><div class='add'>+	EXC_REAL_END(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define EXC_VIRT(name, start, end, realvec)			\</div><div class='del'>-	EXC_VIRT_BEGIN(name, start, end);			\</div><div class='add'>+#define EXC_VIRT(name, start, size, realvec)				\</div><div class='add'>+	EXC_VIRT_BEGIN(name, start, size);				\</div><div class='ctx'> 	STD_RELON_EXCEPTION_PSERIES(start, realvec, name##_common);	\</div><div class='del'>-	EXC_VIRT_END(name, start, end);</div><div class='add'>+	EXC_VIRT_END(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define EXC_REAL_MASKABLE(name, start, end)			\</div><div class='del'>-	EXC_REAL_BEGIN(name, start, end);			\</div><div class='add'>+#define EXC_REAL_MASKABLE(name, start, size)				\</div><div class='add'>+	EXC_REAL_BEGIN(name, start, size);				\</div><div class='ctx'> 	MASKABLE_EXCEPTION_PSERIES(start, start, name##_common);	\</div><div class='del'>-	EXC_REAL_END(name, start, end);</div><div class='add'>+	EXC_REAL_END(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define EXC_VIRT_MASKABLE(name, start, end, realvec)		\</div><div class='del'>-	EXC_VIRT_BEGIN(name, start, end);			\</div><div class='add'>+#define EXC_VIRT_MASKABLE(name, start, size, realvec)			\</div><div class='add'>+	EXC_VIRT_BEGIN(name, start, size);				\</div><div class='ctx'> 	MASKABLE_RELON_EXCEPTION_PSERIES(start, realvec, name##_common); \</div><div class='del'>-	EXC_VIRT_END(name, start, end);</div><div class='add'>+	EXC_VIRT_END(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define EXC_REAL_HV(name, start, end)			\</div><div class='del'>-	EXC_REAL_BEGIN(name, start, end);			\</div><div class='add'>+#define EXC_REAL_HV(name, start, size)					\</div><div class='add'>+	EXC_REAL_BEGIN(name, start, size);				\</div><div class='ctx'> 	STD_EXCEPTION_HV(start, start, name##_common);			\</div><div class='del'>-	EXC_REAL_END(name, start, end);</div><div class='add'>+	EXC_REAL_END(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define EXC_VIRT_HV(name, start, end, realvec)		\</div><div class='del'>-	EXC_VIRT_BEGIN(name, start, end);			\</div><div class='add'>+#define EXC_VIRT_HV(name, start, size, realvec)				\</div><div class='add'>+	EXC_VIRT_BEGIN(name, start, size);				\</div><div class='ctx'> 	STD_RELON_EXCEPTION_HV(start, realvec, name##_common);		\</div><div class='del'>-	EXC_VIRT_END(name, start, end);</div><div class='add'>+	EXC_VIRT_END(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define __EXC_REAL_OOL(name, start, end)			\</div><div class='del'>-	EXC_REAL_BEGIN(name, start, end);			\</div><div class='add'>+#define __EXC_REAL_OOL(name, start, size)				\</div><div class='add'>+	EXC_REAL_BEGIN(name, start, size);				\</div><div class='ctx'> 	__OOL_EXCEPTION(start, label, tramp_real_##name);		\</div><div class='del'>-	EXC_REAL_END(name, start, end);</div><div class='add'>+	EXC_REAL_END(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define __TRAMP_REAL_REAL_OOL(name, vec)				\</div><div class='add'>+#define __TRAMP_REAL_OOL(name, vec)					\</div><div class='ctx'> 	TRAMP_REAL_BEGIN(tramp_real_##name);				\</div><div class='ctx'> 	STD_EXCEPTION_PSERIES_OOL(vec, name##_common);			\</div><div class='ctx'> </div><div class='del'>-#define EXC_REAL_OOL(name, start, end)			\</div><div class='del'>-	__EXC_REAL_OOL(name, start, end);			\</div><div class='del'>-	__TRAMP_REAL_REAL_OOL(name, start);</div><div class='add'>+#define EXC_REAL_OOL(name, start, size)					\</div><div class='add'>+	__EXC_REAL_OOL(name, start, size);				\</div><div class='add'>+	__TRAMP_REAL_OOL(name, start);</div><div class='ctx'> </div><div class='del'>-#define __EXC_REAL_OOL_MASKABLE(name, start, end)		\</div><div class='del'>-	__EXC_REAL_OOL(name, start, end);</div><div class='add'>+#define __EXC_REAL_OOL_MASKABLE(name, start, size)			\</div><div class='add'>+	__EXC_REAL_OOL(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define __TRAMP_REAL_REAL_OOL_MASKABLE(name, vec)			\</div><div class='add'>+#define __TRAMP_REAL_OOL_MASKABLE(name, vec)				\</div><div class='ctx'> 	TRAMP_REAL_BEGIN(tramp_real_##name);				\</div><div class='ctx'> 	MASKABLE_EXCEPTION_PSERIES_OOL(vec, name##_common);		\</div><div class='ctx'> </div><div class='del'>-#define EXC_REAL_OOL_MASKABLE(name, start, end)		\</div><div class='del'>-	__EXC_REAL_OOL_MASKABLE(name, start, end);		\</div><div class='del'>-	__TRAMP_REAL_REAL_OOL_MASKABLE(name, start);</div><div class='add'>+#define EXC_REAL_OOL_MASKABLE(name, start, size)			\</div><div class='add'>+	__EXC_REAL_OOL_MASKABLE(name, start, size);			\</div><div class='add'>+	__TRAMP_REAL_OOL_MASKABLE(name, start);</div><div class='ctx'> </div><div class='del'>-#define __EXC_REAL_OOL_HV_DIRECT(name, start, end, handler)	\</div><div class='del'>-	EXC_REAL_BEGIN(name, start, end);			\</div><div class='add'>+#define __EXC_REAL_OOL_HV_DIRECT(name, start, size, handler)		\</div><div class='add'>+	EXC_REAL_BEGIN(name, start, size);				\</div><div class='ctx'> 	__OOL_EXCEPTION(start, label, handler);				\</div><div class='del'>-	EXC_REAL_END(name, start, end);</div><div class='add'>+	EXC_REAL_END(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define __EXC_REAL_OOL_HV(name, start, end)			\</div><div class='del'>-	__EXC_REAL_OOL(name, start, end);</div><div class='add'>+#define __EXC_REAL_OOL_HV(name, start, size)				\</div><div class='add'>+	__EXC_REAL_OOL(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define __TRAMP_REAL_REAL_OOL_HV(name, vec)				\</div><div class='add'>+#define __TRAMP_REAL_OOL_HV(name, vec)					\</div><div class='ctx'> 	TRAMP_REAL_BEGIN(tramp_real_##name);				\</div><div class='ctx'> 	STD_EXCEPTION_HV_OOL(vec, name##_common);			\</div><div class='ctx'> </div><div class='del'>-#define EXC_REAL_OOL_HV(name, start, end)			\</div><div class='del'>-	__EXC_REAL_OOL_HV(name, start, end);			\</div><div class='del'>-	__TRAMP_REAL_REAL_OOL_HV(name, start);</div><div class='add'>+#define EXC_REAL_OOL_HV(name, start, size)				\</div><div class='add'>+	__EXC_REAL_OOL_HV(name, start, size);				\</div><div class='add'>+	__TRAMP_REAL_OOL_HV(name, start);</div><div class='ctx'> </div><div class='del'>-#define __EXC_REAL_OOL_MASKABLE_HV(name, start, end)		\</div><div class='del'>-	__EXC_REAL_OOL(name, start, end);</div><div class='add'>+#define __EXC_REAL_OOL_MASKABLE_HV(name, start, size)			\</div><div class='add'>+	__EXC_REAL_OOL(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define __TRAMP_REAL_REAL_OOL_MASKABLE_HV(name, vec)			\</div><div class='add'>+#define __TRAMP_REAL_OOL_MASKABLE_HV(name, vec)				\</div><div class='ctx'> 	TRAMP_REAL_BEGIN(tramp_real_##name);				\</div><div class='ctx'> 	MASKABLE_EXCEPTION_HV_OOL(vec, name##_common);			\</div><div class='ctx'> </div><div class='del'>-#define EXC_REAL_OOL_MASKABLE_HV(name, start, end)		\</div><div class='del'>-	__EXC_REAL_OOL_MASKABLE_HV(name, start, end);	\</div><div class='del'>-	__TRAMP_REAL_REAL_OOL_MASKABLE_HV(name, start);</div><div class='add'>+#define EXC_REAL_OOL_MASKABLE_HV(name, start, size)			\</div><div class='add'>+	__EXC_REAL_OOL_MASKABLE_HV(name, start, size);			\</div><div class='add'>+	__TRAMP_REAL_OOL_MASKABLE_HV(name, start);</div><div class='ctx'> </div><div class='del'>-#define __EXC_VIRT_OOL(name, start, end)			\</div><div class='del'>-	EXC_VIRT_BEGIN(name, start, end);			\</div><div class='add'>+#define __EXC_VIRT_OOL(name, start, size)				\</div><div class='add'>+	EXC_VIRT_BEGIN(name, start, size);				\</div><div class='ctx'> 	__OOL_EXCEPTION(start, label, tramp_virt_##name);		\</div><div class='del'>-	EXC_VIRT_END(name, start, end);</div><div class='add'>+	EXC_VIRT_END(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define __TRAMP_REAL_VIRT_OOL(name, realvec)				\</div><div class='del'>-	TRAMP_VIRT_BEGIN(tramp_virt_##name);			\</div><div class='add'>+#define __TRAMP_VIRT_OOL(name, realvec)					\</div><div class='add'>+	TRAMP_VIRT_BEGIN(tramp_virt_##name);				\</div><div class='ctx'> 	STD_RELON_EXCEPTION_PSERIES_OOL(realvec, name##_common);	\</div><div class='ctx'> </div><div class='del'>-#define EXC_VIRT_OOL(name, start, end, realvec)		\</div><div class='del'>-	__EXC_VIRT_OOL(name, start, end);			\</div><div class='del'>-	__TRAMP_REAL_VIRT_OOL(name, realvec);</div><div class='add'>+#define EXC_VIRT_OOL(name, start, size, realvec)			\</div><div class='add'>+	__EXC_VIRT_OOL(name, start, size);				\</div><div class='add'>+	__TRAMP_VIRT_OOL(name, realvec);</div><div class='ctx'> </div><div class='del'>-#define __EXC_VIRT_OOL_MASKABLE(name, start, end)		\</div><div class='del'>-	__EXC_VIRT_OOL(name, start, end);</div><div class='add'>+#define __EXC_VIRT_OOL_MASKABLE(name, start, size)			\</div><div class='add'>+	__EXC_VIRT_OOL(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define __TRAMP_REAL_VIRT_OOL_MASKABLE(name, realvec)		\</div><div class='del'>-	TRAMP_VIRT_BEGIN(tramp_virt_##name);			\</div><div class='add'>+#define __TRAMP_VIRT_OOL_MASKABLE(name, realvec)			\</div><div class='add'>+	TRAMP_VIRT_BEGIN(tramp_virt_##name);				\</div><div class='ctx'> 	MASKABLE_RELON_EXCEPTION_PSERIES_OOL(realvec, name##_common);	\</div><div class='ctx'> </div><div class='del'>-#define EXC_VIRT_OOL_MASKABLE(name, start, end, realvec)	\</div><div class='del'>-	__EXC_VIRT_OOL_MASKABLE(name, start, end);		\</div><div class='del'>-	__TRAMP_REAL_VIRT_OOL_MASKABLE(name, realvec);</div><div class='add'>+#define EXC_VIRT_OOL_MASKABLE(name, start, size, realvec)		\</div><div class='add'>+	__EXC_VIRT_OOL_MASKABLE(name, start, size);			\</div><div class='add'>+	__TRAMP_VIRT_OOL_MASKABLE(name, realvec);</div><div class='ctx'> </div><div class='del'>-#define __EXC_VIRT_OOL_HV(name, start, end)			\</div><div class='del'>-	__EXC_VIRT_OOL(name, start, end);</div><div class='add'>+#define __EXC_VIRT_OOL_HV(name, start, size)				\</div><div class='add'>+	__EXC_VIRT_OOL(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define __TRAMP_REAL_VIRT_OOL_HV(name, realvec)			\</div><div class='del'>-	TRAMP_VIRT_BEGIN(tramp_virt_##name);			\</div><div class='add'>+#define __TRAMP_VIRT_OOL_HV(name, realvec)				\</div><div class='add'>+	TRAMP_VIRT_BEGIN(tramp_virt_##name);				\</div><div class='ctx'> 	STD_RELON_EXCEPTION_HV_OOL(realvec, name##_common);		\</div><div class='ctx'> </div><div class='del'>-#define EXC_VIRT_OOL_HV(name, start, end, realvec)		\</div><div class='del'>-	__EXC_VIRT_OOL_HV(name, start, end);			\</div><div class='del'>-	__TRAMP_REAL_VIRT_OOL_HV(name, realvec);</div><div class='add'>+#define EXC_VIRT_OOL_HV(name, start, size, realvec)			\</div><div class='add'>+	__EXC_VIRT_OOL_HV(name, start, size);				\</div><div class='add'>+	__TRAMP_VIRT_OOL_HV(name, realvec);</div><div class='ctx'> </div><div class='del'>-#define __EXC_VIRT_OOL_MASKABLE_HV(name, start, end)		\</div><div class='del'>-	__EXC_VIRT_OOL(name, start, end);</div><div class='add'>+#define __EXC_VIRT_OOL_MASKABLE_HV(name, start, size)			\</div><div class='add'>+	__EXC_VIRT_OOL(name, start, size);</div><div class='ctx'> </div><div class='del'>-#define __TRAMP_REAL_VIRT_OOL_MASKABLE_HV(name, realvec)		\</div><div class='del'>-	TRAMP_VIRT_BEGIN(tramp_virt_##name);			\</div><div class='add'>+#define __TRAMP_VIRT_OOL_MASKABLE_HV(name, realvec)			\</div><div class='add'>+	TRAMP_VIRT_BEGIN(tramp_virt_##name);				\</div><div class='ctx'> 	MASKABLE_RELON_EXCEPTION_HV_OOL(realvec, name##_common);	\</div><div class='ctx'> </div><div class='del'>-#define EXC_VIRT_OOL_MASKABLE_HV(name, start, end, realvec)	\</div><div class='del'>-	__EXC_VIRT_OOL_MASKABLE_HV(name, start, end);	\</div><div class='del'>-	__TRAMP_REAL_VIRT_OOL_MASKABLE_HV(name, realvec);</div><div class='add'>+#define EXC_VIRT_OOL_MASKABLE_HV(name, start, size, realvec)		\</div><div class='add'>+	__EXC_VIRT_OOL_MASKABLE_HV(name, start, size);			\</div><div class='add'>+	__TRAMP_VIRT_OOL_MASKABLE_HV(name, realvec);</div><div class='ctx'> </div><div class='ctx'> #define TRAMP_KVM(area, n)						\</div><div class='ctx'> 	TRAMP_KVM_BEGIN(do_kvm_##n);					\</div><div class='hunk'>@@ -378,16 +384,16 @@ name:</div><div class='ctx'> 	TRAMP_KVM_BEGIN(do_kvm_H##n);					\</div><div class='ctx'> 	KVM_HANDLER_SKIP(area, EXC_HV, n + 0x2);			\</div><div class='ctx'> </div><div class='del'>-#define EXC_COMMON(name, realvec, hdlr)				\</div><div class='del'>-	EXC_COMMON_BEGIN(name);					\</div><div class='add'>+#define EXC_COMMON(name, realvec, hdlr)					\</div><div class='add'>+	EXC_COMMON_BEGIN(name);						\</div><div class='ctx'> 	STD_EXCEPTION_COMMON(realvec, name, hdlr);			\</div><div class='ctx'> </div><div class='del'>-#define EXC_COMMON_ASYNC(name, realvec, hdlr)			\</div><div class='del'>-	EXC_COMMON_BEGIN(name);					\</div><div class='add'>+#define EXC_COMMON_ASYNC(name, realvec, hdlr)				\</div><div class='add'>+	EXC_COMMON_BEGIN(name);						\</div><div class='ctx'> 	STD_EXCEPTION_COMMON_ASYNC(realvec, name, hdlr);		\</div><div class='ctx'> </div><div class='ctx'> #define EXC_COMMON_HV(name, realvec, hdlr)				\</div><div class='del'>-	EXC_COMMON_BEGIN(name);					\</div><div class='add'>+	EXC_COMMON_BEGIN(name);						\</div><div class='ctx'> 	STD_EXCEPTION_COMMON(realvec + 0x2, name, hdlr);		\</div><div class='ctx'> </div><div class='ctx'> #endif	/* _ASM_POWERPC_HEAD_64_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/hugetlb.h b/arch/powerpc/include/asm/hugetlb.h<br/>index c5517f463ec7..7f4025a6c69e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/hugetlb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/hugetlb.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/hugetlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/hugetlb.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@ extern struct kmem_cache *hugepte_cache;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3S_64</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/book3s/64/hugetlb-radix.h&gt;</div><div class='add'>+#include &lt;asm/book3s/64/hugetlb.h&gt;</div><div class='ctx'> /*</div><div class='ctx'>  * This should work for other subarchs too. But right now we use the</div><div class='ctx'>  * new format only for 64bit book3s</div><div class='hunk'>@@ -21,12 +21,12 @@ static inline pte_t *hugepd_page(hugepd_t hpd)</div><div class='ctx'> 	 * We have only four bits to encode, MMU page size</div><div class='ctx'> 	 */</div><div class='ctx'> 	BUILD_BUG_ON((MMU_PAGE_COUNT - 1) &gt; 0xf);</div><div class='del'>-	return __va(hpd.pd &amp; HUGEPD_ADDR_MASK);</div><div class='add'>+	return __va(hpd_val(hpd) &amp; HUGEPD_ADDR_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int hugepd_mmu_psize(hugepd_t hpd)</div><div class='ctx'> {</div><div class='del'>-	return (hpd.pd &amp; HUGEPD_SHIFT_MASK) &gt;&gt; 2;</div><div class='add'>+	return (hpd_val(hpd) &amp; HUGEPD_SHIFT_MASK) &gt;&gt; 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int hugepd_shift(hugepd_t hpd)</div><div class='hunk'>@@ -51,12 +51,22 @@ static inline void __local_flush_hugetlb_page(struct vm_area_struct *vma,</div><div class='ctx'> static inline pte_t *hugepd_page(hugepd_t hpd)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!hugepd_ok(hpd));</div><div class='del'>-	return (pte_t *)((hpd.pd &amp; ~HUGEPD_SHIFT_MASK) | PD_HUGE);</div><div class='add'>+#ifdef CONFIG_PPC_8xx</div><div class='add'>+	return (pte_t *)__va(hpd_val(hpd) &amp;</div><div class='add'>+			     ~(_PMD_PAGE_MASK | _PMD_PRESENT_MASK));</div><div class='add'>+#else</div><div class='add'>+	return (pte_t *)((hpd_val(hpd) &amp;</div><div class='add'>+			  ~HUGEPD_SHIFT_MASK) | PD_HUGE);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int hugepd_shift(hugepd_t hpd)</div><div class='ctx'> {</div><div class='del'>-	return hpd.pd &amp; HUGEPD_SHIFT_MASK;</div><div class='add'>+#ifdef CONFIG_PPC_8xx</div><div class='add'>+	return ((hpd_val(hpd) &amp; _PMD_PAGE_MASK) &gt;&gt; 1) + 17;</div><div class='add'>+#else</div><div class='add'>+	return hpd_val(hpd) &amp; HUGEPD_SHIFT_MASK;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PPC_BOOK3S_64 */</div><div class='hunk'>@@ -99,7 +109,15 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,</div><div class='ctx'> </div><div class='ctx'> void book3e_hugetlb_preload(struct vm_area_struct *vma, unsigned long ea,</div><div class='ctx'> 			    pte_t pte);</div><div class='add'>+#ifdef CONFIG_PPC_8xx</div><div class='add'>+static inline void flush_hugetlb_page(struct vm_area_struct *vma,</div><div class='add'>+				      unsigned long vmaddr)</div><div class='add'>+{</div><div class='add'>+	flush_tlb_page(vma, vmaddr);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='ctx'> void flush_hugetlb_page(struct vm_area_struct *vma, unsigned long vmaddr);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,</div><div class='ctx'> 			    unsigned long end, unsigned long floor,</div><div class='hunk'>@@ -205,7 +223,8 @@ static inline pte_t *hugepte_offset(hugepd_t hpd, unsigned long addr,</div><div class='ctx'>  * are reserved early in the boot process by memblock instead of via</div><div class='ctx'>  * the .dts as on IBM platforms.</div><div class='ctx'>  */</div><div class='del'>-#if defined(CONFIG_HUGETLB_PAGE) &amp;&amp; defined(CONFIG_PPC_FSL_BOOK3E)</div><div class='add'>+#if defined(CONFIG_HUGETLB_PAGE) &amp;&amp; (defined(CONFIG_PPC_FSL_BOOK3E) || \</div><div class='add'>+    defined(CONFIG_PPC_8xx))</div><div class='ctx'> extern void __init reserve_hugetlb_gpages(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline void reserve_hugetlb_gpages(void)</div><div class='head'>diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h<br/>index 708edebcf147..3cc12a86ef5d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/hvcall.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/hvcall.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/hvcall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/hvcall.h</a></div><div class='hunk'>@@ -275,7 +275,12 @@</div><div class='ctx'> #define H_COP			0x304</div><div class='ctx'> #define H_GET_MPP_X		0x314</div><div class='ctx'> #define H_SET_MODE		0x31C</div><div class='del'>-#define MAX_HCALL_OPCODE	H_SET_MODE</div><div class='add'>+#define H_CLEAR_HPT		0x358</div><div class='add'>+#define H_RESIZE_HPT_PREPARE	0x36C</div><div class='add'>+#define H_RESIZE_HPT_COMMIT	0x370</div><div class='add'>+#define H_REGISTER_PROC_TBL	0x37C</div><div class='add'>+#define H_SIGNAL_SYS_RESET	0x380</div><div class='add'>+#define MAX_HCALL_OPCODE	H_SIGNAL_SYS_RESET</div><div class='ctx'> </div><div class='ctx'> /* H_VIOCTL functions */</div><div class='ctx'> #define H_GET_VIOA_DUMP_SIZE	0x01</div><div class='hunk'>@@ -306,6 +311,21 @@</div><div class='ctx'> #define H_SET_MODE_RESOURCE_ADDR_TRANS_MODE	3</div><div class='ctx'> #define H_SET_MODE_RESOURCE_LE			4</div><div class='ctx'> </div><div class='add'>+/* Values for argument to H_SIGNAL_SYS_RESET */</div><div class='add'>+#define H_SIGNAL_SYS_RESET_ALL			-1</div><div class='add'>+#define H_SIGNAL_SYS_RESET_ALL_OTHERS		-2</div><div class='add'>+/* &gt;= 0 values are CPU number */</div><div class='add'>+</div><div class='add'>+/* Flag values used in H_REGISTER_PROC_TBL hcall */</div><div class='add'>+#define PROC_TABLE_OP_MASK	0x18</div><div class='add'>+#define PROC_TABLE_DEREG	0x10</div><div class='add'>+#define PROC_TABLE_NEW		0x18</div><div class='add'>+#define PROC_TABLE_TYPE_MASK	0x06</div><div class='add'>+#define PROC_TABLE_HPT_SLB	0x00</div><div class='add'>+#define PROC_TABLE_HPT_PT	0x02</div><div class='add'>+#define PROC_TABLE_RADIX	0x04</div><div class='add'>+#define PROC_TABLE_GTSE		0x01</div><div class='add'>+</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -412,27 +432,6 @@ static inline unsigned int get_longbusy_msecs(int longbusy_rc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_PSERIES</div><div class='del'>-extern int CMO_PrPSP;</div><div class='del'>-extern int CMO_SecPSP;</div><div class='del'>-extern unsigned long CMO_PageSize;</div><div class='del'>-</div><div class='del'>-static inline int cmo_get_primary_psp(void)</div><div class='del'>-{</div><div class='del'>-	return CMO_PrPSP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int cmo_get_secondary_psp(void)</div><div class='del'>-{</div><div class='del'>-	return CMO_SecPSP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long cmo_get_page_size(void)</div><div class='del'>-{</div><div class='del'>-	return CMO_PageSize;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PPC_PSERIES */</div><div class='del'>-</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* _ASM_POWERPC_HVCALL_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/ima.h b/arch/powerpc/include/asm/ima.h<br/>new file mode 100644<br/>index 000000000000..2313bdface34<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/ima.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/ima.h</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+#ifndef _ASM_POWERPC_IMA_H</div><div class='add'>+#define _ASM_POWERPC_IMA_H</div><div class='add'>+</div><div class='add'>+struct kimage;</div><div class='add'>+</div><div class='add'>+int ima_get_kexec_buffer(void **addr, size_t *size);</div><div class='add'>+int ima_free_kexec_buffer(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IMA</div><div class='add'>+void remove_ima_buffer(void *fdt, int chosen_node);</div><div class='add'>+#else</div><div class='add'>+static inline void remove_ima_buffer(void *fdt, int chosen_node) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IMA_KEXEC</div><div class='add'>+int arch_ima_add_kexec_buffer(struct kimage *image, unsigned long load_addr,</div><div class='add'>+			      size_t size);</div><div class='add'>+</div><div class='add'>+int setup_ima_buffer(const struct kimage *image, void *fdt, int chosen_node);</div><div class='add'>+#else</div><div class='add'>+static inline int setup_ima_buffer(const struct kimage *image, void *fdt,</div><div class='add'>+				   int chosen_node)</div><div class='add'>+{</div><div class='add'>+	remove_ima_buffer(fdt, chosen_node);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_IMA_KEXEC */</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_POWERPC_IMA_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h<br/>index f6fda8482f60..5ed292431b5b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/io.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/io.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/io.h</a></div><div class='hunk'>@@ -33,6 +33,7 @@ extern struct pci_dev *isa_bridge_pcidev;</div><div class='ctx'> #include &lt;asm/synch.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='add'>+#include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/iomap.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -458,13 +459,10 @@ static inline unsigned int name(unsigned int port)	\</div><div class='ctx'> 		"5:	li	%0,-1\n"		\</div><div class='ctx'> 		"	b	4b\n"			\</div><div class='ctx'> 		".previous\n"				\</div><div class='del'>-		".section __ex_table,\"a\"\n"		\</div><div class='del'>-		"	.align	2\n"			\</div><div class='del'>-		"	.long	0b,5b\n"		\</div><div class='del'>-		"	.long	1b,5b\n"		\</div><div class='del'>-		"	.long	2b,5b\n"		\</div><div class='del'>-		"	.long	3b,5b\n"		\</div><div class='del'>-		".previous"				\</div><div class='add'>+		EX_TABLE(0b, 5b)			\</div><div class='add'>+		EX_TABLE(1b, 5b)			\</div><div class='add'>+		EX_TABLE(2b, 5b)			\</div><div class='add'>+		EX_TABLE(3b, 5b)			\</div><div class='ctx'> 		: "=&amp;r" (x)				\</div><div class='ctx'> 		: "r" (port + _IO_BASE)			\</div><div class='ctx'> 		: "memory");  				\</div><div class='hunk'>@@ -479,11 +477,8 @@ static inline void name(unsigned int val, unsigned int port) \</div><div class='ctx'> 		"0:" op " %0,0,%1\n"			\</div><div class='ctx'> 		"1:	sync\n"				\</div><div class='ctx'> 		"2:\n"					\</div><div class='del'>-		".section __ex_table,\"a\"\n"		\</div><div class='del'>-		"	.align	2\n"			\</div><div class='del'>-		"	.long	0b,2b\n"		\</div><div class='del'>-		"	.long	1b,2b\n"		\</div><div class='del'>-		".previous"				\</div><div class='add'>+		EX_TABLE(0b, 2b)			\</div><div class='add'>+		EX_TABLE(1b, 2b)			\</div><div class='ctx'> 		: : "r" (val), "r" (port + _IO_BASE)	\</div><div class='ctx'> 		: "memory");   	   	   		\</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/include/asm/isa-bridge.h b/arch/powerpc/include/asm/isa-bridge.h<br/>new file mode 100644<br/>index 000000000000..a3a7c1d63a7c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/isa-bridge.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/isa-bridge.h</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+#ifndef __ISA_BRIDGE_H</div><div class='add'>+#define __ISA_BRIDGE_H</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='add'>+</div><div class='add'>+extern void isa_bridge_find_early(struct pci_controller *hose);</div><div class='add'>+extern void isa_bridge_init_non_pci(struct device_node *np);</div><div class='add'>+</div><div class='add'>+static inline int isa_vaddr_is_ioport(void __iomem *address)</div><div class='add'>+{</div><div class='add'>+	/* Check if address hits the reserved legacy IO range */</div><div class='add'>+	unsigned long ea = (unsigned long)address;</div><div class='add'>+	return ea &gt;= ISA_IO_BASE &amp;&amp; ea &lt; ISA_IO_END;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int isa_vaddr_is_ioport(void __iomem *address)</div><div class='add'>+{</div><div class='add'>+	/* No specific ISA handling on ppc32 at this stage, it</div><div class='add'>+	 * all goes through PCI</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __ISA_BRIDGE_H */</div><div class='add'>+</div><div class='head'>diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h<br/>index a46f5f45570c..25668bc8cb2a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/kexec.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/kexec.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/kexec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kexec.h</a></div><div class='hunk'>@@ -53,7 +53,7 @@</div><div class='ctx'> </div><div class='ctx'> typedef void (*crash_shutdown_t)(void);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This function is responsible for capturing register states if coming</div><div class='hunk'>@@ -91,7 +91,28 @@ static inline bool kdump_in_progress(void)</div><div class='ctx'> 	return crashing_cpu &gt;= 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* !CONFIG_KEXEC */</div><div class='add'>+#ifdef CONFIG_KEXEC_FILE</div><div class='add'>+extern struct kexec_file_ops kexec_elf64_ops;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IMA_KEXEC</div><div class='add'>+#define ARCH_HAS_KIMAGE_ARCH</div><div class='add'>+</div><div class='add'>+struct kimage_arch {</div><div class='add'>+	phys_addr_t ima_buffer_addr;</div><div class='add'>+	size_t ima_buffer_size;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int setup_purgatory(struct kimage *image, const void *slave_code,</div><div class='add'>+		    const void *fdt, unsigned long kernel_load_addr,</div><div class='add'>+		    unsigned long fdt_load_addr);</div><div class='add'>+int setup_new_fdt(const struct kimage *image, void *fdt,</div><div class='add'>+		  unsigned long initrd_load_addr, unsigned long initrd_len,</div><div class='add'>+		  const char *cmdline);</div><div class='add'>+int delete_fdt_mem_rsv(void *fdt, unsigned long start, unsigned long size);</div><div class='add'>+#endif /* CONFIG_KEXEC_FILE */</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_KEXEC_CORE */</div><div class='ctx'> static inline void crash_kexec_secondary(struct pt_regs *regs) { }</div><div class='ctx'> </div><div class='ctx'> static inline int overlaps_crashkernel(unsigned long start, unsigned long size)</div><div class='hunk'>@@ -116,7 +137,7 @@ static inline bool kdump_in_progress(void)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_KEXEC */</div><div class='add'>+#endif /* CONFIG_KEXEC_CORE */</div><div class='ctx'> #endif /* ! __ASSEMBLY__ */</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* _ASM_POWERPC_KEXEC_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/kprobes.h b/arch/powerpc/include/asm/kprobes.h<br/>index 2c9759bdb63b..0503c98b2117 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kprobes.h</a></div><div class='hunk'>@@ -1,5 +1,8 @@</div><div class='ctx'> #ifndef _ASM_POWERPC_KPROBES_H</div><div class='ctx'> #define _ASM_POWERPC_KPROBES_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> /*</div><div class='ctx'>  *  Kernel Probes (KProbes)</div><div class='hunk'>@@ -29,16 +32,34 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/probes.h&gt;</div><div class='ctx'> #include &lt;asm/code-patching.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> #define  __ARCH_WANT_KPROBES_INSN_SLOT</div><div class='ctx'> </div><div class='ctx'> struct pt_regs;</div><div class='ctx'> struct kprobe;</div><div class='ctx'> </div><div class='ctx'> typedef ppc_opcode_t kprobe_opcode_t;</div><div class='del'>-#define MAX_INSN_SIZE 1</div><div class='add'>+</div><div class='add'>+extern kprobe_opcode_t optinsn_slot;</div><div class='add'>+</div><div class='add'>+/* Optinsn template address */</div><div class='add'>+extern kprobe_opcode_t optprobe_template_entry[];</div><div class='add'>+extern kprobe_opcode_t optprobe_template_op_address[];</div><div class='add'>+extern kprobe_opcode_t optprobe_template_call_handler[];</div><div class='add'>+extern kprobe_opcode_t optprobe_template_insn[];</div><div class='add'>+extern kprobe_opcode_t optprobe_template_call_emulate[];</div><div class='add'>+extern kprobe_opcode_t optprobe_template_ret[];</div><div class='add'>+extern kprobe_opcode_t optprobe_template_end[];</div><div class='add'>+</div><div class='add'>+/* Fixed instruction size for powerpc */</div><div class='add'>+#define MAX_INSN_SIZE		1</div><div class='add'>+#define MAX_OPTIMIZED_LENGTH	sizeof(kprobe_opcode_t)	/* 4 bytes */</div><div class='add'>+#define MAX_OPTINSN_SIZE	(optprobe_template_end - optprobe_template_entry)</div><div class='add'>+#define RELATIVEJUMP_SIZE	sizeof(kprobe_opcode_t)	/* 4 bytes */</div><div class='ctx'> </div><div class='ctx'> #ifdef PPC64_ELF_ABI_v2</div><div class='ctx'> /* PPC64 ABIv2 needs local entry point */</div><div class='hunk'>@@ -60,7 +81,7 @@ typedef ppc_opcode_t kprobe_opcode_t;</div><div class='ctx'> #define kprobe_lookup_name(name, addr)					\</div><div class='ctx'> {									\</div><div class='ctx'> 	char dot_name[MODULE_NAME_LEN + 1 + KSYM_NAME_LEN];		\</div><div class='del'>-	char *modsym;							\</div><div class='add'>+	const char *modsym;							\</div><div class='ctx'> 	bool dot_appended = false;					\</div><div class='ctx'> 	if ((modsym = strchr(name, ':')) != NULL) {			\</div><div class='ctx'> 		modsym++;						\</div><div class='hunk'>@@ -124,8 +145,20 @@ struct kprobe_ctlblk {</div><div class='ctx'> 	struct prev_kprobe prev_kprobe;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct arch_optimized_insn {</div><div class='add'>+	kprobe_opcode_t copied_insn[1];</div><div class='add'>+	/* detour buffer */</div><div class='add'>+	kprobe_opcode_t *insn;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> extern int kprobe_exceptions_notify(struct notifier_block *self,</div><div class='ctx'> 					unsigned long val, void *data);</div><div class='ctx'> extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);</div><div class='add'>+extern int kprobe_handler(struct pt_regs *regs);</div><div class='add'>+extern int kprobe_post_handler(struct pt_regs *regs);</div><div class='add'>+#else</div><div class='add'>+static inline int kprobe_handler(struct pt_regs *regs) { return 0; }</div><div class='add'>+static inline int kprobe_post_handler(struct pt_regs *regs) { return 0; }</div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif	/* _ASM_POWERPC_KPROBES_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/kvm_asm.h b/arch/powerpc/include/asm/kvm_asm.h<br/>index 05cabed3d1bd..09a802bb702f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/kvm_asm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/kvm_asm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/kvm_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kvm_asm.h</a></div><div class='hunk'>@@ -99,6 +99,7 @@</div><div class='ctx'> #define BOOK3S_INTERRUPT_H_EMUL_ASSIST	0xe40</div><div class='ctx'> #define BOOK3S_INTERRUPT_HMI		0xe60</div><div class='ctx'> #define BOOK3S_INTERRUPT_H_DOORBELL	0xe80</div><div class='add'>+#define BOOK3S_INTERRUPT_H_VIRT		0xea0</div><div class='ctx'> #define BOOK3S_INTERRUPT_PERFMON	0xf00</div><div class='ctx'> #define BOOK3S_INTERRUPT_ALTIVEC	0xf20</div><div class='ctx'> #define BOOK3S_INTERRUPT_VSX		0xf40</div><div class='head'>diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h<br/>index 5cf306ae0ac3..2bf35017ffc0 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/kvm_book3s.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/kvm_book3s.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/kvm_book3s.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kvm_book3s.h</a></div><div class='hunk'>@@ -170,6 +170,8 @@ extern int kvmppc_book3s_hv_page_fault(struct kvm_run *run,</div><div class='ctx'> 			unsigned long status);</div><div class='ctx'> extern long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr,</div><div class='ctx'> 			unsigned long slb_v, unsigned long valid);</div><div class='add'>+extern int kvmppc_hv_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='add'>+			unsigned long gpa, gva_t ea, int is_store);</div><div class='ctx'> </div><div class='ctx'> extern void kvmppc_mmu_hpte_cache_map(struct kvm_vcpu *vcpu, struct hpte_cache *pte);</div><div class='ctx'> extern struct hpte_cache *kvmppc_mmu_hpte_cache_next(struct kvm_vcpu *vcpu);</div><div class='hunk'>@@ -182,6 +184,25 @@ extern void kvmppc_mmu_hpte_sysexit(void);</div><div class='ctx'> extern int kvmppc_mmu_hv_init(void);</div><div class='ctx'> extern int kvmppc_book3s_hcall_implemented(struct kvm *kvm, unsigned long hc);</div><div class='ctx'> </div><div class='add'>+extern int kvmppc_book3s_radix_page_fault(struct kvm_run *run,</div><div class='add'>+			struct kvm_vcpu *vcpu,</div><div class='add'>+			unsigned long ea, unsigned long dsisr);</div><div class='add'>+extern int kvmppc_mmu_radix_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,</div><div class='add'>+			struct kvmppc_pte *gpte, bool data, bool iswrite);</div><div class='add'>+extern int kvmppc_init_vm_radix(struct kvm *kvm);</div><div class='add'>+extern void kvmppc_free_radix(struct kvm *kvm);</div><div class='add'>+extern int kvmppc_radix_init(void);</div><div class='add'>+extern void kvmppc_radix_exit(void);</div><div class='add'>+extern int kvm_unmap_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='add'>+			unsigned long gfn);</div><div class='add'>+extern int kvm_age_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='add'>+			unsigned long gfn);</div><div class='add'>+extern int kvm_test_age_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='add'>+			unsigned long gfn);</div><div class='add'>+extern long kvmppc_hv_get_dirty_log_radix(struct kvm *kvm,</div><div class='add'>+			struct kvm_memory_slot *memslot, unsigned long *map);</div><div class='add'>+extern int kvmhv_get_rmmu_info(struct kvm *kvm, struct kvm_ppc_rmmu_info *info);</div><div class='add'>+</div><div class='ctx'> /* XXX remove this export when load_last_inst() is generic */</div><div class='ctx'> extern int kvmppc_ld(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr, bool data);</div><div class='ctx'> extern void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec);</div><div class='hunk'>@@ -211,8 +232,11 @@ extern long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> extern long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> 			unsigned long pte_index, unsigned long avpn,</div><div class='ctx'> 			unsigned long *hpret);</div><div class='del'>-extern long kvmppc_hv_get_dirty_log(struct kvm *kvm,</div><div class='add'>+extern long kvmppc_hv_get_dirty_log_hpt(struct kvm *kvm,</div><div class='ctx'> 			struct kvm_memory_slot *memslot, unsigned long *map);</div><div class='add'>+extern void kvmppc_harvest_vpa_dirty(struct kvmppc_vpa *vpa,</div><div class='add'>+			struct kvm_memory_slot *memslot,</div><div class='add'>+			unsigned long *map);</div><div class='ctx'> extern void kvmppc_update_lpcr(struct kvm *kvm, unsigned long lpcr,</div><div class='ctx'> 			unsigned long mask);</div><div class='ctx'> extern void kvmppc_set_fscr(struct kvm_vcpu *vcpu, u64 fscr);</div><div class='head'>diff --git a/arch/powerpc/include/asm/kvm_book3s_64.h b/arch/powerpc/include/asm/kvm_book3s_64.h<br/>index 848292176908..d9b48f5bb606 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/kvm_book3s_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/kvm_book3s_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/kvm_book3s_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kvm_book3s_64.h</a></div><div class='hunk'>@@ -22,6 +22,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/book3s/64/mmu-hash.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Power architecture requires HPT is at least 256kiB, at most 64TiB */</div><div class='add'>+#define PPC_MIN_HPT_ORDER	18</div><div class='add'>+#define PPC_MAX_HPT_ORDER	46</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE</div><div class='ctx'> static inline struct kvmppc_book3s_shadow_vcpu *svcpu_get(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -36,6 +40,12 @@ static inline void svcpu_put(struct kvmppc_book3s_shadow_vcpu *svcpu)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE</div><div class='add'>+</div><div class='add'>+static inline bool kvm_is_radix(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	return kvm-&gt;arch.radix;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define KVM_DEFAULT_HPT_ORDER	24	/* 16MB HPT by default */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -350,6 +360,18 @@ extern void kvmppc_mmu_debugfs_init(struct kvm *kvm);</div><div class='ctx'> </div><div class='ctx'> extern void kvmhv_rm_send_ipi(int cpu);</div><div class='ctx'> </div><div class='add'>+static inline unsigned long kvmppc_hpt_npte(struct kvm_hpt_info *hpt)</div><div class='add'>+{</div><div class='add'>+	/* HPTEs are 2**4 bytes long */</div><div class='add'>+	return 1UL &lt;&lt; (hpt-&gt;order - 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long kvmppc_hpt_mask(struct kvm_hpt_info *hpt)</div><div class='add'>+{</div><div class='add'>+	/* 128 (2**7) bytes in each HPTEG */</div><div class='add'>+	return (1UL &lt;&lt; (hpt-&gt;order - 7)) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_KVM_BOOK3S_64_H__ */</div><div class='head'>diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h<br/>index 28350a294b1e..7bba8f415627 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/kvm_host.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/kvm_host.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/kvm_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kvm_host.h</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> #ifdef CONFIG_KVM_MMIO</div><div class='ctx'> #define KVM_COALESCED_MMIO_PAGE_OFFSET 1</div><div class='ctx'> #endif</div><div class='del'>-#define KVM_HALT_POLL_NS_DEFAULT 500000</div><div class='add'>+#define KVM_HALT_POLL_NS_DEFAULT 10000	/* 10 us */</div><div class='ctx'> </div><div class='ctx'> /* These values are internal and can be increased later */</div><div class='ctx'> #define KVM_NR_IRQCHIPS          1</div><div class='hunk'>@@ -241,11 +241,25 @@ struct kvm_arch_memory_slot {</div><div class='ctx'> #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct kvm_hpt_info {</div><div class='add'>+	/* Host virtual (linear mapping) address of guest HPT */</div><div class='add'>+	unsigned long virt;</div><div class='add'>+	/* Array of reverse mapping entries for each guest HPTE */</div><div class='add'>+	struct revmap_entry *rev;</div><div class='add'>+	/* Guest HPT size is 2**(order) bytes */</div><div class='add'>+	u32 order;</div><div class='add'>+	/* 1 if HPT allocated with CMA, 0 otherwise */</div><div class='add'>+	int cma;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvm_resize_hpt;</div><div class='add'>+</div><div class='ctx'> struct kvm_arch {</div><div class='ctx'> 	unsigned int lpid;</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE</div><div class='del'>-	unsigned long hpt_virt;</div><div class='del'>-	struct revmap_entry *revmap;</div><div class='add'>+	unsigned int tlb_sets;</div><div class='add'>+	struct kvm_hpt_info hpt;</div><div class='add'>+	atomic64_t mmio_update;</div><div class='ctx'> 	unsigned int host_lpid;</div><div class='ctx'> 	unsigned long host_lpcr;</div><div class='ctx'> 	unsigned long sdr1;</div><div class='hunk'>@@ -254,16 +268,17 @@ struct kvm_arch {</div><div class='ctx'> 	unsigned long lpcr;</div><div class='ctx'> 	unsigned long vrma_slb_v;</div><div class='ctx'> 	int hpte_setup_done;</div><div class='del'>-	u32 hpt_order;</div><div class='ctx'> 	atomic_t vcpus_running;</div><div class='ctx'> 	u32 online_vcores;</div><div class='del'>-	unsigned long hpt_npte;</div><div class='del'>-	unsigned long hpt_mask;</div><div class='ctx'> 	atomic_t hpte_mod_interest;</div><div class='ctx'> 	cpumask_t need_tlb_flush;</div><div class='del'>-	int hpt_cma_alloc;</div><div class='add'>+	cpumask_t cpu_in_guest;</div><div class='add'>+	u8 radix;</div><div class='add'>+	pgd_t *pgtable;</div><div class='add'>+	u64 process_table;</div><div class='ctx'> 	struct dentry *debugfs_dir;</div><div class='ctx'> 	struct dentry *htab_dentry;</div><div class='add'>+	struct kvm_resize_hpt *resize_hpt; /* protected by kvm-&gt;lock */</div><div class='ctx'> #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE</div><div class='ctx'> 	struct mutex hpt_mutex;</div><div class='hunk'>@@ -408,6 +423,24 @@ struct kvmppc_passthru_irqmap {</div><div class='ctx'> #define KVMPPC_IRQ_MPIC		1</div><div class='ctx'> #define KVMPPC_IRQ_XICS		2</div><div class='ctx'> </div><div class='add'>+#define MMIO_HPTE_CACHE_SIZE	4</div><div class='add'>+</div><div class='add'>+struct mmio_hpte_cache_entry {</div><div class='add'>+	unsigned long hpte_v;</div><div class='add'>+	unsigned long hpte_r;</div><div class='add'>+	unsigned long rpte;</div><div class='add'>+	unsigned long pte_index;</div><div class='add'>+	unsigned long eaddr;</div><div class='add'>+	unsigned long slb_v;</div><div class='add'>+	long mmio_update;</div><div class='add'>+	unsigned int slb_base_pshift;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mmio_hpte_cache {</div><div class='add'>+	struct mmio_hpte_cache_entry entry[MMIO_HPTE_CACHE_SIZE];</div><div class='add'>+	unsigned int index;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct openpic;</div><div class='ctx'> </div><div class='ctx'> struct kvm_vcpu_arch {</div><div class='hunk'>@@ -498,6 +531,8 @@ struct kvm_vcpu_arch {</div><div class='ctx'> 	ulong tcscr;</div><div class='ctx'> 	ulong acop;</div><div class='ctx'> 	ulong wort;</div><div class='add'>+	ulong tid;</div><div class='add'>+	ulong psscr;</div><div class='ctx'> 	ulong shadow_srr1;</div><div class='ctx'> #endif</div><div class='ctx'> 	u32 vrsave; /* also USPRG0 */</div><div class='hunk'>@@ -546,6 +581,7 @@ struct kvm_vcpu_arch {</div><div class='ctx'> 	u64 tfiar;</div><div class='ctx'> </div><div class='ctx'> 	u32 cr_tm;</div><div class='add'>+	u64 xer_tm;</div><div class='ctx'> 	u64 lr_tm;</div><div class='ctx'> 	u64 ctr_tm;</div><div class='ctx'> 	u64 amr_tm;</div><div class='hunk'>@@ -580,6 +616,7 @@ struct kvm_vcpu_arch {</div><div class='ctx'> 	ulong fault_dar;</div><div class='ctx'> 	u32 fault_dsisr;</div><div class='ctx'> 	unsigned long intr_msr;</div><div class='add'>+	ulong fault_gpa;	/* guest real address of page fault (POWER9) */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BOOKE</div><div class='hunk'>@@ -634,6 +671,7 @@ struct kvm_vcpu_arch {</div><div class='ctx'> 	int state;</div><div class='ctx'> 	int ptid;</div><div class='ctx'> 	int thread_cpu;</div><div class='add'>+	int prev_cpu;</div><div class='ctx'> 	bool timer_running;</div><div class='ctx'> 	wait_queue_head_t cpu_run;</div><div class='ctx'> </div><div class='hunk'>@@ -655,9 +693,11 @@ struct kvm_vcpu_arch {</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE</div><div class='ctx'> 	struct kvm_vcpu_arch_shared shregs;</div><div class='ctx'> </div><div class='add'>+	struct mmio_hpte_cache mmio_cache;</div><div class='ctx'> 	unsigned long pgfault_addr;</div><div class='ctx'> 	long pgfault_index;</div><div class='ctx'> 	unsigned long pgfault_hpte[2];</div><div class='add'>+	struct mmio_hpte_cache_entry *pgfault_cache;</div><div class='ctx'> </div><div class='ctx'> 	struct task_struct *run_task;</div><div class='ctx'> 	struct kvm_run *kvm_run;</div><div class='head'>diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h<br/>index f6e49640dbe1..dd11c4c8c56a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/kvm_ppc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/kvm_ppc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/kvm_ppc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/kvm_ppc.h</a></div><div class='hunk'>@@ -155,9 +155,10 @@ extern void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu);</div><div class='ctx'> extern int kvmppc_kvm_pv(struct kvm_vcpu *vcpu);</div><div class='ctx'> extern void kvmppc_map_magic(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='del'>-extern long kvmppc_alloc_hpt(struct kvm *kvm, u32 *htab_orderp);</div><div class='del'>-extern long kvmppc_alloc_reset_hpt(struct kvm *kvm, u32 *htab_orderp);</div><div class='del'>-extern void kvmppc_free_hpt(struct kvm *kvm);</div><div class='add'>+extern int kvmppc_allocate_hpt(struct kvm_hpt_info *info, u32 order);</div><div class='add'>+extern void kvmppc_set_hpt(struct kvm *kvm, struct kvm_hpt_info *info);</div><div class='add'>+extern long kvmppc_alloc_reset_hpt(struct kvm *kvm, int order);</div><div class='add'>+extern void kvmppc_free_hpt(struct kvm_hpt_info *info);</div><div class='ctx'> extern long kvmppc_prepare_vrma(struct kvm *kvm,</div><div class='ctx'> 				struct kvm_userspace_memory_region *mem);</div><div class='ctx'> extern void kvmppc_map_vrma(struct kvm_vcpu *vcpu,</div><div class='hunk'>@@ -186,8 +187,8 @@ extern long kvmppc_h_stuff_tce(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		unsigned long tce_value, unsigned long npages);</div><div class='ctx'> extern long kvmppc_h_get_tce(struct kvm_vcpu *vcpu, unsigned long liobn,</div><div class='ctx'> 			     unsigned long ioba);</div><div class='del'>-extern struct page *kvm_alloc_hpt(unsigned long nr_pages);</div><div class='del'>-extern void kvm_release_hpt(struct page *page, unsigned long nr_pages);</div><div class='add'>+extern struct page *kvm_alloc_hpt_cma(unsigned long nr_pages);</div><div class='add'>+extern void kvm_free_hpt_cma(struct page *page, unsigned long nr_pages);</div><div class='ctx'> extern int kvmppc_core_init_vm(struct kvm *kvm);</div><div class='ctx'> extern void kvmppc_core_destroy_vm(struct kvm *kvm);</div><div class='ctx'> extern void kvmppc_core_free_memslot(struct kvm *kvm,</div><div class='hunk'>@@ -214,6 +215,10 @@ extern void kvmppc_bookehv_exit(void);</div><div class='ctx'> extern int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> extern int kvm_vm_ioctl_get_htab_fd(struct kvm *kvm, struct kvm_get_htab_fd *);</div><div class='add'>+extern long kvm_vm_ioctl_resize_hpt_prepare(struct kvm *kvm,</div><div class='add'>+					    struct kvm_ppc_resize_hpt *rhpt);</div><div class='add'>+extern long kvm_vm_ioctl_resize_hpt_commit(struct kvm *kvm,</div><div class='add'>+					   struct kvm_ppc_resize_hpt *rhpt);</div><div class='ctx'> </div><div class='ctx'> int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq);</div><div class='ctx'> </div><div class='hunk'>@@ -291,6 +296,8 @@ struct kvmppc_ops {</div><div class='ctx'> 				       struct irq_bypass_producer *);</div><div class='ctx'> 	void (*irq_bypass_del_producer)(struct irq_bypass_consumer *,</div><div class='ctx'> 					struct irq_bypass_producer *);</div><div class='add'>+	int (*configure_mmu)(struct kvm *kvm, struct kvm_ppc_mmuv3_cfg *cfg);</div><div class='add'>+	int (*get_rmmu_info)(struct kvm *kvm, struct kvm_ppc_rmmu_info *info);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct kvmppc_ops *kvmppc_hv_ops;</div><div class='hunk'>@@ -483,9 +490,10 @@ extern void kvmppc_xics_set_mapped(struct kvm *kvm, unsigned long guest_irq,</div><div class='ctx'> 				   unsigned long host_irq);</div><div class='ctx'> extern void kvmppc_xics_clr_mapped(struct kvm *kvm, unsigned long guest_irq,</div><div class='ctx'> 				   unsigned long host_irq);</div><div class='del'>-extern long kvmppc_deliver_irq_passthru(struct kvm_vcpu *vcpu, u32 xirr,</div><div class='del'>-				 struct kvmppc_irq_map *irq_map,</div><div class='del'>-				 struct kvmppc_passthru_irqmap *pimap);</div><div class='add'>+extern long kvmppc_deliver_irq_passthru(struct kvm_vcpu *vcpu, __be32 xirr,</div><div class='add'>+					struct kvmppc_irq_map *irq_map,</div><div class='add'>+					struct kvmppc_passthru_irqmap *pimap,</div><div class='add'>+					bool *again);</div><div class='ctx'> extern int h_ipi_redirect;</div><div class='ctx'> #else</div><div class='ctx'> static inline struct kvmppc_passthru_irqmap *kvmppc_get_passthru_irqmap(</div><div class='hunk'>@@ -510,6 +518,48 @@ static inline int kvmppc_xics_hcall(struct kvm_vcpu *vcpu, u32 cmd)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Prototypes for functions called only from assembler code.</div><div class='add'>+ * Having prototypes reduces sparse errors.</div><div class='add'>+ */</div><div class='add'>+long kvmppc_rm_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,</div><div class='add'>+			 unsigned long ioba, unsigned long tce);</div><div class='add'>+long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu,</div><div class='add'>+				  unsigned long liobn, unsigned long ioba,</div><div class='add'>+				  unsigned long tce_list, unsigned long npages);</div><div class='add'>+long kvmppc_rm_h_stuff_tce(struct kvm_vcpu *vcpu,</div><div class='add'>+			   unsigned long liobn, unsigned long ioba,</div><div class='add'>+			   unsigned long tce_value, unsigned long npages);</div><div class='add'>+long int kvmppc_rm_h_confer(struct kvm_vcpu *vcpu, int target,</div><div class='add'>+                            unsigned int yield_count);</div><div class='add'>+long kvmppc_h_random(struct kvm_vcpu *vcpu);</div><div class='add'>+void kvmhv_commence_exit(int trap);</div><div class='add'>+long kvmppc_realmode_machine_check(struct kvm_vcpu *vcpu);</div><div class='add'>+void kvmppc_subcore_enter_guest(void);</div><div class='add'>+void kvmppc_subcore_exit_guest(void);</div><div class='add'>+long kvmppc_realmode_hmi_handler(void);</div><div class='add'>+long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='add'>+                    long pte_index, unsigned long pteh, unsigned long ptel);</div><div class='add'>+long kvmppc_h_remove(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='add'>+                     unsigned long pte_index, unsigned long avpn);</div><div class='add'>+long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu);</div><div class='add'>+long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='add'>+                      unsigned long pte_index, unsigned long avpn,</div><div class='add'>+                      unsigned long va);</div><div class='add'>+long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='add'>+                   unsigned long pte_index);</div><div class='add'>+long kvmppc_h_clear_ref(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='add'>+                        unsigned long pte_index);</div><div class='add'>+long kvmppc_h_clear_mod(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='add'>+                        unsigned long pte_index);</div><div class='add'>+long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,</div><div class='add'>+                          unsigned long slb_v, unsigned int status, bool data);</div><div class='add'>+unsigned long kvmppc_rm_h_xirr(struct kvm_vcpu *vcpu);</div><div class='add'>+int kvmppc_rm_h_ipi(struct kvm_vcpu *vcpu, unsigned long server,</div><div class='add'>+                    unsigned long mfrr);</div><div class='add'>+int kvmppc_rm_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr);</div><div class='add'>+int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Host-side operations we want to set up while running in real</div><div class='ctx'>  * mode in the guest operating on the xics.</div><div class='ctx'>  * Currently only VCPU wakeup is supported.</div><div class='head'>diff --git a/arch/powerpc/include/asm/livepatch.h b/arch/powerpc/include/asm/livepatch.h<br/>index a402f7f94896..47a03b9b528b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/livepatch.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/livepatch.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/livepatch.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/livepatch.h</a></div><div class='hunk'>@@ -28,13 +28,6 @@ static inline int klp_check_compiler_support(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int klp_write_module_reloc(struct module *mod, unsigned long</div><div class='del'>-		type, unsigned long loc, unsigned long value)</div><div class='del'>-{</div><div class='del'>-	/* This requires infrastructure changes; we need the loadinfos. */</div><div class='del'>-	return -ENOSYS;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)</div><div class='ctx'> {</div><div class='ctx'> 	regs-&gt;nip = ip;</div><div class='head'>diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h<br/>index e02cbc6a6c70..5011b69107a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/machdep.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/machdep.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/machdep.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/machdep.h</a></div><div class='hunk'>@@ -183,7 +183,7 @@ struct machdep_calls {</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*machine_shutdown)(void);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> 	void (*kexec_cpu_down)(int crash_shutdown, int secondary);</div><div class='ctx'> </div><div class='ctx'> 	/* Called to do what every setup is needed on image and the</div><div class='hunk'>@@ -198,7 +198,7 @@ struct machdep_calls {</div><div class='ctx'> 	 * no return.</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*machine_kexec)(struct kimage *image);</div><div class='del'>-#endif /* CONFIG_KEXEC */</div><div class='add'>+#endif /* CONFIG_KEXEC_CORE */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SUSPEND</div><div class='ctx'> 	/* These are called to disable and enable, respectively, IRQs when</div><div class='head'>diff --git a/arch/powerpc/include/asm/mmu-8xx.h b/arch/powerpc/include/asm/mmu-8xx.h<br/>index 3e0e4927811c..798b5bf91427 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/mmu-8xx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/mmu-8xx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/mmu-8xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/mmu-8xx.h</a></div><div class='hunk'>@@ -172,6 +172,41 @@ typedef struct {</div><div class='ctx'> </div><div class='ctx'> #define PHYS_IMMR_BASE (mfspr(SPRN_IMMR) &amp; 0xfff80000)</div><div class='ctx'> #define VIRT_IMMR_BASE (__fix_to_virt(FIX_IMMR_BASE))</div><div class='add'>+</div><div class='add'>+/* Page size definitions, common between 32 and 64-bit</div><div class='add'>+ *</div><div class='add'>+ *    shift : is the "PAGE_SHIFT" value for that page size</div><div class='add'>+ *    penc  : is the pte encoding mask</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct mmu_psize_def {</div><div class='add'>+	unsigned int	shift;	/* number of bits */</div><div class='add'>+	unsigned int	enc;	/* PTE encoding */</div><div class='add'>+	unsigned int    ind;    /* Corresponding indirect page size shift */</div><div class='add'>+	unsigned int	flags;</div><div class='add'>+#define MMU_PAGE_SIZE_DIRECT	0x1	/* Supported as a direct size */</div><div class='add'>+#define MMU_PAGE_SIZE_INDIRECT	0x2	/* Supported as an indirect size */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];</div><div class='add'>+</div><div class='add'>+static inline int shift_to_mmu_psize(unsigned int shift)</div><div class='add'>+{</div><div class='add'>+	int psize;</div><div class='add'>+</div><div class='add'>+	for (psize = 0; psize &lt; MMU_PAGE_COUNT; ++psize)</div><div class='add'>+		if (mmu_psize_defs[psize].shift == shift)</div><div class='add'>+			return psize;</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int mmu_psize_to_shift(unsigned int mmu_psize)</div><div class='add'>+{</div><div class='add'>+	if (mmu_psize_defs[mmu_psize].shift)</div><div class='add'>+		return mmu_psize_defs[mmu_psize].shift;</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PPC_4K_PAGES)</div><div class='head'>diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h<br/>index e311c25751a4..065e762fae85 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/mmu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/mmu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/mmu.h</a></div><div class='hunk'>@@ -136,6 +136,7 @@ enum {</div><div class='ctx'> 		MMU_FTR_NO_SLBIE_B | MMU_FTR_16M_PAGE | MMU_FTR_TLBIEL |</div><div class='ctx'> 		MMU_FTR_LOCKLESS_TLBIE | MMU_FTR_CI_LARGE_PAGE |</div><div class='ctx'> 		MMU_FTR_1T_SEGMENT | MMU_FTR_TLBIE_CROP_VA |</div><div class='add'>+		MMU_FTR_KERNEL_RO |</div><div class='ctx'> #ifdef CONFIG_PPC_RADIX_MMU</div><div class='ctx'> 		MMU_FTR_TYPE_RADIX |</div><div class='ctx'> #endif</div><div class='hunk'>@@ -160,7 +161,9 @@ static __always_inline bool mmu_has_feature(unsigned long feature)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+#ifndef __clang__ /* clang can't cope with this */</div><div class='ctx'> 	BUILD_BUG_ON(!__builtin_constant_p(feature));</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG</div><div class='ctx'> 	if (!static_key_initialized) {</div><div class='hunk'>@@ -214,6 +217,11 @@ extern u64 ppc64_rma_size;</div><div class='ctx'> /* Cleanup function used by kexec */</div><div class='ctx'> extern void mmu_cleanup_all(void);</div><div class='ctx'> extern void radix__mmu_cleanup_all(void);</div><div class='add'>+</div><div class='add'>+/* Functions for creating and updating partition table on POWER9 */</div><div class='add'>+extern void mmu_partition_table_init(void);</div><div class='add'>+extern void mmu_partition_table_set_entry(unsigned int lpid, unsigned long dw0,</div><div class='add'>+					  unsigned long dw1);</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> struct mm_struct;</div><div class='hunk'>@@ -270,19 +278,20 @@ static inline bool early_radix_enabled(void)</div><div class='ctx'> #define MMU_PAGE_64K	2</div><div class='ctx'> #define MMU_PAGE_64K_AP	3	/* "Admixed pages" (hash64 only) */</div><div class='ctx'> #define MMU_PAGE_256K	4</div><div class='del'>-#define MMU_PAGE_1M	5</div><div class='del'>-#define MMU_PAGE_2M	6</div><div class='del'>-#define MMU_PAGE_4M	7</div><div class='del'>-#define MMU_PAGE_8M	8</div><div class='del'>-#define MMU_PAGE_16M	9</div><div class='del'>-#define MMU_PAGE_64M	10</div><div class='del'>-#define MMU_PAGE_256M	11</div><div class='del'>-#define MMU_PAGE_1G	12</div><div class='del'>-#define MMU_PAGE_16G	13</div><div class='del'>-#define MMU_PAGE_64G	14</div><div class='add'>+#define MMU_PAGE_512K	5</div><div class='add'>+#define MMU_PAGE_1M	6</div><div class='add'>+#define MMU_PAGE_2M	7</div><div class='add'>+#define MMU_PAGE_4M	8</div><div class='add'>+#define MMU_PAGE_8M	9</div><div class='add'>+#define MMU_PAGE_16M	10</div><div class='add'>+#define MMU_PAGE_64M	11</div><div class='add'>+#define MMU_PAGE_256M	12</div><div class='add'>+#define MMU_PAGE_1G	13</div><div class='add'>+#define MMU_PAGE_16G	14</div><div class='add'>+#define MMU_PAGE_64G	15</div><div class='ctx'> </div><div class='ctx'> /* N.B. we need to change the type of hpte_page_sizes if this gets to be &gt; 16 */</div><div class='del'>-#define MMU_PAGE_COUNT	15</div><div class='add'>+#define MMU_PAGE_COUNT	16</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3S_64</div><div class='ctx'> #include &lt;asm/book3s/64/mmu.h&gt;</div><div class='head'>diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h<br/>index 5c451140660a..b9e3f0aca261 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -19,16 +19,18 @@ extern void destroy_context(struct mm_struct *mm);</div><div class='ctx'> struct mm_iommu_table_group_mem_t;</div><div class='ctx'> </div><div class='ctx'> extern int isolate_lru_page(struct page *page);	/* from internal.h */</div><div class='del'>-extern bool mm_iommu_preregistered(void);</div><div class='del'>-extern long mm_iommu_get(unsigned long ua, unsigned long entries,</div><div class='add'>+extern bool mm_iommu_preregistered(struct mm_struct *mm);</div><div class='add'>+extern long mm_iommu_get(struct mm_struct *mm,</div><div class='add'>+		unsigned long ua, unsigned long entries,</div><div class='ctx'> 		struct mm_iommu_table_group_mem_t **pmem);</div><div class='del'>-extern long mm_iommu_put(struct mm_iommu_table_group_mem_t *mem);</div><div class='del'>-extern void mm_iommu_init(mm_context_t *ctx);</div><div class='del'>-extern void mm_iommu_cleanup(mm_context_t *ctx);</div><div class='del'>-extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup(unsigned long ua,</div><div class='del'>-		unsigned long size);</div><div class='del'>-extern struct mm_iommu_table_group_mem_t *mm_iommu_find(unsigned long ua,</div><div class='del'>-		unsigned long entries);</div><div class='add'>+extern long mm_iommu_put(struct mm_struct *mm,</div><div class='add'>+		struct mm_iommu_table_group_mem_t *mem);</div><div class='add'>+extern void mm_iommu_init(struct mm_struct *mm);</div><div class='add'>+extern void mm_iommu_cleanup(struct mm_struct *mm);</div><div class='add'>+extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup(struct mm_struct *mm,</div><div class='add'>+		unsigned long ua, unsigned long size);</div><div class='add'>+extern struct mm_iommu_table_group_mem_t *mm_iommu_find(struct mm_struct *mm,</div><div class='add'>+		unsigned long ua, unsigned long entries);</div><div class='ctx'> extern long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,</div><div class='ctx'> 		unsigned long ua, unsigned long *hpa);</div><div class='ctx'> extern long mm_iommu_mapped_inc(struct mm_iommu_table_group_mem_t *mem);</div><div class='head'>diff --git a/arch/powerpc/include/asm/module.h b/arch/powerpc/include/asm/module.h<br/>index cd4ffd86765f..53885512b8d3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/module.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/module.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/module.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/module.h</a></div><div class='hunk'>@@ -90,13 +90,5 @@ static inline int module_finalize_ftrace(struct module *mod, const Elf_Shdr *sec</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct exception_table_entry;</div><div class='del'>-void sort_ex_table(struct exception_table_entry *start,</div><div class='del'>-		   struct exception_table_entry *finish);</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_MODVERSIONS) &amp;&amp; defined(CONFIG_PPC64)</div><div class='del'>-#define ARCH_RELOCATES_KCRCTAB</div><div class='del'>-#define reloc_start PHYSICAL_START</div><div class='del'>-#endif</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif	/* _ASM_POWERPC_MODULE_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/mutex.h b/arch/powerpc/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 078155fa1189..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,132 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Optimised mutex implementation of include/asm-generic/mutex-dec.h algorithm</div><div class='del'>- */</div><div class='del'>-#ifndef _ASM_POWERPC_MUTEX_H</div><div class='del'>-#define _ASM_POWERPC_MUTEX_H</div><div class='del'>-</div><div class='del'>-static inline int __mutex_cmpxchg_lock(atomic_t *v, int old, int new)</div><div class='del'>-{</div><div class='del'>-	int t;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__ (</div><div class='del'>-"1:	lwarx	%0,0,%1		# mutex trylock\n\</div><div class='del'>-	cmpw	0,%0,%2\n\</div><div class='del'>-	bne-	2f\n"</div><div class='del'>-	PPC405_ERR77(0,%1)</div><div class='del'>-"	stwcx.	%3,0,%1\n\</div><div class='del'>-	bne-	1b"</div><div class='del'>-	PPC_ACQUIRE_BARRIER</div><div class='del'>-	"\n\</div><div class='del'>-2:"</div><div class='del'>-	: "=&amp;r" (t)</div><div class='del'>-	: "r" (&amp;v-&gt;counter), "r" (old), "r" (new)</div><div class='del'>-	: "cc", "memory");</div><div class='del'>-</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __mutex_dec_return_lock(atomic_t *v)</div><div class='del'>-{</div><div class='del'>-	int t;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-"1:	lwarx	%0,0,%1		# mutex lock\n\</div><div class='del'>-	addic	%0,%0,-1\n"</div><div class='del'>-	PPC405_ERR77(0,%1)</div><div class='del'>-"	stwcx.	%0,0,%1\n\</div><div class='del'>-	bne-	1b"</div><div class='del'>-	PPC_ACQUIRE_BARRIER</div><div class='del'>-	: "=&amp;r" (t)</div><div class='del'>-	: "r" (&amp;v-&gt;counter)</div><div class='del'>-	: "cc", "memory");</div><div class='del'>-</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __mutex_inc_return_unlock(atomic_t *v)</div><div class='del'>-{</div><div class='del'>-	int t;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-	PPC_RELEASE_BARRIER</div><div class='del'>-"1:	lwarx	%0,0,%1		# mutex unlock\n\</div><div class='del'>-	addic	%0,%0,1\n"</div><div class='del'>-	PPC405_ERR77(0,%1)</div><div class='del'>-"	stwcx.	%0,0,%1 \n\</div><div class='del'>-	bne-	1b"</div><div class='del'>-	: "=&amp;r" (t)</div><div class='del'>-	: "r" (&amp;v-&gt;counter)</div><div class='del'>-	: "cc", "memory");</div><div class='del'>-</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  __mutex_fastpath_lock - try to take the lock by moving the count</div><div class='del'>- *                          from 1 to a 0 value</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *  @fail_fn: function to call if the original value was not 1</div><div class='del'>- *</div><div class='del'>- * Change the count from 1 to a value lower than 1, and call &lt;fail_fn&gt; if</div><div class='del'>- * it wasn't 1 originally. This function MUST leave the value lower than</div><div class='del'>- * 1 even when the "1" assertion wasn't true.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-__mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	if (unlikely(__mutex_dec_return_lock(count) &lt; 0))</div><div class='del'>-		fail_fn(count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  __mutex_fastpath_lock_retval - try to take the lock by moving the count</div><div class='del'>- *                                 from 1 to a 0 value</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *</div><div class='del'>- * Change the count from 1 to a value lower than 1. This function returns 0</div><div class='del'>- * if the fastpath succeeds, or -1 otherwise.</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-__mutex_fastpath_lock_retval(atomic_t *count)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(__mutex_dec_return_lock(count) &lt; 0))</div><div class='del'>-		return -1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  __mutex_fastpath_unlock - try to promote the count from 0 to 1</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *  @fail_fn: function to call if the original value was not 0</div><div class='del'>- *</div><div class='del'>- * Try to promote the count from 0 to 1. If it wasn't 0, call &lt;fail_fn&gt;.</div><div class='del'>- * In the failure case, this function is allowed to either set the value to</div><div class='del'>- * 1, or to set it to a value lower than 1.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-__mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	if (unlikely(__mutex_inc_return_unlock(count) &lt;= 0))</div><div class='del'>-		fail_fn(count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define __mutex_slowpath_needs_to_unlock()		1</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __mutex_fastpath_trylock - try to acquire the mutex, without waiting</div><div class='del'>- *</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *  @fail_fn: fallback function</div><div class='del'>- *</div><div class='del'>- * Change the count from 1 to 0, and return 1 (success), or if the count</div><div class='del'>- * was not 1, then return 0 (failure).</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-__mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	if (likely(atomic_read(count) == 1 &amp;&amp; __mutex_cmpxchg_lock(count, 1, 0) == 1))</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/powerpc/include/asm/nohash/32/pgalloc.h b/arch/powerpc/include/asm/nohash/32/pgalloc.h<br/>index 76d6b9e0c8a9..633139291a48 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/32/pgalloc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/nohash/32/pgalloc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/32/pgalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/32/pgalloc.h</a></div><div class='hunk'>@@ -2,14 +2,42 @@</div><div class='ctx'> #define _ASM_POWERPC_PGALLOC_32_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-/* For 32-bit, all levels of page tables are just drawn from get_free_page() */</div><div class='del'>-#define MAX_PGTABLE_INDEX_SIZE	0</div><div class='add'>+/*</div><div class='add'>+ * Functions that deal with pagetables that could be at any level of</div><div class='add'>+ * the table need to be passed an "index_size" so they know how to</div><div class='add'>+ * handle allocation.  For PTE pages (which are linked to a struct</div><div class='add'>+ * page for now, and drawn from the main get_free_pages() pool), the</div><div class='add'>+ * allocation size will be (2^index_size * sizeof(pointer)) and</div><div class='add'>+ * allocations are drawn from the kmem_cache in PGT_CACHE(index_size).</div><div class='add'>+ *</div><div class='add'>+ * The maximum index size needs to be big enough to allow any</div><div class='add'>+ * pagetable sizes we need, but small enough to fit in the low bits of</div><div class='add'>+ * any page table pointer.  In other words all pagetables, even tiny</div><div class='add'>+ * ones, must be aligned to allow at least enough low 0 bits to</div><div class='add'>+ * contain this value.  This value is also used as a mask, so it must</div><div class='add'>+ * be one less than a power of two.</div><div class='add'>+ */</div><div class='add'>+#define MAX_PGTABLE_INDEX_SIZE	0xf</div><div class='ctx'> </div><div class='ctx'> extern void __bad_pte(pmd_t *pmd);</div><div class='ctx'> </div><div class='del'>-extern pgd_t *pgd_alloc(struct mm_struct *mm);</div><div class='del'>-extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);</div><div class='add'>+extern struct kmem_cache *pgtable_cache[];</div><div class='add'>+#define PGT_CACHE(shift) ({				\</div><div class='add'>+			BUG_ON(!(shift));		\</div><div class='add'>+			pgtable_cache[(shift) - 1];	\</div><div class='add'>+		})</div><div class='add'>+</div><div class='add'>+static inline pgd_t *pgd_alloc(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	return kmem_cache_alloc(PGT_CACHE(PGD_INDEX_SIZE), GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)</div><div class='add'>+{</div><div class='add'>+	kmem_cache_free(PGT_CACHE(PGD_INDEX_SIZE), pgd);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We don't have any real pmd's, and this code never triggers because</div><div class='hunk'>@@ -68,8 +96,12 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage)</div><div class='ctx'> </div><div class='ctx'> static inline void pgtable_free(void *table, unsigned index_size)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(index_size); /* 32-bit doesn't use this */</div><div class='del'>-	free_page((unsigned long)table);</div><div class='add'>+	if (!index_size) {</div><div class='add'>+		free_page((unsigned long)table);</div><div class='add'>+	} else {</div><div class='add'>+		BUG_ON(index_size &gt; MAX_PGTABLE_INDEX_SIZE);</div><div class='add'>+		kmem_cache_free(PGT_CACHE(index_size), table);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define check_pgt_cache()	do { } while (0)</div><div class='head'>diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h<br/>index c219ef7be53b..ba9921bf202e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/32/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/nohash/32/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/32/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/32/pgtable.h</a></div><div class='hunk'>@@ -16,6 +16,23 @@ extern int icache_44x_need_flush;</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='add'>+#define PTE_INDEX_SIZE	PTE_SHIFT</div><div class='add'>+#define PMD_INDEX_SIZE	0</div><div class='add'>+#define PUD_INDEX_SIZE	0</div><div class='add'>+#define PGD_INDEX_SIZE	(32 - PGDIR_SHIFT)</div><div class='add'>+</div><div class='add'>+#define PMD_CACHE_INDEX	PMD_INDEX_SIZE</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+#define PTE_TABLE_SIZE	(sizeof(pte_t) &lt;&lt; PTE_INDEX_SIZE)</div><div class='add'>+#define PMD_TABLE_SIZE	0</div><div class='add'>+#define PUD_TABLE_SIZE	0</div><div class='add'>+#define PGD_TABLE_SIZE	(sizeof(pgd_t) &lt;&lt; PGD_INDEX_SIZE)</div><div class='add'>+#endif	/* __ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+#define PTRS_PER_PTE	(1 &lt;&lt; PTE_INDEX_SIZE)</div><div class='add'>+#define PTRS_PER_PGD	(1 &lt;&lt; PGD_INDEX_SIZE)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The normal case is that PTEs are 32-bits and we have a 1-page</div><div class='ctx'>  * 1024-entry pgdir pointing to 1-page 1024-entry PTE pages.  -- paulus</div><div class='hunk'>@@ -27,22 +44,12 @@ extern int icache_44x_need_flush;</div><div class='ctx'>  * -Matt</div><div class='ctx'>  */</div><div class='ctx'> /* PGDIR_SHIFT determines what a top-level page table entry can map */</div><div class='del'>-#define PGDIR_SHIFT	(PAGE_SHIFT + PTE_SHIFT)</div><div class='add'>+#define PGDIR_SHIFT	(PAGE_SHIFT + PTE_INDEX_SIZE)</div><div class='ctx'> #define PGDIR_SIZE	(1UL &lt;&lt; PGDIR_SHIFT)</div><div class='ctx'> #define PGDIR_MASK	(~(PGDIR_SIZE-1))</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * entries per page directory level: our page-table tree is two-level, so</div><div class='del'>- * we don't really have any PMD directory.</div><div class='del'>- */</div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-#define PTE_TABLE_SIZE	(sizeof(pte_t) &lt;&lt; PTE_SHIFT)</div><div class='del'>-#define PGD_TABLE_SIZE	(sizeof(pgd_t) &lt;&lt; (32 - PGDIR_SHIFT))</div><div class='del'>-#endif	/* __ASSEMBLY__ */</div><div class='del'>-</div><div class='del'>-#define PTRS_PER_PTE	(1 &lt;&lt; PTE_SHIFT)</div><div class='del'>-#define PTRS_PER_PMD	1</div><div class='del'>-#define PTRS_PER_PGD	(1 &lt;&lt; (32 - PGDIR_SHIFT))</div><div class='add'>+/* Bits to mask out from a PGD to get to the PUD page */</div><div class='add'>+#define PGD_MASKED_BITS		0</div><div class='ctx'> </div><div class='ctx'> #define USER_PTRS_PER_PGD	(TASK_SIZE / PGDIR_SIZE)</div><div class='ctx'> #define FIRST_USER_ADDRESS	0UL</div><div class='hunk'>@@ -268,7 +275,8 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static inline void __ptep_set_access_flags(struct mm_struct *mm,</div><div class='del'>-					   pte_t *ptep, pte_t entry)</div><div class='add'>+					   pte_t *ptep, pte_t entry,</div><div class='add'>+					   unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long set = pte_val(entry) &amp;</div><div class='ctx'> 		(_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC);</div><div class='hunk'>@@ -328,15 +336,6 @@ static inline void __ptep_set_access_flags(struct mm_struct *mm,</div><div class='ctx'> #define __pte_to_swp_entry(pte)		((swp_entry_t) { pte_val(pte) &gt;&gt; 3 })</div><div class='ctx'> #define __swp_entry_to_pte(x)		((pte_t) { (x).val &lt;&lt; 3 })</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_PPC_4K_PAGES</div><div class='del'>-void pgtable_cache_init(void);</div><div class='del'>-#else</div><div class='del'>-/*</div><div class='del'>- * No page table caches to initialise</div><div class='del'>- */</div><div class='del'>-#define pgtable_cache_init()	do { } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep,</div><div class='ctx'> 		      pmd_t **pmdp);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/nohash/32/pte-8xx.h b/arch/powerpc/include/asm/nohash/32/pte-8xx.h<br/>index 3742b1919661..b4df2734c078 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/32/pte-8xx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/nohash/32/pte-8xx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/32/pte-8xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/32/pte-8xx.h</a></div><div class='hunk'>@@ -49,6 +49,7 @@</div><div class='ctx'> #define _PMD_BAD	0x0ff0</div><div class='ctx'> #define _PMD_PAGE_MASK	0x000c</div><div class='ctx'> #define _PMD_PAGE_8M	0x000c</div><div class='add'>+#define _PMD_PAGE_512K	0x0004</div><div class='ctx'> </div><div class='ctx'> /* Until my rework is finished, 8xx still needs atomic PTE updates */</div><div class='ctx'> #define PTE_ATOMIC_UPDATES	1</div><div class='head'>diff --git a/arch/powerpc/include/asm/nohash/64/pgtable-4k.h b/arch/powerpc/include/asm/nohash/64/pgtable-4k.h<br/>index fc7d51753f81..d0db98793dd8 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/64/pgtable-4k.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/nohash/64/pgtable-4k.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/64/pgtable-4k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/64/pgtable-4k.h</a></div><div class='hunk'>@@ -27,9 +27,6 @@</div><div class='ctx'> #define PMD_SIZE	(1UL &lt;&lt; PMD_SHIFT)</div><div class='ctx'> #define PMD_MASK	(~(PMD_SIZE-1))</div><div class='ctx'> </div><div class='del'>-/* With 4k base page size, hugepage PTEs go at the PMD level */</div><div class='del'>-#define MIN_HUGEPTE_SHIFT	PMD_SHIFT</div><div class='del'>-</div><div class='ctx'> /* PUD_SHIFT determines what a third-level page table entry can map */</div><div class='ctx'> #define PUD_SHIFT	(PMD_SHIFT + PMD_INDEX_SIZE)</div><div class='ctx'> #define PUD_SIZE	(1UL &lt;&lt; PUD_SHIFT)</div><div class='head'>diff --git a/arch/powerpc/include/asm/nohash/64/pgtable-64k.h b/arch/powerpc/include/asm/nohash/64/pgtable-64k.h<br/>index 908324574f77..55b28ef3409a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/64/pgtable-64k.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/nohash/64/pgtable-64k.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/64/pgtable-64k.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/64/pgtable-64k.h</a></div><div class='hunk'>@@ -31,9 +31,6 @@</div><div class='ctx'> #define PTRS_PER_PMD	(1 &lt;&lt; PMD_INDEX_SIZE)</div><div class='ctx'> #define PTRS_PER_PGD	(1 &lt;&lt; PGD_INDEX_SIZE)</div><div class='ctx'> </div><div class='del'>-/* With 4k base page size, hugepage PTEs go at the PMD level */</div><div class='del'>-#define MIN_HUGEPTE_SHIFT	PAGE_SHIFT</div><div class='del'>-</div><div class='ctx'> /* PMD_SHIFT determines what a second-level page table entry can map */</div><div class='ctx'> #define PMD_SHIFT	(PAGE_SHIFT + PTE_INDEX_SIZE)</div><div class='ctx'> #define PMD_SIZE	(1UL &lt;&lt; PMD_SHIFT)</div><div class='head'>diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h<br/>index 653a1838469d..c7f927e67d14 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/64/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/nohash/64/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/64/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/64/pgtable.h</a></div><div class='hunk'>@@ -26,15 +26,11 @@</div><div class='ctx'> #else</div><div class='ctx'> #define PMD_CACHE_INDEX	PMD_INDEX_SIZE</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Define the address range of the kernel non-linear virtual area</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PPC_BOOK3E</div><div class='ctx'> #define KERN_VIRT_START ASM_CONST(0x8000000000000000)</div><div class='del'>-#else</div><div class='del'>-#define KERN_VIRT_START ASM_CONST(0xD000000000000000)</div><div class='del'>-#endif</div><div class='ctx'> #define KERN_VIRT_SIZE	ASM_CONST(0x0000100000000000)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -43,11 +39,7 @@</div><div class='ctx'>  * (we keep a quarter for the virtual memmap)</div><div class='ctx'>  */</div><div class='ctx'> #define VMALLOC_START	KERN_VIRT_START</div><div class='del'>-#ifdef CONFIG_PPC_BOOK3E</div><div class='ctx'> #define VMALLOC_SIZE	(KERN_VIRT_SIZE &gt;&gt; 2)</div><div class='del'>-#else</div><div class='del'>-#define VMALLOC_SIZE	(KERN_VIRT_SIZE &gt;&gt; 1)</div><div class='del'>-#endif</div><div class='ctx'> #define VMALLOC_END	(VMALLOC_START + VMALLOC_SIZE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -85,12 +77,8 @@</div><div class='ctx'>  * Defines the address of the vmemap area, in its own region on</div><div class='ctx'>  * hash table CPUs and after the vmalloc space on Book3E</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PPC_BOOK3E</div><div class='ctx'> #define VMEMMAP_BASE		VMALLOC_END</div><div class='ctx'> #define VMEMMAP_END		KERN_IO_START</div><div class='del'>-#else</div><div class='del'>-#define VMEMMAP_BASE		(VMEMMAP_REGION_ID &lt;&lt; REGION_SHIFT)</div><div class='del'>-#endif</div><div class='ctx'> #define vmemmap			((struct page *)VMEMMAP_BASE)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -301,7 +289,8 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'>  * function doesn't need to flush the hash entry</div><div class='ctx'>  */</div><div class='ctx'> static inline void __ptep_set_access_flags(struct mm_struct *mm,</div><div class='del'>-					   pte_t *ptep, pte_t entry)</div><div class='add'>+					   pte_t *ptep, pte_t entry,</div><div class='add'>+					   unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long bits = pte_val(entry) &amp;</div><div class='ctx'> 		(_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC);</div><div class='hunk'>@@ -358,8 +347,6 @@ static inline void __ptep_set_access_flags(struct mm_struct *mm,</div><div class='ctx'> #define __pte_to_swp_entry(pte)		((swp_entry_t) { pte_val((pte)) })</div><div class='ctx'> #define __swp_entry_to_pte(x)		__pte((x).val)</div><div class='ctx'> </div><div class='del'>-void pgtable_cache_add(unsigned shift, void (*ctor)(void *));</div><div class='del'>-void pgtable_cache_init(void);</div><div class='ctx'> extern int map_kernel_page(unsigned long ea, unsigned long pa,</div><div class='ctx'> 			   unsigned long flags);</div><div class='ctx'> extern int __meminit vmemmap_create_mapping(unsigned long start,</div><div class='head'>diff --git a/arch/powerpc/include/asm/nohash/pgtable.h b/arch/powerpc/include/asm/nohash/pgtable.h<br/>index 1263c22d60d8..0cd8a3852763 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/nohash/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/nohash/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/nohash/pgtable.h</a></div><div class='hunk'>@@ -226,7 +226,12 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,</div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> static inline int hugepd_ok(hugepd_t hpd)</div><div class='ctx'> {</div><div class='del'>-	return (hpd.pd &gt; 0);</div><div class='add'>+#ifdef CONFIG_PPC_8xx</div><div class='add'>+	return ((hpd_val(hpd) &amp; 0x4) != 0);</div><div class='add'>+#else</div><div class='add'>+	/* We clear the top bit to indicate hugepd */</div><div class='add'>+	return ((hpd_val(hpd) &amp; PD_HUGE) ==  0);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int pmd_huge(pmd_t pmd)</div><div class='head'>diff --git a/arch/powerpc/include/asm/opal-api.h b/arch/powerpc/include/asm/opal-api.h<br/>index 0e2e57bcab50..a0aa285869b5 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/opal-api.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/opal-api.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/opal-api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/opal-api.h</a></div><div class='hunk'>@@ -167,7 +167,8 @@</div><div class='ctx'> #define OPAL_INT_EOI				124</div><div class='ctx'> #define OPAL_INT_SET_MFRR			125</div><div class='ctx'> #define OPAL_PCI_TCE_KILL			126</div><div class='del'>-#define OPAL_LAST				126</div><div class='add'>+#define OPAL_NMMU_SET_PTCR			127</div><div class='add'>+#define OPAL_LAST				127</div><div class='ctx'> </div><div class='ctx'> /* Device tree flags */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h<br/>index e958b7096f19..1ff03a6da76e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/opal.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/opal.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/opal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/opal.h</a></div><div class='hunk'>@@ -67,7 +67,6 @@ int64_t opal_pci_config_write_half_word(uint64_t phb_id, uint64_t bus_dev_func,</div><div class='ctx'> int64_t opal_pci_config_write_word(uint64_t phb_id, uint64_t bus_dev_func,</div><div class='ctx'> 				   uint64_t offset, uint32_t data);</div><div class='ctx'> int64_t opal_set_xive(uint32_t isn, uint16_t server, uint8_t priority);</div><div class='del'>-int64_t opal_rm_set_xive(uint32_t isn, uint16_t server, uint8_t priority);</div><div class='ctx'> int64_t opal_get_xive(uint32_t isn, __be16 *server, uint8_t *priority);</div><div class='ctx'> int64_t opal_register_exception_handler(uint64_t opal_exception,</div><div class='ctx'> 					uint64_t handler_address,</div><div class='hunk'>@@ -226,9 +225,7 @@ int64_t opal_int_set_mfrr(uint32_t cpu, uint8_t mfrr);</div><div class='ctx'> int64_t opal_pci_tce_kill(uint64_t phb_id, uint32_t kill_type,</div><div class='ctx'> 			  uint32_t pe_num, uint32_t tce_size,</div><div class='ctx'> 			  uint64_t dma_addr, uint32_t npages);</div><div class='del'>-int64_t opal_rm_pci_tce_kill(uint64_t phb_id, uint32_t kill_type,</div><div class='del'>-			     uint32_t pe_num, uint32_t tce_size,</div><div class='del'>-			     uint64_t dma_addr, uint32_t npages);</div><div class='add'>+int64_t opal_nmmu_set_ptcr(uint64_t chip_id, uint64_t ptcr);</div><div class='ctx'> </div><div class='ctx'> /* Internal functions */</div><div class='ctx'> extern int early_init_dt_scan_opal(unsigned long node, const char *uname,</div><div class='head'>diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h<br/>index 6a6792bb39fb..708c3e592eeb 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/paca.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/paca.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/paca.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/paca.h</a></div><div class='hunk'>@@ -187,7 +187,6 @@ struct paca_struct {</div><div class='ctx'> </div><div class='ctx'> 	/* Stuff for accurate time accounting */</div><div class='ctx'> 	struct cpu_accounting_data accounting;</div><div class='del'>-	u64 stolen_time;		/* TB ticks taken by hypervisor */</div><div class='ctx'> 	u64 dtl_ridx;			/* read index in dispatch log */</div><div class='ctx'> 	struct dtl_entry *dtl_curr;	/* pointer corresponding to dtl_ridx */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h<br/>index 56398e7e6100..2a32483c7b6c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/page.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/page.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/page.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/page.h</a></div><div class='hunk'>@@ -230,7 +230,9 @@ extern long long virt_phys_offset;</div><div class='ctx'>  * and needs to be executable.  This means the whole heap ends</div><div class='ctx'>  * up being executable.</div><div class='ctx'>  */</div><div class='del'>-#define VM_DATA_DEFAULT_FLAGS32	(VM_READ | VM_WRITE | VM_EXEC | \</div><div class='add'>+#define VM_DATA_DEFAULT_FLAGS32 \</div><div class='add'>+	(((current-&gt;personality &amp; READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \</div><div class='add'>+				 VM_READ | VM_WRITE | \</div><div class='ctx'> 				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)</div><div class='ctx'> </div><div class='ctx'> #define VM_DATA_DEFAULT_FLAGS64	(VM_READ | VM_WRITE | \</div><div class='hunk'>@@ -294,15 +296,12 @@ extern long long virt_phys_offset;</div><div class='ctx'> #include &lt;asm/pgtable-types.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-typedef struct { signed long pd; } hugepd_t;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_HUGETLB_PAGE</div><div class='ctx'> #define is_hugepd(pdep)		(0)</div><div class='ctx'> #define pgd_huge(pgd)		(0)</div><div class='ctx'> #endif /* CONFIG_HUGETLB_PAGE */</div><div class='ctx'> </div><div class='del'>-#define __hugepd(x) ((hugepd_t) { (x) })</div><div class='del'>-</div><div class='ctx'> struct page;</div><div class='ctx'> extern void clear_user_page(void *page, unsigned long vaddr, struct page *pg);</div><div class='ctx'> extern void copy_user_page(void *to, void *from, unsigned long vaddr,</div><div class='head'>diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h<br/>index dd5f0712afa2..3e83d2a20b6f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/page_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/page_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/page_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/page_64.h</a></div><div class='hunk'>@@ -47,14 +47,14 @@ static inline void clear_page(void *addr)</div><div class='ctx'> 	unsigned long iterations;</div><div class='ctx'> 	unsigned long onex, twox, fourx, eightx;</div><div class='ctx'> </div><div class='del'>-	iterations = ppc64_caches.dlines_per_page / 8;</div><div class='add'>+	iterations = ppc64_caches.l1d.blocks_per_page / 8;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some verisions of gcc use multiply instructions to</div><div class='ctx'> 	 * calculate the offsets so lets give it a hand to</div><div class='ctx'> 	 * do better.</div><div class='ctx'> 	 */</div><div class='del'>-	onex = ppc64_caches.dline_size;</div><div class='add'>+	onex = ppc64_caches.l1d.block_size;</div><div class='ctx'> 	twox = onex &lt;&lt; 1;</div><div class='ctx'> 	fourx = onex &lt;&lt; 2;</div><div class='ctx'> 	eightx = onex &lt;&lt; 3;</div><div class='head'>diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h<br/>index c0309c59bed8..56c67d3f0108 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/pci-bridge.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/pci-bridge.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/pci-bridge.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pci-bridge.h</a></div><div class='hunk'>@@ -174,14 +174,6 @@ extern int pci_device_from_OF_node(struct device_node *node,</div><div class='ctx'> 				   u8 *bus, u8 *devfn);</div><div class='ctx'> extern void pci_create_OF_bus_map(void);</div><div class='ctx'> </div><div class='del'>-static inline int isa_vaddr_is_ioport(void __iomem *address)</div><div class='del'>-{</div><div class='del'>-	/* No specific ISA handling on ppc32 at this stage, it</div><div class='del'>-	 * all goes through PCI</div><div class='del'>-	 */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #else	/* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -269,16 +261,6 @@ extern void pci_hp_remove_devices(struct pci_bus *bus);</div><div class='ctx'> /** Discover new pci devices under this bus, and add them */</div><div class='ctx'> extern void pci_hp_add_devices(struct pci_bus *bus);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-extern void isa_bridge_find_early(struct pci_controller *hose);</div><div class='del'>-</div><div class='del'>-static inline int isa_vaddr_is_ioport(void __iomem *address)</div><div class='del'>-{</div><div class='del'>-	/* Check if address hits the reserved legacy IO range */</div><div class='del'>-	unsigned long ea = (unsigned long)address;</div><div class='del'>-	return ea &gt;= ISA_IO_BASE &amp;&amp; ea &lt; ISA_IO_END;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern int pcibios_unmap_io_space(struct pci_bus *bus);</div><div class='ctx'> extern int pcibios_map_io_space(struct pci_bus *bus);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h<br/>index e9bd6cf0212f..93eded8d3843 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/pci.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/pci.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pci.h</a></div><div class='hunk'>@@ -53,8 +53,8 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-extern void set_pci_dma_ops(struct dma_map_ops *dma_ops);</div><div class='del'>-extern struct dma_map_ops *get_pci_dma_ops(void);</div><div class='add'>+extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops);</div><div class='add'>+extern const struct dma_map_ops *get_pci_dma_ops(void);</div><div class='ctx'> #else	/* CONFIG_PCI */</div><div class='ctx'> #define set_pci_dma_ops(d)</div><div class='ctx'> #define get_pci_dma_ops()	NULL</div><div class='head'>diff --git a/arch/powerpc/include/asm/perf_event_server.h b/arch/powerpc/include/asm/perf_event_server.h<br/>index e157489ee7a1..ae0a23091a9b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/perf_event_server.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/perf_event_server.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/perf_event_server.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/perf_event_server.h</a></div><div class='hunk'>@@ -65,6 +65,7 @@ struct power_pmu {</div><div class='ctx'> #define PPMU_HAS_SSLOT		0x00000020 /* Has sampled slot in MMCRA */</div><div class='ctx'> #define PPMU_HAS_SIER		0x00000040 /* Has SIER */</div><div class='ctx'> #define PPMU_ARCH_207S		0x00000080 /* PMC is architecture v2.07S */</div><div class='add'>+#define PPMU_NO_SIAR		0x00000100 /* Do not use SIAR */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Values for flags to get_alternatives()</div><div class='head'>diff --git a/arch/powerpc/include/asm/pgtable-be-types.h b/arch/powerpc/include/asm/pgtable-be-types.h<br/>index 49c0a5a80efa..9c0f5db5cf46 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/pgtable-be-types.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/pgtable-be-types.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/pgtable-be-types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pgtable-be-types.h</a></div><div class='hunk'>@@ -104,4 +104,12 @@ static inline bool pmd_xchg(pmd_t *pmdp, pmd_t old, pmd_t new)</div><div class='ctx'> 	return pmd_raw(old) == prev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+typedef struct { __be64 pdbe; } hugepd_t;</div><div class='add'>+#define __hugepd(x) ((hugepd_t) { cpu_to_be64(x) })</div><div class='add'>+</div><div class='add'>+static inline unsigned long hpd_val(hugepd_t x)</div><div class='add'>+{</div><div class='add'>+	return be64_to_cpu(x.pdbe);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_POWERPC_PGTABLE_BE_TYPES_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/pgtable-types.h b/arch/powerpc/include/asm/pgtable-types.h<br/>index e7f4f3e0fcde..8bd3b13fe2fb 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/pgtable-types.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/pgtable-types.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/pgtable-types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pgtable-types.h</a></div><div class='hunk'>@@ -66,4 +66,11 @@ static inline bool pte_xchg(pte_t *ptep, pte_t old, pte_t new)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+typedef struct { unsigned long pd; } hugepd_t;</div><div class='add'>+#define __hugepd(x) ((hugepd_t) { (x) })</div><div class='add'>+static inline unsigned long hpd_val(hugepd_t x)</div><div class='add'>+{</div><div class='add'>+	return x.pd;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_POWERPC_PGTABLE_TYPES_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h<br/>index 9bd87f269d6d..dd01212935ac 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pgtable.h</a></div><div class='hunk'>@@ -78,6 +78,8 @@ static inline pte_t *find_linux_pte_or_hugepte(pgd_t *pgdir, unsigned long ea,</div><div class='ctx'> </div><div class='ctx'> unsigned long vmalloc_to_phys(void *vmalloc_addr);</div><div class='ctx'> </div><div class='add'>+void pgtable_cache_add(unsigned shift, void (*ctor)(void *));</div><div class='add'>+void pgtable_cache_init(void);</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_POWERPC_PGTABLE_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/plpar_wrappers.h b/arch/powerpc/include/asm/plpar_wrappers.h<br/>index 1b394247afc2..c7b164836bc3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/plpar_wrappers.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/plpar_wrappers.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/plpar_wrappers.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/plpar_wrappers.h</a></div><div class='hunk'>@@ -93,38 +93,6 @@ static inline long register_dtl(unsigned long cpu, unsigned long vpa)</div><div class='ctx'> 	return vpa_call(H_VPA_REG_DTL, cpu, vpa);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline long plpar_page_set_loaned(unsigned long vpa)</div><div class='del'>-{</div><div class='del'>-	unsigned long cmo_page_sz = cmo_get_page_size();</div><div class='del'>-	long rc = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; !rc &amp;&amp; i &lt; PAGE_SIZE; i += cmo_page_sz)</div><div class='del'>-		rc = plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED, vpa + i, 0);</div><div class='del'>-</div><div class='del'>-	for (i -= cmo_page_sz; rc &amp;&amp; i != 0; i -= cmo_page_sz)</div><div class='del'>-		plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE,</div><div class='del'>-				   vpa + i - cmo_page_sz, 0);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline long plpar_page_set_active(unsigned long vpa)</div><div class='del'>-{</div><div class='del'>-	unsigned long cmo_page_sz = cmo_get_page_size();</div><div class='del'>-	long rc = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; !rc &amp;&amp; i &lt; PAGE_SIZE; i += cmo_page_sz)</div><div class='del'>-		rc = plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE, vpa + i, 0);</div><div class='del'>-</div><div class='del'>-	for (i -= cmo_page_sz; rc &amp;&amp; i != 0; i -= cmo_page_sz)</div><div class='del'>-		plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED,</div><div class='del'>-				   vpa + i - cmo_page_sz, 0);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern void vpa_init(int cpu);</div><div class='ctx'> </div><div class='ctx'> static inline long plpar_pte_enter(unsigned long flags,</div><div class='hunk'>@@ -242,6 +210,18 @@ static inline long plpar_pte_protect(unsigned long flags, unsigned long ptex,</div><div class='ctx'> 	return plpar_hcall_norets(H_PROTECT, flags, ptex, avpn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline long plpar_resize_hpt_prepare(unsigned long flags,</div><div class='add'>+					    unsigned long shift)</div><div class='add'>+{</div><div class='add'>+	return plpar_hcall_norets(H_RESIZE_HPT_PREPARE, flags, shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long plpar_resize_hpt_commit(unsigned long flags,</div><div class='add'>+					   unsigned long shift)</div><div class='add'>+{</div><div class='add'>+	return plpar_hcall_norets(H_RESIZE_HPT_COMMIT, flags, shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline long plpar_tce_get(unsigned long liobn, unsigned long ioba,</div><div class='ctx'> 		unsigned long *tce_ret)</div><div class='ctx'> {</div><div class='hunk'>@@ -340,4 +320,9 @@ static inline long plapr_set_watchpoint0(unsigned long dawr0, unsigned long dawr</div><div class='ctx'> 	return plpar_set_mode(0, H_SET_MODE_RESOURCE_SET_DAWR, dawr0, dawrx0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline long plapr_signal_sys_reset(long cpu)</div><div class='add'>+{</div><div class='add'>+	return plpar_hcall_norets(H_SIGNAL_SYS_RESET, cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_POWERPC_PLPAR_WRAPPERS_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/pnv-pci.h b/arch/powerpc/include/asm/pnv-pci.h<br/>index 696438f09aea..de9681034353 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/pnv-pci.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/pnv-pci.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/pnv-pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/pnv-pci.h</a></div><div class='hunk'>@@ -57,6 +57,8 @@ struct pnv_php_slot {</div><div class='ctx'> 	uint64_t			id;</div><div class='ctx'> 	char				*name;</div><div class='ctx'> 	int				slot_no;</div><div class='add'>+	unsigned int			flags;</div><div class='add'>+#define PNV_PHP_FLAG_BROKEN_PDC		0x1</div><div class='ctx'> 	struct kref			kref;</div><div class='ctx'> #define PNV_PHP_STATE_INITIALIZED	0</div><div class='ctx'> #define PNV_PHP_STATE_REGISTERED	1</div><div class='head'>diff --git a/arch/powerpc/include/asm/powernv.h b/arch/powerpc/include/asm/powernv.h<br/>new file mode 100644<br/>index 000000000000..0e9c2402dd20<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/powernv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/powernv.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2017 IBM Corp.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ASM_POWERNV_H</div><div class='add'>+#define _ASM_POWERNV_H</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_POWERNV</div><div class='add'>+extern void powernv_set_nmmu_ptcr(unsigned long ptcr);</div><div class='add'>+#else</div><div class='add'>+static inline void powernv_set_nmmu_ptcr(unsigned long ptcr) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_POWERNV_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h<br/>index c56ea8c84abb..d99bd442aacb 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/ppc-opcode.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/ppc-opcode.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/ppc-opcode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/ppc-opcode.h</a></div><div class='hunk'>@@ -157,7 +157,7 @@</div><div class='ctx'> #define PPC_INST_MCRXR			0x7c000400</div><div class='ctx'> #define PPC_INST_MCRXR_MASK		0xfc0007fe</div><div class='ctx'> #define PPC_INST_MFSPR_PVR		0x7c1f42a6</div><div class='del'>-#define PPC_INST_MFSPR_PVR_MASK		0xfc1fffff</div><div class='add'>+#define PPC_INST_MFSPR_PVR_MASK		0xfc1ffffe</div><div class='ctx'> #define PPC_INST_MFTMR			0x7c0002dc</div><div class='ctx'> #define PPC_INST_MSGSND			0x7c00019c</div><div class='ctx'> #define PPC_INST_MSGCLR			0x7c0001dc</div><div class='hunk'>@@ -174,13 +174,13 @@</div><div class='ctx'> #define PPC_INST_RFDI			0x4c00004e</div><div class='ctx'> #define PPC_INST_RFMCI			0x4c00004c</div><div class='ctx'> #define PPC_INST_MFSPR_DSCR		0x7c1102a6</div><div class='del'>-#define PPC_INST_MFSPR_DSCR_MASK	0xfc1fffff</div><div class='add'>+#define PPC_INST_MFSPR_DSCR_MASK	0xfc1ffffe</div><div class='ctx'> #define PPC_INST_MTSPR_DSCR		0x7c1103a6</div><div class='del'>-#define PPC_INST_MTSPR_DSCR_MASK	0xfc1fffff</div><div class='add'>+#define PPC_INST_MTSPR_DSCR_MASK	0xfc1ffffe</div><div class='ctx'> #define PPC_INST_MFSPR_DSCR_USER	0x7c0302a6</div><div class='del'>-#define PPC_INST_MFSPR_DSCR_USER_MASK	0xfc1fffff</div><div class='add'>+#define PPC_INST_MFSPR_DSCR_USER_MASK	0xfc1ffffe</div><div class='ctx'> #define PPC_INST_MTSPR_DSCR_USER	0x7c0303a6</div><div class='del'>-#define PPC_INST_MTSPR_DSCR_USER_MASK	0xfc1fffff</div><div class='add'>+#define PPC_INST_MTSPR_DSCR_USER_MASK	0xfc1ffffe</div><div class='ctx'> #define PPC_INST_MFVSRD			0x7c000066</div><div class='ctx'> #define PPC_INST_MTVSRD			0x7c000166</div><div class='ctx'> #define PPC_INST_SLBFEE			0x7c0007a7</div><div class='hunk'>@@ -306,6 +306,7 @@</div><div class='ctx'> #define __PPC_WC(w)	(((w) &amp; 0x3) &lt;&lt; 21)</div><div class='ctx'> #define __PPC_WS(w)	(((w) &amp; 0x1f) &lt;&lt; 11)</div><div class='ctx'> #define __PPC_SH(s)	__PPC_WS(s)</div><div class='add'>+#define __PPC_SH64(s)	(__PPC_SH(s) | (((s) &amp; 0x20) &gt;&gt; 4))</div><div class='ctx'> #define __PPC_MB(s)	(((s) &amp; 0x1f) &lt;&lt; 6)</div><div class='ctx'> #define __PPC_ME(s)	(((s) &amp; 0x1f) &lt;&lt; 1)</div><div class='ctx'> #define __PPC_MB64(s)	(__PPC_MB(s) | ((s) &amp; 0x20))</div><div class='head'>diff --git a/arch/powerpc/include/asm/ppc-pci.h b/arch/powerpc/include/asm/ppc-pci.h<br/>index 0f73de069f19..726288048652 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/ppc-pci.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/ppc-pci.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/ppc-pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/ppc-pci.h</a></div><div class='hunk'>@@ -53,7 +53,7 @@ void eeh_addr_cache_rmv_dev(struct pci_dev *dev);</div><div class='ctx'> struct eeh_dev *eeh_addr_cache_get_dev(unsigned long addr);</div><div class='ctx'> void eeh_slot_error_detail(struct eeh_pe *pe, int severity);</div><div class='ctx'> int eeh_pci_enable(struct eeh_pe *pe, int function);</div><div class='del'>-int eeh_reset_pe(struct eeh_pe *);</div><div class='add'>+int eeh_pe_reset_full(struct eeh_pe *pe);</div><div class='ctx'> void eeh_save_bars(struct eeh_dev *edev);</div><div class='ctx'> int rtas_write_config(struct pci_dn *, int where, int size, u32 val);</div><div class='ctx'> int rtas_read_config(struct pci_dn *, int where, int size, u32 *val);</div><div class='head'>diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h<br/>index c73750b0d9fa..359c44341761 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/ppc_asm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/ppc_asm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/ppc_asm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/ppc_asm.h</a></div><div class='hunk'>@@ -10,9 +10,7 @@</div><div class='ctx'> #include &lt;asm/ppc-opcode.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-#error __FILE__ should only be used in assembler files</div><div class='del'>-#else</div><div class='add'>+#ifdef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> #define SZL			(BITS_PER_LONG/8)</div><div class='ctx'> </div><div class='hunk'>@@ -265,10 +263,14 @@ n:</div><div class='ctx'>  * latter is for those that incdentially must be excluded from probing</div><div class='ctx'>  * and allows them to be linked at more optimal location within text.</div><div class='ctx'>  */</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> #define _ASM_NOKPROBE_SYMBOL(entry)			\</div><div class='ctx'> 	.pushsection "_kprobe_blacklist","aw";		\</div><div class='ctx'> 	PPC_LONG (entry) ;				\</div><div class='ctx'> 	.popsection</div><div class='add'>+#else</div><div class='add'>+#define _ASM_NOKPROBE_SYMBOL(entry)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define FUNC_START(name)	_GLOBAL(name)</div><div class='ctx'> #define FUNC_END(name)</div><div class='hunk'>@@ -503,7 +505,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)</div><div class='ctx'> #define MTMSRD(r)	mtmsrd	r</div><div class='ctx'> #define MTMSR_EERI(reg)	mtmsrd	reg,1</div><div class='ctx'> #else</div><div class='del'>-#define FIX_SRR1(ra, rb)</div><div class='ctx'> #ifndef CONFIG_40x</div><div class='ctx'> #define	RFI		rfi</div><div class='ctx'> #else</div><div class='hunk'>@@ -779,5 +780,17 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)</div><div class='ctx'> 	.long 0xa6037b7d; /* mtsrr1 r11				*/ \</div><div class='ctx'> 	.long 0x2400004c  /* rfid				*/</div><div class='ctx'> #endif /* !CONFIG_PPC_BOOK3E */</div><div class='add'>+</div><div class='ctx'> #endif /*  __ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helper macro for exception table entries</div><div class='add'>+ */</div><div class='add'>+#define EX_TABLE(_fault, _target)		\</div><div class='add'>+	stringify_in_c(.section __ex_table,"a";)\</div><div class='add'>+	stringify_in_c(.balign 4;)		\</div><div class='add'>+	stringify_in_c(.long (_fault) - . ;)	\</div><div class='add'>+	stringify_in_c(.long (_target) - . ;)	\</div><div class='add'>+	stringify_in_c(.previous)</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_POWERPC_PPC_ASM_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h<br/>index c07c31b0e89e..e0fecbcea2a2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/processor.h</a></div><div class='hunk'>@@ -225,6 +225,7 @@ struct thread_struct {</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> 	unsigned long	start_tb;	/* Start purr when proc switched in */</div><div class='ctx'> 	unsigned long	accum_tb;	/* Total accumulated purr for process */</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_HAVE_HW_BREAKPOINT</div><div class='ctx'> 	struct perf_event *ptrace_bps[HBP_NUM];</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -233,7 +234,6 @@ struct thread_struct {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct perf_event *last_hit_ubp;</div><div class='ctx'> #endif /* CONFIG_HAVE_HW_BREAKPOINT */</div><div class='del'>-#endif</div><div class='ctx'> 	struct arch_hw_breakpoint hw_brk; /* info on the hardware breakpoint */</div><div class='ctx'> 	unsigned long	trap_nr;	/* last trap # on this thread */</div><div class='ctx'> 	u8 load_fp;</div><div class='hunk'>@@ -312,8 +312,6 @@ struct thread_struct {</div><div class='ctx'> 	unsigned long	mmcr2;</div><div class='ctx'> 	unsigned 	mmcr0;</div><div class='ctx'> 	unsigned 	used_ebb;</div><div class='del'>-	unsigned long	lmrr;</div><div class='del'>-	unsigned long	lmser;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -404,8 +402,6 @@ static inline unsigned long __pack_fe01(unsigned int fpmode)</div><div class='ctx'> #define cpu_relax()	barrier()</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='del'>-</div><div class='ctx'> /* Check that a certain kernel stack pointer is valid in task_struct p */</div><div class='ctx'> int validate_sp(unsigned long sp, struct task_struct *p,</div><div class='ctx'>                        unsigned long nbytes);</div><div class='hunk'>@@ -458,7 +454,8 @@ extern int powersave_nap;	/* set if nap mode can be used in idle loop */</div><div class='ctx'> extern unsigned long power7_nap(int check_irq);</div><div class='ctx'> extern unsigned long power7_sleep(void);</div><div class='ctx'> extern unsigned long power7_winkle(void);</div><div class='del'>-extern unsigned long power9_idle_stop(unsigned long stop_level);</div><div class='add'>+extern unsigned long power9_idle_stop(unsigned long stop_psscr_val,</div><div class='add'>+				      unsigned long stop_psscr_mask);</div><div class='ctx'> </div><div class='ctx'> extern void flush_instruction_cache(void);</div><div class='ctx'> extern void hard_reset_now(void);</div><div class='head'>diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h<br/>index 7f436ba1b56f..4a90634e8322 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/prom.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/prom.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/prom.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/prom.h</a></div><div class='hunk'>@@ -121,6 +121,8 @@ struct of_drconf_cell {</div><div class='ctx'> #define OV1_PPC_2_06		0x02	/* set if we support PowerPC 2.06 */</div><div class='ctx'> #define OV1_PPC_2_07		0x01	/* set if we support PowerPC 2.07 */</div><div class='ctx'> </div><div class='add'>+#define OV1_PPC_3_00		0x80	/* set if we support PowerPC 3.00 */</div><div class='add'>+</div><div class='ctx'> /* Option vector 2: Open Firmware options supported */</div><div class='ctx'> #define OV2_REAL_MODE		0x20	/* set if we want OF in real mode */</div><div class='ctx'> </div><div class='hunk'>@@ -151,19 +153,22 @@ struct of_drconf_cell {</div><div class='ctx'> #define OV5_XCMO		0x0440	/* Page Coalescing */</div><div class='ctx'> #define OV5_TYPE1_AFFINITY	0x0580	/* Type 1 NUMA affinity */</div><div class='ctx'> #define OV5_PRRN		0x0540	/* Platform Resource Reassignment */</div><div class='del'>-#define OV5_PFO_HW_RNG		0x0E80	/* PFO Random Number Generator */</div><div class='del'>-#define OV5_PFO_HW_842		0x0E40	/* PFO Compression Accelerator */</div><div class='del'>-#define OV5_PFO_HW_ENCR		0x0E20	/* PFO Encryption Accelerator */</div><div class='del'>-#define OV5_SUB_PROCESSORS	0x0F01	/* 1,2,or 4 Sub-Processors supported */</div><div class='add'>+#define OV5_HP_EVT		0x0604	/* Hot Plug Event support */</div><div class='add'>+#define OV5_RESIZE_HPT		0x0601	/* Hash Page Table resizing */</div><div class='add'>+#define OV5_PFO_HW_RNG		0x1180	/* PFO Random Number Generator */</div><div class='add'>+#define OV5_PFO_HW_842		0x1140	/* PFO Compression Accelerator */</div><div class='add'>+#define OV5_PFO_HW_ENCR		0x1120	/* PFO Encryption Accelerator */</div><div class='add'>+#define OV5_SUB_PROCESSORS	0x1501	/* 1,2,or 4 Sub-Processors supported */</div><div class='add'>+#define OV5_XIVE_EXPLOIT	0x1701	/* XIVE exploitation supported */</div><div class='add'>+#define OV5_MMU_RADIX_300	0x1880	/* ISA v3.00 radix MMU supported */</div><div class='add'>+#define OV5_MMU_HASH_300	0x1840	/* ISA v3.00 hash MMU supported */</div><div class='add'>+#define OV5_MMU_SEGM_RADIX	0x1820	/* radix mode (no segmentation) */</div><div class='add'>+#define OV5_MMU_PROC_TBL	0x1810	/* hcall selects SLB or proc table */</div><div class='add'>+#define OV5_MMU_SLB		0x1800	/* always use SLB */</div><div class='add'>+#define OV5_MMU_GTSE		0x1808	/* Guest translation shootdown */</div><div class='ctx'> </div><div class='ctx'> /* Option Vector 6: IBM PAPR hints */</div><div class='ctx'> #define OV6_LINUX		0x02	/* Linux is our OS */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The architecture vector has an array of PVR mask/value pairs,</div><div class='del'>- * followed by # option vectors - 1, followed by the option vectors.</div><div class='del'>- */</div><div class='del'>-extern unsigned char ibm_architecture_vec[];</div><div class='del'>-</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* _POWERPC_PROM_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/ps3.h b/arch/powerpc/include/asm/ps3.h<br/>index a19f831a4cc9..17ee719e799f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/ps3.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/ps3.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/ps3.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/ps3.h</a></div><div class='hunk'>@@ -435,7 +435,7 @@ static inline void *ps3_system_bus_get_drvdata(</div><div class='ctx'> 	return dev_get_drvdata(&amp;dev-&gt;core);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* These two need global scope for get_dma_ops(). */</div><div class='add'>+/* These two need global scope for get_arch_dma_ops(). */</div><div class='ctx'> </div><div class='ctx'> extern struct bus_type ps3_system_bus_type;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h<br/>index 9e1499f98def..fc879fd6bdae 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/reg.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/reg.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/reg.h</a></div><div class='hunk'>@@ -153,6 +153,8 @@</div><div class='ctx'> #define PSSCR_EC		0x00100000 /* Exit Criterion */</div><div class='ctx'> #define PSSCR_ESL		0x00200000 /* Enable State Loss */</div><div class='ctx'> #define PSSCR_SD		0x00400000 /* Status Disable */</div><div class='add'>+#define PSSCR_PLS	0xf000000000000000 /* Power-saving Level Status */</div><div class='add'>+#define PSSCR_GUEST_VIS	0xf0000000000003ff /* Guest-visible PSSCR fields */</div><div class='ctx'> </div><div class='ctx'> /* Floating Point Status and Control Register (FPSCR) Fields */</div><div class='ctx'> #define FPSCR_FX	0x80000000	/* FPU exception summary */</div><div class='hunk'>@@ -236,6 +238,7 @@</div><div class='ctx'> #define SPRN_TEXASRU	0x83	/* ''	   ''	   ''	 Upper 32  */</div><div class='ctx'> #define   TEXASR_FS	__MASK(63-36) /* TEXASR Failure Summary */</div><div class='ctx'> #define SPRN_TFHAR	0x80	/* Transaction Failure Handler Addr */</div><div class='add'>+#define SPRN_TIDR	144	/* Thread ID register */</div><div class='ctx'> #define SPRN_CTRLF	0x088</div><div class='ctx'> #define SPRN_CTRLT	0x098</div><div class='ctx'> #define   CTRL_CT	0xc0000000	/* current thread */</div><div class='hunk'>@@ -271,10 +274,14 @@</div><div class='ctx'> #define SPRN_DSISR	0x012	/* Data Storage Interrupt Status Register */</div><div class='ctx'> #define   DSISR_NOHPTE		0x40000000	/* no translation found */</div><div class='ctx'> #define   DSISR_PROTFAULT	0x08000000	/* protection fault */</div><div class='add'>+#define   DSISR_BADACCESS	0x04000000	/* bad access to CI or G */</div><div class='ctx'> #define   DSISR_ISSTORE		0x02000000	/* access was a store */</div><div class='ctx'> #define   DSISR_DABRMATCH	0x00400000	/* hit data breakpoint */</div><div class='ctx'> #define   DSISR_NOSEGMENT	0x00200000	/* SLB miss */</div><div class='ctx'> #define   DSISR_KEYFAULT	0x00200000	/* Key fault */</div><div class='add'>+#define   DSISR_UNSUPP_MMU	0x00080000	/* Unsupported MMU config */</div><div class='add'>+#define   DSISR_SET_RC		0x00040000	/* Failed setting of R/C bits */</div><div class='add'>+#define   DSISR_PGDIRFAULT      0x00020000      /* Fault on page directory */</div><div class='ctx'> #define SPRN_TBRL	0x10C	/* Time Base Read Lower Register (user, R/O) */</div><div class='ctx'> #define SPRN_TBRU	0x10D	/* Time Base Read Upper Register (user, R/O) */</div><div class='ctx'> #define SPRN_CIR	0x11B	/* Chip Information Register (hyper, R/0) */</div><div class='hunk'>@@ -292,8 +299,7 @@</div><div class='ctx'> #define SPRN_HRMOR	0x139	/* Real mode offset register */</div><div class='ctx'> #define SPRN_HSRR0	0x13A	/* Hypervisor Save/Restore 0 */</div><div class='ctx'> #define SPRN_HSRR1	0x13B	/* Hypervisor Save/Restore 1 */</div><div class='del'>-#define SPRN_LMRR	0x32D	/* Load Monitor Region Register */</div><div class='del'>-#define SPRN_LMSER	0x32E	/* Load Monitor Section Enable Register */</div><div class='add'>+#define SPRN_ASDR	0x330	/* Access segment descriptor register */</div><div class='ctx'> #define SPRN_IC		0x350	/* Virtual Instruction Count */</div><div class='ctx'> #define SPRN_VTB	0x351	/* Virtual Time Base */</div><div class='ctx'> #define SPRN_LDBAR	0x352	/* LD Base Address Register */</div><div class='hunk'>@@ -304,7 +310,7 @@</div><div class='ctx'> #define SPRN_PMCR	0x374	/* Power Management Control Register */</div><div class='ctx'> </div><div class='ctx'> /* HFSCR and FSCR bit numbers are the same */</div><div class='del'>-#define FSCR_LM_LG	11	/* Enable Load Monitor Registers */</div><div class='add'>+#define FSCR_MSGP_LG	10	/* Enable MSGP */</div><div class='ctx'> #define FSCR_TAR_LG	8	/* Enable Target Address Register */</div><div class='ctx'> #define FSCR_EBB_LG	7	/* Enable Event Based Branching */</div><div class='ctx'> #define FSCR_TM_LG	5	/* Enable Transactional Memory */</div><div class='hunk'>@@ -314,12 +320,11 @@</div><div class='ctx'> #define FSCR_VECVSX_LG	1	/* Enable VMX/VSX  */</div><div class='ctx'> #define FSCR_FP_LG	0	/* Enable Floating Point */</div><div class='ctx'> #define SPRN_FSCR	0x099	/* Facility Status &amp; Control Register */</div><div class='del'>-#define   FSCR_LM	__MASK(FSCR_LM_LG)</div><div class='ctx'> #define   FSCR_TAR	__MASK(FSCR_TAR_LG)</div><div class='ctx'> #define   FSCR_EBB	__MASK(FSCR_EBB_LG)</div><div class='ctx'> #define   FSCR_DSCR	__MASK(FSCR_DSCR_LG)</div><div class='ctx'> #define SPRN_HFSCR	0xbe	/* HV=1 Facility Status &amp; Control Register */</div><div class='del'>-#define   HFSCR_LM	__MASK(FSCR_LM_LG)</div><div class='add'>+#define   HFSCR_MSGP	__MASK(FSCR_MSGP_LG)</div><div class='ctx'> #define   HFSCR_TAR	__MASK(FSCR_TAR_LG)</div><div class='ctx'> #define   HFSCR_EBB	__MASK(FSCR_EBB_LG)</div><div class='ctx'> #define   HFSCR_TM	__MASK(FSCR_TM_LG)</div><div class='hunk'>@@ -337,7 +342,7 @@</div><div class='ctx'> #define   LPCR_DPFD_SH		52</div><div class='ctx'> #define   LPCR_DPFD		(ASM_CONST(7) &lt;&lt; LPCR_DPFD_SH)</div><div class='ctx'> #define   LPCR_VRMASD_SH	47</div><div class='del'>-#define   LPCR_VRMASD		(ASM_CONST(1) &lt;&lt; LPCR_VRMASD_SH)</div><div class='add'>+#define   LPCR_VRMASD		(ASM_CONST(0x1f) &lt;&lt; LPCR_VRMASD_SH)</div><div class='ctx'> #define   LPCR_VRMA_L		ASM_CONST(0x0008000000000000)</div><div class='ctx'> #define   LPCR_VRMA_LP0		ASM_CONST(0x0001000000000000)</div><div class='ctx'> #define   LPCR_VRMA_LP1		ASM_CONST(0x0000800000000000)</div><div class='hunk'>@@ -358,6 +363,7 @@</div><div class='ctx'> #define     LPCR_PECE_HVEE	ASM_CONST(0x0000400000000000)	/* P9 Wakeup on HV interrupts */</div><div class='ctx'> #define   LPCR_MER		ASM_CONST(0x0000000000000800)	/* Mediated External Exception */</div><div class='ctx'> #define   LPCR_MER_SH		11</div><div class='add'>+#define	  LPCR_GTSE		ASM_CONST(0x0000000000000400)  	/* Guest Translation Shootdown Enable */</div><div class='ctx'> #define   LPCR_TC		ASM_CONST(0x0000000000000200)	/* Translation control */</div><div class='ctx'> #define   LPCR_LPES		0x0000000c</div><div class='ctx'> #define   LPCR_LPES0		ASM_CONST(0x0000000000000008)      /* LPAR Env selector 0 */</div><div class='hunk'>@@ -378,6 +384,12 @@</div><div class='ctx'> #define   PCR_VEC_DIS	(1ul &lt;&lt; (63-0))	/* Vec. disable (bit NA since POWER8) */</div><div class='ctx'> #define   PCR_VSX_DIS	(1ul &lt;&lt; (63-1))	/* VSX disable (bit NA since POWER8) */</div><div class='ctx'> #define   PCR_TM_DIS	(1ul &lt;&lt; (63-2))	/* Trans. memory disable (POWER8) */</div><div class='add'>+/*</div><div class='add'>+ * These bits are used in the function kvmppc_set_arch_compat() to specify and</div><div class='add'>+ * determine both the compatibility level which we want to emulate and the</div><div class='add'>+ * compatibility level which the host is capable of emulating.</div><div class='add'>+ */</div><div class='add'>+#define   PCR_ARCH_207	0x8		/* Architecture 2.07 */</div><div class='ctx'> #define   PCR_ARCH_206	0x4		/* Architecture 2.06 */</div><div class='ctx'> #define   PCR_ARCH_205	0x2		/* Architecture 2.05 */</div><div class='ctx'> #define	SPRN_HEIR	0x153	/* Hypervisor Emulated Instruction Register */</div><div class='hunk'>@@ -540,7 +552,9 @@</div><div class='ctx'> #define SPRN_IBAT7U	0x236		/* Instruction BAT 7 Upper Register */</div><div class='ctx'> #define SPRN_ICMP	0x3D5		/* Instruction TLB Compare Register */</div><div class='ctx'> #define SPRN_ICTC	0x3FB	/* Instruction Cache Throttling Control Reg */</div><div class='add'>+#ifndef SPRN_ICTRL</div><div class='ctx'> #define SPRN_ICTRL	0x3F3	/* 1011 7450 icache and interrupt ctrl */</div><div class='add'>+#endif</div><div class='ctx'> #define ICTRL_EICE	0x08000000	/* enable icache parity errs */</div><div class='ctx'> #define ICTRL_EDC	0x04000000	/* enable dcache parity errs */</div><div class='ctx'> #define ICTRL_EICP	0x00000100	/* enable icache par. check */</div><div class='hunk'>@@ -641,9 +655,10 @@</div><div class='ctx'> #define   SRR1_ISI_N_OR_G	0x10000000 /* ISI: Access is no-exec or G */</div><div class='ctx'> #define   SRR1_ISI_PROT		0x08000000 /* ISI: Other protection fault */</div><div class='ctx'> #define   SRR1_WAKEMASK		0x00380000 /* reason for wakeup */</div><div class='del'>-#define   SRR1_WAKEMASK_P8	0x003c0000 /* reason for wakeup on POWER8 */</div><div class='add'>+#define   SRR1_WAKEMASK_P8	0x003c0000 /* reason for wakeup on POWER8 and 9 */</div><div class='ctx'> #define   SRR1_WAKESYSERR	0x00300000 /* System error */</div><div class='ctx'> #define   SRR1_WAKEEE		0x00200000 /* External interrupt */</div><div class='add'>+#define   SRR1_WAKEHVI		0x00240000 /* Hypervisor Virtualization Interrupt (P9) */</div><div class='ctx'> #define   SRR1_WAKEMT		0x00280000 /* mtctrl */</div><div class='ctx'> #define	  SRR1_WAKEHMI		0x00280000 /* Hypervisor maintenance */</div><div class='ctx'> #define   SRR1_WAKEDEC		0x00180000 /* Decrementer interrupt */</div><div class='hunk'>@@ -1219,6 +1234,7 @@</div><div class='ctx'> #define PVR_ARCH_206	0x0f000003</div><div class='ctx'> #define PVR_ARCH_206p	0x0f100003</div><div class='ctx'> #define PVR_ARCH_207	0x0f000004</div><div class='add'>+#define PVR_ARCH_300	0x0f000005</div><div class='ctx'> </div><div class='ctx'> /* Macros for setting and retrieving special purpose registers */</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='head'>diff --git a/arch/powerpc/include/asm/reg_8xx.h b/arch/powerpc/include/asm/reg_8xx.h<br/>index 0197e12f7d48..ae16fef7a4d6 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/reg_8xx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/reg_8xx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/reg_8xx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/reg_8xx.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #ifndef _ASM_POWERPC_REG_8xx_H</div><div class='ctx'> #define _ASM_POWERPC_REG_8xx_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mmu-8xx.h&gt;</div><div class='add'>+#include &lt;asm/mmu.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Cache control on the MPC8xx is provided through some additional</div><div class='ctx'>  * special purpose registers.</div><div class='hunk'>@@ -28,6 +28,17 @@</div><div class='ctx'> /* Special MSR manipulation registers */</div><div class='ctx'> #define SPRN_EIE	80	/* External interrupt enable (EE=1, RI=1) */</div><div class='ctx'> #define SPRN_EID	81	/* External interrupt disable (EE=0, RI=1) */</div><div class='add'>+#define SPRN_NRI	82	/* Non recoverable interrupt (EE=0, RI=0) */</div><div class='add'>+</div><div class='add'>+/* Debug registers */</div><div class='add'>+#define SPRN_CMPA	144</div><div class='add'>+#define SPRN_COUNTA	150</div><div class='add'>+#define SPRN_CMPE	152</div><div class='add'>+#define SPRN_CMPF	153</div><div class='add'>+#define SPRN_LCTRL1	156</div><div class='add'>+#define SPRN_LCTRL2	157</div><div class='add'>+#define SPRN_ICTRL	158</div><div class='add'>+#define SPRN_BAR	159</div><div class='ctx'> </div><div class='ctx'> /* Commands.  Only the first few are available to the instruction cache.</div><div class='ctx'> */</div><div class='head'>diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h<br/>index 9c23baa10b81..ec9dd79398ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/rtas.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/rtas.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/rtas.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/rtas.h</a></div><div class='hunk'>@@ -307,6 +307,7 @@ struct pseries_hp_errorlog {</div><div class='ctx'> 	union {</div><div class='ctx'> 		__be32	drc_index;</div><div class='ctx'> 		__be32	drc_count;</div><div class='add'>+		struct { __be32 count, index; } ic;</div><div class='ctx'> 		char	drc_name[1];</div><div class='ctx'> 	} _drc_u;</div><div class='ctx'> };</div><div class='hunk'>@@ -318,10 +319,12 @@ struct pseries_hp_errorlog {</div><div class='ctx'> </div><div class='ctx'> #define PSERIES_HP_ELOG_ACTION_ADD	1</div><div class='ctx'> #define PSERIES_HP_ELOG_ACTION_REMOVE	2</div><div class='add'>+#define PSERIES_HP_ELOG_ACTION_READD	3</div><div class='ctx'> </div><div class='ctx'> #define PSERIES_HP_ELOG_ID_DRC_NAME	1</div><div class='ctx'> #define PSERIES_HP_ELOG_ID_DRC_INDEX	2</div><div class='ctx'> #define PSERIES_HP_ELOG_ID_DRC_COUNT	3</div><div class='add'>+#define PSERIES_HP_ELOG_ID_DRC_IC	4</div><div class='ctx'> </div><div class='ctx'> struct pseries_errorlog *get_pseries_errorlog(struct rtas_error_log *log,</div><div class='ctx'> 					      uint16_t section_id);</div><div class='head'>diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h<br/>index 0d02c11dc331..32db16d2e7ad 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/smp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/smp.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/smp.h</a></div><div class='hunk'>@@ -176,7 +176,7 @@ static inline void set_hard_smp_processor_id(int cpu, int phys)</div><div class='ctx'> #endif /* !CONFIG_SMP */</div><div class='ctx'> #endif /* !CONFIG_PPC64 */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PPC64) &amp;&amp; (defined(CONFIG_SMP) || defined(CONFIG_KEXEC))</div><div class='add'>+#if defined(CONFIG_PPC64) &amp;&amp; (defined(CONFIG_SMP) || defined(CONFIG_KEXEC_CORE))</div><div class='ctx'> extern void smp_release_cpus(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline void smp_release_cpus(void) { };</div><div class='head'>diff --git a/arch/powerpc/include/asm/sparsemem.h b/arch/powerpc/include/asm/sparsemem.h<br/>index f6fc0ee813d7..c88930c9db7f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/sparsemem.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/sparsemem.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/sparsemem.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/sparsemem.h</a></div><div class='hunk'>@@ -18,6 +18,13 @@</div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTPLUG</div><div class='ctx'> extern int create_section_mapping(unsigned long start, unsigned long end);</div><div class='ctx'> extern int remove_section_mapping(unsigned long start, unsigned long end);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_BOOK3S_64</div><div class='add'>+extern void resize_hpt_for_hotplug(unsigned long new_mem_size);</div><div class='add'>+#else</div><div class='add'>+static inline void resize_hpt_for_hotplug(unsigned long new_mem_size) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> extern int hot_add_scn_to_nid(unsigned long scn_addr);</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h<br/>index fa37fe93bc02..8c1b913de6d7 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/spinlock.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/spinlock.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/spinlock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/spinlock.h</a></div><div class='hunk'>@@ -52,6 +52,14 @@</div><div class='ctx'> #define SYNC_IO</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_PSERIES</div><div class='add'>+#define vcpu_is_preempted vcpu_is_preempted</div><div class='add'>+static inline bool vcpu_is_preempted(int cpu)</div><div class='add'>+{</div><div class='add'>+	return !!(be32_to_cpu(lppaca_of(cpu).yield_count) &amp; 1);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static __always_inline int arch_spin_value_unlocked(arch_spinlock_t lock)</div><div class='ctx'> {</div><div class='ctx'> 	return lock.slock == 0;</div><div class='head'>diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h<br/>index de99d6e29430..01d45a5fd00b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/swiotlb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/swiotlb.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/swiotlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/swiotlb.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/swiotlb.h&gt;</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops swiotlb_dma_ops;</div><div class='add'>+extern const struct dma_map_ops swiotlb_dma_ops;</div><div class='ctx'> </div><div class='ctx'> static inline void dma_mark_clean(void *addr, size_t size) {}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h<br/>index 2fc5d4db503c..4b369d83fe9c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/systbl.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/systbl.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/systbl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/systbl.h</a></div><div class='hunk'>@@ -386,3 +386,4 @@ SYSCALL(mlock2)</div><div class='ctx'> SYSCALL(copy_file_range)</div><div class='ctx'> COMPAT_SYS_SPU(preadv2)</div><div class='ctx'> COMPAT_SYS_SPU(pwritev2)</div><div class='add'>+SYSCALL(kexec_file_load)</div><div class='head'>diff --git a/arch/powerpc/include/asm/tlb.h b/arch/powerpc/include/asm/tlb.h<br/>index 99e1397b71da..609557569f65 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/tlb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/tlb.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/tlb.h</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #define tlb_start_vma(tlb, vma)	do { } while (0)</div><div class='ctx'> #define tlb_end_vma(tlb, vma)	do { } while (0)</div><div class='ctx'> #define __tlb_remove_tlb_entry	__tlb_remove_tlb_entry</div><div class='add'>+#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='ctx'> </div><div class='ctx'> extern void tlb_flush(struct mmu_gather *tlb);</div><div class='ctx'> </div><div class='hunk'>@@ -46,6 +47,21 @@ static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='add'>+						     unsigned int page_size)</div><div class='add'>+{</div><div class='add'>+	if (!tlb-&gt;page_size)</div><div class='add'>+		tlb-&gt;page_size = page_size;</div><div class='add'>+	else if (tlb-&gt;page_size != page_size) {</div><div class='add'>+		tlb_flush_mmu(tlb);</div><div class='add'>+		/*</div><div class='add'>+		 * update the page size after flush for the new</div><div class='add'>+		 * mmu_gather.</div><div class='add'>+		 */</div><div class='add'>+		tlb-&gt;page_size = page_size;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static inline int mm_is_core_local(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/include/asm/trace.h b/arch/powerpc/include/asm/trace.h<br/>index 32e36b16773f..c05cef6ee06c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/trace.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/trace.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/trace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/trace.h</a></div><div class='hunk'>@@ -54,7 +54,7 @@ DEFINE_EVENT(ppc64_interrupt_class, timer_interrupt_exit,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_PSERIES</div><div class='del'>-extern void hcall_tracepoint_regfunc(void);</div><div class='add'>+extern int hcall_tracepoint_regfunc(void);</div><div class='ctx'> extern void hcall_tracepoint_unregfunc(void);</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT_FN_COND(hcall_entry,</div><div class='hunk'>@@ -104,7 +104,7 @@ TRACE_EVENT_FN_COND(hcall_exit,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_POWERNV</div><div class='del'>-extern void opal_tracepoint_regfunc(void);</div><div class='add'>+extern int opal_tracepoint_regfunc(void);</div><div class='ctx'> extern void opal_tracepoint_unregfunc(void);</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT_FN(opal_entry,</div><div class='head'>diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h<br/>index c266227fdd5b..0e6add3187bc 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/uaccess.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/uaccess.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/uaccess.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/asm-compat.h&gt;</div><div class='add'>+#include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -63,23 +64,30 @@</div><div class='ctx'> 	 __access_ok((__force unsigned long)(addr), (size), get_fs()))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The exception table consists of pairs of addresses: the first is the</div><div class='del'>- * address of an instruction that is allowed to fault, and the second is</div><div class='add'>+ * The exception table consists of pairs of relative addresses: the first is</div><div class='add'>+ * the address of an instruction that is allowed to fault, and the second is</div><div class='ctx'>  * the address at which the program should continue.  No registers are</div><div class='del'>- * modified, so it is entirely up to the continuation code to figure out</div><div class='del'>- * what to do.</div><div class='add'>+ * modified, so it is entirely up to the continuation code to figure out what</div><div class='add'>+ * to do.</div><div class='ctx'>  *</div><div class='del'>- * All the routines below use bits of fixup code that are out of line</div><div class='del'>- * with the main instruction path.  This means when everything is well,</div><div class='del'>- * we don't even have to jump over them.  Further, they do not intrude</div><div class='del'>- * on our cache or tlb entries.</div><div class='add'>+ * All the routines below use bits of fixup code that are out of line with the</div><div class='add'>+ * main instruction path.  This means when everything is well, we don't even</div><div class='add'>+ * have to jump over them.  Further, they do not intrude on our cache or tlb</div><div class='add'>+ * entries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define ARCH_HAS_RELATIVE_EXTABLE</div><div class='add'>+</div><div class='ctx'> struct exception_table_entry {</div><div class='del'>-	unsigned long insn;</div><div class='del'>-	unsigned long fixup;</div><div class='add'>+	int insn;</div><div class='add'>+	int fixup;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline unsigned long extable_fixup(const struct exception_table_entry *x)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)&amp;x-&gt;fixup + x-&gt;fixup;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * These are the main single-value transfer routines.  They automatically</div><div class='ctx'>  * use the right size if we just have the right pointer type.</div><div class='hunk'>@@ -132,10 +140,7 @@ extern long __put_user_bad(void);</div><div class='ctx'> 		"3:	li %0,%3\n"				\</div><div class='ctx'> 		"	b 2b\n"					\</div><div class='ctx'> 		".previous\n"					\</div><div class='del'>-		".section __ex_table,\"a\"\n"			\</div><div class='del'>-			PPC_LONG_ALIGN "\n"			\</div><div class='del'>-			PPC_LONG "1b,3b\n"			\</div><div class='del'>-		".previous"					\</div><div class='add'>+		EX_TABLE(1b, 3b)				\</div><div class='ctx'> 		: "=r" (err)					\</div><div class='ctx'> 		: "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))</div><div class='ctx'> </div><div class='hunk'>@@ -152,11 +157,8 @@ extern long __put_user_bad(void);</div><div class='ctx'> 		"4:	li %0,%3\n"				\</div><div class='ctx'> 		"	b 3b\n"					\</div><div class='ctx'> 		".previous\n"					\</div><div class='del'>-		".section __ex_table,\"a\"\n"			\</div><div class='del'>-			PPC_LONG_ALIGN "\n"			\</div><div class='del'>-			PPC_LONG "1b,4b\n"			\</div><div class='del'>-			PPC_LONG "2b,4b\n"			\</div><div class='del'>-		".previous"					\</div><div class='add'>+		EX_TABLE(1b, 4b)				\</div><div class='add'>+		EX_TABLE(2b, 4b)				\</div><div class='ctx'> 		: "=r" (err)					\</div><div class='ctx'> 		: "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))</div><div class='ctx'> #endif /* __powerpc64__ */</div><div class='hunk'>@@ -215,10 +217,7 @@ extern long __get_user_bad(void);</div><div class='ctx'> 		"	li %1,0\n"			\</div><div class='ctx'> 		"	b 2b\n"				\</div><div class='ctx'> 		".previous\n"				\</div><div class='del'>-		".section __ex_table,\"a\"\n"		\</div><div class='del'>-			PPC_LONG_ALIGN "\n"		\</div><div class='del'>-			PPC_LONG "1b,3b\n"		\</div><div class='del'>-		".previous"				\</div><div class='add'>+		EX_TABLE(1b, 3b)			\</div><div class='ctx'> 		: "=r" (err), "=r" (x)			\</div><div class='ctx'> 		: "b" (addr), "i" (-EFAULT), "0" (err))</div><div class='ctx'> </div><div class='hunk'>@@ -237,11 +236,8 @@ extern long __get_user_bad(void);</div><div class='ctx'> 		"	li %1+1,0\n"			\</div><div class='ctx'> 		"	b 3b\n"				\</div><div class='ctx'> 		".previous\n"				\</div><div class='del'>-		".section __ex_table,\"a\"\n"		\</div><div class='del'>-			PPC_LONG_ALIGN "\n"		\</div><div class='del'>-			PPC_LONG "1b,4b\n"		\</div><div class='del'>-			PPC_LONG "2b,4b\n"		\</div><div class='del'>-		".previous"				\</div><div class='add'>+		EX_TABLE(1b, 4b)			\</div><div class='add'>+		EX_TABLE(2b, 4b)			\</div><div class='ctx'> 		: "=r" (err), "=&amp;r" (x)			\</div><div class='ctx'> 		: "b" (addr), "i" (-EFAULT), "0" (err))</div><div class='ctx'> #endif /* __powerpc64__ */</div><div class='hunk'>@@ -265,7 +261,7 @@ do {								\</div><div class='ctx'> ({								\</div><div class='ctx'> 	long __gu_err;						\</div><div class='ctx'> 	unsigned long __gu_val;					\</div><div class='del'>-	__typeof__(*(ptr)) __user *__gu_addr = (ptr);	\</div><div class='add'>+	const __typeof__(*(ptr)) __user *__gu_addr = (ptr);	\</div><div class='ctx'> 	__chk_user_ptr(ptr);					\</div><div class='ctx'> 	if (!is_kernel_addr((unsigned long)__gu_addr))		\</div><div class='ctx'> 		might_fault();					\</div><div class='hunk'>@@ -278,7 +274,7 @@ do {								\</div><div class='ctx'> ({									\</div><div class='ctx'> 	long __gu_err = -EFAULT;					\</div><div class='ctx'> 	unsigned long  __gu_val = 0;					\</div><div class='del'>-	__typeof__(*(ptr)) __user *__gu_addr = (ptr);		\</div><div class='add'>+	const __typeof__(*(ptr)) __user *__gu_addr = (ptr);		\</div><div class='ctx'> 	might_fault();							\</div><div class='ctx'> 	if (access_ok(VERIFY_READ, __gu_addr, (size)))			\</div><div class='ctx'> 		__get_user_size(__gu_val, __gu_addr, (size), __gu_err);	\</div><div class='hunk'>@@ -290,7 +286,7 @@ do {								\</div><div class='ctx'> ({								\</div><div class='ctx'> 	long __gu_err;						\</div><div class='ctx'> 	unsigned long __gu_val;					\</div><div class='del'>-	__typeof__(*(ptr)) __user *__gu_addr = (ptr);	\</div><div class='add'>+	const __typeof__(*(ptr)) __user *__gu_addr = (ptr);	\</div><div class='ctx'> 	__chk_user_ptr(ptr);					\</div><div class='ctx'> 	__get_user_size(__gu_val, __gu_addr, (size), __gu_err);	\</div><div class='ctx'> 	(x) = (__force __typeof__(*(ptr)))__gu_val;			\</div><div class='head'>diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h<br/>index e8cdfec8d512..eb1acee91a20 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/unistd.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/unistd.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/unistd.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;uapi/asm/unistd.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define NR_syscalls		382</div><div class='add'>+#define NR_syscalls		383</div><div class='ctx'> </div><div class='ctx'> #define __NR__exit __NR_exit</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/word-at-a-time.h b/arch/powerpc/include/asm/word-at-a-time.h<br/>index 4afe66aa1400..f3f4710d4ff5 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/word-at-a-time.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/word-at-a-time.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/word-at-a-time.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/word-at-a-time.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/asm-compat.h&gt;</div><div class='add'>+#include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef __BIG_ENDIAN__</div><div class='ctx'> </div><div class='hunk'>@@ -193,10 +194,7 @@ static inline unsigned long load_unaligned_zeropad(const void *addr)</div><div class='ctx'> #endif</div><div class='ctx'> 	"b	2b\n"</div><div class='ctx'> 	".previous\n"</div><div class='del'>-	".section __ex_table,\"a\"\n\t"</div><div class='del'>-		PPC_LONG_ALIGN "\n\t"</div><div class='del'>-		PPC_LONG "1b,3b\n"</div><div class='del'>-	".previous"</div><div class='add'>+	EX_TABLE(1b, 3b)</div><div class='ctx'> 	: [tmp] "=&amp;b" (tmp), [offset] "=&amp;r" (offset), [ret] "=&amp;r" (ret)</div><div class='ctx'> 	: [addr] "b" (addr), "m" (*(unsigned long *)addr));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/xics.h b/arch/powerpc/include/asm/xics.h<br/>index f0b238516e9b..e0b9e576905a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/xics.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/xics.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/xics.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/xics.h</a></div><div class='hunk'>@@ -44,6 +44,7 @@ static inline int icp_hv_init(void) { return -ENODEV; }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_POWERNV</div><div class='ctx'> extern int icp_opal_init(void);</div><div class='add'>+extern void icp_opal_flush_interrupt(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline int icp_opal_init(void) { return -ENODEV; }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/include/asm/xilinx_intc.h b/arch/powerpc/include/asm/xilinx_intc.h<br/>index 343612f8fece..3192d7f0a05b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/asm/xilinx_intc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/asm/xilinx_intc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/asm/xilinx_intc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/asm/xilinx_intc.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> extern void __init xilinx_intc_init_tree(void);</div><div class='del'>-extern unsigned int xilinx_intc_get_irq(void);</div><div class='add'>+extern unsigned int xintc_get_irq(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* _ASM_POWERPC_XILINX_INTC_H */</div><div class='head'>diff --git a/arch/powerpc/include/uapi/asm/auxvec.h b/arch/powerpc/include/uapi/asm/auxvec.h<br/>index ce17d2c9eb4e..be6e94ecec42 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/uapi/asm/auxvec.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/uapi/asm/auxvec.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/uapi/asm/auxvec.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/uapi/asm/auxvec.h</a></div><div class='hunk'>@@ -16,6 +16,37 @@</div><div class='ctx'>  */</div><div class='ctx'> #define AT_SYSINFO_EHDR		33</div><div class='ctx'> </div><div class='del'>-#define AT_VECTOR_SIZE_ARCH 6 /* entries in ARCH_DLINFO */</div><div class='add'>+/*</div><div class='add'>+ * AT_*CACHEBSIZE above represent the cache *block* size which is</div><div class='add'>+ * the size that is affected by the cache management instructions.</div><div class='add'>+ *</div><div class='add'>+ * It doesn't nececssarily matches the cache *line* size which is</div><div class='add'>+ * more of a performance tuning hint. Additionally the latter can</div><div class='add'>+ * be different for the different cache levels.</div><div class='add'>+ *</div><div class='add'>+ * The set of entries below represent more extensive information</div><div class='add'>+ * about the caches, in the form of two entry per cache type,</div><div class='add'>+ * one entry containing the cache size in bytes, and the other</div><div class='add'>+ * containing the cache line size in bytes in the bottom 16 bits</div><div class='add'>+ * and the cache associativity in the next 16 bits.</div><div class='add'>+ *</div><div class='add'>+ * The associativity is such that if N is the 16-bit value, the</div><div class='add'>+ * cache is N way set associative. A value if 0xffff means fully</div><div class='add'>+ * associative, a value of 1 means directly mapped.</div><div class='add'>+ *</div><div class='add'>+ * For all these fields, a value of 0 means that the information</div><div class='add'>+ * is not known.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define AT_L1I_CACHESIZE	40</div><div class='add'>+#define AT_L1I_CACHEGEOMETRY	41</div><div class='add'>+#define AT_L1D_CACHESIZE	42</div><div class='add'>+#define AT_L1D_CACHEGEOMETRY	43</div><div class='add'>+#define AT_L2_CACHESIZE		44</div><div class='add'>+#define AT_L2_CACHEGEOMETRY	45</div><div class='add'>+#define AT_L3_CACHESIZE		46</div><div class='add'>+#define AT_L3_CACHEGEOMETRY	47</div><div class='add'>+</div><div class='add'>+#define AT_VECTOR_SIZE_ARCH	14 /* entries in ARCH_DLINFO */</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h<br/>index 3a9e44c45c78..b2c6fdd5ac30 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/uapi/asm/elf.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/uapi/asm/elf.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/uapi/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/uapi/asm/elf.h</a></div><div class='hunk'>@@ -162,29 +162,6 @@ typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32];</div><div class='ctx'> typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The requirements here are:</div><div class='del'>- * - keep the final alignment of sp (sp &amp; 0xf)</div><div class='del'>- * - make sure the 32-bit value at the first 16 byte aligned position of</div><div class='del'>- *   AUXV is greater than 16 for glibc compatibility.</div><div class='del'>- *   AT_IGNOREPPC is used for that.</div><div class='del'>- * - for compatibility with glibc ARCH_DLINFO must always be defined on PPC,</div><div class='del'>- *   even if DLINFO_ARCH_ITEMS goes to zero or is undefined.</div><div class='del'>- * update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes</div><div class='del'>- */</div><div class='del'>-#define ARCH_DLINFO							\</div><div class='del'>-do {									\</div><div class='del'>-	/* Handle glibc compatibility. */				\</div><div class='del'>-	NEW_AUX_ENT(AT_IGNOREPPC, AT_IGNOREPPC);			\</div><div class='del'>-	NEW_AUX_ENT(AT_IGNOREPPC, AT_IGNOREPPC);			\</div><div class='del'>-	/* Cache size items */						\</div><div class='del'>-	NEW_AUX_ENT(AT_DCACHEBSIZE, dcache_bsize);			\</div><div class='del'>-	NEW_AUX_ENT(AT_ICACHEBSIZE, icache_bsize);			\</div><div class='del'>-	NEW_AUX_ENT(AT_UCACHEBSIZE, ucache_bsize);			\</div><div class='del'>-	VDSO_AUX_ENT(AT_SYSINFO_EHDR, current-&gt;mm-&gt;context.vdso_base);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='ctx'> /* PowerPC64 relocations defined by the ABIs */</div><div class='ctx'> #define R_PPC64_NONE    R_PPC_NONE</div><div class='ctx'> #define R_PPC64_ADDR32  R_PPC_ADDR32  /* 32bit absolute address.  */</div><div class='head'>diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/arch/powerpc/include/uapi/asm/kvm.h<br/>index c93cf35ce379..4edbe4bb0e8b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/uapi/asm/kvm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/uapi/asm/kvm.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/uapi/asm/kvm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/uapi/asm/kvm.h</a></div><div class='hunk'>@@ -413,6 +413,26 @@ struct kvm_get_htab_header {</div><div class='ctx'> 	__u16	n_invalid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* For KVM_PPC_CONFIGURE_V3_MMU */</div><div class='add'>+struct kvm_ppc_mmuv3_cfg {</div><div class='add'>+	__u64	flags;</div><div class='add'>+	__u64	process_table;	/* second doubleword of partition table entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Flag values for KVM_PPC_CONFIGURE_V3_MMU */</div><div class='add'>+#define KVM_PPC_MMUV3_RADIX	1	/* 1 = radix mode, 0 = HPT */</div><div class='add'>+#define KVM_PPC_MMUV3_GTSE	2	/* global translation shootdown enb. */</div><div class='add'>+</div><div class='add'>+/* For KVM_PPC_GET_RMMU_INFO */</div><div class='add'>+struct kvm_ppc_rmmu_info {</div><div class='add'>+	struct kvm_ppc_radix_geom {</div><div class='add'>+		__u8	page_shift;</div><div class='add'>+		__u8	level_bits[4];</div><div class='add'>+		__u8	pad[3];</div><div class='add'>+	}	geometries[8];</div><div class='add'>+	__u32	ap_encodings[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Per-vcpu XICS interrupt controller state */</div><div class='ctx'> #define KVM_REG_PPC_ICP_STATE	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0x8c)</div><div class='ctx'> </div><div class='hunk'>@@ -573,6 +593,10 @@ struct kvm_get_htab_header {</div><div class='ctx'> #define KVM_REG_PPC_SPRG9	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xba)</div><div class='ctx'> #define KVM_REG_PPC_DBSR	(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0xbb)</div><div class='ctx'> </div><div class='add'>+/* POWER9 registers */</div><div class='add'>+#define KVM_REG_PPC_TIDR	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xbc)</div><div class='add'>+#define KVM_REG_PPC_PSSCR	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xbd)</div><div class='add'>+</div><div class='ctx'> /* Transactional Memory checkpointed state:</div><div class='ctx'>  * This is all GPRs, all VSX regs and a subset of SPRs</div><div class='ctx'>  */</div><div class='hunk'>@@ -596,6 +620,7 @@ struct kvm_get_htab_header {</div><div class='ctx'> #define KVM_REG_PPC_TM_VSCR	(KVM_REG_PPC_TM | KVM_REG_SIZE_U32 | 0x67)</div><div class='ctx'> #define KVM_REG_PPC_TM_DSCR	(KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x68)</div><div class='ctx'> #define KVM_REG_PPC_TM_TAR	(KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x69)</div><div class='add'>+#define KVM_REG_PPC_TM_XER	(KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x6a)</div><div class='ctx'> </div><div class='ctx'> /* PPC64 eXternal Interrupt Controller Specification */</div><div class='ctx'> #define KVM_DEV_XICS_GRP_SOURCES	1	/* 64-bit source attributes */</div><div class='hunk'>@@ -608,5 +633,7 @@ struct kvm_get_htab_header {</div><div class='ctx'> #define  KVM_XICS_LEVEL_SENSITIVE	(1ULL &lt;&lt; 40)</div><div class='ctx'> #define  KVM_XICS_MASKED		(1ULL &lt;&lt; 41)</div><div class='ctx'> #define  KVM_XICS_PENDING		(1ULL &lt;&lt; 42)</div><div class='add'>+#define  KVM_XICS_PRESENTED		(1ULL &lt;&lt; 43)</div><div class='add'>+#define  KVM_XICS_QUEUED		(1ULL &lt;&lt; 44)</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_KVM_POWERPC_H */</div><div class='head'>diff --git a/arch/powerpc/include/uapi/asm/socket.h b/arch/powerpc/include/uapi/asm/socket.h<br/>index 1672e3398270..44583a52f882 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -97,4 +97,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		53</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	54</div><div class='add'>+</div><div class='ctx'> #endif	/* _ASM_POWERPC_SOCKET_H */</div><div class='head'>diff --git a/arch/powerpc/include/uapi/asm/unistd.h b/arch/powerpc/include/uapi/asm/unistd.h<br/>index e9f5f41aa55a..2f26335a3c42 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/include/uapi/asm/unistd.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/include/uapi/asm/unistd.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/include/uapi/asm/unistd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/include/uapi/asm/unistd.h</a></div><div class='hunk'>@@ -392,5 +392,6 @@</div><div class='ctx'> #define __NR_copy_file_range	379</div><div class='ctx'> #define __NR_preadv2		380</div><div class='ctx'> #define __NR_pwritev2		381</div><div class='add'>+#define __NR_kexec_file_load	382</div><div class='ctx'> </div><div class='ctx'> #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */</div><div class='head'>diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile<br/>index 1925341dbb9c..811f441a125f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/Makefile</a></div><div class='hunk'>@@ -15,7 +15,7 @@ CFLAGS_btext.o		+= -fPIC</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> CFLAGS_cputable.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)</div><div class='del'>-CFLAGS_init.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)</div><div class='add'>+CFLAGS_prom_init.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)</div><div class='ctx'> CFLAGS_btext.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)</div><div class='ctx'> CFLAGS_prom.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)</div><div class='ctx'> </div><div class='hunk'>@@ -58,8 +58,6 @@ obj-$(CONFIG_PPC_RTAS)		+= rtas.o rtas-rtc.o $(rtaspci-y-y)</div><div class='ctx'> obj-$(CONFIG_PPC_RTAS_DAEMON)	+= rtasd.o</div><div class='ctx'> obj-$(CONFIG_RTAS_FLASH)	+= rtas_flash.o</div><div class='ctx'> obj-$(CONFIG_RTAS_PROC)		+= rtas-proc.o</div><div class='del'>-obj-$(CONFIG_IBMVIO)		+= vio.o</div><div class='del'>-obj-$(CONFIG_IBMEBUS)           += ibmebus.o</div><div class='ctx'> obj-$(CONFIG_EEH)              += eeh.o eeh_pe.o eeh_dev.o eeh_cache.o \</div><div class='ctx'> 				  eeh_driver.o eeh_event.o eeh_sysfs.o</div><div class='ctx'> obj-$(CONFIG_GENERIC_TBSYNC)	+= smp-tbsync.o</div><div class='hunk'>@@ -98,6 +96,7 @@ obj-$(CONFIG_KGDB)		+= kgdb.o</div><div class='ctx'> obj-$(CONFIG_BOOTX_TEXT)	+= btext.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= smp.o</div><div class='ctx'> obj-$(CONFIG_KPROBES)		+= kprobes.o</div><div class='add'>+obj-$(CONFIG_OPTPROBES)		+= optprobes.o optprobes_head.o</div><div class='ctx'> obj-$(CONFIG_UPROBES)		+= uprobes.o</div><div class='ctx'> obj-$(CONFIG_PPC_UDBG_16550)	+= legacy_serial.o udbg_16550.o</div><div class='ctx'> obj-$(CONFIG_STACKTRACE)	+= stacktrace.o</div><div class='hunk'>@@ -107,8 +106,13 @@ pci64-$(CONFIG_PPC64)		+= pci_dn.o pci-hotplug.o isa-bridge.o</div><div class='ctx'> obj-$(CONFIG_PCI)		+= pci_$(BITS).o $(pci64-y) \</div><div class='ctx'> 				   pci-common.o pci_of_scan.o</div><div class='ctx'> obj-$(CONFIG_PCI_MSI)		+= msi.o</div><div class='del'>-obj-$(CONFIG_KEXEC)		+= machine_kexec.o crash.o \</div><div class='add'>+obj-$(CONFIG_KEXEC_CORE)	+= machine_kexec.o crash.o \</div><div class='ctx'> 				   machine_kexec_$(BITS).o</div><div class='add'>+obj-$(CONFIG_KEXEC_FILE)	+= machine_kexec_file_$(BITS).o kexec_elf_$(BITS).o</div><div class='add'>+ifeq ($(CONFIG_HAVE_IMA_KEXEC)$(CONFIG_IMA),yy)</div><div class='add'>+obj-y				+= ima_kexec.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_AUDIT)		+= audit.o</div><div class='ctx'> obj64-$(CONFIG_AUDIT)		+= compat_audit.o</div><div class='ctx'> </div><div class='hunk'>@@ -128,7 +132,7 @@ obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM)	+= tm.o</div><div class='ctx'> obj-$(CONFIG_PPC64)		+= $(obj64-y)</div><div class='ctx'> obj-$(CONFIG_PPC32)		+= $(obj32-y)</div><div class='ctx'> </div><div class='del'>-ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC),)</div><div class='add'>+ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE),)</div><div class='ctx'> obj-y				+= ppc_save_regs.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c<br/>index 033f3385fa49..cbc7c42cdb74 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/align.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/align.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/align.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/align.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='ctx'> #include &lt;asm/emulated_ops.h&gt;</div><div class='hunk'>@@ -204,7 +204,7 @@ static int emulate_dcbz(struct pt_regs *regs, unsigned char __user *addr)</div><div class='ctx'> 	int i, size;</div><div class='ctx'> </div><div class='ctx'> #ifdef __powerpc64__</div><div class='del'>-	size = ppc64_caches.dline_size;</div><div class='add'>+	size = ppc64_caches.l1d.block_size;</div><div class='ctx'> #else</div><div class='ctx'> 	size = L1_CACHE_BYTES;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c<br/>index caec7bf3b99a..4367e7df51a1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/asm-offsets.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/asm-offsets.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -72,205 +72,190 @@</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define STACK_PT_REGS_OFFSET(sym, val)	\</div><div class='add'>+	DEFINE(sym, STACK_FRAME_OVERHEAD + offsetof(struct pt_regs, val))</div><div class='add'>+</div><div class='ctx'> int main(void)</div><div class='ctx'> {</div><div class='del'>-	DEFINE(THREAD, offsetof(struct task_struct, thread));</div><div class='del'>-	DEFINE(MM, offsetof(struct task_struct, mm));</div><div class='del'>-	DEFINE(MMCONTEXTID, offsetof(struct mm_struct, context.id));</div><div class='add'>+	OFFSET(THREAD, task_struct, thread);</div><div class='add'>+	OFFSET(MM, task_struct, mm);</div><div class='add'>+	OFFSET(MMCONTEXTID, mm_struct, context.id);</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> 	DEFINE(SIGSEGV, SIGSEGV);</div><div class='ctx'> 	DEFINE(NMI_MASK, NMI_MASK);</div><div class='del'>-	DEFINE(TASKTHREADPPR, offsetof(struct task_struct, thread.ppr));</div><div class='add'>+	OFFSET(TASKTHREADPPR, task_struct, thread.ppr);</div><div class='ctx'> #else</div><div class='del'>-	DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));</div><div class='add'>+	OFFSET(THREAD_INFO, task_struct, stack);</div><div class='ctx'> 	DEFINE(THREAD_INFO_GAP, _ALIGN_UP(sizeof(struct thread_info), 16));</div><div class='del'>-	DEFINE(KSP_LIMIT, offsetof(struct thread_struct, ksp_limit));</div><div class='add'>+	OFFSET(KSP_LIMIT, thread_struct, ksp_limit);</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LIVEPATCH</div><div class='del'>-	DEFINE(TI_livepatch_sp, offsetof(struct thread_info, livepatch_sp));</div><div class='add'>+	OFFSET(TI_livepatch_sp, thread_info, livepatch_sp);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	DEFINE(KSP, offsetof(struct thread_struct, ksp));</div><div class='del'>-	DEFINE(PT_REGS, offsetof(struct thread_struct, regs));</div><div class='add'>+	OFFSET(KSP, thread_struct, ksp);</div><div class='add'>+	OFFSET(PT_REGS, thread_struct, regs);</div><div class='ctx'> #ifdef CONFIG_BOOKE</div><div class='del'>-	DEFINE(THREAD_NORMSAVES, offsetof(struct thread_struct, normsave[0]));</div><div class='add'>+	OFFSET(THREAD_NORMSAVES, thread_struct, normsave[0]);</div><div class='ctx'> #endif</div><div class='del'>-	DEFINE(THREAD_FPEXC_MODE, offsetof(struct thread_struct, fpexc_mode));</div><div class='del'>-	DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fp_state));</div><div class='del'>-	DEFINE(THREAD_FPSAVEAREA, offsetof(struct thread_struct, fp_save_area));</div><div class='del'>-	DEFINE(FPSTATE_FPSCR, offsetof(struct thread_fp_state, fpscr));</div><div class='del'>-	DEFINE(THREAD_LOAD_FP, offsetof(struct thread_struct, load_fp));</div><div class='add'>+	OFFSET(THREAD_FPEXC_MODE, thread_struct, fpexc_mode);</div><div class='add'>+	OFFSET(THREAD_FPSTATE, thread_struct, fp_state);</div><div class='add'>+	OFFSET(THREAD_FPSAVEAREA, thread_struct, fp_save_area);</div><div class='add'>+	OFFSET(FPSTATE_FPSCR, thread_fp_state, fpscr);</div><div class='add'>+	OFFSET(THREAD_LOAD_FP, thread_struct, load_fp);</div><div class='ctx'> #ifdef CONFIG_ALTIVEC</div><div class='del'>-	DEFINE(THREAD_VRSTATE, offsetof(struct thread_struct, vr_state));</div><div class='del'>-	DEFINE(THREAD_VRSAVEAREA, offsetof(struct thread_struct, vr_save_area));</div><div class='del'>-	DEFINE(THREAD_VRSAVE, offsetof(struct thread_struct, vrsave));</div><div class='del'>-	DEFINE(THREAD_USED_VR, offsetof(struct thread_struct, used_vr));</div><div class='del'>-	DEFINE(VRSTATE_VSCR, offsetof(struct thread_vr_state, vscr));</div><div class='del'>-	DEFINE(THREAD_LOAD_VEC, offsetof(struct thread_struct, load_vec));</div><div class='add'>+	OFFSET(THREAD_VRSTATE, thread_struct, vr_state);</div><div class='add'>+	OFFSET(THREAD_VRSAVEAREA, thread_struct, vr_save_area);</div><div class='add'>+	OFFSET(THREAD_VRSAVE, thread_struct, vrsave);</div><div class='add'>+	OFFSET(THREAD_USED_VR, thread_struct, used_vr);</div><div class='add'>+	OFFSET(VRSTATE_VSCR, thread_vr_state, vscr);</div><div class='add'>+	OFFSET(THREAD_LOAD_VEC, thread_struct, load_vec);</div><div class='ctx'> #endif /* CONFIG_ALTIVEC */</div><div class='ctx'> #ifdef CONFIG_VSX</div><div class='del'>-	DEFINE(THREAD_USED_VSR, offsetof(struct thread_struct, used_vsr));</div><div class='add'>+	OFFSET(THREAD_USED_VSR, thread_struct, used_vsr);</div><div class='ctx'> #endif /* CONFIG_VSX */</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='del'>-	DEFINE(KSP_VSID, offsetof(struct thread_struct, ksp_vsid));</div><div class='add'>+	OFFSET(KSP_VSID, thread_struct, ksp_vsid);</div><div class='ctx'> #else /* CONFIG_PPC64 */</div><div class='del'>-	DEFINE(PGDIR, offsetof(struct thread_struct, pgdir));</div><div class='add'>+	OFFSET(PGDIR, thread_struct, pgdir);</div><div class='ctx'> #ifdef CONFIG_SPE</div><div class='del'>-	DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));</div><div class='del'>-	DEFINE(THREAD_ACC, offsetof(struct thread_struct, acc));</div><div class='del'>-	DEFINE(THREAD_SPEFSCR, offsetof(struct thread_struct, spefscr));</div><div class='del'>-	DEFINE(THREAD_USED_SPE, offsetof(struct thread_struct, used_spe));</div><div class='add'>+	OFFSET(THREAD_EVR0, thread_struct, evr[0]);</div><div class='add'>+	OFFSET(THREAD_ACC, thread_struct, acc);</div><div class='add'>+	OFFSET(THREAD_SPEFSCR, thread_struct, spefscr);</div><div class='add'>+	OFFSET(THREAD_USED_SPE, thread_struct, used_spe);</div><div class='ctx'> #endif /* CONFIG_SPE */</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)</div><div class='del'>-	DEFINE(THREAD_DBCR0, offsetof(struct thread_struct, debug.dbcr0));</div><div class='add'>+	OFFSET(THREAD_DBCR0, thread_struct, debug.dbcr0);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_32_HANDLER</div><div class='del'>-	DEFINE(THREAD_KVM_SVCPU, offsetof(struct thread_struct, kvm_shadow_vcpu));</div><div class='add'>+	OFFSET(THREAD_KVM_SVCPU, thread_struct, kvm_shadow_vcpu);</div><div class='ctx'> #endif</div><div class='ctx'> #if defined(CONFIG_KVM) &amp;&amp; defined(CONFIG_BOOKE)</div><div class='del'>-	DEFINE(THREAD_KVM_VCPU, offsetof(struct thread_struct, kvm_vcpu));</div><div class='add'>+	OFFSET(THREAD_KVM_VCPU, thread_struct, kvm_vcpu);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_TRANSACTIONAL_MEM</div><div class='del'>-	DEFINE(PACATMSCRATCH, offsetof(struct paca_struct, tm_scratch));</div><div class='del'>-	DEFINE(THREAD_TM_TFHAR, offsetof(struct thread_struct, tm_tfhar));</div><div class='del'>-	DEFINE(THREAD_TM_TEXASR, offsetof(struct thread_struct, tm_texasr));</div><div class='del'>-	DEFINE(THREAD_TM_TFIAR, offsetof(struct thread_struct, tm_tfiar));</div><div class='del'>-	DEFINE(THREAD_TM_TAR, offsetof(struct thread_struct, tm_tar));</div><div class='del'>-	DEFINE(THREAD_TM_PPR, offsetof(struct thread_struct, tm_ppr));</div><div class='del'>-	DEFINE(THREAD_TM_DSCR, offsetof(struct thread_struct, tm_dscr));</div><div class='del'>-	DEFINE(PT_CKPT_REGS, offsetof(struct thread_struct, ckpt_regs));</div><div class='del'>-	DEFINE(THREAD_CKVRSTATE, offsetof(struct thread_struct,</div><div class='del'>-						 ckvr_state));</div><div class='del'>-	DEFINE(THREAD_CKVRSAVE, offsetof(struct thread_struct,</div><div class='del'>-					    ckvrsave));</div><div class='del'>-	DEFINE(THREAD_CKFPSTATE, offsetof(struct thread_struct,</div><div class='del'>-						 ckfp_state));</div><div class='add'>+	OFFSET(PACATMSCRATCH, paca_struct, tm_scratch);</div><div class='add'>+	OFFSET(THREAD_TM_TFHAR, thread_struct, tm_tfhar);</div><div class='add'>+	OFFSET(THREAD_TM_TEXASR, thread_struct, tm_texasr);</div><div class='add'>+	OFFSET(THREAD_TM_TFIAR, thread_struct, tm_tfiar);</div><div class='add'>+	OFFSET(THREAD_TM_TAR, thread_struct, tm_tar);</div><div class='add'>+	OFFSET(THREAD_TM_PPR, thread_struct, tm_ppr);</div><div class='add'>+	OFFSET(THREAD_TM_DSCR, thread_struct, tm_dscr);</div><div class='add'>+	OFFSET(PT_CKPT_REGS, thread_struct, ckpt_regs);</div><div class='add'>+	OFFSET(THREAD_CKVRSTATE, thread_struct, ckvr_state);</div><div class='add'>+	OFFSET(THREAD_CKVRSAVE, thread_struct, ckvrsave);</div><div class='add'>+	OFFSET(THREAD_CKFPSTATE, thread_struct, ckfp_state);</div><div class='ctx'> 	/* Local pt_regs on stack for Transactional Memory funcs. */</div><div class='ctx'> 	DEFINE(TM_FRAME_SIZE, STACK_FRAME_OVERHEAD +</div><div class='ctx'> 	       sizeof(struct pt_regs) + 16);</div><div class='ctx'> #endif /* CONFIG_PPC_TRANSACTIONAL_MEM */</div><div class='ctx'> </div><div class='del'>-	DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));</div><div class='del'>-	DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags));</div><div class='del'>-	DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));</div><div class='del'>-	DEFINE(TI_TASK, offsetof(struct thread_info, task));</div><div class='del'>-	DEFINE(TI_CPU, offsetof(struct thread_info, cpu));</div><div class='add'>+	OFFSET(TI_FLAGS, thread_info, flags);</div><div class='add'>+	OFFSET(TI_LOCAL_FLAGS, thread_info, local_flags);</div><div class='add'>+	OFFSET(TI_PREEMPT, thread_info, preempt_count);</div><div class='add'>+	OFFSET(TI_TASK, thread_info, task);</div><div class='add'>+	OFFSET(TI_CPU, thread_info, cpu);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='del'>-	DEFINE(DCACHEL1LINESIZE, offsetof(struct ppc64_caches, dline_size));</div><div class='del'>-	DEFINE(DCACHEL1LOGLINESIZE, offsetof(struct ppc64_caches, log_dline_size));</div><div class='del'>-	DEFINE(DCACHEL1LINESPERPAGE, offsetof(struct ppc64_caches, dlines_per_page));</div><div class='del'>-	DEFINE(ICACHEL1LINESIZE, offsetof(struct ppc64_caches, iline_size));</div><div class='del'>-	DEFINE(ICACHEL1LOGLINESIZE, offsetof(struct ppc64_caches, log_iline_size));</div><div class='del'>-	DEFINE(ICACHEL1LINESPERPAGE, offsetof(struct ppc64_caches, ilines_per_page));</div><div class='add'>+	OFFSET(DCACHEL1BLOCKSIZE, ppc64_caches, l1d.block_size);</div><div class='add'>+	OFFSET(DCACHEL1LOGBLOCKSIZE, ppc64_caches, l1d.log_block_size);</div><div class='add'>+	OFFSET(DCACHEL1BLOCKSPERPAGE, ppc64_caches, l1d.blocks_per_page);</div><div class='add'>+	OFFSET(ICACHEL1BLOCKSIZE, ppc64_caches, l1i.block_size);</div><div class='add'>+	OFFSET(ICACHEL1LOGBLOCKSIZE, ppc64_caches, l1i.log_block_size);</div><div class='add'>+	OFFSET(ICACHEL1BLOCKSPERPAGE, ppc64_caches, l1i.blocks_per_page);</div><div class='ctx'> 	/* paca */</div><div class='ctx'> 	DEFINE(PACA_SIZE, sizeof(struct paca_struct));</div><div class='del'>-	DEFINE(PACAPACAINDEX, offsetof(struct paca_struct, paca_index));</div><div class='del'>-	DEFINE(PACAPROCSTART, offsetof(struct paca_struct, cpu_start));</div><div class='del'>-	DEFINE(PACAKSAVE, offsetof(struct paca_struct, kstack));</div><div class='del'>-	DEFINE(PACACURRENT, offsetof(struct paca_struct, __current));</div><div class='del'>-	DEFINE(PACASAVEDMSR, offsetof(struct paca_struct, saved_msr));</div><div class='del'>-	DEFINE(PACASTABRR, offsetof(struct paca_struct, stab_rr));</div><div class='del'>-	DEFINE(PACAR1, offsetof(struct paca_struct, saved_r1));</div><div class='del'>-	DEFINE(PACATOC, offsetof(struct paca_struct, kernel_toc));</div><div class='del'>-	DEFINE(PACAKBASE, offsetof(struct paca_struct, kernelbase));</div><div class='del'>-	DEFINE(PACAKMSR, offsetof(struct paca_struct, kernel_msr));</div><div class='del'>-	DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled));</div><div class='del'>-	DEFINE(PACAIRQHAPPENED, offsetof(struct paca_struct, irq_happened));</div><div class='add'>+	OFFSET(PACAPACAINDEX, paca_struct, paca_index);</div><div class='add'>+	OFFSET(PACAPROCSTART, paca_struct, cpu_start);</div><div class='add'>+	OFFSET(PACAKSAVE, paca_struct, kstack);</div><div class='add'>+	OFFSET(PACACURRENT, paca_struct, __current);</div><div class='add'>+	OFFSET(PACASAVEDMSR, paca_struct, saved_msr);</div><div class='add'>+	OFFSET(PACASTABRR, paca_struct, stab_rr);</div><div class='add'>+	OFFSET(PACAR1, paca_struct, saved_r1);</div><div class='add'>+	OFFSET(PACATOC, paca_struct, kernel_toc);</div><div class='add'>+	OFFSET(PACAKBASE, paca_struct, kernelbase);</div><div class='add'>+	OFFSET(PACAKMSR, paca_struct, kernel_msr);</div><div class='add'>+	OFFSET(PACASOFTIRQEN, paca_struct, soft_enabled);</div><div class='add'>+	OFFSET(PACAIRQHAPPENED, paca_struct, irq_happened);</div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3S</div><div class='del'>-	DEFINE(PACACONTEXTID, offsetof(struct paca_struct, mm_ctx_id));</div><div class='add'>+	OFFSET(PACACONTEXTID, paca_struct, mm_ctx_id);</div><div class='ctx'> #ifdef CONFIG_PPC_MM_SLICES</div><div class='del'>-	DEFINE(PACALOWSLICESPSIZE, offsetof(struct paca_struct,</div><div class='del'>-					    mm_ctx_low_slices_psize));</div><div class='del'>-	DEFINE(PACAHIGHSLICEPSIZE, offsetof(struct paca_struct,</div><div class='del'>-					    mm_ctx_high_slices_psize));</div><div class='add'>+	OFFSET(PACALOWSLICESPSIZE, paca_struct, mm_ctx_low_slices_psize);</div><div class='add'>+	OFFSET(PACAHIGHSLICEPSIZE, paca_struct, mm_ctx_high_slices_psize);</div><div class='ctx'> 	DEFINE(MMUPSIZEDEFSIZE, sizeof(struct mmu_psize_def));</div><div class='ctx'> #endif /* CONFIG_PPC_MM_SLICES */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3E</div><div class='del'>-	DEFINE(PACAPGD, offsetof(struct paca_struct, pgd));</div><div class='del'>-	DEFINE(PACA_KERNELPGD, offsetof(struct paca_struct, kernel_pgd));</div><div class='del'>-	DEFINE(PACA_EXGEN, offsetof(struct paca_struct, exgen));</div><div class='del'>-	DEFINE(PACA_EXTLB, offsetof(struct paca_struct, extlb));</div><div class='del'>-	DEFINE(PACA_EXMC, offsetof(struct paca_struct, exmc));</div><div class='del'>-	DEFINE(PACA_EXCRIT, offsetof(struct paca_struct, excrit));</div><div class='del'>-	DEFINE(PACA_EXDBG, offsetof(struct paca_struct, exdbg));</div><div class='del'>-	DEFINE(PACA_MC_STACK, offsetof(struct paca_struct, mc_kstack));</div><div class='del'>-	DEFINE(PACA_CRIT_STACK, offsetof(struct paca_struct, crit_kstack));</div><div class='del'>-	DEFINE(PACA_DBG_STACK, offsetof(struct paca_struct, dbg_kstack));</div><div class='del'>-	DEFINE(PACA_TCD_PTR, offsetof(struct paca_struct, tcd_ptr));</div><div class='del'>-</div><div class='del'>-	DEFINE(TCD_ESEL_NEXT,</div><div class='del'>-		offsetof(struct tlb_core_data, esel_next));</div><div class='del'>-	DEFINE(TCD_ESEL_MAX,</div><div class='del'>-		offsetof(struct tlb_core_data, esel_max));</div><div class='del'>-	DEFINE(TCD_ESEL_FIRST,</div><div class='del'>-		offsetof(struct tlb_core_data, esel_first));</div><div class='add'>+	OFFSET(PACAPGD, paca_struct, pgd);</div><div class='add'>+	OFFSET(PACA_KERNELPGD, paca_struct, kernel_pgd);</div><div class='add'>+	OFFSET(PACA_EXGEN, paca_struct, exgen);</div><div class='add'>+	OFFSET(PACA_EXTLB, paca_struct, extlb);</div><div class='add'>+	OFFSET(PACA_EXMC, paca_struct, exmc);</div><div class='add'>+	OFFSET(PACA_EXCRIT, paca_struct, excrit);</div><div class='add'>+	OFFSET(PACA_EXDBG, paca_struct, exdbg);</div><div class='add'>+	OFFSET(PACA_MC_STACK, paca_struct, mc_kstack);</div><div class='add'>+	OFFSET(PACA_CRIT_STACK, paca_struct, crit_kstack);</div><div class='add'>+	OFFSET(PACA_DBG_STACK, paca_struct, dbg_kstack);</div><div class='add'>+	OFFSET(PACA_TCD_PTR, paca_struct, tcd_ptr);</div><div class='add'>+</div><div class='add'>+	OFFSET(TCD_ESEL_NEXT, tlb_core_data, esel_next);</div><div class='add'>+	OFFSET(TCD_ESEL_MAX, tlb_core_data, esel_max);</div><div class='add'>+	OFFSET(TCD_ESEL_FIRST, tlb_core_data, esel_first);</div><div class='ctx'> #endif /* CONFIG_PPC_BOOK3E */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_STD_MMU_64</div><div class='del'>-	DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));</div><div class='del'>-	DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));</div><div class='del'>-	DEFINE(PACAVMALLOCSLLP, offsetof(struct paca_struct, vmalloc_sllp));</div><div class='add'>+	OFFSET(PACASLBCACHE, paca_struct, slb_cache);</div><div class='add'>+	OFFSET(PACASLBCACHEPTR, paca_struct, slb_cache_ptr);</div><div class='add'>+	OFFSET(PACAVMALLOCSLLP, paca_struct, vmalloc_sllp);</div><div class='ctx'> #ifdef CONFIG_PPC_MM_SLICES</div><div class='del'>-	DEFINE(MMUPSIZESLLP, offsetof(struct mmu_psize_def, sllp));</div><div class='add'>+	OFFSET(MMUPSIZESLLP, mmu_psize_def, sllp);</div><div class='ctx'> #else</div><div class='del'>-	DEFINE(PACACONTEXTSLLP, offsetof(struct paca_struct, mm_ctx_sllp));</div><div class='add'>+	OFFSET(PACACONTEXTSLLP, paca_struct, mm_ctx_sllp);</div><div class='ctx'> #endif /* CONFIG_PPC_MM_SLICES */</div><div class='del'>-	DEFINE(PACA_EXGEN, offsetof(struct paca_struct, exgen));</div><div class='del'>-	DEFINE(PACA_EXMC, offsetof(struct paca_struct, exmc));</div><div class='del'>-	DEFINE(PACA_EXSLB, offsetof(struct paca_struct, exslb));</div><div class='del'>-	DEFINE(PACALPPACAPTR, offsetof(struct paca_struct, lppaca_ptr));</div><div class='del'>-	DEFINE(PACA_SLBSHADOWPTR, offsetof(struct paca_struct, slb_shadow_ptr));</div><div class='del'>-	DEFINE(SLBSHADOW_STACKVSID,</div><div class='del'>-	       offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid));</div><div class='del'>-	DEFINE(SLBSHADOW_STACKESID,</div><div class='del'>-	       offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid));</div><div class='del'>-	DEFINE(SLBSHADOW_SAVEAREA, offsetof(struct slb_shadow, save_area));</div><div class='del'>-	DEFINE(LPPACA_PMCINUSE, offsetof(struct lppaca, pmcregs_in_use));</div><div class='del'>-	DEFINE(LPPACA_DTLIDX, offsetof(struct lppaca, dtl_idx));</div><div class='del'>-	DEFINE(LPPACA_YIELDCOUNT, offsetof(struct lppaca, yield_count));</div><div class='del'>-	DEFINE(PACA_DTL_RIDX, offsetof(struct paca_struct, dtl_ridx));</div><div class='add'>+	OFFSET(PACA_EXGEN, paca_struct, exgen);</div><div class='add'>+	OFFSET(PACA_EXMC, paca_struct, exmc);</div><div class='add'>+	OFFSET(PACA_EXSLB, paca_struct, exslb);</div><div class='add'>+	OFFSET(PACALPPACAPTR, paca_struct, lppaca_ptr);</div><div class='add'>+	OFFSET(PACA_SLBSHADOWPTR, paca_struct, slb_shadow_ptr);</div><div class='add'>+	OFFSET(SLBSHADOW_STACKVSID, slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid);</div><div class='add'>+	OFFSET(SLBSHADOW_STACKESID, slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid);</div><div class='add'>+	OFFSET(SLBSHADOW_SAVEAREA, slb_shadow, save_area);</div><div class='add'>+	OFFSET(LPPACA_PMCINUSE, lppaca, pmcregs_in_use);</div><div class='add'>+	OFFSET(LPPACA_DTLIDX, lppaca, dtl_idx);</div><div class='add'>+	OFFSET(LPPACA_YIELDCOUNT, lppaca, yield_count);</div><div class='add'>+	OFFSET(PACA_DTL_RIDX, paca_struct, dtl_ridx);</div><div class='ctx'> #endif /* CONFIG_PPC_STD_MMU_64 */</div><div class='del'>-	DEFINE(PACAEMERGSP, offsetof(struct paca_struct, emergency_sp));</div><div class='add'>+	OFFSET(PACAEMERGSP, paca_struct, emergency_sp);</div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3S_64</div><div class='del'>-	DEFINE(PACAMCEMERGSP, offsetof(struct paca_struct, mc_emergency_sp));</div><div class='del'>-	DEFINE(PACA_IN_MCE, offsetof(struct paca_struct, in_mce));</div><div class='del'>-#endif</div><div class='del'>-	DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));</div><div class='del'>-	DEFINE(PACAKEXECSTATE, offsetof(struct paca_struct, kexec_state));</div><div class='del'>-	DEFINE(PACA_DSCR_DEFAULT, offsetof(struct paca_struct, dscr_default));</div><div class='del'>-	DEFINE(ACCOUNT_STARTTIME,</div><div class='del'>-	       offsetof(struct paca_struct, accounting.starttime));</div><div class='del'>-	DEFINE(ACCOUNT_STARTTIME_USER,</div><div class='del'>-	       offsetof(struct paca_struct, accounting.starttime_user));</div><div class='del'>-	DEFINE(ACCOUNT_USER_TIME,</div><div class='del'>-	       offsetof(struct paca_struct, accounting.user_time));</div><div class='del'>-	DEFINE(ACCOUNT_SYSTEM_TIME,</div><div class='del'>-	       offsetof(struct paca_struct, accounting.system_time));</div><div class='del'>-	DEFINE(PACA_TRAP_SAVE, offsetof(struct paca_struct, trap_save));</div><div class='del'>-	DEFINE(PACA_NAPSTATELOST, offsetof(struct paca_struct, nap_state_lost));</div><div class='del'>-	DEFINE(PACA_SPRG_VDSO, offsetof(struct paca_struct, sprg_vdso));</div><div class='add'>+	OFFSET(PACAMCEMERGSP, paca_struct, mc_emergency_sp);</div><div class='add'>+	OFFSET(PACA_IN_MCE, paca_struct, in_mce);</div><div class='add'>+#endif</div><div class='add'>+	OFFSET(PACAHWCPUID, paca_struct, hw_cpu_id);</div><div class='add'>+	OFFSET(PACAKEXECSTATE, paca_struct, kexec_state);</div><div class='add'>+	OFFSET(PACA_DSCR_DEFAULT, paca_struct, dscr_default);</div><div class='add'>+	OFFSET(ACCOUNT_STARTTIME, paca_struct, accounting.starttime);</div><div class='add'>+	OFFSET(ACCOUNT_STARTTIME_USER, paca_struct, accounting.starttime_user);</div><div class='add'>+	OFFSET(ACCOUNT_USER_TIME, paca_struct, accounting.utime);</div><div class='add'>+	OFFSET(ACCOUNT_SYSTEM_TIME, paca_struct, accounting.stime);</div><div class='add'>+	OFFSET(PACA_TRAP_SAVE, paca_struct, trap_save);</div><div class='add'>+	OFFSET(PACA_NAPSTATELOST, paca_struct, nap_state_lost);</div><div class='add'>+	OFFSET(PACA_SPRG_VDSO, paca_struct, sprg_vdso);</div><div class='ctx'> #else /* CONFIG_PPC64 */</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE</div><div class='del'>-	DEFINE(ACCOUNT_STARTTIME,</div><div class='del'>-	       offsetof(struct thread_info, accounting.starttime));</div><div class='del'>-	DEFINE(ACCOUNT_STARTTIME_USER,</div><div class='del'>-	       offsetof(struct thread_info, accounting.starttime_user));</div><div class='del'>-	DEFINE(ACCOUNT_USER_TIME,</div><div class='del'>-	       offsetof(struct thread_info, accounting.user_time));</div><div class='del'>-	DEFINE(ACCOUNT_SYSTEM_TIME,</div><div class='del'>-	       offsetof(struct thread_info, accounting.system_time));</div><div class='add'>+	OFFSET(ACCOUNT_STARTTIME, thread_info, accounting.starttime);</div><div class='add'>+	OFFSET(ACCOUNT_STARTTIME_USER, thread_info, accounting.starttime_user);</div><div class='add'>+	OFFSET(ACCOUNT_USER_TIME, thread_info, accounting.utime);</div><div class='add'>+	OFFSET(ACCOUNT_SYSTEM_TIME, thread_info, accounting.stime);</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> 	/* RTAS */</div><div class='del'>-	DEFINE(RTASBASE, offsetof(struct rtas_t, base));</div><div class='del'>-	DEFINE(RTASENTRY, offsetof(struct rtas_t, entry));</div><div class='add'>+	OFFSET(RTASBASE, rtas_t, base);</div><div class='add'>+	OFFSET(RTASENTRY, rtas_t, entry);</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt register frame */</div><div class='ctx'> 	DEFINE(INT_FRAME_SIZE, STACK_INT_FRAME_SIZE);</div><div class='hunk'>@@ -280,38 +265,38 @@ int main(void)</div><div class='ctx'> 	DEFINE(PROM_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs) + 16);</div><div class='ctx'> 	DEFINE(RTAS_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs) + 16);</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='del'>-	DEFINE(GPR0, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[0]));</div><div class='del'>-	DEFINE(GPR1, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[1]));</div><div class='del'>-	DEFINE(GPR2, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[2]));</div><div class='del'>-	DEFINE(GPR3, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[3]));</div><div class='del'>-	DEFINE(GPR4, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[4]));</div><div class='del'>-	DEFINE(GPR5, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[5]));</div><div class='del'>-	DEFINE(GPR6, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[6]));</div><div class='del'>-	DEFINE(GPR7, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[7]));</div><div class='del'>-	DEFINE(GPR8, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[8]));</div><div class='del'>-	DEFINE(GPR9, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[9]));</div><div class='del'>-	DEFINE(GPR10, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[10]));</div><div class='del'>-	DEFINE(GPR11, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[11]));</div><div class='del'>-	DEFINE(GPR12, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[12]));</div><div class='del'>-	DEFINE(GPR13, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[13]));</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR0, gpr[0]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR1, gpr[1]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR2, gpr[2]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR3, gpr[3]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR4, gpr[4]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR5, gpr[5]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR6, gpr[6]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR7, gpr[7]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR8, gpr[8]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR9, gpr[9]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR10, gpr[10]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR11, gpr[11]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR12, gpr[12]);</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR13, gpr[13]);</div><div class='ctx'> #ifndef CONFIG_PPC64</div><div class='del'>-	DEFINE(GPR14, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[14]));</div><div class='add'>+	STACK_PT_REGS_OFFSET(GPR14, gpr[14]);</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note: these symbols include _ because they overlap with special</div><div class='ctx'> 	 * register names</div><div class='ctx'> 	 */</div><div class='del'>-	DEFINE(_NIP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, nip));</div><div class='del'>-	DEFINE(_MSR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, msr));</div><div class='del'>-	DEFINE(_CTR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, ctr));</div><div class='del'>-	DEFINE(_LINK, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, link));</div><div class='del'>-	DEFINE(_CCR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, ccr));</div><div class='del'>-	DEFINE(_XER, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, xer));</div><div class='del'>-	DEFINE(_DAR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dar));</div><div class='del'>-	DEFINE(_DSISR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dsisr));</div><div class='del'>-	DEFINE(ORIG_GPR3, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, orig_gpr3));</div><div class='del'>-	DEFINE(RESULT, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, result));</div><div class='del'>-	DEFINE(_TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap));</div><div class='add'>+	STACK_PT_REGS_OFFSET(_NIP, nip);</div><div class='add'>+	STACK_PT_REGS_OFFSET(_MSR, msr);</div><div class='add'>+	STACK_PT_REGS_OFFSET(_CTR, ctr);</div><div class='add'>+	STACK_PT_REGS_OFFSET(_LINK, link);</div><div class='add'>+	STACK_PT_REGS_OFFSET(_CCR, ccr);</div><div class='add'>+	STACK_PT_REGS_OFFSET(_XER, xer);</div><div class='add'>+	STACK_PT_REGS_OFFSET(_DAR, dar);</div><div class='add'>+	STACK_PT_REGS_OFFSET(_DSISR, dsisr);</div><div class='add'>+	STACK_PT_REGS_OFFSET(ORIG_GPR3, orig_gpr3);</div><div class='add'>+	STACK_PT_REGS_OFFSET(RESULT, result);</div><div class='add'>+	STACK_PT_REGS_OFFSET(_TRAP, trap);</div><div class='ctx'> #ifndef CONFIG_PPC64</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The PowerPC 400-class &amp; Book-E processors have neither the DAR</div><div class='hunk'>@@ -319,10 +304,10 @@ int main(void)</div><div class='ctx'> 	 * DEAR and ESR SPRs for such processors.  For critical interrupts</div><div class='ctx'> 	 * we use them to hold SRR0 and SRR1.</div><div class='ctx'> 	 */</div><div class='del'>-	DEFINE(_DEAR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dar));</div><div class='del'>-	DEFINE(_ESR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dsisr));</div><div class='add'>+	STACK_PT_REGS_OFFSET(_DEAR, dar);</div><div class='add'>+	STACK_PT_REGS_OFFSET(_ESR, dsisr);</div><div class='ctx'> #else /* CONFIG_PPC64 */</div><div class='del'>-	DEFINE(SOFTE, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, softe));</div><div class='add'>+	STACK_PT_REGS_OFFSET(SOFTE, softe);</div><div class='ctx'> </div><div class='ctx'> 	/* These _only_ to be used with {PROM,RTAS}_FRAME_SIZE!!! */</div><div class='ctx'> 	DEFINE(_SRR0, STACK_FRAME_OVERHEAD+sizeof(struct pt_regs));</div><div class='hunk'>@@ -351,17 +336,17 @@ int main(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_PPC64</div><div class='del'>-	DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));</div><div class='add'>+	OFFSET(MM_PGD, mm_struct, pgd);</div><div class='ctx'> #endif /* ! CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> 	/* About the CPU features table */</div><div class='del'>-	DEFINE(CPU_SPEC_FEATURES, offsetof(struct cpu_spec, cpu_features));</div><div class='del'>-	DEFINE(CPU_SPEC_SETUP, offsetof(struct cpu_spec, cpu_setup));</div><div class='del'>-	DEFINE(CPU_SPEC_RESTORE, offsetof(struct cpu_spec, cpu_restore));</div><div class='add'>+	OFFSET(CPU_SPEC_FEATURES, cpu_spec, cpu_features);</div><div class='add'>+	OFFSET(CPU_SPEC_SETUP, cpu_spec, cpu_setup);</div><div class='add'>+	OFFSET(CPU_SPEC_RESTORE, cpu_spec, cpu_restore);</div><div class='ctx'> </div><div class='del'>-	DEFINE(pbe_address, offsetof(struct pbe, address));</div><div class='del'>-	DEFINE(pbe_orig_address, offsetof(struct pbe, orig_address));</div><div class='del'>-	DEFINE(pbe_next, offsetof(struct pbe, next));</div><div class='add'>+	OFFSET(pbe_address, pbe, address);</div><div class='add'>+	OFFSET(pbe_orig_address, pbe, orig_address);</div><div class='add'>+	OFFSET(pbe_next, pbe, next);</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_PPC64</div><div class='ctx'> 	DEFINE(TASK_SIZE, TASK_SIZE);</div><div class='hunk'>@@ -369,40 +354,40 @@ int main(void)</div><div class='ctx'> #endif /* ! CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> 	/* datapage offsets for use by vdso */</div><div class='del'>-	DEFINE(CFG_TB_ORIG_STAMP, offsetof(struct vdso_data, tb_orig_stamp));</div><div class='del'>-	DEFINE(CFG_TB_TICKS_PER_SEC, offsetof(struct vdso_data, tb_ticks_per_sec));</div><div class='del'>-	DEFINE(CFG_TB_TO_XS, offsetof(struct vdso_data, tb_to_xs));</div><div class='del'>-	DEFINE(CFG_TB_UPDATE_COUNT, offsetof(struct vdso_data, tb_update_count));</div><div class='del'>-	DEFINE(CFG_TZ_MINUTEWEST, offsetof(struct vdso_data, tz_minuteswest));</div><div class='del'>-	DEFINE(CFG_TZ_DSTTIME, offsetof(struct vdso_data, tz_dsttime));</div><div class='del'>-	DEFINE(CFG_SYSCALL_MAP32, offsetof(struct vdso_data, syscall_map_32));</div><div class='del'>-	DEFINE(WTOM_CLOCK_SEC, offsetof(struct vdso_data, wtom_clock_sec));</div><div class='del'>-	DEFINE(WTOM_CLOCK_NSEC, offsetof(struct vdso_data, wtom_clock_nsec));</div><div class='del'>-	DEFINE(STAMP_XTIME, offsetof(struct vdso_data, stamp_xtime));</div><div class='del'>-	DEFINE(STAMP_SEC_FRAC, offsetof(struct vdso_data, stamp_sec_fraction));</div><div class='del'>-	DEFINE(CFG_ICACHE_BLOCKSZ, offsetof(struct vdso_data, icache_block_size));</div><div class='del'>-	DEFINE(CFG_DCACHE_BLOCKSZ, offsetof(struct vdso_data, dcache_block_size));</div><div class='del'>-	DEFINE(CFG_ICACHE_LOGBLOCKSZ, offsetof(struct vdso_data, icache_log_block_size));</div><div class='del'>-	DEFINE(CFG_DCACHE_LOGBLOCKSZ, offsetof(struct vdso_data, dcache_log_block_size));</div><div class='add'>+	OFFSET(CFG_TB_ORIG_STAMP, vdso_data, tb_orig_stamp);</div><div class='add'>+	OFFSET(CFG_TB_TICKS_PER_SEC, vdso_data, tb_ticks_per_sec);</div><div class='add'>+	OFFSET(CFG_TB_TO_XS, vdso_data, tb_to_xs);</div><div class='add'>+	OFFSET(CFG_TB_UPDATE_COUNT, vdso_data, tb_update_count);</div><div class='add'>+	OFFSET(CFG_TZ_MINUTEWEST, vdso_data, tz_minuteswest);</div><div class='add'>+	OFFSET(CFG_TZ_DSTTIME, vdso_data, tz_dsttime);</div><div class='add'>+	OFFSET(CFG_SYSCALL_MAP32, vdso_data, syscall_map_32);</div><div class='add'>+	OFFSET(WTOM_CLOCK_SEC, vdso_data, wtom_clock_sec);</div><div class='add'>+	OFFSET(WTOM_CLOCK_NSEC, vdso_data, wtom_clock_nsec);</div><div class='add'>+	OFFSET(STAMP_XTIME, vdso_data, stamp_xtime);</div><div class='add'>+	OFFSET(STAMP_SEC_FRAC, vdso_data, stamp_sec_fraction);</div><div class='add'>+	OFFSET(CFG_ICACHE_BLOCKSZ, vdso_data, icache_block_size);</div><div class='add'>+	OFFSET(CFG_DCACHE_BLOCKSZ, vdso_data, dcache_block_size);</div><div class='add'>+	OFFSET(CFG_ICACHE_LOGBLOCKSZ, vdso_data, icache_log_block_size);</div><div class='add'>+	OFFSET(CFG_DCACHE_LOGBLOCKSZ, vdso_data, dcache_log_block_size);</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='del'>-	DEFINE(CFG_SYSCALL_MAP64, offsetof(struct vdso_data, syscall_map_64));</div><div class='del'>-	DEFINE(TVAL64_TV_SEC, offsetof(struct timeval, tv_sec));</div><div class='del'>-	DEFINE(TVAL64_TV_USEC, offsetof(struct timeval, tv_usec));</div><div class='del'>-	DEFINE(TVAL32_TV_SEC, offsetof(struct compat_timeval, tv_sec));</div><div class='del'>-	DEFINE(TVAL32_TV_USEC, offsetof(struct compat_timeval, tv_usec));</div><div class='del'>-	DEFINE(TSPC64_TV_SEC, offsetof(struct timespec, tv_sec));</div><div class='del'>-	DEFINE(TSPC64_TV_NSEC, offsetof(struct timespec, tv_nsec));</div><div class='del'>-	DEFINE(TSPC32_TV_SEC, offsetof(struct compat_timespec, tv_sec));</div><div class='del'>-	DEFINE(TSPC32_TV_NSEC, offsetof(struct compat_timespec, tv_nsec));</div><div class='add'>+	OFFSET(CFG_SYSCALL_MAP64, vdso_data, syscall_map_64);</div><div class='add'>+	OFFSET(TVAL64_TV_SEC, timeval, tv_sec);</div><div class='add'>+	OFFSET(TVAL64_TV_USEC, timeval, tv_usec);</div><div class='add'>+	OFFSET(TVAL32_TV_SEC, compat_timeval, tv_sec);</div><div class='add'>+	OFFSET(TVAL32_TV_USEC, compat_timeval, tv_usec);</div><div class='add'>+	OFFSET(TSPC64_TV_SEC, timespec, tv_sec);</div><div class='add'>+	OFFSET(TSPC64_TV_NSEC, timespec, tv_nsec);</div><div class='add'>+	OFFSET(TSPC32_TV_SEC, compat_timespec, tv_sec);</div><div class='add'>+	OFFSET(TSPC32_TV_NSEC, compat_timespec, tv_nsec);</div><div class='ctx'> #else</div><div class='del'>-	DEFINE(TVAL32_TV_SEC, offsetof(struct timeval, tv_sec));</div><div class='del'>-	DEFINE(TVAL32_TV_USEC, offsetof(struct timeval, tv_usec));</div><div class='del'>-	DEFINE(TSPC32_TV_SEC, offsetof(struct timespec, tv_sec));</div><div class='del'>-	DEFINE(TSPC32_TV_NSEC, offsetof(struct timespec, tv_nsec));</div><div class='add'>+	OFFSET(TVAL32_TV_SEC, timeval, tv_sec);</div><div class='add'>+	OFFSET(TVAL32_TV_USEC, timeval, tv_usec);</div><div class='add'>+	OFFSET(TSPC32_TV_SEC, timespec, tv_sec);</div><div class='add'>+	OFFSET(TSPC32_TV_NSEC, timespec, tv_nsec);</div><div class='ctx'> #endif</div><div class='ctx'> 	/* timeval/timezone offsets for use by vdso */</div><div class='del'>-	DEFINE(TZONE_TZ_MINWEST, offsetof(struct timezone, tz_minuteswest));</div><div class='del'>-	DEFINE(TZONE_TZ_DSTTIME, offsetof(struct timezone, tz_dsttime));</div><div class='add'>+	OFFSET(TZONE_TZ_MINWEST, timezone, tz_minuteswest);</div><div class='add'>+	OFFSET(TZONE_TZ_DSTTIME, timezone, tz_dsttime);</div><div class='ctx'> </div><div class='ctx'> 	/* Other bits used by the vdso */</div><div class='ctx'> 	DEFINE(CLOCK_REALTIME, CLOCK_REALTIME);</div><div class='hunk'>@@ -422,164 +407,170 @@ int main(void)</div><div class='ctx'> 	DEFINE(PTE_SIZE, sizeof(pte_t));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM</div><div class='del'>-	DEFINE(VCPU_HOST_STACK, offsetof(struct kvm_vcpu, arch.host_stack));</div><div class='del'>-	DEFINE(VCPU_HOST_PID, offsetof(struct kvm_vcpu, arch.host_pid));</div><div class='del'>-	DEFINE(VCPU_GUEST_PID, offsetof(struct kvm_vcpu, arch.pid));</div><div class='del'>-	DEFINE(VCPU_GPRS, offsetof(struct kvm_vcpu, arch.gpr));</div><div class='del'>-	DEFINE(VCPU_VRSAVE, offsetof(struct kvm_vcpu, arch.vrsave));</div><div class='del'>-	DEFINE(VCPU_FPRS, offsetof(struct kvm_vcpu, arch.fp.fpr));</div><div class='add'>+	OFFSET(VCPU_HOST_STACK, kvm_vcpu, arch.host_stack);</div><div class='add'>+	OFFSET(VCPU_HOST_PID, kvm_vcpu, arch.host_pid);</div><div class='add'>+	OFFSET(VCPU_GUEST_PID, kvm_vcpu, arch.pid);</div><div class='add'>+	OFFSET(VCPU_GPRS, kvm_vcpu, arch.gpr);</div><div class='add'>+	OFFSET(VCPU_VRSAVE, kvm_vcpu, arch.vrsave);</div><div class='add'>+	OFFSET(VCPU_FPRS, kvm_vcpu, arch.fp.fpr);</div><div class='ctx'> #ifdef CONFIG_ALTIVEC</div><div class='del'>-	DEFINE(VCPU_VRS, offsetof(struct kvm_vcpu, arch.vr.vr));</div><div class='add'>+	OFFSET(VCPU_VRS, kvm_vcpu, arch.vr.vr);</div><div class='ctx'> #endif</div><div class='del'>-	DEFINE(VCPU_XER, offsetof(struct kvm_vcpu, arch.xer));</div><div class='del'>-	DEFINE(VCPU_CTR, offsetof(struct kvm_vcpu, arch.ctr));</div><div class='del'>-	DEFINE(VCPU_LR, offsetof(struct kvm_vcpu, arch.lr));</div><div class='add'>+	OFFSET(VCPU_XER, kvm_vcpu, arch.xer);</div><div class='add'>+	OFFSET(VCPU_CTR, kvm_vcpu, arch.ctr);</div><div class='add'>+	OFFSET(VCPU_LR, kvm_vcpu, arch.lr);</div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3S</div><div class='del'>-	DEFINE(VCPU_TAR, offsetof(struct kvm_vcpu, arch.tar));</div><div class='add'>+	OFFSET(VCPU_TAR, kvm_vcpu, arch.tar);</div><div class='ctx'> #endif</div><div class='del'>-	DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr));</div><div class='del'>-	DEFINE(VCPU_PC, offsetof(struct kvm_vcpu, arch.pc));</div><div class='add'>+	OFFSET(VCPU_CR, kvm_vcpu, arch.cr);</div><div class='add'>+	OFFSET(VCPU_PC, kvm_vcpu, arch.pc);</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE</div><div class='del'>-	DEFINE(VCPU_MSR, offsetof(struct kvm_vcpu, arch.shregs.msr));</div><div class='del'>-	DEFINE(VCPU_SRR0, offsetof(struct kvm_vcpu, arch.shregs.srr0));</div><div class='del'>-	DEFINE(VCPU_SRR1, offsetof(struct kvm_vcpu, arch.shregs.srr1));</div><div class='del'>-	DEFINE(VCPU_SPRG0, offsetof(struct kvm_vcpu, arch.shregs.sprg0));</div><div class='del'>-	DEFINE(VCPU_SPRG1, offsetof(struct kvm_vcpu, arch.shregs.sprg1));</div><div class='del'>-	DEFINE(VCPU_SPRG2, offsetof(struct kvm_vcpu, arch.shregs.sprg2));</div><div class='del'>-	DEFINE(VCPU_SPRG3, offsetof(struct kvm_vcpu, arch.shregs.sprg3));</div><div class='add'>+	OFFSET(VCPU_MSR, kvm_vcpu, arch.shregs.msr);</div><div class='add'>+	OFFSET(VCPU_SRR0, kvm_vcpu, arch.shregs.srr0);</div><div class='add'>+	OFFSET(VCPU_SRR1, kvm_vcpu, arch.shregs.srr1);</div><div class='add'>+	OFFSET(VCPU_SPRG0, kvm_vcpu, arch.shregs.sprg0);</div><div class='add'>+	OFFSET(VCPU_SPRG1, kvm_vcpu, arch.shregs.sprg1);</div><div class='add'>+	OFFSET(VCPU_SPRG2, kvm_vcpu, arch.shregs.sprg2);</div><div class='add'>+	OFFSET(VCPU_SPRG3, kvm_vcpu, arch.shregs.sprg3);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_HV_EXIT_TIMING</div><div class='del'>-	DEFINE(VCPU_TB_RMENTRY, offsetof(struct kvm_vcpu, arch.rm_entry));</div><div class='del'>-	DEFINE(VCPU_TB_RMINTR, offsetof(struct kvm_vcpu, arch.rm_intr));</div><div class='del'>-	DEFINE(VCPU_TB_RMEXIT, offsetof(struct kvm_vcpu, arch.rm_exit));</div><div class='del'>-	DEFINE(VCPU_TB_GUEST, offsetof(struct kvm_vcpu, arch.guest_time));</div><div class='del'>-	DEFINE(VCPU_TB_CEDE, offsetof(struct kvm_vcpu, arch.cede_time));</div><div class='del'>-	DEFINE(VCPU_CUR_ACTIVITY, offsetof(struct kvm_vcpu, arch.cur_activity));</div><div class='del'>-	DEFINE(VCPU_ACTIVITY_START, offsetof(struct kvm_vcpu, arch.cur_tb_start));</div><div class='del'>-	DEFINE(TAS_SEQCOUNT, offsetof(struct kvmhv_tb_accumulator, seqcount));</div><div class='del'>-	DEFINE(TAS_TOTAL, offsetof(struct kvmhv_tb_accumulator, tb_total));</div><div class='del'>-	DEFINE(TAS_MIN, offsetof(struct kvmhv_tb_accumulator, tb_min));</div><div class='del'>-	DEFINE(TAS_MAX, offsetof(struct kvmhv_tb_accumulator, tb_max));</div><div class='del'>-#endif</div><div class='del'>-	DEFINE(VCPU_SHARED_SPRG3, offsetof(struct kvm_vcpu_arch_shared, sprg3));</div><div class='del'>-	DEFINE(VCPU_SHARED_SPRG4, offsetof(struct kvm_vcpu_arch_shared, sprg4));</div><div class='del'>-	DEFINE(VCPU_SHARED_SPRG5, offsetof(struct kvm_vcpu_arch_shared, sprg5));</div><div class='del'>-	DEFINE(VCPU_SHARED_SPRG6, offsetof(struct kvm_vcpu_arch_shared, sprg6));</div><div class='del'>-	DEFINE(VCPU_SHARED_SPRG7, offsetof(struct kvm_vcpu_arch_shared, sprg7));</div><div class='del'>-	DEFINE(VCPU_SHADOW_PID, offsetof(struct kvm_vcpu, arch.shadow_pid));</div><div class='del'>-	DEFINE(VCPU_SHADOW_PID1, offsetof(struct kvm_vcpu, arch.shadow_pid1));</div><div class='del'>-	DEFINE(VCPU_SHARED, offsetof(struct kvm_vcpu, arch.shared));</div><div class='del'>-	DEFINE(VCPU_SHARED_MSR, offsetof(struct kvm_vcpu_arch_shared, msr));</div><div class='del'>-	DEFINE(VCPU_SHADOW_MSR, offsetof(struct kvm_vcpu, arch.shadow_msr));</div><div class='add'>+	OFFSET(VCPU_TB_RMENTRY, kvm_vcpu, arch.rm_entry);</div><div class='add'>+	OFFSET(VCPU_TB_RMINTR, kvm_vcpu, arch.rm_intr);</div><div class='add'>+	OFFSET(VCPU_TB_RMEXIT, kvm_vcpu, arch.rm_exit);</div><div class='add'>+	OFFSET(VCPU_TB_GUEST, kvm_vcpu, arch.guest_time);</div><div class='add'>+	OFFSET(VCPU_TB_CEDE, kvm_vcpu, arch.cede_time);</div><div class='add'>+	OFFSET(VCPU_CUR_ACTIVITY, kvm_vcpu, arch.cur_activity);</div><div class='add'>+	OFFSET(VCPU_ACTIVITY_START, kvm_vcpu, arch.cur_tb_start);</div><div class='add'>+	OFFSET(TAS_SEQCOUNT, kvmhv_tb_accumulator, seqcount);</div><div class='add'>+	OFFSET(TAS_TOTAL, kvmhv_tb_accumulator, tb_total);</div><div class='add'>+	OFFSET(TAS_MIN, kvmhv_tb_accumulator, tb_min);</div><div class='add'>+	OFFSET(TAS_MAX, kvmhv_tb_accumulator, tb_max);</div><div class='add'>+#endif</div><div class='add'>+	OFFSET(VCPU_SHARED_SPRG3, kvm_vcpu_arch_shared, sprg3);</div><div class='add'>+	OFFSET(VCPU_SHARED_SPRG4, kvm_vcpu_arch_shared, sprg4);</div><div class='add'>+	OFFSET(VCPU_SHARED_SPRG5, kvm_vcpu_arch_shared, sprg5);</div><div class='add'>+	OFFSET(VCPU_SHARED_SPRG6, kvm_vcpu_arch_shared, sprg6);</div><div class='add'>+	OFFSET(VCPU_SHARED_SPRG7, kvm_vcpu_arch_shared, sprg7);</div><div class='add'>+	OFFSET(VCPU_SHADOW_PID, kvm_vcpu, arch.shadow_pid);</div><div class='add'>+	OFFSET(VCPU_SHADOW_PID1, kvm_vcpu, arch.shadow_pid1);</div><div class='add'>+	OFFSET(VCPU_SHARED, kvm_vcpu, arch.shared);</div><div class='add'>+	OFFSET(VCPU_SHARED_MSR, kvm_vcpu_arch_shared, msr);</div><div class='add'>+	OFFSET(VCPU_SHADOW_MSR, kvm_vcpu, arch.shadow_msr);</div><div class='ctx'> #if defined(CONFIG_PPC_BOOK3S_64) &amp;&amp; defined(CONFIG_KVM_BOOK3S_PR_POSSIBLE)</div><div class='del'>-	DEFINE(VCPU_SHAREDBE, offsetof(struct kvm_vcpu, arch.shared_big_endian));</div><div class='add'>+	OFFSET(VCPU_SHAREDBE, kvm_vcpu, arch.shared_big_endian);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	DEFINE(VCPU_SHARED_MAS0, offsetof(struct kvm_vcpu_arch_shared, mas0));</div><div class='del'>-	DEFINE(VCPU_SHARED_MAS1, offsetof(struct kvm_vcpu_arch_shared, mas1));</div><div class='del'>-	DEFINE(VCPU_SHARED_MAS2, offsetof(struct kvm_vcpu_arch_shared, mas2));</div><div class='del'>-	DEFINE(VCPU_SHARED_MAS7_3, offsetof(struct kvm_vcpu_arch_shared, mas7_3));</div><div class='del'>-	DEFINE(VCPU_SHARED_MAS4, offsetof(struct kvm_vcpu_arch_shared, mas4));</div><div class='del'>-	DEFINE(VCPU_SHARED_MAS6, offsetof(struct kvm_vcpu_arch_shared, mas6));</div><div class='add'>+	OFFSET(VCPU_SHARED_MAS0, kvm_vcpu_arch_shared, mas0);</div><div class='add'>+	OFFSET(VCPU_SHARED_MAS1, kvm_vcpu_arch_shared, mas1);</div><div class='add'>+	OFFSET(VCPU_SHARED_MAS2, kvm_vcpu_arch_shared, mas2);</div><div class='add'>+	OFFSET(VCPU_SHARED_MAS7_3, kvm_vcpu_arch_shared, mas7_3);</div><div class='add'>+	OFFSET(VCPU_SHARED_MAS4, kvm_vcpu_arch_shared, mas4);</div><div class='add'>+	OFFSET(VCPU_SHARED_MAS6, kvm_vcpu_arch_shared, mas6);</div><div class='ctx'> </div><div class='del'>-	DEFINE(VCPU_KVM, offsetof(struct kvm_vcpu, kvm));</div><div class='del'>-	DEFINE(KVM_LPID, offsetof(struct kvm, arch.lpid));</div><div class='add'>+	OFFSET(VCPU_KVM, kvm_vcpu, kvm);</div><div class='add'>+	OFFSET(KVM_LPID, kvm, arch.lpid);</div><div class='ctx'> </div><div class='ctx'> 	/* book3s */</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE</div><div class='del'>-	DEFINE(KVM_SDR1, offsetof(struct kvm, arch.sdr1));</div><div class='del'>-	DEFINE(KVM_HOST_LPID, offsetof(struct kvm, arch.host_lpid));</div><div class='del'>-	DEFINE(KVM_HOST_LPCR, offsetof(struct kvm, arch.host_lpcr));</div><div class='del'>-	DEFINE(KVM_HOST_SDR1, offsetof(struct kvm, arch.host_sdr1));</div><div class='del'>-	DEFINE(KVM_NEED_FLUSH, offsetof(struct kvm, arch.need_tlb_flush.bits));</div><div class='del'>-	DEFINE(KVM_ENABLED_HCALLS, offsetof(struct kvm, arch.enabled_hcalls));</div><div class='del'>-	DEFINE(KVM_VRMA_SLB_V, offsetof(struct kvm, arch.vrma_slb_v));</div><div class='del'>-	DEFINE(VCPU_DSISR, offsetof(struct kvm_vcpu, arch.shregs.dsisr));</div><div class='del'>-	DEFINE(VCPU_DAR, offsetof(struct kvm_vcpu, arch.shregs.dar));</div><div class='del'>-	DEFINE(VCPU_VPA, offsetof(struct kvm_vcpu, arch.vpa.pinned_addr));</div><div class='del'>-	DEFINE(VCPU_VPA_DIRTY, offsetof(struct kvm_vcpu, arch.vpa.dirty));</div><div class='del'>-	DEFINE(VCPU_HEIR, offsetof(struct kvm_vcpu, arch.emul_inst));</div><div class='del'>-	DEFINE(VCPU_CPU, offsetof(struct kvm_vcpu, cpu));</div><div class='del'>-	DEFINE(VCPU_THREAD_CPU, offsetof(struct kvm_vcpu, arch.thread_cpu));</div><div class='add'>+	OFFSET(KVM_TLB_SETS, kvm, arch.tlb_sets);</div><div class='add'>+	OFFSET(KVM_SDR1, kvm, arch.sdr1);</div><div class='add'>+	OFFSET(KVM_HOST_LPID, kvm, arch.host_lpid);</div><div class='add'>+	OFFSET(KVM_HOST_LPCR, kvm, arch.host_lpcr);</div><div class='add'>+	OFFSET(KVM_HOST_SDR1, kvm, arch.host_sdr1);</div><div class='add'>+	OFFSET(KVM_NEED_FLUSH, kvm, arch.need_tlb_flush.bits);</div><div class='add'>+	OFFSET(KVM_ENABLED_HCALLS, kvm, arch.enabled_hcalls);</div><div class='add'>+	OFFSET(KVM_VRMA_SLB_V, kvm, arch.vrma_slb_v);</div><div class='add'>+	OFFSET(KVM_RADIX, kvm, arch.radix);</div><div class='add'>+	OFFSET(VCPU_DSISR, kvm_vcpu, arch.shregs.dsisr);</div><div class='add'>+	OFFSET(VCPU_DAR, kvm_vcpu, arch.shregs.dar);</div><div class='add'>+	OFFSET(VCPU_VPA, kvm_vcpu, arch.vpa.pinned_addr);</div><div class='add'>+	OFFSET(VCPU_VPA_DIRTY, kvm_vcpu, arch.vpa.dirty);</div><div class='add'>+	OFFSET(VCPU_HEIR, kvm_vcpu, arch.emul_inst);</div><div class='add'>+	OFFSET(VCPU_CPU, kvm_vcpu, cpu);</div><div class='add'>+	OFFSET(VCPU_THREAD_CPU, kvm_vcpu, arch.thread_cpu);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3S</div><div class='del'>-	DEFINE(VCPU_PURR, offsetof(struct kvm_vcpu, arch.purr));</div><div class='del'>-	DEFINE(VCPU_SPURR, offsetof(struct kvm_vcpu, arch.spurr));</div><div class='del'>-	DEFINE(VCPU_IC, offsetof(struct kvm_vcpu, arch.ic));</div><div class='del'>-	DEFINE(VCPU_DSCR, offsetof(struct kvm_vcpu, arch.dscr));</div><div class='del'>-	DEFINE(VCPU_AMR, offsetof(struct kvm_vcpu, arch.amr));</div><div class='del'>-	DEFINE(VCPU_UAMOR, offsetof(struct kvm_vcpu, arch.uamor));</div><div class='del'>-	DEFINE(VCPU_IAMR, offsetof(struct kvm_vcpu, arch.iamr));</div><div class='del'>-	DEFINE(VCPU_CTRL, offsetof(struct kvm_vcpu, arch.ctrl));</div><div class='del'>-	DEFINE(VCPU_DABR, offsetof(struct kvm_vcpu, arch.dabr));</div><div class='del'>-	DEFINE(VCPU_DABRX, offsetof(struct kvm_vcpu, arch.dabrx));</div><div class='del'>-	DEFINE(VCPU_DAWR, offsetof(struct kvm_vcpu, arch.dawr));</div><div class='del'>-	DEFINE(VCPU_DAWRX, offsetof(struct kvm_vcpu, arch.dawrx));</div><div class='del'>-	DEFINE(VCPU_CIABR, offsetof(struct kvm_vcpu, arch.ciabr));</div><div class='del'>-	DEFINE(VCPU_HFLAGS, offsetof(struct kvm_vcpu, arch.hflags));</div><div class='del'>-	DEFINE(VCPU_DEC, offsetof(struct kvm_vcpu, arch.dec));</div><div class='del'>-	DEFINE(VCPU_DEC_EXPIRES, offsetof(struct kvm_vcpu, arch.dec_expires));</div><div class='del'>-	DEFINE(VCPU_PENDING_EXC, offsetof(struct kvm_vcpu, arch.pending_exceptions));</div><div class='del'>-	DEFINE(VCPU_CEDED, offsetof(struct kvm_vcpu, arch.ceded));</div><div class='del'>-	DEFINE(VCPU_PRODDED, offsetof(struct kvm_vcpu, arch.prodded));</div><div class='del'>-	DEFINE(VCPU_MMCR, offsetof(struct kvm_vcpu, arch.mmcr));</div><div class='del'>-	DEFINE(VCPU_PMC, offsetof(struct kvm_vcpu, arch.pmc));</div><div class='del'>-	DEFINE(VCPU_SPMC, offsetof(struct kvm_vcpu, arch.spmc));</div><div class='del'>-	DEFINE(VCPU_SIAR, offsetof(struct kvm_vcpu, arch.siar));</div><div class='del'>-	DEFINE(VCPU_SDAR, offsetof(struct kvm_vcpu, arch.sdar));</div><div class='del'>-	DEFINE(VCPU_SIER, offsetof(struct kvm_vcpu, arch.sier));</div><div class='del'>-	DEFINE(VCPU_SLB, offsetof(struct kvm_vcpu, arch.slb));</div><div class='del'>-	DEFINE(VCPU_SLB_MAX, offsetof(struct kvm_vcpu, arch.slb_max));</div><div class='del'>-	DEFINE(VCPU_SLB_NR, offsetof(struct kvm_vcpu, arch.slb_nr));</div><div class='del'>-	DEFINE(VCPU_FAULT_DSISR, offsetof(struct kvm_vcpu, arch.fault_dsisr));</div><div class='del'>-	DEFINE(VCPU_FAULT_DAR, offsetof(struct kvm_vcpu, arch.fault_dar));</div><div class='del'>-	DEFINE(VCPU_INTR_MSR, offsetof(struct kvm_vcpu, arch.intr_msr));</div><div class='del'>-	DEFINE(VCPU_LAST_INST, offsetof(struct kvm_vcpu, arch.last_inst));</div><div class='del'>-	DEFINE(VCPU_TRAP, offsetof(struct kvm_vcpu, arch.trap));</div><div class='del'>-	DEFINE(VCPU_CFAR, offsetof(struct kvm_vcpu, arch.cfar));</div><div class='del'>-	DEFINE(VCPU_PPR, offsetof(struct kvm_vcpu, arch.ppr));</div><div class='del'>-	DEFINE(VCPU_FSCR, offsetof(struct kvm_vcpu, arch.fscr));</div><div class='del'>-	DEFINE(VCPU_PSPB, offsetof(struct kvm_vcpu, arch.pspb));</div><div class='del'>-	DEFINE(VCPU_EBBHR, offsetof(struct kvm_vcpu, arch.ebbhr));</div><div class='del'>-	DEFINE(VCPU_EBBRR, offsetof(struct kvm_vcpu, arch.ebbrr));</div><div class='del'>-	DEFINE(VCPU_BESCR, offsetof(struct kvm_vcpu, arch.bescr));</div><div class='del'>-	DEFINE(VCPU_CSIGR, offsetof(struct kvm_vcpu, arch.csigr));</div><div class='del'>-	DEFINE(VCPU_TACR, offsetof(struct kvm_vcpu, arch.tacr));</div><div class='del'>-	DEFINE(VCPU_TCSCR, offsetof(struct kvm_vcpu, arch.tcscr));</div><div class='del'>-	DEFINE(VCPU_ACOP, offsetof(struct kvm_vcpu, arch.acop));</div><div class='del'>-	DEFINE(VCPU_WORT, offsetof(struct kvm_vcpu, arch.wort));</div><div class='del'>-	DEFINE(VCORE_ENTRY_EXIT, offsetof(struct kvmppc_vcore, entry_exit_map));</div><div class='del'>-	DEFINE(VCORE_IN_GUEST, offsetof(struct kvmppc_vcore, in_guest));</div><div class='del'>-	DEFINE(VCORE_NAPPING_THREADS, offsetof(struct kvmppc_vcore, napping_threads));</div><div class='del'>-	DEFINE(VCORE_KVM, offsetof(struct kvmppc_vcore, kvm));</div><div class='del'>-	DEFINE(VCORE_TB_OFFSET, offsetof(struct kvmppc_vcore, tb_offset));</div><div class='del'>-	DEFINE(VCORE_LPCR, offsetof(struct kvmppc_vcore, lpcr));</div><div class='del'>-	DEFINE(VCORE_PCR, offsetof(struct kvmppc_vcore, pcr));</div><div class='del'>-	DEFINE(VCORE_DPDES, offsetof(struct kvmppc_vcore, dpdes));</div><div class='del'>-	DEFINE(VCORE_VTB, offsetof(struct kvmppc_vcore, vtb));</div><div class='del'>-	DEFINE(VCPU_SLB_E, offsetof(struct kvmppc_slb, orige));</div><div class='del'>-	DEFINE(VCPU_SLB_V, offsetof(struct kvmppc_slb, origv));</div><div class='add'>+	OFFSET(VCPU_PURR, kvm_vcpu, arch.purr);</div><div class='add'>+	OFFSET(VCPU_SPURR, kvm_vcpu, arch.spurr);</div><div class='add'>+	OFFSET(VCPU_IC, kvm_vcpu, arch.ic);</div><div class='add'>+	OFFSET(VCPU_DSCR, kvm_vcpu, arch.dscr);</div><div class='add'>+	OFFSET(VCPU_AMR, kvm_vcpu, arch.amr);</div><div class='add'>+	OFFSET(VCPU_UAMOR, kvm_vcpu, arch.uamor);</div><div class='add'>+	OFFSET(VCPU_IAMR, kvm_vcpu, arch.iamr);</div><div class='add'>+	OFFSET(VCPU_CTRL, kvm_vcpu, arch.ctrl);</div><div class='add'>+	OFFSET(VCPU_DABR, kvm_vcpu, arch.dabr);</div><div class='add'>+	OFFSET(VCPU_DABRX, kvm_vcpu, arch.dabrx);</div><div class='add'>+	OFFSET(VCPU_DAWR, kvm_vcpu, arch.dawr);</div><div class='add'>+	OFFSET(VCPU_DAWRX, kvm_vcpu, arch.dawrx);</div><div class='add'>+	OFFSET(VCPU_CIABR, kvm_vcpu, arch.ciabr);</div><div class='add'>+	OFFSET(VCPU_HFLAGS, kvm_vcpu, arch.hflags);</div><div class='add'>+	OFFSET(VCPU_DEC, kvm_vcpu, arch.dec);</div><div class='add'>+	OFFSET(VCPU_DEC_EXPIRES, kvm_vcpu, arch.dec_expires);</div><div class='add'>+	OFFSET(VCPU_PENDING_EXC, kvm_vcpu, arch.pending_exceptions);</div><div class='add'>+	OFFSET(VCPU_CEDED, kvm_vcpu, arch.ceded);</div><div class='add'>+	OFFSET(VCPU_PRODDED, kvm_vcpu, arch.prodded);</div><div class='add'>+	OFFSET(VCPU_MMCR, kvm_vcpu, arch.mmcr);</div><div class='add'>+	OFFSET(VCPU_PMC, kvm_vcpu, arch.pmc);</div><div class='add'>+	OFFSET(VCPU_SPMC, kvm_vcpu, arch.spmc);</div><div class='add'>+	OFFSET(VCPU_SIAR, kvm_vcpu, arch.siar);</div><div class='add'>+	OFFSET(VCPU_SDAR, kvm_vcpu, arch.sdar);</div><div class='add'>+	OFFSET(VCPU_SIER, kvm_vcpu, arch.sier);</div><div class='add'>+	OFFSET(VCPU_SLB, kvm_vcpu, arch.slb);</div><div class='add'>+	OFFSET(VCPU_SLB_MAX, kvm_vcpu, arch.slb_max);</div><div class='add'>+	OFFSET(VCPU_SLB_NR, kvm_vcpu, arch.slb_nr);</div><div class='add'>+	OFFSET(VCPU_FAULT_DSISR, kvm_vcpu, arch.fault_dsisr);</div><div class='add'>+	OFFSET(VCPU_FAULT_DAR, kvm_vcpu, arch.fault_dar);</div><div class='add'>+	OFFSET(VCPU_FAULT_GPA, kvm_vcpu, arch.fault_gpa);</div><div class='add'>+	OFFSET(VCPU_INTR_MSR, kvm_vcpu, arch.intr_msr);</div><div class='add'>+	OFFSET(VCPU_LAST_INST, kvm_vcpu, arch.last_inst);</div><div class='add'>+	OFFSET(VCPU_TRAP, kvm_vcpu, arch.trap);</div><div class='add'>+	OFFSET(VCPU_CFAR, kvm_vcpu, arch.cfar);</div><div class='add'>+	OFFSET(VCPU_PPR, kvm_vcpu, arch.ppr);</div><div class='add'>+	OFFSET(VCPU_FSCR, kvm_vcpu, arch.fscr);</div><div class='add'>+	OFFSET(VCPU_PSPB, kvm_vcpu, arch.pspb);</div><div class='add'>+	OFFSET(VCPU_EBBHR, kvm_vcpu, arch.ebbhr);</div><div class='add'>+	OFFSET(VCPU_EBBRR, kvm_vcpu, arch.ebbrr);</div><div class='add'>+	OFFSET(VCPU_BESCR, kvm_vcpu, arch.bescr);</div><div class='add'>+	OFFSET(VCPU_CSIGR, kvm_vcpu, arch.csigr);</div><div class='add'>+	OFFSET(VCPU_TACR, kvm_vcpu, arch.tacr);</div><div class='add'>+	OFFSET(VCPU_TCSCR, kvm_vcpu, arch.tcscr);</div><div class='add'>+	OFFSET(VCPU_ACOP, kvm_vcpu, arch.acop);</div><div class='add'>+	OFFSET(VCPU_WORT, kvm_vcpu, arch.wort);</div><div class='add'>+	OFFSET(VCPU_TID, kvm_vcpu, arch.tid);</div><div class='add'>+	OFFSET(VCPU_PSSCR, kvm_vcpu, arch.psscr);</div><div class='add'>+	OFFSET(VCORE_ENTRY_EXIT, kvmppc_vcore, entry_exit_map);</div><div class='add'>+	OFFSET(VCORE_IN_GUEST, kvmppc_vcore, in_guest);</div><div class='add'>+	OFFSET(VCORE_NAPPING_THREADS, kvmppc_vcore, napping_threads);</div><div class='add'>+	OFFSET(VCORE_KVM, kvmppc_vcore, kvm);</div><div class='add'>+	OFFSET(VCORE_TB_OFFSET, kvmppc_vcore, tb_offset);</div><div class='add'>+	OFFSET(VCORE_LPCR, kvmppc_vcore, lpcr);</div><div class='add'>+	OFFSET(VCORE_PCR, kvmppc_vcore, pcr);</div><div class='add'>+	OFFSET(VCORE_DPDES, kvmppc_vcore, dpdes);</div><div class='add'>+	OFFSET(VCORE_VTB, kvmppc_vcore, vtb);</div><div class='add'>+	OFFSET(VCPU_SLB_E, kvmppc_slb, orige);</div><div class='add'>+	OFFSET(VCPU_SLB_V, kvmppc_slb, origv);</div><div class='ctx'> 	DEFINE(VCPU_SLB_SIZE, sizeof(struct kvmppc_slb));</div><div class='ctx'> #ifdef CONFIG_PPC_TRANSACTIONAL_MEM</div><div class='del'>-	DEFINE(VCPU_TFHAR, offsetof(struct kvm_vcpu, arch.tfhar));</div><div class='del'>-	DEFINE(VCPU_TFIAR, offsetof(struct kvm_vcpu, arch.tfiar));</div><div class='del'>-	DEFINE(VCPU_TEXASR, offsetof(struct kvm_vcpu, arch.texasr));</div><div class='del'>-	DEFINE(VCPU_GPR_TM, offsetof(struct kvm_vcpu, arch.gpr_tm));</div><div class='del'>-	DEFINE(VCPU_FPRS_TM, offsetof(struct kvm_vcpu, arch.fp_tm.fpr));</div><div class='del'>-	DEFINE(VCPU_VRS_TM, offsetof(struct kvm_vcpu, arch.vr_tm.vr));</div><div class='del'>-	DEFINE(VCPU_VRSAVE_TM, offsetof(struct kvm_vcpu, arch.vrsave_tm));</div><div class='del'>-	DEFINE(VCPU_CR_TM, offsetof(struct kvm_vcpu, arch.cr_tm));</div><div class='del'>-	DEFINE(VCPU_LR_TM, offsetof(struct kvm_vcpu, arch.lr_tm));</div><div class='del'>-	DEFINE(VCPU_CTR_TM, offsetof(struct kvm_vcpu, arch.ctr_tm));</div><div class='del'>-	DEFINE(VCPU_AMR_TM, offsetof(struct kvm_vcpu, arch.amr_tm));</div><div class='del'>-	DEFINE(VCPU_PPR_TM, offsetof(struct kvm_vcpu, arch.ppr_tm));</div><div class='del'>-	DEFINE(VCPU_DSCR_TM, offsetof(struct kvm_vcpu, arch.dscr_tm));</div><div class='del'>-	DEFINE(VCPU_TAR_TM, offsetof(struct kvm_vcpu, arch.tar_tm));</div><div class='add'>+	OFFSET(VCPU_TFHAR, kvm_vcpu, arch.tfhar);</div><div class='add'>+	OFFSET(VCPU_TFIAR, kvm_vcpu, arch.tfiar);</div><div class='add'>+	OFFSET(VCPU_TEXASR, kvm_vcpu, arch.texasr);</div><div class='add'>+	OFFSET(VCPU_GPR_TM, kvm_vcpu, arch.gpr_tm);</div><div class='add'>+	OFFSET(VCPU_FPRS_TM, kvm_vcpu, arch.fp_tm.fpr);</div><div class='add'>+	OFFSET(VCPU_VRS_TM, kvm_vcpu, arch.vr_tm.vr);</div><div class='add'>+	OFFSET(VCPU_VRSAVE_TM, kvm_vcpu, arch.vrsave_tm);</div><div class='add'>+	OFFSET(VCPU_CR_TM, kvm_vcpu, arch.cr_tm);</div><div class='add'>+	OFFSET(VCPU_XER_TM, kvm_vcpu, arch.xer_tm);</div><div class='add'>+	OFFSET(VCPU_LR_TM, kvm_vcpu, arch.lr_tm);</div><div class='add'>+	OFFSET(VCPU_CTR_TM, kvm_vcpu, arch.ctr_tm);</div><div class='add'>+	OFFSET(VCPU_AMR_TM, kvm_vcpu, arch.amr_tm);</div><div class='add'>+	OFFSET(VCPU_PPR_TM, kvm_vcpu, arch.ppr_tm);</div><div class='add'>+	OFFSET(VCPU_DSCR_TM, kvm_vcpu, arch.dscr_tm);</div><div class='add'>+	OFFSET(VCPU_TAR_TM, kvm_vcpu, arch.tar_tm);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3S_64</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE</div><div class='del'>-	DEFINE(PACA_SVCPU, offsetof(struct paca_struct, shadow_vcpu));</div><div class='add'>+	OFFSET(PACA_SVCPU, paca_struct, shadow_vcpu);</div><div class='ctx'> # define SVCPU_FIELD(x, f)	DEFINE(x, offsetof(struct paca_struct, shadow_vcpu.f))</div><div class='ctx'> #else</div><div class='ctx'> # define SVCPU_FIELD(x, f)</div><div class='hunk'>@@ -662,11 +653,11 @@ int main(void)</div><div class='ctx'> 	HSTATE_FIELD(HSTATE_DECEXP, dec_expires);</div><div class='ctx'> 	HSTATE_FIELD(HSTATE_SPLIT_MODE, kvm_split_mode);</div><div class='ctx'> 	DEFINE(IPI_PRIORITY, IPI_PRIORITY);</div><div class='del'>-	DEFINE(KVM_SPLIT_RPR, offsetof(struct kvm_split_mode, rpr));</div><div class='del'>-	DEFINE(KVM_SPLIT_PMMAR, offsetof(struct kvm_split_mode, pmmar));</div><div class='del'>-	DEFINE(KVM_SPLIT_LDBAR, offsetof(struct kvm_split_mode, ldbar));</div><div class='del'>-	DEFINE(KVM_SPLIT_DO_NAP, offsetof(struct kvm_split_mode, do_nap));</div><div class='del'>-	DEFINE(KVM_SPLIT_NAPPED, offsetof(struct kvm_split_mode, napped));</div><div class='add'>+	OFFSET(KVM_SPLIT_RPR, kvm_split_mode, rpr);</div><div class='add'>+	OFFSET(KVM_SPLIT_PMMAR, kvm_split_mode, pmmar);</div><div class='add'>+	OFFSET(KVM_SPLIT_LDBAR, kvm_split_mode, ldbar);</div><div class='add'>+	OFFSET(KVM_SPLIT_DO_NAP, kvm_split_mode, do_nap);</div><div class='add'>+	OFFSET(KVM_SPLIT_NAPPED, kvm_split_mode, napped);</div><div class='ctx'> #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3S_64</div><div class='hunk'>@@ -676,32 +667,27 @@ int main(void)</div><div class='ctx'> #endif /* CONFIG_PPC_BOOK3S_64 */</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_PPC_BOOK3S */</div><div class='del'>-	DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr));</div><div class='del'>-	DEFINE(VCPU_XER, offsetof(struct kvm_vcpu, arch.xer));</div><div class='del'>-	DEFINE(VCPU_LR, offsetof(struct kvm_vcpu, arch.lr));</div><div class='del'>-	DEFINE(VCPU_CTR, offsetof(struct kvm_vcpu, arch.ctr));</div><div class='del'>-	DEFINE(VCPU_PC, offsetof(struct kvm_vcpu, arch.pc));</div><div class='del'>-	DEFINE(VCPU_SPRG9, offsetof(struct kvm_vcpu, arch.sprg9));</div><div class='del'>-	DEFINE(VCPU_LAST_INST, offsetof(struct kvm_vcpu, arch.last_inst));</div><div class='del'>-	DEFINE(VCPU_FAULT_DEAR, offsetof(struct kvm_vcpu, arch.fault_dear));</div><div class='del'>-	DEFINE(VCPU_FAULT_ESR, offsetof(struct kvm_vcpu, arch.fault_esr));</div><div class='del'>-	DEFINE(VCPU_CRIT_SAVE, offsetof(struct kvm_vcpu, arch.crit_save));</div><div class='add'>+	OFFSET(VCPU_CR, kvm_vcpu, arch.cr);</div><div class='add'>+	OFFSET(VCPU_XER, kvm_vcpu, arch.xer);</div><div class='add'>+	OFFSET(VCPU_LR, kvm_vcpu, arch.lr);</div><div class='add'>+	OFFSET(VCPU_CTR, kvm_vcpu, arch.ctr);</div><div class='add'>+	OFFSET(VCPU_PC, kvm_vcpu, arch.pc);</div><div class='add'>+	OFFSET(VCPU_SPRG9, kvm_vcpu, arch.sprg9);</div><div class='add'>+	OFFSET(VCPU_LAST_INST, kvm_vcpu, arch.last_inst);</div><div class='add'>+	OFFSET(VCPU_FAULT_DEAR, kvm_vcpu, arch.fault_dear);</div><div class='add'>+	OFFSET(VCPU_FAULT_ESR, kvm_vcpu, arch.fault_esr);</div><div class='add'>+	OFFSET(VCPU_CRIT_SAVE, kvm_vcpu, arch.crit_save);</div><div class='ctx'> #endif /* CONFIG_PPC_BOOK3S */</div><div class='ctx'> #endif /* CONFIG_KVM */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_GUEST</div><div class='del'>-	DEFINE(KVM_MAGIC_SCRATCH1, offsetof(struct kvm_vcpu_arch_shared,</div><div class='del'>-					    scratch1));</div><div class='del'>-	DEFINE(KVM_MAGIC_SCRATCH2, offsetof(struct kvm_vcpu_arch_shared,</div><div class='del'>-					    scratch2));</div><div class='del'>-	DEFINE(KVM_MAGIC_SCRATCH3, offsetof(struct kvm_vcpu_arch_shared,</div><div class='del'>-					    scratch3));</div><div class='del'>-	DEFINE(KVM_MAGIC_INT, offsetof(struct kvm_vcpu_arch_shared,</div><div class='del'>-				       int_pending));</div><div class='del'>-	DEFINE(KVM_MAGIC_MSR, offsetof(struct kvm_vcpu_arch_shared, msr));</div><div class='del'>-	DEFINE(KVM_MAGIC_CRITICAL, offsetof(struct kvm_vcpu_arch_shared,</div><div class='del'>-					    critical));</div><div class='del'>-	DEFINE(KVM_MAGIC_SR, offsetof(struct kvm_vcpu_arch_shared, sr));</div><div class='add'>+	OFFSET(KVM_MAGIC_SCRATCH1, kvm_vcpu_arch_shared, scratch1);</div><div class='add'>+	OFFSET(KVM_MAGIC_SCRATCH2, kvm_vcpu_arch_shared, scratch2);</div><div class='add'>+	OFFSET(KVM_MAGIC_SCRATCH3, kvm_vcpu_arch_shared, scratch3);</div><div class='add'>+	OFFSET(KVM_MAGIC_INT, kvm_vcpu_arch_shared, int_pending);</div><div class='add'>+	OFFSET(KVM_MAGIC_MSR, kvm_vcpu_arch_shared, msr);</div><div class='add'>+	OFFSET(KVM_MAGIC_CRITICAL, kvm_vcpu_arch_shared, critical);</div><div class='add'>+	OFFSET(KVM_MAGIC_SR, kvm_vcpu_arch_shared, sr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_44x</div><div class='hunk'>@@ -710,45 +696,37 @@ int main(void)</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> 	DEFINE(TLBCAM_SIZE, sizeof(struct tlbcam));</div><div class='del'>-	DEFINE(TLBCAM_MAS0, offsetof(struct tlbcam, MAS0));</div><div class='del'>-	DEFINE(TLBCAM_MAS1, offsetof(struct tlbcam, MAS1));</div><div class='del'>-	DEFINE(TLBCAM_MAS2, offsetof(struct tlbcam, MAS2));</div><div class='del'>-	DEFINE(TLBCAM_MAS3, offsetof(struct tlbcam, MAS3));</div><div class='del'>-	DEFINE(TLBCAM_MAS7, offsetof(struct tlbcam, MAS7));</div><div class='add'>+	OFFSET(TLBCAM_MAS0, tlbcam, MAS0);</div><div class='add'>+	OFFSET(TLBCAM_MAS1, tlbcam, MAS1);</div><div class='add'>+	OFFSET(TLBCAM_MAS2, tlbcam, MAS2);</div><div class='add'>+	OFFSET(TLBCAM_MAS3, tlbcam, MAS3);</div><div class='add'>+	OFFSET(TLBCAM_MAS7, tlbcam, MAS7);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_KVM) &amp;&amp; defined(CONFIG_SPE)</div><div class='del'>-	DEFINE(VCPU_EVR, offsetof(struct kvm_vcpu, arch.evr[0]));</div><div class='del'>-	DEFINE(VCPU_ACC, offsetof(struct kvm_vcpu, arch.acc));</div><div class='del'>-	DEFINE(VCPU_SPEFSCR, offsetof(struct kvm_vcpu, arch.spefscr));</div><div class='del'>-	DEFINE(VCPU_HOST_SPEFSCR, offsetof(struct kvm_vcpu, arch.host_spefscr));</div><div class='add'>+	OFFSET(VCPU_EVR, kvm_vcpu, arch.evr[0]);</div><div class='add'>+	OFFSET(VCPU_ACC, kvm_vcpu, arch.acc);</div><div class='add'>+	OFFSET(VCPU_SPEFSCR, kvm_vcpu, arch.spefscr);</div><div class='add'>+	OFFSET(VCPU_HOST_SPEFSCR, kvm_vcpu, arch.host_spefscr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_BOOKE_HV</div><div class='del'>-	DEFINE(VCPU_HOST_MAS4, offsetof(struct kvm_vcpu, arch.host_mas4));</div><div class='del'>-	DEFINE(VCPU_HOST_MAS6, offsetof(struct kvm_vcpu, arch.host_mas6));</div><div class='add'>+	OFFSET(VCPU_HOST_MAS4, kvm_vcpu, arch.host_mas4);</div><div class='add'>+	OFFSET(VCPU_HOST_MAS6, kvm_vcpu, arch.host_mas6);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_EXIT_TIMING</div><div class='del'>-	DEFINE(VCPU_TIMING_EXIT_TBU, offsetof(struct kvm_vcpu,</div><div class='del'>-						arch.timing_exit.tv32.tbu));</div><div class='del'>-	DEFINE(VCPU_TIMING_EXIT_TBL, offsetof(struct kvm_vcpu,</div><div class='del'>-						arch.timing_exit.tv32.tbl));</div><div class='del'>-	DEFINE(VCPU_TIMING_LAST_ENTER_TBU, offsetof(struct kvm_vcpu,</div><div class='del'>-					arch.timing_last_enter.tv32.tbu));</div><div class='del'>-	DEFINE(VCPU_TIMING_LAST_ENTER_TBL, offsetof(struct kvm_vcpu,</div><div class='del'>-					arch.timing_last_enter.tv32.tbl));</div><div class='add'>+	OFFSET(VCPU_TIMING_EXIT_TBU, kvm_vcpu, arch.timing_exit.tv32.tbu);</div><div class='add'>+	OFFSET(VCPU_TIMING_EXIT_TBL, kvm_vcpu, arch.timing_exit.tv32.tbl);</div><div class='add'>+	OFFSET(VCPU_TIMING_LAST_ENTER_TBU, kvm_vcpu, arch.timing_last_enter.tv32.tbu);</div><div class='add'>+	OFFSET(VCPU_TIMING_LAST_ENTER_TBL, kvm_vcpu, arch.timing_last_enter.tv32.tbl);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_POWERNV</div><div class='del'>-	DEFINE(PACA_CORE_IDLE_STATE_PTR,</div><div class='del'>-			offsetof(struct paca_struct, core_idle_state_ptr));</div><div class='del'>-	DEFINE(PACA_THREAD_IDLE_STATE,</div><div class='del'>-			offsetof(struct paca_struct, thread_idle_state));</div><div class='del'>-	DEFINE(PACA_THREAD_MASK,</div><div class='del'>-			offsetof(struct paca_struct, thread_mask));</div><div class='del'>-	DEFINE(PACA_SUBCORE_SIBLING_MASK,</div><div class='del'>-			offsetof(struct paca_struct, subcore_sibling_mask));</div><div class='add'>+	OFFSET(PACA_CORE_IDLE_STATE_PTR, paca_struct, core_idle_state_ptr);</div><div class='add'>+	OFFSET(PACA_THREAD_IDLE_STATE, paca_struct, thread_idle_state);</div><div class='add'>+	OFFSET(PACA_THREAD_MASK, paca_struct, thread_mask);</div><div class='add'>+	OFFSET(PACA_SUBCORE_SIBLING_MASK, paca_struct, subcore_sibling_mask);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	DEFINE(PPC_DBELL_SERVER, PPC_DBELL_SERVER);</div><div class='head'>diff --git a/arch/powerpc/kernel/cpu_setup_power.S b/arch/powerpc/kernel/cpu_setup_power.S<br/>index 37c027ca83b2..7fe8c79e6937 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/cpu_setup_power.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/cpu_setup_power.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/cpu_setup_power.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/cpu_setup_power.S</a></div><div class='hunk'>@@ -96,10 +96,13 @@ _GLOBAL(__setup_cpu_power9)</div><div class='ctx'> 	mtlr	r11</div><div class='ctx'> 	beqlr</div><div class='ctx'> 	li	r0,0</div><div class='add'>+	mtspr	SPRN_PSSCR,r0</div><div class='ctx'> 	mtspr	SPRN_LPID,r0</div><div class='ctx'> 	mfspr	r3,SPRN_LPCR</div><div class='ctx'> 	LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE)</div><div class='ctx'> 	or	r3, r3, r4</div><div class='add'>+	LOAD_REG_IMMEDIATE(r4, LPCR_UPRT | LPCR_HR)</div><div class='add'>+	andc	r3, r3, r4</div><div class='ctx'> 	bl	__init_LPCR</div><div class='ctx'> 	bl	__init_HFSCR</div><div class='ctx'> 	bl	__init_tlb_power9</div><div class='hunk'>@@ -116,10 +119,13 @@ _GLOBAL(__restore_cpu_power9)</div><div class='ctx'> 	mtlr	r11</div><div class='ctx'> 	beqlr</div><div class='ctx'> 	li	r0,0</div><div class='add'>+	mtspr	SPRN_PSSCR,r0</div><div class='ctx'> 	mtspr	SPRN_LPID,r0</div><div class='ctx'> 	mfspr   r3,SPRN_LPCR</div><div class='ctx'> 	LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE)</div><div class='ctx'> 	or	r3, r3, r4</div><div class='add'>+	LOAD_REG_IMMEDIATE(r4, LPCR_UPRT | LPCR_HR)</div><div class='add'>+	andc	r3, r3, r4</div><div class='ctx'> 	bl	__init_LPCR</div><div class='ctx'> 	bl	__init_HFSCR</div><div class='ctx'> 	bl	__init_tlb_power9</div><div class='hunk'>@@ -174,7 +180,7 @@ __init_FSCR:</div><div class='ctx'> __init_HFSCR:</div><div class='ctx'> 	mfspr	r3,SPRN_HFSCR</div><div class='ctx'> 	ori	r3,r3,HFSCR_TAR|HFSCR_TM|HFSCR_BHRB|HFSCR_PM|\</div><div class='del'>-		      HFSCR_DSCR|HFSCR_VECVSX|HFSCR_FP|HFSCR_EBB</div><div class='add'>+		      HFSCR_DSCR|HFSCR_VECVSX|HFSCR_FP|HFSCR_EBB|HFSCR_MSGP</div><div class='ctx'> 	mtspr	SPRN_HFSCR,r3</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c<br/>index 6a82ef039c50..bb7a1890aeb7 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/cputable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/cputable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/cputable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/cputable.c</a></div><div class='hunk'>@@ -386,6 +386,23 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.machine_check_early	= __machine_check_early_realmode_p8,</div><div class='ctx'> 		.platform		= "power8",</div><div class='ctx'> 	},</div><div class='add'>+	{	/* 3.00-compliant processor, i.e. Power9 "architected" mode */</div><div class='add'>+		.pvr_mask		= 0xffffffff,</div><div class='add'>+		.pvr_value		= 0x0f000005,</div><div class='add'>+		.cpu_name		= "POWER9 (architected)",</div><div class='add'>+		.cpu_features		= CPU_FTRS_POWER9,</div><div class='add'>+		.cpu_user_features	= COMMON_USER_POWER9,</div><div class='add'>+		.cpu_user_features2	= COMMON_USER2_POWER9,</div><div class='add'>+		.mmu_features		= MMU_FTRS_POWER9,</div><div class='add'>+		.icache_bsize		= 128,</div><div class='add'>+		.dcache_bsize		= 128,</div><div class='add'>+		.oprofile_type		= PPC_OPROFILE_INVALID,</div><div class='add'>+		.oprofile_cpu_type	= "ppc64/ibm-compat-v1",</div><div class='add'>+		.cpu_setup		= __setup_cpu_power9,</div><div class='add'>+		.cpu_restore		= __restore_cpu_power9,</div><div class='add'>+		.flush_tlb		= __flush_tlb_power9,</div><div class='add'>+		.platform		= "power9",</div><div class='add'>+	},</div><div class='ctx'> 	{	/* Power7 */</div><div class='ctx'> 		.pvr_mask		= 0xffff0000,</div><div class='ctx'> 		.pvr_value		= 0x003f0000,</div><div class='head'>diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c<br/>index cfa0f81a5bb0..d10ad258d41a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/crash_dump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/crash_dump.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/crash_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/crash_dump.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/kdump.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='head'>diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c<br/>index c6689f658b50..d0ea7860e02b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/dma-swiotlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/dma-swiotlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/dma-swiotlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/dma-swiotlb.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@ static u64 swiotlb_powerpc_get_required(struct device *dev)</div><div class='ctx'>  * map_page, and unmap_page on highmem, use normal dma_ops</div><div class='ctx'>  * for everything else.</div><div class='ctx'>  */</div><div class='del'>-struct dma_map_ops swiotlb_dma_ops = {</div><div class='add'>+const struct dma_map_ops swiotlb_dma_ops = {</div><div class='ctx'> 	.alloc = __dma_direct_alloc_coherent,</div><div class='ctx'> 	.free = __dma_direct_free_coherent,</div><div class='ctx'> 	.mmap = dma_direct_mmap_coherent,</div><div class='head'>diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c<br/>index e64a6016fba7..41c749586bd2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/dma.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@ static u64 __maybe_unused get_pfn_limit(struct device *dev)</div><div class='ctx'> 	struct dev_archdata __maybe_unused *sd = &amp;dev-&gt;archdata;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SWIOTLB</div><div class='del'>-	if (sd-&gt;max_direct_dma_addr &amp;&amp; sd-&gt;dma_ops == &amp;swiotlb_dma_ops)</div><div class='add'>+	if (sd-&gt;max_direct_dma_addr &amp;&amp; dev-&gt;dma_ops == &amp;swiotlb_dma_ops)</div><div class='ctx'> 		pfn = min_t(u64, pfn, sd-&gt;max_direct_dma_addr &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -203,6 +203,10 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,</div><div class='ctx'> 	for_each_sg(sgl, sg, nents, i) {</div><div class='ctx'> 		sg-&gt;dma_address = sg_phys(sg) + get_dma_offset(dev);</div><div class='ctx'> 		sg-&gt;dma_length = sg-&gt;length;</div><div class='add'>+</div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		__dma_sync_page(sg_page(sg), sg-&gt;offset, sg-&gt;length, direction);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -235,7 +239,10 @@ static inline dma_addr_t dma_direct_map_page(struct device *dev,</div><div class='ctx'> 					     unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(dir == DMA_NONE);</div><div class='del'>-	__dma_sync_page(page, offset, size, dir);</div><div class='add'>+</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		__dma_sync_page(page, offset, size, dir);</div><div class='add'>+</div><div class='ctx'> 	return page_to_phys(page) + offset + get_dma_offset(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +274,7 @@ static inline void dma_direct_sync_single(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops dma_direct_ops = {</div><div class='add'>+const struct dma_map_ops dma_direct_ops = {</div><div class='ctx'> 	.alloc				= dma_direct_alloc_coherent,</div><div class='ctx'> 	.free				= dma_direct_free_coherent,</div><div class='ctx'> 	.mmap				= dma_direct_mmap_coherent,</div><div class='hunk'>@@ -309,7 +316,7 @@ EXPORT_SYMBOL(dma_set_coherent_mask);</div><div class='ctx'> </div><div class='ctx'> int __dma_set_mask(struct device *dev, u64 dma_mask)</div><div class='ctx'> {</div><div class='del'>-	struct dma_map_ops *dma_ops = get_dma_ops(dev);</div><div class='add'>+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	if ((dma_ops != NULL) &amp;&amp; (dma_ops-&gt;set_dma_mask != NULL))</div><div class='ctx'> 		return dma_ops-&gt;set_dma_mask(dev, dma_mask);</div><div class='hunk'>@@ -337,7 +344,7 @@ EXPORT_SYMBOL(dma_set_mask);</div><div class='ctx'> </div><div class='ctx'> u64 __dma_get_required_mask(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct dma_map_ops *dma_ops = get_dma_ops(dev);</div><div class='add'>+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(dma_ops == NULL))</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c<br/>index f25731627d7f..9de7f79e702b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/eeh.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/eeh.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/eeh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/eeh.c</a></div><div class='hunk'>@@ -298,9 +298,17 @@ void eeh_slot_error_detail(struct eeh_pe *pe, int severity)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * For pHyp, we have to enable IO for log retrieval. Otherwise,</div><div class='ctx'> 	 * 0xFF's is always returned from PCI config space.</div><div class='add'>+	 *</div><div class='add'>+	 * When the @severity is EEH_LOG_PERM, the PE is going to be</div><div class='add'>+	 * removed. Prior to that, the drivers for devices included in</div><div class='add'>+	 * the PE will be closed. The drivers rely on working IO path</div><div class='add'>+	 * to bring the devices to quiet state. Otherwise, PCI traffic</div><div class='add'>+	 * from those devices after they are removed is like to cause</div><div class='add'>+	 * another unexpected EEH error.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(pe-&gt;type &amp; EEH_PE_PHB)) {</div><div class='del'>-		if (eeh_has_flag(EEH_ENABLE_IO_FOR_LOG))</div><div class='add'>+		if (eeh_has_flag(EEH_ENABLE_IO_FOR_LOG) ||</div><div class='add'>+		    severity == EEH_LOG_PERM)</div><div class='ctx'> 			eeh_pci_enable(pe, EEH_OPT_THAW_MMIO);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -372,7 +380,7 @@ static int eeh_phb_check_failure(struct eeh_pe *pe)</div><div class='ctx'> 	/* Find the PHB PE */</div><div class='ctx'> 	phb_pe = eeh_phb_pe_get(pe-&gt;phb);</div><div class='ctx'> 	if (!phb_pe) {</div><div class='del'>-		pr_warn("%s Can't find PE for PHB#%d\n",</div><div class='add'>+		pr_warn("%s Can't find PE for PHB#%x\n",</div><div class='ctx'> 			__func__, pe-&gt;phb-&gt;global_number);</div><div class='ctx'> 		return -EEXIST;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -664,7 +672,7 @@ int eeh_pci_enable(struct eeh_pe *pe, int function)</div><div class='ctx'> 	rc = eeh_ops-&gt;set_option(pe, function);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		pr_warn("%s: Unexpected state change %d on "</div><div class='del'>-			"PHB#%d-PE#%x, err=%d\n",</div><div class='add'>+			"PHB#%x-PE#%x, err=%d\n",</div><div class='ctx'> 			__func__, function, pe-&gt;phb-&gt;global_number,</div><div class='ctx'> 			pe-&gt;addr, rc);</div><div class='ctx'> </div><div class='hunk'>@@ -808,76 +816,67 @@ static void *eeh_set_dev_freset(void *data, void *flag)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * eeh_reset_pe_once - Assert the pci #RST line for 1/4 second</div><div class='add'>+ * eeh_pe_reset_full - Complete a full reset process on the indicated PE</div><div class='ctx'>  * @pe: EEH PE</div><div class='ctx'>  *</div><div class='del'>- * Assert the PCI #RST line for 1/4 second.</div><div class='add'>+ * This function executes a full reset procedure on a PE, including setting</div><div class='add'>+ * the appropriate flags, performing a fundamental or hot reset, and then</div><div class='add'>+ * deactivating the reset status.  It is designed to be used within the EEH</div><div class='add'>+ * subsystem, as opposed to eeh_pe_reset which is exported to drivers and</div><div class='add'>+ * only performs a single operation at a time.</div><div class='add'>+ *</div><div class='add'>+ * This function will attempt to reset a PE three times before failing.</div><div class='ctx'>  */</div><div class='del'>-static void eeh_reset_pe_once(struct eeh_pe *pe)</div><div class='add'>+int eeh_pe_reset_full(struct eeh_pe *pe)</div><div class='ctx'> {</div><div class='add'>+	int active_flags = (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE);</div><div class='add'>+	int reset_state = (EEH_PE_RESET | EEH_PE_CFG_BLOCKED);</div><div class='add'>+	int type = EEH_RESET_HOT;</div><div class='ctx'> 	unsigned int freset = 0;</div><div class='add'>+	int i, state, ret;</div><div class='ctx'> </div><div class='del'>-	/* Determine type of EEH reset required for</div><div class='del'>-	 * Partitionable Endpoint, a hot-reset (1)</div><div class='del'>-	 * or a fundamental reset (3).</div><div class='del'>-	 * A fundamental reset required by any device under</div><div class='del'>-	 * Partitionable Endpoint trumps hot-reset.</div><div class='add'>+	/*</div><div class='add'>+	 * Determine the type of reset to perform - hot or fundamental.</div><div class='add'>+	 * Hot reset is the default operation, unless any device under the</div><div class='add'>+	 * PE requires a fundamental reset.</div><div class='ctx'> 	 */</div><div class='ctx'> 	eeh_pe_dev_traverse(pe, eeh_set_dev_freset, &amp;freset);</div><div class='ctx'> </div><div class='ctx'> 	if (freset)</div><div class='del'>-		eeh_ops-&gt;reset(pe, EEH_RESET_FUNDAMENTAL);</div><div class='del'>-	else</div><div class='del'>-		eeh_ops-&gt;reset(pe, EEH_RESET_HOT);</div><div class='add'>+		type = EEH_RESET_FUNDAMENTAL;</div><div class='ctx'> </div><div class='del'>-	eeh_ops-&gt;reset(pe, EEH_RESET_DEACTIVATE);</div><div class='del'>-}</div><div class='add'>+	/* Mark the PE as in reset state and block config space accesses */</div><div class='add'>+	eeh_pe_state_mark(pe, reset_state);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * eeh_reset_pe - Reset the indicated PE</div><div class='del'>- * @pe: EEH PE</div><div class='del'>- *</div><div class='del'>- * This routine should be called to reset indicated device, including</div><div class='del'>- * PE. A PE might include multiple PCI devices and sometimes PCI bridges</div><div class='del'>- * might be involved as well.</div><div class='del'>- */</div><div class='del'>-int eeh_reset_pe(struct eeh_pe *pe)</div><div class='del'>-{</div><div class='del'>-	int flags = (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE);</div><div class='del'>-	int i, state, ret;</div><div class='del'>-</div><div class='del'>-	/* Mark as reset and block config space */</div><div class='del'>-	eeh_pe_state_mark(pe, EEH_PE_RESET | EEH_PE_CFG_BLOCKED);</div><div class='del'>-</div><div class='del'>-	/* Take three shots at resetting the bus */</div><div class='add'>+	/* Make three attempts at resetting the bus */</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		eeh_reset_pe_once(pe);</div><div class='add'>+		ret = eeh_pe_reset(pe, type);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * EEH_PE_ISOLATED is expected to be removed after</div><div class='del'>-		 * BAR restore.</div><div class='del'>-		 */</div><div class='add'>+		ret = eeh_pe_reset(pe, EEH_RESET_DEACTIVATE);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Wait until the PE is in a functioning state */</div><div class='ctx'> 		state = eeh_ops-&gt;wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);</div><div class='del'>-		if ((state &amp; flags) == flags) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if ((state &amp; active_flags) == active_flags)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		if (state &lt; 0) {</div><div class='del'>-			pr_warn("%s: Unrecoverable slot failure on PHB#%d-PE#%x",</div><div class='add'>+			pr_warn("%s: Unrecoverable slot failure on PHB#%x-PE#%x",</div><div class='ctx'> 				__func__, pe-&gt;phb-&gt;global_number, pe-&gt;addr);</div><div class='ctx'> 			ret = -ENOTRECOVERABLE;</div><div class='del'>-			goto out;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* We might run out of credits */</div><div class='add'>+		/* Set error in case this is our last attempt */</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		pr_warn("%s: Failure %d resetting PHB#%x-PE#%x\n (%d)\n",</div><div class='ctx'> 			__func__, state, pe-&gt;phb-&gt;global_number, pe-&gt;addr, (i + 1));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	eeh_pe_state_clear(pe, EEH_PE_RESET | EEH_PE_CFG_BLOCKED);</div><div class='add'>+	eeh_pe_state_clear(pe, reset_state);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1601,6 +1600,7 @@ static int eeh_pe_reenable_devices(struct eeh_pe *pe)</div><div class='ctx'> 	return eeh_unfreeze_pe(pe, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * eeh_pe_reset - Issue PE reset according to specified type</div><div class='ctx'>  * @pe: EEH PE</div><div class='head'>diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c<br/>index 5c31369435f2..b94887165a10 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/eeh_driver.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/eeh_driver.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/eeh_driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/eeh_driver.c</a></div><div class='hunk'>@@ -545,7 +545,7 @@ static void *eeh_pe_detach_dev(void *data, void *userdata)</div><div class='ctx'> static void *__eeh_clear_pe_frozen_state(void *data, void *flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct eeh_pe *pe = (struct eeh_pe *)data;</div><div class='del'>-	bool *clear_sw_state = flag;</div><div class='add'>+	bool clear_sw_state = *(bool *)flag;</div><div class='ctx'> 	int i, rc = 1;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; rc &amp;&amp; i &lt; 3; i++)</div><div class='hunk'>@@ -588,7 +588,7 @@ int eeh_pe_reset_and_recover(struct eeh_pe *pe)</div><div class='ctx'> 	eeh_pe_dev_traverse(pe, eeh_dev_save_state, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Issue reset */</div><div class='del'>-	ret = eeh_reset_pe(pe);</div><div class='add'>+	ret = eeh_pe_reset_full(pe);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		eeh_pe_state_clear(pe, EEH_PE_RECOVERING);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -659,7 +659,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,</div><div class='ctx'> 	 * config accesses. So we prefer to block them. However, controlled</div><div class='ctx'> 	 * PCI config accesses initiated from EEH itself are allowed.</div><div class='ctx'> 	 */</div><div class='del'>-	rc = eeh_reset_pe(pe);</div><div class='add'>+	rc = eeh_pe_reset_full(pe);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -734,7 +734,7 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)</div><div class='ctx'> </div><div class='ctx'> 	frozen_bus = eeh_pe_bus_get(pe);</div><div class='ctx'> 	if (!frozen_bus) {</div><div class='del'>-		pr_err("%s: Cannot find PCI bus for PHB#%d-PE#%x\n",</div><div class='add'>+		pr_err("%s: Cannot find PCI bus for PHB#%x-PE#%x\n",</div><div class='ctx'> 			__func__, pe-&gt;phb-&gt;global_number, pe-&gt;addr);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -878,7 +878,7 @@ excess_failures:</div><div class='ctx'> 	 * are due to poorly seated PCI cards. Only 10% or so are</div><div class='ctx'> 	 * due to actual, failed cards.</div><div class='ctx'> 	 */</div><div class='del'>-	pr_err("EEH: PHB#%d-PE#%x has failed %d times in the\n"</div><div class='add'>+	pr_err("EEH: PHB#%x-PE#%x has failed %d times in the\n"</div><div class='ctx'> 	       "last hour and has been permanently disabled.\n"</div><div class='ctx'> 	       "Please try reseating or replacing it.\n",</div><div class='ctx'> 		pe-&gt;phb-&gt;global_number, pe-&gt;addr,</div><div class='hunk'>@@ -886,7 +886,7 @@ excess_failures:</div><div class='ctx'> 	goto perm_error;</div><div class='ctx'> </div><div class='ctx'> hard_fail:</div><div class='del'>-	pr_err("EEH: Unable to recover from failure from PHB#%d-PE#%x.\n"</div><div class='add'>+	pr_err("EEH: Unable to recover from failure from PHB#%x-PE#%x.\n"</div><div class='ctx'> 	       "Please try reseating or replacing it\n",</div><div class='ctx'> 		pe-&gt;phb-&gt;global_number, pe-&gt;addr);</div><div class='ctx'> </div><div class='hunk'>@@ -1000,7 +1000,7 @@ static void eeh_handle_special_event(void)</div><div class='ctx'> 				bus = eeh_pe_bus_get(phb_pe);</div><div class='ctx'> 				if (!bus) {</div><div class='ctx'> 					pr_err("%s: Cannot find PCI bus for "</div><div class='del'>-					       "PHB#%d-PE#%x\n",</div><div class='add'>+					       "PHB#%x-PE#%x\n",</div><div class='ctx'> 					       __func__,</div><div class='ctx'> 					       pe-&gt;phb-&gt;global_number,</div><div class='ctx'> 					       pe-&gt;addr);</div><div class='head'>diff --git a/arch/powerpc/kernel/eeh_event.c b/arch/powerpc/kernel/eeh_event.c<br/>index 82e7327e3cd0..accbf8b5fd46 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/eeh_event.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/eeh_event.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/eeh_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/eeh_event.c</a></div><div class='hunk'>@@ -75,11 +75,11 @@ static int eeh_event_handler(void * dummy)</div><div class='ctx'> 		if (pe) {</div><div class='ctx'> 			eeh_pe_state_mark(pe, EEH_PE_RECOVERING);</div><div class='ctx'> 			if (pe-&gt;type &amp; EEH_PE_PHB)</div><div class='del'>-				pr_info("EEH: Detected error on PHB#%d\n",</div><div class='add'>+				pr_info("EEH: Detected error on PHB#%x\n",</div><div class='ctx'> 					 pe-&gt;phb-&gt;global_number);</div><div class='ctx'> 			else</div><div class='ctx'> 				pr_info("EEH: Detected PCI bus error on "</div><div class='del'>-					"PHB#%d-PE#%x\n",</div><div class='add'>+					"PHB#%x-PE#%x\n",</div><div class='ctx'> 					pe-&gt;phb-&gt;global_number, pe-&gt;addr);</div><div class='ctx'> 			eeh_handle_event(pe);</div><div class='ctx'> 			eeh_pe_state_clear(pe, EEH_PE_RECOVERING);</div><div class='head'>diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c<br/>index de7d091c4c31..cc4b206f77e4 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/eeh_pe.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/eeh_pe.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/eeh_pe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/eeh_pe.c</a></div><div class='hunk'>@@ -104,7 +104,7 @@ int eeh_phb_pe_create(struct pci_controller *phb)</div><div class='ctx'> 	/* Put it into the list */</div><div class='ctx'> 	list_add_tail(&amp;pe-&gt;child, &amp;eeh_phb_pe);</div><div class='ctx'> </div><div class='del'>-	pr_debug("EEH: Add PE for PHB#%d\n", phb-&gt;global_number);</div><div class='add'>+	pr_debug("EEH: Add PE for PHB#%x\n", phb-&gt;global_number);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -333,7 +333,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev)</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the PE number is valid */</div><div class='ctx'> 	if (!eeh_has_flag(EEH_VALID_PE_ZERO) &amp;&amp; !edev-&gt;pe_config_addr) {</div><div class='del'>-		pr_err("%s: Invalid PE#0 for edev 0x%x on PHB#%d\n",</div><div class='add'>+		pr_err("%s: Invalid PE#0 for edev 0x%x on PHB#%x\n",</div><div class='ctx'> 		       __func__, edev-&gt;config_addr, edev-&gt;phb-&gt;global_number);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S<br/>index 3841d749a430..a38600949f3a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/entry_32.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/entry_32.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/entry_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/entry_32.S</a></div><div class='hunk'>@@ -205,6 +205,9 @@ transfer_to_handler_cont:</div><div class='ctx'> 	mflr	r9</div><div class='ctx'> 	lwz	r11,0(r9)		/* virtual address of handler */</div><div class='ctx'> 	lwz	r9,4(r9)		/* where to go when done */</div><div class='add'>+#ifdef CONFIG_PPC_8xx_PERF_EVENT</div><div class='add'>+	mtspr	SPRN_NRI, r0</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_TRACE_IRQFLAGS</div><div class='ctx'> 	lis	r12,reenable_mmu@h</div><div class='ctx'> 	ori	r12,r12,reenable_mmu@l</div><div class='hunk'>@@ -292,7 +295,9 @@ stack_ovf:</div><div class='ctx'> 	lis	r9,StackOverflow@ha</div><div class='ctx'> 	addi	r9,r9,StackOverflow@l</div><div class='ctx'> 	LOAD_MSR_KERNEL(r10,MSR_KERNEL)</div><div class='del'>-	FIX_SRR1(r10,r12)</div><div class='add'>+#ifdef CONFIG_PPC_8xx_PERF_EVENT</div><div class='add'>+	mtspr	SPRN_NRI, r0</div><div class='add'>+#endif</div><div class='ctx'> 	mtspr	SPRN_SRR0,r9</div><div class='ctx'> 	mtspr	SPRN_SRR1,r10</div><div class='ctx'> 	SYNC</div><div class='hunk'>@@ -417,9 +422,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)</div><div class='ctx'> 	mtlr	r4</div><div class='ctx'> 	mtcr	r5</div><div class='ctx'> 	lwz	r7,_NIP(r1)</div><div class='del'>-	FIX_SRR1(r8, r0)</div><div class='ctx'> 	lwz	r2,GPR2(r1)</div><div class='ctx'> 	lwz	r1,GPR1(r1)</div><div class='add'>+#ifdef CONFIG_PPC_8xx_PERF_EVENT</div><div class='add'>+	mtspr	SPRN_NRI, r0</div><div class='add'>+#endif</div><div class='ctx'> 	mtspr	SPRN_SRR0,r7</div><div class='ctx'> 	mtspr	SPRN_SRR1,r8</div><div class='ctx'> 	SYNC</div><div class='hunk'>@@ -699,6 +706,9 @@ fast_exception_return:</div><div class='ctx'> 	lwz	r10,_LINK(r11)</div><div class='ctx'> 	mtlr	r10</div><div class='ctx'> 	REST_GPR(10, r11)</div><div class='add'>+#ifdef CONFIG_PPC_8xx_PERF_EVENT</div><div class='add'>+	mtspr	SPRN_NRI, r0</div><div class='add'>+#endif</div><div class='ctx'> 	mtspr	SPRN_SRR1,r9</div><div class='ctx'> 	mtspr	SPRN_SRR0,r12</div><div class='ctx'> 	REST_GPR(9, r11)</div><div class='hunk'>@@ -947,7 +957,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)</div><div class='ctx'> 	.globl exc_exit_restart</div><div class='ctx'> exc_exit_restart:</div><div class='ctx'> 	lwz	r12,_NIP(r1)</div><div class='del'>-	FIX_SRR1(r9,r10)</div><div class='add'>+#ifdef CONFIG_PPC_8xx_PERF_EVENT</div><div class='add'>+	mtspr	SPRN_NRI, r0</div><div class='add'>+#endif</div><div class='ctx'> 	mtspr	SPRN_SRR0,r12</div><div class='ctx'> 	mtspr	SPRN_SRR1,r9</div><div class='ctx'> 	REST_4GPRS(9, r1)</div><div class='hunk'>@@ -1290,7 +1302,6 @@ _GLOBAL(enter_rtas)</div><div class='ctx'> 1:	tophys(r9,r1)</div><div class='ctx'> 	lwz	r8,INT_FRAME_SIZE+4(r9)	/* get return address */</div><div class='ctx'> 	lwz	r9,8(r9)	/* original msr value */</div><div class='del'>-	FIX_SRR1(r9,r0)</div><div class='ctx'> 	addi	r1,r1,INT_FRAME_SIZE</div><div class='ctx'> 	li	r0,0</div><div class='ctx'> 	mtspr	SPRN_SPRG_RTAS,r0</div><div class='head'>diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S<br/>index 38a1f96430e1..45b453e4d0c8 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/exceptions-64e.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/exceptions-64e.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/exceptions-64e.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/exceptions-64e.S</a></div><div class='hunk'>@@ -923,10 +923,10 @@ kernel_dbg_exc:</div><div class='ctx'> 			        PROLOG_ADDITION_NONE)</div><div class='ctx'> 	EXCEPTION_COMMON(0x340)</div><div class='ctx'> 	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='del'>-	bl	.save_nvgprs</div><div class='add'>+	bl	save_nvgprs</div><div class='ctx'> 	INTS_RESTORE_HARD</div><div class='del'>-	bl	.unknown_exception</div><div class='del'>-	b	.ret_from_except</div><div class='add'>+	bl	unknown_exception</div><div class='add'>+	b	ret_from_except</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * An interrupt came in while soft-disabled; We mark paca-&gt;irq_happened</div><div class='head'>diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S<br/>index 1ba82ea90230..857bf7c5b946 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/exceptions-64s.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/exceptions-64s.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/exceptions-64s.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/exceptions-64s.S</a></div><div class='hunk'>@@ -93,7 +93,7 @@ USE_FIXED_SECTION(real_vectors)</div><div class='ctx'> __start_interrupts:</div><div class='ctx'> </div><div class='ctx'> /* No virt vectors corresponding with 0x0..0x100 */</div><div class='del'>-EXC_VIRT_NONE(0x4000, 0x4100)</div><div class='add'>+EXC_VIRT_NONE(0x4000, 0x100)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_P7_NAP</div><div class='hunk'>@@ -114,15 +114,15 @@ EXC_VIRT_NONE(0x4000, 0x4100)</div><div class='ctx'> #define IDLETEST NOTEST</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-EXC_REAL_BEGIN(system_reset, 0x100, 0x200)</div><div class='add'>+EXC_REAL_BEGIN(system_reset, 0x100, 0x100)</div><div class='ctx'> 	SET_SCRATCH0(r13)</div><div class='ctx'> 	GET_PACA(r13)</div><div class='ctx'> 	clrrdi	r13,r13,1 /* Last bit of HSPRG0 is set if waking from winkle */</div><div class='ctx'> 	EXCEPTION_PROLOG_PSERIES_PACA(PACA_EXGEN, system_reset_common, EXC_STD,</div><div class='ctx'> 				 IDLETEST, 0x100)</div><div class='ctx'> </div><div class='del'>-EXC_REAL_END(system_reset, 0x100, 0x200)</div><div class='del'>-EXC_VIRT_NONE(0x4100, 0x4200)</div><div class='add'>+EXC_REAL_END(system_reset, 0x100, 0x100)</div><div class='add'>+EXC_VIRT_NONE(0x4100, 0x100)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_P7_NAP</div><div class='ctx'> EXC_COMMON_BEGIN(system_reset_idle_common)</div><div class='hunk'>@@ -142,7 +142,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300)</div><div class='ctx'> 	lbz	r0,HSTATE_HWTHREAD_REQ(r13)</div><div class='ctx'> 	cmpwi	r0,0</div><div class='ctx'> 	beq	1f</div><div class='del'>-	b	kvm_start_guest</div><div class='add'>+	BRANCH_TO_KVM(r10, kvm_start_guest)</div><div class='ctx'> 1:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -166,7 +166,7 @@ TRAMP_REAL_BEGIN(system_reset_fwnmi)</div><div class='ctx'> #endif /* CONFIG_PPC_PSERIES */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_BEGIN(machine_check, 0x200, 0x300)</div><div class='add'>+EXC_REAL_BEGIN(machine_check, 0x200, 0x100)</div><div class='ctx'> 	/* This is moved out of line as it can be patched by FW, but</div><div class='ctx'> 	 * some code path might still want to branch into the original</div><div class='ctx'> 	 * vector</div><div class='hunk'>@@ -186,8 +186,8 @@ BEGIN_FTR_SECTION</div><div class='ctx'> FTR_SECTION_ELSE</div><div class='ctx'> 	b	machine_check_pSeries_0</div><div class='ctx'> ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE)</div><div class='del'>-EXC_REAL_END(machine_check, 0x200, 0x300)</div><div class='del'>-EXC_VIRT_NONE(0x4200, 0x4300)</div><div class='add'>+EXC_REAL_END(machine_check, 0x200, 0x100)</div><div class='add'>+EXC_VIRT_NONE(0x4200, 0x100)</div><div class='ctx'> TRAMP_REAL_BEGIN(machine_check_powernv_early)</div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='ctx'> 	EXCEPTION_PROLOG_1(PACA_EXMC, NOTEST, 0x200)</div><div class='hunk'>@@ -381,12 +381,12 @@ EXC_COMMON_BEGIN(machine_check_handle_early)</div><div class='ctx'> 	lbz	r3,PACA_THREAD_IDLE_STATE(r13)</div><div class='ctx'> 	cmpwi	r3,PNV_THREAD_NAP</div><div class='ctx'> 	bgt	10f</div><div class='del'>-	IDLE_STATE_ENTER_SEQ(PPC_NAP)</div><div class='add'>+	IDLE_STATE_ENTER_SEQ_NORET(PPC_NAP)</div><div class='ctx'> 	/* No return */</div><div class='ctx'> 10:</div><div class='ctx'> 	cmpwi	r3,PNV_THREAD_SLEEP</div><div class='ctx'> 	bgt	2f</div><div class='del'>-	IDLE_STATE_ENTER_SEQ(PPC_SLEEP)</div><div class='add'>+	IDLE_STATE_ENTER_SEQ_NORET(PPC_SLEEP)</div><div class='ctx'> 	/* No return */</div><div class='ctx'> </div><div class='ctx'> 2:</div><div class='hunk'>@@ -400,7 +400,7 @@ EXC_COMMON_BEGIN(machine_check_handle_early)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ori	r13,r13,1</div><div class='ctx'> 	SET_PACA(r13)</div><div class='del'>-	IDLE_STATE_ENTER_SEQ(PPC_WINKLE)</div><div class='add'>+	IDLE_STATE_ENTER_SEQ_NORET(PPC_WINKLE)</div><div class='ctx'> 	/* No return */</div><div class='ctx'> 4:</div><div class='ctx'> #endif</div><div class='hunk'>@@ -483,8 +483,8 @@ EXC_COMMON_BEGIN(unrecover_mce)</div><div class='ctx'> 	b	1b</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL(data_access, 0x300, 0x380)</div><div class='del'>-EXC_VIRT(data_access, 0x4300, 0x4380, 0x300)</div><div class='add'>+EXC_REAL(data_access, 0x300, 0x80)</div><div class='add'>+EXC_VIRT(data_access, 0x4300, 0x80, 0x300)</div><div class='ctx'> TRAMP_KVM_SKIP(PACA_EXGEN, 0x300)</div><div class='ctx'> </div><div class='ctx'> EXC_COMMON_BEGIN(data_access_common)</div><div class='hunk'>@@ -512,7 +512,7 @@ MMU_FTR_SECTION_ELSE</div><div class='ctx'> ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_BEGIN(data_access_slb, 0x380, 0x400)</div><div class='add'>+EXC_REAL_BEGIN(data_access_slb, 0x380, 0x80)</div><div class='ctx'> 	SET_SCRATCH0(r13)</div><div class='ctx'> 	EXCEPTION_PROLOG_0(PACA_EXSLB)</div><div class='ctx'> 	EXCEPTION_PROLOG_1(PACA_EXSLB, KVMTEST_PR, 0x380)</div><div class='hunk'>@@ -533,9 +533,9 @@ EXC_REAL_BEGIN(data_access_slb, 0x380, 0x400)</div><div class='ctx'> 	mtctr	r10</div><div class='ctx'> 	bctr</div><div class='ctx'> #endif</div><div class='del'>-EXC_REAL_END(data_access_slb, 0x380, 0x400)</div><div class='add'>+EXC_REAL_END(data_access_slb, 0x380, 0x80)</div><div class='ctx'> </div><div class='del'>-EXC_VIRT_BEGIN(data_access_slb, 0x4380, 0x4400)</div><div class='add'>+EXC_VIRT_BEGIN(data_access_slb, 0x4380, 0x80)</div><div class='ctx'> 	SET_SCRATCH0(r13)</div><div class='ctx'> 	EXCEPTION_PROLOG_0(PACA_EXSLB)</div><div class='ctx'> 	EXCEPTION_PROLOG_1(PACA_EXSLB, NOTEST, 0x380)</div><div class='hunk'>@@ -556,12 +556,12 @@ EXC_VIRT_BEGIN(data_access_slb, 0x4380, 0x4400)</div><div class='ctx'> 	mtctr	r10</div><div class='ctx'> 	bctr</div><div class='ctx'> #endif</div><div class='del'>-EXC_VIRT_END(data_access_slb, 0x4380, 0x4400)</div><div class='add'>+EXC_VIRT_END(data_access_slb, 0x4380, 0x80)</div><div class='ctx'> TRAMP_KVM_SKIP(PACA_EXSLB, 0x380)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL(instruction_access, 0x400, 0x480)</div><div class='del'>-EXC_VIRT(instruction_access, 0x4400, 0x4480, 0x400)</div><div class='add'>+EXC_REAL(instruction_access, 0x400, 0x80)</div><div class='add'>+EXC_VIRT(instruction_access, 0x4400, 0x80, 0x400)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0x400)</div><div class='ctx'> </div><div class='ctx'> EXC_COMMON_BEGIN(instruction_access_common)</div><div class='hunk'>@@ -580,7 +580,7 @@ MMU_FTR_SECTION_ELSE</div><div class='ctx'> ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_BEGIN(instruction_access_slb, 0x480, 0x500)</div><div class='add'>+EXC_REAL_BEGIN(instruction_access_slb, 0x480, 0x80)</div><div class='ctx'> 	SET_SCRATCH0(r13)</div><div class='ctx'> 	EXCEPTION_PROLOG_0(PACA_EXSLB)</div><div class='ctx'> 	EXCEPTION_PROLOG_1(PACA_EXSLB, KVMTEST_PR, 0x480)</div><div class='hunk'>@@ -596,9 +596,9 @@ EXC_REAL_BEGIN(instruction_access_slb, 0x480, 0x500)</div><div class='ctx'> 	mtctr	r10</div><div class='ctx'> 	bctr</div><div class='ctx'> #endif</div><div class='del'>-EXC_REAL_END(instruction_access_slb, 0x480, 0x500)</div><div class='add'>+EXC_REAL_END(instruction_access_slb, 0x480, 0x80)</div><div class='ctx'> </div><div class='del'>-EXC_VIRT_BEGIN(instruction_access_slb, 0x4480, 0x4500)</div><div class='add'>+EXC_VIRT_BEGIN(instruction_access_slb, 0x4480, 0x80)</div><div class='ctx'> 	SET_SCRATCH0(r13)</div><div class='ctx'> 	EXCEPTION_PROLOG_0(PACA_EXSLB)</div><div class='ctx'> 	EXCEPTION_PROLOG_1(PACA_EXSLB, NOTEST, 0x480)</div><div class='hunk'>@@ -614,7 +614,7 @@ EXC_VIRT_BEGIN(instruction_access_slb, 0x4480, 0x4500)</div><div class='ctx'> 	mtctr	r10</div><div class='ctx'> 	bctr</div><div class='ctx'> #endif</div><div class='del'>-EXC_VIRT_END(instruction_access_slb, 0x4480, 0x4500)</div><div class='add'>+EXC_VIRT_END(instruction_access_slb, 0x4480, 0x80)</div><div class='ctx'> TRAMP_KVM(PACA_EXSLB, 0x480)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -711,23 +711,19 @@ EXC_COMMON_BEGIN(bad_addr_slb)</div><div class='ctx'> 	bl	slb_miss_bad_addr</div><div class='ctx'> 	b	ret_from_except</div><div class='ctx'> </div><div class='del'>-EXC_REAL_BEGIN(hardware_interrupt, 0x500, 0x600)</div><div class='add'>+EXC_REAL_BEGIN(hardware_interrupt, 0x500, 0x100)</div><div class='ctx'> 	.globl hardware_interrupt_hv;</div><div class='ctx'> hardware_interrupt_hv:</div><div class='ctx'> 	BEGIN_FTR_SECTION</div><div class='ctx'> 		_MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt_common,</div><div class='ctx'> 					    EXC_HV, SOFTEN_TEST_HV)</div><div class='del'>-do_kvm_H0x500:</div><div class='del'>-		KVM_HANDLER(PACA_EXGEN, EXC_HV, 0x502)</div><div class='ctx'> 	FTR_SECTION_ELSE</div><div class='ctx'> 		_MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt_common,</div><div class='ctx'> 					    EXC_STD, SOFTEN_TEST_PR)</div><div class='del'>-do_kvm_0x500:</div><div class='del'>-		KVM_HANDLER(PACA_EXGEN, EXC_STD, 0x500)</div><div class='ctx'> 	ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)</div><div class='del'>-EXC_REAL_END(hardware_interrupt, 0x500, 0x600)</div><div class='add'>+EXC_REAL_END(hardware_interrupt, 0x500, 0x100)</div><div class='ctx'> </div><div class='del'>-EXC_VIRT_BEGIN(hardware_interrupt, 0x4500, 0x4600)</div><div class='add'>+EXC_VIRT_BEGIN(hardware_interrupt, 0x4500, 0x100)</div><div class='ctx'> 	.globl hardware_interrupt_relon_hv;</div><div class='ctx'> hardware_interrupt_relon_hv:</div><div class='ctx'> 	BEGIN_FTR_SECTION</div><div class='hunk'>@@ -735,13 +731,15 @@ hardware_interrupt_relon_hv:</div><div class='ctx'> 	FTR_SECTION_ELSE</div><div class='ctx'> 		_MASKABLE_RELON_EXCEPTION_PSERIES(0x500, hardware_interrupt_common, EXC_STD, SOFTEN_TEST_PR)</div><div class='ctx'> 	ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE)</div><div class='del'>-EXC_VIRT_END(hardware_interrupt, 0x4500, 0x4600)</div><div class='add'>+EXC_VIRT_END(hardware_interrupt, 0x4500, 0x100)</div><div class='ctx'> </div><div class='add'>+TRAMP_KVM(PACA_EXGEN, 0x500)</div><div class='add'>+TRAMP_KVM_HV(PACA_EXGEN, 0x500)</div><div class='ctx'> EXC_COMMON_ASYNC(hardware_interrupt_common, 0x500, do_IRQ)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL(alignment, 0x600, 0x700)</div><div class='del'>-EXC_VIRT(alignment, 0x4600, 0x4700, 0x600)</div><div class='add'>+EXC_REAL(alignment, 0x600, 0x100)</div><div class='add'>+EXC_VIRT(alignment, 0x4600, 0x100, 0x600)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0x600)</div><div class='ctx'> EXC_COMMON_BEGIN(alignment_common)</div><div class='ctx'> 	mfspr	r10,SPRN_DAR</div><div class='hunk'>@@ -760,8 +758,8 @@ EXC_COMMON_BEGIN(alignment_common)</div><div class='ctx'> 	b	ret_from_except</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL(program_check, 0x700, 0x800)</div><div class='del'>-EXC_VIRT(program_check, 0x4700, 0x4800, 0x700)</div><div class='add'>+EXC_REAL(program_check, 0x700, 0x100)</div><div class='add'>+EXC_VIRT(program_check, 0x4700, 0x100, 0x700)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0x700)</div><div class='ctx'> EXC_COMMON_BEGIN(program_check_common)</div><div class='ctx'> 	EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN)</div><div class='hunk'>@@ -772,8 +770,8 @@ EXC_COMMON_BEGIN(program_check_common)</div><div class='ctx'> 	b	ret_from_except</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL(fp_unavailable, 0x800, 0x900)</div><div class='del'>-EXC_VIRT(fp_unavailable, 0x4800, 0x4900, 0x800)</div><div class='add'>+EXC_REAL(fp_unavailable, 0x800, 0x100)</div><div class='add'>+EXC_VIRT(fp_unavailable, 0x4800, 0x100, 0x800)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0x800)</div><div class='ctx'> EXC_COMMON_BEGIN(fp_unavailable_common)</div><div class='ctx'> 	EXCEPTION_PROLOG_COMMON(0x800, PACA_EXGEN)</div><div class='hunk'>@@ -805,20 +803,20 @@ END_FTR_SECTION_IFSET(CPU_FTR_TM)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_MASKABLE(decrementer, 0x900, 0x980)</div><div class='del'>-EXC_VIRT_MASKABLE(decrementer, 0x4900, 0x4980, 0x900)</div><div class='add'>+EXC_REAL_MASKABLE(decrementer, 0x900, 0x80)</div><div class='add'>+EXC_VIRT_MASKABLE(decrementer, 0x4900, 0x80, 0x900)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0x900)</div><div class='ctx'> EXC_COMMON_ASYNC(decrementer_common, 0x900, timer_interrupt)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_HV(hdecrementer, 0x980, 0xa00)</div><div class='del'>-EXC_VIRT_HV(hdecrementer, 0x4980, 0x4a00, 0x980)</div><div class='add'>+EXC_REAL_HV(hdecrementer, 0x980, 0x80)</div><div class='add'>+EXC_VIRT_HV(hdecrementer, 0x4980, 0x80, 0x980)</div><div class='ctx'> TRAMP_KVM_HV(PACA_EXGEN, 0x980)</div><div class='ctx'> EXC_COMMON(hdecrementer_common, 0x980, hdec_interrupt)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_MASKABLE(doorbell_super, 0xa00, 0xb00)</div><div class='del'>-EXC_VIRT_MASKABLE(doorbell_super, 0x4a00, 0x4b00, 0xa00)</div><div class='add'>+EXC_REAL_MASKABLE(doorbell_super, 0xa00, 0x100)</div><div class='add'>+EXC_VIRT_MASKABLE(doorbell_super, 0x4a00, 0x100, 0xa00)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0xa00)</div><div class='ctx'> #ifdef CONFIG_PPC_DOORBELL</div><div class='ctx'> EXC_COMMON_ASYNC(doorbell_super_common, 0xa00, doorbell_exception)</div><div class='hunk'>@@ -827,11 +825,36 @@ EXC_COMMON_ASYNC(doorbell_super_common, 0xa00, unknown_exception)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL(trap_0b, 0xb00, 0xc00)</div><div class='del'>-EXC_VIRT(trap_0b, 0x4b00, 0x4c00, 0xb00)</div><div class='add'>+EXC_REAL(trap_0b, 0xb00, 0x100)</div><div class='add'>+EXC_VIRT(trap_0b, 0x4b00, 0x100, 0xb00)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0xb00)</div><div class='ctx'> EXC_COMMON(trap_0b_common, 0xb00, unknown_exception)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KVM_BOOK3S_64_HANDLER</div><div class='add'>+	 /*</div><div class='add'>+	  * If CONFIG_KVM_BOOK3S_64_HANDLER is set, save the PPR (on systems</div><div class='add'>+	  * that support it) before changing to HMT_MEDIUM. That allows the KVM</div><div class='add'>+	  * code to save that value into the guest state (it is the guest's PPR</div><div class='add'>+	  * value). Otherwise just change to HMT_MEDIUM as userspace has</div><div class='add'>+	  * already saved the PPR.</div><div class='add'>+	  */</div><div class='add'>+#define SYSCALL_KVMTEST							\</div><div class='add'>+	SET_SCRATCH0(r13);						\</div><div class='add'>+	GET_PACA(r13);							\</div><div class='add'>+	std	r9,PACA_EXGEN+EX_R9(r13);				\</div><div class='add'>+	OPT_GET_SPR(r9, SPRN_PPR, CPU_FTR_HAS_PPR);			\</div><div class='add'>+	HMT_MEDIUM;							\</div><div class='add'>+	std	r10,PACA_EXGEN+EX_R10(r13);				\</div><div class='add'>+	OPT_SAVE_REG_TO_PACA(PACA_EXGEN+EX_PPR, r9, CPU_FTR_HAS_PPR);	\</div><div class='add'>+	mfcr	r9;							\</div><div class='add'>+	KVMTEST_PR(0xc00);						\</div><div class='add'>+	GET_SCRATCH0(r13)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define SYSCALL_KVMTEST							\</div><div class='add'>+	HMT_MEDIUM</div><div class='add'>+#endif</div><div class='add'>+	</div><div class='ctx'> #define LOAD_SYSCALL_HANDLER(reg)					\</div><div class='ctx'> 	__LOAD_HANDLER(reg, system_call_common)</div><div class='ctx'> </div><div class='hunk'>@@ -884,50 +907,30 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)				\</div><div class='ctx'> 	b	system_call_common ;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-EXC_REAL_BEGIN(system_call, 0xc00, 0xd00)</div><div class='del'>-	 /*</div><div class='del'>-	  * If CONFIG_KVM_BOOK3S_64_HANDLER is set, save the PPR (on systems</div><div class='del'>-	  * that support it) before changing to HMT_MEDIUM. That allows the KVM</div><div class='del'>-	  * code to save that value into the guest state (it is the guest's PPR</div><div class='del'>-	  * value). Otherwise just change to HMT_MEDIUM as userspace has</div><div class='del'>-	  * already saved the PPR.</div><div class='del'>-	  */</div><div class='del'>-#ifdef CONFIG_KVM_BOOK3S_64_HANDLER</div><div class='del'>-	SET_SCRATCH0(r13)</div><div class='del'>-	GET_PACA(r13)</div><div class='del'>-	std	r9,PACA_EXGEN+EX_R9(r13)</div><div class='del'>-	OPT_GET_SPR(r9, SPRN_PPR, CPU_FTR_HAS_PPR);</div><div class='del'>-	HMT_MEDIUM;</div><div class='del'>-	std	r10,PACA_EXGEN+EX_R10(r13)</div><div class='del'>-	OPT_SAVE_REG_TO_PACA(PACA_EXGEN+EX_PPR, r9, CPU_FTR_HAS_PPR);</div><div class='del'>-	mfcr	r9</div><div class='del'>-	KVMTEST_PR(0xc00)</div><div class='del'>-	GET_SCRATCH0(r13)</div><div class='del'>-#else</div><div class='del'>-	HMT_MEDIUM;</div><div class='del'>-#endif</div><div class='add'>+EXC_REAL_BEGIN(system_call, 0xc00, 0x100)</div><div class='add'>+	SYSCALL_KVMTEST</div><div class='ctx'> 	SYSCALL_PSERIES_1</div><div class='ctx'> 	SYSCALL_PSERIES_2_RFID</div><div class='ctx'> 	SYSCALL_PSERIES_3</div><div class='del'>-EXC_REAL_END(system_call, 0xc00, 0xd00)</div><div class='add'>+EXC_REAL_END(system_call, 0xc00, 0x100)</div><div class='ctx'> </div><div class='del'>-EXC_VIRT_BEGIN(system_call, 0x4c00, 0x4d00)</div><div class='del'>-	HMT_MEDIUM</div><div class='add'>+EXC_VIRT_BEGIN(system_call, 0x4c00, 0x100)</div><div class='add'>+	SYSCALL_KVMTEST</div><div class='ctx'> 	SYSCALL_PSERIES_1</div><div class='ctx'> 	SYSCALL_PSERIES_2_DIRECT</div><div class='ctx'> 	SYSCALL_PSERIES_3</div><div class='del'>-EXC_VIRT_END(system_call, 0x4c00, 0x4d00)</div><div class='add'>+EXC_VIRT_END(system_call, 0x4c00, 0x100)</div><div class='ctx'> </div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0xc00)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL(single_step, 0xd00, 0xe00)</div><div class='del'>-EXC_VIRT(single_step, 0x4d00, 0x4e00, 0xd00)</div><div class='add'>+EXC_REAL(single_step, 0xd00, 0x100)</div><div class='add'>+EXC_VIRT(single_step, 0x4d00, 0x100, 0xd00)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0xd00)</div><div class='ctx'> EXC_COMMON(single_step_common, 0xd00, single_step_exception)</div><div class='ctx'> </div><div class='del'>-EXC_REAL_OOL_HV(h_data_storage, 0xe00, 0xe20)</div><div class='del'>-EXC_VIRT_NONE(0x4e00, 0x4e20)</div><div class='add'>+EXC_REAL_OOL_HV(h_data_storage, 0xe00, 0x20)</div><div class='add'>+EXC_VIRT_OOL_HV(h_data_storage, 0x4e00, 0x20, 0xe00)</div><div class='ctx'> TRAMP_KVM_HV_SKIP(PACA_EXGEN, 0xe00)</div><div class='ctx'> EXC_COMMON_BEGIN(h_data_storage_common)</div><div class='ctx'> 	mfspr   r10,SPRN_HDAR</div><div class='hunk'>@@ -942,14 +945,14 @@ EXC_COMMON_BEGIN(h_data_storage_common)</div><div class='ctx'> 	b       ret_from_except</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_OOL_HV(h_instr_storage, 0xe20, 0xe40)</div><div class='del'>-EXC_VIRT_NONE(0x4e20, 0x4e40)</div><div class='add'>+EXC_REAL_OOL_HV(h_instr_storage, 0xe20, 0x20)</div><div class='add'>+EXC_VIRT_OOL_HV(h_instr_storage, 0x4e20, 0x20, 0xe20)</div><div class='ctx'> TRAMP_KVM_HV(PACA_EXGEN, 0xe20)</div><div class='ctx'> EXC_COMMON(h_instr_storage_common, 0xe20, unknown_exception)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_OOL_HV(emulation_assist, 0xe40, 0xe60)</div><div class='del'>-EXC_VIRT_OOL_HV(emulation_assist, 0x4e40, 0x4e60, 0xe40)</div><div class='add'>+EXC_REAL_OOL_HV(emulation_assist, 0xe40, 0x20)</div><div class='add'>+EXC_VIRT_OOL_HV(emulation_assist, 0x4e40, 0x20, 0xe40)</div><div class='ctx'> TRAMP_KVM_HV(PACA_EXGEN, 0xe40)</div><div class='ctx'> EXC_COMMON(emulation_assist_common, 0xe40, emulation_assist_interrupt)</div><div class='ctx'> </div><div class='hunk'>@@ -959,9 +962,9 @@ EXC_COMMON(emulation_assist_common, 0xe40, emulation_assist_interrupt)</div><div class='ctx'>  * first, and then eventaully from there to the trampoline to get into virtual</div><div class='ctx'>  * mode.</div><div class='ctx'>  */</div><div class='del'>-__EXC_REAL_OOL_HV_DIRECT(hmi_exception, 0xe60, 0xe80, hmi_exception_early)</div><div class='del'>-__TRAMP_REAL_REAL_OOL_MASKABLE_HV(hmi_exception, 0xe60)</div><div class='del'>-EXC_VIRT_NONE(0x4e60, 0x4e80)</div><div class='add'>+__EXC_REAL_OOL_HV_DIRECT(hmi_exception, 0xe60, 0x20, hmi_exception_early)</div><div class='add'>+__TRAMP_REAL_OOL_MASKABLE_HV(hmi_exception, 0xe60)</div><div class='add'>+EXC_VIRT_NONE(0x4e60, 0x20)</div><div class='ctx'> TRAMP_KVM_HV(PACA_EXGEN, 0xe60)</div><div class='ctx'> TRAMP_REAL_BEGIN(hmi_exception_early)</div><div class='ctx'> 	EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST_HV, 0xe60)</div><div class='hunk'>@@ -979,7 +982,7 @@ TRAMP_REAL_BEGIN(hmi_exception_early)</div><div class='ctx'> 	EXCEPTION_PROLOG_COMMON_2(PACA_EXGEN)</div><div class='ctx'> 	EXCEPTION_PROLOG_COMMON_3(0xe60)</div><div class='ctx'> 	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='del'>-	bl	hmi_exception_realmode</div><div class='add'>+	BRANCH_LINK_TO_FAR(r4, hmi_exception_realmode)</div><div class='ctx'> 	/* Windup the stack. */</div><div class='ctx'> 	/* Move original HSRR0 and HSRR1 into the respective regs */</div><div class='ctx'> 	ld	r9,_MSR(r1)</div><div class='hunk'>@@ -1015,8 +1018,8 @@ hmi_exception_after_realmode:</div><div class='ctx'> EXC_COMMON_ASYNC(hmi_exception_common, 0xe60, handle_hmi_exception)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_OOL_MASKABLE_HV(h_doorbell, 0xe80, 0xea0)</div><div class='del'>-EXC_VIRT_OOL_MASKABLE_HV(h_doorbell, 0x4e80, 0x4ea0, 0xe80)</div><div class='add'>+EXC_REAL_OOL_MASKABLE_HV(h_doorbell, 0xe80, 0x20)</div><div class='add'>+EXC_VIRT_OOL_MASKABLE_HV(h_doorbell, 0x4e80, 0x20, 0xe80)</div><div class='ctx'> TRAMP_KVM_HV(PACA_EXGEN, 0xe80)</div><div class='ctx'> #ifdef CONFIG_PPC_DOORBELL</div><div class='ctx'> EXC_COMMON_ASYNC(h_doorbell_common, 0xe80, doorbell_exception)</div><div class='hunk'>@@ -1025,24 +1028,26 @@ EXC_COMMON_ASYNC(h_doorbell_common, 0xe80, unknown_exception)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0, 0xec0)</div><div class='del'>-EXC_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x4ec0, 0xea0)</div><div class='add'>+EXC_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0, 0x20)</div><div class='add'>+EXC_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x20, 0xea0)</div><div class='ctx'> TRAMP_KVM_HV(PACA_EXGEN, 0xea0)</div><div class='ctx'> EXC_COMMON_ASYNC(h_virt_irq_common, 0xea0, do_IRQ)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_NONE(0xec0, 0xf00)</div><div class='del'>-EXC_VIRT_NONE(0x4ec0, 0x4f00)</div><div class='add'>+EXC_REAL_NONE(0xec0, 0x20)</div><div class='add'>+EXC_VIRT_NONE(0x4ec0, 0x20)</div><div class='add'>+EXC_REAL_NONE(0xee0, 0x20)</div><div class='add'>+EXC_VIRT_NONE(0x4ee0, 0x20)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_OOL(performance_monitor, 0xf00, 0xf20)</div><div class='del'>-EXC_VIRT_OOL(performance_monitor, 0x4f00, 0x4f20, 0xf00)</div><div class='add'>+EXC_REAL_OOL(performance_monitor, 0xf00, 0x20)</div><div class='add'>+EXC_VIRT_OOL(performance_monitor, 0x4f00, 0x20, 0xf00)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0xf00)</div><div class='ctx'> EXC_COMMON_ASYNC(performance_monitor_common, 0xf00, performance_monitor_exception)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_OOL(altivec_unavailable, 0xf20, 0xf40)</div><div class='del'>-EXC_VIRT_OOL(altivec_unavailable, 0x4f20, 0x4f40, 0xf20)</div><div class='add'>+EXC_REAL_OOL(altivec_unavailable, 0xf20, 0x20)</div><div class='add'>+EXC_VIRT_OOL(altivec_unavailable, 0x4f20, 0x20, 0xf20)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0xf20)</div><div class='ctx'> EXC_COMMON_BEGIN(altivec_unavailable_common)</div><div class='ctx'> 	EXCEPTION_PROLOG_COMMON(0xf20, PACA_EXGEN)</div><div class='hunk'>@@ -1078,8 +1083,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)</div><div class='ctx'> 	b	ret_from_except</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_OOL(vsx_unavailable, 0xf40, 0xf60)</div><div class='del'>-EXC_VIRT_OOL(vsx_unavailable, 0x4f40, 0x4f60, 0xf40)</div><div class='add'>+EXC_REAL_OOL(vsx_unavailable, 0xf40, 0x20)</div><div class='add'>+EXC_VIRT_OOL(vsx_unavailable, 0x4f40, 0x20, 0xf40)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0xf40)</div><div class='ctx'> EXC_COMMON_BEGIN(vsx_unavailable_common)</div><div class='ctx'> 	EXCEPTION_PROLOG_COMMON(0xf40, PACA_EXGEN)</div><div class='hunk'>@@ -1114,41 +1119,50 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX)</div><div class='ctx'> 	b	ret_from_except</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_OOL(facility_unavailable, 0xf60, 0xf80)</div><div class='del'>-EXC_VIRT_OOL(facility_unavailable, 0x4f60, 0x4f80, 0xf60)</div><div class='add'>+EXC_REAL_OOL(facility_unavailable, 0xf60, 0x20)</div><div class='add'>+EXC_VIRT_OOL(facility_unavailable, 0x4f60, 0x20, 0xf60)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0xf60)</div><div class='ctx'> EXC_COMMON(facility_unavailable_common, 0xf60, facility_unavailable_exception)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_OOL_HV(h_facility_unavailable, 0xf80, 0xfa0)</div><div class='del'>-EXC_VIRT_OOL_HV(h_facility_unavailable, 0x4f80, 0x4fa0, 0xf80)</div><div class='add'>+EXC_REAL_OOL_HV(h_facility_unavailable, 0xf80, 0x20)</div><div class='add'>+EXC_VIRT_OOL_HV(h_facility_unavailable, 0x4f80, 0x20, 0xf80)</div><div class='ctx'> TRAMP_KVM_HV(PACA_EXGEN, 0xf80)</div><div class='ctx'> EXC_COMMON(h_facility_unavailable_common, 0xf80, facility_unavailable_exception)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL_NONE(0xfa0, 0x1200)</div><div class='del'>-EXC_VIRT_NONE(0x4fa0, 0x5200)</div><div class='add'>+EXC_REAL_NONE(0xfa0, 0x20)</div><div class='add'>+EXC_VIRT_NONE(0x4fa0, 0x20)</div><div class='add'>+EXC_REAL_NONE(0xfc0, 0x20)</div><div class='add'>+EXC_VIRT_NONE(0x4fc0, 0x20)</div><div class='add'>+EXC_REAL_NONE(0xfe0, 0x20)</div><div class='add'>+EXC_VIRT_NONE(0x4fe0, 0x20)</div><div class='add'>+</div><div class='add'>+EXC_REAL_NONE(0x1000, 0x100)</div><div class='add'>+EXC_VIRT_NONE(0x5000, 0x100)</div><div class='add'>+EXC_REAL_NONE(0x1100, 0x100)</div><div class='add'>+EXC_VIRT_NONE(0x5100, 0x100)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CBE_RAS</div><div class='del'>-EXC_REAL_HV(cbe_system_error, 0x1200, 0x1300)</div><div class='del'>-EXC_VIRT_NONE(0x5200, 0x5300)</div><div class='add'>+EXC_REAL_HV(cbe_system_error, 0x1200, 0x100)</div><div class='add'>+EXC_VIRT_NONE(0x5200, 0x100)</div><div class='ctx'> TRAMP_KVM_HV_SKIP(PACA_EXGEN, 0x1200)</div><div class='ctx'> EXC_COMMON(cbe_system_error_common, 0x1200, cbe_system_error_exception)</div><div class='ctx'> #else /* CONFIG_CBE_RAS */</div><div class='del'>-EXC_REAL_NONE(0x1200, 0x1300)</div><div class='del'>-EXC_VIRT_NONE(0x5200, 0x5300)</div><div class='add'>+EXC_REAL_NONE(0x1200, 0x100)</div><div class='add'>+EXC_VIRT_NONE(0x5200, 0x100)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL(instruction_breakpoint, 0x1300, 0x1400)</div><div class='del'>-EXC_VIRT(instruction_breakpoint, 0x5300, 0x5400, 0x1300)</div><div class='add'>+EXC_REAL(instruction_breakpoint, 0x1300, 0x100)</div><div class='add'>+EXC_VIRT(instruction_breakpoint, 0x5300, 0x100, 0x1300)</div><div class='ctx'> TRAMP_KVM_SKIP(PACA_EXGEN, 0x1300)</div><div class='ctx'> EXC_COMMON(instruction_breakpoint_common, 0x1300, instruction_breakpoint_exception)</div><div class='ctx'> </div><div class='del'>-EXC_REAL_NONE(0x1400, 0x1500)</div><div class='del'>-EXC_VIRT_NONE(0x5400, 0x5500)</div><div class='add'>+EXC_REAL_NONE(0x1400, 0x100)</div><div class='add'>+EXC_VIRT_NONE(0x5400, 0x100)</div><div class='ctx'> </div><div class='del'>-EXC_REAL_BEGIN(denorm_exception_hv, 0x1500, 0x1600)</div><div class='add'>+EXC_REAL_BEGIN(denorm_exception_hv, 0x1500, 0x100)</div><div class='ctx'> 	mtspr	SPRN_SPRG_HSCRATCH0,r13</div><div class='ctx'> 	EXCEPTION_PROLOG_0(PACA_EXGEN)</div><div class='ctx'> 	EXCEPTION_PROLOG_1(PACA_EXGEN, NOTEST, 0x1500)</div><div class='hunk'>@@ -1163,14 +1177,14 @@ EXC_REAL_BEGIN(denorm_exception_hv, 0x1500, 0x1600)</div><div class='ctx'> </div><div class='ctx'> 	KVMTEST_PR(0x1500)</div><div class='ctx'> 	EXCEPTION_PROLOG_PSERIES_1(denorm_common, EXC_HV)</div><div class='del'>-EXC_REAL_END(denorm_exception_hv, 0x1500, 0x1600)</div><div class='add'>+EXC_REAL_END(denorm_exception_hv, 0x1500, 0x100)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_DENORMALISATION</div><div class='del'>-EXC_VIRT_BEGIN(denorm_exception, 0x5500, 0x5600)</div><div class='add'>+EXC_VIRT_BEGIN(denorm_exception, 0x5500, 0x100)</div><div class='ctx'> 	b	exc_real_0x1500_denorm_exception_hv</div><div class='del'>-EXC_VIRT_END(denorm_exception, 0x5500, 0x5600)</div><div class='add'>+EXC_VIRT_END(denorm_exception, 0x5500, 0x100)</div><div class='ctx'> #else</div><div class='del'>-EXC_VIRT_NONE(0x5500, 0x5600)</div><div class='add'>+EXC_VIRT_NONE(0x5500, 0x100)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> TRAMP_KVM_SKIP(PACA_EXGEN, 0x1500)</div><div class='hunk'>@@ -1243,18 +1257,18 @@ EXC_COMMON_HV(denorm_common, 0x1500, unknown_exception)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CBE_RAS</div><div class='del'>-EXC_REAL_HV(cbe_maintenance, 0x1600, 0x1700)</div><div class='del'>-EXC_VIRT_NONE(0x5600, 0x5700)</div><div class='add'>+EXC_REAL_HV(cbe_maintenance, 0x1600, 0x100)</div><div class='add'>+EXC_VIRT_NONE(0x5600, 0x100)</div><div class='ctx'> TRAMP_KVM_HV_SKIP(PACA_EXGEN, 0x1600)</div><div class='ctx'> EXC_COMMON(cbe_maintenance_common, 0x1600, cbe_maintenance_exception)</div><div class='ctx'> #else /* CONFIG_CBE_RAS */</div><div class='del'>-EXC_REAL_NONE(0x1600, 0x1700)</div><div class='del'>-EXC_VIRT_NONE(0x5600, 0x5700)</div><div class='add'>+EXC_REAL_NONE(0x1600, 0x100)</div><div class='add'>+EXC_VIRT_NONE(0x5600, 0x100)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXC_REAL(altivec_assist, 0x1700, 0x1800)</div><div class='del'>-EXC_VIRT(altivec_assist, 0x5700, 0x5800, 0x1700)</div><div class='add'>+EXC_REAL(altivec_assist, 0x1700, 0x100)</div><div class='add'>+EXC_VIRT(altivec_assist, 0x5700, 0x100, 0x1700)</div><div class='ctx'> TRAMP_KVM(PACA_EXGEN, 0x1700)</div><div class='ctx'> #ifdef CONFIG_ALTIVEC</div><div class='ctx'> EXC_COMMON(altivec_assist_common, 0x1700, altivec_assist_exception)</div><div class='hunk'>@@ -1264,13 +1278,13 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CBE_RAS</div><div class='del'>-EXC_REAL_HV(cbe_thermal, 0x1800, 0x1900)</div><div class='del'>-EXC_VIRT_NONE(0x5800, 0x5900)</div><div class='add'>+EXC_REAL_HV(cbe_thermal, 0x1800, 0x100)</div><div class='add'>+EXC_VIRT_NONE(0x5800, 0x100)</div><div class='ctx'> TRAMP_KVM_HV_SKIP(PACA_EXGEN, 0x1800)</div><div class='ctx'> EXC_COMMON(cbe_thermal_common, 0x1800, cbe_thermal_exception)</div><div class='ctx'> #else /* CONFIG_CBE_RAS */</div><div class='del'>-EXC_REAL_NONE(0x1800, 0x1900)</div><div class='del'>-EXC_VIRT_NONE(0x5800, 0x5900)</div><div class='add'>+EXC_REAL_NONE(0x1800, 0x100)</div><div class='add'>+EXC_VIRT_NONE(0x5800, 0x100)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1408,7 +1422,7 @@ USE_TEXT_SECTION()</div><div class='ctx'> /*</div><div class='ctx'>  * Hash table stuff</div><div class='ctx'>  */</div><div class='del'>-	.align	7</div><div class='add'>+	.balign	IFETCH_ALIGN_BYTES</div><div class='ctx'> do_hash_page:</div><div class='ctx'> #ifdef CONFIG_PPC_STD_MMU_64</div><div class='ctx'> 	andis.	r0,r4,0xa410		/* weird error? */</div><div class='head'>diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c<br/>index 8f0c7c5d93f2..8ff0dd4e77a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/fadump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/fadump.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/fadump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/fadump.c</a></div><div class='hunk'>@@ -406,12 +406,35 @@ static void register_fw_dump(struct fadump_mem_struct *fdm)</div><div class='ctx'> void crash_fadump(struct pt_regs *regs, const char *str)</div><div class='ctx'> {</div><div class='ctx'> 	struct fadump_crash_info_header *fdh = NULL;</div><div class='add'>+	int old_cpu, this_cpu;</div><div class='ctx'> </div><div class='ctx'> 	if (!fw_dump.dump_registered || !fw_dump.fadumphdr_addr)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * old_cpu == -1 means this is the first CPU which has come here,</div><div class='add'>+	 * go ahead and trigger fadump.</div><div class='add'>+	 *</div><div class='add'>+	 * old_cpu != -1 means some other CPU has already on it's way</div><div class='add'>+	 * to trigger fadump, just keep looping here.</div><div class='add'>+	 */</div><div class='add'>+	this_cpu = smp_processor_id();</div><div class='add'>+	old_cpu = cmpxchg(&amp;crashing_cpu, -1, this_cpu);</div><div class='add'>+</div><div class='add'>+	if (old_cpu != -1) {</div><div class='add'>+		/*</div><div class='add'>+		 * We can't loop here indefinitely. Wait as long as fadump</div><div class='add'>+		 * is in force. If we race with fadump un-registration this</div><div class='add'>+		 * loop will break and then we go down to normal panic path</div><div class='add'>+		 * and reboot. If fadump is in force the first crashing</div><div class='add'>+		 * cpu will definitely trigger fadump.</div><div class='add'>+		 */</div><div class='add'>+		while (fw_dump.dump_registered)</div><div class='add'>+			cpu_relax();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	fdh = __va(fw_dump.fadumphdr_addr);</div><div class='del'>-	crashing_cpu = smp_processor_id();</div><div class='ctx'> 	fdh-&gt;crashing_cpu = crashing_cpu;</div><div class='ctx'> 	crash_save_vmcoreinfo();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c<br/>index a95639b8d4ac..5c9f50c1aa99 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/ftrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/ftrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/ftrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/ftrace.c</a></div><div class='hunk'>@@ -47,13 +47,11 @@ ftrace_modify_code(unsigned long ip, unsigned int old, unsigned int new)</div><div class='ctx'> 	unsigned int replaced;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Note: Due to modules and __init, code can</div><div class='del'>-	 *  disappear and change, we need to protect against faulting</div><div class='del'>-	 *  as well as code changing. We do this by using the</div><div class='del'>-	 *  probe_kernel_* functions.</div><div class='del'>-	 *</div><div class='del'>-	 * No real locking needed, this code is run through</div><div class='del'>-	 * kstop_machine, or before SMP starts.</div><div class='add'>+	 * Note:</div><div class='add'>+	 * We are paranoid about modifying text, as if a bug was to happen, it</div><div class='add'>+	 * could cause us to read or write to someplace that could cause harm.</div><div class='add'>+	 * Carefully read and modify the code with probe_kernel_*(), and make</div><div class='add'>+	 * sure what we read is what we expected it to be before modifying it.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* read the text we want to modify */</div><div class='head'>diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S<br/>index 9d963547d243..1607be7c0ef2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/head_32.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/head_32.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/head_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/head_32.S</a></div><div class='hunk'>@@ -869,7 +869,6 @@ __secondary_start:</div><div class='ctx'> </div><div class='ctx'> 	/* enable MMU and jump to start_secondary */</div><div class='ctx'> 	li	r4,MSR_KERNEL</div><div class='del'>-	FIX_SRR1(r4,r5)</div><div class='ctx'> 	lis	r3,start_secondary@h</div><div class='ctx'> 	ori	r3,r3,start_secondary@l</div><div class='ctx'> 	mtspr	SPRN_SRR0,r3</div><div class='hunk'>@@ -977,7 +976,6 @@ start_here:</div><div class='ctx'> 	ori	r4,r4,2f@l</div><div class='ctx'> 	tophys(r4,r4)</div><div class='ctx'> 	li	r3,MSR_KERNEL &amp; ~(MSR_IR|MSR_DR)</div><div class='del'>-	FIX_SRR1(r3,r5)</div><div class='ctx'> 	mtspr	SPRN_SRR0,r4</div><div class='ctx'> 	mtspr	SPRN_SRR1,r3</div><div class='ctx'> 	SYNC</div><div class='hunk'>@@ -1001,7 +999,6 @@ start_here:</div><div class='ctx'> </div><div class='ctx'> /* Now turn on the MMU for real! */</div><div class='ctx'> 	li	r4,MSR_KERNEL</div><div class='del'>-	FIX_SRR1(r4,r5)</div><div class='ctx'> 	lis	r3,start_kernel@h</div><div class='ctx'> 	ori	r3,r3,start_kernel@l</div><div class='ctx'> 	mtspr	SPRN_SRR0,r3</div><div class='head'>diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S<br/>index 04c546e20cc0..1dc5eae2ced3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/head_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/head_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/head_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/head_64.S</a></div><div class='hunk'>@@ -107,12 +107,19 @@ __secondary_hold_acknowledge:</div><div class='ctx'> 	 * crash_kernel region.  The loader is responsible for</div><div class='ctx'> 	 * observing the alignment requirement.</div><div class='ctx'> 	 */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RELOCATABLE_TEST</div><div class='add'>+#define RUN_AT_LOAD_DEFAULT 1		/* Test relocation, do not copy to 0 */</div><div class='add'>+#else</div><div class='add'>+#define RUN_AT_LOAD_DEFAULT 0x72756e30  /* "run0" -- relocate to 0 by default */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* Do not move this variable as kexec-tools knows about it. */</div><div class='ctx'> 	. = 0x5c</div><div class='ctx'> 	.globl	__run_at_load</div><div class='ctx'> __run_at_load:</div><div class='ctx'> DEFINE_FIXED_SYMBOL(__run_at_load)</div><div class='del'>-	.long	0x72756e30	/* "run0" -- relocate to 0 by default */</div><div class='add'>+	.long	RUN_AT_LOAD_DEFAULT</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	. = 0x60</div><div class='hunk'>@@ -153,7 +160,7 @@ __secondary_hold:</div><div class='ctx'> 	cmpdi	0,r12,0</div><div class='ctx'> 	beq	100b</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)</div><div class='add'>+#if defined(CONFIG_SMP) || defined(CONFIG_KEXEC_CORE)</div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3E</div><div class='ctx'> 	tovirt(r12,r12)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -214,9 +221,9 @@ booting_thread_hwid:</div><div class='ctx'>  */</div><div class='ctx'> _GLOBAL(book3e_start_thread)</div><div class='ctx'> 	LOAD_REG_IMMEDIATE(r5, MSR_KERNEL)</div><div class='del'>-	cmpi	0, r3, 0</div><div class='add'>+	cmpwi	r3, 0</div><div class='ctx'> 	beq	10f</div><div class='del'>-	cmpi	0, r3, 1</div><div class='add'>+	cmpwi	r3, 1</div><div class='ctx'> 	beq	11f</div><div class='ctx'> 	/* If the thread id is invalid, just exit. */</div><div class='ctx'> 	b	13f</div><div class='hunk'>@@ -241,9 +248,9 @@ _GLOBAL(book3e_start_thread)</div><div class='ctx'>  * r3 = the thread physical id</div><div class='ctx'>  */</div><div class='ctx'> _GLOBAL(book3e_stop_thread)</div><div class='del'>-	cmpi	0, r3, 0</div><div class='add'>+	cmpwi	r3, 0</div><div class='ctx'> 	beq	10f</div><div class='del'>-	cmpi	0, r3, 1</div><div class='add'>+	cmpwi	r3, 1</div><div class='ctx'> 	beq	10f</div><div class='ctx'> 	/* If the thread id is invalid, just exit. */</div><div class='ctx'> 	b	13f</div><div class='head'>diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S<br/>index fb133a163263..c032fe8c2d26 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/head_8xx.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/head_8xx.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/head_8xx.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/head_8xx.S</a></div><div class='hunk'>@@ -73,6 +73,9 @@</div><div class='ctx'> #define RPN_PATTERN	0x00f0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define PAGE_SHIFT_512K		19</div><div class='add'>+#define PAGE_SHIFT_8M		23</div><div class='add'>+</div><div class='ctx'> 	__HEAD</div><div class='ctx'> _ENTRY(_stext);</div><div class='ctx'> _ENTRY(_start);</div><div class='hunk'>@@ -322,20 +325,28 @@ SystemCall:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> InstructionTLBMiss:</div><div class='del'>-#if defined(CONFIG_8xx_CPU6) || defined(CONFIG_MODULES) || defined (CONFIG_DEBUG_PAGEALLOC)</div><div class='add'>+#if defined(CONFIG_8xx_CPU6) || defined(CONFIG_MODULES) || defined (CONFIG_DEBUG_PAGEALLOC) || defined (CONFIG_HUGETLB_PAGE)</div><div class='ctx'> 	mtspr	SPRN_SPRG_SCRATCH2, r3</div><div class='ctx'> #endif</div><div class='ctx'> 	EXCEPTION_PROLOG_0</div><div class='add'>+#ifdef CONFIG_PPC_8xx_PERF_EVENT</div><div class='add'>+	lis	r10, (itlb_miss_counter - PAGE_OFFSET)@ha</div><div class='add'>+	lwz	r11, (itlb_miss_counter - PAGE_OFFSET)@l(r10)</div><div class='add'>+	addi	r11, r11, 1</div><div class='add'>+	stw	r11, (itlb_miss_counter - PAGE_OFFSET)@l(r10)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* If we are faulting a kernel address, we have to use the</div><div class='ctx'> 	 * kernel page tables.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mfspr	r10, SPRN_SRR0	/* Get effective address of fault */</div><div class='ctx'> 	INVALIDATE_ADJACENT_PAGES_CPU15(r11, r10)</div><div class='del'>-#if defined(CONFIG_MODULES) || defined (CONFIG_DEBUG_PAGEALLOC)</div><div class='ctx'> 	/* Only modules will cause ITLB Misses as we always</div><div class='ctx'> 	 * pin the first 8MB of kernel memory */</div><div class='add'>+#if defined(CONFIG_MODULES) || defined (CONFIG_DEBUG_PAGEALLOC) || defined (CONFIG_HUGETLB_PAGE)</div><div class='ctx'> 	mfcr	r3</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_MODULES) || defined (CONFIG_DEBUG_PAGEALLOC)</div><div class='ctx'> 	IS_KERNEL(r11, r10)</div><div class='ctx'> #endif</div><div class='ctx'> 	mfspr	r11, SPRN_M_TW	/* Get level 1 table */</div><div class='hunk'>@@ -343,7 +354,6 @@ InstructionTLBMiss:</div><div class='ctx'> 	BRANCH_UNLESS_KERNEL(3f)</div><div class='ctx'> 	lis	r11, (swapper_pg_dir-PAGE_OFFSET)@ha</div><div class='ctx'> 3:</div><div class='del'>-	mtcr	r3</div><div class='ctx'> #endif</div><div class='ctx'> 	/* Insert level 1 index */</div><div class='ctx'> 	rlwimi	r11, r10, 32 - ((PAGE_SHIFT - 2) &lt;&lt; 1), (PAGE_SHIFT - 2) &lt;&lt; 1, 29</div><div class='hunk'>@@ -351,14 +361,25 @@ InstructionTLBMiss:</div><div class='ctx'> </div><div class='ctx'> 	/* Extract level 2 index */</div><div class='ctx'> 	rlwinm	r10, r10, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29</div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+	mtcr	r11</div><div class='add'>+	bt-	28, 10f		/* bit 28 = Large page (8M) */</div><div class='add'>+	bt-	29, 20f		/* bit 29 = Large page (8M or 512k) */</div><div class='add'>+#endif</div><div class='ctx'> 	rlwimi	r10, r11, 0, 0, 32 - PAGE_SHIFT - 1	/* Add level 2 base */</div><div class='ctx'> 	lwz	r10, 0(r10)	/* Get the pte */</div><div class='del'>-</div><div class='add'>+4:</div><div class='add'>+#if defined(CONFIG_MODULES) || defined (CONFIG_DEBUG_PAGEALLOC) || defined (CONFIG_HUGETLB_PAGE)</div><div class='add'>+	mtcr	r3</div><div class='add'>+#endif</div><div class='ctx'> 	/* Insert the APG into the TWC from the Linux PTE. */</div><div class='ctx'> 	rlwimi	r11, r10, 0, 25, 26</div><div class='ctx'> 	/* Load the MI_TWC with the attributes for this "segment." */</div><div class='ctx'> 	MTSPR_CPU6(SPRN_MI_TWC, r11, r3)	/* Set segment attributes */</div><div class='ctx'> </div><div class='add'>+#if defined (CONFIG_HUGETLB_PAGE) &amp;&amp; defined (CONFIG_PPC_4K_PAGES)</div><div class='add'>+	rlwimi	r10, r11, 1, MI_SPS16K</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_SWAP</div><div class='ctx'> 	rlwinm	r11, r10, 32-5, _PAGE_PRESENT</div><div class='ctx'> 	and	r11, r11, r10</div><div class='hunk'>@@ -371,20 +392,55 @@ InstructionTLBMiss:</div><div class='ctx'> 	 * set.  All other Linux PTE bits control the behavior</div><div class='ctx'> 	 * of the MMU.</div><div class='ctx'> 	 */</div><div class='add'>+#if defined (CONFIG_HUGETLB_PAGE) &amp;&amp; defined (CONFIG_PPC_4K_PAGES)</div><div class='add'>+	rlwimi	r10, r11, 0, 0x0ff0	/* Set 24-27, clear 20-23 */</div><div class='add'>+#else</div><div class='ctx'> 	rlwimi	r10, r11, 0, 0x0ff8	/* Set 24-27, clear 20-23,28 */</div><div class='add'>+#endif</div><div class='ctx'> 	MTSPR_CPU6(SPRN_MI_RPN, r10, r3)	/* Update TLB entry */</div><div class='ctx'> </div><div class='ctx'> 	/* Restore registers */</div><div class='del'>-#if defined(CONFIG_8xx_CPU6) || defined(CONFIG_MODULES) || defined (CONFIG_DEBUG_PAGEALLOC)</div><div class='add'>+#if defined(CONFIG_8xx_CPU6) || defined(CONFIG_MODULES) || defined (CONFIG_DEBUG_PAGEALLOC) || defined (CONFIG_HUGETLB_PAGE)</div><div class='ctx'> 	mfspr	r3, SPRN_SPRG_SCRATCH2</div><div class='ctx'> #endif</div><div class='ctx'> 	EXCEPTION_EPILOG_0</div><div class='ctx'> 	rfi</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+10:	/* 8M pages */</div><div class='add'>+#ifdef CONFIG_PPC_16K_PAGES</div><div class='add'>+	/* Extract level 2 index */</div><div class='add'>+	rlwinm	r10, r10, 32 - (PAGE_SHIFT_8M - PAGE_SHIFT), 32 + PAGE_SHIFT_8M - (PAGE_SHIFT &lt;&lt; 1), 29</div><div class='add'>+	/* Add level 2 base */</div><div class='add'>+	rlwimi	r10, r11, 0, 0, 32 + PAGE_SHIFT_8M - (PAGE_SHIFT &lt;&lt; 1) - 1</div><div class='add'>+#else</div><div class='add'>+	/* Level 2 base */</div><div class='add'>+	rlwinm	r10, r11, 0, ~HUGEPD_SHIFT_MASK</div><div class='add'>+#endif</div><div class='add'>+	lwz	r10, 0(r10)	/* Get the pte */</div><div class='add'>+	rlwinm	r11, r11, 0, 0xf</div><div class='add'>+	b	4b</div><div class='add'>+</div><div class='add'>+20:	/* 512k pages */</div><div class='add'>+	/* Extract level 2 index */</div><div class='add'>+	rlwinm	r10, r10, 32 - (PAGE_SHIFT_512K - PAGE_SHIFT), 32 + PAGE_SHIFT_512K - (PAGE_SHIFT &lt;&lt; 1), 29</div><div class='add'>+	/* Add level 2 base */</div><div class='add'>+	rlwimi	r10, r11, 0, 0, 32 + PAGE_SHIFT_512K - (PAGE_SHIFT &lt;&lt; 1) - 1</div><div class='add'>+	lwz	r10, 0(r10)	/* Get the pte */</div><div class='add'>+	rlwinm	r11, r11, 0, 0xf</div><div class='add'>+	b	4b</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	. = 0x1200</div><div class='ctx'> DataStoreTLBMiss:</div><div class='ctx'> 	mtspr	SPRN_SPRG_SCRATCH2, r3</div><div class='ctx'> 	EXCEPTION_PROLOG_0</div><div class='add'>+#ifdef CONFIG_PPC_8xx_PERF_EVENT</div><div class='add'>+	lis	r10, (dtlb_miss_counter - PAGE_OFFSET)@ha</div><div class='add'>+	lwz	r11, (dtlb_miss_counter - PAGE_OFFSET)@l(r10)</div><div class='add'>+	addi	r11, r11, 1</div><div class='add'>+	stw	r11, (dtlb_miss_counter - PAGE_OFFSET)@l(r10)</div><div class='add'>+#endif</div><div class='ctx'> 	mfcr	r3</div><div class='ctx'> </div><div class='ctx'> 	/* If we are faulting a kernel address, we have to use the</div><div class='hunk'>@@ -407,7 +463,6 @@ _ENTRY(DTLBMiss_jmp)</div><div class='ctx'> #endif</div><div class='ctx'> 	blt	cr7, DTLBMissLinear</div><div class='ctx'> 3:</div><div class='del'>-	mtcr	r3</div><div class='ctx'> 	mfspr	r10, SPRN_MD_EPN</div><div class='ctx'> </div><div class='ctx'> 	/* Insert level 1 index */</div><div class='hunk'>@@ -418,8 +473,15 @@ _ENTRY(DTLBMiss_jmp)</div><div class='ctx'> 	 */</div><div class='ctx'> 	/* Extract level 2 index */</div><div class='ctx'> 	rlwinm	r10, r10, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29</div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+	mtcr	r11</div><div class='add'>+	bt-	28, 10f		/* bit 28 = Large page (8M) */</div><div class='add'>+	bt-	29, 20f		/* bit 29 = Large page (8M or 512k) */</div><div class='add'>+#endif</div><div class='ctx'> 	rlwimi	r10, r11, 0, 0, 32 - PAGE_SHIFT - 1	/* Add level 2 base */</div><div class='ctx'> 	lwz	r10, 0(r10)	/* Get the pte */</div><div class='add'>+4:</div><div class='add'>+	mtcr	r3</div><div class='ctx'> </div><div class='ctx'> 	/* Insert the Guarded flag and APG into the TWC from the Linux PTE.</div><div class='ctx'> 	 * It is bit 26-27 of both the Linux PTE and the TWC (at least</div><div class='hunk'>@@ -434,6 +496,11 @@ _ENTRY(DTLBMiss_jmp)</div><div class='ctx'> 	rlwimi	r11, r10, 32-5, 30, 30</div><div class='ctx'> 	MTSPR_CPU6(SPRN_MD_TWC, r11, r3)</div><div class='ctx'> </div><div class='add'>+	/* In 4k pages mode, SPS (bit 28) in RPN must match PS[1] (bit 29)</div><div class='add'>+	 * In 16k pages mode, SPS is always 1 */</div><div class='add'>+#if defined (CONFIG_HUGETLB_PAGE) &amp;&amp; defined (CONFIG_PPC_4K_PAGES)</div><div class='add'>+	rlwimi	r10, r11, 1, MD_SPS16K</div><div class='add'>+#endif</div><div class='ctx'> 	/* Both _PAGE_ACCESSED and _PAGE_PRESENT has to be set.</div><div class='ctx'> 	 * We also need to know if the insn is a load/store, so:</div><div class='ctx'> 	 * Clear _PAGE_PRESENT and load that which will</div><div class='hunk'>@@ -455,7 +522,11 @@ _ENTRY(DTLBMiss_jmp)</div><div class='ctx'> 	 * of the MMU.</div><div class='ctx'> 	 */</div><div class='ctx'> 	li	r11, RPN_PATTERN</div><div class='add'>+#if defined (CONFIG_HUGETLB_PAGE) &amp;&amp; defined (CONFIG_PPC_4K_PAGES)</div><div class='add'>+	rlwimi	r10, r11, 0, 24, 27	/* Set 24-27 */</div><div class='add'>+#else</div><div class='ctx'> 	rlwimi	r10, r11, 0, 24, 28	/* Set 24-27, clear 28 */</div><div class='add'>+#endif</div><div class='ctx'> 	rlwimi	r10, r11, 0, 20, 20	/* clear 20 */</div><div class='ctx'> 	MTSPR_CPU6(SPRN_MD_RPN, r10, r3)	/* Update TLB entry */</div><div class='ctx'> </div><div class='hunk'>@@ -465,6 +536,30 @@ _ENTRY(DTLBMiss_jmp)</div><div class='ctx'> 	EXCEPTION_EPILOG_0</div><div class='ctx'> 	rfi</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+10:	/* 8M pages */</div><div class='add'>+	/* Extract level 2 index */</div><div class='add'>+#ifdef CONFIG_PPC_16K_PAGES</div><div class='add'>+	rlwinm	r10, r10, 32 - (PAGE_SHIFT_8M - PAGE_SHIFT), 32 + PAGE_SHIFT_8M - (PAGE_SHIFT &lt;&lt; 1), 29</div><div class='add'>+	/* Add level 2 base */</div><div class='add'>+	rlwimi	r10, r11, 0, 0, 32 + PAGE_SHIFT_8M - (PAGE_SHIFT &lt;&lt; 1) - 1</div><div class='add'>+#else</div><div class='add'>+	/* Level 2 base */</div><div class='add'>+	rlwinm	r10, r11, 0, ~HUGEPD_SHIFT_MASK</div><div class='add'>+#endif</div><div class='add'>+	lwz	r10, 0(r10)	/* Get the pte */</div><div class='add'>+	rlwinm	r11, r11, 0, 0xf</div><div class='add'>+	b	4b</div><div class='add'>+</div><div class='add'>+20:	/* 512k pages */</div><div class='add'>+	/* Extract level 2 index */</div><div class='add'>+	rlwinm	r10, r10, 32 - (PAGE_SHIFT_512K - PAGE_SHIFT), 32 + PAGE_SHIFT_512K - (PAGE_SHIFT &lt;&lt; 1), 29</div><div class='add'>+	/* Add level 2 base */</div><div class='add'>+	rlwimi	r10, r11, 0, 0, 32 + PAGE_SHIFT_512K - (PAGE_SHIFT &lt;&lt; 1) - 1</div><div class='add'>+	lwz	r10, 0(r10)	/* Get the pte */</div><div class='add'>+	rlwinm	r11, r11, 0, 0xf</div><div class='add'>+	b	4b</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* This is an instruction TLB error on the MPC8xx.  This could be due</div><div class='ctx'>  * to many reasons, such as executing guarded memory or illegal instruction</div><div class='hunk'>@@ -478,6 +573,7 @@ InstructionTLBError:</div><div class='ctx'> 	andis.	r10,r5,0x4000</div><div class='ctx'> 	beq+	1f</div><div class='ctx'> 	tlbie	r4</div><div class='add'>+itlbie:</div><div class='ctx'> 	/* 0x400 is InstructionAccess exception, needed by bad_page_fault() */</div><div class='ctx'> 1:	EXC_XFER_LITE(0x400, handle_page_fault)</div><div class='ctx'> </div><div class='hunk'>@@ -502,6 +598,7 @@ DARFixed:/* Return from dcbx instruction bug workaround */</div><div class='ctx'> 	andis.	r10,r5,0x4000</div><div class='ctx'> 	beq+	1f</div><div class='ctx'> 	tlbie	r4</div><div class='add'>+dtlbie:</div><div class='ctx'> 1:	li	r10,RPN_PATTERN</div><div class='ctx'> 	mtspr	SPRN_DAR,r10	/* Tag DAR, to be used in DTLB Error */</div><div class='ctx'> 	/* 0x300 is DataAccess exception, needed by bad_page_fault() */</div><div class='hunk'>@@ -519,8 +616,43 @@ DARFixed:/* Return from dcbx instruction bug workaround */</div><div class='ctx'>  * support of breakpoints and such.  Someday I will get around to</div><div class='ctx'>  * using them.</div><div class='ctx'>  */</div><div class='del'>-	EXCEPTION(0x1c00, Trap_1c, unknown_exception, EXC_XFER_EE)</div><div class='add'>+	. = 0x1c00</div><div class='add'>+DataBreakpoint:</div><div class='add'>+	EXCEPTION_PROLOG_0</div><div class='add'>+	mfcr	r10</div><div class='add'>+	mfspr	r11, SPRN_SRR0</div><div class='add'>+	cmplwi	cr0, r11, (dtlbie - PAGE_OFFSET)@l</div><div class='add'>+	cmplwi	cr7, r11, (itlbie - PAGE_OFFSET)@l</div><div class='add'>+	beq-	cr0, 11f</div><div class='add'>+	beq-	cr7, 11f</div><div class='add'>+	EXCEPTION_PROLOG_1</div><div class='add'>+	EXCEPTION_PROLOG_2</div><div class='add'>+	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='add'>+	mfspr	r4,SPRN_BAR</div><div class='add'>+	stw	r4,_DAR(r11)</div><div class='add'>+	mfspr	r5,SPRN_DSISR</div><div class='add'>+	EXC_XFER_EE(0x1c00, do_break)</div><div class='add'>+11:</div><div class='add'>+	mtcr	r10</div><div class='add'>+	EXCEPTION_EPILOG_0</div><div class='add'>+	rfi</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_8xx_PERF_EVENT</div><div class='add'>+	. = 0x1d00</div><div class='add'>+InstructionBreakpoint:</div><div class='add'>+	EXCEPTION_PROLOG_0</div><div class='add'>+	lis	r10, (instruction_counter - PAGE_OFFSET)@ha</div><div class='add'>+	lwz	r11, (instruction_counter - PAGE_OFFSET)@l(r10)</div><div class='add'>+	addi	r11, r11, -1</div><div class='add'>+	stw	r11, (instruction_counter - PAGE_OFFSET)@l(r10)</div><div class='add'>+	lis	r10, 0xffff</div><div class='add'>+	ori	r10, r10, 0x01</div><div class='add'>+	mtspr	SPRN_COUNTA, r10</div><div class='add'>+	EXCEPTION_EPILOG_0</div><div class='add'>+	rfi</div><div class='add'>+#else</div><div class='ctx'> 	EXCEPTION(0x1d00, Trap_1d, unknown_exception, EXC_XFER_EE)</div><div class='add'>+#endif</div><div class='ctx'> 	EXCEPTION(0x1e00, Trap_1e, unknown_exception, EXC_XFER_EE)</div><div class='ctx'> 	EXCEPTION(0x1f00, Trap_1f, unknown_exception, EXC_XFER_EE)</div><div class='ctx'> </div><div class='hunk'>@@ -586,6 +718,9 @@ _ENTRY(FixupDAR_cmp)</div><div class='ctx'> 	/* Insert level 1 index */</div><div class='ctx'> 3:	rlwimi	r11, r10, 32 - ((PAGE_SHIFT - 2) &lt;&lt; 1), (PAGE_SHIFT - 2) &lt;&lt; 1, 29</div><div class='ctx'> 	lwz	r11, (swapper_pg_dir-PAGE_OFFSET)@l(r11)	/* Get the level 1 entry */</div><div class='add'>+	mtcr	r11</div><div class='add'>+	bt	28,200f		/* bit 28 = Large page (8M) */</div><div class='add'>+	bt	29,202f		/* bit 29 = Large page (8M or 512K) */</div><div class='ctx'> 	rlwinm	r11, r11,0,0,19	/* Extract page descriptor page address */</div><div class='ctx'> 	/* Insert level 2 index */</div><div class='ctx'> 	rlwimi	r11, r10, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29</div><div class='hunk'>@@ -611,6 +746,27 @@ _ENTRY(FixupDAR_cmp)</div><div class='ctx'> 141:	mfspr	r10,SPRN_SPRG_SCRATCH2</div><div class='ctx'> 	b	DARFixed	/* Nope, go back to normal TLB processing */</div><div class='ctx'> </div><div class='add'>+	/* concat physical page address(r11) and page offset(r10) */</div><div class='add'>+200:</div><div class='add'>+#ifdef CONFIG_PPC_16K_PAGES</div><div class='add'>+	rlwinm	r11, r11, 0, 0, 32 + PAGE_SHIFT_8M - (PAGE_SHIFT &lt;&lt; 1) - 1</div><div class='add'>+	rlwimi	r11, r10, 32 - (PAGE_SHIFT_8M - 2), 32 + PAGE_SHIFT_8M - (PAGE_SHIFT &lt;&lt; 1), 29</div><div class='add'>+#else</div><div class='add'>+	rlwinm	r11, r10, 0, ~HUGEPD_SHIFT_MASK</div><div class='add'>+#endif</div><div class='add'>+	lwz	r11, 0(r11)	/* Get the pte */</div><div class='add'>+	/* concat physical page address(r11) and page offset(r10) */</div><div class='add'>+	rlwimi	r11, r10, 0, 32 - PAGE_SHIFT_8M, 31</div><div class='add'>+	b	201b</div><div class='add'>+</div><div class='add'>+202:</div><div class='add'>+	rlwinm	r11, r11, 0, 0, 32 + PAGE_SHIFT_512K - (PAGE_SHIFT &lt;&lt; 1) - 1</div><div class='add'>+	rlwimi	r11, r10, 32 - (PAGE_SHIFT_512K - 2), 32 + PAGE_SHIFT_512K - (PAGE_SHIFT &lt;&lt; 1), 29</div><div class='add'>+	lwz	r11, 0(r11)	/* Get the pte */</div><div class='add'>+	/* concat physical page address(r11) and page offset(r10) */</div><div class='add'>+	rlwimi	r11, r10, 0, 32 - PAGE_SHIFT_512K, 31</div><div class='add'>+	b	201b</div><div class='add'>+</div><div class='ctx'> 144:	mfspr	r10, SPRN_DSISR</div><div class='ctx'> 	rlwinm	r10, r10,0,7,5	/* Clear store bit for buggy dcbst insn */</div><div class='ctx'> 	mtspr	SPRN_DSISR, r10</div><div class='hunk'>@@ -870,6 +1026,14 @@ initial_mmu:</div><div class='ctx'> 	lis	r8, IDC_ENABLE@h</div><div class='ctx'> 	mtspr	SPRN_DC_CST, r8</div><div class='ctx'> #endif</div><div class='add'>+	/* Disable debug mode entry on breakpoints */</div><div class='add'>+	mfspr	r8, SPRN_DER</div><div class='add'>+#ifdef CONFIG_PPC_8xx_PERF_EVENT</div><div class='add'>+	rlwinm	r8, r8, 0, ~0xc</div><div class='add'>+#else</div><div class='add'>+	rlwinm	r8, r8, 0, ~0x8</div><div class='add'>+#endif</div><div class='add'>+	mtspr	SPRN_DER, r8</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -903,3 +1067,16 @@ cpu6_errata_word:</div><div class='ctx'> 	.space	16</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_8xx_PERF_EVENT</div><div class='add'>+	.globl	itlb_miss_counter</div><div class='add'>+itlb_miss_counter:</div><div class='add'>+	.space	4</div><div class='add'>+</div><div class='add'>+	.globl	dtlb_miss_counter</div><div class='add'>+dtlb_miss_counter:</div><div class='add'>+	.space	4</div><div class='add'>+</div><div class='add'>+	.globl	instruction_counter</div><div class='add'>+instruction_counter:</div><div class='add'>+	.space	4</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c<br/>index 03d089b3ed72..53b9c1dfd7d9 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/hw_breakpoint.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/hw_breakpoint.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/hw_breakpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/hw_breakpoint.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;asm/hw_breakpoint.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/sstep.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Stores the breakpoints currently in use on each breakpoint address</div><div class='hunk'>@@ -211,9 +211,11 @@ int hw_breakpoint_handler(struct die_args *args)</div><div class='ctx'> 	int rc = NOTIFY_STOP;</div><div class='ctx'> 	struct perf_event *bp;</div><div class='ctx'> 	struct pt_regs *regs = args-&gt;regs;</div><div class='add'>+#ifndef CONFIG_PPC_8xx</div><div class='ctx'> 	int stepped = 1;</div><div class='del'>-	struct arch_hw_breakpoint *info;</div><div class='ctx'> 	unsigned int instr;</div><div class='add'>+#endif</div><div class='add'>+	struct arch_hw_breakpoint *info;</div><div class='ctx'> 	unsigned long dar = regs-&gt;dar;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable breakpoints during exception handling */</div><div class='hunk'>@@ -228,8 +230,10 @@ int hw_breakpoint_handler(struct die_args *args)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	bp = __this_cpu_read(bp_per_reg);</div><div class='del'>-	if (!bp)</div><div class='add'>+	if (!bp) {</div><div class='add'>+		rc = NOTIFY_DONE;</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	info = counter_arch_bp(bp);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -255,6 +259,7 @@ int hw_breakpoint_handler(struct die_args *args)</div><div class='ctx'> 	      (dar - bp-&gt;attr.bp_addr &lt; bp-&gt;attr.bp_len)))</div><div class='ctx'> 		info-&gt;type |= HW_BRK_TYPE_EXTRANEOUS_IRQ;</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_PPC_8xx</div><div class='ctx'> 	/* Do not emulate user-space instructions, instead single-step them */</div><div class='ctx'> 	if (user_mode(regs)) {</div><div class='ctx'> 		current-&gt;thread.last_hit_ubp = bp;</div><div class='hunk'>@@ -278,6 +283,7 @@ int hw_breakpoint_handler(struct die_args *args)</div><div class='ctx'> 		perf_event_disable_inatomic(bp);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * As a policy, the callback is invoked in a 'trigger-after-execute'</div><div class='ctx'> 	 * fashion</div><div class='head'>diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c<br/>deleted file mode 100644<br/>index 6ca9a2ffaac7..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/ibmebus.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/ibmebus.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,759 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * IBM PowerPC IBM eBus Infrastructure Support.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2005 IBM Corporation</div><div class='del'>- *  Joachim Fenkes &lt;fenkes@de.ibm.com&gt;</div><div class='del'>- *  Heiko J Schick &lt;schickhj@de.ibm.com&gt;</div><div class='del'>- *</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This source code is distributed under a dual license of GPL v2.0 and OpenIB</div><div class='del'>- * BSD.</div><div class='del'>- *</div><div class='del'>- * OpenIB BSD License</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *</div><div class='del'>- * Redistributions of source code must retain the above copyright notice, this</div><div class='del'>- * list of conditions and the following disclaimer.</div><div class='del'>- *</div><div class='del'>- * Redistributions in binary form must reproduce the above copyright notice,</div><div class='del'>- * this list of conditions and the following disclaimer in the documentation</div><div class='del'>- * and/or other materials</div><div class='del'>- * provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE</div><div class='del'>- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='del'>- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER</div><div class='del'>- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</div><div class='del'>- * POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/kobject.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/stat.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-#include &lt;asm/ibmebus.h&gt;</div><div class='del'>-</div><div class='del'>-static struct device ibmebus_bus_device = { /* fake "parent" device */</div><div class='del'>-	.init_name = "ibmebus",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bus_type ibmebus_bus_type;</div><div class='del'>-</div><div class='del'>-/* These devices will automatically be added to the bus during init */</div><div class='del'>-static const struct of_device_id ibmebus_matches[] __initconst = {</div><div class='del'>-	{ .compatible = "IBM,lhca" },</div><div class='del'>-	{ .compatible = "IBM,lhea" },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void *ibmebus_alloc_coherent(struct device *dev,</div><div class='del'>-				    size_t size,</div><div class='del'>-				    dma_addr_t *dma_handle,</div><div class='del'>-				    gfp_t flag,</div><div class='del'>-				    unsigned long attrs)</div><div class='del'>-{</div><div class='del'>-	void *mem;</div><div class='del'>-</div><div class='del'>-	mem = kmalloc(size, flag);</div><div class='del'>-	*dma_handle = (dma_addr_t)mem;</div><div class='del'>-</div><div class='del'>-	return mem;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ibmebus_free_coherent(struct device *dev,</div><div class='del'>-				  size_t size, void *vaddr,</div><div class='del'>-				  dma_addr_t dma_handle,</div><div class='del'>-				  unsigned long attrs)</div><div class='del'>-{</div><div class='del'>-	kfree(vaddr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static dma_addr_t ibmebus_map_page(struct device *dev,</div><div class='del'>-				   struct page *page,</div><div class='del'>-				   unsigned long offset,</div><div class='del'>-				   size_t size,</div><div class='del'>-				   enum dma_data_direction direction,</div><div class='del'>-				   unsigned long attrs)</div><div class='del'>-{</div><div class='del'>-	return (dma_addr_t)(page_address(page) + offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ibmebus_unmap_page(struct device *dev,</div><div class='del'>-			       dma_addr_t dma_addr,</div><div class='del'>-			       size_t size,</div><div class='del'>-			       enum dma_data_direction direction,</div><div class='del'>-			       unsigned long attrs)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_map_sg(struct device *dev,</div><div class='del'>-			  struct scatterlist *sgl,</div><div class='del'>-			  int nents, enum dma_data_direction direction,</div><div class='del'>-			  unsigned long attrs)</div><div class='del'>-{</div><div class='del'>-	struct scatterlist *sg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for_each_sg(sgl, sg, nents, i) {</div><div class='del'>-		sg-&gt;dma_address = (dma_addr_t) sg_virt(sg);</div><div class='del'>-		sg-&gt;dma_length = sg-&gt;length;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nents;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ibmebus_unmap_sg(struct device *dev,</div><div class='del'>-			     struct scatterlist *sg,</div><div class='del'>-			     int nents, enum dma_data_direction direction,</div><div class='del'>-			     unsigned long attrs)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_dma_supported(struct device *dev, u64 mask)</div><div class='del'>-{</div><div class='del'>-	return mask == DMA_BIT_MASK(64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 ibmebus_dma_get_required_mask(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return DMA_BIT_MASK(64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dma_map_ops ibmebus_dma_ops = {</div><div class='del'>-	.alloc              = ibmebus_alloc_coherent,</div><div class='del'>-	.free               = ibmebus_free_coherent,</div><div class='del'>-	.map_sg             = ibmebus_map_sg,</div><div class='del'>-	.unmap_sg           = ibmebus_unmap_sg,</div><div class='del'>-	.dma_supported      = ibmebus_dma_supported,</div><div class='del'>-	.get_required_mask  = ibmebus_dma_get_required_mask,</div><div class='del'>-	.map_page           = ibmebus_map_page,</div><div class='del'>-	.unmap_page         = ibmebus_unmap_page,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ibmebus_match_path(struct device *dev, void *data)</div><div class='del'>-{</div><div class='del'>-	struct device_node *dn = to_platform_device(dev)-&gt;dev.of_node;</div><div class='del'>-	return (dn-&gt;full_name &amp;&amp;</div><div class='del'>-		(strcasecmp((char *)data, dn-&gt;full_name) == 0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_match_node(struct device *dev, void *data)</div><div class='del'>-{</div><div class='del'>-	return to_platform_device(dev)-&gt;dev.of_node == data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_create_device(struct device_node *dn)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *dev;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dev = of_device_alloc(dn, NULL, &amp;ibmebus_bus_device);</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	dev-&gt;dev.bus = &amp;ibmebus_bus_type;</div><div class='del'>-	dev-&gt;dev.archdata.dma_ops = &amp;ibmebus_dma_ops;</div><div class='del'>-</div><div class='del'>-	ret = of_device_add(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		platform_device_put(dev);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_create_devices(const struct of_device_id *matches)</div><div class='del'>-{</div><div class='del'>-	struct device_node *root, *child;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	root = of_find_node_by_path("/");</div><div class='del'>-</div><div class='del'>-	for_each_child_of_node(root, child) {</div><div class='del'>-		if (!of_match_node(matches, child))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (bus_find_device(&amp;ibmebus_bus_type, NULL, child,</div><div class='del'>-				    ibmebus_match_node))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = ibmebus_create_device(child);</div><div class='del'>-		if (ret) {</div><div class='del'>-			printk(KERN_ERR "%s: failed to create device (%i)",</div><div class='del'>-			       __func__, ret);</div><div class='del'>-			of_node_put(child);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	of_node_put(root);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ibmebus_register_driver(struct platform_driver *drv)</div><div class='del'>-{</div><div class='del'>-	/* If the driver uses devices that ibmebus doesn't know, add them */</div><div class='del'>-	ibmebus_create_devices(drv-&gt;driver.of_match_table);</div><div class='del'>-</div><div class='del'>-	drv-&gt;driver.bus = &amp;ibmebus_bus_type;</div><div class='del'>-	return driver_register(&amp;drv-&gt;driver);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ibmebus_register_driver);</div><div class='del'>-</div><div class='del'>-void ibmebus_unregister_driver(struct platform_driver *drv)</div><div class='del'>-{</div><div class='del'>-	driver_unregister(&amp;drv-&gt;driver);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ibmebus_unregister_driver);</div><div class='del'>-</div><div class='del'>-int ibmebus_request_irq(u32 ist, irq_handler_t handler,</div><div class='del'>-			unsigned long irq_flags, const char *devname,</div><div class='del'>-			void *dev_id)</div><div class='del'>-{</div><div class='del'>-	unsigned int irq = irq_create_mapping(NULL, ist);</div><div class='del'>-</div><div class='del'>-	if (!irq)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return request_irq(irq, handler, irq_flags, devname, dev_id);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ibmebus_request_irq);</div><div class='del'>-</div><div class='del'>-void ibmebus_free_irq(u32 ist, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	unsigned int irq = irq_find_mapping(NULL, ist);</div><div class='del'>-</div><div class='del'>-	free_irq(irq, dev_id);</div><div class='del'>-	irq_dispose_mapping(irq);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ibmebus_free_irq);</div><div class='del'>-</div><div class='del'>-static char *ibmebus_chomp(const char *in, size_t count)</div><div class='del'>-{</div><div class='del'>-	char *out = kmalloc(count + 1, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!out)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	memcpy(out, in, count);</div><div class='del'>-	out[count] = '\0';</div><div class='del'>-	if (out[count - 1] == '\n')</div><div class='del'>-		out[count - 1] = '\0';</div><div class='del'>-</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t ibmebus_store_probe(struct bus_type *bus,</div><div class='del'>-				   const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct device_node *dn = NULL;</div><div class='del'>-	char *path;</div><div class='del'>-	ssize_t rc = 0;</div><div class='del'>-</div><div class='del'>-	path = ibmebus_chomp(buf, count);</div><div class='del'>-	if (!path)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (bus_find_device(&amp;ibmebus_bus_type, NULL, path,</div><div class='del'>-			    ibmebus_match_path)) {</div><div class='del'>-		printk(KERN_WARNING "%s: %s has already been probed\n",</div><div class='del'>-		       __func__, path);</div><div class='del'>-		rc = -EEXIST;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((dn = of_find_node_by_path(path))) {</div><div class='del'>-		rc = ibmebus_create_device(dn);</div><div class='del'>-		of_node_put(dn);</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_WARNING "%s: no such device node: %s\n",</div><div class='del'>-		       __func__, path);</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree(path);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-static BUS_ATTR(probe, S_IWUSR, NULL, ibmebus_store_probe);</div><div class='del'>-</div><div class='del'>-static ssize_t ibmebus_store_remove(struct bus_type *bus,</div><div class='del'>-				    const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct device *dev;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	path = ibmebus_chomp(buf, count);</div><div class='del'>-	if (!path)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if ((dev = bus_find_device(&amp;ibmebus_bus_type, NULL, path,</div><div class='del'>-				   ibmebus_match_path))) {</div><div class='del'>-		of_device_unregister(to_platform_device(dev));</div><div class='del'>-</div><div class='del'>-		kfree(path);</div><div class='del'>-		return count;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_WARNING "%s: %s not on the bus\n",</div><div class='del'>-		       __func__, path);</div><div class='del'>-</div><div class='del'>-		kfree(path);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-static BUS_ATTR(remove, S_IWUSR, NULL, ibmebus_store_remove);</div><div class='del'>-</div><div class='del'>-static struct attribute *ibmbus_bus_attrs[] = {</div><div class='del'>-	&amp;bus_attr_probe.attr,</div><div class='del'>-	&amp;bus_attr_remove.attr,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-ATTRIBUTE_GROUPS(ibmbus_bus);</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_bus_match(struct device *dev, struct device_driver *drv)</div><div class='del'>-{</div><div class='del'>-	const struct of_device_id *matches = drv-&gt;of_match_table;</div><div class='del'>-</div><div class='del'>-	if (!matches)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return of_match_device(matches, dev) != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_device_probe(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	int error = -ENODEV;</div><div class='del'>-	struct platform_driver *drv;</div><div class='del'>-	struct platform_device *of_dev;</div><div class='del'>-</div><div class='del'>-	drv = to_platform_driver(dev-&gt;driver);</div><div class='del'>-	of_dev = to_platform_device(dev);</div><div class='del'>-</div><div class='del'>-	if (!drv-&gt;probe)</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	of_dev_get(of_dev);</div><div class='del'>-</div><div class='del'>-	if (of_driver_match_device(dev, dev-&gt;driver))</div><div class='del'>-		error = drv-&gt;probe(of_dev);</div><div class='del'>-	if (error)</div><div class='del'>-		of_dev_put(of_dev);</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_device_remove(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *of_dev = to_platform_device(dev);</div><div class='del'>-	struct platform_driver *drv = to_platform_driver(dev-&gt;driver);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;driver &amp;&amp; drv-&gt;remove)</div><div class='del'>-		drv-&gt;remove(of_dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ibmebus_bus_device_shutdown(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *of_dev = to_platform_device(dev);</div><div class='del'>-	struct platform_driver *drv = to_platform_driver(dev-&gt;driver);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;driver &amp;&amp; drv-&gt;shutdown)</div><div class='del'>-		drv-&gt;shutdown(of_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ibmebus_bus_device_attrs</div><div class='del'>- */</div><div class='del'>-static ssize_t devspec_show(struct device *dev,</div><div class='del'>-				struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *ofdev;</div><div class='del'>-</div><div class='del'>-	ofdev = to_platform_device(dev);</div><div class='del'>-	return sprintf(buf, "%s\n", ofdev-&gt;dev.of_node-&gt;full_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t name_show(struct device *dev,</div><div class='del'>-				struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *ofdev;</div><div class='del'>-</div><div class='del'>-	ofdev = to_platform_device(dev);</div><div class='del'>-	return sprintf(buf, "%s\n", ofdev-&gt;dev.of_node-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t modalias_show(struct device *dev,</div><div class='del'>-				struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	ssize_t len = of_device_get_modalias(dev, buf, PAGE_SIZE - 2);</div><div class='del'>-	buf[len] = '\n';</div><div class='del'>-	buf[len+1] = 0;</div><div class='del'>-	return len+1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct device_attribute ibmebus_bus_device_attrs[] = {</div><div class='del'>-	__ATTR_RO(devspec),</div><div class='del'>-	__ATTR_RO(name),</div><div class='del'>-	__ATTR_RO(modalias),</div><div class='del'>-	__ATTR_NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-static int ibmebus_bus_legacy_suspend(struct device *dev, pm_message_t mesg)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *of_dev = to_platform_device(dev);</div><div class='del'>-	struct platform_driver *drv = to_platform_driver(dev-&gt;driver);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;driver &amp;&amp; drv-&gt;suspend)</div><div class='del'>-		ret = drv-&gt;suspend(of_dev, mesg);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_legacy_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *of_dev = to_platform_device(dev);</div><div class='del'>-	struct platform_driver *drv = to_platform_driver(dev-&gt;driver);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;driver &amp;&amp; drv-&gt;resume)</div><div class='del'>-		ret = drv-&gt;resume(of_dev);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_prepare(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (drv &amp;&amp; drv-&gt;pm &amp;&amp; drv-&gt;pm-&gt;prepare)</div><div class='del'>-		ret = drv-&gt;pm-&gt;prepare(dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ibmebus_bus_pm_complete(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-</div><div class='del'>-	if (drv &amp;&amp; drv-&gt;pm &amp;&amp; drv-&gt;pm-&gt;complete)</div><div class='del'>-		drv-&gt;pm-&gt;complete(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SUSPEND</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_suspend(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;suspend)</div><div class='del'>-			ret = drv-&gt;pm-&gt;suspend(dev);</div><div class='del'>-	} else {</div><div class='del'>-		ret = ibmebus_bus_legacy_suspend(dev, PMSG_SUSPEND);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_suspend_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;suspend_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;suspend_noirq(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;resume)</div><div class='del'>-			ret = drv-&gt;pm-&gt;resume(dev);</div><div class='del'>-	} else {</div><div class='del'>-		ret = ibmebus_bus_legacy_resume(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_resume_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;resume_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;resume_noirq(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_SUSPEND */</div><div class='del'>-</div><div class='del'>-#define ibmebus_bus_pm_suspend		NULL</div><div class='del'>-#define ibmebus_bus_pm_resume		NULL</div><div class='del'>-#define ibmebus_bus_pm_suspend_noirq	NULL</div><div class='del'>-#define ibmebus_bus_pm_resume_noirq	NULL</div><div class='del'>-</div><div class='del'>-#endif /* !CONFIG_SUSPEND */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HIBERNATE_CALLBACKS</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_freeze(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;freeze)</div><div class='del'>-			ret = drv-&gt;pm-&gt;freeze(dev);</div><div class='del'>-	} else {</div><div class='del'>-		ret = ibmebus_bus_legacy_suspend(dev, PMSG_FREEZE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_freeze_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;freeze_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;freeze_noirq(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_thaw(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;thaw)</div><div class='del'>-			ret = drv-&gt;pm-&gt;thaw(dev);</div><div class='del'>-	} else {</div><div class='del'>-		ret = ibmebus_bus_legacy_resume(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_thaw_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;thaw_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;thaw_noirq(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_poweroff(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;poweroff)</div><div class='del'>-			ret = drv-&gt;pm-&gt;poweroff(dev);</div><div class='del'>-	} else {</div><div class='del'>-		ret = ibmebus_bus_legacy_suspend(dev, PMSG_HIBERNATE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_poweroff_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;poweroff_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;poweroff_noirq(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_restore(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;restore)</div><div class='del'>-			ret = drv-&gt;pm-&gt;restore(dev);</div><div class='del'>-	} else {</div><div class='del'>-		ret = ibmebus_bus_legacy_resume(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ibmebus_bus_pm_restore_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;restore_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;restore_noirq(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_HIBERNATE_CALLBACKS */</div><div class='del'>-</div><div class='del'>-#define ibmebus_bus_pm_freeze		NULL</div><div class='del'>-#define ibmebus_bus_pm_thaw		NULL</div><div class='del'>-#define ibmebus_bus_pm_poweroff		NULL</div><div class='del'>-#define ibmebus_bus_pm_restore		NULL</div><div class='del'>-#define ibmebus_bus_pm_freeze_noirq	NULL</div><div class='del'>-#define ibmebus_bus_pm_thaw_noirq		NULL</div><div class='del'>-#define ibmebus_bus_pm_poweroff_noirq	NULL</div><div class='del'>-#define ibmebus_bus_pm_restore_noirq	NULL</div><div class='del'>-</div><div class='del'>-#endif /* !CONFIG_HIBERNATE_CALLBACKS */</div><div class='del'>-</div><div class='del'>-static struct dev_pm_ops ibmebus_bus_dev_pm_ops = {</div><div class='del'>-	.prepare = ibmebus_bus_pm_prepare,</div><div class='del'>-	.complete = ibmebus_bus_pm_complete,</div><div class='del'>-	.suspend = ibmebus_bus_pm_suspend,</div><div class='del'>-	.resume = ibmebus_bus_pm_resume,</div><div class='del'>-	.freeze = ibmebus_bus_pm_freeze,</div><div class='del'>-	.thaw = ibmebus_bus_pm_thaw,</div><div class='del'>-	.poweroff = ibmebus_bus_pm_poweroff,</div><div class='del'>-	.restore = ibmebus_bus_pm_restore,</div><div class='del'>-	.suspend_noirq = ibmebus_bus_pm_suspend_noirq,</div><div class='del'>-	.resume_noirq = ibmebus_bus_pm_resume_noirq,</div><div class='del'>-	.freeze_noirq = ibmebus_bus_pm_freeze_noirq,</div><div class='del'>-	.thaw_noirq = ibmebus_bus_pm_thaw_noirq,</div><div class='del'>-	.poweroff_noirq = ibmebus_bus_pm_poweroff_noirq,</div><div class='del'>-	.restore_noirq = ibmebus_bus_pm_restore_noirq,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IBMEBUS_BUS_PM_OPS_PTR	(&amp;ibmebus_bus_dev_pm_ops)</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_PM_SLEEP */</div><div class='del'>-</div><div class='del'>-#define IBMEBUS_BUS_PM_OPS_PTR	NULL</div><div class='del'>-</div><div class='del'>-#endif /* !CONFIG_PM_SLEEP */</div><div class='del'>-</div><div class='del'>-struct bus_type ibmebus_bus_type = {</div><div class='del'>-	.name      = "ibmebus",</div><div class='del'>-	.uevent    = of_device_uevent_modalias,</div><div class='del'>-	.bus_groups = ibmbus_bus_groups,</div><div class='del'>-	.match     = ibmebus_bus_bus_match,</div><div class='del'>-	.probe     = ibmebus_bus_device_probe,</div><div class='del'>-	.remove    = ibmebus_bus_device_remove,</div><div class='del'>-	.shutdown  = ibmebus_bus_device_shutdown,</div><div class='del'>-	.dev_attrs = ibmebus_bus_device_attrs,</div><div class='del'>-	.pm        = IBMEBUS_BUS_PM_OPS_PTR,</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(ibmebus_bus_type);</div><div class='del'>-</div><div class='del'>-static int __init ibmebus_bus_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "IBM eBus Device Driver\n");</div><div class='del'>-</div><div class='del'>-	err = bus_register(&amp;ibmebus_bus_type);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: failed to register IBM eBus.\n",</div><div class='del'>-		       __func__);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = device_register(&amp;ibmebus_bus_device);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_WARNING "%s: device_register returned %i\n",</div><div class='del'>-		       __func__, err);</div><div class='del'>-		bus_unregister(&amp;ibmebus_bus_type);</div><div class='del'>-</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = ibmebus_create_devices(ibmebus_matches);</div><div class='del'>-	if (err) {</div><div class='del'>-		device_unregister(&amp;ibmebus_bus_device);</div><div class='del'>-		bus_unregister(&amp;ibmebus_bus_type);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-postcore_initcall(ibmebus_bus_init);</div><div class='head'>diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S<br/>index 72dac0b58061..5f61cc0349c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/idle_book3s.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/idle_book3s.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/idle_book3s.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/idle_book3s.S</a></div><div class='hunk'>@@ -40,9 +40,7 @@</div><div class='ctx'> #define _WORC	GPR11</div><div class='ctx'> #define _PTCR	GPR12</div><div class='ctx'> </div><div class='del'>-#define PSSCR_HV_TEMPLATE	PSSCR_ESL | PSSCR_EC | \</div><div class='del'>-				PSSCR_PSLL_MASK | PSSCR_TR_MASK | \</div><div class='del'>-				PSSCR_MTL_MASK</div><div class='add'>+#define PSSCR_EC_ESL_MASK_SHIFTED          (PSSCR_EC | PSSCR_ESL) &gt;&gt; 16</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> </div><div class='hunk'>@@ -205,7 +203,7 @@ pnv_enter_arch207_idle_mode:</div><div class='ctx'> 	stb	r3,PACA_THREAD_IDLE_STATE(r13)</div><div class='ctx'> 	cmpwi	cr3,r3,PNV_THREAD_SLEEP</div><div class='ctx'> 	bge	cr3,2f</div><div class='del'>-	IDLE_STATE_ENTER_SEQ(PPC_NAP)</div><div class='add'>+	IDLE_STATE_ENTER_SEQ_NORET(PPC_NAP)</div><div class='ctx'> 	/* No return */</div><div class='ctx'> 2:</div><div class='ctx'> 	/* Sleep or winkle */</div><div class='hunk'>@@ -239,7 +237,7 @@ pnv_fastsleep_workaround_at_entry:</div><div class='ctx'> </div><div class='ctx'> common_enter: /* common code for all the threads entering sleep or winkle */</div><div class='ctx'> 	bgt	cr3,enter_winkle</div><div class='del'>-	IDLE_STATE_ENTER_SEQ(PPC_SLEEP)</div><div class='add'>+	IDLE_STATE_ENTER_SEQ_NORET(PPC_SLEEP)</div><div class='ctx'> </div><div class='ctx'> fastsleep_workaround_at_entry:</div><div class='ctx'> 	ori	r15,r15,PNV_CORE_IDLE_LOCK_BIT</div><div class='hunk'>@@ -250,7 +248,7 @@ fastsleep_workaround_at_entry:</div><div class='ctx'> 	/* Fast sleep workaround */</div><div class='ctx'> 	li	r3,1</div><div class='ctx'> 	li	r4,1</div><div class='del'>-	bl	opal_rm_config_cpu_idle_state</div><div class='add'>+	bl	opal_config_cpu_idle_state</div><div class='ctx'> </div><div class='ctx'> 	/* Clear Lock bit */</div><div class='ctx'> 	li	r0,0</div><div class='hunk'>@@ -261,10 +259,10 @@ fastsleep_workaround_at_entry:</div><div class='ctx'> enter_winkle:</div><div class='ctx'> 	bl	save_sprs_to_stack</div><div class='ctx'> </div><div class='del'>-	IDLE_STATE_ENTER_SEQ(PPC_WINKLE)</div><div class='add'>+	IDLE_STATE_ENTER_SEQ_NORET(PPC_WINKLE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * r3 - requested stop state</div><div class='add'>+ * r3 - PSSCR value corresponding to the requested stop state.</div><div class='ctx'>  */</div><div class='ctx'> power_enter_stop:</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE</div><div class='hunk'>@@ -274,13 +272,22 @@ power_enter_stop:</div><div class='ctx'> 	stb	r4,HSTATE_HWTHREAD_STATE(r13)</div><div class='ctx'> #endif</div><div class='ctx'> /*</div><div class='add'>+ * Check if we are executing the lite variant with ESL=EC=0</div><div class='add'>+ */</div><div class='add'>+	andis.   r4,r3,PSSCR_EC_ESL_MASK_SHIFTED</div><div class='add'>+	clrldi   r3,r3,60 /* r3 = Bits[60:63] = Requested Level (RL) */</div><div class='add'>+	bne	 1f</div><div class='add'>+	IDLE_STATE_ENTER_SEQ(PPC_STOP)</div><div class='add'>+	li	r3,0  /* Since we didn't lose state, return 0 */</div><div class='add'>+	b 	pnv_wakeup_noloss</div><div class='add'>+/*</div><div class='ctx'>  * Check if the requested state is a deep idle state.</div><div class='ctx'>  */</div><div class='del'>-	LOAD_REG_ADDRBASE(r5,pnv_first_deep_stop_state)</div><div class='add'>+1:	LOAD_REG_ADDRBASE(r5,pnv_first_deep_stop_state)</div><div class='ctx'> 	ld	r4,ADDROFF(pnv_first_deep_stop_state)(r5)</div><div class='ctx'> 	cmpd	r3,r4</div><div class='ctx'> 	bge	2f</div><div class='del'>-	IDLE_STATE_ENTER_SEQ(PPC_STOP)</div><div class='add'>+	IDLE_STATE_ENTER_SEQ_NORET(PPC_STOP)</div><div class='ctx'> 2:</div><div class='ctx'> /*</div><div class='ctx'>  * Entering deep idle state.</div><div class='hunk'>@@ -302,7 +309,7 @@ lwarx_loop_stop:</div><div class='ctx'> </div><div class='ctx'> 	bl	save_sprs_to_stack</div><div class='ctx'> </div><div class='del'>-	IDLE_STATE_ENTER_SEQ(PPC_STOP)</div><div class='add'>+	IDLE_STATE_ENTER_SEQ_NORET(PPC_STOP)</div><div class='ctx'> </div><div class='ctx'> _GLOBAL(power7_idle)</div><div class='ctx'> 	/* Now check if user or arch enabled NAP mode */</div><div class='hunk'>@@ -353,16 +360,17 @@ ALT_FTR_SECTION_END_NESTED_IFSET(CPU_FTR_ARCH_207S, 66);		\</div><div class='ctx'> 	ld	r3,ORIG_GPR3(r1);	/* Restore original r3 */	\</div><div class='ctx'> 20:	nop;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * r3 - requested stop state</div><div class='add'>+ * r3 - The PSSCR value corresponding to the stop state.</div><div class='add'>+ * r4 - The PSSCR mask corrresonding to the stop state.</div><div class='ctx'>  */</div><div class='ctx'> _GLOBAL(power9_idle_stop)</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4, PSSCR_HV_TEMPLATE)</div><div class='del'>-	or	r4,r4,r3</div><div class='del'>-	mtspr	SPRN_PSSCR, r4</div><div class='del'>-	li	r4, 1</div><div class='add'>+	mfspr   r5,SPRN_PSSCR</div><div class='add'>+	andc    r5,r5,r4</div><div class='add'>+	or      r3,r3,r5</div><div class='add'>+	mtspr 	SPRN_PSSCR,r3</div><div class='ctx'> 	LOAD_REG_ADDR(r5,power_enter_stop)</div><div class='add'>+	li	r4,1</div><div class='ctx'> 	b	pnv_powersave_common</div><div class='ctx'> 	/* No return */</div><div class='ctx'> /*</div><div class='hunk'>@@ -544,7 +552,7 @@ timebase_resync:</div><div class='ctx'> 	 */</div><div class='ctx'> 	ble	cr3,clear_lock</div><div class='ctx'> 	/* Time base re-sync */</div><div class='del'>-	bl	opal_rm_resync_timebase;</div><div class='add'>+	bl	opal_resync_timebase;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If waking up from sleep, per core state is not lost, skip to</div><div class='ctx'> 	 * clear_lock.</div><div class='hunk'>@@ -633,7 +641,7 @@ hypervisor_state_restored:</div><div class='ctx'> fastsleep_workaround_at_exit:</div><div class='ctx'> 	li	r3,1</div><div class='ctx'> 	li	r4,0</div><div class='del'>-	bl	opal_rm_config_cpu_idle_state</div><div class='add'>+	bl	opal_config_cpu_idle_state</div><div class='ctx'> 	b	timebase_resync</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/powerpc/kernel/ima_kexec.c b/arch/powerpc/kernel/ima_kexec.c<br/>new file mode 100644<br/>index 000000000000..5ea42c937ca9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/ima_kexec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/ima_kexec.c</a></div><div class='hunk'>@@ -0,0 +1,223 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ * Thiago Jung Bauermann &lt;bauerman@linux.vnet.ibm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='add'>+#include &lt;linux/libfdt.h&gt;</div><div class='add'>+</div><div class='add'>+static int get_addr_size_cells(int *addr_cells, int *size_cells)</div><div class='add'>+{</div><div class='add'>+	struct device_node *root;</div><div class='add'>+</div><div class='add'>+	root = of_find_node_by_path("/");</div><div class='add'>+	if (!root)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*addr_cells = of_n_addr_cells(root);</div><div class='add'>+	*size_cells = of_n_size_cells(root);</div><div class='add'>+</div><div class='add'>+	of_node_put(root);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_get_kexec_buffer(const void *prop, int len, unsigned long *addr,</div><div class='add'>+			       size_t *size)</div><div class='add'>+{</div><div class='add'>+	int ret, addr_cells, size_cells;</div><div class='add'>+</div><div class='add'>+	ret = get_addr_size_cells(&amp;addr_cells, &amp;size_cells);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (len &lt; 4 * (addr_cells + size_cells))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	*addr = of_read_number(prop, addr_cells);</div><div class='add'>+	*size = of_read_number(prop + 4 * addr_cells, size_cells);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ima_get_kexec_buffer - get IMA buffer from the previous kernel</div><div class='add'>+ * @addr:	On successful return, set to point to the buffer contents.</div><div class='add'>+ * @size:	On successful return, set to the buffer size.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative errno on error.</div><div class='add'>+ */</div><div class='add'>+int ima_get_kexec_buffer(void **addr, size_t *size)</div><div class='add'>+{</div><div class='add'>+	int ret, len;</div><div class='add'>+	unsigned long tmp_addr;</div><div class='add'>+	size_t tmp_size;</div><div class='add'>+	const void *prop;</div><div class='add'>+</div><div class='add'>+	prop = of_get_property(of_chosen, "linux,ima-kexec-buffer", &amp;len);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ret = do_get_kexec_buffer(prop, len, &amp;tmp_addr, &amp;tmp_size);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*addr = __va(tmp_addr);</div><div class='add'>+	*size = tmp_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ima_free_kexec_buffer - free memory used by the IMA buffer</div><div class='add'>+ */</div><div class='add'>+int ima_free_kexec_buffer(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	size_t size;</div><div class='add'>+	struct property *prop;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(of_chosen, "linux,ima-kexec-buffer", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ret = do_get_kexec_buffer(prop-&gt;value, prop-&gt;length, &amp;addr, &amp;size);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = of_remove_property(of_chosen, prop);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return memblock_free(addr, size);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * remove_ima_buffer - remove the IMA buffer property and reservation from @fdt</div><div class='add'>+ *</div><div class='add'>+ * The IMA measurement buffer is of no use to a subsequent kernel, so we always</div><div class='add'>+ * remove it from the device tree.</div><div class='add'>+ */</div><div class='add'>+void remove_ima_buffer(void *fdt, int chosen_node)</div><div class='add'>+{</div><div class='add'>+	int ret, len;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	size_t size;</div><div class='add'>+	const void *prop;</div><div class='add'>+</div><div class='add'>+	prop = fdt_getprop(fdt, chosen_node, "linux,ima-kexec-buffer", &amp;len);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = do_get_kexec_buffer(prop, len, &amp;addr, &amp;size);</div><div class='add'>+	fdt_delprop(fdt, chosen_node, "linux,ima-kexec-buffer");</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = delete_fdt_mem_rsv(fdt, addr, size);</div><div class='add'>+	if (!ret)</div><div class='add'>+		pr_debug("Removed old IMA buffer reservation.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IMA_KEXEC</div><div class='add'>+/**</div><div class='add'>+ * arch_ima_add_kexec_buffer - do arch-specific steps to add the IMA buffer</div><div class='add'>+ *</div><div class='add'>+ * Architectures should use this function to pass on the IMA buffer</div><div class='add'>+ * information to the next kernel.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative errno on error.</div><div class='add'>+ */</div><div class='add'>+int arch_ima_add_kexec_buffer(struct kimage *image, unsigned long load_addr,</div><div class='add'>+			      size_t size)</div><div class='add'>+{</div><div class='add'>+	image-&gt;arch.ima_buffer_addr = load_addr;</div><div class='add'>+	image-&gt;arch.ima_buffer_size = size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_number(void *p, u64 value, int cells)</div><div class='add'>+{</div><div class='add'>+	if (cells == 1) {</div><div class='add'>+		u32 tmp;</div><div class='add'>+</div><div class='add'>+		if (value &gt; U32_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		tmp = cpu_to_be32(value);</div><div class='add'>+		memcpy(p, &amp;tmp, sizeof(tmp));</div><div class='add'>+	} else if (cells == 2) {</div><div class='add'>+		u64 tmp;</div><div class='add'>+</div><div class='add'>+		tmp = cpu_to_be64(value);</div><div class='add'>+		memcpy(p, &amp;tmp, sizeof(tmp));</div><div class='add'>+	} else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * setup_ima_buffer - add IMA buffer information to the fdt</div><div class='add'>+ * @image:		kexec image being loaded.</div><div class='add'>+ * @fdt:		Flattened device tree for the next kernel.</div><div class='add'>+ * @chosen_node:	Offset to the chosen node.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or negative errno on error.</div><div class='add'>+ */</div><div class='add'>+int setup_ima_buffer(const struct kimage *image, void *fdt, int chosen_node)</div><div class='add'>+{</div><div class='add'>+	int ret, addr_cells, size_cells, entry_size;</div><div class='add'>+	u8 value[16];</div><div class='add'>+</div><div class='add'>+	remove_ima_buffer(fdt, chosen_node);</div><div class='add'>+	if (!image-&gt;arch.ima_buffer_size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = get_addr_size_cells(&amp;addr_cells, &amp;size_cells);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	entry_size = 4 * (addr_cells + size_cells);</div><div class='add'>+</div><div class='add'>+	if (entry_size &gt; sizeof(value))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = write_number(value, image-&gt;arch.ima_buffer_addr, addr_cells);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = write_number(value + 4 * addr_cells, image-&gt;arch.ima_buffer_size,</div><div class='add'>+			   size_cells);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = fdt_setprop(fdt, chosen_node, "linux,ima-kexec-buffer", value,</div><div class='add'>+			  entry_size);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = fdt_add_mem_rsv(fdt, image-&gt;arch.ima_buffer_addr,</div><div class='add'>+			      image-&gt;arch.ima_buffer_size);</div><div class='add'>+	if (ret)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pr_debug("IMA buffer at 0x%llx, size = 0x%zx\n",</div><div class='add'>+		 image-&gt;arch.ima_buffer_addr, image-&gt;arch.ima_buffer_size);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_IMA_KEXEC */</div><div class='head'>diff --git a/arch/powerpc/kernel/io-workarounds.c b/arch/powerpc/kernel/io-workarounds.c<br/>index 5f8613ceb97f..a582e0d42525 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/io-workarounds.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/io-workarounds.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/io-workarounds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/io-workarounds.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;	/* for init_mm */</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;	/* for init_mm */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c<br/>index 3963f0b68d52..a1854d1ded8b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/iomap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/iomap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/iomap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/iomap.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;asm/isa-bridge.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Here comes the ppc64 implementation of the IOMAP </div><div class='head'>diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c<br/>index 3c05c311e35e..a018f5cae899 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/irq.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/isa-bridge.c b/arch/powerpc/kernel/isa-bridge.c<br/>index ae1316106e2b..bb6f8993412e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/isa-bridge.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/isa-bridge.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/isa-bridge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/isa-bridge.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='add'>+#include &lt;asm/isa-bridge.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long isa_io_base;	/* NULL if no ISA bus */</div><div class='ctx'> EXPORT_SYMBOL(isa_io_base);</div><div class='hunk'>@@ -167,6 +168,97 @@ void __init isa_bridge_find_early(struct pci_controller *hose)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * isa_bridge_find_early - Find and map the ISA IO space early before</div><div class='add'>+ *                         main PCI discovery. This is optionally called by</div><div class='add'>+ *                         the arch code when adding PCI PHBs to get early</div><div class='add'>+ *                         access to ISA IO ports</div><div class='add'>+ */</div><div class='add'>+void __init isa_bridge_init_non_pci(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	const __be32 *ranges, *pbasep = NULL;</div><div class='add'>+	int rlen, i, rs;</div><div class='add'>+	u32 na, ns, pna;</div><div class='add'>+	u64 cbase, pbase, size = 0;</div><div class='add'>+</div><div class='add'>+	/* If we already have an ISA bridge, bail off */</div><div class='add'>+	if (isa_bridge_devnode != NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pna = of_n_addr_cells(np);</div><div class='add'>+	if (of_property_read_u32(np, "#address-cells", &amp;na) ||</div><div class='add'>+	    of_property_read_u32(np, "#size-cells", &amp;ns)) {</div><div class='add'>+		pr_warn("ISA: Non-PCI bridge %s is missing address format\n",</div><div class='add'>+			np-&gt;full_name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check it's a supported address format */</div><div class='add'>+	if (na != 2 || ns != 1) {</div><div class='add'>+		pr_warn("ISA: Non-PCI bridge %s has unsupported address format\n",</div><div class='add'>+			np-&gt;full_name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	rs = na + ns + pna;</div><div class='add'>+</div><div class='add'>+	/* Grab the ranges property */</div><div class='add'>+	ranges = of_get_property(np, "ranges", &amp;rlen);</div><div class='add'>+	if (ranges == NULL || rlen &lt; rs) {</div><div class='add'>+		pr_warn("ISA: Non-PCI bridge %s has absent or invalid ranges\n",</div><div class='add'>+			np-&gt;full_name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Parse it. We are only looking for IO space */</div><div class='add'>+	for (i = 0; (i + rs - 1) &lt; rlen; i += rs) {</div><div class='add'>+		if (be32_to_cpup(ranges + i) != 1)</div><div class='add'>+			continue;</div><div class='add'>+		cbase = be32_to_cpup(ranges + i + 1);</div><div class='add'>+		size = of_read_number(ranges + i + na + pna, ns);</div><div class='add'>+		pbasep = ranges + i + na;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Got something ? */</div><div class='add'>+	if (!size || !pbasep) {</div><div class='add'>+		pr_warn("ISA: Non-PCI bridge %s has no usable IO range\n",</div><div class='add'>+			np-&gt;full_name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Align size and make sure it's cropped to 64K */</div><div class='add'>+	size = PAGE_ALIGN(size);</div><div class='add'>+	if (size &gt; 0x10000)</div><div class='add'>+		size = 0x10000;</div><div class='add'>+</div><div class='add'>+	/* Map pbase */</div><div class='add'>+	pbase = of_translate_address(np, pbasep);</div><div class='add'>+	if (pbase == OF_BAD_ADDR) {</div><div class='add'>+		pr_warn("ISA: Non-PCI bridge %s failed to translate IO base\n",</div><div class='add'>+			np-&gt;full_name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We need page alignment */</div><div class='add'>+	if ((cbase &amp; ~PAGE_MASK) || (pbase &amp; ~PAGE_MASK)) {</div><div class='add'>+		pr_warn("ISA: Non-PCI bridge %s has non aligned IO range\n",</div><div class='add'>+			np-&gt;full_name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Got it */</div><div class='add'>+	isa_bridge_devnode = np;</div><div class='add'>+</div><div class='add'>+	/* Set the global ISA io base to indicate we have an ISA bridge</div><div class='add'>+	 * and map it</div><div class='add'>+	 */</div><div class='add'>+	isa_io_base = ISA_IO_BASE;</div><div class='add'>+	__ioremap_at(pbase, (void *)ISA_IO_BASE,</div><div class='add'>+		     size, pgprot_val(pgprot_noncached(__pgprot(0))));</div><div class='add'>+</div><div class='add'>+	pr_debug("ISA: Non-PCI bridge is %s\n", np-&gt;full_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * isa_bridge_find_late - Find and map the ISA IO space upon discovery of</div><div class='ctx'>  *                        a new ISA bridge</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/powerpc/kernel/kexec_elf_64.c b/arch/powerpc/kernel/kexec_elf_64.c<br/>new file mode 100644<br/>index 000000000000..9a42309b091a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/kexec_elf_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/kexec_elf_64.c</a></div><div class='hunk'>@@ -0,0 +1,663 @@</div><div class='add'>+/*</div><div class='add'>+ * Load ELF vmlinux file for the kexec_file_load syscall.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2004  Adam Litke (agl@us.ibm.com)</div><div class='add'>+ * Copyright (C) 2004  IBM Corp.</div><div class='add'>+ * Copyright (C) 2005  R Sharada (sharada@in.ibm.com)</div><div class='add'>+ * Copyright (C) 2006  Mohan Kumar M (mohan@in.ibm.com)</div><div class='add'>+ * Copyright (C) 2016  IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * Based on kexec-tools' kexec-elf-exec.c and kexec-elf-ppc64.c.</div><div class='add'>+ * Heavily modified for the kernel by</div><div class='add'>+ * Thiago Jung Bauermann &lt;bauerman@linux.vnet.ibm.com&gt;.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation (version 2 of the License).</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt)	"kexec_elf: " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/elf.h&gt;</div><div class='add'>+#include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/libfdt.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of_fdt.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define PURGATORY_STACK_SIZE	(16 * 1024)</div><div class='add'>+</div><div class='add'>+#define elf_addr_to_cpu	elf64_to_cpu</div><div class='add'>+</div><div class='add'>+#ifndef Elf_Rel</div><div class='add'>+#define Elf_Rel		Elf64_Rel</div><div class='add'>+#endif /* Elf_Rel */</div><div class='add'>+</div><div class='add'>+struct elf_info {</div><div class='add'>+	/*</div><div class='add'>+	 * Where the ELF binary contents are kept.</div><div class='add'>+	 * Memory managed by the user of the struct.</div><div class='add'>+	 */</div><div class='add'>+	const char *buffer;</div><div class='add'>+</div><div class='add'>+	const struct elfhdr *ehdr;</div><div class='add'>+	const struct elf_phdr *proghdrs;</div><div class='add'>+	struct elf_shdr *sechdrs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool elf_is_elf_file(const struct elfhdr *ehdr)</div><div class='add'>+{</div><div class='add'>+       return memcmp(ehdr-&gt;e_ident, ELFMAG, SELFMAG) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint64_t elf64_to_cpu(const struct elfhdr *ehdr, uint64_t value)</div><div class='add'>+{</div><div class='add'>+	if (ehdr-&gt;e_ident[EI_DATA] == ELFDATA2LSB)</div><div class='add'>+		value = le64_to_cpu(value);</div><div class='add'>+	else if (ehdr-&gt;e_ident[EI_DATA] == ELFDATA2MSB)</div><div class='add'>+		value = be64_to_cpu(value);</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint16_t elf16_to_cpu(const struct elfhdr *ehdr, uint16_t value)</div><div class='add'>+{</div><div class='add'>+	if (ehdr-&gt;e_ident[EI_DATA] == ELFDATA2LSB)</div><div class='add'>+		value = le16_to_cpu(value);</div><div class='add'>+	else if (ehdr-&gt;e_ident[EI_DATA] == ELFDATA2MSB)</div><div class='add'>+		value = be16_to_cpu(value);</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint32_t elf32_to_cpu(const struct elfhdr *ehdr, uint32_t value)</div><div class='add'>+{</div><div class='add'>+	if (ehdr-&gt;e_ident[EI_DATA] == ELFDATA2LSB)</div><div class='add'>+		value = le32_to_cpu(value);</div><div class='add'>+	else if (ehdr-&gt;e_ident[EI_DATA] == ELFDATA2MSB)</div><div class='add'>+		value = be32_to_cpu(value);</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * elf_is_ehdr_sane - check that it is safe to use the ELF header</div><div class='add'>+ * @buf_len:	size of the buffer in which the ELF file is loaded.</div><div class='add'>+ */</div><div class='add'>+static bool elf_is_ehdr_sane(const struct elfhdr *ehdr, size_t buf_len)</div><div class='add'>+{</div><div class='add'>+	if (ehdr-&gt;e_phnum &gt; 0 &amp;&amp; ehdr-&gt;e_phentsize != sizeof(struct elf_phdr)) {</div><div class='add'>+		pr_debug("Bad program header size.\n");</div><div class='add'>+		return false;</div><div class='add'>+	} else if (ehdr-&gt;e_shnum &gt; 0 &amp;&amp;</div><div class='add'>+		   ehdr-&gt;e_shentsize != sizeof(struct elf_shdr)) {</div><div class='add'>+		pr_debug("Bad section header size.\n");</div><div class='add'>+		return false;</div><div class='add'>+	} else if (ehdr-&gt;e_ident[EI_VERSION] != EV_CURRENT ||</div><div class='add'>+		   ehdr-&gt;e_version != EV_CURRENT) {</div><div class='add'>+		pr_debug("Unknown ELF version.\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ehdr-&gt;e_phoff &gt; 0 &amp;&amp; ehdr-&gt;e_phnum &gt; 0) {</div><div class='add'>+		size_t phdr_size;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * e_phnum is at most 65535 so calculating the size of the</div><div class='add'>+		 * program header cannot overflow.</div><div class='add'>+		 */</div><div class='add'>+		phdr_size = sizeof(struct elf_phdr) * ehdr-&gt;e_phnum;</div><div class='add'>+</div><div class='add'>+		/* Sanity check the program header table location. */</div><div class='add'>+		if (ehdr-&gt;e_phoff + phdr_size &lt; ehdr-&gt;e_phoff) {</div><div class='add'>+			pr_debug("Program headers at invalid location.\n");</div><div class='add'>+			return false;</div><div class='add'>+		} else if (ehdr-&gt;e_phoff + phdr_size &gt; buf_len) {</div><div class='add'>+			pr_debug("Program headers truncated.\n");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ehdr-&gt;e_shoff &gt; 0 &amp;&amp; ehdr-&gt;e_shnum &gt; 0) {</div><div class='add'>+		size_t shdr_size;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * e_shnum is at most 65536 so calculating</div><div class='add'>+		 * the size of the section header cannot overflow.</div><div class='add'>+		 */</div><div class='add'>+		shdr_size = sizeof(struct elf_shdr) * ehdr-&gt;e_shnum;</div><div class='add'>+</div><div class='add'>+		/* Sanity check the section header table location. */</div><div class='add'>+		if (ehdr-&gt;e_shoff + shdr_size &lt; ehdr-&gt;e_shoff) {</div><div class='add'>+			pr_debug("Section headers at invalid location.\n");</div><div class='add'>+			return false;</div><div class='add'>+		} else if (ehdr-&gt;e_shoff + shdr_size &gt; buf_len) {</div><div class='add'>+			pr_debug("Section headers truncated.\n");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int elf_read_ehdr(const char *buf, size_t len, struct elfhdr *ehdr)</div><div class='add'>+{</div><div class='add'>+	struct elfhdr *buf_ehdr;</div><div class='add'>+</div><div class='add'>+	if (len &lt; sizeof(*buf_ehdr)) {</div><div class='add'>+		pr_debug("Buffer is too small to hold ELF header.\n");</div><div class='add'>+		return -ENOEXEC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(ehdr, 0, sizeof(*ehdr));</div><div class='add'>+	memcpy(ehdr-&gt;e_ident, buf, sizeof(ehdr-&gt;e_ident));</div><div class='add'>+	if (!elf_is_elf_file(ehdr)) {</div><div class='add'>+		pr_debug("No ELF header magic.\n");</div><div class='add'>+		return -ENOEXEC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ehdr-&gt;e_ident[EI_CLASS] != ELF_CLASS) {</div><div class='add'>+		pr_debug("Not a supported ELF class.\n");</div><div class='add'>+		return -ENOEXEC;</div><div class='add'>+	} else  if (ehdr-&gt;e_ident[EI_DATA] != ELFDATA2LSB &amp;&amp;</div><div class='add'>+		ehdr-&gt;e_ident[EI_DATA] != ELFDATA2MSB) {</div><div class='add'>+		pr_debug("Not a supported ELF data format.\n");</div><div class='add'>+		return -ENOEXEC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf_ehdr = (struct elfhdr *) buf;</div><div class='add'>+	if (elf16_to_cpu(ehdr, buf_ehdr-&gt;e_ehsize) != sizeof(*buf_ehdr)) {</div><div class='add'>+		pr_debug("Bad ELF header size.\n");</div><div class='add'>+		return -ENOEXEC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ehdr-&gt;e_type      = elf16_to_cpu(ehdr, buf_ehdr-&gt;e_type);</div><div class='add'>+	ehdr-&gt;e_machine   = elf16_to_cpu(ehdr, buf_ehdr-&gt;e_machine);</div><div class='add'>+	ehdr-&gt;e_version   = elf32_to_cpu(ehdr, buf_ehdr-&gt;e_version);</div><div class='add'>+	ehdr-&gt;e_entry     = elf_addr_to_cpu(ehdr, buf_ehdr-&gt;e_entry);</div><div class='add'>+	ehdr-&gt;e_phoff     = elf_addr_to_cpu(ehdr, buf_ehdr-&gt;e_phoff);</div><div class='add'>+	ehdr-&gt;e_shoff     = elf_addr_to_cpu(ehdr, buf_ehdr-&gt;e_shoff);</div><div class='add'>+	ehdr-&gt;e_flags     = elf32_to_cpu(ehdr, buf_ehdr-&gt;e_flags);</div><div class='add'>+	ehdr-&gt;e_phentsize = elf16_to_cpu(ehdr, buf_ehdr-&gt;e_phentsize);</div><div class='add'>+	ehdr-&gt;e_phnum     = elf16_to_cpu(ehdr, buf_ehdr-&gt;e_phnum);</div><div class='add'>+	ehdr-&gt;e_shentsize = elf16_to_cpu(ehdr, buf_ehdr-&gt;e_shentsize);</div><div class='add'>+	ehdr-&gt;e_shnum     = elf16_to_cpu(ehdr, buf_ehdr-&gt;e_shnum);</div><div class='add'>+	ehdr-&gt;e_shstrndx  = elf16_to_cpu(ehdr, buf_ehdr-&gt;e_shstrndx);</div><div class='add'>+</div><div class='add'>+	return elf_is_ehdr_sane(ehdr, len) ? 0 : -ENOEXEC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * elf_is_phdr_sane - check that it is safe to use the program header</div><div class='add'>+ * @buf_len:	size of the buffer in which the ELF file is loaded.</div><div class='add'>+ */</div><div class='add'>+static bool elf_is_phdr_sane(const struct elf_phdr *phdr, size_t buf_len)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (phdr-&gt;p_offset + phdr-&gt;p_filesz &lt; phdr-&gt;p_offset) {</div><div class='add'>+		pr_debug("ELF segment location wraps around.\n");</div><div class='add'>+		return false;</div><div class='add'>+	} else if (phdr-&gt;p_offset + phdr-&gt;p_filesz &gt; buf_len) {</div><div class='add'>+		pr_debug("ELF segment not in file.\n");</div><div class='add'>+		return false;</div><div class='add'>+	} else if (phdr-&gt;p_paddr + phdr-&gt;p_memsz &lt; phdr-&gt;p_paddr) {</div><div class='add'>+		pr_debug("ELF segment address wraps around.\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int elf_read_phdr(const char *buf, size_t len, struct elf_info *elf_info,</div><div class='add'>+			 int idx)</div><div class='add'>+{</div><div class='add'>+	/* Override the const in proghdrs, we are the ones doing the loading. */</div><div class='add'>+	struct elf_phdr *phdr = (struct elf_phdr *) &amp;elf_info-&gt;proghdrs[idx];</div><div class='add'>+	const char *pbuf;</div><div class='add'>+	struct elf_phdr *buf_phdr;</div><div class='add'>+</div><div class='add'>+	pbuf = buf + elf_info-&gt;ehdr-&gt;e_phoff + (idx * sizeof(*buf_phdr));</div><div class='add'>+	buf_phdr = (struct elf_phdr *) pbuf;</div><div class='add'>+</div><div class='add'>+	phdr-&gt;p_type   = elf32_to_cpu(elf_info-&gt;ehdr, buf_phdr-&gt;p_type);</div><div class='add'>+	phdr-&gt;p_offset = elf_addr_to_cpu(elf_info-&gt;ehdr, buf_phdr-&gt;p_offset);</div><div class='add'>+	phdr-&gt;p_paddr  = elf_addr_to_cpu(elf_info-&gt;ehdr, buf_phdr-&gt;p_paddr);</div><div class='add'>+	phdr-&gt;p_vaddr  = elf_addr_to_cpu(elf_info-&gt;ehdr, buf_phdr-&gt;p_vaddr);</div><div class='add'>+	phdr-&gt;p_flags  = elf32_to_cpu(elf_info-&gt;ehdr, buf_phdr-&gt;p_flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The following fields have a type equivalent to Elf_Addr</div><div class='add'>+	 * both in 32 bit and 64 bit ELF.</div><div class='add'>+	 */</div><div class='add'>+	phdr-&gt;p_filesz = elf_addr_to_cpu(elf_info-&gt;ehdr, buf_phdr-&gt;p_filesz);</div><div class='add'>+	phdr-&gt;p_memsz  = elf_addr_to_cpu(elf_info-&gt;ehdr, buf_phdr-&gt;p_memsz);</div><div class='add'>+	phdr-&gt;p_align  = elf_addr_to_cpu(elf_info-&gt;ehdr, buf_phdr-&gt;p_align);</div><div class='add'>+</div><div class='add'>+	return elf_is_phdr_sane(phdr, len) ? 0 : -ENOEXEC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * elf_read_phdrs - read the program headers from the buffer</div><div class='add'>+ *</div><div class='add'>+ * This function assumes that the program header table was checked for sanity.</div><div class='add'>+ * Use elf_is_ehdr_sane() if it wasn't.</div><div class='add'>+ */</div><div class='add'>+static int elf_read_phdrs(const char *buf, size_t len,</div><div class='add'>+			  struct elf_info *elf_info)</div><div class='add'>+{</div><div class='add'>+	size_t phdr_size, i;</div><div class='add'>+	const struct elfhdr *ehdr = elf_info-&gt;ehdr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * e_phnum is at most 65535 so calculating the size of the</div><div class='add'>+	 * program header cannot overflow.</div><div class='add'>+	 */</div><div class='add'>+	phdr_size = sizeof(struct elf_phdr) * ehdr-&gt;e_phnum;</div><div class='add'>+</div><div class='add'>+	elf_info-&gt;proghdrs = kzalloc(phdr_size, GFP_KERNEL);</div><div class='add'>+	if (!elf_info-&gt;proghdrs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ehdr-&gt;e_phnum; i++) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = elf_read_phdr(buf, len, elf_info, i);</div><div class='add'>+		if (ret) {</div><div class='add'>+			kfree(elf_info-&gt;proghdrs);</div><div class='add'>+			elf_info-&gt;proghdrs = NULL;</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * elf_is_shdr_sane - check that it is safe to use the section header</div><div class='add'>+ * @buf_len:	size of the buffer in which the ELF file is loaded.</div><div class='add'>+ */</div><div class='add'>+static bool elf_is_shdr_sane(const struct elf_shdr *shdr, size_t buf_len)</div><div class='add'>+{</div><div class='add'>+	bool size_ok;</div><div class='add'>+</div><div class='add'>+	/* SHT_NULL headers have undefined values, so we can't check them. */</div><div class='add'>+	if (shdr-&gt;sh_type == SHT_NULL)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Now verify sh_entsize */</div><div class='add'>+	switch (shdr-&gt;sh_type) {</div><div class='add'>+	case SHT_SYMTAB:</div><div class='add'>+		size_ok = shdr-&gt;sh_entsize == sizeof(Elf_Sym);</div><div class='add'>+		break;</div><div class='add'>+	case SHT_RELA:</div><div class='add'>+		size_ok = shdr-&gt;sh_entsize == sizeof(Elf_Rela);</div><div class='add'>+		break;</div><div class='add'>+	case SHT_DYNAMIC:</div><div class='add'>+		size_ok = shdr-&gt;sh_entsize == sizeof(Elf_Dyn);</div><div class='add'>+		break;</div><div class='add'>+	case SHT_REL:</div><div class='add'>+		size_ok = shdr-&gt;sh_entsize == sizeof(Elf_Rel);</div><div class='add'>+		break;</div><div class='add'>+	case SHT_NOTE:</div><div class='add'>+	case SHT_PROGBITS:</div><div class='add'>+	case SHT_HASH:</div><div class='add'>+	case SHT_NOBITS:</div><div class='add'>+	default:</div><div class='add'>+		/*</div><div class='add'>+		 * This is a section whose entsize requirements</div><div class='add'>+		 * I don't care about.  If I don't know about</div><div class='add'>+		 * the section I can't care about it's entsize</div><div class='add'>+		 * requirements.</div><div class='add'>+		 */</div><div class='add'>+		size_ok = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!size_ok) {</div><div class='add'>+		pr_debug("ELF section with wrong entry size.\n");</div><div class='add'>+		return false;</div><div class='add'>+	} else if (shdr-&gt;sh_addr + shdr-&gt;sh_size &lt; shdr-&gt;sh_addr) {</div><div class='add'>+		pr_debug("ELF section address wraps around.\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (shdr-&gt;sh_type != SHT_NOBITS) {</div><div class='add'>+		if (shdr-&gt;sh_offset + shdr-&gt;sh_size &lt; shdr-&gt;sh_offset) {</div><div class='add'>+			pr_debug("ELF section location wraps around.\n");</div><div class='add'>+			return false;</div><div class='add'>+		} else if (shdr-&gt;sh_offset + shdr-&gt;sh_size &gt; buf_len) {</div><div class='add'>+			pr_debug("ELF section not in file.\n");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int elf_read_shdr(const char *buf, size_t len, struct elf_info *elf_info,</div><div class='add'>+			 int idx)</div><div class='add'>+{</div><div class='add'>+	struct elf_shdr *shdr = &amp;elf_info-&gt;sechdrs[idx];</div><div class='add'>+	const struct elfhdr *ehdr = elf_info-&gt;ehdr;</div><div class='add'>+	const char *sbuf;</div><div class='add'>+	struct elf_shdr *buf_shdr;</div><div class='add'>+</div><div class='add'>+	sbuf = buf + ehdr-&gt;e_shoff + idx * sizeof(*buf_shdr);</div><div class='add'>+	buf_shdr = (struct elf_shdr *) sbuf;</div><div class='add'>+</div><div class='add'>+	shdr-&gt;sh_name      = elf32_to_cpu(ehdr, buf_shdr-&gt;sh_name);</div><div class='add'>+	shdr-&gt;sh_type      = elf32_to_cpu(ehdr, buf_shdr-&gt;sh_type);</div><div class='add'>+	shdr-&gt;sh_addr      = elf_addr_to_cpu(ehdr, buf_shdr-&gt;sh_addr);</div><div class='add'>+	shdr-&gt;sh_offset    = elf_addr_to_cpu(ehdr, buf_shdr-&gt;sh_offset);</div><div class='add'>+	shdr-&gt;sh_link      = elf32_to_cpu(ehdr, buf_shdr-&gt;sh_link);</div><div class='add'>+	shdr-&gt;sh_info      = elf32_to_cpu(ehdr, buf_shdr-&gt;sh_info);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The following fields have a type equivalent to Elf_Addr</div><div class='add'>+	 * both in 32 bit and 64 bit ELF.</div><div class='add'>+	 */</div><div class='add'>+	shdr-&gt;sh_flags     = elf_addr_to_cpu(ehdr, buf_shdr-&gt;sh_flags);</div><div class='add'>+	shdr-&gt;sh_size      = elf_addr_to_cpu(ehdr, buf_shdr-&gt;sh_size);</div><div class='add'>+	shdr-&gt;sh_addralign = elf_addr_to_cpu(ehdr, buf_shdr-&gt;sh_addralign);</div><div class='add'>+	shdr-&gt;sh_entsize   = elf_addr_to_cpu(ehdr, buf_shdr-&gt;sh_entsize);</div><div class='add'>+</div><div class='add'>+	return elf_is_shdr_sane(shdr, len) ? 0 : -ENOEXEC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * elf_read_shdrs - read the section headers from the buffer</div><div class='add'>+ *</div><div class='add'>+ * This function assumes that the section header table was checked for sanity.</div><div class='add'>+ * Use elf_is_ehdr_sane() if it wasn't.</div><div class='add'>+ */</div><div class='add'>+static int elf_read_shdrs(const char *buf, size_t len,</div><div class='add'>+			  struct elf_info *elf_info)</div><div class='add'>+{</div><div class='add'>+	size_t shdr_size, i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * e_shnum is at most 65536 so calculating</div><div class='add'>+	 * the size of the section header cannot overflow.</div><div class='add'>+	 */</div><div class='add'>+	shdr_size = sizeof(struct elf_shdr) * elf_info-&gt;ehdr-&gt;e_shnum;</div><div class='add'>+</div><div class='add'>+	elf_info-&gt;sechdrs = kzalloc(shdr_size, GFP_KERNEL);</div><div class='add'>+	if (!elf_info-&gt;sechdrs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; elf_info-&gt;ehdr-&gt;e_shnum; i++) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = elf_read_shdr(buf, len, elf_info, i);</div><div class='add'>+		if (ret) {</div><div class='add'>+			kfree(elf_info-&gt;sechdrs);</div><div class='add'>+			elf_info-&gt;sechdrs = NULL;</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * elf_read_from_buffer - read ELF file and sets up ELF header and ELF info</div><div class='add'>+ * @buf:	Buffer to read ELF file from.</div><div class='add'>+ * @len:	Size of @buf.</div><div class='add'>+ * @ehdr:	Pointer to existing struct which will be populated.</div><div class='add'>+ * @elf_info:	Pointer to existing struct which will be populated.</div><div class='add'>+ *</div><div class='add'>+ * This function allows reading ELF files with different byte order than</div><div class='add'>+ * the kernel, byte-swapping the fields as needed.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * On success returns 0, and the caller should call elf_free_info(elf_info) to</div><div class='add'>+ * free the memory allocated for the section and program headers.</div><div class='add'>+ */</div><div class='add'>+int elf_read_from_buffer(const char *buf, size_t len, struct elfhdr *ehdr,</div><div class='add'>+			 struct elf_info *elf_info)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = elf_read_ehdr(buf, len, ehdr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	elf_info-&gt;buffer = buf;</div><div class='add'>+	elf_info-&gt;ehdr = ehdr;</div><div class='add'>+	if (ehdr-&gt;e_phoff &gt; 0 &amp;&amp; ehdr-&gt;e_phnum &gt; 0) {</div><div class='add'>+		ret = elf_read_phdrs(buf, len, elf_info);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	if (ehdr-&gt;e_shoff &gt; 0 &amp;&amp; ehdr-&gt;e_shnum &gt; 0) {</div><div class='add'>+		ret = elf_read_shdrs(buf, len, elf_info);</div><div class='add'>+		if (ret) {</div><div class='add'>+			kfree(elf_info-&gt;proghdrs);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * elf_free_info - free memory allocated by elf_read_from_buffer</div><div class='add'>+ */</div><div class='add'>+void elf_free_info(struct elf_info *elf_info)</div><div class='add'>+{</div><div class='add'>+	kfree(elf_info-&gt;proghdrs);</div><div class='add'>+	kfree(elf_info-&gt;sechdrs);</div><div class='add'>+	memset(elf_info, 0, sizeof(*elf_info));</div><div class='add'>+}</div><div class='add'>+/**</div><div class='add'>+ * build_elf_exec_info - read ELF executable and check that we can use it</div><div class='add'>+ */</div><div class='add'>+static int build_elf_exec_info(const char *buf, size_t len, struct elfhdr *ehdr,</div><div class='add'>+			       struct elf_info *elf_info)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = elf_read_from_buffer(buf, len, ehdr, elf_info);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Big endian vmlinux has type ET_DYN. */</div><div class='add'>+	if (ehdr-&gt;e_type != ET_EXEC &amp;&amp; ehdr-&gt;e_type != ET_DYN) {</div><div class='add'>+		pr_err("Not an ELF executable.\n");</div><div class='add'>+		goto error;</div><div class='add'>+	} else if (!elf_info-&gt;proghdrs) {</div><div class='add'>+		pr_err("No ELF program header.\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ehdr-&gt;e_phnum; i++) {</div><div class='add'>+		/*</div><div class='add'>+		 * Kexec does not support loading interpreters.</div><div class='add'>+		 * In addition this check keeps us from attempting</div><div class='add'>+		 * to kexec ordinay executables.</div><div class='add'>+		 */</div><div class='add'>+		if (elf_info-&gt;proghdrs[i].p_type == PT_INTERP) {</div><div class='add'>+			pr_err("Requires an ELF interpreter.\n");</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	elf_free_info(elf_info);</div><div class='add'>+	return -ENOEXEC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int elf64_probe(const char *buf, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	struct elfhdr ehdr;</div><div class='add'>+	struct elf_info elf_info;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = build_elf_exec_info(buf, len, &amp;ehdr, &amp;elf_info);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	elf_free_info(&amp;elf_info);</div><div class='add'>+</div><div class='add'>+	return elf_check_arch(&amp;ehdr) ? 0 : -ENOEXEC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * elf_exec_load - load ELF executable image</div><div class='add'>+ * @lowest_load_addr:	On return, will be the address where the first PT_LOAD</div><div class='add'>+ *			section will be loaded in memory.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * 0 on success, negative value on failure.</div><div class='add'>+ */</div><div class='add'>+static int elf_exec_load(struct kimage *image, struct elfhdr *ehdr,</div><div class='add'>+			 struct elf_info *elf_info,</div><div class='add'>+			 unsigned long *lowest_load_addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long base = 0, lowest_addr = UINT_MAX;</div><div class='add'>+	int ret;</div><div class='add'>+	size_t i;</div><div class='add'>+	struct kexec_buf kbuf = { .image = image, .buf_max = ppc64_rma_size,</div><div class='add'>+				  .top_down = false };</div><div class='add'>+</div><div class='add'>+	/* Read in the PT_LOAD segments. */</div><div class='add'>+	for (i = 0; i &lt; ehdr-&gt;e_phnum; i++) {</div><div class='add'>+		unsigned long load_addr;</div><div class='add'>+		size_t size;</div><div class='add'>+		const struct elf_phdr *phdr;</div><div class='add'>+</div><div class='add'>+		phdr = &amp;elf_info-&gt;proghdrs[i];</div><div class='add'>+		if (phdr-&gt;p_type != PT_LOAD)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		size = phdr-&gt;p_filesz;</div><div class='add'>+		if (size &gt; phdr-&gt;p_memsz)</div><div class='add'>+			size = phdr-&gt;p_memsz;</div><div class='add'>+</div><div class='add'>+		kbuf.buffer = (void *) elf_info-&gt;buffer + phdr-&gt;p_offset;</div><div class='add'>+		kbuf.bufsz = size;</div><div class='add'>+		kbuf.memsz = phdr-&gt;p_memsz;</div><div class='add'>+		kbuf.buf_align = phdr-&gt;p_align;</div><div class='add'>+		kbuf.buf_min = phdr-&gt;p_paddr + base;</div><div class='add'>+		ret = kexec_add_buffer(&amp;kbuf);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+		load_addr = kbuf.mem;</div><div class='add'>+</div><div class='add'>+		if (load_addr &lt; lowest_addr)</div><div class='add'>+			lowest_addr = load_addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update entry point to reflect new load address. */</div><div class='add'>+	ehdr-&gt;e_entry += base;</div><div class='add'>+</div><div class='add'>+	*lowest_load_addr = lowest_addr;</div><div class='add'>+	ret = 0;</div><div class='add'>+ out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *elf64_load(struct kimage *image, char *kernel_buf,</div><div class='add'>+			unsigned long kernel_len, char *initrd,</div><div class='add'>+			unsigned long initrd_len, char *cmdline,</div><div class='add'>+			unsigned long cmdline_len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int fdt_size;</div><div class='add'>+	unsigned long kernel_load_addr, purgatory_load_addr;</div><div class='add'>+	unsigned long initrd_load_addr = 0, fdt_load_addr;</div><div class='add'>+	void *fdt;</div><div class='add'>+	const void *slave_code;</div><div class='add'>+	struct elfhdr ehdr;</div><div class='add'>+	struct elf_info elf_info;</div><div class='add'>+	struct kexec_buf kbuf = { .image = image, .buf_min = 0,</div><div class='add'>+				  .buf_max = ppc64_rma_size };</div><div class='add'>+</div><div class='add'>+	ret = build_elf_exec_info(kernel_buf, kernel_len, &amp;ehdr, &amp;elf_info);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = elf_exec_load(image, &amp;ehdr, &amp;elf_info, &amp;kernel_load_addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pr_debug("Loaded the kernel at 0x%lx\n", kernel_load_addr);</div><div class='add'>+</div><div class='add'>+	ret = kexec_load_purgatory(image, 0, ppc64_rma_size, true,</div><div class='add'>+				   &amp;purgatory_load_addr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Loading purgatory failed.\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("Loaded purgatory at 0x%lx\n", purgatory_load_addr);</div><div class='add'>+</div><div class='add'>+	if (initrd != NULL) {</div><div class='add'>+		kbuf.buffer = initrd;</div><div class='add'>+		kbuf.bufsz = kbuf.memsz = initrd_len;</div><div class='add'>+		kbuf.buf_align = PAGE_SIZE;</div><div class='add'>+		kbuf.top_down = false;</div><div class='add'>+		ret = kexec_add_buffer(&amp;kbuf);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+		initrd_load_addr = kbuf.mem;</div><div class='add'>+</div><div class='add'>+		pr_debug("Loaded initrd at 0x%lx\n", initrd_load_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fdt_size = fdt_totalsize(initial_boot_params) * 2;</div><div class='add'>+	fdt = kmalloc(fdt_size, GFP_KERNEL);</div><div class='add'>+	if (!fdt) {</div><div class='add'>+		pr_err("Not enough memory for the device tree.\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = fdt_open_into(initial_boot_params, fdt, fdt_size);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("Error setting up the new device tree.\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, cmdline);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	fdt_pack(fdt);</div><div class='add'>+</div><div class='add'>+	kbuf.buffer = fdt;</div><div class='add'>+	kbuf.bufsz = kbuf.memsz = fdt_size;</div><div class='add'>+	kbuf.buf_align = PAGE_SIZE;</div><div class='add'>+	kbuf.top_down = true;</div><div class='add'>+	ret = kexec_add_buffer(&amp;kbuf);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	fdt_load_addr = kbuf.mem;</div><div class='add'>+</div><div class='add'>+	pr_debug("Loaded device tree at 0x%lx\n", fdt_load_addr);</div><div class='add'>+</div><div class='add'>+	slave_code = elf_info.buffer + elf_info.proghdrs[0].p_offset;</div><div class='add'>+	ret = setup_purgatory(image, slave_code, fdt, kernel_load_addr,</div><div class='add'>+			      fdt_load_addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_err("Error setting up the purgatory.\n");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	elf_free_info(&amp;elf_info);</div><div class='add'>+</div><div class='add'>+	/* Make kimage_file_post_load_cleanup free the fdt buffer for us. */</div><div class='add'>+	return ret ? ERR_PTR(ret) : fdt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct kexec_file_ops kexec_elf64_ops = {</div><div class='add'>+	.probe = elf64_probe,</div><div class='add'>+	.load = elf64_load,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c<br/>index e785cc9e1ecd..fce05a38851c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/kprobes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/kprobes.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/kprobes.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;asm/code-patching.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/sstep.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;</div><div class='ctx'> DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);</div><div class='hunk'>@@ -140,13 +140,16 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,</div><div class='ctx'> 	regs-&gt;link = (unsigned long)kretprobe_trampoline;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __kprobes kprobe_handler(struct pt_regs *regs)</div><div class='add'>+int __kprobes kprobe_handler(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct kprobe *p;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	unsigned int *addr = (unsigned int *)regs-&gt;nip;</div><div class='ctx'> 	struct kprobe_ctlblk *kcb;</div><div class='ctx'> </div><div class='add'>+	if (user_mode(regs))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't want to be preempted for the entire</div><div class='ctx'> 	 * duration of kprobe processing</div><div class='hunk'>@@ -282,6 +285,7 @@ asm(".global kretprobe_trampoline\n"</div><div class='ctx'> 	".type kretprobe_trampoline, @function\n"</div><div class='ctx'> 	"kretprobe_trampoline:\n"</div><div class='ctx'> 	"nop\n"</div><div class='add'>+	"blr\n"</div><div class='ctx'> 	".size kretprobe_trampoline, .-kretprobe_trampoline\n");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -334,6 +338,13 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,</div><div class='ctx'> </div><div class='ctx'> 	kretprobe_assert(ri, orig_ret_address, trampoline_address);</div><div class='ctx'> 	regs-&gt;nip = orig_ret_address;</div><div class='add'>+	/*</div><div class='add'>+	 * Make LR point to the orig_ret_address.</div><div class='add'>+	 * When the 'nop' inside the kretprobe_trampoline</div><div class='add'>+	 * is optimized, we can do a 'blr' after executing the</div><div class='add'>+	 * detour buffer code.</div><div class='add'>+	 */</div><div class='add'>+	regs-&gt;link = orig_ret_address;</div><div class='ctx'> </div><div class='ctx'> 	reset_current_kprobe();</div><div class='ctx'> 	kretprobe_hash_unlock(current, &amp;flags);</div><div class='hunk'>@@ -359,12 +370,12 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,</div><div class='ctx'>  * single-stepped a copy of the instruction.  The address of this</div><div class='ctx'>  * copy is p-&gt;ainsn.insn.</div><div class='ctx'>  */</div><div class='del'>-static int __kprobes post_kprobe_handler(struct pt_regs *regs)</div><div class='add'>+int __kprobes kprobe_post_handler(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct kprobe *cur = kprobe_running();</div><div class='ctx'> 	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();</div><div class='ctx'> </div><div class='del'>-	if (!cur)</div><div class='add'>+	if (!cur || user_mode(regs))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* make sure we got here for instruction we have a kprobe on */</div><div class='hunk'>@@ -449,7 +460,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)</div><div class='ctx'> 		 * zero, try to fix up.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((entry = search_exception_tables(regs-&gt;nip)) != NULL) {</div><div class='del'>-			regs-&gt;nip = entry-&gt;fixup;</div><div class='add'>+			regs-&gt;nip = extable_fixup(entry);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -464,33 +475,6 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Wrapper routine to for handling exceptions.</div><div class='del'>- */</div><div class='del'>-int __kprobes kprobe_exceptions_notify(struct notifier_block *self,</div><div class='del'>-				       unsigned long val, void *data)</div><div class='del'>-{</div><div class='del'>-	struct die_args *args = (struct die_args *)data;</div><div class='del'>-	int ret = NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	if (args-&gt;regs &amp;&amp; user_mode(args-&gt;regs))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	switch (val) {</div><div class='del'>-	case DIE_BPT:</div><div class='del'>-		if (kprobe_handler(args-&gt;regs))</div><div class='del'>-			ret = NOTIFY_STOP;</div><div class='del'>-		break;</div><div class='del'>-	case DIE_SSTEP:</div><div class='del'>-		if (post_kprobe_handler(args-&gt;regs))</div><div class='del'>-			ret = NOTIFY_STOP;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> unsigned long arch_deref_entry_point(void *entry)</div><div class='ctx'> {</div><div class='ctx'> 	return ppc_global_function_entry(entry);</div><div class='head'>diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c<br/>index bc525ea0dc09..0694d20f85b6 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/legacy_serial.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/legacy_serial.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/legacy_serial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/legacy_serial.c</a></div><div class='hunk'>@@ -233,7 +233,8 @@ static int __init add_legacy_isa_port(struct device_node *np,</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Note: Don't even try on P8 lpc, we know it's not directly mapped</div><div class='ctx'> 	 */</div><div class='del'>-	if (!of_device_is_compatible(isa_brg, "ibm,power8-lpc")) {</div><div class='add'>+	if (!of_device_is_compatible(isa_brg, "ibm,power8-lpc") ||</div><div class='add'>+	    of_get_property(isa_brg, "ranges", NULL)) {</div><div class='ctx'> 		taddr = of_translate_address(np, reg);</div><div class='ctx'> 		if (taddr == OF_BAD_ADDR)</div><div class='ctx'> 			taddr = 0;</div><div class='head'>diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c<br/>index a205fa3d9bf3..5c12e21d0d1a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/machine_kexec_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/machine_kexec_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/machine_kexec_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/machine_kexec_64.c</a></div><div class='hunk'>@@ -310,7 +310,7 @@ void default_machine_kexec(struct kimage *image)</div><div class='ctx'> 	if (!kdump_in_progress())</div><div class='ctx'> 		kexec_prepare_cpus();</div><div class='ctx'> </div><div class='del'>-	pr_debug("kexec: Starting switchover sequence.\n");</div><div class='add'>+	printk("kexec: Starting switchover sequence.\n");</div><div class='ctx'> </div><div class='ctx'> 	/* switch to a staticly allocated stack.  Based on irq stack code.</div><div class='ctx'> 	 * We setup preempt_count to avoid using VMX in memcpy.</div><div class='head'>diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c b/arch/powerpc/kernel/machine_kexec_file_64.c<br/>new file mode 100644<br/>index 000000000000..992c0d258e5d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/machine_kexec_file_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/machine_kexec_file_64.c</a></div><div class='hunk'>@@ -0,0 +1,347 @@</div><div class='add'>+/*</div><div class='add'>+ * ppc64 code to implement the kexec_file_load syscall</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2004  Adam Litke (agl@us.ibm.com)</div><div class='add'>+ * Copyright (C) 2004  IBM Corp.</div><div class='add'>+ * Copyright (C) 2004,2005  Milton D Miller II, IBM Corporation</div><div class='add'>+ * Copyright (C) 2005  R Sharada (sharada@in.ibm.com)</div><div class='add'>+ * Copyright (C) 2006  Mohan Kumar M (mohan@in.ibm.com)</div><div class='add'>+ * Copyright (C) 2016  IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * Based on kexec-tools' kexec-elf-ppc64.c, fs2dt.c.</div><div class='add'>+ * Heavily modified for the kernel by</div><div class='add'>+ * Thiago Jung Bauermann &lt;bauerman@linux.vnet.ibm.com&gt;.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation (version 2 of the License).</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='add'>+#include &lt;linux/of_fdt.h&gt;</div><div class='add'>+#include &lt;linux/libfdt.h&gt;</div><div class='add'>+#include &lt;asm/ima.h&gt;</div><div class='add'>+</div><div class='add'>+#define SLAVE_CODE_SIZE		256</div><div class='add'>+</div><div class='add'>+static struct kexec_file_ops *kexec_file_loaders[] = {</div><div class='add'>+	&amp;kexec_elf64_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int arch_kexec_kernel_image_probe(struct kimage *image, void *buf,</div><div class='add'>+				  unsigned long buf_len)</div><div class='add'>+{</div><div class='add'>+	int i, ret = -ENOEXEC;</div><div class='add'>+	struct kexec_file_ops *fops;</div><div class='add'>+</div><div class='add'>+	/* We don't support crash kernels yet. */</div><div class='add'>+	if (image-&gt;type == KEXEC_TYPE_CRASH)</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(kexec_file_loaders); i++) {</div><div class='add'>+		fops = kexec_file_loaders[i];</div><div class='add'>+		if (!fops || !fops-&gt;probe)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = fops-&gt;probe(buf, buf_len);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			image-&gt;fops = fops;</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *arch_kexec_kernel_image_load(struct kimage *image)</div><div class='add'>+{</div><div class='add'>+	if (!image-&gt;fops || !image-&gt;fops-&gt;load)</div><div class='add'>+		return ERR_PTR(-ENOEXEC);</div><div class='add'>+</div><div class='add'>+	return image-&gt;fops-&gt;load(image, image-&gt;kernel_buf,</div><div class='add'>+				 image-&gt;kernel_buf_len, image-&gt;initrd_buf,</div><div class='add'>+				 image-&gt;initrd_buf_len, image-&gt;cmdline_buf,</div><div class='add'>+				 image-&gt;cmdline_buf_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_kimage_file_post_load_cleanup(struct kimage *image)</div><div class='add'>+{</div><div class='add'>+	if (!image-&gt;fops || !image-&gt;fops-&gt;cleanup)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return image-&gt;fops-&gt;cleanup(image-&gt;image_loader_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * arch_kexec_walk_mem - call func(data) for each unreserved memory block</div><div class='add'>+ * @kbuf:	Context info for the search. Also passed to @func.</div><div class='add'>+ * @func:	Function to call for each memory block.</div><div class='add'>+ *</div><div class='add'>+ * This function is used by kexec_add_buffer and kexec_locate_mem_hole</div><div class='add'>+ * to find unreserved memory to load kexec segments into.</div><div class='add'>+ *</div><div class='add'>+ * Return: The memory walk will stop when func returns a non-zero value</div><div class='add'>+ * and that value will be returned. If all free regions are visited without</div><div class='add'>+ * func returning non-zero, then zero will be returned.</div><div class='add'>+ */</div><div class='add'>+int arch_kexec_walk_mem(struct kexec_buf *kbuf, int (*func)(u64, u64, void *))</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u64 i;</div><div class='add'>+	phys_addr_t mstart, mend;</div><div class='add'>+</div><div class='add'>+	if (kbuf-&gt;top_down) {</div><div class='add'>+		for_each_free_mem_range_reverse(i, NUMA_NO_NODE, 0,</div><div class='add'>+						&amp;mstart, &amp;mend, NULL) {</div><div class='add'>+			/*</div><div class='add'>+			 * In memblock, end points to the first byte after the</div><div class='add'>+			 * range while in kexec, end points to the last byte</div><div class='add'>+			 * in the range.</div><div class='add'>+			 */</div><div class='add'>+			ret = func(mstart, mend - 1, kbuf);</div><div class='add'>+			if (ret)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for_each_free_mem_range(i, NUMA_NO_NODE, 0, &amp;mstart, &amp;mend,</div><div class='add'>+					NULL) {</div><div class='add'>+			/*</div><div class='add'>+			 * In memblock, end points to the first byte after the</div><div class='add'>+			 * range while in kexec, end points to the last byte</div><div class='add'>+			 * in the range.</div><div class='add'>+			 */</div><div class='add'>+			ret = func(mstart, mend - 1, kbuf);</div><div class='add'>+			if (ret)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * setup_purgatory - initialize the purgatory's global variables</div><div class='add'>+ * @image:		kexec image.</div><div class='add'>+ * @slave_code:		Slave code for the purgatory.</div><div class='add'>+ * @fdt:		Flattened device tree for the next kernel.</div><div class='add'>+ * @kernel_load_addr:	Address where the kernel is loaded.</div><div class='add'>+ * @fdt_load_addr:	Address where the flattened device tree is loaded.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or negative errno on error.</div><div class='add'>+ */</div><div class='add'>+int setup_purgatory(struct kimage *image, const void *slave_code,</div><div class='add'>+		    const void *fdt, unsigned long kernel_load_addr,</div><div class='add'>+		    unsigned long fdt_load_addr)</div><div class='add'>+{</div><div class='add'>+	unsigned int *slave_code_buf, master_entry;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	slave_code_buf = kmalloc(SLAVE_CODE_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!slave_code_buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Get the slave code from the new kernel and put it in purgatory. */</div><div class='add'>+	ret = kexec_purgatory_get_set_symbol(image, "purgatory_start",</div><div class='add'>+					     slave_code_buf, SLAVE_CODE_SIZE,</div><div class='add'>+					     true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(slave_code_buf);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	master_entry = slave_code_buf[0];</div><div class='add'>+	memcpy(slave_code_buf, slave_code, SLAVE_CODE_SIZE);</div><div class='add'>+	slave_code_buf[0] = master_entry;</div><div class='add'>+	ret = kexec_purgatory_get_set_symbol(image, "purgatory_start",</div><div class='add'>+					     slave_code_buf, SLAVE_CODE_SIZE,</div><div class='add'>+					     false);</div><div class='add'>+	kfree(slave_code_buf);</div><div class='add'>+</div><div class='add'>+	ret = kexec_purgatory_get_set_symbol(image, "kernel", &amp;kernel_load_addr,</div><div class='add'>+					     sizeof(kernel_load_addr), false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = kexec_purgatory_get_set_symbol(image, "dt_offset", &amp;fdt_load_addr,</div><div class='add'>+					     sizeof(fdt_load_addr), false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * delete_fdt_mem_rsv - delete memory reservation with given address and size</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or negative errno on error.</div><div class='add'>+ */</div><div class='add'>+int delete_fdt_mem_rsv(void *fdt, unsigned long start, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	int i, ret, num_rsvs = fdt_num_mem_rsv(fdt);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_rsvs; i++) {</div><div class='add'>+		uint64_t rsv_start, rsv_size;</div><div class='add'>+</div><div class='add'>+		ret = fdt_get_mem_rsv(fdt, i, &amp;rsv_start, &amp;rsv_size);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("Malformed device tree.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (rsv_start == start &amp;&amp; rsv_size == size) {</div><div class='add'>+			ret = fdt_del_mem_rsv(fdt, i);</div><div class='add'>+			if (ret) {</div><div class='add'>+				pr_err("Error deleting device tree reservation.\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * setup_new_fdt - modify /chosen and memory reservation for the next kernel</div><div class='add'>+ * @image:		kexec image being loaded.</div><div class='add'>+ * @fdt:		Flattened device tree for the next kernel.</div><div class='add'>+ * @initrd_load_addr:	Address where the next initrd will be loaded.</div><div class='add'>+ * @initrd_len:		Size of the next initrd, or 0 if there will be none.</div><div class='add'>+ * @cmdline:		Command line for the next kernel, or NULL if there will</div><div class='add'>+ *			be none.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or negative errno on error.</div><div class='add'>+ */</div><div class='add'>+int setup_new_fdt(const struct kimage *image, void *fdt,</div><div class='add'>+		  unsigned long initrd_load_addr, unsigned long initrd_len,</div><div class='add'>+		  const char *cmdline)</div><div class='add'>+{</div><div class='add'>+	int ret, chosen_node;</div><div class='add'>+	const void *prop;</div><div class='add'>+</div><div class='add'>+	/* Remove memory reservation for the current device tree. */</div><div class='add'>+	ret = delete_fdt_mem_rsv(fdt, __pa(initial_boot_params),</div><div class='add'>+				 fdt_totalsize(initial_boot_params));</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		pr_debug("Removed old device tree reservation.\n");</div><div class='add'>+	else if (ret != -ENOENT)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	chosen_node = fdt_path_offset(fdt, "/chosen");</div><div class='add'>+	if (chosen_node == -FDT_ERR_NOTFOUND) {</div><div class='add'>+		chosen_node = fdt_add_subnode(fdt, fdt_path_offset(fdt, "/"),</div><div class='add'>+					      "chosen");</div><div class='add'>+		if (chosen_node &lt; 0) {</div><div class='add'>+			pr_err("Error creating /chosen.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else if (chosen_node &lt; 0) {</div><div class='add'>+		pr_err("Malformed device tree: error reading /chosen.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Did we boot using an initrd? */</div><div class='add'>+	prop = fdt_getprop(fdt, chosen_node, "linux,initrd-start", NULL);</div><div class='add'>+	if (prop) {</div><div class='add'>+		uint64_t tmp_start, tmp_end, tmp_size;</div><div class='add'>+</div><div class='add'>+		tmp_start = fdt64_to_cpu(*((const fdt64_t *) prop));</div><div class='add'>+</div><div class='add'>+		prop = fdt_getprop(fdt, chosen_node, "linux,initrd-end", NULL);</div><div class='add'>+		if (!prop) {</div><div class='add'>+			pr_err("Malformed device tree.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		tmp_end = fdt64_to_cpu(*((const fdt64_t *) prop));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * kexec reserves exact initrd size, while firmware may</div><div class='add'>+		 * reserve a multiple of PAGE_SIZE, so check for both.</div><div class='add'>+		 */</div><div class='add'>+		tmp_size = tmp_end - tmp_start;</div><div class='add'>+		ret = delete_fdt_mem_rsv(fdt, tmp_start, tmp_size);</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			ret = delete_fdt_mem_rsv(fdt, tmp_start,</div><div class='add'>+						 round_up(tmp_size, PAGE_SIZE));</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			pr_debug("Removed old initrd reservation.\n");</div><div class='add'>+		else if (ret != -ENOENT)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* If there's no new initrd, delete the old initrd's info. */</div><div class='add'>+		if (initrd_len == 0) {</div><div class='add'>+			ret = fdt_delprop(fdt, chosen_node,</div><div class='add'>+					  "linux,initrd-start");</div><div class='add'>+			if (ret) {</div><div class='add'>+				pr_err("Error deleting linux,initrd-start.\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = fdt_delprop(fdt, chosen_node, "linux,initrd-end");</div><div class='add'>+			if (ret) {</div><div class='add'>+				pr_err("Error deleting linux,initrd-end.\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (initrd_len) {</div><div class='add'>+		ret = fdt_setprop_u64(fdt, chosen_node,</div><div class='add'>+				      "linux,initrd-start",</div><div class='add'>+				      initrd_load_addr);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			pr_err("Error setting up the new device tree.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* initrd-end is the first address after the initrd image. */</div><div class='add'>+		ret = fdt_setprop_u64(fdt, chosen_node, "linux,initrd-end",</div><div class='add'>+				      initrd_load_addr + initrd_len);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			pr_err("Error setting up the new device tree.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = fdt_add_mem_rsv(fdt, initrd_load_addr, initrd_len);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("Error reserving initrd memory: %s\n",</div><div class='add'>+			       fdt_strerror(ret));</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmdline != NULL) {</div><div class='add'>+		ret = fdt_setprop_string(fdt, chosen_node, "bootargs", cmdline);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			pr_err("Error setting up the new device tree.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = fdt_delprop(fdt, chosen_node, "bootargs");</div><div class='add'>+		if (ret &amp;&amp; ret != -FDT_ERR_NOTFOUND) {</div><div class='add'>+			pr_err("Error deleting bootargs.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = setup_ima_buffer(image, fdt, chosen_node);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Error setting up the new device tree.\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = fdt_setprop(fdt, chosen_node, "linux,booted-from-kexec", NULL, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Error setting up the new device tree.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/kernel/mce.c b/arch/powerpc/kernel/mce.c<br/>index 5e7ece0fda9f..c6923ff45131 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/mce.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/mce.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/mce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/mce.c</a></div><div class='hunk'>@@ -72,7 +72,6 @@ void save_mce_event(struct pt_regs *regs, long handled,</div><div class='ctx'> 		    struct mce_error_info *mce_err,</div><div class='ctx'> 		    uint64_t nip, uint64_t addr)</div><div class='ctx'> {</div><div class='del'>-	uint64_t srr1;</div><div class='ctx'> 	int index = __this_cpu_inc_return(mce_nest_count) - 1;</div><div class='ctx'> 	struct machine_check_event *mce = this_cpu_ptr(&amp;mce_event[index]);</div><div class='ctx'> </div><div class='hunk'>@@ -99,8 +98,6 @@ void save_mce_event(struct pt_regs *regs, long handled,</div><div class='ctx'> 		mce-&gt;disposition = MCE_DISPOSITION_NOT_RECOVERED;</div><div class='ctx'> 	mce-&gt;severity = MCE_SEV_ERROR_SYNC;</div><div class='ctx'> </div><div class='del'>-	srr1 = regs-&gt;msr;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Populate the mce error_type and type-specific error_type.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S<br/>index 93cf7a5846a6..84db14e435f5 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/misc_32.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/misc_32.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/misc_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/misc_32.S</a></div><div class='hunk'>@@ -296,7 +296,7 @@ _GLOBAL(flush_instruction_cache)</div><div class='ctx'> 	lis	r3, KERNELBASE@h</div><div class='ctx'> 	iccci	0,r3</div><div class='ctx'> #endif</div><div class='del'>-#elif CONFIG_FSL_BOOKE</div><div class='add'>+#elif defined(CONFIG_FSL_BOOKE)</div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='ctx'> 	mfspr   r3,SPRN_L1CSR0</div><div class='ctx'> 	ori     r3,r3,L1CSR0_CFI|L1CSR0_CLFC</div><div class='hunk'>@@ -614,7 +614,7 @@ _GLOBAL(start_secondary_resume)</div><div class='ctx'> _GLOBAL(__main)</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Must be relocatable PIC code callable as a C function.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S<br/>index 4f178671f230..ae179cb1bb3c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/misc_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/misc_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/misc_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/misc_64.S</a></div><div class='hunk'>@@ -80,12 +80,12 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)</div><div class='ctx'>  * each other.</div><div class='ctx'>  */</div><div class='ctx'>  	ld	r10,PPC64_CACHES@toc(r2)</div><div class='del'>-	lwz	r7,DCACHEL1LINESIZE(r10)/* Get cache line size */</div><div class='add'>+	lwz	r7,DCACHEL1BLOCKSIZE(r10)/* Get cache block size */</div><div class='ctx'> 	addi	r5,r7,-1</div><div class='ctx'> 	andc	r6,r3,r5		/* round low to line bdy */</div><div class='ctx'> 	subf	r8,r6,r4		/* compute length */</div><div class='ctx'> 	add	r8,r8,r5		/* ensure we get enough */</div><div class='del'>-	lwz	r9,DCACHEL1LOGLINESIZE(r10)	/* Get log-2 of cache line size */</div><div class='add'>+	lwz	r9,DCACHEL1LOGBLOCKSIZE(r10)	/* Get log-2 of cache block size */</div><div class='ctx'> 	srw.	r8,r8,r9		/* compute line count */</div><div class='ctx'> 	beqlr				/* nothing to do? */</div><div class='ctx'> 	mtctr	r8</div><div class='hunk'>@@ -96,12 +96,12 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)</div><div class='ctx'> </div><div class='ctx'> /* Now invalidate the instruction cache */</div><div class='ctx'> 	</div><div class='del'>-	lwz	r7,ICACHEL1LINESIZE(r10)	/* Get Icache line size */</div><div class='add'>+	lwz	r7,ICACHEL1BLOCKSIZE(r10)	/* Get Icache block size */</div><div class='ctx'> 	addi	r5,r7,-1</div><div class='ctx'> 	andc	r6,r3,r5		/* round low to line bdy */</div><div class='ctx'> 	subf	r8,r6,r4		/* compute length */</div><div class='ctx'> 	add	r8,r8,r5</div><div class='del'>-	lwz	r9,ICACHEL1LOGLINESIZE(r10)	/* Get log-2 of Icache line size */</div><div class='add'>+	lwz	r9,ICACHEL1LOGBLOCKSIZE(r10)	/* Get log-2 of Icache block size */</div><div class='ctx'> 	srw.	r8,r8,r9		/* compute line count */</div><div class='ctx'> 	beqlr				/* nothing to do? */</div><div class='ctx'> 	mtctr	r8</div><div class='hunk'>@@ -128,12 +128,12 @@ _GLOBAL(flush_dcache_range)</div><div class='ctx'>  * Different systems have different cache line sizes</div><div class='ctx'>  */</div><div class='ctx'>  	ld	r10,PPC64_CACHES@toc(r2)</div><div class='del'>-	lwz	r7,DCACHEL1LINESIZE(r10)	/* Get dcache line size */</div><div class='add'>+	lwz	r7,DCACHEL1BLOCKSIZE(r10)	/* Get dcache block size */</div><div class='ctx'> 	addi	r5,r7,-1</div><div class='ctx'> 	andc	r6,r3,r5		/* round low to line bdy */</div><div class='ctx'> 	subf	r8,r6,r4		/* compute length */</div><div class='ctx'> 	add	r8,r8,r5		/* ensure we get enough */</div><div class='del'>-	lwz	r9,DCACHEL1LOGLINESIZE(r10)	/* Get log-2 of dcache line size */</div><div class='add'>+	lwz	r9,DCACHEL1LOGBLOCKSIZE(r10)	/* Get log-2 of dcache block size */</div><div class='ctx'> 	srw.	r8,r8,r9		/* compute line count */</div><div class='ctx'> 	beqlr				/* nothing to do? */</div><div class='ctx'> 	mtctr	r8</div><div class='hunk'>@@ -156,12 +156,12 @@ EXPORT_SYMBOL(flush_dcache_range)</div><div class='ctx'>  */</div><div class='ctx'> _GLOBAL(flush_dcache_phys_range)</div><div class='ctx'>  	ld	r10,PPC64_CACHES@toc(r2)</div><div class='del'>-	lwz	r7,DCACHEL1LINESIZE(r10)	/* Get dcache line size */</div><div class='add'>+	lwz	r7,DCACHEL1BLOCKSIZE(r10)	/* Get dcache block size */</div><div class='ctx'> 	addi	r5,r7,-1</div><div class='ctx'> 	andc	r6,r3,r5		/* round low to line bdy */</div><div class='ctx'> 	subf	r8,r6,r4		/* compute length */</div><div class='ctx'> 	add	r8,r8,r5		/* ensure we get enough */</div><div class='del'>-	lwz	r9,DCACHEL1LOGLINESIZE(r10)	/* Get log-2 of dcache line size */</div><div class='add'>+	lwz	r9,DCACHEL1LOGBLOCKSIZE(r10)	/* Get log-2 of dcache block size */</div><div class='ctx'> 	srw.	r8,r8,r9		/* compute line count */</div><div class='ctx'> 	beqlr				/* nothing to do? */</div><div class='ctx'> 	mfmsr	r5			/* Disable MMU Data Relocation */</div><div class='hunk'>@@ -184,12 +184,12 @@ _GLOBAL(flush_dcache_phys_range)</div><div class='ctx'> </div><div class='ctx'> _GLOBAL(flush_inval_dcache_range)</div><div class='ctx'>  	ld	r10,PPC64_CACHES@toc(r2)</div><div class='del'>-	lwz	r7,DCACHEL1LINESIZE(r10)	/* Get dcache line size */</div><div class='add'>+	lwz	r7,DCACHEL1BLOCKSIZE(r10)	/* Get dcache block size */</div><div class='ctx'> 	addi	r5,r7,-1</div><div class='ctx'> 	andc	r6,r3,r5		/* round low to line bdy */</div><div class='ctx'> 	subf	r8,r6,r4		/* compute length */</div><div class='ctx'> 	add	r8,r8,r5		/* ensure we get enough */</div><div class='del'>-	lwz	r9,DCACHEL1LOGLINESIZE(r10)/* Get log-2 of dcache line size */</div><div class='add'>+	lwz	r9,DCACHEL1LOGBLOCKSIZE(r10)/* Get log-2 of dcache block size */</div><div class='ctx'> 	srw.	r8,r8,r9		/* compute line count */</div><div class='ctx'> 	beqlr				/* nothing to do? */</div><div class='ctx'> 	sync</div><div class='hunk'>@@ -225,8 +225,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)</div><div class='ctx'> /* Flush the dcache */</div><div class='ctx'>  	ld	r7,PPC64_CACHES@toc(r2)</div><div class='ctx'> 	clrrdi	r3,r3,PAGE_SHIFT           	    /* Page align */</div><div class='del'>-	lwz	r4,DCACHEL1LINESPERPAGE(r7)	/* Get # dcache lines per page */</div><div class='del'>-	lwz	r5,DCACHEL1LINESIZE(r7)		/* Get dcache line size */</div><div class='add'>+	lwz	r4,DCACHEL1BLOCKSPERPAGE(r7)	/* Get # dcache blocks per page */</div><div class='add'>+	lwz	r5,DCACHEL1BLOCKSIZE(r7)	/* Get dcache block size */</div><div class='ctx'> 	mr	r6,r3</div><div class='ctx'> 	mtctr	r4</div><div class='ctx'> 0:	dcbst	0,r6</div><div class='hunk'>@@ -236,8 +236,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)</div><div class='ctx'> </div><div class='ctx'> /* Now invalidate the icache */	</div><div class='ctx'> </div><div class='del'>-	lwz	r4,ICACHEL1LINESPERPAGE(r7)	/* Get # icache lines per page */</div><div class='del'>-	lwz	r5,ICACHEL1LINESIZE(r7)		/* Get icache line size */</div><div class='add'>+	lwz	r4,ICACHEL1BLOCKSPERPAGE(r7)	/* Get # icache blocks per page */</div><div class='add'>+	lwz	r5,ICACHEL1BLOCKSIZE(r7)	/* Get icache block size */</div><div class='ctx'> 	mtctr	r4</div><div class='ctx'> 1:	icbi	0,r3</div><div class='ctx'> 	add	r3,r3,r5</div><div class='hunk'>@@ -478,7 +478,7 @@ _GLOBAL(kexec_wait)</div><div class='ctx'> 	addi	r5,r5,kexec_flag-1b</div><div class='ctx'> </div><div class='ctx'> 99:	HMT_LOW</div><div class='del'>-#ifdef CONFIG_KEXEC		/* use no memory without kexec */</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE	/* use no memory without kexec */</div><div class='ctx'> 	lwz	r4,0(r5)</div><div class='ctx'> 	cmpwi	0,r4,0</div><div class='ctx'> 	beq	99b</div><div class='hunk'>@@ -503,7 +503,7 @@ kexec_flag:</div><div class='ctx'> 	.long	0</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3E</div><div class='ctx'> /*</div><div class='ctx'>  * BOOK3E has no real MMU mode, so we have to setup the initial TLB</div><div class='hunk'>@@ -716,4 +716,4 @@ _GLOBAL(kexec_sequence)</div><div class='ctx'> 	mtlr	4</div><div class='ctx'> 	li	r5,0</div><div class='ctx'> 	blr	/* image-&gt;start(physid, image-&gt;start, 0); */</div><div class='del'>-#endif /* CONFIG_KEXEC */</div><div class='add'>+#endif /* CONFIG_KEXEC_CORE */</div><div class='head'>diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c<br/>index 30b89d5cbb03..3f7ba0f5bf29 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/module.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/module.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/module.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;asm/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c<br/>index 183368e008cf..0b0f89685b67 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/module_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/module_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/module_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/module_64.c</a></div><div class='hunk'>@@ -286,14 +286,6 @@ static void dedotify_versions(struct modversion_info *vers,</div><div class='ctx'> 	for (end = (void *)vers + size; vers &lt; end; vers++)</div><div class='ctx'> 		if (vers-&gt;name[0] == '.') {</div><div class='ctx'> 			memmove(vers-&gt;name, vers-&gt;name+1, strlen(vers-&gt;name));</div><div class='del'>-#ifdef ARCH_RELOCATES_KCRCTAB</div><div class='del'>-			/* The TOC symbol has no CRC computed. To avoid CRC</div><div class='del'>-			 * check failing, we must force it to the expected</div><div class='del'>-			 * value (see CRC check in module.c).</div><div class='del'>-			 */</div><div class='del'>-			if (!strcmp(vers-&gt;name, "TOC."))</div><div class='del'>-				vers-&gt;crc = -(unsigned long)reloc_start;</div><div class='del'>-#endif</div><div class='ctx'> 		}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -652,6 +644,11 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,</div><div class='ctx'> 			*location = value - (unsigned long)location;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case R_PPC64_REL32:</div><div class='add'>+			/* 32 bits relative (used by relative exception tables) */</div><div class='add'>+			*(u32 *)location = value - (unsigned long)location;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case R_PPC64_TOCSAVE:</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Marker reloc indicates we don't have to save r2.</div><div class='head'>diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c<br/>index 34d2c595de23..d5e2b8309939 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/nvram_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/nvram_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/nvram_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/nvram_64.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/pstore.h&gt;</div><div class='ctx'> #include &lt;linux/zlib.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/nvram.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c<br/>index b60a67d92ebd..34aeac54f120 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/of_platform.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/of_platform.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/of_platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/of_platform.c</a></div><div class='hunk'>@@ -114,11 +114,6 @@ static struct platform_driver of_pci_phb_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __init int of_pci_phb_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;of_pci_phb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-device_initcall(of_pci_phb_init);</div><div class='add'>+builtin_platform_driver(of_pci_phb_driver);</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PPC_OF_PLATFORM_PCI */</div><div class='head'>diff --git a/arch/powerpc/kernel/optprobes.c b/arch/powerpc/kernel/optprobes.c<br/>new file mode 100644<br/>index 000000000000..2282bf4e63cd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/optprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/optprobes.c</a></div><div class='hunk'>@@ -0,0 +1,347 @@</div><div class='add'>+/*</div><div class='add'>+ * Code for Kernel probes Jump optimization.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2017, Anju T, IBM Corp.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/jump_label.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;asm/kprobes.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/code-patching.h&gt;</div><div class='add'>+#include &lt;asm/sstep.h&gt;</div><div class='add'>+#include &lt;asm/ppc-opcode.h&gt;</div><div class='add'>+</div><div class='add'>+#define TMPL_CALL_HDLR_IDX	\</div><div class='add'>+	(optprobe_template_call_handler - optprobe_template_entry)</div><div class='add'>+#define TMPL_EMULATE_IDX	\</div><div class='add'>+	(optprobe_template_call_emulate - optprobe_template_entry)</div><div class='add'>+#define TMPL_RET_IDX		\</div><div class='add'>+	(optprobe_template_ret - optprobe_template_entry)</div><div class='add'>+#define TMPL_OP_IDX		\</div><div class='add'>+	(optprobe_template_op_address - optprobe_template_entry)</div><div class='add'>+#define TMPL_INSN_IDX		\</div><div class='add'>+	(optprobe_template_insn - optprobe_template_entry)</div><div class='add'>+#define TMPL_END_IDX		\</div><div class='add'>+	(optprobe_template_end - optprobe_template_entry)</div><div class='add'>+</div><div class='add'>+DEFINE_INSN_CACHE_OPS(ppc_optinsn);</div><div class='add'>+</div><div class='add'>+static bool insn_page_in_use;</div><div class='add'>+</div><div class='add'>+static void *__ppc_alloc_insn_page(void)</div><div class='add'>+{</div><div class='add'>+	if (insn_page_in_use)</div><div class='add'>+		return NULL;</div><div class='add'>+	insn_page_in_use = true;</div><div class='add'>+	return &amp;optinsn_slot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ppc_free_insn_page(void *page __maybe_unused)</div><div class='add'>+{</div><div class='add'>+	insn_page_in_use = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct kprobe_insn_cache kprobe_ppc_optinsn_slots = {</div><div class='add'>+	.mutex = __MUTEX_INITIALIZER(kprobe_ppc_optinsn_slots.mutex),</div><div class='add'>+	.pages = LIST_HEAD_INIT(kprobe_ppc_optinsn_slots.pages),</div><div class='add'>+	/* insn_size initialized later */</div><div class='add'>+	.alloc = __ppc_alloc_insn_page,</div><div class='add'>+	.free = __ppc_free_insn_page,</div><div class='add'>+	.nr_garbage = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if we can optimize this probe. Returns NIP post-emulation if this can</div><div class='add'>+ * be optimized and 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static unsigned long can_optimize(struct kprobe *p)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs regs;</div><div class='add'>+	struct instruction_op op;</div><div class='add'>+	unsigned long nip = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * kprobe placed for kretprobe during boot time</div><div class='add'>+	 * has a 'nop' instruction, which can be emulated.</div><div class='add'>+	 * So further checks can be skipped.</div><div class='add'>+	 */</div><div class='add'>+	if (p-&gt;addr == (kprobe_opcode_t *)&amp;kretprobe_trampoline)</div><div class='add'>+		return (unsigned long)p-&gt;addr + sizeof(kprobe_opcode_t);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We only support optimizing kernel addresses, but not</div><div class='add'>+	 * module addresses.</div><div class='add'>+	 *</div><div class='add'>+	 * FIXME: Optimize kprobes placed in module addresses.</div><div class='add'>+	 */</div><div class='add'>+	if (!is_kernel_addr((unsigned long)p-&gt;addr))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;regs, 0, sizeof(struct pt_regs));</div><div class='add'>+	regs.nip = (unsigned long)p-&gt;addr;</div><div class='add'>+	regs.trap = 0x0;</div><div class='add'>+	regs.msr = MSR_KERNEL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Kprobe placed in conditional branch instructions are</div><div class='add'>+	 * not optimized, as we can't predict the nip prior with</div><div class='add'>+	 * dummy pt_regs and can not ensure that the return branch</div><div class='add'>+	 * from detour buffer falls in the range of address (i.e 32MB).</div><div class='add'>+	 * A branch back from trampoline is set up in the detour buffer</div><div class='add'>+	 * to the nip returned by the analyse_instr() here.</div><div class='add'>+	 *</div><div class='add'>+	 * Ensure that the instruction is not a conditional branch,</div><div class='add'>+	 * and that can be emulated.</div><div class='add'>+	 */</div><div class='add'>+	if (!is_conditional_branch(*p-&gt;ainsn.insn) &amp;&amp;</div><div class='add'>+			analyse_instr(&amp;op, &amp;regs, *p-&gt;ainsn.insn))</div><div class='add'>+		nip = regs.nip;</div><div class='add'>+</div><div class='add'>+	return nip;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void optimized_callback(struct optimized_kprobe *op,</div><div class='add'>+			       struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* This is possible if op is under delayed unoptimizing */</div><div class='add'>+	if (kprobe_disabled(&amp;op-&gt;kp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	hard_irq_disable();</div><div class='add'>+</div><div class='add'>+	if (kprobe_running()) {</div><div class='add'>+		kprobes_inc_nmissed_count(&amp;op-&gt;kp);</div><div class='add'>+	} else {</div><div class='add'>+		__this_cpu_write(current_kprobe, &amp;op-&gt;kp);</div><div class='add'>+		regs-&gt;nip = (unsigned long)op-&gt;kp.addr;</div><div class='add'>+		kcb-&gt;kprobe_status = KPROBE_HIT_ACTIVE;</div><div class='add'>+		opt_pre_handler(&amp;op-&gt;kp, regs);</div><div class='add'>+		__this_cpu_write(current_kprobe, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No need for an explicit __hard_irq_enable() here.</div><div class='add'>+	 * local_irq_restore() will re-enable interrupts,</div><div class='add'>+	 * if they were hard disabled.</div><div class='add'>+	 */</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+NOKPROBE_SYMBOL(optimized_callback);</div><div class='add'>+</div><div class='add'>+void arch_remove_optimized_kprobe(struct optimized_kprobe *op)</div><div class='add'>+{</div><div class='add'>+	if (op-&gt;optinsn.insn) {</div><div class='add'>+		free_ppc_optinsn_slot(op-&gt;optinsn.insn, 1);</div><div class='add'>+		op-&gt;optinsn.insn = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * emulate_step() requires insn to be emulated as</div><div class='add'>+ * second parameter. Load register 'r4' with the</div><div class='add'>+ * instruction.</div><div class='add'>+ */</div><div class='add'>+void patch_imm32_load_insns(unsigned int val, kprobe_opcode_t *addr)</div><div class='add'>+{</div><div class='add'>+	/* addis r4,0,(insn)@h */</div><div class='add'>+	*addr++ = PPC_INST_ADDIS | ___PPC_RT(4) |</div><div class='add'>+		  ((val &gt;&gt; 16) &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+	/* ori r4,r4,(insn)@l */</div><div class='add'>+	*addr = PPC_INST_ORI | ___PPC_RA(4) | ___PPC_RS(4) |</div><div class='add'>+		(val &amp; 0xffff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generate instructions to load provided immediate 64-bit value</div><div class='add'>+ * to register 'r3' and patch these instructions at 'addr'.</div><div class='add'>+ */</div><div class='add'>+void patch_imm64_load_insns(unsigned long val, kprobe_opcode_t *addr)</div><div class='add'>+{</div><div class='add'>+	/* lis r3,(op)@highest */</div><div class='add'>+	*addr++ = PPC_INST_ADDIS | ___PPC_RT(3) |</div><div class='add'>+		  ((val &gt;&gt; 48) &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+	/* ori r3,r3,(op)@higher */</div><div class='add'>+	*addr++ = PPC_INST_ORI | ___PPC_RA(3) | ___PPC_RS(3) |</div><div class='add'>+		  ((val &gt;&gt; 32) &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+	/* rldicr r3,r3,32,31 */</div><div class='add'>+	*addr++ = PPC_INST_RLDICR | ___PPC_RA(3) | ___PPC_RS(3) |</div><div class='add'>+		  __PPC_SH64(32) | __PPC_ME64(31);</div><div class='add'>+</div><div class='add'>+	/* oris r3,r3,(op)@h */</div><div class='add'>+	*addr++ = PPC_INST_ORIS | ___PPC_RA(3) | ___PPC_RS(3) |</div><div class='add'>+		  ((val &gt;&gt; 16) &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+	/* ori r3,r3,(op)@l */</div><div class='add'>+	*addr = PPC_INST_ORI | ___PPC_RA(3) | ___PPC_RS(3) |</div><div class='add'>+		(val &amp; 0xffff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *p)</div><div class='add'>+{</div><div class='add'>+	kprobe_opcode_t *buff, branch_op_callback, branch_emulate_step;</div><div class='add'>+	kprobe_opcode_t *op_callback_addr, *emulate_step_addr;</div><div class='add'>+	long b_offset;</div><div class='add'>+	unsigned long nip;</div><div class='add'>+</div><div class='add'>+	kprobe_ppc_optinsn_slots.insn_size = MAX_OPTINSN_SIZE;</div><div class='add'>+</div><div class='add'>+	nip = can_optimize(p);</div><div class='add'>+	if (!nip)</div><div class='add'>+		return -EILSEQ;</div><div class='add'>+</div><div class='add'>+	/* Allocate instruction slot for detour buffer */</div><div class='add'>+	buff = get_ppc_optinsn_slot();</div><div class='add'>+	if (!buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * OPTPROBE uses 'b' instruction to branch to optinsn.insn.</div><div class='add'>+	 *</div><div class='add'>+	 * The target address has to be relatively nearby, to permit use</div><div class='add'>+	 * of branch instruction in powerpc, because the address is specified</div><div class='add'>+	 * in an immediate field in the instruction opcode itself, ie 24 bits</div><div class='add'>+	 * in the opcode specify the address. Therefore the address should</div><div class='add'>+	 * be within 32MB on either side of the current instruction.</div><div class='add'>+	 */</div><div class='add'>+	b_offset = (unsigned long)buff - (unsigned long)p-&gt;addr;</div><div class='add'>+	if (!is_offset_in_branch_range(b_offset))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Check if the return address is also within 32MB range */</div><div class='add'>+	b_offset = (unsigned long)(buff + TMPL_RET_IDX) -</div><div class='add'>+			(unsigned long)nip;</div><div class='add'>+	if (!is_offset_in_branch_range(b_offset))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Setup template */</div><div class='add'>+	memcpy(buff, optprobe_template_entry,</div><div class='add'>+			TMPL_END_IDX * sizeof(kprobe_opcode_t));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fixup the template with instructions to:</div><div class='add'>+	 * 1. load the address of the actual probepoint</div><div class='add'>+	 */</div><div class='add'>+	patch_imm64_load_insns((unsigned long)op, buff + TMPL_OP_IDX);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 2. branch to optimized_callback() and emulate_step()</div><div class='add'>+	 */</div><div class='add'>+	kprobe_lookup_name("optimized_callback", op_callback_addr);</div><div class='add'>+	kprobe_lookup_name("emulate_step", emulate_step_addr);</div><div class='add'>+	if (!op_callback_addr || !emulate_step_addr) {</div><div class='add'>+		WARN(1, "kprobe_lookup_name() failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	branch_op_callback = create_branch((unsigned int *)buff + TMPL_CALL_HDLR_IDX,</div><div class='add'>+				(unsigned long)op_callback_addr,</div><div class='add'>+				BRANCH_SET_LINK);</div><div class='add'>+</div><div class='add'>+	branch_emulate_step = create_branch((unsigned int *)buff + TMPL_EMULATE_IDX,</div><div class='add'>+				(unsigned long)emulate_step_addr,</div><div class='add'>+				BRANCH_SET_LINK);</div><div class='add'>+</div><div class='add'>+	if (!branch_op_callback || !branch_emulate_step)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	buff[TMPL_CALL_HDLR_IDX] = branch_op_callback;</div><div class='add'>+	buff[TMPL_EMULATE_IDX] = branch_emulate_step;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 3. load instruction to be emulated into relevant register, and</div><div class='add'>+	 */</div><div class='add'>+	patch_imm32_load_insns(*p-&gt;ainsn.insn, buff + TMPL_INSN_IDX);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 4. branch back from trampoline</div><div class='add'>+	 */</div><div class='add'>+	buff[TMPL_RET_IDX] = create_branch((unsigned int *)buff + TMPL_RET_IDX,</div><div class='add'>+				(unsigned long)nip, 0);</div><div class='add'>+</div><div class='add'>+	flush_icache_range((unsigned long)buff,</div><div class='add'>+			   (unsigned long)(&amp;buff[TMPL_END_IDX]));</div><div class='add'>+</div><div class='add'>+	op-&gt;optinsn.insn = buff;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	free_ppc_optinsn_slot(buff, 0);</div><div class='add'>+	return -ERANGE;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_prepared_optinsn(struct arch_optimized_insn *optinsn)</div><div class='add'>+{</div><div class='add'>+	return optinsn-&gt;insn != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On powerpc, Optprobes always replaces one instruction (4 bytes</div><div class='add'>+ * aligned and 4 bytes long). It is impossible to encounter another</div><div class='add'>+ * kprobe in this address range. So always return 0.</div><div class='add'>+ */</div><div class='add'>+int arch_check_optimized_kprobe(struct optimized_kprobe *op)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_optimize_kprobes(struct list_head *oplist)</div><div class='add'>+{</div><div class='add'>+	struct optimized_kprobe *op;</div><div class='add'>+	struct optimized_kprobe *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(op, tmp, oplist, list) {</div><div class='add'>+		/*</div><div class='add'>+		 * Backup instructions which will be replaced</div><div class='add'>+		 * by jump address</div><div class='add'>+		 */</div><div class='add'>+		memcpy(op-&gt;optinsn.copied_insn, op-&gt;kp.addr,</div><div class='add'>+					       RELATIVEJUMP_SIZE);</div><div class='add'>+		patch_instruction(op-&gt;kp.addr,</div><div class='add'>+			create_branch((unsigned int *)op-&gt;kp.addr,</div><div class='add'>+				      (unsigned long)op-&gt;optinsn.insn, 0));</div><div class='add'>+		list_del_init(&amp;op-&gt;list);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_unoptimize_kprobe(struct optimized_kprobe *op)</div><div class='add'>+{</div><div class='add'>+	arch_arm_kprobe(&amp;op-&gt;kp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_unoptimize_kprobes(struct list_head *oplist,</div><div class='add'>+			     struct list_head *done_list)</div><div class='add'>+{</div><div class='add'>+	struct optimized_kprobe *op;</div><div class='add'>+	struct optimized_kprobe *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(op, tmp, oplist, list) {</div><div class='add'>+		arch_unoptimize_kprobe(op);</div><div class='add'>+		list_move(&amp;op-&gt;list, done_list);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_within_optimized_kprobe(struct optimized_kprobe *op,</div><div class='add'>+				 unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return ((unsigned long)op-&gt;kp.addr &lt;= addr &amp;&amp;</div><div class='add'>+		(unsigned long)op-&gt;kp.addr + RELATIVEJUMP_SIZE &gt; addr);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/kernel/optprobes_head.S b/arch/powerpc/kernel/optprobes_head.S<br/>new file mode 100644<br/>index 000000000000..4937bef7652f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/optprobes_head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/optprobes_head.S</a></div><div class='hunk'>@@ -0,0 +1,142 @@</div><div class='add'>+/*</div><div class='add'>+ * Code to prepare detour buffer for optprobes in Kernel.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2017, Anju T, IBM Corp.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ppc_asm.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+</div><div class='add'>+#define	OPT_SLOT_SIZE	65536</div><div class='add'>+</div><div class='add'>+	.balign	4</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reserve an area to allocate slots for detour buffer.</div><div class='add'>+	 * This is part of .text section (rather than vmalloc area)</div><div class='add'>+	 * as this needs to be within 32MB of the probed address.</div><div class='add'>+	 */</div><div class='add'>+	.global optinsn_slot</div><div class='add'>+optinsn_slot:</div><div class='add'>+	.space	OPT_SLOT_SIZE</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Optprobe template:</div><div class='add'>+	 * This template gets copied into one of the slots in optinsn_slot</div><div class='add'>+	 * and gets fixed up with real optprobe structures et al.</div><div class='add'>+	 */</div><div class='add'>+	.global optprobe_template_entry</div><div class='add'>+optprobe_template_entry:</div><div class='add'>+	/* Create an in-memory pt_regs */</div><div class='add'>+	stdu	r1,-INT_FRAME_SIZE(r1)</div><div class='add'>+	SAVE_GPR(0,r1)</div><div class='add'>+	/* Save the previous SP into stack */</div><div class='add'>+	addi	r0,r1,INT_FRAME_SIZE</div><div class='add'>+	std	r0,GPR1(r1)</div><div class='add'>+	SAVE_10GPRS(2,r1)</div><div class='add'>+	SAVE_10GPRS(12,r1)</div><div class='add'>+	SAVE_10GPRS(22,r1)</div><div class='add'>+	/* Save SPRS */</div><div class='add'>+	mfmsr	r5</div><div class='add'>+	std	r5,_MSR(r1)</div><div class='add'>+	li	r5,0x700</div><div class='add'>+	std	r5,_TRAP(r1)</div><div class='add'>+	li	r5,0</div><div class='add'>+	std	r5,ORIG_GPR3(r1)</div><div class='add'>+	std	r5,RESULT(r1)</div><div class='add'>+	mfctr	r5</div><div class='add'>+	std	r5,_CTR(r1)</div><div class='add'>+	mflr	r5</div><div class='add'>+	std	r5,_LINK(r1)</div><div class='add'>+	mfspr	r5,SPRN_XER</div><div class='add'>+	std	r5,_XER(r1)</div><div class='add'>+	mfcr	r5</div><div class='add'>+	std	r5,_CCR(r1)</div><div class='add'>+	lbz     r5,PACASOFTIRQEN(r13)</div><div class='add'>+	std     r5,SOFTE(r1)</div><div class='add'>+	mfdar	r5</div><div class='add'>+	std	r5,_DAR(r1)</div><div class='add'>+	mfdsisr	r5</div><div class='add'>+	std	r5,_DSISR(r1)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We may get here from a module, so load the kernel TOC in r2.</div><div class='add'>+	 * The original TOC gets restored when pt_regs is restored</div><div class='add'>+	 * further below.</div><div class='add'>+	 */</div><div class='add'>+	ld	r2,PACATOC(r13)</div><div class='add'>+</div><div class='add'>+	.global optprobe_template_op_address</div><div class='add'>+optprobe_template_op_address:</div><div class='add'>+	/*</div><div class='add'>+	 * Parameters to optimized_callback():</div><div class='add'>+	 * 1. optimized_kprobe structure in r3</div><div class='add'>+	 */</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	/* 2. pt_regs pointer in r4 */</div><div class='add'>+	addi	r4,r1,STACK_FRAME_OVERHEAD</div><div class='add'>+</div><div class='add'>+	.global optprobe_template_call_handler</div><div class='add'>+optprobe_template_call_handler:</div><div class='add'>+	/* Branch to optimized_callback() */</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Parameters for instruction emulation:</div><div class='add'>+	 * 1. Pass SP in register r3.</div><div class='add'>+	 */</div><div class='add'>+	addi	r3,r1,STACK_FRAME_OVERHEAD</div><div class='add'>+</div><div class='add'>+	.global optprobe_template_insn</div><div class='add'>+optprobe_template_insn:</div><div class='add'>+	/* 2, Pass instruction to be emulated in r4 */</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+	.global optprobe_template_call_emulate</div><div class='add'>+optprobe_template_call_emulate:</div><div class='add'>+	/* Branch to emulate_step()  */</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All done.</div><div class='add'>+	 * Now, restore the registers...</div><div class='add'>+	 */</div><div class='add'>+	ld	r5,_MSR(r1)</div><div class='add'>+	mtmsr	r5</div><div class='add'>+	ld	r5,_CTR(r1)</div><div class='add'>+	mtctr	r5</div><div class='add'>+	ld	r5,_LINK(r1)</div><div class='add'>+	mtlr	r5</div><div class='add'>+	ld	r5,_XER(r1)</div><div class='add'>+	mtxer	r5</div><div class='add'>+	ld	r5,_CCR(r1)</div><div class='add'>+	mtcr	r5</div><div class='add'>+	ld	r5,_DAR(r1)</div><div class='add'>+	mtdar	r5</div><div class='add'>+	ld	r5,_DSISR(r1)</div><div class='add'>+	mtdsisr	r5</div><div class='add'>+	REST_GPR(0,r1)</div><div class='add'>+	REST_10GPRS(2,r1)</div><div class='add'>+	REST_10GPRS(12,r1)</div><div class='add'>+	REST_10GPRS(22,r1)</div><div class='add'>+	/* Restore the previous SP */</div><div class='add'>+	addi	r1,r1,INT_FRAME_SIZE</div><div class='add'>+</div><div class='add'>+	.global optprobe_template_ret</div><div class='add'>+optprobe_template_ret:</div><div class='add'>+	/* ... and jump back from trampoline */</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+	.global optprobe_template_end</div><div class='add'>+optprobe_template_end:</div><div class='head'>diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c<br/>index fa20060ff7a5..dfc479df9634 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/paca.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/paca.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/paca.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/paca.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/lppaca.h&gt;</div><div class='ctx'> #include &lt;asm/paca.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c<br/>index 74bec5498972..ffda24a38dda 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/pci-common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/pci-common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/pci-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/pci-common.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/of_pci.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/shmem_fs.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='hunk'>@@ -59,14 +60,14 @@ resource_size_t isa_mem_base;</div><div class='ctx'> EXPORT_SYMBOL(isa_mem_base);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops *pci_dma_ops = &amp;dma_direct_ops;</div><div class='add'>+static const struct dma_map_ops *pci_dma_ops = &amp;dma_direct_ops;</div><div class='ctx'> </div><div class='del'>-void set_pci_dma_ops(struct dma_map_ops *dma_ops)</div><div class='add'>+void set_pci_dma_ops(const struct dma_map_ops *dma_ops)</div><div class='ctx'> {</div><div class='ctx'> 	pci_dma_ops = dma_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *get_pci_dma_ops(void)</div><div class='add'>+const struct dma_map_ops *get_pci_dma_ops(void)</div><div class='ctx'> {</div><div class='ctx'> 	return pci_dma_ops;</div><div class='ctx'> }</div><div class='hunk'>@@ -1559,16 +1560,10 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose,</div><div class='ctx'> 	/* Hookup PHB Memory resources */</div><div class='ctx'> 	for (i = 0; i &lt; 3; ++i) {</div><div class='ctx'> 		res = &amp;hose-&gt;mem_resources[i];</div><div class='del'>-		if (!res-&gt;flags) {</div><div class='del'>-			if (i == 0)</div><div class='del'>-				printk(KERN_ERR "PCI: Memory resource 0 not set for "</div><div class='del'>-				       "host bridge %s (domain %d)\n",</div><div class='del'>-				       hose-&gt;dn-&gt;full_name, hose-&gt;global_number);</div><div class='add'>+		if (!res-&gt;flags)</div><div class='ctx'> 			continue;</div><div class='del'>-		}</div><div class='del'>-		offset = hose-&gt;mem_offset[i];</div><div class='del'>-</div><div class='ctx'> </div><div class='add'>+		offset = hose-&gt;mem_offset[i];</div><div class='ctx'> 		pr_debug("PCI: PHB MEM resource %d = %pR off 0x%08llx\n", i,</div><div class='ctx'> 			 res, (unsigned long long)offset);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c<br/>index 678f87a63645..41c86c6b6e4d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/pci_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/pci_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/pci_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/pci_32.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='head'>diff --git a/arch/powerpc/kernel/proc_powerpc.c b/arch/powerpc/kernel/proc_powerpc.c<br/>index c30612aad68e..56548bf6231f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/proc_powerpc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/proc_powerpc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/proc_powerpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/proc_powerpc.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/vdso_datapage.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='head'>diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c<br/>index 49a680d5ae37..d645da302bf2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/process.c</a></div><div class='hunk'>@@ -16,6 +16,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -730,6 +733,28 @@ static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)</div><div class='ctx'> 		mtspr(SPRN_DABRX, dabrx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#elif defined(CONFIG_PPC_8xx)</div><div class='add'>+static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr = dabr &amp; ~HW_BRK_TYPE_DABR;</div><div class='add'>+	unsigned long lctrl1 = 0x90000000; /* compare type: equal on E &amp; F */</div><div class='add'>+	unsigned long lctrl2 = 0x8e000002; /* watchpoint 1 on cmp E | F */</div><div class='add'>+</div><div class='add'>+	if ((dabr &amp; HW_BRK_TYPE_RDWR) == HW_BRK_TYPE_READ)</div><div class='add'>+		lctrl1 |= 0xa0000;</div><div class='add'>+	else if ((dabr &amp; HW_BRK_TYPE_RDWR) == HW_BRK_TYPE_WRITE)</div><div class='add'>+		lctrl1 |= 0xf0000;</div><div class='add'>+	else if ((dabr &amp; HW_BRK_TYPE_RDWR) == 0)</div><div class='add'>+		lctrl2 = 0;</div><div class='add'>+</div><div class='add'>+	mtspr(SPRN_LCTRL2, 0);</div><div class='add'>+	mtspr(SPRN_CMPE, addr);</div><div class='add'>+	mtspr(SPRN_CMPF, addr + 4);</div><div class='add'>+	mtspr(SPRN_LCTRL1, lctrl1);</div><div class='add'>+	mtspr(SPRN_LCTRL2, lctrl2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)</div><div class='ctx'> {</div><div class='hunk'>@@ -1051,14 +1076,6 @@ static inline void save_sprs(struct thread_struct *t)</div><div class='ctx'> 		 */</div><div class='ctx'> 		t-&gt;tar = mfspr(SPRN_TAR);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='del'>-		/* Conditionally save Load Monitor registers, if enabled */</div><div class='del'>-		if (t-&gt;fscr &amp; FSCR_LM) {</div><div class='del'>-			t-&gt;lmrr = mfspr(SPRN_LMRR);</div><div class='del'>-			t-&gt;lmser = mfspr(SPRN_LMSER);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1094,16 +1111,6 @@ static inline void restore_sprs(struct thread_struct *old_thread,</div><div class='ctx'> 		if (old_thread-&gt;tar != new_thread-&gt;tar)</div><div class='ctx'> 			mtspr(SPRN_TAR, new_thread-&gt;tar);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='del'>-		/* Conditionally restore Load Monitor registers, if enabled */</div><div class='del'>-		if (new_thread-&gt;fscr &amp; FSCR_LM) {</div><div class='del'>-			if (old_thread-&gt;lmrr != new_thread-&gt;lmrr)</div><div class='del'>-				mtspr(SPRN_LMRR, new_thread-&gt;lmrr);</div><div class='del'>-			if (old_thread-&gt;lmser != new_thread-&gt;lmser)</div><div class='del'>-				mtspr(SPRN_LMSER, new_thread-&gt;lmser);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c<br/>index b0245bed6f54..f5d399e46193 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/prom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/prom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/prom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/prom.c</a></div><div class='hunk'>@@ -156,21 +156,22 @@ static struct ibm_pa_feature {</div><div class='ctx'> 	unsigned char	pabit;		/* bit number (big-endian) */</div><div class='ctx'> 	unsigned char	invert;		/* if 1, pa bit set =&gt; clear feature */</div><div class='ctx'> } ibm_pa_features[] __initdata = {</div><div class='del'>-	{0, 0, PPC_FEATURE_HAS_MMU, 0,		0, 0, 0},</div><div class='del'>-	{0, 0, PPC_FEATURE_HAS_FPU, 0,		0, 1, 0},</div><div class='del'>-	{CPU_FTR_CTRL, 0, 0, 0,			0, 3, 0},</div><div class='del'>-	{CPU_FTR_NOEXECUTE, 0, 0, 0,		0, 6, 0},</div><div class='del'>-	{CPU_FTR_NODSISRALIGN, 0, 0, 0,		1, 1, 1},</div><div class='del'>-	{0, MMU_FTR_CI_LARGE_PAGE, 0, 0,		1, 2, 0},</div><div class='del'>-	{CPU_FTR_REAL_LE, 0, PPC_FEATURE_TRUE_LE, 0, 5, 0, 0},</div><div class='add'>+	{ .pabyte = 0,  .pabit = 0, .cpu_user_ftrs = PPC_FEATURE_HAS_MMU },</div><div class='add'>+	{ .pabyte = 0,  .pabit = 1, .cpu_user_ftrs = PPC_FEATURE_HAS_FPU },</div><div class='add'>+	{ .pabyte = 0,  .pabit = 3, .cpu_features  = CPU_FTR_CTRL },</div><div class='add'>+	{ .pabyte = 0,  .pabit = 6, .cpu_features  = CPU_FTR_NOEXECUTE },</div><div class='add'>+	{ .pabyte = 1,  .pabit = 2, .mmu_features  = MMU_FTR_CI_LARGE_PAGE },</div><div class='add'>+	{ .pabyte = 40, .pabit = 0, .mmu_features  = MMU_FTR_TYPE_RADIX },</div><div class='add'>+	{ .pabyte = 1,  .pabit = 1, .invert = 1, .cpu_features = CPU_FTR_NODSISRALIGN },</div><div class='add'>+	{ .pabyte = 5,  .pabit = 0, .cpu_features  = CPU_FTR_REAL_LE,</div><div class='add'>+				    .cpu_user_ftrs = PPC_FEATURE_TRUE_LE },</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the kernel doesn't support TM (ie CONFIG_PPC_TRANSACTIONAL_MEM=n),</div><div class='ctx'> 	 * we don't want to turn on TM here, so we use the *_COMP versions</div><div class='ctx'> 	 * which are 0 if the kernel doesn't support TM.</div><div class='ctx'> 	 */</div><div class='del'>-	{CPU_FTR_TM_COMP, 0, 0,</div><div class='del'>-	 PPC_FEATURE2_HTM_COMP|PPC_FEATURE2_HTM_NOSC_COMP, 22, 0, 0},</div><div class='del'>-	{0, MMU_FTR_TYPE_RADIX, 0, 0,		40, 0, 0},</div><div class='add'>+	{ .pabyte = 22, .pabit = 0, .cpu_features = CPU_FTR_TM_COMP,</div><div class='add'>+	  .cpu_user_ftrs2 = PPC_FEATURE2_HTM_COMP | PPC_FEATURE2_HTM_NOSC_COMP },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init scan_features(unsigned long node, const unsigned char *ftrs,</div><div class='hunk'>@@ -427,7 +428,7 @@ static int __init early_init_dt_scan_chosen_ppc(unsigned long node,</div><div class='ctx'> 		tce_alloc_end = *lprop;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> 	lprop = of_get_flat_dt_prop(node, "linux,crashkernel-base", NULL);</div><div class='ctx'> 	if (lprop)</div><div class='ctx'> 		crashk_res.start = *lprop;</div><div class='head'>diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c<br/>index 88ac964f4858..a3944540fe0d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/prom_init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/prom_init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/prom_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/prom_init.c</a></div><div class='hunk'>@@ -461,14 +461,14 @@ static int __init prom_next_node(phandle *nodep)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inline prom_getprop(phandle node, const char *pname,</div><div class='add'>+static inline int prom_getprop(phandle node, const char *pname,</div><div class='ctx'> 			       void *value, size_t valuelen)</div><div class='ctx'> {</div><div class='ctx'> 	return call_prom("getprop", 4, 1, node, ADDR(pname),</div><div class='ctx'> 			 (u32)(unsigned long) value, (u32) valuelen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inline prom_getproplen(phandle node, const char *pname)</div><div class='add'>+static inline int prom_getproplen(phandle node, const char *pname)</div><div class='ctx'> {</div><div class='ctx'> 	return call_prom("getproplen", 2, 1, node, ADDR(pname));</div><div class='ctx'> }</div><div class='hunk'>@@ -635,13 +635,7 @@ static void __init early_cmdline_parse(void)</div><div class='ctx'>  *</div><div class='ctx'>  * See prom.h for the definition of the bits specified in the</div><div class='ctx'>  * architecture vector.</div><div class='del'>- *</div><div class='del'>- * Because the description vector contains a mix of byte and word</div><div class='del'>- * values, we declare it as an unsigned char array, and use this</div><div class='del'>- * macro to put word values in.</div><div class='ctx'>  */</div><div class='del'>-#define W(x)	((x) &gt;&gt; 24) &amp; 0xff, ((x) &gt;&gt; 16) &amp; 0xff, \</div><div class='del'>-		((x) &gt;&gt; 8) &amp; 0xff, (x) &amp; 0xff</div><div class='ctx'> </div><div class='ctx'> /* Firmware expects the value to be n - 1, where n is the # of vectors */</div><div class='ctx'> #define NUM_VECTORS(n)		((n) - 1)</div><div class='hunk'>@@ -652,92 +646,221 @@ static void __init early_cmdline_parse(void)</div><div class='ctx'>  */</div><div class='ctx'> #define VECTOR_LENGTH(n)	(1 + (n) - 2)</div><div class='ctx'> </div><div class='del'>-unsigned char ibm_architecture_vec[] = {</div><div class='del'>-	W(0xfffe0000), W(0x003a0000),	/* POWER5/POWER5+ */</div><div class='del'>-	W(0xffff0000), W(0x003e0000),	/* POWER6 */</div><div class='del'>-	W(0xffff0000), W(0x003f0000),	/* POWER7 */</div><div class='del'>-	W(0xffff0000), W(0x004b0000),	/* POWER8E */</div><div class='del'>-	W(0xffff0000), W(0x004c0000),   /* POWER8NVL */</div><div class='del'>-	W(0xffff0000), W(0x004d0000),	/* POWER8 */</div><div class='del'>-	W(0xffffffff), W(0x0f000004),	/* all 2.07-compliant */</div><div class='del'>-	W(0xffffffff), W(0x0f000003),	/* all 2.06-compliant */</div><div class='del'>-	W(0xffffffff), W(0x0f000002),	/* all 2.05-compliant */</div><div class='del'>-	W(0xfffffffe), W(0x0f000001),	/* all 2.04-compliant and earlier */</div><div class='del'>-	NUM_VECTORS(6),			/* 6 option vectors */</div><div class='del'>-</div><div class='del'>-	/* option vector 1: processor architectures supported */</div><div class='del'>-	VECTOR_LENGTH(2),		/* length */</div><div class='del'>-	0,				/* don't ignore, don't halt */</div><div class='del'>-	OV1_PPC_2_00 | OV1_PPC_2_01 | OV1_PPC_2_02 | OV1_PPC_2_03 |</div><div class='del'>-	OV1_PPC_2_04 | OV1_PPC_2_05 | OV1_PPC_2_06 | OV1_PPC_2_07,</div><div class='add'>+struct option_vector1 {</div><div class='add'>+	u8 byte1;</div><div class='add'>+	u8 arch_versions;</div><div class='add'>+	u8 arch_versions3;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct option_vector2 {</div><div class='add'>+	u8 byte1;</div><div class='add'>+	__be16 reserved;</div><div class='add'>+	__be32 real_base;</div><div class='add'>+	__be32 real_size;</div><div class='add'>+	__be32 virt_base;</div><div class='add'>+	__be32 virt_size;</div><div class='add'>+	__be32 load_base;</div><div class='add'>+	__be32 min_rma;</div><div class='add'>+	__be32 min_load;</div><div class='add'>+	u8 min_rma_percent;</div><div class='add'>+	u8 max_pft_size;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct option_vector3 {</div><div class='add'>+	u8 byte1;</div><div class='add'>+	u8 byte2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct option_vector4 {</div><div class='add'>+	u8 byte1;</div><div class='add'>+	u8 min_vp_cap;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct option_vector5 {</div><div class='add'>+	u8 byte1;</div><div class='add'>+	u8 byte2;</div><div class='add'>+	u8 byte3;</div><div class='add'>+	u8 cmo;</div><div class='add'>+	u8 associativity;</div><div class='add'>+	u8 bin_opts;</div><div class='add'>+	u8 micro_checkpoint;</div><div class='add'>+	u8 reserved0;</div><div class='add'>+	__be32 max_cpus;</div><div class='add'>+	__be16 papr_level;</div><div class='add'>+	__be16 reserved1;</div><div class='add'>+	u8 platform_facilities;</div><div class='add'>+	u8 reserved2;</div><div class='add'>+	__be16 reserved3;</div><div class='add'>+	u8 subprocessors;</div><div class='add'>+	u8 byte22;</div><div class='add'>+	u8 intarch;</div><div class='add'>+	u8 mmu;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct option_vector6 {</div><div class='add'>+	u8 reserved;</div><div class='add'>+	u8 secondary_pteg;</div><div class='add'>+	u8 os_name;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ibm_arch_vec {</div><div class='add'>+	struct { u32 mask, val; } pvrs[12];</div><div class='add'>+</div><div class='add'>+	u8 num_vectors;</div><div class='add'>+</div><div class='add'>+	u8 vec1_len;</div><div class='add'>+	struct option_vector1 vec1;</div><div class='add'>+</div><div class='add'>+	u8 vec2_len;</div><div class='add'>+	struct option_vector2 vec2;</div><div class='add'>+</div><div class='add'>+	u8 vec3_len;</div><div class='add'>+	struct option_vector3 vec3;</div><div class='add'>+</div><div class='add'>+	u8 vec4_len;</div><div class='add'>+	struct option_vector4 vec4;</div><div class='add'>+</div><div class='add'>+	u8 vec5_len;</div><div class='add'>+	struct option_vector5 vec5;</div><div class='add'>+</div><div class='add'>+	u8 vec6_len;</div><div class='add'>+	struct option_vector6 vec6;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {</div><div class='add'>+	.pvrs = {</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xfffe0000), /* POWER5/POWER5+ */</div><div class='add'>+			.val  = cpu_to_be32(0x003a0000),</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xffff0000), /* POWER6 */</div><div class='add'>+			.val  = cpu_to_be32(0x003e0000),</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xffff0000), /* POWER7 */</div><div class='add'>+			.val  = cpu_to_be32(0x003f0000),</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xffff0000), /* POWER8E */</div><div class='add'>+			.val  = cpu_to_be32(0x004b0000),</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xffff0000), /* POWER8NVL */</div><div class='add'>+			.val  = cpu_to_be32(0x004c0000),</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xffff0000), /* POWER8 */</div><div class='add'>+			.val  = cpu_to_be32(0x004d0000),</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xffff0000), /* POWER9 */</div><div class='add'>+			.val  = cpu_to_be32(0x004e0000),</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xffffffff), /* all 3.00-compliant */</div><div class='add'>+			.val  = cpu_to_be32(0x0f000005),</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xffffffff), /* all 2.07-compliant */</div><div class='add'>+			.val  = cpu_to_be32(0x0f000004),</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xffffffff), /* all 2.06-compliant */</div><div class='add'>+			.val  = cpu_to_be32(0x0f000003),</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xffffffff), /* all 2.05-compliant */</div><div class='add'>+			.val  = cpu_to_be32(0x0f000002),</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.mask = cpu_to_be32(0xfffffffe), /* all 2.04-compliant and earlier */</div><div class='add'>+			.val  = cpu_to_be32(0x0f000001),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.num_vectors = NUM_VECTORS(6),</div><div class='ctx'> </div><div class='add'>+	.vec1_len = VECTOR_LENGTH(sizeof(struct option_vector1)),</div><div class='add'>+	.vec1 = {</div><div class='add'>+		.byte1 = 0,</div><div class='add'>+		.arch_versions = OV1_PPC_2_00 | OV1_PPC_2_01 | OV1_PPC_2_02 | OV1_PPC_2_03 |</div><div class='add'>+				 OV1_PPC_2_04 | OV1_PPC_2_05 | OV1_PPC_2_06 | OV1_PPC_2_07,</div><div class='add'>+		.arch_versions3 = OV1_PPC_3_00,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.vec2_len = VECTOR_LENGTH(sizeof(struct option_vector2)),</div><div class='ctx'> 	/* option vector 2: Open Firmware options supported */</div><div class='del'>-	VECTOR_LENGTH(33),		/* length */</div><div class='del'>-	OV2_REAL_MODE,</div><div class='del'>-	0, 0,</div><div class='del'>-	W(0xffffffff),			/* real_base */</div><div class='del'>-	W(0xffffffff),			/* real_size */</div><div class='del'>-	W(0xffffffff),			/* virt_base */</div><div class='del'>-	W(0xffffffff),			/* virt_size */</div><div class='del'>-	W(0xffffffff),			/* load_base */</div><div class='del'>-	W(256),				/* 256MB min RMA */</div><div class='del'>-	W(0xffffffff),			/* full client load */</div><div class='del'>-	0,				/* min RMA percentage of total RAM */</div><div class='del'>-	48,				/* max log_2(hash table size) */</div><div class='add'>+	.vec2 = {</div><div class='add'>+		.byte1 = OV2_REAL_MODE,</div><div class='add'>+		.reserved = 0,</div><div class='add'>+		.real_base = cpu_to_be32(0xffffffff),</div><div class='add'>+		.real_size = cpu_to_be32(0xffffffff),</div><div class='add'>+		.virt_base = cpu_to_be32(0xffffffff),</div><div class='add'>+		.virt_size = cpu_to_be32(0xffffffff),</div><div class='add'>+		.load_base = cpu_to_be32(0xffffffff),</div><div class='add'>+		.min_rma = cpu_to_be32(256),		/* 256MB min RMA */</div><div class='add'>+		.min_load = cpu_to_be32(0xffffffff),	/* full client load */</div><div class='add'>+		.min_rma_percent = 0,	/* min RMA percentage of total RAM */</div><div class='add'>+		.max_pft_size = 48,	/* max log_2(hash table size) */</div><div class='add'>+	},</div><div class='ctx'> </div><div class='add'>+	.vec3_len = VECTOR_LENGTH(sizeof(struct option_vector3)),</div><div class='ctx'> 	/* option vector 3: processor options supported */</div><div class='del'>-	VECTOR_LENGTH(2),		/* length */</div><div class='del'>-	0,				/* don't ignore, don't halt */</div><div class='del'>-	OV3_FP | OV3_VMX | OV3_DFP,</div><div class='add'>+	.vec3 = {</div><div class='add'>+		.byte1 = 0,			/* don't ignore, don't halt */</div><div class='add'>+		.byte2 = OV3_FP | OV3_VMX | OV3_DFP,</div><div class='add'>+	},</div><div class='ctx'> </div><div class='add'>+	.vec4_len = VECTOR_LENGTH(sizeof(struct option_vector4)),</div><div class='ctx'> 	/* option vector 4: IBM PAPR implementation */</div><div class='del'>-	VECTOR_LENGTH(2),		/* length */</div><div class='del'>-	0,				/* don't halt */</div><div class='del'>-	OV4_MIN_ENT_CAP,		/* minimum VP entitled capacity */</div><div class='add'>+	.vec4 = {</div><div class='add'>+		.byte1 = 0,			/* don't halt */</div><div class='add'>+		.min_vp_cap = OV4_MIN_ENT_CAP,	/* minimum VP entitled capacity */</div><div class='add'>+	},</div><div class='ctx'> </div><div class='add'>+	.vec5_len = VECTOR_LENGTH(sizeof(struct option_vector5)),</div><div class='ctx'> 	/* option vector 5: PAPR/OF options */</div><div class='del'>-	VECTOR_LENGTH(21),		/* length */</div><div class='del'>-	0,				/* don't ignore, don't halt */</div><div class='del'>-	OV5_FEAT(OV5_LPAR) | OV5_FEAT(OV5_SPLPAR) | OV5_FEAT(OV5_LARGE_PAGES) |</div><div class='del'>-	OV5_FEAT(OV5_DRCONF_MEMORY) | OV5_FEAT(OV5_DONATE_DEDICATE_CPU) |</div><div class='add'>+	.vec5 = {</div><div class='add'>+		.byte1 = 0,				/* don't ignore, don't halt */</div><div class='add'>+		.byte2 = OV5_FEAT(OV5_LPAR) | OV5_FEAT(OV5_SPLPAR) | OV5_FEAT(OV5_LARGE_PAGES) |</div><div class='add'>+		OV5_FEAT(OV5_DRCONF_MEMORY) | OV5_FEAT(OV5_DONATE_DEDICATE_CPU) |</div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='del'>-	/* PCIe/MSI support.  Without MSI full PCIe is not supported */</div><div class='del'>-	OV5_FEAT(OV5_MSI),</div><div class='add'>+		/* PCIe/MSI support.  Without MSI full PCIe is not supported */</div><div class='add'>+		OV5_FEAT(OV5_MSI),</div><div class='ctx'> #else</div><div class='del'>-	0,</div><div class='add'>+		0,</div><div class='ctx'> #endif</div><div class='del'>-	0,</div><div class='add'>+		.byte3 = 0,</div><div class='add'>+		.cmo =</div><div class='ctx'> #ifdef CONFIG_PPC_SMLPAR</div><div class='del'>-	OV5_FEAT(OV5_CMO) | OV5_FEAT(OV5_XCMO),</div><div class='add'>+		OV5_FEAT(OV5_CMO) | OV5_FEAT(OV5_XCMO),</div><div class='ctx'> #else</div><div class='del'>-	0,</div><div class='add'>+		0,</div><div class='ctx'> #endif</div><div class='del'>-	OV5_FEAT(OV5_TYPE1_AFFINITY) | OV5_FEAT(OV5_PRRN),</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	/* WARNING: The offset of the "number of cores" field below</div><div class='del'>-	 * must match by the macro below. Update the definition if</div><div class='del'>-	 * the structure layout changes.</div><div class='del'>-	 */</div><div class='del'>-#define IBM_ARCH_VEC_NRCORES_OFFSET	133</div><div class='del'>-	W(NR_CPUS),			/* number of cores supported */</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	OV5_FEAT(OV5_PFO_HW_RNG) | OV5_FEAT(OV5_PFO_HW_ENCR) |</div><div class='del'>-	OV5_FEAT(OV5_PFO_HW_842),				/* Byte 17 */</div><div class='del'>-	0,							/* Byte 18 */</div><div class='del'>-	0,							/* Byte 19 */</div><div class='del'>-	0,							/* Byte 20 */</div><div class='del'>-	OV5_FEAT(OV5_SUB_PROCESSORS),				/* Byte 21 */</div><div class='add'>+		.associativity = OV5_FEAT(OV5_TYPE1_AFFINITY) | OV5_FEAT(OV5_PRRN),</div><div class='add'>+		.bin_opts = OV5_FEAT(OV5_RESIZE_HPT) | OV5_FEAT(OV5_HP_EVT),</div><div class='add'>+		.micro_checkpoint = 0,</div><div class='add'>+		.reserved0 = 0,</div><div class='add'>+		.max_cpus = cpu_to_be32(NR_CPUS),	/* number of cores supported */</div><div class='add'>+		.papr_level = 0,</div><div class='add'>+		.reserved1 = 0,</div><div class='add'>+		.platform_facilities = OV5_FEAT(OV5_PFO_HW_RNG) | OV5_FEAT(OV5_PFO_HW_ENCR) | OV5_FEAT(OV5_PFO_HW_842),</div><div class='add'>+		.reserved2 = 0,</div><div class='add'>+		.reserved3 = 0,</div><div class='add'>+		.subprocessors = 1,</div><div class='add'>+		.intarch = 0,</div><div class='add'>+		.mmu = OV5_FEAT(OV5_MMU_RADIX_300) | OV5_FEAT(OV5_MMU_HASH_300) |</div><div class='add'>+			OV5_FEAT(OV5_MMU_PROC_TBL) | OV5_FEAT(OV5_MMU_GTSE),</div><div class='add'>+	},</div><div class='ctx'> </div><div class='ctx'> 	/* option vector 6: IBM PAPR hints */</div><div class='del'>-	VECTOR_LENGTH(3),		/* length */</div><div class='del'>-	0,</div><div class='del'>-	0,</div><div class='del'>-	OV6_LINUX,</div><div class='add'>+	.vec6_len = VECTOR_LENGTH(sizeof(struct option_vector6)),</div><div class='add'>+	.vec6 = {</div><div class='add'>+		.reserved = 0,</div><div class='add'>+		.secondary_pteg = 0,</div><div class='add'>+		.os_name = OV6_LINUX,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Old method - ELF header with PT_NOTE sections only works on BE */</div><div class='hunk'>@@ -873,7 +996,6 @@ static void __init prom_send_capabilities(void)</div><div class='ctx'> 	ihandle root;</div><div class='ctx'> 	prom_arg_t ret;</div><div class='ctx'> 	u32 cores;</div><div class='del'>-	unsigned char *ptcores;</div><div class='ctx'> </div><div class='ctx'> 	root = call_prom("open", 1, 1, ADDR("/"));</div><div class='ctx'> 	if (root != 0) {</div><div class='hunk'>@@ -884,37 +1006,18 @@ static void __init prom_send_capabilities(void)</div><div class='ctx'> 		 * divide NR_CPUS.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		/* The core value may start at an odd address. If such a word</div><div class='del'>-		 * access is made at a cache line boundary, this leads to an</div><div class='del'>-		 * exception which may not be handled at this time.</div><div class='del'>-		 * Forcing a per byte access to avoid exception.</div><div class='del'>-		 */</div><div class='del'>-		ptcores = &amp;ibm_architecture_vec[IBM_ARCH_VEC_NRCORES_OFFSET];</div><div class='del'>-		cores = 0;</div><div class='del'>-		cores |= ptcores[0] &lt;&lt; 24;</div><div class='del'>-		cores |= ptcores[1] &lt;&lt; 16;</div><div class='del'>-		cores |= ptcores[2] &lt;&lt; 8;</div><div class='del'>-		cores |= ptcores[3];</div><div class='del'>-		if (cores != NR_CPUS) {</div><div class='del'>-			prom_printf("WARNING ! "</div><div class='del'>-				    "ibm_architecture_vec structure inconsistent: %lu!\n",</div><div class='del'>-				    cores);</div><div class='del'>-		} else {</div><div class='del'>-			cores = DIV_ROUND_UP(NR_CPUS, prom_count_smt_threads());</div><div class='del'>-			prom_printf("Max number of cores passed to firmware: %lu (NR_CPUS = %lu)\n",</div><div class='del'>-				    cores, NR_CPUS);</div><div class='del'>-			ptcores[0] = (cores &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-			ptcores[1] = (cores &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-			ptcores[2] = (cores &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-			ptcores[3] = cores &amp; 0xff;</div><div class='del'>-		}</div><div class='add'>+		cores = DIV_ROUND_UP(NR_CPUS, prom_count_smt_threads());</div><div class='add'>+		prom_printf("Max number of cores passed to firmware: %lu (NR_CPUS = %lu)\n",</div><div class='add'>+			    cores, NR_CPUS);</div><div class='add'>+</div><div class='add'>+		ibm_architecture_vec.vec5.max_cpus = cpu_to_be32(cores);</div><div class='ctx'> </div><div class='ctx'> 		/* try calling the ibm,client-architecture-support method */</div><div class='ctx'> 		prom_printf("Calling ibm,client-architecture-support...");</div><div class='ctx'> 		if (call_prom_ret("call-method", 3, 2, &amp;ret,</div><div class='ctx'> 				  ADDR("ibm,client-architecture-support"),</div><div class='ctx'> 				  root,</div><div class='del'>-				  ADDR(ibm_architecture_vec)) == 0) {</div><div class='add'>+				  ADDR(&amp;ibm_architecture_vec)) == 0) {</div><div class='ctx'> 			/* the call exists... */</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				prom_printf("\nWARNING: ibm,client-architecture"</div><div class='hunk'>@@ -2747,6 +2850,9 @@ static void __init prom_find_boot_cpu(void)</div><div class='ctx'> </div><div class='ctx'> 	cpu_pkg = call_prom("instance-to-package", 1, 1, prom_cpu);</div><div class='ctx'> </div><div class='add'>+	if (!PHANDLE_VALID(cpu_pkg))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	prom_getprop(cpu_pkg, "reg", &amp;rval, sizeof(rval));</div><div class='ctx'> 	prom.cpu = be32_to_cpu(rval);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c<br/>index b1ec62f2cc31..925a4ef90559 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/ptrace.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/context_tracking.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='hunk'>@@ -463,6 +463,10 @@ static int fpr_set(struct task_struct *target, const struct user_regset *regset,</div><div class='ctx'> </div><div class='ctx'> 	flush_fp_to_thread(target);</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; 32 ; i++)</div><div class='add'>+		buf[i] = target-&gt;thread.TS_FPR(i);</div><div class='add'>+	buf[32] = target-&gt;thread.fp_state.fpscr;</div><div class='add'>+</div><div class='ctx'> 	/* copy to local buffer then write that out */</div><div class='ctx'> 	i = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, buf, 0, -1);</div><div class='ctx'> 	if (i)</div><div class='hunk'>@@ -672,6 +676,9 @@ static int vsr_set(struct task_struct *target, const struct user_regset *regset,</div><div class='ctx'> 	flush_altivec_to_thread(target);</div><div class='ctx'> 	flush_vsx_to_thread(target);</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; 32 ; i++)</div><div class='add'>+		buf[i] = target-&gt;thread.fp_state.fpr[i][TS_VSRLOWOFFSET];</div><div class='add'>+</div><div class='ctx'> 	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='ctx'> 				 buf, 0, 32 * sizeof(double));</div><div class='ctx'> 	if (!ret)</div><div class='hunk'>@@ -1019,6 +1026,10 @@ static int tm_cfpr_set(struct task_struct *target,</div><div class='ctx'> 	flush_fp_to_thread(target);</div><div class='ctx'> 	flush_altivec_to_thread(target);</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; 32; i++)</div><div class='add'>+		buf[i] = target-&gt;thread.TS_CKFPR(i);</div><div class='add'>+	buf[32] = target-&gt;thread.ckfp_state.fpscr;</div><div class='add'>+</div><div class='ctx'> 	/* copy to local buffer then write that out */</div><div class='ctx'> 	i = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, buf, 0, -1);</div><div class='ctx'> 	if (i)</div><div class='hunk'>@@ -1283,6 +1294,9 @@ static int tm_cvsx_set(struct task_struct *target,</div><div class='ctx'> 	flush_altivec_to_thread(target);</div><div class='ctx'> 	flush_vsx_to_thread(target);</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; 32 ; i++)</div><div class='add'>+		buf[i] = target-&gt;thread.ckfp_state.fpr[i][TS_VSRLOWOFFSET];</div><div class='add'>+</div><div class='ctx'> 	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='ctx'> 				 buf, 0, 32 * sizeof(double));</div><div class='ctx'> 	if (!ret)</div><div class='head'>diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c<br/>index 010b7b310237..f37eb53de1a1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/ptrace32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/ptrace32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/ptrace32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/ptrace32.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='hunk'>@@ -73,7 +73,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,</div><div class='ctx'> 		if (get_user(addrOthers, (u32 __user * __user *)addr) != 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		copied = access_process_vm(child, (u64)addrOthers, &amp;tmp,</div><div class='add'>+		copied = ptrace_access_vm(child, (u64)addrOthers, &amp;tmp,</div><div class='ctx'> 				sizeof(tmp), FOLL_FORCE);</div><div class='ctx'> 		if (copied != sizeof(tmp))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -178,7 +178,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,</div><div class='ctx'> 		if (get_user(addrOthers, (u32 __user * __user *)addr) != 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		ret = 0;</div><div class='del'>-		if (access_process_vm(child, (u64)addrOthers, &amp;tmp,</div><div class='add'>+		if (ptrace_access_vm(child, (u64)addrOthers, &amp;tmp,</div><div class='ctx'> 					sizeof(tmp),</div><div class='ctx'> 					FOLL_FORCE | FOLL_WRITE) == sizeof(tmp))</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c<br/>index c82eed97bd22..df56dfc4b681 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/rtas-proc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/rtas-proc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/rtas-proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/rtas-proc.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c<br/>index 6a3e5de544ce..b8a4987f58cf 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/rtas.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/rtas.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/rtas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/rtas.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/udbg.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='hunk'>@@ -1145,31 +1145,29 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)</div><div class='ctx'> void __init rtas_initialize(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long rtas_region = RTAS_INSTANTIATE_MAX;</div><div class='add'>+	u32 base, size, entry;</div><div class='add'>+	int no_base, no_size, no_entry;</div><div class='ctx'> </div><div class='ctx'> 	/* Get RTAS dev node and fill up our "rtas" structure with infos</div><div class='ctx'> 	 * about it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rtas.dev = of_find_node_by_name(NULL, "rtas");</div><div class='del'>-	if (rtas.dev) {</div><div class='del'>-		const __be32 *basep, *entryp, *sizep;</div><div class='del'>-</div><div class='del'>-		basep = of_get_property(rtas.dev, "linux,rtas-base", NULL);</div><div class='del'>-		sizep = of_get_property(rtas.dev, "rtas-size", NULL);</div><div class='del'>-		if (basep != NULL &amp;&amp; sizep != NULL) {</div><div class='del'>-			rtas.base = __be32_to_cpu(*basep);</div><div class='del'>-			rtas.size = __be32_to_cpu(*sizep);</div><div class='del'>-			entryp = of_get_property(rtas.dev,</div><div class='del'>-					"linux,rtas-entry", NULL);</div><div class='del'>-			if (entryp == NULL) /* Ugh */</div><div class='del'>-				rtas.entry = rtas.base;</div><div class='del'>-			else</div><div class='del'>-				rtas.entry = __be32_to_cpu(*entryp);</div><div class='del'>-		} else</div><div class='del'>-			rtas.dev = NULL;</div><div class='del'>-	}</div><div class='ctx'> 	if (!rtas.dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	no_base = of_property_read_u32(rtas.dev, "linux,rtas-base", &amp;base);</div><div class='add'>+	no_size = of_property_read_u32(rtas.dev, "rtas-size", &amp;size);</div><div class='add'>+	if (no_base || no_size) {</div><div class='add'>+		of_node_put(rtas.dev);</div><div class='add'>+		rtas.dev = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtas.base = base;</div><div class='add'>+	rtas.size = size;</div><div class='add'>+	no_entry = of_property_read_u32(rtas.dev, "linux,rtas-entry", &amp;entry);</div><div class='add'>+	rtas.entry = no_entry ? rtas.base : entry;</div><div class='add'>+</div><div class='ctx'> 	/* If RTAS was found, allocate the RMO buffer for it and look for</div><div class='ctx'> 	 * the stop-self token if any</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c<br/>index db2b482af658..f6f6a8a5103a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/rtas_flash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/rtas_flash.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/rtas_flash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/rtas_flash.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MODULE_VERS "1.0"</div><div class='head'>diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c<br/>index a26a02006576..3650732639ed 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/rtasd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/rtasd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/rtasd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/rtasd.c</a></div><div class='hunk'>@@ -21,8 +21,9 @@</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/topology.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='hunk'>@@ -282,6 +283,7 @@ static void prrn_work_fn(struct work_struct *work)</div><div class='ctx'> 	 * the RTAS event.</div><div class='ctx'> 	 */</div><div class='ctx'> 	pseries_devicetree_update(-prrn_update_scope);</div><div class='add'>+	arch_update_cpu_topology();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static DECLARE_WORK(prrn_work, prrn_work_fn);</div><div class='hunk'>@@ -434,7 +436,10 @@ static void do_event_scan(void)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (error == 0) {</div><div class='del'>-			pSeries_log_error(logdata, ERR_TYPE_RTAS_LOG, 0);</div><div class='add'>+			if (rtas_error_type((struct rtas_error_log *)logdata) !=</div><div class='add'>+			    RTAS_TYPE_PRRN)</div><div class='add'>+				pSeries_log_error(logdata, ERR_TYPE_RTAS_LOG,</div><div class='add'>+						  0);</div><div class='ctx'> 			handle_rtas_event((struct rtas_error_log *)logdata);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c<br/>index 270ee30abdcf..4697da895133 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/setup-common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/setup-common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/setup-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/setup-common.c</a></div><div class='hunk'>@@ -87,6 +87,15 @@ EXPORT_SYMBOL(machine_id);</div><div class='ctx'> int boot_cpuid = -1;</div><div class='ctx'> EXPORT_SYMBOL_GPL(boot_cpuid);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * These are used in binfmt_elf.c to put aux entries on the stack</div><div class='add'>+ * for each elf executable being started.</div><div class='add'>+ */</div><div class='add'>+int dcache_bsize;</div><div class='add'>+int icache_bsize;</div><div class='add'>+int ucache_bsize;</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> unsigned long klimit = (unsigned long) _end;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -915,7 +924,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	init_mm.context.pte_frag = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_SPAPR_TCE_IOMMU</div><div class='del'>-	mm_iommu_init(&amp;init_mm.context);</div><div class='add'>+	mm_iommu_init(&amp;init_mm);</div><div class='ctx'> #endif</div><div class='ctx'> 	irqstack_early_init();</div><div class='ctx'> 	exc_lvl_early_init();</div><div class='head'>diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c<br/>index 5fe79182f0fa..2f88f6cf1a42 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/setup_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/setup_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/setup_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/setup_32.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;asm/bootx.h&gt;</div><div class='ctx'> #include &lt;asm/btext.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pmac_feature.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/nvram.h&gt;</div><div class='hunk'>@@ -59,14 +59,6 @@ EXPORT_SYMBOL(DMA_MODE_READ);</div><div class='ctx'> EXPORT_SYMBOL(DMA_MODE_WRITE);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * These are used in binfmt_elf.c to put aux entries on the stack</div><div class='del'>- * for each elf executable being started.</div><div class='del'>- */</div><div class='del'>-int dcache_bsize;</div><div class='del'>-int icache_bsize;</div><div class='del'>-int ucache_bsize;</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * We're called here very early in the boot.</div><div class='ctx'>  *</div><div class='ctx'>  * Note that the kernel may be running at an address which is different</div><div class='head'>diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c<br/>index 8d586cff8a41..adf2084f214b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/setup_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/setup_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/setup_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/setup_64.c</a></div><div class='hunk'>@@ -77,25 +77,18 @@</div><div class='ctx'> int spinning_secondaries;</div><div class='ctx'> u64 ppc64_pft_size;</div><div class='ctx'> </div><div class='del'>-/* Pick defaults since we might want to patch instructions</div><div class='del'>- * before we've read this from the device tree.</div><div class='del'>- */</div><div class='ctx'> struct ppc64_caches ppc64_caches = {</div><div class='del'>-	.dline_size = 0x40,</div><div class='del'>-	.log_dline_size = 6,</div><div class='del'>-	.iline_size = 0x40,</div><div class='del'>-	.log_iline_size = 6</div><div class='add'>+	.l1d = {</div><div class='add'>+		.block_size = 0x40,</div><div class='add'>+		.log_block_size = 6,</div><div class='add'>+	},</div><div class='add'>+	.l1i = {</div><div class='add'>+		.block_size = 0x40,</div><div class='add'>+		.log_block_size = 6</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(ppc64_caches);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * These are used in binfmt_elf.c to put aux entries on the stack</div><div class='del'>- * for each elf executable being started.</div><div class='del'>- */</div><div class='del'>-int dcache_bsize;</div><div class='del'>-int icache_bsize;</div><div class='del'>-int ucache_bsize;</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_PPC_BOOK3E) &amp;&amp; defined(CONFIG_SMP)</div><div class='ctx'> void __init setup_tlb_core_data(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -120,14 +113,12 @@ void __init setup_tlb_core_data(void)</div><div class='ctx'> 		 * If we have threads, we need either tlbsrx.</div><div class='ctx'> 		 * or e6500 tablewalk mode, or else TLB handlers</div><div class='ctx'> 		 * will be racy and could produce duplicate entries.</div><div class='add'>+		 * Should we panic instead?</div><div class='ctx'> 		 */</div><div class='del'>-		if (smt_enabled_at_boot &gt;= 2 &amp;&amp;</div><div class='del'>-		    !mmu_has_feature(MMU_FTR_USE_TLBRSRV) &amp;&amp;</div><div class='del'>-		    book3e_htw_mode != PPC_HTW_E6500) {</div><div class='del'>-			/* Should we panic instead? */</div><div class='del'>-			WARN_ONCE("%s: unsupported MMU configuration -- expect problems\n",</div><div class='del'>-				  __func__);</div><div class='del'>-		}</div><div class='add'>+		WARN_ONCE(smt_enabled_at_boot &gt;= 2 &amp;&amp;</div><div class='add'>+			  !mmu_has_feature(MMU_FTR_USE_TLBRSRV) &amp;&amp;</div><div class='add'>+			  book3e_htw_mode != PPC_HTW_E6500,</div><div class='add'>+			  "%s: unsupported MMU configuration\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -354,7 +345,7 @@ void early_setup_secondary(void)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)</div><div class='add'>+#if defined(CONFIG_SMP) || defined(CONFIG_KEXEC_CORE)</div><div class='ctx'> static bool use_spinloop(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_PPC_BOOK3E))</div><div class='hunk'>@@ -399,7 +390,7 @@ void smp_release_cpus(void)</div><div class='ctx'> </div><div class='ctx'> 	DBG(" &lt;- smp_release_cpus()\n");</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_SMP || CONFIG_KEXEC */</div><div class='add'>+#endif /* CONFIG_SMP || CONFIG_KEXEC_CORE */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Initialize some remaining members of the ppc64_caches and systemcfg</div><div class='hunk'>@@ -408,74 +399,135 @@ void smp_release_cpus(void)</div><div class='ctx'>  * cache informations about the CPU that will be used by cache flush</div><div class='ctx'>  * routines and/or provided to userland</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+static void init_cache_info(struct ppc_cache_info *info, u32 size, u32 lsize,</div><div class='add'>+			    u32 bsize, u32 sets)</div><div class='add'>+{</div><div class='add'>+	info-&gt;size = size;</div><div class='add'>+	info-&gt;sets = sets;</div><div class='add'>+	info-&gt;line_size = lsize;</div><div class='add'>+	info-&gt;block_size = bsize;</div><div class='add'>+	info-&gt;log_block_size = __ilog2(bsize);</div><div class='add'>+	info-&gt;blocks_per_page = PAGE_SIZE / bsize;</div><div class='add'>+</div><div class='add'>+	if (sets == 0)</div><div class='add'>+		info-&gt;assoc = 0xffff;</div><div class='add'>+	else</div><div class='add'>+		info-&gt;assoc = size / (sets * lsize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __init parse_cache_info(struct device_node *np,</div><div class='add'>+				    bool icache,</div><div class='add'>+				    struct ppc_cache_info *info)</div><div class='add'>+{</div><div class='add'>+	static const char *ipropnames[] __initdata = {</div><div class='add'>+		"i-cache-size",</div><div class='add'>+		"i-cache-sets",</div><div class='add'>+		"i-cache-block-size",</div><div class='add'>+		"i-cache-line-size",</div><div class='add'>+	};</div><div class='add'>+	static const char *dpropnames[] __initdata = {</div><div class='add'>+		"d-cache-size",</div><div class='add'>+		"d-cache-sets",</div><div class='add'>+		"d-cache-block-size",</div><div class='add'>+		"d-cache-line-size",</div><div class='add'>+	};</div><div class='add'>+	const char **propnames = icache ? ipropnames : dpropnames;</div><div class='add'>+	const __be32 *sizep, *lsizep, *bsizep, *setsp;</div><div class='add'>+	u32 size, lsize, bsize, sets;</div><div class='add'>+	bool success = true;</div><div class='add'>+</div><div class='add'>+	size = 0;</div><div class='add'>+	sets = -1u;</div><div class='add'>+	lsize = bsize = cur_cpu_spec-&gt;dcache_bsize;</div><div class='add'>+	sizep = of_get_property(np, propnames[0], NULL);</div><div class='add'>+	if (sizep != NULL)</div><div class='add'>+		size = be32_to_cpu(*sizep);</div><div class='add'>+	setsp = of_get_property(np, propnames[1], NULL);</div><div class='add'>+	if (setsp != NULL)</div><div class='add'>+		sets = be32_to_cpu(*setsp);</div><div class='add'>+	bsizep = of_get_property(np, propnames[2], NULL);</div><div class='add'>+	lsizep = of_get_property(np, propnames[3], NULL);</div><div class='add'>+	if (bsizep == NULL)</div><div class='add'>+		bsizep = lsizep;</div><div class='add'>+	if (lsizep != NULL)</div><div class='add'>+		lsize = be32_to_cpu(*lsizep);</div><div class='add'>+	if (bsizep != NULL)</div><div class='add'>+		bsize = be32_to_cpu(*bsizep);</div><div class='add'>+	if (sizep == NULL || bsizep == NULL || lsizep == NULL)</div><div class='add'>+		success = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * OF is weird .. it represents fully associative caches</div><div class='add'>+	 * as "1 way" which doesn't make much sense and doesn't</div><div class='add'>+	 * leave room for direct mapped. We'll assume that 0</div><div class='add'>+	 * in OF means direct mapped for that reason.</div><div class='add'>+	 */</div><div class='add'>+	if (sets == 1)</div><div class='add'>+		sets = 0;</div><div class='add'>+	else if (sets == 0)</div><div class='add'>+		sets = 1;</div><div class='add'>+</div><div class='add'>+	init_cache_info(info, size, lsize, bsize, sets);</div><div class='add'>+</div><div class='add'>+	return success;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init initialize_cache_info(void)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	unsigned long num_cpus = 0;</div><div class='add'>+	struct device_node *cpu = NULL, *l2, *l3 = NULL;</div><div class='add'>+	u32 pvr;</div><div class='ctx'> </div><div class='ctx'> 	DBG(" -&gt; initialize_cache_info()\n");</div><div class='ctx'> </div><div class='del'>-	for_each_node_by_type(np, "cpu") {</div><div class='del'>-		num_cpus += 1;</div><div class='add'>+	/*</div><div class='add'>+	 * All shipping POWER8 machines have a firmware bug that</div><div class='add'>+	 * puts incorrect information in the device-tree. This will</div><div class='add'>+	 * be (hopefully) fixed for future chips but for now hard</div><div class='add'>+	 * code the values if we are running on one of these</div><div class='add'>+	 */</div><div class='add'>+	pvr = PVR_VER(mfspr(SPRN_PVR));</div><div class='add'>+	if (pvr == PVR_POWER8 || pvr == PVR_POWER8E ||</div><div class='add'>+	    pvr == PVR_POWER8NVL) {</div><div class='add'>+						/* size    lsize   blk  sets */</div><div class='add'>+		init_cache_info(&amp;ppc64_caches.l1i, 0x8000,   128,  128, 32);</div><div class='add'>+		init_cache_info(&amp;ppc64_caches.l1d, 0x10000,  128,  128, 64);</div><div class='add'>+		init_cache_info(&amp;ppc64_caches.l2,  0x80000,  128,  0,   512);</div><div class='add'>+		init_cache_info(&amp;ppc64_caches.l3,  0x800000, 128,  0,   8192);</div><div class='add'>+	} else</div><div class='add'>+		cpu = of_find_node_by_type(NULL, "cpu");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We're assuming *all* of the CPUs have the same</div><div class='add'>+	 * d-cache and i-cache sizes... -Peter</div><div class='add'>+	 */</div><div class='add'>+	if (cpu) {</div><div class='add'>+		if (!parse_cache_info(cpu, false, &amp;ppc64_caches.l1d))</div><div class='add'>+			DBG("Argh, can't find dcache properties !\n");</div><div class='add'>+</div><div class='add'>+		if (!parse_cache_info(cpu, true, &amp;ppc64_caches.l1i))</div><div class='add'>+			DBG("Argh, can't find icache properties !\n");</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * We're assuming *all* of the CPUs have the same</div><div class='del'>-		 * d-cache and i-cache sizes... -Peter</div><div class='add'>+		 * Try to find the L2 and L3 if any. Assume they are</div><div class='add'>+		 * unified and use the D-side properties.</div><div class='ctx'> 		 */</div><div class='del'>-		if (num_cpus == 1) {</div><div class='del'>-			const __be32 *sizep, *lsizep;</div><div class='del'>-			u32 size, lsize;</div><div class='del'>-</div><div class='del'>-			size = 0;</div><div class='del'>-			lsize = cur_cpu_spec-&gt;dcache_bsize;</div><div class='del'>-			sizep = of_get_property(np, "d-cache-size", NULL);</div><div class='del'>-			if (sizep != NULL)</div><div class='del'>-				size = be32_to_cpu(*sizep);</div><div class='del'>-			lsizep = of_get_property(np, "d-cache-block-size",</div><div class='del'>-						 NULL);</div><div class='del'>-			/* fallback if block size missing */</div><div class='del'>-			if (lsizep == NULL)</div><div class='del'>-				lsizep = of_get_property(np,</div><div class='del'>-							 "d-cache-line-size",</div><div class='del'>-							 NULL);</div><div class='del'>-			if (lsizep != NULL)</div><div class='del'>-				lsize = be32_to_cpu(*lsizep);</div><div class='del'>-			if (sizep == NULL || lsizep == NULL)</div><div class='del'>-				DBG("Argh, can't find dcache properties ! "</div><div class='del'>-				    "sizep: %p, lsizep: %p\n", sizep, lsizep);</div><div class='del'>-</div><div class='del'>-			ppc64_caches.dsize = size;</div><div class='del'>-			ppc64_caches.dline_size = lsize;</div><div class='del'>-			ppc64_caches.log_dline_size = __ilog2(lsize);</div><div class='del'>-			ppc64_caches.dlines_per_page = PAGE_SIZE / lsize;</div><div class='del'>-</div><div class='del'>-			size = 0;</div><div class='del'>-			lsize = cur_cpu_spec-&gt;icache_bsize;</div><div class='del'>-			sizep = of_get_property(np, "i-cache-size", NULL);</div><div class='del'>-			if (sizep != NULL)</div><div class='del'>-				size = be32_to_cpu(*sizep);</div><div class='del'>-			lsizep = of_get_property(np, "i-cache-block-size",</div><div class='del'>-						 NULL);</div><div class='del'>-			if (lsizep == NULL)</div><div class='del'>-				lsizep = of_get_property(np,</div><div class='del'>-							 "i-cache-line-size",</div><div class='del'>-							 NULL);</div><div class='del'>-			if (lsizep != NULL)</div><div class='del'>-				lsize = be32_to_cpu(*lsizep);</div><div class='del'>-			if (sizep == NULL || lsizep == NULL)</div><div class='del'>-				DBG("Argh, can't find icache properties ! "</div><div class='del'>-				    "sizep: %p, lsizep: %p\n", sizep, lsizep);</div><div class='del'>-</div><div class='del'>-			ppc64_caches.isize = size;</div><div class='del'>-			ppc64_caches.iline_size = lsize;</div><div class='del'>-			ppc64_caches.log_iline_size = __ilog2(lsize);</div><div class='del'>-			ppc64_caches.ilines_per_page = PAGE_SIZE / lsize;</div><div class='add'>+		l2 = of_find_next_cache_node(cpu);</div><div class='add'>+		of_node_put(cpu);</div><div class='add'>+		if (l2) {</div><div class='add'>+			parse_cache_info(l2, false, &amp;ppc64_caches.l2);</div><div class='add'>+			l3 = of_find_next_cache_node(l2);</div><div class='add'>+			of_node_put(l2);</div><div class='add'>+		}</div><div class='add'>+		if (l3) {</div><div class='add'>+			parse_cache_info(l3, false, &amp;ppc64_caches.l3);</div><div class='add'>+			of_node_put(l3);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* For use by binfmt_elf */</div><div class='del'>-	dcache_bsize = ppc64_caches.dline_size;</div><div class='del'>-	icache_bsize = ppc64_caches.iline_size;</div><div class='add'>+	dcache_bsize = ppc64_caches.l1d.block_size;</div><div class='add'>+	icache_bsize = ppc64_caches.l1i.block_size;</div><div class='ctx'> </div><div class='ctx'> 	DBG(" &lt;- initialize_cache_info()\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c<br/>index bbe77aed198d..3a3671172436 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/signal.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/key.h&gt;</div><div class='ctx'> #include &lt;linux/context_tracking.h&gt;</div><div class='ctx'> #include &lt;asm/hw_breakpoint.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='ctx'> #include &lt;asm/tm.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c<br/>index 27aa913ac91d..97bb1385e771 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/signal_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/signal_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/signal_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/signal_32.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> #include &lt;linux/binfmts.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c<br/>index 96698fdf93b4..c83c115858c1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/signal_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/signal_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/signal_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/signal_64.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c<br/>index 9c6f3fd58059..46f89e66a273 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/smp.c</a></div><div class='hunk'>@@ -19,7 +19,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/topology.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -193,7 +194,7 @@ int smp_request_message_ipi(int virq, int msg)</div><div class='ctx'> 	if (msg &lt; 0 || msg &gt; PPC_MSG_DEBUGGER_BREAK) {</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-#if !defined(CONFIG_DEBUGGER) &amp;&amp; !defined(CONFIG_KEXEC)</div><div class='add'>+#if !defined(CONFIG_DEBUGGER) &amp;&amp; !defined(CONFIG_KEXEC_CORE)</div><div class='ctx'> 	if (msg == PPC_MSG_DEBUGGER_BREAK) {</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -325,7 +326,7 @@ void tick_broadcast(const struct cpumask *mask)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)</div><div class='add'>+#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE)</div><div class='ctx'> void smp_send_debugger_break(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -340,7 +341,7 @@ void smp_send_debugger_break(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *))</div><div class='ctx'> {</div><div class='ctx'> 	crash_ipi_function_ptr = crash_ipi_callback;</div><div class='hunk'>@@ -707,7 +708,7 @@ void start_secondary(void *unused)</div><div class='ctx'> 	unsigned int cpu = smp_processor_id();</div><div class='ctx'> 	int i, base;</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> </div><div class='ctx'> 	smp_store_cpu_info(cpu);</div><div class='hunk'>@@ -795,7 +796,7 @@ void __init smp_cpus_done(unsigned int max_cpus)</div><div class='ctx'> 	 * se we pin us down to CPU 0 for a short while</div><div class='ctx'> 	 */</div><div class='ctx'> 	alloc_cpumask_var(&amp;old_mask, GFP_NOWAIT);</div><div class='del'>-	cpumask_copy(old_mask, tsk_cpus_allowed(current));</div><div class='add'>+	cpumask_copy(old_mask, &amp;current-&gt;cpus_allowed);</div><div class='ctx'> 	set_cpus_allowed_ptr(current, cpumask_of(boot_cpuid));</div><div class='ctx'> 	</div><div class='ctx'> 	if (smp_ops &amp;&amp; smp_ops-&gt;setup_cpu)</div><div class='head'>diff --git a/arch/powerpc/kernel/stacktrace.c b/arch/powerpc/kernel/stacktrace.c<br/>index 4f24606afc3f..66711958493c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/stacktrace.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/swsusp_64.c b/arch/powerpc/kernel/swsusp_64.c<br/>index 0e899e47c325..51db012808f5 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/swsusp_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/swsusp_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/swsusp_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/swsusp_64.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/nmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> void do_after_copyback(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c<br/>index 8a285876aef8..15f216d022e2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/sys_ppc32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/sys_ppc32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/sys_ppc32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/sys_ppc32.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c<br/>index 644cce3d8dce..de04c9fbb5cd 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/syscalls.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/syscalls.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/syscalls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/syscalls.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c<br/>index c4f1d1f7bae0..c1fb255a60d6 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/sysfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/sysfs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/sysfs.c</a></div><div class='hunk'>@@ -703,7 +703,7 @@ static struct device_attribute pa6t_attrs[] = {</div><div class='ctx'> #endif /* HAS_PPC_PMC_PA6T */</div><div class='ctx'> #endif /* HAS_PPC_PMC_CLASSIC */</div><div class='ctx'> </div><div class='del'>-static void register_cpu_online(unsigned int cpu)</div><div class='add'>+static int register_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='ctx'> 	struct device *s = &amp;c-&gt;dev;</div><div class='hunk'>@@ -782,11 +782,12 @@ static void register_cpu_online(unsigned int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	cacheinfo_cpu_online(cpu);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-static void unregister_cpu_online(unsigned int cpu)</div><div class='add'>+static int unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> 	struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='ctx'> 	struct device *s = &amp;c-&gt;dev;</div><div class='ctx'> 	struct device_attribute *attrs, *pmc_attrs;</div><div class='hunk'>@@ -863,6 +864,8 @@ static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	cacheinfo_cpu_offline(cpu);</div><div class='add'>+#endif /* CONFIG_HOTPLUG_CPU */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE</div><div class='hunk'>@@ -883,32 +886,6 @@ ssize_t arch_cpu_release(const char *buf, size_t count)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_HOTPLUG_CPU */</div><div class='del'>-</div><div class='del'>-static int sysfs_cpu_notify(struct notifier_block *self,</div><div class='del'>-				      unsigned long action, void *hcpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu = (unsigned int)(long)hcpu;</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-	case CPU_ONLINE_FROZEN:</div><div class='del'>-		register_cpu_online(cpu);</div><div class='del'>-		break;</div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-	case CPU_DEAD_FROZEN:</div><div class='del'>-		unregister_cpu_online(cpu);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	return NOTIFY_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block sysfs_cpu_nb = {</div><div class='del'>-	.notifier_call	= sysfs_cpu_notify,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static DEFINE_MUTEX(cpu_mutex);</div><div class='ctx'> </div><div class='ctx'> int cpu_add_dev_attr(struct device_attribute *attr)</div><div class='hunk'>@@ -1023,12 +1000,10 @@ static DEVICE_ATTR(physical_id, 0444, show_physical_id, NULL);</div><div class='ctx'> </div><div class='ctx'> static int __init topology_init(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu;</div><div class='add'>+	int cpu, r;</div><div class='ctx'> </div><div class='ctx'> 	register_nodes();</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -1047,15 +1022,10 @@ static int __init topology_init(void)</div><div class='ctx'> </div><div class='ctx'> 			device_create_file(&amp;c-&gt;dev, &amp;dev_attr_physical_id);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (cpu_online(cpu))</div><div class='del'>-			register_cpu_online(cpu);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	__register_cpu_notifier(&amp;sysfs_cpu_nb);</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-</div><div class='add'>+	r = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "powerpc/topology:online",</div><div class='add'>+			      register_cpu_online, unregister_cpu_online);</div><div class='add'>+	WARN_ON(r &lt; 0);</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> 	sysfs_create_dscr_default();</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='head'>diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c<br/>index bc3f7d0d7b79..07b90725855e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/time.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -57,6 +58,7 @@</div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/sched/cputime.h&gt;</div><div class='ctx'> #include &lt;asm/trace.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -64,7 +66,7 @@</div><div class='ctx'> #include &lt;asm/nvram.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -72,7 +74,6 @@</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/vdso_datapage.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='del'>-#include &lt;asm/cputime.h&gt;</div><div class='ctx'> #include &lt;asm/asm-prototypes.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* powerpc clocksource/clockevent code */</div><div class='hunk'>@@ -80,7 +81,7 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/timekeeper_internal.h&gt;</div><div class='ctx'> </div><div class='del'>-static cycle_t rtc_read(struct clocksource *);</div><div class='add'>+static u64 rtc_read(struct clocksource *);</div><div class='ctx'> static struct clocksource clocksource_rtc = {</div><div class='ctx'> 	.name         = "rtc",</div><div class='ctx'> 	.rating       = 400,</div><div class='hunk'>@@ -89,7 +90,7 @@ static struct clocksource clocksource_rtc = {</div><div class='ctx'> 	.read         = rtc_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static cycle_t timebase_read(struct clocksource *);</div><div class='add'>+static u64 timebase_read(struct clocksource *);</div><div class='ctx'> static struct clocksource clocksource_timebase = {</div><div class='ctx'> 	.name         = "timebase",</div><div class='ctx'> 	.rating       = 400,</div><div class='hunk'>@@ -152,22 +153,11 @@ EXPORT_SYMBOL_GPL(ppc_tb_freq);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE</div><div class='ctx'> /*</div><div class='del'>- * Factors for converting from cputime_t (timebase ticks) to</div><div class='del'>- * jiffies, microseconds, seconds, and clock_t (1/USER_HZ seconds).</div><div class='del'>- * These are all stored as 0.64 fixed-point binary fractions.</div><div class='add'>+ * Factor for converting from cputime_t (timebase ticks) to</div><div class='add'>+ * microseconds. This is stored as 0.64 fixed-point binary fraction.</div><div class='ctx'>  */</div><div class='del'>-u64 __cputime_jiffies_factor;</div><div class='del'>-EXPORT_SYMBOL(__cputime_jiffies_factor);</div><div class='ctx'> u64 __cputime_usec_factor;</div><div class='ctx'> EXPORT_SYMBOL(__cputime_usec_factor);</div><div class='del'>-u64 __cputime_sec_factor;</div><div class='del'>-EXPORT_SYMBOL(__cputime_sec_factor);</div><div class='del'>-u64 __cputime_clockt_factor;</div><div class='del'>-EXPORT_SYMBOL(__cputime_clockt_factor);</div><div class='del'>-DEFINE_PER_CPU(unsigned long, cputime_last_delta);</div><div class='del'>-DEFINE_PER_CPU(unsigned long, cputime_scaled_last_delta);</div><div class='del'>-</div><div class='del'>-cputime_t cputime_one_jiffy;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_SPLPAR</div><div class='ctx'> void (*dtl_consumer)(struct dtl_entry *, u64);</div><div class='hunk'>@@ -183,14 +173,8 @@ static void calc_cputime_factors(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct div_result res;</div><div class='ctx'> </div><div class='del'>-	div128_by_32(HZ, 0, tb_ticks_per_sec, &amp;res);</div><div class='del'>-	__cputime_jiffies_factor = res.result_low;</div><div class='ctx'> 	div128_by_32(1000000, 0, tb_ticks_per_sec, &amp;res);</div><div class='ctx'> 	__cputime_usec_factor = res.result_low;</div><div class='del'>-	div128_by_32(1, 0, tb_ticks_per_sec, &amp;res);</div><div class='del'>-	__cputime_sec_factor = res.result_low;</div><div class='del'>-	div128_by_32(USER_HZ, 0, tb_ticks_per_sec, &amp;res);</div><div class='del'>-	__cputime_clockt_factor = res.result_low;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -273,25 +257,19 @@ void accumulate_stolen_time(void)</div><div class='ctx'> </div><div class='ctx'> 	sst = scan_dispatch_log(acct-&gt;starttime_user);</div><div class='ctx'> 	ust = scan_dispatch_log(acct-&gt;starttime);</div><div class='del'>-	acct-&gt;system_time -= sst;</div><div class='del'>-	acct-&gt;user_time -= ust;</div><div class='del'>-	local_paca-&gt;stolen_time += ust + sst;</div><div class='add'>+	acct-&gt;stime -= sst;</div><div class='add'>+	acct-&gt;utime -= ust;</div><div class='add'>+	acct-&gt;steal_time += ust + sst;</div><div class='ctx'> </div><div class='ctx'> 	local_paca-&gt;soft_enabled = save_soft_enabled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u64 calculate_stolen_time(u64 stop_tb)</div><div class='ctx'> {</div><div class='del'>-	u64 stolen = 0;</div><div class='add'>+	if (get_paca()-&gt;dtl_ridx != be64_to_cpu(get_lppaca()-&gt;dtl_idx))</div><div class='add'>+		return scan_dispatch_log(stop_tb);</div><div class='ctx'> </div><div class='del'>-	if (get_paca()-&gt;dtl_ridx != be64_to_cpu(get_lppaca()-&gt;dtl_idx)) {</div><div class='del'>-		stolen = scan_dispatch_log(stop_tb);</div><div class='del'>-		get_paca()-&gt;accounting.system_time -= stolen;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stolen += get_paca()-&gt;stolen_time;</div><div class='del'>-	get_paca()-&gt;stolen_time = 0;</div><div class='del'>-	return stolen;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_PPC_SPLPAR */</div><div class='hunk'>@@ -307,28 +285,27 @@ static inline u64 calculate_stolen_time(u64 stop_tb)</div><div class='ctx'>  * or soft irq state.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long vtime_delta(struct task_struct *tsk,</div><div class='del'>-				 unsigned long *sys_scaled,</div><div class='del'>-				 unsigned long *stolen)</div><div class='add'>+				 unsigned long *stime_scaled,</div><div class='add'>+				 unsigned long *steal_time)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long now, nowscaled, deltascaled;</div><div class='del'>-	unsigned long udelta, delta, user_scaled;</div><div class='add'>+	unsigned long stime;</div><div class='add'>+	unsigned long utime, utime_scaled;</div><div class='ctx'> 	struct cpu_accounting_data *acct = get_accounting(tsk);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(!irqs_disabled());</div><div class='ctx'> </div><div class='ctx'> 	now = mftb();</div><div class='ctx'> 	nowscaled = read_spurr(now);</div><div class='del'>-	acct-&gt;system_time += now - acct-&gt;starttime;</div><div class='add'>+	stime = now - acct-&gt;starttime;</div><div class='ctx'> 	acct-&gt;starttime = now;</div><div class='ctx'> 	deltascaled = nowscaled - acct-&gt;startspurr;</div><div class='ctx'> 	acct-&gt;startspurr = nowscaled;</div><div class='ctx'> </div><div class='del'>-	*stolen = calculate_stolen_time(now);</div><div class='add'>+	*steal_time = calculate_stolen_time(now);</div><div class='ctx'> </div><div class='del'>-	delta = acct-&gt;system_time;</div><div class='del'>-	acct-&gt;system_time = 0;</div><div class='del'>-	udelta = acct-&gt;user_time - acct-&gt;utime_sspurr;</div><div class='del'>-	acct-&gt;utime_sspurr = acct-&gt;user_time;</div><div class='add'>+	utime = acct-&gt;utime - acct-&gt;utime_sspurr;</div><div class='add'>+	acct-&gt;utime_sspurr = acct-&gt;utime;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Because we don't read the SPURR on every kernel entry/exit,</div><div class='hunk'>@@ -340,60 +317,105 @@ static unsigned long vtime_delta(struct task_struct *tsk,</div><div class='ctx'> 	 * the user ticks get saved up in paca-&gt;user_time_scaled to be</div><div class='ctx'> 	 * used by account_process_tick.</div><div class='ctx'> 	 */</div><div class='del'>-	*sys_scaled = delta;</div><div class='del'>-	user_scaled = udelta;</div><div class='del'>-	if (deltascaled != delta + udelta) {</div><div class='del'>-		if (udelta) {</div><div class='del'>-			*sys_scaled = deltascaled * delta / (delta + udelta);</div><div class='del'>-			user_scaled = deltascaled - *sys_scaled;</div><div class='add'>+	*stime_scaled = stime;</div><div class='add'>+	utime_scaled = utime;</div><div class='add'>+	if (deltascaled != stime + utime) {</div><div class='add'>+		if (utime) {</div><div class='add'>+			*stime_scaled = deltascaled * stime / (stime + utime);</div><div class='add'>+			utime_scaled = deltascaled - *stime_scaled;</div><div class='ctx'> 		} else {</div><div class='del'>-			*sys_scaled = deltascaled;</div><div class='add'>+			*stime_scaled = deltascaled;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	acct-&gt;user_time_scaled += user_scaled;</div><div class='add'>+	acct-&gt;utime_scaled += utime_scaled;</div><div class='ctx'> </div><div class='del'>-	return delta;</div><div class='add'>+	return stime;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void vtime_account_system(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='del'>-	unsigned long delta, sys_scaled, stolen;</div><div class='add'>+	unsigned long stime, stime_scaled, steal_time;</div><div class='add'>+	struct cpu_accounting_data *acct = get_accounting(tsk);</div><div class='add'>+</div><div class='add'>+	stime = vtime_delta(tsk, &amp;stime_scaled, &amp;steal_time);</div><div class='ctx'> </div><div class='del'>-	delta = vtime_delta(tsk, &amp;sys_scaled, &amp;stolen);</div><div class='del'>-	account_system_time(tsk, 0, delta, sys_scaled);</div><div class='del'>-	if (stolen)</div><div class='del'>-		account_steal_time(stolen);</div><div class='add'>+	stime -= min(stime, steal_time);</div><div class='add'>+	acct-&gt;steal_time += steal_time;</div><div class='add'>+</div><div class='add'>+	if ((tsk-&gt;flags &amp; PF_VCPU) &amp;&amp; !irq_count()) {</div><div class='add'>+		acct-&gt;gtime += stime;</div><div class='add'>+		acct-&gt;utime_scaled += stime_scaled;</div><div class='add'>+	} else {</div><div class='add'>+		if (hardirq_count())</div><div class='add'>+			acct-&gt;hardirq_time += stime;</div><div class='add'>+		else if (in_serving_softirq())</div><div class='add'>+			acct-&gt;softirq_time += stime;</div><div class='add'>+		else</div><div class='add'>+			acct-&gt;stime += stime;</div><div class='add'>+</div><div class='add'>+		acct-&gt;stime_scaled += stime_scaled;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vtime_account_system);</div><div class='ctx'> </div><div class='ctx'> void vtime_account_idle(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='del'>-	unsigned long delta, sys_scaled, stolen;</div><div class='add'>+	unsigned long stime, stime_scaled, steal_time;</div><div class='add'>+	struct cpu_accounting_data *acct = get_accounting(tsk);</div><div class='ctx'> </div><div class='del'>-	delta = vtime_delta(tsk, &amp;sys_scaled, &amp;stolen);</div><div class='del'>-	account_idle_time(delta + stolen);</div><div class='add'>+	stime = vtime_delta(tsk, &amp;stime_scaled, &amp;steal_time);</div><div class='add'>+	acct-&gt;idle_time += stime + steal_time;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Transfer the user time accumulated in the paca</div><div class='del'>- * by the exception entry and exit code to the generic</div><div class='del'>- * process user time records.</div><div class='add'>+ * Account the whole cputime accumulated in the paca</div><div class='ctx'>  * Must be called with interrupts disabled.</div><div class='ctx'>  * Assumes that vtime_account_system/idle() has been called</div><div class='ctx'>  * recently (i.e. since the last entry from usermode) so that</div><div class='ctx'>  * get_paca()-&gt;user_time_scaled is up to date.</div><div class='ctx'>  */</div><div class='del'>-void vtime_account_user(struct task_struct *tsk)</div><div class='add'>+void vtime_flush(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='del'>-	cputime_t utime, utimescaled;</div><div class='ctx'> 	struct cpu_accounting_data *acct = get_accounting(tsk);</div><div class='ctx'> </div><div class='del'>-	utime = acct-&gt;user_time;</div><div class='del'>-	utimescaled = acct-&gt;user_time_scaled;</div><div class='del'>-	acct-&gt;user_time = 0;</div><div class='del'>-	acct-&gt;user_time_scaled = 0;</div><div class='add'>+	if (acct-&gt;utime)</div><div class='add'>+		account_user_time(tsk, cputime_to_nsecs(acct-&gt;utime));</div><div class='add'>+</div><div class='add'>+	if (acct-&gt;utime_scaled)</div><div class='add'>+		tsk-&gt;utimescaled += cputime_to_nsecs(acct-&gt;utime_scaled);</div><div class='add'>+</div><div class='add'>+	if (acct-&gt;gtime)</div><div class='add'>+		account_guest_time(tsk, cputime_to_nsecs(acct-&gt;gtime));</div><div class='add'>+</div><div class='add'>+	if (acct-&gt;steal_time)</div><div class='add'>+		account_steal_time(cputime_to_nsecs(acct-&gt;steal_time));</div><div class='add'>+</div><div class='add'>+	if (acct-&gt;idle_time)</div><div class='add'>+		account_idle_time(cputime_to_nsecs(acct-&gt;idle_time));</div><div class='add'>+</div><div class='add'>+	if (acct-&gt;stime)</div><div class='add'>+		account_system_index_time(tsk, cputime_to_nsecs(acct-&gt;stime),</div><div class='add'>+					  CPUTIME_SYSTEM);</div><div class='add'>+	if (acct-&gt;stime_scaled)</div><div class='add'>+		tsk-&gt;stimescaled += cputime_to_nsecs(acct-&gt;stime_scaled);</div><div class='add'>+</div><div class='add'>+	if (acct-&gt;hardirq_time)</div><div class='add'>+		account_system_index_time(tsk, cputime_to_nsecs(acct-&gt;hardirq_time),</div><div class='add'>+					  CPUTIME_IRQ);</div><div class='add'>+	if (acct-&gt;softirq_time)</div><div class='add'>+		account_system_index_time(tsk, cputime_to_nsecs(acct-&gt;softirq_time),</div><div class='add'>+					  CPUTIME_SOFTIRQ);</div><div class='add'>+</div><div class='add'>+	acct-&gt;utime = 0;</div><div class='add'>+	acct-&gt;utime_scaled = 0;</div><div class='ctx'> 	acct-&gt;utime_sspurr = 0;</div><div class='del'>-	account_user_time(tsk, utime, utimescaled);</div><div class='add'>+	acct-&gt;gtime = 0;</div><div class='add'>+	acct-&gt;steal_time = 0;</div><div class='add'>+	acct-&gt;idle_time = 0;</div><div class='add'>+	acct-&gt;stime = 0;</div><div class='add'>+	acct-&gt;stime_scaled = 0;</div><div class='add'>+	acct-&gt;hardirq_time = 0;</div><div class='add'>+	acct-&gt;softirq_time = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC32</div><div class='hunk'>@@ -407,8 +429,7 @@ void arch_vtime_task_switch(struct task_struct *prev)</div><div class='ctx'> 	struct cpu_accounting_data *acct = get_accounting(current);</div><div class='ctx'> </div><div class='ctx'> 	acct-&gt;starttime = get_accounting(prev)-&gt;starttime;</div><div class='del'>-	acct-&gt;system_time = 0;</div><div class='del'>-	acct-&gt;user_time = 0;</div><div class='add'>+	acct-&gt;startspurr = get_accounting(prev)-&gt;startspurr;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PPC32 */</div><div class='ctx'> </div><div class='hunk'>@@ -689,7 +710,7 @@ unsigned long long running_clock(void)</div><div class='ctx'> 	 * time and on a host which doesn't do any virtualisation TB *should* equal</div><div class='ctx'> 	 * VTB so it makes no difference anyway.</div><div class='ctx'> 	 */</div><div class='del'>-	return local_clock() - cputime_to_nsecs(kcpustat_this_cpu-&gt;cpustat[CPUTIME_STEAL]);</div><div class='add'>+	return local_clock() - kcpustat_this_cpu-&gt;cpustat[CPUTIME_STEAL];</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -802,18 +823,18 @@ void read_persistent_clock(struct timespec *ts)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* clocksource code */</div><div class='del'>-static cycle_t rtc_read(struct clocksource *cs)</div><div class='add'>+static u64 rtc_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)get_rtc();</div><div class='add'>+	return (u64)get_rtc();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t timebase_read(struct clocksource *cs)</div><div class='add'>+static u64 timebase_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)get_tb();</div><div class='add'>+	return (u64)get_tb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,</div><div class='del'>-			 struct clocksource *clock, u32 mult, cycle_t cycle_last)</div><div class='add'>+			 struct clocksource *clock, u32 mult, u64 cycle_last)</div><div class='ctx'> {</div><div class='ctx'> 	u64 new_tb_to_xs, new_stamp_xsec;</div><div class='ctx'> 	u32 frac_sec;</div><div class='hunk'>@@ -1018,7 +1039,6 @@ void __init time_init(void)</div><div class='ctx'> 	tb_ticks_per_sec = ppc_tb_freq;</div><div class='ctx'> 	tb_ticks_per_usec = ppc_tb_freq / 1000000;</div><div class='ctx'> 	calc_cputime_factors();</div><div class='del'>-	setup_cputime_one_jiffy();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Compute scale factor for sched_clock.</div><div class='head'>diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c<br/>index 023a462725b5..ff365f9de27a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/traps.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='hunk'>@@ -40,7 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/emulated_ops.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='hunk'>@@ -64,8 +65,9 @@</div><div class='ctx'> #include &lt;asm/asm-prototypes.h&gt;</div><div class='ctx'> #include &lt;asm/hmi.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='add'>+#include &lt;asm/kprobes.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)</div><div class='add'>+#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE)</div><div class='ctx'> int (*__debugger)(struct pt_regs *regs) __read_mostly;</div><div class='ctx'> int (*__debugger_ipi)(struct pt_regs *regs) __read_mostly;</div><div class='ctx'> int (*__debugger_bpt)(struct pt_regs *regs) __read_mostly;</div><div class='hunk'>@@ -122,9 +124,6 @@ static unsigned long oops_begin(struct pt_regs *regs)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (debugger(regs))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='ctx'> 	oops_enter();</div><div class='ctx'> </div><div class='ctx'> 	/* racy, but better than risking deadlock. */</div><div class='hunk'>@@ -150,14 +149,15 @@ static void oops_end(unsigned long flags, struct pt_regs *regs,</div><div class='ctx'> 			       int signr)</div><div class='ctx'> {</div><div class='ctx'> 	bust_spinlocks(0);</div><div class='del'>-	die_owner = -1;</div><div class='ctx'> 	add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);</div><div class='ctx'> 	die_nest_count--;</div><div class='ctx'> 	oops_exit();</div><div class='ctx'> 	printk("\n");</div><div class='del'>-	if (!die_nest_count)</div><div class='add'>+	if (!die_nest_count) {</div><div class='ctx'> 		/* Nest count reaches zero, release the lock. */</div><div class='add'>+		die_owner = -1;</div><div class='ctx'> 		arch_spin_unlock(&amp;die_lock);</div><div class='add'>+	}</div><div class='ctx'> 	raw_local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 	crash_fadump(regs, "die oops");</div><div class='hunk'>@@ -227,8 +227,12 @@ NOKPROBE_SYMBOL(__die);</div><div class='ctx'> </div><div class='ctx'> void die(const char *str, struct pt_regs *regs, long err)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags = oops_begin(regs);</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	if (debugger(regs))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	flags = oops_begin(regs);</div><div class='ctx'> 	if (__die(str, regs, err))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	oops_end(flags, regs, err);</div><div class='hunk'>@@ -365,7 +369,7 @@ static inline int check_io_access(struct pt_regs *regs)</div><div class='ctx'> 			       (*nip &amp; 0x100)? "OUT to": "IN from",</div><div class='ctx'> 			       regs-&gt;gpr[rb] - _IO_BASE, nip);</div><div class='ctx'> 			regs-&gt;msr |= MSR_RI;</div><div class='del'>-			regs-&gt;nip = entry-&gt;fixup;</div><div class='add'>+			regs-&gt;nip = extable_fixup(entry);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -824,6 +828,9 @@ void single_step_exception(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	clear_single_step(regs);</div><div class='ctx'> </div><div class='add'>+	if (kprobe_post_handler(regs))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (notify_die(DIE_SSTEP, "single_step", regs, 5,</div><div class='ctx'> 					5, SIGTRAP) == NOTIFY_STOP)</div><div class='ctx'> 		goto bail;</div><div class='hunk'>@@ -1177,6 +1184,9 @@ void program_check_exception(struct pt_regs *regs)</div><div class='ctx'> 		if (debugger_bpt(regs))</div><div class='ctx'> 			goto bail;</div><div class='ctx'> </div><div class='add'>+		if (kprobe_handler(regs))</div><div class='add'>+			goto bail;</div><div class='add'>+</div><div class='ctx'> 		/* trap exception */</div><div class='ctx'> 		if (notify_die(DIE_BPT, "breakpoint", regs, 5, 5, SIGTRAP)</div><div class='ctx'> 				== NOTIFY_STOP)</div><div class='hunk'>@@ -1430,7 +1440,6 @@ void facility_unavailable_exception(struct pt_regs *regs)</div><div class='ctx'> 		[FSCR_TM_LG] = "TM",</div><div class='ctx'> 		[FSCR_EBB_LG] = "EBB",</div><div class='ctx'> 		[FSCR_TAR_LG] = "TAR",</div><div class='del'>-		[FSCR_LM_LG] = "LM",</div><div class='ctx'> 	};</div><div class='ctx'> 	char *facility = "unknown";</div><div class='ctx'> 	u64 value;</div><div class='hunk'>@@ -1488,14 +1497,6 @@ void facility_unavailable_exception(struct pt_regs *regs)</div><div class='ctx'> 			emulate_single_step(regs);</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='del'>-	} else if ((status == FSCR_LM_LG) &amp;&amp; cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='del'>-		/*</div><div class='del'>-		 * This process has touched LM, so turn it on forever</div><div class='del'>-		 * for this process</div><div class='del'>-		 */</div><div class='del'>-		current-&gt;thread.fscr |= FSCR_LM;</div><div class='del'>-		mtspr(SPRN_FSCR, current-&gt;thread.fscr);</div><div class='del'>-		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status == FSCR_TM_LG) {</div><div class='hunk'>@@ -1519,7 +1520,8 @@ void facility_unavailable_exception(struct pt_regs *regs)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((status &lt; ARRAY_SIZE(facility_strings)) &amp;&amp;</div><div class='add'>+	if ((hv || status &gt;= 2) &amp;&amp;</div><div class='add'>+	    (status &lt; ARRAY_SIZE(facility_strings)) &amp;&amp;</div><div class='ctx'> 	    facility_strings[status])</div><div class='ctx'> 		facility = facility_strings[status];</div><div class='ctx'> </div><div class='hunk'>@@ -1527,9 +1529,8 @@ void facility_unavailable_exception(struct pt_regs *regs)</div><div class='ctx'> 	if (!arch_irq_disabled_regs(regs))</div><div class='ctx'> 		local_irq_enable();</div><div class='ctx'> </div><div class='del'>-	pr_err_ratelimited(</div><div class='del'>-		"%sFacility '%s' unavailable, exception at 0x%lx, MSR=%lx\n",</div><div class='del'>-		hv ? "Hypervisor " : "", facility, regs-&gt;nip, regs-&gt;msr);</div><div class='add'>+	pr_err_ratelimited("%sFacility '%s' unavailable (%d), exception at 0x%lx, MSR=%lx\n",</div><div class='add'>+		hv ? "Hypervisor " : "", facility, status, regs-&gt;nip, regs-&gt;msr);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (user_mode(regs)) {</div><div class='hunk'>@@ -1754,6 +1755,9 @@ void DebugException(struct pt_regs *regs, unsigned long debug_status)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (kprobe_post_handler(regs))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='ctx'> 		if (notify_die(DIE_SSTEP, "block_step", regs, 5,</div><div class='ctx'> 			       5, SIGTRAP) == NOTIFY_STOP) {</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -1768,6 +1772,9 @@ void DebugException(struct pt_regs *regs, unsigned long debug_status)</div><div class='ctx'> 		/* Clear the instruction completion event */</div><div class='ctx'> 		mtspr(SPRN_DBSR, DBSR_IC);</div><div class='ctx'> </div><div class='add'>+		if (kprobe_post_handler(regs))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='ctx'> 		if (notify_die(DIE_SSTEP, "single_step", regs, 5,</div><div class='ctx'> 			       5, SIGTRAP) == NOTIFY_STOP) {</div><div class='ctx'> 			return;</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c<br/>index 4111d30badfa..22b01a3962f0 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/vdso.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/vdso.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/vdso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/vdso.c</a></div><div class='hunk'>@@ -736,16 +736,14 @@ static int __init vdso_init(void)</div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='ctx'> 		vdso_data-&gt;platform |= 1;</div><div class='ctx'> 	vdso_data-&gt;physicalMemorySize = memblock_phys_mem_size();</div><div class='del'>-	vdso_data-&gt;dcache_size = ppc64_caches.dsize;</div><div class='del'>-	vdso_data-&gt;dcache_line_size = ppc64_caches.dline_size;</div><div class='del'>-	vdso_data-&gt;icache_size = ppc64_caches.isize;</div><div class='del'>-	vdso_data-&gt;icache_line_size = ppc64_caches.iline_size;</div><div class='del'>-</div><div class='del'>-	/* XXXOJN: Blocks should be added to ppc64_caches and used instead */</div><div class='del'>-	vdso_data-&gt;dcache_block_size = ppc64_caches.dline_size;</div><div class='del'>-	vdso_data-&gt;icache_block_size = ppc64_caches.iline_size;</div><div class='del'>-	vdso_data-&gt;dcache_log_block_size = ppc64_caches.log_dline_size;</div><div class='del'>-	vdso_data-&gt;icache_log_block_size = ppc64_caches.log_iline_size;</div><div class='add'>+	vdso_data-&gt;dcache_size = ppc64_caches.l1d.size;</div><div class='add'>+	vdso_data-&gt;dcache_line_size = ppc64_caches.l1d.line_size;</div><div class='add'>+	vdso_data-&gt;icache_size = ppc64_caches.l1i.size;</div><div class='add'>+	vdso_data-&gt;icache_line_size = ppc64_caches.l1i.line_size;</div><div class='add'>+	vdso_data-&gt;dcache_block_size = ppc64_caches.l1d.block_size;</div><div class='add'>+	vdso_data-&gt;icache_block_size = ppc64_caches.l1i.block_size;</div><div class='add'>+	vdso_data-&gt;dcache_log_block_size = ppc64_caches.l1d.log_block_size;</div><div class='add'>+	vdso_data-&gt;icache_log_block_size = ppc64_caches.l1i.log_block_size;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Calculate the size of the 64 bits vDSO</div><div class='head'>diff --git a/arch/powerpc/kernel/vecemu.c b/arch/powerpc/kernel/vecemu.c<br/>index c4bfadb2606b..2d8f6d8ccafc 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/vecemu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/vecemu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kernel/vecemu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kernel/vecemu.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Functions in vector.S */</div><div class='ctx'> extern void vaddfp(vector128 *dst, vector128 *a, vector128 *b);</div><div class='head'>diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile<br/>index 7dd89b79d038..b87ccde2137a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/Makefile</a></div><div class='hunk'>@@ -70,7 +70,8 @@ endif</div><div class='ctx'> kvm-hv-y += \</div><div class='ctx'> 	book3s_hv.o \</div><div class='ctx'> 	book3s_hv_interrupts.o \</div><div class='del'>-	book3s_64_mmu_hv.o</div><div class='add'>+	book3s_64_mmu_hv.o \</div><div class='add'>+	book3s_64_mmu_radix.o</div><div class='ctx'> </div><div class='ctx'> kvm-book3s_64-builtin-xics-objs-$(CONFIG_KVM_XICS) := \</div><div class='ctx'> 	book3s_hv_rm_xics.o</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c<br/>index b6952dd23152..b6b5c185bd92 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_ppc.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_book3s.h&gt;</div><div class='hunk'>@@ -239,6 +239,7 @@ void kvmppc_core_queue_data_storage(struct kvm_vcpu *vcpu, ulong dar,</div><div class='ctx'> 	kvmppc_set_dsisr(vcpu, flags);</div><div class='ctx'> 	kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_DATA_STORAGE);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(kvmppc_core_queue_data_storage);	/* used by kvm_hv */</div><div class='ctx'> </div><div class='ctx'> void kvmppc_core_queue_inst_storage(struct kvm_vcpu *vcpu, ulong flags)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_32_mmu.c b/arch/powerpc/kvm/book3s_32_mmu.c<br/>index a2eb6d354a57..1992676c7a94 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_32_mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_32_mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_32_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_32_mmu.c</a></div><div class='hunk'>@@ -224,7 +224,8 @@ static int kvmppc_mmu_book3s_32_xlate_pte(struct kvm_vcpu *vcpu, gva_t eaddr,</div><div class='ctx'> 	ptem = kvmppc_mmu_book3s_32_get_ptem(sre, eaddr, primary);</div><div class='ctx'> </div><div class='ctx'> 	if(copy_from_user(pteg, (void __user *)ptegp, sizeof(pteg))) {</div><div class='del'>-		printk(KERN_ERR "KVM: Can't copy data from 0x%lx!\n", ptegp);</div><div class='add'>+		printk_ratelimited(KERN_ERR</div><div class='add'>+			"KVM: Can't copy data from 0x%lx!\n", ptegp);</div><div class='ctx'> 		goto no_page_found;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c<br/>index b9131aa1aedf..70153578131a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_64_mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_64_mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_64_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_64_mmu.c</a></div><div class='hunk'>@@ -265,7 +265,8 @@ do_second:</div><div class='ctx'> 		goto no_page_found;</div><div class='ctx'> </div><div class='ctx'> 	if(copy_from_user(pteg, (void __user *)ptegp, sizeof(pteg))) {</div><div class='del'>-		printk(KERN_ERR "KVM can't copy data from 0x%lx!\n", ptegp);</div><div class='add'>+		printk_ratelimited(KERN_ERR</div><div class='add'>+			"KVM: Can't copy data from 0x%lx!\n", ptegp);</div><div class='ctx'> 		goto no_page_found;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c<br/>index 05f09ae82587..f3158fb16de3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_64_mmu_hv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_64_mmu_hv.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_64_mmu_hv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_64_mmu_hv.c</a></div><div class='hunk'>@@ -40,82 +40,104 @@</div><div class='ctx'> </div><div class='ctx'> #include "trace_hv.h"</div><div class='ctx'> </div><div class='del'>-/* Power architecture requires HPT is at least 256kB */</div><div class='del'>-#define PPC_MIN_HPT_ORDER	18</div><div class='add'>+//#define DEBUG_RESIZE_HPT	1</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_RESIZE_HPT</div><div class='add'>+#define resize_hpt_debug(resize, ...)				\</div><div class='add'>+	do {							\</div><div class='add'>+		printk(KERN_DEBUG "RESIZE HPT %p: ", resize);	\</div><div class='add'>+		printk(__VA_ARGS__);				\</div><div class='add'>+	} while (0)</div><div class='add'>+#else</div><div class='add'>+#define resize_hpt_debug(resize, ...)				\</div><div class='add'>+	do { } while (0)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static long kvmppc_virtmode_do_h_enter(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> 				long pte_index, unsigned long pteh,</div><div class='ctx'> 				unsigned long ptel, unsigned long *pte_idx_ret);</div><div class='add'>+</div><div class='add'>+struct kvm_resize_hpt {</div><div class='add'>+	/* These fields read-only after init */</div><div class='add'>+	struct kvm *kvm;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	u32 order;</div><div class='add'>+</div><div class='add'>+	/* These fields protected by kvm-&gt;lock */</div><div class='add'>+	int error;</div><div class='add'>+	bool prepare_done;</div><div class='add'>+</div><div class='add'>+	/* Private to the work thread, until prepare_done is true,</div><div class='add'>+	 * then protected by kvm-&gt;resize_hpt_sem */</div><div class='add'>+	struct kvm_hpt_info hpt;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void kvmppc_rmap_reset(struct kvm *kvm);</div><div class='ctx'> </div><div class='del'>-long kvmppc_alloc_hpt(struct kvm *kvm, u32 *htab_orderp)</div><div class='add'>+int kvmppc_allocate_hpt(struct kvm_hpt_info *info, u32 order)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long hpt = 0;</div><div class='del'>-	struct revmap_entry *rev;</div><div class='add'>+	int cma = 0;</div><div class='ctx'> 	struct page *page = NULL;</div><div class='del'>-	long order = KVM_DEFAULT_HPT_ORDER;</div><div class='add'>+	struct revmap_entry *rev;</div><div class='add'>+	unsigned long npte;</div><div class='ctx'> </div><div class='del'>-	if (htab_orderp) {</div><div class='del'>-		order = *htab_orderp;</div><div class='del'>-		if (order &lt; PPC_MIN_HPT_ORDER)</div><div class='del'>-			order = PPC_MIN_HPT_ORDER;</div><div class='del'>-	}</div><div class='add'>+	if ((order &lt; PPC_MIN_HPT_ORDER) || (order &gt; PPC_MAX_HPT_ORDER))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	kvm-&gt;arch.hpt_cma_alloc = 0;</div><div class='del'>-	page = kvm_alloc_hpt(1ul &lt;&lt; (order - PAGE_SHIFT));</div><div class='add'>+	page = kvm_alloc_hpt_cma(1ul &lt;&lt; (order - PAGE_SHIFT));</div><div class='ctx'> 	if (page) {</div><div class='ctx'> 		hpt = (unsigned long)pfn_to_kaddr(page_to_pfn(page));</div><div class='ctx'> 		memset((void *)hpt, 0, (1ul &lt;&lt; order));</div><div class='del'>-		kvm-&gt;arch.hpt_cma_alloc = 1;</div><div class='add'>+		cma = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Lastly try successively smaller sizes from the page allocator */</div><div class='del'>-	/* Only do this if userspace didn't specify a size via ioctl */</div><div class='del'>-	while (!hpt &amp;&amp; order &gt; PPC_MIN_HPT_ORDER &amp;&amp; !htab_orderp) {</div><div class='del'>-		hpt = __get_free_pages(GFP_KERNEL|__GFP_ZERO|__GFP_REPEAT|</div><div class='del'>-				       __GFP_NOWARN, order - PAGE_SHIFT);</div><div class='del'>-		if (!hpt)</div><div class='del'>-			--order;</div><div class='del'>-	}</div><div class='add'>+	if (!hpt)</div><div class='add'>+		hpt = __get_free_pages(GFP_KERNEL|__GFP_ZERO|__GFP_REPEAT</div><div class='add'>+				       |__GFP_NOWARN, order - PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	if (!hpt)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	kvm-&gt;arch.hpt_virt = hpt;</div><div class='del'>-	kvm-&gt;arch.hpt_order = order;</div><div class='ctx'> 	/* HPTEs are 2**4 bytes long */</div><div class='del'>-	kvm-&gt;arch.hpt_npte = 1ul &lt;&lt; (order - 4);</div><div class='del'>-	/* 128 (2**7) bytes in each HPTEG */</div><div class='del'>-	kvm-&gt;arch.hpt_mask = (1ul &lt;&lt; (order - 7)) - 1;</div><div class='add'>+	npte = 1ul &lt;&lt; (order - 4);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate reverse map array */</div><div class='del'>-	rev = vmalloc(sizeof(struct revmap_entry) * kvm-&gt;arch.hpt_npte);</div><div class='add'>+	rev = vmalloc(sizeof(struct revmap_entry) * npte);</div><div class='ctx'> 	if (!rev) {</div><div class='del'>-		pr_err("kvmppc_alloc_hpt: Couldn't alloc reverse map array\n");</div><div class='del'>-		goto out_freehpt;</div><div class='add'>+		pr_err("kvmppc_allocate_hpt: Couldn't alloc reverse map array\n");</div><div class='add'>+		if (cma)</div><div class='add'>+			kvm_free_hpt_cma(page, 1 &lt;&lt; (order - PAGE_SHIFT));</div><div class='add'>+		else</div><div class='add'>+			free_pages(hpt, order - PAGE_SHIFT);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	kvm-&gt;arch.revmap = rev;</div><div class='del'>-	kvm-&gt;arch.sdr1 = __pa(hpt) | (order - 18);</div><div class='ctx'> </div><div class='del'>-	pr_info("KVM guest htab at %lx (order %ld), LPID %x\n",</div><div class='del'>-		hpt, order, kvm-&gt;arch.lpid);</div><div class='add'>+	info-&gt;order = order;</div><div class='add'>+	info-&gt;virt = hpt;</div><div class='add'>+	info-&gt;cma = cma;</div><div class='add'>+	info-&gt;rev = rev;</div><div class='ctx'> </div><div class='del'>-	if (htab_orderp)</div><div class='del'>-		*htab_orderp = order;</div><div class='ctx'> 	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>- out_freehpt:</div><div class='del'>-	if (kvm-&gt;arch.hpt_cma_alloc)</div><div class='del'>-		kvm_release_hpt(page, 1 &lt;&lt; (order - PAGE_SHIFT));</div><div class='del'>-	else</div><div class='del'>-		free_pages(hpt, order - PAGE_SHIFT);</div><div class='del'>-	return -ENOMEM;</div><div class='add'>+void kvmppc_set_hpt(struct kvm *kvm, struct kvm_hpt_info *info)</div><div class='add'>+{</div><div class='add'>+	atomic64_set(&amp;kvm-&gt;arch.mmio_update, 0);</div><div class='add'>+	kvm-&gt;arch.hpt = *info;</div><div class='add'>+	kvm-&gt;arch.sdr1 = __pa(info-&gt;virt) | (info-&gt;order - 18);</div><div class='add'>+</div><div class='add'>+	pr_debug("KVM guest htab at %lx (order %ld), LPID %x\n",</div><div class='add'>+		 info-&gt;virt, (long)info-&gt;order, kvm-&gt;arch.lpid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-long kvmppc_alloc_reset_hpt(struct kvm *kvm, u32 *htab_orderp)</div><div class='add'>+long kvmppc_alloc_reset_hpt(struct kvm *kvm, int order)</div><div class='ctx'> {</div><div class='ctx'> 	long err = -EBUSY;</div><div class='del'>-	long order;</div><div class='add'>+	struct kvm_hpt_info info;</div><div class='add'>+</div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;kvm-&gt;lock);</div><div class='ctx'> 	if (kvm-&gt;arch.hpte_setup_done) {</div><div class='hunk'>@@ -127,37 +149,44 @@ long kvmppc_alloc_reset_hpt(struct kvm *kvm, u32 *htab_orderp)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (kvm-&gt;arch.hpt_virt) {</div><div class='del'>-		order = kvm-&gt;arch.hpt_order;</div><div class='add'>+	if (kvm-&gt;arch.hpt.order == order) {</div><div class='add'>+		/* We already have a suitable HPT */</div><div class='add'>+</div><div class='ctx'> 		/* Set the entire HPT to 0, i.e. invalid HPTEs */</div><div class='del'>-		memset((void *)kvm-&gt;arch.hpt_virt, 0, 1ul &lt;&lt; order);</div><div class='add'>+		memset((void *)kvm-&gt;arch.hpt.virt, 0, 1ul &lt;&lt; order);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Reset all the reverse-mapping chains for all memslots</div><div class='ctx'> 		 */</div><div class='ctx'> 		kvmppc_rmap_reset(kvm);</div><div class='ctx'> 		/* Ensure that each vcpu will flush its TLB on next entry. */</div><div class='ctx'> 		cpumask_setall(&amp;kvm-&gt;arch.need_tlb_flush);</div><div class='del'>-		*htab_orderp = order;</div><div class='ctx'> 		err = 0;</div><div class='del'>-	} else {</div><div class='del'>-		err = kvmppc_alloc_hpt(kvm, htab_orderp);</div><div class='del'>-		order = *htab_orderp;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>- out:</div><div class='add'>+</div><div class='add'>+	if (kvm-&gt;arch.hpt.virt)</div><div class='add'>+		kvmppc_free_hpt(&amp;kvm-&gt;arch.hpt);</div><div class='add'>+</div><div class='add'>+	err = kvmppc_allocate_hpt(&amp;info, order);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	kvmppc_set_hpt(kvm, &amp;info);</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;kvm-&gt;lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void kvmppc_free_hpt(struct kvm *kvm)</div><div class='add'>+void kvmppc_free_hpt(struct kvm_hpt_info *info)</div><div class='ctx'> {</div><div class='del'>-	kvmppc_free_lpid(kvm-&gt;arch.lpid);</div><div class='del'>-	vfree(kvm-&gt;arch.revmap);</div><div class='del'>-	if (kvm-&gt;arch.hpt_cma_alloc)</div><div class='del'>-		kvm_release_hpt(virt_to_page(kvm-&gt;arch.hpt_virt),</div><div class='del'>-				1 &lt;&lt; (kvm-&gt;arch.hpt_order - PAGE_SHIFT));</div><div class='del'>-	else</div><div class='del'>-		free_pages(kvm-&gt;arch.hpt_virt,</div><div class='del'>-			   kvm-&gt;arch.hpt_order - PAGE_SHIFT);</div><div class='add'>+	vfree(info-&gt;rev);</div><div class='add'>+	if (info-&gt;cma)</div><div class='add'>+		kvm_free_hpt_cma(virt_to_page(info-&gt;virt),</div><div class='add'>+				 1 &lt;&lt; (info-&gt;order - PAGE_SHIFT));</div><div class='add'>+	else if (info-&gt;virt)</div><div class='add'>+		free_pages(info-&gt;virt, info-&gt;order - PAGE_SHIFT);</div><div class='add'>+	info-&gt;virt = 0;</div><div class='add'>+	info-&gt;order = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Bits in first HPTE dword for pagesize 4k, 64k or 16M */</div><div class='hunk'>@@ -192,8 +221,8 @@ void kvmppc_map_vrma(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot,</div><div class='ctx'> 	if (npages &gt; 1ul &lt;&lt; (40 - porder))</div><div class='ctx'> 		npages = 1ul &lt;&lt; (40 - porder);</div><div class='ctx'> 	/* Can't use more than 1 HPTE per HPTEG */</div><div class='del'>-	if (npages &gt; kvm-&gt;arch.hpt_mask + 1)</div><div class='del'>-		npages = kvm-&gt;arch.hpt_mask + 1;</div><div class='add'>+	if (npages &gt; kvmppc_hpt_mask(&amp;kvm-&gt;arch.hpt) + 1)</div><div class='add'>+		npages = kvmppc_hpt_mask(&amp;kvm-&gt;arch.hpt) + 1;</div><div class='ctx'> </div><div class='ctx'> 	hp0 = HPTE_V_1TB_SEG | (VRMA_VSID &lt;&lt; (40 - 16)) |</div><div class='ctx'> 		HPTE_V_BOLTED | hpte0_pgsize_encoding(psize);</div><div class='hunk'>@@ -203,7 +232,8 @@ void kvmppc_map_vrma(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot,</div><div class='ctx'> 	for (i = 0; i &lt; npages; ++i) {</div><div class='ctx'> 		addr = i &lt;&lt; porder;</div><div class='ctx'> 		/* can't use hpt_hash since va &gt; 64 bits */</div><div class='del'>-		hash = (i ^ (VRMA_VSID ^ (VRMA_VSID &lt;&lt; 25))) &amp; kvm-&gt;arch.hpt_mask;</div><div class='add'>+		hash = (i ^ (VRMA_VSID ^ (VRMA_VSID &lt;&lt; 25)))</div><div class='add'>+			&amp; kvmppc_hpt_mask(&amp;kvm-&gt;arch.hpt);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We assume that the hash table is empty and no</div><div class='ctx'> 		 * vcpus are using it at this stage.  Since we create</div><div class='hunk'>@@ -255,7 +285,7 @@ static void kvmppc_mmu_book3s_64_hv_reset_msr(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	kvmppc_set_msr(vcpu, msr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-long kvmppc_virtmode_do_h_enter(struct kvm *kvm, unsigned long flags,</div><div class='add'>+static long kvmppc_virtmode_do_h_enter(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> 				long pte_index, unsigned long pteh,</div><div class='ctx'> 				unsigned long ptel, unsigned long *pte_idx_ret)</div><div class='ctx'> {</div><div class='hunk'>@@ -312,7 +342,7 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,</div><div class='ctx'> 	struct kvmppc_slb *slbe;</div><div class='ctx'> 	unsigned long slb_v;</div><div class='ctx'> 	unsigned long pp, key;</div><div class='del'>-	unsigned long v, gr;</div><div class='add'>+	unsigned long v, orig_v, gr;</div><div class='ctx'> 	__be64 *hptep;</div><div class='ctx'> 	int index;</div><div class='ctx'> 	int virtmode = vcpu-&gt;arch.shregs.msr &amp; (data ? MSR_DR : MSR_IR);</div><div class='hunk'>@@ -336,11 +366,13 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,</div><div class='ctx'> 		preempt_enable();</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='del'>-	hptep = (__be64 *)(kvm-&gt;arch.hpt_virt + (index &lt;&lt; 4));</div><div class='del'>-	v = be64_to_cpu(hptep[0]) &amp; ~HPTE_V_HVLOCK;</div><div class='del'>-	gr = kvm-&gt;arch.revmap[index].guest_rpte;</div><div class='add'>+	hptep = (__be64 *)(kvm-&gt;arch.hpt.virt + (index &lt;&lt; 4));</div><div class='add'>+	v = orig_v = be64_to_cpu(hptep[0]) &amp; ~HPTE_V_HVLOCK;</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		v = hpte_new_to_old_v(v, be64_to_cpu(hptep[1]));</div><div class='add'>+	gr = kvm-&gt;arch.hpt.rev[index].guest_rpte;</div><div class='ctx'> </div><div class='del'>-	unlock_hpte(hptep, v);</div><div class='add'>+	unlock_hpte(hptep, orig_v);</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> </div><div class='ctx'> 	gpte-&gt;eaddr = eaddr;</div><div class='hunk'>@@ -388,8 +420,8 @@ static int instruction_is_store(unsigned int instr)</div><div class='ctx'> 	return (instr &amp; mask) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvmppc_hv_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='del'>-				  unsigned long gpa, gva_t ea, int is_store)</div><div class='add'>+int kvmppc_hv_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='add'>+			   unsigned long gpa, gva_t ea, int is_store)</div><div class='ctx'> {</div><div class='ctx'> 	u32 last_inst;</div><div class='ctx'> </div><div class='hunk'>@@ -438,6 +470,7 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm *kvm = vcpu-&gt;kvm;</div><div class='ctx'> 	unsigned long hpte[3], r;</div><div class='add'>+	unsigned long hnow_v, hnow_r;</div><div class='ctx'> 	__be64 *hptep;</div><div class='ctx'> 	unsigned long mmu_seq, psize, pte_size;</div><div class='ctx'> 	unsigned long gpa_base, gfn_base;</div><div class='hunk'>@@ -451,6 +484,10 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='ctx'> 	unsigned int writing, write_ok;</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='ctx'> 	unsigned long rcbits;</div><div class='add'>+	long mmio_update;</div><div class='add'>+</div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		return kvmppc_book3s_radix_page_fault(run, vcpu, ea, dsisr);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Real-mode code has already searched the HPT and found the</div><div class='hunk'>@@ -460,9 +497,22 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ea != vcpu-&gt;arch.pgfault_addr)</div><div class='ctx'> 		return RESUME_GUEST;</div><div class='add'>+</div><div class='add'>+	if (vcpu-&gt;arch.pgfault_cache) {</div><div class='add'>+		mmio_update = atomic64_read(&amp;kvm-&gt;arch.mmio_update);</div><div class='add'>+		if (mmio_update == vcpu-&gt;arch.pgfault_cache-&gt;mmio_update) {</div><div class='add'>+			r = vcpu-&gt;arch.pgfault_cache-&gt;rpte;</div><div class='add'>+			psize = hpte_page_size(vcpu-&gt;arch.pgfault_hpte[0], r);</div><div class='add'>+			gpa_base = r &amp; HPTE_R_RPN &amp; ~(psize - 1);</div><div class='add'>+			gfn_base = gpa_base &gt;&gt; PAGE_SHIFT;</div><div class='add'>+			gpa = gpa_base | (ea &amp; (psize - 1));</div><div class='add'>+			return kvmppc_hv_emulate_mmio(run, vcpu, gpa, ea,</div><div class='add'>+						dsisr &amp; DSISR_ISSTORE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	index = vcpu-&gt;arch.pgfault_index;</div><div class='del'>-	hptep = (__be64 *)(kvm-&gt;arch.hpt_virt + (index &lt;&lt; 4));</div><div class='del'>-	rev = &amp;kvm-&gt;arch.revmap[index];</div><div class='add'>+	hptep = (__be64 *)(kvm-&gt;arch.hpt.virt + (index &lt;&lt; 4));</div><div class='add'>+	rev = &amp;kvm-&gt;arch.hpt.rev[index];</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	while (!try_lock_hpte(hptep, HPTE_V_HVLOCK))</div><div class='ctx'> 		cpu_relax();</div><div class='hunk'>@@ -472,6 +522,10 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='ctx'> 	unlock_hpte(hptep, hpte[0]);</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> </div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		hpte[0] = hpte_new_to_old_v(hpte[0], hpte[1]);</div><div class='add'>+		hpte[1] = hpte_new_to_old_r(hpte[1]);</div><div class='add'>+	}</div><div class='ctx'> 	if (hpte[0] != vcpu-&gt;arch.pgfault_hpte[0] ||</div><div class='ctx'> 	    hpte[1] != vcpu-&gt;arch.pgfault_hpte[1])</div><div class='ctx'> 		return RESUME_GUEST;</div><div class='hunk'>@@ -575,16 +629,22 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (psize &lt; PAGE_SIZE)</div><div class='ctx'> 		psize = PAGE_SIZE;</div><div class='del'>-	r = (r &amp; ~(HPTE_R_PP0 - psize)) | ((pfn &lt;&lt; PAGE_SHIFT) &amp; ~(psize - 1));</div><div class='add'>+	r = (r &amp; HPTE_R_KEY_HI) | (r &amp; ~(HPTE_R_PP0 - psize)) |</div><div class='add'>+					((pfn &lt;&lt; PAGE_SHIFT) &amp; ~(psize - 1));</div><div class='ctx'> 	if (hpte_is_writable(r) &amp;&amp; !write_ok)</div><div class='ctx'> 		r = hpte_make_readonly(r);</div><div class='ctx'> 	ret = RESUME_GUEST;</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	while (!try_lock_hpte(hptep, HPTE_V_HVLOCK))</div><div class='ctx'> 		cpu_relax();</div><div class='del'>-	if ((be64_to_cpu(hptep[0]) &amp; ~HPTE_V_HVLOCK) != hpte[0] ||</div><div class='del'>-		be64_to_cpu(hptep[1]) != hpte[1] ||</div><div class='del'>-		rev-&gt;guest_rpte != hpte[2])</div><div class='add'>+	hnow_v = be64_to_cpu(hptep[0]);</div><div class='add'>+	hnow_r = be64_to_cpu(hptep[1]);</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		hnow_v = hpte_new_to_old_v(hnow_v, hnow_r);</div><div class='add'>+		hnow_r = hpte_new_to_old_r(hnow_r);</div><div class='add'>+	}</div><div class='add'>+	if ((hnow_v &amp; ~HPTE_V_HVLOCK) != hpte[0] || hnow_r != hpte[1] ||</div><div class='add'>+	    rev-&gt;guest_rpte != hpte[2])</div><div class='ctx'> 		/* HPTE has been changed under us; let the guest retry */</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	hpte[0] = (hpte[0] &amp; ~HPTE_V_ABSENT) | HPTE_V_VALID;</div><div class='hunk'>@@ -615,6 +675,10 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='ctx'> 		kvmppc_add_revmap_chain(kvm, rev, rmap, index, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		r = hpte_old_to_new_r(hpte[0], r);</div><div class='add'>+		hpte[0] = hpte_old_to_new_v(hpte[0]);</div><div class='add'>+	}</div><div class='ctx'> 	hptep[1] = cpu_to_be64(r);</div><div class='ctx'> 	eieio();</div><div class='ctx'> 	__unlock_hpte(hptep, hpte[0]);</div><div class='hunk'>@@ -662,12 +726,13 @@ static void kvmppc_rmap_reset(struct kvm *kvm)</div><div class='ctx'> 	srcu_read_unlock(&amp;kvm-&gt;srcu, srcu_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+typedef int (*hva_handler_fn)(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='add'>+			      unsigned long gfn);</div><div class='add'>+</div><div class='ctx'> static int kvm_handle_hva_range(struct kvm *kvm,</div><div class='ctx'> 				unsigned long start,</div><div class='ctx'> 				unsigned long end,</div><div class='del'>-				int (*handler)(struct kvm *kvm,</div><div class='del'>-					       unsigned long *rmapp,</div><div class='del'>-					       unsigned long gfn))</div><div class='add'>+				hva_handler_fn handler)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int retval = 0;</div><div class='hunk'>@@ -692,9 +757,7 @@ static int kvm_handle_hva_range(struct kvm *kvm,</div><div class='ctx'> 		gfn_end = hva_to_gfn_memslot(hva_end + PAGE_SIZE - 1, memslot);</div><div class='ctx'> </div><div class='ctx'> 		for (; gfn &lt; gfn_end; ++gfn) {</div><div class='del'>-			gfn_t gfn_offset = gfn - memslot-&gt;base_gfn;</div><div class='del'>-</div><div class='del'>-			ret = handler(kvm, &amp;memslot-&gt;arch.rmap[gfn_offset], gfn);</div><div class='add'>+			ret = handler(kvm, memslot, gfn);</div><div class='ctx'> 			retval |= ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -703,20 +766,61 @@ static int kvm_handle_hva_range(struct kvm *kvm,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,</div><div class='del'>-			  int (*handler)(struct kvm *kvm, unsigned long *rmapp,</div><div class='del'>-					 unsigned long gfn))</div><div class='add'>+			  hva_handler_fn handler)</div><div class='ctx'> {</div><div class='ctx'> 	return kvm_handle_hva_range(kvm, hva, hva + 1, handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,</div><div class='add'>+/* Must be called with both HPTE and rmap locked */</div><div class='add'>+static void kvmppc_unmap_hpte(struct kvm *kvm, unsigned long i,</div><div class='add'>+			      unsigned long *rmapp, unsigned long gfn)</div><div class='add'>+{</div><div class='add'>+	__be64 *hptep = (__be64 *) (kvm-&gt;arch.hpt.virt + (i &lt;&lt; 4));</div><div class='add'>+	struct revmap_entry *rev = kvm-&gt;arch.hpt.rev;</div><div class='add'>+	unsigned long j, h;</div><div class='add'>+	unsigned long ptel, psize, rcbits;</div><div class='add'>+</div><div class='add'>+	j = rev[i].forw;</div><div class='add'>+	if (j == i) {</div><div class='add'>+		/* chain is now empty */</div><div class='add'>+		*rmapp &amp;= ~(KVMPPC_RMAP_PRESENT | KVMPPC_RMAP_INDEX);</div><div class='add'>+	} else {</div><div class='add'>+		/* remove i from chain */</div><div class='add'>+		h = rev[i].back;</div><div class='add'>+		rev[h].forw = j;</div><div class='add'>+		rev[j].back = h;</div><div class='add'>+		rev[i].forw = rev[i].back = i;</div><div class='add'>+		*rmapp = (*rmapp &amp; ~KVMPPC_RMAP_INDEX) | j;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now check and modify the HPTE */</div><div class='add'>+	ptel = rev[i].guest_rpte;</div><div class='add'>+	psize = hpte_page_size(be64_to_cpu(hptep[0]), ptel);</div><div class='add'>+	if ((be64_to_cpu(hptep[0]) &amp; HPTE_V_VALID) &amp;&amp;</div><div class='add'>+	    hpte_rpn(ptel, psize) == gfn) {</div><div class='add'>+		hptep[0] |= cpu_to_be64(HPTE_V_ABSENT);</div><div class='add'>+		kvmppc_invalidate_hpte(kvm, hptep, i);</div><div class='add'>+		hptep[1] &amp;= ~cpu_to_be64(HPTE_R_KEY_HI | HPTE_R_KEY_LO);</div><div class='add'>+		/* Harvest R and C */</div><div class='add'>+		rcbits = be64_to_cpu(hptep[1]) &amp; (HPTE_R_R | HPTE_R_C);</div><div class='add'>+		*rmapp |= rcbits &lt;&lt; KVMPPC_RMAP_RC_SHIFT;</div><div class='add'>+		if (rcbits &amp; HPTE_R_C)</div><div class='add'>+			kvmppc_update_rmap_change(rmapp, psize);</div><div class='add'>+		if (rcbits &amp; ~rev[i].guest_rpte) {</div><div class='add'>+			rev[i].guest_rpte = ptel | rcbits;</div><div class='add'>+			note_hpte_modification(kvm, &amp;rev[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvm_unmap_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='ctx'> 			   unsigned long gfn)</div><div class='ctx'> {</div><div class='del'>-	struct revmap_entry *rev = kvm-&gt;arch.revmap;</div><div class='del'>-	unsigned long h, i, j;</div><div class='add'>+	unsigned long i;</div><div class='ctx'> 	__be64 *hptep;</div><div class='del'>-	unsigned long ptel, psize, rcbits;</div><div class='add'>+	unsigned long *rmapp;</div><div class='ctx'> </div><div class='add'>+	rmapp = &amp;memslot-&gt;arch.rmap[gfn - memslot-&gt;base_gfn];</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		lock_rmap(rmapp);</div><div class='ctx'> 		if (!(*rmapp &amp; KVMPPC_RMAP_PRESENT)) {</div><div class='hunk'>@@ -730,7 +834,7 @@ static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,</div><div class='ctx'> 		 * rmap chain lock.</div><div class='ctx'> 		 */</div><div class='ctx'> 		i = *rmapp &amp; KVMPPC_RMAP_INDEX;</div><div class='del'>-		hptep = (__be64 *) (kvm-&gt;arch.hpt_virt + (i &lt;&lt; 4));</div><div class='add'>+		hptep = (__be64 *) (kvm-&gt;arch.hpt.virt + (i &lt;&lt; 4));</div><div class='ctx'> 		if (!try_lock_hpte(hptep, HPTE_V_HVLOCK)) {</div><div class='ctx'> 			/* unlock rmap before spinning on the HPTE lock */</div><div class='ctx'> 			unlock_rmap(rmapp);</div><div class='hunk'>@@ -738,36 +842,8 @@ static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,</div><div class='ctx'> 				cpu_relax();</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		j = rev[i].forw;</div><div class='del'>-		if (j == i) {</div><div class='del'>-			/* chain is now empty */</div><div class='del'>-			*rmapp &amp;= ~(KVMPPC_RMAP_PRESENT | KVMPPC_RMAP_INDEX);</div><div class='del'>-		} else {</div><div class='del'>-			/* remove i from chain */</div><div class='del'>-			h = rev[i].back;</div><div class='del'>-			rev[h].forw = j;</div><div class='del'>-			rev[j].back = h;</div><div class='del'>-			rev[i].forw = rev[i].back = i;</div><div class='del'>-			*rmapp = (*rmapp &amp; ~KVMPPC_RMAP_INDEX) | j;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		/* Now check and modify the HPTE */</div><div class='del'>-		ptel = rev[i].guest_rpte;</div><div class='del'>-		psize = hpte_page_size(be64_to_cpu(hptep[0]), ptel);</div><div class='del'>-		if ((be64_to_cpu(hptep[0]) &amp; HPTE_V_VALID) &amp;&amp;</div><div class='del'>-		    hpte_rpn(ptel, psize) == gfn) {</div><div class='del'>-			hptep[0] |= cpu_to_be64(HPTE_V_ABSENT);</div><div class='del'>-			kvmppc_invalidate_hpte(kvm, hptep, i);</div><div class='del'>-			/* Harvest R and C */</div><div class='del'>-			rcbits = be64_to_cpu(hptep[1]) &amp; (HPTE_R_R | HPTE_R_C);</div><div class='del'>-			*rmapp |= rcbits &lt;&lt; KVMPPC_RMAP_RC_SHIFT;</div><div class='del'>-			if (rcbits &amp; HPTE_R_C)</div><div class='del'>-				kvmppc_update_rmap_change(rmapp, psize);</div><div class='del'>-			if (rcbits &amp; ~rev[i].guest_rpte) {</div><div class='del'>-				rev[i].guest_rpte = ptel | rcbits;</div><div class='del'>-				note_hpte_modification(kvm, &amp;rev[i]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		kvmppc_unmap_hpte(kvm, i, rmapp, gfn);</div><div class='ctx'> 		unlock_rmap(rmapp);</div><div class='ctx'> 		__unlock_hpte(hptep, be64_to_cpu(hptep[0]));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -776,26 +852,36 @@ static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,</div><div class='ctx'> </div><div class='ctx'> int kvm_unmap_hva_hv(struct kvm *kvm, unsigned long hva)</div><div class='ctx'> {</div><div class='del'>-	kvm_handle_hva(kvm, hva, kvm_unmap_rmapp);</div><div class='add'>+	hva_handler_fn handler;</div><div class='add'>+</div><div class='add'>+	handler = kvm_is_radix(kvm) ? kvm_unmap_radix : kvm_unmap_rmapp;</div><div class='add'>+	kvm_handle_hva(kvm, hva, handler);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int kvm_unmap_hva_range_hv(struct kvm *kvm, unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='del'>-	kvm_handle_hva_range(kvm, start, end, kvm_unmap_rmapp);</div><div class='add'>+	hva_handler_fn handler;</div><div class='add'>+</div><div class='add'>+	handler = kvm_is_radix(kvm) ? kvm_unmap_radix : kvm_unmap_rmapp;</div><div class='add'>+	kvm_handle_hva_range(kvm, start, end, handler);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvmppc_core_flush_memslot_hv(struct kvm *kvm,</div><div class='ctx'> 				  struct kvm_memory_slot *memslot)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *rmapp;</div><div class='ctx'> 	unsigned long gfn;</div><div class='ctx'> 	unsigned long n;</div><div class='add'>+	unsigned long *rmapp;</div><div class='ctx'> </div><div class='del'>-	rmapp = memslot-&gt;arch.rmap;</div><div class='ctx'> 	gfn = memslot-&gt;base_gfn;</div><div class='del'>-	for (n = memslot-&gt;npages; n; --n) {</div><div class='add'>+	rmapp = memslot-&gt;arch.rmap;</div><div class='add'>+	for (n = memslot-&gt;npages; n; --n, ++gfn) {</div><div class='add'>+		if (kvm_is_radix(kvm)) {</div><div class='add'>+			kvm_unmap_radix(kvm, memslot, gfn);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Testing the present bit without locking is OK because</div><div class='ctx'> 		 * the memslot has been marked invalid already, and hence</div><div class='hunk'>@@ -803,20 +889,21 @@ void kvmppc_core_flush_memslot_hv(struct kvm *kvm,</div><div class='ctx'> 		 * thus the present bit can't go from 0 to 1.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (*rmapp &amp; KVMPPC_RMAP_PRESENT)</div><div class='del'>-			kvm_unmap_rmapp(kvm, rmapp, gfn);</div><div class='add'>+			kvm_unmap_rmapp(kvm, memslot, gfn);</div><div class='ctx'> 		++rmapp;</div><div class='del'>-		++gfn;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp,</div><div class='add'>+static int kvm_age_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='ctx'> 			 unsigned long gfn)</div><div class='ctx'> {</div><div class='del'>-	struct revmap_entry *rev = kvm-&gt;arch.revmap;</div><div class='add'>+	struct revmap_entry *rev = kvm-&gt;arch.hpt.rev;</div><div class='ctx'> 	unsigned long head, i, j;</div><div class='ctx'> 	__be64 *hptep;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	unsigned long *rmapp;</div><div class='ctx'> </div><div class='add'>+	rmapp = &amp;memslot-&gt;arch.rmap[gfn - memslot-&gt;base_gfn];</div><div class='ctx'>  retry:</div><div class='ctx'> 	lock_rmap(rmapp);</div><div class='ctx'> 	if (*rmapp &amp; KVMPPC_RMAP_REFERENCED) {</div><div class='hunk'>@@ -830,7 +917,7 @@ static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp,</div><div class='ctx'> </div><div class='ctx'> 	i = head = *rmapp &amp; KVMPPC_RMAP_INDEX;</div><div class='ctx'> 	do {</div><div class='del'>-		hptep = (__be64 *) (kvm-&gt;arch.hpt_virt + (i &lt;&lt; 4));</div><div class='add'>+		hptep = (__be64 *) (kvm-&gt;arch.hpt.virt + (i &lt;&lt; 4));</div><div class='ctx'> 		j = rev[i].forw;</div><div class='ctx'> </div><div class='ctx'> 		/* If this HPTE isn't referenced, ignore it */</div><div class='hunk'>@@ -864,17 +951,22 @@ static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp,</div><div class='ctx'> </div><div class='ctx'> int kvm_age_hva_hv(struct kvm *kvm, unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='del'>-	return kvm_handle_hva_range(kvm, start, end, kvm_age_rmapp);</div><div class='add'>+	hva_handler_fn handler;</div><div class='add'>+</div><div class='add'>+	handler = kvm_is_radix(kvm) ? kvm_age_radix : kvm_age_rmapp;</div><div class='add'>+	return kvm_handle_hva_range(kvm, start, end, handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_test_age_rmapp(struct kvm *kvm, unsigned long *rmapp,</div><div class='add'>+static int kvm_test_age_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='ctx'> 			      unsigned long gfn)</div><div class='ctx'> {</div><div class='del'>-	struct revmap_entry *rev = kvm-&gt;arch.revmap;</div><div class='add'>+	struct revmap_entry *rev = kvm-&gt;arch.hpt.rev;</div><div class='ctx'> 	unsigned long head, i, j;</div><div class='ctx'> 	unsigned long *hp;</div><div class='ctx'> 	int ret = 1;</div><div class='add'>+	unsigned long *rmapp;</div><div class='ctx'> </div><div class='add'>+	rmapp = &amp;memslot-&gt;arch.rmap[gfn - memslot-&gt;base_gfn];</div><div class='ctx'> 	if (*rmapp &amp; KVMPPC_RMAP_REFERENCED)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='hunk'>@@ -885,7 +977,7 @@ static int kvm_test_age_rmapp(struct kvm *kvm, unsigned long *rmapp,</div><div class='ctx'> 	if (*rmapp &amp; KVMPPC_RMAP_PRESENT) {</div><div class='ctx'> 		i = head = *rmapp &amp; KVMPPC_RMAP_INDEX;</div><div class='ctx'> 		do {</div><div class='del'>-			hp = (unsigned long *)(kvm-&gt;arch.hpt_virt + (i &lt;&lt; 4));</div><div class='add'>+			hp = (unsigned long *)(kvm-&gt;arch.hpt.virt + (i &lt;&lt; 4));</div><div class='ctx'> 			j = rev[i].forw;</div><div class='ctx'> 			if (be64_to_cpu(hp[1]) &amp; HPTE_R_R)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -900,12 +992,18 @@ static int kvm_test_age_rmapp(struct kvm *kvm, unsigned long *rmapp,</div><div class='ctx'> </div><div class='ctx'> int kvm_test_age_hva_hv(struct kvm *kvm, unsigned long hva)</div><div class='ctx'> {</div><div class='del'>-	return kvm_handle_hva(kvm, hva, kvm_test_age_rmapp);</div><div class='add'>+	hva_handler_fn handler;</div><div class='add'>+</div><div class='add'>+	handler = kvm_is_radix(kvm) ? kvm_test_age_radix : kvm_test_age_rmapp;</div><div class='add'>+	return kvm_handle_hva(kvm, hva, handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvm_set_spte_hva_hv(struct kvm *kvm, unsigned long hva, pte_t pte)</div><div class='ctx'> {</div><div class='del'>-	kvm_handle_hva(kvm, hva, kvm_unmap_rmapp);</div><div class='add'>+	hva_handler_fn handler;</div><div class='add'>+</div><div class='add'>+	handler = kvm_is_radix(kvm) ? kvm_unmap_radix : kvm_unmap_rmapp;</div><div class='add'>+	kvm_handle_hva(kvm, hva, handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vcpus_running(struct kvm *kvm)</div><div class='hunk'>@@ -919,7 +1017,7 @@ static int vcpus_running(struct kvm *kvm)</div><div class='ctx'>  */</div><div class='ctx'> static int kvm_test_clear_dirty_npages(struct kvm *kvm, unsigned long *rmapp)</div><div class='ctx'> {</div><div class='del'>-	struct revmap_entry *rev = kvm-&gt;arch.revmap;</div><div class='add'>+	struct revmap_entry *rev = kvm-&gt;arch.hpt.rev;</div><div class='ctx'> 	unsigned long head, i, j;</div><div class='ctx'> 	unsigned long n;</div><div class='ctx'> 	unsigned long v, r;</div><div class='hunk'>@@ -944,7 +1042,7 @@ static int kvm_test_clear_dirty_npages(struct kvm *kvm, unsigned long *rmapp)</div><div class='ctx'> 	i = head = *rmapp &amp; KVMPPC_RMAP_INDEX;</div><div class='ctx'> 	do {</div><div class='ctx'> 		unsigned long hptep1;</div><div class='del'>-		hptep = (__be64 *) (kvm-&gt;arch.hpt_virt + (i &lt;&lt; 4));</div><div class='add'>+		hptep = (__be64 *) (kvm-&gt;arch.hpt.virt + (i &lt;&lt; 4));</div><div class='ctx'> 		j = rev[i].forw;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1006,7 +1104,7 @@ static int kvm_test_clear_dirty_npages(struct kvm *kvm, unsigned long *rmapp)</div><div class='ctx'> 	return npages_dirty;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void harvest_vpa_dirty(struct kvmppc_vpa *vpa,</div><div class='add'>+void kvmppc_harvest_vpa_dirty(struct kvmppc_vpa *vpa,</div><div class='ctx'> 			      struct kvm_memory_slot *memslot,</div><div class='ctx'> 			      unsigned long *map)</div><div class='ctx'> {</div><div class='hunk'>@@ -1024,12 +1122,11 @@ static void harvest_vpa_dirty(struct kvmppc_vpa *vpa,</div><div class='ctx'> 		__set_bit_le(gfn - memslot-&gt;base_gfn, map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-long kvmppc_hv_get_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='del'>-			     unsigned long *map)</div><div class='add'>+long kvmppc_hv_get_dirty_log_hpt(struct kvm *kvm,</div><div class='add'>+			struct kvm_memory_slot *memslot, unsigned long *map)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i, j;</div><div class='ctx'> 	unsigned long *rmapp;</div><div class='del'>-	struct kvm_vcpu *vcpu;</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	rmapp = memslot-&gt;arch.rmap;</div><div class='hunk'>@@ -1045,15 +1142,6 @@ long kvmppc_hv_get_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='ctx'> 				__set_bit_le(j, map);</div><div class='ctx'> 		++rmapp;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Harvest dirty bits from VPA and DTL updates */</div><div class='del'>-	/* Note: we never modify the SLB shadow buffer areas */</div><div class='del'>-	kvm_for_each_vcpu(i, vcpu, kvm) {</div><div class='del'>-		spin_lock(&amp;vcpu-&gt;arch.vpa_update_lock);</div><div class='del'>-		harvest_vpa_dirty(&amp;vcpu-&gt;arch.vpa, memslot, map);</div><div class='del'>-		harvest_vpa_dirty(&amp;vcpu-&gt;arch.dtl, memslot, map);</div><div class='del'>-		spin_unlock(&amp;vcpu-&gt;arch.vpa_update_lock);</div><div class='del'>-	}</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1108,15 +1196,376 @@ void kvmppc_unpin_guest_page(struct kvm *kvm, void *va, unsigned long gpa,</div><div class='ctx'> 	srcu_idx = srcu_read_lock(&amp;kvm-&gt;srcu);</div><div class='ctx'> 	memslot = gfn_to_memslot(kvm, gfn);</div><div class='ctx'> 	if (memslot) {</div><div class='del'>-		rmap = &amp;memslot-&gt;arch.rmap[gfn - memslot-&gt;base_gfn];</div><div class='del'>-		lock_rmap(rmap);</div><div class='del'>-		*rmap |= KVMPPC_RMAP_CHANGED;</div><div class='del'>-		unlock_rmap(rmap);</div><div class='add'>+		if (!kvm_is_radix(kvm)) {</div><div class='add'>+			rmap = &amp;memslot-&gt;arch.rmap[gfn - memslot-&gt;base_gfn];</div><div class='add'>+			lock_rmap(rmap);</div><div class='add'>+			*rmap |= KVMPPC_RMAP_CHANGED;</div><div class='add'>+			unlock_rmap(rmap);</div><div class='add'>+		} else if (memslot-&gt;dirty_bitmap) {</div><div class='add'>+			mark_page_dirty(kvm, gfn);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	srcu_read_unlock(&amp;kvm-&gt;srcu, srcu_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * HPT resizing</div><div class='add'>+ */</div><div class='add'>+static int resize_hpt_allocate(struct kvm_resize_hpt *resize)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = kvmppc_allocate_hpt(&amp;resize-&gt;hpt, resize-&gt;order);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resize_hpt_debug(resize, "resize_hpt_allocate(): HPT @ 0x%lx\n",</div><div class='add'>+			 resize-&gt;hpt.virt);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long resize_hpt_rehash_hpte(struct kvm_resize_hpt *resize,</div><div class='add'>+					    unsigned long idx)</div><div class='add'>+{</div><div class='add'>+	struct kvm *kvm = resize-&gt;kvm;</div><div class='add'>+	struct kvm_hpt_info *old = &amp;kvm-&gt;arch.hpt;</div><div class='add'>+	struct kvm_hpt_info *new = &amp;resize-&gt;hpt;</div><div class='add'>+	unsigned long old_hash_mask = (1ULL &lt;&lt; (old-&gt;order - 7)) - 1;</div><div class='add'>+	unsigned long new_hash_mask = (1ULL &lt;&lt; (new-&gt;order - 7)) - 1;</div><div class='add'>+	__be64 *hptep, *new_hptep;</div><div class='add'>+	unsigned long vpte, rpte, guest_rpte;</div><div class='add'>+	int ret;</div><div class='add'>+	struct revmap_entry *rev;</div><div class='add'>+	unsigned long apsize, psize, avpn, pteg, hash;</div><div class='add'>+	unsigned long new_idx, new_pteg, replace_vpte;</div><div class='add'>+</div><div class='add'>+	hptep = (__be64 *)(old-&gt;virt + (idx &lt;&lt; 4));</div><div class='add'>+</div><div class='add'>+	/* Guest is stopped, so new HPTEs can't be added or faulted</div><div class='add'>+	 * in, only unmapped or altered by host actions.  So, it's</div><div class='add'>+	 * safe to check this before we take the HPTE lock */</div><div class='add'>+	vpte = be64_to_cpu(hptep[0]);</div><div class='add'>+	if (!(vpte &amp; HPTE_V_VALID) &amp;&amp; !(vpte &amp; HPTE_V_ABSENT))</div><div class='add'>+		return 0; /* nothing to do */</div><div class='add'>+</div><div class='add'>+	while (!try_lock_hpte(hptep, HPTE_V_HVLOCK))</div><div class='add'>+		cpu_relax();</div><div class='add'>+</div><div class='add'>+	vpte = be64_to_cpu(hptep[0]);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	if (!(vpte &amp; HPTE_V_VALID) &amp;&amp; !(vpte &amp; HPTE_V_ABSENT))</div><div class='add'>+		/* Nothing to do */</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Unmap */</div><div class='add'>+	rev = &amp;old-&gt;rev[idx];</div><div class='add'>+	guest_rpte = rev-&gt;guest_rpte;</div><div class='add'>+</div><div class='add'>+	ret = -EIO;</div><div class='add'>+	apsize = hpte_page_size(vpte, guest_rpte);</div><div class='add'>+	if (!apsize)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (vpte &amp; HPTE_V_VALID) {</div><div class='add'>+		unsigned long gfn = hpte_rpn(guest_rpte, apsize);</div><div class='add'>+		int srcu_idx = srcu_read_lock(&amp;kvm-&gt;srcu);</div><div class='add'>+		struct kvm_memory_slot *memslot =</div><div class='add'>+			__gfn_to_memslot(kvm_memslots(kvm), gfn);</div><div class='add'>+</div><div class='add'>+		if (memslot) {</div><div class='add'>+			unsigned long *rmapp;</div><div class='add'>+			rmapp = &amp;memslot-&gt;arch.rmap[gfn - memslot-&gt;base_gfn];</div><div class='add'>+</div><div class='add'>+			lock_rmap(rmapp);</div><div class='add'>+			kvmppc_unmap_hpte(kvm, idx, rmapp, gfn);</div><div class='add'>+			unlock_rmap(rmapp);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		srcu_read_unlock(&amp;kvm-&gt;srcu, srcu_idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reload PTE after unmap */</div><div class='add'>+	vpte = be64_to_cpu(hptep[0]);</div><div class='add'>+</div><div class='add'>+	BUG_ON(vpte &amp; HPTE_V_VALID);</div><div class='add'>+	BUG_ON(!(vpte &amp; HPTE_V_ABSENT));</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	if (!(vpte &amp; HPTE_V_BOLTED))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rpte = be64_to_cpu(hptep[1]);</div><div class='add'>+	psize = hpte_base_page_size(vpte, rpte);</div><div class='add'>+	avpn = HPTE_V_AVPN_VAL(vpte) &amp; ~((psize - 1) &gt;&gt; 23);</div><div class='add'>+	pteg = idx / HPTES_PER_GROUP;</div><div class='add'>+	if (vpte &amp; HPTE_V_SECONDARY)</div><div class='add'>+		pteg = ~pteg;</div><div class='add'>+</div><div class='add'>+	if (!(vpte &amp; HPTE_V_1TB_SEG)) {</div><div class='add'>+		unsigned long offset, vsid;</div><div class='add'>+</div><div class='add'>+		/* We only have 28 - 23 bits of offset in avpn */</div><div class='add'>+		offset = (avpn &amp; 0x1f) &lt;&lt; 23;</div><div class='add'>+		vsid = avpn &gt;&gt; 5;</div><div class='add'>+		/* We can find more bits from the pteg value */</div><div class='add'>+		if (psize &lt; (1ULL &lt;&lt; 23))</div><div class='add'>+			offset |= ((vsid ^ pteg) &amp; old_hash_mask) * psize;</div><div class='add'>+</div><div class='add'>+		hash = vsid ^ (offset / psize);</div><div class='add'>+	} else {</div><div class='add'>+		unsigned long offset, vsid;</div><div class='add'>+</div><div class='add'>+		/* We only have 40 - 23 bits of seg_off in avpn */</div><div class='add'>+		offset = (avpn &amp; 0x1ffff) &lt;&lt; 23;</div><div class='add'>+		vsid = avpn &gt;&gt; 17;</div><div class='add'>+		if (psize &lt; (1ULL &lt;&lt; 23))</div><div class='add'>+			offset |= ((vsid ^ (vsid &lt;&lt; 25) ^ pteg) &amp; old_hash_mask) * psize;</div><div class='add'>+</div><div class='add'>+		hash = vsid ^ (vsid &lt;&lt; 25) ^ (offset / psize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_pteg = hash &amp; new_hash_mask;</div><div class='add'>+	if (vpte &amp; HPTE_V_SECONDARY) {</div><div class='add'>+		BUG_ON(~pteg != (hash &amp; old_hash_mask));</div><div class='add'>+		new_pteg = ~new_pteg;</div><div class='add'>+	} else {</div><div class='add'>+		BUG_ON(pteg != (hash &amp; old_hash_mask));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_idx = new_pteg * HPTES_PER_GROUP + (idx % HPTES_PER_GROUP);</div><div class='add'>+	new_hptep = (__be64 *)(new-&gt;virt + (new_idx &lt;&lt; 4));</div><div class='add'>+</div><div class='add'>+	replace_vpte = be64_to_cpu(new_hptep[0]);</div><div class='add'>+</div><div class='add'>+	if (replace_vpte &amp; (HPTE_V_VALID | HPTE_V_ABSENT)) {</div><div class='add'>+		BUG_ON(new-&gt;order &gt;= old-&gt;order);</div><div class='add'>+</div><div class='add'>+		if (replace_vpte &amp; HPTE_V_BOLTED) {</div><div class='add'>+			if (vpte &amp; HPTE_V_BOLTED)</div><div class='add'>+				/* Bolted collision, nothing we can do */</div><div class='add'>+				ret = -ENOSPC;</div><div class='add'>+			/* Discard the new HPTE */</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Discard the previous HPTE */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_hptep[1] = cpu_to_be64(rpte);</div><div class='add'>+	new-&gt;rev[new_idx].guest_rpte = guest_rpte;</div><div class='add'>+	/* No need for a barrier, since new HPT isn't active */</div><div class='add'>+	new_hptep[0] = cpu_to_be64(vpte);</div><div class='add'>+	unlock_hpte(new_hptep, vpte);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	unlock_hpte(hptep, vpte);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int resize_hpt_rehash(struct kvm_resize_hpt *resize)</div><div class='add'>+{</div><div class='add'>+	struct kvm *kvm = resize-&gt;kvm;</div><div class='add'>+	unsigned  long i;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * resize_hpt_rehash_hpte() doesn't handle the new-format HPTEs</div><div class='add'>+	 * that POWER9 uses, and could well hit a BUG_ON on POWER9.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		return -EIO;</div><div class='add'>+	for (i = 0; i &lt; kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt); i++) {</div><div class='add'>+		rc = resize_hpt_rehash_hpte(resize, i);</div><div class='add'>+		if (rc != 0)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void resize_hpt_pivot(struct kvm_resize_hpt *resize)</div><div class='add'>+{</div><div class='add'>+	struct kvm *kvm = resize-&gt;kvm;</div><div class='add'>+	struct kvm_hpt_info hpt_tmp;</div><div class='add'>+</div><div class='add'>+	/* Exchange the pending tables in the resize structure with</div><div class='add'>+	 * the active tables */</div><div class='add'>+</div><div class='add'>+	resize_hpt_debug(resize, "resize_hpt_pivot()\n");</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+	asm volatile("ptesync" : : : "memory");</div><div class='add'>+</div><div class='add'>+	hpt_tmp = kvm-&gt;arch.hpt;</div><div class='add'>+	kvmppc_set_hpt(kvm, &amp;resize-&gt;hpt);</div><div class='add'>+	resize-&gt;hpt = hpt_tmp;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+</div><div class='add'>+	synchronize_srcu_expedited(&amp;kvm-&gt;srcu);</div><div class='add'>+</div><div class='add'>+	resize_hpt_debug(resize, "resize_hpt_pivot() done\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void resize_hpt_release(struct kvm *kvm, struct kvm_resize_hpt *resize)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(kvm-&gt;arch.resize_hpt != resize);</div><div class='add'>+</div><div class='add'>+	if (!resize)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (resize-&gt;hpt.virt)</div><div class='add'>+		kvmppc_free_hpt(&amp;resize-&gt;hpt);</div><div class='add'>+</div><div class='add'>+	kvm-&gt;arch.resize_hpt = NULL;</div><div class='add'>+	kfree(resize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void resize_hpt_prepare_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct kvm_resize_hpt *resize = container_of(work,</div><div class='add'>+						     struct kvm_resize_hpt,</div><div class='add'>+						     work);</div><div class='add'>+	struct kvm *kvm = resize-&gt;kvm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	resize_hpt_debug(resize, "resize_hpt_prepare_work(): order = %d\n",</div><div class='add'>+			 resize-&gt;order);</div><div class='add'>+</div><div class='add'>+	err = resize_hpt_allocate(resize);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;kvm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	resize-&gt;error = err;</div><div class='add'>+	resize-&gt;prepare_done = true;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;kvm-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+long kvm_vm_ioctl_resize_hpt_prepare(struct kvm *kvm,</div><div class='add'>+				     struct kvm_ppc_resize_hpt *rhpt)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = rhpt-&gt;flags;</div><div class='add'>+	unsigned long shift = rhpt-&gt;shift;</div><div class='add'>+	struct kvm_resize_hpt *resize;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (flags != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (shift &amp;&amp; ((shift &lt; 18) || (shift &gt; 46)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;kvm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	resize = kvm-&gt;arch.resize_hpt;</div><div class='add'>+</div><div class='add'>+	if (resize) {</div><div class='add'>+		if (resize-&gt;order == shift) {</div><div class='add'>+			/* Suitable resize in progress */</div><div class='add'>+			if (resize-&gt;prepare_done) {</div><div class='add'>+				ret = resize-&gt;error;</div><div class='add'>+				if (ret != 0)</div><div class='add'>+					resize_hpt_release(kvm, resize);</div><div class='add'>+			} else {</div><div class='add'>+				ret = 100; /* estimated time in ms */</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* not suitable, cancel it */</div><div class='add'>+		resize_hpt_release(kvm, resize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	if (!shift)</div><div class='add'>+		goto out; /* nothing to do */</div><div class='add'>+</div><div class='add'>+	/* start new resize */</div><div class='add'>+</div><div class='add'>+	resize = kzalloc(sizeof(*resize), GFP_KERNEL);</div><div class='add'>+	resize-&gt;order = shift;</div><div class='add'>+	resize-&gt;kvm = kvm;</div><div class='add'>+	INIT_WORK(&amp;resize-&gt;work, resize_hpt_prepare_work);</div><div class='add'>+	kvm-&gt;arch.resize_hpt = resize;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;resize-&gt;work);</div><div class='add'>+</div><div class='add'>+	ret = 100; /* estimated time in ms */</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;kvm-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void resize_hpt_boot_vcpu(void *opaque)</div><div class='add'>+{</div><div class='add'>+	/* Nothing to do, just force a KVM exit */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+long kvm_vm_ioctl_resize_hpt_commit(struct kvm *kvm,</div><div class='add'>+				    struct kvm_ppc_resize_hpt *rhpt)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = rhpt-&gt;flags;</div><div class='add'>+	unsigned long shift = rhpt-&gt;shift;</div><div class='add'>+	struct kvm_resize_hpt *resize;</div><div class='add'>+	long ret;</div><div class='add'>+</div><div class='add'>+	if (flags != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (shift &amp;&amp; ((shift &lt; 18) || (shift &gt; 46)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;kvm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	resize = kvm-&gt;arch.resize_hpt;</div><div class='add'>+</div><div class='add'>+	/* This shouldn't be possible */</div><div class='add'>+	ret = -EIO;</div><div class='add'>+	if (WARN_ON(!kvm-&gt;arch.hpte_setup_done))</div><div class='add'>+		goto out_no_hpt;</div><div class='add'>+</div><div class='add'>+	/* Stop VCPUs from running while we mess with the HPT */</div><div class='add'>+	kvm-&gt;arch.hpte_setup_done = 0;</div><div class='add'>+	smp_mb();</div><div class='add'>+</div><div class='add'>+	/* Boot all CPUs out of the guest so they re-read</div><div class='add'>+	 * hpte_setup_done */</div><div class='add'>+	on_each_cpu(resize_hpt_boot_vcpu, NULL, 1);</div><div class='add'>+</div><div class='add'>+	ret = -ENXIO;</div><div class='add'>+	if (!resize || (resize-&gt;order != shift))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = -EBUSY;</div><div class='add'>+	if (!resize-&gt;prepare_done)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = resize-&gt;error;</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = resize_hpt_rehash(resize);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	resize_hpt_pivot(resize);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	/* Let VCPUs run again */</div><div class='add'>+	kvm-&gt;arch.hpte_setup_done = 1;</div><div class='add'>+	smp_mb();</div><div class='add'>+out_no_hpt:</div><div class='add'>+	resize_hpt_release(kvm, resize);</div><div class='add'>+	mutex_unlock(&amp;kvm-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Functions for reading and writing the hash table via reads and</div><div class='ctx'>  * writes on a file descriptor.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1165,7 +1614,7 @@ static long record_hpte(unsigned long flags, __be64 *hptp,</div><div class='ctx'> 			unsigned long *hpte, struct revmap_entry *revp,</div><div class='ctx'> 			int want_valid, int first_pass)</div><div class='ctx'> {</div><div class='del'>-	unsigned long v, r;</div><div class='add'>+	unsigned long v, r, hr;</div><div class='ctx'> 	unsigned long rcbits_unset;</div><div class='ctx'> 	int ok = 1;</div><div class='ctx'> 	int valid, dirty;</div><div class='hunk'>@@ -1192,6 +1641,11 @@ static long record_hpte(unsigned long flags, __be64 *hptp,</div><div class='ctx'> 		while (!try_lock_hpte(hptp, HPTE_V_HVLOCK))</div><div class='ctx'> 			cpu_relax();</div><div class='ctx'> 		v = be64_to_cpu(hptp[0]);</div><div class='add'>+		hr = be64_to_cpu(hptp[1]);</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+			v = hpte_new_to_old_v(v, hr);</div><div class='add'>+			hr = hpte_new_to_old_r(hr);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* re-evaluate valid and dirty from synchronized HPTE value */</div><div class='ctx'> 		valid = !!(v &amp; HPTE_V_VALID);</div><div class='hunk'>@@ -1199,8 +1653,8 @@ static long record_hpte(unsigned long flags, __be64 *hptp,</div><div class='ctx'> </div><div class='ctx'> 		/* Harvest R and C into guest view if necessary */</div><div class='ctx'> 		rcbits_unset = ~revp-&gt;guest_rpte &amp; (HPTE_R_R | HPTE_R_C);</div><div class='del'>-		if (valid &amp;&amp; (rcbits_unset &amp; be64_to_cpu(hptp[1]))) {</div><div class='del'>-			revp-&gt;guest_rpte |= (be64_to_cpu(hptp[1]) &amp;</div><div class='add'>+		if (valid &amp;&amp; (rcbits_unset &amp; hr)) {</div><div class='add'>+			revp-&gt;guest_rpte |= (hr &amp;</div><div class='ctx'> 				(HPTE_R_R | HPTE_R_C)) | HPTE_GR_MODIFIED;</div><div class='ctx'> 			dirty = 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1251,8 +1705,8 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf,</div><div class='ctx'> 	flags = ctx-&gt;flags;</div><div class='ctx'> </div><div class='ctx'> 	i = ctx-&gt;index;</div><div class='del'>-	hptp = (__be64 *)(kvm-&gt;arch.hpt_virt + (i * HPTE_SIZE));</div><div class='del'>-	revp = kvm-&gt;arch.revmap + i;</div><div class='add'>+	hptp = (__be64 *)(kvm-&gt;arch.hpt.virt + (i * HPTE_SIZE));</div><div class='add'>+	revp = kvm-&gt;arch.hpt.rev + i;</div><div class='ctx'> 	lbuf = (unsigned long __user *)buf;</div><div class='ctx'> </div><div class='ctx'> 	nb = 0;</div><div class='hunk'>@@ -1267,7 +1721,7 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf,</div><div class='ctx'> </div><div class='ctx'> 		/* Skip uninteresting entries, i.e. clean on not-first pass */</div><div class='ctx'> 		if (!first_pass) {</div><div class='del'>-			while (i &lt; kvm-&gt;arch.hpt_npte &amp;&amp;</div><div class='add'>+			while (i &lt; kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt) &amp;&amp;</div><div class='ctx'> 			       !hpte_dirty(revp, hptp)) {</div><div class='ctx'> 				++i;</div><div class='ctx'> 				hptp += 2;</div><div class='hunk'>@@ -1277,7 +1731,7 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf,</div><div class='ctx'> 		hdr.index = i;</div><div class='ctx'> </div><div class='ctx'> 		/* Grab a series of valid entries */</div><div class='del'>-		while (i &lt; kvm-&gt;arch.hpt_npte &amp;&amp;</div><div class='add'>+		while (i &lt; kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt) &amp;&amp;</div><div class='ctx'> 		       hdr.n_valid &lt; 0xffff &amp;&amp;</div><div class='ctx'> 		       nb + HPTE_SIZE &lt; count &amp;&amp;</div><div class='ctx'> 		       record_hpte(flags, hptp, hpte, revp, 1, first_pass)) {</div><div class='hunk'>@@ -1293,7 +1747,7 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf,</div><div class='ctx'> 			++revp;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Now skip invalid entries while we can */</div><div class='del'>-		while (i &lt; kvm-&gt;arch.hpt_npte &amp;&amp;</div><div class='add'>+		while (i &lt; kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt) &amp;&amp;</div><div class='ctx'> 		       hdr.n_invalid &lt; 0xffff &amp;&amp;</div><div class='ctx'> 		       record_hpte(flags, hptp, hpte, revp, 0, first_pass)) {</div><div class='ctx'> 			/* found an invalid entry */</div><div class='hunk'>@@ -1314,7 +1768,7 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check if we've wrapped around the hash table */</div><div class='del'>-		if (i &gt;= kvm-&gt;arch.hpt_npte) {</div><div class='add'>+		if (i &gt;= kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt)) {</div><div class='ctx'> 			i = 0;</div><div class='ctx'> 			ctx-&gt;first_pass = 0;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1373,11 +1827,11 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,</div><div class='ctx'> </div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		i = hdr.index;</div><div class='del'>-		if (i &gt;= kvm-&gt;arch.hpt_npte ||</div><div class='del'>-		    i + hdr.n_valid + hdr.n_invalid &gt; kvm-&gt;arch.hpt_npte)</div><div class='add'>+		if (i &gt;= kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt) ||</div><div class='add'>+		    i + hdr.n_valid + hdr.n_invalid &gt; kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		hptp = (__be64 *)(kvm-&gt;arch.hpt_virt + (i * HPTE_SIZE));</div><div class='add'>+		hptp = (__be64 *)(kvm-&gt;arch.hpt.virt + (i * HPTE_SIZE));</div><div class='ctx'> 		lbuf = (unsigned long __user *)buf;</div><div class='ctx'> 		for (j = 0; j &lt; hdr.n_valid; ++j) {</div><div class='ctx'> 			__be64 hpte_v;</div><div class='hunk'>@@ -1564,8 +2018,9 @@ static ssize_t debugfs_htab_read(struct file *file, char __user *buf,</div><div class='ctx'> </div><div class='ctx'> 	kvm = p-&gt;kvm;</div><div class='ctx'> 	i = p-&gt;hpt_index;</div><div class='del'>-	hptp = (__be64 *)(kvm-&gt;arch.hpt_virt + (i * HPTE_SIZE));</div><div class='del'>-	for (; len != 0 &amp;&amp; i &lt; kvm-&gt;arch.hpt_npte; ++i, hptp += 2) {</div><div class='add'>+	hptp = (__be64 *)(kvm-&gt;arch.hpt.virt + (i * HPTE_SIZE));</div><div class='add'>+	for (; len != 0 &amp;&amp; i &lt; kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt);</div><div class='add'>+	     ++i, hptp += 2) {</div><div class='ctx'> 		if (!(be64_to_cpu(hptp[0]) &amp; (HPTE_V_VALID | HPTE_V_ABSENT)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1575,7 +2030,7 @@ static ssize_t debugfs_htab_read(struct file *file, char __user *buf,</div><div class='ctx'> 			cpu_relax();</div><div class='ctx'> 		v = be64_to_cpu(hptp[0]) &amp; ~HPTE_V_HVLOCK;</div><div class='ctx'> 		hr = be64_to_cpu(hptp[1]);</div><div class='del'>-		gr = kvm-&gt;arch.revmap[i].guest_rpte;</div><div class='add'>+		gr = kvm-&gt;arch.hpt.rev[i].guest_rpte;</div><div class='ctx'> 		unlock_hpte(hptp, v);</div><div class='ctx'> 		preempt_enable();</div><div class='ctx'> </div><div class='hunk'>@@ -1608,7 +2063,7 @@ static ssize_t debugfs_htab_read(struct file *file, char __user *buf,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ssize_t debugfs_htab_write(struct file *file, const char __user *buf,</div><div class='add'>+static ssize_t debugfs_htab_write(struct file *file, const char __user *buf,</div><div class='ctx'> 			   size_t len, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	return -EACCES;</div><div class='hunk'>@@ -1636,7 +2091,10 @@ void kvmppc_mmu_book3s_hv_init(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.slb_nr = 32;		/* POWER7/POWER8 */</div><div class='ctx'> </div><div class='del'>-	mmu-&gt;xlate = kvmppc_mmu_book3s_64_hv_xlate;</div><div class='add'>+	if (kvm_is_radix(vcpu-&gt;kvm))</div><div class='add'>+		mmu-&gt;xlate = kvmppc_mmu_radix_xlate;</div><div class='add'>+	else</div><div class='add'>+		mmu-&gt;xlate = kvmppc_mmu_book3s_64_hv_xlate;</div><div class='ctx'> 	mmu-&gt;reset_msr = kvmppc_mmu_book3s_64_hv_reset_msr;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.hflags |= BOOK3S_HFLAG_SLB;</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c<br/>new file mode 100644<br/>index 000000000000..f6b3e67c5762<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_64_mmu_radix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_64_mmu_radix.c</a></div><div class='hunk'>@@ -0,0 +1,717 @@</div><div class='add'>+/*</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, version 2, as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016 Paul Mackerras, IBM Corp. &lt;paulus@au1.ibm.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kvm.h&gt;</div><div class='add'>+#include &lt;linux/kvm_host.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/kvm_ppc.h&gt;</div><div class='add'>+#include &lt;asm/kvm_book3s.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/mmu.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Supported radix tree geometry.</div><div class='add'>+ * Like p9, we support either 5 or 9 bits at the first (lowest) level,</div><div class='add'>+ * for a page size of 64k or 4k.</div><div class='add'>+ */</div><div class='add'>+static int p9_supported_radix_bits[4] = { 5, 9, 9, 13 };</div><div class='add'>+</div><div class='add'>+int kvmppc_mmu_radix_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,</div><div class='add'>+			   struct kvmppc_pte *gpte, bool data, bool iswrite)</div><div class='add'>+{</div><div class='add'>+	struct kvm *kvm = vcpu-&gt;kvm;</div><div class='add'>+	u32 pid;</div><div class='add'>+	int ret, level, ps;</div><div class='add'>+	__be64 prte, rpte;</div><div class='add'>+	unsigned long ptbl;</div><div class='add'>+	unsigned long root, pte, index;</div><div class='add'>+	unsigned long rts, bits, offset;</div><div class='add'>+	unsigned long gpa;</div><div class='add'>+	unsigned long proc_tbl_size;</div><div class='add'>+</div><div class='add'>+	/* Work out effective PID */</div><div class='add'>+	switch (eaddr &gt;&gt; 62) {</div><div class='add'>+	case 0:</div><div class='add'>+		pid = vcpu-&gt;arch.pid;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		pid = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	proc_tbl_size = 1 &lt;&lt; ((kvm-&gt;arch.process_table &amp; PRTS_MASK) + 12);</div><div class='add'>+	if (pid * 16 &gt;= proc_tbl_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Read partition table to find root of tree for effective PID */</div><div class='add'>+	ptbl = (kvm-&gt;arch.process_table &amp; PRTB_MASK) + (pid * 16);</div><div class='add'>+	ret = kvm_read_guest(kvm, ptbl, &amp;prte, sizeof(prte));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	root = be64_to_cpu(prte);</div><div class='add'>+	rts = ((root &amp; RTS1_MASK) &gt;&gt; (RTS1_SHIFT - 3)) |</div><div class='add'>+		((root &amp; RTS2_MASK) &gt;&gt; RTS2_SHIFT);</div><div class='add'>+	bits = root &amp; RPDS_MASK;</div><div class='add'>+	root = root &amp; RPDB_MASK;</div><div class='add'>+</div><div class='add'>+	/* P9 DD1 interprets RTS (radix tree size) differently */</div><div class='add'>+	offset = rts + 31;</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='add'>+		offset -= 3;</div><div class='add'>+</div><div class='add'>+	/* current implementations only support 52-bit space */</div><div class='add'>+	if (offset != 52)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (level = 3; level &gt;= 0; --level) {</div><div class='add'>+		if (level &amp;&amp; bits != p9_supported_radix_bits[level])</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (level == 0 &amp;&amp; !(bits == 5 || bits == 9))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		offset -= bits;</div><div class='add'>+		index = (eaddr &gt;&gt; offset) &amp; ((1UL &lt;&lt; bits) - 1);</div><div class='add'>+		/* check that low bits of page table base are zero */</div><div class='add'>+		if (root &amp; ((1UL &lt;&lt; (bits + 3)) - 1))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		ret = kvm_read_guest(kvm, root + index * 8,</div><div class='add'>+				     &amp;rpte, sizeof(rpte));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		pte = __be64_to_cpu(rpte);</div><div class='add'>+		if (!(pte &amp; _PAGE_PRESENT))</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		if (pte &amp; _PAGE_PTE)</div><div class='add'>+			break;</div><div class='add'>+		bits = pte &amp; 0x1f;</div><div class='add'>+		root = pte &amp; 0x0fffffffffffff00ul;</div><div class='add'>+	}</div><div class='add'>+	/* need a leaf at lowest level; 512GB pages not supported */</div><div class='add'>+	if (level &lt; 0 || level == 3)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* offset is now log base 2 of the page size */</div><div class='add'>+	gpa = pte &amp; 0x01fffffffffff000ul;</div><div class='add'>+	if (gpa &amp; ((1ul &lt;&lt; offset) - 1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	gpa += eaddr &amp; ((1ul &lt;&lt; offset) - 1);</div><div class='add'>+	for (ps = MMU_PAGE_4K; ps &lt; MMU_PAGE_COUNT; ++ps)</div><div class='add'>+		if (offset == mmu_psize_defs[ps].shift)</div><div class='add'>+			break;</div><div class='add'>+	gpte-&gt;page_size = ps;</div><div class='add'>+</div><div class='add'>+	gpte-&gt;eaddr = eaddr;</div><div class='add'>+	gpte-&gt;raddr = gpa;</div><div class='add'>+</div><div class='add'>+	/* Work out permissions */</div><div class='add'>+	gpte-&gt;may_read = !!(pte &amp; _PAGE_READ);</div><div class='add'>+	gpte-&gt;may_write = !!(pte &amp; _PAGE_WRITE);</div><div class='add'>+	gpte-&gt;may_execute = !!(pte &amp; _PAGE_EXEC);</div><div class='add'>+	if (kvmppc_get_msr(vcpu) &amp; MSR_PR) {</div><div class='add'>+		if (pte &amp; _PAGE_PRIVILEGED) {</div><div class='add'>+			gpte-&gt;may_read = 0;</div><div class='add'>+			gpte-&gt;may_write = 0;</div><div class='add'>+			gpte-&gt;may_execute = 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (!(pte &amp; _PAGE_PRIVILEGED)) {</div><div class='add'>+			/* Check AMR/IAMR to see if strict mode is in force */</div><div class='add'>+			if (vcpu-&gt;arch.amr &amp; (1ul &lt;&lt; 62))</div><div class='add'>+				gpte-&gt;may_read = 0;</div><div class='add'>+			if (vcpu-&gt;arch.amr &amp; (1ul &lt;&lt; 63))</div><div class='add'>+				gpte-&gt;may_write = 0;</div><div class='add'>+			if (vcpu-&gt;arch.iamr &amp; (1ul &lt;&lt; 62))</div><div class='add'>+				gpte-&gt;may_execute = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_64K_PAGES</div><div class='add'>+#define MMU_BASE_PSIZE	MMU_PAGE_64K</div><div class='add'>+#else</div><div class='add'>+#define MMU_BASE_PSIZE	MMU_PAGE_4K</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void kvmppc_radix_tlbie_page(struct kvm *kvm, unsigned long addr,</div><div class='add'>+				    unsigned int pshift)</div><div class='add'>+{</div><div class='add'>+	int psize = MMU_BASE_PSIZE;</div><div class='add'>+</div><div class='add'>+	if (pshift &gt;= PMD_SHIFT)</div><div class='add'>+		psize = MMU_PAGE_2M;</div><div class='add'>+	addr &amp;= ~0xfffUL;</div><div class='add'>+	addr |= mmu_psize_defs[psize].ap &lt;&lt; 5;</div><div class='add'>+	asm volatile("ptesync": : :"memory");</div><div class='add'>+	asm volatile(PPC_TLBIE_5(%0, %1, 0, 0, 1)</div><div class='add'>+		     : : "r" (addr), "r" (kvm-&gt;arch.lpid) : "memory");</div><div class='add'>+	asm volatile("ptesync": : :"memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long kvmppc_radix_update_pte(struct kvm *kvm, pte_t *ptep,</div><div class='add'>+				      unsigned long clr, unsigned long set,</div><div class='add'>+				      unsigned long addr, unsigned int shift)</div><div class='add'>+{</div><div class='add'>+	unsigned long old = 0;</div><div class='add'>+</div><div class='add'>+	if (!(clr &amp; _PAGE_PRESENT) &amp;&amp; cpu_has_feature(CPU_FTR_POWER9_DD1) &amp;&amp;</div><div class='add'>+	    pte_present(*ptep)) {</div><div class='add'>+		/* have to invalidate it first */</div><div class='add'>+		old = __radix_pte_update(ptep, _PAGE_PRESENT, 0);</div><div class='add'>+		kvmppc_radix_tlbie_page(kvm, addr, shift);</div><div class='add'>+		set |= _PAGE_PRESENT;</div><div class='add'>+		old &amp;= _PAGE_PRESENT;</div><div class='add'>+	}</div><div class='add'>+	return __radix_pte_update(ptep, clr, set) | old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvmppc_radix_set_pte_at(struct kvm *kvm, unsigned long addr,</div><div class='add'>+			     pte_t *ptep, pte_t pte)</div><div class='add'>+{</div><div class='add'>+	radix__set_pte_at(kvm-&gt;mm, addr, ptep, pte, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kmem_cache *kvm_pte_cache;</div><div class='add'>+</div><div class='add'>+static pte_t *kvmppc_pte_alloc(void)</div><div class='add'>+{</div><div class='add'>+	return kmem_cache_alloc(kvm_pte_cache, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvmppc_pte_free(pte_t *ptep)</div><div class='add'>+{</div><div class='add'>+	kmem_cache_free(kvm_pte_cache, ptep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvmppc_create_pte(struct kvm *kvm, pte_t pte, unsigned long gpa,</div><div class='add'>+			     unsigned int level, unsigned long mmu_seq)</div><div class='add'>+{</div><div class='add'>+	pgd_t *pgd;</div><div class='add'>+	pud_t *pud, *new_pud = NULL;</div><div class='add'>+	pmd_t *pmd, *new_pmd = NULL;</div><div class='add'>+	pte_t *ptep, *new_ptep = NULL;</div><div class='add'>+	unsigned long old;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Traverse the guest's 2nd-level tree, allocate new levels needed */</div><div class='add'>+	pgd = kvm-&gt;arch.pgtable + pgd_index(gpa);</div><div class='add'>+	pud = NULL;</div><div class='add'>+	if (pgd_present(*pgd))</div><div class='add'>+		pud = pud_offset(pgd, gpa);</div><div class='add'>+	else</div><div class='add'>+		new_pud = pud_alloc_one(kvm-&gt;mm, gpa);</div><div class='add'>+</div><div class='add'>+	pmd = NULL;</div><div class='add'>+	if (pud &amp;&amp; pud_present(*pud))</div><div class='add'>+		pmd = pmd_offset(pud, gpa);</div><div class='add'>+	else</div><div class='add'>+		new_pmd = pmd_alloc_one(kvm-&gt;mm, gpa);</div><div class='add'>+</div><div class='add'>+	if (level == 0 &amp;&amp; !(pmd &amp;&amp; pmd_present(*pmd)))</div><div class='add'>+		new_ptep = kvmppc_pte_alloc();</div><div class='add'>+</div><div class='add'>+	/* Check if we might have been invalidated; let the guest retry if so */</div><div class='add'>+	spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+	ret = -EAGAIN;</div><div class='add'>+	if (mmu_notifier_retry(kvm, mmu_seq))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	/* Now traverse again under the lock and change the tree */</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	if (pgd_none(*pgd)) {</div><div class='add'>+		if (!new_pud)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		pgd_populate(kvm-&gt;mm, pgd, new_pud);</div><div class='add'>+		new_pud = NULL;</div><div class='add'>+	}</div><div class='add'>+	pud = pud_offset(pgd, gpa);</div><div class='add'>+	if (pud_none(*pud)) {</div><div class='add'>+		if (!new_pmd)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		pud_populate(kvm-&gt;mm, pud, new_pmd);</div><div class='add'>+		new_pmd = NULL;</div><div class='add'>+	}</div><div class='add'>+	pmd = pmd_offset(pud, gpa);</div><div class='add'>+	if (pmd_large(*pmd)) {</div><div class='add'>+		/* Someone else has instantiated a large page here; retry */</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+	if (level == 1 &amp;&amp; !pmd_none(*pmd)) {</div><div class='add'>+		/*</div><div class='add'>+		 * There's a page table page here, but we wanted</div><div class='add'>+		 * to install a large page.  Tell the caller and let</div><div class='add'>+		 * it try installing a normal page if it wants.</div><div class='add'>+		 */</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+	if (level == 0) {</div><div class='add'>+		if (pmd_none(*pmd)) {</div><div class='add'>+			if (!new_ptep)</div><div class='add'>+				goto out_unlock;</div><div class='add'>+			pmd_populate(kvm-&gt;mm, pmd, new_ptep);</div><div class='add'>+			new_ptep = NULL;</div><div class='add'>+		}</div><div class='add'>+		ptep = pte_offset_kernel(pmd, gpa);</div><div class='add'>+		if (pte_present(*ptep)) {</div><div class='add'>+			/* PTE was previously valid, so invalidate it */</div><div class='add'>+			old = kvmppc_radix_update_pte(kvm, ptep, _PAGE_PRESENT,</div><div class='add'>+						      0, gpa, 0);</div><div class='add'>+			kvmppc_radix_tlbie_page(kvm, gpa, 0);</div><div class='add'>+			if (old &amp; _PAGE_DIRTY)</div><div class='add'>+				mark_page_dirty(kvm, gpa &gt;&gt; PAGE_SHIFT);</div><div class='add'>+		}</div><div class='add'>+		kvmppc_radix_set_pte_at(kvm, gpa, ptep, pte);</div><div class='add'>+	} else {</div><div class='add'>+		kvmppc_radix_set_pte_at(kvm, gpa, pmdp_ptep(pmd), pte);</div><div class='add'>+	}</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+ out_unlock:</div><div class='add'>+	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+	if (new_pud)</div><div class='add'>+		pud_free(kvm-&gt;mm, new_pud);</div><div class='add'>+	if (new_pmd)</div><div class='add'>+		pmd_free(kvm-&gt;mm, new_pmd);</div><div class='add'>+	if (new_ptep)</div><div class='add'>+		kvmppc_pte_free(new_ptep);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvmppc_book3s_radix_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='add'>+				   unsigned long ea, unsigned long dsisr)</div><div class='add'>+{</div><div class='add'>+	struct kvm *kvm = vcpu-&gt;kvm;</div><div class='add'>+	unsigned long mmu_seq, pte_size;</div><div class='add'>+	unsigned long gpa, gfn, hva, pfn;</div><div class='add'>+	struct kvm_memory_slot *memslot;</div><div class='add'>+	struct page *page = NULL, *pages[1];</div><div class='add'>+	long ret, npages, ok;</div><div class='add'>+	unsigned int writing;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	pte_t pte, *ptep;</div><div class='add'>+	unsigned long pgflags;</div><div class='add'>+	unsigned int shift, level;</div><div class='add'>+</div><div class='add'>+	/* Check for unusual errors */</div><div class='add'>+	if (dsisr &amp; DSISR_UNSUPP_MMU) {</div><div class='add'>+		pr_err("KVM: Got unsupported MMU fault\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	if (dsisr &amp; DSISR_BADACCESS) {</div><div class='add'>+		/* Reflect to the guest as DSI */</div><div class='add'>+		pr_err("KVM: Got radix HV page fault with DSISR=%lx\n", dsisr);</div><div class='add'>+		kvmppc_core_queue_data_storage(vcpu, ea, dsisr);</div><div class='add'>+		return RESUME_GUEST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Translate the logical address and get the page */</div><div class='add'>+	gpa = vcpu-&gt;arch.fault_gpa &amp; ~0xfffUL;</div><div class='add'>+	gpa &amp;= ~0xF000000000000000ul;</div><div class='add'>+	gfn = gpa &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	if (!(dsisr &amp; DSISR_PGDIRFAULT))</div><div class='add'>+		gpa |= ea &amp; 0xfff;</div><div class='add'>+	memslot = gfn_to_memslot(kvm, gfn);</div><div class='add'>+</div><div class='add'>+	/* No memslot means it's an emulated MMIO region */</div><div class='add'>+	if (!memslot || (memslot-&gt;flags &amp; KVM_MEMSLOT_INVALID)) {</div><div class='add'>+		if (dsisr &amp; (DSISR_PGDIRFAULT | DSISR_BADACCESS |</div><div class='add'>+			     DSISR_SET_RC)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Bad address in guest page table tree, or other</div><div class='add'>+			 * unusual error - reflect it to the guest as DSI.</div><div class='add'>+			 */</div><div class='add'>+			kvmppc_core_queue_data_storage(vcpu, ea, dsisr);</div><div class='add'>+			return RESUME_GUEST;</div><div class='add'>+		}</div><div class='add'>+		return kvmppc_hv_emulate_mmio(run, vcpu, gpa, ea,</div><div class='add'>+					      dsisr &amp; DSISR_ISSTORE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* used to check for invalidations in progress */</div><div class='add'>+	mmu_seq = kvm-&gt;mmu_notifier_seq;</div><div class='add'>+	smp_rmb();</div><div class='add'>+</div><div class='add'>+	writing = (dsisr &amp; DSISR_ISSTORE) != 0;</div><div class='add'>+	hva = gfn_to_hva_memslot(memslot, gfn);</div><div class='add'>+	if (dsisr &amp; DSISR_SET_RC) {</div><div class='add'>+		/*</div><div class='add'>+		 * Need to set an R or C bit in the 2nd-level tables;</div><div class='add'>+		 * if the relevant bits aren't already set in the linux</div><div class='add'>+		 * page tables, fall through to do the gup_fast to</div><div class='add'>+		 * set them in the linux page tables too.</div><div class='add'>+		 */</div><div class='add'>+		ok = 0;</div><div class='add'>+		pgflags = _PAGE_ACCESSED;</div><div class='add'>+		if (writing)</div><div class='add'>+			pgflags |= _PAGE_DIRTY;</div><div class='add'>+		local_irq_save(flags);</div><div class='add'>+		ptep = __find_linux_pte_or_hugepte(current-&gt;mm-&gt;pgd, hva,</div><div class='add'>+						   NULL, NULL);</div><div class='add'>+		if (ptep) {</div><div class='add'>+			pte = READ_ONCE(*ptep);</div><div class='add'>+			if (pte_present(pte) &amp;&amp;</div><div class='add'>+			    (pte_val(pte) &amp; pgflags) == pgflags)</div><div class='add'>+				ok = 1;</div><div class='add'>+		}</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+		if (ok) {</div><div class='add'>+			spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+			if (mmu_notifier_retry(vcpu-&gt;kvm, mmu_seq)) {</div><div class='add'>+				spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+				return RESUME_GUEST;</div><div class='add'>+			}</div><div class='add'>+			ptep = __find_linux_pte_or_hugepte(kvm-&gt;arch.pgtable,</div><div class='add'>+							gpa, NULL, &amp;shift);</div><div class='add'>+			if (ptep &amp;&amp; pte_present(*ptep)) {</div><div class='add'>+				kvmppc_radix_update_pte(kvm, ptep, 0, pgflags,</div><div class='add'>+							gpa, shift);</div><div class='add'>+				spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+				return RESUME_GUEST;</div><div class='add'>+			}</div><div class='add'>+			spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = -EFAULT;</div><div class='add'>+	pfn = 0;</div><div class='add'>+	pte_size = PAGE_SIZE;</div><div class='add'>+	pgflags = _PAGE_READ | _PAGE_EXEC;</div><div class='add'>+	level = 0;</div><div class='add'>+	npages = get_user_pages_fast(hva, 1, writing, pages);</div><div class='add'>+	if (npages &lt; 1) {</div><div class='add'>+		/* Check if it's an I/O mapping */</div><div class='add'>+		down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+		vma = find_vma(current-&gt;mm, hva);</div><div class='add'>+		if (vma &amp;&amp; vma-&gt;vm_start &lt;= hva &amp;&amp; hva &lt; vma-&gt;vm_end &amp;&amp;</div><div class='add'>+		    (vma-&gt;vm_flags &amp; VM_PFNMAP)) {</div><div class='add'>+			pfn = vma-&gt;vm_pgoff +</div><div class='add'>+				((hva - vma-&gt;vm_start) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+			pgflags = pgprot_val(vma-&gt;vm_page_prot);</div><div class='add'>+		}</div><div class='add'>+		up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+		if (!pfn)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	} else {</div><div class='add'>+		page = pages[0];</div><div class='add'>+		pfn = page_to_pfn(page);</div><div class='add'>+		if (PageHuge(page)) {</div><div class='add'>+			page = compound_head(page);</div><div class='add'>+			pte_size &lt;&lt;= compound_order(page);</div><div class='add'>+			/* See if we can insert a 2MB large-page PTE here */</div><div class='add'>+			if (pte_size &gt;= PMD_SIZE &amp;&amp;</div><div class='add'>+			    (gpa &amp; PMD_MASK &amp; PAGE_MASK) ==</div><div class='add'>+			    (hva &amp; PMD_MASK &amp; PAGE_MASK)) {</div><div class='add'>+				level = 1;</div><div class='add'>+				pfn &amp;= ~((PMD_SIZE &gt;&gt; PAGE_SHIFT) - 1);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* See if we can provide write access */</div><div class='add'>+		if (writing) {</div><div class='add'>+			/*</div><div class='add'>+			 * We assume gup_fast has set dirty on the host PTE.</div><div class='add'>+			 */</div><div class='add'>+			pgflags |= _PAGE_WRITE;</div><div class='add'>+		} else {</div><div class='add'>+			local_irq_save(flags);</div><div class='add'>+			ptep = __find_linux_pte_or_hugepte(current-&gt;mm-&gt;pgd,</div><div class='add'>+							hva, NULL, NULL);</div><div class='add'>+			if (ptep &amp;&amp; pte_write(*ptep) &amp;&amp; pte_dirty(*ptep))</div><div class='add'>+				pgflags |= _PAGE_WRITE;</div><div class='add'>+			local_irq_restore(flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Compute the PTE value that we need to insert.</div><div class='add'>+	 */</div><div class='add'>+	pgflags |= _PAGE_PRESENT | _PAGE_PTE | _PAGE_ACCESSED;</div><div class='add'>+	if (pgflags &amp; _PAGE_WRITE)</div><div class='add'>+		pgflags |= _PAGE_DIRTY;</div><div class='add'>+	pte = pfn_pte(pfn, __pgprot(pgflags));</div><div class='add'>+</div><div class='add'>+	/* Allocate space in the tree and write the PTE */</div><div class='add'>+	ret = kvmppc_create_pte(kvm, pte, gpa, level, mmu_seq);</div><div class='add'>+	if (ret == -EBUSY) {</div><div class='add'>+		/*</div><div class='add'>+		 * There's already a PMD where wanted to install a large page;</div><div class='add'>+		 * for now, fall back to installing a small page.</div><div class='add'>+		 */</div><div class='add'>+		level = 0;</div><div class='add'>+		pfn |= gfn &amp; ((PMD_SIZE &gt;&gt; PAGE_SHIFT) - 1);</div><div class='add'>+		pte = pfn_pte(pfn, __pgprot(pgflags));</div><div class='add'>+		ret = kvmppc_create_pte(kvm, pte, gpa, level, mmu_seq);</div><div class='add'>+	}</div><div class='add'>+	if (ret == 0 || ret == -EAGAIN)</div><div class='add'>+		ret = RESUME_GUEST;</div><div class='add'>+</div><div class='add'>+	if (page) {</div><div class='add'>+		/*</div><div class='add'>+		 * We drop pages[0] here, not page because page might</div><div class='add'>+		 * have been set to the head page of a compound, but</div><div class='add'>+		 * we have to drop the reference on the correct tail</div><div class='add'>+		 * page to match the get inside gup()</div><div class='add'>+		 */</div><div class='add'>+		put_page(pages[0]);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mark_pages_dirty(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='add'>+			     unsigned long gfn, unsigned int order)</div><div class='add'>+{</div><div class='add'>+	unsigned long i, limit;</div><div class='add'>+	unsigned long *dp;</div><div class='add'>+</div><div class='add'>+	if (!memslot-&gt;dirty_bitmap)</div><div class='add'>+		return;</div><div class='add'>+	limit = 1ul &lt;&lt; order;</div><div class='add'>+	if (limit &lt; BITS_PER_LONG) {</div><div class='add'>+		for (i = 0; i &lt; limit; ++i)</div><div class='add'>+			mark_page_dirty(kvm, gfn + i);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	dp = memslot-&gt;dirty_bitmap + (gfn - memslot-&gt;base_gfn);</div><div class='add'>+	limit /= BITS_PER_LONG;</div><div class='add'>+	for (i = 0; i &lt; limit; ++i)</div><div class='add'>+		*dp++ = ~0ul;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called with kvm-&gt;lock held */</div><div class='add'>+int kvm_unmap_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='add'>+		    unsigned long gfn)</div><div class='add'>+{</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+	unsigned long gpa = gfn &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	unsigned int shift;</div><div class='add'>+	unsigned long old;</div><div class='add'>+</div><div class='add'>+	ptep = __find_linux_pte_or_hugepte(kvm-&gt;arch.pgtable, gpa,</div><div class='add'>+					   NULL, &amp;shift);</div><div class='add'>+	if (ptep &amp;&amp; pte_present(*ptep)) {</div><div class='add'>+		old = kvmppc_radix_update_pte(kvm, ptep, _PAGE_PRESENT, 0,</div><div class='add'>+					      gpa, shift);</div><div class='add'>+		kvmppc_radix_tlbie_page(kvm, gpa, shift);</div><div class='add'>+		if (old &amp; _PAGE_DIRTY) {</div><div class='add'>+			if (!shift)</div><div class='add'>+				mark_page_dirty(kvm, gfn);</div><div class='add'>+			else</div><div class='add'>+				mark_pages_dirty(kvm, memslot,</div><div class='add'>+						 gfn, shift - PAGE_SHIFT);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;				</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called with kvm-&gt;lock held */</div><div class='add'>+int kvm_age_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='add'>+		  unsigned long gfn)</div><div class='add'>+{</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+	unsigned long gpa = gfn &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	unsigned int shift;</div><div class='add'>+	int ref = 0;</div><div class='add'>+</div><div class='add'>+	ptep = __find_linux_pte_or_hugepte(kvm-&gt;arch.pgtable, gpa,</div><div class='add'>+					   NULL, &amp;shift);</div><div class='add'>+	if (ptep &amp;&amp; pte_present(*ptep) &amp;&amp; pte_young(*ptep)) {</div><div class='add'>+		kvmppc_radix_update_pte(kvm, ptep, _PAGE_ACCESSED, 0,</div><div class='add'>+					gpa, shift);</div><div class='add'>+		/* XXX need to flush tlb here? */</div><div class='add'>+		ref = 1;</div><div class='add'>+	}</div><div class='add'>+	return ref;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called with kvm-&gt;lock held */</div><div class='add'>+int kvm_test_age_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,</div><div class='add'>+		       unsigned long gfn)</div><div class='add'>+{</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+	unsigned long gpa = gfn &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	unsigned int shift;</div><div class='add'>+	int ref = 0;</div><div class='add'>+</div><div class='add'>+	ptep = __find_linux_pte_or_hugepte(kvm-&gt;arch.pgtable, gpa,</div><div class='add'>+					   NULL, &amp;shift);</div><div class='add'>+	if (ptep &amp;&amp; pte_present(*ptep) &amp;&amp; pte_young(*ptep))</div><div class='add'>+		ref = 1;</div><div class='add'>+	return ref;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns the number of PAGE_SIZE pages that are dirty */</div><div class='add'>+static int kvm_radix_test_clear_dirty(struct kvm *kvm,</div><div class='add'>+				struct kvm_memory_slot *memslot, int pagenum)</div><div class='add'>+{</div><div class='add'>+	unsigned long gfn = memslot-&gt;base_gfn + pagenum;</div><div class='add'>+	unsigned long gpa = gfn &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+	unsigned int shift;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ptep = __find_linux_pte_or_hugepte(kvm-&gt;arch.pgtable, gpa,</div><div class='add'>+					   NULL, &amp;shift);</div><div class='add'>+	if (ptep &amp;&amp; pte_present(*ptep) &amp;&amp; pte_dirty(*ptep)) {</div><div class='add'>+		ret = 1;</div><div class='add'>+		if (shift)</div><div class='add'>+			ret = 1 &lt;&lt; (shift - PAGE_SHIFT);</div><div class='add'>+		kvmppc_radix_update_pte(kvm, ptep, _PAGE_DIRTY, 0,</div><div class='add'>+					gpa, shift);</div><div class='add'>+		kvmppc_radix_tlbie_page(kvm, gpa, shift);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+long kvmppc_hv_get_dirty_log_radix(struct kvm *kvm,</div><div class='add'>+			struct kvm_memory_slot *memslot, unsigned long *map)</div><div class='add'>+{</div><div class='add'>+	unsigned long i, j;</div><div class='add'>+	unsigned long n, *p;</div><div class='add'>+	int npages;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Radix accumulates dirty bits in the first half of the</div><div class='add'>+	 * memslot's dirty_bitmap area, for when pages are paged</div><div class='add'>+	 * out or modified by the host directly.  Pick up these</div><div class='add'>+	 * bits and add them to the map.</div><div class='add'>+	 */</div><div class='add'>+	n = kvm_dirty_bitmap_bytes(memslot) / sizeof(long);</div><div class='add'>+	p = memslot-&gt;dirty_bitmap;</div><div class='add'>+	for (i = 0; i &lt; n; ++i)</div><div class='add'>+		map[i] |= xchg(&amp;p[i], 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; memslot-&gt;npages; i = j) {</div><div class='add'>+		npages = kvm_radix_test_clear_dirty(kvm, memslot, i);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Note that if npages &gt; 0 then i must be a multiple of npages,</div><div class='add'>+		 * since huge pages are only used to back the guest at guest</div><div class='add'>+		 * real addresses that are a multiple of their size.</div><div class='add'>+		 * Since we have at most one PTE covering any given guest</div><div class='add'>+		 * real address, if npages &gt; 1 we can skip to i + npages.</div><div class='add'>+		 */</div><div class='add'>+		j = i + 1;</div><div class='add'>+		if (npages)</div><div class='add'>+			for (j = i; npages; ++j, --npages)</div><div class='add'>+				__set_bit_le(j, map);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_rmmu_ap_encoding(struct kvm_ppc_rmmu_info *info,</div><div class='add'>+				 int psize, int *indexp)</div><div class='add'>+{</div><div class='add'>+	if (!mmu_psize_defs[psize].shift)</div><div class='add'>+		return;</div><div class='add'>+	info-&gt;ap_encodings[*indexp] = mmu_psize_defs[psize].shift |</div><div class='add'>+		(mmu_psize_defs[psize].ap &lt;&lt; 29);</div><div class='add'>+	++(*indexp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvmhv_get_rmmu_info(struct kvm *kvm, struct kvm_ppc_rmmu_info *info)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!radix_enabled())</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	memset(info, 0, sizeof(*info));</div><div class='add'>+</div><div class='add'>+	/* 4k page size */</div><div class='add'>+	info-&gt;geometries[0].page_shift = 12;</div><div class='add'>+	info-&gt;geometries[0].level_bits[0] = 9;</div><div class='add'>+	for (i = 1; i &lt; 4; ++i)</div><div class='add'>+		info-&gt;geometries[0].level_bits[i] = p9_supported_radix_bits[i];</div><div class='add'>+	/* 64k page size */</div><div class='add'>+	info-&gt;geometries[1].page_shift = 16;</div><div class='add'>+	for (i = 0; i &lt; 4; ++i)</div><div class='add'>+		info-&gt;geometries[1].level_bits[i] = p9_supported_radix_bits[i];</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	add_rmmu_ap_encoding(info, MMU_PAGE_4K, &amp;i);</div><div class='add'>+	add_rmmu_ap_encoding(info, MMU_PAGE_64K, &amp;i);</div><div class='add'>+	add_rmmu_ap_encoding(info, MMU_PAGE_2M, &amp;i);</div><div class='add'>+	add_rmmu_ap_encoding(info, MMU_PAGE_1G, &amp;i);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvmppc_init_vm_radix(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	kvm-&gt;arch.pgtable = pgd_alloc(kvm-&gt;mm);</div><div class='add'>+	if (!kvm-&gt;arch.pgtable)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvmppc_free_radix(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	unsigned long ig, iu, im;</div><div class='add'>+	pte_t *pte;</div><div class='add'>+	pmd_t *pmd;</div><div class='add'>+	pud_t *pud;</div><div class='add'>+	pgd_t *pgd;</div><div class='add'>+</div><div class='add'>+	if (!kvm-&gt;arch.pgtable)</div><div class='add'>+		return;</div><div class='add'>+	pgd = kvm-&gt;arch.pgtable;</div><div class='add'>+	for (ig = 0; ig &lt; PTRS_PER_PGD; ++ig, ++pgd) {</div><div class='add'>+		if (!pgd_present(*pgd))</div><div class='add'>+			continue;</div><div class='add'>+		pud = pud_offset(pgd, 0);</div><div class='add'>+		for (iu = 0; iu &lt; PTRS_PER_PUD; ++iu, ++pud) {</div><div class='add'>+			if (!pud_present(*pud))</div><div class='add'>+				continue;</div><div class='add'>+			pmd = pmd_offset(pud, 0);</div><div class='add'>+			for (im = 0; im &lt; PTRS_PER_PMD; ++im, ++pmd) {</div><div class='add'>+				if (pmd_huge(*pmd)) {</div><div class='add'>+					pmd_clear(pmd);</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				if (!pmd_present(*pmd))</div><div class='add'>+					continue;</div><div class='add'>+				pte = pte_offset_map(pmd, 0);</div><div class='add'>+				memset(pte, 0, sizeof(long) &lt;&lt; PTE_INDEX_SIZE);</div><div class='add'>+				kvmppc_pte_free(pte);</div><div class='add'>+				pmd_clear(pmd);</div><div class='add'>+			}</div><div class='add'>+			pmd_free(kvm-&gt;mm, pmd_offset(pud, 0));</div><div class='add'>+			pud_clear(pud);</div><div class='add'>+		}</div><div class='add'>+		pud_free(kvm-&gt;mm, pud_offset(pgd, 0));</div><div class='add'>+		pgd_clear(pgd);</div><div class='add'>+	}</div><div class='add'>+	pgd_free(kvm-&gt;mm, kvm-&gt;arch.pgtable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pte_ctor(void *addr)</div><div class='add'>+{</div><div class='add'>+	memset(addr, 0, PTE_TABLE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvmppc_radix_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long size = sizeof(void *) &lt;&lt; PTE_INDEX_SIZE;</div><div class='add'>+</div><div class='add'>+	kvm_pte_cache = kmem_cache_create("kvm-pte", size, size, 0, pte_ctor);</div><div class='add'>+	if (!kvm_pte_cache)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvmppc_radix_exit(void)</div><div class='add'>+{</div><div class='add'>+	kmem_cache_destroy(kvm_pte_cache);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c<br/>index c379ff5a4438..3e26cd4979f9 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_64_vio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_64_vio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_64_vio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_64_vio.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/anon_inodes.h&gt;</div><div class='hunk'>@@ -102,9 +103,9 @@ static void release_spapr_tce_table(struct rcu_head *head)</div><div class='ctx'> 	kfree(stt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_spapr_tce_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+static int kvm_spapr_tce_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	struct kvmppc_spapr_tce_table *stt = vma-&gt;vm_file-&gt;private_data;</div><div class='add'>+	struct kvmppc_spapr_tce_table *stt = vmf-&gt;vma-&gt;vm_file-&gt;private_data;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='ctx'> 	if (vmf-&gt;pgoff &gt;= kvmppc_tce_pages(stt-&gt;size))</div><div class='hunk'>@@ -171,6 +172,7 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = -ENOMEM;</div><div class='ctx'> 	stt = kzalloc(sizeof(*stt) + npages * sizeof(struct page *),</div><div class='ctx'> 		      GFP_KERNEL);</div><div class='ctx'> 	if (!stt)</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_64_vio_hv.c b/arch/powerpc/kvm/book3s_64_vio_hv.c<br/>index d461c440889a..e4c4ea973e57 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_64_vio_hv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_64_vio_hv.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_64_vio_hv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_64_vio_hv.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> #include &lt;asm/udbg.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/tce.h&gt;</div><div class='del'>-#include &lt;asm/iommu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TCES_PER_PAGE	(PAGE_SIZE / sizeof(u64))</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c<br/>index 3686471be32b..1ec86d9e2a82 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_hv.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv.c</a></div><div class='hunk'>@@ -22,7 +22,8 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/stat.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -39,7 +40,7 @@</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_ppc.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_book3s.h&gt;</div><div class='hunk'>@@ -54,6 +55,9 @@</div><div class='ctx'> #include &lt;asm/dbell.h&gt;</div><div class='ctx'> #include &lt;asm/hmi.h&gt;</div><div class='ctx'> #include &lt;asm/pnv-pci.h&gt;</div><div class='add'>+#include &lt;asm/mmu.h&gt;</div><div class='add'>+#include &lt;asm/opal.h&gt;</div><div class='add'>+#include &lt;asm/xics.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='hunk'>@@ -62,6 +66,7 @@</div><div class='ctx'> #include &lt;linux/irqbypass.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "book3s.h"</div><div class='ctx'> </div><div class='hunk'>@@ -104,23 +109,6 @@ module_param_cb(h_ipi_redirect, &amp;module_param_ops, &amp;h_ipi_redirect,</div><div class='ctx'> MODULE_PARM_DESC(h_ipi_redirect, "Redirect H_IPI wakeup to a free host core");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Maximum halt poll interval defaults to KVM_HALT_POLL_NS_DEFAULT */</div><div class='del'>-static unsigned int halt_poll_max_ns = KVM_HALT_POLL_NS_DEFAULT;</div><div class='del'>-module_param(halt_poll_max_ns, uint, S_IRUGO | S_IWUSR);</div><div class='del'>-MODULE_PARM_DESC(halt_poll_max_ns, "Maximum halt poll time in ns");</div><div class='del'>-</div><div class='del'>-/* Factor by which the vcore halt poll interval is grown, default is to double</div><div class='del'>- */</div><div class='del'>-static unsigned int halt_poll_ns_grow = 2;</div><div class='del'>-module_param(halt_poll_ns_grow, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(halt_poll_ns_grow, "Factor halt poll time is grown by");</div><div class='del'>-</div><div class='del'>-/* Factor by which the vcore halt poll interval is shrunk, default is to reset</div><div class='del'>- */</div><div class='del'>-static unsigned int halt_poll_ns_shrink;</div><div class='del'>-module_param(halt_poll_ns_shrink, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(halt_poll_ns_shrink, "Factor halt poll time is shrunk by");</div><div class='del'>-</div><div class='ctx'> static void kvmppc_end_cede(struct kvm_vcpu *vcpu);</div><div class='ctx'> static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='hunk'>@@ -146,12 +134,21 @@ static inline struct kvm_vcpu *next_runnable_thread(struct kvmppc_vcore *vc,</div><div class='ctx'> </div><div class='ctx'> static bool kvmppc_ipi_thread(int cpu)</div><div class='ctx'> {</div><div class='add'>+	unsigned long msg = PPC_DBELL_TYPE(PPC_DBELL_SERVER);</div><div class='add'>+</div><div class='add'>+	/* On POWER9 we can use msgsnd to IPI any cpu */</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		msg |= get_hard_smp_processor_id(cpu);</div><div class='add'>+		smp_mb();</div><div class='add'>+		__asm__ __volatile__ (PPC_MSGSND(%0) : : "r" (msg));</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* On POWER8 for IPIs to threads in the same core, use msgsnd */</div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_ARCH_207S)) {</div><div class='ctx'> 		preempt_disable();</div><div class='ctx'> 		if (cpu_first_thread_sibling(cpu) ==</div><div class='ctx'> 		    cpu_first_thread_sibling(smp_processor_id())) {</div><div class='del'>-			unsigned long msg = PPC_DBELL_TYPE(PPC_DBELL_SERVER);</div><div class='ctx'> 			msg |= cpu_thread_in_core(cpu);</div><div class='ctx'> 			smp_mb();</div><div class='ctx'> 			__asm__ __volatile__ (PPC_MSGSND(%0) : : "r" (msg));</div><div class='hunk'>@@ -162,8 +159,12 @@ static bool kvmppc_ipi_thread(int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PPC_ICP_NATIVE) &amp;&amp; defined(CONFIG_SMP)</div><div class='del'>-	if (cpu &gt;= 0 &amp;&amp; cpu &lt; nr_cpu_ids &amp;&amp; paca[cpu].kvm_hstate.xics_phys) {</div><div class='del'>-		xics_wake_cpu(cpu);</div><div class='add'>+	if (cpu &gt;= 0 &amp;&amp; cpu &lt; nr_cpu_ids) {</div><div class='add'>+		if (paca[cpu].kvm_hstate.xics_phys) {</div><div class='add'>+			xics_wake_cpu(cpu);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		opal_int_set_mfrr(get_hard_smp_processor_id(cpu), IPI_PRIORITY);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -182,7 +183,8 @@ static void kvmppc_fast_vcpu_kick_hv(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		++vcpu-&gt;stat.halt_wakeup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (kvmppc_ipi_thread(vcpu-&gt;arch.thread_cpu))</div><div class='add'>+	cpu = READ_ONCE(vcpu-&gt;arch.thread_cpu);</div><div class='add'>+	if (cpu &gt;= 0 &amp;&amp; kvmppc_ipi_thread(cpu))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* CPU points to the first thread of the core */</div><div class='hunk'>@@ -299,41 +301,54 @@ static void kvmppc_set_pvr_hv(struct kvm_vcpu *vcpu, u32 pvr)</div><div class='ctx'> 	vcpu-&gt;arch.pvr = pvr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Dummy value used in computing PCR value below */</div><div class='add'>+#define PCR_ARCH_300	(PCR_ARCH_207 &lt;&lt; 1)</div><div class='add'>+</div><div class='ctx'> static int kvmppc_set_arch_compat(struct kvm_vcpu *vcpu, u32 arch_compat)</div><div class='ctx'> {</div><div class='del'>-	unsigned long pcr = 0;</div><div class='add'>+	unsigned long host_pcr_bit = 0, guest_pcr_bit = 0;</div><div class='ctx'> 	struct kvmppc_vcore *vc = vcpu-&gt;arch.vcore;</div><div class='ctx'> </div><div class='add'>+	/* We can (emulate) our own architecture version and anything older */</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		host_pcr_bit = PCR_ARCH_300;</div><div class='add'>+	else if (cpu_has_feature(CPU_FTR_ARCH_207S))</div><div class='add'>+		host_pcr_bit = PCR_ARCH_207;</div><div class='add'>+	else if (cpu_has_feature(CPU_FTR_ARCH_206))</div><div class='add'>+		host_pcr_bit = PCR_ARCH_206;</div><div class='add'>+	else</div><div class='add'>+		host_pcr_bit = PCR_ARCH_205;</div><div class='add'>+</div><div class='add'>+	/* Determine lowest PCR bit needed to run guest in given PVR level */</div><div class='add'>+	guest_pcr_bit = host_pcr_bit;</div><div class='ctx'> 	if (arch_compat) {</div><div class='ctx'> 		switch (arch_compat) {</div><div class='ctx'> 		case PVR_ARCH_205:</div><div class='del'>-			/*</div><div class='del'>-			 * If an arch bit is set in PCR, all the defined</div><div class='del'>-			 * higher-order arch bits also have to be set.</div><div class='del'>-			 */</div><div class='del'>-			pcr = PCR_ARCH_206 | PCR_ARCH_205;</div><div class='add'>+			guest_pcr_bit = PCR_ARCH_205;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PVR_ARCH_206:</div><div class='ctx'> 		case PVR_ARCH_206p:</div><div class='del'>-			pcr = PCR_ARCH_206;</div><div class='add'>+			guest_pcr_bit = PCR_ARCH_206;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PVR_ARCH_207:</div><div class='add'>+			guest_pcr_bit = PCR_ARCH_207;</div><div class='add'>+			break;</div><div class='add'>+		case PVR_ARCH_300:</div><div class='add'>+			guest_pcr_bit = PCR_ARCH_300;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (!cpu_has_feature(CPU_FTR_ARCH_207S)) {</div><div class='del'>-			/* POWER7 can't emulate POWER8 */</div><div class='del'>-			if (!(pcr &amp; PCR_ARCH_206))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			pcr &amp;= ~PCR_ARCH_206;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Check requested PCR bits don't exceed our capabilities */</div><div class='add'>+	if (guest_pcr_bit &gt; host_pcr_bit)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;vc-&gt;lock);</div><div class='ctx'> 	vc-&gt;arch_compat = arch_compat;</div><div class='del'>-	vc-&gt;pcr = pcr;</div><div class='add'>+	/* Set all PCR bits for which guest_pcr_bit &lt;= bit &lt; host_pcr_bit */</div><div class='add'>+	vc-&gt;pcr = host_pcr_bit - guest_pcr_bit;</div><div class='ctx'> 	spin_unlock(&amp;vc-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -760,12 +775,8 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		}</div><div class='ctx'> 		tvcpu-&gt;arch.prodded = 1;</div><div class='ctx'> 		smp_mb();</div><div class='del'>-		if (vcpu-&gt;arch.ceded) {</div><div class='del'>-			if (swait_active(&amp;vcpu-&gt;wq)) {</div><div class='del'>-				swake_up(&amp;vcpu-&gt;wq);</div><div class='del'>-				vcpu-&gt;stat.halt_wakeup++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		if (tvcpu-&gt;arch.ceded)</div><div class='add'>+			kvmppc_fast_vcpu_kick_hv(tvcpu);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case H_CONFER:</div><div class='ctx'> 		target = kvmppc_get_gpr(vcpu, 4);</div><div class='hunk'>@@ -945,6 +956,7 @@ static int kvmppc_handle_exit_hv(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BOOK3S_INTERRUPT_EXTERNAL:</div><div class='ctx'> 	case BOOK3S_INTERRUPT_H_DOORBELL:</div><div class='add'>+	case BOOK3S_INTERRUPT_H_VIRT:</div><div class='ctx'> 		vcpu-&gt;stat.ext_intr_exits++;</div><div class='ctx'> 		r = RESUME_GUEST;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1121,7 +1133,7 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Userspace can only modify DPFD (default prefetch depth),</div><div class='ctx'> 	 * ILE (interrupt little-endian) and TC (translation control).</div><div class='del'>-	 * On POWER8 userspace can also modify AIL (alt. interrupt loc.)</div><div class='add'>+	 * On POWER8 and POWER9 userspace can also modify AIL (alt. interrupt loc.).</div><div class='ctx'> 	 */</div><div class='ctx'> 	mask = LPCR_DPFD | LPCR_ILE | LPCR_TC;</div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_ARCH_207S))</div><div class='hunk'>@@ -1229,6 +1241,12 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,</div><div class='ctx'> 	case KVM_REG_PPC_WORT:</div><div class='ctx'> 		*val = get_reg_val(id, vcpu-&gt;arch.wort);</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_REG_PPC_TIDR:</div><div class='add'>+		*val = get_reg_val(id, vcpu-&gt;arch.tid);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_PPC_PSSCR:</div><div class='add'>+		*val = get_reg_val(id, vcpu-&gt;arch.psscr);</div><div class='add'>+		break;</div><div class='ctx'> 	case KVM_REG_PPC_VPA_ADDR:</div><div class='ctx'> 		spin_lock(&amp;vcpu-&gt;arch.vpa_update_lock);</div><div class='ctx'> 		*val = get_reg_val(id, vcpu-&gt;arch.vpa.next_gpa);</div><div class='hunk'>@@ -1288,6 +1306,9 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,</div><div class='ctx'> 	case KVM_REG_PPC_TM_CR:</div><div class='ctx'> 		*val = get_reg_val(id, vcpu-&gt;arch.cr_tm);</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_REG_PPC_TM_XER:</div><div class='add'>+		*val = get_reg_val(id, vcpu-&gt;arch.xer_tm);</div><div class='add'>+		break;</div><div class='ctx'> 	case KVM_REG_PPC_TM_LR:</div><div class='ctx'> 		*val = get_reg_val(id, vcpu-&gt;arch.lr_tm);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1427,6 +1448,12 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,</div><div class='ctx'> 	case KVM_REG_PPC_WORT:</div><div class='ctx'> 		vcpu-&gt;arch.wort = set_reg_val(id, *val);</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_REG_PPC_TIDR:</div><div class='add'>+		vcpu-&gt;arch.tid = set_reg_val(id, *val);</div><div class='add'>+		break;</div><div class='add'>+	case KVM_REG_PPC_PSSCR:</div><div class='add'>+		vcpu-&gt;arch.psscr = set_reg_val(id, *val) &amp; PSSCR_GUEST_VIS;</div><div class='add'>+		break;</div><div class='ctx'> 	case KVM_REG_PPC_VPA_ADDR:</div><div class='ctx'> 		addr = set_reg_val(id, *val);</div><div class='ctx'> 		r = -EINVAL;</div><div class='hunk'>@@ -1498,6 +1525,9 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,</div><div class='ctx'> 	case KVM_REG_PPC_TM_CR:</div><div class='ctx'> 		vcpu-&gt;arch.cr_tm = set_reg_val(id, *val);</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_REG_PPC_TM_XER:</div><div class='add'>+		vcpu-&gt;arch.xer_tm = set_reg_val(id, *val);</div><div class='add'>+		break;</div><div class='ctx'> 	case KVM_REG_PPC_TM_LR:</div><div class='ctx'> 		vcpu-&gt;arch.lr_tm = set_reg_val(id, *val);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1540,6 +1570,20 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * On POWER9, threads are independent and can be in different partitions.</div><div class='add'>+ * Therefore we consider each thread to be a subcore.</div><div class='add'>+ * There is a restriction that all threads have to be in the same</div><div class='add'>+ * MMU mode (radix or HPT), unfortunately, but since we only support</div><div class='add'>+ * HPT guests on a HPT host so far, that isn't an impediment yet.</div><div class='add'>+ */</div><div class='add'>+static int threads_per_vcore(void)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		return 1;</div><div class='add'>+	return threads_per_subcore;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct kvmppc_vcore *kvmppc_vcore_create(struct kvm *kvm, int core)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvmppc_vcore *vcore;</div><div class='hunk'>@@ -1554,7 +1598,7 @@ static struct kvmppc_vcore *kvmppc_vcore_create(struct kvm *kvm, int core)</div><div class='ctx'> 	init_swait_queue_head(&amp;vcore-&gt;wq);</div><div class='ctx'> 	vcore-&gt;preempt_tb = TB_NIL;</div><div class='ctx'> 	vcore-&gt;lpcr = kvm-&gt;arch.lpcr;</div><div class='del'>-	vcore-&gt;first_vcpuid = core * threads_per_subcore;</div><div class='add'>+	vcore-&gt;first_vcpuid = core * threads_per_vcore();</div><div class='ctx'> 	vcore-&gt;kvm = kvm;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;vcore-&gt;preempt_list);</div><div class='ctx'> </div><div class='hunk'>@@ -1717,7 +1761,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm,</div><div class='ctx'> 	int core;</div><div class='ctx'> 	struct kvmppc_vcore *vcore;</div><div class='ctx'> </div><div class='del'>-	core = id / threads_per_subcore;</div><div class='add'>+	core = id / threads_per_vcore();</div><div class='ctx'> 	if (core &gt;= KVM_MAX_VCORES)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1775,6 +1819,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm,</div><div class='ctx'> 	vcpu-&gt;arch.vcore = vcore;</div><div class='ctx'> 	vcpu-&gt;arch.ptid = vcpu-&gt;vcpu_id - vcore-&gt;first_vcpuid;</div><div class='ctx'> 	vcpu-&gt;arch.thread_cpu = -1;</div><div class='add'>+	vcpu-&gt;arch.prev_cpu = -1;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.cpu_type = KVM_CPU_3S_64;</div><div class='ctx'> 	kvmppc_sanity_check(vcpu);</div><div class='hunk'>@@ -1826,8 +1871,7 @@ static void kvmppc_set_timer(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	}</div><div class='ctx'> 	dec_nsec = (vcpu-&gt;arch.dec_expires - now) * NSEC_PER_SEC</div><div class='ctx'> 		   / tb_ticks_per_sec;</div><div class='del'>-	hrtimer_start(&amp;vcpu-&gt;arch.dec_timer, ktime_set(0, dec_nsec),</div><div class='del'>-		      HRTIMER_MODE_REL);</div><div class='add'>+	hrtimer_start(&amp;vcpu-&gt;arch.dec_timer, dec_nsec, HRTIMER_MODE_REL);</div><div class='ctx'> 	vcpu-&gt;arch.timer_running = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1905,11 +1949,33 @@ static void kvmppc_release_hwthread(int cpu)</div><div class='ctx'> 	tpaca-&gt;kvm_hstate.kvm_split_mode = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void do_nothing(void *x)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void radix_flush_cpu(struct kvm *kvm, int cpu, struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cpu = cpu_first_thread_sibling(cpu);</div><div class='add'>+	cpumask_set_cpu(cpu, &amp;kvm-&gt;arch.need_tlb_flush);</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure setting of bit in need_tlb_flush precedes</div><div class='add'>+	 * testing of cpu_in_guest bits.  The matching barrier on</div><div class='add'>+	 * the other side is the first smp_mb() in kvmppc_run_core().</div><div class='add'>+	 */</div><div class='add'>+	smp_mb();</div><div class='add'>+	for (i = 0; i &lt; threads_per_core; ++i)</div><div class='add'>+		if (cpumask_test_cpu(cpu + i, &amp;kvm-&gt;arch.cpu_in_guest))</div><div class='add'>+			smp_call_function_single(cpu + i, do_nothing, NULL, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void kvmppc_start_thread(struct kvm_vcpu *vcpu, struct kvmppc_vcore *vc)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	struct paca_struct *tpaca;</div><div class='ctx'> 	struct kvmppc_vcore *mvc = vc-&gt;master_vcore;</div><div class='add'>+	struct kvm *kvm = vc-&gt;kvm;</div><div class='ctx'> </div><div class='ctx'> 	cpu = vc-&gt;pcpu;</div><div class='ctx'> 	if (vcpu) {</div><div class='hunk'>@@ -1920,6 +1986,27 @@ static void kvmppc_start_thread(struct kvm_vcpu *vcpu, struct kvmppc_vcore *vc)</div><div class='ctx'> 		cpu += vcpu-&gt;arch.ptid;</div><div class='ctx'> 		vcpu-&gt;cpu = mvc-&gt;pcpu;</div><div class='ctx'> 		vcpu-&gt;arch.thread_cpu = cpu;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * With radix, the guest can do TLB invalidations itself,</div><div class='add'>+		 * and it could choose to use the local form (tlbiel) if</div><div class='add'>+		 * it is invalidating a translation that has only ever been</div><div class='add'>+		 * used on one vcpu.  However, that doesn't mean it has</div><div class='add'>+		 * only ever been used on one physical cpu, since vcpus</div><div class='add'>+		 * can move around between pcpus.  To cope with this, when</div><div class='add'>+		 * a vcpu moves from one pcpu to another, we need to tell</div><div class='add'>+		 * any vcpus running on the same core as this vcpu previously</div><div class='add'>+		 * ran to flush the TLB.  The TLB is shared between threads,</div><div class='add'>+		 * so we use a single bit in .need_tlb_flush for all 4 threads.</div><div class='add'>+		 */</div><div class='add'>+		if (kvm_is_radix(kvm) &amp;&amp; vcpu-&gt;arch.prev_cpu != cpu) {</div><div class='add'>+			if (vcpu-&gt;arch.prev_cpu &gt;= 0 &amp;&amp;</div><div class='add'>+			    cpu_first_thread_sibling(vcpu-&gt;arch.prev_cpu) !=</div><div class='add'>+			    cpu_first_thread_sibling(cpu))</div><div class='add'>+				radix_flush_cpu(kvm, vcpu-&gt;arch.prev_cpu, vcpu);</div><div class='add'>+			vcpu-&gt;arch.prev_cpu = cpu;</div><div class='add'>+		}</div><div class='add'>+		cpumask_set_cpu(cpu, &amp;kvm-&gt;arch.cpu_in_guest);</div><div class='ctx'> 	}</div><div class='ctx'> 	tpaca = &amp;paca[cpu];</div><div class='ctx'> 	tpaca-&gt;kvm_hstate.kvm_vcpu = vcpu;</div><div class='hunk'>@@ -1935,7 +2022,10 @@ static void kvmppc_wait_for_nap(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> 	int i, loops;</div><div class='add'>+	int n_threads = threads_per_vcore();</div><div class='ctx'> </div><div class='add'>+	if (n_threads &lt;= 1)</div><div class='add'>+		return;</div><div class='ctx'> 	for (loops = 0; loops &lt; 1000000; ++loops) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Check if all threads are finished.</div><div class='hunk'>@@ -1943,17 +2033,17 @@ static void kvmppc_wait_for_nap(void)</div><div class='ctx'> 		 * and the thread clears it when finished, so we look</div><div class='ctx'> 		 * for any threads that still have a non-NULL vcore ptr.</div><div class='ctx'> 		 */</div><div class='del'>-		for (i = 1; i &lt; threads_per_subcore; ++i)</div><div class='add'>+		for (i = 1; i &lt; n_threads; ++i)</div><div class='ctx'> 			if (paca[cpu + i].kvm_hstate.kvm_vcore)</div><div class='ctx'> 				break;</div><div class='del'>-		if (i == threads_per_subcore) {</div><div class='add'>+		if (i == n_threads) {</div><div class='ctx'> 			HMT_medium();</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		HMT_low();</div><div class='ctx'> 	}</div><div class='ctx'> 	HMT_medium();</div><div class='del'>-	for (i = 1; i &lt; threads_per_subcore; ++i)</div><div class='add'>+	for (i = 1; i &lt; n_threads; ++i)</div><div class='ctx'> 		if (paca[cpu + i].kvm_hstate.kvm_vcore)</div><div class='ctx'> 			pr_err("KVM: CPU %d seems to be stuck\n", cpu + i);</div><div class='ctx'> }</div><div class='hunk'>@@ -2019,7 +2109,7 @@ static void kvmppc_vcore_preempt(struct kvmppc_vcore *vc)</div><div class='ctx'> </div><div class='ctx'> 	vc-&gt;vcore_state = VCORE_PREEMPT;</div><div class='ctx'> 	vc-&gt;pcpu = smp_processor_id();</div><div class='del'>-	if (vc-&gt;num_threads &lt; threads_per_subcore) {</div><div class='add'>+	if (vc-&gt;num_threads &lt; threads_per_vcore()) {</div><div class='ctx'> 		spin_lock(&amp;lp-&gt;lock);</div><div class='ctx'> 		list_add_tail(&amp;vc-&gt;preempt_list, &amp;lp-&gt;list);</div><div class='ctx'> 		spin_unlock(&amp;lp-&gt;lock);</div><div class='hunk'>@@ -2123,8 +2213,7 @@ static bool can_dynamic_split(struct kvmppc_vcore *vc, struct core_info *cip)</div><div class='ctx'> 	cip-&gt;subcore_threads[sub] = vc-&gt;num_threads;</div><div class='ctx'> 	cip-&gt;subcore_vm[sub] = vc-&gt;kvm;</div><div class='ctx'> 	init_master_vcore(vc);</div><div class='del'>-	list_del(&amp;vc-&gt;preempt_list);</div><div class='del'>-	list_add_tail(&amp;vc-&gt;preempt_list, &amp;cip-&gt;vcs[sub]);</div><div class='add'>+	list_move_tail(&amp;vc-&gt;preempt_list, &amp;cip-&gt;vcs[sub]);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -2254,12 +2343,12 @@ static void post_guest_process(struct kvmppc_vcore *vc, bool is_master)</div><div class='ctx'>  * enter the guest. Only do this if it is the primary thread of the</div><div class='ctx'>  * core (not if a subcore) that is entering the guest.</div><div class='ctx'>  */</div><div class='del'>-static inline void kvmppc_clear_host_core(int cpu)</div><div class='add'>+static inline int kvmppc_clear_host_core(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	int core;</div><div class='ctx'> </div><div class='ctx'> 	if (!kvmppc_host_rm_ops_hv || cpu_thread_in_core(cpu))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Memory barrier can be omitted here as we will do a smp_wmb()</div><div class='ctx'> 	 * later in kvmppc_start_thread and we need ensure that state is</div><div class='hunk'>@@ -2267,6 +2356,7 @@ static inline void kvmppc_clear_host_core(int cpu)</div><div class='ctx'> 	 */</div><div class='ctx'> 	core = cpu &gt;&gt; threads_shift;</div><div class='ctx'> 	kvmppc_host_rm_ops_hv-&gt;rm_core[core].rm_state.in_host = 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2274,12 +2364,12 @@ static inline void kvmppc_clear_host_core(int cpu)</div><div class='ctx'>  * Only need to do this if it is the primary thread of the core that is</div><div class='ctx'>  * exiting.</div><div class='ctx'>  */</div><div class='del'>-static inline void kvmppc_set_host_core(int cpu)</div><div class='add'>+static inline int kvmppc_set_host_core(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	int core;</div><div class='ctx'> </div><div class='ctx'> 	if (!kvmppc_host_rm_ops_hv || cpu_thread_in_core(cpu))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Memory barrier can be omitted here because we do a spin_unlock</div><div class='hunk'>@@ -2287,6 +2377,7 @@ static inline void kvmppc_set_host_core(int cpu)</div><div class='ctx'> 	 */</div><div class='ctx'> 	core = cpu &gt;&gt; threads_shift;</div><div class='ctx'> 	kvmppc_host_rm_ops_hv-&gt;rm_core[core].rm_state.in_host = 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2307,6 +2398,7 @@ static noinline void kvmppc_run_core(struct kvmppc_vcore *vc)</div><div class='ctx'> 	unsigned long cmd_bit, stat_bit;</div><div class='ctx'> 	int pcpu, thr;</div><div class='ctx'> 	int target_threads;</div><div class='add'>+	int controlled_threads;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Remove from the list any threads that have a signal pending</div><div class='hunk'>@@ -2325,11 +2417,18 @@ static noinline void kvmppc_run_core(struct kvmppc_vcore *vc)</div><div class='ctx'> 	vc-&gt;preempt_tb = TB_NIL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Number of threads that we will be controlling: the same as</div><div class='add'>+	 * the number of threads per subcore, except on POWER9,</div><div class='add'>+	 * where it's 1 because the threads are (mostly) independent.</div><div class='add'>+	 */</div><div class='add'>+	controlled_threads = threads_per_vcore();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Make sure we are running on primary threads, and that secondary</div><div class='ctx'> 	 * threads are offline.  Also check if the number of threads in this</div><div class='ctx'> 	 * guest are greater than the current system threads per guest.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((threads_per_core &gt; 1) &amp;&amp;</div><div class='add'>+	if ((controlled_threads &gt; 1) &amp;&amp;</div><div class='ctx'> 	    ((vc-&gt;num_threads &gt; threads_per_subcore) || !on_primary_thread())) {</div><div class='ctx'> 		for_each_runnable_thread(i, vcpu, vc) {</div><div class='ctx'> 			vcpu-&gt;arch.ret = -EBUSY;</div><div class='hunk'>@@ -2345,7 +2444,7 @@ static noinline void kvmppc_run_core(struct kvmppc_vcore *vc)</div><div class='ctx'> 	 */</div><div class='ctx'> 	init_core_info(&amp;core_info, vc);</div><div class='ctx'> 	pcpu = smp_processor_id();</div><div class='del'>-	target_threads = threads_per_subcore;</div><div class='add'>+	target_threads = controlled_threads;</div><div class='ctx'> 	if (target_smt_mode &amp;&amp; target_smt_mode &lt; target_threads)</div><div class='ctx'> 		target_threads = target_smt_mode;</div><div class='ctx'> 	if (vc-&gt;num_threads &lt; target_threads)</div><div class='hunk'>@@ -2381,7 +2480,7 @@ static noinline void kvmppc_run_core(struct kvmppc_vcore *vc)</div><div class='ctx'> 		smp_wmb();</div><div class='ctx'> 	}</div><div class='ctx'> 	pcpu = smp_processor_id();</div><div class='del'>-	for (thr = 0; thr &lt; threads_per_subcore; ++thr)</div><div class='add'>+	for (thr = 0; thr &lt; controlled_threads; ++thr)</div><div class='ctx'> 		paca[pcpu + thr].kvm_hstate.kvm_split_mode = sip;</div><div class='ctx'> </div><div class='ctx'> 	/* Initiate micro-threading (split-core) if required */</div><div class='hunk'>@@ -2491,10 +2590,11 @@ static noinline void kvmppc_run_core(struct kvmppc_vcore *vc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Let secondaries go back to the offline loop */</div><div class='del'>-	for (i = 0; i &lt; threads_per_subcore; ++i) {</div><div class='add'>+	for (i = 0; i &lt; controlled_threads; ++i) {</div><div class='ctx'> 		kvmppc_release_hwthread(pcpu + i);</div><div class='ctx'> 		if (sip &amp;&amp; sip-&gt;napped[i])</div><div class='ctx'> 			kvmppc_ipi_thread(pcpu + i);</div><div class='add'>+		cpumask_clear_cpu(pcpu + i, &amp;vc-&gt;kvm-&gt;arch.cpu_in_guest);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kvmppc_set_host_core(pcpu);</div><div class='hunk'>@@ -2543,9 +2643,6 @@ static void grow_halt_poll_ns(struct kvmppc_vcore *vc)</div><div class='ctx'> 		vc-&gt;halt_poll_ns = 10000;</div><div class='ctx'> 	else</div><div class='ctx'> 		vc-&gt;halt_poll_ns *= halt_poll_ns_grow;</div><div class='del'>-</div><div class='del'>-	if (vc-&gt;halt_poll_ns &gt; halt_poll_max_ns)</div><div class='del'>-		vc-&gt;halt_poll_ns = halt_poll_max_ns;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void shrink_halt_poll_ns(struct kvmppc_vcore *vc)</div><div class='hunk'>@@ -2556,7 +2653,8 @@ static void shrink_halt_poll_ns(struct kvmppc_vcore *vc)</div><div class='ctx'> 		vc-&gt;halt_poll_ns /= halt_poll_ns_shrink;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Check to see if any of the runnable vcpus on the vcore have pending</div><div class='add'>+/*</div><div class='add'>+ * Check to see if any of the runnable vcpus on the vcore have pending</div><div class='ctx'>  * exceptions or are no longer ceded</div><div class='ctx'>  */</div><div class='ctx'> static int kvmppc_vcore_check_block(struct kvmppc_vcore *vc)</div><div class='hunk'>@@ -2565,7 +2663,8 @@ static int kvmppc_vcore_check_block(struct kvmppc_vcore *vc)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for_each_runnable_thread(i, vcpu, vc) {</div><div class='del'>-		if (vcpu-&gt;arch.pending_exceptions || !vcpu-&gt;arch.ceded)</div><div class='add'>+		if (vcpu-&gt;arch.pending_exceptions || !vcpu-&gt;arch.ceded ||</div><div class='add'>+		    vcpu-&gt;arch.prodded)</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2655,16 +2754,18 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust poll time */</div><div class='del'>-	if (halt_poll_max_ns) {</div><div class='add'>+	if (halt_poll_ns) {</div><div class='ctx'> 		if (block_ns &lt;= vc-&gt;halt_poll_ns)</div><div class='ctx'> 			;</div><div class='ctx'> 		/* We slept and blocked for longer than the max halt time */</div><div class='del'>-		else if (vc-&gt;halt_poll_ns &amp;&amp; block_ns &gt; halt_poll_max_ns)</div><div class='add'>+		else if (vc-&gt;halt_poll_ns &amp;&amp; block_ns &gt; halt_poll_ns)</div><div class='ctx'> 			shrink_halt_poll_ns(vc);</div><div class='ctx'> 		/* We slept and our poll time is too small */</div><div class='del'>-		else if (vc-&gt;halt_poll_ns &lt; halt_poll_max_ns &amp;&amp;</div><div class='del'>-				block_ns &lt; halt_poll_max_ns)</div><div class='add'>+		else if (vc-&gt;halt_poll_ns &lt; halt_poll_ns &amp;&amp;</div><div class='add'>+				block_ns &lt; halt_poll_ns)</div><div class='ctx'> 			grow_halt_poll_ns(vc);</div><div class='add'>+		if (vc-&gt;halt_poll_ns &gt; halt_poll_ns)</div><div class='add'>+			vc-&gt;halt_poll_ns = halt_poll_ns;</div><div class='ctx'> 	} else</div><div class='ctx'> 		vc-&gt;halt_poll_ns = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2749,7 +2850,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)</div><div class='ctx'> 			break;</div><div class='ctx'> 		n_ceded = 0;</div><div class='ctx'> 		for_each_runnable_thread(i, v, vc) {</div><div class='del'>-			if (!v-&gt;arch.pending_exceptions)</div><div class='add'>+			if (!v-&gt;arch.pending_exceptions &amp;&amp; !v-&gt;arch.prodded)</div><div class='ctx'> 				n_ceded += v-&gt;arch.ceded;</div><div class='ctx'> 			else</div><div class='ctx'> 				v-&gt;arch.ceded = 0;</div><div class='hunk'>@@ -2820,7 +2921,7 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu)</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> </div><div class='ctx'> 	/* On the first time here, set up HTAB and VRMA */</div><div class='del'>-	if (!vcpu-&gt;kvm-&gt;arch.hpte_setup_done) {</div><div class='add'>+	if (!kvm_is_radix(vcpu-&gt;kvm) &amp;&amp; !vcpu-&gt;kvm-&gt;arch.hpte_setup_done) {</div><div class='ctx'> 		r = kvmppc_hv_setup_htab_rma(vcpu);</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -2882,6 +2983,13 @@ static int kvm_vm_ioctl_get_smmu_info_hv(struct kvm *kvm,</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_ppc_one_seg_page_size *sps;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Since we don't yet support HPT guests on a radix host,</div><div class='add'>+	 * return an error if the host uses radix.</div><div class='add'>+	 */</div><div class='add'>+	if (radix_enabled())</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	info-&gt;flags = KVM_PPC_PAGE_SIZES_REAL;</div><div class='ctx'> 	if (mmu_has_feature(MMU_FTR_1T_SEGMENT))</div><div class='ctx'> 		info-&gt;flags |= KVM_PPC_1T_SEGMENTS;</div><div class='hunk'>@@ -2904,8 +3012,10 @@ static int kvm_vm_ioctl_get_dirty_log_hv(struct kvm *kvm,</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_memslots *slots;</div><div class='ctx'> 	struct kvm_memory_slot *memslot;</div><div class='del'>-	int r;</div><div class='add'>+	int i, r;</div><div class='ctx'> 	unsigned long n;</div><div class='add'>+	unsigned long *buf;</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;kvm-&gt;slots_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2919,15 +3029,32 @@ static int kvm_vm_ioctl_get_dirty_log_hv(struct kvm *kvm,</div><div class='ctx'> 	if (!memslot-&gt;dirty_bitmap)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Use second half of bitmap area because radix accumulates</div><div class='add'>+	 * bits in the first half.</div><div class='add'>+	 */</div><div class='ctx'> 	n = kvm_dirty_bitmap_bytes(memslot);</div><div class='del'>-	memset(memslot-&gt;dirty_bitmap, 0, n);</div><div class='add'>+	buf = memslot-&gt;dirty_bitmap + n / sizeof(long);</div><div class='add'>+	memset(buf, 0, n);</div><div class='ctx'> </div><div class='del'>-	r = kvmppc_hv_get_dirty_log(kvm, memslot, memslot-&gt;dirty_bitmap);</div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		r = kvmppc_hv_get_dirty_log_radix(kvm, memslot, buf);</div><div class='add'>+	else</div><div class='add'>+		r = kvmppc_hv_get_dirty_log_hpt(kvm, memslot, buf);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/* Harvest dirty bits from VPA and DTL updates */</div><div class='add'>+	/* Note: we never modify the SLB shadow buffer areas */</div><div class='add'>+	kvm_for_each_vcpu(i, vcpu, kvm) {</div><div class='add'>+		spin_lock(&amp;vcpu-&gt;arch.vpa_update_lock);</div><div class='add'>+		kvmppc_harvest_vpa_dirty(&amp;vcpu-&gt;arch.vpa, memslot, buf);</div><div class='add'>+		kvmppc_harvest_vpa_dirty(&amp;vcpu-&gt;arch.dtl, memslot, buf);</div><div class='add'>+		spin_unlock(&amp;vcpu-&gt;arch.vpa_update_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = -EFAULT;</div><div class='del'>-	if (copy_to_user(log-&gt;dirty_bitmap, memslot-&gt;dirty_bitmap, n))</div><div class='add'>+	if (copy_to_user(log-&gt;dirty_bitmap, buf, n))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	r = 0;</div><div class='hunk'>@@ -2948,6 +3075,15 @@ static void kvmppc_core_free_memslot_hv(struct kvm_memory_slot *free,</div><div class='ctx'> static int kvmppc_core_create_memslot_hv(struct kvm_memory_slot *slot,</div><div class='ctx'> 					 unsigned long npages)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * For now, if radix_enabled() then we only support radix guests,</div><div class='add'>+	 * and in that case we don't need the rmap array.</div><div class='add'>+	 */</div><div class='add'>+	if (radix_enabled()) {</div><div class='add'>+		slot-&gt;arch.rmap = NULL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	slot-&gt;arch.rmap = vzalloc(npages * sizeof(*slot-&gt;arch.rmap));</div><div class='ctx'> 	if (!slot-&gt;arch.rmap)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -2971,7 +3107,16 @@ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm,</div><div class='ctx'> 	struct kvm_memslots *slots;</div><div class='ctx'> 	struct kvm_memory_slot *memslot;</div><div class='ctx'> </div><div class='del'>-	if (npages &amp;&amp; old-&gt;npages) {</div><div class='add'>+	/*</div><div class='add'>+	 * If we are making a new memslot, it might make</div><div class='add'>+	 * some address that was previously cached as emulated</div><div class='add'>+	 * MMIO be no longer emulated MMIO, so invalidate</div><div class='add'>+	 * all the caches of emulated MMIO translations.</div><div class='add'>+	 */</div><div class='add'>+	if (npages)</div><div class='add'>+		atomic64_inc(&amp;kvm-&gt;arch.mmio_update);</div><div class='add'>+</div><div class='add'>+	if (npages &amp;&amp; old-&gt;npages &amp;&amp; !kvm_is_radix(kvm)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If modifying a memslot, reset all the rmap dirty bits.</div><div class='ctx'> 		 * If this is a new memslot, we don't need to do anything</div><div class='hunk'>@@ -2980,7 +3125,7 @@ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm,</div><div class='ctx'> 		 */</div><div class='ctx'> 		slots = kvm_memslots(kvm);</div><div class='ctx'> 		memslot = id_to_memslot(slots, mem-&gt;slot);</div><div class='del'>-		kvmppc_hv_get_dirty_log(kvm, memslot, NULL);</div><div class='add'>+		kvmppc_hv_get_dirty_log_hpt(kvm, memslot, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3015,6 +3160,28 @@ static void kvmppc_mmu_destroy_hv(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvmppc_setup_partition_table(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	unsigned long dw0, dw1;</div><div class='add'>+</div><div class='add'>+	if (!kvm_is_radix(kvm)) {</div><div class='add'>+		/* PS field - page size for VRMA */</div><div class='add'>+		dw0 = ((kvm-&gt;arch.vrma_slb_v &amp; SLB_VSID_L) &gt;&gt; 1) |</div><div class='add'>+			((kvm-&gt;arch.vrma_slb_v &amp; SLB_VSID_LP) &lt;&lt; 1);</div><div class='add'>+		/* HTABSIZE and HTABORG fields */</div><div class='add'>+		dw0 |= kvm-&gt;arch.sdr1;</div><div class='add'>+</div><div class='add'>+		/* Second dword as set by userspace */</div><div class='add'>+		dw1 = kvm-&gt;arch.process_table;</div><div class='add'>+	} else {</div><div class='add'>+		dw0 = PATB_HR | radix__get_tree_size() |</div><div class='add'>+			__pa(kvm-&gt;arch.pgtable) | RADIX_PGD_INDEX_SIZE;</div><div class='add'>+		dw1 = PATB_GR | kvm-&gt;arch.process_table;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mmu_partition_table_set_entry(kvm-&gt;arch.lpid, dw0, dw1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -3031,12 +3198,23 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		goto out;	/* another vcpu beat us to it */</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate hashed page table (if not done already) and reset it */</div><div class='del'>-	if (!kvm-&gt;arch.hpt_virt) {</div><div class='del'>-		err = kvmppc_alloc_hpt(kvm, NULL);</div><div class='del'>-		if (err) {</div><div class='add'>+	if (!kvm-&gt;arch.hpt.virt) {</div><div class='add'>+		int order = KVM_DEFAULT_HPT_ORDER;</div><div class='add'>+		struct kvm_hpt_info info;</div><div class='add'>+</div><div class='add'>+		err = kvmppc_allocate_hpt(&amp;info, order);</div><div class='add'>+		/* If we get here, it means userspace didn't specify a</div><div class='add'>+		 * size explicitly.  So, try successively smaller</div><div class='add'>+		 * sizes if the default failed. */</div><div class='add'>+		while ((err == -ENOMEM) &amp;&amp; --order &gt;= PPC_MIN_HPT_ORDER)</div><div class='add'>+			err  = kvmppc_allocate_hpt(&amp;info, order);</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0) {</div><div class='ctx'> 			pr_err("KVM: Couldn't alloc HPT\n");</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		kvmppc_set_hpt(kvm, &amp;info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Look up the memslot for guest physical address 0 */</div><div class='hunk'>@@ -3066,17 +3244,20 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	      psize == 0x1000000))</div><div class='ctx'> 		goto out_srcu;</div><div class='ctx'> </div><div class='del'>-	/* Update VRMASD field in the LPCR */</div><div class='ctx'> 	senc = slb_pgsize_encoding(psize);</div><div class='ctx'> 	kvm-&gt;arch.vrma_slb_v = senc | SLB_VSID_B_1T |</div><div class='ctx'> 		(VRMA_VSID &lt;&lt; SLB_VSID_SHIFT_1T);</div><div class='del'>-	/* the -4 is to account for senc values starting at 0x10 */</div><div class='del'>-	lpcr = senc &lt;&lt; (LPCR_VRMASD_SH - 4);</div><div class='del'>-</div><div class='ctx'> 	/* Create HPTEs in the hash page table for the VRMA */</div><div class='ctx'> 	kvmppc_map_vrma(vcpu, memslot, porder);</div><div class='ctx'> </div><div class='del'>-	kvmppc_update_lpcr(kvm, lpcr, LPCR_VRMASD);</div><div class='add'>+	/* Update VRMASD field in the LPCR */</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		/* the -4 is to account for senc values starting at 0x10 */</div><div class='add'>+		lpcr = senc &lt;&lt; (LPCR_VRMASD_SH - 4);</div><div class='add'>+		kvmppc_update_lpcr(kvm, lpcr, LPCR_VRMASD);</div><div class='add'>+	} else {</div><div class='add'>+		kvmppc_setup_partition_table(kvm);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Order updates to kvm-&gt;arch.lpcr etc. vs. hpte_setup_done */</div><div class='ctx'> 	smp_wmb();</div><div class='hunk'>@@ -3094,36 +3275,6 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_XICS</div><div class='del'>-static int kvmppc_cpu_notify(struct notifier_block *self, unsigned long action,</div><div class='del'>-			void *hcpu)</div><div class='del'>-{</div><div class='del'>-	unsigned long cpu = (long)hcpu;</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_UP_PREPARE:</div><div class='del'>-	case CPU_UP_PREPARE_FROZEN:</div><div class='del'>-		kvmppc_set_host_core(cpu);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-	case CPU_DEAD_FROZEN:</div><div class='del'>-	case CPU_UP_CANCELED:</div><div class='del'>-	case CPU_UP_CANCELED_FROZEN:</div><div class='del'>-		kvmppc_clear_host_core(cpu);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NOTIFY_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block kvmppc_cpu_notifier = {</div><div class='del'>-	    .notifier_call = kvmppc_cpu_notify,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate a per-core structure for managing state about which cores are</div><div class='ctx'>  * running in the host versus the guest and for exchanging data between</div><div class='hunk'>@@ -3185,15 +3336,17 @@ void kvmppc_alloc_host_rm_ops(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	register_cpu_notifier(&amp;kvmppc_cpu_notifier);</div><div class='del'>-</div><div class='add'>+	cpuhp_setup_state_nocalls(CPUHP_KVM_PPC_BOOK3S_PREPARE,</div><div class='add'>+				  "ppc/kvm_book3s:prepare",</div><div class='add'>+				  kvmppc_set_host_core,</div><div class='add'>+				  kvmppc_clear_host_core);</div><div class='ctx'> 	put_online_cpus();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvmppc_free_host_rm_ops(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (kvmppc_host_rm_ops_hv) {</div><div class='del'>-		unregister_cpu_notifier(&amp;kvmppc_cpu_notifier);</div><div class='add'>+		cpuhp_remove_state_nocalls(CPUHP_KVM_PPC_BOOK3S_PREPARE);</div><div class='ctx'> 		kfree(kvmppc_host_rm_ops_hv-&gt;rm_core);</div><div class='ctx'> 		kfree(kvmppc_host_rm_ops_hv);</div><div class='ctx'> 		kvmppc_host_rm_ops_hv = NULL;</div><div class='hunk'>@@ -3205,6 +3358,7 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long lpcr, lpid;</div><div class='ctx'> 	char buf[32];</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate the guest's logical partition ID */</div><div class='ctx'> </div><div class='hunk'>@@ -3219,14 +3373,18 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm)</div><div class='ctx'> 	 * Since we don't flush the TLB when tearing down a VM,</div><div class='ctx'> 	 * and this lpid might have previously been used,</div><div class='ctx'> 	 * make sure we flush on each core before running the new VM.</div><div class='add'>+	 * On POWER9, the tlbie in mmu_partition_table_set_entry()</div><div class='add'>+	 * does this flush for us.</div><div class='ctx'> 	 */</div><div class='del'>-	cpumask_setall(&amp;kvm-&gt;arch.need_tlb_flush);</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		cpumask_setall(&amp;kvm-&gt;arch.need_tlb_flush);</div><div class='ctx'> </div><div class='ctx'> 	/* Start out with the default set of hcalls enabled */</div><div class='ctx'> 	memcpy(kvm-&gt;arch.enabled_hcalls, default_enabled_hcalls,</div><div class='ctx'> 	       sizeof(kvm-&gt;arch.enabled_hcalls));</div><div class='ctx'> </div><div class='del'>-	kvm-&gt;arch.host_sdr1 = mfspr(SPRN_SDR1);</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		kvm-&gt;arch.host_sdr1 = mfspr(SPRN_SDR1);</div><div class='ctx'> </div><div class='ctx'> 	/* Init LPCR for virtual RMA mode */</div><div class='ctx'> 	kvm-&gt;arch.host_lpid = mfspr(SPRN_LPID);</div><div class='hunk'>@@ -3239,13 +3397,56 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm)</div><div class='ctx'> 	/* On POWER8 turn on online bit to enable PURR/SPURR */</div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_ARCH_207S))</div><div class='ctx'> 		lpcr |= LPCR_ONL;</div><div class='add'>+	/*</div><div class='add'>+	 * On POWER9, VPM0 bit is reserved (VPM0=1 behaviour is assumed)</div><div class='add'>+	 * Set HVICE bit to enable hypervisor virtualization interrupts.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		lpcr &amp;= ~LPCR_VPM0;</div><div class='add'>+		lpcr |= LPCR_HVICE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For now, if the host uses radix, the guest must be radix.</div><div class='add'>+	 */</div><div class='add'>+	if (radix_enabled()) {</div><div class='add'>+		kvm-&gt;arch.radix = 1;</div><div class='add'>+		lpcr &amp;= ~LPCR_VPM1;</div><div class='add'>+		lpcr |= LPCR_UPRT | LPCR_GTSE | LPCR_HR;</div><div class='add'>+		ret = kvmppc_init_vm_radix(kvm);</div><div class='add'>+		if (ret) {</div><div class='add'>+			kvmppc_free_lpid(kvm-&gt;arch.lpid);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		kvmppc_setup_partition_table(kvm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	kvm-&gt;arch.lpcr = lpcr;</div><div class='ctx'> </div><div class='add'>+	/* Initialization for future HPT resizes */</div><div class='add'>+	kvm-&gt;arch.resize_hpt = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Work out how many sets the TLB has, for the use of</div><div class='add'>+	 * the TLB invalidation loop in book3s_hv_rmhandlers.S.</div><div class='add'>+	 */</div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		kvm-&gt;arch.tlb_sets = POWER9_TLB_SETS_RADIX;	/* 128 */</div><div class='add'>+	else if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		kvm-&gt;arch.tlb_sets = POWER9_TLB_SETS_HASH;	/* 256 */</div><div class='add'>+	else if (cpu_has_feature(CPU_FTR_ARCH_207S))</div><div class='add'>+		kvm-&gt;arch.tlb_sets = POWER8_TLB_SETS;		/* 512 */</div><div class='add'>+	else</div><div class='add'>+		kvm-&gt;arch.tlb_sets = POWER7_TLB_SETS;		/* 128 */</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Track that we now have a HV mode VM active. This blocks secondary</div><div class='ctx'> 	 * CPU threads from coming online.</div><div class='add'>+	 * On POWER9, we only need to do this for HPT guests on a radix</div><div class='add'>+	 * host, which is not yet supported.</div><div class='ctx'> 	 */</div><div class='del'>-	kvm_hv_vm_activated();</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		kvm_hv_vm_activated();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create a debugfs directory for the VM</div><div class='hunk'>@@ -3271,11 +3472,17 @@ static void kvmppc_core_destroy_vm_hv(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	debugfs_remove_recursive(kvm-&gt;arch.debugfs_dir);</div><div class='ctx'> </div><div class='del'>-	kvm_hv_vm_deactivated();</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		kvm_hv_vm_deactivated();</div><div class='ctx'> </div><div class='ctx'> 	kvmppc_free_vcores(kvm);</div><div class='ctx'> </div><div class='del'>-	kvmppc_free_hpt(kvm);</div><div class='add'>+	kvmppc_free_lpid(kvm-&gt;arch.lpid);</div><div class='add'>+</div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		kvmppc_free_radix(kvm);</div><div class='add'>+	else</div><div class='add'>+		kvmppc_free_hpt(&amp;kvm-&gt;arch.hpt);</div><div class='ctx'> </div><div class='ctx'> 	kvmppc_free_pimap(kvm);</div><div class='ctx'> }</div><div class='hunk'>@@ -3304,11 +3511,6 @@ static int kvmppc_core_check_processor_compat_hv(void)</div><div class='ctx'> 	if (!cpu_has_feature(CPU_FTR_HVMODE) ||</div><div class='ctx'> 	    !cpu_has_feature(CPU_FTR_ARCH_206))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	/*</div><div class='del'>-	 * Disable KVM for Power9, untill the required bits merged.</div><div class='del'>-	 */</div><div class='del'>-	if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='del'>-		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3506,12 +3708,9 @@ static long kvm_arch_vm_ioctl_hv(struct file *filp,</div><div class='ctx'> 		r = -EFAULT;</div><div class='ctx'> 		if (get_user(htab_order, (u32 __user *)argp))</div><div class='ctx'> 			break;</div><div class='del'>-		r = kvmppc_alloc_reset_hpt(kvm, &amp;htab_order);</div><div class='add'>+		r = kvmppc_alloc_reset_hpt(kvm, htab_order);</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			break;</div><div class='del'>-		r = -EFAULT;</div><div class='del'>-		if (put_user(htab_order, (u32 __user *)argp))</div><div class='del'>-			break;</div><div class='ctx'> 		r = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3526,6 +3725,28 @@ static long kvm_arch_vm_ioctl_hv(struct file *filp,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	case KVM_PPC_RESIZE_HPT_PREPARE: {</div><div class='add'>+		struct kvm_ppc_resize_hpt rhpt;</div><div class='add'>+</div><div class='add'>+		r = -EFAULT;</div><div class='add'>+		if (copy_from_user(&amp;rhpt, argp, sizeof(rhpt)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		r = kvm_vm_ioctl_resize_hpt_prepare(kvm, &amp;rhpt);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case KVM_PPC_RESIZE_HPT_COMMIT: {</div><div class='add'>+		struct kvm_ppc_resize_hpt rhpt;</div><div class='add'>+</div><div class='add'>+		r = -EFAULT;</div><div class='add'>+		if (copy_from_user(&amp;rhpt, argp, sizeof(rhpt)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		r = kvm_vm_ioctl_resize_hpt_commit(kvm, &amp;rhpt);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		r = -ENOTTY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3576,6 +3797,41 @@ static void init_default_hcalls(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvmhv_configure_mmu(struct kvm *kvm, struct kvm_ppc_mmuv3_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	unsigned long lpcr;</div><div class='add'>+	int radix;</div><div class='add'>+</div><div class='add'>+	/* If not on a POWER9, reject it */</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* If any unknown flags set, reject it */</div><div class='add'>+	if (cfg-&gt;flags &amp; ~(KVM_PPC_MMUV3_RADIX | KVM_PPC_MMUV3_GTSE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* We can't change a guest to/from radix yet */</div><div class='add'>+	radix = !!(cfg-&gt;flags &amp; KVM_PPC_MMUV3_RADIX);</div><div class='add'>+	if (radix != kvm_is_radix(kvm))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* GR (guest radix) bit in process_table field must match */</div><div class='add'>+	if (!!(cfg-&gt;process_table &amp; PATB_GR) != radix)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Process table size field must be reasonable, i.e. &lt;= 24 */</div><div class='add'>+	if ((cfg-&gt;process_table &amp; PRTS_MASK) &gt; 24)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	kvm-&gt;arch.process_table = cfg-&gt;process_table;</div><div class='add'>+	kvmppc_setup_partition_table(kvm);</div><div class='add'>+</div><div class='add'>+	lpcr = (cfg-&gt;flags &amp; KVM_PPC_MMUV3_GTSE) ? LPCR_GTSE : 0;</div><div class='add'>+	kvmppc_update_lpcr(kvm, lpcr, LPCR_GTSE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct kvmppc_ops kvm_ops_hv = {</div><div class='ctx'> 	.get_sregs = kvm_arch_vcpu_ioctl_get_sregs_hv,</div><div class='ctx'> 	.set_sregs = kvm_arch_vcpu_ioctl_set_sregs_hv,</div><div class='hunk'>@@ -3613,6 +3869,8 @@ static struct kvmppc_ops kvm_ops_hv = {</div><div class='ctx'> 	.irq_bypass_add_producer = kvmppc_irq_bypass_add_producer_hv,</div><div class='ctx'> 	.irq_bypass_del_producer = kvmppc_irq_bypass_del_producer_hv,</div><div class='ctx'> #endif</div><div class='add'>+	.configure_mmu = kvmhv_configure_mmu,</div><div class='add'>+	.get_rmmu_info = kvmhv_get_rmmu_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int kvm_init_subcore_bitmap(void)</div><div class='hunk'>@@ -3647,6 +3905,11 @@ static int kvm_init_subcore_bitmap(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvmppc_radix_possible(void)</div><div class='add'>+{</div><div class='add'>+	return cpu_has_feature(CPU_FTR_ARCH_300) &amp;&amp; radix_enabled();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int kvmppc_book3s_init_hv(void)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='hunk'>@@ -3661,6 +3924,23 @@ static int kvmppc_book3s_init_hv(void)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We need a way of accessing the XICS interrupt controller,</div><div class='add'>+	 * either directly, via paca[cpu].kvm_hstate.xics_phys, or</div><div class='add'>+	 * indirectly, via OPAL.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	if (!get_paca()-&gt;kvm_hstate.xics_phys) {</div><div class='add'>+		struct device_node *np;</div><div class='add'>+</div><div class='add'>+		np = of_find_compatible_node(NULL, NULL, "ibm,opal-intc");</div><div class='add'>+		if (!np) {</div><div class='add'>+			pr_err("KVM-HV: Cannot determine method for accessing XICS\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	kvm_ops_hv.owner = THIS_MODULE;</div><div class='ctx'> 	kvmppc_hv_ops = &amp;kvm_ops_hv;</div><div class='ctx'> </div><div class='hunk'>@@ -3669,12 +3949,19 @@ static int kvmppc_book3s_init_hv(void)</div><div class='ctx'> 	init_vcore_lists();</div><div class='ctx'> </div><div class='ctx'> 	r = kvmppc_mmu_hv_init();</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	if (kvmppc_radix_possible())</div><div class='add'>+		r = kvmppc_radix_init();</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvmppc_book3s_exit_hv(void)</div><div class='ctx'> {</div><div class='ctx'> 	kvmppc_free_host_rm_ops();</div><div class='add'>+	if (kvmppc_radix_possible())</div><div class='add'>+		kvmppc_radix_exit();</div><div class='ctx'> 	kvmppc_hv_ops = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3683,3 +3970,4 @@ module_exit(kvmppc_book3s_exit_hv);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_MISCDEV(KVM_MINOR);</div><div class='ctx'> MODULE_ALIAS("devname:kvm");</div><div class='add'>+</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c<br/>index 0c84d6bc8356..4d6c64b3041c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv_builtin.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_hv_builtin.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv_builtin.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv_builtin.c</a></div><div class='hunk'>@@ -26,6 +26,8 @@</div><div class='ctx'> #include &lt;asm/dbell.h&gt;</div><div class='ctx'> #include &lt;asm/cputhreads.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/opal.h&gt;</div><div class='add'>+#include &lt;asm/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define KVM_CMA_CHUNK_ORDER	18</div><div class='ctx'> </div><div class='hunk'>@@ -50,19 +52,20 @@ static int __init early_parse_kvm_cma_resv(char *p)</div><div class='ctx'> }</div><div class='ctx'> early_param("kvm_cma_resv_ratio", early_parse_kvm_cma_resv);</div><div class='ctx'> </div><div class='del'>-struct page *kvm_alloc_hpt(unsigned long nr_pages)</div><div class='add'>+struct page *kvm_alloc_hpt_cma(unsigned long nr_pages)</div><div class='ctx'> {</div><div class='ctx'> 	VM_BUG_ON(order_base_2(nr_pages) &lt; KVM_CMA_CHUNK_ORDER - PAGE_SHIFT);</div><div class='ctx'> </div><div class='del'>-	return cma_alloc(kvm_cma, nr_pages, order_base_2(HPT_ALIGN_PAGES));</div><div class='add'>+	return cma_alloc(kvm_cma, nr_pages, order_base_2(HPT_ALIGN_PAGES),</div><div class='add'>+			 GFP_KERNEL);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_alloc_hpt);</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_alloc_hpt_cma);</div><div class='ctx'> </div><div class='del'>-void kvm_release_hpt(struct page *page, unsigned long nr_pages)</div><div class='add'>+void kvm_free_hpt_cma(struct page *page, unsigned long nr_pages)</div><div class='ctx'> {</div><div class='ctx'> 	cma_release(kvm_cma, page, nr_pages);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_release_hpt);</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_free_hpt_cma);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kvm_cma_reserve() - reserve area for kvm hash pagetable</div><div class='hunk'>@@ -198,19 +201,24 @@ static inline void rm_writeb(unsigned long paddr, u8 val)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Send an interrupt or message to another CPU.</div><div class='del'>- * This can only be called in real mode.</div><div class='ctx'>  * The caller needs to include any barrier needed to order writes</div><div class='ctx'>  * to memory vs. the IPI/message.</div><div class='ctx'>  */</div><div class='ctx'> void kvmhv_rm_send_ipi(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long xics_phys;</div><div class='add'>+	unsigned long msg = PPC_DBELL_TYPE(PPC_DBELL_SERVER);</div><div class='ctx'> </div><div class='del'>-	/* On POWER8 for IPIs to threads in the same core, use msgsnd */</div><div class='add'>+	/* On POWER9 we can use msgsnd for any destination cpu. */</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		msg |= get_hard_smp_processor_id(cpu);</div><div class='add'>+		__asm__ __volatile__ (PPC_MSGSND(%0) : : "r" (msg));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* On POWER8 for IPIs to threads in the same core, use msgsnd. */</div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_ARCH_207S) &amp;&amp;</div><div class='ctx'> 	    cpu_first_thread_sibling(cpu) ==</div><div class='ctx'> 	    cpu_first_thread_sibling(raw_smp_processor_id())) {</div><div class='del'>-		unsigned long msg = PPC_DBELL_TYPE(PPC_DBELL_SERVER);</div><div class='ctx'> 		msg |= cpu_thread_in_core(cpu);</div><div class='ctx'> 		__asm__ __volatile__ (PPC_MSGSND(%0) : : "r" (msg));</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -218,7 +226,10 @@ void kvmhv_rm_send_ipi(int cpu)</div><div class='ctx'> </div><div class='ctx'> 	/* Else poke the target with an IPI */</div><div class='ctx'> 	xics_phys = paca[cpu].kvm_hstate.xics_phys;</div><div class='del'>-	rm_writeb(xics_phys + XICS_MFRR, IPI_PRIORITY);</div><div class='add'>+	if (xics_phys)</div><div class='add'>+		rm_writeb(xics_phys + XICS_MFRR, IPI_PRIORITY);</div><div class='add'>+	else</div><div class='add'>+		opal_int_set_mfrr(get_hard_smp_processor_id(cpu), IPI_PRIORITY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -329,7 +340,7 @@ static struct kvmppc_irq_map *get_irqmap(struct kvmppc_passthru_irqmap *pimap,</div><div class='ctx'>  * saved a copy of the XIRR in the PACA, it will be picked up by</div><div class='ctx'>  * the host ICP driver.</div><div class='ctx'>  */</div><div class='del'>-static int kvmppc_check_passthru(u32 xisr, __be32 xirr)</div><div class='add'>+static int kvmppc_check_passthru(u32 xisr, __be32 xirr, bool *again)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvmppc_passthru_irqmap *pimap;</div><div class='ctx'> 	struct kvmppc_irq_map *irq_map;</div><div class='hunk'>@@ -348,11 +359,11 @@ static int kvmppc_check_passthru(u32 xisr, __be32 xirr)</div><div class='ctx'> 	/* We're handling this interrupt, generic code doesn't need to */</div><div class='ctx'> 	local_paca-&gt;kvm_hstate.saved_xirr = 0;</div><div class='ctx'> </div><div class='del'>-	return kvmppc_deliver_irq_passthru(vcpu, xirr, irq_map, pimap);</div><div class='add'>+	return kvmppc_deliver_irq_passthru(vcpu, xirr, irq_map, pimap, again);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-static inline int kvmppc_check_passthru(u32 xisr, __be32 xirr)</div><div class='add'>+static inline int kvmppc_check_passthru(u32 xisr, __be32 xirr, bool *again)</div><div class='ctx'> {</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -367,14 +378,31 @@ static inline int kvmppc_check_passthru(u32 xisr, __be32 xirr)</div><div class='ctx'>  *	-1 if there was a guest wakeup IPI (which has now been cleared)</div><div class='ctx'>  *	-2 if there is PCI passthrough external interrupt that was handled</div><div class='ctx'>  */</div><div class='add'>+static long kvmppc_read_one_intr(bool *again);</div><div class='ctx'> </div><div class='ctx'> long kvmppc_read_intr(void)</div><div class='ctx'> {</div><div class='add'>+	long ret = 0;</div><div class='add'>+	long rc;</div><div class='add'>+	bool again;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		again = false;</div><div class='add'>+		rc = kvmppc_read_one_intr(&amp;again);</div><div class='add'>+		if (rc &amp;&amp; (ret == 0 || rc &gt; ret))</div><div class='add'>+			ret = rc;</div><div class='add'>+	} while (again);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long kvmppc_read_one_intr(bool *again)</div><div class='add'>+{</div><div class='ctx'> 	unsigned long xics_phys;</div><div class='ctx'> 	u32 h_xirr;</div><div class='ctx'> 	__be32 xirr;</div><div class='ctx'> 	u32 xisr;</div><div class='ctx'> 	u8 host_ipi;</div><div class='add'>+	int64_t rc;</div><div class='ctx'> </div><div class='ctx'> 	/* see if a host IPI is pending */</div><div class='ctx'> 	host_ipi = local_paca-&gt;kvm_hstate.host_ipi;</div><div class='hunk'>@@ -383,7 +411,12 @@ long kvmppc_read_intr(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Now read the interrupt from the ICP */</div><div class='ctx'> 	xics_phys = local_paca-&gt;kvm_hstate.xics_phys;</div><div class='del'>-	if (unlikely(!xics_phys))</div><div class='add'>+	rc = 0;</div><div class='add'>+	if (!xics_phys)</div><div class='add'>+		rc = opal_int_get_xirr(&amp;xirr, false);</div><div class='add'>+	else</div><div class='add'>+		xirr = _lwzcix(xics_phys + XICS_XIRR);</div><div class='add'>+	if (rc &lt; 0)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -392,7 +425,6 @@ long kvmppc_read_intr(void)</div><div class='ctx'> 	 * host endian. Note that xirr is the value read from the</div><div class='ctx'> 	 * XIRR register, while h_xirr is the host endian version.</div><div class='ctx'> 	 */</div><div class='del'>-	xirr = _lwzcix(xics_phys + XICS_XIRR);</div><div class='ctx'> 	h_xirr = be32_to_cpu(xirr);</div><div class='ctx'> 	local_paca-&gt;kvm_hstate.saved_xirr = h_xirr;</div><div class='ctx'> 	xisr = h_xirr &amp; 0xffffff;</div><div class='hunk'>@@ -411,8 +443,17 @@ long kvmppc_read_intr(void)</div><div class='ctx'> 	 * If it is an IPI, clear the MFRR and EOI it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (xisr == XICS_IPI) {</div><div class='del'>-		_stbcix(xics_phys + XICS_MFRR, 0xff);</div><div class='del'>-		_stwcix(xics_phys + XICS_XIRR, xirr);</div><div class='add'>+		rc = 0;</div><div class='add'>+		if (xics_phys) {</div><div class='add'>+			_stbcix(xics_phys + XICS_MFRR, 0xff);</div><div class='add'>+			_stwcix(xics_phys + XICS_XIRR, xirr);</div><div class='add'>+		} else {</div><div class='add'>+			opal_int_set_mfrr(hard_smp_processor_id(), 0xff);</div><div class='add'>+			rc = opal_int_eoi(h_xirr);</div><div class='add'>+		}</div><div class='add'>+		/* If rc &gt; 0, there is another interrupt pending */</div><div class='add'>+		*again = rc &gt; 0;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Need to ensure side effects of above stores</div><div class='ctx'> 		 * complete before proceeding.</div><div class='hunk'>@@ -429,7 +470,11 @@ long kvmppc_read_intr(void)</div><div class='ctx'> 			/* We raced with the host,</div><div class='ctx'> 			 * we need to resend that IPI, bummer</div><div class='ctx'> 			 */</div><div class='del'>-			_stbcix(xics_phys + XICS_MFRR, IPI_PRIORITY);</div><div class='add'>+			if (xics_phys)</div><div class='add'>+				_stbcix(xics_phys + XICS_MFRR, IPI_PRIORITY);</div><div class='add'>+			else</div><div class='add'>+				opal_int_set_mfrr(hard_smp_processor_id(),</div><div class='add'>+						  IPI_PRIORITY);</div><div class='ctx'> 			/* Let side effects complete */</div><div class='ctx'> 			smp_mb();</div><div class='ctx'> 			return 1;</div><div class='hunk'>@@ -440,5 +485,5 @@ long kvmppc_read_intr(void)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return kvmppc_check_passthru(xisr, xirr);</div><div class='add'>+	return kvmppc_check_passthru(xisr, xirr, again);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_hv_ras.c b/arch/powerpc/kvm/book3s_hv_ras.c<br/>index 0fa70a9618d7..7ef0993214f3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv_ras.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_hv_ras.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv_ras.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv_ras.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/cputhreads.h&gt;</div><div class='ctx'> #include &lt;asm/hmi.h&gt;</div><div class='add'>+#include &lt;asm/kvm_ppc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SRR1 bits for machine check on POWER7 */</div><div class='ctx'> #define SRR1_MC_LDSTERR		(1ul &lt;&lt; (63-42))</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c<br/>index 99b4e9d5dd23..6fca970373ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv_rm_mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_hv_rm_mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv_rm_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv_rm_mmu.c</a></div><div class='hunk'>@@ -43,6 +43,7 @@ static void *real_vmalloc_addr(void *x)</div><div class='ctx'> static int global_invalidates(struct kvm *kvm, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	int global;</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If there is only one vcore, and it's currently running,</div><div class='hunk'>@@ -60,8 +61,14 @@ static int global_invalidates(struct kvm *kvm, unsigned long flags)</div><div class='ctx'> 		/* any other core might now have stale TLB entries... */</div><div class='ctx'> 		smp_wmb();</div><div class='ctx'> 		cpumask_setall(&amp;kvm-&gt;arch.need_tlb_flush);</div><div class='del'>-		cpumask_clear_cpu(local_paca-&gt;kvm_hstate.kvm_vcore-&gt;pcpu,</div><div class='del'>-				  &amp;kvm-&gt;arch.need_tlb_flush);</div><div class='add'>+		cpu = local_paca-&gt;kvm_hstate.kvm_vcore-&gt;pcpu;</div><div class='add'>+		/*</div><div class='add'>+		 * On POWER9, threads are independent but the TLB is shared,</div><div class='add'>+		 * so use the bit for the first thread to represent the core.</div><div class='add'>+		 */</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+			cpu = cpu_first_thread_sibling(cpu);</div><div class='add'>+		cpumask_clear_cpu(cpu, &amp;kvm-&gt;arch.need_tlb_flush);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return global;</div><div class='hunk'>@@ -79,10 +86,10 @@ void kvmppc_add_revmap_chain(struct kvm *kvm, struct revmap_entry *rev,</div><div class='ctx'> </div><div class='ctx'> 	if (*rmap &amp; KVMPPC_RMAP_PRESENT) {</div><div class='ctx'> 		i = *rmap &amp; KVMPPC_RMAP_INDEX;</div><div class='del'>-		head = &amp;kvm-&gt;arch.revmap[i];</div><div class='add'>+		head = &amp;kvm-&gt;arch.hpt.rev[i];</div><div class='ctx'> 		if (realmode)</div><div class='ctx'> 			head = real_vmalloc_addr(head);</div><div class='del'>-		tail = &amp;kvm-&gt;arch.revmap[head-&gt;back];</div><div class='add'>+		tail = &amp;kvm-&gt;arch.hpt.rev[head-&gt;back];</div><div class='ctx'> 		if (realmode)</div><div class='ctx'> 			tail = real_vmalloc_addr(tail);</div><div class='ctx'> 		rev-&gt;forw = i;</div><div class='hunk'>@@ -147,8 +154,8 @@ static void remove_revmap_chain(struct kvm *kvm, long pte_index,</div><div class='ctx'> 	lock_rmap(rmap);</div><div class='ctx'> </div><div class='ctx'> 	head = *rmap &amp; KVMPPC_RMAP_INDEX;</div><div class='del'>-	next = real_vmalloc_addr(&amp;kvm-&gt;arch.revmap[rev-&gt;forw]);</div><div class='del'>-	prev = real_vmalloc_addr(&amp;kvm-&gt;arch.revmap[rev-&gt;back]);</div><div class='add'>+	next = real_vmalloc_addr(&amp;kvm-&gt;arch.hpt.rev[rev-&gt;forw]);</div><div class='add'>+	prev = real_vmalloc_addr(&amp;kvm-&gt;arch.hpt.rev[rev-&gt;back]);</div><div class='ctx'> 	next-&gt;back = rev-&gt;back;</div><div class='ctx'> 	prev-&gt;forw = rev-&gt;forw;</div><div class='ctx'> 	if (head == pte_index) {</div><div class='hunk'>@@ -182,6 +189,8 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> 	unsigned long mmu_seq;</div><div class='ctx'> 	unsigned long rcbits, irq_flags = 0;</div><div class='ctx'> </div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		return H_FUNCTION;</div><div class='ctx'> 	psize = hpte_page_size(pteh, ptel);</div><div class='ctx'> 	if (!psize)</div><div class='ctx'> 		return H_PARAMETER;</div><div class='hunk'>@@ -264,8 +273,10 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> </div><div class='ctx'> 	if (pa)</div><div class='ctx'> 		pteh |= HPTE_V_VALID;</div><div class='del'>-	else</div><div class='add'>+	else {</div><div class='ctx'> 		pteh |= HPTE_V_ABSENT;</div><div class='add'>+		ptel &amp;= ~(HPTE_R_KEY_HI | HPTE_R_KEY_LO);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*If we had host pte mapping then  Check WIMG */</div><div class='ctx'> 	if (ptep &amp;&amp; !hpte_cache_flags_ok(ptel, is_ci)) {</div><div class='hunk'>@@ -281,11 +292,11 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> </div><div class='ctx'> 	/* Find and lock the HPTEG slot to use */</div><div class='ctx'>  do_insert:</div><div class='del'>-	if (pte_index &gt;= kvm-&gt;arch.hpt_npte)</div><div class='add'>+	if (pte_index &gt;= kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt))</div><div class='ctx'> 		return H_PARAMETER;</div><div class='ctx'> 	if (likely((flags &amp; H_EXACT) == 0)) {</div><div class='ctx'> 		pte_index &amp;= ~7UL;</div><div class='del'>-		hpte = (__be64 *)(kvm-&gt;arch.hpt_virt + (pte_index &lt;&lt; 4));</div><div class='add'>+		hpte = (__be64 *)(kvm-&gt;arch.hpt.virt + (pte_index &lt;&lt; 4));</div><div class='ctx'> 		for (i = 0; i &lt; 8; ++i) {</div><div class='ctx'> 			if ((be64_to_cpu(*hpte) &amp; HPTE_V_VALID) == 0 &amp;&amp;</div><div class='ctx'> 			    try_lock_hpte(hpte, HPTE_V_HVLOCK | HPTE_V_VALID |</div><div class='hunk'>@@ -316,7 +327,7 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> 		}</div><div class='ctx'> 		pte_index += i;</div><div class='ctx'> 	} else {</div><div class='del'>-		hpte = (__be64 *)(kvm-&gt;arch.hpt_virt + (pte_index &lt;&lt; 4));</div><div class='add'>+		hpte = (__be64 *)(kvm-&gt;arch.hpt.virt + (pte_index &lt;&lt; 4));</div><div class='ctx'> 		if (!try_lock_hpte(hpte, HPTE_V_HVLOCK | HPTE_V_VALID |</div><div class='ctx'> 				   HPTE_V_ABSENT)) {</div><div class='ctx'> 			/* Lock the slot and check again */</div><div class='hunk'>@@ -333,7 +344,7 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Save away the guest's idea of the second HPTE dword */</div><div class='del'>-	rev = &amp;kvm-&gt;arch.revmap[pte_index];</div><div class='add'>+	rev = &amp;kvm-&gt;arch.hpt.rev[pte_index];</div><div class='ctx'> 	if (realmode)</div><div class='ctx'> 		rev = real_vmalloc_addr(rev);</div><div class='ctx'> 	if (rev) {</div><div class='hunk'>@@ -351,6 +362,7 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> 			/* inval in progress, write a non-present HPTE */</div><div class='ctx'> 			pteh |= HPTE_V_ABSENT;</div><div class='ctx'> 			pteh &amp;= ~HPTE_V_VALID;</div><div class='add'>+			ptel &amp;= ~(HPTE_R_KEY_HI | HPTE_R_KEY_LO);</div><div class='ctx'> 			unlock_rmap(rmap);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			kvmppc_add_revmap_chain(kvm, rev, rmap, pte_index,</div><div class='hunk'>@@ -361,6 +373,11 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Convert to new format on P9 */</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		ptel = hpte_old_to_new_r(pteh, ptel);</div><div class='add'>+		pteh = hpte_old_to_new_v(pteh);</div><div class='add'>+	}</div><div class='ctx'> 	hpte[1] = cpu_to_be64(ptel);</div><div class='ctx'> </div><div class='ctx'> 	/* Write the first HPTE dword, unlocking the HPTE and making it valid */</div><div class='hunk'>@@ -386,6 +403,13 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='ctx'> #define LOCK_TOKEN	(*(u32 *)(&amp;get_paca()-&gt;paca_index))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline int is_mmio_hpte(unsigned long v, unsigned long r)</div><div class='add'>+{</div><div class='add'>+	return ((v &amp; HPTE_V_ABSENT) &amp;&amp;</div><div class='add'>+		(r &amp; (HPTE_R_KEY_HI | HPTE_R_KEY_LO)) ==</div><div class='add'>+		(HPTE_R_KEY_HI | HPTE_R_KEY_LO));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int try_lock_tlbie(unsigned int *lock)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmp, old;</div><div class='hunk'>@@ -409,13 +433,18 @@ static void do_tlbies(struct kvm *kvm, unsigned long *rbvalues,</div><div class='ctx'> {</div><div class='ctx'> 	long i;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We use the POWER9 5-operand versions of tlbie and tlbiel here.</div><div class='add'>+	 * Since we are using RIC=0 PRS=0 R=0, and P7/P8 tlbiel ignores</div><div class='add'>+	 * the RS field, this is backwards-compatible with P7 and P8.</div><div class='add'>+	 */</div><div class='ctx'> 	if (global) {</div><div class='ctx'> 		while (!try_lock_tlbie(&amp;kvm-&gt;arch.tlbie_lock))</div><div class='ctx'> 			cpu_relax();</div><div class='ctx'> 		if (need_sync)</div><div class='ctx'> 			asm volatile("ptesync" : : : "memory");</div><div class='ctx'> 		for (i = 0; i &lt; npages; ++i)</div><div class='del'>-			asm volatile(PPC_TLBIE(%1,%0) : :</div><div class='add'>+			asm volatile(PPC_TLBIE_5(%0,%1,0,0,0) : :</div><div class='ctx'> 				     "r" (rbvalues[i]), "r" (kvm-&gt;arch.lpid));</div><div class='ctx'> 		asm volatile("eieio; tlbsync; ptesync" : : : "memory");</div><div class='ctx'> 		kvm-&gt;arch.tlbie_lock = 0;</div><div class='hunk'>@@ -423,7 +452,8 @@ static void do_tlbies(struct kvm *kvm, unsigned long *rbvalues,</div><div class='ctx'> 		if (need_sync)</div><div class='ctx'> 			asm volatile("ptesync" : : : "memory");</div><div class='ctx'> 		for (i = 0; i &lt; npages; ++i)</div><div class='del'>-			asm volatile("tlbiel %0" : : "r" (rbvalues[i]));</div><div class='add'>+			asm volatile(PPC_TLBIEL(%0,%1,0,0,0) : :</div><div class='add'>+				     "r" (rbvalues[i]), "r" (0));</div><div class='ctx'> 		asm volatile("ptesync" : : : "memory");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -435,26 +465,33 @@ long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> 	__be64 *hpte;</div><div class='ctx'> 	unsigned long v, r, rb;</div><div class='ctx'> 	struct revmap_entry *rev;</div><div class='del'>-	u64 pte;</div><div class='add'>+	u64 pte, orig_pte, pte_r;</div><div class='ctx'> </div><div class='del'>-	if (pte_index &gt;= kvm-&gt;arch.hpt_npte)</div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		return H_FUNCTION;</div><div class='add'>+	if (pte_index &gt;= kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt))</div><div class='ctx'> 		return H_PARAMETER;</div><div class='del'>-	hpte = (__be64 *)(kvm-&gt;arch.hpt_virt + (pte_index &lt;&lt; 4));</div><div class='add'>+	hpte = (__be64 *)(kvm-&gt;arch.hpt.virt + (pte_index &lt;&lt; 4));</div><div class='ctx'> 	while (!try_lock_hpte(hpte, HPTE_V_HVLOCK))</div><div class='ctx'> 		cpu_relax();</div><div class='del'>-	pte = be64_to_cpu(hpte[0]);</div><div class='add'>+	pte = orig_pte = be64_to_cpu(hpte[0]);</div><div class='add'>+	pte_r = be64_to_cpu(hpte[1]);</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		pte = hpte_new_to_old_v(pte, pte_r);</div><div class='add'>+		pte_r = hpte_new_to_old_r(pte_r);</div><div class='add'>+	}</div><div class='ctx'> 	if ((pte &amp; (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 ||</div><div class='ctx'> 	    ((flags &amp; H_AVPN) &amp;&amp; (pte &amp; ~0x7fUL) != avpn) ||</div><div class='ctx'> 	    ((flags &amp; H_ANDCOND) &amp;&amp; (pte &amp; avpn) != 0)) {</div><div class='del'>-		__unlock_hpte(hpte, pte);</div><div class='add'>+		__unlock_hpte(hpte, orig_pte);</div><div class='ctx'> 		return H_NOT_FOUND;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rev = real_vmalloc_addr(&amp;kvm-&gt;arch.revmap[pte_index]);</div><div class='add'>+	rev = real_vmalloc_addr(&amp;kvm-&gt;arch.hpt.rev[pte_index]);</div><div class='ctx'> 	v = pte &amp; ~HPTE_V_HVLOCK;</div><div class='ctx'> 	if (v &amp; HPTE_V_VALID) {</div><div class='ctx'> 		hpte[0] &amp;= ~cpu_to_be64(HPTE_V_VALID);</div><div class='del'>-		rb = compute_tlbie_rb(v, be64_to_cpu(hpte[1]), pte_index);</div><div class='add'>+		rb = compute_tlbie_rb(v, pte_r, pte_index);</div><div class='ctx'> 		do_tlbies(kvm, &amp;rb, 1, global_invalidates(kvm, flags), true);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The reference (R) and change (C) bits in a HPT</div><div class='hunk'>@@ -472,6 +509,9 @@ long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags,</div><div class='ctx'> 	note_hpte_modification(kvm, rev);</div><div class='ctx'> 	unlock_hpte(hpte, 0);</div><div class='ctx'> </div><div class='add'>+	if (is_mmio_hpte(v, pte_r))</div><div class='add'>+		atomic64_inc(&amp;kvm-&gt;arch.mmio_update);</div><div class='add'>+</div><div class='ctx'> 	if (v &amp; HPTE_V_ABSENT)</div><div class='ctx'> 		v = (v &amp; ~HPTE_V_ABSENT) | HPTE_V_VALID;</div><div class='ctx'> 	hpret[0] = v;</div><div class='hunk'>@@ -498,8 +538,10 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	int global;</div><div class='ctx'> 	long int ret = H_SUCCESS;</div><div class='ctx'> 	struct revmap_entry *rev, *revs[4];</div><div class='del'>-	u64 hp0;</div><div class='add'>+	u64 hp0, hp1;</div><div class='ctx'> </div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		return H_FUNCTION;</div><div class='ctx'> 	global = global_invalidates(kvm, 0);</div><div class='ctx'> 	for (i = 0; i &lt; 4 &amp;&amp; ret == H_SUCCESS; ) {</div><div class='ctx'> 		n = 0;</div><div class='hunk'>@@ -515,13 +557,13 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (req != 1 || flags == 3 ||</div><div class='del'>-			    pte_index &gt;= kvm-&gt;arch.hpt_npte) {</div><div class='add'>+			    pte_index &gt;= kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt)) {</div><div class='ctx'> 				/* parameter error */</div><div class='ctx'> 				args[j] = ((0xa0 | flags) &lt;&lt; 56) + pte_index;</div><div class='ctx'> 				ret = H_PARAMETER;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			hp = (__be64 *) (kvm-&gt;arch.hpt_virt + (pte_index &lt;&lt; 4));</div><div class='add'>+			hp = (__be64 *) (kvm-&gt;arch.hpt.virt + (pte_index &lt;&lt; 4));</div><div class='ctx'> 			/* to avoid deadlock, don't spin except for first */</div><div class='ctx'> 			if (!try_lock_hpte(hp, HPTE_V_HVLOCK)) {</div><div class='ctx'> 				if (n)</div><div class='hunk'>@@ -531,6 +573,11 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)</div><div class='ctx'> 			}</div><div class='ctx'> 			found = 0;</div><div class='ctx'> 			hp0 = be64_to_cpu(hp[0]);</div><div class='add'>+			hp1 = be64_to_cpu(hp[1]);</div><div class='add'>+			if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+				hp0 = hpte_new_to_old_v(hp0, hp1);</div><div class='add'>+				hp1 = hpte_new_to_old_r(hp1);</div><div class='add'>+			}</div><div class='ctx'> 			if (hp0 &amp; (HPTE_V_ABSENT | HPTE_V_VALID)) {</div><div class='ctx'> 				switch (flags &amp; 3) {</div><div class='ctx'> 				case 0:		/* absolute */</div><div class='hunk'>@@ -553,7 +600,7 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			args[j] = ((0x80 | flags) &lt;&lt; 56) + pte_index;</div><div class='del'>-			rev = real_vmalloc_addr(&amp;kvm-&gt;arch.revmap[pte_index]);</div><div class='add'>+			rev = real_vmalloc_addr(&amp;kvm-&gt;arch.hpt.rev[pte_index]);</div><div class='ctx'> 			note_hpte_modification(kvm, rev);</div><div class='ctx'> </div><div class='ctx'> 			if (!(hp0 &amp; HPTE_V_VALID)) {</div><div class='hunk'>@@ -561,13 +608,14 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)</div><div class='ctx'> 				rcbits = rev-&gt;guest_rpte &amp; (HPTE_R_R|HPTE_R_C);</div><div class='ctx'> 				args[j] |= rcbits &lt;&lt; (56 - 5);</div><div class='ctx'> 				hp[0] = 0;</div><div class='add'>+				if (is_mmio_hpte(hp0, hp1))</div><div class='add'>+					atomic64_inc(&amp;kvm-&gt;arch.mmio_update);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* leave it locked */</div><div class='ctx'> 			hp[0] &amp;= ~cpu_to_be64(HPTE_V_VALID);</div><div class='del'>-			tlbrb[n] = compute_tlbie_rb(be64_to_cpu(hp[0]),</div><div class='del'>-				be64_to_cpu(hp[1]), pte_index);</div><div class='add'>+			tlbrb[n] = compute_tlbie_rb(hp0, hp1, pte_index);</div><div class='ctx'> 			indexes[n] = j;</div><div class='ctx'> 			hptes[n] = hp;</div><div class='ctx'> 			revs[n] = rev;</div><div class='hunk'>@@ -605,22 +653,26 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='ctx'> 	__be64 *hpte;</div><div class='ctx'> 	struct revmap_entry *rev;</div><div class='ctx'> 	unsigned long v, r, rb, mask, bits;</div><div class='del'>-	u64 pte;</div><div class='add'>+	u64 pte_v, pte_r;</div><div class='ctx'> </div><div class='del'>-	if (pte_index &gt;= kvm-&gt;arch.hpt_npte)</div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		return H_FUNCTION;</div><div class='add'>+	if (pte_index &gt;= kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt))</div><div class='ctx'> 		return H_PARAMETER;</div><div class='ctx'> </div><div class='del'>-	hpte = (__be64 *)(kvm-&gt;arch.hpt_virt + (pte_index &lt;&lt; 4));</div><div class='add'>+	hpte = (__be64 *)(kvm-&gt;arch.hpt.virt + (pte_index &lt;&lt; 4));</div><div class='ctx'> 	while (!try_lock_hpte(hpte, HPTE_V_HVLOCK))</div><div class='ctx'> 		cpu_relax();</div><div class='del'>-	pte = be64_to_cpu(hpte[0]);</div><div class='del'>-	if ((pte &amp; (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 ||</div><div class='del'>-	    ((flags &amp; H_AVPN) &amp;&amp; (pte &amp; ~0x7fUL) != avpn)) {</div><div class='del'>-		__unlock_hpte(hpte, pte);</div><div class='add'>+	v = pte_v = be64_to_cpu(hpte[0]);</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		v = hpte_new_to_old_v(v, be64_to_cpu(hpte[1]));</div><div class='add'>+	if ((v &amp; (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 ||</div><div class='add'>+	    ((flags &amp; H_AVPN) &amp;&amp; (v &amp; ~0x7fUL) != avpn)) {</div><div class='add'>+		__unlock_hpte(hpte, pte_v);</div><div class='ctx'> 		return H_NOT_FOUND;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	v = pte;</div><div class='add'>+	pte_r = be64_to_cpu(hpte[1]);</div><div class='ctx'> 	bits = (flags &lt;&lt; 55) &amp; HPTE_R_PP0;</div><div class='ctx'> 	bits |= (flags &lt;&lt; 48) &amp; HPTE_R_KEY_HI;</div><div class='ctx'> 	bits |= flags &amp; (HPTE_R_PP | HPTE_R_N | HPTE_R_KEY_LO);</div><div class='hunk'>@@ -628,7 +680,7 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='ctx'> 	/* Update guest view of 2nd HPTE dword */</div><div class='ctx'> 	mask = HPTE_R_PP0 | HPTE_R_PP | HPTE_R_N |</div><div class='ctx'> 		HPTE_R_KEY_HI | HPTE_R_KEY_LO;</div><div class='del'>-	rev = real_vmalloc_addr(&amp;kvm-&gt;arch.revmap[pte_index]);</div><div class='add'>+	rev = real_vmalloc_addr(&amp;kvm-&gt;arch.hpt.rev[pte_index]);</div><div class='ctx'> 	if (rev) {</div><div class='ctx'> 		r = (rev-&gt;guest_rpte &amp; ~mask) | bits;</div><div class='ctx'> 		rev-&gt;guest_rpte = r;</div><div class='hunk'>@@ -642,22 +694,26 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='ctx'> 		 * readonly to writable.  If it should be writable, we'll</div><div class='ctx'> 		 * take a trap and let the page fault code sort it out.</div><div class='ctx'> 		 */</div><div class='del'>-		pte = be64_to_cpu(hpte[1]);</div><div class='del'>-		r = (pte &amp; ~mask) | bits;</div><div class='del'>-		if (hpte_is_writable(r) &amp;&amp; !hpte_is_writable(pte))</div><div class='add'>+		r = (pte_r &amp; ~mask) | bits;</div><div class='add'>+		if (hpte_is_writable(r) &amp;&amp; !hpte_is_writable(pte_r))</div><div class='ctx'> 			r = hpte_make_readonly(r);</div><div class='ctx'> 		/* If the PTE is changing, invalidate it first */</div><div class='del'>-		if (r != pte) {</div><div class='add'>+		if (r != pte_r) {</div><div class='ctx'> 			rb = compute_tlbie_rb(v, r, pte_index);</div><div class='del'>-			hpte[0] = cpu_to_be64((v &amp; ~HPTE_V_VALID) |</div><div class='add'>+			hpte[0] = cpu_to_be64((pte_v &amp; ~HPTE_V_VALID) |</div><div class='ctx'> 					      HPTE_V_ABSENT);</div><div class='ctx'> 			do_tlbies(kvm, &amp;rb, 1, global_invalidates(kvm, flags),</div><div class='ctx'> 				  true);</div><div class='add'>+			/* Don't lose R/C bit updates done by hardware */</div><div class='add'>+			r |= be64_to_cpu(hpte[1]) &amp; (HPTE_R_R | HPTE_R_C);</div><div class='ctx'> 			hpte[1] = cpu_to_be64(r);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	unlock_hpte(hpte, v &amp; ~HPTE_V_HVLOCK);</div><div class='add'>+	unlock_hpte(hpte, pte_v &amp; ~HPTE_V_HVLOCK);</div><div class='ctx'> 	asm volatile("ptesync" : : : "memory");</div><div class='add'>+	if (is_mmio_hpte(v, pte_r))</div><div class='add'>+		atomic64_inc(&amp;kvm-&gt;arch.mmio_update);</div><div class='add'>+</div><div class='ctx'> 	return H_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -670,17 +726,23 @@ long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='ctx'> 	int i, n = 1;</div><div class='ctx'> 	struct revmap_entry *rev = NULL;</div><div class='ctx'> </div><div class='del'>-	if (pte_index &gt;= kvm-&gt;arch.hpt_npte)</div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		return H_FUNCTION;</div><div class='add'>+	if (pte_index &gt;= kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt))</div><div class='ctx'> 		return H_PARAMETER;</div><div class='ctx'> 	if (flags &amp; H_READ_4) {</div><div class='ctx'> 		pte_index &amp;= ~3;</div><div class='ctx'> 		n = 4;</div><div class='ctx'> 	}</div><div class='del'>-	rev = real_vmalloc_addr(&amp;kvm-&gt;arch.revmap[pte_index]);</div><div class='add'>+	rev = real_vmalloc_addr(&amp;kvm-&gt;arch.hpt.rev[pte_index]);</div><div class='ctx'> 	for (i = 0; i &lt; n; ++i, ++pte_index) {</div><div class='del'>-		hpte = (__be64 *)(kvm-&gt;arch.hpt_virt + (pte_index &lt;&lt; 4));</div><div class='add'>+		hpte = (__be64 *)(kvm-&gt;arch.hpt.virt + (pte_index &lt;&lt; 4));</div><div class='ctx'> 		v = be64_to_cpu(hpte[0]) &amp; ~HPTE_V_HVLOCK;</div><div class='ctx'> 		r = be64_to_cpu(hpte[1]);</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+			v = hpte_new_to_old_v(v, r);</div><div class='add'>+			r = hpte_new_to_old_r(r);</div><div class='add'>+		}</div><div class='ctx'> 		if (v &amp; HPTE_V_ABSENT) {</div><div class='ctx'> 			v &amp;= ~HPTE_V_ABSENT;</div><div class='ctx'> 			v |= HPTE_V_VALID;</div><div class='hunk'>@@ -705,11 +767,13 @@ long kvmppc_h_clear_ref(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='ctx'> 	unsigned long *rmap;</div><div class='ctx'> 	long ret = H_NOT_FOUND;</div><div class='ctx'> </div><div class='del'>-	if (pte_index &gt;= kvm-&gt;arch.hpt_npte)</div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		return H_FUNCTION;</div><div class='add'>+	if (pte_index &gt;= kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt))</div><div class='ctx'> 		return H_PARAMETER;</div><div class='ctx'> </div><div class='del'>-	rev = real_vmalloc_addr(&amp;kvm-&gt;arch.revmap[pte_index]);</div><div class='del'>-	hpte = (__be64 *)(kvm-&gt;arch.hpt_virt + (pte_index &lt;&lt; 4));</div><div class='add'>+	rev = real_vmalloc_addr(&amp;kvm-&gt;arch.hpt.rev[pte_index]);</div><div class='add'>+	hpte = (__be64 *)(kvm-&gt;arch.hpt.virt + (pte_index &lt;&lt; 4));</div><div class='ctx'> 	while (!try_lock_hpte(hpte, HPTE_V_HVLOCK))</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	v = be64_to_cpu(hpte[0]);</div><div class='hunk'>@@ -751,11 +815,13 @@ long kvmppc_h_clear_mod(struct kvm_vcpu *vcpu, unsigned long flags,</div><div class='ctx'> 	unsigned long *rmap;</div><div class='ctx'> 	long ret = H_NOT_FOUND;</div><div class='ctx'> </div><div class='del'>-	if (pte_index &gt;= kvm-&gt;arch.hpt_npte)</div><div class='add'>+	if (kvm_is_radix(kvm))</div><div class='add'>+		return H_FUNCTION;</div><div class='add'>+	if (pte_index &gt;= kvmppc_hpt_npte(&amp;kvm-&gt;arch.hpt))</div><div class='ctx'> 		return H_PARAMETER;</div><div class='ctx'> </div><div class='del'>-	rev = real_vmalloc_addr(&amp;kvm-&gt;arch.revmap[pte_index]);</div><div class='del'>-	hpte = (__be64 *)(kvm-&gt;arch.hpt_virt + (pte_index &lt;&lt; 4));</div><div class='add'>+	rev = real_vmalloc_addr(&amp;kvm-&gt;arch.hpt.rev[pte_index]);</div><div class='add'>+	hpte = (__be64 *)(kvm-&gt;arch.hpt.virt + (pte_index &lt;&lt; 4));</div><div class='ctx'> 	while (!try_lock_hpte(hpte, HPTE_V_HVLOCK))</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	v = be64_to_cpu(hpte[0]);</div><div class='hunk'>@@ -798,10 +864,16 @@ void kvmppc_invalidate_hpte(struct kvm *kvm, __be64 *hptep,</div><div class='ctx'> 			unsigned long pte_index)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long rb;</div><div class='add'>+	u64 hp0, hp1;</div><div class='ctx'> </div><div class='ctx'> 	hptep[0] &amp;= ~cpu_to_be64(HPTE_V_VALID);</div><div class='del'>-	rb = compute_tlbie_rb(be64_to_cpu(hptep[0]), be64_to_cpu(hptep[1]),</div><div class='del'>-			      pte_index);</div><div class='add'>+	hp0 = be64_to_cpu(hptep[0]);</div><div class='add'>+	hp1 = be64_to_cpu(hptep[1]);</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		hp0 = hpte_new_to_old_v(hp0, hp1);</div><div class='add'>+		hp1 = hpte_new_to_old_r(hp1);</div><div class='add'>+	}</div><div class='add'>+	rb = compute_tlbie_rb(hp0, hp1, pte_index);</div><div class='ctx'> 	do_tlbies(kvm, &amp;rb, 1, 1, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvmppc_invalidate_hpte);</div><div class='hunk'>@@ -811,9 +883,15 @@ void kvmppc_clear_ref_hpte(struct kvm *kvm, __be64 *hptep,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long rb;</div><div class='ctx'> 	unsigned char rbyte;</div><div class='add'>+	u64 hp0, hp1;</div><div class='ctx'> </div><div class='del'>-	rb = compute_tlbie_rb(be64_to_cpu(hptep[0]), be64_to_cpu(hptep[1]),</div><div class='del'>-			      pte_index);</div><div class='add'>+	hp0 = be64_to_cpu(hptep[0]);</div><div class='add'>+	hp1 = be64_to_cpu(hptep[1]);</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		hp0 = hpte_new_to_old_v(hp0, hp1);</div><div class='add'>+		hp1 = hpte_new_to_old_r(hp1);</div><div class='add'>+	}</div><div class='add'>+	rb = compute_tlbie_rb(hp0, hp1, pte_index);</div><div class='ctx'> 	rbyte = (be64_to_cpu(hptep[1]) &amp; ~HPTE_R_R) &gt;&gt; 8;</div><div class='ctx'> 	/* modify only the second-last byte, which contains the ref bit */</div><div class='ctx'> 	*((char *)hptep + 14) = rbyte;</div><div class='hunk'>@@ -828,6 +906,37 @@ static int slb_base_page_shift[4] = {</div><div class='ctx'> 	20,	/* 1M, unsupported */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct mmio_hpte_cache_entry *mmio_cache_search(struct kvm_vcpu *vcpu,</div><div class='add'>+		unsigned long eaddr, unsigned long slb_v, long mmio_update)</div><div class='add'>+{</div><div class='add'>+	struct mmio_hpte_cache_entry *entry = NULL;</div><div class='add'>+	unsigned int pshift;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MMIO_HPTE_CACHE_SIZE; i++) {</div><div class='add'>+		entry = &amp;vcpu-&gt;arch.mmio_cache.entry[i];</div><div class='add'>+		if (entry-&gt;mmio_update == mmio_update) {</div><div class='add'>+			pshift = entry-&gt;slb_base_pshift;</div><div class='add'>+			if ((entry-&gt;eaddr &gt;&gt; pshift) == (eaddr &gt;&gt; pshift) &amp;&amp;</div><div class='add'>+			    entry-&gt;slb_v == slb_v)</div><div class='add'>+				return entry;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mmio_hpte_cache_entry *</div><div class='add'>+			next_mmio_cache_entry(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	unsigned int index = vcpu-&gt;arch.mmio_cache.index;</div><div class='add'>+</div><div class='add'>+	vcpu-&gt;arch.mmio_cache.index++;</div><div class='add'>+	if (vcpu-&gt;arch.mmio_cache.index == MMIO_HPTE_CACHE_SIZE)</div><div class='add'>+		vcpu-&gt;arch.mmio_cache.index = 0;</div><div class='add'>+</div><div class='add'>+	return &amp;vcpu-&gt;arch.mmio_cache.entry[index];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* When called from virtmode, this func should be protected by</div><div class='ctx'>  * preempt_disable(), otherwise, the holding of HPTE_V_HVLOCK</div><div class='ctx'>  * can trigger deadlock issue.</div><div class='hunk'>@@ -842,7 +951,7 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v,</div><div class='ctx'> 	unsigned long avpn;</div><div class='ctx'> 	__be64 *hpte;</div><div class='ctx'> 	unsigned long mask, val;</div><div class='del'>-	unsigned long v, r;</div><div class='add'>+	unsigned long v, r, orig_v;</div><div class='ctx'> </div><div class='ctx'> 	/* Get page shift, work out hash and AVPN etc. */</div><div class='ctx'> 	mask = SLB_VSID_B | HPTE_V_AVPN | HPTE_V_SECONDARY;</div><div class='hunk'>@@ -861,7 +970,7 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v,</div><div class='ctx'> 		somask = (1UL &lt;&lt; 28) - 1;</div><div class='ctx'> 		vsid = (slb_v &amp; ~SLB_VSID_B) &gt;&gt; SLB_VSID_SHIFT;</div><div class='ctx'> 	}</div><div class='del'>-	hash = (vsid ^ ((eaddr &amp; somask) &gt;&gt; pshift)) &amp; kvm-&gt;arch.hpt_mask;</div><div class='add'>+	hash = (vsid ^ ((eaddr &amp; somask) &gt;&gt; pshift)) &amp; kvmppc_hpt_mask(&amp;kvm-&gt;arch.hpt);</div><div class='ctx'> 	avpn = slb_v &amp; ~(somask &gt;&gt; 16);	/* also includes B */</div><div class='ctx'> 	avpn |= (eaddr &amp; somask) &gt;&gt; 16;</div><div class='ctx'> </div><div class='hunk'>@@ -872,11 +981,13 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v,</div><div class='ctx'> 	val |= avpn;</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		hpte = (__be64 *)(kvm-&gt;arch.hpt_virt + (hash &lt;&lt; 7));</div><div class='add'>+		hpte = (__be64 *)(kvm-&gt;arch.hpt.virt + (hash &lt;&lt; 7));</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; 16; i += 2) {</div><div class='ctx'> 			/* Read the PTE racily */</div><div class='ctx'> 			v = be64_to_cpu(hpte[i]) &amp; ~HPTE_V_HVLOCK;</div><div class='add'>+			if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+				v = hpte_new_to_old_v(v, be64_to_cpu(hpte[i+1]));</div><div class='ctx'> </div><div class='ctx'> 			/* Check valid/absent, hash, segment size and AVPN */</div><div class='ctx'> 			if (!(v &amp; valid) || (v &amp; mask) != val)</div><div class='hunk'>@@ -885,8 +996,12 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v,</div><div class='ctx'> 			/* Lock the PTE and read it under the lock */</div><div class='ctx'> 			while (!try_lock_hpte(&amp;hpte[i], HPTE_V_HVLOCK))</div><div class='ctx'> 				cpu_relax();</div><div class='del'>-			v = be64_to_cpu(hpte[i]) &amp; ~HPTE_V_HVLOCK;</div><div class='add'>+			v = orig_v = be64_to_cpu(hpte[i]) &amp; ~HPTE_V_HVLOCK;</div><div class='ctx'> 			r = be64_to_cpu(hpte[i+1]);</div><div class='add'>+			if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+				v = hpte_new_to_old_v(v, r);</div><div class='add'>+				r = hpte_new_to_old_r(r);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Check the HPTE again, including base page size</div><div class='hunk'>@@ -896,13 +1011,13 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v,</div><div class='ctx'> 				/* Return with the HPTE still locked */</div><div class='ctx'> 				return (hash &lt;&lt; 3) + (i &gt;&gt; 1);</div><div class='ctx'> </div><div class='del'>-			__unlock_hpte(&amp;hpte[i], v);</div><div class='add'>+			__unlock_hpte(&amp;hpte[i], orig_v);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (val &amp; HPTE_V_SECONDARY)</div><div class='ctx'> 			break;</div><div class='ctx'> 		val |= HPTE_V_SECONDARY;</div><div class='del'>-		hash = hash ^ kvm-&gt;arch.hpt_mask;</div><div class='add'>+		hash = hash ^ kvmppc_hpt_mask(&amp;kvm-&gt;arch.hpt);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='hunk'>@@ -924,30 +1039,45 @@ long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm *kvm = vcpu-&gt;kvm;</div><div class='ctx'> 	long int index;</div><div class='del'>-	unsigned long v, r, gr;</div><div class='add'>+	unsigned long v, r, gr, orig_v;</div><div class='ctx'> 	__be64 *hpte;</div><div class='ctx'> 	unsigned long valid;</div><div class='ctx'> 	struct revmap_entry *rev;</div><div class='ctx'> 	unsigned long pp, key;</div><div class='add'>+	struct mmio_hpte_cache_entry *cache_entry = NULL;</div><div class='add'>+	long mmio_update = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* For protection fault, expect to find a valid HPTE */</div><div class='ctx'> 	valid = HPTE_V_VALID;</div><div class='del'>-	if (status &amp; DSISR_NOHPTE)</div><div class='add'>+	if (status &amp; DSISR_NOHPTE) {</div><div class='ctx'> 		valid |= HPTE_V_ABSENT;</div><div class='del'>-</div><div class='del'>-	index = kvmppc_hv_find_lock_hpte(kvm, addr, slb_v, valid);</div><div class='del'>-	if (index &lt; 0) {</div><div class='del'>-		if (status &amp; DSISR_NOHPTE)</div><div class='del'>-			return status;	/* there really was no HPTE */</div><div class='del'>-		return 0;		/* for prot fault, HPTE disappeared */</div><div class='add'>+		mmio_update = atomic64_read(&amp;kvm-&gt;arch.mmio_update);</div><div class='add'>+		cache_entry = mmio_cache_search(vcpu, addr, slb_v, mmio_update);</div><div class='ctx'> 	}</div><div class='del'>-	hpte = (__be64 *)(kvm-&gt;arch.hpt_virt + (index &lt;&lt; 4));</div><div class='del'>-	v = be64_to_cpu(hpte[0]) &amp; ~HPTE_V_HVLOCK;</div><div class='del'>-	r = be64_to_cpu(hpte[1]);</div><div class='del'>-	rev = real_vmalloc_addr(&amp;kvm-&gt;arch.revmap[index]);</div><div class='del'>-	gr = rev-&gt;guest_rpte;</div><div class='add'>+	if (cache_entry) {</div><div class='add'>+		index = cache_entry-&gt;pte_index;</div><div class='add'>+		v = cache_entry-&gt;hpte_v;</div><div class='add'>+		r = cache_entry-&gt;hpte_r;</div><div class='add'>+		gr = cache_entry-&gt;rpte;</div><div class='add'>+	} else {</div><div class='add'>+		index = kvmppc_hv_find_lock_hpte(kvm, addr, slb_v, valid);</div><div class='add'>+		if (index &lt; 0) {</div><div class='add'>+			if (status &amp; DSISR_NOHPTE)</div><div class='add'>+				return status;	/* there really was no HPTE */</div><div class='add'>+			return 0;	/* for prot fault, HPTE disappeared */</div><div class='add'>+		}</div><div class='add'>+		hpte = (__be64 *)(kvm-&gt;arch.hpt.virt + (index &lt;&lt; 4));</div><div class='add'>+		v = orig_v = be64_to_cpu(hpte[0]) &amp; ~HPTE_V_HVLOCK;</div><div class='add'>+		r = be64_to_cpu(hpte[1]);</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+			v = hpte_new_to_old_v(v, r);</div><div class='add'>+			r = hpte_new_to_old_r(r);</div><div class='add'>+		}</div><div class='add'>+		rev = real_vmalloc_addr(&amp;kvm-&gt;arch.hpt.rev[index]);</div><div class='add'>+		gr = rev-&gt;guest_rpte;</div><div class='ctx'> </div><div class='del'>-	unlock_hpte(hpte, v);</div><div class='add'>+		unlock_hpte(hpte, orig_v);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* For not found, if the HPTE is valid by now, retry the instruction */</div><div class='ctx'> 	if ((status &amp; DSISR_NOHPTE) &amp;&amp; (v &amp; HPTE_V_VALID))</div><div class='hunk'>@@ -985,12 +1115,32 @@ long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,</div><div class='ctx'> 	vcpu-&gt;arch.pgfault_index = index;</div><div class='ctx'> 	vcpu-&gt;arch.pgfault_hpte[0] = v;</div><div class='ctx'> 	vcpu-&gt;arch.pgfault_hpte[1] = r;</div><div class='add'>+	vcpu-&gt;arch.pgfault_cache = cache_entry;</div><div class='ctx'> </div><div class='ctx'> 	/* Check the storage key to see if it is possibly emulated MMIO */</div><div class='del'>-	if (data &amp;&amp; (vcpu-&gt;arch.shregs.msr &amp; MSR_IR) &amp;&amp;</div><div class='del'>-	    (r &amp; (HPTE_R_KEY_HI | HPTE_R_KEY_LO)) ==</div><div class='del'>-	    (HPTE_R_KEY_HI | HPTE_R_KEY_LO))</div><div class='del'>-		return -2;	/* MMIO emulation - load instr word */</div><div class='add'>+	if ((r &amp; (HPTE_R_KEY_HI | HPTE_R_KEY_LO)) ==</div><div class='add'>+	    (HPTE_R_KEY_HI | HPTE_R_KEY_LO)) {</div><div class='add'>+		if (!cache_entry) {</div><div class='add'>+			unsigned int pshift = 12;</div><div class='add'>+			unsigned int pshift_index;</div><div class='add'>+</div><div class='add'>+			if (slb_v &amp; SLB_VSID_L) {</div><div class='add'>+				pshift_index = ((slb_v &amp; SLB_VSID_LP) &gt;&gt; 4);</div><div class='add'>+				pshift = slb_base_page_shift[pshift_index];</div><div class='add'>+			}</div><div class='add'>+			cache_entry = next_mmio_cache_entry(vcpu);</div><div class='add'>+			cache_entry-&gt;eaddr = addr;</div><div class='add'>+			cache_entry-&gt;slb_base_pshift = pshift;</div><div class='add'>+			cache_entry-&gt;pte_index = index;</div><div class='add'>+			cache_entry-&gt;hpte_v = v;</div><div class='add'>+			cache_entry-&gt;hpte_r = r;</div><div class='add'>+			cache_entry-&gt;rpte = gr;</div><div class='add'>+			cache_entry-&gt;slb_v = slb_v;</div><div class='add'>+			cache_entry-&gt;mmio_update = mmio_update;</div><div class='add'>+		}</div><div class='add'>+		if (data &amp;&amp; (vcpu-&gt;arch.shregs.msr &amp; MSR_IR))</div><div class='add'>+			return -2;	/* MMIO emulation - load instr word */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return -1;		/* send fault up to host kernel mode */</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_hv_rm_xics.c b/arch/powerpc/kvm/book3s_hv_rm_xics.c<br/>index a0ea63ac2b52..e78542d99cd6 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv_rm_xics.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_hv_rm_xics.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv_rm_xics.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv_rm_xics.c</a></div><div class='hunk'>@@ -35,8 +35,8 @@ int kvm_irq_bypass = 1;</div><div class='ctx'> EXPORT_SYMBOL(kvm_irq_bypass);</div><div class='ctx'> </div><div class='ctx'> static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='del'>-			    u32 new_irq);</div><div class='del'>-static int xics_opal_rm_set_server(unsigned int hw_irq, int server_cpu);</div><div class='add'>+			    u32 new_irq, bool check_resend);</div><div class='add'>+static int xics_opal_set_server(unsigned int hw_irq, int server_cpu);</div><div class='ctx'> </div><div class='ctx'> /* -- ICS routines -- */</div><div class='ctx'> static void ics_rm_check_resend(struct kvmppc_xics *xics,</div><div class='hunk'>@@ -44,20 +44,12 @@ static void ics_rm_check_resend(struct kvmppc_xics *xics,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	arch_spin_lock(&amp;ics-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; KVMPPC_XICS_IRQ_PER_ICS; i++) {</div><div class='ctx'> 		struct ics_irq_state *state = &amp;ics-&gt;irq_state[i];</div><div class='del'>-</div><div class='del'>-		if (!state-&gt;resend)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		arch_spin_unlock(&amp;ics-&gt;lock);</div><div class='del'>-		icp_rm_deliver_irq(xics, icp, state-&gt;number);</div><div class='del'>-		arch_spin_lock(&amp;ics-&gt;lock);</div><div class='add'>+		if (state-&gt;resend)</div><div class='add'>+			icp_rm_deliver_irq(xics, icp, state-&gt;number, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	arch_spin_unlock(&amp;ics-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -- ICP routines -- */</div><div class='hunk'>@@ -70,7 +62,9 @@ static inline void icp_send_hcore_msg(int hcore, struct kvm_vcpu *vcpu)</div><div class='ctx'> 	hcpu = hcore &lt;&lt; threads_shift;</div><div class='ctx'> 	kvmppc_host_rm_ops_hv-&gt;rm_core[hcore].rm_data = vcpu;</div><div class='ctx'> 	smp_muxed_ipi_set_message(hcpu, PPC_MSG_RM_HOST_ACTION);</div><div class='del'>-	icp_native_cause_ipi_rm(hcpu);</div><div class='add'>+	kvmppc_set_host_ipi(hcpu, 1);</div><div class='add'>+	smp_mb();</div><div class='add'>+	kvmhv_rm_send_ipi(hcpu);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline void icp_send_hcore_msg(int hcore, struct kvm_vcpu *vcpu) { }</div><div class='hunk'>@@ -286,7 +280,7 @@ static bool icp_rm_try_to_deliver(struct kvmppc_icp *icp, u32 irq, u8 priority,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='del'>-			    u32 new_irq)</div><div class='add'>+			    u32 new_irq, bool check_resend)</div><div class='ctx'> {</div><div class='ctx'> 	struct ics_irq_state *state;</div><div class='ctx'> 	struct kvmppc_ics *ics;</div><div class='hunk'>@@ -331,6 +325,10 @@ static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (check_resend)</div><div class='add'>+		if (!state-&gt;resend)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='ctx'> 	/* Clear the resend bit of that interrupt */</div><div class='ctx'> 	state-&gt;resend = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -376,7 +374,9 @@ static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (reject &amp;&amp; reject != XICS_IPI) {</div><div class='ctx'> 			arch_spin_unlock(&amp;ics-&gt;lock);</div><div class='add'>+			icp-&gt;n_reject++;</div><div class='ctx'> 			new_irq = reject;</div><div class='add'>+			check_resend = 0;</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -384,10 +384,16 @@ static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='ctx'> 		 * We failed to deliver the interrupt we need to set the</div><div class='ctx'> 		 * resend map bit and mark the ICS state as needing a resend</div><div class='ctx'> 		 */</div><div class='del'>-		set_bit(ics-&gt;icsid, icp-&gt;resend_map);</div><div class='ctx'> 		state-&gt;resend = 1;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='add'>+		 * Make sure when checking resend, we don't miss the resend</div><div class='add'>+		 * if resend_map bit is seen and cleared.</div><div class='add'>+		 */</div><div class='add'>+		smp_wmb();</div><div class='add'>+		set_bit(ics-&gt;icsid, icp-&gt;resend_map);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='ctx'> 		 * If the need_resend flag got cleared in the ICP some time</div><div class='ctx'> 		 * between icp_rm_try_to_deliver() atomic update and now, then</div><div class='ctx'> 		 * we know it might have missed the resend_map bit. So we</div><div class='hunk'>@@ -395,7 +401,9 @@ static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='ctx'> 		 */</div><div class='ctx'> 		smp_mb();</div><div class='ctx'> 		if (!icp-&gt;state.need_resend) {</div><div class='add'>+			state-&gt;resend = 0;</div><div class='ctx'> 			arch_spin_unlock(&amp;ics-&gt;lock);</div><div class='add'>+			check_resend = 0;</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -590,7 +598,7 @@ int kvmppc_rm_h_ipi(struct kvm_vcpu *vcpu, unsigned long server,</div><div class='ctx'> 	/* Handle reject in real mode */</div><div class='ctx'> 	if (reject &amp;&amp; reject != XICS_IPI) {</div><div class='ctx'> 		this_icp-&gt;n_reject++;</div><div class='del'>-		icp_rm_deliver_irq(xics, icp, reject);</div><div class='add'>+		icp_rm_deliver_irq(xics, icp, reject, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Handle resends in real mode */</div><div class='hunk'>@@ -658,59 +666,45 @@ int kvmppc_rm_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (reject &amp;&amp; reject != XICS_IPI) {</div><div class='ctx'> 		icp-&gt;n_reject++;</div><div class='del'>-		icp_rm_deliver_irq(xics, icp, reject);</div><div class='add'>+		icp_rm_deliver_irq(xics, icp, reject, false);</div><div class='ctx'> 	}</div><div class='ctx'>  bail:</div><div class='ctx'> 	return check_too_hard(xics, icp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr)</div><div class='add'>+static int ics_rm_eoi(struct kvm_vcpu *vcpu, u32 irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvmppc_xics *xics = vcpu-&gt;kvm-&gt;arch.xics;</div><div class='ctx'> 	struct kvmppc_icp *icp = vcpu-&gt;arch.icp;</div><div class='ctx'> 	struct kvmppc_ics *ics;</div><div class='ctx'> 	struct ics_irq_state *state;</div><div class='del'>-	u32 irq = xirr &amp; 0x00ffffff;</div><div class='ctx'> 	u16 src;</div><div class='del'>-</div><div class='del'>-	if (!xics || !xics-&gt;real_mode)</div><div class='del'>-		return H_TOO_HARD;</div><div class='add'>+	u32 pq_old, pq_new;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * ICP State: EOI</div><div class='del'>-	 *</div><div class='del'>-	 * Note: If EOI is incorrectly used by SW to lower the CPPR</div><div class='del'>-	 * value (ie more favored), we do not check for rejection of</div><div class='del'>-	 * a pending interrupt, this is a SW error and PAPR sepcifies</div><div class='del'>-	 * that we don't have to deal with it.</div><div class='add'>+	 * ICS EOI handling: For LSI, if P bit is still set, we need to</div><div class='add'>+	 * resend it.</div><div class='ctx'> 	 *</div><div class='del'>-	 * The sending of an EOI to the ICS is handled after the</div><div class='del'>-	 * CPPR update</div><div class='del'>-	 *</div><div class='del'>-	 * ICP State: Down_CPPR which we handle</div><div class='del'>-	 * in a separate function as it's shared with H_CPPR.</div><div class='add'>+	 * For MSI, we move Q bit into P (and clear Q). If it is set,</div><div class='add'>+	 * resend it.</div><div class='ctx'> 	 */</div><div class='del'>-	icp_rm_down_cppr(xics, icp, xirr &gt;&gt; 24);</div><div class='ctx'> </div><div class='del'>-	/* IPIs have no EOI */</div><div class='del'>-	if (irq == XICS_IPI)</div><div class='del'>-		goto bail;</div><div class='del'>-	/*</div><div class='del'>-	 * EOI handling: If the interrupt is still asserted, we need to</div><div class='del'>-	 * resend it. We can take a lockless "peek" at the ICS state here.</div><div class='del'>-	 *</div><div class='del'>-	 * "Message" interrupts will never have "asserted" set</div><div class='del'>-	 */</div><div class='ctx'> 	ics = kvmppc_xics_find_ics(xics, irq, &amp;src);</div><div class='ctx'> 	if (!ics)</div><div class='ctx'> 		goto bail;</div><div class='add'>+</div><div class='ctx'> 	state = &amp;ics-&gt;irq_state[src];</div><div class='ctx'> </div><div class='del'>-	/* Still asserted, resend it */</div><div class='del'>-	if (state-&gt;asserted) {</div><div class='del'>-		icp-&gt;n_reject++;</div><div class='del'>-		icp_rm_deliver_irq(xics, icp, irq);</div><div class='del'>-	}</div><div class='add'>+	if (state-&gt;lsi)</div><div class='add'>+		pq_new = state-&gt;pq_state;</div><div class='add'>+	else</div><div class='add'>+		do {</div><div class='add'>+			pq_old = state-&gt;pq_state;</div><div class='add'>+			pq_new = pq_old &gt;&gt; 1;</div><div class='add'>+		} while (cmpxchg(&amp;state-&gt;pq_state, pq_old, pq_new) != pq_old);</div><div class='add'>+</div><div class='add'>+	if (pq_new &amp; PQ_PRESENTED)</div><div class='add'>+		icp_rm_deliver_irq(xics, NULL, irq, false);</div><div class='ctx'> </div><div class='ctx'> 	if (!hlist_empty(&amp;vcpu-&gt;kvm-&gt;irq_ack_notifier_list)) {</div><div class='ctx'> 		icp-&gt;rm_action |= XICS_RM_NOTIFY_EOI;</div><div class='hunk'>@@ -726,18 +720,51 @@ int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr)</div><div class='ctx'> 			++vcpu-&gt;stat.pthru_host;</div><div class='ctx'> 			if (state-&gt;intr_cpu != pcpu) {</div><div class='ctx'> 				++vcpu-&gt;stat.pthru_bad_aff;</div><div class='del'>-				xics_opal_rm_set_server(state-&gt;host_irq, pcpu);</div><div class='add'>+				xics_opal_set_server(state-&gt;host_irq, pcpu);</div><div class='ctx'> 			}</div><div class='ctx'> 			state-&gt;intr_cpu = -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'>  bail:</div><div class='ctx'> 	return check_too_hard(xics, icp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr)</div><div class='add'>+{</div><div class='add'>+	struct kvmppc_xics *xics = vcpu-&gt;kvm-&gt;arch.xics;</div><div class='add'>+	struct kvmppc_icp *icp = vcpu-&gt;arch.icp;</div><div class='add'>+	u32 irq = xirr &amp; 0x00ffffff;</div><div class='add'>+</div><div class='add'>+	if (!xics || !xics-&gt;real_mode)</div><div class='add'>+		return H_TOO_HARD;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ICP State: EOI</div><div class='add'>+	 *</div><div class='add'>+	 * Note: If EOI is incorrectly used by SW to lower the CPPR</div><div class='add'>+	 * value (ie more favored), we do not check for rejection of</div><div class='add'>+	 * a pending interrupt, this is a SW error and PAPR specifies</div><div class='add'>+	 * that we don't have to deal with it.</div><div class='add'>+	 *</div><div class='add'>+	 * The sending of an EOI to the ICS is handled after the</div><div class='add'>+	 * CPPR update</div><div class='add'>+	 *</div><div class='add'>+	 * ICP State: Down_CPPR which we handle</div><div class='add'>+	 * in a separate function as it's shared with H_CPPR.</div><div class='add'>+	 */</div><div class='add'>+	icp_rm_down_cppr(xics, icp, xirr &gt;&gt; 24);</div><div class='add'>+</div><div class='add'>+	/* IPIs have no EOI */</div><div class='add'>+	if (irq == XICS_IPI)</div><div class='add'>+		return check_too_hard(xics, icp);</div><div class='add'>+</div><div class='add'>+	return ics_rm_eoi(vcpu, irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> unsigned long eoi_rc;</div><div class='ctx'> </div><div class='del'>-static void icp_eoi(struct irq_chip *c, u32 hwirq, u32 xirr)</div><div class='add'>+static void icp_eoi(struct irq_chip *c, u32 hwirq, __be32 xirr, bool *again)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long xics_phys;</div><div class='ctx'> 	int64_t rc;</div><div class='hunk'>@@ -751,14 +778,19 @@ static void icp_eoi(struct irq_chip *c, u32 hwirq, u32 xirr)</div><div class='ctx'> </div><div class='ctx'> 	/* EOI it */</div><div class='ctx'> 	xics_phys = local_paca-&gt;kvm_hstate.xics_phys;</div><div class='del'>-	_stwcix(xics_phys + XICS_XIRR, xirr);</div><div class='add'>+	if (xics_phys) {</div><div class='add'>+		_stwcix(xics_phys + XICS_XIRR, xirr);</div><div class='add'>+	} else {</div><div class='add'>+		rc = opal_int_eoi(be32_to_cpu(xirr));</div><div class='add'>+		*again = rc &gt; 0;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xics_opal_rm_set_server(unsigned int hw_irq, int server_cpu)</div><div class='add'>+static int xics_opal_set_server(unsigned int hw_irq, int server_cpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mangle_cpu = get_hard_smp_processor_id(server_cpu) &lt;&lt; 2;</div><div class='ctx'> </div><div class='del'>-	return opal_rm_set_xive(hw_irq, mangle_cpu, DEFAULT_PRIORITY);</div><div class='add'>+	return opal_set_xive(hw_irq, mangle_cpu, DEFAULT_PRIORITY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -809,23 +841,44 @@ static void kvmppc_rm_handle_irq_desc(struct irq_desc *desc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> long kvmppc_deliver_irq_passthru(struct kvm_vcpu *vcpu,</div><div class='del'>-				 u32 xirr,</div><div class='add'>+				 __be32 xirr,</div><div class='ctx'> 				 struct kvmppc_irq_map *irq_map,</div><div class='del'>-				 struct kvmppc_passthru_irqmap *pimap)</div><div class='add'>+				 struct kvmppc_passthru_irqmap *pimap,</div><div class='add'>+				 bool *again)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvmppc_xics *xics;</div><div class='ctx'> 	struct kvmppc_icp *icp;</div><div class='add'>+	struct kvmppc_ics *ics;</div><div class='add'>+	struct ics_irq_state *state;</div><div class='ctx'> 	u32 irq;</div><div class='add'>+	u16 src;</div><div class='add'>+	u32 pq_old, pq_new;</div><div class='ctx'> </div><div class='ctx'> 	irq = irq_map-&gt;v_hwirq;</div><div class='ctx'> 	xics = vcpu-&gt;kvm-&gt;arch.xics;</div><div class='ctx'> 	icp = vcpu-&gt;arch.icp;</div><div class='ctx'> </div><div class='ctx'> 	kvmppc_rm_handle_irq_desc(irq_map-&gt;desc);</div><div class='del'>-	icp_rm_deliver_irq(xics, icp, irq);</div><div class='add'>+</div><div class='add'>+	ics = kvmppc_xics_find_ics(xics, irq, &amp;src);</div><div class='add'>+	if (!ics)</div><div class='add'>+		return 2;</div><div class='add'>+</div><div class='add'>+	state = &amp;ics-&gt;irq_state[src];</div><div class='add'>+</div><div class='add'>+	/* only MSIs register bypass producers, so it must be MSI here */</div><div class='add'>+	do {</div><div class='add'>+		pq_old = state-&gt;pq_state;</div><div class='add'>+		pq_new = ((pq_old &lt;&lt; 1) &amp; 3) | PQ_PRESENTED;</div><div class='add'>+	} while (cmpxchg(&amp;state-&gt;pq_state, pq_old, pq_new) != pq_old);</div><div class='add'>+</div><div class='add'>+	/* Test P=1, Q=0, this is the only case where we present */</div><div class='add'>+	if (pq_new == PQ_PRESENTED)</div><div class='add'>+		icp_rm_deliver_irq(xics, icp, irq, false);</div><div class='ctx'> </div><div class='ctx'> 	/* EOI the interrupt */</div><div class='del'>-	icp_eoi(irq_desc_get_chip(irq_map-&gt;desc), irq_map-&gt;r_hwirq, xirr);</div><div class='add'>+	icp_eoi(irq_desc_get_chip(irq_map-&gt;desc), irq_map-&gt;r_hwirq, xirr,</div><div class='add'>+		again);</div><div class='ctx'> </div><div class='ctx'> 	if (check_too_hard(xics, icp) == H_TOO_HARD)</div><div class='ctx'> 		return 2;</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S<br/>index c3c1d1bcfc67..7c6477d1840a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv_rmhandlers.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_hv_rmhandlers.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_hv_rmhandlers.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_hv_rmhandlers.S</a></div><div class='hunk'>@@ -148,6 +148,15 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	addi	r1, r1, 112</div><div class='ctx'> 	ld	r7, HSTATE_HOST_MSR(r13)</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If we came back from the guest via a relocation-on interrupt,</div><div class='add'>+	 * we will be in virtual mode at this point, which makes it a</div><div class='add'>+	 * little easier to get back to the caller.</div><div class='add'>+	 */</div><div class='add'>+	mfmsr	r0</div><div class='add'>+	andi.	r0, r0, MSR_IR		/* in real mode? */</div><div class='add'>+	bne	.Lvirt_return</div><div class='add'>+</div><div class='ctx'> 	cmpwi	cr1, r12, BOOK3S_INTERRUPT_MACHINE_CHECK</div><div class='ctx'> 	cmpwi	r12, BOOK3S_INTERRUPT_EXTERNAL</div><div class='ctx'> 	beq	11f</div><div class='hunk'>@@ -181,6 +190,26 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	mtspr SPRN_HSRR1, r7</div><div class='ctx'> 	ba    0xe80</div><div class='ctx'> </div><div class='add'>+	/* Virtual-mode return - can't get here for HMI or machine check */</div><div class='add'>+.Lvirt_return:</div><div class='add'>+	cmpwi	r12, BOOK3S_INTERRUPT_EXTERNAL</div><div class='add'>+	beq	16f</div><div class='add'>+	cmpwi	r12, BOOK3S_INTERRUPT_H_DOORBELL</div><div class='add'>+	beq	17f</div><div class='add'>+	andi.	r0, r7, MSR_EE		/* were interrupts hard-enabled? */</div><div class='add'>+	beq	18f</div><div class='add'>+	mtmsrd	r7, 1			/* if so then re-enable them */</div><div class='add'>+18:	mtlr	r8</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+16:	mtspr	SPRN_HSRR0, r8		/* jump to reloc-on external vector */</div><div class='add'>+	mtspr	SPRN_HSRR1, r7</div><div class='add'>+	b	exc_virt_0x4500_hardware_interrupt</div><div class='add'>+</div><div class='add'>+17:	mtspr	SPRN_HSRR0, r8</div><div class='add'>+	mtspr	SPRN_HSRR1, r7</div><div class='add'>+	b	exc_virt_0x4e80_h_doorbell</div><div class='add'>+</div><div class='ctx'> kvmppc_primary_no_guest:</div><div class='ctx'> 	/* We handle this much like a ceded vcpu */</div><div class='ctx'> 	/* put the HDEC into the DEC, since HDEC interrupts don't wake us */</div><div class='hunk'>@@ -501,17 +530,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	cmpwi	r0, 0</div><div class='ctx'> 	beq	57f</div><div class='ctx'> 	li	r3, (LPCR_PECEDH | LPCR_PECE0) &gt;&gt; 4</div><div class='del'>-	mfspr	r4, SPRN_LPCR</div><div class='del'>-	rlwimi	r4, r3, 4, (LPCR_PECEDP | LPCR_PECEDH | LPCR_PECE0 | LPCR_PECE1)</div><div class='del'>-	mtspr	SPRN_LPCR, r4</div><div class='del'>-	isync</div><div class='del'>-	std	r0, HSTATE_SCRATCH0(r13)</div><div class='del'>-	ptesync</div><div class='del'>-	ld	r0, HSTATE_SCRATCH0(r13)</div><div class='del'>-1:	cmpd	r0, r0</div><div class='del'>-	bne	1b</div><div class='del'>-	nap</div><div class='del'>-	b	.</div><div class='add'>+	mfspr	r5, SPRN_LPCR</div><div class='add'>+	rlwimi	r5, r3, 4, (LPCR_PECEDP | LPCR_PECEDH | LPCR_PECE0 | LPCR_PECE1)</div><div class='add'>+	b	kvm_nap_sequence</div><div class='ctx'> </div><div class='ctx'> 57:	li	r0, 0</div><div class='ctx'> 	stbx	r0, r3, r4</div><div class='hunk'>@@ -523,6 +544,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'>  *                                                                            *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='add'>+/* Stack frame offsets */</div><div class='add'>+#define STACK_SLOT_TID		(112-16)</div><div class='add'>+#define STACK_SLOT_PSSCR	(112-24)</div><div class='add'>+#define STACK_SLOT_PID		(112-32)</div><div class='add'>+</div><div class='ctx'> .global kvmppc_hv_entry</div><div class='ctx'> kvmppc_hv_entry:</div><div class='ctx'> </div><div class='hunk'>@@ -534,6 +560,7 @@ kvmppc_hv_entry:</div><div class='ctx'> 	 * R1 = host R1</div><div class='ctx'> 	 * R2 = TOC</div><div class='ctx'> 	 * all other volatile GPRS = free</div><div class='add'>+	 * Does not preserve non-volatile GPRs or CR fields</div><div class='ctx'> 	 */</div><div class='ctx'> 	mflr	r0</div><div class='ctx'> 	std	r0, PPC_LR_STKOFF(r1)</div><div class='hunk'>@@ -553,73 +580,91 @@ kvmppc_hv_entry:</div><div class='ctx'> 	bl	kvmhv_start_timing</div><div class='ctx'> 1:</div><div class='ctx'> #endif</div><div class='del'>-	/* Clear out SLB */</div><div class='add'>+</div><div class='add'>+	/* Use cr7 as an indication of radix mode */</div><div class='add'>+	ld	r5, HSTATE_KVM_VCORE(r13)</div><div class='add'>+	ld	r9, VCORE_KVM(r5)	/* pointer to struct kvm */</div><div class='add'>+	lbz	r0, KVM_RADIX(r9)</div><div class='add'>+	cmpwi	cr7, r0, 0</div><div class='add'>+</div><div class='add'>+	/* Clear out SLB if hash */</div><div class='add'>+	bne	cr7, 2f</div><div class='ctx'> 	li	r6,0</div><div class='ctx'> 	slbmte	r6,r6</div><div class='ctx'> 	slbia</div><div class='ctx'> 	ptesync</div><div class='del'>-</div><div class='add'>+2:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * POWER7/POWER8 host -&gt; guest partition switch code.</div><div class='ctx'> 	 * We don't have to lock against concurrent tlbies,</div><div class='ctx'> 	 * but we do have to coordinate across hardware threads.</div><div class='ctx'> 	 */</div><div class='ctx'> 	/* Set bit in entry map iff exit map is zero. */</div><div class='del'>-	ld	r5, HSTATE_KVM_VCORE(r13)</div><div class='ctx'> 	li	r7, 1</div><div class='ctx'> 	lbz	r6, HSTATE_PTID(r13)</div><div class='ctx'> 	sld	r7, r7, r6</div><div class='del'>-	addi	r9, r5, VCORE_ENTRY_EXIT</div><div class='del'>-21:	lwarx	r3, 0, r9</div><div class='add'>+	addi	r8, r5, VCORE_ENTRY_EXIT</div><div class='add'>+21:	lwarx	r3, 0, r8</div><div class='ctx'> 	cmpwi	r3, 0x100		/* any threads starting to exit? */</div><div class='ctx'> 	bge	secondary_too_late	/* if so we're too late to the party */</div><div class='ctx'> 	or	r3, r3, r7</div><div class='del'>-	stwcx.	r3, 0, r9</div><div class='add'>+	stwcx.	r3, 0, r8</div><div class='ctx'> 	bne	21b</div><div class='ctx'> </div><div class='ctx'> 	/* Primary thread switches to guest partition. */</div><div class='del'>-	ld	r9,VCORE_KVM(r5)	/* pointer to struct kvm */</div><div class='ctx'> 	cmpwi	r6,0</div><div class='ctx'> 	bne	10f</div><div class='del'>-	ld	r6,KVM_SDR1(r9)</div><div class='ctx'> 	lwz	r7,KVM_LPID(r9)</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	ld	r6,KVM_SDR1(r9)</div><div class='ctx'> 	li	r0,LPID_RSVD		/* switch to reserved LPID */</div><div class='ctx'> 	mtspr	SPRN_LPID,r0</div><div class='ctx'> 	ptesync</div><div class='ctx'> 	mtspr	SPRN_SDR1,r6		/* switch to partition page table */</div><div class='add'>+END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300)</div><div class='ctx'> 	mtspr	SPRN_LPID,r7</div><div class='ctx'> 	isync</div><div class='ctx'> </div><div class='ctx'> 	/* See if we need to flush the TLB */</div><div class='ctx'> 	lhz	r6,PACAPACAINDEX(r13)	/* test_bit(cpu, need_tlb_flush) */</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	/*</div><div class='add'>+	 * On POWER9, individual threads can come in here, but the</div><div class='add'>+	 * TLB is shared between the 4 threads in a core, hence</div><div class='add'>+	 * invalidating on one thread invalidates for all.</div><div class='add'>+	 * Thus we make all 4 threads use the same bit here.</div><div class='add'>+	 */</div><div class='add'>+	clrrdi	r6,r6,2</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)</div><div class='ctx'> 	clrldi	r7,r6,64-6		/* extract bit number (6 bits) */</div><div class='ctx'> 	srdi	r6,r6,6			/* doubleword number */</div><div class='ctx'> 	sldi	r6,r6,3			/* address offset */</div><div class='ctx'> 	add	r6,r6,r9</div><div class='ctx'> 	addi	r6,r6,KVM_NEED_FLUSH	/* dword in kvm-&gt;arch.need_tlb_flush */</div><div class='del'>-	li	r0,1</div><div class='del'>-	sld	r0,r0,r7</div><div class='add'>+	li	r8,1</div><div class='add'>+	sld	r8,r8,r7</div><div class='ctx'> 	ld	r7,0(r6)</div><div class='del'>-	and.	r7,r7,r0</div><div class='add'>+	and.	r7,r7,r8</div><div class='ctx'> 	beq	22f</div><div class='del'>-23:	ldarx	r7,0,r6			/* if set, clear the bit */</div><div class='del'>-	andc	r7,r7,r0</div><div class='del'>-	stdcx.	r7,0,r6</div><div class='del'>-	bne	23b</div><div class='ctx'> 	/* Flush the TLB of any entries for this LPID */</div><div class='del'>-	/* use arch 2.07S as a proxy for POWER8 */</div><div class='del'>-BEGIN_FTR_SECTION</div><div class='del'>-	li	r6,512			/* POWER8 has 512 sets */</div><div class='del'>-FTR_SECTION_ELSE</div><div class='del'>-	li	r6,128			/* POWER7 has 128 sets */</div><div class='del'>-ALT_FTR_SECTION_END_IFSET(CPU_FTR_ARCH_207S)</div><div class='del'>-	mtctr	r6</div><div class='add'>+	lwz	r0,KVM_TLB_SETS(r9)</div><div class='add'>+	mtctr	r0</div><div class='ctx'> 	li	r7,0x800		/* IS field = 0b10 */</div><div class='ctx'> 	ptesync</div><div class='del'>-28:	tlbiel	r7</div><div class='add'>+	li	r0,0			/* RS for P9 version of tlbiel */</div><div class='add'>+	bne	cr7, 29f</div><div class='add'>+28:	tlbiel	r7			/* On P9, rs=0, RIC=0, PRS=0, R=0 */</div><div class='ctx'> 	addi	r7,r7,0x1000</div><div class='ctx'> 	bdnz	28b</div><div class='del'>-	ptesync</div><div class='add'>+	b	30f</div><div class='add'>+29:	PPC_TLBIEL(7,0,2,1,1)		/* for radix, RIC=2, PRS=1, R=1 */</div><div class='add'>+	addi	r7,r7,0x1000</div><div class='add'>+	bdnz	29b</div><div class='add'>+30:	ptesync</div><div class='add'>+23:	ldarx	r7,0,r6			/* clear the bit after TLB flushed */</div><div class='add'>+	andc	r7,r7,r8</div><div class='add'>+	stdcx.	r7,0,r6</div><div class='add'>+	bne	23b</div><div class='ctx'> </div><div class='ctx'> 	/* Add timebase offset onto timebase */</div><div class='ctx'> 22:	ld	r8,VCORE_TB_OFFSET(r5)</div><div class='hunk'>@@ -664,7 +709,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	beq	kvmppc_primary_no_guest</div><div class='ctx'> kvmppc_got_guest:</div><div class='ctx'> </div><div class='del'>-	/* Load up guest SLB entries */</div><div class='add'>+	/* Load up guest SLB entries (N.B. slb_max will be 0 for radix) */</div><div class='ctx'> 	lwz	r5,VCPU_SLB_MAX(r4)</div><div class='ctx'> 	cmpwi	r5,0</div><div class='ctx'> 	beq	9f</div><div class='hunk'>@@ -698,6 +743,16 @@ kvmppc_got_guest:</div><div class='ctx'> 	mtspr	SPRN_PURR,r7</div><div class='ctx'> 	mtspr	SPRN_SPURR,r8</div><div class='ctx'> </div><div class='add'>+	/* Save host values of some registers */</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	mfspr	r5, SPRN_TIDR</div><div class='add'>+	mfspr	r6, SPRN_PSSCR</div><div class='add'>+	mfspr	r7, SPRN_PID</div><div class='add'>+	std	r5, STACK_SLOT_TID(r1)</div><div class='add'>+	std	r6, STACK_SLOT_PSSCR(r1)</div><div class='add'>+	std	r7, STACK_SLOT_PID(r1)</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)</div><div class='add'>+</div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='ctx'> 	/* Set partition DABR */</div><div class='ctx'> 	/* Do this before re-enabling PMU to avoid P7 DABR corruption bug */</div><div class='hunk'>@@ -750,14 +805,16 @@ END_FTR_SECTION_IFSET(CPU_FTR_PMAO_BUG)</div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='ctx'> 	ld	r5, VCPU_MMCR + 24(r4)</div><div class='ctx'> 	ld	r6, VCPU_SIER(r4)</div><div class='add'>+	mtspr	SPRN_MMCR2, r5</div><div class='add'>+	mtspr	SPRN_SIER, r6</div><div class='add'>+BEGIN_FTR_SECTION_NESTED(96)</div><div class='ctx'> 	lwz	r7, VCPU_PMC + 24(r4)</div><div class='ctx'> 	lwz	r8, VCPU_PMC + 28(r4)</div><div class='ctx'> 	ld	r9, VCPU_MMCR + 32(r4)</div><div class='del'>-	mtspr	SPRN_MMCR2, r5</div><div class='del'>-	mtspr	SPRN_SIER, r6</div><div class='ctx'> 	mtspr	SPRN_SPMC1, r7</div><div class='ctx'> 	mtspr	SPRN_SPMC2, r8</div><div class='ctx'> 	mtspr	SPRN_MMCRS, r9</div><div class='add'>+END_FTR_SECTION_NESTED(CPU_FTR_ARCH_300, 0, 96)</div><div class='ctx'> END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	mtspr	SPRN_MMCR0, r3</div><div class='ctx'> 	isync</div><div class='hunk'>@@ -813,20 +870,33 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	mtspr	SPRN_EBBHR, r8</div><div class='ctx'> 	ld	r5, VCPU_EBBRR(r4)</div><div class='ctx'> 	ld	r6, VCPU_BESCR(r4)</div><div class='del'>-	ld	r7, VCPU_CSIGR(r4)</div><div class='del'>-	ld	r8, VCPU_TACR(r4)</div><div class='add'>+	lwz	r7, VCPU_GUEST_PID(r4)</div><div class='add'>+	ld	r8, VCPU_WORT(r4)</div><div class='ctx'> 	mtspr	SPRN_EBBRR, r5</div><div class='ctx'> 	mtspr	SPRN_BESCR, r6</div><div class='del'>-	mtspr	SPRN_CSIGR, r7</div><div class='del'>-	mtspr	SPRN_TACR, r8</div><div class='add'>+	mtspr	SPRN_PID, r7</div><div class='add'>+	mtspr	SPRN_WORT, r8</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	PPC_INVALIDATE_ERAT</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_POWER9_DD1)</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	/* POWER8-only registers */</div><div class='ctx'> 	ld	r5, VCPU_TCSCR(r4)</div><div class='ctx'> 	ld	r6, VCPU_ACOP(r4)</div><div class='del'>-	lwz	r7, VCPU_GUEST_PID(r4)</div><div class='del'>-	ld	r8, VCPU_WORT(r4)</div><div class='add'>+	ld	r7, VCPU_CSIGR(r4)</div><div class='add'>+	ld	r8, VCPU_TACR(r4)</div><div class='ctx'> 	mtspr	SPRN_TCSCR, r5</div><div class='ctx'> 	mtspr	SPRN_ACOP, r6</div><div class='del'>-	mtspr	SPRN_PID, r7</div><div class='del'>-	mtspr	SPRN_WORT, r8</div><div class='add'>+	mtspr	SPRN_CSIGR, r7</div><div class='add'>+	mtspr	SPRN_TACR, r8</div><div class='add'>+FTR_SECTION_ELSE</div><div class='add'>+	/* POWER9-only registers */</div><div class='add'>+	ld	r5, VCPU_TID(r4)</div><div class='add'>+	ld	r6, VCPU_PSSCR(r4)</div><div class='add'>+	oris	r6, r6, PSSCR_EC@h	/* This makes stop trap to HV */</div><div class='add'>+	mtspr	SPRN_TIDR, r5</div><div class='add'>+	mtspr	SPRN_PSSCR, r6</div><div class='add'>+ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300)</div><div class='ctx'> 8:</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1043,13 +1113,13 @@ hdec_soon:</div><div class='ctx'> kvmppc_interrupt_hv:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Register contents:</div><div class='del'>-	 * R12		= interrupt vector</div><div class='add'>+	 * R12		= (guest CR &lt;&lt; 32) | interrupt vector</div><div class='ctx'> 	 * R13		= PACA</div><div class='del'>-	 * guest CR, R12 saved in shadow VCPU SCRATCH1/0</div><div class='add'>+	 * guest R12 saved in shadow VCPU SCRATCH0</div><div class='add'>+	 * guest CTR saved in shadow VCPU SCRATCH1 if RELOCATABLE</div><div class='ctx'> 	 * guest R13 saved in SPRN_SCRATCH0</div><div class='ctx'> 	 */</div><div class='ctx'> 	std	r9, HSTATE_SCRATCH2(r13)</div><div class='del'>-</div><div class='ctx'> 	lbz	r9, HSTATE_IN_GUEST(r13)</div><div class='ctx'> 	cmpwi	r9, KVM_GUEST_MODE_HOST_HV</div><div class='ctx'> 	beq	kvmppc_bad_host_intr</div><div class='hunk'>@@ -1080,8 +1150,9 @@ kvmppc_interrupt_hv:</div><div class='ctx'> 	std	r10, VCPU_GPR(R10)(r9)</div><div class='ctx'> 	std	r11, VCPU_GPR(R11)(r9)</div><div class='ctx'> 	ld	r3, HSTATE_SCRATCH0(r13)</div><div class='del'>-	lwz	r4, HSTATE_SCRATCH1(r13)</div><div class='ctx'> 	std	r3, VCPU_GPR(R12)(r9)</div><div class='add'>+	/* CR is in the high half of r12 */</div><div class='add'>+	srdi	r4, r12, 32</div><div class='ctx'> 	stw	r4, VCPU_CR(r9)</div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='ctx'> 	ld	r3, HSTATE_CFAR(r13)</div><div class='hunk'>@@ -1100,6 +1171,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)</div><div class='ctx'> 	mfspr	r11, SPRN_SRR1</div><div class='ctx'> 	std	r10, VCPU_SRR0(r9)</div><div class='ctx'> 	std	r11, VCPU_SRR1(r9)</div><div class='add'>+	/* trap is in the low half of r12, clear CR from the high half */</div><div class='add'>+	clrldi	r12, r12, 32</div><div class='ctx'> 	andi.	r0, r12, 2		/* need to read HSRR0/1? */</div><div class='ctx'> 	beq	1f</div><div class='ctx'> 	mfspr	r10, SPRN_HSRR0</div><div class='hunk'>@@ -1135,7 +1208,12 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)</div><div class='ctx'> 11:	stw	r3,VCPU_HEIR(r9)</div><div class='ctx'> </div><div class='ctx'> 	/* these are volatile across C function calls */</div><div class='add'>+#ifdef CONFIG_RELOCATABLE</div><div class='add'>+	ld	r3, HSTATE_SCRATCH1(r13)</div><div class='add'>+	mtctr	r3</div><div class='add'>+#else</div><div class='ctx'> 	mfctr	r3</div><div class='add'>+#endif</div><div class='ctx'> 	mfxer	r4</div><div class='ctx'> 	std	r3, VCPU_CTR(r9)</div><div class='ctx'> 	std	r4, VCPU_XER(r9)</div><div class='hunk'>@@ -1271,11 +1349,15 @@ mc_cont:</div><div class='ctx'> 	mtspr	SPRN_CTRLT,r6</div><div class='ctx'> 4:</div><div class='ctx'> 	/* Read the guest SLB and save it away */</div><div class='add'>+	ld	r5, VCPU_KVM(r9)</div><div class='add'>+	lbz	r0, KVM_RADIX(r5)</div><div class='add'>+	cmpwi	r0, 0</div><div class='add'>+	li	r5, 0</div><div class='add'>+	bne	3f			/* for radix, save 0 entries */</div><div class='ctx'> 	lwz	r0,VCPU_SLB_NR(r9)	/* number of entries in SLB */</div><div class='ctx'> 	mtctr	r0</div><div class='ctx'> 	li	r6,0</div><div class='ctx'> 	addi	r7,r9,VCPU_SLB</div><div class='del'>-	li	r5,0</div><div class='ctx'> 1:	slbmfee	r8,r6</div><div class='ctx'> 	andis.	r0,r8,SLB_ESID_V@h</div><div class='ctx'> 	beq	2f</div><div class='hunk'>@@ -1287,7 +1369,7 @@ mc_cont:</div><div class='ctx'> 	addi	r5,r5,1</div><div class='ctx'> 2:	addi	r6,r6,1</div><div class='ctx'> 	bdnz	1b</div><div class='del'>-	stw	r5,VCPU_SLB_MAX(r9)</div><div class='add'>+3:	stw	r5,VCPU_SLB_MAX(r9)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Save the guest PURR/SPURR</div><div class='hunk'>@@ -1341,20 +1423,29 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	std	r8, VCPU_EBBHR(r9)</div><div class='ctx'> 	mfspr	r5, SPRN_EBBRR</div><div class='ctx'> 	mfspr	r6, SPRN_BESCR</div><div class='del'>-	mfspr	r7, SPRN_CSIGR</div><div class='del'>-	mfspr	r8, SPRN_TACR</div><div class='add'>+	mfspr	r7, SPRN_PID</div><div class='add'>+	mfspr	r8, SPRN_WORT</div><div class='ctx'> 	std	r5, VCPU_EBBRR(r9)</div><div class='ctx'> 	std	r6, VCPU_BESCR(r9)</div><div class='del'>-	std	r7, VCPU_CSIGR(r9)</div><div class='del'>-	std	r8, VCPU_TACR(r9)</div><div class='add'>+	stw	r7, VCPU_GUEST_PID(r9)</div><div class='add'>+	std	r8, VCPU_WORT(r9)</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='ctx'> 	mfspr	r5, SPRN_TCSCR</div><div class='ctx'> 	mfspr	r6, SPRN_ACOP</div><div class='del'>-	mfspr	r7, SPRN_PID</div><div class='del'>-	mfspr	r8, SPRN_WORT</div><div class='add'>+	mfspr	r7, SPRN_CSIGR</div><div class='add'>+	mfspr	r8, SPRN_TACR</div><div class='ctx'> 	std	r5, VCPU_TCSCR(r9)</div><div class='ctx'> 	std	r6, VCPU_ACOP(r9)</div><div class='del'>-	stw	r7, VCPU_GUEST_PID(r9)</div><div class='del'>-	std	r8, VCPU_WORT(r9)</div><div class='add'>+	std	r7, VCPU_CSIGR(r9)</div><div class='add'>+	std	r8, VCPU_TACR(r9)</div><div class='add'>+FTR_SECTION_ELSE</div><div class='add'>+	mfspr	r5, SPRN_TIDR</div><div class='add'>+	mfspr	r6, SPRN_PSSCR</div><div class='add'>+	std	r5, VCPU_TID(r9)</div><div class='add'>+	rldicl	r6, r6, 4, 50		/* r6 &amp;= PSSCR_GUEST_VIS */</div><div class='add'>+	rotldi	r6, r6, 60</div><div class='add'>+	std	r6, VCPU_PSSCR(r9)</div><div class='add'>+ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Restore various registers to 0, where non-zero values</div><div class='ctx'> 	 * set by the guest could disrupt the host.</div><div class='hunk'>@@ -1363,12 +1454,14 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	mtspr	SPRN_IAMR, r0</div><div class='ctx'> 	mtspr	SPRN_CIABR, r0</div><div class='ctx'> 	mtspr	SPRN_DAWRX, r0</div><div class='del'>-	mtspr	SPRN_TCSCR, r0</div><div class='ctx'> 	mtspr	SPRN_WORT, r0</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	mtspr	SPRN_TCSCR, r0</div><div class='ctx'> 	/* Set MMCRS to 1&lt;&lt;31 to freeze and disable the SPMC counters */</div><div class='ctx'> 	li	r0, 1</div><div class='ctx'> 	sldi	r0, r0, 31</div><div class='ctx'> 	mtspr	SPRN_MMCRS, r0</div><div class='add'>+END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300)</div><div class='ctx'> 8:</div><div class='ctx'> </div><div class='ctx'> 	/* Save and reset AMR and UAMOR before turning on the MMU */</div><div class='hunk'>@@ -1502,15 +1595,17 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	stw	r8, VCPU_PMC + 20(r9)</div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='ctx'> 	mfspr	r5, SPRN_SIER</div><div class='add'>+	std	r5, VCPU_SIER(r9)</div><div class='add'>+BEGIN_FTR_SECTION_NESTED(96)</div><div class='ctx'> 	mfspr	r6, SPRN_SPMC1</div><div class='ctx'> 	mfspr	r7, SPRN_SPMC2</div><div class='ctx'> 	mfspr	r8, SPRN_MMCRS</div><div class='del'>-	std	r5, VCPU_SIER(r9)</div><div class='ctx'> 	stw	r6, VCPU_PMC + 24(r9)</div><div class='ctx'> 	stw	r7, VCPU_PMC + 28(r9)</div><div class='ctx'> 	std	r8, VCPU_MMCR + 32(r9)</div><div class='ctx'> 	lis	r4, 0x8000</div><div class='ctx'> 	mtspr	SPRN_MMCRS, r4</div><div class='add'>+END_FTR_SECTION_NESTED(CPU_FTR_ARCH_300, 0, 96)</div><div class='ctx'> END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'> 22:</div><div class='ctx'> 	/* Clear out SLB */</div><div class='hunk'>@@ -1519,6 +1614,19 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	slbia</div><div class='ctx'> 	ptesync</div><div class='ctx'> </div><div class='add'>+	/* Restore host values of some registers */</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	ld	r5, STACK_SLOT_TID(r1)</div><div class='add'>+	ld	r6, STACK_SLOT_PSSCR(r1)</div><div class='add'>+	ld	r7, STACK_SLOT_PID(r1)</div><div class='add'>+	mtspr	SPRN_TIDR, r5</div><div class='add'>+	mtspr	SPRN_PSSCR, r6</div><div class='add'>+	mtspr	SPRN_PID, r7</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	PPC_INVALIDATE_ERAT</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_POWER9_DD1)</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * POWER7/POWER8 guest -&gt; host partition switch code.</div><div class='ctx'> 	 * We don't have to lock against tlbies but we do</div><div class='hunk'>@@ -1552,12 +1660,14 @@ kvmhv_switch_to_host:</div><div class='ctx'> 	beq	19f</div><div class='ctx'> </div><div class='ctx'> 	/* Primary thread switches back to host partition */</div><div class='del'>-	ld	r6,KVM_HOST_SDR1(r4)</div><div class='ctx'> 	lwz	r7,KVM_HOST_LPID(r4)</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	ld	r6,KVM_HOST_SDR1(r4)</div><div class='ctx'> 	li	r8,LPID_RSVD		/* switch to reserved LPID */</div><div class='ctx'> 	mtspr	SPRN_LPID,r8</div><div class='ctx'> 	ptesync</div><div class='del'>-	mtspr	SPRN_SDR1,r6		/* switch to partition page table */</div><div class='add'>+	mtspr	SPRN_SDR1,r6		/* switch to host page table */</div><div class='add'>+END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300)</div><div class='ctx'> 	mtspr	SPRN_LPID,r7</div><div class='ctx'> 	isync</div><div class='ctx'> </div><div class='hunk'>@@ -1626,6 +1736,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	isync</div><div class='ctx'> </div><div class='ctx'> 	/* load host SLB entries */</div><div class='add'>+BEGIN_MMU_FTR_SECTION</div><div class='add'>+	b	0f</div><div class='add'>+END_MMU_FTR_SECTION_IFSET(MMU_FTR_TYPE_RADIX)</div><div class='ctx'> 	ld	r8,PACA_SLBSHADOWPTR(r13)</div><div class='ctx'> </div><div class='ctx'> 	.rept	SLB_NUM_BOLTED</div><div class='hunk'>@@ -1638,7 +1751,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	slbmte	r6,r5</div><div class='ctx'> 1:	addi	r8,r8,16</div><div class='ctx'> 	.endr</div><div class='del'>-</div><div class='add'>+0:</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_HV_EXIT_TIMING</div><div class='ctx'> 	/* Finish timing, if we have a vcpu */</div><div class='ctx'> 	ld	r4, HSTATE_KVM_VCPU(r13)</div><div class='hunk'>@@ -1665,13 +1778,21 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'>  * reflect the HDSI to the guest as a DSI.</div><div class='ctx'>  */</div><div class='ctx'> kvmppc_hdsi:</div><div class='add'>+	ld	r3, VCPU_KVM(r9)</div><div class='add'>+	lbz	r0, KVM_RADIX(r3)</div><div class='add'>+	cmpwi	r0, 0</div><div class='ctx'> 	mfspr	r4, SPRN_HDAR</div><div class='ctx'> 	mfspr	r6, SPRN_HDSISR</div><div class='add'>+	bne	.Lradix_hdsi		/* on radix, just save DAR/DSISR/ASDR */</div><div class='ctx'> 	/* HPTE not found fault or protection fault? */</div><div class='ctx'> 	andis.	r0, r6, (DSISR_NOHPTE | DSISR_PROTFAULT)@h</div><div class='ctx'> 	beq	1f			/* if not, send it to the guest */</div><div class='ctx'> 	andi.	r0, r11, MSR_DR		/* data relocation enabled? */</div><div class='ctx'> 	beq	3f</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	mfspr	r5, SPRN_ASDR		/* on POWER9, use ASDR to get VSID */</div><div class='add'>+	b	4f</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)</div><div class='ctx'> 	clrrdi	r0, r4, 28</div><div class='ctx'> 	PPC_SLBFEE_DOT(R5, R0)		/* if so, look up SLB */</div><div class='ctx'> 	li	r0, BOOK3S_INTERRUPT_DATA_SEGMENT</div><div class='hunk'>@@ -1739,15 +1860,31 @@ fast_interrupt_c_return:</div><div class='ctx'> 	stb	r0, HSTATE_IN_GUEST(r13)</div><div class='ctx'> 	b	guest_exit_cont</div><div class='ctx'> </div><div class='add'>+.Lradix_hdsi:</div><div class='add'>+	std	r4, VCPU_FAULT_DAR(r9)</div><div class='add'>+	stw	r6, VCPU_FAULT_DSISR(r9)</div><div class='add'>+.Lradix_hisi:</div><div class='add'>+	mfspr	r5, SPRN_ASDR</div><div class='add'>+	std	r5, VCPU_FAULT_GPA(r9)</div><div class='add'>+	b	guest_exit_cont</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Similarly for an HISI, reflect it to the guest as an ISI unless</div><div class='ctx'>  * it is an HPTE not found fault for a page that we have paged out.</div><div class='ctx'>  */</div><div class='ctx'> kvmppc_hisi:</div><div class='add'>+	ld	r3, VCPU_KVM(r9)</div><div class='add'>+	lbz	r0, KVM_RADIX(r3)</div><div class='add'>+	cmpwi	r0, 0</div><div class='add'>+	bne	.Lradix_hisi		/* for radix, just save ASDR */</div><div class='ctx'> 	andis.	r0, r11, SRR1_ISI_NOPT@h</div><div class='ctx'> 	beq	1f</div><div class='ctx'> 	andi.	r0, r11, MSR_IR		/* instruction relocation enabled? */</div><div class='ctx'> 	beq	3f</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	mfspr	r5, SPRN_ASDR		/* on POWER9, use ASDR to get VSID */</div><div class='add'>+	b	4f</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)</div><div class='ctx'> 	clrrdi	r0, r10, 28</div><div class='ctx'> 	PPC_SLBFEE_DOT(R5, R0)		/* if so, look up SLB */</div><div class='ctx'> 	li	r0, BOOK3S_INTERRUPT_INST_SEGMENT</div><div class='hunk'>@@ -2211,6 +2348,21 @@ BEGIN_FTR_SECTION</div><div class='ctx'> 	ori	r5, r5, LPCR_PECEDH</div><div class='ctx'> 	rlwimi	r5, r3, 0, LPCR_PECEDP</div><div class='ctx'> END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='add'>+</div><div class='add'>+kvm_nap_sequence:		/* desired LPCR value in r5 */</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	/*</div><div class='add'>+	 * PSSCR bits:	exit criterion = 1 (wakeup based on LPCR at sreset)</div><div class='add'>+	 *		enable state loss = 1 (allow SMT mode switch)</div><div class='add'>+	 *		requested level = 0 (just stop dispatching)</div><div class='add'>+	 */</div><div class='add'>+	lis	r3, (PSSCR_EC | PSSCR_ESL)@h</div><div class='add'>+	mtspr	SPRN_PSSCR, r3</div><div class='add'>+	/* Set LPCR_PECE_HVEE bit to enable wakeup by HV interrupts */</div><div class='add'>+	li	r4, LPCR_PECE_HVEE@higher</div><div class='add'>+	sldi	r4, r4, 32</div><div class='add'>+	or	r5, r5, r4</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)</div><div class='ctx'> 	mtspr	SPRN_LPCR,r5</div><div class='ctx'> 	isync</div><div class='ctx'> 	li	r0, 0</div><div class='hunk'>@@ -2219,7 +2371,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)</div><div class='ctx'> 	ld	r0, HSTATE_SCRATCH0(r13)</div><div class='ctx'> 1:	cmpd	r0, r0</div><div class='ctx'> 	bne	1b</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='ctx'> 	nap</div><div class='add'>+FTR_SECTION_ELSE</div><div class='add'>+	PPC_STOP</div><div class='add'>+ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300)</div><div class='ctx'> 	b	.</div><div class='ctx'> </div><div class='ctx'> 33:	mr	r4, r3</div><div class='hunk'>@@ -2600,11 +2756,13 @@ kvmppc_save_tm:</div><div class='ctx'> 	mfctr	r7</div><div class='ctx'> 	mfspr	r8, SPRN_AMR</div><div class='ctx'> 	mfspr	r10, SPRN_TAR</div><div class='add'>+	mfxer	r11</div><div class='ctx'> 	std	r5, VCPU_LR_TM(r9)</div><div class='ctx'> 	stw	r6, VCPU_CR_TM(r9)</div><div class='ctx'> 	std	r7, VCPU_CTR_TM(r9)</div><div class='ctx'> 	std	r8, VCPU_AMR_TM(r9)</div><div class='ctx'> 	std	r10, VCPU_TAR_TM(r9)</div><div class='add'>+	std	r11, VCPU_XER_TM(r9)</div><div class='ctx'> </div><div class='ctx'> 	/* Restore r12 as trap number. */</div><div class='ctx'> 	lwz	r12, VCPU_TRAP(r9)</div><div class='hunk'>@@ -2697,11 +2855,13 @@ kvmppc_restore_tm:</div><div class='ctx'> 	ld	r7, VCPU_CTR_TM(r4)</div><div class='ctx'> 	ld	r8, VCPU_AMR_TM(r4)</div><div class='ctx'> 	ld	r9, VCPU_TAR_TM(r4)</div><div class='add'>+	ld	r10, VCPU_XER_TM(r4)</div><div class='ctx'> 	mtlr	r5</div><div class='ctx'> 	mtcr	r6</div><div class='ctx'> 	mtctr	r7</div><div class='ctx'> 	mtspr	SPRN_AMR, r8</div><div class='ctx'> 	mtspr	SPRN_TAR, r9</div><div class='add'>+	mtxer	r10</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Load up PPR and DSCR values but don't put them in the actual SPRs</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_mmu_hpte.c b/arch/powerpc/kvm/book3s_mmu_hpte.c<br/>index 5a1ab1250a05..905a934c1ef4 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_mmu_hpte.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_mmu_hpte.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_mmu_hpte.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_mmu_hpte.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='ctx'> #include &lt;linux/hash.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/rculist.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/kvm_ppc.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_book3s.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c<br/>index 826c541a12af..d4dfc0ca2a44 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_pr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_pr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_pr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_pr.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_ppc.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_book3s.h&gt;</div><div class='hunk'>@@ -902,6 +902,69 @@ static void kvmppc_clear_debug(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvmppc_exit_pr_progint(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='add'>+				  unsigned int exit_nr)</div><div class='add'>+{</div><div class='add'>+	enum emulation_result er;</div><div class='add'>+	ulong flags;</div><div class='add'>+	u32 last_inst;</div><div class='add'>+	int emul, r;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * shadow_srr1 only contains valid flags if we came here via a program</div><div class='add'>+	 * exception. The other exceptions (emulation assist, FP unavailable,</div><div class='add'>+	 * etc.) do not provide flags in SRR1, so use an illegal-instruction</div><div class='add'>+	 * exception when injecting a program interrupt into the guest.</div><div class='add'>+	 */</div><div class='add'>+	if (exit_nr == BOOK3S_INTERRUPT_PROGRAM)</div><div class='add'>+		flags = vcpu-&gt;arch.shadow_srr1 &amp; 0x1f0000ull;</div><div class='add'>+	else</div><div class='add'>+		flags = SRR1_PROGILL;</div><div class='add'>+</div><div class='add'>+	emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &amp;last_inst);</div><div class='add'>+	if (emul != EMULATE_DONE)</div><div class='add'>+		return RESUME_GUEST;</div><div class='add'>+</div><div class='add'>+	if (kvmppc_get_msr(vcpu) &amp; MSR_PR) {</div><div class='add'>+#ifdef EXIT_DEBUG</div><div class='add'>+		pr_info("Userspace triggered 0x700 exception at\n 0x%lx (0x%x)\n",</div><div class='add'>+			kvmppc_get_pc(vcpu), last_inst);</div><div class='add'>+#endif</div><div class='add'>+		if ((last_inst &amp; 0xff0007ff) != (INS_DCBZ &amp; 0xfffffff7)) {</div><div class='add'>+			kvmppc_core_queue_program(vcpu, flags);</div><div class='add'>+			return RESUME_GUEST;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vcpu-&gt;stat.emulated_inst_exits++;</div><div class='add'>+	er = kvmppc_emulate_instruction(run, vcpu);</div><div class='add'>+	switch (er) {</div><div class='add'>+	case EMULATE_DONE:</div><div class='add'>+		r = RESUME_GUEST_NV;</div><div class='add'>+		break;</div><div class='add'>+	case EMULATE_AGAIN:</div><div class='add'>+		r = RESUME_GUEST;</div><div class='add'>+		break;</div><div class='add'>+	case EMULATE_FAIL:</div><div class='add'>+		pr_crit("%s: emulation at %lx failed (%08x)\n",</div><div class='add'>+			__func__, kvmppc_get_pc(vcpu), last_inst);</div><div class='add'>+		kvmppc_core_queue_program(vcpu, flags);</div><div class='add'>+		r = RESUME_GUEST;</div><div class='add'>+		break;</div><div class='add'>+	case EMULATE_DO_MMIO:</div><div class='add'>+		run-&gt;exit_reason = KVM_EXIT_MMIO;</div><div class='add'>+		r = RESUME_HOST_NV;</div><div class='add'>+		break;</div><div class='add'>+	case EMULATE_EXIT_USER:</div><div class='add'>+		r = RESUME_HOST_NV;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int kvmppc_handle_exit_pr(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='ctx'> 			  unsigned int exit_nr)</div><div class='ctx'> {</div><div class='hunk'>@@ -1044,71 +1107,8 @@ int kvmppc_handle_exit_pr(struct kvm_run *run, struct kvm_vcpu *vcpu,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BOOK3S_INTERRUPT_PROGRAM:</div><div class='ctx'> 	case BOOK3S_INTERRUPT_H_EMUL_ASSIST:</div><div class='del'>-	{</div><div class='del'>-		enum emulation_result er;</div><div class='del'>-		ulong flags;</div><div class='del'>-		u32 last_inst;</div><div class='del'>-		int emul;</div><div class='del'>-</div><div class='del'>-program_interrupt:</div><div class='del'>-		/*</div><div class='del'>-		 * shadow_srr1 only contains valid flags if we came here via</div><div class='del'>-		 * a program exception. The other exceptions (emulation assist,</div><div class='del'>-		 * FP unavailable, etc.) do not provide flags in SRR1, so use</div><div class='del'>-		 * an illegal-instruction exception when injecting a program</div><div class='del'>-		 * interrupt into the guest.</div><div class='del'>-		 */</div><div class='del'>-		if (exit_nr == BOOK3S_INTERRUPT_PROGRAM)</div><div class='del'>-			flags = vcpu-&gt;arch.shadow_srr1 &amp; 0x1f0000ull;</div><div class='del'>-		else</div><div class='del'>-			flags = SRR1_PROGILL;</div><div class='del'>-</div><div class='del'>-		emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &amp;last_inst);</div><div class='del'>-		if (emul != EMULATE_DONE) {</div><div class='del'>-			r = RESUME_GUEST;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (kvmppc_get_msr(vcpu) &amp; MSR_PR) {</div><div class='del'>-#ifdef EXIT_DEBUG</div><div class='del'>-			pr_info("Userspace triggered 0x700 exception at\n 0x%lx (0x%x)\n",</div><div class='del'>-				kvmppc_get_pc(vcpu), last_inst);</div><div class='del'>-#endif</div><div class='del'>-			if ((last_inst &amp; 0xff0007ff) !=</div><div class='del'>-			    (INS_DCBZ &amp; 0xfffffff7)) {</div><div class='del'>-				kvmppc_core_queue_program(vcpu, flags);</div><div class='del'>-				r = RESUME_GUEST;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		vcpu-&gt;stat.emulated_inst_exits++;</div><div class='del'>-		er = kvmppc_emulate_instruction(run, vcpu);</div><div class='del'>-		switch (er) {</div><div class='del'>-		case EMULATE_DONE:</div><div class='del'>-			r = RESUME_GUEST_NV;</div><div class='del'>-			break;</div><div class='del'>-		case EMULATE_AGAIN:</div><div class='del'>-			r = RESUME_GUEST;</div><div class='del'>-			break;</div><div class='del'>-		case EMULATE_FAIL:</div><div class='del'>-			printk(KERN_CRIT "%s: emulation at %lx failed (%08x)\n",</div><div class='del'>-			       __func__, kvmppc_get_pc(vcpu), last_inst);</div><div class='del'>-			kvmppc_core_queue_program(vcpu, flags);</div><div class='del'>-			r = RESUME_GUEST;</div><div class='del'>-			break;</div><div class='del'>-		case EMULATE_DO_MMIO:</div><div class='del'>-			run-&gt;exit_reason = KVM_EXIT_MMIO;</div><div class='del'>-			r = RESUME_HOST_NV;</div><div class='del'>-			break;</div><div class='del'>-		case EMULATE_EXIT_USER:</div><div class='del'>-			r = RESUME_HOST_NV;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='add'>+		r = kvmppc_exit_pr_progint(run, vcpu, exit_nr);</div><div class='ctx'> 		break;</div><div class='del'>-	}</div><div class='ctx'> 	case BOOK3S_INTERRUPT_SYSCALL:</div><div class='ctx'> 	{</div><div class='ctx'> 		u32 last_sc;</div><div class='hunk'>@@ -1185,7 +1185,7 @@ program_interrupt:</div><div class='ctx'> 			emul = kvmppc_get_last_inst(vcpu, INST_GENERIC,</div><div class='ctx'> 						    &amp;last_inst);</div><div class='ctx'> 			if (emul == EMULATE_DONE)</div><div class='del'>-				goto program_interrupt;</div><div class='add'>+				r = kvmppc_exit_pr_progint(run, vcpu, exit_nr);</div><div class='ctx'> 			else</div><div class='ctx'> 				r = RESUME_GUEST;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_pr_papr.c b/arch/powerpc/kvm/book3s_pr_papr.c<br/>index 02176fd52f84..f102616febc7 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_pr_papr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_pr_papr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_pr_papr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_pr_papr.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/anon_inodes.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_ppc.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_book3s.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_rtas.c b/arch/powerpc/kvm/book3s_rtas.c<br/>index ef27fbd5d9c5..20528701835b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_rtas.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_rtas.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_rtas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_rtas.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/kvm.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_book3s.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_ppc.h&gt;</div><div class='ctx'> #include &lt;asm/hvcall.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_segment.S b/arch/powerpc/kvm/book3s_segment.S<br/>index ca8f174289bb..2a2b96d53999 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_segment.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_segment.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_segment.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_segment.S</a></div><div class='hunk'>@@ -167,20 +167,38 @@ kvmppc_handler_trampoline_enter_end:</div><div class='ctx'>  *                                                                            *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-.global kvmppc_handler_trampoline_exit</div><div class='del'>-kvmppc_handler_trampoline_exit:</div><div class='del'>-</div><div class='ctx'> .global kvmppc_interrupt_pr</div><div class='ctx'> kvmppc_interrupt_pr:</div><div class='add'>+	/* 64-bit entry. Register usage at this point:</div><div class='add'>+	 *</div><div class='add'>+	 * SPRG_SCRATCH0   = guest R13</div><div class='add'>+	 * R12             = (guest CR &lt;&lt; 32) | exit handler id</div><div class='add'>+	 * R13             = PACA</div><div class='add'>+	 * HSTATE.SCRATCH0 = guest R12</div><div class='add'>+	 * HSTATE.SCRATCH1 = guest CTR if RELOCATABLE</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='add'>+	/* Match 32-bit entry */</div><div class='add'>+#ifdef CONFIG_RELOCATABLE</div><div class='add'>+	std	r9, HSTATE_SCRATCH2(r13)</div><div class='add'>+	ld	r9, HSTATE_SCRATCH1(r13)</div><div class='add'>+	mtctr	r9</div><div class='add'>+	ld	r9, HSTATE_SCRATCH2(r13)</div><div class='add'>+#endif</div><div class='add'>+	rotldi	r12, r12, 32		  /* Flip R12 halves for stw */</div><div class='add'>+	stw	r12, HSTATE_SCRATCH1(r13) /* CR is now in the low half */</div><div class='add'>+	srdi	r12, r12, 32		  /* shift trap into low half */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+.global kvmppc_handler_trampoline_exit</div><div class='add'>+kvmppc_handler_trampoline_exit:</div><div class='ctx'> 	/* Register usage at this point:</div><div class='ctx'> 	 *</div><div class='del'>-	 * SPRG_SCRATCH0  = guest R13</div><div class='del'>-	 * R12            = exit handler id</div><div class='del'>-	 * R13            = shadow vcpu (32-bit) or PACA (64-bit)</div><div class='add'>+	 * SPRG_SCRATCH0   = guest R13</div><div class='add'>+	 * R12             = exit handler id</div><div class='add'>+	 * R13             = shadow vcpu (32-bit) or PACA (64-bit)</div><div class='ctx'> 	 * HSTATE.SCRATCH0 = guest R12</div><div class='ctx'> 	 * HSTATE.SCRATCH1 = guest CR</div><div class='del'>-	 *</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* Save registers */</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c<br/>index 3bdc639157c1..e48803e2918d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_xics.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_xics.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_xics.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_xics.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/anon_inodes.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_book3s.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_ppc.h&gt;</div><div class='ctx'> #include &lt;asm/hvcall.h&gt;</div><div class='hunk'>@@ -63,7 +63,7 @@</div><div class='ctx'> /* -- ICS routines -- */</div><div class='ctx'> </div><div class='ctx'> static void icp_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='del'>-			    u32 new_irq);</div><div class='add'>+			    u32 new_irq, bool check_resend);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return value ideally indicates how the interrupt was handled, but no</div><div class='hunk'>@@ -75,6 +75,7 @@ static int ics_deliver_irq(struct kvmppc_xics *xics, u32 irq, u32 level)</div><div class='ctx'> 	struct ics_irq_state *state;</div><div class='ctx'> 	struct kvmppc_ics *ics;</div><div class='ctx'> 	u16 src;</div><div class='add'>+	u32 pq_old, pq_new;</div><div class='ctx'> </div><div class='ctx'> 	XICS_DBG("ics deliver %#x (level: %d)\n", irq, level);</div><div class='ctx'> </div><div class='hunk'>@@ -87,25 +88,41 @@ static int ics_deliver_irq(struct kvmppc_xics *xics, u32 irq, u32 level)</div><div class='ctx'> 	if (!state-&gt;exists)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (level == KVM_INTERRUPT_SET_LEVEL || level == KVM_INTERRUPT_SET)</div><div class='add'>+		level = 1;</div><div class='add'>+	else if (level == KVM_INTERRUPT_UNSET)</div><div class='add'>+		level = 0;</div><div class='ctx'> 	/*</div><div class='del'>-	 * We set state-&gt;asserted locklessly. This should be fine as</div><div class='del'>-	 * we are the only setter, thus concurrent access is undefined</div><div class='del'>-	 * to begin with.</div><div class='add'>+	 * Take other values the same as 1, consistent with original code.</div><div class='add'>+	 * maybe WARN here?</div><div class='ctx'> 	 */</div><div class='del'>-	if ((level == 1 &amp;&amp; state-&gt;lsi) || level == KVM_INTERRUPT_SET_LEVEL)</div><div class='del'>-		state-&gt;asserted = 1;</div><div class='del'>-	else if (level == 0 || level == KVM_INTERRUPT_UNSET) {</div><div class='del'>-		state-&gt;asserted = 0;</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;lsi &amp;&amp; level == 0) /* noop for MSI */</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		pq_old = state-&gt;pq_state;</div><div class='add'>+		if (state-&gt;lsi) {</div><div class='add'>+			if (level) {</div><div class='add'>+				if (pq_old &amp; PQ_PRESENTED)</div><div class='add'>+					/* Setting already set LSI ... */</div><div class='add'>+					return 0;</div><div class='add'>+</div><div class='add'>+				pq_new = PQ_PRESENTED;</div><div class='add'>+			} else</div><div class='add'>+				pq_new = 0;</div><div class='add'>+		} else</div><div class='add'>+			pq_new = ((pq_old &lt;&lt; 1) &amp; 3) | PQ_PRESENTED;</div><div class='add'>+	} while (cmpxchg(&amp;state-&gt;pq_state, pq_old, pq_new) != pq_old);</div><div class='add'>+</div><div class='add'>+	/* Test P=1, Q=0, this is the only case where we present */</div><div class='add'>+	if (pq_new == PQ_PRESENTED)</div><div class='add'>+		icp_deliver_irq(xics, NULL, irq, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Record which CPU this arrived on for passed-through interrupts */</div><div class='ctx'> 	if (state-&gt;host_irq)</div><div class='ctx'> 		state-&gt;intr_cpu = raw_smp_processor_id();</div><div class='ctx'> </div><div class='del'>-	/* Attempt delivery */</div><div class='del'>-	icp_deliver_irq(xics, NULL, irq);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -114,29 +131,14 @@ static void ics_check_resend(struct kvmppc_xics *xics, struct kvmppc_ics *ics,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	arch_spin_lock(&amp;ics-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; KVMPPC_XICS_IRQ_PER_ICS; i++) {</div><div class='ctx'> 		struct ics_irq_state *state = &amp;ics-&gt;irq_state[i];</div><div class='del'>-</div><div class='del'>-		if (!state-&gt;resend)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		XICS_DBG("resend %#x prio %#x\n", state-&gt;number,</div><div class='del'>-			      state-&gt;priority);</div><div class='del'>-</div><div class='del'>-		arch_spin_unlock(&amp;ics-&gt;lock);</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-		icp_deliver_irq(xics, icp, state-&gt;number);</div><div class='del'>-		local_irq_save(flags);</div><div class='del'>-		arch_spin_lock(&amp;ics-&gt;lock);</div><div class='add'>+		if (state-&gt;resend) {</div><div class='add'>+			XICS_DBG("resend %#x prio %#x\n", state-&gt;number,</div><div class='add'>+				      state-&gt;priority);</div><div class='add'>+			icp_deliver_irq(xics, icp, state-&gt;number, true);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	arch_spin_unlock(&amp;ics-&gt;lock);</div><div class='del'>-	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool write_xive(struct kvmppc_xics *xics, struct kvmppc_ics *ics,</div><div class='hunk'>@@ -155,6 +157,7 @@ static bool write_xive(struct kvmppc_xics *xics, struct kvmppc_ics *ics,</div><div class='ctx'> 	deliver = false;</div><div class='ctx'> 	if ((state-&gt;masked_pending || state-&gt;resend) &amp;&amp; priority != MASKED) {</div><div class='ctx'> 		state-&gt;masked_pending = 0;</div><div class='add'>+		state-&gt;resend = 0;</div><div class='ctx'> 		deliver = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -189,7 +192,7 @@ int kvmppc_xics_set_xive(struct kvm *kvm, u32 irq, u32 server, u32 priority)</div><div class='ctx'> 		 state-&gt;masked_pending, state-&gt;resend);</div><div class='ctx'> </div><div class='ctx'> 	if (write_xive(xics, ics, state, server, priority, priority))</div><div class='del'>-		icp_deliver_irq(xics, icp, irq);</div><div class='add'>+		icp_deliver_irq(xics, icp, irq, false);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -242,7 +245,7 @@ int kvmppc_xics_int_on(struct kvm *kvm, u32 irq)</div><div class='ctx'> </div><div class='ctx'> 	if (write_xive(xics, ics, state, state-&gt;server, state-&gt;saved_priority,</div><div class='ctx'> 		       state-&gt;saved_priority))</div><div class='del'>-		icp_deliver_irq(xics, icp, irq);</div><div class='add'>+		icp_deliver_irq(xics, icp, irq, false);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -376,7 +379,7 @@ static bool icp_try_to_deliver(struct kvmppc_icp *icp, u32 irq, u8 priority,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void icp_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='del'>-			    u32 new_irq)</div><div class='add'>+			    u32 new_irq, bool check_resend)</div><div class='ctx'> {</div><div class='ctx'> 	struct ics_irq_state *state;</div><div class='ctx'> 	struct kvmppc_ics *ics;</div><div class='hunk'>@@ -422,6 +425,10 @@ static void icp_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (check_resend)</div><div class='add'>+		if (!state-&gt;resend)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='ctx'> 	/* Clear the resend bit of that interrupt */</div><div class='ctx'> 	state-&gt;resend = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -470,6 +477,7 @@ static void icp_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='ctx'> 			arch_spin_unlock(&amp;ics-&gt;lock);</div><div class='ctx'> 			local_irq_restore(flags);</div><div class='ctx'> 			new_irq = reject;</div><div class='add'>+			check_resend = 0;</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -477,10 +485,16 @@ static void icp_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='ctx'> 		 * We failed to deliver the interrupt we need to set the</div><div class='ctx'> 		 * resend map bit and mark the ICS state as needing a resend</div><div class='ctx'> 		 */</div><div class='del'>-		set_bit(ics-&gt;icsid, icp-&gt;resend_map);</div><div class='ctx'> 		state-&gt;resend = 1;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='add'>+		 * Make sure when checking resend, we don't miss the resend</div><div class='add'>+		 * if resend_map bit is seen and cleared.</div><div class='add'>+		 */</div><div class='add'>+		smp_wmb();</div><div class='add'>+		set_bit(ics-&gt;icsid, icp-&gt;resend_map);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='ctx'> 		 * If the need_resend flag got cleared in the ICP some time</div><div class='ctx'> 		 * between icp_try_to_deliver() atomic update and now, then</div><div class='ctx'> 		 * we know it might have missed the resend_map bit. So we</div><div class='hunk'>@@ -488,8 +502,10 @@ static void icp_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,</div><div class='ctx'> 		 */</div><div class='ctx'> 		smp_mb();</div><div class='ctx'> 		if (!icp-&gt;state.need_resend) {</div><div class='add'>+			state-&gt;resend = 0;</div><div class='ctx'> 			arch_spin_unlock(&amp;ics-&gt;lock);</div><div class='ctx'> 			local_irq_restore(flags);</div><div class='add'>+			check_resend = 0;</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -681,7 +697,7 @@ static noinline int kvmppc_h_ipi(struct kvm_vcpu *vcpu, unsigned long server,</div><div class='ctx'> </div><div class='ctx'> 	/* Handle reject */</div><div class='ctx'> 	if (reject &amp;&amp; reject != XICS_IPI)</div><div class='del'>-		icp_deliver_irq(xics, icp, reject);</div><div class='add'>+		icp_deliver_irq(xics, icp, reject, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Handle resend */</div><div class='ctx'> 	if (resend)</div><div class='hunk'>@@ -761,17 +777,54 @@ static noinline void kvmppc_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr)</div><div class='ctx'> 	 * attempt (see comments in icp_deliver_irq).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (reject &amp;&amp; reject != XICS_IPI)</div><div class='del'>-		icp_deliver_irq(xics, icp, reject);</div><div class='add'>+		icp_deliver_irq(xics, icp, reject, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int kvmppc_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr)</div><div class='add'>+static int ics_eoi(struct kvm_vcpu *vcpu, u32 irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvmppc_xics *xics = vcpu-&gt;kvm-&gt;arch.xics;</div><div class='ctx'> 	struct kvmppc_icp *icp = vcpu-&gt;arch.icp;</div><div class='ctx'> 	struct kvmppc_ics *ics;</div><div class='ctx'> 	struct ics_irq_state *state;</div><div class='del'>-	u32 irq = xirr &amp; 0x00ffffff;</div><div class='ctx'> 	u16 src;</div><div class='add'>+	u32 pq_old, pq_new;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ICS EOI handling: For LSI, if P bit is still set, we need to</div><div class='add'>+	 * resend it.</div><div class='add'>+	 *</div><div class='add'>+	 * For MSI, we move Q bit into P (and clear Q). If it is set,</div><div class='add'>+	 * resend it.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ics = kvmppc_xics_find_ics(xics, irq, &amp;src);</div><div class='add'>+	if (!ics) {</div><div class='add'>+		XICS_DBG("ios_eoi: IRQ 0x%06x not found !\n", irq);</div><div class='add'>+		return H_PARAMETER;</div><div class='add'>+	}</div><div class='add'>+	state = &amp;ics-&gt;irq_state[src];</div><div class='add'>+</div><div class='add'>+	if (state-&gt;lsi)</div><div class='add'>+		pq_new = state-&gt;pq_state;</div><div class='add'>+	else</div><div class='add'>+		do {</div><div class='add'>+			pq_old = state-&gt;pq_state;</div><div class='add'>+			pq_new = pq_old &gt;&gt; 1;</div><div class='add'>+		} while (cmpxchg(&amp;state-&gt;pq_state, pq_old, pq_new) != pq_old);</div><div class='add'>+</div><div class='add'>+	if (pq_new &amp; PQ_PRESENTED)</div><div class='add'>+		icp_deliver_irq(xics, icp, irq, false);</div><div class='add'>+</div><div class='add'>+	kvm_notify_acked_irq(vcpu-&gt;kvm, 0, irq);</div><div class='add'>+</div><div class='add'>+	return H_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline int kvmppc_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr)</div><div class='add'>+{</div><div class='add'>+	struct kvmppc_xics *xics = vcpu-&gt;kvm-&gt;arch.xics;</div><div class='add'>+	struct kvmppc_icp *icp = vcpu-&gt;arch.icp;</div><div class='add'>+	u32 irq = xirr &amp; 0x00ffffff;</div><div class='ctx'> </div><div class='ctx'> 	XICS_DBG("h_eoi vcpu %d eoi %#lx\n", vcpu-&gt;vcpu_id, xirr);</div><div class='ctx'> </div><div class='hunk'>@@ -794,26 +847,8 @@ static noinline int kvmppc_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr)</div><div class='ctx'> 	/* IPIs have no EOI */</div><div class='ctx'> 	if (irq == XICS_IPI)</div><div class='ctx'> 		return H_SUCCESS;</div><div class='del'>-	/*</div><div class='del'>-	 * EOI handling: If the interrupt is still asserted, we need to</div><div class='del'>-	 * resend it. We can take a lockless "peek" at the ICS state here.</div><div class='del'>-	 *</div><div class='del'>-	 * "Message" interrupts will never have "asserted" set</div><div class='del'>-	 */</div><div class='del'>-	ics = kvmppc_xics_find_ics(xics, irq, &amp;src);</div><div class='del'>-	if (!ics) {</div><div class='del'>-		XICS_DBG("h_eoi: IRQ 0x%06x not found !\n", irq);</div><div class='del'>-		return H_PARAMETER;</div><div class='del'>-	}</div><div class='del'>-	state = &amp;ics-&gt;irq_state[src];</div><div class='ctx'> </div><div class='del'>-	/* Still asserted, resend it */</div><div class='del'>-	if (state-&gt;asserted)</div><div class='del'>-		icp_deliver_irq(xics, icp, irq);</div><div class='del'>-</div><div class='del'>-	kvm_notify_acked_irq(vcpu-&gt;kvm, 0, irq);</div><div class='del'>-</div><div class='del'>-	return H_SUCCESS;</div><div class='add'>+	return ics_eoi(vcpu, irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int kvmppc_xics_rm_complete(struct kvm_vcpu *vcpu, u32 hcall)</div><div class='hunk'>@@ -832,10 +867,6 @@ int kvmppc_xics_rm_complete(struct kvm_vcpu *vcpu, u32 hcall)</div><div class='ctx'> 		icp-&gt;n_rm_check_resend++;</div><div class='ctx'> 		icp_check_resend(xics, icp-&gt;rm_resend_icp);</div><div class='ctx'> 	}</div><div class='del'>-	if (icp-&gt;rm_action &amp; XICS_RM_REJECT) {</div><div class='del'>-		icp-&gt;n_rm_reject++;</div><div class='del'>-		icp_deliver_irq(xics, icp, icp-&gt;rm_reject);</div><div class='del'>-	}</div><div class='ctx'> 	if (icp-&gt;rm_action &amp; XICS_RM_NOTIFY_EOI) {</div><div class='ctx'> 		icp-&gt;n_rm_notify_eoi++;</div><div class='ctx'> 		kvm_notify_acked_irq(vcpu-&gt;kvm, 0, icp-&gt;rm_eoied_irq);</div><div class='hunk'>@@ -920,7 +951,7 @@ static int xics_debug_show(struct seq_file *m, void *private)</div><div class='ctx'> 	int icsid, i;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned long t_rm_kick_vcpu, t_rm_check_resend;</div><div class='del'>-	unsigned long t_rm_reject, t_rm_notify_eoi;</div><div class='add'>+	unsigned long t_rm_notify_eoi;</div><div class='ctx'> 	unsigned long t_reject, t_check_resend;</div><div class='ctx'> </div><div class='ctx'> 	if (!kvm)</div><div class='hunk'>@@ -929,7 +960,6 @@ static int xics_debug_show(struct seq_file *m, void *private)</div><div class='ctx'> 	t_rm_kick_vcpu = 0;</div><div class='ctx'> 	t_rm_notify_eoi = 0;</div><div class='ctx'> 	t_rm_check_resend = 0;</div><div class='del'>-	t_rm_reject = 0;</div><div class='ctx'> 	t_check_resend = 0;</div><div class='ctx'> 	t_reject = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -952,14 +982,13 @@ static int xics_debug_show(struct seq_file *m, void *private)</div><div class='ctx'> 		t_rm_kick_vcpu += icp-&gt;n_rm_kick_vcpu;</div><div class='ctx'> 		t_rm_notify_eoi += icp-&gt;n_rm_notify_eoi;</div><div class='ctx'> 		t_rm_check_resend += icp-&gt;n_rm_check_resend;</div><div class='del'>-		t_rm_reject += icp-&gt;n_rm_reject;</div><div class='ctx'> 		t_check_resend += icp-&gt;n_check_resend;</div><div class='ctx'> 		t_reject += icp-&gt;n_reject;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	seq_printf(m, "ICP Guest-&gt;Host totals: kick_vcpu=%lu check_resend=%lu reject=%lu notify_eoi=%lu\n",</div><div class='add'>+	seq_printf(m, "ICP Guest-&gt;Host totals: kick_vcpu=%lu check_resend=%lu notify_eoi=%lu\n",</div><div class='ctx'> 			t_rm_kick_vcpu, t_rm_check_resend,</div><div class='del'>-			t_rm_reject, t_rm_notify_eoi);</div><div class='add'>+			t_rm_notify_eoi);</div><div class='ctx'> 	seq_printf(m, "ICP Real Mode totals: check_resend=%lu resend=%lu\n",</div><div class='ctx'> 			t_check_resend, t_reject);</div><div class='ctx'> 	for (icsid = 0; icsid &lt;= KVMPPC_XICS_MAX_ICS_ID; icsid++) {</div><div class='hunk'>@@ -977,9 +1006,9 @@ static int xics_debug_show(struct seq_file *m, void *private)</div><div class='ctx'> 		for (i = 0; i &lt; KVMPPC_XICS_IRQ_PER_ICS; i++) {</div><div class='ctx'> 			struct ics_irq_state *irq = &amp;ics-&gt;irq_state[i];</div><div class='ctx'> </div><div class='del'>-			seq_printf(m, "irq 0x%06x: server %#x prio %#x save prio %#x asserted %d resend %d masked pending %d\n",</div><div class='add'>+			seq_printf(m, "irq 0x%06x: server %#x prio %#x save prio %#x pq_state %d resend %d masked pending %d\n",</div><div class='ctx'> 				   irq-&gt;number, irq-&gt;server, irq-&gt;priority,</div><div class='del'>-				   irq-&gt;saved_priority, irq-&gt;asserted,</div><div class='add'>+				   irq-&gt;saved_priority, irq-&gt;pq_state,</div><div class='ctx'> 				   irq-&gt;resend, irq-&gt;masked_pending);</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='hunk'>@@ -1198,10 +1227,17 @@ static int xics_get_source(struct kvmppc_xics *xics, long irq, u64 addr)</div><div class='ctx'> 		val |= prio &lt;&lt; KVM_XICS_PRIORITY_SHIFT;</div><div class='ctx'> 		if (irqp-&gt;lsi) {</div><div class='ctx'> 			val |= KVM_XICS_LEVEL_SENSITIVE;</div><div class='del'>-			if (irqp-&gt;asserted)</div><div class='add'>+			if (irqp-&gt;pq_state &amp; PQ_PRESENTED)</div><div class='ctx'> 				val |= KVM_XICS_PENDING;</div><div class='ctx'> 		} else if (irqp-&gt;masked_pending || irqp-&gt;resend)</div><div class='ctx'> 			val |= KVM_XICS_PENDING;</div><div class='add'>+</div><div class='add'>+		if (irqp-&gt;pq_state &amp; PQ_PRESENTED)</div><div class='add'>+			val |= KVM_XICS_PRESENTED;</div><div class='add'>+</div><div class='add'>+		if (irqp-&gt;pq_state &amp; PQ_QUEUED)</div><div class='add'>+			val |= KVM_XICS_QUEUED;</div><div class='add'>+</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	arch_spin_unlock(&amp;ics-&gt;lock);</div><div class='hunk'>@@ -1253,18 +1289,20 @@ static int xics_set_source(struct kvmppc_xics *xics, long irq, u64 addr)</div><div class='ctx'> 	irqp-&gt;resend = 0;</div><div class='ctx'> 	irqp-&gt;masked_pending = 0;</div><div class='ctx'> 	irqp-&gt;lsi = 0;</div><div class='del'>-	irqp-&gt;asserted = 0;</div><div class='del'>-	if (val &amp; KVM_XICS_LEVEL_SENSITIVE) {</div><div class='add'>+	irqp-&gt;pq_state = 0;</div><div class='add'>+	if (val &amp; KVM_XICS_LEVEL_SENSITIVE)</div><div class='ctx'> 		irqp-&gt;lsi = 1;</div><div class='del'>-		if (val &amp; KVM_XICS_PENDING)</div><div class='del'>-			irqp-&gt;asserted = 1;</div><div class='del'>-	}</div><div class='add'>+	/* If PENDING, set P in case P is not saved because of old code */</div><div class='add'>+	if (val &amp; KVM_XICS_PRESENTED || val &amp; KVM_XICS_PENDING)</div><div class='add'>+		irqp-&gt;pq_state |= PQ_PRESENTED;</div><div class='add'>+	if (val &amp; KVM_XICS_QUEUED)</div><div class='add'>+		irqp-&gt;pq_state |= PQ_QUEUED;</div><div class='ctx'> 	irqp-&gt;exists = 1;</div><div class='ctx'> 	arch_spin_unlock(&amp;ics-&gt;lock);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 	if (val &amp; KVM_XICS_PENDING)</div><div class='del'>-		icp_deliver_irq(xics, NULL, irqp-&gt;number);</div><div class='add'>+		icp_deliver_irq(xics, NULL, irqp-&gt;number, false);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_xics.h b/arch/powerpc/kvm/book3s_xics.h<br/>index 2a50320b55ca..ec5474cf70c6 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_xics.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/book3s_xics.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/book3s_xics.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/book3s_xics.h</a></div><div class='hunk'>@@ -31,16 +31,19 @@</div><div class='ctx'> /* Priority value to use for disabling an interrupt */</div><div class='ctx'> #define MASKED	0xff</div><div class='ctx'> </div><div class='add'>+#define PQ_PRESENTED	1</div><div class='add'>+#define PQ_QUEUED	2</div><div class='add'>+</div><div class='ctx'> /* State for one irq source */</div><div class='ctx'> struct ics_irq_state {</div><div class='ctx'> 	u32 number;</div><div class='ctx'> 	u32 server;</div><div class='add'>+	u32 pq_state;</div><div class='ctx'> 	u8  priority;</div><div class='ctx'> 	u8  saved_priority;</div><div class='ctx'> 	u8  resend;</div><div class='ctx'> 	u8  masked_pending;</div><div class='ctx'> 	u8  lsi;		/* level-sensitive interrupt */</div><div class='del'>-	u8  asserted; /* Only for LSI */</div><div class='ctx'> 	u8  exists;</div><div class='ctx'> 	int intr_cpu;</div><div class='ctx'> 	u32 host_irq;</div><div class='hunk'>@@ -73,7 +76,6 @@ struct kvmppc_icp {</div><div class='ctx'> 	 */</div><div class='ctx'> #define XICS_RM_KICK_VCPU	0x1</div><div class='ctx'> #define XICS_RM_CHECK_RESEND	0x2</div><div class='del'>-#define XICS_RM_REJECT		0x4</div><div class='ctx'> #define XICS_RM_NOTIFY_EOI	0x8</div><div class='ctx'> 	u32 rm_action;</div><div class='ctx'> 	struct kvm_vcpu *rm_kick_target;</div><div class='hunk'>@@ -84,7 +86,6 @@ struct kvmppc_icp {</div><div class='ctx'> 	/* Counters for each reason we exited real mode */</div><div class='ctx'> 	unsigned long n_rm_kick_vcpu;</div><div class='ctx'> 	unsigned long n_rm_check_resend;</div><div class='del'>-	unsigned long n_rm_reject;</div><div class='ctx'> 	unsigned long n_rm_notify_eoi;</div><div class='ctx'> 	/* Counters for handling ICP processing in real mode */</div><div class='ctx'> 	unsigned long n_check_resend;</div><div class='head'>diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c<br/>index df3f2706d3e5..0514cbd4e533 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/booke.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/booke.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/booke.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/booke.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_ppc.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/dbell.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c<br/>index b0333cc737dd..0fda4230f6c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/e500_mmu_host.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/e500_mmu_host.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/e500_mmu_host.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/e500_mmu_host.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c<br/>index ed38f8114118..fe312c160d97 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/mpic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/mpic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/mpic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/mpic.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/anon_inodes.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mpic.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_para.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_host.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c<br/>index 70963c845e96..95c91a9de351 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/powerpc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/powerpc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/powerpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/powerpc.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='hunk'>@@ -30,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/irqbypass.h&gt;</div><div class='ctx'> #include &lt;linux/kvm_irqfd.h&gt;</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_ppc.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/cputhreads.h&gt;</div><div class='hunk'>@@ -511,6 +512,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> 	case KVM_CAP_ONE_REG:</div><div class='ctx'> 	case KVM_CAP_IOEVENTFD:</div><div class='ctx'> 	case KVM_CAP_DEVICE_CTRL:</div><div class='add'>+	case KVM_CAP_IMMEDIATE_EXIT:</div><div class='ctx'> 		r = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KVM_CAP_PPC_PAIRED_SINGLES:</div><div class='hunk'>@@ -536,7 +538,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3S_64</div><div class='ctx'> 	case KVM_CAP_SPAPR_TCE:</div><div class='ctx'> 	case KVM_CAP_SPAPR_TCE_64:</div><div class='del'>-	case KVM_CAP_PPC_ALLOC_HTAB:</div><div class='ctx'> 	case KVM_CAP_PPC_RTAS:</div><div class='ctx'> 	case KVM_CAP_PPC_FIXUP_HCALL:</div><div class='ctx'> 	case KVM_CAP_PPC_ENABLE_HCALL:</div><div class='hunk'>@@ -545,13 +546,20 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> #endif</div><div class='ctx'> 		r = 1;</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	case KVM_CAP_PPC_ALLOC_HTAB:</div><div class='add'>+		r = hv_enabled;</div><div class='add'>+		break;</div><div class='ctx'> #endif /* CONFIG_PPC_BOOK3S_64 */</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE</div><div class='ctx'> 	case KVM_CAP_PPC_SMT:</div><div class='del'>-		if (hv_enabled)</div><div class='del'>-			r = threads_per_subcore;</div><div class='del'>-		else</div><div class='del'>-			r = 0;</div><div class='add'>+		r = 0;</div><div class='add'>+		if (hv_enabled) {</div><div class='add'>+			if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+				r = 1;</div><div class='add'>+			else</div><div class='add'>+				r = threads_per_subcore;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KVM_CAP_PPC_RMA:</div><div class='ctx'> 		r = 0;</div><div class='hunk'>@@ -559,6 +567,13 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> 	case KVM_CAP_PPC_HWRNG:</div><div class='ctx'> 		r = kvmppc_hwrng_present();</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_CAP_PPC_MMU_RADIX:</div><div class='add'>+		r = !!(hv_enabled &amp;&amp; radix_enabled());</div><div class='add'>+		break;</div><div class='add'>+	case KVM_CAP_PPC_MMU_HASH_V3:</div><div class='add'>+		r = !!(hv_enabled &amp;&amp; !radix_enabled() &amp;&amp;</div><div class='add'>+		       cpu_has_feature(CPU_FTR_ARCH_300));</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='ctx'> 	case KVM_CAP_SYNC_MMU:</div><div class='ctx'> #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE</div><div class='hunk'>@@ -599,6 +614,10 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> 	case KVM_CAP_SPAPR_MULTITCE:</div><div class='ctx'> 		r = 1;</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_CAP_SPAPR_RESIZE_HPT:</div><div class='add'>+		/* Disable this on POWER9 until code handles new HPTE format */</div><div class='add'>+		r = !!hv_enabled &amp;&amp; !cpu_has_feature(CPU_FTR_ARCH_300);</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='ctx'> 	case KVM_CAP_PPC_HTM:</div><div class='ctx'> 		r = cpu_has_feature(CPU_FTR_TM_COMP) &amp;&amp;</div><div class='hunk'>@@ -1101,7 +1120,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = kvmppc_vcpu_run(run, vcpu);</div><div class='add'>+	if (run-&gt;immediate_exit)</div><div class='add'>+		r = -EINTR;</div><div class='add'>+	else</div><div class='add'>+		r = kvmppc_vcpu_run(run, vcpu);</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;sigset_active)</div><div class='ctx'> 		sigprocmask(SIG_SETMASK, &amp;sigsaved, NULL);</div><div class='hunk'>@@ -1462,6 +1484,31 @@ long kvm_arch_vm_ioctl(struct file *filp,</div><div class='ctx'> 		r = kvm_vm_ioctl_rtas_define_token(kvm, argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case KVM_PPC_CONFIGURE_V3_MMU: {</div><div class='add'>+		struct kvm *kvm = filp-&gt;private_data;</div><div class='add'>+		struct kvm_ppc_mmuv3_cfg cfg;</div><div class='add'>+</div><div class='add'>+		r = -EINVAL;</div><div class='add'>+		if (!kvm-&gt;arch.kvm_ops-&gt;configure_mmu)</div><div class='add'>+			goto out;</div><div class='add'>+		r = -EFAULT;</div><div class='add'>+		if (copy_from_user(&amp;cfg, argp, sizeof(cfg)))</div><div class='add'>+			goto out;</div><div class='add'>+		r = kvm-&gt;arch.kvm_ops-&gt;configure_mmu(kvm, &amp;cfg);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case KVM_PPC_GET_RMMU_INFO: {</div><div class='add'>+		struct kvm *kvm = filp-&gt;private_data;</div><div class='add'>+		struct kvm_ppc_rmmu_info info;</div><div class='add'>+</div><div class='add'>+		r = -EINVAL;</div><div class='add'>+		if (!kvm-&gt;arch.kvm_ops-&gt;get_rmmu_info)</div><div class='add'>+			goto out;</div><div class='add'>+		r = kvm-&gt;arch.kvm_ops-&gt;get_rmmu_info(kvm, &amp;info);</div><div class='add'>+		if (r &gt;= 0 &amp;&amp; copy_to_user(argp, &amp;info, sizeof(info)))</div><div class='add'>+			r = -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	default: {</div><div class='ctx'> 		struct kvm *kvm = filp-&gt;private_data;</div><div class='ctx'> 		r = kvm-&gt;arch.kvm_ops-&gt;arch_vm_ioctl(filp, ioctl, arg);</div><div class='head'>diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h<br/>index fb21990c0fb4..ebc6dd449556 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kvm/trace_hv.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kvm/trace_hv.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/kvm/trace_hv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/kvm/trace_hv.h</a></div><div class='hunk'>@@ -449,7 +449,7 @@ TRACE_EVENT(kvmppc_vcore_wakeup,</div><div class='ctx'> 		__entry-&gt;tgid   = current-&gt;tgid;</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='del'>-	TP_printk("%s time %lld ns, tgid=%d",</div><div class='add'>+	TP_printk("%s time %llu ns, tgid=%d",</div><div class='ctx'> 		__entry-&gt;waited ? "wait" : "poll",</div><div class='ctx'> 		__entry-&gt;ns, __entry-&gt;tgid)</div><div class='ctx'> );</div><div class='head'>diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile<br/>index 309361e86523..0e649d72fe8d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/Makefile</a></div><div class='hunk'>@@ -21,9 +21,7 @@ obj64-y	+= copypage_64.o copyuser_64.o usercopy_64.o mem_64.o hweight_64.o \</div><div class='ctx'> obj64-$(CONFIG_SMP)	+= locks.o</div><div class='ctx'> obj64-$(CONFIG_ALTIVEC)	+= vmx-helper.o</div><div class='ctx'> </div><div class='del'>-ifeq ($(CONFIG_GENERIC_CSUM),)</div><div class='ctx'> obj-y			+= checksum_$(BITS).o checksum_wrappers.o</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PPC_EMULATE_SSTEP)	+= sstep.o ldstfp.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/lib/checksum_32.S b/arch/powerpc/lib/checksum_32.S<br/>index ea29a5d67743..9a671c774b22 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/checksum_32.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/checksum_32.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/checksum_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/checksum_32.S</a></div><div class='hunk'>@@ -103,17 +103,14 @@ EXPORT_SYMBOL(__csum_partial)</div><div class='ctx'> 	adde	r12,r12,r10</div><div class='ctx'> </div><div class='ctx'> #define CSUM_COPY_16_BYTES_EXCODE(n)		\</div><div class='del'>-.section __ex_table,"a";		\</div><div class='del'>-	.align	2;			\</div><div class='del'>-	.long	8 ## n ## 0b,src_error;	\</div><div class='del'>-	.long	8 ## n ## 1b,src_error;	\</div><div class='del'>-	.long	8 ## n ## 2b,src_error;	\</div><div class='del'>-	.long	8 ## n ## 3b,src_error;	\</div><div class='del'>-	.long	8 ## n ## 4b,dst_error;	\</div><div class='del'>-	.long	8 ## n ## 5b,dst_error;	\</div><div class='del'>-	.long	8 ## n ## 6b,dst_error;	\</div><div class='del'>-	.long	8 ## n ## 7b,dst_error;	\</div><div class='del'>-	.text</div><div class='add'>+	EX_TABLE(8 ## n ## 0b, src_error);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 1b, src_error);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 2b, src_error);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 3b, src_error);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 4b, dst_error);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 5b, dst_error);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 6b, dst_error);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 7b, dst_error);</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> 	.stabs	"arch/powerpc/lib/",N_SO,0,0,0f</div><div class='hunk'>@@ -263,14 +260,11 @@ dst_error:</div><div class='ctx'> 	stw	r0,0(r8)</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align	2</div><div class='del'>-	.long	70b,src_error</div><div class='del'>-	.long	71b,dst_error</div><div class='del'>-	.long	72b,src_error</div><div class='del'>-	.long	73b,dst_error</div><div class='del'>-	.long	54b,dst_error</div><div class='del'>-	.text</div><div class='add'>+	EX_TABLE(70b, src_error);</div><div class='add'>+	EX_TABLE(71b, dst_error);</div><div class='add'>+	EX_TABLE(72b, src_error);</div><div class='add'>+	EX_TABLE(73b, dst_error);</div><div class='add'>+	EX_TABLE(54b, dst_error);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * this stuff handles faults in the cacheline loop and branches to either</div><div class='hunk'>@@ -291,12 +285,11 @@ dst_error:</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align	2</div><div class='del'>-	.long	30b,src_error</div><div class='del'>-	.long	31b,dst_error</div><div class='del'>-	.long	40b,src_error</div><div class='del'>-	.long	41b,dst_error</div><div class='del'>-	.long	50b,src_error</div><div class='del'>-	.long	51b,dst_error</div><div class='add'>+	EX_TABLE(30b, src_error);</div><div class='add'>+	EX_TABLE(31b, dst_error);</div><div class='add'>+	EX_TABLE(40b, src_error);</div><div class='add'>+	EX_TABLE(41b, dst_error);</div><div class='add'>+	EX_TABLE(50b, src_error);</div><div class='add'>+	EX_TABLE(51b, dst_error);</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL(csum_partial_copy_generic)</div><div class='head'>diff --git a/arch/powerpc/lib/checksum_64.S b/arch/powerpc/lib/checksum_64.S<br/>index fd9176671f9f..d7f1a966136e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/checksum_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/checksum_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/checksum_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/checksum_64.S</a></div><div class='hunk'>@@ -36,7 +36,7 @@ _GLOBAL(__csum_partial)</div><div class='ctx'> 	 * work to calculate the correct checksum, we ignore that case</div><div class='ctx'> 	 * and take the potential slowdown of unaligned loads.</div><div class='ctx'> 	 */</div><div class='del'>-	rldicl. r6,r3,64-1,64-2		/* r6 = (r3 &amp; 0x3) &gt;&gt; 1 */</div><div class='add'>+	rldicl. r6,r3,64-1,64-2		/* r6 = (r3 &gt;&gt; 1) &amp; 0x3 */</div><div class='ctx'> 	beq	.Lcsum_aligned</div><div class='ctx'> </div><div class='ctx'> 	li	r7,4</div><div class='hunk'>@@ -168,8 +168,12 @@ _GLOBAL(__csum_partial)</div><div class='ctx'> 	beq	.Lcsum_finish</div><div class='ctx'> </div><div class='ctx'> 	lbz	r6,0(r3)</div><div class='add'>+#ifdef __BIG_ENDIAN__</div><div class='ctx'> 	sldi	r9,r6,8			/* Pad the byte out to 16 bits */</div><div class='ctx'> 	adde	r0,r0,r9</div><div class='add'>+#else</div><div class='add'>+	adde	r0,r0,r6</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> .Lcsum_finish:</div><div class='ctx'> 	addze	r0,r0			/* add in final carry */</div><div class='hunk'>@@ -182,34 +186,22 @@ EXPORT_SYMBOL(__csum_partial)</div><div class='ctx'> </div><div class='ctx'> 	.macro srcnr</div><div class='ctx'> 100:</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align 3</div><div class='del'>-	.llong 100b,.Lsrc_error_nr</div><div class='del'>-	.previous</div><div class='add'>+	EX_TABLE(100b,.Lsrc_error_nr)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro source</div><div class='ctx'> 150:</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align 3</div><div class='del'>-	.llong 150b,.Lsrc_error</div><div class='del'>-	.previous</div><div class='add'>+	EX_TABLE(150b,.Lsrc_error)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro dstnr</div><div class='ctx'> 200:</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align 3</div><div class='del'>-	.llong 200b,.Ldest_error_nr</div><div class='del'>-	.previous</div><div class='add'>+	EX_TABLE(200b,.Ldest_error_nr)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro dest</div><div class='ctx'> 250:</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align 3</div><div class='del'>-	.llong 250b,.Ldest_error</div><div class='del'>-	.previous</div><div class='add'>+	EX_TABLE(250b,.Ldest_error)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -236,7 +228,7 @@ _GLOBAL(csum_partial_copy_generic)</div><div class='ctx'> 	 * If the source and destination are relatively unaligned we only</div><div class='ctx'> 	 * align the source. This keeps things simple.</div><div class='ctx'> 	 */</div><div class='del'>-	rldicl. r6,r3,64-1,64-2		/* r6 = (r3 &amp; 0x3) &gt;&gt; 1 */</div><div class='add'>+	rldicl. r6,r3,64-1,64-2		/* r6 = (r3 &gt;&gt; 1) &amp; 0x3 */</div><div class='ctx'> 	beq	.Lcopy_aligned</div><div class='ctx'> </div><div class='ctx'> 	li	r9,4</div><div class='hunk'>@@ -398,8 +390,12 @@ dstnr;	sth	r6,0(r4)</div><div class='ctx'> 	beq	.Lcopy_finish</div><div class='ctx'> </div><div class='ctx'> srcnr;	lbz	r6,0(r3)</div><div class='add'>+#ifdef __BIG_ENDIAN__</div><div class='ctx'> 	sldi	r9,r6,8			/* Pad the byte out to 16 bits */</div><div class='ctx'> 	adde	r0,r0,r9</div><div class='add'>+#else</div><div class='add'>+	adde	r0,r0,r6</div><div class='add'>+#endif</div><div class='ctx'> dstnr;	stb	r6,0(r4)</div><div class='ctx'> </div><div class='ctx'> .Lcopy_finish:</div><div class='head'>diff --git a/arch/powerpc/lib/checksum_wrappers.c b/arch/powerpc/lib/checksum_wrappers.c<br/>index 08e3a3356c40..a0cb63fb76a1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/checksum_wrappers.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/checksum_wrappers.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/checksum_wrappers.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/checksum_wrappers.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> __wsum csum_and_copy_from_user(const void __user *src, void *dst,</div><div class='ctx'> 			       int len, __wsum sum, int *err_ptr)</div><div class='head'>diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c<br/>index d5edbeb8eb82..0d3002b7e2b4 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/code-patching.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/code-patching.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/code-patching.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/code-patching.c</a></div><div class='hunk'>@@ -13,7 +13,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/code-patching.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/kprobes.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> int patch_instruction(unsigned int *addr, unsigned int instr)</div><div class='hunk'>@@ -32,6 +33,49 @@ int patch_branch(unsigned int *addr, unsigned long target, int flags)</div><div class='ctx'> 	return patch_instruction(addr, create_branch(addr, target, flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool is_offset_in_branch_range(long offset)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Powerpc branch instruction is :</div><div class='add'>+	 *</div><div class='add'>+	 *  0         6                 30   31</div><div class='add'>+	 *  +---------+----------------+---+---+</div><div class='add'>+	 *  | opcode  |     LI         |AA |LK |</div><div class='add'>+	 *  +---------+----------------+---+---+</div><div class='add'>+	 *  Where AA = 0 and LK = 0</div><div class='add'>+	 *</div><div class='add'>+	 * LI is a signed 24 bits integer. The real branch offset is computed</div><div class='add'>+	 * by: imm32 = SignExtend(LI:'0b00', 32);</div><div class='add'>+	 *</div><div class='add'>+	 * So the maximum forward branch should be:</div><div class='add'>+	 *   (0x007fffff &lt;&lt; 2) = 0x01fffffc =  0x1fffffc</div><div class='add'>+	 * The maximum backward branch should be:</div><div class='add'>+	 *   (0xff800000 &lt;&lt; 2) = 0xfe000000 = -0x2000000</div><div class='add'>+	 */</div><div class='add'>+	return (offset &gt;= -0x2000000 &amp;&amp; offset &lt;= 0x1fffffc &amp;&amp; !(offset &amp; 0x3));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helper to check if a given instruction is a conditional branch</div><div class='add'>+ * Derived from the conditional checks in analyse_instr()</div><div class='add'>+ */</div><div class='add'>+bool __kprobes is_conditional_branch(unsigned int instr)</div><div class='add'>+{</div><div class='add'>+	unsigned int opcode = instr &gt;&gt; 26;</div><div class='add'>+</div><div class='add'>+	if (opcode == 16)       /* bc, bca, bcl, bcla */</div><div class='add'>+		return true;</div><div class='add'>+	if (opcode == 19) {</div><div class='add'>+		switch ((instr &gt;&gt; 1) &amp; 0x3ff) {</div><div class='add'>+		case 16:        /* bclr, bclrl */</div><div class='add'>+		case 528:       /* bcctr, bcctrl */</div><div class='add'>+		case 560:       /* bctar, bctarl */</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> unsigned int create_branch(const unsigned int *addr,</div><div class='ctx'> 			   unsigned long target, int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -43,7 +87,7 @@ unsigned int create_branch(const unsigned int *addr,</div><div class='ctx'> 		offset = offset - (unsigned long)addr;</div><div class='ctx'> </div><div class='ctx'> 	/* Check we can represent the target in the instruction format */</div><div class='del'>-	if (offset &lt; -0x2000000 || offset &gt; 0x1fffffc || offset &amp; 0x3)</div><div class='add'>+	if (!is_offset_in_branch_range(offset))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Mask out the flags and target, so they don't step on each other. */</div><div class='head'>diff --git a/arch/powerpc/lib/copy_32.S b/arch/powerpc/lib/copy_32.S<br/>index 40cce33b08d6..ff0d894d7ff9 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/copy_32.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/copy_32.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/copy_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/copy_32.S</a></div><div class='hunk'>@@ -49,17 +49,14 @@</div><div class='ctx'> 9 ## n ## 1:					\</div><div class='ctx'> 	addi	r5,r5,-(16 * n);		\</div><div class='ctx'> 	b	105f;				\</div><div class='del'>-.section __ex_table,"a";			\</div><div class='del'>-	.align	2;				\</div><div class='del'>-	.long	8 ## n ## 0b,9 ## n ## 0b;	\</div><div class='del'>-	.long	8 ## n ## 1b,9 ## n ## 0b;	\</div><div class='del'>-	.long	8 ## n ## 2b,9 ## n ## 0b;	\</div><div class='del'>-	.long	8 ## n ## 3b,9 ## n ## 0b;	\</div><div class='del'>-	.long	8 ## n ## 4b,9 ## n ## 1b;	\</div><div class='del'>-	.long	8 ## n ## 5b,9 ## n ## 1b;	\</div><div class='del'>-	.long	8 ## n ## 6b,9 ## n ## 1b;	\</div><div class='del'>-	.long	8 ## n ## 7b,9 ## n ## 1b;	\</div><div class='del'>-	.text</div><div class='add'>+	EX_TABLE(8 ## n ## 0b,9 ## n ## 0b);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 1b,9 ## n ## 0b);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 2b,9 ## n ## 0b);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 3b,9 ## n ## 0b);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 4b,9 ## n ## 1b);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 5b,9 ## n ## 1b);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 6b,9 ## n ## 1b);	\</div><div class='add'>+	EX_TABLE(8 ## n ## 7b,9 ## n ## 1b)</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> 	.stabs	"arch/powerpc/lib/",N_SO,0,0,0f</div><div class='hunk'>@@ -323,13 +320,10 @@ _GLOBAL(__copy_tofrom_user)</div><div class='ctx'> 73:	stwu	r9,4(r6)</div><div class='ctx'> 	bdnz	72b</div><div class='ctx'> </div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align	2</div><div class='del'>-	.long	70b,100f</div><div class='del'>-	.long	71b,101f</div><div class='del'>-	.long	72b,102f</div><div class='del'>-	.long	73b,103f</div><div class='del'>-	.text</div><div class='add'>+	EX_TABLE(70b,100f)</div><div class='add'>+	EX_TABLE(71b,101f)</div><div class='add'>+	EX_TABLE(72b,102f)</div><div class='add'>+	EX_TABLE(73b,103f)</div><div class='ctx'> </div><div class='ctx'> 58:	srwi.	r0,r5,LG_CACHELINE_BYTES /* # complete cachelines */</div><div class='ctx'> 	clrlwi	r5,r5,32-LG_CACHELINE_BYTES</div><div class='hunk'>@@ -364,10 +358,7 @@ _GLOBAL(__copy_tofrom_user)</div><div class='ctx'> </div><div class='ctx'> 53:	dcbt	r3,r4</div><div class='ctx'> 54:	dcbz	r11,r6</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align	2</div><div class='del'>-	.long	54b,105f</div><div class='del'>-	.text</div><div class='add'>+	EX_TABLE(54b,105f)</div><div class='ctx'> /* the main body of the cacheline loop */</div><div class='ctx'> 	COPY_16_BYTES_WITHEX(0)</div><div class='ctx'> #if L1_CACHE_BYTES &gt;= 32</div><div class='hunk'>@@ -500,15 +491,13 @@ _GLOBAL(__copy_tofrom_user)</div><div class='ctx'> 	bdnz	114b</div><div class='ctx'> 120:	blr</div><div class='ctx'> </div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align	2</div><div class='del'>-	.long	30b,108b</div><div class='del'>-	.long	31b,109b</div><div class='del'>-	.long	40b,110b</div><div class='del'>-	.long	41b,111b</div><div class='del'>-	.long	130b,132b</div><div class='del'>-	.long	131b,120b</div><div class='del'>-	.long	112b,120b</div><div class='del'>-	.long	114b,120b</div><div class='del'>-	.text</div><div class='add'>+	EX_TABLE(30b,108b)</div><div class='add'>+	EX_TABLE(31b,109b)</div><div class='add'>+	EX_TABLE(40b,110b)</div><div class='add'>+	EX_TABLE(41b,111b)</div><div class='add'>+	EX_TABLE(130b,132b)</div><div class='add'>+	EX_TABLE(131b,120b)</div><div class='add'>+	EX_TABLE(112b,120b)</div><div class='add'>+	EX_TABLE(114b,120b)</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL(__copy_tofrom_user)</div><div class='head'>diff --git a/arch/powerpc/lib/copypage_64.S b/arch/powerpc/lib/copypage_64.S<br/>index 21367b3a8146..4bcc9e76fb55 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/copypage_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/copypage_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/copypage_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/copypage_64.S</a></div><div class='hunk'>@@ -26,8 +26,8 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_VMX_COPY)</div><div class='ctx'> 	ori	r5,r5,PAGE_SIZE@l</div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='ctx'> 	ld      r10,PPC64_CACHES@toc(r2)</div><div class='del'>-	lwz	r11,DCACHEL1LOGLINESIZE(r10)	/* log2 of cache line size */</div><div class='del'>-	lwz     r12,DCACHEL1LINESIZE(r10)	/* get cache line size */</div><div class='add'>+	lwz	r11,DCACHEL1LOGBLOCKSIZE(r10)	/* log2 of cache block size */</div><div class='add'>+	lwz     r12,DCACHEL1BLOCKSIZE(r10)	/* get cache block size */</div><div class='ctx'> 	li	r9,0</div><div class='ctx'> 	srd	r8,r5,r11</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/lib/copyuser_64.S b/arch/powerpc/lib/copyuser_64.S<br/>index 60386b2c99bb..aee6e24e81ab 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/copyuser_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/copyuser_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/copyuser_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/copyuser_64.S</a></div><div class='hunk'>@@ -394,70 +394,66 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)</div><div class='ctx'> 192:</div><div class='ctx'> 	blr			/* #bytes not copied in r3 */</div><div class='ctx'> </div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align	3</div><div class='del'>-	.llong	20b,120b</div><div class='del'>-	.llong	220b,320b</div><div class='del'>-	.llong	21b,121b</div><div class='del'>-	.llong	221b,321b</div><div class='del'>-	.llong	70b,170b</div><div class='del'>-	.llong	270b,370b</div><div class='del'>-	.llong	22b,122b</div><div class='del'>-	.llong	222b,322b</div><div class='del'>-	.llong	71b,171b</div><div class='del'>-	.llong	271b,371b</div><div class='del'>-	.llong	72b,172b</div><div class='del'>-	.llong	272b,372b</div><div class='del'>-	.llong	244b,344b</div><div class='del'>-	.llong	245b,345b</div><div class='del'>-	.llong	23b,123b</div><div class='del'>-	.llong	73b,173b</div><div class='del'>-	.llong	44b,144b</div><div class='del'>-	.llong	74b,174b</div><div class='del'>-	.llong	45b,145b</div><div class='del'>-	.llong	75b,175b</div><div class='del'>-	.llong	24b,124b</div><div class='del'>-	.llong	25b,125b</div><div class='del'>-	.llong	26b,126b</div><div class='del'>-	.llong	27b,127b</div><div class='del'>-	.llong	28b,128b</div><div class='del'>-	.llong	29b,129b</div><div class='del'>-	.llong	30b,130b</div><div class='del'>-	.llong	31b,131b</div><div class='del'>-	.llong	32b,132b</div><div class='del'>-	.llong	76b,176b</div><div class='del'>-	.llong	33b,133b</div><div class='del'>-	.llong	77b,177b</div><div class='del'>-	.llong	78b,178b</div><div class='del'>-	.llong	79b,179b</div><div class='del'>-	.llong	80b,180b</div><div class='del'>-	.llong	34b,134b</div><div class='del'>-	.llong	94b,194b</div><div class='del'>-	.llong	95b,195b</div><div class='del'>-	.llong	96b,196b</div><div class='del'>-	.llong	35b,135b</div><div class='del'>-	.llong	81b,181b</div><div class='del'>-	.llong	36b,136b</div><div class='del'>-	.llong	82b,182b</div><div class='del'>-	.llong	37b,137b</div><div class='del'>-	.llong	83b,183b</div><div class='del'>-	.llong	38b,138b</div><div class='del'>-	.llong	39b,139b</div><div class='del'>-	.llong	84b,184b</div><div class='del'>-	.llong	85b,185b</div><div class='del'>-	.llong	40b,140b</div><div class='del'>-	.llong	86b,186b</div><div class='del'>-	.llong	41b,141b</div><div class='del'>-	.llong	87b,187b</div><div class='del'>-	.llong	42b,142b</div><div class='del'>-	.llong	88b,188b</div><div class='del'>-	.llong	43b,143b</div><div class='del'>-	.llong	89b,189b</div><div class='del'>-	.llong	90b,190b</div><div class='del'>-	.llong	91b,191b</div><div class='del'>-	.llong	92b,192b</div><div class='del'>-	</div><div class='del'>-	.text</div><div class='add'>+	EX_TABLE(20b,120b)</div><div class='add'>+	EX_TABLE(220b,320b)</div><div class='add'>+	EX_TABLE(21b,121b)</div><div class='add'>+	EX_TABLE(221b,321b)</div><div class='add'>+	EX_TABLE(70b,170b)</div><div class='add'>+	EX_TABLE(270b,370b)</div><div class='add'>+	EX_TABLE(22b,122b)</div><div class='add'>+	EX_TABLE(222b,322b)</div><div class='add'>+	EX_TABLE(71b,171b)</div><div class='add'>+	EX_TABLE(271b,371b)</div><div class='add'>+	EX_TABLE(72b,172b)</div><div class='add'>+	EX_TABLE(272b,372b)</div><div class='add'>+	EX_TABLE(244b,344b)</div><div class='add'>+	EX_TABLE(245b,345b)</div><div class='add'>+	EX_TABLE(23b,123b)</div><div class='add'>+	EX_TABLE(73b,173b)</div><div class='add'>+	EX_TABLE(44b,144b)</div><div class='add'>+	EX_TABLE(74b,174b)</div><div class='add'>+	EX_TABLE(45b,145b)</div><div class='add'>+	EX_TABLE(75b,175b)</div><div class='add'>+	EX_TABLE(24b,124b)</div><div class='add'>+	EX_TABLE(25b,125b)</div><div class='add'>+	EX_TABLE(26b,126b)</div><div class='add'>+	EX_TABLE(27b,127b)</div><div class='add'>+	EX_TABLE(28b,128b)</div><div class='add'>+	EX_TABLE(29b,129b)</div><div class='add'>+	EX_TABLE(30b,130b)</div><div class='add'>+	EX_TABLE(31b,131b)</div><div class='add'>+	EX_TABLE(32b,132b)</div><div class='add'>+	EX_TABLE(76b,176b)</div><div class='add'>+	EX_TABLE(33b,133b)</div><div class='add'>+	EX_TABLE(77b,177b)</div><div class='add'>+	EX_TABLE(78b,178b)</div><div class='add'>+	EX_TABLE(79b,179b)</div><div class='add'>+	EX_TABLE(80b,180b)</div><div class='add'>+	EX_TABLE(34b,134b)</div><div class='add'>+	EX_TABLE(94b,194b)</div><div class='add'>+	EX_TABLE(95b,195b)</div><div class='add'>+	EX_TABLE(96b,196b)</div><div class='add'>+	EX_TABLE(35b,135b)</div><div class='add'>+	EX_TABLE(81b,181b)</div><div class='add'>+	EX_TABLE(36b,136b)</div><div class='add'>+	EX_TABLE(82b,182b)</div><div class='add'>+	EX_TABLE(37b,137b)</div><div class='add'>+	EX_TABLE(83b,183b)</div><div class='add'>+	EX_TABLE(38b,138b)</div><div class='add'>+	EX_TABLE(39b,139b)</div><div class='add'>+	EX_TABLE(84b,184b)</div><div class='add'>+	EX_TABLE(85b,185b)</div><div class='add'>+	EX_TABLE(40b,140b)</div><div class='add'>+	EX_TABLE(86b,186b)</div><div class='add'>+	EX_TABLE(41b,141b)</div><div class='add'>+	EX_TABLE(87b,187b)</div><div class='add'>+	EX_TABLE(42b,142b)</div><div class='add'>+	EX_TABLE(88b,188b)</div><div class='add'>+	EX_TABLE(43b,143b)</div><div class='add'>+	EX_TABLE(89b,189b)</div><div class='add'>+	EX_TABLE(90b,190b)</div><div class='add'>+	EX_TABLE(91b,191b)</div><div class='add'>+	EX_TABLE(92b,192b)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Routine to copy a whole page of data, optimized for POWER4.</div><div class='hunk'>@@ -598,78 +594,77 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)</div><div class='ctx'> 	li	r5,4096</div><div class='ctx'> 	b	.Ldst_aligned</div><div class='ctx'> </div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align	3</div><div class='del'>-	.llong	20b,100b</div><div class='del'>-	.llong	21b,100b</div><div class='del'>-	.llong	22b,100b</div><div class='del'>-	.llong	23b,100b</div><div class='del'>-	.llong	24b,100b</div><div class='del'>-	.llong	25b,100b</div><div class='del'>-	.llong	26b,100b</div><div class='del'>-	.llong	27b,100b</div><div class='del'>-	.llong	28b,100b</div><div class='del'>-	.llong	29b,100b</div><div class='del'>-	.llong	30b,100b</div><div class='del'>-	.llong	31b,100b</div><div class='del'>-	.llong	32b,100b</div><div class='del'>-	.llong	33b,100b</div><div class='del'>-	.llong	34b,100b</div><div class='del'>-	.llong	35b,100b</div><div class='del'>-	.llong	36b,100b</div><div class='del'>-	.llong	37b,100b</div><div class='del'>-	.llong	38b,100b</div><div class='del'>-	.llong	39b,100b</div><div class='del'>-	.llong	40b,100b</div><div class='del'>-	.llong	41b,100b</div><div class='del'>-	.llong	42b,100b</div><div class='del'>-	.llong	43b,100b</div><div class='del'>-	.llong	44b,100b</div><div class='del'>-	.llong	45b,100b</div><div class='del'>-	.llong	46b,100b</div><div class='del'>-	.llong	47b,100b</div><div class='del'>-	.llong	48b,100b</div><div class='del'>-	.llong	49b,100b</div><div class='del'>-	.llong	50b,100b</div><div class='del'>-	.llong	51b,100b</div><div class='del'>-	.llong	52b,100b</div><div class='del'>-	.llong	53b,100b</div><div class='del'>-	.llong	54b,100b</div><div class='del'>-	.llong	55b,100b</div><div class='del'>-	.llong	56b,100b</div><div class='del'>-	.llong	57b,100b</div><div class='del'>-	.llong	58b,100b</div><div class='del'>-	.llong	59b,100b</div><div class='del'>-	.llong	60b,100b</div><div class='del'>-	.llong	61b,100b</div><div class='del'>-	.llong	62b,100b</div><div class='del'>-	.llong	63b,100b</div><div class='del'>-	.llong	64b,100b</div><div class='del'>-	.llong	65b,100b</div><div class='del'>-	.llong	66b,100b</div><div class='del'>-	.llong	67b,100b</div><div class='del'>-	.llong	68b,100b</div><div class='del'>-	.llong	69b,100b</div><div class='del'>-	.llong	70b,100b</div><div class='del'>-	.llong	71b,100b</div><div class='del'>-	.llong	72b,100b</div><div class='del'>-	.llong	73b,100b</div><div class='del'>-	.llong	74b,100b</div><div class='del'>-	.llong	75b,100b</div><div class='del'>-	.llong	76b,100b</div><div class='del'>-	.llong	77b,100b</div><div class='del'>-	.llong	78b,100b</div><div class='del'>-	.llong	79b,100b</div><div class='del'>-	.llong	80b,100b</div><div class='del'>-	.llong	81b,100b</div><div class='del'>-	.llong	82b,100b</div><div class='del'>-	.llong	83b,100b</div><div class='del'>-	.llong	84b,100b</div><div class='del'>-	.llong	85b,100b</div><div class='del'>-	.llong	86b,100b</div><div class='del'>-	.llong	87b,100b</div><div class='del'>-	.llong	88b,100b</div><div class='del'>-	.llong	89b,100b</div><div class='del'>-	.llong	90b,100b</div><div class='del'>-	.llong	91b,100b</div><div class='add'>+	EX_TABLE(20b,100b)</div><div class='add'>+	EX_TABLE(21b,100b)</div><div class='add'>+	EX_TABLE(22b,100b)</div><div class='add'>+	EX_TABLE(23b,100b)</div><div class='add'>+	EX_TABLE(24b,100b)</div><div class='add'>+	EX_TABLE(25b,100b)</div><div class='add'>+	EX_TABLE(26b,100b)</div><div class='add'>+	EX_TABLE(27b,100b)</div><div class='add'>+	EX_TABLE(28b,100b)</div><div class='add'>+	EX_TABLE(29b,100b)</div><div class='add'>+	EX_TABLE(30b,100b)</div><div class='add'>+	EX_TABLE(31b,100b)</div><div class='add'>+	EX_TABLE(32b,100b)</div><div class='add'>+	EX_TABLE(33b,100b)</div><div class='add'>+	EX_TABLE(34b,100b)</div><div class='add'>+	EX_TABLE(35b,100b)</div><div class='add'>+	EX_TABLE(36b,100b)</div><div class='add'>+	EX_TABLE(37b,100b)</div><div class='add'>+	EX_TABLE(38b,100b)</div><div class='add'>+	EX_TABLE(39b,100b)</div><div class='add'>+	EX_TABLE(40b,100b)</div><div class='add'>+	EX_TABLE(41b,100b)</div><div class='add'>+	EX_TABLE(42b,100b)</div><div class='add'>+	EX_TABLE(43b,100b)</div><div class='add'>+	EX_TABLE(44b,100b)</div><div class='add'>+	EX_TABLE(45b,100b)</div><div class='add'>+	EX_TABLE(46b,100b)</div><div class='add'>+	EX_TABLE(47b,100b)</div><div class='add'>+	EX_TABLE(48b,100b)</div><div class='add'>+	EX_TABLE(49b,100b)</div><div class='add'>+	EX_TABLE(50b,100b)</div><div class='add'>+	EX_TABLE(51b,100b)</div><div class='add'>+	EX_TABLE(52b,100b)</div><div class='add'>+	EX_TABLE(53b,100b)</div><div class='add'>+	EX_TABLE(54b,100b)</div><div class='add'>+	EX_TABLE(55b,100b)</div><div class='add'>+	EX_TABLE(56b,100b)</div><div class='add'>+	EX_TABLE(57b,100b)</div><div class='add'>+	EX_TABLE(58b,100b)</div><div class='add'>+	EX_TABLE(59b,100b)</div><div class='add'>+	EX_TABLE(60b,100b)</div><div class='add'>+	EX_TABLE(61b,100b)</div><div class='add'>+	EX_TABLE(62b,100b)</div><div class='add'>+	EX_TABLE(63b,100b)</div><div class='add'>+	EX_TABLE(64b,100b)</div><div class='add'>+	EX_TABLE(65b,100b)</div><div class='add'>+	EX_TABLE(66b,100b)</div><div class='add'>+	EX_TABLE(67b,100b)</div><div class='add'>+	EX_TABLE(68b,100b)</div><div class='add'>+	EX_TABLE(69b,100b)</div><div class='add'>+	EX_TABLE(70b,100b)</div><div class='add'>+	EX_TABLE(71b,100b)</div><div class='add'>+	EX_TABLE(72b,100b)</div><div class='add'>+	EX_TABLE(73b,100b)</div><div class='add'>+	EX_TABLE(74b,100b)</div><div class='add'>+	EX_TABLE(75b,100b)</div><div class='add'>+	EX_TABLE(76b,100b)</div><div class='add'>+	EX_TABLE(77b,100b)</div><div class='add'>+	EX_TABLE(78b,100b)</div><div class='add'>+	EX_TABLE(79b,100b)</div><div class='add'>+	EX_TABLE(80b,100b)</div><div class='add'>+	EX_TABLE(81b,100b)</div><div class='add'>+	EX_TABLE(82b,100b)</div><div class='add'>+	EX_TABLE(83b,100b)</div><div class='add'>+	EX_TABLE(84b,100b)</div><div class='add'>+	EX_TABLE(85b,100b)</div><div class='add'>+	EX_TABLE(86b,100b)</div><div class='add'>+	EX_TABLE(87b,100b)</div><div class='add'>+	EX_TABLE(88b,100b)</div><div class='add'>+	EX_TABLE(89b,100b)</div><div class='add'>+	EX_TABLE(90b,100b)</div><div class='add'>+	EX_TABLE(91b,100b)</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL(__copy_tofrom_user)</div><div class='head'>diff --git a/arch/powerpc/lib/copyuser_power7.S b/arch/powerpc/lib/copyuser_power7.S<br/>index da0c568d18c4..a24b4039352c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/copyuser_power7.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/copyuser_power7.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/copyuser_power7.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/copyuser_power7.S</a></div><div class='hunk'>@@ -29,35 +29,23 @@</div><div class='ctx'> </div><div class='ctx'> 	.macro err1</div><div class='ctx'> 100:</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align 3</div><div class='del'>-	.llong 100b,.Ldo_err1</div><div class='del'>-	.previous</div><div class='add'>+	EX_TABLE(100b,.Ldo_err1)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro err2</div><div class='ctx'> 200:</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align 3</div><div class='del'>-	.llong 200b,.Ldo_err2</div><div class='del'>-	.previous</div><div class='add'>+	EX_TABLE(200b,.Ldo_err2)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ALTIVEC</div><div class='ctx'> 	.macro err3</div><div class='ctx'> 300:</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align 3</div><div class='del'>-	.llong 300b,.Ldo_err3</div><div class='del'>-	.previous</div><div class='add'>+	EX_TABLE(300b,.Ldo_err3)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro err4</div><div class='ctx'> 400:</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align 3</div><div class='del'>-	.llong 400b,.Ldo_err4</div><div class='del'>-	.previous</div><div class='add'>+	EX_TABLE(400b,.Ldo_err4)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c<br/>index 043415f0bdb1..f3917705c686 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/feature-fixups.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/feature-fixups.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/feature-fixups.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/feature-fixups.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='ctx'> #include &lt;asm/code-patching.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/powerpc/lib/ldstfp.S b/arch/powerpc/lib/ldstfp.S<br/>index 5d0cdbfbe3f2..a58777c1b2cb 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/ldstfp.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/ldstfp.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/ldstfp.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/ldstfp.S</a></div><div class='hunk'>@@ -21,18 +21,12 @@</div><div class='ctx'> </div><div class='ctx'> #define STKFRM	(PPC_MIN_STKFRM + 16)</div><div class='ctx'> </div><div class='del'>-	.macro	extab	instr,handler</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	PPC_LONG \instr,\handler</div><div class='del'>-	.previous</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> 	.macro	inst32	op</div><div class='ctx'> reg = 0</div><div class='ctx'> 	.rept	32</div><div class='ctx'> 20:	\op	reg,0,r4</div><div class='ctx'> 	b	3f</div><div class='del'>-	extab	20b,99f</div><div class='add'>+	EX_TABLE(20b,99f)</div><div class='ctx'> reg = reg + 1</div><div class='ctx'> 	.endr</div><div class='ctx'> 	.endm</div><div class='hunk'>@@ -100,7 +94,7 @@ _GLOBAL(do_lfs)</div><div class='ctx'> 	mr	r3,r9</div><div class='ctx'> 	addi	r1,r1,STKFRM</div><div class='ctx'> 	blr</div><div class='del'>-	extab	2b,3b</div><div class='add'>+	EX_TABLE(2b,3b)</div><div class='ctx'> </div><div class='ctx'> /* Load FP reg N from double at *p.  N is in r3, p in r4. */</div><div class='ctx'> _GLOBAL(do_lfd)</div><div class='hunk'>@@ -127,7 +121,7 @@ _GLOBAL(do_lfd)</div><div class='ctx'> 	mr	r3,r9</div><div class='ctx'> 	addi	r1,r1,STKFRM</div><div class='ctx'> 	blr</div><div class='del'>-	extab	2b,3b</div><div class='add'>+	EX_TABLE(2b,3b)</div><div class='ctx'> </div><div class='ctx'> /* Store FP reg N to float at *p.  N is in r3, p in r4. */</div><div class='ctx'> _GLOBAL(do_stfs)</div><div class='hunk'>@@ -154,7 +148,7 @@ _GLOBAL(do_stfs)</div><div class='ctx'> 	mr	r3,r9</div><div class='ctx'> 	addi	r1,r1,STKFRM</div><div class='ctx'> 	blr</div><div class='del'>-	extab	2b,3b</div><div class='add'>+	EX_TABLE(2b,3b)</div><div class='ctx'> </div><div class='ctx'> /* Store FP reg N to double at *p.  N is in r3, p in r4. */</div><div class='ctx'> _GLOBAL(do_stfd)</div><div class='hunk'>@@ -181,7 +175,7 @@ _GLOBAL(do_stfd)</div><div class='ctx'> 	mr	r3,r9</div><div class='ctx'> 	addi	r1,r1,STKFRM</div><div class='ctx'> 	blr</div><div class='del'>-	extab	2b,3b</div><div class='add'>+	EX_TABLE(2b,3b)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ALTIVEC</div><div class='ctx'> /* Get the contents of vrN into v0; N is in r3. */</div><div class='hunk'>@@ -248,7 +242,7 @@ _GLOBAL(do_lvx)</div><div class='ctx'> 	mr	r3,r9</div><div class='ctx'> 	addi	r1,r1,STKFRM</div><div class='ctx'> 	blr</div><div class='del'>-	extab	2b,3b</div><div class='add'>+	EX_TABLE(2b,3b)</div><div class='ctx'> </div><div class='ctx'> /* Store vector reg N to *p.  N is in r3, p in r4. */</div><div class='ctx'> _GLOBAL(do_stvx)</div><div class='hunk'>@@ -276,7 +270,7 @@ _GLOBAL(do_stvx)</div><div class='ctx'> 	mr	r3,r9</div><div class='ctx'> 	addi	r1,r1,STKFRM</div><div class='ctx'> 	blr</div><div class='del'>-	extab	2b,3b</div><div class='add'>+	EX_TABLE(2b,3b)</div><div class='ctx'> #endif /* CONFIG_ALTIVEC */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_VSX</div><div class='hunk'>@@ -344,7 +338,7 @@ _GLOBAL(do_lxvd2x)</div><div class='ctx'> 	mr	r3,r9</div><div class='ctx'> 	addi	r1,r1,STKFRM</div><div class='ctx'> 	blr</div><div class='del'>-	extab	2b,3b</div><div class='add'>+	EX_TABLE(2b,3b)</div><div class='ctx'> </div><div class='ctx'> /* Store VSX reg N to vector doubleword *p.  N is in r3, p in r4. */</div><div class='ctx'> _GLOBAL(do_stxvd2x)</div><div class='hunk'>@@ -372,7 +366,7 @@ _GLOBAL(do_stxvd2x)</div><div class='ctx'> 	mr	r3,r9</div><div class='ctx'> 	addi	r1,r1,STKFRM</div><div class='ctx'> 	blr</div><div class='del'>-	extab	2b,3b</div><div class='add'>+	EX_TABLE(2b,3b)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_VSX */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c<br/>index 3362299b1859..846dba2c6360 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/sstep.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/sstep.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/sstep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/sstep.c</a></div><div class='hunk'>@@ -14,7 +14,8 @@</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;asm/sstep.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/cpu_has_feature.h&gt;</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern char system_call_common[];</div><div class='hunk'>@@ -493,10 +494,7 @@ static int __kprobes do_vsx_store(int rn, int (*func)(int, unsigned long),</div><div class='ctx'> 		"3:	li	%0,%4\n"		\</div><div class='ctx'> 		"	b	2b\n"			\</div><div class='ctx'> 		".previous\n"				\</div><div class='del'>-		".section __ex_table,\"a\"\n"		\</div><div class='del'>-			PPC_LONG_ALIGN "\n"		\</div><div class='del'>-			PPC_LONG "1b,3b\n"		\</div><div class='del'>-		".previous"				\</div><div class='add'>+		EX_TABLE(1b, 3b)			\</div><div class='ctx'> 		: "=r" (err), "=r" (cr)			\</div><div class='ctx'> 		: "r" (x), "r" (addr), "i" (-EFAULT), "0" (err))</div><div class='ctx'> </div><div class='hunk'>@@ -508,10 +506,7 @@ static int __kprobes do_vsx_store(int rn, int (*func)(int, unsigned long),</div><div class='ctx'> 		"3:	li	%0,%3\n"		\</div><div class='ctx'> 		"	b	2b\n"			\</div><div class='ctx'> 		".previous\n"				\</div><div class='del'>-		".section __ex_table,\"a\"\n"		\</div><div class='del'>-			PPC_LONG_ALIGN "\n"		\</div><div class='del'>-			PPC_LONG "1b,3b\n"		\</div><div class='del'>-		".previous"				\</div><div class='add'>+		EX_TABLE(1b, 3b)			\</div><div class='ctx'> 		: "=r" (err), "=r" (x)			\</div><div class='ctx'> 		: "r" (addr), "i" (-EFAULT), "0" (err))</div><div class='ctx'> </div><div class='hunk'>@@ -523,10 +518,7 @@ static int __kprobes do_vsx_store(int rn, int (*func)(int, unsigned long),</div><div class='ctx'> 		"3:	li	%0,%3\n"		\</div><div class='ctx'> 		"	b	2b\n"			\</div><div class='ctx'> 		".previous\n"				\</div><div class='del'>-		".section __ex_table,\"a\"\n"		\</div><div class='del'>-			PPC_LONG_ALIGN "\n"		\</div><div class='del'>-			PPC_LONG "1b,3b\n"		\</div><div class='del'>-		".previous"				\</div><div class='add'>+		EX_TABLE(1b, 3b)			\</div><div class='ctx'> 		: "=r" (err)				\</div><div class='ctx'> 		: "r" (addr), "i" (-EFAULT), "0" (err))</div><div class='ctx'> </div><div class='hunk'>@@ -1811,9 +1803,8 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		if (op.ea &amp; (size - 1))</div><div class='ctx'> 			break;		/* can't handle misaligned */</div><div class='del'>-		err = -EFAULT;</div><div class='ctx'> 		if (!address_ok(regs, op.ea, size))</div><div class='del'>-			goto ldst_done;</div><div class='add'>+			return 0;</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		switch (size) {</div><div class='ctx'> 		case 4:</div><div class='hunk'>@@ -1836,9 +1827,8 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		if (op.ea &amp; (size - 1))</div><div class='ctx'> 			break;		/* can't handle misaligned */</div><div class='del'>-		err = -EFAULT;</div><div class='ctx'> 		if (!address_ok(regs, op.ea, size))</div><div class='del'>-			goto ldst_done;</div><div class='add'>+			return 0;</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		switch (size) {</div><div class='ctx'> 		case 4:</div><div class='head'>diff --git a/arch/powerpc/lib/string.S b/arch/powerpc/lib/string.S<br/>index d13e07603519..a787776822d8 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/string.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/string.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/string.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/string.S</a></div><div class='hunk'>@@ -13,8 +13,6 @@</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/export.h&gt;</div><div class='ctx'> </div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	PPC_LONG_ALIGN</div><div class='ctx'> 	.text</div><div class='ctx'> 	</div><div class='ctx'> /* This clears out any unused part of the destination buffer,</div><div class='hunk'>@@ -125,10 +123,9 @@ _GLOBAL(__clear_user)</div><div class='ctx'> 92:	mfctr	r3</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	PPC_LONG	11b,90b</div><div class='del'>-	PPC_LONG	1b,91b</div><div class='del'>-	PPC_LONG	8b,92b</div><div class='del'>-	.text</div><div class='add'>+	EX_TABLE(11b, 90b)</div><div class='add'>+	EX_TABLE(1b, 91b)</div><div class='add'>+	EX_TABLE(8b, 92b)</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL(__clear_user)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/lib/string_64.S b/arch/powerpc/lib/string_64.S<br/>index 57ace356c949..d5b4d9498c54 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/string_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/string_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/string_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/string_64.S</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='add'>+#include &lt;asm/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/export.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -41,26 +42,17 @@ PPC64_CACHES:</div><div class='ctx'> </div><div class='ctx'> 	.macro err1</div><div class='ctx'> 100:</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align 3</div><div class='del'>-	.llong 100b,.Ldo_err1</div><div class='del'>-	.previous</div><div class='add'>+	EX_TABLE(100b,.Ldo_err1)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro err2</div><div class='ctx'> 200:</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align 3</div><div class='del'>-	.llong 200b,.Ldo_err2</div><div class='del'>-	.previous</div><div class='add'>+	EX_TABLE(200b,.Ldo_err2)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro err3</div><div class='ctx'> 300:</div><div class='del'>-	.section __ex_table,"a"</div><div class='del'>-	.align 3</div><div class='del'>-	.llong 300b,.Ldo_err3</div><div class='del'>-	.previous</div><div class='add'>+	EX_TABLE(300b,.Ldo_err3)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> .Ldo_err1:</div><div class='hunk'>@@ -160,9 +152,9 @@ err2;	std	r0,0(r3)</div><div class='ctx'> 	addi	r3,r3,8</div><div class='ctx'> 	addi	r4,r4,-8</div><div class='ctx'> </div><div class='del'>-	/* Destination is 16 byte aligned, need to get it cacheline aligned */</div><div class='del'>-11:	lwz	r7,DCACHEL1LOGLINESIZE(r5)</div><div class='del'>-	lwz	r9,DCACHEL1LINESIZE(r5)</div><div class='add'>+	/* Destination is 16 byte aligned, need to get it cache block aligned */</div><div class='add'>+11:	lwz	r7,DCACHEL1LOGBLOCKSIZE(r5)</div><div class='add'>+	lwz	r9,DCACHEL1BLOCKSIZE(r5)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * With worst case alignment the long clear loop takes a minimum</div><div class='head'>diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c<br/>index 5eea6f3c1e03..9bd3a3dad78d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/lib/usercopy_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/lib/usercopy_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/lib/usercopy_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/lib/usercopy_64.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/math-emu/fabs.c b/arch/powerpc/math-emu/fabs.c<br/>index 549baba5948f..a5e7ad1384ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fabs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fabs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fabs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fabs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fabs(u32 *frD, u32 *frB)</div><div class='head'>diff --git a/arch/powerpc/math-emu/fadd.c b/arch/powerpc/math-emu/fadd.c<br/>index 0158a16e2b82..29de37e0e0da 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fadd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fadd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fadd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fadd.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fadds.c b/arch/powerpc/math-emu/fadds.c<br/>index 5930f40a8687..7093c5b58002 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fadds.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fadds.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fadds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fadds.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fcmpo.c b/arch/powerpc/math-emu/fcmpo.c<br/>index 5bce011c2aec..5d644467221c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fcmpo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fcmpo.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fcmpo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fcmpo.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fcmpu.c b/arch/powerpc/math-emu/fcmpu.c<br/>index d4fb1babc6ad..0f9bf4864832 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fcmpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fcmpu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fcmpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fcmpu.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fctiw.c b/arch/powerpc/math-emu/fctiw.c<br/>index f694440ddc00..716d6da7f204 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fctiw.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fctiw.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fctiw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fctiw.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fctiwz.c b/arch/powerpc/math-emu/fctiwz.c<br/>index 71e782fd4fe3..7212fa7cfd36 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fctiwz.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fctiwz.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fctiwz.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fctiwz.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fdiv.c b/arch/powerpc/math-emu/fdiv.c<br/>index a29239c05e3e..e1e452069e49 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fdiv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fdiv.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fdiv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fdiv.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fdivs.c b/arch/powerpc/math-emu/fdivs.c<br/>index 526bc261275f..5511e2d1c3ad 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fdivs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fdivs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fdivs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fdivs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmadd.c b/arch/powerpc/math-emu/fmadd.c<br/>index 8c3f20aa5a95..2b6fae0bc8c2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmadd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fmadd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmadd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmadd.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmadds.c b/arch/powerpc/math-emu/fmadds.c<br/>index 794fb31e59d1..aff35f24a236 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmadds.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fmadds.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmadds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmadds.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmr.c b/arch/powerpc/math-emu/fmr.c<br/>index bd55384b8196..f6347911f6a3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fmr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmr.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fmr(u32 *frD, u32 *frB)</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmsub.c b/arch/powerpc/math-emu/fmsub.c<br/>index 626f6fed84ac..1fb26cebe04e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmsub.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fmsub.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmsub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmsub.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmsubs.c b/arch/powerpc/math-emu/fmsubs.c<br/>index 3425bc899760..f73965453e05 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmsubs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fmsubs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmsubs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmsubs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmul.c b/arch/powerpc/math-emu/fmul.c<br/>index 2c1929779892..ffd31b549290 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmul.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fmul.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmul.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fmuls.c b/arch/powerpc/math-emu/fmuls.c<br/>index f5ad5c9c77d0..21aee431ca9d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmuls.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fmuls.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fmuls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fmuls.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fnabs.c b/arch/powerpc/math-emu/fnabs.c<br/>index a7d34f3d9499..af877a53d264 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fnabs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fnabs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fnabs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fnabs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fnabs(u32 *frD, u32 *frB)</div><div class='head'>diff --git a/arch/powerpc/math-emu/fneg.c b/arch/powerpc/math-emu/fneg.c<br/>index 1e988cd9c6cc..8417d174758c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fneg.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fneg.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fneg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fneg.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fneg(u32 *frD, u32 *frB)</div><div class='head'>diff --git a/arch/powerpc/math-emu/fnmadd.c b/arch/powerpc/math-emu/fnmadd.c<br/>index e817bc5453ef..6316ef0e0874 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fnmadd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fnmadd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fnmadd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fnmadd.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fnmadds.c b/arch/powerpc/math-emu/fnmadds.c<br/>index 4db4b7d9ba8d..9ffe037df2b9 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fnmadds.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fnmadds.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fnmadds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fnmadds.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fnmsub.c b/arch/powerpc/math-emu/fnmsub.c<br/>index f65979fa770e..f97a9cfb54ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fnmsub.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fnmsub.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fnmsub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fnmsub.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fnmsubs.c b/arch/powerpc/math-emu/fnmsubs.c<br/>index 9021dacc03b8..7fa1217bd930 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fnmsubs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fnmsubs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fnmsubs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fnmsubs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fre.c b/arch/powerpc/math-emu/fre.c<br/>index 49ccf2cc6a5a..b621a790aa67 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fre.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fre.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fre.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fre.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fre(void *frD, void *frB)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/math-emu/fres.c b/arch/powerpc/math-emu/fres.c<br/>index 10ecbd08b79e..211c30d0145f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fres.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fres.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fres.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fres.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> fres(void *frD, void *frB)</div><div class='head'>diff --git a/arch/powerpc/math-emu/frsp.c b/arch/powerpc/math-emu/frsp.c<br/>index ddcc14664b1a..3e3bc73e27ae 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/frsp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/frsp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/frsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/frsp.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/frsqrte.c b/arch/powerpc/math-emu/frsqrte.c<br/>index 1d0a3a0fd0e6..7c2ce43750dc 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/frsqrte.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/frsqrte.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/frsqrte.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/frsqrte.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> frsqrte(void *frD, void *frB)</div><div class='head'>diff --git a/arch/powerpc/math-emu/frsqrtes.c b/arch/powerpc/math-emu/frsqrtes.c<br/>index 7e838e380314..269951a8c650 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/frsqrtes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/frsqrtes.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/frsqrtes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/frsqrtes.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int frsqrtes(void *frD, void *frB)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/math-emu/fsel.c b/arch/powerpc/math-emu/fsel.c<br/>index 1b0c14498032..32b62c6c7f48 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fsel.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fsel.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fsel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fsel.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fsqrt.c b/arch/powerpc/math-emu/fsqrt.c<br/>index a55fc7d49983..0e2a34b616dc 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fsqrt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fsqrt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fsqrt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fsqrt.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fsqrts.c b/arch/powerpc/math-emu/fsqrts.c<br/>index 31dccbfc39ff..420cf19b5fd4 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fsqrts.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fsqrts.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fsqrts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fsqrts.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fsub.c b/arch/powerpc/math-emu/fsub.c<br/>index 02c5dff458ba..feedd705cf62 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fsub.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fsub.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fsub.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fsub.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/fsubs.c b/arch/powerpc/math-emu/fsubs.c<br/>index 5d9b18c35e07..74190514063e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/fsubs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/fsubs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/fsubs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/fsubs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/lfd.c b/arch/powerpc/math-emu/lfd.c<br/>index 79ac76d596c3..d998a50740a0 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/lfd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/lfd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/lfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/lfd.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/double.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/lfs.c b/arch/powerpc/math-emu/lfs.c<br/>index 434ed27be8db..1ee10b83d7e3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/lfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/lfs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/lfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/lfs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c<br/>index ab151f040502..76ee2e5dba65 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/math.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/math.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/math.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/math.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/math-emu/math_efp.c b/arch/powerpc/math-emu/math_efp.c<br/>index 28337c9709ae..581f404caa1d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/math_efp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/math_efp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/math_efp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/math_efp.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/prctl.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define FP_EX_BOOKE_E500_SPE</div><div class='head'>diff --git a/arch/powerpc/math-emu/mcrfs.c b/arch/powerpc/math-emu/mcrfs.c<br/>index e948d5708e2b..8e8e72397ebc 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/mcrfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/mcrfs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/mcrfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mcrfs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/mffs.c b/arch/powerpc/math-emu/mffs.c<br/>index 5526cf96ede5..e00fdc22a0bc 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/mffs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/mffs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/mffs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mffs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/mtfsb0.c b/arch/powerpc/math-emu/mtfsb0.c<br/>index bc985585bca8..5ed3e7d5063e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/mtfsb0.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/mtfsb0.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/mtfsb0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mtfsb0.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/mtfsb1.c b/arch/powerpc/math-emu/mtfsb1.c<br/>index fe6ed5ac85b3..602aa16eda81 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/mtfsb1.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/mtfsb1.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/mtfsb1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mtfsb1.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/mtfsf.c b/arch/powerpc/math-emu/mtfsf.c<br/>index 44b0fc8214f4..b0d5593ad357 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/mtfsf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/mtfsf.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/mtfsf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mtfsf.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/mtfsfi.c b/arch/powerpc/math-emu/mtfsfi.c<br/>index fd2acc26813b..5df30541a784 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/mtfsfi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/mtfsfi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/mtfsfi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/mtfsfi.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/stfd.c b/arch/powerpc/math-emu/stfd.c<br/>index 33a165c8df0f..6baeaec134a2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/stfd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/stfd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/stfd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/stfd.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> stfd(void *frS, void *ea)</div><div class='head'>diff --git a/arch/powerpc/math-emu/stfiwx.c b/arch/powerpc/math-emu/stfiwx.c<br/>index f15a35f67e2c..9da7c5d1a872 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/stfiwx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/stfiwx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/stfiwx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/stfiwx.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> stfiwx(u32 *frS, void *ea)</div><div class='head'>diff --git a/arch/powerpc/math-emu/stfs.c b/arch/powerpc/math-emu/stfs.c<br/>index 6122147356d1..62bd25264fb5 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/math-emu/stfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/math-emu/stfs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/math-emu/stfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/math-emu/stfs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sfp-machine.h&gt;</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/mm/40x_mmu.c b/arch/powerpc/mm/40x_mmu.c<br/>index 31a5d42df8c9..61ac468c87c6 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/40x_mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/40x_mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/40x_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/40x_mmu.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/bootx.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='head'>diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile<br/>index 1a4e570f7894..7414034df1c3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/Makefile</a></div><div class='hunk'>@@ -7,7 +7,8 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror</div><div class='ctx'> ccflags-$(CONFIG_PPC64)	:= $(NO_MINIMAL_TOC)</div><div class='ctx'> </div><div class='ctx'> obj-y				:= fault.o mem.o pgtable.o mmap.o \</div><div class='del'>-				   init_$(BITS).o pgtable_$(BITS).o</div><div class='add'>+				   init_$(BITS).o pgtable_$(BITS).o \</div><div class='add'>+				   init-common.o</div><div class='ctx'> obj-$(CONFIG_PPC_MMU_NOHASH)	+= mmu_context_nohash.o tlb_nohash.o \</div><div class='ctx'> 				   tlb_nohash_low.o</div><div class='ctx'> obj-$(CONFIG_PPC_BOOK3E)	+= tlb_low_$(BITS)e.o</div><div class='hunk'>@@ -42,3 +43,5 @@ obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o</div><div class='ctx'> obj-$(CONFIG_HIGHMEM)		+= highmem.o</div><div class='ctx'> obj-$(CONFIG_PPC_COPRO_BASE)	+= copro_fault.o</div><div class='ctx'> obj-$(CONFIG_SPAPR_TCE_IOMMU)	+= mmu_context_iommu.o</div><div class='add'>+obj-$(CONFIG_PPC_PTDUMP)	+= dump_linuxpagetables.o</div><div class='add'>+obj-$(CONFIG_PPC_HTDUMP)	+= dump_hashpagetable.o</div><div class='head'>diff --git a/arch/powerpc/mm/copro_fault.c b/arch/powerpc/mm/copro_fault.c<br/>index 362954f98029..697b70ad1195 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/copro_fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/copro_fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/copro_fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/copro_fault.c</a></div><div class='hunk'>@@ -67,11 +67,13 @@ int copro_handle_mm_fault(struct mm_struct *mm, unsigned long ea,</div><div class='ctx'> 		if (!(vma-&gt;vm_flags &amp; (VM_READ | VM_EXEC)))</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		/*</div><div class='del'>-		 * protfault should only happen due to us</div><div class='del'>-		 * mapping a region readonly temporarily. PROT_NONE</div><div class='del'>-		 * is also covered by the VMA check above.</div><div class='add'>+		 * PROT_NONE is covered by the VMA check above.</div><div class='add'>+		 * and hash should get a NOHPTE fault instead of</div><div class='add'>+		 * a PROTFAULT in case fixup is needed for things</div><div class='add'>+		 * like autonuma.</div><div class='ctx'> 		 */</div><div class='del'>-		WARN_ON_ONCE(dsisr &amp; DSISR_PROTFAULT);</div><div class='add'>+		if (!radix_enabled())</div><div class='add'>+			WARN_ON_ONCE(dsisr &amp; DSISR_PROTFAULT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -134,6 +136,9 @@ int copro_calculate_slb(struct mm_struct *mm, u64 ea, struct copro_slb *slb)</div><div class='ctx'> 		pr_debug("%s: invalid region access at %016llx\n", __func__, ea);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='add'>+	/* Bad address */</div><div class='add'>+	if (!vsid)</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	vsid = (vsid &lt;&lt; slb_vsid_shift(ssize)) | vsidkey;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/dump_hashpagetable.c b/arch/powerpc/mm/dump_hashpagetable.c<br/>new file mode 100644<br/>index 000000000000..d979709a0239<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/dump_hashpagetable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/dump_hashpagetable.c</a></div><div class='hunk'>@@ -0,0 +1,551 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016, Rashmica Gupta, IBM Corp.</div><div class='add'>+ *</div><div class='add'>+ * This traverses the kernel virtual memory and dumps the pages that are in</div><div class='add'>+ * the hash pagetable, along with their flags to</div><div class='add'>+ * /sys/kernel/debug/kernel_hash_pagetable.</div><div class='add'>+ *</div><div class='add'>+ * If radix is enabled then there is no hash page table and so no debugfs file</div><div class='add'>+ * is generated.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; version 2</div><div class='add'>+ * of the License.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;asm/fixmap.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;linux/const.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='add'>+#include &lt;asm/plpar_wrappers.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='add'>+#include &lt;asm/firmware.h&gt;</div><div class='add'>+</div><div class='add'>+struct pg_state {</div><div class='add'>+	struct seq_file *seq;</div><div class='add'>+	const struct addr_marker *marker;</div><div class='add'>+	unsigned long start_address;</div><div class='add'>+	unsigned int level;</div><div class='add'>+	u64 current_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct addr_marker {</div><div class='add'>+	unsigned long start_address;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct addr_marker address_markers[] = {</div><div class='add'>+	{ 0,	"Start of kernel VM" },</div><div class='add'>+	{ 0,	"vmalloc() Area" },</div><div class='add'>+	{ 0,	"vmalloc() End" },</div><div class='add'>+	{ 0,	"isa I/O start" },</div><div class='add'>+	{ 0,	"isa I/O end" },</div><div class='add'>+	{ 0,	"phb I/O start" },</div><div class='add'>+	{ 0,	"phb I/O end" },</div><div class='add'>+	{ 0,	"I/O remap start" },</div><div class='add'>+	{ 0,	"I/O remap end" },</div><div class='add'>+	{ 0,	"vmemmap start" },</div><div class='add'>+	{ -1,	NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct flag_info {</div><div class='add'>+	u64		mask;</div><div class='add'>+	u64		val;</div><div class='add'>+	const char	*set;</div><div class='add'>+	const char	*clear;</div><div class='add'>+	bool		is_val;</div><div class='add'>+	int		shift;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct flag_info v_flag_array[] = {</div><div class='add'>+	{</div><div class='add'>+		.mask   = SLB_VSID_B,</div><div class='add'>+		.val    = SLB_VSID_B_256M,</div><div class='add'>+		.set    = "ssize: 256M",</div><div class='add'>+		.clear  = "ssize: 1T  ",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_V_SECONDARY,</div><div class='add'>+		.val	= HPTE_V_SECONDARY,</div><div class='add'>+		.set	= "secondary",</div><div class='add'>+		.clear	= "primary  ",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_V_VALID,</div><div class='add'>+		.val	= HPTE_V_VALID,</div><div class='add'>+		.set	= "valid  ",</div><div class='add'>+		.clear	= "invalid",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_V_BOLTED,</div><div class='add'>+		.val	= HPTE_V_BOLTED,</div><div class='add'>+		.set	= "bolted",</div><div class='add'>+		.clear	= "",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct flag_info r_flag_array[] = {</div><div class='add'>+	{</div><div class='add'>+		.mask	= HPTE_R_PP0 | HPTE_R_PP,</div><div class='add'>+		.val	= PP_RWXX,</div><div class='add'>+		.set	= "prot:RW--",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_R_PP0 | HPTE_R_PP,</div><div class='add'>+		.val	= PP_RWRX,</div><div class='add'>+		.set	= "prot:RWR-",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_R_PP0 | HPTE_R_PP,</div><div class='add'>+		.val	= PP_RWRW,</div><div class='add'>+		.set	= "prot:RWRW",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_R_PP0 | HPTE_R_PP,</div><div class='add'>+		.val	= PP_RXRX,</div><div class='add'>+		.set	= "prot:R-R-",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_R_PP0 | HPTE_R_PP,</div><div class='add'>+		.val	= PP_RXXX,</div><div class='add'>+		.set	= "prot:R---",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_R_KEY_HI | HPTE_R_KEY_LO,</div><div class='add'>+		.val	= HPTE_R_KEY_HI | HPTE_R_KEY_LO,</div><div class='add'>+		.set	= "key",</div><div class='add'>+		.clear	= "",</div><div class='add'>+		.is_val = true,</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_R_R,</div><div class='add'>+		.val	= HPTE_R_R,</div><div class='add'>+		.set	= "ref",</div><div class='add'>+		.clear	= "   ",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_R_C,</div><div class='add'>+		.val	= HPTE_R_C,</div><div class='add'>+		.set	= "changed",</div><div class='add'>+		.clear	= "       ",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_R_N,</div><div class='add'>+		.val	= HPTE_R_N,</div><div class='add'>+		.set	= "no execute",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_R_WIMG,</div><div class='add'>+		.val	= HPTE_R_W,</div><div class='add'>+		.set	= "writethru",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_R_WIMG,</div><div class='add'>+		.val	= HPTE_R_I,</div><div class='add'>+		.set	= "no cache",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= HPTE_R_WIMG,</div><div class='add'>+		.val	= HPTE_R_G,</div><div class='add'>+		.set	= "guarded",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int calculate_pagesize(struct pg_state *st, int ps, char s[])</div><div class='add'>+{</div><div class='add'>+	static const char units[] = "BKMGTPE";</div><div class='add'>+	const char *unit = units;</div><div class='add'>+</div><div class='add'>+	while (ps &gt; 9 &amp;&amp; unit[1]) {</div><div class='add'>+		ps -= 10;</div><div class='add'>+		unit++;</div><div class='add'>+	}</div><div class='add'>+	seq_printf(st-&gt;seq, "  %s_ps: %i%c\t", s, 1&lt;&lt;ps, *unit);</div><div class='add'>+	return ps;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dump_flag_info(struct pg_state *st, const struct flag_info</div><div class='add'>+		*flag, u64 pte, int num)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++, flag++) {</div><div class='add'>+		const char *s = NULL;</div><div class='add'>+		u64 val;</div><div class='add'>+</div><div class='add'>+		/* flag not defined so don't check it */</div><div class='add'>+		if (flag-&gt;mask == 0)</div><div class='add'>+			continue;</div><div class='add'>+		/* Some 'flags' are actually values */</div><div class='add'>+		if (flag-&gt;is_val) {</div><div class='add'>+			val = pte &amp; flag-&gt;val;</div><div class='add'>+			if (flag-&gt;shift)</div><div class='add'>+				val = val &gt;&gt; flag-&gt;shift;</div><div class='add'>+			seq_printf(st-&gt;seq, "  %s:%llx", flag-&gt;set, val);</div><div class='add'>+		} else {</div><div class='add'>+			if ((pte &amp; flag-&gt;mask) == flag-&gt;val)</div><div class='add'>+				s = flag-&gt;set;</div><div class='add'>+			else</div><div class='add'>+				s = flag-&gt;clear;</div><div class='add'>+			if (s)</div><div class='add'>+				seq_printf(st-&gt;seq, "  %s", s);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dump_hpte_info(struct pg_state *st, unsigned long ea, u64 v, u64 r,</div><div class='add'>+		unsigned long rpn, int bps, int aps, unsigned long lp)</div><div class='add'>+{</div><div class='add'>+	int aps_index;</div><div class='add'>+</div><div class='add'>+	while (ea &gt;= st-&gt;marker[1].start_address) {</div><div class='add'>+		st-&gt;marker++;</div><div class='add'>+		seq_printf(st-&gt;seq, "---[ %s ]---\n", st-&gt;marker-&gt;name);</div><div class='add'>+	}</div><div class='add'>+	seq_printf(st-&gt;seq, "0x%lx:\t", ea);</div><div class='add'>+	seq_printf(st-&gt;seq, "AVPN:%llx\t", HPTE_V_AVPN_VAL(v));</div><div class='add'>+	dump_flag_info(st, v_flag_array, v, ARRAY_SIZE(v_flag_array));</div><div class='add'>+	seq_printf(st-&gt;seq, "  rpn: %lx\t", rpn);</div><div class='add'>+	dump_flag_info(st, r_flag_array, r, ARRAY_SIZE(r_flag_array));</div><div class='add'>+</div><div class='add'>+	calculate_pagesize(st, bps, "base");</div><div class='add'>+	aps_index = calculate_pagesize(st, aps, "actual");</div><div class='add'>+	if (aps_index != 2)</div><div class='add'>+		seq_printf(st-&gt;seq, "LP enc: %lx", lp);</div><div class='add'>+	seq_puts(st-&gt;seq, "\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int native_find(unsigned long ea, int psize, bool primary, u64 *v, u64</div><div class='add'>+		*r)</div><div class='add'>+{</div><div class='add'>+	struct hash_pte *hptep;</div><div class='add'>+	unsigned long hash, vsid, vpn, hpte_group, want_v, hpte_v;</div><div class='add'>+	int i, ssize = mmu_kernel_ssize;</div><div class='add'>+	unsigned long shift = mmu_psize_defs[psize].shift;</div><div class='add'>+</div><div class='add'>+	/* calculate hash */</div><div class='add'>+	vsid = get_kernel_vsid(ea, ssize);</div><div class='add'>+	vpn  = hpt_vpn(ea, vsid, ssize);</div><div class='add'>+	hash = hpt_hash(vpn, shift, ssize);</div><div class='add'>+	want_v = hpte_encode_avpn(vpn, psize, ssize);</div><div class='add'>+</div><div class='add'>+	/* to check in the secondary hash table, we invert the hash */</div><div class='add'>+	if (!primary)</div><div class='add'>+		hash = ~hash;</div><div class='add'>+	hpte_group = (hash &amp; htab_hash_mask) * HPTES_PER_GROUP;</div><div class='add'>+	for (i = 0; i &lt; HPTES_PER_GROUP; i++) {</div><div class='add'>+		hptep = htab_address + hpte_group;</div><div class='add'>+		hpte_v = be64_to_cpu(hptep-&gt;v);</div><div class='add'>+</div><div class='add'>+		if (HPTE_V_COMPARE(hpte_v, want_v) &amp;&amp; (hpte_v &amp; HPTE_V_VALID)) {</div><div class='add'>+			/* HPTE matches */</div><div class='add'>+			*v = be64_to_cpu(hptep-&gt;v);</div><div class='add'>+			*r = be64_to_cpu(hptep-&gt;r);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		++hpte_group;</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_PSERIES</div><div class='add'>+static int pseries_find(unsigned long ea, int psize, bool primary, u64 *v, u64 *r)</div><div class='add'>+{</div><div class='add'>+	struct hash_pte ptes[4];</div><div class='add'>+	unsigned long vsid, vpn, hash, hpte_group, want_v;</div><div class='add'>+	int i, j, ssize = mmu_kernel_ssize;</div><div class='add'>+	long lpar_rc = 0;</div><div class='add'>+	unsigned long shift = mmu_psize_defs[psize].shift;</div><div class='add'>+</div><div class='add'>+	/* calculate hash */</div><div class='add'>+	vsid = get_kernel_vsid(ea, ssize);</div><div class='add'>+	vpn  = hpt_vpn(ea, vsid, ssize);</div><div class='add'>+	hash = hpt_hash(vpn, shift, ssize);</div><div class='add'>+	want_v = hpte_encode_avpn(vpn, psize, ssize);</div><div class='add'>+</div><div class='add'>+	/* to check in the secondary hash table, we invert the hash */</div><div class='add'>+	if (!primary)</div><div class='add'>+		hash = ~hash;</div><div class='add'>+	hpte_group = ((hash &amp; htab_hash_mask) * HPTES_PER_GROUP) &amp; ~0x7UL;</div><div class='add'>+	/* see if we can find an entry in the hpte with this hash */</div><div class='add'>+	for (i = 0; i &lt; HPTES_PER_GROUP; i += 4, hpte_group += 4) {</div><div class='add'>+		lpar_rc = plpar_pte_read_4(0, hpte_group, (void *)ptes);</div><div class='add'>+</div><div class='add'>+		if (lpar_rc != H_SUCCESS)</div><div class='add'>+			continue;</div><div class='add'>+		for (j = 0; j &lt; 4; j++) {</div><div class='add'>+			if (HPTE_V_COMPARE(ptes[j].v, want_v) &amp;&amp;</div><div class='add'>+					(ptes[j].v &amp; HPTE_V_VALID)) {</div><div class='add'>+				/* HPTE matches */</div><div class='add'>+				*v = ptes[j].v;</div><div class='add'>+				*r = ptes[j].r;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void decode_r(int bps, unsigned long r, unsigned long *rpn, int *aps,</div><div class='add'>+		unsigned long *lp_bits)</div><div class='add'>+{</div><div class='add'>+	struct mmu_psize_def entry;</div><div class='add'>+	unsigned long arpn, mask, lp;</div><div class='add'>+	int penc = -2, idx = 0, shift;</div><div class='add'>+</div><div class='add'>+	/*.</div><div class='add'>+	 * The LP field has 8 bits. Depending on the actual page size, some of</div><div class='add'>+	 * these bits are concatenated with the APRN to get the RPN. The rest</div><div class='add'>+	 * of the bits in the LP field is the LP value and is an encoding for</div><div class='add'>+	 * the base page size and the actual page size.</div><div class='add'>+	 *</div><div class='add'>+	 *  -	find the mmu entry for our base page size</div><div class='add'>+	 *  -	go through all page encodings and use the associated mask to</div><div class='add'>+	 *	find an encoding that matches our encoding in the LP field.</div><div class='add'>+	 */</div><div class='add'>+	arpn = (r &amp; HPTE_R_RPN) &gt;&gt; HPTE_R_RPN_SHIFT;</div><div class='add'>+	lp = arpn &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	entry = mmu_psize_defs[bps];</div><div class='add'>+	while (idx &lt; MMU_PAGE_COUNT) {</div><div class='add'>+		penc = entry.penc[idx];</div><div class='add'>+		if ((penc != -1) &amp;&amp; (mmu_psize_defs[idx].shift)) {</div><div class='add'>+			shift = mmu_psize_defs[idx].shift -  HPTE_R_RPN_SHIFT;</div><div class='add'>+			mask = (0x1 &lt;&lt; (shift)) - 1;</div><div class='add'>+			if ((lp &amp; mask) == penc) {</div><div class='add'>+				*aps = mmu_psize_to_shift(idx);</div><div class='add'>+				*lp_bits = lp &amp; mask;</div><div class='add'>+				*rpn = arpn &gt;&gt; shift;</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int base_hpte_find(unsigned long ea, int psize, bool primary, u64 *v,</div><div class='add'>+			  u64 *r)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PPC_PSERIES</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+		return pseries_find(ea, psize, primary, v, r);</div><div class='add'>+#endif</div><div class='add'>+	return native_find(ea, psize, primary, v, r);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long hpte_find(struct pg_state *st, unsigned long ea, int psize)</div><div class='add'>+{</div><div class='add'>+	unsigned long slot;</div><div class='add'>+	u64 v  = 0, r = 0;</div><div class='add'>+	unsigned long rpn, lp_bits;</div><div class='add'>+	int base_psize = 0, actual_psize = 0;</div><div class='add'>+</div><div class='add'>+	if (ea &lt;= PAGE_OFFSET)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* Look in primary table */</div><div class='add'>+	slot = base_hpte_find(ea, psize, true, &amp;v, &amp;r);</div><div class='add'>+</div><div class='add'>+	/* Look in secondary table */</div><div class='add'>+	if (slot == -1)</div><div class='add'>+		slot = base_hpte_find(ea, psize, true, &amp;v, &amp;r);</div><div class='add'>+</div><div class='add'>+	/* No entry found */</div><div class='add'>+	if (slot == -1)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We found an entry in the hash page table:</div><div class='add'>+	 *  - check that this has the same base page</div><div class='add'>+	 *  - find the actual page size</div><div class='add'>+	 *  - find the RPN</div><div class='add'>+	 */</div><div class='add'>+	base_psize = mmu_psize_to_shift(psize);</div><div class='add'>+</div><div class='add'>+	if ((v &amp; HPTE_V_LARGE) == HPTE_V_LARGE) {</div><div class='add'>+		decode_r(psize, r, &amp;rpn, &amp;actual_psize, &amp;lp_bits);</div><div class='add'>+	} else {</div><div class='add'>+		/* 4K actual page size */</div><div class='add'>+		actual_psize = 12;</div><div class='add'>+		rpn = (r &amp; HPTE_R_RPN) &gt;&gt; HPTE_R_RPN_SHIFT;</div><div class='add'>+		/* In this case there are no LP bits */</div><div class='add'>+		lp_bits = -1;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * We didn't find a matching encoding, so the PTE we found isn't for</div><div class='add'>+	 * this address.</div><div class='add'>+	 */</div><div class='add'>+	if (actual_psize == -1)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	dump_hpte_info(st, ea, v, r, rpn, base_psize, actual_psize, lp_bits);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void walk_pte(struct pg_state *st, pmd_t *pmd, unsigned long start)</div><div class='add'>+{</div><div class='add'>+	pte_t *pte = pte_offset_kernel(pmd, 0);</div><div class='add'>+	unsigned long addr, pteval, psize;</div><div class='add'>+	int i, status;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PTRS_PER_PTE; i++, pte++) {</div><div class='add'>+		addr = start + i * PAGE_SIZE;</div><div class='add'>+		pteval = pte_val(*pte);</div><div class='add'>+</div><div class='add'>+		if (addr &lt; VMALLOC_END)</div><div class='add'>+			psize = mmu_vmalloc_psize;</div><div class='add'>+		else</div><div class='add'>+			psize = mmu_io_psize;</div><div class='add'>+#ifdef CONFIG_PPC_64K_PAGES</div><div class='add'>+		/* check for secret 4K mappings */</div><div class='add'>+		if (((pteval &amp; H_PAGE_COMBO) == H_PAGE_COMBO) ||</div><div class='add'>+			((pteval &amp; H_PAGE_4K_PFN) == H_PAGE_4K_PFN))</div><div class='add'>+			psize = mmu_io_psize;</div><div class='add'>+#endif</div><div class='add'>+		/* check for hashpte */</div><div class='add'>+		status = hpte_find(st, addr, psize);</div><div class='add'>+</div><div class='add'>+		if (((pteval &amp; H_PAGE_HASHPTE) != H_PAGE_HASHPTE)</div><div class='add'>+				&amp;&amp; (status != -1)) {</div><div class='add'>+		/* found a hpte that is not in the linux page tables */</div><div class='add'>+			seq_printf(st-&gt;seq, "page probably bolted before linux"</div><div class='add'>+				" pagetables were set: addr:%lx, pteval:%lx\n",</div><div class='add'>+				addr, pteval);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start)</div><div class='add'>+{</div><div class='add'>+	pmd_t *pmd = pmd_offset(pud, 0);</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PTRS_PER_PMD; i++, pmd++) {</div><div class='add'>+		addr = start + i * PMD_SIZE;</div><div class='add'>+		if (!pmd_none(*pmd))</div><div class='add'>+			/* pmd exists */</div><div class='add'>+			walk_pte(st, pmd, addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void walk_pud(struct pg_state *st, pgd_t *pgd, unsigned long start)</div><div class='add'>+{</div><div class='add'>+	pud_t *pud = pud_offset(pgd, 0);</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PTRS_PER_PUD; i++, pud++) {</div><div class='add'>+		addr = start + i * PUD_SIZE;</div><div class='add'>+		if (!pud_none(*pud))</div><div class='add'>+			/* pud exists */</div><div class='add'>+			walk_pmd(st, pud, addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void walk_pagetables(struct pg_state *st)</div><div class='add'>+{</div><div class='add'>+	pgd_t *pgd = pgd_offset_k(0UL);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Traverse the linux pagetable structure and dump pages that are in</div><div class='add'>+	 * the hash pagetable.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; PTRS_PER_PGD; i++, pgd++) {</div><div class='add'>+		addr = KERN_VIRT_START + i * PGDIR_SIZE;</div><div class='add'>+		if (!pgd_none(*pgd))</div><div class='add'>+			/* pgd exists */</div><div class='add'>+			walk_pud(st, pgd, addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void walk_linearmapping(struct pg_state *st)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Traverse the linear mapping section of virtual memory and dump pages</div><div class='add'>+	 * that are in the hash pagetable.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long psize = 1 &lt;&lt; mmu_psize_defs[mmu_linear_psize].shift;</div><div class='add'>+</div><div class='add'>+	for (addr = PAGE_OFFSET; addr &lt; PAGE_OFFSET +</div><div class='add'>+			memblock_phys_mem_size(); addr += psize)</div><div class='add'>+		hpte_find(st, addr, mmu_linear_psize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void walk_vmemmap(struct pg_state *st)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SPARSEMEM_VMEMMAP</div><div class='add'>+	struct vmemmap_backing *ptr = vmemmap_list;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Traverse the vmemmaped memory and dump pages that are in the hash</div><div class='add'>+	 * pagetable.</div><div class='add'>+	 */</div><div class='add'>+	while (ptr-&gt;list) {</div><div class='add'>+		hpte_find(st, ptr-&gt;virt_addr, mmu_vmemmap_psize);</div><div class='add'>+		ptr = ptr-&gt;list;</div><div class='add'>+	}</div><div class='add'>+	seq_puts(st-&gt;seq, "---[ vmemmap end ]---\n");</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void populate_markers(void)</div><div class='add'>+{</div><div class='add'>+	address_markers[0].start_address = PAGE_OFFSET;</div><div class='add'>+	address_markers[1].start_address = VMALLOC_START;</div><div class='add'>+	address_markers[2].start_address = VMALLOC_END;</div><div class='add'>+	address_markers[3].start_address = ISA_IO_BASE;</div><div class='add'>+	address_markers[4].start_address = ISA_IO_END;</div><div class='add'>+	address_markers[5].start_address = PHB_IO_BASE;</div><div class='add'>+	address_markers[6].start_address = PHB_IO_END;</div><div class='add'>+	address_markers[7].start_address = IOREMAP_BASE;</div><div class='add'>+	address_markers[8].start_address = IOREMAP_END;</div><div class='add'>+#ifdef CONFIG_PPC_STD_MMU_64</div><div class='add'>+	address_markers[9].start_address =  H_VMEMMAP_BASE;</div><div class='add'>+#else</div><div class='add'>+	address_markers[9].start_address =  VMEMMAP_BASE;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ptdump_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct pg_state st = {</div><div class='add'>+		.seq = m,</div><div class='add'>+		.start_address = PAGE_OFFSET,</div><div class='add'>+		.marker = address_markers,</div><div class='add'>+	};</div><div class='add'>+	/*</div><div class='add'>+	 * Traverse the 0xc, 0xd and 0xf areas of the kernel virtual memory and</div><div class='add'>+	 * dump pages that are in the hash pagetable.</div><div class='add'>+	 */</div><div class='add'>+	walk_linearmapping(&amp;st);</div><div class='add'>+	walk_pagetables(&amp;st);</div><div class='add'>+	walk_vmemmap(&amp;st);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ptdump_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, ptdump_show, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations ptdump_fops = {</div><div class='add'>+	.open		= ptdump_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ptdump_init(void)</div><div class='add'>+{</div><div class='add'>+	struct dentry *debugfs_file;</div><div class='add'>+</div><div class='add'>+	if (!radix_enabled()) {</div><div class='add'>+		populate_markers();</div><div class='add'>+		debugfs_file = debugfs_create_file("kernel_hash_pagetable",</div><div class='add'>+				0400, NULL, NULL, &amp;ptdump_fops);</div><div class='add'>+		return debugfs_file ? 0 : -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+device_initcall(ptdump_init);</div><div class='head'>diff --git a/arch/powerpc/mm/dump_linuxpagetables.c b/arch/powerpc/mm/dump_linuxpagetables.c<br/>new file mode 100644<br/>index 000000000000..49abaf4dc8e3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/dump_linuxpagetables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/dump_linuxpagetables.c</a></div><div class='hunk'>@@ -0,0 +1,442 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016, Rashmica Gupta, IBM Corp.</div><div class='add'>+ *</div><div class='add'>+ * This traverses the kernel pagetables and dumps the</div><div class='add'>+ * information about the used sections of memory to</div><div class='add'>+ * /sys/kernel/debug/kernel_pagetables.</div><div class='add'>+ *</div><div class='add'>+ * Derived from the arm64 implementation:</div><div class='add'>+ * Copyright (c) 2014, The Linux Foundation, Laura Abbott.</div><div class='add'>+ * (C) Copyright 2008 Intel Corporation, Arjan van de Ven.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; version 2</div><div class='add'>+ * of the License.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;asm/fixmap.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;linux/const.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To visualise what is happening,</div><div class='add'>+ *</div><div class='add'>+ *  - PTRS_PER_P** = how many entries there are in the corresponding P**</div><div class='add'>+ *  - P**_SHIFT = how many bits of the address we use to index into the</div><div class='add'>+ * corresponding P**</div><div class='add'>+ *  - P**_SIZE is how much memory we can access through the table - not the</div><div class='add'>+ * size of the table itself.</div><div class='add'>+ * P**={PGD, PUD, PMD, PTE}</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Each entry of the PGD points to a PUD. Each entry of a PUD points to a</div><div class='add'>+ * PMD. Each entry of a PMD points to a PTE. And every PTE entry points to</div><div class='add'>+ * a page.</div><div class='add'>+ *</div><div class='add'>+ * In the case where there are only 3 levels, the PUD is folded into the</div><div class='add'>+ * PGD: every PUD has only one entry which points to the PMD.</div><div class='add'>+ *</div><div class='add'>+ * The page dumper groups page table entries of the same type into a single</div><div class='add'>+ * description. It uses pg_state to track the range information while</div><div class='add'>+ * iterating over the PTE entries. When the continuity is broken it then</div><div class='add'>+ * dumps out a description of the range - ie PTEs that are virtually contiguous</div><div class='add'>+ * with the same PTE flags are chunked together. This is to make it clear how</div><div class='add'>+ * different areas of the kernel virtual memory are used.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct pg_state {</div><div class='add'>+	struct seq_file *seq;</div><div class='add'>+	const struct addr_marker *marker;</div><div class='add'>+	unsigned long start_address;</div><div class='add'>+	unsigned int level;</div><div class='add'>+	u64 current_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct addr_marker {</div><div class='add'>+	unsigned long start_address;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct addr_marker address_markers[] = {</div><div class='add'>+	{ 0,	"Start of kernel VM" },</div><div class='add'>+	{ 0,	"vmalloc() Area" },</div><div class='add'>+	{ 0,	"vmalloc() End" },</div><div class='add'>+	{ 0,	"isa I/O start" },</div><div class='add'>+	{ 0,	"isa I/O end" },</div><div class='add'>+	{ 0,	"phb I/O start" },</div><div class='add'>+	{ 0,	"phb I/O end" },</div><div class='add'>+	{ 0,	"I/O remap start" },</div><div class='add'>+	{ 0,	"I/O remap end" },</div><div class='add'>+	{ 0,	"vmemmap start" },</div><div class='add'>+	{ -1,	NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct flag_info {</div><div class='add'>+	u64		mask;</div><div class='add'>+	u64		val;</div><div class='add'>+	const char	*set;</div><div class='add'>+	const char	*clear;</div><div class='add'>+	bool		is_val;</div><div class='add'>+	int		shift;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct flag_info flag_array[] = {</div><div class='add'>+	{</div><div class='add'>+#ifdef CONFIG_PPC_STD_MMU_64</div><div class='add'>+		.mask	= _PAGE_PRIVILEGED,</div><div class='add'>+		.val	= 0,</div><div class='add'>+#else</div><div class='add'>+		.mask	= _PAGE_USER,</div><div class='add'>+		.val	= _PAGE_USER,</div><div class='add'>+#endif</div><div class='add'>+		.set	= "user",</div><div class='add'>+		.clear	= "    ",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= _PAGE_RW,</div><div class='add'>+		.val	= _PAGE_RW,</div><div class='add'>+		.set	= "rw",</div><div class='add'>+		.clear	= "ro",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= _PAGE_EXEC,</div><div class='add'>+		.val	= _PAGE_EXEC,</div><div class='add'>+		.set	= " X ",</div><div class='add'>+		.clear	= "   ",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= _PAGE_PTE,</div><div class='add'>+		.val	= _PAGE_PTE,</div><div class='add'>+		.set	= "pte",</div><div class='add'>+		.clear	= "   ",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= _PAGE_PRESENT,</div><div class='add'>+		.val	= _PAGE_PRESENT,</div><div class='add'>+		.set	= "present",</div><div class='add'>+		.clear	= "       ",</div><div class='add'>+	}, {</div><div class='add'>+#ifdef CONFIG_PPC_STD_MMU_64</div><div class='add'>+		.mask	= H_PAGE_HASHPTE,</div><div class='add'>+		.val	= H_PAGE_HASHPTE,</div><div class='add'>+#else</div><div class='add'>+		.mask	= _PAGE_HASHPTE,</div><div class='add'>+		.val	= _PAGE_HASHPTE,</div><div class='add'>+#endif</div><div class='add'>+		.set	= "hpte",</div><div class='add'>+		.clear	= "    ",</div><div class='add'>+	}, {</div><div class='add'>+#ifndef CONFIG_PPC_STD_MMU_64</div><div class='add'>+		.mask	= _PAGE_GUARDED,</div><div class='add'>+		.val	= _PAGE_GUARDED,</div><div class='add'>+		.set	= "guarded",</div><div class='add'>+		.clear	= "       ",</div><div class='add'>+	}, {</div><div class='add'>+#endif</div><div class='add'>+		.mask	= _PAGE_DIRTY,</div><div class='add'>+		.val	= _PAGE_DIRTY,</div><div class='add'>+		.set	= "dirty",</div><div class='add'>+		.clear	= "     ",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= _PAGE_ACCESSED,</div><div class='add'>+		.val	= _PAGE_ACCESSED,</div><div class='add'>+		.set	= "accessed",</div><div class='add'>+		.clear	= "        ",</div><div class='add'>+	}, {</div><div class='add'>+#ifndef CONFIG_PPC_STD_MMU_64</div><div class='add'>+		.mask	= _PAGE_WRITETHRU,</div><div class='add'>+		.val	= _PAGE_WRITETHRU,</div><div class='add'>+		.set	= "write through",</div><div class='add'>+		.clear	= "             ",</div><div class='add'>+	}, {</div><div class='add'>+#endif</div><div class='add'>+		.mask	= _PAGE_NO_CACHE,</div><div class='add'>+		.val	= _PAGE_NO_CACHE,</div><div class='add'>+		.set	= "no cache",</div><div class='add'>+		.clear	= "        ",</div><div class='add'>+	}, {</div><div class='add'>+#ifdef CONFIG_PPC_BOOK3S_64</div><div class='add'>+		.mask	= H_PAGE_BUSY,</div><div class='add'>+		.val	= H_PAGE_BUSY,</div><div class='add'>+		.set	= "busy",</div><div class='add'>+	}, {</div><div class='add'>+#ifdef CONFIG_PPC_64K_PAGES</div><div class='add'>+		.mask	= H_PAGE_COMBO,</div><div class='add'>+		.val	= H_PAGE_COMBO,</div><div class='add'>+		.set	= "combo",</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= H_PAGE_4K_PFN,</div><div class='add'>+		.val	= H_PAGE_4K_PFN,</div><div class='add'>+		.set	= "4K_pfn",</div><div class='add'>+	}, {</div><div class='add'>+#endif</div><div class='add'>+		.mask	= H_PAGE_F_GIX,</div><div class='add'>+		.val	= H_PAGE_F_GIX,</div><div class='add'>+		.set	= "f_gix",</div><div class='add'>+		.is_val	= true,</div><div class='add'>+		.shift	= H_PAGE_F_GIX_SHIFT,</div><div class='add'>+	}, {</div><div class='add'>+		.mask	= H_PAGE_F_SECOND,</div><div class='add'>+		.val	= H_PAGE_F_SECOND,</div><div class='add'>+		.set	= "f_second",</div><div class='add'>+	}, {</div><div class='add'>+#endif</div><div class='add'>+		.mask	= _PAGE_SPECIAL,</div><div class='add'>+		.val	= _PAGE_SPECIAL,</div><div class='add'>+		.set	= "special",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pgtable_level {</div><div class='add'>+	const struct flag_info *flag;</div><div class='add'>+	size_t num;</div><div class='add'>+	u64 mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pgtable_level pg_level[] = {</div><div class='add'>+	{</div><div class='add'>+	}, { /* pgd */</div><div class='add'>+		.flag	= flag_array,</div><div class='add'>+		.num	= ARRAY_SIZE(flag_array),</div><div class='add'>+	}, { /* pud */</div><div class='add'>+		.flag	= flag_array,</div><div class='add'>+		.num	= ARRAY_SIZE(flag_array),</div><div class='add'>+	}, { /* pmd */</div><div class='add'>+		.flag	= flag_array,</div><div class='add'>+		.num	= ARRAY_SIZE(flag_array),</div><div class='add'>+	}, { /* pte */</div><div class='add'>+		.flag	= flag_array,</div><div class='add'>+		.num	= ARRAY_SIZE(flag_array),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void dump_flag_info(struct pg_state *st, const struct flag_info</div><div class='add'>+		*flag, u64 pte, int num)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++, flag++) {</div><div class='add'>+		const char *s = NULL;</div><div class='add'>+		u64 val;</div><div class='add'>+</div><div class='add'>+		/* flag not defined so don't check it */</div><div class='add'>+		if (flag-&gt;mask == 0)</div><div class='add'>+			continue;</div><div class='add'>+		/* Some 'flags' are actually values */</div><div class='add'>+		if (flag-&gt;is_val) {</div><div class='add'>+			val = pte &amp; flag-&gt;val;</div><div class='add'>+			if (flag-&gt;shift)</div><div class='add'>+				val = val &gt;&gt; flag-&gt;shift;</div><div class='add'>+			seq_printf(st-&gt;seq, "  %s:%llx", flag-&gt;set, val);</div><div class='add'>+		} else {</div><div class='add'>+			if ((pte &amp; flag-&gt;mask) == flag-&gt;val)</div><div class='add'>+				s = flag-&gt;set;</div><div class='add'>+			else</div><div class='add'>+				s = flag-&gt;clear;</div><div class='add'>+			if (s)</div><div class='add'>+				seq_printf(st-&gt;seq, "  %s", s);</div><div class='add'>+		}</div><div class='add'>+		st-&gt;current_flags &amp;= ~flag-&gt;mask;</div><div class='add'>+	}</div><div class='add'>+	if (st-&gt;current_flags != 0)</div><div class='add'>+		seq_printf(st-&gt;seq, "  unknown flags:%llx", st-&gt;current_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dump_addr(struct pg_state *st, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	static const char units[] = "KMGTPE";</div><div class='add'>+	const char *unit = units;</div><div class='add'>+	unsigned long delta;</div><div class='add'>+</div><div class='add'>+	seq_printf(st-&gt;seq, "0x%016lx-0x%016lx   ", st-&gt;start_address, addr-1);</div><div class='add'>+	delta = (addr - st-&gt;start_address) &gt;&gt; 10;</div><div class='add'>+	/* Work out what appropriate unit to use */</div><div class='add'>+	while (!(delta &amp; 1023) &amp;&amp; unit[1]) {</div><div class='add'>+		delta &gt;&gt;= 10;</div><div class='add'>+		unit++;</div><div class='add'>+	}</div><div class='add'>+	seq_printf(st-&gt;seq, "%9lu%c", delta, *unit);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void note_page(struct pg_state *st, unsigned long addr,</div><div class='add'>+	       unsigned int level, u64 val)</div><div class='add'>+{</div><div class='add'>+	u64 flag = val &amp; pg_level[level].mask;</div><div class='add'>+	/* At first no level is set */</div><div class='add'>+	if (!st-&gt;level) {</div><div class='add'>+		st-&gt;level = level;</div><div class='add'>+		st-&gt;current_flags = flag;</div><div class='add'>+		st-&gt;start_address = addr;</div><div class='add'>+		seq_printf(st-&gt;seq, "---[ %s ]---\n", st-&gt;marker-&gt;name);</div><div class='add'>+	/*</div><div class='add'>+	 * Dump the section of virtual memory when:</div><div class='add'>+	 *   - the PTE flags from one entry to the next differs.</div><div class='add'>+	 *   - we change levels in the tree.</div><div class='add'>+	 *   - the address is in a different section of memory and is thus</div><div class='add'>+	 *   used for a different purpose, regardless of the flags.</div><div class='add'>+	 */</div><div class='add'>+	} else if (flag != st-&gt;current_flags || level != st-&gt;level ||</div><div class='add'>+		   addr &gt;= st-&gt;marker[1].start_address) {</div><div class='add'>+</div><div class='add'>+		/* Check the PTE flags */</div><div class='add'>+		if (st-&gt;current_flags) {</div><div class='add'>+			dump_addr(st, addr);</div><div class='add'>+</div><div class='add'>+			/* Dump all the flags */</div><div class='add'>+			if (pg_level[st-&gt;level].flag)</div><div class='add'>+				dump_flag_info(st, pg_level[st-&gt;level].flag,</div><div class='add'>+					  st-&gt;current_flags,</div><div class='add'>+					  pg_level[st-&gt;level].num);</div><div class='add'>+</div><div class='add'>+			seq_puts(st-&gt;seq, "\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Address indicates we have passed the end of the</div><div class='add'>+		 * current section of virtual memory</div><div class='add'>+		 */</div><div class='add'>+		while (addr &gt;= st-&gt;marker[1].start_address) {</div><div class='add'>+			st-&gt;marker++;</div><div class='add'>+			seq_printf(st-&gt;seq, "---[ %s ]---\n", st-&gt;marker-&gt;name);</div><div class='add'>+		}</div><div class='add'>+		st-&gt;start_address = addr;</div><div class='add'>+		st-&gt;current_flags = flag;</div><div class='add'>+		st-&gt;level = level;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void walk_pte(struct pg_state *st, pmd_t *pmd, unsigned long start)</div><div class='add'>+{</div><div class='add'>+	pte_t *pte = pte_offset_kernel(pmd, 0);</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PTRS_PER_PTE; i++, pte++) {</div><div class='add'>+		addr = start + i * PAGE_SIZE;</div><div class='add'>+		note_page(st, addr, 4, pte_val(*pte));</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start)</div><div class='add'>+{</div><div class='add'>+	pmd_t *pmd = pmd_offset(pud, 0);</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PTRS_PER_PMD; i++, pmd++) {</div><div class='add'>+		addr = start + i * PMD_SIZE;</div><div class='add'>+		if (!pmd_none(*pmd))</div><div class='add'>+			/* pmd exists */</div><div class='add'>+			walk_pte(st, pmd, addr);</div><div class='add'>+		else</div><div class='add'>+			note_page(st, addr, 3, pmd_val(*pmd));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void walk_pud(struct pg_state *st, pgd_t *pgd, unsigned long start)</div><div class='add'>+{</div><div class='add'>+	pud_t *pud = pud_offset(pgd, 0);</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PTRS_PER_PUD; i++, pud++) {</div><div class='add'>+		addr = start + i * PUD_SIZE;</div><div class='add'>+		if (!pud_none(*pud))</div><div class='add'>+			/* pud exists */</div><div class='add'>+			walk_pmd(st, pud, addr);</div><div class='add'>+		else</div><div class='add'>+			note_page(st, addr, 2, pud_val(*pud));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void walk_pagetables(struct pg_state *st)</div><div class='add'>+{</div><div class='add'>+	pgd_t *pgd = pgd_offset_k(0UL);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Traverse the linux pagetable structure and dump pages that are in</div><div class='add'>+	 * the hash pagetable.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; PTRS_PER_PGD; i++, pgd++) {</div><div class='add'>+		addr = KERN_VIRT_START + i * PGDIR_SIZE;</div><div class='add'>+		if (!pgd_none(*pgd))</div><div class='add'>+			/* pgd exists */</div><div class='add'>+			walk_pud(st, pgd, addr);</div><div class='add'>+		else</div><div class='add'>+			note_page(st, addr, 1, pgd_val(*pgd));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void populate_markers(void)</div><div class='add'>+{</div><div class='add'>+	address_markers[0].start_address = PAGE_OFFSET;</div><div class='add'>+	address_markers[1].start_address = VMALLOC_START;</div><div class='add'>+	address_markers[2].start_address = VMALLOC_END;</div><div class='add'>+	address_markers[3].start_address = ISA_IO_BASE;</div><div class='add'>+	address_markers[4].start_address = ISA_IO_END;</div><div class='add'>+	address_markers[5].start_address = PHB_IO_BASE;</div><div class='add'>+	address_markers[6].start_address = PHB_IO_END;</div><div class='add'>+	address_markers[7].start_address = IOREMAP_BASE;</div><div class='add'>+	address_markers[8].start_address = IOREMAP_END;</div><div class='add'>+#ifdef CONFIG_PPC_STD_MMU_64</div><div class='add'>+	address_markers[9].start_address =  H_VMEMMAP_BASE;</div><div class='add'>+#else</div><div class='add'>+	address_markers[9].start_address =  VMEMMAP_BASE;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ptdump_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct pg_state st = {</div><div class='add'>+		.seq = m,</div><div class='add'>+		.start_address = KERN_VIRT_START,</div><div class='add'>+		.marker = address_markers,</div><div class='add'>+	};</div><div class='add'>+	/* Traverse kernel page tables */</div><div class='add'>+	walk_pagetables(&amp;st);</div><div class='add'>+	note_page(&amp;st, 0, 0, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ptdump_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, ptdump_show, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations ptdump_fops = {</div><div class='add'>+	.open		= ptdump_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void build_pgtable_complete_mask(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pg_level); i++)</div><div class='add'>+		if (pg_level[i].flag)</div><div class='add'>+			for (j = 0; j &lt; pg_level[i].num; j++)</div><div class='add'>+				pg_level[i].mask |= pg_level[i].flag[j].mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ptdump_init(void)</div><div class='add'>+{</div><div class='add'>+	struct dentry *debugfs_file;</div><div class='add'>+</div><div class='add'>+	populate_markers();</div><div class='add'>+	build_pgtable_complete_mask();</div><div class='add'>+	debugfs_file = debugfs_create_file("kernel_pagetables", 0400, NULL,</div><div class='add'>+			NULL, &amp;ptdump_fops);</div><div class='add'>+	return debugfs_file ? 0 : -ENOMEM;</div><div class='add'>+}</div><div class='add'>+device_initcall(ptdump_init);</div><div class='head'>diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c<br/>index d0b137d96df1..51def8a515be 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/fault.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -253,8 +254,11 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,</div><div class='ctx'> 	if (unlikely(debugger_fault_handler(regs)))</div><div class='ctx'> 		goto bail;</div><div class='ctx'> </div><div class='del'>-	/* On a kernel SLB miss we can only check for a valid exception entry */</div><div class='del'>-	if (!user_mode(regs) &amp;&amp; (address &gt;= TASK_SIZE)) {</div><div class='add'>+	/*</div><div class='add'>+	 * The kernel should never take an execute fault nor should it</div><div class='add'>+	 * take a page fault to a kernel address.</div><div class='add'>+	 */</div><div class='add'>+	if (!user_mode(regs) &amp;&amp; (is_exec || (address &gt;= TASK_SIZE))) {</div><div class='ctx'> 		rc = SIGSEGV;</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -404,14 +408,6 @@ good_area:</div><div class='ctx'> 		    (cpu_has_feature(CPU_FTR_NOEXECUTE) ||</div><div class='ctx'> 		     !(vma-&gt;vm_flags &amp; (VM_READ | VM_WRITE))))</div><div class='ctx'> 			goto bad_area;</div><div class='del'>-#ifdef CONFIG_PPC_STD_MMU</div><div class='del'>-		/*</div><div class='del'>-		 * protfault should only happen due to us</div><div class='del'>-		 * mapping a region readonly temporarily. PROT_NONE</div><div class='del'>-		 * is also covered by the VMA check above.</div><div class='del'>-		 */</div><div class='del'>-		WARN_ON_ONCE(error_code &amp; DSISR_PROTFAULT);</div><div class='del'>-#endif /* CONFIG_PPC_STD_MMU */</div><div class='ctx'> 	/* a write */</div><div class='ctx'> 	} else if (is_write) {</div><div class='ctx'> 		if (!(vma-&gt;vm_flags &amp; VM_WRITE))</div><div class='hunk'>@@ -421,8 +417,40 @@ good_area:</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!(vma-&gt;vm_flags &amp; (VM_READ | VM_EXEC | VM_WRITE)))</div><div class='ctx'> 			goto bad_area;</div><div class='del'>-		WARN_ON_ONCE(error_code &amp; DSISR_PROTFAULT);</div><div class='ctx'> 	}</div><div class='add'>+#ifdef CONFIG_PPC_STD_MMU</div><div class='add'>+	/*</div><div class='add'>+	 * For hash translation mode, we should never get a</div><div class='add'>+	 * PROTFAULT. Any update to pte to reduce access will result in us</div><div class='add'>+	 * removing the hash page table entry, thus resulting in a DSISR_NOHPTE</div><div class='add'>+	 * fault instead of DSISR_PROTFAULT.</div><div class='add'>+	 *</div><div class='add'>+	 * A pte update to relax the access will not result in a hash page table</div><div class='add'>+	 * entry invalidate and hence can result in DSISR_PROTFAULT.</div><div class='add'>+	 * ptep_set_access_flags() doesn't do a hpte flush. This is why we have</div><div class='add'>+	 * the special !is_write in the below conditional.</div><div class='add'>+	 *</div><div class='add'>+	 * For platforms that doesn't supports coherent icache and do support</div><div class='add'>+	 * per page noexec bit, we do setup things such that we do the</div><div class='add'>+	 * sync between D/I cache via fault. But that is handled via low level</div><div class='add'>+	 * hash fault code (hash_page_do_lazy_icache()) and we should not reach</div><div class='add'>+	 * here in such case.</div><div class='add'>+	 *</div><div class='add'>+	 * For wrong access that can result in PROTFAULT, the above vma-&gt;vm_flags</div><div class='add'>+	 * check should handle those and hence we should fall to the bad_area</div><div class='add'>+	 * handling correctly.</div><div class='add'>+	 *</div><div class='add'>+	 * For embedded with per page exec support that doesn't support coherent</div><div class='add'>+	 * icache we do get PROTFAULT and we handle that D/I cache sync in</div><div class='add'>+	 * set_pte_at while taking the noexec/prot fault. Hence this is WARN_ON</div><div class='add'>+	 * is conditional for server MMU.</div><div class='add'>+	 *</div><div class='add'>+	 * For radix, we can get prot fault for autonuma case, because radix</div><div class='add'>+	 * page table will have them marked noaccess for user.</div><div class='add'>+	 */</div><div class='add'>+	if (!radix_enabled() &amp;&amp; !is_write)</div><div class='add'>+		WARN_ON_ONCE(error_code &amp; DSISR_PROTFAULT);</div><div class='add'>+#endif /* CONFIG_PPC_STD_MMU */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If for any reason at all we couldn't handle the fault,</div><div class='hunk'>@@ -512,7 +540,7 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)</div><div class='ctx'> </div><div class='ctx'> 	/* Are we prepared to handle this fault?  */</div><div class='ctx'> 	if ((entry = search_exception_tables(regs-&gt;nip)) != NULL) {</div><div class='del'>-		regs-&gt;nip = entry-&gt;fixup;</div><div class='add'>+		regs-&gt;nip = extable_fixup(entry);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c<br/>index 139dec421e57..080d49b26c3a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/fsl_booke_mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/fsl_booke_mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/fsl_booke_mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/fsl_booke_mmu.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='head'>diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c<br/>index 83ddc0e171b0..cc332608e656 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/hash_native_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/hash_native_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/hash_native_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/hash_native_64.c</a></div><div class='hunk'>@@ -123,8 +123,9 @@ static inline void __tlbiel(unsigned long vpn, int psize, int apsize, int ssize)</div><div class='ctx'> 		va |= ssize &lt;&lt; 8;</div><div class='ctx'> 		sllp = get_sllp_encoding(apsize);</div><div class='ctx'> 		va |= sllp &lt;&lt; 5;</div><div class='del'>-		asm volatile(".long 0x7c000224 | (%0 &lt;&lt; 11) | (0 &lt;&lt; 21)"</div><div class='del'>-			     : : "r"(va) : "memory");</div><div class='add'>+		asm volatile(ASM_FTR_IFSET("tlbiel %0", "tlbiel %0,0", %1)</div><div class='add'>+			     : : "r" (va), "i" (CPU_FTR_ARCH_206)</div><div class='add'>+			     : "memory");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* We need 14 to 14 + i bits of va */</div><div class='hunk'>@@ -141,8 +142,9 @@ static inline void __tlbiel(unsigned long vpn, int psize, int apsize, int ssize)</div><div class='ctx'> 		 */</div><div class='ctx'> 		va |= (vpn &amp; 0xfe);</div><div class='ctx'> 		va |= 1; /* L */</div><div class='del'>-		asm volatile(".long 0x7c000224 | (%0 &lt;&lt; 11) | (1 &lt;&lt; 21)"</div><div class='del'>-			     : : "r"(va) : "memory");</div><div class='add'>+		asm volatile(ASM_FTR_IFSET("tlbiel %0", "tlbiel %0,1", %1)</div><div class='add'>+			     : : "r" (va), "i" (CPU_FTR_ARCH_206)</div><div class='add'>+			     : "memory");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -221,13 +223,18 @@ static long native_hpte_insert(unsigned long hpte_group, unsigned long vpn,</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	hpte_v = hpte_encode_v(vpn, psize, apsize, ssize) | vflags | HPTE_V_VALID;</div><div class='del'>-	hpte_r = hpte_encode_r(pa, psize, apsize, ssize) | rflags;</div><div class='add'>+	hpte_r = hpte_encode_r(pa, psize, apsize) | rflags;</div><div class='ctx'> </div><div class='ctx'> 	if (!(vflags &amp; HPTE_V_BOLTED)) {</div><div class='ctx'> 		DBG_LOW(" i=%x hpte_v=%016lx, hpte_r=%016lx\n",</div><div class='ctx'> 			i, hpte_v, hpte_r);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		hpte_r = hpte_old_to_new_r(hpte_v, hpte_r);</div><div class='add'>+		hpte_v = hpte_old_to_new_v(hpte_v);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hptep-&gt;r = cpu_to_be64(hpte_r);</div><div class='ctx'> 	/* Guarantee the second dword is visible before the valid bit */</div><div class='ctx'> 	eieio();</div><div class='hunk'>@@ -295,6 +302,8 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,</div><div class='ctx'> 		vpn, want_v &amp; HPTE_V_AVPN, slot, newpp);</div><div class='ctx'> </div><div class='ctx'> 	hpte_v = be64_to_cpu(hptep-&gt;v);</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		hpte_v = hpte_new_to_old_v(hpte_v, be64_to_cpu(hptep-&gt;r));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to invalidate the TLB always because hpte_remove doesn't do</div><div class='ctx'> 	 * a tlb invalidate. If a hash bucket gets full, we "evict" a more/less</div><div class='hunk'>@@ -309,6 +318,8 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,</div><div class='ctx'> 		native_lock_hpte(hptep);</div><div class='ctx'> 		/* recheck with locks held */</div><div class='ctx'> 		hpte_v = be64_to_cpu(hptep-&gt;v);</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+			hpte_v = hpte_new_to_old_v(hpte_v, be64_to_cpu(hptep-&gt;r));</div><div class='ctx'> 		if (unlikely(!HPTE_V_COMPARE(hpte_v, want_v) ||</div><div class='ctx'> 			     !(hpte_v &amp; HPTE_V_VALID))) {</div><div class='ctx'> 			ret = -1;</div><div class='hunk'>@@ -350,6 +361,8 @@ static long native_hpte_find(unsigned long vpn, int psize, int ssize)</div><div class='ctx'> 	for (i = 0; i &lt; HPTES_PER_GROUP; i++) {</div><div class='ctx'> 		hptep = htab_address + slot;</div><div class='ctx'> 		hpte_v = be64_to_cpu(hptep-&gt;v);</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+			hpte_v = hpte_new_to_old_v(hpte_v, be64_to_cpu(hptep-&gt;r));</div><div class='ctx'> </div><div class='ctx'> 		if (HPTE_V_COMPARE(hpte_v, want_v) &amp;&amp; (hpte_v &amp; HPTE_V_VALID))</div><div class='ctx'> 			/* HPTE matches */</div><div class='hunk'>@@ -409,6 +422,8 @@ static void native_hpte_invalidate(unsigned long slot, unsigned long vpn,</div><div class='ctx'> 	want_v = hpte_encode_avpn(vpn, bpsize, ssize);</div><div class='ctx'> 	native_lock_hpte(hptep);</div><div class='ctx'> 	hpte_v = be64_to_cpu(hptep-&gt;v);</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+		hpte_v = hpte_new_to_old_v(hpte_v, be64_to_cpu(hptep-&gt;r));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to invalidate the TLB always because hpte_remove doesn't do</div><div class='hunk'>@@ -467,6 +482,8 @@ static void native_hugepage_invalidate(unsigned long vsid,</div><div class='ctx'> 		want_v = hpte_encode_avpn(vpn, psize, ssize);</div><div class='ctx'> 		native_lock_hpte(hptep);</div><div class='ctx'> 		hpte_v = be64_to_cpu(hptep-&gt;v);</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+			hpte_v = hpte_new_to_old_v(hpte_v, be64_to_cpu(hptep-&gt;r));</div><div class='ctx'> </div><div class='ctx'> 		/* Even if we miss, we need to invalidate the TLB */</div><div class='ctx'> 		if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v &amp; HPTE_V_VALID))</div><div class='hunk'>@@ -504,6 +521,10 @@ static void hpte_decode(struct hash_pte *hpte, unsigned long slot,</div><div class='ctx'> 	/* Look at the 8 bit LP value */</div><div class='ctx'> 	unsigned int lp = (hpte_r &gt;&gt; LP_SHIFT) &amp; ((1 &lt;&lt; LP_BITS) - 1);</div><div class='ctx'> </div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+		hpte_v = hpte_new_to_old_v(hpte_v, hpte_r);</div><div class='add'>+		hpte_r = hpte_new_to_old_r(hpte_r);</div><div class='add'>+	}</div><div class='ctx'> 	if (!(hpte_v &amp; HPTE_V_LARGE)) {</div><div class='ctx'> 		size   = MMU_PAGE_4K;</div><div class='ctx'> 		a_size = MMU_PAGE_4K;</div><div class='hunk'>@@ -512,11 +533,7 @@ static void hpte_decode(struct hash_pte *hpte, unsigned long slot,</div><div class='ctx'> 		a_size = hpte_page_sizes[lp] &gt;&gt; 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* This works for all page sizes, and for 256M and 1T segments */</div><div class='del'>-	if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='del'>-		*ssize = hpte_r &gt;&gt; HPTE_R_3_0_SSIZE_SHIFT;</div><div class='del'>-	else</div><div class='del'>-		*ssize = hpte_v &gt;&gt; HPTE_V_SSIZE_SHIFT;</div><div class='del'>-</div><div class='add'>+	*ssize = hpte_v &gt;&gt; HPTE_V_SSIZE_SHIFT;</div><div class='ctx'> 	shift = mmu_psize_defs[size].shift;</div><div class='ctx'> </div><div class='ctx'> 	avpn = (HPTE_V_AVPN_VAL(hpte_v) &amp; ~mmu_psize_defs[size].avpnm);</div><div class='hunk'>@@ -639,6 +656,9 @@ static void native_flush_hash_range(unsigned long number, int local)</div><div class='ctx'> 			want_v = hpte_encode_avpn(vpn, psize, ssize);</div><div class='ctx'> 			native_lock_hpte(hptep);</div><div class='ctx'> 			hpte_v = be64_to_cpu(hptep-&gt;v);</div><div class='add'>+			if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+				hpte_v = hpte_new_to_old_v(hpte_v,</div><div class='add'>+						be64_to_cpu(hptep-&gt;r));</div><div class='ctx'> 			if (!HPTE_V_COMPARE(hpte_v, want_v) ||</div><div class='ctx'> 			    !(hpte_v &amp; HPTE_V_VALID))</div><div class='ctx'> 				native_unlock_hpte(hptep);</div><div class='head'>diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c<br/>index 78dabf065ba9..c554768b1fa2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/hash_utils_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/hash_utils_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/hash_utils_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/hash_utils_64.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='hunk'>@@ -35,14 +35,16 @@</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/context_tracking.h&gt;</div><div class='ctx'> #include &lt;linux/libfdt.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/debug.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='hunk'>@@ -747,7 +749,36 @@ static unsigned long __init htab_get_table_size(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTPLUG</div><div class='del'>-int create_section_mapping(unsigned long start, unsigned long end)</div><div class='add'>+void resize_hpt_for_hotplug(unsigned long new_mem_size)</div><div class='add'>+{</div><div class='add'>+	unsigned target_hpt_shift;</div><div class='add'>+</div><div class='add'>+	if (!mmu_hash_ops.resize_hpt)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	target_hpt_shift = htab_shift_for_mem_size(new_mem_size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * To avoid lots of HPT resizes if memory size is fluctuating</div><div class='add'>+	 * across a boundary, we deliberately have some hysterisis</div><div class='add'>+	 * here: we immediately increase the HPT size if the target</div><div class='add'>+	 * shift exceeds the current shift, but we won't attempt to</div><div class='add'>+	 * reduce unless the target shift is at least 2 below the</div><div class='add'>+	 * current shift</div><div class='add'>+	 */</div><div class='add'>+	if ((target_hpt_shift &gt; ppc64_pft_size)</div><div class='add'>+	    || (target_hpt_shift &lt; (ppc64_pft_size - 1))) {</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='add'>+		rc = mmu_hash_ops.resize_hpt(target_hpt_shift);</div><div class='add'>+		if (rc)</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "Unable to resize hash page table to target order %d: %d\n",</div><div class='add'>+			       target_hpt_shift, rc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hash__create_section_mapping(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = htab_bolt_mapping(start, end, __pa(start),</div><div class='ctx'> 				   pgprot_val(PAGE_KERNEL), mmu_linear_psize,</div><div class='hunk'>@@ -761,7 +792,7 @@ int create_section_mapping(unsigned long start, unsigned long end)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int remove_section_mapping(unsigned long start, unsigned long end)</div><div class='add'>+int hash__remove_section_mapping(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = htab_remove_mapping(start, end, mmu_linear_psize,</div><div class='ctx'> 				     mmu_kernel_ssize);</div><div class='hunk'>@@ -796,37 +827,17 @@ static void update_hid_for_hash(void)</div><div class='ctx'> static void __init hash_init_partition_table(phys_addr_t hash_table,</div><div class='ctx'> 					     unsigned long htab_size)</div><div class='ctx'> {</div><div class='del'>-	unsigned long ps_field;</div><div class='del'>-	unsigned long patb_size = 1UL &lt;&lt; PATB_SIZE_SHIFT;</div><div class='add'>+	mmu_partition_table_init();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * slb llp encoding for the page size used in VPM real mode.</div><div class='del'>-	 * We can ignore that for lpid 0</div><div class='add'>+	 * PS field (VRMA page size) is not used for LPID 0, hence set to 0.</div><div class='add'>+	 * For now, UPRT is 0 and we have no segment table.</div><div class='ctx'> 	 */</div><div class='del'>-	ps_field = 0;</div><div class='ctx'> 	htab_size =  __ilog2(htab_size) - 18;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON_MSG((PATB_SIZE_SHIFT &gt; 24), "Partition table size too large.");</div><div class='del'>-	partition_tb = __va(memblock_alloc_base(patb_size, patb_size,</div><div class='del'>-						MEMBLOCK_ALLOC_ANYWHERE));</div><div class='del'>-</div><div class='del'>-	/* Initialize the Partition Table with no entries */</div><div class='del'>-	memset((void *)partition_tb, 0, patb_size);</div><div class='del'>-	partition_tb-&gt;patb0 = cpu_to_be64(ps_field | hash_table | htab_size);</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME!! This should be done via update_partition table</div><div class='del'>-	 * For now UPRT is 0 for us.</div><div class='del'>-	 */</div><div class='del'>-	partition_tb-&gt;patb1 = 0;</div><div class='add'>+	mmu_partition_table_set_entry(0, hash_table | htab_size, 0);</div><div class='ctx'> 	pr_info("Partition table %p\n", partition_tb);</div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='ctx'> 		update_hid_for_hash();</div><div class='del'>-	/*</div><div class='del'>-	 * update partition table control register,</div><div class='del'>-	 * 64 K size.</div><div class='del'>-	 */</div><div class='del'>-	mtspr(SPRN_PTCR, __pa(partition_tb) | (PATB_SIZE_SHIFT - 12));</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init htab_initialize(void)</div><div class='hunk'>@@ -1815,3 +1826,34 @@ void hash__setup_initial_memory_limit(phys_addr_t first_memblock_base,</div><div class='ctx'> 	/* Finally limit subsequent allocations */</div><div class='ctx'> 	memblock_set_current_limit(ppc64_rma_size);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+</div><div class='add'>+static int hpt_order_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	*val = ppc64_pft_size;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hpt_order_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	if (!mmu_hash_ops.resize_hpt)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return mmu_hash_ops.resize_hpt(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_SIMPLE_ATTRIBUTE(fops_hpt_order, hpt_order_get, hpt_order_set, "%llu\n");</div><div class='add'>+</div><div class='add'>+static int __init hash64_debugfs(void)</div><div class='add'>+{</div><div class='add'>+	if (!debugfs_create_file("hpt_order", 0600, powerpc_debugfs_root,</div><div class='add'>+				 NULL, &amp;fops_hpt_order)) {</div><div class='add'>+		pr_err("lpar: unable to create hpt_order debugsfs file\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+machine_device_initcall(pseries, hash64_debugfs);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_DEBUG_FS */</div><div class='head'>diff --git a/arch/powerpc/mm/hugetlbpage-hash64.c b/arch/powerpc/mm/hugetlbpage-hash64.c<br/>index d5026f3800b6..a84bb44497f9 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/hugetlbpage-hash64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/hugetlbpage-hash64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/hugetlbpage-hash64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/hugetlbpage-hash64.c</a></div><div class='hunk'>@@ -116,21 +116,3 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid,</div><div class='ctx'> 	*ptep = __pte(new_pte &amp; ~H_PAGE_BUSY);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PPC_64K_PAGES) &amp;&amp; defined(CONFIG_DEBUG_VM)</div><div class='del'>-/*</div><div class='del'>- * This enables us to catch the wrong page directory format</div><div class='del'>- * Moved here so that we can use WARN() in the call.</div><div class='del'>- */</div><div class='del'>-int hugepd_ok(hugepd_t hpd)</div><div class='del'>-{</div><div class='del'>-	bool is_hugepd;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We should not find this format in page directory, warn otherwise.</div><div class='del'>-	 */</div><div class='del'>-	is_hugepd = (((hpd.pd &amp; 0x3) == 0x0) &amp;&amp; ((hpd.pd &amp; HUGEPD_SHIFT_MASK) != 0));</div><div class='del'>-	WARN(is_hugepd, "Found wrong page directory format\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c<br/>index a5d3ecdabc44..8c3389cbcd12 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/hugetlbpage.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/hugetlbpage.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -26,6 +26,8 @@</div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> </div><div class='ctx'> #define PAGE_SHIFT_64K	16</div><div class='add'>+#define PAGE_SHIFT_512K	19</div><div class='add'>+#define PAGE_SHIFT_8M	23</div><div class='ctx'> #define PAGE_SHIFT_16M	24</div><div class='ctx'> #define PAGE_SHIFT_16G	34</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +40,7 @@ unsigned int HPAGE_SHIFT;</div><div class='ctx'>  * implementations may have more than one gpage size, so we need multiple</div><div class='ctx'>  * arrays</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='add'>+#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_8xx)</div><div class='ctx'> #define MAX_NUMBER_GPAGES	128</div><div class='ctx'> struct psize_gpages {</div><div class='ctx'> 	u64 gpage_list[MAX_NUMBER_GPAGES];</div><div class='hunk'>@@ -51,7 +53,7 @@ static u64 gpage_freearray[MAX_NUMBER_GPAGES];</div><div class='ctx'> static unsigned nr_gpages;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define hugepd_none(hpd)	((hpd).pd == 0)</div><div class='add'>+#define hugepd_none(hpd)	(hpd_val(hpd) == 0)</div><div class='ctx'> </div><div class='ctx'> pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -64,14 +66,16 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,</div><div class='ctx'> {</div><div class='ctx'> 	struct kmem_cache *cachep;</div><div class='ctx'> 	pte_t *new;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> 	int i;</div><div class='del'>-	int num_hugepd = 1 &lt;&lt; (pshift - pdshift);</div><div class='del'>-	cachep = hugepte_cache;</div><div class='del'>-#else</div><div class='del'>-	cachep = PGT_CACHE(pdshift - pshift);</div><div class='del'>-#endif</div><div class='add'>+	int num_hugepd;</div><div class='add'>+</div><div class='add'>+	if (pshift &gt;= pdshift) {</div><div class='add'>+		cachep = hugepte_cache;</div><div class='add'>+		num_hugepd = 1 &lt;&lt; (pshift - pdshift);</div><div class='add'>+	} else {</div><div class='add'>+		cachep = PGT_CACHE(pdshift - pshift);</div><div class='add'>+		num_hugepd = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	new = kmem_cache_zalloc(cachep, GFP_KERNEL);</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +93,7 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;mm-&gt;page_table_lock);</div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have multiple higher-level entries that point to the same</div><div class='ctx'> 	 * actual pte location.  Fill in each as we go and backtrack on error.</div><div class='hunk'>@@ -99,27 +103,26 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,</div><div class='ctx'> 	for (i = 0; i &lt; num_hugepd; i++, hpdp++) {</div><div class='ctx'> 		if (unlikely(!hugepd_none(*hpdp)))</div><div class='ctx'> 			break;</div><div class='del'>-		else</div><div class='add'>+		else {</div><div class='add'>+#ifdef CONFIG_PPC_BOOK3S_64</div><div class='add'>+			*hpdp = __hugepd(__pa(new) |</div><div class='add'>+					 (shift_to_mmu_psize(pshift) &lt;&lt; 2));</div><div class='add'>+#elif defined(CONFIG_PPC_8xx)</div><div class='add'>+			*hpdp = __hugepd(__pa(new) |</div><div class='add'>+					 (pshift == PAGE_SHIFT_8M ? _PMD_PAGE_8M :</div><div class='add'>+					  _PMD_PAGE_512K) | _PMD_PRESENT);</div><div class='add'>+#else</div><div class='ctx'> 			/* We use the old format for PPC_FSL_BOOK3E */</div><div class='del'>-			hpdp-&gt;pd = ((unsigned long)new &amp; ~PD_HUGE) | pshift;</div><div class='add'>+			*hpdp = __hugepd(((unsigned long)new &amp; ~PD_HUGE) | pshift);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* If we bailed from the for loop early, an error occurred, clean up */</div><div class='ctx'> 	if (i &lt; num_hugepd) {</div><div class='ctx'> 		for (i = i - 1 ; i &gt;= 0; i--, hpdp--)</div><div class='del'>-			hpdp-&gt;pd = 0;</div><div class='del'>-		kmem_cache_free(cachep, new);</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	if (!hugepd_none(*hpdp))</div><div class='add'>+			*hpdp = __hugepd(0);</div><div class='ctx'> 		kmem_cache_free(cachep, new);</div><div class='del'>-	else {</div><div class='del'>-#ifdef CONFIG_PPC_BOOK3S_64</div><div class='del'>-		hpdp-&gt;pd = __pa(new) | (shift_to_mmu_psize(pshift) &lt;&lt; 2);</div><div class='del'>-#else</div><div class='del'>-		hpdp-&gt;pd = ((unsigned long)new &amp; ~PD_HUGE) | pshift;</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> 	spin_unlock(&amp;mm-&gt;page_table_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -128,7 +131,7 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,</div><div class='ctx'>  * These macros define how to determine which level of the page table holds</div><div class='ctx'>  * the hpdp.</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='add'>+#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_8xx)</div><div class='ctx'> #define HUGEPD_PGD_SHIFT PGDIR_SHIFT</div><div class='ctx'> #define HUGEPD_PUD_SHIFT PUD_SHIFT</div><div class='ctx'> #else</div><div class='hunk'>@@ -136,7 +139,6 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,</div><div class='ctx'> #define HUGEPD_PUD_SHIFT PMD_SHIFT</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_BOOK3S_64</div><div class='ctx'> /*</div><div class='ctx'>  * At this point we do the placement change only for BOOK3S 64. This would</div><div class='ctx'>  * possibly work on other subarchs.</div><div class='hunk'>@@ -153,6 +155,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz</div><div class='ctx'> 	addr &amp;= ~(sz-1);</div><div class='ctx'> 	pg = pgd_offset(mm, addr);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_BOOK3S_64</div><div class='ctx'> 	if (pshift == PGDIR_SHIFT)</div><div class='ctx'> 		/* 16GB huge page */</div><div class='ctx'> 		return (pte_t *) pg;</div><div class='hunk'>@@ -178,32 +181,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz</div><div class='ctx'> 				hpdp = (hugepd_t *)pm;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!hpdp)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!hugepd_none(*hpdp) &amp;&amp; !hugepd_ok(*hpdp));</div><div class='del'>-</div><div class='del'>-	if (hugepd_none(*hpdp) &amp;&amp; __hugepte_alloc(mm, hpdp, addr, pdshift, pshift))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return hugepte_offset(*hpdp, addr, pdshift);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #else</div><div class='del'>-</div><div class='del'>-pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz)</div><div class='del'>-{</div><div class='del'>-	pgd_t *pg;</div><div class='del'>-	pud_t *pu;</div><div class='del'>-	pmd_t *pm;</div><div class='del'>-	hugepd_t *hpdp = NULL;</div><div class='del'>-	unsigned pshift = __ffs(sz);</div><div class='del'>-	unsigned pdshift = PGDIR_SHIFT;</div><div class='del'>-</div><div class='del'>-	addr &amp;= ~(sz-1);</div><div class='del'>-</div><div class='del'>-	pg = pgd_offset(mm, addr);</div><div class='del'>-</div><div class='ctx'> 	if (pshift &gt;= HUGEPD_PGD_SHIFT) {</div><div class='ctx'> 		hpdp = (hugepd_t *)pg;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -217,7 +195,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz</div><div class='ctx'> 			hpdp = (hugepd_t *)pm;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> 	if (!hpdp)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -228,9 +206,8 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz</div><div class='ctx'> </div><div class='ctx'> 	return hugepte_offset(*hpdp, addr, pdshift);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='add'>+#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_8xx)</div><div class='ctx'> /* Build list of addresses of gigantic pages.  This function is used in early</div><div class='ctx'>  * boot before the buddy allocator is setup.</div><div class='ctx'>  */</div><div class='hunk'>@@ -310,7 +287,11 @@ static int __init do_gpage_early_setup(char *param, char *val,</div><div class='ctx'> 				npages = 0;</div><div class='ctx'> 			if (npages &gt; MAX_NUMBER_GPAGES) {</div><div class='ctx'> 				pr_warn("MMU: %lu pages requested for page "</div><div class='add'>+#ifdef CONFIG_PHYS_ADDR_T_64BIT</div><div class='ctx'> 					"size %llu KB, limiting to "</div><div class='add'>+#else</div><div class='add'>+					"size %u KB, limiting to "</div><div class='add'>+#endif</div><div class='ctx'> 					__stringify(MAX_NUMBER_GPAGES) "\n",</div><div class='ctx'> 					npages, size / 1024);</div><div class='ctx'> 				npages = MAX_NUMBER_GPAGES;</div><div class='hunk'>@@ -392,7 +373,7 @@ int alloc_bootmem_huge_page(struct hstate *hstate)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='add'>+#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_8xx)</div><div class='ctx'> #define HUGEPD_FREELIST_SIZE \</div><div class='ctx'> 	((PAGE_SIZE - sizeof(struct hugepd_freelist)) / sizeof(pte_t))</div><div class='ctx'> </div><div class='hunk'>@@ -442,6 +423,8 @@ static void hugepd_free(struct mmu_gather *tlb, void *hugepte)</div><div class='ctx'> 	}</div><div class='ctx'> 	put_cpu_var(hugepd_freelist_cur);</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+static inline void hugepd_free(struct mmu_gather *tlb, void *hugepte) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void free_hugepd_range(struct mmu_gather *tlb, hugepd_t *hpdp, int pdshift,</div><div class='hunk'>@@ -453,13 +436,11 @@ static void free_hugepd_range(struct mmu_gather *tlb, hugepd_t *hpdp, int pdshif</div><div class='ctx'> </div><div class='ctx'> 	unsigned long pdmask = ~((1UL &lt;&lt; pdshift) - 1);</div><div class='ctx'> 	unsigned int num_hugepd = 1;</div><div class='add'>+	unsigned int shift = hugepd_shift(*hpdp);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> 	/* Note: On fsl the hpdp may be the first of several */</div><div class='del'>-	num_hugepd = (1 &lt;&lt; (hugepd_shift(*hpdp) - pdshift));</div><div class='del'>-#else</div><div class='del'>-	unsigned int shift = hugepd_shift(*hpdp);</div><div class='del'>-#endif</div><div class='add'>+	if (shift &gt; pdshift)</div><div class='add'>+		num_hugepd = 1 &lt;&lt; (shift - pdshift);</div><div class='ctx'> </div><div class='ctx'> 	start &amp;= pdmask;</div><div class='ctx'> 	if (start &lt; floor)</div><div class='hunk'>@@ -473,13 +454,12 @@ static void free_hugepd_range(struct mmu_gather *tlb, hugepd_t *hpdp, int pdshif</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_hugepd; i++, hpdp++)</div><div class='del'>-		hpdp-&gt;pd = 0;</div><div class='add'>+		*hpdp = __hugepd(0);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='del'>-	hugepd_free(tlb, hugepte);</div><div class='del'>-#else</div><div class='del'>-	pgtable_free_tlb(tlb, hugepte, pdshift - shift);</div><div class='del'>-#endif</div><div class='add'>+	if (shift &gt;= pdshift)</div><div class='add'>+		hugepd_free(tlb, hugepte);</div><div class='add'>+	else</div><div class='add'>+		pgtable_free_tlb(tlb, hugepte, pdshift - shift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud,</div><div class='hunk'>@@ -492,6 +472,8 @@ static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud,</div><div class='ctx'> </div><div class='ctx'> 	start = addr;</div><div class='ctx'> 	do {</div><div class='add'>+		unsigned long more;</div><div class='add'>+</div><div class='ctx'> 		pmd = pmd_offset(pud, addr);</div><div class='ctx'> 		next = pmd_addr_end(addr, end);</div><div class='ctx'> 		if (!is_hugepd(__hugepd(pmd_val(*pmd)))) {</div><div class='hunk'>@@ -502,15 +484,16 @@ static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud,</div><div class='ctx'> 			WARN_ON(!pmd_none_or_clear_bad(pmd));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Increment next by the size of the huge mapping since</div><div class='ctx'> 		 * there may be more than one entry at this level for a</div><div class='ctx'> 		 * single hugepage, but all of them point to</div><div class='ctx'> 		 * the same kmem cache that holds the hugepte.</div><div class='ctx'> 		 */</div><div class='del'>-		next = addr + (1 &lt;&lt; hugepd_shift(*(hugepd_t *)pmd));</div><div class='del'>-#endif</div><div class='add'>+		more = addr + (1 &lt;&lt; hugepd_shift(*(hugepd_t *)pmd));</div><div class='add'>+		if (more &gt; next)</div><div class='add'>+			next = more;</div><div class='add'>+</div><div class='ctx'> 		free_hugepd_range(tlb, (hugepd_t *)pmd, PMD_SHIFT,</div><div class='ctx'> 				  addr, next, floor, ceiling);</div><div class='ctx'> 	} while (addr = next, addr != end);</div><div class='hunk'>@@ -550,15 +533,17 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,</div><div class='ctx'> 			hugetlb_free_pmd_range(tlb, pud, addr, next, floor,</div><div class='ctx'> 					       ceiling);</div><div class='ctx'> 		} else {</div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='add'>+			unsigned long more;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Increment next by the size of the huge mapping since</div><div class='ctx'> 			 * there may be more than one entry at this level for a</div><div class='ctx'> 			 * single hugepage, but all of them point to</div><div class='ctx'> 			 * the same kmem cache that holds the hugepte.</div><div class='ctx'> 			 */</div><div class='del'>-			next = addr + (1 &lt;&lt; hugepd_shift(*(hugepd_t *)pud));</div><div class='del'>-#endif</div><div class='add'>+			more = addr + (1 &lt;&lt; hugepd_shift(*(hugepd_t *)pud));</div><div class='add'>+			if (more &gt; next)</div><div class='add'>+				next = more;</div><div class='add'>+</div><div class='ctx'> 			free_hugepd_range(tlb, (hugepd_t *)pud, PUD_SHIFT,</div><div class='ctx'> 					  addr, next, floor, ceiling);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -615,15 +600,17 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb,</div><div class='ctx'> 				continue;</div><div class='ctx'> 			hugetlb_free_pud_range(tlb, pgd, addr, next, floor, ceiling);</div><div class='ctx'> 		} else {</div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='add'>+			unsigned long more;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Increment next by the size of the huge mapping since</div><div class='ctx'> 			 * there may be more than one entry at the pgd level</div><div class='ctx'> 			 * for a single hugepage, but all of them point to the</div><div class='ctx'> 			 * same kmem cache that holds the hugepte.</div><div class='ctx'> 			 */</div><div class='del'>-			next = addr + (1 &lt;&lt; hugepd_shift(*(hugepd_t *)pgd));</div><div class='del'>-#endif</div><div class='add'>+			more = addr + (1 &lt;&lt; hugepd_shift(*(hugepd_t *)pgd));</div><div class='add'>+			if (more &gt; next)</div><div class='add'>+				next = more;</div><div class='add'>+</div><div class='ctx'> 			free_hugepd_range(tlb, (hugepd_t *)pgd, PGDIR_SHIFT,</div><div class='ctx'> 					  addr, next, floor, ceiling);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -753,12 +740,13 @@ static int __init add_huge_page_size(unsigned long long size)</div><div class='ctx'> </div><div class='ctx'> 	/* Check that it is a page size supported by the hardware and</div><div class='ctx'> 	 * that it fits within pagetable and slice limits. */</div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='del'>-	if ((size &lt; PAGE_SIZE) || !is_power_of_4(size))</div><div class='add'>+	if (size &lt;= PAGE_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-#else</div><div class='del'>-	if (!is_power_of_2(size)</div><div class='del'>-	    || (shift &gt; SLICE_HIGH_SHIFT) || (shift &lt;= PAGE_SHIFT))</div><div class='add'>+#if defined(CONFIG_PPC_FSL_BOOK3E)</div><div class='add'>+	if (!is_power_of_4(size))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+#elif !defined(CONFIG_PPC_8xx)</div><div class='add'>+	if (!is_power_of_2(size) || (shift &gt; SLICE_HIGH_SHIFT))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -791,53 +779,15 @@ static int __init hugepage_setup_sz(char *str)</div><div class='ctx'> }</div><div class='ctx'> __setup("hugepagesz=", hugepage_setup_sz);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> struct kmem_cache *hugepte_cache;</div><div class='ctx'> static int __init hugetlbpage_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int psize;</div><div class='ctx'> </div><div class='del'>-	for (psize = 0; psize &lt; MMU_PAGE_COUNT; ++psize) {</div><div class='del'>-		unsigned shift;</div><div class='del'>-</div><div class='del'>-		if (!mmu_psize_defs[psize].shift)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		shift = mmu_psize_to_shift(psize);</div><div class='del'>-</div><div class='del'>-		/* Don't treat normal page sizes as huge... */</div><div class='del'>-		if (shift != PAGE_SHIFT)</div><div class='del'>-			if (add_huge_page_size(1ULL &lt;&lt; shift) &lt; 0)</div><div class='del'>-				continue;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Create a kmem cache for hugeptes.  The bottom bits in the pte have</div><div class='del'>-	 * size information encoded in them, so align them to allow this</div><div class='del'>-	 */</div><div class='del'>-	hugepte_cache =  kmem_cache_create("hugepte-cache", sizeof(pte_t),</div><div class='del'>-					   HUGEPD_SHIFT_MASK + 1, 0, NULL);</div><div class='del'>-	if (hugepte_cache == NULL)</div><div class='del'>-		panic("%s: Unable to create kmem cache for hugeptes\n",</div><div class='del'>-		      __func__);</div><div class='del'>-</div><div class='del'>-	/* Default hpage size = 4M */</div><div class='del'>-	if (mmu_psize_defs[MMU_PAGE_4M].shift)</div><div class='del'>-		HPAGE_SHIFT = mmu_psize_defs[MMU_PAGE_4M].shift;</div><div class='del'>-	else</div><div class='del'>-		panic("%s: Unable to set default huge page size\n", __func__);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static int __init hugetlbpage_init(void)</div><div class='del'>-{</div><div class='del'>-	int psize;</div><div class='del'>-</div><div class='add'>+#if !defined(CONFIG_PPC_FSL_BOOK3E) &amp;&amp; !defined(CONFIG_PPC_8xx)</div><div class='ctx'> 	if (!radix_enabled() &amp;&amp; !mmu_has_feature(MMU_FTR_16M_PAGE))</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> 	for (psize = 0; psize &lt; MMU_PAGE_COUNT; ++psize) {</div><div class='ctx'> 		unsigned shift;</div><div class='ctx'> 		unsigned pdshift;</div><div class='hunk'>@@ -850,9 +800,9 @@ static int __init hugetlbpage_init(void)</div><div class='ctx'> 		if (add_huge_page_size(1ULL &lt;&lt; shift) &lt; 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (shift &lt; PMD_SHIFT)</div><div class='add'>+		if (shift &lt; HUGEPD_PUD_SHIFT)</div><div class='ctx'> 			pdshift = PMD_SHIFT;</div><div class='del'>-		else if (shift &lt; PUD_SHIFT)</div><div class='add'>+		else if (shift &lt; HUGEPD_PGD_SHIFT)</div><div class='ctx'> 			pdshift = PUD_SHIFT;</div><div class='ctx'> 		else</div><div class='ctx'> 			pdshift = PGDIR_SHIFT;</div><div class='hunk'>@@ -860,14 +810,34 @@ static int __init hugetlbpage_init(void)</div><div class='ctx'> 		 * if we have pdshift and shift value same, we don't</div><div class='ctx'> 		 * use pgt cache for hugepd.</div><div class='ctx'> 		 */</div><div class='del'>-		if (pdshift != shift) {</div><div class='add'>+		if (pdshift &gt; shift)</div><div class='ctx'> 			pgtable_cache_add(pdshift - shift, NULL);</div><div class='del'>-			if (!PGT_CACHE(pdshift - shift))</div><div class='del'>-				panic("hugetlbpage_init(): could not create "</div><div class='del'>-				      "pgtable cache for %d bit pagesize\n", shift);</div><div class='add'>+#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_8xx)</div><div class='add'>+		else if (!hugepte_cache) {</div><div class='add'>+			/*</div><div class='add'>+			 * Create a kmem cache for hugeptes.  The bottom bits in</div><div class='add'>+			 * the pte have size information encoded in them, so</div><div class='add'>+			 * align them to allow this</div><div class='add'>+			 */</div><div class='add'>+			hugepte_cache = kmem_cache_create("hugepte-cache",</div><div class='add'>+							  sizeof(pte_t),</div><div class='add'>+							  HUGEPD_SHIFT_MASK + 1,</div><div class='add'>+							  0, NULL);</div><div class='add'>+			if (hugepte_cache == NULL)</div><div class='add'>+				panic("%s: Unable to create kmem cache "</div><div class='add'>+				      "for hugeptes\n", __func__);</div><div class='add'>+</div><div class='ctx'> 		}</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_8xx)</div><div class='add'>+	/* Default hpage size = 4M on FSL_BOOK3E and 512k on 8xx */</div><div class='add'>+	if (mmu_psize_defs[MMU_PAGE_4M].shift)</div><div class='add'>+		HPAGE_SHIFT = mmu_psize_defs[MMU_PAGE_4M].shift;</div><div class='add'>+	else if (mmu_psize_defs[MMU_PAGE_512K].shift)</div><div class='add'>+		HPAGE_SHIFT = mmu_psize_defs[MMU_PAGE_512K].shift;</div><div class='add'>+#else</div><div class='ctx'> 	/* Set default large page size. Currently, we pick 16M or 1M</div><div class='ctx'> 	 * depending on what is available</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -877,11 +847,10 @@ static int __init hugetlbpage_init(void)</div><div class='ctx'> 		HPAGE_SHIFT = mmu_psize_defs[MMU_PAGE_1M].shift;</div><div class='ctx'> 	else if (mmu_psize_defs[MMU_PAGE_2M].shift)</div><div class='ctx'> 		HPAGE_SHIFT = mmu_psize_defs[MMU_PAGE_2M].shift;</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> arch_initcall(hugetlbpage_init);</div><div class='ctx'> </div><div class='ctx'> void flush_dcache_icache_hugepage(struct page *page)</div><div class='head'>diff --git a/arch/powerpc/mm/init-common.c b/arch/powerpc/mm/init-common.c<br/>new file mode 100644<br/>index 000000000000..eb8c6c8c4851<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/init-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/init-common.c</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+/*</div><div class='add'>+ *  PowerPC version</div><div class='add'>+ *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)</div><div class='add'>+ *</div><div class='add'>+ *  Modifications by Paul Mackerras (PowerMac) (paulus@cs.anu.edu.au)</div><div class='add'>+ *  and Cort Dougan (PReP) (cort@cs.nmt.edu)</div><div class='add'>+ *    Copyright (C) 1996 Paul Mackerras</div><div class='add'>+ *</div><div class='add'>+ *  Derived from "arch/i386/mm/init.c"</div><div class='add'>+ *    Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds</div><div class='add'>+ *</div><div class='add'>+ *  Dave Engebretsen &lt;engebret@us.ibm.com&gt;</div><div class='add'>+ *      Rework for PPC64 port.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or</div><div class='add'>+ *  modify it under the terms of the GNU General Public License</div><div class='add'>+ *  as published by the Free Software Foundation; either version</div><div class='add'>+ *  2 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+</div><div class='add'>+static void pgd_ctor(void *addr)</div><div class='add'>+{</div><div class='add'>+	memset(addr, 0, PGD_TABLE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pud_ctor(void *addr)</div><div class='add'>+{</div><div class='add'>+	memset(addr, 0, PUD_TABLE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmd_ctor(void *addr)</div><div class='add'>+{</div><div class='add'>+	memset(addr, 0, PMD_TABLE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct kmem_cache *pgtable_cache[MAX_PGTABLE_INDEX_SIZE];</div><div class='add'>+EXPORT_SYMBOL_GPL(pgtable_cache);	/* used by kvm_hv module */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a kmem_cache() for pagetables.  This is not used for PTE</div><div class='add'>+ * pages - they're linked to struct page, come from the normal free</div><div class='add'>+ * pages pool and have a different entry size (see real_pte_t) to</div><div class='add'>+ * everything else.  Caches created by this function are used for all</div><div class='add'>+ * the higher level pagetables, and for hugepage pagetables.</div><div class='add'>+ */</div><div class='add'>+void pgtable_cache_add(unsigned shift, void (*ctor)(void *))</div><div class='add'>+{</div><div class='add'>+	char *name;</div><div class='add'>+	unsigned long table_size = sizeof(void *) &lt;&lt; shift;</div><div class='add'>+	unsigned long align = table_size;</div><div class='add'>+</div><div class='add'>+	/* When batching pgtable pointers for RCU freeing, we store</div><div class='add'>+	 * the index size in the low bits.  Table alignment must be</div><div class='add'>+	 * big enough to fit it.</div><div class='add'>+	 *</div><div class='add'>+	 * Likewise, hugeapge pagetable pointers contain a (different)</div><div class='add'>+	 * shift value in the low bits.  All tables must be aligned so</div><div class='add'>+	 * as to leave enough 0 bits in the address to contain it. */</div><div class='add'>+	unsigned long minalign = max(MAX_PGTABLE_INDEX_SIZE + 1,</div><div class='add'>+				     HUGEPD_SHIFT_MASK + 1);</div><div class='add'>+	struct kmem_cache *new;</div><div class='add'>+</div><div class='add'>+	/* It would be nice if this was a BUILD_BUG_ON(), but at the</div><div class='add'>+	 * moment, gcc doesn't seem to recognize is_power_of_2 as a</div><div class='add'>+	 * constant expression, so so much for that. */</div><div class='add'>+	BUG_ON(!is_power_of_2(minalign));</div><div class='add'>+	BUG_ON((shift &lt; 1) || (shift &gt; MAX_PGTABLE_INDEX_SIZE));</div><div class='add'>+</div><div class='add'>+	if (PGT_CACHE(shift))</div><div class='add'>+		return; /* Already have a cache of this size */</div><div class='add'>+</div><div class='add'>+	align = max_t(unsigned long, align, minalign);</div><div class='add'>+	name = kasprintf(GFP_KERNEL, "pgtable-2^%d", shift);</div><div class='add'>+	new = kmem_cache_create(name, table_size, align, 0, ctor);</div><div class='add'>+	if (!new)</div><div class='add'>+		panic("Could not allocate pgtable cache for order %d", shift);</div><div class='add'>+</div><div class='add'>+	kfree(name);</div><div class='add'>+	pgtable_cache[shift - 1] = new;</div><div class='add'>+</div><div class='add'>+	pr_debug("Allocated pgtable cache for order %d\n", shift);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pgtable_cache_add);	/* used by kvm_hv module */</div><div class='add'>+</div><div class='add'>+void pgtable_cache_init(void)</div><div class='add'>+{</div><div class='add'>+	pgtable_cache_add(PGD_INDEX_SIZE, pgd_ctor);</div><div class='add'>+</div><div class='add'>+	if (PMD_CACHE_INDEX &amp;&amp; !PGT_CACHE(PMD_CACHE_INDEX))</div><div class='add'>+		pgtable_cache_add(PMD_CACHE_INDEX, pmd_ctor);</div><div class='add'>+	/*</div><div class='add'>+	 * In all current configs, when the PUD index exists it's the</div><div class='add'>+	 * same size as either the pgd or pmd index except with THP enabled</div><div class='add'>+	 * on book3s 64</div><div class='add'>+	 */</div><div class='add'>+	if (PUD_INDEX_SIZE &amp;&amp; !PGT_CACHE(PUD_INDEX_SIZE))</div><div class='add'>+		pgtable_cache_add(PUD_INDEX_SIZE, pud_ctor);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c<br/>index 16ada1eb7e26..6aa3b76aa0d6 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/init_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/init_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/init_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/init_64.c</a></div><div class='hunk'>@@ -42,6 +42,8 @@</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/of_fdt.h&gt;</div><div class='add'>+#include &lt;linux/libfdt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -51,7 +53,7 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='hunk'>@@ -80,83 +82,6 @@ EXPORT_SYMBOL_GPL(memstart_addr);</div><div class='ctx'> phys_addr_t kernstart_addr;</div><div class='ctx'> EXPORT_SYMBOL_GPL(kernstart_addr);</div><div class='ctx'> </div><div class='del'>-static void pgd_ctor(void *addr)</div><div class='del'>-{</div><div class='del'>-	memset(addr, 0, PGD_TABLE_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pud_ctor(void *addr)</div><div class='del'>-{</div><div class='del'>-	memset(addr, 0, PUD_TABLE_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pmd_ctor(void *addr)</div><div class='del'>-{</div><div class='del'>-	memset(addr, 0, PMD_TABLE_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct kmem_cache *pgtable_cache[MAX_PGTABLE_INDEX_SIZE];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Create a kmem_cache() for pagetables.  This is not used for PTE</div><div class='del'>- * pages - they're linked to struct page, come from the normal free</div><div class='del'>- * pages pool and have a different entry size (see real_pte_t) to</div><div class='del'>- * everything else.  Caches created by this function are used for all</div><div class='del'>- * the higher level pagetables, and for hugepage pagetables.</div><div class='del'>- */</div><div class='del'>-void pgtable_cache_add(unsigned shift, void (*ctor)(void *))</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	unsigned long table_size = sizeof(void *) &lt;&lt; shift;</div><div class='del'>-	unsigned long align = table_size;</div><div class='del'>-</div><div class='del'>-	/* When batching pgtable pointers for RCU freeing, we store</div><div class='del'>-	 * the index size in the low bits.  Table alignment must be</div><div class='del'>-	 * big enough to fit it.</div><div class='del'>-	 *</div><div class='del'>-	 * Likewise, hugeapge pagetable pointers contain a (different)</div><div class='del'>-	 * shift value in the low bits.  All tables must be aligned so</div><div class='del'>-	 * as to leave enough 0 bits in the address to contain it. */</div><div class='del'>-	unsigned long minalign = max(MAX_PGTABLE_INDEX_SIZE + 1,</div><div class='del'>-				     HUGEPD_SHIFT_MASK + 1);</div><div class='del'>-	struct kmem_cache *new;</div><div class='del'>-</div><div class='del'>-	/* It would be nice if this was a BUILD_BUG_ON(), but at the</div><div class='del'>-	 * moment, gcc doesn't seem to recognize is_power_of_2 as a</div><div class='del'>-	 * constant expression, so so much for that. */</div><div class='del'>-	BUG_ON(!is_power_of_2(minalign));</div><div class='del'>-	BUG_ON((shift &lt; 1) || (shift &gt; MAX_PGTABLE_INDEX_SIZE));</div><div class='del'>-</div><div class='del'>-	if (PGT_CACHE(shift))</div><div class='del'>-		return; /* Already have a cache of this size */</div><div class='del'>-</div><div class='del'>-	align = max_t(unsigned long, align, minalign);</div><div class='del'>-	name = kasprintf(GFP_KERNEL, "pgtable-2^%d", shift);</div><div class='del'>-	new = kmem_cache_create(name, table_size, align, 0, ctor);</div><div class='del'>-	kfree(name);</div><div class='del'>-	pgtable_cache[shift - 1] = new;</div><div class='del'>-	pr_debug("Allocated pgtable cache for order %d\n", shift);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void pgtable_cache_init(void)</div><div class='del'>-{</div><div class='del'>-	pgtable_cache_add(PGD_INDEX_SIZE, pgd_ctor);</div><div class='del'>-	pgtable_cache_add(PMD_CACHE_INDEX, pmd_ctor);</div><div class='del'>-	/*</div><div class='del'>-	 * In all current configs, when the PUD index exists it's the</div><div class='del'>-	 * same size as either the pgd or pmd index except with THP enabled</div><div class='del'>-	 * on book3s 64</div><div class='del'>-	 */</div><div class='del'>-	if (PUD_INDEX_SIZE &amp;&amp; !PGT_CACHE(PUD_INDEX_SIZE))</div><div class='del'>-		pgtable_cache_add(PUD_INDEX_SIZE, pud_ctor);</div><div class='del'>-</div><div class='del'>-	if (!PGT_CACHE(PGD_INDEX_SIZE) || !PGT_CACHE(PMD_CACHE_INDEX))</div><div class='del'>-		panic("Couldn't allocate pgtable caches");</div><div class='del'>-	if (PUD_INDEX_SIZE &amp;&amp; !PGT_CACHE(PUD_INDEX_SIZE))</div><div class='del'>-		panic("Couldn't allocate pud pgtable caches");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SPARSEMEM_VMEMMAP</div><div class='ctx'> /*</div><div class='ctx'>  * Given an address within the vmemmap, determine the pfn of the page that</div><div class='hunk'>@@ -421,12 +346,46 @@ static int __init parse_disable_radix(char *p)</div><div class='ctx'> }</div><div class='ctx'> early_param("disable_radix", parse_disable_radix);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * If we're running under a hypervisor, we need to check the contents of</div><div class='add'>+ * /chosen/ibm,architecture-vec-5 to see if the hypervisor is willing to do</div><div class='add'>+ * radix.  If not, we clear the radix feature bit so we fall back to hash.</div><div class='add'>+ */</div><div class='add'>+static void early_check_vec5(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long root, chosen;</div><div class='add'>+	int size;</div><div class='add'>+	const u8 *vec5;</div><div class='add'>+</div><div class='add'>+	root = of_get_flat_dt_root();</div><div class='add'>+	chosen = of_get_flat_dt_subnode_by_name(root, "chosen");</div><div class='add'>+	if (chosen == -FDT_ERR_NOTFOUND)</div><div class='add'>+		return;</div><div class='add'>+	vec5 = of_get_flat_dt_prop(chosen, "ibm,architecture-vec-5", &amp;size);</div><div class='add'>+	if (!vec5)</div><div class='add'>+		return;</div><div class='add'>+	if (size &lt;= OV5_INDX(OV5_MMU_RADIX_300) ||</div><div class='add'>+	    !(vec5[OV5_INDX(OV5_MMU_RADIX_300)] &amp; OV5_FEAT(OV5_MMU_RADIX_300)))</div><div class='add'>+		/* Hypervisor doesn't support radix */</div><div class='add'>+		cur_cpu_spec-&gt;mmu_features &amp;= ~MMU_FTR_TYPE_RADIX;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init mmu_early_init_devtree(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable radix mode based on kernel command line. */</div><div class='del'>-	if (disable_radix)</div><div class='add'>+	/* We don't yet have the machinery to do radix as a guest. */</div><div class='add'>+	if (disable_radix || !(mfmsr() &amp; MSR_HV))</div><div class='ctx'> 		cur_cpu_spec-&gt;mmu_features &amp;= ~MMU_FTR_TYPE_RADIX;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Check /chosen/ibm,architecture-vec-5 if running as a guest.</div><div class='add'>+	 * When running bare-metal, we can use radix if we like</div><div class='add'>+	 * even though the ibm,architecture-vec-5 property created by</div><div class='add'>+	 * skiboot doesn't have the necessary bits set.</div><div class='add'>+	 */</div><div class='add'>+	if (early_radix_enabled() &amp;&amp; !(mfmsr() &amp; MSR_HV))</div><div class='add'>+		early_check_vec5();</div><div class='add'>+</div><div class='ctx'> 	if (early_radix_enabled())</div><div class='ctx'> 		radix__early_init_devtree();</div><div class='ctx'> 	else</div><div class='head'>diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c<br/>index 5f844337de21..9ee536ec0739 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/mem.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/mem.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/mem.c</a></div><div class='hunk'>@@ -134,6 +134,8 @@ int arch_add_memory(int nid, u64 start, u64 size, bool for_device)</div><div class='ctx'> 	unsigned long nr_pages = size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	resize_hpt_for_hotplug(memblock_phys_mem_size());</div><div class='add'>+</div><div class='ctx'> 	pgdata = NODE_DATA(nid);</div><div class='ctx'> </div><div class='ctx'> 	start = (unsigned long)__va(start);</div><div class='hunk'>@@ -174,6 +176,8 @@ int arch_remove_memory(u64 start, u64 size)</div><div class='ctx'> 	 */</div><div class='ctx'> 	vm_unmap_aliases();</div><div class='ctx'> </div><div class='add'>+	resize_hpt_for_hotplug(memblock_phys_mem_size());</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c<br/>index 2f1e44362198..a5d9ef59debe 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/mmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/mmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/mmap.c</a></div><div class='hunk'>@@ -25,7 +25,8 @@</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/elf-randomize.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='head'>diff --git a/arch/powerpc/mm/mmu_context_book3s64.c b/arch/powerpc/mm/mmu_context_book3s64.c<br/>index b114f8b93ec9..73bf6e14c3aa 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/mmu_context_book3s64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/mmu_context_book3s64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/mmu_context_book3s64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/mmu_context_book3s64.c</a></div><div class='hunk'>@@ -115,7 +115,7 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)</div><div class='ctx'> 	mm-&gt;context.pte_frag = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_SPAPR_TCE_IOMMU</div><div class='del'>-	mm_iommu_init(&amp;mm-&gt;context);</div><div class='add'>+	mm_iommu_init(mm);</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -156,13 +156,11 @@ static inline void destroy_pagetable_page(struct mm_struct *mm)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void destroy_context(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_SPAPR_TCE_IOMMU</div><div class='del'>-	mm_iommu_cleanup(&amp;mm-&gt;context);</div><div class='add'>+	WARN_ON_ONCE(!list_empty(&amp;mm-&gt;context.iommu_group_mem_list));</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PPC_ICSWX</div><div class='ctx'> 	drop_cop(mm-&gt;context.acop, mm);</div><div class='ctx'> 	kfree(mm-&gt;context.cop_lockp);</div><div class='head'>diff --git a/arch/powerpc/mm/mmu_context_iommu.c b/arch/powerpc/mm/mmu_context_iommu.c<br/>index e0f1c33601dd..497130c5c742 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/mmu_context_iommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/mmu_context_iommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/mmu_context_iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/mmu_context_iommu.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='hunk'>@@ -56,7 +56,7 @@ static long mm_iommu_adjust_locked_vm(struct mm_struct *mm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("[%d] RLIMIT_MEMLOCK HASH64 %c%ld %ld/%ld\n",</div><div class='del'>-			current-&gt;pid,</div><div class='add'>+			current ? current-&gt;pid : 0,</div><div class='ctx'> 			incr ? '+' : '-',</div><div class='ctx'> 			npages &lt;&lt; PAGE_SHIFT,</div><div class='ctx'> 			mm-&gt;locked_vm &lt;&lt; PAGE_SHIFT,</div><div class='hunk'>@@ -66,12 +66,9 @@ static long mm_iommu_adjust_locked_vm(struct mm_struct *mm,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool mm_iommu_preregistered(void)</div><div class='add'>+bool mm_iommu_preregistered(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	if (!current || !current-&gt;mm)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return !list_empty(&amp;current-&gt;mm-&gt;context.iommu_group_mem_list);</div><div class='add'>+	return !list_empty(&amp;mm-&gt;context.iommu_group_mem_list);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mm_iommu_preregistered);</div><div class='ctx'> </div><div class='hunk'>@@ -124,19 +121,16 @@ static int mm_iommu_move_page_from_cma(struct page *page)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-long mm_iommu_get(unsigned long ua, unsigned long entries,</div><div class='add'>+long mm_iommu_get(struct mm_struct *mm, unsigned long ua, unsigned long entries,</div><div class='ctx'> 		struct mm_iommu_table_group_mem_t **pmem)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_iommu_table_group_mem_t *mem;</div><div class='ctx'> 	long i, j, ret = 0, locked_entries = 0;</div><div class='ctx'> 	struct page *page = NULL;</div><div class='ctx'> </div><div class='del'>-	if (!current || !current-&gt;mm)</div><div class='del'>-		return -ESRCH; /* process exited */</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;mem_list_mutex);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(mem, &amp;current-&gt;mm-&gt;context.iommu_group_mem_list,</div><div class='add'>+	list_for_each_entry_rcu(mem, &amp;mm-&gt;context.iommu_group_mem_list,</div><div class='ctx'> 			next) {</div><div class='ctx'> 		if ((mem-&gt;ua == ua) &amp;&amp; (mem-&gt;entries == entries)) {</div><div class='ctx'> 			++mem-&gt;used;</div><div class='hunk'>@@ -154,7 +148,7 @@ long mm_iommu_get(unsigned long ua, unsigned long entries,</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = mm_iommu_adjust_locked_vm(current-&gt;mm, entries, true);</div><div class='add'>+	ret = mm_iommu_adjust_locked_vm(mm, entries, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto unlock_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -190,7 +184,7 @@ long mm_iommu_get(unsigned long ua, unsigned long entries,</div><div class='ctx'> 		 * of the CMA zone if possible. NOTE: faulting in + migration</div><div class='ctx'> 		 * can be expensive. Batching can be considered later</div><div class='ctx'> 		 */</div><div class='del'>-		if (get_pageblock_migratetype(page) == MIGRATE_CMA) {</div><div class='add'>+		if (is_migrate_cma_page(page)) {</div><div class='ctx'> 			if (mm_iommu_move_page_from_cma(page))</div><div class='ctx'> 				goto populate;</div><div class='ctx'> 			if (1 != get_user_pages_fast(ua + (i &lt;&lt; PAGE_SHIFT),</div><div class='hunk'>@@ -215,11 +209,11 @@ populate:</div><div class='ctx'> 	mem-&gt;entries = entries;</div><div class='ctx'> 	*pmem = mem;</div><div class='ctx'> </div><div class='del'>-	list_add_rcu(&amp;mem-&gt;next, &amp;current-&gt;mm-&gt;context.iommu_group_mem_list);</div><div class='add'>+	list_add_rcu(&amp;mem-&gt;next, &amp;mm-&gt;context.iommu_group_mem_list);</div><div class='ctx'> </div><div class='ctx'> unlock_exit:</div><div class='ctx'> 	if (locked_entries &amp;&amp; ret)</div><div class='del'>-		mm_iommu_adjust_locked_vm(current-&gt;mm, locked_entries, false);</div><div class='add'>+		mm_iommu_adjust_locked_vm(mm, locked_entries, false);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mem_list_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -264,17 +258,13 @@ static void mm_iommu_free(struct rcu_head *head)</div><div class='ctx'> static void mm_iommu_release(struct mm_iommu_table_group_mem_t *mem)</div><div class='ctx'> {</div><div class='ctx'> 	list_del_rcu(&amp;mem-&gt;next);</div><div class='del'>-	mm_iommu_adjust_locked_vm(current-&gt;mm, mem-&gt;entries, false);</div><div class='ctx'> 	call_rcu(&amp;mem-&gt;rcu, mm_iommu_free);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-long mm_iommu_put(struct mm_iommu_table_group_mem_t *mem)</div><div class='add'>+long mm_iommu_put(struct mm_struct *mm, struct mm_iommu_table_group_mem_t *mem)</div><div class='ctx'> {</div><div class='ctx'> 	long ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (!current || !current-&gt;mm)</div><div class='del'>-		return -ESRCH; /* process exited */</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;mem_list_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (mem-&gt;used == 0) {</div><div class='hunk'>@@ -297,6 +287,8 @@ long mm_iommu_put(struct mm_iommu_table_group_mem_t *mem)</div><div class='ctx'> 	/* @mapped became 0 so now mappings are disabled, release the region */</div><div class='ctx'> 	mm_iommu_release(mem);</div><div class='ctx'> </div><div class='add'>+	mm_iommu_adjust_locked_vm(mm, mem-&gt;entries, false);</div><div class='add'>+</div><div class='ctx'> unlock_exit:</div><div class='ctx'> 	mutex_unlock(&amp;mem_list_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -304,14 +296,12 @@ unlock_exit:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mm_iommu_put);</div><div class='ctx'> </div><div class='del'>-struct mm_iommu_table_group_mem_t *mm_iommu_lookup(unsigned long ua,</div><div class='del'>-		unsigned long size)</div><div class='add'>+struct mm_iommu_table_group_mem_t *mm_iommu_lookup(struct mm_struct *mm,</div><div class='add'>+		unsigned long ua, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_iommu_table_group_mem_t *mem, *ret = NULL;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(mem,</div><div class='del'>-			&amp;current-&gt;mm-&gt;context.iommu_group_mem_list,</div><div class='del'>-			next) {</div><div class='add'>+	list_for_each_entry_rcu(mem, &amp;mm-&gt;context.iommu_group_mem_list, next) {</div><div class='ctx'> 		if ((mem-&gt;ua &lt;= ua) &amp;&amp;</div><div class='ctx'> 				(ua + size &lt;= mem-&gt;ua +</div><div class='ctx'> 				 (mem-&gt;entries &lt;&lt; PAGE_SHIFT))) {</div><div class='hunk'>@@ -324,14 +314,12 @@ struct mm_iommu_table_group_mem_t *mm_iommu_lookup(unsigned long ua,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mm_iommu_lookup);</div><div class='ctx'> </div><div class='del'>-struct mm_iommu_table_group_mem_t *mm_iommu_find(unsigned long ua,</div><div class='del'>-		unsigned long entries)</div><div class='add'>+struct mm_iommu_table_group_mem_t *mm_iommu_find(struct mm_struct *mm,</div><div class='add'>+		unsigned long ua, unsigned long entries)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_iommu_table_group_mem_t *mem, *ret = NULL;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(mem,</div><div class='del'>-			&amp;current-&gt;mm-&gt;context.iommu_group_mem_list,</div><div class='del'>-			next) {</div><div class='add'>+	list_for_each_entry_rcu(mem, &amp;mm-&gt;context.iommu_group_mem_list, next) {</div><div class='ctx'> 		if ((mem-&gt;ua == ua) &amp;&amp; (mem-&gt;entries == entries)) {</div><div class='ctx'> 			ret = mem;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -373,17 +361,7 @@ void mm_iommu_mapped_dec(struct mm_iommu_table_group_mem_t *mem)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mm_iommu_mapped_dec);</div><div class='ctx'> </div><div class='del'>-void mm_iommu_init(mm_context_t *ctx)</div><div class='add'>+void mm_iommu_init(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	INIT_LIST_HEAD_RCU(&amp;ctx-&gt;iommu_group_mem_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mm_iommu_cleanup(mm_context_t *ctx)</div><div class='del'>-{</div><div class='del'>-	struct mm_iommu_table_group_mem_t *mem, *tmp;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(mem, tmp, &amp;ctx-&gt;iommu_group_mem_list, next) {</div><div class='del'>-		list_del_rcu(&amp;mem-&gt;next);</div><div class='del'>-		mm_iommu_do_free(mem);</div><div class='del'>-	}</div><div class='add'>+	INIT_LIST_HEAD_RCU(&amp;mm-&gt;context.iommu_group_mem_list);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c<br/>index a51c188b81f3..9befaee237d6 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/numa.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/numa.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/numa.c</a></div><div class='hunk'>@@ -290,7 +290,7 @@ int of_node_to_nid(struct device_node *device)</div><div class='ctx'> </div><div class='ctx'> 	return nid;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(of_node_to_nid);</div><div class='add'>+EXPORT_SYMBOL(of_node_to_nid);</div><div class='ctx'> </div><div class='ctx'> static int __init find_min_common_depth(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -786,14 +786,9 @@ new_range:</div><div class='ctx'> 		fake_numa_create_new_node(((start + size) &gt;&gt; PAGE_SHIFT), &amp;nid);</div><div class='ctx'> 		node_set_online(nid);</div><div class='ctx'> </div><div class='del'>-		if (!(size = numa_enforce_memory_limit(start, size))) {</div><div class='del'>-			if (--ranges)</div><div class='del'>-				goto new_range;</div><div class='del'>-			else</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memblock_set_node(start, size, &amp;memblock.memory, nid);</div><div class='add'>+		size = numa_enforce_memory_limit(start, size);</div><div class='add'>+		if (size)</div><div class='add'>+			memblock_set_node(start, size, &amp;memblock.memory, nid);</div><div class='ctx'> </div><div class='ctx'> 		if (--ranges)</div><div class='ctx'> 			goto new_range;</div><div class='hunk'>@@ -944,7 +939,7 @@ void __init initmem_init(void)</div><div class='ctx'> 	 * _nocalls() + manual invocation is used because cpuhp is not yet</div><div class='ctx'> 	 * initialized for the boot CPU.</div><div class='ctx'> 	 */</div><div class='del'>-	cpuhp_setup_state_nocalls(CPUHP_POWER_NUMA_PREPARE, "POWER_NUMA_PREPARE",</div><div class='add'>+	cpuhp_setup_state_nocalls(CPUHP_POWER_NUMA_PREPARE, "powerpc/numa:prepare",</div><div class='ctx'> 				  ppc_numa_cpu_prepare, ppc_numa_cpu_dead);</div><div class='ctx'> 	for_each_present_cpu(cpu)</div><div class='ctx'> 		numa_setup_cpu(cpu);</div><div class='hunk'>@@ -1085,7 +1080,7 @@ static int hot_add_node_scn_to_nid(unsigned long scn_addr)</div><div class='ctx'> int hot_add_scn_to_nid(unsigned long scn_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *memory = NULL;</div><div class='del'>-	int nid, found = 0;</div><div class='add'>+	int nid;</div><div class='ctx'> </div><div class='ctx'> 	if (!numa_enabled || (min_common_depth &lt; 0))</div><div class='ctx'> 		return first_online_node;</div><div class='hunk'>@@ -1098,20 +1093,9 @@ int hot_add_scn_to_nid(unsigned long scn_addr)</div><div class='ctx'> 		nid = hot_add_node_scn_to_nid(scn_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nid &lt; 0 || !node_online(nid))</div><div class='add'>+	if (nid &lt; 0 || !node_possible(nid))</div><div class='ctx'> 		nid = first_online_node;</div><div class='ctx'> </div><div class='del'>-	if (NODE_DATA(nid)-&gt;node_spanned_pages)</div><div class='del'>-		return nid;</div><div class='del'>-</div><div class='del'>-	for_each_online_node(nid) {</div><div class='del'>-		if (NODE_DATA(nid)-&gt;node_spanned_pages) {</div><div class='del'>-			found = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(!found);</div><div class='ctx'> 	return nid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/pgtable-book3s64.c b/arch/powerpc/mm/pgtable-book3s64.c<br/>index f4f437cbabf1..5fcb3dd74c13 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable-book3s64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/pgtable-book3s64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable-book3s64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable-book3s64.c</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -35,7 +37,8 @@ int pmdp_set_access_flags(struct vm_area_struct *vma, unsigned long address,</div><div class='ctx'> #endif</div><div class='ctx'> 	changed = !pmd_same(*(pmdp), entry);</div><div class='ctx'> 	if (changed) {</div><div class='del'>-		__ptep_set_access_flags(vma-&gt;vm_mm, pmdp_ptep(pmdp), pmd_pte(entry));</div><div class='add'>+		__ptep_set_access_flags(vma-&gt;vm_mm, pmdp_ptep(pmdp),</div><div class='add'>+					pmd_pte(entry), address);</div><div class='ctx'> 		flush_pmd_tlb_range(vma, address, address + HPAGE_PMD_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	return changed;</div><div class='hunk'>@@ -125,3 +128,21 @@ void mmu_cleanup_all(void)</div><div class='ctx'> 	else if (mmu_hash_ops.hpte_clear_all)</div><div class='ctx'> 		mmu_hash_ops.hpte_clear_all();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEMORY_HOTPLUG</div><div class='add'>+int create_section_mapping(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	if (radix_enabled())</div><div class='add'>+		return radix__create_section_mapping(start, end);</div><div class='add'>+</div><div class='add'>+	return hash__create_section_mapping(start, end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int remove_section_mapping(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	if (radix_enabled())</div><div class='add'>+		return radix__remove_section_mapping(start, end);</div><div class='add'>+</div><div class='add'>+	return hash__remove_section_mapping(start, end);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_MEMORY_HOTPLUG */</div><div class='head'>diff --git a/arch/powerpc/mm/pgtable-hash64.c b/arch/powerpc/mm/pgtable-hash64.c<br/>index c23e286a6b8f..8b85a14b08ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable-hash64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/pgtable-hash64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable-hash64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable-hash64.c</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c<br/>index 688b54517655..2a590a98e652 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable-radix.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/pgtable-radix.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable-radix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable-radix.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/of_fdt.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='add'>+#include &lt;asm/powernv.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/thp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -65,7 +66,7 @@ int radix__map_kernel_page(unsigned long ea, unsigned long pa,</div><div class='ctx'> 		if (!pmdp)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		if (map_page_size == PMD_SIZE) {</div><div class='del'>-			ptep = (pte_t *)pudp;</div><div class='add'>+			ptep = pmdp_ptep(pmdp);</div><div class='ctx'> 			goto set_the_pte;</div><div class='ctx'> 		}</div><div class='ctx'> 		ptep = pte_alloc_kernel(pmdp, ea);</div><div class='hunk'>@@ -90,7 +91,7 @@ int radix__map_kernel_page(unsigned long ea, unsigned long pa,</div><div class='ctx'> 		}</div><div class='ctx'> 		pmdp = pmd_offset(pudp, ea);</div><div class='ctx'> 		if (map_page_size == PMD_SIZE) {</div><div class='del'>-			ptep = (pte_t *)pudp;</div><div class='add'>+			ptep = pmdp_ptep(pmdp);</div><div class='ctx'> 			goto set_the_pte;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!pmd_present(*pmdp)) {</div><div class='hunk'>@@ -107,59 +108,71 @@ set_the_pte:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void __meminit print_mapping(unsigned long start,</div><div class='add'>+					   unsigned long end,</div><div class='add'>+					   unsigned long size)</div><div class='add'>+{</div><div class='add'>+	if (end &lt;= start)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pr_info("Mapped range 0x%lx - 0x%lx with 0x%lx\n", start, end, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __meminit create_physical_mapping(unsigned long start,</div><div class='add'>+					     unsigned long end)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr, mapping_size = 0;</div><div class='add'>+</div><div class='add'>+	start = _ALIGN_UP(start, PAGE_SIZE);</div><div class='add'>+	for (addr = start; addr &lt; end; addr += mapping_size) {</div><div class='add'>+		unsigned long gap, previous_size;</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='add'>+		gap = end - addr;</div><div class='add'>+		previous_size = mapping_size;</div><div class='add'>+</div><div class='add'>+		if (IS_ALIGNED(addr, PUD_SIZE) &amp;&amp; gap &gt;= PUD_SIZE &amp;&amp;</div><div class='add'>+		    mmu_psize_defs[MMU_PAGE_1G].shift)</div><div class='add'>+			mapping_size = PUD_SIZE;</div><div class='add'>+		else if (IS_ALIGNED(addr, PMD_SIZE) &amp;&amp; gap &gt;= PMD_SIZE &amp;&amp;</div><div class='add'>+			 mmu_psize_defs[MMU_PAGE_2M].shift)</div><div class='add'>+			mapping_size = PMD_SIZE;</div><div class='add'>+		else</div><div class='add'>+			mapping_size = PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+		if (mapping_size != previous_size) {</div><div class='add'>+			print_mapping(start, addr, previous_size);</div><div class='add'>+			start = addr;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rc = radix__map_kernel_page((unsigned long)__va(addr), addr,</div><div class='add'>+					    PAGE_KERNEL_X, mapping_size);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	print_mapping(start, addr, mapping_size);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init radix_init_pgtable(void)</div><div class='ctx'> {</div><div class='del'>-	int loop_count;</div><div class='del'>-	u64 base, end, start_addr;</div><div class='ctx'> 	unsigned long rts_field;</div><div class='ctx'> 	struct memblock_region *reg;</div><div class='del'>-	unsigned long linear_page_size;</div><div class='ctx'> </div><div class='ctx'> 	/* We don't support slb for radix */</div><div class='ctx'> 	mmu_slb_size = 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create the linear mapping, using standard page size for now</div><div class='ctx'> 	 */</div><div class='del'>-	loop_count = 0;</div><div class='del'>-	for_each_memblock(memory, reg) {</div><div class='del'>-</div><div class='del'>-		start_addr = reg-&gt;base;</div><div class='del'>-</div><div class='del'>-redo:</div><div class='del'>-		if (loop_count &lt; 1 &amp;&amp; mmu_psize_defs[MMU_PAGE_1G].shift)</div><div class='del'>-			linear_page_size = PUD_SIZE;</div><div class='del'>-		else if (loop_count &lt; 2 &amp;&amp; mmu_psize_defs[MMU_PAGE_2M].shift)</div><div class='del'>-			linear_page_size = PMD_SIZE;</div><div class='del'>-		else</div><div class='del'>-			linear_page_size = PAGE_SIZE;</div><div class='del'>-</div><div class='del'>-		base = _ALIGN_UP(start_addr, linear_page_size);</div><div class='del'>-		end = _ALIGN_DOWN(reg-&gt;base + reg-&gt;size, linear_page_size);</div><div class='del'>-</div><div class='del'>-		pr_info("Mapping range 0x%lx - 0x%lx with 0x%lx\n",</div><div class='del'>-			(unsigned long)base, (unsigned long)end,</div><div class='del'>-			linear_page_size);</div><div class='del'>-</div><div class='del'>-		while (base &lt; end) {</div><div class='del'>-			radix__map_kernel_page((unsigned long)__va(base),</div><div class='del'>-					      base, PAGE_KERNEL_X,</div><div class='del'>-					      linear_page_size);</div><div class='del'>-			base += linear_page_size;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * map the rest using lower page size</div><div class='del'>-		 */</div><div class='del'>-		if (end &lt; reg-&gt;base + reg-&gt;size) {</div><div class='del'>-			start_addr = end;</div><div class='del'>-			loop_count++;</div><div class='del'>-			goto redo;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	for_each_memblock(memory, reg)</div><div class='add'>+		WARN_ON(create_physical_mapping(reg-&gt;base,</div><div class='add'>+						reg-&gt;base + reg-&gt;size));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate Partition table and process table for the</div><div class='ctx'> 	 * host.</div><div class='ctx'> 	 */</div><div class='del'>-	BUILD_BUG_ON_MSG((PRTB_SIZE_SHIFT &gt; 23), "Process table size too large.");</div><div class='add'>+	BUILD_BUG_ON_MSG((PRTB_SIZE_SHIFT &gt; 36), "Process table size too large.");</div><div class='ctx'> 	process_tb = early_alloc_pgtable(1UL &lt;&lt; PRTB_SIZE_SHIFT);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fill in the process table.</div><div class='hunk'>@@ -177,23 +190,15 @@ redo:</div><div class='ctx'> </div><div class='ctx'> static void __init radix_init_partition_table(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long rts_field;</div><div class='add'>+	unsigned long rts_field, dw0;</div><div class='ctx'> </div><div class='add'>+	mmu_partition_table_init();</div><div class='ctx'> 	rts_field = radix__get_tree_size();</div><div class='add'>+	dw0 = rts_field | __pa(init_mm.pgd) | RADIX_PGD_INDEX_SIZE | PATB_HR;</div><div class='add'>+	mmu_partition_table_set_entry(0, dw0, 0);</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON_MSG((PATB_SIZE_SHIFT &gt; 24), "Partition table size too large.");</div><div class='del'>-	partition_tb = early_alloc_pgtable(1UL &lt;&lt; PATB_SIZE_SHIFT);</div><div class='del'>-	partition_tb-&gt;patb0 = cpu_to_be64(rts_field | __pa(init_mm.pgd) |</div><div class='del'>-					  RADIX_PGD_INDEX_SIZE | PATB_HR);</div><div class='ctx'> 	pr_info("Initializing Radix MMU\n");</div><div class='ctx'> 	pr_info("Partition table %p\n", partition_tb);</div><div class='del'>-</div><div class='del'>-	memblock_set_current_limit(MEMBLOCK_ALLOC_ANYWHERE);</div><div class='del'>-	/*</div><div class='del'>-	 * update partition table control register,</div><div class='del'>-	 * 64 K size.</div><div class='del'>-	 */</div><div class='del'>-	mtspr(SPRN_PTCR, __pa(partition_tb) | (PATB_SIZE_SHIFT - 12));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init radix_init_native(void)</div><div class='hunk'>@@ -248,7 +253,7 @@ static int __init radix_dt_scan_page_sizes(unsigned long node,</div><div class='ctx'> 		/* top 3 bit is AP encoding */</div><div class='ctx'> 		shift = be32_to_cpu(prop[0]) &amp; ~(0xe &lt;&lt; 28);</div><div class='ctx'> 		ap = be32_to_cpu(prop[0]) &gt;&gt; 29;</div><div class='del'>-		pr_info("Page size sift = %d AP=0x%x\n", shift, ap);</div><div class='add'>+		pr_info("Page size shift = %d AP=0x%x\n", shift, ap);</div><div class='ctx'> </div><div class='ctx'> 		idx = get_idx_from_shift(shift);</div><div class='ctx'> 		if (idx &lt; 0)</div><div class='hunk'>@@ -320,6 +325,38 @@ static void update_hid_for_radix(void)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void radix_init_amor(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	* In HV mode, we init AMOR (Authority Mask Override Register) so that</div><div class='add'>+	* the hypervisor and guest can setup IAMR (Instruction Authority Mask</div><div class='add'>+	* Register), enable key 0 and set it to 1.</div><div class='add'>+	*</div><div class='add'>+	* AMOR = 0b1100 .... 0000 (Mask for key 0 is 11)</div><div class='add'>+	*/</div><div class='add'>+	mtspr(SPRN_AMOR, (3ul &lt;&lt; 62));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void radix_init_iamr(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long iamr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The IAMR should set to 0 on DD1.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='add'>+		iamr = 0;</div><div class='add'>+	else</div><div class='add'>+		iamr = (1ul &lt;&lt; 62);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Radix always uses key0 of the IAMR to determine if an access is</div><div class='add'>+	 * allowed. We set bit 0 (IBM bit 1) of key0, to prevent instruction</div><div class='add'>+	 * fetch.</div><div class='add'>+	 */</div><div class='add'>+	mtspr(SPRN_IAMR, iamr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init radix__early_init_mmu(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long lpcr;</div><div class='hunk'>@@ -376,8 +413,14 @@ void __init radix__early_init_mmu(void)</div><div class='ctx'> 		lpcr = mfspr(SPRN_LPCR);</div><div class='ctx'> 		mtspr(SPRN_LPCR, lpcr | LPCR_UPRT | LPCR_HR);</div><div class='ctx'> 		radix_init_partition_table();</div><div class='add'>+		radix_init_amor();</div><div class='add'>+	} else {</div><div class='add'>+		radix_init_pseries();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	memblock_set_current_limit(MEMBLOCK_ALLOC_ANYWHERE);</div><div class='add'>+</div><div class='add'>+	radix_init_iamr();</div><div class='ctx'> 	radix_init_pgtable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -397,7 +440,9 @@ void radix__early_init_mmu_secondary(void)</div><div class='ctx'> </div><div class='ctx'> 		mtspr(SPRN_PTCR,</div><div class='ctx'> 		      __pa(partition_tb) | (PATB_SIZE_SHIFT - 12));</div><div class='add'>+		radix_init_amor();</div><div class='ctx'> 	}</div><div class='add'>+	radix_init_iamr();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void radix__mmu_cleanup_all(void)</div><div class='hunk'>@@ -408,6 +453,7 @@ void radix__mmu_cleanup_all(void)</div><div class='ctx'> 		lpcr = mfspr(SPRN_LPCR);</div><div class='ctx'> 		mtspr(SPRN_LPCR, lpcr &amp; ~LPCR_UPRT);</div><div class='ctx'> 		mtspr(SPRN_PTCR, 0);</div><div class='add'>+		powernv_set_nmmu_ptcr(0);</div><div class='ctx'> 		radix__flush_tlb_all();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -437,6 +483,173 @@ void radix__setup_initial_memory_limit(phys_addr_t first_memblock_base,</div><div class='ctx'> 	memblock_set_current_limit(first_memblock_base + first_memblock_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MEMORY_HOTPLUG</div><div class='add'>+static void free_pte_table(pte_t *pte_start, pmd_t *pmd)</div><div class='add'>+{</div><div class='add'>+	pte_t *pte;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PTRS_PER_PTE; i++) {</div><div class='add'>+		pte = pte_start + i;</div><div class='add'>+		if (!pte_none(*pte))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pte_free_kernel(&amp;init_mm, pte_start);</div><div class='add'>+	pmd_clear(pmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_pmd_table(pmd_t *pmd_start, pud_t *pud)</div><div class='add'>+{</div><div class='add'>+	pmd_t *pmd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PTRS_PER_PMD; i++) {</div><div class='add'>+		pmd = pmd_start + i;</div><div class='add'>+		if (!pmd_none(*pmd))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pmd_free(&amp;init_mm, pmd_start);</div><div class='add'>+	pud_clear(pud);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_pte_table(pte_t *pte_start, unsigned long addr,</div><div class='add'>+			     unsigned long end)</div><div class='add'>+{</div><div class='add'>+	unsigned long next;</div><div class='add'>+	pte_t *pte;</div><div class='add'>+</div><div class='add'>+	pte = pte_start + pte_index(addr);</div><div class='add'>+	for (; addr &lt; end; addr = next, pte++) {</div><div class='add'>+		next = (addr + PAGE_SIZE) &amp; PAGE_MASK;</div><div class='add'>+		if (next &gt; end)</div><div class='add'>+			next = end;</div><div class='add'>+</div><div class='add'>+		if (!pte_present(*pte))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!PAGE_ALIGNED(addr) || !PAGE_ALIGNED(next)) {</div><div class='add'>+			/*</div><div class='add'>+			 * The vmemmap_free() and remove_section_mapping()</div><div class='add'>+			 * codepaths call us with aligned addresses.</div><div class='add'>+			 */</div><div class='add'>+			WARN_ONCE(1, "%s: unaligned range\n", __func__);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pte_clear(&amp;init_mm, addr, pte);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_pmd_table(pmd_t *pmd_start, unsigned long addr,</div><div class='add'>+			     unsigned long end)</div><div class='add'>+{</div><div class='add'>+	unsigned long next;</div><div class='add'>+	pte_t *pte_base;</div><div class='add'>+	pmd_t *pmd;</div><div class='add'>+</div><div class='add'>+	pmd = pmd_start + pmd_index(addr);</div><div class='add'>+	for (; addr &lt; end; addr = next, pmd++) {</div><div class='add'>+		next = pmd_addr_end(addr, end);</div><div class='add'>+</div><div class='add'>+		if (!pmd_present(*pmd))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (pmd_huge(*pmd)) {</div><div class='add'>+			if (!IS_ALIGNED(addr, PMD_SIZE) ||</div><div class='add'>+			    !IS_ALIGNED(next, PMD_SIZE)) {</div><div class='add'>+				WARN_ONCE(1, "%s: unaligned range\n", __func__);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pte_clear(&amp;init_mm, addr, (pte_t *)pmd);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pte_base = (pte_t *)pmd_page_vaddr(*pmd);</div><div class='add'>+		remove_pte_table(pte_base, addr, next);</div><div class='add'>+		free_pte_table(pte_base, pmd);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_pud_table(pud_t *pud_start, unsigned long addr,</div><div class='add'>+			     unsigned long end)</div><div class='add'>+{</div><div class='add'>+	unsigned long next;</div><div class='add'>+	pmd_t *pmd_base;</div><div class='add'>+	pud_t *pud;</div><div class='add'>+</div><div class='add'>+	pud = pud_start + pud_index(addr);</div><div class='add'>+	for (; addr &lt; end; addr = next, pud++) {</div><div class='add'>+		next = pud_addr_end(addr, end);</div><div class='add'>+</div><div class='add'>+		if (!pud_present(*pud))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (pud_huge(*pud)) {</div><div class='add'>+			if (!IS_ALIGNED(addr, PUD_SIZE) ||</div><div class='add'>+			    !IS_ALIGNED(next, PUD_SIZE)) {</div><div class='add'>+				WARN_ONCE(1, "%s: unaligned range\n", __func__);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pte_clear(&amp;init_mm, addr, (pte_t *)pud);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pmd_base = (pmd_t *)pud_page_vaddr(*pud);</div><div class='add'>+		remove_pmd_table(pmd_base, addr, next);</div><div class='add'>+		free_pmd_table(pmd_base, pud);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_pagetable(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr, next;</div><div class='add'>+	pud_t *pud_base;</div><div class='add'>+	pgd_t *pgd;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;init_mm.page_table_lock);</div><div class='add'>+</div><div class='add'>+	for (addr = start; addr &lt; end; addr = next) {</div><div class='add'>+		next = pgd_addr_end(addr, end);</div><div class='add'>+</div><div class='add'>+		pgd = pgd_offset_k(addr);</div><div class='add'>+		if (!pgd_present(*pgd))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (pgd_huge(*pgd)) {</div><div class='add'>+			if (!IS_ALIGNED(addr, PGDIR_SIZE) ||</div><div class='add'>+			    !IS_ALIGNED(next, PGDIR_SIZE)) {</div><div class='add'>+				WARN_ONCE(1, "%s: unaligned range\n", __func__);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pte_clear(&amp;init_mm, addr, (pte_t *)pgd);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pud_base = (pud_t *)pgd_page_vaddr(*pgd);</div><div class='add'>+		remove_pud_table(pud_base, addr, next);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;init_mm.page_table_lock);</div><div class='add'>+	radix__flush_tlb_kernel_range(start, end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __ref radix__create_section_mapping(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	return create_physical_mapping(start, end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int radix__remove_section_mapping(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	remove_pagetable(start, end);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_MEMORY_HOTPLUG */</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SPARSEMEM_VMEMMAP</div><div class='ctx'> int __meminit radix__vmemmap_create_mapping(unsigned long start,</div><div class='ctx'> 				      unsigned long page_size,</div><div class='hunk'>@@ -452,7 +665,7 @@ int __meminit radix__vmemmap_create_mapping(unsigned long start,</div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTPLUG</div><div class='ctx'> void radix__vmemmap_remove_mapping(unsigned long start, unsigned long page_size)</div><div class='ctx'> {</div><div class='del'>-	/* FIXME!! intel does more. We should free page tables mapping vmemmap ? */</div><div class='add'>+	remove_pagetable(start, start + page_size);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c<br/>index 911fdfb63ec1..a03ff3d99e0c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/pgtable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable.c</a></div><div class='hunk'>@@ -193,9 +193,7 @@ void set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep,</div><div class='ctx'> 	 */</div><div class='ctx'> 	VM_WARN_ON(pte_present(*ptep) &amp;&amp; !pte_protnone(*ptep));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Add the pte bit when tryint set a pte</div><div class='del'>-	 */</div><div class='add'>+	/* Add the pte bit when trying to set a pte */</div><div class='ctx'> 	pte = __pte(pte_val(pte) | _PAGE_PTE);</div><div class='ctx'> </div><div class='ctx'> 	/* Note: mm-&gt;context.id might not yet have been assigned as</div><div class='hunk'>@@ -224,7 +222,7 @@ int ptep_set_access_flags(struct vm_area_struct *vma, unsigned long address,</div><div class='ctx'> 	if (changed) {</div><div class='ctx'> 		if (!is_vm_hugetlb_page(vma))</div><div class='ctx'> 			assert_pte_locked(vma-&gt;vm_mm, address);</div><div class='del'>-		__ptep_set_access_flags(vma-&gt;vm_mm, ptep, entry);</div><div class='add'>+		__ptep_set_access_flags(vma-&gt;vm_mm, ptep, entry, address);</div><div class='ctx'> 		flush_tlb_page(vma, address);</div><div class='ctx'> 	}</div><div class='ctx'> 	return changed;</div><div class='head'>diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c<br/>index 0ae0572bc239..a65c0b4c0669 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/pgtable_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable_32.c</a></div><div class='hunk'>@@ -42,43 +42,6 @@ EXPORT_SYMBOL(ioremap_bot);	/* aka VMALLOC_END */</div><div class='ctx'> </div><div class='ctx'> extern char etext[], _stext[], _sinittext[], _einittext[];</div><div class='ctx'> </div><div class='del'>-#define PGDIR_ORDER	(32 + PGD_T_LOG2 - PGDIR_SHIFT)</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_PPC_4K_PAGES</div><div class='del'>-static struct kmem_cache *pgtable_cache;</div><div class='del'>-</div><div class='del'>-void pgtable_cache_init(void)</div><div class='del'>-{</div><div class='del'>-	pgtable_cache = kmem_cache_create("PGDIR cache", 1 &lt;&lt; PGDIR_ORDER,</div><div class='del'>-					  1 &lt;&lt; PGDIR_ORDER, 0, NULL);</div><div class='del'>-	if (pgtable_cache == NULL)</div><div class='del'>-		panic("Couldn't allocate pgtable caches");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-pgd_t *pgd_alloc(struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	pgd_t *ret;</div><div class='del'>-</div><div class='del'>-	/* pgdir take page or two with 4K pages and a page fraction otherwise */</div><div class='del'>-#ifndef CONFIG_PPC_4K_PAGES</div><div class='del'>-	ret = kmem_cache_alloc(pgtable_cache, GFP_KERNEL | __GFP_ZERO);</div><div class='del'>-#else</div><div class='del'>-	ret = (pgd_t *)__get_free_pages(GFP_KERNEL|__GFP_ZERO,</div><div class='del'>-			PGDIR_ORDER - PAGE_SHIFT);</div><div class='del'>-#endif</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void pgd_free(struct mm_struct *mm, pgd_t *pgd)</div><div class='del'>-{</div><div class='del'>-#ifndef CONFIG_PPC_4K_PAGES</div><div class='del'>-	kmem_cache_free(pgtable_cache, (void *)pgd);</div><div class='del'>-#else</div><div class='del'>-	free_pages((unsigned long)pgd, PGDIR_ORDER - PAGE_SHIFT);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> __ref pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> 	pte_t *pte;</div><div class='head'>diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c<br/>index f5e8d4edb808..db93cf747a03 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/pgtable_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/pgtable_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/pgtable_64.c</a></div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/powernv.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mmu_decl.h"</div><div class='ctx'> </div><div class='hunk'>@@ -431,3 +432,50 @@ void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_BOOK3S_64</div><div class='add'>+void __init mmu_partition_table_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long patb_size = 1UL &lt;&lt; PATB_SIZE_SHIFT;</div><div class='add'>+	unsigned long ptcr;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON_MSG((PATB_SIZE_SHIFT &gt; 36), "Partition table size too large.");</div><div class='add'>+	partition_tb = __va(memblock_alloc_base(patb_size, patb_size,</div><div class='add'>+						MEMBLOCK_ALLOC_ANYWHERE));</div><div class='add'>+</div><div class='add'>+	/* Initialize the Partition Table with no entries */</div><div class='add'>+	memset((void *)partition_tb, 0, patb_size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * update partition table control register,</div><div class='add'>+	 * 64 K size.</div><div class='add'>+	 */</div><div class='add'>+	ptcr = __pa(partition_tb) | (PATB_SIZE_SHIFT - 12);</div><div class='add'>+	mtspr(SPRN_PTCR, ptcr);</div><div class='add'>+	powernv_set_nmmu_ptcr(ptcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mmu_partition_table_set_entry(unsigned int lpid, unsigned long dw0,</div><div class='add'>+				   unsigned long dw1)</div><div class='add'>+{</div><div class='add'>+	unsigned long old = be64_to_cpu(partition_tb[lpid].patb0);</div><div class='add'>+</div><div class='add'>+	partition_tb[lpid].patb0 = cpu_to_be64(dw0);</div><div class='add'>+	partition_tb[lpid].patb1 = cpu_to_be64(dw1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Global flush of TLBs and partition table caches for this lpid.</div><div class='add'>+	 * The type of flush (hash or radix) depends on what the previous</div><div class='add'>+	 * use of this partition ID was, not the new use.</div><div class='add'>+	 */</div><div class='add'>+	asm volatile("ptesync" : : : "memory");</div><div class='add'>+	if (old &amp; PATB_HR)</div><div class='add'>+		asm volatile(PPC_TLBIE_5(%0,%1,2,0,1) : :</div><div class='add'>+			     "r" (TLBIEL_INVAL_SET_LPID), "r" (lpid));</div><div class='add'>+	else</div><div class='add'>+		asm volatile(PPC_TLBIE_5(%0,%1,2,0,0) : :</div><div class='add'>+			     "r" (TLBIEL_INVAL_SET_LPID), "r" (lpid));</div><div class='add'>+	asm volatile("eieio; tlbsync; ptesync" : : : "memory");</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mmu_partition_table_set_entry);</div><div class='add'>+#endif /* CONFIG_PPC_BOOK3S_64 */</div><div class='head'>diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c<br/>index 48fc28bab544..5e01b2ece1d0 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/slb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/slb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/slb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/slb.c</a></div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/udbg.h&gt;</div><div class='ctx'> #include &lt;asm/code-patching.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/slb_low.S b/arch/powerpc/mm/slb_low.S<br/>index e2974fcd20f1..a85e06ea6c20 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/slb_low.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/slb_low.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/slb_low.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/slb_low.S</a></div><div class='hunk'>@@ -71,9 +71,9 @@ slb_miss_kernel_load_linear:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='del'>-	b	slb_finish_load</div><div class='add'>+	b	.Lslb_finish_load</div><div class='ctx'> END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT)</div><div class='del'>-	b	slb_finish_load_1T</div><div class='add'>+	b	.Lslb_finish_load_1T</div><div class='ctx'> </div><div class='ctx'> 1:</div><div class='ctx'> #ifdef CONFIG_SPARSEMEM_VMEMMAP</div><div class='hunk'>@@ -109,9 +109,9 @@ slb_miss_kernel_load_io:</div><div class='ctx'> 	addi	r9,r9,(MAX_USER_CONTEXT - 0xc + 1)@l</div><div class='ctx'> </div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='del'>-	b	slb_finish_load</div><div class='add'>+	b	.Lslb_finish_load</div><div class='ctx'> END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT)</div><div class='del'>-	b	slb_finish_load_1T</div><div class='add'>+	b	.Lslb_finish_load_1T</div><div class='ctx'> </div><div class='ctx'> 0:	/*</div><div class='ctx'> 	 * For userspace addresses, make sure this is region 0.</div><div class='hunk'>@@ -174,9 +174,9 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT)</div><div class='ctx'> 	ld	r9,PACACONTEXTID(r13)</div><div class='ctx'> BEGIN_FTR_SECTION</div><div class='ctx'> 	cmpldi	r10,0x1000</div><div class='del'>-	bge	slb_finish_load_1T</div><div class='add'>+	bge	.Lslb_finish_load_1T</div><div class='ctx'> END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)</div><div class='del'>-	b	slb_finish_load</div><div class='add'>+	b	.Lslb_finish_load</div><div class='ctx'> </div><div class='ctx'> 8:	/* invalid EA - return an error indication */</div><div class='ctx'> 	crset	4*cr0+eq		/* indicate failure */</div><div class='hunk'>@@ -187,7 +187,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)</div><div class='ctx'>  *</div><div class='ctx'>  * r3 = EA, r9 = context, r10 = ESID, r11 = flags, clobbers r9, cr7 = &lt;&gt; PAGE_OFFSET</div><div class='ctx'>  */</div><div class='del'>-slb_finish_load:</div><div class='add'>+.Lslb_finish_load:</div><div class='ctx'> 	rldimi  r10,r9,ESID_BITS,0</div><div class='ctx'> 	ASM_VSID_SCRAMBLE(r10,r9,256M)</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -256,7 +256,7 @@ slb_compare_rr_to_size:</div><div class='ctx'>  *</div><div class='ctx'>  * r3 = EA, r9 = context, r10 = ESID(256MB), r11 = flags, clobbers r9</div><div class='ctx'>  */</div><div class='del'>-slb_finish_load_1T:</div><div class='add'>+.Lslb_finish_load_1T:</div><div class='ctx'> 	srdi	r10,r10,(SID_SHIFT_1T - SID_SHIFT)	/* get 1T ESID */</div><div class='ctx'> 	rldimi  r10,r9,ESID_BITS_1T,0</div><div class='ctx'> 	ASM_VSID_SCRAMBLE(r10,r9,1T)</div><div class='hunk'>@@ -272,3 +272,11 @@ slb_finish_load_1T:</div><div class='ctx'> 	clrrdi	r3,r3,SID_SHIFT_1T	/* clear out non-ESID bits */</div><div class='ctx'> 	b	7b</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+_ASM_NOKPROBE_SYMBOL(slb_allocate_realmode)</div><div class='add'>+_ASM_NOKPROBE_SYMBOL(slb_miss_kernel_load_linear)</div><div class='add'>+_ASM_NOKPROBE_SYMBOL(slb_miss_kernel_load_io)</div><div class='add'>+_ASM_NOKPROBE_SYMBOL(slb_compare_rr_to_size)</div><div class='add'>+#ifdef CONFIG_SPARSEMEM_VMEMMAP</div><div class='add'>+_ASM_NOKPROBE_SYMBOL(slb_miss_kernel_load_vmemmap)</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/powerpc/mm/subpage-prot.c b/arch/powerpc/mm/subpage-prot.c<br/>index d5543514c1df..94210940112f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/subpage-prot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/subpage-prot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/subpage-prot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/subpage-prot.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -248,9 +248,8 @@ long sys_subpage_prot(unsigned long addr, unsigned long len, u32 __user *map)</div><div class='ctx'> 			nw = (next - addr) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 		up_write(&amp;mm-&gt;mmap_sem);</div><div class='del'>-		err = -EFAULT;</div><div class='ctx'> 		if (__copy_from_user(spp, map, nw * sizeof(u32)))</div><div class='del'>-			goto out2;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		map += nw;</div><div class='ctx'> 		down_write(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='hunk'>@@ -262,6 +261,5 @@ long sys_subpage_prot(unsigned long addr, unsigned long len, u32 __user *map)</div><div class='ctx'> 	err = 0;</div><div class='ctx'>  out:</div><div class='ctx'> 	up_write(&amp;mm-&gt;mmap_sem);</div><div class='del'>- out2:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/mm/tlb-radix.c b/arch/powerpc/mm/tlb-radix.c<br/>index 3493cf4e0452..952713d6cf04 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/tlb-radix.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/tlb-radix.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/tlb-radix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/tlb-radix.c</a></div><div class='hunk'>@@ -50,9 +50,7 @@ static inline void _tlbiel_pid(unsigned long pid, unsigned long ric)</div><div class='ctx'> 	for (set = 0; set &lt; POWER9_TLB_SETS_RADIX ; set++) {</div><div class='ctx'> 		__tlbiel_pid(pid, set, ric);</div><div class='ctx'> 	}</div><div class='del'>-	if (cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='del'>-		asm volatile(PPC_INVALIDATE_ERAT : : :"memory");</div><div class='del'>-	return;</div><div class='add'>+	asm volatile(PPC_INVALIDATE_ERAT "; isync" : : :"memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void _tlbie_pid(unsigned long pid, unsigned long ric)</div><div class='hunk'>@@ -85,8 +83,6 @@ static inline void _tlbiel_va(unsigned long va, unsigned long pid,</div><div class='ctx'> 	asm volatile(PPC_TLBIEL(%0, %4, %3, %2, %1)</div><div class='ctx'> 		     : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory");</div><div class='ctx'> 	asm volatile("ptesync": : :"memory");</div><div class='del'>-	if (cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='del'>-		asm volatile(PPC_INVALIDATE_ERAT : : :"memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void _tlbie_va(unsigned long va, unsigned long pid,</div><div class='hunk'>@@ -428,3 +424,21 @@ void radix__flush_tlb_all(void)</div><div class='ctx'> 		     : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(0) : "memory");</div><div class='ctx'> 	asm volatile("eieio; tlbsync; ptesync": : :"memory");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void radix__flush_tlb_pte_p9_dd1(unsigned long old_pte, struct mm_struct *mm,</div><div class='add'>+				 unsigned long address)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * We track page size in pte only for DD1, So we can</div><div class='add'>+	 * call this only on DD1.</div><div class='add'>+	 */</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_POWER9_DD1)) {</div><div class='add'>+		VM_WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (old_pte &amp; _PAGE_LARGE)</div><div class='add'>+		radix__flush_tlb_page_psize(mm, address, MMU_PAGE_2M);</div><div class='add'>+	else</div><div class='add'>+		radix__flush_tlb_page_psize(mm, address, mmu_virtual_psize);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c<br/>index 050badc0ebd3..ba28fcb98597 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/mm/tlb_nohash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/mm/tlb_nohash.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/mm/tlb_nohash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/mm/tlb_nohash.c</a></div><div class='hunk'>@@ -53,7 +53,7 @@</div><div class='ctx'>  * other sizes not listed here.   The .ind field is only used on MMUs that have</div><div class='ctx'>  * indirect page table entries.</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PPC_BOOK3E_MMU</div><div class='add'>+#if defined(CONFIG_PPC_BOOK3E_MMU) || defined(CONFIG_PPC_8xx)</div><div class='ctx'> #ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = {</div><div class='ctx'> 	[MMU_PAGE_4K] = {</div><div class='hunk'>@@ -85,6 +85,25 @@ struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = {</div><div class='ctx'> 		.enc	= BOOK3E_PAGESZ_1GB,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='add'>+#elif defined(CONFIG_PPC_8xx)</div><div class='add'>+struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = {</div><div class='add'>+	/* we only manage 4k and 16k pages as normal pages */</div><div class='add'>+#ifdef CONFIG_PPC_4K_PAGES</div><div class='add'>+	[MMU_PAGE_4K] = {</div><div class='add'>+		.shift	= 12,</div><div class='add'>+	},</div><div class='add'>+#else</div><div class='add'>+	[MMU_PAGE_16K] = {</div><div class='add'>+		.shift	= 14,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+	[MMU_PAGE_512K] = {</div><div class='add'>+		.shift	= 19,</div><div class='add'>+	},</div><div class='add'>+	[MMU_PAGE_8M] = {</div><div class='add'>+		.shift	= 23,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> #else</div><div class='ctx'> struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = {</div><div class='ctx'> 	[MMU_PAGE_4K] = {</div><div class='head'>diff --git a/arch/powerpc/net/bpf_jit.h b/arch/powerpc/net/bpf_jit.h<br/>index 89f70073dec8..30cf03f53428 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/net/bpf_jit.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/net/bpf_jit.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/net/bpf_jit.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/net/bpf_jit.h</a></div><div class='hunk'>@@ -157,8 +157,7 @@</div><div class='ctx'> #define PPC_SRAD(d, a, s)	EMIT(PPC_INST_SRAD | ___PPC_RA(d) |	      \</div><div class='ctx'> 				     ___PPC_RS(a) | ___PPC_RB(s))</div><div class='ctx'> #define PPC_SRADI(d, a, i)	EMIT(PPC_INST_SRADI | ___PPC_RA(d) |	      \</div><div class='del'>-				     ___PPC_RS(a) | __PPC_SH(i) |             \</div><div class='del'>-				     (((i) &amp; 0x20) &gt;&gt; 4))</div><div class='add'>+				     ___PPC_RS(a) | __PPC_SH64(i))</div><div class='ctx'> #define PPC_RLWINM(d, a, i, mb, me)	EMIT(PPC_INST_RLWINM | ___PPC_RA(d) | \</div><div class='ctx'> 					___PPC_RS(a) | __PPC_SH(i) |	      \</div><div class='ctx'> 					__PPC_MB(mb) | __PPC_ME(me))</div><div class='hunk'>@@ -166,11 +165,11 @@</div><div class='ctx'> 					___PPC_RS(a) | __PPC_SH(i) |	      \</div><div class='ctx'> 					__PPC_MB(mb) | __PPC_ME(me))</div><div class='ctx'> #define PPC_RLDICL(d, a, i, mb)		EMIT(PPC_INST_RLDICL | ___PPC_RA(d) | \</div><div class='del'>-					___PPC_RS(a) | __PPC_SH(i) |	      \</div><div class='del'>-					__PPC_MB64(mb) | (((i) &amp; 0x20) &gt;&gt; 4))</div><div class='add'>+					___PPC_RS(a) | __PPC_SH64(i) |	      \</div><div class='add'>+					__PPC_MB64(mb))</div><div class='ctx'> #define PPC_RLDICR(d, a, i, me)		EMIT(PPC_INST_RLDICR | ___PPC_RA(d) | \</div><div class='del'>-					___PPC_RS(a) | __PPC_SH(i) |	      \</div><div class='del'>-					__PPC_ME64(me) | (((i) &amp; 0x20) &gt;&gt; 4))</div><div class='add'>+					___PPC_RS(a) | __PPC_SH64(i) |	      \</div><div class='add'>+					__PPC_ME64(me))</div><div class='ctx'> </div><div class='ctx'> /* slwi = rlwinm Rx, Ry, n, 0, 31-n */</div><div class='ctx'> #define PPC_SLWI(d, a, i)	PPC_RLWINM(d, a, i, 0, 31-(i))</div><div class='head'>diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c<br/>index 7e706f36e364..f9941b3b5770 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/net/bpf_jit_comp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/net/bpf_jit_comp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/net/bpf_jit_comp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/net/bpf_jit_comp.c</a></div><div class='hunk'>@@ -662,16 +662,17 @@ void bpf_jit_compile(struct bpf_prog *fp)</div><div class='ctx'> 		 */</div><div class='ctx'> 		bpf_jit_dump(flen, proglen, pass, code_base);</div><div class='ctx'> </div><div class='del'>-	if (image) {</div><div class='del'>-		bpf_flush_icache(code_base, code_base + (proglen/4));</div><div class='add'>+	bpf_flush_icache(code_base, code_base + (proglen/4));</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='del'>-		/* Function descriptor nastiness: Address + TOC */</div><div class='del'>-		((u64 *)image)[0] = (u64)code_base;</div><div class='del'>-		((u64 *)image)[1] = local_paca-&gt;kernel_toc;</div><div class='add'>+	/* Function descriptor nastiness: Address + TOC */</div><div class='add'>+	((u64 *)image)[0] = (u64)code_base;</div><div class='add'>+	((u64 *)image)[1] = local_paca-&gt;kernel_toc;</div><div class='ctx'> #endif</div><div class='del'>-		fp-&gt;bpf_func = (void *)image;</div><div class='del'>-		fp-&gt;jited = 1;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	fp-&gt;bpf_func = (void *)image;</div><div class='add'>+	fp-&gt;jited = 1;</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(addrs);</div><div class='ctx'> 	return;</div><div class='head'>diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c<br/>index 0fe98a567125..aee2bb817ac6 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/net/bpf_jit_comp64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/net/bpf_jit_comp64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/net/bpf_jit_comp64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/net/bpf_jit_comp64.c</a></div><div class='hunk'>@@ -766,7 +766,7 @@ emit_clear:</div><div class='ctx'> 			func = (u8 *) __bpf_call_base + imm;</div><div class='ctx'> </div><div class='ctx'> 			/* Save skb pointer if we need to re-cache skb data */</div><div class='del'>-			if (bpf_helper_changes_skb_data(func))</div><div class='add'>+			if (bpf_helper_changes_pkt_data(func))</div><div class='ctx'> 				PPC_BPF_STL(3, 1, bpf_jit_stack_local(ctx));</div><div class='ctx'> </div><div class='ctx'> 			bpf_jit_emit_func_call(image, ctx, (u64)func);</div><div class='hunk'>@@ -775,7 +775,7 @@ emit_clear:</div><div class='ctx'> 			PPC_MR(b2p[BPF_REG_0], 3);</div><div class='ctx'> </div><div class='ctx'> 			/* refresh skb cache */</div><div class='del'>-			if (bpf_helper_changes_skb_data(func)) {</div><div class='add'>+			if (bpf_helper_changes_pkt_data(func)) {</div><div class='ctx'> 				/* reload skb pointer to r3 */</div><div class='ctx'> 				PPC_BPF_LL(3, 1, bpf_jit_stack_local(ctx));</div><div class='ctx'> 				bpf_jit_emit_skb_loads(image, ctx);</div><div class='hunk'>@@ -961,8 +961,6 @@ common_load:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bpf_jit_compile(struct bpf_prog *fp) { }</div><div class='del'>-</div><div class='ctx'> struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 proglen;</div><div class='hunk'>@@ -1046,16 +1044,16 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)</div><div class='ctx'> 		 */</div><div class='ctx'> 		bpf_jit_dump(flen, proglen, pass, code_base);</div><div class='ctx'> </div><div class='del'>-	if (image) {</div><div class='del'>-		bpf_flush_icache(bpf_hdr, image + alloclen);</div><div class='ctx'> #ifdef PPC64_ELF_ABI_v1</div><div class='del'>-		/* Function descriptor nastiness: Address + TOC */</div><div class='del'>-		((u64 *)image)[0] = (u64)code_base;</div><div class='del'>-		((u64 *)image)[1] = local_paca-&gt;kernel_toc;</div><div class='add'>+	/* Function descriptor nastiness: Address + TOC */</div><div class='add'>+	((u64 *)image)[0] = (u64)code_base;</div><div class='add'>+	((u64 *)image)[1] = local_paca-&gt;kernel_toc;</div><div class='ctx'> #endif</div><div class='del'>-		fp-&gt;bpf_func = (void *)image;</div><div class='del'>-		fp-&gt;jited = 1;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	fp-&gt;bpf_func = (void *)image;</div><div class='add'>+	fp-&gt;jited = 1;</div><div class='add'>+</div><div class='add'>+	bpf_flush_icache(bpf_hdr, (u8 *)bpf_hdr + (bpf_hdr-&gt;pages * PAGE_SIZE));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	kfree(addrs);</div><div class='hunk'>@@ -1066,6 +1064,7 @@ out:</div><div class='ctx'> 	return fp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Overriding bpf_jit_free() as we don't set images read-only. */</div><div class='ctx'> void bpf_jit_free(struct bpf_prog *fp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr = (unsigned long)fp-&gt;bpf_func &amp; PAGE_MASK;</div><div class='head'>diff --git a/arch/powerpc/oprofile/cell/spu_profiler.c b/arch/powerpc/oprofile/cell/spu_profiler.c<br/>index b19265de9178..5182f2936af2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/oprofile/cell/spu_profiler.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/oprofile/cell/spu_profiler.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/oprofile/cell/spu_profiler.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/oprofile/cell/spu_profiler.c</a></div><div class='hunk'>@@ -180,7 +180,7 @@ static enum hrtimer_restart profile_spus(struct hrtimer *timer)</div><div class='ctx'> 	smp_wmb();	/* insure spu event buffer updates are written */</div><div class='ctx'> 			/* don't want events intermingled... */</div><div class='ctx'> </div><div class='del'>-	kt = ktime_set(0, profiling_interval);</div><div class='add'>+	kt = profiling_interval;</div><div class='ctx'> 	if (!spu_prof_running)</div><div class='ctx'> 		goto stop;</div><div class='ctx'> 	hrtimer_forward(timer, timer-&gt;base-&gt;get_time(), kt);</div><div class='hunk'>@@ -204,7 +204,7 @@ int start_spu_profiling_cycles(unsigned int cycles_reset)</div><div class='ctx'> 	ktime_t kt;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("timer resolution: %lu\n", TICK_NSEC);</div><div class='del'>-	kt = ktime_set(0, profiling_interval);</div><div class='add'>+	kt = profiling_interval;</div><div class='ctx'> 	hrtimer_init(&amp;timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='ctx'> 	hrtimer_set_expires(&amp;timer, kt);</div><div class='ctx'> 	timer.function = profile_spus;</div><div class='head'>diff --git a/arch/powerpc/oprofile/cell/spu_task_sync.c b/arch/powerpc/oprofile/cell/spu_task_sync.c<br/>index 83d2b4ef7f0d..44d67b167e0b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/oprofile/cell/spu_task_sync.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/oprofile/cell/spu_task_sync.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/oprofile/cell/spu_task_sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/oprofile/cell/spu_task_sync.c</a></div><div class='hunk'>@@ -295,7 +295,7 @@ out:</div><div class='ctx'>  * dcookie user still being registered (namely, the reader</div><div class='ctx'>  * of the event buffer).</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long fast_get_dcookie(struct path *path)</div><div class='add'>+static inline unsigned long fast_get_dcookie(const struct path *path)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cookie;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/perf/8xx-pmu.c b/arch/powerpc/perf/8xx-pmu.c<br/>new file mode 100644<br/>index 000000000000..3c39f05f0af3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/perf/8xx-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/8xx-pmu.c</a></div><div class='hunk'>@@ -0,0 +1,173 @@</div><div class='add'>+/*</div><div class='add'>+ * Performance event support - PPC 8xx</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016 Christophe Leroy, CS Systemes d'Information</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;asm/pmc.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/firmware.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+</div><div class='add'>+#define PERF_8xx_ID_CPU_CYCLES		1</div><div class='add'>+#define PERF_8xx_ID_HW_INSTRUCTIONS	2</div><div class='add'>+#define PERF_8xx_ID_ITLB_LOAD_MISS	3</div><div class='add'>+#define PERF_8xx_ID_DTLB_LOAD_MISS	4</div><div class='add'>+</div><div class='add'>+#define C(x)	PERF_COUNT_HW_CACHE_##x</div><div class='add'>+#define DTLB_LOAD_MISS	(C(DTLB) | (C(OP_READ) &lt;&lt; 8) | (C(RESULT_MISS) &lt;&lt; 16))</div><div class='add'>+#define ITLB_LOAD_MISS	(C(ITLB) | (C(OP_READ) &lt;&lt; 8) | (C(RESULT_MISS) &lt;&lt; 16))</div><div class='add'>+</div><div class='add'>+extern unsigned long itlb_miss_counter, dtlb_miss_counter;</div><div class='add'>+extern atomic_t instruction_counter;</div><div class='add'>+</div><div class='add'>+static atomic_t insn_ctr_ref;</div><div class='add'>+</div><div class='add'>+static s64 get_insn_ctr(void)</div><div class='add'>+{</div><div class='add'>+	int ctr;</div><div class='add'>+	unsigned long counta;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ctr = atomic_read(&amp;instruction_counter);</div><div class='add'>+		counta = mfspr(SPRN_COUNTA);</div><div class='add'>+	} while (ctr != atomic_read(&amp;instruction_counter));</div><div class='add'>+</div><div class='add'>+	return ((s64)ctr &lt;&lt; 16) | (counta &gt;&gt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int event_type(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	switch (event-&gt;attr.type) {</div><div class='add'>+	case PERF_TYPE_HARDWARE:</div><div class='add'>+		if (event-&gt;attr.config == PERF_COUNT_HW_CPU_CYCLES)</div><div class='add'>+			return PERF_8xx_ID_CPU_CYCLES;</div><div class='add'>+		if (event-&gt;attr.config == PERF_COUNT_HW_INSTRUCTIONS)</div><div class='add'>+			return PERF_8xx_ID_HW_INSTRUCTIONS;</div><div class='add'>+		break;</div><div class='add'>+	case PERF_TYPE_HW_CACHE:</div><div class='add'>+		if (event-&gt;attr.config == ITLB_LOAD_MISS)</div><div class='add'>+			return PERF_8xx_ID_ITLB_LOAD_MISS;</div><div class='add'>+		if (event-&gt;attr.config == DTLB_LOAD_MISS)</div><div class='add'>+			return PERF_8xx_ID_DTLB_LOAD_MISS;</div><div class='add'>+		break;</div><div class='add'>+	case PERF_TYPE_RAW:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpc8xx_pmu_event_init(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	int type = event_type(event);</div><div class='add'>+</div><div class='add'>+	if (type &lt; 0)</div><div class='add'>+		return type;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpc8xx_pmu_add(struct perf_event *event, int flags)</div><div class='add'>+{</div><div class='add'>+	int type = event_type(event);</div><div class='add'>+	s64 val = 0;</div><div class='add'>+</div><div class='add'>+	if (type &lt; 0)</div><div class='add'>+		return type;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PERF_8xx_ID_CPU_CYCLES:</div><div class='add'>+		val = get_tb();</div><div class='add'>+		break;</div><div class='add'>+	case PERF_8xx_ID_HW_INSTRUCTIONS:</div><div class='add'>+		if (atomic_inc_return(&amp;insn_ctr_ref) == 1)</div><div class='add'>+			mtspr(SPRN_ICTRL, 0xc0080007);</div><div class='add'>+		val = get_insn_ctr();</div><div class='add'>+		break;</div><div class='add'>+	case PERF_8xx_ID_ITLB_LOAD_MISS:</div><div class='add'>+		val = itlb_miss_counter;</div><div class='add'>+		break;</div><div class='add'>+	case PERF_8xx_ID_DTLB_LOAD_MISS:</div><div class='add'>+		val = dtlb_miss_counter;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	local64_set(&amp;event-&gt;hw.prev_count, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mpc8xx_pmu_read(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	int type = event_type(event);</div><div class='add'>+	s64 prev, val = 0, delta = 0;</div><div class='add'>+</div><div class='add'>+	if (type &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		prev = local64_read(&amp;event-&gt;hw.prev_count);</div><div class='add'>+		switch (type) {</div><div class='add'>+		case PERF_8xx_ID_CPU_CYCLES:</div><div class='add'>+			val = get_tb();</div><div class='add'>+			delta = 16 * (val - prev);</div><div class='add'>+			break;</div><div class='add'>+		case PERF_8xx_ID_HW_INSTRUCTIONS:</div><div class='add'>+			val = get_insn_ctr();</div><div class='add'>+			delta = prev - val;</div><div class='add'>+			if (delta &lt; 0)</div><div class='add'>+				delta += 0x1000000000000LL;</div><div class='add'>+			break;</div><div class='add'>+		case PERF_8xx_ID_ITLB_LOAD_MISS:</div><div class='add'>+			val = itlb_miss_counter;</div><div class='add'>+			delta = (s64)((s32)val - (s32)prev);</div><div class='add'>+			break;</div><div class='add'>+		case PERF_8xx_ID_DTLB_LOAD_MISS:</div><div class='add'>+			val = dtlb_miss_counter;</div><div class='add'>+			delta = (s64)((s32)val - (s32)prev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (local64_cmpxchg(&amp;event-&gt;hw.prev_count, prev, val) != prev);</div><div class='add'>+</div><div class='add'>+	local64_add(delta, &amp;event-&gt;count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mpc8xx_pmu_del(struct perf_event *event, int flags)</div><div class='add'>+{</div><div class='add'>+	mpc8xx_pmu_read(event);</div><div class='add'>+	if (event_type(event) != PERF_8xx_ID_HW_INSTRUCTIONS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* If it was the last user, stop counting to avoid useles overhead */</div><div class='add'>+	if (atomic_dec_return(&amp;insn_ctr_ref) == 0)</div><div class='add'>+		mtspr(SPRN_ICTRL, 7);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pmu mpc8xx_pmu = {</div><div class='add'>+	.event_init	= mpc8xx_pmu_event_init,</div><div class='add'>+	.add		= mpc8xx_pmu_add,</div><div class='add'>+	.del		= mpc8xx_pmu_del,</div><div class='add'>+	.read		= mpc8xx_pmu_read,</div><div class='add'>+	.capabilities	= PERF_PMU_CAP_NO_INTERRUPT |</div><div class='add'>+			  PERF_PMU_CAP_NO_NMI,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int init_mpc8xx_pmu(void)</div><div class='add'>+{</div><div class='add'>+	mtspr(SPRN_ICTRL, 7);</div><div class='add'>+	mtspr(SPRN_CMPA, 0);</div><div class='add'>+	mtspr(SPRN_COUNTA, 0xffff);</div><div class='add'>+</div><div class='add'>+	return perf_pmu_register(&amp;mpc8xx_pmu, "cpu", PERF_TYPE_RAW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+early_initcall(init_mpc8xx_pmu);</div><div class='head'>diff --git a/arch/powerpc/perf/Makefile b/arch/powerpc/perf/Makefile<br/>index f102d5370101..4d606b99a5cb 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/perf/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/perf/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/perf/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/Makefile</a></div><div class='hunk'>@@ -13,5 +13,7 @@ obj-$(CONFIG_FSL_EMB_PERF_EVENT_E500) += e500-pmu.o e6500-pmu.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_HV_PERF_CTRS) += hv-24x7.o hv-gpci.o hv-common.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_PPC_8xx_PERF_EVENT) += 8xx-pmu.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_PPC64)		+= $(obj64-y)</div><div class='ctx'> obj-$(CONFIG_PPC32)		+= $(obj32-y)</div><div class='head'>diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c<br/>index 72c27b8d2cf3..595dd718ea87 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/perf/core-book3s.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/perf/core-book3s.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/perf/core-book3s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/core-book3s.c</a></div><div class='hunk'>@@ -57,6 +57,7 @@ struct cpu_hw_events {</div><div class='ctx'> 	void				*bhrb_context;</div><div class='ctx'> 	struct	perf_branch_stack	bhrb_stack;</div><div class='ctx'> 	struct	perf_branch_entry	bhrb_entries[BHRB_MAX_ENTRIES];</div><div class='add'>+	u64				ic_init;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events);</div><div class='hunk'>@@ -127,6 +128,10 @@ static inline void power_pmu_bhrb_disable(struct perf_event *event) {}</div><div class='ctx'> static void power_pmu_sched_task(struct perf_event_context *ctx, bool sched_in) {}</div><div class='ctx'> static inline void power_pmu_bhrb_read(struct cpu_hw_events *cpuhw) {}</div><div class='ctx'> static void pmao_restore_workaround(bool ebb) { }</div><div class='add'>+static bool use_ic(u64 event)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_PPC32 */</div><div class='ctx'> </div><div class='ctx'> static bool regs_use_siar(struct pt_regs *regs)</div><div class='hunk'>@@ -243,7 +248,7 @@ static inline u32 perf_get_misc_flags(struct pt_regs *regs)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ppmu-&gt;flags &amp; PPMU_NO_SIPR) {</div><div class='ctx'> 		unsigned long siar = mfspr(SPRN_SIAR);</div><div class='del'>-		if (siar &gt;= PAGE_OFFSET)</div><div class='add'>+		if (is_kernel_addr(siar))</div><div class='ctx'> 			return PERF_RECORD_MISC_KERNEL;</div><div class='ctx'> 		return PERF_RECORD_MISC_USER;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -295,6 +300,8 @@ static inline void perf_read_regs(struct pt_regs *regs)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (TRAP(regs) != 0xf00)</div><div class='ctx'> 		use_siar = 0;</div><div class='add'>+	else if ((ppmu-&gt;flags &amp; PPMU_NO_SIAR))</div><div class='add'>+		use_siar = 0;</div><div class='ctx'> 	else if (marked)</div><div class='ctx'> 		use_siar = 1;</div><div class='ctx'> 	else if ((ppmu-&gt;flags &amp; PPMU_NO_CONT_SAMPLING))</div><div class='hunk'>@@ -686,6 +693,15 @@ static void pmao_restore_workaround(bool ebb)</div><div class='ctx'> 	mtspr(SPRN_PMC5, pmcs[4]);</div><div class='ctx'> 	mtspr(SPRN_PMC6, pmcs[5]);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static bool use_ic(u64 event)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_POWER9_DD1) &amp;&amp;</div><div class='add'>+			(event == 0x200f2 || event == 0x300f2))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> static void perf_event_interrupt(struct pt_regs *regs);</div><div class='hunk'>@@ -1005,6 +1021,7 @@ static u64 check_and_compute_delta(u64 prev, u64 val)</div><div class='ctx'> static void power_pmu_read(struct perf_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	s64 val, delta, prev;</div><div class='add'>+	struct cpu_hw_events *cpuhw = this_cpu_ptr(&amp;cpu_hw_events);</div><div class='ctx'> </div><div class='ctx'> 	if (event-&gt;hw.state &amp; PERF_HES_STOPPED)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1014,6 +1031,13 @@ static void power_pmu_read(struct perf_event *event)</div><div class='ctx'> </div><div class='ctx'> 	if (is_ebb_event(event)) {</div><div class='ctx'> 		val = read_pmc(event-&gt;hw.idx);</div><div class='add'>+		if (use_ic(event-&gt;attr.config)) {</div><div class='add'>+			val = mfspr(SPRN_IC);</div><div class='add'>+			if (val &gt; cpuhw-&gt;ic_init)</div><div class='add'>+				val = val - cpuhw-&gt;ic_init;</div><div class='add'>+			else</div><div class='add'>+				val = val + (0 - cpuhw-&gt;ic_init);</div><div class='add'>+		}</div><div class='ctx'> 		local64_set(&amp;event-&gt;hw.prev_count, val);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1027,6 +1051,13 @@ static void power_pmu_read(struct perf_event *event)</div><div class='ctx'> 		prev = local64_read(&amp;event-&gt;hw.prev_count);</div><div class='ctx'> 		barrier();</div><div class='ctx'> 		val = read_pmc(event-&gt;hw.idx);</div><div class='add'>+		if (use_ic(event-&gt;attr.config)) {</div><div class='add'>+			val = mfspr(SPRN_IC);</div><div class='add'>+			if (val &gt; cpuhw-&gt;ic_init)</div><div class='add'>+				val = val - cpuhw-&gt;ic_init;</div><div class='add'>+			else</div><div class='add'>+				val = val + (0 - cpuhw-&gt;ic_init);</div><div class='add'>+		}</div><div class='ctx'> 		delta = check_and_compute_delta(prev, val);</div><div class='ctx'> 		if (!delta)</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -1464,6 +1495,13 @@ nocheck:</div><div class='ctx'> 					event-&gt;attr.branch_sample_type);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Workaround for POWER9 DD1 to use the Instruction Counter</div><div class='add'>+	 * register value for instruction counting</div><div class='add'>+	 */</div><div class='add'>+	if (use_ic(event-&gt;attr.config))</div><div class='add'>+		cpuhw-&gt;ic_init = mfspr(SPRN_IC);</div><div class='add'>+</div><div class='ctx'> 	perf_pmu_enable(event-&gt;pmu);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2189,7 +2227,7 @@ int register_power_pmu(struct power_pmu *pmu)</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> 	perf_pmu_register(&amp;power_pmu, "cpu", PERF_TYPE_RAW);</div><div class='del'>-	cpuhp_setup_state(CPUHP_PERF_POWER, "PERF_POWER",</div><div class='add'>+	cpuhp_setup_state(CPUHP_PERF_POWER, "perf/powerpc:prepare",</div><div class='ctx'> 			  power_pmu_prepare_cpu, NULL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/perf/isa207-common.c b/arch/powerpc/perf/isa207-common.c<br/>index 6143c99f3ec5..e79fb5fb817d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/perf/isa207-common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/perf/isa207-common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/perf/isa207-common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/isa207-common.c</a></div><div class='hunk'>@@ -12,6 +12,40 @@</div><div class='ctx'>  */</div><div class='ctx'> #include "isa207-common.h"</div><div class='ctx'> </div><div class='add'>+PMU_FORMAT_ATTR(event,		"config:0-49");</div><div class='add'>+PMU_FORMAT_ATTR(pmcxsel,	"config:0-7");</div><div class='add'>+PMU_FORMAT_ATTR(mark,		"config:8");</div><div class='add'>+PMU_FORMAT_ATTR(combine,	"config:11");</div><div class='add'>+PMU_FORMAT_ATTR(unit,		"config:12-15");</div><div class='add'>+PMU_FORMAT_ATTR(pmc,		"config:16-19");</div><div class='add'>+PMU_FORMAT_ATTR(cache_sel,	"config:20-23");</div><div class='add'>+PMU_FORMAT_ATTR(sample_mode,	"config:24-28");</div><div class='add'>+PMU_FORMAT_ATTR(thresh_sel,	"config:29-31");</div><div class='add'>+PMU_FORMAT_ATTR(thresh_stop,	"config:32-35");</div><div class='add'>+PMU_FORMAT_ATTR(thresh_start,	"config:36-39");</div><div class='add'>+PMU_FORMAT_ATTR(thresh_cmp,	"config:40-49");</div><div class='add'>+</div><div class='add'>+struct attribute *isa207_pmu_format_attr[] = {</div><div class='add'>+	&amp;format_attr_event.attr,</div><div class='add'>+	&amp;format_attr_pmcxsel.attr,</div><div class='add'>+	&amp;format_attr_mark.attr,</div><div class='add'>+	&amp;format_attr_combine.attr,</div><div class='add'>+	&amp;format_attr_unit.attr,</div><div class='add'>+	&amp;format_attr_pmc.attr,</div><div class='add'>+	&amp;format_attr_cache_sel.attr,</div><div class='add'>+	&amp;format_attr_sample_mode.attr,</div><div class='add'>+	&amp;format_attr_thresh_sel.attr,</div><div class='add'>+	&amp;format_attr_thresh_stop.attr,</div><div class='add'>+	&amp;format_attr_thresh_start.attr,</div><div class='add'>+	&amp;format_attr_thresh_cmp.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct attribute_group isa207_pmu_format_group = {</div><div class='add'>+	.name = "format",</div><div class='add'>+	.attrs = isa207_pmu_format_attr,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline bool event_is_fab_match(u64 event)</div><div class='ctx'> {</div><div class='ctx'> 	/* Only check pmc, unit and pmcxsel, ignore the edge bit (0) */</div><div class='hunk'>@@ -21,6 +55,70 @@ static inline bool event_is_fab_match(u64 event)</div><div class='ctx'> 	return (event == 0x30056 || event == 0x4f052);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool is_event_valid(u64 event)</div><div class='add'>+{</div><div class='add'>+	u64 valid_mask = EVENT_VALID_MASK;</div><div class='add'>+</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300) &amp;&amp; !cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='add'>+		valid_mask = p9_EVENT_VALID_MASK;</div><div class='add'>+</div><div class='add'>+	return !(event &amp; ~valid_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mmcra_sdar_mode(u64 event)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300) &amp;&amp; !cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='add'>+		return p9_SDAR_MODE(event) &lt;&lt; MMCRA_SDAR_MODE_SHIFT;</div><div class='add'>+</div><div class='add'>+	return MMCRA_SDAR_MODE_TLB;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 thresh_cmp_val(u64 value)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300) &amp;&amp; !cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='add'>+		return value &lt;&lt; p9_MMCRA_THR_CMP_SHIFT;</div><div class='add'>+</div><div class='add'>+	return value &lt;&lt; MMCRA_THR_CMP_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long combine_from_event(u64 event)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300) &amp;&amp; !cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='add'>+		return p9_EVENT_COMBINE(event);</div><div class='add'>+</div><div class='add'>+	return EVENT_COMBINE(event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long combine_shift(unsigned long pmc)</div><div class='add'>+{</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300) &amp;&amp; !cpu_has_feature(CPU_FTR_POWER9_DD1))</div><div class='add'>+		return p9_MMCR1_COMBINE_SHIFT(pmc);</div><div class='add'>+</div><div class='add'>+	return MMCR1_COMBINE_SHIFT(pmc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool event_is_threshold(u64 event)</div><div class='add'>+{</div><div class='add'>+	return (event &gt;&gt; EVENT_THR_SEL_SHIFT) &amp; EVENT_THR_SEL_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_thresh_cmp_valid(u64 event)</div><div class='add'>+{</div><div class='add'>+	unsigned int cmp, exp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check the mantissa upper two bits are not zero, unless the</div><div class='add'>+	 * exponent is also zero. See the THRESH_CMP_MANTISSA doc.</div><div class='add'>+	 */</div><div class='add'>+	cmp = (event &gt;&gt; EVENT_THR_CMP_SHIFT) &amp; EVENT_THR_CMP_MASK;</div><div class='add'>+	exp = cmp &gt;&gt; 7;</div><div class='add'>+</div><div class='add'>+	if (exp &amp;&amp; (cmp &amp; 0x60) == 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int unit, pmc, cache, ebb;</div><div class='hunk'>@@ -28,7 +126,7 @@ int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp)</div><div class='ctx'> </div><div class='ctx'> 	mask = value = 0;</div><div class='ctx'> </div><div class='del'>-	if (event &amp; ~EVENT_VALID_MASK)</div><div class='add'>+	if (!is_event_valid(event))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	pmc   = (event &gt;&gt; EVENT_PMC_SHIFT)        &amp; EVENT_PMC_MASK;</div><div class='hunk'>@@ -87,28 +185,26 @@ int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp)</div><div class='ctx'> 		value |= CNST_SAMPLE_VAL(event &gt;&gt; EVENT_SAMPLE_SHIFT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Special case for PM_MRK_FAB_RSP_MATCH and PM_MRK_FAB_RSP_MATCH_CYC,</div><div class='del'>-	 * the threshold control bits are used for the match value.</div><div class='del'>-	 */</div><div class='del'>-	if (event_is_fab_match(event)) {</div><div class='del'>-		mask  |= CNST_FAB_MATCH_MASK;</div><div class='del'>-		value |= CNST_FAB_MATCH_VAL(event &gt;&gt; EVENT_THR_CTL_SHIFT);</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_ARCH_300))  {</div><div class='add'>+		if (event_is_threshold(event) &amp;&amp; is_thresh_cmp_valid(event)) {</div><div class='add'>+			mask  |= CNST_THRESH_MASK;</div><div class='add'>+			value |= CNST_THRESH_VAL(event &gt;&gt; EVENT_THRESH_SHIFT);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Check the mantissa upper two bits are not zero, unless the</div><div class='del'>-		 * exponent is also zero. See the THRESH_CMP_MANTISSA doc.</div><div class='add'>+		 * Special case for PM_MRK_FAB_RSP_MATCH and PM_MRK_FAB_RSP_MATCH_CYC,</div><div class='add'>+		 * the threshold control bits are used for the match value.</div><div class='ctx'> 		 */</div><div class='del'>-		unsigned int cmp, exp;</div><div class='del'>-</div><div class='del'>-		cmp = (event &gt;&gt; EVENT_THR_CMP_SHIFT) &amp; EVENT_THR_CMP_MASK;</div><div class='del'>-		exp = cmp &gt;&gt; 7;</div><div class='del'>-</div><div class='del'>-		if (exp &amp;&amp; (cmp &amp; 0x60) == 0)</div><div class='del'>-			return -1;</div><div class='add'>+		if (event_is_fab_match(event)) {</div><div class='add'>+			mask  |= CNST_FAB_MATCH_MASK;</div><div class='add'>+			value |= CNST_FAB_MATCH_VAL(event &gt;&gt; EVENT_THR_CTL_SHIFT);</div><div class='add'>+		} else {</div><div class='add'>+			if (!is_thresh_cmp_valid(event))</div><div class='add'>+				return -1;</div><div class='ctx'> </div><div class='del'>-		mask  |= CNST_THRESH_MASK;</div><div class='del'>-		value |= CNST_THRESH_VAL(event &gt;&gt; EVENT_THRESH_SHIFT);</div><div class='add'>+			mask  |= CNST_THRESH_MASK;</div><div class='add'>+			value |= CNST_THRESH_VAL(event &gt;&gt; EVENT_THRESH_SHIFT);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!pmc &amp;&amp; ebb)</div><div class='hunk'>@@ -155,15 +251,13 @@ int isa207_compute_mmcr(u64 event[], int n_ev,</div><div class='ctx'> 			pmc_inuse |= 1 &lt;&lt; pmc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* In continuous sampling mode, update SDAR on TLB miss */</div><div class='del'>-	mmcra = MMCRA_SDAR_MODE_TLB;</div><div class='del'>-	mmcr1 = mmcr2 = 0;</div><div class='add'>+	mmcra = mmcr1 = mmcr2 = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Second pass: assign PMCs, set all MMCR1 fields */</div><div class='ctx'> 	for (i = 0; i &lt; n_ev; ++i) {</div><div class='ctx'> 		pmc     = (event[i] &gt;&gt; EVENT_PMC_SHIFT) &amp; EVENT_PMC_MASK;</div><div class='ctx'> 		unit    = (event[i] &gt;&gt; EVENT_UNIT_SHIFT) &amp; EVENT_UNIT_MASK;</div><div class='del'>-		combine = (event[i] &gt;&gt; EVENT_COMBINE_SHIFT) &amp; EVENT_COMBINE_MASK;</div><div class='add'>+		combine = combine_from_event(event[i]);</div><div class='ctx'> 		psel    =  event[i] &amp; EVENT_PSEL_MASK;</div><div class='ctx'> </div><div class='ctx'> 		if (!pmc) {</div><div class='hunk'>@@ -177,10 +271,13 @@ int isa207_compute_mmcr(u64 event[], int n_ev,</div><div class='ctx'> </div><div class='ctx'> 		if (pmc &lt;= 4) {</div><div class='ctx'> 			mmcr1 |= unit &lt;&lt; MMCR1_UNIT_SHIFT(pmc);</div><div class='del'>-			mmcr1 |= combine &lt;&lt; MMCR1_COMBINE_SHIFT(pmc);</div><div class='add'>+			mmcr1 |= combine &lt;&lt; combine_shift(pmc);</div><div class='ctx'> 			mmcr1 |= psel &lt;&lt; MMCR1_PMCSEL_SHIFT(pmc);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* In continuous sampling mode, update SDAR on TLB miss */</div><div class='add'>+		mmcra |= mmcra_sdar_mode(event[i]);</div><div class='add'>+</div><div class='ctx'> 		if (event[i] &amp; EVENT_IS_L1) {</div><div class='ctx'> 			cache = event[i] &gt;&gt; EVENT_CACHE_SEL_SHIFT;</div><div class='ctx'> 			mmcr1 |= (cache &amp; 1) &lt;&lt; MMCR1_IC_QUAL_SHIFT;</div><div class='hunk'>@@ -202,7 +299,7 @@ int isa207_compute_mmcr(u64 event[], int n_ev,</div><div class='ctx'> 		 * PM_MRK_FAB_RSP_MATCH and PM_MRK_FAB_RSP_MATCH_CYC,</div><div class='ctx'> 		 * the threshold bits are used for the match value.</div><div class='ctx'> 		 */</div><div class='del'>-		if (event_is_fab_match(event[i])) {</div><div class='add'>+		if (!cpu_has_feature(CPU_FTR_ARCH_300) &amp;&amp; event_is_fab_match(event[i])) {</div><div class='ctx'> 			mmcr1 |= ((event[i] &gt;&gt; EVENT_THR_CTL_SHIFT) &amp;</div><div class='ctx'> 				  EVENT_THR_CTL_MASK) &lt;&lt; MMCR1_FAB_SHIFT;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -211,7 +308,7 @@ int isa207_compute_mmcr(u64 event[], int n_ev,</div><div class='ctx'> 			val = (event[i] &gt;&gt; EVENT_THR_SEL_SHIFT) &amp; EVENT_THR_SEL_MASK;</div><div class='ctx'> 			mmcra |= val &lt;&lt; MMCRA_THR_SEL_SHIFT;</div><div class='ctx'> 			val = (event[i] &gt;&gt; EVENT_THR_CMP_SHIFT) &amp; EVENT_THR_CMP_MASK;</div><div class='del'>-			mmcra |= val &lt;&lt; MMCRA_THR_CMP_SHIFT;</div><div class='add'>+			mmcra |= thresh_cmp_val(val);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (event[i] &amp; EVENT_WANTS_BHRB) {</div><div class='hunk'>@@ -261,3 +358,39 @@ void isa207_disable_pmc(unsigned int pmc, unsigned long mmcr[])</div><div class='ctx'> 	if (pmc &lt;= 3)</div><div class='ctx'> 		mmcr[1] &amp;= ~(0xffUL &lt;&lt; MMCR1_PMCSEL_SHIFT(pmc + 1));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int find_alternative(u64 event, const unsigned int ev_alt[][MAX_ALT], int size)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size; ++i) {</div><div class='add'>+		if (event &lt; ev_alt[i][0])</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; MAX_ALT &amp;&amp; ev_alt[i][j]; ++j)</div><div class='add'>+			if (event == ev_alt[i][j])</div><div class='add'>+				return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int isa207_get_alternatives(u64 event, u64 alt[],</div><div class='add'>+				const unsigned int ev_alt[][MAX_ALT], int size)</div><div class='add'>+{</div><div class='add'>+	int i, j, num_alt = 0;</div><div class='add'>+	u64 alt_event;</div><div class='add'>+</div><div class='add'>+	alt[num_alt++] = event;</div><div class='add'>+	i = find_alternative(event, ev_alt, size);</div><div class='add'>+	if (i &gt;= 0) {</div><div class='add'>+		/* Filter out the original event, it's already in alt[0] */</div><div class='add'>+		for (j = 0; j &lt; MAX_ALT; ++j) {</div><div class='add'>+			alt_event = ev_alt[i][j];</div><div class='add'>+			if (alt_event &amp;&amp; alt_event != event)</div><div class='add'>+				alt[num_alt++] = alt_event;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return num_alt;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/perf/isa207-common.h b/arch/powerpc/perf/isa207-common.h<br/>index 4d0a4e5017c2..cf9bd8990159 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/perf/isa207-common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/perf/isa207-common.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/perf/isa207-common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/isa207-common.h</a></div><div class='hunk'>@@ -107,6 +107,7 @@</div><div class='ctx'> #define EVENT_UNIT_MASK		0xf</div><div class='ctx'> #define EVENT_COMBINE_SHIFT	11	/* Combine bit */</div><div class='ctx'> #define EVENT_COMBINE_MASK	0x1</div><div class='add'>+#define EVENT_COMBINE(v)	(((v) &gt;&gt; EVENT_COMBINE_SHIFT) &amp; EVENT_COMBINE_MASK)</div><div class='ctx'> #define EVENT_MARKED_SHIFT	8	/* Marked bit */</div><div class='ctx'> #define EVENT_MARKED_MASK	0x1</div><div class='ctx'> #define EVENT_IS_MARKED		(EVENT_MARKED_MASK &lt;&lt; EVENT_MARKED_SHIFT)</div><div class='hunk'>@@ -134,6 +135,26 @@</div><div class='ctx'> 	 PERF_SAMPLE_BRANCH_KERNEL      |\</div><div class='ctx'> 	 PERF_SAMPLE_BRANCH_HV)</div><div class='ctx'> </div><div class='add'>+/* Contants to support power9 raw encoding format */</div><div class='add'>+#define p9_EVENT_COMBINE_SHIFT	10	/* Combine bit */</div><div class='add'>+#define p9_EVENT_COMBINE_MASK	0x3ull</div><div class='add'>+#define p9_EVENT_COMBINE(v)	(((v) &gt;&gt; p9_EVENT_COMBINE_SHIFT) &amp; p9_EVENT_COMBINE_MASK)</div><div class='add'>+#define p9_SDAR_MODE_SHIFT	50</div><div class='add'>+#define p9_SDAR_MODE_MASK	0x3ull</div><div class='add'>+#define p9_SDAR_MODE(v)		(((v) &gt;&gt; p9_SDAR_MODE_SHIFT) &amp; p9_SDAR_MODE_MASK)</div><div class='add'>+</div><div class='add'>+#define p9_EVENT_VALID_MASK		\</div><div class='add'>+	((p9_SDAR_MODE_MASK   &lt;&lt; p9_SDAR_MODE_SHIFT		|	\</div><div class='add'>+	(EVENT_THRESH_MASK    &lt;&lt; EVENT_THRESH_SHIFT)		|	\</div><div class='add'>+	(EVENT_SAMPLE_MASK    &lt;&lt; EVENT_SAMPLE_SHIFT)		|	\</div><div class='add'>+	(EVENT_CACHE_SEL_MASK &lt;&lt; EVENT_CACHE_SEL_SHIFT)		|	\</div><div class='add'>+	(EVENT_PMC_MASK       &lt;&lt; EVENT_PMC_SHIFT)		|	\</div><div class='add'>+	(EVENT_UNIT_MASK      &lt;&lt; EVENT_UNIT_SHIFT)		|	\</div><div class='add'>+	(p9_EVENT_COMBINE_MASK &lt;&lt; p9_EVENT_COMBINE_SHIFT)	|	\</div><div class='add'>+	(EVENT_MARKED_MASK    &lt;&lt; EVENT_MARKED_SHIFT)		|	\</div><div class='add'>+	 EVENT_LINUX_MASK					|	\</div><div class='add'>+	 EVENT_PSEL_MASK))</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Layout of constraint bits:</div><div class='ctx'>  *</div><div class='hunk'>@@ -201,6 +222,10 @@</div><div class='ctx'> 	CNST_PMC_VAL(1) | CNST_PMC_VAL(2) | CNST_PMC_VAL(3) | \</div><div class='ctx'> 	CNST_PMC_VAL(4) | CNST_PMC_VAL(5) | CNST_PMC_VAL(6) | CNST_NC_VAL</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Lets restrict use of PMC5 for instruction counting.</div><div class='add'>+ */</div><div class='add'>+#define P9_DD1_TEST_ADDER	(ISA207_TEST_ADDER | CNST_PMC_VAL(5))</div><div class='ctx'> </div><div class='ctx'> /* Bits in MMCR1 for PowerISA v2.07 */</div><div class='ctx'> #define MMCR1_UNIT_SHIFT(pmc)		(60 - (4 * ((pmc) - 1)))</div><div class='hunk'>@@ -210,15 +235,22 @@</div><div class='ctx'> #define MMCR1_DC_QUAL_SHIFT		47</div><div class='ctx'> #define MMCR1_IC_QUAL_SHIFT		46</div><div class='ctx'> </div><div class='add'>+/* MMCR1 Combine bits macro for power9 */</div><div class='add'>+#define p9_MMCR1_COMBINE_SHIFT(pmc)	(38 - ((pmc - 1) * 2))</div><div class='add'>+</div><div class='ctx'> /* Bits in MMCRA for PowerISA v2.07 */</div><div class='ctx'> #define MMCRA_SAMP_MODE_SHIFT		1</div><div class='ctx'> #define MMCRA_SAMP_ELIG_SHIFT		4</div><div class='ctx'> #define MMCRA_THR_CTL_SHIFT		8</div><div class='ctx'> #define MMCRA_THR_SEL_SHIFT		16</div><div class='ctx'> #define MMCRA_THR_CMP_SHIFT		32</div><div class='del'>-#define MMCRA_SDAR_MODE_TLB		(1ull &lt;&lt; 42)</div><div class='add'>+#define MMCRA_SDAR_MODE_SHIFT		42</div><div class='add'>+#define MMCRA_SDAR_MODE_TLB		(1ull &lt;&lt; MMCRA_SDAR_MODE_SHIFT)</div><div class='ctx'> #define MMCRA_IFM_SHIFT			30</div><div class='ctx'> </div><div class='add'>+/* MMCR1 Threshold Compare bit constant for power9 */</div><div class='add'>+#define p9_MMCRA_THR_CMP_SHIFT	45</div><div class='add'>+</div><div class='ctx'> /* Bits in MMCR2 for PowerISA v2.07 */</div><div class='ctx'> #define MMCR2_FCS(pmc)			(1ull &lt;&lt; (63 - (((pmc) - 1) * 9)))</div><div class='ctx'> #define MMCR2_FCP(pmc)			(1ull &lt;&lt; (62 - (((pmc) - 1) * 9)))</div><div class='hunk'>@@ -232,5 +264,8 @@ int isa207_compute_mmcr(u64 event[], int n_ev,</div><div class='ctx'> 				unsigned int hwc[], unsigned long mmcr[],</div><div class='ctx'> 				struct perf_event *pevents[]);</div><div class='ctx'> void isa207_disable_pmc(unsigned int pmc, unsigned long mmcr[]);</div><div class='add'>+int isa207_get_alternatives(u64 event, u64 alt[],</div><div class='add'>+				const unsigned int ev_alt[][MAX_ALT], int size);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/perf/perf_regs.c b/arch/powerpc/perf/perf_regs.c<br/>index d24a8a3668fa..cbd82fde5770 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/perf/perf_regs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/perf/perf_regs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/perf/perf_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/perf_regs.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='head'>diff --git a/arch/powerpc/perf/power8-pmu.c b/arch/powerpc/perf/power8-pmu.c<br/>index ab830d106ec5..ce15b19a7962 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/perf/power8-pmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/perf/power8-pmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/perf/power8-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/power8-pmu.c</a></div><div class='hunk'>@@ -30,6 +30,9 @@ enum {</div><div class='ctx'> #define	POWER8_MMCRA_IFM2		0x0000000080000000UL</div><div class='ctx'> #define	POWER8_MMCRA_IFM3		0x00000000C0000000UL</div><div class='ctx'> </div><div class='add'>+/* PowerISA v2.07 format attribute structure*/</div><div class='add'>+extern struct attribute_group isa207_pmu_format_group;</div><div class='add'>+</div><div class='ctx'> /* Table of alternatives, sorted by column 0 */</div><div class='ctx'> static const unsigned int event_alternatives[][MAX_ALT] = {</div><div class='ctx'> 	{ PM_MRK_ST_CMPL,		PM_MRK_ST_CMPL_ALT },</div><div class='hunk'>@@ -45,43 +48,12 @@ static const unsigned int event_alternatives[][MAX_ALT] = {</div><div class='ctx'> 	{ PM_RUN_INST_CMPL_ALT,		PM_RUN_INST_CMPL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Scan the alternatives table for a match and return the</div><div class='del'>- * index into the alternatives table if found, else -1.</div><div class='del'>- */</div><div class='del'>-static int find_alternative(u64 event)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(event_alternatives); ++i) {</div><div class='del'>-		if (event &lt; event_alternatives[i][0])</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; MAX_ALT &amp;&amp; event_alternatives[i][j]; ++j)</div><div class='del'>-			if (event == event_alternatives[i][j])</div><div class='del'>-				return i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int power8_get_alternatives(u64 event, unsigned int flags, u64 alt[])</div><div class='ctx'> {</div><div class='ctx'> 	int i, j, num_alt = 0;</div><div class='del'>-	u64 alt_event;</div><div class='del'>-</div><div class='del'>-	alt[num_alt++] = event;</div><div class='del'>-</div><div class='del'>-	i = find_alternative(event);</div><div class='del'>-	if (i &gt;= 0) {</div><div class='del'>-		/* Filter out the original event, it's already in alt[0] */</div><div class='del'>-		for (j = 0; j &lt; MAX_ALT; ++j) {</div><div class='del'>-			alt_event = event_alternatives[i][j];</div><div class='del'>-			if (alt_event &amp;&amp; alt_event != event)</div><div class='del'>-				alt[num_alt++] = alt_event;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	num_alt = isa207_get_alternatives(event, alt, event_alternatives,</div><div class='add'>+					(int)ARRAY_SIZE(event_alternatives));</div><div class='ctx'> 	if (flags &amp; PPMU_ONLY_COUNT_RUN) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We're only counting in RUN state, so PM_CYC is equivalent to</div><div class='hunk'>@@ -175,42 +147,8 @@ static struct attribute_group power8_pmu_events_group = {</div><div class='ctx'> 	.attrs = power8_events_attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-PMU_FORMAT_ATTR(event,		"config:0-49");</div><div class='del'>-PMU_FORMAT_ATTR(pmcxsel,	"config:0-7");</div><div class='del'>-PMU_FORMAT_ATTR(mark,		"config:8");</div><div class='del'>-PMU_FORMAT_ATTR(combine,	"config:11");</div><div class='del'>-PMU_FORMAT_ATTR(unit,		"config:12-15");</div><div class='del'>-PMU_FORMAT_ATTR(pmc,		"config:16-19");</div><div class='del'>-PMU_FORMAT_ATTR(cache_sel,	"config:20-23");</div><div class='del'>-PMU_FORMAT_ATTR(sample_mode,	"config:24-28");</div><div class='del'>-PMU_FORMAT_ATTR(thresh_sel,	"config:29-31");</div><div class='del'>-PMU_FORMAT_ATTR(thresh_stop,	"config:32-35");</div><div class='del'>-PMU_FORMAT_ATTR(thresh_start,	"config:36-39");</div><div class='del'>-PMU_FORMAT_ATTR(thresh_cmp,	"config:40-49");</div><div class='del'>-</div><div class='del'>-static struct attribute *power8_pmu_format_attr[] = {</div><div class='del'>-	&amp;format_attr_event.attr,</div><div class='del'>-	&amp;format_attr_pmcxsel.attr,</div><div class='del'>-	&amp;format_attr_mark.attr,</div><div class='del'>-	&amp;format_attr_combine.attr,</div><div class='del'>-	&amp;format_attr_unit.attr,</div><div class='del'>-	&amp;format_attr_pmc.attr,</div><div class='del'>-	&amp;format_attr_cache_sel.attr,</div><div class='del'>-	&amp;format_attr_sample_mode.attr,</div><div class='del'>-	&amp;format_attr_thresh_sel.attr,</div><div class='del'>-	&amp;format_attr_thresh_stop.attr,</div><div class='del'>-	&amp;format_attr_thresh_start.attr,</div><div class='del'>-	&amp;format_attr_thresh_cmp.attr,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct attribute_group power8_pmu_format_group = {</div><div class='del'>-	.name = "format",</div><div class='del'>-	.attrs = power8_pmu_format_attr,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct attribute_group *power8_pmu_attr_groups[] = {</div><div class='del'>-	&amp;power8_pmu_format_group,</div><div class='add'>+	&amp;isa207_pmu_format_group,</div><div class='ctx'> 	&amp;power8_pmu_events_group,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/perf/power9-events-list.h b/arch/powerpc/perf/power9-events-list.h<br/>index 6447dc1c3d89..71a6bfee5c02 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/perf/power9-events-list.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/perf/power9-events-list.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/perf/power9-events-list.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/power9-events-list.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@ EVENT(PM_CYC,					0x0001e)</div><div class='ctx'> EVENT(PM_ICT_NOSLOT_CYC,			0x100f8)</div><div class='ctx'> EVENT(PM_CMPLU_STALL,				0x1e054)</div><div class='ctx'> EVENT(PM_INST_CMPL,				0x00002)</div><div class='del'>-EVENT(PM_BRU_CMPL,				0x40060)</div><div class='add'>+EVENT(PM_BRU_CMPL,				0x10012)</div><div class='ctx'> EVENT(PM_BR_MPRED_CMPL,				0x400f6)</div><div class='ctx'> </div><div class='ctx'> /* All L1 D cache load references counted at finish, gated by reject */</div><div class='hunk'>@@ -53,3 +53,6 @@ EVENT(PM_ITLB_MISS,				0x400fc)</div><div class='ctx'> EVENT(PM_RUN_INST_CMPL,				0x500fa)</div><div class='ctx'> /* Run_cycles */</div><div class='ctx'> EVENT(PM_RUN_CYC,				0x600f4)</div><div class='add'>+/* Instruction Dispatched */</div><div class='add'>+EVENT(PM_INST_DISP,				0x200f2)</div><div class='add'>+EVENT(PM_INST_DISP_ALT,				0x300f2)</div><div class='head'>diff --git a/arch/powerpc/perf/power9-pmu.c b/arch/powerpc/perf/power9-pmu.c<br/>index 8e9a81967ff8..7f6582708e06 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/perf/power9-pmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/perf/power9-pmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/perf/power9-pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/perf/power9-pmu.c</a></div><div class='hunk'>@@ -16,6 +16,76 @@</div><div class='ctx'> #include "isa207-common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Raw event encoding for Power9:</div><div class='add'>+ *</div><div class='add'>+ *        60        56        52        48        44        40        36        32</div><div class='add'>+ * | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - |</div><div class='add'>+ *   | | [ ]                       [ ] [      thresh_cmp     ]   [  thresh_ctl   ]</div><div class='add'>+ *   | |  |                         |                                     |</div><div class='add'>+ *   | |  *- IFM (Linux)            |	               thresh start/stop -*</div><div class='add'>+ *   | *- BHRB (Linux)              *sm</div><div class='add'>+ *   *- EBB (Linux)</div><div class='add'>+ *</div><div class='add'>+ *        28        24        20        16        12         8         4         0</div><div class='add'>+ * | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - |</div><div class='add'>+ *   [   ] [  sample ]   [cache]   [ pmc ]   [unit ]   []    m   [    pmcxsel    ]</div><div class='add'>+ *     |        |           |                          |     |</div><div class='add'>+ *     |        |           |                          |     *- mark</div><div class='add'>+ *     |        |           *- L1/L2/L3 cache_sel      |</div><div class='add'>+ *     |        |                                      |</div><div class='add'>+ *     |        *- sampling mode for marked events     *- combine</div><div class='add'>+ *     |</div><div class='add'>+ *     *- thresh_sel</div><div class='add'>+ *</div><div class='add'>+ * Below uses IBM bit numbering.</div><div class='add'>+ *</div><div class='add'>+ * MMCR1[x:y] = unit    (PMCxUNIT)</div><div class='add'>+ * MMCR1[24]   = pmc1combine[0]</div><div class='add'>+ * MMCR1[25]   = pmc1combine[1]</div><div class='add'>+ * MMCR1[26]   = pmc2combine[0]</div><div class='add'>+ * MMCR1[27]   = pmc2combine[1]</div><div class='add'>+ * MMCR1[28]   = pmc3combine[0]</div><div class='add'>+ * MMCR1[29]   = pmc3combine[1]</div><div class='add'>+ * MMCR1[30]   = pmc4combine[0]</div><div class='add'>+ * MMCR1[31]   = pmc4combine[1]</div><div class='add'>+ *</div><div class='add'>+ * if pmc == 3 and unit == 0 and pmcxsel[0:6] == 0b0101011</div><div class='add'>+ *	MMCR1[20:27] = thresh_ctl</div><div class='add'>+ * else if pmc == 4 and unit == 0xf and pmcxsel[0:6] == 0b0101001</div><div class='add'>+ *	MMCR1[20:27] = thresh_ctl</div><div class='add'>+ * else</div><div class='add'>+ *	MMCRA[48:55] = thresh_ctl   (THRESH START/END)</div><div class='add'>+ *</div><div class='add'>+ * if thresh_sel:</div><div class='add'>+ *	MMCRA[45:47] = thresh_sel</div><div class='add'>+ *</div><div class='add'>+ * if thresh_cmp:</div><div class='add'>+ *	MMCRA[9:11] = thresh_cmp[0:2]</div><div class='add'>+ *	MMCRA[12:18] = thresh_cmp[3:9]</div><div class='add'>+ *</div><div class='add'>+ * if unit == 6 or unit == 7</div><div class='add'>+ *	MMCRC[53:55] = cache_sel[1:3]      (L2EVENT_SEL)</div><div class='add'>+ * else if unit == 8 or unit == 9:</div><div class='add'>+ *	if cache_sel[0] == 0: # L3 bank</div><div class='add'>+ *		MMCRC[47:49] = cache_sel[1:3]  (L3EVENT_SEL0)</div><div class='add'>+ *	else if cache_sel[0] == 1:</div><div class='add'>+ *		MMCRC[50:51] = cache_sel[2:3]  (L3EVENT_SEL1)</div><div class='add'>+ * else if cache_sel[1]: # L1 event</div><div class='add'>+ *	MMCR1[16] = cache_sel[2]</div><div class='add'>+ *	MMCR1[17] = cache_sel[3]</div><div class='add'>+ *</div><div class='add'>+ * if mark:</div><div class='add'>+ *	MMCRA[63]    = 1		(SAMPLE_ENABLE)</div><div class='add'>+ *	MMCRA[57:59] = sample[0:2]	(RAND_SAMP_ELIG)</div><div class='add'>+ *	MMCRA[61:62] = sample[3:4]	(RAND_SAMP_MODE)</div><div class='add'>+ *</div><div class='add'>+ * if EBB and BHRB:</div><div class='add'>+ *	MMCRA[32:33] = IFM</div><div class='add'>+ *</div><div class='add'>+ * MMCRA[SDAR_MODE]  = sm</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Some power9 event codes.</div><div class='ctx'>  */</div><div class='ctx'> #define EVENT(_name, _code)	_name = _code,</div><div class='hunk'>@@ -31,6 +101,24 @@ enum {</div><div class='ctx'> #define POWER9_MMCRA_IFM2		0x0000000080000000UL</div><div class='ctx'> #define POWER9_MMCRA_IFM3		0x00000000C0000000UL</div><div class='ctx'> </div><div class='add'>+/* PowerISA v2.07 format attribute structure*/</div><div class='add'>+extern struct attribute_group isa207_pmu_format_group;</div><div class='add'>+</div><div class='add'>+/* Table of alternatives, sorted by column 0 */</div><div class='add'>+static const unsigned int power9_event_alternatives[][MAX_ALT] = {</div><div class='add'>+	{ PM_INST_DISP,			PM_INST_DISP_ALT },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int power9_get_alternatives(u64 event, unsigned int flags, u64 alt[])</div><div class='add'>+{</div><div class='add'>+	int num_alt = 0;</div><div class='add'>+</div><div class='add'>+	num_alt = isa207_get_alternatives(event, alt, power9_event_alternatives,</div><div class='add'>+				(int)ARRAY_SIZE(power9_event_alternatives));</div><div class='add'>+</div><div class='add'>+	return num_alt;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> GENERIC_EVENT_ATTR(cpu-cycles,			PM_CYC);</div><div class='ctx'> GENERIC_EVENT_ATTR(stalled-cycles-frontend,	PM_ICT_NOSLOT_CYC);</div><div class='ctx'> GENERIC_EVENT_ATTR(stalled-cycles-backend,	PM_CMPLU_STALL);</div><div class='hunk'>@@ -90,10 +178,16 @@ static struct attribute_group power9_pmu_events_group = {</div><div class='ctx'> 	.attrs = power9_events_attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-PMU_FORMAT_ATTR(event,		"config:0-49");</div><div class='add'>+static const struct attribute_group *power9_isa207_pmu_attr_groups[] = {</div><div class='add'>+	&amp;isa207_pmu_format_group,</div><div class='add'>+	&amp;power9_pmu_events_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+PMU_FORMAT_ATTR(event,		"config:0-51");</div><div class='ctx'> PMU_FORMAT_ATTR(pmcxsel,	"config:0-7");</div><div class='ctx'> PMU_FORMAT_ATTR(mark,		"config:8");</div><div class='del'>-PMU_FORMAT_ATTR(combine,	"config:11");</div><div class='add'>+PMU_FORMAT_ATTR(combine,	"config:10-11");</div><div class='ctx'> PMU_FORMAT_ATTR(unit,		"config:12-15");</div><div class='ctx'> PMU_FORMAT_ATTR(pmc,		"config:16-19");</div><div class='ctx'> PMU_FORMAT_ATTR(cache_sel,	"config:20-23");</div><div class='hunk'>@@ -102,6 +196,7 @@ PMU_FORMAT_ATTR(thresh_sel,	"config:29-31");</div><div class='ctx'> PMU_FORMAT_ATTR(thresh_stop,	"config:32-35");</div><div class='ctx'> PMU_FORMAT_ATTR(thresh_start,	"config:36-39");</div><div class='ctx'> PMU_FORMAT_ATTR(thresh_cmp,	"config:40-49");</div><div class='add'>+PMU_FORMAT_ATTR(sdar_mode,	"config:50-51");</div><div class='ctx'> </div><div class='ctx'> static struct attribute *power9_pmu_format_attr[] = {</div><div class='ctx'> 	&amp;format_attr_event.attr,</div><div class='hunk'>@@ -116,6 +211,7 @@ static struct attribute *power9_pmu_format_attr[] = {</div><div class='ctx'> 	&amp;format_attr_thresh_stop.attr,</div><div class='ctx'> 	&amp;format_attr_thresh_start.attr,</div><div class='ctx'> 	&amp;format_attr_thresh_cmp.attr,</div><div class='add'>+	&amp;format_attr_sdar_mode.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -130,6 +226,17 @@ static const struct attribute_group *power9_pmu_attr_groups[] = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int power9_generic_events_dd1[] = {</div><div class='add'>+	[PERF_COUNT_HW_CPU_CYCLES] =			PM_CYC,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =	PM_ICT_NOSLOT_CYC,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] =	PM_CMPLU_STALL,</div><div class='add'>+	[PERF_COUNT_HW_INSTRUCTIONS] =			PM_INST_DISP,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] =		PM_BRU_CMPL,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_MISSES] =			PM_BR_MPRED_CMPL,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_REFERENCES] =		PM_LD_REF_L1,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_MISSES] =			PM_LD_MISS_L1_FIN,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int power9_generic_events[] = {</div><div class='ctx'> 	[PERF_COUNT_HW_CPU_CYCLES] =			PM_CYC,</div><div class='ctx'> 	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =	PM_ICT_NOSLOT_CYC,</div><div class='hunk'>@@ -291,7 +398,7 @@ static int power9_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {</div><div class='ctx'> </div><div class='ctx'> #undef C</div><div class='ctx'> </div><div class='del'>-static struct power_pmu power9_pmu = {</div><div class='add'>+static struct power_pmu power9_isa207_pmu = {</div><div class='ctx'> 	.name			= "POWER9",</div><div class='ctx'> 	.n_counter		= MAX_PMU_COUNTERS,</div><div class='ctx'> 	.add_fields		= ISA207_ADD_FIELDS,</div><div class='hunk'>@@ -300,6 +407,26 @@ static struct power_pmu power9_pmu = {</div><div class='ctx'> 	.config_bhrb		= power9_config_bhrb,</div><div class='ctx'> 	.bhrb_filter_map	= power9_bhrb_filter_map,</div><div class='ctx'> 	.get_constraint		= isa207_get_constraint,</div><div class='add'>+	.get_alternatives	= power9_get_alternatives,</div><div class='add'>+	.disable_pmc		= isa207_disable_pmc,</div><div class='add'>+	.flags			= PPMU_NO_SIAR | PPMU_ARCH_207S,</div><div class='add'>+	.n_generic		= ARRAY_SIZE(power9_generic_events_dd1),</div><div class='add'>+	.generic_events		= power9_generic_events_dd1,</div><div class='add'>+	.cache_events		= &amp;power9_cache_events,</div><div class='add'>+	.attr_groups		= power9_isa207_pmu_attr_groups,</div><div class='add'>+	.bhrb_nr		= 32,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct power_pmu power9_pmu = {</div><div class='add'>+	.name			= "POWER9",</div><div class='add'>+	.n_counter		= MAX_PMU_COUNTERS,</div><div class='add'>+	.add_fields		= ISA207_ADD_FIELDS,</div><div class='add'>+	.test_adder		= P9_DD1_TEST_ADDER,</div><div class='add'>+	.compute_mmcr		= isa207_compute_mmcr,</div><div class='add'>+	.config_bhrb		= power9_config_bhrb,</div><div class='add'>+	.bhrb_filter_map	= power9_bhrb_filter_map,</div><div class='add'>+	.get_constraint		= isa207_get_constraint,</div><div class='add'>+	.get_alternatives	= power9_get_alternatives,</div><div class='ctx'> 	.disable_pmc		= isa207_disable_pmc,</div><div class='ctx'> 	.flags			= PPMU_HAS_SIER | PPMU_ARCH_207S,</div><div class='ctx'> 	.n_generic		= ARRAY_SIZE(power9_generic_events),</div><div class='hunk'>@@ -311,14 +438,24 @@ static struct power_pmu power9_pmu = {</div><div class='ctx'> </div><div class='ctx'> static int __init init_power9_pmu(void)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Comes from cpu_specs[] */</div><div class='ctx'> 	if (!cur_cpu_spec-&gt;oprofile_cpu_type ||</div><div class='ctx'> 	    strcmp(cur_cpu_spec-&gt;oprofile_cpu_type, "ppc64/power9"))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	rc = register_power_pmu(&amp;power9_pmu);</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_POWER9_DD1)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Since PM_INST_CMPL may not provide right counts in all</div><div class='add'>+		 * sampling scenarios in power9 DD1, instead use PM_INST_DISP.</div><div class='add'>+		 */</div><div class='add'>+		EVENT_VAR(PM_INST_CMPL, _g).id = PM_INST_DISP;</div><div class='add'>+		rc = register_power_pmu(&amp;power9_isa207_pmu);</div><div class='add'>+	} else {</div><div class='add'>+		rc = register_power_pmu(&amp;power9_pmu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig<br/>index e3257f24a8a1..abc24501c4c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/40x/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/40x/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/40x/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/40x/Kconfig</a></div><div class='hunk'>@@ -64,6 +64,7 @@ config XILINX_VIRTEX_GENERIC_BOARD</div><div class='ctx'> 	default n</div><div class='ctx'> 	select XILINX_VIRTEX_II_PRO</div><div class='ctx'> 	select XILINX_VIRTEX_4_FX</div><div class='add'>+	select XILINX_INTC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables generic support for Xilinx Virtex based boards.</div><div class='ctx'> </div><div class='hunk'>@@ -102,18 +103,18 @@ config 405GP</div><div class='ctx'> 	bool</div><div class='ctx'> 	select IBM405_ERR77</div><div class='ctx'> 	select IBM405_ERR51</div><div class='del'>-	select IBM_EMAC_ZMII</div><div class='add'>+	select IBM_EMAC_ZMII if IBM_EMAC</div><div class='ctx'> </div><div class='ctx'> config 405EX</div><div class='ctx'> 	bool</div><div class='del'>-	select IBM_EMAC_EMAC4</div><div class='del'>-	select IBM_EMAC_RGMII</div><div class='add'>+	select IBM_EMAC_EMAC4 if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_RGMII if IBM_EMAC</div><div class='ctx'> </div><div class='ctx'> config 405EZ</div><div class='ctx'> 	bool</div><div class='del'>-	select IBM_EMAC_NO_FLOW_CTRL</div><div class='del'>-	select IBM_EMAC_MAL_CLR_ICINTSTAT</div><div class='del'>-	select IBM_EMAC_MAL_COMMON_ERR</div><div class='add'>+	select IBM_EMAC_NO_FLOW_CTRL if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_MAL_CLR_ICINTSTAT if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_MAL_COMMON_ERR if IBM_EMAC</div><div class='ctx'> </div><div class='ctx'> config XILINX_VIRTEX</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/powerpc/platforms/40x/virtex.c b/arch/powerpc/platforms/40x/virtex.c<br/>index 91a08ea758a8..e3d5e095846b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/40x/virtex.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/40x/virtex.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/40x/virtex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/40x/virtex.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ define_machine(virtex) {</div><div class='ctx'> 	.probe			= virtex_probe,</div><div class='ctx'> 	.setup_arch		= xilinx_pci_init,</div><div class='ctx'> 	.init_IRQ		= xilinx_intc_init_tree,</div><div class='del'>-	.get_irq		= xilinx_intc_get_irq,</div><div class='add'>+	.get_irq		= xintc_get_irq,</div><div class='ctx'> 	.restart		= ppc4xx_reset_system,</div><div class='ctx'> 	.calibrate_decr		= generic_calibrate_decr,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig<br/>index 48fc18041ff6..9b0afe935cc1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/44x/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/44x/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/44x/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/44x/Kconfig</a></div><div class='hunk'>@@ -26,7 +26,7 @@ config BLUESTONE</div><div class='ctx'> 	select PCI_MSI</div><div class='ctx'> 	select PPC4xx_MSI</div><div class='ctx'> 	select PPC4xx_PCI_EXPRESS</div><div class='del'>-	select IBM_EMAC_RGMII</div><div class='add'>+	select IBM_EMAC_RGMII if IBM_EMAC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the APM APM821xx Evaluation board.</div><div class='ctx'> </div><div class='hunk'>@@ -125,8 +125,8 @@ config CANYONLANDS</div><div class='ctx'> 	select PPC4xx_PCI_EXPRESS</div><div class='ctx'> 	select PCI_MSI</div><div class='ctx'> 	select PPC4xx_MSI</div><div class='del'>-	select IBM_EMAC_RGMII</div><div class='del'>-	select IBM_EMAC_ZMII</div><div class='add'>+	select IBM_EMAC_RGMII if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_ZMII if IBM_EMAC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the AMCC PPC460EX evaluation board.</div><div class='ctx'> </div><div class='hunk'>@@ -138,8 +138,8 @@ config GLACIER</div><div class='ctx'> 	select 460EX # Odd since it uses 460GT but the effects are the same</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	select PPC4xx_PCI_EXPRESS</div><div class='del'>-	select IBM_EMAC_RGMII</div><div class='del'>-	select IBM_EMAC_ZMII</div><div class='add'>+	select IBM_EMAC_RGMII if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_ZMII if IBM_EMAC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the AMCC PPC460GT evaluation board.</div><div class='ctx'> </div><div class='hunk'>@@ -164,7 +164,7 @@ config EIGER</div><div class='ctx'> 	select 460SX</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	select PPC4xx_PCI_EXPRESS</div><div class='del'>-	select IBM_EMAC_RGMII</div><div class='add'>+	select IBM_EMAC_RGMII if IBM_EMAC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the AMCC PPC460SX evaluation board.</div><div class='ctx'> </div><div class='hunk'>@@ -213,7 +213,7 @@ config AKEBONO</div><div class='ctx'> 	select NETDEVICES</div><div class='ctx'> 	select ETHERNET</div><div class='ctx'> 	select NET_VENDOR_IBM</div><div class='del'>-	select IBM_EMAC_EMAC4</div><div class='add'>+	select IBM_EMAC_EMAC4 if IBM_EMAC</div><div class='ctx'> 	select USB if USB_SUPPORT</div><div class='ctx'> 	select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD</div><div class='ctx'> 	select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD</div><div class='hunk'>@@ -241,6 +241,7 @@ config XILINX_VIRTEX440_GENERIC_BOARD</div><div class='ctx'> 	depends on 44x</div><div class='ctx'> 	default n</div><div class='ctx'> 	select XILINX_VIRTEX_5_FXT</div><div class='add'>+	select XILINX_INTC</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables generic support for Xilinx Virtex based boards</div><div class='ctx'> 	  that use a 440 based processor in the Virtex 5 FXT FPGA architecture.</div><div class='hunk'>@@ -290,54 +291,54 @@ config 440EP</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PPC_FPU</div><div class='ctx'> 	select IBM440EP_ERR42</div><div class='del'>-	select IBM_EMAC_ZMII</div><div class='add'>+	select IBM_EMAC_ZMII if IBM_EMAC</div><div class='ctx'> </div><div class='ctx'> config 440EPX</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PPC_FPU</div><div class='del'>-	select IBM_EMAC_EMAC4</div><div class='del'>-	select IBM_EMAC_RGMII</div><div class='del'>-	select IBM_EMAC_ZMII</div><div class='add'>+	select IBM_EMAC_EMAC4 if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_RGMII if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_ZMII if IBM_EMAC</div><div class='ctx'> 	select USB_EHCI_BIG_ENDIAN_MMIO</div><div class='ctx'> 	select USB_EHCI_BIG_ENDIAN_DESC</div><div class='ctx'> </div><div class='ctx'> config 440GRX</div><div class='ctx'> 	bool</div><div class='del'>-	select IBM_EMAC_EMAC4</div><div class='del'>-	select IBM_EMAC_RGMII</div><div class='del'>-	select IBM_EMAC_ZMII</div><div class='add'>+	select IBM_EMAC_EMAC4 if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_RGMII if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_ZMII if IBM_EMAC</div><div class='ctx'> </div><div class='ctx'> config 440GP</div><div class='ctx'> 	bool</div><div class='del'>-	select IBM_EMAC_ZMII</div><div class='add'>+	select IBM_EMAC_ZMII if IBM_EMAC</div><div class='ctx'> </div><div class='ctx'> config 440GX</div><div class='ctx'> 	bool</div><div class='del'>-	select IBM_EMAC_EMAC4</div><div class='del'>-	select IBM_EMAC_RGMII</div><div class='del'>-	select IBM_EMAC_ZMII #test only</div><div class='del'>-	select IBM_EMAC_TAH  #test only</div><div class='add'>+	select IBM_EMAC_EMAC4 if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_RGMII if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_ZMII if IBM_EMAC #test only</div><div class='add'>+	select IBM_EMAC_TAH if IBM_EMAC  #test only</div><div class='ctx'> </div><div class='ctx'> config 440SP</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='ctx'> config 440SPe</div><div class='ctx'> 	bool</div><div class='del'>-	select IBM_EMAC_EMAC4</div><div class='add'>+	select IBM_EMAC_EMAC4 if IBM_EMAC</div><div class='ctx'> </div><div class='ctx'> config 460EX</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PPC_FPU</div><div class='del'>-	select IBM_EMAC_EMAC4</div><div class='del'>-	select IBM_EMAC_TAH</div><div class='add'>+	select IBM_EMAC_EMAC4 if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_TAH if IBM_EMAC</div><div class='ctx'> </div><div class='ctx'> config 460SX</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PPC_FPU</div><div class='del'>-	select IBM_EMAC_EMAC4</div><div class='del'>-	select IBM_EMAC_RGMII</div><div class='del'>-	select IBM_EMAC_ZMII</div><div class='del'>-	select IBM_EMAC_TAH</div><div class='add'>+	select IBM_EMAC_EMAC4 if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_RGMII if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_ZMII if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_TAH if IBM_EMAC</div><div class='ctx'> </div><div class='ctx'> config 476FPE</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -346,8 +347,8 @@ config 476FPE</div><div class='ctx'> config APM821xx</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PPC_FPU</div><div class='del'>-	select IBM_EMAC_EMAC4</div><div class='del'>-	select IBM_EMAC_TAH</div><div class='add'>+	select IBM_EMAC_EMAC4 if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_TAH if IBM_EMAC</div><div class='ctx'> </div><div class='ctx'> config 476FPE_ERR46</div><div class='ctx'> 	depends on 476FPE</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/virtex.c b/arch/powerpc/platforms/44x/virtex.c<br/>index a7e08026097a..3eb13ed926ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/44x/virtex.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/44x/virtex.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/44x/virtex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/44x/virtex.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ define_machine(virtex) {</div><div class='ctx'> 	.probe			= virtex_probe,</div><div class='ctx'> 	.setup_arch		= xilinx_pci_init,</div><div class='ctx'> 	.init_IRQ		= xilinx_intc_init_tree,</div><div class='del'>-	.get_irq		= xilinx_intc_get_irq,</div><div class='add'>+	.get_irq		= xintc_get_irq,</div><div class='ctx'> 	.calibrate_decr		= generic_calibrate_decr,</div><div class='ctx'> 	.restart		= ppc4xx_reset_system,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c<br/>index 24717d060008..978b85bb3233 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/83xx/suspend.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/83xx/suspend.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/83xx/suspend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/83xx/suspend.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='hunk'>@@ -441,8 +442,4 @@ static struct platform_driver pmc_driver = {</div><div class='ctx'> 	.remove = pmc_remove</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int pmc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pmc_driver);</div><div class='del'>-}</div><div class='del'>-device_initcall(pmc_init);</div><div class='add'>+builtin_platform_driver(pmc_driver);</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig<br/>index 9dc1d28975b9..47b389dc4938 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/85xx/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/85xx/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/85xx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/85xx/Kconfig</a></div><div class='hunk'>@@ -253,6 +253,8 @@ endif # PPC32</div><div class='ctx'> config PPC_QEMU_E500</div><div class='ctx'> 	bool "QEMU generic e500 platform"</div><div class='ctx'> 	select DEFAULT_UIMAGE</div><div class='add'>+	select E500</div><div class='add'>+	select PPC_E500MC if PPC64</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for running as a QEMU guest using</div><div class='ctx'> 	  QEMU's generic e500 machine.  This is not required if you're</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile<br/>index 7bc86dae9517..fe19dad568e2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/85xx/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/85xx/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/85xx/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/85xx/Makefile</a></div><div class='hunk'>@@ -22,6 +22,7 @@ obj-$(CONFIG_P1022_RDK)   += p1022_rdk.o</div><div class='ctx'> obj-$(CONFIG_P1023_RDB)   += p1023_rdb.o</div><div class='ctx'> obj-$(CONFIG_TWR_P102x)   += twr_p102x.o</div><div class='ctx'> obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o</div><div class='add'>+obj-$(CONFIG_FB_FSL_DIU)	+= t1042rdb_diu.o</div><div class='ctx'> obj-$(CONFIG_STX_GP3)	  += stx_gp3.o</div><div class='ctx'> obj-$(CONFIG_TQM85xx)	  += tqm85xx.o</div><div class='ctx'> obj-$(CONFIG_SBC8548)     += sbc8548.o</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c<br/>index 1179115a4b5c..ac191a7a1337 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/85xx/corenet_generic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/85xx/corenet_generic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/85xx/corenet_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/85xx/corenet_generic.c</a></div><div class='hunk'>@@ -117,9 +117,6 @@ static const struct of_device_id of_device_ids[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible	= "fsl,qe",</div><div class='ctx'> 	},</div><div class='del'>-	{</div><div class='del'>-		.compatible    = "fsl,fman",</div><div class='del'>-	},</div><div class='ctx'> 	/* The following two are for the Freescale hypervisor */</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "hypervisor",</div><div class='hunk'>@@ -160,6 +157,7 @@ static const char * const boards[] __initconst = {</div><div class='ctx'> 	"fsl,T1040RDB",</div><div class='ctx'> 	"fsl,T1042RDB",</div><div class='ctx'> 	"fsl,T1042RDB_PI",</div><div class='add'>+	"keymile,kmcent2",</div><div class='ctx'> 	"keymile,kmcoge4",</div><div class='ctx'> 	"varisys,CYRUS",</div><div class='ctx'> 	NULL</div><div class='hunk'>@@ -220,7 +218,7 @@ define_machine(corenet_generic) {</div><div class='ctx'>  *</div><div class='ctx'>  * Likewise, problems have been seen with kexec when coreint is enabled.</div><div class='ctx'>  */</div><div class='del'>-#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_KEXEC)</div><div class='add'>+#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_KEXEC_CORE)</div><div class='ctx'> 	.get_irq		= mpic_get_irq,</div><div class='ctx'> #else</div><div class='ctx'> 	.get_irq		= mpic_get_coreint_irq,</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c<br/>index fe9f19e5e935..078097a0b09d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/85xx/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/85xx/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/85xx/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/85xx/smp.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='hunk'>@@ -349,13 +350,13 @@ struct smp_ops_t smp_85xx_ops = {</div><div class='ctx'> 	.cpu_disable	= generic_cpu_disable,</div><div class='ctx'> 	.cpu_die	= generic_cpu_die,</div><div class='ctx'> #endif</div><div class='del'>-#if defined(CONFIG_KEXEC) &amp;&amp; !defined(CONFIG_PPC64)</div><div class='add'>+#if defined(CONFIG_KEXEC_CORE) &amp;&amp; !defined(CONFIG_PPC64)</div><div class='ctx'> 	.give_timebase	= smp_generic_give_timebase,</div><div class='ctx'> 	.take_timebase	= smp_generic_take_timebase,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> #ifdef CONFIG_PPC32</div><div class='ctx'> atomic_t kexec_down_cpus = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='hunk'>@@ -458,7 +459,7 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image)</div><div class='ctx'> </div><div class='ctx'> 	default_machine_kexec(image);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_KEXEC */</div><div class='add'>+#endif /* CONFIG_KEXEC_CORE */</div><div class='ctx'> </div><div class='ctx'> static void smp_85xx_basic_setup(int cpu_nr)</div><div class='ctx'> {</div><div class='hunk'>@@ -512,7 +513,7 @@ void __init mpc85xx_smp_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	smp_ops = &amp;smp_85xx_ops;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> 	ppc_md.kexec_cpu_down = mpc85xx_smp_kexec_cpu_down;</div><div class='ctx'> 	ppc_md.machine_kexec = mpc85xx_smp_machine_kexec;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/t1042rdb_diu.c b/arch/powerpc/platforms/85xx/t1042rdb_diu.c<br/>new file mode 100644<br/>index 000000000000..58fa3d319f1c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/85xx/t1042rdb_diu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/85xx/t1042rdb_diu.c</a></div><div class='hunk'>@@ -0,0 +1,152 @@</div><div class='add'>+/*</div><div class='add'>+ * T1042 platform DIU operation</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2014 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sysdev/fsl_soc.h&gt;</div><div class='add'>+</div><div class='add'>+/*DIU Pixel ClockCR offset in scfg*/</div><div class='add'>+#define CCSR_SCFG_PIXCLKCR      0x28</div><div class='add'>+</div><div class='add'>+/* DIU Pixel Clock bits of the PIXCLKCR */</div><div class='add'>+#define PIXCLKCR_PXCKEN		0x80000000</div><div class='add'>+#define PIXCLKCR_PXCKINV	0x40000000</div><div class='add'>+#define PIXCLKCR_PXCKDLY	0x0000FF00</div><div class='add'>+#define PIXCLKCR_PXCLK_MASK	0x00FF0000</div><div class='add'>+</div><div class='add'>+/* Some CPLD register definitions */</div><div class='add'>+#define CPLD_DIUCSR		0x16</div><div class='add'>+#define CPLD_DIUCSR_DVIEN	0x80</div><div class='add'>+#define CPLD_DIUCSR_BACKLIGHT	0x0f</div><div class='add'>+</div><div class='add'>+struct device_node *cpld_node;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * t1042rdb_set_monitor_port: switch the output to a different monitor port</div><div class='add'>+ */</div><div class='add'>+static void t1042rdb_set_monitor_port(enum fsl_diu_monitor_port port)</div><div class='add'>+{</div><div class='add'>+	static void __iomem *cpld_base;</div><div class='add'>+</div><div class='add'>+	cpld_base = of_iomap(cpld_node, 0);</div><div class='add'>+	if (!cpld_base) {</div><div class='add'>+		pr_err("%s: Could not map cpld registers\n", __func__);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (port) {</div><div class='add'>+	case FSL_DIU_PORT_DVI:</div><div class='add'>+		/* Enable the DVI(HDMI) port, disable the DFP and</div><div class='add'>+		 * the backlight</div><div class='add'>+		 */</div><div class='add'>+		clrbits8(cpld_base + CPLD_DIUCSR, CPLD_DIUCSR_DVIEN);</div><div class='add'>+		break;</div><div class='add'>+	case FSL_DIU_PORT_LVDS:</div><div class='add'>+		/*</div><div class='add'>+		 * LVDS also needs backlight enabled, otherwise the display</div><div class='add'>+		 * will be blank.</div><div class='add'>+		 */</div><div class='add'>+		/* Enable the DFP port, disable the DVI*/</div><div class='add'>+		setbits8(cpld_base + CPLD_DIUCSR, 0x01 &lt;&lt; 8);</div><div class='add'>+		setbits8(cpld_base + CPLD_DIUCSR, 0x01 &lt;&lt; 4);</div><div class='add'>+		setbits8(cpld_base + CPLD_DIUCSR, CPLD_DIUCSR_BACKLIGHT);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("%s: Unsupported monitor port %i\n", __func__, port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iounmap(cpld_base);</div><div class='add'>+exit:</div><div class='add'>+	of_node_put(cpld_node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * t1042rdb_set_pixel_clock: program the DIU's clock</div><div class='add'>+ * @pixclock: pixel clock in ps (pico seconds)</div><div class='add'>+ */</div><div class='add'>+static void t1042rdb_set_pixel_clock(unsigned int pixclock)</div><div class='add'>+{</div><div class='add'>+	struct device_node *scfg_np;</div><div class='add'>+	void __iomem *scfg;</div><div class='add'>+	unsigned long freq;</div><div class='add'>+	u64 temp;</div><div class='add'>+	u32 pxclk;</div><div class='add'>+</div><div class='add'>+	scfg_np = of_find_compatible_node(NULL, NULL, "fsl,t1040-scfg");</div><div class='add'>+	if (!scfg_np) {</div><div class='add'>+		pr_err("%s: Missing scfg node. Can not display video.\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scfg = of_iomap(scfg_np, 0);</div><div class='add'>+	of_node_put(scfg_np);</div><div class='add'>+	if (!scfg) {</div><div class='add'>+		pr_err("%s: Could not map device. Can not display video.\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Convert pixclock into frequency */</div><div class='add'>+	temp = 1000000000000ULL;</div><div class='add'>+	do_div(temp, pixclock);</div><div class='add'>+	freq = temp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 'pxclk' is the ratio of the platform clock to the pixel clock.</div><div class='add'>+	 * This number is programmed into the PIXCLKCR register, and the valid</div><div class='add'>+	 * range of values is 2-255.</div><div class='add'>+	 */</div><div class='add'>+	pxclk = DIV_ROUND_CLOSEST(fsl_get_sys_freq(), freq);</div><div class='add'>+	pxclk = clamp_t(u32, pxclk, 2, 255);</div><div class='add'>+</div><div class='add'>+	/* Disable the pixel clock, and set it to non-inverted and no delay */</div><div class='add'>+	clrbits32(scfg + CCSR_SCFG_PIXCLKCR,</div><div class='add'>+		  PIXCLKCR_PXCKEN | PIXCLKCR_PXCKDLY | PIXCLKCR_PXCLK_MASK);</div><div class='add'>+</div><div class='add'>+	/* Enable the clock and set the pxclk */</div><div class='add'>+	setbits32(scfg + CCSR_SCFG_PIXCLKCR, PIXCLKCR_PXCKEN | (pxclk &lt;&lt; 16));</div><div class='add'>+</div><div class='add'>+	iounmap(scfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * t1042rdb_valid_monitor_port: set the monitor port for sysfs</div><div class='add'>+ */</div><div class='add'>+static enum fsl_diu_monitor_port</div><div class='add'>+t1042rdb_valid_monitor_port(enum fsl_diu_monitor_port port)</div><div class='add'>+{</div><div class='add'>+	switch (port) {</div><div class='add'>+	case FSL_DIU_PORT_DVI:</div><div class='add'>+	case FSL_DIU_PORT_LVDS:</div><div class='add'>+		return port;</div><div class='add'>+	default:</div><div class='add'>+		return FSL_DIU_PORT_DVI; /* Dual-link LVDS is not supported */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init t1042rdb_diu_init(void)</div><div class='add'>+{</div><div class='add'>+	cpld_node = of_find_compatible_node(NULL, NULL, "fsl,t1042rdb-cpld");</div><div class='add'>+	if (!cpld_node)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	diu_ops.set_monitor_port	= t1042rdb_set_monitor_port;</div><div class='add'>+	diu_ops.set_pixel_clock		= t1042rdb_set_pixel_clock;</div><div class='add'>+	diu_ops.valid_monitor_port	= t1042rdb_valid_monitor_port;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+early_initcall(t1042rdb_diu_init);</div><div class='head'>diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig<br/>index 564d99bb2a26..80cbcb0ad9b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/8xx/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/8xx/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/8xx/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/8xx/Kconfig</a></div><div class='hunk'>@@ -130,6 +130,7 @@ config 8xx_CPU6</div><div class='ctx'> </div><div class='ctx'> config 8xx_CPU15</div><div class='ctx'> 	bool "CPU15 Silicon Errata"</div><div class='add'>+	depends on !HUGETLB_PAGE</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables a workaround for erratum CPU15 on MPC8xx chips.</div><div class='head'>diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig<br/>index fbdae8377b71..7e3a2ebba29b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/Kconfig</a></div><div class='hunk'>@@ -168,17 +168,6 @@ config MPIC_BROKEN_REGREAD</div><div class='ctx'> 	  well, but enabling it uses about 8KB of memory to keep copies</div><div class='ctx'> 	  of the register contents in software.</div><div class='ctx'> </div><div class='del'>-config IBMVIO</div><div class='del'>-	depends on PPC_PSERIES</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-</div><div class='del'>-config IBMEBUS</div><div class='del'>-	depends on PPC_PSERIES</div><div class='del'>-	bool "Support for GX bus based adapters"</div><div class='del'>-	help</div><div class='del'>-	  Bus device driver for GX bus based adapters.</div><div class='del'>-</div><div class='ctx'> config EEH</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on (PPC_POWERNV || PPC_PSERIES) &amp;&amp; PCI</div><div class='head'>diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype<br/>index ca2da30ad2ab..99b0ae8acb78 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/Kconfig.cputype?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/Kconfig.cputype</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/Kconfig.cputype?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/Kconfig.cputype</a></div><div class='hunk'>@@ -34,6 +34,7 @@ config PPC_8xx</div><div class='ctx'> 	select FSL_SOC</div><div class='ctx'> 	select 8xx</div><div class='ctx'> 	select PPC_LIB_RHEAP</div><div class='add'>+	select SYS_SUPPORTS_HUGETLBFS</div><div class='ctx'> </div><div class='ctx'> config 40x</div><div class='ctx'> 	bool "AMCC 40x"</div><div class='hunk'>@@ -171,6 +172,13 @@ config PPC_FPU</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y if PPC64</div><div class='ctx'> </div><div class='add'>+config PPC_8xx_PERF_EVENT</div><div class='add'>+	bool "PPC 8xx perf events"</div><div class='add'>+	depends on PPC_8xx &amp;&amp; PERF_EVENTS</div><div class='add'>+	help</div><div class='add'>+	  This is Performance Events support for PPC 8xx. The 8xx doesn't</div><div class='add'>+	  have a PMU but some events are emulated using 8xx features.</div><div class='add'>+</div><div class='ctx'> config FSL_EMB_PERFMON</div><div class='ctx'> 	bool "Freescale Embedded Perfmon"</div><div class='ctx'> 	depends on E500 || PPC_83xx</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig<br/>index d9088f0b8fcc..a4522f09d65e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/Kconfig</a></div><div class='hunk'>@@ -17,10 +17,10 @@ config PPC_CELL_NATIVE</div><div class='ctx'> 	select PPC_CELL_COMMON</div><div class='ctx'> 	select MPIC</div><div class='ctx'> 	select PPC_IO_WORKAROUNDS</div><div class='del'>-	select IBM_EMAC_EMAC4</div><div class='del'>-	select IBM_EMAC_RGMII</div><div class='del'>-	select IBM_EMAC_ZMII #test only</div><div class='del'>-	select IBM_EMAC_TAH  #test only</div><div class='add'>+	select IBM_EMAC_EMAC4 if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_RGMII if IBM_EMAC</div><div class='add'>+	select IBM_EMAC_ZMII if IBM_EMAC #test only</div><div class='add'>+	select IBM_EMAC_TAH if IBM_EMAC  #test only</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='ctx'> config PPC_IBM_CELL_BLADE</div><div class='hunk'>@@ -46,7 +46,6 @@ config SPU_FS</div><div class='ctx'> 	default m</div><div class='ctx'> 	depends on PPC_CELL</div><div class='ctx'> 	select SPU_BASE</div><div class='del'>-	select MEMORY_HOTPLUG</div><div class='ctx'> 	help</div><div class='ctx'> 	  The SPU file system is used to access Synergistic Processing</div><div class='ctx'> 	  Units on machines implementing the Broadband Processor</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/cpufreq_spudemand.c b/arch/powerpc/platforms/cell/cpufreq_spudemand.c<br/>index 88301e53f085..882944c36ef5 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/cpufreq_spudemand.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/cpufreq_spudemand.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/cpufreq_spudemand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/cpufreq_spudemand.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/loadavg.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c<br/>index 7ff51f96a00e..71b995bbcae0 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/iommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/iommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/iommu.c</a></div><div class='hunk'>@@ -651,7 +651,7 @@ static int dma_fixed_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> </div><div class='ctx'> static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops dma_iommu_fixed_ops = {</div><div class='add'>+static const struct dma_map_ops dma_iommu_fixed_ops = {</div><div class='ctx'> 	.alloc          = dma_fixed_alloc_coherent,</div><div class='ctx'> 	.free           = dma_fixed_free_coherent,</div><div class='ctx'> 	.map_sg         = dma_fixed_map_sg,</div><div class='hunk'>@@ -692,7 +692,7 @@ static int cell_of_bus_notify(struct notifier_block *nb, unsigned long action,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* We use the PCI DMA ops */</div><div class='del'>-	dev-&gt;archdata.dma_ops = get_pci_dma_ops();</div><div class='add'>+	dev-&gt;dma_ops = get_pci_dma_ops();</div><div class='ctx'> </div><div class='ctx'> 	cell_dma_dev_setup(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1172,7 +1172,7 @@ __setup("iommu_fixed=", setup_iommu_fixed);</div><div class='ctx'> </div><div class='ctx'> static u64 cell_dma_get_required_mask(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct dma_map_ops *dma_ops;</div><div class='add'>+	const struct dma_map_ops *dma_ops;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;dma_mask)</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c<br/>index e84d8fbc2e21..96c2b8a40630 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spu_base.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/spu_base.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spu_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spu_base.c</a></div><div class='hunk'>@@ -676,7 +676,7 @@ static ssize_t spu_stat_show(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR(stat, 0444, spu_stat_show, NULL);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> </div><div class='ctx'> struct crash_spu_info {</div><div class='ctx'> 	struct spu *spu;</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c<br/>index 3b4152faeb1f..b500b17254a0 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/context.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/spufs/context.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/context.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/context.c</a></div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/spu.h&gt;</div><div class='ctx'> #include &lt;asm/spu_csa.h&gt;</div><div class='ctx'> #include "spufs.h"</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c<br/>index 85c85eb3e245..e5a891ae80ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/coredump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/spufs/coredump.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/coredump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/coredump.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/coredump.h&gt;</div><div class='ctx'> #include &lt;linux/binfmts.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "spufs.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/fault.c b/arch/powerpc/platforms/cell/spufs/fault.c<br/>index e29e4d5afa2d..870c0a82d560 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/spufs/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/fault.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/spu.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c<br/>index 06254467e4dd..ae2f740a82f1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/file.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/spufs/file.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/file.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/file.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/spu.h&gt;</div><div class='ctx'> #include &lt;asm/spu_info.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "spufs.h"</div><div class='ctx'> #include "sputrace.h"</div><div class='hunk'>@@ -233,10 +233,10 @@ spufs_mem_write(struct file *file, const char __user *buffer,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+spufs_mem_mmap_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='add'>+	struct vm_area_struct *vma = vmf-&gt;vma;</div><div class='ctx'> 	struct spu_context *ctx	= vma-&gt;vm_file-&gt;private_data;</div><div class='del'>-	unsigned long address = (unsigned long)vmf-&gt;virtual_address;</div><div class='ctx'> 	unsigned long pfn, offset;</div><div class='ctx'> </div><div class='ctx'> 	offset = vmf-&gt;pgoff &lt;&lt; PAGE_SHIFT;</div><div class='hunk'>@@ -244,7 +244,7 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("spufs_mem_mmap_fault address=0x%lx, offset=0x%lx\n",</div><div class='del'>-			address, offset);</div><div class='add'>+			vmf-&gt;address, offset);</div><div class='ctx'> </div><div class='ctx'> 	if (spu_acquire(ctx))</div><div class='ctx'> 		return VM_FAULT_NOPAGE;</div><div class='hunk'>@@ -256,7 +256,7 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='ctx'> 		vma-&gt;vm_page_prot = pgprot_noncached_wc(vma-&gt;vm_page_prot);</div><div class='ctx'> 		pfn = (ctx-&gt;spu-&gt;local_store_phys + offset) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	}</div><div class='del'>-	vm_insert_pfn(vma, address, pfn);</div><div class='add'>+	vm_insert_pfn(vma, vmf-&gt;address, pfn);</div><div class='ctx'> </div><div class='ctx'> 	spu_release(ctx);</div><div class='ctx'> </div><div class='hunk'>@@ -312,12 +312,11 @@ static const struct file_operations spufs_mem_fops = {</div><div class='ctx'> 	.mmap			= spufs_mem_mmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int spufs_ps_fault(struct vm_area_struct *vma,</div><div class='del'>-				    struct vm_fault *vmf,</div><div class='add'>+static int spufs_ps_fault(struct vm_fault *vmf,</div><div class='ctx'> 				    unsigned long ps_offs,</div><div class='ctx'> 				    unsigned long ps_size)</div><div class='ctx'> {</div><div class='del'>-	struct spu_context *ctx = vma-&gt;vm_file-&gt;private_data;</div><div class='add'>+	struct spu_context *ctx = vmf-&gt;vma-&gt;vm_file-&gt;private_data;</div><div class='ctx'> 	unsigned long area, offset = vmf-&gt;pgoff &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -355,8 +354,7 @@ static int spufs_ps_fault(struct vm_area_struct *vma,</div><div class='ctx'> 		down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		area = ctx-&gt;spu-&gt;problem_phys + ps_offs;</div><div class='del'>-		vm_insert_pfn(vma, (unsigned long)vmf-&gt;virtual_address,</div><div class='del'>-					(area + offset) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+		vm_insert_pfn(vmf-&gt;vma, vmf-&gt;address, (area + offset) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 		spu_context_trace(spufs_ps_fault__insert, ctx, ctx-&gt;spu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -369,10 +367,9 @@ refault:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if SPUFS_MMAP_4K</div><div class='del'>-static int spufs_cntl_mmap_fault(struct vm_area_struct *vma,</div><div class='del'>-					   struct vm_fault *vmf)</div><div class='add'>+static int spufs_cntl_mmap_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	return spufs_ps_fault(vma, vmf, 0x4000, SPUFS_CNTL_MAP_SIZE);</div><div class='add'>+	return spufs_ps_fault(vmf, 0x4000, SPUFS_CNTL_MAP_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct vm_operations_struct spufs_cntl_mmap_vmops = {</div><div class='hunk'>@@ -686,23 +683,13 @@ size_t spu_ibox_read(struct spu_context *ctx, u32 *data)</div><div class='ctx'> 	return ctx-&gt;ops-&gt;ibox_read(ctx, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int spufs_ibox_fasync(int fd, struct file *file, int on)</div><div class='del'>-{</div><div class='del'>-	struct spu_context *ctx = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	return fasync_helper(fd, file, on, &amp;ctx-&gt;ibox_fasync);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* interrupt-level ibox callback function. */</div><div class='ctx'> void spufs_ibox_callback(struct spu *spu)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu_context *ctx = spu-&gt;ctx;</div><div class='ctx'> </div><div class='del'>-	if (!ctx)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	wake_up_all(&amp;ctx-&gt;ibox_wq);</div><div class='del'>-	kill_fasync(&amp;ctx-&gt;ibox_fasync, SIGIO, POLLIN);</div><div class='add'>+	if (ctx)</div><div class='add'>+		wake_up_all(&amp;ctx-&gt;ibox_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -797,7 +784,6 @@ static const struct file_operations spufs_ibox_fops = {</div><div class='ctx'> 	.open	= spufs_pipe_open,</div><div class='ctx'> 	.read	= spufs_ibox_read,</div><div class='ctx'> 	.poll	= spufs_ibox_poll,</div><div class='del'>-	.fasync	= spufs_ibox_fasync,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -835,26 +821,13 @@ size_t spu_wbox_write(struct spu_context *ctx, u32 data)</div><div class='ctx'> 	return ctx-&gt;ops-&gt;wbox_write(ctx, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int spufs_wbox_fasync(int fd, struct file *file, int on)</div><div class='del'>-{</div><div class='del'>-	struct spu_context *ctx = file-&gt;private_data;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = fasync_helper(fd, file, on, &amp;ctx-&gt;wbox_fasync);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* interrupt-level wbox callback function. */</div><div class='ctx'> void spufs_wbox_callback(struct spu *spu)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu_context *ctx = spu-&gt;ctx;</div><div class='ctx'> </div><div class='del'>-	if (!ctx)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	wake_up_all(&amp;ctx-&gt;wbox_wq);</div><div class='del'>-	kill_fasync(&amp;ctx-&gt;wbox_fasync, SIGIO, POLLOUT);</div><div class='add'>+	if (ctx)</div><div class='add'>+		wake_up_all(&amp;ctx-&gt;wbox_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -947,7 +920,6 @@ static const struct file_operations spufs_wbox_fops = {</div><div class='ctx'> 	.open	= spufs_pipe_open,</div><div class='ctx'> 	.write	= spufs_wbox_write,</div><div class='ctx'> 	.poll	= spufs_wbox_poll,</div><div class='del'>-	.fasync	= spufs_wbox_fasync,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1069,15 +1041,15 @@ static ssize_t spufs_signal1_write(struct file *file, const char __user *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-spufs_signal1_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+spufs_signal1_mmap_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='ctx'> #if SPUFS_SIGNAL_MAP_SIZE == 0x1000</div><div class='del'>-	return spufs_ps_fault(vma, vmf, 0x14000, SPUFS_SIGNAL_MAP_SIZE);</div><div class='add'>+	return spufs_ps_fault(vmf, 0x14000, SPUFS_SIGNAL_MAP_SIZE);</div><div class='ctx'> #elif SPUFS_SIGNAL_MAP_SIZE == 0x10000</div><div class='ctx'> 	/* For 64k pages, both signal1 and signal2 can be used to mmap the whole</div><div class='ctx'> 	 * signal 1 and 2 area</div><div class='ctx'> 	 */</div><div class='del'>-	return spufs_ps_fault(vma, vmf, 0x10000, SPUFS_SIGNAL_MAP_SIZE);</div><div class='add'>+	return spufs_ps_fault(vmf, 0x10000, SPUFS_SIGNAL_MAP_SIZE);</div><div class='ctx'> #else</div><div class='ctx'> #error unsupported page size</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1207,15 +1179,15 @@ static ssize_t spufs_signal2_write(struct file *file, const char __user *buf,</div><div class='ctx'> </div><div class='ctx'> #if SPUFS_MMAP_4K</div><div class='ctx'> static int</div><div class='del'>-spufs_signal2_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+spufs_signal2_mmap_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='ctx'> #if SPUFS_SIGNAL_MAP_SIZE == 0x1000</div><div class='del'>-	return spufs_ps_fault(vma, vmf, 0x1c000, SPUFS_SIGNAL_MAP_SIZE);</div><div class='add'>+	return spufs_ps_fault(vmf, 0x1c000, SPUFS_SIGNAL_MAP_SIZE);</div><div class='ctx'> #elif SPUFS_SIGNAL_MAP_SIZE == 0x10000</div><div class='ctx'> 	/* For 64k pages, both signal1 and signal2 can be used to mmap the whole</div><div class='ctx'> 	 * signal 1 and 2 area</div><div class='ctx'> 	 */</div><div class='del'>-	return spufs_ps_fault(vma, vmf, 0x10000, SPUFS_SIGNAL_MAP_SIZE);</div><div class='add'>+	return spufs_ps_fault(vmf, 0x10000, SPUFS_SIGNAL_MAP_SIZE);</div><div class='ctx'> #else</div><div class='ctx'> #error unsupported page size</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1336,9 +1308,9 @@ DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,</div><div class='ctx'> </div><div class='ctx'> #if SPUFS_MMAP_4K</div><div class='ctx'> static int</div><div class='del'>-spufs_mss_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+spufs_mss_mmap_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	return spufs_ps_fault(vma, vmf, 0x0000, SPUFS_MSS_MAP_SIZE);</div><div class='add'>+	return spufs_ps_fault(vmf, 0x0000, SPUFS_MSS_MAP_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct vm_operations_struct spufs_mss_mmap_vmops = {</div><div class='hunk'>@@ -1398,9 +1370,9 @@ static const struct file_operations spufs_mss_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-spufs_psmap_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+spufs_psmap_mmap_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	return spufs_ps_fault(vma, vmf, 0x0000, SPUFS_PS_MAP_SIZE);</div><div class='add'>+	return spufs_ps_fault(vmf, 0x0000, SPUFS_PS_MAP_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct vm_operations_struct spufs_psmap_mmap_vmops = {</div><div class='hunk'>@@ -1458,9 +1430,9 @@ static const struct file_operations spufs_psmap_fops = {</div><div class='ctx'> </div><div class='ctx'> #if SPUFS_MMAP_4K</div><div class='ctx'> static int</div><div class='del'>-spufs_mfc_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+spufs_mfc_mmap_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	return spufs_ps_fault(vma, vmf, 0x3000, SPUFS_MFC_MAP_SIZE);</div><div class='add'>+	return spufs_ps_fault(vmf, 0x3000, SPUFS_MFC_MAP_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct vm_operations_struct spufs_mfc_mmap_vmops = {</div><div class='hunk'>@@ -1523,28 +1495,8 @@ void spufs_mfc_callback(struct spu *spu)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu_context *ctx = spu-&gt;ctx;</div><div class='ctx'> </div><div class='del'>-	if (!ctx)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	wake_up_all(&amp;ctx-&gt;mfc_wq);</div><div class='del'>-</div><div class='del'>-	pr_debug("%s %s\n", __func__, spu-&gt;name);</div><div class='del'>-	if (ctx-&gt;mfc_fasync) {</div><div class='del'>-		u32 free_elements, tagstatus;</div><div class='del'>-		unsigned int mask;</div><div class='del'>-</div><div class='del'>-		/* no need for spu_acquire in interrupt context */</div><div class='del'>-		free_elements = ctx-&gt;ops-&gt;get_mfc_free_elements(ctx);</div><div class='del'>-		tagstatus = ctx-&gt;ops-&gt;read_mfc_tagstatus(ctx);</div><div class='del'>-</div><div class='del'>-		mask = 0;</div><div class='del'>-		if (free_elements &amp; 0xffff)</div><div class='del'>-			mask |= POLLOUT;</div><div class='del'>-		if (tagstatus &amp; ctx-&gt;tagwait)</div><div class='del'>-			mask |= POLLIN;</div><div class='del'>-</div><div class='del'>-		kill_fasync(&amp;ctx-&gt;mfc_fasync, SIGIO, mask);</div><div class='del'>-	}</div><div class='add'>+	if (ctx)</div><div class='add'>+		wake_up_all(&amp;ctx-&gt;mfc_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int spufs_read_mfc_tagstatus(struct spu_context *ctx, u32 *status)</div><div class='hunk'>@@ -1806,13 +1758,6 @@ static int spufs_mfc_fsync(struct file *file, loff_t start, loff_t end, int data</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int spufs_mfc_fasync(int fd, struct file *file, int on)</div><div class='del'>-{</div><div class='del'>-	struct spu_context *ctx = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	return fasync_helper(fd, file, on, &amp;ctx-&gt;mfc_fasync);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct file_operations spufs_mfc_fops = {</div><div class='ctx'> 	.open	 = spufs_mfc_open,</div><div class='ctx'> 	.release = spufs_mfc_release,</div><div class='hunk'>@@ -1821,7 +1766,6 @@ static const struct file_operations spufs_mfc_fops = {</div><div class='ctx'> 	.poll	 = spufs_mfc_poll,</div><div class='ctx'> 	.flush	 = spufs_mfc_flush,</div><div class='ctx'> 	.fsync	 = spufs_mfc_fsync,</div><div class='del'>-	.fasync	 = spufs_mfc_fasync,</div><div class='ctx'> 	.mmap	 = spufs_mfc_mmap,</div><div class='ctx'> 	.llseek  = no_llseek,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c<br/>index 5364d4a54249..d8af9bc0489f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/inode.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/spufs/inode.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/inode.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/spu.h&gt;</div><div class='ctx'> #include &lt;asm/spu_priv1.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "spufs.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c<br/>index 460f5f31d5cb..1fbb5da17dd2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/sched.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/spufs/sched.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/sched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/sched.c</a></div><div class='hunk'>@@ -23,7 +23,8 @@</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/loadavg.h&gt;</div><div class='ctx'> #include &lt;linux/sched/rt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -140,7 +141,7 @@ void __spu_update_sched_info(struct spu_context *ctx)</div><div class='ctx'> 	 * runqueue. The context will be rescheduled on the proper node</div><div class='ctx'> 	 * if it is timesliced or preempted.</div><div class='ctx'> 	 */</div><div class='del'>-	cpumask_copy(&amp;ctx-&gt;cpus_allowed, tsk_cpus_allowed(current));</div><div class='add'>+	cpumask_copy(&amp;ctx-&gt;cpus_allowed, &amp;current-&gt;cpus_allowed);</div><div class='ctx'> </div><div class='ctx'> 	/* Save the current cpu id for spu interrupt routing. */</div><div class='ctx'> 	ctx-&gt;last_ran = raw_smp_processor_id();</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h<br/>index bcfd6f063efa..5e59f80e95db 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/spufs.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/spufs/spufs.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/spufs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/spufs.h</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/spu.h&gt;</div><div class='ctx'> #include &lt;asm/spu_csa.h&gt;</div><div class='hunk'>@@ -102,9 +103,6 @@ struct spu_context {</div><div class='ctx'> 	wait_queue_head_t stop_wq;</div><div class='ctx'> 	wait_queue_head_t mfc_wq;</div><div class='ctx'> 	wait_queue_head_t run_wq;</div><div class='del'>-	struct fasync_struct *ibox_fasync;</div><div class='del'>-	struct fasync_struct *wbox_fasync;</div><div class='del'>-	struct fasync_struct *mfc_fasync;</div><div class='ctx'> 	u32 tagwait;</div><div class='ctx'> 	struct spu_context_ops *ops;</div><div class='ctx'> 	struct work_struct reap_work;</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c<br/>index a87200a535fa..0d290ea83dc1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/syscalls.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/cell/spufs/syscalls.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/cell/spufs/syscalls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/cell/spufs/syscalls.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "spufs.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/chrp/nvram.c b/arch/powerpc/platforms/chrp/nvram.c<br/>index 9ef8cc3378d0..c3ede2c365c3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/chrp/nvram.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/chrp/nvram.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/chrp/nvram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/chrp/nvram.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c<br/>index dfd310031549..0409714e8070 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/embedded6xx/holly.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/embedded6xx/holly.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/embedded6xx/holly.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/embedded6xx/holly.c</a></div><div class='hunk'>@@ -263,7 +263,7 @@ static int ppc750_machine_check_exception(struct pt_regs *regs)</div><div class='ctx'> 	if ((entry = search_exception_tables(regs-&gt;nip)) != NULL) {</div><div class='ctx'> 		tsi108_clear_pci_cfg_error();</div><div class='ctx'> 		regs-&gt;msr |= MSR_RI;</div><div class='del'>-		regs-&gt;nip = entry-&gt;fixup;</div><div class='add'>+		regs-&gt;nip = extable_fixup(entry);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c<br/>index f97bab8e37a2..9de100e22bf3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c</a></div><div class='hunk'>@@ -174,7 +174,7 @@ static int mpc7448_machine_check_exception(struct pt_regs *regs)</div><div class='ctx'> 	if ((entry = search_exception_tables(regs-&gt;nip)) != NULL) {</div><div class='ctx'> 		tsi108_clear_pci_cfg_error();</div><div class='ctx'> 		regs-&gt;msr |= MSR_RI;</div><div class='del'>-		regs-&gt;nip = entry-&gt;fixup;</div><div class='add'>+		regs-&gt;nip = extable_fixup(entry);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c<br/>index a0589aac4163..69794d9389c2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/maple/pci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/maple/pci.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/maple/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/maple/pci.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='add'>+#include &lt;asm/isa-bridge.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "maple.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c<br/>index e74adc4e7fd8..7fec04de27fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pasemi/iommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pasemi/iommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pasemi/iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pasemi/iommu.c</a></div><div class='hunk'>@@ -186,7 +186,7 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (dev-&gt;vendor == 0x1959 &amp;&amp; dev-&gt;device == 0xa007 &amp;&amp;</div><div class='ctx'> 	    !firmware_has_feature(FW_FEATURE_LPAR)) {</div><div class='del'>-		dev-&gt;dev.archdata.dma_ops = &amp;dma_direct_ops;</div><div class='add'>+		dev-&gt;dev.dma_ops = &amp;dma_direct_ops;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Set the coherent DMA mask to prevent the iommu</div><div class='ctx'> 		 * being used unnecessarily</div><div class='head'>diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c<br/>index 3182400cf48f..c4a3e93dc324 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pasemi/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pasemi/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pasemi/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pasemi/setup.c</a></div><div class='hunk'>@@ -363,7 +363,7 @@ static int pcmcia_notify(struct notifier_block *nb, unsigned long action,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* We use the direct ops for localbus */</div><div class='del'>-	dev-&gt;archdata.dma_ops = &amp;dma_direct_ops;</div><div class='add'>+	dev-&gt;dma_ops = &amp;dma_direct_ops;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c<br/>index c8c217b7dd33..f627c9fd7b48 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powermac/low_i2c.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powermac/low_i2c.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powermac/low_i2c.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powermac/low_i2c.c</a></div><div class='hunk'>@@ -90,6 +90,7 @@ struct pmac_i2c_bus</div><div class='ctx'> 	int			opened;</div><div class='ctx'> 	int			polled;		/* open mode */</div><div class='ctx'> 	struct platform_device	*platform_dev;</div><div class='add'>+	struct lock_class_key   lock_key;</div><div class='ctx'> </div><div class='ctx'> 	/* ops */</div><div class='ctx'> 	int (*open)(struct pmac_i2c_bus *bus);</div><div class='hunk'>@@ -587,6 +588,7 @@ static void __init kw_i2c_add(struct pmac_i2c_host_kw *host,</div><div class='ctx'> 	bus-&gt;close = kw_i2c_close;</div><div class='ctx'> 	bus-&gt;xfer = kw_i2c_xfer;</div><div class='ctx'> 	mutex_init(&amp;bus-&gt;mutex);</div><div class='add'>+	lockdep_set_class(&amp;bus-&gt;mutex, &amp;bus-&gt;lock_key);</div><div class='ctx'> 	if (controller == busnode)</div><div class='ctx'> 		bus-&gt;flags = pmac_i2c_multibus;</div><div class='ctx'> 	list_add(&amp;bus-&gt;link, &amp;pmac_i2c_busses);</div><div class='hunk'>@@ -815,6 +817,7 @@ static void __init pmu_i2c_probe(void)</div><div class='ctx'> 		bus-&gt;hostdata = bus + 1;</div><div class='ctx'> 		bus-&gt;xfer = pmu_i2c_xfer;</div><div class='ctx'> 		mutex_init(&amp;bus-&gt;mutex);</div><div class='add'>+		lockdep_set_class(&amp;bus-&gt;mutex, &amp;bus-&gt;lock_key);</div><div class='ctx'> 		bus-&gt;flags = pmac_i2c_multibus;</div><div class='ctx'> 		list_add(&amp;bus-&gt;link, &amp;pmac_i2c_busses);</div><div class='ctx'> </div><div class='hunk'>@@ -938,6 +941,7 @@ static void __init smu_i2c_probe(void)</div><div class='ctx'> 		bus-&gt;hostdata = bus + 1;</div><div class='ctx'> 		bus-&gt;xfer = smu_i2c_xfer;</div><div class='ctx'> 		mutex_init(&amp;bus-&gt;mutex);</div><div class='add'>+		lockdep_set_class(&amp;bus-&gt;mutex, &amp;bus-&gt;lock_key);</div><div class='ctx'> 		bus-&gt;flags = 0;</div><div class='ctx'> 		list_add(&amp;bus-&gt;link, &amp;pmac_i2c_busses);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c<br/>index c9eb7d6540ea..746ca7321b03 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powermac/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powermac/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powermac/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powermac/smp.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig<br/>index 604190cab522..3a07e4dcf97c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/Kconfig</a></div><div class='hunk'>@@ -5,7 +5,8 @@ config PPC_POWERNV</div><div class='ctx'> 	select PPC_XICS</div><div class='ctx'> 	select PPC_ICP_NATIVE</div><div class='ctx'> 	select PPC_P7_NAP</div><div class='del'>-	select PPC_PCI_CHOICE if EMBEDDED</div><div class='add'>+	select PCI</div><div class='add'>+	select PCI_MSI</div><div class='ctx'> 	select EPAPR_BOOT</div><div class='ctx'> 	select PPC_INDIRECT_PIO</div><div class='ctx'> 	select PPC_UDBG_16550</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c<br/>index 2354ea51e871..6fb5522acd70 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/eeh-powernv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/eeh-powernv.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/eeh-powernv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/eeh-powernv.c</a></div><div class='hunk'>@@ -393,7 +393,7 @@ static void *pnv_eeh_probe(struct pci_dn *pdn, void *data)</div><div class='ctx'> 	/* Create PE */</div><div class='ctx'> 	ret = eeh_add_to_parent_pe(edev);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		pr_warn("%s: Can't add PCI dev %04x:%02x:%02x.%01x to parent PE (%d)\n",</div><div class='add'>+		pr_warn("%s: Can't add PCI dev %04x:%02x:%02x.%01x to parent PE (%x)\n",</div><div class='ctx'> 			__func__, hose-&gt;global_number, pdn-&gt;busno,</div><div class='ctx'> 			PCI_SLOT(pdn-&gt;devfn), PCI_FUNC(pdn-&gt;devfn), ret);</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1097,7 +1097,7 @@ static int pnv_eeh_reset(struct eeh_pe *pe, int option)</div><div class='ctx'> </div><div class='ctx'> 	bus = eeh_pe_bus_get(pe);</div><div class='ctx'> 	if (!bus) {</div><div class='del'>-		pr_err("%s: Cannot find PCI bus for PHB#%d-PE#%x\n",</div><div class='add'>+		pr_err("%s: Cannot find PCI bus for PHB#%x-PE#%x\n",</div><div class='ctx'> 			__func__, pe-&gt;phb-&gt;global_number, pe-&gt;addr);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c<br/>index 479c25601612..4ee837e6391a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/idle.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/idle.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/idle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/idle.c</a></div><div class='hunk'>@@ -237,15 +237,21 @@ static DEVICE_ATTR(fastsleep_workaround_applyonce, 0600,</div><div class='ctx'> 			show_fastsleep_workaround_applyonce,</div><div class='ctx'> 			store_fastsleep_workaround_applyonce);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The default stop state that will be used by ppc_md.power_save</div><div class='add'>+ * function on platforms that support stop instruction.</div><div class='add'>+ */</div><div class='add'>+u64 pnv_default_stop_val;</div><div class='add'>+u64 pnv_default_stop_mask;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Used for ppc_md.power_save which needs a function with no parameters</div><div class='ctx'>  */</div><div class='ctx'> static void power9_idle(void)</div><div class='ctx'> {</div><div class='del'>-	/* Requesting stop state 0 */</div><div class='del'>-	power9_idle_stop(0);</div><div class='add'>+	power9_idle_stop(pnv_default_stop_val, pnv_default_stop_mask);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * First deep stop state. Used to figure out when to save/restore</div><div class='ctx'>  * hypervisor context.</div><div class='hunk'>@@ -253,9 +259,11 @@ static void power9_idle(void)</div><div class='ctx'> u64 pnv_first_deep_stop_state = MAX_STOP_STATE;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Deepest stop idle state. Used when a cpu is offlined</div><div class='add'>+ * psscr value and mask of the deepest stop idle state.</div><div class='add'>+ * Used when a cpu is offlined.</div><div class='ctx'>  */</div><div class='del'>-u64 pnv_deepest_stop_state;</div><div class='add'>+u64 pnv_deepest_stop_psscr_val;</div><div class='add'>+u64 pnv_deepest_stop_psscr_mask;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Power ISA 3.0 idle initialization.</div><div class='hunk'>@@ -292,53 +300,157 @@ u64 pnv_deepest_stop_state;</div><div class='ctx'>  *	Bits 60:63 - Requested Level</div><div class='ctx'>  *	Used to specify which power-saving level must be entered on executing</div><div class='ctx'>  *	stop instruction</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int validate_psscr_val_mask(u64 *psscr_val, u64 *psscr_mask, u32 flags)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * psscr_mask == 0xf indicates an older firmware.</div><div class='add'>+	 * Set remaining fields of psscr to the default values.</div><div class='add'>+	 * See NOTE above definition of PSSCR_HV_DEFAULT_VAL</div><div class='add'>+	 */</div><div class='add'>+	if (*psscr_mask == 0xf) {</div><div class='add'>+		*psscr_val = *psscr_val | PSSCR_HV_DEFAULT_VAL;</div><div class='add'>+		*psscr_mask = PSSCR_HV_DEFAULT_MASK;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * New firmware is expected to set the psscr_val bits correctly.</div><div class='add'>+	 * Validate that the following invariants are correctly maintained by</div><div class='add'>+	 * the new firmware.</div><div class='add'>+	 * - ESL bit value matches the EC bit value.</div><div class='add'>+	 * - ESL bit is set for all the deep stop states.</div><div class='add'>+	 */</div><div class='add'>+	if (GET_PSSCR_ESL(*psscr_val) != GET_PSSCR_EC(*psscr_val)) {</div><div class='add'>+		err = ERR_EC_ESL_MISMATCH;</div><div class='add'>+	} else if ((flags &amp; OPAL_PM_LOSE_FULL_CONTEXT) &amp;&amp;</div><div class='add'>+		GET_PSSCR_ESL(*psscr_val) == 0) {</div><div class='add'>+		err = ERR_DEEP_STATE_ESL_MISMATCH;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pnv_arch300_idle_init: Initializes the default idle state, first</div><div class='add'>+ *                        deep idle state and deepest idle state on</div><div class='add'>+ *                        ISA 3.0 CPUs.</div><div class='ctx'>  *</div><div class='ctx'>  * @np: /ibm,opal/power-mgt device node</div><div class='ctx'>  * @flags: cpu-idle-state-flags array</div><div class='ctx'>  * @dt_idle_states: Number of idle state entries</div><div class='ctx'>  * Returns 0 on success</div><div class='ctx'>  */</div><div class='del'>-static int __init pnv_arch300_idle_init(struct device_node *np, u32 *flags,</div><div class='add'>+static int __init pnv_power9_idle_init(struct device_node *np, u32 *flags,</div><div class='ctx'> 					int dt_idle_states)</div><div class='ctx'> {</div><div class='ctx'> 	u64 *psscr_val = NULL;</div><div class='add'>+	u64 *psscr_mask = NULL;</div><div class='add'>+	u32 *residency_ns = NULL;</div><div class='add'>+	u64 max_residency_ns = 0;</div><div class='ctx'> 	int rc = 0, i;</div><div class='add'>+	bool default_stop_found = false, deepest_stop_found = false;</div><div class='ctx'> </div><div class='del'>-	psscr_val = kcalloc(dt_idle_states, sizeof(*psscr_val),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-	if (!psscr_val) {</div><div class='add'>+	psscr_val = kcalloc(dt_idle_states, sizeof(*psscr_val), GFP_KERNEL);</div><div class='add'>+	psscr_mask = kcalloc(dt_idle_states, sizeof(*psscr_mask), GFP_KERNEL);</div><div class='add'>+	residency_ns = kcalloc(dt_idle_states, sizeof(*residency_ns),</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!psscr_val || !psscr_mask || !residency_ns) {</div><div class='ctx'> 		rc = -1;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (of_property_read_u64_array(np,</div><div class='ctx'> 		"ibm,cpu-idle-state-psscr",</div><div class='ctx'> 		psscr_val, dt_idle_states)) {</div><div class='del'>-		pr_warn("cpuidle-powernv: missing ibm,cpu-idle-states-psscr in DT\n");</div><div class='add'>+		pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-psscr in DT\n");</div><div class='add'>+		rc = -1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_property_read_u64_array(np,</div><div class='add'>+				       "ibm,cpu-idle-state-psscr-mask",</div><div class='add'>+				       psscr_mask, dt_idle_states)) {</div><div class='add'>+		pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-psscr-mask in DT\n");</div><div class='add'>+		rc = -1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_property_read_u32_array(np,</div><div class='add'>+				       "ibm,cpu-idle-state-residency-ns",</div><div class='add'>+					residency_ns, dt_idle_states)) {</div><div class='add'>+		pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-residency-ns in DT\n");</div><div class='ctx'> 		rc = -1;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Set pnv_first_deep_stop_state and pnv_deepest_stop_state.</div><div class='add'>+	 * Set pnv_first_deep_stop_state, pnv_deepest_stop_psscr_{val,mask},</div><div class='add'>+	 * and the pnv_default_stop_{val,mask}.</div><div class='add'>+	 *</div><div class='ctx'> 	 * pnv_first_deep_stop_state should be set to the first stop</div><div class='ctx'> 	 * level to cause hypervisor state loss.</div><div class='del'>-	 * pnv_deepest_stop_state should be set to the deepest stop</div><div class='del'>-	 * stop state.</div><div class='add'>+	 *</div><div class='add'>+	 * pnv_deepest_stop_{val,mask} should be set to values corresponding to</div><div class='add'>+	 * the deepest stop state.</div><div class='add'>+	 *</div><div class='add'>+	 * pnv_default_stop_{val,mask} should be set to values corresponding to</div><div class='add'>+	 * the shallowest (OPAL_PM_STOP_INST_FAST) loss-less stop state.</div><div class='ctx'> 	 */</div><div class='ctx'> 	pnv_first_deep_stop_state = MAX_STOP_STATE;</div><div class='ctx'> 	for (i = 0; i &lt; dt_idle_states; i++) {</div><div class='add'>+		int err;</div><div class='ctx'> 		u64 psscr_rl = psscr_val[i] &amp; PSSCR_RL_MASK;</div><div class='ctx'> </div><div class='ctx'> 		if ((flags[i] &amp; OPAL_PM_LOSE_FULL_CONTEXT) &amp;&amp;</div><div class='ctx'> 		     (pnv_first_deep_stop_state &gt; psscr_rl))</div><div class='ctx'> 			pnv_first_deep_stop_state = psscr_rl;</div><div class='ctx'> </div><div class='del'>-		if (pnv_deepest_stop_state &lt; psscr_rl)</div><div class='del'>-			pnv_deepest_stop_state = psscr_rl;</div><div class='add'>+		err = validate_psscr_val_mask(&amp;psscr_val[i], &amp;psscr_mask[i],</div><div class='add'>+					      flags[i]);</div><div class='add'>+		if (err) {</div><div class='add'>+			report_invalid_psscr_val(psscr_val[i], err);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (max_residency_ns &lt; residency_ns[i]) {</div><div class='add'>+			max_residency_ns = residency_ns[i];</div><div class='add'>+			pnv_deepest_stop_psscr_val = psscr_val[i];</div><div class='add'>+			pnv_deepest_stop_psscr_mask = psscr_mask[i];</div><div class='add'>+			deepest_stop_found = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!default_stop_found &amp;&amp;</div><div class='add'>+		    (flags[i] &amp; OPAL_PM_STOP_INST_FAST)) {</div><div class='add'>+			pnv_default_stop_val = psscr_val[i];</div><div class='add'>+			pnv_default_stop_mask = psscr_mask[i];</div><div class='add'>+			default_stop_found = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!default_stop_found) {</div><div class='add'>+		pnv_default_stop_val = PSSCR_HV_DEFAULT_VAL;</div><div class='add'>+		pnv_default_stop_mask = PSSCR_HV_DEFAULT_MASK;</div><div class='add'>+		pr_warn("Setting default stop psscr val=0x%016llx,mask=0x%016llx\n",</div><div class='add'>+			pnv_default_stop_val, pnv_default_stop_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!deepest_stop_found) {</div><div class='add'>+		pnv_deepest_stop_psscr_val = PSSCR_HV_DEFAULT_VAL;</div><div class='add'>+		pnv_deepest_stop_psscr_mask = PSSCR_HV_DEFAULT_MASK;</div><div class='add'>+		pr_warn("Setting default stop psscr val=0x%016llx,mask=0x%016llx\n",</div><div class='add'>+			pnv_deepest_stop_psscr_val,</div><div class='add'>+			pnv_deepest_stop_psscr_mask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	kfree(psscr_val);</div><div class='add'>+	kfree(psscr_mask);</div><div class='add'>+	kfree(residency_ns);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -373,7 +485,7 @@ static void __init pnv_probe_idle_states(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='del'>-		if (pnv_arch300_idle_init(np, flags, dt_idle_states))</div><div class='add'>+		if (pnv_power9_idle_init(np, flags, dt_idle_states))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/npu-dma.c b/arch/powerpc/platforms/powernv/npu-dma.c<br/>index aec85e778028..1c383f38031d 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/npu-dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/npu-dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/npu-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/npu-dma.c</a></div><div class='hunk'>@@ -115,7 +115,7 @@ static u64 dma_npu_get_required_mask(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops dma_npu_ops = {</div><div class='add'>+static const struct dma_map_ops dma_npu_ops = {</div><div class='ctx'> 	.map_page		= dma_npu_map_page,</div><div class='ctx'> 	.map_sg			= dma_npu_map_sg,</div><div class='ctx'> 	.alloc			= dma_npu_alloc,</div><div class='hunk'>@@ -263,7 +263,7 @@ static int pnv_npu_dma_set_bypass(struct pnv_ioda_pe *npe)</div><div class='ctx'> 	/* Enable the bypass window */</div><div class='ctx'> </div><div class='ctx'> 	top = roundup_pow_of_two(top);</div><div class='del'>-	dev_info(&amp;npe-&gt;pdev-&gt;dev, "Enabling bypass for PE %d\n",</div><div class='add'>+	dev_info(&amp;npe-&gt;pdev-&gt;dev, "Enabling bypass for PE %x\n",</div><div class='ctx'> 			npe-&gt;pe_number);</div><div class='ctx'> 	rc = opal_pci_map_pe_dma_window_real(phb-&gt;opal_id,</div><div class='ctx'> 			npe-&gt;pe_number, npe-&gt;pe_number,</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/opal-elog.c b/arch/powerpc/platforms/powernv/opal-elog.c<br/>index f2344cbd2f46..ecd6d9177d13 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-elog.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/opal-elog.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-elog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-elog.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/opal.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct elog_obj {</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/opal-hmi.c b/arch/powerpc/platforms/powernv/opal-hmi.c<br/>index c0a8201cb4d9..88f3c61eec95 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-hmi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/opal-hmi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-hmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-hmi.c</a></div><div class='hunk'>@@ -180,7 +180,8 @@ static void print_hmi_event_info(struct OpalHMIEvent *hmi_evt)</div><div class='ctx'> 		"An XSCOM operation completed",</div><div class='ctx'> 		"SCOM has set a reserved FIR bit to cause recovery",</div><div class='ctx'> 		"Debug trigger has set a reserved FIR bit to cause recovery",</div><div class='del'>-		"A hypervisor resource error occurred"</div><div class='add'>+		"A hypervisor resource error occurred",</div><div class='add'>+		"CAPP recovery process is in progress",</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* Print things out */</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/opal-irqchip.c b/arch/powerpc/platforms/powernv/opal-irqchip.c<br/>index 998316bf2dad..ecdcba9d1220 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-irqchip.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/opal-irqchip.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-irqchip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-irqchip.c</a></div><div class='hunk'>@@ -183,8 +183,9 @@ void opal_event_shutdown(void)</div><div class='ctx'> int __init opal_event_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *dn, *opal_node;</div><div class='del'>-	const __be32 *irqs;</div><div class='del'>-	int i, irqlen, rc = 0;</div><div class='add'>+	const char **names;</div><div class='add'>+	u32 *irqs;</div><div class='add'>+	int i, rc;</div><div class='ctx'> </div><div class='ctx'> 	opal_node = of_find_node_by_path("/ibm,opal");</div><div class='ctx'> 	if (!opal_node) {</div><div class='hunk'>@@ -209,31 +210,56 @@ int __init opal_event_init(void)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Get interrupt property */</div><div class='del'>-	irqs = of_get_property(opal_node, "opal-interrupts", &amp;irqlen);</div><div class='del'>-	opal_irq_count = irqs ? (irqlen / 4) : 0;</div><div class='add'>+	/* Get opal-interrupts property and names if present */</div><div class='add'>+	rc = of_property_count_u32_elems(opal_node, "opal-interrupts");</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	opal_irq_count = rc;</div><div class='ctx'> 	pr_debug("Found %d interrupts reserved for OPAL\n", opal_irq_count);</div><div class='ctx'> </div><div class='del'>-	/* Install interrupt handlers */</div><div class='add'>+	irqs = kcalloc(opal_irq_count, sizeof(*irqs), GFP_KERNEL);</div><div class='add'>+	names = kcalloc(opal_irq_count, sizeof(*names), GFP_KERNEL);</div><div class='ctx'> 	opal_irqs = kcalloc(opal_irq_count, sizeof(*opal_irqs), GFP_KERNEL);</div><div class='del'>-	for (i = 0; irqs &amp;&amp; i &lt; opal_irq_count; i++, irqs++) {</div><div class='del'>-		unsigned int irq, virq;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!irqs || !names || !opal_irqs))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	rc = of_property_read_u32_array(opal_node, "opal-interrupts",</div><div class='add'>+					irqs, opal_irq_count);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		pr_err("Error %d reading opal-interrupts array\n", rc);</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* It's not an error for the names to be missing */</div><div class='add'>+	of_property_read_string_array(opal_node, "opal-interrupts-names",</div><div class='add'>+				      names, opal_irq_count);</div><div class='add'>+</div><div class='add'>+	/* Install interrupt handlers */</div><div class='add'>+	for (i = 0; i &lt; opal_irq_count; i++) {</div><div class='add'>+		unsigned int virq;</div><div class='add'>+		char *name;</div><div class='ctx'> </div><div class='ctx'> 		/* Get hardware and virtual IRQ */</div><div class='del'>-		irq = be32_to_cpup(irqs);</div><div class='del'>-		virq = irq_create_mapping(NULL, irq);</div><div class='add'>+		virq = irq_create_mapping(NULL, irqs[i]);</div><div class='ctx'> 		if (!virq) {</div><div class='del'>-			pr_warn("Failed to map irq 0x%x\n", irq);</div><div class='add'>+			pr_warn("Failed to map irq 0x%x\n", irqs[i]);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (names[i] &amp;&amp; strlen(names[i]))</div><div class='add'>+			name = kasprintf(GFP_KERNEL, "opal-%s", names[i]);</div><div class='add'>+		else</div><div class='add'>+			name = kasprintf(GFP_KERNEL, "opal");</div><div class='add'>+</div><div class='ctx'> 		/* Install interrupt handler */</div><div class='ctx'> 		rc = request_irq(virq, opal_interrupt, IRQF_TRIGGER_LOW,</div><div class='del'>-				 "opal", NULL);</div><div class='add'>+				 name, NULL);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			irq_dispose_mapping(virq);</div><div class='ctx'> 			pr_warn("Error %d requesting irq %d (0x%x)\n",</div><div class='del'>-				 rc, virq, irq);</div><div class='add'>+				 rc, virq, irqs[i]);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -241,6 +267,9 @@ int __init opal_event_init(void)</div><div class='ctx'> 		opal_irqs[i] = virq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out_free:</div><div class='add'>+	kfree(irqs);</div><div class='add'>+	kfree(names);</div><div class='ctx'> out:</div><div class='ctx'> 	of_node_put(opal_node);</div><div class='ctx'> 	return rc;</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/opal-lpc.c b/arch/powerpc/platforms/powernv/opal-lpc.c<br/>index e4169d68cb32..a91d7876fae2 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-lpc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/opal-lpc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-lpc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-lpc.c</a></div><div class='hunk'>@@ -18,11 +18,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='del'>-#include &lt;asm/xics.h&gt;</div><div class='ctx'> #include &lt;asm/opal.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='add'>+#include &lt;asm/isa-bridge.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int opal_lpc_chip_id = -1;</div><div class='ctx'> </div><div class='hunk'>@@ -386,7 +386,7 @@ static int opal_lpc_init_debugfs(void)</div><div class='ctx'> machine_device_initcall(powernv, opal_lpc_init_debugfs);</div><div class='ctx'> #endif  /* CONFIG_DEBUG_FS */</div><div class='ctx'> </div><div class='del'>-void opal_lpc_init(void)</div><div class='add'>+void __init opal_lpc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> </div><div class='hunk'>@@ -406,9 +406,17 @@ void opal_lpc_init(void)</div><div class='ctx'> 	if (opal_lpc_chip_id &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* Setup special IO ops */</div><div class='del'>-	ppc_pci_io = opal_lpc_io;</div><div class='del'>-	isa_io_special = true;</div><div class='del'>-</div><div class='del'>-	pr_info("OPAL: Power8 LPC bus found, chip ID %d\n", opal_lpc_chip_id);</div><div class='add'>+	/* Does it support direct mapping ? */</div><div class='add'>+	if (of_get_property(np, "ranges", NULL)) {</div><div class='add'>+		pr_info("OPAL: Found memory mapped LPC bus on chip %d\n",</div><div class='add'>+			opal_lpc_chip_id);</div><div class='add'>+		isa_bridge_init_non_pci(np);</div><div class='add'>+	} else {</div><div class='add'>+		pr_info("OPAL: Found non-mapped LPC bus on chip %d\n",</div><div class='add'>+			opal_lpc_chip_id);</div><div class='add'>+</div><div class='add'>+		/* Setup special IO ops */</div><div class='add'>+		ppc_pci_io = opal_lpc_io;</div><div class='add'>+		isa_io_special = true;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/opal-msglog.c b/arch/powerpc/platforms/powernv/opal-msglog.c<br/>index 39d6ff9e5630..7a9cde0cfbd1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-msglog.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/opal-msglog.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-msglog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-msglog.c</a></div><div class='hunk'>@@ -123,6 +123,10 @@ void __init opal_msglog_init(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Report maximum size */</div><div class='add'>+	opal_msglog_attr.size =  be32_to_cpu(mc-&gt;ibuf_size) +</div><div class='add'>+		be32_to_cpu(mc-&gt;obuf_size);</div><div class='add'>+</div><div class='ctx'> 	opal_memcons = mc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/opal-prd.c b/arch/powerpc/platforms/powernv/opal-prd.c<br/>index e315e704cca7..2d6ee1c5ad85 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-prd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/opal-prd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-prd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-prd.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;asm/opal-prd.h&gt;</div><div class='ctx'> #include &lt;asm/opal.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/opal-tracepoints.c b/arch/powerpc/platforms/powernv/opal-tracepoints.c<br/>index 1e496b780efd..3c447002edff 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-tracepoints.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/opal-tracepoints.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-tracepoints.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-tracepoints.c</a></div><div class='hunk'>@@ -6,9 +6,10 @@</div><div class='ctx'> #ifdef HAVE_JUMP_LABEL</div><div class='ctx'> struct static_key opal_tracepoint_key = STATIC_KEY_INIT;</div><div class='ctx'> </div><div class='del'>-void opal_tracepoint_regfunc(void)</div><div class='add'>+int opal_tracepoint_regfunc(void)</div><div class='ctx'> {</div><div class='ctx'> 	static_key_slow_inc(&amp;opal_tracepoint_key);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void opal_tracepoint_unregfunc(void)</div><div class='hunk'>@@ -25,9 +26,10 @@ void opal_tracepoint_unregfunc(void)</div><div class='ctx'> /* NB: reg/unreg are called while guarded with the tracepoints_mutex */</div><div class='ctx'> extern long opal_tracepoint_refcount;</div><div class='ctx'> </div><div class='del'>-void opal_tracepoint_regfunc(void)</div><div class='add'>+int opal_tracepoint_regfunc(void)</div><div class='ctx'> {</div><div class='ctx'> 	opal_tracepoint_refcount++;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void opal_tracepoint_unregfunc(void)</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S<br/>index 44d2d842cee7..6693f75e93d1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-wrappers.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/opal-wrappers.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal-wrappers.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal-wrappers.S</a></div><div class='hunk'>@@ -58,14 +58,16 @@ END_FTR_SECTION(0, 1);						\</div><div class='ctx'> </div><div class='ctx'> #define OPAL_CALL(name, token)		\</div><div class='ctx'>  _GLOBAL_TOC(name);			\</div><div class='add'>+	mfmsr	r12;			\</div><div class='ctx'> 	mflr	r0;			\</div><div class='add'>+	andi.	r11,r12,MSR_IR|MSR_DR; 	\</div><div class='ctx'> 	std	r0,PPC_LR_STKOFF(r1);	\</div><div class='ctx'> 	li	r0,token;		\</div><div class='add'>+	beq	opal_real_call;         \</div><div class='ctx'> 	OPAL_BRANCH(opal_tracepoint_entry) \</div><div class='del'>-	mfcr	r12;			\</div><div class='del'>-	stw	r12,8(r1);		\</div><div class='add'>+	mfcr	r11;			\</div><div class='add'>+	stw	r11,8(r1);		\</div><div class='ctx'> 	li	r11,0;			\</div><div class='del'>-	mfmsr	r12;			\</div><div class='ctx'> 	ori	r11,r11,MSR_EE;		\</div><div class='ctx'> 	std	r12,PACASAVEDMSR(r13);	\</div><div class='ctx'> 	andc	r12,r12,r11;		\</div><div class='hunk'>@@ -98,6 +100,30 @@ opal_return:</div><div class='ctx'> 	mtcr	r4;</div><div class='ctx'> 	rfid</div><div class='ctx'> </div><div class='add'>+opal_real_call:</div><div class='add'>+	mfcr	r11</div><div class='add'>+	stw	r11,8(r1)</div><div class='add'>+	/* Set opal return address */</div><div class='add'>+	LOAD_REG_ADDR(r11, opal_return_realmode)</div><div class='add'>+	mtlr	r11</div><div class='add'>+	li	r11,MSR_LE</div><div class='add'>+	andc	r12,r12,r11</div><div class='add'>+	mtspr	SPRN_HSRR1,r12</div><div class='add'>+	LOAD_REG_ADDR(r11,opal)</div><div class='add'>+	ld	r12,8(r11)</div><div class='add'>+	ld	r2,0(r11)</div><div class='add'>+	mtspr	SPRN_HSRR0,r12</div><div class='add'>+	hrfid</div><div class='add'>+</div><div class='add'>+opal_return_realmode:</div><div class='add'>+	FIXUP_ENDIAN</div><div class='add'>+	ld	r2,PACATOC(r13);</div><div class='add'>+	lwz	r11,8(r1);</div><div class='add'>+	ld	r12,PPC_LR_STKOFF(r1)</div><div class='add'>+	mtcr	r11;</div><div class='add'>+	mtlr	r12</div><div class='add'>+	blr</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_TRACEPOINTS</div><div class='ctx'> opal_tracepoint_entry:</div><div class='ctx'> 	stdu	r1,-STACKFRAMESIZE(r1)</div><div class='hunk'>@@ -146,7 +172,7 @@ opal_tracepoint_entry:</div><div class='ctx'> opal_tracepoint_return:</div><div class='ctx'> 	std	r3,STK_REG(R31)(r1)</div><div class='ctx'> 	mr	r4,r3</div><div class='del'>-	ld	r0,STK_REG(R23)(r1)</div><div class='add'>+	ld	r3,STK_REG(R23)(r1)</div><div class='ctx'> 	bl	__trace_opal_exit</div><div class='ctx'> 	ld	r3,STK_REG(R31)(r1)</div><div class='ctx'> 	addi	r1,r1,STACKFRAMESIZE</div><div class='hunk'>@@ -155,36 +181,6 @@ opal_tracepoint_return:</div><div class='ctx'> 	blr</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define OPAL_CALL_REAL(name, token)			\</div><div class='del'>- _GLOBAL_TOC(name);					\</div><div class='del'>-	mflr	r0;					\</div><div class='del'>-	std	r0,PPC_LR_STKOFF(r1);			\</div><div class='del'>-	li	r0,token;				\</div><div class='del'>-	mfcr	r12;					\</div><div class='del'>-	stw	r12,8(r1);				\</div><div class='del'>-							\</div><div class='del'>-	/* Set opal return address */			\</div><div class='del'>-	LOAD_REG_ADDR(r11, opal_return_realmode);	\</div><div class='del'>-	mtlr	r11;					\</div><div class='del'>-	mfmsr	r12;					\</div><div class='del'>-	li	r11,MSR_LE;				\</div><div class='del'>-	andc	r12,r12,r11;				\</div><div class='del'>-	mtspr	SPRN_HSRR1,r12;				\</div><div class='del'>-	LOAD_REG_ADDR(r11,opal);			\</div><div class='del'>-	ld	r12,8(r11);				\</div><div class='del'>-	ld	r2,0(r11);				\</div><div class='del'>-	mtspr	SPRN_HSRR0,r12;				\</div><div class='del'>-	hrfid</div><div class='del'>-</div><div class='del'>-opal_return_realmode:</div><div class='del'>-	FIXUP_ENDIAN</div><div class='del'>-	ld	r2,PACATOC(r13);</div><div class='del'>-	lwz	r11,8(r1);</div><div class='del'>-	ld	r12,PPC_LR_STKOFF(r1)</div><div class='del'>-	mtcr	r11;</div><div class='del'>-	mtlr	r12</div><div class='del'>-	blr</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> OPAL_CALL(opal_invalid_call,			OPAL_INVALID_CALL);</div><div class='ctx'> OPAL_CALL(opal_console_write,			OPAL_CONSOLE_WRITE);</div><div class='hunk'>@@ -208,7 +204,6 @@ OPAL_CALL(opal_pci_config_write_byte,		OPAL_PCI_CONFIG_WRITE_BYTE);</div><div class='ctx'> OPAL_CALL(opal_pci_config_write_half_word,	OPAL_PCI_CONFIG_WRITE_HALF_WORD);</div><div class='ctx'> OPAL_CALL(opal_pci_config_write_word,		OPAL_PCI_CONFIG_WRITE_WORD);</div><div class='ctx'> OPAL_CALL(opal_set_xive,			OPAL_SET_XIVE);</div><div class='del'>-OPAL_CALL_REAL(opal_rm_set_xive,		OPAL_SET_XIVE);</div><div class='ctx'> OPAL_CALL(opal_get_xive,			OPAL_GET_XIVE);</div><div class='ctx'> OPAL_CALL(opal_register_exception_handler,	OPAL_REGISTER_OPAL_EXCEPTION_HANDLER);</div><div class='ctx'> OPAL_CALL(opal_pci_eeh_freeze_status,		OPAL_PCI_EEH_FREEZE_STATUS);</div><div class='hunk'>@@ -264,7 +259,6 @@ OPAL_CALL(opal_validate_flash,			OPAL_FLASH_VALIDATE);</div><div class='ctx'> OPAL_CALL(opal_manage_flash,			OPAL_FLASH_MANAGE);</div><div class='ctx'> OPAL_CALL(opal_update_flash,			OPAL_FLASH_UPDATE);</div><div class='ctx'> OPAL_CALL(opal_resync_timebase,			OPAL_RESYNC_TIMEBASE);</div><div class='del'>-OPAL_CALL_REAL(opal_rm_resync_timebase,		OPAL_RESYNC_TIMEBASE);</div><div class='ctx'> OPAL_CALL(opal_check_token,			OPAL_CHECK_TOKEN);</div><div class='ctx'> OPAL_CALL(opal_dump_init,			OPAL_DUMP_INIT);</div><div class='ctx'> OPAL_CALL(opal_dump_info,			OPAL_DUMP_INFO);</div><div class='hunk'>@@ -280,9 +274,7 @@ OPAL_CALL(opal_sensor_read,			OPAL_SENSOR_READ);</div><div class='ctx'> OPAL_CALL(opal_get_param,			OPAL_GET_PARAM);</div><div class='ctx'> OPAL_CALL(opal_set_param,			OPAL_SET_PARAM);</div><div class='ctx'> OPAL_CALL(opal_handle_hmi,			OPAL_HANDLE_HMI);</div><div class='del'>-OPAL_CALL_REAL(opal_rm_handle_hmi,		OPAL_HANDLE_HMI);</div><div class='ctx'> OPAL_CALL(opal_config_cpu_idle_state,		OPAL_CONFIG_CPU_IDLE_STATE);</div><div class='del'>-OPAL_CALL_REAL(opal_rm_config_cpu_idle_state,	OPAL_CONFIG_CPU_IDLE_STATE);</div><div class='ctx'> OPAL_CALL(opal_slw_set_reg,			OPAL_SLW_SET_REG);</div><div class='ctx'> OPAL_CALL(opal_register_dump_region,		OPAL_REGISTER_DUMP_REGION);</div><div class='ctx'> OPAL_CALL(opal_unregister_dump_region,		OPAL_UNREGISTER_DUMP_REGION);</div><div class='hunk'>@@ -308,4 +300,4 @@ OPAL_CALL(opal_int_set_cppr,			OPAL_INT_SET_CPPR);</div><div class='ctx'> OPAL_CALL(opal_int_eoi,				OPAL_INT_EOI);</div><div class='ctx'> OPAL_CALL(opal_int_set_mfrr,			OPAL_INT_SET_MFRR);</div><div class='ctx'> OPAL_CALL(opal_pci_tce_kill,			OPAL_PCI_TCE_KILL);</div><div class='del'>-OPAL_CALL_REAL(opal_rm_pci_tce_kill,		OPAL_PCI_TCE_KILL);</div><div class='add'>+OPAL_CALL(opal_nmmu_set_ptcr,			OPAL_NMMU_SET_PTCR);</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c<br/>index 6c9a65b52e63..86d9fde93c17 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/opal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/opal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/opal.c</a></div><div class='hunk'>@@ -632,21 +632,11 @@ static void __init opal_dump_region_init(void)</div><div class='ctx'> 			"rc = %d\n", rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void opal_pdev_init(struct device_node *opal_node,</div><div class='del'>-		const char *compatible)</div><div class='add'>+static void opal_pdev_init(const char *compatible)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> </div><div class='del'>-	for_each_child_of_node(opal_node, np)</div><div class='del'>-		if (of_device_is_compatible(np, compatible))</div><div class='del'>-			of_platform_device_create(np, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void opal_i2c_create_devs(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	for_each_compatible_node(np, NULL, "ibm,opal-i2c")</div><div class='add'>+	for_each_compatible_node(np, NULL, compatible)</div><div class='ctx'> 		of_platform_device_create(np, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -718,7 +708,7 @@ static int __init opal_init(void)</div><div class='ctx'> 	opal_hmi_handler_init();</div><div class='ctx'> </div><div class='ctx'> 	/* Create i2c platform devices */</div><div class='del'>-	opal_i2c_create_devs();</div><div class='add'>+	opal_pdev_init("ibm,opal-i2c");</div><div class='ctx'> </div><div class='ctx'> 	/* Setup a heatbeat thread if requested by OPAL */</div><div class='ctx'> 	opal_init_heartbeat();</div><div class='hunk'>@@ -753,12 +743,12 @@ static int __init opal_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize platform devices: IPMI backend, PRD &amp; flash interface */</div><div class='del'>-	opal_pdev_init(opal_node, "ibm,opal-ipmi");</div><div class='del'>-	opal_pdev_init(opal_node, "ibm,opal-flash");</div><div class='del'>-	opal_pdev_init(opal_node, "ibm,opal-prd");</div><div class='add'>+	opal_pdev_init("ibm,opal-ipmi");</div><div class='add'>+	opal_pdev_init("ibm,opal-flash");</div><div class='add'>+	opal_pdev_init("ibm,opal-prd");</div><div class='ctx'> </div><div class='ctx'> 	/* Initialise platform device: oppanel interface */</div><div class='del'>-	opal_pdev_init(opal_node, "ibm,opal-oppanel");</div><div class='add'>+	opal_pdev_init("ibm,opal-oppanel");</div><div class='ctx'> </div><div class='ctx'> 	/* Initialise OPAL kmsg dumper for flushing console on panic */</div><div class='ctx'> 	opal_kmsg_init();</div><div class='hunk'>@@ -885,6 +875,17 @@ int opal_error_code(int rc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void powernv_set_nmmu_ptcr(unsigned long ptcr)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_OPAL)) {</div><div class='add'>+		rc = opal_nmmu_set_ptcr(-1UL, ptcr);</div><div class='add'>+		if (rc != OPAL_SUCCESS &amp;&amp; rc != OPAL_UNSUPPORTED)</div><div class='add'>+			pr_warn("%s: Unable to set nest mmu ptcr\n", __func__);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL_GPL(opal_poll_events);</div><div class='ctx'> EXPORT_SYMBOL_GPL(opal_rtc_read);</div><div class='ctx'> EXPORT_SYMBOL_GPL(opal_rtc_write);</div><div class='hunk'>@@ -896,3 +897,5 @@ EXPORT_SYMBOL_GPL(opal_leds_get_ind);</div><div class='ctx'> EXPORT_SYMBOL_GPL(opal_leds_set_ind);</div><div class='ctx'> /* Export this symbol for PowerNV Operator Panel class driver */</div><div class='ctx'> EXPORT_SYMBOL_GPL(opal_write_oppanel_async);</div><div class='add'>+/* Export this for KVM */</div><div class='add'>+EXPORT_SYMBOL_GPL(opal_int_set_mfrr);</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c<br/>index d4b33dd2d9e7..6901a06da2f9 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/pci-ioda.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/pci-ioda.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/pci-ioda.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/pci-ioda.c</a></div><div class='hunk'>@@ -83,7 +83,7 @@ void pe_level_printk(const struct pnv_ioda_pe *pe, const char *level,</div><div class='ctx'> 			PCI_SLOT(pe-&gt;rid), PCI_FUNC(pe-&gt;rid));</div><div class='ctx'> #endif /* CONFIG_PCI_IOV*/</div><div class='ctx'> </div><div class='del'>-	printk("%spci %s: [PE# %.3d] %pV",</div><div class='add'>+	printk("%spci %s: [PE# %.2x] %pV",</div><div class='ctx'> 	       level, pfix, pe-&gt;pe_number, &amp;vaf);</div><div class='ctx'> </div><div class='ctx'> 	va_end(args);</div><div class='hunk'>@@ -145,8 +145,8 @@ static struct pnv_ioda_pe *pnv_ioda_init_pe(struct pnv_phb *phb, int pe_no)</div><div class='ctx'> 	 */</div><div class='ctx'> 	rc = opal_pci_eeh_freeze_clear(phb-&gt;opal_id, pe_no,</div><div class='ctx'> 				       OPAL_EEH_ACTION_CLEAR_FREEZE_ALL);</div><div class='del'>-	if (rc != OPAL_SUCCESS)</div><div class='del'>-		pr_warn("%s: Error %lld unfreezing PHB#%d-PE#%d\n",</div><div class='add'>+	if (rc != OPAL_SUCCESS &amp;&amp; rc != OPAL_UNSUPPORTED)</div><div class='add'>+		pr_warn("%s: Error %lld unfreezing PHB#%x-PE#%x\n",</div><div class='ctx'> 			__func__, rc, phb-&gt;hose-&gt;global_number, pe_no);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;phb-&gt;ioda.pe_array[pe_no];</div><div class='hunk'>@@ -155,13 +155,13 @@ static struct pnv_ioda_pe *pnv_ioda_init_pe(struct pnv_phb *phb, int pe_no)</div><div class='ctx'> static void pnv_ioda_reserve_pe(struct pnv_phb *phb, int pe_no)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(pe_no &gt;= 0 &amp;&amp; pe_no &lt; phb-&gt;ioda.total_pe_num)) {</div><div class='del'>-		pr_warn("%s: Invalid PE %d on PHB#%x\n",</div><div class='add'>+		pr_warn("%s: Invalid PE %x on PHB#%x\n",</div><div class='ctx'> 			__func__, pe_no, phb-&gt;hose-&gt;global_number);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_set_bit(pe_no, phb-&gt;ioda.pe_alloc))</div><div class='del'>-		pr_debug("%s: PE %d was reserved on PHB#%x\n",</div><div class='add'>+		pr_debug("%s: PE %x was reserved on PHB#%x\n",</div><div class='ctx'> 			 __func__, pe_no, phb-&gt;hose-&gt;global_number);</div><div class='ctx'> </div><div class='ctx'> 	pnv_ioda_init_pe(phb, pe_no);</div><div class='hunk'>@@ -229,7 +229,7 @@ static int pnv_ioda2_init_m64(struct pnv_phb *phb)</div><div class='ctx'> 	else if (phb-&gt;ioda.reserved_pe_idx == (phb-&gt;ioda.total_pe_num - 1))</div><div class='ctx'> 		r-&gt;end -= (2 * phb-&gt;ioda.m64_segsize);</div><div class='ctx'> 	else</div><div class='del'>-		pr_warn("  Cannot strip M64 segment for reserved PE#%d\n",</div><div class='add'>+		pr_warn("  Cannot strip M64 segment for reserved PE#%x\n",</div><div class='ctx'> 			phb-&gt;ioda.reserved_pe_idx);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -291,7 +291,7 @@ static int pnv_ioda1_init_m64(struct pnv_phb *phb)</div><div class='ctx'> 				OPAL_M64_WINDOW_TYPE, index, base, 0,</div><div class='ctx'> 				PNV_IODA1_M64_SEGS * segsz);</div><div class='ctx'> 		if (rc != OPAL_SUCCESS) {</div><div class='del'>-			pr_warn("  Error %lld setting M64 PHB#%d-BAR#%d\n",</div><div class='add'>+			pr_warn("  Error %lld setting M64 PHB#%x-BAR#%d\n",</div><div class='ctx'> 				rc, phb-&gt;hose-&gt;global_number, index);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -300,7 +300,7 @@ static int pnv_ioda1_init_m64(struct pnv_phb *phb)</div><div class='ctx'> 				OPAL_M64_WINDOW_TYPE, index,</div><div class='ctx'> 				OPAL_ENABLE_M64_SPLIT);</div><div class='ctx'> 		if (rc != OPAL_SUCCESS) {</div><div class='del'>-			pr_warn("  Error %lld enabling M64 PHB#%d-BAR#%d\n",</div><div class='add'>+			pr_warn("  Error %lld enabling M64 PHB#%x-BAR#%d\n",</div><div class='ctx'> 				rc, phb-&gt;hose-&gt;global_number, index);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -316,7 +316,7 @@ static int pnv_ioda1_init_m64(struct pnv_phb *phb)</div><div class='ctx'> 	else if (phb-&gt;ioda.reserved_pe_idx == (phb-&gt;ioda.total_pe_num - 1))</div><div class='ctx'> 		r-&gt;end -= (2 * phb-&gt;ioda.m64_segsize);</div><div class='ctx'> 	else</div><div class='del'>-		WARN(1, "Wrong reserved PE#%d on PHB#%d\n",</div><div class='add'>+		WARN(1, "Wrong reserved PE#%x on PHB#%x\n",</div><div class='ctx'> 		     phb-&gt;ioda.reserved_pe_idx, phb-&gt;hose-&gt;global_number);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -414,7 +414,7 @@ static struct pnv_ioda_pe *pnv_ioda_pick_m64_pe(struct pci_bus *bus, bool all)</div><div class='ctx'> 					pe-&gt;pe_number / PNV_IODA1_M64_SEGS,</div><div class='ctx'> 					pe-&gt;pe_number % PNV_IODA1_M64_SEGS);</div><div class='ctx'> 			if (rc != OPAL_SUCCESS)</div><div class='del'>-				pr_warn("%s: Error %lld mapping M64 for PHB#%d-PE#%d\n",</div><div class='add'>+				pr_warn("%s: Error %lld mapping M64 for PHB#%x-PE#%x\n",</div><div class='ctx'> 					__func__, rc, phb-&gt;hose-&gt;global_number,</div><div class='ctx'> 					pe-&gt;pe_number);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -941,14 +941,14 @@ static int pnv_ioda_configure_pe(struct pnv_phb *phb, struct pnv_ioda_pe *pe)</div><div class='ctx'> 	pe-&gt;mve_number = pe-&gt;pe_number;</div><div class='ctx'> 	rc = opal_pci_set_mve(phb-&gt;opal_id, pe-&gt;mve_number, pe-&gt;pe_number);</div><div class='ctx'> 	if (rc != OPAL_SUCCESS) {</div><div class='del'>-		pe_err(pe, "OPAL error %ld setting up MVE %d\n",</div><div class='add'>+		pe_err(pe, "OPAL error %ld setting up MVE %x\n",</div><div class='ctx'> 		       rc, pe-&gt;mve_number);</div><div class='ctx'> 		pe-&gt;mve_number = -1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rc = opal_pci_set_mve_enable(phb-&gt;opal_id,</div><div class='ctx'> 					     pe-&gt;mve_number, OPAL_ENABLE_MVE);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			pe_err(pe, "OPAL error %ld enabling MVE %d\n",</div><div class='add'>+			pe_err(pe, "OPAL error %ld enabling MVE %x\n",</div><div class='ctx'> 			       rc, pe-&gt;mve_number);</div><div class='ctx'> 			pe-&gt;mve_number = -1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1159,10 +1159,10 @@ static struct pnv_ioda_pe *pnv_ioda_setup_bus_PE(struct pci_bus *bus, bool all)</div><div class='ctx'> 	pe-&gt;rid = bus-&gt;busn_res.start &lt;&lt; 8;</div><div class='ctx'> </div><div class='ctx'> 	if (all)</div><div class='del'>-		pe_info(pe, "Secondary bus %d..%d associated with PE#%d\n",</div><div class='add'>+		pe_info(pe, "Secondary bus %d..%d associated with PE#%x\n",</div><div class='ctx'> 			bus-&gt;busn_res.start, bus-&gt;busn_res.end, pe-&gt;pe_number);</div><div class='ctx'> 	else</div><div class='del'>-		pe_info(pe, "Secondary bus %d associated with PE#%d\n",</div><div class='add'>+		pe_info(pe, "Secondary bus %d associated with PE#%x\n",</div><div class='ctx'> 			bus-&gt;busn_res.start, pe-&gt;pe_number);</div><div class='ctx'> </div><div class='ctx'> 	if (pnv_ioda_configure_pe(phb, pe)) {</div><div class='hunk'>@@ -1213,7 +1213,7 @@ static struct pnv_ioda_pe *pnv_ioda_setup_npu_PE(struct pci_dev *npu_pdev)</div><div class='ctx'> 			 * peer NPU.</div><div class='ctx'> 			 */</div><div class='ctx'> 			dev_info(&amp;npu_pdev-&gt;dev,</div><div class='del'>-				"Associating to existing PE %d\n", pe_num);</div><div class='add'>+				"Associating to existing PE %x\n", pe_num);</div><div class='ctx'> 			pci_dev_get(npu_pdev);</div><div class='ctx'> 			npu_pdn = pci_get_pdn(npu_pdev);</div><div class='ctx'> 			rid = npu_pdev-&gt;bus-&gt;number &lt;&lt; 8 | npu_pdn-&gt;devfn;</div><div class='hunk'>@@ -1326,7 +1326,9 @@ static int pnv_pci_vf_assign_m64(struct pci_dev *pdev, u16 num_vfs)</div><div class='ctx'> 	else</div><div class='ctx'> 		m64_bars = 1;</div><div class='ctx'> </div><div class='del'>-	pdn-&gt;m64_map = kmalloc(sizeof(*pdn-&gt;m64_map) * m64_bars, GFP_KERNEL);</div><div class='add'>+	pdn-&gt;m64_map = kmalloc_array(m64_bars,</div><div class='add'>+				     sizeof(*pdn-&gt;m64_map),</div><div class='add'>+				     GFP_KERNEL);</div><div class='ctx'> 	if (!pdn-&gt;m64_map)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	/* Initialize the m64_map to IODA_INVALID_M64 */</div><div class='hunk'>@@ -1466,14 +1468,12 @@ void pnv_pci_sriov_disable(struct pci_dev *pdev)</div><div class='ctx'> 	struct pnv_phb        *phb;</div><div class='ctx'> 	struct pnv_ioda_pe    *pe;</div><div class='ctx'> 	struct pci_dn         *pdn;</div><div class='del'>-	struct pci_sriov      *iov;</div><div class='ctx'> 	u16                    num_vfs, i;</div><div class='ctx'> </div><div class='ctx'> 	bus = pdev-&gt;bus;</div><div class='ctx'> 	hose = pci_bus_to_host(bus);</div><div class='ctx'> 	phb = hose-&gt;private_data;</div><div class='ctx'> 	pdn = pci_get_pdn(pdev);</div><div class='del'>-	iov = pdev-&gt;sriov;</div><div class='ctx'> 	num_vfs = pdn-&gt;num_vfs;</div><div class='ctx'> </div><div class='ctx'> 	/* Release VF PEs */</div><div class='hunk'>@@ -1539,7 +1539,7 @@ static void pnv_ioda_setup_vf_PE(struct pci_dev *pdev, u16 num_vfs)</div><div class='ctx'> 		pe-&gt;rid = (pci_iov_virtfn_bus(pdev, vf_index) &lt;&lt; 8) |</div><div class='ctx'> 			   pci_iov_virtfn_devfn(pdev, vf_index);</div><div class='ctx'> </div><div class='del'>-		pe_info(pe, "VF %04d:%02d:%02d.%d associated with PE#%d\n",</div><div class='add'>+		pe_info(pe, "VF %04d:%02d:%02d.%d associated with PE#%x\n",</div><div class='ctx'> 			hose-&gt;global_number, pdev-&gt;bus-&gt;number,</div><div class='ctx'> 			PCI_SLOT(pci_iov_virtfn_devfn(pdev, vf_index)),</div><div class='ctx'> 			PCI_FUNC(pci_iov_virtfn_devfn(pdev, vf_index)), pe_num);</div><div class='hunk'>@@ -1593,8 +1593,9 @@ int pnv_pci_sriov_enable(struct pci_dev *pdev, u16 num_vfs)</div><div class='ctx'> </div><div class='ctx'> 		/* Allocating pe_num_map */</div><div class='ctx'> 		if (pdn-&gt;m64_single_mode)</div><div class='del'>-			pdn-&gt;pe_num_map = kmalloc(sizeof(*pdn-&gt;pe_num_map) * num_vfs,</div><div class='del'>-					GFP_KERNEL);</div><div class='add'>+			pdn-&gt;pe_num_map = kmalloc_array(num_vfs,</div><div class='add'>+							sizeof(*pdn-&gt;pe_num_map),</div><div class='add'>+							GFP_KERNEL);</div><div class='ctx'> 		else</div><div class='ctx'> 			pdn-&gt;pe_num_map = kmalloc(sizeof(*pdn-&gt;pe_num_map), GFP_KERNEL);</div><div class='ctx'> </div><div class='hunk'>@@ -1950,7 +1951,12 @@ static void pnv_pci_ioda2_tce_invalidate(struct iommu_table *tbl,</div><div class='ctx'> 		struct pnv_phb *phb = pe-&gt;phb;</div><div class='ctx'> 		unsigned int shift = tbl-&gt;it_page_shift;</div><div class='ctx'> </div><div class='del'>-		if (phb-&gt;type == PNV_PHB_NPU) {</div><div class='add'>+		/*</div><div class='add'>+		 * NVLink1 can use the TCE kill register directly as</div><div class='add'>+		 * it's the same as PHB3. NVLink2 is different and</div><div class='add'>+		 * should go via the OPAL call.</div><div class='add'>+		 */</div><div class='add'>+		if (phb-&gt;model == PNV_PHB_MODEL_NPU) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The NVLink hardware does not support TCE kill</div><div class='ctx'> 			 * per TCE entry so we have to invalidate</div><div class='hunk'>@@ -1962,11 +1968,6 @@ static void pnv_pci_ioda2_tce_invalidate(struct iommu_table *tbl,</div><div class='ctx'> 		if (phb-&gt;model == PNV_PHB_MODEL_PHB3 &amp;&amp; phb-&gt;regs)</div><div class='ctx'> 			pnv_pci_phb3_tce_invalidate(pe, rm, shift,</div><div class='ctx'> 						    index, npages);</div><div class='del'>-		else if (rm)</div><div class='del'>-			opal_rm_pci_tce_kill(phb-&gt;opal_id,</div><div class='del'>-					     OPAL_PCI_TCE_KILL_PAGES,</div><div class='del'>-					     pe-&gt;pe_number, 1u &lt;&lt; shift,</div><div class='del'>-					     index &lt;&lt; shift, npages);</div><div class='ctx'> 		else</div><div class='ctx'> 			opal_pci_tce_kill(phb-&gt;opal_id,</div><div class='ctx'> 					  OPAL_PCI_TCE_KILL_PAGES,</div><div class='hunk'>@@ -2844,7 +2845,7 @@ static int pnv_pci_ioda_msi_setup(struct pnv_phb *phb, struct pci_dev *dev,</div><div class='ctx'> 	pnv_set_msi_irq_chip(phb, virq);</div><div class='ctx'> </div><div class='ctx'> 	pr_devel("%s: %s-bit MSI on hwirq %x (xive #%d),"</div><div class='del'>-		 " address=%x_%08x data=%x PE# %d\n",</div><div class='add'>+		 " address=%x_%08x data=%x PE# %x\n",</div><div class='ctx'> 		 pci_name(dev), is_64 ? "64" : "32", hwirq, xive_num,</div><div class='ctx'> 		 msg-&gt;address_hi, msg-&gt;address_lo, data, pe-&gt;pe_number);</div><div class='ctx'> </div><div class='hunk'>@@ -2993,7 +2994,7 @@ static void pnv_ioda_setup_pe_res(struct pnv_ioda_pe *pe,</div><div class='ctx'> 			rc = opal_pci_map_pe_mmio_window(phb-&gt;opal_id,</div><div class='ctx'> 				pe-&gt;pe_number, OPAL_IO_WINDOW_TYPE, 0, index);</div><div class='ctx'> 			if (rc != OPAL_SUCCESS) {</div><div class='del'>-				pr_err("%s: Error %lld mapping IO segment#%d to PE#%d\n",</div><div class='add'>+				pr_err("%s: Error %lld mapping IO segment#%d to PE#%x\n",</div><div class='ctx'> 				       __func__, rc, index, pe-&gt;pe_number);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3017,7 +3018,7 @@ static void pnv_ioda_setup_pe_res(struct pnv_ioda_pe *pe,</div><div class='ctx'> 			rc = opal_pci_map_pe_mmio_window(phb-&gt;opal_id,</div><div class='ctx'> 				pe-&gt;pe_number, OPAL_M32_WINDOW_TYPE, 0, index);</div><div class='ctx'> 			if (rc != OPAL_SUCCESS) {</div><div class='del'>-				pr_err("%s: Error %lld mapping M32 segment#%d to PE#%d",</div><div class='add'>+				pr_err("%s: Error %lld mapping M32 segment#%d to PE#%x",</div><div class='ctx'> 				       __func__, rc, index, pe-&gt;pe_number);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3031,7 +3032,7 @@ static void pnv_ioda_setup_pe_res(struct pnv_ioda_pe *pe,</div><div class='ctx'> /*</div><div class='ctx'>  * This function is supposed to be called on basis of PE from top</div><div class='ctx'>  * to bottom style. So the the I/O or MMIO segment assigned to</div><div class='del'>- * parent PE could be overrided by its child PEs if necessary.</div><div class='add'>+ * parent PE could be overridden by its child PEs if necessary.</div><div class='ctx'>  */</div><div class='ctx'> static void pnv_ioda_setup_pe_seg(struct pnv_ioda_pe *pe)</div><div class='ctx'> {</div><div class='hunk'>@@ -3281,7 +3282,7 @@ static void pnv_pci_setup_bridge(struct pci_bus *bus, unsigned long type)</div><div class='ctx'> 		pnv_pci_ioda2_setup_dma_pe(phb, pe);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		pr_warn("%s: No DMA for PHB#%d (type %d)\n",</div><div class='add'>+		pr_warn("%s: No DMA for PHB#%x (type %d)\n",</div><div class='ctx'> 			__func__, phb-&gt;hose-&gt;global_number, phb-&gt;type);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3671,6 +3672,8 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,</div><div class='ctx'> 		phb-&gt;model = PNV_PHB_MODEL_PHB3;</div><div class='ctx'> 	else if (of_device_is_compatible(np, "ibm,power8-npu-pciex"))</div><div class='ctx'> 		phb-&gt;model = PNV_PHB_MODEL_NPU;</div><div class='add'>+	else if (of_device_is_compatible(np, "ibm,power9-npu-pciex"))</div><div class='add'>+		phb-&gt;model = PNV_PHB_MODEL_NPU2;</div><div class='ctx'> 	else</div><div class='ctx'> 		phb-&gt;model = PNV_PHB_MODEL_UNKNOWN;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c<br/>index db7b8020f68e..eb835e977e33 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/pci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/pci.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/pci.c</a></div><div class='hunk'>@@ -234,7 +234,7 @@ static void pnv_pci_dump_p7ioc_diag_data(struct pci_controller *hose,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	data = (struct OpalIoP7IOCPhbErrorData *)common;</div><div class='del'>-	pr_info("P7IOC PHB#%d Diag-data (Version: %d)\n",</div><div class='add'>+	pr_info("P7IOC PHB#%x Diag-data (Version: %d)\n",</div><div class='ctx'> 		hose-&gt;global_number, be32_to_cpu(common-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;brdgCtl)</div><div class='hunk'>@@ -326,7 +326,7 @@ static void pnv_pci_dump_phb3_diag_data(struct pci_controller *hose,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	data = (struct OpalIoPhb3ErrorData*)common;</div><div class='del'>-	pr_info("PHB3 PHB#%d Diag-data (Version: %d)\n",</div><div class='add'>+	pr_info("PHB3 PHB#%x Diag-data (Version: %d)\n",</div><div class='ctx'> 		hose-&gt;global_number, be32_to_cpu(common-&gt;version));</div><div class='ctx'> 	if (data-&gt;brdgCtl)</div><div class='ctx'> 		pr_info("brdgCtl:     %08x\n",</div><div class='hunk'>@@ -516,7 +516,7 @@ static void pnv_pci_config_check_eeh(struct pci_dn *pdn)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_devel(" -&gt; EEH check, bdfn=%04x PE#%d fstate=%x\n",</div><div class='add'>+	pr_devel(" -&gt; EEH check, bdfn=%04x PE#%x fstate=%x\n",</div><div class='ctx'> 		 (pdn-&gt;busno &lt;&lt; 8) | (pdn-&gt;devfn), pe_no, fstate);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the frozen state if applicable */</div><div class='hunk'>@@ -940,6 +940,13 @@ void __init pnv_pci_init(void)</div><div class='ctx'> 	for_each_compatible_node(np, NULL, "ibm,ioda2-npu-phb")</div><div class='ctx'> 		pnv_pci_init_npu_phb(np);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Look for NPU2 PHBs which we treat mostly as NPU PHBs with</div><div class='add'>+	 * the exception of TCE kill which requires an OPAL call.</div><div class='add'>+	 */</div><div class='add'>+	for_each_compatible_node(np, NULL, "ibm,ioda2-npu2-phb")</div><div class='add'>+		pnv_pci_init_npu_phb(np);</div><div class='add'>+</div><div class='ctx'> 	/* Configure IOMMU DMA hooks */</div><div class='ctx'> 	set_pci_dma_ops(&amp;dma_iommu_ops);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h<br/>index e64df7894d6e..e1d3e5526b54 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/pci.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/pci.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/pci.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@ enum pnv_phb_model {</div><div class='ctx'> 	PNV_PHB_MODEL_P7IOC,</div><div class='ctx'> 	PNV_PHB_MODEL_PHB3,</div><div class='ctx'> 	PNV_PHB_MODEL_NPU,</div><div class='add'>+	PNV_PHB_MODEL_NPU2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PNV_PCI_DIAG_BUF_SIZE	8192</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/powernv.h b/arch/powerpc/platforms/powernv/powernv.h<br/>index da7c843ac7f1..613052232475 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/powernv.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/powernv.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/powernv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/powernv.h</a></div><div class='hunk'>@@ -18,7 +18,8 @@ static inline void pnv_pci_shutdown(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> extern u32 pnv_get_supported_cpuidle_states(void);</div><div class='del'>-extern u64 pnv_deepest_stop_state;</div><div class='add'>+extern u64 pnv_deepest_stop_psscr_val;</div><div class='add'>+extern u64 pnv_deepest_stop_psscr_mask;</div><div class='ctx'> </div><div class='ctx'> extern void pnv_lpc_init(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c<br/>index efe8b6bb168b..d50c7d99baaf 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/setup.c</a></div><div class='hunk'>@@ -174,7 +174,7 @@ static void pnv_shutdown(void)</div><div class='ctx'> 	opal_shutdown();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> static void pnv_kexec_wait_secondaries_down(void)</div><div class='ctx'> {</div><div class='ctx'> 	int my_cpu, i, notified = -1;</div><div class='hunk'>@@ -245,7 +245,7 @@ static void pnv_kexec_cpu_down(int crash_shutdown, int secondary)</div><div class='ctx'> 		opal_reinit_cpus(OPAL_REINIT_CPUS_HILE_BE);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_KEXEC */</div><div class='add'>+#endif /* CONFIG_KEXEC_CORE */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE</div><div class='ctx'> static unsigned long pnv_memory_block_size(void)</div><div class='hunk'>@@ -311,7 +311,7 @@ define_machine(powernv) {</div><div class='ctx'> 	.machine_shutdown	= pnv_shutdown,</div><div class='ctx'> 	.power_save             = NULL,</div><div class='ctx'> 	.calibrate_decr		= generic_calibrate_decr,</div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> 	.kexec_cpu_down		= pnv_kexec_cpu_down,</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c<br/>index c789258ae1e1..8b67e1eefb5c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/powernv/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/powernv/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/powernv/smp.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -155,8 +156,10 @@ static void pnv_smp_cpu_kill_self(void)</div><div class='ctx'> 		wmask = SRR1_WAKEMASK_P8;</div><div class='ctx'> </div><div class='ctx'> 	idle_states = pnv_get_supported_cpuidle_states();</div><div class='add'>+</div><div class='ctx'> 	/* We don't want to take decrementer interrupts while we are offline,</div><div class='del'>-	 * so clear LPCR:PECE1. We keep PECE2 enabled.</div><div class='add'>+	 * so clear LPCR:PECE1. We keep PECE2 (and LPCR_PECE_HVEE on P9)</div><div class='add'>+	 * enabled as to let IPIs in.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mtspr(SPRN_LPCR, mfspr(SPRN_LPCR) &amp; ~(u64)LPCR_PECE1);</div><div class='ctx'> </div><div class='hunk'>@@ -182,15 +185,17 @@ static void pnv_smp_cpu_kill_self(void)</div><div class='ctx'> </div><div class='ctx'> 		ppc64_runlatch_off();</div><div class='ctx'> </div><div class='del'>-		if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='del'>-			srr1 = power9_idle_stop(pnv_deepest_stop_state);</div><div class='del'>-		else if (idle_states &amp; OPAL_PM_WINKLE_ENABLED)</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_ARCH_300)) {</div><div class='add'>+			srr1 = power9_idle_stop(pnv_deepest_stop_psscr_val,</div><div class='add'>+						pnv_deepest_stop_psscr_mask);</div><div class='add'>+		} else if (idle_states &amp; OPAL_PM_WINKLE_ENABLED) {</div><div class='ctx'> 			srr1 = power7_winkle();</div><div class='del'>-		else if ((idle_states &amp; OPAL_PM_SLEEP_ENABLED) ||</div><div class='del'>-				(idle_states &amp; OPAL_PM_SLEEP_ENABLED_ER1))</div><div class='add'>+		} else if ((idle_states &amp; OPAL_PM_SLEEP_ENABLED) ||</div><div class='add'>+			   (idle_states &amp; OPAL_PM_SLEEP_ENABLED_ER1)) {</div><div class='ctx'> 			srr1 = power7_sleep();</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			srr1 = power7_nap(1);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ppc64_runlatch_on();</div><div class='ctx'> </div><div class='hunk'>@@ -206,8 +211,12 @@ static void pnv_smp_cpu_kill_self(void)</div><div class='ctx'> 		 * contains 0.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (((srr1 &amp; wmask) == SRR1_WAKEEE) ||</div><div class='add'>+		    ((srr1 &amp; wmask) == SRR1_WAKEHVI) ||</div><div class='ctx'> 		    (local_paca-&gt;irq_happened &amp; PACA_IRQ_EE)) {</div><div class='del'>-			icp_native_flush_interrupt();</div><div class='add'>+			if (cpu_has_feature(CPU_FTR_ARCH_300))</div><div class='add'>+				icp_opal_flush_interrupt();</div><div class='add'>+			else</div><div class='add'>+				icp_native_flush_interrupt();</div><div class='ctx'> 		} else if ((srr1 &amp; wmask) == SRR1_WAKEHDBELL) {</div><div class='ctx'> 			unsigned long msg = PPC_DBELL_TYPE(PPC_DBELL_SERVER);</div><div class='ctx'> 			asm volatile(PPC_MSGCLR(%0) : : "r" (msg));</div><div class='hunk'>@@ -221,6 +230,8 @@ static void pnv_smp_cpu_kill_self(void)</div><div class='ctx'> 		if (srr1 &amp;&amp; !generic_check_cpu_restart(cpu))</div><div class='ctx'> 			DBG("CPU%d Unexpected exit while offline !\n", cpu);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Re-enable decrementer interrupts */</div><div class='ctx'> 	mtspr(SPRN_LPCR, mfspr(SPRN_LPCR) | LPCR_PECE1);</div><div class='ctx'> 	DBG("CPU%d coming online...\n", cpu);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c<br/>index cb3c50328de8..cc2b281a3766 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/ps3/htab.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/ps3/htab.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/ps3/htab.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/ps3/htab.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long vpn,</div><div class='ctx'> 	vflags &amp;= ~HPTE_V_SECONDARY;</div><div class='ctx'> </div><div class='ctx'> 	hpte_v = hpte_encode_v(vpn, psize, apsize, ssize) | vflags | HPTE_V_VALID;</div><div class='del'>-	hpte_r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize, apsize, ssize) | rflags;</div><div class='add'>+	hpte_r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize, apsize) | rflags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ps3_htab_lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c<br/>index 3a487e7f4a5e..6244bc849469 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/ps3/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/ps3/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/ps3/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/ps3/setup.c</a></div><div class='hunk'>@@ -250,7 +250,7 @@ static int __init ps3_probe(void)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_KEXEC)</div><div class='add'>+#if defined(CONFIG_KEXEC_CORE)</div><div class='ctx'> static void ps3_kexec_cpu_down(int crash_shutdown, int secondary)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='hunk'>@@ -276,7 +276,7 @@ define_machine(ps3) {</div><div class='ctx'> 	.progress			= ps3_progress,</div><div class='ctx'> 	.restart			= ps3_restart,</div><div class='ctx'> 	.halt				= ps3_halt,</div><div class='del'>-#if defined(CONFIG_KEXEC)</div><div class='add'>+#if defined(CONFIG_KEXEC_CORE)</div><div class='ctx'> 	.kexec_cpu_down			= ps3_kexec_cpu_down,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c<br/>index 8af1c15aef85..2d2e5f80a3d3 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/ps3/system-bus.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/ps3/system-bus.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/ps3/system-bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/ps3/system-bus.c</a></div><div class='hunk'>@@ -701,7 +701,7 @@ static u64 ps3_dma_get_required_mask(struct device *_dev)</div><div class='ctx'> 	return DMA_BIT_MASK(32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops ps3_sb_dma_ops = {</div><div class='add'>+static const struct dma_map_ops ps3_sb_dma_ops = {</div><div class='ctx'> 	.alloc = ps3_alloc_coherent,</div><div class='ctx'> 	.free = ps3_free_coherent,</div><div class='ctx'> 	.map_sg = ps3_sb_map_sg,</div><div class='hunk'>@@ -712,7 +712,7 @@ static struct dma_map_ops ps3_sb_dma_ops = {</div><div class='ctx'> 	.unmap_page = ps3_unmap_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops ps3_ioc0_dma_ops = {</div><div class='add'>+static const struct dma_map_ops ps3_ioc0_dma_ops = {</div><div class='ctx'> 	.alloc = ps3_alloc_coherent,</div><div class='ctx'> 	.free = ps3_free_coherent,</div><div class='ctx'> 	.map_sg = ps3_ioc0_map_sg,</div><div class='hunk'>@@ -756,11 +756,11 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	switch (dev-&gt;dev_type) {</div><div class='ctx'> 	case PS3_DEVICE_TYPE_IOC0:</div><div class='del'>-		dev-&gt;core.archdata.dma_ops = &amp;ps3_ioc0_dma_ops;</div><div class='add'>+		dev-&gt;core.dma_ops = &amp;ps3_ioc0_dma_ops;</div><div class='ctx'> 		dev_set_name(&amp;dev-&gt;core, "ioc0_%02x", ++dev_ioc0_count);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PS3_DEVICE_TYPE_SB:</div><div class='del'>-		dev-&gt;core.archdata.dma_ops = &amp;ps3_sb_dma_ops;</div><div class='add'>+		dev-&gt;core.dma_ops = &amp;ps3_sb_dma_ops;</div><div class='ctx'> 		dev_set_name(&amp;dev-&gt;core, "sb_%02x", ++dev_sb_count);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig<br/>index bec90fb30425..30ec04f1c67c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/Kconfig</a></div><div class='hunk'>@@ -17,7 +17,6 @@ config PPC_PSERIES</div><div class='ctx'> 	select PPC_UDBG_16550</div><div class='ctx'> 	select PPC_NATIVE</div><div class='ctx'> 	select PPC_DOORBELL</div><div class='del'>-	select HAVE_CONTEXT_TRACKING</div><div class='ctx'> 	select HOTPLUG_CPU if SMP</div><div class='ctx'> 	select ARCH_RANDOM</div><div class='ctx'> 	select PPC_DOORBELL</div><div class='hunk'>@@ -127,3 +126,14 @@ config HV_PERF_CTRS</div><div class='ctx'> 	  systems. 24x7 is available on Power 8 systems.</div><div class='ctx'> </div><div class='ctx'>           If unsure, select Y.</div><div class='add'>+</div><div class='add'>+config IBMVIO</div><div class='add'>+	depends on PPC_PSERIES</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config IBMEBUS</div><div class='add'>+	depends on PPC_PSERIES &amp;&amp; !CPU_LITTLE_ENDIAN</div><div class='add'>+	bool "Support for GX bus based adapters"</div><div class='add'>+	help</div><div class='add'>+	  Bus device driver for GX bus based adapters.</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile<br/>index fedc2ccf029d..8f4ba089e802 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/Makefile</a></div><div class='hunk'>@@ -8,7 +8,7 @@ obj-y			:= lpar.o hvCall.o nvram.o reconfig.o \</div><div class='ctx'> 			   pci.o pci_dlpar.o eeh_pseries.o msi.o</div><div class='ctx'> obj-$(CONFIG_SMP)	+= smp.o</div><div class='ctx'> obj-$(CONFIG_SCANLOG)	+= scanlog.o</div><div class='del'>-obj-$(CONFIG_KEXEC)	+= kexec.o</div><div class='add'>+obj-$(CONFIG_KEXEC_CORE)	+= kexec.o</div><div class='ctx'> obj-$(CONFIG_PSERIES_ENERGY)	+= pseries_energy.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug-cpu.o</div><div class='hunk'>@@ -21,6 +21,8 @@ obj-$(CONFIG_CMM)		+= cmm.o</div><div class='ctx'> obj-$(CONFIG_DTL)		+= dtl.o</div><div class='ctx'> obj-$(CONFIG_IO_EVENT_IRQ)	+= io_event_irq.o</div><div class='ctx'> obj-$(CONFIG_LPARCFG)		+= lparcfg.o</div><div class='add'>+obj-$(CONFIG_IBMVIO)		+= vio.o</div><div class='add'>+obj-$(CONFIG_IBMEBUS)		+= ibmebus.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_PPC_PSERIES),y)</div><div class='ctx'> obj-$(CONFIG_SUSPEND)		+= suspend.o</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c<br/>index 66e7227469b8..4ac419c7eb4c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/cmm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/cmm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/cmm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/cmm.c</a></div><div class='hunk'>@@ -37,10 +37,12 @@</div><div class='ctx'> #include &lt;asm/hvcall.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/memory.h&gt;</div><div class='ctx'> #include &lt;asm/plpar_wrappers.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "pseries.h"</div><div class='add'>+</div><div class='ctx'> #define CMM_DRIVER_VERSION	"1.0.0"</div><div class='ctx'> #define CMM_DEFAULT_DELAY	1</div><div class='ctx'> #define CMM_HOTPLUG_DELAY	5</div><div class='hunk'>@@ -74,7 +76,7 @@ module_param_named(delay, delay, uint, S_IRUGO | S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(delay, "Delay (in seconds) between polls to query hypervisor paging requests. "</div><div class='ctx'> 		 "[Default=" __stringify(CMM_DEFAULT_DELAY) "]");</div><div class='ctx'> module_param_named(hotplug_delay, hotplug_delay, uint, S_IRUGO | S_IWUSR);</div><div class='del'>-MODULE_PARM_DESC(delay, "Delay (in seconds) after memory hotplug remove "</div><div class='add'>+MODULE_PARM_DESC(hotplug_delay, "Delay (in seconds) after memory hotplug remove "</div><div class='ctx'> 		 "before loaning resumes. "</div><div class='ctx'> 		 "[Default=" __stringify(CMM_HOTPLUG_DELAY) "]");</div><div class='ctx'> module_param_named(oom_kb, oom_kb, uint, S_IRUGO | S_IWUSR);</div><div class='hunk'>@@ -109,6 +111,38 @@ static int hotplug_occurred; /* protected by the hotplug mutex */</div><div class='ctx'> </div><div class='ctx'> static struct task_struct *cmm_thread_ptr;</div><div class='ctx'> </div><div class='add'>+static long plpar_page_set_loaned(unsigned long vpa)</div><div class='add'>+{</div><div class='add'>+	unsigned long cmo_page_sz = cmo_get_page_size();</div><div class='add'>+	long rc = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; !rc &amp;&amp; i &lt; PAGE_SIZE; i += cmo_page_sz)</div><div class='add'>+		rc = plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED, vpa + i, 0);</div><div class='add'>+</div><div class='add'>+	for (i -= cmo_page_sz; rc &amp;&amp; i != 0; i -= cmo_page_sz)</div><div class='add'>+		plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE,</div><div class='add'>+				   vpa + i - cmo_page_sz, 0);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long plpar_page_set_active(unsigned long vpa)</div><div class='add'>+{</div><div class='add'>+	unsigned long cmo_page_sz = cmo_get_page_size();</div><div class='add'>+	long rc = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; !rc &amp;&amp; i &lt; PAGE_SIZE; i += cmo_page_sz)</div><div class='add'>+		rc = plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE, vpa + i, 0);</div><div class='add'>+</div><div class='add'>+	for (i -= cmo_page_sz; rc &amp;&amp; i != 0; i -= cmo_page_sz)</div><div class='add'>+		plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED,</div><div class='add'>+				   vpa + i - cmo_page_sz, 0);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * cmm_alloc_pages - Allocate pages and mark them as loaned</div><div class='ctx'>  * @nr:	number of pages to allocate</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c<br/>index 423e450efe07..193e052fa0dd 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/dlpar.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/dlpar.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/dlpar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/dlpar.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct workqueue_struct *pseries_hp_wq;</div><div class='hunk'>@@ -354,11 +354,17 @@ static int handle_dlpar_errorlog(struct pseries_hp_errorlog *hp_elog)</div><div class='ctx'> 	switch (hp_elog-&gt;id_type) {</div><div class='ctx'> 	case PSERIES_HP_ELOG_ID_DRC_COUNT:</div><div class='ctx'> 		hp_elog-&gt;_drc_u.drc_count =</div><div class='del'>-					be32_to_cpu(hp_elog-&gt;_drc_u.drc_count);</div><div class='add'>+				be32_to_cpu(hp_elog-&gt;_drc_u.drc_count);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PSERIES_HP_ELOG_ID_DRC_INDEX:</div><div class='ctx'> 		hp_elog-&gt;_drc_u.drc_index =</div><div class='del'>-					be32_to_cpu(hp_elog-&gt;_drc_u.drc_index);</div><div class='add'>+				be32_to_cpu(hp_elog-&gt;_drc_u.drc_index);</div><div class='add'>+		break;</div><div class='add'>+	case PSERIES_HP_ELOG_ID_DRC_IC:</div><div class='add'>+		hp_elog-&gt;_drc_u.ic.count =</div><div class='add'>+				be32_to_cpu(hp_elog-&gt;_drc_u.ic.count);</div><div class='add'>+		hp_elog-&gt;_drc_u.ic.index =</div><div class='add'>+				be32_to_cpu(hp_elog-&gt;_drc_u.ic.index);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (hp_elog-&gt;resource) {</div><div class='hunk'>@@ -418,88 +424,172 @@ void queue_hotplug_event(struct pseries_hp_errorlog *hp_errlog,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t dlpar_store(struct class *class, struct class_attribute *attr,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='add'>+static int dlpar_parse_resource(char **cmd, struct pseries_hp_errorlog *hp_elog)</div><div class='ctx'> {</div><div class='del'>-	struct pseries_hp_errorlog *hp_elog;</div><div class='del'>-	struct completion hotplug_done;</div><div class='del'>-	const char *arg;</div><div class='del'>-	int rc;</div><div class='add'>+	char *arg;</div><div class='ctx'> </div><div class='del'>-	hp_elog = kzalloc(sizeof(*hp_elog), GFP_KERNEL);</div><div class='del'>-	if (!hp_elog) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto dlpar_store_out;</div><div class='del'>-	}</div><div class='add'>+	arg = strsep(cmd, " ");</div><div class='add'>+	if (!arg)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Parse out the request from the user, this will be in the form</div><div class='del'>-	 * &lt;resource&gt; &lt;action&gt; &lt;id_type&gt; &lt;id&gt;</div><div class='del'>-	 */</div><div class='del'>-	arg = buf;</div><div class='del'>-	if (!strncmp(arg, "memory", 6)) {</div><div class='add'>+	if (sysfs_streq(arg, "memory")) {</div><div class='ctx'> 		hp_elog-&gt;resource = PSERIES_HP_ELOG_RESOURCE_MEM;</div><div class='del'>-		arg += strlen("memory ");</div><div class='del'>-	} else if (!strncmp(arg, "cpu", 3)) {</div><div class='add'>+	} else if (sysfs_streq(arg, "cpu")) {</div><div class='ctx'> 		hp_elog-&gt;resource = PSERIES_HP_ELOG_RESOURCE_CPU;</div><div class='del'>-		arg += strlen("cpu ");</div><div class='ctx'> 	} else {</div><div class='del'>-		pr_err("Invalid resource specified: \"%s\"\n", buf);</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		goto dlpar_store_out;</div><div class='add'>+		pr_err("Invalid resource specified.\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!strncmp(arg, "add", 3)) {</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dlpar_parse_action(char **cmd, struct pseries_hp_errorlog *hp_elog)</div><div class='add'>+{</div><div class='add'>+	char *arg;</div><div class='add'>+</div><div class='add'>+	arg = strsep(cmd, " ");</div><div class='add'>+	if (!arg)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (sysfs_streq(arg, "add")) {</div><div class='ctx'> 		hp_elog-&gt;action = PSERIES_HP_ELOG_ACTION_ADD;</div><div class='del'>-		arg += strlen("add ");</div><div class='del'>-	} else if (!strncmp(arg, "remove", 6)) {</div><div class='add'>+	} else if (sysfs_streq(arg, "remove")) {</div><div class='ctx'> 		hp_elog-&gt;action = PSERIES_HP_ELOG_ACTION_REMOVE;</div><div class='del'>-		arg += strlen("remove ");</div><div class='ctx'> 	} else {</div><div class='del'>-		pr_err("Invalid action specified: \"%s\"\n", buf);</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		goto dlpar_store_out;</div><div class='add'>+		pr_err("Invalid action specified.\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!strncmp(arg, "index", 5)) {</div><div class='del'>-		u32 index;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dlpar_parse_id_type(char **cmd, struct pseries_hp_errorlog *hp_elog)</div><div class='add'>+{</div><div class='add'>+	char *arg;</div><div class='add'>+	u32 count, index;</div><div class='add'>+</div><div class='add'>+	arg = strsep(cmd, " ");</div><div class='add'>+	if (!arg)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (sysfs_streq(arg, "indexed-count")) {</div><div class='add'>+		hp_elog-&gt;id_type = PSERIES_HP_ELOG_ID_DRC_IC;</div><div class='add'>+		arg = strsep(cmd, " ");</div><div class='add'>+		if (!arg) {</div><div class='add'>+			pr_err("No DRC count specified.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (kstrtou32(arg, 0, &amp;count)) {</div><div class='add'>+			pr_err("Invalid DRC count specified.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		arg = strsep(cmd, " ");</div><div class='add'>+		if (!arg) {</div><div class='add'>+			pr_err("No DRC Index specified.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (kstrtou32(arg, 0, &amp;index)) {</div><div class='add'>+			pr_err("Invalid DRC Index specified.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hp_elog-&gt;_drc_u.ic.count = cpu_to_be32(count);</div><div class='add'>+		hp_elog-&gt;_drc_u.ic.index = cpu_to_be32(index);</div><div class='add'>+	} else if (sysfs_streq(arg, "index")) {</div><div class='ctx'> 		hp_elog-&gt;id_type = PSERIES_HP_ELOG_ID_DRC_INDEX;</div><div class='del'>-		arg += strlen("index ");</div><div class='add'>+		arg = strsep(cmd, " ");</div><div class='add'>+		if (!arg) {</div><div class='add'>+			pr_err("No DRC Index specified.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (kstrtou32(arg, 0, &amp;index)) {</div><div class='del'>-			rc = -EINVAL;</div><div class='del'>-			pr_err("Invalid drc_index specified: \"%s\"\n", buf);</div><div class='del'>-			goto dlpar_store_out;</div><div class='add'>+			pr_err("Invalid DRC Index specified.\n");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hp_elog-&gt;_drc_u.drc_index = cpu_to_be32(index);</div><div class='del'>-	} else if (!strncmp(arg, "count", 5)) {</div><div class='del'>-		u32 count;</div><div class='del'>-</div><div class='add'>+	} else if (sysfs_streq(arg, "count")) {</div><div class='ctx'> 		hp_elog-&gt;id_type = PSERIES_HP_ELOG_ID_DRC_COUNT;</div><div class='del'>-		arg += strlen("count ");</div><div class='add'>+		arg = strsep(cmd, " ");</div><div class='add'>+		if (!arg) {</div><div class='add'>+			pr_err("No DRC count specified.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (kstrtou32(arg, 0, &amp;count)) {</div><div class='del'>-			rc = -EINVAL;</div><div class='del'>-			pr_err("Invalid count specified: \"%s\"\n", buf);</div><div class='del'>-			goto dlpar_store_out;</div><div class='add'>+			pr_err("Invalid DRC count specified.\n");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hp_elog-&gt;_drc_u.drc_count = cpu_to_be32(count);</div><div class='ctx'> 	} else {</div><div class='del'>-		pr_err("Invalid id_type specified: \"%s\"\n", buf);</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		goto dlpar_store_out;</div><div class='add'>+		pr_err("Invalid id_type specified.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t dlpar_store(struct class *class, struct class_attribute *attr,</div><div class='add'>+			   const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct pseries_hp_errorlog *hp_elog;</div><div class='add'>+	struct completion hotplug_done;</div><div class='add'>+	char *argbuf;</div><div class='add'>+	char *args;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	args = argbuf = kstrdup(buf, GFP_KERNEL);</div><div class='add'>+	hp_elog = kzalloc(sizeof(*hp_elog), GFP_KERNEL);</div><div class='add'>+	if (!hp_elog || !argbuf) {</div><div class='add'>+		pr_info("Could not allocate resources for DLPAR operation\n");</div><div class='add'>+		kfree(argbuf);</div><div class='add'>+		kfree(hp_elog);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Parse out the request from the user, this will be in the form:</div><div class='add'>+	 * &lt;resource&gt; &lt;action&gt; &lt;id_type&gt; &lt;id&gt;</div><div class='add'>+	 */</div><div class='add'>+	rc = dlpar_parse_resource(&amp;args, hp_elog);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto dlpar_store_out;</div><div class='add'>+</div><div class='add'>+	rc = dlpar_parse_action(&amp;args, hp_elog);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto dlpar_store_out;</div><div class='add'>+</div><div class='add'>+	rc = dlpar_parse_id_type(&amp;args, hp_elog);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto dlpar_store_out;</div><div class='add'>+</div><div class='ctx'> 	init_completion(&amp;hotplug_done);</div><div class='ctx'> 	queue_hotplug_event(hp_elog, &amp;hotplug_done, &amp;rc);</div><div class='ctx'> 	wait_for_completion(&amp;hotplug_done);</div><div class='ctx'> </div><div class='ctx'> dlpar_store_out:</div><div class='add'>+	kfree(argbuf);</div><div class='ctx'> 	kfree(hp_elog);</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		pr_err("Could not handle DLPAR request \"%s\"\n", buf);</div><div class='add'>+</div><div class='ctx'> 	return rc ? rc : count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static CLASS_ATTR(dlpar, S_IWUSR, NULL, dlpar_store);</div><div class='add'>+static ssize_t dlpar_show(struct class *class, struct class_attribute *attr,</div><div class='add'>+			  char *buf)</div><div class='add'>+{</div><div class='add'>+	return sprintf(buf, "%s\n", "memory,cpu");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static CLASS_ATTR(dlpar, S_IWUSR | S_IRUSR, dlpar_show, dlpar_store);</div><div class='ctx'> </div><div class='ctx'> static int __init pseries_dlpar_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c<br/>index 39049e4884fb..6b04e3f0f982 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/dtl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/dtl.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/dtl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/dtl.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='ctx'> #include &lt;asm/lppaca.h&gt;</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c<br/>index 1c428f06b14c..1eef46d9cf30 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/eeh_pseries.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/eeh_pseries.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/eeh_pseries.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/eeh_pseries.c</a></div><div class='hunk'>@@ -270,7 +270,7 @@ static void *pseries_eeh_probe(struct pci_dn *pdn, void *data)</div><div class='ctx'> 			eeh_add_flag(EEH_ENABLED);</div><div class='ctx'> 			eeh_add_to_parent_pe(edev);</div><div class='ctx'> </div><div class='del'>-			pr_debug("%s: EEH enabled on %02x:%02x.%01x PHB#%d-PE#%x\n",</div><div class='add'>+			pr_debug("%s: EEH enabled on %02x:%02x.%01x PHB#%x-PE#%x\n",</div><div class='ctx'> 				__func__, pdn-&gt;busno, PCI_SLOT(pdn-&gt;devfn),</div><div class='ctx'> 				PCI_FUNC(pdn-&gt;devfn), pe.phb-&gt;global_number,</div><div class='ctx'> 				pe.addr);</div><div class='hunk'>@@ -371,7 +371,7 @@ static int pseries_eeh_get_pe_addr(struct eeh_pe *pe)</div><div class='ctx'> 				pe-&gt;config_addr, BUID_HI(pe-&gt;phb-&gt;buid),</div><div class='ctx'> 				BUID_LO(pe-&gt;phb-&gt;buid), 0);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			pr_warn("%s: Failed to get address for PHB#%d-PE#%x\n",</div><div class='add'>+			pr_warn("%s: Failed to get address for PHB#%x-PE#%x\n",</div><div class='ctx'> 				__func__, pe-&gt;phb-&gt;global_number, pe-&gt;config_addr);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -384,7 +384,7 @@ static int pseries_eeh_get_pe_addr(struct eeh_pe *pe)</div><div class='ctx'> 				pe-&gt;config_addr, BUID_HI(pe-&gt;phb-&gt;buid),</div><div class='ctx'> 				BUID_LO(pe-&gt;phb-&gt;buid), 0);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			pr_warn("%s: Failed to get address for PHB#%d-PE#%x\n",</div><div class='add'>+			pr_warn("%s: Failed to get address for PHB#%x-PE#%x\n",</div><div class='ctx'> 				__func__, pe-&gt;phb-&gt;global_number, pe-&gt;config_addr);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -653,7 +653,7 @@ static int pseries_eeh_configure_bridge(struct eeh_pe *pe)</div><div class='ctx'> 		rtas_busy_delay(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_warn("%s: Unable to configure bridge PHB#%d-PE#%x (%d)\n",</div><div class='add'>+	pr_warn("%s: Unable to configure bridge PHB#%x-PE#%x (%d)\n",</div><div class='ctx'> 		__func__, pe-&gt;phb-&gt;global_number, pe-&gt;addr, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c<br/>index ea7f09bd73b1..63cc82ad58ac 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/firmware.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/firmware.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/firmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/firmware.c</a></div><div class='hunk'>@@ -64,6 +64,7 @@ hypertas_fw_features_table[] = {</div><div class='ctx'> 	{FW_FEATURE_VPHN,		"hcall-vphn"},</div><div class='ctx'> 	{FW_FEATURE_SET_MODE,		"hcall-set-mode"},</div><div class='ctx'> 	{FW_FEATURE_BEST_ENERGY,	"hcall-best-energy-1*"},</div><div class='add'>+	{FW_FEATURE_HPT_RESIZE,		"hcall-hpt-resize"},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Build up the firmware features bitmask using the contents of</div><div class='hunk'>@@ -126,7 +127,7 @@ static void __init fw_vec5_feature_init(const char *vec5, unsigned long len)</div><div class='ctx'> 		index = OV5_INDX(vec5_fw_features_table[i].feature);</div><div class='ctx'> 		feat = OV5_FEAT(vec5_fw_features_table[i].feature);</div><div class='ctx'> </div><div class='del'>-		if (vec5[index] &amp; feat)</div><div class='add'>+		if (index &lt; len &amp;&amp; (vec5[index] &amp; feat))</div><div class='ctx'> 			powerpc_firmware_features |=</div><div class='ctx'> 				vec5_fw_features_table[i].val;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c<br/>index a1b63e00b2f7..7bc0e91f8715 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/hotplug-cpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/hotplug-cpu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/hotplug-cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/hotplug-cpu.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;	/* for idle_task_exit */</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c<br/>index 76ec104e88be..e104c71ea44a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/hotplug-memory.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/hotplug-memory.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/hotplug-memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/hotplug-memory.c</a></div><div class='hunk'>@@ -320,6 +320,19 @@ static int dlpar_remove_device_tree_lmb(struct of_drconf_cell *lmb)</div><div class='ctx'> 	return dlpar_update_device_tree_lmb(lmb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct memory_block *lmb_to_memblock(struct of_drconf_cell *lmb)</div><div class='add'>+{</div><div class='add'>+	unsigned long section_nr;</div><div class='add'>+	struct mem_section *mem_sect;</div><div class='add'>+	struct memory_block *mem_block;</div><div class='add'>+</div><div class='add'>+	section_nr = pfn_to_section_nr(PFN_DOWN(lmb-&gt;base_addr));</div><div class='add'>+	mem_sect = __nr_to_section(section_nr);</div><div class='add'>+</div><div class='add'>+	mem_block = find_memory_block(mem_sect);</div><div class='add'>+	return mem_block;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTREMOVE</div><div class='ctx'> static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -407,19 +420,6 @@ static bool lmb_is_removable(struct of_drconf_cell *lmb)</div><div class='ctx'> </div><div class='ctx'> static int dlpar_add_lmb(struct of_drconf_cell *);</div><div class='ctx'> </div><div class='del'>-static struct memory_block *lmb_to_memblock(struct of_drconf_cell *lmb)</div><div class='del'>-{</div><div class='del'>-	unsigned long section_nr;</div><div class='del'>-	struct mem_section *mem_sect;</div><div class='del'>-	struct memory_block *mem_block;</div><div class='del'>-</div><div class='del'>-	section_nr = pfn_to_section_nr(PFN_DOWN(lmb-&gt;base_addr));</div><div class='del'>-	mem_sect = __nr_to_section(section_nr);</div><div class='del'>-</div><div class='del'>-	mem_block = find_memory_block(mem_sect);</div><div class='del'>-	return mem_block;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int dlpar_remove_lmb(struct of_drconf_cell *lmb)</div><div class='ctx'> {</div><div class='ctx'> 	struct memory_block *mem_block;</div><div class='hunk'>@@ -446,9 +446,7 @@ static int dlpar_remove_lmb(struct of_drconf_cell *lmb)</div><div class='ctx'> 	/* Update memory regions for memory remove */</div><div class='ctx'> 	memblock_remove(lmb-&gt;base_addr, block_sz);</div><div class='ctx'> </div><div class='del'>-	dlpar_release_drc(lmb-&gt;drc_index);</div><div class='ctx'> 	dlpar_remove_device_tree_lmb(lmb);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -472,12 +470,15 @@ static int dlpar_memory_remove_by_count(u32 lmbs_to_remove,</div><div class='ctx'> </div><div class='ctx'> 	/* Validate that there are enough LMBs to satisfy the request */</div><div class='ctx'> 	for (i = 0; i &lt; num_lmbs; i++) {</div><div class='del'>-		if (lmbs[i].flags &amp; DRCONF_MEM_ASSIGNED)</div><div class='add'>+		if (lmb_is_removable(&amp;lmbs[i]))</div><div class='ctx'> 			lmbs_available++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (lmbs_available &lt; lmbs_to_remove)</div><div class='add'>+	if (lmbs_available &lt; lmbs_to_remove) {</div><div class='add'>+		pr_info("Not enough LMBs available (%d of %d) to satisfy request\n",</div><div class='add'>+			lmbs_available, lmbs_to_remove);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_lmbs &amp;&amp; lmbs_removed &lt; lmbs_to_remove; i++) {</div><div class='ctx'> 		rc = dlpar_remove_lmb(&amp;lmbs[i]);</div><div class='hunk'>@@ -513,6 +514,7 @@ static int dlpar_memory_remove_by_count(u32 lmbs_to_remove,</div><div class='ctx'> 			if (!lmbs[i].reserved)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='add'>+			dlpar_release_drc(lmbs[i].drc_index);</div><div class='ctx'> 			pr_info("Memory at %llx was hot-removed\n",</div><div class='ctx'> 				lmbs[i].base_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -542,6 +544,9 @@ static int dlpar_memory_remove_by_index(u32 drc_index, struct property *prop)</div><div class='ctx'> 		if (lmbs[i].drc_index == drc_index) {</div><div class='ctx'> 			lmb_found = 1;</div><div class='ctx'> 			rc = dlpar_remove_lmb(&amp;lmbs[i]);</div><div class='add'>+			if (!rc)</div><div class='add'>+				dlpar_release_drc(lmbs[i].drc_index);</div><div class='add'>+</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -558,6 +563,132 @@ static int dlpar_memory_remove_by_index(u32 drc_index, struct property *prop)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dlpar_memory_readd_by_index(u32 drc_index, struct property *prop)</div><div class='add'>+{</div><div class='add'>+	struct of_drconf_cell *lmbs;</div><div class='add'>+	u32 num_lmbs, *p;</div><div class='add'>+	int lmb_found;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	pr_info("Attempting to update LMB, drc index %x\n", drc_index);</div><div class='add'>+</div><div class='add'>+	p = prop-&gt;value;</div><div class='add'>+	num_lmbs = *p++;</div><div class='add'>+	lmbs = (struct of_drconf_cell *)p;</div><div class='add'>+</div><div class='add'>+	lmb_found = 0;</div><div class='add'>+	for (i = 0; i &lt; num_lmbs; i++) {</div><div class='add'>+		if (lmbs[i].drc_index == drc_index) {</div><div class='add'>+			lmb_found = 1;</div><div class='add'>+			rc = dlpar_remove_lmb(&amp;lmbs[i]);</div><div class='add'>+			if (!rc) {</div><div class='add'>+				rc = dlpar_add_lmb(&amp;lmbs[i]);</div><div class='add'>+				if (rc)</div><div class='add'>+					dlpar_release_drc(lmbs[i].drc_index);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!lmb_found)</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		pr_info("Failed to update memory at %llx\n",</div><div class='add'>+			lmbs[i].base_addr);</div><div class='add'>+	else</div><div class='add'>+		pr_info("Memory at %llx was updated\n", lmbs[i].base_addr);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index,</div><div class='add'>+				     struct property *prop)</div><div class='add'>+{</div><div class='add'>+	struct of_drconf_cell *lmbs;</div><div class='add'>+	u32 num_lmbs, *p;</div><div class='add'>+	int i, rc, start_lmb_found;</div><div class='add'>+	int lmbs_available = 0, start_index = 0, end_index;</div><div class='add'>+</div><div class='add'>+	pr_info("Attempting to hot-remove %u LMB(s) at %x\n",</div><div class='add'>+		lmbs_to_remove, drc_index);</div><div class='add'>+</div><div class='add'>+	if (lmbs_to_remove == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p = prop-&gt;value;</div><div class='add'>+	num_lmbs = *p++;</div><div class='add'>+	lmbs = (struct of_drconf_cell *)p;</div><div class='add'>+	start_lmb_found = 0;</div><div class='add'>+</div><div class='add'>+	/* Navigate to drc_index */</div><div class='add'>+	while (start_index &lt; num_lmbs) {</div><div class='add'>+		if (lmbs[start_index].drc_index == drc_index) {</div><div class='add'>+			start_lmb_found = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		start_index++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!start_lmb_found)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	end_index = start_index + lmbs_to_remove;</div><div class='add'>+</div><div class='add'>+	/* Validate that there are enough LMBs to satisfy the request */</div><div class='add'>+	for (i = start_index; i &lt; end_index; i++) {</div><div class='add'>+		if (lmbs[i].flags &amp; DRCONF_MEM_RESERVED)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		lmbs_available++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lmbs_available &lt; lmbs_to_remove)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = start_index; i &lt; end_index; i++) {</div><div class='add'>+		if (!(lmbs[i].flags &amp; DRCONF_MEM_ASSIGNED))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rc = dlpar_remove_lmb(&amp;lmbs[i]);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		lmbs[i].reserved = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc) {</div><div class='add'>+		pr_err("Memory indexed-count-remove failed, adding any removed LMBs\n");</div><div class='add'>+</div><div class='add'>+		for (i = start_index; i &lt; end_index; i++) {</div><div class='add'>+			if (!lmbs[i].reserved)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			rc = dlpar_add_lmb(&amp;lmbs[i]);</div><div class='add'>+			if (rc)</div><div class='add'>+				pr_err("Failed to add LMB, drc index %x\n",</div><div class='add'>+				       be32_to_cpu(lmbs[i].drc_index));</div><div class='add'>+</div><div class='add'>+			lmbs[i].reserved = 0;</div><div class='add'>+		}</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = start_index; i &lt; end_index; i++) {</div><div class='add'>+			if (!lmbs[i].reserved)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			dlpar_release_drc(lmbs[i].drc_index);</div><div class='add'>+			pr_info("Memory at %llx (drc index %x) was hot-removed\n",</div><div class='add'>+				lmbs[i].base_addr, lmbs[i].drc_index);</div><div class='add'>+</div><div class='add'>+			lmbs[i].reserved = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> static inline int pseries_remove_memblock(unsigned long base,</div><div class='ctx'> 					  unsigned int memblock_size)</div><div class='hunk'>@@ -585,9 +716,32 @@ static int dlpar_memory_remove_by_index(u32 drc_index, struct property *prop)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='add'>+static int dlpar_memory_readd_by_index(u32 drc_index, struct property *prop)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index,</div><div class='add'>+				     struct property *prop)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_MEMORY_HOTREMOVE */</div><div class='ctx'> </div><div class='add'>+static int dlpar_online_lmb(struct of_drconf_cell *lmb)</div><div class='add'>+{</div><div class='add'>+	struct memory_block *mem_block;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mem_block = lmb_to_memblock(lmb);</div><div class='add'>+	if (!mem_block)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rc = device_online(&amp;mem_block-&gt;dev);</div><div class='add'>+	put_device(&amp;mem_block-&gt;dev);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dlpar_add_lmb(struct of_drconf_cell *lmb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long block_sz;</div><div class='hunk'>@@ -596,10 +750,6 @@ static int dlpar_add_lmb(struct of_drconf_cell *lmb)</div><div class='ctx'> 	if (lmb-&gt;flags &amp; DRCONF_MEM_ASSIGNED)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rc = dlpar_acquire_drc(lmb-&gt;drc_index);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='ctx'> 	rc = dlpar_add_device_tree_lmb(lmb);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		pr_err("Couldn't update device tree for drc index %x\n",</div><div class='hunk'>@@ -617,7 +767,13 @@ static int dlpar_add_lmb(struct of_drconf_cell *lmb)</div><div class='ctx'> 	rc = add_memory(nid, lmb-&gt;base_addr, block_sz);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dlpar_remove_device_tree_lmb(lmb);</div><div class='del'>-		dlpar_release_drc(lmb-&gt;drc_index);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = dlpar_online_lmb(lmb);</div><div class='add'>+	if (rc) {</div><div class='add'>+		remove_memory(nid, lmb-&gt;base_addr, block_sz);</div><div class='add'>+		dlpar_remove_device_tree_lmb(lmb);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		lmb-&gt;flags |= DRCONF_MEM_ASSIGNED;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -652,10 +808,16 @@ static int dlpar_memory_add_by_count(u32 lmbs_to_add, struct property *prop)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_lmbs &amp;&amp; lmbs_to_add != lmbs_added; i++) {</div><div class='del'>-		rc = dlpar_add_lmb(&amp;lmbs[i]);</div><div class='add'>+		rc = dlpar_acquire_drc(lmbs[i].drc_index);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		rc = dlpar_add_lmb(&amp;lmbs[i]);</div><div class='add'>+		if (rc) {</div><div class='add'>+			dlpar_release_drc(lmbs[i].drc_index);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		lmbs_added++;</div><div class='ctx'> </div><div class='ctx'> 		/* Mark this lmb so we can remove it later if all of the</div><div class='hunk'>@@ -675,6 +837,8 @@ static int dlpar_memory_add_by_count(u32 lmbs_to_add, struct property *prop)</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				pr_err("Failed to remove LMB, drc index %x\n",</div><div class='ctx'> 				       be32_to_cpu(lmbs[i].drc_index));</div><div class='add'>+			else</div><div class='add'>+				dlpar_release_drc(lmbs[i].drc_index);</div><div class='ctx'> 		}</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -708,7 +872,13 @@ static int dlpar_memory_add_by_index(u32 drc_index, struct property *prop)</div><div class='ctx'> 	for (i = 0; i &lt; num_lmbs; i++) {</div><div class='ctx'> 		if (lmbs[i].drc_index == drc_index) {</div><div class='ctx'> 			lmb_found = 1;</div><div class='del'>-			rc = dlpar_add_lmb(&amp;lmbs[i]);</div><div class='add'>+			rc = dlpar_acquire_drc(lmbs[i].drc_index);</div><div class='add'>+			if (!rc) {</div><div class='add'>+				rc = dlpar_add_lmb(&amp;lmbs[i]);</div><div class='add'>+				if (rc)</div><div class='add'>+					dlpar_release_drc(lmbs[i].drc_index);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -725,6 +895,97 @@ static int dlpar_memory_add_by_index(u32 drc_index, struct property *prop)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dlpar_memory_add_by_ic(u32 lmbs_to_add, u32 drc_index,</div><div class='add'>+				  struct property *prop)</div><div class='add'>+{</div><div class='add'>+	struct of_drconf_cell *lmbs;</div><div class='add'>+	u32 num_lmbs, *p;</div><div class='add'>+	int i, rc, start_lmb_found;</div><div class='add'>+	int lmbs_available = 0, start_index = 0, end_index;</div><div class='add'>+</div><div class='add'>+	pr_info("Attempting to hot-add %u LMB(s) at index %x\n",</div><div class='add'>+		lmbs_to_add, drc_index);</div><div class='add'>+</div><div class='add'>+	if (lmbs_to_add == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p = prop-&gt;value;</div><div class='add'>+	num_lmbs = *p++;</div><div class='add'>+	lmbs = (struct of_drconf_cell *)p;</div><div class='add'>+	start_lmb_found = 0;</div><div class='add'>+</div><div class='add'>+	/* Navigate to drc_index */</div><div class='add'>+	while (start_index &lt; num_lmbs) {</div><div class='add'>+		if (lmbs[start_index].drc_index == drc_index) {</div><div class='add'>+			start_lmb_found = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		start_index++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!start_lmb_found)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	end_index = start_index + lmbs_to_add;</div><div class='add'>+</div><div class='add'>+	/* Validate that the LMBs in this range are not reserved */</div><div class='add'>+	for (i = start_index; i &lt; end_index; i++) {</div><div class='add'>+		if (lmbs[i].flags &amp; DRCONF_MEM_RESERVED)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		lmbs_available++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lmbs_available &lt; lmbs_to_add)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = start_index; i &lt; end_index; i++) {</div><div class='add'>+		if (lmbs[i].flags &amp; DRCONF_MEM_ASSIGNED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rc = dlpar_acquire_drc(lmbs[i].drc_index);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		rc = dlpar_add_lmb(&amp;lmbs[i]);</div><div class='add'>+		if (rc) {</div><div class='add'>+			dlpar_release_drc(lmbs[i].drc_index);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		lmbs[i].reserved = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc) {</div><div class='add'>+		pr_err("Memory indexed-count-add failed, removing any added LMBs\n");</div><div class='add'>+</div><div class='add'>+		for (i = start_index; i &lt; end_index; i++) {</div><div class='add'>+			if (!lmbs[i].reserved)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			rc = dlpar_remove_lmb(&amp;lmbs[i]);</div><div class='add'>+			if (rc)</div><div class='add'>+				pr_err("Failed to remove LMB, drc index %x\n",</div><div class='add'>+				       be32_to_cpu(lmbs[i].drc_index));</div><div class='add'>+			else</div><div class='add'>+				dlpar_release_drc(lmbs[i].drc_index);</div><div class='add'>+		}</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = start_index; i &lt; end_index; i++) {</div><div class='add'>+			if (!lmbs[i].reserved)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			pr_info("Memory at %llx (drc index %x) was hot-added\n",</div><div class='add'>+				lmbs[i].base_addr, lmbs[i].drc_index);</div><div class='add'>+			lmbs[i].reserved = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int dlpar_memory(struct pseries_hp_errorlog *hp_elog)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *dn;</div><div class='hunk'>@@ -732,9 +993,6 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)</div><div class='ctx'> 	u32 count, drc_index;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	count = hp_elog-&gt;_drc_u.drc_count;</div><div class='del'>-	drc_index = hp_elog-&gt;_drc_u.drc_index;</div><div class='del'>-</div><div class='ctx'> 	lock_device_hotplug();</div><div class='ctx'> </div><div class='ctx'> 	dn = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");</div><div class='hunk'>@@ -751,20 +1009,40 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)</div><div class='ctx'> </div><div class='ctx'> 	switch (hp_elog-&gt;action) {</div><div class='ctx'> 	case PSERIES_HP_ELOG_ACTION_ADD:</div><div class='del'>-		if (hp_elog-&gt;id_type == PSERIES_HP_ELOG_ID_DRC_COUNT)</div><div class='add'>+		if (hp_elog-&gt;id_type == PSERIES_HP_ELOG_ID_DRC_COUNT) {</div><div class='add'>+			count = hp_elog-&gt;_drc_u.drc_count;</div><div class='ctx'> 			rc = dlpar_memory_add_by_count(count, prop);</div><div class='del'>-		else if (hp_elog-&gt;id_type == PSERIES_HP_ELOG_ID_DRC_INDEX)</div><div class='add'>+		} else if (hp_elog-&gt;id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {</div><div class='add'>+			drc_index = hp_elog-&gt;_drc_u.drc_index;</div><div class='ctx'> 			rc = dlpar_memory_add_by_index(drc_index, prop);</div><div class='del'>-		else</div><div class='add'>+		} else if (hp_elog-&gt;id_type == PSERIES_HP_ELOG_ID_DRC_IC) {</div><div class='add'>+			count = hp_elog-&gt;_drc_u.ic.count;</div><div class='add'>+			drc_index = hp_elog-&gt;_drc_u.ic.index;</div><div class='add'>+			rc = dlpar_memory_add_by_ic(count, drc_index, prop);</div><div class='add'>+		} else {</div><div class='ctx'> 			rc = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PSERIES_HP_ELOG_ACTION_REMOVE:</div><div class='del'>-		if (hp_elog-&gt;id_type == PSERIES_HP_ELOG_ID_DRC_COUNT)</div><div class='add'>+		if (hp_elog-&gt;id_type == PSERIES_HP_ELOG_ID_DRC_COUNT) {</div><div class='add'>+			count = hp_elog-&gt;_drc_u.drc_count;</div><div class='ctx'> 			rc = dlpar_memory_remove_by_count(count, prop);</div><div class='del'>-		else if (hp_elog-&gt;id_type == PSERIES_HP_ELOG_ID_DRC_INDEX)</div><div class='add'>+		} else if (hp_elog-&gt;id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {</div><div class='add'>+			drc_index = hp_elog-&gt;_drc_u.drc_index;</div><div class='ctx'> 			rc = dlpar_memory_remove_by_index(drc_index, prop);</div><div class='del'>-		else</div><div class='add'>+		} else if (hp_elog-&gt;id_type == PSERIES_HP_ELOG_ID_DRC_IC) {</div><div class='add'>+			count = hp_elog-&gt;_drc_u.ic.count;</div><div class='add'>+			drc_index = hp_elog-&gt;_drc_u.ic.index;</div><div class='add'>+			rc = dlpar_memory_remove_by_ic(count, drc_index, prop);</div><div class='add'>+		} else {</div><div class='ctx'> 			rc = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case PSERIES_HP_ELOG_ACTION_READD:</div><div class='add'>+		drc_index = hp_elog-&gt;_drc_u.drc_index;</div><div class='add'>+		rc = dlpar_memory_readd_by_index(drc_index, prop);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		pr_err("Invalid action (%d) specified\n", hp_elog-&gt;action);</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/ibmebus.c b/arch/powerpc/platforms/pseries/ibmebus.c<br/>new file mode 100644<br/>index 000000000000..99a6bf7f3bcf<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/ibmebus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/ibmebus.c</a></div><div class='hunk'>@@ -0,0 +1,469 @@</div><div class='add'>+/*</div><div class='add'>+ * IBM PowerPC IBM eBus Infrastructure Support.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 IBM Corporation</div><div class='add'>+ *  Joachim Fenkes &lt;fenkes@de.ibm.com&gt;</div><div class='add'>+ *  Heiko J Schick &lt;schickhj@de.ibm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This source code is distributed under a dual license of GPL v2.0 and OpenIB</div><div class='add'>+ * BSD.</div><div class='add'>+ *</div><div class='add'>+ * OpenIB BSD License</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *</div><div class='add'>+ * Redistributions of source code must retain the above copyright notice, this</div><div class='add'>+ * list of conditions and the following disclaimer.</div><div class='add'>+ *</div><div class='add'>+ * Redistributions in binary form must reproduce the above copyright notice,</div><div class='add'>+ * this list of conditions and the following disclaimer in the documentation</div><div class='add'>+ * and/or other materials</div><div class='add'>+ * provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='add'>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE</div><div class='add'>+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER</div><div class='add'>+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='add'>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</div><div class='add'>+ * POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/kobject.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/stat.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;asm/ibmebus.h&gt;</div><div class='add'>+</div><div class='add'>+static struct device ibmebus_bus_device = { /* fake "parent" device */</div><div class='add'>+	.init_name = "ibmebus",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bus_type ibmebus_bus_type;</div><div class='add'>+</div><div class='add'>+/* These devices will automatically be added to the bus during init */</div><div class='add'>+static const struct of_device_id ibmebus_matches[] __initconst = {</div><div class='add'>+	{ .compatible = "IBM,lhca" },</div><div class='add'>+	{ .compatible = "IBM,lhea" },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void *ibmebus_alloc_coherent(struct device *dev,</div><div class='add'>+				    size_t size,</div><div class='add'>+				    dma_addr_t *dma_handle,</div><div class='add'>+				    gfp_t flag,</div><div class='add'>+				    unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+	void *mem;</div><div class='add'>+</div><div class='add'>+	mem = kmalloc(size, flag);</div><div class='add'>+	*dma_handle = (dma_addr_t)mem;</div><div class='add'>+</div><div class='add'>+	return mem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ibmebus_free_coherent(struct device *dev,</div><div class='add'>+				  size_t size, void *vaddr,</div><div class='add'>+				  dma_addr_t dma_handle,</div><div class='add'>+				  unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+	kfree(vaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static dma_addr_t ibmebus_map_page(struct device *dev,</div><div class='add'>+				   struct page *page,</div><div class='add'>+				   unsigned long offset,</div><div class='add'>+				   size_t size,</div><div class='add'>+				   enum dma_data_direction direction,</div><div class='add'>+				   unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+	return (dma_addr_t)(page_address(page) + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ibmebus_unmap_page(struct device *dev,</div><div class='add'>+			       dma_addr_t dma_addr,</div><div class='add'>+			       size_t size,</div><div class='add'>+			       enum dma_data_direction direction,</div><div class='add'>+			       unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ibmebus_map_sg(struct device *dev,</div><div class='add'>+			  struct scatterlist *sgl,</div><div class='add'>+			  int nents, enum dma_data_direction direction,</div><div class='add'>+			  unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_sg(sgl, sg, nents, i) {</div><div class='add'>+		sg-&gt;dma_address = (dma_addr_t) sg_virt(sg);</div><div class='add'>+		sg-&gt;dma_length = sg-&gt;length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nents;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ibmebus_unmap_sg(struct device *dev,</div><div class='add'>+			     struct scatterlist *sg,</div><div class='add'>+			     int nents, enum dma_data_direction direction,</div><div class='add'>+			     unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ibmebus_dma_supported(struct device *dev, u64 mask)</div><div class='add'>+{</div><div class='add'>+	return mask == DMA_BIT_MASK(64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 ibmebus_dma_get_required_mask(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return DMA_BIT_MASK(64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dma_map_ops ibmebus_dma_ops = {</div><div class='add'>+	.alloc              = ibmebus_alloc_coherent,</div><div class='add'>+	.free               = ibmebus_free_coherent,</div><div class='add'>+	.map_sg             = ibmebus_map_sg,</div><div class='add'>+	.unmap_sg           = ibmebus_unmap_sg,</div><div class='add'>+	.dma_supported      = ibmebus_dma_supported,</div><div class='add'>+	.get_required_mask  = ibmebus_dma_get_required_mask,</div><div class='add'>+	.map_page           = ibmebus_map_page,</div><div class='add'>+	.unmap_page         = ibmebus_unmap_page,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ibmebus_match_path(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dn = to_platform_device(dev)-&gt;dev.of_node;</div><div class='add'>+	return (dn-&gt;full_name &amp;&amp;</div><div class='add'>+		(strcasecmp((char *)data, dn-&gt;full_name) == 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ibmebus_match_node(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	return to_platform_device(dev)-&gt;dev.of_node == data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ibmebus_create_device(struct device_node *dn)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev = of_device_alloc(dn, NULL, &amp;ibmebus_bus_device);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;dev.bus = &amp;ibmebus_bus_type;</div><div class='add'>+	dev-&gt;dev.dma_ops = &amp;ibmebus_dma_ops;</div><div class='add'>+</div><div class='add'>+	ret = of_device_add(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		platform_device_put(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ibmebus_create_devices(const struct of_device_id *matches)</div><div class='add'>+{</div><div class='add'>+	struct device_node *root, *child;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	root = of_find_node_by_path("/");</div><div class='add'>+</div><div class='add'>+	for_each_child_of_node(root, child) {</div><div class='add'>+		if (!of_match_node(matches, child))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dev = bus_find_device(&amp;ibmebus_bus_type, NULL, child,</div><div class='add'>+				      ibmebus_match_node);</div><div class='add'>+		if (dev) {</div><div class='add'>+			put_device(dev);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ibmebus_create_device(child);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_ERR "%s: failed to create device (%i)",</div><div class='add'>+			       __func__, ret);</div><div class='add'>+			of_node_put(child);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	of_node_put(root);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ibmebus_register_driver(struct platform_driver *drv)</div><div class='add'>+{</div><div class='add'>+	/* If the driver uses devices that ibmebus doesn't know, add them */</div><div class='add'>+	ibmebus_create_devices(drv-&gt;driver.of_match_table);</div><div class='add'>+</div><div class='add'>+	drv-&gt;driver.bus = &amp;ibmebus_bus_type;</div><div class='add'>+	return driver_register(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ibmebus_register_driver);</div><div class='add'>+</div><div class='add'>+void ibmebus_unregister_driver(struct platform_driver *drv)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ibmebus_unregister_driver);</div><div class='add'>+</div><div class='add'>+int ibmebus_request_irq(u32 ist, irq_handler_t handler,</div><div class='add'>+			unsigned long irq_flags, const char *devname,</div><div class='add'>+			void *dev_id)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq = irq_create_mapping(NULL, ist);</div><div class='add'>+</div><div class='add'>+	if (!irq)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return request_irq(irq, handler, irq_flags, devname, dev_id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ibmebus_request_irq);</div><div class='add'>+</div><div class='add'>+void ibmebus_free_irq(u32 ist, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq = irq_find_mapping(NULL, ist);</div><div class='add'>+</div><div class='add'>+	free_irq(irq, dev_id);</div><div class='add'>+	irq_dispose_mapping(irq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ibmebus_free_irq);</div><div class='add'>+</div><div class='add'>+static char *ibmebus_chomp(const char *in, size_t count)</div><div class='add'>+{</div><div class='add'>+	char *out = kmalloc(count + 1, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!out)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memcpy(out, in, count);</div><div class='add'>+	out[count] = '\0';</div><div class='add'>+	if (out[count - 1] == '\n')</div><div class='add'>+		out[count - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	return out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ibmebus_store_probe(struct bus_type *bus,</div><div class='add'>+				   const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dn = NULL;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	char *path;</div><div class='add'>+	ssize_t rc = 0;</div><div class='add'>+</div><div class='add'>+	path = ibmebus_chomp(buf, count);</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev = bus_find_device(&amp;ibmebus_bus_type, NULL, path,</div><div class='add'>+			      ibmebus_match_path);</div><div class='add'>+	if (dev) {</div><div class='add'>+		put_device(dev);</div><div class='add'>+		printk(KERN_WARNING "%s: %s has already been probed\n",</div><div class='add'>+		       __func__, path);</div><div class='add'>+		rc = -EEXIST;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((dn = of_find_node_by_path(path))) {</div><div class='add'>+		rc = ibmebus_create_device(dn);</div><div class='add'>+		of_node_put(dn);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_WARNING "%s: no such device node: %s\n",</div><div class='add'>+		       __func__, path);</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(path);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static BUS_ATTR(probe, S_IWUSR, NULL, ibmebus_store_probe);</div><div class='add'>+</div><div class='add'>+static ssize_t ibmebus_store_remove(struct bus_type *bus,</div><div class='add'>+				    const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+	char *path;</div><div class='add'>+</div><div class='add'>+	path = ibmebus_chomp(buf, count);</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if ((dev = bus_find_device(&amp;ibmebus_bus_type, NULL, path,</div><div class='add'>+				   ibmebus_match_path))) {</div><div class='add'>+		of_device_unregister(to_platform_device(dev));</div><div class='add'>+		put_device(dev);</div><div class='add'>+</div><div class='add'>+		kfree(path);</div><div class='add'>+		return count;</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_WARNING "%s: %s not on the bus\n",</div><div class='add'>+		       __func__, path);</div><div class='add'>+</div><div class='add'>+		kfree(path);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+static BUS_ATTR(remove, S_IWUSR, NULL, ibmebus_store_remove);</div><div class='add'>+</div><div class='add'>+static struct attribute *ibmbus_bus_attrs[] = {</div><div class='add'>+	&amp;bus_attr_probe.attr,</div><div class='add'>+	&amp;bus_attr_remove.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(ibmbus_bus);</div><div class='add'>+</div><div class='add'>+static int ibmebus_bus_bus_match(struct device *dev, struct device_driver *drv)</div><div class='add'>+{</div><div class='add'>+	const struct of_device_id *matches = drv-&gt;of_match_table;</div><div class='add'>+</div><div class='add'>+	if (!matches)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return of_match_device(matches, dev) != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ibmebus_bus_device_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int error = -ENODEV;</div><div class='add'>+	struct platform_driver *drv;</div><div class='add'>+	struct platform_device *of_dev;</div><div class='add'>+</div><div class='add'>+	drv = to_platform_driver(dev-&gt;driver);</div><div class='add'>+	of_dev = to_platform_device(dev);</div><div class='add'>+</div><div class='add'>+	if (!drv-&gt;probe)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	of_dev_get(of_dev);</div><div class='add'>+</div><div class='add'>+	if (of_driver_match_device(dev, dev-&gt;driver))</div><div class='add'>+		error = drv-&gt;probe(of_dev);</div><div class='add'>+	if (error)</div><div class='add'>+		of_dev_put(of_dev);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ibmebus_bus_device_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *of_dev = to_platform_device(dev);</div><div class='add'>+	struct platform_driver *drv = to_platform_driver(dev-&gt;driver);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;remove)</div><div class='add'>+		drv-&gt;remove(of_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ibmebus_bus_device_shutdown(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *of_dev = to_platform_device(dev);</div><div class='add'>+	struct platform_driver *drv = to_platform_driver(dev-&gt;driver);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;shutdown)</div><div class='add'>+		drv-&gt;shutdown(of_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ibmebus_bus_device_attrs</div><div class='add'>+ */</div><div class='add'>+static ssize_t devspec_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *ofdev;</div><div class='add'>+</div><div class='add'>+	ofdev = to_platform_device(dev);</div><div class='add'>+	return sprintf(buf, "%s\n", ofdev-&gt;dev.of_node-&gt;full_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t name_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *ofdev;</div><div class='add'>+</div><div class='add'>+	ofdev = to_platform_device(dev);</div><div class='add'>+	return sprintf(buf, "%s\n", ofdev-&gt;dev.of_node-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t modalias_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	ssize_t len = of_device_get_modalias(dev, buf, PAGE_SIZE - 2);</div><div class='add'>+	buf[len] = '\n';</div><div class='add'>+	buf[len+1] = 0;</div><div class='add'>+	return len+1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_attribute ibmebus_bus_device_attrs[] = {</div><div class='add'>+	__ATTR_RO(devspec),</div><div class='add'>+	__ATTR_RO(name),</div><div class='add'>+	__ATTR_RO(modalias),</div><div class='add'>+	__ATTR_NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bus_type ibmebus_bus_type = {</div><div class='add'>+	.name      = "ibmebus",</div><div class='add'>+	.uevent    = of_device_uevent_modalias,</div><div class='add'>+	.bus_groups = ibmbus_bus_groups,</div><div class='add'>+	.match     = ibmebus_bus_bus_match,</div><div class='add'>+	.probe     = ibmebus_bus_device_probe,</div><div class='add'>+	.remove    = ibmebus_bus_device_remove,</div><div class='add'>+	.shutdown  = ibmebus_bus_device_shutdown,</div><div class='add'>+	.dev_attrs = ibmebus_bus_device_attrs,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(ibmebus_bus_type);</div><div class='add'>+</div><div class='add'>+static int __init ibmebus_bus_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "IBM eBus Device Driver\n");</div><div class='add'>+</div><div class='add'>+	err = bus_register(&amp;ibmebus_bus_type);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "%s: failed to register IBM eBus.\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = device_register(&amp;ibmebus_bus_device);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_WARNING "%s: device_register returned %i\n",</div><div class='add'>+		       __func__, err);</div><div class='add'>+		bus_unregister(&amp;ibmebus_bus_type);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ibmebus_create_devices(ibmebus_matches);</div><div class='add'>+	if (err) {</div><div class='add'>+		device_unregister(&amp;ibmebus_bus_device);</div><div class='add'>+		bus_unregister(&amp;ibmebus_bus_type);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+postcore_initcall(ibmebus_bus_init);</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c<br/>index 0024e451bb36..4d757eaa46bf 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/iommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/iommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/iommu.c</a></div><div class='hunk'>@@ -1020,7 +1020,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)</div><div class='ctx'> 	/* check largest block * page size &gt; max memory hotplug addr */</div><div class='ctx'> 	max_addr = memory_hotplug_max();</div><div class='ctx'> 	if (query.largest_available_block &lt; (max_addr &gt;&gt; page_shift)) {</div><div class='del'>-		dev_dbg(&amp;dev-&gt;dev, "can't map partiton max 0x%llx with %u "</div><div class='add'>+		dev_dbg(&amp;dev-&gt;dev, "can't map partition max 0x%llx with %u "</div><div class='ctx'> 			  "%llu-sized pages\n", max_addr,  query.largest_available_block,</div><div class='ctx'> 			  1ULL &lt;&lt; page_shift);</div><div class='ctx'> 		goto out_failed;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c<br/>index aa35245d8d6d..251060cf1713 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/lpar.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/lpar.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/lpar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/lpar.c</a></div><div class='hunk'>@@ -27,6 +27,8 @@</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/jump_label.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/stop_machine.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -145,7 +147,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,</div><div class='ctx'> 			 hpte_group, vpn,  pa, rflags, vflags, psize);</div><div class='ctx'> </div><div class='ctx'> 	hpte_v = hpte_encode_v(vpn, psize, apsize, ssize) | vflags | HPTE_V_VALID;</div><div class='del'>-	hpte_r = hpte_encode_r(pa, psize, apsize, ssize) | rflags;</div><div class='add'>+	hpte_r = hpte_encode_r(pa, psize, apsize) | rflags;</div><div class='ctx'> </div><div class='ctx'> 	if (!(vflags &amp; HPTE_V_BOLTED))</div><div class='ctx'> 		pr_devel(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);</div><div class='hunk'>@@ -221,7 +223,7 @@ static long pSeries_lpar_hpte_remove(unsigned long hpte_group)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pSeries_lpar_hptab_clear(void)</div><div class='add'>+static void manual_hpte_clear_all(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long size_bytes = 1UL &lt;&lt; ppc64_pft_size;</div><div class='ctx'> 	unsigned long hpte_count = size_bytes &gt;&gt; 4;</div><div class='hunk'>@@ -249,6 +251,26 @@ static void pSeries_lpar_hptab_clear(void)</div><div class='ctx'> 					&amp;(ptes[j].pteh), &amp;(ptes[j].ptel));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hcall_hpte_clear_all(void)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		rc = plpar_hcall_norets(H_CLEAR_HPT);</div><div class='add'>+	} while (rc == H_CONTINUE);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pseries_hpte_clear_all(void)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hcall_hpte_clear_all();</div><div class='add'>+	if (rc != H_SUCCESS)</div><div class='add'>+		manual_hpte_clear_all();</div><div class='ctx'> </div><div class='ctx'> #ifdef __LITTLE_ENDIAN__</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -589,6 +611,135 @@ static int __init disable_bulk_remove(char *str)</div><div class='ctx'> </div><div class='ctx'> __setup("bulk_remove=", disable_bulk_remove);</div><div class='ctx'> </div><div class='add'>+#define HPT_RESIZE_TIMEOUT	10000 /* ms */</div><div class='add'>+</div><div class='add'>+struct hpt_resize_state {</div><div class='add'>+	unsigned long shift;</div><div class='add'>+	int commit_rc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pseries_lpar_resize_hpt_commit(void *data)</div><div class='add'>+{</div><div class='add'>+	struct hpt_resize_state *state = data;</div><div class='add'>+</div><div class='add'>+	state-&gt;commit_rc = plpar_resize_hpt_commit(0, state-&gt;shift);</div><div class='add'>+	if (state-&gt;commit_rc != H_SUCCESS)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* Hypervisor has transitioned the HTAB, update our globals */</div><div class='add'>+	ppc64_pft_size = state-&gt;shift;</div><div class='add'>+	htab_size_bytes = 1UL &lt;&lt; ppc64_pft_size;</div><div class='add'>+	htab_hash_mask = (htab_size_bytes &gt;&gt; 7) - 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be called in user context */</div><div class='add'>+static int pseries_lpar_resize_hpt(unsigned long shift)</div><div class='add'>+{</div><div class='add'>+	struct hpt_resize_state state = {</div><div class='add'>+		.shift = shift,</div><div class='add'>+		.commit_rc = H_FUNCTION,</div><div class='add'>+	};</div><div class='add'>+	unsigned int delay, total_delay = 0;</div><div class='add'>+	int rc;</div><div class='add'>+	ktime_t t0, t1, t2;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (!firmware_has_feature(FW_FEATURE_HPT_RESIZE))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "lpar: Attempting to resize HPT to shift %lu\n",</div><div class='add'>+	       shift);</div><div class='add'>+</div><div class='add'>+	t0 = ktime_get();</div><div class='add'>+</div><div class='add'>+	rc = plpar_resize_hpt_prepare(0, shift);</div><div class='add'>+	while (H_IS_LONG_BUSY(rc)) {</div><div class='add'>+		delay = get_longbusy_msecs(rc);</div><div class='add'>+		total_delay += delay;</div><div class='add'>+		if (total_delay &gt; HPT_RESIZE_TIMEOUT) {</div><div class='add'>+			/* prepare with shift==0 cancels an in-progress resize */</div><div class='add'>+			rc = plpar_resize_hpt_prepare(0, 0);</div><div class='add'>+			if (rc != H_SUCCESS)</div><div class='add'>+				printk(KERN_WARNING</div><div class='add'>+				       "lpar: Unexpected error %d cancelling timed out HPT resize\n",</div><div class='add'>+				       rc);</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+		msleep(delay);</div><div class='add'>+		rc = plpar_resize_hpt_prepare(0, shift);</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (rc) {</div><div class='add'>+	case H_SUCCESS:</div><div class='add'>+		/* Continue on */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case H_PARAMETER:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case H_RESOURCE:</div><div class='add'>+		return -EPERM;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "lpar: Unexpected error %d from H_RESIZE_HPT_PREPARE\n",</div><div class='add'>+		       rc);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	t1 = ktime_get();</div><div class='add'>+</div><div class='add'>+	rc = stop_machine(pseries_lpar_resize_hpt_commit, &amp;state, NULL);</div><div class='add'>+</div><div class='add'>+	t2 = ktime_get();</div><div class='add'>+</div><div class='add'>+	if (rc != 0) {</div><div class='add'>+		switch (state.commit_rc) {</div><div class='add'>+		case H_PTEG_FULL:</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "lpar: Hash collision while resizing HPT\n");</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "lpar: Unexpected error %d from H_RESIZE_HPT_COMMIT\n",</div><div class='add'>+			       state.commit_rc);</div><div class='add'>+			return -EIO;</div><div class='add'>+		};</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO</div><div class='add'>+	       "lpar: HPT resize to shift %lu complete (%lld ms / %lld ms)\n",</div><div class='add'>+	       shift, (long long) ktime_ms_delta(t1, t0),</div><div class='add'>+	       (long long) ktime_ms_delta(t2, t1));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Actually only used for radix, so far */</div><div class='add'>+static int pseries_lpar_register_process_table(unsigned long base,</div><div class='add'>+			unsigned long page_size, unsigned long table_size)</div><div class='add'>+{</div><div class='add'>+	long rc;</div><div class='add'>+	unsigned long flags = PROC_TABLE_NEW;</div><div class='add'>+</div><div class='add'>+	if (radix_enabled())</div><div class='add'>+		flags |= PROC_TABLE_RADIX | PROC_TABLE_GTSE;</div><div class='add'>+	for (;;) {</div><div class='add'>+		rc = plpar_hcall_norets(H_REGISTER_PROC_TBL, flags, base,</div><div class='add'>+					page_size, table_size);</div><div class='add'>+		if (!H_IS_LONG_BUSY(rc))</div><div class='add'>+			break;</div><div class='add'>+		mdelay(get_longbusy_msecs(rc));</div><div class='add'>+	}</div><div class='add'>+	if (rc != H_SUCCESS) {</div><div class='add'>+		pr_err("Failed to register process table (rc=%ld)\n", rc);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init hpte_init_pseries(void)</div><div class='ctx'> {</div><div class='ctx'> 	mmu_hash_ops.hpte_invalidate	 = pSeries_lpar_hpte_invalidate;</div><div class='hunk'>@@ -598,8 +749,15 @@ void __init hpte_init_pseries(void)</div><div class='ctx'> 	mmu_hash_ops.hpte_remove	 = pSeries_lpar_hpte_remove;</div><div class='ctx'> 	mmu_hash_ops.hpte_removebolted   = pSeries_lpar_hpte_removebolted;</div><div class='ctx'> 	mmu_hash_ops.flush_hash_range	 = pSeries_lpar_flush_hash_range;</div><div class='del'>-	mmu_hash_ops.hpte_clear_all      = pSeries_lpar_hptab_clear;</div><div class='add'>+	mmu_hash_ops.hpte_clear_all      = pseries_hpte_clear_all;</div><div class='ctx'> 	mmu_hash_ops.hugepage_invalidate = pSeries_lpar_hugepage_invalidate;</div><div class='add'>+	mmu_hash_ops.resize_hpt		 = pseries_lpar_resize_hpt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radix_init_pseries(void)</div><div class='add'>+{</div><div class='add'>+	pr_info("Using radix MMU under hypervisor\n");</div><div class='add'>+	register_process_table = pseries_lpar_register_process_table;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_SMLPAR</div><div class='hunk'>@@ -661,9 +819,10 @@ EXPORT_SYMBOL(arch_free_page);</div><div class='ctx'> #ifdef HAVE_JUMP_LABEL</div><div class='ctx'> struct static_key hcall_tracepoint_key = STATIC_KEY_INIT;</div><div class='ctx'> </div><div class='del'>-void hcall_tracepoint_regfunc(void)</div><div class='add'>+int hcall_tracepoint_regfunc(void)</div><div class='ctx'> {</div><div class='ctx'> 	static_key_slow_inc(&amp;hcall_tracepoint_key);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hcall_tracepoint_unregfunc(void)</div><div class='hunk'>@@ -680,9 +839,10 @@ void hcall_tracepoint_unregfunc(void)</div><div class='ctx'> /* NB: reg/unreg are called while guarded with the tracepoints_mutex */</div><div class='ctx'> extern long hcall_tracepoint_refcount;</div><div class='ctx'> </div><div class='del'>-void hcall_tracepoint_regfunc(void)</div><div class='add'>+int hcall_tracepoint_regfunc(void)</div><div class='ctx'> {</div><div class='ctx'> 	hcall_tracepoint_refcount++;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hcall_tracepoint_unregfunc(void)</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c<br/>index afa05a2cb702..779fc2a1c8f7 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/lparcfg.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/lparcfg.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/lparcfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/lparcfg.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/lppaca.h&gt;</div><div class='ctx'> #include &lt;asm/hvcall.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "pseries.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This isn't a module but we expose that to userspace</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c<br/>index a560a98bcf3b..5a0c7ba429ce 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/mobility.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/mobility.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/mobility.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/mobility.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@ struct update_props_workarea {</div><div class='ctx'> #define ADD_DT_NODE	0x03000000</div><div class='ctx'> </div><div class='ctx'> #define MIGRATION_SCOPE	(1)</div><div class='add'>+#define PRRN_SCOPE -2</div><div class='ctx'> </div><div class='ctx'> static int mobility_rtas_call(int token, char *buf, s32 scope)</div><div class='ctx'> {</div><div class='hunk'>@@ -236,6 +237,35 @@ static int add_dt_node(__be32 parent_phandle, __be32 drc_index)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void prrn_update_node(__be32 phandle)</div><div class='add'>+{</div><div class='add'>+	struct pseries_hp_errorlog *hp_elog;</div><div class='add'>+	struct device_node *dn;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If a node is found from a the given phandle, the phandle does not</div><div class='add'>+	 * represent the drc index of an LMB and we can ignore.</div><div class='add'>+	 */</div><div class='add'>+	dn = of_find_node_by_phandle(be32_to_cpu(phandle));</div><div class='add'>+	if (dn) {</div><div class='add'>+		of_node_put(dn);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hp_elog = kzalloc(sizeof(*hp_elog), GFP_KERNEL);</div><div class='add'>+	if(!hp_elog)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hp_elog-&gt;resource = PSERIES_HP_ELOG_RESOURCE_MEM;</div><div class='add'>+	hp_elog-&gt;action = PSERIES_HP_ELOG_ACTION_READD;</div><div class='add'>+	hp_elog-&gt;id_type = PSERIES_HP_ELOG_ID_DRC_INDEX;</div><div class='add'>+	hp_elog-&gt;_drc_u.drc_index = phandle;</div><div class='add'>+</div><div class='add'>+	queue_hotplug_event(hp_elog, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	kfree(hp_elog);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int pseries_devicetree_update(s32 scope)</div><div class='ctx'> {</div><div class='ctx'> 	char *rtas_buf;</div><div class='hunk'>@@ -274,6 +304,10 @@ int pseries_devicetree_update(s32 scope)</div><div class='ctx'> 					break;</div><div class='ctx'> 				case UPDATE_DT_NODE:</div><div class='ctx'> 					update_dt_node(phandle, scope);</div><div class='add'>+</div><div class='add'>+					if (scope == PRRN_SCOPE)</div><div class='add'>+						prrn_update_node(phandle);</div><div class='add'>+</div><div class='ctx'> 					break;</div><div class='ctx'> 				case ADD_DT_NODE:</div><div class='ctx'> 					drc_index = *data++;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c<br/>index 79aef8c1c5b3..69cedc1b3b8a 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/nvram.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/nvram.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/nvram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/nvram.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/nvram.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h<br/>index b1be7b713fe6..1361a9db534b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/pseries.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/pseries.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/pseries.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/pseries.h</a></div><div class='hunk'>@@ -79,4 +79,23 @@ extern struct pci_controller_ops pseries_pci_controller_ops;</div><div class='ctx'> </div><div class='ctx'> unsigned long pseries_memory_block_size(void);</div><div class='ctx'> </div><div class='add'>+extern int CMO_PrPSP;</div><div class='add'>+extern int CMO_SecPSP;</div><div class='add'>+extern unsigned long CMO_PageSize;</div><div class='add'>+</div><div class='add'>+static inline int cmo_get_primary_psp(void)</div><div class='add'>+{</div><div class='add'>+	return CMO_PrPSP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cmo_get_secondary_psp(void)</div><div class='add'>+{</div><div class='add'>+	return CMO_SecPSP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long cmo_get_page_size(void)</div><div class='add'>+{</div><div class='add'>+	return CMO_PageSize;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _PSERIES_PSERIES_H */</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c<br/>index cc66c49f07aa..e5bf1e84047f 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/reconfig.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/reconfig.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/reconfig.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/reconfig.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "of_helpers.h"</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c<br/>index 7d28cabf1206..c47585a78b69 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/scanlog.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/scanlog.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/scanlog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/scanlog.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c<br/>index 97aa3f332f24..b4d362ed03a1 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/platforms/pseries/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/setup.c</a></div><div class='hunk'>@@ -66,6 +66,7 @@</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/plpar_wrappers.h&gt;</div><div class='ctx'> #include &lt;asm/kexec.h&gt;</div><div class='add'>+#include &lt;asm/isa-bridge.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pseries.h"</div><div class='ctx'> </div><div class='hunk'>@@ -367,7 +368,7 @@ void pseries_disable_reloc_on_exc(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pseries_disable_reloc_on_exc);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> static void pSeries_machine_kexec(struct kimage *image)</div><div class='ctx'> {</div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_SET_MODE))</div><div class='hunk'>@@ -725,7 +726,7 @@ define_machine(pseries) {</div><div class='ctx'> 	.progress		= rtas_progress,</div><div class='ctx'> 	.system_reset_exception = pSeries_system_reset_exception,</div><div class='ctx'> 	.machine_check_exception = pSeries_machine_check_exception,</div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='add'>+#ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> 	.machine_kexec          = pSeries_machine_kexec,</div><div class='ctx'> 	.kexec_cpu_down         = pseries_kexec_cpu_down,</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/platforms/pseries/vio.c<br/>index b3813ddb2fb4..720493932486 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/kernel/vio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/kernel/vio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/platforms/pseries/vio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/platforms/pseries/vio.c</a></div><div class='hunk'>@@ -615,7 +615,7 @@ static u64 vio_dma_get_required_mask(struct device *dev)</div><div class='ctx'>         return dma_iommu_ops.get_required_mask(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops vio_dma_mapping_ops = {</div><div class='add'>+static const struct dma_map_ops vio_dma_mapping_ops = {</div><div class='ctx'> 	.alloc             = vio_dma_iommu_alloc_coherent,</div><div class='ctx'> 	.free              = vio_dma_iommu_free_coherent,</div><div class='ctx'> 	.mmap		   = dma_direct_mmap_coherent,</div><div class='hunk'>@@ -1648,6 +1648,9 @@ static struct vio_dev *vio_find_name(const char *name)</div><div class='ctx'> /**</div><div class='ctx'>  * vio_find_node - find an already-registered vio_dev</div><div class='ctx'>  * @vnode: device_node of the virtual device we're looking for</div><div class='add'>+ *</div><div class='add'>+ * Takes a reference to the embedded struct device which needs to be dropped</div><div class='add'>+ * after use.</div><div class='ctx'>  */</div><div class='ctx'> struct vio_dev *vio_find_node(struct device_node *vnode)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/purgatory/.gitignore b/arch/powerpc/purgatory/.gitignore<br/>new file mode 100644<br/>index 000000000000..e9e66f178a6d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/purgatory/.gitignore?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/purgatory/.gitignore</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+kexec-purgatory.c</div><div class='add'>+purgatory.ro</div><div class='head'>diff --git a/arch/powerpc/purgatory/Makefile b/arch/powerpc/purgatory/Makefile<br/>new file mode 100644<br/>index 000000000000..ac8793c13348<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/purgatory/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/purgatory/Makefile</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+targets += trampoline.o purgatory.ro kexec-purgatory.c</div><div class='add'>+</div><div class='add'>+LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined</div><div class='add'>+</div><div class='add'>+$(obj)/purgatory.ro: $(obj)/trampoline.o FORCE</div><div class='add'>+		$(call if_changed,ld)</div><div class='add'>+</div><div class='add'>+CMD_BIN2C = $(objtree)/scripts/basic/bin2c</div><div class='add'>+quiet_cmd_bin2c = BIN2C   $@</div><div class='add'>+      cmd_bin2c = $(CMD_BIN2C) kexec_purgatory &lt; $&lt; &gt; $@</div><div class='add'>+</div><div class='add'>+$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE</div><div class='add'>+	$(call if_changed,bin2c)</div><div class='add'>+</div><div class='add'>+obj-y	+= kexec-purgatory.o</div><div class='head'>diff --git a/arch/powerpc/purgatory/trampoline.S b/arch/powerpc/purgatory/trampoline.S<br/>new file mode 100644<br/>index 000000000000..f9760ccf4032<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/purgatory/trampoline.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/purgatory/trampoline.S</a></div><div class='hunk'>@@ -0,0 +1,128 @@</div><div class='add'>+/*</div><div class='add'>+ * kexec trampoline</div><div class='add'>+ *</div><div class='add'>+ * Based on code taken from kexec-tools and kexec-lite.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2004 - 2005, Milton D Miller II, IBM Corporation</div><div class='add'>+ * Copyright (C) 2006, Mohan Kumar M, IBM Corporation</div><div class='add'>+ * Copyright (C) 2013, Anton Blanchard, IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it under</div><div class='add'>+ * the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation (version 2 of the License).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if defined(__LITTLE_ENDIAN__)</div><div class='add'>+#define STWX_BE	stwbrx</div><div class='add'>+#define LWZX_BE	lwbrx</div><div class='add'>+#elif defined(__BIG_ENDIAN__)</div><div class='add'>+#define STWX_BE	stwx</div><div class='add'>+#define LWZX_BE	lwzx</div><div class='add'>+#else</div><div class='add'>+#error no endianness defined!</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	.machine ppc64</div><div class='add'>+	.balign 256</div><div class='add'>+	.globl purgatory_start</div><div class='add'>+purgatory_start:</div><div class='add'>+	b	master</div><div class='add'>+</div><div class='add'>+	/* ABI: possible run_at_load flag at 0x5c */</div><div class='add'>+	.org purgatory_start + 0x5c</div><div class='add'>+	.globl run_at_load</div><div class='add'>+run_at_load:</div><div class='add'>+	.long 0</div><div class='add'>+	.size run_at_load, . - run_at_load</div><div class='add'>+</div><div class='add'>+	/* ABI: slaves start at 60 with r3=phys */</div><div class='add'>+	.org purgatory_start + 0x60</div><div class='add'>+slave:</div><div class='add'>+	b .</div><div class='add'>+	/* ABI: end of copied region */</div><div class='add'>+	.org purgatory_start + 0x100</div><div class='add'>+	.size purgatory_start, . - purgatory_start</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The above 0x100 bytes at purgatory_start are replaced with the</div><div class='add'>+ * code from the kernel (or next stage) by setup_purgatory().</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+master:</div><div class='add'>+	or	%r1,%r1,%r1	/* low priority to let other threads catchup */</div><div class='add'>+	isync</div><div class='add'>+	mr	%r17,%r3	/* save cpu id to r17 */</div><div class='add'>+	mr	%r15,%r4	/* save physical address in reg15 */</div><div class='add'>+</div><div class='add'>+	or	%r3,%r3,%r3	/* ok now to high priority, lets boot */</div><div class='add'>+	lis	%r6,0x1</div><div class='add'>+	mtctr	%r6		/* delay a bit for slaves to catch up */</div><div class='add'>+	bdnz	.		/* before we overwrite 0-100 again */</div><div class='add'>+</div><div class='add'>+	bl	0f		/* Work out where we're running */</div><div class='add'>+0:	mflr	%r18</div><div class='add'>+</div><div class='add'>+	/* load device-tree address */</div><div class='add'>+	ld	%r3, (dt_offset - 0b)(%r18)</div><div class='add'>+	mr	%r16,%r3	/* save dt address in reg16 */</div><div class='add'>+	li	%r4,20</div><div class='add'>+	LWZX_BE	%r6,%r3,%r4	/* fetch __be32 version number at byte 20 */</div><div class='add'>+	cmpwi	%r0,%r6,2	/* v2 or later? */</div><div class='add'>+	blt	1f</div><div class='add'>+	li	%r4,28</div><div class='add'>+	STWX_BE	%r17,%r3,%r4	/* Store my cpu as __be32 at byte 28 */</div><div class='add'>+1:</div><div class='add'>+	/* load the kernel address */</div><div class='add'>+	ld	%r4,(kernel - 0b)(%r18)</div><div class='add'>+</div><div class='add'>+	/* load the run_at_load flag */</div><div class='add'>+	/* possibly patched by kexec */</div><div class='add'>+	ld	%r6,(run_at_load - 0b)(%r18)</div><div class='add'>+	/* and patch it into the kernel */</div><div class='add'>+	stw	%r6,(0x5c)(%r4)</div><div class='add'>+</div><div class='add'>+	mr	%r3,%r16	/* restore dt address */</div><div class='add'>+</div><div class='add'>+	li	%r5,0		/* r5 will be 0 for kernel */</div><div class='add'>+</div><div class='add'>+	mfmsr	%r11</div><div class='add'>+	andi.	%r10,%r11,1	/* test MSR_LE */</div><div class='add'>+	bne	.Little_endian</div><div class='add'>+</div><div class='add'>+	mtctr	%r4		/* prepare branch to */</div><div class='add'>+	bctr			/* start kernel */</div><div class='add'>+</div><div class='add'>+.Little_endian:</div><div class='add'>+	mtsrr0	%r4		/* prepare branch to */</div><div class='add'>+</div><div class='add'>+	clrrdi	%r11,%r11,1	/* clear MSR_LE */</div><div class='add'>+	mtsrr1	%r11</div><div class='add'>+</div><div class='add'>+	rfid			/* update MSR and start kernel */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	.balign 8</div><div class='add'>+	.globl kernel</div><div class='add'>+kernel:</div><div class='add'>+	.llong  0x0</div><div class='add'>+	.size kernel, . - kernel</div><div class='add'>+</div><div class='add'>+	.balign 8</div><div class='add'>+	.globl dt_offset</div><div class='add'>+dt_offset:</div><div class='add'>+	.llong  0x0</div><div class='add'>+	.size dt_offset, . - dt_offset</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	.data</div><div class='add'>+	.balign 8</div><div class='add'>+.globl sha256_digest</div><div class='add'>+sha256_digest:</div><div class='add'>+	.skip	32</div><div class='add'>+	.size sha256_digest, . - sha256_digest</div><div class='add'>+</div><div class='add'>+	.balign 8</div><div class='add'>+.globl sha_regions</div><div class='add'>+sha_regions:</div><div class='add'>+	.skip	8 * 2 * 16</div><div class='add'>+	.size sha_regions, . - sha_regions</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c<br/>index 424b67fdb57f..5340a483cf55 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/sysdev/fsl_lbc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/sysdev/fsl_lbc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/sysdev/fsl_lbc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/fsl_lbc.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/fsl_lbc.h&gt;</div><div class='ctx'> </div><div class='del'>-static spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);</div><div class='add'>+static DEFINE_SPINLOCK(fsl_lbc_lock);</div><div class='ctx'> struct fsl_lbc_ctrl *fsl_lbc_ctrl_dev;</div><div class='ctx'> EXPORT_SYMBOL(fsl_lbc_ctrl_dev);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_pmc.c b/arch/powerpc/sysdev/fsl_pmc.c<br/>index 1d6fd7c59fe9..232225e7f863 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/sysdev/fsl_pmc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/sysdev/fsl_pmc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/sysdev/fsl_pmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/fsl_pmc.c</a></div><div class='hunk'>@@ -85,8 +85,4 @@ static struct platform_driver pmc_driver = {</div><div class='ctx'> 	.probe = pmc_probe,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pmc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pmc_driver);</div><div class='del'>-}</div><div class='del'>-device_initcall(pmc_init);</div><div class='add'>+builtin_platform_driver(pmc_driver);</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c<br/>index 3cc7cace194a..1c41c51f22cb 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/sysdev/fsl_rio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/sysdev/fsl_rio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/sysdev/fsl_rio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/fsl_rio.c</a></div><div class='hunk'>@@ -80,10 +80,8 @@</div><div class='ctx'> 		"3:	li %1,-1\n"			\</div><div class='ctx'> 		"	li %0,%3\n"			\</div><div class='ctx'> 		"	b 2b\n"				\</div><div class='del'>-		".section __ex_table,\"a\"\n"		\</div><div class='del'>-			PPC_LONG_ALIGN "\n"		\</div><div class='del'>-			PPC_LONG "1b,3b\n"		\</div><div class='del'>-		".text"					\</div><div class='add'>+		".previous\n"				\</div><div class='add'>+		EX_TABLE(1b, 3b)			\</div><div class='ctx'> 		: "=r" (err), "=r" (x)			\</div><div class='ctx'> 		: "b" (addr), "i" (-EFAULT), "0" (err))</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +111,7 @@ int fsl_rio_mcheck_exception(struct pt_regs *regs)</div><div class='ctx'> 			out_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR),</div><div class='ctx'> 				 0);</div><div class='ctx'> 			regs-&gt;msr |= MSR_RI;</div><div class='del'>-			regs-&gt;nip = entry-&gt;fixup;</div><div class='add'>+			regs-&gt;nip = extable_fixup(entry);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c<br/>index d93056eedcb0..19101f9cfcfc 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/sysdev/fsl_soc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/sysdev/fsl_soc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/sysdev/fsl_soc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/fsl_soc.c</a></div><div class='hunk'>@@ -77,13 +77,10 @@ phys_addr_t get_immrbase(void)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(get_immrbase);</div><div class='ctx'> </div><div class='del'>-static u32 sysfreq = -1;</div><div class='del'>-</div><div class='ctx'> u32 fsl_get_sys_freq(void)</div><div class='ctx'> {</div><div class='add'>+	static u32 sysfreq = -1;</div><div class='ctx'> 	struct device_node *soc;</div><div class='del'>-	const u32 *prop;</div><div class='del'>-	int size;</div><div class='ctx'> </div><div class='ctx'> 	if (sysfreq != -1)</div><div class='ctx'> 		return sysfreq;</div><div class='hunk'>@@ -92,12 +89,9 @@ u32 fsl_get_sys_freq(void)</div><div class='ctx'> 	if (!soc)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	prop = of_get_property(soc, "clock-frequency", &amp;size);</div><div class='del'>-	if (!prop || size != sizeof(*prop) || *prop == 0)</div><div class='del'>-		prop = of_get_property(soc, "bus-frequency", &amp;size);</div><div class='del'>-</div><div class='del'>-	if (prop &amp;&amp; size == sizeof(*prop))</div><div class='del'>-		sysfreq = *prop;</div><div class='add'>+	of_property_read_u32(soc, "clock-frequency", &amp;sysfreq);</div><div class='add'>+	if (sysfreq == -1 || !sysfreq)</div><div class='add'>+		of_property_read_u32(soc, "bus-frequency", &amp;sysfreq);</div><div class='ctx'> </div><div class='ctx'> 	of_node_put(soc);</div><div class='ctx'> 	return sysfreq;</div><div class='hunk'>@@ -106,23 +100,17 @@ EXPORT_SYMBOL(fsl_get_sys_freq);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)</div><div class='ctx'> </div><div class='del'>-static u32 brgfreq = -1;</div><div class='del'>-</div><div class='ctx'> u32 get_brgfreq(void)</div><div class='ctx'> {</div><div class='add'>+	static u32 brgfreq = -1;</div><div class='ctx'> 	struct device_node *node;</div><div class='del'>-	const unsigned int *prop;</div><div class='del'>-	int size;</div><div class='ctx'> </div><div class='ctx'> 	if (brgfreq != -1)</div><div class='ctx'> 		return brgfreq;</div><div class='ctx'> </div><div class='ctx'> 	node = of_find_compatible_node(NULL, NULL, "fsl,cpm-brg");</div><div class='ctx'> 	if (node) {</div><div class='del'>-		prop = of_get_property(node, "clock-frequency", &amp;size);</div><div class='del'>-		if (prop &amp;&amp; size == 4)</div><div class='del'>-			brgfreq = *prop;</div><div class='del'>-</div><div class='add'>+		of_property_read_u32(node, "clock-frequency", &amp;brgfreq);</div><div class='ctx'> 		of_node_put(node);</div><div class='ctx'> 		return brgfreq;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -135,15 +123,11 @@ u32 get_brgfreq(void)</div><div class='ctx'> 		node = of_find_node_by_type(NULL, "qe");</div><div class='ctx'> </div><div class='ctx'> 	if (node) {</div><div class='del'>-		prop = of_get_property(node, "brg-frequency", &amp;size);</div><div class='del'>-		if (prop &amp;&amp; size == 4)</div><div class='del'>-			brgfreq = *prop;</div><div class='del'>-</div><div class='del'>-		if (brgfreq == -1 || brgfreq == 0) {</div><div class='del'>-			prop = of_get_property(node, "bus-frequency", &amp;size);</div><div class='del'>-			if (prop &amp;&amp; size == 4)</div><div class='del'>-				brgfreq = *prop / 2;</div><div class='del'>-		}</div><div class='add'>+		of_property_read_u32(node, "brg-frequency", &amp;brgfreq);</div><div class='add'>+		if (brgfreq == -1 || !brgfreq)</div><div class='add'>+			if (!of_property_read_u32(node, "bus-frequency",</div><div class='add'>+						  &amp;brgfreq))</div><div class='add'>+				brgfreq /= 2;</div><div class='ctx'> 		of_node_put(node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -152,10 +136,9 @@ u32 get_brgfreq(void)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(get_brgfreq);</div><div class='ctx'> </div><div class='del'>-static u32 fs_baudrate = -1;</div><div class='del'>-</div><div class='ctx'> u32 get_baudrate(void)</div><div class='ctx'> {</div><div class='add'>+	static u32 fs_baudrate = -1;</div><div class='ctx'> 	struct device_node *node;</div><div class='ctx'> </div><div class='ctx'> 	if (fs_baudrate != -1)</div><div class='hunk'>@@ -163,12 +146,7 @@ u32 get_baudrate(void)</div><div class='ctx'> </div><div class='ctx'> 	node = of_find_node_by_type(NULL, "serial");</div><div class='ctx'> 	if (node) {</div><div class='del'>-		int size;</div><div class='del'>-		const unsigned int *prop = of_get_property(node,</div><div class='del'>-				"current-speed", &amp;size);</div><div class='del'>-</div><div class='del'>-		if (prop)</div><div class='del'>-			fs_baudrate = *prop;</div><div class='add'>+		of_property_read_u32(node, "current-speed", &amp;fs_baudrate);</div><div class='ctx'> 		of_node_put(node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/sysdev/scom.c b/arch/powerpc/sysdev/scom.c<br/>index 6f5a8d177c42..d0e9f178a324 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/sysdev/scom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/sysdev/scom.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/sysdev/scom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/scom.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/scom.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> const struct scom_controller *scom_controller;</div><div class='ctx'> EXPORT_SYMBOL_GPL(scom_controller);</div><div class='head'>diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c<br/>index 57c971b7839c..5692dd569b9b 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/sysdev/tsi108_pci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/sysdev/tsi108_pci.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/sysdev/tsi108_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/tsi108_pci.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #include &lt;asm/tsi108.h&gt;</div><div class='hunk'>@@ -137,10 +137,8 @@ void tsi108_clear_pci_error(u32 pci_cfg_base)</div><div class='ctx'> 		".section .fixup,\"ax\"\n"		\</div><div class='ctx'> 		"3:	li %0,-1\n"			\</div><div class='ctx'> 		"	b 2b\n"				\</div><div class='del'>-		".section __ex_table,\"a\"\n"		\</div><div class='del'>-		"	.align 2\n"			\</div><div class='del'>-		"	.long 1b,3b\n"			\</div><div class='del'>-		".text"					\</div><div class='add'>+		".previous\n"				\</div><div class='add'>+		EX_TABLE(1b, 3b)			\</div><div class='ctx'> 		: "=r"(x) : "r"(addr))</div><div class='ctx'> </div><div class='ctx'> int</div><div class='head'>diff --git a/arch/powerpc/sysdev/xics/icp-opal.c b/arch/powerpc/sysdev/xics/icp-opal.c<br/>index d38e86fd5720..f9670eabfcfa 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/sysdev/xics/icp-opal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/sysdev/xics/icp-opal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/sysdev/xics/icp-opal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/xics/icp-opal.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;asm/xics.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/opal.h&gt;</div><div class='add'>+#include &lt;asm/kvm_ppc.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void icp_opal_teardown_cpu(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -39,7 +40,26 @@ static void icp_opal_flush_ipi(void)</div><div class='ctx'> 	 * Should we be flagging idle loop instead?</div><div class='ctx'> 	 * Or creating some task to be scheduled?</div><div class='ctx'> 	 */</div><div class='del'>-	opal_int_eoi((0x00 &lt;&lt; 24) | XICS_IPI);</div><div class='add'>+	if (opal_int_eoi((0x00 &lt;&lt; 24) | XICS_IPI) &gt; 0)</div><div class='add'>+		force_external_irq_replay();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int icp_opal_get_xirr(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int kvm_xirr;</div><div class='add'>+	__be32 hw_xirr;</div><div class='add'>+	int64_t rc;</div><div class='add'>+</div><div class='add'>+	/* Handle an interrupt latched by KVM first */</div><div class='add'>+	kvm_xirr = kvmppc_get_xics_latch();</div><div class='add'>+	if (kvm_xirr)</div><div class='add'>+		return kvm_xirr;</div><div class='add'>+</div><div class='add'>+	/* Then ask OPAL */</div><div class='add'>+	rc = opal_int_get_xirr(&amp;hw_xirr, false);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+	return be32_to_cpu(hw_xirr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int icp_opal_get_irq(void)</div><div class='hunk'>@@ -47,12 +67,8 @@ static unsigned int icp_opal_get_irq(void)</div><div class='ctx'> 	unsigned int xirr;</div><div class='ctx'> 	unsigned int vec;</div><div class='ctx'> 	unsigned int irq;</div><div class='del'>-	int64_t rc;</div><div class='ctx'> </div><div class='del'>-	rc = opal_int_get_xirr(&amp;xirr, false);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-	xirr = be32_to_cpu(xirr);</div><div class='add'>+	xirr = icp_opal_get_xirr();</div><div class='ctx'> 	vec = xirr &amp; 0x00ffffff;</div><div class='ctx'> 	if (vec == XICS_IRQ_SPURIOUS)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -67,7 +83,8 @@ static unsigned int icp_opal_get_irq(void)</div><div class='ctx'> 	xics_mask_unknown_vec(vec);</div><div class='ctx'> </div><div class='ctx'> 	/* We might learn about it later, so EOI it */</div><div class='del'>-	opal_int_eoi(xirr);</div><div class='add'>+	if (opal_int_eoi(xirr) &gt; 0)</div><div class='add'>+		force_external_irq_replay();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -103,18 +120,49 @@ static void icp_opal_cause_ipi(int cpu, unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	int hw_cpu = get_hard_smp_processor_id(cpu);</div><div class='ctx'> </div><div class='add'>+	kvmppc_set_host_ipi(cpu, 1);</div><div class='ctx'> 	opal_int_set_mfrr(hw_cpu, IPI_PRIORITY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t icp_opal_ipi_action(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	int hw_cpu = hard_smp_processor_id();</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='del'>-	opal_int_set_mfrr(hw_cpu, 0xff);</div><div class='add'>+	kvmppc_set_host_ipi(cpu, 0);</div><div class='add'>+	opal_int_set_mfrr(get_hard_smp_processor_id(cpu), 0xff);</div><div class='ctx'> </div><div class='ctx'> 	return smp_ipi_demux();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Called when an interrupt is received on an off-line CPU to</div><div class='add'>+ * clear the interrupt, so that the CPU can go back to nap mode.</div><div class='add'>+ */</div><div class='add'>+void icp_opal_flush_interrupt(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int xirr;</div><div class='add'>+	unsigned int vec;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		xirr = icp_opal_get_xirr();</div><div class='add'>+		vec = xirr &amp; 0x00ffffff;</div><div class='add'>+		if (vec == XICS_IRQ_SPURIOUS)</div><div class='add'>+			break;</div><div class='add'>+		if (vec == XICS_IPI) {</div><div class='add'>+			/* Clear pending IPI */</div><div class='add'>+			int cpu = smp_processor_id();</div><div class='add'>+			kvmppc_set_host_ipi(cpu, 0);</div><div class='add'>+			opal_int_set_mfrr(get_hard_smp_processor_id(cpu), 0xff);</div><div class='add'>+		} else {</div><div class='add'>+			pr_err("XICS: hw interrupt 0x%x to offline cpu, "</div><div class='add'>+			       "disabling\n", vec);</div><div class='add'>+			xics_mask_unknown_vec(vec);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* EOI the interrupt */</div><div class='add'>+	} while (opal_int_eoi(xirr) &gt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='ctx'> static const struct icp_ops icp_opal_ops = {</div><div class='head'>diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c<br/>index 0f52d7955796..4a86dcff3fcd 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/sysdev/xilinx_intc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/sysdev/xilinx_intc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/sysdev/xilinx_intc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/sysdev/xilinx_intc.c</a></div><div class='hunk'>@@ -29,194 +29,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/i8259.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * INTC Registers</div><div class='del'>- */</div><div class='del'>-#define XINTC_ISR	0	/* Interrupt Status */</div><div class='del'>-#define XINTC_IPR	4	/* Interrupt Pending */</div><div class='del'>-#define XINTC_IER	8	/* Interrupt Enable */</div><div class='del'>-#define XINTC_IAR	12	/* Interrupt Acknowledge */</div><div class='del'>-#define XINTC_SIE	16	/* Set Interrupt Enable bits */</div><div class='del'>-#define XINTC_CIE	20	/* Clear Interrupt Enable bits */</div><div class='del'>-#define XINTC_IVR	24	/* Interrupt Vector */</div><div class='del'>-#define XINTC_MER	28	/* Master Enable */</div><div class='del'>-</div><div class='del'>-static struct irq_domain *master_irqhost;</div><div class='del'>-</div><div class='del'>-#define XILINX_INTC_MAXIRQS	(32)</div><div class='del'>-</div><div class='del'>-/* The following table allows the interrupt type, edge or level,</div><div class='del'>- * to be cached after being read from the device tree until the interrupt</div><div class='del'>- * is mapped</div><div class='del'>- */</div><div class='del'>-static int xilinx_intc_typetable[XILINX_INTC_MAXIRQS];</div><div class='del'>-</div><div class='del'>-/* Map the interrupt type from the device tree to the interrupt types</div><div class='del'>- * used by the interrupt subsystem</div><div class='del'>- */</div><div class='del'>-static unsigned char xilinx_intc_map_senses[] = {</div><div class='del'>-	IRQ_TYPE_EDGE_RISING,</div><div class='del'>-	IRQ_TYPE_EDGE_FALLING,</div><div class='del'>-	IRQ_TYPE_LEVEL_HIGH,</div><div class='del'>-	IRQ_TYPE_LEVEL_LOW,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The interrupt controller is setup such that it doesn't work well with</div><div class='del'>- * the level interrupt handler in the kernel because the handler acks the</div><div class='del'>- * interrupt before calling the application interrupt handler. To deal with</div><div class='del'>- * that, we use 2 different irq chips so that different functions can be</div><div class='del'>- * used for level and edge type interrupts.</div><div class='del'>- *</div><div class='del'>- * IRQ Chip common (across level and edge) operations</div><div class='del'>- */</div><div class='del'>-static void xilinx_intc_mask(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	int irq = irqd_to_hwirq(d);</div><div class='del'>-	void * regs = irq_data_get_irq_chip_data(d);</div><div class='del'>-	pr_debug("mask: %d\n", irq);</div><div class='del'>-	out_be32(regs + XINTC_CIE, 1 &lt;&lt; irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xilinx_intc_set_type(struct irq_data *d, unsigned int flow_type)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IRQ Chip level operations</div><div class='del'>- */</div><div class='del'>-static void xilinx_intc_level_unmask(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	int irq = irqd_to_hwirq(d);</div><div class='del'>-	void * regs = irq_data_get_irq_chip_data(d);</div><div class='del'>-	pr_debug("unmask: %d\n", irq);</div><div class='del'>-	out_be32(regs + XINTC_SIE, 1 &lt;&lt; irq);</div><div class='del'>-</div><div class='del'>-	/* ack level irqs because they can't be acked during</div><div class='del'>-	 * ack function since the handle_level_irq function</div><div class='del'>-	 * acks the irq before calling the inerrupt handler</div><div class='del'>-	 */</div><div class='del'>-	out_be32(regs + XINTC_IAR, 1 &lt;&lt; irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irq_chip xilinx_intc_level_irqchip = {</div><div class='del'>-	.name = "Xilinx Level INTC",</div><div class='del'>-	.irq_mask = xilinx_intc_mask,</div><div class='del'>-	.irq_mask_ack = xilinx_intc_mask,</div><div class='del'>-	.irq_unmask = xilinx_intc_level_unmask,</div><div class='del'>-	.irq_set_type = xilinx_intc_set_type,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IRQ Chip edge operations</div><div class='del'>- */</div><div class='del'>-static void xilinx_intc_edge_unmask(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	int irq = irqd_to_hwirq(d);</div><div class='del'>-	void *regs = irq_data_get_irq_chip_data(d);</div><div class='del'>-	pr_debug("unmask: %d\n", irq);</div><div class='del'>-	out_be32(regs + XINTC_SIE, 1 &lt;&lt; irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xilinx_intc_edge_ack(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	int irq = irqd_to_hwirq(d);</div><div class='del'>-	void * regs = irq_data_get_irq_chip_data(d);</div><div class='del'>-	pr_debug("ack: %d\n", irq);</div><div class='del'>-	out_be32(regs + XINTC_IAR, 1 &lt;&lt; irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irq_chip xilinx_intc_edge_irqchip = {</div><div class='del'>-	.name = "Xilinx Edge  INTC",</div><div class='del'>-	.irq_mask = xilinx_intc_mask,</div><div class='del'>-	.irq_unmask = xilinx_intc_edge_unmask,</div><div class='del'>-	.irq_ack = xilinx_intc_edge_ack,</div><div class='del'>-	.irq_set_type = xilinx_intc_set_type,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IRQ Host operations</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * xilinx_intc_xlate - translate virq# from device tree interrupts property</div><div class='del'>- */</div><div class='del'>-static int xilinx_intc_xlate(struct irq_domain *h, struct device_node *ct,</div><div class='del'>-				const u32 *intspec, unsigned int intsize,</div><div class='del'>-				irq_hw_number_t *out_hwirq,</div><div class='del'>-				unsigned int *out_flags)</div><div class='del'>-{</div><div class='del'>-	if ((intsize &lt; 2) || (intspec[0] &gt;= XILINX_INTC_MAXIRQS))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* keep a copy of the interrupt type til the interrupt is mapped</div><div class='del'>-	 */</div><div class='del'>-	xilinx_intc_typetable[intspec[0]] = xilinx_intc_map_senses[intspec[1]];</div><div class='del'>-</div><div class='del'>-	/* Xilinx uses 2 interrupt entries, the 1st being the h/w</div><div class='del'>-	 * interrupt number, the 2nd being the interrupt type, edge or level</div><div class='del'>-	 */</div><div class='del'>-	*out_hwirq = intspec[0];</div><div class='del'>-	*out_flags = xilinx_intc_map_senses[intspec[1]];</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static int xilinx_intc_map(struct irq_domain *h, unsigned int virq,</div><div class='del'>-				  irq_hw_number_t irq)</div><div class='del'>-{</div><div class='del'>-	irq_set_chip_data(virq, h-&gt;host_data);</div><div class='del'>-</div><div class='del'>-	if (xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_HIGH ||</div><div class='del'>-	    xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_LOW) {</div><div class='del'>-		irq_set_chip_and_handler(virq, &amp;xilinx_intc_level_irqchip,</div><div class='del'>-					 handle_level_irq);</div><div class='del'>-	} else {</div><div class='del'>-		irq_set_chip_and_handler(virq, &amp;xilinx_intc_edge_irqchip,</div><div class='del'>-					 handle_edge_irq);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct irq_domain_ops xilinx_intc_ops = {</div><div class='del'>-	.map = xilinx_intc_map,</div><div class='del'>-	.xlate = xilinx_intc_xlate,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct irq_domain * __init</div><div class='del'>-xilinx_intc_init(struct device_node *np)</div><div class='del'>-{</div><div class='del'>-	struct irq_domain * irq;</div><div class='del'>-	void * regs;</div><div class='del'>-</div><div class='del'>-	/* Find and map the intc registers */</div><div class='del'>-	regs = of_iomap(np, 0);</div><div class='del'>-	if (!regs) {</div><div class='del'>-		pr_err("xilinx_intc: could not map registers\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Setup interrupt controller */</div><div class='del'>-	out_be32(regs + XINTC_IER, 0); /* disable all irqs */</div><div class='del'>-	out_be32(regs + XINTC_IAR, ~(u32) 0); /* Acknowledge pending irqs */</div><div class='del'>-	out_be32(regs + XINTC_MER, 0x3UL); /* Turn on the Master Enable. */</div><div class='del'>-</div><div class='del'>-	/* Allocate and initialize an irq_domain structure. */</div><div class='del'>-	irq = irq_domain_add_linear(np, XILINX_INTC_MAXIRQS, &amp;xilinx_intc_ops,</div><div class='del'>-				    regs);</div><div class='del'>-	if (!irq)</div><div class='del'>-		panic(__FILE__ ": Cannot allocate IRQ host\n");</div><div class='del'>-</div><div class='del'>-	return irq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int xilinx_intc_get_irq(void)</div><div class='del'>-{</div><div class='del'>-	void * regs = master_irqhost-&gt;host_data;</div><div class='del'>-	pr_debug("get_irq:\n");</div><div class='del'>-	return irq_linear_revmap(master_irqhost, in_be32(regs + XINTC_IVR));</div><div class='del'>-}</div><div class='add'>+#include &lt;linux/irqchip.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PPC_I8259)</div><div class='ctx'> /*</div><div class='hunk'>@@ -265,31 +78,11 @@ static void __init xilinx_i8259_setup_cascade(void)</div><div class='ctx'> static inline void xilinx_i8259_setup_cascade(void) { return; }</div><div class='ctx'> #endif /* defined(CONFIG_PPC_I8259) */</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id xilinx_intc_match[] __initconst = {</div><div class='del'>-	{ .compatible = "xlnx,opb-intc-1.00.c", },</div><div class='del'>-	{ .compatible = "xlnx,xps-intc-1.00.a", },</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize master Xilinx interrupt controller</div><div class='ctx'>  */</div><div class='ctx'> void __init xilinx_intc_init_tree(void)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	/* find top level interrupt controller */</div><div class='del'>-	for_each_matching_node(np, xilinx_intc_match) {</div><div class='del'>-		if (!of_get_property(np, "interrupts", NULL))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(!np);</div><div class='del'>-</div><div class='del'>-	master_irqhost = xilinx_intc_init(np);</div><div class='del'>-	BUG_ON(!master_irqhost);</div><div class='del'>-</div><div class='del'>-	irq_set_default_host(master_irqhost);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='add'>+	irqchip_init();</div><div class='ctx'> 	xilinx_i8259_setup_cascade();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/xmon/ppc-dis.c b/arch/powerpc/xmon/ppc-dis.c<br/>index ee9891734149..31db8c072acd 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/xmon/ppc-dis.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/xmon/ppc-dis.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/xmon/ppc-dis.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/xmon/ppc-dis.c</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> /* ppc-dis.c -- Disassemble PowerPC instructions</div><div class='del'>-   Copyright 1994, 1995, 2000, 2001, 2002, 2003, 2004, 2005, 2006</div><div class='del'>-   Free Software Foundation, Inc.</div><div class='add'>+   Copyright (C) 1994-2016 Free Software Foundation, Inc.</div><div class='ctx'>    Written by Ian Lance Taylor, Cygnus Support</div><div class='ctx'> </div><div class='ctx'> This file is part of GDB, GAS, and the GNU binutils.</div><div class='hunk'>@@ -26,57 +25,94 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, US</div><div class='ctx'> #include "ppc.h"</div><div class='ctx'> #include "dis-asm.h"</div><div class='ctx'> </div><div class='del'>-/* Print a PowerPC or POWER instruction.  */</div><div class='add'>+/* This file provides several disassembler functions, all of which use</div><div class='add'>+   the disassembler interface defined in dis-asm.h.  Several functions</div><div class='add'>+   are provided because this file handles disassembly for the PowerPC</div><div class='add'>+   in both big and little endian mode and also for the POWER (RS/6000)</div><div class='add'>+   chip.  */</div><div class='add'>+</div><div class='add'>+/* Extract the operand value from the PowerPC or POWER instruction.  */</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-print_insn_powerpc (unsigned long insn, unsigned long memaddr)</div><div class='add'>+static long</div><div class='add'>+operand_value_powerpc (const struct powerpc_operand *operand,</div><div class='add'>+		       unsigned long insn, ppc_cpu_t dialect)</div><div class='ctx'> {</div><div class='del'>-  const struct powerpc_opcode *opcode;</div><div class='del'>-  const struct powerpc_opcode *opcode_end;</div><div class='del'>-  unsigned long op;</div><div class='del'>-  int dialect;</div><div class='add'>+  long value;</div><div class='add'>+  int invalid;</div><div class='add'>+  /* Extract the value from the instruction.  */</div><div class='add'>+  if (operand-&gt;extract)</div><div class='add'>+    value = (*operand-&gt;extract) (insn, dialect, &amp;invalid);</div><div class='add'>+  else</div><div class='add'>+    {</div><div class='add'>+      if (operand-&gt;shift &gt;= 0)</div><div class='add'>+	value = (insn &gt;&gt; operand-&gt;shift) &amp; operand-&gt;bitm;</div><div class='add'>+      else</div><div class='add'>+	value = (insn &lt;&lt; -operand-&gt;shift) &amp; operand-&gt;bitm;</div><div class='add'>+      if ((operand-&gt;flags &amp; PPC_OPERAND_SIGNED) != 0)</div><div class='add'>+	{</div><div class='add'>+	  /* BITM is always some number of zeros followed by some</div><div class='add'>+	     number of ones, followed by some number of zeros.  */</div><div class='add'>+	  unsigned long top = operand-&gt;bitm;</div><div class='add'>+	  /* top &amp; -top gives the rightmost 1 bit, so this</div><div class='add'>+	     fills in any trailing zeros.  */</div><div class='add'>+	  top |= (top &amp; -top) - 1;</div><div class='add'>+	  top &amp;= ~(top &gt;&gt; 1);</div><div class='add'>+	  value = (value ^ top) - top;</div><div class='add'>+	}</div><div class='add'>+    }</div><div class='ctx'> </div><div class='del'>-  dialect = PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_COMMON</div><div class='del'>-	      | PPC_OPCODE_64 | PPC_OPCODE_POWER4 | PPC_OPCODE_ALTIVEC;</div><div class='add'>+  return value;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-  if (cpu_has_feature(CPU_FTRS_POWER5))</div><div class='del'>-    dialect |= PPC_OPCODE_POWER5;</div><div class='add'>+/* Determine whether the optional operand(s) should be printed.  */</div><div class='ctx'> </div><div class='del'>-  if (cpu_has_feature(CPU_FTRS_CELL))</div><div class='del'>-    dialect |= PPC_OPCODE_CELL | PPC_OPCODE_ALTIVEC;</div><div class='add'>+static int</div><div class='add'>+skip_optional_operands (const unsigned char *opindex,</div><div class='add'>+			unsigned long insn, ppc_cpu_t dialect)</div><div class='add'>+{</div><div class='add'>+  const struct powerpc_operand *operand;</div><div class='ctx'> </div><div class='del'>-  if (cpu_has_feature(CPU_FTRS_POWER6))</div><div class='del'>-    dialect |= PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_ALTIVEC;</div><div class='add'>+  for (; *opindex != 0; opindex++)</div><div class='add'>+    {</div><div class='add'>+      operand = &amp;powerpc_operands[*opindex];</div><div class='add'>+      if ((operand-&gt;flags &amp; PPC_OPERAND_NEXT) != 0</div><div class='add'>+	  || ((operand-&gt;flags &amp; PPC_OPERAND_OPTIONAL) != 0</div><div class='add'>+	      &amp;&amp; operand_value_powerpc (operand, insn, dialect) !=</div><div class='add'>+		 ppc_optional_operand_value (operand)))</div><div class='add'>+	return 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+  return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Find a match for INSN in the opcode table, given machine DIALECT.</div><div class='add'>+   A DIALECT of -1 is special, matching all machine opcode variations.  */</div><div class='add'>+</div><div class='add'>+static const struct powerpc_opcode *</div><div class='add'>+lookup_powerpc (unsigned long insn, ppc_cpu_t dialect)</div><div class='add'>+{</div><div class='add'>+  const struct powerpc_opcode *opcode;</div><div class='add'>+  const struct powerpc_opcode *opcode_end;</div><div class='add'>+  unsigned long op;</div><div class='ctx'> </div><div class='ctx'>   /* Get the major opcode of the instruction.  */</div><div class='ctx'>   op = PPC_OP (insn);</div><div class='ctx'> </div><div class='del'>-  /* Find the first match in the opcode table.  We could speed this up</div><div class='del'>-     a bit by doing a binary search on the major opcode.  */</div><div class='ctx'>   opcode_end = powerpc_opcodes + powerpc_num_opcodes;</div><div class='del'>- again:</div><div class='del'>-  for (opcode = powerpc_opcodes; opcode &lt; opcode_end; opcode++)</div><div class='add'>+  /* Find the first match in the opcode table for this major opcode.  */</div><div class='add'>+  for (opcode = powerpc_opcodes; opcode &lt; opcode_end; ++opcode)</div><div class='ctx'>     {</div><div class='del'>-      unsigned long table_op;</div><div class='ctx'>       const unsigned char *opindex;</div><div class='ctx'>       const struct powerpc_operand *operand;</div><div class='ctx'>       int invalid;</div><div class='del'>-      int need_comma;</div><div class='del'>-      int need_paren;</div><div class='del'>-</div><div class='del'>-      table_op = PPC_OP (opcode-&gt;opcode);</div><div class='del'>-      if (op &lt; table_op)</div><div class='del'>-	break;</div><div class='del'>-      if (op &gt; table_op)</div><div class='del'>-	continue;</div><div class='ctx'> </div><div class='ctx'>       if ((insn &amp; opcode-&gt;mask) != opcode-&gt;opcode</div><div class='del'>-	  || (opcode-&gt;flags &amp; dialect) == 0)</div><div class='add'>+	  || (dialect != (ppc_cpu_t) -1</div><div class='add'>+	      &amp;&amp; ((opcode-&gt;flags &amp; dialect) == 0</div><div class='add'>+		  || (opcode-&gt;deprecated &amp; dialect) != 0)))</div><div class='ctx'> 	continue;</div><div class='ctx'> </div><div class='del'>-      /* Make two passes over the operands.  First see if any of them</div><div class='del'>-	 have extraction functions, and, if they do, make sure the</div><div class='del'>-	 instruction is valid.  */</div><div class='add'>+      /* Check validity of operands.  */</div><div class='ctx'>       invalid = 0;</div><div class='ctx'>       for (opindex = opcode-&gt;operands; *opindex != 0; opindex++)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -87,14 +123,77 @@ print_insn_powerpc (unsigned long insn, unsigned long memaddr)</div><div class='ctx'>       if (invalid)</div><div class='ctx'> 	continue;</div><div class='ctx'> </div><div class='del'>-      /* The instruction is valid.  */</div><div class='del'>-      printf("%s", opcode-&gt;name);</div><div class='add'>+      return opcode;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+  return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Print a PowerPC or POWER instruction.  */</div><div class='add'>+</div><div class='add'>+int print_insn_powerpc (unsigned long insn, unsigned long memaddr)</div><div class='add'>+{</div><div class='add'>+  const struct powerpc_opcode *opcode;</div><div class='add'>+  bool insn_is_short;</div><div class='add'>+  ppc_cpu_t dialect;</div><div class='add'>+</div><div class='add'>+  dialect = PPC_OPCODE_PPC | PPC_OPCODE_COMMON</div><div class='add'>+            | PPC_OPCODE_64 | PPC_OPCODE_POWER4 | PPC_OPCODE_ALTIVEC;</div><div class='add'>+</div><div class='add'>+  if (cpu_has_feature(CPU_FTRS_POWER5))</div><div class='add'>+    dialect |= PPC_OPCODE_POWER5;</div><div class='add'>+</div><div class='add'>+  if (cpu_has_feature(CPU_FTRS_CELL))</div><div class='add'>+    dialect |= (PPC_OPCODE_CELL | PPC_OPCODE_ALTIVEC);</div><div class='add'>+</div><div class='add'>+  if (cpu_has_feature(CPU_FTRS_POWER6))</div><div class='add'>+    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_ALTIVEC);</div><div class='add'>+</div><div class='add'>+  if (cpu_has_feature(CPU_FTRS_POWER7))</div><div class='add'>+    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7</div><div class='add'>+                | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX);</div><div class='add'>+</div><div class='add'>+  if (cpu_has_feature(CPU_FTRS_POWER8))</div><div class='add'>+    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7</div><div class='add'>+		| PPC_OPCODE_POWER8 | PPC_OPCODE_HTM</div><div class='add'>+		| PPC_OPCODE_ALTIVEC | PPC_OPCODE_ALTIVEC2 | PPC_OPCODE_VSX);</div><div class='add'>+</div><div class='add'>+  if (cpu_has_feature(CPU_FTRS_POWER9))</div><div class='add'>+    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7</div><div class='add'>+		| PPC_OPCODE_POWER8 | PPC_OPCODE_POWER9 | PPC_OPCODE_HTM</div><div class='add'>+		| PPC_OPCODE_ALTIVEC | PPC_OPCODE_ALTIVEC2</div><div class='add'>+		| PPC_OPCODE_VSX | PPC_OPCODE_VSX3),</div><div class='add'>+</div><div class='add'>+  /* Get the major opcode of the insn.  */</div><div class='add'>+  opcode = NULL;</div><div class='add'>+  insn_is_short = false;</div><div class='add'>+</div><div class='add'>+  if (opcode == NULL)</div><div class='add'>+    opcode = lookup_powerpc (insn, dialect);</div><div class='add'>+  if (opcode == NULL &amp;&amp; (dialect &amp; PPC_OPCODE_ANY) != 0)</div><div class='add'>+    opcode = lookup_powerpc (insn, (ppc_cpu_t) -1);</div><div class='add'>+</div><div class='add'>+  if (opcode != NULL)</div><div class='add'>+    {</div><div class='add'>+      const unsigned char *opindex;</div><div class='add'>+      const struct powerpc_operand *operand;</div><div class='add'>+      int need_comma;</div><div class='add'>+      int need_paren;</div><div class='add'>+      int skip_optional;</div><div class='add'>+</div><div class='ctx'>       if (opcode-&gt;operands[0] != 0)</div><div class='del'>-	printf("\t");</div><div class='add'>+	printf("%-7s ", opcode-&gt;name);</div><div class='add'>+      else</div><div class='add'>+	printf("%s", opcode-&gt;name);</div><div class='add'>+</div><div class='add'>+      if (insn_is_short)</div><div class='add'>+        /* The operands will be fetched out of the 16-bit instruction.  */</div><div class='add'>+        insn &gt;&gt;= 16;</div><div class='ctx'> </div><div class='ctx'>       /* Now extract and print the operands.  */</div><div class='ctx'>       need_comma = 0;</div><div class='ctx'>       need_paren = 0;</div><div class='add'>+      skip_optional = -1;</div><div class='ctx'>       for (opindex = opcode-&gt;operands; *opindex != 0; opindex++)</div><div class='ctx'> 	{</div><div class='ctx'> 	  long value;</div><div class='hunk'>@@ -107,23 +206,18 @@ print_insn_powerpc (unsigned long insn, unsigned long memaddr)</div><div class='ctx'> 	  if ((operand-&gt;flags &amp; PPC_OPERAND_FAKE) != 0)</div><div class='ctx'> 	    continue;</div><div class='ctx'> </div><div class='del'>-	  /* Extract the value from the instruction.  */</div><div class='del'>-	  if (operand-&gt;extract)</div><div class='del'>-	    value = (*operand-&gt;extract) (insn, dialect, &amp;invalid);</div><div class='del'>-	  else</div><div class='add'>+	  /* If all of the optional operands have the value zero,</div><div class='add'>+	     then don't print any of them.  */</div><div class='add'>+	  if ((operand-&gt;flags &amp; PPC_OPERAND_OPTIONAL) != 0)</div><div class='ctx'> 	    {</div><div class='del'>-	      value = (insn &gt;&gt; operand-&gt;shift) &amp; ((1 &lt;&lt; operand-&gt;bits) - 1);</div><div class='del'>-	      if ((operand-&gt;flags &amp; PPC_OPERAND_SIGNED) != 0</div><div class='del'>-		  &amp;&amp; (value &amp; (1 &lt;&lt; (operand-&gt;bits - 1))) != 0)</div><div class='del'>-		value -= 1 &lt;&lt; operand-&gt;bits;</div><div class='add'>+	      if (skip_optional &lt; 0)</div><div class='add'>+		skip_optional = skip_optional_operands (opindex, insn,</div><div class='add'>+							dialect);</div><div class='add'>+	      if (skip_optional)</div><div class='add'>+		continue;</div><div class='ctx'> 	    }</div><div class='ctx'> </div><div class='del'>-	  /* If the operand is optional, and the value is zero, don't</div><div class='del'>-	     print anything.  */</div><div class='del'>-	  if ((operand-&gt;flags &amp; PPC_OPERAND_OPTIONAL) != 0</div><div class='del'>-	      &amp;&amp; (operand-&gt;flags &amp; PPC_OPERAND_NEXT) == 0</div><div class='del'>-	      &amp;&amp; value == 0)</div><div class='del'>-	    continue;</div><div class='add'>+	  value = operand_value_powerpc (operand, insn, dialect);</div><div class='ctx'> </div><div class='ctx'> 	  if (need_comma)</div><div class='ctx'> 	    {</div><div class='hunk'>@@ -139,30 +233,38 @@ print_insn_powerpc (unsigned long insn, unsigned long memaddr)</div><div class='ctx'> 	    printf("f%ld", value);</div><div class='ctx'> 	  else if ((operand-&gt;flags &amp; PPC_OPERAND_VR) != 0)</div><div class='ctx'> 	    printf("v%ld", value);</div><div class='add'>+	  else if ((operand-&gt;flags &amp; PPC_OPERAND_VSR) != 0)</div><div class='add'>+	    printf("vs%ld", value);</div><div class='ctx'> 	  else if ((operand-&gt;flags &amp; PPC_OPERAND_RELATIVE) != 0)</div><div class='del'>-	    print_address (memaddr + value);</div><div class='add'>+	    print_address(memaddr + value);</div><div class='ctx'> 	  else if ((operand-&gt;flags &amp; PPC_OPERAND_ABSOLUTE) != 0)</div><div class='del'>-	    print_address (value &amp; 0xffffffff);</div><div class='del'>-	  else if ((operand-&gt;flags &amp; PPC_OPERAND_CR) == 0</div><div class='del'>-		   || (dialect &amp; PPC_OPCODE_PPC) == 0)</div><div class='add'>+	    print_address(value &amp; 0xffffffff);</div><div class='add'>+	  else if ((operand-&gt;flags &amp; PPC_OPERAND_FSL) != 0)</div><div class='add'>+	    printf("fsl%ld", value);</div><div class='add'>+	  else if ((operand-&gt;flags &amp; PPC_OPERAND_FCR) != 0)</div><div class='add'>+	    printf("fcr%ld", value);</div><div class='add'>+	  else if ((operand-&gt;flags &amp; PPC_OPERAND_UDI) != 0)</div><div class='ctx'> 	    printf("%ld", value);</div><div class='del'>-	  else</div><div class='add'>+	  else if ((operand-&gt;flags &amp; PPC_OPERAND_CR_REG) != 0</div><div class='add'>+		   &amp;&amp; (((dialect &amp; PPC_OPCODE_PPC) != 0)</div><div class='add'>+		       || ((dialect &amp; PPC_OPCODE_VLE) != 0)))</div><div class='add'>+	    printf("cr%ld", value);</div><div class='add'>+	  else if (((operand-&gt;flags &amp; PPC_OPERAND_CR_BIT) != 0)</div><div class='add'>+		   &amp;&amp; (((dialect &amp; PPC_OPCODE_PPC) != 0)</div><div class='add'>+		       || ((dialect &amp; PPC_OPCODE_VLE) != 0)))</div><div class='ctx'> 	    {</div><div class='del'>-	      if (operand-&gt;bits == 3)</div><div class='del'>-		printf("cr%ld", value);</div><div class='del'>-	      else</div><div class='del'>-		{</div><div class='del'>-		  static const char *cbnames[4] = { "lt", "gt", "eq", "so" };</div><div class='del'>-		  int cr;</div><div class='del'>-		  int cc;</div><div class='del'>-</div><div class='del'>-		  cr = value &gt;&gt; 2;</div><div class='del'>-		  if (cr != 0)</div><div class='del'>-		    printf("4*cr%d+", cr);</div><div class='del'>-		  cc = value &amp; 3;</div><div class='del'>-		  printf("%s", cbnames[cc]);</div><div class='del'>-		}</div><div class='add'>+	      static const char *cbnames[4] = { "lt", "gt", "eq", "so" };</div><div class='add'>+	      int cr;</div><div class='add'>+	      int cc;</div><div class='add'>+</div><div class='add'>+	      cr = value &gt;&gt; 2;</div><div class='add'>+	      if (cr != 0)</div><div class='add'>+		printf("4*cr%d+", cr);</div><div class='add'>+	      cc = value &amp; 3;</div><div class='add'>+	      printf("%s", cbnames[cc]);</div><div class='ctx'> 	    }</div><div class='add'>+	  else</div><div class='add'>+	    printf("%d", (int) value);</div><div class='ctx'> </div><div class='ctx'> 	  if (need_paren)</div><div class='ctx'> 	    {</div><div class='hunk'>@@ -179,14 +281,16 @@ print_insn_powerpc (unsigned long insn, unsigned long memaddr)</div><div class='ctx'> 	    }</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-      /* We have found and printed an instruction; return.  */</div><div class='del'>-      return 4;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  if ((dialect &amp; PPC_OPCODE_ANY) != 0)</div><div class='del'>-    {</div><div class='del'>-      dialect = ~PPC_OPCODE_ANY;</div><div class='del'>-      goto again;</div><div class='add'>+      /* We have found and printed an instruction.</div><div class='add'>+         If it was a short VLE instruction we have more to do.  */</div><div class='add'>+      if (insn_is_short)</div><div class='add'>+        {</div><div class='add'>+          memaddr += 2;</div><div class='add'>+          return 2;</div><div class='add'>+        }</div><div class='add'>+      else</div><div class='add'>+        /* Otherwise, return.  */</div><div class='add'>+        return 4;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>   /* We could not find a match.  */</div><div class='head'>diff --git a/arch/powerpc/xmon/ppc-opc.c b/arch/powerpc/xmon/ppc-opc.c<br/>index 6845e91ba04a..ac2b55b1332e 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/xmon/ppc-opc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/xmon/ppc-opc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/xmon/ppc-opc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/xmon/ppc-opc.c</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> /* ppc-opc.c -- PowerPC opcode list</div><div class='del'>-   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,</div><div class='del'>-   2005 Free Software Foundation, Inc.</div><div class='add'>+   Copyright (C) 1994-2016 Free Software Foundation, Inc.</div><div class='ctx'>    Written by Ian Lance Taylor, Cygnus Support</div><div class='ctx'> </div><div class='ctx'>    This file is part of GDB, GAS, and the GNU binutils.</div><div class='hunk'>@@ -42,66 +41,97 @@</div><div class='ctx'> </div><div class='ctx'> /* Local insertion and extraction functions.  */</div><div class='ctx'> </div><div class='del'>-static unsigned long insert_bat (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_bat (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_bba (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_bba (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_bd (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_bd (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_bdm (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_bdm (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_bdp (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_bdp (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_bo (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_bo (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_boe (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_boe (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_dq (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_dq (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_ds (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_ds (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_de (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_de (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_des (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_des (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_fxm (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_fxm (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_li (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_li (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_mbe (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_mbe (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_mb6 (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_mb6 (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_nb (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_nb (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_nsi (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_nsi (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_ral (unsigned long, long, int, const char **);</div><div class='del'>-static unsigned long insert_ram (unsigned long, long, int, const char **);</div><div class='del'>-static unsigned long insert_raq (unsigned long, long, int, const char **);</div><div class='del'>-static unsigned long insert_ras (unsigned long, long, int, const char **);</div><div class='del'>-static unsigned long insert_rbs (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_rbs (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_rsq (unsigned long, long, int, const char **);</div><div class='del'>-static unsigned long insert_rtq (unsigned long, long, int, const char **);</div><div class='del'>-static unsigned long insert_sh6 (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_sh6 (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_spr (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_spr (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_sprg (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_sprg (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_tbr (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_tbr (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_ev2 (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_ev2 (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_ev4 (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_ev4 (unsigned long, int, int *);</div><div class='del'>-static unsigned long insert_ev8 (unsigned long, long, int, const char **);</div><div class='del'>-static long extract_ev8 (unsigned long, int, int *);</div><div class='add'>+static unsigned long insert_arx (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_arx (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_ary (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_ary (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_bat (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_bat (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_bba (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_bba (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_bdm (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_bdm (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_bdp (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_bdp (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_bo (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_bo (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_boe (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_boe (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_esync (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static unsigned long insert_dcmxs (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_dcmxs (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_dxd (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_dxd (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_dxdn (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_dxdn (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_fxm (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_fxm (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_li20 (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_li20 (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_ls (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static unsigned long insert_mbe (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_mbe (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_mb6 (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_mb6 (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static long extract_nb (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_nbi (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static unsigned long insert_nsi (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_nsi (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_oimm (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_oimm (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_ral (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static unsigned long insert_ram (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static unsigned long insert_raq (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static unsigned long insert_ras (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static unsigned long insert_rbs (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_rbs (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_rbx (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static unsigned long insert_rx (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_rx (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_ry (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_ry (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_sh6 (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_sh6 (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_sci8 (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_sci8 (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_sci8n (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_sci8n (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_sd4h (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_sd4h (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_sd4w (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_sd4w (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_spr (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_spr (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_sprg (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_sprg (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_tbr (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_tbr (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_xt6 (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_xt6 (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_xtq6 (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_xtq6 (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_xa6 (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_xa6 (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_xb6 (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_xb6 (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_xb6s (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_xb6s (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_xc6 (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_xc6 (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_dm (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_dm (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_vlesi (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_vlesi (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_vlensi (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_vlensi (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_vleui (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_vleui (unsigned long, ppc_cpu_t, int *);</div><div class='add'>+static unsigned long insert_vleil (unsigned long, long, ppc_cpu_t, const char **);</div><div class='add'>+static long extract_vleil (unsigned long, ppc_cpu_t, int *);</div><div class='ctx'> </div><div class='ctx'> /* The operands table.</div><div class='ctx'> </div><div class='del'>-   The fields are bits, shift, insert, extract, flags.</div><div class='add'>+   The fields are bitm, shift, insert, extract, flags.</div><div class='ctx'> </div><div class='ctx'>    We used to put parens around the various additions, like the one</div><div class='ctx'>    for BA just below.  However, that caused trouble with feeble</div><div class='hunk'>@@ -119,493 +149,934 @@ const struct powerpc_operand powerpc_operands[] =</div><div class='ctx'> </div><div class='ctx'>   /* The BA field in an XL form instruction.  */</div><div class='ctx'> #define BA UNUSED + 1</div><div class='del'>-#define BA_MASK (0x1f &lt;&lt; 16)</div><div class='del'>-  { 5, 16, NULL, NULL, PPC_OPERAND_CR },</div><div class='add'>+  /* The BI field in a B form or XL form instruction.  */</div><div class='add'>+#define BI BA</div><div class='add'>+#define BI_MASK (0x1f &lt;&lt; 16)</div><div class='add'>+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_CR_BIT },</div><div class='ctx'> </div><div class='ctx'>   /* The BA field in an XL form instruction when it must be the same</div><div class='ctx'>      as the BT field in the same instruction.  */</div><div class='ctx'> #define BAT BA + 1</div><div class='del'>-  { 5, 16, insert_bat, extract_bat, PPC_OPERAND_FAKE },</div><div class='add'>+  { 0x1f, 16, insert_bat, extract_bat, PPC_OPERAND_FAKE },</div><div class='ctx'> </div><div class='ctx'>   /* The BB field in an XL form instruction.  */</div><div class='ctx'> #define BB BAT + 1</div><div class='ctx'> #define BB_MASK (0x1f &lt;&lt; 11)</div><div class='del'>-  { 5, 11, NULL, NULL, PPC_OPERAND_CR },</div><div class='add'>+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_CR_BIT },</div><div class='ctx'> </div><div class='ctx'>   /* The BB field in an XL form instruction when it must be the same</div><div class='ctx'>      as the BA field in the same instruction.  */</div><div class='ctx'> #define BBA BB + 1</div><div class='del'>-  { 5, 11, insert_bba, extract_bba, PPC_OPERAND_FAKE },</div><div class='add'>+  /* The VB field in a VX form instruction when it must be the same</div><div class='add'>+     as the VA field in the same instruction.  */</div><div class='add'>+#define VBA BBA</div><div class='add'>+  { 0x1f, 11, insert_bba, extract_bba, PPC_OPERAND_FAKE },</div><div class='ctx'> </div><div class='ctx'>   /* The BD field in a B form instruction.  The lower two bits are</div><div class='ctx'>      forced to zero.  */</div><div class='ctx'> #define BD BBA + 1</div><div class='del'>-  { 16, 0, insert_bd, extract_bd, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },</div><div class='add'>+  { 0xfffc, 0, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='ctx'>   /* The BD field in a B form instruction when absolute addressing is</div><div class='ctx'>      used.  */</div><div class='ctx'> #define BDA BD + 1</div><div class='del'>-  { 16, 0, insert_bd, extract_bd, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },</div><div class='add'>+  { 0xfffc, 0, NULL, NULL, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='ctx'>   /* The BD field in a B form instruction when the - modifier is used.</div><div class='ctx'>      This sets the y bit of the BO field appropriately.  */</div><div class='ctx'> #define BDM BDA + 1</div><div class='del'>-  { 16, 0, insert_bdm, extract_bdm,</div><div class='del'>-      PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },</div><div class='add'>+  { 0xfffc, 0, insert_bdm, extract_bdm,</div><div class='add'>+    PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='ctx'>   /* The BD field in a B form instruction when the - modifier is used</div><div class='ctx'>      and absolute address is used.  */</div><div class='ctx'> #define BDMA BDM + 1</div><div class='del'>-  { 16, 0, insert_bdm, extract_bdm,</div><div class='del'>-      PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },</div><div class='add'>+  { 0xfffc, 0, insert_bdm, extract_bdm,</div><div class='add'>+    PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='ctx'>   /* The BD field in a B form instruction when the + modifier is used.</div><div class='ctx'>      This sets the y bit of the BO field appropriately.  */</div><div class='ctx'> #define BDP BDMA + 1</div><div class='del'>-  { 16, 0, insert_bdp, extract_bdp,</div><div class='del'>-      PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },</div><div class='add'>+  { 0xfffc, 0, insert_bdp, extract_bdp,</div><div class='add'>+    PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='ctx'>   /* The BD field in a B form instruction when the + modifier is used</div><div class='ctx'>      and absolute addressing is used.  */</div><div class='ctx'> #define BDPA BDP + 1</div><div class='del'>-  { 16, 0, insert_bdp, extract_bdp,</div><div class='del'>-      PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },</div><div class='add'>+  { 0xfffc, 0, insert_bdp, extract_bdp,</div><div class='add'>+    PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='ctx'>   /* The BF field in an X or XL form instruction.  */</div><div class='ctx'> #define BF BDPA + 1</div><div class='del'>-  { 3, 23, NULL, NULL, PPC_OPERAND_CR },</div><div class='add'>+  /* The CRFD field in an X form instruction.  */</div><div class='add'>+#define CRFD BF</div><div class='add'>+  /* The CRD field in an XL form instruction.  */</div><div class='add'>+#define CRD BF</div><div class='add'>+  { 0x7, 23, NULL, NULL, PPC_OPERAND_CR_REG },</div><div class='add'>+</div><div class='add'>+  /* The BF field in an X or XL form instruction.  */</div><div class='add'>+#define BFF BF + 1</div><div class='add'>+  { 0x7, 23, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* An optional BF field.  This is used for comparison instructions,</div><div class='ctx'>      in which an omitted BF field is taken as zero.  */</div><div class='del'>-#define OBF BF + 1</div><div class='del'>-  { 3, 23, NULL, NULL, PPC_OPERAND_CR | PPC_OPERAND_OPTIONAL },</div><div class='add'>+#define OBF BFF + 1</div><div class='add'>+  { 0x7, 23, NULL, NULL, PPC_OPERAND_CR_REG | PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='ctx'>   /* The BFA field in an X or XL form instruction.  */</div><div class='ctx'> #define BFA OBF + 1</div><div class='del'>-  { 3, 18, NULL, NULL, PPC_OPERAND_CR },</div><div class='del'>-</div><div class='del'>-  /* The BI field in a B form or XL form instruction.  */</div><div class='del'>-#define BI BFA + 1</div><div class='del'>-#define BI_MASK (0x1f &lt;&lt; 16)</div><div class='del'>-  { 5, 16, NULL, NULL, PPC_OPERAND_CR },</div><div class='add'>+  { 0x7, 18, NULL, NULL, PPC_OPERAND_CR_REG },</div><div class='ctx'> </div><div class='ctx'>   /* The BO field in a B form instruction.  Certain values are</div><div class='ctx'>      illegal.  */</div><div class='del'>-#define BO BI + 1</div><div class='add'>+#define BO BFA + 1</div><div class='ctx'> #define BO_MASK (0x1f &lt;&lt; 21)</div><div class='del'>-  { 5, 21, insert_bo, extract_bo, 0 },</div><div class='add'>+  { 0x1f, 21, insert_bo, extract_bo, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The BO field in a B form instruction when the + or - modifier is</div><div class='ctx'>      used.  This is like the BO field, but it must be even.  */</div><div class='ctx'> #define BOE BO + 1</div><div class='del'>-  { 5, 21, insert_boe, extract_boe, 0 },</div><div class='add'>+  { 0x1e, 21, insert_boe, extract_boe, 0 },</div><div class='add'>+</div><div class='add'>+  /* The RM field in an X form instruction.  */</div><div class='add'>+#define RM BOE + 1</div><div class='add'>+  { 0x3, 11, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='del'>-#define BH BOE + 1</div><div class='del'>-  { 2, 11, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+#define BH RM + 1</div><div class='add'>+  { 0x3, 11, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='ctx'>   /* The BT field in an X or XL form instruction.  */</div><div class='ctx'> #define BT BH + 1</div><div class='del'>-  { 5, 21, NULL, NULL, PPC_OPERAND_CR },</div><div class='add'>+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_CR_BIT },</div><div class='add'>+</div><div class='add'>+  /* The BI16 field in a BD8 form instruction.  */</div><div class='add'>+#define BI16 BT + 1</div><div class='add'>+  { 0x3, 8, NULL, NULL, PPC_OPERAND_CR_BIT },</div><div class='add'>+</div><div class='add'>+  /* The BI32 field in a BD15 form instruction.  */</div><div class='add'>+#define BI32 BI16 + 1</div><div class='add'>+  { 0xf, 16, NULL, NULL, PPC_OPERAND_CR_BIT },</div><div class='add'>+</div><div class='add'>+  /* The BO32 field in a BD15 form instruction.  */</div><div class='add'>+#define BO32 BI32 + 1</div><div class='add'>+  { 0x3, 20, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+  /* The B8 field in a BD8 form instruction.  */</div><div class='add'>+#define B8 BO32 + 1</div><div class='add'>+  { 0x1fe, -1, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },</div><div class='add'>+</div><div class='add'>+  /* The B15 field in a BD15 form instruction.  The lowest bit is</div><div class='add'>+     forced to zero.  */</div><div class='add'>+#define B15 B8 + 1</div><div class='add'>+  { 0xfffe, 0, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },</div><div class='add'>+</div><div class='add'>+  /* The B24 field in a BD24 form instruction.  The lowest bit is</div><div class='add'>+     forced to zero.  */</div><div class='add'>+#define B24 B15 + 1</div><div class='add'>+  { 0x1fffffe, 0, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='ctx'>   /* The condition register number portion of the BI field in a B form</div><div class='ctx'>      or XL form instruction.  This is used for the extended</div><div class='ctx'>      conditional branch mnemonics, which set the lower two bits of the</div><div class='ctx'>      BI field.  This field is optional.  */</div><div class='del'>-#define CR BT + 1</div><div class='del'>-  { 3, 18, NULL, NULL, PPC_OPERAND_CR | PPC_OPERAND_OPTIONAL },</div><div class='add'>+#define CR B24 + 1</div><div class='add'>+  { 0x7, 18, NULL, NULL, PPC_OPERAND_CR_REG | PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='ctx'>   /* The CRB field in an X form instruction.  */</div><div class='ctx'> #define CRB CR + 1</div><div class='del'>-  { 5, 6, NULL, NULL, 0 },</div><div class='add'>+  /* The MB field in an M form instruction.  */</div><div class='add'>+#define MB CRB</div><div class='add'>+#define MB_MASK (0x1f &lt;&lt; 6)</div><div class='add'>+  { 0x1f, 6, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='del'>-  /* The CRFD field in an X form instruction.  */</div><div class='del'>-#define CRFD CRB + 1</div><div class='del'>-  { 3, 23, NULL, NULL, PPC_OPERAND_CR },</div><div class='add'>+  /* The CRD32 field in an XL form instruction.  */</div><div class='add'>+#define CRD32 CRB + 1</div><div class='add'>+  { 0x3, 21, NULL, NULL, PPC_OPERAND_CR_REG },</div><div class='ctx'> </div><div class='ctx'>   /* The CRFS field in an X form instruction.  */</div><div class='del'>-#define CRFS CRFD + 1</div><div class='del'>-  { 3, 0, NULL, NULL, PPC_OPERAND_CR },</div><div class='add'>+#define CRFS CRD32 + 1</div><div class='add'>+  { 0x7, 0, NULL, NULL, PPC_OPERAND_CR_REG },</div><div class='add'>+</div><div class='add'>+#define CRS CRFS + 1</div><div class='add'>+  { 0x3, 18, NULL, NULL, PPC_OPERAND_CR_REG | PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='ctx'>   /* The CT field in an X form instruction.  */</div><div class='del'>-#define CT CRFS + 1</div><div class='del'>-  { 5, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+#define CT CRS + 1</div><div class='add'>+  /* The MO field in an mbar instruction.  */</div><div class='add'>+#define MO CT</div><div class='add'>+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='ctx'>   /* The D field in a D form instruction.  This is a displacement off</div><div class='ctx'>      a register, and implies that the next operand is a register in</div><div class='ctx'>      parentheses.  */</div><div class='ctx'> #define D CT + 1</div><div class='del'>-  { 16, 0, NULL, NULL, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },</div><div class='add'>+  { 0xffff, 0, NULL, NULL, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='del'>-  /* The DE field in a DE form instruction.  This is like D, but is 12</div><div class='del'>-     bits only.  */</div><div class='del'>-#define DE D + 1</div><div class='del'>-  { 14, 0, insert_de, extract_de, PPC_OPERAND_PARENS },</div><div class='add'>+  /* The D8 field in a D form instruction.  This is a displacement off</div><div class='add'>+     a register, and implies that the next operand is a register in</div><div class='add'>+     parentheses.  */</div><div class='add'>+#define D8 D + 1</div><div class='add'>+  { 0xff, 0, NULL, NULL, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },</div><div class='add'>+</div><div class='add'>+  /* The DCMX field in an X form instruction.  */</div><div class='add'>+#define DCMX D8 + 1</div><div class='add'>+  { 0x7f, 16, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='del'>-  /* The DES field in a DES form instruction.  This is like DS, but is 14</div><div class='del'>-     bits only (12 stored.)  */</div><div class='del'>-#define DES DE + 1</div><div class='del'>-  { 14, 0, insert_des, extract_des, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },</div><div class='add'>+  /* The split DCMX field in an X form instruction.  */</div><div class='add'>+#define DCMXS DCMX + 1</div><div class='add'>+  { 0x7f, PPC_OPSHIFT_INV, insert_dcmxs, extract_dcmxs, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The DQ field in a DQ form instruction.  This is like D, but the</div><div class='ctx'>      lower four bits are forced to zero. */</div><div class='del'>-#define DQ DES + 1</div><div class='del'>-  { 16, 0, insert_dq, extract_dq,</div><div class='del'>-      PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DQ },</div><div class='add'>+#define DQ DCMXS + 1</div><div class='add'>+  { 0xfff0, 0, NULL, NULL,</div><div class='add'>+    PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DQ },</div><div class='ctx'> </div><div class='ctx'>   /* The DS field in a DS form instruction.  This is like D, but the</div><div class='ctx'>      lower two bits are forced to zero.  */</div><div class='ctx'> #define DS DQ + 1</div><div class='del'>-  { 16, 0, insert_ds, extract_ds,</div><div class='del'>-      PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DS },</div><div class='add'>+  { 0xfffc, 0, NULL, NULL,</div><div class='add'>+    PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DS },</div><div class='add'>+</div><div class='add'>+  /* The DUIS or BHRBE fields in a XFX form instruction, 10 bits</div><div class='add'>+     unsigned imediate */</div><div class='add'>+#define DUIS DS + 1</div><div class='add'>+#define BHRBE DUIS</div><div class='add'>+  { 0x3ff, 11, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+  /* The split D field in a DX form instruction.  */</div><div class='add'>+#define DXD DUIS + 1</div><div class='add'>+  { 0xffff, PPC_OPSHIFT_INV, insert_dxd, extract_dxd,</div><div class='add'>+    PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT},</div><div class='add'>+</div><div class='add'>+  /* The split ND field in a DX form instruction.</div><div class='add'>+     This is the same as the DX field, only negated.  */</div><div class='add'>+#define NDXD DXD + 1</div><div class='add'>+  { 0xffff, PPC_OPSHIFT_INV, insert_dxdn, extract_dxdn,</div><div class='add'>+    PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT},</div><div class='ctx'> </div><div class='ctx'>   /* The E field in a wrteei instruction.  */</div><div class='del'>-#define E DS + 1</div><div class='del'>-  { 1, 15, NULL, NULL, 0 },</div><div class='add'>+  /* And the W bit in the pair singles instructions.  */</div><div class='add'>+  /* And the ST field in a VX form instruction.  */</div><div class='add'>+#define E NDXD + 1</div><div class='add'>+#define PSW E</div><div class='add'>+#define ST E</div><div class='add'>+  { 0x1, 15, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The FL1 field in a POWER SC form instruction.  */</div><div class='ctx'> #define FL1 E + 1</div><div class='del'>-  { 4, 12, NULL, NULL, 0 },</div><div class='add'>+  /* The U field in an X form instruction.  */</div><div class='add'>+#define U FL1</div><div class='add'>+  { 0xf, 12, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The FL2 field in a POWER SC form instruction.  */</div><div class='ctx'> #define FL2 FL1 + 1</div><div class='del'>-  { 3, 2, NULL, NULL, 0 },</div><div class='add'>+  { 0x7, 2, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The FLM field in an XFL form instruction.  */</div><div class='ctx'> #define FLM FL2 + 1</div><div class='del'>-  { 8, 17, NULL, NULL, 0 },</div><div class='add'>+  { 0xff, 17, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The FRA field in an X or A form instruction.  */</div><div class='ctx'> #define FRA FLM + 1</div><div class='ctx'> #define FRA_MASK (0x1f &lt;&lt; 16)</div><div class='del'>-  { 5, 16, NULL, NULL, PPC_OPERAND_FPR },</div><div class='add'>+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_FPR },</div><div class='add'>+</div><div class='add'>+  /* The FRAp field of DFP instructions.  */</div><div class='add'>+#define FRAp FRA + 1</div><div class='add'>+  { 0x1e, 16, NULL, NULL, PPC_OPERAND_FPR },</div><div class='ctx'> </div><div class='ctx'>   /* The FRB field in an X or A form instruction.  */</div><div class='del'>-#define FRB FRA + 1</div><div class='add'>+#define FRB FRAp + 1</div><div class='ctx'> #define FRB_MASK (0x1f &lt;&lt; 11)</div><div class='del'>-  { 5, 11, NULL, NULL, PPC_OPERAND_FPR },</div><div class='add'>+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_FPR },</div><div class='add'>+</div><div class='add'>+  /* The FRBp field of DFP instructions.  */</div><div class='add'>+#define FRBp FRB + 1</div><div class='add'>+  { 0x1e, 11, NULL, NULL, PPC_OPERAND_FPR },</div><div class='ctx'> </div><div class='ctx'>   /* The FRC field in an A form instruction.  */</div><div class='del'>-#define FRC FRB + 1</div><div class='add'>+#define FRC FRBp + 1</div><div class='ctx'> #define FRC_MASK (0x1f &lt;&lt; 6)</div><div class='del'>-  { 5, 6, NULL, NULL, PPC_OPERAND_FPR },</div><div class='add'>+  { 0x1f, 6, NULL, NULL, PPC_OPERAND_FPR },</div><div class='ctx'> </div><div class='ctx'>   /* The FRS field in an X form instruction or the FRT field in a D, X</div><div class='ctx'>      or A form instruction.  */</div><div class='ctx'> #define FRS FRC + 1</div><div class='ctx'> #define FRT FRS</div><div class='del'>-  { 5, 21, NULL, NULL, PPC_OPERAND_FPR },</div><div class='add'>+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_FPR },</div><div class='add'>+</div><div class='add'>+  /* The FRSp field of stfdp or the FRTp field of lfdp and DFP</div><div class='add'>+     instructions.  */</div><div class='add'>+#define FRSp FRS + 1</div><div class='add'>+#define FRTp FRSp</div><div class='add'>+  { 0x1e, 21, NULL, NULL, PPC_OPERAND_FPR },</div><div class='ctx'> </div><div class='ctx'>   /* The FXM field in an XFX instruction.  */</div><div class='del'>-#define FXM FRS + 1</div><div class='del'>-#define FXM_MASK (0xff &lt;&lt; 12)</div><div class='del'>-  { 8, 12, insert_fxm, extract_fxm, 0 },</div><div class='add'>+#define FXM FRSp + 1</div><div class='add'>+  { 0xff, 12, insert_fxm, extract_fxm, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* Power4 version for mfcr.  */</div><div class='ctx'> #define FXM4 FXM + 1</div><div class='del'>-  { 8, 12, insert_fxm, extract_fxm, PPC_OPERAND_OPTIONAL },</div><div class='add'>+  { 0xff, 12, insert_fxm, extract_fxm,</div><div class='add'>+    PPC_OPERAND_OPTIONAL | PPC_OPERAND_OPTIONAL_VALUE},</div><div class='add'>+  /* If the FXM4 operand is ommitted, use the sentinel value -1.  */</div><div class='add'>+  { -1, -1, NULL, NULL, 0},</div><div class='add'>+</div><div class='add'>+  /* The IMM20 field in an LI instruction.  */</div><div class='add'>+#define IMM20 FXM4 + 2</div><div class='add'>+  { 0xfffff, PPC_OPSHIFT_INV, insert_li20, extract_li20, PPC_OPERAND_SIGNED},</div><div class='ctx'> </div><div class='ctx'>   /* The L field in a D or X form instruction.  */</div><div class='del'>-#define L FXM4 + 1</div><div class='del'>-  { 1, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+#define L IMM20 + 1</div><div class='add'>+  { 0x1, 21, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+  /* The optional L field in tlbie and tlbiel instructions.  */</div><div class='add'>+#define LOPT L + 1</div><div class='add'>+  /* The R field in a HTM X form instruction.  */</div><div class='add'>+#define HTM_R LOPT</div><div class='add'>+  { 0x1, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+</div><div class='add'>+  /* The optional (for 32-bit) L field in cmp[l][i] instructions.  */</div><div class='add'>+#define L32OPT LOPT + 1</div><div class='add'>+  { 0x1, 21, NULL, NULL, PPC_OPERAND_OPTIONAL | PPC_OPERAND_OPTIONAL32 },</div><div class='add'>+</div><div class='add'>+  /* The L field in dcbf instruction.  */</div><div class='add'>+#define L2OPT L32OPT + 1</div><div class='add'>+  { 0x3, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='ctx'>   /* The LEV field in a POWER SVC form instruction.  */</div><div class='del'>-#define SVC_LEV L + 1</div><div class='del'>-  { 7, 5, NULL, NULL, 0 },</div><div class='add'>+#define SVC_LEV L2OPT + 1</div><div class='add'>+  { 0x7f, 5, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The LEV field in an SC form instruction.  */</div><div class='ctx'> #define LEV SVC_LEV + 1</div><div class='del'>-  { 7, 5, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+  { 0x7f, 5, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='ctx'>   /* The LI field in an I form instruction.  The lower two bits are</div><div class='ctx'>      forced to zero.  */</div><div class='ctx'> #define LI LEV + 1</div><div class='del'>-  { 26, 0, insert_li, extract_li, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },</div><div class='add'>+  { 0x3fffffc, 0, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='ctx'>   /* The LI field in an I form instruction when used as an absolute</div><div class='ctx'>      address.  */</div><div class='ctx'> #define LIA LI + 1</div><div class='del'>-  { 26, 0, insert_li, extract_li, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },</div><div class='add'>+  { 0x3fffffc, 0, NULL, NULL, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='del'>-  /* The LS field in an X (sync) form instruction.  */</div><div class='add'>+  /* The LS or WC field in an X (sync or wait) form instruction.  */</div><div class='ctx'> #define LS LIA + 1</div><div class='del'>-  { 2, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='del'>-</div><div class='del'>-  /* The MB field in an M form instruction.  */</div><div class='del'>-#define MB LS + 1</div><div class='del'>-#define MB_MASK (0x1f &lt;&lt; 6)</div><div class='del'>-  { 5, 6, NULL, NULL, 0 },</div><div class='add'>+#define WC LS</div><div class='add'>+  { 0x3, 21, insert_ls, NULL, PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='ctx'>   /* The ME field in an M form instruction.  */</div><div class='del'>-#define ME MB + 1</div><div class='add'>+#define ME LS + 1</div><div class='ctx'> #define ME_MASK (0x1f &lt;&lt; 1)</div><div class='del'>-  { 5, 1, NULL, NULL, 0 },</div><div class='add'>+  { 0x1f, 1, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The MB and ME fields in an M form instruction expressed a single</div><div class='ctx'>      operand which is a bitmask indicating which bits to select.  This</div><div class='ctx'>      is a two operand form using PPC_OPERAND_NEXT.  See the</div><div class='ctx'>      description in opcode/ppc.h for what this means.  */</div><div class='ctx'> #define MBE ME + 1</div><div class='del'>-  { 5, 6, NULL, NULL, PPC_OPERAND_OPTIONAL | PPC_OPERAND_NEXT },</div><div class='del'>-  { 32, 0, insert_mbe, extract_mbe, 0 },</div><div class='add'>+  { 0x1f, 6, NULL, NULL, PPC_OPERAND_OPTIONAL | PPC_OPERAND_NEXT },</div><div class='add'>+  { -1, 0, insert_mbe, extract_mbe, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The MB or ME field in an MD or MDS form instruction.  The high</div><div class='ctx'>      bit is wrapped to the low end.  */</div><div class='ctx'> #define MB6 MBE + 2</div><div class='ctx'> #define ME6 MB6</div><div class='ctx'> #define MB6_MASK (0x3f &lt;&lt; 5)</div><div class='del'>-  { 6, 5, insert_mb6, extract_mb6, 0 },</div><div class='del'>-</div><div class='del'>-  /* The MO field in an mbar instruction.  */</div><div class='del'>-#define MO MB6 + 1</div><div class='del'>-  { 5, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+  { 0x3f, 5, insert_mb6, extract_mb6, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The NB field in an X form instruction.  The value 32 is stored as</div><div class='ctx'>      0.  */</div><div class='del'>-#define NB MO + 1</div><div class='del'>-  { 6, 11, insert_nb, extract_nb, 0 },</div><div class='add'>+#define NB MB6 + 1</div><div class='add'>+  { 0x1f, 11, NULL, extract_nb, PPC_OPERAND_PLUS1 },</div><div class='add'>+</div><div class='add'>+  /* The NBI field in an lswi instruction, which has special value</div><div class='add'>+     restrictions.  The value 32 is stored as 0.  */</div><div class='add'>+#define NBI NB + 1</div><div class='add'>+  { 0x1f, 11, insert_nbi, extract_nb, PPC_OPERAND_PLUS1 },</div><div class='ctx'> </div><div class='ctx'>   /* The NSI field in a D form instruction.  This is the same as the</div><div class='ctx'>      SI field, only negated.  */</div><div class='del'>-#define NSI NB + 1</div><div class='del'>-  { 16, 0, insert_nsi, extract_nsi,</div><div class='del'>-      PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED },</div><div class='add'>+#define NSI NBI + 1</div><div class='add'>+  { 0xffff, 0, insert_nsi, extract_nsi,</div><div class='add'>+    PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED },</div><div class='add'>+</div><div class='add'>+  /* The NSI field in a D form instruction when we accept a wide range</div><div class='add'>+     of positive values.  */</div><div class='add'>+#define NSISIGNOPT NSI + 1</div><div class='add'>+  { 0xffff, 0, insert_nsi, extract_nsi,</div><div class='add'>+    PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT },</div><div class='ctx'> </div><div class='ctx'>   /* The RA field in an D, DS, DQ, X, XO, M, or MDS form instruction.  */</div><div class='del'>-#define RA NSI + 1</div><div class='add'>+#define RA NSISIGNOPT + 1</div><div class='ctx'> #define RA_MASK (0x1f &lt;&lt; 16)</div><div class='del'>-  { 5, 16, NULL, NULL, PPC_OPERAND_GPR },</div><div class='add'>+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_GPR },</div><div class='ctx'> </div><div class='ctx'>   /* As above, but 0 in the RA field means zero, not r0.  */</div><div class='ctx'> #define RA0 RA + 1</div><div class='del'>-  { 5, 16, NULL, NULL, PPC_OPERAND_GPR_0 },</div><div class='add'>+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_GPR_0 },</div><div class='ctx'> </div><div class='del'>-  /* The RA field in the DQ form lq instruction, which has special</div><div class='add'>+  /* The RA field in the DQ form lq or an lswx instruction, which have special</div><div class='ctx'>      value restrictions.  */</div><div class='ctx'> #define RAQ RA0 + 1</div><div class='del'>-  { 5, 16, insert_raq, NULL, PPC_OPERAND_GPR_0 },</div><div class='add'>+#define RAX RAQ</div><div class='add'>+  { 0x1f, 16, insert_raq, NULL, PPC_OPERAND_GPR_0 },</div><div class='ctx'> </div><div class='ctx'>   /* The RA field in a D or X form instruction which is an updating</div><div class='ctx'>      load, which means that the RA field may not be zero and may not</div><div class='ctx'>      equal the RT field.  */</div><div class='ctx'> #define RAL RAQ + 1</div><div class='del'>-  { 5, 16, insert_ral, NULL, PPC_OPERAND_GPR_0 },</div><div class='add'>+  { 0x1f, 16, insert_ral, NULL, PPC_OPERAND_GPR_0 },</div><div class='ctx'> </div><div class='ctx'>   /* The RA field in an lmw instruction, which has special value</div><div class='ctx'>      restrictions.  */</div><div class='ctx'> #define RAM RAL + 1</div><div class='del'>-  { 5, 16, insert_ram, NULL, PPC_OPERAND_GPR_0 },</div><div class='add'>+  { 0x1f, 16, insert_ram, NULL, PPC_OPERAND_GPR_0 },</div><div class='ctx'> </div><div class='ctx'>   /* The RA field in a D or X form instruction which is an updating</div><div class='ctx'>      store or an updating floating point load, which means that the RA</div><div class='ctx'>      field may not be zero.  */</div><div class='ctx'> #define RAS RAM + 1</div><div class='del'>-  { 5, 16, insert_ras, NULL, PPC_OPERAND_GPR_0 },</div><div class='add'>+  { 0x1f, 16, insert_ras, NULL, PPC_OPERAND_GPR_0 },</div><div class='ctx'> </div><div class='del'>-  /* The RA field of the tlbwe instruction, which is optional.  */</div><div class='add'>+  /* The RA field of the tlbwe, dccci and iccci instructions,</div><div class='add'>+     which are optional.  */</div><div class='ctx'> #define RAOPT RAS + 1</div><div class='del'>-  { 5, 16, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },</div><div class='add'>+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='ctx'>   /* The RB field in an X, XO, M, or MDS form instruction.  */</div><div class='ctx'> #define RB RAOPT + 1</div><div class='ctx'> #define RB_MASK (0x1f &lt;&lt; 11)</div><div class='del'>-  { 5, 11, NULL, NULL, PPC_OPERAND_GPR },</div><div class='add'>+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_GPR },</div><div class='ctx'> </div><div class='ctx'>   /* The RB field in an X form instruction when it must be the same as</div><div class='ctx'>      the RS field in the instruction.  This is used for extended</div><div class='ctx'>      mnemonics like mr.  */</div><div class='ctx'> #define RBS RB + 1</div><div class='del'>-  { 5, 1, insert_rbs, extract_rbs, PPC_OPERAND_FAKE },</div><div class='add'>+  { 0x1f, 11, insert_rbs, extract_rbs, PPC_OPERAND_FAKE },</div><div class='add'>+</div><div class='add'>+  /* The RB field in an lswx instruction, which has special value</div><div class='add'>+     restrictions.  */</div><div class='add'>+#define RBX RBS + 1</div><div class='add'>+  { 0x1f, 11, insert_rbx, NULL, PPC_OPERAND_GPR },</div><div class='add'>+</div><div class='add'>+  /* The RB field of the dccci and iccci instructions, which are optional.  */</div><div class='add'>+#define RBOPT RBX + 1</div><div class='add'>+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },</div><div class='add'>+</div><div class='add'>+  /* The RC register field in an maddld, maddhd or maddhdu instruction.  */</div><div class='add'>+#define RC RBOPT + 1</div><div class='add'>+  { 0x1f, 6, NULL, NULL, PPC_OPERAND_GPR },</div><div class='ctx'> </div><div class='ctx'>   /* The RS field in a D, DS, X, XFX, XS, M, MD or MDS form</div><div class='ctx'>      instruction or the RT field in a D, DS, X, XFX or XO form</div><div class='ctx'>      instruction.  */</div><div class='del'>-#define RS RBS + 1</div><div class='add'>+#define RS RC + 1</div><div class='ctx'> #define RT RS</div><div class='ctx'> #define RT_MASK (0x1f &lt;&lt; 21)</div><div class='del'>-  { 5, 21, NULL, NULL, PPC_OPERAND_GPR },</div><div class='add'>+#define RD RS</div><div class='add'>+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_GPR },</div><div class='ctx'> </div><div class='del'>-  /* The RS field of the DS form stq instruction, which has special</div><div class='del'>-     value restrictions.  */</div><div class='add'>+  /* The RS and RT fields of the DS form stq and DQ form lq instructions,</div><div class='add'>+     which have special value restrictions.  */</div><div class='ctx'> #define RSQ RS + 1</div><div class='del'>-  { 5, 21, insert_rsq, NULL, PPC_OPERAND_GPR_0 },</div><div class='del'>-</div><div class='del'>-  /* The RT field of the DQ form lq instruction, which has special</div><div class='del'>-     value restrictions.  */</div><div class='del'>-#define RTQ RSQ + 1</div><div class='del'>-  { 5, 21, insert_rtq, NULL, PPC_OPERAND_GPR_0 },</div><div class='add'>+#define RTQ RSQ</div><div class='add'>+  { 0x1e, 21, NULL, NULL, PPC_OPERAND_GPR },</div><div class='ctx'> </div><div class='ctx'>   /* The RS field of the tlbwe instruction, which is optional.  */</div><div class='del'>-#define RSO RTQ + 1</div><div class='add'>+#define RSO RSQ + 1</div><div class='ctx'> #define RTO RSO</div><div class='del'>-  { 5, 21, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },</div><div class='add'>+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },</div><div class='add'>+</div><div class='add'>+  /* The RX field of the SE_RR form instruction.  */</div><div class='add'>+#define RX RSO + 1</div><div class='add'>+  { 0x1f, PPC_OPSHIFT_INV, insert_rx, extract_rx, PPC_OPERAND_GPR },</div><div class='add'>+</div><div class='add'>+  /* The ARX field of the SE_RR form instruction.  */</div><div class='add'>+#define ARX RX + 1</div><div class='add'>+  { 0x1f, PPC_OPSHIFT_INV, insert_arx, extract_arx, PPC_OPERAND_GPR },</div><div class='add'>+</div><div class='add'>+  /* The RY field of the SE_RR form instruction.  */</div><div class='add'>+#define RY ARX + 1</div><div class='add'>+#define RZ RY</div><div class='add'>+  { 0x1f, PPC_OPSHIFT_INV, insert_ry, extract_ry, PPC_OPERAND_GPR },</div><div class='add'>+</div><div class='add'>+  /* The ARY field of the SE_RR form instruction.  */</div><div class='add'>+#define ARY RY + 1</div><div class='add'>+  { 0x1f, PPC_OPSHIFT_INV, insert_ary, extract_ary, PPC_OPERAND_GPR },</div><div class='add'>+</div><div class='add'>+  /* The SCLSCI8 field in a D form instruction.  */</div><div class='add'>+#define SCLSCI8 ARY + 1</div><div class='add'>+  { 0xffffffff, PPC_OPSHIFT_INV, insert_sci8, extract_sci8, 0 },</div><div class='add'>+</div><div class='add'>+  /* The SCLSCI8N field in a D form instruction.  This is the same as the</div><div class='add'>+     SCLSCI8 field, only negated.  */</div><div class='add'>+#define SCLSCI8N SCLSCI8 + 1</div><div class='add'>+  { 0xffffffff, PPC_OPSHIFT_INV, insert_sci8n, extract_sci8n,</div><div class='add'>+    PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED },</div><div class='add'>+</div><div class='add'>+  /* The SD field of the SD4 form instruction.  */</div><div class='add'>+#define SE_SD SCLSCI8N + 1</div><div class='add'>+  { 0xf, 8, NULL, NULL, PPC_OPERAND_PARENS },</div><div class='add'>+</div><div class='add'>+  /* The SD field of the SD4 form instruction, for halfword.  */</div><div class='add'>+#define SE_SDH SE_SD + 1</div><div class='add'>+  { 0x1e, PPC_OPSHIFT_INV, insert_sd4h, extract_sd4h, PPC_OPERAND_PARENS },</div><div class='add'>+</div><div class='add'>+  /* The SD field of the SD4 form instruction, for word.  */</div><div class='add'>+#define SE_SDW SE_SDH + 1</div><div class='add'>+  { 0x3c, PPC_OPSHIFT_INV, insert_sd4w, extract_sd4w, PPC_OPERAND_PARENS },</div><div class='ctx'> </div><div class='ctx'>   /* The SH field in an X or M form instruction.  */</div><div class='del'>-#define SH RSO + 1</div><div class='add'>+#define SH SE_SDW + 1</div><div class='ctx'> #define SH_MASK (0x1f &lt;&lt; 11)</div><div class='del'>-  { 5, 11, NULL, NULL, 0 },</div><div class='add'>+  /* The other UIMM field in a EVX form instruction.  */</div><div class='add'>+#define EVUIMM SH</div><div class='add'>+  /* The FC field in an atomic X form instruction.  */</div><div class='add'>+#define FC SH</div><div class='add'>+  { 0x1f, 11, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+  /* The SI field in a HTM X form instruction.  */</div><div class='add'>+#define HTM_SI SH + 1</div><div class='add'>+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='ctx'>   /* The SH field in an MD form instruction.  This is split.  */</div><div class='del'>-#define SH6 SH + 1</div><div class='add'>+#define SH6 HTM_SI + 1</div><div class='ctx'> #define SH6_MASK ((0x1f &lt;&lt; 11) | (1 &lt;&lt; 1))</div><div class='del'>-  { 6, 1, insert_sh6, extract_sh6, 0 },</div><div class='add'>+  { 0x3f, PPC_OPSHIFT_INV, insert_sh6, extract_sh6, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The SH field of the tlbwe instruction, which is optional.  */</div><div class='ctx'> #define SHO SH6 + 1</div><div class='del'>-  { 5, 11,NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='ctx'>   /* The SI field in a D form instruction.  */</div><div class='ctx'> #define SI SHO + 1</div><div class='del'>-  { 16, 0, NULL, NULL, PPC_OPERAND_SIGNED },</div><div class='add'>+  { 0xffff, 0, NULL, NULL, PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='ctx'>   /* The SI field in a D form instruction when we accept a wide range</div><div class='ctx'>      of positive values.  */</div><div class='ctx'> #define SISIGNOPT SI + 1</div><div class='del'>-  { 16, 0, NULL, NULL, PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT },</div><div class='add'>+  { 0xffff, 0, NULL, NULL, PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT },</div><div class='add'>+</div><div class='add'>+  /* The SI8 field in a D form instruction.  */</div><div class='add'>+#define SI8 SISIGNOPT + 1</div><div class='add'>+  { 0xff, 0, NULL, NULL, PPC_OPERAND_SIGNED },</div><div class='ctx'> </div><div class='ctx'>   /* The SPR field in an XFX form instruction.  This is flipped--the</div><div class='ctx'>      lower 5 bits are stored in the upper 5 and vice- versa.  */</div><div class='del'>-#define SPR SISIGNOPT + 1</div><div class='add'>+#define SPR SI8 + 1</div><div class='ctx'> #define PMR SPR</div><div class='add'>+#define TMR SPR</div><div class='ctx'> #define SPR_MASK (0x3ff &lt;&lt; 11)</div><div class='del'>-  { 10, 11, insert_spr, extract_spr, 0 },</div><div class='add'>+  { 0x3ff, 11, insert_spr, extract_spr, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The BAT index number in an XFX form m[ft]ibat[lu] instruction.  */</div><div class='ctx'> #define SPRBAT SPR + 1</div><div class='ctx'> #define SPRBAT_MASK (0x3 &lt;&lt; 17)</div><div class='del'>-  { 2, 17, NULL, NULL, 0 },</div><div class='add'>+  { 0x3, 17, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The SPRG register number in an XFX form m[ft]sprg instruction.  */</div><div class='ctx'> #define SPRG SPRBAT + 1</div><div class='del'>-  { 5, 16, insert_sprg, extract_sprg, 0 },</div><div class='add'>+  { 0x1f, 16, insert_sprg, extract_sprg, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The SR field in an X form instruction.  */</div><div class='ctx'> #define SR SPRG + 1</div><div class='del'>-  { 4, 16, NULL, NULL, 0 },</div><div class='add'>+  /* The 4-bit UIMM field in a VX form instruction.  */</div><div class='add'>+#define UIMM4 SR</div><div class='add'>+  { 0xf, 16, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The STRM field in an X AltiVec form instruction.  */</div><div class='ctx'> #define STRM SR + 1</div><div class='del'>-#define STRM_MASK (0x3 &lt;&lt; 21)</div><div class='del'>-  { 2, 21, NULL, NULL, 0 },</div><div class='add'>+  /* The T field in a tlbilx form instruction.  */</div><div class='add'>+#define T STRM</div><div class='add'>+  /* The L field in wclr instructions.  */</div><div class='add'>+#define L2 STRM</div><div class='add'>+  { 0x3, 21, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+  /* The ESYNC field in an X (sync) form instruction.  */</div><div class='add'>+#define ESYNC STRM + 1</div><div class='add'>+  { 0xf, 16, insert_esync, NULL, PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='ctx'>   /* The SV field in a POWER SC form instruction.  */</div><div class='del'>-#define SV STRM + 1</div><div class='del'>-  { 14, 2, NULL, NULL, 0 },</div><div class='add'>+#define SV ESYNC + 1</div><div class='add'>+  { 0x3fff, 2, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The TBR field in an XFX form instruction.  This is like the SPR</div><div class='ctx'>      field, but it is optional.  */</div><div class='ctx'> #define TBR SV + 1</div><div class='del'>-  { 10, 11, insert_tbr, extract_tbr, PPC_OPERAND_OPTIONAL },</div><div class='add'>+  { 0x3ff, 11, insert_tbr, extract_tbr,</div><div class='add'>+    PPC_OPERAND_OPTIONAL | PPC_OPERAND_OPTIONAL_VALUE},</div><div class='add'>+  /* If the TBR operand is ommitted, use the value 268.  */</div><div class='add'>+  { -1, 268, NULL, NULL, 0},</div><div class='ctx'> </div><div class='ctx'>   /* The TO field in a D or X form instruction.  */</div><div class='del'>-#define TO TBR + 1</div><div class='add'>+#define TO TBR + 2</div><div class='add'>+#define DUI TO</div><div class='ctx'> #define TO_MASK (0x1f &lt;&lt; 21)</div><div class='del'>-  { 5, 21, NULL, NULL, 0 },</div><div class='del'>-</div><div class='del'>-  /* The U field in an X form instruction.  */</div><div class='del'>-#define U TO + 1</div><div class='del'>-  { 4, 12, NULL, NULL, 0 },</div><div class='add'>+  { 0x1f, 21, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The UI field in a D form instruction.  */</div><div class='del'>-#define UI U + 1</div><div class='del'>-  { 16, 0, NULL, NULL, 0 },</div><div class='add'>+#define UI TO + 1</div><div class='add'>+  { 0xffff, 0, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+#define UISIGNOPT UI + 1</div><div class='add'>+  { 0xffff, 0, NULL, NULL, PPC_OPERAND_SIGNOPT },</div><div class='add'>+</div><div class='add'>+  /* The IMM field in an SE_IM5 instruction.  */</div><div class='add'>+#define UI5 UISIGNOPT + 1</div><div class='add'>+  { 0x1f, 4, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+  /* The OIMM field in an SE_OIM5 instruction.  */</div><div class='add'>+#define OIMM5 UI5 + 1</div><div class='add'>+  { 0x1f, PPC_OPSHIFT_INV, insert_oimm, extract_oimm, PPC_OPERAND_PLUS1 },</div><div class='add'>+</div><div class='add'>+  /* The UI7 field in an SE_LI instruction.  */</div><div class='add'>+#define UI7 OIMM5 + 1</div><div class='add'>+  { 0x7f, 4, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The VA field in a VA, VX or VXR form instruction.  */</div><div class='del'>-#define VA UI + 1</div><div class='del'>-#define VA_MASK	(0x1f &lt;&lt; 16)</div><div class='del'>-  { 5, 16, NULL, NULL, PPC_OPERAND_VR },</div><div class='add'>+#define VA UI7 + 1</div><div class='add'>+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_VR },</div><div class='ctx'> </div><div class='ctx'>   /* The VB field in a VA, VX or VXR form instruction.  */</div><div class='ctx'> #define VB VA + 1</div><div class='del'>-#define VB_MASK (0x1f &lt;&lt; 11)</div><div class='del'>-  { 5, 11, NULL, NULL, PPC_OPERAND_VR },</div><div class='add'>+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_VR },</div><div class='ctx'> </div><div class='ctx'>   /* The VC field in a VA form instruction.  */</div><div class='ctx'> #define VC VB + 1</div><div class='del'>-#define VC_MASK (0x1f &lt;&lt; 6)</div><div class='del'>-  { 5, 6, NULL, NULL, PPC_OPERAND_VR },</div><div class='add'>+  { 0x1f, 6, NULL, NULL, PPC_OPERAND_VR },</div><div class='ctx'> </div><div class='ctx'>   /* The VD or VS field in a VA, VX, VXR or X form instruction.  */</div><div class='ctx'> #define VD VC + 1</div><div class='ctx'> #define VS VD</div><div class='del'>-#define VD_MASK (0x1f &lt;&lt; 21)</div><div class='del'>-  { 5, 21, NULL, NULL, PPC_OPERAND_VR },</div><div class='add'>+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_VR },</div><div class='ctx'> </div><div class='del'>-  /* The SIMM field in a VX form instruction.  */</div><div class='add'>+  /* The SIMM field in a VX form instruction, and TE in Z form.  */</div><div class='ctx'> #define SIMM VD + 1</div><div class='del'>-  { 5, 16, NULL, NULL, PPC_OPERAND_SIGNED},</div><div class='add'>+#define TE SIMM</div><div class='add'>+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_SIGNED},</div><div class='ctx'> </div><div class='ctx'>   /* The UIMM field in a VX form instruction.  */</div><div class='ctx'> #define UIMM SIMM + 1</div><div class='del'>-  { 5, 16, NULL, NULL, 0 },</div><div class='add'>+#define DCTL UIMM</div><div class='add'>+  { 0x1f, 16, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='del'>-  /* The SHB field in a VA form instruction.  */</div><div class='del'>-#define SHB UIMM + 1</div><div class='del'>-  { 4, 6, NULL, NULL, 0 },</div><div class='add'>+  /* The 3-bit UIMM field in a VX form instruction.  */</div><div class='add'>+#define UIMM3 UIMM + 1</div><div class='add'>+  { 0x7, 16, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='del'>-  /* The other UIMM field in a EVX form instruction.  */</div><div class='del'>-#define EVUIMM SHB + 1</div><div class='del'>-  { 5, 11, NULL, NULL, 0 },</div><div class='add'>+  /* The 6-bit UIM field in a X form instruction.  */</div><div class='add'>+#define UIM6 UIMM3 + 1</div><div class='add'>+  { 0x3f, 16, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+  /* The SIX field in a VX form instruction.  */</div><div class='add'>+#define SIX UIM6 + 1</div><div class='add'>+  { 0xf, 11, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+  /* The PS field in a VX form instruction.  */</div><div class='add'>+#define PS SIX + 1</div><div class='add'>+  { 0x1, 9, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+  /* The SHB field in a VA form instruction.  */</div><div class='add'>+#define SHB PS + 1</div><div class='add'>+  { 0xf, 6, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The other UIMM field in a half word EVX form instruction.  */</div><div class='del'>-#define EVUIMM_2 EVUIMM + 1</div><div class='del'>-  { 32, 11, insert_ev2, extract_ev2, PPC_OPERAND_PARENS },</div><div class='add'>+#define EVUIMM_2 SHB + 1</div><div class='add'>+  { 0x3e, 10, NULL, NULL, PPC_OPERAND_PARENS },</div><div class='ctx'> </div><div class='ctx'>   /* The other UIMM field in a word EVX form instruction.  */</div><div class='ctx'> #define EVUIMM_4 EVUIMM_2 + 1</div><div class='del'>-  { 32, 11, insert_ev4, extract_ev4, PPC_OPERAND_PARENS },</div><div class='add'>+  { 0x7c, 9, NULL, NULL, PPC_OPERAND_PARENS },</div><div class='ctx'> </div><div class='ctx'>   /* The other UIMM field in a double EVX form instruction.  */</div><div class='ctx'> #define EVUIMM_8 EVUIMM_4 + 1</div><div class='del'>-  { 32, 11, insert_ev8, extract_ev8, PPC_OPERAND_PARENS },</div><div class='add'>+  { 0xf8, 8, NULL, NULL, PPC_OPERAND_PARENS },</div><div class='ctx'> </div><div class='del'>-  /* The WS field.  */</div><div class='add'>+  /* The WS or DRM field in an X form instruction.  */</div><div class='ctx'> #define WS EVUIMM_8 + 1</div><div class='del'>-#define WS_MASK (0x7 &lt;&lt; 11)</div><div class='del'>-  { 3, 11, NULL, NULL, 0 },</div><div class='del'>-</div><div class='del'>-  /* The L field in an mtmsrd or A form instruction.  */</div><div class='del'>-#define MTMSRD_L WS + 1</div><div class='del'>-#define A_L MTMSRD_L</div><div class='del'>-  { 1, 16, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+#define DRM WS</div><div class='add'>+  { 0x7, 11, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+  /* PowerPC paired singles extensions.  */</div><div class='add'>+  /* W bit in the pair singles instructions for x type instructions.  */</div><div class='add'>+#define PSWM WS + 1</div><div class='add'>+  /* The BO16 field in a BD8 form instruction.  */</div><div class='add'>+#define BO16 PSWM</div><div class='add'>+  {  0x1, 10, 0, 0, 0 },</div><div class='add'>+</div><div class='add'>+  /* IDX bits for quantization in the pair singles instructions.  */</div><div class='add'>+#define PSQ PSWM + 1</div><div class='add'>+  {  0x7, 12, 0, 0, 0 },</div><div class='add'>+</div><div class='add'>+  /* IDX bits for quantization in the pair singles x-type instructions.  */</div><div class='add'>+#define PSQM PSQ + 1</div><div class='add'>+  {  0x7, 7, 0, 0, 0 },</div><div class='add'>+</div><div class='add'>+  /* Smaller D field for quantization in the pair singles instructions.  */</div><div class='add'>+#define PSD PSQM + 1</div><div class='add'>+  {  0xfff, 0, 0, 0,  PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },</div><div class='add'>+</div><div class='add'>+  /* The L field in an mtmsrd or A form instruction or R or W in an X form.  */</div><div class='add'>+#define A_L PSD + 1</div><div class='add'>+#define W A_L</div><div class='add'>+#define X_R A_L</div><div class='add'>+  { 0x1, 16, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+</div><div class='add'>+  /* The RMC or CY field in a Z23 form instruction.  */</div><div class='add'>+#define RMC A_L + 1</div><div class='add'>+#define CY RMC</div><div class='add'>+  { 0x3, 9, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='del'>-  /* The DCM field in a Z form instruction.  */</div><div class='del'>-#define DCM MTMSRD_L + 1</div><div class='del'>-  { 6, 16, NULL, NULL, 0 },</div><div class='del'>-</div><div class='del'>-  /* Likewise, the DGM field in a Z form instruction.  */</div><div class='del'>-#define DGM DCM + 1</div><div class='del'>-  { 6, 16, NULL, NULL, 0 },</div><div class='add'>+#define R RMC + 1</div><div class='add'>+  { 0x1, 16, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='del'>-#define TE DGM + 1</div><div class='del'>-  { 5, 11, NULL, NULL, 0 },</div><div class='add'>+#define RIC R + 1</div><div class='add'>+  { 0x3, 18, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='del'>-#define RMC TE + 1</div><div class='del'>-  { 2, 21, NULL, NULL, 0 },</div><div class='add'>+#define PRS RIC + 1</div><div class='add'>+  { 0x1, 17, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='ctx'> </div><div class='del'>-#define R RMC + 1</div><div class='del'>-  { 1, 15, NULL, NULL, 0 },</div><div class='del'>-</div><div class='del'>-#define SP R + 1</div><div class='del'>-  { 2, 11, NULL, NULL, 0 },</div><div class='add'>+#define SP PRS + 1</div><div class='add'>+  { 0x3, 19, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'> #define S SP + 1</div><div class='del'>-  { 1, 11, NULL, NULL, 0 },</div><div class='add'>+  { 0x1, 20, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='del'>-  /* SH field starting at bit position 16.  */</div><div class='del'>-#define SH16 S + 1</div><div class='del'>-  { 6, 10, NULL, NULL, 0 },</div><div class='add'>+  /* The S field in a XL form instruction.  */</div><div class='add'>+#define SXL S + 1</div><div class='add'>+  { 0x1, 11, NULL, NULL, PPC_OPERAND_OPTIONAL | PPC_OPERAND_OPTIONAL_VALUE},</div><div class='add'>+  /* If the SXL operand is ommitted, use the value 1.  */</div><div class='add'>+  { -1, 1, NULL, NULL, 0},</div><div class='ctx'> </div><div class='del'>-  /* The L field in an X form with the RT field fixed instruction.  */</div><div class='del'>-#define XRT_L SH16 + 1</div><div class='del'>-  { 2, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+  /* SH field starting at bit position 16.  */</div><div class='add'>+#define SH16 SXL + 2</div><div class='add'>+  /* The DCM and DGM fields in a Z form instruction.  */</div><div class='add'>+#define DCM SH16</div><div class='add'>+#define DGM DCM</div><div class='add'>+  { 0x3f, 10, NULL, NULL, 0 },</div><div class='ctx'> </div><div class='ctx'>   /* The EH field in larx instruction.  */</div><div class='del'>-#define EH XRT_L + 1</div><div class='del'>-  { 1, 0, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+#define EH SH16 + 1</div><div class='add'>+  { 0x1, 0, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+</div><div class='add'>+  /* The L field in an mtfsf or XFL form instruction.  */</div><div class='add'>+  /* The A field in a HTM X form instruction.  */</div><div class='add'>+#define XFL_L EH + 1</div><div class='add'>+#define HTM_A XFL_L</div><div class='add'>+  { 0x1, 25, NULL, NULL, PPC_OPERAND_OPTIONAL},</div><div class='add'>+</div><div class='add'>+  /* Xilinx APU related masks and macros */</div><div class='add'>+#define FCRT XFL_L + 1</div><div class='add'>+#define FCRT_MASK (0x1f &lt;&lt; 21)</div><div class='add'>+  { 0x1f, 21, 0, 0, PPC_OPERAND_FCR },</div><div class='add'>+</div><div class='add'>+  /* Xilinx FSL related masks and macros */</div><div class='add'>+#define FSL FCRT + 1</div><div class='add'>+#define FSL_MASK (0x1f &lt;&lt; 11)</div><div class='add'>+  { 0x1f, 11, 0, 0, PPC_OPERAND_FSL },</div><div class='add'>+</div><div class='add'>+  /* Xilinx UDI related masks and macros */</div><div class='add'>+#define URT FSL + 1</div><div class='add'>+  { 0x1f, 21, 0, 0, PPC_OPERAND_UDI },</div><div class='add'>+</div><div class='add'>+#define URA URT + 1</div><div class='add'>+  { 0x1f, 16, 0, 0, PPC_OPERAND_UDI },</div><div class='add'>+</div><div class='add'>+#define URB URA + 1</div><div class='add'>+  { 0x1f, 11, 0, 0, PPC_OPERAND_UDI },</div><div class='add'>+</div><div class='add'>+#define URC URB + 1</div><div class='add'>+  { 0x1f, 6, 0, 0, PPC_OPERAND_UDI },</div><div class='add'>+</div><div class='add'>+  /* The VLESIMM field in a D form instruction.  */</div><div class='add'>+#define VLESIMM URC + 1</div><div class='add'>+  { 0xffff, PPC_OPSHIFT_INV, insert_vlesi, extract_vlesi,</div><div class='add'>+    PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT },</div><div class='add'>+</div><div class='add'>+  /* The VLENSIMM field in a D form instruction.  */</div><div class='add'>+#define VLENSIMM VLESIMM + 1</div><div class='add'>+  { 0xffff, PPC_OPSHIFT_INV, insert_vlensi, extract_vlensi,</div><div class='add'>+    PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT },</div><div class='add'>+</div><div class='add'>+  /* The VLEUIMM field in a D form instruction.  */</div><div class='add'>+#define VLEUIMM VLENSIMM + 1</div><div class='add'>+  { 0xffff, PPC_OPSHIFT_INV, insert_vleui, extract_vleui, 0 },</div><div class='add'>+</div><div class='add'>+  /* The VLEUIMML field in a D form instruction.  */</div><div class='add'>+#define VLEUIMML VLEUIMM + 1</div><div class='add'>+  { 0xffff, PPC_OPSHIFT_INV, insert_vleil, extract_vleil, 0 },</div><div class='add'>+</div><div class='add'>+  /* The XT and XS fields in an XX1 or XX3 form instruction.  This is split.  */</div><div class='add'>+#define XS6 VLEUIMML + 1</div><div class='add'>+#define XT6 XS6</div><div class='add'>+  { 0x3f, PPC_OPSHIFT_INV, insert_xt6, extract_xt6, PPC_OPERAND_VSR },</div><div class='add'>+</div><div class='add'>+  /* The XT and XS fields in an DQ form VSX instruction.  This is split.  */</div><div class='add'>+#define XSQ6 XT6 + 1</div><div class='add'>+#define XTQ6 XSQ6</div><div class='add'>+  { 0x3f, PPC_OPSHIFT_INV, insert_xtq6, extract_xtq6, PPC_OPERAND_VSR },</div><div class='add'>+</div><div class='add'>+  /* The XA field in an XX3 form instruction.  This is split.  */</div><div class='add'>+#define XA6 XTQ6 + 1</div><div class='add'>+  { 0x3f, PPC_OPSHIFT_INV, insert_xa6, extract_xa6, PPC_OPERAND_VSR },</div><div class='add'>+</div><div class='add'>+  /* The XB field in an XX2 or XX3 form instruction.  This is split.  */</div><div class='add'>+#define XB6 XA6 + 1</div><div class='add'>+  { 0x3f, PPC_OPSHIFT_INV, insert_xb6, extract_xb6, PPC_OPERAND_VSR },</div><div class='add'>+</div><div class='add'>+  /* The XB field in an XX3 form instruction when it must be the same as</div><div class='add'>+     the XA field in the instruction.  This is used in extended mnemonics</div><div class='add'>+     like xvmovdp.  This is split.  */</div><div class='add'>+#define XB6S XB6 + 1</div><div class='add'>+  { 0x3f, PPC_OPSHIFT_INV, insert_xb6s, extract_xb6s, PPC_OPERAND_FAKE },</div><div class='add'>+</div><div class='add'>+  /* The XC field in an XX4 form instruction.  This is split.  */</div><div class='add'>+#define XC6 XB6S + 1</div><div class='add'>+  { 0x3f, PPC_OPSHIFT_INV, insert_xc6, extract_xc6, PPC_OPERAND_VSR },</div><div class='add'>+</div><div class='add'>+  /* The DM or SHW field in an XX3 form instruction.  */</div><div class='add'>+#define DM XC6 + 1</div><div class='add'>+#define SHW DM</div><div class='add'>+  { 0x3, 8, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+  /* The DM field in an extended mnemonic XX3 form instruction.  */</div><div class='add'>+#define DMEX DM + 1</div><div class='add'>+  { 0x3, 8, insert_dm, extract_dm, 0 },</div><div class='add'>+</div><div class='add'>+  /* The UIM field in an XX2 form instruction.  */</div><div class='add'>+#define UIM DMEX + 1</div><div class='add'>+  /* The 2-bit UIMM field in a VX form instruction.  */</div><div class='add'>+#define UIMM2 UIM</div><div class='add'>+  /* The 2-bit L field in a darn instruction.  */</div><div class='add'>+#define LRAND UIM</div><div class='add'>+  { 0x3, 16, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+#define ERAT_T UIM + 1</div><div class='add'>+  { 0x7, 21, NULL, NULL, 0 },</div><div class='add'>+</div><div class='add'>+#define IH ERAT_T + 1</div><div class='add'>+  { 0x7, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },</div><div class='add'>+</div><div class='add'>+  /* The 8-bit IMM8 field in a XX1 form instruction.  */</div><div class='add'>+#define IMM8 IH + 1</div><div class='add'>+  { 0xff, 11, NULL, NULL, PPC_OPERAND_SIGNOPT },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const unsigned int num_powerpc_operands = (sizeof (powerpc_operands)</div><div class='add'>+					   / sizeof (powerpc_operands[0]));</div><div class='add'>+</div><div class='ctx'> /* The functions used to insert and extract complicated operands.  */</div><div class='ctx'> </div><div class='add'>+/* The ARX, ARY, RX and RY operands are alternate encodings of GPRs.  */</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_arx (unsigned long insn,</div><div class='add'>+	    long value,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  if (value &gt;= 8 &amp;&amp; value &lt; 24)</div><div class='add'>+    return insn | ((value - 8) &amp; 0xf);</div><div class='add'>+  else</div><div class='add'>+    {</div><div class='add'>+      *errmsg = _("invalid register");</div><div class='add'>+      return 0;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_arx (unsigned long insn,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return (insn &amp; 0xf) + 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_ary (unsigned long insn,</div><div class='add'>+	    long value,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  if (value &gt;= 8 &amp;&amp; value &lt; 24)</div><div class='add'>+    return insn | (((value - 8) &amp; 0xf) &lt;&lt; 4);</div><div class='add'>+  else</div><div class='add'>+    {</div><div class='add'>+      *errmsg = _("invalid register");</div><div class='add'>+      return 0;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_ary (unsigned long insn,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return ((insn &gt;&gt; 4) &amp; 0xf) + 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_rx (unsigned long insn,</div><div class='add'>+	   long value,</div><div class='add'>+	   ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	   const char **errmsg)</div><div class='add'>+{</div><div class='add'>+  if (value &gt;= 0 &amp;&amp; value &lt; 8)</div><div class='add'>+    return insn | value;</div><div class='add'>+  else if (value &gt;= 24 &amp;&amp; value &lt;= 31)</div><div class='add'>+    return insn | (value - 16);</div><div class='add'>+  else</div><div class='add'>+    {</div><div class='add'>+      *errmsg = _("invalid register");</div><div class='add'>+      return 0;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_rx (unsigned long insn,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  int value = insn &amp; 0xf;</div><div class='add'>+  if (value &gt;= 0 &amp;&amp; value &lt; 8)</div><div class='add'>+    return value;</div><div class='add'>+  else</div><div class='add'>+    return value + 16;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_ry (unsigned long insn,</div><div class='add'>+	   long value,</div><div class='add'>+	   ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	   const char **errmsg)</div><div class='add'>+{</div><div class='add'>+  if (value &gt;= 0 &amp;&amp; value &lt; 8)</div><div class='add'>+    return insn | (value &lt;&lt; 4);</div><div class='add'>+  else if (value &gt;= 24 &amp;&amp; value &lt;= 31)</div><div class='add'>+    return insn | ((value - 16) &lt;&lt; 4);</div><div class='add'>+  else</div><div class='add'>+    {</div><div class='add'>+      *errmsg = _("invalid register");</div><div class='add'>+      return 0;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_ry (unsigned long insn,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  int value = (insn &gt;&gt; 4) &amp; 0xf;</div><div class='add'>+  if (value &gt;= 0 &amp;&amp; value &lt; 8)</div><div class='add'>+    return value;</div><div class='add'>+  else</div><div class='add'>+    return value + 16;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* The BA field in an XL form instruction when it must be the same as</div><div class='ctx'>    the BT field in the same instruction.  This operand is marked FAKE.</div><div class='ctx'>    The insertion function just copies the BT field into the BA field,</div><div class='hunk'>@@ -615,7 +1086,7 @@ const struct powerpc_operand powerpc_operands[] =</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_bat (unsigned long insn,</div><div class='ctx'> 	    long value ATTRIBUTE_UNUSED,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='ctx'>   return insn | (((insn &gt;&gt; 21) &amp; 0x1f) &lt;&lt; 16);</div><div class='hunk'>@@ -623,7 +1094,7 @@ insert_bat (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_bat (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid)</div><div class='ctx'> {</div><div class='ctx'>   if (((insn &gt;&gt; 21) &amp; 0x1f) != ((insn &gt;&gt; 16) &amp; 0x1f))</div><div class='hunk'>@@ -640,7 +1111,7 @@ extract_bat (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_bba (unsigned long insn,</div><div class='ctx'> 	    long value ATTRIBUTE_UNUSED,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='ctx'>   return insn | (((insn &gt;&gt; 16) &amp; 0x1f) &lt;&lt; 11);</div><div class='hunk'>@@ -648,7 +1119,7 @@ insert_bba (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_bba (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid)</div><div class='ctx'> {</div><div class='ctx'>   if (((insn &gt;&gt; 16) &amp; 0x1f) != ((insn &gt;&gt; 11) &amp; 0x1f))</div><div class='hunk'>@@ -656,26 +1127,6 @@ extract_bba (unsigned long insn,</div><div class='ctx'>   return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The BD field in a B form instruction.  The lower two bits are</div><div class='del'>-   forced to zero.  */</div><div class='del'>-</div><div class='del'>-static unsigned long</div><div class='del'>-insert_bd (unsigned long insn,</div><div class='del'>-	   long value,</div><div class='del'>-	   int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	   const char **errmsg ATTRIBUTE_UNUSED)</div><div class='del'>-{</div><div class='del'>-  return insn | (value &amp; 0xfffc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-extract_bd (unsigned long insn,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	    int *invalid ATTRIBUTE_UNUSED)</div><div class='del'>-{</div><div class='del'>-  return ((insn &amp; 0xfffc) ^ 0x8000) - 0x8000;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* The BD field in a B form instruction when the - modifier is used.</div><div class='ctx'>    This modifier means that the branch is not expected to be taken.</div><div class='ctx'>    For chips built to versions of the architecture prior to version 2</div><div class='hunk'>@@ -687,15 +1138,21 @@ extract_bd (unsigned long insn,</div><div class='ctx'>    the "y" bit.  "at" == 00 =&gt; no hint, "at" == 01 =&gt; unpredictable,</div><div class='ctx'>    "at" == 10 =&gt; not taken, "at" == 11 =&gt; taken.  The "t" bit is 00001</div><div class='ctx'>    in BO field, the "a" bit is 00010 for branch on CR(BI) and 01000</div><div class='del'>-   for branch on CTR.  We only handle the taken/not-taken hint here.  */</div><div class='add'>+   for branch on CTR.  We only handle the taken/not-taken hint here.</div><div class='add'>+   Note that we don't relax the conditions tested here when</div><div class='add'>+   disassembling with -Many because insns using extract_bdm and</div><div class='add'>+   extract_bdp always occur in pairs.  One or the other will always</div><div class='add'>+   be valid.  */</div><div class='add'>+</div><div class='add'>+#define ISA_V2 (PPC_OPCODE_POWER4 | PPC_OPCODE_E500MC | PPC_OPCODE_TITAN)</div><div class='ctx'> </div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_bdm (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect,</div><div class='add'>+	    ppc_cpu_t dialect,</div><div class='ctx'> 	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='del'>-  if ((dialect &amp; PPC_OPCODE_POWER4) == 0)</div><div class='add'>+  if ((dialect &amp; ISA_V2) == 0)</div><div class='ctx'>     {</div><div class='ctx'>       if ((value &amp; 0x8000) != 0)</div><div class='ctx'> 	insn |= 1 &lt;&lt; 21;</div><div class='hunk'>@@ -712,10 +1169,10 @@ insert_bdm (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_bdm (unsigned long insn,</div><div class='del'>-	     int dialect,</div><div class='add'>+	     ppc_cpu_t dialect,</div><div class='ctx'> 	     int *invalid)</div><div class='ctx'> {</div><div class='del'>-  if ((dialect &amp; PPC_OPCODE_POWER4) == 0)</div><div class='add'>+  if ((dialect &amp; ISA_V2) == 0)</div><div class='ctx'>     {</div><div class='ctx'>       if (((insn &amp; (1 &lt;&lt; 21)) == 0) != ((insn &amp; (1 &lt;&lt; 15)) == 0))</div><div class='ctx'> 	*invalid = 1;</div><div class='hunk'>@@ -737,10 +1194,10 @@ extract_bdm (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_bdp (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect,</div><div class='add'>+	    ppc_cpu_t dialect,</div><div class='ctx'> 	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='del'>-  if ((dialect &amp; PPC_OPCODE_POWER4) == 0)</div><div class='add'>+  if ((dialect &amp; ISA_V2) == 0)</div><div class='ctx'>     {</div><div class='ctx'>       if ((value &amp; 0x8000) == 0)</div><div class='ctx'> 	insn |= 1 &lt;&lt; 21;</div><div class='hunk'>@@ -757,10 +1214,10 @@ insert_bdp (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_bdp (unsigned long insn,</div><div class='del'>-	     int dialect,</div><div class='add'>+	     ppc_cpu_t dialect,</div><div class='ctx'> 	     int *invalid)</div><div class='ctx'> {</div><div class='del'>-  if ((dialect &amp; PPC_OPCODE_POWER4) == 0)</div><div class='add'>+  if ((dialect &amp; ISA_V2) == 0)</div><div class='ctx'>     {</div><div class='ctx'>       if (((insn &amp; (1 &lt;&lt; 21)) == 0) == ((insn &amp; (1 &lt;&lt; 15)) == 0))</div><div class='ctx'> 	*invalid = 1;</div><div class='hunk'>@@ -775,55 +1232,70 @@ extract_bdp (unsigned long insn,</div><div class='ctx'>   return ((insn &amp; 0xfffc) ^ 0x8000) - 0x8000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int</div><div class='add'>+valid_bo_pre_v2 (long value)</div><div class='add'>+{</div><div class='add'>+  /* Certain encodings have bits that are required to be zero.</div><div class='add'>+     These are (z must be zero, y may be anything):</div><div class='add'>+	 0000y</div><div class='add'>+	 0001y</div><div class='add'>+	 001zy</div><div class='add'>+	 0100y</div><div class='add'>+	 0101y</div><div class='add'>+	 011zy</div><div class='add'>+	 1z00y</div><div class='add'>+	 1z01y</div><div class='add'>+	 1z1zz</div><div class='add'>+  */</div><div class='add'>+  if ((value &amp; 0x14) == 0)</div><div class='add'>+    return 1;</div><div class='add'>+  else if ((value &amp; 0x14) == 0x4)</div><div class='add'>+    return (value &amp; 0x2) == 0;</div><div class='add'>+  else if ((value &amp; 0x14) == 0x10)</div><div class='add'>+    return (value &amp; 0x8) == 0;</div><div class='add'>+  else</div><div class='add'>+    return value == 0x14;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+valid_bo_post_v2 (long value)</div><div class='add'>+{</div><div class='add'>+  /* Certain encodings have bits that are required to be zero.</div><div class='add'>+     These are (z must be zero, a &amp; t may be anything):</div><div class='add'>+	 0000z</div><div class='add'>+	 0001z</div><div class='add'>+	 001at</div><div class='add'>+	 0100z</div><div class='add'>+	 0101z</div><div class='add'>+	 011at</div><div class='add'>+	 1a00t</div><div class='add'>+	 1a01t</div><div class='add'>+	 1z1zz</div><div class='add'>+  */</div><div class='add'>+  if ((value &amp; 0x14) == 0)</div><div class='add'>+    return (value &amp; 0x1) == 0;</div><div class='add'>+  else if ((value &amp; 0x14) == 0x14)</div><div class='add'>+    return value == 0x14;</div><div class='add'>+  else</div><div class='add'>+    return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Check for legal values of a BO field.  */</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-valid_bo (long value, int dialect)</div><div class='add'>+valid_bo (long value, ppc_cpu_t dialect, int extract)</div><div class='ctx'> {</div><div class='del'>-  if ((dialect &amp; PPC_OPCODE_POWER4) == 0)</div><div class='del'>-    {</div><div class='del'>-      /* Certain encodings have bits that are required to be zero.</div><div class='del'>-	 These are (z must be zero, y may be anything):</div><div class='del'>-	     001zy</div><div class='del'>-	     011zy</div><div class='del'>-	     1z00y</div><div class='del'>-	     1z01y</div><div class='del'>-	     1z1zz</div><div class='del'>-      */</div><div class='del'>-      switch (value &amp; 0x14)</div><div class='del'>-	{</div><div class='del'>-	default:</div><div class='del'>-	case 0:</div><div class='del'>-	  return 1;</div><div class='del'>-	case 0x4:</div><div class='del'>-	  return (value &amp; 0x2) == 0;</div><div class='del'>-	case 0x10:</div><div class='del'>-	  return (value &amp; 0x8) == 0;</div><div class='del'>-	case 0x14:</div><div class='del'>-	  return value == 0x14;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='add'>+  int valid_y = valid_bo_pre_v2 (value);</div><div class='add'>+  int valid_at = valid_bo_post_v2 (value);</div><div class='add'>+</div><div class='add'>+  /* When disassembling with -Many, accept either encoding on the</div><div class='add'>+     second pass through opcodes.  */</div><div class='add'>+  if (extract &amp;&amp; dialect == ~(ppc_cpu_t) PPC_OPCODE_ANY)</div><div class='add'>+    return valid_y || valid_at;</div><div class='add'>+  if ((dialect &amp; ISA_V2) == 0)</div><div class='add'>+    return valid_y;</div><div class='ctx'>   else</div><div class='del'>-    {</div><div class='del'>-      /* Certain encodings have bits that are required to be zero.</div><div class='del'>-	 These are (z must be zero, a &amp; t may be anything):</div><div class='del'>-	     0000z</div><div class='del'>-	     0001z</div><div class='del'>-	     0100z</div><div class='del'>-	     0101z</div><div class='del'>-	     001at</div><div class='del'>-	     011at</div><div class='del'>-	     1a00t</div><div class='del'>-	     1a01t</div><div class='del'>-	     1z1zz</div><div class='del'>-      */</div><div class='del'>-      if ((value &amp; 0x14) == 0)</div><div class='del'>-	return (value &amp; 0x1) == 0;</div><div class='del'>-      else if ((value &amp; 0x14) == 0x14)</div><div class='del'>-	return value == 0x14;</div><div class='del'>-      else</div><div class='del'>-	return 1;</div><div class='del'>-    }</div><div class='add'>+    return valid_at;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The BO field in a B form instruction.  Warn about attempts to set</div><div class='hunk'>@@ -832,23 +1304,25 @@ valid_bo (long value, int dialect)</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_bo (unsigned long insn,</div><div class='ctx'> 	   long value,</div><div class='del'>-	   int dialect,</div><div class='add'>+	   ppc_cpu_t dialect,</div><div class='ctx'> 	   const char **errmsg)</div><div class='ctx'> {</div><div class='del'>-  if (!valid_bo (value, dialect))</div><div class='add'>+  if (!valid_bo (value, dialect, 0))</div><div class='ctx'>     *errmsg = _("invalid conditional option");</div><div class='add'>+  else if (PPC_OP (insn) == 19 &amp;&amp; (insn &amp; 0x400) &amp;&amp; ! (value &amp; 4))</div><div class='add'>+    *errmsg = _("invalid counter access");</div><div class='ctx'>   return insn | ((value &amp; 0x1f) &lt;&lt; 21);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_bo (unsigned long insn,</div><div class='del'>-	    int dialect,</div><div class='add'>+	    ppc_cpu_t dialect,</div><div class='ctx'> 	    int *invalid)</div><div class='ctx'> {</div><div class='ctx'>   long value;</div><div class='ctx'> </div><div class='ctx'>   value = (insn &gt;&gt; 21) &amp; 0x1f;</div><div class='del'>-  if (!valid_bo (value, dialect))</div><div class='add'>+  if (!valid_bo (value, dialect, 1))</div><div class='ctx'>     *invalid = 1;</div><div class='ctx'>   return value;</div><div class='ctx'> }</div><div class='hunk'>@@ -860,11 +1334,13 @@ extract_bo (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_boe (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect,</div><div class='add'>+	    ppc_cpu_t dialect,</div><div class='ctx'> 	    const char **errmsg)</div><div class='ctx'> {</div><div class='del'>-  if (!valid_bo (value, dialect))</div><div class='add'>+  if (!valid_bo (value, dialect, 0))</div><div class='ctx'>     *errmsg = _("invalid conditional option");</div><div class='add'>+  else if (PPC_OP (insn) == 19 &amp;&amp; (insn &amp; 0x400) &amp;&amp; ! (value &amp; 4))</div><div class='add'>+    *errmsg = _("invalid counter access");</div><div class='ctx'>   else if ((value &amp; 1) != 0)</div><div class='ctx'>     *errmsg = _("attempt to set y bit when using + or - modifier");</div><div class='ctx'> </div><div class='hunk'>@@ -873,166 +1349,73 @@ insert_boe (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_boe (unsigned long insn,</div><div class='del'>-	     int dialect,</div><div class='add'>+	     ppc_cpu_t dialect,</div><div class='ctx'> 	     int *invalid)</div><div class='ctx'> {</div><div class='ctx'>   long value;</div><div class='ctx'> </div><div class='ctx'>   value = (insn &gt;&gt; 21) &amp; 0x1f;</div><div class='del'>-  if (!valid_bo (value, dialect))</div><div class='add'>+  if (!valid_bo (value, dialect, 1))</div><div class='ctx'>     *invalid = 1;</div><div class='ctx'>   return value &amp; 0x1e;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The DQ field in a DQ form instruction.  This is like D, but the</div><div class='del'>-   lower four bits are forced to zero. */</div><div class='del'>-</div><div class='del'>-static unsigned long</div><div class='del'>-insert_dq (unsigned long insn,</div><div class='del'>-	   long value,</div><div class='del'>-	   int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	   const char **errmsg)</div><div class='del'>-{</div><div class='del'>-  if ((value &amp; 0xf) != 0)</div><div class='del'>-    *errmsg = _("offset not a multiple of 16");</div><div class='del'>-  return insn | (value &amp; 0xfff0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-extract_dq (unsigned long insn,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	    int *invalid ATTRIBUTE_UNUSED)</div><div class='del'>-{</div><div class='del'>-  return ((insn &amp; 0xfff0) ^ 0x8000) - 0x8000;</div><div class='del'>-}</div><div class='add'>+/* The DCMX field in a X form instruction when the field is split</div><div class='add'>+   into separate DC, DM and DX fields.  */</div><div class='ctx'> </div><div class='ctx'> static unsigned long</div><div class='del'>-insert_ev2 (unsigned long insn,</div><div class='add'>+insert_dcmxs (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	    const char **errmsg)</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='del'>-  if ((value &amp; 1) != 0)</div><div class='del'>-    *errmsg = _("offset not a multiple of 2");</div><div class='del'>-  if ((value &gt; 62) != 0)</div><div class='del'>-    *errmsg = _("offset greater than 62");</div><div class='del'>-  return insn | ((value &amp; 0x3e) &lt;&lt; 10);</div><div class='add'>+  return insn | ((value &amp; 0x1f) &lt;&lt; 16) | ((value &amp; 0x20) &gt;&gt; 3) | (value &amp; 0x40);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='del'>-extract_ev2 (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+extract_dcmxs (unsigned long insn,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='del'>-  return (insn &gt;&gt; 10) &amp; 0x3e;</div><div class='add'>+  return (insn &amp; 0x40) | ((insn &lt;&lt; 3) &amp; 0x20) | ((insn &gt;&gt; 16) &amp; 0x1f);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long</div><div class='del'>-insert_ev4 (unsigned long insn,</div><div class='del'>-	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	    const char **errmsg)</div><div class='del'>-{</div><div class='del'>-  if ((value &amp; 3) != 0)</div><div class='del'>-    *errmsg = _("offset not a multiple of 4");</div><div class='del'>-  if ((value &gt; 124) != 0)</div><div class='del'>-    *errmsg = _("offset greater than 124");</div><div class='del'>-  return insn | ((value &amp; 0x7c) &lt;&lt; 9);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-extract_ev4 (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	     int *invalid ATTRIBUTE_UNUSED)</div><div class='del'>-{</div><div class='del'>-  return (insn &gt;&gt; 9) &amp; 0x7c;</div><div class='del'>-}</div><div class='add'>+/* The D field in a DX form instruction when the field is split</div><div class='add'>+   into separate D0, D1 and D2 fields.  */</div><div class='ctx'> </div><div class='ctx'> static unsigned long</div><div class='del'>-insert_ev8 (unsigned long insn,</div><div class='add'>+insert_dxd (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	    const char **errmsg)</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='del'>-  if ((value &amp; 7) != 0)</div><div class='del'>-    *errmsg = _("offset not a multiple of 8");</div><div class='del'>-  if ((value &gt; 248) != 0)</div><div class='del'>-    *errmsg = _("offset greater than 248");</div><div class='del'>-  return insn | ((value &amp; 0xf8) &lt;&lt; 8);</div><div class='add'>+  return insn | (value &amp; 0xffc1) | ((value &amp; 0x3e) &lt;&lt; 15);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='del'>-extract_ev8 (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+extract_dxd (unsigned long insn,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='del'>-  return (insn &gt;&gt; 8) &amp; 0xf8;</div><div class='add'>+  unsigned long dxd = (insn &amp; 0xffc1) | ((insn &gt;&gt; 15) &amp; 0x3e);</div><div class='add'>+  return (dxd ^ 0x8000) - 0x8000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The DS field in a DS form instruction.  This is like D, but the</div><div class='del'>-   lower two bits are forced to zero.  */</div><div class='del'>-</div><div class='ctx'> static unsigned long</div><div class='del'>-insert_ds (unsigned long insn,</div><div class='del'>-	   long value,</div><div class='del'>-	   int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	   const char **errmsg)</div><div class='del'>-{</div><div class='del'>-  if ((value &amp; 3) != 0)</div><div class='del'>-    *errmsg = _("offset not a multiple of 4");</div><div class='del'>-  return insn | (value &amp; 0xfffc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-extract_ds (unsigned long insn,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	    int *invalid ATTRIBUTE_UNUSED)</div><div class='del'>-{</div><div class='del'>-  return ((insn &amp; 0xfffc) ^ 0x8000) - 0x8000;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The DE field in a DE form instruction.  */</div><div class='del'>-</div><div class='del'>-static unsigned long</div><div class='del'>-insert_de (unsigned long insn,</div><div class='del'>-	   long value,</div><div class='del'>-	   int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	   const char **errmsg)</div><div class='del'>-{</div><div class='del'>-  if (value &gt; 2047 || value &lt; -2048)</div><div class='del'>-    *errmsg = _("offset not between -2048 and 2047");</div><div class='del'>-  return insn | ((value &lt;&lt; 4) &amp; 0xfff0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-extract_de (unsigned long insn,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	    int *invalid ATTRIBUTE_UNUSED)</div><div class='del'>-{</div><div class='del'>-  return (insn &amp; 0xfff0) &gt;&gt; 4;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The DES field in a DES form instruction.  */</div><div class='del'>-</div><div class='del'>-static unsigned long</div><div class='del'>-insert_des (unsigned long insn,</div><div class='add'>+insert_dxdn (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	    const char **errmsg)</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='del'>-  if (value &gt; 8191 || value &lt; -8192)</div><div class='del'>-    *errmsg = _("offset not between -8192 and 8191");</div><div class='del'>-  else if ((value &amp; 3) != 0)</div><div class='del'>-    *errmsg = _("offset not a multiple of 4");</div><div class='del'>-  return insn | ((value &lt;&lt; 2) &amp; 0xfff0);</div><div class='add'>+  return insert_dxd (insn, -value, dialect, errmsg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='del'>-extract_des (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+extract_dxdn (unsigned long insn,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='del'>-  return (((insn &gt;&gt; 2) &amp; 0x3ffc) ^ 0x2000) - 0x2000;</div><div class='add'>+  return -extract_dxd (insn, dialect, invalid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* FXM mask in mfcr and mtcrf instructions.  */</div><div class='hunk'>@@ -1040,7 +1423,7 @@ extract_des (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_fxm (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect,</div><div class='add'>+	    ppc_cpu_t dialect,</div><div class='ctx'> 	    const char **errmsg)</div><div class='ctx'> {</div><div class='ctx'>   /* If we're handling the mfocrf and mtocrf insns ensure that exactly</div><div class='hunk'>@@ -1054,19 +1437,13 @@ insert_fxm (unsigned long insn,</div><div class='ctx'> 	}</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-  /* If the optional field on mfcr is missing that means we want to use</div><div class='del'>-     the old form of the instruction that moves the whole cr.  In that</div><div class='del'>-     case we'll have VALUE zero.  There doesn't seem to be a way to</div><div class='del'>-     distinguish this from the case where someone writes mfcr %r3,0.  */</div><div class='del'>-  else if (value == 0)</div><div class='del'>-    ;</div><div class='del'>-</div><div class='ctx'>   /* If only one bit of the FXM field is set, we can use the new form</div><div class='ctx'>      of the instruction, which is faster.  Unlike the Power4 branch hint</div><div class='ctx'>      encoding, this is not backward compatible.  Do not generate the</div><div class='ctx'>      new form unless -mpower4 has been given, or -many and the two</div><div class='ctx'>      operand form of mfcr was used.  */</div><div class='del'>-  else if ((value &amp; -value) == value</div><div class='add'>+  else if (value &gt; 0</div><div class='add'>+	   &amp;&amp; (value &amp; -value) == value</div><div class='ctx'> 	   &amp;&amp; ((dialect &amp; PPC_OPCODE_POWER4) != 0</div><div class='ctx'> 	       || ((dialect &amp; PPC_OPCODE_ANY) != 0</div><div class='ctx'> 		   &amp;&amp; (insn &amp; (0x3ff &lt;&lt; 1)) == 19 &lt;&lt; 1)))</div><div class='hunk'>@@ -1075,7 +1452,10 @@ insert_fxm (unsigned long insn,</div><div class='ctx'>   /* Any other value on mfcr is an error.  */</div><div class='ctx'>   else if ((insn &amp; (0x3ff &lt;&lt; 1)) == 19 &lt;&lt; 1)</div><div class='ctx'>     {</div><div class='del'>-      *errmsg = _("ignoring invalid mfcr mask");</div><div class='add'>+      /* A value of -1 means we used the one operand form of</div><div class='add'>+	 mfcr which is valid.  */</div><div class='add'>+      if (value != -1)</div><div class='add'>+        *errmsg = _("invalid mfcr mask");</div><div class='ctx'>       value = 0;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -1084,7 +1464,7 @@ insert_fxm (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_fxm (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid)</div><div class='ctx'> {</div><div class='ctx'>   long mask = (insn &gt;&gt; 12) &amp; 0xff;</div><div class='hunk'>@@ -1102,31 +1482,86 @@ extract_fxm (unsigned long insn,</div><div class='ctx'>     {</div><div class='ctx'>       if (mask != 0)</div><div class='ctx'> 	*invalid = 1;</div><div class='add'>+      else</div><div class='add'>+	mask = -1;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>   return mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The LI field in an I form instruction.  The lower two bits are</div><div class='del'>-   forced to zero.  */</div><div class='add'>+static unsigned long</div><div class='add'>+insert_li20 (unsigned long insn,</div><div class='add'>+	     long value,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | ((value &amp; 0xf0000) &gt;&gt; 5) | ((value &amp; 0x0f800) &lt;&lt; 5) | (value &amp; 0x7ff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_li20 (unsigned long insn,</div><div class='add'>+	      ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	      int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  long ext = ((insn &amp; 0x4000) == 0x4000) ? 0xfff00000 : 0x00000000;</div><div class='add'>+</div><div class='add'>+  return ext</div><div class='add'>+         | (((insn &gt;&gt; 11) &amp; 0xf) &lt;&lt; 16)</div><div class='add'>+         | (((insn &gt;&gt; 17) &amp; 0xf) &lt;&lt; 12)</div><div class='add'>+         | (((insn &gt;&gt; 16) &amp; 0x1) &lt;&lt; 11)</div><div class='add'>+         | (insn &amp; 0x7ff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The 2-bit L field in a SYNC or WC field in a WAIT instruction.</div><div class='add'>+   For SYNC, some L values are reserved:</div><div class='add'>+     * Value 3 is reserved on newer server cpus.</div><div class='add'>+     * Values 2 and 3 are reserved on all other cpus.  */</div><div class='ctx'> </div><div class='ctx'> static unsigned long</div><div class='del'>-insert_li (unsigned long insn,</div><div class='add'>+insert_ls (unsigned long insn,</div><div class='ctx'> 	   long value,</div><div class='del'>-	   int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	   ppc_cpu_t dialect,</div><div class='ctx'> 	   const char **errmsg)</div><div class='ctx'> {</div><div class='del'>-  if ((value &amp; 3) != 0)</div><div class='del'>-    *errmsg = _("ignoring least significant bits in branch offset");</div><div class='del'>-  return insn | (value &amp; 0x3fffffc);</div><div class='add'>+  /* For SYNC, some L values are illegal.  */</div><div class='add'>+  if (((insn &gt;&gt; 1) &amp; 0x3ff) == 598)</div><div class='add'>+    {</div><div class='add'>+      long max_lvalue = (dialect &amp; PPC_OPCODE_POWER4) ? 2 : 1;</div><div class='add'>+      if (value &gt; max_lvalue)</div><div class='add'>+	{</div><div class='add'>+	  *errmsg = _("illegal L operand value");</div><div class='add'>+	  return insn;</div><div class='add'>+	}</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+  return insn | ((value &amp; 0x3) &lt;&lt; 21);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long</div><div class='del'>-extract_li (unsigned long insn,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	    int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+/* The 4-bit E field in a sync instruction that accepts 2 operands.</div><div class='add'>+   If ESYNC is non-zero, then the L field must be either 0 or 1 and</div><div class='add'>+   the complement of ESYNC-bit2.  */</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_esync (unsigned long insn,</div><div class='add'>+	      long value,</div><div class='add'>+	      ppc_cpu_t dialect,</div><div class='add'>+	      const char **errmsg)</div><div class='ctx'> {</div><div class='del'>-  return ((insn &amp; 0x3fffffc) ^ 0x2000000) - 0x2000000;</div><div class='add'>+  unsigned long ls = (insn &gt;&gt; 21) &amp; 0x03;</div><div class='add'>+</div><div class='add'>+  if (value == 0)</div><div class='add'>+    {</div><div class='add'>+      if (((dialect &amp; PPC_OPCODE_E6500) != 0 &amp;&amp; ls &gt; 1)</div><div class='add'>+	  || ((dialect &amp; PPC_OPCODE_POWER9) != 0 &amp;&amp; ls &gt; 2))</div><div class='add'>+        *errmsg = _("illegal L operand value");</div><div class='add'>+      return insn;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+  if ((ls &amp; ~0x1)</div><div class='add'>+      || (((value &gt;&gt; 1) &amp; 0x1) ^ ls) == 0)</div><div class='add'>+        *errmsg = _("incompatible L operand value");</div><div class='add'>+</div><div class='add'>+  return insn | ((value &amp; 0xf) &lt;&lt; 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The MB and ME fields in an M form instruction expressed as a single</div><div class='hunk'>@@ -1137,7 +1572,7 @@ extract_li (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_mbe (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg)</div><div class='ctx'> {</div><div class='ctx'>   unsigned long uval, mask;</div><div class='hunk'>@@ -1189,7 +1624,7 @@ insert_mbe (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_mbe (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid)</div><div class='ctx'> {</div><div class='ctx'>   long ret;</div><div class='hunk'>@@ -1223,7 +1658,7 @@ extract_mbe (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_mb6 (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='ctx'>   return insn | ((value &amp; 0x1f) &lt;&lt; 6) | (value &amp; 0x20);</div><div class='hunk'>@@ -1231,7 +1666,7 @@ insert_mb6 (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_mb6 (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='ctx'>   return ((insn &gt;&gt; 6) &amp; 0x1f) | (insn &amp; 0x20);</div><div class='hunk'>@@ -1240,22 +1675,9 @@ extract_mb6 (unsigned long insn,</div><div class='ctx'> /* The NB field in an X form instruction.  The value 32 is stored as</div><div class='ctx'>    0.  */</div><div class='ctx'> </div><div class='del'>-static unsigned long</div><div class='del'>-insert_nb (unsigned long insn,</div><div class='del'>-	   long value,</div><div class='del'>-	   int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	   const char **errmsg)</div><div class='del'>-{</div><div class='del'>-  if (value &lt; 0 || value &gt; 32)</div><div class='del'>-    *errmsg = _("value out of range");</div><div class='del'>-  if (value == 32)</div><div class='del'>-    value = 0;</div><div class='del'>-  return insn | ((value &amp; 0x1f) &lt;&lt; 11);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static long</div><div class='ctx'> extract_nb (unsigned long insn,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    int *invalid ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='ctx'>   long ret;</div><div class='hunk'>@@ -1266,6 +1688,26 @@ extract_nb (unsigned long insn,</div><div class='ctx'>   return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* The NB field in an lswi instruction, which has special value</div><div class='add'>+   restrictions.  The value 32 is stored as 0.  */</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_nbi (unsigned long insn,</div><div class='add'>+	    long value,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  long rtvalue = (insn &amp; RT_MASK) &gt;&gt; 21;</div><div class='add'>+  long ravalue = (insn &amp; RA_MASK) &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+  if (value == 0)</div><div class='add'>+    value = 32;</div><div class='add'>+  if (rtvalue + (value + 3) / 4 &gt; (rtvalue &gt; ravalue ? ravalue + 32</div><div class='add'>+						     : ravalue))</div><div class='add'>+    *errmsg = _("address register in load range");</div><div class='add'>+  return insn | ((value &amp; 0x1f) &lt;&lt; 11);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* The NSI field in a D form instruction.  This is the same as the SI</div><div class='ctx'>    field, only negated.  The extraction function always marks it as</div><div class='ctx'>    invalid, since we never want to recognize an instruction which uses</div><div class='hunk'>@@ -1274,7 +1716,7 @@ extract_nb (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_nsi (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='ctx'>   return insn | (-value &amp; 0xffff);</div><div class='hunk'>@@ -1282,7 +1724,7 @@ insert_nsi (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_nsi (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid)</div><div class='ctx'> {</div><div class='ctx'>   *invalid = 1;</div><div class='hunk'>@@ -1296,7 +1738,7 @@ extract_nsi (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_ral (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg)</div><div class='ctx'> {</div><div class='ctx'>   if (value == 0</div><div class='hunk'>@@ -1311,7 +1753,7 @@ insert_ral (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_ram (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg)</div><div class='ctx'> {</div><div class='ctx'>   if ((unsigned long) value &gt;= ((insn &gt;&gt; 21) &amp; 0x1f))</div><div class='hunk'>@@ -1319,13 +1761,13 @@ insert_ram (unsigned long insn,</div><div class='ctx'>   return insn | ((value &amp; 0x1f) &lt;&lt; 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The RA field in the DQ form lq instruction, which has special</div><div class='add'>+/* The RA field in the DQ form lq or an lswx instruction, which have special</div><div class='ctx'>    value restrictions.  */</div><div class='ctx'> </div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_raq (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg)</div><div class='ctx'> {</div><div class='ctx'>   long rtvalue = (insn &amp; RT_MASK) &gt;&gt; 21;</div><div class='hunk'>@@ -1342,7 +1784,7 @@ insert_raq (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_ras (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg)</div><div class='ctx'> {</div><div class='ctx'>   if (value == 0)</div><div class='hunk'>@@ -1359,7 +1801,7 @@ insert_ras (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_rbs (unsigned long insn,</div><div class='ctx'> 	    long value ATTRIBUTE_UNUSED,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='ctx'>   return insn | (((insn &gt;&gt; 21) &amp; 0x1f) &lt;&lt; 11);</div><div class='hunk'>@@ -1367,7 +1809,7 @@ insert_rbs (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_rbs (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid)</div><div class='ctx'> {</div><div class='ctx'>   if (((insn &gt;&gt; 21) &amp; 0x1f) != ((insn &gt;&gt; 11) &amp; 0x1f))</div><div class='hunk'>@@ -1375,32 +1817,155 @@ extract_rbs (unsigned long insn,</div><div class='ctx'>   return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The RT field of the DQ form lq instruction, which has special</div><div class='del'>-   value restrictions.  */</div><div class='add'>+/* The RB field in an lswx instruction, which has special value</div><div class='add'>+   restrictions.  */</div><div class='ctx'> </div><div class='ctx'> static unsigned long</div><div class='del'>-insert_rtq (unsigned long insn,</div><div class='add'>+insert_rbx (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg)</div><div class='ctx'> {</div><div class='del'>-  if ((value &amp; 1) != 0)</div><div class='del'>-    *errmsg = _("target register operand must be even");</div><div class='del'>-  return insn | ((value &amp; 0x1f) &lt;&lt; 21);</div><div class='add'>+  long rtvalue = (insn &amp; RT_MASK) &gt;&gt; 21;</div><div class='add'>+</div><div class='add'>+  if (value == rtvalue)</div><div class='add'>+    *errmsg = _("source and target register operands must be different");</div><div class='add'>+  return insn | ((value &amp; 0x1f) &lt;&lt; 11);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The RS field of the DS form stq instruction, which has special</div><div class='del'>-   value restrictions.  */</div><div class='add'>+/* The SCI8 field is made up of SCL and {U,N}I8 fields.  */</div><div class='add'>+static unsigned long</div><div class='add'>+insert_sci8 (unsigned long insn,</div><div class='add'>+	     long value,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     const char **errmsg)</div><div class='add'>+{</div><div class='add'>+  unsigned int fill_scale = 0;</div><div class='add'>+  unsigned long ui8 = value;</div><div class='add'>+</div><div class='add'>+  if ((ui8 &amp; 0xffffff00) == 0)</div><div class='add'>+    ;</div><div class='add'>+  else if ((ui8 &amp; 0xffffff00) == 0xffffff00)</div><div class='add'>+    fill_scale = 0x400;</div><div class='add'>+  else if ((ui8 &amp; 0xffff00ff) == 0)</div><div class='add'>+    {</div><div class='add'>+      fill_scale = 1 &lt;&lt; 8;</div><div class='add'>+      ui8 &gt;&gt;= 8;</div><div class='add'>+    }</div><div class='add'>+  else if ((ui8 &amp; 0xffff00ff) == 0xffff00ff)</div><div class='add'>+    {</div><div class='add'>+      fill_scale = 0x400 | (1 &lt;&lt; 8);</div><div class='add'>+      ui8 &gt;&gt;= 8;</div><div class='add'>+    }</div><div class='add'>+  else if ((ui8 &amp; 0xff00ffff) == 0)</div><div class='add'>+    {</div><div class='add'>+      fill_scale = 2 &lt;&lt; 8;</div><div class='add'>+      ui8 &gt;&gt;= 16;</div><div class='add'>+    }</div><div class='add'>+  else if ((ui8 &amp; 0xff00ffff) == 0xff00ffff)</div><div class='add'>+    {</div><div class='add'>+      fill_scale = 0x400 | (2 &lt;&lt; 8);</div><div class='add'>+      ui8 &gt;&gt;= 16;</div><div class='add'>+    }</div><div class='add'>+  else if ((ui8 &amp; 0x00ffffff) == 0)</div><div class='add'>+    {</div><div class='add'>+      fill_scale = 3 &lt;&lt; 8;</div><div class='add'>+      ui8 &gt;&gt;= 24;</div><div class='add'>+    }</div><div class='add'>+  else if ((ui8 &amp; 0x00ffffff) == 0x00ffffff)</div><div class='add'>+    {</div><div class='add'>+      fill_scale = 0x400 | (3 &lt;&lt; 8);</div><div class='add'>+      ui8 &gt;&gt;= 24;</div><div class='add'>+    }</div><div class='add'>+  else</div><div class='add'>+    {</div><div class='add'>+      *errmsg = _("illegal immediate value");</div><div class='add'>+      ui8 = 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+  return insn | fill_scale | (ui8 &amp; 0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_sci8 (unsigned long insn,</div><div class='add'>+	      ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	      int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  int fill = insn &amp; 0x400;</div><div class='add'>+  int scale_factor = (insn &amp; 0x300) &gt;&gt; 5;</div><div class='add'>+  long value = (insn &amp; 0xff) &lt;&lt; scale_factor;</div><div class='add'>+</div><div class='add'>+  if (fill != 0)</div><div class='add'>+    value |= ~((long) 0xff &lt;&lt; scale_factor);</div><div class='add'>+  return value;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static unsigned long</div><div class='del'>-insert_rsq (unsigned long insn,</div><div class='del'>-	    long value ATTRIBUTE_UNUSED,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	    const char **errmsg)</div><div class='add'>+insert_sci8n (unsigned long insn,</div><div class='add'>+	      long value,</div><div class='add'>+	      ppc_cpu_t dialect,</div><div class='add'>+	      const char **errmsg)</div><div class='ctx'> {</div><div class='del'>-  if ((value &amp; 1) != 0)</div><div class='del'>-    *errmsg = _("source register operand must be even");</div><div class='del'>-  return insn | ((value &amp; 0x1f) &lt;&lt; 21);</div><div class='add'>+  return insert_sci8 (insn, -value, dialect, errmsg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_sci8n (unsigned long insn,</div><div class='add'>+	       ppc_cpu_t dialect,</div><div class='add'>+	       int *invalid)</div><div class='add'>+{</div><div class='add'>+  return -extract_sci8 (insn, dialect, invalid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_sd4h (unsigned long insn,</div><div class='add'>+	     long value,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | ((value &amp; 0x1e) &lt;&lt; 7);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_sd4h (unsigned long insn,</div><div class='add'>+	      ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	      int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return ((insn &gt;&gt; 8) &amp; 0xf) &lt;&lt; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_sd4w (unsigned long insn,</div><div class='add'>+	     long value,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | ((value &amp; 0x3c) &lt;&lt; 6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_sd4w (unsigned long insn,</div><div class='add'>+	      ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	      int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return ((insn &gt;&gt; 8) &amp; 0xf) &lt;&lt; 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_oimm (unsigned long insn,</div><div class='add'>+	     long value,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | (((value - 1) &amp; 0x1f) &lt;&lt; 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_oimm (unsigned long insn,</div><div class='add'>+	      ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	      int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return ((insn &gt;&gt; 4) &amp; 0x1f) + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The SH field in an MD form instruction.  This is split.  */</div><div class='hunk'>@@ -1408,18 +1973,26 @@ insert_rsq (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_sh6 (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='del'>-  return insn | ((value &amp; 0x1f) &lt;&lt; 11) | ((value &amp; 0x20) &gt;&gt; 4);</div><div class='add'>+  /* SH6 operand in the rldixor instructions.  */</div><div class='add'>+  if (PPC_OP (insn) == 4)</div><div class='add'>+    return insn | ((value &amp; 0x1f) &lt;&lt; 6) | ((value &amp; 0x20) &gt;&gt; 5);</div><div class='add'>+  else</div><div class='add'>+    return insn | ((value &amp; 0x1f) &lt;&lt; 11) | ((value &amp; 0x20) &gt;&gt; 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_sh6 (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='del'>-  return ((insn &gt;&gt; 11) &amp; 0x1f) | ((insn &lt;&lt; 4) &amp; 0x20);</div><div class='add'>+  /* SH6 operand in the rldixor instructions.  */</div><div class='add'>+  if (PPC_OP (insn) == 4)</div><div class='add'>+    return ((insn &gt;&gt; 6) &amp; 0x1f) | ((insn &lt;&lt; 5) &amp; 0x20);</div><div class='add'>+  else</div><div class='add'>+    return ((insn &gt;&gt; 11) &amp; 0x1f) | ((insn &lt;&lt; 4) &amp; 0x20);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The SPR field in an XFX form instruction.  This is flipped--the</div><div class='hunk'>@@ -1428,7 +2001,7 @@ extract_sh6 (unsigned long insn,</div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_spr (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='ctx'>   return insn | ((value &amp; 0x1f) &lt;&lt; 16) | ((value &amp; 0x3e0) &lt;&lt; 6);</div><div class='hunk'>@@ -1436,26 +2009,23 @@ insert_spr (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_spr (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='ctx'> 	     int *invalid ATTRIBUTE_UNUSED)</div><div class='ctx'> {</div><div class='ctx'>   return ((insn &gt;&gt; 16) &amp; 0x1f) | ((insn &gt;&gt; 6) &amp; 0x3e0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Some dialects have 8 SPRG registers instead of the standard 4.  */</div><div class='add'>+#define ALLOW8_SPRG (PPC_OPCODE_BOOKE | PPC_OPCODE_405)</div><div class='ctx'> </div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_sprg (unsigned long insn,</div><div class='ctx'> 	     long value,</div><div class='del'>-	     int dialect,</div><div class='add'>+	     ppc_cpu_t dialect,</div><div class='ctx'> 	     const char **errmsg)</div><div class='ctx'> {</div><div class='del'>-  /* This check uses PPC_OPCODE_403 because PPC405 is later defined</div><div class='del'>-     as a synonym.  If ever a 405 specific dialect is added this</div><div class='del'>-     check should use that instead.  */</div><div class='ctx'>   if (value &gt; 7</div><div class='del'>-      || (value &gt; 3</div><div class='del'>-	  &amp;&amp; (dialect &amp; (PPC_OPCODE_BOOKE | PPC_OPCODE_403)) == 0))</div><div class='add'>+      || (value &gt; 3 &amp;&amp; (dialect &amp; ALLOW8_SPRG) == 0))</div><div class='ctx'>     *errmsg = _("invalid sprg number");</div><div class='ctx'> </div><div class='ctx'>   /* If this is mfsprg4..7 then use spr 260..263 which can be read in</div><div class='hunk'>@@ -1468,54 +2038,272 @@ insert_sprg (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_sprg (unsigned long insn,</div><div class='del'>-	      int dialect,</div><div class='add'>+	      ppc_cpu_t dialect,</div><div class='ctx'> 	      int *invalid)</div><div class='ctx'> {</div><div class='ctx'>   unsigned long val = (insn &gt;&gt; 16) &amp; 0x1f;</div><div class='ctx'> </div><div class='ctx'>   /* mfsprg can use 260..263 and 272..279.  mtsprg only uses spr 272..279</div><div class='del'>-     If not BOOKE or 405, then both use only 272..275.  */</div><div class='del'>-  if (val &lt;= 3</div><div class='del'>-      || (val &lt; 0x10 &amp;&amp; (insn &amp; 0x100) != 0)</div><div class='del'>-      || (val - 0x10 &gt; 3</div><div class='del'>-	  &amp;&amp; (dialect &amp; (PPC_OPCODE_BOOKE | PPC_OPCODE_403)) == 0))</div><div class='add'>+     If not BOOKE, 405 or VLE, then both use only 272..275.  */</div><div class='add'>+  if ((val - 0x10 &gt; 3 &amp;&amp; (dialect &amp; ALLOW8_SPRG) == 0)</div><div class='add'>+      || (val - 0x10 &gt; 7 &amp;&amp; (insn &amp; 0x100) != 0)</div><div class='add'>+      || val &lt;= 3</div><div class='add'>+      || (val &amp; 8) != 0)</div><div class='ctx'>     *invalid = 1;</div><div class='ctx'>   return val &amp; 7;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The TBR field in an XFX instruction.  This is just like SPR, but it</div><div class='del'>-   is optional.  When TBR is omitted, it must be inserted as 268 (the</div><div class='del'>-   magic number of the TB register).  These functions treat 0</div><div class='del'>-   (indicating an omitted optional operand) as 268.  This means that</div><div class='del'>-   ``mftb 4,0'' is not handled correctly.  This does not matter very</div><div class='del'>-   much, since the architecture manual does not define mftb as</div><div class='del'>-   accepting any values other than 268 or 269.  */</div><div class='del'>-</div><div class='del'>-#define TB (268)</div><div class='add'>+   is optional.  */</div><div class='ctx'> </div><div class='ctx'> static unsigned long</div><div class='ctx'> insert_tbr (unsigned long insn,</div><div class='ctx'> 	    long value,</div><div class='del'>-	    int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg)</div><div class='ctx'> {</div><div class='del'>-  if (value == 0)</div><div class='del'>-    value = TB;</div><div class='add'>+  if (value != 268 &amp;&amp; value != 269)</div><div class='add'>+    *errmsg = _("invalid tbr number");</div><div class='ctx'>   return insn | ((value &amp; 0x1f) &lt;&lt; 16) | ((value &amp; 0x3e0) &lt;&lt; 6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long</div><div class='ctx'> extract_tbr (unsigned long insn,</div><div class='del'>-	     int dialect ATTRIBUTE_UNUSED,</div><div class='del'>-	     int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     int *invalid)</div><div class='ctx'> {</div><div class='ctx'>   long ret;</div><div class='ctx'> </div><div class='ctx'>   ret = ((insn &gt;&gt; 16) &amp; 0x1f) | ((insn &gt;&gt; 6) &amp; 0x3e0);</div><div class='del'>-  if (ret == TB)</div><div class='del'>-    ret = 0;</div><div class='add'>+  if (ret != 268 &amp;&amp; ret != 269)</div><div class='add'>+    *invalid = 1;</div><div class='ctx'>   return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* The XT and XS fields in an XX1 or XX3 form instruction.  This is split.  */</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_xt6 (unsigned long insn,</div><div class='add'>+	    long value,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | ((value &amp; 0x1f) &lt;&lt; 21) | ((value &amp; 0x20) &gt;&gt; 5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_xt6 (unsigned long insn,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return ((insn &lt;&lt; 5) &amp; 0x20) | ((insn &gt;&gt; 21) &amp; 0x1f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The XT and XS fields in an DQ form VSX instruction.  This is split.  */</div><div class='add'>+static unsigned long</div><div class='add'>+insert_xtq6 (unsigned long insn,</div><div class='add'>+	    long value,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | ((value &amp; 0x1f) &lt;&lt; 21) | ((value &amp; 0x20) &gt;&gt; 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_xtq6 (unsigned long insn,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return ((insn &lt;&lt; 2) &amp; 0x20) | ((insn &gt;&gt; 21) &amp; 0x1f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The XA field in an XX3 form instruction.  This is split.  */</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_xa6 (unsigned long insn,</div><div class='add'>+	    long value,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | ((value &amp; 0x1f) &lt;&lt; 16) | ((value &amp; 0x20) &gt;&gt; 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_xa6 (unsigned long insn,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return ((insn &lt;&lt; 3) &amp; 0x20) | ((insn &gt;&gt; 16) &amp; 0x1f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The XB field in an XX3 form instruction.  This is split.  */</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_xb6 (unsigned long insn,</div><div class='add'>+	    long value,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | ((value &amp; 0x1f) &lt;&lt; 11) | ((value &amp; 0x20) &gt;&gt; 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_xb6 (unsigned long insn,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return ((insn &lt;&lt; 4) &amp; 0x20) | ((insn &gt;&gt; 11) &amp; 0x1f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The XB field in an XX3 form instruction when it must be the same as</div><div class='add'>+   the XA field in the instruction.  This is used for extended</div><div class='add'>+   mnemonics like xvmovdp.  This operand is marked FAKE.  The insertion</div><div class='add'>+   function just copies the XA field into the XB field, and the</div><div class='add'>+   extraction function just checks that the fields are the same.  */</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_xb6s (unsigned long insn,</div><div class='add'>+	    long value ATTRIBUTE_UNUSED,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | (((insn &gt;&gt; 16) &amp; 0x1f) &lt;&lt; 11) | (((insn &gt;&gt; 2) &amp; 0x1) &lt;&lt; 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_xb6s (unsigned long insn,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     int *invalid)</div><div class='add'>+{</div><div class='add'>+  if ((((insn &gt;&gt; 16) &amp; 0x1f) != ((insn &gt;&gt; 11) &amp; 0x1f))</div><div class='add'>+      || (((insn &gt;&gt; 2) &amp; 0x1) != ((insn &gt;&gt; 1) &amp; 0x1)))</div><div class='add'>+    *invalid = 1;</div><div class='add'>+  return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The XC field in an XX4 form instruction.  This is split.  */</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_xc6 (unsigned long insn,</div><div class='add'>+	    long value,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | ((value &amp; 0x1f) &lt;&lt; 6) | ((value &amp; 0x20) &gt;&gt; 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_xc6 (unsigned long insn,</div><div class='add'>+	     ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	     int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return ((insn &lt;&lt; 2) &amp; 0x20) | ((insn &gt;&gt; 6) &amp; 0x1f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_dm (unsigned long insn,</div><div class='add'>+	   long value,</div><div class='add'>+	   ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	   const char **errmsg)</div><div class='add'>+{</div><div class='add'>+  if (value != 0 &amp;&amp; value != 1)</div><div class='add'>+    *errmsg = _("invalid constant");</div><div class='add'>+  return insn | (((value) ? 3 : 0) &lt;&lt; 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_dm (unsigned long insn,</div><div class='add'>+	    ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+	    int *invalid)</div><div class='add'>+{</div><div class='add'>+  long value;</div><div class='add'>+</div><div class='add'>+  value = (insn &gt;&gt; 8) &amp; 3;</div><div class='add'>+  if (value != 0 &amp;&amp; value != 3)</div><div class='add'>+    *invalid = 1;</div><div class='add'>+  return (value) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The VLESIMM field in an I16A form instruction.  This is split.  */</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_vlesi (unsigned long insn,</div><div class='add'>+            long value,</div><div class='add'>+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+            const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | ((value &amp; 0xf800) &lt;&lt; 10) | (value &amp; 0x7ff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_vlesi (unsigned long insn,</div><div class='add'>+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+             int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  long value = ((insn &gt;&gt; 10) &amp; 0xf800) | (insn &amp; 0x7ff);</div><div class='add'>+  value = (value ^ 0x8000) - 0x8000;</div><div class='add'>+  return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_vlensi (unsigned long insn,</div><div class='add'>+            long value,</div><div class='add'>+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+            const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  value = -value;</div><div class='add'>+  return insn | ((value &amp; 0xf800) &lt;&lt; 10) | (value &amp; 0x7ff);</div><div class='add'>+}</div><div class='add'>+static long</div><div class='add'>+extract_vlensi (unsigned long insn,</div><div class='add'>+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+             int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  long value = ((insn &gt;&gt; 10) &amp; 0xf800) | (insn &amp; 0x7ff);</div><div class='add'>+  value = (value ^ 0x8000) - 0x8000;</div><div class='add'>+  /* Don't use for disassembly.  */</div><div class='add'>+  *invalid = 1;</div><div class='add'>+  return -value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The VLEUIMM field in an I16A form instruction.  This is split.  */</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_vleui (unsigned long insn,</div><div class='add'>+            long value,</div><div class='add'>+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+            const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | ((value &amp; 0xf800) &lt;&lt; 10) | (value &amp; 0x7ff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_vleui (unsigned long insn,</div><div class='add'>+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+             int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return ((insn &gt;&gt; 10) &amp; 0xf800) | (insn &amp; 0x7ff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The VLEUIMML field in an I16L form instruction.  This is split.  */</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+insert_vleil (unsigned long insn,</div><div class='add'>+            long value,</div><div class='add'>+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+            const char **errmsg ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return insn | ((value &amp; 0xf800) &lt;&lt; 5) | (value &amp; 0x7ff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+extract_vleil (unsigned long insn,</div><div class='add'>+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,</div><div class='add'>+             int *invalid ATTRIBUTE_UNUSED)</div><div class='add'>+{</div><div class='add'>+  return ((insn &gt;&gt; 5) &amp; 0xf800) | (insn &amp; 0x7ff);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* Macros used to form opcodes.  */</div><div class='ctx'> </div><div class='hunk'>@@ -1535,6 +2323,17 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> #define OPL(x,l) (OP (x) | ((((unsigned long)(l)) &amp; 1) &lt;&lt; 21))</div><div class='ctx'> #define OPL_MASK OPL (0x3f,1)</div><div class='ctx'> </div><div class='add'>+/* The main opcode combined with an update code in D form instruction.</div><div class='add'>+   Used for extended mnemonics for VLE memory instructions.  */</div><div class='add'>+#define OPVUP(x,vup) (OP (x) | ((((unsigned long)(vup)) &amp; 0xff) &lt;&lt; 8))</div><div class='add'>+#define OPVUP_MASK OPVUP (0x3f,  0xff)</div><div class='add'>+</div><div class='add'>+/* The main opcode combined with an update code and the RT fields specified in</div><div class='add'>+   D form instruction.  Used for VLE volatile context save/restore</div><div class='add'>+   instructions.  */</div><div class='add'>+#define OPVUPRT(x,vup,rt) (OPVUP (x, vup) | ((((unsigned long)(rt)) &amp; 0x1f) &lt;&lt; 21))</div><div class='add'>+#define OPVUPRT_MASK OPVUPRT (0x3f, 0xff, 0x1f)</div><div class='add'>+</div><div class='ctx'> /* An A form instruction.  */</div><div class='ctx'> #define A(op, xop, rc) (OP (op) | ((((unsigned long)(xop)) &amp; 0x1f) &lt;&lt; 1) | (((unsigned long)(rc)) &amp; 1))</div><div class='ctx'> #define A_MASK A (0x3f, 0x1f, 1)</div><div class='hunk'>@@ -1555,6 +2354,43 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> #define B(op, aa, lk) (OP (op) | ((((unsigned long)(aa)) &amp; 1) &lt;&lt; 1) | ((lk) &amp; 1))</div><div class='ctx'> #define B_MASK B (0x3f, 1, 1)</div><div class='ctx'> </div><div class='add'>+/* A BD8 form instruction.  This is a 16-bit instruction.  */</div><div class='add'>+#define BD8(op, aa, lk) (((((unsigned long)(op)) &amp; 0x3f) &lt;&lt; 10) | (((aa) &amp; 1) &lt;&lt; 9) | (((lk) &amp; 1) &lt;&lt; 8))</div><div class='add'>+#define BD8_MASK BD8 (0x3f, 1, 1)</div><div class='add'>+</div><div class='add'>+/* Another BD8 form instruction.  This is a 16-bit instruction.  */</div><div class='add'>+#define BD8IO(op) ((((unsigned long)(op)) &amp; 0x1f) &lt;&lt; 11)</div><div class='add'>+#define BD8IO_MASK BD8IO (0x1f)</div><div class='add'>+</div><div class='add'>+/* A BD8 form instruction for simplified mnemonics.  */</div><div class='add'>+#define EBD8IO(op, bo, bi) (BD8IO ((op)) | ((bo) &lt;&lt; 10) | ((bi) &lt;&lt; 8))</div><div class='add'>+/* A mask that excludes BO32 and BI32.  */</div><div class='add'>+#define EBD8IO1_MASK 0xf800</div><div class='add'>+/* A mask that includes BO32 and excludes BI32.  */</div><div class='add'>+#define EBD8IO2_MASK 0xfc00</div><div class='add'>+/* A mask that include BO32 AND BI32.  */</div><div class='add'>+#define EBD8IO3_MASK 0xff00</div><div class='add'>+</div><div class='add'>+/* A BD15 form instruction.  */</div><div class='add'>+#define BD15(op, aa, lk) (OP (op) | ((((unsigned long)(aa)) &amp; 0xf) &lt;&lt; 22) | ((lk) &amp; 1))</div><div class='add'>+#define BD15_MASK BD15 (0x3f, 0xf, 1)</div><div class='add'>+</div><div class='add'>+/* A BD15 form instruction for extended conditional branch mnemonics.  */</div><div class='add'>+#define EBD15(op, aa, bo, lk) (((op) &amp; 0x3f) &lt;&lt; 26) | (((aa) &amp; 0xf) &lt;&lt; 22) | (((bo) &amp; 0x3) &lt;&lt; 20) | ((lk) &amp; 1)</div><div class='add'>+#define EBD15_MASK 0xfff00001</div><div class='add'>+</div><div class='add'>+/* A BD15 form instruction for extended conditional branch mnemonics with BI.  */</div><div class='add'>+#define EBD15BI(op, aa, bo, bi, lk) (((op) &amp; 0x3f) &lt;&lt; 26) \</div><div class='add'>+                                    | (((aa) &amp; 0xf) &lt;&lt; 22) \</div><div class='add'>+                                    | (((bo) &amp; 0x3) &lt;&lt; 20) \</div><div class='add'>+                                    | (((bi) &amp; 0x3) &lt;&lt; 16) \</div><div class='add'>+                                    | ((lk) &amp; 1)</div><div class='add'>+#define EBD15BI_MASK  0xfff30001</div><div class='add'>+</div><div class='add'>+/* A BD24 form instruction.  */</div><div class='add'>+#define BD24(op, aa, lk) (OP (op) | ((((unsigned long)(aa)) &amp; 1) &lt;&lt; 25) | ((lk) &amp; 1))</div><div class='add'>+#define BD24_MASK BD24 (0x3f, 1, 1)</div><div class='add'>+</div><div class='ctx'> /* A B form instruction setting the BO field.  */</div><div class='ctx'> #define BBO(op, bo, aa, lk) (B ((op), (aa), (lk)) | ((((unsigned long)(bo)) &amp; 0x1f) &lt;&lt; 21))</div><div class='ctx'> #define BBO_MASK BBO (0x3f, 0x1f, 1, 1)</div><div class='hunk'>@@ -1562,7 +2398,7 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> /* A BBO_MASK with the y bit of the BO field removed.  This permits</div><div class='ctx'>    matching a conditional branch regardless of the setting of the y</div><div class='ctx'>    bit.  Similarly for the 'at' bits used for power4 branch hints.  */</div><div class='del'>-#define Y_MASK   (((unsigned long) 1) &lt;&lt; 21)</div><div class='add'>+#define Y_MASK	 (((unsigned long) 1) &lt;&lt; 21)</div><div class='ctx'> #define AT1_MASK (((unsigned long) 3) &lt;&lt; 21)</div><div class='ctx'> #define AT2_MASK (((unsigned long) 9) &lt;&lt; 21)</div><div class='ctx'> #define BBOY_MASK  (BBO_MASK &amp;~ Y_MASK)</div><div class='hunk'>@@ -1583,33 +2419,63 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> #define BBOYBI_MASK (BBOYCB_MASK | BI_MASK)</div><div class='ctx'> #define BBOATBI_MASK (BBOAT2CB_MASK | BI_MASK)</div><div class='ctx'> </div><div class='add'>+/* A VLE C form instruction.  */</div><div class='add'>+#define C_LK(x, lk) (((((unsigned long)(x)) &amp; 0x7fff) &lt;&lt; 1) | ((lk) &amp; 1))</div><div class='add'>+#define C_LK_MASK C_LK(0x7fff, 1)</div><div class='add'>+#define C(x) ((((unsigned long)(x)) &amp; 0xffff))</div><div class='add'>+#define C_MASK C(0xffff)</div><div class='add'>+</div><div class='ctx'> /* An Context form instruction.  */</div><div class='ctx'> #define CTX(op, xop)   (OP (op) | (((unsigned long)(xop)) &amp; 0x7))</div><div class='ctx'> #define CTX_MASK CTX(0x3f, 0x7)</div><div class='ctx'> </div><div class='del'>-/* An User Context form instruction.  */</div><div class='add'>+/* A User Context form instruction.  */</div><div class='ctx'> #define UCTX(op, xop)  (OP (op) | (((unsigned long)(xop)) &amp; 0x1f))</div><div class='ctx'> #define UCTX_MASK UCTX(0x3f, 0x1f)</div><div class='ctx'> </div><div class='ctx'> /* The main opcode mask with the RA field clear.  */</div><div class='ctx'> #define DRA_MASK (OP_MASK | RA_MASK)</div><div class='ctx'> </div><div class='add'>+/* A DQ form VSX instruction.  */</div><div class='add'>+#define DQX(op, xop) (OP (op) | ((xop) &amp; 0x7))</div><div class='add'>+#define DQX_MASK DQX (0x3f, 7)</div><div class='add'>+</div><div class='ctx'> /* A DS form instruction.  */</div><div class='ctx'> #define DSO(op, xop) (OP (op) | ((xop) &amp; 0x3))</div><div class='ctx'> #define DS_MASK DSO (0x3f, 3)</div><div class='ctx'> </div><div class='del'>-/* A DE form instruction.  */</div><div class='del'>-#define DEO(op, xop) (OP (op) | ((xop) &amp; 0xf))</div><div class='del'>-#define DE_MASK DEO (0x3e, 0xf)</div><div class='add'>+/* An DX form instruction.  */</div><div class='add'>+#define DX(op, xop) (OP (op) | ((((unsigned long)(xop)) &amp; 0x1f) &lt;&lt; 1))</div><div class='add'>+#define DX_MASK DX (0x3f, 0x1f)</div><div class='ctx'> </div><div class='ctx'> /* An EVSEL form instruction.  */</div><div class='ctx'> #define EVSEL(op, xop) (OP (op) | (((unsigned long)(xop)) &amp; 0xff) &lt;&lt; 3)</div><div class='ctx'> #define EVSEL_MASK EVSEL(0x3f, 0xff)</div><div class='ctx'> </div><div class='add'>+/* An IA16 form instruction.  */</div><div class='add'>+#define IA16(op, xop) (OP (op) | (((unsigned long)(xop)) &amp; 0x1f) &lt;&lt; 11)</div><div class='add'>+#define IA16_MASK IA16(0x3f, 0x1f)</div><div class='add'>+</div><div class='add'>+/* An I16A form instruction.  */</div><div class='add'>+#define I16A(op, xop) (OP (op) | (((unsigned long)(xop)) &amp; 0x1f) &lt;&lt; 11)</div><div class='add'>+#define I16A_MASK I16A(0x3f, 0x1f)</div><div class='add'>+</div><div class='add'>+/* An I16L form instruction.  */</div><div class='add'>+#define I16L(op, xop) (OP (op) | (((unsigned long)(xop)) &amp; 0x1f) &lt;&lt; 11)</div><div class='add'>+#define I16L_MASK I16L(0x3f, 0x1f)</div><div class='add'>+</div><div class='add'>+/* An IM7 form instruction.  */</div><div class='add'>+#define IM7(op) ((((unsigned long)(op)) &amp; 0x1f) &lt;&lt; 11)</div><div class='add'>+#define IM7_MASK IM7(0x1f)</div><div class='add'>+</div><div class='ctx'> /* An M form instruction.  */</div><div class='ctx'> #define M(op, rc) (OP (op) | ((rc) &amp; 1))</div><div class='ctx'> #define M_MASK M (0x3f, 1)</div><div class='ctx'> </div><div class='add'>+/* An LI20 form instruction.  */</div><div class='add'>+#define LI20(op, xop) (OP (op) | (((unsigned long)(xop)) &amp; 0x1) &lt;&lt; 15)</div><div class='add'>+#define LI20_MASK LI20(0x3f, 0x1)</div><div class='add'>+</div><div class='ctx'> /* An M form instruction with the ME field specified.  */</div><div class='ctx'> #define MME(op, me, rc) (M ((op), (rc)) | ((((unsigned long)(me)) &amp; 0x1f) &lt;&lt; 1))</div><div class='ctx'> </div><div class='hunk'>@@ -1640,44 +2506,189 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> #define SC(op, sa, lk) (OP (op) | ((((unsigned long)(sa)) &amp; 1) &lt;&lt; 1) | ((lk) &amp; 1))</div><div class='ctx'> #define SC_MASK (OP_MASK | (((unsigned long)0x3ff) &lt;&lt; 16) | (((unsigned long)1) &lt;&lt; 1) | 1)</div><div class='ctx'> </div><div class='del'>-/* An VX form instruction.  */</div><div class='add'>+/* An SCI8 form instruction.  */</div><div class='add'>+#define SCI8(op, xop) (OP (op) | ((((unsigned long)(xop)) &amp; 0x1f) &lt;&lt; 11))</div><div class='add'>+#define SCI8_MASK SCI8(0x3f, 0x1f)</div><div class='add'>+</div><div class='add'>+/* An SCI8 form instruction.  */</div><div class='add'>+#define SCI8BF(op, fop, xop) (OP (op) | ((((unsigned long)(xop)) &amp; 0x1f) &lt;&lt; 11) | (((fop) &amp; 7) &lt;&lt; 23))</div><div class='add'>+#define SCI8BF_MASK SCI8BF(0x3f, 7, 0x1f)</div><div class='add'>+</div><div class='add'>+/* An SD4 form instruction.  This is a 16-bit instruction.  */</div><div class='add'>+#define SD4(op) ((((unsigned long)(op)) &amp; 0xf) &lt;&lt; 12)</div><div class='add'>+#define SD4_MASK SD4(0xf)</div><div class='add'>+</div><div class='add'>+/* An SE_IM5 form instruction.  This is a 16-bit instruction.  */</div><div class='add'>+#define SE_IM5(op, xop) (((((unsigned long)(op)) &amp; 0x3f) &lt;&lt; 10) | (((xop) &amp; 0x1) &lt;&lt; 9))</div><div class='add'>+#define SE_IM5_MASK SE_IM5(0x3f, 1)</div><div class='add'>+</div><div class='add'>+/* An SE_R form instruction.  This is a 16-bit instruction.  */</div><div class='add'>+#define SE_R(op, xop) (((((unsigned long)(op)) &amp; 0x3f) &lt;&lt; 10) | (((xop) &amp; 0x3f) &lt;&lt; 4))</div><div class='add'>+#define SE_R_MASK SE_R(0x3f, 0x3f)</div><div class='add'>+</div><div class='add'>+/* An SE_RR form instruction.  This is a 16-bit instruction.  */</div><div class='add'>+#define SE_RR(op, xop) (((((unsigned long)(op)) &amp; 0x3f) &lt;&lt; 10) | (((xop) &amp; 0x3) &lt;&lt; 8))</div><div class='add'>+#define SE_RR_MASK SE_RR(0x3f, 3)</div><div class='add'>+</div><div class='add'>+/* A VX form instruction.  */</div><div class='ctx'> #define VX(op, xop) (OP (op) | (((unsigned long)(xop)) &amp; 0x7ff))</div><div class='ctx'> </div><div class='ctx'> /* The mask for an VX form instruction.  */</div><div class='ctx'> #define VX_MASK	VX(0x3f, 0x7ff)</div><div class='ctx'> </div><div class='del'>-/* An VA form instruction.  */</div><div class='add'>+/* A VX_MASK with the VA field fixed.  */</div><div class='add'>+#define VXVA_MASK (VX_MASK | (0x1f &lt;&lt; 16))</div><div class='add'>+</div><div class='add'>+/* A VX_MASK with the VB field fixed.  */</div><div class='add'>+#define VXVB_MASK (VX_MASK | (0x1f &lt;&lt; 11))</div><div class='add'>+</div><div class='add'>+/* A VX_MASK with the VA and VB fields fixed.  */</div><div class='add'>+#define VXVAVB_MASK (VX_MASK | (0x1f &lt;&lt; 16) | (0x1f &lt;&lt; 11))</div><div class='add'>+</div><div class='add'>+/* A VX_MASK with the VD and VA fields fixed.  */</div><div class='add'>+#define VXVDVA_MASK (VX_MASK | (0x1f &lt;&lt; 21) | (0x1f &lt;&lt; 16))</div><div class='add'>+</div><div class='add'>+/* A VX_MASK with a UIMM4 field.  */</div><div class='add'>+#define VXUIMM4_MASK (VX_MASK | (0x1 &lt;&lt; 20))</div><div class='add'>+</div><div class='add'>+/* A VX_MASK with a UIMM3 field.  */</div><div class='add'>+#define VXUIMM3_MASK (VX_MASK | (0x3 &lt;&lt; 19))</div><div class='add'>+</div><div class='add'>+/* A VX_MASK with a UIMM2 field.  */</div><div class='add'>+#define VXUIMM2_MASK (VX_MASK | (0x7 &lt;&lt; 18))</div><div class='add'>+</div><div class='add'>+/* A VX_MASK with a PS field.  */</div><div class='add'>+#define VXPS_MASK (VX_MASK &amp; ~(0x1 &lt;&lt; 9))</div><div class='add'>+</div><div class='add'>+/* A VX_MASK with the VA field fixed with a PS field.  */</div><div class='add'>+#define VXVAPS_MASK ((VX_MASK | (0x1f &lt;&lt; 16)) &amp; ~(0x1 &lt;&lt; 9))</div><div class='add'>+</div><div class='add'>+/* A VA form instruction.  */</div><div class='ctx'> #define VXA(op, xop) (OP (op) | (((unsigned long)(xop)) &amp; 0x03f))</div><div class='ctx'> </div><div class='ctx'> /* The mask for an VA form instruction.  */</div><div class='ctx'> #define VXA_MASK VXA(0x3f, 0x3f)</div><div class='ctx'> </div><div class='del'>-/* An VXR form instruction.  */</div><div class='add'>+/* A VXA_MASK with a SHB field.  */</div><div class='add'>+#define VXASHB_MASK (VXA_MASK | (1 &lt;&lt; 10))</div><div class='add'>+</div><div class='add'>+/* A VXR form instruction.  */</div><div class='ctx'> #define VXR(op, xop, rc) (OP (op) | (((rc) &amp; 1) &lt;&lt; 10) | (((unsigned long)(xop)) &amp; 0x3ff))</div><div class='ctx'> </div><div class='ctx'> /* The mask for a VXR form instruction.  */</div><div class='ctx'> #define VXR_MASK VXR(0x3f, 0x3ff, 1)</div><div class='ctx'> </div><div class='add'>+/* A VX form instruction with a VA tertiary opcode.  */</div><div class='add'>+#define VXVA(op, xop, vaop) (VX(op,xop) | (((vaop) &amp; 0x1f) &lt;&lt; 16))</div><div class='add'>+</div><div class='add'>+#define VXASH(op, xop) (OP (op) | ((((unsigned long)(xop)) &amp; 0x1f) &lt;&lt; 1))</div><div class='add'>+#define VXASH_MASK VXASH (0x3f, 0x1f)</div><div class='add'>+</div><div class='ctx'> /* An X form instruction.  */</div><div class='ctx'> #define X(op, xop) (OP (op) | ((((unsigned long)(xop)) &amp; 0x3ff) &lt;&lt; 1))</div><div class='ctx'> </div><div class='add'>+/* A X form instruction for Quad-Precision FP Instructions.  */</div><div class='add'>+#define XVA(op, xop, vaop) (X(op,xop) | (((vaop) &amp; 0x1f) &lt;&lt; 16))</div><div class='add'>+</div><div class='add'>+/* An EX form instruction.  */</div><div class='add'>+#define EX(op, xop) (OP (op) | (((unsigned long)(xop)) &amp; 0x7ff))</div><div class='add'>+</div><div class='add'>+/* The mask for an EX form instruction.  */</div><div class='add'>+#define EX_MASK EX (0x3f, 0x7ff)</div><div class='add'>+</div><div class='add'>+/* An XX2 form instruction.  */</div><div class='add'>+#define XX2(op, xop) (OP (op) | ((((unsigned long)(xop)) &amp; 0x1ff) &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+/* A XX2 form instruction with the VA bits specified.  */</div><div class='add'>+#define XX2VA(op, xop, vaop) (XX2(op,xop) | (((vaop) &amp; 0x1f) &lt;&lt; 16))</div><div class='add'>+</div><div class='add'>+/* An XX3 form instruction.  */</div><div class='add'>+#define XX3(op, xop) (OP (op) | ((((unsigned long)(xop)) &amp; 0xff) &lt;&lt; 3))</div><div class='add'>+</div><div class='add'>+/* An XX3 form instruction with the RC bit specified.  */</div><div class='add'>+#define XX3RC(op, xop, rc) (OP (op) | (((rc) &amp; 1) &lt;&lt; 10) | ((((unsigned long)(xop)) &amp; 0x7f) &lt;&lt; 3))</div><div class='add'>+</div><div class='add'>+/* An XX4 form instruction.  */</div><div class='add'>+#define XX4(op, xop) (OP (op) | ((((unsigned long)(xop)) &amp; 0x3) &lt;&lt; 4))</div><div class='add'>+</div><div class='ctx'> /* A Z form instruction.  */</div><div class='ctx'> #define Z(op, xop) (OP (op) | ((((unsigned long)(xop)) &amp; 0x1ff) &lt;&lt; 1))</div><div class='ctx'> </div><div class='ctx'> /* An X form instruction with the RC bit specified.  */</div><div class='ctx'> #define XRC(op, xop, rc) (X ((op), (xop)) | ((rc) &amp; 1))</div><div class='ctx'> </div><div class='add'>+/* A X form instruction for Quad-Precision FP Instructions with RC bit.  */</div><div class='add'>+#define XVARC(op, xop, vaop, rc) (XVA ((op), (xop), (vaop)) | ((rc) &amp; 1))</div><div class='add'>+</div><div class='add'>+/* An X form instruction with the RA bits specified as two ops.  */</div><div class='add'>+#define XMMF(op, xop, mop0, mop1) (X ((op), (xop)) | ((mop0) &amp; 3) &lt;&lt; 19 | ((mop1) &amp; 7) &lt;&lt; 16)</div><div class='add'>+</div><div class='ctx'> /* A Z form instruction with the RC bit specified.  */</div><div class='ctx'> #define ZRC(op, xop, rc) (Z ((op), (xop)) | ((rc) &amp; 1))</div><div class='ctx'> </div><div class='ctx'> /* The mask for an X form instruction.  */</div><div class='ctx'> #define X_MASK XRC (0x3f, 0x3ff, 1)</div><div class='ctx'> </div><div class='add'>+/* The mask for an X form instruction with the BF bits specified.  */</div><div class='add'>+#define XBF_MASK (X_MASK | (3 &lt;&lt; 21))</div><div class='add'>+</div><div class='add'>+/* An X form wait instruction with everything filled in except the WC field.  */</div><div class='add'>+#define XWC_MASK (XRC (0x3f, 0x3ff, 1) | (7 &lt;&lt; 23) | RA_MASK | RB_MASK)</div><div class='add'>+</div><div class='add'>+/* The mask for an XX1 form instruction.  */</div><div class='add'>+#define XX1_MASK X (0x3f, 0x3ff)</div><div class='add'>+</div><div class='add'>+/* An XX1_MASK with the RB field fixed.  */</div><div class='add'>+#define XX1RB_MASK (XX1_MASK | RB_MASK)</div><div class='add'>+</div><div class='add'>+/* The mask for an XX2 form instruction.  */</div><div class='add'>+#define XX2_MASK (XX2 (0x3f, 0x1ff) | (0x1f &lt;&lt; 16))</div><div class='add'>+</div><div class='add'>+/* The mask for an XX2 form instruction with the UIM bits specified.  */</div><div class='add'>+#define XX2UIM_MASK (XX2 (0x3f, 0x1ff) | (7 &lt;&lt; 18))</div><div class='add'>+</div><div class='add'>+/* The mask for an XX2 form instruction with the 4 UIM bits specified.  */</div><div class='add'>+#define XX2UIM4_MASK (XX2 (0x3f, 0x1ff) | (1 &lt;&lt; 20))</div><div class='add'>+</div><div class='add'>+/* The mask for an XX2 form instruction with the BF bits specified.  */</div><div class='add'>+#define XX2BF_MASK (XX2_MASK | (3 &lt;&lt; 21) | (1))</div><div class='add'>+</div><div class='add'>+/* The mask for an XX2 form instruction with the BF and DCMX bits specified.  */</div><div class='add'>+#define XX2BFD_MASK (XX2 (0x3f, 0x1ff) | 1)</div><div class='add'>+</div><div class='add'>+/* The mask for an XX2 form instruction with a split DCMX bits specified.  */</div><div class='add'>+#define XX2DCMXS_MASK XX2 (0x3f, 0x1ee)</div><div class='add'>+</div><div class='add'>+/* The mask for an XX3 form instruction.  */</div><div class='add'>+#define XX3_MASK XX3 (0x3f, 0xff)</div><div class='add'>+</div><div class='add'>+/* The mask for an XX3 form instruction with the BF bits specified.  */</div><div class='add'>+#define XX3BF_MASK (XX3 (0x3f, 0xff) | (3 &lt;&lt; 21) | (1))</div><div class='add'>+</div><div class='add'>+/* The mask for an XX3 form instruction with the DM or SHW bits specified.  */</div><div class='add'>+#define XX3DM_MASK (XX3 (0x3f, 0x1f) | (1 &lt;&lt; 10))</div><div class='add'>+#define XX3SHW_MASK XX3DM_MASK</div><div class='add'>+</div><div class='add'>+/* The mask for an XX4 form instruction.  */</div><div class='add'>+#define XX4_MASK XX4 (0x3f, 0x3)</div><div class='add'>+</div><div class='add'>+/* An X form wait instruction with everything filled in except the WC field.  */</div><div class='add'>+#define XWC_MASK (XRC (0x3f, 0x3ff, 1) | (7 &lt;&lt; 23) | RA_MASK | RB_MASK)</div><div class='add'>+</div><div class='add'>+/* The mask for an XMMF form instruction.  */</div><div class='add'>+#define XMMF_MASK (XMMF (0x3f, 0x3ff, 3, 7) | (1))</div><div class='add'>+</div><div class='ctx'> /* The mask for a Z form instruction.  */</div><div class='ctx'> #define Z_MASK ZRC (0x3f, 0x1ff, 1)</div><div class='add'>+#define Z2_MASK ZRC (0x3f, 0xff, 1)</div><div class='ctx'> </div><div class='del'>-/* An X_MASK with the RA field fixed.  */</div><div class='add'>+/* An X_MASK with the RA/VA field fixed.  */</div><div class='ctx'> #define XRA_MASK (X_MASK | RA_MASK)</div><div class='add'>+#define XVA_MASK XRA_MASK</div><div class='add'>+</div><div class='add'>+/* An XRA_MASK with the A_L/W field clear.  */</div><div class='add'>+#define XWRA_MASK (XRA_MASK &amp; ~((unsigned long) 1 &lt;&lt; 16))</div><div class='add'>+#define XRLA_MASK XWRA_MASK</div><div class='ctx'> </div><div class='ctx'> /* An X_MASK with the RB field fixed.  */</div><div class='ctx'> #define XRB_MASK (X_MASK | RB_MASK)</div><div class='hunk'>@@ -1691,18 +2702,54 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> /* An X_MASK with the RA and RB fields fixed.  */</div><div class='ctx'> #define XRARB_MASK (X_MASK | RA_MASK | RB_MASK)</div><div class='ctx'> </div><div class='add'>+/* An XBF_MASK with the RA and RB fields fixed.  */</div><div class='add'>+#define XBFRARB_MASK (XBF_MASK | RA_MASK | RB_MASK)</div><div class='add'>+</div><div class='ctx'> /* An XRARB_MASK, but with the L bit clear.  */</div><div class='ctx'> #define XRLARB_MASK (XRARB_MASK &amp; ~((unsigned long) 1 &lt;&lt; 16))</div><div class='ctx'> </div><div class='add'>+/* An XRARB_MASK, but with the L bits in a darn instruction clear.  */</div><div class='add'>+#define XLRAND_MASK (XRARB_MASK &amp; ~((unsigned long) 3 &lt;&lt; 16))</div><div class='add'>+</div><div class='ctx'> /* An X_MASK with the RT and RA fields fixed.  */</div><div class='ctx'> #define XRTRA_MASK (X_MASK | RT_MASK | RA_MASK)</div><div class='ctx'> </div><div class='add'>+/* An X_MASK with the RT and RB fields fixed.  */</div><div class='add'>+#define XRTRB_MASK (X_MASK | RT_MASK | RB_MASK)</div><div class='add'>+</div><div class='ctx'> /* An XRTRA_MASK, but with L bit clear.  */</div><div class='ctx'> #define XRTLRA_MASK (XRTRA_MASK &amp; ~((unsigned long) 1 &lt;&lt; 21))</div><div class='ctx'> </div><div class='add'>+/* An X_MASK with the RT, RA and RB fields fixed.  */</div><div class='add'>+#define XRTRARB_MASK (X_MASK | RT_MASK | RA_MASK | RB_MASK)</div><div class='add'>+</div><div class='add'>+/* An XRTRARB_MASK, but with L bit clear.  */</div><div class='add'>+#define XRTLRARB_MASK (XRTRARB_MASK &amp; ~((unsigned long) 1 &lt;&lt; 21))</div><div class='add'>+</div><div class='add'>+/* An XRTRARB_MASK, but with A bit clear.  */</div><div class='add'>+#define XRTARARB_MASK (XRTRARB_MASK &amp; ~((unsigned long) 1 &lt;&lt; 25))</div><div class='add'>+</div><div class='add'>+/* An XRTRARB_MASK, but with BF bits clear.  */</div><div class='add'>+#define XRTBFRARB_MASK (XRTRARB_MASK &amp; ~((unsigned long) 7 &lt;&lt; 23))</div><div class='add'>+</div><div class='ctx'> /* An X form instruction with the L bit specified.  */</div><div class='ctx'> #define XOPL(op, xop, l) (X ((op), (xop)) | ((((unsigned long)(l)) &amp; 1) &lt;&lt; 21))</div><div class='ctx'> </div><div class='add'>+/* An X form instruction with the L bits specified.  */</div><div class='add'>+#define XOPL2(op, xop, l) (X ((op), (xop)) | ((((unsigned long)(l)) &amp; 3) &lt;&lt; 21))</div><div class='add'>+</div><div class='add'>+/* An X form instruction with the L bit and RC bit specified.  */</div><div class='add'>+#define XRCL(op, xop, l, rc) (XRC ((op), (xop), (rc)) | ((((unsigned long)(l)) &amp; 1) &lt;&lt; 21))</div><div class='add'>+</div><div class='add'>+/* An X form instruction with RT fields specified */</div><div class='add'>+#define XRT(op, xop, rt) (X ((op), (xop)) \</div><div class='add'>+        | ((((unsigned long)(rt)) &amp; 0x1f) &lt;&lt; 21))</div><div class='add'>+</div><div class='add'>+/* An X form instruction with RT and RA fields specified */</div><div class='add'>+#define XRTRA(op, xop, rt, ra) (X ((op), (xop)) \</div><div class='add'>+        | ((((unsigned long)(rt)) &amp; 0x1f) &lt;&lt; 21) \</div><div class='add'>+        | ((((unsigned long)(ra)) &amp; 0x1f) &lt;&lt; 16))</div><div class='add'>+</div><div class='ctx'> /* The mask for an X form comparison instruction.  */</div><div class='ctx'> #define XCMP_MASK (X_MASK | (((unsigned long)1) &lt;&lt; 22))</div><div class='ctx'> </div><div class='hunk'>@@ -1724,6 +2771,9 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> /* An X form sync instruction with everything filled in except the LS field.  */</div><div class='ctx'> #define XSYNC_MASK (0xff9fffff)</div><div class='ctx'> </div><div class='add'>+/* An X form sync instruction with everything filled in except the L and E fields.  */</div><div class='add'>+#define XSYNCLE_MASK (0xff90ffff)</div><div class='add'>+</div><div class='ctx'> /* An X_MASK, but with the EH bit clear.  */</div><div class='ctx'> #define XEH_MASK (X_MASK &amp; ~((unsigned long )1))</div><div class='ctx'> </div><div class='hunk'>@@ -1733,11 +2783,11 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> /* An XFL form instruction.  */</div><div class='ctx'> #define XFL(op, xop, rc) (OP (op) | ((((unsigned long)(xop)) &amp; 0x3ff) &lt;&lt; 1) | (((unsigned long)(rc)) &amp; 1))</div><div class='del'>-#define XFL_MASK (XFL (0x3f, 0x3ff, 1) | (((unsigned long)1) &lt;&lt; 25) | (((unsigned long)1) &lt;&lt; 16))</div><div class='add'>+#define XFL_MASK XFL (0x3f, 0x3ff, 1)</div><div class='ctx'> </div><div class='ctx'> /* An X form isel instruction.  */</div><div class='del'>-#define XISEL(op, xop)  (OP (op) | ((((unsigned long)(xop)) &amp; 0x1f) &lt;&lt; 1))</div><div class='del'>-#define XISEL_MASK      XISEL(0x3f, 0x1f)</div><div class='add'>+#define XISEL(op, xop)	(OP (op) | ((((unsigned long)(xop)) &amp; 0x1f) &lt;&lt; 1))</div><div class='add'>+#define XISEL_MASK	XISEL(0x3f, 0x1f)</div><div class='ctx'> </div><div class='ctx'> /* An XL form instruction with the LK field set to 0.  */</div><div class='ctx'> #define XL(op, xop) (OP (op) | ((((unsigned long)(xop)) &amp; 0x3ff) &lt;&lt; 1))</div><div class='hunk'>@@ -1748,6 +2798,9 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> /* The mask for an XL form instruction.  */</div><div class='ctx'> #define XL_MASK XLLK (0x3f, 0x3ff, 1)</div><div class='ctx'> </div><div class='add'>+/* An XL_MASK with the RT, RA and RB fields fixed, but S bit clear.  */</div><div class='add'>+#define XLS_MASK ((XL_MASK | RT_MASK | RA_MASK | RB_MASK) &amp; ~(1 &lt;&lt; 11))</div><div class='add'>+</div><div class='ctx'> /* An XL form instruction which explicitly sets the BO field.  */</div><div class='ctx'> #define XLO(op, bo, xop, lk) \</div><div class='ctx'>   (XLLK ((op), (xop), (lk)) | ((((unsigned long)(bo)) &amp; 0x1f) &lt;&lt; 21))</div><div class='hunk'>@@ -1778,6 +2831,9 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> /* An XL_MASK with the BO, BI and BB fields fixed.  */</div><div class='ctx'> #define XLBOBIBB_MASK (XL_MASK | BO_MASK | BI_MASK | BB_MASK)</div><div class='ctx'> </div><div class='add'>+/* An X form mbar instruction with MO field.  */</div><div class='add'>+#define XMBAR(op, xop, mo) (X ((op), (xop)) | ((((unsigned long)(mo)) &amp; 1) &lt;&lt; 21))</div><div class='add'>+</div><div class='ctx'> /* An XO form instruction.  */</div><div class='ctx'> #define XO(op, xop, oe, rc) \</div><div class='ctx'>   (OP (op) | ((((unsigned long)(xop)) &amp; 0x1ff) &lt;&lt; 1) | ((((unsigned long)(oe)) &amp; 1) &lt;&lt; 10) | (((unsigned long)(rc)) &amp; 1))</div><div class='hunk'>@@ -1786,6 +2842,12 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> /* An XO_MASK with the RB field fixed.  */</div><div class='ctx'> #define XORB_MASK (XO_MASK | RB_MASK)</div><div class='ctx'> </div><div class='add'>+/* An XOPS form instruction for paired singles.  */</div><div class='add'>+#define XOPS(op, xop, rc) \</div><div class='add'>+  (OP (op) | ((((unsigned long)(xop)) &amp; 0x3ff) &lt;&lt; 1) | (((unsigned long)(rc)) &amp; 1))</div><div class='add'>+#define XOPS_MASK XOPS (0x3f, 0x3ff, 1)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* An XS form instruction.  */</div><div class='ctx'> #define XS(op, xop, rc) (OP (op) | ((((unsigned long)(xop)) &amp; 0x1ff) &lt;&lt; 2) | (((unsigned long)(rc)) &amp; 1))</div><div class='ctx'> #define XS_MASK XS (0x3f, 0x1ff, 1)</div><div class='hunk'>@@ -1809,7 +2871,7 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> /* An XFX form instruction with the SPR field filled in except for the</div><div class='ctx'>    SPRG field.  */</div><div class='del'>-#define XSPRG_MASK (XSPR_MASK &amp; ~(0x17 &lt;&lt; 16))</div><div class='add'>+#define XSPRG_MASK (XSPR_MASK &amp; ~(0x1f &lt;&lt; 16))</div><div class='ctx'> </div><div class='ctx'> /* An X form instruction with everything filled in except the E field.  */</div><div class='ctx'> #define XE_MASK (0xffff7fff)</div><div class='hunk'>@@ -1818,6 +2880,19 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> #define XUC(op, xop)  (OP (op) | (((unsigned long)(xop)) &amp; 0x1f))</div><div class='ctx'> #define XUC_MASK      XUC(0x3f, 0x1f)</div><div class='ctx'> </div><div class='add'>+/* An XW form instruction.  */</div><div class='add'>+#define XW(op, xop, rc) (OP (op) | ((((unsigned long)(xop)) &amp; 0x3f) &lt;&lt; 1) | ((rc) &amp; 1))</div><div class='add'>+/* The mask for a G form instruction. rc not supported at present.  */</div><div class='add'>+#define XW_MASK XW (0x3f, 0x3f, 0)</div><div class='add'>+</div><div class='add'>+/* An APU form instruction.  */</div><div class='add'>+#define APU(op, xop, rc) (OP (op) | (((unsigned long)(xop)) &amp; 0x3ff) &lt;&lt; 1 | ((rc) &amp; 1))</div><div class='add'>+</div><div class='add'>+/* The mask for an APU form instruction.  */</div><div class='add'>+#define APU_MASK APU (0x3f, 0x3ff, 1)</div><div class='add'>+#define APU_RT_MASK (APU_MASK | RT_MASK)</div><div class='add'>+#define APU_RA_MASK (APU_MASK | RA_MASK)</div><div class='add'>+</div><div class='ctx'> /* The BO encodings used in extended conditional branch mnemonics.  */</div><div class='ctx'> #define BODNZF	(0x0)</div><div class='ctx'> #define BODNZFP	(0x1)</div><div class='hunk'>@@ -1848,6 +2923,16 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> </div><div class='ctx'> #define BOU	(0x14)</div><div class='ctx'> </div><div class='add'>+/* The BO16 encodings used in extended VLE conditional branch mnemonics.  */</div><div class='add'>+#define BO16F   (0x0)</div><div class='add'>+#define BO16T   (0x1)</div><div class='add'>+</div><div class='add'>+/* The BO32 encodings used in extended VLE conditional branch mnemonics.  */</div><div class='add'>+#define BO32F   (0x0)</div><div class='add'>+#define BO32T   (0x1)</div><div class='add'>+#define BO32DNZ (0x2)</div><div class='add'>+#define BO32DZ  (0x3)</div><div class='add'>+</div><div class='ctx'> /* The BI condition bit encodings used in extended conditional branch</div><div class='ctx'>    mnemonics.  */</div><div class='ctx'> #define CBLT	(0)</div><div class='hunk'>@@ -1875,3066 +2960,4267 @@ extract_tbr (unsigned long insn,</div><div class='ctx'> /* Smaller names for the flags so each entry in the opcodes table will</div><div class='ctx'>    fit on a single line.  */</div><div class='ctx'> #undef	PPC</div><div class='del'>-#define PPC     PPC_OPCODE_PPC</div><div class='add'>+#define PPC	PPC_OPCODE_PPC</div><div class='ctx'> #define PPCCOM	PPC_OPCODE_PPC | PPC_OPCODE_COMMON</div><div class='del'>-#define NOPOWER4 PPC_OPCODE_NOPOWER4 | PPCCOM</div><div class='ctx'> #define POWER4	PPC_OPCODE_POWER4</div><div class='ctx'> #define POWER5	PPC_OPCODE_POWER5</div><div class='ctx'> #define POWER6	PPC_OPCODE_POWER6</div><div class='add'>+#define POWER7	PPC_OPCODE_POWER7</div><div class='add'>+#define POWER8	PPC_OPCODE_POWER8</div><div class='add'>+#define POWER9	PPC_OPCODE_POWER9</div><div class='ctx'> #define CELL	PPC_OPCODE_CELL</div><div class='del'>-#define PPC32   PPC_OPCODE_32 | PPC_OPCODE_PPC</div><div class='del'>-#define PPC64   PPC_OPCODE_64 | PPC_OPCODE_PPC</div><div class='add'>+#define PPC64	PPC_OPCODE_64 | PPC_OPCODE_64_BRIDGE</div><div class='add'>+#define NON32	(PPC_OPCODE_64 | PPC_OPCODE_POWER4	\</div><div class='add'>+		 | PPC_OPCODE_EFS | PPC_OPCODE_E500MC | PPC_OPCODE_TITAN)</div><div class='ctx'> #define PPC403	PPC_OPCODE_403</div><div class='del'>-#define PPC405	PPC403</div><div class='add'>+#define PPC405	PPC_OPCODE_405</div><div class='ctx'> #define PPC440	PPC_OPCODE_440</div><div class='del'>-#define PPC750	PPC</div><div class='del'>-#define PPC860	PPC</div><div class='add'>+#define PPC464	PPC440</div><div class='add'>+#define PPC476	PPC_OPCODE_476</div><div class='add'>+#define PPC750	PPC_OPCODE_750</div><div class='add'>+#define PPC7450 PPC_OPCODE_7450</div><div class='add'>+#define PPC860	PPC_OPCODE_860</div><div class='add'>+#define PPCPS	PPC_OPCODE_PPCPS</div><div class='ctx'> #define PPCVEC	PPC_OPCODE_ALTIVEC</div><div class='del'>-#define	POWER   PPC_OPCODE_POWER</div><div class='del'>-#define	POWER2	PPC_OPCODE_POWER | PPC_OPCODE_POWER2</div><div class='del'>-#define PPCPWR2	PPC_OPCODE_PPC | PPC_OPCODE_POWER | PPC_OPCODE_POWER2</div><div class='del'>-#define	POWER32	PPC_OPCODE_POWER | PPC_OPCODE_32</div><div class='del'>-#define	COM     PPC_OPCODE_POWER | PPC_OPCODE_PPC | PPC_OPCODE_COMMON</div><div class='del'>-#define	COM32   PPC_OPCODE_POWER | PPC_OPCODE_PPC | PPC_OPCODE_COMMON | PPC_OPCODE_32</div><div class='del'>-#define	M601    PPC_OPCODE_POWER | PPC_OPCODE_601</div><div class='add'>+#define PPCVEC2	PPC_OPCODE_ALTIVEC2</div><div class='add'>+#define PPCVEC3	PPC_OPCODE_ALTIVEC2</div><div class='add'>+#define PPCVSX	PPC_OPCODE_VSX</div><div class='add'>+#define PPCVSX2	PPC_OPCODE_VSX</div><div class='add'>+#define PPCVSX3	PPC_OPCODE_VSX3</div><div class='add'>+#define POWER	PPC_OPCODE_POWER</div><div class='add'>+#define POWER2	PPC_OPCODE_POWER | PPC_OPCODE_POWER2</div><div class='add'>+#define PWR2COM PPC_OPCODE_POWER | PPC_OPCODE_POWER2 | PPC_OPCODE_COMMON</div><div class='add'>+#define PPCPWR2 PPC_OPCODE_PPC | PPC_OPCODE_POWER | PPC_OPCODE_POWER2 | PPC_OPCODE_COMMON</div><div class='add'>+#define COM	PPC_OPCODE_POWER | PPC_OPCODE_PPC | PPC_OPCODE_COMMON</div><div class='add'>+#define M601	PPC_OPCODE_POWER | PPC_OPCODE_601</div><div class='ctx'> #define PWRCOM	PPC_OPCODE_POWER | PPC_OPCODE_601 | PPC_OPCODE_COMMON</div><div class='del'>-#define	MFDEC1	PPC_OPCODE_POWER</div><div class='del'>-#define	MFDEC2	PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE</div><div class='add'>+#define MFDEC1	PPC_OPCODE_POWER</div><div class='add'>+#define MFDEC2	PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE | PPC_OPCODE_TITAN</div><div class='ctx'> #define BOOKE	PPC_OPCODE_BOOKE</div><div class='del'>-#define BOOKE64	PPC_OPCODE_BOOKE64</div><div class='del'>-#define CLASSIC	PPC_OPCODE_CLASSIC</div><div class='add'>+#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS</div><div class='ctx'> #define PPCE300 PPC_OPCODE_E300</div><div class='ctx'> #define PPCSPE	PPC_OPCODE_SPE</div><div class='del'>-#define PPCISEL	PPC_OPCODE_ISEL</div><div class='add'>+#define PPCISEL PPC_OPCODE_ISEL</div><div class='ctx'> #define PPCEFS	PPC_OPCODE_EFS</div><div class='del'>-#define PPCBRLK	PPC_OPCODE_BRLOCK</div><div class='add'>+#define PPCBRLK PPC_OPCODE_BRLOCK</div><div class='ctx'> #define PPCPMR	PPC_OPCODE_PMR</div><div class='del'>-#define PPCCHLK	PPC_OPCODE_CACHELCK</div><div class='del'>-#define PPCCHLK64	PPC_OPCODE_CACHELCK | PPC_OPCODE_BOOKE64</div><div class='add'>+#define PPCTMR  PPC_OPCODE_TMR</div><div class='add'>+#define PPCCHLK PPC_OPCODE_CACHELCK</div><div class='ctx'> #define PPCRFMCI	PPC_OPCODE_RFMCI</div><div class='add'>+#define E500MC  PPC_OPCODE_E500MC</div><div class='add'>+#define PPCA2	PPC_OPCODE_A2</div><div class='add'>+#define TITAN   PPC_OPCODE_TITAN</div><div class='add'>+#define MULHW   PPC_OPCODE_405 | PPC_OPCODE_440 | TITAN</div><div class='add'>+#define E500	PPC_OPCODE_E500</div><div class='add'>+#define E6500	PPC_OPCODE_E6500</div><div class='add'>+#define PPCVLE  PPC_OPCODE_VLE</div><div class='add'>+#define PPCHTM  PPC_OPCODE_HTM</div><div class='add'>+#define E200Z4  PPC_OPCODE_E200Z4</div><div class='add'>+/* The list of embedded processors that use the embedded operand ordering</div><div class='add'>+   for the 3 operand dcbt and dcbtst instructions.  */</div><div class='add'>+#define DCBT_EO	(PPC_OPCODE_E500 | PPC_OPCODE_E500MC | PPC_OPCODE_476 \</div><div class='add'>+		 | PPC_OPCODE_A2)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* The opcode table.</div><div class='ctx'> </div><div class='ctx'>    The format of the opcode table is:</div><div class='ctx'> </div><div class='del'>-   NAME	     OPCODE	MASK		FLAGS		{ OPERANDS }</div><div class='add'>+   NAME		OPCODE		MASK	     FLAGS	ANTI		{OPERANDS}</div><div class='ctx'> </div><div class='ctx'>    NAME is the name of the instruction.</div><div class='ctx'>    OPCODE is the instruction opcode.</div><div class='ctx'>    MASK is the opcode mask; this is used to tell the disassembler</div><div class='ctx'>      which bits in the actual opcode must match OPCODE.</div><div class='del'>-   FLAGS are flags indicated what processors support the instruction.</div><div class='add'>+   FLAGS are flags indicating which processors support the instruction.</div><div class='add'>+   ANTI indicates which processors don't support the instruction.</div><div class='ctx'>    OPERANDS is the list of operands.</div><div class='ctx'> </div><div class='ctx'>    The disassembler reads the table in order and prints the first</div><div class='ctx'>    instruction which matches, so this table is sorted to put more</div><div class='del'>-   specific instructions before more general instructions.  It is also</div><div class='del'>-   sorted by major opcode.  */</div><div class='add'>+   specific instructions before more general instructions.</div><div class='add'>+</div><div class='add'>+   This table must be sorted by major opcode.  Please try to keep it</div><div class='add'>+   vaguely sorted within major opcode too, except of course where</div><div class='add'>+   constrained otherwise by disassembler operation.  */</div><div class='ctx'> </div><div class='ctx'> const struct powerpc_opcode powerpc_opcodes[] = {</div><div class='del'>-{ "attn",    X(0,256), X_MASK,		POWER4,		{ 0 } },</div><div class='del'>-{ "tdlgti",  OPTO(2,TOLGT), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdllti",  OPTO(2,TOLLT), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdeqi",   OPTO(2,TOEQ), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdlgei",  OPTO(2,TOLGE), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdlnli",  OPTO(2,TOLNL), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdllei",  OPTO(2,TOLLE), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdlngi",  OPTO(2,TOLNG), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdgti",   OPTO(2,TOGT), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdgei",   OPTO(2,TOGE), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdnli",   OPTO(2,TONL), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdlti",   OPTO(2,TOLT), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdlei",   OPTO(2,TOLE), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdngi",   OPTO(2,TONG), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdnei",   OPTO(2,TONE), OPTO_MASK,	PPC64,		{ RA, SI } },</div><div class='del'>-{ "tdi",     OP(2),	OP_MASK,	PPC64,		{ TO, RA, SI } },</div><div class='del'>-</div><div class='del'>-{ "twlgti",  OPTO(3,TOLGT), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tlgti",   OPTO(3,TOLGT), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twllti",  OPTO(3,TOLLT), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tllti",   OPTO(3,TOLLT), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "tweqi",   OPTO(3,TOEQ), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "teqi",    OPTO(3,TOEQ), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twlgei",  OPTO(3,TOLGE), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tlgei",   OPTO(3,TOLGE), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twlnli",  OPTO(3,TOLNL), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tlnli",   OPTO(3,TOLNL), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twllei",  OPTO(3,TOLLE), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tllei",   OPTO(3,TOLLE), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twlngi",  OPTO(3,TOLNG), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tlngi",   OPTO(3,TOLNG), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twgti",   OPTO(3,TOGT), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tgti",    OPTO(3,TOGT), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twgei",   OPTO(3,TOGE), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tgei",    OPTO(3,TOGE), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twnli",   OPTO(3,TONL), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tnli",    OPTO(3,TONL), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twlti",   OPTO(3,TOLT), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tlti",    OPTO(3,TOLT), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twlei",   OPTO(3,TOLE), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tlei",    OPTO(3,TOLE), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twngi",   OPTO(3,TONG), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tngi",    OPTO(3,TONG), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twnei",   OPTO(3,TONE), OPTO_MASK,	PPCCOM,		{ RA, SI } },</div><div class='del'>-{ "tnei",    OPTO(3,TONE), OPTO_MASK,	PWRCOM,		{ RA, SI } },</div><div class='del'>-{ "twi",     OP(3),	OP_MASK,	PPCCOM,		{ TO, RA, SI } },</div><div class='del'>-{ "ti",      OP(3),	OP_MASK,	PWRCOM,		{ TO, RA, SI } },</div><div class='del'>-</div><div class='del'>-{ "macchw",	XO(4,172,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchw.",	XO(4,172,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwo",	XO(4,172,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwo.",	XO(4,172,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchws",	XO(4,236,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchws.",	XO(4,236,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwso",	XO(4,236,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwso.",	XO(4,236,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwsu",	XO(4,204,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwsu.",	XO(4,204,0,1), XO_MASK, PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwsuo",	XO(4,204,1,0), XO_MASK, PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwsuo.",	XO(4,204,1,1), XO_MASK, PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwu",	XO(4,140,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwu.",	XO(4,140,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwuo",	XO(4,140,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "macchwuo.",	XO(4,140,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhw",	XO(4,44,0,0),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhw.",	XO(4,44,0,1),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwo",	XO(4,44,1,0),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwo.",	XO(4,44,1,1),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhws",	XO(4,108,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhws.",	XO(4,108,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwso",	XO(4,108,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwso.",	XO(4,108,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwsu",	XO(4,76,0,0),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwsu.",	XO(4,76,0,1),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwsuo",	XO(4,76,1,0),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwsuo.",	XO(4,76,1,1),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwu",	XO(4,12,0,0),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwu.",	XO(4,12,0,1),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwuo",	XO(4,12,1,0),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "machhwuo.",	XO(4,12,1,1),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhw",	XO(4,428,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhw.",	XO(4,428,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwo",	XO(4,428,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwo.",	XO(4,428,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhws",	XO(4,492,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhws.",	XO(4,492,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwso",	XO(4,492,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwso.",	XO(4,492,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwsu",	XO(4,460,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwsu.",	XO(4,460,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwsuo",	XO(4,460,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwsuo.",	XO(4,460,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwu",	XO(4,396,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwu.",	XO(4,396,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwuo",	XO(4,396,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "maclhwuo.",	XO(4,396,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mulchw",	XRC(4,168,0),  X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mulchw.",	XRC(4,168,1),  X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mulchwu",	XRC(4,136,0),  X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mulchwu.",	XRC(4,136,1),  X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mulhhw",	XRC(4,40,0),   X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mulhhw.",	XRC(4,40,1),   X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mulhhwu",	XRC(4,8,0),    X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mulhhwu.",	XRC(4,8,1),    X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mullhw",	XRC(4,424,0),  X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mullhw.",	XRC(4,424,1),  X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mullhwu",	XRC(4,392,0),  X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mullhwu.",	XRC(4,392,1),  X_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmacchw",	XO(4,174,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmacchw.",	XO(4,174,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmacchwo",	XO(4,174,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmacchwo.",	XO(4,174,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmacchws",	XO(4,238,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmacchws.",	XO(4,238,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmacchwso",	XO(4,238,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmacchwso.",	XO(4,238,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmachhw",	XO(4,46,0,0),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmachhw.",	XO(4,46,0,1),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmachhwo",	XO(4,46,1,0),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmachhwo.",	XO(4,46,1,1),  XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmachhws",	XO(4,110,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmachhws.",	XO(4,110,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmachhwso",	XO(4,110,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmachhwso.",	XO(4,110,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmaclhw",	XO(4,430,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmaclhw.",	XO(4,430,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmaclhwo",	XO(4,430,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmaclhwo.",	XO(4,430,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmaclhws",	XO(4,494,0,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmaclhws.",	XO(4,494,0,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmaclhwso",	XO(4,494,1,0), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "nmaclhwso.",	XO(4,494,1,1), XO_MASK,	PPC405|PPC440,	{ RT, RA, RB } },</div><div class='del'>-{ "mfvscr",  VX(4, 1540), VX_MASK,	PPCVEC,		{ VD } },</div><div class='del'>-{ "mtvscr",  VX(4, 1604), VX_MASK,	PPCVEC,		{ VB } },</div><div class='del'>-</div><div class='del'>-  /* Double-precision opcodes.  */</div><div class='del'>-  /* Some of these conflict with AltiVec, so move them before, since</div><div class='del'>-     PPCVEC includes the PPC_OPCODE_PPC set.  */</div><div class='del'>-{ "efscfd",   VX(4, 719), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdabs",   VX(4, 740), VX_MASK,	PPCEFS,		{ RS, RA } },</div><div class='del'>-{ "efdnabs",  VX(4, 741), VX_MASK,	PPCEFS,		{ RS, RA } },</div><div class='del'>-{ "efdneg",   VX(4, 742), VX_MASK,	PPCEFS,		{ RS, RA } },</div><div class='del'>-{ "efdadd",   VX(4, 736), VX_MASK,	PPCEFS,		{ RS, RA, RB } },</div><div class='del'>-{ "efdsub",   VX(4, 737), VX_MASK,	PPCEFS,		{ RS, RA, RB } },</div><div class='del'>-{ "efdmul",   VX(4, 744), VX_MASK,	PPCEFS,		{ RS, RA, RB } },</div><div class='del'>-{ "efddiv",   VX(4, 745), VX_MASK,	PPCEFS,		{ RS, RA, RB } },</div><div class='del'>-{ "efdcmpgt", VX(4, 748), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efdcmplt", VX(4, 749), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efdcmpeq", VX(4, 750), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efdtstgt", VX(4, 764), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efdtstlt", VX(4, 765), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efdtsteq", VX(4, 766), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efdcfsi",  VX(4, 753), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdcfsid", VX(4, 739), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdcfui",  VX(4, 752), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdcfuid", VX(4, 738), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdcfsf",  VX(4, 755), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdcfuf",  VX(4, 754), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdctsi",  VX(4, 757), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdctsidz",VX(4, 747), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdctsiz", VX(4, 762), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdctui",  VX(4, 756), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdctuidz",VX(4, 746), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdctuiz", VX(4, 760), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdctsf",  VX(4, 759), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdctuf",  VX(4, 758), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efdcfs",   VX(4, 751), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-  /* End of double-precision opcodes.  */</div><div class='del'>-</div><div class='del'>-{ "vaddcuw", VX(4,  384), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vaddfp",  VX(4,   10), VX_MASK, 	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vaddsbs", VX(4,  768), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vaddshs", VX(4,  832), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vaddsws", VX(4,  896), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vaddubm", VX(4,    0), VX_MASK, 	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vaddubs", VX(4,  512), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vadduhm", VX(4,   64), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vadduhs", VX(4,  576), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vadduwm", VX(4,  128), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vadduws", VX(4,  640), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vand",    VX(4, 1028), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vandc",   VX(4, 1092), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vavgsb",  VX(4, 1282), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vavgsh",  VX(4, 1346), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vavgsw",  VX(4, 1410), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vavgub",  VX(4, 1026), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vavguh",  VX(4, 1090), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vavguw",  VX(4, 1154), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vcfsx",   VX(4,  842), VX_MASK,	PPCVEC,		{ VD, VB, UIMM } },</div><div class='del'>-{ "vcfux",   VX(4,  778), VX_MASK,	PPCVEC,		{ VD, VB, UIMM } },</div><div class='del'>-{ "vcmpbfp",   VXR(4, 966, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpbfp.",  VXR(4, 966, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpeqfp",  VXR(4, 198, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpeqfp.", VXR(4, 198, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpequb",  VXR(4,   6, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpequb.", VXR(4,   6, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpequh",  VXR(4,  70, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpequh.", VXR(4,  70, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpequw",  VXR(4, 134, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpequw.", VXR(4, 134, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgefp",  VXR(4, 454, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgefp.", VXR(4, 454, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtfp",  VXR(4, 710, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtfp.", VXR(4, 710, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtsb",  VXR(4, 774, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtsb.", VXR(4, 774, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtsh",  VXR(4, 838, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtsh.", VXR(4, 838, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtsw",  VXR(4, 902, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtsw.", VXR(4, 902, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtub",  VXR(4, 518, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtub.", VXR(4, 518, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtuh",  VXR(4, 582, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtuh.", VXR(4, 582, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtuw",  VXR(4, 646, 0), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vcmpgtuw.", VXR(4, 646, 1), VXR_MASK, PPCVEC,	{ VD, VA, VB } },</div><div class='del'>-{ "vctsxs",    VX(4,  970), VX_MASK,	PPCVEC,		{ VD, VB, UIMM } },</div><div class='del'>-{ "vctuxs",    VX(4,  906), VX_MASK,	PPCVEC,		{ VD, VB, UIMM } },</div><div class='del'>-{ "vexptefp",  VX(4,  394), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vlogefp",   VX(4,  458), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vmaddfp",   VXA(4,  46), VXA_MASK,	PPCVEC,		{ VD, VA, VC, VB } },</div><div class='del'>-{ "vmaxfp",    VX(4, 1034), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmaxsb",    VX(4,  258), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmaxsh",    VX(4,  322), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmaxsw",    VX(4,  386), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmaxub",    VX(4,    2), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmaxuh",    VX(4,   66), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmaxuw",    VX(4,  130), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmhaddshs", VXA(4,  32), VXA_MASK,	PPCVEC,		{ VD, VA, VB, VC } },</div><div class='del'>-{ "vmhraddshs", VXA(4, 33), VXA_MASK,	PPCVEC,		{ VD, VA, VB, VC } },</div><div class='del'>-{ "vminfp",    VX(4, 1098), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vminsb",    VX(4,  770), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vminsh",    VX(4,  834), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vminsw",    VX(4,  898), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vminub",    VX(4,  514), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vminuh",    VX(4,  578), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vminuw",    VX(4,  642), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmladduhm", VXA(4,  34), VXA_MASK,	PPCVEC,		{ VD, VA, VB, VC } },</div><div class='del'>-{ "vmrghb",    VX(4,   12), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmrghh",    VX(4,   76), VX_MASK,    PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmrghw",    VX(4,  140), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmrglb",    VX(4,  268), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmrglh",    VX(4,  332), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmrglw",    VX(4,  396), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmsummbm",  VXA(4,  37), VXA_MASK,	PPCVEC,		{ VD, VA, VB, VC } },</div><div class='del'>-{ "vmsumshm",  VXA(4,  40), VXA_MASK,	PPCVEC,		{ VD, VA, VB, VC } },</div><div class='del'>-{ "vmsumshs",  VXA(4,  41), VXA_MASK,	PPCVEC,		{ VD, VA, VB, VC } },</div><div class='del'>-{ "vmsumubm",  VXA(4,  36), VXA_MASK,   PPCVEC,		{ VD, VA, VB, VC } },</div><div class='del'>-{ "vmsumuhm",  VXA(4,  38), VXA_MASK,   PPCVEC,		{ VD, VA, VB, VC } },</div><div class='del'>-{ "vmsumuhs",  VXA(4,  39), VXA_MASK,   PPCVEC,		{ VD, VA, VB, VC } },</div><div class='del'>-{ "vmulesb",   VX(4,  776), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmulesh",   VX(4,  840), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmuleub",   VX(4,  520), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmuleuh",   VX(4,  584), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmulosb",   VX(4,  264), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmulosh",   VX(4,  328), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmuloub",   VX(4,    8), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vmulouh",   VX(4,   72), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vnmsubfp",  VXA(4,  47), VXA_MASK,	PPCVEC,		{ VD, VA, VC, VB } },</div><div class='del'>-{ "vnor",      VX(4, 1284), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vor",       VX(4, 1156), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vperm",     VXA(4,  43), VXA_MASK,	PPCVEC,		{ VD, VA, VB, VC } },</div><div class='del'>-{ "vpkpx",     VX(4,  782), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vpkshss",   VX(4,  398), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vpkshus",   VX(4,  270), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vpkswss",   VX(4,  462), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vpkswus",   VX(4,  334), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vpkuhum",   VX(4,   14), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vpkuhus",   VX(4,  142), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vpkuwum",   VX(4,   78), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vpkuwus",   VX(4,  206), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vrefp",     VX(4,  266), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vrfim",     VX(4,  714), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vrfin",     VX(4,  522), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vrfip",     VX(4,  650), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vrfiz",     VX(4,  586), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vrlb",      VX(4,    4), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vrlh",      VX(4,   68), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vrlw",      VX(4,  132), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vrsqrtefp", VX(4,  330), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vsel",      VXA(4,  42), VXA_MASK,	PPCVEC,		{ VD, VA, VB, VC } },</div><div class='del'>-{ "vsl",       VX(4,  452), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vslb",      VX(4,  260), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsldoi",    VXA(4,  44), VXA_MASK,	PPCVEC,		{ VD, VA, VB, SHB } },</div><div class='del'>-{ "vslh",      VX(4,  324), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vslo",      VX(4, 1036), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vslw",      VX(4,  388), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vspltb",    VX(4,  524), VX_MASK,	PPCVEC,		{ VD, VB, UIMM } },</div><div class='del'>-{ "vsplth",    VX(4,  588), VX_MASK,	PPCVEC,		{ VD, VB, UIMM } },</div><div class='del'>-{ "vspltisb",  VX(4,  780), VX_MASK,	PPCVEC,		{ VD, SIMM } },</div><div class='del'>-{ "vspltish",  VX(4,  844), VX_MASK,	PPCVEC,		{ VD, SIMM } },</div><div class='del'>-{ "vspltisw",  VX(4,  908), VX_MASK,	PPCVEC,		{ VD, SIMM } },</div><div class='del'>-{ "vspltw",    VX(4,  652), VX_MASK,	PPCVEC,		{ VD, VB, UIMM } },</div><div class='del'>-{ "vsr",       VX(4,  708), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsrab",     VX(4,  772), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsrah",     VX(4,  836), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsraw",     VX(4,  900), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsrb",      VX(4,  516), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsrh",      VX(4,  580), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsro",      VX(4, 1100), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsrw",      VX(4,  644), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsubcuw",   VX(4, 1408), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsubfp",    VX(4,   74), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsubsbs",   VX(4, 1792), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsubshs",   VX(4, 1856), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsubsws",   VX(4, 1920), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsububm",   VX(4, 1024), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsububs",   VX(4, 1536), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsubuhm",   VX(4, 1088), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsubuhs",   VX(4, 1600), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsubuwm",   VX(4, 1152), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsubuws",   VX(4, 1664), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsumsws",   VX(4, 1928), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsum2sws",  VX(4, 1672), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsum4sbs",  VX(4, 1800), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsum4shs",  VX(4, 1608), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vsum4ubs",  VX(4, 1544), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-{ "vupkhpx",   VX(4,  846), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vupkhsb",   VX(4,  526), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vupkhsh",   VX(4,  590), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vupklpx",   VX(4,  974), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vupklsb",   VX(4,  654), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vupklsh",   VX(4,  718), VX_MASK,	PPCVEC,		{ VD, VB } },</div><div class='del'>-{ "vxor",      VX(4, 1220), VX_MASK,	PPCVEC,		{ VD, VA, VB } },</div><div class='del'>-</div><div class='del'>-{ "evaddw",    VX(4, 512), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evaddiw",   VX(4, 514), VX_MASK,	PPCSPE,		{ RS, RB, UIMM } },</div><div class='del'>-{ "evsubfw",   VX(4, 516), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evsubw",    VX(4, 516), VX_MASK,	PPCSPE,		{ RS, RB, RA } },</div><div class='del'>-{ "evsubifw",  VX(4, 518), VX_MASK,	PPCSPE,		{ RS, UIMM, RB } },</div><div class='del'>-{ "evsubiw",   VX(4, 518), VX_MASK,	PPCSPE,		{ RS, RB, UIMM } },</div><div class='del'>-{ "evabs",     VX(4, 520), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evneg",     VX(4, 521), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evextsb",   VX(4, 522), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evextsh",   VX(4, 523), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evrndw",    VX(4, 524), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evcntlzw",  VX(4, 525), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evcntlsw",  VX(4, 526), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-</div><div class='del'>-{ "brinc",     VX(4, 527), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evand",     VX(4, 529), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evandc",    VX(4, 530), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmr",      VX(4, 535), VX_MASK,	PPCSPE,		{ RS, RA, BBA } },</div><div class='del'>-{ "evor",      VX(4, 535), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evorc",     VX(4, 539), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evxor",     VX(4, 534), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "eveqv",     VX(4, 537), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evnand",    VX(4, 542), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evnot",     VX(4, 536), VX_MASK,	PPCSPE,		{ RS, RA, BBA } },</div><div class='del'>-{ "evnor",     VX(4, 536), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evrlw",     VX(4, 552), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evrlwi",    VX(4, 554), VX_MASK,	PPCSPE,		{ RS, RA, EVUIMM } },</div><div class='del'>-{ "evslw",     VX(4, 548), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evslwi",    VX(4, 550), VX_MASK,	PPCSPE,		{ RS, RA, EVUIMM } },</div><div class='del'>-{ "evsrws",    VX(4, 545), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evsrwu",    VX(4, 544), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evsrwis",   VX(4, 547), VX_MASK,	PPCSPE,		{ RS, RA, EVUIMM } },</div><div class='del'>-{ "evsrwiu",   VX(4, 546), VX_MASK,	PPCSPE,		{ RS, RA, EVUIMM } },</div><div class='del'>-{ "evsplati",  VX(4, 553), VX_MASK,	PPCSPE,		{ RS, SIMM } },</div><div class='del'>-{ "evsplatfi", VX(4, 555), VX_MASK,	PPCSPE,		{ RS, SIMM } },</div><div class='del'>-{ "evmergehi", VX(4, 556), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmergelo", VX(4, 557), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmergehilo",VX(4,558), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmergelohi",VX(4,559), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evcmpgts",  VX(4, 561), VX_MASK,	PPCSPE,		{ CRFD, RA, RB } },</div><div class='del'>-{ "evcmpgtu",  VX(4, 560), VX_MASK,	PPCSPE,		{ CRFD, RA, RB } },</div><div class='del'>-{ "evcmplts",  VX(4, 563), VX_MASK,	PPCSPE,		{ CRFD, RA, RB } },</div><div class='del'>-{ "evcmpltu",  VX(4, 562), VX_MASK,	PPCSPE,		{ CRFD, RA, RB } },</div><div class='del'>-{ "evcmpeq",   VX(4, 564), VX_MASK,	PPCSPE,		{ CRFD, RA, RB } },</div><div class='del'>-{ "evsel",     EVSEL(4,79),EVSEL_MASK,	PPCSPE,		{ RS, RA, RB, CRFS } },</div><div class='del'>-</div><div class='del'>-{ "evldd",     VX(4, 769), VX_MASK,	PPCSPE,		{ RS, EVUIMM_8, RA } },</div><div class='del'>-{ "evlddx",    VX(4, 768), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evldw",     VX(4, 771), VX_MASK,	PPCSPE,		{ RS, EVUIMM_8, RA } },</div><div class='del'>-{ "evldwx",    VX(4, 770), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evldh",     VX(4, 773), VX_MASK,	PPCSPE,		{ RS, EVUIMM_8, RA } },</div><div class='del'>-{ "evldhx",    VX(4, 772), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evlwhe",    VX(4, 785), VX_MASK,	PPCSPE,		{ RS, EVUIMM_4, RA } },</div><div class='del'>-{ "evlwhex",   VX(4, 784), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evlwhou",   VX(4, 789), VX_MASK,	PPCSPE,		{ RS, EVUIMM_4, RA } },</div><div class='del'>-{ "evlwhoux",  VX(4, 788), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evlwhos",   VX(4, 791), VX_MASK,	PPCSPE,		{ RS, EVUIMM_4, RA } },</div><div class='del'>-{ "evlwhosx",  VX(4, 790), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evlwwsplat",VX(4, 793), VX_MASK,	PPCSPE,		{ RS, EVUIMM_4, RA } },</div><div class='del'>-{ "evlwwsplatx",VX(4, 792), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evlwhsplat",VX(4, 797), VX_MASK,	PPCSPE,		{ RS, EVUIMM_4, RA } },</div><div class='del'>-{ "evlwhsplatx",VX(4, 796), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evlhhesplat",VX(4, 777), VX_MASK,	PPCSPE,		{ RS, EVUIMM_2, RA } },</div><div class='del'>-{ "evlhhesplatx",VX(4, 776), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evlhhousplat",VX(4, 781), VX_MASK,	PPCSPE,		{ RS, EVUIMM_2, RA } },</div><div class='del'>-{ "evlhhousplatx",VX(4, 780), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evlhhossplat",VX(4, 783), VX_MASK,	PPCSPE,		{ RS, EVUIMM_2, RA } },</div><div class='del'>-{ "evlhhossplatx",VX(4, 782), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evstdd",    VX(4, 801), VX_MASK,	PPCSPE,		{ RS, EVUIMM_8, RA } },</div><div class='del'>-{ "evstddx",   VX(4, 800), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evstdw",    VX(4, 803), VX_MASK,	PPCSPE,		{ RS, EVUIMM_8, RA } },</div><div class='del'>-{ "evstdwx",   VX(4, 802), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evstdh",    VX(4, 805), VX_MASK,	PPCSPE,		{ RS, EVUIMM_8, RA } },</div><div class='del'>-{ "evstdhx",   VX(4, 804), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evstwwe",   VX(4, 825), VX_MASK,	PPCSPE,		{ RS, EVUIMM_4, RA } },</div><div class='del'>-{ "evstwwex",  VX(4, 824), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evstwwo",   VX(4, 829), VX_MASK,	PPCSPE,		{ RS, EVUIMM_4, RA } },</div><div class='del'>-{ "evstwwox",  VX(4, 828), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evstwhe",   VX(4, 817), VX_MASK,	PPCSPE,		{ RS, EVUIMM_4, RA } },</div><div class='del'>-{ "evstwhex",  VX(4, 816), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evstwho",   VX(4, 821), VX_MASK,	PPCSPE,		{ RS, EVUIMM_4, RA } },</div><div class='del'>-{ "evstwhox",  VX(4, 820), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evfsabs",   VX(4, 644), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evfsnabs",  VX(4, 645), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evfsneg",   VX(4, 646), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evfsadd",   VX(4, 640), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evfssub",   VX(4, 641), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evfsmul",   VX(4, 648), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evfsdiv",   VX(4, 649), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evfscmpgt", VX(4, 652), VX_MASK,	PPCSPE,		{ CRFD, RA, RB } },</div><div class='del'>-{ "evfscmplt", VX(4, 653), VX_MASK,	PPCSPE,		{ CRFD, RA, RB } },</div><div class='del'>-{ "evfscmpeq", VX(4, 654), VX_MASK,	PPCSPE,		{ CRFD, RA, RB } },</div><div class='del'>-{ "evfststgt", VX(4, 668), VX_MASK,	PPCSPE,		{ CRFD, RA, RB } },</div><div class='del'>-{ "evfststlt", VX(4, 669), VX_MASK,	PPCSPE,		{ CRFD, RA, RB } },</div><div class='del'>-{ "evfststeq", VX(4, 670), VX_MASK,	PPCSPE,		{ CRFD, RA, RB } },</div><div class='del'>-{ "evfscfui",  VX(4, 656), VX_MASK,	PPCSPE,		{ RS, RB } },</div><div class='del'>-{ "evfsctuiz", VX(4, 664), VX_MASK,	PPCSPE,		{ RS, RB } },</div><div class='del'>-{ "evfscfsi",  VX(4, 657), VX_MASK,	PPCSPE,		{ RS, RB } },</div><div class='del'>-{ "evfscfuf",  VX(4, 658), VX_MASK,	PPCSPE,		{ RS, RB } },</div><div class='del'>-{ "evfscfsf",  VX(4, 659), VX_MASK,	PPCSPE,		{ RS, RB } },</div><div class='del'>-{ "evfsctui",  VX(4, 660), VX_MASK,	PPCSPE,		{ RS, RB } },</div><div class='del'>-{ "evfsctsi",  VX(4, 661), VX_MASK,	PPCSPE,		{ RS, RB } },</div><div class='del'>-{ "evfsctsiz", VX(4, 666), VX_MASK,	PPCSPE,		{ RS, RB } },</div><div class='del'>-{ "evfsctuf",  VX(4, 662), VX_MASK,	PPCSPE,		{ RS, RB } },</div><div class='del'>-{ "evfsctsf",  VX(4, 663), VX_MASK,	PPCSPE,		{ RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "efsabs",   VX(4, 708), VX_MASK,	PPCEFS,		{ RS, RA } },</div><div class='del'>-{ "efsnabs",  VX(4, 709), VX_MASK,	PPCEFS,		{ RS, RA } },</div><div class='del'>-{ "efsneg",   VX(4, 710), VX_MASK,	PPCEFS,		{ RS, RA } },</div><div class='del'>-{ "efsadd",   VX(4, 704), VX_MASK,	PPCEFS,		{ RS, RA, RB } },</div><div class='del'>-{ "efssub",   VX(4, 705), VX_MASK,	PPCEFS,		{ RS, RA, RB } },</div><div class='del'>-{ "efsmul",   VX(4, 712), VX_MASK,	PPCEFS,		{ RS, RA, RB } },</div><div class='del'>-{ "efsdiv",   VX(4, 713), VX_MASK,	PPCEFS,		{ RS, RA, RB } },</div><div class='del'>-{ "efscmpgt", VX(4, 716), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efscmplt", VX(4, 717), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efscmpeq", VX(4, 718), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efststgt", VX(4, 732), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efststlt", VX(4, 733), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efststeq", VX(4, 734), VX_MASK,	PPCEFS,		{ CRFD, RA, RB } },</div><div class='del'>-{ "efscfui",  VX(4, 720), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efsctuiz", VX(4, 728), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efscfsi",  VX(4, 721), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efscfuf",  VX(4, 722), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efscfsf",  VX(4, 723), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efsctui",  VX(4, 724), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efsctsi",  VX(4, 725), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efsctsiz", VX(4, 730), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efsctuf",  VX(4, 726), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-{ "efsctsf",  VX(4, 727), VX_MASK,	PPCEFS,		{ RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmhossf",  VX(4, 1031), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhossfa", VX(4, 1063), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhosmf",  VX(4, 1039), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhosmfa", VX(4, 1071), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhosmi",  VX(4, 1037), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhosmia", VX(4, 1069), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhoumi",  VX(4, 1036), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhoumia", VX(4, 1068), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhessf",  VX(4, 1027), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhessfa", VX(4, 1059), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhesmf",  VX(4, 1035), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhesmfa", VX(4, 1067), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhesmi",  VX(4, 1033), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhesmia", VX(4, 1065), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmheumi",  VX(4, 1032), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmheumia", VX(4, 1064), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmhossfaaw",VX(4, 1287), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhossiaaw",VX(4, 1285), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhosmfaaw",VX(4, 1295), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhosmiaaw",VX(4, 1293), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhousiaaw",VX(4, 1284), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhoumiaaw",VX(4, 1292), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhessfaaw",VX(4, 1283), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhessiaaw",VX(4, 1281), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhesmfaaw",VX(4, 1291), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhesmiaaw",VX(4, 1289), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmheusiaaw",VX(4, 1280), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmheumiaaw",VX(4, 1288), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmhossfanw",VX(4, 1415), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhossianw",VX(4, 1413), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhosmfanw",VX(4, 1423), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhosmianw",VX(4, 1421), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhousianw",VX(4, 1412), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhoumianw",VX(4, 1420), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhessfanw",VX(4, 1411), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhessianw",VX(4, 1409), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhesmfanw",VX(4, 1419), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhesmianw",VX(4, 1417), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmheusianw",VX(4, 1408), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmheumianw",VX(4, 1416), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmhogsmfaa",VX(4, 1327), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhogsmiaa",VX(4, 1325), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhogumiaa",VX(4, 1324), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhegsmfaa",VX(4, 1323), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhegsmiaa",VX(4, 1321), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhegumiaa",VX(4, 1320), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmhogsmfan",VX(4, 1455), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhogsmian",VX(4, 1453), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhogumian",VX(4, 1452), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhegsmfan",VX(4, 1451), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhegsmian",VX(4, 1449), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmhegumian",VX(4, 1448), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmwhssf",  VX(4, 1095), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwhssfa", VX(4, 1127), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwhsmf",  VX(4, 1103), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwhsmfa", VX(4, 1135), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwhsmi",  VX(4, 1101), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwhsmia", VX(4, 1133), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwhumi",  VX(4, 1100), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwhumia", VX(4, 1132), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmwlumi",  VX(4, 1096), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwlumia", VX(4, 1128), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmwlssiaaw",VX(4, 1345), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwlsmiaaw",VX(4, 1353), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwlusiaaw",VX(4, 1344), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwlumiaaw",VX(4, 1352), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmwlssianw",VX(4, 1473), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwlsmianw",VX(4, 1481), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwlusianw",VX(4, 1472), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwlumianw",VX(4, 1480), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmwssf",   VX(4, 1107), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwssfa",  VX(4, 1139), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwsmf",   VX(4, 1115), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwsmfa",  VX(4, 1147), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwsmi",   VX(4, 1113), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwsmia",  VX(4, 1145), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwumi",   VX(4, 1112), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwumia",  VX(4, 1144), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmwssfaa", VX(4, 1363), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwsmfaa", VX(4, 1371), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwsmiaa", VX(4, 1369), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwumiaa", VX(4, 1368), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evmwssfan", VX(4, 1491), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwsmfan", VX(4, 1499), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwsmian", VX(4, 1497), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evmwumian", VX(4, 1496), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "evaddssiaaw",VX(4, 1217), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evaddsmiaaw",VX(4, 1225), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evaddusiaaw",VX(4, 1216), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evaddumiaaw",VX(4, 1224), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-</div><div class='del'>-{ "evsubfssiaaw",VX(4, 1219), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evsubfsmiaaw",VX(4, 1227), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evsubfusiaaw",VX(4, 1218), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-{ "evsubfumiaaw",VX(4, 1226), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-</div><div class='del'>-{ "evmra",    VX(4, 1220), VX_MASK,	PPCSPE,		{ RS, RA } },</div><div class='del'>-</div><div class='del'>-{ "evdivws",  VX(4, 1222), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-{ "evdivwu",  VX(4, 1223), VX_MASK,	PPCSPE,		{ RS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "mulli",   OP(7),	OP_MASK,	PPCCOM,		{ RT, RA, SI } },</div><div class='del'>-{ "muli",    OP(7),	OP_MASK,	PWRCOM,		{ RT, RA, SI } },</div><div class='del'>-</div><div class='del'>-{ "subfic",  OP(8),	OP_MASK,	PPCCOM,		{ RT, RA, SI } },</div><div class='del'>-{ "sfi",     OP(8),	OP_MASK,	PWRCOM,		{ RT, RA, SI } },</div><div class='del'>-</div><div class='del'>-{ "dozi",    OP(9),	OP_MASK,	M601,		{ RT, RA, SI } },</div><div class='del'>-</div><div class='del'>-{ "bce",     B(9,0,0),	B_MASK,		BOOKE64,	{ BO, BI, BD } },</div><div class='del'>-{ "bcel",    B(9,0,1),	B_MASK,		BOOKE64,	{ BO, BI, BD } },</div><div class='del'>-{ "bcea",    B(9,1,0),	B_MASK,		BOOKE64,	{ BO, BI, BDA } },</div><div class='del'>-{ "bcela",   B(9,1,1),	B_MASK,		BOOKE64,	{ BO, BI, BDA } },</div><div class='del'>-</div><div class='del'>-{ "cmplwi",  OPL(10,0),	OPL_MASK,	PPCCOM,		{ OBF, RA, UI } },</div><div class='del'>-{ "cmpldi",  OPL(10,1), OPL_MASK,	PPC64,		{ OBF, RA, UI } },</div><div class='del'>-{ "cmpli",   OP(10),	OP_MASK,	PPC,		{ BF, L, RA, UI } },</div><div class='del'>-{ "cmpli",   OP(10),	OP_MASK,	PWRCOM,		{ BF, RA, UI } },</div><div class='del'>-</div><div class='del'>-{ "cmpwi",   OPL(11,0),	OPL_MASK,	PPCCOM,		{ OBF, RA, SI } },</div><div class='del'>-{ "cmpdi",   OPL(11,1),	OPL_MASK,	PPC64,		{ OBF, RA, SI } },</div><div class='del'>-{ "cmpi",    OP(11),	OP_MASK,	PPC,		{ BF, L, RA, SI } },</div><div class='del'>-{ "cmpi",    OP(11),	OP_MASK,	PWRCOM,		{ BF, RA, SI } },</div><div class='del'>-</div><div class='del'>-{ "addic",   OP(12),	OP_MASK,	PPCCOM,		{ RT, RA, SI } },</div><div class='del'>-{ "ai",	     OP(12),	OP_MASK,	PWRCOM,		{ RT, RA, SI } },</div><div class='del'>-{ "subic",   OP(12),	OP_MASK,	PPCCOM,		{ RT, RA, NSI } },</div><div class='del'>-</div><div class='del'>-{ "addic.",  OP(13),	OP_MASK,	PPCCOM,		{ RT, RA, SI } },</div><div class='del'>-{ "ai.",     OP(13),	OP_MASK,	PWRCOM,		{ RT, RA, SI } },</div><div class='del'>-{ "subic.",  OP(13),	OP_MASK,	PPCCOM,		{ RT, RA, NSI } },</div><div class='del'>-</div><div class='del'>-{ "li",	     OP(14),	DRA_MASK,	PPCCOM,		{ RT, SI } },</div><div class='del'>-{ "lil",     OP(14),	DRA_MASK,	PWRCOM,		{ RT, SI } },</div><div class='del'>-{ "addi",    OP(14),	OP_MASK,	PPCCOM,		{ RT, RA0, SI } },</div><div class='del'>-{ "cal",     OP(14),	OP_MASK,	PWRCOM,		{ RT, D, RA0 } },</div><div class='del'>-{ "subi",    OP(14),	OP_MASK,	PPCCOM,		{ RT, RA0, NSI } },</div><div class='del'>-{ "la",	     OP(14),	OP_MASK,	PPCCOM,		{ RT, D, RA0 } },</div><div class='del'>-</div><div class='del'>-{ "lis",     OP(15),	DRA_MASK,	PPCCOM,		{ RT, SISIGNOPT } },</div><div class='del'>-{ "liu",     OP(15),	DRA_MASK,	PWRCOM,		{ RT, SISIGNOPT } },</div><div class='del'>-{ "addis",   OP(15),	OP_MASK,	PPCCOM,		{ RT,RA0,SISIGNOPT } },</div><div class='del'>-{ "cau",     OP(15),	OP_MASK,	PWRCOM,		{ RT,RA0,SISIGNOPT } },</div><div class='del'>-{ "subis",   OP(15),	OP_MASK,	PPCCOM,		{ RT, RA0, NSI } },</div><div class='del'>-</div><div class='del'>-{ "bdnz-",   BBO(16,BODNZ,0,0),      BBOATBI_MASK, PPCCOM,	{ BDM } },</div><div class='del'>-{ "bdnz+",   BBO(16,BODNZ,0,0),      BBOATBI_MASK, PPCCOM,	{ BDP } },</div><div class='del'>-{ "bdnz",    BBO(16,BODNZ,0,0),      BBOATBI_MASK, PPCCOM,	{ BD } },</div><div class='del'>-{ "bdn",     BBO(16,BODNZ,0,0),      BBOATBI_MASK, PWRCOM,	{ BD } },</div><div class='del'>-{ "bdnzl-",  BBO(16,BODNZ,0,1),      BBOATBI_MASK, PPCCOM,	{ BDM } },</div><div class='del'>-{ "bdnzl+",  BBO(16,BODNZ,0,1),      BBOATBI_MASK, PPCCOM,	{ BDP } },</div><div class='del'>-{ "bdnzl",   BBO(16,BODNZ,0,1),      BBOATBI_MASK, PPCCOM,	{ BD } },</div><div class='del'>-{ "bdnl",    BBO(16,BODNZ,0,1),      BBOATBI_MASK, PWRCOM,	{ BD } },</div><div class='del'>-{ "bdnza-",  BBO(16,BODNZ,1,0),      BBOATBI_MASK, PPCCOM,	{ BDMA } },</div><div class='del'>-{ "bdnza+",  BBO(16,BODNZ,1,0),      BBOATBI_MASK, PPCCOM,	{ BDPA } },</div><div class='del'>-{ "bdnza",   BBO(16,BODNZ,1,0),      BBOATBI_MASK, PPCCOM,	{ BDA } },</div><div class='del'>-{ "bdna",    BBO(16,BODNZ,1,0),      BBOATBI_MASK, PWRCOM,	{ BDA } },</div><div class='del'>-{ "bdnzla-", BBO(16,BODNZ,1,1),      BBOATBI_MASK, PPCCOM,	{ BDMA } },</div><div class='del'>-{ "bdnzla+", BBO(16,BODNZ,1,1),      BBOATBI_MASK, PPCCOM,	{ BDPA } },</div><div class='del'>-{ "bdnzla",  BBO(16,BODNZ,1,1),      BBOATBI_MASK, PPCCOM,	{ BDA } },</div><div class='del'>-{ "bdnla",   BBO(16,BODNZ,1,1),      BBOATBI_MASK, PWRCOM,	{ BDA } },</div><div class='del'>-{ "bdz-",    BBO(16,BODZ,0,0),       BBOATBI_MASK, PPCCOM,	{ BDM } },</div><div class='del'>-{ "bdz+",    BBO(16,BODZ,0,0),       BBOATBI_MASK, PPCCOM,	{ BDP } },</div><div class='del'>-{ "bdz",     BBO(16,BODZ,0,0),       BBOATBI_MASK, COM,		{ BD } },</div><div class='del'>-{ "bdzl-",   BBO(16,BODZ,0,1),       BBOATBI_MASK, PPCCOM,	{ BDM } },</div><div class='del'>-{ "bdzl+",   BBO(16,BODZ,0,1),       BBOATBI_MASK, PPCCOM,	{ BDP } },</div><div class='del'>-{ "bdzl",    BBO(16,BODZ,0,1),       BBOATBI_MASK, COM,		{ BD } },</div><div class='del'>-{ "bdza-",   BBO(16,BODZ,1,0),       BBOATBI_MASK, PPCCOM,	{ BDMA } },</div><div class='del'>-{ "bdza+",   BBO(16,BODZ,1,0),       BBOATBI_MASK, PPCCOM,	{ BDPA } },</div><div class='del'>-{ "bdza",    BBO(16,BODZ,1,0),       BBOATBI_MASK, COM,		{ BDA } },</div><div class='del'>-{ "bdzla-",  BBO(16,BODZ,1,1),       BBOATBI_MASK, PPCCOM,	{ BDMA } },</div><div class='del'>-{ "bdzla+",  BBO(16,BODZ,1,1),       BBOATBI_MASK, PPCCOM,	{ BDPA } },</div><div class='del'>-{ "bdzla",   BBO(16,BODZ,1,1),       BBOATBI_MASK, COM,		{ BDA } },</div><div class='del'>-{ "blt-",    BBOCB(16,BOT,CBLT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "blt+",    BBOCB(16,BOT,CBLT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "blt",     BBOCB(16,BOT,CBLT,0,0), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bltl-",   BBOCB(16,BOT,CBLT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bltl+",   BBOCB(16,BOT,CBLT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bltl",    BBOCB(16,BOT,CBLT,0,1), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "blta-",   BBOCB(16,BOT,CBLT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "blta+",   BBOCB(16,BOT,CBLT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "blta",    BBOCB(16,BOT,CBLT,1,0), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bltla-",  BBOCB(16,BOT,CBLT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bltla+",  BBOCB(16,BOT,CBLT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bltla",   BBOCB(16,BOT,CBLT,1,1), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bgt-",    BBOCB(16,BOT,CBGT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bgt+",    BBOCB(16,BOT,CBGT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bgt",     BBOCB(16,BOT,CBGT,0,0), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bgtl-",   BBOCB(16,BOT,CBGT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bgtl+",   BBOCB(16,BOT,CBGT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bgtl",    BBOCB(16,BOT,CBGT,0,1), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bgta-",   BBOCB(16,BOT,CBGT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bgta+",   BBOCB(16,BOT,CBGT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bgta",    BBOCB(16,BOT,CBGT,1,0), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bgtla-",  BBOCB(16,BOT,CBGT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bgtla+",  BBOCB(16,BOT,CBGT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bgtla",   BBOCB(16,BOT,CBGT,1,1), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "beq-",    BBOCB(16,BOT,CBEQ,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "beq+",    BBOCB(16,BOT,CBEQ,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "beq",     BBOCB(16,BOT,CBEQ,0,0), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "beql-",   BBOCB(16,BOT,CBEQ,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "beql+",   BBOCB(16,BOT,CBEQ,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "beql",    BBOCB(16,BOT,CBEQ,0,1), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "beqa-",   BBOCB(16,BOT,CBEQ,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "beqa+",   BBOCB(16,BOT,CBEQ,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "beqa",    BBOCB(16,BOT,CBEQ,1,0), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "beqla-",  BBOCB(16,BOT,CBEQ,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "beqla+",  BBOCB(16,BOT,CBEQ,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "beqla",   BBOCB(16,BOT,CBEQ,1,1), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bso-",    BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bso+",    BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bso",     BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bsol-",   BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bsol+",   BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bsol",    BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bsoa-",   BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bsoa+",   BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bsoa",    BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bsola-",  BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bsola+",  BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bsola",   BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bun-",    BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bun+",    BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bun",     BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BD } },</div><div class='del'>-{ "bunl-",   BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bunl+",   BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bunl",    BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BD } },</div><div class='del'>-{ "buna-",   BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "buna+",   BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "buna",    BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDA } },</div><div class='del'>-{ "bunla-",  BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bunla+",  BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bunla",   BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDA } },</div><div class='del'>-{ "bge-",    BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bge+",    BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bge",     BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bgel-",   BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bgel+",   BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bgel",    BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bgea-",   BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bgea+",   BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bgea",    BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bgela-",  BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bgela+",  BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bgela",   BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bnl-",    BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bnl+",    BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bnl",     BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bnll-",   BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bnll+",   BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bnll",    BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bnla-",   BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bnla+",   BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bnla",    BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bnlla-",  BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bnlla+",  BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bnlla",   BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "ble-",    BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "ble+",    BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "ble",     BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "blel-",   BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "blel+",   BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "blel",    BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "blea-",   BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "blea+",   BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "blea",    BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "blela-",  BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "blela+",  BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "blela",   BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bng-",    BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bng+",    BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bng",     BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bngl-",   BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bngl+",   BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bngl",    BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bnga-",   BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bnga+",   BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bnga",    BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bngla-",  BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bngla+",  BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bngla",   BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bne-",    BBOCB(16,BOF,CBEQ,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bne+",    BBOCB(16,BOF,CBEQ,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bne",     BBOCB(16,BOF,CBEQ,0,0), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bnel-",   BBOCB(16,BOF,CBEQ,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bnel+",   BBOCB(16,BOF,CBEQ,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bnel",    BBOCB(16,BOF,CBEQ,0,1), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bnea-",   BBOCB(16,BOF,CBEQ,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bnea+",   BBOCB(16,BOF,CBEQ,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bnea",    BBOCB(16,BOF,CBEQ,1,0), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bnela-",  BBOCB(16,BOF,CBEQ,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bnela+",  BBOCB(16,BOF,CBEQ,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bnela",   BBOCB(16,BOF,CBEQ,1,1), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bns-",    BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bns+",    BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bns",     BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bnsl-",   BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bnsl+",   BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bnsl",    BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, COM,		{ CR, BD } },</div><div class='del'>-{ "bnsa-",   BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bnsa+",   BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bnsa",    BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bnsla-",  BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bnsla+",  BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bnsla",   BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, COM,		{ CR, BDA } },</div><div class='del'>-{ "bnu-",    BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bnu+",    BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bnu",     BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, PPCCOM,	{ CR, BD } },</div><div class='del'>-{ "bnul-",   BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDM } },</div><div class='del'>-{ "bnul+",   BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BDP } },</div><div class='del'>-{ "bnul",    BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, PPCCOM,	{ CR, BD } },</div><div class='del'>-{ "bnua-",   BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bnua+",   BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bnua",    BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, PPCCOM,	{ CR, BDA } },</div><div class='del'>-{ "bnula-",  BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDMA } },</div><div class='del'>-{ "bnula+",  BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDPA } },</div><div class='del'>-{ "bnula",   BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, PPCCOM,	{ CR, BDA } },</div><div class='del'>-{ "bdnzt-",  BBO(16,BODNZT,0,0), BBOY_MASK, NOPOWER4,	{ BI, BDM } },</div><div class='del'>-{ "bdnzt+",  BBO(16,BODNZT,0,0), BBOY_MASK, NOPOWER4,	{ BI, BDP } },</div><div class='del'>-{ "bdnzt",   BBO(16,BODNZT,0,0), BBOY_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bdnztl-", BBO(16,BODNZT,0,1), BBOY_MASK, NOPOWER4,	{ BI, BDM } },</div><div class='del'>-{ "bdnztl+", BBO(16,BODNZT,0,1), BBOY_MASK, NOPOWER4,	{ BI, BDP } },</div><div class='del'>-{ "bdnztl",  BBO(16,BODNZT,0,1), BBOY_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bdnzta-", BBO(16,BODNZT,1,0), BBOY_MASK, NOPOWER4,	{ BI, BDMA } },</div><div class='del'>-{ "bdnzta+", BBO(16,BODNZT,1,0), BBOY_MASK, NOPOWER4,	{ BI, BDPA } },</div><div class='del'>-{ "bdnzta",  BBO(16,BODNZT,1,0), BBOY_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bdnztla-",BBO(16,BODNZT,1,1), BBOY_MASK, NOPOWER4,	{ BI, BDMA } },</div><div class='del'>-{ "bdnztla+",BBO(16,BODNZT,1,1), BBOY_MASK, NOPOWER4,	{ BI, BDPA } },</div><div class='del'>-{ "bdnztla", BBO(16,BODNZT,1,1), BBOY_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bdnzf-",  BBO(16,BODNZF,0,0), BBOY_MASK, NOPOWER4,	{ BI, BDM } },</div><div class='del'>-{ "bdnzf+",  BBO(16,BODNZF,0,0), BBOY_MASK, NOPOWER4,	{ BI, BDP } },</div><div class='del'>-{ "bdnzf",   BBO(16,BODNZF,0,0), BBOY_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bdnzfl-", BBO(16,BODNZF,0,1), BBOY_MASK, NOPOWER4,	{ BI, BDM } },</div><div class='del'>-{ "bdnzfl+", BBO(16,BODNZF,0,1), BBOY_MASK, NOPOWER4,	{ BI, BDP } },</div><div class='del'>-{ "bdnzfl",  BBO(16,BODNZF,0,1), BBOY_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bdnzfa-", BBO(16,BODNZF,1,0), BBOY_MASK, NOPOWER4,	{ BI, BDMA } },</div><div class='del'>-{ "bdnzfa+", BBO(16,BODNZF,1,0), BBOY_MASK, NOPOWER4,	{ BI, BDPA } },</div><div class='del'>-{ "bdnzfa",  BBO(16,BODNZF,1,0), BBOY_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bdnzfla-",BBO(16,BODNZF,1,1), BBOY_MASK, NOPOWER4,	{ BI, BDMA } },</div><div class='del'>-{ "bdnzfla+",BBO(16,BODNZF,1,1), BBOY_MASK, NOPOWER4,	{ BI, BDPA } },</div><div class='del'>-{ "bdnzfla", BBO(16,BODNZF,1,1), BBOY_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bt-",     BBO(16,BOT,0,0), BBOAT_MASK, PPCCOM,	{ BI, BDM } },</div><div class='del'>-{ "bt+",     BBO(16,BOT,0,0), BBOAT_MASK, PPCCOM,	{ BI, BDP } },</div><div class='del'>-{ "bt",	     BBO(16,BOT,0,0), BBOAT_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bbt",     BBO(16,BOT,0,0), BBOAT_MASK, PWRCOM,	{ BI, BD } },</div><div class='del'>-{ "btl-",    BBO(16,BOT,0,1), BBOAT_MASK, PPCCOM,	{ BI, BDM } },</div><div class='del'>-{ "btl+",    BBO(16,BOT,0,1), BBOAT_MASK, PPCCOM,	{ BI, BDP } },</div><div class='del'>-{ "btl",     BBO(16,BOT,0,1), BBOAT_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bbtl",    BBO(16,BOT,0,1), BBOAT_MASK, PWRCOM,	{ BI, BD } },</div><div class='del'>-{ "bta-",    BBO(16,BOT,1,0), BBOAT_MASK, PPCCOM,	{ BI, BDMA } },</div><div class='del'>-{ "bta+",    BBO(16,BOT,1,0), BBOAT_MASK, PPCCOM,	{ BI, BDPA } },</div><div class='del'>-{ "bta",     BBO(16,BOT,1,0), BBOAT_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bbta",    BBO(16,BOT,1,0), BBOAT_MASK, PWRCOM,	{ BI, BDA } },</div><div class='del'>-{ "btla-",   BBO(16,BOT,1,1), BBOAT_MASK, PPCCOM,	{ BI, BDMA } },</div><div class='del'>-{ "btla+",   BBO(16,BOT,1,1), BBOAT_MASK, PPCCOM,	{ BI, BDPA } },</div><div class='del'>-{ "btla",    BBO(16,BOT,1,1), BBOAT_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bbtla",   BBO(16,BOT,1,1), BBOAT_MASK, PWRCOM,	{ BI, BDA } },</div><div class='del'>-{ "bf-",     BBO(16,BOF,0,0), BBOAT_MASK, PPCCOM,	{ BI, BDM } },</div><div class='del'>-{ "bf+",     BBO(16,BOF,0,0), BBOAT_MASK, PPCCOM,	{ BI, BDP } },</div><div class='del'>-{ "bf",	     BBO(16,BOF,0,0), BBOAT_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bbf",     BBO(16,BOF,0,0), BBOAT_MASK, PWRCOM,	{ BI, BD } },</div><div class='del'>-{ "bfl-",    BBO(16,BOF,0,1), BBOAT_MASK, PPCCOM,	{ BI, BDM } },</div><div class='del'>-{ "bfl+",    BBO(16,BOF,0,1), BBOAT_MASK, PPCCOM,	{ BI, BDP } },</div><div class='del'>-{ "bfl",     BBO(16,BOF,0,1), BBOAT_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bbfl",    BBO(16,BOF,0,1), BBOAT_MASK, PWRCOM,	{ BI, BD } },</div><div class='del'>-{ "bfa-",    BBO(16,BOF,1,0), BBOAT_MASK, PPCCOM,	{ BI, BDMA } },</div><div class='del'>-{ "bfa+",    BBO(16,BOF,1,0), BBOAT_MASK, PPCCOM,	{ BI, BDPA } },</div><div class='del'>-{ "bfa",     BBO(16,BOF,1,0), BBOAT_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bbfa",    BBO(16,BOF,1,0), BBOAT_MASK, PWRCOM,	{ BI, BDA } },</div><div class='del'>-{ "bfla-",   BBO(16,BOF,1,1), BBOAT_MASK, PPCCOM,	{ BI, BDMA } },</div><div class='del'>-{ "bfla+",   BBO(16,BOF,1,1), BBOAT_MASK, PPCCOM,	{ BI, BDPA } },</div><div class='del'>-{ "bfla",    BBO(16,BOF,1,1), BBOAT_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bbfla",   BBO(16,BOF,1,1), BBOAT_MASK, PWRCOM,	{ BI, BDA } },</div><div class='del'>-{ "bdzt-",   BBO(16,BODZT,0,0), BBOY_MASK, NOPOWER4,	{ BI, BDM } },</div><div class='del'>-{ "bdzt+",   BBO(16,BODZT,0,0), BBOY_MASK, NOPOWER4,	{ BI, BDP } },</div><div class='del'>-{ "bdzt",    BBO(16,BODZT,0,0), BBOY_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bdztl-",  BBO(16,BODZT,0,1), BBOY_MASK, NOPOWER4,	{ BI, BDM } },</div><div class='del'>-{ "bdztl+",  BBO(16,BODZT,0,1), BBOY_MASK, NOPOWER4,	{ BI, BDP } },</div><div class='del'>-{ "bdztl",   BBO(16,BODZT,0,1), BBOY_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bdzta-",  BBO(16,BODZT,1,0), BBOY_MASK, NOPOWER4,	{ BI, BDMA } },</div><div class='del'>-{ "bdzta+",  BBO(16,BODZT,1,0), BBOY_MASK, NOPOWER4,	{ BI, BDPA } },</div><div class='del'>-{ "bdzta",   BBO(16,BODZT,1,0), BBOY_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bdztla-", BBO(16,BODZT,1,1), BBOY_MASK, NOPOWER4,	{ BI, BDMA } },</div><div class='del'>-{ "bdztla+", BBO(16,BODZT,1,1), BBOY_MASK, NOPOWER4,	{ BI, BDPA } },</div><div class='del'>-{ "bdztla",  BBO(16,BODZT,1,1), BBOY_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bdzf-",   BBO(16,BODZF,0,0), BBOY_MASK, NOPOWER4,	{ BI, BDM } },</div><div class='del'>-{ "bdzf+",   BBO(16,BODZF,0,0), BBOY_MASK, NOPOWER4,	{ BI, BDP } },</div><div class='del'>-{ "bdzf",    BBO(16,BODZF,0,0), BBOY_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bdzfl-",  BBO(16,BODZF,0,1), BBOY_MASK, NOPOWER4,	{ BI, BDM } },</div><div class='del'>-{ "bdzfl+",  BBO(16,BODZF,0,1), BBOY_MASK, NOPOWER4,	{ BI, BDP } },</div><div class='del'>-{ "bdzfl",   BBO(16,BODZF,0,1), BBOY_MASK, PPCCOM,	{ BI, BD } },</div><div class='del'>-{ "bdzfa-",  BBO(16,BODZF,1,0), BBOY_MASK, NOPOWER4,	{ BI, BDMA } },</div><div class='del'>-{ "bdzfa+",  BBO(16,BODZF,1,0), BBOY_MASK, NOPOWER4,	{ BI, BDPA } },</div><div class='del'>-{ "bdzfa",   BBO(16,BODZF,1,0), BBOY_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bdzfla-", BBO(16,BODZF,1,1), BBOY_MASK, NOPOWER4,	{ BI, BDMA } },</div><div class='del'>-{ "bdzfla+", BBO(16,BODZF,1,1), BBOY_MASK, NOPOWER4,	{ BI, BDPA } },</div><div class='del'>-{ "bdzfla",  BBO(16,BODZF,1,1), BBOY_MASK, PPCCOM,	{ BI, BDA } },</div><div class='del'>-{ "bc-",     B(16,0,0),	B_MASK,		PPCCOM,		{ BOE, BI, BDM } },</div><div class='del'>-{ "bc+",     B(16,0,0),	B_MASK,		PPCCOM,		{ BOE, BI, BDP } },</div><div class='del'>-{ "bc",	     B(16,0,0),	B_MASK,		COM,		{ BO, BI, BD } },</div><div class='del'>-{ "bcl-",    B(16,0,1),	B_MASK,		PPCCOM,		{ BOE, BI, BDM } },</div><div class='del'>-{ "bcl+",    B(16,0,1),	B_MASK,		PPCCOM,		{ BOE, BI, BDP } },</div><div class='del'>-{ "bcl",     B(16,0,1),	B_MASK,		COM,		{ BO, BI, BD } },</div><div class='del'>-{ "bca-",    B(16,1,0),	B_MASK,		PPCCOM,		{ BOE, BI, BDMA } },</div><div class='del'>-{ "bca+",    B(16,1,0),	B_MASK,		PPCCOM,		{ BOE, BI, BDPA } },</div><div class='del'>-{ "bca",     B(16,1,0),	B_MASK,		COM,		{ BO, BI, BDA } },</div><div class='del'>-{ "bcla-",   B(16,1,1),	B_MASK,		PPCCOM,		{ BOE, BI, BDMA } },</div><div class='del'>-{ "bcla+",   B(16,1,1),	B_MASK,		PPCCOM,		{ BOE, BI, BDPA } },</div><div class='del'>-{ "bcla",    B(16,1,1),	B_MASK,		COM,		{ BO, BI, BDA } },</div><div class='del'>-</div><div class='del'>-{ "sc",      SC(17,1,0), SC_MASK,	PPC,		{ LEV } },</div><div class='del'>-{ "svc",     SC(17,0,0), SC_MASK,	POWER,		{ SVC_LEV, FL1, FL2 } },</div><div class='del'>-{ "svcl",    SC(17,0,1), SC_MASK,	POWER,		{ SVC_LEV, FL1, FL2 } },</div><div class='del'>-{ "svca",    SC(17,1,0), SC_MASK,	PWRCOM,		{ SV } },</div><div class='del'>-{ "svcla",   SC(17,1,1), SC_MASK,	POWER,		{ SV } },</div><div class='del'>-</div><div class='del'>-{ "b",	     B(18,0,0),	B_MASK,		COM,		{ LI } },</div><div class='del'>-{ "bl",      B(18,0,1),	B_MASK,		COM,		{ LI } },</div><div class='del'>-{ "ba",      B(18,1,0),	B_MASK,		COM,		{ LIA } },</div><div class='del'>-{ "bla",     B(18,1,1),	B_MASK,		COM,		{ LIA } },</div><div class='del'>-</div><div class='del'>-{ "mcrf",    XL(19,0),	XLBB_MASK|(3 &lt;&lt; 21)|(3 &lt;&lt; 16), COM,	{ BF, BFA } },</div><div class='del'>-</div><div class='del'>-{ "blr",     XLO(19,BOU,16,0), XLBOBIBB_MASK, PPCCOM,	{ 0 } },</div><div class='del'>-{ "br",      XLO(19,BOU,16,0), XLBOBIBB_MASK, PWRCOM,	{ 0 } },</div><div class='del'>-{ "blrl",    XLO(19,BOU,16,1), XLBOBIBB_MASK, PPCCOM,	{ 0 } },</div><div class='del'>-{ "brl",     XLO(19,BOU,16,1), XLBOBIBB_MASK, PWRCOM,	{ 0 } },</div><div class='del'>-{ "bdnzlr",  XLO(19,BODNZ,16,0), XLBOBIBB_MASK, PPCCOM,	{ 0 } },</div><div class='del'>-{ "bdnzlr-", XLO(19,BODNZ,16,0), XLBOBIBB_MASK, NOPOWER4,	{ 0 } },</div><div class='del'>-{ "bdnzlr-", XLO(19,BODNZM4,16,0), XLBOBIBB_MASK, POWER4,	{ 0 } },</div><div class='del'>-{ "bdnzlr+", XLO(19,BODNZP,16,0), XLBOBIBB_MASK, NOPOWER4,	{ 0 } },</div><div class='del'>-{ "bdnzlr+", XLO(19,BODNZP4,16,0), XLBOBIBB_MASK, POWER4,	{ 0 } },</div><div class='del'>-{ "bdnzlrl", XLO(19,BODNZ,16,1), XLBOBIBB_MASK, PPCCOM,	{ 0 } },</div><div class='del'>-{ "bdnzlrl-",XLO(19,BODNZ,16,1), XLBOBIBB_MASK, NOPOWER4,	{ 0 } },</div><div class='del'>-{ "bdnzlrl-",XLO(19,BODNZM4,16,1), XLBOBIBB_MASK, POWER4,	{ 0 } },</div><div class='del'>-{ "bdnzlrl+",XLO(19,BODNZP,16,1), XLBOBIBB_MASK, NOPOWER4,	{ 0 } },</div><div class='del'>-{ "bdnzlrl+",XLO(19,BODNZP4,16,1), XLBOBIBB_MASK, POWER4,	{ 0 } },</div><div class='del'>-{ "bdzlr",   XLO(19,BODZ,16,0), XLBOBIBB_MASK, PPCCOM,	{ 0 } },</div><div class='del'>-{ "bdzlr-",  XLO(19,BODZ,16,0), XLBOBIBB_MASK, NOPOWER4,	{ 0 } },</div><div class='del'>-{ "bdzlr-",  XLO(19,BODZM4,16,0), XLBOBIBB_MASK, POWER4,	{ 0 } },</div><div class='del'>-{ "bdzlr+",  XLO(19,BODZP,16,0), XLBOBIBB_MASK, NOPOWER4,	{ 0 } },</div><div class='del'>-{ "bdzlr+",  XLO(19,BODZP4,16,0), XLBOBIBB_MASK, POWER4,	{ 0 } },</div><div class='del'>-{ "bdzlrl",  XLO(19,BODZ,16,1), XLBOBIBB_MASK, PPCCOM,	{ 0 } },</div><div class='del'>-{ "bdzlrl-", XLO(19,BODZ,16,1), XLBOBIBB_MASK, NOPOWER4,	{ 0 } },</div><div class='del'>-{ "bdzlrl-", XLO(19,BODZM4,16,1), XLBOBIBB_MASK, POWER4,	{ 0 } },</div><div class='del'>-{ "bdzlrl+", XLO(19,BODZP,16,1), XLBOBIBB_MASK, NOPOWER4,	{ 0 } },</div><div class='del'>-{ "bdzlrl+", XLO(19,BODZP4,16,1), XLBOBIBB_MASK, POWER4,	{ 0 } },</div><div class='del'>-{ "bltlr",   XLOCB(19,BOT,CBLT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bltlr-",  XLOCB(19,BOT,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bltlr-",  XLOCB(19,BOTM4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bltlr+",  XLOCB(19,BOTP,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bltlr+",  XLOCB(19,BOTP4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bltr",    XLOCB(19,BOT,CBLT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bltlrl",  XLOCB(19,BOT,CBLT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bltlrl-", XLOCB(19,BOT,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bltlrl-", XLOCB(19,BOTM4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bltlrl+", XLOCB(19,BOTP,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bltlrl+", XLOCB(19,BOTP4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bltrl",   XLOCB(19,BOT,CBLT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bgtlr",   XLOCB(19,BOT,CBGT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bgtlr-",  XLOCB(19,BOT,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgtlr-",  XLOCB(19,BOTM4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgtlr+",  XLOCB(19,BOTP,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgtlr+",  XLOCB(19,BOTP4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgtr",    XLOCB(19,BOT,CBGT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bgtlrl",  XLOCB(19,BOT,CBGT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bgtlrl-", XLOCB(19,BOT,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgtlrl-", XLOCB(19,BOTM4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgtlrl+", XLOCB(19,BOTP,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgtlrl+", XLOCB(19,BOTP4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgtrl",   XLOCB(19,BOT,CBGT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "beqlr",   XLOCB(19,BOT,CBEQ,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "beqlr-",  XLOCB(19,BOT,CBEQ,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "beqlr-",  XLOCB(19,BOTM4,CBEQ,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "beqlr+",  XLOCB(19,BOTP,CBEQ,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "beqlr+",  XLOCB(19,BOTP4,CBEQ,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "beqr",    XLOCB(19,BOT,CBEQ,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "beqlrl",  XLOCB(19,BOT,CBEQ,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "beqlrl-", XLOCB(19,BOT,CBEQ,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "beqlrl-", XLOCB(19,BOTM4,CBEQ,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "beqlrl+", XLOCB(19,BOTP,CBEQ,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "beqlrl+", XLOCB(19,BOTP4,CBEQ,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "beqrl",   XLOCB(19,BOT,CBEQ,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bsolr",   XLOCB(19,BOT,CBSO,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bsolr-",  XLOCB(19,BOT,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bsolr-",  XLOCB(19,BOTM4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bsolr+",  XLOCB(19,BOTP,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bsolr+",  XLOCB(19,BOTP4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bsor",    XLOCB(19,BOT,CBSO,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bsolrl",  XLOCB(19,BOT,CBSO,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bsolrl-", XLOCB(19,BOT,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bsolrl-", XLOCB(19,BOTM4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bsolrl+", XLOCB(19,BOTP,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bsolrl+", XLOCB(19,BOTP4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bsorl",   XLOCB(19,BOT,CBSO,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bunlr",   XLOCB(19,BOT,CBSO,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bunlr-",  XLOCB(19,BOT,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bunlr-",  XLOCB(19,BOTM4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bunlr+",  XLOCB(19,BOTP,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bunlr+",  XLOCB(19,BOTP4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bunlrl",  XLOCB(19,BOT,CBSO,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bunlrl-", XLOCB(19,BOT,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bunlrl-", XLOCB(19,BOTM4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bunlrl+", XLOCB(19,BOTP,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bunlrl+", XLOCB(19,BOTP4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgelr",   XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bgelr-",  XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgelr-",  XLOCB(19,BOFM4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgelr+",  XLOCB(19,BOFP,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgelr+",  XLOCB(19,BOFP4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bger",    XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bgelrl",  XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bgelrl-", XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgelrl-", XLOCB(19,BOFM4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgelrl+", XLOCB(19,BOFP,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgelrl+", XLOCB(19,BOFP4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgerl",   XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bnllr",   XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bnllr-",  XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnllr-",  XLOCB(19,BOFM4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnllr+",  XLOCB(19,BOFP,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnllr+",  XLOCB(19,BOFP4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnlr",    XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bnllrl",  XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bnllrl-", XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnllrl-", XLOCB(19,BOFM4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnllrl+", XLOCB(19,BOFP,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnllrl+", XLOCB(19,BOFP4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnlrl",   XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "blelr",   XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "blelr-",  XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "blelr-",  XLOCB(19,BOFM4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "blelr+",  XLOCB(19,BOFP,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "blelr+",  XLOCB(19,BOFP4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bler",    XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "blelrl",  XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "blelrl-", XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "blelrl-", XLOCB(19,BOFM4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "blelrl+", XLOCB(19,BOFP,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "blelrl+", XLOCB(19,BOFP4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "blerl",   XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bnglr",   XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bnglr-",  XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnglr-",  XLOCB(19,BOFM4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnglr+",  XLOCB(19,BOFP,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnglr+",  XLOCB(19,BOFP4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bngr",    XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bnglrl",  XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bnglrl-", XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnglrl-", XLOCB(19,BOFM4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnglrl+", XLOCB(19,BOFP,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnglrl+", XLOCB(19,BOFP4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bngrl",   XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bnelr",   XLOCB(19,BOF,CBEQ,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bnelr-",  XLOCB(19,BOF,CBEQ,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnelr-",  XLOCB(19,BOFM4,CBEQ,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnelr+",  XLOCB(19,BOFP,CBEQ,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnelr+",  XLOCB(19,BOFP4,CBEQ,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bner",    XLOCB(19,BOF,CBEQ,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bnelrl",  XLOCB(19,BOF,CBEQ,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bnelrl-", XLOCB(19,BOF,CBEQ,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnelrl-", XLOCB(19,BOFM4,CBEQ,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnelrl+", XLOCB(19,BOFP,CBEQ,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnelrl+", XLOCB(19,BOFP4,CBEQ,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnerl",   XLOCB(19,BOF,CBEQ,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bnslr",   XLOCB(19,BOF,CBSO,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bnslr-",  XLOCB(19,BOF,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnslr-",  XLOCB(19,BOFM4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnslr+",  XLOCB(19,BOFP,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnslr+",  XLOCB(19,BOFP4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnsr",    XLOCB(19,BOF,CBSO,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bnslrl",  XLOCB(19,BOF,CBSO,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bnslrl-", XLOCB(19,BOF,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnslrl-", XLOCB(19,BOFM4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnslrl+", XLOCB(19,BOFP,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnslrl+", XLOCB(19,BOFP4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnsrl",   XLOCB(19,BOF,CBSO,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },</div><div class='del'>-{ "bnulr",   XLOCB(19,BOF,CBSO,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bnulr-",  XLOCB(19,BOF,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnulr-",  XLOCB(19,BOFM4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnulr+",  XLOCB(19,BOFP,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnulr+",  XLOCB(19,BOFP4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnulrl",  XLOCB(19,BOF,CBSO,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },</div><div class='del'>-{ "bnulrl-", XLOCB(19,BOF,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnulrl-", XLOCB(19,BOFM4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnulrl+", XLOCB(19,BOFP,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnulrl+", XLOCB(19,BOFP4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "btlr",    XLO(19,BOT,16,0), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "btlr-",   XLO(19,BOT,16,0), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "btlr-",   XLO(19,BOTM4,16,0), XLBOBB_MASK, POWER4,	{ BI } },</div><div class='del'>-{ "btlr+",   XLO(19,BOTP,16,0), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "btlr+",   XLO(19,BOTP4,16,0), XLBOBB_MASK, POWER4,	{ BI } },</div><div class='del'>-{ "bbtr",    XLO(19,BOT,16,0), XLBOBB_MASK, PWRCOM,	{ BI } },</div><div class='del'>-{ "btlrl",   XLO(19,BOT,16,1), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "btlrl-",  XLO(19,BOT,16,1), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "btlrl-",  XLO(19,BOTM4,16,1), XLBOBB_MASK, POWER4,	{ BI } },</div><div class='del'>-{ "btlrl+",  XLO(19,BOTP,16,1), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "btlrl+",  XLO(19,BOTP4,16,1), XLBOBB_MASK, POWER4,	{ BI } },</div><div class='del'>-{ "bbtrl",   XLO(19,BOT,16,1), XLBOBB_MASK, PWRCOM,	{ BI } },</div><div class='del'>-{ "bflr",    XLO(19,BOF,16,0), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bflr-",   XLO(19,BOF,16,0), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "bflr-",   XLO(19,BOFM4,16,0), XLBOBB_MASK, POWER4,	{ BI } },</div><div class='del'>-{ "bflr+",   XLO(19,BOFP,16,0), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "bflr+",   XLO(19,BOFP4,16,0), XLBOBB_MASK, POWER4,	{ BI } },</div><div class='del'>-{ "bbfr",    XLO(19,BOF,16,0), XLBOBB_MASK, PWRCOM,	{ BI } },</div><div class='del'>-{ "bflrl",   XLO(19,BOF,16,1), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bflrl-",  XLO(19,BOF,16,1), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "bflrl-",  XLO(19,BOFM4,16,1), XLBOBB_MASK, POWER4,	{ BI } },</div><div class='del'>-{ "bflrl+",  XLO(19,BOFP,16,1), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "bflrl+",  XLO(19,BOFP4,16,1), XLBOBB_MASK, POWER4,	{ BI } },</div><div class='del'>-{ "bbfrl",   XLO(19,BOF,16,1), XLBOBB_MASK, PWRCOM,	{ BI } },</div><div class='del'>-{ "bdnztlr", XLO(19,BODNZT,16,0), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bdnztlr-",XLO(19,BODNZT,16,0), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bdnztlr+",XLO(19,BODNZTP,16,0), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bdnztlrl",XLO(19,BODNZT,16,1), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bdnztlrl-",XLO(19,BODNZT,16,1), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bdnztlrl+",XLO(19,BODNZTP,16,1), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bdnzflr", XLO(19,BODNZF,16,0), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bdnzflr-",XLO(19,BODNZF,16,0), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bdnzflr+",XLO(19,BODNZFP,16,0), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bdnzflrl",XLO(19,BODNZF,16,1), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bdnzflrl-",XLO(19,BODNZF,16,1), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bdnzflrl+",XLO(19,BODNZFP,16,1), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bdztlr",  XLO(19,BODZT,16,0), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bdztlr-", XLO(19,BODZT,16,0), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "bdztlr+", XLO(19,BODZTP,16,0), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bdztlrl", XLO(19,BODZT,16,1), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bdztlrl-",XLO(19,BODZT,16,1), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "bdztlrl+",XLO(19,BODZTP,16,1), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bdzflr",  XLO(19,BODZF,16,0), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bdzflr-", XLO(19,BODZF,16,0), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "bdzflr+", XLO(19,BODZFP,16,0), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bdzflrl", XLO(19,BODZF,16,1), XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bdzflrl-",XLO(19,BODZF,16,1), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "bdzflrl+",XLO(19,BODZFP,16,1), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bclr+",   XLYLK(19,16,1,0), XLYBB_MASK, PPCCOM,	{ BOE, BI } },</div><div class='del'>-{ "bclrl+",  XLYLK(19,16,1,1), XLYBB_MASK, PPCCOM,	{ BOE, BI } },</div><div class='del'>-{ "bclr-",   XLYLK(19,16,0,0), XLYBB_MASK, PPCCOM,	{ BOE, BI } },</div><div class='del'>-{ "bclrl-",  XLYLK(19,16,0,1), XLYBB_MASK, PPCCOM,	{ BOE, BI } },</div><div class='del'>-{ "bclr",    XLLK(19,16,0), XLBH_MASK,	PPCCOM,		{ BO, BI, BH } },</div><div class='del'>-{ "bclrl",   XLLK(19,16,1), XLBH_MASK,	PPCCOM,		{ BO, BI, BH } },</div><div class='del'>-{ "bcr",     XLLK(19,16,0), XLBB_MASK,	PWRCOM,		{ BO, BI } },</div><div class='del'>-{ "bcrl",    XLLK(19,16,1), XLBB_MASK,	PWRCOM,		{ BO, BI } },</div><div class='del'>-{ "bclre",   XLLK(19,17,0), XLBB_MASK,	BOOKE64,	{ BO, BI } },</div><div class='del'>-{ "bclrel",  XLLK(19,17,1), XLBB_MASK,	BOOKE64,	{ BO, BI } },</div><div class='del'>-</div><div class='del'>-{ "rfid",    XL(19,18),	0xffffffff,	PPC64,		{ 0 } },</div><div class='del'>-</div><div class='del'>-{ "crnot",   XL(19,33), XL_MASK,	PPCCOM,		{ BT, BA, BBA } },</div><div class='del'>-{ "crnor",   XL(19,33),	XL_MASK,	COM,		{ BT, BA, BB } },</div><div class='del'>-{ "rfmci",    X(19,38), 0xffffffff,	PPCRFMCI,	{ 0 } },</div><div class='del'>-</div><div class='del'>-{ "rfi",     XL(19,50),	0xffffffff,	COM,		{ 0 } },</div><div class='del'>-{ "rfci",    XL(19,51),	0xffffffff,	PPC403 | BOOKE,	{ 0 } },</div><div class='del'>-</div><div class='del'>-{ "rfsvc",   XL(19,82),	0xffffffff,	POWER,		{ 0 } },</div><div class='del'>-</div><div class='del'>-{ "crandc",  XL(19,129), XL_MASK,	COM,		{ BT, BA, BB } },</div><div class='del'>-</div><div class='del'>-{ "isync",   XL(19,150), 0xffffffff,	PPCCOM,		{ 0 } },</div><div class='del'>-{ "ics",     XL(19,150), 0xffffffff,	PWRCOM,		{ 0 } },</div><div class='del'>-</div><div class='del'>-{ "crclr",   XL(19,193), XL_MASK,	PPCCOM,		{ BT, BAT, BBA } },</div><div class='del'>-{ "crxor",   XL(19,193), XL_MASK,	COM,		{ BT, BA, BB } },</div><div class='del'>-</div><div class='del'>-{ "crnand",  XL(19,225), XL_MASK,	COM,		{ BT, BA, BB } },</div><div class='del'>-</div><div class='del'>-{ "crand",   XL(19,257), XL_MASK,	COM,		{ BT, BA, BB } },</div><div class='del'>-</div><div class='del'>-{ "hrfid",   XL(19,274), 0xffffffff,	POWER5 | CELL,	{ 0 } },</div><div class='del'>-</div><div class='del'>-{ "crset",   XL(19,289), XL_MASK,	PPCCOM,		{ BT, BAT, BBA } },</div><div class='del'>-{ "creqv",   XL(19,289), XL_MASK,	COM,		{ BT, BA, BB } },</div><div class='del'>-</div><div class='del'>-{ "doze",    XL(19,402), 0xffffffff,	POWER6,		{ 0 } },</div><div class='del'>-</div><div class='del'>-{ "crorc",   XL(19,417), XL_MASK,	COM,		{ BT, BA, BB } },</div><div class='del'>-</div><div class='del'>-{ "nap",     XL(19,434), 0xffffffff,	POWER6,		{ 0 } },</div><div class='del'>-</div><div class='del'>-{ "crmove",  XL(19,449), XL_MASK,	PPCCOM,		{ BT, BA, BBA } },</div><div class='del'>-{ "cror",    XL(19,449), XL_MASK,	COM,		{ BT, BA, BB } },</div><div class='del'>-</div><div class='del'>-{ "sleep",   XL(19,466), 0xffffffff,	POWER6,		{ 0 } },</div><div class='del'>-{ "rvwinkle", XL(19,498), 0xffffffff,	POWER6,		{ 0 } },</div><div class='del'>-</div><div class='del'>-{ "bctr",    XLO(19,BOU,528,0), XLBOBIBB_MASK, COM,	{ 0 } },</div><div class='del'>-{ "bctrl",   XLO(19,BOU,528,1), XLBOBIBB_MASK, COM,	{ 0 } },</div><div class='del'>-{ "bltctr",  XLOCB(19,BOT,CBLT,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bltctr-", XLOCB(19,BOT,CBLT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bltctr-", XLOCB(19,BOTM4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bltctr+", XLOCB(19,BOTP,CBLT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bltctr+", XLOCB(19,BOTP4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bltctrl", XLOCB(19,BOT,CBLT,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bltctrl-",XLOCB(19,BOT,CBLT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bltctrl-",XLOCB(19,BOTM4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bltctrl+",XLOCB(19,BOTP,CBLT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bltctrl+",XLOCB(19,BOTP4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgtctr",  XLOCB(19,BOT,CBGT,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bgtctr-", XLOCB(19,BOT,CBGT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgtctr-", XLOCB(19,BOTM4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgtctr+", XLOCB(19,BOTP,CBGT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgtctr+", XLOCB(19,BOTP4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgtctrl", XLOCB(19,BOT,CBGT,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bgtctrl-",XLOCB(19,BOT,CBGT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgtctrl-",XLOCB(19,BOTM4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgtctrl+",XLOCB(19,BOTP,CBGT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgtctrl+",XLOCB(19,BOTP4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "beqctr",  XLOCB(19,BOT,CBEQ,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "beqctr-", XLOCB(19,BOT,CBEQ,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "beqctr-", XLOCB(19,BOTM4,CBEQ,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "beqctr+", XLOCB(19,BOTP,CBEQ,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "beqctr+", XLOCB(19,BOTP4,CBEQ,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "beqctrl", XLOCB(19,BOT,CBEQ,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "beqctrl-",XLOCB(19,BOT,CBEQ,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "beqctrl-",XLOCB(19,BOTM4,CBEQ,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "beqctrl+",XLOCB(19,BOTP,CBEQ,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "beqctrl+",XLOCB(19,BOTP4,CBEQ,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bsoctr",  XLOCB(19,BOT,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bsoctr-", XLOCB(19,BOT,CBSO,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bsoctr-", XLOCB(19,BOTM4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bsoctr+", XLOCB(19,BOTP,CBSO,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bsoctr+", XLOCB(19,BOTP4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bsoctrl", XLOCB(19,BOT,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bsoctrl-",XLOCB(19,BOT,CBSO,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bsoctrl-",XLOCB(19,BOTM4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bsoctrl+",XLOCB(19,BOTP,CBSO,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bsoctrl+",XLOCB(19,BOTP4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bunctr",  XLOCB(19,BOT,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bunctr-", XLOCB(19,BOT,CBSO,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bunctr-", XLOCB(19,BOTM4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bunctr+", XLOCB(19,BOTP,CBSO,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bunctr+", XLOCB(19,BOTP4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bunctrl", XLOCB(19,BOT,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bunctrl-",XLOCB(19,BOT,CBSO,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bunctrl-",XLOCB(19,BOTM4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bunctrl+",XLOCB(19,BOTP,CBSO,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bunctrl+",XLOCB(19,BOTP4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgectr",  XLOCB(19,BOF,CBLT,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bgectr-", XLOCB(19,BOF,CBLT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgectr-", XLOCB(19,BOFM4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgectr+", XLOCB(19,BOFP,CBLT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgectr+", XLOCB(19,BOFP4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgectrl", XLOCB(19,BOF,CBLT,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bgectrl-",XLOCB(19,BOF,CBLT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgectrl-",XLOCB(19,BOFM4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bgectrl+",XLOCB(19,BOFP,CBLT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bgectrl+",XLOCB(19,BOFP4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnlctr",  XLOCB(19,BOF,CBLT,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bnlctr-", XLOCB(19,BOF,CBLT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnlctr-", XLOCB(19,BOFM4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnlctr+", XLOCB(19,BOFP,CBLT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnlctr+", XLOCB(19,BOFP4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnlctrl", XLOCB(19,BOF,CBLT,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bnlctrl-",XLOCB(19,BOF,CBLT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnlctrl-",XLOCB(19,BOFM4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnlctrl+",XLOCB(19,BOFP,CBLT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnlctrl+",XLOCB(19,BOFP4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "blectr",  XLOCB(19,BOF,CBGT,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "blectr-", XLOCB(19,BOF,CBGT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "blectr-", XLOCB(19,BOFM4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "blectr+", XLOCB(19,BOFP,CBGT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "blectr+", XLOCB(19,BOFP4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "blectrl", XLOCB(19,BOF,CBGT,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "blectrl-",XLOCB(19,BOF,CBGT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "blectrl-",XLOCB(19,BOFM4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "blectrl+",XLOCB(19,BOFP,CBGT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "blectrl+",XLOCB(19,BOFP4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bngctr",  XLOCB(19,BOF,CBGT,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bngctr-", XLOCB(19,BOF,CBGT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bngctr-", XLOCB(19,BOFM4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bngctr+", XLOCB(19,BOFP,CBGT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bngctr+", XLOCB(19,BOFP4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bngctrl", XLOCB(19,BOF,CBGT,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bngctrl-",XLOCB(19,BOF,CBGT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bngctrl-",XLOCB(19,BOFM4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bngctrl+",XLOCB(19,BOFP,CBGT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bngctrl+",XLOCB(19,BOFP4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnectr",  XLOCB(19,BOF,CBEQ,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bnectr-", XLOCB(19,BOF,CBEQ,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnectr-", XLOCB(19,BOFM4,CBEQ,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnectr+", XLOCB(19,BOFP,CBEQ,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnectr+", XLOCB(19,BOFP4,CBEQ,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnectrl", XLOCB(19,BOF,CBEQ,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bnectrl-",XLOCB(19,BOF,CBEQ,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnectrl-",XLOCB(19,BOFM4,CBEQ,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnectrl+",XLOCB(19,BOFP,CBEQ,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnectrl+",XLOCB(19,BOFP4,CBEQ,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnsctr",  XLOCB(19,BOF,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bnsctr-", XLOCB(19,BOF,CBSO,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnsctr-", XLOCB(19,BOFM4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnsctr+", XLOCB(19,BOFP,CBSO,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnsctr+", XLOCB(19,BOFP4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnsctrl", XLOCB(19,BOF,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bnsctrl-",XLOCB(19,BOF,CBSO,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnsctrl-",XLOCB(19,BOFM4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnsctrl+",XLOCB(19,BOFP,CBSO,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnsctrl+",XLOCB(19,BOFP4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnuctr",  XLOCB(19,BOF,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bnuctr-", XLOCB(19,BOF,CBSO,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnuctr-", XLOCB(19,BOFM4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnuctr+", XLOCB(19,BOFP,CBSO,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnuctr+", XLOCB(19,BOFP4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnuctrl", XLOCB(19,BOF,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,	{ CR } },</div><div class='del'>-{ "bnuctrl-",XLOCB(19,BOF,CBSO,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnuctrl-",XLOCB(19,BOFM4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "bnuctrl+",XLOCB(19,BOFP,CBSO,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },</div><div class='del'>-{ "bnuctrl+",XLOCB(19,BOFP4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },</div><div class='del'>-{ "btctr",   XLO(19,BOT,528,0),  XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "btctr-",  XLO(19,BOT,528,0),  XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "btctr-",  XLO(19,BOTM4,528,0), XLBOBB_MASK, POWER4, { BI } },</div><div class='del'>-{ "btctr+",  XLO(19,BOTP,528,0), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "btctr+",  XLO(19,BOTP4,528,0), XLBOBB_MASK, POWER4, { BI } },</div><div class='del'>-{ "btctrl",  XLO(19,BOT,528,1),  XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "btctrl-", XLO(19,BOT,528,1),  XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "btctrl-", XLO(19,BOTM4,528,1), XLBOBB_MASK, POWER4, { BI } },</div><div class='del'>-{ "btctrl+", XLO(19,BOTP,528,1), XLBOBB_MASK, NOPOWER4,	{ BI } },</div><div class='del'>-{ "btctrl+", XLO(19,BOTP4,528,1), XLBOBB_MASK, POWER4, { BI } },</div><div class='del'>-{ "bfctr",   XLO(19,BOF,528,0),  XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bfctr-",  XLO(19,BOF,528,0),  XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bfctr-",  XLO(19,BOFM4,528,0), XLBOBB_MASK, POWER4, { BI } },</div><div class='del'>-{ "bfctr+",  XLO(19,BOFP,528,0), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bfctr+",  XLO(19,BOFP4,528,0), XLBOBB_MASK, POWER4, { BI } },</div><div class='del'>-{ "bfctrl",  XLO(19,BOF,528,1),  XLBOBB_MASK, PPCCOM,	{ BI } },</div><div class='del'>-{ "bfctrl-", XLO(19,BOF,528,1),  XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bfctrl-", XLO(19,BOFM4,528,1), XLBOBB_MASK, POWER4, { BI } },</div><div class='del'>-{ "bfctrl+", XLO(19,BOFP,528,1), XLBOBB_MASK, NOPOWER4, { BI } },</div><div class='del'>-{ "bfctrl+", XLO(19,BOFP4,528,1), XLBOBB_MASK, POWER4, { BI } },</div><div class='del'>-{ "bcctr-",  XLYLK(19,528,0,0),  XLYBB_MASK,  PPCCOM,	{ BOE, BI } },</div><div class='del'>-{ "bcctr+",  XLYLK(19,528,1,0),  XLYBB_MASK,  PPCCOM,	{ BOE, BI } },</div><div class='del'>-{ "bcctrl-", XLYLK(19,528,0,1),  XLYBB_MASK,  PPCCOM,	{ BOE, BI } },</div><div class='del'>-{ "bcctrl+", XLYLK(19,528,1,1),  XLYBB_MASK,  PPCCOM,	{ BOE, BI } },</div><div class='del'>-{ "bcctr",   XLLK(19,528,0),     XLBH_MASK,   PPCCOM,	{ BO, BI, BH } },</div><div class='del'>-{ "bcctrl",  XLLK(19,528,1),     XLBH_MASK,   PPCCOM,	{ BO, BI, BH } },</div><div class='del'>-{ "bcc",     XLLK(19,528,0),     XLBB_MASK,   PWRCOM,	{ BO, BI } },</div><div class='del'>-{ "bccl",    XLLK(19,528,1),     XLBB_MASK,   PWRCOM,	{ BO, BI } },</div><div class='del'>-{ "bcctre",  XLLK(19,529,0),     XLYBB_MASK,  BOOKE64,	{ BO, BI } },</div><div class='del'>-{ "bcctrel", XLLK(19,529,1),     XLYBB_MASK,  BOOKE64,	{ BO, BI } },</div><div class='del'>-</div><div class='del'>-{ "rlwimi",  M(20,0),	M_MASK,		PPCCOM,		{ RA,RS,SH,MBE,ME } },</div><div class='del'>-{ "rlimi",   M(20,0),	M_MASK,		PWRCOM,		{ RA,RS,SH,MBE,ME } },</div><div class='del'>-</div><div class='del'>-{ "rlwimi.", M(20,1),	M_MASK,		PPCCOM,		{ RA,RS,SH,MBE,ME } },</div><div class='del'>-{ "rlimi.",  M(20,1),	M_MASK,		PWRCOM,		{ RA,RS,SH,MBE,ME } },</div><div class='del'>-</div><div class='del'>-{ "rotlwi",  MME(21,31,0), MMBME_MASK,	PPCCOM,		{ RA, RS, SH } },</div><div class='del'>-{ "clrlwi",  MME(21,31,0), MSHME_MASK,	PPCCOM,		{ RA, RS, MB } },</div><div class='del'>-{ "rlwinm",  M(21,0),	M_MASK,		PPCCOM,		{ RA,RS,SH,MBE,ME } },</div><div class='del'>-{ "rlinm",   M(21,0),	M_MASK,		PWRCOM,		{ RA,RS,SH,MBE,ME } },</div><div class='del'>-{ "rotlwi.", MME(21,31,1), MMBME_MASK,	PPCCOM,		{ RA,RS,SH } },</div><div class='del'>-{ "clrlwi.", MME(21,31,1), MSHME_MASK,	PPCCOM,		{ RA, RS, MB } },</div><div class='del'>-{ "rlwinm.", M(21,1),	M_MASK,		PPCCOM,		{ RA,RS,SH,MBE,ME } },</div><div class='del'>-{ "rlinm.",  M(21,1),	M_MASK,		PWRCOM,		{ RA,RS,SH,MBE,ME } },</div><div class='del'>-</div><div class='del'>-{ "rlmi",    M(22,0),	M_MASK,		M601,		{ RA,RS,RB,MBE,ME } },</div><div class='del'>-{ "rlmi.",   M(22,1),	M_MASK,		M601,		{ RA,RS,RB,MBE,ME } },</div><div class='del'>-</div><div class='del'>-{ "be",	     B(22,0,0),	B_MASK,		BOOKE64,	{ LI } },</div><div class='del'>-{ "bel",     B(22,0,1),	B_MASK,		BOOKE64,	{ LI } },</div><div class='del'>-{ "bea",     B(22,1,0),	B_MASK,		BOOKE64,	{ LIA } },</div><div class='del'>-{ "bela",    B(22,1,1),	B_MASK,		BOOKE64,	{ LIA } },</div><div class='del'>-</div><div class='del'>-{ "rotlw",   MME(23,31,0), MMBME_MASK,	PPCCOM,		{ RA, RS, RB } },</div><div class='del'>-{ "rlwnm",   M(23,0),	M_MASK,		PPCCOM,		{ RA,RS,RB,MBE,ME } },</div><div class='del'>-{ "rlnm",    M(23,0),	M_MASK,		PWRCOM,		{ RA,RS,RB,MBE,ME } },</div><div class='del'>-{ "rotlw.",  MME(23,31,1), MMBME_MASK,	PPCCOM,		{ RA, RS, RB } },</div><div class='del'>-{ "rlwnm.",  M(23,1),	M_MASK,		PPCCOM,		{ RA,RS,RB,MBE,ME } },</div><div class='del'>-{ "rlnm.",   M(23,1),	M_MASK,		PWRCOM,		{ RA,RS,RB,MBE,ME } },</div><div class='del'>-</div><div class='del'>-{ "nop",     OP(24),	0xffffffff,	PPCCOM,		{ 0 } },</div><div class='del'>-{ "ori",     OP(24),	OP_MASK,	PPCCOM,		{ RA, RS, UI } },</div><div class='del'>-{ "oril",    OP(24),	OP_MASK,	PWRCOM,		{ RA, RS, UI } },</div><div class='del'>-</div><div class='del'>-{ "oris",    OP(25),	OP_MASK,	PPCCOM,		{ RA, RS, UI } },</div><div class='del'>-{ "oriu",    OP(25),	OP_MASK,	PWRCOM,		{ RA, RS, UI } },</div><div class='del'>-</div><div class='del'>-{ "xori",    OP(26),	OP_MASK,	PPCCOM,		{ RA, RS, UI } },</div><div class='del'>-{ "xoril",   OP(26),	OP_MASK,	PWRCOM,		{ RA, RS, UI } },</div><div class='del'>-</div><div class='del'>-{ "xoris",   OP(27),	OP_MASK,	PPCCOM,		{ RA, RS, UI } },</div><div class='del'>-{ "xoriu",   OP(27),	OP_MASK,	PWRCOM,		{ RA, RS, UI } },</div><div class='del'>-</div><div class='del'>-{ "andi.",   OP(28),	OP_MASK,	PPCCOM,		{ RA, RS, UI } },</div><div class='del'>-{ "andil.",  OP(28),	OP_MASK,	PWRCOM,		{ RA, RS, UI } },</div><div class='del'>-</div><div class='del'>-{ "andis.",  OP(29),	OP_MASK,	PPCCOM,		{ RA, RS, UI } },</div><div class='del'>-{ "andiu.",  OP(29),	OP_MASK,	PWRCOM,		{ RA, RS, UI } },</div><div class='del'>-</div><div class='del'>-{ "rotldi",  MD(30,0,0), MDMB_MASK,	PPC64,		{ RA, RS, SH6 } },</div><div class='del'>-{ "clrldi",  MD(30,0,0), MDSH_MASK,	PPC64,		{ RA, RS, MB6 } },</div><div class='del'>-{ "rldicl",  MD(30,0,0), MD_MASK,	PPC64,		{ RA, RS, SH6, MB6 } },</div><div class='del'>-{ "rotldi.", MD(30,0,1), MDMB_MASK,	PPC64,		{ RA, RS, SH6 } },</div><div class='del'>-{ "clrldi.", MD(30,0,1), MDSH_MASK,	PPC64,		{ RA, RS, MB6 } },</div><div class='del'>-{ "rldicl.", MD(30,0,1), MD_MASK,	PPC64,		{ RA, RS, SH6, MB6 } },</div><div class='del'>-</div><div class='del'>-{ "rldicr",  MD(30,1,0), MD_MASK,	PPC64,		{ RA, RS, SH6, ME6 } },</div><div class='del'>-{ "rldicr.", MD(30,1,1), MD_MASK,	PPC64,		{ RA, RS, SH6, ME6 } },</div><div class='del'>-</div><div class='del'>-{ "rldic",   MD(30,2,0), MD_MASK,	PPC64,		{ RA, RS, SH6, MB6 } },</div><div class='del'>-{ "rldic.",  MD(30,2,1), MD_MASK,	PPC64,		{ RA, RS, SH6, MB6 } },</div><div class='del'>-</div><div class='del'>-{ "rldimi",  MD(30,3,0), MD_MASK,	PPC64,		{ RA, RS, SH6, MB6 } },</div><div class='del'>-{ "rldimi.", MD(30,3,1), MD_MASK,	PPC64,		{ RA, RS, SH6, MB6 } },</div><div class='del'>-</div><div class='del'>-{ "rotld",   MDS(30,8,0), MDSMB_MASK,	PPC64,		{ RA, RS, RB } },</div><div class='del'>-{ "rldcl",   MDS(30,8,0), MDS_MASK,	PPC64,		{ RA, RS, RB, MB6 } },</div><div class='del'>-{ "rotld.",  MDS(30,8,1), MDSMB_MASK,	PPC64,		{ RA, RS, RB } },</div><div class='del'>-{ "rldcl.",  MDS(30,8,1), MDS_MASK,	PPC64,		{ RA, RS, RB, MB6 } },</div><div class='del'>-</div><div class='del'>-{ "rldcr",   MDS(30,9,0), MDS_MASK,	PPC64,		{ RA, RS, RB, ME6 } },</div><div class='del'>-{ "rldcr.",  MDS(30,9,1), MDS_MASK,	PPC64,		{ RA, RS, RB, ME6 } },</div><div class='del'>-</div><div class='del'>-{ "cmpw",    XOPL(31,0,0), XCMPL_MASK, PPCCOM,		{ OBF, RA, RB } },</div><div class='del'>-{ "cmpd",    XOPL(31,0,1), XCMPL_MASK, PPC64,		{ OBF, RA, RB } },</div><div class='del'>-{ "cmp",     X(31,0),	XCMP_MASK,	PPC,		{ BF, L, RA, RB } },</div><div class='del'>-{ "cmp",     X(31,0),	XCMPL_MASK,	PWRCOM,		{ BF, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "twlgt",   XTO(31,4,TOLGT), XTO_MASK, PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tlgt",    XTO(31,4,TOLGT), XTO_MASK, PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twllt",   XTO(31,4,TOLLT), XTO_MASK, PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tllt",    XTO(31,4,TOLLT), XTO_MASK, PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "tweq",    XTO(31,4,TOEQ), XTO_MASK,	PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "teq",     XTO(31,4,TOEQ), XTO_MASK,	PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twlge",   XTO(31,4,TOLGE), XTO_MASK, PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tlge",    XTO(31,4,TOLGE), XTO_MASK, PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twlnl",   XTO(31,4,TOLNL), XTO_MASK, PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tlnl",    XTO(31,4,TOLNL), XTO_MASK, PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twlle",   XTO(31,4,TOLLE), XTO_MASK, PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tlle",    XTO(31,4,TOLLE), XTO_MASK, PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twlng",   XTO(31,4,TOLNG), XTO_MASK, PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tlng",    XTO(31,4,TOLNG), XTO_MASK, PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twgt",    XTO(31,4,TOGT), XTO_MASK,	PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tgt",     XTO(31,4,TOGT), XTO_MASK,	PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twge",    XTO(31,4,TOGE), XTO_MASK,	PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tge",     XTO(31,4,TOGE), XTO_MASK,	PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twnl",    XTO(31,4,TONL), XTO_MASK,	PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tnl",     XTO(31,4,TONL), XTO_MASK,	PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twlt",    XTO(31,4,TOLT), XTO_MASK,	PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tlt",     XTO(31,4,TOLT), XTO_MASK,	PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twle",    XTO(31,4,TOLE), XTO_MASK,	PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tle",     XTO(31,4,TOLE), XTO_MASK,	PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twng",    XTO(31,4,TONG), XTO_MASK,	PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tng",     XTO(31,4,TONG), XTO_MASK,	PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "twne",    XTO(31,4,TONE), XTO_MASK,	PPCCOM,		{ RA, RB } },</div><div class='del'>-{ "tne",     XTO(31,4,TONE), XTO_MASK,	PWRCOM,		{ RA, RB } },</div><div class='del'>-{ "trap",    XTO(31,4,TOU), 0xffffffff,	PPCCOM,		{ 0 } },</div><div class='del'>-{ "tw",      X(31,4),	X_MASK,		PPCCOM,		{ TO, RA, RB } },</div><div class='del'>-{ "t",       X(31,4),	X_MASK,		PWRCOM,		{ TO, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "subfc",   XO(31,8,0,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "sf",      XO(31,8,0,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "subc",    XO(31,8,0,0), XO_MASK,	PPC,		{ RT, RB, RA } },</div><div class='del'>-{ "subfc.",  XO(31,8,0,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "sf.",     XO(31,8,0,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "subc.",   XO(31,8,0,1), XO_MASK,	PPCCOM,		{ RT, RB, RA } },</div><div class='del'>-{ "subfco",  XO(31,8,1,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "sfo",     XO(31,8,1,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "subco",   XO(31,8,1,0), XO_MASK,	PPC,		{ RT, RB, RA } },</div><div class='del'>-{ "subfco.", XO(31,8,1,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "sfo.",    XO(31,8,1,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "subco.",  XO(31,8,1,1), XO_MASK,	PPC,		{ RT, RB, RA } },</div><div class='del'>-</div><div class='del'>-{ "mulhdu",  XO(31,9,0,0), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-{ "mulhdu.", XO(31,9,0,1), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "addc",    XO(31,10,0,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "a",       XO(31,10,0,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "addc.",   XO(31,10,0,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "a.",      XO(31,10,0,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "addco",   XO(31,10,1,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "ao",      XO(31,10,1,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "addco.",  XO(31,10,1,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "ao.",     XO(31,10,1,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "mulhwu",  XO(31,11,0,0), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "mulhwu.", XO(31,11,0,1), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "isellt",  X(31,15),      X_MASK,	PPCISEL,	{ RT, RA, RB } },</div><div class='del'>-{ "iselgt",  X(31,47),      X_MASK,	PPCISEL,	{ RT, RA, RB } },</div><div class='del'>-{ "iseleq",  X(31,79),      X_MASK,	PPCISEL,	{ RT, RA, RB } },</div><div class='del'>-{ "isel",    XISEL(31,15),  XISEL_MASK,	PPCISEL,	{ RT, RA, RB, CRB } },</div><div class='del'>-</div><div class='del'>-{ "mfocrf",  XFXM(31,19,0,1), XFXFXM_MASK, COM,		{ RT, FXM } },</div><div class='del'>-{ "mfcr",    X(31,19),	XRARB_MASK,	NOPOWER4 | COM,	{ RT } },</div><div class='del'>-{ "mfcr",    X(31,19),	XFXFXM_MASK,	POWER4,		{ RT, FXM4 } },</div><div class='del'>-</div><div class='del'>-{ "lwarx",   X(31,20),	XEH_MASK,	PPC,		{ RT, RA0, RB, EH } },</div><div class='del'>-</div><div class='del'>-{ "ldx",     X(31,21),	X_MASK,		PPC64,		{ RT, RA0, RB } },</div><div class='del'>-</div><div class='del'>-{ "icbt",    X(31,22),	X_MASK,		BOOKE|PPCE300,	{ CT, RA, RB } },</div><div class='del'>-{ "icbt",    X(31,262),	XRT_MASK,	PPC403,		{ RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "lwzx",    X(31,23),	X_MASK,		PPCCOM,		{ RT, RA0, RB } },</div><div class='del'>-{ "lx",      X(31,23),	X_MASK,		PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "slw",     XRC(31,24,0), X_MASK,	PPCCOM,		{ RA, RS, RB } },</div><div class='del'>-{ "sl",      XRC(31,24,0), X_MASK,	PWRCOM,		{ RA, RS, RB } },</div><div class='del'>-{ "slw.",    XRC(31,24,1), X_MASK,	PPCCOM,		{ RA, RS, RB } },</div><div class='del'>-{ "sl.",     XRC(31,24,1), X_MASK,	PWRCOM,		{ RA, RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "cntlzw",  XRC(31,26,0), XRB_MASK,	PPCCOM,		{ RA, RS } },</div><div class='del'>-{ "cntlz",   XRC(31,26,0), XRB_MASK,	PWRCOM,		{ RA, RS } },</div><div class='del'>-{ "cntlzw.", XRC(31,26,1), XRB_MASK,	PPCCOM,		{ RA, RS } },</div><div class='del'>-{ "cntlz.",  XRC(31,26,1), XRB_MASK, 	PWRCOM,		{ RA, RS } },</div><div class='del'>-</div><div class='del'>-{ "sld",     XRC(31,27,0), X_MASK,	PPC64,		{ RA, RS, RB } },</div><div class='del'>-{ "sld.",    XRC(31,27,1), X_MASK,	PPC64,		{ RA, RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "and",     XRC(31,28,0), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-{ "and.",    XRC(31,28,1), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "maskg",   XRC(31,29,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "maskg.",  XRC(31,29,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "icbte",   X(31,30),	X_MASK,		BOOKE64,	{ CT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "lwzxe",   X(31,31),	X_MASK,		BOOKE64,	{ RT, RA0, RB } },</div><div class='del'>-</div><div class='del'>-{ "cmplw",   XOPL(31,32,0), XCMPL_MASK, PPCCOM,	{ OBF, RA, RB } },</div><div class='del'>-{ "cmpld",   XOPL(31,32,1), XCMPL_MASK, PPC64,		{ OBF, RA, RB } },</div><div class='del'>-{ "cmpl",    X(31,32),	XCMP_MASK,	 PPC,		{ BF, L, RA, RB } },</div><div class='del'>-{ "cmpl",    X(31,32),	XCMPL_MASK,	 PWRCOM,	{ BF, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "subf",    XO(31,40,0,0), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "sub",     XO(31,40,0,0), XO_MASK,	PPC,		{ RT, RB, RA } },</div><div class='del'>-{ "subf.",   XO(31,40,0,1), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "sub.",    XO(31,40,0,1), XO_MASK,	PPC,		{ RT, RB, RA } },</div><div class='del'>-{ "subfo",   XO(31,40,1,0), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "subo",    XO(31,40,1,0), XO_MASK,	PPC,		{ RT, RB, RA } },</div><div class='del'>-{ "subfo.",  XO(31,40,1,1), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "subo.",   XO(31,40,1,1), XO_MASK,	PPC,		{ RT, RB, RA } },</div><div class='add'>+{"attn",	X(0,256),	X_MASK,	  POWER4|PPCA2,	PPC476|PPCVLE,	{0}},</div><div class='add'>+{"tdlgti",	OPTO(2,TOLGT),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdllti",	OPTO(2,TOLLT),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdeqi",	OPTO(2,TOEQ),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdlgei",	OPTO(2,TOLGE),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdlnli",	OPTO(2,TOLNL),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdllei",	OPTO(2,TOLLE),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdlngi",	OPTO(2,TOLNG),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdgti",	OPTO(2,TOGT),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdgei",	OPTO(2,TOGE),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdnli",	OPTO(2,TONL),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdlti",	OPTO(2,TOLT),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdlei",	OPTO(2,TOLE),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdngi",	OPTO(2,TONG),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdnei",	OPTO(2,TONE),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdui",	OPTO(2,TOU),	OPTO_MASK,   PPC64,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tdi",		OP(2),		OP_MASK,     PPC64,	PPCVLE,		{TO, RA, SI}},</div><div class='add'>+</div><div class='add'>+{"twlgti",	OPTO(3,TOLGT),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tlgti",	OPTO(3,TOLGT),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twllti",	OPTO(3,TOLLT),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tllti",	OPTO(3,TOLLT),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tweqi",	OPTO(3,TOEQ),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"teqi",	OPTO(3,TOEQ),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twlgei",	OPTO(3,TOLGE),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tlgei",	OPTO(3,TOLGE),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twlnli",	OPTO(3,TOLNL),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tlnli",	OPTO(3,TOLNL),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twllei",	OPTO(3,TOLLE),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tllei",	OPTO(3,TOLLE),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twlngi",	OPTO(3,TOLNG),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tlngi",	OPTO(3,TOLNG),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twgti",	OPTO(3,TOGT),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tgti",	OPTO(3,TOGT),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twgei",	OPTO(3,TOGE),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tgei",	OPTO(3,TOGE),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twnli",	OPTO(3,TONL),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tnli",	OPTO(3,TONL),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twlti",	OPTO(3,TOLT),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tlti",	OPTO(3,TOLT),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twlei",	OPTO(3,TOLE),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tlei",	OPTO(3,TOLE),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twngi",	OPTO(3,TONG),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tngi",	OPTO(3,TONG),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twnei",	OPTO(3,TONE),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tnei",	OPTO(3,TONE),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twui",	OPTO(3,TOU),	OPTO_MASK,   PPCCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"tui",		OPTO(3,TOU),	OPTO_MASK,   PWRCOM,	PPCVLE,		{RA, SI}},</div><div class='add'>+{"twi",		OP(3),		OP_MASK,     PPCCOM,	PPCVLE,		{TO, RA, SI}},</div><div class='add'>+{"ti",		OP(3),		OP_MASK,     PWRCOM,	PPCVLE,		{TO, RA, SI}},</div><div class='add'>+</div><div class='add'>+{"ps_cmpu0",	X  (4,	 0),	XBF_MASK,    PPCPS,	0,		{BF, FRA, FRB}},</div><div class='add'>+{"vaddubm",	VX (4,	 0),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmul10cuq",	VX (4,	 1),	VXVB_MASK,   PPCVEC3,	0,		{VD, VA}},</div><div class='add'>+{"vmaxub",	VX (4,	 2),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vrlb",	VX (4,	 4),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpequb",	VXR(4,	 6,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpneb",	VXR(4,	 7,0),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmuloub",	VX (4,	 8),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vaddfp",	VX (4,	10),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"psq_lx",	XW (4,	 6,0),	XW_MASK,     PPCPS,	0,		{FRT,RA,RB,PSWM,PSQM}},</div><div class='add'>+{"vmrghb",	VX (4,	12),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"psq_stx",	XW (4,	 7,0),	XW_MASK,     PPCPS,	0,		{FRS,RA,RB,PSWM,PSQM}},</div><div class='add'>+{"vpkuhum",	VX (4,	14),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"mulhhwu",	XRC(4,	 8,0),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"mulhhwu.",	XRC(4,	 8,1),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"ps_sum0",	A  (4,	10,0),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"ps_sum0.",	A  (4,	10,1),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"ps_sum1",	A  (4,	11,0),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"ps_sum1.",	A  (4,	11,1),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"ps_muls0",	A  (4,	12,0),	AFRB_MASK,   PPCPS,	0,		{FRT, FRA, FRC}},</div><div class='add'>+{"machhwu",	XO (4,	12,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"ps_muls0.",	A  (4,	12,1),	AFRB_MASK,   PPCPS,	0,		{FRT, FRA, FRC}},</div><div class='add'>+{"machhwu.",	XO (4,	12,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"ps_muls1",	A  (4,	13,0),	AFRB_MASK,   PPCPS,	0,		{FRT, FRA, FRC}},</div><div class='add'>+{"ps_muls1.",	A  (4,	13,1),	AFRB_MASK,   PPCPS,	0,		{FRT, FRA, FRC}},</div><div class='add'>+{"ps_madds0",	A  (4,	14,0),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"ps_madds0.",	A  (4,	14,1),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"ps_madds1",	A  (4,	15,0),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"ps_madds1.",	A  (4,	15,1),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"vmhaddshs",	VXA(4,	32),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"vmhraddshs",	VXA(4,	33),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"vmladduhm",	VXA(4,	34),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"vmsumudm",	VXA(4,	35),	VXA_MASK,    PPCVEC3,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_div",	A  (4,	18,0),	AFRC_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"vmsumubm",	VXA(4,	36),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_div.",	A  (4,	18,1),	AFRC_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"vmsummbm",	VXA(4,	37),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"vmsumuhm",	VXA(4,	38),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"vmsumuhs",	VXA(4,	39),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_sub",	A  (4,	20,0),	AFRC_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"vmsumshm",	VXA(4,	40),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_sub.",	A  (4,	20,1),	AFRC_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"vmsumshs",	VXA(4,	41),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_add",	A  (4,	21,0),	AFRC_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"vsel",	VXA(4,	42),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_add.",	A  (4,	21,1),	AFRC_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"vperm",	VXA(4,	43),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"vsldoi",	VXA(4,	44),	VXASHB_MASK, PPCVEC,	0,		{VD, VA, VB, SHB}},</div><div class='add'>+{"vpermxor",	VXA(4,	45),	VXA_MASK,    PPCVEC2,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_sel",	A  (4,	23,0),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"vmaddfp",	VXA(4,	46),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VC, VB}},</div><div class='add'>+{"ps_sel.",	A  (4,	23,1),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"vnmsubfp",	VXA(4,	47),	VXA_MASK,    PPCVEC,	0,		{VD, VA, VC, VB}},</div><div class='add'>+{"ps_res",	A  (4,	24,0), AFRAFRC_MASK, PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"maddhd",	VXA(4,	48),	VXA_MASK,    POWER9,	0,		{RT, RA, RB, RC}},</div><div class='add'>+{"ps_res.",	A  (4,	24,1), AFRAFRC_MASK, PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"maddhdu",	VXA(4,	49),	VXA_MASK,    POWER9,	0,		{RT, RA, RB, RC}},</div><div class='add'>+{"ps_mul",	A  (4,	25,0),	AFRB_MASK,   PPCPS,	0,		{FRT, FRA, FRC}},</div><div class='add'>+{"ps_mul.",	A  (4,	25,1),	AFRB_MASK,   PPCPS,	0,		{FRT, FRA, FRC}},</div><div class='add'>+{"maddld",	VXA(4,	51),	VXA_MASK,    POWER9,	0,		{RT, RA, RB, RC}},</div><div class='add'>+{"ps_rsqrte",	A  (4,	26,0), AFRAFRC_MASK, PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"ps_rsqrte.",	A  (4,	26,1), AFRAFRC_MASK, PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"ps_msub",	A  (4,	28,0),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"ps_msub.",	A  (4,	28,1),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"ps_madd",	A  (4,	29,0),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"ps_madd.",	A  (4,	29,1),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"vpermr",	VXA(4,	59),	VXA_MASK,    PPCVEC3,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_nmsub",	A  (4,	30,0),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"vaddeuqm",	VXA(4,	60),	VXA_MASK,    PPCVEC2,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_nmsub.",	A  (4,	30,1),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"vaddecuq",	VXA(4,	61),	VXA_MASK,    PPCVEC2,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_nmadd",	A  (4,	31,0),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"vsubeuqm",	VXA(4,	62),	VXA_MASK,    PPCVEC2,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_nmadd.",	A  (4,	31,1),	A_MASK,	     PPCPS,	0,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"vsubecuq",	VXA(4,	63),	VXA_MASK,    PPCVEC2,	0,		{VD, VA, VB, VC}},</div><div class='add'>+{"ps_cmpo0",	X  (4,	32),	XBF_MASK,    PPCPS,	0,		{BF, FRA, FRB}},</div><div class='add'>+{"vadduhm",	VX (4,	64),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmul10ecuq",	VX (4,	65),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmaxuh",	VX (4,	66),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vrlh",	VX (4,	68),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpequh",	VXR(4,	70,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpneh",	VXR(4,	71,0),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmulouh",	VX (4,	72),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vsubfp",	VX (4,	74),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"psq_lux",	XW (4,	38,0),	XW_MASK,     PPCPS,	0,		{FRT,RA,RB,PSWM,PSQM}},</div><div class='add'>+{"vmrghh",	VX (4,	76),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"psq_stux",	XW (4,	39,0),	XW_MASK,     PPCPS,	0,		{FRS,RA,RB,PSWM,PSQM}},</div><div class='add'>+{"vpkuwum",	VX (4,	78),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"ps_neg",	XRC(4,	40,0),	XRA_MASK,    PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"mulhhw",	XRC(4,	40,0),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"ps_neg.",	XRC(4,	40,1),	XRA_MASK,    PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"mulhhw.",	XRC(4,	40,1),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"machhw",	XO (4,	44,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"machhw.",	XO (4,	44,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmachhw",	XO (4,	46,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmachhw.",	XO (4,	46,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"ps_cmpu1",	X  (4,	64),	XBF_MASK,    PPCPS,	0,		{BF, FRA, FRB}},</div><div class='add'>+{"vadduwm",	VX (4,	128),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmaxuw",	VX (4,	130),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vrlw",	VX (4,	132),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vrlwmi",	VX (4,	133),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpequw",	VXR(4,	134,0), VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpnew",	VXR(4,	135,0),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmulouw",	VX (4,	136),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmuluwm",	VX (4,	137),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmrghw",	VX (4,	140),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vpkuhus",	VX (4,	142),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"ps_mr",	XRC(4,	72,0),	XRA_MASK,    PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"ps_mr.",	XRC(4,	72,1),	XRA_MASK,    PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"machhwsu",	XO (4,	76,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"machhwsu.",	XO (4,	76,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"ps_cmpo1",	X  (4,	96),	XBF_MASK,    PPCPS,	0,		{BF, FRA, FRB}},</div><div class='add'>+{"vaddudm",	VX (4, 192),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmaxud",	VX (4, 194),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vrld",	VX (4, 196),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vrldmi",	VX (4, 197),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpeqfp",	VXR(4, 198,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpequd",	VXR(4, 199,0),	VXR_MASK,    PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vpkuwus",	VX (4, 206),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"machhws",	XO (4, 108,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"machhws.",	XO (4, 108,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmachhws",	XO (4, 110,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmachhws.",	XO (4, 110,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"vadduqm",	VX (4, 256),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmaxsb",	VX (4, 258),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vslb",	VX (4, 260),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpnezb",	VXR(4, 263,0),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmulosb",	VX (4, 264),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vrefp",	VX (4, 266),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"vmrglb",	VX (4, 268),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vpkshus",	VX (4, 270),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"ps_nabs",	XRC(4, 136,0),	XRA_MASK,    PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"mulchwu",	XRC(4, 136,0),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"ps_nabs.",	XRC(4, 136,1),	XRA_MASK,    PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"mulchwu.",	XRC(4, 136,1),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"macchwu",	XO (4, 140,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"macchwu.",	XO (4, 140,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"vaddcuq",	VX (4, 320),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmaxsh",	VX (4, 322),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vslh",	VX (4, 324),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpnezh",	VXR(4, 327,0),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmulosh",	VX (4, 328),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vrsqrtefp",	VX (4, 330),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"vmrglh",	VX (4, 332),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vpkswus",	VX (4, 334),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"mulchw",	XRC(4, 168,0),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"mulchw.",	XRC(4, 168,1),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"macchw",	XO (4, 172,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"macchw.",	XO (4, 172,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmacchw",	XO (4, 174,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmacchw.",	XO (4, 174,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"vaddcuw",	VX (4, 384),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmaxsw",	VX (4, 386),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vslw",	VX (4, 388),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vrlwnm",	VX (4, 389),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpnezw",	VXR(4, 391,0),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmulosw",	VX (4, 392),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vexptefp",	VX (4, 394),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"vmrglw",	VX (4, 396),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vpkshss",	VX (4, 398),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"macchwsu",	XO (4, 204,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"macchwsu.",	XO (4, 204,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"vmaxsd",	VX (4, 450),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vsl",		VX (4, 452),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vrldnm",	VX (4, 453),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpgefp",	VXR(4, 454,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vlogefp",	VX (4, 458),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"vpkswss",	VX (4, 462),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"macchws",	XO (4, 236,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"macchws.",	XO (4, 236,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmacchws",	XO (4, 238,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmacchws.",	XO (4, 238,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evaddw",	VX (4, 512),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vaddubs",	VX (4, 512),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmul10uq",	VX (4, 513),	VXVB_MASK,   PPCVEC3,	0,		{VD, VA}},</div><div class='add'>+{"evaddiw",	VX (4, 514),	VX_MASK,     PPCSPE,	0,		{RS, RB, UIMM}},</div><div class='add'>+{"vminub",	VX (4, 514),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evsubfw",	VX (4, 516),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evsubw",	VX (4, 516),	VX_MASK,     PPCSPE,	0,		{RS, RB, RA}},</div><div class='add'>+{"vsrb",	VX (4, 516),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evsubifw",	VX (4, 518),	VX_MASK,     PPCSPE,	0,		{RS, UIMM, RB}},</div><div class='add'>+{"evsubiw",	VX (4, 518),	VX_MASK,     PPCSPE,	0,		{RS, RB, UIMM}},</div><div class='add'>+{"vcmpgtub",	VXR(4, 518,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evabs",	VX (4, 520),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"vmuleub",	VX (4, 520),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evneg",	VX (4, 521),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"evextsb",	VX (4, 522),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"vrfin",	VX (4, 522),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"evextsh",	VX (4, 523),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"evrndw",	VX (4, 524),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"vspltb",	VX (4, 524),   VXUIMM4_MASK, PPCVEC,	0,		{VD, VB, UIMM4}},</div><div class='add'>+{"vextractub",	VX (4, 525),   VXUIMM4_MASK, PPCVEC3,	0,		{VD, VB, UIMM4}},</div><div class='add'>+{"evcntlzw",	VX (4, 525),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"evcntlsw",	VX (4, 526),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"vupkhsb",	VX (4, 526),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"brinc",	VX (4, 527),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"ps_abs",	XRC(4, 264,0),	XRA_MASK,    PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"ps_abs.",	XRC(4, 264,1),	XRA_MASK,    PPCPS,	0,		{FRT, FRB}},</div><div class='add'>+{"evand",	VX (4, 529),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evandc",	VX (4, 530),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evxor",	VX (4, 534),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmr",	VX (4, 535),	VX_MASK,     PPCSPE,	0,		{RS, RA, BBA}},</div><div class='add'>+{"evor",	VX (4, 535),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evnor",	VX (4, 536),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evnot",	VX (4, 536),	VX_MASK,     PPCSPE,	0,		{RS, RA, BBA}},</div><div class='add'>+{"get",		APU(4, 268,0),	APU_RA_MASK, PPC405,	0,		{RT, FSL}},</div><div class='add'>+{"eveqv",	VX (4, 537),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evorc",	VX (4, 539),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evnand",	VX (4, 542),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evsrwu",	VX (4, 544),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evsrws",	VX (4, 545),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evsrwiu",	VX (4, 546),	VX_MASK,     PPCSPE,	0,		{RS, RA, EVUIMM}},</div><div class='add'>+{"evsrwis",	VX (4, 547),	VX_MASK,     PPCSPE,	0,		{RS, RA, EVUIMM}},</div><div class='add'>+{"evslw",	VX (4, 548),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evslwi",	VX (4, 550),	VX_MASK,     PPCSPE,	0,		{RS, RA, EVUIMM}},</div><div class='add'>+{"evrlw",	VX (4, 552),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evsplati",	VX (4, 553),	VX_MASK,     PPCSPE,	0,		{RS, SIMM}},</div><div class='add'>+{"evrlwi",	VX (4, 554),	VX_MASK,     PPCSPE,	0,		{RS, RA, EVUIMM}},</div><div class='add'>+{"evsplatfi",	VX (4, 555),	VX_MASK,     PPCSPE,	0,		{RS, SIMM}},</div><div class='add'>+{"evmergehi",	VX (4, 556),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmergelo",	VX (4, 557),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmergehilo",	VX (4, 558),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmergelohi",	VX (4, 559),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evcmpgtu",	VX (4, 560),	VX_MASK,     PPCSPE,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"evcmpgts",	VX (4, 561),	VX_MASK,     PPCSPE,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"evcmpltu",	VX (4, 562),	VX_MASK,     PPCSPE,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"evcmplts",	VX (4, 563),	VX_MASK,     PPCSPE,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"evcmpeq",	VX (4, 564),	VX_MASK,     PPCSPE,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"cget",	APU(4, 284,0),	APU_RA_MASK, PPC405,	0,		{RT, FSL}},</div><div class='add'>+{"vadduhs",	VX (4, 576),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmul10euq",	VX (4, 577),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vminuh",	VX (4, 578),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vsrh",	VX (4, 580),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpgtuh",	VXR(4, 582,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmuleuh",	VX (4, 584),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vrfiz",	VX (4, 586),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"vsplth",	VX (4, 588),   VXUIMM3_MASK, PPCVEC,	0,		{VD, VB, UIMM3}},</div><div class='add'>+{"vextractuh",	VX (4, 589),   VXUIMM4_MASK, PPCVEC3,	0,		{VD, VB, UIMM4}},</div><div class='add'>+{"vupkhsh",	VX (4, 590),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"nget",	APU(4, 300,0),	APU_RA_MASK, PPC405,	0,		{RT, FSL}},</div><div class='add'>+{"evsel",	EVSEL(4,79),	EVSEL_MASK,  PPCSPE,	0,		{RS, RA, RB, CRFS}},</div><div class='add'>+{"ncget",	APU(4, 316,0),	APU_RA_MASK, PPC405,	0,		{RT, FSL}},</div><div class='add'>+{"evfsadd",	VX (4, 640),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vadduws",	VX (4, 640),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evfssub",	VX (4, 641),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vminuw",	VX (4, 642),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evfsabs",	VX (4, 644),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"vsrw",	VX (4, 644),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evfsnabs",	VX (4, 645),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"evfsneg",	VX (4, 646),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"vcmpgtuw",	VXR(4, 646,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmuleuw",	VX (4, 648),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evfsmul",	VX (4, 648),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evfsdiv",	VX (4, 649),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vrfip",	VX (4, 650),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"evfscmpgt",	VX (4, 652),	VX_MASK,     PPCSPE,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"vspltw",	VX (4, 652),   VXUIMM2_MASK, PPCVEC,	0,		{VD, VB, UIMM2}},</div><div class='add'>+{"vextractuw",	VX (4, 653),   VXUIMM4_MASK, PPCVEC3,	0,		{VD, VB, UIMM4}},</div><div class='add'>+{"evfscmplt",	VX (4, 653),	VX_MASK,     PPCSPE,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"evfscmpeq",	VX (4, 654),	VX_MASK,     PPCSPE,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"vupklsb",	VX (4, 654),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"evfscfui",	VX (4, 656),	VX_MASK,     PPCSPE,	0,		{RS, RB}},</div><div class='add'>+{"evfscfsi",	VX (4, 657),	VX_MASK,     PPCSPE,	0,		{RS, RB}},</div><div class='add'>+{"evfscfuf",	VX (4, 658),	VX_MASK,     PPCSPE,	0,		{RS, RB}},</div><div class='add'>+{"evfscfsf",	VX (4, 659),	VX_MASK,     PPCSPE,	0,		{RS, RB}},</div><div class='add'>+{"evfsctui",	VX (4, 660),	VX_MASK,     PPCSPE,	0,		{RS, RB}},</div><div class='add'>+{"evfsctsi",	VX (4, 661),	VX_MASK,     PPCSPE,	0,		{RS, RB}},</div><div class='add'>+{"evfsctuf",	VX (4, 662),	VX_MASK,     PPCSPE,	0,		{RS, RB}},</div><div class='add'>+{"evfsctsf",	VX (4, 663),	VX_MASK,     PPCSPE,	0,		{RS, RB}},</div><div class='add'>+{"evfsctuiz",	VX (4, 664),	VX_MASK,     PPCSPE,	0,		{RS, RB}},</div><div class='add'>+{"put",		APU(4, 332,0),	APU_RT_MASK, PPC405,	0,		{RA, FSL}},</div><div class='add'>+{"evfsctsiz",	VX (4, 666),	VX_MASK,     PPCSPE,	0,		{RS, RB}},</div><div class='add'>+{"evfststgt",	VX (4, 668),	VX_MASK,     PPCSPE,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"evfststlt",	VX (4, 669),	VX_MASK,     PPCSPE,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"evfststeq",	VX (4, 670),	VX_MASK,     PPCSPE,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"cput",	APU(4, 348,0),	APU_RT_MASK, PPC405,	0,		{RA, FSL}},</div><div class='add'>+{"efsadd",	VX (4, 704),	VX_MASK,     PPCEFS,	0,		{RS, RA, RB}},</div><div class='add'>+{"efssub",	VX (4, 705),	VX_MASK,     PPCEFS,	0,		{RS, RA, RB}},</div><div class='add'>+{"vminud",	VX (4, 706),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"efsabs",	VX (4, 708),	VX_MASK,     PPCEFS,	0,		{RS, RA}},</div><div class='add'>+{"vsr",		VX (4, 708),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"efsnabs",	VX (4, 709),	VX_MASK,     PPCEFS,	0,		{RS, RA}},</div><div class='add'>+{"efsneg",	VX (4, 710),	VX_MASK,     PPCEFS,	0,		{RS, RA}},</div><div class='add'>+{"vcmpgtfp",	VXR(4, 710,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpgtud",	VXR(4, 711,0),	VXR_MASK,    PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"efsmul",	VX (4, 712),	VX_MASK,     PPCEFS,	0,		{RS, RA, RB}},</div><div class='add'>+{"efsdiv",	VX (4, 713),	VX_MASK,     PPCEFS,	0,		{RS, RA, RB}},</div><div class='add'>+{"vrfim",	VX (4, 714),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"efscmpgt",	VX (4, 716),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"vextractd",	VX (4, 717),   VXUIMM4_MASK, PPCVEC3,	0,		{VD, VB, UIMM4}},</div><div class='add'>+{"efscmplt",	VX (4, 717),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"efscmpeq",	VX (4, 718),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"vupklsh",	VX (4, 718),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"efscfd",	VX (4, 719),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efscfui",	VX (4, 720),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efscfsi",	VX (4, 721),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efscfuf",	VX (4, 722),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efscfsf",	VX (4, 723),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efsctui",	VX (4, 724),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efsctsi",	VX (4, 725),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efsctuf",	VX (4, 726),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efsctsf",	VX (4, 727),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efsctuiz",	VX (4, 728),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"nput",	APU(4, 364,0),	APU_RT_MASK, PPC405,	0,		{RA, FSL}},</div><div class='add'>+{"efsctsiz",	VX (4, 730),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efststgt",	VX (4, 732),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"efststlt",	VX (4, 733),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"efststeq",	VX (4, 734),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"efdadd",	VX (4, 736),	VX_MASK,     PPCEFS,	0,		{RS, RA, RB}},</div><div class='add'>+{"efdsub",	VX (4, 737),	VX_MASK,     PPCEFS,	0,		{RS, RA, RB}},</div><div class='add'>+{"efdcfuid",	VX (4, 738),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdcfsid",	VX (4, 739),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdabs",	VX (4, 740),	VX_MASK,     PPCEFS,	0,		{RS, RA}},</div><div class='add'>+{"efdnabs",	VX (4, 741),	VX_MASK,     PPCEFS,	0,		{RS, RA}},</div><div class='add'>+{"efdneg",	VX (4, 742),	VX_MASK,     PPCEFS,	0,		{RS, RA}},</div><div class='add'>+{"efdmul",	VX (4, 744),	VX_MASK,     PPCEFS,	0,		{RS, RA, RB}},</div><div class='add'>+{"efddiv",	VX (4, 745),	VX_MASK,     PPCEFS,	0,		{RS, RA, RB}},</div><div class='add'>+{"efdctuidz",	VX (4, 746),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdctsidz",	VX (4, 747),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdcmpgt",	VX (4, 748),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"efdcmplt",	VX (4, 749),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"efdcmpeq",	VX (4, 750),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"efdcfs",	VX (4, 751),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdcfui",	VX (4, 752),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdcfsi",	VX (4, 753),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdcfuf",	VX (4, 754),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdcfsf",	VX (4, 755),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdctui",	VX (4, 756),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdctsi",	VX (4, 757),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdctuf",	VX (4, 758),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdctsf",	VX (4, 759),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdctuiz",	VX (4, 760),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"ncput",	APU(4, 380,0),	APU_RT_MASK, PPC405,	0,		{RA, FSL}},</div><div class='add'>+{"efdctsiz",	VX (4, 762),	VX_MASK,     PPCEFS,	0,		{RS, RB}},</div><div class='add'>+{"efdtstgt",	VX (4, 764),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"efdtstlt",	VX (4, 765),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"efdtsteq",	VX (4, 766),	VX_MASK,     PPCEFS,	0,		{CRFD, RA, RB}},</div><div class='add'>+{"evlddx",	VX (4, 768),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vaddsbs",	VX (4, 768),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evldd",	VX (4, 769),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_8, RA}},</div><div class='add'>+{"evldwx",	VX (4, 770),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vminsb",	VX (4, 770),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evldw",	VX (4, 771),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_8, RA}},</div><div class='add'>+{"evldhx",	VX (4, 772),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vsrab",	VX (4, 772),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evldh",	VX (4, 773),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_8, RA}},</div><div class='add'>+{"vcmpgtsb",	VXR(4, 774,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evlhhesplatx",VX (4, 776),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vmulesb",	VX (4, 776),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evlhhesplat",	VX (4, 777),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_2, RA}},</div><div class='add'>+{"vcfux",	VX (4, 778),	VX_MASK,     PPCVEC,	0,		{VD, VB, UIMM}},</div><div class='add'>+{"vcuxwfp",	VX (4, 778),	VX_MASK,     PPCVEC,	0,		{VD, VB, UIMM}},</div><div class='add'>+{"evlhhousplatx",VX(4, 780),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vspltisb",	VX (4, 780),	VXVB_MASK,   PPCVEC,	0,		{VD, SIMM}},</div><div class='add'>+{"vinsertb",	VX (4, 781),   VXUIMM4_MASK, PPCVEC3,	0,		{VD, VB, UIMM4}},</div><div class='add'>+{"evlhhousplat",VX (4, 781),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_2, RA}},</div><div class='add'>+{"evlhhossplatx",VX(4, 782),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vpkpx",	VX (4, 782),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evlhhossplat",VX (4, 783),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_2, RA}},</div><div class='add'>+{"mullhwu",	XRC(4, 392,0),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evlwhex",	VX (4, 784),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"mullhwu.",	XRC(4, 392,1),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evlwhe",	VX (4, 785),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_4, RA}},</div><div class='add'>+{"evlwhoux",	VX (4, 788),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evlwhou",	VX (4, 789),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_4, RA}},</div><div class='add'>+{"evlwhosx",	VX (4, 790),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evlwhos",	VX (4, 791),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_4, RA}},</div><div class='add'>+{"maclhwu",	XO (4, 396,0,0),XO_MASK,     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evlwwsplatx",	VX (4, 792),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"maclhwu.",	XO (4, 396,0,1),XO_MASK,     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evlwwsplat",	VX (4, 793),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_4, RA}},</div><div class='add'>+{"evlwhsplatx",	VX (4, 796),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evlwhsplat",	VX (4, 797),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_4, RA}},</div><div class='add'>+{"evstddx",	VX (4, 800),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evstdd",	VX (4, 801),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_8, RA}},</div><div class='add'>+{"evstdwx",	VX (4, 802),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evstdw",	VX (4, 803),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_8, RA}},</div><div class='add'>+{"evstdhx",	VX (4, 804),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evstdh",	VX (4, 805),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_8, RA}},</div><div class='add'>+{"evstwhex",	VX (4, 816),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evstwhe",	VX (4, 817),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_4, RA}},</div><div class='add'>+{"evstwhox",	VX (4, 820),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evstwho",	VX (4, 821),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_4, RA}},</div><div class='add'>+{"evstwwex",	VX (4, 824),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evstwwe",	VX (4, 825),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_4, RA}},</div><div class='add'>+{"evstwwox",	VX (4, 828),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evstwwo",	VX (4, 829),	VX_MASK,     PPCSPE,	0,		{RS, EVUIMM_4, RA}},</div><div class='add'>+{"vaddshs",	VX (4, 832),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"bcdcpsgn.",	VX (4, 833),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vminsh",	VX (4, 834),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vsrah",	VX (4, 836),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpgtsh",	VXR(4, 838,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmulesh",	VX (4, 840),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcfsx",	VX (4, 842),	VX_MASK,     PPCVEC,	0,		{VD, VB, UIMM}},</div><div class='add'>+{"vcsxwfp",	VX (4, 842),	VX_MASK,     PPCVEC,	0,		{VD, VB, UIMM}},</div><div class='add'>+{"vspltish",	VX (4, 844),	VXVB_MASK,   PPCVEC,	0,		{VD, SIMM}},</div><div class='add'>+{"vinserth",	VX (4, 845),   VXUIMM4_MASK, PPCVEC3,	0,		{VD, VB, UIMM4}},</div><div class='add'>+{"vupkhpx",	VX (4, 846),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"mullhw",	XRC(4, 424,0),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"mullhw.",	XRC(4, 424,1),	X_MASK,	     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"maclhw",	XO (4, 428,0,0),XO_MASK,     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"maclhw.",	XO (4, 428,0,1),XO_MASK,     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmaclhw",	XO (4, 430,0,0),XO_MASK,     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmaclhw.",	XO (4, 430,0,1),XO_MASK,     MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"vaddsws",	VX (4, 896),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vminsw",	VX (4, 898),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vsraw",	VX (4, 900),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpgtsw",	VXR(4, 902,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmulesw",	VX (4, 904),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vctuxs",	VX (4, 906),	VX_MASK,     PPCVEC,	0,		{VD, VB, UIMM}},</div><div class='add'>+{"vcfpuxws",	VX (4, 906),	VX_MASK,     PPCVEC,	0,		{VD, VB, UIMM}},</div><div class='add'>+{"vspltisw",	VX (4, 908),	VXVB_MASK,   PPCVEC,	0,		{VD, SIMM}},</div><div class='add'>+{"vinsertw",	VX (4, 909),   VXUIMM4_MASK, PPCVEC3,	0,		{VD, VB, UIMM4}},</div><div class='add'>+{"maclhwsu",	XO (4, 460,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"maclhwsu.",	XO (4, 460,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"vminsd",	VX (4, 962),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vsrad",	VX (4, 964),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpbfp",	VXR(4, 966,0),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpgtsd",	VXR(4, 967,0),	VXR_MASK,    PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vctsxs",	VX (4, 970),	VX_MASK,     PPCVEC,	0,		{VD, VB, UIMM}},</div><div class='add'>+{"vcfpsxws",	VX (4, 970),	VX_MASK,     PPCVEC,	0,		{VD, VB, UIMM}},</div><div class='add'>+{"vinsertd",	VX (4, 973),   VXUIMM4_MASK, PPCVEC3,	0,		{VD, VB, UIMM4}},</div><div class='add'>+{"vupklpx",	VX (4, 974),	VXVA_MASK,   PPCVEC,	0,		{VD, VB}},</div><div class='add'>+{"maclhws",	XO (4, 492,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"maclhws.",	XO (4, 492,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmaclhws",	XO (4, 494,0,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmaclhws.",	XO (4, 494,0,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"vsububm",	VX (4,1024),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"bcdadd.",	VX (4,1025),	VXPS_MASK,   PPCVEC2,	0,		{VD, VA, VB, PS}},</div><div class='add'>+{"vavgub",	VX (4,1026),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vabsdub",	VX (4,1027),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmhessf",	VX (4,1027),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vand",	VX (4,1028),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpequb.",	VXR(4,	 6,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpneb.",	VXR(4,	 7,1),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi0fcm.",	APU(4, 515,0),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"udi0fcm",	APU(4, 515,1),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"evmhossf",	VX (4,1031),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vpmsumb",	VX (4,1032),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmheumi",	VX (4,1032),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhesmi",	VX (4,1033),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vmaxfp",	VX (4,1034),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmhesmf",	VX (4,1035),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhoumi",	VX (4,1036),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vslo",	VX (4,1036),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmhosmi",	VX (4,1037),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhosmf",	VX (4,1039),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"machhwuo",	XO (4,	12,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"machhwuo.",	XO (4,	12,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"ps_merge00",	XOPS(4,528,0),	XOPS_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"ps_merge00.",	XOPS(4,528,1),	XOPS_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"evmhessfa",	VX (4,1059),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhossfa",	VX (4,1063),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmheumia",	VX (4,1064),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhesmia",	VX (4,1065),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhesmfa",	VX (4,1067),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhoumia",	VX (4,1068),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhosmia",	VX (4,1069),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhosmfa",	VX (4,1071),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vsubuhm",	VX (4,1088),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"bcdsub.",	VX (4,1089),	VXPS_MASK,   PPCVEC2,	0,		{VD, VA, VB, PS}},</div><div class='add'>+{"vavguh",	VX (4,1090),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vabsduh",	VX (4,1091),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vandc",	VX (4,1092),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpequh.",	VXR(4,	70,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi1fcm.",	APU(4, 547,0),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"udi1fcm",	APU(4, 547,1),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"vcmpneh.",	VXR(4,	71,1),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmwhssf",	VX (4,1095),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vpmsumh",	VX (4,1096),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmwlumi",	VX (4,1096),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vminfp",	VX (4,1098),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmwhumi",	VX (4,1100),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vsro",	VX (4,1100),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmwhsmi",	VX (4,1101),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vpkudum",	VX (4,1102),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmwhsmf",	VX (4,1103),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwssf",	VX (4,1107),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"machhwo",	XO (4,	44,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evmwumi",	VX (4,1112),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"machhwo.",	XO (4,	44,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evmwsmi",	VX (4,1113),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwsmf",	VX (4,1115),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"nmachhwo",	XO (4,	46,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmachhwo.",	XO (4,	46,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"ps_merge01",	XOPS(4,560,0),	XOPS_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"ps_merge01.",	XOPS(4,560,1),	XOPS_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"evmwhssfa",	VX (4,1127),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwlumia",	VX (4,1128),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwhumia",	VX (4,1132),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwhsmia",	VX (4,1133),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwhsmfa",	VX (4,1135),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwssfa",	VX (4,1139),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwumia",	VX (4,1144),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwsmia",	VX (4,1145),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwsmfa",	VX (4,1147),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vsubuwm",	VX (4,1152),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"bcdus.",	VX (4,1153),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vavguw",	VX (4,1154),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vabsduw",	VX (4,1155),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmr",		VX (4,1156),	VX_MASK,     PPCVEC,	0,		{VD, VA, VBA}},</div><div class='add'>+{"vor",		VX (4,1156),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpnew.",	VXR(4, 135,1),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vpmsumw",	VX (4,1160),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpequw.",	VXR(4, 134,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi2fcm.",	APU(4, 579,0),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"udi2fcm",	APU(4, 579,1),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"machhwsuo",	XO (4,	76,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"machhwsuo.",	XO (4,	76,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"ps_merge10",	XOPS(4,592,0),	XOPS_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"ps_merge10.",	XOPS(4,592,1),	XOPS_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"vsubudm",	VX (4,1216),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evaddusiaaw",	VX (4,1216),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"bcds.",	VX (4,1217),	VXPS_MASK,   PPCVEC3,	0,		{VD, VA, VB, PS}},</div><div class='add'>+{"evaddssiaaw",	VX (4,1217),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"evsubfusiaaw",VX (4,1218),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"evsubfssiaaw",VX (4,1219),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"evmra",	VX (4,1220),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"vxor",	VX (4,1220),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evdivws",	VX (4,1222),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vcmpeqfp.",	VXR(4, 198,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi3fcm.",	APU(4, 611,0),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"vcmpequd.",	VXR(4, 199,1),	VXR_MASK,    PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi3fcm",	APU(4, 611,1),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"evdivwu",	VX (4,1223),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vpmsumd",	VX (4,1224),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evaddumiaaw",	VX (4,1224),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"evaddsmiaaw",	VX (4,1225),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"evsubfumiaaw",VX (4,1226),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"evsubfsmiaaw",VX (4,1227),	VX_MASK,     PPCSPE,	0,		{RS, RA}},</div><div class='add'>+{"vpkudus",	VX (4,1230),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"machhwso",	XO (4, 108,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"machhwso.",	XO (4, 108,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmachhwso",	XO (4, 110,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmachhwso.",	XO (4, 110,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"ps_merge11",	XOPS(4,624,0),	XOPS_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"ps_merge11.",	XOPS(4,624,1),	XOPS_MASK,   PPCPS,	0,		{FRT, FRA, FRB}},</div><div class='add'>+{"vsubuqm",	VX (4,1280),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmheusiaaw",	VX (4,1280),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"bcdtrunc.",	VX (4,1281),	VXPS_MASK,   PPCVEC3,	0,		{VD, VA, VB, PS}},</div><div class='add'>+{"evmhessiaaw",	VX (4,1281),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vavgsb",	VX (4,1282),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmhessfaaw",	VX (4,1283),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhousiaaw",	VX (4,1284),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vnot",	VX (4,1284),	VX_MASK,     PPCVEC,	0,		{VD, VA, VBA}},</div><div class='add'>+{"vnor",	VX (4,1284),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmhossiaaw",	VX (4,1285),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"udi4fcm.",	APU(4, 643,0),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"udi4fcm",	APU(4, 643,1),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"vcmpnezb.",	VXR(4, 263,1),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmhossfaaw",	VX (4,1287),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmheumiaaw",	VX (4,1288),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vcipher",	VX (4,1288),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcipherlast",	VX (4,1289),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmhesmiaaw",	VX (4,1289),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhesmfaaw",	VX (4,1291),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vgbbd",	VX (4,1292),	VXVA_MASK,   PPCVEC2,	0,		{VD, VB}},</div><div class='add'>+{"evmhoumiaaw",	VX (4,1292),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhosmiaaw",	VX (4,1293),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhosmfaaw",	VX (4,1295),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"macchwuo",	XO (4, 140,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"macchwuo.",	XO (4, 140,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evmhegumiaa",	VX (4,1320),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhegsmiaa",	VX (4,1321),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhegsmfaa",	VX (4,1323),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhogumiaa",	VX (4,1324),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhogsmiaa",	VX (4,1325),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhogsmfaa",	VX (4,1327),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vsubcuq",	VX (4,1344),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmwlusiaaw",	VX (4,1344),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"bcdutrunc.",	VX (4,1345),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmwlssiaaw",	VX (4,1345),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vavgsh",	VX (4,1346),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vorc",	VX (4,1348),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi5fcm.",	APU(4, 675,0),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"udi5fcm",	APU(4, 675,1),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"vcmpnezh.",	VXR(4, 327,1),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vncipher",	VX (4,1352),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmwlumiaaw",	VX (4,1352),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vncipherlast",VX (4,1353),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmwlsmiaaw",	VX (4,1353),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vbpermq",	VX (4,1356),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vpksdus",	VX (4,1358),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmwssfaa",	VX (4,1363),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"macchwo",	XO (4, 172,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evmwumiaa",	VX (4,1368),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"macchwo.",	XO (4, 172,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evmwsmiaa",	VX (4,1369),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwsmfaa",	VX (4,1371),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"nmacchwo",	XO (4, 174,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmacchwo.",	XO (4, 174,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evmheusianw",	VX (4,1408),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vsubcuw",	VX (4,1408),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmhessianw",	VX (4,1409),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"bcdctsq.",	VXVA(4,1409,0),	VXVA_MASK,   PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"bcdcfsq.",	VXVA(4,1409,2),	VXVAPS_MASK, PPCVEC3,	0,		{VD, VB, PS}},</div><div class='add'>+{"bcdctz.",	VXVA(4,1409,4),	VXVAPS_MASK, PPCVEC3,	0,		{VD, VB, PS}},</div><div class='add'>+{"bcdctn.",	VXVA(4,1409,5),	VXVA_MASK,   PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"bcdcfz.",	VXVA(4,1409,6),	VXVAPS_MASK, PPCVEC3,	0,		{VD, VB, PS}},</div><div class='add'>+{"bcdcfn.",	VXVA(4,1409,7),	VXVAPS_MASK, PPCVEC3,	0,		{VD, VB, PS}},</div><div class='add'>+{"bcdsetsgn.",	VXVA(4,1409,31), VXVAPS_MASK, PPCVEC3,	0,		{VD, VB, PS}},</div><div class='add'>+{"vavgsw",	VX (4,1410),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmhessfanw",	VX (4,1411),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vnand",	VX (4,1412),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmhousianw",	VX (4,1412),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhossianw",	VX (4,1413),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"udi6fcm.",	APU(4, 707,0),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"udi6fcm",	APU(4, 707,1),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"vcmpnezw.",	VXR(4, 391,1),	VXR_MASK,    PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmhossfanw",	VX (4,1415),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmheumianw",	VX (4,1416),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhesmianw",	VX (4,1417),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhesmfanw",	VX (4,1419),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhoumianw",	VX (4,1420),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhosmianw",	VX (4,1421),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhosmfanw",	VX (4,1423),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"macchwsuo",	XO (4, 204,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"macchwsuo.",	XO (4, 204,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evmhegumian",	VX (4,1448),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhegsmian",	VX (4,1449),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhegsmfan",	VX (4,1451),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhogumian",	VX (4,1452),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhogsmian",	VX (4,1453),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmhogsmfan",	VX (4,1455),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwlusianw",	VX (4,1472),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"bcdsr.",	VX (4,1473),	VXPS_MASK,   PPCVEC3,	0,		{VD, VA, VB, PS}},</div><div class='add'>+{"evmwlssianw",	VX (4,1473),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vsld",	VX (4,1476),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpgefp.",	VXR(4, 454,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi7fcm.",	APU(4, 739,0),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"udi7fcm",	APU(4, 739,1),	APU_MASK, PPC405|PPC440, PPC476,	{URT, URA, URB}},</div><div class='add'>+{"vsbox",	VX (4,1480),	VXVB_MASK,   PPCVEC2,	0,		{VD, VA}},</div><div class='add'>+{"evmwlumianw",	VX (4,1480),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwlsmianw",	VX (4,1481),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"vbpermd",	VX (4,1484),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vpksdss",	VX (4,1486),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"evmwssfan",	VX (4,1491),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"macchwso",	XO (4, 236,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evmwumian",	VX (4,1496),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"macchwso.",	XO (4, 236,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"evmwsmian",	VX (4,1497),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"evmwsmfan",	VX (4,1499),	VX_MASK,     PPCSPE,	0,		{RS, RA, RB}},</div><div class='add'>+{"nmacchwso",	XO (4, 238,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmacchwso.",	XO (4, 238,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"vsububs",	VX (4,1536),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vclzlsbb",	VXVA(4,1538,0), VXVA_MASK,   PPCVEC3,	0,		{RT, VB}},</div><div class='add'>+{"vctzlsbb",	VXVA(4,1538,1), VXVA_MASK,   PPCVEC3,	0,		{RT, VB}},</div><div class='add'>+{"vnegw",	VXVA(4,1538,6), VXVA_MASK,   PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vnegd",	VXVA(4,1538,7), VXVA_MASK,   PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vprtybw",	VXVA(4,1538,8), VXVA_MASK,   PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vprtybd",	VXVA(4,1538,9), VXVA_MASK,   PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vprtybq",	VXVA(4,1538,10), VXVA_MASK,  PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vextsb2w",	VXVA(4,1538,16), VXVA_MASK,  PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vextsh2w",	VXVA(4,1538,17), VXVA_MASK,  PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vextsb2d",	VXVA(4,1538,24), VXVA_MASK,  PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vextsh2d",	VXVA(4,1538,25), VXVA_MASK,  PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vextsw2d",	VXVA(4,1538,26), VXVA_MASK,  PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vctzb",	VXVA(4,1538,28), VXVA_MASK,  PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vctzh",	VXVA(4,1538,29), VXVA_MASK,  PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vctzw",	VXVA(4,1538,30), VXVA_MASK,  PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"vctzd",	VXVA(4,1538,31), VXVA_MASK,  PPCVEC3,	0,		{VD, VB}},</div><div class='add'>+{"mfvscr",	VX (4,1540),	VXVAVB_MASK, PPCVEC,	0,		{VD}},</div><div class='add'>+{"vcmpgtub.",	VXR(4, 518,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi8fcm.",	APU(4, 771,0),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"udi8fcm",	APU(4, 771,1),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"vsum4ubs",	VX (4,1544),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vextublx",	VX (4,1549),	VX_MASK,     PPCVEC3,	0,		{RT, RA, VB}},</div><div class='add'>+{"vsubuhs",	VX (4,1600),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"mtvscr",	VX (4,1604),	VXVDVA_MASK, PPCVEC,	0,		{VB}},</div><div class='add'>+{"vcmpgtuh.",	VXR(4, 582,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vsum4shs",	VX (4,1608),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi9fcm.",	APU(4, 804,0),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"udi9fcm",	APU(4, 804,1),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"vextuhlx",	VX (4,1613),	VX_MASK,     PPCVEC3,	0,		{RT, RA, VB}},</div><div class='add'>+{"vupkhsw",	VX (4,1614),	VXVA_MASK,   PPCVEC2,	0,		{VD, VB}},</div><div class='add'>+{"vsubuws",	VX (4,1664),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vshasigmaw",	VX (4,1666),	VX_MASK,     PPCVEC2,	0,		{VD, VA, ST, SIX}},</div><div class='add'>+{"veqv",	VX (4,1668),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpgtuw.",	VXR(4, 646,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi10fcm.",	APU(4, 835,0),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"udi10fcm",	APU(4, 835,1),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"vsum2sws",	VX (4,1672),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmrgow",	VX (4,1676),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vextuwlx",	VX (4,1677),	VX_MASK,     PPCVEC3,	0,		{RT, RA, VB}},</div><div class='add'>+{"vshasigmad",	VX (4,1730),	VX_MASK,     PPCVEC2,	0,		{VD, VA, ST, SIX}},</div><div class='add'>+{"vsrd",	VX (4,1732),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpgtfp.",	VXR(4, 710,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi11fcm.",	APU(4, 867,0),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"vcmpgtud.",	VXR(4, 711,1),	VXR_MASK,    PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi11fcm",	APU(4, 867,1),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"vupklsw",	VX (4,1742),	VXVA_MASK,   PPCVEC2,	0,		{VD, VB}},</div><div class='add'>+{"vsubsbs",	VX (4,1792),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vclzb",	VX (4,1794),	VXVA_MASK,   PPCVEC2,	0,		{VD, VB}},</div><div class='add'>+{"vpopcntb",	VX (4,1795),	VXVA_MASK,   PPCVEC2,	0,		{VD, VB}},</div><div class='add'>+{"vsrv",	VX (4,1796),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpgtsb.",	VXR(4, 774,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi12fcm.",	APU(4, 899,0),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"udi12fcm",	APU(4, 899,1),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"vsum4sbs",	VX (4,1800),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vextubrx",	VX (4,1805),	VX_MASK,     PPCVEC3,	0,		{RT, RA, VB}},</div><div class='add'>+{"maclhwuo",	XO (4, 396,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"maclhwuo.",	XO (4, 396,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"vsubshs",	VX (4,1856),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vclzh",	VX (4,1858),	VXVA_MASK,   PPCVEC2,	0,		{VD, VB}},</div><div class='add'>+{"vpopcnth",	VX (4,1859),	VXVA_MASK,   PPCVEC2,	0,		{VD, VB}},</div><div class='add'>+{"vslv",	VX (4,1860),	VX_MASK,     PPCVEC3,	0,		{VD, VA, VB}},</div><div class='add'>+{"vcmpgtsh.",	VXR(4, 838,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vextuhrx",	VX (4,1869),	VX_MASK,     PPCVEC3,	0,		{RT, RA, VB}},</div><div class='add'>+{"udi13fcm.",	APU(4, 931,0),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"udi13fcm",	APU(4, 931,1),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"maclhwo",	XO (4, 428,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"maclhwo.",	XO (4, 428,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmaclhwo",	XO (4, 430,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmaclhwo.",	XO (4, 430,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"vsubsws",	VX (4,1920),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vclzw",	VX (4,1922),	VXVA_MASK,   PPCVEC2,	0,		{VD, VB}},</div><div class='add'>+{"vpopcntw",	VX (4,1923),	VXVA_MASK,   PPCVEC2,	0,		{VD, VB}},</div><div class='add'>+{"vcmpgtsw.",	VXR(4, 902,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi14fcm.",	APU(4, 963,0),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"udi14fcm",	APU(4, 963,1),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"vsumsws",	VX (4,1928),	VX_MASK,     PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"vmrgew",	VX (4,1932),	VX_MASK,     PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"vextuwrx",	VX (4,1933),	VX_MASK,     PPCVEC3,	0,		{RT, RA, VB}},</div><div class='add'>+{"maclhwsuo",	XO (4, 460,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"maclhwsuo.",	XO (4, 460,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"vclzd",	VX (4,1986),	VXVA_MASK,   PPCVEC2,	0,		{VD, VB}},</div><div class='add'>+{"vpopcntd",	VX (4,1987),	VXVA_MASK,   PPCVEC2,	0,		{VD, VB}},</div><div class='add'>+{"vcmpbfp.",	VXR(4, 966,1),	VXR_MASK,    PPCVEC,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi15fcm.",	APU(4, 995,0),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"vcmpgtsd.",	VXR(4, 967,1),	VXR_MASK,    PPCVEC2,	0,		{VD, VA, VB}},</div><div class='add'>+{"udi15fcm",	APU(4, 995,1),	APU_MASK,    PPC440,	PPC476,		{URT, URA, URB}},</div><div class='add'>+{"maclhwso",	XO (4, 492,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"maclhwso.",	XO (4, 492,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmaclhwso",	XO (4, 494,1,0), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"nmaclhwso.",	XO (4, 494,1,1), XO_MASK,    MULHW,	0,		{RT, RA, RB}},</div><div class='add'>+{"dcbz_l",	X  (4,1014),	XRT_MASK,    PPCPS,	0,		{RA, RB}},</div><div class='add'>+</div><div class='add'>+{"mulli",	OP(7),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, RA, SI}},</div><div class='add'>+{"muli",	OP(7),		OP_MASK,     PWRCOM,	PPCVLE,		{RT, RA, SI}},</div><div class='add'>+</div><div class='add'>+{"subfic",	OP(8),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, RA, SI}},</div><div class='add'>+{"sfi",		OP(8),		OP_MASK,     PWRCOM,	PPCVLE,		{RT, RA, SI}},</div><div class='add'>+</div><div class='add'>+{"dozi",	OP(9),		OP_MASK,     M601,	PPCVLE,		{RT, RA, SI}},</div><div class='add'>+</div><div class='add'>+{"cmplwi",	OPL(10,0),	OPL_MASK,    PPCCOM,	PPCVLE,		{OBF, RA, UISIGNOPT}},</div><div class='add'>+{"cmpldi",	OPL(10,1),	OPL_MASK,    PPC64,	PPCVLE,		{OBF, RA, UISIGNOPT}},</div><div class='add'>+{"cmpli",	OP(10),		OP_MASK,     PPC,	PPCVLE,		{BF, L32OPT, RA, UISIGNOPT}},</div><div class='add'>+{"cmpli",	OP(10),		OP_MASK,     PWRCOM,	PPC|PPCVLE,	{BF, RA, UISIGNOPT}},</div><div class='add'>+</div><div class='add'>+{"cmpwi",	OPL(11,0),	OPL_MASK,    PPCCOM,	PPCVLE,		{OBF, RA, SI}},</div><div class='add'>+{"cmpdi",	OPL(11,1),	OPL_MASK,    PPC64,	PPCVLE,		{OBF, RA, SI}},</div><div class='add'>+{"cmpi",	OP(11),		OP_MASK,     PPC,	PPCVLE,		{BF, L32OPT, RA, SI}},</div><div class='add'>+{"cmpi",	OP(11),		OP_MASK,     PWRCOM,	PPC|PPCVLE,	{BF, RA, SI}},</div><div class='add'>+</div><div class='add'>+{"addic",	OP(12),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, RA, SI}},</div><div class='add'>+{"ai",		OP(12),		OP_MASK,     PWRCOM,	PPCVLE,		{RT, RA, SI}},</div><div class='add'>+{"subic",	OP(12),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, RA, NSI}},</div><div class='add'>+</div><div class='add'>+{"addic.",	OP(13),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, RA, SI}},</div><div class='add'>+{"ai.",		OP(13),		OP_MASK,     PWRCOM,	PPCVLE,		{RT, RA, SI}},</div><div class='add'>+{"subic.",	OP(13),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, RA, NSI}},</div><div class='add'>+</div><div class='add'>+{"li",		OP(14),		DRA_MASK,    PPCCOM,	PPCVLE,		{RT, SI}},</div><div class='add'>+{"lil",		OP(14),		DRA_MASK,    PWRCOM,	PPCVLE,		{RT, SI}},</div><div class='add'>+{"addi",	OP(14),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, RA0, SI}},</div><div class='add'>+{"cal",		OP(14),		OP_MASK,     PWRCOM,	PPCVLE,		{RT, D, RA0}},</div><div class='add'>+{"subi",	OP(14),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, RA0, NSI}},</div><div class='add'>+{"la",		OP(14),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, D, RA0}},</div><div class='add'>+</div><div class='add'>+{"lis",		OP(15),		DRA_MASK,    PPCCOM,	PPCVLE,		{RT, SISIGNOPT}},</div><div class='add'>+{"liu",		OP(15),		DRA_MASK,    PWRCOM,	PPCVLE,		{RT, SISIGNOPT}},</div><div class='add'>+{"addis",	OP(15),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, RA0, SISIGNOPT}},</div><div class='add'>+{"cau",		OP(15),		OP_MASK,     PWRCOM,	PPCVLE,		{RT, RA0, SISIGNOPT}},</div><div class='add'>+{"subis",	OP(15),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, RA0, NSISIGNOPT}},</div><div class='add'>+</div><div class='add'>+{"bdnz-",    BBO(16,BODNZ,0,0),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDM}},</div><div class='add'>+{"bdnz+",    BBO(16,BODNZ,0,0),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDP}},</div><div class='add'>+{"bdnz",     BBO(16,BODNZ,0,0),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BD}},</div><div class='add'>+{"bdn",	     BBO(16,BODNZ,0,0),		BBOATBI_MASK,  PWRCOM,	 PPCVLE,	{BD}},</div><div class='add'>+{"bdnzl-",   BBO(16,BODNZ,0,1),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDM}},</div><div class='add'>+{"bdnzl+",   BBO(16,BODNZ,0,1),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDP}},</div><div class='add'>+{"bdnzl",    BBO(16,BODNZ,0,1),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BD}},</div><div class='add'>+{"bdnl",     BBO(16,BODNZ,0,1),		BBOATBI_MASK,  PWRCOM,	 PPCVLE,	{BD}},</div><div class='add'>+{"bdnza-",   BBO(16,BODNZ,1,0),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDMA}},</div><div class='add'>+{"bdnza+",   BBO(16,BODNZ,1,0),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDPA}},</div><div class='add'>+{"bdnza",    BBO(16,BODNZ,1,0),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDA}},</div><div class='add'>+{"bdna",     BBO(16,BODNZ,1,0),		BBOATBI_MASK,  PWRCOM,	 PPCVLE,	{BDA}},</div><div class='add'>+{"bdnzla-",  BBO(16,BODNZ,1,1),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDMA}},</div><div class='add'>+{"bdnzla+",  BBO(16,BODNZ,1,1),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDPA}},</div><div class='add'>+{"bdnzla",   BBO(16,BODNZ,1,1),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDA}},</div><div class='add'>+{"bdnla",    BBO(16,BODNZ,1,1),		BBOATBI_MASK,  PWRCOM,	 PPCVLE,	{BDA}},</div><div class='add'>+{"bdz-",     BBO(16,BODZ,0,0),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDM}},</div><div class='add'>+{"bdz+",     BBO(16,BODZ,0,0),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDP}},</div><div class='add'>+{"bdz",	     BBO(16,BODZ,0,0),		BBOATBI_MASK,  COM,	 PPCVLE,	{BD}},</div><div class='add'>+{"bdzl-",    BBO(16,BODZ,0,1),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDM}},</div><div class='add'>+{"bdzl+",    BBO(16,BODZ,0,1),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDP}},</div><div class='add'>+{"bdzl",     BBO(16,BODZ,0,1),		BBOATBI_MASK,  COM,	 PPCVLE,	{BD}},</div><div class='add'>+{"bdza-",    BBO(16,BODZ,1,0),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDMA}},</div><div class='add'>+{"bdza+",    BBO(16,BODZ,1,0),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDPA}},</div><div class='add'>+{"bdza",     BBO(16,BODZ,1,0),		BBOATBI_MASK,  COM,	 PPCVLE,	{BDA}},</div><div class='add'>+{"bdzla-",   BBO(16,BODZ,1,1),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDMA}},</div><div class='add'>+{"bdzla+",   BBO(16,BODZ,1,1),		BBOATBI_MASK,  PPCCOM,	 PPCVLE,	{BDPA}},</div><div class='add'>+{"bdzla",    BBO(16,BODZ,1,1),		BBOATBI_MASK,  COM,	 PPCVLE,	{BDA}},</div><div class='add'>+</div><div class='add'>+{"bge-",     BBOCB(16,BOF,CBLT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bge+",     BBOCB(16,BOF,CBLT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bge",	     BBOCB(16,BOF,CBLT,0,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bnl-",     BBOCB(16,BOF,CBLT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bnl+",     BBOCB(16,BOF,CBLT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bnl",	     BBOCB(16,BOF,CBLT,0,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bgel-",    BBOCB(16,BOF,CBLT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bgel+",    BBOCB(16,BOF,CBLT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bgel",     BBOCB(16,BOF,CBLT,0,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bnll-",    BBOCB(16,BOF,CBLT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bnll+",    BBOCB(16,BOF,CBLT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bnll",     BBOCB(16,BOF,CBLT,0,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bgea-",    BBOCB(16,BOF,CBLT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bgea+",    BBOCB(16,BOF,CBLT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bgea",     BBOCB(16,BOF,CBLT,1,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bnla-",    BBOCB(16,BOF,CBLT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bnla+",    BBOCB(16,BOF,CBLT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bnla",     BBOCB(16,BOF,CBLT,1,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bgela-",   BBOCB(16,BOF,CBLT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bgela+",   BBOCB(16,BOF,CBLT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bgela",    BBOCB(16,BOF,CBLT,1,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bnlla-",   BBOCB(16,BOF,CBLT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bnlla+",   BBOCB(16,BOF,CBLT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bnlla",    BBOCB(16,BOF,CBLT,1,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"ble-",     BBOCB(16,BOF,CBGT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"ble+",     BBOCB(16,BOF,CBGT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"ble",	     BBOCB(16,BOF,CBGT,0,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bng-",     BBOCB(16,BOF,CBGT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bng+",     BBOCB(16,BOF,CBGT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bng",	     BBOCB(16,BOF,CBGT,0,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"blel-",    BBOCB(16,BOF,CBGT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"blel+",    BBOCB(16,BOF,CBGT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"blel",     BBOCB(16,BOF,CBGT,0,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bngl-",    BBOCB(16,BOF,CBGT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bngl+",    BBOCB(16,BOF,CBGT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bngl",     BBOCB(16,BOF,CBGT,0,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"blea-",    BBOCB(16,BOF,CBGT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"blea+",    BBOCB(16,BOF,CBGT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"blea",     BBOCB(16,BOF,CBGT,1,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bnga-",    BBOCB(16,BOF,CBGT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bnga+",    BBOCB(16,BOF,CBGT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bnga",     BBOCB(16,BOF,CBGT,1,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"blela-",   BBOCB(16,BOF,CBGT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"blela+",   BBOCB(16,BOF,CBGT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"blela",    BBOCB(16,BOF,CBGT,1,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bngla-",   BBOCB(16,BOF,CBGT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bngla+",   BBOCB(16,BOF,CBGT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bngla",    BBOCB(16,BOF,CBGT,1,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bne-",     BBOCB(16,BOF,CBEQ,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bne+",     BBOCB(16,BOF,CBEQ,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bne",	     BBOCB(16,BOF,CBEQ,0,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bnel-",    BBOCB(16,BOF,CBEQ,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bnel+",    BBOCB(16,BOF,CBEQ,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bnel",     BBOCB(16,BOF,CBEQ,0,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bnea-",    BBOCB(16,BOF,CBEQ,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bnea+",    BBOCB(16,BOF,CBEQ,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bnea",     BBOCB(16,BOF,CBEQ,1,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bnela-",   BBOCB(16,BOF,CBEQ,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bnela+",   BBOCB(16,BOF,CBEQ,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bnela",    BBOCB(16,BOF,CBEQ,1,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bns-",     BBOCB(16,BOF,CBSO,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bns+",     BBOCB(16,BOF,CBSO,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bns",	     BBOCB(16,BOF,CBSO,0,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bnu-",     BBOCB(16,BOF,CBSO,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bnu+",     BBOCB(16,BOF,CBSO,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bnu",	     BBOCB(16,BOF,CBSO,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bnsl-",    BBOCB(16,BOF,CBSO,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bnsl+",    BBOCB(16,BOF,CBSO,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bnsl",     BBOCB(16,BOF,CBSO,0,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bnul-",    BBOCB(16,BOF,CBSO,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bnul+",    BBOCB(16,BOF,CBSO,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bnul",     BBOCB(16,BOF,CBSO,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bnsa-",    BBOCB(16,BOF,CBSO,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bnsa+",    BBOCB(16,BOF,CBSO,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bnsa",     BBOCB(16,BOF,CBSO,1,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bnua-",    BBOCB(16,BOF,CBSO,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bnua+",    BBOCB(16,BOF,CBSO,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bnua",     BBOCB(16,BOF,CBSO,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bnsla-",   BBOCB(16,BOF,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bnsla+",   BBOCB(16,BOF,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bnsla",    BBOCB(16,BOF,CBSO,1,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bnula-",   BBOCB(16,BOF,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bnula+",   BBOCB(16,BOF,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bnula",    BBOCB(16,BOF,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+</div><div class='add'>+{"blt-",     BBOCB(16,BOT,CBLT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"blt+",     BBOCB(16,BOT,CBLT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"blt",	     BBOCB(16,BOT,CBLT,0,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bltl-",    BBOCB(16,BOT,CBLT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bltl+",    BBOCB(16,BOT,CBLT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bltl",     BBOCB(16,BOT,CBLT,0,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"blta-",    BBOCB(16,BOT,CBLT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"blta+",    BBOCB(16,BOT,CBLT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"blta",     BBOCB(16,BOT,CBLT,1,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bltla-",   BBOCB(16,BOT,CBLT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bltla+",   BBOCB(16,BOT,CBLT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bltla",    BBOCB(16,BOT,CBLT,1,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bgt-",     BBOCB(16,BOT,CBGT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bgt+",     BBOCB(16,BOT,CBGT,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bgt",	     BBOCB(16,BOT,CBGT,0,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bgtl-",    BBOCB(16,BOT,CBGT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bgtl+",    BBOCB(16,BOT,CBGT,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bgtl",     BBOCB(16,BOT,CBGT,0,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bgta-",    BBOCB(16,BOT,CBGT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bgta+",    BBOCB(16,BOT,CBGT,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bgta",     BBOCB(16,BOT,CBGT,1,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bgtla-",   BBOCB(16,BOT,CBGT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bgtla+",   BBOCB(16,BOT,CBGT,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bgtla",    BBOCB(16,BOT,CBGT,1,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"beq-",     BBOCB(16,BOT,CBEQ,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"beq+",     BBOCB(16,BOT,CBEQ,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"beq",	     BBOCB(16,BOT,CBEQ,0,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"beql-",    BBOCB(16,BOT,CBEQ,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"beql+",    BBOCB(16,BOT,CBEQ,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"beql",     BBOCB(16,BOT,CBEQ,0,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"beqa-",    BBOCB(16,BOT,CBEQ,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"beqa+",    BBOCB(16,BOT,CBEQ,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"beqa",     BBOCB(16,BOT,CBEQ,1,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"beqla-",   BBOCB(16,BOT,CBEQ,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"beqla+",   BBOCB(16,BOT,CBEQ,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"beqla",    BBOCB(16,BOT,CBEQ,1,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bso-",     BBOCB(16,BOT,CBSO,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bso+",     BBOCB(16,BOT,CBSO,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bso",	     BBOCB(16,BOT,CBSO,0,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bun-",     BBOCB(16,BOT,CBSO,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bun+",     BBOCB(16,BOT,CBSO,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bun",	     BBOCB(16,BOT,CBSO,0,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bsol-",    BBOCB(16,BOT,CBSO,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bsol+",    BBOCB(16,BOT,CBSO,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bsol",     BBOCB(16,BOT,CBSO,0,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bunl-",    BBOCB(16,BOT,CBSO,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDM}},</div><div class='add'>+{"bunl+",    BBOCB(16,BOT,CBSO,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDP}},</div><div class='add'>+{"bunl",     BBOCB(16,BOT,CBSO,0,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BD}},</div><div class='add'>+{"bsoa-",    BBOCB(16,BOT,CBSO,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bsoa+",    BBOCB(16,BOT,CBSO,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bsoa",     BBOCB(16,BOT,CBSO,1,0),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"buna-",    BBOCB(16,BOT,CBSO,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"buna+",    BBOCB(16,BOT,CBSO,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"buna",     BBOCB(16,BOT,CBSO,1,0),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bsola-",   BBOCB(16,BOT,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bsola+",   BBOCB(16,BOT,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bsola",    BBOCB(16,BOT,CBSO,1,1),	BBOATCB_MASK,  COM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+{"bunla-",   BBOCB(16,BOT,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDMA}},</div><div class='add'>+{"bunla+",   BBOCB(16,BOT,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDPA}},</div><div class='add'>+{"bunla",    BBOCB(16,BOT,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCVLE,	{CR, BDA}},</div><div class='add'>+</div><div class='add'>+{"bdnzf-",   BBO(16,BODNZF,0,0),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDM}},</div><div class='add'>+{"bdnzf+",   BBO(16,BODNZF,0,0),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDP}},</div><div class='add'>+{"bdnzf",    BBO(16,BODNZF,0,0),	BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bdnzfl-",  BBO(16,BODNZF,0,1),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDM}},</div><div class='add'>+{"bdnzfl+",  BBO(16,BODNZF,0,1),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDP}},</div><div class='add'>+{"bdnzfl",   BBO(16,BODNZF,0,1),	BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bdnzfa-",  BBO(16,BODNZF,1,0),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"bdnzfa+",  BBO(16,BODNZF,1,0),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"bdnzfa",   BBO(16,BODNZF,1,0),	BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"bdnzfla-", BBO(16,BODNZF,1,1),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"bdnzfla+", BBO(16,BODNZF,1,1),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"bdnzfla",  BBO(16,BODNZF,1,1),	BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"bdzf-",    BBO(16,BODZF,0,0),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDM}},</div><div class='add'>+{"bdzf+",    BBO(16,BODZF,0,0),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDP}},</div><div class='add'>+{"bdzf",     BBO(16,BODZF,0,0),		BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bdzfl-",   BBO(16,BODZF,0,1),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDM}},</div><div class='add'>+{"bdzfl+",   BBO(16,BODZF,0,1),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDP}},</div><div class='add'>+{"bdzfl",    BBO(16,BODZF,0,1),		BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bdzfa-",   BBO(16,BODZF,1,0),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"bdzfa+",   BBO(16,BODZF,1,0),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"bdzfa",    BBO(16,BODZF,1,0),		BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"bdzfla-",  BBO(16,BODZF,1,1),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"bdzfla+",  BBO(16,BODZF,1,1),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"bdzfla",   BBO(16,BODZF,1,1),		BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+</div><div class='add'>+{"bf-",	     BBO(16,BOF,0,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDM}},</div><div class='add'>+{"bf+",	     BBO(16,BOF,0,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDP}},</div><div class='add'>+{"bf",	     BBO(16,BOF,0,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bbf",	     BBO(16,BOF,0,0),		BBOAT_MASK,    PWRCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bfl-",     BBO(16,BOF,0,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDM}},</div><div class='add'>+{"bfl+",     BBO(16,BOF,0,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDP}},</div><div class='add'>+{"bfl",	     BBO(16,BOF,0,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bbfl",     BBO(16,BOF,0,1),		BBOAT_MASK,    PWRCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bfa-",     BBO(16,BOF,1,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"bfa+",     BBO(16,BOF,1,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"bfa",	     BBO(16,BOF,1,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"bbfa",     BBO(16,BOF,1,0),		BBOAT_MASK,    PWRCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"bfla-",    BBO(16,BOF,1,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"bfla+",    BBO(16,BOF,1,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"bfla",     BBO(16,BOF,1,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"bbfla",    BBO(16,BOF,1,1),		BBOAT_MASK,    PWRCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+</div><div class='add'>+{"bdnzt-",   BBO(16,BODNZT,0,0),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDM}},</div><div class='add'>+{"bdnzt+",   BBO(16,BODNZT,0,0),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDP}},</div><div class='add'>+{"bdnzt",    BBO(16,BODNZT,0,0),	BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bdnztl-",  BBO(16,BODNZT,0,1),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDM}},</div><div class='add'>+{"bdnztl+",  BBO(16,BODNZT,0,1),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDP}},</div><div class='add'>+{"bdnztl",   BBO(16,BODNZT,0,1),	BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bdnzta-",  BBO(16,BODNZT,1,0),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"bdnzta+",  BBO(16,BODNZT,1,0),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"bdnzta",   BBO(16,BODNZT,1,0),	BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"bdnztla-", BBO(16,BODNZT,1,1),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"bdnztla+", BBO(16,BODNZT,1,1),	BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"bdnztla",  BBO(16,BODNZT,1,1),	BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"bdzt-",    BBO(16,BODZT,0,0),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDM}},</div><div class='add'>+{"bdzt+",    BBO(16,BODZT,0,0),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDP}},</div><div class='add'>+{"bdzt",     BBO(16,BODZT,0,0),		BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bdztl-",   BBO(16,BODZT,0,1),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDM}},</div><div class='add'>+{"bdztl+",   BBO(16,BODZT,0,1),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDP}},</div><div class='add'>+{"bdztl",    BBO(16,BODZT,0,1),		BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bdzta-",   BBO(16,BODZT,1,0),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"bdzta+",   BBO(16,BODZT,1,0),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"bdzta",    BBO(16,BODZT,1,0),		BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"bdztla-",  BBO(16,BODZT,1,1),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"bdztla+",  BBO(16,BODZT,1,1),		BBOY_MASK,     PPCCOM,	 ISA_V2|PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"bdztla",   BBO(16,BODZT,1,1),		BBOY_MASK,     PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+</div><div class='add'>+{"bt-",	     BBO(16,BOT,0,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDM}},</div><div class='add'>+{"bt+",	     BBO(16,BOT,0,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDP}},</div><div class='add'>+{"bt",	     BBO(16,BOT,0,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bbt",	     BBO(16,BOT,0,0),		BBOAT_MASK,    PWRCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"btl-",     BBO(16,BOT,0,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDM}},</div><div class='add'>+{"btl+",     BBO(16,BOT,0,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDP}},</div><div class='add'>+{"btl",	     BBO(16,BOT,0,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bbtl",     BBO(16,BOT,0,1),		BBOAT_MASK,    PWRCOM,	 PPCVLE,	{BI, BD}},</div><div class='add'>+{"bta-",     BBO(16,BOT,1,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"bta+",     BBO(16,BOT,1,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"bta",	     BBO(16,BOT,1,0),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"bbta",     BBO(16,BOT,1,0),		BBOAT_MASK,    PWRCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"btla-",    BBO(16,BOT,1,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDMA}},</div><div class='add'>+{"btla+",    BBO(16,BOT,1,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDPA}},</div><div class='add'>+{"btla",     BBO(16,BOT,1,1),		BBOAT_MASK,    PPCCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+{"bbtla",    BBO(16,BOT,1,1),		BBOAT_MASK,    PWRCOM,	 PPCVLE,	{BI, BDA}},</div><div class='add'>+</div><div class='add'>+{"bc-",		B(16,0,0),	B_MASK,	     PPCCOM,	PPCVLE,		{BOE, BI, BDM}},</div><div class='add'>+{"bc+",		B(16,0,0),	B_MASK,	     PPCCOM,	PPCVLE,		{BOE, BI, BDP}},</div><div class='add'>+{"bc",		B(16,0,0),	B_MASK,	     COM,	PPCVLE,		{BO, BI, BD}},</div><div class='add'>+{"bcl-",	B(16,0,1),	B_MASK,	     PPCCOM,	PPCVLE,		{BOE, BI, BDM}},</div><div class='add'>+{"bcl+",	B(16,0,1),	B_MASK,	     PPCCOM,	PPCVLE,		{BOE, BI, BDP}},</div><div class='add'>+{"bcl",		B(16,0,1),	B_MASK,	     COM,	PPCVLE,		{BO, BI, BD}},</div><div class='add'>+{"bca-",	B(16,1,0),	B_MASK,	     PPCCOM,	PPCVLE,		{BOE, BI, BDMA}},</div><div class='add'>+{"bca+",	B(16,1,0),	B_MASK,	     PPCCOM,	PPCVLE,		{BOE, BI, BDPA}},</div><div class='add'>+{"bca",		B(16,1,0),	B_MASK,	     COM,	PPCVLE,		{BO, BI, BDA}},</div><div class='add'>+{"bcla-",	B(16,1,1),	B_MASK,	     PPCCOM,	PPCVLE,		{BOE, BI, BDMA}},</div><div class='add'>+{"bcla+",	B(16,1,1),	B_MASK,	     PPCCOM,	PPCVLE,		{BOE, BI, BDPA}},</div><div class='add'>+{"bcla",	B(16,1,1),	B_MASK,	     COM,	PPCVLE,		{BO, BI, BDA}},</div><div class='add'>+</div><div class='add'>+{"svc",		SC(17,0,0),	SC_MASK,     POWER,	PPCVLE,		{SVC_LEV, FL1, FL2}},</div><div class='add'>+{"svcl",	SC(17,0,1),	SC_MASK,     POWER,	PPCVLE,		{SVC_LEV, FL1, FL2}},</div><div class='add'>+{"sc",		SC(17,1,0),	SC_MASK,     PPC,	PPCVLE,		{LEV}},</div><div class='add'>+{"svca",	SC(17,1,0),	SC_MASK,     PWRCOM,	PPCVLE,		{SV}},</div><div class='add'>+{"svcla",	SC(17,1,1),	SC_MASK,     POWER,	PPCVLE,		{SV}},</div><div class='add'>+</div><div class='add'>+{"b",		B(18,0,0),	B_MASK,	     COM,	PPCVLE,		{LI}},</div><div class='add'>+{"bl",		B(18,0,1),	B_MASK,	     COM,	PPCVLE,		{LI}},</div><div class='add'>+{"ba",		B(18,1,0),	B_MASK,	     COM,	PPCVLE,		{LIA}},</div><div class='add'>+{"bla",		B(18,1,1),	B_MASK,	     COM,	PPCVLE,		{LIA}},</div><div class='add'>+</div><div class='add'>+{"mcrf",     XL(19,0), XLBB_MASK|(3&lt;&lt;21)|(3&lt;&lt;16), COM,	PPCVLE,		{BF, BFA}},</div><div class='add'>+</div><div class='add'>+{"addpcis",  DX(19,2),		DX_MASK,     POWER9,	PPCVLE,		{RT, DXD}},</div><div class='add'>+{"subpcis",  DX(19,2),		DX_MASK,     POWER9,	PPCVLE,		{RT, NDXD}},</div><div class='add'>+</div><div class='add'>+{"bdnzlr",   XLO(19,BODNZ,16,0),	XLBOBIBB_MASK, PPCCOM,	 PPCVLE,	{0}},</div><div class='add'>+{"bdnzlr-",  XLO(19,BODNZ,16,0),	XLBOBIBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{0}},</div><div class='add'>+{"bdnzlrl",  XLO(19,BODNZ,16,1),	XLBOBIBB_MASK, PPCCOM,	 PPCVLE,	{0}},</div><div class='add'>+{"bdnzlrl-", XLO(19,BODNZ,16,1),	XLBOBIBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{0}},</div><div class='add'>+{"bdnzlr+",  XLO(19,BODNZP,16,0),	XLBOBIBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{0}},</div><div class='add'>+{"bdnzlrl+", XLO(19,BODNZP,16,1),	XLBOBIBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{0}},</div><div class='add'>+{"bdzlr",    XLO(19,BODZ,16,0),		XLBOBIBB_MASK, PPCCOM,	 PPCVLE,	{0}},</div><div class='add'>+{"bdzlr-",   XLO(19,BODZ,16,0),		XLBOBIBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{0}},</div><div class='add'>+{"bdzlrl",   XLO(19,BODZ,16,1),		XLBOBIBB_MASK, PPCCOM,	 PPCVLE,	{0}},</div><div class='add'>+{"bdzlrl-",  XLO(19,BODZ,16,1),		XLBOBIBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{0}},</div><div class='add'>+{"bdzlr+",   XLO(19,BODZP,16,0),	XLBOBIBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{0}},</div><div class='add'>+{"bdzlrl+",  XLO(19,BODZP,16,1),	XLBOBIBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{0}},</div><div class='add'>+{"blr",	     XLO(19,BOU,16,0),		XLBOBIBB_MASK, PPCCOM,	 PPCVLE,	{0}},</div><div class='add'>+{"br",	     XLO(19,BOU,16,0),		XLBOBIBB_MASK, PWRCOM,	 PPCVLE,	{0}},</div><div class='add'>+{"blrl",     XLO(19,BOU,16,1),		XLBOBIBB_MASK, PPCCOM,	 PPCVLE,	{0}},</div><div class='add'>+{"brl",	     XLO(19,BOU,16,1),		XLBOBIBB_MASK, PWRCOM,	 PPCVLE,	{0}},</div><div class='add'>+{"bdnzlr-",  XLO(19,BODNZM4,16,0),	XLBOBIBB_MASK, ISA_V2,	 PPCVLE,	{0}},</div><div class='add'>+{"bdnzlrl-", XLO(19,BODNZM4,16,1),	XLBOBIBB_MASK, ISA_V2,	 PPCVLE,	{0}},</div><div class='add'>+{"bdnzlr+",  XLO(19,BODNZP4,16,0),	XLBOBIBB_MASK, ISA_V2,	 PPCVLE,	{0}},</div><div class='add'>+{"bdnzlrl+", XLO(19,BODNZP4,16,1),	XLBOBIBB_MASK, ISA_V2,	 PPCVLE,	{0}},</div><div class='add'>+{"bdzlr-",   XLO(19,BODZM4,16,0),	XLBOBIBB_MASK, ISA_V2,	 PPCVLE,	{0}},</div><div class='add'>+{"bdzlrl-",  XLO(19,BODZM4,16,1),	XLBOBIBB_MASK, ISA_V2,	 PPCVLE,	{0}},</div><div class='add'>+{"bdzlr+",   XLO(19,BODZP4,16,0),	XLBOBIBB_MASK, ISA_V2,	 PPCVLE,	{0}},</div><div class='add'>+{"bdzlrl+",  XLO(19,BODZP4,16,1),	XLBOBIBB_MASK, ISA_V2,	 PPCVLE,	{0}},</div><div class='add'>+</div><div class='add'>+{"bgelr",    XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgelr-",   XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bger",     XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnllr",    XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnllr-",   XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnlr",     XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgelrl",   XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgelrl-",  XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgerl",    XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnllrl",   XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnllrl-",  XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnlrl",    XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"blelr",    XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"blelr-",   XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bler",     XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnglr",    XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnglr-",   XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bngr",     XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"blelrl",   XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"blelrl-",  XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"blerl",    XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnglrl",   XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnglrl-",  XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bngrl",    XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnelr",    XLOCB(19,BOF,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnelr-",   XLOCB(19,BOF,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bner",     XLOCB(19,BOF,CBEQ,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnelrl",   XLOCB(19,BOF,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnelrl-",  XLOCB(19,BOF,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnerl",    XLOCB(19,BOF,CBEQ,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnslr",    XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnslr-",   XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnsr",     XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnulr",    XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnulr-",   XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnslrl",   XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnslrl-",  XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnsrl",    XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnulrl",   XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnulrl-",  XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgelr+",   XLOCB(19,BOFP,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnllr+",   XLOCB(19,BOFP,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgelrl+",  XLOCB(19,BOFP,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnllrl+",  XLOCB(19,BOFP,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"blelr+",   XLOCB(19,BOFP,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnglr+",   XLOCB(19,BOFP,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"blelrl+",  XLOCB(19,BOFP,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnglrl+",  XLOCB(19,BOFP,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnelr+",   XLOCB(19,BOFP,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnelrl+",  XLOCB(19,BOFP,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnslr+",   XLOCB(19,BOFP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnulr+",   XLOCB(19,BOFP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnslrl+",  XLOCB(19,BOFP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnulrl+",  XLOCB(19,BOFP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgelr-",   XLOCB(19,BOFM4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnllr-",   XLOCB(19,BOFM4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgelrl-",  XLOCB(19,BOFM4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnllrl-",  XLOCB(19,BOFM4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"blelr-",   XLOCB(19,BOFM4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnglr-",   XLOCB(19,BOFM4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"blelrl-",  XLOCB(19,BOFM4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnglrl-",  XLOCB(19,BOFM4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnelr-",   XLOCB(19,BOFM4,CBEQ,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnelrl-",  XLOCB(19,BOFM4,CBEQ,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnslr-",   XLOCB(19,BOFM4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnulr-",   XLOCB(19,BOFM4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnslrl-",  XLOCB(19,BOFM4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnulrl-",  XLOCB(19,BOFM4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgelr+",   XLOCB(19,BOFP4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnllr+",   XLOCB(19,BOFP4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgelrl+",  XLOCB(19,BOFP4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnllrl+",  XLOCB(19,BOFP4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"blelr+",   XLOCB(19,BOFP4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnglr+",   XLOCB(19,BOFP4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"blelrl+",  XLOCB(19,BOFP4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnglrl+",  XLOCB(19,BOFP4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnelr+",   XLOCB(19,BOFP4,CBEQ,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnelrl+",  XLOCB(19,BOFP4,CBEQ,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnslr+",   XLOCB(19,BOFP4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnulr+",   XLOCB(19,BOFP4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnslrl+",  XLOCB(19,BOFP4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnulrl+",  XLOCB(19,BOFP4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltlr",    XLOCB(19,BOT,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltlr-",   XLOCB(19,BOT,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bltr",     XLOCB(19,BOT,CBLT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltlrl",   XLOCB(19,BOT,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltlrl-",  XLOCB(19,BOT,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bltrl",    XLOCB(19,BOT,CBLT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtlr",    XLOCB(19,BOT,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtlr-",   XLOCB(19,BOT,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgtr",     XLOCB(19,BOT,CBGT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtlrl",   XLOCB(19,BOT,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtlrl-",  XLOCB(19,BOT,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgtrl",    XLOCB(19,BOT,CBGT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqlr",    XLOCB(19,BOT,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqlr-",   XLOCB(19,BOT,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"beqr",     XLOCB(19,BOT,CBEQ,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqlrl",   XLOCB(19,BOT,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqlrl-",  XLOCB(19,BOT,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"beqrl",    XLOCB(19,BOT,CBEQ,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsolr",    XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsolr-",   XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bsor",     XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunlr",    XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunlr-",   XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bsolrl",   XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsolrl-",  XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bsorl",    XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunlrl",   XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunlrl-",  XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bltlr+",   XLOCB(19,BOTP,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bltlrl+",  XLOCB(19,BOTP,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgtlr+",   XLOCB(19,BOTP,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgtlrl+",  XLOCB(19,BOTP,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"beqlr+",   XLOCB(19,BOTP,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"beqlrl+",  XLOCB(19,BOTP,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bsolr+",   XLOCB(19,BOTP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bunlr+",   XLOCB(19,BOTP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bsolrl+",  XLOCB(19,BOTP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bunlrl+",  XLOCB(19,BOTP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bltlr-",   XLOCB(19,BOTM4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltlrl-",  XLOCB(19,BOTM4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtlr-",   XLOCB(19,BOTM4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtlrl-",  XLOCB(19,BOTM4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqlr-",   XLOCB(19,BOTM4,CBEQ,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqlrl-",  XLOCB(19,BOTM4,CBEQ,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsolr-",   XLOCB(19,BOTM4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunlr-",   XLOCB(19,BOTM4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsolrl-",  XLOCB(19,BOTM4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunlrl-",  XLOCB(19,BOTM4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltlr+",   XLOCB(19,BOTP4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltlrl+",  XLOCB(19,BOTP4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtlr+",   XLOCB(19,BOTP4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtlrl+",  XLOCB(19,BOTP4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqlr+",   XLOCB(19,BOTP4,CBEQ,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqlrl+",  XLOCB(19,BOTP4,CBEQ,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsolr+",   XLOCB(19,BOTP4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunlr+",   XLOCB(19,BOTP4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsolrl+",  XLOCB(19,BOTP4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunlrl+",  XLOCB(19,BOTP4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+</div><div class='add'>+{"bdnzflr",  XLO(19,BODNZF,16,0),	XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bdnzflr-", XLO(19,BODNZF,16,0),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdnzflrl", XLO(19,BODNZF,16,1),	XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bdnzflrl-",XLO(19,BODNZF,16,1),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdnzflr+", XLO(19,BODNZFP,16,0),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdnzflrl+",XLO(19,BODNZFP,16,1),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdzflr",   XLO(19,BODZF,16,0),	XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bdzflr-",  XLO(19,BODZF,16,0),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdzflrl",  XLO(19,BODZF,16,1),	XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bdzflrl-", XLO(19,BODZF,16,1),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdzflr+",  XLO(19,BODZFP,16,0),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdzflrl+", XLO(19,BODZFP,16,1),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bflr",     XLO(19,BOF,16,0),		XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bflr-",    XLO(19,BOF,16,0),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bbfr",     XLO(19,BOF,16,0),		XLBOBB_MASK,   PWRCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bflrl",    XLO(19,BOF,16,1),		XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bflrl-",   XLO(19,BOF,16,1),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bbfrl",    XLO(19,BOF,16,1),		XLBOBB_MASK,   PWRCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bflr+",    XLO(19,BOFP,16,0),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bflrl+",   XLO(19,BOFP,16,1),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bflr-",    XLO(19,BOFM4,16,0),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"bflrl-",   XLO(19,BOFM4,16,1),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"bflr+",    XLO(19,BOFP4,16,0),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"bflrl+",   XLO(19,BOFP4,16,1),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"bdnztlr",  XLO(19,BODNZT,16,0),	XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bdnztlr-", XLO(19,BODNZT,16,0),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdnztlrl", XLO(19,BODNZT,16,1),	XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bdnztlrl-", XLO(19,BODNZT,16,1),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdnztlr+", XLO(19,BODNZTP,16,0),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdnztlrl+", XLO(19,BODNZTP,16,1),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdztlr",   XLO(19,BODZT,16,0),	XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bdztlr-",  XLO(19,BODZT,16,0),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdztlrl",  XLO(19,BODZT,16,1),	XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bdztlrl-", XLO(19,BODZT,16,1),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdztlr+",  XLO(19,BODZTP,16,0),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bdztlrl+", XLO(19,BODZTP,16,1),	XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"btlr",     XLO(19,BOT,16,0),		XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"btlr-",    XLO(19,BOT,16,0),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bbtr",     XLO(19,BOT,16,0),		XLBOBB_MASK,   PWRCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"btlrl",    XLO(19,BOT,16,1),		XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"btlrl-",   XLO(19,BOT,16,1),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bbtrl",    XLO(19,BOT,16,1),		XLBOBB_MASK,   PWRCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"btlr+",    XLO(19,BOTP,16,0),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"btlrl+",   XLO(19,BOTP,16,1),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"btlr-",    XLO(19,BOTM4,16,0),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"btlrl-",   XLO(19,BOTM4,16,1),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"btlr+",    XLO(19,BOTP4,16,0),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"btlrl+",   XLO(19,BOTP4,16,1),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+</div><div class='add'>+{"bclr-",    XLYLK(19,16,0,0),		XLYBB_MASK,    PPCCOM,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bclrl-",   XLYLK(19,16,0,1),		XLYBB_MASK,    PPCCOM,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bclr+",    XLYLK(19,16,1,0),		XLYBB_MASK,    PPCCOM,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bclrl+",   XLYLK(19,16,1,1),		XLYBB_MASK,    PPCCOM,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bclr",     XLLK(19,16,0),		XLBH_MASK,     PPCCOM,	 PPCVLE,	{BO, BI, BH}},</div><div class='add'>+{"bcr",	     XLLK(19,16,0),		XLBB_MASK,     PWRCOM,	 PPCVLE,	{BO, BI}},</div><div class='add'>+{"bclrl",    XLLK(19,16,1),		XLBH_MASK,     PPCCOM,	 PPCVLE,	{BO, BI, BH}},</div><div class='add'>+{"bcrl",     XLLK(19,16,1),		XLBB_MASK,     PWRCOM,	 PPCVLE,	{BO, BI}},</div><div class='add'>+</div><div class='add'>+{"rfid",	XL(19,18),	0xffffffff,  PPC64,	PPCVLE,	{0}},</div><div class='add'>+</div><div class='add'>+{"crnot",	XL(19,33),	XL_MASK,     PPCCOM,	PPCVLE,		{BT, BA, BBA}},</div><div class='add'>+{"crnor",	XL(19,33),	XL_MASK,     COM,	PPCVLE,		{BT, BA, BB}},</div><div class='add'>+{"rfmci",	X(19,38),    0xffffffff, PPCRFMCI|PPCA2|PPC476, PPCVLE,	{0}},</div><div class='add'>+</div><div class='add'>+{"rfdi",	XL(19,39),	0xffffffff,  E500MC,	PPCVLE,		{0}},</div><div class='add'>+{"rfi",		XL(19,50),	0xffffffff,  COM,	PPCVLE,		{0}},</div><div class='add'>+{"rfci",	XL(19,51), 0xffffffff, PPC403|BOOKE|PPCE300|PPCA2|PPC476, PPCVLE, {0}},</div><div class='add'>+</div><div class='add'>+{"rfsvc",	XL(19,82),	0xffffffff,  POWER,	PPCVLE,		{0}},</div><div class='add'>+</div><div class='add'>+{"rfgi",	XL(19,102),   0xffffffff, E500MC|PPCA2,	PPCVLE,		{0}},</div><div class='add'>+</div><div class='add'>+{"crandc",	XL(19,129),	XL_MASK,     COM,	PPCVLE,		{BT, BA, BB}},</div><div class='add'>+</div><div class='add'>+{"rfebb",	XL(19,146),	XLS_MASK,    POWER8,	PPCVLE,		{SXL}},</div><div class='add'>+</div><div class='add'>+{"isync",	XL(19,150),	0xffffffff,  PPCCOM,	PPCVLE,		{0}},</div><div class='add'>+{"ics",		XL(19,150),	0xffffffff,  PWRCOM,	PPCVLE,		{0}},</div><div class='add'>+</div><div class='add'>+{"crclr",	XL(19,193),	XL_MASK,     PPCCOM,	PPCVLE,		{BT, BAT, BBA}},</div><div class='add'>+{"crxor",	XL(19,193),	XL_MASK,     COM,	PPCVLE,		{BT, BA, BB}},</div><div class='add'>+</div><div class='add'>+{"dnh",		X(19,198),	X_MASK,	     E500MC,	PPCVLE,		{DUI, DUIS}},</div><div class='add'>+</div><div class='add'>+{"crnand",	XL(19,225),	XL_MASK,     COM,	PPCVLE,		{BT, BA, BB}},</div><div class='add'>+</div><div class='add'>+{"crand",	XL(19,257),	XL_MASK,     COM,	PPCVLE,		{BT, BA, BB}},</div><div class='add'>+</div><div class='add'>+{"hrfid",	XL(19,274),    0xffffffff, POWER5|CELL, PPC476|PPCVLE,	{0}},</div><div class='add'>+</div><div class='add'>+{"crset",	XL(19,289),	XL_MASK,     PPCCOM,	PPCVLE,		{BT, BAT, BBA}},</div><div class='add'>+{"creqv",	XL(19,289),	XL_MASK,     COM,	PPCVLE,		{BT, BA, BB}},</div><div class='add'>+</div><div class='add'>+{"urfid",	XL(19,306),	0xffffffff,  POWER9,	PPCVLE,		{0}},</div><div class='add'>+{"stop",	XL(19,370),	0xffffffff,  POWER9,	PPCVLE,		{0}},</div><div class='add'>+</div><div class='add'>+{"doze",	XL(19,402),	0xffffffff,  POWER6,	POWER9|PPCVLE,	{0}},</div><div class='add'>+</div><div class='add'>+{"crorc",	XL(19,417),	XL_MASK,     COM,	PPCVLE,		{BT, BA, BB}},</div><div class='add'>+</div><div class='add'>+{"nap",		XL(19,434),	0xffffffff,  POWER6,	POWER9|PPCVLE,	{0}},</div><div class='add'>+</div><div class='add'>+{"crmove",	XL(19,449),	XL_MASK,     PPCCOM,	PPCVLE,		{BT, BA, BBA}},</div><div class='add'>+{"cror",	XL(19,449),	XL_MASK,     COM,	PPCVLE,		{BT, BA, BB}},</div><div class='add'>+</div><div class='add'>+{"sleep",	XL(19,466),	0xffffffff,  POWER6,	POWER9|PPCVLE,	{0}},</div><div class='add'>+{"rvwinkle",	XL(19,498),	0xffffffff,  POWER6,	POWER9|PPCVLE,	{0}},</div><div class='add'>+</div><div class='add'>+{"bctr",    XLO(19,BOU,528,0),		XLBOBIBB_MASK, COM,	 PPCVLE,	{0}},</div><div class='add'>+{"bctrl",   XLO(19,BOU,528,1),		XLBOBIBB_MASK, COM,	 PPCVLE,	{0}},</div><div class='add'>+</div><div class='add'>+{"bgectr",  XLOCB(19,BOF,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgectr-", XLOCB(19,BOF,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnlctr",  XLOCB(19,BOF,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnlctr-", XLOCB(19,BOF,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgectrl", XLOCB(19,BOF,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgectrl-",XLOCB(19,BOF,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnlctrl", XLOCB(19,BOF,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnlctrl-",XLOCB(19,BOF,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"blectr",  XLOCB(19,BOF,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"blectr-", XLOCB(19,BOF,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bngctr",  XLOCB(19,BOF,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bngctr-", XLOCB(19,BOF,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"blectrl", XLOCB(19,BOF,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"blectrl-",XLOCB(19,BOF,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bngctrl", XLOCB(19,BOF,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bngctrl-",XLOCB(19,BOF,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnectr",  XLOCB(19,BOF,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnectr-", XLOCB(19,BOF,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnectrl", XLOCB(19,BOF,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnectrl-",XLOCB(19,BOF,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnsctr",  XLOCB(19,BOF,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnsctr-", XLOCB(19,BOF,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnuctr",  XLOCB(19,BOF,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnuctr-", XLOCB(19,BOF,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnsctrl", XLOCB(19,BOF,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnsctrl-",XLOCB(19,BOF,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnuctrl", XLOCB(19,BOF,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnuctrl-",XLOCB(19,BOF,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgectr+", XLOCB(19,BOFP,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnlctr+", XLOCB(19,BOFP,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgectrl+",XLOCB(19,BOFP,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnlctrl+",XLOCB(19,BOFP,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"blectr+", XLOCB(19,BOFP,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bngctr+", XLOCB(19,BOFP,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"blectrl+",XLOCB(19,BOFP,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bngctrl+",XLOCB(19,BOFP,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnectr+", XLOCB(19,BOFP,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnectrl+",XLOCB(19,BOFP,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnsctr+", XLOCB(19,BOFP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnuctr+", XLOCB(19,BOFP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnsctrl+",XLOCB(19,BOFP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bnuctrl+",XLOCB(19,BOFP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgectr-", XLOCB(19,BOFM4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnlctr-", XLOCB(19,BOFM4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgectrl-",XLOCB(19,BOFM4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnlctrl-",XLOCB(19,BOFM4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"blectr-", XLOCB(19,BOFM4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bngctr-", XLOCB(19,BOFM4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"blectrl-",XLOCB(19,BOFM4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bngctrl-",XLOCB(19,BOFM4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnectr-", XLOCB(19,BOFM4,CBEQ,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnectrl-",XLOCB(19,BOFM4,CBEQ,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnsctr-", XLOCB(19,BOFM4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnuctr-", XLOCB(19,BOFM4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnsctrl-",XLOCB(19,BOFM4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnuctrl-",XLOCB(19,BOFM4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgectr+", XLOCB(19,BOFP4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnlctr+", XLOCB(19,BOFP4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgectrl+",XLOCB(19,BOFP4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnlctrl+",XLOCB(19,BOFP4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"blectr+", XLOCB(19,BOFP4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bngctr+", XLOCB(19,BOFP4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"blectrl+",XLOCB(19,BOFP4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bngctrl+",XLOCB(19,BOFP4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnectr+", XLOCB(19,BOFP4,CBEQ,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnectrl+",XLOCB(19,BOFP4,CBEQ,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnsctr+", XLOCB(19,BOFP4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnuctr+", XLOCB(19,BOFP4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnsctrl+",XLOCB(19,BOFP4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bnuctrl+",XLOCB(19,BOFP4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltctr",  XLOCB(19,BOT,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltctr-", XLOCB(19,BOT,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bltctrl", XLOCB(19,BOT,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltctrl-",XLOCB(19,BOT,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgtctr",  XLOCB(19,BOT,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtctr-", XLOCB(19,BOT,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgtctrl", XLOCB(19,BOT,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtctrl-",XLOCB(19,BOT,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"beqctr",  XLOCB(19,BOT,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqctr-", XLOCB(19,BOT,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"beqctrl", XLOCB(19,BOT,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqctrl-",XLOCB(19,BOT,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bsoctr",  XLOCB(19,BOT,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsoctr-", XLOCB(19,BOT,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bunctr",  XLOCB(19,BOT,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunctr-", XLOCB(19,BOT,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bsoctrl", XLOCB(19,BOT,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsoctrl-",XLOCB(19,BOT,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bunctrl", XLOCB(19,BOT,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunctrl-",XLOCB(19,BOT,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bltctr+", XLOCB(19,BOTP,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bltctrl+",XLOCB(19,BOTP,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgtctr+", XLOCB(19,BOTP,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bgtctrl+",XLOCB(19,BOTP,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"beqctr+", XLOCB(19,BOTP,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"beqctrl+",XLOCB(19,BOTP,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bsoctr+", XLOCB(19,BOTP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bunctr+", XLOCB(19,BOTP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bsoctrl+",XLOCB(19,BOTP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bunctrl+",XLOCB(19,BOTP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 ISA_V2|PPCVLE,	{CR}},</div><div class='add'>+{"bltctr-", XLOCB(19,BOTM4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltctrl-",XLOCB(19,BOTM4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtctr-", XLOCB(19,BOTM4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtctrl-",XLOCB(19,BOTM4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqctr-", XLOCB(19,BOTM4,CBEQ,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqctrl-",XLOCB(19,BOTM4,CBEQ,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsoctr-", XLOCB(19,BOTM4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunctr-", XLOCB(19,BOTM4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsoctrl-",XLOCB(19,BOTM4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunctrl-",XLOCB(19,BOTM4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltctr+", XLOCB(19,BOTP4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bltctrl+",XLOCB(19,BOTP4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtctr+", XLOCB(19,BOTP4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bgtctrl+",XLOCB(19,BOTP4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqctr+", XLOCB(19,BOTP4,CBEQ,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"beqctrl+",XLOCB(19,BOTP4,CBEQ,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsoctr+", XLOCB(19,BOTP4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunctr+", XLOCB(19,BOTP4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bsoctrl+",XLOCB(19,BOTP4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+{"bunctrl+",XLOCB(19,BOTP4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCVLE,	{CR}},</div><div class='add'>+</div><div class='add'>+{"bfctr",   XLO(19,BOF,528,0),		XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bfctr-",  XLO(19,BOF,528,0),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bfctrl",  XLO(19,BOF,528,1),		XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"bfctrl-", XLO(19,BOF,528,1),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bfctr+",  XLO(19,BOFP,528,0),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bfctrl+", XLO(19,BOFP,528,1),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"bfctr-",  XLO(19,BOFM4,528,0),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"bfctrl-", XLO(19,BOFM4,528,1),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"bfctr+",  XLO(19,BOFP4,528,0),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"bfctrl+", XLO(19,BOFP4,528,1),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"btctr",   XLO(19,BOT,528,0),		XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"btctr-",  XLO(19,BOT,528,0),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"btctrl",  XLO(19,BOT,528,1),		XLBOBB_MASK,   PPCCOM,	 PPCVLE,	{BI}},</div><div class='add'>+{"btctrl-", XLO(19,BOT,528,1),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"btctr+",  XLO(19,BOTP,528,0),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"btctrl+", XLO(19,BOTP,528,1),		XLBOBB_MASK,   PPCCOM,	 ISA_V2|PPCVLE,	{BI}},</div><div class='add'>+{"btctr-",  XLO(19,BOTM4,528,0),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"btctrl-", XLO(19,BOTM4,528,1),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"btctr+",  XLO(19,BOTP4,528,0),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+{"btctrl+", XLO(19,BOTP4,528,1),	XLBOBB_MASK,   ISA_V2,	 PPCVLE,	{BI}},</div><div class='add'>+</div><div class='add'>+{"bcctr-",  XLYLK(19,528,0,0),		XLYBB_MASK,    PPCCOM,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bcctrl-", XLYLK(19,528,0,1),		XLYBB_MASK,    PPCCOM,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bcctr+",  XLYLK(19,528,1,0),		XLYBB_MASK,    PPCCOM,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bcctrl+", XLYLK(19,528,1,1),		XLYBB_MASK,    PPCCOM,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bcctr",   XLLK(19,528,0),		XLBH_MASK,     PPCCOM,	 PPCVLE,	{BO, BI, BH}},</div><div class='add'>+{"bcc",	    XLLK(19,528,0),		XLBB_MASK,     PWRCOM,	 PPCVLE,	{BO, BI}},</div><div class='add'>+{"bcctrl",  XLLK(19,528,1),		XLBH_MASK,     PPCCOM,	 PPCVLE,	{BO, BI, BH}},</div><div class='add'>+{"bccl",    XLLK(19,528,1),		XLBB_MASK,     PWRCOM,	 PPCVLE,	{BO, BI}},</div><div class='add'>+</div><div class='add'>+{"bctar-",  XLYLK(19,560,0,0),		XLYBB_MASK,    POWER8,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bctarl-", XLYLK(19,560,0,1),		XLYBB_MASK,    POWER8,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bctar+",  XLYLK(19,560,1,0),		XLYBB_MASK,    POWER8,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bctarl+", XLYLK(19,560,1,1),		XLYBB_MASK,    POWER8,	 PPCVLE,	{BOE, BI}},</div><div class='add'>+{"bctar",   XLLK(19,560,0),		XLBH_MASK,     POWER8,	 PPCVLE,	{BO, BI, BH}},</div><div class='add'>+{"bctarl",  XLLK(19,560,1),		XLBH_MASK,     POWER8,	 PPCVLE,	{BO, BI, BH}},</div><div class='add'>+</div><div class='add'>+{"rlwimi",	M(20,0),	M_MASK,	     PPCCOM,	PPCVLE,		{RA, RS, SH, MBE, ME}},</div><div class='add'>+{"rlimi",	M(20,0),	M_MASK,	     PWRCOM,	PPCVLE,		{RA, RS, SH, MBE, ME}},</div><div class='add'>+</div><div class='add'>+{"rlwimi.",	M(20,1),	M_MASK,	     PPCCOM,	PPCVLE,		{RA, RS, SH, MBE, ME}},</div><div class='add'>+{"rlimi.",	M(20,1),	M_MASK,	     PWRCOM,	PPCVLE,		{RA, RS, SH, MBE, ME}},</div><div class='add'>+</div><div class='add'>+{"rotlwi",	MME(21,31,0),	MMBME_MASK,  PPCCOM,	PPCVLE,		{RA, RS, SH}},</div><div class='add'>+{"clrlwi",	MME(21,31,0),	MSHME_MASK,  PPCCOM,	PPCVLE,		{RA, RS, MB}},</div><div class='add'>+{"rlwinm",	M(21,0),	M_MASK,	     PPCCOM,	PPCVLE,		{RA, RS, SH, MBE, ME}},</div><div class='add'>+{"rlinm",	M(21,0),	M_MASK,	     PWRCOM,	PPCVLE,		{RA, RS, SH, MBE, ME}},</div><div class='add'>+{"rotlwi.",	MME(21,31,1),	MMBME_MASK,  PPCCOM,	PPCVLE,		{RA, RS, SH}},</div><div class='add'>+{"clrlwi.",	MME(21,31,1),	MSHME_MASK,  PPCCOM,	PPCVLE,		{RA, RS, MB}},</div><div class='add'>+{"rlwinm.",	M(21,1),	M_MASK,	     PPCCOM,	PPCVLE,		{RA, RS, SH, MBE, ME}},</div><div class='add'>+{"rlinm.",	M(21,1),	M_MASK,	     PWRCOM,	PPCVLE,		{RA, RS, SH, MBE, ME}},</div><div class='add'>+</div><div class='add'>+{"rlmi",	M(22,0),	M_MASK,	     M601,	PPCVLE,		{RA, RS, RB, MBE, ME}},</div><div class='add'>+{"rlmi.",	M(22,1),	M_MASK,	     M601,	PPCVLE,		{RA, RS, RB, MBE, ME}},</div><div class='add'>+</div><div class='add'>+{"rotlw",	MME(23,31,0),	MMBME_MASK,  PPCCOM,	PPCVLE,		{RA, RS, RB}},</div><div class='add'>+{"rlwnm",	M(23,0),	M_MASK,	     PPCCOM,	PPCVLE,		{RA, RS, RB, MBE, ME}},</div><div class='add'>+{"rlnm",	M(23,0),	M_MASK,	     PWRCOM,	PPCVLE,		{RA, RS, RB, MBE, ME}},</div><div class='add'>+{"rotlw.",	MME(23,31,1),	MMBME_MASK,  PPCCOM,	PPCVLE,		{RA, RS, RB}},</div><div class='add'>+{"rlwnm.",	M(23,1),	M_MASK,	     PPCCOM,	PPCVLE,		{RA, RS, RB, MBE, ME}},</div><div class='add'>+{"rlnm.",	M(23,1),	M_MASK,	     PWRCOM,	PPCVLE,		{RA, RS, RB, MBE, ME}},</div><div class='add'>+</div><div class='add'>+{"nop",		OP(24),		0xffffffff,  PPCCOM,	PPCVLE,		{0}},</div><div class='add'>+{"ori",		OP(24),		OP_MASK,     PPCCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+{"oril",	OP(24),		OP_MASK,     PWRCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+</div><div class='add'>+{"oris",	OP(25),		OP_MASK,     PPCCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+{"oriu",	OP(25),		OP_MASK,     PWRCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+</div><div class='add'>+{"xnop",	OP(26),		0xffffffff,  PPCCOM,	PPCVLE,		{0}},</div><div class='add'>+{"xori",	OP(26),		OP_MASK,     PPCCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+{"xoril",	OP(26),		OP_MASK,     PWRCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+</div><div class='add'>+{"xoris",	OP(27),		OP_MASK,     PPCCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+{"xoriu",	OP(27),		OP_MASK,     PWRCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+</div><div class='add'>+{"andi.",	OP(28),		OP_MASK,     PPCCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+{"andil.",	OP(28),		OP_MASK,     PWRCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+</div><div class='add'>+{"andis.",	OP(29),		OP_MASK,     PPCCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+{"andiu.",	OP(29),		OP_MASK,     PWRCOM,	PPCVLE,		{RA, RS, UI}},</div><div class='add'>+</div><div class='add'>+{"rotldi",	MD(30,0,0),	MDMB_MASK,   PPC64,	PPCVLE,		{RA, RS, SH6}},</div><div class='add'>+{"clrldi",	MD(30,0,0),	MDSH_MASK,   PPC64,	PPCVLE,		{RA, RS, MB6}},</div><div class='add'>+{"rldicl",	MD(30,0,0),	MD_MASK,     PPC64,	PPCVLE,		{RA, RS, SH6, MB6}},</div><div class='add'>+{"rotldi.",	MD(30,0,1),	MDMB_MASK,   PPC64,	PPCVLE,		{RA, RS, SH6}},</div><div class='add'>+{"clrldi.",	MD(30,0,1),	MDSH_MASK,   PPC64,	PPCVLE,		{RA, RS, MB6}},</div><div class='add'>+{"rldicl.",	MD(30,0,1),	MD_MASK,     PPC64,	PPCVLE,		{RA, RS, SH6, MB6}},</div><div class='add'>+</div><div class='add'>+{"rldicr",	MD(30,1,0),	MD_MASK,     PPC64,	PPCVLE,		{RA, RS, SH6, ME6}},</div><div class='add'>+{"rldicr.",	MD(30,1,1),	MD_MASK,     PPC64,	PPCVLE,		{RA, RS, SH6, ME6}},</div><div class='add'>+</div><div class='add'>+{"rldic",	MD(30,2,0),	MD_MASK,     PPC64,	PPCVLE,		{RA, RS, SH6, MB6}},</div><div class='add'>+{"rldic.",	MD(30,2,1),	MD_MASK,     PPC64,	PPCVLE,		{RA, RS, SH6, MB6}},</div><div class='add'>+</div><div class='add'>+{"rldimi",	MD(30,3,0),	MD_MASK,     PPC64,	PPCVLE,		{RA, RS, SH6, MB6}},</div><div class='add'>+{"rldimi.",	MD(30,3,1),	MD_MASK,     PPC64,	PPCVLE,		{RA, RS, SH6, MB6}},</div><div class='add'>+</div><div class='add'>+{"rotld",	MDS(30,8,0),	MDSMB_MASK,  PPC64,	PPCVLE,		{RA, RS, RB}},</div><div class='add'>+{"rldcl",	MDS(30,8,0),	MDS_MASK,    PPC64,	PPCVLE,		{RA, RS, RB, MB6}},</div><div class='add'>+{"rotld.",	MDS(30,8,1),	MDSMB_MASK,  PPC64,	PPCVLE,		{RA, RS, RB}},</div><div class='add'>+{"rldcl.",	MDS(30,8,1),	MDS_MASK,    PPC64,	PPCVLE,		{RA, RS, RB, MB6}},</div><div class='add'>+</div><div class='add'>+{"rldcr",	MDS(30,9,0),	MDS_MASK,    PPC64,	PPCVLE,		{RA, RS, RB, ME6}},</div><div class='add'>+{"rldcr.",	MDS(30,9,1),	MDS_MASK,    PPC64,	PPCVLE,		{RA, RS, RB, ME6}},</div><div class='add'>+</div><div class='add'>+{"cmpw",	XOPL(31,0,0),	XCMPL_MASK,  PPCCOM,	0,		{OBF, RA, RB}},</div><div class='add'>+{"cmpd",	XOPL(31,0,1),	XCMPL_MASK,  PPC64,	0,		{OBF, RA, RB}},</div><div class='add'>+{"cmp",		X(31,0),	XCMP_MASK,   PPC,	0,		{BF, L32OPT, RA, RB}},</div><div class='add'>+{"cmp",		X(31,0),	XCMPL_MASK,  PWRCOM,	PPC,		{BF, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"twlgt",	XTO(31,4,TOLGT), XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tlgt",	XTO(31,4,TOLGT), XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twllt",	XTO(31,4,TOLLT), XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tllt",	XTO(31,4,TOLLT), XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"tweq",	XTO(31,4,TOEQ),	 XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"teq",		XTO(31,4,TOEQ),	 XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twlge",	XTO(31,4,TOLGE), XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tlge",	XTO(31,4,TOLGE), XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twlnl",	XTO(31,4,TOLNL), XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tlnl",	XTO(31,4,TOLNL), XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twlle",	XTO(31,4,TOLLE), XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tlle",	XTO(31,4,TOLLE), XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twlng",	XTO(31,4,TOLNG), XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tlng",	XTO(31,4,TOLNG), XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twgt",	XTO(31,4,TOGT),	 XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tgt",		XTO(31,4,TOGT),	 XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twge",	XTO(31,4,TOGE),	 XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tge",		XTO(31,4,TOGE),	 XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twnl",	XTO(31,4,TONL),	 XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tnl",		XTO(31,4,TONL),	 XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twlt",	XTO(31,4,TOLT),	 XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tlt",		XTO(31,4,TOLT),	 XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twle",	XTO(31,4,TOLE),	 XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tle",		XTO(31,4,TOLE),	 XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twng",	XTO(31,4,TONG),	 XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tng",		XTO(31,4,TONG),	 XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"twne",	XTO(31,4,TONE),	 XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tne",		XTO(31,4,TONE),	 XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"trap",	XTO(31,4,TOU),	 0xffffffff, PPCCOM,	0,		{0}},</div><div class='add'>+{"twu",		XTO(31,4,TOU),	 XTO_MASK,   PPCCOM,	0,		{RA, RB}},</div><div class='add'>+{"tu",		XTO(31,4,TOU),	 XTO_MASK,   PWRCOM,	0,		{RA, RB}},</div><div class='add'>+{"tw",		X(31,4),	 X_MASK,     PPCCOM,	0,		{TO, RA, RB}},</div><div class='add'>+{"t",		X(31,4),	 X_MASK,     PWRCOM,	0,		{TO, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"lvsl",	X(31,6),	X_MASK,	     PPCVEC,	0,		{VD, RA0, RB}},</div><div class='add'>+{"lvebx",	X(31,7),	X_MASK,	     PPCVEC,	0,		{VD, RA0, RB}},</div><div class='add'>+{"lbfcmx",	APU(31,7,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"subfc",	XO(31,8,0,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"sf",		XO(31,8,0,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"subc",	XO(31,8,0,0),	XO_MASK,     PPCCOM,	0,		{RT, RB, RA}},</div><div class='add'>+{"subfc.",	XO(31,8,0,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"sf.",		XO(31,8,0,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"subc.",	XO(31,8,0,1),	XO_MASK,     PPCCOM,	0,		{RT, RB, RA}},</div><div class='add'>+</div><div class='add'>+{"mulhdu",	XO(31,9,0,0),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+{"mulhdu.",	XO(31,9,0,1),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"addc",	XO(31,10,0,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"a",		XO(31,10,0,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"addc.",	XO(31,10,0,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"a.",		XO(31,10,0,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"mulhwu",	XO(31,11,0,0),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+{"mulhwu.",	XO(31,11,0,1),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"lxsiwzx",	X(31,12),	XX1_MASK,    PPCVSX2,	0,		{XT6, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"isellt",	X(31,15),	X_MASK,	     PPCISEL,	0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"tlbilxlpid",	XTO(31,18,0),	XTO_MASK, E500MC|PPCA2,	0,		{0}},</div><div class='add'>+{"tlbilxpid",	XTO(31,18,1),	XTO_MASK, E500MC|PPCA2,	0,		{0}},</div><div class='add'>+{"tlbilxva",	XTO(31,18,3),	XTO_MASK, E500MC|PPCA2,	0,		{RA0, RB}},</div><div class='add'>+{"tlbilx",	X(31,18),	X_MASK,	  E500MC|PPCA2,	0,		{T, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"mfcr",	XFXM(31,19,0,0), XFXFXM_MASK, COM,	0,		{RT, FXM4}},</div><div class='add'>+{"mfocrf",	XFXM(31,19,0,1), XFXFXM_MASK, COM,	0,		{RT, FXM}},</div><div class='add'>+</div><div class='add'>+{"lwarx",	X(31,20),	XEH_MASK,    PPC,	0,		{RT, RA0, RB, EH}},</div><div class='add'>+</div><div class='add'>+{"ldx",		X(31,21),	X_MASK,	     PPC64,	0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"icbt",	X(31,22),  X_MASK, BOOKE|PPCE300|PPCA2|PPC476, 0,	{CT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"lwzx",	X(31,23),	X_MASK,	     PPCCOM,	0,		{RT, RA0, RB}},</div><div class='add'>+{"lx",		X(31,23),	X_MASK,	     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"slw",		XRC(31,24,0),	X_MASK,	     PPCCOM,	0,		{RA, RS, RB}},</div><div class='add'>+{"sl",		XRC(31,24,0),	X_MASK,	     PWRCOM,	0,		{RA, RS, RB}},</div><div class='add'>+{"slw.",	XRC(31,24,1),	X_MASK,	     PPCCOM,	0,		{RA, RS, RB}},</div><div class='add'>+{"sl.",		XRC(31,24,1),	X_MASK,	     PWRCOM,	0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"cntlzw",	XRC(31,26,0),	XRB_MASK,    PPCCOM,	0,		{RA, RS}},</div><div class='add'>+{"cntlz",	XRC(31,26,0),	XRB_MASK,    PWRCOM,	0,		{RA, RS}},</div><div class='add'>+{"cntlzw.",	XRC(31,26,1),	XRB_MASK,    PPCCOM,	0,		{RA, RS}},</div><div class='add'>+{"cntlz.",	XRC(31,26,1),	XRB_MASK,    PWRCOM,	0,		{RA, RS}},</div><div class='add'>+</div><div class='add'>+{"sld",		XRC(31,27,0),	X_MASK,	     PPC64,	0,		{RA, RS, RB}},</div><div class='add'>+{"sld.",	XRC(31,27,1),	X_MASK,	     PPC64,	0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"and",		XRC(31,28,0),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+{"and.",	XRC(31,28,1),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"maskg",	XRC(31,29,0),	X_MASK,	     M601,	PPCA2,		{RA, RS, RB}},</div><div class='add'>+{"maskg.",	XRC(31,29,1),	X_MASK,	     M601,	PPCA2,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"ldepx",	X(31,29),	X_MASK,	  E500MC|PPCA2, 0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"waitasec",	X(31,30),      XRTRARB_MASK, POWER8,	POWER9,		{0}},</div><div class='add'>+{"wait",	X(31,30),	XWC_MASK,    POWER9,	0,		{WC}},</div><div class='add'>+</div><div class='add'>+{"lwepx",	X(31,31),	X_MASK,	  E500MC|PPCA2, 0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"cmplw",	XOPL(31,32,0),	XCMPL_MASK,  PPCCOM,	0,		{OBF, RA, RB}},</div><div class='add'>+{"cmpld",	XOPL(31,32,1),	XCMPL_MASK,  PPC64,	0,		{OBF, RA, RB}},</div><div class='add'>+{"cmpl",	X(31,32),	XCMP_MASK,   PPC,	0,		{BF, L32OPT, RA, RB}},</div><div class='add'>+{"cmpl",	X(31,32),	XCMPL_MASK,  PWRCOM,	PPC,		{BF, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"lvsr",	X(31,38),	X_MASK,	     PPCVEC,	0,		{VD, RA0, RB}},</div><div class='add'>+{"lvehx",	X(31,39),	X_MASK,	     PPCVEC,	0,		{VD, RA0, RB}},</div><div class='add'>+{"lhfcmx",	APU(31,39,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"mviwsplt",	X(31,46),	X_MASK,	     PPCVEC2,	0,		{VD, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"iselgt",	X(31,47),	X_MASK,	     PPCISEL,	0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"lvewx",	X(31,71),	X_MASK,	     PPCVEC,	0,		{VD, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"addg6s",	XO(31,74,0,0),	XO_MASK,     POWER6,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"lxsiwax",	X(31,76),	XX1_MASK,    PPCVSX2,	0,		{XT6, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"iseleq",	X(31,79),	X_MASK,	     PPCISEL,	0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"isel",	XISEL(31,15), XISEL_MASK, PPCISEL|TITAN, 0,		{RT, RA0, RB, CRB}},</div><div class='add'>+</div><div class='add'>+{"subf",	XO(31,40,0,0),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+{"sub",		XO(31,40,0,0),	XO_MASK,     PPC,	0,		{RT, RB, RA}},</div><div class='add'>+{"subf.",	XO(31,40,0,1),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+{"sub.",	XO(31,40,0,1),	XO_MASK,     PPC,	0,		{RT, RB, RA}},</div><div class='add'>+</div><div class='add'>+{"mfvsrd",	X(31,51),	XX1RB_MASK,   PPCVSX2,	0,		{RA, XS6}},</div><div class='add'>+{"mffprd",	X(31,51),	XX1RB_MASK|1, PPCVSX2,	0,		{RA, FRS}},</div><div class='add'>+{"mfvrd",	X(31,51)|1,	XX1RB_MASK|1, PPCVSX2,	0,		{RA, VS}},</div><div class='add'>+{"eratilx",	X(31,51),	X_MASK,	     PPCA2,	0,		{ERAT_T, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"lbarx",	X(31,52),	XEH_MASK, POWER8|E6500, 0,		{RT, RA0, RB, EH}},</div><div class='add'>+</div><div class='add'>+{"ldux",	X(31,53),	X_MASK,	     PPC64,	0,		{RT, RAL, RB}},</div><div class='add'>+</div><div class='add'>+{"dcbst",	X(31,54),	XRT_MASK,    PPC,	0,		{RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"lwzux",	X(31,55),	X_MASK,	     PPCCOM,	0,		{RT, RAL, RB}},</div><div class='add'>+{"lux",		X(31,55),	X_MASK,	     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"cntlzd",	XRC(31,58,0),	XRB_MASK,    PPC64,	0,		{RA, RS}},</div><div class='add'>+{"cntlzd.",	XRC(31,58,1),	XRB_MASK,    PPC64,	0,		{RA, RS}},</div><div class='add'>+</div><div class='add'>+{"andc",	XRC(31,60,0),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+{"andc.",	XRC(31,60,1),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"waitrsv",	X(31,62)|(1&lt;&lt;21), 0xffffffff, E500MC|PPCA2, 0,		{0}},</div><div class='add'>+{"waitimpl",	X(31,62)|(2&lt;&lt;21), 0xffffffff, E500MC|PPCA2, 0,		{0}},</div><div class='add'>+{"wait",	X(31,62),	XWC_MASK,    E500MC|PPCA2, 0,		{WC}},</div><div class='add'>+</div><div class='add'>+{"dcbstep",	XRT(31,63,0),	XRT_MASK,    E500MC|PPCA2, 0,		{RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"tdlgt",	XTO(31,68,TOLGT), XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdllt",	XTO(31,68,TOLLT), XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdeq",	XTO(31,68,TOEQ),  XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdlge",	XTO(31,68,TOLGE), XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdlnl",	XTO(31,68,TOLNL), XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdlle",	XTO(31,68,TOLLE), XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdlng",	XTO(31,68,TOLNG), XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdgt",	XTO(31,68,TOGT),  XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdge",	XTO(31,68,TOGE),  XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdnl",	XTO(31,68,TONL),  XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdlt",	XTO(31,68,TOLT),  XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdle",	XTO(31,68,TOLE),  XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdng",	XTO(31,68,TONG),  XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdne",	XTO(31,68,TONE),  XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"tdu",		XTO(31,68,TOU),	  XTO_MASK,  PPC64,	0,		{RA, RB}},</div><div class='add'>+{"td",		X(31,68),	X_MASK,	     PPC64,	0,		{TO, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"lwfcmx",	APU(31,71,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='add'>+{"mulhd",	XO(31,73,0,0),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+{"mulhd.",	XO(31,73,0,1),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"mulhw",	XO(31,75,0,0),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+{"mulhw.",	XO(31,75,0,1),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"dlmzb",	XRC(31,78,0), X_MASK, PPC403|PPC440|TITAN, 0,		{RA, RS, RB}},</div><div class='add'>+{"dlmzb.",	XRC(31,78,1), X_MASK, PPC403|PPC440|TITAN, 0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"mtsrd",	X(31,82),  XRB_MASK|(1&lt;&lt;20), PPC64,	0,		{SR, RS}},</div><div class='add'>+</div><div class='add'>+{"mfmsr",	X(31,83),	XRARB_MASK,  COM,	0,		{RT}},</div><div class='add'>+</div><div class='add'>+{"ldarx",	X(31,84),	XEH_MASK,    PPC64,	0,		{RT, RA0, RB, EH}},</div><div class='add'>+</div><div class='add'>+{"dcbfl",	XOPL(31,86,1),	XRT_MASK,    POWER5,	PPC476,		{RA0, RB}},</div><div class='add'>+{"dcbf",	X(31,86),	XLRT_MASK,   PPC,	0,		{RA0, RB, L2OPT}},</div><div class='add'>+</div><div class='add'>+{"lbzx",	X(31,87),	X_MASK,	     COM,	0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"lbepx",	X(31,95),	X_MASK,	  E500MC|PPCA2, 0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"dni",		XRC(31,97,1),	XRB_MASK,    E6500,	0,		{DUI, DCTL}},</div><div class='add'>+</div><div class='add'>+{"lvx",		X(31,103),	X_MASK,	     PPCVEC,	0,		{VD, RA0, RB}},</div><div class='add'>+{"lqfcmx",	APU(31,103,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"neg",		XO(31,104,0,0),	XORB_MASK,   COM,	0,		{RT, RA}},</div><div class='add'>+{"neg.",	XO(31,104,0,1),	XORB_MASK,   COM,	0,		{RT, RA}},</div><div class='add'>+</div><div class='add'>+{"mul",		XO(31,107,0,0),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='add'>+{"mul.",	XO(31,107,0,1),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"mvidsplt",	X(31,110),	X_MASK,	     PPCVEC2,	0,		{VD, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"mtsrdin",	X(31,114),	XRA_MASK,    PPC64,	0,		{RS, RB}},</div><div class='add'>+</div><div class='add'>+{"mffprwz",	X(31,115),	XX1RB_MASK|1, PPCVSX2,	0,		{RA, FRS}},</div><div class='add'>+{"mfvrwz",	X(31,115)|1,	XX1RB_MASK|1, PPCVSX2,	0,		{RA, VS}},</div><div class='add'>+{"mfvsrwz",	X(31,115),	XX1RB_MASK,   PPCVSX2,	0,		{RA, XS6}},</div><div class='add'>+</div><div class='add'>+{"lharx",	X(31,116),	XEH_MASK, POWER8|E6500, 0,		{RT, RA0, RB, EH}},</div><div class='add'>+</div><div class='add'>+{"clf",		X(31,118),	XTO_MASK,    POWER,	0,		{RA, RB}},</div><div class='add'>+</div><div class='add'>+{"lbzux",	X(31,119),	X_MASK,	     COM,	0,		{RT, RAL, RB}},</div><div class='add'>+</div><div class='add'>+{"popcntb",	X(31,122),	XRB_MASK,    POWER5,	0,		{RA, RS}},</div><div class='add'>+</div><div class='add'>+{"not",		XRC(31,124,0),	X_MASK,	     COM,	0,		{RA, RS, RBS}},</div><div class='add'>+{"nor",		XRC(31,124,0),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+{"not.",	XRC(31,124,1),	X_MASK,	     COM,	0,		{RA, RS, RBS}},</div><div class='add'>+{"nor.",	XRC(31,124,1),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"dcbfep",	XRT(31,127,0),	XRT_MASK, E500MC|PPCA2, 0,		{RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"setb",	X(31,128),	XRB_MASK|(3&lt;&lt;16), POWER9, 0,		{RT, BFA}},</div><div class='add'>+</div><div class='add'>+{"wrtee",	X(31,131), XRARB_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,	{RS}},</div><div class='add'>+</div><div class='add'>+{"dcbtstls",	X(31,134),	X_MASK, PPCCHLK|PPC476|TITAN, 0,	{CT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"stvebx",	X(31,135),	X_MASK,	     PPCVEC,	0,		{VS, RA0, RB}},</div><div class='add'>+{"stbfcmx",	APU(31,135,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"subfe",	XO(31,136,0,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"sfe",		XO(31,136,0,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"subfe.",	XO(31,136,0,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"sfe.",	XO(31,136,0,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"adde",	XO(31,138,0,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"ae",		XO(31,138,0,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"adde.",	XO(31,138,0,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"ae.",		XO(31,138,0,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"stxsiwx",	X(31,140),	XX1_MASK,    PPCVSX2,	0,		{XS6, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"msgsndp",	XRTRA(31,142,0,0), XRTRA_MASK, POWER8,	0,		{RB}},</div><div class='add'>+{"dcbtstlse",	X(31,142),	X_MASK,	     PPCCHLK,	E500MC,		{CT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"mtcr",	XFXM(31,144,0xff,0), XRARB_MASK, COM,	0,		{RS}},</div><div class='add'>+{"mtcrf",	XFXM(31,144,0,0), XFXFXM_MASK, COM,	0,		{FXM, RS}},</div><div class='add'>+{"mtocrf",	XFXM(31,144,0,1), XFXFXM_MASK, COM,	0,		{FXM, RS}},</div><div class='add'>+</div><div class='add'>+{"mtmsr",	X(31,146),	XRLARB_MASK, COM,	0,		{RS, A_L}},</div><div class='add'>+</div><div class='add'>+{"mtsle",	X(31,147),    XRTLRARB_MASK, POWER8,	0,		{L}},</div><div class='ctx'> </div><div class='del'>-{ "ldux",    X(31,53),	X_MASK,		PPC64,		{ RT, RAL, RB } },</div><div class='add'>+{"eratsx",	XRC(31,147,0),	X_MASK,	     PPCA2,	0,		{RT, RA0, RB}},</div><div class='add'>+{"eratsx.",	XRC(31,147,1),	X_MASK,	     PPCA2,	0,		{RT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcbst",   X(31,54),	XRT_MASK,	PPC,		{ RA, RB } },</div><div class='add'>+{"stdx",	X(31,149),	X_MASK,	     PPC64,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lwzux",   X(31,55),	X_MASK,		PPCCOM,		{ RT, RAL, RB } },</div><div class='del'>-{ "lux",     X(31,55),	X_MASK,		PWRCOM,		{ RT, RA, RB } },</div><div class='add'>+{"stwcx.",	XRC(31,150,1),	X_MASK,	     PPC,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcbste",  X(31,62),	XRT_MASK,	BOOKE64,	{ RA, RB } },</div><div class='add'>+{"stwx",	X(31,151),	X_MASK,	     PPCCOM,	0,		{RS, RA0, RB}},</div><div class='add'>+{"stx",		X(31,151),	X_MASK,	     PWRCOM,	0,		{RS, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lwzuxe",  X(31,63),	X_MASK,		BOOKE64,	{ RT, RAL, RB } },</div><div class='add'>+{"slq",		XRC(31,152,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"slq.",	XRC(31,152,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "cntlzd",  XRC(31,58,0), XRB_MASK,	PPC64,		{ RA, RS } },</div><div class='del'>-{ "cntlzd.", XRC(31,58,1), XRB_MASK,	PPC64,		{ RA, RS } },</div><div class='add'>+{"sle",		XRC(31,153,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"sle.",	XRC(31,153,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "andc",    XRC(31,60,0), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-{ "andc.",   XRC(31,60,1), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='add'>+{"prtyw",	X(31,154),    XRB_MASK, POWER6|PPCA2|PPC476, 0,		{RA, RS}},</div><div class='ctx'> </div><div class='del'>-{ "tdlgt",   XTO(31,68,TOLGT), XTO_MASK, PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdllt",   XTO(31,68,TOLLT), XTO_MASK, PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdeq",    XTO(31,68,TOEQ), XTO_MASK,  PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdlge",   XTO(31,68,TOLGE), XTO_MASK, PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdlnl",   XTO(31,68,TOLNL), XTO_MASK, PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdlle",   XTO(31,68,TOLLE), XTO_MASK, PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdlng",   XTO(31,68,TOLNG), XTO_MASK, PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdgt",    XTO(31,68,TOGT), XTO_MASK,  PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdge",    XTO(31,68,TOGE), XTO_MASK,  PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdnl",    XTO(31,68,TONL), XTO_MASK,  PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdlt",    XTO(31,68,TOLT), XTO_MASK,  PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdle",    XTO(31,68,TOLE), XTO_MASK,  PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdng",    XTO(31,68,TONG), XTO_MASK,  PPC64,		{ RA, RB } },</div><div class='del'>-{ "tdne",    XTO(31,68,TONE), XTO_MASK,  PPC64,		{ RA, RB } },</div><div class='del'>-{ "td",	     X(31,68),	X_MASK,		 PPC64,		{ TO, RA, RB } },</div><div class='add'>+{"stdepx",	X(31,157),	X_MASK,	  E500MC|PPCA2, 0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mulhd",   XO(31,73,0,0), XO_MASK,	 PPC64,		{ RT, RA, RB } },</div><div class='del'>-{ "mulhd.",  XO(31,73,0,1), XO_MASK,	 PPC64,		{ RT, RA, RB } },</div><div class='add'>+{"stwepx",	X(31,159),	X_MASK,	  E500MC|PPCA2, 0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mulhw",   XO(31,75,0,0), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "mulhw.",  XO(31,75,0,1), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='add'>+{"wrteei",	X(31,163), XE_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,	{E}},</div><div class='ctx'> </div><div class='del'>-{ "dlmzb",   XRC(31,78,0),  X_MASK,	PPC403|PPC440,	{ RA, RS, RB } },</div><div class='del'>-{ "dlmzb.",  XRC(31,78,1),  X_MASK,	PPC403|PPC440,	{ RA, RS, RB } },</div><div class='add'>+{"dcbtls",	X(31,166),	X_MASK,	 PPCCHLK|PPC476|TITAN, 0,	{CT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mtsrd",   X(31,82),	XRB_MASK|(1&lt;&lt;20), PPC64,	{ SR, RS } },</div><div class='add'>+{"stvehx",	X(31,167),	X_MASK,	     PPCVEC,	0,		{VS, RA0, RB}},</div><div class='add'>+{"sthfcmx",	APU(31,167,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mfmsr",   X(31,83),	XRARB_MASK,	COM,		{ RT } },</div><div class='add'>+{"addex",	ZRC(31,170,0),	Z2_MASK,     POWER9,	0,		{RT, RA, RB, CY}},</div><div class='ctx'> </div><div class='del'>-{ "ldarx",   X(31,84),	XEH_MASK,	PPC64,		{ RT, RA0, RB, EH } },</div><div class='add'>+{"msgclrp",	XRTRA(31,174,0,0), XRTRA_MASK, POWER8,	0,		{RB}},</div><div class='add'>+{"dcbtlse",	X(31,174),	X_MASK,	     PPCCHLK,	E500MC,		{CT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcbfl",   XOPL(31,86,1), XRT_MASK,	POWER5,		{ RA, RB } },</div><div class='del'>-{ "dcbf",    X(31,86),	XLRT_MASK,	PPC,		{ RA, RB, XRT_L } },</div><div class='add'>+{"mtmsrd",	X(31,178),	XRLARB_MASK, PPC64,	0,		{RS, A_L}},</div><div class='ctx'> </div><div class='del'>-{ "lbzx",    X(31,87),	X_MASK,		COM,		{ RT, RA0, RB } },</div><div class='add'>+{"mtvsrd",	X(31,179),	XX1RB_MASK,   PPCVSX2,	0,		{XT6, RA}},</div><div class='add'>+{"mtfprd",	X(31,179),	XX1RB_MASK|1, PPCVSX2,	0,		{FRT, RA}},</div><div class='add'>+{"mtvrd",	X(31,179)|1,	XX1RB_MASK|1, PPCVSX2,	0,		{VD, RA}},</div><div class='add'>+{"eratre",	X(31,179),	X_MASK,	     PPCA2,	0,		{RT, RA, WS}},</div><div class='ctx'> </div><div class='del'>-{ "dcbfe",   X(31,94),	XRT_MASK,	BOOKE64,	{ RA, RB } },</div><div class='add'>+{"stdux",	X(31,181),	X_MASK,	     PPC64,	0,		{RS, RAS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lbzxe",   X(31,95),	X_MASK,		BOOKE64,	{ RT, RA0, RB } },</div><div class='add'>+{"stqcx.",	XRC(31,182,1),	X_MASK,	     POWER8,	0,		{RSQ, RA0, RB}},</div><div class='add'>+{"wchkall",	X(31,182),	X_MASK,	     PPCA2,	0,		{OBF}},</div><div class='ctx'> </div><div class='del'>-{ "neg",     XO(31,104,0,0), XORB_MASK,	COM,		{ RT, RA } },</div><div class='del'>-{ "neg.",    XO(31,104,0,1), XORB_MASK,	COM,		{ RT, RA } },</div><div class='del'>-{ "nego",    XO(31,104,1,0), XORB_MASK,	COM,		{ RT, RA } },</div><div class='del'>-{ "nego.",   XO(31,104,1,1), XORB_MASK,	COM,		{ RT, RA } },</div><div class='add'>+{"stwux",	X(31,183),	X_MASK,	     PPCCOM,	0,		{RS, RAS, RB}},</div><div class='add'>+{"stux",	X(31,183),	X_MASK,	     PWRCOM,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mul",     XO(31,107,0,0), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "mul.",    XO(31,107,0,1), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "mulo",    XO(31,107,1,0), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "mulo.",   XO(31,107,1,1), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='add'>+{"sliq",	XRC(31,184,0),	X_MASK,	     M601,	0,		{RA, RS, SH}},</div><div class='add'>+{"sliq.",	XRC(31,184,1),	X_MASK,	     M601,	0,		{RA, RS, SH}},</div><div class='ctx'> </div><div class='del'>-{ "mtsrdin", X(31,114),	XRA_MASK,	PPC64,		{ RS, RB } },</div><div class='add'>+{"prtyd",	X(31,186),	XRB_MASK, POWER6|PPCA2,	0,		{RA, RS}},</div><div class='ctx'> </div><div class='del'>-{ "clf",     X(31,118), XTO_MASK,	POWER,		{ RA, RB } },</div><div class='add'>+{"cmprb",	X(31,192),	XCMP_MASK,   POWER9,	0,		{BF, L, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lbzux",   X(31,119),	X_MASK,		COM,		{ RT, RAL, RB } },</div><div class='add'>+{"icblq.",	XRC(31,198,1),	X_MASK,	     E6500,	0,		{CT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "popcntb", X(31,122), XRB_MASK,	POWER5,		{ RA, RS } },</div><div class='add'>+{"stvewx",	X(31,199),	X_MASK,	     PPCVEC,	0,		{VS, RA0, RB}},</div><div class='add'>+{"stwfcmx",	APU(31,199,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "not",     XRC(31,124,0), X_MASK,	COM,		{ RA, RS, RBS } },</div><div class='del'>-{ "nor",     XRC(31,124,0), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-{ "not.",    XRC(31,124,1), X_MASK,	COM,		{ RA, RS, RBS } },</div><div class='del'>-{ "nor.",    XRC(31,124,1), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='add'>+{"subfze",	XO(31,200,0,0),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"sfze",	XO(31,200,0,0),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='add'>+{"subfze.",	XO(31,200,0,1),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"sfze.",	XO(31,200,0,1),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "lwarxe",  X(31,126),	X_MASK,		BOOKE64,	{ RT, RA0, RB } },</div><div class='add'>+{"addze",	XO(31,202,0,0),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"aze",		XO(31,202,0,0),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='add'>+{"addze.",	XO(31,202,0,1),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"aze.",	XO(31,202,0,1),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "lbzuxe",  X(31,127),	X_MASK,		BOOKE64,	{ RT, RAL, RB } },</div><div class='add'>+{"msgsnd",	XRTRA(31,206,0,0), XRTRA_MASK, E500MC|PPCA2|POWER8, 0,	{RB}},</div><div class='ctx'> </div><div class='del'>-{ "wrtee",   X(31,131),	XRARB_MASK,	PPC403 | BOOKE,	{ RS } },</div><div class='add'>+{"mtsr",	X(31,210), XRB_MASK|(1&lt;&lt;20), COM,	NON32,		{SR, RS}},</div><div class='ctx'> </div><div class='del'>-{ "dcbtstls",X(31,134),	X_MASK,		PPCCHLK,	{ CT, RA, RB }},</div><div class='add'>+{"mtfprwa",	X(31,211),	XX1RB_MASK|1, PPCVSX2,	0,		{FRT, RA}},</div><div class='add'>+{"mtvrwa",	X(31,211)|1,	XX1RB_MASK|1, PPCVSX2,	0,		{VD, RA}},</div><div class='add'>+{"mtvsrwa",	X(31,211),	XX1RB_MASK,   PPCVSX2,	0,		{XT6, RA}},</div><div class='add'>+{"eratwe",	X(31,211),	X_MASK,	     PPCA2,	0,		{RS, RA, WS}},</div><div class='ctx'> </div><div class='del'>-{ "subfe",   XO(31,136,0,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "sfe",     XO(31,136,0,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "subfe.",  XO(31,136,0,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "sfe.",    XO(31,136,0,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "subfeo",  XO(31,136,1,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "sfeo",    XO(31,136,1,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "subfeo.", XO(31,136,1,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "sfeo.",   XO(31,136,1,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='add'>+{"ldawx.",	XRC(31,212,1),	X_MASK,	     PPCA2,	0,		{RT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "adde",    XO(31,138,0,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "ae",      XO(31,138,0,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "adde.",   XO(31,138,0,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "ae.",     XO(31,138,0,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "addeo",   XO(31,138,1,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "aeo",     XO(31,138,1,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "addeo.",  XO(31,138,1,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "aeo.",    XO(31,138,1,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='add'>+{"stdcx.",	XRC(31,214,1),	X_MASK,	     PPC64,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcbtstlse",X(31,142),X_MASK,		PPCCHLK64,	{ CT, RA, RB }},</div><div class='add'>+{"stbx",	X(31,215),	X_MASK,	     COM,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mtocrf",  XFXM(31,144,0,1), XFXFXM_MASK, COM,	{ FXM, RS } },</div><div class='del'>-{ "mtcr",    XFXM(31,144,0xff,0), XRARB_MASK, COM,	{ RS }},</div><div class='del'>-{ "mtcrf",   X(31,144),	XFXFXM_MASK,	COM,		{ FXM, RS } },</div><div class='add'>+{"sllq",	XRC(31,216,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"sllq.",	XRC(31,216,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mtmsr",   X(31,146),	XRARB_MASK,	COM,		{ RS } },</div><div class='add'>+{"sleq",	XRC(31,217,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"sleq.",	XRC(31,217,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stdx",    X(31,149), X_MASK,		PPC64,		{ RS, RA0, RB } },</div><div class='add'>+{"stbepx",	X(31,223),	X_MASK,	  E500MC|PPCA2, 0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stwcx.",  XRC(31,150,1), X_MASK,	PPC,		{ RS, RA0, RB } },</div><div class='add'>+{"cmpeqb",	X(31,224),	XCMPL_MASK,  POWER9,	0,		{BF, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stwx",    X(31,151), X_MASK,		PPCCOM,		{ RS, RA0, RB } },</div><div class='del'>-{ "stx",     X(31,151), X_MASK,		PWRCOM,		{ RS, RA, RB } },</div><div class='add'>+{"icblc",	X(31,230),	X_MASK,	PPCCHLK|PPC476|TITAN, 0,	{CT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stwcxe.", XRC(31,158,1), X_MASK,	BOOKE64,	{ RS, RA0, RB } },</div><div class='add'>+{"stvx",	X(31,231),	X_MASK,	     PPCVEC,	0,		{VS, RA0, RB}},</div><div class='add'>+{"stqfcmx",	APU(31,231,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stwxe",   X(31,159), X_MASK,		BOOKE64,	{ RS, RA0, RB } },</div><div class='add'>+{"subfme",	XO(31,232,0,0),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"sfme",	XO(31,232,0,0),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='add'>+{"subfme.",	XO(31,232,0,1),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"sfme.",	XO(31,232,0,1),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "slq",     XRC(31,152,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "slq.",    XRC(31,152,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"mulld",	XO(31,233,0,0),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+{"mulld.",	XO(31,233,0,1),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sle",     XRC(31,153,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "sle.",    XRC(31,153,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"addme",	XO(31,234,0,0),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"ame",		XO(31,234,0,0),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='add'>+{"addme.",	XO(31,234,0,1),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"ame.",	XO(31,234,0,1),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "prtyw",   X(31,154),	XRB_MASK,	POWER6,		{ RA, RS } },</div><div class='add'>+{"mullw",	XO(31,235,0,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"muls",	XO(31,235,0,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"mullw.",	XO(31,235,0,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"muls.",	XO(31,235,0,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "wrteei",  X(31,163),	XE_MASK,	PPC403 | BOOKE,	{ E } },</div><div class='add'>+{"icblce",	X(31,238),	X_MASK,	     PPCCHLK,	E500MC|PPCA2,	{CT, RA, RB}},</div><div class='add'>+{"msgclr",	XRTRA(31,238,0,0), XRTRA_MASK, E500MC|PPCA2|POWER8, 0,	{RB}},</div><div class='add'>+{"mtsrin",	X(31,242),	XRA_MASK,    PPC,	NON32,		{RS, RB}},</div><div class='add'>+{"mtsri",	X(31,242),	XRA_MASK,    POWER,	NON32,		{RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcbtls",  X(31,166),	X_MASK,		PPCCHLK,	{ CT, RA, RB }},</div><div class='del'>-{ "dcbtlse", X(31,174),	X_MASK,		PPCCHLK64,	{ CT, RA, RB }},</div><div class='add'>+{"mtfprwz",	X(31,243),	XX1RB_MASK|1, PPCVSX2,	0,		{FRT, RA}},</div><div class='add'>+{"mtvrwz",	X(31,243)|1,	XX1RB_MASK|1, PPCVSX2,	0,		{VD, RA}},</div><div class='add'>+{"mtvsrwz",	X(31,243),	XX1RB_MASK,   PPCVSX2,	0,		{XT6, RA}},</div><div class='ctx'> </div><div class='del'>-{ "mtmsrd",  X(31,178),	XRLARB_MASK,	PPC64,		{ RS, MTMSRD_L } },</div><div class='add'>+{"dcbtstt",	XRT(31,246,0x10), XRT_MASK,  POWER7,	0,		{RA0, RB}},</div><div class='add'>+{"dcbtst",	X(31,246),	X_MASK,	     POWER4,	DCBT_EO,	{RA0, RB, CT}},</div><div class='add'>+{"dcbtst",	X(31,246),	X_MASK,	     DCBT_EO,	0,		{CT, RA0, RB}},</div><div class='add'>+{"dcbtst",	X(31,246),	X_MASK,	     PPC,	POWER4|DCBT_EO,	{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stdux",   X(31,181),	X_MASK,		PPC64,		{ RS, RAS, RB } },</div><div class='add'>+{"stbux",	X(31,247),	X_MASK,	     COM,	0,		{RS, RAS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stwux",   X(31,183),	X_MASK,		PPCCOM,		{ RS, RAS, RB } },</div><div class='del'>-{ "stux",    X(31,183),	X_MASK,		PWRCOM,		{ RS, RA0, RB } },</div><div class='add'>+{"slliq",	XRC(31,248,0),	X_MASK,	     M601,	0,		{RA, RS, SH}},</div><div class='add'>+{"slliq.",	XRC(31,248,1),	X_MASK,	     M601,	0,		{RA, RS, SH}},</div><div class='ctx'> </div><div class='del'>-{ "sliq",    XRC(31,184,0), X_MASK,	M601,		{ RA, RS, SH } },</div><div class='del'>-{ "sliq.",   XRC(31,184,1), X_MASK,	M601,		{ RA, RS, SH } },</div><div class='add'>+{"bpermd",	X(31,252),	X_MASK,	  POWER7|PPCA2,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "prtyd",   X(31,186),	XRB_MASK,	POWER6,		{ RA, RS } },</div><div class='add'>+{"dcbtstep",	XRT(31,255,0),	X_MASK,	  E500MC|PPCA2, 0,		{RT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stwuxe",  X(31,191),	X_MASK,		BOOKE64,	{ RS, RAS, RB } },</div><div class='add'>+{"mfdcrx",	X(31,259),	X_MASK, BOOKE|PPCA2|PPC476, TITAN,	{RS, RA}},</div><div class='add'>+{"mfdcrx.",	XRC(31,259,1),	X_MASK,	     PPCA2,	0,		{RS, RA}},</div><div class='ctx'> </div><div class='del'>-{ "subfze",  XO(31,200,0,0), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "sfze",    XO(31,200,0,0), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "subfze.", XO(31,200,0,1), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "sfze.",   XO(31,200,0,1), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "subfzeo", XO(31,200,1,0), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "sfzeo",   XO(31,200,1,0), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "subfzeo.",XO(31,200,1,1), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "sfzeo.",  XO(31,200,1,1), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='add'>+{"lvexbx",	X(31,261),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "addze",   XO(31,202,0,0), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "aze",     XO(31,202,0,0), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "addze.",  XO(31,202,0,1), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "aze.",    XO(31,202,0,1), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "addzeo",  XO(31,202,1,0), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "azeo",    XO(31,202,1,0), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "addzeo.", XO(31,202,1,1), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "azeo.",   XO(31,202,1,1), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='add'>+{"icbt",	X(31,262),	XRT_MASK,    PPC403,	0,		{RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mtsr",    X(31,210),	XRB_MASK|(1&lt;&lt;20), COM32,	{ SR, RS } },</div><div class='add'>+{"lvepxl",	X(31,263),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stdcx.",  XRC(31,214,1), X_MASK,	PPC64,		{ RS, RA0, RB } },</div><div class='add'>+{"ldfcmx",	APU(31,263,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='add'>+{"doz",		XO(31,264,0,0),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='add'>+{"doz.",	XO(31,264,0,1),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stbx",    X(31,215),	X_MASK,		COM,		{ RS, RA0, RB } },</div><div class='add'>+{"modud",	X(31,265),	X_MASK,	     POWER9,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sllq",    XRC(31,216,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "sllq.",   XRC(31,216,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"add",		XO(31,266,0,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"cax",		XO(31,266,0,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"add.",	XO(31,266,0,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"cax.",	XO(31,266,0,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sleq",    XRC(31,217,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "sleq.",   XRC(31,217,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"moduw",	X(31,267),	X_MASK,	     POWER9,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stbxe",   X(31,223),	X_MASK,		BOOKE64,	{ RS, RA0, RB } },</div><div class='add'>+{"lxvx",	X(31,268),	XX1_MASK|1&lt;&lt;6, PPCVSX3,	0,		{XT6, RA0, RB}},</div><div class='add'>+{"lxvl",	X(31,269),	XX1_MASK,    PPCVSX3,	0,		{XT6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "icblc",   X(31,230),	X_MASK,		PPCCHLK,	{ CT, RA, RB }},</div><div class='add'>+{"ehpriv",	X(31,270),	0xffffffff,  E500MC|PPCA2, 0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "subfme",  XO(31,232,0,0), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "sfme",    XO(31,232,0,0), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "subfme.", XO(31,232,0,1), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "sfme.",   XO(31,232,0,1), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "subfmeo", XO(31,232,1,0), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "sfmeo",   XO(31,232,1,0), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "subfmeo.",XO(31,232,1,1), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "sfmeo.",  XO(31,232,1,1), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='add'>+{"tlbiel",	X(31,274),	X_MASK|1&lt;&lt;20,POWER9,	PPC476,		{RB, RSO, RIC, PRS, X_R}},</div><div class='add'>+{"tlbiel",	X(31,274),	XRTLRA_MASK, POWER4,	POWER9|PPC476,	{RB, LOPT}},</div><div class='ctx'> </div><div class='del'>-{ "mulld",   XO(31,233,0,0), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-{ "mulld.",  XO(31,233,0,1), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-{ "mulldo",  XO(31,233,1,0), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-{ "mulldo.", XO(31,233,1,1), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='add'>+{"mfapidi",	X(31,275),	X_MASK,	     BOOKE,	E500|TITAN,	{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "addme",   XO(31,234,0,0), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "ame",     XO(31,234,0,0), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "addme.",  XO(31,234,0,1), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "ame.",    XO(31,234,0,1), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "addmeo",  XO(31,234,1,0), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "ameo",    XO(31,234,1,0), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='del'>-{ "addmeo.", XO(31,234,1,1), XORB_MASK, PPCCOM,		{ RT, RA } },</div><div class='del'>-{ "ameo.",   XO(31,234,1,1), XORB_MASK, PWRCOM,		{ RT, RA } },</div><div class='add'>+{"lqarx",	X(31,276),	XEH_MASK,    POWER8,	0,		{RTQ, RAX, RBX, EH}},</div><div class='ctx'> </div><div class='del'>-{ "mullw",   XO(31,235,0,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "muls",    XO(31,235,0,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "mullw.",  XO(31,235,0,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "muls.",   XO(31,235,0,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "mullwo",  XO(31,235,1,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "mulso",   XO(31,235,1,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "mullwo.", XO(31,235,1,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "mulso.",  XO(31,235,1,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='add'>+{"lscbx",	XRC(31,277,0),	X_MASK,	     M601,	0,		{RT, RA, RB}},</div><div class='add'>+{"lscbx.",	XRC(31,277,1),	X_MASK,	     M601,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "icblce",  X(31,238),	X_MASK,		PPCCHLK64,	{ CT, RA, RB }},</div><div class='del'>-{ "mtsrin",  X(31,242),	XRA_MASK,	PPC32,		{ RS, RB } },</div><div class='del'>-{ "mtsri",   X(31,242),	XRA_MASK,	POWER32,	{ RS, RB } },</div><div class='add'>+{"dcbtt",	XRT(31,278,0x10), XRT_MASK,  POWER7,	0,		{RA0, RB}},</div><div class='add'>+{"dcbt",	X(31,278),	X_MASK,	     POWER4,	DCBT_EO,	{RA0, RB, CT}},</div><div class='add'>+{"dcbt",	X(31,278),	X_MASK,	     DCBT_EO,	0,		{CT, RA0, RB}},</div><div class='add'>+{"dcbt",	X(31,278),	X_MASK,	     PPC,	POWER4|DCBT_EO,	{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcbtst",  X(31,246),	X_MASK,	PPC,			{ CT, RA, RB } },</div><div class='add'>+{"lhzx",	X(31,279),	X_MASK,	     COM,	0,		{RT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stbux",   X(31,247),	X_MASK,		COM,		{ RS, RAS, RB } },</div><div class='del'>-</div><div class='del'>-{ "slliq",   XRC(31,248,0), X_MASK,	M601,		{ RA, RS, SH } },</div><div class='del'>-{ "slliq.",  XRC(31,248,1), X_MASK,	M601,		{ RA, RS, SH } },</div><div class='del'>-</div><div class='del'>-{ "dcbtste", X(31,253),	X_MASK,		BOOKE64,	{ CT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "stbuxe",  X(31,255),	X_MASK,		BOOKE64,	{ RS, RAS, RB } },</div><div class='del'>-</div><div class='del'>-{ "mfdcrx",  X(31,259),	X_MASK,		BOOKE,		{ RS, RA } },</div><div class='del'>-</div><div class='del'>-{ "doz",     XO(31,264,0,0), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "doz.",    XO(31,264,0,1), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "dozo",    XO(31,264,1,0), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "dozo.",   XO(31,264,1,1), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "add",     XO(31,266,0,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "cax",     XO(31,266,0,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "add.",    XO(31,266,0,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "cax.",    XO(31,266,0,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "addo",    XO(31,266,1,0), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "caxo",    XO(31,266,1,0), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "addo.",   XO(31,266,1,1), XO_MASK,	PPCCOM,		{ RT, RA, RB } },</div><div class='del'>-{ "caxo.",   XO(31,266,1,1), XO_MASK,	PWRCOM,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "tlbiel",  X(31,274), XRTLRA_MASK,	POWER4,		{ RB, L } },</div><div class='del'>-</div><div class='del'>-{ "mfapidi", X(31,275), X_MASK,		BOOKE,		{ RT, RA } },</div><div class='del'>-</div><div class='del'>-{ "lscbx",   XRC(31,277,0), X_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "lscbx.",  XRC(31,277,1), X_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "dcbt",    X(31,278),	X_MASK,		PPC,		{ CT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "lhzx",    X(31,279),	X_MASK,		COM,		{ RT, RA0, RB } },</div><div class='del'>-</div><div class='del'>-{ "eqv",     XRC(31,284,0), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-{ "eqv.",    XRC(31,284,1), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "dcbte",   X(31,286),	X_MASK,		BOOKE64,	{ CT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "lhzxe",   X(31,287),	X_MASK,		BOOKE64,	{ RT, RA0, RB } },</div><div class='del'>-</div><div class='del'>-{ "tlbie",   X(31,306),	XRTLRA_MASK,	PPC,		{ RB, L } },</div><div class='del'>-{ "tlbi",    X(31,306),	XRT_MASK,	POWER,		{ RA0, RB } },</div><div class='del'>-</div><div class='del'>-{ "eciwx",   X(31,310), X_MASK,		PPC,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "lhzux",   X(31,311),	X_MASK,		COM,		{ RT, RAL, RB } },</div><div class='del'>-</div><div class='del'>-{ "xor",     XRC(31,316,0), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-{ "xor.",    XRC(31,316,1), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "lhzuxe",  X(31,319),	X_MASK,		BOOKE64,	{ RT, RAL, RB } },</div><div class='del'>-</div><div class='del'>-{ "mfexisr",  XSPR(31,323,64),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfexier",  XSPR(31,323,66),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfbr0",    XSPR(31,323,128), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfbr1",    XSPR(31,323,129), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfbr2",    XSPR(31,323,130), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfbr3",    XSPR(31,323,131), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfbr4",    XSPR(31,323,132), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfbr5",    XSPR(31,323,133), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfbr6",    XSPR(31,323,134), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfbr7",    XSPR(31,323,135), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfbear",   XSPR(31,323,144), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfbesr",   XSPR(31,323,145), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfiocr",   XSPR(31,323,160), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmacr0", XSPR(31,323,192), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmact0", XSPR(31,323,193), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmada0", XSPR(31,323,194), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmasa0", XSPR(31,323,195), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmacc0", XSPR(31,323,196), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmacr1", XSPR(31,323,200), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmact1", XSPR(31,323,201), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmada1", XSPR(31,323,202), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmasa1", XSPR(31,323,203), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmacc1", XSPR(31,323,204), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmacr2", XSPR(31,323,208), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmact2", XSPR(31,323,209), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmada2", XSPR(31,323,210), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmasa2", XSPR(31,323,211), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmacc2", XSPR(31,323,212), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmacr3", XSPR(31,323,216), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmact3", XSPR(31,323,217), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmada3", XSPR(31,323,218), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmasa3", XSPR(31,323,219), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmacc3", XSPR(31,323,220), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdmasr",  XSPR(31,323,224), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdcr",    X(31,323),	X_MASK,	PPC403 | BOOKE,	{ RT, SPR } },</div><div class='del'>-</div><div class='del'>-{ "div",     XO(31,331,0,0), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "div.",    XO(31,331,0,1), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "divo",    XO(31,331,1,0), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "divo.",   XO(31,331,1,1), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "mfpmr",   X(31,334),	X_MASK,		PPCPMR,		{ RT, PMR }},</div><div class='del'>-</div><div class='del'>-{ "mfmq",       XSPR(31,339,0),    XSPR_MASK, M601,	{ RT } },</div><div class='del'>-{ "mfxer",      XSPR(31,339,1),    XSPR_MASK, COM,	{ RT } },</div><div class='del'>-{ "mfrtcu",     XSPR(31,339,4),    XSPR_MASK, COM,	{ RT } },</div><div class='del'>-{ "mfrtcl",     XSPR(31,339,5),    XSPR_MASK, COM,	{ RT } },</div><div class='del'>-{ "mfdec",      XSPR(31,339,6),    XSPR_MASK, MFDEC1,	{ RT } },</div><div class='del'>-{ "mfdec",      XSPR(31,339,22),   XSPR_MASK, MFDEC2,	{ RT } },</div><div class='del'>-{ "mflr",       XSPR(31,339,8),    XSPR_MASK, COM,	{ RT } },</div><div class='del'>-{ "mfctr",      XSPR(31,339,9),    XSPR_MASK, COM,	{ RT } },</div><div class='del'>-{ "mftid",      XSPR(31,339,17),   XSPR_MASK, POWER,	{ RT } },</div><div class='del'>-{ "mfdsisr",    XSPR(31,339,18),   XSPR_MASK, COM,	{ RT } },</div><div class='del'>-{ "mfdar",      XSPR(31,339,19),   XSPR_MASK, COM,	{ RT } },</div><div class='del'>-{ "mfsdr0",     XSPR(31,339,24),   XSPR_MASK, POWER,	{ RT } },</div><div class='del'>-{ "mfsdr1",     XSPR(31,339,25),   XSPR_MASK, COM,	{ RT } },</div><div class='del'>-{ "mfsrr0",     XSPR(31,339,26),   XSPR_MASK, COM,	{ RT } },</div><div class='del'>-{ "mfsrr1",     XSPR(31,339,27),   XSPR_MASK, COM,	{ RT } },</div><div class='del'>-{ "mfcfar",     XSPR(31,339,28),   XSPR_MASK, POWER6,	{ RT } },</div><div class='del'>-{ "mfpid",      XSPR(31,339,48),   XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfpid",      XSPR(31,339,945),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfcsrr0",    XSPR(31,339,58),   XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfcsrr1",    XSPR(31,339,59),   XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfdear",     XSPR(31,339,61),   XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfdear",     XSPR(31,339,981),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfesr",      XSPR(31,339,62),   XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfesr",      XSPR(31,339,980),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfivpr",     XSPR(31,339,63),   XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfcmpa",     XSPR(31,339,144),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfcmpb",     XSPR(31,339,145),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfcmpc",     XSPR(31,339,146),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfcmpd",     XSPR(31,339,147),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mficr",      XSPR(31,339,148),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfder",      XSPR(31,339,149),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfcounta",   XSPR(31,339,150),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfcountb",   XSPR(31,339,151),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfcmpe",     XSPR(31,339,152),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfcmpf",     XSPR(31,339,153),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfcmpg",     XSPR(31,339,154),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfcmph",     XSPR(31,339,155),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mflctrl1",   XSPR(31,339,156),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mflctrl2",   XSPR(31,339,157),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfictrl",    XSPR(31,339,158),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfbar",      XSPR(31,339,159),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfvrsave",   XSPR(31,339,256),  XSPR_MASK, PPCVEC,	{ RT } },</div><div class='del'>-{ "mfusprg0",   XSPR(31,339,256),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mftb",       X(31,371),	   X_MASK,    CLASSIC,	{ RT, TBR } },</div><div class='del'>-{ "mftb",       XSPR(31,339,268),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mftbl",      XSPR(31,371,268),  XSPR_MASK, CLASSIC,	{ RT } },</div><div class='del'>-{ "mftbl",      XSPR(31,339,268),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mftbu",      XSPR(31,371,269),  XSPR_MASK, CLASSIC,	{ RT } },</div><div class='del'>-{ "mftbu",      XSPR(31,339,269),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfsprg",     XSPR(31,339,256),  XSPRG_MASK, PPC,	{ RT, SPRG } },</div><div class='del'>-{ "mfsprg0",    XSPR(31,339,272),  XSPR_MASK, PPC,	{ RT } },</div><div class='del'>-{ "mfsprg1",    XSPR(31,339,273),  XSPR_MASK, PPC,	{ RT } },</div><div class='del'>-{ "mfsprg2",    XSPR(31,339,274),  XSPR_MASK, PPC,	{ RT } },</div><div class='del'>-{ "mfsprg3",    XSPR(31,339,275),  XSPR_MASK, PPC,	{ RT } },</div><div class='del'>-{ "mfsprg4",    XSPR(31,339,260),  XSPR_MASK, PPC405 | BOOKE,	{ RT } },</div><div class='del'>-{ "mfsprg5",    XSPR(31,339,261),  XSPR_MASK, PPC405 | BOOKE,	{ RT } },</div><div class='del'>-{ "mfsprg6",    XSPR(31,339,262),  XSPR_MASK, PPC405 | BOOKE,	{ RT } },</div><div class='del'>-{ "mfsprg7",    XSPR(31,339,263),  XSPR_MASK, PPC405 | BOOKE,	{ RT } },</div><div class='del'>-{ "mfasr",      XSPR(31,339,280),  XSPR_MASK, PPC64,	{ RT } },</div><div class='del'>-{ "mfear",      XSPR(31,339,282),  XSPR_MASK, PPC,	{ RT } },</div><div class='del'>-{ "mfpir",      XSPR(31,339,286),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfpvr",      XSPR(31,339,287),  XSPR_MASK, PPC,	{ RT } },</div><div class='del'>-{ "mfdbsr",     XSPR(31,339,304),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfdbsr",     XSPR(31,339,1008), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdbcr0",    XSPR(31,339,308),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfdbcr0",    XSPR(31,339,1010), XSPR_MASK, PPC405,	{ RT } },</div><div class='del'>-{ "mfdbcr1",    XSPR(31,339,309),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfdbcr1",    XSPR(31,339,957),  XSPR_MASK, PPC405,	{ RT } },</div><div class='del'>-{ "mfdbcr2",    XSPR(31,339,310),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfiac1",     XSPR(31,339,312),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfiac1",     XSPR(31,339,1012), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfiac2",     XSPR(31,339,313),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfiac2",     XSPR(31,339,1013), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfiac3",     XSPR(31,339,314),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfiac3",     XSPR(31,339,948),  XSPR_MASK, PPC405,	{ RT } },</div><div class='del'>-{ "mfiac4",     XSPR(31,339,315),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfiac4",     XSPR(31,339,949),  XSPR_MASK, PPC405,	{ RT } },</div><div class='del'>-{ "mfdac1",     XSPR(31,339,316),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfdac1",     XSPR(31,339,1014), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdac2",     XSPR(31,339,317),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfdac2",     XSPR(31,339,1015), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfdvc1",     XSPR(31,339,318),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfdvc1",     XSPR(31,339,950),  XSPR_MASK, PPC405,	{ RT } },</div><div class='del'>-{ "mfdvc2",     XSPR(31,339,319),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfdvc2",     XSPR(31,339,951),  XSPR_MASK, PPC405,	{ RT } },</div><div class='del'>-{ "mftsr",      XSPR(31,339,336),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mftsr",      XSPR(31,339,984),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mftcr",      XSPR(31,339,340),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mftcr",      XSPR(31,339,986),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfivor0",    XSPR(31,339,400),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor1",    XSPR(31,339,401),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor2",    XSPR(31,339,402),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor3",    XSPR(31,339,403),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor4",    XSPR(31,339,404),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor5",    XSPR(31,339,405),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor6",    XSPR(31,339,406),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor7",    XSPR(31,339,407),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor8",    XSPR(31,339,408),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor9",    XSPR(31,339,409),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor10",   XSPR(31,339,410),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor11",   XSPR(31,339,411),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor12",   XSPR(31,339,412),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor13",   XSPR(31,339,413),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor14",   XSPR(31,339,414),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfivor15",   XSPR(31,339,415),  XSPR_MASK, BOOKE,    { RT } },</div><div class='del'>-{ "mfspefscr",  XSPR(31,339,512),  XSPR_MASK, PPCSPE,	{ RT } },</div><div class='del'>-{ "mfbbear",    XSPR(31,339,513),  XSPR_MASK, PPCBRLK,  { RT } },</div><div class='del'>-{ "mfbbtar",    XSPR(31,339,514),  XSPR_MASK, PPCBRLK,  { RT } },</div><div class='del'>-{ "mfivor32",   XSPR(31,339,528),  XSPR_MASK, PPCSPE,	{ RT } },</div><div class='del'>-{ "mfivor33",   XSPR(31,339,529),  XSPR_MASK, PPCSPE,	{ RT } },</div><div class='del'>-{ "mfivor34",   XSPR(31,339,530),  XSPR_MASK, PPCSPE,	{ RT } },</div><div class='del'>-{ "mfivor35",   XSPR(31,339,531),  XSPR_MASK, PPCPMR,	{ RT } },</div><div class='del'>-{ "mfibatu",    XSPR(31,339,528),  XSPRBAT_MASK, PPC,	{ RT, SPRBAT } },</div><div class='del'>-{ "mfibatl",    XSPR(31,339,529),  XSPRBAT_MASK, PPC,	{ RT, SPRBAT } },</div><div class='del'>-{ "mfdbatu",    XSPR(31,339,536),  XSPRBAT_MASK, PPC,	{ RT, SPRBAT } },</div><div class='del'>-{ "mfdbatl",    XSPR(31,339,537),  XSPRBAT_MASK, PPC,	{ RT, SPRBAT } },</div><div class='del'>-{ "mfic_cst",   XSPR(31,339,560),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfic_adr",   XSPR(31,339,561),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfic_dat",   XSPR(31,339,562),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfdc_cst",   XSPR(31,339,568),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfdc_adr",   XSPR(31,339,569),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmcsrr0",   XSPR(31,339,570),  XSPR_MASK, PPCRFMCI, { RT } },</div><div class='del'>-{ "mfdc_dat",   XSPR(31,339,570),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmcsrr1",   XSPR(31,339,571),  XSPR_MASK, PPCRFMCI, { RT } },</div><div class='del'>-{ "mfmcsr",     XSPR(31,339,572),  XSPR_MASK, PPCRFMCI, { RT } },</div><div class='del'>-{ "mfmcar",     XSPR(31,339,573),  XSPR_MASK, PPCRFMCI, { RT } },</div><div class='del'>-{ "mfdpdr",     XSPR(31,339,630),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfdpir",     XSPR(31,339,631),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfimmr",     XSPR(31,339,638),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmi_ctr",   XSPR(31,339,784),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmi_ap",    XSPR(31,339,786),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmi_epn",   XSPR(31,339,787),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmi_twc",   XSPR(31,339,789),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmi_rpn",   XSPR(31,339,790),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmd_ctr",   XSPR(31,339,792),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfm_casid",  XSPR(31,339,793),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmd_ap",    XSPR(31,339,794),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmd_epn",   XSPR(31,339,795),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmd_twb",   XSPR(31,339,796),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmd_twc",   XSPR(31,339,797),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmd_rpn",   XSPR(31,339,798),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfm_tw",     XSPR(31,339,799),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmi_dbcam", XSPR(31,339,816),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmi_dbram0",XSPR(31,339,817),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmi_dbram1",XSPR(31,339,818),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmd_dbcam", XSPR(31,339,824),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmd_dbram0",XSPR(31,339,825),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfmd_dbram1",XSPR(31,339,826),  XSPR_MASK, PPC860,	{ RT } },</div><div class='del'>-{ "mfummcr0",   XSPR(31,339,936),  XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfupmc1",    XSPR(31,339,937),  XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfupmc2",    XSPR(31,339,938),  XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfusia",     XSPR(31,339,939),  XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfummcr1",   XSPR(31,339,940),  XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfupmc3",    XSPR(31,339,941),  XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfupmc4",    XSPR(31,339,942),  XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfzpr",   	XSPR(31,339,944),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfccr0",  	XSPR(31,339,947),  XSPR_MASK, PPC405,	{ RT } },</div><div class='del'>-{ "mfmmcr0",	XSPR(31,339,952),  XSPR_MASK, PPC750,	{ RT } },</div><div class='del'>-{ "mfpmc1",	XSPR(31,339,953),  XSPR_MASK, PPC750,	{ RT } },</div><div class='del'>-{ "mfsgr",	XSPR(31,339,953),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfpmc2",	XSPR(31,339,954),  XSPR_MASK, PPC750,	{ RT } },</div><div class='del'>-{ "mfdcwr", 	XSPR(31,339,954),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfsia",	XSPR(31,339,955),  XSPR_MASK, PPC750,	{ RT } },</div><div class='del'>-{ "mfsler",	XSPR(31,339,955),  XSPR_MASK, PPC405,	{ RT } },</div><div class='del'>-{ "mfmmcr1",	XSPR(31,339,956),  XSPR_MASK, PPC750,	{ RT } },</div><div class='del'>-{ "mfsu0r",	XSPR(31,339,956),  XSPR_MASK, PPC405,	{ RT } },</div><div class='del'>-{ "mfpmc3",	XSPR(31,339,957),  XSPR_MASK, PPC750,	{ RT } },</div><div class='del'>-{ "mfpmc4",	XSPR(31,339,958),  XSPR_MASK, PPC750,	{ RT } },</div><div class='del'>-{ "mficdbdr",   XSPR(31,339,979),  XSPR_MASK, PPC403,   { RT } },</div><div class='del'>-{ "mfevpr",     XSPR(31,339,982),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfcdbcr",    XSPR(31,339,983),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfpit",      XSPR(31,339,987),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mftbhi",     XSPR(31,339,988),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mftblo",     XSPR(31,339,989),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfsrr2",     XSPR(31,339,990),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfsrr3",     XSPR(31,339,991),  XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfl2cr",     XSPR(31,339,1017), XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfdccr",     XSPR(31,339,1018), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mficcr",     XSPR(31,339,1019), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfictc",     XSPR(31,339,1019), XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfpbl1",     XSPR(31,339,1020), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfthrm1",    XSPR(31,339,1020), XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfpbu1",     XSPR(31,339,1021), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfthrm2",    XSPR(31,339,1021), XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfpbl2",     XSPR(31,339,1022), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfthrm3",    XSPR(31,339,1022), XSPR_MASK, PPC750,   { RT } },</div><div class='del'>-{ "mfpbu2",     XSPR(31,339,1023), XSPR_MASK, PPC403,	{ RT } },</div><div class='del'>-{ "mfspr",      X(31,339),	   X_MASK,    COM,	{ RT, SPR } },</div><div class='del'>-</div><div class='del'>-{ "lwax",    X(31,341),	X_MASK,		PPC64,		{ RT, RA0, RB } },</div><div class='del'>-</div><div class='del'>-{ "dst",     XDSS(31,342,0), XDSS_MASK,	PPCVEC,		{ RA, RB, STRM } },</div><div class='del'>-{ "dstt",    XDSS(31,342,1), XDSS_MASK,	PPCVEC,		{ RA, RB, STRM } },</div><div class='del'>-</div><div class='del'>-{ "lhax",    X(31,343),	X_MASK,		COM,		{ RT, RA0, RB } },</div><div class='del'>-</div><div class='del'>-{ "lhaxe",   X(31,351),	X_MASK,		BOOKE64,	{ RT, RA0, RB } },</div><div class='del'>-</div><div class='del'>-{ "dstst",   XDSS(31,374,0), XDSS_MASK,	PPCVEC,		{ RA, RB, STRM } },</div><div class='del'>-{ "dststt",  XDSS(31,374,1), XDSS_MASK,	PPCVEC,		{ RA, RB, STRM } },</div><div class='del'>-</div><div class='del'>-{ "dccci",   X(31,454),	XRT_MASK,	PPC403|PPC440,	{ RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "abs",     XO(31,360,0,0), XORB_MASK, M601,		{ RT, RA } },</div><div class='del'>-{ "abs.",    XO(31,360,0,1), XORB_MASK, M601,		{ RT, RA } },</div><div class='del'>-{ "abso",    XO(31,360,1,0), XORB_MASK, M601,		{ RT, RA } },</div><div class='del'>-{ "abso.",   XO(31,360,1,1), XORB_MASK, M601,		{ RT, RA } },</div><div class='del'>-</div><div class='del'>-{ "divs",    XO(31,363,0,0), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "divs.",   XO(31,363,0,1), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "divso",   XO(31,363,1,0), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-{ "divso.",  XO(31,363,1,1), XO_MASK,	M601,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "tlbia",   X(31,370),	0xffffffff,	PPC,		{ 0 } },</div><div class='del'>-</div><div class='del'>-{ "lwaux",   X(31,373),	X_MASK,		PPC64,		{ RT, RAL, RB } },</div><div class='del'>-</div><div class='del'>-{ "lhaux",   X(31,375),	X_MASK,		COM,		{ RT, RAL, RB } },</div><div class='del'>-</div><div class='del'>-{ "lhauxe",  X(31,383),	X_MASK,		BOOKE64,	{ RT, RAL, RB } },</div><div class='del'>-</div><div class='del'>-{ "mtdcrx",  X(31,387),	X_MASK,		BOOKE,		{ RA, RS } },</div><div class='del'>-</div><div class='del'>-{ "dcblc",   X(31,390),	X_MASK,		PPCCHLK,	{ CT, RA, RB }},</div><div class='del'>-</div><div class='del'>-{ "subfe64", XO(31,392,0,0), XO_MASK,	BOOKE64,	{ RT, RA, RB } },</div><div class='del'>-{ "subfe64o",XO(31,392,1,0), XO_MASK,	BOOKE64,	{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "adde64",  XO(31,394,0,0), XO_MASK,	BOOKE64,	{ RT, RA, RB } },</div><div class='del'>-{ "adde64o", XO(31,394,1,0), XO_MASK,	BOOKE64,	{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "dcblce",  X(31,398),	X_MASK,		PPCCHLK64,	{ CT, RA, RB }},</div><div class='del'>-</div><div class='del'>-{ "slbmte",  X(31,402), XRA_MASK,	PPC64,		{ RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "sthx",    X(31,407),	X_MASK,		COM,		{ RS, RA0, RB } },</div><div class='del'>-</div><div class='del'>-{ "cmpb",    X(31,508),	X_MASK,		POWER6,		{ RA, RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "lfqx",    X(31,791),	X_MASK,		POWER2,		{ FRT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "lfdpx",   X(31,791),	X_MASK,		POWER6,		{ FRT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "lfqux",   X(31,823),	X_MASK,		POWER2,		{ FRT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "stfqx",   X(31,919),	X_MASK,		POWER2,		{ FRS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "stfdpx",  X(31,919),	X_MASK,		POWER6,		{ FRS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "stfqux",  X(31,951),	X_MASK,		POWER2,		{ FRS, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "orc",     XRC(31,412,0), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-{ "orc.",    XRC(31,412,1), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "sradi",   XS(31,413,0), XS_MASK,	PPC64,		{ RA, RS, SH6 } },</div><div class='del'>-{ "sradi.",  XS(31,413,1), XS_MASK,	PPC64,		{ RA, RS, SH6 } },</div><div class='del'>-</div><div class='del'>-{ "sthxe",   X(31,415),	X_MASK,		BOOKE64,	{ RS, RA0, RB } },</div><div class='del'>-</div><div class='del'>-{ "slbie",   X(31,434),	XRTRA_MASK,	PPC64,		{ RB } },</div><div class='del'>-</div><div class='del'>-{ "ecowx",   X(31,438),	X_MASK,		PPC,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "sthux",   X(31,439),	X_MASK,		COM,		{ RS, RAS, RB } },</div><div class='del'>-</div><div class='del'>-{ "sthuxe",  X(31,447),	X_MASK,		BOOKE64,	{ RS, RAS, RB } },</div><div class='del'>-</div><div class='del'>-{ "mr",	     XRC(31,444,0), X_MASK,	COM,		{ RA, RS, RBS } },</div><div class='del'>-{ "or",      XRC(31,444,0), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-{ "mr.",     XRC(31,444,1), X_MASK,	COM,		{ RA, RS, RBS } },</div><div class='del'>-{ "or.",     XRC(31,444,1), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "mtexisr",  XSPR(31,451,64),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtexier",  XSPR(31,451,66),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtbr0",    XSPR(31,451,128), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtbr1",    XSPR(31,451,129), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtbr2",    XSPR(31,451,130), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtbr3",    XSPR(31,451,131), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtbr4",    XSPR(31,451,132), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtbr5",    XSPR(31,451,133), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtbr6",    XSPR(31,451,134), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtbr7",    XSPR(31,451,135), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtbear",   XSPR(31,451,144), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtbesr",   XSPR(31,451,145), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtiocr",   XSPR(31,451,160), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmacr0", XSPR(31,451,192), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmact0", XSPR(31,451,193), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmada0", XSPR(31,451,194), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmasa0", XSPR(31,451,195), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmacc0", XSPR(31,451,196), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmacr1", XSPR(31,451,200), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmact1", XSPR(31,451,201), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmada1", XSPR(31,451,202), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmasa1", XSPR(31,451,203), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmacc1", XSPR(31,451,204), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmacr2", XSPR(31,451,208), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmact2", XSPR(31,451,209), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmada2", XSPR(31,451,210), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmasa2", XSPR(31,451,211), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmacc2", XSPR(31,451,212), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmacr3", XSPR(31,451,216), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmact3", XSPR(31,451,217), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmada3", XSPR(31,451,218), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmasa3", XSPR(31,451,219), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmacc3", XSPR(31,451,220), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdmasr",  XSPR(31,451,224), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdcr",    X(31,451),	X_MASK,	PPC403 | BOOKE,	{ SPR, RS } },</div><div class='del'>-</div><div class='del'>-{ "subfze64",XO(31,456,0,0), XORB_MASK, BOOKE64,	{ RT, RA } },</div><div class='del'>-{ "subfze64o",XO(31,456,1,0), XORB_MASK, BOOKE64,	{ RT, RA } },</div><div class='del'>-</div><div class='del'>-{ "divdu",   XO(31,457,0,0), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-{ "divdu.",  XO(31,457,0,1), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-{ "divduo",  XO(31,457,1,0), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-{ "divduo.", XO(31,457,1,1), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "addze64", XO(31,458,0,0), XORB_MASK, BOOKE64,	{ RT, RA } },</div><div class='del'>-{ "addze64o",XO(31,458,1,0), XORB_MASK, BOOKE64,	{ RT, RA } },</div><div class='del'>-</div><div class='del'>-{ "divwu",   XO(31,459,0,0), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "divwu.",  XO(31,459,0,1), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "divwuo",  XO(31,459,1,0), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "divwuo.", XO(31,459,1,1), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "mtmq",      XSPR(31,467,0),    XSPR_MASK, M601,	{ RS } },</div><div class='del'>-{ "mtxer",     XSPR(31,467,1),    XSPR_MASK, COM,	{ RS } },</div><div class='del'>-{ "mtlr",      XSPR(31,467,8),    XSPR_MASK, COM,	{ RS } },</div><div class='del'>-{ "mtctr",     XSPR(31,467,9),    XSPR_MASK, COM,	{ RS } },</div><div class='del'>-{ "mttid",     XSPR(31,467,17),   XSPR_MASK, POWER,	{ RS } },</div><div class='del'>-{ "mtdsisr",   XSPR(31,467,18),   XSPR_MASK, COM,	{ RS } },</div><div class='del'>-{ "mtdar",     XSPR(31,467,19),   XSPR_MASK, COM,	{ RS } },</div><div class='del'>-{ "mtrtcu",    XSPR(31,467,20),   XSPR_MASK, COM,	{ RS } },</div><div class='del'>-{ "mtrtcl",    XSPR(31,467,21),   XSPR_MASK, COM,	{ RS } },</div><div class='del'>-{ "mtdec",     XSPR(31,467,22),   XSPR_MASK, COM,	{ RS } },</div><div class='del'>-{ "mtsdr0",    XSPR(31,467,24),   XSPR_MASK, POWER,	{ RS } },</div><div class='del'>-{ "mtsdr1",    XSPR(31,467,25),   XSPR_MASK, COM,	{ RS } },</div><div class='del'>-{ "mtsrr0",    XSPR(31,467,26),   XSPR_MASK, COM,	{ RS } },</div><div class='del'>-{ "mtsrr1",    XSPR(31,467,27),   XSPR_MASK, COM,	{ RS } },</div><div class='del'>-{ "mtcfar",    XSPR(31,467,28),   XSPR_MASK, POWER6,	{ RS } },</div><div class='del'>-{ "mtpid",     XSPR(31,467,48),   XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtpid",     XSPR(31,467,945),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdecar",   XSPR(31,467,54),   XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtcsrr0",   XSPR(31,467,58),   XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtcsrr1",   XSPR(31,467,59),   XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtdear",    XSPR(31,467,61),   XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtdear",    XSPR(31,467,981),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtesr",     XSPR(31,467,62),   XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtesr",     XSPR(31,467,980),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtivpr",    XSPR(31,467,63),   XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtcmpa",    XSPR(31,467,144),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtcmpb",    XSPR(31,467,145),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtcmpc",    XSPR(31,467,146),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtcmpd",    XSPR(31,467,147),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mticr",     XSPR(31,467,148),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtder",     XSPR(31,467,149),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtcounta",  XSPR(31,467,150),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtcountb",  XSPR(31,467,151),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtcmpe",    XSPR(31,467,152),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtcmpf",    XSPR(31,467,153),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtcmpg",    XSPR(31,467,154),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtcmph",    XSPR(31,467,155),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtlctrl1",  XSPR(31,467,156),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtlctrl2",  XSPR(31,467,157),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtictrl",   XSPR(31,467,158),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtbar",     XSPR(31,467,159),  XSPR_MASK, PPC860,	{ RS } },</div><div class='del'>-{ "mtvrsave",  XSPR(31,467,256),  XSPR_MASK, PPCVEC,	{ RS } },</div><div class='del'>-{ "mtusprg0",  XSPR(31,467,256),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtsprg",    XSPR(31,467,256),  XSPRG_MASK,PPC,	{ SPRG, RS } },</div><div class='del'>-{ "mtsprg0",   XSPR(31,467,272),  XSPR_MASK, PPC,	{ RS } },</div><div class='del'>-{ "mtsprg1",   XSPR(31,467,273),  XSPR_MASK, PPC,	{ RS } },</div><div class='del'>-{ "mtsprg2",   XSPR(31,467,274),  XSPR_MASK, PPC,	{ RS } },</div><div class='del'>-{ "mtsprg3",   XSPR(31,467,275),  XSPR_MASK, PPC,	{ RS } },</div><div class='del'>-{ "mtsprg4",   XSPR(31,467,276),  XSPR_MASK, PPC405 | BOOKE, { RS } },</div><div class='del'>-{ "mtsprg5",   XSPR(31,467,277),  XSPR_MASK, PPC405 | BOOKE, { RS } },</div><div class='del'>-{ "mtsprg6",   XSPR(31,467,278),  XSPR_MASK, PPC405 | BOOKE, { RS } },</div><div class='del'>-{ "mtsprg7",   XSPR(31,467,279),  XSPR_MASK, PPC405 | BOOKE, { RS } },</div><div class='del'>-{ "mtasr",     XSPR(31,467,280),  XSPR_MASK, PPC64,	{ RS } },</div><div class='del'>-{ "mtear",     XSPR(31,467,282),  XSPR_MASK, PPC,	{ RS } },</div><div class='del'>-{ "mttbl",     XSPR(31,467,284),  XSPR_MASK, PPC,	{ RS } },</div><div class='del'>-{ "mttbu",     XSPR(31,467,285),  XSPR_MASK, PPC,	{ RS } },</div><div class='del'>-{ "mtdbsr",    XSPR(31,467,304),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtdbsr",    XSPR(31,467,1008), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdbcr0",   XSPR(31,467,308),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtdbcr0",   XSPR(31,467,1010), XSPR_MASK, PPC405,	{ RS } },</div><div class='del'>-{ "mtdbcr1",   XSPR(31,467,309),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtdbcr1",   XSPR(31,467,957),  XSPR_MASK, PPC405,	{ RS } },</div><div class='del'>-{ "mtdbcr2",   XSPR(31,467,310),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtiac1",    XSPR(31,467,312),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtiac1",    XSPR(31,467,1012), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtiac2",    XSPR(31,467,313),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtiac2",    XSPR(31,467,1013), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtiac3",    XSPR(31,467,314),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtiac3",    XSPR(31,467,948),  XSPR_MASK, PPC405,	{ RS } },</div><div class='del'>-{ "mtiac4",    XSPR(31,467,315),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtiac4",    XSPR(31,467,949),  XSPR_MASK, PPC405,	{ RS } },</div><div class='del'>-{ "mtdac1",    XSPR(31,467,316),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtdac1",    XSPR(31,467,1014), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdac2",    XSPR(31,467,317),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtdac2",    XSPR(31,467,1015), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtdvc1",    XSPR(31,467,318),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtdvc1",    XSPR(31,467,950),  XSPR_MASK, PPC405,	{ RS } },</div><div class='del'>-{ "mtdvc2",    XSPR(31,467,319),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtdvc2",    XSPR(31,467,951),  XSPR_MASK, PPC405,	{ RS } },</div><div class='del'>-{ "mttsr",     XSPR(31,467,336),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mttsr",     XSPR(31,467,984),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mttcr",     XSPR(31,467,340),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mttcr",     XSPR(31,467,986),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtivor0",   XSPR(31,467,400),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor1",   XSPR(31,467,401),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor2",   XSPR(31,467,402),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor3",   XSPR(31,467,403),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor4",   XSPR(31,467,404),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor5",   XSPR(31,467,405),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor6",   XSPR(31,467,406),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor7",   XSPR(31,467,407),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor8",   XSPR(31,467,408),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor9",   XSPR(31,467,409),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor10",  XSPR(31,467,410),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor11",  XSPR(31,467,411),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor12",  XSPR(31,467,412),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor13",  XSPR(31,467,413),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor14",  XSPR(31,467,414),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtivor15",  XSPR(31,467,415),  XSPR_MASK, BOOKE,     { RS } },</div><div class='del'>-{ "mtspefscr",  XSPR(31,467,512),  XSPR_MASK, PPCSPE,   { RS } },</div><div class='del'>-{ "mtbbear",   XSPR(31,467,513),  XSPR_MASK, PPCBRLK,   { RS } },</div><div class='del'>-{ "mtbbtar",   XSPR(31,467,514),  XSPR_MASK, PPCBRLK,  { RS } },</div><div class='del'>-{ "mtivor32",  XSPR(31,467,528),  XSPR_MASK, PPCSPE,	{ RS } },</div><div class='del'>-{ "mtivor33",  XSPR(31,467,529),  XSPR_MASK, PPCSPE,	{ RS } },</div><div class='del'>-{ "mtivor34",  XSPR(31,467,530),  XSPR_MASK, PPCSPE,	{ RS } },</div><div class='del'>-{ "mtivor35",  XSPR(31,467,531),  XSPR_MASK, PPCPMR,	{ RS } },</div><div class='del'>-{ "mtibatu",   XSPR(31,467,528),  XSPRBAT_MASK, PPC,	{ SPRBAT, RS } },</div><div class='del'>-{ "mtibatl",   XSPR(31,467,529),  XSPRBAT_MASK, PPC,	{ SPRBAT, RS } },</div><div class='del'>-{ "mtdbatu",   XSPR(31,467,536),  XSPRBAT_MASK, PPC,	{ SPRBAT, RS } },</div><div class='del'>-{ "mtdbatl",   XSPR(31,467,537),  XSPRBAT_MASK, PPC,	{ SPRBAT, RS } },</div><div class='del'>-{ "mtmcsrr0",  XSPR(31,467,570),  XSPR_MASK, PPCRFMCI,  { RS } },</div><div class='del'>-{ "mtmcsrr1",  XSPR(31,467,571),  XSPR_MASK, PPCRFMCI,  { RS } },</div><div class='del'>-{ "mtmcsr",    XSPR(31,467,572),  XSPR_MASK, PPCRFMCI,  { RS } },</div><div class='del'>-{ "mtummcr0",  XSPR(31,467,936),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtupmc1",   XSPR(31,467,937),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtupmc2",   XSPR(31,467,938),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtusia",    XSPR(31,467,939),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtummcr1",  XSPR(31,467,940),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtupmc3",   XSPR(31,467,941),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtupmc4",   XSPR(31,467,942),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtzpr",     XSPR(31,467,944),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtccr0",    XSPR(31,467,947),  XSPR_MASK, PPC405,	{ RS } },</div><div class='del'>-{ "mtmmcr0",   XSPR(31,467,952),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtsgr",     XSPR(31,467,953),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtpmc1",    XSPR(31,467,953),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtdcwr",    XSPR(31,467,954),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtpmc2",    XSPR(31,467,954),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtsler",    XSPR(31,467,955),  XSPR_MASK, PPC405,	{ RS } },</div><div class='del'>-{ "mtsia",     XSPR(31,467,955),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtsu0r",    XSPR(31,467,956),  XSPR_MASK, PPC405,	{ RS } },</div><div class='del'>-{ "mtmmcr1",   XSPR(31,467,956),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtpmc3",    XSPR(31,467,957),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtpmc4",    XSPR(31,467,958),  XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mticdbdr",  XSPR(31,467,979),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtevpr",    XSPR(31,467,982),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtcdbcr",   XSPR(31,467,983),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtpit",     XSPR(31,467,987),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mttbhi",    XSPR(31,467,988),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mttblo",    XSPR(31,467,989),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtsrr2",    XSPR(31,467,990),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtsrr3",    XSPR(31,467,991),  XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtl2cr",    XSPR(31,467,1017), XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtdccr",    XSPR(31,467,1018), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mticcr",    XSPR(31,467,1019), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtictc",    XSPR(31,467,1019), XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtpbl1",    XSPR(31,467,1020), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtthrm1",   XSPR(31,467,1020), XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtpbu1",    XSPR(31,467,1021), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtthrm2",   XSPR(31,467,1021), XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtpbl2",    XSPR(31,467,1022), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtthrm3",   XSPR(31,467,1022), XSPR_MASK, PPC750,    { RS } },</div><div class='del'>-{ "mtpbu2",    XSPR(31,467,1023), XSPR_MASK, PPC403,	{ RS } },</div><div class='del'>-{ "mtspr",     X(31,467),	  X_MASK,    COM,	{ SPR, RS } },</div><div class='del'>-</div><div class='del'>-{ "dcbi",    X(31,470),	XRT_MASK,	PPC,		{ RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "nand",    XRC(31,476,0), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-{ "nand.",   XRC(31,476,1), X_MASK,	COM,		{ RA, RS, RB } },</div><div class='del'>-</div><div class='del'>-{ "dcbie",   X(31,478),	XRT_MASK,	BOOKE64,	{ RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "dcread",  X(31,486),	X_MASK,		PPC403|PPC440,	{ RT, RA, RB }},</div><div class='del'>-</div><div class='del'>-{ "mtpmr",   X(31,462),	X_MASK,		PPCPMR,		{ PMR, RS }},</div><div class='del'>-</div><div class='del'>-{ "icbtls",  X(31,486),	X_MASK,		PPCCHLK,	{ CT, RA, RB }},</div><div class='del'>-</div><div class='del'>-{ "nabs",    XO(31,488,0,0), XORB_MASK, M601,		{ RT, RA } },</div><div class='del'>-{ "subfme64",XO(31,488,0,0), XORB_MASK, BOOKE64,	{ RT, RA } },</div><div class='del'>-{ "nabs.",   XO(31,488,0,1), XORB_MASK, M601,		{ RT, RA } },</div><div class='del'>-{ "nabso",   XO(31,488,1,0), XORB_MASK, M601,		{ RT, RA } },</div><div class='del'>-{ "subfme64o",XO(31,488,1,0), XORB_MASK, BOOKE64,	{ RT, RA } },</div><div class='del'>-{ "nabso.",  XO(31,488,1,1), XORB_MASK, M601,		{ RT, RA } },</div><div class='del'>-</div><div class='del'>-{ "divd",    XO(31,489,0,0), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-{ "divd.",   XO(31,489,0,1), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-{ "divdo",   XO(31,489,1,0), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-{ "divdo.",  XO(31,489,1,1), XO_MASK,	PPC64,		{ RT, RA, RB } },</div><div class='del'>-</div><div class='del'>-{ "addme64", XO(31,490,0,0), XORB_MASK, BOOKE64,	{ RT, RA } },</div><div class='del'>-{ "addme64o",XO(31,490,1,0), XORB_MASK, BOOKE64,	{ RT, RA } },</div><div class='del'>-</div><div class='del'>-{ "divw",    XO(31,491,0,0), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "divw.",   XO(31,491,0,1), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "divwo",   XO(31,491,1,0), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='del'>-{ "divwo.",  XO(31,491,1,1), XO_MASK,	PPC,		{ RT, RA, RB } },</div><div class='add'>+{"cdtbcd",	X(31,282),	XRB_MASK,    POWER6,	0,		{RA, RS}},</div><div class='ctx'> </div><div class='del'>-{ "icbtlse", X(31,494),	X_MASK,		PPCCHLK64,	{ CT, RA, RB }},</div><div class='add'>+{"eqv",		XRC(31,284,0),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+{"eqv.",	XRC(31,284,1),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "slbia",   X(31,498),	0xffffffff,	PPC64,		{ 0 } },</div><div class='add'>+{"lhepx",	X(31,287),	X_MASK,	  E500MC|PPCA2, 0,		{RT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "cli",     X(31,502), XRB_MASK,	POWER,		{ RT, RA } },</div><div class='add'>+{"mfdcrux",	X(31,291),	X_MASK,	     PPC464,	0,		{RS, RA}},</div><div class='ctx'> </div><div class='del'>-{ "stdcxe.", XRC(31,511,1), X_MASK,	BOOKE64,	{ RS, RA, RB } },</div><div class='add'>+{"lvexhx",	X(31,293),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='add'>+{"lvepx",	X(31,295),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mcrxr",   X(31,512),	XRARB_MASK|(3&lt;&lt;21), COM,	{ BF } },</div><div class='add'>+{"lxvll",	X(31,301),	XX1_MASK,    PPCVSX3,	0,		{XT6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "bblels",  X(31,518),	X_MASK,		PPCBRLK,	{ 0 }},</div><div class='del'>-{ "mcrxr64", X(31,544),	XRARB_MASK|(3&lt;&lt;21), BOOKE64,	{ BF } },</div><div class='add'>+{"mfbhrbe",	X(31,302),	X_MASK,	     POWER8,	0,		{RT, BHRBE}},</div><div class='add'>+</div><div class='add'>+{"tlbie",	X(31,306),	X_MASK|1&lt;&lt;20,POWER9,	TITAN,		{RB, RS, RIC, PRS, X_R}},</div><div class='add'>+{"tlbie",	X(31,306),	XRA_MASK,    POWER7,	POWER9|TITAN,	{RB, RS}},</div><div class='add'>+{"tlbie",	X(31,306),	XRTLRA_MASK, PPC,    E500|POWER7|TITAN,	{RB, LOPT}},</div><div class='add'>+{"tlbi",	X(31,306),	XRT_MASK,    POWER,	0,		{RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"mfvsrld",	X(31,307),	XX1RB_MASK,  PPCVSX3,	0,		{RA, XS6}},</div><div class='add'>+</div><div class='add'>+{"ldmx",	X(31,309),	X_MASK,	     POWER9,	0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"eciwx",	X(31,310),	X_MASK,	     PPC,	E500|TITAN,	{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"lhzux",	X(31,311),	X_MASK,	     COM,	0,		{RT, RAL, RB}},</div><div class='add'>+</div><div class='add'>+{"cbcdtd",	X(31,314),	XRB_MASK,    POWER6,	0,		{RA, RS}},</div><div class='add'>+</div><div class='add'>+{"xor",		XRC(31,316,0),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+{"xor.",	XRC(31,316,1),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"dcbtep",	XRT(31,319,0),	X_MASK,	  E500MC|PPCA2, 0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"mfexisr",	XSPR(31,323, 64), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfexier",	XSPR(31,323, 66), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfbr0",	XSPR(31,323,128), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfbr1",	XSPR(31,323,129), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfbr2",	XSPR(31,323,130), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfbr3",	XSPR(31,323,131), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfbr4",	XSPR(31,323,132), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfbr5",	XSPR(31,323,133), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfbr6",	XSPR(31,323,134), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfbr7",	XSPR(31,323,135), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfbear",	XSPR(31,323,144), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfbesr",	XSPR(31,323,145), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfiocr",	XSPR(31,323,160), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmacr0",	XSPR(31,323,192), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmact0",	XSPR(31,323,193), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmada0",	XSPR(31,323,194), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmasa0",	XSPR(31,323,195), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmacc0",	XSPR(31,323,196), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmacr1",	XSPR(31,323,200), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmact1",	XSPR(31,323,201), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmada1",	XSPR(31,323,202), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmasa1",	XSPR(31,323,203), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmacc1",	XSPR(31,323,204), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmacr2",	XSPR(31,323,208), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmact2",	XSPR(31,323,209), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmada2",	XSPR(31,323,210), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmasa2",	XSPR(31,323,211), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmacc2",	XSPR(31,323,212), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmacr3",	XSPR(31,323,216), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmact3",	XSPR(31,323,217), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmada3",	XSPR(31,323,218), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmasa3",	XSPR(31,323,219), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmacc3",	XSPR(31,323,220), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdmasr",	XSPR(31,323,224), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdcr",	X(31,323), X_MASK, PPC403|BOOKE|PPCA2|PPC476, E500|TITAN, {RT, SPR}},</div><div class='add'>+{"mfdcr.",	XRC(31,323,1),	X_MASK,	     PPCA2,	0,		{RT, SPR}},</div><div class='add'>+</div><div class='add'>+{"lvexwx",	X(31,325),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"dcread",	X(31,326),	X_MASK,	  PPC476|TITAN,	0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"div",		XO(31,331,0,0),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='add'>+{"div.",	XO(31,331,0,1),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"lxvdsx",	X(31,332),	XX1_MASK,    PPCVSX,	0,		{XT6, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"mfpmr",	X(31,334),	X_MASK, PPCPMR|PPCE300, 0,		{RT, PMR}},</div><div class='add'>+{"mftmr",	X(31,366),	X_MASK,	PPCTMR|E6500,	0,		{RT, TMR}},</div><div class='add'>+</div><div class='add'>+{"slbsync",	X(31,338),	0xffffffff,  POWER9,	0,		{0}},</div><div class='add'>+</div><div class='add'>+{"mfmq",	XSPR(31,339,  0), XSPR_MASK, M601,	0,		{RT}},</div><div class='add'>+{"mfxer",	XSPR(31,339,  1), XSPR_MASK, COM,	0,		{RT}},</div><div class='add'>+{"mfrtcu",	XSPR(31,339,  4), XSPR_MASK, COM,	TITAN,		{RT}},</div><div class='add'>+{"mfrtcl",	XSPR(31,339,  5), XSPR_MASK, COM,	TITAN,		{RT}},</div><div class='add'>+{"mfdec",	XSPR(31,339,  6), XSPR_MASK, MFDEC1,	0,		{RT}},</div><div class='add'>+{"mflr",	XSPR(31,339,  8), XSPR_MASK, COM,	0,		{RT}},</div><div class='add'>+{"mfctr",	XSPR(31,339,  9), XSPR_MASK, COM,	0,		{RT}},</div><div class='add'>+{"mfdscr",	XSPR(31,339, 17), XSPR_MASK, POWER6,	0,		{RT}},</div><div class='add'>+{"mftid",	XSPR(31,339, 17), XSPR_MASK, POWER,	0,		{RT}},</div><div class='add'>+{"mfdsisr",	XSPR(31,339, 18), XSPR_MASK, COM,	TITAN,		{RT}},</div><div class='add'>+{"mfdar",	XSPR(31,339, 19), XSPR_MASK, COM,	TITAN,		{RT}},</div><div class='add'>+{"mfdec",	XSPR(31,339, 22), XSPR_MASK, MFDEC2,	MFDEC1,		{RT}},</div><div class='add'>+{"mfsdr0",	XSPR(31,339, 24), XSPR_MASK, POWER,	0,		{RT}},</div><div class='add'>+{"mfsdr1",	XSPR(31,339, 25), XSPR_MASK, COM,	TITAN,		{RT}},</div><div class='add'>+{"mfsrr0",	XSPR(31,339, 26), XSPR_MASK, COM,	0,		{RT}},</div><div class='add'>+{"mfsrr1",	XSPR(31,339, 27), XSPR_MASK, COM,	0,		{RT}},</div><div class='add'>+{"mfcfar",	XSPR(31,339, 28), XSPR_MASK, POWER6,	0,		{RT}},</div><div class='add'>+{"mfpid",	XSPR(31,339, 48), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfcsrr0",	XSPR(31,339, 58), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfcsrr1",	XSPR(31,339, 59), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfdear",	XSPR(31,339, 61), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfesr",	XSPR(31,339, 62), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivpr",	XSPR(31,339, 63), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfctrl",	XSPR(31,339,136), XSPR_MASK, POWER4,	0,		{RT}},</div><div class='add'>+{"mfcmpa",	XSPR(31,339,144), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfcmpb",	XSPR(31,339,145), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfcmpc",	XSPR(31,339,146), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfcmpd",	XSPR(31,339,147), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mficr",	XSPR(31,339,148), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfder",	XSPR(31,339,149), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfcounta",	XSPR(31,339,150), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfcountb",	XSPR(31,339,151), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfcmpe",	XSPR(31,339,152), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfcmpf",	XSPR(31,339,153), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfcmpg",	XSPR(31,339,154), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfcmph",	XSPR(31,339,155), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mflctrl1",	XSPR(31,339,156), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mflctrl2",	XSPR(31,339,157), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfictrl",	XSPR(31,339,158), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfbar",	XSPR(31,339,159), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfvrsave",	XSPR(31,339,256), XSPR_MASK, PPCVEC,	0,		{RT}},</div><div class='add'>+{"mfusprg0",	XSPR(31,339,256), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfsprg",	XSPR(31,339,256), XSPRG_MASK, PPC,	0,		{RT, SPRG}},</div><div class='add'>+{"mfsprg4",	XSPR(31,339,260), XSPR_MASK, PPC405|BOOKE, 0,		{RT}},</div><div class='add'>+{"mfsprg5",	XSPR(31,339,261), XSPR_MASK, PPC405|BOOKE, 0,		{RT}},</div><div class='add'>+{"mfsprg6",	XSPR(31,339,262), XSPR_MASK, PPC405|BOOKE, 0,		{RT}},</div><div class='add'>+{"mfsprg7",	XSPR(31,339,263), XSPR_MASK, PPC405|BOOKE, 0,		{RT}},</div><div class='add'>+{"mftbu",	XSPR(31,339,269), XSPR_MASK, POWER4|BOOKE, 0,		{RT}},</div><div class='add'>+{"mftb",	X(31,339),	  X_MASK,    POWER4|BOOKE, 0,		{RT, TBR}},</div><div class='add'>+{"mftbl",	XSPR(31,339,268), XSPR_MASK, POWER4|BOOKE, 0,		{RT}},</div><div class='add'>+{"mfsprg0",	XSPR(31,339,272), XSPR_MASK, PPC,	0,		{RT}},</div><div class='add'>+{"mfsprg1",	XSPR(31,339,273), XSPR_MASK, PPC,	0,		{RT}},</div><div class='add'>+{"mfsprg2",	XSPR(31,339,274), XSPR_MASK, PPC,	0,		{RT}},</div><div class='add'>+{"mfsprg3",	XSPR(31,339,275), XSPR_MASK, PPC,	0,		{RT}},</div><div class='add'>+{"mfasr",	XSPR(31,339,280), XSPR_MASK, PPC64,	0,		{RT}},</div><div class='add'>+{"mfear",	XSPR(31,339,282), XSPR_MASK, PPC,	TITAN,		{RT}},</div><div class='add'>+{"mfpir",	XSPR(31,339,286), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfpvr",	XSPR(31,339,287), XSPR_MASK, PPC,	0,		{RT}},</div><div class='add'>+{"mfdbsr",	XSPR(31,339,304), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfdbcr0",	XSPR(31,339,308), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfdbcr1",	XSPR(31,339,309), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfdbcr2",	XSPR(31,339,310), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfiac1",	XSPR(31,339,312), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfiac2",	XSPR(31,339,313), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfiac3",	XSPR(31,339,314), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfiac4",	XSPR(31,339,315), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfdac1",	XSPR(31,339,316), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfdac2",	XSPR(31,339,317), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfdvc1",	XSPR(31,339,318), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfdvc2",	XSPR(31,339,319), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mftsr",	XSPR(31,339,336), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mftcr",	XSPR(31,339,340), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor0",	XSPR(31,339,400), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor1",	XSPR(31,339,401), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor2",	XSPR(31,339,402), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor3",	XSPR(31,339,403), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor4",	XSPR(31,339,404), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor5",	XSPR(31,339,405), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor6",	XSPR(31,339,406), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor7",	XSPR(31,339,407), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor8",	XSPR(31,339,408), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor9",	XSPR(31,339,409), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor10",	XSPR(31,339,410), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor11",	XSPR(31,339,411), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor12",	XSPR(31,339,412), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor13",	XSPR(31,339,413), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor14",	XSPR(31,339,414), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfivor15",	XSPR(31,339,415), XSPR_MASK, BOOKE,	0,		{RT}},</div><div class='add'>+{"mfspefscr",	XSPR(31,339,512), XSPR_MASK, PPCSPE,	0,		{RT}},</div><div class='add'>+{"mfbbear",	XSPR(31,339,513), XSPR_MASK, PPCBRLK,	0,		{RT}},</div><div class='add'>+{"mfbbtar",	XSPR(31,339,514), XSPR_MASK, PPCBRLK,	0,		{RT}},</div><div class='add'>+{"mfivor32",	XSPR(31,339,528), XSPR_MASK, PPCSPE,	0,		{RT}},</div><div class='add'>+{"mfibatu",	XSPR(31,339,528), XSPRBAT_MASK, PPC,	TITAN,		{RT, SPRBAT}},</div><div class='add'>+{"mfivor33",	XSPR(31,339,529), XSPR_MASK, PPCSPE,	0,		{RT}},</div><div class='add'>+{"mfibatl",	XSPR(31,339,529), XSPRBAT_MASK, PPC,	TITAN,		{RT, SPRBAT}},</div><div class='add'>+{"mfivor34",	XSPR(31,339,530), XSPR_MASK, PPCSPE,	0,		{RT}},</div><div class='add'>+{"mfivor35",	XSPR(31,339,531), XSPR_MASK, PPCPMR,	0,		{RT}},</div><div class='add'>+{"mfdbatu",	XSPR(31,339,536), XSPRBAT_MASK, PPC,	TITAN,		{RT, SPRBAT}},</div><div class='add'>+{"mfdbatl",	XSPR(31,339,537), XSPRBAT_MASK, PPC,	TITAN,		{RT, SPRBAT}},</div><div class='add'>+{"mfic_cst",	XSPR(31,339,560), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfic_adr",	XSPR(31,339,561), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfic_dat",	XSPR(31,339,562), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfdc_cst",	XSPR(31,339,568), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfdc_adr",	XSPR(31,339,569), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfdc_dat",	XSPR(31,339,570), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmcsrr0",	XSPR(31,339,570), XSPR_MASK, PPCRFMCI,	0,		{RT}},</div><div class='add'>+{"mfmcsrr1",	XSPR(31,339,571), XSPR_MASK, PPCRFMCI,	0,		{RT}},</div><div class='add'>+{"mfmcsr",	XSPR(31,339,572), XSPR_MASK, PPCRFMCI,	0,		{RT}},</div><div class='add'>+{"mfmcar",	XSPR(31,339,573), XSPR_MASK, PPCRFMCI,	TITAN,		{RT}},</div><div class='add'>+{"mfdpdr",	XSPR(31,339,630), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfdpir",	XSPR(31,339,631), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfimmr",	XSPR(31,339,638), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmi_ctr",	XSPR(31,339,784), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmi_ap",	XSPR(31,339,786), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmi_epn",	XSPR(31,339,787), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmi_twc",	XSPR(31,339,789), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmi_rpn",	XSPR(31,339,790), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmd_ctr",	XSPR(31,339,792), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfm_casid",	XSPR(31,339,793), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmd_ap",	XSPR(31,339,794), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmd_epn",	XSPR(31,339,795), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmd_twb",	XSPR(31,339,796), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmd_twc",	XSPR(31,339,797), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmd_rpn",	XSPR(31,339,798), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfm_tw",	XSPR(31,339,799), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmi_dbcam",	XSPR(31,339,816), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmi_dbram0",	XSPR(31,339,817), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmi_dbram1",	XSPR(31,339,818), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmd_dbcam",	XSPR(31,339,824), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmd_dbram0",	XSPR(31,339,825), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfmd_dbram1",	XSPR(31,339,826), XSPR_MASK, PPC860,	0,		{RT}},</div><div class='add'>+{"mfivndx",	XSPR(31,339,880), XSPR_MASK, TITAN,	0,		{RT}},</div><div class='add'>+{"mfdvndx",	XSPR(31,339,881), XSPR_MASK, TITAN,	0,		{RT}},</div><div class='add'>+{"mfivlim",	XSPR(31,339,882), XSPR_MASK, TITAN,	0,		{RT}},</div><div class='add'>+{"mfdvlim",	XSPR(31,339,883), XSPR_MASK, TITAN,	0,		{RT}},</div><div class='add'>+{"mfclcsr",	XSPR(31,339,884), XSPR_MASK, TITAN,	0,		{RT}},</div><div class='add'>+{"mfccr1",	XSPR(31,339,888), XSPR_MASK, TITAN,	0,		{RT}},</div><div class='add'>+{"mfppr",	XSPR(31,339,896), XSPR_MASK, POWER7,	0,		{RT}},</div><div class='add'>+{"mfppr32",	XSPR(31,339,898), XSPR_MASK, POWER7,	0,		{RT}},</div><div class='add'>+{"mfrstcfg",	XSPR(31,339,923), XSPR_MASK, TITAN,	0,		{RT}},</div><div class='add'>+{"mfdcdbtrl",	XSPR(31,339,924), XSPR_MASK, TITAN,	0,		{RT}},</div><div class='add'>+{"mfdcdbtrh",	XSPR(31,339,925), XSPR_MASK, TITAN,	0,		{RT}},</div><div class='add'>+{"mficdbtr",	XSPR(31,339,927), XSPR_MASK, TITAN,	0,		{RT}},</div><div class='add'>+{"mfummcr0",	XSPR(31,339,936), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfupmc1",	XSPR(31,339,937), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfupmc2",	XSPR(31,339,938), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfusia",	XSPR(31,339,939), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfummcr1",	XSPR(31,339,940), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfupmc3",	XSPR(31,339,941), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfupmc4",	XSPR(31,339,942), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfzpr",	XSPR(31,339,944), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfpid",	XSPR(31,339,945), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfmmucr",	XSPR(31,339,946), XSPR_MASK, TITAN,	0,		{RT}},</div><div class='add'>+{"mfccr0",	XSPR(31,339,947), XSPR_MASK, PPC405|TITAN, 0,		{RT}},</div><div class='add'>+{"mfiac3",	XSPR(31,339,948), XSPR_MASK, PPC405,	0,		{RT}},</div><div class='add'>+{"mfiac4",	XSPR(31,339,949), XSPR_MASK, PPC405,	0,		{RT}},</div><div class='add'>+{"mfdvc1",	XSPR(31,339,950), XSPR_MASK, PPC405,	0,		{RT}},</div><div class='add'>+{"mfdvc2",	XSPR(31,339,951), XSPR_MASK, PPC405,	0,		{RT}},</div><div class='add'>+{"mfmmcr0",	XSPR(31,339,952), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfpmc1",	XSPR(31,339,953), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfsgr",	XSPR(31,339,953), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdcwr",	XSPR(31,339,954), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfpmc2",	XSPR(31,339,954), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfsia",	XSPR(31,339,955), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfsler",	XSPR(31,339,955), XSPR_MASK, PPC405,	0,		{RT}},</div><div class='add'>+{"mfmmcr1",	XSPR(31,339,956), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfsu0r",	XSPR(31,339,956), XSPR_MASK, PPC405,	0,		{RT}},</div><div class='add'>+{"mfdbcr1",	XSPR(31,339,957), XSPR_MASK, PPC405,	0,		{RT}},</div><div class='add'>+{"mfpmc3",	XSPR(31,339,957), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfpmc4",	XSPR(31,339,958), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mficdbdr",	XSPR(31,339,979), XSPR_MASK, PPC403|TITAN, 0,		{RT}},</div><div class='add'>+{"mfesr",	XSPR(31,339,980), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdear",	XSPR(31,339,981), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfevpr",	XSPR(31,339,982), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfcdbcr",	XSPR(31,339,983), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mftsr",	XSPR(31,339,984), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mftcr",	XSPR(31,339,986), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfpit",	XSPR(31,339,987), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mftbhi",	XSPR(31,339,988), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mftblo",	XSPR(31,339,989), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfsrr2",	XSPR(31,339,990), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfsrr3",	XSPR(31,339,991), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdbsr",	XSPR(31,339,1008), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdbcr0",	XSPR(31,339,1010), XSPR_MASK, PPC405,	0,		{RT}},</div><div class='add'>+{"mfdbdr",	XSPR(31,339,1011), XSPR_MASK, TITAN,	0,		{RS}},</div><div class='add'>+{"mfiac1",	XSPR(31,339,1012), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfiac2",	XSPR(31,339,1013), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdac1",	XSPR(31,339,1014), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfdac2",	XSPR(31,339,1015), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfl2cr",	XSPR(31,339,1017), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfdccr",	XSPR(31,339,1018), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mficcr",	XSPR(31,339,1019), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfictc",	XSPR(31,339,1019), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfpbl1",	XSPR(31,339,1020), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfthrm1",	XSPR(31,339,1020), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfpbu1",	XSPR(31,339,1021), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfthrm2",	XSPR(31,339,1021), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfpbl2",	XSPR(31,339,1022), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfthrm3",	XSPR(31,339,1022), XSPR_MASK, PPC750,	0,		{RT}},</div><div class='add'>+{"mfpbu2",	XSPR(31,339,1023), XSPR_MASK, PPC403,	0,		{RT}},</div><div class='add'>+{"mfspr",	X(31,339),	X_MASK,	     COM,	0,		{RT, SPR}},</div><div class='add'>+</div><div class='add'>+{"lwax",	X(31,341),	X_MASK,	     PPC64,	0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"dst",		XDSS(31,342,0),	XDSS_MASK,   PPCVEC,	0,		{RA, RB, STRM}},</div><div class='add'>+</div><div class='add'>+{"lhax",	X(31,343),	X_MASK,	     COM,	0,		{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"lvxl",	X(31,359),	X_MASK,	     PPCVEC,	0,		{VD, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"abs",		XO(31,360,0,0),	XORB_MASK,   M601,	0,		{RT, RA}},</div><div class='add'>+{"abs.",	XO(31,360,0,1),	XORB_MASK,   M601,	0,		{RT, RA}},</div><div class='add'>+</div><div class='add'>+{"divs",	XO(31,363,0,0),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='add'>+{"divs.",	XO(31,363,0,1),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"lxvwsx",	X(31,364),	XX1_MASK,    PPCVSX3,	0,		{XT6, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"tlbia",	X(31,370),	0xffffffff,  PPC,	E500|TITAN,	{0}},</div><div class='add'>+</div><div class='add'>+{"mftbu",	XSPR(31,371,269), XSPR_MASK, PPC,	NO371|POWER4,	{RT}},</div><div class='add'>+{"mftb",	X(31,371),	X_MASK,	     PPC,	NO371|POWER4,	{RT, TBR}},</div><div class='add'>+{"mftbl",	XSPR(31,371,268), XSPR_MASK, PPC,	NO371|POWER4,	{RT}},</div><div class='add'>+</div><div class='add'>+{"lwaux",	X(31,373),	X_MASK,	     PPC64,	0,		{RT, RAL, RB}},</div><div class='add'>+</div><div class='add'>+{"dstst",	XDSS(31,374,0),	XDSS_MASK,   PPCVEC,	0,		{RA, RB, STRM}},</div><div class='add'>+</div><div class='add'>+{"lhaux",	X(31,375),	X_MASK,	     COM,	0,		{RT, RAL, RB}},</div><div class='add'>+</div><div class='add'>+{"popcntw",	X(31,378),	XRB_MASK,    POWER7|PPCA2, 0,		{RA, RS}},</div><div class='add'>+</div><div class='add'>+{"mtdcrx",	X(31,387),	X_MASK,	     BOOKE|PPCA2|PPC476, TITAN,	{RA, RS}},</div><div class='add'>+{"mtdcrx.",	XRC(31,387,1),	X_MASK,	     PPCA2,	0,		{RA, RS}},</div><div class='add'>+</div><div class='add'>+{"stvexbx",	X(31,389),	X_MASK,	     PPCVEC2,	0,		{VS, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"dcblc",	X(31,390),	X_MASK,	 PPCCHLK|PPC476|TITAN, 0,	{CT, RA0, RB}},</div><div class='add'>+{"stdfcmx",	APU(31,391,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"divdeu",	XO(31,393,0,0),	XO_MASK,     POWER7|PPCA2, 0,		{RT, RA, RB}},</div><div class='add'>+{"divdeu.",	XO(31,393,0,1),	XO_MASK,     POWER7|PPCA2, 0,		{RT, RA, RB}},</div><div class='add'>+{"divweu",	XO(31,395,0,0),	XO_MASK,     POWER7|PPCA2, 0,		{RT, RA, RB}},</div><div class='add'>+{"divweu.",	XO(31,395,0,1),	XO_MASK,     POWER7|PPCA2, 0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"stxvx",	X(31,396),	XX1_MASK,    PPCVSX3,	0,		{XS6, RA0, RB}},</div><div class='add'>+{"stxvl",	X(31,397),	XX1_MASK,    PPCVSX3,	0,		{XS6, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"dcblce",	X(31,398),	X_MASK,	     PPCCHLK,	E500MC,		{CT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"slbmte",	X(31,402),	XRA_MASK,    PPC64,	0,		{RS, RB}},</div><div class='add'>+</div><div class='add'>+{"mtvsrws",	X(31,403),	XX1RB_MASK,  PPCVSX3,	0,		{XT6, RA}},</div><div class='add'>+</div><div class='add'>+{"pbt.",	XRC(31,404,1),	X_MASK,	     POWER8,	0,		{RS, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"icswx",	XRC(31,406,0),	X_MASK,	  POWER7|PPCA2,	0,		{RS, RA, RB}},</div><div class='add'>+{"icswx.",	XRC(31,406,1),	X_MASK,	  POWER7|PPCA2,	0,		{RS, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"sthx",	X(31,407),	X_MASK,	     COM,	0,		{RS, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"orc",		XRC(31,412,0),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+{"orc.",	XRC(31,412,1),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"sthepx",	X(31,415),	X_MASK,	  E500MC|PPCA2, 0,		{RS, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"mtdcrux",	X(31,419),	X_MASK,	     PPC464,	0,		{RA, RS}},</div><div class='add'>+</div><div class='add'>+{"stvexhx",	X(31,421),	X_MASK,	     PPCVEC2,	0,		{VS, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"dcblq.",	XRC(31,422,1),	X_MASK,	     E6500,	0,		{CT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"divde",	XO(31,425,0,0),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='add'>+{"divde.",	XO(31,425,0,1),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='add'>+{"divwe",	XO(31,427,0,0),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='add'>+{"divwe.",	XO(31,427,0,1),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"stxvll",	X(31,429),	XX1_MASK,    PPCVSX3,	0,		{XS6, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"clrbhrb",	X(31,430),	0xffffffff,  POWER8,	0,		{0}},</div><div class='add'>+</div><div class='add'>+{"slbie",	X(31,434),	XRTRA_MASK,  PPC64,	0,		{RB}},</div><div class='add'>+</div><div class='add'>+{"mtvsrdd",	X(31,435),	XX1_MASK,    PPCVSX3,	0,		{XT6, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"ecowx",	X(31,438),	X_MASK,	     PPC,	E500|TITAN,	{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"sthux",	X(31,439),	X_MASK,	     COM,	0,		{RS, RAS, RB}},</div><div class='add'>+</div><div class='add'>+{"mdors",	0x7f9ce378,	0xffffffff,  E500MC,	0,		{0}},</div><div class='add'>+</div><div class='add'>+{"miso",	0x7f5ad378,	0xffffffff,  E6500,	0,		{0}},</div><div class='add'>+</div><div class='add'>+/* The "yield", "mdoio" and "mdoom" instructions are extended mnemonics for</div><div class='add'>+   "or rX,rX,rX", with rX being r27, r29 and r30 respectively.	*/</div><div class='add'>+{"yield",	0x7f7bdb78,	0xffffffff,  POWER7,	0,		{0}},</div><div class='add'>+{"mdoio",	0x7fbdeb78,	0xffffffff,  POWER7,	0,		{0}},</div><div class='add'>+{"mdoom",	0x7fdef378,	0xffffffff,  POWER7,	0,		{0}},</div><div class='add'>+{"mr",		XRC(31,444,0),	X_MASK,	     COM,	0,		{RA, RS, RBS}},</div><div class='add'>+{"or",		XRC(31,444,0),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+{"mr.",		XRC(31,444,1),	X_MASK,	     COM,	0,		{RA, RS, RBS}},</div><div class='add'>+{"or.",		XRC(31,444,1),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"mtexisr",	XSPR(31,451, 64), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtexier",	XSPR(31,451, 66), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtbr0",	XSPR(31,451,128), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtbr1",	XSPR(31,451,129), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtbr2",	XSPR(31,451,130), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtbr3",	XSPR(31,451,131), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtbr4",	XSPR(31,451,132), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtbr5",	XSPR(31,451,133), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtbr6",	XSPR(31,451,134), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtbr7",	XSPR(31,451,135), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtbear",	XSPR(31,451,144), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtbesr",	XSPR(31,451,145), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtiocr",	XSPR(31,451,160), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmacr0",	XSPR(31,451,192), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmact0",	XSPR(31,451,193), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmada0",	XSPR(31,451,194), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmasa0",	XSPR(31,451,195), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmacc0",	XSPR(31,451,196), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmacr1",	XSPR(31,451,200), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmact1",	XSPR(31,451,201), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmada1",	XSPR(31,451,202), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmasa1",	XSPR(31,451,203), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmacc1",	XSPR(31,451,204), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmacr2",	XSPR(31,451,208), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmact2",	XSPR(31,451,209), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmada2",	XSPR(31,451,210), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmasa2",	XSPR(31,451,211), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmacc2",	XSPR(31,451,212), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmacr3",	XSPR(31,451,216), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmact3",	XSPR(31,451,217), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmada3",	XSPR(31,451,218), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmasa3",	XSPR(31,451,219), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmacc3",	XSPR(31,451,220), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdmasr",	XSPR(31,451,224), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdcr",	X(31,451), X_MASK, PPC403|BOOKE|PPCA2|PPC476, E500|TITAN, {SPR, RS}},</div><div class='add'>+{"mtdcr.",	XRC(31,451,1), X_MASK,	     PPCA2,	0,		{SPR, RS}},</div><div class='add'>+</div><div class='add'>+{"stvexwx",	X(31,453),	X_MASK,	     PPCVEC2,	0,		{VS, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"dccci",	X(31,454), XRT_MASK, PPC403|PPC440|TITAN|PPCA2, 0,	{RAOPT, RBOPT}},</div><div class='add'>+{"dci",		X(31,454),	XRARB_MASK, PPCA2|PPC476, 0,		{CT}},</div><div class='add'>+</div><div class='add'>+{"divdu",	XO(31,457,0,0),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+{"divdu.",	XO(31,457,0,1),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"divwu",	XO(31,459,0,0),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+{"divwu.",	XO(31,459,0,1),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"mtpmr",	X(31,462),	X_MASK, PPCPMR|PPCE300, 0,		{PMR, RS}},</div><div class='add'>+{"mttmr",	X(31,494),	X_MASK,	PPCTMR|E6500,	0,		{TMR, RS}},</div><div class='add'>+</div><div class='add'>+{"slbieg",	X(31,466),	XRA_MASK,    POWER9,	0,		{RS, RB}},</div><div class='add'>+</div><div class='add'>+{"mtmq",	XSPR(31,467,  0), XSPR_MASK, M601,	0,		{RS}},</div><div class='add'>+{"mtxer",	XSPR(31,467,  1), XSPR_MASK, COM,	0,		{RS}},</div><div class='add'>+{"mtlr",	XSPR(31,467,  8), XSPR_MASK, COM,	0,		{RS}},</div><div class='add'>+{"mtctr",	XSPR(31,467,  9), XSPR_MASK, COM,	0,		{RS}},</div><div class='add'>+{"mtdscr",	XSPR(31,467, 17), XSPR_MASK, POWER6,	0,		{RS}},</div><div class='add'>+{"mttid",	XSPR(31,467, 17), XSPR_MASK, POWER,	0,		{RS}},</div><div class='add'>+{"mtdsisr",	XSPR(31,467, 18), XSPR_MASK, COM,	TITAN,		{RS}},</div><div class='add'>+{"mtdar",	XSPR(31,467, 19), XSPR_MASK, COM,	TITAN,		{RS}},</div><div class='add'>+{"mtrtcu",	XSPR(31,467, 20), XSPR_MASK, COM,	TITAN,		{RS}},</div><div class='add'>+{"mtrtcl",	XSPR(31,467, 21), XSPR_MASK, COM,	TITAN,		{RS}},</div><div class='add'>+{"mtdec",	XSPR(31,467, 22), XSPR_MASK, COM,	0,		{RS}},</div><div class='add'>+{"mtsdr0",	XSPR(31,467, 24), XSPR_MASK, POWER,	0,		{RS}},</div><div class='add'>+{"mtsdr1",	XSPR(31,467, 25), XSPR_MASK, COM,	TITAN,		{RS}},</div><div class='add'>+{"mtsrr0",	XSPR(31,467, 26), XSPR_MASK, COM,	0,		{RS}},</div><div class='add'>+{"mtsrr1",	XSPR(31,467, 27), XSPR_MASK, COM,	0,		{RS}},</div><div class='add'>+{"mtcfar",	XSPR(31,467, 28), XSPR_MASK, POWER6,	0,		{RS}},</div><div class='add'>+{"mtpid",	XSPR(31,467, 48), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtdecar",	XSPR(31,467, 54), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtcsrr0",	XSPR(31,467, 58), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtcsrr1",	XSPR(31,467, 59), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtdear",	XSPR(31,467, 61), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtesr",	XSPR(31,467, 62), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivpr",	XSPR(31,467, 63), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtcmpa",	XSPR(31,467,144), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtcmpb",	XSPR(31,467,145), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtcmpc",	XSPR(31,467,146), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtcmpd",	XSPR(31,467,147), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mticr",	XSPR(31,467,148), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtder",	XSPR(31,467,149), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtcounta",	XSPR(31,467,150), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtcountb",	XSPR(31,467,151), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtctrl",	XSPR(31,467,152), XSPR_MASK, POWER4,	0,		{RS}},</div><div class='add'>+{"mtcmpe",	XSPR(31,467,152), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtcmpf",	XSPR(31,467,153), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtcmpg",	XSPR(31,467,154), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtcmph",	XSPR(31,467,155), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtlctrl1",	XSPR(31,467,156), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtlctrl2",	XSPR(31,467,157), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtictrl",	XSPR(31,467,158), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtbar",	XSPR(31,467,159), XSPR_MASK, PPC860,	0,		{RS}},</div><div class='add'>+{"mtvrsave",	XSPR(31,467,256), XSPR_MASK, PPCVEC,	0,		{RS}},</div><div class='add'>+{"mtusprg0",	XSPR(31,467,256), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtsprg",	XSPR(31,467,256), XSPRG_MASK, PPC,	0,		{SPRG, RS}},</div><div class='add'>+{"mtsprg0",	XSPR(31,467,272), XSPR_MASK, PPC,	0,		{RS}},</div><div class='add'>+{"mtsprg1",	XSPR(31,467,273), XSPR_MASK, PPC,	0,		{RS}},</div><div class='add'>+{"mtsprg2",	XSPR(31,467,274), XSPR_MASK, PPC,	0,		{RS}},</div><div class='add'>+{"mtsprg3",	XSPR(31,467,275), XSPR_MASK, PPC,	0,		{RS}},</div><div class='add'>+{"mtsprg4",	XSPR(31,467,276), XSPR_MASK, PPC405|BOOKE, 0,		{RS}},</div><div class='add'>+{"mtsprg5",	XSPR(31,467,277), XSPR_MASK, PPC405|BOOKE, 0,		{RS}},</div><div class='add'>+{"mtsprg6",	XSPR(31,467,278), XSPR_MASK, PPC405|BOOKE, 0,		{RS}},</div><div class='add'>+{"mtsprg7",	XSPR(31,467,279), XSPR_MASK, PPC405|BOOKE, 0,		{RS}},</div><div class='add'>+{"mtasr",	XSPR(31,467,280), XSPR_MASK, PPC64,	0,		{RS}},</div><div class='add'>+{"mtear",	XSPR(31,467,282), XSPR_MASK, PPC,	TITAN,		{RS}},</div><div class='add'>+{"mttbl",	XSPR(31,467,284), XSPR_MASK, PPC,	0,		{RS}},</div><div class='add'>+{"mttbu",	XSPR(31,467,285), XSPR_MASK, PPC,	0,		{RS}},</div><div class='add'>+{"mtdbsr",	XSPR(31,467,304), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtdbcr0",	XSPR(31,467,308), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtdbcr1",	XSPR(31,467,309), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtdbcr2",	XSPR(31,467,310), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtiac1",	XSPR(31,467,312), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtiac2",	XSPR(31,467,313), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtiac3",	XSPR(31,467,314), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtiac4",	XSPR(31,467,315), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtdac1",	XSPR(31,467,316), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtdac2",	XSPR(31,467,317), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtdvc1",	XSPR(31,467,318), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtdvc2",	XSPR(31,467,319), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mttsr",	XSPR(31,467,336), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mttcr",	XSPR(31,467,340), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor0",	XSPR(31,467,400), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor1",	XSPR(31,467,401), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor2",	XSPR(31,467,402), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor3",	XSPR(31,467,403), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor4",	XSPR(31,467,404), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor5",	XSPR(31,467,405), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor6",	XSPR(31,467,406), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor7",	XSPR(31,467,407), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor8",	XSPR(31,467,408), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor9",	XSPR(31,467,409), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor10",	XSPR(31,467,410), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor11",	XSPR(31,467,411), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor12",	XSPR(31,467,412), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor13",	XSPR(31,467,413), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor14",	XSPR(31,467,414), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtivor15",	XSPR(31,467,415), XSPR_MASK, BOOKE,	0,		{RS}},</div><div class='add'>+{"mtspefscr",	XSPR(31,467,512), XSPR_MASK, PPCSPE,	0,		{RS}},</div><div class='add'>+{"mtbbear",	XSPR(31,467,513), XSPR_MASK, PPCBRLK,	0,		{RS}},</div><div class='add'>+{"mtbbtar",	XSPR(31,467,514), XSPR_MASK, PPCBRLK,	0,		{RS}},</div><div class='add'>+{"mtivor32",	XSPR(31,467,528), XSPR_MASK, PPCSPE,	0,		{RS}},</div><div class='add'>+{"mtibatu",	XSPR(31,467,528), XSPRBAT_MASK, PPC,	TITAN,		{SPRBAT, RS}},</div><div class='add'>+{"mtivor33",	XSPR(31,467,529), XSPR_MASK, PPCSPE,	0,		{RS}},</div><div class='add'>+{"mtibatl",	XSPR(31,467,529), XSPRBAT_MASK, PPC,	TITAN,		{SPRBAT, RS}},</div><div class='add'>+{"mtivor34",	XSPR(31,467,530), XSPR_MASK, PPCSPE,	0,		{RS}},</div><div class='add'>+{"mtivor35",	XSPR(31,467,531), XSPR_MASK, PPCPMR,	0,		{RS}},</div><div class='add'>+{"mtdbatu",	XSPR(31,467,536), XSPRBAT_MASK, PPC,	TITAN,		{SPRBAT, RS}},</div><div class='add'>+{"mtdbatl",	XSPR(31,467,537), XSPRBAT_MASK, PPC,	TITAN,		{SPRBAT, RS}},</div><div class='add'>+{"mtmcsrr0",	XSPR(31,467,570), XSPR_MASK, PPCRFMCI,	0,		{RS}},</div><div class='add'>+{"mtmcsrr1",	XSPR(31,467,571), XSPR_MASK, PPCRFMCI,	0,		{RS}},</div><div class='add'>+{"mtmcsr",	XSPR(31,467,572), XSPR_MASK, PPCRFMCI,	0,		{RS}},</div><div class='add'>+{"mtivndx",	XSPR(31,467,880), XSPR_MASK, TITAN,	0,		{RS}},</div><div class='add'>+{"mtdvndx",	XSPR(31,467,881), XSPR_MASK, TITAN,	0,		{RS}},</div><div class='add'>+{"mtivlim",	XSPR(31,467,882), XSPR_MASK, TITAN,	0,		{RS}},</div><div class='add'>+{"mtdvlim",	XSPR(31,467,883), XSPR_MASK, TITAN,	0,		{RS}},</div><div class='add'>+{"mtclcsr",	XSPR(31,467,884), XSPR_MASK, TITAN,	0,		{RS}},</div><div class='add'>+{"mtccr1",	XSPR(31,467,888), XSPR_MASK, TITAN,	0,		{RS}},</div><div class='add'>+{"mtppr",	XSPR(31,467,896), XSPR_MASK, POWER7,	0,		{RS}},</div><div class='add'>+{"mtppr32",	XSPR(31,467,898), XSPR_MASK, POWER7,	0,		{RS}},</div><div class='add'>+{"mtummcr0",	XSPR(31,467,936), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtupmc1",	XSPR(31,467,937), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtupmc2",	XSPR(31,467,938), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtusia",	XSPR(31,467,939), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtummcr1",	XSPR(31,467,940), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtupmc3",	XSPR(31,467,941), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtupmc4",	XSPR(31,467,942), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtzpr",	XSPR(31,467,944), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtpid",	XSPR(31,467,945), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtrmmucr",	XSPR(31,467,946), XSPR_MASK, TITAN,	0,		{RS}},</div><div class='add'>+{"mtccr0",	XSPR(31,467,947), XSPR_MASK, PPC405|TITAN, 0,		{RS}},</div><div class='add'>+{"mtiac3",	XSPR(31,467,948), XSPR_MASK, PPC405,	0,		{RS}},</div><div class='add'>+{"mtiac4",	XSPR(31,467,949), XSPR_MASK, PPC405,	0,		{RS}},</div><div class='add'>+{"mtdvc1",	XSPR(31,467,950), XSPR_MASK, PPC405,	0,		{RS}},</div><div class='add'>+{"mtdvc2",	XSPR(31,467,951), XSPR_MASK, PPC405,	0,		{RS}},</div><div class='add'>+{"mtmmcr0",	XSPR(31,467,952), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtpmc1",	XSPR(31,467,953), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtsgr",	XSPR(31,467,953), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdcwr",	XSPR(31,467,954), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtpmc2",	XSPR(31,467,954), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtsia",	XSPR(31,467,955), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtsler",	XSPR(31,467,955), XSPR_MASK, PPC405,	0,		{RS}},</div><div class='add'>+{"mtmmcr1",	XSPR(31,467,956), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtsu0r",	XSPR(31,467,956), XSPR_MASK, PPC405,	0,		{RS}},</div><div class='add'>+{"mtdbcr1",	XSPR(31,467,957), XSPR_MASK, PPC405,	0,		{RS}},</div><div class='add'>+{"mtpmc3",	XSPR(31,467,957), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtpmc4",	XSPR(31,467,958), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mticdbdr",	XSPR(31,467,979), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtesr",	XSPR(31,467,980), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdear",	XSPR(31,467,981), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtevpr",	XSPR(31,467,982), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtcdbcr",	XSPR(31,467,983), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mttsr",	XSPR(31,467,984), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mttcr",	XSPR(31,467,986), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtpit",	XSPR(31,467,987), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mttbhi",	XSPR(31,467,988), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mttblo",	XSPR(31,467,989), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtsrr2",	XSPR(31,467,990), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtsrr3",	XSPR(31,467,991), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdbsr",	XSPR(31,467,1008), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdbdr",	XSPR(31,467,1011), XSPR_MASK, TITAN,	0,		{RS}},</div><div class='add'>+{"mtdbcr0",	XSPR(31,467,1010), XSPR_MASK, PPC405,	0,		{RS}},</div><div class='add'>+{"mtiac1",	XSPR(31,467,1012), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtiac2",	XSPR(31,467,1013), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdac1",	XSPR(31,467,1014), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtdac2",	XSPR(31,467,1015), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtl2cr",	XSPR(31,467,1017), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtdccr",	XSPR(31,467,1018), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mticcr",	XSPR(31,467,1019), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtictc",	XSPR(31,467,1019), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtpbl1",	XSPR(31,467,1020), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtthrm1",	XSPR(31,467,1020), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtpbu1",	XSPR(31,467,1021), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtthrm2",	XSPR(31,467,1021), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtpbl2",	XSPR(31,467,1022), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtthrm3",	XSPR(31,467,1022), XSPR_MASK, PPC750,	0,		{RS}},</div><div class='add'>+{"mtpbu2",	XSPR(31,467,1023), XSPR_MASK, PPC403,	0,		{RS}},</div><div class='add'>+{"mtspr",	X(31,467),	X_MASK,	     COM,	0,		{SPR, RS}},</div><div class='add'>+</div><div class='add'>+{"dcbi",	X(31,470),	XRT_MASK,    PPC,	0,		{RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"nand",	XRC(31,476,0),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+{"nand.",	XRC(31,476,1),	X_MASK,	     COM,	0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"dsn",		X(31,483),	XRT_MASK,    E500MC,	0,		{RA, RB}},</div><div class='add'>+</div><div class='add'>+{"dcread",	X(31,486),	X_MASK,	 PPC403|PPC440, PPCA2|PPC476,	{RT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"icbtls",	X(31,486),	X_MASK,	 PPCCHLK|PPC476|TITAN, 0,	{CT, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"stvxl",	X(31,487),	X_MASK,	     PPCVEC,	0,		{VS, RA0, RB}},</div><div class='add'>+</div><div class='add'>+{"nabs",	XO(31,488,0,0),	XORB_MASK,   M601,	0,		{RT, RA}},</div><div class='add'>+{"nabs.",	XO(31,488,0,1),	XORB_MASK,   M601,	0,		{RT, RA}},</div><div class='add'>+</div><div class='add'>+{"divd",	XO(31,489,0,0),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+{"divd.",	XO(31,489,0,1),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"divw",	XO(31,491,0,0),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+{"divw.",	XO(31,491,0,1),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"icbtlse",	X(31,494),	X_MASK,	     PPCCHLK,	E500MC,		{CT, RA, RB}},</div><div class='add'>+</div><div class='add'>+{"slbia",	X(31,498),	0xff1fffff,  POWER6,	0,		{IH}},</div><div class='add'>+{"slbia",	X(31,498),	0xffffffff,  PPC64,	POWER6,		{0}},</div><div class='add'>+</div><div class='add'>+{"cli",		X(31,502),	XRB_MASK,    POWER,	0,		{RT, RA}},</div><div class='add'>+</div><div class='add'>+{"popcntd",	X(31,506),	XRB_MASK, POWER7|PPCA2,	0,		{RA, RS}},</div><div class='add'>+</div><div class='add'>+{"cmpb",	X(31,508),	X_MASK, POWER6|PPCA2|PPC476, 0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"mcrxr",	X(31,512),	XBFRARB_MASK, COM,	POWER7,		{BF}},</div><div class='add'>+</div><div class='add'>+{"lbdcbx",	X(31,514),	X_MASK,      E200Z4,	0,		{RT, RA, RB}},</div><div class='add'>+{"lbdx",	X(31,515),	X_MASK,	     E500MC,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "clcs",    X(31,531), XRB_MASK,	M601,		{ RT, RA } },</div><div class='add'>+{"bblels",	X(31,518),	X_MASK,	     PPCBRLK,	0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "ldbrx",   X(31,532),	X_MASK,		CELL,		{ RT, RA0, RB } },</div><div class='add'>+{"lvlx",	X(31,519),	X_MASK,	     CELL,	0,		{VD, RA0, RB}},</div><div class='add'>+{"lbfcmux",	APU(31,519,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lswx",    X(31,533),	X_MASK,		PPCCOM,		{ RT, RA0, RB } },</div><div class='del'>-{ "lsx",     X(31,533),	X_MASK,		PWRCOM,		{ RT, RA, RB } },</div><div class='add'>+{"subfco",	XO(31,8,1,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"sfo",		XO(31,8,1,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"subco",	XO(31,8,1,0),	XO_MASK,     PPCCOM,	0,		{RT, RB, RA}},</div><div class='add'>+{"subfco.",	XO(31,8,1,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"sfo.",	XO(31,8,1,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"subco.",	XO(31,8,1,1),	XO_MASK,     PPCCOM,	0,		{RT, RB, RA}},</div><div class='ctx'> </div><div class='del'>-{ "lwbrx",   X(31,534),	X_MASK,		PPCCOM,		{ RT, RA0, RB } },</div><div class='del'>-{ "lbrx",    X(31,534),	X_MASK,		PWRCOM,		{ RT, RA, RB } },</div><div class='add'>+{"addco",	XO(31,10,1,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"ao",		XO(31,10,1,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"addco.",	XO(31,10,1,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"ao.",		XO(31,10,1,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lfsx",    X(31,535),	X_MASK,		COM,		{ FRT, RA0, RB } },</div><div class='add'>+{"lxsspx",	X(31,524),	XX1_MASK,    PPCVSX2,	0,		{XT6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "srw",     XRC(31,536,0), X_MASK,	PPCCOM,		{ RA, RS, RB } },</div><div class='del'>-{ "sr",      XRC(31,536,0), X_MASK,	PWRCOM,		{ RA, RS, RB } },</div><div class='del'>-{ "srw.",    XRC(31,536,1), X_MASK,	PPCCOM,		{ RA, RS, RB } },</div><div class='del'>-{ "sr.",     XRC(31,536,1), X_MASK,	PWRCOM,		{ RA, RS, RB } },</div><div class='add'>+{"clcs",	X(31,531),	XRB_MASK,    M601,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "rrib",    XRC(31,537,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "rrib.",   XRC(31,537,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"ldbrx",	X(31,532),	X_MASK, CELL|POWER7|PPCA2, 0,		{RT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "srd",     XRC(31,539,0), X_MASK,	PPC64,		{ RA, RS, RB } },</div><div class='del'>-{ "srd.",    XRC(31,539,1), X_MASK,	PPC64,		{ RA, RS, RB } },</div><div class='add'>+{"lswx",	X(31,533),	X_MASK,	     PPCCOM,	E500|E500MC,	{RT, RAX, RBX}},</div><div class='add'>+{"lsx",		X(31,533),	X_MASK,	     PWRCOM,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "maskir",  XRC(31,541,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "maskir.", XRC(31,541,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"lwbrx",	X(31,534),	X_MASK,	     PPCCOM,	0,		{RT, RA0, RB}},</div><div class='add'>+{"lbrx",	X(31,534),	X_MASK,	     PWRCOM,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lwbrxe",  X(31,542),	X_MASK,		BOOKE64,	{ RT, RA0, RB } },</div><div class='add'>+{"lfsx",	X(31,535),	X_MASK,	     COM,	PPCEFS,		{FRT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lfsxe",   X(31,543),	X_MASK,		BOOKE64,	{ FRT, RA0, RB } },</div><div class='add'>+{"srw",		XRC(31,536,0),	X_MASK,	     PPCCOM,	0,		{RA, RS, RB}},</div><div class='add'>+{"sr",		XRC(31,536,0),	X_MASK,	     PWRCOM,	0,		{RA, RS, RB}},</div><div class='add'>+{"srw.",	XRC(31,536,1),	X_MASK,	     PPCCOM,	0,		{RA, RS, RB}},</div><div class='add'>+{"sr.",		XRC(31,536,1),	X_MASK,	     PWRCOM,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "bbelr",   X(31,550),	X_MASK,		PPCBRLK,	{ 0 }},</div><div class='add'>+{"rrib",	XRC(31,537,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"rrib.",	XRC(31,537,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "tlbsync", X(31,566),	0xffffffff,	PPC,		{ 0 } },</div><div class='add'>+{"cnttzw",	XRC(31,538,0),	XRB_MASK,    POWER9,	0,		{RA, RS}},</div><div class='add'>+{"cnttzw.",	XRC(31,538,1),	XRB_MASK,    POWER9,	0,		{RA, RS}},</div><div class='ctx'> </div><div class='del'>-{ "lfsux",   X(31,567),	X_MASK,		COM,		{ FRT, RAS, RB } },</div><div class='add'>+{"srd",		XRC(31,539,0),	X_MASK,	     PPC64,	0,		{RA, RS, RB}},</div><div class='add'>+{"srd.",	XRC(31,539,1),	X_MASK,	     PPC64,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lfsuxe",  X(31,575),	X_MASK,		BOOKE64,	{ FRT, RAS, RB } },</div><div class='add'>+{"maskir",	XRC(31,541,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"maskir.",	XRC(31,541,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mfsr",    X(31,595),	XRB_MASK|(1&lt;&lt;20), COM32,	{ RT, SR } },</div><div class='add'>+{"lhdcbx",	X(31,546),	X_MASK,      E200Z4,	0,		{RT, RA, RB}},</div><div class='add'>+{"lhdx",	X(31,547),	X_MASK,	     E500MC,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lswi",    X(31,597),	X_MASK,		PPCCOM,		{ RT, RA0, NB } },</div><div class='del'>-{ "lsi",     X(31,597),	X_MASK,		PWRCOM,		{ RT, RA0, NB } },</div><div class='add'>+{"lvtrx",	X(31,549),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lwsync",  XSYNC(31,598,1), 0xffffffff, PPC,		{ 0 } },</div><div class='del'>-{ "ptesync", XSYNC(31,598,2), 0xffffffff, PPC64,	{ 0 } },</div><div class='del'>-{ "msync",   X(31,598), 0xffffffff,	BOOKE,		{ 0 } },</div><div class='del'>-{ "sync",    X(31,598), XSYNC_MASK,	PPCCOM,		{ LS } },</div><div class='del'>-{ "dcs",     X(31,598), 0xffffffff,	PWRCOM,		{ 0 } },</div><div class='add'>+{"bbelr",	X(31,550),	X_MASK,	     PPCBRLK,	0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "lfdx",    X(31,599), X_MASK,		COM,		{ FRT, RA0, RB } },</div><div class='add'>+{"lvrx",	X(31,551),	X_MASK,	     CELL,	0,		{VD, RA0, RB}},</div><div class='add'>+{"lhfcmux",	APU(31,551,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lfdxe",   X(31,607), X_MASK,		BOOKE64,	{ FRT, RA0, RB } },</div><div class='add'>+{"subfo",	XO(31,40,1,0),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+{"subo",	XO(31,40,1,0),	XO_MASK,     PPC,	0,		{RT, RB, RA}},</div><div class='add'>+{"subfo.",	XO(31,40,1,1),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+{"subo.",	XO(31,40,1,1),	XO_MASK,     PPC,	0,		{RT, RB, RA}},</div><div class='ctx'> </div><div class='del'>-{ "mffgpr",  XRC(31,607,0), XRA_MASK,	POWER6,		{ FRT, RB } },</div><div class='add'>+{"tlbsync",	X(31,566),	0xffffffff,  PPC,	0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "mfsri",   X(31,627), X_MASK,		PWRCOM,		{ RT, RA, RB } },</div><div class='add'>+{"lfsux",	X(31,567),	X_MASK,	     COM,	PPCEFS,		{FRT, RAS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dclst",   X(31,630), XRB_MASK,	PWRCOM,		{ RS, RA } },</div><div class='add'>+{"cnttzd",	XRC(31,570,0),	XRB_MASK,    POWER9,	0,		{RA, RS}},</div><div class='add'>+{"cnttzd.",	XRC(31,570,1),	XRB_MASK,    POWER9,	0,		{RA, RS}},</div><div class='ctx'> </div><div class='del'>-{ "lfdux",   X(31,631), X_MASK,		COM,		{ FRT, RAS, RB } },</div><div class='add'>+{"mcrxrx",	X(31,576),     XBFRARB_MASK, POWER9,	0,		{BF}},</div><div class='ctx'> </div><div class='del'>-{ "lfduxe",  X(31,639), X_MASK,		BOOKE64,	{ FRT, RAS, RB } },</div><div class='add'>+{"lwdcbx",	X(31,578),	X_MASK,      E200Z4,	0,		{RT, RA, RB}},</div><div class='add'>+{"lwdx",	X(31,579),	X_MASK,	     E500MC,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mfsrin",  X(31,659), XRA_MASK,	PPC32,		{ RT, RB } },</div><div class='add'>+{"lvtlx",	X(31,581),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stdbrx",  X(31,660), X_MASK,		CELL,		{ RS, RA0, RB } },</div><div class='add'>+{"lwat",	X(31,582),	X_MASK,	     POWER9,	0,		{RT, RA0, FC}},</div><div class='ctx'> </div><div class='del'>-{ "stswx",   X(31,661), X_MASK,		PPCCOM,		{ RS, RA0, RB } },</div><div class='del'>-{ "stsx",    X(31,661), X_MASK,		PWRCOM,		{ RS, RA0, RB } },</div><div class='add'>+{"lwfcmux",	APU(31,583,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stwbrx",  X(31,662), X_MASK,		PPCCOM,		{ RS, RA0, RB } },</div><div class='del'>-{ "stbrx",   X(31,662), X_MASK,		PWRCOM,		{ RS, RA0, RB } },</div><div class='add'>+{"lxsdx",	X(31,588),	XX1_MASK,    PPCVSX,	0,		{XT6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stfsx",   X(31,663), X_MASK,		COM,		{ FRS, RA0, RB } },</div><div class='add'>+{"mfsr",	X(31,595), XRB_MASK|(1&lt;&lt;20), COM,	NON32,		{RT, SR}},</div><div class='ctx'> </div><div class='del'>-{ "srq",     XRC(31,664,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "srq.",    XRC(31,664,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"lswi",	X(31,597),	X_MASK,	     PPCCOM,	E500|E500MC,	{RT, RAX, NBI}},</div><div class='add'>+{"lsi",		X(31,597),	X_MASK,	     PWRCOM,	0,		{RT, RA0, NB}},</div><div class='ctx'> </div><div class='del'>-{ "sre",     XRC(31,665,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "sre.",    XRC(31,665,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"hwsync",	XSYNC(31,598,0), 0xffffffff, POWER4,	BOOKE|PPC476,	{0}},</div><div class='add'>+{"lwsync",	XSYNC(31,598,1), 0xffffffff, PPC,	E500,		{0}},</div><div class='add'>+{"ptesync",	XSYNC(31,598,2), 0xffffffff, PPC64,	0,		{0}},</div><div class='add'>+{"sync",	X(31,598),     XSYNCLE_MASK, E6500,	0,		{LS, ESYNC}},</div><div class='add'>+{"sync",	X(31,598),     XSYNC_MASK,   PPCCOM,	BOOKE|PPC476,	{LS}},</div><div class='add'>+{"msync",	X(31,598),     0xffffffff, BOOKE|PPCA2|PPC476, 0,	{0}},</div><div class='add'>+{"sync",	X(31,598),     0xffffffff,   BOOKE|PPC476, E6500,	{0}},</div><div class='add'>+{"lwsync",	X(31,598),     0xffffffff,   E500,	0,		{0}},</div><div class='add'>+{"dcs",		X(31,598),     0xffffffff,   PWRCOM,	0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "stwbrxe", X(31,670), X_MASK,		BOOKE64,	{ RS, RA0, RB } },</div><div class='add'>+{"lfdx",	X(31,599),	X_MASK,	     COM,	PPCEFS,		{FRT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stfsxe",  X(31,671), X_MASK,		BOOKE64,	{ FRS, RA0, RB } },</div><div class='add'>+{"mffgpr",	XRC(31,607,0),	XRA_MASK,    POWER6,	POWER7,		{FRT, RB}},</div><div class='add'>+{"lfdepx",	X(31,607),	X_MASK,	  E500MC|PPCA2, 0,		{FRT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stfsux",  X(31,695),	X_MASK,		COM,		{ FRS, RAS, RB } },</div><div class='add'>+{"lddx",	X(31,611),	X_MASK,	     E500MC,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sriq",    XRC(31,696,0), X_MASK,	M601,		{ RA, RS, SH } },</div><div class='del'>-{ "sriq.",   XRC(31,696,1), X_MASK,	M601,		{ RA, RS, SH } },</div><div class='add'>+{"lvswx",	X(31,613),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stfsuxe", X(31,703),	X_MASK,		BOOKE64,	{ FRS, RAS, RB } },</div><div class='add'>+{"ldat",	X(31,614),	X_MASK,	     POWER9,	0,		{RT, RA0, FC}},</div><div class='ctx'> </div><div class='del'>-{ "stswi",   X(31,725),	X_MASK,		PPCCOM,		{ RS, RA0, NB } },</div><div class='del'>-{ "stsi",    X(31,725),	X_MASK,		PWRCOM,		{ RS, RA0, NB } },</div><div class='add'>+{"lqfcmux",	APU(31,615,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stfdx",   X(31,727),	X_MASK,		COM,		{ FRS, RA0, RB } },</div><div class='add'>+{"nego",	XO(31,104,1,0),	XORB_MASK,   COM,	0,		{RT, RA}},</div><div class='add'>+{"nego.",	XO(31,104,1,1),	XORB_MASK,   COM,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "srlq",    XRC(31,728,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "srlq.",   XRC(31,728,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"mulo",	XO(31,107,1,0),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='add'>+{"mulo.",	XO(31,107,1,1),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sreq",    XRC(31,729,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "sreq.",   XRC(31,729,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"mfsri",	X(31,627),	X_MASK,	     M601,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stfdxe",  X(31,735),	X_MASK,		BOOKE64,	{ FRS, RA0, RB } },</div><div class='add'>+{"dclst",	X(31,630),	XRB_MASK,    M601,	0,		{RS, RA}},</div><div class='ctx'> </div><div class='del'>-{ "mftgpr",  XRC(31,735,0), XRA_MASK,	POWER6,		{ RT, FRB } },</div><div class='add'>+{"lfdux",	X(31,631),	X_MASK,	     COM,	PPCEFS,		{FRT, RAS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcba",    X(31,758),	XRT_MASK,	PPC405 | BOOKE,	{ RA, RB } },</div><div class='add'>+{"stbdcbx",	X(31,642),	X_MASK,      E200Z4,	0,		{RS, RA, RB}},</div><div class='add'>+{"stbdx",	X(31,643),	X_MASK,	     E500MC,	0,		{RS, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stfdux",  X(31,759),	X_MASK,		COM,		{ FRS, RAS, RB } },</div><div class='add'>+{"stvlx",	X(31,647),	X_MASK,	     CELL,	0,		{VS, RA0, RB}},</div><div class='add'>+{"stbfcmux",	APU(31,647,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "srliq",   XRC(31,760,0), X_MASK,	M601,		{ RA, RS, SH } },</div><div class='del'>-{ "srliq.",  XRC(31,760,1), X_MASK,	M601,		{ RA, RS, SH } },</div><div class='add'>+{"stxsspx",	X(31,652),	XX1_MASK,    PPCVSX2,	0,		{XS6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcbae",   X(31,766),	XRT_MASK,	BOOKE64,	{ RA, RB } },</div><div class='add'>+{"tbegin.",	XRC(31,654,1), XRTLRARB_MASK, PPCHTM,	0,		{HTM_R}},</div><div class='ctx'> </div><div class='del'>-{ "stfduxe", X(31,767),	X_MASK,		BOOKE64,	{ FRS, RAS, RB } },</div><div class='add'>+{"subfeo",	XO(31,136,1,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"sfeo",	XO(31,136,1,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"subfeo.",	XO(31,136,1,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"sfeo.",	XO(31,136,1,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "tlbivax", X(31,786),	XRT_MASK,	BOOKE,		{ RA, RB } },</div><div class='del'>-{ "tlbivaxe",X(31,787),	XRT_MASK,	BOOKE64,	{ RA, RB } },</div><div class='add'>+{"addeo",	XO(31,138,1,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"aeo",		XO(31,138,1,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"addeo.",	XO(31,138,1,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"aeo.",	XO(31,138,1,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lwzcix",  X(31,789),	X_MASK,		POWER6,		{ RT, RA0, RB } },</div><div class='add'>+{"mfsrin",	X(31,659),	XRA_MASK,    PPC,	NON32,		{RT, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lhbrx",   X(31,790),	X_MASK,		COM,		{ RT, RA0, RB } },</div><div class='add'>+{"stdbrx",	X(31,660),	X_MASK, CELL|POWER7|PPCA2, 0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sraw",    XRC(31,792,0), X_MASK,	PPCCOM,		{ RA, RS, RB } },</div><div class='del'>-{ "sra",     XRC(31,792,0), X_MASK,	PWRCOM,		{ RA, RS, RB } },</div><div class='del'>-{ "sraw.",   XRC(31,792,1), X_MASK,	PPCCOM,		{ RA, RS, RB } },</div><div class='del'>-{ "sra.",    XRC(31,792,1), X_MASK,	PWRCOM,		{ RA, RS, RB } },</div><div class='add'>+{"stswx",	X(31,661),	X_MASK,	     PPCCOM,	E500|E500MC,	{RS, RA0, RB}},</div><div class='add'>+{"stsx",	X(31,661),	X_MASK,	     PWRCOM,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "srad",    XRC(31,794,0), X_MASK,	PPC64,		{ RA, RS, RB } },</div><div class='del'>-{ "srad.",   XRC(31,794,1), X_MASK,	PPC64,		{ RA, RS, RB } },</div><div class='add'>+{"stwbrx",	X(31,662),	X_MASK,	     PPCCOM,	0,		{RS, RA0, RB}},</div><div class='add'>+{"stbrx",	X(31,662),	X_MASK,	     PWRCOM,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lhbrxe",  X(31,798),	X_MASK,		BOOKE64,	{ RT, RA0, RB } },</div><div class='add'>+{"stfsx",	X(31,663),	X_MASK,	     COM,	PPCEFS,		{FRS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "ldxe",    X(31,799),	X_MASK,		BOOKE64,	{ RT, RA0, RB } },</div><div class='del'>-{ "lduxe",   X(31,831),	X_MASK,		BOOKE64,	{ RT, RA0, RB } },</div><div class='add'>+{"srq",		XRC(31,664,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"srq.",	XRC(31,664,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "rac",     X(31,818),	X_MASK,		PWRCOM,		{ RT, RA, RB } },</div><div class='add'>+{"sre",		XRC(31,665,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"sre.",	XRC(31,665,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lhzcix",  X(31,821),	X_MASK,		POWER6,		{ RT, RA0, RB } },</div><div class='add'>+{"sthdcbx",	X(31,674),	X_MASK,      E200Z4,	0,		{RS, RA, RB}},</div><div class='add'>+{"sthdx",	X(31,675),	X_MASK,	     E500MC,	0,		{RS, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dss",     XDSS(31,822,0), XDSS_MASK,	PPCVEC,		{ STRM } },</div><div class='del'>-{ "dssall",  XDSS(31,822,1), XDSS_MASK,	PPCVEC,		{ 0 } },</div><div class='add'>+{"stvfrx",	X(31,677),	X_MASK,	     PPCVEC2,	0,		{VS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "srawi",   XRC(31,824,0), X_MASK,	PPCCOM,		{ RA, RS, SH } },</div><div class='del'>-{ "srai",    XRC(31,824,0), X_MASK,	PWRCOM,		{ RA, RS, SH } },</div><div class='del'>-{ "srawi.",  XRC(31,824,1), X_MASK,	PPCCOM,		{ RA, RS, SH } },</div><div class='del'>-{ "srai.",   XRC(31,824,1), X_MASK,	PWRCOM,		{ RA, RS, SH } },</div><div class='add'>+{"stvrx",	X(31,679),	X_MASK,	     CELL,	0,		{VS, RA0, RB}},</div><div class='add'>+{"sthfcmux",	APU(31,679,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "slbmfev", X(31,851), XRA_MASK,	PPC64,		{ RT, RB } },</div><div class='add'>+{"tendall.",	XRC(31,686,1)|(1&lt;&lt;25), XRTRARB_MASK, PPCHTM, 0,		{0}},</div><div class='add'>+{"tend.",	XRC(31,686,1), XRTARARB_MASK, PPCHTM,	0,		{HTM_A}},</div><div class='ctx'> </div><div class='del'>-{ "lbzcix",  X(31,853),	X_MASK,		POWER6,		{ RT, RA0, RB } },</div><div class='add'>+{"stbcx.",	XRC(31,694,1),	X_MASK,	  POWER8|E6500, 0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "mbar",    X(31,854),	X_MASK,		BOOKE,		{ MO } },</div><div class='del'>-{ "eieio",   X(31,854),	0xffffffff,	PPC,		{ 0 } },</div><div class='add'>+{"stfsux",	X(31,695),	X_MASK,	     COM,	PPCEFS,		{FRS, RAS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lfiwax",  X(31,855),	X_MASK,		POWER6,		{ FRT, RA0, RB } },</div><div class='add'>+{"sriq",	XRC(31,696,0),	X_MASK,	     M601,	0,		{RA, RS, SH}},</div><div class='add'>+{"sriq.",	XRC(31,696,1),	X_MASK,	     M601,	0,		{RA, RS, SH}},</div><div class='ctx'> </div><div class='del'>-{ "ldcix",   X(31,885),	X_MASK,		POWER6,		{ RT, RA0, RB } },</div><div class='add'>+{"stwdcbx",	X(31,706),	X_MASK,	     E200Z4,	0,		{RS, RA, RB}},</div><div class='add'>+{"stwdx",	X(31,707),	X_MASK,	     E500MC,	0,		{RS, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "tlbsx",   XRC(31,914,0), X_MASK, 	PPC403|BOOKE,	{ RTO, RA, RB } },</div><div class='del'>-{ "tlbsx.",  XRC(31,914,1), X_MASK, 	PPC403|BOOKE,	{ RTO, RA, RB } },</div><div class='del'>-{ "tlbsxe",  XRC(31,915,0), X_MASK,	BOOKE64,	{ RA, RB } },</div><div class='del'>-{ "tlbsxe.", XRC(31,915,1), X_MASK,	BOOKE64,	{ RA, RB } },</div><div class='add'>+{"stvflx",	X(31,709),	X_MASK,	     PPCVEC2,	0,		{VS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "slbmfee", X(31,915), XRA_MASK,	PPC64,		{ RT, RB } },</div><div class='add'>+{"stwat",	X(31,710),	X_MASK,	     POWER9,	0,		{RS, RA0, FC}},</div><div class='ctx'> </div><div class='del'>-{ "stwcix",  X(31,917),	X_MASK,		POWER6,		{ RS, RA0, RB } },</div><div class='add'>+{"stwfcmux",	APU(31,711,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sthbrx",  X(31,918),	X_MASK,		COM,		{ RS, RA0, RB } },</div><div class='add'>+{"stxsdx",	X(31,716),	XX1_MASK,    PPCVSX,	0,		{XS6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sraq",    XRC(31,920,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "sraq.",   XRC(31,920,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"tcheck",	X(31,718),   XRTBFRARB_MASK, PPCHTM,	0,		{BF}},</div><div class='ctx'> </div><div class='del'>-{ "srea",    XRC(31,921,0), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='del'>-{ "srea.",   XRC(31,921,1), X_MASK,	M601,		{ RA, RS, RB } },</div><div class='add'>+{"subfzeo",	XO(31,200,1,0),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"sfzeo",	XO(31,200,1,0),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='add'>+{"subfzeo.",	XO(31,200,1,1),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"sfzeo.",	XO(31,200,1,1),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "extsh",   XRC(31,922,0), XRB_MASK,	PPCCOM,		{ RA, RS } },</div><div class='del'>-{ "exts",    XRC(31,922,0), XRB_MASK,	PWRCOM,		{ RA, RS } },</div><div class='del'>-{ "extsh.",  XRC(31,922,1), XRB_MASK,	PPCCOM,		{ RA, RS } },</div><div class='del'>-{ "exts.",   XRC(31,922,1), XRB_MASK,	PWRCOM,		{ RA, RS } },</div><div class='add'>+{"addzeo",	XO(31,202,1,0),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"azeo",	XO(31,202,1,0),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='add'>+{"addzeo.",	XO(31,202,1,1),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"azeo.",	XO(31,202,1,1),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "sthbrxe", X(31,926),	X_MASK,		BOOKE64,	{ RS, RA0, RB } },</div><div class='add'>+{"stswi",	X(31,725),	X_MASK,	     PPCCOM,	E500|E500MC,	{RS, RA0, NB}},</div><div class='add'>+{"stsi",	X(31,725),	X_MASK,	     PWRCOM,	0,		{RS, RA0, NB}},</div><div class='ctx'> </div><div class='del'>-{ "stdxe",   X(31,927), X_MASK,		BOOKE64,	{ RS, RA0, RB } },</div><div class='add'>+{"sthcx.",	XRC(31,726,1),	X_MASK,	  POWER8|E6500, 0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "tlbrehi", XTLB(31,946,0), XTLB_MASK,	PPC403,		{ RT, RA } },</div><div class='del'>-{ "tlbrelo", XTLB(31,946,1), XTLB_MASK,	PPC403,		{ RT, RA } },</div><div class='del'>-{ "tlbre",   X(31,946),	X_MASK,		PPC403|BOOKE,	{ RSO, RAOPT, SHO } },</div><div class='add'>+{"stfdx",	X(31,727),	X_MASK,	     COM,	PPCEFS,		{FRS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sthcix",  X(31,949),	X_MASK,		POWER6,		{ RS, RA0, RB } },</div><div class='add'>+{"srlq",	XRC(31,728,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"srlq.",	XRC(31,728,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sraiq",   XRC(31,952,0), X_MASK,	M601,		{ RA, RS, SH } },</div><div class='del'>-{ "sraiq.",  XRC(31,952,1), X_MASK,	M601,		{ RA, RS, SH } },</div><div class='add'>+{"sreq",	XRC(31,729,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"sreq.",	XRC(31,729,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "extsb",   XRC(31,954,0), XRB_MASK,	PPC,		{ RA, RS} },</div><div class='del'>-{ "extsb.",  XRC(31,954,1), XRB_MASK,	PPC,		{ RA, RS} },</div><div class='add'>+{"mftgpr",	XRC(31,735,0),	XRA_MASK,    POWER6,	POWER7,		{RT, FRB}},</div><div class='add'>+{"stfdepx",	X(31,735),	X_MASK,	  E500MC|PPCA2, 0,		{FRS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stduxe",  X(31,959),	X_MASK,		BOOKE64,	{ RS, RAS, RB } },</div><div class='add'>+{"stddx",	X(31,739),	X_MASK,	     E500MC,	0,		{RS, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "iccci",   X(31,966),	XRT_MASK,	PPC403|PPC440,	{ RA, RB } },</div><div class='add'>+{"stvswx",	X(31,741),	X_MASK,	     PPCVEC2,	0,		{VS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "tlbwehi", XTLB(31,978,0), XTLB_MASK,	PPC403,		{ RT, RA } },</div><div class='del'>-{ "tlbwelo", XTLB(31,978,1), XTLB_MASK,	PPC403,		{ RT, RA } },</div><div class='del'>-{ "tlbwe",   X(31,978),	X_MASK,		PPC403|BOOKE,	{ RSO, RAOPT, SHO } },</div><div class='del'>-{ "tlbld",   X(31,978),	XRTRA_MASK,	PPC,		{ RB } },</div><div class='add'>+{"stdat",	X(31,742),	X_MASK,	     POWER9,	0,		{RS, RA0, FC}},</div><div class='ctx'> </div><div class='del'>-{ "stbcix",  X(31,981),	X_MASK,		POWER6,		{ RS, RA0, RB } },</div><div class='add'>+{"stqfcmux",	APU(31,743,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "icbi",    X(31,982),	XRT_MASK,	PPC,		{ RA, RB } },</div><div class='add'>+{"subfmeo",	XO(31,232,1,0),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"sfmeo",	XO(31,232,1,0),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='add'>+{"subfmeo.",	XO(31,232,1,1),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"sfmeo.",	XO(31,232,1,1),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "stfiwx",  X(31,983),	X_MASK,		PPC,		{ FRS, RA0, RB } },</div><div class='add'>+{"mulldo",	XO(31,233,1,0),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+{"mulldo.",	XO(31,233,1,1),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "extsw",   XRC(31,986,0), XRB_MASK,	PPC64 | BOOKE64,{ RA, RS } },</div><div class='del'>-{ "extsw.",  XRC(31,986,1), XRB_MASK,	PPC64,		{ RA, RS } },</div><div class='add'>+{"addmeo",	XO(31,234,1,0),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"ameo",	XO(31,234,1,0),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='add'>+{"addmeo.",	XO(31,234,1,1),	XORB_MASK,   PPCCOM,	0,		{RT, RA}},</div><div class='add'>+{"ameo.",	XO(31,234,1,1),	XORB_MASK,   PWRCOM,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "icread",  X(31,998),	XRT_MASK,	PPC403|PPC440,	{ RA, RB } },</div><div class='add'>+{"mullwo",	XO(31,235,1,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"mulso",	XO(31,235,1,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"mullwo.",	XO(31,235,1,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"mulso.",	XO(31,235,1,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "icbie",   X(31,990),	XRT_MASK,	BOOKE64,	{ RA, RB } },</div><div class='del'>-{ "stfiwxe", X(31,991),	X_MASK,		BOOKE64,	{ FRS, RA0, RB } },</div><div class='add'>+{"tsuspend.",	XRCL(31,750,0,1), XRTRARB_MASK,PPCHTM,	0,		{0}},</div><div class='add'>+{"tresume.",	XRCL(31,750,1,1), XRTRARB_MASK,PPCHTM,	0,		{0}},</div><div class='add'>+{"tsr.",	XRC(31,750,1),	  XRTLRARB_MASK,PPCHTM,	0,		{L}},</div><div class='ctx'> </div><div class='del'>-{ "tlbli",   X(31,1010), XRTRA_MASK,	PPC,		{ RB } },</div><div class='add'>+{"darn",	X(31,755),	XLRAND_MASK, POWER9,	0,		{RT, LRAND}},</div><div class='ctx'> </div><div class='del'>-{ "stdcix",  X(31,1013), X_MASK,	POWER6,		{ RS, RA0, RB } },</div><div class='add'>+{"dcba",	X(31,758), XRT_MASK, PPC405|PPC7450|BOOKE|PPCA2|PPC476, 0, {RA0, RB}},</div><div class='add'>+{"dcbal",	XOPL(31,758,1), XRT_MASK,    E500MC,	0,		{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcbzl",   XOPL(31,1014,1), XRT_MASK,POWER4,            { RA, RB } },</div><div class='del'>-{ "dcbz",    X(31,1014), XRT_MASK,	PPC,		{ RA, RB } },</div><div class='del'>-{ "dclz",    X(31,1014), XRT_MASK,	PPC,		{ RA, RB } },</div><div class='add'>+{"stfdux",	X(31,759),	X_MASK,	     COM,	PPCEFS,		{FRS, RAS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcbze",   X(31,1022), XRT_MASK,	BOOKE64,	{ RA, RB } },</div><div class='add'>+{"srliq",	XRC(31,760,0),	X_MASK,	     M601,	0,		{RA, RS, SH}},</div><div class='add'>+{"srliq.",	XRC(31,760,1),	X_MASK,	     M601,	0,		{RA, RS, SH}},</div><div class='ctx'> </div><div class='del'>-{ "lvebx",   X(31,   7), X_MASK,	PPCVEC,		{ VD, RA, RB } },</div><div class='del'>-{ "lvehx",   X(31,  39), X_MASK,	PPCVEC,		{ VD, RA, RB } },</div><div class='del'>-{ "lvewx",   X(31,  71), X_MASK,	PPCVEC,		{ VD, RA, RB } },</div><div class='del'>-{ "lvsl",    X(31,   6), X_MASK,	PPCVEC,		{ VD, RA, RB } },</div><div class='del'>-{ "lvsr",    X(31,  38), X_MASK,	PPCVEC,		{ VD, RA, RB } },</div><div class='del'>-{ "lvx",     X(31, 103), X_MASK,	PPCVEC,		{ VD, RA, RB } },</div><div class='del'>-{ "lvxl",    X(31, 359), X_MASK,	PPCVEC,		{ VD, RA, RB } },</div><div class='del'>-{ "stvebx",  X(31, 135), X_MASK,	PPCVEC,		{ VS, RA, RB } },</div><div class='del'>-{ "stvehx",  X(31, 167), X_MASK,	PPCVEC,		{ VS, RA, RB } },</div><div class='del'>-{ "stvewx",  X(31, 199), X_MASK,	PPCVEC,		{ VS, RA, RB } },</div><div class='del'>-{ "stvx",    X(31, 231), X_MASK,	PPCVEC,		{ VS, RA, RB } },</div><div class='del'>-{ "stvxl",   X(31, 487), X_MASK,	PPCVEC,		{ VS, RA, RB } },</div><div class='add'>+{"lvsm",	X(31,773),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-/* New load/store left/right index vector instructions that are in the Cell only.  */</div><div class='del'>-{ "lvlx",    X(31, 519), X_MASK,	CELL,		{ VD, RA0, RB } },</div><div class='del'>-{ "lvlxl",   X(31, 775), X_MASK,	CELL,		{ VD, RA0, RB } },</div><div class='del'>-{ "lvrx",    X(31, 551), X_MASK,	CELL,		{ VD, RA0, RB } },</div><div class='del'>-{ "lvrxl",   X(31, 807), X_MASK,	CELL,		{ VD, RA0, RB } },</div><div class='del'>-{ "stvlx",   X(31, 647), X_MASK,	CELL,		{ VS, RA0, RB } },</div><div class='del'>-{ "stvlxl",  X(31, 903), X_MASK,	CELL,		{ VS, RA0, RB } },</div><div class='del'>-{ "stvrx",   X(31, 679), X_MASK,	CELL,		{ VS, RA0, RB } },</div><div class='del'>-{ "stvrxl",  X(31, 935), X_MASK,	CELL,		{ VS, RA0, RB } },</div><div class='add'>+{"copy",	XOPL(31,774,1),	XRT_MASK,    POWER9,	0,		{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lwz",     OP(32),	OP_MASK,	PPCCOM,		{ RT, D, RA0 } },</div><div class='del'>-{ "l",	     OP(32),	OP_MASK,	PWRCOM,		{ RT, D, RA0 } },</div><div class='add'>+{"stvepxl",	X(31,775),	X_MASK,	     PPCVEC2,	0,		{VS, RA0, RB}},</div><div class='add'>+{"lvlxl",	X(31,775),	X_MASK,	     CELL,	0,		{VD, RA0, RB}},</div><div class='add'>+{"ldfcmux",	APU(31,775,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lwzu",    OP(33),	OP_MASK,	PPCCOM,		{ RT, D, RAL } },</div><div class='del'>-{ "lu",      OP(33),	OP_MASK,	PWRCOM,		{ RT, D, RA0 } },</div><div class='add'>+{"dozo",	XO(31,264,1,0),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='add'>+{"dozo.",	XO(31,264,1,1),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lbz",     OP(34),	OP_MASK,	COM,		{ RT, D, RA0 } },</div><div class='add'>+{"addo",	XO(31,266,1,0),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"caxo",	XO(31,266,1,0),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"addo.",	XO(31,266,1,1),	XO_MASK,     PPCCOM,	0,		{RT, RA, RB}},</div><div class='add'>+{"caxo.",	XO(31,266,1,1),	XO_MASK,     PWRCOM,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lbzu",    OP(35),	OP_MASK,	COM,		{ RT, D, RAL } },</div><div class='add'>+{"modsd",	X(31,777),	X_MASK,	     POWER9,	0,		{RT, RA, RB}},</div><div class='add'>+{"modsw",	X(31,779),	X_MASK,	     POWER9,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stw",     OP(36),	OP_MASK,	PPCCOM,		{ RS, D, RA0 } },</div><div class='del'>-{ "st",      OP(36),	OP_MASK,	PWRCOM,		{ RS, D, RA0 } },</div><div class='add'>+{"lxvw4x",	X(31,780),	XX1_MASK,    PPCVSX,	0,		{XT6, RA0, RB}},</div><div class='add'>+{"lxsibzx",	X(31,781),	XX1_MASK,    PPCVSX3,	0,		{XT6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stwu",    OP(37),	OP_MASK,	PPCCOM,		{ RS, D, RAS } },</div><div class='del'>-{ "stu",     OP(37),	OP_MASK,	PWRCOM,		{ RS, D, RA0 } },</div><div class='add'>+{"tabortwc.",	XRC(31,782,1),	X_MASK,	     PPCHTM,	0,		{TO, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stb",     OP(38),	OP_MASK,	COM,		{ RS, D, RA0 } },</div><div class='add'>+{"tlbivax",	X(31,786),	XRT_MASK, BOOKE|PPCA2|PPC476, 0,	{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stbu",    OP(39),	OP_MASK,	COM,		{ RS, D, RAS } },</div><div class='add'>+{"lwzcix",	X(31,789),	X_MASK,	     POWER6,	0,		{RT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lhz",     OP(40),	OP_MASK,	COM,		{ RT, D, RA0 } },</div><div class='add'>+{"lhbrx",	X(31,790),	X_MASK,	     COM,	0,		{RT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lhzu",    OP(41),	OP_MASK,	COM,		{ RT, D, RAL } },</div><div class='add'>+{"lfdpx",	X(31,791),	X_MASK,	     POWER6,	POWER7,		{FRTp, RA0, RB}},</div><div class='add'>+{"lfqx",	X(31,791),	X_MASK,	     POWER2,	0,		{FRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lha",     OP(42),	OP_MASK,	COM,		{ RT, D, RA0 } },</div><div class='add'>+{"sraw",	XRC(31,792,0),	X_MASK,	     PPCCOM,	0,		{RA, RS, RB}},</div><div class='add'>+{"sra",		XRC(31,792,0),	X_MASK,	     PWRCOM,	0,		{RA, RS, RB}},</div><div class='add'>+{"sraw.",	XRC(31,792,1),	X_MASK,	     PPCCOM,	0,		{RA, RS, RB}},</div><div class='add'>+{"sra.",	XRC(31,792,1),	X_MASK,	     PWRCOM,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lhau",    OP(43),	OP_MASK,	COM,		{ RT, D, RAL } },</div><div class='add'>+{"srad",	XRC(31,794,0),	X_MASK,	     PPC64,	0,		{RA, RS, RB}},</div><div class='add'>+{"srad.",	XRC(31,794,1),	X_MASK,	     PPC64,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sth",     OP(44),	OP_MASK,	COM,		{ RS, D, RA0 } },</div><div class='add'>+{"lfddx",	X(31,803),	X_MASK,	     E500MC,	0,		{FRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "sthu",    OP(45),	OP_MASK,	COM,		{ RS, D, RAS } },</div><div class='add'>+{"lvtrxl",	X(31,805),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='add'>+{"stvepx",	X(31,807),	X_MASK,	     PPCVEC2,	0,		{VS, RA0, RB}},</div><div class='add'>+{"lvrxl",	X(31,807),	X_MASK,	     CELL,	0,		{VD, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lmw",     OP(46),	OP_MASK,	PPCCOM,		{ RT, D, RAM } },</div><div class='del'>-{ "lm",      OP(46),	OP_MASK,	PWRCOM,		{ RT, D, RA0 } },</div><div class='add'>+{"lxvh8x",	X(31,812),	XX1_MASK,    PPCVSX3,	0,		{XT6, RA0, RB}},</div><div class='add'>+{"lxsihzx",	X(31,813),	XX1_MASK,    PPCVSX3,	0,		{XT6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stmw",    OP(47),	OP_MASK,	PPCCOM,		{ RS, D, RA0 } },</div><div class='del'>-{ "stm",     OP(47),	OP_MASK,	PWRCOM,		{ RS, D, RA0 } },</div><div class='add'>+{"tabortdc.",	XRC(31,814,1),	X_MASK,	     PPCHTM,	0,		{TO, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lfs",     OP(48),	OP_MASK,	COM,		{ FRT, D, RA0 } },</div><div class='add'>+{"rac",		X(31,818),	X_MASK,	     M601,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lfsu",    OP(49),	OP_MASK,	COM,		{ FRT, D, RAS } },</div><div class='add'>+{"erativax",	X(31,819),	X_MASK,	     PPCA2,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lfd",     OP(50),	OP_MASK,	COM,		{ FRT, D, RA0 } },</div><div class='add'>+{"lhzcix",	X(31,821),	X_MASK,	     POWER6,	0,		{RT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lfdu",    OP(51),	OP_MASK,	COM,		{ FRT, D, RAS } },</div><div class='add'>+{"dss",		XDSS(31,822,0),	XDSS_MASK,   PPCVEC,	0,		{STRM}},</div><div class='ctx'> </div><div class='del'>-{ "stfs",    OP(52),	OP_MASK,	COM,		{ FRS, D, RA0 } },</div><div class='add'>+{"lfqux",	X(31,823),	X_MASK,	     POWER2,	0,		{FRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stfsu",   OP(53),	OP_MASK,	COM,		{ FRS, D, RAS } },</div><div class='add'>+{"srawi",	XRC(31,824,0),	X_MASK,	     PPCCOM,	0,		{RA, RS, SH}},</div><div class='add'>+{"srai",	XRC(31,824,0),	X_MASK,	     PWRCOM,	0,		{RA, RS, SH}},</div><div class='add'>+{"srawi.",	XRC(31,824,1),	X_MASK,	     PPCCOM,	0,		{RA, RS, SH}},</div><div class='add'>+{"srai.",	XRC(31,824,1),	X_MASK,	     PWRCOM,	0,		{RA, RS, SH}},</div><div class='ctx'> </div><div class='del'>-{ "stfd",    OP(54),	OP_MASK,	COM,		{ FRS, D, RA0 } },</div><div class='add'>+{"sradi",	XS(31,413,0),	XS_MASK,     PPC64,	0,		{RA, RS, SH6}},</div><div class='add'>+{"sradi.",	XS(31,413,1),	XS_MASK,     PPC64,	0,		{RA, RS, SH6}},</div><div class='ctx'> </div><div class='del'>-{ "stfdu",   OP(55),	OP_MASK,	COM,		{ FRS, D, RAS } },</div><div class='add'>+{"lvtlxl",	X(31,837),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lq",      OP(56),	OP_MASK,	POWER4,		{ RTQ, DQ, RAQ } },</div><div class='add'>+{"cpabort",	X(31,838),	XRTRARB_MASK,POWER9,	0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "lfq",     OP(56),	OP_MASK,	POWER2,		{ FRT, D, RA0 } },</div><div class='add'>+{"divo",	XO(31,331,1,0),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='add'>+{"divo.",	XO(31,331,1,1),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lfqu",    OP(57),	OP_MASK,	POWER2,		{ FRT, D, RA0 } },</div><div class='add'>+{"lxvd2x",	X(31,844),	XX1_MASK,    PPCVSX,	0,		{XT6, RA0, RB}},</div><div class='add'>+{"lxvx",	X(31,844),	XX1_MASK,    POWER8,	POWER9|PPCVSX3,	{XT6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lfdp",    OP(57),	OP_MASK,	POWER6,		{ FRT, D, RA0 } },</div><div class='add'>+{"tabortwci.",	XRC(31,846,1),	X_MASK,	     PPCHTM,	0,		{TO, RA, HTM_SI}},</div><div class='ctx'> </div><div class='del'>-{ "lbze",    DEO(58,0), DE_MASK,	BOOKE64,	{ RT, DE, RA0 } },</div><div class='del'>-{ "lbzue",   DEO(58,1), DE_MASK,	BOOKE64,	{ RT, DE, RAL } },</div><div class='del'>-{ "lhze",    DEO(58,2), DE_MASK,	BOOKE64,	{ RT, DE, RA0 } },</div><div class='del'>-{ "lhzue",   DEO(58,3), DE_MASK,	BOOKE64,	{ RT, DE, RAL } },</div><div class='del'>-{ "lhae",    DEO(58,4), DE_MASK,	BOOKE64,	{ RT, DE, RA0 } },</div><div class='del'>-{ "lhaue",   DEO(58,5), DE_MASK,	BOOKE64,	{ RT, DE, RAL } },</div><div class='del'>-{ "lwze",    DEO(58,6), DE_MASK,	BOOKE64,	{ RT, DE, RA0 } },</div><div class='del'>-{ "lwzue",   DEO(58,7), DE_MASK,	BOOKE64,	{ RT, DE, RAL } },</div><div class='del'>-{ "stbe",    DEO(58,8), DE_MASK,	BOOKE64,	{ RS, DE, RA0 } },</div><div class='del'>-{ "stbue",   DEO(58,9), DE_MASK,	BOOKE64,	{ RS, DE, RAS } },</div><div class='del'>-{ "sthe",    DEO(58,10), DE_MASK,	BOOKE64,	{ RS, DE, RA0 } },</div><div class='del'>-{ "sthue",   DEO(58,11), DE_MASK,	BOOKE64,	{ RS, DE, RAS } },</div><div class='del'>-{ "stwe",    DEO(58,14), DE_MASK,	BOOKE64,	{ RS, DE, RA0 } },</div><div class='del'>-{ "stwue",   DEO(58,15), DE_MASK,	BOOKE64,	{ RS, DE, RAS } },</div><div class='add'>+{"tlbsrx.",	XRC(31,850,1),	XRT_MASK,    PPCA2,	0,		{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "ld",      DSO(58,0),	DS_MASK,	PPC64,		{ RT, DS, RA0 } },</div><div class='add'>+{"slbiag",	X(31,850),	XRARB_MASK,  POWER9,	0,		{RS}},</div><div class='add'>+{"slbmfev",	X(31,851),	XRLA_MASK,   POWER9,	0,		{RT, RB, A_L}},</div><div class='add'>+{"slbmfev",	X(31,851),	XRA_MASK,    PPC64,	POWER9,		{RT, RB}},</div><div class='ctx'> </div><div class='del'>-{ "ldu",     DSO(58,1), DS_MASK,	PPC64,		{ RT, DS, RAL } },</div><div class='add'>+{"lbzcix",	X(31,853),	X_MASK,	     POWER6,	0,		{RT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "lwa",     DSO(58,2), DS_MASK,	PPC64,		{ RT, DS, RA0 } },</div><div class='add'>+{"eieio",	X(31,854),	0xffffffff,  PPC,   BOOKE|PPCA2|PPC476,	{0}},</div><div class='add'>+{"mbar",	X(31,854),	X_MASK,	   BOOKE|PPCA2|PPC476, 0,	{MO}},</div><div class='add'>+{"eieio",	XMBAR(31,854,1),0xffffffff,  E500,	0,		{0}},</div><div class='add'>+{"eieio",	X(31,854),	0xffffffff, PPCA2|PPC476, 0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "dadd",    XRC(59,2,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "dadd.",   XRC(59,2,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='add'>+{"lfiwax",	X(31,855),	X_MASK, POWER6|PPCA2|PPC476, 0,		{FRT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dqua",    ZRC(59,3,0), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },</div><div class='del'>-{ "dqua.",   ZRC(59,3,1), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },</div><div class='add'>+{"lvswxl",	X(31,869),	X_MASK,	     PPCVEC2,	0,		{VD, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fdivs",   A(59,18,0), AFRC_MASK,	PPC,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fdivs.",  A(59,18,1), AFRC_MASK,	PPC,		{ FRT, FRA, FRB } },</div><div class='add'>+{"abso",	XO(31,360,1,0),	XORB_MASK,   M601,	0,		{RT, RA}},</div><div class='add'>+{"abso.",	XO(31,360,1,1),	XORB_MASK,   M601,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "fsubs",   A(59,20,0), AFRC_MASK,	PPC,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fsubs.",  A(59,20,1), AFRC_MASK,	PPC,		{ FRT, FRA, FRB } },</div><div class='add'>+{"divso",	XO(31,363,1,0),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='add'>+{"divso.",	XO(31,363,1,1),	XO_MASK,     M601,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fadds",   A(59,21,0), AFRC_MASK,	PPC,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fadds.",  A(59,21,1), AFRC_MASK,	PPC,		{ FRT, FRA, FRB } },</div><div class='add'>+{"lxvb16x",	X(31,876),	XX1_MASK,    PPCVSX3,	0,		{XT6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fsqrts",  A(59,22,0), AFRAFRC_MASK,	PPC,		{ FRT, FRB } },</div><div class='del'>-{ "fsqrts.", A(59,22,1), AFRAFRC_MASK,	PPC,		{ FRT, FRB } },</div><div class='add'>+{"tabortdci.",	XRC(31,878,1),	X_MASK,	     PPCHTM,	0,		{TO, RA, HTM_SI}},</div><div class='ctx'> </div><div class='del'>-{ "fres",    A(59,24,0), AFRALFRC_MASK,	PPC,		{ FRT, FRB, A_L } },</div><div class='del'>-{ "fres.",   A(59,24,1), AFRALFRC_MASK,	PPC,		{ FRT, FRB, A_L } },</div><div class='add'>+{"rmieg",	X(31,882),	XRTRA_MASK,  POWER9,	0,		{RB}},</div><div class='ctx'> </div><div class='del'>-{ "fmuls",   A(59,25,0), AFRB_MASK,	PPC,		{ FRT, FRA, FRC } },</div><div class='del'>-{ "fmuls.",  A(59,25,1), AFRB_MASK,	PPC,		{ FRT, FRA, FRC } },</div><div class='add'>+{"ldcix",	X(31,885),	X_MASK,	     POWER6,	0,		{RT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "frsqrtes", A(59,26,0), AFRALFRC_MASK,POWER5,		{ FRT, FRB, A_L } },</div><div class='del'>-{ "frsqrtes.",A(59,26,1), AFRALFRC_MASK,POWER5,		{ FRT, FRB, A_L } },</div><div class='add'>+{"msgsync",	X(31,886),	0xffffffff,  POWER9,	0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "fmsubs",  A(59,28,0), A_MASK,	PPC,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fmsubs.", A(59,28,1), A_MASK,	PPC,		{ FRT,FRA,FRC,FRB } },</div><div class='add'>+{"lfiwzx",	X(31,887),	X_MASK,	  POWER7|PPCA2,	0,		{FRT, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fmadds",  A(59,29,0), A_MASK,	PPC,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fmadds.", A(59,29,1), A_MASK,	PPC,		{ FRT,FRA,FRC,FRB } },</div><div class='add'>+{"extswsli",	XS(31,445,0),	XS_MASK,     POWER9,	0,		{RA, RS, SH6}},</div><div class='add'>+{"extswsli.",	XS(31,445,1),	XS_MASK,     POWER9,	0,		{RA, RS, SH6}},</div><div class='ctx'> </div><div class='del'>-{ "fnmsubs", A(59,30,0), A_MASK,	PPC,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fnmsubs.",A(59,30,1), A_MASK,	PPC,		{ FRT,FRA,FRC,FRB } },</div><div class='add'>+{"paste.",	XRCL(31,902,1,1),XRT_MASK,   POWER9,	0,		{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fnmadds", A(59,31,0), A_MASK,	PPC,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fnmadds.",A(59,31,1), A_MASK,	PPC,		{ FRT,FRA,FRC,FRB } },</div><div class='add'>+{"stvlxl",	X(31,903),	X_MASK,	     CELL,	0,		{VS, RA0, RB}},</div><div class='add'>+{"stdfcmux",	APU(31,903,0),	APU_MASK,    PPC405,	0,		{FCRT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dmul",    XRC(59,34,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "dmul.",   XRC(59,34,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='add'>+{"divdeuo",	XO(31,393,1,0),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='add'>+{"divdeuo.",	XO(31,393,1,1),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='add'>+{"divweuo",	XO(31,395,1,0),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='add'>+{"divweuo.",	XO(31,395,1,1),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "drrnd",   ZRC(59,35,0), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },</div><div class='del'>-{ "drrnd.",  ZRC(59,35,1), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },</div><div class='add'>+{"stxvw4x",	X(31,908),	XX1_MASK,    PPCVSX,	0,		{XS6, RA0, RB}},</div><div class='add'>+{"stxsibx",	X(31,909),	XX1_MASK,    PPCVSX3,	0,		{XS6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dscli",   ZRC(59,66,0), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },</div><div class='del'>-{ "dscli.",  ZRC(59,66,1), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },</div><div class='add'>+{"tabort.",	XRC(31,910,1),	XRTRB_MASK,  PPCHTM,	0,		{RA}},</div><div class='ctx'> </div><div class='del'>-{ "dquai",   ZRC(59,67,0), Z_MASK,	POWER6,		{ TE,  FRT, FRB, RMC } },</div><div class='del'>-{ "dquai.",  ZRC(59,67,1), Z_MASK,	POWER6,		{ TE,  FRT, FRB, RMC } },</div><div class='add'>+{"tlbsx",	XRC(31,914,0),	X_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,	{RTO, RA0, RB}},</div><div class='add'>+{"tlbsx.",	XRC(31,914,1),	X_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,	{RTO, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dscri",   ZRC(59,98,0), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },</div><div class='del'>-{ "dscri.",  ZRC(59,98,1), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },</div><div class='add'>+{"slbmfee",	X(31,915),	XRLA_MASK,   POWER9,	0,		{RT, RB, A_L}},</div><div class='add'>+{"slbmfee",	X(31,915),	XRA_MASK,    PPC64,	POWER9,		{RT, RB}},</div><div class='ctx'> </div><div class='del'>-{ "drintx",  ZRC(59,99,0), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },</div><div class='del'>-{ "drintx.", ZRC(59,99,1), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },</div><div class='add'>+{"stwcix",	X(31,917),	X_MASK,	     POWER6,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcmpo",   X(59,130),	   X_MASK,	POWER6,		{ BF,  FRA, FRB } },</div><div class='add'>+{"sthbrx",	X(31,918),	X_MASK,	     COM,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dtstex",  X(59,162),	   X_MASK,	POWER6,		{ BF,  FRA, FRB } },</div><div class='del'>-{ "dtstdc",  Z(59,194),	   Z_MASK,	POWER6,		{ BF,  FRA, DCM } },</div><div class='del'>-{ "dtstdg",  Z(59,226),	   Z_MASK,	POWER6,		{ BF,  FRA, DGM } },</div><div class='add'>+{"stfdpx",	X(31,919),	X_MASK,	     POWER6,	POWER7,		{FRSp, RA0, RB}},</div><div class='add'>+{"stfqx",	X(31,919),	X_MASK,	     POWER2,	0,		{FRS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "drintn",  ZRC(59,227,0), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },</div><div class='del'>-{ "drintn.", ZRC(59,227,1), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },</div><div class='add'>+{"sraq",	XRC(31,920,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"sraq.",	XRC(31,920,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dctdp",   XRC(59,258,0), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='del'>-{ "dctdp.",  XRC(59,258,1), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='add'>+{"srea",	XRC(31,921,0),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='add'>+{"srea.",	XRC(31,921,1),	X_MASK,	     M601,	0,		{RA, RS, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dctfix",  XRC(59,290,0), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='del'>-{ "dctfix.", XRC(59,290,1), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='add'>+{"extsh",	XRC(31,922,0),	XRB_MASK,    PPCCOM,	0,		{RA, RS}},</div><div class='add'>+{"exts",	XRC(31,922,0),	XRB_MASK,    PWRCOM,	0,		{RA, RS}},</div><div class='add'>+{"extsh.",	XRC(31,922,1),	XRB_MASK,    PPCCOM,	0,		{RA, RS}},</div><div class='add'>+{"exts.",	XRC(31,922,1),	XRB_MASK,    PWRCOM,	0,		{RA, RS}},</div><div class='ctx'> </div><div class='del'>-{ "ddedpd",  XRC(59,322,0), X_MASK,	POWER6,		{ SP, FRT, FRB } }, </div><div class='del'>-{ "ddedpd.", XRC(59,322,1), X_MASK,	POWER6,		{ SP, FRT, FRB } }, </div><div class='add'>+{"stfddx",	X(31,931),	X_MASK,	     E500MC,	0,		{FRS, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dxex",    XRC(59,354,0), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='del'>-{ "dxex.",   XRC(59,354,1), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='add'>+{"stvfrxl",	X(31,933),	X_MASK,	     PPCVEC2,	0,		{VS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dsub",    XRC(59,514,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "dsub.",   XRC(59,514,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='add'>+{"wclrone",	XOPL2(31,934,2),XRT_MASK,    PPCA2,	0,		{RA0, RB}},</div><div class='add'>+{"wclrall",	X(31,934),	XRARB_MASK,  PPCA2,	0,		{L2}},</div><div class='add'>+{"wclr",	X(31,934),	X_MASK,	     PPCA2,	0,		{L2, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "ddiv",    XRC(59,546,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "ddiv.",   XRC(59,546,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='add'>+{"stvrxl",	X(31,935),	X_MASK,	     CELL,	0,		{VS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dcmpu",   X(59,642),	    X_MASK,	POWER6,		{ BF,  FRA, FRB } },</div><div class='add'>+{"divdeo",	XO(31,425,1,0),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='add'>+{"divdeo.",	XO(31,425,1,1),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='add'>+{"divweo",	XO(31,427,1,0),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='add'>+{"divweo.",	XO(31,427,1,1),	XO_MASK,  POWER7|PPCA2,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dtstsf",  X(59,674),	   X_MASK,	POWER6,		{ BF,  FRA, FRB } },</div><div class='add'>+{"stxvh8x",	X(31,940),	XX1_MASK,    PPCVSX3,	0,		{XS6, RA0, RB}},</div><div class='add'>+{"stxsihx",	X(31,941),	XX1_MASK,    PPCVSX3,	0,		{XS6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "drsp",    XRC(59,770,0), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='del'>-{ "drsp.",   XRC(59,770,1), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='add'>+{"treclaim.",	XRC(31,942,1),	XRTRB_MASK,  PPCHTM,	0,		{RA}},</div><div class='ctx'> </div><div class='del'>-{ "dcffix",  XRC(59,802,0), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='del'>-{ "dcffix.", XRC(59,802,1), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='add'>+{"tlbrehi",	XTLB(31,946,0),	XTLB_MASK,   PPC403,	PPCA2,		{RT, RA}},</div><div class='add'>+{"tlbrelo",	XTLB(31,946,1),	XTLB_MASK,   PPC403,	PPCA2,		{RT, RA}},</div><div class='add'>+{"tlbre",	X(31,946),  X_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,	{RSO, RAOPT, SHO}},</div><div class='ctx'> </div><div class='del'>-{ "denbcd",  XRC(59,834,0), X_MASK,	POWER6,		{ S, FRT, FRB } },</div><div class='del'>-{ "denbcd.", XRC(59,834,1), X_MASK,	POWER6,		{ S, FRT, FRB } },</div><div class='add'>+{"sthcix",	X(31,949),	X_MASK,	     POWER6,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "diex",    XRC(59,866,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "diex.",   XRC(59,866,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='add'>+{"icswepx",	XRC(31,950,0),	X_MASK,	     PPCA2,	0,		{RS, RA, RB}},</div><div class='add'>+{"icswepx.",	XRC(31,950,1),	X_MASK,	     PPCA2,	0,		{RS, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stfq",    OP(60),	OP_MASK,	POWER2,		{ FRS, D, RA } },</div><div class='add'>+{"stfqux",	X(31,951),	X_MASK,	     POWER2,	0,		{FRS, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stfqu",   OP(61),	OP_MASK,	POWER2,		{ FRS, D, RA } },</div><div class='add'>+{"sraiq",	XRC(31,952,0),	X_MASK,	     M601,	0,		{RA, RS, SH}},</div><div class='add'>+{"sraiq.",	XRC(31,952,1),	X_MASK,	     M601,	0,		{RA, RS, SH}},</div><div class='ctx'> </div><div class='del'>-{ "stfdp",   OP(61),	OP_MASK,	POWER6,		{ FRT, D, RA0 } },</div><div class='add'>+{"extsb",	XRC(31,954,0),	XRB_MASK,    PPC,	0,		{RA, RS}},</div><div class='add'>+{"extsb.",	XRC(31,954,1),	XRB_MASK,    PPC,	0,		{RA, RS}},</div><div class='ctx'> </div><div class='del'>-{ "lde",     DEO(62,0), DE_MASK,	BOOKE64,	{ RT, DES, RA0 } },</div><div class='del'>-{ "ldue",    DEO(62,1), DE_MASK,	BOOKE64,	{ RT, DES, RA0 } },</div><div class='del'>-{ "lfse",    DEO(62,4), DE_MASK,	BOOKE64,	{ FRT, DES, RA0 } },</div><div class='del'>-{ "lfsue",   DEO(62,5), DE_MASK,	BOOKE64,	{ FRT, DES, RAS } },</div><div class='del'>-{ "lfde",    DEO(62,6), DE_MASK,	BOOKE64,	{ FRT, DES, RA0 } },</div><div class='del'>-{ "lfdue",   DEO(62,7), DE_MASK,	BOOKE64,	{ FRT, DES, RAS } },</div><div class='del'>-{ "stde",    DEO(62,8), DE_MASK,	BOOKE64,	{ RS, DES, RA0 } },</div><div class='del'>-{ "stdue",   DEO(62,9), DE_MASK,	BOOKE64,	{ RS, DES, RAS } },</div><div class='del'>-{ "stfse",   DEO(62,12), DE_MASK,	BOOKE64,	{ FRS, DES, RA0 } },</div><div class='del'>-{ "stfsue",  DEO(62,13), DE_MASK,	BOOKE64,	{ FRS, DES, RAS } },</div><div class='del'>-{ "stfde",   DEO(62,14), DE_MASK,	BOOKE64,	{ FRS, DES, RA0 } },</div><div class='del'>-{ "stfdue",  DEO(62,15), DE_MASK,	BOOKE64,	{ FRS, DES, RAS } },</div><div class='add'>+{"stvflxl",	X(31,965),	X_MASK,	     PPCVEC2,	0,		{VS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "std",     DSO(62,0),	DS_MASK,	PPC64,		{ RS, DS, RA0 } },</div><div class='add'>+{"iccci",	X(31,966), XRT_MASK, PPC403|PPC440|TITAN|PPCA2, 0,	 {RAOPT, RBOPT}},</div><div class='add'>+{"ici",		X(31,966),	XRARB_MASK,  PPCA2|PPC476, 0,		{CT}},</div><div class='ctx'> </div><div class='del'>-{ "stdu",    DSO(62,1),	DS_MASK,	PPC64,		{ RS, DS, RAS } },</div><div class='add'>+{"divduo",	XO(31,457,1,0),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+{"divduo.",	XO(31,457,1,1),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "stq",     DSO(62,2),	DS_MASK,	POWER4,		{ RSQ, DS, RA0 } },</div><div class='add'>+{"divwuo",	XO(31,459,1,0),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+{"divwuo.",	XO(31,459,1,1),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fcmpu",   X(63,0),	X_MASK|(3&lt;&lt;21),	COM,		{ BF, FRA, FRB } },</div><div class='add'>+{"stxvd2x",	X(31,972),	XX1_MASK,    PPCVSX,	0,		{XS6, RA0, RB}},</div><div class='add'>+{"stxvx",	X(31,972),	XX1_MASK,    POWER8,	POWER9|PPCVSX3,	{XS6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "daddq",   XRC(63,2,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "daddq.",  XRC(63,2,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='add'>+{"tlbld",	X(31,978),	XRTRA_MASK,  PPC, PPC403|BOOKE|PPCA2|PPC476, {RB}},</div><div class='add'>+{"tlbwehi",	XTLB(31,978,0),	XTLB_MASK,   PPC403,	0,		{RT, RA}},</div><div class='add'>+{"tlbwelo",	XTLB(31,978,1),	XTLB_MASK,   PPC403,	0,		{RT, RA}},</div><div class='add'>+{"tlbwe",	X(31,978),  X_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,	{RSO, RAOPT, SHO}},</div><div class='ctx'> </div><div class='del'>-{ "dquaq",   ZRC(63,3,0), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },</div><div class='del'>-{ "dquaq.",  ZRC(63,3,1), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },</div><div class='add'>+{"slbfee.",	XRC(31,979,1),	XRA_MASK,    POWER6,	0,		{RT, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fcpsgn",  XRC(63,8,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fcpsgn.", XRC(63,8,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='add'>+{"stbcix",	X(31,981),	X_MASK,	     POWER6,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "frsp",    XRC(63,12,0), XRA_MASK,	COM,		{ FRT, FRB } },</div><div class='del'>-{ "frsp.",   XRC(63,12,1), XRA_MASK,	COM,		{ FRT, FRB } },</div><div class='add'>+{"icbi",	X(31,982),	XRT_MASK,    PPC,	0,		{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fctiw",   XRC(63,14,0), XRA_MASK,	PPCCOM,		{ FRT, FRB } },</div><div class='del'>-{ "fcir",    XRC(63,14,0), XRA_MASK,	POWER2,		{ FRT, FRB } },</div><div class='del'>-{ "fctiw.",  XRC(63,14,1), XRA_MASK,	PPCCOM,		{ FRT, FRB } },</div><div class='del'>-{ "fcir.",   XRC(63,14,1), XRA_MASK,	POWER2,		{ FRT, FRB } },</div><div class='add'>+{"stfiwx",	X(31,983),	X_MASK,	     PPC,	PPCEFS,		{FRS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fctiwz",  XRC(63,15,0), XRA_MASK,	PPCCOM,		{ FRT, FRB } },</div><div class='del'>-{ "fcirz",   XRC(63,15,0), XRA_MASK,	POWER2,		{ FRT, FRB } },</div><div class='del'>-{ "fctiwz.", XRC(63,15,1), XRA_MASK,	PPCCOM,		{ FRT, FRB } },</div><div class='del'>-{ "fcirz.",  XRC(63,15,1), XRA_MASK,	POWER2,		{ FRT, FRB } },</div><div class='add'>+{"extsw",	XRC(31,986,0),	XRB_MASK,    PPC64,	0,		{RA, RS}},</div><div class='add'>+{"extsw.",	XRC(31,986,1),	XRB_MASK,    PPC64,	0,		{RA, RS}},</div><div class='ctx'> </div><div class='del'>-{ "fdiv",    A(63,18,0), AFRC_MASK,	PPCCOM,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fd",      A(63,18,0), AFRC_MASK,	PWRCOM,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fdiv.",   A(63,18,1), AFRC_MASK,	PPCCOM,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fd.",     A(63,18,1), AFRC_MASK,	PWRCOM,		{ FRT, FRA, FRB } },</div><div class='add'>+{"icbiep",	XRT(31,991,0),	XRT_MASK,    E500MC|PPCA2, 0,		{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fsub",    A(63,20,0), AFRC_MASK,	PPCCOM,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fs",      A(63,20,0), AFRC_MASK,	PWRCOM,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fsub.",   A(63,20,1), AFRC_MASK,	PPCCOM,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fs.",     A(63,20,1), AFRC_MASK,	PWRCOM,		{ FRT, FRA, FRB } },</div><div class='add'>+{"stvswxl",	X(31,997),	X_MASK,	     PPCVEC2,	0,		{VS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fadd",    A(63,21,0), AFRC_MASK,	PPCCOM,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fa",      A(63,21,0), AFRC_MASK,	PWRCOM,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fadd.",   A(63,21,1), AFRC_MASK,	PPCCOM,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "fa.",     A(63,21,1), AFRC_MASK,	PWRCOM,		{ FRT, FRA, FRB } },</div><div class='add'>+{"icread",	X(31,998),     XRT_MASK, PPC403|PPC440|PPC476|TITAN, 0,	{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fsqrt",   A(63,22,0), AFRAFRC_MASK,	PPCPWR2,	{ FRT, FRB } },</div><div class='del'>-{ "fsqrt.",  A(63,22,1), AFRAFRC_MASK,	PPCPWR2,	{ FRT, FRB } },</div><div class='add'>+{"nabso",	XO(31,488,1,0),	XORB_MASK,   M601,	0,		{RT, RA}},</div><div class='add'>+{"nabso.",	XO(31,488,1,1),	XORB_MASK,   M601,	0,		{RT, RA}},</div><div class='ctx'> </div><div class='del'>-{ "fsel",    A(63,23,0), A_MASK,	PPC,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fsel.",   A(63,23,1), A_MASK,	PPC,		{ FRT,FRA,FRC,FRB } },</div><div class='add'>+{"divdo",	XO(31,489,1,0),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='add'>+{"divdo.",	XO(31,489,1,1),	XO_MASK,     PPC64,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fre",     A(63,24,0), AFRALFRC_MASK,	POWER5,		{ FRT, FRB, A_L } },</div><div class='del'>-{ "fre.",    A(63,24,1), AFRALFRC_MASK,	POWER5,		{ FRT, FRB, A_L } },</div><div class='add'>+{"divwo",	XO(31,491,1,0),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='add'>+{"divwo.",	XO(31,491,1,1),	XO_MASK,     PPC,	0,		{RT, RA, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fmul",    A(63,25,0), AFRB_MASK,	PPCCOM,		{ FRT, FRA, FRC } },</div><div class='del'>-{ "fm",      A(63,25,0), AFRB_MASK,	PWRCOM,		{ FRT, FRA, FRC } },</div><div class='del'>-{ "fmul.",   A(63,25,1), AFRB_MASK,	PPCCOM,		{ FRT, FRA, FRC } },</div><div class='del'>-{ "fm.",     A(63,25,1), AFRB_MASK,	PWRCOM,		{ FRT, FRA, FRC } },</div><div class='add'>+{"stxvb16x",	X(31,1004),	XX1_MASK,    PPCVSX3,	0,		{XS6, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "frsqrte", A(63,26,0), AFRALFRC_MASK,	PPC,		{ FRT, FRB, A_L } },</div><div class='del'>-{ "frsqrte.",A(63,26,1), AFRALFRC_MASK,	PPC,		{ FRT, FRB, A_L } },</div><div class='add'>+{"trechkpt.",	XRC(31,1006,1),	XRTRARB_MASK,PPCHTM,	0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "fmsub",   A(63,28,0), A_MASK,	PPCCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fms",     A(63,28,0), A_MASK,	PWRCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fmsub.",  A(63,28,1), A_MASK,	PPCCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fms.",    A(63,28,1), A_MASK,	PWRCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='add'>+{"tlbli",	X(31,1010),	XRTRA_MASK,  PPC,	TITAN,		{RB}},</div><div class='ctx'> </div><div class='del'>-{ "fmadd",   A(63,29,0), A_MASK,	PPCCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fma",     A(63,29,0), A_MASK,	PWRCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fmadd.",  A(63,29,1), A_MASK,	PPCCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fma.",    A(63,29,1), A_MASK,	PWRCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='add'>+{"stdcix",	X(31,1013),	X_MASK,	     POWER6,	0,		{RS, RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fnmsub",  A(63,30,0), A_MASK,	PPCCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fnms",    A(63,30,0), A_MASK,	PWRCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fnmsub.", A(63,30,1), A_MASK,	PPCCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fnms.",   A(63,30,1), A_MASK,	PWRCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='add'>+{"dcbz",	X(31,1014),	XRT_MASK,    PPC,	0,		{RA0, RB}},</div><div class='add'>+{"dclz",	X(31,1014),	XRT_MASK,    PPC,	0,		{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fnmadd",  A(63,31,0), A_MASK,	PPCCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fnma",    A(63,31,0), A_MASK,	PWRCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fnmadd.", A(63,31,1), A_MASK,	PPCCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='del'>-{ "fnma.",   A(63,31,1), A_MASK,	PWRCOM,		{ FRT,FRA,FRC,FRB } },</div><div class='add'>+{"dcbzep",	XRT(31,1023,0),	XRT_MASK,    E500MC|PPCA2, 0,		{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "fcmpo",   X(63,32),	X_MASK|(3&lt;&lt;21),	COM,		{ BF, FRA, FRB } },</div><div class='add'>+{"dcbzl",	XOPL(31,1014,1), XRT_MASK,   POWER4|E500MC, PPC476,	{RA0, RB}},</div><div class='ctx'> </div><div class='del'>-{ "dmulq",   XRC(63,34,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "dmulq.",  XRC(63,34,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='add'>+{"cctpl",	0x7c210b78,	0xffffffff,  CELL,	0,		{0}},</div><div class='add'>+{"cctpm",	0x7c421378,	0xffffffff,  CELL,	0,		{0}},</div><div class='add'>+{"cctph",	0x7c631b78,	0xffffffff,  CELL,	0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "drrndq",  ZRC(63,35,0), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },</div><div class='del'>-{ "drrndq.", ZRC(63,35,1), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },</div><div class='add'>+{"dstt",	XDSS(31,342,1),	XDSS_MASK,   PPCVEC,	0,		{RA, RB, STRM}},</div><div class='add'>+{"dststt",	XDSS(31,374,1),	XDSS_MASK,   PPCVEC,	0,		{RA, RB, STRM}},</div><div class='add'>+{"dssall",	XDSS(31,822,1),	XDSS_MASK,   PPCVEC,	0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "mtfsb1",  XRC(63,38,0), XRARB_MASK,	COM,		{ BT } },</div><div class='del'>-{ "mtfsb1.", XRC(63,38,1), XRARB_MASK,	COM,		{ BT } },</div><div class='add'>+{"db8cyc",	0x7f9ce378,	0xffffffff,  CELL,	0,		{0}},</div><div class='add'>+{"db10cyc",	0x7fbdeb78,	0xffffffff,  CELL,	0,		{0}},</div><div class='add'>+{"db12cyc",	0x7fdef378,	0xffffffff,  CELL,	0,		{0}},</div><div class='add'>+{"db16cyc",	0x7ffffb78,	0xffffffff,  CELL,	0,		{0}},</div><div class='ctx'> </div><div class='del'>-{ "fneg",    XRC(63,40,0), XRA_MASK,	COM,		{ FRT, FRB } },</div><div class='del'>-{ "fneg.",   XRC(63,40,1), XRA_MASK,	COM,		{ FRT, FRB } },</div><div class='add'>+{"lwz",		OP(32),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, D, RA0}},</div><div class='add'>+{"l",		OP(32),		OP_MASK,     PWRCOM,	PPCVLE,		{RT, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "mcrfs",   X(63,64),	XRB_MASK|(3&lt;&lt;21)|(3&lt;&lt;16), COM,	{ BF, BFA } },</div><div class='add'>+{"lwzu",	OP(33),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, D, RAL}},</div><div class='add'>+{"lu",		OP(33),		OP_MASK,     PWRCOM,	PPCVLE,		{RT, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "dscliq",  ZRC(63,66,0), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },</div><div class='del'>-{ "dscliq.", ZRC(63,66,1), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },</div><div class='add'>+{"lbz",		OP(34),		OP_MASK,     COM,	PPCVLE,		{RT, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "dquaiq",  ZRC(63,67,0), Z_MASK,	POWER6,		{ TE,  FRT, FRB, RMC } },</div><div class='del'>-{ "dquaiq.", ZRC(63,67,1), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },</div><div class='add'>+{"lbzu",	OP(35),		OP_MASK,     COM,	PPCVLE,		{RT, D, RAL}},</div><div class='ctx'> </div><div class='del'>-{ "mtfsb0",  XRC(63,70,0), XRARB_MASK,	COM,		{ BT } },</div><div class='del'>-{ "mtfsb0.", XRC(63,70,1), XRARB_MASK,	COM,		{ BT } },</div><div class='add'>+{"stw",		OP(36),		OP_MASK,     PPCCOM,	PPCVLE,		{RS, D, RA0}},</div><div class='add'>+{"st",		OP(36),		OP_MASK,     PWRCOM,	PPCVLE,		{RS, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "fmr",     XRC(63,72,0), XRA_MASK,	COM,		{ FRT, FRB } },</div><div class='del'>-{ "fmr.",    XRC(63,72,1), XRA_MASK,	COM,		{ FRT, FRB } },</div><div class='add'>+{"stwu",	OP(37),		OP_MASK,     PPCCOM,	PPCVLE,		{RS, D, RAS}},</div><div class='add'>+{"stu",		OP(37),		OP_MASK,     PWRCOM,	PPCVLE,		{RS, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "dscriq",  ZRC(63,98,0), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },</div><div class='del'>-{ "dscriq.", ZRC(63,98,1), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },</div><div class='add'>+{"stb",		OP(38),		OP_MASK,     COM,	PPCVLE,		{RS, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "drintxq", ZRC(63,99,0), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },</div><div class='del'>-{ "drintxq.",ZRC(63,99,1), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },</div><div class='add'>+{"stbu",	OP(39),		OP_MASK,     COM,	PPCVLE,		{RS, D, RAS}},</div><div class='ctx'> </div><div class='del'>-{ "dcmpoq",  X(63,130),	   X_MASK,	POWER6,		{ BF,  FRA, FRB } },</div><div class='add'>+{"lhz",		OP(40),		OP_MASK,     COM,	PPCVLE,		{RT, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "mtfsfi",  XRC(63,134,0), XRA_MASK|(3&lt;&lt;21)|(1&lt;&lt;11), COM, { BF, U } },</div><div class='del'>-{ "mtfsfi.", XRC(63,134,1), XRA_MASK|(3&lt;&lt;21)|(1&lt;&lt;11), COM, { BF, U } },</div><div class='add'>+{"lhzu",	OP(41),		OP_MASK,     COM,	PPCVLE,		{RT, D, RAL}},</div><div class='ctx'> </div><div class='del'>-{ "fnabs",   XRC(63,136,0), XRA_MASK,	COM,		{ FRT, FRB } },</div><div class='del'>-{ "fnabs.",  XRC(63,136,1), XRA_MASK,	COM,		{ FRT, FRB } },</div><div class='add'>+{"lha",		OP(42),		OP_MASK,     COM,	PPCVLE,		{RT, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "dtstexq", X(63,162),	    X_MASK,	POWER6,		{ BF,  FRA, FRB } },</div><div class='del'>-{ "dtstdcq", Z(63,194),	    Z_MASK,	POWER6,		{ BF,  FRA, DCM } },</div><div class='del'>-{ "dtstdgq", Z(63,226),	    Z_MASK,	POWER6,		{ BF,  FRA, DGM } },</div><div class='add'>+{"lhau",	OP(43),		OP_MASK,     COM,	PPCVLE,		{RT, D, RAL}},</div><div class='ctx'> </div><div class='del'>-{ "drintnq", ZRC(63,227,0), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },</div><div class='del'>-{ "drintnq.",ZRC(63,227,1), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },</div><div class='add'>+{"sth",		OP(44),		OP_MASK,     COM,	PPCVLE,		{RS, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "dctqpq",  XRC(63,258,0), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='del'>-{ "dctqpq.", XRC(63,258,1), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='add'>+{"sthu",	OP(45),		OP_MASK,     COM,	PPCVLE,		{RS, D, RAS}},</div><div class='ctx'> </div><div class='del'>-{ "fabs",    XRC(63,264,0), XRA_MASK,	COM,		{ FRT, FRB } },</div><div class='del'>-{ "fabs.",   XRC(63,264,1), XRA_MASK,	COM,		{ FRT, FRB } },</div><div class='add'>+{"lmw",		OP(46),		OP_MASK,     PPCCOM,	PPCVLE,		{RT, D, RAM}},</div><div class='add'>+{"lm",		OP(46),		OP_MASK,     PWRCOM,	PPCVLE,		{RT, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "dctfixq", XRC(63,290,0), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='del'>-{ "dctfixq.",XRC(63,290,1), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='add'>+{"stmw",	OP(47),		OP_MASK,     PPCCOM,	PPCVLE,		{RS, D, RA0}},</div><div class='add'>+{"stm",		OP(47),		OP_MASK,     PWRCOM,	PPCVLE,		{RS, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "ddedpdq", XRC(63,322,0), X_MASK,	POWER6,		{ SP, FRT, FRB } },</div><div class='del'>-{ "ddedpdq.",XRC(63,322,1), X_MASK,	POWER6,		{ SP, FRT, FRB } },</div><div class='add'>+{"lfs",		OP(48),		OP_MASK,     COM,	PPCEFS|PPCVLE,	{FRT, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "dxexq",   XRC(63,354,0), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='del'>-{ "dxexq.",  XRC(63,354,1), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='add'>+{"lfsu",	OP(49),		OP_MASK,     COM,	PPCEFS|PPCVLE,	{FRT, D, RAS}},</div><div class='ctx'> </div><div class='del'>-{ "frin",    XRC(63,392,0), XRA_MASK,	POWER5,		{ FRT, FRB } },</div><div class='del'>-{ "frin.",   XRC(63,392,1), XRA_MASK,	POWER5,		{ FRT, FRB } },</div><div class='del'>-{ "friz",    XRC(63,424,0), XRA_MASK,	POWER5,		{ FRT, FRB } },</div><div class='del'>-{ "friz.",   XRC(63,424,1), XRA_MASK,	POWER5,		{ FRT, FRB } },</div><div class='del'>-{ "frip",    XRC(63,456,0), XRA_MASK,	POWER5,		{ FRT, FRB } },</div><div class='del'>-{ "frip.",   XRC(63,456,1), XRA_MASK,	POWER5,		{ FRT, FRB } },</div><div class='del'>-{ "frim",    XRC(63,488,0), XRA_MASK,	POWER5,		{ FRT, FRB } },</div><div class='del'>-{ "frim.",   XRC(63,488,1), XRA_MASK,	POWER5,		{ FRT, FRB } },</div><div class='add'>+{"lfd",		OP(50),		OP_MASK,     COM,	PPCEFS|PPCVLE,	{FRT, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "dsubq",   XRC(63,514,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "dsubq.",  XRC(63,514,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='add'>+{"lfdu",	OP(51),		OP_MASK,     COM,	PPCEFS|PPCVLE,	{FRT, D, RAS}},</div><div class='ctx'> </div><div class='del'>-{ "ddivq",   XRC(63,546,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "ddivq.",  XRC(63,546,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='add'>+{"stfs",	OP(52),		OP_MASK,     COM,	PPCEFS|PPCVLE,	{FRS, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "mffs",    XRC(63,583,0), XRARB_MASK,	COM,		{ FRT } },</div><div class='del'>-{ "mffs.",   XRC(63,583,1), XRARB_MASK,	COM,		{ FRT } },</div><div class='add'>+{"stfsu",	OP(53),		OP_MASK,     COM,	PPCEFS|PPCVLE,	{FRS, D, RAS}},</div><div class='ctx'> </div><div class='del'>-{ "dcmpuq",  X(63,642),	    X_MASK,	POWER6,		{ BF,  FRA, FRB } },</div><div class='add'>+{"stfd",	OP(54),		OP_MASK,     COM,	PPCEFS|PPCVLE,	{FRS, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "dtstsfq", X(63,674),	    X_MASK,	POWER6,		{ BF,  FRA, FRB } },</div><div class='add'>+{"stfdu",	OP(55),		OP_MASK,     COM,	PPCEFS|PPCVLE,	{FRS, D, RAS}},</div><div class='ctx'> </div><div class='del'>-{ "mtfsf",   XFL(63,711,0), XFL_MASK,	COM,		{ FLM, FRB } },</div><div class='del'>-{ "mtfsf.",  XFL(63,711,1), XFL_MASK,	COM,		{ FLM, FRB } },</div><div class='add'>+{"lq",		OP(56),		OP_MASK,     POWER4,	PPC476|PPCVLE,	{RTQ, DQ, RAQ}},</div><div class='add'>+{"psq_l",	OP(56),		OP_MASK,     PPCPS,	PPCVLE,		{FRT,PSD,RA,PSW,PSQ}},</div><div class='add'>+{"lfq",		OP(56),		OP_MASK,     POWER2,	PPCVLE,		{FRT, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "drdpq",   XRC(63,770,0), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='del'>-{ "drdpq.",  XRC(63,770,1), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='add'>+{"lxsd",	DSO(57,2),	DS_MASK,     PPCVSX3,	PPCVLE,		{VD, DS, RA0}},</div><div class='add'>+{"lxssp",	DSO(57,3),	DS_MASK,     PPCVSX3,	PPCVLE,		{VD, DS, RA0}},</div><div class='add'>+{"lfdp",	OP(57),		OP_MASK,     POWER6,	POWER7|PPCVLE,	{FRTp, DS, RA0}},</div><div class='add'>+{"psq_lu",	OP(57),		OP_MASK,     PPCPS,	PPCVLE,		{FRT,PSD,RA,PSW,PSQ}},</div><div class='add'>+{"lfqu",	OP(57),		OP_MASK,     POWER2,	PPCVLE,		{FRT, D, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "dcffixq", XRC(63,802,0), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='del'>-{ "dcffixq.",XRC(63,802,1), X_MASK,	POWER6,		{ FRT, FRB } },</div><div class='add'>+{"ld",		DSO(58,0),	DS_MASK,     PPC64,	PPCVLE,		{RT, DS, RA0}},</div><div class='add'>+{"ldu",		DSO(58,1),	DS_MASK,     PPC64,	PPCVLE,		{RT, DS, RAL}},</div><div class='add'>+{"lwa",		DSO(58,2),	DS_MASK,     PPC64,	PPCVLE,		{RT, DS, RA0}},</div><div class='ctx'> </div><div class='del'>-{ "fctid",   XRC(63,814,0), XRA_MASK,	PPC64,		{ FRT, FRB } },</div><div class='del'>-{ "fctid.",  XRC(63,814,1), XRA_MASK,	PPC64,		{ FRT, FRB } },</div><div class='add'>+{"dadd",	XRC(59,2,0),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+{"dadd.",	XRC(59,2,1),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='ctx'> </div><div class='del'>-{ "fctidz",  XRC(63,815,0), XRA_MASK,	PPC64,		{ FRT, FRB } },</div><div class='del'>-{ "fctidz.", XRC(63,815,1), XRA_MASK,	PPC64,		{ FRT, FRB } },</div><div class='add'>+{"dqua",	ZRC(59,3,0),	Z2_MASK,     POWER6,	PPCVLE,		{FRT,FRA,FRB,RMC}},</div><div class='add'>+{"dqua.",	ZRC(59,3,1),	Z2_MASK,     POWER6,	PPCVLE,		{FRT,FRA,FRB,RMC}},</div><div class='ctx'> </div><div class='del'>-{ "denbcdq", XRC(63,834,0), X_MASK,	POWER6,		{ S, FRT, FRB } },</div><div class='del'>-{ "denbcdq.",XRC(63,834,1), X_MASK,	POWER6,		{ S, FRT, FRB } },</div><div class='add'>+{"fdivs",	A(59,18,0),	AFRC_MASK,   PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='add'>+{"fdivs.",	A(59,18,1),	AFRC_MASK,   PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='ctx'> </div><div class='del'>-{ "fcfid",   XRC(63,846,0), XRA_MASK,	PPC64,		{ FRT, FRB } },</div><div class='del'>-{ "fcfid.",  XRC(63,846,1), XRA_MASK,	PPC64,		{ FRT, FRB } },</div><div class='add'>+{"fsubs",	A(59,20,0),	AFRC_MASK,   PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='add'>+{"fsubs.",	A(59,20,1),	AFRC_MASK,   PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='ctx'> </div><div class='del'>-{ "diexq",   XRC(63,866,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='del'>-{ "diexq.",  XRC(63,866,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },</div><div class='add'>+{"fadds",	A(59,21,0),	AFRC_MASK,   PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='add'>+{"fadds.",	A(59,21,1),	AFRC_MASK,   PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='ctx'> </div><div class='add'>+{"fsqrts",	A(59,22,0),    AFRAFRC_MASK, PPC,	TITAN|PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"fsqrts.",	A(59,22,1),    AFRAFRC_MASK, PPC,	TITAN|PPCVLE,	{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"fres",	A(59,24,0),   AFRAFRC_MASK,  POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fres",	A(59,24,0),   AFRALFRC_MASK, PPC,	POWER7|PPCVLE,	{FRT, FRB, A_L}},</div><div class='add'>+{"fres.",	A(59,24,1),   AFRAFRC_MASK,  POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fres.",	A(59,24,1),   AFRALFRC_MASK, PPC,	POWER7|PPCVLE,	{FRT, FRB, A_L}},</div><div class='add'>+</div><div class='add'>+{"fmuls",	A(59,25,0),	AFRB_MASK,   PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC}},</div><div class='add'>+{"fmuls.",	A(59,25,1),	AFRB_MASK,   PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC}},</div><div class='add'>+</div><div class='add'>+{"frsqrtes",	A(59,26,0),   AFRAFRC_MASK,  POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"frsqrtes",	A(59,26,0),   AFRALFRC_MASK, POWER5,	POWER7|PPCVLE,	{FRT, FRB, A_L}},</div><div class='add'>+{"frsqrtes.",	A(59,26,1),   AFRAFRC_MASK,  POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"frsqrtes.",	A(59,26,1),   AFRALFRC_MASK, POWER5,	POWER7|PPCVLE,	{FRT, FRB, A_L}},</div><div class='add'>+</div><div class='add'>+{"fmsubs",	A(59,28,0),	A_MASK,	     PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fmsubs.",	A(59,28,1),	A_MASK,	     PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+</div><div class='add'>+{"fmadds",	A(59,29,0),	A_MASK,	     PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fmadds.",	A(59,29,1),	A_MASK,	     PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+</div><div class='add'>+{"fnmsubs",	A(59,30,0),	A_MASK,	     PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fnmsubs.",	A(59,30,1),	A_MASK,	     PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+</div><div class='add'>+{"fnmadds",	A(59,31,0),	A_MASK,	     PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fnmadds.",	A(59,31,1),	A_MASK,	     PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+</div><div class='add'>+{"dmul",	XRC(59,34,0),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+{"dmul.",	XRC(59,34,1),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"drrnd",	ZRC(59,35,0),	Z2_MASK,     POWER6,	PPCVLE,		{FRT, FRA, FRB, RMC}},</div><div class='add'>+{"drrnd.",	ZRC(59,35,1),	Z2_MASK,     POWER6,	PPCVLE,		{FRT, FRA, FRB, RMC}},</div><div class='add'>+</div><div class='add'>+{"dscli",	ZRC(59,66,0),	Z_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, SH16}},</div><div class='add'>+{"dscli.",	ZRC(59,66,1),	Z_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, SH16}},</div><div class='add'>+</div><div class='add'>+{"dquai",	ZRC(59,67,0),	Z2_MASK,     POWER6,	PPCVLE,		{TE, FRT,FRB,RMC}},</div><div class='add'>+{"dquai.",	ZRC(59,67,1),	Z2_MASK,     POWER6,	PPCVLE,		{TE, FRT,FRB,RMC}},</div><div class='add'>+</div><div class='add'>+{"dscri",	ZRC(59,98,0),	Z_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, SH16}},</div><div class='add'>+{"dscri.",	ZRC(59,98,1),	Z_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, SH16}},</div><div class='add'>+</div><div class='add'>+{"drintx",	ZRC(59,99,0),	Z2_MASK,     POWER6,	PPCVLE,		{R, FRT, FRB, RMC}},</div><div class='add'>+{"drintx.",	ZRC(59,99,1),	Z2_MASK,     POWER6,	PPCVLE,		{R, FRT, FRB, RMC}},</div><div class='add'>+</div><div class='add'>+{"dcmpo",	X(59,130),	X_MASK,	     POWER6,	PPCVLE,		{BF,  FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"dtstex",	X(59,162),	X_MASK,	     POWER6,	PPCVLE,		{BF,  FRA, FRB}},</div><div class='add'>+{"dtstdc",	Z(59,194),	Z_MASK,	     POWER6,	PPCVLE,		{BF,  FRA, DCM}},</div><div class='add'>+{"dtstdg",	Z(59,226),	Z_MASK,	     POWER6,	PPCVLE,		{BF,  FRA, DGM}},</div><div class='add'>+</div><div class='add'>+{"drintn",	ZRC(59,227,0),	Z2_MASK,     POWER6,	PPCVLE,		{R, FRT, FRB, RMC}},</div><div class='add'>+{"drintn.",	ZRC(59,227,1),	Z2_MASK,     POWER6,	PPCVLE,		{R, FRT, FRB, RMC}},</div><div class='add'>+</div><div class='add'>+{"dctdp",	XRC(59,258,0),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"dctdp.",	XRC(59,258,1),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"dctfix",	XRC(59,290,0),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"dctfix.",	XRC(59,290,1),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"ddedpd",	XRC(59,322,0),	X_MASK,	     POWER6,	PPCVLE,		{SP, FRT, FRB}},</div><div class='add'>+{"ddedpd.",	XRC(59,322,1),	X_MASK,	     POWER6,	PPCVLE,		{SP, FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"dxex",	XRC(59,354,0),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"dxex.",	XRC(59,354,1),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"dsub",	XRC(59,514,0),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+{"dsub.",	XRC(59,514,1),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"ddiv",	XRC(59,546,0),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+{"ddiv.",	XRC(59,546,1),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"dcmpu",	X(59,642),	X_MASK,	     POWER6,	PPCVLE,		{BF,  FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"dtstsf",	X(59,674),	X_MASK,	     POWER6,	PPCVLE,		{BF,  FRA, FRB}},</div><div class='add'>+{"dtstsfi",	X(59,675),	X_MASK|1&lt;&lt;22,POWER9,	PPCVLE,		{BF, UIM6, FRB}},</div><div class='add'>+</div><div class='add'>+{"drsp",	XRC(59,770,0),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"drsp.",	XRC(59,770,1),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"dcffix",	XRC(59,802,0), X_MASK|FRA_MASK, POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"dcffix.",	XRC(59,802,1), X_MASK|FRA_MASK, POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"denbcd",	XRC(59,834,0),	X_MASK,	     POWER6,	PPCVLE,		{S, FRT, FRB}},</div><div class='add'>+{"denbcd.",	XRC(59,834,1),	X_MASK,	     POWER6,	PPCVLE,		{S, FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"fcfids",	XRC(59,846,0),	XRA_MASK, POWER7|PPCA2,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fcfids.",	XRC(59,846,1),	XRA_MASK, POWER7|PPCA2,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"diex",	XRC(59,866,0),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+{"diex.",	XRC(59,866,1),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"fcfidus",	XRC(59,974,0),	XRA_MASK, POWER7|PPCA2,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fcfidus.",	XRC(59,974,1),	XRA_MASK, POWER7|PPCA2,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"xsaddsp",	XX3(60,0),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsmaddasp",	XX3(60,1),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxsldwi",	XX3(60,2),	XX3SHW_MASK, PPCVSX,	PPCVLE,		{XT6, XA6, XB6, SHW}},</div><div class='add'>+{"xscmpeqdp",	XX3(60,3),	XX3_MASK,    PPCVSX3,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsrsqrtesp",	XX2(60,10),	XX2_MASK,    PPCVSX2,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xssqrtsp",	XX2(60,11),	XX2_MASK,    PPCVSX2,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xxsel",	XX4(60,3),	XX4_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6, XC6}},</div><div class='add'>+{"xssubsp",	XX3(60,8),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsmaddmsp",	XX3(60,9),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxspltd",	XX3(60,10),	XX3DM_MASK,  PPCVSX,	PPCVLE,		{XT6, XA6, XB6S, DMEX}},</div><div class='add'>+{"xxmrghd",	XX3(60,10),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxswapd",	XX3(60,10)|(2&lt;&lt;8), XX3_MASK, PPCVSX,	PPCVLE,		{XT6, XA6, XB6S}},</div><div class='add'>+{"xxmrgld",	XX3(60,10)|(3&lt;&lt;8), XX3_MASK, PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxpermdi",	XX3(60,10),	XX3DM_MASK,  PPCVSX,	PPCVLE,		{XT6, XA6, XB6, DM}},</div><div class='add'>+{"xscmpgtdp",	XX3(60,11),	XX3_MASK,    PPCVSX3,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsresp",	XX2(60,26),	XX2_MASK,    PPCVSX2,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsmulsp",	XX3(60,16),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsmsubasp",	XX3(60,17),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxmrghw",	XX3(60,18),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xscmpgedp",	XX3(60,19),	XX3_MASK,    PPCVSX3,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsdivsp",	XX3(60,24),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsmsubmsp",	XX3(60,25),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxperm",	XX3(60,26),	XX3_MASK,    PPCVSX3,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsadddp",	XX3(60,32),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsmaddadp",	XX3(60,33),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xscmpudp",	XX3(60,35),	XX3BF_MASK,  PPCVSX,	PPCVLE,		{BF, XA6, XB6}},</div><div class='add'>+{"xscvdpuxws",	XX2(60,72),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsrdpi",	XX2(60,73),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsrsqrtedp",	XX2(60,74),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xssqrtdp",	XX2(60,75),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xssubdp",	XX3(60,40),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsmaddmdp",	XX3(60,41),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xscmpodp",	XX3(60,43),	XX3BF_MASK,  PPCVSX,	PPCVLE,		{BF, XA6, XB6}},</div><div class='add'>+{"xscvdpsxws",	XX2(60,88),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsrdpiz",	XX2(60,89),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsredp",	XX2(60,90),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsmuldp",	XX3(60,48),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsmsubadp",	XX3(60,49),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxmrglw",	XX3(60,50),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsrdpip",	XX2(60,105),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xstsqrtdp",	XX2(60,106),	XX2BF_MASK,  PPCVSX,	PPCVLE,		{BF, XB6}},</div><div class='add'>+{"xsrdpic",	XX2(60,107),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsdivdp",	XX3(60,56),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsmsubmdp",	XX3(60,57),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxpermr",	XX3(60,58),	XX3_MASK,    PPCVSX3,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xscmpexpdp",	XX3(60,59),	XX3BF_MASK,  PPCVSX3,	PPCVLE,		{BF, XA6, XB6}},</div><div class='add'>+{"xsrdpim",	XX2(60,121),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xstdivdp",	XX3(60,61),	XX3BF_MASK,  PPCVSX,	PPCVLE,		{BF, XA6, XB6}},</div><div class='add'>+{"xvaddsp",	XX3(60,64),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvmaddasp",	XX3(60,65),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcmpeqsp",	XX3RC(60,67,0),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcmpeqsp.",	XX3RC(60,67,1),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvspuxws",	XX2(60,136),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvrspi",	XX2(60,137),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvrsqrtesp",	XX2(60,138),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvsqrtsp",	XX2(60,139),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvsubsp",	XX3(60,72),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvmaddmsp",	XX3(60,73),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcmpgtsp",	XX3RC(60,75,0),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcmpgtsp.",	XX3RC(60,75,1),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvspsxws",	XX2(60,152),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvrspiz",	XX2(60,153),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvresp",	XX2(60,154),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvmulsp",	XX3(60,80),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvmsubasp",	XX3(60,81),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxspltw",	XX2(60,164),	XX2UIM_MASK, PPCVSX,	PPCVLE,		{XT6, XB6, UIM}},</div><div class='add'>+{"xxextractuw",	XX2(60,165),   XX2UIM4_MASK, PPCVSX3,	PPCVLE,		{XT6, XB6, UIMM4}},</div><div class='add'>+{"xvcmpgesp",	XX3RC(60,83,0),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcmpgesp.",	XX3RC(60,83,1),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvuxwsp",	XX2(60,168),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvrspip",	XX2(60,169),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvtsqrtsp",	XX2(60,170),	XX2BF_MASK,  PPCVSX,	PPCVLE,		{BF, XB6}},</div><div class='add'>+{"xvrspic",	XX2(60,171),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvdivsp",	XX3(60,88),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvmsubmsp",	XX3(60,89),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxspltib",	X(60,360),   XX1_MASK|3&lt;&lt;19, PPCVSX3,	PPCVLE,		{XT6, IMM8}},</div><div class='add'>+{"xxinsertw",	XX2(60,181),   XX2UIM4_MASK, PPCVSX3,	PPCVLE,		{XT6, XB6, UIMM4}},</div><div class='add'>+{"xvcvsxwsp",	XX2(60,184),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvrspim",	XX2(60,185),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvtdivsp",	XX3(60,93),	XX3BF_MASK,  PPCVSX,	PPCVLE,		{BF, XA6, XB6}},</div><div class='add'>+{"xvadddp",	XX3(60,96),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvmaddadp",	XX3(60,97),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcmpeqdp",	XX3RC(60,99,0),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcmpeqdp.",	XX3RC(60,99,1),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvdpuxws",	XX2(60,200),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvrdpi",	XX2(60,201),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvrsqrtedp",	XX2(60,202),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvsqrtdp",	XX2(60,203),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvsubdp",	XX3(60,104),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvmaddmdp",	XX3(60,105),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcmpgtdp",	XX3RC(60,107,0), XX3_MASK,   PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcmpgtdp.",	XX3RC(60,107,1), XX3_MASK,   PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvdpsxws",	XX2(60,216),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvrdpiz",	XX2(60,217),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvredp",	XX2(60,218),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvmuldp",	XX3(60,112),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvmsubadp",	XX3(60,113),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcmpgedp",	XX3RC(60,115,0), XX3_MASK,   PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcmpgedp.",	XX3RC(60,115,1), XX3_MASK,   PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvuxwdp",	XX2(60,232),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvrdpip",	XX2(60,233),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvtsqrtdp",	XX2(60,234),	XX2BF_MASK,  PPCVSX,	PPCVLE,		{BF, XB6}},</div><div class='add'>+{"xvrdpic",	XX2(60,235),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvdivdp",	XX3(60,120),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvmsubmdp",	XX3(60,121),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvsxwdp",	XX2(60,248),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvrdpim",	XX2(60,249),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvtdivdp",	XX3(60,125),	XX3BF_MASK,  PPCVSX,	PPCVLE,		{BF, XA6, XB6}},</div><div class='add'>+{"xsmaxcdp",	XX3(60,128),	XX3_MASK,    PPCVSX3,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsnmaddasp",	XX3(60,129),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxland",	XX3(60,130),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xscvdpsp",	XX2(60,265),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xscvdpspn",	XX2(60,267),	XX2_MASK,    PPCVSX2,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsmincdp",	XX3(60,136),	XX3_MASK,    PPCVSX3,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsnmaddmsp",	XX3(60,137),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxlandc",	XX3(60,138),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsrsp",	XX2(60,281),	XX2_MASK,    PPCVSX2,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsmaxjdp",	XX3(60,144),	XX3_MASK,    PPCVSX3,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsnmsubasp",	XX3(60,145),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxlor",	XX3(60,146),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xscvuxdsp",	XX2(60,296),	XX2_MASK,    PPCVSX2,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xststdcsp",	XX2(60,298),	XX2BFD_MASK, PPCVSX3,	PPCVLE,		{BF, XB6, DCMX}},</div><div class='add'>+{"xsminjdp",	XX3(60,152),	XX3_MASK,    PPCVSX3,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsnmsubmsp",	XX3(60,153),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxlxor",	XX3(60,154),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xscvsxdsp",	XX2(60,312),	XX2_MASK,    PPCVSX2,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsmaxdp",	XX3(60,160),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsnmaddadp",	XX3(60,161),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxlnor",	XX3(60,162),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xscvdpuxds",	XX2(60,328),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xscvspdp",	XX2(60,329),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xscvspdpn",	XX2(60,331),	XX2_MASK,    PPCVSX2,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsmindp",	XX3(60,168),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsnmaddmdp",	XX3(60,169),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxlorc",	XX3(60,170),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xscvdpsxds",	XX2(60,344),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsabsdp",	XX2(60,345),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsxexpdp",	XX2VA(60,347,0),XX2_MASK|1,  PPCVSX3,	PPCVLE,		{RT, XB6}},</div><div class='add'>+{"xsxsigdp",	XX2VA(60,347,1),XX2_MASK|1,  PPCVSX3,	PPCVLE,		{RT, XB6}},</div><div class='add'>+{"xscvhpdp",	XX2VA(60,347,16),XX2_MASK,   PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xscvdphp",	XX2VA(60,347,17),XX2_MASK,   PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xscpsgndp",	XX3(60,176),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xsnmsubadp",	XX3(60,177),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxlnand",	XX3(60,178),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xscvuxddp",	XX2(60,360),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsnabsdp",	XX2(60,361),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xststdcdp",	XX2(60,362),	XX2BFD_MASK, PPCVSX3,	PPCVLE,		{BF, XB6, DCMX}},</div><div class='add'>+{"xsnmsubmdp",	XX3(60,185),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xxleqv",	XX3(60,186),	XX3_MASK,    PPCVSX2,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xscvsxddp",	XX2(60,376),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsnegdp",	XX2(60,377),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvmaxsp",	XX3(60,192),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvnmaddasp",	XX3(60,193),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvspuxds",	XX2(60,392),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvcvdpsp",	XX2(60,393),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvminsp",	XX3(60,200),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvnmaddmsp",	XX3(60,201),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvspsxds",	XX2(60,408),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvabssp",	XX2(60,409),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvmovsp",	XX3(60,208),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6S}},</div><div class='add'>+{"xvcpsgnsp",	XX3(60,208),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvnmsubasp",	XX3(60,209),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvuxdsp",	XX2(60,424),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvnabssp",	XX2(60,425),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvtstdcsp",	XX2(60,426),  XX2DCMXS_MASK, PPCVSX3,	PPCVLE,		{XT6, XB6, DCMXS}},</div><div class='add'>+{"xviexpsp",	XX3(60,216),	XX3_MASK,    PPCVSX3,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvnmsubmsp",	XX3(60,217),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvsxdsp",	XX2(60,440),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvnegsp",	XX2(60,441),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvmaxdp",	XX3(60,224),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvnmaddadp",	XX3(60,225),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvdpuxds",	XX2(60,456),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvcvspdp",	XX2(60,457),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xsiexpdp",	X(60,918),	XX1_MASK,    PPCVSX3,	PPCVLE,		{XT6, RA, RB}},</div><div class='add'>+{"xvmindp",	XX3(60,232),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvnmaddmdp",	XX3(60,233),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvdpsxds",	XX2(60,472),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvabsdp",	XX2(60,473),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvxexpdp",	XX2VA(60,475,0),XX2_MASK,    PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvxsigdp",	XX2VA(60,475,1),XX2_MASK,    PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xxbrh",	XX2VA(60,475,7),XX2_MASK,    PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvxexpsp",	XX2VA(60,475,8),XX2_MASK,    PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvxsigsp",	XX2VA(60,475,9),XX2_MASK,    PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xxbrw",	XX2VA(60,475,15),XX2_MASK,   PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xxbrd",	XX2VA(60,475,23),XX2_MASK,   PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvcvhpsp",	XX2VA(60,475,24),XX2_MASK,   PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvcvsphp",	XX2VA(60,475,25),XX2_MASK,   PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xxbrq",	XX2VA(60,475,31),XX2_MASK,   PPCVSX3,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvmovdp",	XX3(60,240),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6S}},</div><div class='add'>+{"xvcpsgndp",	XX3(60,240),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvnmsubadp",	XX3(60,241),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvuxddp",	XX2(60,488),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvnabsdp",	XX2(60,489),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvtstdcdp",	XX2(60,490),  XX2DCMXS_MASK, PPCVSX3,	PPCVLE,		{XT6, XB6, DCMXS}},</div><div class='add'>+{"xviexpdp",	XX3(60,248),	XX3_MASK,    PPCVSX3,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvnmsubmdp",	XX3(60,249),	XX3_MASK,    PPCVSX,	PPCVLE,		{XT6, XA6, XB6}},</div><div class='add'>+{"xvcvsxddp",	XX2(60,504),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+{"xvnegdp",	XX2(60,505),	XX2_MASK,    PPCVSX,	PPCVLE,		{XT6, XB6}},</div><div class='add'>+</div><div class='add'>+{"psq_st",	OP(60),		OP_MASK,     PPCPS,	PPCVLE,		{FRS,PSD,RA,PSW,PSQ}},</div><div class='add'>+{"stfq",	OP(60),		OP_MASK,     POWER2,	PPCVLE,		{FRS, D, RA}},</div><div class='add'>+</div><div class='add'>+{"lxv",		DQX(61,1),	DQX_MASK,    PPCVSX3,	PPCVLE,		{XTQ6, DQ, RA0}},</div><div class='add'>+{"stxv",	DQX(61,5),	DQX_MASK,    PPCVSX3,	PPCVLE,		{XSQ6, DQ, RA0}},</div><div class='add'>+{"stxsd",	DSO(61,2),	DS_MASK,     PPCVSX3,	PPCVLE,		{VS, DS, RA0}},</div><div class='add'>+{"stxssp",	DSO(61,3),	DS_MASK,     PPCVSX3,	PPCVLE,		{VS, DS, RA0}},</div><div class='add'>+{"stfdp",	OP(61),		OP_MASK,     POWER6,	POWER7|PPCVLE,	{FRSp, DS, RA0}},</div><div class='add'>+{"psq_stu",	OP(61),		OP_MASK,     PPCPS,	PPCVLE,		{FRS,PSD,RA,PSW,PSQ}},</div><div class='add'>+{"stfqu",	OP(61),		OP_MASK,     POWER2,	PPCVLE,		{FRS, D, RA}},</div><div class='add'>+</div><div class='add'>+{"std",		DSO(62,0),	DS_MASK,     PPC64,	PPCVLE,		{RS, DS, RA0}},</div><div class='add'>+{"stdu",	DSO(62,1),	DS_MASK,     PPC64,	PPCVLE,		{RS, DS, RAS}},</div><div class='add'>+{"stq",		DSO(62,2),	DS_MASK,     POWER4,	PPC476|PPCVLE,	{RSQ, DS, RA0}},</div><div class='add'>+</div><div class='add'>+{"fcmpu",	X(63,0),	XBF_MASK,    COM,	PPCEFS|PPCVLE,	{BF, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"daddq",	XRC(63,2,0),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, FRBp}},</div><div class='add'>+{"daddq.",	XRC(63,2,1),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, FRBp}},</div><div class='add'>+</div><div class='add'>+{"dquaq",	ZRC(63,3,0),	Z2_MASK,     POWER6,	PPCVLE,		{FRTp, FRAp, FRBp, RMC}},</div><div class='add'>+{"dquaq.",	ZRC(63,3,1),	Z2_MASK,     POWER6,	PPCVLE,		{FRTp, FRAp, FRBp, RMC}},</div><div class='add'>+</div><div class='add'>+{"xsaddqp",	XRC(63,4,0),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+{"xsaddqpo",	XRC(63,4,1),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"xsrqpi",	ZRC(63,5,0),	Z2_MASK,     PPCVSX3,	PPCVLE,		{R, VD, VB, RMC}},</div><div class='add'>+{"xsrqpix",	ZRC(63,5,1),	Z2_MASK,     PPCVSX3,	PPCVLE,		{R, VD, VB, RMC}},</div><div class='add'>+</div><div class='add'>+{"fcpsgn",	XRC(63,8,0),	X_MASK, POWER6|PPCA2|PPC476, PPCVLE,	{FRT, FRA, FRB}},</div><div class='add'>+{"fcpsgn.",	XRC(63,8,1),	X_MASK, POWER6|PPCA2|PPC476, PPCVLE,	{FRT, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"frsp",	XRC(63,12,0),	XRA_MASK,    COM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"frsp.",	XRC(63,12,1),	XRA_MASK,    COM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"fctiw",	XRC(63,14,0),	XRA_MASK,    PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"fcir",	XRC(63,14,0),	XRA_MASK,    PWR2COM,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctiw.",	XRC(63,14,1),	XRA_MASK,    PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"fcir.",	XRC(63,14,1),	XRA_MASK,    PWR2COM,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"fctiwz",	XRC(63,15,0),	XRA_MASK,    PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"fcirz",	XRC(63,15,0),	XRA_MASK,    PWR2COM,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctiwz.",	XRC(63,15,1),	XRA_MASK,    PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"fcirz.",	XRC(63,15,1),	XRA_MASK,    PWR2COM,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"fdiv",	A(63,18,0),	AFRC_MASK,   PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='add'>+{"fd",		A(63,18,0),	AFRC_MASK,   PWRCOM,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+{"fdiv.",	A(63,18,1),	AFRC_MASK,   PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='add'>+{"fd.",		A(63,18,1),	AFRC_MASK,   PWRCOM,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"fsub",	A(63,20,0),	AFRC_MASK,   PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='add'>+{"fs",		A(63,20,0),	AFRC_MASK,   PWRCOM,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+{"fsub.",	A(63,20,1),	AFRC_MASK,   PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='add'>+{"fs.",		A(63,20,1),	AFRC_MASK,   PWRCOM,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"fadd",	A(63,21,0),	AFRC_MASK,   PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='add'>+{"fa",		A(63,21,0),	AFRC_MASK,   PWRCOM,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+{"fadd.",	A(63,21,1),	AFRC_MASK,   PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRB}},</div><div class='add'>+{"fa.",		A(63,21,1),	AFRC_MASK,   PWRCOM,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"fsqrt",	A(63,22,0),    AFRAFRC_MASK, PPCPWR2,	TITAN|PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"fsqrt.",	A(63,22,1),    AFRAFRC_MASK, PPCPWR2,	TITAN|PPCVLE,	{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"fsel",	A(63,23,0),	A_MASK,	     PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fsel.",	A(63,23,1),	A_MASK,	     PPC,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+</div><div class='add'>+{"fre",		A(63,24,0),   AFRAFRC_MASK,  POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fre",		A(63,24,0),   AFRALFRC_MASK, POWER5,	POWER7|PPCVLE,	{FRT, FRB, A_L}},</div><div class='add'>+{"fre.",	A(63,24,1),   AFRAFRC_MASK,  POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fre.",	A(63,24,1),   AFRALFRC_MASK, POWER5,	POWER7|PPCVLE,	{FRT, FRB, A_L}},</div><div class='add'>+</div><div class='add'>+{"fmul",	A(63,25,0),	AFRB_MASK,   PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRC}},</div><div class='add'>+{"fm",		A(63,25,0),	AFRB_MASK,   PWRCOM,	PPCVLE|PPCVLE,	{FRT, FRA, FRC}},</div><div class='add'>+{"fmul.",	A(63,25,1),	AFRB_MASK,   PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRC}},</div><div class='add'>+{"fm.",		A(63,25,1),	AFRB_MASK,   PWRCOM,	PPCVLE|PPCVLE,	{FRT, FRA, FRC}},</div><div class='add'>+</div><div class='add'>+{"frsqrte",	A(63,26,0),   AFRAFRC_MASK,  POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"frsqrte",	A(63,26,0),   AFRALFRC_MASK, PPC,	POWER7|PPCVLE,	{FRT, FRB, A_L}},</div><div class='add'>+{"frsqrte.",	A(63,26,1),   AFRAFRC_MASK,  POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"frsqrte.",	A(63,26,1),   AFRALFRC_MASK, PPC,	POWER7|PPCVLE,	{FRT, FRB, A_L}},</div><div class='add'>+</div><div class='add'>+{"fmsub",	A(63,28,0),	A_MASK,	     PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fms",		A(63,28,0),	A_MASK,	     PWRCOM,	PPCVLE,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fmsub.",	A(63,28,1),	A_MASK,	     PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fms.",	A(63,28,1),	A_MASK,	     PWRCOM,	PPCVLE,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+</div><div class='add'>+{"fmadd",	A(63,29,0),	A_MASK,	     PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fma",		A(63,29,0),	A_MASK,	     PWRCOM,	PPCVLE,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fmadd.",	A(63,29,1),	A_MASK,	     PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fma.",	A(63,29,1),	A_MASK,	     PWRCOM,	PPCVLE,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+</div><div class='add'>+{"fnmsub",	A(63,30,0),	A_MASK,	     PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fnms",	A(63,30,0),	A_MASK,	     PWRCOM,	PPCVLE,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fnmsub.",	A(63,30,1),	A_MASK,	     PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fnms.",	A(63,30,1),	A_MASK,	     PWRCOM,	PPCVLE,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+</div><div class='add'>+{"fnmadd",	A(63,31,0),	A_MASK,	     PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fnma",	A(63,31,0),	A_MASK,	     PWRCOM,	PPCVLE,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fnmadd.",	A(63,31,1),	A_MASK,	     PPCCOM,	PPCEFS|PPCVLE,	{FRT, FRA, FRC, FRB}},</div><div class='add'>+{"fnma.",	A(63,31,1),	A_MASK,	     PWRCOM,	PPCVLE,		{FRT, FRA, FRC, FRB}},</div><div class='add'>+</div><div class='add'>+{"fcmpo",	X(63,32),	XBF_MASK,    COM,	PPCEFS|PPCVLE,	{BF, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"dmulq",	XRC(63,34,0),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, FRBp}},</div><div class='add'>+{"dmulq.",	XRC(63,34,1),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, FRBp}},</div><div class='add'>+</div><div class='add'>+{"drrndq",	ZRC(63,35,0),	Z2_MASK,     POWER6,	PPCVLE,		{FRTp, FRA, FRBp, RMC}},</div><div class='add'>+{"drrndq.",	ZRC(63,35,1),	Z2_MASK,     POWER6,	PPCVLE,		{FRTp, FRA, FRBp, RMC}},</div><div class='add'>+</div><div class='add'>+{"xsmulqp",	XRC(63,36,0),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+{"xsmulqpo",	XRC(63,36,1),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"xsrqpxp",	Z(63,37),	Z2_MASK,     PPCVSX3,	PPCVLE,		{R, VD, VB, RMC}},</div><div class='add'>+</div><div class='add'>+{"mtfsb1",	XRC(63,38,0),	XRARB_MASK,  COM,	PPCVLE,		{BT}},</div><div class='add'>+{"mtfsb1.",	XRC(63,38,1),	XRARB_MASK,  COM,	PPCVLE,		{BT}},</div><div class='add'>+</div><div class='add'>+{"fneg",	XRC(63,40,0),	XRA_MASK,    COM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"fneg.",	XRC(63,40,1),	XRA_MASK,    COM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"mcrfs",      X(63,64), XRB_MASK|(3&lt;&lt;21)|(3&lt;&lt;16), COM,	PPCVLE,		{BF, BFA}},</div><div class='add'>+</div><div class='add'>+{"dscliq",	ZRC(63,66,0),	Z_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, SH16}},</div><div class='add'>+{"dscliq.",	ZRC(63,66,1),	Z_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, SH16}},</div><div class='add'>+</div><div class='add'>+{"dquaiq",	ZRC(63,67,0),	Z2_MASK,     POWER6,	PPCVLE,		{TE, FRTp, FRBp, RMC}},</div><div class='add'>+{"dquaiq.",	ZRC(63,67,1),	Z2_MASK,     POWER6,	PPCVLE,		{TE, FRTp, FRBp, RMC}},</div><div class='add'>+</div><div class='add'>+{"mtfsb0",	XRC(63,70,0),	XRARB_MASK,  COM,	PPCVLE,		{BT}},</div><div class='add'>+{"mtfsb0.",	XRC(63,70,1),	XRARB_MASK,  COM,	PPCVLE,		{BT}},</div><div class='add'>+</div><div class='add'>+{"fmr",		XRC(63,72,0),	XRA_MASK,    COM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"fmr.",	XRC(63,72,1),	XRA_MASK,    COM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"dscriq",	ZRC(63,98,0),	Z_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, SH16}},</div><div class='add'>+{"dscriq.",	ZRC(63,98,1),	Z_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, SH16}},</div><div class='add'>+</div><div class='add'>+{"drintxq",	ZRC(63,99,0),	Z2_MASK,     POWER6,	PPCVLE,		{R, FRTp, FRBp, RMC}},</div><div class='add'>+{"drintxq.",	ZRC(63,99,1),	Z2_MASK,     POWER6,	PPCVLE,		{R, FRTp, FRBp, RMC}},</div><div class='add'>+</div><div class='add'>+{"xscpsgnqp",	X(63,100),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"ftdiv",	X(63,128),	XBF_MASK,    POWER7,	PPCVLE,		{BF, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"dcmpoq",	X(63,130),	X_MASK,	     POWER6,	PPCVLE,		{BF, FRAp, FRBp}},</div><div class='add'>+</div><div class='add'>+{"xscmpoqp",	X(63,132),	XBF_MASK,    PPCVSX3,	PPCVLE,		{BF, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"mtfsfi",  XRC(63,134,0), XWRA_MASK|(3&lt;&lt;21)|(1&lt;&lt;11), POWER6|PPCA2|PPC476, PPCVLE, {BFF, U, W}},</div><div class='add'>+{"mtfsfi",  XRC(63,134,0), XRA_MASK|(3&lt;&lt;21)|(1&lt;&lt;11), COM, POWER6|PPCA2|PPC476|PPCVLE, {BFF, U}},</div><div class='add'>+{"mtfsfi.", XRC(63,134,1), XWRA_MASK|(3&lt;&lt;21)|(1&lt;&lt;11), POWER6|PPCA2|PPC476, PPCVLE, {BFF, U, W}},</div><div class='add'>+{"mtfsfi.", XRC(63,134,1), XRA_MASK|(3&lt;&lt;21)|(1&lt;&lt;11), COM, POWER6|PPCA2|PPC476|PPCVLE, {BFF, U}},</div><div class='add'>+</div><div class='add'>+{"fnabs",	XRC(63,136,0),	XRA_MASK,    COM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"fnabs.",	XRC(63,136,1),	XRA_MASK,    COM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"fctiwu",	XRC(63,142,0),	XRA_MASK,    POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctiwu.",	XRC(63,142,1),	XRA_MASK,    POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctiwuz",	XRC(63,143,0),	XRA_MASK,    POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctiwuz.",	XRC(63,143,1),	XRA_MASK,    POWER7,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"ftsqrt",	X(63,160),	XBF_MASK|FRA_MASK, POWER7, PPCVLE,	{BF, FRB}},</div><div class='add'>+</div><div class='add'>+{"dtstexq",	X(63,162),	X_MASK,	     POWER6,	PPCVLE,		{BF, FRAp, FRBp}},</div><div class='add'>+</div><div class='add'>+{"xscmpexpqp",	X(63,164),	XBF_MASK,    PPCVSX3,	PPCVLE,		{BF, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"dtstdcq",	Z(63,194),	Z_MASK,	     POWER6,	PPCVLE,		{BF, FRAp, DCM}},</div><div class='add'>+{"dtstdgq",	Z(63,226),	Z_MASK,	     POWER6,	PPCVLE,		{BF, FRAp, DGM}},</div><div class='add'>+</div><div class='add'>+{"drintnq",	ZRC(63,227,0),	Z2_MASK,     POWER6,	PPCVLE,		{R, FRTp, FRBp, RMC}},</div><div class='add'>+{"drintnq.",	ZRC(63,227,1),	Z2_MASK,     POWER6,	PPCVLE,		{R, FRTp, FRBp, RMC}},</div><div class='add'>+</div><div class='add'>+{"dctqpq",	XRC(63,258,0),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRB}},</div><div class='add'>+{"dctqpq.",	XRC(63,258,1),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRB}},</div><div class='add'>+</div><div class='add'>+{"fabs",	XRC(63,264,0),	XRA_MASK,    COM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"fabs.",	XRC(63,264,1),	XRA_MASK,    COM,	PPCEFS|PPCVLE,	{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"dctfixq",	XRC(63,290,0),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRBp}},</div><div class='add'>+{"dctfixq.",	XRC(63,290,1),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRBp}},</div><div class='add'>+</div><div class='add'>+{"ddedpdq",	XRC(63,322,0),	X_MASK,	     POWER6,	PPCVLE,		{SP, FRTp, FRBp}},</div><div class='add'>+{"ddedpdq.",	XRC(63,322,1),	X_MASK,	     POWER6,	PPCVLE,		{SP, FRTp, FRBp}},</div><div class='add'>+</div><div class='add'>+{"dxexq",	XRC(63,354,0),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRBp}},</div><div class='add'>+{"dxexq.",	XRC(63,354,1),	X_MASK,	     POWER6,	PPCVLE,		{FRT, FRBp}},</div><div class='add'>+</div><div class='add'>+{"xsmaddqp",	XRC(63,388,0),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+{"xsmaddqpo",	XRC(63,388,1),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"frin",	XRC(63,392,0),	XRA_MASK,    POWER5,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"frin.",	XRC(63,392,1),	XRA_MASK,    POWER5,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"xsmsubqp",	XRC(63,420,0),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+{"xsmsubqpo",	XRC(63,420,1),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"friz",	XRC(63,424,0),	XRA_MASK,    POWER5,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"friz.",	XRC(63,424,1),	XRA_MASK,    POWER5,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"xsnmaddqp",	XRC(63,452,0),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+{"xsnmaddqpo",	XRC(63,452,1),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"frip",	XRC(63,456,0),	XRA_MASK,    POWER5,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"frip.",	XRC(63,456,1),	XRA_MASK,    POWER5,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"xsnmsubqp",	XRC(63,484,0),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+{"xsnmsubqpo",	XRC(63,484,1),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"frim",	XRC(63,488,0),	XRA_MASK,    POWER5,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"frim.",	XRC(63,488,1),	XRA_MASK,    POWER5,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"dsubq",	XRC(63,514,0),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, FRBp}},</div><div class='add'>+{"dsubq.",	XRC(63,514,1),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, FRBp}},</div><div class='add'>+</div><div class='add'>+{"xssubqp",	XRC(63,516,0),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+{"xssubqpo",	XRC(63,516,1),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"ddivq",	XRC(63,546,0),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, FRBp}},</div><div class='add'>+{"ddivq.",	XRC(63,546,1),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRAp, FRBp}},</div><div class='add'>+</div><div class='add'>+{"xsdivqp",	XRC(63,548,0),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+{"xsdivqpo",	XRC(63,548,1),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"mffs",	XRC(63,583,0),	XRARB_MASK,  COM,	PPCEFS|PPCVLE,	{FRT}},</div><div class='add'>+{"mffs.",	XRC(63,583,1),	XRARB_MASK,  COM,	PPCEFS|PPCVLE,	{FRT}},</div><div class='add'>+</div><div class='add'>+{"mffsce",	XMMF(63,583,0,1), XMMF_MASK|RB_MASK, POWER9, PPCVLE,	{FRT}},</div><div class='add'>+{"mffscdrn",	XMMF(63,583,2,4), XMMF_MASK,         POWER9, PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"mffscdrni",	XMMF(63,583,2,5), XMMF_MASK|(3&lt;&lt;14), POWER9, PPCVLE,	{FRT, DRM}},</div><div class='add'>+{"mffscrn",	XMMF(63,583,2,6), XMMF_MASK,         POWER9, PPCVLE,	{FRT, FRB}},</div><div class='add'>+{"mffscrni",	XMMF(63,583,2,7), XMMF_MASK|(7&lt;&lt;13), POWER9, PPCVLE,	{FRT, RM}},</div><div class='add'>+{"mffsl",	XMMF(63,583,3,0), XMMF_MASK|RB_MASK, POWER9, PPCVLE,	{FRT}},</div><div class='add'>+</div><div class='add'>+{"dcmpuq",	X(63,642),	X_MASK,	     POWER6,	PPCVLE,		{BF, FRAp, FRBp}},</div><div class='add'>+</div><div class='add'>+{"xscmpuqp",	X(63,644),	XBF_MASK,    PPCVSX3,	PPCVLE,		{BF, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"dtstsfq",	X(63,674),	X_MASK,	     POWER6,	PPCVLE,		{BF, FRA, FRBp}},</div><div class='add'>+{"dtstsfiq",	X(63,675),	X_MASK|1&lt;&lt;22,POWER9,	PPCVLE,		{BF, UIM6, FRBp}},</div><div class='add'>+</div><div class='add'>+{"xststdcqp",	X(63,708),	X_MASK,	     PPCVSX3,	PPCVLE,		{BF, VB, DCMX}},</div><div class='add'>+</div><div class='add'>+{"mtfsf",	XFL(63,711,0),	XFL_MASK, POWER6|PPCA2|PPC476, PPCVLE,	{FLM, FRB, XFL_L, W}},</div><div class='add'>+{"mtfsf",	XFL(63,711,0),	XFL_MASK,    COM, POWER6|PPCA2|PPC476|PPCEFS|PPCVLE, {FLM, FRB}},</div><div class='add'>+{"mtfsf.",	XFL(63,711,1),	XFL_MASK, POWER6|PPCA2|PPC476, PPCVLE,	{FLM, FRB, XFL_L, W}},</div><div class='add'>+{"mtfsf.",	XFL(63,711,1),	XFL_MASK,    COM, POWER6|PPCA2|PPC476|PPCEFS|PPCVLE, {FLM, FRB}},</div><div class='add'>+</div><div class='add'>+{"drdpq",	XRC(63,770,0),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRBp}},</div><div class='add'>+{"drdpq.",	XRC(63,770,1),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRBp}},</div><div class='add'>+</div><div class='add'>+{"dcffixq",	XRC(63,802,0),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRB}},</div><div class='add'>+{"dcffixq.",	XRC(63,802,1),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRB}},</div><div class='add'>+</div><div class='add'>+{"xsabsqp",	XVA(63,804,0),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xsxexpqp",	XVA(63,804,2),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xsnabsqp",	XVA(63,804,8),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xsnegqp",	XVA(63,804,16),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xsxsigqp",	XVA(63,804,18),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xssqrtqp",	XVARC(63,804,27,0), XVA_MASK, PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xssqrtqpo",	XVARC(63,804,27,1), XVA_MASK, PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+</div><div class='add'>+{"fctid",	XRC(63,814,0),	XRA_MASK,    PPC64,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctid",	XRC(63,814,0),	XRA_MASK,    PPC476,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctid.",	XRC(63,814,1),	XRA_MASK,    PPC64,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctid.",	XRC(63,814,1),	XRA_MASK,    PPC476,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"fctidz",	XRC(63,815,0),	XRA_MASK,    PPC64,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctidz",	XRC(63,815,0),	XRA_MASK,    PPC476,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctidz.",	XRC(63,815,1),	XRA_MASK,    PPC64,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctidz.",	XRC(63,815,1),	XRA_MASK,    PPC476,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"denbcdq",	XRC(63,834,0),	X_MASK,	     POWER6,	PPCVLE,		{S, FRTp, FRBp}},</div><div class='add'>+{"denbcdq.",	XRC(63,834,1),	X_MASK,	     POWER6,	PPCVLE,		{S, FRTp, FRBp}},</div><div class='add'>+</div><div class='add'>+{"xscvqpuwz",	XVA(63,836,1),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xscvudqp",	XVA(63,836,2),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xscvqpswz",	XVA(63,836,9),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xscvsdqp",	XVA(63,836,10),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xscvqpudz",	XVA(63,836,17),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xscvqpdp",	XVARC(63,836,20,0), XVA_MASK, PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xscvqpdpo",	XVARC(63,836,20,1), XVA_MASK, PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xscvdpqp",	XVA(63,836,22),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+{"xscvqpsdz",	XVA(63,836,25),	XVA_MASK,    PPCVSX3,	PPCVLE,		{VD, VB}},</div><div class='add'>+</div><div class='add'>+{"fmrgow",	X(63,838),	X_MASK,	     PPCVSX2,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"fcfid",	XRC(63,846,0),	XRA_MASK,    PPC64,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fcfid",	XRC(63,846,0),	XRA_MASK,    PPC476,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fcfid.",	XRC(63,846,1),	XRA_MASK,    PPC64,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fcfid.",	XRC(63,846,1),	XRA_MASK,    PPC476,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"diexq",	XRC(63,866,0),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRA, FRBp}},</div><div class='add'>+{"diexq.",	XRC(63,866,1),	X_MASK,	     POWER6,	PPCVLE,		{FRTp, FRA, FRBp}},</div><div class='add'>+</div><div class='add'>+{"xsiexpqp",	X(63,868),	X_MASK,	     PPCVSX3,	PPCVLE,		{VD, VA, VB}},</div><div class='add'>+</div><div class='add'>+{"fctidu",	XRC(63,942,0),	XRA_MASK, POWER7|PPCA2,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctidu.",	XRC(63,942,1),	XRA_MASK, POWER7|PPCA2,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"fctiduz",	XRC(63,943,0),	XRA_MASK, POWER7|PPCA2,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fctiduz.",	XRC(63,943,1),	XRA_MASK, POWER7|PPCA2,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+</div><div class='add'>+{"fmrgew",	X(63,966),	X_MASK,	     PPCVSX2,	PPCVLE,		{FRT, FRA, FRB}},</div><div class='add'>+</div><div class='add'>+{"fcfidu",	XRC(63,974,0),	XRA_MASK, POWER7|PPCA2,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+{"fcfidu.",	XRC(63,974,1),	XRA_MASK, POWER7|PPCA2,	PPCVLE,		{FRT, FRB}},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const int powerpc_num_opcodes =</div><div class='add'>+  sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]);</div><div class='add'>+</div><div class='add'>+/* The VLE opcode table.</div><div class='add'>+</div><div class='add'>+   The format of this opcode table is the same as the main opcode table.  */</div><div class='add'>+</div><div class='add'>+const struct powerpc_opcode vle_opcodes[] = {</div><div class='add'>+{"se_illegal",	C(0),		C_MASK,		PPCVLE,	0,		{}},</div><div class='add'>+{"se_isync",	C(1),		C_MASK,		PPCVLE,	0,		{}},</div><div class='add'>+{"se_sc",	C(2),		C_MASK,		PPCVLE,	0,		{}},</div><div class='add'>+{"se_blr",	C_LK(2,0),	C_LK_MASK,	PPCVLE,	0,		{}},</div><div class='add'>+{"se_blrl",	C_LK(2,1),	C_LK_MASK,	PPCVLE,	0,		{}},</div><div class='add'>+{"se_bctr",	C_LK(3,0),	C_LK_MASK,	PPCVLE,	0,		{}},</div><div class='add'>+{"se_bctrl",	C_LK(3,1),	C_LK_MASK,	PPCVLE,	0,		{}},</div><div class='add'>+{"se_rfi",	C(8),		C_MASK,		PPCVLE,	0,		{}},</div><div class='add'>+{"se_rfci",	C(9),		C_MASK,		PPCVLE,	0,		{}},</div><div class='add'>+{"se_rfdi",	C(10),		C_MASK,		PPCVLE,	0,		{}},</div><div class='add'>+{"se_rfmci",	C(11),		C_MASK, PPCRFMCI|PPCVLE, 0,		{}},</div><div class='add'>+{"se_not",	SE_R(0,2),	SE_R_MASK,	PPCVLE,	0,		{RX}},</div><div class='add'>+{"se_neg",	SE_R(0,3),	SE_R_MASK,	PPCVLE,	0,		{RX}},</div><div class='add'>+{"se_mflr",	SE_R(0,8),	SE_R_MASK,	PPCVLE,	0,		{RX}},</div><div class='add'>+{"se_mtlr",	SE_R(0,9),	SE_R_MASK,	PPCVLE,	0,		{RX}},</div><div class='add'>+{"se_mfctr",	SE_R(0,10),	SE_R_MASK,	PPCVLE,	0,		{RX}},</div><div class='add'>+{"se_mtctr",	SE_R(0,11),	SE_R_MASK,	PPCVLE,	0,		{RX}},</div><div class='add'>+{"se_extzb",	SE_R(0,12),	SE_R_MASK,	PPCVLE,	0,		{RX}},</div><div class='add'>+{"se_extsb",	SE_R(0,13),	SE_R_MASK,	PPCVLE,	0,		{RX}},</div><div class='add'>+{"se_extzh",	SE_R(0,14),	SE_R_MASK,	PPCVLE,	0,		{RX}},</div><div class='add'>+{"se_extsh",	SE_R(0,15),	SE_R_MASK,	PPCVLE,	0,		{RX}},</div><div class='add'>+{"se_mr",	SE_RR(0,1),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_mtar",	SE_RR(0,2),	SE_RR_MASK,	PPCVLE,	0,		{ARX, RY}},</div><div class='add'>+{"se_mfar",	SE_RR(0,3),	SE_RR_MASK,	PPCVLE,	0,		{RX, ARY}},</div><div class='add'>+{"se_add",	SE_RR(1,0),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_mullw",	SE_RR(1,1),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_sub",	SE_RR(1,2),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_subf",	SE_RR(1,3),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_cmp",	SE_RR(3,0),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_cmpl",	SE_RR(3,1),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_cmph",	SE_RR(3,2),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_cmphl",	SE_RR(3,3),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+</div><div class='add'>+{"e_cmpi",	SCI8BF(6,0,21),	SCI8BF_MASK,	PPCVLE,	0,		{CRD32, RA, SCLSCI8}},</div><div class='add'>+{"e_cmpwi",	SCI8BF(6,0,21),	SCI8BF_MASK,	PPCVLE,	0,		{CRD32, RA, SCLSCI8}},</div><div class='add'>+{"e_cmpli",	SCI8BF(6,1,21),	SCI8BF_MASK,	PPCVLE,	0,		{CRD32, RA, SCLSCI8}},</div><div class='add'>+{"e_cmplwi",	SCI8BF(6,1,21),	SCI8BF_MASK,	PPCVLE,	0,		{CRD32, RA, SCLSCI8}},</div><div class='add'>+{"e_addi",	SCI8(6,16),	SCI8_MASK,	PPCVLE,	0,		{RT, RA, SCLSCI8}},</div><div class='add'>+{"e_subi",	SCI8(6,16),	SCI8_MASK,	PPCVLE,	0,		{RT, RA, SCLSCI8N}},</div><div class='add'>+{"e_addi.",	SCI8(6,17),	SCI8_MASK,	PPCVLE,	0,		{RT, RA, SCLSCI8}},</div><div class='add'>+{"e_addic",	SCI8(6,18),	SCI8_MASK,	PPCVLE,	0,		{RT, RA, SCLSCI8}},</div><div class='add'>+{"e_subic",	SCI8(6,18),	SCI8_MASK,	PPCVLE,	0,		{RT, RA, SCLSCI8N}},</div><div class='add'>+{"e_addic.",	SCI8(6,19),	SCI8_MASK,	PPCVLE,	0,		{RT, RA, SCLSCI8}},</div><div class='add'>+{"e_subic.",	SCI8(6,19),	SCI8_MASK,	PPCVLE,	0,		{RT, RA, SCLSCI8N}},</div><div class='add'>+{"e_mulli",	SCI8(6,20),	SCI8_MASK,	PPCVLE,	0,		{RT, RA, SCLSCI8}},</div><div class='add'>+{"e_subfic",	SCI8(6,22),	SCI8_MASK,	PPCVLE,	0,		{RT, RA, SCLSCI8}},</div><div class='add'>+{"e_subfic.",	SCI8(6,23),	SCI8_MASK,	PPCVLE,	0,		{RT, RA, SCLSCI8}},</div><div class='add'>+{"e_andi",	SCI8(6,24),	SCI8_MASK,	PPCVLE,	0,		{RA, RS, SCLSCI8}},</div><div class='add'>+{"e_andi.",	SCI8(6,25),	SCI8_MASK,	PPCVLE,	0,		{RA, RS, SCLSCI8}},</div><div class='add'>+{"e_nop",	SCI8(6,26),	0xffffffff,	PPCVLE,	0,		{0}},</div><div class='add'>+{"e_ori",	SCI8(6,26),	SCI8_MASK,	PPCVLE,	0,		{RA, RS, SCLSCI8}},</div><div class='add'>+{"e_ori.",	SCI8(6,27),	SCI8_MASK,	PPCVLE,	0,		{RA, RS, SCLSCI8}},</div><div class='add'>+{"e_xori",	SCI8(6,28),	SCI8_MASK,	PPCVLE,	0,		{RA, RS, SCLSCI8}},</div><div class='add'>+{"e_xori.",	SCI8(6,29),	SCI8_MASK,	PPCVLE,	0,		{RA, RS, SCLSCI8}},</div><div class='add'>+{"e_lbzu",	OPVUP(6,0),	OPVUP_MASK,	PPCVLE,	0,		{RT, D8, RA0}},</div><div class='add'>+{"e_lhau",	OPVUP(6,3),	OPVUP_MASK,	PPCVLE,	0,		{RT, D8, RA0}},</div><div class='add'>+{"e_lhzu",	OPVUP(6,1),	OPVUP_MASK,	PPCVLE,	0,		{RT, D8, RA0}},</div><div class='add'>+{"e_lmw",	OPVUP(6,8),	OPVUP_MASK,	PPCVLE,	0,		{RT, D8, RA0}},</div><div class='add'>+{"e_lwzu",	OPVUP(6,2),	OPVUP_MASK,	PPCVLE,	0,		{RT, D8, RA0}},</div><div class='add'>+{"e_stbu",	OPVUP(6,4),	OPVUP_MASK,	PPCVLE,	0,		{RT, D8, RA0}},</div><div class='add'>+{"e_sthu",	OPVUP(6,5),	OPVUP_MASK,	PPCVLE,	0,		{RT, D8, RA0}},</div><div class='add'>+{"e_stwu",	OPVUP(6,6),	OPVUP_MASK,	PPCVLE,	0,		{RT, D8, RA0}},</div><div class='add'>+{"e_stmw",	OPVUP(6,9),	OPVUP_MASK,	PPCVLE,	0,		{RT, D8, RA0}},</div><div class='add'>+{"e_ldmvgprw",	OPVUPRT(6,16,0),OPVUPRT_MASK,	PPCVLE,	0,		{D8, RA0}},</div><div class='add'>+{"e_stmvgprw",	OPVUPRT(6,17,0),OPVUPRT_MASK,	PPCVLE,	0,		{D8, RA0}},</div><div class='add'>+{"e_ldmvsprw",	OPVUPRT(6,16,1),OPVUPRT_MASK,	PPCVLE,	0,		{D8, RA0}},</div><div class='add'>+{"e_stmvsprw",	OPVUPRT(6,17,1),OPVUPRT_MASK,	PPCVLE,	0,		{D8, RA0}},</div><div class='add'>+{"e_ldmvsrrw",	OPVUPRT(6,16,4),OPVUPRT_MASK,	PPCVLE,	0,		{D8, RA0}},</div><div class='add'>+{"e_stmvsrrw",	OPVUPRT(6,17,4),OPVUPRT_MASK,	PPCVLE,	0,		{D8, RA0}},</div><div class='add'>+{"e_ldmvcsrrw",	OPVUPRT(6,16,5),OPVUPRT_MASK,	PPCVLE,	0,		{D8, RA0}},</div><div class='add'>+{"e_stmvcsrrw",	OPVUPRT(6,17,5),OPVUPRT_MASK,	PPCVLE,	0,		{D8, RA0}},</div><div class='add'>+{"e_ldmvdsrrw",	OPVUPRT(6,16,6),OPVUPRT_MASK,	PPCVLE,	0,		{D8, RA0}},</div><div class='add'>+{"e_stmvdsrrw",	OPVUPRT(6,17,6),OPVUPRT_MASK,	PPCVLE,	0,		{D8, RA0}},</div><div class='add'>+{"e_add16i",	OP(7),		OP_MASK,	PPCVLE,	0,		{RT, RA, SI}},</div><div class='add'>+{"e_la",	OP(7),		OP_MASK,	PPCVLE,	0,		{RT, D, RA0}},</div><div class='add'>+{"e_sub16i",	OP(7),		OP_MASK,	PPCVLE,	0,		{RT, RA, NSI}},</div><div class='add'>+</div><div class='add'>+{"se_addi",	SE_IM5(8,0),	SE_IM5_MASK,	PPCVLE,	0,		{RX, OIMM5}},</div><div class='add'>+{"se_cmpli",	SE_IM5(8,1),	SE_IM5_MASK,	PPCVLE,	0,		{RX, OIMM5}},</div><div class='add'>+{"se_subi",	SE_IM5(9,0),	SE_IM5_MASK,	PPCVLE,	0,		{RX, OIMM5}},</div><div class='add'>+{"se_subi.",	SE_IM5(9,1),	SE_IM5_MASK,	PPCVLE,	0,		{RX, OIMM5}},</div><div class='add'>+{"se_cmpi",	SE_IM5(10,1),	SE_IM5_MASK,	PPCVLE,	0,		{RX, UI5}},</div><div class='add'>+{"se_bmaski",	SE_IM5(11,0),	SE_IM5_MASK,	PPCVLE,	0,		{RX, UI5}},</div><div class='add'>+{"se_andi",	SE_IM5(11,1),	SE_IM5_MASK,	PPCVLE,	0,		{RX, UI5}},</div><div class='add'>+</div><div class='add'>+{"e_lbz",	OP(12),		OP_MASK,	PPCVLE,	0,		{RT, D, RA0}},</div><div class='add'>+{"e_stb",	OP(13),		OP_MASK,	PPCVLE,	0,		{RT, D, RA0}},</div><div class='add'>+{"e_lha",	OP(14),		OP_MASK,	PPCVLE,	0,		{RT, D, RA0}},</div><div class='add'>+</div><div class='add'>+{"se_srw",	SE_RR(16,0),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_sraw",	SE_RR(16,1),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_slw",	SE_RR(16,2),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_nop",	SE_RR(17,0),	0xffff,		PPCVLE,	0,		{0}},</div><div class='add'>+{"se_or",	SE_RR(17,0),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_andc",	SE_RR(17,1),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_and",	SE_RR(17,2),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_and.",	SE_RR(17,3),	SE_RR_MASK,	PPCVLE,	0,		{RX, RY}},</div><div class='add'>+{"se_li",	IM7(9),		IM7_MASK,	PPCVLE,	0,		{RX, UI7}},</div><div class='add'>+</div><div class='add'>+{"e_lwz",	OP(20),		OP_MASK,	PPCVLE,	0,		{RT, D, RA0}},</div><div class='add'>+{"e_stw",	OP(21),		OP_MASK,	PPCVLE,	0,		{RT, D, RA0}},</div><div class='add'>+{"e_lhz",	OP(22),		OP_MASK,	PPCVLE,	0,		{RT, D, RA0}},</div><div class='add'>+{"e_sth",	OP(23),		OP_MASK,	PPCVLE,	0,		{RT, D, RA0}},</div><div class='add'>+</div><div class='add'>+{"se_bclri",	SE_IM5(24,0),	SE_IM5_MASK,	PPCVLE,	0,		{RX, UI5}},</div><div class='add'>+{"se_bgeni",	SE_IM5(24,1),	SE_IM5_MASK,	PPCVLE,	0,		{RX, UI5}},</div><div class='add'>+{"se_bseti",	SE_IM5(25,0),	SE_IM5_MASK,	PPCVLE,	0,		{RX, UI5}},</div><div class='add'>+{"se_btsti",	SE_IM5(25,1),	SE_IM5_MASK,	PPCVLE,	0,		{RX, UI5}},</div><div class='add'>+{"se_srwi",	SE_IM5(26,0),	SE_IM5_MASK,	PPCVLE,	0,		{RX, UI5}},</div><div class='add'>+{"se_srawi",	SE_IM5(26,1),	SE_IM5_MASK,	PPCVLE,	0,		{RX, UI5}},</div><div class='add'>+{"se_slwi",	SE_IM5(27,0),	SE_IM5_MASK,	PPCVLE,	0,		{RX, UI5}},</div><div class='add'>+</div><div class='add'>+{"e_lis",	I16L(28,28),	I16L_MASK,	PPCVLE,	0,		{RD, VLEUIMML}},</div><div class='add'>+{"e_and2is.",	I16L(28,29),	I16L_MASK,	PPCVLE,	0,		{RD, VLEUIMML}},</div><div class='add'>+{"e_or2is",	I16L(28,26),	I16L_MASK,	PPCVLE,	0,		{RD, VLEUIMML}},</div><div class='add'>+{"e_and2i.",	I16L(28,25),	I16L_MASK,	PPCVLE,	0,		{RD, VLEUIMML}},</div><div class='add'>+{"e_or2i",	I16L(28,24),	I16L_MASK,	PPCVLE,	0,		{RD, VLEUIMML}},</div><div class='add'>+{"e_cmphl16i",	IA16(28,23),	IA16_MASK,	PPCVLE,	0,		{RA, VLEUIMM}},</div><div class='add'>+{"e_cmph16i",	IA16(28,22),	IA16_MASK,	PPCVLE,	0,		{RA, VLESIMM}},</div><div class='add'>+{"e_cmpl16i",	I16A(28,21),	I16A_MASK,	PPCVLE,	0,		{RA, VLEUIMM}},</div><div class='add'>+{"e_mull2i",	I16A(28,20),	I16A_MASK,	PPCVLE,	0,		{RA, VLESIMM}},</div><div class='add'>+{"e_cmp16i",	IA16(28,19),	IA16_MASK,	PPCVLE,	0,		{RA, VLESIMM}},</div><div class='add'>+{"e_sub2is",	I16A(28,18),	I16A_MASK,	PPCVLE,	0,		{RA, VLENSIMM}},</div><div class='add'>+{"e_add2is",	I16A(28,18),	I16A_MASK,	PPCVLE,	0,		{RA, VLESIMM}},</div><div class='add'>+{"e_sub2i.",	I16A(28,17),	I16A_MASK,	PPCVLE,	0,		{RA, VLENSIMM}},</div><div class='add'>+{"e_add2i.",	I16A(28,17),	I16A_MASK,	PPCVLE,	0,		{RA, VLESIMM}},</div><div class='add'>+{"e_li",	LI20(28,0),	LI20_MASK,	PPCVLE,	0,		{RT, IMM20}},</div><div class='add'>+{"e_rlwimi",	M(29,0),	M_MASK,		PPCVLE,	0,		{RA, RS, SH, MB, ME}},</div><div class='add'>+{"e_rlwinm",	M(29,1),	M_MASK,		PPCVLE,	0,		{RA, RT, SH, MBE, ME}},</div><div class='add'>+{"e_b",		BD24(30,0,0),	BD24_MASK,	PPCVLE,	0,		{B24}},</div><div class='add'>+{"e_bl",	BD24(30,0,1),	BD24_MASK,	PPCVLE,	0,		{B24}},</div><div class='add'>+{"e_bdnz",	EBD15(30,8,BO32DNZ,0),	EBD15_MASK, PPCVLE, 0,		{B15}},</div><div class='add'>+{"e_bdnzl",	EBD15(30,8,BO32DNZ,1),	EBD15_MASK, PPCVLE, 0,		{B15}},</div><div class='add'>+{"e_bdz",	EBD15(30,8,BO32DZ,0),	EBD15_MASK, PPCVLE, 0,		{B15}},</div><div class='add'>+{"e_bdzl",	EBD15(30,8,BO32DZ,1),	EBD15_MASK, PPCVLE, 0,		{B15}},</div><div class='add'>+{"e_bge",	EBD15BI(30,8,BO32F,CBLT,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bgel",	EBD15BI(30,8,BO32F,CBLT,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bnl",	EBD15BI(30,8,BO32F,CBLT,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bnll",	EBD15BI(30,8,BO32F,CBLT,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_blt",	EBD15BI(30,8,BO32T,CBLT,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bltl",	EBD15BI(30,8,BO32T,CBLT,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bgt",	EBD15BI(30,8,BO32T,CBGT,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bgtl",	EBD15BI(30,8,BO32T,CBGT,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_ble",	EBD15BI(30,8,BO32F,CBGT,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_blel",	EBD15BI(30,8,BO32F,CBGT,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bng",	EBD15BI(30,8,BO32F,CBGT,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bngl",	EBD15BI(30,8,BO32F,CBGT,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bne",	EBD15BI(30,8,BO32F,CBEQ,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bnel",	EBD15BI(30,8,BO32F,CBEQ,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_beq",	EBD15BI(30,8,BO32T,CBEQ,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_beql",	EBD15BI(30,8,BO32T,CBEQ,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bso",	EBD15BI(30,8,BO32T,CBSO,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bsol",	EBD15BI(30,8,BO32T,CBSO,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bun",	EBD15BI(30,8,BO32T,CBSO,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bunl",	EBD15BI(30,8,BO32T,CBSO,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bns",	EBD15BI(30,8,BO32F,CBSO,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bnsl",	EBD15BI(30,8,BO32F,CBSO,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bnu",	EBD15BI(30,8,BO32F,CBSO,0), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bnul",	EBD15BI(30,8,BO32F,CBSO,1), EBD15BI_MASK, PPCVLE, 0,	{CRS,B15}},</div><div class='add'>+{"e_bc",	BD15(30,8,0),	BD15_MASK,	PPCVLE,	0,		{BO32, BI32, B15}},</div><div class='add'>+{"e_bcl",	BD15(30,8,1),	BD15_MASK,	PPCVLE,	0,		{BO32, BI32, B15}},</div><div class='add'>+</div><div class='add'>+{"e_bf",	EBD15(30,8,BO32F,0), EBD15_MASK, PPCVLE, 0,		{BI32,B15}},</div><div class='add'>+{"e_bfl",	EBD15(30,8,BO32F,1), EBD15_MASK, PPCVLE, 0,		{BI32,B15}},</div><div class='add'>+{"e_bt",	EBD15(30,8,BO32T,0), EBD15_MASK, PPCVLE, 0,		{BI32,B15}},</div><div class='add'>+{"e_btl",	EBD15(30,8,BO32T,1), EBD15_MASK, PPCVLE, 0,		{BI32,B15}},</div><div class='add'>+</div><div class='add'>+{"e_cmph",	X(31,14),	X_MASK,		PPCVLE,	0,		{CRD, RA, RB}},</div><div class='add'>+{"e_cmphl",	X(31,46),	X_MASK,		PPCVLE,	0,		{CRD, RA, RB}},</div><div class='add'>+{"e_crandc",	XL(31,129),	XL_MASK,	PPCVLE,	0,		{BT, BA, BB}},</div><div class='add'>+{"e_crnand",	XL(31,225),	XL_MASK,	PPCVLE,	0,		{BT, BA, BB}},</div><div class='add'>+{"e_crnot",	XL(31,33),	XL_MASK,	PPCVLE,	0,		{BT, BA, BBA}},</div><div class='add'>+{"e_crnor",	XL(31,33),	XL_MASK,	PPCVLE,	0,		{BT, BA, BB}},</div><div class='add'>+{"e_crclr",	XL(31,193),	XL_MASK,	PPCVLE,	0,		{BT, BAT, BBA}},</div><div class='add'>+{"e_crxor",	XL(31,193),	XL_MASK,	PPCVLE,	0,		{BT, BA, BB}},</div><div class='add'>+{"e_mcrf",	XL(31,16),	XL_MASK,	PPCVLE,	0,		{CRD, CR}},</div><div class='add'>+{"e_slwi",	EX(31,112),	EX_MASK,	PPCVLE,	0,		{RA, RS, SH}},</div><div class='add'>+{"e_slwi.",	EX(31,113),	EX_MASK,	PPCVLE,	0,		{RA, RS, SH}},</div><div class='add'>+</div><div class='add'>+{"e_crand",	XL(31,257),	XL_MASK,	PPCVLE,	0,		{BT, BA, BB}},</div><div class='add'>+</div><div class='add'>+{"e_rlw",	EX(31,560),	EX_MASK,	PPCVLE,	0,		{RA, RS, RB}},</div><div class='add'>+{"e_rlw.",	EX(31,561),	EX_MASK,	PPCVLE,	0,		{RA, RS, RB}},</div><div class='add'>+</div><div class='add'>+{"e_crset",	XL(31,289),	XL_MASK,	PPCVLE,	0,		{BT, BAT, BBA}},</div><div class='add'>+{"e_creqv",	XL(31,289),	XL_MASK,	PPCVLE,	0,		{BT, BA, BB}},</div><div class='add'>+</div><div class='add'>+{"e_rlwi",	EX(31,624),	EX_MASK,	PPCVLE,	0,		{RA, RS, SH}},</div><div class='add'>+{"e_rlwi.",	EX(31,625),	EX_MASK,	PPCVLE,	0,		{RA, RS, SH}},</div><div class='add'>+</div><div class='add'>+{"e_crorc",	XL(31,417),	XL_MASK,	PPCVLE,	0,		{BT, BA, BB}},</div><div class='add'>+</div><div class='add'>+{"e_crmove",	XL(31,449),	XL_MASK,	PPCVLE,	0,		{BT, BA, BBA}},</div><div class='add'>+{"e_cror",	XL(31,449),	XL_MASK,	PPCVLE,	0,		{BT, BA, BB}},</div><div class='add'>+</div><div class='add'>+{"mtmas1",	XSPR(31,467,625), XSPR_MASK,	PPCVLE,	0,		{RS}},</div><div class='add'>+</div><div class='add'>+{"e_srwi",	EX(31,1136),	EX_MASK,	PPCVLE,	0,		{RA, RS, SH}},</div><div class='add'>+{"e_srwi.",	EX(31,1137),	EX_MASK,	PPCVLE,	0,		{RA, RS, SH}},</div><div class='add'>+</div><div class='add'>+{"se_lbz",	SD4(8),		SD4_MASK,	PPCVLE,	0,		{RZ, SE_SD, RX}},</div><div class='add'>+</div><div class='add'>+{"se_stb",	SD4(9),		SD4_MASK,	PPCVLE,	0,		{RZ, SE_SD, RX}},</div><div class='add'>+</div><div class='add'>+{"se_lhz",	SD4(10),	SD4_MASK,	PPCVLE,	0,		{RZ, SE_SDH, RX}},</div><div class='add'>+</div><div class='add'>+{"se_sth",	SD4(11),	SD4_MASK,	PPCVLE,	0,		{RZ, SE_SDH, RX}},</div><div class='add'>+</div><div class='add'>+{"se_lwz",	SD4(12),	SD4_MASK,	PPCVLE,	0,		{RZ, SE_SDW, RX}},</div><div class='add'>+</div><div class='add'>+{"se_stw",	SD4(13),	SD4_MASK,	PPCVLE,	0,		{RZ, SE_SDW, RX}},</div><div class='add'>+</div><div class='add'>+{"se_bge",	EBD8IO(28,0,0),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_bnl",	EBD8IO(28,0,0),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_ble",	EBD8IO(28,0,1),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_bng",	EBD8IO(28,0,1),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_bne",	EBD8IO(28,0,2),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_bns",	EBD8IO(28,0,3),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_bnu",	EBD8IO(28,0,3),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_bf",	EBD8IO(28,0,0),	EBD8IO2_MASK,	PPCVLE,	0,		{BI16, B8}},</div><div class='add'>+{"se_blt",	EBD8IO(28,1,0),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_bgt",	EBD8IO(28,1,1),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_beq",	EBD8IO(28,1,2),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_bso",	EBD8IO(28,1,3),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_bun",	EBD8IO(28,1,3),	EBD8IO3_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_bt",	EBD8IO(28,1,0),	EBD8IO2_MASK,	PPCVLE,	0,		{BI16, B8}},</div><div class='add'>+{"se_bc",	BD8IO(28),	BD8IO_MASK,	PPCVLE,	0,		{BO16, BI16, B8}},</div><div class='add'>+{"se_b",	BD8(58,0,0),	BD8_MASK,	PPCVLE,	0,		{B8}},</div><div class='add'>+{"se_bl",	BD8(58,0,1),	BD8_MASK,	PPCVLE,	0,		{B8}},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes);</div><div class='add'>+const int vle_num_opcodes =</div><div class='add'>+  sizeof (vle_opcodes) / sizeof (vle_opcodes[0]);</div><div class='ctx'> </div><div class='ctx'> /* The macro table.  This is only used by the assembler.  */</div><div class='ctx'> </div><div class='hunk'>@@ -4949,45 +7235,58 @@ const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes);</div><div class='ctx'>    support extracting the whole word (32 bits in this case).  */</div><div class='ctx'> </div><div class='ctx'> const struct powerpc_macro powerpc_macros[] = {</div><div class='del'>-{ "extldi",  4,   PPC64,	"rldicr %0,%1,%3,(%2)-1" },</div><div class='del'>-{ "extldi.", 4,   PPC64,	"rldicr. %0,%1,%3,(%2)-1" },</div><div class='del'>-{ "extrdi",  4,   PPC64,	"rldicl %0,%1,(%2)+(%3),64-(%2)" },</div><div class='del'>-{ "extrdi.", 4,   PPC64,	"rldicl. %0,%1,(%2)+(%3),64-(%2)" },</div><div class='del'>-{ "insrdi",  4,   PPC64,	"rldimi %0,%1,64-((%2)+(%3)),%3" },</div><div class='del'>-{ "insrdi.", 4,   PPC64,	"rldimi. %0,%1,64-((%2)+(%3)),%3" },</div><div class='del'>-{ "rotrdi",  3,   PPC64,	"rldicl %0,%1,(-(%2)!63)&amp;((%2)|63),0" },</div><div class='del'>-{ "rotrdi.", 3,   PPC64,	"rldicl. %0,%1,(-(%2)!63)&amp;((%2)|63),0" },</div><div class='del'>-{ "sldi",    3,   PPC64,	"rldicr %0,%1,%2,63-(%2)" },</div><div class='del'>-{ "sldi.",   3,   PPC64,	"rldicr. %0,%1,%2,63-(%2)" },</div><div class='del'>-{ "srdi",    3,   PPC64,	"rldicl %0,%1,(-(%2)!63)&amp;((%2)|63),%2" },</div><div class='del'>-{ "srdi.",   3,   PPC64,	"rldicl. %0,%1,(-(%2)!63)&amp;((%2)|63),%2" },</div><div class='del'>-{ "clrrdi",  3,   PPC64,	"rldicr %0,%1,0,63-(%2)" },</div><div class='del'>-{ "clrrdi.", 3,   PPC64,	"rldicr. %0,%1,0,63-(%2)" },</div><div class='del'>-{ "clrlsldi",4,   PPC64,	"rldic %0,%1,%3,(%2)-(%3)" },</div><div class='del'>-{ "clrlsldi.",4,  PPC64,	"rldic. %0,%1,%3,(%2)-(%3)" },</div><div class='del'>-</div><div class='del'>-{ "extlwi",  4,   PPCCOM,	"rlwinm %0,%1,%3,0,(%2)-1" },</div><div class='del'>-{ "extlwi.", 4,   PPCCOM,	"rlwinm. %0,%1,%3,0,(%2)-1" },</div><div class='del'>-{ "extrwi",  4,   PPCCOM,	"rlwinm %0,%1,((%2)+(%3))&amp;((%2)+(%3)&lt;&gt;32),32-(%2),31" },</div><div class='del'>-{ "extrwi.", 4,   PPCCOM,	"rlwinm. %0,%1,((%2)+(%3))&amp;((%2)+(%3)&lt;&gt;32),32-(%2),31" },</div><div class='del'>-{ "inslwi",  4,   PPCCOM,	"rlwimi %0,%1,(-(%3)!31)&amp;((%3)|31),%3,(%2)+(%3)-1" },</div><div class='del'>-{ "inslwi.", 4,   PPCCOM,	"rlwimi. %0,%1,(-(%3)!31)&amp;((%3)|31),%3,(%2)+(%3)-1"},</div><div class='del'>-{ "insrwi",  4,   PPCCOM,	"rlwimi %0,%1,32-((%2)+(%3)),%3,(%2)+(%3)-1" },</div><div class='del'>-{ "insrwi.", 4,   PPCCOM,	"rlwimi. %0,%1,32-((%2)+(%3)),%3,(%2)+(%3)-1"},</div><div class='del'>-{ "rotrwi",  3,   PPCCOM,	"rlwinm %0,%1,(-(%2)!31)&amp;((%2)|31),0,31" },</div><div class='del'>-{ "rotrwi.", 3,   PPCCOM,	"rlwinm. %0,%1,(-(%2)!31)&amp;((%2)|31),0,31" },</div><div class='del'>-{ "slwi",    3,   PPCCOM,	"rlwinm %0,%1,%2,0,31-(%2)" },</div><div class='del'>-{ "sli",     3,   PWRCOM,	"rlinm %0,%1,%2,0,31-(%2)" },</div><div class='del'>-{ "slwi.",   3,   PPCCOM,	"rlwinm. %0,%1,%2,0,31-(%2)" },</div><div class='del'>-{ "sli.",    3,   PWRCOM,	"rlinm. %0,%1,%2,0,31-(%2)" },</div><div class='del'>-{ "srwi",    3,   PPCCOM,	"rlwinm %0,%1,(-(%2)!31)&amp;((%2)|31),%2,31" },</div><div class='del'>-{ "sri",     3,   PWRCOM,	"rlinm %0,%1,(-(%2)!31)&amp;((%2)|31),%2,31" },</div><div class='del'>-{ "srwi.",   3,   PPCCOM,	"rlwinm. %0,%1,(-(%2)!31)&amp;((%2)|31),%2,31" },</div><div class='del'>-{ "sri.",    3,   PWRCOM,	"rlinm. %0,%1,(-(%2)!31)&amp;((%2)|31),%2,31" },</div><div class='del'>-{ "clrrwi",  3,   PPCCOM,	"rlwinm %0,%1,0,0,31-(%2)" },</div><div class='del'>-{ "clrrwi.", 3,   PPCCOM,	"rlwinm. %0,%1,0,0,31-(%2)" },</div><div class='del'>-{ "clrlslwi",4,   PPCCOM,	"rlwinm %0,%1,%3,(%2)-(%3),31-(%3)" },</div><div class='del'>-{ "clrlslwi.",4,  PPCCOM,	"rlwinm. %0,%1,%3,(%2)-(%3),31-(%3)" },</div><div class='add'>+{"extldi",   4,	PPC64,	"rldicr %0,%1,%3,(%2)-1"},</div><div class='add'>+{"extldi.",  4,	PPC64,	"rldicr. %0,%1,%3,(%2)-1"},</div><div class='add'>+{"extrdi",   4,	PPC64,	"rldicl %0,%1,((%2)+(%3))&amp;((%2)+(%3)&lt;&gt;64),64-(%2)"},</div><div class='add'>+{"extrdi.",  4,	PPC64,	"rldicl. %0,%1,((%2)+(%3))&amp;((%2)+(%3)&lt;&gt;64),64-(%2)"},</div><div class='add'>+{"insrdi",   4,	PPC64,	"rldimi %0,%1,64-((%2)+(%3)),%3"},</div><div class='add'>+{"insrdi.",  4,	PPC64,	"rldimi. %0,%1,64-((%2)+(%3)),%3"},</div><div class='add'>+{"rotrdi",   3,	PPC64,	"rldicl %0,%1,(-(%2)!63)&amp;((%2)|63),0"},</div><div class='add'>+{"rotrdi.",  3,	PPC64,	"rldicl. %0,%1,(-(%2)!63)&amp;((%2)|63),0"},</div><div class='add'>+{"sldi",     3,	PPC64,	"rldicr %0,%1,%2,63-(%2)"},</div><div class='add'>+{"sldi.",    3,	PPC64,	"rldicr. %0,%1,%2,63-(%2)"},</div><div class='add'>+{"srdi",     3,	PPC64,	"rldicl %0,%1,(-(%2)!63)&amp;((%2)|63),%2"},</div><div class='add'>+{"srdi.",    3,	PPC64,	"rldicl. %0,%1,(-(%2)!63)&amp;((%2)|63),%2"},</div><div class='add'>+{"clrrdi",   3,	PPC64,	"rldicr %0,%1,0,63-(%2)"},</div><div class='add'>+{"clrrdi.",  3,	PPC64,	"rldicr. %0,%1,0,63-(%2)"},</div><div class='add'>+{"clrlsldi", 4,	PPC64,	"rldic %0,%1,%3,(%2)-(%3)"},</div><div class='add'>+{"clrlsldi.",4,	PPC64,	"rldic. %0,%1,%3,(%2)-(%3)"},</div><div class='add'>+</div><div class='add'>+{"extlwi",   4,	PPCCOM,	"rlwinm %0,%1,%3,0,(%2)-1"},</div><div class='add'>+{"extlwi.",  4,	PPCCOM,	"rlwinm. %0,%1,%3,0,(%2)-1"},</div><div class='add'>+{"extrwi",   4,	PPCCOM,	"rlwinm %0,%1,((%2)+(%3))&amp;((%2)+(%3)&lt;&gt;32),32-(%2),31"},</div><div class='add'>+{"extrwi.",  4,	PPCCOM,	"rlwinm. %0,%1,((%2)+(%3))&amp;((%2)+(%3)&lt;&gt;32),32-(%2),31"},</div><div class='add'>+{"inslwi",   4,	PPCCOM,	"rlwimi %0,%1,(-(%3)!31)&amp;((%3)|31),%3,(%2)+(%3)-1"},</div><div class='add'>+{"inslwi.",  4,	PPCCOM,	"rlwimi. %0,%1,(-(%3)!31)&amp;((%3)|31),%3,(%2)+(%3)-1"},</div><div class='add'>+{"insrwi",   4,	PPCCOM,	"rlwimi %0,%1,32-((%2)+(%3)),%3,(%2)+(%3)-1"},</div><div class='add'>+{"insrwi.",  4,	PPCCOM,	"rlwimi. %0,%1,32-((%2)+(%3)),%3,(%2)+(%3)-1"},</div><div class='add'>+{"rotrwi",   3,	PPCCOM,	"rlwinm %0,%1,(-(%2)!31)&amp;((%2)|31),0,31"},</div><div class='add'>+{"rotrwi.",  3,	PPCCOM,	"rlwinm. %0,%1,(-(%2)!31)&amp;((%2)|31),0,31"},</div><div class='add'>+{"slwi",     3,	PPCCOM,	"rlwinm %0,%1,%2,0,31-(%2)"},</div><div class='add'>+{"sli",      3,	PWRCOM,	"rlinm %0,%1,%2,0,31-(%2)"},</div><div class='add'>+{"slwi.",    3,	PPCCOM,	"rlwinm. %0,%1,%2,0,31-(%2)"},</div><div class='add'>+{"sli.",     3,	PWRCOM,	"rlinm. %0,%1,%2,0,31-(%2)"},</div><div class='add'>+{"srwi",     3,	PPCCOM,	"rlwinm %0,%1,(-(%2)!31)&amp;((%2)|31),%2,31"},</div><div class='add'>+{"sri",      3,	PWRCOM,	"rlinm %0,%1,(-(%2)!31)&amp;((%2)|31),%2,31"},</div><div class='add'>+{"srwi.",    3,	PPCCOM,	"rlwinm. %0,%1,(-(%2)!31)&amp;((%2)|31),%2,31"},</div><div class='add'>+{"sri.",     3,	PWRCOM,	"rlinm. %0,%1,(-(%2)!31)&amp;((%2)|31),%2,31"},</div><div class='add'>+{"clrrwi",   3,	PPCCOM,	"rlwinm %0,%1,0,0,31-(%2)"},</div><div class='add'>+{"clrrwi.",  3,	PPCCOM,	"rlwinm. %0,%1,0,0,31-(%2)"},</div><div class='add'>+{"clrlslwi", 4,	PPCCOM,	"rlwinm %0,%1,%3,(%2)-(%3),31-(%3)"},</div><div class='add'>+{"clrlslwi.",4, PPCCOM,	"rlwinm. %0,%1,%3,(%2)-(%3),31-(%3)"},</div><div class='add'>+</div><div class='add'>+{"e_extlwi", 4,	PPCVLE, "e_rlwinm %0,%1,%3,0,(%2)-1"},</div><div class='add'>+{"e_extrwi", 4,	PPCVLE, "e_rlwinm %0,%1,((%2)+(%3))&amp;((%2)+(%3)&lt;&gt;32),32-(%2),31"},</div><div class='add'>+{"e_inslwi", 4,	PPCVLE, "e_rlwimi %0,%1,(-(%3)!31)&amp;((%3)|31),%3,(%2)+(%3)-1"},</div><div class='add'>+{"e_insrwi", 4,	PPCVLE, "e_rlwimi %0,%1,32-((%2)+(%3)),%3,(%2)+(%3)-1"},</div><div class='add'>+{"e_rotlwi", 3,	PPCVLE, "e_rlwinm %0,%1,%2,0,31"},</div><div class='add'>+{"e_rotrwi", 3,	PPCVLE, "e_rlwinm %0,%1,(-(%2)!31)&amp;((%2)|31),0,31"},</div><div class='add'>+{"e_slwi",   3,	PPCVLE, "e_rlwinm %0,%1,%2,0,31-(%2)"},</div><div class='add'>+{"e_srwi",   3,	PPCVLE, "e_rlwinm %0,%1,(-(%2)!31)&amp;((%2)|31),%2,31"},</div><div class='add'>+{"e_clrlwi", 3,	PPCVLE, "e_rlwinm %0,%1,0,%2,31"},</div><div class='add'>+{"e_clrrwi", 3,	PPCVLE, "e_rlwinm %0,%1,0,0,31-(%2)"},</div><div class='add'>+{"e_clrlslwi",4, PPCVLE, "e_rlwinm %0,%1,%3,(%2)-(%3),31-(%3)"},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const int powerpc_num_macros = ARRAY_SIZE(powerpc_macros);</div><div class='add'>+const int powerpc_num_macros =</div><div class='add'>+  sizeof (powerpc_macros) / sizeof (powerpc_macros[0]);</div><div class='head'>diff --git a/arch/powerpc/xmon/ppc.h b/arch/powerpc/xmon/ppc.h<br/>index 110df96354b4..d00f33dcf192 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/xmon/ppc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/xmon/ppc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/xmon/ppc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/xmon/ppc.h</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> /* ppc.h -- Header file for PowerPC opcode table</div><div class='del'>-   Copyright 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006</div><div class='del'>-   Free Software Foundation, Inc.</div><div class='add'>+   Copyright (C) 1994-2016 Free Software Foundation, Inc.</div><div class='ctx'>    Written by Ian Lance Taylor, Cygnus Support</div><div class='ctx'> </div><div class='ctx'> This file is part of GDB, GAS, and the GNU binutils.</div><div class='hunk'>@@ -22,6 +21,12 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, US</div><div class='ctx'> #ifndef PPC_H</div><div class='ctx'> #define PPC_H</div><div class='ctx'> </div><div class='add'>+#ifdef __cplusplus</div><div class='add'>+extern "C" {</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef uint64_t ppc_cpu_t;</div><div class='add'>+</div><div class='ctx'> /* The opcode table is an array of struct powerpc_opcode.  */</div><div class='ctx'> </div><div class='ctx'> struct powerpc_opcode</div><div class='hunk'>@@ -42,7 +47,12 @@ struct powerpc_opcode</div><div class='ctx'>   /* One bit flags for the opcode.  These are used to indicate which</div><div class='ctx'>      specific processors support the instructions.  The defined values</div><div class='ctx'>      are listed below.  */</div><div class='del'>-  unsigned long flags;</div><div class='add'>+  ppc_cpu_t flags;</div><div class='add'>+</div><div class='add'>+  /* One bit flags for the opcode.  These are used to indicate which</div><div class='add'>+     specific processors no longer support the instructions.  The defined</div><div class='add'>+     values are listed below.  */</div><div class='add'>+  ppc_cpu_t deprecated;</div><div class='ctx'> </div><div class='ctx'>   /* An array of operand codes.  Each code is an index into the</div><div class='ctx'>      operand table.  They appear in the order which the operands must</div><div class='hunk'>@@ -55,6 +65,8 @@ struct powerpc_opcode</div><div class='ctx'>    instructions.  */</div><div class='ctx'> extern const struct powerpc_opcode powerpc_opcodes[];</div><div class='ctx'> extern const int powerpc_num_opcodes;</div><div class='add'>+extern const struct powerpc_opcode vle_opcodes[];</div><div class='add'>+extern const int vle_num_opcodes;</div><div class='ctx'> </div><div class='ctx'> /* Values defined for the flags field of a struct powerpc_opcode.  */</div><div class='ctx'> </div><div class='hunk'>@@ -67,106 +79,178 @@ extern const int powerpc_num_opcodes;</div><div class='ctx'> /* Opcode is defined for the POWER2 (Rios 2) architecture.  */</div><div class='ctx'> #define PPC_OPCODE_POWER2		 4</div><div class='ctx'> </div><div class='del'>-/* Opcode is only defined on 32 bit architectures.  */</div><div class='del'>-#define PPC_OPCODE_32			 8</div><div class='del'>-</div><div class='del'>-/* Opcode is only defined on 64 bit architectures.  */</div><div class='del'>-#define PPC_OPCODE_64		      0x10</div><div class='del'>-</div><div class='ctx'> /* Opcode is supported by the Motorola PowerPC 601 processor.  The 601</div><div class='ctx'>    is assumed to support all PowerPC (PPC_OPCODE_PPC) instructions,</div><div class='ctx'>    but it also supports many additional POWER instructions.  */</div><div class='del'>-#define PPC_OPCODE_601		      0x20</div><div class='add'>+#define PPC_OPCODE_601			 8</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported in both the Power and PowerPC architectures</div><div class='del'>-   (ie, compiler's -mcpu=common or assembler's -mcom).  */</div><div class='del'>-#define PPC_OPCODE_COMMON	      0x40</div><div class='add'>+   (ie, compiler's -mcpu=common or assembler's -mcom).  More than just</div><div class='add'>+   the intersection of PPC_OPCODE_PPC with the union of PPC_OPCODE_POWER</div><div class='add'>+   and PPC_OPCODE_POWER2 because many instructions changed mnemonics</div><div class='add'>+   between POWER and POWERPC.  */</div><div class='add'>+#define PPC_OPCODE_COMMON	      0x10</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported for any Power or PowerPC platform (this is</div><div class='ctx'>    for the assembler's -many option, and it eliminates duplicates).  */</div><div class='del'>-#define PPC_OPCODE_ANY		      0x80</div><div class='add'>+#define PPC_OPCODE_ANY		      0x20</div><div class='add'>+</div><div class='add'>+/* Opcode is only defined on 64 bit architectures.  */</div><div class='add'>+#define PPC_OPCODE_64		      0x40</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported as part of the 64-bit bridge.  */</div><div class='del'>-#define PPC_OPCODE_64_BRIDGE	     0x100</div><div class='add'>+#define PPC_OPCODE_64_BRIDGE	      0x80</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported by Altivec Vector Unit */</div><div class='del'>-#define PPC_OPCODE_ALTIVEC	     0x200</div><div class='add'>+#define PPC_OPCODE_ALTIVEC	     0x100</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported by PowerPC 403 processor.  */</div><div class='del'>-#define PPC_OPCODE_403		     0x400</div><div class='add'>+#define PPC_OPCODE_403		     0x200</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported by PowerPC BookE processor.  */</div><div class='del'>-#define PPC_OPCODE_BOOKE	     0x800</div><div class='del'>-</div><div class='del'>-/* Opcode is only supported by 64-bit PowerPC BookE processor.  */</div><div class='del'>-#define PPC_OPCODE_BOOKE64	    0x1000</div><div class='add'>+#define PPC_OPCODE_BOOKE	     0x400</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported by PowerPC 440 processor.  */</div><div class='del'>-#define PPC_OPCODE_440		    0x2000</div><div class='add'>+#define PPC_OPCODE_440		     0x800</div><div class='ctx'> </div><div class='ctx'> /* Opcode is only supported by Power4 architecture.  */</div><div class='del'>-#define PPC_OPCODE_POWER4	    0x4000</div><div class='del'>-</div><div class='del'>-/* Opcode isn't supported by Power4 architecture.  */</div><div class='del'>-#define PPC_OPCODE_NOPOWER4	    0x8000</div><div class='add'>+#define PPC_OPCODE_POWER4	    0x1000</div><div class='ctx'> </div><div class='del'>-/* Opcode is only supported by POWERPC Classic architecture.  */</div><div class='del'>-#define PPC_OPCODE_CLASSIC	   0x10000</div><div class='add'>+/* Opcode is only supported by Power7 architecture.  */</div><div class='add'>+#define PPC_OPCODE_POWER7	    0x2000</div><div class='ctx'> </div><div class='ctx'> /* Opcode is only supported by e500x2 Core.  */</div><div class='del'>-#define PPC_OPCODE_SPE		   0x20000</div><div class='add'>+#define PPC_OPCODE_SPE		    0x4000</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported by e500x2 Integer select APU.  */</div><div class='del'>-#define PPC_OPCODE_ISEL		   0x40000</div><div class='add'>+#define PPC_OPCODE_ISEL		    0x8000</div><div class='ctx'> </div><div class='ctx'> /* Opcode is an e500 SPE floating point instruction.  */</div><div class='del'>-#define PPC_OPCODE_EFS		   0x80000</div><div class='add'>+#define PPC_OPCODE_EFS		   0x10000</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported by branch locking APU.  */</div><div class='del'>-#define PPC_OPCODE_BRLOCK	  0x100000</div><div class='add'>+#define PPC_OPCODE_BRLOCK	   0x20000</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported by performance monitor APU.  */</div><div class='del'>-#define PPC_OPCODE_PMR		  0x200000</div><div class='add'>+#define PPC_OPCODE_PMR		   0x40000</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported by cache locking APU.  */</div><div class='del'>-#define PPC_OPCODE_CACHELCK	  0x400000</div><div class='add'>+#define PPC_OPCODE_CACHELCK	   0x80000</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported by machine check APU.  */</div><div class='del'>-#define PPC_OPCODE_RFMCI	  0x800000</div><div class='add'>+#define PPC_OPCODE_RFMCI	  0x100000</div><div class='ctx'> </div><div class='ctx'> /* Opcode is only supported by Power5 architecture.  */</div><div class='del'>-#define PPC_OPCODE_POWER5	 0x1000000</div><div class='add'>+#define PPC_OPCODE_POWER5	  0x200000</div><div class='ctx'> </div><div class='ctx'> /* Opcode is supported by PowerPC e300 family.  */</div><div class='del'>-#define PPC_OPCODE_E300          0x2000000</div><div class='add'>+#define PPC_OPCODE_E300           0x400000</div><div class='ctx'> </div><div class='ctx'> /* Opcode is only supported by Power6 architecture.  */</div><div class='del'>-#define PPC_OPCODE_POWER6	 0x4000000</div><div class='add'>+#define PPC_OPCODE_POWER6	  0x800000</div><div class='ctx'> </div><div class='ctx'> /* Opcode is only supported by PowerPC Cell family.  */</div><div class='del'>-#define PPC_OPCODE_CELL		 0x8000000</div><div class='add'>+#define PPC_OPCODE_CELL		 0x1000000</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by CPUs with paired singles support.  */</div><div class='add'>+#define PPC_OPCODE_PPCPS	 0x2000000</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by Power E500MC */</div><div class='add'>+#define PPC_OPCODE_E500MC        0x4000000</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by PowerPC 405 processor.  */</div><div class='add'>+#define PPC_OPCODE_405		 0x8000000</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by Vector-Scalar (VSX) Unit */</div><div class='add'>+#define PPC_OPCODE_VSX		0x10000000</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by A2.  */</div><div class='add'>+#define PPC_OPCODE_A2	 	0x20000000</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by PowerPC 476 processor.  */</div><div class='add'>+#define PPC_OPCODE_476		0x40000000</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by AppliedMicro Titan core */</div><div class='add'>+#define PPC_OPCODE_TITAN        0x80000000</div><div class='add'>+</div><div class='add'>+/* Opcode which is supported by the e500 family */</div><div class='add'>+#define PPC_OPCODE_E500	       0x100000000ull</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by Extended Altivec Vector Unit */</div><div class='add'>+#define PPC_OPCODE_ALTIVEC2    0x200000000ull</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by Power E6500 */</div><div class='add'>+#define PPC_OPCODE_E6500       0x400000000ull</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by Thread management APU */</div><div class='add'>+#define PPC_OPCODE_TMR         0x800000000ull</div><div class='add'>+</div><div class='add'>+/* Opcode which is supported by the VLE extension.  */</div><div class='add'>+#define PPC_OPCODE_VLE	      0x1000000000ull</div><div class='add'>+</div><div class='add'>+/* Opcode is only supported by Power8 architecture.  */</div><div class='add'>+#define PPC_OPCODE_POWER8     0x2000000000ull</div><div class='add'>+</div><div class='add'>+/* Opcode which is supported by the Hardware Transactional Memory extension.  */</div><div class='add'>+/* Currently, this is the same as the POWER8 mask.  If another cpu comes out</div><div class='add'>+   that isn't a superset of POWER8, we can define this to its own mask.  */</div><div class='add'>+#define PPC_OPCODE_HTM        PPC_OPCODE_POWER8</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by ppc750cl.  */</div><div class='add'>+#define PPC_OPCODE_750	      0x4000000000ull</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by ppc7450.  */</div><div class='add'>+#define PPC_OPCODE_7450	      0x8000000000ull</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by ppc821/850/860.  */</div><div class='add'>+#define PPC_OPCODE_860	      0x10000000000ull</div><div class='add'>+</div><div class='add'>+/* Opcode is only supported by Power9 architecture.  */</div><div class='add'>+#define PPC_OPCODE_POWER9     0x20000000000ull</div><div class='add'>+</div><div class='add'>+/* Opcode is supported by Vector-Scalar (VSX) Unit from ISA 2.08.  */</div><div class='add'>+#define PPC_OPCODE_VSX3       0x40000000000ull</div><div class='add'>+</div><div class='add'>+  /* Opcode is supported by e200z4.  */</div><div class='add'>+#define PPC_OPCODE_E200Z4     0x80000000000ull</div><div class='ctx'> </div><div class='ctx'> /* A macro to extract the major opcode from an instruction.  */</div><div class='ctx'> #define PPC_OP(i) (((i) &gt;&gt; 26) &amp; 0x3f)</div><div class='add'>+</div><div class='add'>+/* A macro to determine if the instruction is a 2-byte VLE insn.  */</div><div class='add'>+#define PPC_OP_SE_VLE(m) ((m) &lt;= 0xffff)</div><div class='add'>+</div><div class='add'>+/* A macro to extract the major opcode from a VLE instruction.  */</div><div class='add'>+#define VLE_OP(i,m) (((i) &gt;&gt; ((m) &lt;= 0xffff ? 10 : 26)) &amp; 0x3f)</div><div class='add'>+</div><div class='add'>+/* A macro to convert a VLE opcode to a VLE opcode segment.  */</div><div class='add'>+#define VLE_OP_TO_SEG(i) ((i) &gt;&gt; 1)</div><div class='ctx'> </div><div class='ctx'> /* The operands table is an array of struct powerpc_operand.  */</div><div class='ctx'> </div><div class='ctx'> struct powerpc_operand</div><div class='ctx'> {</div><div class='del'>-  /* The number of bits in the operand.  */</div><div class='del'>-  int bits;</div><div class='del'>-</div><div class='del'>-  /* How far the operand is left shifted in the instruction.  */</div><div class='add'>+  /* A bitmask of bits in the operand.  */</div><div class='add'>+  unsigned int bitm;</div><div class='add'>+</div><div class='add'>+  /* The shift operation to be applied to the operand.  No shift</div><div class='add'>+     is made if this is zero.  For positive values, the operand</div><div class='add'>+     is shifted left by SHIFT.  For negative values, the operand</div><div class='add'>+     is shifted right by -SHIFT.  Use PPC_OPSHIFT_INV to indicate</div><div class='add'>+     that BITM and SHIFT cannot be used to determine where the</div><div class='add'>+     operand goes in the insn.  */</div><div class='ctx'>   int shift;</div><div class='ctx'> </div><div class='ctx'>   /* Insertion function.  This is used by the assembler.  To insert an</div><div class='ctx'>      operand value into an instruction, check this field.</div><div class='ctx'> </div><div class='ctx'>      If it is NULL, execute</div><div class='del'>-         i |= (op &amp; ((1 &lt;&lt; o-&gt;bits) - 1)) &lt;&lt; o-&gt;shift;</div><div class='add'>+	 if (o-&gt;shift &gt;= 0)</div><div class='add'>+	   i |= (op &amp; o-&gt;bitm) &lt;&lt; o-&gt;shift;</div><div class='add'>+	 else</div><div class='add'>+	   i |= (op &amp; o-&gt;bitm) &gt;&gt; -o-&gt;shift;</div><div class='ctx'>      (i is the instruction which we are filling in, o is a pointer to</div><div class='del'>-     this structure, and op is the opcode value; this assumes twos</div><div class='del'>-     complement arithmetic).</div><div class='add'>+     this structure, and op is the operand value).</div><div class='ctx'> </div><div class='ctx'>      If this field is not NULL, then simply call it with the</div><div class='ctx'>      instruction and the operand value.  It will return the new value</div><div class='hunk'>@@ -176,18 +260,20 @@ struct powerpc_operand</div><div class='ctx'>      operand value is legal, *ERRMSG will be unchanged (most operands</div><div class='ctx'>      can accept any value).  */</div><div class='ctx'>   unsigned long (*insert)</div><div class='del'>-    (unsigned long instruction, long op, int dialect, const char **errmsg);</div><div class='add'>+    (unsigned long instruction, long op, ppc_cpu_t dialect, const char **errmsg);</div><div class='ctx'> </div><div class='ctx'>   /* Extraction function.  This is used by the disassembler.  To</div><div class='ctx'>      extract this operand type from an instruction, check this field.</div><div class='ctx'> </div><div class='ctx'>      If it is NULL, compute</div><div class='del'>-         op = ((i) &gt;&gt; o-&gt;shift) &amp; ((1 &lt;&lt; o-&gt;bits) - 1);</div><div class='del'>-	 if ((o-&gt;flags &amp; PPC_OPERAND_SIGNED) != 0</div><div class='del'>-	     &amp;&amp; (op &amp; (1 &lt;&lt; (o-&gt;bits - 1))) != 0)</div><div class='del'>-	   op -= 1 &lt;&lt; o-&gt;bits;</div><div class='add'>+	 if (o-&gt;shift &gt;= 0)</div><div class='add'>+	   op = (i &gt;&gt; o-&gt;shift) &amp; o-&gt;bitm;</div><div class='add'>+	 else</div><div class='add'>+	   op = (i &lt;&lt; -o-&gt;shift) &amp; o-&gt;bitm;</div><div class='add'>+	 if ((o-&gt;flags &amp; PPC_OPERAND_SIGNED) != 0)</div><div class='add'>+	   sign_extend (op);</div><div class='ctx'>      (i is the instruction, o is a pointer to this structure, and op</div><div class='del'>-     is the result; this assumes twos complement arithmetic).</div><div class='add'>+     is the result).</div><div class='ctx'> </div><div class='ctx'>      If this field is not NULL, then simply call it with the</div><div class='ctx'>      instruction value.  It will return the value of the operand.  If</div><div class='hunk'>@@ -195,7 +281,7 @@ struct powerpc_operand</div><div class='ctx'>      non-zero if this operand type can not actually be extracted from</div><div class='ctx'>      this operand (i.e., the instruction does not match).  If the</div><div class='ctx'>      operand is valid, *INVALID will not be changed.  */</div><div class='del'>-  long (*extract) (unsigned long instruction, int dialect, int *invalid);</div><div class='add'>+  long (*extract) (unsigned long instruction, ppc_cpu_t dialect, int *invalid);</div><div class='ctx'> </div><div class='ctx'>   /* One bit syntax flags.  */</div><div class='ctx'>   unsigned long flags;</div><div class='hunk'>@@ -205,17 +291,23 @@ struct powerpc_operand</div><div class='ctx'>    the operands field of the powerpc_opcodes table.  */</div><div class='ctx'> </div><div class='ctx'> extern const struct powerpc_operand powerpc_operands[];</div><div class='add'>+extern const unsigned int num_powerpc_operands;</div><div class='add'>+</div><div class='add'>+/* Use with the shift field of a struct powerpc_operand to indicate</div><div class='add'>+     that BITM and SHIFT cannot be used to determine where the operand</div><div class='add'>+     goes in the insn.  */</div><div class='add'>+#define PPC_OPSHIFT_INV (-1U &lt;&lt; 31)</div><div class='ctx'> </div><div class='ctx'> /* Values defined for the flags field of a struct powerpc_operand.  */</div><div class='ctx'> </div><div class='ctx'> /* This operand takes signed values.  */</div><div class='del'>-#define PPC_OPERAND_SIGNED (01)</div><div class='add'>+#define PPC_OPERAND_SIGNED (0x1)</div><div class='ctx'> </div><div class='ctx'> /* This operand takes signed values, but also accepts a full positive</div><div class='ctx'>    range of values when running in 32 bit mode.  That is, if bits is</div><div class='ctx'>    16, it takes any value from -0x8000 to 0xffff.  In 64 bit mode,</div><div class='ctx'>    this flag is ignored.  */</div><div class='del'>-#define PPC_OPERAND_SIGNOPT (02)</div><div class='add'>+#define PPC_OPERAND_SIGNOPT (0x2)</div><div class='ctx'> </div><div class='ctx'> /* This operand does not actually exist in the assembler input.  This</div><div class='ctx'>    is used to support extended mnemonics such as mr, for which two</div><div class='hunk'>@@ -223,14 +315,14 @@ extern const struct powerpc_operand powerpc_operands[];</div><div class='ctx'>    insert function with any op value.  The disassembler should call</div><div class='ctx'>    the extract function, ignore the return value, and check the value</div><div class='ctx'>    placed in the valid argument.  */</div><div class='del'>-#define PPC_OPERAND_FAKE (04)</div><div class='add'>+#define PPC_OPERAND_FAKE (0x4)</div><div class='ctx'> </div><div class='ctx'> /* The next operand should be wrapped in parentheses rather than</div><div class='ctx'>    separated from this one by a comma.  This is used for the load and</div><div class='ctx'>    store instructions which want their operands to look like</div><div class='ctx'>        reg,displacement(reg)</div><div class='ctx'>    */</div><div class='del'>-#define PPC_OPERAND_PARENS (010)</div><div class='add'>+#define PPC_OPERAND_PARENS (0x8)</div><div class='ctx'> </div><div class='ctx'> /* This operand may use the symbolic names for the CR fields, which</div><div class='ctx'>    are</div><div class='hunk'>@@ -239,26 +331,26 @@ extern const struct powerpc_operand powerpc_operands[];</div><div class='ctx'>        cr4 4	cr5 5	cr6 6	cr7 7</div><div class='ctx'>    These may be combined arithmetically, as in cr2*4+gt.  These are</div><div class='ctx'>    only supported on the PowerPC, not the POWER.  */</div><div class='del'>-#define PPC_OPERAND_CR (020)</div><div class='add'>+#define PPC_OPERAND_CR_BIT (0x10)</div><div class='ctx'> </div><div class='ctx'> /* This operand names a register.  The disassembler uses this to print</div><div class='ctx'>    register names with a leading 'r'.  */</div><div class='del'>-#define PPC_OPERAND_GPR (040)</div><div class='add'>+#define PPC_OPERAND_GPR (0x20)</div><div class='ctx'> </div><div class='ctx'> /* Like PPC_OPERAND_GPR, but don't print a leading 'r' for r0.  */</div><div class='del'>-#define PPC_OPERAND_GPR_0 (0100)</div><div class='add'>+#define PPC_OPERAND_GPR_0 (0x40)</div><div class='ctx'> </div><div class='ctx'> /* This operand names a floating point register.  The disassembler</div><div class='ctx'>    prints these with a leading 'f'.  */</div><div class='del'>-#define PPC_OPERAND_FPR (0200)</div><div class='add'>+#define PPC_OPERAND_FPR (0x80)</div><div class='ctx'> </div><div class='ctx'> /* This operand is a relative branch displacement.  The disassembler</div><div class='ctx'>    prints these symbolically if possible.  */</div><div class='del'>-#define PPC_OPERAND_RELATIVE (0400)</div><div class='add'>+#define PPC_OPERAND_RELATIVE (0x100)</div><div class='ctx'> </div><div class='ctx'> /* This operand is an absolute branch address.  The disassembler</div><div class='ctx'>    prints these symbolically if possible.  */</div><div class='del'>-#define PPC_OPERAND_ABSOLUTE (01000)</div><div class='add'>+#define PPC_OPERAND_ABSOLUTE (0x200)</div><div class='ctx'> </div><div class='ctx'> /* This operand is optional, and is zero if omitted.  This is used for</div><div class='ctx'>    example, in the optional BF field in the comparison instructions.  The</div><div class='hunk'>@@ -266,7 +358,7 @@ extern const struct powerpc_operand powerpc_operands[];</div><div class='ctx'>    and the number of operands remaining for the opcode, and decide</div><div class='ctx'>    whether this operand is present or not.  The disassembler should</div><div class='ctx'>    print this operand out only if it is not zero.  */</div><div class='del'>-#define PPC_OPERAND_OPTIONAL (02000)</div><div class='add'>+#define PPC_OPERAND_OPTIONAL (0x400)</div><div class='ctx'> </div><div class='ctx'> /* This flag is only used with PPC_OPERAND_OPTIONAL.  If this operand</div><div class='ctx'>    is omitted, then for the next operand use this operand value plus</div><div class='hunk'>@@ -274,24 +366,48 @@ extern const struct powerpc_operand powerpc_operands[];</div><div class='ctx'>    hack is needed because the Power rotate instructions can take</div><div class='ctx'>    either 4 or 5 operands.  The disassembler should print this operand</div><div class='ctx'>    out regardless of the PPC_OPERAND_OPTIONAL field.  */</div><div class='del'>-#define PPC_OPERAND_NEXT (04000)</div><div class='add'>+#define PPC_OPERAND_NEXT (0x800)</div><div class='ctx'> </div><div class='ctx'> /* This operand should be regarded as a negative number for the</div><div class='ctx'>    purposes of overflow checking (i.e., the normal most negative</div><div class='ctx'>    number is disallowed and one more than the normal most positive</div><div class='ctx'>    number is allowed).  This flag will only be set for a signed</div><div class='ctx'>    operand.  */</div><div class='del'>-#define PPC_OPERAND_NEGATIVE (010000)</div><div class='add'>+#define PPC_OPERAND_NEGATIVE (0x1000)</div><div class='ctx'> </div><div class='ctx'> /* This operand names a vector unit register.  The disassembler</div><div class='ctx'>    prints these with a leading 'v'.  */</div><div class='del'>-#define PPC_OPERAND_VR (020000)</div><div class='add'>+#define PPC_OPERAND_VR (0x2000)</div><div class='ctx'> </div><div class='ctx'> /* This operand is for the DS field in a DS form instruction.  */</div><div class='del'>-#define PPC_OPERAND_DS (040000)</div><div class='add'>+#define PPC_OPERAND_DS (0x4000)</div><div class='ctx'> </div><div class='ctx'> /* This operand is for the DQ field in a DQ form instruction.  */</div><div class='del'>-#define PPC_OPERAND_DQ (0100000)</div><div class='add'>+#define PPC_OPERAND_DQ (0x8000)</div><div class='add'>+</div><div class='add'>+/* Valid range of operand is 0..n rather than 0..n-1.  */</div><div class='add'>+#define PPC_OPERAND_PLUS1 (0x10000)</div><div class='add'>+</div><div class='add'>+/* Xilinx APU and FSL related operands */</div><div class='add'>+#define PPC_OPERAND_FSL (0x20000)</div><div class='add'>+#define PPC_OPERAND_FCR (0x40000)</div><div class='add'>+#define PPC_OPERAND_UDI (0x80000)</div><div class='add'>+</div><div class='add'>+/* This operand names a vector-scalar unit register.  The disassembler</div><div class='add'>+   prints these with a leading 'vs'.  */</div><div class='add'>+#define PPC_OPERAND_VSR (0x100000)</div><div class='add'>+</div><div class='add'>+/* This is a CR FIELD that does not use symbolic names.  */</div><div class='add'>+#define PPC_OPERAND_CR_REG (0x200000)</div><div class='add'>+</div><div class='add'>+/* This flag is only used with PPC_OPERAND_OPTIONAL.  If this operand</div><div class='add'>+   is omitted, then the value it should use for the operand is stored</div><div class='add'>+   in the SHIFT field of the immediatly following operand field.  */</div><div class='add'>+#define PPC_OPERAND_OPTIONAL_VALUE (0x400000)</div><div class='add'>+</div><div class='add'>+/* This flag is only used with PPC_OPERAND_OPTIONAL.  The operand is</div><div class='add'>+   only optional when generating 32-bit code.  */</div><div class='add'>+#define PPC_OPERAND_OPTIONAL32 (0x800000)</div><div class='ctx'> </div><div class='ctx'> /* The POWER and PowerPC assemblers use a few macros.  We keep them</div><div class='ctx'>    with the operands table for simplicity.  The macro table is an</div><div class='hunk'>@@ -308,7 +424,7 @@ struct powerpc_macro</div><div class='ctx'>   /* One bit flags for the opcode.  These are used to indicate which</div><div class='ctx'>      specific processors support the instructions.  The values are the</div><div class='ctx'>      same as those for the struct powerpc_opcode flags field.  */</div><div class='del'>-  unsigned long flags;</div><div class='add'>+  ppc_cpu_t flags;</div><div class='ctx'> </div><div class='ctx'>   /* A format string to turn the macro into a normal instruction.</div><div class='ctx'>      Each %N in the string is replaced with operand number N (zero</div><div class='hunk'>@@ -319,4 +435,18 @@ struct powerpc_macro</div><div class='ctx'> extern const struct powerpc_macro powerpc_macros[];</div><div class='ctx'> extern const int powerpc_num_macros;</div><div class='ctx'> </div><div class='add'>+extern ppc_cpu_t ppc_parse_cpu (ppc_cpu_t, ppc_cpu_t *, const char *);</div><div class='add'>+</div><div class='add'>+static inline long</div><div class='add'>+ppc_optional_operand_value (const struct powerpc_operand *operand)</div><div class='add'>+{</div><div class='add'>+  if ((operand-&gt;flags &amp; PPC_OPERAND_OPTIONAL_VALUE) != 0)</div><div class='add'>+    return (operand+1)-&gt;shift;</div><div class='add'>+  return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef __cplusplus</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* PPC_H */</div><div class='head'>diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c<br/>index 760545519a0b..16321ad9e70c 100644<br/>--- a/<a href='/drm-misc/tree/arch/powerpc/xmon/xmon.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/powerpc/xmon/xmon.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/powerpc/xmon/xmon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/powerpc/xmon/xmon.c</a></div><div class='hunk'>@@ -10,8 +10,10 @@</div><div class='ctx'>  *      as published by the Free Software Foundation; either version</div><div class='ctx'>  *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='hunk'>@@ -210,6 +212,10 @@ Commands:\n\</div><div class='ctx'>   "\</div><div class='ctx'>   C	checksum\n\</div><div class='ctx'>   d	dump bytes\n\</div><div class='add'>+  d1	dump 1 byte values\n\</div><div class='add'>+  d2	dump 2 byte values\n\</div><div class='add'>+  d4	dump 4 byte values\n\</div><div class='add'>+  d8	dump 8 byte values\n\</div><div class='ctx'>   di	dump instructions\n\</div><div class='ctx'>   df	dump float values\n\</div><div class='ctx'>   dd	dump double values\n\</div><div class='hunk'>@@ -225,6 +231,7 @@ Commands:\n\</div><div class='ctx'> #endif</div><div class='ctx'>   "\</div><div class='ctx'>   dr	dump stream of raw bytes\n\</div><div class='add'>+  dt	dump the tracing buffers (uses printk)\n\</div><div class='ctx'>   e	print exception information\n\</div><div class='ctx'>   f	flush cache\n\</div><div class='ctx'>   la	lookup symbol+offset of specified address\n\</div><div class='hunk'>@@ -913,7 +920,7 @@ cmds(struct pt_regs *excp)</div><div class='ctx'> 				memzcan();</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 'i':</div><div class='del'>-				show_mem(0);</div><div class='add'>+				show_mem(0, NULL);</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				termch = cmd;</div><div class='hunk'>@@ -1400,7 +1407,7 @@ static void xmon_show_stack(unsigned long sp, unsigned long lr,</div><div class='ctx'> 	struct pt_regs regs;</div><div class='ctx'> </div><div class='ctx'> 	while (max_to_print--) {</div><div class='del'>-		if (sp &lt; PAGE_OFFSET) {</div><div class='add'>+		if (!is_kernel_addr(sp)) {</div><div class='ctx'> 			if (sp != 0)</div><div class='ctx'> 				printf("SP (%lx) is in userspace\n", sp);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1428,12 +1435,12 @@ static void xmon_show_stack(unsigned long sp, unsigned long lr,</div><div class='ctx'> 				mread(newsp + LRSAVE_OFFSET, &amp;nextip,</div><div class='ctx'> 				      sizeof(unsigned long));</div><div class='ctx'> 			if (lr == ip) {</div><div class='del'>-				if (lr &lt; PAGE_OFFSET</div><div class='add'>+				if (!is_kernel_addr(lr)</div><div class='ctx'> 				    || (fnstart &lt;= lr &amp;&amp; lr &lt; fnend))</div><div class='ctx'> 					printip = 0;</div><div class='ctx'> 			} else if (lr == nextip) {</div><div class='ctx'> 				printip = 0;</div><div class='del'>-			} else if (lr &gt;= PAGE_OFFSET</div><div class='add'>+			} else if (is_kernel_addr(lr)</div><div class='ctx'> 				   &amp;&amp; !(fnstart &lt;= lr &amp;&amp; lr &lt; fnend)) {</div><div class='ctx'> 				printf("[link register   ] ");</div><div class='ctx'> 				xmon_print_symbol(lr, " ", "\n");</div><div class='hunk'>@@ -1493,7 +1500,7 @@ static void print_bug_trap(struct pt_regs *regs)</div><div class='ctx'> 	if (regs-&gt;msr &amp; MSR_PR)</div><div class='ctx'> 		return;		/* not in kernel */</div><div class='ctx'> 	addr = regs-&gt;nip;	/* address of trap instruction */</div><div class='del'>-	if (addr &lt; PAGE_OFFSET)</div><div class='add'>+	if (!is_kernel_addr(addr))</div><div class='ctx'> 		return;</div><div class='ctx'> 	bug = find_bug(regs-&gt;nip);</div><div class='ctx'> 	if (bug == NULL)</div><div class='hunk'>@@ -2284,14 +2291,14 @@ static void dump_one_paca(int cpu)</div><div class='ctx'> 	DUMP(p, subcore_sibling_mask, "x");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	DUMP(p, accounting.user_time, "llx");</div><div class='del'>-	DUMP(p, accounting.system_time, "llx");</div><div class='del'>-	DUMP(p, accounting.user_time_scaled, "llx");</div><div class='add'>+	DUMP(p, accounting.utime, "llx");</div><div class='add'>+	DUMP(p, accounting.stime, "llx");</div><div class='add'>+	DUMP(p, accounting.utime_scaled, "llx");</div><div class='ctx'> 	DUMP(p, accounting.starttime, "llx");</div><div class='ctx'> 	DUMP(p, accounting.starttime_user, "llx");</div><div class='ctx'> 	DUMP(p, accounting.startspurr, "llx");</div><div class='ctx'> 	DUMP(p, accounting.utime_sspurr, "llx");</div><div class='del'>-	DUMP(p, stolen_time, "llx");</div><div class='add'>+	DUMP(p, accounting.steal_time, "llx");</div><div class='ctx'> #undef DUMP</div><div class='ctx'> </div><div class='ctx'> 	catch_memory_errors = 0;</div><div class='hunk'>@@ -2331,9 +2338,42 @@ static void dump_pacas(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void dump_by_size(unsigned long addr, long count, int size)</div><div class='add'>+{</div><div class='add'>+	unsigned char temp[16];</div><div class='add'>+	int i, j;</div><div class='add'>+	u64 val;</div><div class='add'>+</div><div class='add'>+	count = ALIGN(count, 16);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i += 16, addr += 16) {</div><div class='add'>+		printf(REG, addr);</div><div class='add'>+</div><div class='add'>+		if (mread(addr, temp, 16) != 16) {</div><div class='add'>+			printf("\nFaulted reading %d bytes from 0x"REG"\n", 16, addr);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; 16; j += size) {</div><div class='add'>+			putchar(' ');</div><div class='add'>+			switch (size) {</div><div class='add'>+			case 1: val = temp[j]; break;</div><div class='add'>+			case 2: val = *(u16 *)&amp;temp[j]; break;</div><div class='add'>+			case 4: val = *(u32 *)&amp;temp[j]; break;</div><div class='add'>+			case 8: val = *(u64 *)&amp;temp[j]; break;</div><div class='add'>+			default: val = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			printf("%0*lx", size * 2, val);</div><div class='add'>+		}</div><div class='add'>+		printf("\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> dump(void)</div><div class='ctx'> {</div><div class='add'>+	static char last[] = { "d?\n" };</div><div class='ctx'> 	int c;</div><div class='ctx'> </div><div class='ctx'> 	c = inchar();</div><div class='hunk'>@@ -2347,8 +2387,9 @@ dump(void)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if ((isxdigit(c) &amp;&amp; c != 'f' &amp;&amp; c != 'd') || c == '\n')</div><div class='add'>+	if (c == '\n')</div><div class='ctx'> 		termch = c;</div><div class='add'>+</div><div class='ctx'> 	scanhex((void *)&amp;adrs);</div><div class='ctx'> 	if (termch != '\n')</div><div class='ctx'> 		termch = 0;</div><div class='hunk'>@@ -2364,6 +2405,9 @@ dump(void)</div><div class='ctx'> 		dump_log_buf();</div><div class='ctx'> 	} else if (c == 'o') {</div><div class='ctx'> 		dump_opal_msglog();</div><div class='add'>+	} else if (c == 't') {</div><div class='add'>+		ftrace_dump(DUMP_ALL);</div><div class='add'>+		tracing_on();</div><div class='ctx'> 	} else if (c == 'r') {</div><div class='ctx'> 		scanhex(&amp;ndump);</div><div class='ctx'> 		if (ndump == 0)</div><div class='hunk'>@@ -2377,9 +2421,23 @@ dump(void)</div><div class='ctx'> 			ndump = 64;</div><div class='ctx'> 		else if (ndump &gt; MAX_DUMP)</div><div class='ctx'> 			ndump = MAX_DUMP;</div><div class='del'>-		prdump(adrs, ndump);</div><div class='add'>+</div><div class='add'>+		switch (c) {</div><div class='add'>+		case '8':</div><div class='add'>+		case '4':</div><div class='add'>+		case '2':</div><div class='add'>+		case '1':</div><div class='add'>+			ndump = ALIGN(ndump, 16);</div><div class='add'>+			dump_by_size(adrs, ndump, c - '0');</div><div class='add'>+			last[1] = c;</div><div class='add'>+			last_cmd = last;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			prdump(adrs, ndump);</div><div class='add'>+			last_cmd = "d\n";</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		adrs += ndump;</div><div class='del'>-		last_cmd = "d\n";</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig<br/>index 426481d4cc86..a2dcef0aacc7 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/Kconfig</a></div><div class='hunk'>@@ -62,9 +62,6 @@ config PCI_QUIRKS</div><div class='ctx'> config ARCH_SUPPORTS_UPROBES</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config DEBUG_RODATA</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config S390</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	select ARCH_HAS_DEVMEM_IS_ALLOWED</div><div class='hunk'>@@ -72,7 +69,10 @@ config S390</div><div class='ctx'> 	select ARCH_HAS_GCOV_PROFILE_ALL</div><div class='ctx'> 	select ARCH_HAS_GIGANTIC_PAGE</div><div class='ctx'> 	select ARCH_HAS_KCOV</div><div class='add'>+	select ARCH_HAS_SET_MEMORY</div><div class='ctx'> 	select ARCH_HAS_SG_CHAIN</div><div class='add'>+	select ARCH_HAS_STRICT_KERNEL_RWX</div><div class='add'>+	select ARCH_HAS_STRICT_MODULE_RWX</div><div class='ctx'> 	select ARCH_HAS_UBSAN_SANITIZE_ALL</div><div class='ctx'> 	select ARCH_HAVE_NMI_SAFE_CMPXCHG</div><div class='ctx'> 	select ARCH_INLINE_READ_LOCK</div><div class='hunk'>@@ -134,8 +134,11 @@ config S390</div><div class='ctx'> 	select HAVE_EBPF_JIT if PACK_STACK &amp;&amp; HAVE_MARCH_Z196_FEATURES</div><div class='ctx'> 	select HAVE_CMPXCHG_DOUBLE</div><div class='ctx'> 	select HAVE_CMPXCHG_LOCAL</div><div class='add'>+	select HAVE_COPY_THREAD_TLS</div><div class='ctx'> 	select HAVE_DEBUG_KMEMLEAK</div><div class='ctx'> 	select HAVE_DMA_API_DEBUG</div><div class='add'>+	select HAVE_DMA_CONTIGUOUS</div><div class='add'>+	select DMA_NOOP_OPS</div><div class='ctx'> 	select HAVE_DYNAMIC_FTRACE</div><div class='ctx'> 	select HAVE_DYNAMIC_FTRACE_WITH_REGS</div><div class='ctx'> 	select HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='hunk'>@@ -169,8 +172,10 @@ config S390</div><div class='ctx'> 	select OLD_SIGSUSPEND3</div><div class='ctx'> 	select SPARSE_IRQ</div><div class='ctx'> 	select SYSCTL_EXCEPTION_TRACE</div><div class='add'>+	select THREAD_INFO_IN_TASK</div><div class='ctx'> 	select TTY</div><div class='ctx'> 	select VIRT_CPU_ACCOUNTING</div><div class='add'>+	select ARCH_HAS_SCALED_CPUTIME</div><div class='ctx'> 	select VIRT_TO_BUS</div><div class='ctx'> 	select HAVE_NMI</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/Kconfig.debug b/arch/s390/Kconfig.debug<br/>index 26c5d5beb4be..ba5f878a295c 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/Kconfig.debug?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/Kconfig.debug</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/Kconfig.debug</a></div><div class='hunk'>@@ -17,7 +17,7 @@ config S390_PTDUMP</div><div class='ctx'> 	  kernel.</div><div class='ctx'> 	  If in doubt, say "N"</div><div class='ctx'> </div><div class='del'>-config DEBUG_SET_MODULE_RONX</div><div class='add'>+config EARLY_PRINTK</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on MODULES</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c<br/>index f587c4811faf..ef3fb1b9201f 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/appldata/appldata_base.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/appldata/appldata_base.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/appldata/appldata_base.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/appldata/appldata_base.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/stat.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -28,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/appldata.h&gt;</div><div class='ctx'> #include &lt;asm/vtimer.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c<br/>index 69b23b25ac34..45b3178200ab 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/appldata/appldata_os.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/appldata/appldata_os.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/appldata/appldata_os.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/appldata/appldata_os.c</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/loadavg.h&gt;</div><div class='add'>+#include &lt;linux/sched/stat.h&gt;</div><div class='ctx'> #include &lt;asm/appldata.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -113,21 +115,21 @@ static void appldata_get_os_data(void *data)</div><div class='ctx'> 	j = 0;</div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='ctx'> 		os_data-&gt;os_cpu[j].per_cpu_user =</div><div class='del'>-			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_USER]);</div><div class='add'>+			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_USER]);</div><div class='ctx'> 		os_data-&gt;os_cpu[j].per_cpu_nice =</div><div class='del'>-			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_NICE]);</div><div class='add'>+			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_NICE]);</div><div class='ctx'> 		os_data-&gt;os_cpu[j].per_cpu_system =</div><div class='del'>-			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM]);</div><div class='add'>+			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM]);</div><div class='ctx'> 		os_data-&gt;os_cpu[j].per_cpu_idle =</div><div class='del'>-			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IDLE]);</div><div class='add'>+			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IDLE]);</div><div class='ctx'> 		os_data-&gt;os_cpu[j].per_cpu_irq =</div><div class='del'>-			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IRQ]);</div><div class='add'>+			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IRQ]);</div><div class='ctx'> 		os_data-&gt;os_cpu[j].per_cpu_softirq =</div><div class='del'>-			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ]);</div><div class='add'>+			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ]);</div><div class='ctx'> 		os_data-&gt;os_cpu[j].per_cpu_iowait =</div><div class='del'>-			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IOWAIT]);</div><div class='add'>+			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IOWAIT]);</div><div class='ctx'> 		os_data-&gt;os_cpu[j].per_cpu_steal =</div><div class='del'>-			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_STEAL]);</div><div class='add'>+			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_STEAL]);</div><div class='ctx'> 		os_data-&gt;os_cpu[j].cpu_id = i;</div><div class='ctx'> 		j++;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile<br/>index 0daa070d6c9d..f7e4c834ea24 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/boot/compressed/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/boot/compressed/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/boot/compressed/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/boot/compressed/Makefile</a></div><div class='hunk'>@@ -10,7 +10,7 @@ targets	:= vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2</div><div class='ctx'> targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4</div><div class='ctx'> targets += misc.o piggy.o sizes.h head.o</div><div class='ctx'> </div><div class='del'>-KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUX_INCLUDE) -O2</div><div class='add'>+KBUILD_CFLAGS := -m64 -D__KERNEL__ -O2</div><div class='ctx'> KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING</div><div class='ctx'> KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -msoft-float</div><div class='ctx'> KBUILD_CFLAGS += $(call cc-option,-mpacked-stack)</div><div class='hunk'>@@ -19,7 +19,8 @@ KBUILD_CFLAGS += $(call cc-option,-ffreestanding)</div><div class='ctx'> GCOV_PROFILE := n</div><div class='ctx'> UBSAN_SANITIZE := n</div><div class='ctx'> </div><div class='del'>-OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o sclp.o ebcdic.o als.o)</div><div class='add'>+OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o ebcdic.o als.o)</div><div class='add'>+OBJECTS += $(objtree)/drivers/s390/char/sclp_early_core.o</div><div class='ctx'> OBJECTS += $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o</div><div class='ctx'> </div><div class='ctx'> LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup -T</div><div class='head'>diff --git a/arch/s390/boot/compressed/head.S b/arch/s390/boot/compressed/head.S<br/>index 28c4f96a2d9c..11f6254c561e 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/boot/compressed/head.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/boot/compressed/head.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/boot/compressed/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/boot/compressed/head.S</a></div><div class='hunk'>@@ -46,7 +46,7 @@ mover_end:</div><div class='ctx'> </div><div class='ctx'> 	.align	8</div><div class='ctx'> .Lstack:</div><div class='del'>-	.quad	0x8000 + (1&lt;&lt;(PAGE_SHIFT+THREAD_ORDER))</div><div class='add'>+	.quad	0x8000 + (1&lt;&lt;(PAGE_SHIFT+THREAD_SIZE_ORDER))</div><div class='ctx'> .Loffset:</div><div class='ctx'> 	.quad	0x11000</div><div class='ctx'> .Lmvsize:</div><div class='head'>diff --git a/arch/s390/boot/compressed/misc.c b/arch/s390/boot/compressed/misc.c<br/>index 4da604ebf6fd..fa95041fa9f6 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/boot/compressed/misc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/boot/compressed/misc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/boot/compressed/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/boot/compressed/misc.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * Author(s): Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/sclp.h&gt;</div><div class='ctx'> #include &lt;asm/ipl.h&gt;</div><div class='hunk'>@@ -66,7 +66,7 @@ static unsigned long free_mem_end_ptr;</div><div class='ctx'> </div><div class='ctx'> static int puts(const char *s)</div><div class='ctx'> {</div><div class='del'>-	_sclp_print_early(s);</div><div class='add'>+	sclp_early_printk(s);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig<br/>index 45968686f918..143b1e00b818 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/configs/default_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/configs/default_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/configs/default_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/configs/default_defconfig</a></div><div class='hunk'>@@ -66,8 +66,10 @@ CONFIG_TRANSPARENT_HUGEPAGE=y</div><div class='ctx'> CONFIG_CLEANCACHE=y</div><div class='ctx'> CONFIG_FRONTSWAP=y</div><div class='ctx'> CONFIG_CMA=y</div><div class='add'>+CONFIG_CMA_DEBUG=y</div><div class='add'>+CONFIG_CMA_DEBUGFS=y</div><div class='ctx'> CONFIG_MEM_SOFT_DIRTY=y</div><div class='del'>-CONFIG_ZPOOL=m</div><div class='add'>+CONFIG_ZSWAP=y</div><div class='ctx'> CONFIG_ZBUD=m</div><div class='ctx'> CONFIG_ZSMALLOC=m</div><div class='ctx'> CONFIG_ZSMALLOC_STAT=y</div><div class='hunk'>@@ -139,8 +141,6 @@ CONFIG_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_TIMEOUT=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_TIMESTAMP=y</div><div class='del'>-CONFIG_NF_CT_PROTO_DCCP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -157,13 +157,12 @@ CONFIG_NF_TABLES=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='del'>-CONFIG_NFT_RBTREE=m</div><div class='del'>-CONFIG_NFT_HASH=m</div><div class='ctx'> CONFIG_NFT_COUNTER=m</div><div class='ctx'> CONFIG_NFT_LOG=m</div><div class='ctx'> CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='add'>+CONFIG_NFT_HASH=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_AUDIT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m</div><div class='hunk'>@@ -217,7 +216,6 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_RATEEST=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_RECENT=m</div><div class='del'>-CONFIG_NETFILTER_XT_MATCH_SOCKET=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATE=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='hunk'>@@ -256,7 +254,6 @@ CONFIG_IP_VS_NQ=m</div><div class='ctx'> CONFIG_IP_VS_FTP=m</div><div class='ctx'> CONFIG_IP_VS_PE_SIP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='del'>-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set</div><div class='ctx'> CONFIG_NF_TABLES_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='hunk'>@@ -366,6 +363,8 @@ CONFIG_BPF_JIT=y</div><div class='ctx'> CONFIG_NET_PKTGEN=m</div><div class='ctx'> CONFIG_NET_TCPPROBE=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='add'>+CONFIG_DMA_CMA=y</div><div class='add'>+CONFIG_CMA_SIZE_MBYTES=0</div><div class='ctx'> CONFIG_CONNECTOR=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=m</div><div class='ctx'> CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='hunk'>@@ -432,13 +431,11 @@ CONFIG_EQUALIZER=m</div><div class='ctx'> CONFIG_IFB=m</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='ctx'> CONFIG_MACVTAP=m</div><div class='del'>-CONFIG_IPVLAN=m</div><div class='ctx'> CONFIG_VXLAN=m</div><div class='ctx'> CONFIG_TUN=m</div><div class='ctx'> CONFIG_VETH=m</div><div class='ctx'> CONFIG_VIRTIO_NET=m</div><div class='ctx'> CONFIG_NLMON=m</div><div class='del'>-CONFIG_VHOST_NET=m</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_CHELSIO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_INTEL is not set</div><div class='hunk'>@@ -477,6 +474,7 @@ CONFIG_VIRTIO_BALLOON=m</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_EXT4_FS_SECURITY=y</div><div class='add'>+CONFIG_EXT4_ENCRYPTION=y</div><div class='ctx'> CONFIG_JBD2_DEBUG=y</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_JFS_POSIX_ACL=y</div><div class='hunk'>@@ -589,14 +587,12 @@ CONFIG_LOCK_STAT=y</div><div class='ctx'> CONFIG_DEBUG_LOCKDEP=y</div><div class='ctx'> CONFIG_DEBUG_ATOMIC_SLEEP=y</div><div class='ctx'> CONFIG_DEBUG_LOCKING_API_SELFTESTS=y</div><div class='del'>-CONFIG_DEBUG_LIST=y</div><div class='ctx'> CONFIG_DEBUG_SG=y</div><div class='ctx'> CONFIG_DEBUG_NOTIFIERS=y</div><div class='ctx'> CONFIG_DEBUG_CREDENTIALS=y</div><div class='ctx'> CONFIG_RCU_TORTURE_TEST=m</div><div class='ctx'> CONFIG_RCU_CPU_STALL_TIMEOUT=300</div><div class='ctx'> CONFIG_NOTIFIER_ERROR_INJECTION=m</div><div class='del'>-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m</div><div class='ctx'> CONFIG_PM_NOTIFIER_ERROR_INJECT=m</div><div class='ctx'> CONFIG_FAULT_INJECTION=y</div><div class='ctx'> CONFIG_FAILSLAB=y</div><div class='hunk'>@@ -615,6 +611,7 @@ CONFIG_STACK_TRACER=y</div><div class='ctx'> CONFIG_BLK_DEV_IO_TRACE=y</div><div class='ctx'> CONFIG_UPROBE_EVENT=y</div><div class='ctx'> CONFIG_FUNCTION_PROFILER=y</div><div class='add'>+CONFIG_HIST_TRIGGERS=y</div><div class='ctx'> CONFIG_TRACE_ENUM_MAP_FILE=y</div><div class='ctx'> CONFIG_LKDTM=m</div><div class='ctx'> CONFIG_TEST_LIST_SORT=y</div><div class='hunk'>@@ -627,6 +624,7 @@ CONFIG_TEST_STRING_HELPERS=y</div><div class='ctx'> CONFIG_TEST_KSTRTOX=y</div><div class='ctx'> CONFIG_DMA_API_DEBUG=y</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='add'>+CONFIG_BUG_ON_DATA_CORRUPTION=y</div><div class='ctx'> CONFIG_S390_PTDUMP=y</div><div class='ctx'> CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_SECURITY=y</div><div class='hunk'>@@ -637,16 +635,18 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0</div><div class='ctx'> CONFIG_SECURITY_SELINUX_DISABLE=y</div><div class='ctx'> CONFIG_IMA=y</div><div class='ctx'> CONFIG_IMA_APPRAISE=y</div><div class='add'>+CONFIG_CRYPTO_RSA=m</div><div class='add'>+CONFIG_CRYPTO_DH=m</div><div class='add'>+CONFIG_CRYPTO_ECDH=m</div><div class='ctx'> CONFIG_CRYPTO_USER=m</div><div class='del'>-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set</div><div class='ctx'> CONFIG_CRYPTO_CRYPTD=m</div><div class='ctx'> CONFIG_CRYPTO_TEST=m</div><div class='ctx'> CONFIG_CRYPTO_CCM=m</div><div class='ctx'> CONFIG_CRYPTO_GCM=m</div><div class='del'>-CONFIG_CRYPTO_CTS=m</div><div class='add'>+CONFIG_CRYPTO_CHACHA20POLY1305=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='del'>-CONFIG_CRYPTO_XTS=m</div><div class='add'>+CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='ctx'> CONFIG_CRYPTO_VMAC=m</div><div class='ctx'> CONFIG_CRYPTO_CRC32=m</div><div class='hunk'>@@ -670,12 +670,15 @@ CONFIG_CRYPTO_SEED=m</div><div class='ctx'> CONFIG_CRYPTO_SERPENT=m</div><div class='ctx'> CONFIG_CRYPTO_TEA=m</div><div class='ctx'> CONFIG_CRYPTO_TWOFISH=m</div><div class='del'>-CONFIG_CRYPTO_LZO=m</div><div class='add'>+CONFIG_CRYPTO_842=m</div><div class='ctx'> CONFIG_CRYPTO_LZ4=m</div><div class='ctx'> CONFIG_CRYPTO_LZ4HC=m</div><div class='ctx'> CONFIG_CRYPTO_USER_API_HASH=m</div><div class='ctx'> CONFIG_CRYPTO_USER_API_SKCIPHER=m</div><div class='add'>+CONFIG_CRYPTO_USER_API_RNG=m</div><div class='add'>+CONFIG_CRYPTO_USER_API_AEAD=m</div><div class='ctx'> CONFIG_ZCRYPT=m</div><div class='add'>+CONFIG_PKEY=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1_S390=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256_S390=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512_S390=m</div><div class='hunk'>@@ -693,3 +696,4 @@ CONFIG_CMM=m</div><div class='ctx'> CONFIG_APPLDATA_BASE=y</div><div class='ctx'> CONFIG_KVM=m</div><div class='ctx'> CONFIG_KVM_S390_UCONTROL=y</div><div class='add'>+CONFIG_VHOST_NET=m</div><div class='head'>diff --git a/arch/s390/configs/gcov_defconfig b/arch/s390/configs/gcov_defconfig<br/>index 1dd05e345c4d..f05d2d6e1087 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/configs/gcov_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/configs/gcov_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/configs/gcov_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/configs/gcov_defconfig</a></div><div class='hunk'>@@ -12,6 +12,7 @@ CONFIG_TASK_IO_ACCOUNTING=y</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='ctx'> CONFIG_NUMA_BALANCING=y</div><div class='add'>+# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set</div><div class='ctx'> CONFIG_MEMCG=y</div><div class='ctx'> CONFIG_MEMCG_SWAP=y</div><div class='ctx'> CONFIG_BLK_CGROUP=y</div><div class='hunk'>@@ -54,8 +55,9 @@ CONFIG_SOLARIS_X86_PARTITION=y</div><div class='ctx'> CONFIG_UNIXWARE_DISKLABEL=y</div><div class='ctx'> CONFIG_CFQ_GROUP_IOSCHED=y</div><div class='ctx'> CONFIG_DEFAULT_DEADLINE=y</div><div class='add'>+CONFIG_LIVEPATCH=y</div><div class='ctx'> CONFIG_TUNE_ZEC12=y</div><div class='del'>-CONFIG_NR_CPUS=256</div><div class='add'>+CONFIG_NR_CPUS=512</div><div class='ctx'> CONFIG_NUMA=y</div><div class='ctx'> CONFIG_HZ_100=y</div><div class='ctx'> CONFIG_MEMORY_HOTPLUG=y</div><div class='hunk'>@@ -65,6 +67,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y</div><div class='ctx'> CONFIG_CLEANCACHE=y</div><div class='ctx'> CONFIG_FRONTSWAP=y</div><div class='ctx'> CONFIG_CMA=y</div><div class='add'>+CONFIG_MEM_SOFT_DIRTY=y</div><div class='ctx'> CONFIG_ZSWAP=y</div><div class='ctx'> CONFIG_ZBUD=m</div><div class='ctx'> CONFIG_ZSMALLOC=m</div><div class='hunk'>@@ -136,8 +139,6 @@ CONFIG_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_TIMEOUT=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_TIMESTAMP=y</div><div class='del'>-CONFIG_NF_CT_PROTO_DCCP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -154,13 +155,12 @@ CONFIG_NF_TABLES=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='del'>-CONFIG_NFT_RBTREE=m</div><div class='del'>-CONFIG_NFT_HASH=m</div><div class='ctx'> CONFIG_NFT_COUNTER=m</div><div class='ctx'> CONFIG_NFT_LOG=m</div><div class='ctx'> CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='add'>+CONFIG_NFT_HASH=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_AUDIT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m</div><div class='hunk'>@@ -214,7 +214,6 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_RATEEST=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_RECENT=m</div><div class='del'>-CONFIG_NETFILTER_XT_MATCH_SOCKET=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATE=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='hunk'>@@ -253,7 +252,6 @@ CONFIG_IP_VS_NQ=m</div><div class='ctx'> CONFIG_IP_VS_FTP=m</div><div class='ctx'> CONFIG_IP_VS_PE_SIP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='del'>-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set</div><div class='ctx'> CONFIG_NF_TABLES_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='hunk'>@@ -362,6 +360,8 @@ CONFIG_BPF_JIT=y</div><div class='ctx'> CONFIG_NET_PKTGEN=m</div><div class='ctx'> CONFIG_NET_TCPPROBE=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='add'>+CONFIG_DMA_CMA=y</div><div class='add'>+CONFIG_CMA_SIZE_MBYTES=0</div><div class='ctx'> CONFIG_CONNECTOR=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=m</div><div class='ctx'> CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='hunk'>@@ -428,13 +428,11 @@ CONFIG_EQUALIZER=m</div><div class='ctx'> CONFIG_IFB=m</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='ctx'> CONFIG_MACVTAP=m</div><div class='del'>-CONFIG_IPVLAN=m</div><div class='ctx'> CONFIG_VXLAN=m</div><div class='ctx'> CONFIG_TUN=m</div><div class='ctx'> CONFIG_VETH=m</div><div class='ctx'> CONFIG_VIRTIO_NET=m</div><div class='ctx'> CONFIG_NLMON=m</div><div class='del'>-CONFIG_VHOST_NET=m</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_CHELSIO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_INTEL is not set</div><div class='hunk'>@@ -459,6 +457,7 @@ CONFIG_HW_RANDOM_VIRTIO=m</div><div class='ctx'> CONFIG_RAW_DRIVER=m</div><div class='ctx'> CONFIG_HANGCHECK_TIMER=m</div><div class='ctx'> CONFIG_TN3270_FS=y</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='ctx'> CONFIG_SOFT_WATCHDOG=m</div><div class='hunk'>@@ -472,6 +471,7 @@ CONFIG_VIRTIO_BALLOON=m</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_EXT4_FS_SECURITY=y</div><div class='add'>+CONFIG_EXT4_ENCRYPTION=y</div><div class='ctx'> CONFIG_JBD2_DEBUG=y</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_JFS_POSIX_ACL=y</div><div class='hunk'>@@ -494,6 +494,7 @@ CONFIG_AUTOFS4_FS=m</div><div class='ctx'> CONFIG_FUSE_FS=y</div><div class='ctx'> CONFIG_CUSE=m</div><div class='ctx'> CONFIG_OVERLAY_FS=m</div><div class='add'>+CONFIG_OVERLAY_FS_REDIRECT_DIR=y</div><div class='ctx'> CONFIG_FSCACHE=m</div><div class='ctx'> CONFIG_CACHEFILES=m</div><div class='ctx'> CONFIG_ISO9660_FS=y</div><div class='hunk'>@@ -550,25 +551,27 @@ CONFIG_FRAME_WARN=1024</div><div class='ctx'> CONFIG_UNUSED_SYMBOLS=y</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_MEMORY_INIT=y</div><div class='del'>-CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m</div><div class='ctx'> CONFIG_PANIC_ON_OOPS=y</div><div class='ctx'> CONFIG_TIMER_STATS=y</div><div class='ctx'> CONFIG_RCU_TORTURE_TEST=m</div><div class='ctx'> CONFIG_RCU_CPU_STALL_TIMEOUT=60</div><div class='del'>-CONFIG_NOTIFIER_ERROR_INJECTION=m</div><div class='del'>-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m</div><div class='del'>-CONFIG_PM_NOTIFIER_ERROR_INJECT=m</div><div class='ctx'> CONFIG_LATENCYTOP=y</div><div class='add'>+CONFIG_SCHED_TRACER=y</div><div class='add'>+CONFIG_FTRACE_SYSCALLS=y</div><div class='add'>+CONFIG_STACK_TRACER=y</div><div class='ctx'> CONFIG_BLK_DEV_IO_TRACE=y</div><div class='del'>-# CONFIG_KPROBE_EVENT is not set</div><div class='add'>+CONFIG_UPROBE_EVENT=y</div><div class='add'>+CONFIG_FUNCTION_PROFILER=y</div><div class='add'>+CONFIG_HIST_TRIGGERS=y</div><div class='ctx'> CONFIG_TRACE_ENUM_MAP_FILE=y</div><div class='ctx'> CONFIG_LKDTM=m</div><div class='del'>-CONFIG_RBTREE_TEST=m</div><div class='del'>-CONFIG_INTERVAL_TREE_TEST=m</div><div class='ctx'> CONFIG_PERCPU_TEST=m</div><div class='ctx'> CONFIG_ATOMIC64_SELFTEST=y</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='add'>+CONFIG_BUG_ON_DATA_CORRUPTION=y</div><div class='ctx'> CONFIG_S390_PTDUMP=y</div><div class='add'>+CONFIG_PERSISTENT_KEYRINGS=y</div><div class='add'>+CONFIG_BIG_KEYS=y</div><div class='ctx'> CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_SECURITY=y</div><div class='ctx'> CONFIG_SECURITY_NETWORK=y</div><div class='hunk'>@@ -576,18 +579,25 @@ CONFIG_SECURITY_SELINUX=y</div><div class='ctx'> CONFIG_SECURITY_SELINUX_BOOTPARAM=y</div><div class='ctx'> CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0</div><div class='ctx'> CONFIG_SECURITY_SELINUX_DISABLE=y</div><div class='add'>+CONFIG_INTEGRITY_SIGNATURE=y</div><div class='add'>+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y</div><div class='ctx'> CONFIG_IMA=y</div><div class='add'>+CONFIG_IMA_WRITE_POLICY=y</div><div class='ctx'> CONFIG_IMA_APPRAISE=y</div><div class='add'>+CONFIG_CRYPTO_DH=m</div><div class='add'>+CONFIG_CRYPTO_ECDH=m</div><div class='ctx'> CONFIG_CRYPTO_USER=m</div><div class='ctx'> # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set</div><div class='add'>+CONFIG_CRYPTO_PCRYPT=m</div><div class='ctx'> CONFIG_CRYPTO_CRYPTD=m</div><div class='add'>+CONFIG_CRYPTO_MCRYPTD=m</div><div class='ctx'> CONFIG_CRYPTO_TEST=m</div><div class='ctx'> CONFIG_CRYPTO_CCM=m</div><div class='ctx'> CONFIG_CRYPTO_GCM=m</div><div class='del'>-CONFIG_CRYPTO_CTS=m</div><div class='add'>+CONFIG_CRYPTO_CHACHA20POLY1305=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='del'>-CONFIG_CRYPTO_XTS=m</div><div class='add'>+CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='ctx'> CONFIG_CRYPTO_VMAC=m</div><div class='ctx'> CONFIG_CRYPTO_CRC32=m</div><div class='hunk'>@@ -597,6 +607,7 @@ CONFIG_CRYPTO_RMD160=m</div><div class='ctx'> CONFIG_CRYPTO_RMD256=m</div><div class='ctx'> CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='add'>+CONFIG_CRYPTO_SHA3=m</div><div class='ctx'> CONFIG_CRYPTO_TGR192=m</div><div class='ctx'> CONFIG_CRYPTO_WP512=m</div><div class='ctx'> CONFIG_CRYPTO_ANUBIS=m</div><div class='hunk'>@@ -611,10 +622,13 @@ CONFIG_CRYPTO_SEED=m</div><div class='ctx'> CONFIG_CRYPTO_SERPENT=m</div><div class='ctx'> CONFIG_CRYPTO_TEA=m</div><div class='ctx'> CONFIG_CRYPTO_TWOFISH=m</div><div class='add'>+CONFIG_CRYPTO_842=m</div><div class='ctx'> CONFIG_CRYPTO_LZ4=m</div><div class='ctx'> CONFIG_CRYPTO_LZ4HC=m</div><div class='ctx'> CONFIG_CRYPTO_USER_API_HASH=m</div><div class='ctx'> CONFIG_CRYPTO_USER_API_SKCIPHER=m</div><div class='add'>+CONFIG_CRYPTO_USER_API_RNG=m</div><div class='add'>+CONFIG_CRYPTO_USER_API_AEAD=m</div><div class='ctx'> CONFIG_ZCRYPT=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1_S390=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256_S390=m</div><div class='hunk'>@@ -623,9 +637,6 @@ CONFIG_CRYPTO_DES_S390=m</div><div class='ctx'> CONFIG_CRYPTO_AES_S390=m</div><div class='ctx'> CONFIG_CRYPTO_GHASH_S390=m</div><div class='ctx'> CONFIG_CRYPTO_CRC32_S390=y</div><div class='del'>-CONFIG_ASYMMETRIC_KEY_TYPE=y</div><div class='del'>-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m</div><div class='del'>-CONFIG_X509_CERTIFICATE_PARSER=m</div><div class='ctx'> CONFIG_CRC7=m</div><div class='ctx'> CONFIG_CRC8=m</div><div class='ctx'> CONFIG_CORDIC=m</div><div class='hunk'>@@ -633,3 +644,4 @@ CONFIG_CMM=m</div><div class='ctx'> CONFIG_APPLDATA_BASE=y</div><div class='ctx'> CONFIG_KVM=m</div><div class='ctx'> CONFIG_KVM_S390_UCONTROL=y</div><div class='add'>+CONFIG_VHOST_NET=m</div><div class='head'>diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig<br/>index 29d1178666f0..2358bf33c5ef 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/configs/performance_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/configs/performance_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/configs/performance_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/configs/performance_defconfig</a></div><div class='hunk'>@@ -65,6 +65,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y</div><div class='ctx'> CONFIG_CLEANCACHE=y</div><div class='ctx'> CONFIG_FRONTSWAP=y</div><div class='ctx'> CONFIG_CMA=y</div><div class='add'>+CONFIG_MEM_SOFT_DIRTY=y</div><div class='ctx'> CONFIG_ZSWAP=y</div><div class='ctx'> CONFIG_ZBUD=m</div><div class='ctx'> CONFIG_ZSMALLOC=m</div><div class='hunk'>@@ -136,8 +137,6 @@ CONFIG_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_TIMEOUT=y</div><div class='ctx'> CONFIG_NF_CONNTRACK_TIMESTAMP=y</div><div class='del'>-CONFIG_NF_CT_PROTO_DCCP=m</div><div class='del'>-CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_FTP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_H323=m</div><div class='hunk'>@@ -154,13 +153,12 @@ CONFIG_NF_TABLES=m</div><div class='ctx'> CONFIG_NFT_EXTHDR=m</div><div class='ctx'> CONFIG_NFT_META=m</div><div class='ctx'> CONFIG_NFT_CT=m</div><div class='del'>-CONFIG_NFT_RBTREE=m</div><div class='del'>-CONFIG_NFT_HASH=m</div><div class='ctx'> CONFIG_NFT_COUNTER=m</div><div class='ctx'> CONFIG_NFT_LOG=m</div><div class='ctx'> CONFIG_NFT_LIMIT=m</div><div class='ctx'> CONFIG_NFT_NAT=m</div><div class='ctx'> CONFIG_NFT_COMPAT=m</div><div class='add'>+CONFIG_NFT_HASH=m</div><div class='ctx'> CONFIG_NETFILTER_XT_SET=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_AUDIT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m</div><div class='hunk'>@@ -214,7 +212,6 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_RATEEST=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_RECENT=m</div><div class='del'>-CONFIG_NETFILTER_XT_MATCH_SOCKET=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATE=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='hunk'>@@ -253,7 +250,6 @@ CONFIG_IP_VS_NQ=m</div><div class='ctx'> CONFIG_IP_VS_FTP=m</div><div class='ctx'> CONFIG_IP_VS_PE_SIP=m</div><div class='ctx'> CONFIG_NF_CONNTRACK_IPV4=m</div><div class='del'>-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set</div><div class='ctx'> CONFIG_NF_TABLES_IPV4=m</div><div class='ctx'> CONFIG_NFT_CHAIN_ROUTE_IPV4=m</div><div class='ctx'> CONFIG_NF_TABLES_ARP=m</div><div class='hunk'>@@ -362,6 +358,8 @@ CONFIG_BPF_JIT=y</div><div class='ctx'> CONFIG_NET_PKTGEN=m</div><div class='ctx'> CONFIG_NET_TCPPROBE=m</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='add'>+CONFIG_DMA_CMA=y</div><div class='add'>+CONFIG_CMA_SIZE_MBYTES=0</div><div class='ctx'> CONFIG_CONNECTOR=y</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=m</div><div class='ctx'> CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='hunk'>@@ -428,13 +426,11 @@ CONFIG_EQUALIZER=m</div><div class='ctx'> CONFIG_IFB=m</div><div class='ctx'> CONFIG_MACVLAN=m</div><div class='ctx'> CONFIG_MACVTAP=m</div><div class='del'>-CONFIG_IPVLAN=m</div><div class='ctx'> CONFIG_VXLAN=m</div><div class='ctx'> CONFIG_TUN=m</div><div class='ctx'> CONFIG_VETH=m</div><div class='ctx'> CONFIG_VIRTIO_NET=m</div><div class='ctx'> CONFIG_NLMON=m</div><div class='del'>-CONFIG_VHOST_NET=m</div><div class='ctx'> # CONFIG_NET_VENDOR_ARC is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_CHELSIO is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_INTEL is not set</div><div class='hunk'>@@ -473,6 +469,7 @@ CONFIG_VIRTIO_BALLOON=m</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='ctx'> CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_EXT4_FS_SECURITY=y</div><div class='add'>+CONFIG_EXT4_ENCRYPTION=y</div><div class='ctx'> CONFIG_JBD2_DEBUG=y</div><div class='ctx'> CONFIG_JFS_FS=m</div><div class='ctx'> CONFIG_JFS_POSIX_ACL=y</div><div class='hunk'>@@ -495,6 +492,7 @@ CONFIG_AUTOFS4_FS=m</div><div class='ctx'> CONFIG_FUSE_FS=y</div><div class='ctx'> CONFIG_CUSE=m</div><div class='ctx'> CONFIG_OVERLAY_FS=m</div><div class='add'>+CONFIG_OVERLAY_FS_REDIRECT_DIR=y</div><div class='ctx'> CONFIG_FSCACHE=m</div><div class='ctx'> CONFIG_CACHEFILES=m</div><div class='ctx'> CONFIG_ISO9660_FS=y</div><div class='hunk'>@@ -562,12 +560,16 @@ CONFIG_STACK_TRACER=y</div><div class='ctx'> CONFIG_BLK_DEV_IO_TRACE=y</div><div class='ctx'> CONFIG_UPROBE_EVENT=y</div><div class='ctx'> CONFIG_FUNCTION_PROFILER=y</div><div class='add'>+CONFIG_HIST_TRIGGERS=y</div><div class='ctx'> CONFIG_TRACE_ENUM_MAP_FILE=y</div><div class='ctx'> CONFIG_LKDTM=m</div><div class='ctx'> CONFIG_PERCPU_TEST=m</div><div class='ctx'> CONFIG_ATOMIC64_SELFTEST=y</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='add'>+CONFIG_BUG_ON_DATA_CORRUPTION=y</div><div class='ctx'> CONFIG_S390_PTDUMP=y</div><div class='add'>+CONFIG_PERSISTENT_KEYRINGS=y</div><div class='add'>+CONFIG_BIG_KEYS=y</div><div class='ctx'> CONFIG_ENCRYPTED_KEYS=m</div><div class='ctx'> CONFIG_SECURITY=y</div><div class='ctx'> CONFIG_SECURITY_NETWORK=y</div><div class='hunk'>@@ -575,18 +577,25 @@ CONFIG_SECURITY_SELINUX=y</div><div class='ctx'> CONFIG_SECURITY_SELINUX_BOOTPARAM=y</div><div class='ctx'> CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0</div><div class='ctx'> CONFIG_SECURITY_SELINUX_DISABLE=y</div><div class='add'>+CONFIG_INTEGRITY_SIGNATURE=y</div><div class='add'>+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y</div><div class='ctx'> CONFIG_IMA=y</div><div class='add'>+CONFIG_IMA_WRITE_POLICY=y</div><div class='ctx'> CONFIG_IMA_APPRAISE=y</div><div class='add'>+CONFIG_CRYPTO_DH=m</div><div class='add'>+CONFIG_CRYPTO_ECDH=m</div><div class='ctx'> CONFIG_CRYPTO_USER=m</div><div class='ctx'> # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set</div><div class='add'>+CONFIG_CRYPTO_PCRYPT=m</div><div class='ctx'> CONFIG_CRYPTO_CRYPTD=m</div><div class='add'>+CONFIG_CRYPTO_MCRYPTD=m</div><div class='ctx'> CONFIG_CRYPTO_TEST=m</div><div class='ctx'> CONFIG_CRYPTO_CCM=m</div><div class='ctx'> CONFIG_CRYPTO_GCM=m</div><div class='del'>-CONFIG_CRYPTO_CTS=m</div><div class='add'>+CONFIG_CRYPTO_CHACHA20POLY1305=m</div><div class='ctx'> CONFIG_CRYPTO_LRW=m</div><div class='ctx'> CONFIG_CRYPTO_PCBC=m</div><div class='del'>-CONFIG_CRYPTO_XTS=m</div><div class='add'>+CONFIG_CRYPTO_KEYWRAP=m</div><div class='ctx'> CONFIG_CRYPTO_XCBC=m</div><div class='ctx'> CONFIG_CRYPTO_VMAC=m</div><div class='ctx'> CONFIG_CRYPTO_CRC32=m</div><div class='hunk'>@@ -596,6 +605,7 @@ CONFIG_CRYPTO_RMD160=m</div><div class='ctx'> CONFIG_CRYPTO_RMD256=m</div><div class='ctx'> CONFIG_CRYPTO_RMD320=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512=m</div><div class='add'>+CONFIG_CRYPTO_SHA3=m</div><div class='ctx'> CONFIG_CRYPTO_TGR192=m</div><div class='ctx'> CONFIG_CRYPTO_WP512=m</div><div class='ctx'> CONFIG_CRYPTO_ANUBIS=m</div><div class='hunk'>@@ -610,11 +620,15 @@ CONFIG_CRYPTO_SEED=m</div><div class='ctx'> CONFIG_CRYPTO_SERPENT=m</div><div class='ctx'> CONFIG_CRYPTO_TEA=m</div><div class='ctx'> CONFIG_CRYPTO_TWOFISH=m</div><div class='add'>+CONFIG_CRYPTO_842=m</div><div class='ctx'> CONFIG_CRYPTO_LZ4=m</div><div class='ctx'> CONFIG_CRYPTO_LZ4HC=m</div><div class='ctx'> CONFIG_CRYPTO_USER_API_HASH=m</div><div class='ctx'> CONFIG_CRYPTO_USER_API_SKCIPHER=m</div><div class='add'>+CONFIG_CRYPTO_USER_API_RNG=m</div><div class='add'>+CONFIG_CRYPTO_USER_API_AEAD=m</div><div class='ctx'> CONFIG_ZCRYPT=m</div><div class='add'>+CONFIG_PKEY=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1_S390=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256_S390=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512_S390=m</div><div class='hunk'>@@ -622,9 +636,6 @@ CONFIG_CRYPTO_DES_S390=m</div><div class='ctx'> CONFIG_CRYPTO_AES_S390=m</div><div class='ctx'> CONFIG_CRYPTO_GHASH_S390=m</div><div class='ctx'> CONFIG_CRYPTO_CRC32_S390=y</div><div class='del'>-CONFIG_ASYMMETRIC_KEY_TYPE=y</div><div class='del'>-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m</div><div class='del'>-CONFIG_X509_CERTIFICATE_PARSER=m</div><div class='ctx'> CONFIG_CRC7=m</div><div class='ctx'> CONFIG_CRC8=m</div><div class='ctx'> CONFIG_CORDIC=m</div><div class='hunk'>@@ -632,3 +643,4 @@ CONFIG_CMM=m</div><div class='ctx'> CONFIG_APPLDATA_BASE=y</div><div class='ctx'> CONFIG_KVM=m</div><div class='ctx'> CONFIG_KVM_S390_UCONTROL=y</div><div class='add'>+CONFIG_VHOST_NET=m</div><div class='head'>diff --git a/arch/s390/crypto/Makefile b/arch/s390/crypto/Makefile<br/>index d1033de4c4ee..402c530c6da5 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/crypto/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/crypto/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/crypto/Makefile</a></div><div class='hunk'>@@ -6,7 +6,7 @@ obj-$(CONFIG_CRYPTO_SHA1_S390) += sha1_s390.o sha_common.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256_s390.o sha_common.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SHA512_S390) += sha512_s390.o sha_common.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DES_S390) += des_s390.o</div><div class='del'>-obj-$(CONFIG_CRYPTO_AES_S390) += aes_s390.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_AES_S390) += aes_s390.o paes_s390.o</div><div class='ctx'> obj-$(CONFIG_S390_PRNG) += prng.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_GHASH_S390) += ghash_s390.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_CRC32_S390) += crc32-vx_s390.o</div><div class='head'>diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c<br/>index 303d28eb03a2..591cbdf615af 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/crypto/aes_s390.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/crypto/aes_s390.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/crypto/aes_s390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/crypto/aes_s390.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/fips.h&gt;</div><div class='ctx'> #include &lt;crypto/xts.h&gt;</div><div class='ctx'> #include &lt;asm/cpacf.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -501,6 +502,12 @@ static int xts_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	/* In fips mode only 128 bit or 256 bit keys are valid */</div><div class='add'>+	if (fips_enabled &amp;&amp; key_len != 32 &amp;&amp; key_len != 64) {</div><div class='add'>+		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Pick the correct function code based on the key length */</div><div class='ctx'> 	fc = (key_len == 32) ? CPACF_KM_XTS_128 :</div><div class='ctx'> 	     (key_len == 64) ? CPACF_KM_XTS_256 : 0;</div><div class='head'>diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c<br/>index 8b83144206eb..0d296662bbf0 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/crypto/des_s390.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/crypto/des_s390.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/crypto/des_s390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/crypto/des_s390.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/fips.h&gt;</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/des.h&gt;</div><div class='ctx'> #include &lt;asm/cpacf.h&gt;</div><div class='hunk'>@@ -221,6 +222,8 @@ static struct crypto_alg cbc_des_alg = {</div><div class='ctx'>  *   same as DES.  Implementers MUST reject keys that exhibit this</div><div class='ctx'>  *   property.</div><div class='ctx'>  *</div><div class='add'>+ *   In fips mode additinally check for all 3 keys are unique.</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> static int des3_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='ctx'> 		       unsigned int key_len)</div><div class='hunk'>@@ -234,6 +237,17 @@ static int des3_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='ctx'> 		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* in fips mode, ensure k1 != k2 and k2 != k3 and k1 != k3 */</div><div class='add'>+	if (fips_enabled &amp;&amp;</div><div class='add'>+	    !(crypto_memneq(key, &amp;key[DES_KEY_SIZE], DES_KEY_SIZE) &amp;&amp;</div><div class='add'>+	      crypto_memneq(&amp;key[DES_KEY_SIZE], &amp;key[DES_KEY_SIZE * 2],</div><div class='add'>+			    DES_KEY_SIZE) &amp;&amp;</div><div class='add'>+	      crypto_memneq(key, &amp;key[DES_KEY_SIZE * 2], DES_KEY_SIZE))) {</div><div class='add'>+		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	memcpy(ctx-&gt;key, key, key_len);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/crypto/paes_s390.c b/arch/s390/crypto/paes_s390.c<br/>new file mode 100644<br/>index 000000000000..d69ea495c4d7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/s390/crypto/paes_s390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/crypto/paes_s390.c</a></div><div class='hunk'>@@ -0,0 +1,619 @@</div><div class='add'>+/*</div><div class='add'>+ * Cryptographic API.</div><div class='add'>+ *</div><div class='add'>+ * s390 implementation of the AES Cipher Algorithm with protected keys.</div><div class='add'>+ *</div><div class='add'>+ * s390 Version:</div><div class='add'>+ *   Copyright IBM Corp. 2017</div><div class='add'>+ *   Author(s): Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='add'>+ *		Harald Freudenberger &lt;freude@de.ibm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License (version 2 only)</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define KMSG_COMPONENT "paes_s390"</div><div class='add'>+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/cpufeature.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;crypto/xts.h&gt;</div><div class='add'>+#include &lt;asm/cpacf.h&gt;</div><div class='add'>+#include &lt;asm/pkey.h&gt;</div><div class='add'>+</div><div class='add'>+static u8 *ctrblk;</div><div class='add'>+static DEFINE_SPINLOCK(ctrblk_lock);</div><div class='add'>+</div><div class='add'>+static cpacf_mask_t km_functions, kmc_functions, kmctr_functions;</div><div class='add'>+</div><div class='add'>+struct s390_paes_ctx {</div><div class='add'>+	struct pkey_seckey sk;</div><div class='add'>+	struct pkey_protkey pk;</div><div class='add'>+	unsigned long fc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct s390_pxts_ctx {</div><div class='add'>+	struct pkey_seckey sk[2];</div><div class='add'>+	struct pkey_protkey pk[2];</div><div class='add'>+	unsigned long fc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int __paes_convert_key(struct pkey_seckey *sk,</div><div class='add'>+				     struct pkey_protkey *pk)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* try three times in case of failure */</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		ret = pkey_skey2pkey(sk, pk);</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __paes_set_key(struct s390_paes_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long fc;</div><div class='add'>+</div><div class='add'>+	if (__paes_convert_key(&amp;ctx-&gt;sk, &amp;ctx-&gt;pk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Pick the correct function code based on the protected key type */</div><div class='add'>+	fc = (ctx-&gt;pk.type == PKEY_KEYTYPE_AES_128) ? CPACF_KM_PAES_128 :</div><div class='add'>+		(ctx-&gt;pk.type == PKEY_KEYTYPE_AES_192) ? CPACF_KM_PAES_192 :</div><div class='add'>+		(ctx-&gt;pk.type == PKEY_KEYTYPE_AES_256) ? CPACF_KM_PAES_256 : 0;</div><div class='add'>+</div><div class='add'>+	/* Check if the function code is available */</div><div class='add'>+	ctx-&gt;fc = (fc &amp;&amp; cpacf_test_func(&amp;km_functions, fc)) ? fc : 0;</div><div class='add'>+</div><div class='add'>+	return ctx-&gt;fc ? 0 : -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_paes_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+			    unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct s390_paes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	if (key_len != SECKEYBLOBSIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;sk.seckey, in_key, SECKEYBLOBSIZE);</div><div class='add'>+	if (__paes_set_key(ctx)) {</div><div class='add'>+		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_paes_crypt(struct blkcipher_desc *desc,</div><div class='add'>+			  unsigned long modifier,</div><div class='add'>+			  struct blkcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct s390_paes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	unsigned int nbytes, n, k;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = blkcipher_walk_virt(desc, walk);</div><div class='add'>+	while ((nbytes = walk-&gt;nbytes) &gt;= AES_BLOCK_SIZE) {</div><div class='add'>+		/* only use complete blocks */</div><div class='add'>+		n = nbytes &amp; ~(AES_BLOCK_SIZE - 1);</div><div class='add'>+		k = cpacf_km(ctx-&gt;fc | modifier, ctx-&gt;pk.protkey,</div><div class='add'>+			     walk-&gt;dst.virt.addr, walk-&gt;src.virt.addr, n);</div><div class='add'>+		if (k)</div><div class='add'>+			ret = blkcipher_walk_done(desc, walk, nbytes - k);</div><div class='add'>+		if (k &lt; n) {</div><div class='add'>+			if (__paes_set_key(ctx) != 0)</div><div class='add'>+				return blkcipher_walk_done(desc, walk, -EIO);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_paes_encrypt(struct blkcipher_desc *desc,</div><div class='add'>+			    struct scatterlist *dst, struct scatterlist *src,</div><div class='add'>+			    unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	return ecb_paes_crypt(desc, CPACF_ENCRYPT, &amp;walk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_paes_decrypt(struct blkcipher_desc *desc,</div><div class='add'>+			    struct scatterlist *dst, struct scatterlist *src,</div><div class='add'>+			    unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	return ecb_paes_crypt(desc, CPACF_DECRYPT, &amp;walk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg ecb_paes_alg = {</div><div class='add'>+	.cra_name		=	"ecb(paes)",</div><div class='add'>+	.cra_driver_name	=	"ecb-paes-s390",</div><div class='add'>+	.cra_priority		=	400,	/* combo: aes + ecb */</div><div class='add'>+	.cra_flags		=	CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='add'>+	.cra_blocksize		=	AES_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		=	sizeof(struct s390_paes_ctx),</div><div class='add'>+	.cra_type		=	&amp;crypto_blkcipher_type,</div><div class='add'>+	.cra_module		=	THIS_MODULE,</div><div class='add'>+	.cra_list		=	LIST_HEAD_INIT(ecb_paes_alg.cra_list),</div><div class='add'>+	.cra_u			=	{</div><div class='add'>+		.blkcipher = {</div><div class='add'>+			.min_keysize		=	SECKEYBLOBSIZE,</div><div class='add'>+			.max_keysize		=	SECKEYBLOBSIZE,</div><div class='add'>+			.setkey			=	ecb_paes_set_key,</div><div class='add'>+			.encrypt		=	ecb_paes_encrypt,</div><div class='add'>+			.decrypt		=	ecb_paes_decrypt,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __cbc_paes_set_key(struct s390_paes_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long fc;</div><div class='add'>+</div><div class='add'>+	if (__paes_convert_key(&amp;ctx-&gt;sk, &amp;ctx-&gt;pk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Pick the correct function code based on the protected key type */</div><div class='add'>+	fc = (ctx-&gt;pk.type == PKEY_KEYTYPE_AES_128) ? CPACF_KMC_PAES_128 :</div><div class='add'>+		(ctx-&gt;pk.type == PKEY_KEYTYPE_AES_192) ? CPACF_KMC_PAES_192 :</div><div class='add'>+		(ctx-&gt;pk.type == PKEY_KEYTYPE_AES_256) ? CPACF_KMC_PAES_256 : 0;</div><div class='add'>+</div><div class='add'>+	/* Check if the function code is available */</div><div class='add'>+	ctx-&gt;fc = (fc &amp;&amp; cpacf_test_func(&amp;kmc_functions, fc)) ? fc : 0;</div><div class='add'>+</div><div class='add'>+	return ctx-&gt;fc ? 0 : -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbc_paes_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+			    unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct s390_paes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;sk.seckey, in_key, SECKEYBLOBSIZE);</div><div class='add'>+	if (__cbc_paes_set_key(ctx)) {</div><div class='add'>+		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbc_paes_crypt(struct blkcipher_desc *desc, unsigned long modifier,</div><div class='add'>+			  struct blkcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct s390_paes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	unsigned int nbytes, n, k;</div><div class='add'>+	int ret;</div><div class='add'>+	struct {</div><div class='add'>+		u8 iv[AES_BLOCK_SIZE];</div><div class='add'>+		u8 key[MAXPROTKEYSIZE];</div><div class='add'>+	} param;</div><div class='add'>+</div><div class='add'>+	ret = blkcipher_walk_virt(desc, walk);</div><div class='add'>+	memcpy(param.iv, walk-&gt;iv, AES_BLOCK_SIZE);</div><div class='add'>+	memcpy(param.key, ctx-&gt;pk.protkey, MAXPROTKEYSIZE);</div><div class='add'>+	while ((nbytes = walk-&gt;nbytes) &gt;= AES_BLOCK_SIZE) {</div><div class='add'>+		/* only use complete blocks */</div><div class='add'>+		n = nbytes &amp; ~(AES_BLOCK_SIZE - 1);</div><div class='add'>+		k = cpacf_kmc(ctx-&gt;fc | modifier, &amp;param,</div><div class='add'>+			      walk-&gt;dst.virt.addr, walk-&gt;src.virt.addr, n);</div><div class='add'>+		if (k)</div><div class='add'>+			ret = blkcipher_walk_done(desc, walk, nbytes - k);</div><div class='add'>+		if (n &lt; k) {</div><div class='add'>+			if (__cbc_paes_set_key(ctx) != 0)</div><div class='add'>+				return blkcipher_walk_done(desc, walk, -EIO);</div><div class='add'>+			memcpy(param.key, ctx-&gt;pk.protkey, MAXPROTKEYSIZE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	memcpy(walk-&gt;iv, param.iv, AES_BLOCK_SIZE);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbc_paes_encrypt(struct blkcipher_desc *desc,</div><div class='add'>+			    struct scatterlist *dst, struct scatterlist *src,</div><div class='add'>+			    unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	return cbc_paes_crypt(desc, 0, &amp;walk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbc_paes_decrypt(struct blkcipher_desc *desc,</div><div class='add'>+			    struct scatterlist *dst, struct scatterlist *src,</div><div class='add'>+			    unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	return cbc_paes_crypt(desc, CPACF_DECRYPT, &amp;walk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg cbc_paes_alg = {</div><div class='add'>+	.cra_name		=	"cbc(paes)",</div><div class='add'>+	.cra_driver_name	=	"cbc-paes-s390",</div><div class='add'>+	.cra_priority		=	400,	/* combo: aes + cbc */</div><div class='add'>+	.cra_flags		=	CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='add'>+	.cra_blocksize		=	AES_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		=	sizeof(struct s390_paes_ctx),</div><div class='add'>+	.cra_type		=	&amp;crypto_blkcipher_type,</div><div class='add'>+	.cra_module		=	THIS_MODULE,</div><div class='add'>+	.cra_list		=	LIST_HEAD_INIT(cbc_paes_alg.cra_list),</div><div class='add'>+	.cra_u			=	{</div><div class='add'>+		.blkcipher = {</div><div class='add'>+			.min_keysize		=	SECKEYBLOBSIZE,</div><div class='add'>+			.max_keysize		=	SECKEYBLOBSIZE,</div><div class='add'>+			.ivsize			=	AES_BLOCK_SIZE,</div><div class='add'>+			.setkey			=	cbc_paes_set_key,</div><div class='add'>+			.encrypt		=	cbc_paes_encrypt,</div><div class='add'>+			.decrypt		=	cbc_paes_decrypt,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __xts_paes_set_key(struct s390_pxts_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long fc;</div><div class='add'>+</div><div class='add'>+	if (__paes_convert_key(&amp;ctx-&gt;sk[0], &amp;ctx-&gt;pk[0]) ||</div><div class='add'>+	    __paes_convert_key(&amp;ctx-&gt;sk[1], &amp;ctx-&gt;pk[1]))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;pk[0].type != ctx-&gt;pk[1].type)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Pick the correct function code based on the protected key type */</div><div class='add'>+	fc = (ctx-&gt;pk[0].type == PKEY_KEYTYPE_AES_128) ? CPACF_KM_PXTS_128 :</div><div class='add'>+		(ctx-&gt;pk[0].type == PKEY_KEYTYPE_AES_256) ?</div><div class='add'>+		CPACF_KM_PXTS_256 : 0;</div><div class='add'>+</div><div class='add'>+	/* Check if the function code is available */</div><div class='add'>+	ctx-&gt;fc = (fc &amp;&amp; cpacf_test_func(&amp;km_functions, fc)) ? fc : 0;</div><div class='add'>+</div><div class='add'>+	return ctx-&gt;fc ? 0 : -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_paes_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+			    unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct s390_pxts_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	u8 ckey[2 * AES_MAX_KEY_SIZE];</div><div class='add'>+	unsigned int ckey_len;</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;sk[0].seckey, in_key, SECKEYBLOBSIZE);</div><div class='add'>+	memcpy(ctx-&gt;sk[1].seckey, in_key + SECKEYBLOBSIZE, SECKEYBLOBSIZE);</div><div class='add'>+	if (__xts_paes_set_key(ctx)) {</div><div class='add'>+		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * xts_check_key verifies the key length is not odd and makes</div><div class='add'>+	 * sure that the two keys are not the same. This can be done</div><div class='add'>+	 * on the two protected keys as well</div><div class='add'>+	 */</div><div class='add'>+	ckey_len = (ctx-&gt;pk[0].type == PKEY_KEYTYPE_AES_128) ?</div><div class='add'>+		AES_KEYSIZE_128 : AES_KEYSIZE_256;</div><div class='add'>+	memcpy(ckey, ctx-&gt;pk[0].protkey, ckey_len);</div><div class='add'>+	memcpy(ckey + ckey_len, ctx-&gt;pk[1].protkey, ckey_len);</div><div class='add'>+	return xts_check_key(tfm, ckey, 2*ckey_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_paes_crypt(struct blkcipher_desc *desc, unsigned long modifier,</div><div class='add'>+			  struct blkcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct s390_pxts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	unsigned int keylen, offset, nbytes, n, k;</div><div class='add'>+	int ret;</div><div class='add'>+	struct {</div><div class='add'>+		u8 key[MAXPROTKEYSIZE];	/* key + verification pattern */</div><div class='add'>+		u8 tweak[16];</div><div class='add'>+		u8 block[16];</div><div class='add'>+		u8 bit[16];</div><div class='add'>+		u8 xts[16];</div><div class='add'>+	} pcc_param;</div><div class='add'>+	struct {</div><div class='add'>+		u8 key[MAXPROTKEYSIZE];	/* key + verification pattern */</div><div class='add'>+		u8 init[16];</div><div class='add'>+	} xts_param;</div><div class='add'>+</div><div class='add'>+	ret = blkcipher_walk_virt(desc, walk);</div><div class='add'>+	keylen = (ctx-&gt;pk[0].type == PKEY_KEYTYPE_AES_128) ? 48 : 64;</div><div class='add'>+	offset = (ctx-&gt;pk[0].type == PKEY_KEYTYPE_AES_128) ? 16 : 0;</div><div class='add'>+retry:</div><div class='add'>+	memset(&amp;pcc_param, 0, sizeof(pcc_param));</div><div class='add'>+	memcpy(pcc_param.tweak, walk-&gt;iv, sizeof(pcc_param.tweak));</div><div class='add'>+	memcpy(pcc_param.key + offset, ctx-&gt;pk[1].protkey, keylen);</div><div class='add'>+	cpacf_pcc(ctx-&gt;fc, pcc_param.key + offset);</div><div class='add'>+</div><div class='add'>+	memcpy(xts_param.key + offset, ctx-&gt;pk[0].protkey, keylen);</div><div class='add'>+	memcpy(xts_param.init, pcc_param.xts, 16);</div><div class='add'>+</div><div class='add'>+	while ((nbytes = walk-&gt;nbytes) &gt;= AES_BLOCK_SIZE) {</div><div class='add'>+		/* only use complete blocks */</div><div class='add'>+		n = nbytes &amp; ~(AES_BLOCK_SIZE - 1);</div><div class='add'>+		k = cpacf_km(ctx-&gt;fc | modifier, xts_param.key + offset,</div><div class='add'>+			     walk-&gt;dst.virt.addr, walk-&gt;src.virt.addr, n);</div><div class='add'>+		if (k)</div><div class='add'>+			ret = blkcipher_walk_done(desc, walk, nbytes - k);</div><div class='add'>+		if (k &lt; n) {</div><div class='add'>+			if (__xts_paes_set_key(ctx) != 0)</div><div class='add'>+				return blkcipher_walk_done(desc, walk, -EIO);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_paes_encrypt(struct blkcipher_desc *desc,</div><div class='add'>+			    struct scatterlist *dst, struct scatterlist *src,</div><div class='add'>+			    unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	return xts_paes_crypt(desc, 0, &amp;walk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_paes_decrypt(struct blkcipher_desc *desc,</div><div class='add'>+			    struct scatterlist *dst, struct scatterlist *src,</div><div class='add'>+			    unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	return xts_paes_crypt(desc, CPACF_DECRYPT, &amp;walk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg xts_paes_alg = {</div><div class='add'>+	.cra_name		=	"xts(paes)",</div><div class='add'>+	.cra_driver_name	=	"xts-paes-s390",</div><div class='add'>+	.cra_priority		=	400,	/* combo: aes + xts */</div><div class='add'>+	.cra_flags		=	CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='add'>+	.cra_blocksize		=	AES_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		=	sizeof(struct s390_pxts_ctx),</div><div class='add'>+	.cra_type		=	&amp;crypto_blkcipher_type,</div><div class='add'>+	.cra_module		=	THIS_MODULE,</div><div class='add'>+	.cra_list		=	LIST_HEAD_INIT(xts_paes_alg.cra_list),</div><div class='add'>+	.cra_u			=	{</div><div class='add'>+		.blkcipher = {</div><div class='add'>+			.min_keysize		=	2 * SECKEYBLOBSIZE,</div><div class='add'>+			.max_keysize		=	2 * SECKEYBLOBSIZE,</div><div class='add'>+			.ivsize			=	AES_BLOCK_SIZE,</div><div class='add'>+			.setkey			=	xts_paes_set_key,</div><div class='add'>+			.encrypt		=	xts_paes_encrypt,</div><div class='add'>+			.decrypt		=	xts_paes_decrypt,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __ctr_paes_set_key(struct s390_paes_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long fc;</div><div class='add'>+</div><div class='add'>+	if (__paes_convert_key(&amp;ctx-&gt;sk, &amp;ctx-&gt;pk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Pick the correct function code based on the protected key type */</div><div class='add'>+	fc = (ctx-&gt;pk.type == PKEY_KEYTYPE_AES_128) ? CPACF_KMCTR_PAES_128 :</div><div class='add'>+		(ctx-&gt;pk.type == PKEY_KEYTYPE_AES_192) ? CPACF_KMCTR_PAES_192 :</div><div class='add'>+		(ctx-&gt;pk.type == PKEY_KEYTYPE_AES_256) ?</div><div class='add'>+		CPACF_KMCTR_PAES_256 : 0;</div><div class='add'>+</div><div class='add'>+	/* Check if the function code is available */</div><div class='add'>+	ctx-&gt;fc = (fc &amp;&amp; cpacf_test_func(&amp;kmctr_functions, fc)) ? fc : 0;</div><div class='add'>+</div><div class='add'>+	return ctx-&gt;fc ? 0 : -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctr_paes_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+			    unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct s390_paes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;sk.seckey, in_key, key_len);</div><div class='add'>+	if (__ctr_paes_set_key(ctx)) {</div><div class='add'>+		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int __ctrblk_init(u8 *ctrptr, u8 *iv, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, n;</div><div class='add'>+</div><div class='add'>+	/* only use complete blocks, max. PAGE_SIZE */</div><div class='add'>+	memcpy(ctrptr, iv, AES_BLOCK_SIZE);</div><div class='add'>+	n = (nbytes &gt; PAGE_SIZE) ? PAGE_SIZE : nbytes &amp; ~(AES_BLOCK_SIZE - 1);</div><div class='add'>+	for (i = (n / AES_BLOCK_SIZE) - 1; i &gt; 0; i--) {</div><div class='add'>+		memcpy(ctrptr + AES_BLOCK_SIZE, ctrptr, AES_BLOCK_SIZE);</div><div class='add'>+		crypto_inc(ctrptr + AES_BLOCK_SIZE, AES_BLOCK_SIZE);</div><div class='add'>+		ctrptr += AES_BLOCK_SIZE;</div><div class='add'>+	}</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctr_paes_crypt(struct blkcipher_desc *desc, unsigned long modifier,</div><div class='add'>+			  struct blkcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct s390_paes_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	u8 buf[AES_BLOCK_SIZE], *ctrptr;</div><div class='add'>+	unsigned int nbytes, n, k;</div><div class='add'>+	int ret, locked;</div><div class='add'>+</div><div class='add'>+	locked = spin_trylock(&amp;ctrblk_lock);</div><div class='add'>+</div><div class='add'>+	ret = blkcipher_walk_virt_block(desc, walk, AES_BLOCK_SIZE);</div><div class='add'>+	while ((nbytes = walk-&gt;nbytes) &gt;= AES_BLOCK_SIZE) {</div><div class='add'>+		n = AES_BLOCK_SIZE;</div><div class='add'>+		if (nbytes &gt;= 2*AES_BLOCK_SIZE &amp;&amp; locked)</div><div class='add'>+			n = __ctrblk_init(ctrblk, walk-&gt;iv, nbytes);</div><div class='add'>+		ctrptr = (n &gt; AES_BLOCK_SIZE) ? ctrblk : walk-&gt;iv;</div><div class='add'>+		k = cpacf_kmctr(ctx-&gt;fc | modifier, ctx-&gt;pk.protkey,</div><div class='add'>+				walk-&gt;dst.virt.addr, walk-&gt;src.virt.addr,</div><div class='add'>+				n, ctrptr);</div><div class='add'>+		if (k) {</div><div class='add'>+			if (ctrptr == ctrblk)</div><div class='add'>+				memcpy(walk-&gt;iv, ctrptr + k - AES_BLOCK_SIZE,</div><div class='add'>+				       AES_BLOCK_SIZE);</div><div class='add'>+			crypto_inc(walk-&gt;iv, AES_BLOCK_SIZE);</div><div class='add'>+			ret = blkcipher_walk_done(desc, walk, nbytes - n);</div><div class='add'>+		}</div><div class='add'>+		if (k &lt; n) {</div><div class='add'>+			if (__ctr_paes_set_key(ctx) != 0)</div><div class='add'>+				return blkcipher_walk_done(desc, walk, -EIO);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (locked)</div><div class='add'>+		spin_unlock(&amp;ctrblk_lock);</div><div class='add'>+	/*</div><div class='add'>+	 * final block may be &lt; AES_BLOCK_SIZE, copy only nbytes</div><div class='add'>+	 */</div><div class='add'>+	if (nbytes) {</div><div class='add'>+		while (1) {</div><div class='add'>+			if (cpacf_kmctr(ctx-&gt;fc | modifier,</div><div class='add'>+					ctx-&gt;pk.protkey, buf,</div><div class='add'>+					walk-&gt;src.virt.addr, AES_BLOCK_SIZE,</div><div class='add'>+					walk-&gt;iv) == AES_BLOCK_SIZE)</div><div class='add'>+				break;</div><div class='add'>+			if (__ctr_paes_set_key(ctx) != 0)</div><div class='add'>+				return blkcipher_walk_done(desc, walk, -EIO);</div><div class='add'>+		}</div><div class='add'>+		memcpy(walk-&gt;dst.virt.addr, buf, nbytes);</div><div class='add'>+		crypto_inc(walk-&gt;iv, AES_BLOCK_SIZE);</div><div class='add'>+		ret = blkcipher_walk_done(desc, walk, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctr_paes_encrypt(struct blkcipher_desc *desc,</div><div class='add'>+			    struct scatterlist *dst, struct scatterlist *src,</div><div class='add'>+			    unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	return ctr_paes_crypt(desc, 0, &amp;walk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctr_paes_decrypt(struct blkcipher_desc *desc,</div><div class='add'>+			    struct scatterlist *dst, struct scatterlist *src,</div><div class='add'>+			    unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	return ctr_paes_crypt(desc, CPACF_DECRYPT, &amp;walk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg ctr_paes_alg = {</div><div class='add'>+	.cra_name		=	"ctr(paes)",</div><div class='add'>+	.cra_driver_name	=	"ctr-paes-s390",</div><div class='add'>+	.cra_priority		=	400,	/* combo: aes + ctr */</div><div class='add'>+	.cra_flags		=	CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='add'>+	.cra_blocksize		=	1,</div><div class='add'>+	.cra_ctxsize		=	sizeof(struct s390_paes_ctx),</div><div class='add'>+	.cra_type		=	&amp;crypto_blkcipher_type,</div><div class='add'>+	.cra_module		=	THIS_MODULE,</div><div class='add'>+	.cra_list		=	LIST_HEAD_INIT(ctr_paes_alg.cra_list),</div><div class='add'>+	.cra_u			=	{</div><div class='add'>+		.blkcipher = {</div><div class='add'>+			.min_keysize		=	SECKEYBLOBSIZE,</div><div class='add'>+			.max_keysize		=	SECKEYBLOBSIZE,</div><div class='add'>+			.ivsize			=	AES_BLOCK_SIZE,</div><div class='add'>+			.setkey			=	ctr_paes_set_key,</div><div class='add'>+			.encrypt		=	ctr_paes_encrypt,</div><div class='add'>+			.decrypt		=	ctr_paes_decrypt,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void __crypto_unregister_alg(struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	if (!list_empty(&amp;alg-&gt;cra_list))</div><div class='add'>+		crypto_unregister_alg(alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void paes_s390_fini(void)</div><div class='add'>+{</div><div class='add'>+	if (ctrblk)</div><div class='add'>+		free_page((unsigned long) ctrblk);</div><div class='add'>+	__crypto_unregister_alg(&amp;ctr_paes_alg);</div><div class='add'>+	__crypto_unregister_alg(&amp;xts_paes_alg);</div><div class='add'>+	__crypto_unregister_alg(&amp;cbc_paes_alg);</div><div class='add'>+	__crypto_unregister_alg(&amp;ecb_paes_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init paes_s390_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Query available functions for KM, KMC and KMCTR */</div><div class='add'>+	cpacf_query(CPACF_KM, &amp;km_functions);</div><div class='add'>+	cpacf_query(CPACF_KMC, &amp;kmc_functions);</div><div class='add'>+	cpacf_query(CPACF_KMCTR, &amp;kmctr_functions);</div><div class='add'>+</div><div class='add'>+	if (cpacf_test_func(&amp;km_functions, CPACF_KM_PAES_128) ||</div><div class='add'>+	    cpacf_test_func(&amp;km_functions, CPACF_KM_PAES_192) ||</div><div class='add'>+	    cpacf_test_func(&amp;km_functions, CPACF_KM_PAES_256)) {</div><div class='add'>+		ret = crypto_register_alg(&amp;ecb_paes_alg);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpacf_test_func(&amp;kmc_functions, CPACF_KMC_PAES_128) ||</div><div class='add'>+	    cpacf_test_func(&amp;kmc_functions, CPACF_KMC_PAES_192) ||</div><div class='add'>+	    cpacf_test_func(&amp;kmc_functions, CPACF_KMC_PAES_256)) {</div><div class='add'>+		ret = crypto_register_alg(&amp;cbc_paes_alg);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpacf_test_func(&amp;km_functions, CPACF_KM_PXTS_128) ||</div><div class='add'>+	    cpacf_test_func(&amp;km_functions, CPACF_KM_PXTS_256)) {</div><div class='add'>+		ret = crypto_register_alg(&amp;xts_paes_alg);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpacf_test_func(&amp;kmctr_functions, CPACF_KMCTR_PAES_128) ||</div><div class='add'>+	    cpacf_test_func(&amp;kmctr_functions, CPACF_KMCTR_PAES_192) ||</div><div class='add'>+	    cpacf_test_func(&amp;kmctr_functions, CPACF_KMCTR_PAES_256)) {</div><div class='add'>+		ret = crypto_register_alg(&amp;ctr_paes_alg);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_err;</div><div class='add'>+		ctrblk = (u8 *) __get_free_page(GFP_KERNEL);</div><div class='add'>+		if (!ctrblk) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+out_err:</div><div class='add'>+	paes_s390_fini();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(paes_s390_init);</div><div class='add'>+module_exit(paes_s390_fini);</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS_CRYPTO("aes-all");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm with protected keys");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c<br/>index 9cc050f9536c..5a3ec04a7082 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/crypto/prng.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/crypto/prng.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/crypto/prng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/crypto/prng.c</a></div><div class='hunk'>@@ -20,8 +20,10 @@</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/timex.h&gt;</div><div class='ctx'> #include &lt;asm/cpacf.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -110,22 +112,30 @@ static const u8 initial_parm_block[32] __initconst = {</div><div class='ctx'> </div><div class='ctx'> /*** helper functions ***/</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * generate_entropy:</div><div class='add'>+ * This algorithm produces 64 bytes of entropy data based on 1024</div><div class='add'>+ * individual stckf() invocations assuming that each stckf() value</div><div class='add'>+ * contributes 0.25 bits of entropy. So the caller gets 256 bit</div><div class='add'>+ * entropy per 64 byte or 4 bits entropy per byte.</div><div class='add'>+ */</div><div class='ctx'> static int generate_entropy(u8 *ebuf, size_t nbytes)</div><div class='ctx'> {</div><div class='ctx'> 	int n, ret = 0;</div><div class='del'>-	u8 *pg, *h, hash[32];</div><div class='add'>+	u8 *pg, *h, hash[64];</div><div class='ctx'> </div><div class='del'>-	pg = (u8 *) __get_free_page(GFP_KERNEL);</div><div class='add'>+	/* allocate 2 pages */</div><div class='add'>+	pg = (u8 *) __get_free_pages(GFP_KERNEL, 1);</div><div class='ctx'> 	if (!pg) {</div><div class='ctx'> 		prng_errorflag = PRNG_GEN_ENTROPY_FAILED;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (nbytes) {</div><div class='del'>-		/* fill page with urandom bytes */</div><div class='del'>-		get_random_bytes(pg, PAGE_SIZE);</div><div class='del'>-		/* exor page with stckf values */</div><div class='del'>-		for (n = 0; n &lt; PAGE_SIZE / sizeof(u64); n++) {</div><div class='add'>+		/* fill pages with urandom bytes */</div><div class='add'>+		get_random_bytes(pg, 2*PAGE_SIZE);</div><div class='add'>+		/* exor pages with 1024 stckf values */</div><div class='add'>+		for (n = 0; n &lt; 2 * PAGE_SIZE / sizeof(u64); n++) {</div><div class='ctx'> 			u64 *p = ((u64 *)pg) + n;</div><div class='ctx'> 			*p ^= get_tod_clock_fast();</div><div class='ctx'> 		}</div><div class='hunk'>@@ -134,8 +144,8 @@ static int generate_entropy(u8 *ebuf, size_t nbytes)</div><div class='ctx'> 			h = hash;</div><div class='ctx'> 		else</div><div class='ctx'> 			h = ebuf;</div><div class='del'>-		/* generate sha256 from this page */</div><div class='del'>-		cpacf_kimd(CPACF_KIMD_SHA_256, h, pg, PAGE_SIZE);</div><div class='add'>+		/* hash over the filled pages */</div><div class='add'>+		cpacf_kimd(CPACF_KIMD_SHA_512, h, pg, 2*PAGE_SIZE);</div><div class='ctx'> 		if (n &lt; sizeof(hash))</div><div class='ctx'> 			memcpy(ebuf, hash, n);</div><div class='ctx'> 		ret += n;</div><div class='hunk'>@@ -143,7 +153,7 @@ static int generate_entropy(u8 *ebuf, size_t nbytes)</div><div class='ctx'> 		nbytes -= n;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	free_page((unsigned long)pg);</div><div class='add'>+	free_pages((unsigned long)pg, 1);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -334,7 +344,7 @@ static int __init prng_sha512_selftest(void)</div><div class='ctx'> static int __init prng_sha512_instantiate(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, datalen;</div><div class='del'>-	u8 seed[64];</div><div class='add'>+	u8 seed[64 + 32 + 16];</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("prng runs in SHA-512 mode "</div><div class='ctx'> 		 "with chunksize=%d and reseed_limit=%u\n",</div><div class='hunk'>@@ -357,12 +367,12 @@ static int __init prng_sha512_instantiate(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto outfree;</div><div class='ctx'> </div><div class='del'>-	/* generate initial seed bytestring, first 48 bytes of entropy */</div><div class='del'>-	ret = generate_entropy(seed, 48);</div><div class='del'>-	if (ret != 48)</div><div class='add'>+	/* generate initial seed bytestring, with 256 + 128 bits entropy */</div><div class='add'>+	ret = generate_entropy(seed, 64 + 32);</div><div class='add'>+	if (ret != 64 + 32)</div><div class='ctx'> 		goto outfree;</div><div class='ctx'> 	/* followed by 16 bytes of unique nonce */</div><div class='del'>-	get_tod_clock_ext(seed + 48);</div><div class='add'>+	get_tod_clock_ext(seed + 64 + 32);</div><div class='ctx'> </div><div class='ctx'> 	/* initial seed of the ppno drng */</div><div class='ctx'> 	cpacf_ppno(CPACF_PPNO_SHA512_DRNG_SEED,</div><div class='hunk'>@@ -395,9 +405,9 @@ static void prng_sha512_deinstantiate(void)</div><div class='ctx'> static int prng_sha512_reseed(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 seed[32];</div><div class='add'>+	u8 seed[64];</div><div class='ctx'> </div><div class='del'>-	/* generate 32 bytes of fresh entropy */</div><div class='add'>+	/* fetch 256 bits of fresh entropy */</div><div class='ctx'> 	ret = generate_entropy(seed, sizeof(seed));</div><div class='ctx'> 	if (ret != sizeof(seed))</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -507,8 +517,10 @@ static ssize_t prng_tdes_read(struct file *file, char __user *ubuf,</div><div class='ctx'> 		prng_data-&gt;prngws.byte_counter += n;</div><div class='ctx'> 		prng_data-&gt;prngws.reseed_counter += n;</div><div class='ctx'> </div><div class='del'>-		if (copy_to_user(ubuf, prng_data-&gt;buf, chunk))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		if (copy_to_user(ubuf, prng_data-&gt;buf, chunk)) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		nbytes -= chunk;</div><div class='ctx'> 		ret += chunk;</div><div class='head'>diff --git a/arch/s390/defconfig b/arch/s390/defconfig<br/>index 2d40ef0a6295..68bfd09f1b02 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/defconfig</a></div><div class='hunk'>@@ -38,7 +38,6 @@ CONFIG_JUMP_LABEL=y</div><div class='ctx'> CONFIG_STATIC_KEYS_SELFTEST=y</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='del'>-CONFIG_MODVERSIONS=y</div><div class='ctx'> CONFIG_BLK_DEV_INTEGRITY=y</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> CONFIG_IBM_PARTITION=y</div><div class='hunk'>@@ -130,8 +129,11 @@ CONFIG_DUMMY=m</div><div class='ctx'> CONFIG_EQUALIZER=m</div><div class='ctx'> CONFIG_TUN=m</div><div class='ctx'> CONFIG_VIRTIO_NET=y</div><div class='add'>+# CONFIG_NET_VENDOR_ALACRITECH is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SOLARFLARE is not set</div><div class='ctx'> # CONFIG_INPUT is not set</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> CONFIG_RAW_DRIVER=m</div><div class='ctx'> CONFIG_VIRTIO_BALLOON=y</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='hunk'>@@ -183,7 +185,6 @@ CONFIG_TRACE_ENUM_MAP_FILE=y</div><div class='ctx'> CONFIG_KPROBES_SANITY_TEST=y</div><div class='ctx'> CONFIG_S390_PTDUMP=y</div><div class='ctx'> CONFIG_CRYPTO_CRYPTD=m</div><div class='del'>-CONFIG_CRYPTO_AUTHENC=m</div><div class='ctx'> CONFIG_CRYPTO_TEST=m</div><div class='ctx'> CONFIG_CRYPTO_CCM=m</div><div class='ctx'> CONFIG_CRYPTO_GCM=m</div><div class='hunk'>@@ -228,6 +229,7 @@ CONFIG_CRYPTO_USER_API_HASH=m</div><div class='ctx'> CONFIG_CRYPTO_USER_API_SKCIPHER=m</div><div class='ctx'> CONFIG_CRYPTO_USER_API_RNG=m</div><div class='ctx'> CONFIG_ZCRYPT=m</div><div class='add'>+CONFIG_PKEY=m</div><div class='ctx'> CONFIG_CRYPTO_SHA1_S390=m</div><div class='ctx'> CONFIG_CRYPTO_SHA256_S390=m</div><div class='ctx'> CONFIG_CRYPTO_SHA512_S390=m</div><div class='head'>diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c<br/>index 09bccb224d03..cf8a2d92467f 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/hypfs/inode.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/hypfs/inode.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/hypfs/inode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/hypfs/inode.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *    Copyright IBM Corp. 2006, 2008</div><div class='ctx'>  *    Author(s): Michael Holzheu &lt;holzheu@de.ibm.com&gt;</div><div class='add'>+ *    License: GPL</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define KMSG_COMPONENT "hypfs"</div><div class='hunk'>@@ -18,7 +19,8 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kobject.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='hunk'>@@ -443,7 +445,6 @@ static struct file_system_type hypfs_type = {</div><div class='ctx'> 	.mount		= hypfs_mount,</div><div class='ctx'> 	.kill_sb	= hypfs_kill_super</div><div class='ctx'> };</div><div class='del'>-MODULE_ALIAS_FS("s390_hypfs");</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations hypfs_s_ops = {</div><div class='ctx'> 	.statfs		= simple_statfs,</div><div class='hunk'>@@ -497,21 +498,4 @@ fail_dbfs_exit:</div><div class='ctx'> 	pr_err("Initialization of hypfs failed with rc=%i\n", rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static void __exit hypfs_exit(void)</div><div class='del'>-{</div><div class='del'>-	unregister_filesystem(&amp;hypfs_type);</div><div class='del'>-	sysfs_remove_mount_point(hypervisor_kobj, "s390");</div><div class='del'>-	hypfs_diag0c_exit();</div><div class='del'>-	hypfs_sprp_exit();</div><div class='del'>-	hypfs_vm_exit();</div><div class='del'>-	hypfs_diag_exit();</div><div class='del'>-	hypfs_dbfs_exit();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(hypfs_init)</div><div class='del'>-module_exit(hypfs_exit)</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Michael Holzheu &lt;holzheu@de.ibm.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("s390 Hypervisor Filesystem");</div><div class='add'>+device_initcall(hypfs_init)</div><div class='head'>diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild<br/>index 20f196b82a6e..8aea32fe8bd2 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+generic-y += asm-offsets.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='add'>+generic-y += dma-contiguous.h</div><div class='ctx'> generic-y += export.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='head'>diff --git a/arch/s390/include/asm/asm-offsets.h b/arch/s390/include/asm/asm-offsets.h<br/>deleted file mode 100644<br/>index d370ee36a182..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/asm-offsets.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/asm-offsets.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-#include &lt;generated/asm-offsets.h&gt;</div><div class='head'>diff --git a/arch/s390/include/asm/asm-prototypes.h b/arch/s390/include/asm/asm-prototypes.h<br/>new file mode 100644<br/>index 000000000000..2c3413b0ca52<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/asm-prototypes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/asm-prototypes.h</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+#ifndef _ASM_S390_PROTOTYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kvm_host.h&gt;</div><div class='add'>+#include &lt;linux/ftrace.h&gt;</div><div class='add'>+#include &lt;asm/fpu/api.h&gt;</div><div class='add'>+#include &lt;asm-generic/asm-prototypes.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_S390_PROTOTYPES_H */</div><div class='head'>diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h<br/>index d28cc2f5b7b2..f7f69dfd2db2 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/atomic.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/atomic.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/atomic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/atomic.h</a></div><div class='hunk'>@@ -1,13 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright IBM Corp. 1999, 2009</div><div class='add'>+ * Copyright IBM Corp. 1999, 2016</div><div class='ctx'>  * Author(s): Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;,</div><div class='ctx'>  *	      Denis Joseph Barrow,</div><div class='del'>- *	      Arnd Bergmann &lt;arndb@de.ibm.com&gt;,</div><div class='del'>- *</div><div class='del'>- * Atomic operations that C can't guarantee us.</div><div class='del'>- * Useful for resource counting etc.</div><div class='del'>- * s390 uses 'Compare And Swap' for atomicity in SMP environment.</div><div class='del'>- *</div><div class='add'>+ *	      Arnd Bergmann,</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ARCH_S390_ATOMIC__</div><div class='hunk'>@@ -15,62 +10,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;asm/atomic_ops.h&gt;</div><div class='ctx'> #include &lt;asm/barrier.h&gt;</div><div class='ctx'> #include &lt;asm/cmpxchg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ATOMIC_INIT(i)  { (i) }</div><div class='ctx'> </div><div class='del'>-#define __ATOMIC_NO_BARRIER	"\n"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES</div><div class='del'>-</div><div class='del'>-#define __ATOMIC_OR	"lao"</div><div class='del'>-#define __ATOMIC_AND	"lan"</div><div class='del'>-#define __ATOMIC_ADD	"laa"</div><div class='del'>-#define __ATOMIC_XOR	"lax"</div><div class='del'>-#define __ATOMIC_BARRIER "bcr	14,0\n"</div><div class='del'>-</div><div class='del'>-#define __ATOMIC_LOOP(ptr, op_val, op_string, __barrier)		\</div><div class='del'>-({									\</div><div class='del'>-	int old_val;							\</div><div class='del'>-									\</div><div class='del'>-	typecheck(atomic_t *, ptr);					\</div><div class='del'>-	asm volatile(							\</div><div class='del'>-		op_string "	%0,%2,%1\n"				\</div><div class='del'>-		__barrier						\</div><div class='del'>-		: "=d" (old_val), "+Q" ((ptr)-&gt;counter)			\</div><div class='del'>-		: "d" (op_val)						\</div><div class='del'>-		: "cc", "memory");					\</div><div class='del'>-	old_val;							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_HAVE_MARCH_Z196_FEATURES */</div><div class='del'>-</div><div class='del'>-#define __ATOMIC_OR	"or"</div><div class='del'>-#define __ATOMIC_AND	"nr"</div><div class='del'>-#define __ATOMIC_ADD	"ar"</div><div class='del'>-#define __ATOMIC_XOR	"xr"</div><div class='del'>-#define __ATOMIC_BARRIER "\n"</div><div class='del'>-</div><div class='del'>-#define __ATOMIC_LOOP(ptr, op_val, op_string, __barrier)		\</div><div class='del'>-({									\</div><div class='del'>-	int old_val, new_val;						\</div><div class='del'>-									\</div><div class='del'>-	typecheck(atomic_t *, ptr);					\</div><div class='del'>-	asm volatile(							\</div><div class='del'>-		"	l	%0,%2\n"				\</div><div class='del'>-		"0:	lr	%1,%0\n"				\</div><div class='del'>-		op_string "	%1,%3\n"				\</div><div class='del'>-		"	cs	%0,%1,%2\n"				\</div><div class='del'>-		"	jl	0b"					\</div><div class='del'>-		: "=&amp;d" (old_val), "=&amp;d" (new_val), "+Q" ((ptr)-&gt;counter)\</div><div class='del'>-		: "d" (op_val)						\</div><div class='del'>-		: "cc", "memory");					\</div><div class='del'>-	old_val;							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */</div><div class='del'>-</div><div class='ctx'> static inline int atomic_read(const atomic_t *v)</div><div class='ctx'> {</div><div class='ctx'> 	int c;</div><div class='hunk'>@@ -90,27 +35,23 @@ static inline void atomic_set(atomic_t *v, int i)</div><div class='ctx'> </div><div class='ctx'> static inline int atomic_add_return(int i, atomic_t *v)</div><div class='ctx'> {</div><div class='del'>-	return __ATOMIC_LOOP(v, i, __ATOMIC_ADD, __ATOMIC_BARRIER) + i;</div><div class='add'>+	return __atomic_add_barrier(i, &amp;v-&gt;counter) + i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int atomic_fetch_add(int i, atomic_t *v)</div><div class='ctx'> {</div><div class='del'>-	return __ATOMIC_LOOP(v, i, __ATOMIC_ADD, __ATOMIC_BARRIER);</div><div class='add'>+	return __atomic_add_barrier(i, &amp;v-&gt;counter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void atomic_add(int i, atomic_t *v)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_HAVE_MARCH_Z196_FEATURES</div><div class='ctx'> 	if (__builtin_constant_p(i) &amp;&amp; (i &gt; -129) &amp;&amp; (i &lt; 128)) {</div><div class='del'>-		asm volatile(</div><div class='del'>-			"asi	%0,%1\n"</div><div class='del'>-			: "+Q" (v-&gt;counter)</div><div class='del'>-			: "i" (i)</div><div class='del'>-			: "cc", "memory");</div><div class='add'>+		__atomic_add_const(i, &amp;v-&gt;counter);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	__ATOMIC_LOOP(v, i, __ATOMIC_ADD, __ATOMIC_NO_BARRIER);</div><div class='add'>+	__atomic_add(i, &amp;v-&gt;counter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define atomic_add_negative(_i, _v)	(atomic_add_return(_i, _v) &lt; 0)</div><div class='hunk'>@@ -125,19 +66,19 @@ static inline void atomic_add(int i, atomic_t *v)</div><div class='ctx'> #define atomic_dec_return(_v)		atomic_sub_return(1, _v)</div><div class='ctx'> #define atomic_dec_and_test(_v)		(atomic_sub_return(1, _v) == 0)</div><div class='ctx'> </div><div class='del'>-#define ATOMIC_OPS(op, OP)						\</div><div class='add'>+#define ATOMIC_OPS(op)							\</div><div class='ctx'> static inline void atomic_##op(int i, atomic_t *v)			\</div><div class='ctx'> {									\</div><div class='del'>-	__ATOMIC_LOOP(v, i, __ATOMIC_##OP, __ATOMIC_NO_BARRIER);	\</div><div class='add'>+	__atomic_##op(i, &amp;v-&gt;counter);					\</div><div class='ctx'> }									\</div><div class='ctx'> static inline int atomic_fetch_##op(int i, atomic_t *v)			\</div><div class='ctx'> {									\</div><div class='del'>-	return __ATOMIC_LOOP(v, i, __ATOMIC_##OP, __ATOMIC_BARRIER);	\</div><div class='add'>+	return __atomic_##op##_barrier(i, &amp;v-&gt;counter);			\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ATOMIC_OPS(and, AND)</div><div class='del'>-ATOMIC_OPS(or, OR)</div><div class='del'>-ATOMIC_OPS(xor, XOR)</div><div class='add'>+ATOMIC_OPS(and)</div><div class='add'>+ATOMIC_OPS(or)</div><div class='add'>+ATOMIC_OPS(xor)</div><div class='ctx'> </div><div class='ctx'> #undef ATOMIC_OPS</div><div class='ctx'> </div><div class='hunk'>@@ -145,12 +86,7 @@ ATOMIC_OPS(xor, XOR)</div><div class='ctx'> </div><div class='ctx'> static inline int atomic_cmpxchg(atomic_t *v, int old, int new)</div><div class='ctx'> {</div><div class='del'>-	asm volatile(</div><div class='del'>-		"	cs	%0,%2,%1"</div><div class='del'>-		: "+d" (old), "+Q" (v-&gt;counter)</div><div class='del'>-		: "d" (new)</div><div class='del'>-		: "cc", "memory");</div><div class='del'>-	return old;</div><div class='add'>+	return __atomic_cmpxchg(&amp;v-&gt;counter, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int __atomic_add_unless(atomic_t *v, int a, int u)</div><div class='hunk'>@@ -168,65 +104,11 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)</div><div class='ctx'> 	return c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#undef __ATOMIC_LOOP</div><div class='del'>-</div><div class='ctx'> #define ATOMIC64_INIT(i)  { (i) }</div><div class='ctx'> </div><div class='del'>-#define __ATOMIC64_NO_BARRIER	"\n"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES</div><div class='del'>-</div><div class='del'>-#define __ATOMIC64_OR	"laog"</div><div class='del'>-#define __ATOMIC64_AND	"lang"</div><div class='del'>-#define __ATOMIC64_ADD	"laag"</div><div class='del'>-#define __ATOMIC64_XOR	"laxg"</div><div class='del'>-#define __ATOMIC64_BARRIER "bcr	14,0\n"</div><div class='del'>-</div><div class='del'>-#define __ATOMIC64_LOOP(ptr, op_val, op_string, __barrier)		\</div><div class='del'>-({									\</div><div class='del'>-	long long old_val;						\</div><div class='del'>-									\</div><div class='del'>-	typecheck(atomic64_t *, ptr);					\</div><div class='del'>-	asm volatile(							\</div><div class='del'>-		op_string "	%0,%2,%1\n"				\</div><div class='del'>-		__barrier						\</div><div class='del'>-		: "=d" (old_val), "+Q" ((ptr)-&gt;counter)			\</div><div class='del'>-		: "d" (op_val)						\</div><div class='del'>-		: "cc", "memory");					\</div><div class='del'>-	old_val;							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_HAVE_MARCH_Z196_FEATURES */</div><div class='del'>-</div><div class='del'>-#define __ATOMIC64_OR	"ogr"</div><div class='del'>-#define __ATOMIC64_AND	"ngr"</div><div class='del'>-#define __ATOMIC64_ADD	"agr"</div><div class='del'>-#define __ATOMIC64_XOR	"xgr"</div><div class='del'>-#define __ATOMIC64_BARRIER "\n"</div><div class='del'>-</div><div class='del'>-#define __ATOMIC64_LOOP(ptr, op_val, op_string, __barrier)		\</div><div class='del'>-({									\</div><div class='del'>-	long long old_val, new_val;					\</div><div class='del'>-									\</div><div class='del'>-	typecheck(atomic64_t *, ptr);					\</div><div class='del'>-	asm volatile(							\</div><div class='del'>-		"	lg	%0,%2\n"				\</div><div class='del'>-		"0:	lgr	%1,%0\n"				\</div><div class='del'>-		op_string "	%1,%3\n"				\</div><div class='del'>-		"	csg	%0,%1,%2\n"				\</div><div class='del'>-		"	jl	0b"					\</div><div class='del'>-		: "=&amp;d" (old_val), "=&amp;d" (new_val), "+Q" ((ptr)-&gt;counter)\</div><div class='del'>-		: "d" (op_val)						\</div><div class='del'>-		: "cc", "memory");					\</div><div class='del'>-	old_val;							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */</div><div class='del'>-</div><div class='del'>-static inline long long atomic64_read(const atomic64_t *v)</div><div class='add'>+static inline long atomic64_read(const atomic64_t *v)</div><div class='ctx'> {</div><div class='del'>-	long long c;</div><div class='add'>+	long c;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile(</div><div class='ctx'> 		"	lg	%0,%1\n"</div><div class='hunk'>@@ -234,71 +116,60 @@ static inline long long atomic64_read(const atomic64_t *v)</div><div class='ctx'> 	return c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void atomic64_set(atomic64_t *v, long long i)</div><div class='add'>+static inline void atomic64_set(atomic64_t *v, long i)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile(</div><div class='ctx'> 		"	stg	%1,%0\n"</div><div class='ctx'> 		: "=Q" (v-&gt;counter) : "d" (i));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline long long atomic64_add_return(long long i, atomic64_t *v)</div><div class='add'>+static inline long atomic64_add_return(long i, atomic64_t *v)</div><div class='ctx'> {</div><div class='del'>-	return __ATOMIC64_LOOP(v, i, __ATOMIC64_ADD, __ATOMIC64_BARRIER) + i;</div><div class='add'>+	return __atomic64_add_barrier(i, &amp;v-&gt;counter) + i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline long long atomic64_fetch_add(long long i, atomic64_t *v)</div><div class='add'>+static inline long atomic64_fetch_add(long i, atomic64_t *v)</div><div class='ctx'> {</div><div class='del'>-	return __ATOMIC64_LOOP(v, i, __ATOMIC64_ADD, __ATOMIC64_BARRIER);</div><div class='add'>+	return __atomic64_add_barrier(i, &amp;v-&gt;counter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void atomic64_add(long long i, atomic64_t *v)</div><div class='add'>+static inline void atomic64_add(long i, atomic64_t *v)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_HAVE_MARCH_Z196_FEATURES</div><div class='ctx'> 	if (__builtin_constant_p(i) &amp;&amp; (i &gt; -129) &amp;&amp; (i &lt; 128)) {</div><div class='del'>-		asm volatile(</div><div class='del'>-			"agsi	%0,%1\n"</div><div class='del'>-			: "+Q" (v-&gt;counter)</div><div class='del'>-			: "i" (i)</div><div class='del'>-			: "cc", "memory");</div><div class='add'>+		__atomic64_add_const(i, &amp;v-&gt;counter);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	__ATOMIC64_LOOP(v, i, __ATOMIC64_ADD, __ATOMIC64_NO_BARRIER);</div><div class='add'>+	__atomic64_add(i, &amp;v-&gt;counter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define atomic64_xchg(v, new) (xchg(&amp;((v)-&gt;counter), new))</div><div class='ctx'> </div><div class='del'>-static inline long long atomic64_cmpxchg(atomic64_t *v,</div><div class='del'>-					     long long old, long long new)</div><div class='add'>+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)</div><div class='ctx'> {</div><div class='del'>-	asm volatile(</div><div class='del'>-		"	csg	%0,%2,%1"</div><div class='del'>-		: "+d" (old), "+Q" (v-&gt;counter)</div><div class='del'>-		: "d" (new)</div><div class='del'>-		: "cc", "memory");</div><div class='del'>-	return old;</div><div class='add'>+	return __atomic64_cmpxchg(&amp;v-&gt;counter, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define ATOMIC64_OPS(op, OP)						\</div><div class='add'>+#define ATOMIC64_OPS(op)						\</div><div class='ctx'> static inline void atomic64_##op(long i, atomic64_t *v)			\</div><div class='ctx'> {									\</div><div class='del'>-	__ATOMIC64_LOOP(v, i, __ATOMIC64_##OP, __ATOMIC64_NO_BARRIER);	\</div><div class='add'>+	__atomic64_##op(i, &amp;v-&gt;counter);				\</div><div class='ctx'> }									\</div><div class='ctx'> static inline long atomic64_fetch_##op(long i, atomic64_t *v)		\</div><div class='ctx'> {									\</div><div class='del'>-	return __ATOMIC64_LOOP(v, i, __ATOMIC64_##OP, __ATOMIC64_BARRIER); \</div><div class='add'>+	return __atomic64_##op##_barrier(i, &amp;v-&gt;counter);		\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ATOMIC64_OPS(and, AND)</div><div class='del'>-ATOMIC64_OPS(or, OR)</div><div class='del'>-ATOMIC64_OPS(xor, XOR)</div><div class='add'>+ATOMIC64_OPS(and)</div><div class='add'>+ATOMIC64_OPS(or)</div><div class='add'>+ATOMIC64_OPS(xor)</div><div class='ctx'> </div><div class='ctx'> #undef ATOMIC64_OPS</div><div class='del'>-#undef __ATOMIC64_LOOP</div><div class='ctx'> </div><div class='del'>-static inline int atomic64_add_unless(atomic64_t *v, long long i, long long u)</div><div class='add'>+static inline int atomic64_add_unless(atomic64_t *v, long i, long u)</div><div class='ctx'> {</div><div class='del'>-	long long c, old;</div><div class='add'>+	long c, old;</div><div class='ctx'> </div><div class='ctx'> 	c = atomic64_read(v);</div><div class='ctx'> 	for (;;) {</div><div class='hunk'>@@ -312,9 +183,9 @@ static inline int atomic64_add_unless(atomic64_t *v, long long i, long long u)</div><div class='ctx'> 	return c != u;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline long long atomic64_dec_if_positive(atomic64_t *v)</div><div class='add'>+static inline long atomic64_dec_if_positive(atomic64_t *v)</div><div class='ctx'> {</div><div class='del'>-	long long c, old, dec;</div><div class='add'>+	long c, old, dec;</div><div class='ctx'> </div><div class='ctx'> 	c = atomic64_read(v);</div><div class='ctx'> 	for (;;) {</div><div class='hunk'>@@ -333,9 +204,9 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)</div><div class='ctx'> #define atomic64_inc(_v)		atomic64_add(1, _v)</div><div class='ctx'> #define atomic64_inc_return(_v)		atomic64_add_return(1, _v)</div><div class='ctx'> #define atomic64_inc_and_test(_v)	(atomic64_add_return(1, _v) == 0)</div><div class='del'>-#define atomic64_sub_return(_i, _v)	atomic64_add_return(-(long long)(_i), _v)</div><div class='del'>-#define atomic64_fetch_sub(_i, _v)	atomic64_fetch_add(-(long long)(_i), _v)</div><div class='del'>-#define atomic64_sub(_i, _v)		atomic64_add(-(long long)(_i), _v)</div><div class='add'>+#define atomic64_sub_return(_i, _v)	atomic64_add_return(-(long)(_i), _v)</div><div class='add'>+#define atomic64_fetch_sub(_i, _v)	atomic64_fetch_add(-(long)(_i), _v)</div><div class='add'>+#define atomic64_sub(_i, _v)		atomic64_add(-(long)(_i), _v)</div><div class='ctx'> #define atomic64_sub_and_test(_i, _v)	(atomic64_sub_return(_i, _v) == 0)</div><div class='ctx'> #define atomic64_dec(_v)		atomic64_sub(1, _v)</div><div class='ctx'> #define atomic64_dec_return(_v)		atomic64_sub_return(1, _v)</div><div class='head'>diff --git a/arch/s390/include/asm/atomic_ops.h b/arch/s390/include/asm/atomic_ops.h<br/>new file mode 100644<br/>index 000000000000..ac9e2b939d04<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/atomic_ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/atomic_ops.h</a></div><div class='hunk'>@@ -0,0 +1,130 @@</div><div class='add'>+/*</div><div class='add'>+ * Low level function for atomic operations</div><div class='add'>+ *</div><div class='add'>+ * Copyright IBM Corp. 1999, 2016</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ARCH_S390_ATOMIC_OPS__</div><div class='add'>+#define __ARCH_S390_ATOMIC_OPS__</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES</div><div class='add'>+</div><div class='add'>+#define __ATOMIC_OP(op_name, op_type, op_string, op_barrier)		\</div><div class='add'>+static inline op_type op_name(op_type val, op_type *ptr)		\</div><div class='add'>+{									\</div><div class='add'>+	op_type old;							\</div><div class='add'>+									\</div><div class='add'>+	asm volatile(							\</div><div class='add'>+		op_string "	%[old],%[val],%[ptr]\n"			\</div><div class='add'>+		op_barrier						\</div><div class='add'>+		: [old] "=d" (old), [ptr] "+Q" (*ptr)			\</div><div class='add'>+		: [val] "d" (val) : "cc", "memory");			\</div><div class='add'>+	return old;							\</div><div class='add'>+}									\</div><div class='add'>+</div><div class='add'>+#define __ATOMIC_OPS(op_name, op_type, op_string)			\</div><div class='add'>+	__ATOMIC_OP(op_name, op_type, op_string, "\n")			\</div><div class='add'>+	__ATOMIC_OP(op_name##_barrier, op_type, op_string, "bcr 14,0\n")</div><div class='add'>+</div><div class='add'>+__ATOMIC_OPS(__atomic_add, int, "laa")</div><div class='add'>+__ATOMIC_OPS(__atomic_and, int, "lan")</div><div class='add'>+__ATOMIC_OPS(__atomic_or,  int, "lao")</div><div class='add'>+__ATOMIC_OPS(__atomic_xor, int, "lax")</div><div class='add'>+</div><div class='add'>+__ATOMIC_OPS(__atomic64_add, long, "laag")</div><div class='add'>+__ATOMIC_OPS(__atomic64_and, long, "lang")</div><div class='add'>+__ATOMIC_OPS(__atomic64_or,  long, "laog")</div><div class='add'>+__ATOMIC_OPS(__atomic64_xor, long, "laxg")</div><div class='add'>+</div><div class='add'>+#undef __ATOMIC_OPS</div><div class='add'>+#undef __ATOMIC_OP</div><div class='add'>+</div><div class='add'>+static inline void __atomic_add_const(int val, int *ptr)</div><div class='add'>+{</div><div class='add'>+	asm volatile(</div><div class='add'>+		"	asi	%[ptr],%[val]\n"</div><div class='add'>+		: [ptr] "+Q" (*ptr) : [val] "i" (val) : "cc");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __atomic64_add_const(long val, long *ptr)</div><div class='add'>+{</div><div class='add'>+	asm volatile(</div><div class='add'>+		"	agsi	%[ptr],%[val]\n"</div><div class='add'>+		: [ptr] "+Q" (*ptr) : [val] "i" (val) : "cc");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_HAVE_MARCH_Z196_FEATURES */</div><div class='add'>+</div><div class='add'>+#define __ATOMIC_OP(op_name, op_string)					\</div><div class='add'>+static inline int op_name(int val, int *ptr)				\</div><div class='add'>+{									\</div><div class='add'>+	int old, new;							\</div><div class='add'>+									\</div><div class='add'>+	asm volatile(							\</div><div class='add'>+		"0:	lr	%[new],%[old]\n"			\</div><div class='add'>+		op_string "	%[new],%[val]\n"			\</div><div class='add'>+		"	cs	%[old],%[new],%[ptr]\n"			\</div><div class='add'>+		"	jl	0b"					\</div><div class='add'>+		: [old] "=d" (old), [new] "=&amp;d" (new), [ptr] "+Q" (*ptr)\</div><div class='add'>+		: [val] "d" (val), "0" (*ptr) : "cc", "memory");	\</div><div class='add'>+	return old;							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __ATOMIC_OPS(op_name, op_string)				\</div><div class='add'>+	__ATOMIC_OP(op_name, op_string)					\</div><div class='add'>+	__ATOMIC_OP(op_name##_barrier, op_string)</div><div class='add'>+</div><div class='add'>+__ATOMIC_OPS(__atomic_add, "ar")</div><div class='add'>+__ATOMIC_OPS(__atomic_and, "nr")</div><div class='add'>+__ATOMIC_OPS(__atomic_or,  "or")</div><div class='add'>+__ATOMIC_OPS(__atomic_xor, "xr")</div><div class='add'>+</div><div class='add'>+#undef __ATOMIC_OPS</div><div class='add'>+</div><div class='add'>+#define __ATOMIC64_OP(op_name, op_string)				\</div><div class='add'>+static inline long op_name(long val, long *ptr)				\</div><div class='add'>+{									\</div><div class='add'>+	long old, new;							\</div><div class='add'>+									\</div><div class='add'>+	asm volatile(							\</div><div class='add'>+		"0:	lgr	%[new],%[old]\n"			\</div><div class='add'>+		op_string "	%[new],%[val]\n"			\</div><div class='add'>+		"	csg	%[old],%[new],%[ptr]\n"			\</div><div class='add'>+		"	jl	0b"					\</div><div class='add'>+		: [old] "=d" (old), [new] "=&amp;d" (new), [ptr] "+Q" (*ptr)\</div><div class='add'>+		: [val] "d" (val), "0" (*ptr) : "cc", "memory");	\</div><div class='add'>+	return old;							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __ATOMIC64_OPS(op_name, op_string)				\</div><div class='add'>+	__ATOMIC64_OP(op_name, op_string)				\</div><div class='add'>+	__ATOMIC64_OP(op_name##_barrier, op_string)</div><div class='add'>+</div><div class='add'>+__ATOMIC64_OPS(__atomic64_add, "agr")</div><div class='add'>+__ATOMIC64_OPS(__atomic64_and, "ngr")</div><div class='add'>+__ATOMIC64_OPS(__atomic64_or,  "ogr")</div><div class='add'>+__ATOMIC64_OPS(__atomic64_xor, "xgr")</div><div class='add'>+</div><div class='add'>+#undef __ATOMIC64_OPS</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */</div><div class='add'>+</div><div class='add'>+static inline int __atomic_cmpxchg(int *ptr, int old, int new)</div><div class='add'>+{</div><div class='add'>+	asm volatile(</div><div class='add'>+		"	cs	%[old],%[new],%[ptr]"</div><div class='add'>+		: [old] "+d" (old), [ptr] "+Q" (*ptr)</div><div class='add'>+		: [new] "d" (new) : "cc", "memory");</div><div class='add'>+	return old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long __atomic64_cmpxchg(long *ptr, long old, long new)</div><div class='add'>+{</div><div class='add'>+	asm volatile(</div><div class='add'>+		"	csg	%[old],%[new],%[ptr]"</div><div class='add'>+		: [old] "+d" (old), [ptr] "+Q" (*ptr)</div><div class='add'>+		: [new] "d" (new) : "cc", "memory");</div><div class='add'>+	return old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __ARCH_S390_ATOMIC_OPS__  */</div><div class='head'>diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h<br/>index 8043f10da6b5..d92047da5ccb 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/bitops.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/bitops.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/bitops.h</a></div><div class='hunk'>@@ -42,57 +42,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/typecheck.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;asm/atomic_ops.h&gt;</div><div class='ctx'> #include &lt;asm/barrier.h&gt;</div><div class='ctx'> </div><div class='del'>-#define __BITOPS_NO_BARRIER	"\n"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES</div><div class='del'>-</div><div class='del'>-#define __BITOPS_OR		"laog"</div><div class='del'>-#define __BITOPS_AND		"lang"</div><div class='del'>-#define __BITOPS_XOR		"laxg"</div><div class='del'>-#define __BITOPS_BARRIER	"bcr	14,0\n"</div><div class='del'>-</div><div class='del'>-#define __BITOPS_LOOP(__addr, __val, __op_string, __barrier)	\</div><div class='del'>-({								\</div><div class='del'>-	unsigned long __old;					\</div><div class='del'>-								\</div><div class='del'>-	typecheck(unsigned long *, (__addr));			\</div><div class='del'>-	asm volatile(						\</div><div class='del'>-		__op_string "	%0,%2,%1\n"			\</div><div class='del'>-		__barrier					\</div><div class='del'>-		: "=d" (__old),	"+Q" (*(__addr))		\</div><div class='del'>-		: "d" (__val)					\</div><div class='del'>-		: "cc", "memory");				\</div><div class='del'>-	__old;							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_HAVE_MARCH_Z196_FEATURES */</div><div class='del'>-</div><div class='del'>-#define __BITOPS_OR		"ogr"</div><div class='del'>-#define __BITOPS_AND		"ngr"</div><div class='del'>-#define __BITOPS_XOR		"xgr"</div><div class='del'>-#define __BITOPS_BARRIER	"\n"</div><div class='del'>-</div><div class='del'>-#define __BITOPS_LOOP(__addr, __val, __op_string, __barrier)	\</div><div class='del'>-({								\</div><div class='del'>-	unsigned long __old, __new;				\</div><div class='del'>-								\</div><div class='del'>-	typecheck(unsigned long *, (__addr));			\</div><div class='del'>-	asm volatile(						\</div><div class='del'>-		"	lg	%0,%2\n"			\</div><div class='del'>-		"0:	lgr	%1,%0\n"			\</div><div class='del'>-		__op_string "	%1,%3\n"			\</div><div class='del'>-		"	csg	%0,%1,%2\n"			\</div><div class='del'>-		"	jl	0b"				\</div><div class='del'>-		: "=&amp;d" (__old), "=&amp;d" (__new), "+Q" (*(__addr))\</div><div class='del'>-		: "d" (__val)					\</div><div class='del'>-		: "cc", "memory");				\</div><div class='del'>-	__old;							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */</div><div class='del'>-</div><div class='ctx'> #define __BITOPS_WORDS(bits) (((bits) + BITS_PER_LONG - 1) / BITS_PER_LONG)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long *</div><div class='hunk'>@@ -128,7 +80,7 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	mask = 1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1));</div><div class='del'>-	__BITOPS_LOOP(addr, mask, __BITOPS_OR, __BITOPS_NO_BARRIER);</div><div class='add'>+	__atomic64_or(mask, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void clear_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='hunk'>@@ -149,7 +101,7 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	mask = ~(1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1)));</div><div class='del'>-	__BITOPS_LOOP(addr, mask, __BITOPS_AND, __BITOPS_NO_BARRIER);</div><div class='add'>+	__atomic64_and(mask, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void change_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='hunk'>@@ -170,7 +122,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	mask = 1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1));</div><div class='del'>-	__BITOPS_LOOP(addr, mask, __BITOPS_XOR, __BITOPS_NO_BARRIER);</div><div class='add'>+	__atomic64_xor(mask, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='hunk'>@@ -180,7 +132,7 @@ test_and_set_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	unsigned long old, mask;</div><div class='ctx'> </div><div class='ctx'> 	mask = 1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1));</div><div class='del'>-	old = __BITOPS_LOOP(addr, mask, __BITOPS_OR, __BITOPS_BARRIER);</div><div class='add'>+	old = __atomic64_or_barrier(mask, addr);</div><div class='ctx'> 	return (old &amp; mask) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -191,7 +143,7 @@ test_and_clear_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	unsigned long old, mask;</div><div class='ctx'> </div><div class='ctx'> 	mask = ~(1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1)));</div><div class='del'>-	old = __BITOPS_LOOP(addr, mask, __BITOPS_AND, __BITOPS_BARRIER);</div><div class='add'>+	old = __atomic64_and_barrier(mask, addr);</div><div class='ctx'> 	return (old &amp; ~mask) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -202,7 +154,7 @@ test_and_change_bit(unsigned long nr, volatile unsigned long *ptr)</div><div class='ctx'> 	unsigned long old, mask;</div><div class='ctx'> </div><div class='ctx'> 	mask = 1UL &lt;&lt; (nr &amp; (BITS_PER_LONG - 1));</div><div class='del'>-	old = __BITOPS_LOOP(addr, mask, __BITOPS_XOR, __BITOPS_BARRIER);</div><div class='add'>+	old = __atomic64_xor_barrier(mask, addr);</div><div class='ctx'> 	return (old &amp; mask) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/cacheflush.h b/arch/s390/include/asm/cacheflush.h<br/>index 58fae7d098cf..0499334f9473 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/cacheflush.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/cacheflush.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/cacheflush.h</a></div><div class='hunk'>@@ -4,9 +4,31 @@</div><div class='ctx'> /* Caches aren't brain-dead on the s390. */</div><div class='ctx'> #include &lt;asm-generic/cacheflush.h&gt;</div><div class='ctx'> </div><div class='del'>-int set_memory_ro(unsigned long addr, int numpages);</div><div class='del'>-int set_memory_rw(unsigned long addr, int numpages);</div><div class='del'>-int set_memory_nx(unsigned long addr, int numpages);</div><div class='del'>-int set_memory_x(unsigned long addr, int numpages);</div><div class='add'>+#define SET_MEMORY_RO	1UL</div><div class='add'>+#define SET_MEMORY_RW	2UL</div><div class='add'>+#define SET_MEMORY_NX	4UL</div><div class='add'>+#define SET_MEMORY_X	8UL</div><div class='add'>+</div><div class='add'>+int __set_memory(unsigned long addr, int numpages, unsigned long flags);</div><div class='add'>+</div><div class='add'>+static inline int set_memory_ro(unsigned long addr, int numpages)</div><div class='add'>+{</div><div class='add'>+	return __set_memory(addr, numpages, SET_MEMORY_RO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int set_memory_rw(unsigned long addr, int numpages)</div><div class='add'>+{</div><div class='add'>+	return __set_memory(addr, numpages, SET_MEMORY_RW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int set_memory_nx(unsigned long addr, int numpages)</div><div class='add'>+{</div><div class='add'>+	return __set_memory(addr, numpages, SET_MEMORY_NX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int set_memory_x(unsigned long addr, int numpages)</div><div class='add'>+{</div><div class='add'>+	return __set_memory(addr, numpages, SET_MEMORY_X);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* _S390_CACHEFLUSH_H */</div><div class='head'>diff --git a/arch/s390/include/asm/checksum.h b/arch/s390/include/asm/checksum.h<br/>index d7f100c53f07..12bf4fef2a68 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/checksum.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/checksum.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/checksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/checksum.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #ifndef _S390_CHECKSUM_H</div><div class='ctx'> #define _S390_CHECKSUM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * computes the checksum of a memory block at buff, length len,</div><div class='head'>diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h<br/>index 352f7bdaf11f..0ddd37e6c29d 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/compat.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/compat.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/compat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/compat.h</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __TYPE_IS_PTR(t) (!__builtin_types_compatible_p(typeof(0?(t)0:0ULL), u64))</div><div class='head'>diff --git a/arch/s390/include/asm/cpacf.h b/arch/s390/include/asm/cpacf.h<br/>index 2c680db7e5c1..e2dfbf280d12 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/cpacf.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/cpacf.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/cpacf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/cpacf.h</a></div><div class='hunk'>@@ -28,8 +28,9 @@</div><div class='ctx'> #define CPACF_PPNO		0xb93c		/* MSA5 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Decryption modifier bit</div><div class='add'>+ * En/decryption modifier bits</div><div class='ctx'>  */</div><div class='add'>+#define CPACF_ENCRYPT		0x00</div><div class='ctx'> #define CPACF_DECRYPT		0x80</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -42,8 +43,13 @@</div><div class='ctx'> #define CPACF_KM_AES_128	0x12</div><div class='ctx'> #define CPACF_KM_AES_192	0x13</div><div class='ctx'> #define CPACF_KM_AES_256	0x14</div><div class='add'>+#define CPACF_KM_PAES_128	0x1a</div><div class='add'>+#define CPACF_KM_PAES_192	0x1b</div><div class='add'>+#define CPACF_KM_PAES_256	0x1c</div><div class='ctx'> #define CPACF_KM_XTS_128	0x32</div><div class='ctx'> #define CPACF_KM_XTS_256	0x34</div><div class='add'>+#define CPACF_KM_PXTS_128	0x3a</div><div class='add'>+#define CPACF_KM_PXTS_256	0x3c</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Function codes for the KMC (CIPHER MESSAGE WITH CHAINING)</div><div class='hunk'>@@ -56,6 +62,9 @@</div><div class='ctx'> #define CPACF_KMC_AES_128	0x12</div><div class='ctx'> #define CPACF_KMC_AES_192	0x13</div><div class='ctx'> #define CPACF_KMC_AES_256	0x14</div><div class='add'>+#define CPACF_KMC_PAES_128	0x1a</div><div class='add'>+#define CPACF_KMC_PAES_192	0x1b</div><div class='add'>+#define CPACF_KMC_PAES_256	0x1c</div><div class='ctx'> #define CPACF_KMC_PRNG		0x43</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -69,6 +78,9 @@</div><div class='ctx'> #define CPACF_KMCTR_AES_128	0x12</div><div class='ctx'> #define CPACF_KMCTR_AES_192	0x13</div><div class='ctx'> #define CPACF_KMCTR_AES_256	0x14</div><div class='add'>+#define CPACF_KMCTR_PAES_128	0x1a</div><div class='add'>+#define CPACF_KMCTR_PAES_192	0x1b</div><div class='add'>+#define CPACF_KMCTR_PAES_256	0x1c</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Function codes for the KIMD (COMPUTE INTERMEDIATE MESSAGE DIGEST)</div><div class='hunk'>@@ -99,6 +111,18 @@</div><div class='ctx'> #define CPACF_KMAC_TDEA_192	0x03</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Function codes for the PCKMO (PERFORM CRYPTOGRAPHIC KEY MANAGEMENT)</div><div class='add'>+ * instruction</div><div class='add'>+ */</div><div class='add'>+#define CPACF_PCKMO_QUERY		0x00</div><div class='add'>+#define CPACF_PCKMO_ENC_DES_KEY		0x01</div><div class='add'>+#define CPACF_PCKMO_ENC_TDES_128_KEY	0x02</div><div class='add'>+#define CPACF_PCKMO_ENC_TDES_192_KEY	0x03</div><div class='add'>+#define CPACF_PCKMO_ENC_AES_128_KEY	0x12</div><div class='add'>+#define CPACF_PCKMO_ENC_AES_192_KEY	0x13</div><div class='add'>+#define CPACF_PCKMO_ENC_AES_256_KEY	0x14</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Function codes for the PPNO (PERFORM PSEUDORANDOM NUMBER OPERATION)</div><div class='ctx'>  * instruction</div><div class='ctx'>  */</div><div class='hunk'>@@ -397,4 +421,24 @@ static inline void cpacf_pcc(unsigned long func, void *param)</div><div class='ctx'> 		: "cc", "memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * cpacf_pckmo() - executes the PCKMO (PERFORM CRYPTOGRAPHIC KEY</div><div class='add'>+ *		  MANAGEMENT) instruction</div><div class='add'>+ * @func: the function code passed to PCKMO; see CPACF_PCKMO_xxx defines</div><div class='add'>+ * @param: address of parameter block; see POP for details on each func</div><div class='add'>+ *</div><div class='add'>+ * Returns 0.</div><div class='add'>+ */</div><div class='add'>+static inline void cpacf_pckmo(long func, void *param)</div><div class='add'>+{</div><div class='add'>+	register unsigned long r0 asm("0") = (unsigned long) func;</div><div class='add'>+	register unsigned long r1 asm("1") = (unsigned long) param;</div><div class='add'>+</div><div class='add'>+	asm volatile(</div><div class='add'>+		"       .insn   rre,%[opc] &lt;&lt; 16,0,0\n" /* PCKMO opcode */</div><div class='add'>+		:</div><div class='add'>+		: [fc] "d" (r0), [pba] "a" (r1), [opc] "i" (CPACF_PCKMO)</div><div class='add'>+		: "cc", "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* _ASM_S390_CPACF_H */</div><div class='head'>diff --git a/arch/s390/include/asm/cpu_mf.h b/arch/s390/include/asm/cpu_mf.h<br/>index 03516476127b..d1e0707310fd 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/cpu_mf.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/cpu_mf.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/cpu_mf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/cpu_mf.h</a></div><div class='hunk'>@@ -104,7 +104,8 @@ struct hws_basic_entry {</div><div class='ctx'> 	unsigned int P:1;	    /* 28 PSW Problem state		 */</div><div class='ctx'> 	unsigned int AS:2;	    /* 29-30 PSW address-space control	 */</div><div class='ctx'> 	unsigned int I:1;	    /* 31 entry valid or invalid	 */</div><div class='del'>-	unsigned int:16;</div><div class='add'>+	unsigned int CL:2;	    /* 32-33 Configuration Level	 */</div><div class='add'>+	unsigned int:14;</div><div class='ctx'> 	unsigned int prim_asn:16;   /* primary ASN			 */</div><div class='ctx'> 	unsigned long long ia;	    /* Instruction Address		 */</div><div class='ctx'> 	unsigned long long gpp;     /* Guest Program Parameter		 */</div><div class='hunk'>@@ -198,32 +199,29 @@ static inline int ecctr(u64 ctr, u64 *val)</div><div class='ctx'> /* Store CPU counter multiple for the MT utilization counter set */</div><div class='ctx'> static inline int stcctm5(u64 num, u64 *val)</div><div class='ctx'> {</div><div class='del'>-	typedef struct { u64 _[num]; } addrtype;</div><div class='ctx'> 	int cc;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile (</div><div class='ctx'> 		"	.insn	rsy,0xeb0000000017,%2,5,%1\n"</div><div class='ctx'> 		"	ipm	%0\n"</div><div class='ctx'> 		"	srl	%0,28\n"</div><div class='del'>-		: "=d" (cc), "=Q" (*(addrtype *) val)  : "d" (num) : "cc");</div><div class='add'>+		: "=d" (cc)</div><div class='add'>+		: "Q" (*val), "d" (num)</div><div class='add'>+		: "cc", "memory");</div><div class='ctx'> 	return cc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Query sampling information */</div><div class='ctx'> static inline int qsi(struct hws_qsi_info_block *info)</div><div class='ctx'> {</div><div class='del'>-	int cc;</div><div class='del'>-	cc = 1;</div><div class='add'>+	int cc = 1;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile(</div><div class='del'>-		"0:	.insn	s,0xb2860000,0(%1)\n"</div><div class='add'>+		"0:	.insn	s,0xb2860000,%1\n"</div><div class='ctx'> 		"1:	lhi	%0,0\n"</div><div class='ctx'> 		"2:\n"</div><div class='ctx'> 		EX_TABLE(0b, 2b) EX_TABLE(1b, 2b)</div><div class='del'>-		: "=d" (cc), "+a" (info)</div><div class='del'>-		: "m" (*info)</div><div class='del'>-		: "cc", "memory");</div><div class='del'>-</div><div class='add'>+		: "+d" (cc), "+Q" (*info));</div><div class='ctx'> 	return cc ? -EINVAL : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h<br/>index 221b454c734a..d1c407ddf703 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/cputime.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/cputime.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/cputime.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/cputime.h</a></div><div class='hunk'>@@ -25,33 +25,6 @@ static inline unsigned long __div(unsigned long long n, unsigned long base)</div><div class='ctx'> 	return n / base;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define cputime_one_jiffy		jiffies_to_cputime(1)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert cputime to jiffies and back.</div><div class='del'>- */</div><div class='del'>-static inline unsigned long cputime_to_jiffies(const cputime_t cputime)</div><div class='del'>-{</div><div class='del'>-	return __div((__force unsigned long long) cputime, CPUTIME_PER_SEC / HZ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline cputime_t jiffies_to_cputime(const unsigned int jif)</div><div class='del'>-{</div><div class='del'>-	return (__force cputime_t)(jif * (CPUTIME_PER_SEC / HZ));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 cputime64_to_jiffies64(cputime64_t cputime)</div><div class='del'>-{</div><div class='del'>-	unsigned long long jif = (__force unsigned long long) cputime;</div><div class='del'>-	do_div(jif, CPUTIME_PER_SEC / HZ);</div><div class='del'>-	return jif;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline cputime64_t jiffies64_to_cputime64(const u64 jif)</div><div class='del'>-{</div><div class='del'>-	return (__force cputime64_t)(jif * (CPUTIME_PER_SEC / HZ));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Convert cputime to microseconds and back.</div><div class='ctx'>  */</div><div class='hunk'>@@ -60,88 +33,8 @@ static inline unsigned int cputime_to_usecs(const cputime_t cputime)</div><div class='ctx'> 	return (__force unsigned long long) cputime &gt;&gt; 12;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline cputime_t usecs_to_cputime(const unsigned int m)</div><div class='del'>-{</div><div class='del'>-	return (__force cputime_t)(m * CPUTIME_PER_USEC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define usecs_to_cputime64(m)		usecs_to_cputime(m)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert cputime to milliseconds and back.</div><div class='del'>- */</div><div class='del'>-static inline unsigned int cputime_to_secs(const cputime_t cputime)</div><div class='del'>-{</div><div class='del'>-	return __div((__force unsigned long long) cputime, CPUTIME_PER_SEC / 2) &gt;&gt; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline cputime_t secs_to_cputime(const unsigned int s)</div><div class='del'>-{</div><div class='del'>-	return (__force cputime_t)(s * CPUTIME_PER_SEC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert cputime to timespec and back.</div><div class='del'>- */</div><div class='del'>-static inline cputime_t timespec_to_cputime(const struct timespec *value)</div><div class='del'>-{</div><div class='del'>-	unsigned long long ret = value-&gt;tv_sec * CPUTIME_PER_SEC;</div><div class='del'>-	return (__force cputime_t)(ret + __div(value-&gt;tv_nsec * CPUTIME_PER_USEC, NSEC_PER_USEC));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void cputime_to_timespec(const cputime_t cputime,</div><div class='del'>-				       struct timespec *value)</div><div class='del'>-{</div><div class='del'>-	unsigned long long __cputime = (__force unsigned long long) cputime;</div><div class='del'>-	value-&gt;tv_nsec = (__cputime % CPUTIME_PER_SEC) * NSEC_PER_USEC / CPUTIME_PER_USEC;</div><div class='del'>-	value-&gt;tv_sec = __cputime / CPUTIME_PER_SEC;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert cputime to timeval and back.</div><div class='del'>- * Since cputime and timeval have the same resolution (microseconds)</div><div class='del'>- * this is easy.</div><div class='del'>- */</div><div class='del'>-static inline cputime_t timeval_to_cputime(const struct timeval *value)</div><div class='del'>-{</div><div class='del'>-	unsigned long long ret = value-&gt;tv_sec * CPUTIME_PER_SEC;</div><div class='del'>-	return (__force cputime_t)(ret + value-&gt;tv_usec * CPUTIME_PER_USEC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void cputime_to_timeval(const cputime_t cputime,</div><div class='del'>-				      struct timeval *value)</div><div class='del'>-{</div><div class='del'>-	unsigned long long __cputime = (__force unsigned long long) cputime;</div><div class='del'>-	value-&gt;tv_usec = (__cputime % CPUTIME_PER_SEC) / CPUTIME_PER_USEC;</div><div class='del'>-	value-&gt;tv_sec = __cputime / CPUTIME_PER_SEC;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert cputime to clock and back.</div><div class='del'>- */</div><div class='del'>-static inline clock_t cputime_to_clock_t(cputime_t cputime)</div><div class='del'>-{</div><div class='del'>-	unsigned long long clock = (__force unsigned long long) cputime;</div><div class='del'>-	do_div(clock, CPUTIME_PER_SEC / USER_HZ);</div><div class='del'>-	return clock;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline cputime_t clock_t_to_cputime(unsigned long x)</div><div class='del'>-{</div><div class='del'>-	return (__force cputime_t)(x * (CPUTIME_PER_SEC / USER_HZ));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert cputime64 to clock.</div><div class='del'>- */</div><div class='del'>-static inline clock_t cputime64_to_clock_t(cputime64_t cputime)</div><div class='del'>-{</div><div class='del'>-	unsigned long long clock = (__force unsigned long long) cputime;</div><div class='del'>-	do_div(clock, CPUTIME_PER_SEC / USER_HZ);</div><div class='del'>-	return clock;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-cputime64_t arch_cpu_idle_time(int cpu);</div><div class='add'>+u64 arch_cpu_idle_time(int cpu);</div><div class='ctx'> </div><div class='ctx'> #define arch_idle_time(cpu) arch_cpu_idle_time(cpu)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/ctl_reg.h b/arch/s390/include/asm/ctl_reg.h<br/>index d7697ab802f6..d0441ad2a990 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/ctl_reg.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/ctl_reg.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/ctl_reg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/ctl_reg.h</a></div><div class='hunk'>@@ -9,16 +9,18 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> </div><div class='del'>-#define __ctl_load(array, low, high) {					\</div><div class='add'>+#define __ctl_load(array, low, high) do {				\</div><div class='ctx'> 	typedef struct { char _[sizeof(array)]; } addrtype;		\</div><div class='ctx'> 									\</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\</div><div class='ctx'> 	asm volatile(							\</div><div class='ctx'> 		"	lctlg	%1,%2,%0\n"				\</div><div class='del'>-		: : "Q" (*(addrtype *)(&amp;array)), "i" (low), "i" (high));\</div><div class='del'>-}</div><div class='add'>+		:							\</div><div class='add'>+		: "Q" (*(addrtype *)(&amp;array)), "i" (low), "i" (high)	\</div><div class='add'>+		: "memory");						\</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='del'>-#define __ctl_store(array, low, high) {					\</div><div class='add'>+#define __ctl_store(array, low, high) do {				\</div><div class='ctx'> 	typedef struct { char _[sizeof(array)]; } addrtype;		\</div><div class='ctx'> 									\</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\</div><div class='hunk'>@@ -26,7 +28,7 @@</div><div class='ctx'> 		"	stctg	%1,%2,%0\n"				\</div><div class='ctx'> 		: "=Q" (*(addrtype *)(&amp;array))				\</div><div class='ctx'> 		: "i" (low), "i" (high));				\</div><div class='del'>-}</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='ctx'> static inline void __ctl_set_bit(unsigned int cr, unsigned int bit)</div><div class='ctx'> {</div><div class='hunk'>@@ -60,7 +62,9 @@ union ctlreg0 {</div><div class='ctx'> 		unsigned long	   : 4;</div><div class='ctx'> 		unsigned long afp  : 1; /* AFP-register control */</div><div class='ctx'> 		unsigned long vx   : 1; /* Vector enablement control */</div><div class='del'>-		unsigned long	   : 17;</div><div class='add'>+		unsigned long	   : 7;</div><div class='add'>+		unsigned long sssm : 1; /* Service signal subclass mask */</div><div class='add'>+		unsigned long	   : 9;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/device.h b/arch/s390/include/asm/device.h<br/>index 4a9f35e0973f..5203fc87f080 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/device.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/device.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/device.h</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * This file is released under the GPLv2</div><div class='ctx'>  */</div><div class='ctx'> struct dev_archdata {</div><div class='del'>-	struct dma_map_ops *dma_ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pdev_archdata {</div><div class='head'>diff --git a/arch/s390/include/asm/dma-mapping.h b/arch/s390/include/asm/dma-mapping.h<br/>index ffaba07f50ab..3108b8dbe266 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -10,12 +10,10 @@</div><div class='ctx'> </div><div class='ctx'> #define DMA_ERROR_CODE		(~(dma_addr_t) 0x0)</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops s390_pci_dma_ops;</div><div class='add'>+extern const struct dma_map_ops s390_pci_dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='del'>-	if (dev &amp;&amp; dev-&gt;archdata.dma_ops)</div><div class='del'>-		return dev-&gt;archdata.dma_ops;</div><div class='ctx'> 	return &amp;dma_noop_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h<br/>index 1736c7d3c94c..1d48880b3cc1 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/elf.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/elf.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/elf.h</a></div><div class='hunk'>@@ -103,6 +103,8 @@</div><div class='ctx'> #define HWCAP_S390_HIGH_GPRS	512</div><div class='ctx'> #define HWCAP_S390_TE		1024</div><div class='ctx'> #define HWCAP_S390_VXRS		2048</div><div class='add'>+#define HWCAP_S390_VXRS_BCD	4096</div><div class='add'>+#define HWCAP_S390_VXRS_EXT	8192</div><div class='ctx'> </div><div class='ctx'> /* Internal bits, not exposed via elf */</div><div class='ctx'> #define HWCAP_INT_SIE		1UL</div><div class='hunk'>@@ -130,7 +132,7 @@ typedef s390_fp_regs compat_elf_fpregset_t;</div><div class='ctx'> typedef s390_compat_regs compat_elf_gregset_t;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;	/* for task_struct */</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;	/* for task_struct */</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='hunk'>@@ -193,7 +195,7 @@ extern char elf_platform[];</div><div class='ctx'> do {								\</div><div class='ctx'> 	set_personality(PER_LINUX |				\</div><div class='ctx'> 		(current-&gt;personality &amp; (~PER_MASK)));		\</div><div class='del'>-	current_thread_info()-&gt;sys_call_table = 		\</div><div class='add'>+	current-&gt;thread.sys_call_table =			\</div><div class='ctx'> 		(unsigned long) &amp;sys_call_table;		\</div><div class='ctx'> } while (0)</div><div class='ctx'> #else /* CONFIG_COMPAT */</div><div class='hunk'>@@ -204,11 +206,11 @@ do {								\</div><div class='ctx'> 			(current-&gt;personality &amp; ~PER_MASK));	\</div><div class='ctx'> 	if ((ex).e_ident[EI_CLASS] == ELFCLASS32) {		\</div><div class='ctx'> 		set_thread_flag(TIF_31BIT);			\</div><div class='del'>-		current_thread_info()-&gt;sys_call_table =		\</div><div class='add'>+		current-&gt;thread.sys_call_table =		\</div><div class='ctx'> 			(unsigned long)	&amp;sys_call_table_emu;	\</div><div class='ctx'> 	} else {						\</div><div class='ctx'> 		clear_thread_flag(TIF_31BIT);			\</div><div class='del'>-		current_thread_info()-&gt;sys_call_table =		\</div><div class='add'>+		current-&gt;thread.sys_call_table =		\</div><div class='ctx'> 			(unsigned long) &amp;sys_call_table;	\</div><div class='ctx'> 	}							\</div><div class='ctx'> } while (0)</div><div class='head'>diff --git a/arch/s390/include/asm/facilities_src.h b/arch/s390/include/asm/facilities_src.h<br/>deleted file mode 100644<br/>index 3b758f66e48b..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/facilities_src.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/facilities_src.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *    Copyright IBM Corp. 2015</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef S390_GEN_FACILITIES_C</div><div class='del'>-#error "This file can only be included by gen_facilities.c"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kconfig.h&gt;</div><div class='del'>-</div><div class='del'>-struct facility_def {</div><div class='del'>-	char *name;</div><div class='del'>-	int *bits;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct facility_def facility_defs[] = {</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * FACILITIES_ALS contains the list of facilities that are</div><div class='del'>-		 * required to run a kernel that is compiled e.g. with</div><div class='del'>-		 * -march=&lt;machine&gt;.</div><div class='del'>-		 */</div><div class='del'>-		.name = "FACILITIES_ALS",</div><div class='del'>-		.bits = (int[]){</div><div class='del'>-#ifdef CONFIG_HAVE_MARCH_Z900_FEATURES</div><div class='del'>-			0,  /* N3 instructions */</div><div class='del'>-			1,  /* z/Arch mode installed */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_HAVE_MARCH_Z990_FEATURES</div><div class='del'>-			18, /* long displacement facility */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES</div><div class='del'>-			7,  /* stfle */</div><div class='del'>-			17, /* message security assist */</div><div class='del'>-			21, /* extended-immediate facility */</div><div class='del'>-			25, /* store clock fast */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_HAVE_MARCH_Z10_FEATURES</div><div class='del'>-			27, /* mvcos */</div><div class='del'>-			32, /* compare and swap and store */</div><div class='del'>-			33, /* compare and swap and store 2 */</div><div class='del'>-			34, /* general extension facility */</div><div class='del'>-			35, /* execute extensions */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES</div><div class='del'>-			45, /* fast-BCR, etc. */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_HAVE_MARCH_ZEC12_FEATURES</div><div class='del'>-			49, /* misc-instruction-extensions */</div><div class='del'>-			52, /* interlocked facility 2 */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_HAVE_MARCH_Z13_FEATURES</div><div class='del'>-			53, /* load-and-zero-rightmost-byte, etc. */</div><div class='del'>-#endif</div><div class='del'>-			-1 /* END */</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name = "FACILITIES_KVM",</div><div class='del'>-		.bits = (int[]){</div><div class='del'>-			0,  /* N3 instructions */</div><div class='del'>-			1,  /* z/Arch mode installed */</div><div class='del'>-			2,  /* z/Arch mode active */</div><div class='del'>-			3,  /* DAT-enhancement */</div><div class='del'>-			4,  /* idte segment table */</div><div class='del'>-			5,  /* idte region table */</div><div class='del'>-			6,  /* ASN-and-LX reuse */</div><div class='del'>-			7,  /* stfle */</div><div class='del'>-			8,  /* enhanced-DAT 1 */</div><div class='del'>-			9,  /* sense-running-status */</div><div class='del'>-			10, /* conditional sske */</div><div class='del'>-			13, /* ipte-range */</div><div class='del'>-			14, /* nonquiescing key-setting */</div><div class='del'>-			73, /* transactional execution */</div><div class='del'>-			75, /* access-exception-fetch/store indication */</div><div class='del'>-			76, /* msa extension 3 */</div><div class='del'>-			77, /* msa extension 4 */</div><div class='del'>-			78, /* enhanced-DAT 2 */</div><div class='del'>-			-1  /* END */</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-};</div><div class='head'>diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h<br/>index 4c7fac75090e..cd546a245c68 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/hugetlb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/hugetlb.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/hugetlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/hugetlb.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #define is_hugepage_only_range(mm, addr, len)	0</div><div class='ctx'> #define hugetlb_free_pgd_range			free_pgd_range</div><div class='del'>-#define hugepages_supported()			(MACHINE_HAS_HPAGE)</div><div class='add'>+#define hugepages_supported()			(MACHINE_HAS_EDAT1)</div><div class='ctx'> </div><div class='ctx'> void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 		     pte_t *ptep, pte_t pte);</div><div class='head'>diff --git a/arch/s390/include/asm/idals.h b/arch/s390/include/asm/idals.h<br/>index a7b2d7504049..280b60a0bcd4 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/idals.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/idals.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/idals.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/idals.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/cio.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IDA_SIZE_LOG 12 /* 11 for 2k , 12 for 4k */</div><div class='ctx'> #define IDA_BLOCK_SIZE (1L&lt;&lt;IDA_SIZE_LOG)</div><div class='head'>diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h<br/>index 4da22b2f0521..edb5161df7e2 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/ipl.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/ipl.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/ipl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/ipl.h</a></div><div class='hunk'>@@ -97,7 +97,7 @@ void __init save_area_add_vxrs(struct save_area *, __vector128 *vxrs);</div><div class='ctx'> extern void do_reipl(void);</div><div class='ctx'> extern void do_halt(void);</div><div class='ctx'> extern void do_poff(void);</div><div class='del'>-extern void ipl_save_parameters(void);</div><div class='add'>+extern void ipl_verify_parameters(void);</div><div class='ctx'> extern void ipl_update_parameters(void);</div><div class='ctx'> extern size_t append_ipl_vmparm(char *, size_t);</div><div class='ctx'> extern size_t append_ipl_scpdata(char *, size_t);</div><div class='head'>diff --git a/arch/s390/include/asm/kprobes.h b/arch/s390/include/asm/kprobes.h<br/>index 591e5a5279b0..1293c4066cfc 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/kprobes.h</a></div><div class='hunk'>@@ -27,9 +27,15 @@</div><div class='ctx'>  * 2005-Dec	Used as a template for s390 by Mike Grundy</div><div class='ctx'>  *		&lt;grundym@us.ibm.com&gt;</div><div class='ctx'>  */</div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='add'>+#define BREAKPOINT_INSTRUCTION	0x0002</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __ARCH_WANT_KPROBES_INSN_SLOT</div><div class='ctx'> </div><div class='hunk'>@@ -37,7 +43,6 @@ struct pt_regs;</div><div class='ctx'> struct kprobe;</div><div class='ctx'> </div><div class='ctx'> typedef u16 kprobe_opcode_t;</div><div class='del'>-#define BREAKPOINT_INSTRUCTION	0x0002</div><div class='ctx'> </div><div class='ctx'> /* Maximum instruction size is 3 (16bit) halfwords: */</div><div class='ctx'> #define MAX_INSN_SIZE		0x0003</div><div class='hunk'>@@ -91,4 +96,5 @@ int probe_is_insn_relative_long(u16 *insn);</div><div class='ctx'> </div><div class='ctx'> #define flush_insn_slot(p)	do { } while (0)</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='ctx'> #endif	/* _ASM_S390_KPROBES_H */</div><div class='head'>diff --git a/arch/s390/include/asm/livepatch.h b/arch/s390/include/asm/livepatch.h<br/>index 2c1213785892..6de5c6cb0061 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/livepatch.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/livepatch.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/livepatch.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/livepatch.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #ifndef ASM_LIVEPATCH_H</div><div class='ctx'> #define ASM_LIVEPATCH_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int klp_check_compiler_support(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h<br/>index 7b93b78f423c..61261e0e95c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/lowcore.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/lowcore.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/lowcore.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/lowcore.h</a></div><div class='hunk'>@@ -85,52 +85,56 @@ struct lowcore {</div><div class='ctx'> 	__u64	mcck_enter_timer;		/* 0x02c0 */</div><div class='ctx'> 	__u64	exit_timer;			/* 0x02c8 */</div><div class='ctx'> 	__u64	user_timer;			/* 0x02d0 */</div><div class='del'>-	__u64	system_timer;			/* 0x02d8 */</div><div class='del'>-	__u64	steal_timer;			/* 0x02e0 */</div><div class='del'>-	__u64	last_update_timer;		/* 0x02e8 */</div><div class='del'>-	__u64	last_update_clock;		/* 0x02f0 */</div><div class='del'>-	__u64	int_clock;			/* 0x02f8 */</div><div class='del'>-	__u64	mcck_clock;			/* 0x0300 */</div><div class='del'>-	__u64	clock_comparator;		/* 0x0308 */</div><div class='add'>+	__u64	guest_timer;			/* 0x02d8 */</div><div class='add'>+	__u64	system_timer;			/* 0x02e0 */</div><div class='add'>+	__u64	hardirq_timer;			/* 0x02e8 */</div><div class='add'>+	__u64	softirq_timer;			/* 0x02f0 */</div><div class='add'>+	__u64	steal_timer;			/* 0x02f8 */</div><div class='add'>+	__u64	last_update_timer;		/* 0x0300 */</div><div class='add'>+	__u64	last_update_clock;		/* 0x0308 */</div><div class='add'>+	__u64	int_clock;			/* 0x0310 */</div><div class='add'>+	__u64	mcck_clock;			/* 0x0318 */</div><div class='add'>+	__u64	clock_comparator;		/* 0x0320 */</div><div class='ctx'> </div><div class='ctx'> 	/* Current process. */</div><div class='del'>-	__u64	current_task;			/* 0x0310 */</div><div class='del'>-	__u64	thread_info;			/* 0x0318 */</div><div class='del'>-	__u64	kernel_stack;			/* 0x0320 */</div><div class='add'>+	__u64	current_task;			/* 0x0328 */</div><div class='add'>+	__u8	pad_0x318[0x320-0x318];		/* 0x0330 */</div><div class='add'>+	__u64	kernel_stack;			/* 0x0338 */</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt, panic and restart stack. */</div><div class='del'>-	__u64	async_stack;			/* 0x0328 */</div><div class='del'>-	__u64	panic_stack;			/* 0x0330 */</div><div class='del'>-	__u64	restart_stack;			/* 0x0338 */</div><div class='add'>+	__u64	async_stack;			/* 0x0340 */</div><div class='add'>+	__u64	panic_stack;			/* 0x0348 */</div><div class='add'>+	__u64	restart_stack;			/* 0x0350 */</div><div class='ctx'> </div><div class='ctx'> 	/* Restart function and parameter. */</div><div class='del'>-	__u64	restart_fn;			/* 0x0340 */</div><div class='del'>-	__u64	restart_data;			/* 0x0348 */</div><div class='del'>-	__u64	restart_source;			/* 0x0350 */</div><div class='add'>+	__u64	restart_fn;			/* 0x0358 */</div><div class='add'>+	__u64	restart_data;			/* 0x0360 */</div><div class='add'>+	__u64	restart_source;			/* 0x0368 */</div><div class='ctx'> </div><div class='ctx'> 	/* Address space pointer. */</div><div class='del'>-	__u64	kernel_asce;			/* 0x0358 */</div><div class='del'>-	__u64	user_asce;			/* 0x0360 */</div><div class='add'>+	__u64	kernel_asce;			/* 0x0370 */</div><div class='add'>+	__u64	user_asce;			/* 0x0378 */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The lpp and current_pid fields form a</div><div class='ctx'> 	 * 64-bit value that is set as program</div><div class='ctx'> 	 * parameter with the LPP instruction.</div><div class='ctx'> 	 */</div><div class='del'>-	__u32	lpp;				/* 0x0368 */</div><div class='del'>-	__u32	current_pid;			/* 0x036c */</div><div class='add'>+	__u32	lpp;				/* 0x0380 */</div><div class='add'>+	__u32	current_pid;			/* 0x0384 */</div><div class='ctx'> </div><div class='ctx'> 	/* SMP info area */</div><div class='del'>-	__u32	cpu_nr;				/* 0x0370 */</div><div class='del'>-	__u32	softirq_pending;		/* 0x0374 */</div><div class='del'>-	__u64	percpu_offset;			/* 0x0378 */</div><div class='del'>-	__u64	vdso_per_cpu_data;		/* 0x0380 */</div><div class='del'>-	__u64	machine_flags;			/* 0x0388 */</div><div class='del'>-	__u8	pad_0x0390[0x0398-0x0390];	/* 0x0390 */</div><div class='del'>-	__u64	gmap;				/* 0x0398 */</div><div class='del'>-	__u32	spinlock_lockval;		/* 0x03a0 */</div><div class='del'>-	__u32	fpu_flags;			/* 0x03a4 */</div><div class='del'>-	__u8	pad_0x03a8[0x0400-0x03a8];	/* 0x03a8 */</div><div class='add'>+	__u32	cpu_nr;				/* 0x0388 */</div><div class='add'>+	__u32	softirq_pending;		/* 0x038c */</div><div class='add'>+	__u64	percpu_offset;			/* 0x0390 */</div><div class='add'>+	__u64	vdso_per_cpu_data;		/* 0x0398 */</div><div class='add'>+	__u64	machine_flags;			/* 0x03a0 */</div><div class='add'>+	__u32	preempt_count;			/* 0x03a8 */</div><div class='add'>+	__u8	pad_0x03ac[0x03b0-0x03ac];	/* 0x03ac */</div><div class='add'>+	__u64	gmap;				/* 0x03b0 */</div><div class='add'>+	__u32	spinlock_lockval;		/* 0x03b8 */</div><div class='add'>+	__u32	fpu_flags;			/* 0x03bc */</div><div class='add'>+	__u8	pad_0x03c0[0x0400-0x03c0];	/* 0x03c0 */</div><div class='ctx'> </div><div class='ctx'> 	/* Per cpu primary space access list */</div><div class='ctx'> 	__u32	paste[16];			/* 0x0400 */</div><div class='head'>diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h<br/>index 515fea5a3fc4..6e31d87fb669 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -8,7 +8,8 @@</div><div class='ctx'> #define __S390_MMU_CONTEXT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/ctl_reg.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -63,7 +64,7 @@ static inline void set_user_asce(struct mm_struct *mm)</div><div class='ctx'> 	S390_lowcore.user_asce = mm-&gt;context.asce;</div><div class='ctx'> 	if (current-&gt;thread.mm_segment.ar4)</div><div class='ctx'> 		__ctl_load(S390_lowcore.user_asce, 7, 7);</div><div class='del'>-	set_cpu_flag(CIF_ASCE);</div><div class='add'>+	set_cpu_flag(CIF_ASCE_PRIMARY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void clear_user_asce(void)</div><div class='hunk'>@@ -81,7 +82,7 @@ static inline void load_kernel_asce(void)</div><div class='ctx'> 	__ctl_store(asce, 1, 1);</div><div class='ctx'> 	if (asce != S390_lowcore.kernel_asce)</div><div class='ctx'> 		__ctl_load(S390_lowcore.kernel_asce, 1, 1);</div><div class='del'>-	set_cpu_flag(CIF_ASCE);</div><div class='add'>+	set_cpu_flag(CIF_ASCE_PRIMARY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,</div><div class='head'>diff --git a/arch/s390/include/asm/mutex.h b/arch/s390/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 458c1f7fbc18..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pull in the generic implementation for the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='head'>diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h<br/>index 6611f798d2be..4e3186649578 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/pci.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/pci.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/pci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/pci.h</a></div><div class='hunk'>@@ -133,6 +133,7 @@ struct zpci_dev {</div><div class='ctx'> 	/* Function measurement block */</div><div class='ctx'> 	struct zpci_fmb *fmb;</div><div class='ctx'> 	u16		fmb_update;	/* update interval */</div><div class='add'>+	u16		fmb_length;</div><div class='ctx'> 	/* software counters */</div><div class='ctx'> 	atomic64_t allocated_pages;</div><div class='ctx'> 	atomic64_t mapped_pages;</div><div class='head'>diff --git a/arch/s390/include/asm/pci_clp.h b/arch/s390/include/asm/pci_clp.h<br/>index e75c64cbcf08..938b8cc19fc6 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/pci_clp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/pci_clp.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/pci_clp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/pci_clp.h</a></div><div class='hunk'>@@ -46,6 +46,8 @@ struct clp_fh_list_entry {</div><div class='ctx'> #define CLP_UTIL_STR_LEN	64</div><div class='ctx'> #define CLP_PFIP_NR_SEGMENTS	4</div><div class='ctx'> </div><div class='add'>+extern bool zpci_unique_uid;</div><div class='add'>+</div><div class='ctx'> /* List PCI functions request */</div><div class='ctx'> struct clp_req_list_pci {</div><div class='ctx'> 	struct clp_req_hdr hdr;</div><div class='hunk'>@@ -59,7 +61,8 @@ struct clp_rsp_list_pci {</div><div class='ctx'> 	u64 resume_token;</div><div class='ctx'> 	u32 reserved2;</div><div class='ctx'> 	u16 max_fn;</div><div class='del'>-	u8 reserved3;</div><div class='add'>+	u8			: 7;</div><div class='add'>+	u8 uid_checking		: 1;</div><div class='ctx'> 	u8 entry_size;</div><div class='ctx'> 	struct clp_fh_list_entry fh_list[CLP_FH_LIST_NR_ENTRIES];</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -82,9 +85,10 @@ struct clp_rsp_query_pci {</div><div class='ctx'> 	u32 fid;			/* pci function id */</div><div class='ctx'> 	u8 bar_size[PCI_BAR_COUNT];</div><div class='ctx'> 	u16 pchid;</div><div class='del'>-	u32 bar[PCI_BAR_COUNT];</div><div class='add'>+	__le32 bar[PCI_BAR_COUNT];</div><div class='ctx'> 	u8 pfip[CLP_PFIP_NR_SEGMENTS];	/* pci function internal path */</div><div class='del'>-	u32			: 24;</div><div class='add'>+	u32			: 16;</div><div class='add'>+	u8 fmb_len;</div><div class='ctx'> 	u8 pft;				/* pci function type */</div><div class='ctx'> 	u64 sdma;			/* start dma as */</div><div class='ctx'> 	u64 edma;			/* end dma as */</div><div class='head'>diff --git a/arch/s390/include/asm/pgalloc.h b/arch/s390/include/asm/pgalloc.h<br/>index f4eb9843eed4..166f703dad7c 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/pgalloc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/pgalloc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/pgalloc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/pgalloc.h</a></div><div class='hunk'>@@ -27,17 +27,17 @@ extern int page_table_allocate_pgste;</div><div class='ctx'> </div><div class='ctx'> static inline void clear_table(unsigned long *s, unsigned long val, size_t n)</div><div class='ctx'> {</div><div class='del'>-	typedef struct { char _[n]; } addrtype;</div><div class='del'>-</div><div class='del'>-	*s = val;</div><div class='del'>-	n = (n / 256) - 1;</div><div class='del'>-	asm volatile(</div><div class='del'>-		"	mvc	8(248,%0),0(%0)\n"</div><div class='del'>-		"0:	mvc	256(256,%0),0(%0)\n"</div><div class='del'>-		"	la	%0,256(%0)\n"</div><div class='del'>-		"	brct	%1,0b\n"</div><div class='del'>-		: "+a" (s), "+d" (n), "=m" (*(addrtype *) s)</div><div class='del'>-		: "m" (*(addrtype *) s));</div><div class='add'>+	struct addrtype { char _[256]; };</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i += 256) {</div><div class='add'>+		*s = val;</div><div class='add'>+		asm volatile(</div><div class='add'>+			"mvc	8(248,%[s]),0(%[s])\n"</div><div class='add'>+			: "+m" (*(struct addrtype *) s)</div><div class='add'>+			: [s] "a" (s));</div><div class='add'>+		s += 256 / sizeof(long);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void crst_table_init(unsigned long *crst, unsigned long entry)</div><div class='head'>diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h<br/>index 0362cd5fa187..7ed1972b1920 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/pgtable.h</a></div><div class='hunk'>@@ -200,6 +200,7 @@ static inline int is_module_addr(void *addr)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Hardware bits in the page table entry */</div><div class='add'>+#define _PAGE_NOEXEC	0x100		/* HW no-execute bit  */</div><div class='ctx'> #define _PAGE_PROTECT	0x200		/* HW read-only bit  */</div><div class='ctx'> #define _PAGE_INVALID	0x400		/* HW invalid bit    */</div><div class='ctx'> #define _PAGE_LARGE	0x800		/* Bit to mark a large pte */</div><div class='hunk'>@@ -277,6 +278,7 @@ static inline int is_module_addr(void *addr)</div><div class='ctx'> /* Bits in the region table entry */</div><div class='ctx'> #define _REGION_ENTRY_ORIGIN	~0xfffUL/* region/segment table origin	    */</div><div class='ctx'> #define _REGION_ENTRY_PROTECT	0x200	/* region protection bit	    */</div><div class='add'>+#define _REGION_ENTRY_NOEXEC	0x100	/* region no-execute bit	    */</div><div class='ctx'> #define _REGION_ENTRY_OFFSET	0xc0	/* region table offset		    */</div><div class='ctx'> #define _REGION_ENTRY_INVALID	0x20	/* invalid region table entry	    */</div><div class='ctx'> #define _REGION_ENTRY_TYPE_MASK	0x0c	/* region/segment table type mask   */</div><div class='hunk'>@@ -316,6 +318,7 @@ static inline int is_module_addr(void *addr)</div><div class='ctx'> #define _SEGMENT_ENTRY_ORIGIN_LARGE ~0xfffffUL /* large page address	    */</div><div class='ctx'> #define _SEGMENT_ENTRY_ORIGIN	~0x7ffUL/* segment table origin		    */</div><div class='ctx'> #define _SEGMENT_ENTRY_PROTECT	0x200	/* page protection bit		    */</div><div class='add'>+#define _SEGMENT_ENTRY_NOEXEC	0x100	/* region no-execute bit	    */</div><div class='ctx'> #define _SEGMENT_ENTRY_INVALID	0x20	/* invalid segment table entry	    */</div><div class='ctx'> </div><div class='ctx'> #define _SEGMENT_ENTRY		(0)</div><div class='hunk'>@@ -385,17 +388,23 @@ static inline int is_module_addr(void *addr)</div><div class='ctx'>  * Page protection definitions.</div><div class='ctx'>  */</div><div class='ctx'> #define PAGE_NONE	__pgprot(_PAGE_PRESENT | _PAGE_INVALID | _PAGE_PROTECT)</div><div class='del'>-#define PAGE_READ	__pgprot(_PAGE_PRESENT | _PAGE_READ | \</div><div class='add'>+#define PAGE_RO		__pgprot(_PAGE_PRESENT | _PAGE_READ | \</div><div class='add'>+				 _PAGE_NOEXEC  | _PAGE_INVALID | _PAGE_PROTECT)</div><div class='add'>+#define PAGE_RX		__pgprot(_PAGE_PRESENT | _PAGE_READ | \</div><div class='ctx'> 				 _PAGE_INVALID | _PAGE_PROTECT)</div><div class='del'>-#define PAGE_WRITE	__pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \</div><div class='add'>+#define PAGE_RW		__pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \</div><div class='add'>+				 _PAGE_NOEXEC  | _PAGE_INVALID | _PAGE_PROTECT)</div><div class='add'>+#define PAGE_RWX	__pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \</div><div class='ctx'> 				 _PAGE_INVALID | _PAGE_PROTECT)</div><div class='ctx'> </div><div class='ctx'> #define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \</div><div class='del'>-				 _PAGE_YOUNG | _PAGE_DIRTY)</div><div class='add'>+				 _PAGE_YOUNG | _PAGE_DIRTY | _PAGE_NOEXEC)</div><div class='ctx'> #define PAGE_KERNEL	__pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \</div><div class='del'>-				 _PAGE_YOUNG | _PAGE_DIRTY)</div><div class='add'>+				 _PAGE_YOUNG | _PAGE_DIRTY | _PAGE_NOEXEC)</div><div class='ctx'> #define PAGE_KERNEL_RO	__pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_YOUNG | \</div><div class='del'>-				 _PAGE_PROTECT)</div><div class='add'>+				 _PAGE_PROTECT | _PAGE_NOEXEC)</div><div class='add'>+#define PAGE_KERNEL_EXEC __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \</div><div class='add'>+				  _PAGE_YOUNG |	_PAGE_DIRTY)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * On s390 the page table entry has an invalid bit and a read-only bit.</div><div class='hunk'>@@ -404,43 +413,51 @@ static inline int is_module_addr(void *addr)</div><div class='ctx'>  */</div><div class='ctx'>          /*xwr*/</div><div class='ctx'> #define __P000	PAGE_NONE</div><div class='del'>-#define __P001	PAGE_READ</div><div class='del'>-#define __P010	PAGE_READ</div><div class='del'>-#define __P011	PAGE_READ</div><div class='del'>-#define __P100	PAGE_READ</div><div class='del'>-#define __P101	PAGE_READ</div><div class='del'>-#define __P110	PAGE_READ</div><div class='del'>-#define __P111	PAGE_READ</div><div class='add'>+#define __P001	PAGE_RO</div><div class='add'>+#define __P010	PAGE_RO</div><div class='add'>+#define __P011	PAGE_RO</div><div class='add'>+#define __P100	PAGE_RX</div><div class='add'>+#define __P101	PAGE_RX</div><div class='add'>+#define __P110	PAGE_RX</div><div class='add'>+#define __P111	PAGE_RX</div><div class='ctx'> </div><div class='ctx'> #define __S000	PAGE_NONE</div><div class='del'>-#define __S001	PAGE_READ</div><div class='del'>-#define __S010	PAGE_WRITE</div><div class='del'>-#define __S011	PAGE_WRITE</div><div class='del'>-#define __S100	PAGE_READ</div><div class='del'>-#define __S101	PAGE_READ</div><div class='del'>-#define __S110	PAGE_WRITE</div><div class='del'>-#define __S111	PAGE_WRITE</div><div class='add'>+#define __S001	PAGE_RO</div><div class='add'>+#define __S010	PAGE_RW</div><div class='add'>+#define __S011	PAGE_RW</div><div class='add'>+#define __S100	PAGE_RX</div><div class='add'>+#define __S101	PAGE_RX</div><div class='add'>+#define __S110	PAGE_RWX</div><div class='add'>+#define __S111	PAGE_RWX</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Segment entry (large page) protection definitions.</div><div class='ctx'>  */</div><div class='ctx'> #define SEGMENT_NONE	__pgprot(_SEGMENT_ENTRY_INVALID | \</div><div class='ctx'> 				 _SEGMENT_ENTRY_PROTECT)</div><div class='del'>-#define SEGMENT_READ	__pgprot(_SEGMENT_ENTRY_PROTECT | \</div><div class='add'>+#define SEGMENT_RO	__pgprot(_SEGMENT_ENTRY_PROTECT | \</div><div class='add'>+				 _SEGMENT_ENTRY_READ | \</div><div class='add'>+				 _SEGMENT_ENTRY_NOEXEC)</div><div class='add'>+#define SEGMENT_RX	__pgprot(_SEGMENT_ENTRY_PROTECT | \</div><div class='ctx'> 				 _SEGMENT_ENTRY_READ)</div><div class='del'>-#define SEGMENT_WRITE	__pgprot(_SEGMENT_ENTRY_READ | \</div><div class='add'>+#define SEGMENT_RW	__pgprot(_SEGMENT_ENTRY_READ | \</div><div class='add'>+				 _SEGMENT_ENTRY_WRITE | \</div><div class='add'>+				 _SEGMENT_ENTRY_NOEXEC)</div><div class='add'>+#define SEGMENT_RWX	__pgprot(_SEGMENT_ENTRY_READ | \</div><div class='ctx'> 				 _SEGMENT_ENTRY_WRITE)</div><div class='ctx'> #define SEGMENT_KERNEL	__pgprot(_SEGMENT_ENTRY |	\</div><div class='ctx'> 				 _SEGMENT_ENTRY_LARGE |	\</div><div class='ctx'> 				 _SEGMENT_ENTRY_READ |	\</div><div class='ctx'> 				 _SEGMENT_ENTRY_WRITE | \</div><div class='ctx'> 				 _SEGMENT_ENTRY_YOUNG | \</div><div class='del'>-				 _SEGMENT_ENTRY_DIRTY)</div><div class='add'>+				 _SEGMENT_ENTRY_DIRTY | \</div><div class='add'>+				 _SEGMENT_ENTRY_NOEXEC)</div><div class='ctx'> #define SEGMENT_KERNEL_RO __pgprot(_SEGMENT_ENTRY |	\</div><div class='ctx'> 				 _SEGMENT_ENTRY_LARGE |	\</div><div class='ctx'> 				 _SEGMENT_ENTRY_READ |	\</div><div class='ctx'> 				 _SEGMENT_ENTRY_YOUNG |	\</div><div class='del'>-				 _SEGMENT_ENTRY_PROTECT)</div><div class='add'>+				 _SEGMENT_ENTRY_PROTECT | \</div><div class='add'>+				 _SEGMENT_ENTRY_NOEXEC)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Region3 entry (large page) protection definitions.</div><div class='hunk'>@@ -451,12 +468,14 @@ static inline int is_module_addr(void *addr)</div><div class='ctx'> 				 _REGION3_ENTRY_READ |	 \</div><div class='ctx'> 				 _REGION3_ENTRY_WRITE |	 \</div><div class='ctx'> 				 _REGION3_ENTRY_YOUNG |	 \</div><div class='del'>-				 _REGION3_ENTRY_DIRTY)</div><div class='add'>+				 _REGION3_ENTRY_DIRTY | \</div><div class='add'>+				 _REGION_ENTRY_NOEXEC)</div><div class='ctx'> #define REGION3_KERNEL_RO __pgprot(_REGION_ENTRY_TYPE_R3 | \</div><div class='ctx'> 				   _REGION3_ENTRY_LARGE |  \</div><div class='ctx'> 				   _REGION3_ENTRY_READ |   \</div><div class='ctx'> 				   _REGION3_ENTRY_YOUNG |  \</div><div class='del'>-				   _REGION_ENTRY_PROTECT)</div><div class='add'>+				   _REGION_ENTRY_PROTECT | \</div><div class='add'>+				   _REGION_ENTRY_NOEXEC)</div><div class='ctx'> </div><div class='ctx'> static inline int mm_has_pgste(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='hunk'>@@ -621,12 +640,12 @@ static inline int pud_bad(pud_t pud)</div><div class='ctx'> </div><div class='ctx'> static inline int pmd_present(pmd_t pmd)</div><div class='ctx'> {</div><div class='del'>-	return pmd_val(pmd) != _SEGMENT_ENTRY_INVALID;</div><div class='add'>+	return pmd_val(pmd) != _SEGMENT_ENTRY_EMPTY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int pmd_none(pmd_t pmd)</div><div class='ctx'> {</div><div class='del'>-	return pmd_val(pmd) == _SEGMENT_ENTRY_INVALID;</div><div class='add'>+	return pmd_val(pmd) == _SEGMENT_ENTRY_EMPTY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long pmd_pfn(pmd_t pmd)</div><div class='hunk'>@@ -784,7 +803,7 @@ static inline void pud_clear(pud_t *pud)</div><div class='ctx'> </div><div class='ctx'> static inline void pmd_clear(pmd_t *pmdp)</div><div class='ctx'> {</div><div class='del'>-	pmd_val(*pmdp) = _SEGMENT_ENTRY_INVALID;</div><div class='add'>+	pmd_val(*pmdp) = _SEGMENT_ENTRY_EMPTY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)</div><div class='hunk'>@@ -801,14 +820,14 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)</div><div class='ctx'> 	pte_val(pte) &amp;= _PAGE_CHG_MASK;</div><div class='ctx'> 	pte_val(pte) |= pgprot_val(newprot);</div><div class='ctx'> 	/*</div><div class='del'>-	 * newprot for PAGE_NONE, PAGE_READ and PAGE_WRITE has the</div><div class='del'>-	 * invalid bit set, clear it again for readable, young pages</div><div class='add'>+	 * newprot for PAGE_NONE, PAGE_RO, PAGE_RX, PAGE_RW and PAGE_RWX</div><div class='add'>+	 * has the invalid bit set, clear it again for readable, young pages</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((pte_val(pte) &amp; _PAGE_YOUNG) &amp;&amp; (pte_val(pte) &amp; _PAGE_READ))</div><div class='ctx'> 		pte_val(pte) &amp;= ~_PAGE_INVALID;</div><div class='ctx'> 	/*</div><div class='del'>-	 * newprot for PAGE_READ and PAGE_WRITE has the page protection</div><div class='del'>-	 * bit set, clear it again for writable, dirty pages</div><div class='add'>+	 * newprot for PAGE_RO, PAGE_RX, PAGE_RW and PAGE_RWX has the page</div><div class='add'>+	 * protection bit set, clear it again for writable, dirty pages</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((pte_val(pte) &amp; _PAGE_DIRTY) &amp;&amp; (pte_val(pte) &amp; _PAGE_WRITE))</div><div class='ctx'> 		pte_val(pte) &amp;= ~_PAGE_PROTECT;</div><div class='hunk'>@@ -1029,6 +1048,8 @@ int get_guest_storage_key(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 			      pte_t *ptep, pte_t entry)</div><div class='ctx'> {</div><div class='add'>+	if (!MACHINE_HAS_NX)</div><div class='add'>+		pte_val(entry) &amp;= ~_PAGE_NOEXEC;</div><div class='ctx'> 	if (mm_has_pgste(mm))</div><div class='ctx'> 		ptep_set_pte_at(mm, addr, ptep, entry);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1173,14 +1194,18 @@ static inline pud_t pud_mkdirty(pud_t pud)</div><div class='ctx'> static inline unsigned long massage_pgprot_pmd(pgprot_t pgprot)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * pgprot is PAGE_NONE, PAGE_READ, or PAGE_WRITE (see __Pxxx / __Sxxx)</div><div class='del'>-	 * Convert to segment table entry format.</div><div class='add'>+	 * pgprot is PAGE_NONE, PAGE_RO, PAGE_RX, PAGE_RW or PAGE_RWX</div><div class='add'>+	 * (see __Pxxx / __Sxxx). Convert to segment table entry format.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pgprot_val(pgprot) == pgprot_val(PAGE_NONE))</div><div class='ctx'> 		return pgprot_val(SEGMENT_NONE);</div><div class='del'>-	if (pgprot_val(pgprot) == pgprot_val(PAGE_READ))</div><div class='del'>-		return pgprot_val(SEGMENT_READ);</div><div class='del'>-	return pgprot_val(SEGMENT_WRITE);</div><div class='add'>+	if (pgprot_val(pgprot) == pgprot_val(PAGE_RO))</div><div class='add'>+		return pgprot_val(SEGMENT_RO);</div><div class='add'>+	if (pgprot_val(pgprot) == pgprot_val(PAGE_RX))</div><div class='add'>+		return pgprot_val(SEGMENT_RX);</div><div class='add'>+	if (pgprot_val(pgprot) == pgprot_val(PAGE_RW))</div><div class='add'>+		return pgprot_val(SEGMENT_RW);</div><div class='add'>+	return pgprot_val(SEGMENT_RWX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline pmd_t pmd_mkyoung(pmd_t pmd)</div><div class='hunk'>@@ -1315,6 +1340,8 @@ static inline int pmdp_clear_flush_young(struct vm_area_struct *vma,</div><div class='ctx'> static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 			      pmd_t *pmdp, pmd_t entry)</div><div class='ctx'> {</div><div class='add'>+	if (!MACHINE_HAS_NX)</div><div class='add'>+		pmd_val(entry) &amp;= ~_SEGMENT_ENTRY_NOEXEC;</div><div class='ctx'> 	*pmdp = entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1330,7 +1357,7 @@ static inline pmd_t pmd_mkhuge(pmd_t pmd)</div><div class='ctx'> static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,</div><div class='ctx'> 					    unsigned long addr, pmd_t *pmdp)</div><div class='ctx'> {</div><div class='del'>-	return pmdp_xchg_direct(mm, addr, pmdp, __pmd(_SEGMENT_ENTRY_INVALID));</div><div class='add'>+	return pmdp_xchg_direct(mm, addr, pmdp, __pmd(_SEGMENT_ENTRY_EMPTY));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR_FULL</div><div class='hunk'>@@ -1340,10 +1367,10 @@ static inline pmd_t pmdp_huge_get_and_clear_full(struct mm_struct *mm,</div><div class='ctx'> {</div><div class='ctx'> 	if (full) {</div><div class='ctx'> 		pmd_t pmd = *pmdp;</div><div class='del'>-		*pmdp = __pmd(_SEGMENT_ENTRY_INVALID);</div><div class='add'>+		*pmdp = __pmd(_SEGMENT_ENTRY_EMPTY);</div><div class='ctx'> 		return pmd;</div><div class='ctx'> 	}</div><div class='del'>-	return pmdp_xchg_lazy(mm, addr, pmdp, __pmd(_SEGMENT_ENTRY_INVALID));</div><div class='add'>+	return pmdp_xchg_lazy(mm, addr, pmdp, __pmd(_SEGMENT_ENTRY_EMPTY));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define __HAVE_ARCH_PMDP_HUGE_CLEAR_FLUSH</div><div class='hunk'>@@ -1357,7 +1384,7 @@ static inline pmd_t pmdp_huge_clear_flush(struct vm_area_struct *vma,</div><div class='ctx'> static inline void pmdp_invalidate(struct vm_area_struct *vma,</div><div class='ctx'> 				   unsigned long addr, pmd_t *pmdp)</div><div class='ctx'> {</div><div class='del'>-	pmdp_xchg_direct(vma-&gt;vm_mm, addr, pmdp, __pmd(_SEGMENT_ENTRY_INVALID));</div><div class='add'>+	pmdp_xchg_direct(vma-&gt;vm_mm, addr, pmdp, __pmd(_SEGMENT_ENTRY_EMPTY));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define __HAVE_ARCH_PMDP_SET_WRPROTECT</div><div class='hunk'>@@ -1389,7 +1416,7 @@ static inline int pmd_trans_huge(pmd_t pmd)</div><div class='ctx'> #define has_transparent_hugepage has_transparent_hugepage</div><div class='ctx'> static inline int has_transparent_hugepage(void)</div><div class='ctx'> {</div><div class='del'>-	return MACHINE_HAS_HPAGE ? 1 : 0;</div><div class='add'>+	return MACHINE_HAS_EDAT1 ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/pkey.h b/arch/s390/include/asm/pkey.h<br/>new file mode 100644<br/>index 000000000000..b48aef4188f6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/pkey.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/pkey.h</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+/*</div><div class='add'>+ * Kernelspace interface to the pkey device driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright IBM Corp. 2016</div><div class='add'>+ *</div><div class='add'>+ * Author: Harald Freudenberger &lt;freude@de.ibm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _KAPI_PKEY_H</div><div class='add'>+#define _KAPI_PKEY_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;uapi/asm/pkey.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generate (AES) random secure key.</div><div class='add'>+ * @param cardnr may be -1 (use default card)</div><div class='add'>+ * @param domain may be -1 (use default domain)</div><div class='add'>+ * @param keytype one of the PKEY_KEYTYPE values</div><div class='add'>+ * @param seckey pointer to buffer receiving the secure key</div><div class='add'>+ * @return 0 on success, negative errno value on failure</div><div class='add'>+ */</div><div class='add'>+int pkey_genseckey(__u16 cardnr, __u16 domain,</div><div class='add'>+		   __u32 keytype, struct pkey_seckey *seckey);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generate (AES) secure key with given key value.</div><div class='add'>+ * @param cardnr may be -1 (use default card)</div><div class='add'>+ * @param domain may be -1 (use default domain)</div><div class='add'>+ * @param keytype one of the PKEY_KEYTYPE values</div><div class='add'>+ * @param clrkey pointer to buffer with clear key data</div><div class='add'>+ * @param seckey pointer to buffer receiving the secure key</div><div class='add'>+ * @return 0 on success, negative errno value on failure</div><div class='add'>+ */</div><div class='add'>+int pkey_clr2seckey(__u16 cardnr, __u16 domain, __u32 keytype,</div><div class='add'>+		    const struct pkey_clrkey *clrkey,</div><div class='add'>+		    struct pkey_seckey *seckey);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Derive (AES) proteced key from the (AES) secure key blob.</div><div class='add'>+ * @param cardnr may be -1 (use default card)</div><div class='add'>+ * @param domain may be -1 (use default domain)</div><div class='add'>+ * @param seckey pointer to buffer with the input secure key</div><div class='add'>+ * @param protkey pointer to buffer receiving the protected key and</div><div class='add'>+ *	  additional info (type, length)</div><div class='add'>+ * @return 0 on success, negative errno value on failure</div><div class='add'>+ */</div><div class='add'>+int pkey_sec2protkey(__u16 cardnr, __u16 domain,</div><div class='add'>+		     const struct pkey_seckey *seckey,</div><div class='add'>+		     struct pkey_protkey *protkey);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Derive (AES) protected key from a given clear key value.</div><div class='add'>+ * @param keytype one of the PKEY_KEYTYPE values</div><div class='add'>+ * @param clrkey pointer to buffer with clear key data</div><div class='add'>+ * @param protkey pointer to buffer receiving the protected key and</div><div class='add'>+ *	  additional info (type, length)</div><div class='add'>+ * @return 0 on success, negative errno value on failure</div><div class='add'>+ */</div><div class='add'>+int pkey_clr2protkey(__u32 keytype,</div><div class='add'>+		     const struct pkey_clrkey *clrkey,</div><div class='add'>+		     struct pkey_protkey *protkey);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Search for a matching crypto card based on the Master Key</div><div class='add'>+ * Verification Pattern provided inside a secure key.</div><div class='add'>+ * @param seckey pointer to buffer with the input secure key</div><div class='add'>+ * @param cardnr pointer to cardnr, receives the card number on success</div><div class='add'>+ * @param domain pointer to domain, receives the domain number on success</div><div class='add'>+ * @param verify if set, always verify by fetching verification pattern</div><div class='add'>+ *	  from card</div><div class='add'>+ * @return 0 on success, negative errno value on failure. If no card could be</div><div class='add'>+ *	   found, -ENODEV is returned.</div><div class='add'>+ */</div><div class='add'>+int pkey_findcard(const struct pkey_seckey *seckey,</div><div class='add'>+		  __u16 *cardnr, __u16 *domain, int verify);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find card and transform secure key to protected key.</div><div class='add'>+ * @param seckey pointer to buffer with the input secure key</div><div class='add'>+ * @param protkey pointer to buffer receiving the protected key and</div><div class='add'>+ *	  additional info (type, length)</div><div class='add'>+ * @return 0 on success, negative errno value on failure</div><div class='add'>+ */</div><div class='add'>+int pkey_skey2pkey(const struct pkey_seckey *seckey,</div><div class='add'>+		   struct pkey_protkey *protkey);</div><div class='add'>+</div><div class='add'>+#endif /* _KAPI_PKEY_H */</div><div class='head'>diff --git a/arch/s390/include/asm/preempt.h b/arch/s390/include/asm/preempt.h<br/>new file mode 100644<br/>index 000000000000..b0776b2c8dcf<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/preempt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/preempt.h</a></div><div class='hunk'>@@ -0,0 +1,137 @@</div><div class='add'>+#ifndef __ASM_PREEMPT_H</div><div class='add'>+#define __ASM_PREEMPT_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/current.h&gt;</div><div class='add'>+#include &lt;linux/thread_info.h&gt;</div><div class='add'>+#include &lt;asm/atomic_ops.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES</div><div class='add'>+</div><div class='add'>+#define PREEMPT_ENABLED	(0 + PREEMPT_NEED_RESCHED)</div><div class='add'>+</div><div class='add'>+static inline int preempt_count(void)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(S390_lowcore.preempt_count) &amp; ~PREEMPT_NEED_RESCHED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void preempt_count_set(int pc)</div><div class='add'>+{</div><div class='add'>+	int old, new;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		old = READ_ONCE(S390_lowcore.preempt_count);</div><div class='add'>+		new = (old &amp; PREEMPT_NEED_RESCHED) |</div><div class='add'>+			(pc &amp; ~PREEMPT_NEED_RESCHED);</div><div class='add'>+	} while (__atomic_cmpxchg(&amp;S390_lowcore.preempt_count,</div><div class='add'>+				  old, new) != old);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define init_task_preempt_count(p)	do { } while (0)</div><div class='add'>+</div><div class='add'>+#define init_idle_preempt_count(p, cpu)	do { \</div><div class='add'>+	S390_lowcore.preempt_count = PREEMPT_ENABLED; \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static inline void set_preempt_need_resched(void)</div><div class='add'>+{</div><div class='add'>+	__atomic_and(~PREEMPT_NEED_RESCHED, &amp;S390_lowcore.preempt_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void clear_preempt_need_resched(void)</div><div class='add'>+{</div><div class='add'>+	__atomic_or(PREEMPT_NEED_RESCHED, &amp;S390_lowcore.preempt_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool test_preempt_need_resched(void)</div><div class='add'>+{</div><div class='add'>+	return !(READ_ONCE(S390_lowcore.preempt_count) &amp; PREEMPT_NEED_RESCHED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __preempt_count_add(int val)</div><div class='add'>+{</div><div class='add'>+	if (__builtin_constant_p(val) &amp;&amp; (val &gt;= -128) &amp;&amp; (val &lt;= 127))</div><div class='add'>+		__atomic_add_const(val, &amp;S390_lowcore.preempt_count);</div><div class='add'>+	else</div><div class='add'>+		__atomic_add(val, &amp;S390_lowcore.preempt_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __preempt_count_sub(int val)</div><div class='add'>+{</div><div class='add'>+	__preempt_count_add(-val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool __preempt_count_dec_and_test(void)</div><div class='add'>+{</div><div class='add'>+	return __atomic_add(-1, &amp;S390_lowcore.preempt_count) == 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool should_resched(int preempt_offset)</div><div class='add'>+{</div><div class='add'>+	return unlikely(READ_ONCE(S390_lowcore.preempt_count) ==</div><div class='add'>+			preempt_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_HAVE_MARCH_Z196_FEATURES */</div><div class='add'>+</div><div class='add'>+#define PREEMPT_ENABLED	(0)</div><div class='add'>+</div><div class='add'>+static inline int preempt_count(void)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(S390_lowcore.preempt_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void preempt_count_set(int pc)</div><div class='add'>+{</div><div class='add'>+	S390_lowcore.preempt_count = pc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define init_task_preempt_count(p)	do { } while (0)</div><div class='add'>+</div><div class='add'>+#define init_idle_preempt_count(p, cpu)	do { \</div><div class='add'>+	S390_lowcore.preempt_count = PREEMPT_ENABLED; \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static inline void set_preempt_need_resched(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void clear_preempt_need_resched(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool test_preempt_need_resched(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __preempt_count_add(int val)</div><div class='add'>+{</div><div class='add'>+	S390_lowcore.preempt_count += val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __preempt_count_sub(int val)</div><div class='add'>+{</div><div class='add'>+	S390_lowcore.preempt_count -= val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool __preempt_count_dec_and_test(void)</div><div class='add'>+{</div><div class='add'>+	return !--S390_lowcore.preempt_count &amp;&amp; tif_need_resched();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool should_resched(int preempt_offset)</div><div class='add'>+{</div><div class='add'>+	return unlikely(preempt_count() == preempt_offset &amp;&amp;</div><div class='add'>+			tif_need_resched());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PREEMPT</div><div class='add'>+extern asmlinkage void preempt_schedule(void);</div><div class='add'>+#define __preempt_schedule() preempt_schedule()</div><div class='add'>+extern asmlinkage void preempt_schedule_notrace(void);</div><div class='add'>+#define __preempt_schedule_notrace() preempt_schedule_notrace()</div><div class='add'>+#endif /* CONFIG_PREEMPT */</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_PREEMPT_H */</div><div class='head'>diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h<br/>index 602af692efdc..e4988710aa86 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/processor.h</a></div><div class='hunk'>@@ -14,14 +14,16 @@</div><div class='ctx'> #include &lt;linux/const.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CIF_MCCK_PENDING	0	/* machine check handling is pending */</div><div class='del'>-#define CIF_ASCE		1	/* user asce needs fixup / uaccess */</div><div class='del'>-#define CIF_NOHZ_DELAY		2	/* delay HZ disable for a tick */</div><div class='del'>-#define CIF_FPU			3	/* restore FPU registers */</div><div class='del'>-#define CIF_IGNORE_IRQ		4	/* ignore interrupt (for udelay) */</div><div class='del'>-#define CIF_ENABLED_WAIT	5	/* in enabled wait state */</div><div class='add'>+#define CIF_ASCE_PRIMARY	1	/* primary asce needs fixup / uaccess */</div><div class='add'>+#define CIF_ASCE_SECONDARY	2	/* secondary asce needs fixup / uaccess */</div><div class='add'>+#define CIF_NOHZ_DELAY		3	/* delay HZ disable for a tick */</div><div class='add'>+#define CIF_FPU			4	/* restore FPU registers */</div><div class='add'>+#define CIF_IGNORE_IRQ		5	/* ignore interrupt (for udelay) */</div><div class='add'>+#define CIF_ENABLED_WAIT	6	/* in enabled wait state */</div><div class='ctx'> </div><div class='ctx'> #define _CIF_MCCK_PENDING	_BITUL(CIF_MCCK_PENDING)</div><div class='del'>-#define _CIF_ASCE		_BITUL(CIF_ASCE)</div><div class='add'>+#define _CIF_ASCE_PRIMARY	_BITUL(CIF_ASCE_PRIMARY)</div><div class='add'>+#define _CIF_ASCE_SECONDARY	_BITUL(CIF_ASCE_SECONDARY)</div><div class='ctx'> #define _CIF_NOHZ_DELAY		_BITUL(CIF_NOHZ_DELAY)</div><div class='ctx'> #define _CIF_FPU		_BITUL(CIF_FPU)</div><div class='ctx'> #define _CIF_IGNORE_IRQ		_BITUL(CIF_IGNORE_IRQ)</div><div class='hunk'>@@ -89,7 +91,8 @@ extern void execve_tail(void);</div><div class='ctx'>  * User space process size: 2GB for 31 bit, 4TB or 8PT for 64 bit.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define TASK_SIZE_OF(tsk)	((tsk)-&gt;mm-&gt;context.asce_limit)</div><div class='add'>+#define TASK_SIZE_OF(tsk)	((tsk)-&gt;mm ? \</div><div class='add'>+				 (tsk)-&gt;mm-&gt;context.asce_limit : TASK_MAX_SIZE)</div><div class='ctx'> #define TASK_UNMAPPED_BASE	(test_thread_flag(TIF_31BIT) ? \</div><div class='ctx'> 					(1UL &lt;&lt; 30) : (1UL &lt;&lt; 41))</div><div class='ctx'> #define TASK_SIZE		TASK_SIZE_OF(current)</div><div class='hunk'>@@ -110,14 +113,23 @@ typedef struct {</div><div class='ctx'> struct thread_struct {</div><div class='ctx'> 	unsigned int  acrs[NUM_ACRS];</div><div class='ctx'>         unsigned long ksp;              /* kernel stack pointer             */</div><div class='add'>+	unsigned long user_timer;	/* task cputime in user space */</div><div class='add'>+	unsigned long guest_timer;	/* task cputime in kvm guest */</div><div class='add'>+	unsigned long system_timer;	/* task cputime in kernel space */</div><div class='add'>+	unsigned long hardirq_timer;	/* task cputime in hardirq context */</div><div class='add'>+	unsigned long softirq_timer;	/* task cputime in softirq context */</div><div class='add'>+	unsigned long sys_call_table;	/* system call table address */</div><div class='ctx'> 	mm_segment_t mm_segment;</div><div class='ctx'> 	unsigned long gmap_addr;	/* address of last gmap fault. */</div><div class='ctx'> 	unsigned int gmap_write_flag;	/* gmap fault write indication */</div><div class='ctx'> 	unsigned int gmap_int_code;	/* int code of last gmap fault */</div><div class='ctx'> 	unsigned int gmap_pfault;	/* signal of a pending guest pfault */</div><div class='add'>+	/* Per-thread information related to debugging */</div><div class='ctx'> 	struct per_regs per_user;	/* User specified PER registers */</div><div class='ctx'> 	struct per_event per_event;	/* Cause of the last PER trap */</div><div class='ctx'> 	unsigned long per_flags;	/* Flags to control debug behavior */</div><div class='add'>+	unsigned int system_call;	/* system call number in signal */</div><div class='add'>+	unsigned long last_break;	/* last breaking-event-address. */</div><div class='ctx'>         /* pfault_wait is used to block the process on a pfault event */</div><div class='ctx'> 	unsigned long pfault_wait;</div><div class='ctx'> 	struct list_head list;</div><div class='hunk'>@@ -191,10 +203,12 @@ struct stack_frame {</div><div class='ctx'> struct task_struct;</div><div class='ctx'> struct mm_struct;</div><div class='ctx'> struct seq_file;</div><div class='add'>+struct pt_regs;</div><div class='ctx'> </div><div class='ctx'> typedef int (*dump_trace_func_t)(void *data, unsigned long address, int reliable);</div><div class='ctx'> void dump_trace(dump_trace_func_t func, void *data,</div><div class='ctx'> 		struct task_struct *task, unsigned long sp);</div><div class='add'>+void show_registers(struct pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> void show_cacheinfo(struct seq_file *m);</div><div class='ctx'> </div><div class='hunk'>@@ -234,9 +248,10 @@ static inline unsigned short stap(void)</div><div class='ctx'> /*</div><div class='ctx'>  * Give up the time slice of the virtual PU.</div><div class='ctx'>  */</div><div class='del'>-void cpu_relax(void);</div><div class='add'>+#define cpu_relax_yield cpu_relax_yield</div><div class='add'>+void cpu_relax_yield(void);</div><div class='ctx'> </div><div class='del'>-#define cpu_relax_lowlatency()  barrier()</div><div class='add'>+#define cpu_relax() barrier()</div><div class='ctx'> </div><div class='ctx'> #define ECAG_CACHE_ATTRIBUTE	0</div><div class='ctx'> #define ECAG_CPU_ATTRIBUTE	1</div><div class='hunk'>@@ -351,12 +366,12 @@ extern void (*s390_base_ext_handler_fn)(void);</div><div class='ctx'> extern int memcpy_real(void *, void *, size_t);</div><div class='ctx'> extern void memcpy_absolute(void *, void *, size_t);</div><div class='ctx'> </div><div class='del'>-#define mem_assign_absolute(dest, val) {			\</div><div class='add'>+#define mem_assign_absolute(dest, val) do {			\</div><div class='ctx'> 	__typeof__(dest) __tmp = (val);				\</div><div class='ctx'> 								\</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(__tmp) != sizeof(val));		\</div><div class='ctx'> 	memcpy_absolute(&amp;(dest), &amp;__tmp, sizeof(__tmp));	\</div><div class='del'>-}</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h<br/>index 2ad9c204b1a2..ace3bd315438 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/sclp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/sclp.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/sclp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/sclp.h</a></div><div class='hunk'>@@ -101,7 +101,13 @@ struct zpci_report_error_header {</div><div class='ctx'> 	u8 data[0];	/* Subsequent Data passed verbatim to SCLP ET 24 */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-int sclp_get_core_info(struct sclp_core_info *info);</div><div class='add'>+int sclp_early_get_core_info(struct sclp_core_info *info);</div><div class='add'>+void sclp_early_get_ipl_info(struct sclp_ipl_info *info);</div><div class='add'>+void sclp_early_detect(void);</div><div class='add'>+void sclp_early_printk(const char *s);</div><div class='add'>+void __sclp_early_printk(const char *s, unsigned int len);</div><div class='add'>+</div><div class='add'>+int _sclp_get_core_info(struct sclp_core_info *info);</div><div class='ctx'> int sclp_core_configure(u8 core);</div><div class='ctx'> int sclp_core_deconfigure(u8 core);</div><div class='ctx'> int sclp_sdias_blk_count(void);</div><div class='hunk'>@@ -109,14 +115,18 @@ int sclp_sdias_copy(void *dest, int blk_num, int nr_blks);</div><div class='ctx'> int sclp_chp_configure(struct chp_id chpid);</div><div class='ctx'> int sclp_chp_deconfigure(struct chp_id chpid);</div><div class='ctx'> int sclp_chp_read_info(struct sclp_chp_info *info);</div><div class='del'>-void sclp_get_ipl_info(struct sclp_ipl_info *info);</div><div class='ctx'> int sclp_pci_configure(u32 fid);</div><div class='ctx'> int sclp_pci_deconfigure(u32 fid);</div><div class='ctx'> int sclp_pci_report(struct zpci_report_error_header *report, u32 fh, u32 fid);</div><div class='ctx'> int memcpy_hsa_kernel(void *dest, unsigned long src, size_t count);</div><div class='ctx'> int memcpy_hsa_user(void __user *dest, unsigned long src, size_t count);</div><div class='del'>-void sclp_early_detect(void);</div><div class='del'>-void _sclp_print_early(const char *);</div><div class='ctx'> void sclp_ocf_cpc_name_copy(char *dst);</div><div class='ctx'> </div><div class='add'>+static inline int sclp_get_core_info(struct sclp_core_info *info, int early)</div><div class='add'>+{</div><div class='add'>+	if (early)</div><div class='add'>+		return sclp_early_get_core_info(info);</div><div class='add'>+	return _sclp_get_core_info(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_S390_SCLP_H */</div><div class='head'>diff --git a/arch/s390/include/asm/scsw.h b/arch/s390/include/asm/scsw.h<br/>index 4af99cdaddf5..17a7904f001a 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/scsw.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/scsw.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/scsw.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/scsw.h</a></div><div class='hunk'>@@ -96,7 +96,8 @@ struct tm_scsw {</div><div class='ctx'> 	u32 dstat:8;</div><div class='ctx'> 	u32 cstat:8;</div><div class='ctx'> 	u32 fcxs:8;</div><div class='del'>-	u32 schxs:8;</div><div class='add'>+	u32 ifob:1;</div><div class='add'>+	u32 sesq:7;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -177,6 +178,9 @@ union scsw {</div><div class='ctx'> #define SCHN_STAT_INTF_CTRL_CHK	 0x02</div><div class='ctx'> #define SCHN_STAT_CHAIN_CHECK	 0x01</div><div class='ctx'> </div><div class='add'>+#define SCSW_SESQ_DEV_NOFCX	 3</div><div class='add'>+#define SCSW_SESQ_PATH_NOFCX	 4</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * architectured values for first sense byte</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h<br/>index 5e8d57e1cc5e..30bdb5a027f3 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/setup.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/setup.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/setup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/setup.h</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #define MACHINE_FLAG_TLB_LC	_BITUL(12)</div><div class='ctx'> #define MACHINE_FLAG_VX		_BITUL(13)</div><div class='ctx'> #define MACHINE_FLAG_CAD	_BITUL(14)</div><div class='add'>+#define MACHINE_FLAG_NX		_BITUL(15)</div><div class='ctx'> </div><div class='ctx'> #define LPP_MAGIC		_BITUL(31)</div><div class='ctx'> #define LPP_PFAULT_PID_MASK	_AC(0xffffffff, UL)</div><div class='hunk'>@@ -58,9 +59,6 @@ extern void detect_memory_memblock(void);</div><div class='ctx'> </div><div class='ctx'> #define MACHINE_HAS_DIAG9C	(S390_lowcore.machine_flags &amp; MACHINE_FLAG_DIAG9C)</div><div class='ctx'> #define MACHINE_HAS_ESOP	(S390_lowcore.machine_flags &amp; MACHINE_FLAG_ESOP)</div><div class='del'>-#define MACHINE_HAS_PFMF	MACHINE_HAS_EDAT1</div><div class='del'>-#define MACHINE_HAS_HPAGE	MACHINE_HAS_EDAT1</div><div class='del'>-</div><div class='ctx'> #define MACHINE_HAS_IDTE	(S390_lowcore.machine_flags &amp; MACHINE_FLAG_IDTE)</div><div class='ctx'> #define MACHINE_HAS_DIAG44	(S390_lowcore.machine_flags &amp; MACHINE_FLAG_DIAG44)</div><div class='ctx'> #define MACHINE_HAS_EDAT1	(S390_lowcore.machine_flags &amp; MACHINE_FLAG_EDAT1)</div><div class='hunk'>@@ -71,6 +69,7 @@ extern void detect_memory_memblock(void);</div><div class='ctx'> #define MACHINE_HAS_TLB_LC	(S390_lowcore.machine_flags &amp; MACHINE_FLAG_TLB_LC)</div><div class='ctx'> #define MACHINE_HAS_VX		(S390_lowcore.machine_flags &amp; MACHINE_FLAG_VX)</div><div class='ctx'> #define MACHINE_HAS_CAD		(S390_lowcore.machine_flags &amp; MACHINE_FLAG_CAD)</div><div class='add'>+#define MACHINE_HAS_NX		(S390_lowcore.machine_flags &amp; MACHINE_FLAG_NX)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Console mode. Override with conmode=</div><div class='head'>diff --git a/arch/s390/include/asm/smp.h b/arch/s390/include/asm/smp.h<br/>index 0cc383b9be7f..3deb134587b7 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/smp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/smp.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/smp.h</a></div><div class='hunk'>@@ -36,6 +36,7 @@ extern void smp_yield_cpu(int cpu);</div><div class='ctx'> extern void smp_cpu_set_polarization(int cpu, int val);</div><div class='ctx'> extern int smp_cpu_get_polarization(int cpu);</div><div class='ctx'> extern void smp_fill_possible_mask(void);</div><div class='add'>+extern void smp_detect_cpus(void);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_SMP */</div><div class='ctx'> </div><div class='hunk'>@@ -56,6 +57,7 @@ static inline int smp_store_status(int cpu) { return 0; }</div><div class='ctx'> static inline int smp_vcpu_scheduled(int cpu) { return 1; }</div><div class='ctx'> static inline void smp_yield_cpu(int cpu) { }</div><div class='ctx'> static inline void smp_fill_possible_mask(void) { }</div><div class='add'>+static inline void smp_detect_cpus(void) { }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='hunk'>@@ -69,6 +71,12 @@ static inline void smp_stop_cpu(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Return thread 0 CPU number as base CPU */</div><div class='add'>+static inline int smp_get_base_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	return cpu - (cpu % (smp_cpu_mtid + 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> extern int smp_rescan_cpus(void);</div><div class='ctx'> extern void __noreturn cpu_die(void);</div><div class='head'>diff --git a/arch/s390/include/asm/spinlock.h b/arch/s390/include/asm/spinlock.h<br/>index 7e9e09f600fa..ffc45048ea7d 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/spinlock.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/spinlock.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/spinlock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/spinlock.h</a></div><div class='hunk'>@@ -23,6 +23,14 @@ _raw_compare_and_swap(unsigned int *lock, unsigned int old, unsigned int new)</div><div class='ctx'> 	return __sync_bool_compare_and_swap(lock, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_SMP</div><div class='add'>+static inline bool arch_vcpu_is_preempted(int cpu) { return false; }</div><div class='add'>+#else</div><div class='add'>+bool arch_vcpu_is_preempted(int cpu);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define vcpu_is_preempted arch_vcpu_is_preempted</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Simple spin lock operations.  There are two variants, one clears IRQ's</div><div class='ctx'>  * on the local processor, one does not.</div><div class='hunk'>@@ -55,7 +63,7 @@ static inline int arch_spin_value_unlocked(arch_spinlock_t lock)</div><div class='ctx'> </div><div class='ctx'> static inline int arch_spin_is_locked(arch_spinlock_t *lp)</div><div class='ctx'> {</div><div class='del'>-	return ACCESS_ONCE(lp-&gt;lock) != 0;</div><div class='add'>+	return READ_ONCE(lp-&gt;lock) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int arch_spin_trylock_once(arch_spinlock_t *lp)</div><div class='head'>diff --git a/arch/s390/include/asm/string.h b/arch/s390/include/asm/string.h<br/>index 8662f5c8e17f..e5f5c7074f2c 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/string.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/string.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/string.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/string.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #define __HAVE_ARCH_MEMCHR	/* inline &amp; arch function */</div><div class='ctx'> #define __HAVE_ARCH_MEMCMP	/* arch function */</div><div class='ctx'> #define __HAVE_ARCH_MEMCPY	/* gcc builtin &amp; arch function */</div><div class='add'>+#define __HAVE_ARCH_MEMMOVE	/* gcc builtin &amp; arch function */</div><div class='ctx'> #define __HAVE_ARCH_MEMSCAN	/* inline &amp; arch function */</div><div class='ctx'> #define __HAVE_ARCH_MEMSET	/* gcc builtin &amp; arch function */</div><div class='ctx'> #define __HAVE_ARCH_STRCAT	/* inline &amp; arch function */</div><div class='hunk'>@@ -32,6 +33,7 @@</div><div class='ctx'> extern int memcmp(const void *, const void *, size_t);</div><div class='ctx'> extern void *memcpy(void *, const void *, size_t);</div><div class='ctx'> extern void *memset(void *, int, size_t);</div><div class='add'>+extern void *memmove(void *, const void *, size_t);</div><div class='ctx'> extern int strcmp(const char *,const char *);</div><div class='ctx'> extern size_t strlcat(char *, const char *, size_t);</div><div class='ctx'> extern size_t strlcpy(char *, const char *, size_t);</div><div class='hunk'>@@ -40,7 +42,6 @@ extern char *strncpy(char *, const char *, size_t);</div><div class='ctx'> extern char *strrchr(const char *, int);</div><div class='ctx'> extern char *strstr(const char *, const char *);</div><div class='ctx'> </div><div class='del'>-#undef __HAVE_ARCH_MEMMOVE</div><div class='ctx'> #undef __HAVE_ARCH_STRCHR</div><div class='ctx'> #undef __HAVE_ARCH_STRNCHR</div><div class='ctx'> #undef __HAVE_ARCH_STRNCMP</div><div class='hunk'>@@ -61,7 +62,7 @@ static inline void *memchr(const void * s, int c, size_t n)</div><div class='ctx'> 		"	jl	1f\n"</div><div class='ctx'> 		"	la	%0,0\n"</div><div class='ctx'> 		"1:"</div><div class='del'>-		: "+a" (ret), "+&amp;a" (s) : "d" (r0) : "cc");</div><div class='add'>+		: "+a" (ret), "+&amp;a" (s) : "d" (r0) : "cc", "memory");</div><div class='ctx'> 	return (void *) ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -73,7 +74,7 @@ static inline void *memscan(void *s, int c, size_t n)</div><div class='ctx'> 	asm volatile(</div><div class='ctx'> 		"0:	srst	%0,%1\n"</div><div class='ctx'> 		"	jo	0b\n"</div><div class='del'>-		: "+a" (ret), "+&amp;a" (s) : "d" (r0) : "cc");</div><div class='add'>+		: "+a" (ret), "+&amp;a" (s) : "d" (r0) : "cc", "memory");</div><div class='ctx'> 	return (void *) ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +115,7 @@ static inline size_t strlen(const char *s)</div><div class='ctx'> 	asm volatile(</div><div class='ctx'> 		"0:	srst	%0,%1\n"</div><div class='ctx'> 		"	jo	0b"</div><div class='del'>-		: "+d" (r0), "+a" (tmp) :  : "cc");</div><div class='add'>+		: "+d" (r0), "+a" (tmp) :  : "cc", "memory");</div><div class='ctx'> 	return r0 - (unsigned long) s;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -127,7 +128,7 @@ static inline size_t strnlen(const char * s, size_t n)</div><div class='ctx'> 	asm volatile(</div><div class='ctx'> 		"0:	srst	%0,%1\n"</div><div class='ctx'> 		"	jo	0b"</div><div class='del'>-		: "+a" (end), "+a" (tmp) : "d" (r0)  : "cc");</div><div class='add'>+		: "+a" (end), "+a" (tmp) : "d" (r0)  : "cc", "memory");</div><div class='ctx'> 	return end - s;</div><div class='ctx'> }</div><div class='ctx'> #else /* IN_ARCH_STRING_C */</div><div class='head'>diff --git a/arch/s390/include/asm/sysinfo.h b/arch/s390/include/asm/sysinfo.h<br/>index 2728114d5484..229326c942c7 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/sysinfo.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/sysinfo.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/sysinfo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/sysinfo.h</a></div><div class='hunk'>@@ -107,6 +107,11 @@ struct sysinfo_2_2_2 {</div><div class='ctx'> 	char reserved_3[5];</div><div class='ctx'> 	unsigned short cpus_dedicated;</div><div class='ctx'> 	unsigned short cpus_shared;</div><div class='add'>+	char reserved_4[3];</div><div class='add'>+	unsigned char vsne;</div><div class='add'>+	uuid_be uuid;</div><div class='add'>+	char reserved_5[160];</div><div class='add'>+	char ext_name[256];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define LPAR_CHAR_DEDICATED	(1 &lt;&lt; 7)</div><div class='hunk'>@@ -127,7 +132,7 @@ struct sysinfo_3_2_2 {</div><div class='ctx'> 		unsigned int caf;</div><div class='ctx'> 		char cpi[16];</div><div class='ctx'> 		char reserved_1[3];</div><div class='del'>-		char ext_name_encoding;</div><div class='add'>+		unsigned char evmne;</div><div class='ctx'> 		unsigned int reserved_2;</div><div class='ctx'> 		uuid_be uuid;</div><div class='ctx'> 	} vm[8];</div><div class='head'>diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h<br/>index f15c0398c363..a5b54a445eb8 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/thread_info.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/thread_info.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/thread_info.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/thread_info.h</a></div><div class='hunk'>@@ -12,10 +12,10 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Size of kernel stack for each process</div><div class='ctx'>  */</div><div class='del'>-#define THREAD_ORDER 2</div><div class='add'>+#define THREAD_SIZE_ORDER 2</div><div class='ctx'> #define ASYNC_ORDER  2</div><div class='ctx'> </div><div class='del'>-#define THREAD_SIZE (PAGE_SIZE &lt;&lt; THREAD_ORDER)</div><div class='add'>+#define THREAD_SIZE (PAGE_SIZE &lt;&lt; THREAD_SIZE_ORDER)</div><div class='ctx'> #define ASYNC_SIZE  (PAGE_SIZE &lt;&lt; ASYNC_ORDER)</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='hunk'>@@ -30,15 +30,7 @@</div><div class='ctx'>  * - if the contents of this structure are changed, the assembly constants must also be changed</div><div class='ctx'>  */</div><div class='ctx'> struct thread_info {</div><div class='del'>-	struct task_struct	*task;		/* main task structure */</div><div class='ctx'> 	unsigned long		flags;		/* low level flags */</div><div class='del'>-	unsigned long		sys_call_table;	/* System call table address */</div><div class='del'>-	unsigned int		cpu;		/* current CPU */</div><div class='del'>-	int			preempt_count;	/* 0 =&gt; preemptable, &lt;0 =&gt; BUG */</div><div class='del'>-	unsigned int		system_call;</div><div class='del'>-	__u64			user_timer;</div><div class='del'>-	__u64			system_timer;</div><div class='del'>-	unsigned long		last_break;	/* last breaking-event-address. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -46,26 +38,14 @@ struct thread_info {</div><div class='ctx'>  */</div><div class='ctx'> #define INIT_THREAD_INFO(tsk)			\</div><div class='ctx'> {						\</div><div class='del'>-	.task		= &amp;tsk,			\</div><div class='ctx'> 	.flags		= 0,			\</div><div class='del'>-	.cpu		= 0,			\</div><div class='del'>-	.preempt_count	= INIT_PREEMPT_COUNT,	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define init_thread_info	(init_thread_union.thread_info)</div><div class='ctx'> #define init_stack		(init_thread_union.stack)</div><div class='ctx'> </div><div class='del'>-/* how to get the thread information struct from C */</div><div class='del'>-static inline struct thread_info *current_thread_info(void)</div><div class='del'>-{</div><div class='del'>-	return (struct thread_info *) S390_lowcore.thread_info;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void arch_release_task_struct(struct task_struct *tsk);</div><div class='ctx'> int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);</div><div class='ctx'> </div><div class='del'>-#define THREAD_SIZE_ORDER THREAD_ORDER</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h<br/>index 0bb08f341c09..354344dcc198 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/timex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/timex.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/timex.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/timex.h</a></div><div class='hunk'>@@ -52,11 +52,9 @@ static inline void store_clock_comparator(__u64 *time)</div><div class='ctx'> </div><div class='ctx'> void clock_comparator_work(void);</div><div class='ctx'> </div><div class='del'>-void __init ptff_init(void);</div><div class='add'>+void __init time_early_init(void);</div><div class='ctx'> </div><div class='ctx'> extern unsigned char ptff_function_mask[16];</div><div class='del'>-extern unsigned long lpar_offset;</div><div class='del'>-extern unsigned long initial_leap_seconds;</div><div class='ctx'> </div><div class='ctx'> /* Function codes for the ptff instruction. */</div><div class='ctx'> #define PTFF_QAF	0x00	/* query available functions */</div><div class='hunk'>@@ -100,21 +98,28 @@ struct ptff_qui {</div><div class='ctx'> 	unsigned int pad_0x5c[41];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-static inline int ptff(void *ptff_block, size_t len, unsigned int func)</div><div class='del'>-{</div><div class='del'>-	typedef struct { char _[len]; } addrtype;</div><div class='del'>-	register unsigned int reg0 asm("0") = func;</div><div class='del'>-	register unsigned long reg1 asm("1") = (unsigned long) ptff_block;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	asm volatile(</div><div class='del'>-		"	.word	0x0104\n"</div><div class='del'>-		"	ipm	%0\n"</div><div class='del'>-		"	srl	%0,28\n"</div><div class='del'>-		: "=d" (rc), "+m" (*(addrtype *) ptff_block)</div><div class='del'>-		: "d" (reg0), "d" (reg1) : "cc");</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * ptff - Perform timing facility function</div><div class='add'>+ * @ptff_block: Pointer to ptff parameter block</div><div class='add'>+ * @len: Length of parameter block</div><div class='add'>+ * @func: Function code</div><div class='add'>+ * Returns: Condition code (0 on success)</div><div class='add'>+ */</div><div class='add'>+#define ptff(ptff_block, len, func)					\</div><div class='add'>+({									\</div><div class='add'>+	struct addrtype { char _[len]; };				\</div><div class='add'>+	register unsigned int reg0 asm("0") = func;			\</div><div class='add'>+	register unsigned long reg1 asm("1") = (unsigned long) (ptff_block);\</div><div class='add'>+	int rc;								\</div><div class='add'>+									\</div><div class='add'>+	asm volatile(							\</div><div class='add'>+		"	.word	0x0104\n"				\</div><div class='add'>+		"	ipm	%0\n"					\</div><div class='add'>+		"	srl	%0,28\n"				\</div><div class='add'>+		: "=d" (rc), "+m" (*(struct addrtype *) reg1)		\</div><div class='add'>+		: "d" (reg0), "d" (reg1) : "cc");			\</div><div class='add'>+	rc;								\</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long long local_tick_disable(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -173,14 +178,6 @@ int get_phys_clock(unsigned long long *clock);</div><div class='ctx'> void init_cpu_timer(void);</div><div class='ctx'> unsigned long long monotonic_clock(void);</div><div class='ctx'> </div><div class='del'>-void tod_to_timeval(__u64 todval, struct timespec64 *xt);</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-void stck_to_timespec64(unsigned long long stck, struct timespec64 *ts)</div><div class='del'>-{</div><div class='del'>-	tod_to_timeval(stck - TOD_UNIX_EPOCH, ts);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern u64 sched_clock_base_cc;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h<br/>index 15711de10403..853b2a3d8dee 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/tlb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/tlb.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/tlb.h</a></div><div class='hunk'>@@ -104,12 +104,6 @@ static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 	return __tlb_remove_page(tlb, page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool __tlb_remove_pte_page(struct mmu_gather *tlb,</div><div class='del'>-					 struct page *page)</div><div class='del'>-{</div><div class='del'>-	return __tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 					struct page *page, int page_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -162,5 +156,13 @@ static inline void pud_free_tlb(struct mmu_gather *tlb, pud_t *pud,</div><div class='ctx'> #define tlb_remove_tlb_entry(tlb, ptep, addr)	do { } while (0)</div><div class='ctx'> #define tlb_remove_pmd_tlb_entry(tlb, pmdp, addr)	do { } while (0)</div><div class='ctx'> #define tlb_migrate_finish(mm)			do { } while (0)</div><div class='add'>+#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\</div><div class='add'>+	tlb_remove_tlb_entry(tlb, ptep, address)</div><div class='add'>+</div><div class='add'>+#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='add'>+static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='add'>+						     unsigned int page_size)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* _S390_TLB_H */</div><div class='head'>diff --git a/arch/s390/include/asm/topology.h b/arch/s390/include/asm/topology.h<br/>index f15f5571ca2b..fa1bfce10370 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/topology.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/topology.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/topology.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/topology.h</a></div><div class='hunk'>@@ -22,21 +22,22 @@ struct cpu_topology_s390 {</div><div class='ctx'> 	cpumask_t drawer_mask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-DECLARE_PER_CPU(struct cpu_topology_s390, cpu_topology);</div><div class='del'>-</div><div class='del'>-#define topology_physical_package_id(cpu) (per_cpu(cpu_topology, cpu).socket_id)</div><div class='del'>-#define topology_thread_id(cpu)		  (per_cpu(cpu_topology, cpu).thread_id)</div><div class='del'>-#define topology_sibling_cpumask(cpu) \</div><div class='del'>-		(&amp;per_cpu(cpu_topology, cpu).thread_mask)</div><div class='del'>-#define topology_core_id(cpu)		  (per_cpu(cpu_topology, cpu).core_id)</div><div class='del'>-#define topology_core_cpumask(cpu)	  (&amp;per_cpu(cpu_topology, cpu).core_mask)</div><div class='del'>-#define topology_book_id(cpu)		  (per_cpu(cpu_topology, cpu).book_id)</div><div class='del'>-#define topology_book_cpumask(cpu)	  (&amp;per_cpu(cpu_topology, cpu).book_mask)</div><div class='del'>-#define topology_drawer_id(cpu)		  (per_cpu(cpu_topology, cpu).drawer_id)</div><div class='del'>-#define topology_drawer_cpumask(cpu)	  (&amp;per_cpu(cpu_topology, cpu).drawer_mask)</div><div class='add'>+extern struct cpu_topology_s390 cpu_topology[NR_CPUS];</div><div class='add'>+extern cpumask_t cpus_with_topology;</div><div class='add'>+</div><div class='add'>+#define topology_physical_package_id(cpu) (cpu_topology[cpu].socket_id)</div><div class='add'>+#define topology_thread_id(cpu)		  (cpu_topology[cpu].thread_id)</div><div class='add'>+#define topology_sibling_cpumask(cpu)	  (&amp;cpu_topology[cpu].thread_mask)</div><div class='add'>+#define topology_core_id(cpu)		  (cpu_topology[cpu].core_id)</div><div class='add'>+#define topology_core_cpumask(cpu)	  (&amp;cpu_topology[cpu].core_mask)</div><div class='add'>+#define topology_book_id(cpu)		  (cpu_topology[cpu].book_id)</div><div class='add'>+#define topology_book_cpumask(cpu)	  (&amp;cpu_topology[cpu].book_mask)</div><div class='add'>+#define topology_drawer_id(cpu)		  (cpu_topology[cpu].drawer_id)</div><div class='add'>+#define topology_drawer_cpumask(cpu)	  (&amp;cpu_topology[cpu].drawer_mask)</div><div class='ctx'> </div><div class='ctx'> #define mc_capable() 1</div><div class='ctx'> </div><div class='add'>+void topology_init_early(void);</div><div class='ctx'> int topology_cpu_init(struct cpu *);</div><div class='ctx'> int topology_set_cpu_management(int fc);</div><div class='ctx'> void topology_schedule_update(void);</div><div class='hunk'>@@ -46,6 +47,7 @@ const struct cpumask *cpu_coregroup_mask(int cpu);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_SCHED_TOPOLOGY */</div><div class='ctx'> </div><div class='add'>+static inline void topology_init_early(void) { }</div><div class='ctx'> static inline void topology_schedule_update(void) { }</div><div class='ctx'> static inline int topology_cpu_init(struct cpu *cpu) { return 0; }</div><div class='ctx'> static inline void topology_expect_change(void) { }</div><div class='hunk'>@@ -65,7 +67,7 @@ static inline void topology_expect_change(void) { }</div><div class='ctx'> #define cpu_to_node cpu_to_node</div><div class='ctx'> static inline int cpu_to_node(int cpu)</div><div class='ctx'> {</div><div class='del'>-	return per_cpu(cpu_topology, cpu).node_id;</div><div class='add'>+	return cpu_topology[cpu].node_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns a pointer to the cpumask of CPUs on node 'node'. */</div><div class='head'>diff --git a/arch/s390/include/asm/trace/zcrypt.h b/arch/s390/include/asm/trace/zcrypt.h<br/>new file mode 100644<br/>index 000000000000..adcb77fafa9d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/trace/zcrypt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/trace/zcrypt.h</a></div><div class='hunk'>@@ -0,0 +1,122 @@</div><div class='add'>+/*</div><div class='add'>+ * Tracepoint definitions for the s390 zcrypt device driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright IBM Corp. 2016</div><div class='add'>+ * Author(s): Harald Freudenberger &lt;freude@de.ibm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Currently there are two tracepoint events defined here.</div><div class='add'>+ * An s390_zcrypt_req request event occurs as soon as the request is</div><div class='add'>+ * recognized by the zcrypt ioctl function. This event may act as some kind</div><div class='add'>+ * of request-processing-starts-now indication.</div><div class='add'>+ * As late as possible within the zcrypt ioctl function there occurs the</div><div class='add'>+ * s390_zcrypt_rep event which may act as the point in time where the</div><div class='add'>+ * request has been processed by the kernel and the result is about to be</div><div class='add'>+ * transferred back to userspace.</div><div class='add'>+ * The glue which binds together request and reply event is the ptr</div><div class='add'>+ * parameter, which is the local buffer address where the request from</div><div class='add'>+ * userspace has been stored by the ioctl function.</div><div class='add'>+ *</div><div class='add'>+ * The main purpose of this zcrypt tracepoint api is to get some data for</div><div class='add'>+ * performance measurements together with information about on which card</div><div class='add'>+ * and queue the request has been processed. It is not an ffdc interface as</div><div class='add'>+ * there is already code in the zcrypt device driver to serve the s390</div><div class='add'>+ * debug feature interface.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM s390</div><div class='add'>+</div><div class='add'>+#if !defined(_TRACE_S390_ZCRYPT_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _TRACE_S390_ZCRYPT_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+#define TP_ICARSAMODEXPO  0x0001</div><div class='add'>+#define TP_ICARSACRT	  0x0002</div><div class='add'>+#define TB_ZSECSENDCPRB   0x0003</div><div class='add'>+#define TP_ZSENDEP11CPRB  0x0004</div><div class='add'>+#define TP_HWRNGCPRB	  0x0005</div><div class='add'>+</div><div class='add'>+#define show_zcrypt_tp_type(type)				\</div><div class='add'>+	__print_symbolic(type,					\</div><div class='add'>+			 { TP_ICARSAMODEXPO, "ICARSAMODEXPO" }, \</div><div class='add'>+			 { TP_ICARSACRT, "ICARSACRT" },		\</div><div class='add'>+			 { TB_ZSECSENDCPRB, "ZSECSENDCPRB" },	\</div><div class='add'>+			 { TP_ZSENDEP11CPRB, "ZSENDEP11CPRB" }, \</div><div class='add'>+			 { TP_HWRNGCPRB, "HWRNGCPRB" })</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * trace_s390_zcrypt_req - zcrypt request tracepoint function</div><div class='add'>+ * @ptr:  Address of the local buffer where the request from userspace</div><div class='add'>+ *	  is stored. Can be used as a unique id to relate together</div><div class='add'>+ *	  request and reply.</div><div class='add'>+ * @type: One of the TP_ defines above.</div><div class='add'>+ *</div><div class='add'>+ * Called when a request from userspace is recognised within the ioctl</div><div class='add'>+ * function of the zcrypt device driver and may act as an entry</div><div class='add'>+ * timestamp.</div><div class='add'>+ */</div><div class='add'>+TRACE_EVENT(s390_zcrypt_req,</div><div class='add'>+	    TP_PROTO(void *ptr, u32 type),</div><div class='add'>+	    TP_ARGS(ptr, type),</div><div class='add'>+	    TP_STRUCT__entry(</div><div class='add'>+		    __field(void *, ptr)</div><div class='add'>+		    __field(u32, type)),</div><div class='add'>+	    TP_fast_assign(</div><div class='add'>+		    __entry-&gt;ptr = ptr;</div><div class='add'>+		    __entry-&gt;type = type;),</div><div class='add'>+	    TP_printk("ptr=%p type=%s",</div><div class='add'>+		      __entry-&gt;ptr,</div><div class='add'>+		      show_zcrypt_tp_type(__entry-&gt;type))</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * trace_s390_zcrypt_rep - zcrypt reply tracepoint function</div><div class='add'>+ * @ptr:  Address of the local buffer where the request from userspace</div><div class='add'>+ *	  is stored. Can be used as a unique id to match together</div><div class='add'>+ *	  request and reply.</div><div class='add'>+ * @fc:   Function code.</div><div class='add'>+ * @rc:   The bare returncode as returned by the device driver ioctl</div><div class='add'>+ *	  function.</div><div class='add'>+ * @dev:  The adapter nr where this request was actually processed.</div><div class='add'>+ * @dom:  Domain id of the device where this request was processed.</div><div class='add'>+ *</div><div class='add'>+ * Called upon recognising the reply from the crypto adapter. This</div><div class='add'>+ * message may act as the exit timestamp for the request but also</div><div class='add'>+ * carries some info about on which adapter the request was processed</div><div class='add'>+ * and the returncode from the device driver.</div><div class='add'>+ */</div><div class='add'>+TRACE_EVENT(s390_zcrypt_rep,</div><div class='add'>+	    TP_PROTO(void *ptr, u32 fc, u32 rc, u16 dev, u16 dom),</div><div class='add'>+	    TP_ARGS(ptr, fc, rc, dev, dom),</div><div class='add'>+	    TP_STRUCT__entry(</div><div class='add'>+		    __field(void *, ptr)</div><div class='add'>+		    __field(u32, fc)</div><div class='add'>+		    __field(u32, rc)</div><div class='add'>+		    __field(u16, device)</div><div class='add'>+		    __field(u16, domain)),</div><div class='add'>+	    TP_fast_assign(</div><div class='add'>+		    __entry-&gt;ptr = ptr;</div><div class='add'>+		    __entry-&gt;fc = fc;</div><div class='add'>+		    __entry-&gt;rc = rc;</div><div class='add'>+		    __entry-&gt;device = dev;</div><div class='add'>+		    __entry-&gt;domain = dom;),</div><div class='add'>+	    TP_printk("ptr=%p fc=0x%04x rc=%d dev=0x%02hx domain=0x%04hx",</div><div class='add'>+		      __entry-&gt;ptr,</div><div class='add'>+		      (unsigned int) __entry-&gt;fc,</div><div class='add'>+		      (int) __entry-&gt;rc,</div><div class='add'>+		      (unsigned short) __entry-&gt;device,</div><div class='add'>+		      (unsigned short) __entry-&gt;domain)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif /* _TRACE_S390_ZCRYPT_H */</div><div class='add'>+</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+</div><div class='add'>+#define TRACE_INCLUDE_PATH asm/trace</div><div class='add'>+#define TRACE_INCLUDE_FILE zcrypt</div><div class='add'>+</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h<br/>index 52d7c8709279..136932ff4250 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/uaccess.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/uaccess.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/uaccess.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ctl_reg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VERIFY_READ     0</div><div class='hunk'>@@ -36,18 +37,20 @@</div><div class='ctx'> </div><div class='ctx'> #define get_ds()        (KERNEL_DS)</div><div class='ctx'> #define get_fs()        (current-&gt;thread.mm_segment)</div><div class='del'>-</div><div class='del'>-#define set_fs(x) \</div><div class='del'>-({									\</div><div class='del'>-	unsigned long __pto;						\</div><div class='del'>-	current-&gt;thread.mm_segment = (x);				\</div><div class='del'>-	__pto = current-&gt;thread.mm_segment.ar4 ?			\</div><div class='del'>-		S390_lowcore.user_asce : S390_lowcore.kernel_asce;	\</div><div class='del'>-	__ctl_load(__pto, 7, 7);					\</div><div class='del'>-})</div><div class='del'>-</div><div class='ctx'> #define segment_eq(a,b) ((a).ar4 == (b).ar4)</div><div class='ctx'> </div><div class='add'>+static inline void set_fs(mm_segment_t fs)</div><div class='add'>+{</div><div class='add'>+	current-&gt;thread.mm_segment = fs;</div><div class='add'>+	if (segment_eq(fs, KERNEL_DS)) {</div><div class='add'>+		set_cpu_flag(CIF_ASCE_SECONDARY);</div><div class='add'>+		__ctl_load(S390_lowcore.kernel_asce, 7, 7);</div><div class='add'>+	} else {</div><div class='add'>+		clear_cpu_flag(CIF_ASCE_SECONDARY);</div><div class='add'>+		__ctl_load(S390_lowcore.user_asce, 7, 7);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int __range_ok(unsigned long addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -177,7 +180,7 @@ static inline int __put_user_fn(void *x, void __user *ptr, unsigned long size)</div><div class='ctx'> 					(unsigned long *)x,</div><div class='ctx'> 					size, spec);</div><div class='ctx'> 		break;</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -207,7 +210,7 @@ static inline int __get_user_fn(void *x, const void __user *ptr, unsigned long s</div><div class='ctx'> 					(unsigned long __user *)ptr,</div><div class='ctx'> 					size, spec);</div><div class='ctx'> 		break;</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/vdso.h b/arch/s390/include/asm/vdso.h<br/>index d0a2dbf2433d..88bdc477a843 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/asm/vdso.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/asm/vdso.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/asm/vdso.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/asm/vdso.h</a></div><div class='hunk'>@@ -33,6 +33,8 @@ struct vdso_data {</div><div class='ctx'> 	__u32 ectg_available;		/* ECTG instruction present	0x58 */</div><div class='ctx'> 	__u32 tk_mult;			/* Mult. used for xtime_nsec	0x5c */</div><div class='ctx'> 	__u32 tk_shift;			/* Shift used for xtime_nsec	0x60 */</div><div class='add'>+	__u32 ts_dir;			/* TOD steering direction	0x64 */</div><div class='add'>+	__u64 ts_end;			/* TOD steering end		0x68 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct vdso_per_cpu_data {</div><div class='head'>diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild<br/>index cc44b09c25fc..6848ba5c1454 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/uapi/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/uapi/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/uapi/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/uapi/asm/Kbuild</a></div><div class='hunk'>@@ -12,6 +12,7 @@ header-y += dasd.h</div><div class='ctx'> header-y += debug.h</div><div class='ctx'> header-y += errno.h</div><div class='ctx'> header-y += fcntl.h</div><div class='add'>+header-y += hypfs.h</div><div class='ctx'> header-y += ioctl.h</div><div class='ctx'> header-y += ioctls.h</div><div class='ctx'> header-y += ipcbuf.h</div><div class='hunk'>@@ -23,22 +24,23 @@ header-y += mman.h</div><div class='ctx'> header-y += monwriter.h</div><div class='ctx'> header-y += msgbuf.h</div><div class='ctx'> header-y += param.h</div><div class='add'>+header-y += pkey.h</div><div class='ctx'> header-y += poll.h</div><div class='ctx'> header-y += posix_types.h</div><div class='ctx'> header-y += ptrace.h</div><div class='ctx'> header-y += qeth.h</div><div class='ctx'> header-y += resource.h</div><div class='ctx'> header-y += schid.h</div><div class='add'>+header-y += sclp_ctl.h</div><div class='ctx'> header-y += sembuf.h</div><div class='ctx'> header-y += setup.h</div><div class='ctx'> header-y += shmbuf.h</div><div class='add'>+header-y += sie.h</div><div class='ctx'> header-y += sigcontext.h</div><div class='ctx'> header-y += siginfo.h</div><div class='ctx'> header-y += signal.h</div><div class='ctx'> header-y += socket.h</div><div class='ctx'> header-y += sockios.h</div><div class='del'>-header-y += sclp_ctl.h</div><div class='del'>-header-y += sie.h</div><div class='ctx'> header-y += stat.h</div><div class='ctx'> header-y += statfs.h</div><div class='ctx'> header-y += swab.h</div><div class='head'>diff --git a/arch/s390/include/uapi/asm/pkey.h b/arch/s390/include/uapi/asm/pkey.h<br/>new file mode 100644<br/>index 000000000000..ed7f19c27ce5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/uapi/asm/pkey.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/uapi/asm/pkey.h</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/*</div><div class='add'>+ * Userspace interface to the pkey device driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright IBM Corp. 2017</div><div class='add'>+ *</div><div class='add'>+ * Author: Harald Freudenberger &lt;freude@de.ibm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _UAPI_PKEY_H</div><div class='add'>+#define _UAPI_PKEY_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Ioctl calls supported by the pkey device driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PKEY_IOCTL_MAGIC 'p'</div><div class='add'>+</div><div class='add'>+#define SECKEYBLOBSIZE	64     /* secure key blob size is always 64 bytes */</div><div class='add'>+#define MAXPROTKEYSIZE	64  /* a protected key blob may be up to 64 bytes */</div><div class='add'>+#define MAXCLRKEYSIZE	32     /* a clear key value may be up to 32 bytes */</div><div class='add'>+</div><div class='add'>+/* defines for the type field within the pkey_protkey struct */</div><div class='add'>+#define PKEY_KEYTYPE_AES_128  1</div><div class='add'>+#define PKEY_KEYTYPE_AES_192  2</div><div class='add'>+#define PKEY_KEYTYPE_AES_256  3</div><div class='add'>+</div><div class='add'>+/* Struct to hold a secure key blob */</div><div class='add'>+struct pkey_seckey {</div><div class='add'>+	__u8  seckey[SECKEYBLOBSIZE];		  /* the secure key blob */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Struct to hold protected key and length info */</div><div class='add'>+struct pkey_protkey {</div><div class='add'>+	__u32 type;	     /* key type, one of the PKEY_KEYTYPE values */</div><div class='add'>+	__u32 len;		/* bytes actually stored in protkey[]	 */</div><div class='add'>+	__u8  protkey[MAXPROTKEYSIZE];	       /* the protected key blob */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Struct to hold a clear key value */</div><div class='add'>+struct pkey_clrkey {</div><div class='add'>+	__u8  clrkey[MAXCLRKEYSIZE]; /* 16, 24, or 32 byte clear key value */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generate secure key</div><div class='add'>+ */</div><div class='add'>+struct pkey_genseck {</div><div class='add'>+	__u16 cardnr;		    /* in: card to use or FFFF for any	 */</div><div class='add'>+	__u16 domain;		    /* in: domain or FFFF for any	 */</div><div class='add'>+	__u32 keytype;		    /* in: key type to generate		 */</div><div class='add'>+	struct pkey_seckey seckey;  /* out: the secure key blob		 */</div><div class='add'>+};</div><div class='add'>+#define PKEY_GENSECK _IOWR(PKEY_IOCTL_MAGIC, 0x01, struct pkey_genseck)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Construct secure key from clear key value</div><div class='add'>+ */</div><div class='add'>+struct pkey_clr2seck {</div><div class='add'>+	__u16 cardnr;		    /* in: card to use or FFFF for any	 */</div><div class='add'>+	__u16 domain;		    /* in: domain or FFFF for any	 */</div><div class='add'>+	__u32 keytype;		    /* in: key type to generate		 */</div><div class='add'>+	struct pkey_clrkey clrkey;  /* in: the clear key value		 */</div><div class='add'>+	struct pkey_seckey seckey;  /* out: the secure key blob		 */</div><div class='add'>+};</div><div class='add'>+#define PKEY_CLR2SECK _IOWR(PKEY_IOCTL_MAGIC, 0x02, struct pkey_clr2seck)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fabricate protected key from a secure key</div><div class='add'>+ */</div><div class='add'>+struct pkey_sec2protk {</div><div class='add'>+	__u16 cardnr;		     /* in: card to use or FFFF for any   */</div><div class='add'>+	__u16 domain;		     /* in: domain or FFFF for any	  */</div><div class='add'>+	struct pkey_seckey seckey;   /* in: the secure key blob		  */</div><div class='add'>+	struct pkey_protkey protkey; /* out: the protected key		  */</div><div class='add'>+};</div><div class='add'>+#define PKEY_SEC2PROTK _IOWR(PKEY_IOCTL_MAGIC, 0x03, struct pkey_sec2protk)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fabricate protected key from an clear key value</div><div class='add'>+ */</div><div class='add'>+struct pkey_clr2protk {</div><div class='add'>+	__u32 keytype;		     /* in: key type to generate	  */</div><div class='add'>+	struct pkey_clrkey clrkey;   /* in: the clear key value		  */</div><div class='add'>+	struct pkey_protkey protkey; /* out: the protected key		  */</div><div class='add'>+};</div><div class='add'>+#define PKEY_CLR2PROTK _IOWR(PKEY_IOCTL_MAGIC, 0x04, struct pkey_clr2protk)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Search for matching crypto card based on the Master Key</div><div class='add'>+ * Verification Pattern provided inside a secure key.</div><div class='add'>+ */</div><div class='add'>+struct pkey_findcard {</div><div class='add'>+	struct pkey_seckey seckey;	       /* in: the secure key blob */</div><div class='add'>+	__u16  cardnr;			       /* out: card number	  */</div><div class='add'>+	__u16  domain;			       /* out: domain number	  */</div><div class='add'>+};</div><div class='add'>+#define PKEY_FINDCARD _IOWR(PKEY_IOCTL_MAGIC, 0x05, struct pkey_findcard)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Combined together: findcard + sec2prot</div><div class='add'>+ */</div><div class='add'>+struct pkey_skey2pkey {</div><div class='add'>+	struct pkey_seckey seckey;   /* in: the secure key blob		  */</div><div class='add'>+	struct pkey_protkey protkey; /* out: the protected key		  */</div><div class='add'>+};</div><div class='add'>+#define PKEY_SKEY2PKEY _IOWR(PKEY_IOCTL_MAGIC, 0x06, struct pkey_skey2pkey)</div><div class='add'>+</div><div class='add'>+#endif /* _UAPI_PKEY_H */</div><div class='head'>diff --git a/arch/s390/include/uapi/asm/socket.h b/arch/s390/include/uapi/asm/socket.h<br/>index 41b51c2f4f1b..b24a64cbfeb1 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -96,4 +96,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		53</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	54</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_SOCKET_H */</div><div class='head'>diff --git a/arch/s390/include/uapi/asm/zcrypt.h b/arch/s390/include/uapi/asm/zcrypt.h<br/>index f2b18eacaca8..a777f87ef889 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/include/uapi/asm/zcrypt.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/include/uapi/asm/zcrypt.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/include/uapi/asm/zcrypt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/include/uapi/asm/zcrypt.h</a></div><div class='hunk'>@@ -215,6 +215,42 @@ struct ep11_urb {</div><div class='ctx'> 	uint64_t		resp;</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct zcrypt_device_status</div><div class='add'>+ * @hwtype:		raw hardware type</div><div class='add'>+ * @qid:		6 bit device index, 8 bit domain</div><div class='add'>+ * @functions:		AP device function bit field 'abcdef'</div><div class='add'>+ *			a, b, c = reserved</div><div class='add'>+ *			d = CCA coprocessor</div><div class='add'>+ *			e = Accelerator</div><div class='add'>+ *			f = EP11 coprocessor</div><div class='add'>+ * @online		online status</div><div class='add'>+ * @reserved		reserved</div><div class='add'>+ */</div><div class='add'>+struct zcrypt_device_status {</div><div class='add'>+	unsigned int hwtype:8;</div><div class='add'>+	unsigned int qid:14;</div><div class='add'>+	unsigned int online:1;</div><div class='add'>+	unsigned int functions:6;</div><div class='add'>+	unsigned int reserved:3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MAX_ZDEV_CARDIDS 64</div><div class='add'>+#define MAX_ZDEV_DOMAINS 256</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Maximum number of zcrypt devices</div><div class='add'>+ */</div><div class='add'>+#define MAX_ZDEV_ENTRIES (MAX_ZDEV_CARDIDS * MAX_ZDEV_DOMAINS)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * zcrypt_device_matrix</div><div class='add'>+ * Device matrix of all zcrypt devices</div><div class='add'>+ */</div><div class='add'>+struct zcrypt_device_matrix {</div><div class='add'>+	struct zcrypt_device_status device[MAX_ZDEV_ENTRIES];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define AUTOSELECT ((unsigned int)0xFFFFFFFF)</div><div class='ctx'> </div><div class='ctx'> #define ZCRYPT_IOCTL_MAGIC 'z'</div><div class='hunk'>@@ -321,6 +357,7 @@ struct ep11_urb {</div><div class='ctx'> #define ICARSACRT	_IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x06, 0)</div><div class='ctx'> #define ZSECSENDCPRB	_IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x81, 0)</div><div class='ctx'> #define ZSENDEP11CPRB	_IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x04, 0)</div><div class='add'>+#define ZDEVICESTATUS	_IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x4f, 0)</div><div class='ctx'> </div><div class='ctx'> /* New status calls */</div><div class='ctx'> #define Z90STAT_TOTALCOUNT	_IOR(ZCRYPT_IOCTL_MAGIC, 0x40, int)</div><div class='head'>diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile<br/>index 1f0fe98f6db9..060ce548fe8b 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/Makefile</a></div><div class='hunk'>@@ -2,20 +2,41 @@</div><div class='ctx'> # Makefile for the linux kernel.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-KCOV_INSTRUMENT_early.o := n</div><div class='del'>-KCOV_INSTRUMENT_sclp.o := n</div><div class='del'>-KCOV_INSTRUMENT_als.o := n</div><div class='del'>-</div><div class='ctx'> ifdef CONFIG_FUNCTION_TRACER</div><div class='del'>-# Don't trace early setup code and tracing code</div><div class='del'>-CFLAGS_REMOVE_early.o = $(CC_FLAGS_FTRACE)</div><div class='del'>-CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE)</div><div class='add'>+</div><div class='add'>+# Do not trace tracer code</div><div class='add'>+CFLAGS_REMOVE_ftrace.o	= $(CC_FLAGS_FTRACE)</div><div class='add'>+</div><div class='add'>+# Do not trace early setup code</div><div class='add'>+CFLAGS_REMOVE_als.o	= $(CC_FLAGS_FTRACE)</div><div class='add'>+CFLAGS_REMOVE_early.o	= $(CC_FLAGS_FTRACE)</div><div class='add'>+</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+GCOV_PROFILE_als.o	:= n</div><div class='add'>+GCOV_PROFILE_early.o	:= n</div><div class='add'>+</div><div class='add'>+KCOV_INSTRUMENT_als.o	:= n</div><div class='add'>+KCOV_INSTRUMENT_early.o	:= n</div><div class='add'>+</div><div class='add'>+UBSAN_SANITIZE_als.o	:= n</div><div class='add'>+UBSAN_SANITIZE_early.o	:= n</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Use -march=z900 for als.c to be able to print an error</div><div class='add'>+# message if the kernel is started on a machine which is too old</div><div class='add'>+#</div><div class='add'>+ifneq ($(CC_FLAGS_MARCH),-march=z900)</div><div class='add'>+CFLAGS_REMOVE_als.o	+= $(CC_FLAGS_MARCH)</div><div class='add'>+CFLAGS_als.o		+= -march=z900</div><div class='add'>+AFLAGS_REMOVE_head.o	+= $(CC_FLAGS_MARCH)</div><div class='add'>+AFLAGS_head.o		+= -march=z900</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Passing null pointers is ok for smp code, since we access the lowcore here.</div><div class='ctx'> #</div><div class='del'>-CFLAGS_smp.o	:= -Wno-nonnull</div><div class='add'>+CFLAGS_smp.o		:= -Wno-nonnull</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Disable tailcall optimizations for stack / callchain walking functions</div><div class='hunk'>@@ -30,31 +51,11 @@ CFLAGS_dumpstack.o	+= -fno-optimize-sibling-calls</div><div class='ctx'> #</div><div class='ctx'> CFLAGS_ptrace.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'</div><div class='ctx'> </div><div class='del'>-CFLAGS_sysinfo.o += -w</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Use -march=z900 for sclp.c and als.c to be able to print an error</div><div class='del'>-# message if the kernel is started on a machine which is too old</div><div class='del'>-#</div><div class='del'>-CFLAGS_REMOVE_sclp.o = $(CC_FLAGS_FTRACE)</div><div class='del'>-CFLAGS_REMOVE_als.o = $(CC_FLAGS_FTRACE)</div><div class='del'>-ifneq ($(CC_FLAGS_MARCH),-march=z900)</div><div class='del'>-CFLAGS_REMOVE_sclp.o	+= $(CC_FLAGS_MARCH)</div><div class='del'>-CFLAGS_sclp.o		+= -march=z900</div><div class='del'>-CFLAGS_REMOVE_als.o	+= $(CC_FLAGS_MARCH)</div><div class='del'>-CFLAGS_als.o		+= -march=z900</div><div class='del'>-AFLAGS_REMOVE_head.o	+= $(CC_FLAGS_MARCH)</div><div class='del'>-AFLAGS_head.o		+= -march=z900</div><div class='del'>-endif</div><div class='del'>-GCOV_PROFILE_sclp.o := n</div><div class='del'>-GCOV_PROFILE_als.o := n</div><div class='del'>-UBSAN_SANITIZE_als.o := n</div><div class='del'>-UBSAN_SANITIZE_early.o := n</div><div class='del'>-UBSAN_SANITIZE_sclp.o := n</div><div class='add'>+CFLAGS_sysinfo.o	+= -w</div><div class='ctx'> </div><div class='ctx'> obj-y	:= traps.o time.o process.o base.o early.o setup.o idle.o vtime.o</div><div class='ctx'> obj-y	+= processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o</div><div class='del'>-obj-y	+= debug.o irq.o ipl.o dis.o diag.o sclp.o vdso.o als.o</div><div class='add'>+obj-y	+= debug.o irq.o ipl.o dis.o diag.o vdso.o als.o</div><div class='ctx'> obj-y	+= sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o</div><div class='ctx'> obj-y	+= runtime_instr.o cache.o fpu.o dumpstack.o</div><div class='ctx'> obj-y	+= entry.o reipl.o relocate_kernel.o</div><div class='hunk'>@@ -69,7 +70,7 @@ obj-$(CONFIG_AUDIT)		+= audit.o</div><div class='ctx'> compat-obj-$(CONFIG_AUDIT)	+= compat_audit.o</div><div class='ctx'> obj-$(CONFIG_COMPAT)		+= compat_linux.o compat_signal.o</div><div class='ctx'> obj-$(CONFIG_COMPAT)		+= compat_wrapper.o $(compat-obj-y)</div><div class='del'>-</div><div class='add'>+obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o</div><div class='ctx'> obj-$(CONFIG_STACKTRACE)	+= stacktrace.o</div><div class='ctx'> obj-$(CONFIG_KPROBES)		+= kprobes.o</div><div class='ctx'> obj-$(CONFIG_FUNCTION_TRACER)	+= mcount.o ftrace.o</div><div class='head'>diff --git a/arch/s390/kernel/als.c b/arch/s390/kernel/als.c<br/>index a16e9d1bf9e3..14769eb52a33 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/als.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/als.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/als.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/als.c</a></div><div class='hunk'>@@ -41,7 +41,8 @@ static void __init print_machine_type(void)</div><div class='ctx'> 	get_cpu_id(&amp;id);</div><div class='ctx'> 	u16_to_hex(type_str, id.machine);</div><div class='ctx'> 	strcat(mach_str, type_str);</div><div class='del'>-	_sclp_print_early(mach_str);</div><div class='add'>+	strcat(mach_str, "\n");</div><div class='add'>+	sclp_early_printk(mach_str);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init u16_to_decimal(char *str, u16 val)</div><div class='hunk'>@@ -79,7 +80,8 @@ static void __init print_missing_facilities(void)</div><div class='ctx'> 			 * z/VM adds a four character prefix.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (strlen(als_str) &gt; 70) {</div><div class='del'>-				_sclp_print_early(als_str);</div><div class='add'>+				strcat(als_str, "\n");</div><div class='add'>+				sclp_early_printk(als_str);</div><div class='ctx'> 				*als_str = '\0';</div><div class='ctx'> 			}</div><div class='ctx'> 			u16_to_decimal(val_str, i * BITS_PER_LONG + j);</div><div class='hunk'>@@ -87,13 +89,14 @@ static void __init print_missing_facilities(void)</div><div class='ctx'> 			first = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	_sclp_print_early(als_str);</div><div class='del'>-	_sclp_print_early("See Principles of Operations for facility bits");</div><div class='add'>+	strcat(als_str, "\n");</div><div class='add'>+	sclp_early_printk(als_str);</div><div class='add'>+	sclp_early_printk("See Principles of Operations for facility bits\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init facility_mismatch(void)</div><div class='ctx'> {</div><div class='del'>-	_sclp_print_early("The Linux kernel requires more recent processor hardware");</div><div class='add'>+	sclp_early_printk("The Linux kernel requires more recent processor hardware\n");</div><div class='ctx'> 	print_machine_type();</div><div class='ctx'> 	print_missing_facilities();</div><div class='ctx'> 	disabled_wait(0x8badcccc);</div><div class='head'>diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c<br/>index f3df9e0a5dec..c4b3570ded5b 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/asm-offsets.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/asm-offsets.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -25,12 +25,14 @@</div><div class='ctx'> int main(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* task struct offsets */</div><div class='del'>-	OFFSET(__TASK_thread_info, task_struct, stack);</div><div class='add'>+	OFFSET(__TASK_stack, task_struct, stack);</div><div class='ctx'> 	OFFSET(__TASK_thread, task_struct, thread);</div><div class='ctx'> 	OFFSET(__TASK_pid, task_struct, pid);</div><div class='ctx'> 	BLANK();</div><div class='ctx'> 	/* thread struct offsets */</div><div class='ctx'> 	OFFSET(__THREAD_ksp, thread_struct, ksp);</div><div class='add'>+	OFFSET(__THREAD_sysc_table,  thread_struct, sys_call_table);</div><div class='add'>+	OFFSET(__THREAD_last_break, thread_struct, last_break);</div><div class='ctx'> 	OFFSET(__THREAD_FPU_fpc, thread_struct, fpu.fpc);</div><div class='ctx'> 	OFFSET(__THREAD_FPU_regs, thread_struct, fpu.regs);</div><div class='ctx'> 	OFFSET(__THREAD_per_cause, thread_struct, per_event.cause);</div><div class='hunk'>@@ -39,14 +41,7 @@ int main(void)</div><div class='ctx'> 	OFFSET(__THREAD_trap_tdb, thread_struct, trap_tdb);</div><div class='ctx'> 	BLANK();</div><div class='ctx'> 	/* thread info offsets */</div><div class='del'>-	OFFSET(__TI_task, thread_info, task);</div><div class='del'>-	OFFSET(__TI_flags, thread_info, flags);</div><div class='del'>-	OFFSET(__TI_sysc_table, thread_info, sys_call_table);</div><div class='del'>-	OFFSET(__TI_cpu, thread_info, cpu);</div><div class='del'>-	OFFSET(__TI_precount, thread_info, preempt_count);</div><div class='del'>-	OFFSET(__TI_user_timer, thread_info, user_timer);</div><div class='del'>-	OFFSET(__TI_system_timer, thread_info, system_timer);</div><div class='del'>-	OFFSET(__TI_last_break, thread_info, last_break);</div><div class='add'>+	OFFSET(__TI_flags, task_struct, thread_info.flags);</div><div class='ctx'> 	BLANK();</div><div class='ctx'> 	/* pt_regs offsets */</div><div class='ctx'> 	OFFSET(__PT_ARGS, pt_regs, args);</div><div class='hunk'>@@ -79,6 +74,8 @@ int main(void)</div><div class='ctx'> 	OFFSET(__VDSO_ECTG_OK, vdso_data, ectg_available);</div><div class='ctx'> 	OFFSET(__VDSO_TK_MULT, vdso_data, tk_mult);</div><div class='ctx'> 	OFFSET(__VDSO_TK_SHIFT, vdso_data, tk_shift);</div><div class='add'>+	OFFSET(__VDSO_TS_DIR, vdso_data, ts_dir);</div><div class='add'>+	OFFSET(__VDSO_TS_END, vdso_data, ts_end);</div><div class='ctx'> 	OFFSET(__VDSO_ECTG_BASE, vdso_per_cpu_data, ectg_timer_base);</div><div class='ctx'> 	OFFSET(__VDSO_ECTG_USER, vdso_per_cpu_data, ectg_user_time);</div><div class='ctx'> 	OFFSET(__VDSO_CPU_NR, vdso_per_cpu_data, cpu_nr);</div><div class='hunk'>@@ -159,7 +156,6 @@ int main(void)</div><div class='ctx'> 	OFFSET(__LC_INT_CLOCK, lowcore, int_clock);</div><div class='ctx'> 	OFFSET(__LC_MCCK_CLOCK, lowcore, mcck_clock);</div><div class='ctx'> 	OFFSET(__LC_CURRENT, lowcore, current_task);</div><div class='del'>-	OFFSET(__LC_THREAD_INFO, lowcore, thread_info);</div><div class='ctx'> 	OFFSET(__LC_KERNEL_STACK, lowcore, kernel_stack);</div><div class='ctx'> 	OFFSET(__LC_ASYNC_STACK, lowcore, async_stack);</div><div class='ctx'> 	OFFSET(__LC_PANIC_STACK, lowcore, panic_stack);</div><div class='hunk'>@@ -173,6 +169,7 @@ int main(void)</div><div class='ctx'> 	OFFSET(__LC_PERCPU_OFFSET, lowcore, percpu_offset);</div><div class='ctx'> 	OFFSET(__LC_VDSO_PER_CPU, lowcore, vdso_per_cpu_data);</div><div class='ctx'> 	OFFSET(__LC_MACHINE_FLAGS, lowcore, machine_flags);</div><div class='add'>+	OFFSET(__LC_PREEMPT_COUNT, lowcore, preempt_count);</div><div class='ctx'> 	OFFSET(__LC_GMAP, lowcore, gmap);</div><div class='ctx'> 	OFFSET(__LC_PASTE, lowcore, paste);</div><div class='ctx'> 	/* software defined ABI-relevant lowcore locations 0xe00 - 0xe20 */</div><div class='head'>diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c<br/>index 0f9cd90c11af..a3d14161abcb 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/compat_linux.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/compat_linux.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/compat_linux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/compat_linux.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/shm.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/quota.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='hunk'>@@ -51,7 +50,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/scm.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c<br/>index 4af60374eba0..c620049c61f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/compat_signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/compat_signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/compat_signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/compat_signal.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -23,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/binfmts.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include "compat_linux.h"</div><div class='hunk'>@@ -446,7 +447,7 @@ static int setup_frame32(struct ksignal *ksig, sigset_t *set,</div><div class='ctx'> 		/* set extra registers only for synchronous signals */</div><div class='ctx'> 		regs-&gt;gprs[4] = regs-&gt;int_code &amp; 127;</div><div class='ctx'> 		regs-&gt;gprs[5] = regs-&gt;int_parm_long;</div><div class='del'>-		regs-&gt;gprs[6] = task_thread_info(current)-&gt;last_break;</div><div class='add'>+		regs-&gt;gprs[6] = current-&gt;thread.last_break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -523,7 +524,7 @@ static int setup_rt_frame32(struct ksignal *ksig, sigset_t *set,</div><div class='ctx'> 	regs-&gt;gprs[2] = ksig-&gt;sig;</div><div class='ctx'> 	regs-&gt;gprs[3] = (__force __u64) &amp;frame-&gt;info;</div><div class='ctx'> 	regs-&gt;gprs[4] = (__force __u64) &amp;frame-&gt;uc;</div><div class='del'>-	regs-&gt;gprs[5] = task_thread_info(current)-&gt;last_break;</div><div class='add'>+	regs-&gt;gprs[5] = current-&gt;thread.last_break;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/cpcmd.c b/arch/s390/kernel/cpcmd.c<br/>index 7f48e568ac64..9f0e4a2785f7 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/cpcmd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/cpcmd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/cpcmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/cpcmd.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c<br/>index f9293bfefb7f..dd1d5c62c374 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/crash_dump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/crash_dump.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/crash_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/crash_dump.c</a></div><div class='hunk'>@@ -8,7 +8,8 @@</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='hunk'>@@ -31,6 +32,7 @@ static struct memblock_type oldmem_type = {</div><div class='ctx'> 	.max = 1,</div><div class='ctx'> 	.total_size = 0,</div><div class='ctx'> 	.regions = &amp;oldmem_region,</div><div class='add'>+	.name = "oldmem",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct save_area {</div><div class='hunk'>@@ -329,7 +331,11 @@ static void *nt_init_name(void *buf, Elf64_Word type, void *desc, int d_len,</div><div class='ctx'> </div><div class='ctx'> static inline void *nt_init(void *buf, Elf64_Word type, void *desc, int d_len)</div><div class='ctx'> {</div><div class='del'>-	return nt_init_name(buf, type, desc, d_len, KEXEC_CORE_NOTE_NAME);</div><div class='add'>+	const char *note_name = "LINUX";</div><div class='add'>+</div><div class='add'>+	if (type == NT_PRPSINFO || type == NT_PRSTATUS || type == NT_PRFPREG)</div><div class='add'>+		note_name = KEXEC_CORE_NOTE_NAME;</div><div class='add'>+	return nt_init_name(buf, type, desc, d_len, note_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c<br/>index aa12de72fd47..530226b6cb19 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/debug.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/debug.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/debug.c</a></div><div class='hunk'>@@ -19,8 +19,8 @@</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='hunk'>@@ -866,7 +866,7 @@ static inline void</div><div class='ctx'> debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level,</div><div class='ctx'> 			int exception)</div><div class='ctx'> {</div><div class='del'>-	active-&gt;id.stck = get_tod_clock_fast();</div><div class='add'>+	active-&gt;id.stck = get_tod_clock_fast() - sched_clock_base_cc;</div><div class='ctx'> 	active-&gt;id.fields.cpuid = smp_processor_id();</div><div class='ctx'> 	active-&gt;caller = __builtin_return_address(0);</div><div class='ctx'> 	active-&gt;id.fields.exception = exception;</div><div class='hunk'>@@ -1455,23 +1455,24 @@ int</div><div class='ctx'> debug_dflt_header_fn(debug_info_t * id, struct debug_view *view,</div><div class='ctx'> 			 int area, debug_entry_t * entry, char *out_buf)</div><div class='ctx'> {</div><div class='del'>-	struct timespec64 time_spec;</div><div class='add'>+	unsigned long sec, usec;</div><div class='ctx'> 	char *except_str;</div><div class='ctx'> 	unsigned long caller;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	unsigned int level;</div><div class='ctx'> </div><div class='ctx'> 	level = entry-&gt;id.fields.level;</div><div class='del'>-	stck_to_timespec64(entry-&gt;id.stck, &amp;time_spec);</div><div class='add'>+	sec = (entry-&gt;id.stck &gt;&gt; 12) + (sched_clock_base_cc &gt;&gt; 12);</div><div class='add'>+	sec = sec - (TOD_UNIX_EPOCH &gt;&gt; 12);</div><div class='add'>+	usec = do_div(sec, USEC_PER_SEC);</div><div class='ctx'> </div><div class='ctx'> 	if (entry-&gt;id.fields.exception)</div><div class='ctx'> 		except_str = "*";</div><div class='ctx'> 	else</div><div class='ctx'> 		except_str = "-";</div><div class='ctx'> 	caller = (unsigned long) entry-&gt;caller;</div><div class='del'>-	rc += sprintf(out_buf, "%02i %011lld:%06lu %1u %1s %02i %p  ",</div><div class='del'>-		      area, (long long)time_spec.tv_sec,</div><div class='del'>-		      time_spec.tv_nsec / 1000, level, except_str,</div><div class='add'>+	rc += sprintf(out_buf, "%02i %011ld:%06lu %1u %1s %02i %p  ",</div><div class='add'>+		      area, sec, usec, level, except_str,</div><div class='ctx'> 		      entry-&gt;id.fields.cpuid, (void *)caller);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c<br/>index a97354c8c667..ac6abcd3fe6a 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/diag.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/diag.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/diag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/diag.c</a></div><div class='hunk'>@@ -5,7 +5,8 @@</div><div class='ctx'>  * Author(s): Michael Holzheu &lt;holzheu@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c<br/>index c74c59236f44..f7e82302a71e 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/dis.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/dis.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/dis.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/dis.c</a></div><div class='hunk'>@@ -16,13 +16,13 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/dis.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/dumpstack.c b/arch/s390/kernel/dumpstack.c<br/>index 55d4fe174fd9..829e1c53005c 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/dumpstack.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/dumpstack.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/dumpstack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/dumpstack.c</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='ctx'> #include &lt;asm/dis.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c<br/>index 2374c5b46bbc..4e65c79cc5f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/early.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/early.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/early.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/early.c</a></div><div class='hunk'>@@ -293,6 +293,7 @@ static noinline __init void setup_lowcore_early(void)</div><div class='ctx'> 	psw.addr = (unsigned long) s390_base_pgm_handler;</div><div class='ctx'> 	S390_lowcore.program_new_psw = psw;</div><div class='ctx'> 	s390_base_pgm_handler_fn = early_pgm_check_handler;</div><div class='add'>+	S390_lowcore.preempt_count = INIT_PREEMPT_COUNT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline __init void setup_facility_list(void)</div><div class='hunk'>@@ -353,6 +354,10 @@ static __init void detect_machine_facilities(void)</div><div class='ctx'> 		S390_lowcore.machine_flags |= MACHINE_FLAG_VX;</div><div class='ctx'> 		__ctl_set_bit(0, 17);</div><div class='ctx'> 	}</div><div class='add'>+	if (test_facility(130)) {</div><div class='add'>+		S390_lowcore.machine_flags |= MACHINE_FLAG_NX;</div><div class='add'>+		__ctl_set_bit(0, 20);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void save_vector_registers(void)</div><div class='hunk'>@@ -363,6 +368,18 @@ static inline void save_vector_registers(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init topology_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	bool enabled;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = kstrtobool(str, &amp;enabled);</div><div class='add'>+	if (!rc &amp;&amp; !enabled)</div><div class='add'>+		S390_lowcore.machine_flags &amp;= ~MACHINE_HAS_TOPOLOGY;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+early_param("topology", topology_setup);</div><div class='add'>+</div><div class='ctx'> static int __init disable_vector_extension(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	S390_lowcore.machine_flags &amp;= ~MACHINE_FLAG_VX;</div><div class='hunk'>@@ -371,6 +388,21 @@ static int __init disable_vector_extension(char *str)</div><div class='ctx'> }</div><div class='ctx'> early_param("novx", disable_vector_extension);</div><div class='ctx'> </div><div class='add'>+static int __init noexec_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	bool enabled;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = kstrtobool(str, &amp;enabled);</div><div class='add'>+	if (!rc &amp;&amp; !enabled) {</div><div class='add'>+		/* Disable no-execute support */</div><div class='add'>+		S390_lowcore.machine_flags &amp;= ~MACHINE_FLAG_NX;</div><div class='add'>+		__ctl_clear_bit(0, 20);</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+early_param("noexec", noexec_setup);</div><div class='add'>+</div><div class='ctx'> static int __init cad_setup(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='hunk'>@@ -391,7 +423,49 @@ static int __init cad_init(void)</div><div class='ctx'> }</div><div class='ctx'> early_initcall(cad_init);</div><div class='ctx'> </div><div class='del'>-static __init void rescue_initrd(void)</div><div class='add'>+static __init void memmove_early(void *dst, const void *src, size_t n)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	long incr;</div><div class='add'>+	psw_t old;</div><div class='add'>+</div><div class='add'>+	if (!n)</div><div class='add'>+		return;</div><div class='add'>+	incr = 1;</div><div class='add'>+	if (dst &gt; src) {</div><div class='add'>+		incr = -incr;</div><div class='add'>+		dst += n - 1;</div><div class='add'>+		src += n - 1;</div><div class='add'>+	}</div><div class='add'>+	old = S390_lowcore.program_new_psw;</div><div class='add'>+	S390_lowcore.program_new_psw.mask = __extract_psw();</div><div class='add'>+	asm volatile(</div><div class='add'>+		"	larl	%[addr],1f\n"</div><div class='add'>+		"	stg	%[addr],%[psw_pgm_addr]\n"</div><div class='add'>+		"0:     mvc	0(1,%[dst]),0(%[src])\n"</div><div class='add'>+		"	agr	%[dst],%[incr]\n"</div><div class='add'>+		"	agr	%[src],%[incr]\n"</div><div class='add'>+		"	brctg	%[n],0b\n"</div><div class='add'>+		"1:\n"</div><div class='add'>+		: [addr] "=&amp;d" (addr),</div><div class='add'>+		  [psw_pgm_addr] "=Q" (S390_lowcore.program_new_psw.addr),</div><div class='add'>+		  [dst] "+&amp;a" (dst), [src] "+&amp;a" (src),  [n] "+d" (n)</div><div class='add'>+		: [incr] "d" (incr)</div><div class='add'>+		: "cc", "memory");</div><div class='add'>+	S390_lowcore.program_new_psw = old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init noinline void ipl_save_parameters(void)</div><div class='add'>+{</div><div class='add'>+	void *src, *dst;</div><div class='add'>+</div><div class='add'>+	src = (void *)(unsigned long) S390_lowcore.ipl_parmblock_ptr;</div><div class='add'>+	dst = (void *) IPL_PARMBLOCK_ORIGIN;</div><div class='add'>+	memmove_early(dst, src, PAGE_SIZE);</div><div class='add'>+	S390_lowcore.ipl_parmblock_ptr = IPL_PARMBLOCK_ORIGIN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init noinline void rescue_initrd(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='ctx'> 	unsigned long min_initrd_addr = (unsigned long) _end + (4UL &lt;&lt; 20);</div><div class='hunk'>@@ -405,7 +479,7 @@ static __init void rescue_initrd(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (INITRD_START &gt;= min_initrd_addr)</div><div class='ctx'> 		return;</div><div class='del'>-	memmove((void *) min_initrd_addr, (void *) INITRD_START, INITRD_SIZE);</div><div class='add'>+	memmove_early((void *) min_initrd_addr, (void *) INITRD_START, INITRD_SIZE);</div><div class='ctx'> 	INITRD_START = min_initrd_addr;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -467,7 +541,8 @@ void __init startup_init(void)</div><div class='ctx'> 	ipl_save_parameters();</div><div class='ctx'> 	rescue_initrd();</div><div class='ctx'> 	clear_bss_section();</div><div class='del'>-	ptff_init();</div><div class='add'>+	ipl_verify_parameters();</div><div class='add'>+	time_early_init();</div><div class='ctx'> 	init_kernel_storage_key();</div><div class='ctx'> 	lockdep_off();</div><div class='ctx'> 	setup_lowcore_early();</div><div class='head'>diff --git a/arch/s390/kernel/early_printk.c b/arch/s390/kernel/early_printk.c<br/>new file mode 100644<br/>index 000000000000..819cb15c67e8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/early_printk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/early_printk.c</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/*</div><div class='add'>+ *    Copyright IBM Corp. 2017</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;asm/sclp.h&gt;</div><div class='add'>+</div><div class='add'>+static void sclp_early_write(struct console *con, const char *s, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	__sclp_early_printk(s, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct console sclp_early_console = {</div><div class='add'>+	.name  = "earlysclp",</div><div class='add'>+	.write = sclp_early_write,</div><div class='add'>+	.flags = CON_PRINTBUFFER | CON_BOOT,</div><div class='add'>+	.index = -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init setup_early_printk(char *buf)</div><div class='add'>+{</div><div class='add'>+	if (early_console)</div><div class='add'>+		return 0;</div><div class='add'>+	/* Accept only "earlyprintk" and "earlyprintk=sclp" */</div><div class='add'>+	if (buf &amp;&amp; strncmp(buf, "sclp", 4))</div><div class='add'>+		return 0;</div><div class='add'>+	if (!sclp.has_linemode &amp;&amp; !sclp.has_vt220)</div><div class='add'>+		return 0;</div><div class='add'>+	early_console = &amp;sclp_early_console;</div><div class='add'>+	register_console(early_console);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("earlyprintk", setup_early_printk);</div><div class='head'>diff --git a/arch/s390/kernel/ebcdic.c b/arch/s390/kernel/ebcdic.c<br/>index b971c6be6298..1d5392b36ad8 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/ebcdic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/ebcdic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/ebcdic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/ebcdic.c</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'>  *               Martin Peschke &lt;peschke@fh-brandenburg.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/types.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/ebcdic.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S<br/>index 49a30737adde..dff2152350a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/entry.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/entry.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/entry.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/entry.S</a></div><div class='hunk'>@@ -42,7 +42,7 @@ __PT_R13     =	__PT_GPRS + 104</div><div class='ctx'> __PT_R14     =	__PT_GPRS + 112</div><div class='ctx'> __PT_R15     =	__PT_GPRS + 120</div><div class='ctx'> </div><div class='del'>-STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER</div><div class='add'>+STACK_SHIFT = PAGE_SHIFT + THREAD_SIZE_ORDER</div><div class='ctx'> STACK_SIZE  = 1 &lt;&lt; STACK_SHIFT</div><div class='ctx'> STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE</div><div class='ctx'> </div><div class='hunk'>@@ -50,7 +50,8 @@ _TIF_WORK	= (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \</div><div class='ctx'> 		   _TIF_UPROBE)</div><div class='ctx'> _TIF_TRACE	= (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \</div><div class='ctx'> 		   _TIF_SYSCALL_TRACEPOINT)</div><div class='del'>-_CIF_WORK	= (_CIF_MCCK_PENDING | _CIF_ASCE | _CIF_FPU)</div><div class='add'>+_CIF_WORK	= (_CIF_MCCK_PENDING | _CIF_ASCE_PRIMARY | \</div><div class='add'>+		   _CIF_ASCE_SECONDARY | _CIF_FPU)</div><div class='ctx'> _PIF_WORK	= (_PIF_PER_TRAP)</div><div class='ctx'> </div><div class='ctx'> #define BASED(name) name-cleanup_critical(%r13)</div><div class='hunk'>@@ -103,8 +104,7 @@ _PIF_WORK	= (_PIF_PER_TRAP)</div><div class='ctx'> 	CHECK_STACK 1&lt;&lt;STACK_SHIFT,\savearea</div><div class='ctx'> 	aghi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='ctx'> 	j	3f</div><div class='del'>-1:	LAST_BREAK %r14</div><div class='del'>-	UPDATE_VTIME %r14,%r15,\timer</div><div class='add'>+1:	UPDATE_VTIME %r14,%r15,\timer</div><div class='ctx'> 2:	lg	%r15,__LC_ASYNC_STACK	# load async stack</div><div class='ctx'> 3:	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='ctx'> 	.endm</div><div class='hunk'>@@ -121,12 +121,6 @@ _PIF_WORK	= (_PIF_PER_TRAP)</div><div class='ctx'> 	mvc	__LC_LAST_UPDATE_TIMER(8),\enter_timer</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	LAST_BREAK scratch</div><div class='del'>-	srag	\scratch,%r10,23</div><div class='del'>-	jz	.+10</div><div class='del'>-	stg	%r10,__TI_last_break(%r12)</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> 	.macro REENABLE_IRQS</div><div class='ctx'> 	stg	%r8,__LC_RETURN_PSW</div><div class='ctx'> 	ni	__LC_RETURN_PSW,0xbf</div><div class='hunk'>@@ -186,14 +180,13 @@ ENTRY(__switch_to)</div><div class='ctx'> 	stmg	%r6,%r15,__SF_GPRS(%r15)	# store gprs of prev task</div><div class='ctx'> 	lgr	%r1,%r2</div><div class='ctx'> 	aghi	%r1,__TASK_thread		# thread_struct of prev task</div><div class='del'>-	lg	%r5,__TASK_thread_info(%r3)	# get thread_info of next</div><div class='add'>+	lg	%r5,__TASK_stack(%r3)		# start of kernel stack of next</div><div class='ctx'> 	stg	%r15,__THREAD_ksp(%r1)		# store kernel stack of prev</div><div class='ctx'> 	lgr	%r1,%r3</div><div class='ctx'> 	aghi	%r1,__TASK_thread		# thread_struct of next task</div><div class='ctx'> 	lgr	%r15,%r5</div><div class='ctx'> 	aghi	%r15,STACK_INIT			# end of kernel stack of next</div><div class='ctx'> 	stg	%r3,__LC_CURRENT		# store task struct of next</div><div class='del'>-	stg	%r5,__LC_THREAD_INFO		# store thread info of next</div><div class='ctx'> 	stg	%r15,__LC_KERNEL_STACK		# store end of kernel stack</div><div class='ctx'> 	lg	%r15,__THREAD_ksp(%r1)		# load kernel stack of next</div><div class='ctx'> 	/* c4 is used in guest detection: arch/s390/kernel/perf_cpum_sf.c */</div><div class='hunk'>@@ -273,22 +266,22 @@ ENTRY(system_call)</div><div class='ctx'> 	stpt	__LC_SYNC_ENTER_TIMER</div><div class='ctx'> .Lsysc_stmg:</div><div class='ctx'> 	stmg	%r8,%r15,__LC_SAVE_AREA_SYNC</div><div class='del'>-	lg	%r10,__LC_LAST_BREAK</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	lg	%r12,__LC_CURRENT</div><div class='add'>+	lghi	%r13,__TASK_thread</div><div class='ctx'> 	lghi	%r14,_PIF_SYSCALL</div><div class='ctx'> .Lsysc_per:</div><div class='ctx'> 	lg	%r15,__LC_KERNEL_STACK</div><div class='ctx'> 	la	%r11,STACK_FRAME_OVERHEAD(%r15)	# pointer to pt_regs</div><div class='del'>-	LAST_BREAK %r13</div><div class='ctx'> .Lsysc_vtime:</div><div class='del'>-	UPDATE_VTIME %r10,%r13,__LC_SYNC_ENTER_TIMER</div><div class='add'>+	UPDATE_VTIME %r8,%r9,__LC_SYNC_ENTER_TIMER</div><div class='ctx'> 	stmg	%r0,%r7,__PT_R0(%r11)</div><div class='ctx'> 	mvc	__PT_R8(64,%r11),__LC_SAVE_AREA_SYNC</div><div class='ctx'> 	mvc	__PT_PSW(16,%r11),__LC_SVC_OLD_PSW</div><div class='ctx'> 	mvc	__PT_INT_CODE(4,%r11),__LC_SVC_ILC</div><div class='ctx'> 	stg	%r14,__PT_FLAGS(%r11)</div><div class='ctx'> .Lsysc_do_svc:</div><div class='del'>-	lg	%r10,__TI_sysc_table(%r12)	# address of system call table</div><div class='add'>+	# load address of system call table</div><div class='add'>+	lg	%r10,__THREAD_sysc_table(%r13,%r12)</div><div class='ctx'> 	llgh	%r8,__PT_INT_CODE+2(%r11)</div><div class='ctx'> 	slag	%r8,%r8,2			# shift and test for svc 0</div><div class='ctx'> 	jnz	.Lsysc_nr_ok</div><div class='hunk'>@@ -347,8 +340,8 @@ ENTRY(system_call)</div><div class='ctx'> 	jo	.Lsysc_notify_resume</div><div class='ctx'> 	TSTMSK	__LC_CPU_FLAGS,_CIF_FPU</div><div class='ctx'> 	jo	.Lsysc_vxrs</div><div class='del'>-	TSTMSK	__LC_CPU_FLAGS,_CIF_ASCE</div><div class='del'>-	jo	.Lsysc_uaccess</div><div class='add'>+	TSTMSK	__LC_CPU_FLAGS,(_CIF_ASCE_PRIMARY|_CIF_ASCE_SECONDARY)</div><div class='add'>+	jnz	.Lsysc_asce</div><div class='ctx'> 	j	.Lsysc_return		# beware of critical section cleanup</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -366,12 +359,15 @@ ENTRY(system_call)</div><div class='ctx'> 	jg	s390_handle_mcck	# TIF bit will be cleared by handler</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# _CIF_ASCE is set, load user space asce</div><div class='add'>+# _CIF_ASCE_PRIMARY and/or CIF_ASCE_SECONDARY set, load user space asce</div><div class='ctx'> #</div><div class='del'>-.Lsysc_uaccess:</div><div class='del'>-	ni	__LC_CPU_FLAGS+7,255-_CIF_ASCE</div><div class='add'>+.Lsysc_asce:</div><div class='add'>+	ni	__LC_CPU_FLAGS+7,255-_CIF_ASCE_PRIMARY</div><div class='ctx'> 	lctlg	%c1,%c1,__LC_USER_ASCE		# load primary asce</div><div class='del'>-	j	.Lsysc_return</div><div class='add'>+	TSTMSK	__LC_CPU_FLAGS,_CIF_ASCE_SECONDARY</div><div class='add'>+	jz	.Lsysc_return</div><div class='add'>+	larl	%r14,.Lsysc_return</div><div class='add'>+	jg	set_fs_fixup</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CIF_FPU is set, restore floating-point controls and floating-point registers.</div><div class='hunk'>@@ -388,14 +384,11 @@ ENTRY(system_call)</div><div class='ctx'> 	brasl	%r14,do_signal</div><div class='ctx'> 	TSTMSK	__PT_FLAGS(%r11),_PIF_SYSCALL</div><div class='ctx'> 	jno	.Lsysc_return</div><div class='add'>+.Lsysc_do_syscall:</div><div class='add'>+	lghi	%r13,__TASK_thread</div><div class='ctx'> 	lmg	%r2,%r7,__PT_R2(%r11)	# load svc arguments</div><div class='del'>-	lg	%r10,__TI_sysc_table(%r12)	# address of system call table</div><div class='del'>-	lghi	%r8,0			# svc 0 returns -ENOSYS</div><div class='del'>-	llgh	%r1,__PT_INT_CODE+2(%r11)	# load new svc number</div><div class='del'>-	cghi	%r1,NR_syscalls</div><div class='del'>-	jnl	.Lsysc_nr_ok		# invalid svc number -&gt; do svc 0</div><div class='del'>-	slag	%r8,%r1,2</div><div class='del'>-	j	.Lsysc_nr_ok		# restart svc</div><div class='add'>+	lghi	%r1,0			# svc 0 returns -ENOSYS</div><div class='add'>+	j	.Lsysc_do_svc</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # _TIF_NOTIFY_RESUME is set, call do_notify_resume</div><div class='hunk'>@@ -457,7 +450,7 @@ ENTRY(system_call)</div><div class='ctx'> #</div><div class='ctx'> ENTRY(ret_from_fork)</div><div class='ctx'> 	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	lg	%r12,__LC_CURRENT</div><div class='ctx'> 	brasl	%r14,schedule_tail</div><div class='ctx'> 	TRACE_IRQS_ON</div><div class='ctx'> 	ssm	__LC_SVC_NEW_PSW	# reenable interrupts</div><div class='hunk'>@@ -478,7 +471,7 @@ ENTRY(pgm_check_handler)</div><div class='ctx'> 	stpt	__LC_SYNC_ENTER_TIMER</div><div class='ctx'> 	stmg	%r8,%r15,__LC_SAVE_AREA_SYNC</div><div class='ctx'> 	lg	%r10,__LC_LAST_BREAK</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	lg	%r12,__LC_CURRENT</div><div class='ctx'> 	larl	%r13,cleanup_critical</div><div class='ctx'> 	lmg	%r8,%r9,__LC_PGM_OLD_PSW</div><div class='ctx'> 	tmhh	%r8,0x0001		# test problem state bit</div><div class='hunk'>@@ -498,16 +491,16 @@ ENTRY(pgm_check_handler)</div><div class='ctx'> 1:	CHECK_STACK STACK_SIZE,__LC_SAVE_AREA_SYNC</div><div class='ctx'> 	aghi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='ctx'> 	j	3f</div><div class='del'>-2:	LAST_BREAK %r14</div><div class='del'>-	UPDATE_VTIME %r14,%r15,__LC_SYNC_ENTER_TIMER</div><div class='add'>+2:	UPDATE_VTIME %r14,%r15,__LC_SYNC_ENTER_TIMER</div><div class='ctx'> 	lg	%r15,__LC_KERNEL_STACK</div><div class='del'>-	lg	%r14,__TI_task(%r12)</div><div class='add'>+	lgr	%r14,%r12</div><div class='ctx'> 	aghi	%r14,__TASK_thread	# pointer to thread_struct</div><div class='ctx'> 	lghi	%r13,__LC_PGM_TDB</div><div class='ctx'> 	tm	__LC_PGM_ILC+2,0x02	# check for transaction abort</div><div class='ctx'> 	jz	3f</div><div class='ctx'> 	mvc	__THREAD_trap_tdb(256,%r14),0(%r13)</div><div class='ctx'> 3:	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='add'>+	stg	%r10,__THREAD_last_break(%r14)</div><div class='ctx'> 	stmg	%r0,%r7,__PT_R0(%r11)</div><div class='ctx'> 	mvc	__PT_R8(64,%r11),__LC_SAVE_AREA_SYNC</div><div class='ctx'> 	stmg	%r8,%r9,__PT_PSW(%r11)</div><div class='hunk'>@@ -537,6 +530,8 @@ ENTRY(pgm_check_handler)</div><div class='ctx'> 	LOCKDEP_SYS_EXIT</div><div class='ctx'> 	tm	__PT_PSW+1(%r11),0x01	# returning to user ?</div><div class='ctx'> 	jno	.Lsysc_restore</div><div class='add'>+	TSTMSK	__PT_FLAGS(%r11),_PIF_SYSCALL</div><div class='add'>+	jo	.Lsysc_do_syscall</div><div class='ctx'> 	j	.Lsysc_tif</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -554,6 +549,7 @@ ENTRY(pgm_check_handler)</div><div class='ctx'> #</div><div class='ctx'> .Lpgm_svcper:</div><div class='ctx'> 	mvc	__LC_RETURN_PSW(8),__LC_SVC_NEW_PSW</div><div class='add'>+	lghi	%r13,__TASK_thread</div><div class='ctx'> 	larl	%r14,.Lsysc_per</div><div class='ctx'> 	stg	%r14,__LC_RETURN_PSW+8</div><div class='ctx'> 	lghi	%r14,_PIF_SYSCALL | _PIF_PER_TRAP</div><div class='hunk'>@@ -566,8 +562,7 @@ ENTRY(io_int_handler)</div><div class='ctx'> 	STCK	__LC_INT_CLOCK</div><div class='ctx'> 	stpt	__LC_ASYNC_ENTER_TIMER</div><div class='ctx'> 	stmg	%r8,%r15,__LC_SAVE_AREA_ASYNC</div><div class='del'>-	lg	%r10,__LC_LAST_BREAK</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	lg	%r12,__LC_CURRENT</div><div class='ctx'> 	larl	%r13,cleanup_critical</div><div class='ctx'> 	lmg	%r8,%r9,__LC_IO_OLD_PSW</div><div class='ctx'> 	SWITCH_ASYNC __LC_SAVE_AREA_ASYNC,__LC_ASYNC_ENTER_TIMER</div><div class='hunk'>@@ -626,7 +621,7 @@ ENTRY(io_int_handler)</div><div class='ctx'> 	jo	.Lio_work_user		# yes -&gt; do resched &amp; signal</div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='ctx'> 	# check for preemptive scheduling</div><div class='del'>-	icm	%r0,15,__TI_precount(%r12)</div><div class='add'>+	icm	%r0,15,__LC_PREEMPT_COUNT</div><div class='ctx'> 	jnz	.Lio_restore		# preemption is disabled</div><div class='ctx'> 	TSTMSK	__TI_flags(%r12),_TIF_NEED_RESCHED</div><div class='ctx'> 	jno	.Lio_restore</div><div class='hunk'>@@ -670,8 +665,8 @@ ENTRY(io_int_handler)</div><div class='ctx'> 	jo	.Lio_notify_resume</div><div class='ctx'> 	TSTMSK	__LC_CPU_FLAGS,_CIF_FPU</div><div class='ctx'> 	jo	.Lio_vxrs</div><div class='del'>-	TSTMSK	__LC_CPU_FLAGS,_CIF_ASCE</div><div class='del'>-	jo	.Lio_uaccess</div><div class='add'>+	TSTMSK	__LC_CPU_FLAGS,(_CIF_ASCE_PRIMARY|_CIF_ASCE_SECONDARY)</div><div class='add'>+	jnz	.Lio_asce</div><div class='ctx'> 	j	.Lio_return		# beware of critical section cleanup</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -684,12 +679,15 @@ ENTRY(io_int_handler)</div><div class='ctx'> 	j	.Lio_return</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# _CIF_ASCE is set, load user space asce</div><div class='add'>+# _CIF_ASCE_PRIMARY and/or CIF_ASCE_SECONDARY set, load user space asce</div><div class='ctx'> #</div><div class='del'>-.Lio_uaccess:</div><div class='del'>-	ni	__LC_CPU_FLAGS+7,255-_CIF_ASCE</div><div class='add'>+.Lio_asce:</div><div class='add'>+	ni	__LC_CPU_FLAGS+7,255-_CIF_ASCE_PRIMARY</div><div class='ctx'> 	lctlg	%c1,%c1,__LC_USER_ASCE		# load primary asce</div><div class='del'>-	j	.Lio_return</div><div class='add'>+	TSTMSK	__LC_CPU_FLAGS,_CIF_ASCE_SECONDARY</div><div class='add'>+	jz	.Lio_return</div><div class='add'>+	larl	%r14,.Lio_return</div><div class='add'>+	jg	set_fs_fixup</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CIF_FPU is set, restore floating-point controls and floating-point registers.</div><div class='hunk'>@@ -740,8 +738,7 @@ ENTRY(ext_int_handler)</div><div class='ctx'> 	STCK	__LC_INT_CLOCK</div><div class='ctx'> 	stpt	__LC_ASYNC_ENTER_TIMER</div><div class='ctx'> 	stmg	%r8,%r15,__LC_SAVE_AREA_ASYNC</div><div class='del'>-	lg	%r10,__LC_LAST_BREAK</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	lg	%r12,__LC_CURRENT</div><div class='ctx'> 	larl	%r13,cleanup_critical</div><div class='ctx'> 	lmg	%r8,%r9,__LC_EXT_OLD_PSW</div><div class='ctx'> 	SWITCH_ASYNC __LC_SAVE_AREA_ASYNC,__LC_ASYNC_ENTER_TIMER</div><div class='hunk'>@@ -798,13 +795,10 @@ ENTRY(save_fpu_regs)</div><div class='ctx'> 	TSTMSK	__LC_CPU_FLAGS,_CIF_FPU</div><div class='ctx'> 	bor	%r14</div><div class='ctx'> 	stfpc	__THREAD_FPU_fpc(%r2)</div><div class='del'>-.Lsave_fpu_regs_fpc_end:</div><div class='ctx'> 	lg	%r3,__THREAD_FPU_regs(%r2)</div><div class='ctx'> 	TSTMSK	__LC_MACHINE_FLAGS,MACHINE_FLAG_VX</div><div class='ctx'> 	jz	.Lsave_fpu_regs_fp	  # no -&gt; store FP regs</div><div class='del'>-.Lsave_fpu_regs_vx_low:</div><div class='ctx'> 	VSTM	%v0,%v15,0,%r3		  # vstm 0,15,0(3)</div><div class='del'>-.Lsave_fpu_regs_vx_high:</div><div class='ctx'> 	VSTM	%v16,%v31,256,%r3	  # vstm 16,31,256(3)</div><div class='ctx'> 	j	.Lsave_fpu_regs_done	  # -&gt; set CIF_FPU flag</div><div class='ctx'> .Lsave_fpu_regs_fp:</div><div class='hunk'>@@ -851,9 +845,7 @@ load_fpu_regs:</div><div class='ctx'> 	TSTMSK	__LC_MACHINE_FLAGS,MACHINE_FLAG_VX</div><div class='ctx'> 	lg	%r4,__THREAD_FPU_regs(%r4)	# %r4 &lt;- reg save area</div><div class='ctx'> 	jz	.Lload_fpu_regs_fp		# -&gt; no VX, load FP regs</div><div class='del'>-.Lload_fpu_regs_vx:</div><div class='ctx'> 	VLM	%v0,%v15,0,%r4</div><div class='del'>-.Lload_fpu_regs_vx_high:</div><div class='ctx'> 	VLM	%v16,%v31,256,%r4</div><div class='ctx'> 	j	.Lload_fpu_regs_done</div><div class='ctx'> .Lload_fpu_regs_fp:</div><div class='hunk'>@@ -888,8 +880,7 @@ ENTRY(mcck_int_handler)</div><div class='ctx'> 	la	%r1,4095		# revalidate r1</div><div class='ctx'> 	spt	__LC_CPU_TIMER_SAVE_AREA-4095(%r1)	# revalidate cpu timer</div><div class='ctx'> 	lmg	%r0,%r15,__LC_GPREGS_SAVE_AREA-4095(%r1)# revalidate gprs</div><div class='del'>-	lg	%r10,__LC_LAST_BREAK</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	lg	%r12,__LC_CURRENT</div><div class='ctx'> 	larl	%r13,cleanup_critical</div><div class='ctx'> 	lmg	%r8,%r9,__LC_MCK_OLD_PSW</div><div class='ctx'> 	TSTMSK	__LC_MCCK_CODE,MCCK_CODE_SYSTEM_DAMAGE</div><div class='hunk'>@@ -948,7 +939,7 @@ ENTRY(mcck_int_handler)</div><div class='ctx'> </div><div class='ctx'> .Lmcck_panic:</div><div class='ctx'> 	lg	%r15,__LC_PANIC_STACK</div><div class='del'>-	aghi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='ctx'> 	j	.Lmcck_skip</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1083,9 +1074,10 @@ cleanup_critical:</div><div class='ctx'> 0:	# check if base register setup + TIF bit load has been done</div><div class='ctx'> 	clg	%r9,BASED(.Lcleanup_system_call_insn+16)</div><div class='ctx'> 	jhe	0f</div><div class='del'>-	# set up saved registers r10 and r12</div><div class='del'>-	stg	%r10,16(%r11)		# r10 last break</div><div class='del'>-	stg	%r12,32(%r11)		# r12 thread-info pointer</div><div class='add'>+	# set up saved register r12 task struct pointer</div><div class='add'>+	stg	%r12,32(%r11)</div><div class='add'>+	# set up saved register r13 __TASK_thread offset</div><div class='add'>+	mvc	40(8,%r11),BASED(.Lcleanup_system_call_const)</div><div class='ctx'> 0:	# check if the user time update has been done</div><div class='ctx'> 	clg	%r9,BASED(.Lcleanup_system_call_insn+24)</div><div class='ctx'> 	jh	0f</div><div class='hunk'>@@ -1102,12 +1094,7 @@ cleanup_critical:</div><div class='ctx'> 	stg	%r15,__LC_SYSTEM_TIMER</div><div class='ctx'> 0:	# update accounting time stamp</div><div class='ctx'> 	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER</div><div class='del'>-	# do LAST_BREAK</div><div class='del'>-	lg	%r9,16(%r11)</div><div class='del'>-	srag	%r9,%r9,23</div><div class='del'>-	jz	0f</div><div class='del'>-	mvc	__TI_last_break(8,%r12),16(%r11)</div><div class='del'>-0:	# set up saved register r11</div><div class='add'>+	# set up saved register r11</div><div class='ctx'> 	lg	%r15,__LC_KERNEL_STACK</div><div class='ctx'> 	la	%r9,STACK_FRAME_OVERHEAD(%r15)</div><div class='ctx'> 	stg	%r9,24(%r11)		# r11 pt_regs pointer</div><div class='hunk'>@@ -1129,6 +1116,8 @@ cleanup_critical:</div><div class='ctx'> 	.quad	.Lsysc_per</div><div class='ctx'> 	.quad	.Lsysc_vtime+36</div><div class='ctx'> 	.quad	.Lsysc_vtime+42</div><div class='add'>+.Lcleanup_system_call_const:</div><div class='add'>+	.quad	__TASK_thread</div><div class='ctx'> </div><div class='ctx'> .Lcleanup_sysc_tif:</div><div class='ctx'> 	larl	%r9,.Lsysc_tif</div><div class='head'>diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h<br/>index e79f030dd276..33f901865326 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/entry.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/entry.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/entry.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/entry.h</a></div><div class='hunk'>@@ -80,5 +80,6 @@ long sys_s390_pci_mmio_read(unsigned long, void __user *, size_t);</div><div class='ctx'> DECLARE_PER_CPU(u64, mt_cycles[8]);</div><div class='ctx'> </div><div class='ctx'> void verify_facilities(void);</div><div class='add'>+void set_fs_fixup(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* _ENTRY_H */</div><div class='head'>diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S<br/>index 4431905f8cfa..0b5ebf8a3d30 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/head.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/head.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/head.S</a></div><div class='hunk'>@@ -315,7 +315,7 @@ ENTRY(startup_kdump)</div><div class='ctx'> 	jg	startup_continue</div><div class='ctx'> </div><div class='ctx'> .Lstack:</div><div class='del'>-	.long	0x8000 + (1&lt;&lt;(PAGE_SHIFT+THREAD_ORDER))</div><div class='add'>+	.long	0x8000 + (1&lt;&lt;(PAGE_SHIFT+THREAD_SIZE_ORDER))</div><div class='ctx'> 	.align	8</div><div class='ctx'> 6:	.long	0x7fffffff,0xffffffff</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S<br/>index 03c2b469c472..482d3526e32b 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/head64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/head64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/head64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/head64.S</a></div><div class='hunk'>@@ -32,11 +32,10 @@ ENTRY(startup_continue)</div><div class='ctx'> #</div><div class='ctx'> # Setup stack</div><div class='ctx'> #</div><div class='del'>-	larl	%r15,init_thread_union</div><div class='del'>-	stg	%r15,__LC_THREAD_INFO	# cache thread info in lowcore</div><div class='del'>-	lg	%r14,__TI_task(%r15)	# cache current in lowcore</div><div class='add'>+	larl	%r14,init_task</div><div class='ctx'> 	stg	%r14,__LC_CURRENT</div><div class='del'>-	aghi	%r15,1&lt;&lt;(PAGE_SHIFT+THREAD_ORDER) # init_task_union + THREAD_SIZE</div><div class='add'>+	larl	%r15,init_thread_union</div><div class='add'>+	aghi	%r15,1&lt;&lt;(PAGE_SHIFT+THREAD_SIZE_ORDER) # init_task_union + THREAD_SIZE</div><div class='ctx'> 	stg	%r15,__LC_KERNEL_STACK	# set end of kernel stack</div><div class='ctx'> 	aghi	%r15,-160</div><div class='ctx'> #</div><div class='head'>diff --git a/arch/s390/kernel/idle.c b/arch/s390/kernel/idle.c<br/>index 7a55c29b0b33..9340b2a07935 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/idle.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/idle.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/idle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/idle.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='del'>-#include &lt;asm/cputime.h&gt;</div><div class='add'>+#include &lt;linux/sched/cputime.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='hunk'>@@ -43,7 +43,7 @@ void enabled_wait(void)</div><div class='ctx'> 	idle-&gt;clock_idle_enter = idle-&gt;clock_idle_exit = 0ULL;</div><div class='ctx'> 	idle-&gt;idle_time += idle_time;</div><div class='ctx'> 	idle-&gt;idle_count++;</div><div class='del'>-	account_idle_time(idle_time);</div><div class='add'>+	account_idle_time(cputime_to_nsecs(idle_time));</div><div class='ctx'> 	write_seqcount_end(&amp;idle-&gt;seqcount);</div><div class='ctx'> }</div><div class='ctx'> NOKPROBE_SYMBOL(enabled_wait);</div><div class='hunk'>@@ -57,8 +57,8 @@ static ssize_t show_idle_count(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		seq = read_seqcount_begin(&amp;idle-&gt;seqcount);</div><div class='del'>-		idle_count = ACCESS_ONCE(idle-&gt;idle_count);</div><div class='del'>-		if (ACCESS_ONCE(idle-&gt;clock_idle_enter))</div><div class='add'>+		idle_count = READ_ONCE(idle-&gt;idle_count);</div><div class='add'>+		if (READ_ONCE(idle-&gt;clock_idle_enter))</div><div class='ctx'> 			idle_count++;</div><div class='ctx'> 	} while (read_seqcount_retry(&amp;idle-&gt;seqcount, seq));</div><div class='ctx'> 	return sprintf(buf, "%llu\n", idle_count);</div><div class='hunk'>@@ -75,16 +75,16 @@ static ssize_t show_idle_time(struct device *dev,</div><div class='ctx'> 	do {</div><div class='ctx'> 		now = get_tod_clock();</div><div class='ctx'> 		seq = read_seqcount_begin(&amp;idle-&gt;seqcount);</div><div class='del'>-		idle_time = ACCESS_ONCE(idle-&gt;idle_time);</div><div class='del'>-		idle_enter = ACCESS_ONCE(idle-&gt;clock_idle_enter);</div><div class='del'>-		idle_exit = ACCESS_ONCE(idle-&gt;clock_idle_exit);</div><div class='add'>+		idle_time = READ_ONCE(idle-&gt;idle_time);</div><div class='add'>+		idle_enter = READ_ONCE(idle-&gt;clock_idle_enter);</div><div class='add'>+		idle_exit = READ_ONCE(idle-&gt;clock_idle_exit);</div><div class='ctx'> 	} while (read_seqcount_retry(&amp;idle-&gt;seqcount, seq));</div><div class='ctx'> 	idle_time += idle_enter ? ((idle_exit ? : now) - idle_enter) : 0;</div><div class='ctx'> 	return sprintf(buf, "%llu\n", idle_time &gt;&gt; 12);</div><div class='ctx'> }</div><div class='ctx'> DEVICE_ATTR(idle_time_us, 0444, show_idle_time, NULL);</div><div class='ctx'> </div><div class='del'>-cputime64_t arch_cpu_idle_time(int cpu)</div><div class='add'>+u64 arch_cpu_idle_time(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct s390_idle_data *idle = &amp;per_cpu(s390_idle, cpu);</div><div class='ctx'> 	unsigned long long now, idle_enter, idle_exit;</div><div class='hunk'>@@ -93,10 +93,11 @@ cputime64_t arch_cpu_idle_time(int cpu)</div><div class='ctx'> 	do {</div><div class='ctx'> 		now = get_tod_clock();</div><div class='ctx'> 		seq = read_seqcount_begin(&amp;idle-&gt;seqcount);</div><div class='del'>-		idle_enter = ACCESS_ONCE(idle-&gt;clock_idle_enter);</div><div class='del'>-		idle_exit = ACCESS_ONCE(idle-&gt;clock_idle_exit);</div><div class='add'>+		idle_enter = READ_ONCE(idle-&gt;clock_idle_enter);</div><div class='add'>+		idle_exit = READ_ONCE(idle-&gt;clock_idle_exit);</div><div class='ctx'> 	} while (read_seqcount_retry(&amp;idle-&gt;seqcount, seq));</div><div class='del'>-	return idle_enter ? ((idle_exit ?: now) - idle_enter) : 0;</div><div class='add'>+</div><div class='add'>+	return cputime_to_nsecs(idle_enter ? ((idle_exit ?: now) - idle_enter) : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void arch_cpu_idle_enter(void)</div><div class='head'>diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c<br/>index 295bfb7124bc..b67dafb7b7cf 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/ipl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/ipl.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/ipl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/ipl.c</a></div><div class='hunk'>@@ -8,7 +8,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='hunk'>@@ -1546,7 +1547,8 @@ static void dump_reipl_run(struct shutdown_trigger *trigger)</div><div class='ctx'> 	unsigned long ipib = (unsigned long) reipl_block_actual;</div><div class='ctx'> 	unsigned int csum;</div><div class='ctx'> </div><div class='del'>-	csum = csum_partial(reipl_block_actual, reipl_block_actual-&gt;hdr.len, 0);</div><div class='add'>+	csum = (__force unsigned int)</div><div class='add'>+	       csum_partial(reipl_block_actual, reipl_block_actual-&gt;hdr.len, 0);</div><div class='ctx'> 	mem_assign_absolute(S390_lowcore.ipib, ipib);</div><div class='ctx'> 	mem_assign_absolute(S390_lowcore.ipib_checksum, csum);</div><div class='ctx'> 	dump_run(trigger);</div><div class='hunk'>@@ -1863,7 +1865,7 @@ static int __init s390_ipl_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	char str[8] = {0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40};</div><div class='ctx'> </div><div class='del'>-	sclp_get_ipl_info(&amp;sclp_ipl_info);</div><div class='add'>+	sclp_early_get_ipl_info(&amp;sclp_ipl_info);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fix loadparm: There are systems where the (SCSI) LOADPARM</div><div class='ctx'> 	 * returned by read SCP info is invalid (contains EBCDIC blanks)</div><div class='hunk'>@@ -1991,10 +1993,9 @@ void __init ipl_update_parameters(void)</div><div class='ctx'> 		diag308_set_works = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init ipl_save_parameters(void)</div><div class='add'>+void __init ipl_verify_parameters(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct cio_iplinfo iplinfo;</div><div class='del'>-	void *src, *dst;</div><div class='ctx'> </div><div class='ctx'> 	if (cio_get_iplinfo(&amp;iplinfo))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2005,10 +2006,6 @@ void __init ipl_save_parameters(void)</div><div class='ctx'> 	if (!iplinfo.is_qdio)</div><div class='ctx'> 		return;</div><div class='ctx'> 	ipl_flags |= IPL_PARMBLOCK_VALID;</div><div class='del'>-	src = (void *)(unsigned long)S390_lowcore.ipl_parmblock_ptr;</div><div class='del'>-	dst = (void *)IPL_PARMBLOCK_ORIGIN;</div><div class='del'>-	memmove(dst, src, PAGE_SIZE);</div><div class='del'>-	S390_lowcore.ipl_parmblock_ptr = IPL_PARMBLOCK_ORIGIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(rcall);</div><div class='head'>diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c<br/>index 285d6561076d..6dca93b29bed 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/irq.c</a></div><div class='hunk'>@@ -12,11 +12,12 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='hunk'>@@ -168,7 +169,7 @@ void do_softirq_own_stack(void)</div><div class='ctx'> 	old = current_stack_pointer();</div><div class='ctx'> 	/* Check against async. stack address range. */</div><div class='ctx'> 	new = S390_lowcore.async_stack;</div><div class='del'>-	if (((new - old) &gt;&gt; (PAGE_SHIFT + THREAD_ORDER)) != 0) {</div><div class='add'>+	if (((new - old) &gt;&gt; (PAGE_SHIFT + THREAD_SIZE_ORDER)) != 0) {</div><div class='ctx'> 		/* Need to switch to the async. stack. */</div><div class='ctx'> 		new -= STACK_FRAME_OVERHEAD;</div><div class='ctx'> 		((struct stack_frame *) new)-&gt;back_chain = old;</div><div class='head'>diff --git a/arch/s390/kernel/jump_label.c b/arch/s390/kernel/jump_label.c<br/>index 083b05f5f5ab..6aa630a8d24f 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/jump_label.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/jump_label.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/jump_label.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/jump_label.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright IBM Corp. 2011</div><div class='ctx'>  * Author(s): Jan Glauber &lt;jang@linux.vnet.ibm.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/stop_machine.h&gt;</div><div class='ctx'> #include &lt;linux/jump_label.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c<br/>index fdb40424acfe..76f9eda1d7c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/kprobes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/kprobes.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/kprobes.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/dis.h&gt;</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct kprobe *, current_kprobe);</div><div class='hunk'>@@ -45,11 +45,17 @@ DEFINE_INSN_CACHE_OPS(dmainsn);</div><div class='ctx'> </div><div class='ctx'> static void *alloc_dmainsn_page(void)</div><div class='ctx'> {</div><div class='del'>-	return (void *)__get_free_page(GFP_KERNEL | GFP_DMA);</div><div class='add'>+	void *page;</div><div class='add'>+</div><div class='add'>+	page = (void *) __get_free_page(GFP_KERNEL | GFP_DMA);</div><div class='add'>+	if (page)</div><div class='add'>+		set_memory_x((unsigned long) page, 1);</div><div class='add'>+	return page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void free_dmainsn_page(void *page)</div><div class='ctx'> {</div><div class='add'>+	set_memory_nx((unsigned long) page, 1);</div><div class='ctx'> 	free_page((unsigned long)page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c<br/>index 6ea6d69339b5..ae7dff110054 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/lgr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/lgr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/lgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/lgr.c</a></div><div class='hunk'>@@ -5,7 +5,8 @@</div><div class='ctx'>  * Author(s): Michael Holzheu &lt;holzheu@linux.vnet.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/facility.h&gt;</div><div class='hunk'>@@ -183,4 +184,4 @@ static int __init lgr_init(void)</div><div class='ctx'> 	lgr_timer_set();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-module_init(lgr_init);</div><div class='add'>+device_initcall(lgr_init);</div><div class='head'>diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c<br/>index fbc07891f9e7..1a27f307a920 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/module.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/module.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/module.c</a></div><div class='hunk'>@@ -45,7 +45,8 @@ void *module_alloc(unsigned long size)</div><div class='ctx'> 	if (PAGE_ALIGN(size) &gt; MODULES_LEN)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,</div><div class='del'>-				    GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE,</div><div class='add'>+				    GFP_KERNEL, PAGE_KERNEL_EXEC,</div><div class='add'>+				    0, NUMA_NO_NODE,</div><div class='ctx'> 				    __builtin_return_address(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c<br/>index 9a32f7419d78..9bf8327154ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/nmi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/nmi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/nmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/nmi.c</a></div><div class='hunk'>@@ -14,6 +14,9 @@</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/stp.h&gt;</div><div class='hunk'>@@ -102,7 +105,7 @@ static int notrace s390_validate_registers(union mci mci, int umode)</div><div class='ctx'> {</div><div class='ctx'> 	int kill_task;</div><div class='ctx'> 	u64 zero;</div><div class='del'>-	void *fpt_save_area, *fpt_creg_save_area;</div><div class='add'>+	void *fpt_save_area;</div><div class='ctx'> </div><div class='ctx'> 	kill_task = 0;</div><div class='ctx'> 	zero = 0;</div><div class='hunk'>@@ -116,6 +119,19 @@ static int notrace s390_validate_registers(union mci mci, int umode)</div><div class='ctx'> 			s390_handle_damage();</div><div class='ctx'> 		kill_task = 1;</div><div class='ctx'> 	}</div><div class='add'>+	/* Validate control registers */</div><div class='add'>+	if (!mci.cr) {</div><div class='add'>+		/*</div><div class='add'>+		 * Control registers have unknown contents.</div><div class='add'>+		 * Can't recover and therefore stopping machine.</div><div class='add'>+		 */</div><div class='add'>+		s390_handle_damage();</div><div class='add'>+	} else {</div><div class='add'>+		asm volatile(</div><div class='add'>+			"	lctlg	0,15,0(%0)\n"</div><div class='add'>+			"	ptlb\n"</div><div class='add'>+			: : "a" (&amp;S390_lowcore.cregs_save_area) : "memory");</div><div class='add'>+	}</div><div class='ctx'> 	if (!mci.fp) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Floating point registers can't be restored. If the</div><div class='hunk'>@@ -130,7 +146,6 @@ static int notrace s390_validate_registers(union mci mci, int umode)</div><div class='ctx'> 			kill_task = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	fpt_save_area = &amp;S390_lowcore.floating_pt_save_area;</div><div class='del'>-	fpt_creg_save_area = &amp;S390_lowcore.fpt_creg_save_area;</div><div class='ctx'> 	if (!mci.fc) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Floating point control register can't be restored.</div><div class='hunk'>@@ -142,11 +157,13 @@ static int notrace s390_validate_registers(union mci mci, int umode)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (S390_lowcore.fpu_flags &amp; KERNEL_FPC)</div><div class='ctx'> 			s390_handle_damage();</div><div class='del'>-		asm volatile("lfpc 0(%0)" : : "a" (&amp;zero), "m" (zero));</div><div class='add'>+		asm volatile("lfpc %0" : : "Q" (zero));</div><div class='ctx'> 		if (!test_cpu_flag(CIF_FPU))</div><div class='ctx'> 			kill_task = 1;</div><div class='del'>-	} else</div><div class='del'>-		asm volatile("lfpc 0(%0)" : : "a" (fpt_creg_save_area));</div><div class='add'>+	} else {</div><div class='add'>+		asm volatile("lfpc %0"</div><div class='add'>+			     : : "Q" (S390_lowcore.fpt_creg_save_area));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!MACHINE_HAS_VX) {</div><div class='ctx'> 		/* Validate floating point registers */</div><div class='hunk'>@@ -167,7 +184,7 @@ static int notrace s390_validate_registers(union mci mci, int umode)</div><div class='ctx'> 			"	ld	13,104(%0)\n"</div><div class='ctx'> 			"	ld	14,112(%0)\n"</div><div class='ctx'> 			"	ld	15,120(%0)\n"</div><div class='del'>-			: : "a" (fpt_save_area));</div><div class='add'>+			: : "a" (fpt_save_area) : "memory");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Validate vector registers */</div><div class='ctx'> 		union ctlreg0 cr0;</div><div class='hunk'>@@ -207,18 +224,6 @@ static int notrace s390_validate_registers(union mci mci, int umode)</div><div class='ctx'> 		 */</div><div class='ctx'> 		kill_task = 1;</div><div class='ctx'> 	}</div><div class='del'>-	/* Validate control registers */</div><div class='del'>-	if (!mci.cr) {</div><div class='del'>-		/*</div><div class='del'>-		 * Control registers have unknown contents.</div><div class='del'>-		 * Can't recover and therefore stopping machine.</div><div class='del'>-		 */</div><div class='del'>-		s390_handle_damage();</div><div class='del'>-	} else {</div><div class='del'>-		asm volatile(</div><div class='del'>-			"	lctlg	0,15,0(%0)"</div><div class='del'>-			: : "a" (&amp;S390_lowcore.cregs_save_area));</div><div class='del'>-	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't even try to validate the TOD register, since we simply</div><div class='ctx'> 	 * can't write something sensible into that register.</div><div class='hunk'>@@ -234,9 +239,9 @@ static int notrace s390_validate_registers(union mci mci, int umode)</div><div class='ctx'> 			: : : "0", "cc");</div><div class='ctx'> 	else</div><div class='ctx'> 		asm volatile(</div><div class='del'>-			"	l	0,0(%0)\n"</div><div class='add'>+			"	l	0,%0\n"</div><div class='ctx'> 			"	sckpf"</div><div class='del'>-			: : "a" (&amp;S390_lowcore.tod_progreg_save_area)</div><div class='add'>+			: : "Q" (S390_lowcore.tod_progreg_save_area)</div><div class='ctx'> 			: "0", "cc");</div><div class='ctx'> 	/* Validate clock comparator register */</div><div class='ctx'> 	set_clock_comparator(S390_lowcore.clock_comparator);</div><div class='head'>diff --git a/arch/s390/kernel/os_info.c b/arch/s390/kernel/os_info.c<br/>index 87f05e475ae8..753ba63182b9 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/os_info.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/os_info.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/os_info.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/os_info.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@ static struct os_info os_info __page_aligned_data;</div><div class='ctx'> u32 os_info_csum(struct os_info *os_info)</div><div class='ctx'> {</div><div class='ctx'> 	int size = sizeof(*os_info) - offsetof(struct os_info, version_major);</div><div class='del'>-	return csum_partial(&amp;os_info-&gt;version_major, size, 0);</div><div class='add'>+	return (__force u32)csum_partial(&amp;os_info-&gt;version_major, size, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -46,7 +46,7 @@ void os_info_entry_add(int nr, void *ptr, u64 size)</div><div class='ctx'> {</div><div class='ctx'> 	os_info.entry[nr].addr = (u64)(unsigned long)ptr;</div><div class='ctx'> 	os_info.entry[nr].size = size;</div><div class='del'>-	os_info.entry[nr].csum = csum_partial(ptr, size, 0);</div><div class='add'>+	os_info.entry[nr].csum = (__force u32)csum_partial(ptr, size, 0);</div><div class='ctx'> 	os_info.csum = os_info_csum(&amp;os_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -93,7 +93,7 @@ static void os_info_old_alloc(int nr, int align)</div><div class='ctx'> 		msg = "copy failed";</div><div class='ctx'> 		goto fail_free;</div><div class='ctx'> 	}</div><div class='del'>-	csum = csum_partial(buf_align, size, 0);</div><div class='add'>+	csum = (__force u32)csum_partial(buf_align, size, 0);</div><div class='ctx'> 	if (csum != os_info_old-&gt;entry[nr].csum) {</div><div class='ctx'> 		msg = "checksum failed";</div><div class='ctx'> 		goto fail_free;</div><div class='head'>diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c<br/>index 037c2a253ae4..1aba10e90906 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/perf_cpum_cf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/perf_cpum_cf.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/perf_cpum_cf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/perf_cpum_cf.c</a></div><div class='hunk'>@@ -711,7 +711,7 @@ static int __init cpumf_pmu_init(void)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	return cpuhp_setup_state(CPUHP_AP_PERF_S390_CF_ONLINE,</div><div class='del'>-				 "AP_PERF_S390_CF_ONLINE",</div><div class='add'>+				 "perf/s390/cf:online",</div><div class='ctx'> 				 s390_pmu_online_cpu, s390_pmu_offline_cpu);</div><div class='ctx'> }</div><div class='ctx'> early_initcall(cpumf_pmu_init);</div><div class='head'>diff --git a/arch/s390/kernel/perf_cpum_cf_events.c b/arch/s390/kernel/perf_cpum_cf_events.c<br/>index 4554a4bae39e..c343ac2cf6c5 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/perf_cpum_cf_events.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/perf_cpum_cf_events.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/perf_cpum_cf_events.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/perf_cpum_cf_events.c</a></div><div class='hunk'>@@ -309,7 +309,7 @@ __init const struct attribute_group **cpumf_cf_event_group(void)</div><div class='ctx'> 	default:</div><div class='ctx'> 		model = NULL;</div><div class='ctx'> 		break;</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!model)</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c<br/>index fcc634c1479a..1c0b58545c04 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/perf_cpum_sf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/perf_cpum_sf.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/perf_cpum_sf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/perf_cpum_sf.c</a></div><div class='hunk'>@@ -995,39 +995,36 @@ static int perf_push_sample(struct perf_event *event, struct sf_raw_sample *sfr)</div><div class='ctx'> 	regs.int_parm = CPU_MF_INT_SF_PRA;</div><div class='ctx'> 	sde_regs = (struct perf_sf_sde_regs *) &amp;regs.int_parm_long;</div><div class='ctx'> </div><div class='del'>-	regs.psw.addr = sfr-&gt;basic.ia;</div><div class='del'>-	if (sfr-&gt;basic.T)</div><div class='del'>-		regs.psw.mask |= PSW_MASK_DAT;</div><div class='del'>-	if (sfr-&gt;basic.W)</div><div class='del'>-		regs.psw.mask |= PSW_MASK_WAIT;</div><div class='del'>-	if (sfr-&gt;basic.P)</div><div class='del'>-		regs.psw.mask |= PSW_MASK_PSTATE;</div><div class='del'>-	switch (sfr-&gt;basic.AS) {</div><div class='del'>-	case 0x0:</div><div class='del'>-		regs.psw.mask |= PSW_ASC_PRIMARY;</div><div class='del'>-		break;</div><div class='del'>-	case 0x1:</div><div class='del'>-		regs.psw.mask |= PSW_ASC_ACCREG;</div><div class='del'>-		break;</div><div class='del'>-	case 0x2:</div><div class='del'>-		regs.psw.mask |= PSW_ASC_SECONDARY;</div><div class='del'>-		break;</div><div class='del'>-	case 0x3:</div><div class='del'>-		regs.psw.mask |= PSW_ASC_HOME;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	psw_bits(regs.psw).ia = sfr-&gt;basic.ia;</div><div class='add'>+	psw_bits(regs.psw).t  = sfr-&gt;basic.T;</div><div class='add'>+	psw_bits(regs.psw).w  = sfr-&gt;basic.W;</div><div class='add'>+	psw_bits(regs.psw).p  = sfr-&gt;basic.P;</div><div class='add'>+	psw_bits(regs.psw).as = sfr-&gt;basic.AS;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * A non-zero guest program parameter indicates a guest</div><div class='del'>-	 * sample.</div><div class='del'>-	 * Note that some early samples or samples from guests without</div><div class='add'>+	 * Use the hardware provided configuration level to decide if the</div><div class='add'>+	 * sample belongs to a guest or host. If that is not available,</div><div class='add'>+	 * fall back to the following heuristics:</div><div class='add'>+	 * A non-zero guest program parameter always indicates a guest</div><div class='add'>+	 * sample. Some early samples or samples from guests without</div><div class='ctx'> 	 * lpp usage would be misaccounted to the host. We use the asn</div><div class='del'>-	 * value as a heuristic to detect most of these guest samples.</div><div class='del'>-	 * If the value differs from the host hpp value, we assume</div><div class='del'>-	 * it to be a KVM guest.</div><div class='add'>+	 * value as an addon heuristic to detect most of these guest samples.</div><div class='add'>+	 * If the value differs from the host hpp value, we assume to be a</div><div class='add'>+	 * KVM guest.</div><div class='ctx'> 	 */</div><div class='del'>-	if (sfr-&gt;basic.gpp || sfr-&gt;basic.prim_asn != (u16) sfr-&gt;basic.hpp)</div><div class='add'>+	switch (sfr-&gt;basic.CL) {</div><div class='add'>+	case 1: /* logical partition */</div><div class='add'>+		sde_regs-&gt;in_guest = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 2: /* virtual machine */</div><div class='ctx'> 		sde_regs-&gt;in_guest = 1;</div><div class='add'>+		break;</div><div class='add'>+	default: /* old machine, use heuristics */</div><div class='add'>+		if (sfr-&gt;basic.gpp ||</div><div class='add'>+		    sfr-&gt;basic.prim_asn != (u16)sfr-&gt;basic.hpp)</div><div class='add'>+			sde_regs-&gt;in_guest = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	overflow = 0;</div><div class='ctx'> 	if (perf_exclude_event(event, &amp;regs, sde_regs))</div><div class='hunk'>@@ -1626,7 +1623,7 @@ static int __init init_cpum_sampling_pmu(void)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cpuhp_setup_state(CPUHP_AP_PERF_S390_SF_ONLINE, "AP_PERF_S390_SF_ONLINE",</div><div class='add'>+	cpuhp_setup_state(CPUHP_AP_PERF_S390_SF_ONLINE, "perf/s390/sf:online",</div><div class='ctx'> 			  s390_pmu_sf_online_cpu, s390_pmu_sf_offline_cpu);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='head'>diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c<br/>index bba4fa74b321..20cd339e11ae 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/process.c</a></div><div class='hunk'>@@ -11,6 +11,9 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='hunk'>@@ -23,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init_task.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -100,10 +103,9 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int copy_thread(unsigned long clone_flags, unsigned long new_stackp,</div><div class='del'>-		unsigned long arg, struct task_struct *p)</div><div class='add'>+int copy_thread_tls(unsigned long clone_flags, unsigned long new_stackp,</div><div class='add'>+		    unsigned long arg, struct task_struct *p, unsigned long tls)</div><div class='ctx'> {</div><div class='del'>-	struct thread_info *ti;</div><div class='ctx'> 	struct fake_frame</div><div class='ctx'> 	{</div><div class='ctx'> 		struct stack_frame sf;</div><div class='hunk'>@@ -121,9 +123,8 @@ int copy_thread(unsigned long clone_flags, unsigned long new_stackp,</div><div class='ctx'> 	memset(&amp;p-&gt;thread.per_event, 0, sizeof(p-&gt;thread.per_event));</div><div class='ctx'> 	clear_tsk_thread_flag(p, TIF_SINGLE_STEP);</div><div class='ctx'> 	/* Initialize per thread user and system timer values */</div><div class='del'>-	ti = task_thread_info(p);</div><div class='del'>-	ti-&gt;user_timer = 0;</div><div class='del'>-	ti-&gt;system_timer = 0;</div><div class='add'>+	p-&gt;thread.user_timer = 0;</div><div class='add'>+	p-&gt;thread.system_timer = 0;</div><div class='ctx'> </div><div class='ctx'> 	frame-&gt;sf.back_chain = 0;</div><div class='ctx'> 	/* new return point is ret_from_fork */</div><div class='hunk'>@@ -158,7 +159,6 @@ int copy_thread(unsigned long clone_flags, unsigned long new_stackp,</div><div class='ctx'> </div><div class='ctx'> 	/* Set a new TLS ?  */</div><div class='ctx'> 	if (clone_flags &amp; CLONE_SETTLS) {</div><div class='del'>-		unsigned long tls = frame-&gt;childregs.gprs[6];</div><div class='ctx'> 		if (is_compat_task()) {</div><div class='ctx'> 			p-&gt;thread.acrs[0] = (unsigned int)tls;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -236,3 +236,16 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)</div><div class='ctx'> 	ret = PAGE_ALIGN(mm-&gt;brk + brk_rnd());</div><div class='ctx'> 	return (ret &gt; mm-&gt;brk) ? ret : mm-&gt;brk;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void set_fs_fixup(void)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = current_pt_regs();</div><div class='add'>+	static bool warned;</div><div class='add'>+</div><div class='add'>+	set_fs(USER_DS);</div><div class='add'>+	if (warned)</div><div class='add'>+		return;</div><div class='add'>+	WARN(1, "Unbalanced set_fs - int code: 0x%x\n", regs-&gt;int_code);</div><div class='add'>+	show_registers(regs);</div><div class='add'>+	warned = true;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c<br/>index 81d0808085e6..928b929a6261 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/processor.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/processor.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/processor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/processor.c</a></div><div class='hunk'>@@ -8,10 +8,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/diag.h&gt;</div><div class='ctx'> #include &lt;asm/facility.h&gt;</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='hunk'>@@ -32,7 +35,7 @@ static bool machine_has_cpu_mhz;</div><div class='ctx'> void __init cpu_detect_mhz_feature(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_facility(34) &amp;&amp; __ecag(ECAG_CPU_ATTRIBUTE, 0) != -1UL)</div><div class='del'>-		machine_has_cpu_mhz = 1;</div><div class='add'>+		machine_has_cpu_mhz = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void update_cpu_mhz(void *arg)</div><div class='hunk'>@@ -53,7 +56,7 @@ void s390_update_cpu_mhz(void)</div><div class='ctx'> 		on_each_cpu(update_cpu_mhz, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void notrace cpu_relax(void)</div><div class='add'>+void notrace cpu_relax_yield(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!smp_cpu_mtid &amp;&amp; MACHINE_HAS_DIAG44) {</div><div class='ctx'> 		diag_stat_inc(DIAG_STAT_X044);</div><div class='hunk'>@@ -61,7 +64,7 @@ void notrace cpu_relax(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	barrier();</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(cpu_relax);</div><div class='add'>+EXPORT_SYMBOL(cpu_relax_yield);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_init - initializes state that is per-CPU.</div><div class='hunk'>@@ -73,7 +76,7 @@ void cpu_init(void)</div><div class='ctx'> 	get_cpu_id(id);</div><div class='ctx'> 	if (machine_has_cpu_mhz)</div><div class='ctx'> 		update_cpu_mhz(NULL);</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> 	BUG_ON(current-&gt;mm);</div><div class='ctx'> 	enter_lazy_tlb(&amp;init_mm, current);</div><div class='hunk'>@@ -92,7 +95,7 @@ static void show_cpu_summary(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	static const char *hwcap_str[] = {</div><div class='ctx'> 		"esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp",</div><div class='del'>-		"edat", "etf3eh", "highgprs", "te", "vx"</div><div class='add'>+		"edat", "etf3eh", "highgprs", "te", "vx", "vxd", "vxe"</div><div class='ctx'> 	};</div><div class='ctx'> 	static const char * const int_hwcap_str[] = {</div><div class='ctx'> 		"sie"</div><div class='head'>diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c<br/>index 9336e824e2db..c14df0a1ec3c 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/ptrace.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -26,7 +27,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='hunk'>@@ -461,7 +462,7 @@ long arch_ptrace(struct task_struct *child, long request,</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case PTRACE_GET_LAST_BREAK:</div><div class='del'>-		put_user(task_thread_info(child)-&gt;last_break,</div><div class='add'>+		put_user(child-&gt;thread.last_break,</div><div class='ctx'> 			 (unsigned long __user *) data);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case PTRACE_ENABLE_TE:</div><div class='hunk'>@@ -811,7 +812,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case PTRACE_GET_LAST_BREAK:</div><div class='del'>-		put_user(task_thread_info(child)-&gt;last_break,</div><div class='add'>+		put_user(child-&gt;thread.last_break,</div><div class='ctx'> 			 (unsigned int __user *) data);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -963,6 +964,11 @@ static int s390_fpregs_set(struct task_struct *target,</div><div class='ctx'> 	if (target == current)</div><div class='ctx'> 		save_fpu_regs();</div><div class='ctx'> </div><div class='add'>+	if (MACHINE_HAS_VX)</div><div class='add'>+		convert_vx_to_fp(fprs, target-&gt;thread.fpu.vxrs);</div><div class='add'>+	else</div><div class='add'>+		memcpy(&amp;fprs, target-&gt;thread.fpu.fprs, sizeof(fprs));</div><div class='add'>+</div><div class='ctx'> 	/* If setting FPC, must validate it first. */</div><div class='ctx'> 	if (count &gt; 0 &amp;&amp; pos &lt; offsetof(s390_fp_regs, fprs)) {</div><div class='ctx'> 		u32 ufpc[2] = { target-&gt;thread.fpu.fpc, 0 };</div><div class='hunk'>@@ -997,10 +1003,10 @@ static int s390_last_break_get(struct task_struct *target,</div><div class='ctx'> 	if (count &gt; 0) {</div><div class='ctx'> 		if (kbuf) {</div><div class='ctx'> 			unsigned long *k = kbuf;</div><div class='del'>-			*k = task_thread_info(target)-&gt;last_break;</div><div class='add'>+			*k = target-&gt;thread.last_break;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			unsigned long  __user *u = ubuf;</div><div class='del'>-			if (__put_user(task_thread_info(target)-&gt;last_break, u))</div><div class='add'>+			if (__put_user(target-&gt;thread.last_break, u))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1067,6 +1073,9 @@ static int s390_vxrs_low_set(struct task_struct *target,</div><div class='ctx'> 	if (target == current)</div><div class='ctx'> 		save_fpu_regs();</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; __NUM_VXRS_LOW; i++)</div><div class='add'>+		vxrs[i] = *((__u64 *)(target-&gt;thread.fpu.vxrs + i) + 1);</div><div class='add'>+</div><div class='ctx'> 	rc = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, vxrs, 0, -1);</div><div class='ctx'> 	if (rc == 0)</div><div class='ctx'> 		for (i = 0; i &lt; __NUM_VXRS_LOW; i++)</div><div class='hunk'>@@ -1113,7 +1122,7 @@ static int s390_system_call_get(struct task_struct *target,</div><div class='ctx'> 				unsigned int pos, unsigned int count,</div><div class='ctx'> 				void *kbuf, void __user *ubuf)</div><div class='ctx'> {</div><div class='del'>-	unsigned int *data = &amp;task_thread_info(target)-&gt;system_call;</div><div class='add'>+	unsigned int *data = &amp;target-&gt;thread.system_call;</div><div class='ctx'> 	return user_regset_copyout(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='ctx'> 				   data, 0, sizeof(unsigned int));</div><div class='ctx'> }</div><div class='hunk'>@@ -1123,7 +1132,7 @@ static int s390_system_call_set(struct task_struct *target,</div><div class='ctx'> 				unsigned int pos, unsigned int count,</div><div class='ctx'> 				const void *kbuf, const void __user *ubuf)</div><div class='ctx'> {</div><div class='del'>-	unsigned int *data = &amp;task_thread_info(target)-&gt;system_call;</div><div class='add'>+	unsigned int *data = &amp;target-&gt;thread.system_call;</div><div class='ctx'> 	return user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='ctx'> 				  data, 0, sizeof(unsigned int));</div><div class='ctx'> }</div><div class='hunk'>@@ -1327,7 +1336,7 @@ static int s390_compat_last_break_get(struct task_struct *target,</div><div class='ctx'> 	compat_ulong_t last_break;</div><div class='ctx'> </div><div class='ctx'> 	if (count &gt; 0) {</div><div class='del'>-		last_break = task_thread_info(target)-&gt;last_break;</div><div class='add'>+		last_break = target-&gt;thread.last_break;</div><div class='ctx'> 		if (kbuf) {</div><div class='ctx'> 			unsigned long *k = kbuf;</div><div class='ctx'> 			*k = last_break;</div><div class='head'>diff --git a/arch/s390/kernel/runtime_instr.c b/arch/s390/kernel/runtime_instr.c<br/>index fffa0e5462af..429d3a782f1c 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/runtime_instr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/runtime_instr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/runtime_instr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/runtime_instr.c</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/runtime_instr.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_mf.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/sclp.c b/arch/s390/kernel/sclp.c<br/>deleted file mode 100644<br/>index f08af675f36f..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/sclp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/sclp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,196 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *    Copyright IBM Corp. 2015</div><div class='del'>- *    Author(s): Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;asm/ebcdic.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/lowcore.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/sclp.h&gt;</div><div class='del'>-</div><div class='del'>-#define EVTYP_VT220MSG_MASK	0x00000040</div><div class='del'>-#define EVTYP_MSG_MASK		0x40000000</div><div class='del'>-</div><div class='del'>-static char _sclp_work_area[4096] __aligned(PAGE_SIZE) __section(data);</div><div class='del'>-static bool have_vt220 __section(data);</div><div class='del'>-static bool have_linemode __section(data);</div><div class='del'>-</div><div class='del'>-static void _sclp_wait_int(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long cr0, cr0_new, psw_mask, addr;</div><div class='del'>-	psw_t psw_ext_save, psw_wait;</div><div class='del'>-</div><div class='del'>-	__ctl_store(cr0, 0, 0);</div><div class='del'>-	cr0_new = cr0 | 0x200;</div><div class='del'>-	__ctl_load(cr0_new, 0, 0);</div><div class='del'>-</div><div class='del'>-	psw_ext_save = S390_lowcore.external_new_psw;</div><div class='del'>-	psw_mask = __extract_psw();</div><div class='del'>-	S390_lowcore.external_new_psw.mask = psw_mask;</div><div class='del'>-	psw_wait.mask = psw_mask | PSW_MASK_EXT | PSW_MASK_WAIT;</div><div class='del'>-	S390_lowcore.ext_int_code = 0;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		asm volatile(</div><div class='del'>-			"	larl	%[addr],0f\n"</div><div class='del'>-			"	stg	%[addr],%[psw_wait_addr]\n"</div><div class='del'>-			"	stg	%[addr],%[psw_ext_addr]\n"</div><div class='del'>-			"	lpswe	%[psw_wait]\n"</div><div class='del'>-			"0:\n"</div><div class='del'>-			: [addr] "=&amp;d" (addr),</div><div class='del'>-			  [psw_wait_addr] "=Q" (psw_wait.addr),</div><div class='del'>-			  [psw_ext_addr] "=Q" (S390_lowcore.external_new_psw.addr)</div><div class='del'>-			: [psw_wait] "Q" (psw_wait)</div><div class='del'>-			: "cc", "memory");</div><div class='del'>-	} while (S390_lowcore.ext_int_code != EXT_IRQ_SERVICE_SIG);</div><div class='del'>-</div><div class='del'>-	__ctl_load(cr0, 0, 0);</div><div class='del'>-	S390_lowcore.external_new_psw = psw_ext_save;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int _sclp_servc(unsigned int cmd, char *sccb)</div><div class='del'>-{</div><div class='del'>-	unsigned int cc;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		asm volatile(</div><div class='del'>-			"	.insn	rre,0xb2200000,%1,%2\n"</div><div class='del'>-			"	ipm	%0\n"</div><div class='del'>-			: "=d" (cc) : "d" (cmd), "a" (sccb)</div><div class='del'>-			: "cc", "memory");</div><div class='del'>-		cc &gt;&gt;= 28;</div><div class='del'>-		if (cc == 3)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		_sclp_wait_int();</div><div class='del'>-	} while (cc != 0);</div><div class='del'>-	return (*(unsigned short *)(sccb + 6) == 0x20) ? 0 : -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int _sclp_setup(int disable)</div><div class='del'>-{</div><div class='del'>-	static unsigned char init_sccb[] = {</div><div class='del'>-		0x00, 0x1c,</div><div class='del'>-		0x00, 0x00, 0x00, 0x00,	0x00, 0x00, 0x00, 0x00,</div><div class='del'>-		0x00, 0x04,</div><div class='del'>-		0x80, 0x00, 0x00, 0x00,	0x40, 0x00, 0x00, 0x40,</div><div class='del'>-		0x00, 0x00, 0x00, 0x00,	0x00, 0x00, 0x00, 0x00</div><div class='del'>-	};</div><div class='del'>-	unsigned int *masks;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	memcpy(_sclp_work_area, init_sccb, 28);</div><div class='del'>-	masks = (unsigned int *)(_sclp_work_area + 12);</div><div class='del'>-	if (disable)</div><div class='del'>-		memset(masks, 0, 16);</div><div class='del'>-	/* SCLP write mask */</div><div class='del'>-	rc = _sclp_servc(0x00780005, _sclp_work_area);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-	have_vt220 = masks[2] &amp; EVTYP_VT220MSG_MASK;</div><div class='del'>-	have_linemode = masks[2] &amp; EVTYP_MSG_MASK;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Output multi-line text using SCLP Message interface. */</div><div class='del'>-static void _sclp_print_lm(const char *str)</div><div class='del'>-{</div><div class='del'>-	static unsigned char write_head[] = {</div><div class='del'>-		/* sccb header */</div><div class='del'>-		0x00, 0x52,					/* 0 */</div><div class='del'>-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00,		/* 2 */</div><div class='del'>-		/* evbuf */</div><div class='del'>-		0x00, 0x4a,					/* 8 */</div><div class='del'>-		0x02, 0x00, 0x00, 0x00,				/* 10 */</div><div class='del'>-		/* mdb */</div><div class='del'>-		0x00, 0x44,					/* 14 */</div><div class='del'>-		0x00, 0x01,					/* 16 */</div><div class='del'>-		0xd4, 0xc4, 0xc2, 0x40,				/* 18 */</div><div class='del'>-		0x00, 0x00, 0x00, 0x01,				/* 22 */</div><div class='del'>-		/* go */</div><div class='del'>-		0x00, 0x38,					/* 26 */</div><div class='del'>-		0x00, 0x01,					/* 28 */</div><div class='del'>-		0x00, 0x00, 0x00, 0x00,				/* 30 */</div><div class='del'>-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	/* 34 */</div><div class='del'>-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	/* 42 */</div><div class='del'>-		0x00, 0x00, 0x00, 0x00,				/* 50 */</div><div class='del'>-		0x00, 0x00,					/* 54 */</div><div class='del'>-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	/* 56 */</div><div class='del'>-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	/* 64 */</div><div class='del'>-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	/* 72 */</div><div class='del'>-		0x00, 0x00,					/* 80 */</div><div class='del'>-	};</div><div class='del'>-	static unsigned char write_mto[] = {</div><div class='del'>-		/* mto	*/</div><div class='del'>-		0x00, 0x0a,					/* 0 */</div><div class='del'>-		0x00, 0x04,					/* 2 */</div><div class='del'>-		0x10, 0x00,					/* 4 */</div><div class='del'>-		0x00, 0x00, 0x00, 0x00				/* 6 */</div><div class='del'>-	};</div><div class='del'>-	unsigned char *ptr, ch;</div><div class='del'>-	unsigned int count;</div><div class='del'>-</div><div class='del'>-	memcpy(_sclp_work_area, write_head, sizeof(write_head));</div><div class='del'>-	ptr = _sclp_work_area + sizeof(write_head);</div><div class='del'>-	do {</div><div class='del'>-		memcpy(ptr, write_mto, sizeof(write_mto));</div><div class='del'>-		for (count = sizeof(write_mto); (ch = *str++) != 0; count++) {</div><div class='del'>-			if (ch == 0x0a)</div><div class='del'>-				break;</div><div class='del'>-			ptr[count] = _ascebc[ch];</div><div class='del'>-		}</div><div class='del'>-		/* Update length fields in mto, mdb, evbuf and sccb */</div><div class='del'>-		*(unsigned short *) ptr = count;</div><div class='del'>-		*(unsigned short *)(_sclp_work_area + 14) += count;</div><div class='del'>-		*(unsigned short *)(_sclp_work_area + 8) += count;</div><div class='del'>-		*(unsigned short *)(_sclp_work_area + 0) += count;</div><div class='del'>-		ptr += count;</div><div class='del'>-	} while (ch != 0);</div><div class='del'>-</div><div class='del'>-	/* SCLP write data */</div><div class='del'>-	_sclp_servc(0x00760005, _sclp_work_area);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Output multi-line text (plus a newline) using SCLP VT220</div><div class='del'>- * interface.</div><div class='del'>- */</div><div class='del'>-static void _sclp_print_vt220(const char *str)</div><div class='del'>-{</div><div class='del'>-	static unsigned char const write_head[] = {</div><div class='del'>-		/* sccb header */</div><div class='del'>-		0x00, 0x0e,</div><div class='del'>-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='del'>-		/* evbuf header */</div><div class='del'>-		0x00, 0x06,</div><div class='del'>-		0x1a, 0x00, 0x00, 0x00,</div><div class='del'>-	};</div><div class='del'>-	size_t len = strlen(str);</div><div class='del'>-</div><div class='del'>-	if (sizeof(write_head) + len &gt;= sizeof(_sclp_work_area))</div><div class='del'>-		len = sizeof(_sclp_work_area) - sizeof(write_head) - 1;</div><div class='del'>-</div><div class='del'>-	memcpy(_sclp_work_area, write_head, sizeof(write_head));</div><div class='del'>-	memcpy(_sclp_work_area + sizeof(write_head), str, len);</div><div class='del'>-	_sclp_work_area[sizeof(write_head) + len] = '\n';</div><div class='del'>-</div><div class='del'>-	/* Update length fields in evbuf and sccb headers */</div><div class='del'>-	*(unsigned short *)(_sclp_work_area + 8) += len + 1;</div><div class='del'>-	*(unsigned short *)(_sclp_work_area + 0) += len + 1;</div><div class='del'>-</div><div class='del'>-	/* SCLP write data */</div><div class='del'>-	(void)_sclp_servc(0x00760005, _sclp_work_area);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Output one or more lines of text on the SCLP console (VT220 and /</div><div class='del'>- * or line-mode). All lines get terminated; no need for a trailing LF.</div><div class='del'>- */</div><div class='del'>-void _sclp_print_early(const char *str)</div><div class='del'>-{</div><div class='del'>-	if (_sclp_setup(0) != 0)</div><div class='del'>-		return;</div><div class='del'>-	if (have_linemode)</div><div class='del'>-		_sclp_print_lm(str);</div><div class='del'>-	if (have_vt220)</div><div class='del'>-		_sclp_print_vt220(str);</div><div class='del'>-	_sclp_setup(1);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c<br/>index 7f7ba5f23f13..911dc0b49be0 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/setup.c</a></div><div class='hunk'>@@ -18,6 +18,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -35,6 +37,7 @@</div><div class='ctx'> #include &lt;linux/root_dev.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='add'>+#include &lt;linux/dma-contiguous.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/pfn.h&gt;</div><div class='hunk'>@@ -303,7 +306,7 @@ static void __init setup_lowcore(void)</div><div class='ctx'> 	 * Setup lowcore for boot cpu</div><div class='ctx'> 	 */</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct lowcore) != LC_PAGES * 4096);</div><div class='del'>-	lc = __alloc_bootmem_low(LC_PAGES * PAGE_SIZE, LC_PAGES * PAGE_SIZE, 0);</div><div class='add'>+	lc = memblock_virt_alloc_low(sizeof(*lc), sizeof(*lc));</div><div class='ctx'> 	lc-&gt;restart_psw.mask = PSW_KERNEL_BITS;</div><div class='ctx'> 	lc-&gt;restart_psw.addr = (unsigned long) restart_int_handler;</div><div class='ctx'> 	lc-&gt;external_new_psw.mask = PSW_KERNEL_BITS |</div><div class='hunk'>@@ -324,15 +327,15 @@ static void __init setup_lowcore(void)</div><div class='ctx'> 	lc-&gt;kernel_stack = ((unsigned long) &amp;init_thread_union)</div><div class='ctx'> 		+ THREAD_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs);</div><div class='ctx'> 	lc-&gt;async_stack = (unsigned long)</div><div class='del'>-		__alloc_bootmem(ASYNC_SIZE, ASYNC_SIZE, 0)</div><div class='add'>+		memblock_virt_alloc(ASYNC_SIZE, ASYNC_SIZE)</div><div class='ctx'> 		+ ASYNC_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs);</div><div class='ctx'> 	lc-&gt;panic_stack = (unsigned long)</div><div class='del'>-		__alloc_bootmem(PAGE_SIZE, PAGE_SIZE, 0)</div><div class='add'>+		memblock_virt_alloc(PAGE_SIZE, PAGE_SIZE)</div><div class='ctx'> 		+ PAGE_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs);</div><div class='del'>-	lc-&gt;current_task = (unsigned long) init_thread_union.thread_info.task;</div><div class='del'>-	lc-&gt;thread_info = (unsigned long) &amp;init_thread_union;</div><div class='add'>+	lc-&gt;current_task = (unsigned long)&amp;init_task;</div><div class='ctx'> 	lc-&gt;lpp = LPP_MAGIC;</div><div class='ctx'> 	lc-&gt;machine_flags = S390_lowcore.machine_flags;</div><div class='add'>+	lc-&gt;preempt_count = S390_lowcore.preempt_count;</div><div class='ctx'> 	lc-&gt;stfl_fac_list = S390_lowcore.stfl_fac_list;</div><div class='ctx'> 	memcpy(lc-&gt;stfle_fac_list, S390_lowcore.stfle_fac_list,</div><div class='ctx'> 	       MAX_FACILITY_BIT/8);</div><div class='hunk'>@@ -349,7 +352,7 @@ static void __init setup_lowcore(void)</div><div class='ctx'> 	lc-&gt;last_update_timer = S390_lowcore.last_update_timer;</div><div class='ctx'> 	lc-&gt;last_update_clock = S390_lowcore.last_update_clock;</div><div class='ctx'> </div><div class='del'>-	restart_stack = __alloc_bootmem(ASYNC_SIZE, ASYNC_SIZE, 0);</div><div class='add'>+	restart_stack = memblock_virt_alloc(ASYNC_SIZE, ASYNC_SIZE);</div><div class='ctx'> 	restart_stack += ASYNC_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -412,7 +415,7 @@ static void __init setup_resources(void)</div><div class='ctx'> 	bss_resource.end = (unsigned long) &amp;__bss_stop - 1;</div><div class='ctx'> </div><div class='ctx'> 	for_each_memblock(memory, reg) {</div><div class='del'>-		res = alloc_bootmem_low(sizeof(*res));</div><div class='add'>+		res = memblock_virt_alloc(sizeof(*res), 8);</div><div class='ctx'> 		res-&gt;flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM;</div><div class='ctx'> </div><div class='ctx'> 		res-&gt;name = "System RAM";</div><div class='hunk'>@@ -426,7 +429,7 @@ static void __init setup_resources(void)</div><div class='ctx'> 			    std_res-&gt;start &gt; res-&gt;end)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (std_res-&gt;end &gt; res-&gt;end) {</div><div class='del'>-				sub_res = alloc_bootmem_low(sizeof(*sub_res));</div><div class='add'>+				sub_res = memblock_virt_alloc(sizeof(*sub_res), 8);</div><div class='ctx'> 				*sub_res = *std_res;</div><div class='ctx'> 				sub_res-&gt;end = res-&gt;end;</div><div class='ctx'> 				std_res-&gt;start = res-&gt;end + 1;</div><div class='hunk'>@@ -445,7 +448,7 @@ static void __init setup_resources(void)</div><div class='ctx'> 	 * part of the System RAM resource.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (crashk_res.end) {</div><div class='del'>-		memblock_add(crashk_res.start, resource_size(&amp;crashk_res));</div><div class='add'>+		memblock_add_node(crashk_res.start, resource_size(&amp;crashk_res), 0);</div><div class='ctx'> 		memblock_reserve(crashk_res.start, resource_size(&amp;crashk_res));</div><div class='ctx'> 		insert_resource(&amp;iomem_resource, &amp;crashk_res);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -484,7 +487,7 @@ static void __init setup_memory_end(void)</div><div class='ctx'> 	max_pfn = max_low_pfn = PFN_DOWN(memory_end);</div><div class='ctx'> 	memblock_remove(memory_end, ULONG_MAX);</div><div class='ctx'> </div><div class='del'>-	pr_notice("Max memory size: %luMB\n", memory_end &gt;&gt; 20);</div><div class='add'>+	pr_notice("The maximum memory size is %luMB\n", memory_end &gt;&gt; 20);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init setup_vmcoreinfo(void)</div><div class='hunk'>@@ -635,6 +638,8 @@ static void __init reserve_crashkernel(void)</div><div class='ctx'> static void __init reserve_initrd(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='add'>+	if (!INITRD_START || !INITRD_SIZE)</div><div class='add'>+		return;</div><div class='ctx'> 	initrd_start = INITRD_START;</div><div class='ctx'> 	initrd_end = initrd_start + INITRD_SIZE;</div><div class='ctx'> 	memblock_reserve(INITRD_START, INITRD_SIZE);</div><div class='hunk'>@@ -649,7 +654,7 @@ static void __init check_initrd(void)</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='ctx'> 	if (INITRD_START &amp;&amp; INITRD_SIZE &amp;&amp;</div><div class='ctx'> 	    !memblock_is_region_memory(INITRD_START, INITRD_SIZE)) {</div><div class='del'>-		pr_err("initrd does not fit memory.\n");</div><div class='add'>+		pr_err("The initial RAM disk does not fit into the memory\n");</div><div class='ctx'> 		memblock_free(INITRD_START, INITRD_SIZE);</div><div class='ctx'> 		initrd_start = initrd_end = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -746,7 +751,7 @@ static int __init setup_hwcaps(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Huge page support HWCAP_S390_HPAGE is bit 7.</div><div class='ctx'> 	 */</div><div class='del'>-	if (MACHINE_HAS_HPAGE)</div><div class='add'>+	if (MACHINE_HAS_EDAT1)</div><div class='ctx'> 		elf_hwcap |= HWCAP_S390_HPAGE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -766,8 +771,14 @@ static int __init setup_hwcaps(void)</div><div class='ctx'> 	 * can be disabled with the "novx" parameter. Use MACHINE_HAS_VX</div><div class='ctx'> 	 * instead of facility bit 129.</div><div class='ctx'> 	 */</div><div class='del'>-	if (MACHINE_HAS_VX)</div><div class='add'>+	if (MACHINE_HAS_VX) {</div><div class='ctx'> 		elf_hwcap |= HWCAP_S390_VXRS;</div><div class='add'>+		if (test_facility(134))</div><div class='add'>+			elf_hwcap |= HWCAP_S390_VXRS_EXT;</div><div class='add'>+		if (test_facility(135))</div><div class='add'>+			elf_hwcap |= HWCAP_S390_VXRS_BCD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	get_cpu_id(&amp;cpu_id);</div><div class='ctx'> 	add_device_randomness(&amp;cpu_id, sizeof(cpu_id));</div><div class='ctx'> 	switch (cpu_id.machine) {</div><div class='hunk'>@@ -819,10 +830,10 @@ static void __init setup_randomness(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct sysinfo_3_2_2 *vmms;</div><div class='ctx'> </div><div class='del'>-	vmms = (struct sysinfo_3_2_2 *) alloc_page(GFP_KERNEL);</div><div class='del'>-	if (vmms &amp;&amp; stsi(vmms, 3, 2, 2) == 0 &amp;&amp; vmms-&gt;count)</div><div class='del'>-		add_device_randomness(&amp;vmms, vmms-&gt;count);</div><div class='del'>-	free_page((unsigned long) vmms);</div><div class='add'>+	vmms = (struct sysinfo_3_2_2 *) memblock_alloc(PAGE_SIZE, PAGE_SIZE);</div><div class='add'>+	if (stsi(vmms, 3, 2, 2) == 0 &amp;&amp; vmms-&gt;count)</div><div class='add'>+		add_device_randomness(&amp;vmms-&gt;vm, sizeof(vmms-&gt;vm[0]) * vmms-&gt;count);</div><div class='add'>+	memblock_free((unsigned long) vmms, PAGE_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -903,6 +914,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> </div><div class='ctx'> 	setup_memory_end();</div><div class='ctx'> 	setup_memory();</div><div class='add'>+	dma_contiguous_reserve(memory_end);</div><div class='ctx'> </div><div class='ctx'> 	check_initrd();</div><div class='ctx'> 	reserve_crashkernel();</div><div class='hunk'>@@ -921,6 +933,8 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	cpu_detect_mhz_feature();</div><div class='ctx'>         cpu_init();</div><div class='ctx'> 	numa_setup();</div><div class='add'>+	smp_detect_cpus();</div><div class='add'>+	topology_init_early();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create kernel page tables and switch to virtual addressing.</div><div class='head'>diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c<br/>index d82562cf0a0e..289dd50f9744 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/signal.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -26,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='hunk'>@@ -359,7 +360,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,</div><div class='ctx'> 		/* set extra registers only for synchronous signals */</div><div class='ctx'> 		regs-&gt;gprs[4] = regs-&gt;int_code &amp; 127;</div><div class='ctx'> 		regs-&gt;gprs[5] = regs-&gt;int_parm_long;</div><div class='del'>-		regs-&gt;gprs[6] = task_thread_info(current)-&gt;last_break;</div><div class='add'>+		regs-&gt;gprs[6] = current-&gt;thread.last_break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -430,7 +431,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,</div><div class='ctx'> 	regs-&gt;gprs[2] = ksig-&gt;sig;</div><div class='ctx'> 	regs-&gt;gprs[3] = (unsigned long) &amp;frame-&gt;info;</div><div class='ctx'> 	regs-&gt;gprs[4] = (unsigned long) &amp;frame-&gt;uc;</div><div class='del'>-	regs-&gt;gprs[5] = task_thread_info(current)-&gt;last_break;</div><div class='add'>+	regs-&gt;gprs[5] = current-&gt;thread.last_break;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -467,13 +468,13 @@ void do_signal(struct pt_regs *regs)</div><div class='ctx'> 	 * the debugger may change all our registers, including the system</div><div class='ctx'> 	 * call information.</div><div class='ctx'> 	 */</div><div class='del'>-	current_thread_info()-&gt;system_call =</div><div class='add'>+	current-&gt;thread.system_call =</div><div class='ctx'> 		test_pt_regs_flag(regs, PIF_SYSCALL) ? regs-&gt;int_code : 0;</div><div class='ctx'> </div><div class='ctx'> 	if (get_signal(&amp;ksig)) {</div><div class='ctx'> 		/* Whee!  Actually deliver the signal.  */</div><div class='del'>-		if (current_thread_info()-&gt;system_call) {</div><div class='del'>-			regs-&gt;int_code = current_thread_info()-&gt;system_call;</div><div class='add'>+		if (current-&gt;thread.system_call) {</div><div class='add'>+			regs-&gt;int_code = current-&gt;thread.system_call;</div><div class='ctx'> 			/* Check for system call restarting. */</div><div class='ctx'> 			switch (regs-&gt;gprs[2]) {</div><div class='ctx'> 			case -ERESTART_RESTARTBLOCK:</div><div class='hunk'>@@ -506,8 +507,8 @@ void do_signal(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	/* No handlers present - check for system call restart */</div><div class='ctx'> 	clear_pt_regs_flag(regs, PIF_SYSCALL);</div><div class='del'>-	if (current_thread_info()-&gt;system_call) {</div><div class='del'>-		regs-&gt;int_code = current_thread_info()-&gt;system_call;</div><div class='add'>+	if (current-&gt;thread.system_call) {</div><div class='add'>+		regs-&gt;int_code = current-&gt;thread.system_call;</div><div class='ctx'> 		switch (regs-&gt;gprs[2]) {</div><div class='ctx'> 		case -ERESTART_RESTARTBLOCK:</div><div class='ctx'> 			/* Restart with sys_restart_syscall */</div><div class='head'>diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c<br/>index 35531fe1c5ea..47a973b5b4f1 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/smp.c</a></div><div class='hunk'>@@ -19,7 +19,8 @@</div><div class='ctx'> #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -30,6 +31,8 @@</div><div class='ctx'> #include &lt;linux/irqflags.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -259,16 +262,14 @@ static void pcpu_prepare_secondary(struct pcpu *pcpu, int cpu)</div><div class='ctx'> static void pcpu_attach_task(struct pcpu *pcpu, struct task_struct *tsk)</div><div class='ctx'> {</div><div class='ctx'> 	struct lowcore *lc = pcpu-&gt;lowcore;</div><div class='del'>-	struct thread_info *ti = task_thread_info(tsk);</div><div class='ctx'> </div><div class='ctx'> 	lc-&gt;kernel_stack = (unsigned long) task_stack_page(tsk)</div><div class='ctx'> 		+ THREAD_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs);</div><div class='del'>-	lc-&gt;thread_info = (unsigned long) task_thread_info(tsk);</div><div class='ctx'> 	lc-&gt;current_task = (unsigned long) tsk;</div><div class='ctx'> 	lc-&gt;lpp = LPP_MAGIC;</div><div class='ctx'> 	lc-&gt;current_pid = tsk-&gt;pid;</div><div class='del'>-	lc-&gt;user_timer = ti-&gt;user_timer;</div><div class='del'>-	lc-&gt;system_timer = ti-&gt;system_timer;</div><div class='add'>+	lc-&gt;user_timer = tsk-&gt;thread.user_timer;</div><div class='add'>+	lc-&gt;system_timer = tsk-&gt;thread.system_timer;</div><div class='ctx'> 	lc-&gt;steal_timer = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -368,10 +369,15 @@ int smp_find_processor_id(u16 address)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int smp_vcpu_scheduled(int cpu)</div><div class='add'>+bool arch_vcpu_is_preempted(int cpu)</div><div class='ctx'> {</div><div class='del'>-	return pcpu_running(pcpu_devices + cpu);</div><div class='add'>+	if (test_cpu_flag_of(CIF_ENABLED_WAIT, cpu))</div><div class='add'>+		return false;</div><div class='add'>+	if (pcpu_running(pcpu_devices + cpu))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(arch_vcpu_is_preempted);</div><div class='ctx'> </div><div class='ctx'> void smp_yield_cpu(int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -657,14 +663,12 @@ int smp_cpu_get_polarization(int cpu)</div><div class='ctx'> 	return pcpu_devices[cpu].polarization;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sclp_core_info *smp_get_core_info(void)</div><div class='add'>+static void __ref smp_get_core_info(struct sclp_core_info *info, int early)</div><div class='ctx'> {</div><div class='ctx'> 	static int use_sigp_detection;</div><div class='del'>-	struct sclp_core_info *info;</div><div class='ctx'> 	int address;</div><div class='ctx'> </div><div class='del'>-	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='del'>-	if (info &amp;&amp; (use_sigp_detection || sclp_get_core_info(info))) {</div><div class='add'>+	if (use_sigp_detection || sclp_get_core_info(info, early)) {</div><div class='ctx'> 		use_sigp_detection = 1;</div><div class='ctx'> 		for (address = 0;</div><div class='ctx'> 		     address &lt; (SCLP_MAX_CORES &lt;&lt; smp_cpu_mt_shift);</div><div class='hunk'>@@ -678,7 +682,6 @@ static struct sclp_core_info *smp_get_core_info(void)</div><div class='ctx'> 		}</div><div class='ctx'> 		info-&gt;combined = info-&gt;configured;</div><div class='ctx'> 	}</div><div class='del'>-	return info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int smp_add_present_cpu(int cpu);</div><div class='hunk'>@@ -719,17 +722,15 @@ static int __smp_rescan_cpus(struct sclp_core_info *info, int sysfs_add)</div><div class='ctx'> 	return nr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init smp_detect_cpus(void)</div><div class='add'>+void __init smp_detect_cpus(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu, mtid, c_cpus, s_cpus;</div><div class='ctx'> 	struct sclp_core_info *info;</div><div class='ctx'> 	u16 address;</div><div class='ctx'> </div><div class='ctx'> 	/* Get CPU information */</div><div class='del'>-	info = smp_get_core_info();</div><div class='del'>-	if (!info)</div><div class='del'>-		panic("smp_detect_cpus failed to allocate memory\n");</div><div class='del'>-</div><div class='add'>+	info = memblock_virt_alloc(sizeof(*info), 8);</div><div class='add'>+	smp_get_core_info(info, 1);</div><div class='ctx'> 	/* Find boot CPU type */</div><div class='ctx'> 	if (sclp.has_core_type) {</div><div class='ctx'> 		address = stap();</div><div class='hunk'>@@ -765,7 +766,7 @@ static void __init smp_detect_cpus(void)</div><div class='ctx'> 	get_online_cpus();</div><div class='ctx'> 	__smp_rescan_cpus(info, 0);</div><div class='ctx'> 	put_online_cpus();</div><div class='del'>-	kfree(info);</div><div class='add'>+	memblock_free_early((unsigned long)info, sizeof(*info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -802,7 +803,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle)</div><div class='ctx'> 	pcpu = pcpu_devices + cpu;</div><div class='ctx'> 	if (pcpu-&gt;state != CPU_STATE_CONFIGURED)</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	base = cpu - (cpu % (smp_cpu_mtid + 1));</div><div class='add'>+	base = smp_get_base_cpu(cpu);</div><div class='ctx'> 	for (i = 0; i &lt;= smp_cpu_mtid; i++) {</div><div class='ctx'> 		if (base + i &lt; nr_cpu_ids)</div><div class='ctx'> 			if (cpu_online(base + i))</div><div class='hunk'>@@ -902,7 +903,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	/* request the 0x1202 external call external interrupt */</div><div class='ctx'> 	if (register_external_irq(EXT_IRQ_EXTERNAL_CALL, do_ext_call_interrupt))</div><div class='ctx'> 		panic("Couldn't request external interrupt 0x1202");</div><div class='del'>-	smp_detect_cpus();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init smp_prepare_boot_cpu(void)</div><div class='hunk'>@@ -968,7 +968,7 @@ static ssize_t cpu_configure_store(struct device *dev,</div><div class='ctx'> 	rc = -EBUSY;</div><div class='ctx'> 	/* disallow configuration changes of online cpus and cpu 0 */</div><div class='ctx'> 	cpu = dev-&gt;id;</div><div class='del'>-	cpu -= cpu % (smp_cpu_mtid + 1);</div><div class='add'>+	cpu = smp_get_base_cpu(cpu);</div><div class='ctx'> 	if (cpu == 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	for (i = 0; i &lt;= smp_cpu_mtid; i++)</div><div class='hunk'>@@ -1047,22 +1047,18 @@ static struct attribute_group cpu_online_attr_group = {</div><div class='ctx'> 	.attrs = cpu_online_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int smp_cpu_notify(struct notifier_block *self, unsigned long action,</div><div class='del'>-			  void *hcpu)</div><div class='add'>+static int smp_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = (unsigned int)(long)hcpu;</div><div class='ctx'> 	struct device *s = &amp;per_cpu(cpu_device, cpu)-&gt;dev;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='del'>-	switch (action &amp; ~CPU_TASKS_FROZEN) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-		err = sysfs_create_group(&amp;s-&gt;kobj, &amp;cpu_online_attr_group);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-		sysfs_remove_group(&amp;s-&gt;kobj, &amp;cpu_online_attr_group);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return notifier_from_errno(err);</div><div class='add'>+	return sysfs_create_group(&amp;s-&gt;kobj, &amp;cpu_online_attr_group);</div><div class='add'>+}</div><div class='add'>+static int smp_cpu_pre_down(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct device *s = &amp;per_cpu(cpu_device, cpu)-&gt;dev;</div><div class='add'>+</div><div class='add'>+	sysfs_remove_group(&amp;s-&gt;kobj, &amp;cpu_online_attr_group);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int smp_add_present_cpu(int cpu)</div><div class='hunk'>@@ -1083,20 +1079,12 @@ static int smp_add_present_cpu(int cpu)</div><div class='ctx'> 	rc = sysfs_create_group(&amp;s-&gt;kobj, &amp;cpu_common_attr_group);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_cpu;</div><div class='del'>-	if (cpu_online(cpu)) {</div><div class='del'>-		rc = sysfs_create_group(&amp;s-&gt;kobj, &amp;cpu_online_attr_group);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto out_online;</div><div class='del'>-	}</div><div class='ctx'> 	rc = topology_cpu_init(c);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_topology;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_topology:</div><div class='del'>-	if (cpu_online(cpu))</div><div class='del'>-		sysfs_remove_group(&amp;s-&gt;kobj, &amp;cpu_online_attr_group);</div><div class='del'>-out_online:</div><div class='ctx'> 	sysfs_remove_group(&amp;s-&gt;kobj, &amp;cpu_common_attr_group);</div><div class='ctx'> out_cpu:</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='hunk'>@@ -1113,9 +1101,10 @@ int __ref smp_rescan_cpus(void)</div><div class='ctx'> 	struct sclp_core_info *info;</div><div class='ctx'> 	int nr;</div><div class='ctx'> </div><div class='del'>-	info = smp_get_core_info();</div><div class='add'>+	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='ctx'> 	if (!info)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	smp_get_core_info(info, 0);</div><div class='ctx'> 	get_online_cpus();</div><div class='ctx'> 	mutex_lock(&amp;smp_cpu_state_mutex);</div><div class='ctx'> 	nr = __smp_rescan_cpus(info, 1);</div><div class='hunk'>@@ -1149,17 +1138,15 @@ static int __init s390_smp_init(void)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> #endif</div><div class='del'>-	cpu_notifier_register_begin();</div><div class='ctx'> 	for_each_present_cpu(cpu) {</div><div class='ctx'> 		rc = smp_add_present_cpu(cpu);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__hotcpu_notifier(smp_cpu_notify, 0);</div><div class='del'>-</div><div class='add'>+	rc = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "s390/smp:online",</div><div class='add'>+			       smp_cpu_online, smp_cpu_pre_down);</div><div class='ctx'> out:</div><div class='del'>-	cpu_notifier_register_done();</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> subsys_initcall(s390_smp_init);</div><div class='head'>diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c<br/>index 355db9db8210..e66687dc6144 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/stacktrace.c</a></div><div class='hunk'>@@ -6,9 +6,10 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int __save_address(void *data, unsigned long address, int nosched)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/s390/kernel/swsusp.S b/arch/s390/kernel/swsusp.S<br/>index 2d6b6e81f812..6bebc935e9c2 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/swsusp.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/swsusp.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/swsusp.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/swsusp.S</a></div><div class='hunk'>@@ -194,9 +194,9 @@ pgm_check_entry:</div><div class='ctx'> </div><div class='ctx'> 	/* Suspend CPU not available -&gt; panic */</div><div class='ctx'> 	larl	%r15,init_thread_union</div><div class='del'>-	ahi	%r15,1&lt;&lt;(PAGE_SHIFT+THREAD_ORDER)</div><div class='add'>+	ahi	%r15,1&lt;&lt;(PAGE_SHIFT+THREAD_SIZE_ORDER)</div><div class='ctx'> 	larl	%r2,.Lpanic_string</div><div class='del'>-	larl	%r3,_sclp_print_early</div><div class='add'>+	larl	%r3,sclp_early_printk</div><div class='ctx'> 	lghi	%r1,0</div><div class='ctx'> 	sam31</div><div class='ctx'> 	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE</div><div class='hunk'>@@ -273,7 +273,7 @@ restore_registers:</div><div class='ctx'> .Ldisabled_wait_31:</div><div class='ctx'> 	.long  0x000a0000,0x00000000</div><div class='ctx'> .Lpanic_string:</div><div class='del'>-	.asciz	"Resume not possible because suspend CPU is no longer available"</div><div class='add'>+	.asciz	"Resume not possible because suspend CPU is no longer available\n"</div><div class='ctx'> 	.align	8</div><div class='ctx'> .Lrestart_diag308_psw:</div><div class='ctx'> 	.long	0x00080000,0x80000000</div><div class='head'>diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c<br/>index f145490cce54..b7af452978ca 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/sys_s390.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/sys_s390.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/sys_s390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/sys_s390.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='ctx'> #include &lt;linux/ipc.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c<br/>index bfda6aa40280..12b6b138e354 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/sysinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/sysinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/sysinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/sysinfo.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/ebcdic.h&gt;</div><div class='ctx'> #include &lt;asm/sysinfo.h&gt;</div><div class='hunk'>@@ -56,6 +56,20 @@ int stsi(void *sysinfo, int fc, int sel1, int sel2)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(stsi);</div><div class='ctx'> </div><div class='add'>+static bool convert_ext_name(unsigned char encoding, char *name, size_t len)</div><div class='add'>+{</div><div class='add'>+	switch (encoding) {</div><div class='add'>+	case 1: /* EBCDIC */</div><div class='add'>+		EBCASC(name, len);</div><div class='add'>+		break;</div><div class='add'>+	case 2:	/* UTF-8 */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void stsi_1_1_1(struct seq_file *m, struct sysinfo_1_1_1 *info)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -207,24 +221,19 @@ static void stsi_2_2_2(struct seq_file *m, struct sysinfo_2_2_2 *info)</div><div class='ctx'> 		seq_printf(m, "LPAR CPUs S-MTID:     %d\n", info-&gt;mt_stid);</div><div class='ctx'> 		seq_printf(m, "LPAR CPUs PS-MTID:    %d\n", info-&gt;mt_psmtid);</div><div class='ctx'> 	}</div><div class='add'>+	if (convert_ext_name(info-&gt;vsne, info-&gt;ext_name, sizeof(info-&gt;ext_name))) {</div><div class='add'>+		seq_printf(m, "LPAR Extended Name:   %-.256s\n", info-&gt;ext_name);</div><div class='add'>+		seq_printf(m, "LPAR UUID:            %pUb\n", &amp;info-&gt;uuid);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void print_ext_name(struct seq_file *m, int lvl,</div><div class='ctx'> 			   struct sysinfo_3_2_2 *info)</div><div class='ctx'> {</div><div class='del'>-	if (info-&gt;vm[lvl].ext_name_encoding == 0)</div><div class='del'>-		return;</div><div class='del'>-	if (info-&gt;ext_names[lvl][0] == 0)</div><div class='del'>-		return;</div><div class='del'>-	switch (info-&gt;vm[lvl].ext_name_encoding) {</div><div class='del'>-	case 1: /* EBCDIC */</div><div class='del'>-		EBCASC(info-&gt;ext_names[lvl], sizeof(info-&gt;ext_names[lvl]));</div><div class='del'>-		break;</div><div class='del'>-	case 2:	/* UTF-8 */</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='add'>+	size_t len = sizeof(info-&gt;ext_names[lvl]);</div><div class='add'>+</div><div class='add'>+	if (!convert_ext_name(info-&gt;vm[lvl].evmne, info-&gt;ext_names[lvl], len))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> 	seq_printf(m, "VM%02d Extended Name:   %-.256s\n", lvl,</div><div class='ctx'> 		   info-&gt;ext_names[lvl]);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c<br/>index 0bfcc492987e..c31da46bc037 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/time.c</a></div><div class='hunk'>@@ -16,8 +16,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -38,7 +39,7 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/facility.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='hunk'>@@ -59,19 +60,27 @@ ATOMIC_NOTIFIER_HEAD(s390_epoch_delta_notifier);</div><div class='ctx'> EXPORT_SYMBOL(s390_epoch_delta_notifier);</div><div class='ctx'> </div><div class='ctx'> unsigned char ptff_function_mask[16];</div><div class='del'>-unsigned long lpar_offset;</div><div class='del'>-unsigned long initial_leap_seconds;</div><div class='add'>+</div><div class='add'>+static unsigned long long lpar_offset;</div><div class='add'>+static unsigned long long initial_leap_seconds;</div><div class='add'>+static unsigned long long tod_steering_end;</div><div class='add'>+static long long tod_steering_delta;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Get time offsets with PTFF</div><div class='ctx'>  */</div><div class='del'>-void __init ptff_init(void)</div><div class='add'>+void __init time_early_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct ptff_qto qto;</div><div class='ctx'> 	struct ptff_qui qui;</div><div class='ctx'> </div><div class='add'>+	/* Initialize TOD steering parameters */</div><div class='add'>+	tod_steering_end = sched_clock_base_cc;</div><div class='add'>+	vdso_data-&gt;ts_end = tod_steering_end;</div><div class='add'>+</div><div class='ctx'> 	if (!test_facility(28))</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='ctx'> 	ptff(&amp;ptff_function_mask, sizeof(ptff_function_mask), PTFF_QAF);</div><div class='ctx'> </div><div class='ctx'> 	/* get LPAR offset */</div><div class='hunk'>@@ -80,7 +89,7 @@ void __init ptff_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* get initial leap seconds */</div><div class='ctx'> 	if (ptff_query(PTFF_QUI) &amp;&amp; ptff(&amp;qui, sizeof(qui), PTFF_QUI) == 0)</div><div class='del'>-		initial_leap_seconds = (unsigned long)</div><div class='add'>+		initial_leap_seconds = (unsigned long long)</div><div class='ctx'> 			((long) qui.old_leap * 4096000000L);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +111,7 @@ unsigned long long monotonic_clock(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(monotonic_clock);</div><div class='ctx'> </div><div class='del'>-void tod_to_timeval(__u64 todval, struct timespec64 *xt)</div><div class='add'>+static void tod_to_timeval(__u64 todval, struct timespec64 *xt)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long long sec;</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +121,6 @@ void tod_to_timeval(__u64 todval, struct timespec64 *xt)</div><div class='ctx'> 	todval -= (sec * 1000000) &lt;&lt; 12;</div><div class='ctx'> 	xt-&gt;tv_nsec = ((todval * 1000) &gt;&gt; 12);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(tod_to_timeval);</div><div class='ctx'> </div><div class='ctx'> void clock_comparator_work(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -123,18 +131,6 @@ void clock_comparator_work(void)</div><div class='ctx'> 	cd-&gt;event_handler(cd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Fixup the clock comparator.</div><div class='del'>- */</div><div class='del'>-static void fixup_clock_comparator(unsigned long long delta)</div><div class='del'>-{</div><div class='del'>-	/* If nobody is waiting there's nothing to fix. */</div><div class='del'>-	if (S390_lowcore.clock_comparator == -1ULL)</div><div class='del'>-		return;</div><div class='del'>-	S390_lowcore.clock_comparator += delta;</div><div class='del'>-	set_clock_comparator(S390_lowcore.clock_comparator);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int s390_next_event(unsigned long delta,</div><div class='ctx'> 			   struct clock_event_device *evt)</div><div class='ctx'> {</div><div class='hunk'>@@ -213,9 +209,23 @@ void read_boot_clock64(struct timespec64 *ts)</div><div class='ctx'> 	tod_to_timeval(clock - TOD_UNIX_EPOCH, ts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t read_tod_clock(struct clocksource *cs)</div><div class='add'>+static u64 read_tod_clock(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return get_tod_clock();</div><div class='add'>+	unsigned long long now, adj;</div><div class='add'>+</div><div class='add'>+	preempt_disable(); /* protect from changes to steering parameters */</div><div class='add'>+	now = get_tod_clock();</div><div class='add'>+	adj = tod_steering_end - now;</div><div class='add'>+	if (unlikely((s64) adj &gt;= 0))</div><div class='add'>+		/*</div><div class='add'>+		 * manually steer by 1 cycle every 2^16 cycles. This</div><div class='add'>+		 * corresponds to shifting the tod delta by 15. 1s is</div><div class='add'>+		 * therefore steered in ~9h. The adjust will decrease</div><div class='add'>+		 * over time, until it finally reaches 0.</div><div class='add'>+		 */</div><div class='add'>+		now += (tod_steering_delta &lt; 0) ? (adj &gt;&gt; 15) : -(adj &gt;&gt; 15);</div><div class='add'>+	preempt_enable();</div><div class='add'>+	return now;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource clocksource_tod = {</div><div class='hunk'>@@ -384,6 +394,55 @@ static inline int check_sync_clock(void)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Apply clock delta to the global data structures.</div><div class='add'>+ * This is called once on the CPU that performed the clock sync.</div><div class='add'>+ */</div><div class='add'>+static void clock_sync_global(unsigned long long delta)</div><div class='add'>+{</div><div class='add'>+	unsigned long now, adj;</div><div class='add'>+	struct ptff_qto qto;</div><div class='add'>+</div><div class='add'>+	/* Fixup the monotonic sched clock. */</div><div class='add'>+	sched_clock_base_cc += delta;</div><div class='add'>+	/* Adjust TOD steering parameters. */</div><div class='add'>+	vdso_data-&gt;tb_update_count++;</div><div class='add'>+	now = get_tod_clock();</div><div class='add'>+	adj = tod_steering_end - now;</div><div class='add'>+	if (unlikely((s64) adj &gt;= 0))</div><div class='add'>+		/* Calculate how much of the old adjustment is left. */</div><div class='add'>+		tod_steering_delta = (tod_steering_delta &lt; 0) ?</div><div class='add'>+			-(adj &gt;&gt; 15) : (adj &gt;&gt; 15);</div><div class='add'>+	tod_steering_delta += delta;</div><div class='add'>+	if ((abs(tod_steering_delta) &gt;&gt; 48) != 0)</div><div class='add'>+		panic("TOD clock sync offset %lli is too large to drift\n",</div><div class='add'>+		      tod_steering_delta);</div><div class='add'>+	tod_steering_end = now + (abs(tod_steering_delta) &lt;&lt; 15);</div><div class='add'>+	vdso_data-&gt;ts_dir = (tod_steering_delta &lt; 0) ? 0 : 1;</div><div class='add'>+	vdso_data-&gt;ts_end = tod_steering_end;</div><div class='add'>+	vdso_data-&gt;tb_update_count++;</div><div class='add'>+	/* Update LPAR offset. */</div><div class='add'>+	if (ptff_query(PTFF_QTO) &amp;&amp; ptff(&amp;qto, sizeof(qto), PTFF_QTO) == 0)</div><div class='add'>+		lpar_offset = qto.tod_epoch_difference;</div><div class='add'>+	/* Call the TOD clock change notifier. */</div><div class='add'>+	atomic_notifier_call_chain(&amp;s390_epoch_delta_notifier, 0, &amp;delta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Apply clock delta to the per-CPU data structures of this CPU.</div><div class='add'>+ * This is called for each online CPU after the call to clock_sync_global.</div><div class='add'>+ */</div><div class='add'>+static void clock_sync_local(unsigned long long delta)</div><div class='add'>+{</div><div class='add'>+	/* Add the delta to the clock comparator. */</div><div class='add'>+	if (S390_lowcore.clock_comparator != -1ULL) {</div><div class='add'>+		S390_lowcore.clock_comparator += delta;</div><div class='add'>+		set_clock_comparator(S390_lowcore.clock_comparator);</div><div class='add'>+	}</div><div class='add'>+	/* Adjust the last_update_clock time-stamp. */</div><div class='add'>+	S390_lowcore.last_update_clock += delta;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Single threaded workqueue used for stp sync events */</div><div class='ctx'> static struct workqueue_struct *time_sync_wq;</div><div class='ctx'> </div><div class='hunk'>@@ -397,31 +456,9 @@ static void __init time_init_wq(void)</div><div class='ctx'> struct clock_sync_data {</div><div class='ctx'> 	atomic_t cpus;</div><div class='ctx'> 	int in_sync;</div><div class='del'>-	unsigned long long fixup_cc;</div><div class='add'>+	unsigned long long clock_delta;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void clock_sync_cpu(struct clock_sync_data *sync)</div><div class='del'>-{</div><div class='del'>-	atomic_dec(&amp;sync-&gt;cpus);</div><div class='del'>-	enable_sync_clock();</div><div class='del'>-	while (sync-&gt;in_sync == 0) {</div><div class='del'>-		__udelay(1);</div><div class='del'>-		/*</div><div class='del'>-		 * A different cpu changes *in_sync. Therefore use</div><div class='del'>-		 * barrier() to force memory access.</div><div class='del'>-		 */</div><div class='del'>-		barrier();</div><div class='del'>-	}</div><div class='del'>-	if (sync-&gt;in_sync != 1)</div><div class='del'>-		/* Didn't work. Clear per-cpu in sync bit again. */</div><div class='del'>-		disable_sync_clock(NULL);</div><div class='del'>-	/*</div><div class='del'>-	 * This round of TOD syncing is done. Set the clock comparator</div><div class='del'>-	 * to the next tick and let the processor continue.</div><div class='del'>-	 */</div><div class='del'>-	fixup_clock_comparator(sync-&gt;fixup_cc);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Server Time Protocol (STP) code.</div><div class='ctx'>  */</div><div class='hunk'>@@ -455,7 +492,7 @@ static void __init stp_reset(void)</div><div class='ctx'> 		pr_warn("The real or virtual hardware system does not provide an STP interface\n");</div><div class='ctx'> 		free_page((unsigned long) stp_page);</div><div class='ctx'> 		stp_page = NULL;</div><div class='del'>-		stp_online = 0;</div><div class='add'>+		stp_online = false;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -523,54 +560,46 @@ void stp_queue_work(void)</div><div class='ctx'> </div><div class='ctx'> static int stp_sync_clock(void *data)</div><div class='ctx'> {</div><div class='del'>-	static int first;</div><div class='add'>+	struct clock_sync_data *sync = data;</div><div class='ctx'> 	unsigned long long clock_delta;</div><div class='del'>-	struct clock_sync_data *stp_sync;</div><div class='del'>-	struct ptff_qto qto;</div><div class='add'>+	static int first;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	stp_sync = data;</div><div class='del'>-</div><div class='del'>-	if (xchg(&amp;first, 1) == 1) {</div><div class='del'>-		/* Slave */</div><div class='del'>-		clock_sync_cpu(stp_sync);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Wait until all other cpus entered the sync function. */</div><div class='del'>-	while (atomic_read(&amp;stp_sync-&gt;cpus) != 0)</div><div class='del'>-		cpu_relax();</div><div class='del'>-</div><div class='ctx'> 	enable_sync_clock();</div><div class='del'>-</div><div class='del'>-	rc = 0;</div><div class='del'>-	if (stp_info.todoff[0] || stp_info.todoff[1] ||</div><div class='del'>-	    stp_info.todoff[2] || stp_info.todoff[3] ||</div><div class='del'>-	    stp_info.tmd != 2) {</div><div class='del'>-		rc = chsc_sstpc(stp_page, STP_OP_SYNC, 0, &amp;clock_delta);</div><div class='del'>-		if (rc == 0) {</div><div class='del'>-			/* fixup the monotonic sched clock */</div><div class='del'>-			sched_clock_base_cc += clock_delta;</div><div class='del'>-			if (ptff_query(PTFF_QTO) &amp;&amp;</div><div class='del'>-			    ptff(&amp;qto, sizeof(qto), PTFF_QTO) == 0)</div><div class='del'>-				/* Update LPAR offset */</div><div class='del'>-				lpar_offset = qto.tod_epoch_difference;</div><div class='del'>-			atomic_notifier_call_chain(&amp;s390_epoch_delta_notifier,</div><div class='del'>-						   0, &amp;clock_delta);</div><div class='del'>-			stp_sync-&gt;fixup_cc = clock_delta;</div><div class='del'>-			fixup_clock_comparator(clock_delta);</div><div class='del'>-			rc = chsc_sstpi(stp_page, &amp;stp_info,</div><div class='del'>-					sizeof(struct stp_sstpi));</div><div class='del'>-			if (rc == 0 &amp;&amp; stp_info.tmd != 2)</div><div class='del'>-				rc = -EAGAIN;</div><div class='add'>+	if (xchg(&amp;first, 1) == 0) {</div><div class='add'>+		/* Wait until all other cpus entered the sync function. */</div><div class='add'>+		while (atomic_read(&amp;sync-&gt;cpus) != 0)</div><div class='add'>+			cpu_relax();</div><div class='add'>+		rc = 0;</div><div class='add'>+		if (stp_info.todoff[0] || stp_info.todoff[1] ||</div><div class='add'>+		    stp_info.todoff[2] || stp_info.todoff[3] ||</div><div class='add'>+		    stp_info.tmd != 2) {</div><div class='add'>+			rc = chsc_sstpc(stp_page, STP_OP_SYNC, 0,</div><div class='add'>+					&amp;clock_delta);</div><div class='add'>+			if (rc == 0) {</div><div class='add'>+				sync-&gt;clock_delta = clock_delta;</div><div class='add'>+				clock_sync_global(clock_delta);</div><div class='add'>+				rc = chsc_sstpi(stp_page, &amp;stp_info,</div><div class='add'>+						sizeof(struct stp_sstpi));</div><div class='add'>+				if (rc == 0 &amp;&amp; stp_info.tmd != 2)</div><div class='add'>+					rc = -EAGAIN;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+		sync-&gt;in_sync = rc ? -EAGAIN : 1;</div><div class='add'>+		xchg(&amp;first, 0);</div><div class='add'>+	} else {</div><div class='add'>+		/* Slave */</div><div class='add'>+		atomic_dec(&amp;sync-&gt;cpus);</div><div class='add'>+		/* Wait for in_sync to be set. */</div><div class='add'>+		while (READ_ONCE(sync-&gt;in_sync) == 0)</div><div class='add'>+			__udelay(1);</div><div class='ctx'> 	}</div><div class='del'>-	if (rc) {</div><div class='add'>+	if (sync-&gt;in_sync != 1)</div><div class='add'>+		/* Didn't work. Clear per-cpu in sync bit again. */</div><div class='ctx'> 		disable_sync_clock(NULL);</div><div class='del'>-		stp_sync-&gt;in_sync = -EAGAIN;</div><div class='del'>-	} else</div><div class='del'>-		stp_sync-&gt;in_sync = 1;</div><div class='del'>-	xchg(&amp;first, 0);</div><div class='add'>+	/* Apply clock delta to per-CPU fields of this CPU. */</div><div class='add'>+	clock_sync_local(sync-&gt;clock_delta);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c<br/>index e959c02e0cac..17660e800e74 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/topology.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/topology.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/topology.c</a></div><div class='hunk'>@@ -7,11 +7,13 @@</div><div class='ctx'> #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/cpuset.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/topology.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -37,26 +39,27 @@ static void set_topology_timer(void);</div><div class='ctx'> static void topology_work_fn(struct work_struct *work);</div><div class='ctx'> static struct sysinfo_15_1_x *tl_info;</div><div class='ctx'> </div><div class='del'>-static bool topology_enabled = true;</div><div class='ctx'> static DECLARE_WORK(topology_work, topology_work_fn);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Socket/Book linked lists and per_cpu(cpu_topology) updates are</div><div class='add'>+ * Socket/Book linked lists and cpu_topology updates are</div><div class='ctx'>  * protected by "sched_domains_mutex".</div><div class='ctx'>  */</div><div class='ctx'> static struct mask_info socket_info;</div><div class='ctx'> static struct mask_info book_info;</div><div class='ctx'> static struct mask_info drawer_info;</div><div class='ctx'> </div><div class='del'>-DEFINE_PER_CPU(struct cpu_topology_s390, cpu_topology);</div><div class='del'>-EXPORT_PER_CPU_SYMBOL_GPL(cpu_topology);</div><div class='add'>+struct cpu_topology_s390 cpu_topology[NR_CPUS];</div><div class='add'>+EXPORT_SYMBOL_GPL(cpu_topology);</div><div class='add'>+</div><div class='add'>+cpumask_t cpus_with_topology;</div><div class='ctx'> </div><div class='ctx'> static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	cpumask_t mask;</div><div class='ctx'> </div><div class='ctx'> 	cpumask_copy(&amp;mask, cpumask_of(cpu));</div><div class='del'>-	if (!topology_enabled || !MACHINE_HAS_TOPOLOGY)</div><div class='add'>+	if (!MACHINE_HAS_TOPOLOGY)</div><div class='ctx'> 		return mask;</div><div class='ctx'> 	for (; info; info = info-&gt;next) {</div><div class='ctx'> 		if (cpumask_test_cpu(cpu, &amp;info-&gt;mask))</div><div class='hunk'>@@ -71,7 +74,7 @@ static cpumask_t cpu_thread_map(unsigned int cpu)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	cpumask_copy(&amp;mask, cpumask_of(cpu));</div><div class='del'>-	if (!topology_enabled || !MACHINE_HAS_TOPOLOGY)</div><div class='add'>+	if (!MACHINE_HAS_TOPOLOGY)</div><div class='ctx'> 		return mask;</div><div class='ctx'> 	cpu -= cpu % (smp_cpu_mtid + 1);</div><div class='ctx'> 	for (i = 0; i &lt;= smp_cpu_mtid; i++)</div><div class='hunk'>@@ -97,7 +100,7 @@ static void add_cpus_to_mask(struct topology_core *tl_core,</div><div class='ctx'> 		if (lcpu &lt; 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		for (i = 0; i &lt;= smp_cpu_mtid; i++) {</div><div class='del'>-			topo = &amp;per_cpu(cpu_topology, lcpu + i);</div><div class='add'>+			topo = &amp;cpu_topology[lcpu + i];</div><div class='ctx'> 			topo-&gt;drawer_id = drawer-&gt;id;</div><div class='ctx'> 			topo-&gt;book_id = book-&gt;id;</div><div class='ctx'> 			topo-&gt;socket_id = socket-&gt;id;</div><div class='hunk'>@@ -106,6 +109,7 @@ static void add_cpus_to_mask(struct topology_core *tl_core,</div><div class='ctx'> 			cpumask_set_cpu(lcpu + i, &amp;drawer-&gt;mask);</div><div class='ctx'> 			cpumask_set_cpu(lcpu + i, &amp;book-&gt;mask);</div><div class='ctx'> 			cpumask_set_cpu(lcpu + i, &amp;socket-&gt;mask);</div><div class='add'>+			cpumask_set_cpu(lcpu + i, &amp;cpus_with_topology);</div><div class='ctx'> 			smp_cpu_set_polarization(lcpu + i, tl_core-&gt;pp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -220,7 +224,7 @@ static void update_cpu_masks(void)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='del'>-		topo = &amp;per_cpu(cpu_topology, cpu);</div><div class='add'>+		topo = &amp;cpu_topology[cpu];</div><div class='ctx'> 		topo-&gt;thread_mask = cpu_thread_map(cpu);</div><div class='ctx'> 		topo-&gt;core_mask = cpu_group_map(&amp;socket_info, cpu);</div><div class='ctx'> 		topo-&gt;book_mask = cpu_group_map(&amp;book_info, cpu);</div><div class='hunk'>@@ -231,6 +235,8 @@ static void update_cpu_masks(void)</div><div class='ctx'> 			topo-&gt;socket_id = cpu;</div><div class='ctx'> 			topo-&gt;book_id = cpu;</div><div class='ctx'> 			topo-&gt;drawer_id = cpu;</div><div class='add'>+			if (cpu_present(cpu))</div><div class='add'>+				cpumask_set_cpu(cpu, &amp;cpus_with_topology);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	numa_update_cpu_topology();</div><div class='hunk'>@@ -241,12 +247,12 @@ void store_topology(struct sysinfo_15_1_x *info)</div><div class='ctx'> 	stsi(info, 15, 1, min(topology_max_mnest, 4));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int arch_update_cpu_topology(void)</div><div class='add'>+static int __arch_update_cpu_topology(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct sysinfo_15_1_x *info = tl_info;</div><div class='del'>-	struct device *dev;</div><div class='del'>-	int cpu, rc = 0;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='add'>+	cpumask_clear(&amp;cpus_with_topology);</div><div class='ctx'> 	if (MACHINE_HAS_TOPOLOGY) {</div><div class='ctx'> 		rc = 1;</div><div class='ctx'> 		store_topology(info);</div><div class='hunk'>@@ -255,6 +261,15 @@ int arch_update_cpu_topology(void)</div><div class='ctx'> 	update_cpu_masks();</div><div class='ctx'> 	if (!MACHINE_HAS_TOPOLOGY)</div><div class='ctx'> 		topology_update_polarization_simple();</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_update_cpu_topology(void)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int cpu, rc;</div><div class='add'>+</div><div class='add'>+	rc = __arch_update_cpu_topology();</div><div class='ctx'> 	for_each_online_cpu(cpu) {</div><div class='ctx'> 		dev = get_cpu_device(cpu);</div><div class='ctx'> 		kobject_uevent(&amp;dev-&gt;kobj, KOBJ_CHANGE);</div><div class='hunk'>@@ -394,30 +409,24 @@ int topology_cpu_init(struct cpu *cpu)</div><div class='ctx'> </div><div class='ctx'> static const struct cpumask *cpu_thread_mask(int cpu)</div><div class='ctx'> {</div><div class='del'>-	return &amp;per_cpu(cpu_topology, cpu).thread_mask;</div><div class='add'>+	return &amp;cpu_topology[cpu].thread_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> const struct cpumask *cpu_coregroup_mask(int cpu)</div><div class='ctx'> {</div><div class='del'>-	return &amp;per_cpu(cpu_topology, cpu).core_mask;</div><div class='add'>+	return &amp;cpu_topology[cpu].core_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct cpumask *cpu_book_mask(int cpu)</div><div class='ctx'> {</div><div class='del'>-	return &amp;per_cpu(cpu_topology, cpu).book_mask;</div><div class='add'>+	return &amp;cpu_topology[cpu].book_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct cpumask *cpu_drawer_mask(int cpu)</div><div class='ctx'> {</div><div class='del'>-	return &amp;per_cpu(cpu_topology, cpu).drawer_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init early_parse_topology(char *p)</div><div class='del'>-{</div><div class='del'>-	return kstrtobool(p, &amp;topology_enabled);</div><div class='add'>+	return &amp;cpu_topology[cpu].drawer_mask;</div><div class='ctx'> }</div><div class='del'>-early_param("topology", early_parse_topology);</div><div class='ctx'> </div><div class='ctx'> static struct sched_domain_topology_level s390_topology[] = {</div><div class='ctx'> 	{ cpu_thread_mask, cpu_smt_flags, SD_INIT_NAME(SMT) },</div><div class='hunk'>@@ -438,32 +447,30 @@ static void __init alloc_masks(struct sysinfo_15_1_x *info,</div><div class='ctx'> 		nr_masks *= info-&gt;mag[TOPOLOGY_NR_MAG - offset - 1 - i];</div><div class='ctx'> 	nr_masks = max(nr_masks, 1);</div><div class='ctx'> 	for (i = 0; i &lt; nr_masks; i++) {</div><div class='del'>-		mask-&gt;next = kzalloc(sizeof(*mask-&gt;next), GFP_KERNEL);</div><div class='add'>+		mask-&gt;next = memblock_virt_alloc(sizeof(*mask-&gt;next), 8);</div><div class='ctx'> 		mask = mask-&gt;next;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init s390_topology_init(void)</div><div class='add'>+void __init topology_init_early(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct sysinfo_15_1_x *info;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='add'>+	set_sched_topology(s390_topology);</div><div class='ctx'> 	if (!MACHINE_HAS_TOPOLOGY)</div><div class='del'>-		return 0;</div><div class='del'>-	tl_info = (struct sysinfo_15_1_x *)__get_free_page(GFP_KERNEL);</div><div class='add'>+		goto out;</div><div class='add'>+	tl_info = memblock_virt_alloc(PAGE_SIZE, PAGE_SIZE);</div><div class='ctx'> 	info = tl_info;</div><div class='ctx'> 	store_topology(info);</div><div class='del'>-	pr_info("The CPU configuration topology of the machine is:");</div><div class='del'>-	for (i = 0; i &lt; TOPOLOGY_NR_MAG; i++)</div><div class='del'>-		printk(KERN_CONT " %d", info-&gt;mag[i]);</div><div class='del'>-	printk(KERN_CONT " / %d\n", info-&gt;mnest);</div><div class='add'>+	pr_info("The CPU configuration topology of the machine is: %d %d %d %d %d %d / %d\n",</div><div class='add'>+		info-&gt;mag[0], info-&gt;mag[1], info-&gt;mag[2], info-&gt;mag[3],</div><div class='add'>+		info-&gt;mag[4], info-&gt;mag[5], info-&gt;mnest);</div><div class='ctx'> 	alloc_masks(info, &amp;socket_info, 1);</div><div class='ctx'> 	alloc_masks(info, &amp;book_info, 2);</div><div class='ctx'> 	alloc_masks(info, &amp;drawer_info, 3);</div><div class='del'>-	set_sched_topology(s390_topology);</div><div class='del'>-	return 0;</div><div class='add'>+out:</div><div class='add'>+	__arch_update_cpu_topology();</div><div class='ctx'> }</div><div class='del'>-early_initcall(s390_topology_init);</div><div class='ctx'> </div><div class='ctx'> static int __init topology_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c<br/>index d0539f76fd24..f787b9d8f54c 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/traps.c</a></div><div class='hunk'>@@ -17,9 +17,10 @@</div><div class='ctx'> #include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/api.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/uprobes.c b/arch/s390/kernel/uprobes.c<br/>index 66956c09d5bf..314e0ee3016a 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/uprobes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/uprobes.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/uprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/uprobes.c</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> #include &lt;linux/uprobes.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include &lt;asm/facility.h&gt;</div><div class='ctx'> #include &lt;asm/kprobes.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c<br/>index 5904abf6b1ae..10516ae3b55e 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/vdso.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/vdso.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/vdso.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vdso.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/vdso32/clock_gettime.S b/arch/s390/kernel/vdso32/clock_gettime.S<br/>index 5eec9afbb5b5..a5769b83d90e 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/vdso32/clock_gettime.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/vdso32/clock_gettime.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/vdso32/clock_gettime.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vdso32/clock_gettime.S</a></div><div class='hunk'>@@ -99,8 +99,27 @@ __kernel_clock_gettime:</div><div class='ctx'> 	tml	%r4,0x0001			/* pending update ? loop */</div><div class='ctx'> 	jnz	11b</div><div class='ctx'> 	stcke	0(%r15)				/* Store TOD clock */</div><div class='del'>-	lm	%r0,%r1,1(%r15)</div><div class='del'>-	s	%r0,__VDSO_XTIME_STAMP(%r5)	/* TOD - cycle_last */</div><div class='add'>+	lm	%r0,%r1,__VDSO_TS_END(%r5)	/* TOD steering end time */</div><div class='add'>+	s	%r0,1(%r15)			/* no - ts_steering_end */</div><div class='add'>+	sl	%r1,5(%r15)</div><div class='add'>+	brc	3,22f</div><div class='add'>+	ahi	%r0,-1</div><div class='add'>+22:	ltr	%r0,%r0				/* past end of steering? */</div><div class='add'>+	jm	24f</div><div class='add'>+	srdl	%r0,15				/* 1 per 2^16 */</div><div class='add'>+	tm	__VDSO_TS_DIR+3(%r5),0x01	/* steering direction? */</div><div class='add'>+	jz	23f</div><div class='add'>+	lcr	%r0,%r0				/* negative TOD offset */</div><div class='add'>+	lcr	%r1,%r1</div><div class='add'>+	je	23f</div><div class='add'>+	ahi	%r0,-1</div><div class='add'>+23:	a	%r0,1(%r15)			/* add TOD timestamp */</div><div class='add'>+	al	%r1,5(%r15)</div><div class='add'>+	brc	12,25f</div><div class='add'>+	ahi	%r0,1</div><div class='add'>+	j	25f</div><div class='add'>+24:	lm	%r0,%r1,1(%r15)			/* load TOD timestamp */</div><div class='add'>+25:	s	%r0,__VDSO_XTIME_STAMP(%r5)	/* TOD - cycle_last */</div><div class='ctx'> 	sl	%r1,__VDSO_XTIME_STAMP+4(%r5)</div><div class='ctx'> 	brc	3,12f</div><div class='ctx'> 	ahi	%r0,-1</div><div class='head'>diff --git a/arch/s390/kernel/vdso32/gettimeofday.S b/arch/s390/kernel/vdso32/gettimeofday.S<br/>index 719de6186b20..63b86dceb0bf 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/vdso32/gettimeofday.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/vdso32/gettimeofday.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/vdso32/gettimeofday.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vdso32/gettimeofday.S</a></div><div class='hunk'>@@ -31,8 +31,27 @@ __kernel_gettimeofday:</div><div class='ctx'> 	tml	%r4,0x0001			/* pending update ? loop */</div><div class='ctx'> 	jnz	1b</div><div class='ctx'> 	stcke	0(%r15)				/* Store TOD clock */</div><div class='del'>-	lm	%r0,%r1,1(%r15)</div><div class='del'>-	s	%r0,__VDSO_XTIME_STAMP(%r5)	/* TOD - cycle_last */</div><div class='add'>+	lm	%r0,%r1,__VDSO_TS_END(%r5)	/* TOD steering end time */</div><div class='add'>+	s	%r0,1(%r15)</div><div class='add'>+	sl	%r1,5(%r15)</div><div class='add'>+	brc	3,14f</div><div class='add'>+	ahi	%r0,-1</div><div class='add'>+14:	ltr	%r0,%r0				/* past end of steering? */</div><div class='add'>+	jm	16f</div><div class='add'>+	srdl	%r0,15				/* 1 per 2^16 */</div><div class='add'>+	tm	__VDSO_TS_DIR+3(%r5),0x01	/* steering direction? */</div><div class='add'>+	jz	15f</div><div class='add'>+	lcr	%r0,%r0				/* negative TOD offset */</div><div class='add'>+	lcr	%r1,%r1</div><div class='add'>+	je	15f</div><div class='add'>+	ahi	%r0,-1</div><div class='add'>+15:	a	%r0,1(%r15)			/* add TOD timestamp */</div><div class='add'>+	al	%r1,5(%r15)</div><div class='add'>+	brc	12,17f</div><div class='add'>+	ahi	%r0,1</div><div class='add'>+	j	17f</div><div class='add'>+16:	lm	%r0,%r1,1(%r15)			/* load TOD timestamp */</div><div class='add'>+17:	s	%r0,__VDSO_XTIME_STAMP(%r5)	/* TOD - cycle_last */</div><div class='ctx'> 	sl	%r1,__VDSO_XTIME_STAMP+4(%r5)</div><div class='ctx'> 	brc	3,3f</div><div class='ctx'> 	ahi	%r0,-1</div><div class='head'>diff --git a/arch/s390/kernel/vdso64/clock_gettime.S b/arch/s390/kernel/vdso64/clock_gettime.S<br/>index 61541fb93dc6..9c3b12626dba 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/vdso64/clock_gettime.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/vdso64/clock_gettime.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/vdso64/clock_gettime.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vdso64/clock_gettime.S</a></div><div class='hunk'>@@ -83,8 +83,17 @@ __kernel_clock_gettime:</div><div class='ctx'> 	tmll	%r4,0x0001			/* pending update ? loop */</div><div class='ctx'> 	jnz	5b</div><div class='ctx'> 	stcke	0(%r15)				/* Store TOD clock */</div><div class='del'>-	lgf	%r2,__VDSO_TK_SHIFT(%r5)	/* Timekeeper shift */</div><div class='ctx'> 	lg	%r1,1(%r15)</div><div class='add'>+	lg	%r0,__VDSO_TS_END(%r5)		/* TOD steering end time */</div><div class='add'>+	slgr	%r0,%r1				/* now - ts_steering_end */</div><div class='add'>+	ltgr	%r0,%r0				/* past end of steering ? */</div><div class='add'>+	jm	17f</div><div class='add'>+	srlg	%r0,%r0,15			/* 1 per 2^16 */</div><div class='add'>+	tm	__VDSO_TS_DIR+3(%r5),0x01	/* steering direction? */</div><div class='add'>+	jz	18f</div><div class='add'>+	lcgr	%r0,%r0				/* negative TOD offset */</div><div class='add'>+18:	algr	%r1,%r0				/* add steering offset */</div><div class='add'>+17:	lgf	%r2,__VDSO_TK_SHIFT(%r5)	/* Timekeeper shift */</div><div class='ctx'> 	sg	%r1,__VDSO_XTIME_STAMP(%r5)	/* TOD - cycle_last */</div><div class='ctx'> 	msgf	%r1,__VDSO_TK_MULT(%r5)		/*  * tk-&gt;mult */</div><div class='ctx'> 	alg	%r1,__VDSO_XTIME_NSEC(%r5)	/*  + tk-&gt;xtime_nsec */</div><div class='head'>diff --git a/arch/s390/kernel/vdso64/gettimeofday.S b/arch/s390/kernel/vdso64/gettimeofday.S<br/>index 6ce46707663c..b02e62f3bc12 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/vdso64/gettimeofday.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/vdso64/gettimeofday.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/vdso64/gettimeofday.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vdso64/gettimeofday.S</a></div><div class='hunk'>@@ -31,7 +31,16 @@ __kernel_gettimeofday:</div><div class='ctx'> 	jnz	0b</div><div class='ctx'> 	stcke	0(%r15)				/* Store TOD clock */</div><div class='ctx'> 	lg	%r1,1(%r15)</div><div class='del'>-	sg	%r1,__VDSO_XTIME_STAMP(%r5)	/* TOD - cycle_last */</div><div class='add'>+	lg	%r0,__VDSO_TS_END(%r5)		/* TOD steering end time */</div><div class='add'>+	slgr	%r0,%r1				/* now - ts_steering_end */</div><div class='add'>+	ltgr	%r0,%r0				/* past end of steering ? */</div><div class='add'>+	jm	6f</div><div class='add'>+	srlg	%r0,%r0,15			/* 1 per 2^16 */</div><div class='add'>+	tm	__VDSO_TS_DIR+3(%r5),0x01	/* steering direction? */</div><div class='add'>+	jz	7f</div><div class='add'>+	lcgr	%r0,%r0				/* negative TOD offset */</div><div class='add'>+7:	algr	%r1,%r0				/* add steering offset */</div><div class='add'>+6:	sg	%r1,__VDSO_XTIME_STAMP(%r5)	/* TOD - cycle_last */</div><div class='ctx'> 	msgf	%r1,__VDSO_TK_MULT(%r5)		/*  * tk-&gt;mult */</div><div class='ctx'> 	alg	%r1,__VDSO_XTIME_NSEC(%r5)	/*  + tk-&gt;xtime_nsec */</div><div class='ctx'> 	lg	%r0,__VDSO_XTIME_SEC(%r5)	/* tk-&gt;xtime_sec */</div><div class='head'>diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S<br/>index 3667d20e997f..5ccf95396251 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/vmlinux.lds.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -44,6 +44,7 @@ SECTIONS</div><div class='ctx'> 		*(.gnu.warning)</div><div class='ctx'> 	} :text = 0x0700</div><div class='ctx'> </div><div class='add'>+	. = ALIGN(PAGE_SIZE);</div><div class='ctx'> 	_etext = .;		/* End of text section */</div><div class='ctx'> </div><div class='ctx'> 	NOTES :text :note</div><div class='hunk'>@@ -79,7 +80,13 @@ SECTIONS</div><div class='ctx'> 	. = ALIGN(PAGE_SIZE);	/* Init code and data */</div><div class='ctx'> 	__init_begin = .;</div><div class='ctx'> </div><div class='del'>-	INIT_TEXT_SECTION(PAGE_SIZE)</div><div class='add'>+	. = ALIGN(PAGE_SIZE);</div><div class='add'>+	.init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {</div><div class='add'>+		VMLINUX_SYMBOL(_sinittext) = . ;</div><div class='add'>+		INIT_TEXT</div><div class='add'>+		. = ALIGN(PAGE_SIZE);</div><div class='add'>+		VMLINUX_SYMBOL(_einittext) = . ;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * .exit.text is discarded at runtime, not link time,</div><div class='head'>diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c<br/>index 856e30d8463f..c14fc9029912 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kernel/vtime.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kernel/vtime.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kernel/vtime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kernel/vtime.c</a></div><div class='hunk'>@@ -6,13 +6,13 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='add'>+#include &lt;linux/sched/cputime.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/cputime.h&gt;</div><div class='ctx'> #include &lt;asm/vtimer.h&gt;</div><div class='ctx'> #include &lt;asm/vtime.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_mf.h&gt;</div><div class='hunk'>@@ -90,15 +90,41 @@ static void update_mt_scaling(void)</div><div class='ctx'> 	__this_cpu_write(mt_scaling_jiffies, jiffies_64);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u64 update_tsk_timer(unsigned long *tsk_vtime, u64 new)</div><div class='add'>+{</div><div class='add'>+	u64 delta;</div><div class='add'>+</div><div class='add'>+	delta = new - *tsk_vtime;</div><div class='add'>+	*tsk_vtime = new;</div><div class='add'>+	return delta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline u64 scale_vtime(u64 vtime)</div><div class='add'>+{</div><div class='add'>+	u64 mult = __this_cpu_read(mt_scaling_mult);</div><div class='add'>+	u64 div = __this_cpu_read(mt_scaling_div);</div><div class='add'>+</div><div class='add'>+	if (smp_cpu_mtid)</div><div class='add'>+		return vtime * mult / div;</div><div class='add'>+	return vtime;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void account_system_index_scaled(struct task_struct *p,</div><div class='add'>+					cputime_t cputime, cputime_t scaled,</div><div class='add'>+					enum cpu_usage_stat index)</div><div class='add'>+{</div><div class='add'>+	p-&gt;stimescaled += cputime_to_nsecs(scaled);</div><div class='add'>+	account_system_index_time(p, cputime_to_nsecs(cputime), index);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Update process times based on virtual cpu times stored by entry.S</div><div class='ctx'>  * to the lowcore fields user_timer, system_timer &amp; steal_clock.</div><div class='ctx'>  */</div><div class='del'>-static int do_account_vtime(struct task_struct *tsk, int hardirq_offset)</div><div class='add'>+static int do_account_vtime(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='del'>-	struct thread_info *ti = task_thread_info(tsk);</div><div class='del'>-	u64 timer, clock, user, system, steal;</div><div class='del'>-	u64 user_scaled, system_scaled;</div><div class='add'>+	u64 timer, clock, user, guest, system, hardirq, softirq, steal;</div><div class='ctx'> </div><div class='ctx'> 	timer = S390_lowcore.last_update_timer;</div><div class='ctx'> 	clock = S390_lowcore.last_update_clock;</div><div class='hunk'>@@ -111,55 +137,76 @@ static int do_account_vtime(struct task_struct *tsk, int hardirq_offset)</div><div class='ctx'> #endif</div><div class='ctx'> 		: "=m" (S390_lowcore.last_update_timer),</div><div class='ctx'> 		  "=m" (S390_lowcore.last_update_clock));</div><div class='del'>-	S390_lowcore.system_timer += timer - S390_lowcore.last_update_timer;</div><div class='del'>-	S390_lowcore.steal_timer += S390_lowcore.last_update_clock - clock;</div><div class='add'>+	clock = S390_lowcore.last_update_clock - clock;</div><div class='add'>+	timer -= S390_lowcore.last_update_timer;</div><div class='add'>+</div><div class='add'>+	if (hardirq_count())</div><div class='add'>+		S390_lowcore.hardirq_timer += timer;</div><div class='add'>+	else</div><div class='add'>+		S390_lowcore.system_timer += timer;</div><div class='ctx'> </div><div class='ctx'> 	/* Update MT utilization calculation */</div><div class='ctx'> 	if (smp_cpu_mtid &amp;&amp;</div><div class='ctx'> 	    time_after64(jiffies_64, this_cpu_read(mt_scaling_jiffies)))</div><div class='ctx'> 		update_mt_scaling();</div><div class='ctx'> </div><div class='del'>-	user = S390_lowcore.user_timer - ti-&gt;user_timer;</div><div class='del'>-	S390_lowcore.steal_timer -= user;</div><div class='del'>-	ti-&gt;user_timer = S390_lowcore.user_timer;</div><div class='del'>-</div><div class='del'>-	system = S390_lowcore.system_timer - ti-&gt;system_timer;</div><div class='del'>-	S390_lowcore.steal_timer -= system;</div><div class='del'>-	ti-&gt;system_timer = S390_lowcore.system_timer;</div><div class='del'>-</div><div class='del'>-	user_scaled = user;</div><div class='del'>-	system_scaled = system;</div><div class='del'>-	/* Do MT utilization scaling */</div><div class='del'>-	if (smp_cpu_mtid) {</div><div class='del'>-		u64 mult = __this_cpu_read(mt_scaling_mult);</div><div class='del'>-		u64 div = __this_cpu_read(mt_scaling_div);</div><div class='add'>+	/* Calculate cputime delta */</div><div class='add'>+	user = update_tsk_timer(&amp;tsk-&gt;thread.user_timer,</div><div class='add'>+				READ_ONCE(S390_lowcore.user_timer));</div><div class='add'>+	guest = update_tsk_timer(&amp;tsk-&gt;thread.guest_timer,</div><div class='add'>+				 READ_ONCE(S390_lowcore.guest_timer));</div><div class='add'>+	system = update_tsk_timer(&amp;tsk-&gt;thread.system_timer,</div><div class='add'>+				  READ_ONCE(S390_lowcore.system_timer));</div><div class='add'>+	hardirq = update_tsk_timer(&amp;tsk-&gt;thread.hardirq_timer,</div><div class='add'>+				   READ_ONCE(S390_lowcore.hardirq_timer));</div><div class='add'>+	softirq = update_tsk_timer(&amp;tsk-&gt;thread.softirq_timer,</div><div class='add'>+				   READ_ONCE(S390_lowcore.softirq_timer));</div><div class='add'>+	S390_lowcore.steal_timer +=</div><div class='add'>+		clock - user - guest - system - hardirq - softirq;</div><div class='add'>+</div><div class='add'>+	/* Push account value */</div><div class='add'>+	if (user) {</div><div class='add'>+		account_user_time(tsk, cputime_to_nsecs(user));</div><div class='add'>+		tsk-&gt;utimescaled += cputime_to_nsecs(scale_vtime(user));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		user_scaled = (user_scaled * mult) / div;</div><div class='del'>-		system_scaled = (system_scaled * mult) / div;</div><div class='add'>+	if (guest) {</div><div class='add'>+		account_guest_time(tsk, cputime_to_nsecs(guest));</div><div class='add'>+		tsk-&gt;utimescaled += cputime_to_nsecs(scale_vtime(guest));</div><div class='ctx'> 	}</div><div class='del'>-	account_user_time(tsk, user, user_scaled);</div><div class='del'>-	account_system_time(tsk, hardirq_offset, system, system_scaled);</div><div class='add'>+</div><div class='add'>+	if (system)</div><div class='add'>+		account_system_index_scaled(tsk, system, scale_vtime(system),</div><div class='add'>+					    CPUTIME_SYSTEM);</div><div class='add'>+	if (hardirq)</div><div class='add'>+		account_system_index_scaled(tsk, hardirq, scale_vtime(hardirq),</div><div class='add'>+					    CPUTIME_IRQ);</div><div class='add'>+	if (softirq)</div><div class='add'>+		account_system_index_scaled(tsk, softirq, scale_vtime(softirq),</div><div class='add'>+					    CPUTIME_SOFTIRQ);</div><div class='ctx'> </div><div class='ctx'> 	steal = S390_lowcore.steal_timer;</div><div class='ctx'> 	if ((s64) steal &gt; 0) {</div><div class='ctx'> 		S390_lowcore.steal_timer = 0;</div><div class='del'>-		account_steal_time(steal);</div><div class='add'>+		account_steal_time(cputime_to_nsecs(steal));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return virt_timer_forward(user + system);</div><div class='add'>+	return virt_timer_forward(user + guest + system + hardirq + softirq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void vtime_task_switch(struct task_struct *prev)</div><div class='ctx'> {</div><div class='del'>-	struct thread_info *ti;</div><div class='del'>-</div><div class='del'>-	do_account_vtime(prev, 0);</div><div class='del'>-	ti = task_thread_info(prev);</div><div class='del'>-	ti-&gt;user_timer = S390_lowcore.user_timer;</div><div class='del'>-	ti-&gt;system_timer = S390_lowcore.system_timer;</div><div class='del'>-	ti = task_thread_info(current);</div><div class='del'>-	S390_lowcore.user_timer = ti-&gt;user_timer;</div><div class='del'>-	S390_lowcore.system_timer = ti-&gt;system_timer;</div><div class='add'>+	do_account_vtime(prev);</div><div class='add'>+	prev-&gt;thread.user_timer = S390_lowcore.user_timer;</div><div class='add'>+	prev-&gt;thread.guest_timer = S390_lowcore.guest_timer;</div><div class='add'>+	prev-&gt;thread.system_timer = S390_lowcore.system_timer;</div><div class='add'>+	prev-&gt;thread.hardirq_timer = S390_lowcore.hardirq_timer;</div><div class='add'>+	prev-&gt;thread.softirq_timer = S390_lowcore.softirq_timer;</div><div class='add'>+	S390_lowcore.user_timer = current-&gt;thread.user_timer;</div><div class='add'>+	S390_lowcore.guest_timer = current-&gt;thread.guest_timer;</div><div class='add'>+	S390_lowcore.system_timer = current-&gt;thread.system_timer;</div><div class='add'>+	S390_lowcore.hardirq_timer = current-&gt;thread.hardirq_timer;</div><div class='add'>+	S390_lowcore.softirq_timer = current-&gt;thread.softirq_timer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -167,9 +214,9 @@ void vtime_task_switch(struct task_struct *prev)</div><div class='ctx'>  * accounting system time in order to correctly compute</div><div class='ctx'>  * the stolen time accounting.</div><div class='ctx'>  */</div><div class='del'>-void vtime_account_user(struct task_struct *tsk)</div><div class='add'>+void vtime_flush(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='del'>-	if (do_account_vtime(tsk, HARDIRQ_OFFSET))</div><div class='add'>+	if (do_account_vtime(tsk))</div><div class='ctx'> 		virt_timer_expire();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -179,32 +226,22 @@ void vtime_account_user(struct task_struct *tsk)</div><div class='ctx'>  */</div><div class='ctx'> void vtime_account_irq_enter(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='del'>-	struct thread_info *ti = task_thread_info(tsk);</div><div class='del'>-	u64 timer, system, system_scaled;</div><div class='add'>+	u64 timer;</div><div class='ctx'> </div><div class='ctx'> 	timer = S390_lowcore.last_update_timer;</div><div class='ctx'> 	S390_lowcore.last_update_timer = get_vtimer();</div><div class='del'>-	S390_lowcore.system_timer += timer - S390_lowcore.last_update_timer;</div><div class='del'>-</div><div class='del'>-	/* Update MT utilization calculation */</div><div class='del'>-	if (smp_cpu_mtid &amp;&amp;</div><div class='del'>-	    time_after64(jiffies_64, this_cpu_read(mt_scaling_jiffies)))</div><div class='del'>-		update_mt_scaling();</div><div class='del'>-</div><div class='del'>-	system = S390_lowcore.system_timer - ti-&gt;system_timer;</div><div class='del'>-	S390_lowcore.steal_timer -= system;</div><div class='del'>-	ti-&gt;system_timer = S390_lowcore.system_timer;</div><div class='del'>-	system_scaled = system;</div><div class='del'>-	/* Do MT utilization scaling */</div><div class='del'>-	if (smp_cpu_mtid) {</div><div class='del'>-		u64 mult = __this_cpu_read(mt_scaling_mult);</div><div class='del'>-		u64 div = __this_cpu_read(mt_scaling_div);</div><div class='del'>-</div><div class='del'>-		system_scaled = (system_scaled * mult) / div;</div><div class='del'>-	}</div><div class='del'>-	account_system_time(tsk, 0, system, system_scaled);</div><div class='del'>-</div><div class='del'>-	virt_timer_forward(system);</div><div class='add'>+	timer -= S390_lowcore.last_update_timer;</div><div class='add'>+</div><div class='add'>+	if ((tsk-&gt;flags &amp; PF_VCPU) &amp;&amp; (irq_count() == 0))</div><div class='add'>+		S390_lowcore.guest_timer += timer;</div><div class='add'>+	else if (hardirq_count())</div><div class='add'>+		S390_lowcore.hardirq_timer += timer;</div><div class='add'>+	else if (in_serving_softirq())</div><div class='add'>+		S390_lowcore.softirq_timer += timer;</div><div class='add'>+	else</div><div class='add'>+		S390_lowcore.system_timer += timer;</div><div class='add'>+</div><div class='add'>+	virt_timer_forward(timer);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vtime_account_irq_enter);</div><div class='ctx'> </div><div class='hunk'>@@ -313,7 +350,7 @@ static void __add_vtimer(struct vtimer_list *timer, int periodic)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * add_virt_timer - add an oneshot virtual CPU timer</div><div class='add'>+ * add_virt_timer - add a oneshot virtual CPU timer</div><div class='ctx'>  */</div><div class='ctx'> void add_virt_timer(struct vtimer_list *timer)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/s390/kvm/gaccess.c b/arch/s390/kvm/gaccess.c<br/>index 4aa8a7e2a1da..d55c829a5944 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kvm/gaccess.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kvm/gaccess.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kvm/gaccess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/gaccess.c</a></div><div class='hunk'>@@ -6,7 +6,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/gmap.h&gt;</div><div class='ctx'> #include "kvm-s390.h"</div><div class='hunk'>@@ -373,7 +375,7 @@ void ipte_unlock(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		ipte_unlock_simple(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ar_translation(struct kvm_vcpu *vcpu, union asce *asce, ar_t ar,</div><div class='add'>+static int ar_translation(struct kvm_vcpu *vcpu, union asce *asce, u8 ar,</div><div class='ctx'> 			  enum gacc_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	union alet alet;</div><div class='hunk'>@@ -465,7 +467,9 @@ static int ar_translation(struct kvm_vcpu *vcpu, union asce *asce, ar_t ar,</div><div class='ctx'> struct trans_exc_code_bits {</div><div class='ctx'> 	unsigned long addr : 52; /* Translation-exception Address */</div><div class='ctx'> 	unsigned long fsi  : 2;  /* Access Exception Fetch/Store Indication */</div><div class='del'>-	unsigned long	   : 6;</div><div class='add'>+	unsigned long	   : 2;</div><div class='add'>+	unsigned long b56  : 1;</div><div class='add'>+	unsigned long	   : 3;</div><div class='ctx'> 	unsigned long b60  : 1;</div><div class='ctx'> 	unsigned long b61  : 1;</div><div class='ctx'> 	unsigned long as   : 2;  /* ASCE Identifier */</div><div class='hunk'>@@ -485,7 +489,7 @@ enum prot_type {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int trans_exc(struct kvm_vcpu *vcpu, int code, unsigned long gva,</div><div class='del'>-		     ar_t ar, enum gacc_mode mode, enum prot_type prot)</div><div class='add'>+		     u8 ar, enum gacc_mode mode, enum prot_type prot)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_s390_pgm_info *pgm = &amp;vcpu-&gt;arch.pgm;</div><div class='ctx'> 	struct trans_exc_code_bits *tec;</div><div class='hunk'>@@ -497,14 +501,18 @@ static int trans_exc(struct kvm_vcpu *vcpu, int code, unsigned long gva,</div><div class='ctx'> 	switch (code) {</div><div class='ctx'> 	case PGM_PROTECTION:</div><div class='ctx'> 		switch (prot) {</div><div class='add'>+		case PROT_TYPE_LA:</div><div class='add'>+			tec-&gt;b56 = 1;</div><div class='add'>+			break;</div><div class='add'>+		case PROT_TYPE_KEYC:</div><div class='add'>+			tec-&gt;b60 = 1;</div><div class='add'>+			break;</div><div class='ctx'> 		case PROT_TYPE_ALC:</div><div class='ctx'> 			tec-&gt;b60 = 1;</div><div class='ctx'> 			/* FALL THROUGH */</div><div class='ctx'> 		case PROT_TYPE_DAT:</div><div class='ctx'> 			tec-&gt;b61 = 1;</div><div class='ctx'> 			break;</div><div class='del'>-		default: /* LA and KEYC set b61 to 0, other params undefined */</div><div class='del'>-			return code;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* FALL THROUGH */</div><div class='ctx'> 	case PGM_ASCE_TYPE:</div><div class='hunk'>@@ -539,7 +547,7 @@ static int trans_exc(struct kvm_vcpu *vcpu, int code, unsigned long gva,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_vcpu_asce(struct kvm_vcpu *vcpu, union asce *asce,</div><div class='del'>-			 unsigned long ga, ar_t ar, enum gacc_mode mode)</div><div class='add'>+			 unsigned long ga, u8 ar, enum gacc_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct psw_bits psw = psw_bits(vcpu-&gt;arch.sie_block-&gt;gpsw);</div><div class='hunk'>@@ -771,7 +779,7 @@ static int low_address_protection_enabled(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int guest_page_range(struct kvm_vcpu *vcpu, unsigned long ga, ar_t ar,</div><div class='add'>+static int guest_page_range(struct kvm_vcpu *vcpu, unsigned long ga, u8 ar,</div><div class='ctx'> 			    unsigned long *pages, unsigned long nr_pages,</div><div class='ctx'> 			    const union asce asce, enum gacc_mode mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -803,7 +811,7 @@ static int guest_page_range(struct kvm_vcpu *vcpu, unsigned long ga, ar_t ar,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int access_guest(struct kvm_vcpu *vcpu, unsigned long ga, ar_t ar, void *data,</div><div class='add'>+int access_guest(struct kvm_vcpu *vcpu, unsigned long ga, u8 ar, void *data,</div><div class='ctx'> 		 unsigned long len, enum gacc_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	psw_t *psw = &amp;vcpu-&gt;arch.sie_block-&gt;gpsw;</div><div class='hunk'>@@ -877,7 +885,7 @@ int access_guest_real(struct kvm_vcpu *vcpu, unsigned long gra,</div><div class='ctx'>  * Note: The IPTE lock is not taken during this function, so the caller</div><div class='ctx'>  * has to take care of this.</div><div class='ctx'>  */</div><div class='del'>-int guest_translate_address(struct kvm_vcpu *vcpu, unsigned long gva, ar_t ar,</div><div class='add'>+int guest_translate_address(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar,</div><div class='ctx'> 			    unsigned long *gpa, enum gacc_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	psw_t *psw = &amp;vcpu-&gt;arch.sie_block-&gt;gpsw;</div><div class='hunk'>@@ -910,7 +918,7 @@ int guest_translate_address(struct kvm_vcpu *vcpu, unsigned long gva, ar_t ar,</div><div class='ctx'> /**</div><div class='ctx'>  * check_gva_range - test a range of guest virtual addresses for accessibility</div><div class='ctx'>  */</div><div class='del'>-int check_gva_range(struct kvm_vcpu *vcpu, unsigned long gva, ar_t ar,</div><div class='add'>+int check_gva_range(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar,</div><div class='ctx'> 		    unsigned long length, enum gacc_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long gpa;</div><div class='head'>diff --git a/arch/s390/kvm/gaccess.h b/arch/s390/kvm/gaccess.h<br/>index 8756569ad938..7ce47fd36f28 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kvm/gaccess.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kvm/gaccess.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kvm/gaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/gaccess.h</a></div><div class='hunk'>@@ -162,11 +162,11 @@ enum gacc_mode {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int guest_translate_address(struct kvm_vcpu *vcpu, unsigned long gva,</div><div class='del'>-			    ar_t ar, unsigned long *gpa, enum gacc_mode mode);</div><div class='del'>-int check_gva_range(struct kvm_vcpu *vcpu, unsigned long gva, ar_t ar,</div><div class='add'>+			    u8 ar, unsigned long *gpa, enum gacc_mode mode);</div><div class='add'>+int check_gva_range(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar,</div><div class='ctx'> 		    unsigned long length, enum gacc_mode mode);</div><div class='ctx'> </div><div class='del'>-int access_guest(struct kvm_vcpu *vcpu, unsigned long ga, ar_t ar, void *data,</div><div class='add'>+int access_guest(struct kvm_vcpu *vcpu, unsigned long ga, u8 ar, void *data,</div><div class='ctx'> 		 unsigned long len, enum gacc_mode mode);</div><div class='ctx'> </div><div class='ctx'> int access_guest_real(struct kvm_vcpu *vcpu, unsigned long gra,</div><div class='hunk'>@@ -218,7 +218,7 @@ int access_guest_real(struct kvm_vcpu *vcpu, unsigned long gra,</div><div class='ctx'>  *	 if data has been changed in guest space in case of an exception.</div><div class='ctx'>  */</div><div class='ctx'> static inline __must_check</div><div class='del'>-int write_guest(struct kvm_vcpu *vcpu, unsigned long ga, ar_t ar, void *data,</div><div class='add'>+int write_guest(struct kvm_vcpu *vcpu, unsigned long ga, u8 ar, void *data,</div><div class='ctx'> 		unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	return access_guest(vcpu, ga, ar, data, len, GACC_STORE);</div><div class='hunk'>@@ -238,7 +238,7 @@ int write_guest(struct kvm_vcpu *vcpu, unsigned long ga, ar_t ar, void *data,</div><div class='ctx'>  * data will be copied from guest space to kernel space.</div><div class='ctx'>  */</div><div class='ctx'> static inline __must_check</div><div class='del'>-int read_guest(struct kvm_vcpu *vcpu, unsigned long ga, ar_t ar, void *data,</div><div class='add'>+int read_guest(struct kvm_vcpu *vcpu, unsigned long ga, u8 ar, void *data,</div><div class='ctx'> 	       unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	return access_guest(vcpu, ga, ar, data, len, GACC_FETCH);</div><div class='hunk'>@@ -247,10 +247,11 @@ int read_guest(struct kvm_vcpu *vcpu, unsigned long ga, ar_t ar, void *data,</div><div class='ctx'> /**</div><div class='ctx'>  * read_guest_instr - copy instruction data from guest space to kernel space</div><div class='ctx'>  * @vcpu: virtual cpu</div><div class='add'>+ * @ga: guest address</div><div class='ctx'>  * @data: destination address in kernel space</div><div class='ctx'>  * @len: number of bytes to copy</div><div class='ctx'>  *</div><div class='del'>- * Copy @len bytes from the current psw address (guest space) to @data (kernel</div><div class='add'>+ * Copy @len bytes from the given address (guest space) to @data (kernel</div><div class='ctx'>  * space).</div><div class='ctx'>  *</div><div class='ctx'>  * The behaviour of read_guest_instr is identical to read_guest, except that</div><div class='hunk'>@@ -258,10 +259,10 @@ int read_guest(struct kvm_vcpu *vcpu, unsigned long ga, ar_t ar, void *data,</div><div class='ctx'>  * address-space mode.</div><div class='ctx'>  */</div><div class='ctx'> static inline __must_check</div><div class='del'>-int read_guest_instr(struct kvm_vcpu *vcpu, void *data, unsigned long len)</div><div class='add'>+int read_guest_instr(struct kvm_vcpu *vcpu, unsigned long ga, void *data,</div><div class='add'>+		     unsigned long len)</div><div class='ctx'> {</div><div class='del'>-	return access_guest(vcpu, vcpu-&gt;arch.sie_block-&gt;gpsw.addr, 0, data, len,</div><div class='del'>-			    GACC_IFETCH);</div><div class='add'>+	return access_guest(vcpu, ga, 0, data, len, GACC_IFETCH);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/s390/kvm/guestdbg.c b/arch/s390/kvm/guestdbg.c<br/>index d7c6a7f53ced..23d9a4e12da1 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kvm/guestdbg.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kvm/guestdbg.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kvm/guestdbg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/guestdbg.c</a></div><div class='hunk'>@@ -388,14 +388,13 @@ void kvm_s390_prepare_debug_exit(struct kvm_vcpu *vcpu)</div><div class='ctx'> #define per_write_wp_event(code) \</div><div class='ctx'> 			(code &amp; (PER_CODE_STORE | PER_CODE_STORE_REAL))</div><div class='ctx'> </div><div class='del'>-static int debug_exit_required(struct kvm_vcpu *vcpu)</div><div class='add'>+static int debug_exit_required(struct kvm_vcpu *vcpu, u8 perc,</div><div class='add'>+			       unsigned long peraddr)</div><div class='ctx'> {</div><div class='del'>-	u8 perc = vcpu-&gt;arch.sie_block-&gt;perc;</div><div class='ctx'> 	struct kvm_debug_exit_arch *debug_exit = &amp;vcpu-&gt;run-&gt;debug.arch;</div><div class='ctx'> 	struct kvm_hw_wp_info_arch *wp_info = NULL;</div><div class='ctx'> 	struct kvm_hw_bp_info_arch *bp_info = NULL;</div><div class='ctx'> 	unsigned long addr = vcpu-&gt;arch.sie_block-&gt;gpsw.addr;</div><div class='del'>-	unsigned long peraddr = vcpu-&gt;arch.sie_block-&gt;peraddr;</div><div class='ctx'> </div><div class='ctx'> 	if (guestdbg_hw_bp_enabled(vcpu)) {</div><div class='ctx'> 		if (per_write_wp_event(perc) &amp;&amp;</div><div class='hunk'>@@ -437,36 +436,118 @@ exit_required:</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int per_fetched_addr(struct kvm_vcpu *vcpu, unsigned long *addr)</div><div class='add'>+{</div><div class='add'>+	u8 exec_ilen = 0;</div><div class='add'>+	u16 opcode[3];</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (vcpu-&gt;arch.sie_block-&gt;icptcode == ICPT_PROGI) {</div><div class='add'>+		/* PER address references the fetched or the execute instr */</div><div class='add'>+		*addr = vcpu-&gt;arch.sie_block-&gt;peraddr;</div><div class='add'>+		/*</div><div class='add'>+		 * Manually detect if we have an EXECUTE instruction. As</div><div class='add'>+		 * instructions are always 2 byte aligned we can read the</div><div class='add'>+		 * first two bytes unconditionally</div><div class='add'>+		 */</div><div class='add'>+		rc = read_guest_instr(vcpu, *addr, &amp;opcode, 2);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		if (opcode[0] &gt;&gt; 8 == 0x44)</div><div class='add'>+			exec_ilen = 4;</div><div class='add'>+		if ((opcode[0] &amp; 0xff0f) == 0xc600)</div><div class='add'>+			exec_ilen = 6;</div><div class='add'>+	} else {</div><div class='add'>+		/* instr was suppressed, calculate the responsible instr */</div><div class='add'>+		*addr = __rewind_psw(vcpu-&gt;arch.sie_block-&gt;gpsw,</div><div class='add'>+				     kvm_s390_get_ilen(vcpu));</div><div class='add'>+		if (vcpu-&gt;arch.sie_block-&gt;icptstatus &amp; 0x01) {</div><div class='add'>+			exec_ilen = (vcpu-&gt;arch.sie_block-&gt;icptstatus &amp; 0x60) &gt;&gt; 4;</div><div class='add'>+			if (!exec_ilen)</div><div class='add'>+				exec_ilen = 4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (exec_ilen) {</div><div class='add'>+		/* read the complete EXECUTE instr to detect the fetched addr */</div><div class='add'>+		rc = read_guest_instr(vcpu, *addr, &amp;opcode, exec_ilen);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		if (exec_ilen == 6) {</div><div class='add'>+			/* EXECUTE RELATIVE LONG - RIL-b format */</div><div class='add'>+			s32 rl = *((s32 *) (opcode + 1));</div><div class='add'>+</div><div class='add'>+			/* rl is a _signed_ 32 bit value specifying halfwords */</div><div class='add'>+			*addr += (u64)(s64) rl * 2;</div><div class='add'>+		} else {</div><div class='add'>+			/* EXECUTE - RX-a format */</div><div class='add'>+			u32 base = (opcode[1] &amp; 0xf000) &gt;&gt; 12;</div><div class='add'>+			u32 disp = opcode[1] &amp; 0x0fff;</div><div class='add'>+			u32 index = opcode[0] &amp; 0x000f;</div><div class='add'>+</div><div class='add'>+			*addr = base ? vcpu-&gt;run-&gt;s.regs.gprs[base] : 0;</div><div class='add'>+			*addr += index ? vcpu-&gt;run-&gt;s.regs.gprs[index] : 0;</div><div class='add'>+			*addr += disp;</div><div class='add'>+		}</div><div class='add'>+		*addr = kvm_s390_logical_to_effective(vcpu, *addr);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define guest_per_enabled(vcpu) \</div><div class='ctx'> 			     (vcpu-&gt;arch.sie_block-&gt;gpsw.mask &amp; PSW_MASK_PER)</div><div class='ctx'> </div><div class='ctx'> int kvm_s390_handle_per_ifetch_icpt(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='add'>+	const u64 cr10 = vcpu-&gt;arch.sie_block-&gt;gcr[10];</div><div class='add'>+	const u64 cr11 = vcpu-&gt;arch.sie_block-&gt;gcr[11];</div><div class='ctx'> 	const u8 ilen = kvm_s390_get_ilen(vcpu);</div><div class='ctx'> 	struct kvm_s390_pgm_info pgm_info = {</div><div class='ctx'> 		.code = PGM_PER,</div><div class='ctx'> 		.per_code = PER_CODE_IFETCH,</div><div class='ctx'> 		.per_address = __rewind_psw(vcpu-&gt;arch.sie_block-&gt;gpsw, ilen),</div><div class='ctx'> 	};</div><div class='add'>+	unsigned long fetched_addr;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The PSW points to the next instruction, therefore the intercepted</div><div class='ctx'> 	 * instruction generated a PER i-fetch event. PER address therefore</div><div class='ctx'> 	 * points at the previous PSW address (could be an EXECUTE function).</div><div class='ctx'> 	 */</div><div class='del'>-	return kvm_s390_inject_prog_irq(vcpu, &amp;pgm_info);</div><div class='add'>+	if (!guestdbg_enabled(vcpu))</div><div class='add'>+		return kvm_s390_inject_prog_irq(vcpu, &amp;pgm_info);</div><div class='add'>+</div><div class='add'>+	if (debug_exit_required(vcpu, pgm_info.per_code, pgm_info.per_address))</div><div class='add'>+		vcpu-&gt;guest_debug |= KVM_GUESTDBG_EXIT_PENDING;</div><div class='add'>+</div><div class='add'>+	if (!guest_per_enabled(vcpu) ||</div><div class='add'>+	    !(vcpu-&gt;arch.sie_block-&gt;gcr[9] &amp; PER_EVENT_IFETCH))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = per_fetched_addr(vcpu, &amp;fetched_addr);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	if (rc)</div><div class='add'>+		/* instruction-fetching exceptions */</div><div class='add'>+		return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);</div><div class='add'>+</div><div class='add'>+	if (in_addr_range(fetched_addr, cr10, cr11))</div><div class='add'>+		return kvm_s390_inject_prog_irq(vcpu, &amp;pgm_info);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void filter_guest_per_event(struct kvm_vcpu *vcpu)</div><div class='add'>+static int filter_guest_per_event(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	const u8 perc = vcpu-&gt;arch.sie_block-&gt;perc;</div><div class='del'>-	u64 peraddr = vcpu-&gt;arch.sie_block-&gt;peraddr;</div><div class='ctx'> 	u64 addr = vcpu-&gt;arch.sie_block-&gt;gpsw.addr;</div><div class='ctx'> 	u64 cr9 = vcpu-&gt;arch.sie_block-&gt;gcr[9];</div><div class='ctx'> 	u64 cr10 = vcpu-&gt;arch.sie_block-&gt;gcr[10];</div><div class='ctx'> 	u64 cr11 = vcpu-&gt;arch.sie_block-&gt;gcr[11];</div><div class='ctx'> 	/* filter all events, demanded by the guest */</div><div class='ctx'> 	u8 guest_perc = perc &amp; (cr9 &gt;&gt; 24) &amp; PER_CODE_MASK;</div><div class='add'>+	unsigned long fetched_addr;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!guest_per_enabled(vcpu))</div><div class='ctx'> 		guest_perc = 0;</div><div class='hunk'>@@ -478,9 +559,17 @@ static void filter_guest_per_event(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		guest_perc &amp;= ~PER_CODE_BRANCH;</div><div class='ctx'> </div><div class='ctx'> 	/* filter "instruction-fetching" events */</div><div class='del'>-	if (guest_perc &amp; PER_CODE_IFETCH &amp;&amp;</div><div class='del'>-	    !in_addr_range(peraddr, cr10, cr11))</div><div class='del'>-		guest_perc &amp;= ~PER_CODE_IFETCH;</div><div class='add'>+	if (guest_perc &amp; PER_CODE_IFETCH) {</div><div class='add'>+		rc = per_fetched_addr(vcpu, &amp;fetched_addr);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+		/*</div><div class='add'>+		 * Don't inject an irq on exceptions. This would make handling</div><div class='add'>+		 * on icpt code 8 very complex (as PSW was already rewound).</div><div class='add'>+		 */</div><div class='add'>+		if (rc || !in_addr_range(fetched_addr, cr10, cr11))</div><div class='add'>+			guest_perc &amp;= ~PER_CODE_IFETCH;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* All other PER events will be given to the guest */</div><div class='ctx'> 	/* TODO: Check altered address/address space */</div><div class='hunk'>@@ -489,6 +578,7 @@ static void filter_guest_per_event(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	if (!guest_perc)</div><div class='ctx'> 		vcpu-&gt;arch.sie_block-&gt;iprcc &amp;= ~PGM_PER;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define pssec(vcpu) (vcpu-&gt;arch.sie_block-&gt;gcr[1] &amp; _ASCE_SPACE_SWITCH)</div><div class='hunk'>@@ -496,14 +586,17 @@ static void filter_guest_per_event(struct kvm_vcpu *vcpu)</div><div class='ctx'> #define old_ssec(vcpu) ((vcpu-&gt;arch.sie_block-&gt;tecmc &gt;&gt; 31) &amp; 0x1)</div><div class='ctx'> #define old_as_is_home(vcpu) !(vcpu-&gt;arch.sie_block-&gt;tecmc &amp; 0xffff)</div><div class='ctx'> </div><div class='del'>-void kvm_s390_handle_per_event(struct kvm_vcpu *vcpu)</div><div class='add'>+int kvm_s390_handle_per_event(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	int new_as;</div><div class='add'>+	int rc, new_as;</div><div class='ctx'> </div><div class='del'>-	if (debug_exit_required(vcpu))</div><div class='add'>+	if (debug_exit_required(vcpu, vcpu-&gt;arch.sie_block-&gt;perc,</div><div class='add'>+				vcpu-&gt;arch.sie_block-&gt;peraddr))</div><div class='ctx'> 		vcpu-&gt;guest_debug |= KVM_GUESTDBG_EXIT_PENDING;</div><div class='ctx'> </div><div class='del'>-	filter_guest_per_event(vcpu);</div><div class='add'>+	rc = filter_guest_per_event(vcpu);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only RP, SAC, SACF, PT, PTI, PR, PC instructions can trigger</div><div class='hunk'>@@ -532,4 +625,5 @@ void kvm_s390_handle_per_event(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		    (pssec(vcpu) || old_ssec(vcpu)))</div><div class='ctx'> 			vcpu-&gt;arch.sie_block-&gt;iprcc = PGM_SPACE_SWITCH;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c<br/>index 7a27eebab28a..59920f96ebc0 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kvm/intercept.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kvm/intercept.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kvm/intercept.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/intercept.c</a></div><div class='hunk'>@@ -238,7 +238,9 @@ static int handle_prog(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	vcpu-&gt;stat.exit_program_interruption++;</div><div class='ctx'> </div><div class='ctx'> 	if (guestdbg_enabled(vcpu) &amp;&amp; per_event(vcpu)) {</div><div class='del'>-		kvm_s390_handle_per_event(vcpu);</div><div class='add'>+		rc = kvm_s390_handle_per_event(vcpu);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='ctx'> 		/* the interrupt might have been filtered out completely */</div><div class='ctx'> 		if (vcpu-&gt;arch.sie_block-&gt;iprcc == 0)</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -359,6 +361,9 @@ static int handle_partial_execution(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> static int handle_operexc(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='add'>+	psw_t oldpsw, newpsw;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='ctx'> 	vcpu-&gt;stat.exit_operation_exception++;</div><div class='ctx'> 	trace_kvm_s390_handle_operexc(vcpu, vcpu-&gt;arch.sie_block-&gt;ipa,</div><div class='ctx'> 				      vcpu-&gt;arch.sie_block-&gt;ipb);</div><div class='hunk'>@@ -369,6 +374,24 @@ static int handle_operexc(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;arch.sie_block-&gt;ipa == 0 &amp;&amp; vcpu-&gt;kvm-&gt;arch.user_instr0)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='add'>+	rc = read_guest_lc(vcpu, __LC_PGM_NEW_PSW, &amp;newpsw, sizeof(psw_t));</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	/*</div><div class='add'>+	 * Avoid endless loops of operation exceptions, if the pgm new</div><div class='add'>+	 * PSW will cause a new operation exception.</div><div class='add'>+	 * The heuristic checks if the pgm new psw is within 6 bytes before</div><div class='add'>+	 * the faulting psw address (with same DAT, AS settings) and the</div><div class='add'>+	 * new psw is not a wait psw and the fault was not triggered by</div><div class='add'>+	 * problem state.</div><div class='add'>+	 */</div><div class='add'>+	oldpsw = vcpu-&gt;arch.sie_block-&gt;gpsw;</div><div class='add'>+	if (oldpsw.addr - newpsw.addr &lt;= 6 &amp;&amp;</div><div class='add'>+	    !(newpsw.mask &amp; PSW_MASK_WAIT) &amp;&amp;</div><div class='add'>+	    !(oldpsw.mask &amp; PSW_MASK_PSTATE) &amp;&amp;</div><div class='add'>+	    (newpsw.mask &amp; PSW_MASK_ASC) == (oldpsw.mask &amp; PSW_MASK_ASC) &amp;&amp;</div><div class='add'>+	    (newpsw.mask &amp; PSW_MASK_DAT) == (oldpsw.mask &amp; PSW_MASK_DAT))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	return kvm_s390_inject_program_int(vcpu, PGM_OPERATION);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c<br/>index be4db07f70d3..0f8f14199734 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kvm/interrupt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kvm/interrupt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kvm/interrupt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/interrupt.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/dis.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/sclp.h&gt;</div><div class='ctx'> #include &lt;asm/isc.h&gt;</div><div class='ctx'> #include &lt;asm/gmap.h&gt;</div><div class='hunk'>@@ -415,7 +415,7 @@ static int __write_machine_check(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	mci.val = mchk-&gt;mcic;</div><div class='del'>-	/* take care of lazy register loading via vcpu load/put */</div><div class='add'>+	/* take care of lazy register loading */</div><div class='ctx'> 	save_fpu_regs();</div><div class='ctx'> 	save_access_regs(vcpu-&gt;run-&gt;s.regs.acrs);</div><div class='ctx'> </div><div class='hunk'>@@ -1019,7 +1019,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	__set_cpu_idle(vcpu);</div><div class='del'>-	hrtimer_start(&amp;vcpu-&gt;arch.ckc_timer, ktime_set (0, sltime) , HRTIMER_MODE_REL);</div><div class='add'>+	hrtimer_start(&amp;vcpu-&gt;arch.ckc_timer, sltime, HRTIMER_MODE_REL);</div><div class='ctx'> 	VCPU_EVENT(vcpu, 4, "enabled wait: %llu ns", sltime);</div><div class='ctx'> no_timer:</div><div class='ctx'> 	srcu_read_unlock(&amp;vcpu-&gt;kvm-&gt;srcu, vcpu-&gt;srcu_idx);</div><div class='head'>diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c<br/>index 9c7a1ecfe6bd..fd6cd05bb6a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kvm/kvm-s390.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kvm/kvm-s390.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kvm/kvm-s390.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/kvm-s390.c</a></div><div class='hunk'>@@ -23,11 +23,14 @@</div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> #include &lt;asm/stp.h&gt;</div><div class='hunk'>@@ -217,7 +220,7 @@ static void allow_cpu_feat(unsigned long nr)</div><div class='ctx'> static inline int plo_test_bit(unsigned char nr)</div><div class='ctx'> {</div><div class='ctx'> 	register unsigned long r0 asm("0") = (unsigned long) nr | 0x100;</div><div class='del'>-	int cc = 3; /* subfunction not available */</div><div class='add'>+	int cc;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile(</div><div class='ctx'> 		/* Parameter registers are ignored for "test bit" */</div><div class='hunk'>@@ -370,6 +373,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> 	case KVM_CAP_S390_IRQCHIP:</div><div class='ctx'> 	case KVM_CAP_VM_ATTRIBUTES:</div><div class='ctx'> 	case KVM_CAP_MP_STATE:</div><div class='add'>+	case KVM_CAP_IMMEDIATE_EXIT:</div><div class='ctx'> 	case KVM_CAP_S390_INJECT_IRQ:</div><div class='ctx'> 	case KVM_CAP_S390_USER_SIGP:</div><div class='ctx'> 	case KVM_CAP_S390_USER_STSI:</div><div class='hunk'>@@ -442,6 +446,9 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,</div><div class='ctx'> 	struct kvm_memory_slot *memslot;</div><div class='ctx'> 	int is_dirty = 0;</div><div class='ctx'> </div><div class='add'>+	if (kvm_is_ucontrol(kvm))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;kvm-&gt;slots_lock);</div><div class='ctx'> </div><div class='ctx'> 	r = -EINVAL;</div><div class='hunk'>@@ -505,6 +512,14 @@ static int kvm_vm_ioctl_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap)</div><div class='ctx'> 		} else if (MACHINE_HAS_VX) {</div><div class='ctx'> 			set_kvm_facility(kvm-&gt;arch.model.fac_mask, 129);</div><div class='ctx'> 			set_kvm_facility(kvm-&gt;arch.model.fac_list, 129);</div><div class='add'>+			if (test_facility(134)) {</div><div class='add'>+				set_kvm_facility(kvm-&gt;arch.model.fac_mask, 134);</div><div class='add'>+				set_kvm_facility(kvm-&gt;arch.model.fac_list, 134);</div><div class='add'>+			}</div><div class='add'>+			if (test_facility(135)) {</div><div class='add'>+				set_kvm_facility(kvm-&gt;arch.model.fac_mask, 135);</div><div class='add'>+				set_kvm_facility(kvm-&gt;arch.model.fac_list, 135);</div><div class='add'>+			}</div><div class='ctx'> 			r = 0;</div><div class='ctx'> 		} else</div><div class='ctx'> 			r = -EINVAL;</div><div class='hunk'>@@ -821,6 +836,13 @@ static int kvm_s390_set_processor(struct kvm *kvm, struct kvm_device_attr *attr)</div><div class='ctx'> 		}</div><div class='ctx'> 		memcpy(kvm-&gt;arch.model.fac_list, proc-&gt;fac_list,</div><div class='ctx'> 		       S390_ARCH_FAC_LIST_SIZE_BYTE);</div><div class='add'>+		VM_EVENT(kvm, 3, "SET: guest ibc: 0x%4.4x, guest cpuid: 0x%16.16llx",</div><div class='add'>+			 kvm-&gt;arch.model.ibc,</div><div class='add'>+			 kvm-&gt;arch.model.cpuid);</div><div class='add'>+		VM_EVENT(kvm, 3, "SET: guest faclist: 0x%16.16llx.%16.16llx.%16.16llx",</div><div class='add'>+			 kvm-&gt;arch.model.fac_list[0],</div><div class='add'>+			 kvm-&gt;arch.model.fac_list[1],</div><div class='add'>+			 kvm-&gt;arch.model.fac_list[2]);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 	kfree(proc);</div><div class='hunk'>@@ -894,6 +916,13 @@ static int kvm_s390_get_processor(struct kvm *kvm, struct kvm_device_attr *attr)</div><div class='ctx'> 	proc-&gt;ibc = kvm-&gt;arch.model.ibc;</div><div class='ctx'> 	memcpy(&amp;proc-&gt;fac_list, kvm-&gt;arch.model.fac_list,</div><div class='ctx'> 	       S390_ARCH_FAC_LIST_SIZE_BYTE);</div><div class='add'>+	VM_EVENT(kvm, 3, "GET: guest ibc: 0x%4.4x, guest cpuid: 0x%16.16llx",</div><div class='add'>+		 kvm-&gt;arch.model.ibc,</div><div class='add'>+		 kvm-&gt;arch.model.cpuid);</div><div class='add'>+	VM_EVENT(kvm, 3, "GET: guest faclist: 0x%16.16llx.%16.16llx.%16.16llx",</div><div class='add'>+		 kvm-&gt;arch.model.fac_list[0],</div><div class='add'>+		 kvm-&gt;arch.model.fac_list[1],</div><div class='add'>+		 kvm-&gt;arch.model.fac_list[2]);</div><div class='ctx'> 	if (copy_to_user((void __user *)attr-&gt;addr, proc, sizeof(*proc)))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 	kfree(proc);</div><div class='hunk'>@@ -916,7 +945,18 @@ static int kvm_s390_get_machine(struct kvm *kvm, struct kvm_device_attr *attr)</div><div class='ctx'> 	memcpy(&amp;mach-&gt;fac_mask, kvm-&gt;arch.model.fac_mask,</div><div class='ctx'> 	       S390_ARCH_FAC_LIST_SIZE_BYTE);</div><div class='ctx'> 	memcpy((unsigned long *)&amp;mach-&gt;fac_list, S390_lowcore.stfle_fac_list,</div><div class='del'>-	       S390_ARCH_FAC_LIST_SIZE_BYTE);</div><div class='add'>+	       sizeof(S390_lowcore.stfle_fac_list));</div><div class='add'>+	VM_EVENT(kvm, 3, "GET: host ibc:  0x%4.4x, host cpuid:  0x%16.16llx",</div><div class='add'>+		 kvm-&gt;arch.model.ibc,</div><div class='add'>+		 kvm-&gt;arch.model.cpuid);</div><div class='add'>+	VM_EVENT(kvm, 3, "GET: host facmask:  0x%16.16llx.%16.16llx.%16.16llx",</div><div class='add'>+		 mach-&gt;fac_mask[0],</div><div class='add'>+		 mach-&gt;fac_mask[1],</div><div class='add'>+		 mach-&gt;fac_mask[2]);</div><div class='add'>+	VM_EVENT(kvm, 3, "GET: host faclist:  0x%16.16llx.%16.16llx.%16.16llx",</div><div class='add'>+		 mach-&gt;fac_list[0],</div><div class='add'>+		 mach-&gt;fac_list[1],</div><div class='add'>+		 mach-&gt;fac_list[2]);</div><div class='ctx'> 	if (copy_to_user((void __user *)attr-&gt;addr, mach, sizeof(*mach)))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 	kfree(mach);</div><div class='hunk'>@@ -1437,7 +1477,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)</div><div class='ctx'> </div><div class='ctx'> 	/* Populate the facility mask initially. */</div><div class='ctx'> 	memcpy(kvm-&gt;arch.model.fac_mask, S390_lowcore.stfle_fac_list,</div><div class='del'>-	       S390_ARCH_FAC_LIST_SIZE_BYTE);</div><div class='add'>+	       sizeof(S390_lowcore.stfle_fac_list));</div><div class='ctx'> 	for (i = 0; i &lt; S390_ARCH_FAC_LIST_SIZE_U64; i++) {</div><div class='ctx'> 		if (i &lt; kvm_s390_fac_list_mask_size())</div><div class='ctx'> 			kvm-&gt;arch.model.fac_mask[i] &amp;= kvm_s390_fac_list_mask[i];</div><div class='hunk'>@@ -1812,22 +1852,7 @@ __u64 kvm_s390_get_cpu_timer(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)</div><div class='ctx'> {</div><div class='del'>-	/* Save host register state */</div><div class='del'>-	save_fpu_regs();</div><div class='del'>-	vcpu-&gt;arch.host_fpregs.fpc = current-&gt;thread.fpu.fpc;</div><div class='del'>-	vcpu-&gt;arch.host_fpregs.regs = current-&gt;thread.fpu.regs;</div><div class='del'>-</div><div class='del'>-	if (MACHINE_HAS_VX)</div><div class='del'>-		current-&gt;thread.fpu.regs = vcpu-&gt;run-&gt;s.regs.vrs;</div><div class='del'>-	else</div><div class='del'>-		current-&gt;thread.fpu.regs = vcpu-&gt;run-&gt;s.regs.fprs;</div><div class='del'>-	current-&gt;thread.fpu.fpc = vcpu-&gt;run-&gt;s.regs.fpc;</div><div class='del'>-	if (test_fp_ctl(current-&gt;thread.fpu.fpc))</div><div class='del'>-		/* User space provided an invalid FPC, let's clear it */</div><div class='del'>-		current-&gt;thread.fpu.fpc = 0;</div><div class='ctx'> </div><div class='del'>-	save_access_regs(vcpu-&gt;arch.host_acrs);</div><div class='del'>-	restore_access_regs(vcpu-&gt;run-&gt;s.regs.acrs);</div><div class='ctx'> 	gmap_enable(vcpu-&gt;arch.enabled_gmap);</div><div class='ctx'> 	atomic_or(CPUSTAT_RUNNING, &amp;vcpu-&gt;arch.sie_block-&gt;cpuflags);</div><div class='ctx'> 	if (vcpu-&gt;arch.cputm_enabled &amp;&amp; !is_vcpu_idle(vcpu))</div><div class='hunk'>@@ -1844,16 +1869,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	vcpu-&gt;arch.enabled_gmap = gmap_get_enabled();</div><div class='ctx'> 	gmap_disable(vcpu-&gt;arch.enabled_gmap);</div><div class='ctx'> </div><div class='del'>-	/* Save guest register state */</div><div class='del'>-	save_fpu_regs();</div><div class='del'>-	vcpu-&gt;run-&gt;s.regs.fpc = current-&gt;thread.fpu.fpc;</div><div class='del'>-</div><div class='del'>-	/* Restore host register state */</div><div class='del'>-	current-&gt;thread.fpu.fpc = vcpu-&gt;arch.host_fpregs.fpc;</div><div class='del'>-	current-&gt;thread.fpu.regs = vcpu-&gt;arch.host_fpregs.regs;</div><div class='del'>-</div><div class='del'>-	save_access_regs(vcpu-&gt;run-&gt;s.regs.acrs);</div><div class='del'>-	restore_access_regs(vcpu-&gt;arch.host_acrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -1963,6 +1978,8 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	if (test_kvm_facility(vcpu-&gt;kvm, 8) &amp;&amp; sclp.has_pfmfi)</div><div class='ctx'> 		vcpu-&gt;arch.sie_block-&gt;ecb2 |= 0x08;</div><div class='add'>+	if (test_kvm_facility(vcpu-&gt;kvm, 130))</div><div class='add'>+		vcpu-&gt;arch.sie_block-&gt;ecb2 |= 0x20;</div><div class='ctx'> 	vcpu-&gt;arch.sie_block-&gt;eca = 0x1002000U;</div><div class='ctx'> 	if (sclp.has_cei)</div><div class='ctx'> 		vcpu-&gt;arch.sie_block-&gt;eca |= 0x80000000U;</div><div class='hunk'>@@ -2243,7 +2260,6 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;vcpu-&gt;run-&gt;s.regs.acrs, &amp;sregs-&gt;acrs, sizeof(sregs-&gt;acrs));</div><div class='ctx'> 	memcpy(&amp;vcpu-&gt;arch.sie_block-&gt;gcr, &amp;sregs-&gt;crs, sizeof(sregs-&gt;crs));</div><div class='del'>-	restore_access_regs(vcpu-&gt;run-&gt;s.regs.acrs);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2257,11 +2273,9 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,</div><div class='ctx'> </div><div class='ctx'> int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)</div><div class='ctx'> {</div><div class='del'>-	/* make sure the new values will be lazily loaded */</div><div class='del'>-	save_fpu_regs();</div><div class='ctx'> 	if (test_fp_ctl(fpu-&gt;fpc))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	current-&gt;thread.fpu.fpc = fpu-&gt;fpc;</div><div class='add'>+	vcpu-&gt;run-&gt;s.regs.fpc = fpu-&gt;fpc;</div><div class='ctx'> 	if (MACHINE_HAS_VX)</div><div class='ctx'> 		convert_fp_to_vx((__vector128 *) vcpu-&gt;run-&gt;s.regs.vrs,</div><div class='ctx'> 				 (freg_t *) fpu-&gt;fprs);</div><div class='hunk'>@@ -2279,7 +2293,7 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)</div><div class='ctx'> 				 (__vector128 *) vcpu-&gt;run-&gt;s.regs.vrs);</div><div class='ctx'> 	else</div><div class='ctx'> 		memcpy(fpu-&gt;fprs, vcpu-&gt;run-&gt;s.regs.fprs, sizeof(fpu-&gt;fprs));</div><div class='del'>-	fpu-&gt;fpc = current-&gt;thread.fpu.fpc;</div><div class='add'>+	fpu-&gt;fpc = vcpu-&gt;run-&gt;s.regs.fpc;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2606,7 +2620,7 @@ static int vcpu_post_run_fault_in_sie(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	 * to look up the current opcode to get the length of the instruction</div><div class='ctx'> 	 * to be able to forward the PSW.</div><div class='ctx'> 	 */</div><div class='del'>-	rc = read_guest_instr(vcpu, &amp;opcode, 1);</div><div class='add'>+	rc = read_guest_instr(vcpu, vcpu-&gt;arch.sie_block-&gt;gpsw.addr, &amp;opcode, 1);</div><div class='ctx'> 	ilen = insn_length(opcode);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -2740,6 +2754,20 @@ static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 		if (riccb-&gt;valid)</div><div class='ctx'> 			vcpu-&gt;arch.sie_block-&gt;ecb3 |= 0x01;</div><div class='ctx'> 	}</div><div class='add'>+	save_access_regs(vcpu-&gt;arch.host_acrs);</div><div class='add'>+	restore_access_regs(vcpu-&gt;run-&gt;s.regs.acrs);</div><div class='add'>+	/* save host (userspace) fprs/vrs */</div><div class='add'>+	save_fpu_regs();</div><div class='add'>+	vcpu-&gt;arch.host_fpregs.fpc = current-&gt;thread.fpu.fpc;</div><div class='add'>+	vcpu-&gt;arch.host_fpregs.regs = current-&gt;thread.fpu.regs;</div><div class='add'>+	if (MACHINE_HAS_VX)</div><div class='add'>+		current-&gt;thread.fpu.regs = vcpu-&gt;run-&gt;s.regs.vrs;</div><div class='add'>+	else</div><div class='add'>+		current-&gt;thread.fpu.regs = vcpu-&gt;run-&gt;s.regs.fprs;</div><div class='add'>+	current-&gt;thread.fpu.fpc = vcpu-&gt;run-&gt;s.regs.fpc;</div><div class='add'>+	if (test_fp_ctl(current-&gt;thread.fpu.fpc))</div><div class='add'>+		/* User space provided an invalid FPC, let's clear it */</div><div class='add'>+		current-&gt;thread.fpu.fpc = 0;</div><div class='ctx'> </div><div class='ctx'> 	kvm_run-&gt;kvm_dirty_regs = 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2758,6 +2786,15 @@ static void store_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	kvm_run-&gt;s.regs.pft = vcpu-&gt;arch.pfault_token;</div><div class='ctx'> 	kvm_run-&gt;s.regs.pfs = vcpu-&gt;arch.pfault_select;</div><div class='ctx'> 	kvm_run-&gt;s.regs.pfc = vcpu-&gt;arch.pfault_compare;</div><div class='add'>+	save_access_regs(vcpu-&gt;run-&gt;s.regs.acrs);</div><div class='add'>+	restore_access_regs(vcpu-&gt;arch.host_acrs);</div><div class='add'>+	/* Save guest register state */</div><div class='add'>+	save_fpu_regs();</div><div class='add'>+	vcpu-&gt;run-&gt;s.regs.fpc = current-&gt;thread.fpu.fpc;</div><div class='add'>+	/* Restore will be done lazily at return */</div><div class='add'>+	current-&gt;thread.fpu.fpc = vcpu-&gt;arch.host_fpregs.fpc;</div><div class='add'>+	current-&gt;thread.fpu.regs = vcpu-&gt;arch.host_fpregs.regs;</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='hunk'>@@ -2765,6 +2802,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	sigset_t sigsaved;</div><div class='ctx'> </div><div class='add'>+	if (kvm_run-&gt;immediate_exit)</div><div class='add'>+		return -EINTR;</div><div class='add'>+</div><div class='ctx'> 	if (guestdbg_exit_pending(vcpu)) {</div><div class='ctx'> 		kvm_s390_prepare_debug_exit(vcpu);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -2874,7 +2914,7 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy</div><div class='del'>-	 * copying in vcpu load/put. Lets update our copies before we save</div><div class='add'>+	 * switch in the run ioctl. Let's update our copies before we save</div><div class='ctx'> 	 * it into the save area</div><div class='ctx'> 	 */</div><div class='ctx'> 	save_fpu_regs();</div><div class='head'>diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h<br/>index 3a4e97f1a9e6..af9fa91a0c91 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kvm/kvm-s390.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kvm/kvm-s390.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kvm/kvm-s390.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/kvm-s390.h</a></div><div class='hunk'>@@ -86,9 +86,7 @@ static inline void kvm_s390_set_prefix(struct kvm_vcpu *vcpu, u32 prefix)</div><div class='ctx'> 	kvm_make_request(KVM_REQ_MMU_RELOAD, vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-typedef u8 __bitwise ar_t;</div><div class='del'>-</div><div class='del'>-static inline u64 kvm_s390_get_base_disp_s(struct kvm_vcpu *vcpu, ar_t *ar)</div><div class='add'>+static inline u64 kvm_s390_get_base_disp_s(struct kvm_vcpu *vcpu, u8 *ar)</div><div class='ctx'> {</div><div class='ctx'> 	u32 base2 = vcpu-&gt;arch.sie_block-&gt;ipb &gt;&gt; 28;</div><div class='ctx'> 	u32 disp2 = ((vcpu-&gt;arch.sie_block-&gt;ipb &amp; 0x0fff0000) &gt;&gt; 16);</div><div class='hunk'>@@ -101,7 +99,7 @@ static inline u64 kvm_s390_get_base_disp_s(struct kvm_vcpu *vcpu, ar_t *ar)</div><div class='ctx'> </div><div class='ctx'> static inline void kvm_s390_get_base_disp_sse(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					      u64 *address1, u64 *address2,</div><div class='del'>-					      ar_t *ar_b1, ar_t *ar_b2)</div><div class='add'>+					      u8 *ar_b1, u8 *ar_b2)</div><div class='ctx'> {</div><div class='ctx'> 	u32 base1 = (vcpu-&gt;arch.sie_block-&gt;ipb &amp; 0xf0000000) &gt;&gt; 28;</div><div class='ctx'> 	u32 disp1 = (vcpu-&gt;arch.sie_block-&gt;ipb &amp; 0x0fff0000) &gt;&gt; 16;</div><div class='hunk'>@@ -125,7 +123,7 @@ static inline void kvm_s390_get_regs_rre(struct kvm_vcpu *vcpu, int *r1, int *r2</div><div class='ctx'> 		*r2 = (vcpu-&gt;arch.sie_block-&gt;ipb &amp; 0x000f0000) &gt;&gt; 16;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 kvm_s390_get_base_disp_rsy(struct kvm_vcpu *vcpu, ar_t *ar)</div><div class='add'>+static inline u64 kvm_s390_get_base_disp_rsy(struct kvm_vcpu *vcpu, u8 *ar)</div><div class='ctx'> {</div><div class='ctx'> 	u32 base2 = vcpu-&gt;arch.sie_block-&gt;ipb &gt;&gt; 28;</div><div class='ctx'> 	u32 disp2 = ((vcpu-&gt;arch.sie_block-&gt;ipb &amp; 0x0fff0000) &gt;&gt; 16) +</div><div class='hunk'>@@ -140,7 +138,7 @@ static inline u64 kvm_s390_get_base_disp_rsy(struct kvm_vcpu *vcpu, ar_t *ar)</div><div class='ctx'> 	return (base2 ? vcpu-&gt;run-&gt;s.regs.gprs[base2] : 0) + (long)(int)disp2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 kvm_s390_get_base_disp_rs(struct kvm_vcpu *vcpu, ar_t *ar)</div><div class='add'>+static inline u64 kvm_s390_get_base_disp_rs(struct kvm_vcpu *vcpu, u8 *ar)</div><div class='ctx'> {</div><div class='ctx'> 	u32 base2 = vcpu-&gt;arch.sie_block-&gt;ipb &gt;&gt; 28;</div><div class='ctx'> 	u32 disp2 = ((vcpu-&gt;arch.sie_block-&gt;ipb &amp; 0x0fff0000) &gt;&gt; 16);</div><div class='hunk'>@@ -379,7 +377,7 @@ int kvm_s390_import_bp_data(struct kvm_vcpu *vcpu,</div><div class='ctx'> void kvm_s390_clear_bp_data(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_s390_prepare_debug_exit(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_s390_handle_per_ifetch_icpt(struct kvm_vcpu *vcpu);</div><div class='del'>-void kvm_s390_handle_per_event(struct kvm_vcpu *vcpu);</div><div class='add'>+int kvm_s390_handle_per_event(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> /* support for Basic/Extended SCA handling */</div><div class='ctx'> static inline union ipte_control *kvm_s390_get_ipte_control(struct kvm *kvm)</div><div class='head'>diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c<br/>index e18435355c16..64b6a309f2c4 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kvm/priv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kvm/priv.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kvm/priv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/priv.c</a></div><div class='hunk'>@@ -15,6 +15,8 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/facility.h&gt;</div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='hunk'>@@ -54,7 +56,7 @@ int kvm_s390_handle_aa(struct kvm_vcpu *vcpu)</div><div class='ctx'> static int handle_set_clock(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> 	u64 op2, val;</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;arch.sie_block-&gt;gpsw.mask &amp; PSW_MASK_PSTATE)</div><div class='hunk'>@@ -79,7 +81,7 @@ static int handle_set_prefix(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u64 operand2;</div><div class='ctx'> 	u32 address;</div><div class='ctx'> 	int rc;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_spx++;</div><div class='ctx'> </div><div class='hunk'>@@ -117,7 +119,7 @@ static int handle_store_prefix(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u64 operand2;</div><div class='ctx'> 	u32 address;</div><div class='ctx'> 	int rc;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_stpx++;</div><div class='ctx'> </div><div class='hunk'>@@ -147,7 +149,7 @@ static int handle_store_cpu_address(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u16 vcpu_id = vcpu-&gt;vcpu_id;</div><div class='ctx'> 	u64 ga;</div><div class='ctx'> 	int rc;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_stap++;</div><div class='ctx'> </div><div class='hunk'>@@ -311,7 +313,7 @@ static int handle_sske(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);</div><div class='ctx'> 		start += PAGE_SIZE;</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (m3 &amp; (SSKE_MC | SSKE_MR)) {</div><div class='ctx'> 		if (m3 &amp; SSKE_MB) {</div><div class='hunk'>@@ -380,7 +382,7 @@ static int handle_tpi(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u32 tpi_data[3];</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	u64 addr;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	addr = kvm_s390_get_base_disp_s(vcpu, &amp;ar);</div><div class='ctx'> 	if (addr &amp; 3)</div><div class='hunk'>@@ -548,7 +550,7 @@ int kvm_s390_handle_lpsw(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	psw_compat_t new_psw;</div><div class='ctx'> 	u64 addr;</div><div class='ctx'> 	int rc;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	if (gpsw-&gt;mask &amp; PSW_MASK_PSTATE)</div><div class='ctx'> 		return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);</div><div class='hunk'>@@ -575,7 +577,7 @@ static int handle_lpswe(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	psw_t new_psw;</div><div class='ctx'> 	u64 addr;</div><div class='ctx'> 	int rc;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;arch.sie_block-&gt;gpsw.mask &amp; PSW_MASK_PSTATE)</div><div class='ctx'> 		return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);</div><div class='hunk'>@@ -597,7 +599,7 @@ static int handle_stidp(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u64 stidp_data = vcpu-&gt;kvm-&gt;arch.model.cpuid;</div><div class='ctx'> 	u64 operand2;</div><div class='ctx'> 	int rc;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_stidp++;</div><div class='ctx'> </div><div class='hunk'>@@ -644,7 +646,7 @@ static void handle_stsi_3_2_2(struct kvm_vcpu *vcpu, struct sysinfo_3_2_2 *mem)</div><div class='ctx'> 	ASCEBC(mem-&gt;vm[0].cpi, 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void insert_stsi_usr_data(struct kvm_vcpu *vcpu, u64 addr, ar_t ar,</div><div class='add'>+static void insert_stsi_usr_data(struct kvm_vcpu *vcpu, u64 addr, u8 ar,</div><div class='ctx'> 				 u8 fc, u8 sel1, u16 sel2)</div><div class='ctx'> {</div><div class='ctx'> 	vcpu-&gt;run-&gt;exit_reason = KVM_EXIT_S390_STSI;</div><div class='hunk'>@@ -663,7 +665,7 @@ static int handle_stsi(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	unsigned long mem = 0;</div><div class='ctx'> 	u64 operand2;</div><div class='ctx'> 	int rc = 0;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_stsi++;</div><div class='ctx'> 	VCPU_EVENT(vcpu, 3, "STSI: fc: %u sel1: %u sel2: %u", fc, sel1, sel2);</div><div class='hunk'>@@ -970,7 +972,7 @@ int kvm_s390_handle_lctl(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	int reg, rc, nr_regs;</div><div class='ctx'> 	u32 ctl_array[16];</div><div class='ctx'> 	u64 ga;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_lctl++;</div><div class='ctx'> </div><div class='hunk'>@@ -1009,7 +1011,7 @@ int kvm_s390_handle_stctl(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	int reg, rc, nr_regs;</div><div class='ctx'> 	u32 ctl_array[16];</div><div class='ctx'> 	u64 ga;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_stctl++;</div><div class='ctx'> </div><div class='hunk'>@@ -1043,7 +1045,7 @@ static int handle_lctlg(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	int reg, rc, nr_regs;</div><div class='ctx'> 	u64 ctl_array[16];</div><div class='ctx'> 	u64 ga;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_lctlg++;</div><div class='ctx'> </div><div class='hunk'>@@ -1081,7 +1083,7 @@ static int handle_stctg(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	int reg, rc, nr_regs;</div><div class='ctx'> 	u64 ctl_array[16];</div><div class='ctx'> 	u64 ga;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_stctg++;</div><div class='ctx'> </div><div class='hunk'>@@ -1132,7 +1134,7 @@ static int handle_tprot(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	unsigned long hva, gpa;</div><div class='ctx'> 	int ret = 0, cc = 0;</div><div class='ctx'> 	bool writable;</div><div class='del'>-	ar_t ar;</div><div class='add'>+	u8 ar;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;stat.instruction_tprot++;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c<br/>index d8673e243f13..5491be39776b 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/kvm/vsie.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/kvm/vsie.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/kvm/vsie.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/kvm/vsie.c</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/gmap.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/sclp.h&gt;</div><div class='hunk'>@@ -324,6 +326,9 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)</div><div class='ctx'> 	/* Run-time-Instrumentation */</div><div class='ctx'> 	if (test_kvm_facility(vcpu-&gt;kvm, 64))</div><div class='ctx'> 		scb_s-&gt;ecb3 |= scb_o-&gt;ecb3 &amp; 0x01U;</div><div class='add'>+	/* Instruction Execution Prevention */</div><div class='add'>+	if (test_kvm_facility(vcpu-&gt;kvm, 130))</div><div class='add'>+		scb_s-&gt;ecb2 |= scb_o-&gt;ecb2 &amp; 0x20U;</div><div class='ctx'> 	if (test_kvm_cpu_feat(vcpu-&gt;kvm, KVM_S390_VM_CPU_FEAT_SIIF))</div><div class='ctx'> 		scb_s-&gt;eca |= scb_o-&gt;eca &amp; 0x00000001U;</div><div class='ctx'> 	if (test_kvm_cpu_feat(vcpu-&gt;kvm, KVM_S390_VM_CPU_FEAT_IB))</div><div class='hunk'>@@ -899,7 +904,7 @@ static int vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)</div><div class='ctx'> 		if (rc || scb_s-&gt;icptcode || signal_pending(current) ||</div><div class='ctx'> 		    kvm_s390_vcpu_has_irq(vcpu, 0))</div><div class='ctx'> 			break;</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (rc == -EFAULT) {</div><div class='ctx'> 		/*</div><div class='head'>diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c<br/>index 501dcd4ca4a0..92e90e40b6fb 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/lib/delay.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/lib/delay.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/lib/delay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/lib/delay.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/irqflags.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='head'>diff --git a/arch/s390/lib/mem.S b/arch/s390/lib/mem.S<br/>index be9fa65bfac4..7ff79a4ff00c 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/lib/mem.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/lib/mem.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/lib/mem.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/lib/mem.S</a></div><div class='hunk'>@@ -8,6 +8,43 @@</div><div class='ctx'> #include &lt;asm/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * void *memmove(void *dest, const void *src, size_t n)</div><div class='add'>+ */</div><div class='add'>+ENTRY(memmove)</div><div class='add'>+	ltgr	%r4,%r4</div><div class='add'>+	lgr	%r1,%r2</div><div class='add'>+	bzr	%r14</div><div class='add'>+	aghi	%r4,-1</div><div class='add'>+	clgr	%r2,%r3</div><div class='add'>+	jnh	.Lmemmove_forward</div><div class='add'>+	la	%r5,1(%r4,%r3)</div><div class='add'>+	clgr	%r2,%r5</div><div class='add'>+	jl	.Lmemmove_reverse</div><div class='add'>+.Lmemmove_forward:</div><div class='add'>+	srlg	%r0,%r4,8</div><div class='add'>+	ltgr	%r0,%r0</div><div class='add'>+	jz	.Lmemmove_forward_remainder</div><div class='add'>+.Lmemmove_forward_loop:</div><div class='add'>+	mvc	0(256,%r1),0(%r3)</div><div class='add'>+	la	%r1,256(%r1)</div><div class='add'>+	la	%r3,256(%r3)</div><div class='add'>+	brctg	%r0,.Lmemmove_forward_loop</div><div class='add'>+.Lmemmove_forward_remainder:</div><div class='add'>+	larl	%r5,.Lmemmove_mvc</div><div class='add'>+	ex	%r4,0(%r5)</div><div class='add'>+	br	%r14</div><div class='add'>+.Lmemmove_reverse:</div><div class='add'>+	ic	%r0,0(%r4,%r3)</div><div class='add'>+	stc	%r0,0(%r4,%r1)</div><div class='add'>+	brctg	%r4,.Lmemmove_reverse</div><div class='add'>+	ic	%r0,0(%r4,%r3)</div><div class='add'>+	stc	%r0,0(%r4,%r1)</div><div class='add'>+	br	%r14</div><div class='add'>+.Lmemmove_mvc:</div><div class='add'>+	mvc	0(1,%r1),0(%r3)</div><div class='add'>+EXPORT_SYMBOL(memmove)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * memset implementation</div><div class='ctx'>  *</div><div class='ctx'>  * This code corresponds to the C construct below. We do distinguish</div><div class='hunk'>@@ -31,12 +68,12 @@ ENTRY(memset)</div><div class='ctx'> 	srlg	%r3,%r4,8</div><div class='ctx'> 	ltgr	%r3,%r3</div><div class='ctx'> 	lgr	%r1,%r2</div><div class='del'>-	jz	.Lmemset_clear_rest</div><div class='add'>+	jz	.Lmemset_clear_remainder</div><div class='ctx'> .Lmemset_clear_loop:</div><div class='ctx'> 	xc	0(256,%r1),0(%r1)</div><div class='ctx'> 	la	%r1,256(%r1)</div><div class='ctx'> 	brctg	%r3,.Lmemset_clear_loop</div><div class='del'>-.Lmemset_clear_rest:</div><div class='add'>+.Lmemset_clear_remainder:</div><div class='ctx'> 	larl	%r3,.Lmemset_xc</div><div class='ctx'> 	ex	%r4,0(%r3)</div><div class='ctx'> 	br	%r14</div><div class='hunk'>@@ -48,12 +85,12 @@ ENTRY(memset)</div><div class='ctx'> 	aghi	%r4,-2</div><div class='ctx'> 	srlg	%r3,%r4,8</div><div class='ctx'> 	ltgr	%r3,%r3</div><div class='del'>-	jz	.Lmemset_fill_rest</div><div class='add'>+	jz	.Lmemset_fill_remainder</div><div class='ctx'> .Lmemset_fill_loop:</div><div class='ctx'> 	mvc	1(256,%r1),0(%r1)</div><div class='ctx'> 	la	%r1,256(%r1)</div><div class='ctx'> 	brctg	%r3,.Lmemset_fill_loop</div><div class='del'>-.Lmemset_fill_rest:</div><div class='add'>+.Lmemset_fill_remainder:</div><div class='ctx'> 	larl	%r3,.Lmemset_mvc</div><div class='ctx'> 	ex	%r4,0(%r3)</div><div class='ctx'> 	br	%r14</div><div class='hunk'>@@ -76,7 +113,7 @@ ENTRY(memcpy)</div><div class='ctx'> 	ltgr	%r5,%r5</div><div class='ctx'> 	lgr	%r1,%r2</div><div class='ctx'> 	jnz	.Lmemcpy_loop</div><div class='del'>-.Lmemcpy_rest:</div><div class='add'>+.Lmemcpy_remainder:</div><div class='ctx'> 	larl	%r5,.Lmemcpy_mvc</div><div class='ctx'> 	ex	%r4,0(%r5)</div><div class='ctx'> 	br	%r14</div><div class='hunk'>@@ -85,7 +122,7 @@ ENTRY(memcpy)</div><div class='ctx'> 	la	%r1,256(%r1)</div><div class='ctx'> 	la	%r3,256(%r3)</div><div class='ctx'> 	brctg	%r5,.Lmemcpy_loop</div><div class='del'>-	j	.Lmemcpy_rest</div><div class='add'>+	j	.Lmemcpy_remainder</div><div class='ctx'> .Lmemcpy_mvc:</div><div class='ctx'> 	mvc	0(1,%r1),0(%r3)</div><div class='ctx'> EXPORT_SYMBOL(memcpy)</div><div class='head'>diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c<br/>index e5f50a7d2f4e..ba427eb6f14c 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/lib/spinlock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/lib/spinlock.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/lib/spinlock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/lib/spinlock.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -37,15 +37,6 @@ static inline void _raw_compare_and_delay(unsigned int *lock, unsigned int old)</div><div class='ctx'> 	asm(".insn rsy,0xeb0000000022,%0,0,%1" : : "d" (old), "Q" (*lock));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int cpu_is_preempted(int cpu)</div><div class='del'>-{</div><div class='del'>-	if (test_cpu_flag_of(CIF_ENABLED_WAIT, cpu))</div><div class='del'>-		return 0;</div><div class='del'>-	if (smp_vcpu_scheduled(cpu))</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void arch_spin_lock_wait(arch_spinlock_t *lp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = SPINLOCK_LOCKVAL;</div><div class='hunk'>@@ -62,7 +53,7 @@ void arch_spin_lock_wait(arch_spinlock_t *lp)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* First iteration: check if the lock owner is running. */</div><div class='del'>-		if (first_diag &amp;&amp; cpu_is_preempted(~owner)) {</div><div class='add'>+		if (first_diag &amp;&amp; arch_vcpu_is_preempted(~owner)) {</div><div class='ctx'> 			smp_yield_cpu(~owner);</div><div class='ctx'> 			first_diag = 0;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -81,7 +72,7 @@ void arch_spin_lock_wait(arch_spinlock_t *lp)</div><div class='ctx'> 		 * yield the CPU unconditionally. For LPAR rely on the</div><div class='ctx'> 		 * sense running status.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!MACHINE_IS_LPAR || cpu_is_preempted(~owner)) {</div><div class='add'>+		if (!MACHINE_IS_LPAR || arch_vcpu_is_preempted(~owner)) {</div><div class='ctx'> 			smp_yield_cpu(~owner);</div><div class='ctx'> 			first_diag = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -108,7 +99,7 @@ void arch_spin_lock_wait_flags(arch_spinlock_t *lp, unsigned long flags)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Check if the lock owner is running. */</div><div class='del'>-		if (first_diag &amp;&amp; cpu_is_preempted(~owner)) {</div><div class='add'>+		if (first_diag &amp;&amp; arch_vcpu_is_preempted(~owner)) {</div><div class='ctx'> 			smp_yield_cpu(~owner);</div><div class='ctx'> 			first_diag = 0;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -127,7 +118,7 @@ void arch_spin_lock_wait_flags(arch_spinlock_t *lp, unsigned long flags)</div><div class='ctx'> 		 * yield the CPU unconditionally. For LPAR rely on the</div><div class='ctx'> 		 * sense running status.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!MACHINE_IS_LPAR || cpu_is_preempted(~owner)) {</div><div class='add'>+		if (!MACHINE_IS_LPAR || arch_vcpu_is_preempted(~owner)) {</div><div class='ctx'> 			smp_yield_cpu(~owner);</div><div class='ctx'> 			first_diag = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -142,7 +133,7 @@ int arch_spin_trylock_retry(arch_spinlock_t *lp)</div><div class='ctx'> 	int count;</div><div class='ctx'> </div><div class='ctx'> 	for (count = spin_retry; count &gt; 0; count--) {</div><div class='del'>-		owner = ACCESS_ONCE(lp-&gt;lock);</div><div class='add'>+		owner = READ_ONCE(lp-&gt;lock);</div><div class='ctx'> 		/* Try to get the lock if it is free. */</div><div class='ctx'> 		if (!owner) {</div><div class='ctx'> 			if (_raw_compare_and_swap(&amp;lp-&gt;lock, 0, cpu))</div><div class='hunk'>@@ -165,7 +156,7 @@ void _raw_read_lock_wait(arch_rwlock_t *rw)</div><div class='ctx'> 	owner = 0;</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (count-- &lt;= 0) {</div><div class='del'>-			if (owner &amp;&amp; cpu_is_preempted(~owner))</div><div class='add'>+			if (owner &amp;&amp; arch_vcpu_is_preempted(~owner))</div><div class='ctx'> 				smp_yield_cpu(~owner);</div><div class='ctx'> 			count = spin_retry;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -211,7 +202,7 @@ void _raw_write_lock_wait(arch_rwlock_t *rw, unsigned int prev)</div><div class='ctx'> 	owner = 0;</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (count-- &lt;= 0) {</div><div class='del'>-			if (owner &amp;&amp; cpu_is_preempted(~owner))</div><div class='add'>+			if (owner &amp;&amp; arch_vcpu_is_preempted(~owner))</div><div class='ctx'> 				smp_yield_cpu(~owner);</div><div class='ctx'> 			count = spin_retry;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -241,7 +232,7 @@ void _raw_write_lock_wait(arch_rwlock_t *rw)</div><div class='ctx'> 	owner = 0;</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (count-- &lt;= 0) {</div><div class='del'>-			if (owner &amp;&amp; cpu_is_preempted(~owner))</div><div class='add'>+			if (owner &amp;&amp; arch_vcpu_is_preempted(~owner))</div><div class='ctx'> 				smp_yield_cpu(~owner);</div><div class='ctx'> 			count = spin_retry;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -285,7 +276,7 @@ void arch_lock_relax(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	if (!cpu)</div><div class='ctx'> 		return;</div><div class='del'>-	if (MACHINE_IS_LPAR &amp;&amp; !cpu_is_preempted(~cpu))</div><div class='add'>+	if (MACHINE_IS_LPAR &amp;&amp; !arch_vcpu_is_preempted(~cpu))</div><div class='ctx'> 		return;</div><div class='ctx'> 	smp_yield_cpu(~cpu);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/lib/string.c b/arch/s390/lib/string.c<br/>index 48352bffbc92..4ee27339c792 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/lib/string.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/lib/string.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/lib/string.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/lib/string.c</a></div><div class='hunk'>@@ -9,7 +9,8 @@</div><div class='ctx'> #define IN_ARCH_STRING_C 1</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Helper functions to find the end of a string</div><div class='hunk'>@@ -20,7 +21,7 @@ static inline char *__strend(const char *s)</div><div class='ctx'> </div><div class='ctx'> 	asm volatile ("0: srst  %0,%1\n"</div><div class='ctx'> 		      "   jo    0b"</div><div class='del'>-		      : "+d" (r0), "+a" (s) :  : "cc" );</div><div class='add'>+		      : "+d" (r0), "+a" (s) :  : "cc", "memory");</div><div class='ctx'> 	return (char *) r0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -31,7 +32,7 @@ static inline char *__strnend(const char *s, size_t n)</div><div class='ctx'> </div><div class='ctx'> 	asm volatile ("0: srst  %0,%1\n"</div><div class='ctx'> 		      "   jo    0b"</div><div class='del'>-		      : "+d" (p), "+a" (s) : "d" (r0) : "cc" );</div><div class='add'>+		      : "+d" (p), "+a" (s) : "d" (r0) : "cc", "memory");</div><div class='ctx'> 	return (char *) p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -213,7 +214,7 @@ int strcmp(const char *cs, const char *ct)</div><div class='ctx'> 		      "   sr   %0,%1\n"</div><div class='ctx'> 		      "1:"</div><div class='ctx'> 		      : "+d" (ret), "+d" (r0), "+a" (cs), "+a" (ct)</div><div class='del'>-		      : : "cc" );</div><div class='add'>+		      : : "cc", "memory");</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(strcmp);</div><div class='hunk'>@@ -250,7 +251,7 @@ static inline int clcle(const char *s1, unsigned long l1,</div><div class='ctx'> 		      "   ipm   %0\n"</div><div class='ctx'> 		      "   srl   %0,28"</div><div class='ctx'> 		      : "=&amp;d" (cc), "+a" (r2), "+a" (r3),</div><div class='del'>-			"+a" (r4), "+a" (r5) : : "cc");</div><div class='add'>+			"+a" (r4), "+a" (r5) : : "cc", "memory");</div><div class='ctx'> 	return cc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -298,7 +299,7 @@ void *memchr(const void *s, int c, size_t n)</div><div class='ctx'> 		      "   jl	1f\n"</div><div class='ctx'> 		      "   la    %0,0\n"</div><div class='ctx'> 		      "1:"</div><div class='del'>-		      : "+a" (ret), "+&amp;a" (s) : "d" (r0) : "cc" );</div><div class='add'>+		      : "+a" (ret), "+&amp;a" (s) : "d" (r0) : "cc", "memory");</div><div class='ctx'> 	return (void *) ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(memchr);</div><div class='hunk'>@@ -336,7 +337,7 @@ void *memscan(void *s, int c, size_t n)</div><div class='ctx'> </div><div class='ctx'> 	asm volatile ("0: srst  %0,%1\n"</div><div class='ctx'> 		      "   jo    0b\n"</div><div class='del'>-		      : "+a" (ret), "+&amp;a" (s) : "d" (r0) : "cc" );</div><div class='add'>+		      : "+a" (ret), "+&amp;a" (s) : "d" (r0) : "cc", "memory");</div><div class='ctx'> 	return (void *) ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(memscan);</div><div class='head'>diff --git a/arch/s390/lib/xor.c b/arch/s390/lib/xor.c<br/>index 7d94e3ec34a9..b4fd05c36151 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/lib/xor.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/lib/xor.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/lib/xor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/lib/xor.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/raid/xor.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void xor_xc_2(unsigned long bytes, unsigned long *p1, unsigned long *p2)</div><div class='head'>diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c<br/>index 79ddd580d605..829c63dbc81a 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/cmm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/cmm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/cmm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/cmm.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='head'>diff --git a/arch/s390/mm/dump_pagetables.c b/arch/s390/mm/dump_pagetables.c<br/>index 861880df12c7..1b553d847140 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/dump_pagetables.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/dump_pagetables.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/dump_pagetables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/dump_pagetables.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -49,8 +49,8 @@ static void print_prot(struct seq_file *m, unsigned int pr, int level)</div><div class='ctx'> 		seq_printf(m, "I\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	seq_printf(m, "%s", pr &amp; _PAGE_PROTECT ? "RO " : "RW ");</div><div class='del'>-	seq_putc(m, '\n');</div><div class='add'>+	seq_puts(m, (pr &amp; _PAGE_PROTECT) ? "RO " : "RW ");</div><div class='add'>+	seq_puts(m, (pr &amp; _PAGE_NOEXEC) ? "NX\n" : "X\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void note_page(struct seq_file *m, struct pg_state *st,</div><div class='hunk'>@@ -117,7 +117,8 @@ static void walk_pte_level(struct seq_file *m, struct pg_state *st,</div><div class='ctx'> 	for (i = 0; i &lt; PTRS_PER_PTE &amp;&amp; addr &lt; max_addr; i++) {</div><div class='ctx'> 		st-&gt;current_address = addr;</div><div class='ctx'> 		pte = pte_offset_kernel(pmd, addr);</div><div class='del'>-		prot = pte_val(*pte) &amp; (_PAGE_PROTECT | _PAGE_INVALID);</div><div class='add'>+		prot = pte_val(*pte) &amp;</div><div class='add'>+			(_PAGE_PROTECT | _PAGE_INVALID | _PAGE_NOEXEC);</div><div class='ctx'> 		note_page(m, st, prot, 4);</div><div class='ctx'> 		addr += PAGE_SIZE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -135,7 +136,9 @@ static void walk_pmd_level(struct seq_file *m, struct pg_state *st,</div><div class='ctx'> 		pmd = pmd_offset(pud, addr);</div><div class='ctx'> 		if (!pmd_none(*pmd)) {</div><div class='ctx'> 			if (pmd_large(*pmd)) {</div><div class='del'>-				prot = pmd_val(*pmd) &amp; _SEGMENT_ENTRY_PROTECT;</div><div class='add'>+				prot = pmd_val(*pmd) &amp;</div><div class='add'>+					(_SEGMENT_ENTRY_PROTECT |</div><div class='add'>+					 _SEGMENT_ENTRY_NOEXEC);</div><div class='ctx'> 				note_page(m, st, prot, 3);</div><div class='ctx'> 			} else</div><div class='ctx'> 				walk_pte_level(m, st, pmd, addr);</div><div class='hunk'>@@ -157,7 +160,9 @@ static void walk_pud_level(struct seq_file *m, struct pg_state *st,</div><div class='ctx'> 		pud = pud_offset(pgd, addr);</div><div class='ctx'> 		if (!pud_none(*pud))</div><div class='ctx'> 			if (pud_large(*pud)) {</div><div class='del'>-				prot = pud_val(*pud) &amp; _REGION_ENTRY_PROTECT;</div><div class='add'>+				prot = pud_val(*pud) &amp;</div><div class='add'>+					(_REGION_ENTRY_PROTECT |</div><div class='add'>+					 _REGION_ENTRY_NOEXEC);</div><div class='ctx'> 				note_page(m, st, prot, 2);</div><div class='ctx'> 			} else</div><div class='ctx'> 				walk_pmd_level(m, st, pud, addr);</div><div class='hunk'>@@ -183,6 +188,7 @@ static void walk_pgd_level(struct seq_file *m)</div><div class='ctx'> 		else</div><div class='ctx'> 			note_page(m, &amp;st, _PAGE_INVALID, 1);</div><div class='ctx'> 		addr += PGDIR_SIZE;</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Flush out the last page */</div><div class='ctx'> 	st.current_address = max_addr;</div><div class='head'>diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c<br/>index 02042b6b66bf..9f118629b55f 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/extmem.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/extmem.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/extmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/extmem.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -122,7 +122,7 @@ dcss_set_subcodes(void)</div><div class='ctx'> 		"1:	la	%2,3\n"</div><div class='ctx'> 		"2:\n"</div><div class='ctx'> 		EX_TABLE(0b, 1b)</div><div class='del'>-		: "+d" (rx), "+d" (ry), "=d" (rc) : : "cc");</div><div class='add'>+		: "+d" (rx), "+d" (ry), "=d" (rc) : : "cc", "memory");</div><div class='ctx'> </div><div class='ctx'> 	kfree(name);</div><div class='ctx'> 	/* Diag x'64' new subcodes are supported, set to new subcodes */</div><div class='hunk'>@@ -154,7 +154,7 @@ dcss_mkname(char *name, char *dcss_name)</div><div class='ctx'> 		if (name[i] == '\0')</div><div class='ctx'> 			break;</div><div class='ctx'> 		dcss_name[i] = toupper(name[i]);</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> 	for (; i &lt; 8; i++)</div><div class='ctx'> 		dcss_name[i] = ' ';</div><div class='ctx'> 	ASCEBC(dcss_name, 8);</div><div class='head'>diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c<br/>index 661d9fe63c43..5845d3028ffc 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/fault.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -311,12 +312,34 @@ static noinline void do_sigbus(struct pt_regs *regs)</div><div class='ctx'> 	force_sig_info(SIGBUS, &amp;si, tsk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline void do_fault_error(struct pt_regs *regs, int fault)</div><div class='add'>+static noinline int signal_return(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	u16 instruction;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = __get_user(instruction, (u16 __user *) regs-&gt;psw.addr);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	if (instruction == 0x0a77) {</div><div class='add'>+		set_pt_regs_flag(regs, PIF_SYSCALL);</div><div class='add'>+		regs-&gt;int_code = 0x00040077;</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (instruction == 0x0aad) {</div><div class='add'>+		set_pt_regs_flag(regs, PIF_SYSCALL);</div><div class='add'>+		regs-&gt;int_code = 0x000400ad;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EACCES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline void do_fault_error(struct pt_regs *regs, int access, int fault)</div><div class='ctx'> {</div><div class='ctx'> 	int si_code;</div><div class='ctx'> </div><div class='ctx'> 	switch (fault) {</div><div class='ctx'> 	case VM_FAULT_BADACCESS:</div><div class='add'>+		if (access == VM_EXEC &amp;&amp; signal_return(regs) == 0)</div><div class='add'>+			break;</div><div class='ctx'> 	case VM_FAULT_BADMAP:</div><div class='ctx'> 		/* Bad memory access. Check if it is kernel or user space. */</div><div class='ctx'> 		if (user_mode(regs)) {</div><div class='hunk'>@@ -324,7 +347,7 @@ static noinline void do_fault_error(struct pt_regs *regs, int fault)</div><div class='ctx'> 			si_code = (fault == VM_FAULT_BADMAP) ?</div><div class='ctx'> 				SEGV_MAPERR : SEGV_ACCERR;</div><div class='ctx'> 			do_sigsegv(regs, si_code);</div><div class='del'>-			return;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	case VM_FAULT_BADCONTEXT:</div><div class='ctx'> 	case VM_FAULT_PFAULT:</div><div class='hunk'>@@ -525,7 +548,7 @@ out:</div><div class='ctx'> void do_protection_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long trans_exc_code;</div><div class='del'>-	int fault;</div><div class='add'>+	int access, fault;</div><div class='ctx'> </div><div class='ctx'> 	trans_exc_code = regs-&gt;int_parm_long;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -544,9 +567,17 @@ void do_protection_exception(struct pt_regs *regs)</div><div class='ctx'> 		do_low_address(regs);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	fault = do_exception(regs, VM_WRITE);</div><div class='add'>+	if (unlikely(MACHINE_HAS_NX &amp;&amp; (trans_exc_code &amp; 0x80))) {</div><div class='add'>+		regs-&gt;int_parm_long = (trans_exc_code &amp; ~PAGE_MASK) |</div><div class='add'>+					(regs-&gt;psw.addr &amp; PAGE_MASK);</div><div class='add'>+		access = VM_EXEC;</div><div class='add'>+		fault = VM_FAULT_BADACCESS;</div><div class='add'>+	} else {</div><div class='add'>+		access = VM_WRITE;</div><div class='add'>+		fault = do_exception(regs, access);</div><div class='add'>+	}</div><div class='ctx'> 	if (unlikely(fault))</div><div class='del'>-		do_fault_error(regs, fault);</div><div class='add'>+		do_fault_error(regs, access, fault);</div><div class='ctx'> }</div><div class='ctx'> NOKPROBE_SYMBOL(do_protection_exception);</div><div class='ctx'> </div><div class='hunk'>@@ -557,7 +588,7 @@ void do_dat_exception(struct pt_regs *regs)</div><div class='ctx'> 	access = VM_READ | VM_EXEC | VM_WRITE;</div><div class='ctx'> 	fault = do_exception(regs, access);</div><div class='ctx'> 	if (unlikely(fault))</div><div class='del'>-		do_fault_error(regs, fault);</div><div class='add'>+		do_fault_error(regs, access, fault);</div><div class='ctx'> }</div><div class='ctx'> NOKPROBE_SYMBOL(do_dat_exception);</div><div class='ctx'> </div><div class='hunk'>@@ -733,6 +764,7 @@ block:</div><div class='ctx'> 			 * return to userspace schedule() to block. */</div><div class='ctx'> 			__set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 			set_tsk_need_resched(tsk);</div><div class='add'>+			set_preempt_need_resched();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='head'>diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c<br/>index 3ba622702ce4..a07b1ec1391d 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/gmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/gmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/gmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/gmap.c</a></div><div class='hunk'>@@ -359,8 +359,8 @@ static int __gmap_unlink_by_vmaddr(struct gmap *gmap, unsigned long vmaddr)</div><div class='ctx'> 	spin_lock(&amp;gmap-&gt;guest_table_lock);</div><div class='ctx'> 	entry = radix_tree_delete(&amp;gmap-&gt;host_to_guest, vmaddr &gt;&gt; PMD_SHIFT);</div><div class='ctx'> 	if (entry) {</div><div class='del'>-		flush = (*entry != _SEGMENT_ENTRY_INVALID);</div><div class='del'>-		*entry = _SEGMENT_ENTRY_INVALID;</div><div class='add'>+		flush = (*entry != _SEGMENT_ENTRY_EMPTY);</div><div class='add'>+		*entry = _SEGMENT_ENTRY_EMPTY;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;gmap-&gt;guest_table_lock);</div><div class='ctx'> 	return flush;</div><div class='hunk'>@@ -589,7 +589,7 @@ int __gmap_link(struct gmap *gmap, unsigned long gaddr, unsigned long vmaddr)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	ptl = pmd_lock(mm, pmd);</div><div class='ctx'> 	spin_lock(&amp;gmap-&gt;guest_table_lock);</div><div class='del'>-	if (*table == _SEGMENT_ENTRY_INVALID) {</div><div class='add'>+	if (*table == _SEGMENT_ENTRY_EMPTY) {</div><div class='ctx'> 		rc = radix_tree_insert(&amp;gmap-&gt;host_to_guest,</div><div class='ctx'> 				       vmaddr &gt;&gt; PMD_SHIFT, table);</div><div class='ctx'> 		if (!rc)</div><div class='hunk'>@@ -687,7 +687,7 @@ void gmap_discard(struct gmap *gmap, unsigned long from, unsigned long to)</div><div class='ctx'> 		/* Find vma in the parent mm */</div><div class='ctx'> 		vma = find_vma(gmap-&gt;mm, vmaddr);</div><div class='ctx'> 		size = min(to - gaddr, PMD_SIZE - (gaddr &amp; ~PMD_MASK));</div><div class='del'>-		zap_page_range(vma, vmaddr, size, NULL);</div><div class='add'>+		zap_page_range(vma, vmaddr, size);</div><div class='ctx'> 	}</div><div class='ctx'> 	up_read(&amp;gmap-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> }</div><div class='hunk'>@@ -1015,7 +1015,7 @@ static inline void gmap_insert_rmap(struct gmap *sg, unsigned long vmaddr,</div><div class='ctx'> 	if (slot) {</div><div class='ctx'> 		rmap-&gt;next = radix_tree_deref_slot_protected(slot,</div><div class='ctx'> 							&amp;sg-&gt;guest_table_lock);</div><div class='del'>-		radix_tree_replace_slot(slot, rmap);</div><div class='add'>+		radix_tree_replace_slot(&amp;sg-&gt;host_to_rmap, slot, rmap);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rmap-&gt;next = NULL;</div><div class='ctx'> 		radix_tree_insert(&amp;sg-&gt;host_to_rmap, vmaddr &gt;&gt; PAGE_SHIFT,</div><div class='head'>diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c<br/>index 4a0c5bce3552..9b4050caa4e9 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/hugetlbpage.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/hugetlbpage.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -59,8 +59,10 @@ static inline unsigned long __pte_to_rste(pte_t pte)</div><div class='ctx'> 		rste |= move_set_bit(pte_val(pte), _PAGE_SOFT_DIRTY,</div><div class='ctx'> 				     _SEGMENT_ENTRY_SOFT_DIRTY);</div><div class='ctx'> #endif</div><div class='add'>+		rste |= move_set_bit(pte_val(pte), _PAGE_NOEXEC,</div><div class='add'>+				     _SEGMENT_ENTRY_NOEXEC);</div><div class='ctx'> 	} else</div><div class='del'>-		rste = _SEGMENT_ENTRY_INVALID;</div><div class='add'>+		rste = _SEGMENT_ENTRY_EMPTY;</div><div class='ctx'> 	return rste;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -113,6 +115,8 @@ static inline pte_t __rste_to_pte(unsigned long rste)</div><div class='ctx'> 		pte_val(pte) |= move_set_bit(rste, _SEGMENT_ENTRY_SOFT_DIRTY,</div><div class='ctx'> 					     _PAGE_DIRTY);</div><div class='ctx'> #endif</div><div class='add'>+		pte_val(pte) |= move_set_bit(rste, _SEGMENT_ENTRY_NOEXEC,</div><div class='add'>+					     _PAGE_NOEXEC);</div><div class='ctx'> 	} else</div><div class='ctx'> 		pte_val(pte) = _PAGE_INVALID;</div><div class='ctx'> 	return pte;</div><div class='hunk'>@@ -121,7 +125,11 @@ static inline pte_t __rste_to_pte(unsigned long rste)</div><div class='ctx'> void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 		     pte_t *ptep, pte_t pte)</div><div class='ctx'> {</div><div class='del'>-	unsigned long rste = __pte_to_rste(pte);</div><div class='add'>+	unsigned long rste;</div><div class='add'>+</div><div class='add'>+	rste = __pte_to_rste(pte);</div><div class='add'>+	if (!MACHINE_HAS_NX)</div><div class='add'>+		rste &amp;= ~_SEGMENT_ENTRY_NOEXEC;</div><div class='ctx'> </div><div class='ctx'> 	/* Set correct table type for 2G hugepages */</div><div class='ctx'> 	if ((pte_val(*ptep) &amp; _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3)</div><div class='head'>diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c<br/>index b3e9d18f2ec6..ee5066718b21 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/init.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -137,6 +137,9 @@ void __init mem_init(void)</div><div class='ctx'> </div><div class='ctx'> void free_initmem(void)</div><div class='ctx'> {</div><div class='add'>+	__set_memory((unsigned long) _sinittext,</div><div class='add'>+		     (_einittext - _sinittext) &gt;&gt; PAGE_SHIFT,</div><div class='add'>+		     SET_MEMORY_RW | SET_MEMORY_NX);</div><div class='ctx'> 	free_initmem_default(POISON_FREE_INITMEM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -148,6 +151,15 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+unsigned long memory_block_size_bytes(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the memory block size is always greater</div><div class='add'>+	 * or equal than the memory increment size.</div><div class='add'>+	 */</div><div class='add'>+	return max_t(unsigned long, MIN_MEMORY_BLOCK_SIZE, sclp.rzm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTPLUG</div><div class='ctx'> int arch_add_memory(int nid, u64 start, u64 size, bool for_device)</div><div class='ctx'> {</div><div class='hunk'>@@ -191,15 +203,6 @@ int arch_add_memory(int nid, u64 start, u64 size, bool for_device)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned long memory_block_size_bytes(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure the memory block size is always greater</div><div class='del'>-	 * or equal than the memory increment size.</div><div class='del'>-	 */</div><div class='del'>-	return max_t(unsigned long, MIN_MEMORY_BLOCK_SIZE, sclp.rzm);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTREMOVE</div><div class='ctx'> int arch_remove_memory(u64 start, u64 size)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/s390/mm/mem_detect.c b/arch/s390/mm/mem_detect.c<br/>index d612cc3eec6a..e58dca05b962 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/mem_detect.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/mem_detect.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/mem_detect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/mem_detect.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='hunk'>@@ -19,6 +18,8 @@</div><div class='ctx'> </div><div class='ctx'> static inline void memblock_physmem_add(phys_addr_t start, phys_addr_t size)</div><div class='ctx'> {</div><div class='add'>+	memblock_dbg("memblock_physmem_add: [%#016llx-%#016llx]\n",</div><div class='add'>+		     start, start + size - 1);</div><div class='ctx'> 	memblock_add_range(&amp;memblock.memory, start, size, 0, 0);</div><div class='ctx'> 	memblock_add_range(&amp;memblock.physmem, start, size, 0, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -39,7 +40,8 @@ void __init detect_memory_memblock(void)</div><div class='ctx'> 	memblock_set_bottom_up(true);</div><div class='ctx'> 	do {</div><div class='ctx'> 		size = 0;</div><div class='del'>-		type = tprot(addr);</div><div class='add'>+		/* assume lowcore is writable */</div><div class='add'>+		type = addr ? tprot(addr) : CHUNK_READ_WRITE;</div><div class='ctx'> 		do {</div><div class='ctx'> 			size += rzm;</div><div class='ctx'> 			if (max_physmem_end &amp;&amp; addr + size &gt;= max_physmem_end)</div><div class='hunk'>@@ -55,4 +57,5 @@ void __init detect_memory_memblock(void)</div><div class='ctx'> 	memblock_set_bottom_up(false);</div><div class='ctx'> 	if (!max_physmem_end)</div><div class='ctx'> 		max_physmem_end = memblock_end_of_DRAM();</div><div class='add'>+	memblock_dump_all();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c<br/>index eb9df2822da1..50618614881f 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/mmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/mmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/mmap.c</a></div><div class='hunk'>@@ -26,11 +26,13 @@</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='add'>+#include &lt;asm/elf.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned long stack_maxrandom_size(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c<br/>index 44f150312a16..fc5dc33bb141 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/pageattr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/pageattr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/pageattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/pageattr.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Author(s): Jan Glauber &lt;jang@linux.vnet.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/facility.h&gt;</div><div class='hunk'>@@ -81,24 +80,24 @@ static void pgt_set(unsigned long *old, unsigned long new, unsigned long addr,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct cpa {</div><div class='del'>-	unsigned int set_ro	: 1;</div><div class='del'>-	unsigned int clear_ro	: 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int walk_pte_level(pmd_t *pmdp, unsigned long addr, unsigned long end,</div><div class='del'>-			  struct cpa cpa)</div><div class='add'>+			  unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	pte_t *ptep, new;</div><div class='ctx'> </div><div class='ctx'> 	ptep = pte_offset(pmdp, addr);</div><div class='ctx'> 	do {</div><div class='del'>-		if (pte_none(*ptep))</div><div class='add'>+		new = *ptep;</div><div class='add'>+		if (pte_none(new))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (cpa.set_ro)</div><div class='del'>-			new = pte_wrprotect(*ptep);</div><div class='del'>-		else if (cpa.clear_ro)</div><div class='del'>-			new = pte_mkwrite(pte_mkdirty(*ptep));</div><div class='add'>+		if (flags &amp; SET_MEMORY_RO)</div><div class='add'>+			new = pte_wrprotect(new);</div><div class='add'>+		else if (flags &amp; SET_MEMORY_RW)</div><div class='add'>+			new = pte_mkwrite(pte_mkdirty(new));</div><div class='add'>+		if ((flags &amp; SET_MEMORY_NX) &amp;&amp; MACHINE_HAS_NX)</div><div class='add'>+			pte_val(new) |= _PAGE_NOEXEC;</div><div class='add'>+		else if (flags &amp; SET_MEMORY_X)</div><div class='add'>+			pte_val(new) &amp;= ~_PAGE_NOEXEC;</div><div class='ctx'> 		pgt_set((unsigned long *)ptep, pte_val(new), addr, CRDTE_DTT_PAGE);</div><div class='ctx'> 		ptep++;</div><div class='ctx'> 		addr += PAGE_SIZE;</div><div class='hunk'>@@ -112,14 +111,17 @@ static int split_pmd_page(pmd_t *pmdp, unsigned long addr)</div><div class='ctx'> 	unsigned long pte_addr, prot;</div><div class='ctx'> 	pte_t *pt_dir, *ptep;</div><div class='ctx'> 	pmd_t new;</div><div class='del'>-	int i, ro;</div><div class='add'>+	int i, ro, nx;</div><div class='ctx'> </div><div class='ctx'> 	pt_dir = vmem_pte_alloc();</div><div class='ctx'> 	if (!pt_dir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	pte_addr = pmd_pfn(*pmdp) &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	ro = !!(pmd_val(*pmdp) &amp; _SEGMENT_ENTRY_PROTECT);</div><div class='add'>+	nx = !!(pmd_val(*pmdp) &amp; _SEGMENT_ENTRY_NOEXEC);</div><div class='ctx'> 	prot = pgprot_val(ro ? PAGE_KERNEL_RO : PAGE_KERNEL);</div><div class='add'>+	if (!nx)</div><div class='add'>+		prot &amp;= ~_PAGE_NOEXEC;</div><div class='ctx'> 	ptep = pt_dir;</div><div class='ctx'> 	for (i = 0; i &lt; PTRS_PER_PTE; i++) {</div><div class='ctx'> 		pte_val(*ptep) = pte_addr | prot;</div><div class='hunk'>@@ -133,19 +135,24 @@ static int split_pmd_page(pmd_t *pmdp, unsigned long addr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void modify_pmd_page(pmd_t *pmdp, unsigned long addr, struct cpa cpa)</div><div class='add'>+static void modify_pmd_page(pmd_t *pmdp, unsigned long addr,</div><div class='add'>+			    unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-	pmd_t new;</div><div class='del'>-</div><div class='del'>-	if (cpa.set_ro)</div><div class='del'>-		new = pmd_wrprotect(*pmdp);</div><div class='del'>-	else if (cpa.clear_ro)</div><div class='del'>-		new = pmd_mkwrite(pmd_mkdirty(*pmdp));</div><div class='add'>+	pmd_t new = *pmdp;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; SET_MEMORY_RO)</div><div class='add'>+		new = pmd_wrprotect(new);</div><div class='add'>+	else if (flags &amp; SET_MEMORY_RW)</div><div class='add'>+		new = pmd_mkwrite(pmd_mkdirty(new));</div><div class='add'>+	if ((flags &amp; SET_MEMORY_NX) &amp;&amp; MACHINE_HAS_NX)</div><div class='add'>+		pmd_val(new) |= _SEGMENT_ENTRY_NOEXEC;</div><div class='add'>+	else if (flags &amp; SET_MEMORY_X)</div><div class='add'>+		pmd_val(new) &amp;= ~_SEGMENT_ENTRY_NOEXEC;</div><div class='ctx'> 	pgt_set((unsigned long *)pmdp, pmd_val(new), addr, CRDTE_DTT_SEGMENT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int walk_pmd_level(pud_t *pudp, unsigned long addr, unsigned long end,</div><div class='del'>-			  struct cpa cpa)</div><div class='add'>+			  unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long next;</div><div class='ctx'> 	pmd_t *pmdp;</div><div class='hunk'>@@ -163,9 +170,9 @@ static int walk_pmd_level(pud_t *pudp, unsigned long addr, unsigned long end,</div><div class='ctx'> 					return rc;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			modify_pmd_page(pmdp, addr, cpa);</div><div class='add'>+			modify_pmd_page(pmdp, addr, flags);</div><div class='ctx'> 		} else {</div><div class='del'>-			rc = walk_pte_level(pmdp, addr, next, cpa);</div><div class='add'>+			rc = walk_pte_level(pmdp, addr, next, flags);</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				return rc;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -181,14 +188,17 @@ static int split_pud_page(pud_t *pudp, unsigned long addr)</div><div class='ctx'> 	unsigned long pmd_addr, prot;</div><div class='ctx'> 	pmd_t *pm_dir, *pmdp;</div><div class='ctx'> 	pud_t new;</div><div class='del'>-	int i, ro;</div><div class='add'>+	int i, ro, nx;</div><div class='ctx'> </div><div class='ctx'> 	pm_dir = vmem_pmd_alloc();</div><div class='ctx'> 	if (!pm_dir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	pmd_addr = pud_pfn(*pudp) &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	ro = !!(pud_val(*pudp) &amp; _REGION_ENTRY_PROTECT);</div><div class='add'>+	nx = !!(pud_val(*pudp) &amp; _REGION_ENTRY_NOEXEC);</div><div class='ctx'> 	prot = pgprot_val(ro ? SEGMENT_KERNEL_RO : SEGMENT_KERNEL);</div><div class='add'>+	if (!nx)</div><div class='add'>+		prot &amp;= ~_SEGMENT_ENTRY_NOEXEC;</div><div class='ctx'> 	pmdp = pm_dir;</div><div class='ctx'> 	for (i = 0; i &lt; PTRS_PER_PMD; i++) {</div><div class='ctx'> 		pmd_val(*pmdp) = pmd_addr | prot;</div><div class='hunk'>@@ -202,19 +212,24 @@ static int split_pud_page(pud_t *pudp, unsigned long addr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void modify_pud_page(pud_t *pudp, unsigned long addr, struct cpa cpa)</div><div class='add'>+static void modify_pud_page(pud_t *pudp, unsigned long addr,</div><div class='add'>+			    unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-	pud_t new;</div><div class='del'>-</div><div class='del'>-	if (cpa.set_ro)</div><div class='del'>-		new = pud_wrprotect(*pudp);</div><div class='del'>-	else if (cpa.clear_ro)</div><div class='del'>-		new = pud_mkwrite(pud_mkdirty(*pudp));</div><div class='add'>+	pud_t new = *pudp;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; SET_MEMORY_RO)</div><div class='add'>+		new = pud_wrprotect(new);</div><div class='add'>+	else if (flags &amp; SET_MEMORY_RW)</div><div class='add'>+		new = pud_mkwrite(pud_mkdirty(new));</div><div class='add'>+	if ((flags &amp; SET_MEMORY_NX) &amp;&amp; MACHINE_HAS_NX)</div><div class='add'>+		pud_val(new) |= _REGION_ENTRY_NOEXEC;</div><div class='add'>+	else if (flags &amp; SET_MEMORY_X)</div><div class='add'>+		pud_val(new) &amp;= ~_REGION_ENTRY_NOEXEC;</div><div class='ctx'> 	pgt_set((unsigned long *)pudp, pud_val(new), addr, CRDTE_DTT_REGION3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int walk_pud_level(pgd_t *pgd, unsigned long addr, unsigned long end,</div><div class='del'>-			  struct cpa cpa)</div><div class='add'>+			  unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long next;</div><div class='ctx'> 	pud_t *pudp;</div><div class='hunk'>@@ -232,9 +247,9 @@ static int walk_pud_level(pgd_t *pgd, unsigned long addr, unsigned long end,</div><div class='ctx'> 					break;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			modify_pud_page(pudp, addr, cpa);</div><div class='add'>+			modify_pud_page(pudp, addr, flags);</div><div class='ctx'> 		} else {</div><div class='del'>-			rc = walk_pmd_level(pudp, addr, next, cpa);</div><div class='add'>+			rc = walk_pmd_level(pudp, addr, next, flags);</div><div class='ctx'> 		}</div><div class='ctx'> 		pudp++;</div><div class='ctx'> 		addr = next;</div><div class='hunk'>@@ -246,7 +261,7 @@ static int walk_pud_level(pgd_t *pgd, unsigned long addr, unsigned long end,</div><div class='ctx'> static DEFINE_MUTEX(cpa_mutex);</div><div class='ctx'> </div><div class='ctx'> static int change_page_attr(unsigned long addr, unsigned long end,</div><div class='del'>-			    struct cpa cpa)</div><div class='add'>+			    unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long next;</div><div class='ctx'> 	int rc = -EINVAL;</div><div class='hunk'>@@ -262,7 +277,7 @@ static int change_page_attr(unsigned long addr, unsigned long end,</div><div class='ctx'> 		if (pgd_none(*pgdp))</div><div class='ctx'> 			break;</div><div class='ctx'> 		next = pgd_addr_end(addr, end);</div><div class='del'>-		rc = walk_pud_level(pgdp, addr, next, cpa);</div><div class='add'>+		rc = walk_pud_level(pgdp, addr, next, flags);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='ctx'> 		cond_resched();</div><div class='hunk'>@@ -271,35 +286,10 @@ static int change_page_attr(unsigned long addr, unsigned long end,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int set_memory_ro(unsigned long addr, int numpages)</div><div class='add'>+int __set_memory(unsigned long addr, int numpages, unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-	struct cpa cpa = {</div><div class='del'>-		.set_ro = 1,</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	addr &amp;= PAGE_MASK;</div><div class='del'>-	return change_page_attr(addr, addr + numpages * PAGE_SIZE, cpa);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int set_memory_rw(unsigned long addr, int numpages)</div><div class='del'>-{</div><div class='del'>-	struct cpa cpa = {</div><div class='del'>-		.clear_ro = 1,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	addr &amp;= PAGE_MASK;</div><div class='del'>-	return change_page_attr(addr, addr + numpages * PAGE_SIZE, cpa);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* not possible */</div><div class='del'>-int set_memory_nx(unsigned long addr, int numpages)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int set_memory_x(unsigned long addr, int numpages)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='add'>+	return change_page_attr(addr, addr + numpages * PAGE_SIZE, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='hunk'>@@ -339,7 +329,7 @@ void __kernel_map_pages(struct page *page, int numpages, int enable)</div><div class='ctx'> 		nr = min(numpages - i, nr);</div><div class='ctx'> 		if (enable) {</div><div class='ctx'> 			for (j = 0; j &lt; nr; j++) {</div><div class='del'>-				pte_val(*pte) = address | pgprot_val(PAGE_KERNEL);</div><div class='add'>+				pte_val(*pte) &amp;= ~_PAGE_INVALID;</div><div class='ctx'> 				address += PAGE_SIZE;</div><div class='ctx'> 				pte++;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c<br/>index 7a1897c51c54..b48dc5f1900b 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/pgtable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/pgtable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/pgtable.c</a></div><div class='hunk'>@@ -202,7 +202,7 @@ static inline pgste_t ptep_xchg_start(struct mm_struct *mm,</div><div class='ctx'> 	return pgste;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ptep_xchg_commit(struct mm_struct *mm,</div><div class='add'>+static inline pte_t ptep_xchg_commit(struct mm_struct *mm,</div><div class='ctx'> 				    unsigned long addr, pte_t *ptep,</div><div class='ctx'> 				    pgste_t pgste, pte_t old, pte_t new)</div><div class='ctx'> {</div><div class='hunk'>@@ -220,6 +220,7 @@ static inline void ptep_xchg_commit(struct mm_struct *mm,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*ptep = new;</div><div class='ctx'> 	}</div><div class='add'>+	return old;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> pte_t ptep_xchg_direct(struct mm_struct *mm, unsigned long addr,</div><div class='hunk'>@@ -231,7 +232,7 @@ pte_t ptep_xchg_direct(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	pgste = ptep_xchg_start(mm, addr, ptep);</div><div class='ctx'> 	old = ptep_flush_direct(mm, addr, ptep);</div><div class='del'>-	ptep_xchg_commit(mm, addr, ptep, pgste, old, new);</div><div class='add'>+	old = ptep_xchg_commit(mm, addr, ptep, pgste, old, new);</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> 	return old;</div><div class='ctx'> }</div><div class='hunk'>@@ -246,7 +247,7 @@ pte_t ptep_xchg_lazy(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	pgste = ptep_xchg_start(mm, addr, ptep);</div><div class='ctx'> 	old = ptep_flush_lazy(mm, addr, ptep);</div><div class='del'>-	ptep_xchg_commit(mm, addr, ptep, pgste, old, new);</div><div class='add'>+	old = ptep_xchg_commit(mm, addr, ptep, pgste, old, new);</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> 	return old;</div><div class='ctx'> }</div><div class='hunk'>@@ -274,6 +275,8 @@ void ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> {</div><div class='ctx'> 	pgste_t pgste;</div><div class='ctx'> </div><div class='add'>+	if (!MACHINE_HAS_NX)</div><div class='add'>+		pte_val(pte) &amp;= ~_PAGE_NOEXEC;</div><div class='ctx'> 	if (mm_has_pgste(mm)) {</div><div class='ctx'> 		pgste = pgste_get(ptep);</div><div class='ctx'> 		pgste_set_key(ptep, pgste, pte, mm);</div><div class='hunk'>@@ -741,7 +744,7 @@ int reset_guest_reference_bit(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> 	pgste_set_unlock(ptep, new);</div><div class='ctx'> 	pte_unmap_unlock(ptep, ptl);</div><div class='del'>-	return 0;</div><div class='add'>+	return cc;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(reset_guest_reference_bit);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c<br/>index 1848292766ef..60d38993f232 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/mm/vmem.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/mm/vmem.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/mm/vmem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/mm/vmem.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/pfn.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -34,7 +34,7 @@ static void __ref *vmem_alloc_pages(unsigned int order)</div><div class='ctx'> </div><div class='ctx'> 	if (slab_is_available())</div><div class='ctx'> 		return (void *)__get_free_pages(GFP_KERNEL, order);</div><div class='del'>-	return alloc_bootmem_align(size, size);</div><div class='add'>+	return (void *) memblock_alloc(size, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline pud_t *vmem_pud_alloc(void)</div><div class='hunk'>@@ -61,17 +61,16 @@ pmd_t *vmem_pmd_alloc(void)</div><div class='ctx'> </div><div class='ctx'> pte_t __ref *vmem_pte_alloc(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned long size = PTRS_PER_PTE * sizeof(pte_t);</div><div class='ctx'> 	pte_t *pte;</div><div class='ctx'> </div><div class='ctx'> 	if (slab_is_available())</div><div class='ctx'> 		pte = (pte_t *) page_table_alloc(&amp;init_mm);</div><div class='ctx'> 	else</div><div class='del'>-		pte = alloc_bootmem_align(PTRS_PER_PTE * sizeof(pte_t),</div><div class='del'>-					  PTRS_PER_PTE * sizeof(pte_t));</div><div class='add'>+		pte = (pte_t *) memblock_alloc(size, size);</div><div class='ctx'> 	if (!pte)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	clear_table((unsigned long *) pte, _PAGE_INVALID,</div><div class='del'>-		    PTRS_PER_PTE * sizeof(pte_t));</div><div class='add'>+	clear_table((unsigned long *) pte, _PAGE_INVALID, size);</div><div class='ctx'> 	return pte;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -80,6 +79,7 @@ pte_t __ref *vmem_pte_alloc(void)</div><div class='ctx'>  */</div><div class='ctx'> static int vmem_add_mem(unsigned long start, unsigned long size)</div><div class='ctx'> {</div><div class='add'>+	unsigned long pgt_prot, sgt_prot, r3_prot;</div><div class='ctx'> 	unsigned long pages4k, pages1m, pages2g;</div><div class='ctx'> 	unsigned long end = start + size;</div><div class='ctx'> 	unsigned long address = start;</div><div class='hunk'>@@ -89,6 +89,14 @@ static int vmem_add_mem(unsigned long start, unsigned long size)</div><div class='ctx'> 	pte_t *pt_dir;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	pgt_prot = pgprot_val(PAGE_KERNEL);</div><div class='add'>+	sgt_prot = pgprot_val(SEGMENT_KERNEL);</div><div class='add'>+	r3_prot = pgprot_val(REGION3_KERNEL);</div><div class='add'>+	if (!MACHINE_HAS_NX) {</div><div class='add'>+		pgt_prot &amp;= ~_PAGE_NOEXEC;</div><div class='add'>+		sgt_prot &amp;= ~_SEGMENT_ENTRY_NOEXEC;</div><div class='add'>+		r3_prot &amp;= ~_REGION_ENTRY_NOEXEC;</div><div class='add'>+	}</div><div class='ctx'> 	pages4k = pages1m = pages2g = 0;</div><div class='ctx'> 	while (address &lt; end) {</div><div class='ctx'> 		pg_dir = pgd_offset_k(address);</div><div class='hunk'>@@ -102,7 +110,7 @@ static int vmem_add_mem(unsigned long start, unsigned long size)</div><div class='ctx'> 		if (MACHINE_HAS_EDAT2 &amp;&amp; pud_none(*pu_dir) &amp;&amp; address &amp;&amp;</div><div class='ctx'> 		    !(address &amp; ~PUD_MASK) &amp;&amp; (address + PUD_SIZE &lt;= end) &amp;&amp;</div><div class='ctx'> 		     !debug_pagealloc_enabled()) {</div><div class='del'>-			pud_val(*pu_dir) = address | pgprot_val(REGION3_KERNEL);</div><div class='add'>+			pud_val(*pu_dir) = address | r3_prot;</div><div class='ctx'> 			address += PUD_SIZE;</div><div class='ctx'> 			pages2g++;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -117,7 +125,7 @@ static int vmem_add_mem(unsigned long start, unsigned long size)</div><div class='ctx'> 		if (MACHINE_HAS_EDAT1 &amp;&amp; pmd_none(*pm_dir) &amp;&amp; address &amp;&amp;</div><div class='ctx'> 		    !(address &amp; ~PMD_MASK) &amp;&amp; (address + PMD_SIZE &lt;= end) &amp;&amp;</div><div class='ctx'> 		    !debug_pagealloc_enabled()) {</div><div class='del'>-			pmd_val(*pm_dir) = address | pgprot_val(SEGMENT_KERNEL);</div><div class='add'>+			pmd_val(*pm_dir) = address | sgt_prot;</div><div class='ctx'> 			address += PMD_SIZE;</div><div class='ctx'> 			pages1m++;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -130,7 +138,7 @@ static int vmem_add_mem(unsigned long start, unsigned long size)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pt_dir = pte_offset_kernel(pm_dir, address);</div><div class='del'>-		pte_val(*pt_dir) = address |  pgprot_val(PAGE_KERNEL);</div><div class='add'>+		pte_val(*pt_dir) = address | pgt_prot;</div><div class='ctx'> 		address += PAGE_SIZE;</div><div class='ctx'> 		pages4k++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -201,6 +209,7 @@ static void vmem_remove_range(unsigned long start, unsigned long size)</div><div class='ctx'>  */</div><div class='ctx'> int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)</div><div class='ctx'> {</div><div class='add'>+	unsigned long pgt_prot, sgt_prot;</div><div class='ctx'> 	unsigned long address = start;</div><div class='ctx'> 	pgd_t *pg_dir;</div><div class='ctx'> 	pud_t *pu_dir;</div><div class='hunk'>@@ -208,6 +217,12 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)</div><div class='ctx'> 	pte_t *pt_dir;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	pgt_prot = pgprot_val(PAGE_KERNEL);</div><div class='add'>+	sgt_prot = pgprot_val(SEGMENT_KERNEL);</div><div class='add'>+	if (!MACHINE_HAS_NX) {</div><div class='add'>+		pgt_prot &amp;= ~_PAGE_NOEXEC;</div><div class='add'>+		sgt_prot &amp;= ~_SEGMENT_ENTRY_NOEXEC;</div><div class='add'>+	}</div><div class='ctx'> 	for (address = start; address &lt; end;) {</div><div class='ctx'> 		pg_dir = pgd_offset_k(address);</div><div class='ctx'> 		if (pgd_none(*pg_dir)) {</div><div class='hunk'>@@ -239,8 +254,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)</div><div class='ctx'> 				new_page = vmemmap_alloc_block(PMD_SIZE, node);</div><div class='ctx'> 				if (!new_page)</div><div class='ctx'> 					goto out;</div><div class='del'>-				pmd_val(*pm_dir) = __pa(new_page) |</div><div class='del'>-					_SEGMENT_ENTRY | _SEGMENT_ENTRY_LARGE;</div><div class='add'>+				pmd_val(*pm_dir) = __pa(new_page) | sgt_prot;</div><div class='ctx'> 				address = (address + PMD_SIZE) &amp; PMD_MASK;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -260,8 +274,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)</div><div class='ctx'> 			new_page = vmemmap_alloc_block(PAGE_SIZE, node);</div><div class='ctx'> 			if (!new_page)</div><div class='ctx'> 				goto out;</div><div class='del'>-			pte_val(*pt_dir) =</div><div class='del'>-				__pa(new_page) | pgprot_val(PAGE_KERNEL);</div><div class='add'>+			pte_val(*pt_dir) = __pa(new_page) | pgt_prot;</div><div class='ctx'> 		}</div><div class='ctx'> 		address += PAGE_SIZE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -373,13 +386,21 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> void __init vmem_map_init(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long size = _eshared - _stext;</div><div class='ctx'> 	struct memblock_region *reg;</div><div class='ctx'> </div><div class='ctx'> 	for_each_memblock(memory, reg)</div><div class='ctx'> 		vmem_add_mem(reg-&gt;base, reg-&gt;size);</div><div class='del'>-	set_memory_ro((unsigned long)_stext, size &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	pr_info("Write protected kernel read-only data: %luk\n", size &gt;&gt; 10);</div><div class='add'>+	__set_memory((unsigned long) _stext,</div><div class='add'>+		     (_etext - _stext) &gt;&gt; PAGE_SHIFT,</div><div class='add'>+		     SET_MEMORY_RO | SET_MEMORY_X);</div><div class='add'>+	__set_memory((unsigned long) _etext,</div><div class='add'>+		     (_eshared - _etext) &gt;&gt; PAGE_SHIFT,</div><div class='add'>+		     SET_MEMORY_RO);</div><div class='add'>+	__set_memory((unsigned long) _sinittext,</div><div class='add'>+		     (_einittext - _sinittext) &gt;&gt; PAGE_SHIFT,</div><div class='add'>+		     SET_MEMORY_RO | SET_MEMORY_X);</div><div class='add'>+	pr_info("Write protected kernel read-only data: %luk\n",</div><div class='add'>+		(_eshared - _stext) &gt;&gt; 10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c<br/>index bee281f3163d..4ecf6d687509 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/net/bpf_jit_comp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/net/bpf_jit_comp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/net/bpf_jit_comp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/net/bpf_jit_comp.c</a></div><div class='hunk'>@@ -981,7 +981,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i</div><div class='ctx'> 		EMIT2(0x0d00, REG_14, REG_W1);</div><div class='ctx'> 		/* lgr %b0,%r2: load return value into %b0 */</div><div class='ctx'> 		EMIT4(0xb9040000, BPF_REG_0, REG_2);</div><div class='del'>-		if (bpf_helper_changes_skb_data((void *)func)) {</div><div class='add'>+		if (bpf_helper_changes_pkt_data((void *)func)) {</div><div class='ctx'> 			jit-&gt;seen |= SEEN_SKB_CHANGE;</div><div class='ctx'> 			/* lg %b1,ST_OFF_SKBP(%r15) */</div><div class='ctx'> 			EMIT6_DISP_LH(0xe3000000, 0x0004, BPF_REG_1, REG_0,</div><div class='hunk'>@@ -1263,14 +1263,6 @@ static int bpf_jit_prog(struct bpf_jit *jit, struct bpf_prog *fp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Classic BPF function stub. BPF programs will be converted into</div><div class='del'>- * eBPF and then bpf_int_jit_compile() will be called.</div><div class='del'>- */</div><div class='del'>-void bpf_jit_compile(struct bpf_prog *fp)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Compile eBPF program "fp"</div><div class='ctx'>  */</div><div class='ctx'> struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)</div><div class='hunk'>@@ -1331,14 +1323,11 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bpf_jit_enable &gt; 1) {</div><div class='ctx'> 		bpf_jit_dump(fp-&gt;len, jit.size, pass, jit.prg_buf);</div><div class='del'>-		if (jit.prg_buf)</div><div class='del'>-			print_fn_code(jit.prg_buf, jit.size_prg);</div><div class='del'>-	}</div><div class='del'>-	if (jit.prg_buf) {</div><div class='del'>-		set_memory_ro((unsigned long)header, header-&gt;pages);</div><div class='del'>-		fp-&gt;bpf_func = (void *) jit.prg_buf;</div><div class='del'>-		fp-&gt;jited = 1;</div><div class='add'>+		print_fn_code(jit.prg_buf, jit.size_prg);</div><div class='ctx'> 	}</div><div class='add'>+	bpf_jit_binary_lock_ro(header);</div><div class='add'>+	fp-&gt;bpf_func = (void *) jit.prg_buf;</div><div class='add'>+	fp-&gt;jited = 1;</div><div class='ctx'> free_addrs:</div><div class='ctx'> 	kfree(jit.addrs);</div><div class='ctx'> out:</div><div class='hunk'>@@ -1347,21 +1336,3 @@ out:</div><div class='ctx'> 					   tmp : orig_fp);</div><div class='ctx'> 	return fp;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Free eBPF program</div><div class='del'>- */</div><div class='del'>-void bpf_jit_free(struct bpf_prog *fp)</div><div class='del'>-{</div><div class='del'>-	unsigned long addr = (unsigned long)fp-&gt;bpf_func &amp; PAGE_MASK;</div><div class='del'>-	struct bpf_binary_header *header = (void *)addr;</div><div class='del'>-</div><div class='del'>-	if (!fp-&gt;jited)</div><div class='del'>-		goto free_filter;</div><div class='del'>-</div><div class='del'>-	set_memory_rw(addr, header-&gt;pages);</div><div class='del'>-	bpf_jit_binary_free(header);</div><div class='del'>-</div><div class='del'>-free_filter:</div><div class='del'>-	bpf_prog_unlock_free(fp);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/s390/numa/mode_emu.c b/arch/s390/numa/mode_emu.c<br/>index 37e0bb835516..cfd08384f0ab 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/numa/mode_emu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/numa/mode_emu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/numa/mode_emu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/numa/mode_emu.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/node.h&gt;</div><div class='ctx'> #include &lt;linux/memory.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -307,13 +308,11 @@ fail:</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate and initialize core to node mapping</div><div class='ctx'>  */</div><div class='del'>-static void create_core_to_node_map(void)</div><div class='add'>+static void __ref create_core_to_node_map(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	emu_cores = kzalloc(sizeof(*emu_cores), GFP_KERNEL);</div><div class='del'>-	if (emu_cores == NULL)</div><div class='del'>-		panic("Could not allocate cores to node memory");</div><div class='add'>+	emu_cores = memblock_virt_alloc(sizeof(*emu_cores), 8);</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(emu_cores-&gt;to_node_id); i++)</div><div class='ctx'> 		emu_cores-&gt;to_node_id[i] = NODE_ID_FREE;</div><div class='ctx'> }</div><div class='hunk'>@@ -354,13 +353,13 @@ static struct toptree *toptree_from_topology(void)</div><div class='ctx'> </div><div class='ctx'> 	phys = toptree_new(TOPTREE_ID_PHYS, 1);</div><div class='ctx'> </div><div class='del'>-	for_each_online_cpu(cpu) {</div><div class='del'>-		top = &amp;per_cpu(cpu_topology, cpu);</div><div class='add'>+	for_each_cpu(cpu, &amp;cpus_with_topology) {</div><div class='add'>+		top = &amp;cpu_topology[cpu];</div><div class='ctx'> 		node = toptree_get_child(phys, 0);</div><div class='ctx'> 		drawer = toptree_get_child(node, top-&gt;drawer_id);</div><div class='ctx'> 		book = toptree_get_child(drawer, top-&gt;book_id);</div><div class='ctx'> 		mc = toptree_get_child(book, top-&gt;socket_id);</div><div class='del'>-		core = toptree_get_child(mc, top-&gt;core_id);</div><div class='add'>+		core = toptree_get_child(mc, smp_get_base_cpu(cpu));</div><div class='ctx'> 		if (!drawer || !book || !mc || !core)</div><div class='ctx'> 			panic("NUMA emulation could not allocate memory");</div><div class='ctx'> 		cpumask_set_cpu(cpu, &amp;core-&gt;mask);</div><div class='hunk'>@@ -378,7 +377,7 @@ static void topology_add_core(struct toptree *core)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	for_each_cpu(cpu, &amp;core-&gt;mask) {</div><div class='del'>-		top = &amp;per_cpu(cpu_topology, cpu);</div><div class='add'>+		top = &amp;cpu_topology[cpu];</div><div class='ctx'> 		cpumask_copy(&amp;top-&gt;thread_mask, &amp;core-&gt;mask);</div><div class='ctx'> 		cpumask_copy(&amp;top-&gt;core_mask, &amp;core_mc(core)-&gt;mask);</div><div class='ctx'> 		cpumask_copy(&amp;top-&gt;book_mask, &amp;core_book(core)-&gt;mask);</div><div class='hunk'>@@ -425,6 +424,27 @@ static void print_node_to_core_map(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void pin_all_possible_cpus(void)</div><div class='add'>+{</div><div class='add'>+	int core_id, node_id, cpu;</div><div class='add'>+	static int initialized;</div><div class='add'>+</div><div class='add'>+	if (initialized)</div><div class='add'>+		return;</div><div class='add'>+	print_node_to_core_map();</div><div class='add'>+	node_id = 0;</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		core_id = smp_get_base_cpu(cpu);</div><div class='add'>+		if (emu_cores-&gt;to_node_id[core_id] != NODE_ID_FREE)</div><div class='add'>+			continue;</div><div class='add'>+		pin_core_to_node(core_id, node_id);</div><div class='add'>+		cpu_topology[cpu].node_id = node_id;</div><div class='add'>+		node_id = (node_id + 1) % emu_nodes;</div><div class='add'>+	}</div><div class='add'>+	print_node_to_core_map();</div><div class='add'>+	initialized = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Transfer physical topology into a NUMA topology and modify CPU masks</div><div class='ctx'>  * according to the NUMA topology.</div><div class='hunk'>@@ -442,7 +462,7 @@ static void emu_update_cpu_topology(void)</div><div class='ctx'> 	toptree_free(phys);</div><div class='ctx'> 	toptree_to_topology(numa);</div><div class='ctx'> 	toptree_free(numa);</div><div class='del'>-	print_node_to_core_map();</div><div class='add'>+	pin_all_possible_cpus();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/numa/toptree.c b/arch/s390/numa/toptree.c<br/>index 902d350d859a..26f622b1cd11 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/numa/toptree.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/numa/toptree.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/numa/toptree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/numa/toptree.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/list_sort.h&gt;</div><div class='hunk'>@@ -25,10 +26,14 @@</div><div class='ctx'>  * RETURNS:</div><div class='ctx'>  * Pointer to the new tree node or NULL on error</div><div class='ctx'>  */</div><div class='del'>-struct toptree *toptree_alloc(int level, int id)</div><div class='add'>+struct toptree __ref *toptree_alloc(int level, int id)</div><div class='ctx'> {</div><div class='del'>-	struct toptree *res = kzalloc(sizeof(struct toptree), GFP_KERNEL);</div><div class='add'>+	struct toptree *res;</div><div class='ctx'> </div><div class='add'>+	if (slab_is_available())</div><div class='add'>+		res = kzalloc(sizeof(*res), GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		res = memblock_virt_alloc(sizeof(*res), 8);</div><div class='ctx'> 	if (!res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='hunk'>@@ -65,7 +70,7 @@ static void toptree_remove(struct toptree *cand)</div><div class='ctx'>  * cleanly using toptree_remove. Possible children are freed</div><div class='ctx'>  * recursively. In the end @cand itself is freed.</div><div class='ctx'>  */</div><div class='del'>-void toptree_free(struct toptree *cand)</div><div class='add'>+void __ref toptree_free(struct toptree *cand)</div><div class='ctx'> {</div><div class='ctx'> 	struct toptree *child, *tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -73,7 +78,10 @@ void toptree_free(struct toptree *cand)</div><div class='ctx'> 		toptree_remove(cand);</div><div class='ctx'> 	toptree_for_each_child_safe(child, tmp, cand)</div><div class='ctx'> 		toptree_free(child);</div><div class='del'>-	kfree(cand);</div><div class='add'>+	if (slab_is_available())</div><div class='add'>+		kfree(cand);</div><div class='add'>+	else</div><div class='add'>+		memblock_free_early((unsigned long)cand, sizeof(*cand));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c<br/>index 15ffc19c8c0c..364b9d824be3 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/pci/pci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/pci/pci.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/pci/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/pci/pci.c</a></div><div class='hunk'>@@ -180,7 +180,7 @@ int zpci_fmb_enable_device(struct zpci_dev *zdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mod_pci_args args = { 0, 0, 0, 0 };</div><div class='ctx'> </div><div class='del'>-	if (zdev-&gt;fmb)</div><div class='add'>+	if (zdev-&gt;fmb || sizeof(*zdev-&gt;fmb) &lt; zdev-&gt;fmb_length)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	zdev-&gt;fmb = kmem_cache_zalloc(zdev_fmb_cache, GFP_KERNEL);</div><div class='hunk'>@@ -224,8 +224,8 @@ static int zpci_cfg_load(struct zpci_dev *zdev, int offset, u32 *val, u8 len)</div><div class='ctx'> </div><div class='ctx'> 	rc = zpci_load(&amp;data, req, offset);</div><div class='ctx'> 	if (!rc) {</div><div class='del'>-		data = data &lt;&lt; ((8 - len) * 8);</div><div class='del'>-		data = le64_to_cpu(data);</div><div class='add'>+		data = le64_to_cpu((__force __le64) data);</div><div class='add'>+		data &gt;&gt;= (8 - len) * 8;</div><div class='ctx'> 		*val = (u32) data;</div><div class='ctx'> 	} else</div><div class='ctx'> 		*val = 0xffffffff;</div><div class='hunk'>@@ -238,8 +238,8 @@ static int zpci_cfg_store(struct zpci_dev *zdev, int offset, u32 val, u8 len)</div><div class='ctx'> 	u64 data = val;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	data = cpu_to_le64(data);</div><div class='del'>-	data = data &gt;&gt; ((8 - len) * 8);</div><div class='add'>+	data &lt;&lt;= (8 - len) * 8;</div><div class='add'>+	data = (__force u64) cpu_to_le64(data);</div><div class='ctx'> 	rc = zpci_store(data, req, offset);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -641,7 +641,7 @@ int pcibios_add_device(struct pci_dev *pdev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;dev.groups = zpci_attr_groups;</div><div class='del'>-	pdev-&gt;dev.archdata.dma_ops = &amp;s390_pci_dma_ops;</div><div class='add'>+	pdev-&gt;dev.dma_ops = &amp;s390_pci_dma_ops;</div><div class='ctx'> 	zpci_map_resources(pdev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PCI_BAR_COUNT; i++) {</div><div class='hunk'>@@ -722,6 +722,11 @@ struct dev_pm_ops pcibios_pm_ops = {</div><div class='ctx'> </div><div class='ctx'> static int zpci_alloc_domain(struct zpci_dev *zdev)</div><div class='ctx'> {</div><div class='add'>+	if (zpci_unique_uid) {</div><div class='add'>+		zdev-&gt;domain = (u16) zdev-&gt;uid;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;zpci_domain_lock);</div><div class='ctx'> 	zdev-&gt;domain = find_first_zero_bit(zpci_domain, ZPCI_NR_DEVICES);</div><div class='ctx'> 	if (zdev-&gt;domain == ZPCI_NR_DEVICES) {</div><div class='hunk'>@@ -735,6 +740,9 @@ static int zpci_alloc_domain(struct zpci_dev *zdev)</div><div class='ctx'> </div><div class='ctx'> static void zpci_free_domain(struct zpci_dev *zdev)</div><div class='ctx'> {</div><div class='add'>+	if (zpci_unique_uid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;zpci_domain_lock);</div><div class='ctx'> 	clear_bit(zdev-&gt;domain, zpci_domain);</div><div class='ctx'> 	spin_unlock(&amp;zpci_domain_lock);</div><div class='head'>diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c<br/>index 1a4512c8544a..1c3332ac1957 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/pci/pci_clp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/pci/pci_clp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/pci/pci_clp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/pci/pci_clp.c</a></div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'> #include &lt;asm/clp.h&gt;</div><div class='ctx'> #include &lt;uapi/asm/clp.h&gt;</div><div class='ctx'> </div><div class='add'>+bool zpci_unique_uid;</div><div class='add'>+</div><div class='ctx'> static inline void zpci_err_clp(unsigned int rsp, int rc)</div><div class='ctx'> {</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -146,6 +148,7 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev,</div><div class='ctx'> 	zdev-&gt;pft = response-&gt;pft;</div><div class='ctx'> 	zdev-&gt;vfn = response-&gt;vfn;</div><div class='ctx'> 	zdev-&gt;uid = response-&gt;uid;</div><div class='add'>+	zdev-&gt;fmb_length = sizeof(u32) * response-&gt;fmb_len;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(zdev-&gt;pfip, response-&gt;pfip, sizeof(zdev-&gt;pfip));</div><div class='ctx'> 	if (response-&gt;util_str_avail) {</div><div class='hunk'>@@ -315,6 +318,7 @@ static int clp_list_pci(struct clp_req_rsp_list_pci *rrb,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		zpci_unique_uid = rrb-&gt;response.uid_checking;</div><div class='ctx'> 		WARN_ON_ONCE(rrb-&gt;response.entry_size !=</div><div class='ctx'> 			sizeof(struct clp_fh_list_entry));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c<br/>index 38993b156924..c2f786f0ea06 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/pci/pci_debug.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/pci/pci_debug.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/pci/pci_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/pci/pci_debug.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ static void pci_sw_counter_show(struct seq_file *m)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(pci_sw_names); i++, counter++)</div><div class='del'>-		seq_printf(m, "%26s:\t%llu\n", pci_sw_names[i],</div><div class='add'>+		seq_printf(m, "%26s:\t%lu\n", pci_sw_names[i],</div><div class='ctx'> 			   atomic64_read(counter));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c<br/>index 6b2f72f523b9..9081a57fa340 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/pci/pci_dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/pci/pci_dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/pci/pci_dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/pci/pci_dma.c</a></div><div class='hunk'>@@ -181,14 +181,17 @@ static int __dma_purge_tlb(struct zpci_dev *zdev, dma_addr_t dma_addr,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * With zdev-&gt;tlb_refresh == 0, rpcit is not required to establish new</div><div class='ctx'> 	 * translations when previously invalid translation-table entries are</div><div class='del'>-	 * validated. With lazy unmap, it also is skipped for previously valid</div><div class='add'>+	 * validated. With lazy unmap, rpcit is skipped for previously valid</div><div class='ctx'> 	 * entries, but a global rpcit is then required before any address can</div><div class='ctx'> 	 * be re-used, i.e. after each iommu bitmap wrap-around.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!zdev-&gt;tlb_refresh &amp;&amp;</div><div class='del'>-			(!s390_iommu_strict ||</div><div class='del'>-			((flags &amp; ZPCI_PTE_VALID_MASK) == ZPCI_PTE_VALID)))</div><div class='del'>-		return 0;</div><div class='add'>+	if ((flags &amp; ZPCI_PTE_VALID_MASK) == ZPCI_PTE_VALID) {</div><div class='add'>+		if (!zdev-&gt;tlb_refresh)</div><div class='add'>+			return 0;</div><div class='add'>+	} else {</div><div class='add'>+		if (!s390_iommu_strict)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return zpci_refresh_trans((u64) zdev-&gt;fh &lt;&lt; 32, dma_addr,</div><div class='ctx'> 				  PAGE_ALIGN(size));</div><div class='hunk'>@@ -257,7 +260,7 @@ static dma_addr_t dma_alloc_address(struct device *dev, int size)</div><div class='ctx'> 	spin_lock_irqsave(&amp;zdev-&gt;iommu_bitmap_lock, flags);</div><div class='ctx'> 	offset = __dma_alloc_iommu(dev, zdev-&gt;next_bit, size);</div><div class='ctx'> 	if (offset == -1) {</div><div class='del'>-		if (!zdev-&gt;tlb_refresh &amp;&amp; !s390_iommu_strict) {</div><div class='add'>+		if (!s390_iommu_strict) {</div><div class='ctx'> 			/* global flush before DMA addresses are reused */</div><div class='ctx'> 			if (zpci_refresh_global(zdev))</div><div class='ctx'> 				goto out_error;</div><div class='hunk'>@@ -292,7 +295,7 @@ static void dma_free_address(struct device *dev, dma_addr_t dma_addr, int size)</div><div class='ctx'> 	if (!zdev-&gt;iommu_bitmap)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (zdev-&gt;tlb_refresh || s390_iommu_strict)</div><div class='add'>+	if (s390_iommu_strict)</div><div class='ctx'> 		bitmap_clear(zdev-&gt;iommu_bitmap, offset, size);</div><div class='ctx'> 	else</div><div class='ctx'> 		bitmap_set(zdev-&gt;lazy_bitmap, offset, size);</div><div class='hunk'>@@ -388,8 +391,6 @@ static void *s390_dma_alloc(struct device *dev, size_t size,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	pa = page_to_phys(page);</div><div class='del'>-	memset((void *) pa, 0, size);</div><div class='del'>-</div><div class='ctx'> 	map = s390_dma_map_pages(dev, page, 0, size, DMA_BIDIRECTIONAL, 0);</div><div class='ctx'> 	if (dma_mapping_error(dev, map)) {</div><div class='ctx'> 		free_pages(pa, get_order(size));</div><div class='hunk'>@@ -419,6 +420,7 @@ static int __s390_dma_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 			     size_t size, dma_addr_t *handle,</div><div class='ctx'> 			     enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='add'>+	unsigned long nr_pages = PAGE_ALIGN(size) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	struct zpci_dev *zdev = to_zpci(to_pci_dev(dev));</div><div class='ctx'> 	dma_addr_t dma_addr_base, dma_addr;</div><div class='ctx'> 	int flags = ZPCI_PTE_VALID;</div><div class='hunk'>@@ -426,8 +428,7 @@ static int __s390_dma_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 	unsigned long pa = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	size = PAGE_ALIGN(size);</div><div class='del'>-	dma_addr_base = dma_alloc_address(dev, size &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	dma_addr_base = dma_alloc_address(dev, nr_pages);</div><div class='ctx'> 	if (dma_addr_base == DMA_ERROR_CODE)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -436,26 +437,27 @@ static int __s390_dma_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 		flags |= ZPCI_TABLE_PROTECTED;</div><div class='ctx'> </div><div class='ctx'> 	for (s = sg; dma_addr &lt; dma_addr_base + size; s = sg_next(s)) {</div><div class='del'>-		pa = page_to_phys(sg_page(s)) + s-&gt;offset;</div><div class='del'>-		ret = __dma_update_trans(zdev, pa, dma_addr, s-&gt;length, flags);</div><div class='add'>+		pa = page_to_phys(sg_page(s));</div><div class='add'>+		ret = __dma_update_trans(zdev, pa, dma_addr,</div><div class='add'>+					 s-&gt;offset + s-&gt;length, flags);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto unmap;</div><div class='ctx'> </div><div class='del'>-		dma_addr += s-&gt;length;</div><div class='add'>+		dma_addr += s-&gt;offset + s-&gt;length;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = __dma_purge_tlb(zdev, dma_addr_base, size, flags);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> </div><div class='ctx'> 	*handle = dma_addr_base;</div><div class='del'>-	atomic64_add(size &gt;&gt; PAGE_SHIFT, &amp;zdev-&gt;mapped_pages);</div><div class='add'>+	atomic64_add(nr_pages, &amp;zdev-&gt;mapped_pages);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> unmap:</div><div class='ctx'> 	dma_update_trans(zdev, 0, dma_addr_base, dma_addr - dma_addr_base,</div><div class='ctx'> 			 ZPCI_PTE_INVALID);</div><div class='del'>-	dma_free_address(dev, dma_addr_base, size &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	dma_free_address(dev, dma_addr_base, nr_pages);</div><div class='ctx'> 	zpci_err("map error:\n");</div><div class='ctx'> 	zpci_err_dma(ret, pa);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -564,7 +566,7 @@ int zpci_dma_init_device(struct zpci_dev *zdev)</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto free_dma_table;</div><div class='ctx'> 	}</div><div class='del'>-	if (!zdev-&gt;tlb_refresh &amp;&amp; !s390_iommu_strict) {</div><div class='add'>+	if (!s390_iommu_strict) {</div><div class='ctx'> 		zdev-&gt;lazy_bitmap = vzalloc(zdev-&gt;iommu_pages / 8);</div><div class='ctx'> 		if (!zdev-&gt;lazy_bitmap) {</div><div class='ctx'> 			rc = -ENOMEM;</div><div class='hunk'>@@ -648,7 +650,7 @@ static int __init dma_debug_do_init(void)</div><div class='ctx'> }</div><div class='ctx'> fs_initcall(dma_debug_do_init);</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops s390_pci_dma_ops = {</div><div class='add'>+const struct dma_map_ops s390_pci_dma_ops = {</div><div class='ctx'> 	.alloc		= s390_dma_alloc,</div><div class='ctx'> 	.free		= s390_dma_free,</div><div class='ctx'> 	.map_sg		= s390_dma_map_sg,</div><div class='head'>diff --git a/arch/s390/tools/Makefile b/arch/s390/tools/Makefile<br/>index 6d9814c9df2b..4b5e1e499527 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/tools/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/tools/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/tools/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/tools/Makefile</a></div><div class='hunk'>@@ -9,7 +9,5 @@ define filechk_facilities.h</div><div class='ctx'> 	$(obj)/gen_facilities</div><div class='ctx'> endef</div><div class='ctx'> </div><div class='del'>-$(obj)/gen_facilities.o: $(srctree)/arch/s390/tools/gen_facilities.c</div><div class='del'>-</div><div class='ctx'> include/generated/facilities.h: $(obj)/gen_facilities FORCE</div><div class='ctx'> 	$(call filechk,facilities.h)</div><div class='head'>diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c<br/>index fe4e6c910dd7..0cf802de52a1 100644<br/>--- a/<a href='/drm-misc/tree/arch/s390/tools/gen_facilities.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/s390/tools/gen_facilities.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/s390/tools/gen_facilities.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/s390/tools/gen_facilities.c</a></div><div class='hunk'>@@ -7,13 +7,85 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define S390_GEN_FACILITIES_C</div><div class='del'>-</div><div class='ctx'> #include &lt;strings.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;asm/facilities_src.h&gt;</div><div class='add'>+</div><div class='add'>+struct facility_def {</div><div class='add'>+	char *name;</div><div class='add'>+	int *bits;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct facility_def facility_defs[] = {</div><div class='add'>+	{</div><div class='add'>+		/*</div><div class='add'>+		 * FACILITIES_ALS contains the list of facilities that are</div><div class='add'>+		 * required to run a kernel that is compiled e.g. with</div><div class='add'>+		 * -march=&lt;machine&gt;.</div><div class='add'>+		 */</div><div class='add'>+		.name = "FACILITIES_ALS",</div><div class='add'>+		.bits = (int[]){</div><div class='add'>+#ifdef CONFIG_HAVE_MARCH_Z900_FEATURES</div><div class='add'>+			0,  /* N3 instructions */</div><div class='add'>+			1,  /* z/Arch mode installed */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HAVE_MARCH_Z990_FEATURES</div><div class='add'>+			18, /* long displacement facility */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES</div><div class='add'>+			7,  /* stfle */</div><div class='add'>+			17, /* message security assist */</div><div class='add'>+			21, /* extended-immediate facility */</div><div class='add'>+			25, /* store clock fast */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HAVE_MARCH_Z10_FEATURES</div><div class='add'>+			27, /* mvcos */</div><div class='add'>+			32, /* compare and swap and store */</div><div class='add'>+			33, /* compare and swap and store 2 */</div><div class='add'>+			34, /* general extension facility */</div><div class='add'>+			35, /* execute extensions */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES</div><div class='add'>+			45, /* fast-BCR, etc. */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HAVE_MARCH_ZEC12_FEATURES</div><div class='add'>+			49, /* misc-instruction-extensions */</div><div class='add'>+			52, /* interlocked facility 2 */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HAVE_MARCH_Z13_FEATURES</div><div class='add'>+			53, /* load-and-zero-rightmost-byte, etc. */</div><div class='add'>+#endif</div><div class='add'>+			-1 /* END */</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "FACILITIES_KVM",</div><div class='add'>+		.bits = (int[]){</div><div class='add'>+			0,  /* N3 instructions */</div><div class='add'>+			1,  /* z/Arch mode installed */</div><div class='add'>+			2,  /* z/Arch mode active */</div><div class='add'>+			3,  /* DAT-enhancement */</div><div class='add'>+			4,  /* idte segment table */</div><div class='add'>+			5,  /* idte region table */</div><div class='add'>+			6,  /* ASN-and-LX reuse */</div><div class='add'>+			7,  /* stfle */</div><div class='add'>+			8,  /* enhanced-DAT 1 */</div><div class='add'>+			9,  /* sense-running-status */</div><div class='add'>+			10, /* conditional sske */</div><div class='add'>+			13, /* ipte-range */</div><div class='add'>+			14, /* nonquiescing key-setting */</div><div class='add'>+			73, /* transactional execution */</div><div class='add'>+			75, /* access-exception-fetch/store indication */</div><div class='add'>+			76, /* msa extension 3 */</div><div class='add'>+			77, /* msa extension 4 */</div><div class='add'>+			78, /* enhanced-DAT 2 */</div><div class='add'>+			130, /* instruction-execution-protection */</div><div class='add'>+			131, /* enhanced-SOP 2 and side-effect */</div><div class='add'>+			-1  /* END */</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void print_facility_list(struct facility_def *def)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild<br/>index a05218ff3fe4..926943a49ea5 100644<br/>--- a/<a href='/drm-misc/tree/arch/score/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/score/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,10 +1,9 @@</div><div class='ctx'> </div><div class='ctx'> header-y +=</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> generic-y += barrier.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='add'>+generic-y += current.h</div><div class='ctx'> generic-y += irq_work.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='hunk'>@@ -14,3 +13,4 @@ generic-y += trace_clock.h</div><div class='ctx'> generic-y += xor.h</div><div class='ctx'> generic-y += serial.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/score/include/asm/checksum.h b/arch/score/include/asm/checksum.h<br/>index 539d9fd45d21..0338927f4826 100644<br/>--- a/<a href='/drm-misc/tree/arch/score/include/asm/checksum.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/include/asm/checksum.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/score/include/asm/checksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/include/asm/checksum.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #define _ASM_SCORE_CHECKSUM_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * computes the checksum of a memory block at buff, length len,</div><div class='head'>diff --git a/arch/score/include/asm/current.h b/arch/score/include/asm/current.h<br/>deleted file mode 100644<br/>index 16eae9cbaf1a..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/score/include/asm/current.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/include/asm/current.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-#ifndef _ASM_SCORE_CURRENT_H</div><div class='del'>-#define _ASM_SCORE_CURRENT_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/current.h&gt;</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_SCORE_CURRENT_H */</div><div class='head'>diff --git a/arch/score/include/asm/mmu_context.h b/arch/score/include/asm/mmu_context.h<br/>index 2644577c96e8..073f95d350de 100644<br/>--- a/<a href='/drm-misc/tree/arch/score/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/score/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -3,7 +3,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='head'>diff --git a/arch/score/include/asm/mutex.h b/arch/score/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 10d48fe4db97..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/score/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-#ifndef _ASM_SCORE_MUTEX_H</div><div class='del'>-#define _ASM_SCORE_MUTEX_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_SCORE_MUTEX_H */</div><div class='head'>diff --git a/arch/score/include/asm/processor.h b/arch/score/include/asm/processor.h<br/>index 851f441991d2..d9a922d8711b 100644<br/>--- a/<a href='/drm-misc/tree/arch/score/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/score/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/include/asm/processor.h</a></div><div class='hunk'>@@ -24,7 +24,6 @@ extern unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define current_text_addr() ({ __label__ _l; _l: &amp;&amp;_l; })</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()		barrier()</div><div class='del'>-#define cpu_relax_lowlatency()        cpu_relax()</div><div class='ctx'> #define release_thread(thread)	do {} while (0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c<br/>index aae9480706c2..eb64d7a677cb 100644<br/>--- a/<a href='/drm-misc/tree/arch/score/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/score/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/kernel/process.c</a></div><div class='hunk'>@@ -28,6 +28,8 @@</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> void (*pm_power_off)(void);</div><div class='ctx'> EXPORT_SYMBOL(pm_power_off);</div><div class='head'>diff --git a/arch/score/kernel/ptrace.c b/arch/score/kernel/ptrace.c<br/>index 4f7314d5f334..d8455e60bce0 100644<br/>--- a/<a href='/drm-misc/tree/arch/score/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/score/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/kernel/ptrace.c</a></div><div class='hunk'>@@ -28,8 +28,9 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/regset.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * retrieve the contents of SCORE userspace general registers</div><div class='head'>diff --git a/arch/score/kernel/traps.c b/arch/score/kernel/traps.c<br/>index 5cea1e750cec..e359ec675869 100644<br/>--- a/<a href='/drm-misc/tree/arch/score/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/score/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/kernel/traps.c</a></div><div class='hunk'>@@ -23,13 +23,16 @@</div><div class='ctx'>  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long exception_handlers[32];</div><div class='ctx'> </div><div class='hunk'>@@ -336,7 +339,7 @@ void __init trap_init(void)</div><div class='ctx'> 	set_except_vector(18, handle_dbe);</div><div class='ctx'> 	flush_icache_range(DEBUG_VECTOR_BASE_ADDR, IRQ_VECTOR_BASE_ADDR);</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> 	cpu_cache_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/score/lib/checksum_copy.c b/arch/score/lib/checksum_copy.c<br/>index 9b770b30e8a5..39b99ef61804 100644<br/>--- a/<a href='/drm-misc/tree/arch/score/lib/checksum_copy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/lib/checksum_copy.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/score/lib/checksum_copy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/lib/checksum_copy.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned int csum_partial_copy(const char *src, char *dst,</div><div class='ctx'> 				int len, unsigned int sum)</div><div class='head'>diff --git a/arch/score/mm/extable.c b/arch/score/mm/extable.c<br/>index 01ff6445171c..ec871355fc2d 100644<br/>--- a/<a href='/drm-misc/tree/arch/score/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/score/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/mm/extable.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'>  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/score/mm/fault.c b/arch/score/mm/fault.c<br/>index 995b71e4db4b..b85fad4f0874 100644<br/>--- a/<a href='/drm-misc/tree/arch/score/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/score/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/score/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/score/mm/fault.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/mach-landisk/gio.c b/arch/sh/boards/mach-landisk/gio.c<br/>index 8132dff078fb..32c317f5d991 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/boards/mach-landisk/gio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/boards/mach-landisk/gio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/boards/mach-landisk/gio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/boards/mach-landisk/gio.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;mach-landisk/mach/gio.h&gt;</div><div class='ctx'> #include &lt;mach-landisk/mach/iodata_landisk.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c<br/>index 208a9753ab38..ae1dfdb0013b 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/boot/compressed/misc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/boot/compressed/misc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/boot/compressed/misc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/boot/compressed/misc.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'>  * Modified to use standard LinuxSH BIOS by Greg Banks 7Jul2000</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boot/dts/j2_mimas_v2.dts b/arch/sh/boot/dts/j2_mimas_v2.dts<br/>index 880de75360b3..880de75360b3 100755..100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/boot/dts/j2_mimas_v2.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/boot/dts/j2_mimas_v2.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/boot/dts/j2_mimas_v2.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/boot/dts/j2_mimas_v2.dts</a></div><div class='head'>diff --git a/arch/sh/boot/romimage/mmcif-sh7724.c b/arch/sh/boot/romimage/mmcif-sh7724.c<br/>index 16b122510c84..6595b6b45bf1 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/boot/romimage/mmcif-sh7724.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/boot/romimage/mmcif-sh7724.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/boot/romimage/mmcif-sh7724.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/boot/romimage/mmcif-sh7724.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mmc/sh_mmcif.h&gt;</div><div class='del'>-#include &lt;linux/mmc/boot.h&gt;</div><div class='ctx'> #include &lt;mach/romimage.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MMCIF_BASE      (void __iomem *)0xa4ca0000</div><div class='hunk'>@@ -22,6 +21,13 @@</div><div class='ctx'> #define HIZCRC		0xa405015c</div><div class='ctx'> #define DRVCRA		0xa405018a</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	MMCIF_PROGRESS_ENTER,</div><div class='add'>+	MMCIF_PROGRESS_INIT,</div><div class='add'>+	MMCIF_PROGRESS_LOAD,</div><div class='add'>+	MMCIF_PROGRESS_DONE</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* SH7724 specific MMCIF loader</div><div class='ctx'>  *</div><div class='ctx'>  * loads the romImage from an MMC card starting from block 512</div><div class='hunk'>@@ -30,7 +36,7 @@</div><div class='ctx'>  */</div><div class='ctx'> asmlinkage void mmcif_loader(unsigned char *buf, unsigned long no_bytes)</div><div class='ctx'> {</div><div class='del'>-	mmcif_update_progress(MMC_PROGRESS_ENTER);</div><div class='add'>+	mmcif_update_progress(MMCIF_PROGRESS_ENTER);</div><div class='ctx'> </div><div class='ctx'> 	/* enable clock to the MMCIF hardware block */</div><div class='ctx'> 	__raw_writel(__raw_readl(MSTPCR2) &amp; ~0x20000000, MSTPCR2);</div><div class='hunk'>@@ -53,12 +59,12 @@ asmlinkage void mmcif_loader(unsigned char *buf, unsigned long no_bytes)</div><div class='ctx'> 	/* high drive capability for MMC pins */</div><div class='ctx'> 	__raw_writew(__raw_readw(DRVCRA) | 0x3000, DRVCRA);</div><div class='ctx'> </div><div class='del'>-	mmcif_update_progress(MMC_PROGRESS_INIT);</div><div class='add'>+	mmcif_update_progress(MMCIF_PROGRESS_INIT);</div><div class='ctx'> </div><div class='ctx'> 	/* setup MMCIF hardware */</div><div class='ctx'> 	sh_mmcif_boot_init(MMCIF_BASE);</div><div class='ctx'> </div><div class='del'>-	mmcif_update_progress(MMC_PROGRESS_LOAD);</div><div class='add'>+	mmcif_update_progress(MMCIF_PROGRESS_LOAD);</div><div class='ctx'> </div><div class='ctx'> 	/* load kernel via MMCIF interface */</div><div class='ctx'> 	sh_mmcif_boot_do_read(MMCIF_BASE, 512,</div><div class='hunk'>@@ -68,5 +74,5 @@ asmlinkage void mmcif_loader(unsigned char *buf, unsigned long no_bytes)</div><div class='ctx'> 	/* disable clock to the MMCIF hardware block */</div><div class='ctx'> 	__raw_writel(__raw_readl(MSTPCR2) | 0x20000000, MSTPCR2);</div><div class='ctx'> </div><div class='del'>-	mmcif_update_progress(MMC_PROGRESS_DONE);</div><div class='add'>+	mmcif_update_progress(MMCIF_PROGRESS_DONE);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig<br/>index 9bdcf72ec06a..2fce54d9c388 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/configs/sh7785lcr_32bit_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/configs/sh7785lcr_32bit_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/configs/sh7785lcr_32bit_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/configs/sh7785lcr_32bit_defconfig</a></div><div class='hunk'>@@ -25,7 +25,7 @@ CONFIG_SH_SH7785LCR=y</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='del'>-CONFIG_CPU_FREQ_STAT_DETAILS=y</div><div class='add'>+CONFIG_CPU_FREQ_STAT=y</div><div class='ctx'> CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y</div><div class='ctx'> CONFIG_SH_CPU_FREQ=y</div><div class='ctx'> CONFIG_HEARTBEAT=y</div><div class='head'>diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c<br/>index 49bace446a1a..c6d96049a0bb 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/drivers/heartbeat.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/drivers/heartbeat.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/drivers/heartbeat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/drivers/heartbeat.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/loadavg.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild<br/>index 751c3373a92c..cf2a75063b53 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> </div><div class='ctx'> generic-y += bitsperlong.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += delay.h</div><div class='ctx'> generic-y += div64.h</div><div class='head'>diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h<br/>index 0052ad40e86d..d99008af5f73 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='ctx'> #ifndef __ASM_SH_DMA_MAPPING_H</div><div class='ctx'> #define __ASM_SH_DMA_MAPPING_H</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops *dma_ops;</div><div class='add'>+extern const struct dma_map_ops *dma_ops;</div><div class='ctx'> extern void no_iommu_init(void);</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return dma_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/include/asm/fpu.h b/arch/sh/include/asm/fpu.h<br/>index 09fc2bc8a790..50921c7cc3f0 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/include/asm/fpu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/include/asm/fpu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/include/asm/fpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/fpu.h</a></div><div class='hunk'>@@ -3,6 +3,8 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+</div><div class='ctx'> struct task_struct;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SH_FPU</div><div class='head'>diff --git a/arch/sh/include/asm/kprobes.h b/arch/sh/include/asm/kprobes.h<br/>index 134f3980e44a..f0986f9b3844 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/kprobes.h</a></div><div class='hunk'>@@ -1,13 +1,16 @@</div><div class='ctx'> #ifndef __ASM_SH_KPROBES_H</div><div class='ctx'> #define __ASM_SH_KPROBES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='add'>+#define BREAKPOINT_INSTRUCTION	0xc33a</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_KPROBES</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef insn_size_t kprobe_opcode_t;</div><div class='del'>-#define BREAKPOINT_INSTRUCTION	0xc33a</div><div class='ctx'> </div><div class='ctx'> #define MAX_INSN_SIZE 16</div><div class='ctx'> #define MAX_STACK_SIZE 64</div><div class='head'>diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h<br/>index 9f417feaf6e8..eb6ac3c10c44 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -10,7 +10,9 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> #include &lt;cpu/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/include/asm/mutex-llsc.h b/arch/sh/include/asm/mutex-llsc.h<br/>deleted file mode 100644<br/>index dad29b687bd3..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/sh/include/asm/mutex-llsc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/include/asm/mutex-llsc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/sh/include/asm/mutex-llsc.h</div><div class='del'>- *</div><div class='del'>- * SH-4A optimized mutex locking primitives</div><div class='del'>- *</div><div class='del'>- * Please look into asm-generic/mutex-xchg.h for a formal definition.</div><div class='del'>- */</div><div class='del'>-#ifndef __ASM_SH_MUTEX_LLSC_H</div><div class='del'>-#define __ASM_SH_MUTEX_LLSC_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attempting to lock a mutex on SH4A is done like in ARMv6+ architecure.</div><div class='del'>- * with a bastardized atomic decrement (it is not a reliable atomic decrement</div><div class='del'>- * but it satisfies the defined semantics for our purpose, while being</div><div class='del'>- * smaller and faster than a real atomic decrement or atomic swap.</div><div class='del'>- * The idea is to attempt  decrementing the lock value only once. If once</div><div class='del'>- * decremented it isn't zero, or if its store-back fails due to a dispute</div><div class='del'>- * on the exclusive store, we simply bail out immediately through the slow</div><div class='del'>- * path where the lock will be reattempted until it succeeds.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-__mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	int __done, __res;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__ (</div><div class='del'>-		"movli.l	@%2, %0	\n"</div><div class='del'>-		"add		#-1, %0	\n"</div><div class='del'>-		"movco.l	%0, @%2	\n"</div><div class='del'>-		"movt		%1	\n"</div><div class='del'>-		: "=&amp;z" (__res), "=&amp;r" (__done)</div><div class='del'>-		: "r" (&amp;(count)-&gt;counter)</div><div class='del'>-		: "t");</div><div class='del'>-</div><div class='del'>-	if (unlikely(!__done || __res != 0))</div><div class='del'>-		fail_fn(count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-__mutex_fastpath_lock_retval(atomic_t *count)</div><div class='del'>-{</div><div class='del'>-	int __done, __res;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__ (</div><div class='del'>-		"movli.l	@%2, %0	\n"</div><div class='del'>-		"add		#-1, %0	\n"</div><div class='del'>-		"movco.l	%0, @%2	\n"</div><div class='del'>-		"movt		%1	\n"</div><div class='del'>-		: "=&amp;z" (__res), "=&amp;r" (__done)</div><div class='del'>-		: "r" (&amp;(count)-&gt;counter)</div><div class='del'>-		: "t");</div><div class='del'>-</div><div class='del'>-	if (unlikely(!__done || __res != 0))</div><div class='del'>-		__res = -1;</div><div class='del'>-</div><div class='del'>-	return __res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-__mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	int __done, __res;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__ (</div><div class='del'>-		"movli.l	@%2, %0	\n\t"</div><div class='del'>-		"add		#1, %0	\n\t"</div><div class='del'>-		"movco.l	%0, @%2 \n\t"</div><div class='del'>-		"movt		%1	\n\t"</div><div class='del'>-		: "=&amp;z" (__res), "=&amp;r" (__done)</div><div class='del'>-		: "r" (&amp;(count)-&gt;counter)</div><div class='del'>-		: "t");</div><div class='del'>-</div><div class='del'>-	if (unlikely(!__done || __res &lt;= 0))</div><div class='del'>-		fail_fn(count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If the unlock was done on a contended lock, or if the unlock simply fails</div><div class='del'>- * then the mutex remains locked.</div><div class='del'>- */</div><div class='del'>-#define __mutex_slowpath_needs_to_unlock()	1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For __mutex_fastpath_trylock we do an atomic decrement and check the</div><div class='del'>- * result and put it in the __res variable.</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-__mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	int __res, __orig;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__ (</div><div class='del'>-		"1: movli.l	@%2, %0		\n\t"</div><div class='del'>-		"dt		%0		\n\t"</div><div class='del'>-		"movco.l	%0,@%2		\n\t"</div><div class='del'>-		"bf		1b		\n\t"</div><div class='del'>-		"cmp/eq		#0,%0		\n\t"</div><div class='del'>-		"bt		2f		\n\t"</div><div class='del'>-		"mov		#0, %1		\n\t"</div><div class='del'>-		"bf		3f		\n\t"</div><div class='del'>-		"2: mov		#1, %1		\n\t"</div><div class='del'>-		"3:				"</div><div class='del'>-		: "=&amp;z" (__orig), "=&amp;r" (__res)</div><div class='del'>-		: "r" (&amp;count-&gt;counter)</div><div class='del'>-		: "t");</div><div class='del'>-</div><div class='del'>-	return __res;</div><div class='del'>-}</div><div class='del'>-#endif /* __ASM_SH_MUTEX_LLSC_H */</div><div class='head'>diff --git a/arch/sh/include/asm/mutex.h b/arch/sh/include/asm/mutex.h<br/>deleted file mode 100644<br/>index d8e37716a4a0..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/sh/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pull in the generic implementation for the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_CPU_SH4A)</div><div class='del'>-#include &lt;asm/mutex-llsc.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h<br/>index f9a09942a32d..5addd69f70ef 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/processor.h</a></div><div class='hunk'>@@ -97,7 +97,6 @@ extern struct sh_cpuinfo cpu_data[];</div><div class='ctx'> </div><div class='ctx'> #define cpu_sleep()	__asm__ __volatile__ ("sleep" : : : "memory")</div><div class='ctx'> #define cpu_relax()	barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> void default_idle(void);</div><div class='ctx'> void stop_this_cpu(void *);</div><div class='head'>diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h<br/>index 025cdb1032f6..46e0d635e36f 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/include/asm/tlb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/include/asm/tlb.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/tlb.h</a></div><div class='hunk'>@@ -65,6 +65,9 @@ tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, unsigned long address)</div><div class='ctx'> 		tlb-&gt;end = address + PAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\</div><div class='add'>+	tlb_remove_tlb_entry(tlb, ptep, address)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * In the case of tlb vma handling, we can optimise these away in the</div><div class='ctx'>  * case where we're doing a full MM flush.  When we're doing a munmap,</div><div class='hunk'>@@ -115,18 +118,18 @@ static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 	return __tlb_remove_page(tlb, page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool __tlb_remove_pte_page(struct mmu_gather *tlb,</div><div class='del'>-					 struct page *page)</div><div class='del'>-{</div><div class='del'>-	return __tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 					struct page *page, int page_size)</div><div class='ctx'> {</div><div class='ctx'> 	return tlb_remove_page(tlb, page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='add'>+static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='add'>+						     unsigned int page_size)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define pte_free_tlb(tlb, ptep, addr)	pte_free((tlb)-&gt;mm, ptep)</div><div class='ctx'> #define pmd_free_tlb(tlb, pmdp, addr)	pmd_free((tlb)-&gt;mm, pmdp)</div><div class='ctx'> #define pud_free_tlb(tlb, pudp, addr)	pud_free((tlb)-&gt;mm, pudp)</div><div class='head'>diff --git a/arch/sh/include/asm/uaccess.h b/arch/sh/include/asm/uaccess.h<br/>index a38d0c7b818f..c4f0fee812c3 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/include/asm/uaccess.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/include/asm/uaccess.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/include/asm/uaccess.h</a></div><div class='hunk'>@@ -192,7 +192,6 @@ struct exception_table_entry {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs);</div><div class='del'>-const struct exception_table_entry *search_exception_tables(unsigned long addr);</div><div class='ctx'> </div><div class='ctx'> extern void *set_exception_table_vec(unsigned int vec, void *handler);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile<br/>index accc7ca722e1..252e9fee687f 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/Makefile</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> #</div><div class='del'>-# Makefile for the Linux/SuperH CPU-specifc backends.</div><div class='add'>+# Makefile for the Linux/SuperH CPU-specific backends.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CPU_SH2)		= sh2/</div><div class='head'>diff --git a/arch/sh/kernel/cpu/fpu.c b/arch/sh/kernel/cpu/fpu.c<br/>index 4e332244ea75..547c73478459 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/fpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/fpu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/fpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/fpu.c</a></div><div class='hunk'>@@ -1,8 +1,11 @@</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> int init_fpu(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c<br/>index c8b3be1b54e6..c4f01c5c8736 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/init.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/cpu/irq/Makefile b/arch/sh/kernel/cpu/irq/Makefile<br/>index f0c7025a67d1..3f8e79402d7d 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/irq/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/irq/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/irq/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/irq/Makefile</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> #</div><div class='del'>-# Makefile for the Linux/SuperH CPU-specifc IRQ handlers.</div><div class='add'>+# Makefile for the Linux/SuperH CPU-specific IRQ handlers.</div><div class='ctx'> #</div><div class='ctx'> obj-$(CONFIG_SUPERH32)			+= imask.o</div><div class='ctx'> obj-$(CONFIG_CPU_SH5)			+= intc-sh5.o</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c<br/>index 58c19adae900..95796ad00fbe 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2/setup-sh7619.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh2/setup-sh7619.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2/setup-sh7619.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2/setup-sh7619.c</a></div><div class='hunk'>@@ -61,8 +61,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL,</div><div class='ctx'> 			 NULL, prio_registers, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -82,8 +81,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -103,8 +101,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh2a/fpu.c b/arch/sh/kernel/cpu/sh2a/fpu.c<br/>index 98bbaa447c93..352f894bece1 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/fpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh2a/fpu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/fpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/fpu.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * FIXME! These routines can be optimized in big endian case.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh2a/setup-mxg.c b/arch/sh/kernel/cpu/sh2a/setup-mxg.c<br/>index 26fcdbd4127a..060fdd369f09 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-mxg.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh2a/setup-mxg.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-mxg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-mxg.c</a></div><div class='hunk'>@@ -129,8 +129,7 @@ static struct platform_device mtu2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c<br/>index abc0ce9fb800..c1301f68d3cd 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-sh7201.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh2a/setup-sh7201.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-sh7201.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-sh7201.c</a></div><div class='hunk'>@@ -178,8 +178,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7201", vectors, groups,</div><div class='ctx'> 			 mask_registers, prio_registers, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -199,8 +198,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -220,8 +218,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -241,8 +238,7 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -262,8 +258,7 @@ static struct platform_device scif3_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif4_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -283,8 +278,7 @@ static struct platform_device scif4_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif5_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -304,8 +298,7 @@ static struct platform_device scif5_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif6_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -325,8 +318,7 @@ static struct platform_device scif6_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif7_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c<br/>index 3b4894cba92f..32ec732e28e5 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-sh7203.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh2a/setup-sh7203.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-sh7203.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-sh7203.c</a></div><div class='hunk'>@@ -174,9 +174,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7203", vectors, groups,</div><div class='ctx'> 			 mask_registers, prio_registers, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -197,9 +195,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -220,9 +216,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -243,9 +237,7 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c<br/>index 49bc5a34bec1..8d8d354851ce 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-sh7206.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh2a/setup-sh7206.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-sh7206.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-sh7206.c</a></div><div class='hunk'>@@ -134,8 +134,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7206", vectors, groups,</div><div class='ctx'> 			 mask_registers, prio_registers, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -155,8 +154,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -176,8 +174,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -197,8 +194,7 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7264.c b/arch/sh/kernel/cpu/sh2a/setup-sh7264.c<br/>index 608146455562..ab71eab690fd 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-sh7264.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh2a/setup-sh7264.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-sh7264.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-sh7264.c</a></div><div class='hunk'>@@ -226,9 +226,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7264", vectors, groups,</div><div class='ctx'> 			 mask_registers, prio_registers, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -252,9 +250,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -278,9 +274,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -304,9 +298,7 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -330,9 +322,7 @@ static struct platform_device scif3_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif4_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -356,9 +346,7 @@ static struct platform_device scif4_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif5_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -382,9 +370,7 @@ static struct platform_device scif5_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif6_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -408,9 +394,7 @@ static struct platform_device scif6_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif7_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7269.c b/arch/sh/kernel/cpu/sh2a/setup-sh7269.c<br/>index 16ce5aa77bdd..c7e81b20967c 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-sh7269.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh2a/setup-sh7269.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh2a/setup-sh7269.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh2a/setup-sh7269.c</a></div><div class='hunk'>@@ -248,9 +248,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7269", vectors, groups,</div><div class='ctx'> 			 mask_registers, prio_registers, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -274,9 +272,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -300,9 +296,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -326,9 +320,7 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -352,9 +344,7 @@ static struct platform_device scif3_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif4_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -378,9 +368,7 @@ static struct platform_device scif4_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif5_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -404,9 +392,7 @@ static struct platform_device scif5_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif6_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -430,9 +416,7 @@ static struct platform_device scif6_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif7_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |</div><div class='del'>-			  SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c<br/>index 6a72fd14de21..f6e392e0d27e 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh3/setup-sh7705.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh3/setup-sh7705.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh3/setup-sh7705.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh3/setup-sh7705.c</a></div><div class='hunk'>@@ -70,9 +70,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, NULL,</div><div class='ctx'> 			 NULL, prio_registers, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_TIE | SCSCR_RIE  | SCSCR_TE |</div><div class='del'>-			  SCSCR_RE  | SCSCR_CKE1 | SCSCR_CKE0,</div><div class='add'>+	.scscr		= SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.ops		= &amp;sh770x_sci_port_ops,</div><div class='ctx'> 	.regtype	= SCIx_SH7705_SCIF_REGTYPE,</div><div class='hunk'>@@ -94,8 +92,6 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_TIE | SCSCR_RIE | SCSCR_TE | SCSCR_RE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.ops		= &amp;sh770x_sci_port_ops,</div><div class='ctx'> 	.regtype	= SCIx_SH7705_SCIF_REGTYPE,</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c<br/>index 538c10db3537..59a88611df55 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh3/setup-sh770x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh3/setup-sh770x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh3/setup-sh770x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh3/setup-sh770x.c</a></div><div class='hunk'>@@ -109,12 +109,8 @@ static struct platform_device rtc_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.port_reg	= 0xa4000136,</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_TE | SCSCR_RE,</div><div class='ctx'> 	.type		= PORT_SCI,</div><div class='ctx'> 	.ops		= &amp;sh770x_sci_port_ops,</div><div class='del'>-	.regshift	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource scif0_resources[] = {</div><div class='hunk'>@@ -135,8 +131,6 @@ static struct platform_device scif0_device = {</div><div class='ctx'>     defined(CONFIG_CPU_SUBTYPE_SH7707) || \</div><div class='ctx'>     defined(CONFIG_CPU_SUBTYPE_SH7709)</div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_TE | SCSCR_RE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.ops		= &amp;sh770x_sci_port_ops,</div><div class='ctx'> 	.regtype	= SCIx_SH3_SCIF_REGTYPE,</div><div class='hunk'>@@ -160,12 +154,8 @@ static struct platform_device scif1_device = {</div><div class='ctx'> #if defined(CONFIG_CPU_SUBTYPE_SH7707) || \</div><div class='ctx'>     defined(CONFIG_CPU_SUBTYPE_SH7709)</div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_TE | SCSCR_RE,</div><div class='ctx'> 	.type		= PORT_IRDA,</div><div class='ctx'> 	.ops		= &amp;sh770x_sci_port_ops,</div><div class='del'>-	.regshift	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource scif2_resources[] = {</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c<br/>index e9ed300dba5c..ea52410b430d 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh3/setup-sh7710.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh3/setup-sh7710.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh3/setup-sh7710.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh3/setup-sh7710.c</a></div><div class='hunk'>@@ -98,9 +98,7 @@ static struct platform_device rtc_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_TE | SCSCR_RE | SCSCR_REIE |</div><div class='del'>-			  SCSCR_CKE1 | SCSCR_CKE0,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -120,9 +118,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_TE | SCSCR_RE | SCSCR_REIE |</div><div class='del'>-			  SCSCR_CKE1 | SCSCR_CKE0,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7720.c b/arch/sh/kernel/cpu/sh3/setup-sh7720.c<br/>index 84df85a5b800..bf34b4e2e9ef 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh3/setup-sh7720.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh3/setup-sh7720.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh3/setup-sh7720.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh3/setup-sh7720.c</a></div><div class='hunk'>@@ -52,8 +52,6 @@ static struct platform_device rtc_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.ops		= &amp;sh7720_sci_port_ops,</div><div class='ctx'> 	.regtype	= SCIx_SH7705_SCIF_REGTYPE,</div><div class='hunk'>@@ -75,8 +73,6 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.ops		= &amp;sh7720_sci_port_ops,</div><div class='ctx'> 	.regtype	= SCIx_SH7705_SCIF_REGTYPE,</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4/fpu.c b/arch/sh/kernel/cpu/sh4/fpu.c<br/>index 69ab4d3c8d41..95fd2dcb83da 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4/fpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4/fpu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4/fpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4/fpu.c</a></div><div class='hunk'>@@ -10,8 +10,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * FIXME! These routines have not been tested for big endian case.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;cpu/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c<br/>index e7a7b3cdf68d..2623f820d510 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4/setup-sh4-202.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4/setup-sh4-202.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4/setup-sh4-202.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4/setup-sh4-202.c</a></div><div class='hunk'>@@ -17,8 +17,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c<br/>index 5f08c59b9f3e..57d30689204d 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4/setup-sh7750.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4/setup-sh7750.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4/setup-sh7750.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4/setup-sh7750.c</a></div><div class='hunk'>@@ -38,15 +38,11 @@ static struct platform_device rtc_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port sci_platform_data = {</div><div class='del'>-	.port_reg	= 0xffe0001C,</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_TE | SCSCR_RE,</div><div class='ctx'> 	.type		= PORT_SCI,</div><div class='del'>-	.regshift	= 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource sci_resources[] = {</div><div class='del'>-	DEFINE_RES_MEM(0xffe00000, 0x100),</div><div class='add'>+	DEFINE_RES_MEM(0xffe00000, 0x20),</div><div class='ctx'> 	DEFINE_RES_IRQ(evt2irq(0x4e0)),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -61,8 +57,7 @@ static struct platform_device sci_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_TE | SCSCR_RE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c<br/>index 973b736b3b98..e51fe1734e13 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4/setup-sh7760.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4/setup-sh7760.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4/setup-sh7760.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4/setup-sh7760.c</a></div><div class='hunk'>@@ -128,8 +128,7 @@ static DECLARE_INTC_DESC(intc_desc_irq, "sh7760-irq", vectors_irq, groups,</div><div class='ctx'> 			 mask_registers, prio_registers, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -153,9 +152,8 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -178,8 +176,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -203,14 +200,18 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	/*</div><div class='add'>+	 * This is actually a SIM card module serial port, based on an SCI with</div><div class='add'>+	 * additional registers. The sh-sci driver doesn't support the SIM port</div><div class='add'>+	 * type, declare it as a SCI. Don't declare the additional registers in</div><div class='add'>+	 * the memory resource or the driver will compute an incorrect regshift</div><div class='add'>+	 * value.</div><div class='add'>+	 */</div><div class='ctx'> 	.type		= PORT_SCI,</div><div class='del'>-	.regshift	= 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource scif3_resources[] = {</div><div class='del'>-	DEFINE_RES_MEM(0xfe480000, 0x100),</div><div class='add'>+	DEFINE_RES_MEM(0xfe480000, 0x10),</div><div class='ctx'> 	DEFINE_RES_IRQ(evt2irq(0xc00)),</div><div class='ctx'> 	DEFINE_RES_IRQ(evt2irq(0xc20)),</div><div class='ctx'> 	DEFINE_RES_IRQ(evt2irq(0xc40)),</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c<br/>index ceb3dedad983..5788073a7c30 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7343.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7343.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7343.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7343.c</a></div><div class='hunk'>@@ -18,8 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Serial */</div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_CKE1,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -39,8 +38,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_CKE1,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -60,8 +58,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_CKE1,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -81,8 +78,7 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_CKE1,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c<br/>index f75f67343139..646918713d9a 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7366.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7366.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7366.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7366.c</a></div><div class='hunk'>@@ -20,9 +20,7 @@</div><div class='ctx'> #include &lt;asm/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.port_reg	= 0xa405013e,</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c<br/>index 7aa733307afc..6b3a26e61abb 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7722.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7722.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7722.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7722.c</a></div><div class='hunk'>@@ -179,8 +179,7 @@ struct platform_device dma_device = {</div><div class='ctx'> </div><div class='ctx'> /* Serial */</div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.ops		= &amp;sh7722_sci_port_ops,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,</div><div class='hunk'>@@ -202,8 +201,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.ops		= &amp;sh7722_sci_port_ops,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,</div><div class='hunk'>@@ -225,8 +223,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.ops		= &amp;sh7722_sci_port_ops,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c<br/>index 3533b56dd465..1c1b3c469831 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7723.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7723.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7723.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7723.c</a></div><div class='hunk'>@@ -23,9 +23,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Serial */</div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.port_reg	= 0xa4050160,</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -46,9 +44,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -69,9 +65,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -92,9 +86,6 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='ctx'> 	.sampling_rate	= 8,</div><div class='ctx'> 	.type           = PORT_SCIFA,</div><div class='ctx'> };</div><div class='hunk'>@@ -115,9 +106,6 @@ static struct platform_device scif3_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif4_platform_data = {</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='ctx'> 	.sampling_rate	= 8,</div><div class='ctx'> 	.type           = PORT_SCIFA,</div><div class='ctx'> };</div><div class='hunk'>@@ -138,9 +126,6 @@ static struct platform_device scif4_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif5_platform_data = {</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='ctx'> 	.sampling_rate	= 8,</div><div class='ctx'> 	.type           = PORT_SCIFA,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c<br/>index ea5780b3c7f6..c20258b18775 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7724.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7724.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7724.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7724.c</a></div><div class='hunk'>@@ -290,9 +290,7 @@ static struct platform_device dma1_device = {</div><div class='ctx'> </div><div class='ctx'> /* Serial */</div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -313,9 +311,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -336,9 +332,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -359,9 +353,6 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='ctx'> 	.sampling_rate	= 8,</div><div class='ctx'> 	.type           = PORT_SCIFA,</div><div class='ctx'> };</div><div class='hunk'>@@ -382,9 +373,6 @@ static struct platform_device scif3_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif4_platform_data = {</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='ctx'> 	.sampling_rate	= 8,</div><div class='ctx'> 	.type           = PORT_SCIFA,</div><div class='ctx'> };</div><div class='hunk'>@@ -405,9 +393,6 @@ static struct platform_device scif4_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif5_platform_data = {</div><div class='del'>-	.port_reg	= SCIx_NOT_SUPPORTED,</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='ctx'> 	.sampling_rate	= 8,</div><div class='ctx'> 	.type           = PORT_SCIFA,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7734.c b/arch/sh/kernel/cpu/sh4a/setup-sh7734.c<br/>index 69b8a50310d9..8c0c9da6b5b3 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7734.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7734.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7734.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7734.c</a></div><div class='hunk'>@@ -25,8 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> /* SCIF */</div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr          = SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype        = SCIx_SH4_SCIF_BRG_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -47,8 +46,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr          = SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype        = SCIx_SH4_SCIF_BRG_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -69,8 +67,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr          = SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype        = SCIx_SH4_SCIF_BRG_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -91,8 +88,7 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr          = SCSCR_REIE | SCSCR_TOIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype        = SCIx_SH4_SCIF_BRG_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -113,8 +109,7 @@ static struct platform_device scif3_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif4_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr          = SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype        = SCIx_SH4_SCIF_BRG_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -135,8 +130,7 @@ static struct platform_device scif4_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif5_platform_data = {</div><div class='del'>-	.flags          = UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr          = SCSCR_REIE,</div><div class='ctx'> 	.type           = PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_BRG_REGTYPE,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c<br/>index 18bcd70cd813..a46a19b49e08 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7757.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7757.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7757.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7757.c</a></div><div class='hunk'>@@ -24,8 +24,7 @@</div><div class='ctx'> #include &lt;cpu/sh7757.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -45,8 +44,7 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -66,8 +64,7 @@ static struct platform_device scif3_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif4_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c<br/>index 5a47d670ddec..40e6cda914d3 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7763.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7763.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7763.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7763.c</a></div><div class='hunk'>@@ -19,8 +19,7 @@</div><div class='ctx'> #include &lt;linux/usb/ohci_pdriver.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -41,8 +40,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -63,8 +61,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c<br/>index e9b532a76c37..82e3bdf2e1b6 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7770.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7770.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7770.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7770.c</a></div><div class='hunk'>@@ -16,8 +16,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_TOIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -37,8 +36,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_TOIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -58,8 +56,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_TOIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -79,8 +76,7 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_TOIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -100,8 +96,7 @@ static struct platform_device scif3_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif4_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_TOIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -121,8 +116,7 @@ static struct platform_device scif4_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif5_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_TOIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -142,8 +136,7 @@ static struct platform_device scif5_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif6_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_TOIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -163,8 +156,7 @@ static struct platform_device scif6_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif7_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_TOIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -184,8 +176,7 @@ static struct platform_device scif7_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif8_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_TOIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -205,8 +196,7 @@ static struct platform_device scif8_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif9_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_TOIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c<br/>index 3ee7dd9b3a65..d90ff67a4633 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7780.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7780.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7780.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7780.c</a></div><div class='hunk'>@@ -18,8 +18,7 @@</div><div class='ctx'> #include &lt;cpu/dma-register.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -40,8 +39,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c<br/>index c72d5a5d0995..b0d6f82f2d71 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7785.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7785.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7785.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7785.c</a></div><div class='hunk'>@@ -20,8 +20,7 @@</div><div class='ctx'> #include &lt;cpu/dma-register.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -42,8 +41,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -64,8 +62,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -86,8 +83,7 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -108,8 +104,7 @@ static struct platform_device scif3_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif4_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -130,8 +125,7 @@ static struct platform_device scif4_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif5_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c<br/>index 479e79bdd3d0..17aac38a6e90 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7786.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-sh7786.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-sh7786.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-sh7786.c</a></div><div class='hunk'>@@ -28,8 +28,7 @@</div><div class='ctx'> #include &lt;asm/mmzone.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -56,8 +55,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'>  * The rest of these all have multiplexed IRQs</div><div class='ctx'>  */</div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -87,8 +85,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -109,8 +106,7 @@ static struct platform_device scif2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif3_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -131,8 +127,7 @@ static struct platform_device scif3_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif4_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='hunk'>@@ -153,8 +148,7 @@ static struct platform_device scif4_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif5_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,</div><div class='add'>+	.scscr		= SCSCR_REIE | SCSCR_CKE1,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> 	.regtype	= SCIx_SH4_SCIF_FIFODATA_REGTYPE,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c<br/>index a78c5feb4e3b..ee14d92d840f 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-shx3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh4a/setup-shx3.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh4a/setup-shx3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh4a/setup-shx3.c</a></div><div class='hunk'>@@ -28,8 +28,7 @@</div><div class='ctx'>  * all rather than adding infrastructure to hack around it.</div><div class='ctx'>  */</div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -52,8 +51,7 @@ static struct platform_device scif0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif1_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -76,8 +74,7 @@ static struct platform_device scif1_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif2_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5.c b/arch/sh/kernel/cpu/sh5/setup-sh5.c<br/>index 1bf0b2cf6652..084a9cc99175 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh5/setup-sh5.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/sh5/setup-sh5.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/sh5/setup-sh5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/sh5/setup-sh5.c</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct plat_sci_port scif0_platform_data = {</div><div class='del'>-	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,</div><div class='del'>-	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,</div><div class='add'>+	.flags		= UPF_IOREMAP,</div><div class='add'>+	.scscr		= SCSCR_REIE,</div><div class='ctx'> 	.type		= PORT_SCIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c<br/>index 53b8eeb1db20..c32e66079f7c 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/shmobile/cpuidle.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/shmobile/cpuidle.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/shmobile/cpuidle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/shmobile/cpuidle.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/cpuidle.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/suspend.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned long cpuidle_mode[] = {</div><div class='ctx'> 	SUSP_SH_SLEEP, /* regular sleep mode */</div><div class='head'>diff --git a/arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/shmobile/pm.c<br/>index ac37b7234f85..fba2be5d72e9 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/cpu/shmobile/pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/cpu/shmobile/pm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/cpu/shmobile/pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/cpu/shmobile/pm.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;asm/suspend.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/bl_bit.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/crash_dump.c b/arch/sh/kernel/crash_dump.c<br/>index 569e7b171c01..b33be505361e 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/crash_dump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/crash_dump.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/crash_dump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/crash_dump.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * copy_oldmem_page - copy one page from "oldmem"</div><div class='head'>diff --git a/arch/sh/kernel/disassemble.c b/arch/sh/kernel/disassemble.c<br/>index 64d5d8dded7c..015fee58014b 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/disassemble.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/disassemble.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/disassemble.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/disassemble.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Format of an instruction in memory.</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/sh/kernel/dma-nommu.c b/arch/sh/kernel/dma-nommu.c<br/>index eadb669a7329..d24c707b2181 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/dma-nommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/dma-nommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/dma-nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/dma-nommu.c</a></div><div class='hunk'>@@ -18,7 +18,9 @@ static dma_addr_t nommu_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 	dma_addr_t addr = page_to_phys(page) + offset;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(size == 0);</div><div class='del'>-	dma_cache_sync(dev, page_address(page) + offset, size, dir);</div><div class='add'>+</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		dma_cache_sync(dev, page_address(page) + offset, size, dir);</div><div class='ctx'> </div><div class='ctx'> 	return addr;</div><div class='ctx'> }</div><div class='hunk'>@@ -35,7 +37,8 @@ static int nommu_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 	for_each_sg(sg, s, nents, i) {</div><div class='ctx'> 		BUG_ON(!sg_page(s));</div><div class='ctx'> </div><div class='del'>-		dma_cache_sync(dev, sg_virt(s), s-&gt;length, dir);</div><div class='add'>+		if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+			dma_cache_sync(dev, sg_virt(s), s-&gt;length, dir);</div><div class='ctx'> </div><div class='ctx'> 		s-&gt;dma_address = sg_phys(s);</div><div class='ctx'> 		s-&gt;dma_length = s-&gt;length;</div><div class='hunk'>@@ -62,7 +65,7 @@ static void nommu_sync_sg(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops nommu_dma_ops = {</div><div class='add'>+const struct dma_map_ops nommu_dma_ops = {</div><div class='ctx'> 	.alloc			= dma_generic_alloc_coherent,</div><div class='ctx'> 	.free			= dma_generic_free_coherent,</div><div class='ctx'> 	.map_page		= nommu_map_page,</div><div class='head'>diff --git a/arch/sh/kernel/dumpstack.c b/arch/sh/kernel/dumpstack.c<br/>index 8dfe645bcc4b..b564b1eae4ae 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/dumpstack.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/dumpstack.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/dumpstack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/dumpstack.c</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='ctx'> #include &lt;linux/debug_locks.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/hw_breakpoint.c b/arch/sh/kernel/hw_breakpoint.c<br/>index 2197fc584186..afe965712a69 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/hw_breakpoint.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/hw_breakpoint.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/hw_breakpoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/hw_breakpoint.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/hw_breakpoint.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c<br/>index f8ce36286cea..4d4e7a2a774b 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/io_trapped.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/io_trapped.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/io_trapped.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/io_trapped.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/io_trapped.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c<br/>index 6c0378c0b8b5..04487e8fc9b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/irq.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;cpu/mmu_context.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -99,7 +99,7 @@ static inline void handle_one_irq(unsigned int irq)</div><div class='ctx'> 			"mov	%0, r4		\n"</div><div class='ctx'> 			"mov	r15, r8		\n"</div><div class='ctx'> 			"jsr	@%1		\n"</div><div class='del'>-			/* swith to the irq stack */</div><div class='add'>+			/* switch to the irq stack */</div><div class='ctx'> 			" mov	%2, r15		\n"</div><div class='ctx'> 			/* restore the stack (ring zero) */</div><div class='ctx'> 			"mov	r8, r15		\n"</div><div class='head'>diff --git a/arch/sh/kernel/kgdb.c b/arch/sh/kernel/kgdb.c<br/>index adad46e41a1d..4f04c6638a4d 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/kgdb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/kgdb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/kgdb.c</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/kprobes.c b/arch/sh/kernel/kprobes.c<br/>index 83acbf3f6de8..52a5e11247d1 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/kprobes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/kprobes.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/kprobes.c</a></div><div class='hunk'>@@ -9,13 +9,13 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;</div><div class='ctx'> DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);</div><div class='head'>diff --git a/arch/sh/kernel/nmi_debug.c b/arch/sh/kernel/nmi_debug.c<br/>index ff0abbd1e652..730d928f0d12 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/nmi_debug.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/nmi_debug.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/nmi_debug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/nmi_debug.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum nmi_action {</div><div class='head'>diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c<br/>index 53bc6c4c84ec..f8a695a223dd 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/process.c</a></div><div class='hunk'>@@ -1,10 +1,12 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/stackprotector.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct kmem_cache *task_xstate_cachep = NULL;</div><div class='ctx'> unsigned int xstate_size;</div><div class='head'>diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c<br/>index ee12e9451874..2c7bdf8cb934 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/process_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/process_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/process_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/process_32.c</a></div><div class='hunk'>@@ -15,6 +15,9 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='hunk'>@@ -23,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/hw_breakpoint.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;linux/stackprotector.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c<br/>index 9d3e9916555d..ee2abe96f9f3 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/process_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/process_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/process_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/process_64.c</a></div><div class='hunk'>@@ -25,8 +25,11 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c<br/>index c1a6b89bfe70..5fc3ff606210 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/ptrace_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/ptrace_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/ptrace_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/ptrace_32.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -26,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/regset.h&gt;</div><div class='ctx'> #include &lt;linux/hw_breakpoint.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c<br/>index 5cea973a65b2..1e0656d9e7af 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/ptrace_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/ptrace_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/ptrace_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/ptrace_64.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -32,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/regset.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c<br/>index e7b49d81053e..3a44c753b642 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/setup.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_fdt.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/sh_ksyms_64.c b/arch/sh/kernel/sh_ksyms_64.c<br/>index 26a0774f5272..6ee3740e009e 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/sh_ksyms_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/sh_ksyms_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/sh_ksyms_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/sh_ksyms_64.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c<br/>index f7c3d5c25caf..08bce11badc6 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/signal_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/signal_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/signal_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/signal_32.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -25,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c<br/>index d8a3f0d22809..7b77f1812434 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/signal_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/signal_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/signal_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/signal_64.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c<br/>index 38e7860845db..c483422ea4d0 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/smp.c</a></div><div class='hunk'>@@ -20,7 +20,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -178,8 +179,8 @@ asmlinkage void start_secondary(void)</div><div class='ctx'> 	struct mm_struct *mm = &amp;init_mm;</div><div class='ctx'> </div><div class='ctx'> 	enable_mmu();</div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_count);</div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_users);</div><div class='add'>+	mmgrab(mm);</div><div class='add'>+	mmget(mm);</div><div class='ctx'> 	current-&gt;active_mm = mm;</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	enter_lazy_tlb(mm, current);</div><div class='head'>diff --git a/arch/sh/kernel/stacktrace.c b/arch/sh/kernel/stacktrace.c<br/>index bf989e063a0c..7a73d2763e1b 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/stacktrace.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c<br/>index 8c6a350df751..6576e5ee1fc3 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/sys_sh.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/sys_sh.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/sys_sh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/sys_sh.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/ipc.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/cachectl.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/sys_sh32.c b/arch/sh/kernel/sys_sh32.c<br/>index b66d1c62eb19..a2e1231a90a3 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/sys_sh32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/sys_sh32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/sys_sh32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/sys_sh32.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/sem.h&gt;</div><div class='hunk'>@@ -13,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/ipc.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c<br/>index dfdad72c61ca..b32d1c3a4655 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/traps.c</a></div><div class='hunk'>@@ -4,11 +4,16 @@</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;	/* print_modules */</div><div class='ctx'> #include &lt;asm/unwinder.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c<br/>index ff639342a8be..57cff00cad17 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/traps_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/traps_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/traps_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/traps_32.c</a></div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/alignment.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/kprobes.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c<br/>index d208c27ccc67..014fb08cf133 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/kernel/traps_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/kernel/traps_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/kernel/traps_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/kernel/traps_64.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -25,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/alignment.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/sh/math-emu/math.c b/arch/sh/math-emu/math.c<br/>index 04aa55fa8c75..c86f4360c6ce 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/math-emu/math.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/math-emu/math.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/math-emu/math.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/math-emu/math.c</a></div><div class='hunk'>@@ -10,11 +10,11 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/mm/asids-debugfs.c b/arch/sh/mm/asids-debugfs.c<br/>index bf95fdaedd0c..e5539e0f8e3b 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/asids-debugfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/asids-debugfs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/asids-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/asids-debugfs.c</a></div><div class='hunk'>@@ -20,6 +20,9 @@</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/mm/cache-debugfs.c b/arch/sh/mm/cache-debugfs.c<br/>index 777e50f33c00..4eb9d43578b4 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/cache-debugfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/cache-debugfs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/cache-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/cache-debugfs.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/mm/cache-sh3.c b/arch/sh/mm/cache-sh3.c<br/>index e37523f65195..031634f273fa 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/cache-sh3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/cache-sh3.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/cache-sh3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/cache-sh3.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='head'>diff --git a/arch/sh/mm/cache-sh5.c b/arch/sh/mm/cache-sh5.c<br/>index d1bffbcd9d52..d94dadedf74f 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/cache-sh5.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/cache-sh5.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/cache-sh5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/cache-sh5.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void __weak sh4__flush_region_init(void);</div><div class='head'>diff --git a/arch/sh/mm/cache-sh7705.c b/arch/sh/mm/cache-sh7705.c<br/>index 7729cca727eb..6cd2aa395817 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/cache-sh7705.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/cache-sh7705.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/cache-sh7705.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/cache-sh7705.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='head'>diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c<br/>index 92b6976fde59..d1275adfa0ef 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/consistent.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/consistent.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/consistent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/consistent.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #define PREALLOC_DMA_DEBUG_ENTRIES	4096</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *dma_ops;</div><div class='add'>+const struct dma_map_ops *dma_ops;</div><div class='ctx'> EXPORT_SYMBOL(dma_ops);</div><div class='ctx'> </div><div class='ctx'> static int __init dma_init(void)</div><div class='head'>diff --git a/arch/sh/mm/extable_32.c b/arch/sh/mm/extable_32.c<br/>index c1cf4463d09d..940e871bc816 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/extable_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/extable_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/extable_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/extable_32.c</a></div><div class='hunk'>@@ -4,8 +4,10 @@</div><div class='ctx'>  *   linux/arch/i386/mm/extable.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sh/mm/extable_64.c b/arch/sh/mm/extable_64.c<br/>index f05499688d88..b90cdfad2c78 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/extable_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/extable_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/extable_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/extable_64.c</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long copy_user_memcpy, copy_user_memcpy_end;</div><div class='ctx'> extern void __copy_user_fixup(void);</div><div class='head'>diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c<br/>index 9bf876780cef..6fd1bf7481c7 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/fault.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='head'>diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c<br/>index 6777177807c2..08e7af0be4a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/mmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/mmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/mmap.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/sh/mm/nommu.c b/arch/sh/mm/nommu.c<br/>index 36312d254faf..82f8197b93f6 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/nommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/nommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/nommu.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Nothing too terribly exciting here ..</div><div class='head'>diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c<br/>index 7160c9fd6fe3..7b2cc490ebb7 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/pmb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/pmb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/pmb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/pmb.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='head'>diff --git a/arch/sh/mm/tlb-sh3.c b/arch/sh/mm/tlb-sh3.c<br/>index 6554fb439f0e..5c66665bff8b 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/tlb-sh3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/tlb-sh3.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/tlb-sh3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/tlb-sh3.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='head'>diff --git a/arch/sh/mm/tlbex_64.c b/arch/sh/mm/tlbex_64.c<br/>index 8557548fc53e..8ff966dd0c74 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/tlbex_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/tlbex_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/tlbex_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/tlbex_64.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/mm/tlbflush_64.c b/arch/sh/mm/tlbflush_64.c<br/>index f33fdd2558e8..bd0715d5dca4 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/mm/tlbflush_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/mm/tlbflush_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/mm/tlbflush_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/mm/tlbflush_64.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/oprofile/backtrace.c b/arch/sh/oprofile/backtrace.c<br/>index 9c88dcd56e86..c7695f99c8c3 100644<br/>--- a/<a href='/drm-misc/tree/arch/sh/oprofile/backtrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sh/oprofile/backtrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sh/oprofile/backtrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sh/oprofile/backtrace.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/unwinder.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig<br/>index 165ecdd24d22..68ac5c7cd982 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/Kconfig</a></div><div class='hunk'>@@ -44,6 +44,7 @@ config SPARC</div><div class='ctx'> 	select CPU_NO_EFFICIENT_FFS</div><div class='ctx'> 	select HAVE_ARCH_HARDENED_USERCOPY</div><div class='ctx'> 	select PROVE_LOCKING_SMALL if PROVE_LOCKING</div><div class='add'>+	select ARCH_WANT_RELAX_ORDER</div><div class='ctx'> </div><div class='ctx'> config SPARC32</div><div class='ctx'> 	def_bool !64BIT</div><div class='hunk'>@@ -155,6 +156,9 @@ config PGTABLE_LEVELS</div><div class='ctx'> 	default 4 if 64BIT</div><div class='ctx'> 	default 3</div><div class='ctx'> </div><div class='add'>+config ARCH_SUPPORTS_UPROBES</div><div class='add'>+	def_bool y if SPARC64</div><div class='add'>+</div><div class='ctx'> source "init/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "kernel/Kconfig.freezer"</div><div class='head'>diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig<br/>index 3583d676a916..b2e650d1764f 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/configs/sparc64_defconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/configs/sparc64_defconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/configs/sparc64_defconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/configs/sparc64_defconfig</a></div><div class='hunk'>@@ -213,6 +213,7 @@ CONFIG_SCHEDSTATS=y</div><div class='ctx'> # CONFIG_RCU_CPU_STALL_DETECTOR is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> CONFIG_BLK_DEV_IO_TRACE=y</div><div class='add'>+CONFIG_UPROBE_EVENTS=y</div><div class='ctx'> CONFIG_KEYS=y</div><div class='ctx'> CONFIG_CRYPTO_NULL=m</div><div class='ctx'> CONFIG_CRYPTO_TEST=m</div><div class='head'>diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild<br/>index cfc918067f80..e9e837bc3158 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/Kbuild</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += div64.h</div><div class='ctx'> generic-y += emergency-restart.h</div><div class='ctx'> generic-y += exec.h</div><div class='hunk'>@@ -15,7 +14,6 @@ generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='ctx'> generic-y += module.h</div><div class='del'>-generic-y += mutex.h</div><div class='ctx'> generic-y += preempt.h</div><div class='ctx'> generic-y += rwsem.h</div><div class='ctx'> generic-y += serial.h</div><div class='head'>diff --git a/arch/sparc/include/asm/checksum_32.h b/arch/sparc/include/asm/checksum_32.h<br/>index eff748c871ec..e25af5fc99fd 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/checksum_32.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/checksum_32.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/checksum_32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/checksum_32.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* computes the checksum of a memory block at buff, length len,</div><div class='ctx'>  * and adds in "sum" (32-bit)</div><div class='head'>diff --git a/arch/sparc/include/asm/checksum_64.h b/arch/sparc/include/asm/checksum_64.h<br/>index 0395d75322e9..96a5ed58cea6 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/checksum_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/checksum_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/checksum_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/checksum_64.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* computes the checksum of a memory block at buff, length len,</div><div class='ctx'>  * and adds in "sum" (32-bit)</div><div class='head'>diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h<br/>index 1180ae254154..69cc627779f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -18,20 +18,20 @@ static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,</div><div class='ctx'> 	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops *dma_ops;</div><div class='del'>-extern struct dma_map_ops *leon_dma_ops;</div><div class='del'>-extern struct dma_map_ops pci32_dma_ops;</div><div class='add'>+extern const struct dma_map_ops *dma_ops;</div><div class='add'>+extern const struct dma_map_ops *leon_dma_ops;</div><div class='add'>+extern const struct dma_map_ops pci32_dma_ops;</div><div class='ctx'> </div><div class='ctx'> extern struct bus_type pci_bus_type;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_SPARC_LEON</div><div class='ctx'> 	if (sparc_cpu_model == sparc_leon)</div><div class='ctx'> 		return leon_dma_ops;</div><div class='ctx'> #endif</div><div class='ctx'> #if defined(CONFIG_SPARC32) &amp;&amp; defined(CONFIG_PCI)</div><div class='del'>-	if (dev-&gt;bus == &amp;pci_bus_type)</div><div class='add'>+	if (bus == &amp;pci_bus_type)</div><div class='ctx'> 		return &amp;pci32_dma_ops;</div><div class='ctx'> #endif</div><div class='ctx'> 	return dma_ops;</div><div class='head'>diff --git a/arch/sparc/include/asm/kdebug_64.h b/arch/sparc/include/asm/kdebug_64.h<br/>index 04465de8f3b5..867286bf7b1a 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/kdebug_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/kdebug_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/kdebug_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/kdebug_64.h</a></div><div class='hunk'>@@ -10,6 +10,8 @@ enum die_val {</div><div class='ctx'> 	DIE_OOPS = 1,</div><div class='ctx'> 	DIE_DEBUG,	/* ta 0x70 */</div><div class='ctx'> 	DIE_DEBUG_2,	/* ta 0x71 */</div><div class='add'>+	DIE_BPT,	/* ta 0x73 */</div><div class='add'>+	DIE_SSTEP,	/* ta 0x74 */</div><div class='ctx'> 	DIE_DIE,</div><div class='ctx'> 	DIE_TRAP,</div><div class='ctx'> 	DIE_TRAP_TL1,</div><div class='head'>diff --git a/arch/sparc/include/asm/kprobes.h b/arch/sparc/include/asm/kprobes.h<br/>index a145d798e112..49f8402035d7 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/kprobes.h</a></div><div class='hunk'>@@ -1,13 +1,17 @@</div><div class='ctx'> #ifndef _SPARC64_KPROBES_H</div><div class='ctx'> #define _SPARC64_KPROBES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='add'>+#define BREAKPOINT_INSTRUCTION   0x91d02070 /* ta 0x70 */</div><div class='add'>+#define BREAKPOINT_INSTRUCTION_2 0x91d02071 /* ta 0x71 */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef u32 kprobe_opcode_t;</div><div class='ctx'> </div><div class='del'>-#define BREAKPOINT_INSTRUCTION   0x91d02070 /* ta 0x70 */</div><div class='del'>-#define BREAKPOINT_INSTRUCTION_2 0x91d02071 /* ta 0x71 */</div><div class='ctx'> #define MAX_INSN_SIZE 2</div><div class='ctx'> </div><div class='ctx'> #define kretprobe_blacklist_size 0</div><div class='hunk'>@@ -48,4 +52,6 @@ int kprobe_exceptions_notify(struct notifier_block *self,</div><div class='ctx'> int kprobe_fault_handler(struct pt_regs *regs, int trapnr);</div><div class='ctx'> asmlinkage void __kprobes kprobe_trap(unsigned long trap_level,</div><div class='ctx'> 				      struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='ctx'> #endif /* _SPARC64_KPROBES_H */</div><div class='head'>diff --git a/arch/sparc/include/asm/mmu_context_64.h b/arch/sparc/include/asm/mmu_context_64.h<br/>index b84be675e507..22fede6eba11 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/mmu_context_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/mmu_context_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/mmu_context_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/mmu_context_64.h</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/spitfire.h&gt;</div><div class='ctx'> #include &lt;asm-generic/mm_hooks.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -35,15 +37,15 @@ void __tsb_context_switch(unsigned long pgd_pa,</div><div class='ctx'> static inline void tsb_context_switch(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	__tsb_context_switch(__pa(mm-&gt;pgd),</div><div class='del'>-			     &amp;mm-&gt;context.tsb_block[0],</div><div class='add'>+			     &amp;mm-&gt;context.tsb_block[MM_TSB_BASE],</div><div class='ctx'> #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='del'>-			     (mm-&gt;context.tsb_block[1].tsb ?</div><div class='del'>-			      &amp;mm-&gt;context.tsb_block[1] :</div><div class='add'>+			     (mm-&gt;context.tsb_block[MM_TSB_HUGE].tsb ?</div><div class='add'>+			      &amp;mm-&gt;context.tsb_block[MM_TSB_HUGE] :</div><div class='ctx'> 			      NULL)</div><div class='ctx'> #else</div><div class='ctx'> 			     NULL</div><div class='ctx'> #endif</div><div class='del'>-			     , __pa(&amp;mm-&gt;context.tsb_descr[0]));</div><div class='add'>+			     , __pa(&amp;mm-&gt;context.tsb_descr[MM_TSB_BASE]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void tsb_grow(struct mm_struct *mm,</div><div class='head'>diff --git a/arch/sparc/include/asm/page_64.h b/arch/sparc/include/asm/page_64.h<br/>index c1263fc390db..f294dd42fc7d 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/page_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/page_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/page_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/page_64.h</a></div><div class='hunk'>@@ -17,7 +17,8 @@</div><div class='ctx'> </div><div class='ctx'> #define HPAGE_SHIFT		23</div><div class='ctx'> #define REAL_HPAGE_SHIFT	22</div><div class='del'>-</div><div class='add'>+#define HPAGE_256MB_SHIFT	28</div><div class='add'>+#define HPAGE_64K_SHIFT		16</div><div class='ctx'> #define REAL_HPAGE_SIZE		(_AC(1,UL) &lt;&lt; REAL_HPAGE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='hunk'>@@ -26,6 +27,7 @@</div><div class='ctx'> #define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)</div><div class='ctx'> #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA</div><div class='ctx'> #define REAL_HPAGE_PER_HPAGE	(_AC(1,UL) &lt;&lt; (HPAGE_SHIFT - REAL_HPAGE_SHIFT))</div><div class='add'>+#define HUGE_MAX_HSTATE		3</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='head'>diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h<br/>index 1fb317fbc0b3..56e49c8f770d 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/pgtable_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/pgtable_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/pgtable_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/pgtable_64.h</a></div><div class='hunk'>@@ -375,7 +375,10 @@ static inline pgprot_t pgprot_noncached(pgprot_t prot)</div><div class='ctx'> #define pgprot_noncached pgprot_noncached</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='del'>-static inline unsigned long __pte_huge_mask(void)</div><div class='add'>+extern pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma,</div><div class='add'>+				struct page *page, int writable);</div><div class='add'>+#define arch_make_huge_pte arch_make_huge_pte</div><div class='add'>+static inline unsigned long __pte_default_huge_mask(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mask;</div><div class='ctx'> </div><div class='hunk'>@@ -395,12 +398,14 @@ static inline unsigned long __pte_huge_mask(void)</div><div class='ctx'> </div><div class='ctx'> static inline pte_t pte_mkhuge(pte_t pte)</div><div class='ctx'> {</div><div class='del'>-	return __pte(pte_val(pte) | _PAGE_PMD_HUGE | __pte_huge_mask());</div><div class='add'>+	return __pte(pte_val(pte) | __pte_default_huge_mask());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_hugetlb_pte(pte_t pte)</div><div class='add'>+static inline bool is_default_hugetlb_pte(pte_t pte)</div><div class='ctx'> {</div><div class='del'>-	return !!(pte_val(pte) &amp; __pte_huge_mask());</div><div class='add'>+	unsigned long mask = __pte_default_huge_mask();</div><div class='add'>+</div><div class='add'>+	return (pte_val(pte) &amp; mask) == mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool is_hugetlb_pmd(pmd_t pmd)</div><div class='hunk'>@@ -826,7 +831,7 @@ static inline unsigned long __pmd_page(pmd_t pmd)</div><div class='ctx'> #define pgd_page_vaddr(pgd)		\</div><div class='ctx'> 	((unsigned long) __va(pgd_val(pgd)))</div><div class='ctx'> #define pgd_present(pgd)		(pgd_val(pgd) != 0U)</div><div class='del'>-#define pgd_clear(pgdp)			(pgd_val(*(pgd)) = 0UL)</div><div class='add'>+#define pgd_clear(pgdp)			(pgd_val(*(pgdp)) = 0UL)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long pud_large(pud_t pud)</div><div class='ctx'> {</div><div class='hunk'>@@ -873,12 +878,17 @@ static inline unsigned long pud_pfn(pud_t pud)</div><div class='ctx'> #define pte_offset_map			pte_index</div><div class='ctx'> #define pte_unmap(pte)			do { } while (0)</div><div class='ctx'> </div><div class='add'>+/* We cannot include &lt;linux/mm_types.h&gt; at this point yet: */</div><div class='add'>+extern struct mm_struct init_mm;</div><div class='add'>+</div><div class='ctx'> /* Actual page table PTE updates.  */</div><div class='ctx'> void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,</div><div class='del'>-		   pte_t *ptep, pte_t orig, int fullmm);</div><div class='add'>+		   pte_t *ptep, pte_t orig, int fullmm,</div><div class='add'>+		   unsigned int hugepage_shift);</div><div class='ctx'> </div><div class='ctx'> static void maybe_tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,</div><div class='del'>-				pte_t *ptep, pte_t orig, int fullmm)</div><div class='add'>+				pte_t *ptep, pte_t orig, int fullmm,</div><div class='add'>+				unsigned int hugepage_shift)</div><div class='ctx'> {</div><div class='ctx'> 	/* It is more efficient to let flush_tlb_kernel_range()</div><div class='ctx'> 	 * handle init_mm tlb flushes.</div><div class='hunk'>@@ -887,7 +897,7 @@ static void maybe_tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,</div><div class='ctx'> 	 *             and SUN4V pte layout, so this inline test is fine.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (likely(mm != &amp;init_mm) &amp;&amp; pte_accessible(mm, orig))</div><div class='del'>-		tlb_batch_add(mm, vaddr, ptep, orig, fullmm);</div><div class='add'>+		tlb_batch_add(mm, vaddr, ptep, orig, fullmm, hugepage_shift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR</div><div class='hunk'>@@ -906,7 +916,7 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 	pte_t orig = *ptep;</div><div class='ctx'> </div><div class='ctx'> 	*ptep = pte;</div><div class='del'>-	maybe_tlb_batch_add(mm, addr, ptep, orig, fullmm);</div><div class='add'>+	maybe_tlb_batch_add(mm, addr, ptep, orig, fullmm, PAGE_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define set_pte_at(mm,addr,ptep,pte)	\</div><div class='head'>diff --git a/arch/sparc/include/asm/processor_32.h b/arch/sparc/include/asm/processor_32.h<br/>index 812fd08f3e62..365d4cb267b4 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/processor_32.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/processor_32.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/processor_32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/processor_32.h</a></div><div class='hunk'>@@ -119,7 +119,6 @@ extern struct task_struct *last_task_used_math;</div><div class='ctx'> int do_mathemu(struct pt_regs *regs, struct task_struct *fpt);</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()	barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> extern void (*sparc_idle)(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/asm/processor_64.h<br/>index ce2595c89471..6448cfc8292f 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/processor_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/processor_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/processor_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/processor_64.h</a></div><div class='hunk'>@@ -216,7 +216,6 @@ unsigned long get_wchan(struct task_struct *task);</div><div class='ctx'> 				     "nop\n\t"				\</div><div class='ctx'> 				     ".previous"			\</div><div class='ctx'> 				     ::: "memory")</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> /* Prefetch support.  This is tuned for UltraSPARC-III and later.</div><div class='ctx'>  * UltraSPARC-I will treat these as nops, and UltraSPARC-II has</div><div class='head'>diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h<br/>index bac6a946ee00..ca57f08bd3db 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/ptrace.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/ptrace.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/ptrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/ptrace.h</a></div><div class='hunk'>@@ -61,7 +61,10 @@ extern union global_cpu_snapshot global_cpu_snapshot[NR_CPUS];</div><div class='ctx'> #define force_successful_syscall_return() set_thread_noerror(1)</div><div class='ctx'> #define user_mode(regs) (!((regs)-&gt;tstate &amp; TSTATE_PRIV))</div><div class='ctx'> #define instruction_pointer(regs) ((regs)-&gt;tpc)</div><div class='del'>-#define instruction_pointer_set(regs, val) ((regs)-&gt;tpc = (val))</div><div class='add'>+#define instruction_pointer_set(regs, val) do { \</div><div class='add'>+		(regs)-&gt;tpc = (val); \</div><div class='add'>+		(regs)-&gt;tnpc = (val)+4; \</div><div class='add'>+	} while (0)</div><div class='ctx'> #define user_stack_pointer(regs) ((regs)-&gt;u_regs[UREG_FP])</div><div class='ctx'> static inline int is_syscall_success(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -77,6 +80,36 @@ unsigned long profile_pc(struct pt_regs *);</div><div class='ctx'> #else</div><div class='ctx'> #define profile_pc(regs) instruction_pointer(regs)</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#define MAX_REG_OFFSET (offsetof(struct pt_regs, magic))</div><div class='add'>+</div><div class='add'>+extern int regs_query_register_offset(const char *name);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * regs_get_register() - get register value from its offset</div><div class='add'>+ * @regs:	pt_regs from which register value is gotten</div><div class='add'>+ * @offset:	offset number of the register.</div><div class='add'>+ *</div><div class='add'>+ * regs_get_register returns the value of a register whose</div><div class='add'>+ * offset from @regs. The @offset is the offset of the register</div><div class='add'>+ * in struct pt_regs. If @offset is bigger than MAX_REG_OFFSET,</div><div class='add'>+ * this returns 0.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long regs_get_register(struct pt_regs *regs,</div><div class='add'>+					     unsigned long offset)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(offset &gt;= MAX_REG_OFFSET))</div><div class='add'>+		return 0;</div><div class='add'>+	if (offset == PT_V9_Y)</div><div class='add'>+		return *(unsigned int *)((unsigned long)regs + offset);</div><div class='add'>+	return *(unsigned long *)((unsigned long)regs + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Valid only for Kernel mode traps. */</div><div class='add'>+static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;u_regs[UREG_I6];</div><div class='add'>+}</div><div class='ctx'> #else /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #else /* (defined(__sparc__) &amp;&amp; defined(__arch64__)) */</div><div class='head'>diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h<br/>index 29d64b1758ed..478bf6bb4598 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/setup.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/setup.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/setup.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/setup.h</a></div><div class='hunk'>@@ -59,8 +59,11 @@ extern atomic_t dcpage_flushes;</div><div class='ctx'> extern atomic_t dcpage_flushes_xcall;</div><div class='ctx'> </div><div class='ctx'> extern int sysctl_tsb_ratio;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SERIAL_SUNHV</div><div class='add'>+void sunhv_migrate_hvcons_irq(int cpu);</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='ctx'> void sun_do_break(void);</div><div class='ctx'> extern int stop_a_enabled;</div><div class='ctx'> extern int scons_pwroff;</div><div class='head'>diff --git a/arch/sparc/include/asm/switch_to_32.h b/arch/sparc/include/asm/switch_to_32.h<br/>index 16f10374feb3..475dd4158ae4 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/switch_to_32.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/switch_to_32.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/switch_to_32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/switch_to_32.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@ extern struct thread_info *current_set[NR_CPUS];</div><div class='ctx'>  * Flush windows so that the VM switch which follows</div><div class='ctx'>  * would not pull the stack from under us.</div><div class='ctx'>  *</div><div class='del'>- * SWITCH_ENTER and SWITH_DO_LAZY_FPU do not work yet (e.g. SMP does not work)</div><div class='add'>+ * SWITCH_ENTER and SWITCH_DO_LAZY_FPU do not work yet (e.g. SMP does not work)</div><div class='ctx'>  * XXX WTF is the above comment? Found in late teen 2.4.x.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='head'>diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h<br/>index 3d7b925f6516..38a24f257b85 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/thread_info_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/thread_info_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/thread_info_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/thread_info_64.h</a></div><div class='hunk'>@@ -180,7 +180,7 @@ register struct thread_info *current_thread_info_reg asm("g6");</div><div class='ctx'> #define TIF_NEED_RESCHED	3	/* rescheduling necessary */</div><div class='ctx'> /* flag bit 4 is available */</div><div class='ctx'> #define TIF_UNALIGNED		5	/* allowed to do unaligned accesses */</div><div class='del'>-/* flag bit 6 is available */</div><div class='add'>+#define TIF_UPROBE		6	/* breakpointed or singlestepped */</div><div class='ctx'> #define TIF_32BIT		7	/* 32-bit binary */</div><div class='ctx'> #define TIF_NOHZ		8	/* in adaptive nohz mode */</div><div class='ctx'> #define TIF_SECCOMP		9	/* secure computing */</div><div class='hunk'>@@ -199,6 +199,7 @@ register struct thread_info *current_thread_info_reg asm("g6");</div><div class='ctx'> #define _TIF_SIGPENDING		(1&lt;&lt;TIF_SIGPENDING)</div><div class='ctx'> #define _TIF_NEED_RESCHED	(1&lt;&lt;TIF_NEED_RESCHED)</div><div class='ctx'> #define _TIF_UNALIGNED		(1&lt;&lt;TIF_UNALIGNED)</div><div class='add'>+#define _TIF_UPROBE		(1&lt;&lt;TIF_UPROBE)</div><div class='ctx'> #define _TIF_32BIT		(1&lt;&lt;TIF_32BIT)</div><div class='ctx'> #define _TIF_NOHZ		(1&lt;&lt;TIF_NOHZ)</div><div class='ctx'> #define _TIF_SECCOMP		(1&lt;&lt;TIF_SECCOMP)</div><div class='hunk'>@@ -209,7 +210,8 @@ register struct thread_info *current_thread_info_reg asm("g6");</div><div class='ctx'> #define _TIF_USER_WORK_MASK	((0xff &lt;&lt; TI_FLAG_WSAVED_SHIFT) | \</div><div class='ctx'> 				 _TIF_DO_NOTIFY_RESUME_MASK | \</div><div class='ctx'> 				 _TIF_NEED_RESCHED)</div><div class='del'>-#define _TIF_DO_NOTIFY_RESUME_MASK	(_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)</div><div class='add'>+#define _TIF_DO_NOTIFY_RESUME_MASK	(_TIF_NOTIFY_RESUME | \</div><div class='add'>+					 _TIF_SIGPENDING | _TIF_UPROBE)</div><div class='ctx'> </div><div class='ctx'> #define is_32bit_task()	(test_thread_flag(TIF_32BIT))</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/include/asm/tlbflush_64.h b/arch/sparc/include/asm/tlbflush_64.h<br/>index a8e192e90700..54be88a6774c 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/tlbflush_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/tlbflush_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/tlbflush_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/tlbflush_64.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #define TLB_BATCH_NR	192</div><div class='ctx'> </div><div class='ctx'> struct tlb_batch {</div><div class='del'>-	bool huge;</div><div class='add'>+	unsigned int hugepage_shift;</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='ctx'> 	unsigned long tlb_nr;</div><div class='ctx'> 	unsigned long active;</div><div class='hunk'>@@ -17,7 +17,8 @@ struct tlb_batch {</div><div class='ctx'> </div><div class='ctx'> void flush_tsb_kernel_range(unsigned long start, unsigned long end);</div><div class='ctx'> void flush_tsb_user(struct tlb_batch *tb);</div><div class='del'>-void flush_tsb_user_page(struct mm_struct *mm, unsigned long vaddr, bool huge);</div><div class='add'>+void flush_tsb_user_page(struct mm_struct *mm, unsigned long vaddr,</div><div class='add'>+			 unsigned int hugepage_shift);</div><div class='ctx'> </div><div class='ctx'> /* TLB flush operations. */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h<br/>index 7b4898a36eee..ad5293f89680 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/topology_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/topology_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/topology_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/topology_64.h</a></div><div class='hunk'>@@ -41,6 +41,9 @@ int __node_distance(int, int);</div><div class='ctx'> #endif /* !(CONFIG_NUMA) */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cpudata.h&gt;</div><div class='add'>+</div><div class='ctx'> #define topology_physical_package_id(cpu)	(cpu_data(cpu).proc_id)</div><div class='ctx'> #define topology_core_id(cpu)			(cpu_data(cpu).core_id)</div><div class='ctx'> #define topology_core_cpumask(cpu)		(&amp;cpu_core_sib_map[cpu])</div><div class='head'>diff --git a/arch/sparc/include/asm/ttable.h b/arch/sparc/include/asm/ttable.h<br/>index 781b9f1dbdc2..82e7df296abc 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/asm/ttable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/asm/ttable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/ttable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/ttable.h</a></div><div class='hunk'>@@ -186,6 +186,12 @@</div><div class='ctx'> #define KPROBES_TRAP(lvl) TRAP_ARG(bad_trap, lvl)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_UPROBES</div><div class='add'>+#define UPROBES_TRAP(lvl) TRAP_ARG(uprobe_trap, lvl)</div><div class='add'>+#else</div><div class='add'>+#define UPROBES_TRAP(lvl) TRAP_ARG(bad_trap, lvl)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='ctx'> #define KGDB_TRAP(lvl) TRAP_IRQ(kgdb_trap, lvl)</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/sparc/include/asm/uprobes.h b/arch/sparc/include/asm/uprobes.h<br/>new file mode 100644<br/>index 000000000000..36196c17aff8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/asm/uprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/asm/uprobes.h</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+#ifndef _ASM_UPROBES_H</div><div class='add'>+#define _ASM_UPROBES_H</div><div class='add'>+/*</div><div class='add'>+ * User-space Probes (UProbes) for sparc</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2013 Oracle, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software: you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation, either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *     Jose E. Marchesi &lt;jose.marchesi@oracle.com&gt;</div><div class='add'>+ *	Eric Saint Etienne &lt;eric.saint.etienne@oracle.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+typedef u32 uprobe_opcode_t;</div><div class='add'>+</div><div class='add'>+#define MAX_UINSN_BYTES		4</div><div class='add'>+#define UPROBE_XOL_SLOT_BYTES	(MAX_UINSN_BYTES * 2)</div><div class='add'>+</div><div class='add'>+#define UPROBE_SWBP_INSN_SIZE	4</div><div class='add'>+#define UPROBE_SWBP_INSN	0x91d02073 /* ta 0x73 */</div><div class='add'>+#define UPROBE_STP_INSN		0x91d02074 /* ta 0x74 */</div><div class='add'>+</div><div class='add'>+#define ANNUL_BIT (1 &lt;&lt; 29)</div><div class='add'>+</div><div class='add'>+struct arch_uprobe {</div><div class='add'>+	union {</div><div class='add'>+		u8  insn[MAX_UINSN_BYTES];</div><div class='add'>+		u32 ixol;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct arch_uprobe_task {</div><div class='add'>+	u64 saved_tpc;</div><div class='add'>+	u64 saved_tnpc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct task_struct;</div><div class='add'>+struct notifier_block;</div><div class='add'>+</div><div class='add'>+extern int  arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long addr);</div><div class='add'>+extern int  arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs);</div><div class='add'>+extern int  arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs);</div><div class='add'>+extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk);</div><div class='add'>+extern int  arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, void *data);</div><div class='add'>+extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_UPROBES_H */</div><div class='head'>diff --git a/arch/sparc/include/uapi/asm/socket.h b/arch/sparc/include/uapi/asm/socket.h<br/>index 31aede3af088..a25dc32f5d6a 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -86,6 +86,8 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		0x0037</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	0x0038</div><div class='add'>+</div><div class='ctx'> /* Security levels - as per NRL IPv6 - don't actually do anything */</div><div class='ctx'> #define SO_SECURITY_AUTHENTICATION		0x5001</div><div class='ctx'> #define SO_SECURITY_ENCRYPTION_TRANSPORT	0x5002</div><div class='head'>diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile<br/>index fa3c02d41138..aac609889ee4 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/Makefile</a></div><div class='hunk'>@@ -116,4 +116,5 @@ obj-$(CONFIG_COMPAT)    += $(audit--y)</div><div class='ctx'> pc--$(CONFIG_PERF_EVENTS) := perf_event.o</div><div class='ctx'> obj-$(CONFIG_SPARC64)	+= $(pc--y)</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_UPROBES)	+= uprobes.o</div><div class='ctx'> obj-$(CONFIG_SPARC64)	+= jump_label.o</div><div class='head'>diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c<br/>index 742f6c4436bf..9ebc37e7d64c 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/apc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/apc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/apc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/apc.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='ctx'> #include &lt;asm/apc.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/asm-offsets.c b/arch/sparc/kernel/asm-offsets.c<br/>index f76389a32342..3f09e1c83f58 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/asm-offsets.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/asm-offsets.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> // #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kbuild.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c<br/>index f87a55d77094..b542cc7c8d94 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/ds.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/ds.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/ds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/ds.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c<br/>index 852a3291db96..c63ba99ca551 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/iommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/iommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/iommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/iommu.c</a></div><div class='hunk'>@@ -415,7 +415,7 @@ static void dma_4u_unmap_page(struct device *dev, dma_addr_t bus_addr,</div><div class='ctx'> 		ctx = (iopte_val(*base) &amp; IOPTE_CONTEXT) &gt;&gt; 47UL;</div><div class='ctx'> </div><div class='ctx'> 	/* Step 1: Kick data out of streaming buffers if necessary. */</div><div class='del'>-	if (strbuf-&gt;strbuf_enabled)</div><div class='add'>+	if (strbuf-&gt;strbuf_enabled &amp;&amp; !(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='ctx'> 		strbuf_flush(strbuf, iommu, bus_addr, ctx,</div><div class='ctx'> 			     npages, direction);</div><div class='ctx'> </div><div class='hunk'>@@ -640,7 +640,7 @@ static void dma_4u_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 		base = iommu-&gt;page_table + entry;</div><div class='ctx'> </div><div class='ctx'> 		dma_handle &amp;= IO_PAGE_MASK;</div><div class='del'>-		if (strbuf-&gt;strbuf_enabled)</div><div class='add'>+		if (strbuf-&gt;strbuf_enabled &amp;&amp; !(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='ctx'> 			strbuf_flush(strbuf, iommu, dma_handle, ctx,</div><div class='ctx'> 				     npages, direction);</div><div class='ctx'> </div><div class='hunk'>@@ -741,7 +741,7 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;iommu-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops sun4u_dma_ops = {</div><div class='add'>+static const struct dma_map_ops sun4u_dma_ops = {</div><div class='ctx'> 	.alloc			= dma_4u_alloc_coherent,</div><div class='ctx'> 	.free			= dma_4u_free_coherent,</div><div class='ctx'> 	.map_page		= dma_4u_map_page,</div><div class='hunk'>@@ -752,7 +752,7 @@ static struct dma_map_ops sun4u_dma_ops = {</div><div class='ctx'> 	.sync_sg_for_cpu	= dma_4u_sync_sg_for_cpu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *dma_ops = &amp;sun4u_dma_ops;</div><div class='add'>+const struct dma_map_ops *dma_ops = &amp;sun4u_dma_ops;</div><div class='ctx'> EXPORT_SYMBOL(dma_ops);</div><div class='ctx'> </div><div class='ctx'> int dma_supported(struct device *dev, u64 device_mask)</div><div class='head'>diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c<br/>index 2344103414d1..cf20033a1458 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/ioport.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/ioport.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/ioport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/ioport.c</a></div><div class='hunk'>@@ -401,7 +401,7 @@ static void sbus_sync_sg_for_device(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 	BUG();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops sbus_dma_ops = {</div><div class='add'>+static const struct dma_map_ops sbus_dma_ops = {</div><div class='ctx'> 	.alloc			= sbus_alloc_coherent,</div><div class='ctx'> 	.free			= sbus_free_coherent,</div><div class='ctx'> 	.map_page		= sbus_map_page,</div><div class='hunk'>@@ -527,7 +527,7 @@ static dma_addr_t pci32_map_page(struct device *dev, struct page *page,</div><div class='ctx'> static void pci32_unmap_page(struct device *dev, dma_addr_t ba, size_t size,</div><div class='ctx'> 			     enum dma_data_direction dir, unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	if (dir != PCI_DMA_TODEVICE)</div><div class='add'>+	if (dir != PCI_DMA_TODEVICE &amp;&amp; !(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='ctx'> 		dma_make_coherent(ba, PAGE_ALIGN(size));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -572,7 +572,7 @@ static void pci32_unmap_sg(struct device *dev, struct scatterlist *sgl,</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='del'>-	if (dir != PCI_DMA_TODEVICE) {</div><div class='add'>+	if (dir != PCI_DMA_TODEVICE &amp;&amp; !(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)) {</div><div class='ctx'> 		for_each_sg(sgl, sg, nents, n) {</div><div class='ctx'> 			dma_make_coherent(sg_phys(sg), PAGE_ALIGN(sg-&gt;length));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -637,7 +637,7 @@ static void pci32_sync_sg_for_device(struct device *device, struct scatterlist *</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops pci32_dma_ops = {</div><div class='add'>+const struct dma_map_ops pci32_dma_ops = {</div><div class='ctx'> 	.alloc			= pci32_alloc_coherent,</div><div class='ctx'> 	.free			= pci32_free_coherent,</div><div class='ctx'> 	.map_page		= pci32_map_page,</div><div class='hunk'>@@ -652,10 +652,10 @@ struct dma_map_ops pci32_dma_ops = {</div><div class='ctx'> EXPORT_SYMBOL(pci32_dma_ops);</div><div class='ctx'> </div><div class='ctx'> /* leon re-uses pci32_dma_ops */</div><div class='del'>-struct dma_map_ops *leon_dma_ops = &amp;pci32_dma_ops;</div><div class='add'>+const struct dma_map_ops *leon_dma_ops = &amp;pci32_dma_ops;</div><div class='ctx'> EXPORT_SYMBOL(leon_dma_ops);</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *dma_ops = &amp;sbus_dma_ops;</div><div class='add'>+const struct dma_map_ops *dma_ops = &amp;sbus_dma_ops;</div><div class='ctx'> EXPORT_SYMBOL(dma_ops);</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c<br/>index 34a7930b76ef..4d0248aa0928 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/irq_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/irq_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/irq_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/irq_64.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/starfire.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/cpudata.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='hunk'>@@ -1021,7 +1021,7 @@ static void __init alloc_one_queue(unsigned long *pa_ptr, unsigned long qmask)</div><div class='ctx'> 	unsigned long order = get_order(size);</div><div class='ctx'> 	unsigned long p;</div><div class='ctx'> </div><div class='del'>-	p = __get_free_pages(GFP_KERNEL, order);</div><div class='add'>+	p = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order);</div><div class='ctx'> 	if (!p) {</div><div class='ctx'> 		prom_printf("SUN4V: Error, cannot allocate queue.\n");</div><div class='ctx'> 		prom_halt();</div><div class='head'>diff --git a/arch/sparc/kernel/kprobes.c b/arch/sparc/kernel/kprobes.c<br/>index b0377db12d83..2d13a4fc0384 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/kprobes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/kprobes.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/kprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/kprobes.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/context_tracking.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* We do not have hardware single-stepping on sparc64.</div><div class='ctx'>  * So we implement software single-stepping with breakpoint</div><div class='head'>diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c<br/>index 3ae36f36e758..44a3ed93c214 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/led.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/led.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/led.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/led.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/sched/loadavg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c<br/>index 33cd171d933e..afcdd5e4f43f 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/leon_kernel.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/leon_kernel.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/leon_kernel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/leon_kernel.c</a></div><div class='hunk'>@@ -349,37 +349,37 @@ void __init leon_init_timers(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Find GPTIMER Timer Registers base address otherwise bail out. */</div><div class='ctx'> 	nnp = rootnp;</div><div class='del'>-	do {</div><div class='del'>-		np = of_find_node_by_name(nnp, "GAISLER_GPTIMER");</div><div class='del'>-		if (!np) {</div><div class='del'>-			np = of_find_node_by_name(nnp, "01_011");</div><div class='del'>-			if (!np)</div><div class='del'>-				goto bad;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		ampopts = 0;</div><div class='del'>-		pp = of_find_property(np, "ampopts", &amp;len);</div><div class='del'>-		if (pp) {</div><div class='del'>-			ampopts = *(int *)pp-&gt;value;</div><div class='del'>-			if (ampopts == 0) {</div><div class='del'>-				/* Skip this instance, resource already</div><div class='del'>-				 * allocated by other OS */</div><div class='del'>-				nnp = np;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='add'>+retry:</div><div class='add'>+	np = of_find_node_by_name(nnp, "GAISLER_GPTIMER");</div><div class='add'>+	if (!np) {</div><div class='add'>+		np = of_find_node_by_name(nnp, "01_011");</div><div class='add'>+		if (!np)</div><div class='add'>+			goto bad;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ampopts = 0;</div><div class='add'>+	pp = of_find_property(np, "ampopts", &amp;len);</div><div class='add'>+	if (pp) {</div><div class='add'>+		ampopts = *(int *)pp-&gt;value;</div><div class='add'>+		if (ampopts == 0) {</div><div class='add'>+			/* Skip this instance, resource already</div><div class='add'>+			 * allocated by other OS */</div><div class='add'>+			nnp = np;</div><div class='add'>+			goto retry;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Select Timer-Instance on Timer Core. Default is zero */</div><div class='add'>+	leon3_gptimer_idx = ampopts &amp; 0x7;</div><div class='ctx'> </div><div class='del'>-		/* Select Timer-Instance on Timer Core. Default is zero */</div><div class='del'>-		leon3_gptimer_idx = ampopts &amp; 0x7;</div><div class='del'>-</div><div class='del'>-		pp = of_find_property(np, "reg", &amp;len);</div><div class='del'>-		if (pp)</div><div class='del'>-			leon3_gptimer_regs = *(struct leon3_gptimer_regs_map **)</div><div class='del'>-						pp-&gt;value;</div><div class='del'>-		pp = of_find_property(np, "interrupts", &amp;len);</div><div class='del'>-		if (pp)</div><div class='del'>-			leon3_gptimer_irq = *(unsigned int *)pp-&gt;value;</div><div class='del'>-	} while (0);</div><div class='add'>+	pp = of_find_property(np, "reg", &amp;len);</div><div class='add'>+	if (pp)</div><div class='add'>+		leon3_gptimer_regs = *(struct leon3_gptimer_regs_map **)</div><div class='add'>+					pp-&gt;value;</div><div class='add'>+	pp = of_find_property(np, "interrupts", &amp;len);</div><div class='add'>+	if (pp)</div><div class='add'>+		leon3_gptimer_irq = *(unsigned int *)pp-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	if (!(leon3_gptimer_regs &amp;&amp; leon3_irqctrl_regs &amp;&amp; leon3_gptimer_irq))</div><div class='ctx'> 		goto bad;</div><div class='head'>diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c<br/>index 71e16f2241c2..db7acf27bea2 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/leon_smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/leon_smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/leon_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/leon_smp.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;asm/head.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -93,7 +93,7 @@ void leon_cpu_pre_online(void *arg)</div><div class='ctx'> 			     : "memory" /* paranoid */);</div><div class='ctx'> </div><div class='ctx'> 	/* Attach to the address space of init_task. */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> </div><div class='ctx'> 	while (!cpumask_test_cpu(cpuid, &amp;smp_commenced_mask))</div><div class='head'>diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c<br/>index 8a6982dfd733..c0765bbf60ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/mdesc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/mdesc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/mdesc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/mdesc.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='ctx'> #include &lt;asm/mdesc.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c<br/>index a9973bb4a1b2..95e73c63c99d 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/nmi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/nmi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/nmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/nmi.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ static int panic_on_timeout;</div><div class='ctx'>  */</div><div class='ctx'> atomic_t nmi_active = ATOMIC_INIT(0);		/* oprofile uses this */</div><div class='ctx'> EXPORT_SYMBOL(nmi_active);</div><div class='del'>-</div><div class='add'>+static int nmi_init_done;</div><div class='ctx'> static unsigned int nmi_hz = HZ;</div><div class='ctx'> static DEFINE_PER_CPU(short, wd_enabled);</div><div class='ctx'> static int endflag __initdata;</div><div class='hunk'>@@ -153,6 +153,8 @@ static void report_broken_nmi(int cpu, int *prev_nmi_count)</div><div class='ctx'> </div><div class='ctx'> void stop_nmi_watchdog(void *unused)</div><div class='ctx'> {</div><div class='add'>+	if (!__this_cpu_read(wd_enabled))</div><div class='add'>+		return;</div><div class='ctx'> 	pcr_ops-&gt;write_pcr(0, pcr_ops-&gt;pcr_nmi_disable);</div><div class='ctx'> 	__this_cpu_write(wd_enabled, 0);</div><div class='ctx'> 	atomic_dec(&amp;nmi_active);</div><div class='hunk'>@@ -207,6 +209,9 @@ error:</div><div class='ctx'> </div><div class='ctx'> void start_nmi_watchdog(void *unused)</div><div class='ctx'> {</div><div class='add'>+	if (__this_cpu_read(wd_enabled))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	__this_cpu_write(wd_enabled, 1);</div><div class='ctx'> 	atomic_inc(&amp;nmi_active);</div><div class='ctx'> </div><div class='hunk'>@@ -259,6 +264,8 @@ int __init nmi_init(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	nmi_init_done = 1;</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -270,3 +277,38 @@ static int __init setup_nmi_watchdog(char *str)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> __setup("nmi_watchdog=", setup_nmi_watchdog);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sparc specific NMI watchdog enable function.</div><div class='add'>+ * Enables watchdog if it is not enabled already.</div><div class='add'>+ */</div><div class='add'>+int watchdog_nmi_enable(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	if (atomic_read(&amp;nmi_active) == -1) {</div><div class='add'>+		pr_warn("NMI watchdog cannot be enabled or disabled\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * watchdog thread could start even before nmi_init is called.</div><div class='add'>+	 * Just Return in that case. Let nmi_init finish the init</div><div class='add'>+	 * process first.</div><div class='add'>+	 */</div><div class='add'>+	if (!nmi_init_done)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	smp_call_function_single(cpu, start_nmi_watchdog, NULL, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+/*</div><div class='add'>+ * sparc specific NMI watchdog disable function.</div><div class='add'>+ * Disables watchdog if it is not disabled already.</div><div class='add'>+ */</div><div class='add'>+void watchdog_nmi_disable(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	if (atomic_read(&amp;nmi_active) == -1)</div><div class='add'>+		pr_warn_once("NMI watchdog cannot be enabled or disabled\n");</div><div class='add'>+	else</div><div class='add'>+		smp_call_function_single(cpu, stop_nmi_watchdog, NULL, 1);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c<br/>index 9c1878f4fa9f..015e55a7495d 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/pci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/pci.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/pci.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c<br/>index 06981cc716b6..68bec7c97cb8 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/pci_sun4v.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/pci_sun4v.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/pci_sun4v.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/pci_sun4v.c</a></div><div class='hunk'>@@ -242,6 +242,7 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> iommu_map_fail:</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> 	iommu_tbl_range_free(tbl, *dma_addrp, npages, IOMMU_ERROR_CODE);</div><div class='ctx'> </div><div class='ctx'> range_alloc_fail:</div><div class='hunk'>@@ -414,6 +415,7 @@ bad:</div><div class='ctx'> 	return DMA_ERROR_CODE;</div><div class='ctx'> </div><div class='ctx'> iommu_map_fail:</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> 	iommu_tbl_range_free(tbl, bus_addr, npages, IOMMU_ERROR_CODE);</div><div class='ctx'> 	return DMA_ERROR_CODE;</div><div class='ctx'> }</div><div class='hunk'>@@ -478,11 +480,10 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 	BUG_ON(direction == DMA_NONE);</div><div class='ctx'> </div><div class='ctx'> 	iommu = dev-&gt;archdata.iommu;</div><div class='del'>-	atu = iommu-&gt;atu;</div><div class='del'>-</div><div class='ctx'> 	if (nelems == 0 || !iommu)</div><div class='ctx'> 		return 0;</div><div class='del'>-	</div><div class='add'>+	atu = iommu-&gt;atu;</div><div class='add'>+</div><div class='ctx'> 	prot = HV_PCI_MAP_ATTR_READ;</div><div class='ctx'> 	if (direction != DMA_TO_DEVICE)</div><div class='ctx'> 		prot |= HV_PCI_MAP_ATTR_WRITE;</div><div class='hunk'>@@ -668,7 +669,7 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops sun4v_dma_ops = {</div><div class='add'>+static const struct dma_map_ops sun4v_dma_ops = {</div><div class='ctx'> 	.alloc				= dma_4v_alloc_coherent,</div><div class='ctx'> 	.free				= dma_4v_free_coherent,</div><div class='ctx'> 	.map_page			= dma_4v_map_page,</div><div class='head'>diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c<br/>index 24384e1dc33d..a38787b84322 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/pcic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/pcic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/pcic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/pcic.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;asm/pcic.h&gt;</div><div class='ctx'> #include &lt;asm/timex.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "kernel.h"</div><div class='head'>diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c<br/>index 97d123107ecb..f12b23f7b515 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/pmc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/pmc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/pmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/pmc.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/power.c b/arch/sparc/kernel/power.c<br/>index 1836cb965ff8..4b60f385c98f 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/power.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/power.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/power.c</a></div><div class='hunk'>@@ -67,9 +67,4 @@ static struct platform_driver power_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init power_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;power_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-device_initcall(power_init);</div><div class='add'>+builtin_platform_driver(power_driver);</div><div class='head'>diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c<br/>index b7780a5bef11..b6dac8e980f0 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/process_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/process_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/process_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/process_32.c</a></div><div class='hunk'>@@ -14,6 +14,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='hunk'>@@ -28,7 +31,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c<br/>index 47ff5588e521..1badc493e62e 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/process_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/process_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/process_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/process_64.c</a></div><div class='hunk'>@@ -14,6 +14,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -33,7 +36,7 @@</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;linux/context_tracking.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c<br/>index a331fdc11a2c..eca3dc76793c 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/ptrace_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/ptrace_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/ptrace_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/ptrace_32.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "kernel.h"</div><div class='head'>diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c<br/>index ac082dd8c67d..df9e731a76f5 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/ptrace_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/ptrace_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/ptrace_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/ptrace_64.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='hunk'>@@ -31,7 +32,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/psrcompat.h&gt;</div><div class='ctx'> #include &lt;asm/visasm.h&gt;</div><div class='ctx'> #include &lt;asm/spitfire.h&gt;</div><div class='hunk'>@@ -46,6 +47,43 @@</div><div class='ctx'> </div><div class='ctx'> /* #define ALLOW_INIT_TRACING */</div><div class='ctx'> </div><div class='add'>+struct pt_regs_offset {</div><div class='add'>+	const char *name;</div><div class='add'>+	int offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define REG_OFFSET_NAME(n, r) \</div><div class='add'>+	{.name = n, .offset = (PT_V9_##r)}</div><div class='add'>+#define REG_OFFSET_END {.name = NULL, .offset = 0}</div><div class='add'>+</div><div class='add'>+static const struct pt_regs_offset regoffset_table[] = {</div><div class='add'>+	REG_OFFSET_NAME("g0", G0),</div><div class='add'>+	REG_OFFSET_NAME("g1", G1),</div><div class='add'>+	REG_OFFSET_NAME("g2", G2),</div><div class='add'>+	REG_OFFSET_NAME("g3", G3),</div><div class='add'>+	REG_OFFSET_NAME("g4", G4),</div><div class='add'>+	REG_OFFSET_NAME("g5", G5),</div><div class='add'>+	REG_OFFSET_NAME("g6", G6),</div><div class='add'>+	REG_OFFSET_NAME("g7", G7),</div><div class='add'>+</div><div class='add'>+	REG_OFFSET_NAME("i0", I0),</div><div class='add'>+	REG_OFFSET_NAME("i1", I1),</div><div class='add'>+	REG_OFFSET_NAME("i2", I2),</div><div class='add'>+	REG_OFFSET_NAME("i3", I3),</div><div class='add'>+	REG_OFFSET_NAME("i4", I4),</div><div class='add'>+	REG_OFFSET_NAME("i5", I5),</div><div class='add'>+	REG_OFFSET_NAME("i6", I6),</div><div class='add'>+	REG_OFFSET_NAME("i7", I7),</div><div class='add'>+</div><div class='add'>+	REG_OFFSET_NAME("tstate", TSTATE),</div><div class='add'>+	REG_OFFSET_NAME("pc", TPC),</div><div class='add'>+	REG_OFFSET_NAME("npc", TNPC),</div><div class='add'>+	REG_OFFSET_NAME("y", Y),</div><div class='add'>+	REG_OFFSET_NAME("lr", I7),</div><div class='add'>+</div><div class='add'>+	REG_OFFSET_END,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Called by kernel/ptrace.c when detaching..</div><div class='ctx'>  *</div><div class='hunk'>@@ -1107,3 +1145,20 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)</div><div class='ctx'> 	if (test_thread_flag(TIF_NOHZ))</div><div class='ctx'> 		user_enter();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * regs_query_register_offset() - query register offset from its name</div><div class='add'>+ * @name:	the name of a register</div><div class='add'>+ *</div><div class='add'>+ * regs_query_register_offset() returns the offset of a register in struct</div><div class='add'>+ * pt_regs from its name. If the name is invalid, this returns -EINVAL;</div><div class='add'>+ */</div><div class='add'>+int regs_query_register_offset(const char *name)</div><div class='add'>+{</div><div class='add'>+	const struct pt_regs_offset *roff;</div><div class='add'>+</div><div class='add'>+	for (roff = regoffset_table; roff-&gt;name != NULL; roff++)</div><div class='add'>+		if (!strcmp(roff-&gt;name, name))</div><div class='add'>+			return roff-&gt;offset;</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c<br/>index c4e65cb3280f..6f06058c5ae7 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/setup_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/setup_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/setup_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/setup_32.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ static void prom_sync_me(void)</div><div class='ctx'> 			     "nop\n\t" : : "r" (&amp;trapbase));</div><div class='ctx'> </div><div class='ctx'> 	prom_printf("PROM SYNC COMMAND...\n");</div><div class='del'>-	show_free_areas(0);</div><div class='add'>+	show_free_areas(0, NULL);</div><div class='ctx'> 	if (!is_idle_task(current)) {</div><div class='ctx'> 		local_irq_enable();</div><div class='ctx'> 		sys_sync();</div><div class='head'>diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c<br/>index 91cc2f4ae4d9..b4096bb665b2 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/signal32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/signal32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/signal32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/signal32.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/psrcompat.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c<br/>index 9c0c8fd0b292..62c3e255ae7c 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/signal_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/signal_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/signal_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/signal_32.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c<br/>index 5ee930c48f4c..965d50e833e7 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/signal_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/signal_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/signal_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/signal_64.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/context_tracking.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/fpumacro.h&gt;</div><div class='hunk'>@@ -545,6 +545,8 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)</div><div class='ctx'> void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long thread_info_flags)</div><div class='ctx'> {</div><div class='ctx'> 	user_exit();</div><div class='add'>+	if (thread_info_flags &amp; _TIF_UPROBE)</div><div class='add'>+		uprobe_notify_resume(regs);</div><div class='ctx'> 	if (thread_info_flags &amp; _TIF_SIGPENDING)</div><div class='ctx'> 		do_signal(regs, orig_i0);</div><div class='ctx'> 	if (thread_info_flags &amp; _TIF_NOTIFY_RESUME) {</div><div class='head'>diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c<br/>index 8182f7caf5b1..b3bc0ac757cc 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/smp_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/smp_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/smp_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/smp_64.c</a></div><div class='hunk'>@@ -5,7 +5,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='hunk'>@@ -43,7 +44,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/starfire.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='hunk'>@@ -122,7 +123,7 @@ void smp_callin(void)</div><div class='ctx'> 	current_thread_info()-&gt;new_child = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Attach to the address space of init_task. */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> </div><div class='ctx'> 	/* inform the notifiers about the new cpu */</div><div class='hunk'>@@ -1443,6 +1444,7 @@ void __irq_entry smp_receive_signal_client(int irq, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static void stop_this_cpu(void *dummy)</div><div class='ctx'> {</div><div class='add'>+	set_cpu_online(smp_processor_id(), false);</div><div class='ctx'> 	prom_stopself();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1451,9 +1453,15 @@ void smp_send_stop(void)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	if (tlb_type == hypervisor) {</div><div class='add'>+		int this_cpu = smp_processor_id();</div><div class='add'>+#ifdef CONFIG_SERIAL_SUNHV</div><div class='add'>+		sunhv_migrate_hvcons_irq(this_cpu);</div><div class='add'>+#endif</div><div class='ctx'> 		for_each_online_cpu(cpu) {</div><div class='del'>-			if (cpu == smp_processor_id())</div><div class='add'>+			if (cpu == this_cpu)</div><div class='ctx'> 				continue;</div><div class='add'>+</div><div class='add'>+			set_cpu_online(cpu, false);</div><div class='ctx'> #ifdef CONFIG_SUN_LDOMS</div><div class='ctx'> 			if (ldom_domaining_enabled) {</div><div class='ctx'> 				unsigned long hv_err;</div><div class='head'>diff --git a/arch/sparc/kernel/sstate.c b/arch/sparc/kernel/sstate.c<br/>index c59af546f522..3caed4023589 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/sstate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/sstate.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/sstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sstate.c</a></div><div class='hunk'>@@ -43,8 +43,8 @@ static const char poweroff_msg[32] __attribute__((aligned(32))) =</div><div class='ctx'> 	"Linux powering off";</div><div class='ctx'> static const char rebooting_msg[32] __attribute__((aligned(32))) =</div><div class='ctx'> 	"Linux rebooting";</div><div class='del'>-static const char panicing_msg[32] __attribute__((aligned(32))) =</div><div class='del'>-	"Linux panicing";</div><div class='add'>+static const char panicking_msg[32] __attribute__((aligned(32))) =</div><div class='add'>+	"Linux panicking";</div><div class='ctx'> </div><div class='ctx'> static int sstate_reboot_call(struct notifier_block *np, unsigned long type, void *_unused)</div><div class='ctx'> {</div><div class='hunk'>@@ -76,7 +76,7 @@ static struct notifier_block sstate_reboot_notifier = {</div><div class='ctx'> </div><div class='ctx'> static int sstate_panic_event(struct notifier_block *n, unsigned long event, void *ptr)</div><div class='ctx'> {</div><div class='del'>-	do_set_sstate(HV_SOFT_STATE_TRANSITION, panicing_msg);</div><div class='add'>+	do_set_sstate(HV_SOFT_STATE_TRANSITION, panicking_msg);</div><div class='ctx'> </div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc/kernel/stacktrace.c b/arch/sparc/kernel/stacktrace.c<br/>index e78386a0029f..be4c14cccc05 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/stacktrace.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c<br/>index 9d98e5002a09..af93b50e3ce4 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/sun4d_smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/sun4d_smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/sun4d_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sun4d_smp.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='hunk'>@@ -93,7 +93,7 @@ void sun4d_cpu_pre_online(void *arg)</div><div class='ctx'> 	show_leds(cpuid);</div><div class='ctx'> </div><div class='ctx'> 	/* Attach to the address space of init_task. */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> </div><div class='ctx'> 	local_ops-&gt;cache_all();</div><div class='head'>diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c<br/>index da737c712fa8..aa84da0b2d30 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/sun4m_irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/sun4m_irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/sun4m_irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sun4m_irq.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c<br/>index 278c40abce82..5547fcb1d72d 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/sun4m_smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/sun4m_smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/sun4m_smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sun4m_smp.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='hunk'>@@ -59,7 +59,7 @@ void sun4m_cpu_pre_online(void *arg)</div><div class='ctx'> 			     : "memory" /* paranoid */);</div><div class='ctx'> </div><div class='ctx'> 	/* Attach to the address space of init_task. */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> </div><div class='ctx'> 	while (!cpumask_test_cpu(cpuid, &amp;smp_commenced_mask))</div><div class='head'>diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c<br/>index 022c30c72ebd..bca44f3e6b86 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/sys_sparc32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/sys_sparc32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/sys_sparc32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sys_sparc32.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/fpumacro.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/compat_signal.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c<br/>index 646988d4c1a3..7aecb239626d 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/sys_sparc_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/sys_sparc_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/sys_sparc_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sys_sparc_32.c</a></div><div class='hunk'>@@ -7,7 +7,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='hunk'>@@ -21,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/ipc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "systbls.h"</div><div class='head'>diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c<br/>index fe8b8ee8e660..ef4520efc813 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/sys_sparc_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/sys_sparc_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/sys_sparc_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sys_sparc_64.c</a></div><div class='hunk'>@@ -7,7 +7,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -26,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/context_tracking.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/utrap.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c<br/>index fa8e21abb5e0..d63fc613e7a9 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/sysfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/sysfs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/sysfs.c</a></div><div class='hunk'>@@ -106,7 +106,7 @@ static unsigned long run_on_cpu(unsigned long cpu,</div><div class='ctx'> 	cpumask_t old_affinity;</div><div class='ctx'> 	unsigned long ret;</div><div class='ctx'> </div><div class='del'>-	cpumask_copy(&amp;old_affinity, tsk_cpus_allowed(current));</div><div class='add'>+	cpumask_copy(&amp;old_affinity, &amp;current-&gt;cpus_allowed);</div><div class='ctx'> 	/* should return -EINVAL to userspace */</div><div class='ctx'> 	if (set_cpus_allowed_ptr(current, cpumask_of(cpu)))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -221,7 +221,7 @@ static struct device_attribute cpu_core_attrs[] = {</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct cpu, cpu_devices);</div><div class='ctx'> </div><div class='del'>-static void register_cpu_online(unsigned int cpu)</div><div class='add'>+static int register_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='ctx'> 	struct device *s = &amp;c-&gt;dev;</div><div class='hunk'>@@ -231,11 +231,12 @@ static void register_cpu_online(unsigned int cpu)</div><div class='ctx'> 		device_create_file(s, &amp;cpu_core_attrs[i]);</div><div class='ctx'> </div><div class='ctx'> 	register_mmu_stats(s);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-static void unregister_cpu_online(unsigned int cpu)</div><div class='add'>+static int unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> 	struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='ctx'> 	struct device *s = &amp;c-&gt;dev;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -243,33 +244,10 @@ static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> 	unregister_mmu_stats(s);</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(cpu_core_attrs); i++)</div><div class='ctx'> 		device_remove_file(s, &amp;cpu_core_attrs[i]);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int sysfs_cpu_notify(struct notifier_block *self,</div><div class='del'>-				      unsigned long action, void *hcpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu = (unsigned int)(long)hcpu;</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-	case CPU_ONLINE_FROZEN:</div><div class='del'>-		register_cpu_online(cpu);</div><div class='del'>-		break;</div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-	case CPU_DEAD_FROZEN:</div><div class='del'>-		unregister_cpu_online(cpu);</div><div class='del'>-		break;</div><div class='ctx'> #endif</div><div class='del'>-	}</div><div class='del'>-	return NOTIFY_OK;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block sysfs_cpu_nb = {</div><div class='del'>-	.notifier_call	= sysfs_cpu_notify,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init check_mmu_stats(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long dummy1, err;</div><div class='hunk'>@@ -294,26 +272,21 @@ static void register_nodes(void)</div><div class='ctx'> </div><div class='ctx'> static int __init topology_init(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu;</div><div class='add'>+	int cpu, ret;</div><div class='ctx'> </div><div class='ctx'> 	register_nodes();</div><div class='ctx'> </div><div class='ctx'> 	check_mmu_stats();</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='ctx'> </div><div class='ctx'> 		register_cpu(c, cpu);</div><div class='del'>-		if (cpu_online(cpu))</div><div class='del'>-			register_cpu_online(cpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__register_cpu_notifier(&amp;sysfs_cpu_nb);</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "sparc/topology:online",</div><div class='add'>+				register_cpu_online, unregister_cpu_online);</div><div class='add'>+	WARN_ON(ret &lt; 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c<br/>index 1affabc96b08..244062bdaa56 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/time_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/time_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/time_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/time_32.c</a></div><div class='hunk'>@@ -148,7 +148,7 @@ static unsigned int sbus_cycles_offset(void)</div><div class='ctx'> 	return offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t timer_cs_read(struct clocksource *cs)</div><div class='add'>+static u64 timer_cs_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int seq, offset;</div><div class='ctx'> 	u64 cycles;</div><div class='head'>diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c<br/>index c69b21e51efc..12a6d3555cb8 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/time_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/time_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/time_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/time_64.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/cpudata.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "entry.h"</div><div class='hunk'>@@ -770,7 +770,7 @@ void udelay(unsigned long usecs)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(udelay);</div><div class='ctx'> </div><div class='del'>-static cycle_t clocksource_tick_read(struct clocksource *cs)</div><div class='add'>+static u64 clocksource_tick_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return tick_ops-&gt;get_tick();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c<br/>index 4f21df7d4f13..466d4aed06c7 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/traps_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/traps_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/traps_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/traps_32.c</a></div><div class='hunk'>@@ -9,7 +9,9 @@</div><div class='ctx'>  * I hate traps on the sparc, grrr...</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;  /* for jiffies */</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -448,7 +450,7 @@ void trap_init(void)</div><div class='ctx'> 		thread_info_offsets_are_bolixed_pete();</div><div class='ctx'> </div><div class='ctx'> 	/* Attach to the address space of init_task. */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE: Other cpus have this done as they are started</div><div class='head'>diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c<br/>index 4094a51b1970..196ee5eb4d48 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/traps_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/traps_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/traps_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/traps_64.c</a></div><div class='hunk'>@@ -9,7 +9,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/extable.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -29,7 +30,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/fpumacro.h&gt;</div><div class='ctx'> #include &lt;asm/lsu.h&gt;</div><div class='ctx'> #include &lt;asm/dcu.h&gt;</div><div class='hunk'>@@ -85,7 +86,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)</div><div class='ctx'> </div><div class='ctx'> void bad_trap(struct pt_regs *regs, long lvl)</div><div class='ctx'> {</div><div class='del'>-	char buffer[32];</div><div class='add'>+	char buffer[36];</div><div class='ctx'> 	siginfo_t info;</div><div class='ctx'> </div><div class='ctx'> 	if (notify_die(DIE_TRAP, "bad trap", regs,</div><div class='hunk'>@@ -116,7 +117,7 @@ void bad_trap(struct pt_regs *regs, long lvl)</div><div class='ctx'> </div><div class='ctx'> void bad_trap_tl1(struct pt_regs *regs, long lvl)</div><div class='ctx'> {</div><div class='del'>-	char buffer[32];</div><div class='add'>+	char buffer[36];</div><div class='ctx'> 	</div><div class='ctx'> 	if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,</div><div class='ctx'> 		       0, lvl, SIGTRAP) == NOTIFY_STOP)</div><div class='hunk'>@@ -2051,6 +2052,73 @@ void sun4v_resum_overflow(struct pt_regs *regs)</div><div class='ctx'> 	atomic_inc(&amp;sun4v_resum_oflow_cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Given a set of registers, get the virtual addressi that was being accessed</div><div class='add'>+ * by the faulting instructions at tpc.</div><div class='add'>+ */</div><div class='add'>+static unsigned long sun4v_get_vaddr(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int insn;</div><div class='add'>+</div><div class='add'>+	if (!copy_from_user(&amp;insn, (void __user *)regs-&gt;tpc, 4)) {</div><div class='add'>+		return compute_effective_address(regs, insn,</div><div class='add'>+						 (insn &gt;&gt; 25) &amp; 0x1f);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Attempt to handle non-resumable errors generated from userspace.</div><div class='add'>+ * Returns true if the signal was handled, false otherwise.</div><div class='add'>+ */</div><div class='add'>+bool sun4v_nonresum_error_user_handled(struct pt_regs *regs,</div><div class='add'>+				  struct sun4v_error_entry *ent) {</div><div class='add'>+</div><div class='add'>+	unsigned int attrs = ent-&gt;err_attrs;</div><div class='add'>+</div><div class='add'>+	if (attrs &amp; SUN4V_ERR_ATTRS_MEMORY) {</div><div class='add'>+		unsigned long addr = ent-&gt;err_raddr;</div><div class='add'>+		siginfo_t info;</div><div class='add'>+</div><div class='add'>+		if (addr == ~(u64)0) {</div><div class='add'>+			/* This seems highly unlikely to ever occur */</div><div class='add'>+			pr_emerg("SUN4V NON-RECOVERABLE ERROR: Memory error detected in unknown location!\n");</div><div class='add'>+		} else {</div><div class='add'>+			unsigned long page_cnt = DIV_ROUND_UP(ent-&gt;err_size,</div><div class='add'>+							      PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+			/* Break the unfortunate news. */</div><div class='add'>+			pr_emerg("SUN4V NON-RECOVERABLE ERROR: Memory failed at %016lX\n",</div><div class='add'>+				 addr);</div><div class='add'>+			pr_emerg("SUN4V NON-RECOVERABLE ERROR:   Claiming %lu ages.\n",</div><div class='add'>+				 page_cnt);</div><div class='add'>+</div><div class='add'>+			while (page_cnt-- &gt; 0) {</div><div class='add'>+				if (pfn_valid(addr &gt;&gt; PAGE_SHIFT))</div><div class='add'>+					get_page(pfn_to_page(addr &gt;&gt; PAGE_SHIFT));</div><div class='add'>+				addr += PAGE_SIZE;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		info.si_signo = SIGKILL;</div><div class='add'>+		info.si_errno = 0;</div><div class='add'>+		info.si_trapno = 0;</div><div class='add'>+		force_sig_info(info.si_signo, &amp;info, current);</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	if (attrs &amp; SUN4V_ERR_ATTRS_PIO) {</div><div class='add'>+		siginfo_t info;</div><div class='add'>+</div><div class='add'>+		info.si_signo = SIGBUS;</div><div class='add'>+		info.si_code = BUS_ADRERR;</div><div class='add'>+		info.si_addr = (void __user *)sun4v_get_vaddr(regs);</div><div class='add'>+		force_sig_info(info.si_signo, &amp;info, current);</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Default to doing nothing */</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.</div><div class='ctx'>  * Log the event, clear the first word of the entry, and die.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2075,6 +2143,12 @@ void sun4v_nonresum_error(struct pt_regs *regs, unsigned long offset)</div><div class='ctx'> </div><div class='ctx'> 	put_cpu();</div><div class='ctx'> </div><div class='add'>+	if (!(regs-&gt;tstate &amp; TSTATE_PRIV) &amp;&amp;</div><div class='add'>+	    sun4v_nonresum_error_user_handled(regs, &amp;local_copy)) {</div><div class='add'>+		/* DON'T PANIC: This userspace error was handled. */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> 	/* Check for the special PCI poke sequence. */</div><div class='ctx'> 	if (pci_poke_in_progress &amp;&amp; pci_poke_cpu == cpu) {</div><div class='hunk'>@@ -2764,6 +2838,6 @@ void __init trap_init(void)</div><div class='ctx'> 	/* Attach to the address space of init_task.  On SMP we</div><div class='ctx'> 	 * do this in smp.c:smp_callin for other cpus.</div><div class='ctx'> 	 */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc/kernel/tsb.S b/arch/sparc/kernel/tsb.S<br/>index d568c8207af7..10689cfd0ad4 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/tsb.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/tsb.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/tsb.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/tsb.S</a></div><div class='hunk'>@@ -117,26 +117,11 @@ tsb_miss_page_table_walk_sun4v_fastpath:</div><div class='ctx'> 	/* Valid PTE is now in %g5.  */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='del'>-661:	sethi		%uhi(_PAGE_SZALL_4U), %g7</div><div class='add'>+	sethi		%uhi(_PAGE_PMD_HUGE), %g7</div><div class='ctx'> 	sllx		%g7, 32, %g7</div><div class='del'>-	.section	.sun4v_2insn_patch, "ax"</div><div class='del'>-	.word		661b</div><div class='del'>-	mov		_PAGE_SZALL_4V, %g7</div><div class='del'>-	nop</div><div class='del'>-	.previous</div><div class='del'>-</div><div class='del'>-	and		%g5, %g7, %g2</div><div class='del'>-</div><div class='del'>-661:	sethi		%uhi(_PAGE_SZHUGE_4U), %g7</div><div class='del'>-	sllx		%g7, 32, %g7</div><div class='del'>-	.section	.sun4v_2insn_patch, "ax"</div><div class='del'>-	.word		661b</div><div class='del'>-	mov		_PAGE_SZHUGE_4V, %g7</div><div class='del'>-	nop</div><div class='del'>-	.previous</div><div class='ctx'> </div><div class='del'>-	cmp		%g2, %g7</div><div class='del'>-	bne,pt		%xcc, 60f</div><div class='add'>+	andcc		%g5, %g7, %g0</div><div class='add'>+	be,pt		%xcc, 60f</div><div class='ctx'> 	 nop</div><div class='ctx'> </div><div class='ctx'> 	/* It is a huge page, use huge page TSB entry address we</div><div class='head'>diff --git a/arch/sparc/kernel/ttable_64.S b/arch/sparc/kernel/ttable_64.S<br/>index c6dfdaa29e20..7bd8f6556352 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/ttable_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/ttable_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/ttable_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/ttable_64.S</a></div><div class='hunk'>@@ -165,7 +165,7 @@ tl0_resv169:	BTRAP(0x169) BTRAP(0x16a) BTRAP(0x16b) BTRAP(0x16c)</div><div class='ctx'> tl0_linux64:	LINUX_64BIT_SYSCALL_TRAP</div><div class='ctx'> tl0_gsctx:	TRAP(sparc64_get_context) TRAP(sparc64_set_context)</div><div class='ctx'> tl0_resv170:	KPROBES_TRAP(0x170) KPROBES_TRAP(0x171) KGDB_TRAP(0x172)</div><div class='del'>-tl0_resv173:	BTRAP(0x173) BTRAP(0x174) BTRAP(0x175) BTRAP(0x176) BTRAP(0x177)</div><div class='add'>+tl0_resv173:	UPROBES_TRAP(0x173) UPROBES_TRAP(0x174) BTRAP(0x175) BTRAP(0x176) BTRAP(0x177)</div><div class='ctx'> tl0_resv178:	BTRAP(0x178) BTRAP(0x179) BTRAP(0x17a) BTRAP(0x17b) BTRAP(0x17c)</div><div class='ctx'> tl0_resv17d:	BTRAP(0x17d) BTRAP(0x17e) BTRAP(0x17f)</div><div class='ctx'> #define BTRAPS(x) BTRAP(x) BTRAP(x+1) BTRAP(x+2) BTRAP(x+3) BTRAP(x+4) BTRAP(x+5) BTRAP(x+6) BTRAP(x+7)</div><div class='head'>diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c<br/>index 32b61d1b6379..8367dce5f41b 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/unaligned_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/unaligned_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/unaligned_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/unaligned_32.c</a></div><div class='hunk'>@@ -8,11 +8,11 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c<br/>index 52c00d90d4b4..cda7fd367c4f 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/unaligned_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/unaligned_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/unaligned_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/unaligned_64.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/pstate.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/uprobes.c b/arch/sparc/kernel/uprobes.c<br/>new file mode 100644<br/>index 000000000000..d852ae56ddc1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/uprobes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/uprobes.c</a></div><div class='hunk'>@@ -0,0 +1,331 @@</div><div class='add'>+/*</div><div class='add'>+ * User-space Probes (UProbes) for sparc</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2013 Oracle Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software: you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation, either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Jose E. Marchesi &lt;jose.marchesi@oracle.com&gt;</div><div class='add'>+ *	Eric Saint Etienne &lt;eric.saint.etienne@oracle.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/uprobes.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt; /* For struct task_struct */</div><div class='add'>+#include &lt;linux/kdebug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+/* Compute the address of the breakpoint instruction and return it.</div><div class='add'>+ *</div><div class='add'>+ * Note that uprobe_get_swbp_addr is defined as a weak symbol in</div><div class='add'>+ * kernel/events/uprobe.c.</div><div class='add'>+ */</div><div class='add'>+unsigned long uprobe_get_swbp_addr(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return instruction_pointer(regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void copy_to_page(struct page *page, unsigned long vaddr,</div><div class='add'>+			 const void *src, int len)</div><div class='add'>+{</div><div class='add'>+	void *kaddr = kmap_atomic(page);</div><div class='add'>+</div><div class='add'>+	memcpy(kaddr + (vaddr &amp; ~PAGE_MASK), src, len);</div><div class='add'>+	kunmap_atomic(kaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fill in the xol area with the probed instruction followed by the</div><div class='add'>+ * single-step trap.  Some fixups in the copied instruction are</div><div class='add'>+ * performed at this point.</div><div class='add'>+ *</div><div class='add'>+ * Note that uprobe_xol_copy is defined as a weak symbol in</div><div class='add'>+ * kernel/events/uprobe.c.</div><div class='add'>+ */</div><div class='add'>+void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,</div><div class='add'>+			   void *src, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	const u32 stp_insn = UPROBE_STP_INSN;</div><div class='add'>+	u32 insn = *(u32 *) src;</div><div class='add'>+</div><div class='add'>+	/* Branches annulling their delay slot must be fixed to not do</div><div class='add'>+	 * so.  Clearing the annul bit on these instructions we can be</div><div class='add'>+	 * sure the single-step breakpoint in the XOL slot will be</div><div class='add'>+	 * executed.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	u32 op = (insn &gt;&gt; 30) &amp; 0x3;</div><div class='add'>+	u32 op2 = (insn &gt;&gt; 22) &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	if (op == 0 &amp;&amp;</div><div class='add'>+	    (op2 == 1 || op2 == 2 || op2 == 3 || op2 == 5 || op2 == 6) &amp;&amp;</div><div class='add'>+	    (insn &amp; ANNUL_BIT) == ANNUL_BIT)</div><div class='add'>+		insn &amp;= ~ANNUL_BIT;</div><div class='add'>+</div><div class='add'>+	copy_to_page(page, vaddr, &amp;insn, len);</div><div class='add'>+	copy_to_page(page, vaddr+len, &amp;stp_insn, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Instruction analysis/validity.</div><div class='add'>+ *</div><div class='add'>+ * This function returns 0 on success or a -ve number on error.</div><div class='add'>+ */</div><div class='add'>+int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe,</div><div class='add'>+			     struct mm_struct *mm, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	/* Any unsupported instruction?  Then return -EINVAL  */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If INSN is a relative control transfer instruction, return the</div><div class='add'>+ * corrected branch destination value.</div><div class='add'>+ *</div><div class='add'>+ * Note that regs-&gt;tpc and regs-&gt;tnpc still hold the values of the</div><div class='add'>+ * program counters at the time of the single-step trap due to the</div><div class='add'>+ * execution of the UPROBE_STP_INSN at utask-&gt;xol_vaddr + 4.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static unsigned long relbranch_fixup(u32 insn, struct uprobe_task *utask,</div><div class='add'>+				     struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	/* Branch not taken, no mods necessary.  */</div><div class='add'>+	if (regs-&gt;tnpc == regs-&gt;tpc + 0x4UL)</div><div class='add'>+		return utask-&gt;autask.saved_tnpc + 0x4UL;</div><div class='add'>+</div><div class='add'>+	/* The three cases are call, branch w/prediction,</div><div class='add'>+	 * and traditional branch.</div><div class='add'>+	 */</div><div class='add'>+	if ((insn &amp; 0xc0000000) == 0x40000000 ||</div><div class='add'>+	    (insn &amp; 0xc1c00000) == 0x00400000 ||</div><div class='add'>+	    (insn &amp; 0xc1c00000) == 0x00800000) {</div><div class='add'>+		unsigned long real_pc = (unsigned long) utask-&gt;vaddr;</div><div class='add'>+		unsigned long ixol_addr = utask-&gt;xol_vaddr;</div><div class='add'>+</div><div class='add'>+		/* The instruction did all the work for us</div><div class='add'>+		 * already, just apply the offset to the correct</div><div class='add'>+		 * instruction location.</div><div class='add'>+		 */</div><div class='add'>+		return (real_pc + (regs-&gt;tnpc - ixol_addr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* It is jmpl or some other absolute PC modification instruction,</div><div class='add'>+	 * leave NPC as-is.</div><div class='add'>+	 */</div><div class='add'>+	return regs-&gt;tnpc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If INSN is an instruction which writes its PC location</div><div class='add'>+ * into a destination register, fix that up.</div><div class='add'>+ */</div><div class='add'>+static int retpc_fixup(struct pt_regs *regs, u32 insn,</div><div class='add'>+		       unsigned long real_pc)</div><div class='add'>+{</div><div class='add'>+	unsigned long *slot = NULL;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	/* Simplest case is 'call', which always uses %o7 */</div><div class='add'>+	if ((insn &amp; 0xc0000000) == 0x40000000)</div><div class='add'>+		slot = &amp;regs-&gt;u_regs[UREG_I7];</div><div class='add'>+</div><div class='add'>+	/* 'jmpl' encodes the register inside of the opcode */</div><div class='add'>+	if ((insn &amp; 0xc1f80000) == 0x81c00000) {</div><div class='add'>+		unsigned long rd = ((insn &gt;&gt; 25) &amp; 0x1f);</div><div class='add'>+</div><div class='add'>+		if (rd &lt;= 15) {</div><div class='add'>+			slot = &amp;regs-&gt;u_regs[rd];</div><div class='add'>+		} else {</div><div class='add'>+			unsigned long fp = regs-&gt;u_regs[UREG_FP];</div><div class='add'>+			/* Hard case, it goes onto the stack. */</div><div class='add'>+			flushw_all();</div><div class='add'>+</div><div class='add'>+			rd -= 16;</div><div class='add'>+			if (test_thread_64bit_stack(fp)) {</div><div class='add'>+				unsigned long __user *uslot =</div><div class='add'>+			(unsigned long __user *) (fp + STACK_BIAS) + rd;</div><div class='add'>+				rc = __put_user(real_pc, uslot);</div><div class='add'>+			} else {</div><div class='add'>+				unsigned int __user *uslot = (unsigned int</div><div class='add'>+						__user *) fp + rd;</div><div class='add'>+				rc = __put_user((u32) real_pc, uslot);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (slot != NULL)</div><div class='add'>+		*slot = real_pc;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Single-stepping can be avoided for certain instructions: NOPs and</div><div class='add'>+ * instructions that can be emulated.  This function determines</div><div class='add'>+ * whether the instruction where the uprobe is installed falls in one</div><div class='add'>+ * of these cases and emulates it.</div><div class='add'>+ *</div><div class='add'>+ * This function returns true if the single-stepping can be skipped,</div><div class='add'>+ * false otherwise.</div><div class='add'>+ */</div><div class='add'>+bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	/* We currently only emulate NOP instructions.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (auprobe-&gt;ixol == (1 &lt;&lt; 24)) {</div><div class='add'>+		regs-&gt;tnpc += 4;</div><div class='add'>+		regs-&gt;tpc += 4;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Prepare to execute out of line.  At this point</div><div class='add'>+ * current-&gt;utask-&gt;xol_vaddr points to an allocated XOL slot properly</div><div class='add'>+ * initialized with the original instruction and the single-stepping</div><div class='add'>+ * trap instruction.</div><div class='add'>+ *</div><div class='add'>+ * This function returns 0 on success, any other number on error.</div><div class='add'>+ */</div><div class='add'>+int arch_uprobe_pre_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct uprobe_task *utask = current-&gt;utask;</div><div class='add'>+	struct arch_uprobe_task *autask = &amp;current-&gt;utask-&gt;autask;</div><div class='add'>+</div><div class='add'>+	/* Save the current program counters so they can be restored</div><div class='add'>+	 * later.</div><div class='add'>+	 */</div><div class='add'>+	autask-&gt;saved_tpc = regs-&gt;tpc;</div><div class='add'>+	autask-&gt;saved_tnpc = regs-&gt;tnpc;</div><div class='add'>+</div><div class='add'>+	/* Adjust PC and NPC so the first instruction in the XOL slot</div><div class='add'>+	 * will be executed by the user task.</div><div class='add'>+	 */</div><div class='add'>+	instruction_pointer_set(regs, utask-&gt;xol_vaddr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Prepare to resume execution after the single-step.  Called after</div><div class='add'>+ * single-stepping. To avoid the SMP problems that can occur when we</div><div class='add'>+ * temporarily put back the original opcode to single-step, we</div><div class='add'>+ * single-stepped a copy of the instruction.</div><div class='add'>+ *</div><div class='add'>+ * This function returns 0 on success, any other number on error.</div><div class='add'>+ */</div><div class='add'>+int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct uprobe_task *utask = current-&gt;utask;</div><div class='add'>+	struct arch_uprobe_task *autask = &amp;utask-&gt;autask;</div><div class='add'>+	u32 insn = auprobe-&gt;ixol;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (utask-&gt;state == UTASK_SSTEP_ACK) {</div><div class='add'>+		regs-&gt;tnpc = relbranch_fixup(insn, utask, regs);</div><div class='add'>+		regs-&gt;tpc = autask-&gt;saved_tnpc;</div><div class='add'>+		rc =  retpc_fixup(regs, insn, (unsigned long) utask-&gt;vaddr);</div><div class='add'>+	} else {</div><div class='add'>+		regs-&gt;tnpc = utask-&gt;vaddr+4;</div><div class='add'>+		regs-&gt;tpc = autask-&gt;saved_tnpc+4;</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handler for uprobe traps.  This is called from the traps table and</div><div class='add'>+ * triggers the proper die notification.</div><div class='add'>+ */</div><div class='add'>+asmlinkage void uprobe_trap(struct pt_regs *regs,</div><div class='add'>+			    unsigned long trap_level)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(trap_level != 0x173 &amp;&amp; trap_level != 0x174);</div><div class='add'>+</div><div class='add'>+	/* We are only interested in user-mode code.  Uprobe traps</div><div class='add'>+	 * shall not be present in kernel code.</div><div class='add'>+	 */</div><div class='add'>+	if (!user_mode(regs)) {</div><div class='add'>+		local_irq_enable();</div><div class='add'>+		bad_trap(regs, trap_level);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* trap_level == 0x173 --&gt; ta 0x73</div><div class='add'>+	 * trap_level == 0x174 --&gt; ta 0x74</div><div class='add'>+	 */</div><div class='add'>+	if (notify_die((trap_level == 0x173) ? DIE_BPT : DIE_SSTEP,</div><div class='add'>+				(trap_level == 0x173) ? "bpt" : "sstep",</div><div class='add'>+				regs, 0, trap_level, SIGTRAP) != NOTIFY_STOP)</div><div class='add'>+		bad_trap(regs, trap_level);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Callback routine for handling die notifications.</div><div class='add'>+*/</div><div class='add'>+int arch_uprobe_exception_notify(struct notifier_block *self,</div><div class='add'>+				 unsigned long val, void *data)</div><div class='add'>+{</div><div class='add'>+	int ret = NOTIFY_DONE;</div><div class='add'>+	struct die_args *args = (struct die_args *)data;</div><div class='add'>+</div><div class='add'>+	/* We are only interested in userspace traps */</div><div class='add'>+	if (args-&gt;regs &amp;&amp; !user_mode(args-&gt;regs))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	switch (val) {</div><div class='add'>+	case DIE_BPT:</div><div class='add'>+		if (uprobe_pre_sstep_notifier(args-&gt;regs))</div><div class='add'>+			ret = NOTIFY_STOP;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DIE_SSTEP:</div><div class='add'>+		if (uprobe_post_sstep_notifier(args-&gt;regs))</div><div class='add'>+			ret = NOTIFY_STOP;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function gets called when a XOL instruction either gets</div><div class='add'>+ * trapped or the thread has a fatal signal, so reset the instruction</div><div class='add'>+ * pointer to its probed address.</div><div class='add'>+ */</div><div class='add'>+void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct uprobe_task *utask = current-&gt;utask;</div><div class='add'>+</div><div class='add'>+	instruction_pointer_set(regs, utask-&gt;vaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If xol insn itself traps and generates a signal(Say,</div><div class='add'>+ * SIGILL/SIGSEGV/etc), then detect the case where a singlestepped</div><div class='add'>+ * instruction jumps back to its own address.</div><div class='add'>+ */</div><div class='add'>+bool arch_uprobe_xol_was_trapped(struct task_struct *t)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long</div><div class='add'>+arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr,</div><div class='add'>+				  struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long orig_ret_vaddr = regs-&gt;u_regs[UREG_I7];</div><div class='add'>+</div><div class='add'>+	regs-&gt;u_regs[UREG_I7] = trampoline_vaddr-8;</div><div class='add'>+</div><div class='add'>+	return orig_ret_vaddr + 8;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/sparc/kernel/viohs.c b/arch/sparc/kernel/viohs.c<br/>index 526fcb5d8ce9..b30b30ab3ddd 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/viohs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/viohs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/viohs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/viohs.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ldc.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/visemul.c b/arch/sparc/kernel/visemul.c<br/>index c096c624ac4d..8f35eea2103a 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/visemul.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/visemul.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/visemul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/visemul.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/pstate.h&gt;</div><div class='ctx'> #include &lt;asm/fpumacro.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* OPF field of various VIS instructions.  */</div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> /* 001001011 - two 32-bit merges */</div><div class='ctx'> #define FPMERGE_OPF	0x04b</div><div class='ctx'> </div><div class='del'>-/* 000110001 - 8-by-16-bit partitoned product  */</div><div class='add'>+/* 000110001 - 8-by-16-bit partitioned product  */</div><div class='ctx'> #define FMUL8x16_OPF	0x031</div><div class='ctx'> </div><div class='ctx'> /* 000110011 - 8-by-16-bit upper alpha partitioned product  */</div><div class='head'>diff --git a/arch/sparc/kernel/windows.c b/arch/sparc/kernel/windows.c<br/>index 87bab0a3857a..435a467b0595 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/kernel/windows.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/kernel/windows.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/kernel/windows.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/kernel/windows.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "kernel.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/math-emu/math_32.c b/arch/sparc/math-emu/math_32.c<br/>index 5ce8f2f64604..4d7e0fff054f 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/math-emu/math_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/math-emu/math_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/math-emu/math_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/math-emu/math_32.c</a></div><div class='hunk'>@@ -68,7 +68,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sfp-util_32.h"</div><div class='ctx'> #include &lt;math-emu/soft-fp.h&gt;</div><div class='head'>diff --git a/arch/sparc/math-emu/math_64.c b/arch/sparc/math-emu/math_64.c<br/>index 034aadbff036..9647051853d3 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/math-emu/math_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/math-emu/math_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/math-emu/math_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/math-emu/math_64.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/fpumacro.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sfp-util_64.h"</div><div class='head'>diff --git a/arch/sparc/mm/extable.c b/arch/sparc/mm/extable.c<br/>index a61c349448e1..db214e9931d9 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/extable.c</a></div><div class='hunk'>@@ -3,7 +3,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> void sort_extable(struct exception_table_entry *start,</div><div class='ctx'> 		  struct exception_table_entry *finish)</div><div class='head'>diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c<br/>index 643c149a3151..b84c4dd14954 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/mm/fault_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/mm/fault_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/mm/fault_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/fault_64.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='head'>diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c<br/>index 988acc8b1b80..323bc6b6e3ad 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/mm/hugetlbpage.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/mm/hugetlbpage.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='hunk'>@@ -28,6 +29,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,</div><div class='ctx'> 							unsigned long pgoff,</div><div class='ctx'> 							unsigned long flags)</div><div class='ctx'> {</div><div class='add'>+	struct hstate *h = hstate_file(filp);</div><div class='ctx'> 	unsigned long task_size = TASK_SIZE;</div><div class='ctx'> 	struct vm_unmapped_area_info info;</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +40,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,</div><div class='ctx'> 	info.length = len;</div><div class='ctx'> 	info.low_limit = TASK_UNMAPPED_BASE;</div><div class='ctx'> 	info.high_limit = min(task_size, VA_EXCLUDE_START);</div><div class='del'>-	info.align_mask = PAGE_MASK &amp; ~HPAGE_MASK;</div><div class='add'>+	info.align_mask = PAGE_MASK &amp; ~huge_page_mask(h);</div><div class='ctx'> 	info.align_offset = 0;</div><div class='ctx'> 	addr = vm_unmapped_area(&amp;info);</div><div class='ctx'> </div><div class='hunk'>@@ -58,6 +60,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,</div><div class='ctx'> 				  const unsigned long pgoff,</div><div class='ctx'> 				  const unsigned long flags)</div><div class='ctx'> {</div><div class='add'>+	struct hstate *h = hstate_file(filp);</div><div class='ctx'> 	struct mm_struct *mm = current-&gt;mm;</div><div class='ctx'> 	unsigned long addr = addr0;</div><div class='ctx'> 	struct vm_unmapped_area_info info;</div><div class='hunk'>@@ -69,7 +72,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,</div><div class='ctx'> 	info.length = len;</div><div class='ctx'> 	info.low_limit = PAGE_SIZE;</div><div class='ctx'> 	info.high_limit = mm-&gt;mmap_base;</div><div class='del'>-	info.align_mask = PAGE_MASK &amp; ~HPAGE_MASK;</div><div class='add'>+	info.align_mask = PAGE_MASK &amp; ~huge_page_mask(h);</div><div class='ctx'> 	info.align_offset = 0;</div><div class='ctx'> 	addr = vm_unmapped_area(&amp;info);</div><div class='ctx'> </div><div class='hunk'>@@ -94,6 +97,7 @@ unsigned long</div><div class='ctx'> hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='ctx'> 		unsigned long len, unsigned long pgoff, unsigned long flags)</div><div class='ctx'> {</div><div class='add'>+	struct hstate *h = hstate_file(file);</div><div class='ctx'> 	struct mm_struct *mm = current-&gt;mm;</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='ctx'> 	unsigned long task_size = TASK_SIZE;</div><div class='hunk'>@@ -101,7 +105,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='ctx'> 	if (test_thread_flag(TIF_32BIT))</div><div class='ctx'> 		task_size = STACK_TOP32;</div><div class='ctx'> </div><div class='del'>-	if (len &amp; ~HPAGE_MASK)</div><div class='add'>+	if (len &amp; ~huge_page_mask(h))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (len &gt; task_size)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -113,7 +117,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (addr) {</div><div class='del'>-		addr = ALIGN(addr, HPAGE_SIZE);</div><div class='add'>+		addr = ALIGN(addr, huge_page_size(h));</div><div class='ctx'> 		vma = find_vma(mm, addr);</div><div class='ctx'> 		if (task_size - len &gt;= addr &amp;&amp;</div><div class='ctx'> 		    (!vma || addr + len &lt;= vma-&gt;vm_start))</div><div class='hunk'>@@ -127,17 +131,141 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='ctx'> 				pgoff, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static pte_t sun4u_hugepage_shift_to_tte(pte_t entry, unsigned int shift)</div><div class='add'>+{</div><div class='add'>+	return entry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static pte_t sun4v_hugepage_shift_to_tte(pte_t entry, unsigned int shift)</div><div class='add'>+{</div><div class='add'>+	unsigned long hugepage_size = _PAGE_SZ4MB_4V;</div><div class='add'>+</div><div class='add'>+	pte_val(entry) = pte_val(entry) &amp; ~_PAGE_SZALL_4V;</div><div class='add'>+</div><div class='add'>+	switch (shift) {</div><div class='add'>+	case HPAGE_256MB_SHIFT:</div><div class='add'>+		hugepage_size = _PAGE_SZ256MB_4V;</div><div class='add'>+		pte_val(entry) |= _PAGE_PMD_HUGE;</div><div class='add'>+		break;</div><div class='add'>+	case HPAGE_SHIFT:</div><div class='add'>+		pte_val(entry) |= _PAGE_PMD_HUGE;</div><div class='add'>+		break;</div><div class='add'>+	case HPAGE_64K_SHIFT:</div><div class='add'>+		hugepage_size = _PAGE_SZ64K_4V;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(1, "unsupported hugepage shift=%u\n", shift);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pte_val(entry) = pte_val(entry) | hugepage_size;</div><div class='add'>+	return entry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static pte_t hugepage_shift_to_tte(pte_t entry, unsigned int shift)</div><div class='add'>+{</div><div class='add'>+	if (tlb_type == hypervisor)</div><div class='add'>+		return sun4v_hugepage_shift_to_tte(entry, shift);</div><div class='add'>+	else</div><div class='add'>+		return sun4u_hugepage_shift_to_tte(entry, shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma,</div><div class='add'>+			 struct page *page, int writeable)</div><div class='add'>+{</div><div class='add'>+	unsigned int shift = huge_page_shift(hstate_vma(vma));</div><div class='add'>+</div><div class='add'>+	return hugepage_shift_to_tte(entry, shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int sun4v_huge_tte_to_shift(pte_t entry)</div><div class='add'>+{</div><div class='add'>+	unsigned long tte_szbits = pte_val(entry) &amp; _PAGE_SZALL_4V;</div><div class='add'>+	unsigned int shift;</div><div class='add'>+</div><div class='add'>+	switch (tte_szbits) {</div><div class='add'>+	case _PAGE_SZ256MB_4V:</div><div class='add'>+		shift = HPAGE_256MB_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case _PAGE_SZ4MB_4V:</div><div class='add'>+		shift = REAL_HPAGE_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case _PAGE_SZ64K_4V:</div><div class='add'>+		shift = HPAGE_64K_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		shift = PAGE_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return shift;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int sun4u_huge_tte_to_shift(pte_t entry)</div><div class='add'>+{</div><div class='add'>+	unsigned long tte_szbits = pte_val(entry) &amp; _PAGE_SZALL_4U;</div><div class='add'>+	unsigned int shift;</div><div class='add'>+</div><div class='add'>+	switch (tte_szbits) {</div><div class='add'>+	case _PAGE_SZ256MB_4U:</div><div class='add'>+		shift = HPAGE_256MB_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case _PAGE_SZ4MB_4U:</div><div class='add'>+		shift = REAL_HPAGE_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case _PAGE_SZ64K_4U:</div><div class='add'>+		shift = HPAGE_64K_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		shift = PAGE_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return shift;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int huge_tte_to_shift(pte_t entry)</div><div class='add'>+{</div><div class='add'>+	unsigned long shift;</div><div class='add'>+</div><div class='add'>+	if (tlb_type == hypervisor)</div><div class='add'>+		shift = sun4v_huge_tte_to_shift(entry);</div><div class='add'>+	else</div><div class='add'>+		shift = sun4u_huge_tte_to_shift(entry);</div><div class='add'>+</div><div class='add'>+	if (shift == PAGE_SHIFT)</div><div class='add'>+		WARN_ONCE(1, "tto_to_shift: invalid hugepage tte=0x%lx\n",</div><div class='add'>+			  pte_val(entry));</div><div class='add'>+</div><div class='add'>+	return shift;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long huge_tte_to_size(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	unsigned long size = 1UL &lt;&lt; huge_tte_to_shift(pte);</div><div class='add'>+</div><div class='add'>+	if (size == REAL_HPAGE_SIZE)</div><div class='add'>+		size = HPAGE_SIZE;</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> pte_t *huge_pte_alloc(struct mm_struct *mm,</div><div class='ctx'> 			unsigned long addr, unsigned long sz)</div><div class='ctx'> {</div><div class='ctx'> 	pgd_t *pgd;</div><div class='ctx'> 	pud_t *pud;</div><div class='add'>+	pmd_t *pmd;</div><div class='ctx'> 	pte_t *pte = NULL;</div><div class='ctx'> </div><div class='ctx'> 	pgd = pgd_offset(mm, addr);</div><div class='ctx'> 	pud = pud_alloc(mm, pgd, addr);</div><div class='del'>-	if (pud)</div><div class='del'>-		pte = (pte_t *)pmd_alloc(mm, pud, addr);</div><div class='add'>+	if (pud) {</div><div class='add'>+		pmd = pmd_alloc(mm, pud, addr);</div><div class='add'>+		if (!pmd)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		if (sz == PMD_SHIFT)</div><div class='add'>+			pte = (pte_t *)pmd;</div><div class='add'>+		else</div><div class='add'>+			pte = pte_alloc_map(mm, pmd, addr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return pte;</div><div class='ctx'> }</div><div class='hunk'>@@ -146,49 +274,83 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	pgd_t *pgd;</div><div class='ctx'> 	pud_t *pud;</div><div class='add'>+	pmd_t *pmd;</div><div class='ctx'> 	pte_t *pte = NULL;</div><div class='ctx'> </div><div class='ctx'> 	pgd = pgd_offset(mm, addr);</div><div class='ctx'> 	if (!pgd_none(*pgd)) {</div><div class='ctx'> 		pud = pud_offset(pgd, addr);</div><div class='del'>-		if (!pud_none(*pud))</div><div class='del'>-			pte = (pte_t *)pmd_offset(pud, addr);</div><div class='add'>+		if (!pud_none(*pud)) {</div><div class='add'>+			pmd = pmd_offset(pud, addr);</div><div class='add'>+			if (!pmd_none(*pmd)) {</div><div class='add'>+				if (is_hugetlb_pmd(*pmd))</div><div class='add'>+					pte = (pte_t *)pmd;</div><div class='add'>+				else</div><div class='add'>+					pte = pte_offset_map(pmd, addr);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return pte;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 		     pte_t *ptep, pte_t entry)</div><div class='ctx'> {</div><div class='add'>+	unsigned int i, nptes, orig_shift, shift;</div><div class='add'>+	unsigned long size;</div><div class='ctx'> 	pte_t orig;</div><div class='ctx'> </div><div class='add'>+	size = huge_tte_to_size(entry);</div><div class='add'>+	shift = size &gt;= HPAGE_SIZE ? PMD_SHIFT : PAGE_SHIFT;</div><div class='add'>+	nptes = size &gt;&gt; shift;</div><div class='add'>+</div><div class='ctx'> 	if (!pte_present(*ptep) &amp;&amp; pte_present(entry))</div><div class='del'>-		mm-&gt;context.hugetlb_pte_count++;</div><div class='add'>+		mm-&gt;context.hugetlb_pte_count += nptes;</div><div class='ctx'> </div><div class='del'>-	addr &amp;= HPAGE_MASK;</div><div class='add'>+	addr &amp;= ~(size - 1);</div><div class='ctx'> 	orig = *ptep;</div><div class='del'>-	*ptep = entry;</div><div class='add'>+	orig_shift = pte_none(orig) ? PAGE_SHIFT : huge_tte_to_shift(orig);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nptes; i++)</div><div class='add'>+		ptep[i] = __pte(pte_val(entry) + (i &lt;&lt; shift));</div><div class='ctx'> </div><div class='del'>-	/* Issue TLB flush at REAL_HPAGE_SIZE boundaries */</div><div class='del'>-	maybe_tlb_batch_add(mm, addr, ptep, orig, 0);</div><div class='del'>-	maybe_tlb_batch_add(mm, addr + REAL_HPAGE_SIZE, ptep, orig, 0);</div><div class='add'>+	maybe_tlb_batch_add(mm, addr, ptep, orig, 0, orig_shift);</div><div class='add'>+	/* An HPAGE_SIZE'ed page is composed of two REAL_HPAGE_SIZE'ed pages */</div><div class='add'>+	if (size == HPAGE_SIZE)</div><div class='add'>+		maybe_tlb_batch_add(mm, addr + REAL_HPAGE_SIZE, ptep, orig, 0,</div><div class='add'>+				    orig_shift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 			      pte_t *ptep)</div><div class='ctx'> {</div><div class='add'>+	unsigned int i, nptes, hugepage_shift;</div><div class='add'>+	unsigned long size;</div><div class='ctx'> 	pte_t entry;</div><div class='ctx'> </div><div class='ctx'> 	entry = *ptep;</div><div class='add'>+	size = huge_tte_to_size(entry);</div><div class='add'>+	if (size &gt;= HPAGE_SIZE)</div><div class='add'>+		nptes = size &gt;&gt; PMD_SHIFT;</div><div class='add'>+	else</div><div class='add'>+		nptes = size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	hugepage_shift = pte_none(entry) ? PAGE_SHIFT :</div><div class='add'>+		huge_tte_to_shift(entry);</div><div class='add'>+</div><div class='ctx'> 	if (pte_present(entry))</div><div class='del'>-		mm-&gt;context.hugetlb_pte_count--;</div><div class='add'>+		mm-&gt;context.hugetlb_pte_count -= nptes;</div><div class='ctx'> </div><div class='del'>-	addr &amp;= HPAGE_MASK;</div><div class='del'>-	*ptep = __pte(0UL);</div><div class='add'>+	addr &amp;= ~(size - 1);</div><div class='add'>+	for (i = 0; i &lt; nptes; i++)</div><div class='add'>+		ptep[i] = __pte(0UL);</div><div class='ctx'> </div><div class='del'>-	/* Issue TLB flush at REAL_HPAGE_SIZE boundaries */</div><div class='del'>-	maybe_tlb_batch_add(mm, addr, ptep, entry, 0);</div><div class='del'>-	maybe_tlb_batch_add(mm, addr + REAL_HPAGE_SIZE, ptep, entry, 0);</div><div class='add'>+	maybe_tlb_batch_add(mm, addr, ptep, entry, 0, hugepage_shift);</div><div class='add'>+	/* An HPAGE_SIZE'ed page is composed of two REAL_HPAGE_SIZE'ed pages */</div><div class='add'>+	if (size == HPAGE_SIZE)</div><div class='add'>+		maybe_tlb_batch_add(mm, addr + REAL_HPAGE_SIZE, ptep, entry, 0,</div><div class='add'>+				    hugepage_shift);</div><div class='ctx'> </div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c<br/>index eb8287155279..c6afe98de4d9 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/mm/init_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/mm/init_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/mm/init_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/init_32.c</a></div><div class='hunk'>@@ -55,17 +55,6 @@ extern unsigned int sparc_ramdisk_size;</div><div class='ctx'> </div><div class='ctx'> unsigned long highstart_pfn, highend_pfn;</div><div class='ctx'> </div><div class='del'>-void show_mem(unsigned int filter)</div><div class='del'>-{</div><div class='del'>-	printk("Mem-info:\n");</div><div class='del'>-	show_free_areas(filter);</div><div class='del'>-	printk("Free swap:       %6ldkB\n",</div><div class='del'>-	       get_nr_swap_pages() &lt;&lt; (PAGE_SHIFT-10));</div><div class='del'>-	printk("%ld pages of RAM\n", totalram_pages);</div><div class='del'>-	printk("%ld free pages\n", nr_free_pages());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> unsigned long last_valid_pfn;</div><div class='ctx'> </div><div class='ctx'> unsigned long calc_highpages(void)</div><div class='head'>diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c<br/>index 37aa537b3ad8..ccd455328989 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/mm/init_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/mm/init_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/mm/init_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/init_64.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -324,6 +324,50 @@ static void __update_mmu_tsb_insert(struct mm_struct *mm, unsigned long tsb_inde</div><div class='ctx'> 	tsb_insert(tsb, tag, tte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+static int __init setup_hugepagesz(char *string)</div><div class='add'>+{</div><div class='add'>+	unsigned long long hugepage_size;</div><div class='add'>+	unsigned int hugepage_shift;</div><div class='add'>+	unsigned short hv_pgsz_idx;</div><div class='add'>+	unsigned int hv_pgsz_mask;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	hugepage_size = memparse(string, &amp;string);</div><div class='add'>+	hugepage_shift = ilog2(hugepage_size);</div><div class='add'>+</div><div class='add'>+	switch (hugepage_shift) {</div><div class='add'>+	case HPAGE_256MB_SHIFT:</div><div class='add'>+		hv_pgsz_mask = HV_PGSZ_MASK_256MB;</div><div class='add'>+		hv_pgsz_idx = HV_PGSZ_IDX_256MB;</div><div class='add'>+		break;</div><div class='add'>+	case HPAGE_SHIFT:</div><div class='add'>+		hv_pgsz_mask = HV_PGSZ_MASK_4MB;</div><div class='add'>+		hv_pgsz_idx = HV_PGSZ_IDX_4MB;</div><div class='add'>+		break;</div><div class='add'>+	case HPAGE_64K_SHIFT:</div><div class='add'>+		hv_pgsz_mask = HV_PGSZ_MASK_64K;</div><div class='add'>+		hv_pgsz_idx = HV_PGSZ_IDX_64K;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		hv_pgsz_mask = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((hv_pgsz_mask &amp; cpu_pgsz_mask) == 0U) {</div><div class='add'>+		pr_warn("hugepagesz=%llu not supported by MMU.\n",</div><div class='add'>+			hugepage_size);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hugetlb_add_hstate(hugepage_shift - PAGE_SHIFT);</div><div class='add'>+	rc = 1;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+__setup("hugepagesz=", setup_hugepagesz);</div><div class='add'>+#endif	/* CONFIG_HUGETLB_PAGE */</div><div class='add'>+</div><div class='ctx'> void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t *ptep)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='hunk'>@@ -347,7 +391,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t *</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='ctx'> 	if ((mm-&gt;context.hugetlb_pte_count || mm-&gt;context.thp_pte_count) &amp;&amp;</div><div class='del'>-	    is_hugetlb_pte(pte)) {</div><div class='add'>+	    is_hugetlb_pmd(__pmd(pte_val(pte)))) {</div><div class='ctx'> 		/* We are fabricating 8MB pages using 4MB real hw pages.  */</div><div class='ctx'> 		pte_val(pte) |= (address &amp; (1UL &lt;&lt; REAL_HPAGE_SHIFT));</div><div class='ctx'> 		__update_mmu_tsb_insert(mm, MM_TSB_HUGE, REAL_HPAGE_SHIFT,</div><div class='hunk'>@@ -785,13 +829,23 @@ static void __init find_ramdisk(unsigned long phys_base)</div><div class='ctx'> </div><div class='ctx'> struct node_mem_mask {</div><div class='ctx'> 	unsigned long mask;</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned long match;</div><div class='ctx'> };</div><div class='ctx'> static struct node_mem_mask node_masks[MAX_NUMNODES];</div><div class='ctx'> static int num_node_masks;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NEED_MULTIPLE_NODES</div><div class='ctx'> </div><div class='add'>+struct mdesc_mlgroup {</div><div class='add'>+	u64	node;</div><div class='add'>+	u64	latency;</div><div class='add'>+	u64	match;</div><div class='add'>+	u64	mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mdesc_mlgroup *mlgroups;</div><div class='add'>+static int num_mlgroups;</div><div class='add'>+</div><div class='ctx'> int numa_cpu_lookup_table[NR_CPUS];</div><div class='ctx'> cpumask_t numa_cpumask_lookup_table[MAX_NUMNODES];</div><div class='ctx'> </div><div class='hunk'>@@ -802,78 +856,129 @@ struct mdesc_mblock {</div><div class='ctx'> };</div><div class='ctx'> static struct mdesc_mblock *mblocks;</div><div class='ctx'> static int num_mblocks;</div><div class='del'>-static int find_numa_node_for_addr(unsigned long pa,</div><div class='del'>-				   struct node_mem_mask *pnode_mask);</div><div class='ctx'> </div><div class='del'>-static unsigned long __init ra_to_pa(unsigned long addr)</div><div class='add'>+static struct mdesc_mblock * __init addr_to_mblock(unsigned long addr)</div><div class='ctx'> {</div><div class='add'>+	struct mdesc_mblock *m = NULL;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_mblocks; i++) {</div><div class='del'>-		struct mdesc_mblock *m = &amp;mblocks[i];</div><div class='add'>+		m = &amp;mblocks[i];</div><div class='ctx'> </div><div class='ctx'> 		if (addr &gt;= m-&gt;base &amp;&amp;</div><div class='ctx'> 		    addr &lt; (m-&gt;base + m-&gt;size)) {</div><div class='del'>-			addr += m-&gt;offset;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return addr;</div><div class='add'>+</div><div class='add'>+	return m;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init find_node(unsigned long addr)</div><div class='add'>+static u64 __init memblock_nid_range_sun4u(u64 start, u64 end, int *nid)</div><div class='ctx'> {</div><div class='del'>-	static bool search_mdesc = true;</div><div class='del'>-	static struct node_mem_mask last_mem_mask = { ~0UL, ~0UL };</div><div class='del'>-	static int last_index;</div><div class='del'>-	int i;</div><div class='add'>+	int prev_nid, new_nid;</div><div class='ctx'> </div><div class='del'>-	addr = ra_to_pa(addr);</div><div class='del'>-	for (i = 0; i &lt; num_node_masks; i++) {</div><div class='del'>-		struct node_mem_mask *p = &amp;node_masks[i];</div><div class='add'>+	prev_nid = -1;</div><div class='add'>+	for ( ; start &lt; end; start += PAGE_SIZE) {</div><div class='add'>+		for (new_nid = 0; new_nid &lt; num_node_masks; new_nid++) {</div><div class='add'>+			struct node_mem_mask *p = &amp;node_masks[new_nid];</div><div class='ctx'> </div><div class='del'>-		if ((addr &amp; p-&gt;mask) == p-&gt;val)</div><div class='del'>-			return i;</div><div class='del'>-	}</div><div class='del'>-	/* The following condition has been observed on LDOM guests because</div><div class='del'>-	 * node_masks only contains the best latency mask and value.</div><div class='del'>-	 * LDOM guest's mdesc can contain a single latency group to</div><div class='del'>-	 * cover multiple address range. Print warning message only if the</div><div class='del'>-	 * address cannot be found in node_masks nor mdesc.</div><div class='del'>-	 */</div><div class='del'>-	if ((search_mdesc) &amp;&amp;</div><div class='del'>-	    ((addr &amp; last_mem_mask.mask) != last_mem_mask.val)) {</div><div class='del'>-		/* find the available node in the mdesc */</div><div class='del'>-		last_index = find_numa_node_for_addr(addr, &amp;last_mem_mask);</div><div class='del'>-		numadbg("find_node: latency group for address 0x%lx is %d\n",</div><div class='del'>-			addr, last_index);</div><div class='del'>-		if ((last_index &lt; 0) || (last_index &gt;= num_node_masks)) {</div><div class='del'>-			/* WARN_ONCE() and use default group 0 */</div><div class='del'>-			WARN_ONCE(1, "find_node: A physical address doesn't match a NUMA node rule. Some physical memory will be owned by node 0.");</div><div class='del'>-			search_mdesc = false;</div><div class='del'>-			last_index = 0;</div><div class='add'>+			if ((start &amp; p-&gt;mask) == p-&gt;match) {</div><div class='add'>+				if (prev_nid == -1)</div><div class='add'>+					prev_nid = new_nid;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (new_nid == num_node_masks) {</div><div class='add'>+			prev_nid = 0;</div><div class='add'>+			WARN_ONCE(1, "addr[%Lx] doesn't match a NUMA node rule. Some memory will be owned by node 0.",</div><div class='add'>+				  start);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (prev_nid != new_nid)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='add'>+	*nid = prev_nid;</div><div class='ctx'> </div><div class='del'>-	return last_index;</div><div class='add'>+	return start &gt; end ? end : start;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u64 __init memblock_nid_range(u64 start, u64 end, int *nid)</div><div class='ctx'> {</div><div class='del'>-	*nid = find_node(start);</div><div class='del'>-	start += PAGE_SIZE;</div><div class='del'>-	while (start &lt; end) {</div><div class='del'>-		int n = find_node(start);</div><div class='add'>+	u64 ret_end, pa_start, m_mask, m_match, m_end;</div><div class='add'>+	struct mdesc_mblock *mblock;</div><div class='add'>+	int _nid, i;</div><div class='add'>+</div><div class='add'>+	if (tlb_type != hypervisor)</div><div class='add'>+		return memblock_nid_range_sun4u(start, end, nid);</div><div class='add'>+</div><div class='add'>+	mblock = addr_to_mblock(start);</div><div class='add'>+	if (!mblock) {</div><div class='add'>+		WARN_ONCE(1, "memblock_nid_range: Can't find mblock addr[%Lx]",</div><div class='add'>+			  start);</div><div class='add'>+</div><div class='add'>+		_nid = 0;</div><div class='add'>+		ret_end = end;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (n != *nid)</div><div class='add'>+	pa_start = start + mblock-&gt;offset;</div><div class='add'>+	m_match = 0;</div><div class='add'>+	m_mask = 0;</div><div class='add'>+</div><div class='add'>+	for (_nid = 0; _nid &lt; num_node_masks; _nid++) {</div><div class='add'>+		struct node_mem_mask *const m = &amp;node_masks[_nid];</div><div class='add'>+</div><div class='add'>+		if ((pa_start &amp; m-&gt;mask) == m-&gt;match) {</div><div class='add'>+			m_match = m-&gt;match;</div><div class='add'>+			m_mask = m-&gt;mask;</div><div class='ctx'> 			break;</div><div class='del'>-		start += PAGE_SIZE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_node_masks == _nid) {</div><div class='add'>+		/* We could not find NUMA group, so default to 0, but lets</div><div class='add'>+		 * search for latency group, so we could calculate the correct</div><div class='add'>+		 * end address that we return</div><div class='add'>+		 */</div><div class='add'>+		_nid = 0;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; num_mlgroups; i++) {</div><div class='add'>+			struct mdesc_mlgroup *const m = &amp;mlgroups[i];</div><div class='add'>+</div><div class='add'>+			if ((pa_start &amp; m-&gt;mask) == m-&gt;match) {</div><div class='add'>+				m_match = m-&gt;match;</div><div class='add'>+				m_mask = m-&gt;mask;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == num_mlgroups) {</div><div class='add'>+			WARN_ONCE(1, "memblock_nid_range: Can't find latency group addr[%Lx]",</div><div class='add'>+				  start);</div><div class='add'>+</div><div class='add'>+			ret_end = end;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (start &gt; end)</div><div class='del'>-		start = end;</div><div class='add'>+	/*</div><div class='add'>+	 * Each latency group has match and mask, and each memory block has an</div><div class='add'>+	 * offset.  An address belongs to a latency group if its address matches</div><div class='add'>+	 * the following formula: ((addr + offset) &amp; mask) == match</div><div class='add'>+	 * It is, however, slow to check every single page if it matches a</div><div class='add'>+	 * particular latency group. As optimization we calculate end value by</div><div class='add'>+	 * using bit arithmetics.</div><div class='add'>+	 */</div><div class='add'>+	m_end = m_match + (1ul &lt;&lt; __ffs(m_mask)) - mblock-&gt;offset;</div><div class='add'>+	m_end += pa_start &amp; ~((1ul &lt;&lt; fls64(m_mask)) - 1);</div><div class='add'>+	ret_end = m_end &gt; end ? end : m_end;</div><div class='ctx'> </div><div class='del'>-	return start;</div><div class='add'>+done:</div><div class='add'>+	*nid = _nid;</div><div class='add'>+	return ret_end;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -914,7 +1019,8 @@ static void init_node_masks_nonnuma(void)</div><div class='ctx'> </div><div class='ctx'> 	numadbg("Initializing tables for non-numa.\n");</div><div class='ctx'> </div><div class='del'>-	node_masks[0].mask = node_masks[0].val = 0;</div><div class='add'>+	node_masks[0].mask = 0;</div><div class='add'>+	node_masks[0].match = 0;</div><div class='ctx'> 	num_node_masks = 1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NEED_MULTIPLE_NODES</div><div class='hunk'>@@ -932,15 +1038,6 @@ EXPORT_SYMBOL(numa_cpu_lookup_table);</div><div class='ctx'> EXPORT_SYMBOL(numa_cpumask_lookup_table);</div><div class='ctx'> EXPORT_SYMBOL(node_data);</div><div class='ctx'> </div><div class='del'>-struct mdesc_mlgroup {</div><div class='del'>-	u64	node;</div><div class='del'>-	u64	latency;</div><div class='del'>-	u64	match;</div><div class='del'>-	u64	mask;</div><div class='del'>-};</div><div class='del'>-static struct mdesc_mlgroup *mlgroups;</div><div class='del'>-static int num_mlgroups;</div><div class='del'>-</div><div class='ctx'> static int scan_pio_for_cfg_handle(struct mdesc_handle *md, u64 pio,</div><div class='ctx'> 				   u32 cfg_handle)</div><div class='ctx'> {</div><div class='hunk'>@@ -1029,6 +1126,10 @@ int of_node_to_nid(struct device_node *dp)</div><div class='ctx'> static void __init add_node_ranges(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct memblock_region *reg;</div><div class='add'>+	unsigned long prev_max;</div><div class='add'>+</div><div class='add'>+memblock_resized:</div><div class='add'>+	prev_max = memblock.memory.max;</div><div class='ctx'> </div><div class='ctx'> 	for_each_memblock(memory, reg) {</div><div class='ctx'> 		unsigned long size = reg-&gt;size;</div><div class='hunk'>@@ -1048,6 +1149,8 @@ static void __init add_node_ranges(void)</div><div class='ctx'> </div><div class='ctx'> 			memblock_set_node(start, this_end - start,</div><div class='ctx'> 					  &amp;memblock.memory, nid);</div><div class='add'>+			if (memblock.memory.max != prev_max)</div><div class='add'>+				goto memblock_resized;</div><div class='ctx'> 			start = this_end;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1182,41 +1285,6 @@ int __node_distance(int from, int to)</div><div class='ctx'> 	return numa_latency[from][to];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int find_numa_node_for_addr(unsigned long pa,</div><div class='del'>-				   struct node_mem_mask *pnode_mask)</div><div class='del'>-{</div><div class='del'>-	struct mdesc_handle *md = mdesc_grab();</div><div class='del'>-	u64 node, arc;</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	node = mdesc_node_by_name(md, MDESC_NODE_NULL, "latency-groups");</div><div class='del'>-	if (node == MDESC_NODE_NULL)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	mdesc_for_each_node_by_name(md, node, "group") {</div><div class='del'>-		mdesc_for_each_arc(arc, md, node, MDESC_ARC_TYPE_FWD) {</div><div class='del'>-			u64 target = mdesc_arc_target(md, arc);</div><div class='del'>-			struct mdesc_mlgroup *m = find_mlgroup(target);</div><div class='del'>-</div><div class='del'>-			if (!m)</div><div class='del'>-				continue;</div><div class='del'>-			if ((pa &amp; m-&gt;mask) == m-&gt;match) {</div><div class='del'>-				if (pnode_mask) {</div><div class='del'>-					pnode_mask-&gt;mask = m-&gt;mask;</div><div class='del'>-					pnode_mask-&gt;val = m-&gt;match;</div><div class='del'>-				}</div><div class='del'>-				mdesc_release(md);</div><div class='del'>-				return i;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mdesc_release(md);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init find_best_numa_node_for_mlgroup(struct mdesc_mlgroup *grp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1224,7 +1292,7 @@ static int __init find_best_numa_node_for_mlgroup(struct mdesc_mlgroup *grp)</div><div class='ctx'> 	for (i = 0; i &lt; MAX_NUMNODES; i++) {</div><div class='ctx'> 		struct node_mem_mask *n = &amp;node_masks[i];</div><div class='ctx'> </div><div class='del'>-		if ((grp-&gt;mask == n-&gt;mask) &amp;&amp; (grp-&gt;match == n-&gt;val))</div><div class='add'>+		if ((grp-&gt;mask == n-&gt;mask) &amp;&amp; (grp-&gt;match == n-&gt;match))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return i;</div><div class='hunk'>@@ -1279,10 +1347,10 @@ static int __init numa_attach_mlgroup(struct mdesc_handle *md, u64 grp,</div><div class='ctx'> 	n = &amp;node_masks[num_node_masks++];</div><div class='ctx'> </div><div class='ctx'> 	n-&gt;mask = candidate-&gt;mask;</div><div class='del'>-	n-&gt;val = candidate-&gt;match;</div><div class='add'>+	n-&gt;match = candidate-&gt;match;</div><div class='ctx'> </div><div class='del'>-	numadbg("NUMA NODE[%d]: mask[%lx] val[%lx] (latency[%llx])\n",</div><div class='del'>-		index, n-&gt;mask, n-&gt;val, candidate-&gt;latency);</div><div class='add'>+	numadbg("NUMA NODE[%d]: mask[%lx] match[%lx] (latency[%llx])\n",</div><div class='add'>+		index, n-&gt;mask, n-&gt;match, candidate-&gt;latency);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1379,7 +1447,7 @@ static int __init numa_parse_jbus(void)</div><div class='ctx'> 		numa_cpu_lookup_table[cpu] = index;</div><div class='ctx'> 		cpumask_copy(&amp;numa_cpumask_lookup_table[index], cpumask_of(cpu));</div><div class='ctx'> 		node_masks[index].mask = ~((1UL &lt;&lt; 36UL) - 1UL);</div><div class='del'>-		node_masks[index].val = cpu &lt;&lt; 36UL;</div><div class='add'>+		node_masks[index].match = cpu &lt;&lt; 36UL;</div><div class='ctx'> </div><div class='ctx'> 		index++;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c<br/>index c7f2a5295b3a..def82f6d626f 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/mm/srmmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/mm/srmmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/mm/srmmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/srmmu.c</a></div><div class='hunk'>@@ -1444,7 +1444,7 @@ static void poke_viking(void)</div><div class='ctx'> 	srmmu_set_mmureg(mreg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sparc32_cachetlb_ops viking_ops = {</div><div class='add'>+static struct sparc32_cachetlb_ops viking_ops __ro_after_init = {</div><div class='ctx'> 	.cache_all	= viking_flush_cache_all,</div><div class='ctx'> 	.cache_mm	= viking_flush_cache_mm,</div><div class='ctx'> 	.cache_page	= viking_flush_cache_page,</div><div class='hunk'>@@ -1475,7 +1475,7 @@ static struct sparc32_cachetlb_ops viking_ops = {</div><div class='ctx'>  * flushes going at once will require SMP locking anyways so there's</div><div class='ctx'>  * no real value in trying any harder than this.</div><div class='ctx'>  */</div><div class='del'>-static struct sparc32_cachetlb_ops viking_sun4d_smp_ops = {</div><div class='add'>+static struct sparc32_cachetlb_ops viking_sun4d_smp_ops __ro_after_init = {</div><div class='ctx'> 	.cache_all	= viking_flush_cache_all,</div><div class='ctx'> 	.cache_mm	= viking_flush_cache_mm,</div><div class='ctx'> 	.cache_page	= viking_flush_cache_page,</div><div class='hunk'>@@ -1759,7 +1759,7 @@ static void smp_flush_sig_insns(struct mm_struct *mm, unsigned long insn_addr)</div><div class='ctx'> 	local_ops-&gt;sig_insns(mm, insn_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sparc32_cachetlb_ops smp_cachetlb_ops = {</div><div class='add'>+static struct sparc32_cachetlb_ops smp_cachetlb_ops __ro_after_init = {</div><div class='ctx'> 	.cache_all	= smp_flush_cache_all,</div><div class='ctx'> 	.cache_mm	= smp_flush_cache_mm,</div><div class='ctx'> 	.cache_page	= smp_flush_cache_page,</div><div class='head'>diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c<br/>index c56a195c9071..afda3bbf7854 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/mm/tlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/mm/tlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/mm/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/tlb.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ void arch_leave_lazy_mmu_mode(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tlb_batch_add_one(struct mm_struct *mm, unsigned long vaddr,</div><div class='del'>-			      bool exec, bool huge)</div><div class='add'>+			      bool exec, unsigned int hugepage_shift)</div><div class='ctx'> {</div><div class='ctx'> 	struct tlb_batch *tb = &amp;get_cpu_var(tlb_batch);</div><div class='ctx'> 	unsigned long nr;</div><div class='hunk'>@@ -84,19 +84,19 @@ static void tlb_batch_add_one(struct mm_struct *mm, unsigned long vaddr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!tb-&gt;active) {</div><div class='del'>-		flush_tsb_user_page(mm, vaddr, huge);</div><div class='add'>+		flush_tsb_user_page(mm, vaddr, hugepage_shift);</div><div class='ctx'> 		global_flush_tlb_page(mm, vaddr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (nr == 0) {</div><div class='ctx'> 		tb-&gt;mm = mm;</div><div class='del'>-		tb-&gt;huge = huge;</div><div class='add'>+		tb-&gt;hugepage_shift = hugepage_shift;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tb-&gt;huge != huge) {</div><div class='add'>+	if (tb-&gt;hugepage_shift != hugepage_shift) {</div><div class='ctx'> 		flush_tlb_pending();</div><div class='del'>-		tb-&gt;huge = huge;</div><div class='add'>+		tb-&gt;hugepage_shift = hugepage_shift;</div><div class='ctx'> 		nr = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -110,10 +110,9 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,</div><div class='del'>-		   pte_t *ptep, pte_t orig, int fullmm)</div><div class='add'>+		   pte_t *ptep, pte_t orig, int fullmm,</div><div class='add'>+		   unsigned int hugepage_shift)</div><div class='ctx'> {</div><div class='del'>-	bool huge = is_hugetlb_pte(orig);</div><div class='del'>-</div><div class='ctx'> 	if (tlb_type != hypervisor &amp;&amp;</div><div class='ctx'> 	    pte_dirty(orig)) {</div><div class='ctx'> 		unsigned long paddr, pfn = pte_pfn(orig);</div><div class='hunk'>@@ -139,7 +138,7 @@ void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,</div><div class='ctx'> </div><div class='ctx'> no_cache_flush:</div><div class='ctx'> 	if (!fullmm)</div><div class='del'>-		tlb_batch_add_one(mm, vaddr, pte_exec(orig), huge);</div><div class='add'>+		tlb_batch_add_one(mm, vaddr, pte_exec(orig), hugepage_shift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='head'>diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c<br/>index e20fbbafb0b0..0a04811f06b7 100644<br/>--- a/<a href='/drm-misc/tree/arch/sparc/mm/tsb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/sparc/mm/tsb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/sparc/mm/tsb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/sparc/mm/tsb.c</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='hunk'>@@ -86,6 +88,33 @@ static void __flush_tsb_one(struct tlb_batch *tb, unsigned long hash_shift,</div><div class='ctx'> 		__flush_tsb_one_entry(tsb, tb-&gt;vaddrs[i], hash_shift, nentries);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='add'>+static void __flush_huge_tsb_one_entry(unsigned long tsb, unsigned long v,</div><div class='add'>+				       unsigned long hash_shift,</div><div class='add'>+				       unsigned long nentries,</div><div class='add'>+				       unsigned int hugepage_shift)</div><div class='add'>+{</div><div class='add'>+	unsigned int hpage_entries;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	hpage_entries = 1 &lt;&lt; (hugepage_shift - hash_shift);</div><div class='add'>+	for (i = 0; i &lt; hpage_entries; i++)</div><div class='add'>+		__flush_tsb_one_entry(tsb, v + (i &lt;&lt; hash_shift), hash_shift,</div><div class='add'>+				      nentries);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __flush_huge_tsb_one(struct tlb_batch *tb, unsigned long hash_shift,</div><div class='add'>+				 unsigned long tsb, unsigned long nentries,</div><div class='add'>+				 unsigned int hugepage_shift)</div><div class='add'>+{</div><div class='add'>+	unsigned long i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tb-&gt;tlb_nr; i++)</div><div class='add'>+		__flush_huge_tsb_one_entry(tsb, tb-&gt;vaddrs[i], hash_shift,</div><div class='add'>+					   nentries, hugepage_shift);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void flush_tsb_user(struct tlb_batch *tb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_struct *mm = tb-&gt;mm;</div><div class='hunk'>@@ -93,45 +122,61 @@ void flush_tsb_user(struct tlb_batch *tb)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;mm-&gt;context.lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (!tb-&gt;huge) {</div><div class='add'>+	if (tb-&gt;hugepage_shift &lt; HPAGE_SHIFT) {</div><div class='ctx'> 		base = (unsigned long) mm-&gt;context.tsb_block[MM_TSB_BASE].tsb;</div><div class='ctx'> 		nentries = mm-&gt;context.tsb_block[MM_TSB_BASE].tsb_nentries;</div><div class='ctx'> 		if (tlb_type == cheetah_plus || tlb_type == hypervisor)</div><div class='ctx'> 			base = __pa(base);</div><div class='del'>-		__flush_tsb_one(tb, PAGE_SHIFT, base, nentries);</div><div class='add'>+		if (tb-&gt;hugepage_shift == PAGE_SHIFT)</div><div class='add'>+			__flush_tsb_one(tb, PAGE_SHIFT, base, nentries);</div><div class='add'>+#if defined(CONFIG_HUGETLB_PAGE)</div><div class='add'>+		else</div><div class='add'>+			__flush_huge_tsb_one(tb, PAGE_SHIFT, base, nentries,</div><div class='add'>+					     tb-&gt;hugepage_shift);</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='del'>-	if (tb-&gt;huge &amp;&amp; mm-&gt;context.tsb_block[MM_TSB_HUGE].tsb) {</div><div class='add'>+	else if (mm-&gt;context.tsb_block[MM_TSB_HUGE].tsb) {</div><div class='ctx'> 		base = (unsigned long) mm-&gt;context.tsb_block[MM_TSB_HUGE].tsb;</div><div class='ctx'> 		nentries = mm-&gt;context.tsb_block[MM_TSB_HUGE].tsb_nentries;</div><div class='ctx'> 		if (tlb_type == cheetah_plus || tlb_type == hypervisor)</div><div class='ctx'> 			base = __pa(base);</div><div class='del'>-		__flush_tsb_one(tb, REAL_HPAGE_SHIFT, base, nentries);</div><div class='add'>+		__flush_huge_tsb_one(tb, REAL_HPAGE_SHIFT, base, nentries,</div><div class='add'>+				     tb-&gt;hugepage_shift);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mm-&gt;context.lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void flush_tsb_user_page(struct mm_struct *mm, unsigned long vaddr, bool huge)</div><div class='add'>+void flush_tsb_user_page(struct mm_struct *mm, unsigned long vaddr,</div><div class='add'>+			 unsigned int hugepage_shift)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long nentries, base, flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;mm-&gt;context.lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (!huge) {</div><div class='add'>+	if (hugepage_shift &lt; HPAGE_SHIFT) {</div><div class='ctx'> 		base = (unsigned long) mm-&gt;context.tsb_block[MM_TSB_BASE].tsb;</div><div class='ctx'> 		nentries = mm-&gt;context.tsb_block[MM_TSB_BASE].tsb_nentries;</div><div class='ctx'> 		if (tlb_type == cheetah_plus || tlb_type == hypervisor)</div><div class='ctx'> 			base = __pa(base);</div><div class='del'>-		__flush_tsb_one_entry(base, vaddr, PAGE_SHIFT, nentries);</div><div class='add'>+		if (hugepage_shift == PAGE_SHIFT)</div><div class='add'>+			__flush_tsb_one_entry(base, vaddr, PAGE_SHIFT,</div><div class='add'>+					      nentries);</div><div class='add'>+#if defined(CONFIG_HUGETLB_PAGE)</div><div class='add'>+		else</div><div class='add'>+			__flush_huge_tsb_one_entry(base, vaddr, PAGE_SHIFT,</div><div class='add'>+						   nentries, hugepage_shift);</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='del'>-	if (huge &amp;&amp; mm-&gt;context.tsb_block[MM_TSB_HUGE].tsb) {</div><div class='add'>+	else if (mm-&gt;context.tsb_block[MM_TSB_HUGE].tsb) {</div><div class='ctx'> 		base = (unsigned long) mm-&gt;context.tsb_block[MM_TSB_HUGE].tsb;</div><div class='ctx'> 		nentries = mm-&gt;context.tsb_block[MM_TSB_HUGE].tsb_nentries;</div><div class='ctx'> 		if (tlb_type == cheetah_plus || tlb_type == hypervisor)</div><div class='ctx'> 			base = __pa(base);</div><div class='del'>-		__flush_tsb_one_entry(base, vaddr, REAL_HPAGE_SHIFT, nentries);</div><div class='add'>+		__flush_huge_tsb_one_entry(base, vaddr, REAL_HPAGE_SHIFT,</div><div class='add'>+					   nentries, hugepage_shift);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mm-&gt;context.lock, flags);</div><div class='head'>diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild<br/>index ba35c41c71ff..aa48b6eaff2d 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/Kbuild</a></div><div class='hunk'>@@ -4,8 +4,6 @@ header-y += ../arch/</div><div class='ctx'> generic-y += bug.h</div><div class='ctx'> generic-y += bugs.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='del'>-generic-y += div64.h</div><div class='ctx'> generic-y += emergency-restart.h</div><div class='ctx'> generic-y += errno.h</div><div class='ctx'> generic-y += exec.h</div><div class='hunk'>@@ -21,7 +19,6 @@ generic-y += local64.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='ctx'> generic-y += msgbuf.h</div><div class='del'>-generic-y += mutex.h</div><div class='ctx'> generic-y += param.h</div><div class='ctx'> generic-y += parport.h</div><div class='ctx'> generic-y += poll.h</div><div class='head'>diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h<br/>index 4810e48dbbbf..7d6aaa128e8b 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/include/asm/cache.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/include/asm/cache.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/include/asm/cache.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/cache.h</a></div><div class='hunk'>@@ -50,18 +50,15 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Originally we used small TLB pages for kernel data and grouped some</div><div class='del'>- * things together as "write once", enforcing the property at the end</div><div class='add'>+ * things together as ro-after-init, enforcing the property at the end</div><div class='ctx'>  * of initialization by making those pages read-only and non-coherent.</div><div class='ctx'>  * This allowed better cache utilization since cache inclusion did not</div><div class='ctx'>  * need to be maintained.  However, to do this requires an extra TLB</div><div class='ctx'>  * entry, which on balance is more of a performance hit than the</div><div class='ctx'>  * non-coherence is a performance gain, so we now just make "read</div><div class='del'>- * mostly" and "write once" be synonyms.  We keep the attribute</div><div class='add'>+ * mostly" and "ro-after-init" be synonyms.  We keep the attribute</div><div class='ctx'>  * separate in case we change our minds at a future date.</div><div class='ctx'>  */</div><div class='del'>-#define __write_once __read_mostly</div><div class='del'>-</div><div class='del'>-/* __ro_after_init is the generic name for the tile arch __write_once. */</div><div class='ctx'> #define __ro_after_init __read_mostly</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_TILE_CACHE_H */</div><div class='head'>diff --git a/arch/tile/include/asm/device.h b/arch/tile/include/asm/device.h<br/>index 6ab8bf146d4c..1cf45422a0df 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/include/asm/device.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/include/asm/device.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/device.h</a></div><div class='hunk'>@@ -17,9 +17,6 @@</div><div class='ctx'> #define _ASM_TILE_DEVICE_H</div><div class='ctx'> </div><div class='ctx'> struct dev_archdata {</div><div class='del'>-	/* DMA operations on that device */</div><div class='del'>-        struct dma_map_ops	*dma_ops;</div><div class='del'>-</div><div class='ctx'> 	/* Offset of the DMA address from the PA. */</div><div class='ctx'> 	dma_addr_t		dma_offset;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/tile/include/asm/div64.h b/arch/tile/include/asm/div64.h<br/>new file mode 100644<br/>index 000000000000..9f765cdf09a5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/tile/include/asm/div64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/div64.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+#ifndef _ASM_TILE_DIV64_H</div><div class='add'>+#define _ASM_TILE_DIV64_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef __tilegx__</div><div class='add'>+static inline u64 mul_u32_u32(u32 a, u32 b)</div><div class='add'>+{</div><div class='add'>+	return __insn_mul_lu_lu(a, b);</div><div class='add'>+}</div><div class='add'>+#define mul_u32_u32 mul_u32_u32</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/div64.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_TILE_DIV64_H */</div><div class='head'>diff --git a/arch/tile/include/asm/dma-mapping.h b/arch/tile/include/asm/dma-mapping.h<br/>index 01ceb4a895b0..bbc71a29b2c6 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -24,17 +24,14 @@</div><div class='ctx'> #define ARCH_HAS_DMA_GET_REQUIRED_MASK</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops *tile_dma_map_ops;</div><div class='del'>-extern struct dma_map_ops *gx_pci_dma_map_ops;</div><div class='del'>-extern struct dma_map_ops *gx_legacy_pci_dma_map_ops;</div><div class='del'>-extern struct dma_map_ops *gx_hybrid_pci_dma_map_ops;</div><div class='add'>+extern const struct dma_map_ops *tile_dma_map_ops;</div><div class='add'>+extern const struct dma_map_ops *gx_pci_dma_map_ops;</div><div class='add'>+extern const struct dma_map_ops *gx_legacy_pci_dma_map_ops;</div><div class='add'>+extern const struct dma_map_ops *gx_hybrid_pci_dma_map_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='del'>-	if (dev &amp;&amp; dev-&gt;archdata.dma_ops)</div><div class='del'>-		return dev-&gt;archdata.dma_ops;</div><div class='del'>-	else</div><div class='del'>-		return tile_dma_map_ops;</div><div class='add'>+	return tile_dma_map_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline dma_addr_t get_dma_offset(struct device *dev)</div><div class='hunk'>@@ -59,11 +56,6 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)</div><div class='ctx'> </div><div class='ctx'> static inline void dma_mark_clean(void *addr, size_t size) {}</div><div class='ctx'> </div><div class='del'>-static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;archdata.dma_ops = ops;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	if (!dev-&gt;dma_mask)</div><div class='head'>diff --git a/arch/tile/include/asm/kprobes.h b/arch/tile/include/asm/kprobes.h<br/>index d8f9a83943b1..4a8b1cadca24 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/kprobes.h</a></div><div class='hunk'>@@ -17,10 +17,13 @@</div><div class='ctx'> #ifndef _ASM_TILE_KPROBES_H</div><div class='ctx'> #define _ASM_TILE_KPROBES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;arch/opcode.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __ARCH_WANT_KPROBES_INSN_SLOT</div><div class='hunk'>@@ -76,4 +79,5 @@ void arch_remove_kprobe(struct kprobe *);</div><div class='ctx'> extern int kprobe_exceptions_notify(struct notifier_block *self,</div><div class='ctx'> 			     unsigned long val, void *data);</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='ctx'> #endif /* _ASM_TILE_KPROBES_H */</div><div class='head'>diff --git a/arch/tile/include/asm/mmu_context.h b/arch/tile/include/asm/mmu_context.h<br/>index f67753db1f78..45a4b4c424cf 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'> #define _ASM_TILE_MMU_CONTEXT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='head'>diff --git a/arch/tile/include/asm/processor.h b/arch/tile/include/asm/processor.h<br/>index 0684e88aacd8..0bc9968b97a1 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/processor.h</a></div><div class='hunk'>@@ -264,8 +264,6 @@ static inline void cpu_relax(void)</div><div class='ctx'> 	barrier();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='del'>-</div><div class='ctx'> /* Info on this processor (see fs/proc/cpuinfo.c) */</div><div class='ctx'> struct seq_operations;</div><div class='ctx'> extern const struct seq_operations cpuinfo_op;</div><div class='head'>diff --git a/arch/tile/include/asm/sections.h b/arch/tile/include/asm/sections.h<br/>index 86a746243dc8..50343bfe7936 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/include/asm/sections.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/include/asm/sections.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/include/asm/sections.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/sections.h</a></div><div class='hunk'>@@ -19,9 +19,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/sections.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Write-once data is writable only till the end of initialization. */</div><div class='del'>-extern char __w1data_begin[], __w1data_end[];</div><div class='del'>-</div><div class='ctx'> extern char vdso_start[], vdso_end[];</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> extern char vdso32_start[], vdso32_end[];</div><div class='head'>diff --git a/arch/tile/include/asm/stack.h b/arch/tile/include/asm/stack.h<br/>index c3cb42615a9f..3573325e340b 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/include/asm/stack.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/include/asm/stack.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/include/asm/stack.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/include/asm/stack.h</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/backtrace.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;hv/hypervisor.h&gt;</div><div class='head'>diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c<br/>index c667e104a0c2..0e863f1ee08c 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/compat_signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/compat_signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/compat_signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/compat_signal.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/tile/kernel/kgdb.c b/arch/tile/kernel/kgdb.c<br/>index 9247d6b562f4..d4eb5fb2df9d 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/kgdb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/kgdb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/kgdb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/kgdb.c</a></div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> static tile_bundle_bits singlestep_insn = TILEGX_BPT_BUNDLE | DIE_SSTEPBP;</div><div class='head'>diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c<br/>index 2305084c9b93..09233fbe7801 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/module.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/module.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/module.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/module.c</a></div><div class='hunk'>@@ -43,29 +43,28 @@ void *module_alloc(unsigned long size)</div><div class='ctx'> 	int npages;</div><div class='ctx'> </div><div class='ctx'> 	npages = (size + PAGE_SIZE - 1) / PAGE_SIZE;</div><div class='del'>-	pages = kmalloc(npages * sizeof(struct page *), GFP_KERNEL);</div><div class='add'>+	pages = kmalloc_array(npages, sizeof(*pages), GFP_KERNEL);</div><div class='ctx'> 	if (pages == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	for (; i &lt; npages; ++i) {</div><div class='ctx'> 		pages[i] = alloc_page(GFP_KERNEL | __GFP_HIGHMEM);</div><div class='ctx'> 		if (!pages[i])</div><div class='del'>-			goto error;</div><div class='add'>+			goto free_pages;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	area = __get_vm_area(size, VM_ALLOC, MEM_MODULE_START, MEM_MODULE_END);</div><div class='ctx'> 	if (!area)</div><div class='del'>-		goto error;</div><div class='add'>+		goto free_pages;</div><div class='ctx'> 	area-&gt;nr_pages = npages;</div><div class='ctx'> 	area-&gt;pages = pages;</div><div class='ctx'> </div><div class='ctx'> 	if (map_vm_area(area, prot_rwx, pages)) {</div><div class='ctx'> 		vunmap(area-&gt;addr);</div><div class='del'>-		goto error;</div><div class='add'>+		goto free_pages;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return area-&gt;addr;</div><div class='del'>-</div><div class='del'>-error:</div><div class='add'>+ free_pages:</div><div class='ctx'> 	while (--i &gt;= 0)</div><div class='ctx'> 		__free_page(pages[i]);</div><div class='ctx'> 	kfree(pages);</div><div class='head'>diff --git a/arch/tile/kernel/pci-dma.c b/arch/tile/kernel/pci-dma.c<br/>index 09bb774b39cd..569bb6dd154a 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/pci-dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/pci-dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/pci-dma.c</a></div><div class='hunk'>@@ -213,10 +213,12 @@ static int tile_dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 	for_each_sg(sglist, sg, nents, i) {</div><div class='ctx'> 		sg-&gt;dma_address = sg_phys(sg);</div><div class='del'>-		__dma_prep_pa_range(sg-&gt;dma_address, sg-&gt;length, direction);</div><div class='ctx'> #ifdef CONFIG_NEED_SG_DMA_LENGTH</div><div class='ctx'> 		sg-&gt;dma_length = sg-&gt;length;</div><div class='ctx'> #endif</div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='add'>+		__dma_prep_pa_range(sg-&gt;dma_address, sg-&gt;length, direction);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return nents;</div><div class='hunk'>@@ -232,6 +234,8 @@ static void tile_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='ctx'> 	BUG_ON(!valid_dma_direction(direction));</div><div class='ctx'> 	for_each_sg(sglist, sg, nents, i) {</div><div class='ctx'> 		sg-&gt;dma_address = sg_phys(sg);</div><div class='add'>+		if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+			continue;</div><div class='ctx'> 		__dma_complete_pa_range(sg-&gt;dma_address, sg-&gt;length,</div><div class='ctx'> 					direction);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -245,7 +249,8 @@ static dma_addr_t tile_dma_map_page(struct device *dev, struct page *page,</div><div class='ctx'> 	BUG_ON(!valid_dma_direction(direction));</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(offset + size &gt; PAGE_SIZE);</div><div class='del'>-	__dma_prep_page(page, offset, size, direction);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		__dma_prep_page(page, offset, size, direction);</div><div class='ctx'> </div><div class='ctx'> 	return page_to_pa(page) + offset;</div><div class='ctx'> }</div><div class='hunk'>@@ -256,6 +261,9 @@ static void tile_dma_unmap_page(struct device *dev, dma_addr_t dma_address,</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!valid_dma_direction(direction));</div><div class='ctx'> </div><div class='add'>+	if (attrs &amp; DMA_ATTR_SKIP_CPU_SYNC)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	__dma_complete_page(pfn_to_page(PFN_DOWN(dma_address)),</div><div class='ctx'> 			    dma_address &amp; (PAGE_SIZE - 1), size, direction);</div><div class='ctx'> }</div><div class='hunk'>@@ -321,7 +329,7 @@ tile_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops tile_default_dma_map_ops = {</div><div class='add'>+static const struct dma_map_ops tile_default_dma_map_ops = {</div><div class='ctx'> 	.alloc = tile_dma_alloc_coherent,</div><div class='ctx'> 	.free = tile_dma_free_coherent,</div><div class='ctx'> 	.map_page = tile_dma_map_page,</div><div class='hunk'>@@ -336,7 +344,7 @@ static struct dma_map_ops tile_default_dma_map_ops = {</div><div class='ctx'> 	.dma_supported = tile_dma_supported</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *tile_dma_map_ops = &amp;tile_default_dma_map_ops;</div><div class='add'>+const struct dma_map_ops *tile_dma_map_ops = &amp;tile_default_dma_map_ops;</div><div class='ctx'> EXPORT_SYMBOL(tile_dma_map_ops);</div><div class='ctx'> </div><div class='ctx'> /* Generic PCI DMA mapping functions */</div><div class='hunk'>@@ -508,7 +516,7 @@ tile_pci_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops tile_pci_default_dma_map_ops = {</div><div class='add'>+static const struct dma_map_ops tile_pci_default_dma_map_ops = {</div><div class='ctx'> 	.alloc = tile_pci_dma_alloc_coherent,</div><div class='ctx'> 	.free = tile_pci_dma_free_coherent,</div><div class='ctx'> 	.map_page = tile_pci_dma_map_page,</div><div class='hunk'>@@ -523,7 +531,7 @@ static struct dma_map_ops tile_pci_default_dma_map_ops = {</div><div class='ctx'> 	.dma_supported = tile_pci_dma_supported</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *gx_pci_dma_map_ops = &amp;tile_pci_default_dma_map_ops;</div><div class='add'>+const struct dma_map_ops *gx_pci_dma_map_ops = &amp;tile_pci_default_dma_map_ops;</div><div class='ctx'> EXPORT_SYMBOL(gx_pci_dma_map_ops);</div><div class='ctx'> </div><div class='ctx'> /* PCI DMA mapping functions for legacy PCI devices */</div><div class='hunk'>@@ -544,7 +552,7 @@ static void tile_swiotlb_free_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	swiotlb_free_coherent(dev, size, vaddr, dma_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops pci_swiotlb_dma_ops = {</div><div class='add'>+static const struct dma_map_ops pci_swiotlb_dma_ops = {</div><div class='ctx'> 	.alloc = tile_swiotlb_alloc_coherent,</div><div class='ctx'> 	.free = tile_swiotlb_free_coherent,</div><div class='ctx'> 	.map_page = swiotlb_map_page,</div><div class='hunk'>@@ -559,7 +567,7 @@ static struct dma_map_ops pci_swiotlb_dma_ops = {</div><div class='ctx'> 	.mapping_error = swiotlb_dma_mapping_error,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops pci_hybrid_dma_ops = {</div><div class='add'>+static const struct dma_map_ops pci_hybrid_dma_ops = {</div><div class='ctx'> 	.alloc = tile_swiotlb_alloc_coherent,</div><div class='ctx'> 	.free = tile_swiotlb_free_coherent,</div><div class='ctx'> 	.map_page = tile_pci_dma_map_page,</div><div class='hunk'>@@ -574,18 +582,18 @@ static struct dma_map_ops pci_hybrid_dma_ops = {</div><div class='ctx'> 	.dma_supported = tile_pci_dma_supported</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *gx_legacy_pci_dma_map_ops = &amp;pci_swiotlb_dma_ops;</div><div class='del'>-struct dma_map_ops *gx_hybrid_pci_dma_map_ops = &amp;pci_hybrid_dma_ops;</div><div class='add'>+const struct dma_map_ops *gx_legacy_pci_dma_map_ops = &amp;pci_swiotlb_dma_ops;</div><div class='add'>+const struct dma_map_ops *gx_hybrid_pci_dma_map_ops = &amp;pci_hybrid_dma_ops;</div><div class='ctx'> #else</div><div class='del'>-struct dma_map_ops *gx_legacy_pci_dma_map_ops;</div><div class='del'>-struct dma_map_ops *gx_hybrid_pci_dma_map_ops;</div><div class='add'>+const struct dma_map_ops *gx_legacy_pci_dma_map_ops;</div><div class='add'>+const struct dma_map_ops *gx_hybrid_pci_dma_map_ops;</div><div class='ctx'> #endif</div><div class='ctx'> EXPORT_SYMBOL(gx_legacy_pci_dma_map_ops);</div><div class='ctx'> EXPORT_SYMBOL(gx_hybrid_pci_dma_map_ops);</div><div class='ctx'> </div><div class='ctx'> int dma_set_mask(struct device *dev, u64 mask)</div><div class='ctx'> {</div><div class='del'>-	struct dma_map_ops *dma_ops = get_dma_ops(dev);</div><div class='add'>+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For PCI devices with 64-bit DMA addressing capability, promote</div><div class='hunk'>@@ -615,7 +623,7 @@ EXPORT_SYMBOL(dma_set_mask);</div><div class='ctx'> #ifdef CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK</div><div class='ctx'> int dma_set_coherent_mask(struct device *dev, u64 mask)</div><div class='ctx'> {</div><div class='del'>-	struct dma_map_ops *dma_ops = get_dma_ops(dev);</div><div class='add'>+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For PCI devices with 64-bit DMA addressing capability, promote</div><div class='head'>diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c<br/>index 9475a74cd53a..bc6656b5708b 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/pci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/pci.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/pci.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ static int pci_probe = 1;</div><div class='ctx'>  * This flag tells if the platform is TILEmpower that needs</div><div class='ctx'>  * special configuration for the PLX switch chip.</div><div class='ctx'>  */</div><div class='del'>-int __write_once tile_plx_gen1;</div><div class='add'>+int __ro_after_init tile_plx_gen1;</div><div class='ctx'> </div><div class='ctx'> static struct pci_controller controllers[TILE_NUM_PCIE];</div><div class='ctx'> static int num_controllers;</div><div class='head'>diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c<br/>index 0e7a5d09e023..b554a68eea1b 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/pci_gx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/pci_gx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/pci_gx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/pci_gx.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ static int tile_irq_cpu(int irq)</div><div class='ctx'> </div><div class='ctx'> 	count = cpumask_weight(&amp;intr_cpus_map);</div><div class='ctx'> 	if (unlikely(count == 0)) {</div><div class='del'>-		pr_warn("intr_cpus_map empty, interrupts will be delievered to dataplane tiles\n");</div><div class='add'>+		pr_warn("intr_cpus_map empty, interrupts will be delivered to dataplane tiles\n");</div><div class='ctx'> 		return irq % (smp_height * smp_width);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c<br/>index 9f37106ef93a..f0a0e18e4dfb 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/process.c</a></div><div class='hunk'>@@ -13,6 +13,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -35,7 +38,7 @@</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #ifdef CONFIG_HARDWALL</div><div class='ctx'> #include &lt;asm/hardwall.h&gt;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/tile/kernel/ptrace.c b/arch/tile/kernel/ptrace.c<br/>index d89b7011667c..e1a078e6828e 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/ptrace.c</a></div><div class='hunk'>@@ -23,6 +23,8 @@</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='ctx'> #include &lt;linux/context_tracking.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;arch/chip.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -111,7 +113,7 @@ static int tile_gpr_set(struct task_struct *target,</div><div class='ctx'> 			  const void *kbuf, const void __user *ubuf)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct pt_regs regs;</div><div class='add'>+	struct pt_regs regs = *task_pt_regs(target);</div><div class='ctx'> </div><div class='ctx'> 	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf, &amp;regs, 0,</div><div class='ctx'> 				 sizeof(regs));</div><div class='head'>diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c<br/>index 153020abd2f5..443a70bccc1c 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/setup.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@</div><div class='ctx'> static inline int ABS(int x) { return x &gt;= 0 ? x : -x; }</div><div class='ctx'> </div><div class='ctx'> /* Chip information */</div><div class='del'>-char chip_model[64] __write_once;</div><div class='add'>+char chip_model[64] __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_VT</div><div class='ctx'> struct screen_info screen_info;</div><div class='hunk'>@@ -97,17 +97,17 @@ int node_controller[MAX_NUMNODES] = { [0 ... MAX_NUMNODES-1] = -1 };</div><div class='ctx'> #ifdef CONFIG_HIGHMEM</div><div class='ctx'> /* Map information from VAs to PAs */</div><div class='ctx'> unsigned long pbase_map[1 &lt;&lt; (32 - HPAGE_SHIFT)]</div><div class='del'>-  __write_once __attribute__((aligned(L2_CACHE_BYTES)));</div><div class='add'>+  __ro_after_init __attribute__((aligned(L2_CACHE_BYTES)));</div><div class='ctx'> EXPORT_SYMBOL(pbase_map);</div><div class='ctx'> </div><div class='ctx'> /* Map information from PAs to VAs */</div><div class='ctx'> void *vbase_map[NR_PA_HIGHBIT_VALUES]</div><div class='del'>-  __write_once __attribute__((aligned(L2_CACHE_BYTES)));</div><div class='add'>+  __ro_after_init __attribute__((aligned(L2_CACHE_BYTES)));</div><div class='ctx'> EXPORT_SYMBOL(vbase_map);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Node number as a function of the high PA bits */</div><div class='del'>-int highbits_to_node[NR_PA_HIGHBIT_VALUES] __write_once;</div><div class='add'>+int highbits_to_node[NR_PA_HIGHBIT_VALUES] __ro_after_init;</div><div class='ctx'> EXPORT_SYMBOL(highbits_to_node);</div><div class='ctx'> </div><div class='ctx'> static unsigned int __initdata maxmem_pfn = -1U;</div><div class='hunk'>@@ -844,11 +844,11 @@ static void __init zone_sizes_init(void)</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> </div><div class='ctx'> /* which logical CPUs are on which nodes */</div><div class='del'>-struct cpumask node_2_cpu_mask[MAX_NUMNODES] __write_once;</div><div class='add'>+struct cpumask node_2_cpu_mask[MAX_NUMNODES] __ro_after_init;</div><div class='ctx'> EXPORT_SYMBOL(node_2_cpu_mask);</div><div class='ctx'> </div><div class='ctx'> /* which node each logical CPU is on */</div><div class='del'>-char cpu_2_node[NR_CPUS] __write_once __attribute__((aligned(L2_CACHE_BYTES)));</div><div class='add'>+char cpu_2_node[NR_CPUS] __ro_after_init __attribute__((aligned(L2_CACHE_BYTES)));</div><div class='ctx'> EXPORT_SYMBOL(cpu_2_node);</div><div class='ctx'> </div><div class='ctx'> /* Return cpu_to_node() except for cpus not yet assigned, which return -1 */</div><div class='hunk'>@@ -1269,7 +1269,7 @@ static void __init validate_va(void)</div><div class='ctx'>  * cpus plus any other cpus that are willing to share their cache.</div><div class='ctx'>  * It is set by hv_inquire_tiles(HV_INQ_TILES_LOTAR).</div><div class='ctx'>  */</div><div class='del'>-struct cpumask __write_once cpu_lotar_map;</div><div class='add'>+struct cpumask __ro_after_init cpu_lotar_map;</div><div class='ctx'> EXPORT_SYMBOL(cpu_lotar_map);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1291,7 +1291,7 @@ EXPORT_SYMBOL(hash_for_home_map);</div><div class='ctx'>  * cache, those tiles will only appear in cpu_lotar_map, NOT in</div><div class='ctx'>  * cpu_cacheable_map, as they are a special case.</div><div class='ctx'>  */</div><div class='del'>-struct cpumask __write_once cpu_cacheable_map;</div><div class='add'>+struct cpumask __ro_after_init cpu_cacheable_map;</div><div class='ctx'> EXPORT_SYMBOL(cpu_cacheable_map);</div><div class='ctx'> </div><div class='ctx'> static __initdata struct cpumask disabled_map;</div><div class='hunk'>@@ -1506,7 +1506,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'>  * Set up per-cpu memory.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-unsigned long __per_cpu_offset[NR_CPUS] __write_once;</div><div class='add'>+unsigned long __per_cpu_offset[NR_CPUS] __ro_after_init;</div><div class='ctx'> EXPORT_SYMBOL(__per_cpu_offset);</div><div class='ctx'> </div><div class='ctx'> static size_t __initdata pfn_offset[MAX_NUMNODES] = { 0 };</div><div class='head'>diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c<br/>index 87299a6cfec8..f2bf557bb005 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/signal.c</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/tile/kernel/single_step.c b/arch/tile/kernel/single_step.c<br/>index 862973074bf9..de3eae813e52 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/single_step.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/single_step.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/single_step.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/single_step.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/prctl.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;arch/abi.h&gt;</div><div class='ctx'> #include &lt;arch/spr_def.h&gt;</div><div class='head'>diff --git a/arch/tile/kernel/smp.c b/arch/tile/kernel/smp.c<br/>index 07e3ff5cc740..94a62e1197ce 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/smp.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'>  * We write to width and height with a single store in head_NN.S,</div><div class='ctx'>  * so make the variable aligned to "long".</div><div class='ctx'>  */</div><div class='del'>-HV_Topology smp_topology __write_once __aligned(sizeof(long));</div><div class='add'>+HV_Topology smp_topology __ro_after_init __aligned(sizeof(long));</div><div class='ctx'> EXPORT_SYMBOL(smp_topology);</div><div class='ctx'> </div><div class='ctx'> #if CHIP_HAS_IPI()</div><div class='head'>diff --git a/arch/tile/kernel/smpboot.c b/arch/tile/kernel/smpboot.c<br/>index 6c0abaacec33..869c22e57561 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/smpboot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/smpboot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/smpboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/smpboot.c</a></div><div class='hunk'>@@ -16,7 +16,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='hunk'>@@ -160,7 +161,7 @@ static void start_secondary(void)</div><div class='ctx'> 	__this_cpu_write(current_asid, min_asid);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up this thread as another owner of the init_mm */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	current-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> 	if (current-&gt;mm)</div><div class='ctx'> 		BUG();</div><div class='head'>diff --git a/arch/tile/kernel/stack.c b/arch/tile/kernel/stack.c<br/>index 22bbbd3ff4a3..94ecbc6676e5 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/stack.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/stack.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/stack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/stack.c</a></div><div class='hunk'>@@ -13,6 +13,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c<br/>index ea960d660917..5bd4e88c7c60 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/time.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -37,7 +38,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* How many cycles per second we are running at. */</div><div class='del'>-static cycles_t cycles_per_sec __write_once;</div><div class='add'>+static cycles_t cycles_per_sec __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> cycles_t get_clock_rate(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -68,7 +69,7 @@ EXPORT_SYMBOL(get_cycles);</div><div class='ctx'>  */</div><div class='ctx'> #define SCHED_CLOCK_SHIFT 10</div><div class='ctx'> </div><div class='del'>-static unsigned long sched_clock_mult __write_once;</div><div class='add'>+static unsigned long sched_clock_mult __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> static cycles_t clocksource_get_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/tile/kernel/traps.c b/arch/tile/kernel/traps.c<br/>index 39f427bb0de2..54804866f238 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/traps.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='head'>diff --git a/arch/tile/kernel/unaligned.c b/arch/tile/kernel/unaligned.c<br/>index 9772a3554282..8149c38f67b6 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/kernel/unaligned.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/kernel/unaligned.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/kernel/unaligned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/kernel/unaligned.c</a></div><div class='hunk'>@@ -17,17 +17,19 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/prctl.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;arch/abi.h&gt;</div><div class='ctx'> #include &lt;arch/spr_def.h&gt;</div><div class='head'>diff --git a/arch/tile/lib/cacheflush.c b/arch/tile/lib/cacheflush.c<br/>index 9c0ec22009a5..c1ebc1065fc1 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/lib/cacheflush.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/lib/cacheflush.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/lib/cacheflush.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/lib/cacheflush.c</a></div><div class='hunk'>@@ -138,19 +138,13 @@ finv_buffer_remote(void *buffer, size_t size, int hfh)</div><div class='ctx'> 	if ((unsigned long)base &lt; (unsigned long)buffer)</div><div class='ctx'> 		base = buffer;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Fire all the loads we need.  The MAF only has eight entries</div><div class='del'>-	 * so we can have at most eight outstanding loads, so we</div><div class='del'>-	 * unroll by that amount.</div><div class='del'>-	 */</div><div class='del'>-#pragma unroll 8</div><div class='add'>+	/* Fire all the loads we need. */</div><div class='ctx'> 	for (; p &gt;= base; p -= step_size)</div><div class='ctx'> 		force_load(p);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Repeat, but with finv's instead of loads, to get rid of the</div><div class='ctx'> 	 * data we just loaded into our own cache and the old home L3.</div><div class='del'>-	 * No need to unroll since finv's don't target a register.</div><div class='ctx'> 	 * The finv's are guaranteed not to actually flush the data in</div><div class='ctx'> 	 * the buffer back to their home, since we just read it, so the</div><div class='ctx'> 	 * lines are clean in cache; we will only invalidate those lines.</div><div class='head'>diff --git a/arch/tile/mm/elf.c b/arch/tile/mm/elf.c<br/>index 6225cc998db1..889901824400 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/mm/elf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/mm/elf.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/mm/elf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/elf.c</a></div><div class='hunk'>@@ -143,7 +143,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,</div><div class='ctx'> 		unsigned long addr = MEM_USER_INTRPT;</div><div class='ctx'> 		addr = mmap_region(NULL, addr, INTRPT_SIZE,</div><div class='ctx'> 				   VM_READ|VM_EXEC|</div><div class='del'>-				   VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, 0);</div><div class='add'>+				   VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, 0, NULL);</div><div class='ctx'> 		if (addr &gt; (unsigned long) -PAGE_SIZE)</div><div class='ctx'> 			retval = (int) addr;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/tile/mm/extable.c b/arch/tile/mm/extable.c<br/>index 4fb0acb9d154..aeaf20c7aaa4 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/extable.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'>  *   more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c<br/>index beba986589e5..f58fa06a2214 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/fault.c</a></div><div class='hunk'>@@ -16,6 +16,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -29,7 +32,7 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;		/* For unblank_screen() */</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='head'>diff --git a/arch/tile/mm/homecache.c b/arch/tile/mm/homecache.c<br/>index 40ca30a9fee3..b51cc28acd0a 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/mm/homecache.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/mm/homecache.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/mm/homecache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/homecache.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'>  * The noallocl2 option suppresses all use of the L2 cache to cache</div><div class='ctx'>  * locally from a remote home.</div><div class='ctx'>  */</div><div class='del'>-static int __write_once noallocl2;</div><div class='add'>+static int __ro_after_init noallocl2;</div><div class='ctx'> static int __init set_noallocl2(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	noallocl2 = 1;</div><div class='head'>diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c<br/>index 77ceaa343fce..cb10153b5c9f 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/mm/hugetlbpage.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/mm/hugetlbpage.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c<br/>index adce25462b0d..3a97e4d7205c 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/init.c</a></div><div class='hunk'>@@ -190,9 +190,9 @@ static void __init page_table_range_init(unsigned long start,</div><div class='ctx'> </div><div class='ctx'> static int __initdata ktext_hash = 1;  /* .text pages */</div><div class='ctx'> static int __initdata kdata_hash = 1;  /* .data and .bss pages */</div><div class='del'>-int __write_once hash_default = 1;     /* kernel allocator pages */</div><div class='add'>+int __ro_after_init hash_default = 1;     /* kernel allocator pages */</div><div class='ctx'> EXPORT_SYMBOL(hash_default);</div><div class='del'>-int __write_once kstack_hash = 1;      /* if no homecaching, use h4h */</div><div class='add'>+int __ro_after_init kstack_hash = 1;      /* if no homecaching, use h4h */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * CPUs to use to for striping the pages of kernel data.  If hash-for-home</div><div class='hunk'>@@ -203,7 +203,7 @@ int __write_once kstack_hash = 1;      /* if no homecaching, use h4h */</div><div class='ctx'> static __initdata struct cpumask kdata_mask;</div><div class='ctx'> static __initdata int kdata_arg_seen;</div><div class='ctx'> </div><div class='del'>-int __write_once kdata_huge;       /* if no homecaching, small pages */</div><div class='add'>+int __ro_after_init kdata_huge;       /* if no homecaching, small pages */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Combine a generic pgprot_t with cache home to get a cache-aware pgprot. */</div><div class='hunk'>@@ -896,8 +896,8 @@ void __init pgtable_cache_init(void)</div><div class='ctx'> 		panic("pgtable_cache_init(): Cannot create pgd cache");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long __write_once initfree = 1;</div><div class='del'>-static bool __write_once set_initfree_done;</div><div class='add'>+static long __ro_after_init initfree = 1;</div><div class='add'>+static bool __ro_after_init set_initfree_done;</div><div class='ctx'> </div><div class='ctx'> /* Select whether to free (1) or mark unusable (0) the __init pages. */</div><div class='ctx'> static int __init set_initfree(char *str)</div><div class='head'>diff --git a/arch/tile/mm/mmap.c b/arch/tile/mm/mmap.c<br/>index ef61c597898b..8ab28167c44b 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/mm/mmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/mm/mmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/mmap.c</a></div><div class='hunk'>@@ -17,7 +17,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/tile/mm/pgtable.c b/arch/tile/mm/pgtable.c<br/>index 7cc6ee7f1a58..492a7361e58e 100644<br/>--- a/<a href='/drm-misc/tree/arch/tile/mm/pgtable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/tile/mm/pgtable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/tile/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/tile/mm/pgtable.c</a></div><div class='hunk'>@@ -36,51 +36,6 @@</div><div class='ctx'> </div><div class='ctx'> #define K(x) ((x) &lt;&lt; (PAGE_SHIFT-10))</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The normal show_free_areas() is too verbose on Tile, with dozens</div><div class='del'>- * of processors and often four NUMA zones each with high and lowmem.</div><div class='del'>- */</div><div class='del'>-void show_mem(unsigned int filter)</div><div class='del'>-{</div><div class='del'>-	struct zone *zone;</div><div class='del'>-</div><div class='del'>-	pr_err("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu free:%lu\n slab:%lu mapped:%lu pagetables:%lu bounce:%lu pagecache:%lu swap:%lu\n",</div><div class='del'>-	       (global_node_page_state(NR_ACTIVE_ANON) +</div><div class='del'>-		global_node_page_state(NR_ACTIVE_FILE)),</div><div class='del'>-	       (global_node_page_state(NR_INACTIVE_ANON) +</div><div class='del'>-		global_node_page_state(NR_INACTIVE_FILE)),</div><div class='del'>-	       global_node_page_state(NR_FILE_DIRTY),</div><div class='del'>-	       global_node_page_state(NR_WRITEBACK),</div><div class='del'>-	       global_node_page_state(NR_UNSTABLE_NFS),</div><div class='del'>-	       global_page_state(NR_FREE_PAGES),</div><div class='del'>-	       (global_page_state(NR_SLAB_RECLAIMABLE) +</div><div class='del'>-		global_page_state(NR_SLAB_UNRECLAIMABLE)),</div><div class='del'>-	       global_node_page_state(NR_FILE_MAPPED),</div><div class='del'>-	       global_page_state(NR_PAGETABLE),</div><div class='del'>-	       global_page_state(NR_BOUNCE),</div><div class='del'>-	       global_node_page_state(NR_FILE_PAGES),</div><div class='del'>-	       get_nr_swap_pages());</div><div class='del'>-</div><div class='del'>-	for_each_zone(zone) {</div><div class='del'>-		unsigned long flags, order, total = 0, largest_order = -1;</div><div class='del'>-</div><div class='del'>-		if (!populated_zone(zone))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;zone-&gt;lock, flags);</div><div class='del'>-		for (order = 0; order &lt; MAX_ORDER; order++) {</div><div class='del'>-			int nr = zone-&gt;free_area[order].nr_free;</div><div class='del'>-			total += nr &lt;&lt; order;</div><div class='del'>-			if (nr)</div><div class='del'>-				largest_order = order;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;zone-&gt;lock, flags);</div><div class='del'>-		pr_err("Node %d %7s: %lukB (largest %luKb)\n",</div><div class='del'>-		       zone_to_nid(zone), zone-&gt;name,</div><div class='del'>-		       K(total), largest_order ? K(1UL) &lt;&lt; largest_order : 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * shatter_huge_page() - ensure a given address is mapped by a small page.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c<br/>index 3282787bbcfb..6d381279b362 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/drivers/harddog_kern.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/drivers/harddog_kern.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/drivers/harddog_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/harddog_kern.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include "mconsole.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c<br/>index 3a4b58730f5f..12bdb5996bf5 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/drivers/hostaudio_kern.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/drivers/hostaudio_kern.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/drivers/hostaudio_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/hostaudio_kern.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/sound.h&gt;</div><div class='ctx'> #include &lt;linux/soundcard.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;init.h&gt;</div><div class='ctx'> #include &lt;os.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c<br/>index 62087028a9ce..366e57f5e8d6 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/drivers/line.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/drivers/line.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/drivers/line.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/line.c</a></div><div class='hunk'>@@ -5,8 +5,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/irqreturn.h&gt;</div><div class='ctx'> #include &lt;linux/kd.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "chan.h"</div><div class='ctx'> #include &lt;irq_kern.h&gt;</div><div class='ctx'> #include &lt;irq_user.h&gt;</div><div class='head'>diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c<br/>index 8a6b57108ac2..af326fb6510d 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/drivers/mconsole_kern.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/drivers/mconsole_kern.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/drivers/mconsole_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/mconsole_kern.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='hunk'>@@ -24,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;init.h&gt;</div><div class='head'>diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c<br/>index 62145c276167..3645fcb2a787 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/drivers/mmapper_kern.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/drivers/mmapper_kern.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/drivers/mmapper_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/mmapper_kern.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;mem_user.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* These are set in mmapper_init, which is called at boot time */</div><div class='head'>diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c<br/>index 2cd5b6874c7b..1669240c7a25 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/drivers/net_kern.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/drivers/net_kern.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/drivers/net_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/net_kern.c</a></div><div class='hunk'>@@ -256,13 +256,6 @@ static void uml_net_tx_timeout(struct net_device *dev)</div><div class='ctx'> 	netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int uml_net_change_mtu(struct net_device *dev, int new_mtu)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> static void uml_net_poll_controller(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -374,7 +367,6 @@ static const struct net_device_ops uml_netdev_ops = {</div><div class='ctx'> 	.ndo_set_rx_mode	= uml_net_set_multicast_list,</div><div class='ctx'> 	.ndo_tx_timeout 	= uml_net_tx_timeout,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='del'>-	.ndo_change_mtu 	= uml_net_change_mtu,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller = uml_net_poll_controller,</div><div class='head'>diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c<br/>index dd16c902ff70..37c51a6be690 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/drivers/random.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/drivers/random.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/drivers/random.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/random.c</a></div><div class='hunk'>@@ -6,13 +6,13 @@</div><div class='ctx'>  * This software may be used and distributed according to the terms</div><div class='ctx'>  * of the GNU General Public License, incorporated herein by reference.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;irq_kern.h&gt;</div><div class='ctx'> #include &lt;os.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +76,7 @@ static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,</div><div class='ctx'> 			add_sigio_fd(random_fd);</div><div class='ctx'> </div><div class='ctx'> 			add_wait_queue(&amp;host_read_wait, &amp;wait);</div><div class='del'>-			set_task_state(current, TASK_INTERRUPTIBLE);</div><div class='add'>+			set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> </div><div class='ctx'> 			schedule();</div><div class='ctx'> 			remove_wait_queue(&amp;host_read_wait, &amp;wait);</div><div class='head'>diff --git a/arch/um/drivers/ubd.h b/arch/um/drivers/ubd.h<br/>index 3b48cd2081ee..cc1cc85f5afc 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/drivers/ubd.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/drivers/ubd.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/drivers/ubd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/ubd.h</a></div><div class='hunk'>@@ -11,5 +11,10 @@ extern int start_io_thread(unsigned long sp, int *fds_out);</div><div class='ctx'> extern int io_thread(void *arg);</div><div class='ctx'> extern int kernel_fd;</div><div class='ctx'> </div><div class='add'>+extern int ubd_read_poll(int timeout);</div><div class='add'>+extern int ubd_write_poll(int timeout);</div><div class='add'>+</div><div class='add'>+#define UBD_REQ_BUFFER_SIZE 64</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c<br/>index f3540270d096..85410279beab 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/drivers/ubd_kern.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/drivers/ubd_kern.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/drivers/ubd_kern.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/ubd_kern.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (C) 2015-2016 Anton Ivanov (aivanov@brocade.com)</div><div class='ctx'>  * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)</div><div class='ctx'>  * Licensed under the GPL</div><div class='ctx'>  */</div><div class='hunk'>@@ -58,6 +59,17 @@ struct io_thread_req {</div><div class='ctx'> 	int error;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static struct io_thread_req * (*irq_req_buffer)[];</div><div class='add'>+static struct io_thread_req *irq_remainder;</div><div class='add'>+static int irq_remainder_size;</div><div class='add'>+</div><div class='add'>+static struct io_thread_req * (*io_req_buffer)[];</div><div class='add'>+static struct io_thread_req *io_remainder;</div><div class='add'>+static int io_remainder_size;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static inline int ubd_test_bit(__u64 bit, unsigned char *data)</div><div class='ctx'> {</div><div class='ctx'> 	__u64 n;</div><div class='hunk'>@@ -442,29 +454,91 @@ static void do_ubd_request(struct request_queue * q);</div><div class='ctx'> static int thread_fd = -1;</div><div class='ctx'> static LIST_HEAD(restart);</div><div class='ctx'> </div><div class='del'>-/* XXX - move this inside ubd_intr. */</div><div class='add'>+/* Function to read several request pointers at a time</div><div class='add'>+* handling fractional reads if (and as) needed</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static int bulk_req_safe_read(</div><div class='add'>+	int fd,</div><div class='add'>+	struct io_thread_req * (*request_buffer)[],</div><div class='add'>+	struct io_thread_req **remainder,</div><div class='add'>+	int *remainder_size,</div><div class='add'>+	int max_recs</div><div class='add'>+	)</div><div class='add'>+{</div><div class='add'>+	int n = 0;</div><div class='add'>+	int res = 0;</div><div class='add'>+</div><div class='add'>+	if (*remainder_size &gt; 0) {</div><div class='add'>+		memmove(</div><div class='add'>+			(char *) request_buffer,</div><div class='add'>+			(char *) remainder, *remainder_size</div><div class='add'>+		);</div><div class='add'>+		n = *remainder_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = os_read_file(</div><div class='add'>+			fd,</div><div class='add'>+			((char *) request_buffer) + *remainder_size,</div><div class='add'>+			sizeof(struct io_thread_req *)*max_recs</div><div class='add'>+				- *remainder_size</div><div class='add'>+		);</div><div class='add'>+	if (res &gt; 0) {</div><div class='add'>+		n += res;</div><div class='add'>+		if ((n % sizeof(struct io_thread_req *)) &gt; 0) {</div><div class='add'>+			/*</div><div class='add'>+			* Read somehow returned not a multiple of dword</div><div class='add'>+			* theoretically possible, but never observed in the</div><div class='add'>+			* wild, so read routine must be able to handle it</div><div class='add'>+			*/</div><div class='add'>+			*remainder_size = n % sizeof(struct io_thread_req *);</div><div class='add'>+			WARN(*remainder_size &gt; 0, "UBD IPC read returned a partial result");</div><div class='add'>+			memmove(</div><div class='add'>+				remainder,</div><div class='add'>+				((char *) request_buffer) +</div><div class='add'>+					(n/sizeof(struct io_thread_req *))*sizeof(struct io_thread_req *),</div><div class='add'>+				*remainder_size</div><div class='add'>+			);</div><div class='add'>+			n = n - *remainder_size;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		n = res;</div><div class='add'>+	}</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Called without dev-&gt;lock held, and only in interrupt context. */</div><div class='ctx'> static void ubd_handler(void)</div><div class='ctx'> {</div><div class='del'>-	struct io_thread_req *req;</div><div class='ctx'> 	struct ubd *ubd;</div><div class='ctx'> 	struct list_head *list, *next_ele;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int n;</div><div class='add'>+	int count;</div><div class='ctx'> </div><div class='ctx'> 	while(1){</div><div class='del'>-		n = os_read_file(thread_fd, &amp;req,</div><div class='del'>-				 sizeof(struct io_thread_req *));</div><div class='del'>-		if(n != sizeof(req)){</div><div class='add'>+		n = bulk_req_safe_read(</div><div class='add'>+			thread_fd,</div><div class='add'>+			irq_req_buffer,</div><div class='add'>+			&amp;irq_remainder,</div><div class='add'>+			&amp;irq_remainder_size,</div><div class='add'>+			UBD_REQ_BUFFER_SIZE</div><div class='add'>+		);</div><div class='add'>+		if (n &lt; 0) {</div><div class='ctx'> 			if(n == -EAGAIN)</div><div class='ctx'> 				break;</div><div class='ctx'> 			printk(KERN_ERR "spurious interrupt in ubd_handler, "</div><div class='ctx'> 			       "err = %d\n", -n);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		blk_end_request(req-&gt;req, 0, req-&gt;length);</div><div class='del'>-		kfree(req);</div><div class='add'>+		for (count = 0; count &lt; n/sizeof(struct io_thread_req *); count++) {</div><div class='add'>+			blk_end_request(</div><div class='add'>+				(*irq_req_buffer)[count]-&gt;req,</div><div class='add'>+				0,</div><div class='add'>+				(*irq_req_buffer)[count]-&gt;length</div><div class='add'>+			);</div><div class='add'>+			kfree((*irq_req_buffer)[count]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	reactivate_fd(thread_fd, UBD_IRQ);</div><div class='ctx'> </div><div class='hunk'>@@ -1064,6 +1138,28 @@ static int __init ubd_init(void)</div><div class='ctx'> 		if (register_blkdev(fake_major, "ubd"))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	irq_req_buffer = kmalloc(</div><div class='add'>+			sizeof(struct io_thread_req *) * UBD_REQ_BUFFER_SIZE,</div><div class='add'>+			GFP_KERNEL</div><div class='add'>+		);</div><div class='add'>+	irq_remainder = 0;</div><div class='add'>+</div><div class='add'>+	if (irq_req_buffer == NULL) {</div><div class='add'>+		printk(KERN_ERR "Failed to initialize ubd buffering\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	io_req_buffer = kmalloc(</div><div class='add'>+			sizeof(struct io_thread_req *) * UBD_REQ_BUFFER_SIZE,</div><div class='add'>+			GFP_KERNEL</div><div class='add'>+		);</div><div class='add'>+</div><div class='add'>+	io_remainder = 0;</div><div class='add'>+</div><div class='add'>+	if (io_req_buffer == NULL) {</div><div class='add'>+		printk(KERN_ERR "Failed to initialize ubd buffering\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='ctx'> 	platform_driver_register(&amp;ubd_driver);</div><div class='ctx'> 	mutex_lock(&amp;ubd_lock);</div><div class='ctx'> 	for (i = 0; i &lt; MAX_DEV; i++){</div><div class='hunk'>@@ -1458,31 +1554,51 @@ static int io_count = 0;</div><div class='ctx'> </div><div class='ctx'> int io_thread(void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct io_thread_req *req;</div><div class='del'>-	int n;</div><div class='add'>+	int n, count, written, res;</div><div class='ctx'> </div><div class='ctx'> 	os_fix_helper_signals();</div><div class='ctx'> </div><div class='ctx'> 	while(1){</div><div class='del'>-		n = os_read_file(kernel_fd, &amp;req,</div><div class='del'>-				 sizeof(struct io_thread_req *));</div><div class='del'>-		if(n != sizeof(struct io_thread_req *)){</div><div class='del'>-			if(n &lt; 0)</div><div class='add'>+		n = bulk_req_safe_read(</div><div class='add'>+			kernel_fd,</div><div class='add'>+			io_req_buffer,</div><div class='add'>+			&amp;io_remainder,</div><div class='add'>+			&amp;io_remainder_size,</div><div class='add'>+			UBD_REQ_BUFFER_SIZE</div><div class='add'>+		);</div><div class='add'>+		if (n &lt; 0) {</div><div class='add'>+			if (n == -EAGAIN) {</div><div class='add'>+				ubd_read_poll(-1);</div><div class='add'>+				continue;</div><div class='add'>+			} else {</div><div class='ctx'> 				printk("io_thread - read failed, fd = %d, "</div><div class='del'>-				       "err = %d\n", kernel_fd, -n);</div><div class='del'>-			else {</div><div class='del'>-				printk("io_thread - short read, fd = %d, "</div><div class='del'>-				       "length = %d\n", kernel_fd, n);</div><div class='add'>+				       "err = %d,"</div><div class='add'>+				       "reminder = %d\n",</div><div class='add'>+				       kernel_fd, -n, io_remainder_size);</div><div class='ctx'> 			}</div><div class='del'>-			continue;</div><div class='ctx'> 		}</div><div class='del'>-		io_count++;</div><div class='del'>-		do_io(req);</div><div class='del'>-		n = os_write_file(kernel_fd, &amp;req,</div><div class='del'>-				  sizeof(struct io_thread_req *));</div><div class='del'>-		if(n != sizeof(struct io_thread_req *))</div><div class='del'>-			printk("io_thread - write failed, fd = %d, err = %d\n",</div><div class='del'>-			       kernel_fd, -n);</div><div class='add'>+</div><div class='add'>+		for (count = 0; count &lt; n/sizeof(struct io_thread_req *); count++) {</div><div class='add'>+			io_count++;</div><div class='add'>+			do_io((*io_req_buffer)[count]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		written = 0;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			res = os_write_file(kernel_fd, ((char *) io_req_buffer) + written, n);</div><div class='add'>+			if (res &gt; 0) {</div><div class='add'>+				written += res;</div><div class='add'>+			} else {</div><div class='add'>+				if (res != -EAGAIN) {</div><div class='add'>+					printk("io_thread - read failed, fd = %d, "</div><div class='add'>+					       "err = %d\n", kernel_fd, -n);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (written &lt; n) {</div><div class='add'>+				ubd_write_poll(-1);</div><div class='add'>+			}</div><div class='add'>+		} while (written &lt; n);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c<br/>index e376f9b9c68d..6f744794d141 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/drivers/ubd_user.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/drivers/ubd_user.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/drivers/ubd_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/drivers/ubd_user.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Anton Ivanov (aivanov@brocade.com)</div><div class='ctx'>  * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)</div><div class='ctx'>  * Copyright (C) 2001 Ridgerun,Inc (glonnon@ridgerun.com)</div><div class='ctx'>  * Licensed under the GPL</div><div class='hunk'>@@ -20,6 +21,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "ubd.h"</div><div class='ctx'> #include &lt;os.h&gt;</div><div class='add'>+#include &lt;poll.h&gt;</div><div class='add'>+</div><div class='add'>+struct pollfd kernel_pollfd;</div><div class='ctx'> </div><div class='ctx'> int start_io_thread(unsigned long sp, int *fd_out)</div><div class='ctx'> {</div><div class='hunk'>@@ -32,9 +36,12 @@ int start_io_thread(unsigned long sp, int *fd_out)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kernel_fd = fds[0];</div><div class='add'>+	kernel_pollfd.fd = kernel_fd;</div><div class='add'>+	kernel_pollfd.events = POLLIN;</div><div class='ctx'> 	*fd_out = fds[1];</div><div class='ctx'> </div><div class='ctx'> 	err = os_set_fd_block(*fd_out, 0);</div><div class='add'>+	err = os_set_fd_block(kernel_fd, 0);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk("start_io_thread - failed to set nonblocking I/O.\n");</div><div class='ctx'> 		goto out_close;</div><div class='hunk'>@@ -57,3 +64,15 @@ int start_io_thread(unsigned long sp, int *fd_out)</div><div class='ctx'>  out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int ubd_read_poll(int timeout)</div><div class='add'>+{</div><div class='add'>+	kernel_pollfd.events = POLLIN;</div><div class='add'>+	return poll(&amp;kernel_pollfd, 1, timeout);</div><div class='add'>+}</div><div class='add'>+int ubd_write_poll(int timeout)</div><div class='add'>+{</div><div class='add'>+	kernel_pollfd.events = POLLOUT;</div><div class='add'>+	return poll(&amp;kernel_pollfd, 1, timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild<br/>index 904f3ebf4220..e9d42aab76dc 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> generic-y += barrier.h</div><div class='ctx'> generic-y += bug.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += delay.h</div><div class='ctx'> generic-y += device.h</div><div class='hunk'>@@ -17,7 +16,6 @@ generic-y += irq_work.h</div><div class='ctx'> generic-y += kdebug.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='ctx'> generic-y += mm-arch-hooks.h</div><div class='del'>-generic-y += mutex.h</div><div class='ctx'> generic-y += param.h</div><div class='ctx'> generic-y += pci.h</div><div class='ctx'> generic-y += percpu.h</div><div class='hunk'>@@ -27,3 +25,4 @@ generic-y += topology.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/asm/mmu_context.h<br/>index 1a60e1328e2f..94ac2739918c 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -7,6 +7,8 @@</div><div class='ctx'> #define __UM_MMU_CONTEXT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void uml_setup_stubs(struct mm_struct *mm);</div><div class='head'>diff --git a/arch/um/include/asm/tlb.h b/arch/um/include/asm/tlb.h<br/>index 821ff0acfe17..600a2e9bfee2 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/include/asm/tlb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/include/asm/tlb.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/include/asm/tlb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/include/asm/tlb.h</a></div><div class='hunk'>@@ -116,12 +116,6 @@ static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 	return __tlb_remove_page(tlb, page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool __tlb_remove_pte_page(struct mmu_gather *tlb,</div><div class='del'>-					 struct page *page)</div><div class='del'>-{</div><div class='del'>-	return __tlb_remove_page(tlb, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 					struct page *page, int page_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -141,6 +135,15 @@ static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 		__tlb_remove_tlb_entry(tlb, ptep, address);	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\</div><div class='add'>+	tlb_remove_tlb_entry(tlb, ptep, address)</div><div class='add'>+</div><div class='add'>+#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change</div><div class='add'>+static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,</div><div class='add'>+						     unsigned int page_size)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define pte_free_tlb(tlb, ptep, addr) __pte_free_tlb(tlb, ptep, addr)</div><div class='ctx'> </div><div class='ctx'> #define pud_free_tlb(tlb, pudp, addr) __pud_free_tlb(tlb, pudp, addr)</div><div class='head'>diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c<br/>index 0d7103c9eff3..a43d42bf0a86 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/exec.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/exec.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/exec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/exec.c</a></div><div class='hunk'>@@ -7,11 +7,13 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;as-layout.h&gt;</div><div class='ctx'> #include &lt;mem_user.h&gt;</div><div class='ctx'> #include &lt;skas.h&gt;</div><div class='head'>diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c<br/>index 41ebbfebb333..546302e3b7fb 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/exitcode.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/exitcode.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/exitcode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/exitcode.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * If read and write race, the read will still atomically read a valid</div><div class='head'>diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c<br/>index 034b42c7ab40..a9bd61820042 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/process.c</a></div><div class='hunk'>@@ -17,6 +17,9 @@</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='hunk'>@@ -24,7 +27,7 @@</div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;as-layout.h&gt;</div><div class='ctx'> #include &lt;kern_util.h&gt;</div><div class='ctx'> #include &lt;os.h&gt;</div><div class='head'>diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c<br/>index 6a826cbb15c4..bc2a516c190f 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/ptrace.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace-abi.h&gt;</div><div class='ctx'> </div><div class='ctx'> void user_enable_single_step(struct task_struct *child)</div><div class='head'>diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c<br/>index b60a9f8cda75..71f3e9217cf2 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/reboot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/reboot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/reboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/reboot.c</a></div><div class='hunk'>@@ -3,7 +3,9 @@</div><div class='ctx'>  * Licensed under the GPL</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/oom.h&gt;</div><div class='head'>diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c<br/>index 3943e9d7d13d..7a1f2a936fd1 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/skas/mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/skas/mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/skas/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/skas/mmu.c</a></div><div class='hunk'>@@ -5,8 +5,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='head'>diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c<br/>index 527fa5881915..d4dbf08722d6 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/skas/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/skas/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/skas/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/skas/process.c</a></div><div class='hunk'>@@ -4,7 +4,10 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;as-layout.h&gt;</div><div class='ctx'> #include &lt;kern.h&gt;</div><div class='ctx'> #include &lt;os.h&gt;</div><div class='head'>diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c<br/>index c1d0ae069b53..6258676bed85 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/syscall.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/syscall.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/syscall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/syscall.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='ctx'> #include &lt;asm/mman.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='ctx'> long old_mmap(unsigned long addr, unsigned long len,</div><div class='head'>diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c<br/>index aa1b56f5ac68..a76295f7ede9 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/sysrq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/sysrq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/sysrq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/sysrq.c</a></div><div class='hunk'>@@ -11,6 +11,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/sysrq.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include &lt;os.h&gt;</div><div class='head'>diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c<br/>index 25c23666d592..ba87a27d6715 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/time.c</a></div><div class='hunk'>@@ -83,7 +83,7 @@ static irqreturn_t um_timer(int irq, void *dev)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t timer_read(struct clocksource *cs)</div><div class='add'>+static u64 timer_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return os_nsecs() / TIMER_MULTIPLIER;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c<br/>index 3777b82759bd..37508b190106 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/tlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/tlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/tlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/tlb.c</a></div><div class='hunk'>@@ -5,7 +5,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;as-layout.h&gt;</div><div class='head'>diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c<br/>index ad8f206ab5e8..59158871b9fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/trap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/trap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/trap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/trap.c</a></div><div class='hunk'>@@ -4,10 +4,11 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='head'>diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c<br/>index e8175a8aa22c..4b85acd4020c 100644<br/>--- a/<a href='/drm-misc/tree/arch/um/kernel/um_arch.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/um/kernel/um_arch.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/um/kernel/um_arch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/um/kernel/um_arch.c</a></div><div class='hunk'>@@ -11,7 +11,9 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/kmsg_dump.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='head'>diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild<br/>index 256c45b3ae34..84205fe1cd79 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/include/asm/Kbuild</a></div><div class='hunk'>@@ -4,7 +4,6 @@ generic-y += auxvec.h</div><div class='ctx'> generic-y += bitsperlong.h</div><div class='ctx'> generic-y += bugs.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += current.h</div><div class='ctx'> generic-y += device.h</div><div class='ctx'> generic-y += div64.h</div><div class='hunk'>@@ -64,3 +63,4 @@ generic-y += user.h</div><div class='ctx'> generic-y += vga.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/unicore32/include/asm/dma-mapping.h b/arch/unicore32/include/asm/dma-mapping.h<br/>index 4749854afd03..518ba5848dd6 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops swiotlb_dma_map_ops;</div><div class='add'>+extern const struct dma_map_ops swiotlb_dma_map_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;swiotlb_dma_map_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/unicore32/include/asm/mutex.h b/arch/unicore32/include/asm/mutex.h<br/>deleted file mode 100644<br/>index fab7d0e8adf6..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/unicore32/include/asm/mutex.h</div><div class='del'>- *</div><div class='del'>- * Code specific to PKUnity SoC and UniCore ISA</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001-2010 GUAN Xue-tao</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * UniCore optimized mutex locking primitives</div><div class='del'>- *</div><div class='del'>- * Please look into asm-generic/mutex-xchg.h for a formal definition.</div><div class='del'>- */</div><div class='del'>-#ifndef __UNICORE_MUTEX_H__</div><div class='del'>-#define __UNICORE_MUTEX_H__</div><div class='del'>-</div><div class='del'>-# include &lt;asm-generic/mutex-xchg.h&gt;</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/unicore32/include/asm/processor.h b/arch/unicore32/include/asm/processor.h<br/>index 8d21b7adf26b..4eaa42167667 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/include/asm/processor.h</a></div><div class='hunk'>@@ -71,7 +71,6 @@ extern void release_thread(struct task_struct *);</div><div class='ctx'> unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()			barrier()</div><div class='del'>-#define cpu_relax_lowlatency()                cpu_relax()</div><div class='ctx'> </div><div class='ctx'> #define task_pt_regs(p) \</div><div class='ctx'> 	((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)</div><div class='head'>diff --git a/arch/unicore32/kernel/fpu-ucf64.c b/arch/unicore32/kernel/fpu-ucf64.c<br/>index a53343a90ca2..12c8c9527b8e 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/kernel/fpu-ucf64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/kernel/fpu-ucf64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/kernel/fpu-ucf64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/fpu-ucf64.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/fpu-ucf64.h&gt;</div><div class='head'>diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c<br/>index d7c6b676b3a5..d22c1dc7e39e 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/process.c</a></div><div class='hunk'>@@ -13,6 +13,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='head'>diff --git a/arch/unicore32/kernel/ptrace.c b/arch/unicore32/kernel/ptrace.c<br/>index 9f07c08da050..a102c2b4f358 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/ptrace.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * this routine will get a word off of the processes privileged stack.</div><div class='head'>diff --git a/arch/unicore32/kernel/stacktrace.c b/arch/unicore32/kernel/stacktrace.c<br/>index b34030bdabe3..9976e767d51c 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/stacktrace.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='head'>diff --git a/arch/unicore32/kernel/time.c b/arch/unicore32/kernel/time.c<br/>index ac4c5449bb88..fceaa673f861 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/time.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ static struct clock_event_device ckevt_puv3_osmr0 = {</div><div class='ctx'> 	.set_state_oneshot	= puv3_osmr0_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static cycle_t puv3_read_oscr(struct clocksource *cs)</div><div class='add'>+static u64 puv3_read_oscr(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return readl(OST_OSCR);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c<br/>index c54e32410ead..5f25b39f04d4 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/kernel/traps.c</a></div><div class='hunk'>@@ -14,6 +14,9 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='head'>diff --git a/arch/unicore32/mm/alignment.c b/arch/unicore32/mm/alignment.c<br/>index 24e836023e6c..3a7f6faa8794 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/mm/alignment.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/mm/alignment.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/mm/alignment.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/mm/alignment.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/unicore32/mm/dma-swiotlb.c b/arch/unicore32/mm/dma-swiotlb.c<br/>index 3e9f6489ba38..525413d6690e 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/mm/dma-swiotlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/mm/dma-swiotlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/mm/dma-swiotlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/mm/dma-swiotlb.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@ static void unicore_swiotlb_free_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	swiotlb_free_coherent(dev, size, vaddr, dma_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops swiotlb_dma_map_ops = {</div><div class='add'>+const struct dma_map_ops swiotlb_dma_map_ops = {</div><div class='ctx'> 	.alloc = unicore_swiotlb_alloc_coherent,</div><div class='ctx'> 	.free = unicore_swiotlb_free_coherent,</div><div class='ctx'> 	.map_sg = swiotlb_map_sg_attrs,</div><div class='head'>diff --git a/arch/unicore32/mm/extable.c b/arch/unicore32/mm/extable.c<br/>index 6564180eb285..c562046947ba 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/mm/extable.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int fixup_exception(struct pt_regs *regs)</div><div class='head'>diff --git a/arch/unicore32/mm/fault.c b/arch/unicore32/mm/fault.c<br/>index 6c7f70bcaae3..bbefcc46a45e 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/mm/fault.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/page-flags.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c<br/>index be2bde9b07cf..f4950fbfe574 100644<br/>--- a/<a href='/drm-misc/tree/arch/unicore32/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/unicore32/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/unicore32/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/unicore32/mm/init.c</a></div><div class='hunk'>@@ -57,50 +57,6 @@ early_param("initrd", early_initrd);</div><div class='ctx'>  */</div><div class='ctx'> struct meminfo meminfo;</div><div class='ctx'> </div><div class='del'>-void show_mem(unsigned int filter)</div><div class='del'>-{</div><div class='del'>-	int free = 0, total = 0, reserved = 0;</div><div class='del'>-	int shared = 0, cached = 0, slab = 0, i;</div><div class='del'>-	struct meminfo *mi = &amp;meminfo;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEFAULT "Mem-info:\n");</div><div class='del'>-	show_free_areas(filter);</div><div class='del'>-</div><div class='del'>-	for_each_bank(i, mi) {</div><div class='del'>-		struct membank *bank = &amp;mi-&gt;bank[i];</div><div class='del'>-		unsigned int pfn1, pfn2;</div><div class='del'>-		struct page *page, *end;</div><div class='del'>-</div><div class='del'>-		pfn1 = bank_pfn_start(bank);</div><div class='del'>-		pfn2 = bank_pfn_end(bank);</div><div class='del'>-</div><div class='del'>-		page = pfn_to_page(pfn1);</div><div class='del'>-		end  = pfn_to_page(pfn2 - 1) + 1;</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			total++;</div><div class='del'>-			if (PageReserved(page))</div><div class='del'>-				reserved++;</div><div class='del'>-			else if (PageSwapCache(page))</div><div class='del'>-				cached++;</div><div class='del'>-			else if (PageSlab(page))</div><div class='del'>-				slab++;</div><div class='del'>-			else if (!page_count(page))</div><div class='del'>-				free++;</div><div class='del'>-			else</div><div class='del'>-				shared += page_count(page) - 1;</div><div class='del'>-			page++;</div><div class='del'>-		} while (page &lt; end);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEFAULT "%d pages of RAM\n", total);</div><div class='del'>-	printk(KERN_DEFAULT "%d free pages\n", free);</div><div class='del'>-	printk(KERN_DEFAULT "%d reserved pages\n", reserved);</div><div class='del'>-	printk(KERN_DEFAULT "%d slab pages\n", slab);</div><div class='del'>-	printk(KERN_DEFAULT "%d pages shared\n", shared);</div><div class='del'>-	printk(KERN_DEFAULT "%d pages swap cached\n", cached);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init find_limits(unsigned long *min, unsigned long *max_low,</div><div class='ctx'> 	unsigned long *max_high)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild<br/>index eb3abf8ac44e..586b786b3edf 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/Kbuild</a></div><div class='hunk'>@@ -7,6 +7,9 @@ obj-$(CONFIG_KVM) += kvm/</div><div class='ctx'> # Xen paravirtualization support</div><div class='ctx'> obj-$(CONFIG_XEN) += xen/</div><div class='ctx'> </div><div class='add'>+# Hyper-V paravirtualization support</div><div class='add'>+obj-$(CONFIG_HYPERVISOR_GUEST) += hyperv/</div><div class='add'>+</div><div class='ctx'> # lguest paravirtualization support</div><div class='ctx'> obj-$(CONFIG_LGUEST_GUEST) += lguest/</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig<br/>index bada636d1065..cc98d5a294ee 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/Kconfig</a></div><div class='hunk'>@@ -9,29 +9,55 @@ config 64BIT</div><div class='ctx'> config X86_32</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on !64BIT</div><div class='add'>+	# Options that are inherently 32-bit kernel only:</div><div class='add'>+	select ARCH_WANT_IPC_PARSE_VERSION</div><div class='add'>+	select CLKSRC_I8253</div><div class='add'>+	select CLONE_BACKWARDS</div><div class='add'>+	select HAVE_AOUT</div><div class='add'>+	select HAVE_GENERIC_DMA_COHERENT</div><div class='add'>+	select MODULES_USE_ELF_REL</div><div class='add'>+	select OLD_SIGACTION</div><div class='ctx'> </div><div class='ctx'> config X86_64</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on 64BIT</div><div class='add'>+	# Options that are inherently 64-bit kernel only:</div><div class='add'>+	select ARCH_HAS_GIGANTIC_PAGE</div><div class='add'>+	select ARCH_SUPPORTS_INT128</div><div class='add'>+	select ARCH_USE_CMPXCHG_LOCKREF</div><div class='add'>+	select HAVE_ARCH_SOFT_DIRTY</div><div class='add'>+	select MODULES_USE_ELF_RELA</div><div class='add'>+	select X86_DEV_DMA_OPS</div><div class='ctx'> </div><div class='del'>-### Arch settings</div><div class='add'>+#</div><div class='add'>+# Arch settings</div><div class='add'>+#</div><div class='add'>+# ( Note that options that are marked 'if X86_64' could in principle be</div><div class='add'>+#   ported to 32-bit as well. )</div><div class='add'>+#</div><div class='ctx'> config X86</div><div class='ctx'> 	def_bool y</div><div class='add'>+	#</div><div class='add'>+	# Note: keep this list sorted alphabetically</div><div class='add'>+	#</div><div class='ctx'> 	select ACPI_LEGACY_TABLES_LOOKUP	if ACPI</div><div class='ctx'> 	select ACPI_SYSTEM_POWER_STATES_SUPPORT	if ACPI</div><div class='ctx'> 	select ANON_INODES</div><div class='ctx'> 	select ARCH_CLOCKSOURCE_DATA</div><div class='ctx'> 	select ARCH_DISCARD_MEMBLOCK</div><div class='del'>-	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI</div><div class='add'>+	select ARCH_HAS_ACPI_TABLE_UPGRADE	if ACPI</div><div class='add'>+	select ARCH_HAS_DEBUG_VIRTUAL</div><div class='ctx'> 	select ARCH_HAS_DEVMEM_IS_ALLOWED</div><div class='ctx'> 	select ARCH_HAS_ELF_RANDOMIZE</div><div class='ctx'> 	select ARCH_HAS_FAST_MULTIPLIER</div><div class='ctx'> 	select ARCH_HAS_GCOV_PROFILE_ALL</div><div class='del'>-	select ARCH_HAS_GIGANTIC_PAGE		if X86_64</div><div class='ctx'> 	select ARCH_HAS_KCOV			if X86_64</div><div class='del'>-	select ARCH_HAS_PMEM_API		if X86_64</div><div class='ctx'> 	select ARCH_HAS_MMIO_FLUSH</div><div class='add'>+	select ARCH_HAS_PMEM_API		if X86_64</div><div class='add'>+	select ARCH_HAS_SET_MEMORY</div><div class='ctx'> 	select ARCH_HAS_SG_CHAIN</div><div class='add'>+	select ARCH_HAS_STRICT_KERNEL_RWX</div><div class='add'>+	select ARCH_HAS_STRICT_MODULE_RWX</div><div class='ctx'> 	select ARCH_HAS_UBSAN_SANITIZE_ALL</div><div class='ctx'> 	select ARCH_HAVE_NMI_SAFE_CMPXCHG</div><div class='ctx'> 	select ARCH_MIGHT_HAVE_ACPI_PDC		if ACPI</div><div class='hunk'>@@ -39,23 +65,17 @@ config X86</div><div class='ctx'> 	select ARCH_MIGHT_HAVE_PC_SERIO</div><div class='ctx'> 	select ARCH_SUPPORTS_ATOMIC_RMW</div><div class='ctx'> 	select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT</div><div class='del'>-	select ARCH_SUPPORTS_INT128		if X86_64</div><div class='ctx'> 	select ARCH_SUPPORTS_NUMA_BALANCING	if X86_64</div><div class='ctx'> 	select ARCH_USE_BUILTIN_BSWAP</div><div class='del'>-	select ARCH_USE_CMPXCHG_LOCKREF		if X86_64</div><div class='ctx'> 	select ARCH_USE_QUEUED_RWLOCKS</div><div class='ctx'> 	select ARCH_USE_QUEUED_SPINLOCKS</div><div class='ctx'> 	select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if SMP</div><div class='del'>-	select ARCH_WANTS_DYNAMIC_TASK_STRUCT</div><div class='ctx'> 	select ARCH_WANT_FRAME_POINTERS</div><div class='del'>-	select ARCH_WANT_IPC_PARSE_VERSION	if X86_32</div><div class='add'>+	select ARCH_WANTS_DYNAMIC_TASK_STRUCT</div><div class='ctx'> 	select BUILDTIME_EXTABLE_SORT</div><div class='ctx'> 	select CLKEVT_I8253</div><div class='del'>-	select CLKSRC_I8253			if X86_32</div><div class='ctx'> 	select CLOCKSOURCE_VALIDATE_LAST_CYCLE</div><div class='ctx'> 	select CLOCKSOURCE_WATCHDOG</div><div class='del'>-	select CLONE_BACKWARDS			if X86_32</div><div class='del'>-	select COMPAT_OLD_SIGACTION		if IA32_EMULATION</div><div class='ctx'> 	select DCACHE_WORD_ACCESS</div><div class='ctx'> 	select EDAC_ATOMIC_SCRUB</div><div class='ctx'> 	select EDAC_SUPPORT</div><div class='hunk'>@@ -77,7 +97,6 @@ config X86</div><div class='ctx'> 	select HAVE_ACPI_APEI			if ACPI</div><div class='ctx'> 	select HAVE_ACPI_APEI_NMI		if ACPI</div><div class='ctx'> 	select HAVE_ALIGNED_STRUCT_PAGE		if SLUB</div><div class='del'>-	select HAVE_AOUT			if X86_32</div><div class='ctx'> 	select HAVE_ARCH_AUDITSYSCALL</div><div class='ctx'> 	select HAVE_ARCH_HARDENED_USERCOPY</div><div class='ctx'> 	select HAVE_ARCH_HUGE_VMAP		if X86_64 || X86_PAE</div><div class='hunk'>@@ -88,12 +107,11 @@ config X86</div><div class='ctx'> 	select HAVE_ARCH_MMAP_RND_BITS		if MMU</div><div class='ctx'> 	select HAVE_ARCH_MMAP_RND_COMPAT_BITS	if MMU &amp;&amp; COMPAT</div><div class='ctx'> 	select HAVE_ARCH_SECCOMP_FILTER</div><div class='del'>-	select HAVE_ARCH_SOFT_DIRTY		if X86_64</div><div class='ctx'> 	select HAVE_ARCH_TRACEHOOK</div><div class='ctx'> 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE</div><div class='del'>-	select HAVE_ARCH_WITHIN_STACK_FRAMES</div><div class='del'>-	select HAVE_EBPF_JIT			if X86_64</div><div class='add'>+	select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD if X86_64</div><div class='ctx'> 	select HAVE_ARCH_VMAP_STACK		if X86_64</div><div class='add'>+	select HAVE_ARCH_WITHIN_STACK_FRAMES</div><div class='ctx'> 	select HAVE_CC_STACKPROTECTOR</div><div class='ctx'> 	select HAVE_CMPXCHG_DOUBLE</div><div class='ctx'> 	select HAVE_CMPXCHG_LOCAL</div><div class='hunk'>@@ -106,6 +124,7 @@ config X86</div><div class='ctx'> 	select HAVE_DMA_CONTIGUOUS</div><div class='ctx'> 	select HAVE_DYNAMIC_FTRACE</div><div class='ctx'> 	select HAVE_DYNAMIC_FTRACE_WITH_REGS</div><div class='add'>+	select HAVE_EBPF_JIT			if X86_64</div><div class='ctx'> 	select HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='ctx'> 	select HAVE_EXIT_THREAD</div><div class='ctx'> 	select HAVE_FENTRY			if X86_64</div><div class='hunk'>@@ -113,7 +132,6 @@ config X86</div><div class='ctx'> 	select HAVE_FUNCTION_GRAPH_TRACER</div><div class='ctx'> 	select HAVE_FUNCTION_TRACER</div><div class='ctx'> 	select HAVE_GCC_PLUGINS</div><div class='del'>-	select HAVE_GENERIC_DMA_COHERENT	if X86_32</div><div class='ctx'> 	select HAVE_HW_BREAKPOINT</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select HAVE_IOREMAP_PROT</div><div class='hunk'>@@ -142,15 +160,11 @@ config X86</div><div class='ctx'> 	select HAVE_PERF_REGS</div><div class='ctx'> 	select HAVE_PERF_USER_STACK_DUMP</div><div class='ctx'> 	select HAVE_REGS_AND_STACK_ACCESS_API</div><div class='add'>+	select HAVE_STACK_VALIDATION		if X86_64</div><div class='ctx'> 	select HAVE_SYSCALL_TRACEPOINTS</div><div class='del'>-	select HAVE_UID16			if X86_32 || IA32_EMULATION</div><div class='ctx'> 	select HAVE_UNSTABLE_SCHED_CLOCK</div><div class='ctx'> 	select HAVE_USER_RETURN_NOTIFIER</div><div class='ctx'> 	select IRQ_FORCED_THREADING</div><div class='del'>-	select MODULES_USE_ELF_RELA		if X86_64</div><div class='del'>-	select MODULES_USE_ELF_REL		if X86_32</div><div class='del'>-	select OLD_SIGACTION			if X86_32</div><div class='del'>-	select OLD_SIGSUSPEND3			if X86_32 || IA32_EMULATION</div><div class='ctx'> 	select PERF_EVENTS</div><div class='ctx'> 	select RTC_LIB</div><div class='ctx'> 	select RTC_MC146818_LIB</div><div class='hunk'>@@ -160,11 +174,7 @@ config X86</div><div class='ctx'> 	select THREAD_INFO_IN_TASK</div><div class='ctx'> 	select USER_STACKTRACE_SUPPORT</div><div class='ctx'> 	select VIRT_TO_BUS</div><div class='del'>-	select X86_DEV_DMA_OPS			if X86_64</div><div class='ctx'> 	select X86_FEATURE_NAMES		if PROC_FS</div><div class='del'>-	select HAVE_STACK_VALIDATION		if X86_64</div><div class='del'>-	select ARCH_USES_HIGH_VMA_FLAGS		if X86_INTEL_MEMORY_PROTECTION_KEYS</div><div class='del'>-	select ARCH_HAS_PKEYS			if X86_INTEL_MEMORY_PROTECTION_KEYS</div><div class='ctx'> </div><div class='ctx'> config INSTRUCTION_DECODER</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -304,9 +314,6 @@ config ARCH_SUPPORTS_UPROBES</div><div class='ctx'> config FIX_EARLYCON_MEM</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config DEBUG_RODATA</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config PGTABLE_LEVELS</div><div class='ctx'> 	int</div><div class='ctx'> 	default 4 if X86_64</div><div class='hunk'>@@ -407,6 +414,19 @@ config GOLDFISH</div><div class='ctx'>        def_bool y</div><div class='ctx'>        depends on X86_GOLDFISH</div><div class='ctx'> </div><div class='add'>+config INTEL_RDT_A</div><div class='add'>+	bool "Intel Resource Director Technology Allocation support"</div><div class='add'>+	default n</div><div class='add'>+	depends on X86 &amp;&amp; CPU_SUP_INTEL</div><div class='add'>+	select KERNFS</div><div class='add'>+	help</div><div class='add'>+	  Select to enable resource allocation which is a sub-feature of</div><div class='add'>+	  Intel Resource Director Technology(RDT). More information about</div><div class='add'>+	  RDT can be found in the Intel x86 Architecture Software</div><div class='add'>+	  Developer Manual.</div><div class='add'>+</div><div class='add'>+	  Say N if unsure.</div><div class='add'>+</div><div class='ctx'> if X86_32</div><div class='ctx'> config X86_EXTENDED_PLATFORM</div><div class='ctx'> 	bool "Support for extended (non-PC) x86 platforms"</div><div class='hunk'>@@ -550,18 +570,6 @@ config X86_INTEL_QUARK</div><div class='ctx'> 	  Say Y here if you have a Quark based system such as the Arduino</div><div class='ctx'> 	  compatible Intel Galileo.</div><div class='ctx'> </div><div class='del'>-config MLX_PLATFORM</div><div class='del'>-	tristate "Mellanox Technologies platform support"</div><div class='del'>-	depends on X86_64</div><div class='del'>-	depends on X86_EXTENDED_PLATFORM</div><div class='del'>-	---help---</div><div class='del'>-	  This option enables system support for the Mellanox Technologies</div><div class='del'>-	  platform.</div><div class='del'>-</div><div class='del'>-	  Say Y here if you are building a kernel for Mellanox system.</div><div class='del'>-</div><div class='del'>-	  Otherwise, say N.</div><div class='del'>-</div><div class='ctx'> config X86_INTEL_LPSS</div><div class='ctx'> 	bool "Intel Low Power Subsystem Support"</div><div class='ctx'> 	depends on X86 &amp;&amp; ACPI</div><div class='hunk'>@@ -939,6 +947,27 @@ config SCHED_MC</div><div class='ctx'> 	  making when dealing with multi-core CPU chips at a cost of slightly</div><div class='ctx'> 	  increased overhead in some places. If unsure say N here.</div><div class='ctx'> </div><div class='add'>+config SCHED_MC_PRIO</div><div class='add'>+	bool "CPU core priorities scheduler support"</div><div class='add'>+	depends on SCHED_MC &amp;&amp; CPU_SUP_INTEL</div><div class='add'>+	select X86_INTEL_PSTATE</div><div class='add'>+	select CPU_FREQ</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  Intel Turbo Boost Max Technology 3.0 enabled CPUs have a</div><div class='add'>+	  core ordering determined at manufacturing time, which allows</div><div class='add'>+	  certain cores to reach higher turbo frequencies (when running</div><div class='add'>+	  single threaded workloads) than others.</div><div class='add'>+</div><div class='add'>+	  Enabling this kernel feature teaches the scheduler about</div><div class='add'>+	  the TBM3 (aka ITMT) priority order of the CPU cores and adjusts the</div><div class='add'>+	  scheduler's CPU selection logic accordingly, so that higher</div><div class='add'>+	  overall system performance can be achieved.</div><div class='add'>+</div><div class='add'>+	  This feature will have no effect on CPUs without this feature.</div><div class='add'>+</div><div class='add'>+	  If unsure say Y here.</div><div class='add'>+</div><div class='ctx'> source "kernel/Kconfig.preempt"</div><div class='ctx'> </div><div class='ctx'> config UP_LATE_INIT</div><div class='hunk'>@@ -1025,7 +1054,7 @@ config X86_MCE_INTEL</div><div class='ctx'> config X86_MCE_AMD</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	prompt "AMD MCE features"</div><div class='del'>-	depends on X86_MCE &amp;&amp; X86_LOCAL_APIC</div><div class='add'>+	depends on X86_MCE &amp;&amp; X86_LOCAL_APIC &amp;&amp; AMD_NB</div><div class='ctx'> 	---help---</div><div class='ctx'> 	   Additional support for AMD specific MCE features such as</div><div class='ctx'> 	   the DRAM Error Threshold.</div><div class='hunk'>@@ -1043,7 +1072,7 @@ config X86_MCE_THRESHOLD</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='ctx'> config X86_MCE_INJECT</div><div class='del'>-	depends on X86_MCE</div><div class='add'>+	depends on X86_MCE &amp;&amp; X86_LOCAL_APIC</div><div class='ctx'> 	tristate "Machine check injector support"</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Provide support for injecting machine checks for testing purposes.</div><div class='hunk'>@@ -1525,7 +1554,7 @@ config X86_CHECK_BIOS_CORRUPTION</div><div class='ctx'> 	  line.  By default it scans the low 64k of memory every 60</div><div class='ctx'> 	  seconds; see the memory_corruption_check_size and</div><div class='ctx'> 	  memory_corruption_check_period parameters in</div><div class='del'>-	  Documentation/kernel-parameters.txt to adjust this.</div><div class='add'>+	  Documentation/admin-guide/kernel-parameters.rst to adjust this.</div><div class='ctx'> </div><div class='ctx'> 	  When enabled with the default parameters, this option has</div><div class='ctx'> 	  almost no overhead, as it reserves a relatively small amount</div><div class='hunk'>@@ -1737,6 +1766,8 @@ config X86_INTEL_MEMORY_PROTECTION_KEYS</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	# Note: only available in 64-bit mode</div><div class='ctx'> 	depends on CPU_SUP_INTEL &amp;&amp; X86_64</div><div class='add'>+	select ARCH_USES_HIGH_VMA_FLAGS</div><div class='add'>+	select ARCH_HAS_PKEYS</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Memory Protection Keys provides a mechanism for enforcing</div><div class='ctx'> 	  page-based protections, but without requiring modification of the</div><div class='hunk'>@@ -1965,10 +1996,6 @@ config RANDOMIZE_BASE</div><div class='ctx'> 	  theoretically possible, but the implementations are further</div><div class='ctx'> 	  limited due to memory layouts.</div><div class='ctx'> </div><div class='del'>-	  If CONFIG_HIBERNATE is also enabled, KASLR is disabled at boot</div><div class='del'>-	  time. To enable it, boot with "kaslr" on the kernel command</div><div class='del'>-	  line (which will also disable hibernation).</div><div class='del'>-</div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> # Relocation on x86 needs some additional build support</div><div class='hunk'>@@ -2092,7 +2119,7 @@ config DEBUG_HOTPLUG_CPU0</div><div class='ctx'> config COMPAT_VDSO</div><div class='ctx'> 	def_bool n</div><div class='ctx'> 	prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"</div><div class='del'>-	depends on X86_32 || IA32_EMULATION</div><div class='add'>+	depends on COMPAT_32</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Certain buggy versions of glibc will crash if they are</div><div class='ctx'> 	  presented with a 32-bit vDSO that is not mapped at the address</div><div class='hunk'>@@ -2694,9 +2721,10 @@ source "fs/Kconfig.binfmt"</div><div class='ctx'> config IA32_EMULATION</div><div class='ctx'> 	bool "IA32 Emulation"</div><div class='ctx'> 	depends on X86_64</div><div class='add'>+	select ARCH_WANT_OLD_COMPAT_IPC</div><div class='ctx'> 	select BINFMT_ELF</div><div class='ctx'> 	select COMPAT_BINFMT_ELF</div><div class='del'>-	select ARCH_WANT_OLD_COMPAT_IPC</div><div class='add'>+	select COMPAT_OLD_SIGACTION</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Include code to run legacy 32-bit programs under a</div><div class='ctx'> 	  64-bit kernel. You should likely turn this on, unless you're</div><div class='hunk'>@@ -2721,6 +2749,12 @@ config X86_X32</div><div class='ctx'> 	  elf32_x86_64 support enabled to compile a kernel with this</div><div class='ctx'> 	  option set.</div><div class='ctx'> </div><div class='add'>+config COMPAT_32</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on IA32_EMULATION || X86_32</div><div class='add'>+	select HAVE_UID16</div><div class='add'>+	select OLD_SIGSUSPEND3</div><div class='add'>+</div><div class='ctx'> config COMPAT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on IA32_EMULATION || X86_X32</div><div class='hunk'>@@ -2753,10 +2787,6 @@ config X86_DMA_REMAP</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on STA2X11</div><div class='ctx'> </div><div class='del'>-config PMC_ATOM</div><div class='del'>-	def_bool y</div><div class='del'>-        depends on PCI</div><div class='del'>-</div><div class='ctx'> source "net/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/Kconfig"</div><div class='head'>diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug<br/>index 67eec55093a5..63c1d13aaf9f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/Kconfig.debug?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/Kconfig.debug</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/Kconfig.debug?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/Kconfig.debug</a></div><div class='hunk'>@@ -74,14 +74,6 @@ config EFI_PGT_DUMP</div><div class='ctx'> 	  issues with the mapping of the EFI runtime regions into that</div><div class='ctx'> 	  table.</div><div class='ctx'> </div><div class='del'>-config DEBUG_RODATA_TEST</div><div class='del'>-	bool "Testcase for the marking rodata read-only"</div><div class='del'>-	default y</div><div class='del'>-	---help---</div><div class='del'>-	  This option enables a testcase for the setting rodata read-only</div><div class='del'>-	  as well as for the change_page_attr() infrastructure.</div><div class='del'>-	  If in doubt, say "N"</div><div class='del'>-</div><div class='ctx'> config DEBUG_WX</div><div class='ctx'> 	bool "Warn on W+X mappings at boot"</div><div class='ctx'> 	select X86_PTDUMP_CORE</div><div class='hunk'>@@ -109,25 +101,6 @@ config DEBUG_WX</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say "Y".</div><div class='ctx'> </div><div class='del'>-config DEBUG_SET_MODULE_RONX</div><div class='del'>-	bool "Set loadable kernel module data as NX and text as RO"</div><div class='del'>-	depends on MODULES</div><div class='del'>-	---help---</div><div class='del'>-	  This option helps catch unintended modifications to loadable</div><div class='del'>-	  kernel module's text and read-only data. It also prevents execution</div><div class='del'>-	  of module data. Such protection may interfere with run-time code</div><div class='del'>-	  patching and dynamic kernel tracing - and they might also protect</div><div class='del'>-	  against certain classes of kernel exploits.</div><div class='del'>-	  If in doubt, say "N".</div><div class='del'>-</div><div class='del'>-config DEBUG_NX_TEST</div><div class='del'>-	tristate "Testcase for the NX non-executable stack feature"</div><div class='del'>-	depends on DEBUG_KERNEL &amp;&amp; m</div><div class='del'>-	---help---</div><div class='del'>-	  This option enables a testcase for the CPU NX capability</div><div class='del'>-	  and the software setup of this feature.</div><div class='del'>-	  If in doubt, say "N"</div><div class='del'>-</div><div class='ctx'> config DOUBLEFAULT</div><div class='ctx'> 	default y</div><div class='ctx'> 	bool "Enable doublefault exception handler" if EXPERT</div><div class='head'>diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile<br/>index 12ea8f8384f4..0d810fb15eac 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/boot/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/boot/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/boot/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/Makefile</a></div><div class='hunk'>@@ -65,7 +65,7 @@ clean-files += cpustr.h</div><div class='ctx'> </div><div class='ctx'> # ---------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-KBUILD_CFLAGS	:= $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP</div><div class='add'>+KBUILD_CFLAGS	:= $(REALMODE_CFLAGS) -D_SETUP</div><div class='ctx'> KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__</div><div class='ctx'> GCOV_PROFILE := n</div><div class='ctx'> UBSAN_SANITIZE := n</div><div class='head'>diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h<br/>index e5612f3e3b57..9b42b6d1e902 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/boot/boot.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/boot/boot.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/boot/boot.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/boot.h</a></div><div class='hunk'>@@ -333,6 +333,7 @@ size_t strnlen(const char *s, size_t maxlen);</div><div class='ctx'> unsigned int atou(const char *s);</div><div class='ctx'> unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base);</div><div class='ctx'> size_t strlen(const char *s);</div><div class='add'>+char *strchr(const char *s, int c);</div><div class='ctx'> </div><div class='ctx'> /* tty.c */</div><div class='ctx'> void puts(const char *);</div><div class='head'>diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile<br/>index 34d9e15857c3..44163e8c3868 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/boot/compressed/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/boot/compressed/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/boot/compressed/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/compressed/Makefile</a></div><div class='hunk'>@@ -25,7 +25,7 @@ KCOV_INSTRUMENT		:= n</div><div class='ctx'> targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \</div><div class='ctx'> 	vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4</div><div class='ctx'> </div><div class='del'>-KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2</div><div class='add'>+KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ -O2</div><div class='ctx'> KBUILD_CFLAGS += -fno-strict-aliasing $(call cc-option, -fPIE, -fPIC)</div><div class='ctx'> KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING</div><div class='ctx'> cflags-$(CONFIG_X86_32) := -march=i386</div><div class='head'>diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c<br/>index cc69e37548db..801c7a158e55 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/boot/compressed/eboot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/boot/compressed/eboot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/boot/compressed/eboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/compressed/eboot.c</a></div><div class='hunk'>@@ -32,160 +32,13 @@ static void setup_boot_services##bits(struct efi_config *c)		\</div><div class='ctx'> 									\</div><div class='ctx'> 	table = (typeof(table))sys_table;				\</div><div class='ctx'> 									\</div><div class='add'>+	c-&gt;runtime_services = table-&gt;runtime;				\</div><div class='ctx'> 	c-&gt;boot_services = table-&gt;boottime;				\</div><div class='ctx'> 	c-&gt;text_output = table-&gt;con_out;				\</div><div class='ctx'> }</div><div class='ctx'> BOOT_SERVICES(32);</div><div class='ctx'> BOOT_SERVICES(64);</div><div class='ctx'> </div><div class='del'>-void efi_char16_printk(efi_system_table_t *, efi_char16_t *);</div><div class='del'>-</div><div class='del'>-static efi_status_t</div><div class='del'>-__file_size32(void *__fh, efi_char16_t *filename_16,</div><div class='del'>-	      void **handle, u64 *file_sz)</div><div class='del'>-{</div><div class='del'>-	efi_file_handle_32_t *h, *fh = __fh;</div><div class='del'>-	efi_file_info_t *info;</div><div class='del'>-	efi_status_t status;</div><div class='del'>-	efi_guid_t info_guid = EFI_FILE_INFO_ID;</div><div class='del'>-	u32 info_sz;</div><div class='del'>-</div><div class='del'>-	status = efi_early-&gt;call((unsigned long)fh-&gt;open, fh, &amp;h, filename_16,</div><div class='del'>-				 EFI_FILE_MODE_READ, (u64)0);</div><div class='del'>-	if (status != EFI_SUCCESS) {</div><div class='del'>-		efi_printk(sys_table, "Failed to open file: ");</div><div class='del'>-		efi_char16_printk(sys_table, filename_16);</div><div class='del'>-		efi_printk(sys_table, "\n");</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*handle = h;</div><div class='del'>-</div><div class='del'>-	info_sz = 0;</div><div class='del'>-	status = efi_early-&gt;call((unsigned long)h-&gt;get_info, h, &amp;info_guid,</div><div class='del'>-				 &amp;info_sz, NULL);</div><div class='del'>-	if (status != EFI_BUFFER_TOO_SMALL) {</div><div class='del'>-		efi_printk(sys_table, "Failed to get file info size\n");</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-grow:</div><div class='del'>-	status = efi_call_early(allocate_pool, EFI_LOADER_DATA,</div><div class='del'>-				info_sz, (void **)&amp;info);</div><div class='del'>-	if (status != EFI_SUCCESS) {</div><div class='del'>-		efi_printk(sys_table, "Failed to alloc mem for file info\n");</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = efi_early-&gt;call((unsigned long)h-&gt;get_info, h, &amp;info_guid,</div><div class='del'>-				 &amp;info_sz, info);</div><div class='del'>-	if (status == EFI_BUFFER_TOO_SMALL) {</div><div class='del'>-		efi_call_early(free_pool, info);</div><div class='del'>-		goto grow;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*file_sz = info-&gt;file_size;</div><div class='del'>-	efi_call_early(free_pool, info);</div><div class='del'>-</div><div class='del'>-	if (status != EFI_SUCCESS)</div><div class='del'>-		efi_printk(sys_table, "Failed to get initrd info\n");</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static efi_status_t</div><div class='del'>-__file_size64(void *__fh, efi_char16_t *filename_16,</div><div class='del'>-	      void **handle, u64 *file_sz)</div><div class='del'>-{</div><div class='del'>-	efi_file_handle_64_t *h, *fh = __fh;</div><div class='del'>-	efi_file_info_t *info;</div><div class='del'>-	efi_status_t status;</div><div class='del'>-	efi_guid_t info_guid = EFI_FILE_INFO_ID;</div><div class='del'>-	u64 info_sz;</div><div class='del'>-</div><div class='del'>-	status = efi_early-&gt;call((unsigned long)fh-&gt;open, fh, &amp;h, filename_16,</div><div class='del'>-				 EFI_FILE_MODE_READ, (u64)0);</div><div class='del'>-	if (status != EFI_SUCCESS) {</div><div class='del'>-		efi_printk(sys_table, "Failed to open file: ");</div><div class='del'>-		efi_char16_printk(sys_table, filename_16);</div><div class='del'>-		efi_printk(sys_table, "\n");</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*handle = h;</div><div class='del'>-</div><div class='del'>-	info_sz = 0;</div><div class='del'>-	status = efi_early-&gt;call((unsigned long)h-&gt;get_info, h, &amp;info_guid,</div><div class='del'>-				 &amp;info_sz, NULL);</div><div class='del'>-	if (status != EFI_BUFFER_TOO_SMALL) {</div><div class='del'>-		efi_printk(sys_table, "Failed to get file info size\n");</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-grow:</div><div class='del'>-	status = efi_call_early(allocate_pool, EFI_LOADER_DATA,</div><div class='del'>-				info_sz, (void **)&amp;info);</div><div class='del'>-	if (status != EFI_SUCCESS) {</div><div class='del'>-		efi_printk(sys_table, "Failed to alloc mem for file info\n");</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = efi_early-&gt;call((unsigned long)h-&gt;get_info, h, &amp;info_guid,</div><div class='del'>-				 &amp;info_sz, info);</div><div class='del'>-	if (status == EFI_BUFFER_TOO_SMALL) {</div><div class='del'>-		efi_call_early(free_pool, info);</div><div class='del'>-		goto grow;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*file_sz = info-&gt;file_size;</div><div class='del'>-	efi_call_early(free_pool, info);</div><div class='del'>-</div><div class='del'>-	if (status != EFI_SUCCESS)</div><div class='del'>-		efi_printk(sys_table, "Failed to get initrd info\n");</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-efi_status_t</div><div class='del'>-efi_file_size(efi_system_table_t *sys_table, void *__fh,</div><div class='del'>-	      efi_char16_t *filename_16, void **handle, u64 *file_sz)</div><div class='del'>-{</div><div class='del'>-	if (efi_early-&gt;is64)</div><div class='del'>-		return __file_size64(__fh, filename_16, handle, file_sz);</div><div class='del'>-</div><div class='del'>-	return __file_size32(__fh, filename_16, handle, file_sz);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-efi_status_t</div><div class='del'>-efi_file_read(void *handle, unsigned long *size, void *addr)</div><div class='del'>-{</div><div class='del'>-	unsigned long func;</div><div class='del'>-</div><div class='del'>-	if (efi_early-&gt;is64) {</div><div class='del'>-		efi_file_handle_64_t *fh = handle;</div><div class='del'>-</div><div class='del'>-		func = (unsigned long)fh-&gt;read;</div><div class='del'>-		return efi_early-&gt;call(func, handle, size, addr);</div><div class='del'>-	} else {</div><div class='del'>-		efi_file_handle_32_t *fh = handle;</div><div class='del'>-</div><div class='del'>-		func = (unsigned long)fh-&gt;read;</div><div class='del'>-		return efi_early-&gt;call(func, handle, size, addr);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-efi_status_t efi_file_close(void *handle)</div><div class='del'>-{</div><div class='del'>-	if (efi_early-&gt;is64) {</div><div class='del'>-		efi_file_handle_64_t *fh = handle;</div><div class='del'>-</div><div class='del'>-		return efi_early-&gt;call((unsigned long)fh-&gt;close, handle);</div><div class='del'>-	} else {</div><div class='del'>-		efi_file_handle_32_t *fh = handle;</div><div class='del'>-</div><div class='del'>-		return efi_early-&gt;call((unsigned long)fh-&gt;close, handle);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline efi_status_t __open_volume32(void *__image, void **__fh)</div><div class='ctx'> {</div><div class='ctx'> 	efi_file_io_interface_t *io;</div><div class='hunk'>@@ -249,30 +102,8 @@ efi_open_volume(efi_system_table_t *sys_table, void *__image, void **__fh)</div><div class='ctx'> </div><div class='ctx'> void efi_char16_printk(efi_system_table_t *table, efi_char16_t *str)</div><div class='ctx'> {</div><div class='del'>-	unsigned long output_string;</div><div class='del'>-	size_t offset;</div><div class='del'>-</div><div class='del'>-	if (efi_early-&gt;is64) {</div><div class='del'>-		struct efi_simple_text_output_protocol_64 *out;</div><div class='del'>-		u64 *func;</div><div class='del'>-</div><div class='del'>-		offset = offsetof(typeof(*out), output_string);</div><div class='del'>-		output_string = efi_early-&gt;text_output + offset;</div><div class='del'>-		out = (typeof(out))(unsigned long)efi_early-&gt;text_output;</div><div class='del'>-		func = (u64 *)output_string;</div><div class='del'>-</div><div class='del'>-		efi_early-&gt;call(*func, out, str);</div><div class='del'>-	} else {</div><div class='del'>-		struct efi_simple_text_output_protocol_32 *out;</div><div class='del'>-		u32 *func;</div><div class='del'>-</div><div class='del'>-		offset = offsetof(typeof(*out), output_string);</div><div class='del'>-		output_string = efi_early-&gt;text_output + offset;</div><div class='del'>-		out = (typeof(out))(unsigned long)efi_early-&gt;text_output;</div><div class='del'>-		func = (u32 *)output_string;</div><div class='del'>-</div><div class='del'>-		efi_early-&gt;call(*func, out, str);</div><div class='del'>-	}</div><div class='add'>+	efi_call_proto(efi_simple_text_output_protocol, output_string,</div><div class='add'>+		       efi_early-&gt;text_output, str);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static efi_status_t</div><div class='hunk'>@@ -537,6 +368,69 @@ free_handle:</div><div class='ctx'> 	efi_call_early(free_pool, pci_handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void retrieve_apple_device_properties(struct boot_params *boot_params)</div><div class='add'>+{</div><div class='add'>+	efi_guid_t guid = APPLE_PROPERTIES_PROTOCOL_GUID;</div><div class='add'>+	struct setup_data *data, *new;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	u32 size = 0;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	status = efi_call_early(locate_protocol, &amp;guid, NULL, &amp;p);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (efi_table_attr(apple_properties_protocol, version, p) != 0x10000) {</div><div class='add'>+		efi_printk(sys_table, "Unsupported properties proto version\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	efi_call_proto(apple_properties_protocol, get_all, p, NULL, &amp;size);</div><div class='add'>+	if (!size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		status = efi_call_early(allocate_pool, EFI_LOADER_DATA,</div><div class='add'>+					size + sizeof(struct setup_data), &amp;new);</div><div class='add'>+		if (status != EFI_SUCCESS) {</div><div class='add'>+			efi_printk(sys_table,</div><div class='add'>+					"Failed to alloc mem for properties\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		status = efi_call_proto(apple_properties_protocol, get_all, p,</div><div class='add'>+					new-&gt;data, &amp;size);</div><div class='add'>+</div><div class='add'>+		if (status == EFI_BUFFER_TOO_SMALL)</div><div class='add'>+			efi_call_early(free_pool, new);</div><div class='add'>+	} while (status == EFI_BUFFER_TOO_SMALL);</div><div class='add'>+</div><div class='add'>+	new-&gt;type = SETUP_APPLE_PROPERTIES;</div><div class='add'>+	new-&gt;len  = size;</div><div class='add'>+	new-&gt;next = 0;</div><div class='add'>+</div><div class='add'>+	data = (struct setup_data *)(unsigned long)boot_params-&gt;hdr.setup_data;</div><div class='add'>+	if (!data)</div><div class='add'>+		boot_params-&gt;hdr.setup_data = (unsigned long)new;</div><div class='add'>+	else {</div><div class='add'>+		while (data-&gt;next)</div><div class='add'>+			data = (struct setup_data *)(unsigned long)data-&gt;next;</div><div class='add'>+		data-&gt;next = (unsigned long)new;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_quirks(struct boot_params *boot_params)</div><div class='add'>+{</div><div class='add'>+	efi_char16_t const apple[] = { 'A', 'p', 'p', 'l', 'e', 0 };</div><div class='add'>+	efi_char16_t *fw_vendor = (efi_char16_t *)(unsigned long)</div><div class='add'>+		efi_table_attr(efi_system_table, fw_vendor, sys_table);</div><div class='add'>+</div><div class='add'>+	if (!memcmp(fw_vendor, apple, sizeof(apple))) {</div><div class='add'>+		if (IS_ENABLED(CONFIG_APPLE_PROPERTIES))</div><div class='add'>+			retrieve_apple_device_properties(boot_params);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static efi_status_t</div><div class='ctx'> setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height)</div><div class='ctx'> {</div><div class='hunk'>@@ -1094,10 +988,19 @@ struct boot_params *efi_main(struct efi_config *c,</div><div class='ctx'> 	else</div><div class='ctx'> 		setup_boot_services32(efi_early);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If the boot loader gave us a value for secure_boot then we use that,</div><div class='add'>+	 * otherwise we ask the BIOS.</div><div class='add'>+	 */</div><div class='add'>+	if (boot_params-&gt;secure_boot == efi_secureboot_mode_unset)</div><div class='add'>+		boot_params-&gt;secure_boot = efi_get_secureboot(sys_table);</div><div class='add'>+</div><div class='ctx'> 	setup_graphics(boot_params);</div><div class='ctx'> </div><div class='ctx'> 	setup_efi_pci(boot_params);</div><div class='ctx'> </div><div class='add'>+	setup_quirks(boot_params);</div><div class='add'>+</div><div class='ctx'> 	status = efi_call_early(allocate_pool, EFI_LOADER_DATA,</div><div class='ctx'> 				sizeof(*gdt), (void **)&amp;gdt);</div><div class='ctx'> 	if (status != EFI_SUCCESS) {</div><div class='head'>diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S<br/>index fd0b6a272dd5..d85b9625e836 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/boot/compressed/head_32.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/boot/compressed/head_32.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/boot/compressed/head_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/compressed/head_32.S</a></div><div class='hunk'>@@ -82,7 +82,7 @@ ENTRY(efi_pe_entry)</div><div class='ctx'> </div><div class='ctx'> 	/* Relocate efi_config-&gt;call() */</div><div class='ctx'> 	leal	efi32_config(%esi), %eax</div><div class='del'>-	add	%esi, 32(%eax)</div><div class='add'>+	add	%esi, 40(%eax)</div><div class='ctx'> 	pushl	%eax</div><div class='ctx'> </div><div class='ctx'> 	call	make_boot_params</div><div class='hunk'>@@ -108,7 +108,7 @@ ENTRY(efi32_stub_entry)</div><div class='ctx'> </div><div class='ctx'> 	/* Relocate efi_config-&gt;call() */</div><div class='ctx'> 	leal	efi32_config(%esi), %eax</div><div class='del'>-	add	%esi, 32(%eax)</div><div class='add'>+	add	%esi, 40(%eax)</div><div class='ctx'> 	pushl	%eax</div><div class='ctx'> 2:</div><div class='ctx'> 	call	efi_main</div><div class='hunk'>@@ -264,7 +264,7 @@ relocated:</div><div class='ctx'> #ifdef CONFIG_EFI_STUB</div><div class='ctx'> 	.data</div><div class='ctx'> efi32_config:</div><div class='del'>-	.fill 4,8,0</div><div class='add'>+	.fill 5,8,0</div><div class='ctx'> 	.long efi_call_phys</div><div class='ctx'> 	.long 0</div><div class='ctx'> 	.byte 0</div><div class='head'>diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S<br/>index efdfba21a5b2..d2ae1f821e0c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/boot/compressed/head_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/boot/compressed/head_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/boot/compressed/head_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/compressed/head_64.S</a></div><div class='hunk'>@@ -119,8 +119,7 @@ ENTRY(startup_32)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> 	/* Load new GDT with the 64bit segments using 32bit descriptor */</div><div class='del'>-	leal	gdt(%ebp), %eax</div><div class='del'>-	movl	%eax, gdt+2(%ebp)</div><div class='add'>+	addl	%ebp, gdt+2(%ebp)</div><div class='ctx'> 	lgdt	gdt(%ebp)</div><div class='ctx'> </div><div class='ctx'> 	/* Enable PAE mode */</div><div class='hunk'>@@ -265,7 +264,7 @@ ENTRY(efi_pe_entry)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Relocate efi_config-&gt;call().</div><div class='ctx'> 	 */</div><div class='del'>-	addq	%rbp, efi64_config+32(%rip)</div><div class='add'>+	addq	%rbp, efi64_config+40(%rip)</div><div class='ctx'> </div><div class='ctx'> 	movq	%rax, %rdi</div><div class='ctx'> 	call	make_boot_params</div><div class='hunk'>@@ -285,7 +284,7 @@ handover_entry:</div><div class='ctx'> 	 * Relocate efi_config-&gt;call().</div><div class='ctx'> 	 */</div><div class='ctx'> 	movq	efi_config(%rip), %rax</div><div class='del'>-	addq	%rbp, 32(%rax)</div><div class='add'>+	addq	%rbp, 40(%rax)</div><div class='ctx'> 2:</div><div class='ctx'> 	movq	efi_config(%rip), %rdi</div><div class='ctx'> 	call	efi_main</div><div class='hunk'>@@ -457,14 +456,14 @@ efi_config:</div><div class='ctx'> #ifdef CONFIG_EFI_MIXED</div><div class='ctx'> 	.global efi32_config</div><div class='ctx'> efi32_config:</div><div class='del'>-	.fill	4,8,0</div><div class='add'>+	.fill	5,8,0</div><div class='ctx'> 	.quad	efi64_thunk</div><div class='ctx'> 	.byte	0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	.global efi64_config</div><div class='ctx'> efi64_config:</div><div class='del'>-	.fill	4,8,0</div><div class='add'>+	.fill	5,8,0</div><div class='ctx'> 	.quad	efi_call</div><div class='ctx'> 	.byte	1</div><div class='ctx'> #endif /* CONFIG_EFI_STUB */</div><div class='head'>diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c<br/>index a66854d99ee1..8b7c9e75edcb 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/boot/compressed/kaslr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/boot/compressed/kaslr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/boot/compressed/kaslr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/compressed/kaslr.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include "misc.h"</div><div class='ctx'> #include "error.h"</div><div class='add'>+#include "../boot.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;generated/compile.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -52,15 +53,22 @@ static unsigned long get_boot_seed(void)</div><div class='ctx'> #include "../../lib/kaslr.c"</div><div class='ctx'> </div><div class='ctx'> struct mem_vector {</div><div class='del'>-	unsigned long start;</div><div class='del'>-	unsigned long size;</div><div class='add'>+	unsigned long long start;</div><div class='add'>+	unsigned long long size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Only supporting at most 4 unusable memmap regions with kaslr */</div><div class='add'>+#define MAX_MEMMAP_REGIONS	4</div><div class='add'>+</div><div class='add'>+static bool memmap_too_large;</div><div class='add'>+</div><div class='ctx'> enum mem_avoid_index {</div><div class='ctx'> 	MEM_AVOID_ZO_RANGE = 0,</div><div class='ctx'> 	MEM_AVOID_INITRD,</div><div class='ctx'> 	MEM_AVOID_CMDLINE,</div><div class='ctx'> 	MEM_AVOID_BOOTPARAMS,</div><div class='add'>+	MEM_AVOID_MEMMAP_BEGIN,</div><div class='add'>+	MEM_AVOID_MEMMAP_END = MEM_AVOID_MEMMAP_BEGIN + MAX_MEMMAP_REGIONS - 1,</div><div class='ctx'> 	MEM_AVOID_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -77,6 +85,123 @@ static bool mem_overlaps(struct mem_vector *one, struct mem_vector *two)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	_memparse - Parse a string with mem suffixes into a number</div><div class='add'>+ *	@ptr: Where parse begins</div><div class='add'>+ *	@retptr: (output) Optional pointer to next char after parse completes</div><div class='add'>+ *</div><div class='add'>+ *	Parses a string into a number.  The number stored at @ptr is</div><div class='add'>+ *	potentially suffixed with K, M, G, T, P, E.</div><div class='add'>+ */</div><div class='add'>+static unsigned long long _memparse(const char *ptr, char **retptr)</div><div class='add'>+{</div><div class='add'>+	char *endptr;	/* Local pointer to end of parsed string */</div><div class='add'>+</div><div class='add'>+	unsigned long long ret = simple_strtoull(ptr, &amp;endptr, 0);</div><div class='add'>+</div><div class='add'>+	switch (*endptr) {</div><div class='add'>+	case 'E':</div><div class='add'>+	case 'e':</div><div class='add'>+		ret &lt;&lt;= 10;</div><div class='add'>+	case 'P':</div><div class='add'>+	case 'p':</div><div class='add'>+		ret &lt;&lt;= 10;</div><div class='add'>+	case 'T':</div><div class='add'>+	case 't':</div><div class='add'>+		ret &lt;&lt;= 10;</div><div class='add'>+	case 'G':</div><div class='add'>+	case 'g':</div><div class='add'>+		ret &lt;&lt;= 10;</div><div class='add'>+	case 'M':</div><div class='add'>+	case 'm':</div><div class='add'>+		ret &lt;&lt;= 10;</div><div class='add'>+	case 'K':</div><div class='add'>+	case 'k':</div><div class='add'>+		ret &lt;&lt;= 10;</div><div class='add'>+		endptr++;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (retptr)</div><div class='add'>+		*retptr = endptr;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+parse_memmap(char *p, unsigned long long *start, unsigned long long *size)</div><div class='add'>+{</div><div class='add'>+	char *oldp;</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* We don't care about this option here */</div><div class='add'>+	if (!strncmp(p, "exactmap", 8))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	oldp = p;</div><div class='add'>+	*size = _memparse(p, &amp;p);</div><div class='add'>+	if (p == oldp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (*p) {</div><div class='add'>+	case '@':</div><div class='add'>+		/* Skip this region, usable */</div><div class='add'>+		*start = 0;</div><div class='add'>+		*size = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	case '#':</div><div class='add'>+	case '$':</div><div class='add'>+	case '!':</div><div class='add'>+		*start = _memparse(p + 1, &amp;p);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mem_avoid_memmap(void)</div><div class='add'>+{</div><div class='add'>+	char arg[128];</div><div class='add'>+	int rc;</div><div class='add'>+	int i;</div><div class='add'>+	char *str;</div><div class='add'>+</div><div class='add'>+	/* See if we have any memmap areas */</div><div class='add'>+	rc = cmdline_find_option("memmap", arg, sizeof(arg));</div><div class='add'>+	if (rc &lt;= 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	str = arg;</div><div class='add'>+	while (str &amp;&amp; (i &lt; MAX_MEMMAP_REGIONS)) {</div><div class='add'>+		int rc;</div><div class='add'>+		unsigned long long start, size;</div><div class='add'>+		char *k = strchr(str, ',');</div><div class='add'>+</div><div class='add'>+		if (k)</div><div class='add'>+			*k++ = 0;</div><div class='add'>+</div><div class='add'>+		rc = parse_memmap(str, &amp;start, &amp;size);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		str = k;</div><div class='add'>+		/* A usable region that should not be skipped */</div><div class='add'>+		if (size == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mem_avoid[MEM_AVOID_MEMMAP_BEGIN + i].start = start;</div><div class='add'>+		mem_avoid[MEM_AVOID_MEMMAP_BEGIN + i].size = size;</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* More than 4 memmaps, fail kaslr */</div><div class='add'>+	if ((i &gt;= MAX_MEMMAP_REGIONS) &amp;&amp; str)</div><div class='add'>+		memmap_too_large = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * In theory, KASLR can put the kernel anywhere in the range of [16M, 64T).</div><div class='ctx'>  * The mem_avoid array is used to store the ranges that need to be avoided</div><div class='hunk'>@@ -197,6 +322,9 @@ static void mem_avoid_init(unsigned long input, unsigned long input_size,</div><div class='ctx'> </div><div class='ctx'> 	/* We don't need to set a mapping for setup_data. */</div><div class='ctx'> </div><div class='add'>+	/* Mark the memmap regions we need to avoid */</div><div class='add'>+	mem_avoid_memmap();</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_VERBOSE_BOOTUP</div><div class='ctx'> 	/* Make sure video RAM can be used. */</div><div class='ctx'> 	add_identity_map(0, PMD_SIZE);</div><div class='hunk'>@@ -379,6 +507,12 @@ static unsigned long find_random_phys_addr(unsigned long minimum,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'> </div><div class='add'>+	/* Check if we had too many memmaps. */</div><div class='add'>+	if (memmap_too_large) {</div><div class='add'>+		debug_putstr("Aborted e820 scan (more than 4 memmap= args)!\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Make sure minimum is aligned. */</div><div class='ctx'> 	minimum = ALIGN(minimum, CONFIG_PHYSICAL_ALIGN);</div><div class='ctx'> </div><div class='hunk'>@@ -456,7 +590,7 @@ void choose_random_location(unsigned long input,</div><div class='ctx'> 	/* Walk e820 and find a random address. */</div><div class='ctx'> 	random_addr = find_random_phys_addr(min_addr, output_size);</div><div class='ctx'> 	if (!random_addr) {</div><div class='del'>-		warn("KASLR disabled: could not find suitable E820 region!");</div><div class='add'>+		warn("Physical KASLR disabled: no suitable memory region!");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Update the new physical address location. */</div><div class='ctx'> 		if (*output != random_addr) {</div><div class='head'>diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c<br/>index 4224ede43b4e..26240dde081e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/boot/cpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/boot/cpu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/boot/cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/cpu.c</a></div><div class='hunk'>@@ -87,12 +87,6 @@ int validate_cpu(void)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (CONFIG_X86_MINIMUM_CPU_FAMILY &lt;= 4 &amp;&amp; !IS_ENABLED(CONFIG_M486) &amp;&amp;</div><div class='del'>-	    !has_eflag(X86_EFLAGS_ID)) {</div><div class='del'>-		printf("This kernel requires a CPU with the CPUID instruction.  Build with CONFIG_M486=y to run on this CPU.\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (err_flags) {</div><div class='ctx'> 		puts("This kernel requires the following features "</div><div class='ctx'> 		     "not present on the CPU:\n");</div><div class='head'>diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c<br/>index cc3bd583dce1..5457b02fc050 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/boot/string.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/boot/string.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/boot/string.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/string.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include "ctype.h"</div><div class='add'>+#include "string.h"</div><div class='ctx'> </div><div class='ctx'> int memcmp(const void *s1, const void *s2, size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -155,3 +156,16 @@ char *strstr(const char *s1, const char *s2)</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * strchr - Find the first occurrence of the character c in the string s.</div><div class='add'>+ * @s: the string to be searched</div><div class='add'>+ * @c: the character to search for</div><div class='add'>+ */</div><div class='add'>+char *strchr(const char *s, int c)</div><div class='add'>+{</div><div class='add'>+	while (*s != (char)c)</div><div class='add'>+		if (*s++ == '\0')</div><div class='add'>+			return NULL;</div><div class='add'>+	return (char *)s;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/boot/string.h b/arch/x86/boot/string.h<br/>index 725e820602b1..113588ddb43f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/boot/string.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/boot/string.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/boot/string.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/boot/string.h</a></div><div class='hunk'>@@ -18,4 +18,13 @@ int memcmp(const void *s1, const void *s2, size_t len);</div><div class='ctx'> #define memset(d,c,l) __builtin_memset(d,c,l)</div><div class='ctx'> #define memcmp	__builtin_memcmp</div><div class='ctx'> </div><div class='add'>+extern int strcmp(const char *str1, const char *str2);</div><div class='add'>+extern int strncmp(const char *cs, const char *ct, size_t count);</div><div class='add'>+extern size_t strlen(const char *s);</div><div class='add'>+extern char *strstr(const char *s1, const char *s2);</div><div class='add'>+extern size_t strnlen(const char *s, size_t maxlen);</div><div class='add'>+extern unsigned int atou(const char *s);</div><div class='add'>+extern unsigned long long simple_strtoull(const char *cp, char **endp,</div><div class='add'>+					  unsigned int base);</div><div class='add'>+</div><div class='ctx'> #endif /* BOOT_STRING_H */</div><div class='head'>diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S<br/>index 383a6f84a060..3c465184ff8a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/aesni-intel_asm.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/aesni-intel_asm.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/aesni-intel_asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/aesni-intel_asm.S</a></div><div class='hunk'>@@ -46,28 +46,49 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef __x86_64__</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+# constants in mergeable sections, linker can reorder and merge</div><div class='add'>+.section	.rodata.cst16.gf128mul_x_ble_mask, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='ctx'> .Lgf128mul_x_ble_mask:</div><div class='ctx'> 	.octa 0x00000000000000010000000000000087</div><div class='add'>+.section	.rodata.cst16.POLY, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> POLY:   .octa 0xC2000000000000000000000000000001</div><div class='add'>+.section	.rodata.cst16.TWOONE, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> TWOONE: .octa 0x00000001000000000000000000000001</div><div class='ctx'> </div><div class='del'>-# order of these constants should not change.</div><div class='del'>-# more specifically, ALL_F should follow SHIFT_MASK,</div><div class='del'>-# and ZERO should follow ALL_F</div><div class='del'>-</div><div class='add'>+.section	.rodata.cst16.SHUF_MASK, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> SHUF_MASK:  .octa 0x000102030405060708090A0B0C0D0E0F</div><div class='add'>+.section	.rodata.cst16.MASK1, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> MASK1:      .octa 0x0000000000000000ffffffffffffffff</div><div class='add'>+.section	.rodata.cst16.MASK2, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> MASK2:      .octa 0xffffffffffffffff0000000000000000</div><div class='del'>-SHIFT_MASK: .octa 0x0f0e0d0c0b0a09080706050403020100</div><div class='del'>-ALL_F:      .octa 0xffffffffffffffffffffffffffffffff</div><div class='del'>-ZERO:       .octa 0x00000000000000000000000000000000</div><div class='add'>+.section	.rodata.cst16.ONE, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> ONE:        .octa 0x00000000000000000000000000000001</div><div class='add'>+.section	.rodata.cst16.F_MIN_MASK, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> F_MIN_MASK: .octa 0xf1f2f3f4f5f6f7f8f9fafbfcfdfeff0</div><div class='add'>+.section	.rodata.cst16.dec, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> dec:        .octa 0x1</div><div class='add'>+.section	.rodata.cst16.enc, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> enc:        .octa 0x2</div><div class='ctx'> </div><div class='add'>+# order of these constants should not change.</div><div class='add'>+# more specifically, ALL_F should follow SHIFT_MASK,</div><div class='add'>+# and zero should follow ALL_F</div><div class='add'>+.section	.rodata, "a", @progbits</div><div class='add'>+.align 16</div><div class='add'>+SHIFT_MASK: .octa 0x0f0e0d0c0b0a09080706050403020100</div><div class='add'>+ALL_F:      .octa 0xffffffffffffffffffffffffffffffff</div><div class='add'>+            .octa 0x00000000000000000000000000000000</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> .text</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/aesni-intel_avx-x86_64.S b/arch/x86/crypto/aesni-intel_avx-x86_64.S<br/>index 522ab68d1c88..d664382c6e56 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/aesni-intel_avx-x86_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/aesni-intel_avx-x86_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/aesni-intel_avx-x86_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/aesni-intel_avx-x86_64.S</a></div><div class='hunk'>@@ -122,23 +122,39 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/inst.h&gt;</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+# constants in mergeable sections, linker can reorder and merge</div><div class='add'>+.section	.rodata.cst16.POLY, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='del'>-</div><div class='ctx'> POLY:            .octa     0xC2000000000000000000000000000001</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst16.POLY2, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> POLY2:           .octa     0xC20000000000000000000001C2000000</div><div class='del'>-TWOONE:          .octa     0x00000001000000000000000000000001</div><div class='ctx'> </div><div class='del'>-# order of these constants should not change.</div><div class='del'>-# more specifically, ALL_F should follow SHIFT_MASK, and ZERO should follow ALL_F</div><div class='add'>+.section	.rodata.cst16.TWOONE, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='add'>+TWOONE:          .octa     0x00000001000000000000000000000001</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst16.SHUF_MASK, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> SHUF_MASK:       .octa     0x000102030405060708090A0B0C0D0E0F</div><div class='del'>-SHIFT_MASK:      .octa     0x0f0e0d0c0b0a09080706050403020100</div><div class='del'>-ALL_F:           .octa     0xffffffffffffffffffffffffffffffff</div><div class='del'>-ZERO:            .octa     0x00000000000000000000000000000000</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst16.ONE, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> ONE:             .octa     0x00000000000000000000000000000001</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst16.ONEf, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> ONEf:            .octa     0x01000000000000000000000000000000</div><div class='ctx'> </div><div class='add'>+# order of these constants should not change.</div><div class='add'>+# more specifically, ALL_F should follow SHIFT_MASK, and zero should follow ALL_F</div><div class='add'>+.section	.rodata, "a", @progbits</div><div class='add'>+.align 16</div><div class='add'>+SHIFT_MASK:      .octa     0x0f0e0d0c0b0a09080706050403020100</div><div class='add'>+ALL_F:           .octa     0xffffffffffffffffffffffffffffffff</div><div class='add'>+                 .octa     0x00000000000000000000000000000000</div><div class='add'>+</div><div class='ctx'> .text</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c<br/>index aa8b0672f87a..93de8ea51548 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/aesni-intel_glue.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/aesni-intel_glue.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/aesni-intel_glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/aesni-intel_glue.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='hunk'>@@ -29,14 +28,14 @@</div><div class='ctx'> #include &lt;crypto/cryptd.h&gt;</div><div class='ctx'> #include &lt;crypto/ctr.h&gt;</div><div class='ctx'> #include &lt;crypto/b128ops.h&gt;</div><div class='del'>-#include &lt;crypto/lrw.h&gt;</div><div class='ctx'> #include &lt;crypto/xts.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_device_id.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/api.h&gt;</div><div class='ctx'> #include &lt;asm/crypto/aes.h&gt;</div><div class='del'>-#include &lt;crypto/ablk_helper.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='hunk'>@@ -45,28 +44,26 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define AESNI_ALIGN	16</div><div class='add'>+#define AESNI_ALIGN_ATTR __attribute__ ((__aligned__(AESNI_ALIGN)))</div><div class='ctx'> #define AES_BLOCK_MASK	(~(AES_BLOCK_SIZE - 1))</div><div class='ctx'> #define RFC4106_HASH_SUBKEY_SIZE 16</div><div class='add'>+#define AESNI_ALIGN_EXTRA ((AESNI_ALIGN - 1) &amp; ~(CRYPTO_MINALIGN - 1))</div><div class='add'>+#define CRYPTO_AES_CTX_SIZE (sizeof(struct crypto_aes_ctx) + AESNI_ALIGN_EXTRA)</div><div class='add'>+#define XTS_AES_CTX_SIZE (sizeof(struct aesni_xts_ctx) + AESNI_ALIGN_EXTRA)</div><div class='ctx'> </div><div class='ctx'> /* This data is stored at the end of the crypto_tfm struct.</div><div class='ctx'>  * It's a type of per "session" data storage location.</div><div class='ctx'>  * This needs to be 16 byte aligned.</div><div class='ctx'>  */</div><div class='ctx'> struct aesni_rfc4106_gcm_ctx {</div><div class='del'>-	u8 hash_subkey[16] __attribute__ ((__aligned__(AESNI_ALIGN)));</div><div class='del'>-	struct crypto_aes_ctx aes_key_expanded</div><div class='del'>-		__attribute__ ((__aligned__(AESNI_ALIGN)));</div><div class='add'>+	u8 hash_subkey[16] AESNI_ALIGN_ATTR;</div><div class='add'>+	struct crypto_aes_ctx aes_key_expanded AESNI_ALIGN_ATTR;</div><div class='ctx'> 	u8 nonce[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct aesni_lrw_ctx {</div><div class='del'>-	struct lrw_table_ctx lrw_table;</div><div class='del'>-	u8 raw_aes_ctx[sizeof(struct crypto_aes_ctx) + AESNI_ALIGN - 1];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct aesni_xts_ctx {</div><div class='del'>-	u8 raw_tweak_ctx[sizeof(struct crypto_aes_ctx) + AESNI_ALIGN - 1];</div><div class='del'>-	u8 raw_crypt_ctx[sizeof(struct crypto_aes_ctx) + AESNI_ALIGN - 1];</div><div class='add'>+	u8 raw_tweak_ctx[sizeof(struct crypto_aes_ctx)] AESNI_ALIGN_ATTR;</div><div class='add'>+	u8 raw_crypt_ctx[sizeof(struct crypto_aes_ctx)] AESNI_ALIGN_ATTR;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> asmlinkage int aesni_set_key(struct crypto_aes_ctx *ctx, const u8 *in_key,</div><div class='hunk'>@@ -360,96 +357,95 @@ static void __aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> 	aesni_dec(ctx, dst, src);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ecb_encrypt(struct blkcipher_desc *desc,</div><div class='del'>-		       struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-		       unsigned int nbytes)</div><div class='add'>+static int aesni_skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='add'>+			         unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return aes_set_key_common(crypto_skcipher_tfm(tfm),</div><div class='add'>+				  crypto_skcipher_ctx(tfm), key, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = aes_ctx(crypto_blkcipher_ctx(desc-&gt;tfm));</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = aes_ctx(crypto_skcipher_ctx(tfm));</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	unsigned int nbytes;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='ctx'> 	while ((nbytes = walk.nbytes)) {</div><div class='ctx'> 		aesni_ecb_enc(ctx, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 			      nbytes &amp; AES_BLOCK_MASK);</div><div class='ctx'> 		nbytes &amp;= AES_BLOCK_SIZE - 1;</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, nbytes);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_fpu_end();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ecb_decrypt(struct blkcipher_desc *desc,</div><div class='del'>-		       struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-		       unsigned int nbytes)</div><div class='add'>+static int ecb_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = aes_ctx(crypto_blkcipher_ctx(desc-&gt;tfm));</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = aes_ctx(crypto_skcipher_ctx(tfm));</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	unsigned int nbytes;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='ctx'> 	while ((nbytes = walk.nbytes)) {</div><div class='ctx'> 		aesni_ecb_dec(ctx, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 			      nbytes &amp; AES_BLOCK_MASK);</div><div class='ctx'> 		nbytes &amp;= AES_BLOCK_SIZE - 1;</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, nbytes);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_fpu_end();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cbc_encrypt(struct blkcipher_desc *desc,</div><div class='del'>-		       struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-		       unsigned int nbytes)</div><div class='add'>+static int cbc_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = aes_ctx(crypto_blkcipher_ctx(desc-&gt;tfm));</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = aes_ctx(crypto_skcipher_ctx(tfm));</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	unsigned int nbytes;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='ctx'> 	while ((nbytes = walk.nbytes)) {</div><div class='ctx'> 		aesni_cbc_enc(ctx, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 			      nbytes &amp; AES_BLOCK_MASK, walk.iv);</div><div class='ctx'> 		nbytes &amp;= AES_BLOCK_SIZE - 1;</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, nbytes);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_fpu_end();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cbc_decrypt(struct blkcipher_desc *desc,</div><div class='del'>-		       struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-		       unsigned int nbytes)</div><div class='add'>+static int cbc_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = aes_ctx(crypto_blkcipher_ctx(desc-&gt;tfm));</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = aes_ctx(crypto_skcipher_ctx(tfm));</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	unsigned int nbytes;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='ctx'> 	while ((nbytes = walk.nbytes)) {</div><div class='ctx'> 		aesni_cbc_dec(ctx, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 			      nbytes &amp; AES_BLOCK_MASK, walk.iv);</div><div class='ctx'> 		nbytes &amp;= AES_BLOCK_SIZE - 1;</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, nbytes);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_fpu_end();</div><div class='ctx'> </div><div class='hunk'>@@ -458,7 +454,7 @@ static int cbc_decrypt(struct blkcipher_desc *desc,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> static void ctr_crypt_final(struct crypto_aes_ctx *ctx,</div><div class='del'>-			    struct blkcipher_walk *walk)</div><div class='add'>+			    struct skcipher_walk *walk)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *ctrblk = walk-&gt;iv;</div><div class='ctx'> 	u8 keystream[AES_BLOCK_SIZE];</div><div class='hunk'>@@ -491,157 +487,53 @@ static void aesni_ctr_enc_avx_tfm(struct crypto_aes_ctx *ctx, u8 *out,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int ctr_crypt(struct blkcipher_desc *desc,</div><div class='del'>-		     struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-		     unsigned int nbytes)</div><div class='add'>+static int ctr_crypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_aes_ctx *ctx = aes_ctx(crypto_blkcipher_ctx(desc-&gt;tfm));</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_aes_ctx *ctx = aes_ctx(crypto_skcipher_ctx(tfm));</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	unsigned int nbytes;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt_block(desc, &amp;walk, AES_BLOCK_SIZE);</div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='ctx'> 	while ((nbytes = walk.nbytes) &gt;= AES_BLOCK_SIZE) {</div><div class='ctx'> 		aesni_ctr_enc_tfm(ctx, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 			              nbytes &amp; AES_BLOCK_MASK, walk.iv);</div><div class='ctx'> 		nbytes &amp;= AES_BLOCK_SIZE - 1;</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, nbytes);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (walk.nbytes) {</div><div class='ctx'> 		ctr_crypt_final(ctx, &amp;walk);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, 0);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	kernel_fpu_end();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int ablk_ecb_init(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-	return ablk_init_common(tfm, "__driver-ecb-aes-aesni");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ablk_cbc_init(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-	return ablk_init_common(tfm, "__driver-cbc-aes-aesni");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-static int ablk_ctr_init(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-	return ablk_init_common(tfm, "__driver-ctr-aes-aesni");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_CRYPTO_PCBC)</div><div class='del'>-static int ablk_pcbc_init(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-	return ablk_init_common(tfm, "fpu(pcbc(__driver-aes-aesni))");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void lrw_xts_encrypt_callback(void *ctx, u8 *blks, unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	aesni_ecb_enc(ctx, blks, blks, nbytes);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void lrw_xts_decrypt_callback(void *ctx, u8 *blks, unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	aesni_ecb_dec(ctx, blks, blks, nbytes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lrw_aesni_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+static int xts_aesni_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='ctx'> 			    unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	struct aesni_lrw_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct aesni_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = aes_set_key_common(tfm, ctx-&gt;raw_aes_ctx, key,</div><div class='del'>-				 keylen - AES_BLOCK_SIZE);</div><div class='add'>+	err = xts_verify_key(tfm, key, keylen);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return lrw_init_table(&amp;ctx-&gt;lrw_table, key + keylen - AES_BLOCK_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lrw_aesni_exit_tfm(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-	struct aesni_lrw_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-</div><div class='del'>-	lrw_free_table(&amp;ctx-&gt;lrw_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lrw_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	struct aesni_lrw_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	be128 buf[8];</div><div class='del'>-	struct lrw_crypt_req req = {</div><div class='del'>-		.tbuf = buf,</div><div class='del'>-		.tbuflen = sizeof(buf),</div><div class='del'>-</div><div class='del'>-		.table_ctx = &amp;ctx-&gt;lrw_table,</div><div class='del'>-		.crypt_ctx = aes_ctx(ctx-&gt;raw_aes_ctx),</div><div class='del'>-		.crypt_fn = lrw_xts_encrypt_callback,</div><div class='del'>-	};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-</div><div class='del'>-	kernel_fpu_begin();</div><div class='del'>-	ret = lrw_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='del'>-	kernel_fpu_end();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lrw_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	struct aesni_lrw_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	be128 buf[8];</div><div class='del'>-	struct lrw_crypt_req req = {</div><div class='del'>-		.tbuf = buf,</div><div class='del'>-		.tbuflen = sizeof(buf),</div><div class='del'>-</div><div class='del'>-		.table_ctx = &amp;ctx-&gt;lrw_table,</div><div class='del'>-		.crypt_ctx = aes_ctx(ctx-&gt;raw_aes_ctx),</div><div class='del'>-		.crypt_fn = lrw_xts_decrypt_callback,</div><div class='del'>-	};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-</div><div class='del'>-	kernel_fpu_begin();</div><div class='del'>-	ret = lrw_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='del'>-	kernel_fpu_end();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xts_aesni_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='del'>-			    unsigned int keylen)</div><div class='del'>-{</div><div class='del'>-	struct aesni_xts_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xts_check_key(tfm, key, keylen);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	keylen /= 2;</div><div class='ctx'> </div><div class='ctx'> 	/* first half of xts-key is for crypt */</div><div class='del'>-	err = aes_set_key_common(tfm, ctx-&gt;raw_crypt_ctx, key, keylen / 2);</div><div class='add'>+	err = aes_set_key_common(crypto_skcipher_tfm(tfm), ctx-&gt;raw_crypt_ctx,</div><div class='add'>+				 key, keylen);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* second half of xts-key is for tweak */</div><div class='del'>-	return aes_set_key_common(tfm, ctx-&gt;raw_tweak_ctx, key + keylen / 2,</div><div class='del'>-				  keylen / 2);</div><div class='add'>+	return aes_set_key_common(crypto_skcipher_tfm(tfm), ctx-&gt;raw_tweak_ctx,</div><div class='add'>+				  key + keylen, keylen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -650,8 +542,6 @@ static void aesni_xts_tweak(void *ctx, u8 *out, const u8 *in)</div><div class='ctx'> 	aesni_enc(ctx, out, in);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-</div><div class='ctx'> static void aesni_xts_enc(void *ctx, u128 *dst, const u128 *src, le128 *iv)</div><div class='ctx'> {</div><div class='ctx'> 	glue_xts_crypt_128bit_one(ctx, dst, src, iv, GLUE_FUNC_CAST(aesni_enc));</div><div class='hunk'>@@ -698,83 +588,28 @@ static const struct common_glue_ctx aesni_dec_xts = {</div><div class='ctx'> 	} }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int xts_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct aesni_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct aesni_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	return glue_xts_crypt_128bit(&amp;aesni_enc_xts, desc, dst, src, nbytes,</div><div class='del'>-				     XTS_TWEAK_CAST(aesni_xts_tweak),</div><div class='del'>-				     aes_ctx(ctx-&gt;raw_tweak_ctx),</div><div class='del'>-				     aes_ctx(ctx-&gt;raw_crypt_ctx));</div><div class='add'>+	return glue_xts_req_128bit(&amp;aesni_enc_xts, req,</div><div class='add'>+				   XTS_TWEAK_CAST(aesni_xts_tweak),</div><div class='add'>+				   aes_ctx(ctx-&gt;raw_tweak_ctx),</div><div class='add'>+				   aes_ctx(ctx-&gt;raw_crypt_ctx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int xts_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct aesni_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct aesni_xts_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	return glue_xts_crypt_128bit(&amp;aesni_dec_xts, desc, dst, src, nbytes,</div><div class='del'>-				     XTS_TWEAK_CAST(aesni_xts_tweak),</div><div class='del'>-				     aes_ctx(ctx-&gt;raw_tweak_ctx),</div><div class='del'>-				     aes_ctx(ctx-&gt;raw_crypt_ctx));</div><div class='add'>+	return glue_xts_req_128bit(&amp;aesni_dec_xts, req,</div><div class='add'>+				   XTS_TWEAK_CAST(aesni_xts_tweak),</div><div class='add'>+				   aes_ctx(ctx-&gt;raw_tweak_ctx),</div><div class='add'>+				   aes_ctx(ctx-&gt;raw_crypt_ctx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	struct aesni_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	be128 buf[8];</div><div class='del'>-	struct xts_crypt_req req = {</div><div class='del'>-		.tbuf = buf,</div><div class='del'>-		.tbuflen = sizeof(buf),</div><div class='del'>-</div><div class='del'>-		.tweak_ctx = aes_ctx(ctx-&gt;raw_tweak_ctx),</div><div class='del'>-		.tweak_fn = aesni_xts_tweak,</div><div class='del'>-		.crypt_ctx = aes_ctx(ctx-&gt;raw_crypt_ctx),</div><div class='del'>-		.crypt_fn = lrw_xts_encrypt_callback,</div><div class='del'>-	};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-</div><div class='del'>-	kernel_fpu_begin();</div><div class='del'>-	ret = xts_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='del'>-	kernel_fpu_end();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		       struct scatterlist *src, unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	struct aesni_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	be128 buf[8];</div><div class='del'>-	struct xts_crypt_req req = {</div><div class='del'>-		.tbuf = buf,</div><div class='del'>-		.tbuflen = sizeof(buf),</div><div class='del'>-</div><div class='del'>-		.tweak_ctx = aes_ctx(ctx-&gt;raw_tweak_ctx),</div><div class='del'>-		.tweak_fn = aesni_xts_tweak,</div><div class='del'>-		.crypt_ctx = aes_ctx(ctx-&gt;raw_crypt_ctx),</div><div class='del'>-		.crypt_fn = lrw_xts_decrypt_callback,</div><div class='del'>-	};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='del'>-</div><div class='del'>-	kernel_fpu_begin();</div><div class='del'>-	ret = xts_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='del'>-	kernel_fpu_end();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='ctx'> static int rfc4106_init(struct crypto_aead *aead)</div><div class='ctx'> {</div><div class='ctx'> 	struct cryptd_aead *cryptd_tfm;</div><div class='hunk'>@@ -905,9 +740,11 @@ static int helper_rfc4106_encrypt(struct aead_request *req)</div><div class='ctx'> 	*((__be32 *)(iv+12)) = counter;</div><div class='ctx'> </div><div class='ctx'> 	if (sg_is_last(req-&gt;src) &amp;&amp;</div><div class='del'>-	    req-&gt;src-&gt;offset + req-&gt;src-&gt;length &lt;= PAGE_SIZE &amp;&amp;</div><div class='add'>+	    (!PageHighMem(sg_page(req-&gt;src)) ||</div><div class='add'>+	    req-&gt;src-&gt;offset + req-&gt;src-&gt;length &lt;= PAGE_SIZE) &amp;&amp;</div><div class='ctx'> 	    sg_is_last(req-&gt;dst) &amp;&amp;</div><div class='del'>-	    req-&gt;dst-&gt;offset + req-&gt;dst-&gt;length &lt;= PAGE_SIZE) {</div><div class='add'>+	    (!PageHighMem(sg_page(req-&gt;dst)) ||</div><div class='add'>+	    req-&gt;dst-&gt;offset + req-&gt;dst-&gt;length &lt;= PAGE_SIZE)) {</div><div class='ctx'> 		one_entry_in_sg = 1;</div><div class='ctx'> 		scatterwalk_start(&amp;src_sg_walk, req-&gt;src);</div><div class='ctx'> 		assoc = scatterwalk_map(&amp;src_sg_walk);</div><div class='hunk'>@@ -987,9 +824,11 @@ static int helper_rfc4106_decrypt(struct aead_request *req)</div><div class='ctx'> 	*((__be32 *)(iv+12)) = counter;</div><div class='ctx'> </div><div class='ctx'> 	if (sg_is_last(req-&gt;src) &amp;&amp;</div><div class='del'>-	    req-&gt;src-&gt;offset + req-&gt;src-&gt;length &lt;= PAGE_SIZE &amp;&amp;</div><div class='add'>+	    (!PageHighMem(sg_page(req-&gt;src)) ||</div><div class='add'>+	    req-&gt;src-&gt;offset + req-&gt;src-&gt;length &lt;= PAGE_SIZE) &amp;&amp;</div><div class='ctx'> 	    sg_is_last(req-&gt;dst) &amp;&amp;</div><div class='del'>-	    req-&gt;dst-&gt;offset + req-&gt;dst-&gt;length &lt;= PAGE_SIZE) {</div><div class='add'>+	    (!PageHighMem(sg_page(req-&gt;dst)) ||</div><div class='add'>+	    req-&gt;dst-&gt;offset + req-&gt;dst-&gt;length &lt;= PAGE_SIZE)) {</div><div class='ctx'> 		one_entry_in_sg = 1;</div><div class='ctx'> 		scatterwalk_start(&amp;src_sg_walk, req-&gt;src);</div><div class='ctx'> 		assoc = scatterwalk_map(&amp;src_sg_walk);</div><div class='hunk'>@@ -1077,9 +916,7 @@ static struct crypto_alg aesni_algs[] = { {</div><div class='ctx'> 	.cra_priority		= 300,</div><div class='ctx'> 	.cra_flags		= CRYPTO_ALG_TYPE_CIPHER,</div><div class='ctx'> 	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_ctx) +</div><div class='del'>-				  AESNI_ALIGN - 1,</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='add'>+	.cra_ctxsize		= CRYPTO_AES_CTX_SIZE,</div><div class='ctx'> 	.cra_module		= THIS_MODULE,</div><div class='ctx'> 	.cra_u	= {</div><div class='ctx'> 		.cipher	= {</div><div class='hunk'>@@ -1091,14 +928,12 @@ static struct crypto_alg aesni_algs[] = { {</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }, {</div><div class='del'>-	.cra_name		= "__aes-aesni",</div><div class='del'>-	.cra_driver_name	= "__driver-aes-aesni",</div><div class='del'>-	.cra_priority		= 0,</div><div class='add'>+	.cra_name		= "__aes",</div><div class='add'>+	.cra_driver_name	= "__aes-aesni",</div><div class='add'>+	.cra_priority		= 300,</div><div class='ctx'> 	.cra_flags		= CRYPTO_ALG_TYPE_CIPHER | CRYPTO_ALG_INTERNAL,</div><div class='ctx'> 	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_ctx) +</div><div class='del'>-				  AESNI_ALIGN - 1,</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='add'>+	.cra_ctxsize		= CRYPTO_AES_CTX_SIZE,</div><div class='ctx'> 	.cra_module		= THIS_MODULE,</div><div class='ctx'> 	.cra_u	= {</div><div class='ctx'> 		.cipher	= {</div><div class='hunk'>@@ -1109,250 +944,95 @@ static struct crypto_alg aesni_algs[] = { {</div><div class='ctx'> 			.cia_decrypt		= __aes_decrypt</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "__ecb-aes-aesni",</div><div class='del'>-	.cra_driver_name	= "__driver-ecb-aes-aesni",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_ctx) +</div><div class='del'>-				  AESNI_ALIGN - 1,</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_u = {</div><div class='del'>-		.blkcipher = {</div><div class='del'>-			.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-			.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-			.setkey		= aes_set_key,</div><div class='del'>-			.encrypt	= ecb_encrypt,</div><div class='del'>-			.decrypt	= ecb_decrypt,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "__cbc-aes-aesni",</div><div class='del'>-	.cra_driver_name	= "__driver-cbc-aes-aesni",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_ctx) +</div><div class='del'>-				  AESNI_ALIGN - 1,</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_u = {</div><div class='del'>-		.blkcipher = {</div><div class='del'>-			.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-			.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-			.setkey		= aes_set_key,</div><div class='del'>-			.encrypt	= cbc_encrypt,</div><div class='del'>-			.decrypt	= cbc_decrypt,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "ecb(aes)",</div><div class='del'>-	.cra_driver_name	= "ecb-aes-aesni",</div><div class='del'>-	.cra_priority		= 400,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_ecb_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_u = {</div><div class='del'>-		.ablkcipher = {</div><div class='del'>-			.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-			.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-			.setkey		= ablk_set_key,</div><div class='del'>-			.encrypt	= ablk_encrypt,</div><div class='del'>-			.decrypt	= ablk_decrypt,</div><div class='add'>+} };</div><div class='add'>+</div><div class='add'>+static struct skcipher_alg aesni_skciphers[] = {</div><div class='add'>+	{</div><div class='add'>+		.base = {</div><div class='add'>+			.cra_name		= "__ecb(aes)",</div><div class='add'>+			.cra_driver_name	= "__ecb-aes-aesni",</div><div class='add'>+			.cra_priority		= 400,</div><div class='add'>+			.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+			.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+			.cra_ctxsize		= CRYPTO_AES_CTX_SIZE,</div><div class='add'>+			.cra_module		= THIS_MODULE,</div><div class='ctx'> 		},</div><div class='del'>-	},</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "cbc(aes)",</div><div class='del'>-	.cra_driver_name	= "cbc-aes-aesni",</div><div class='del'>-	.cra_priority		= 400,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_cbc_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_u = {</div><div class='del'>-		.ablkcipher = {</div><div class='del'>-			.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-			.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-			.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-			.setkey		= ablk_set_key,</div><div class='del'>-			.encrypt	= ablk_encrypt,</div><div class='del'>-			.decrypt	= ablk_decrypt,</div><div class='add'>+		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+		.setkey		= aesni_skcipher_setkey,</div><div class='add'>+		.encrypt	= ecb_encrypt,</div><div class='add'>+		.decrypt	= ecb_decrypt,</div><div class='add'>+	}, {</div><div class='add'>+		.base = {</div><div class='add'>+			.cra_name		= "__cbc(aes)",</div><div class='add'>+			.cra_driver_name	= "__cbc-aes-aesni",</div><div class='add'>+			.cra_priority		= 400,</div><div class='add'>+			.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+			.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+			.cra_ctxsize		= CRYPTO_AES_CTX_SIZE,</div><div class='add'>+			.cra_module		= THIS_MODULE,</div><div class='ctx'> 		},</div><div class='del'>-	},</div><div class='add'>+		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+		.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+		.setkey		= aesni_skcipher_setkey,</div><div class='add'>+		.encrypt	= cbc_encrypt,</div><div class='add'>+		.decrypt	= cbc_decrypt,</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "__ctr-aes-aesni",</div><div class='del'>-	.cra_driver_name	= "__driver-ctr-aes-aesni",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= 1,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct crypto_aes_ctx) +</div><div class='del'>-				  AESNI_ALIGN - 1,</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_u = {</div><div class='del'>-		.blkcipher = {</div><div class='del'>-			.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-			.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-			.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-			.setkey		= aes_set_key,</div><div class='del'>-			.encrypt	= ctr_crypt,</div><div class='del'>-			.decrypt	= ctr_crypt,</div><div class='add'>+	}, {</div><div class='add'>+		.base = {</div><div class='add'>+			.cra_name		= "__ctr(aes)",</div><div class='add'>+			.cra_driver_name	= "__ctr-aes-aesni",</div><div class='add'>+			.cra_priority		= 400,</div><div class='add'>+			.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+			.cra_blocksize		= 1,</div><div class='add'>+			.cra_ctxsize		= CRYPTO_AES_CTX_SIZE,</div><div class='add'>+			.cra_module		= THIS_MODULE,</div><div class='ctx'> 		},</div><div class='del'>-	},</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "ctr(aes)",</div><div class='del'>-	.cra_driver_name	= "ctr-aes-aesni",</div><div class='del'>-	.cra_priority		= 400,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= 1,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_ctr_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_u = {</div><div class='del'>-		.ablkcipher = {</div><div class='del'>-			.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-			.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-			.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-			.setkey		= ablk_set_key,</div><div class='del'>-			.encrypt	= ablk_encrypt,</div><div class='del'>-			.decrypt	= ablk_encrypt,</div><div class='del'>-			.geniv		= "chainiv",</div><div class='add'>+		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+		.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+		.chunksize	= AES_BLOCK_SIZE,</div><div class='add'>+		.setkey		= aesni_skcipher_setkey,</div><div class='add'>+		.encrypt	= ctr_crypt,</div><div class='add'>+		.decrypt	= ctr_crypt,</div><div class='add'>+	}, {</div><div class='add'>+		.base = {</div><div class='add'>+			.cra_name		= "__xts(aes)",</div><div class='add'>+			.cra_driver_name	= "__xts-aes-aesni",</div><div class='add'>+			.cra_priority		= 401,</div><div class='add'>+			.cra_flags		= CRYPTO_ALG_INTERNAL,</div><div class='add'>+			.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+			.cra_ctxsize		= XTS_AES_CTX_SIZE,</div><div class='add'>+			.cra_module		= THIS_MODULE,</div><div class='ctx'> 		},</div><div class='del'>-	},</div><div class='add'>+		.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='add'>+		.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='add'>+		.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+		.setkey		= xts_aesni_setkey,</div><div class='add'>+		.encrypt	= xts_encrypt,</div><div class='add'>+		.decrypt	= xts_decrypt,</div><div class='ctx'> #endif</div><div class='del'>-#if IS_ENABLED(CONFIG_CRYPTO_PCBC)</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "pcbc(aes)",</div><div class='del'>-	.cra_driver_name	= "pcbc-aes-aesni",</div><div class='del'>-	.cra_priority		= 400,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_pcbc_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_u = {</div><div class='del'>-		.ablkcipher = {</div><div class='del'>-			.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='del'>-			.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='del'>-			.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-			.setkey		= ablk_set_key,</div><div class='del'>-			.encrypt	= ablk_encrypt,</div><div class='del'>-			.decrypt	= ablk_decrypt,</div><div class='del'>-		},</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct simd_skcipher_alg *aesni_simd_skciphers[ARRAY_SIZE(aesni_skciphers)];</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	const char *algname;</div><div class='add'>+	const char *drvname;</div><div class='add'>+	const char *basename;</div><div class='add'>+	struct simd_skcipher_alg *simd;</div><div class='add'>+} aesni_simd_skciphers2[] = {</div><div class='add'>+#if (defined(MODULE) &amp;&amp; IS_ENABLED(CONFIG_CRYPTO_PCBC)) || \</div><div class='add'>+    IS_BUILTIN(CONFIG_CRYPTO_PCBC)</div><div class='add'>+	{</div><div class='add'>+		.algname	= "pcbc(aes)",</div><div class='add'>+		.drvname	= "pcbc-aes-aesni",</div><div class='add'>+		.basename	= "fpu(pcbc(__aes-aesni))",</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "__lrw-aes-aesni",</div><div class='del'>-	.cra_driver_name	= "__driver-lrw-aes-aesni",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct aesni_lrw_ctx),</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_exit		= lrw_aesni_exit_tfm,</div><div class='del'>-	.cra_u = {</div><div class='del'>-		.blkcipher = {</div><div class='del'>-			.min_keysize	= AES_MIN_KEY_SIZE + AES_BLOCK_SIZE,</div><div class='del'>-			.max_keysize	= AES_MAX_KEY_SIZE + AES_BLOCK_SIZE,</div><div class='del'>-			.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-			.setkey		= lrw_aesni_setkey,</div><div class='del'>-			.encrypt	= lrw_encrypt,</div><div class='del'>-			.decrypt	= lrw_decrypt,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "__xts-aes-aesni",</div><div class='del'>-	.cra_driver_name	= "__driver-xts-aes-aesni",</div><div class='del'>-	.cra_priority		= 0,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='del'>-				  CRYPTO_ALG_INTERNAL,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct aesni_xts_ctx),</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_u = {</div><div class='del'>-		.blkcipher = {</div><div class='del'>-			.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='del'>-			.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='del'>-			.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-			.setkey		= xts_aesni_setkey,</div><div class='del'>-			.encrypt	= xts_encrypt,</div><div class='del'>-			.decrypt	= xts_decrypt,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "lrw(aes)",</div><div class='del'>-	.cra_driver_name	= "lrw-aes-aesni",</div><div class='del'>-	.cra_priority		= 400,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_u = {</div><div class='del'>-		.ablkcipher = {</div><div class='del'>-			.min_keysize	= AES_MIN_KEY_SIZE + AES_BLOCK_SIZE,</div><div class='del'>-			.max_keysize	= AES_MAX_KEY_SIZE + AES_BLOCK_SIZE,</div><div class='del'>-			.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-			.setkey		= ablk_set_key,</div><div class='del'>-			.encrypt	= ablk_encrypt,</div><div class='del'>-			.decrypt	= ablk_decrypt,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-}, {</div><div class='del'>-	.cra_name		= "xts(aes)",</div><div class='del'>-	.cra_driver_name	= "xts-aes-aesni",</div><div class='del'>-	.cra_priority		= 400,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='del'>-	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct async_helper_ctx),</div><div class='del'>-	.cra_alignmask		= 0,</div><div class='del'>-	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_init		= ablk_init,</div><div class='del'>-	.cra_exit		= ablk_exit,</div><div class='del'>-	.cra_u = {</div><div class='del'>-		.ablkcipher = {</div><div class='del'>-			.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='del'>-			.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='del'>-			.ivsize		= AES_BLOCK_SIZE,</div><div class='del'>-			.setkey		= ablk_set_key,</div><div class='del'>-			.encrypt	= ablk_encrypt,</div><div class='del'>-			.decrypt	= ablk_decrypt,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-} };</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> static struct aead_alg aesni_aead_algs[] = { {</div><div class='hunk'>@@ -1401,9 +1081,27 @@ static const struct x86_cpu_id aesni_cpu_id[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(x86cpu, aesni_cpu_id);</div><div class='ctx'> </div><div class='add'>+static void aesni_free_simds(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aesni_simd_skciphers) &amp;&amp;</div><div class='add'>+		    aesni_simd_skciphers[i]; i++)</div><div class='add'>+		simd_skcipher_free(aesni_simd_skciphers[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aesni_simd_skciphers2); i++)</div><div class='add'>+		if (aesni_simd_skciphers2[i].simd)</div><div class='add'>+			simd_skcipher_free(aesni_simd_skciphers2[i].simd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init aesni_init(void)</div><div class='ctx'> {</div><div class='add'>+	struct simd_skcipher_alg *simd;</div><div class='add'>+	const char *basename;</div><div class='add'>+	const char *algname;</div><div class='add'>+	const char *drvname;</div><div class='ctx'> 	int err;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!x86_match_cpu(aesni_cpu_id))</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1445,13 +1143,48 @@ static int __init aesni_init(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fpu_exit;</div><div class='ctx'> </div><div class='add'>+	err = crypto_register_skciphers(aesni_skciphers,</div><div class='add'>+					ARRAY_SIZE(aesni_skciphers));</div><div class='add'>+	if (err)</div><div class='add'>+		goto unregister_algs;</div><div class='add'>+</div><div class='ctx'> 	err = crypto_register_aeads(aesni_aead_algs,</div><div class='ctx'> 				    ARRAY_SIZE(aesni_aead_algs));</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto unregister_algs;</div><div class='add'>+		goto unregister_skciphers;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aesni_skciphers); i++) {</div><div class='add'>+		algname = aesni_skciphers[i].base.cra_name + 2;</div><div class='add'>+		drvname = aesni_skciphers[i].base.cra_driver_name + 2;</div><div class='add'>+		basename = aesni_skciphers[i].base.cra_driver_name;</div><div class='add'>+		simd = simd_skcipher_create_compat(algname, drvname, basename);</div><div class='add'>+		err = PTR_ERR(simd);</div><div class='add'>+		if (IS_ERR(simd))</div><div class='add'>+			goto unregister_simds;</div><div class='add'>+</div><div class='add'>+		aesni_simd_skciphers[i] = simd;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aesni_simd_skciphers2); i++) {</div><div class='add'>+		algname = aesni_simd_skciphers2[i].algname;</div><div class='add'>+		drvname = aesni_simd_skciphers2[i].drvname;</div><div class='add'>+		basename = aesni_simd_skciphers2[i].basename;</div><div class='add'>+		simd = simd_skcipher_create_compat(algname, drvname, basename);</div><div class='add'>+		err = PTR_ERR(simd);</div><div class='add'>+		if (IS_ERR(simd))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='add'>+		aesni_simd_skciphers2[i].simd = simd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unregister_simds:</div><div class='add'>+	aesni_free_simds();</div><div class='add'>+	crypto_unregister_aeads(aesni_aead_algs, ARRAY_SIZE(aesni_aead_algs));</div><div class='add'>+unregister_skciphers:</div><div class='add'>+	crypto_unregister_skciphers(aesni_skciphers,</div><div class='add'>+				    ARRAY_SIZE(aesni_skciphers));</div><div class='ctx'> unregister_algs:</div><div class='ctx'> 	crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));</div><div class='ctx'> fpu_exit:</div><div class='hunk'>@@ -1461,7 +1194,10 @@ fpu_exit:</div><div class='ctx'> </div><div class='ctx'> static void __exit aesni_exit(void)</div><div class='ctx'> {</div><div class='add'>+	aesni_free_simds();</div><div class='ctx'> 	crypto_unregister_aeads(aesni_aead_algs, ARRAY_SIZE(aesni_aead_algs));</div><div class='add'>+	crypto_unregister_skciphers(aesni_skciphers,</div><div class='add'>+				    ARRAY_SIZE(aesni_skciphers));</div><div class='ctx'> 	crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));</div><div class='ctx'> </div><div class='ctx'> 	crypto_fpu_exit();</div><div class='head'>diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S<br/>index aa9e8bd163f6..f7c495e2863c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/camellia-aesni-avx-asm_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/camellia-aesni-avx-asm_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/camellia-aesni-avx-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/camellia-aesni-avx-asm_64.S</a></div><div class='hunk'>@@ -571,7 +571,9 @@ ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)</div><div class='ctx'> 	vmovdqu y6, 14 * 16(rio); \</div><div class='ctx'> 	vmovdqu y7, 15 * 16(rio);</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+</div><div class='add'>+/* NB: section is mergeable, all elements must be aligned 16-byte blocks */</div><div class='add'>+.section	.rodata.cst16, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='ctx'> </div><div class='ctx'> #define SHUFB_BYTES(idx) \</div><div class='hunk'>@@ -711,6 +713,7 @@ ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)</div><div class='ctx'> 	.byte 0x08, 0x05, 0x02, 0x0f, 0x0c, 0x09, 0x06, 0x03</div><div class='ctx'> </div><div class='ctx'> /* 4-bit mask */</div><div class='add'>+.section	.rodata.cst4.L0f0f0f0f, "aM", @progbits, 4</div><div class='ctx'> .align 4</div><div class='ctx'> .L0f0f0f0f:</div><div class='ctx'> 	.long 0x0f0f0f0f</div><div class='head'>diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S<br/>index 16186c18656d..eee5b3982cfd 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/camellia-aesni-avx2-asm_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/camellia-aesni-avx2-asm_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/camellia-aesni-avx2-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/camellia-aesni-avx2-asm_64.S</a></div><div class='hunk'>@@ -610,20 +610,25 @@ ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)</div><div class='ctx'> 	vmovdqu y6, 14 * 32(rio); \</div><div class='ctx'> 	vmovdqu y7, 15 * 32(rio);</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-.align 32</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst32.shufb_16x16b, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> #define SHUFB_BYTES(idx) \</div><div class='ctx'> 	0 + (idx), 4 + (idx), 8 + (idx), 12 + (idx)</div><div class='del'>-</div><div class='ctx'> .Lshufb_16x16b:</div><div class='ctx'> 	.byte SHUFB_BYTES(0), SHUFB_BYTES(1), SHUFB_BYTES(2), SHUFB_BYTES(3)</div><div class='ctx'> 	.byte SHUFB_BYTES(0), SHUFB_BYTES(1), SHUFB_BYTES(2), SHUFB_BYTES(3)</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst32.pack_bswap, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> .Lpack_bswap:</div><div class='ctx'> 	.long 0x00010203, 0x04050607, 0x80808080, 0x80808080</div><div class='ctx'> 	.long 0x00010203, 0x04050607, 0x80808080, 0x80808080</div><div class='ctx'> </div><div class='add'>+/* NB: section is mergeable, all elements must be aligned 16-byte blocks */</div><div class='add'>+.section	.rodata.cst16, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='add'>+</div><div class='ctx'> /* For CTR-mode IV byteswap */</div><div class='ctx'> .Lbswap128_mask:</div><div class='ctx'> 	.byte 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0</div><div class='hunk'>@@ -750,6 +755,7 @@ ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)</div><div class='ctx'> 	.byte 0x00, 0x0d, 0x0a, 0x07, 0x04, 0x01, 0x0e, 0x0b</div><div class='ctx'> 	.byte 0x08, 0x05, 0x02, 0x0f, 0x0c, 0x09, 0x06, 0x03</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst4.L0f0f0f0f, "aM", @progbits, 4</div><div class='ctx'> .align 4</div><div class='ctx'> /* 4-bit mask */</div><div class='ctx'> .L0f0f0f0f:</div><div class='head'>diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S<br/>index 14fa1966bf01..b4a8806234ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/cast5-avx-x86_64-asm_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/cast5-avx-x86_64-asm_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/cast5-avx-x86_64-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/cast5-avx-x86_64-asm_64.S</a></div><div class='hunk'>@@ -195,19 +195,29 @@</div><div class='ctx'> 	vpshufb rmask,	x0, x0;           \</div><div class='ctx'> 	vpshufb rmask,	x1, x1;</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='add'>+.section	.rodata.cst16.bswap_mask, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='ctx'> .Lbswap_mask:</div><div class='ctx'> 	.byte 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12</div><div class='add'>+.section	.rodata.cst16.bswap128_mask, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> .Lbswap128_mask:</div><div class='ctx'> 	.byte 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0</div><div class='add'>+.section	.rodata.cst16.bswap_iv_mask, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> .Lbswap_iv_mask:</div><div class='ctx'> 	.byte 7, 6, 5, 4, 3, 2, 1, 0, 7, 6, 5, 4, 3, 2, 1, 0</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst4.16_mask, "aM", @progbits, 4</div><div class='add'>+.align 4</div><div class='ctx'> .L16_mask:</div><div class='ctx'> 	.byte 16, 16, 16, 16</div><div class='add'>+.section	.rodata.cst4.32_mask, "aM", @progbits, 4</div><div class='add'>+.align 4</div><div class='ctx'> .L32_mask:</div><div class='ctx'> 	.byte 32, 0, 0, 0</div><div class='add'>+.section	.rodata.cst4.first_mask, "aM", @progbits, 4</div><div class='add'>+.align 4</div><div class='ctx'> .Lfirst_mask:</div><div class='ctx'> 	.byte 0x1f, 0, 0, 0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S<br/>index c419389889cd..952d3156a933 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/cast6-avx-x86_64-asm_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/cast6-avx-x86_64-asm_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/cast6-avx-x86_64-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/cast6-avx-x86_64-asm_64.S</a></div><div class='hunk'>@@ -225,8 +225,7 @@</div><div class='ctx'> 	vpshufb rmask,		x2, x2;       \</div><div class='ctx'> 	vpshufb rmask,		x3, x3;</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='add'>+.section	.rodata.cst16, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='ctx'> .Lxts_gf128mul_and_shl1_mask:</div><div class='ctx'> 	.byte 0x87, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0</div><div class='hunk'>@@ -244,10 +243,19 @@</div><div class='ctx'> 	.byte 12, 13, 14, 15, 8, 9, 10, 11, 7, 6, 5, 4, 3, 2, 1, 0</div><div class='ctx'> .Lrkr_dec_QBAR_QBAR_QBAR_QBAR:</div><div class='ctx'> 	.byte 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst4.L16_mask, "aM", @progbits, 4</div><div class='add'>+.align 4</div><div class='ctx'> .L16_mask:</div><div class='ctx'> 	.byte 16, 16, 16, 16</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst4.L32_mask, "aM", @progbits, 4</div><div class='add'>+.align 4</div><div class='ctx'> .L32_mask:</div><div class='ctx'> 	.byte 32, 0, 0, 0</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst4.first_mask, "aM", @progbits, 4</div><div class='add'>+.align 4</div><div class='ctx'> .Lfirst_mask:</div><div class='ctx'> 	.byte 0x1f, 0, 0, 0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/chacha20-avx2-x86_64.S b/arch/x86/crypto/chacha20-avx2-x86_64.S<br/>index 16694e625f77..3a2dc3dc6cac 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/chacha20-avx2-x86_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/chacha20-avx2-x86_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/chacha20-avx2-x86_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/chacha20-avx2-x86_64.S</a></div><div class='hunk'>@@ -11,13 +11,18 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.cst32.ROT8, "aM", @progbits, 32</div><div class='ctx'> .align 32</div><div class='del'>-</div><div class='ctx'> ROT8:	.octa 0x0e0d0c0f0a09080b0605040702010003</div><div class='ctx'> 	.octa 0x0e0d0c0f0a09080b0605040702010003</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst32.ROT16, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> ROT16:	.octa 0x0d0c0f0e09080b0a0504070601000302</div><div class='ctx'> 	.octa 0x0d0c0f0e09080b0a0504070601000302</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst32.CTRINC, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> CTRINC:	.octa 0x00000003000000020000000100000000</div><div class='ctx'> 	.octa 0x00000007000000060000000500000004</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/chacha20-ssse3-x86_64.S b/arch/x86/crypto/chacha20-ssse3-x86_64.S<br/>index 3a33124e9112..3f511a7d73b8 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/chacha20-ssse3-x86_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/chacha20-ssse3-x86_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/chacha20-ssse3-x86_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/chacha20-ssse3-x86_64.S</a></div><div class='hunk'>@@ -11,11 +11,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.cst16.ROT8, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='del'>-</div><div class='ctx'> ROT8:	.octa 0x0e0d0c0f0a09080b0605040702010003</div><div class='add'>+.section	.rodata.cst16.ROT16, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> ROT16:	.octa 0x0d0c0f0e09080b0a0504070601000302</div><div class='add'>+.section	.rodata.cst16.CTRINC, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> CTRINC:	.octa 0x00000003000000020000000100000000</div><div class='ctx'> </div><div class='ctx'> .text</div><div class='head'>diff --git a/arch/x86/crypto/chacha20_glue.c b/arch/x86/crypto/chacha20_glue.c<br/>index f910d1d449f0..1e6af1b35f7b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/chacha20_glue.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/chacha20_glue.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/chacha20_glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/chacha20_glue.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/chacha20.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/api.h&gt;</div><div class='hunk'>@@ -63,36 +63,37 @@ static void chacha20_dosimd(u32 *state, u8 *dst, const u8 *src,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int chacha20_simd(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-			 struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int chacha20_simd(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	u32 *state, state_buf[16 + (CHACHA20_STATE_ALIGN / sizeof(u32)) - 1];</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct chacha20_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	u32 *state, state_buf[16 + 2] __aligned(8);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (nbytes &lt;= CHACHA20_BLOCK_SIZE || !may_use_simd())</div><div class='del'>-		return crypto_chacha20_crypt(desc, dst, src, nbytes);</div><div class='add'>+	BUILD_BUG_ON(CHACHA20_STATE_ALIGN != 16);</div><div class='add'>+	state = PTR_ALIGN(state_buf + 0, CHACHA20_STATE_ALIGN);</div><div class='ctx'> </div><div class='del'>-	state = (u32 *)roundup((uintptr_t)state_buf, CHACHA20_STATE_ALIGN);</div><div class='add'>+	if (req-&gt;cryptlen &lt;= CHACHA20_BLOCK_SIZE || !may_use_simd())</div><div class='add'>+		return crypto_chacha20_crypt(req);</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt_block(desc, &amp;walk, CHACHA20_BLOCK_SIZE);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='del'>-	crypto_chacha20_init(state, crypto_blkcipher_ctx(desc-&gt;tfm), walk.iv);</div><div class='add'>+	crypto_chacha20_init(state, ctx, walk.iv);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='ctx'> </div><div class='ctx'> 	while (walk.nbytes &gt;= CHACHA20_BLOCK_SIZE) {</div><div class='ctx'> 		chacha20_dosimd(state, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				rounddown(walk.nbytes, CHACHA20_BLOCK_SIZE));</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk,</div><div class='del'>-					  walk.nbytes % CHACHA20_BLOCK_SIZE);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk,</div><div class='add'>+					 walk.nbytes % CHACHA20_BLOCK_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (walk.nbytes) {</div><div class='ctx'> 		chacha20_dosimd(state, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				walk.nbytes);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, 0);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_end();</div><div class='hunk'>@@ -100,27 +101,22 @@ static int chacha20_simd(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct crypto_alg alg = {</div><div class='del'>-	.cra_name		= "chacha20",</div><div class='del'>-	.cra_driver_name	= "chacha20-simd",</div><div class='del'>-	.cra_priority		= 300,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='del'>-	.cra_blocksize		= 1,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct chacha20_ctx),</div><div class='del'>-	.cra_alignmask		= sizeof(u32) - 1,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_u			= {</div><div class='del'>-		.blkcipher = {</div><div class='del'>-			.min_keysize	= CHACHA20_KEY_SIZE,</div><div class='del'>-			.max_keysize	= CHACHA20_KEY_SIZE,</div><div class='del'>-			.ivsize		= CHACHA20_IV_SIZE,</div><div class='del'>-			.geniv		= "seqiv",</div><div class='del'>-			.setkey		= crypto_chacha20_setkey,</div><div class='del'>-			.encrypt	= chacha20_simd,</div><div class='del'>-			.decrypt	= chacha20_simd,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='add'>+static struct skcipher_alg alg = {</div><div class='add'>+	.base.cra_name		= "chacha20",</div><div class='add'>+	.base.cra_driver_name	= "chacha20-simd",</div><div class='add'>+	.base.cra_priority	= 300,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct chacha20_ctx),</div><div class='add'>+	.base.cra_alignmask	= sizeof(u32) - 1,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= CHACHA20_KEY_SIZE,</div><div class='add'>+	.max_keysize		= CHACHA20_KEY_SIZE,</div><div class='add'>+	.ivsize			= CHACHA20_IV_SIZE,</div><div class='add'>+	.chunksize		= CHACHA20_BLOCK_SIZE,</div><div class='add'>+	.setkey			= crypto_chacha20_setkey,</div><div class='add'>+	.encrypt		= chacha20_simd,</div><div class='add'>+	.decrypt		= chacha20_simd,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init chacha20_simd_mod_init(void)</div><div class='hunk'>@@ -133,12 +129,12 @@ static int __init chacha20_simd_mod_init(void)</div><div class='ctx'> 			    boot_cpu_has(X86_FEATURE_AVX2) &amp;&amp;</div><div class='ctx'> 			    cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL);</div><div class='ctx'> #endif</div><div class='del'>-	return crypto_register_alg(&amp;alg);</div><div class='add'>+	return crypto_register_skcipher(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit chacha20_simd_mod_fini(void)</div><div class='ctx'> {</div><div class='del'>-	crypto_unregister_alg(&amp;alg);</div><div class='add'>+	crypto_unregister_skcipher(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(chacha20_simd_mod_init);</div><div class='head'>diff --git a/arch/x86/crypto/crc32c-intel_glue.c b/arch/x86/crypto/crc32c-intel_glue.c<br/>index 0857b1a1de3b..c194d5717ae5 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/crc32c-intel_glue.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/crc32c-intel_glue.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/crc32c-intel_glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/crc32c-intel_glue.c</a></div><div class='hunk'>@@ -48,26 +48,13 @@</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> /*</div><div class='ctx'>  * use carryless multiply version of crc32c when buffer</div><div class='del'>- * size is &gt;= 512 (when eager fpu is enabled) or</div><div class='del'>- * &gt;= 1024 (when eager fpu is disabled) to account</div><div class='add'>+ * size is &gt;= 512 to account</div><div class='ctx'>  * for fpu state save/restore overhead.</div><div class='ctx'>  */</div><div class='del'>-#define CRC32C_PCL_BREAKEVEN_EAGERFPU	512</div><div class='del'>-#define CRC32C_PCL_BREAKEVEN_NOEAGERFPU	1024</div><div class='add'>+#define CRC32C_PCL_BREAKEVEN	512</div><div class='ctx'> </div><div class='ctx'> asmlinkage unsigned int crc_pcl(const u8 *buffer, int len,</div><div class='ctx'> 				unsigned int crc_init);</div><div class='del'>-static int crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_EAGERFPU;</div><div class='del'>-#if defined(X86_FEATURE_EAGER_FPU)</div><div class='del'>-#define set_pcl_breakeven_point()					\</div><div class='del'>-do {									\</div><div class='del'>-	if (!use_eager_fpu())						\</div><div class='del'>-		crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU;	\</div><div class='del'>-} while (0)</div><div class='del'>-#else</div><div class='del'>-#define set_pcl_breakeven_point()					\</div><div class='del'>-	(crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU)</div><div class='del'>-#endif</div><div class='ctx'> #endif /* CONFIG_X86_64 */</div><div class='ctx'> </div><div class='ctx'> static u32 crc32c_intel_le_hw_byte(u32 crc, unsigned char const *data, size_t length)</div><div class='hunk'>@@ -190,7 +177,7 @@ static int crc32c_pcl_intel_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 	 * use faster PCL version if datasize is large enough to</div><div class='ctx'> 	 * overcome kernel fpu state save/restore overhead</div><div class='ctx'> 	 */</div><div class='del'>-	if (len &gt;= crc32c_pcl_breakeven &amp;&amp; irq_fpu_usable()) {</div><div class='add'>+	if (len &gt;= CRC32C_PCL_BREAKEVEN &amp;&amp; irq_fpu_usable()) {</div><div class='ctx'> 		kernel_fpu_begin();</div><div class='ctx'> 		*crcp = crc_pcl(data, len, *crcp);</div><div class='ctx'> 		kernel_fpu_end();</div><div class='hunk'>@@ -202,7 +189,7 @@ static int crc32c_pcl_intel_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> static int __crc32c_pcl_intel_finup(u32 *crcp, const u8 *data, unsigned int len,</div><div class='ctx'> 				u8 *out)</div><div class='ctx'> {</div><div class='del'>-	if (len &gt;= crc32c_pcl_breakeven &amp;&amp; irq_fpu_usable()) {</div><div class='add'>+	if (len &gt;= CRC32C_PCL_BREAKEVEN &amp;&amp; irq_fpu_usable()) {</div><div class='ctx'> 		kernel_fpu_begin();</div><div class='ctx'> 		*(__le32 *)out = ~cpu_to_le32(crc_pcl(data, len, *crcp));</div><div class='ctx'> 		kernel_fpu_end();</div><div class='hunk'>@@ -261,7 +248,6 @@ static int __init crc32c_intel_mod_init(void)</div><div class='ctx'> 		alg.update = crc32c_pcl_intel_update;</div><div class='ctx'> 		alg.finup = crc32c_pcl_intel_finup;</div><div class='ctx'> 		alg.digest = crc32c_pcl_intel_digest;</div><div class='del'>-		set_pcl_breakeven_point();</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	return crypto_register_shash(&amp;alg);</div><div class='head'>diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S<br/>index dc05f010ca9b..7a7de27c6f41 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/crc32c-pcl-intel-asm_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/crc32c-pcl-intel-asm_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/crc32c-pcl-intel-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/crc32c-pcl-intel-asm_64.S</a></div><div class='hunk'>@@ -312,7 +312,7 @@ do_return:</div><div class='ctx'>         ret</div><div class='ctx'> ENDPROC(crc_pcl)</div><div class='ctx'> </div><div class='del'>-.section	.rodata, "a", %progbits</div><div class='add'>+.section	.rodata, "a", @progbits</div><div class='ctx'>         ################################################################</div><div class='ctx'>         ## jump table        Table is 129 entries x 2 bytes each</div><div class='ctx'>         ################################################################</div><div class='head'>diff --git a/arch/x86/crypto/crct10dif-pcl-asm_64.S b/arch/x86/crypto/crct10dif-pcl-asm_64.S<br/>index 35e97569d05f..de04d3e98d8d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/crct10dif-pcl-asm_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/crct10dif-pcl-asm_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/crct10dif-pcl-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/crct10dif-pcl-asm_64.S</a></div><div class='hunk'>@@ -554,12 +554,11 @@ _only_less_than_2:</div><div class='ctx'> </div><div class='ctx'> ENDPROC(crc_t10dif_pcl)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='add'>+.section	.rodata, "a", @progbits</div><div class='add'>+.align 16</div><div class='ctx'> # precomputed constants</div><div class='ctx'> # these constants are precomputed from the poly:</div><div class='ctx'> # 0x8bb70000 (0x8bb7 scaled to 32 bits)</div><div class='del'>-.align 16</div><div class='ctx'> # Q = 0x18BB70000</div><div class='ctx'> # rk1 = 2^(32*3) mod Q &lt;&lt; 32</div><div class='ctx'> # rk2 = 2^(32*5) mod Q &lt;&lt; 32</div><div class='hunk'>@@ -613,14 +612,23 @@ rk20:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst16.mask1, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> mask1:</div><div class='ctx'> .octa 0x80808080808080808080808080808080</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst16.mask2, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> mask2:</div><div class='ctx'> .octa 0x00000000FFFFFFFFFFFFFFFFFFFFFFFF</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst16.SHUF_MASK, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> SHUF_MASK:</div><div class='ctx'> .octa 0x000102030405060708090A0B0C0D0E0F</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst32.pshufb_shf_table, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> pshufb_shf_table:</div><div class='ctx'> # use these values for shift constants for the pshufb instruction</div><div class='ctx'> # different alignments result in values as shown:</div><div class='head'>diff --git a/arch/x86/crypto/des3_ede-asm_64.S b/arch/x86/crypto/des3_ede-asm_64.S<br/>index 038f6ae87c5e..f3e91647ca27 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/des3_ede-asm_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/des3_ede-asm_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/des3_ede-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/des3_ede-asm_64.S</a></div><div class='hunk'>@@ -537,7 +537,7 @@ ENTRY(des3_ede_x86_64_crypt_blk_3way)</div><div class='ctx'> 	ret;</div><div class='ctx'> ENDPROC(des3_ede_x86_64_crypt_blk_3way)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata, "a", @progbits</div><div class='ctx'> .align 16</div><div class='ctx'> .L_s1:</div><div class='ctx'> 	.quad 0x0010100001010400, 0x0000000000000000</div><div class='head'>diff --git a/arch/x86/crypto/fpu.c b/arch/x86/crypto/fpu.c<br/>index e7d679e2a018..406680476c52 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/fpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/fpu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/fpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/fpu.c</a></div><div class='hunk'>@@ -11,143 +11,186 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/api.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct crypto_fpu_ctx {</div><div class='del'>-	struct crypto_blkcipher *child;</div><div class='add'>+	struct crypto_skcipher *child;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int crypto_fpu_setkey(struct crypto_tfm *parent, const u8 *key,</div><div class='add'>+static int crypto_fpu_setkey(struct crypto_skcipher *parent, const u8 *key,</div><div class='ctx'> 			     unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_fpu_ctx *ctx = crypto_tfm_ctx(parent);</div><div class='del'>-	struct crypto_blkcipher *child = ctx-&gt;child;</div><div class='add'>+	struct crypto_fpu_ctx *ctx = crypto_skcipher_ctx(parent);</div><div class='add'>+	struct crypto_skcipher *child = ctx-&gt;child;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	crypto_blkcipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	crypto_blkcipher_set_flags(child, crypto_tfm_get_flags(parent) &amp;</div><div class='del'>-				   CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	err = crypto_blkcipher_setkey(child, key, keylen);</div><div class='del'>-	crypto_tfm_set_flags(parent, crypto_blkcipher_get_flags(child) &amp;</div><div class='del'>-				     CRYPTO_TFM_RES_MASK);</div><div class='add'>+	crypto_skcipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_skcipher_set_flags(child, crypto_skcipher_get_flags(parent) &amp;</div><div class='add'>+					 CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	err = crypto_skcipher_setkey(child, key, keylen);</div><div class='add'>+	crypto_skcipher_set_flags(parent, crypto_skcipher_get_flags(child) &amp;</div><div class='add'>+					  CRYPTO_TFM_RES_MASK);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_fpu_encrypt(struct blkcipher_desc *desc_in,</div><div class='del'>-			      struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-			      unsigned int nbytes)</div><div class='add'>+static int crypto_fpu_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_fpu_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_skcipher *child = ctx-&gt;child;</div><div class='add'>+	SKCIPHER_REQUEST_ON_STACK(subreq, child);</div><div class='ctx'> 	int err;</div><div class='del'>-	struct crypto_fpu_ctx *ctx = crypto_blkcipher_ctx(desc_in-&gt;tfm);</div><div class='del'>-	struct crypto_blkcipher *child = ctx-&gt;child;</div><div class='del'>-	struct blkcipher_desc desc = {</div><div class='del'>-		.tfm = child,</div><div class='del'>-		.info = desc_in-&gt;info,</div><div class='del'>-		.flags = desc_in-&gt;flags &amp; ~CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='del'>-	};</div><div class='add'>+</div><div class='add'>+	skcipher_request_set_tfm(subreq, child);</div><div class='add'>+	skcipher_request_set_callback(subreq, 0, NULL, NULL);</div><div class='add'>+	skcipher_request_set_crypt(subreq, req-&gt;src, req-&gt;dst, req-&gt;cryptlen,</div><div class='add'>+				   req-&gt;iv);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='del'>-	err = crypto_blkcipher_crt(desc.tfm)-&gt;encrypt(&amp;desc, dst, src, nbytes);</div><div class='add'>+	err = crypto_skcipher_encrypt(subreq);</div><div class='ctx'> 	kernel_fpu_end();</div><div class='add'>+</div><div class='add'>+	skcipher_request_zero(subreq);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_fpu_decrypt(struct blkcipher_desc *desc_in,</div><div class='del'>-			      struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-			      unsigned int nbytes)</div><div class='add'>+static int crypto_fpu_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_fpu_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_skcipher *child = ctx-&gt;child;</div><div class='add'>+	SKCIPHER_REQUEST_ON_STACK(subreq, child);</div><div class='ctx'> 	int err;</div><div class='del'>-	struct crypto_fpu_ctx *ctx = crypto_blkcipher_ctx(desc_in-&gt;tfm);</div><div class='del'>-	struct crypto_blkcipher *child = ctx-&gt;child;</div><div class='del'>-	struct blkcipher_desc desc = {</div><div class='del'>-		.tfm = child,</div><div class='del'>-		.info = desc_in-&gt;info,</div><div class='del'>-		.flags = desc_in-&gt;flags &amp; ~CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='del'>-	};</div><div class='add'>+</div><div class='add'>+	skcipher_request_set_tfm(subreq, child);</div><div class='add'>+	skcipher_request_set_callback(subreq, 0, NULL, NULL);</div><div class='add'>+	skcipher_request_set_crypt(subreq, req-&gt;src, req-&gt;dst, req-&gt;cryptlen,</div><div class='add'>+				   req-&gt;iv);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='del'>-	err = crypto_blkcipher_crt(desc.tfm)-&gt;decrypt(&amp;desc, dst, src, nbytes);</div><div class='add'>+	err = crypto_skcipher_decrypt(subreq);</div><div class='ctx'> 	kernel_fpu_end();</div><div class='add'>+</div><div class='add'>+	skcipher_request_zero(subreq);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_fpu_init_tfm(struct crypto_tfm *tfm)</div><div class='add'>+static int crypto_fpu_init_tfm(struct crypto_skcipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_instance *inst = crypto_tfm_alg_instance(tfm);</div><div class='del'>-	struct crypto_spawn *spawn = crypto_instance_ctx(inst);</div><div class='del'>-	struct crypto_fpu_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	struct crypto_blkcipher *cipher;</div><div class='add'>+	struct skcipher_instance *inst = skcipher_alg_instance(tfm);</div><div class='add'>+	struct crypto_fpu_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_skcipher_spawn *spawn;</div><div class='add'>+	struct crypto_skcipher *cipher;</div><div class='ctx'> </div><div class='del'>-	cipher = crypto_spawn_blkcipher(spawn);</div><div class='add'>+	spawn = skcipher_instance_ctx(inst);</div><div class='add'>+	cipher = crypto_spawn_skcipher(spawn);</div><div class='ctx'> 	if (IS_ERR(cipher))</div><div class='ctx'> 		return PTR_ERR(cipher);</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;child = cipher;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void crypto_fpu_exit_tfm(struct crypto_tfm *tfm)</div><div class='add'>+static void crypto_fpu_exit_tfm(struct crypto_skcipher *tfm)</div><div class='add'>+{</div><div class='add'>+	struct crypto_fpu_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	crypto_free_skcipher(ctx-&gt;child);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto_fpu_free(struct skcipher_instance *inst)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_fpu_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	crypto_free_blkcipher(ctx-&gt;child);</div><div class='add'>+	crypto_drop_skcipher(skcipher_instance_ctx(inst));</div><div class='add'>+	kfree(inst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct crypto_instance *crypto_fpu_alloc(struct rtattr **tb)</div><div class='add'>+static int crypto_fpu_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_instance *inst;</div><div class='del'>-	struct crypto_alg *alg;</div><div class='add'>+	struct crypto_skcipher_spawn *spawn;</div><div class='add'>+	struct skcipher_instance *inst;</div><div class='add'>+	struct crypto_attr_type *algt;</div><div class='add'>+	struct skcipher_alg *alg;</div><div class='add'>+	const char *cipher_name;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);</div><div class='add'>+	algt = crypto_get_attr_type(tb);</div><div class='add'>+	if (IS_ERR(algt))</div><div class='add'>+		return PTR_ERR(algt);</div><div class='add'>+</div><div class='add'>+	if ((algt-&gt;type ^ (CRYPTO_ALG_INTERNAL | CRYPTO_ALG_TYPE_SKCIPHER)) &amp;</div><div class='add'>+	    algt-&gt;mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(algt-&gt;mask &amp; CRYPTO_ALG_INTERNAL))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cipher_name = crypto_attr_alg_name(tb[1]);</div><div class='add'>+	if (IS_ERR(cipher_name))</div><div class='add'>+		return PTR_ERR(cipher_name);</div><div class='add'>+</div><div class='add'>+	inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);</div><div class='add'>+	if (!inst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spawn = skcipher_instance_ctx(inst);</div><div class='add'>+</div><div class='add'>+	crypto_set_skcipher_spawn(spawn, skcipher_crypto_instance(inst));</div><div class='add'>+	err = crypto_grab_skcipher(spawn, cipher_name, CRYPTO_ALG_INTERNAL,</div><div class='add'>+				   CRYPTO_ALG_INTERNAL | CRYPTO_ALG_ASYNC);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return ERR_PTR(err);</div><div class='del'>-</div><div class='del'>-	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='del'>-				  CRYPTO_ALG_TYPE_MASK);</div><div class='del'>-	if (IS_ERR(alg))</div><div class='del'>-		return ERR_CAST(alg);</div><div class='del'>-</div><div class='del'>-	inst = crypto_alloc_instance("fpu", alg);</div><div class='del'>-	if (IS_ERR(inst))</div><div class='del'>-		goto out_put_alg;</div><div class='del'>-</div><div class='del'>-	inst-&gt;alg.cra_flags = alg-&gt;cra_flags;</div><div class='del'>-	inst-&gt;alg.cra_priority = alg-&gt;cra_priority;</div><div class='del'>-	inst-&gt;alg.cra_blocksize = alg-&gt;cra_blocksize;</div><div class='del'>-	inst-&gt;alg.cra_alignmask = alg-&gt;cra_alignmask;</div><div class='del'>-	inst-&gt;alg.cra_type = alg-&gt;cra_type;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.ivsize = alg-&gt;cra_blkcipher.ivsize;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.min_keysize = alg-&gt;cra_blkcipher.min_keysize;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.max_keysize = alg-&gt;cra_blkcipher.max_keysize;</div><div class='del'>-	inst-&gt;alg.cra_ctxsize = sizeof(struct crypto_fpu_ctx);</div><div class='del'>-	inst-&gt;alg.cra_init = crypto_fpu_init_tfm;</div><div class='del'>-	inst-&gt;alg.cra_exit = crypto_fpu_exit_tfm;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.setkey = crypto_fpu_setkey;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.encrypt = crypto_fpu_encrypt;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.decrypt = crypto_fpu_decrypt;</div><div class='del'>-</div><div class='del'>-out_put_alg:</div><div class='del'>-	crypto_mod_put(alg);</div><div class='del'>-	return inst;</div><div class='del'>-}</div><div class='add'>+		goto out_free_inst;</div><div class='ctx'> </div><div class='del'>-static void crypto_fpu_free(struct crypto_instance *inst)</div><div class='del'>-{</div><div class='del'>-	crypto_drop_spawn(crypto_instance_ctx(inst));</div><div class='add'>+	alg = crypto_skcipher_spawn_alg(spawn);</div><div class='add'>+</div><div class='add'>+	err = crypto_inst_setname(skcipher_crypto_instance(inst), "fpu",</div><div class='add'>+				  &amp;alg-&gt;base);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_drop_skcipher;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.base.cra_flags = CRYPTO_ALG_INTERNAL;</div><div class='add'>+	inst-&gt;alg.base.cra_priority = alg-&gt;base.cra_priority;</div><div class='add'>+	inst-&gt;alg.base.cra_blocksize = alg-&gt;base.cra_blocksize;</div><div class='add'>+	inst-&gt;alg.base.cra_alignmask = alg-&gt;base.cra_alignmask;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.ivsize = crypto_skcipher_alg_ivsize(alg);</div><div class='add'>+	inst-&gt;alg.min_keysize = crypto_skcipher_alg_min_keysize(alg);</div><div class='add'>+	inst-&gt;alg.max_keysize = crypto_skcipher_alg_max_keysize(alg);</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.base.cra_ctxsize = sizeof(struct crypto_fpu_ctx);</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.init = crypto_fpu_init_tfm;</div><div class='add'>+	inst-&gt;alg.exit = crypto_fpu_exit_tfm;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.setkey = crypto_fpu_setkey;</div><div class='add'>+	inst-&gt;alg.encrypt = crypto_fpu_encrypt;</div><div class='add'>+	inst-&gt;alg.decrypt = crypto_fpu_decrypt;</div><div class='add'>+</div><div class='add'>+	inst-&gt;free = crypto_fpu_free;</div><div class='add'>+</div><div class='add'>+	err = skcipher_register_instance(tmpl, inst);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_drop_skcipher;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out_drop_skcipher:</div><div class='add'>+	crypto_drop_skcipher(spawn);</div><div class='add'>+out_free_inst:</div><div class='ctx'> 	kfree(inst);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_template crypto_fpu_tmpl = {</div><div class='ctx'> 	.name = "fpu",</div><div class='del'>-	.alloc = crypto_fpu_alloc,</div><div class='del'>-	.free = crypto_fpu_free,</div><div class='add'>+	.create = crypto_fpu_create,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S<br/>index eed55c8cca4f..f94375a8dcd1 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/ghash-clmulni-intel_asm.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/ghash-clmulni-intel_asm.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/ghash-clmulni-intel_asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/ghash-clmulni-intel_asm.S</a></div><div class='hunk'>@@ -20,8 +20,7 @@</div><div class='ctx'> #include &lt;asm/inst.h&gt;</div><div class='ctx'> #include &lt;asm/frame.h&gt;</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='add'>+.section	.rodata.cst16.bswap_mask, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='ctx'> .Lbswap_mask:</div><div class='ctx'> 	.octa 0x000102030405060708090a0b0c0d0e0f</div><div class='head'>diff --git a/arch/x86/crypto/glue_helper.c b/arch/x86/crypto/glue_helper.c<br/>index 6a85598931b5..260a060d7275 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/glue_helper.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/glue_helper.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/glue_helper.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/glue_helper.c</a></div><div class='hunk'>@@ -27,10 +27,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;crypto/b128ops.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;crypto/lrw.h&gt;</div><div class='ctx'> #include &lt;crypto/xts.h&gt;</div><div class='ctx'> #include &lt;asm/crypto/glue_helper.h&gt;</div><div class='del'>-#include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,</div><div class='ctx'> 				   struct blkcipher_desc *desc,</div><div class='hunk'>@@ -339,6 +339,41 @@ done:</div><div class='ctx'> 	return nbytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int __glue_xts_req_128bit(const struct common_glue_ctx *gctx,</div><div class='add'>+					  void *ctx,</div><div class='add'>+					  struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	const unsigned int bsize = 128 / 8;</div><div class='add'>+	unsigned int nbytes = walk-&gt;nbytes;</div><div class='add'>+	u128 *src = walk-&gt;src.virt.addr;</div><div class='add'>+	u128 *dst = walk-&gt;dst.virt.addr;</div><div class='add'>+	unsigned int num_blocks, func_bytes;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* Process multi-block batch */</div><div class='add'>+	for (i = 0; i &lt; gctx-&gt;num_funcs; i++) {</div><div class='add'>+		num_blocks = gctx-&gt;funcs[i].num_blocks;</div><div class='add'>+		func_bytes = bsize * num_blocks;</div><div class='add'>+</div><div class='add'>+		if (nbytes &gt;= func_bytes) {</div><div class='add'>+			do {</div><div class='add'>+				gctx-&gt;funcs[i].fn_u.xts(ctx, dst, src,</div><div class='add'>+							walk-&gt;iv);</div><div class='add'>+</div><div class='add'>+				src += num_blocks;</div><div class='add'>+				dst += num_blocks;</div><div class='add'>+				nbytes -= func_bytes;</div><div class='add'>+			} while (nbytes &gt;= func_bytes);</div><div class='add'>+</div><div class='add'>+			if (nbytes &lt; bsize)</div><div class='add'>+				goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* for implementations implementing faster XTS IV generator */</div><div class='ctx'> int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,</div><div class='ctx'> 			  struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='hunk'>@@ -379,6 +414,43 @@ int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit);</div><div class='ctx'> </div><div class='add'>+int glue_xts_req_128bit(const struct common_glue_ctx *gctx,</div><div class='add'>+			struct skcipher_request *req,</div><div class='add'>+			common_glue_func_t tweak_fn, void *tweak_ctx,</div><div class='add'>+			void *crypt_ctx)</div><div class='add'>+{</div><div class='add'>+	const unsigned int bsize = 128 / 8;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	bool fpu_enabled = false;</div><div class='add'>+	unsigned int nbytes;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, false);</div><div class='add'>+	nbytes = walk.nbytes;</div><div class='add'>+	if (!nbytes)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* set minimum length to bsize, for tweak_fn */</div><div class='add'>+	fpu_enabled = glue_skwalk_fpu_begin(bsize, gctx-&gt;fpu_blocks_limit,</div><div class='add'>+					    &amp;walk, fpu_enabled,</div><div class='add'>+					    nbytes &lt; bsize ? bsize : nbytes);</div><div class='add'>+</div><div class='add'>+	/* calculate first value of T */</div><div class='add'>+	tweak_fn(tweak_ctx, walk.iv, walk.iv);</div><div class='add'>+</div><div class='add'>+	while (nbytes) {</div><div class='add'>+		nbytes = __glue_xts_req_128bit(gctx, crypt_ctx, &amp;walk);</div><div class='add'>+</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, nbytes);</div><div class='add'>+		nbytes = walk.nbytes;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	glue_fpu_end(fpu_enabled);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(glue_xts_req_128bit);</div><div class='add'>+</div><div class='ctx'> void glue_xts_crypt_128bit_one(void *ctx, u128 *dst, const u128 *src, le128 *iv,</div><div class='ctx'> 			       common_glue_func_t fn)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/crypto/poly1305-avx2-x86_64.S b/arch/x86/crypto/poly1305-avx2-x86_64.S<br/>index eff2f414e22b..3b6e70d085da 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/poly1305-avx2-x86_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/poly1305-avx2-x86_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/poly1305-avx2-x86_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/poly1305-avx2-x86_64.S</a></div><div class='hunk'>@@ -11,11 +11,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.cst32.ANMASK, "aM", @progbits, 32</div><div class='ctx'> .align 32</div><div class='del'>-</div><div class='ctx'> ANMASK:	.octa 0x0000000003ffffff0000000003ffffff</div><div class='ctx'> 	.octa 0x0000000003ffffff0000000003ffffff</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst32.ORMASK, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> ORMASK:	.octa 0x00000000010000000000000001000000</div><div class='ctx'> 	.octa 0x00000000010000000000000001000000</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/poly1305-sse2-x86_64.S b/arch/x86/crypto/poly1305-sse2-x86_64.S<br/>index 338c748054ed..c88c670cb5fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/poly1305-sse2-x86_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/poly1305-sse2-x86_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/poly1305-sse2-x86_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/poly1305-sse2-x86_64.S</a></div><div class='hunk'>@@ -11,10 +11,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.cst16.ANMASK, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='del'>-</div><div class='ctx'> ANMASK:	.octa 0x0000000003ffffff0000000003ffffff</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst16.ORMASK, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> ORMASK:	.octa 0x00000000010000000000000001000000</div><div class='ctx'> </div><div class='ctx'> .text</div><div class='head'>diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S<br/>index 8be571808342..2925077f8c6a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/serpent-avx-x86_64-asm_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/serpent-avx-x86_64-asm_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/serpent-avx-x86_64-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/serpent-avx-x86_64-asm_64.S</a></div><div class='hunk'>@@ -29,11 +29,12 @@</div><div class='ctx'> </div><div class='ctx'> .file "serpent-avx-x86_64-asm_64.S"</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.cst16.bswap128_mask, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='del'>-</div><div class='ctx'> .Lbswap128_mask:</div><div class='ctx'> 	.byte 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0</div><div class='add'>+.section	.rodata.cst16.xts_gf128mul_and_shl1_mask, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> .Lxts_gf128mul_and_shl1_mask:</div><div class='ctx'> 	.byte 0x87, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S<br/>index 97c48add33ed..d67888f2a52a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/serpent-avx2-asm_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/serpent-avx2-asm_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/serpent-avx2-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/serpent-avx2-asm_64.S</a></div><div class='hunk'>@@ -20,13 +20,18 @@</div><div class='ctx'> </div><div class='ctx'> .file "serpent-avx2-asm_64.S"</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.cst16.bswap128_mask, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='del'>-</div><div class='ctx'> .Lbswap128_mask:</div><div class='ctx'> 	.byte 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst16.xts_gf128mul_and_shl1_mask_0, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> .Lxts_gf128mul_and_shl1_mask_0:</div><div class='ctx'> 	.byte 0x87, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst16.xts_gf128mul_and_shl1_mask_1, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> .Lxts_gf128mul_and_shl1_mask_1:</div><div class='ctx'> 	.byte 0x0e, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/sha1-mb/sha1_mb.c b/arch/x86/crypto/sha1-mb/sha1_mb.c<br/>index 9e5b67127a09..acf9fdf01671 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha1-mb/sha1_mb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha1-mb/sha1_mb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha1-mb/sha1_mb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1-mb/sha1_mb.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ static inline void sha1_init_digest(uint32_t *digest)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2],</div><div class='del'>-			 uint32_t total_len)</div><div class='add'>+			 uint64_t total_len)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t i = total_len &amp; (SHA1_BLOCK_SIZE - 1);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h b/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h<br/>index 98a35bcc6f4a..13590ccf965c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha1-mb/sha1_mb_ctx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1-mb/sha1_mb_ctx.h</a></div><div class='hunk'>@@ -125,7 +125,7 @@ struct sha1_hash_ctx {</div><div class='ctx'> 	/* error flag */</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	uint32_t	total_length;</div><div class='add'>+	uint64_t	total_length;</div><div class='ctx'> 	const void	*incoming_buffer;</div><div class='ctx'> 	uint32_t	incoming_buffer_length;</div><div class='ctx'> 	uint8_t		partial_block_buffer[SHA1_BLOCK_SIZE * 2];</div><div class='head'>diff --git a/arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S b/arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S<br/>index 96df6a39d7e2..93b945597ecf 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S</a></div><div class='hunk'>@@ -281,11 +281,13 @@ ENTRY(sha1_mb_mgr_get_comp_job_avx2)</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(sha1_mb_mgr_get_comp_job_avx2)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='add'>+.section	.rodata.cst16.clear_low_nibble, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='ctx'> clear_low_nibble:</div><div class='ctx'> .octa	0x000000000000000000000000FFFFFFF0</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst8, "aM", @progbits, 8</div><div class='add'>+.align 8</div><div class='ctx'> one:</div><div class='ctx'> .quad  1</div><div class='ctx'> two:</div><div class='head'>diff --git a/arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S b/arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S<br/>index 63a0d9c8e31f..7a93b1c0d69a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S</a></div><div class='hunk'>@@ -203,8 +203,7 @@ return_null:</div><div class='ctx'> </div><div class='ctx'> ENDPROC(sha1_mb_mgr_submit_avx2)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='add'>+.section	.rodata.cst16.clear_low_nibble, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='ctx'> clear_low_nibble:</div><div class='ctx'> 	.octa	0x000000000000000000000000FFFFFFF0</div><div class='head'>diff --git a/arch/x86/crypto/sha1-mb/sha1_x8_avx2.S b/arch/x86/crypto/sha1-mb/sha1_x8_avx2.S<br/>index c9dae1cd2919..20f77aa633de 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha1-mb/sha1_x8_avx2.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha1-mb/sha1_x8_avx2.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha1-mb/sha1_x8_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1-mb/sha1_x8_avx2.S</a></div><div class='hunk'>@@ -461,21 +461,32 @@ lloop:</div><div class='ctx'> ENDPROC(sha1_x8_avx2)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='add'>+.section	.rodata.cst32.K00_19, "aM", @progbits, 32</div><div class='ctx'> .align 32</div><div class='ctx'> K00_19:</div><div class='ctx'> .octa 0x5A8279995A8279995A8279995A827999</div><div class='ctx'> .octa 0x5A8279995A8279995A8279995A827999</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst32.K20_39, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> K20_39:</div><div class='ctx'> .octa 0x6ED9EBA16ED9EBA16ED9EBA16ED9EBA1</div><div class='ctx'> .octa 0x6ED9EBA16ED9EBA16ED9EBA16ED9EBA1</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst32.K40_59, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> K40_59:</div><div class='ctx'> .octa 0x8F1BBCDC8F1BBCDC8F1BBCDC8F1BBCDC</div><div class='ctx'> .octa 0x8F1BBCDC8F1BBCDC8F1BBCDC8F1BBCDC</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst32.K60_79, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> K60_79:</div><div class='ctx'> .octa 0xCA62C1D6CA62C1D6CA62C1D6CA62C1D6</div><div class='ctx'> .octa 0xCA62C1D6CA62C1D6CA62C1D6CA62C1D6</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> PSHUFFLE_BYTE_FLIP_MASK:</div><div class='ctx'> .octa 0x0c0d0e0f08090a0b0405060700010203</div><div class='ctx'> .octa 0x0c0d0e0f08090a0b0405060700010203</div><div class='head'>diff --git a/arch/x86/crypto/sha1_ni_asm.S b/arch/x86/crypto/sha1_ni_asm.S<br/>index 874a651b9e7d..ebbdba72ae07 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha1_ni_asm.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha1_ni_asm.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha1_ni_asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha1_ni_asm.S</a></div><div class='hunk'>@@ -293,10 +293,12 @@ ENTRY(sha1_ni_transform)</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(sha1_ni_transform)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='del'>-.align 64</div><div class='add'>+.section	.rodata.cst16.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> PSHUFFLE_BYTE_FLIP_MASK:</div><div class='ctx'> 	.octa 0x000102030405060708090a0b0c0d0e0f</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst16.UPPER_WORD_MASK, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> UPPER_WORD_MASK:</div><div class='ctx'> 	.octa 0xFFFFFFFF000000000000000000000000</div><div class='head'>diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S<br/>index 92b3b5d75ba9..e08888a1a5f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha256-avx-asm.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha256-avx-asm.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha256-avx-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-avx-asm.S</a></div><div class='hunk'>@@ -463,7 +463,7 @@ done_hash:</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(sha256_transform_avx)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.cst256.K256, "aM", @progbits, 256</div><div class='ctx'> .align 64</div><div class='ctx'> K256:</div><div class='ctx'> 	.long 0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5</div><div class='hunk'>@@ -483,14 +483,21 @@ K256:</div><div class='ctx'> 	.long 0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208</div><div class='ctx'> 	.long 0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst16.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> PSHUFFLE_BYTE_FLIP_MASK:</div><div class='ctx'> 	.octa 0x0c0d0e0f08090a0b0405060700010203</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst16._SHUF_00BA, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> # shuffle xBxA -&gt; 00BA</div><div class='ctx'> _SHUF_00BA:</div><div class='ctx'> 	.octa 0xFFFFFFFFFFFFFFFF0b0a090803020100</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst16._SHUF_DC00, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> # shuffle xDxC -&gt; DC00</div><div class='ctx'> _SHUF_DC00:</div><div class='ctx'> 	.octa 0x0b0a090803020100FFFFFFFFFFFFFFFF</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S<br/>index 570ec5ec62d7..89c8f09787d2 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha256-avx2-asm.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha256-avx2-asm.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha256-avx2-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-avx2-asm.S</a></div><div class='hunk'>@@ -723,7 +723,7 @@ done_hash:</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(sha256_transform_rorx)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.cst512.K256, "aM", @progbits, 512</div><div class='ctx'> .align 64</div><div class='ctx'> K256:</div><div class='ctx'> 	.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5</div><div class='hunk'>@@ -759,14 +759,21 @@ K256:</div><div class='ctx'> 	.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2</div><div class='ctx'> 	.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> PSHUFFLE_BYTE_FLIP_MASK:</div><div class='ctx'> 	.octa 0x0c0d0e0f08090a0b0405060700010203,0x0c0d0e0f08090a0b0405060700010203</div><div class='ctx'> </div><div class='ctx'> # shuffle xBxA -&gt; 00BA</div><div class='add'>+.section	.rodata.cst32._SHUF_00BA, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> _SHUF_00BA:</div><div class='ctx'> 	.octa 0xFFFFFFFFFFFFFFFF0b0a090803020100,0xFFFFFFFFFFFFFFFF0b0a090803020100</div><div class='ctx'> </div><div class='ctx'> # shuffle xDxC -&gt; DC00</div><div class='add'>+.section	.rodata.cst32._SHUF_DC00, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> _SHUF_DC00:</div><div class='ctx'> 	.octa 0x0b0a090803020100FFFFFFFFFFFFFFFF,0x0b0a090803020100FFFFFFFFFFFFFFFF</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/crypto/sha256-mb/sha256_mb.c b/arch/x86/crypto/sha256-mb/sha256_mb.c<br/>index 6f97fb33ae21..7926a226b120 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha256-mb/sha256_mb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha256-mb/sha256_mb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha256-mb/sha256_mb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-mb/sha256_mb.c</a></div><div class='hunk'>@@ -115,7 +115,7 @@ inline void sha256_init_digest(uint32_t *digest)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> inline uint32_t sha256_pad(uint8_t padblock[SHA256_BLOCK_SIZE * 2],</div><div class='del'>-			 uint32_t total_len)</div><div class='add'>+			 uint64_t total_len)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t i = total_len &amp; (SHA256_BLOCK_SIZE - 1);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h b/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h<br/>index edd252b73206..aabb30320af0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha256-mb/sha256_mb_ctx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-mb/sha256_mb_ctx.h</a></div><div class='hunk'>@@ -125,7 +125,7 @@ struct sha256_hash_ctx {</div><div class='ctx'> 	/* error flag */</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	uint32_t	total_length;</div><div class='add'>+	uint64_t	total_length;</div><div class='ctx'> 	const void	*incoming_buffer;</div><div class='ctx'> 	uint32_t	incoming_buffer_length;</div><div class='ctx'> 	uint8_t		partial_block_buffer[SHA256_BLOCK_SIZE * 2];</div><div class='head'>diff --git a/arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S b/arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S<br/>index a78a0694ddef..8fe6338bcc84 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S</a></div><div class='hunk'>@@ -284,11 +284,13 @@ ENTRY(sha256_mb_mgr_get_comp_job_avx2)</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(sha256_mb_mgr_get_comp_job_avx2)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='add'>+.section	.rodata.cst16.clear_low_nibble, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='ctx'> clear_low_nibble:</div><div class='ctx'> .octa	0x000000000000000000000000FFFFFFF0</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst8, "aM", @progbits, 8</div><div class='add'>+.align 8</div><div class='ctx'> one:</div><div class='ctx'> .quad	1</div><div class='ctx'> two:</div><div class='head'>diff --git a/arch/x86/crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S b/arch/x86/crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S<br/>index 7ea670e25acc..b36ae7454084 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S</a></div><div class='hunk'>@@ -208,8 +208,7 @@ return_null:</div><div class='ctx'> </div><div class='ctx'> ENDPROC(sha256_mb_mgr_submit_avx2)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='add'>+.section	.rodata.cst16.clear_low_nibble, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='ctx'> clear_low_nibble:</div><div class='ctx'> 	.octa	0x000000000000000000000000FFFFFFF0</div><div class='head'>diff --git a/arch/x86/crypto/sha256-mb/sha256_x8_avx2.S b/arch/x86/crypto/sha256-mb/sha256_x8_avx2.S<br/>index aa21aea4c722..1687c80c5995 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha256-mb/sha256_x8_avx2.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha256-mb/sha256_x8_avx2.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha256-mb/sha256_x8_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-mb/sha256_x8_avx2.S</a></div><div class='hunk'>@@ -437,7 +437,8 @@ Lrounds_16_xx:</div><div class='ctx'> </div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(sha256_x8_avx2)</div><div class='del'>-.data</div><div class='add'>+</div><div class='add'>+.section	.rodata.K256_8, "a", @progbits</div><div class='ctx'> .align 64</div><div class='ctx'> K256_8:</div><div class='ctx'> 	.octa	0x428a2f98428a2f98428a2f98428a2f98</div><div class='hunk'>@@ -568,10 +569,14 @@ K256_8:</div><div class='ctx'> 	.octa	0xbef9a3f7bef9a3f7bef9a3f7bef9a3f7</div><div class='ctx'> 	.octa	0xc67178f2c67178f2c67178f2c67178f2</div><div class='ctx'> 	.octa	0xc67178f2c67178f2c67178f2c67178f2</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> PSHUFFLE_BYTE_FLIP_MASK:</div><div class='ctx'> .octa 0x0c0d0e0f08090a0b0405060700010203</div><div class='ctx'> .octa 0x0c0d0e0f08090a0b0405060700010203</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst256.K256, "aM", @progbits, 256</div><div class='ctx'> .align 64</div><div class='ctx'> .global K256</div><div class='ctx'> K256:</div><div class='head'>diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S<br/>index 2cedc44e8121..39b83c93e7fd 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha256-ssse3-asm.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha256-ssse3-asm.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha256-ssse3-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256-ssse3-asm.S</a></div><div class='hunk'>@@ -474,7 +474,7 @@ done_hash:</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(sha256_transform_ssse3)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.cst256.K256, "aM", @progbits, 256</div><div class='ctx'> .align 64</div><div class='ctx'> K256:</div><div class='ctx'>         .long 0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5</div><div class='hunk'>@@ -494,13 +494,19 @@ K256:</div><div class='ctx'>         .long 0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208</div><div class='ctx'>         .long 0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst16.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> PSHUFFLE_BYTE_FLIP_MASK:</div><div class='ctx'> 	.octa 0x0c0d0e0f08090a0b0405060700010203</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst16._SHUF_00BA, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> # shuffle xBxA -&gt; 00BA</div><div class='ctx'> _SHUF_00BA:</div><div class='ctx'> 	.octa 0xFFFFFFFFFFFFFFFF0b0a090803020100</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst16._SHUF_DC00, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> # shuffle xDxC -&gt; DC00</div><div class='ctx'> _SHUF_DC00:</div><div class='ctx'> 	.octa 0x0b0a090803020100FFFFFFFFFFFFFFFF</div><div class='head'>diff --git a/arch/x86/crypto/sha256_ni_asm.S b/arch/x86/crypto/sha256_ni_asm.S<br/>index 748cdf21a938..fb58f58ecfbc 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha256_ni_asm.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha256_ni_asm.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha256_ni_asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha256_ni_asm.S</a></div><div class='hunk'>@@ -329,7 +329,7 @@ ENTRY(sha256_ni_transform)</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(sha256_ni_transform)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.cst256.K256, "aM", @progbits, 256</div><div class='ctx'> .align 64</div><div class='ctx'> K256:</div><div class='ctx'> 	.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5</div><div class='hunk'>@@ -349,5 +349,7 @@ K256:</div><div class='ctx'> 	.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208</div><div class='ctx'> 	.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst16.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> PSHUFFLE_BYTE_FLIP_MASK:</div><div class='ctx'> 	.octa 0x0c0d0e0f08090a0b0405060700010203</div><div class='head'>diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S<br/>index 565274d6a641..39235fefe6f7 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha512-avx-asm.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha512-avx-asm.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha512-avx-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-avx-asm.S</a></div><div class='hunk'>@@ -370,14 +370,17 @@ ENDPROC(sha512_transform_avx)</div><div class='ctx'> ########################################################################</div><div class='ctx'> ### Binary Data</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='add'>+.section	.rodata.cst16.XMM_QWORD_BSWAP, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='del'>-</div><div class='ctx'> # Mask for byte-swapping a couple of qwords in an XMM register using (v)pshufb.</div><div class='ctx'> XMM_QWORD_BSWAP:</div><div class='ctx'> 	.octa 0x08090a0b0c0d0e0f0001020304050607</div><div class='ctx'> </div><div class='add'>+# Mergeable 640-byte rodata section. This allows linker to merge the table</div><div class='add'>+# with other, exactly the same 640-byte fragment of another rodata section</div><div class='add'>+# (if such section exists).</div><div class='add'>+.section	.rodata.cst640.K512, "aM", @progbits, 640</div><div class='add'>+.align 64</div><div class='ctx'> # K[t] used in SHA512 hashing</div><div class='ctx'> K512:</div><div class='ctx'> 	.quad 0x428a2f98d728ae22,0x7137449123ef65cd</div><div class='head'>diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S<br/>index 1f20b35d8573..7f5f6c6ec72e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha512-avx2-asm.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha512-avx2-asm.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha512-avx2-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-avx2-asm.S</a></div><div class='hunk'>@@ -684,8 +684,11 @@ ENDPROC(sha512_transform_rorx)</div><div class='ctx'> ########################################################################</div><div class='ctx'> ### Binary Data</div><div class='ctx'> </div><div class='del'>-.data</div><div class='ctx'> </div><div class='add'>+# Mergeable 640-byte rodata section. This allows linker to merge the table</div><div class='add'>+# with other, exactly the same 640-byte fragment of another rodata section</div><div class='add'>+# (if such section exists).</div><div class='add'>+.section	.rodata.cst640.K512, "aM", @progbits, 640</div><div class='ctx'> .align 64</div><div class='ctx'> # K[t] used in SHA512 hashing</div><div class='ctx'> K512:</div><div class='hunk'>@@ -730,14 +733,17 @@ K512:</div><div class='ctx'> 	.quad	0x4cc5d4becb3e42b6,0x597f299cfc657e2a</div><div class='ctx'> 	.quad	0x5fcb6fab3ad6faec,0x6c44198c4a475817</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 32</div><div class='ctx'> .align 32</div><div class='del'>-</div><div class='ctx'> # Mask for byte-swapping a couple of qwords in an XMM register using (v)pshufb.</div><div class='ctx'> PSHUFFLE_BYTE_FLIP_MASK:</div><div class='ctx'> 	.octa 0x08090a0b0c0d0e0f0001020304050607</div><div class='ctx'> 	.octa 0x18191a1b1c1d1e1f1011121314151617</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst32.MASK_YMM_LO, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> MASK_YMM_LO:</div><div class='ctx'> 	.octa 0x00000000000000000000000000000000</div><div class='ctx'> 	.octa 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/crypto/sha512-mb/sha512_mb.c b/arch/x86/crypto/sha512-mb/sha512_mb.c<br/>index d210174a52b0..2dd3674b5a1e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha512-mb/sha512_mb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha512-mb/sha512_mb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha512-mb/sha512_mb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-mb/sha512_mb.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ inline void sha512_init_digest(uint64_t *digest)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> inline uint32_t sha512_pad(uint8_t padblock[SHA512_BLOCK_SIZE * 2],</div><div class='del'>-			 uint32_t total_len)</div><div class='add'>+			 uint64_t total_len)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t i = total_len &amp; (SHA512_BLOCK_SIZE - 1);</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +221,7 @@ static struct sha512_hash_ctx *sha512_ctx_mgr_resubmit</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sha512_hash_ctx</div><div class='del'>-		*sha512_ctx_mgr_get_comp_ctx(struct sha512_ctx_mgr *mgr)</div><div class='add'>+		*sha512_ctx_mgr_get_comp_ctx(struct mcryptd_alg_cstate *cstate)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If get_comp_job returns NULL, there are no jobs complete.</div><div class='hunk'>@@ -233,11 +233,17 @@ static struct sha512_hash_ctx</div><div class='ctx'> 	 * Otherwise, all jobs currently being managed by the hash_ctx_mgr</div><div class='ctx'> 	 * still need processing.</div><div class='ctx'> 	 */</div><div class='add'>+	struct sha512_ctx_mgr *mgr;</div><div class='ctx'> 	struct sha512_hash_ctx *ctx;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	mgr = cstate-&gt;mgr;</div><div class='add'>+	spin_lock_irqsave(&amp;cstate-&gt;work_lock, flags);</div><div class='ctx'> 	ctx = (struct sha512_hash_ctx *)</div><div class='ctx'> 				sha512_job_mgr_get_comp_job(&amp;mgr-&gt;mgr);</div><div class='del'>-	return sha512_ctx_mgr_resubmit(mgr, ctx);</div><div class='add'>+	ctx = sha512_ctx_mgr_resubmit(mgr, ctx);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cstate-&gt;work_lock, flags);</div><div class='add'>+	return ctx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sha512_ctx_mgr_init(struct sha512_ctx_mgr *mgr)</div><div class='hunk'>@@ -246,12 +252,17 @@ static void sha512_ctx_mgr_init(struct sha512_ctx_mgr *mgr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sha512_hash_ctx</div><div class='del'>-			*sha512_ctx_mgr_submit(struct sha512_ctx_mgr *mgr,</div><div class='add'>+			*sha512_ctx_mgr_submit(struct mcryptd_alg_cstate *cstate,</div><div class='ctx'> 					  struct sha512_hash_ctx *ctx,</div><div class='ctx'> 					  const void *buffer,</div><div class='ctx'> 					  uint32_t len,</div><div class='ctx'> 					  int flags)</div><div class='ctx'> {</div><div class='add'>+	struct sha512_ctx_mgr *mgr;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+</div><div class='add'>+	mgr = cstate-&gt;mgr;</div><div class='add'>+	spin_lock_irqsave(&amp;cstate-&gt;work_lock, irqflags);</div><div class='ctx'> 	if (flags &amp; (~HASH_ENTIRE)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * User should not pass anything other than FIRST, UPDATE, or</div><div class='hunk'>@@ -351,20 +362,26 @@ static struct sha512_hash_ctx</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return sha512_ctx_mgr_resubmit(mgr, ctx);</div><div class='add'>+	ctx = sha512_ctx_mgr_resubmit(mgr, ctx);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cstate-&gt;work_lock, irqflags);</div><div class='add'>+	return ctx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sha512_hash_ctx *sha512_ctx_mgr_flush(struct sha512_ctx_mgr *mgr)</div><div class='add'>+static struct sha512_hash_ctx *sha512_ctx_mgr_flush(struct mcryptd_alg_cstate *cstate)</div><div class='ctx'> {</div><div class='add'>+	struct sha512_ctx_mgr *mgr;</div><div class='ctx'> 	struct sha512_hash_ctx *ctx;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	mgr = cstate-&gt;mgr;</div><div class='add'>+	spin_lock_irqsave(&amp;cstate-&gt;work_lock, flags);</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		ctx = (struct sha512_hash_ctx *)</div><div class='ctx'> 					sha512_job_mgr_flush(&amp;mgr-&gt;mgr);</div><div class='ctx'> </div><div class='ctx'> 		/* If flush returned 0, there are no more jobs in flight. */</div><div class='ctx'> 		if (!ctx)</div><div class='del'>-			return NULL;</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If flush returned a job, resubmit the job to finish</div><div class='hunk'>@@ -378,8 +395,10 @@ static struct sha512_hash_ctx *sha512_ctx_mgr_flush(struct sha512_ctx_mgr *mgr)</div><div class='ctx'> 		 * the sha512_ctx_mgr still need processing. Loop.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (ctx)</div><div class='del'>-			return ctx;</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;cstate-&gt;work_lock, flags);</div><div class='add'>+	return ctx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sha512_mb_init(struct ahash_request *areq)</div><div class='hunk'>@@ -439,11 +458,11 @@ static int sha_finish_walk(struct mcryptd_hash_request_ctx **ret_rctx,</div><div class='ctx'> 		sha_ctx = (struct sha512_hash_ctx *)</div><div class='ctx'> 						ahash_request_ctx(&amp;rctx-&gt;areq);</div><div class='ctx'> 		kernel_fpu_begin();</div><div class='del'>-		sha_ctx = sha512_ctx_mgr_submit(cstate-&gt;mgr, sha_ctx,</div><div class='add'>+		sha_ctx = sha512_ctx_mgr_submit(cstate, sha_ctx,</div><div class='ctx'> 						rctx-&gt;walk.data, nbytes, flag);</div><div class='ctx'> 		if (!sha_ctx) {</div><div class='ctx'> 			if (flush)</div><div class='del'>-				sha_ctx = sha512_ctx_mgr_flush(cstate-&gt;mgr);</div><div class='add'>+				sha_ctx = sha512_ctx_mgr_flush(cstate);</div><div class='ctx'> 		}</div><div class='ctx'> 		kernel_fpu_end();</div><div class='ctx'> 		if (sha_ctx)</div><div class='hunk'>@@ -471,11 +490,12 @@ static int sha_complete_job(struct mcryptd_hash_request_ctx *rctx,</div><div class='ctx'> 	struct sha512_hash_ctx *sha_ctx;</div><div class='ctx'> 	struct mcryptd_hash_request_ctx *req_ctx;</div><div class='ctx'> 	int ret;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* remove from work list */</div><div class='del'>-	spin_lock(&amp;cstate-&gt;work_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;cstate-&gt;work_lock, flags);</div><div class='ctx'> 	list_del(&amp;rctx-&gt;waiter);</div><div class='del'>-	spin_unlock(&amp;cstate-&gt;work_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cstate-&gt;work_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (irqs_disabled())</div><div class='ctx'> 		rctx-&gt;complete(&amp;req-&gt;base, err);</div><div class='hunk'>@@ -486,14 +506,14 @@ static int sha_complete_job(struct mcryptd_hash_request_ctx *rctx,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check to see if there are other jobs that are done */</div><div class='del'>-	sha_ctx = sha512_ctx_mgr_get_comp_ctx(cstate-&gt;mgr);</div><div class='add'>+	sha_ctx = sha512_ctx_mgr_get_comp_ctx(cstate);</div><div class='ctx'> 	while (sha_ctx) {</div><div class='ctx'> 		req_ctx = cast_hash_to_mcryptd_ctx(sha_ctx);</div><div class='ctx'> 		ret = sha_finish_walk(&amp;req_ctx, cstate, false);</div><div class='ctx'> 		if (req_ctx) {</div><div class='del'>-			spin_lock(&amp;cstate-&gt;work_lock);</div><div class='add'>+			spin_lock_irqsave(&amp;cstate-&gt;work_lock, flags);</div><div class='ctx'> 			list_del(&amp;req_ctx-&gt;waiter);</div><div class='del'>-			spin_unlock(&amp;cstate-&gt;work_lock);</div><div class='add'>+			spin_unlock_irqrestore(&amp;cstate-&gt;work_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 			req = cast_mcryptd_ctx_to_req(req_ctx);</div><div class='ctx'> 			if (irqs_disabled())</div><div class='hunk'>@@ -504,7 +524,7 @@ static int sha_complete_job(struct mcryptd_hash_request_ctx *rctx,</div><div class='ctx'> 				local_bh_enable();</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		sha_ctx = sha512_ctx_mgr_get_comp_ctx(cstate-&gt;mgr);</div><div class='add'>+		sha_ctx = sha512_ctx_mgr_get_comp_ctx(cstate);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -515,6 +535,7 @@ static void sha512_mb_add_list(struct mcryptd_hash_request_ctx *rctx,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long next_flush;</div><div class='ctx'> 	unsigned long delay = usecs_to_jiffies(FLUSH_INTERVAL);</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* initialize tag */</div><div class='ctx'> 	rctx-&gt;tag.arrival = jiffies;    /* tag the arrival time */</div><div class='hunk'>@@ -522,9 +543,9 @@ static void sha512_mb_add_list(struct mcryptd_hash_request_ctx *rctx,</div><div class='ctx'> 	next_flush = rctx-&gt;tag.arrival + delay;</div><div class='ctx'> 	rctx-&gt;tag.expire = next_flush;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cstate-&gt;work_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;cstate-&gt;work_lock, flags);</div><div class='ctx'> 	list_add_tail(&amp;rctx-&gt;waiter, &amp;cstate-&gt;work_list);</div><div class='del'>-	spin_unlock(&amp;cstate-&gt;work_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;cstate-&gt;work_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	mcryptd_arm_flusher(cstate, delay);</div><div class='ctx'> }</div><div class='hunk'>@@ -565,7 +586,7 @@ static int sha512_mb_update(struct ahash_request *areq)</div><div class='ctx'> 	sha_ctx = (struct sha512_hash_ctx *) ahash_request_ctx(areq);</div><div class='ctx'> 	sha512_mb_add_list(rctx, cstate);</div><div class='ctx'> 	kernel_fpu_begin();</div><div class='del'>-	sha_ctx = sha512_ctx_mgr_submit(cstate-&gt;mgr, sha_ctx, rctx-&gt;walk.data,</div><div class='add'>+	sha_ctx = sha512_ctx_mgr_submit(cstate, sha_ctx, rctx-&gt;walk.data,</div><div class='ctx'> 							nbytes, HASH_UPDATE);</div><div class='ctx'> 	kernel_fpu_end();</div><div class='ctx'> </div><div class='hunk'>@@ -628,7 +649,7 @@ static int sha512_mb_finup(struct ahash_request *areq)</div><div class='ctx'> 	sha512_mb_add_list(rctx, cstate);</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_begin();</div><div class='del'>-	sha_ctx = sha512_ctx_mgr_submit(cstate-&gt;mgr, sha_ctx, rctx-&gt;walk.data,</div><div class='add'>+	sha_ctx = sha512_ctx_mgr_submit(cstate, sha_ctx, rctx-&gt;walk.data,</div><div class='ctx'> 								nbytes, flag);</div><div class='ctx'> 	kernel_fpu_end();</div><div class='ctx'> </div><div class='hunk'>@@ -677,8 +698,7 @@ static int sha512_mb_final(struct ahash_request *areq)</div><div class='ctx'> 	/* flag HASH_FINAL and 0 data size */</div><div class='ctx'> 	sha512_mb_add_list(rctx, cstate);</div><div class='ctx'> 	kernel_fpu_begin();</div><div class='del'>-	sha_ctx = sha512_ctx_mgr_submit(cstate-&gt;mgr, sha_ctx, &amp;data, 0,</div><div class='del'>-								HASH_LAST);</div><div class='add'>+	sha_ctx = sha512_ctx_mgr_submit(cstate, sha_ctx, &amp;data, 0, HASH_LAST);</div><div class='ctx'> 	kernel_fpu_end();</div><div class='ctx'> </div><div class='ctx'> 	/* check if anything is returned */</div><div class='hunk'>@@ -940,7 +960,7 @@ static unsigned long sha512_mb_flusher(struct mcryptd_alg_cstate *cstate)</div><div class='ctx'> 			break;</div><div class='ctx'> 		kernel_fpu_begin();</div><div class='ctx'> 		sha_ctx = (struct sha512_hash_ctx *)</div><div class='del'>-					sha512_ctx_mgr_flush(cstate-&gt;mgr);</div><div class='add'>+					sha512_ctx_mgr_flush(cstate);</div><div class='ctx'> 		kernel_fpu_end();</div><div class='ctx'> 		if (!sha_ctx) {</div><div class='ctx'> 			pr_err("sha512_mb error: nothing got flushed for"</div><div class='head'>diff --git a/arch/x86/crypto/sha512-mb/sha512_mb_ctx.h b/arch/x86/crypto/sha512-mb/sha512_mb_ctx.h<br/>index 9d4b2c8208d5..e4653f5eec3f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha512-mb/sha512_mb_ctx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha512-mb/sha512_mb_ctx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha512-mb/sha512_mb_ctx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-mb/sha512_mb_ctx.h</a></div><div class='hunk'>@@ -119,7 +119,7 @@ struct sha512_hash_ctx {</div><div class='ctx'> 	/* error flag */</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	uint32_t        total_length;</div><div class='add'>+	uint64_t        total_length;</div><div class='ctx'> 	const void      *incoming_buffer;</div><div class='ctx'> 	uint32_t        incoming_buffer_length;</div><div class='ctx'> 	uint8_t         partial_block_buffer[SHA512_BLOCK_SIZE * 2];</div><div class='head'>diff --git a/arch/x86/crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S b/arch/x86/crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S<br/>index 3ddba19a0db6..7c629caebc05 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S</a></div><div class='hunk'>@@ -280,12 +280,18 @@ ENTRY(sha512_mb_mgr_get_comp_job_avx2)</div><div class='ctx'> 	pop     %rbx</div><div class='ctx'>         ret</div><div class='ctx'> ENDPROC(sha512_mb_mgr_get_comp_job_avx2)</div><div class='del'>-.data</div><div class='ctx'> </div><div class='del'>-.align 16</div><div class='add'>+.section	.rodata.cst8.one, "aM", @progbits, 8</div><div class='add'>+.align 8</div><div class='ctx'> one:</div><div class='ctx'> .quad  1</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst8.two, "aM", @progbits, 8</div><div class='add'>+.align 8</div><div class='ctx'> two:</div><div class='ctx'> .quad  2</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst8.three, "aM", @progbits, 8</div><div class='add'>+.align 8</div><div class='ctx'> three:</div><div class='ctx'> .quad  3</div><div class='head'>diff --git a/arch/x86/crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S b/arch/x86/crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S<br/>index 815f07bdd1f8..4ba709ba78e5 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S</a></div><div class='hunk'>@@ -209,8 +209,9 @@ return_null:</div><div class='ctx'> 	xor     job_rax, job_rax</div><div class='ctx'> 	jmp     return</div><div class='ctx'> ENDPROC(sha512_mb_mgr_submit_avx2)</div><div class='del'>-.data</div><div class='ctx'> </div><div class='add'>+/* UNUSED?</div><div class='add'>+.section	.rodata.cst16, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='ctx'> H0:     .int  0x6a09e667</div><div class='ctx'> H1:     .int  0xbb67ae85</div><div class='hunk'>@@ -220,3 +221,4 @@ H4:     .int  0x510e527f</div><div class='ctx'> H5:     .int  0x9b05688c</div><div class='ctx'> H6:     .int  0x1f83d9ab</div><div class='ctx'> H7:     .int  0x5be0cd19</div><div class='add'>+*/</div><div class='head'>diff --git a/arch/x86/crypto/sha512-mb/sha512_x4_avx2.S b/arch/x86/crypto/sha512-mb/sha512_x4_avx2.S<br/>index 31ab1eff6413..e22e907643a6 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha512-mb/sha512_x4_avx2.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha512-mb/sha512_x4_avx2.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha512-mb/sha512_x4_avx2.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-mb/sha512_x4_avx2.S</a></div><div class='hunk'>@@ -361,7 +361,7 @@ Lrounds_16_xx:</div><div class='ctx'> 	ret</div><div class='ctx'> ENDPROC(sha512_x4_avx2)</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.K512_4, "a", @progbits</div><div class='ctx'> .align 64</div><div class='ctx'> K512_4:</div><div class='ctx'> 	.octa 0x428a2f98d728ae22428a2f98d728ae22,\</div><div class='hunk'>@@ -525,5 +525,7 @@ K512_4:</div><div class='ctx'> 	.octa 0x6c44198c4a4758176c44198c4a475817,\</div><div class='ctx'> 		0x6c44198c4a4758176c44198c4a475817</div><div class='ctx'> </div><div class='add'>+.section	.rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 32</div><div class='add'>+.align 32</div><div class='ctx'> PSHUFFLE_BYTE_FLIP_MASK: .octa 0x08090a0b0c0d0e0f0001020304050607</div><div class='ctx'>                          .octa 0x18191a1b1c1d1e1f1011121314151617</div><div class='head'>diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S<br/>index e610e29cbc81..66bbd9058a90 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/sha512-ssse3-asm.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/sha512-ssse3-asm.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/sha512-ssse3-asm.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/sha512-ssse3-asm.S</a></div><div class='hunk'>@@ -369,14 +369,17 @@ ENDPROC(sha512_transform_ssse3)</div><div class='ctx'> ########################################################################</div><div class='ctx'> ### Binary Data</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-</div><div class='add'>+.section	.rodata.cst16.XMM_QWORD_BSWAP, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='del'>-</div><div class='ctx'> # Mask for byte-swapping a couple of qwords in an XMM register using (v)pshufb.</div><div class='ctx'> XMM_QWORD_BSWAP:</div><div class='ctx'> 	.octa 0x08090a0b0c0d0e0f0001020304050607</div><div class='ctx'> </div><div class='add'>+# Mergeable 640-byte rodata section. This allows linker to merge the table</div><div class='add'>+# with other, exactly the same 640-byte fragment of another rodata section</div><div class='add'>+# (if such section exists).</div><div class='add'>+.section	.rodata.cst640.K512, "aM", @progbits, 640</div><div class='add'>+.align 64</div><div class='ctx'> # K[t] used in SHA512 hashing</div><div class='ctx'> K512:</div><div class='ctx'> 	.quad 0x428a2f98d728ae22,0x7137449123ef65cd</div><div class='head'>diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S<br/>index dc66273e610d..b3f49d286348 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/crypto/twofish-avx-x86_64-asm_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/crypto/twofish-avx-x86_64-asm_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/crypto/twofish-avx-x86_64-asm_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/crypto/twofish-avx-x86_64-asm_64.S</a></div><div class='hunk'>@@ -29,11 +29,13 @@</div><div class='ctx'> </div><div class='ctx'> .file "twofish-avx-x86_64-asm_64.S"</div><div class='ctx'> </div><div class='del'>-.data</div><div class='add'>+.section	.rodata.cst16.bswap128_mask, "aM", @progbits, 16</div><div class='ctx'> .align 16</div><div class='del'>-</div><div class='ctx'> .Lbswap128_mask:</div><div class='ctx'> 	.byte 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0</div><div class='add'>+</div><div class='add'>+.section	.rodata.cst16.xts_gf128mul_and_shl1_mask, "aM", @progbits, 16</div><div class='add'>+.align 16</div><div class='ctx'> .Lxts_gf128mul_and_shl1_mask:</div><div class='ctx'> 	.byte 0x87, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/entry/calling.h b/arch/x86/entry/calling.h<br/>index 9a9e5884066c..05ed3d393da7 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/entry/calling.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/entry/calling.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/entry/calling.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/calling.h</a></div><div class='hunk'>@@ -90,8 +90,8 @@ For 32-bit we have the following conventions - kernel is built with</div><div class='ctx'> </div><div class='ctx'> #define SIZEOF_PTREGS	21*8</div><div class='ctx'> </div><div class='del'>-	.macro ALLOC_PT_GPREGS_ON_STACK addskip=0</div><div class='del'>-	addq	$-(15*8+\addskip), %rsp</div><div class='add'>+	.macro ALLOC_PT_GPREGS_ON_STACK</div><div class='add'>+	addq	$-(15*8), %rsp</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro SAVE_C_REGS_HELPER offset=0 rax=1 rcx=1 r8910=1 r11=1</div><div class='hunk'>@@ -147,15 +147,6 @@ For 32-bit we have the following conventions - kernel is built with</div><div class='ctx'> 	movq 5*8+\offset(%rsp), %rbx</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro ZERO_EXTRA_REGS</div><div class='del'>-	xorl	%r15d, %r15d</div><div class='del'>-	xorl	%r14d, %r14d</div><div class='del'>-	xorl	%r13d, %r13d</div><div class='del'>-	xorl	%r12d, %r12d</div><div class='del'>-	xorl	%ebp, %ebp</div><div class='del'>-	xorl	%ebx, %ebx</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> 	.macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1</div><div class='ctx'> 	.if \rstor_r11</div><div class='ctx'> 	movq 6*8(%rsp), %r11</div><div class='hunk'>@@ -201,6 +192,26 @@ For 32-bit we have the following conventions - kernel is built with</div><div class='ctx'> 	.byte 0xf1</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This is a sneaky trick to help the unwinder find pt_regs on the stack.  The</div><div class='add'>+ * frame pointer is replaced with an encoded pointer to pt_regs.  The encoding</div><div class='add'>+ * is just setting the LSB, which makes it an invalid stack address and is also</div><div class='add'>+ * a signal to the unwinder that it's a pt_regs pointer in disguise.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: This macro must be used *after* SAVE_EXTRA_REGS because it corrupts</div><div class='add'>+ * the original rbp.</div><div class='add'>+ */</div><div class='add'>+.macro ENCODE_FRAME_POINTER ptregs_offset=0</div><div class='add'>+#ifdef CONFIG_FRAME_POINTER</div><div class='add'>+	.if \ptregs_offset</div><div class='add'>+		leaq \ptregs_offset(%rsp), %rbp</div><div class='add'>+	.else</div><div class='add'>+		mov %rsp, %rbp</div><div class='add'>+	.endif</div><div class='add'>+	orq	$0x1, %rbp</div><div class='add'>+#endif</div><div class='add'>+.endm</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_X86_64 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c<br/>index bdd9cc59d20f..370c42c7f046 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/entry/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/entry/common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/entry/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/common.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -25,7 +26,7 @@</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='head'>diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S<br/>index 21b352a11b49..57f7ec35216e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/entry/entry_32.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/entry/entry_32.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/entry/entry_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/entry_32.S</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/smap.h&gt;</div><div class='ctx'> #include &lt;asm/export.h&gt;</div><div class='add'>+#include &lt;asm/frame.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.section .entry.text, "ax"</div><div class='ctx'> </div><div class='hunk'>@@ -175,6 +176,22 @@</div><div class='ctx'> 	SET_KERNEL_GS %edx</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This is a sneaky trick to help the unwinder find pt_regs on the stack.  The</div><div class='add'>+ * frame pointer is replaced with an encoded pointer to pt_regs.  The encoding</div><div class='add'>+ * is just setting the LSB, which makes it an invalid stack address and is also</div><div class='add'>+ * a signal to the unwinder that it's a pt_regs pointer in disguise.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: This macro must be used *after* SAVE_ALL because it corrupts the</div><div class='add'>+ * original rbp.</div><div class='add'>+ */</div><div class='add'>+.macro ENCODE_FRAME_POINTER</div><div class='add'>+#ifdef CONFIG_FRAME_POINTER</div><div class='add'>+	mov %esp, %ebp</div><div class='add'>+	orl $0x1, %ebp</div><div class='add'>+#endif</div><div class='add'>+.endm</div><div class='add'>+</div><div class='ctx'> .macro RESTORE_INT_REGS</div><div class='ctx'> 	popl	%ebx</div><div class='ctx'> 	popl	%ecx</div><div class='hunk'>@@ -245,6 +262,12 @@ END(__switch_to_asm)</div><div class='ctx'>  * edi: kernel thread arg</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(ret_from_fork)</div><div class='add'>+	FRAME_BEGIN		/* help unwinder find end of stack */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * schedule_tail() is asmlinkage so we have to put its 'prev' argument</div><div class='add'>+	 * on the stack.</div><div class='add'>+	 */</div><div class='ctx'> 	pushl	%eax</div><div class='ctx'> 	call	schedule_tail</div><div class='ctx'> 	popl	%eax</div><div class='hunk'>@@ -254,8 +277,9 @@ ENTRY(ret_from_fork)</div><div class='ctx'> </div><div class='ctx'> 2:</div><div class='ctx'> 	/* When we fork, we trace the syscall return in the child, too. */</div><div class='del'>-	movl    %esp, %eax</div><div class='add'>+	leal	FRAME_OFFSET(%esp), %eax</div><div class='ctx'> 	call    syscall_return_slowpath</div><div class='add'>+	FRAME_END</div><div class='ctx'> 	jmp     restore_all</div><div class='ctx'> </div><div class='ctx'> 	/* kernel thread */</div><div class='hunk'>@@ -307,13 +331,13 @@ END(ret_from_exception)</div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='ctx'> ENTRY(resume_kernel)</div><div class='ctx'> 	DISABLE_INTERRUPTS(CLBR_ANY)</div><div class='del'>-need_resched:</div><div class='add'>+.Lneed_resched:</div><div class='ctx'> 	cmpl	$0, PER_CPU_VAR(__preempt_count)</div><div class='ctx'> 	jnz	restore_all</div><div class='ctx'> 	testl	$X86_EFLAGS_IF, PT_EFLAGS(%esp)	# interrupts off (exception path) ?</div><div class='ctx'> 	jz	restore_all</div><div class='ctx'> 	call	preempt_schedule_irq</div><div class='del'>-	jmp	need_resched</div><div class='add'>+	jmp	.Lneed_resched</div><div class='ctx'> END(resume_kernel)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -334,7 +358,7 @@ GLOBAL(__begin_SYSENTER_singlestep_region)</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(xen_sysenter_target)</div><div class='ctx'> 	addl	$5*4, %esp			/* remove xen-provided frame */</div><div class='del'>-	jmp	sysenter_past_esp</div><div class='add'>+	jmp	.Lsysenter_past_esp</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -371,7 +395,7 @@ ENTRY(xen_sysenter_target)</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(entry_SYSENTER_32)</div><div class='ctx'> 	movl	TSS_sysenter_sp0(%esp), %esp</div><div class='del'>-sysenter_past_esp:</div><div class='add'>+.Lsysenter_past_esp:</div><div class='ctx'> 	pushl	$__USER_DS		/* pt_regs-&gt;ss */</div><div class='ctx'> 	pushl	%ebp			/* pt_regs-&gt;sp (stashed in bp) */</div><div class='ctx'> 	pushfl				/* pt_regs-&gt;flags (except IF = 0) */</div><div class='hunk'>@@ -504,9 +528,9 @@ ENTRY(entry_INT80_32)</div><div class='ctx'> </div><div class='ctx'> restore_all:</div><div class='ctx'> 	TRACE_IRQS_IRET</div><div class='del'>-restore_all_notrace:</div><div class='add'>+.Lrestore_all_notrace:</div><div class='ctx'> #ifdef CONFIG_X86_ESPFIX32</div><div class='del'>-	ALTERNATIVE	"jmp restore_nocheck", "", X86_BUG_ESPFIX</div><div class='add'>+	ALTERNATIVE	"jmp .Lrestore_nocheck", "", X86_BUG_ESPFIX</div><div class='ctx'> </div><div class='ctx'> 	movl	PT_EFLAGS(%esp), %eax		# mix EFLAGS, SS and CS</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -518,22 +542,23 @@ restore_all_notrace:</div><div class='ctx'> 	movb	PT_CS(%esp), %al</div><div class='ctx'> 	andl	$(X86_EFLAGS_VM | (SEGMENT_TI_MASK &lt;&lt; 8) | SEGMENT_RPL_MASK), %eax</div><div class='ctx'> 	cmpl	$((SEGMENT_LDT &lt;&lt; 8) | USER_RPL), %eax</div><div class='del'>-	je ldt_ss				# returning to user-space with LDT SS</div><div class='add'>+	je .Lldt_ss				# returning to user-space with LDT SS</div><div class='ctx'> #endif</div><div class='del'>-restore_nocheck:</div><div class='add'>+.Lrestore_nocheck:</div><div class='ctx'> 	RESTORE_REGS 4				# skip orig_eax/error_code</div><div class='del'>-irq_return:</div><div class='add'>+.Lirq_return:</div><div class='ctx'> 	INTERRUPT_RETURN</div><div class='add'>+</div><div class='ctx'> .section .fixup, "ax"</div><div class='ctx'> ENTRY(iret_exc	)</div><div class='ctx'> 	pushl	$0				# no error code</div><div class='ctx'> 	pushl	$do_iret_error</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> .previous</div><div class='del'>-	_ASM_EXTABLE(irq_return, iret_exc)</div><div class='add'>+	_ASM_EXTABLE(.Lirq_return, iret_exc)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_ESPFIX32</div><div class='del'>-ldt_ss:</div><div class='add'>+.Lldt_ss:</div><div class='ctx'> /*</div><div class='ctx'>  * Setup and switch to ESPFIX stack</div><div class='ctx'>  *</div><div class='hunk'>@@ -562,7 +587,7 @@ ldt_ss:</div><div class='ctx'> 	 */</div><div class='ctx'> 	DISABLE_INTERRUPTS(CLBR_EAX)</div><div class='ctx'> 	lss	(%esp), %esp			/* switch to espfix segment */</div><div class='del'>-	jmp	restore_nocheck</div><div class='add'>+	jmp	.Lrestore_nocheck</div><div class='ctx'> #endif</div><div class='ctx'> ENDPROC(entry_INT80_32)</div><div class='ctx'> </div><div class='hunk'>@@ -624,6 +649,7 @@ common_interrupt:</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	addl	$-0x80, (%esp)			/* Adjust vector into the [-256, -1] range */</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	ENCODE_FRAME_POINTER</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	movl	%esp, %eax</div><div class='ctx'> 	call	do_IRQ</div><div class='hunk'>@@ -635,6 +661,7 @@ ENTRY(name)				\</div><div class='ctx'> 	ASM_CLAC;			\</div><div class='ctx'> 	pushl	$~(nr);			\</div><div class='ctx'> 	SAVE_ALL;			\</div><div class='add'>+	ENCODE_FRAME_POINTER;		\</div><div class='ctx'> 	TRACE_IRQS_OFF			\</div><div class='ctx'> 	movl	%esp, %eax;		\</div><div class='ctx'> 	call	fn;			\</div><div class='hunk'>@@ -659,7 +686,7 @@ ENTRY(coprocessor_error)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$0</div><div class='ctx'> 	pushl	$do_coprocessor_error</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(coprocessor_error)</div><div class='ctx'> </div><div class='ctx'> ENTRY(simd_coprocessor_error)</div><div class='hunk'>@@ -673,14 +700,14 @@ ENTRY(simd_coprocessor_error)</div><div class='ctx'> #else</div><div class='ctx'> 	pushl	$do_simd_coprocessor_error</div><div class='ctx'> #endif</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(simd_coprocessor_error)</div><div class='ctx'> </div><div class='ctx'> ENTRY(device_not_available)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$-1				# mark this as an int</div><div class='ctx'> 	pushl	$do_device_not_available</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(device_not_available)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PARAVIRT</div><div class='hunk'>@@ -694,59 +721,59 @@ ENTRY(overflow)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$0</div><div class='ctx'> 	pushl	$do_overflow</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(overflow)</div><div class='ctx'> </div><div class='ctx'> ENTRY(bounds)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$0</div><div class='ctx'> 	pushl	$do_bounds</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(bounds)</div><div class='ctx'> </div><div class='ctx'> ENTRY(invalid_op)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$0</div><div class='ctx'> 	pushl	$do_invalid_op</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(invalid_op)</div><div class='ctx'> </div><div class='ctx'> ENTRY(coprocessor_segment_overrun)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$0</div><div class='ctx'> 	pushl	$do_coprocessor_segment_overrun</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(coprocessor_segment_overrun)</div><div class='ctx'> </div><div class='ctx'> ENTRY(invalid_TSS)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$do_invalid_TSS</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(invalid_TSS)</div><div class='ctx'> </div><div class='ctx'> ENTRY(segment_not_present)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$do_segment_not_present</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(segment_not_present)</div><div class='ctx'> </div><div class='ctx'> ENTRY(stack_segment)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$do_stack_segment</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(stack_segment)</div><div class='ctx'> </div><div class='ctx'> ENTRY(alignment_check)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$do_alignment_check</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(alignment_check)</div><div class='ctx'> </div><div class='ctx'> ENTRY(divide_error)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$0				# no error code</div><div class='ctx'> 	pushl	$do_divide_error</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(divide_error)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_MCE</div><div class='hunk'>@@ -754,7 +781,7 @@ ENTRY(machine_check)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$0</div><div class='ctx'> 	pushl	machine_check_vector</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(machine_check)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -762,13 +789,14 @@ ENTRY(spurious_interrupt_bug)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$0</div><div class='ctx'> 	pushl	$do_spurious_interrupt_bug</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(spurious_interrupt_bug)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XEN</div><div class='ctx'> ENTRY(xen_hypervisor_callback)</div><div class='ctx'> 	pushl	$-1				/* orig_ax = -1 =&gt; not a system call */</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	ENCODE_FRAME_POINTER</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -823,6 +851,7 @@ ENTRY(xen_failsafe_callback)</div><div class='ctx'> 	jmp	iret_exc</div><div class='ctx'> 5:	pushl	$-1				/* orig_ax = -1 =&gt; not a system call */</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	ENCODE_FRAME_POINTER</div><div class='ctx'> 	jmp	ret_from_exception</div><div class='ctx'> </div><div class='ctx'> .section .fixup, "ax"</div><div class='hunk'>@@ -882,15 +911,15 @@ ftrace_call:</div><div class='ctx'> 	popl	%edx</div><div class='ctx'> 	popl	%ecx</div><div class='ctx'> 	popl	%eax</div><div class='del'>-ftrace_ret:</div><div class='add'>+.Lftrace_ret:</div><div class='ctx'> #ifdef CONFIG_FUNCTION_GRAPH_TRACER</div><div class='ctx'> .globl ftrace_graph_call</div><div class='ctx'> ftrace_graph_call:</div><div class='ctx'> 	jmp	ftrace_stub</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-.globl ftrace_stub</div><div class='del'>-ftrace_stub:</div><div class='add'>+/* This is weak to keep gas from relaxing the jumps */</div><div class='add'>+WEAK(ftrace_stub)</div><div class='ctx'> 	ret</div><div class='ctx'> END(ftrace_caller)</div><div class='ctx'> </div><div class='hunk'>@@ -952,7 +981,7 @@ GLOBAL(ftrace_regs_call)</div><div class='ctx'> 	popl	%gs</div><div class='ctx'> 	addl	$8, %esp			/* Skip orig_ax and ip */</div><div class='ctx'> 	popf					/* Pop flags at end (no addl to corrupt flags) */</div><div class='del'>-	jmp	ftrace_ret</div><div class='add'>+	jmp	.Lftrace_ret</div><div class='ctx'> </div><div class='ctx'> 	popf</div><div class='ctx'> 	jmp	ftrace_stub</div><div class='hunk'>@@ -963,7 +992,7 @@ ENTRY(mcount)</div><div class='ctx'> 	jb	ftrace_stub			/* Paging not enabled yet? */</div><div class='ctx'> </div><div class='ctx'> 	cmpl	$ftrace_stub, ftrace_trace_function</div><div class='del'>-	jnz	trace</div><div class='add'>+	jnz	.Ltrace</div><div class='ctx'> #ifdef CONFIG_FUNCTION_GRAPH_TRACER</div><div class='ctx'> 	cmpl	$ftrace_stub, ftrace_graph_return</div><div class='ctx'> 	jnz	ftrace_graph_caller</div><div class='hunk'>@@ -976,7 +1005,7 @@ ftrace_stub:</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> 	/* taken from glibc */</div><div class='del'>-trace:</div><div class='add'>+.Ltrace:</div><div class='ctx'> 	pushl	%eax</div><div class='ctx'> 	pushl	%ecx</div><div class='ctx'> 	pushl	%edx</div><div class='hunk'>@@ -1027,7 +1056,7 @@ return_to_handler:</div><div class='ctx'> ENTRY(trace_page_fault)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$trace_do_page_fault</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(trace_page_fault)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1035,7 +1064,10 @@ ENTRY(page_fault)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$do_page_fault</div><div class='ctx'> 	ALIGN</div><div class='del'>-error_code:</div><div class='add'>+	jmp common_exception</div><div class='add'>+END(page_fault)</div><div class='add'>+</div><div class='add'>+common_exception:</div><div class='ctx'> 	/* the function address is in %gs's slot on the stack */</div><div class='ctx'> 	pushl	%fs</div><div class='ctx'> 	pushl	%es</div><div class='hunk'>@@ -1047,6 +1079,7 @@ error_code:</div><div class='ctx'> 	pushl	%edx</div><div class='ctx'> 	pushl	%ecx</div><div class='ctx'> 	pushl	%ebx</div><div class='add'>+	ENCODE_FRAME_POINTER</div><div class='ctx'> 	cld</div><div class='ctx'> 	movl	$(__KERNEL_PERCPU), %ecx</div><div class='ctx'> 	movl	%ecx, %fs</div><div class='hunk'>@@ -1064,7 +1097,7 @@ error_code:</div><div class='ctx'> 	movl	%esp, %eax			# pt_regs pointer</div><div class='ctx'> 	call	*%edi</div><div class='ctx'> 	jmp	ret_from_exception</div><div class='del'>-END(page_fault)</div><div class='add'>+END(common_exception)</div><div class='ctx'> </div><div class='ctx'> ENTRY(debug)</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1079,6 +1112,7 @@ ENTRY(debug)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$-1				# mark this as an int</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	ENCODE_FRAME_POINTER</div><div class='ctx'> 	xorl	%edx, %edx			# error code 0</div><div class='ctx'> 	movl	%esp, %eax			# pt_regs pointer</div><div class='ctx'> </div><div class='hunk'>@@ -1094,11 +1128,11 @@ ENTRY(debug)</div><div class='ctx'> </div><div class='ctx'> .Ldebug_from_sysenter_stack:</div><div class='ctx'> 	/* We're on the SYSENTER stack.  Switch off. */</div><div class='del'>-	movl	%esp, %ebp</div><div class='add'>+	movl	%esp, %ebx</div><div class='ctx'> 	movl	PER_CPU_VAR(cpu_current_top_of_stack), %esp</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	call	do_debug</div><div class='del'>-	movl	%ebp, %esp</div><div class='add'>+	movl	%ebx, %esp</div><div class='ctx'> 	jmp	ret_from_exception</div><div class='ctx'> END(debug)</div><div class='ctx'> </div><div class='hunk'>@@ -1116,11 +1150,12 @@ ENTRY(nmi)</div><div class='ctx'> 	movl	%ss, %eax</div><div class='ctx'> 	cmpw	$__ESPFIX_SS, %ax</div><div class='ctx'> 	popl	%eax</div><div class='del'>-	je	nmi_espfix_stack</div><div class='add'>+	je	.Lnmi_espfix_stack</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	pushl	%eax				# pt_regs-&gt;orig_ax</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	ENCODE_FRAME_POINTER</div><div class='ctx'> 	xorl	%edx, %edx			# zero error code</div><div class='ctx'> 	movl	%esp, %eax			# pt_regs pointer</div><div class='ctx'> </div><div class='hunk'>@@ -1132,21 +1167,21 @@ ENTRY(nmi)</div><div class='ctx'> </div><div class='ctx'> 	/* Not on SYSENTER stack. */</div><div class='ctx'> 	call	do_nmi</div><div class='del'>-	jmp	restore_all_notrace</div><div class='add'>+	jmp	.Lrestore_all_notrace</div><div class='ctx'> </div><div class='ctx'> .Lnmi_from_sysenter_stack:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We're on the SYSENTER stack.  Switch off.  No one (not even debug)</div><div class='ctx'> 	 * is using the thread stack right now, so it's safe for us to use it.</div><div class='ctx'> 	 */</div><div class='del'>-	movl	%esp, %ebp</div><div class='add'>+	movl	%esp, %ebx</div><div class='ctx'> 	movl	PER_CPU_VAR(cpu_current_top_of_stack), %esp</div><div class='ctx'> 	call	do_nmi</div><div class='del'>-	movl	%ebp, %esp</div><div class='del'>-	jmp	restore_all_notrace</div><div class='add'>+	movl	%ebx, %esp</div><div class='add'>+	jmp	.Lrestore_all_notrace</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_ESPFIX32</div><div class='del'>-nmi_espfix_stack:</div><div class='add'>+.Lnmi_espfix_stack:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * create the pointer to lss back</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1159,12 +1194,13 @@ nmi_espfix_stack:</div><div class='ctx'> 	.endr</div><div class='ctx'> 	pushl	%eax</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	ENCODE_FRAME_POINTER</div><div class='ctx'> 	FIXUP_ESPFIX_STACK			# %eax == %esp</div><div class='ctx'> 	xorl	%edx, %edx			# zero error code</div><div class='ctx'> 	call	do_nmi</div><div class='ctx'> 	RESTORE_REGS</div><div class='ctx'> 	lss	12+4(%esp), %esp		# back to espfix stack</div><div class='del'>-	jmp	irq_return</div><div class='add'>+	jmp	.Lirq_return</div><div class='ctx'> #endif</div><div class='ctx'> END(nmi)</div><div class='ctx'> </div><div class='hunk'>@@ -1172,6 +1208,7 @@ ENTRY(int3)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$-1				# mark this as an int</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	ENCODE_FRAME_POINTER</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	xorl	%edx, %edx			# zero error code</div><div class='ctx'> 	movl	%esp, %eax			# pt_regs pointer</div><div class='hunk'>@@ -1181,14 +1218,14 @@ END(int3)</div><div class='ctx'> </div><div class='ctx'> ENTRY(general_protection)</div><div class='ctx'> 	pushl	$do_general_protection</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(general_protection)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_GUEST</div><div class='ctx'> ENTRY(async_page_fault)</div><div class='ctx'> 	ASM_CLAC</div><div class='ctx'> 	pushl	$do_async_page_fault</div><div class='del'>-	jmp	error_code</div><div class='add'>+	jmp	common_exception</div><div class='ctx'> END(async_page_fault)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S<br/>index ef766a358b37..044d18ebc43c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/entry/entry_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/entry/entry_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/entry/entry_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/entry_64.S</a></div><div class='hunk'>@@ -36,14 +36,9 @@</div><div class='ctx'> #include &lt;asm/smap.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable_types.h&gt;</div><div class='ctx'> #include &lt;asm/export.h&gt;</div><div class='add'>+#include &lt;asm/frame.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Avoid __ASSEMBLER__'ifying &lt;linux/audit.h&gt; just for this.  */</div><div class='del'>-#include &lt;linux/elf-em.h&gt;</div><div class='del'>-#define AUDIT_ARCH_X86_64			(EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)</div><div class='del'>-#define __AUDIT_ARCH_64BIT			0x80000000</div><div class='del'>-#define __AUDIT_ARCH_LE				0x40000000</div><div class='del'>-</div><div class='ctx'> .code64</div><div class='ctx'> .section .entry.text, "ax"</div><div class='ctx'> </div><div class='hunk'>@@ -414,17 +409,19 @@ END(__switch_to_asm)</div><div class='ctx'>  * r12: kernel thread arg</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(ret_from_fork)</div><div class='add'>+	FRAME_BEGIN			/* help unwinder find end of stack */</div><div class='ctx'> 	movq	%rax, %rdi</div><div class='del'>-	call	schedule_tail			/* rdi: 'prev' task parameter */</div><div class='add'>+	call	schedule_tail		/* rdi: 'prev' task parameter */</div><div class='ctx'> </div><div class='del'>-	testq	%rbx, %rbx			/* from kernel_thread? */</div><div class='del'>-	jnz	1f				/* kernel threads are uncommon */</div><div class='add'>+	testq	%rbx, %rbx		/* from kernel_thread? */</div><div class='add'>+	jnz	1f			/* kernel threads are uncommon */</div><div class='ctx'> </div><div class='ctx'> 2:</div><div class='del'>-	movq	%rsp, %rdi</div><div class='add'>+	leaq	FRAME_OFFSET(%rsp),%rdi	/* pt_regs pointer */</div><div class='ctx'> 	call	syscall_return_slowpath	/* returns with IRQs disabled */</div><div class='ctx'> 	TRACE_IRQS_ON			/* user mode is traced as IRQS on */</div><div class='ctx'> 	SWAPGS</div><div class='add'>+	FRAME_END</div><div class='ctx'> 	jmp	restore_regs_and_iret</div><div class='ctx'> </div><div class='ctx'> 1:</div><div class='hunk'>@@ -469,6 +466,7 @@ END(irq_entries_start)</div><div class='ctx'> 	ALLOC_PT_GPREGS_ON_STACK</div><div class='ctx'> 	SAVE_C_REGS</div><div class='ctx'> 	SAVE_EXTRA_REGS</div><div class='add'>+	ENCODE_FRAME_POINTER</div><div class='ctx'> </div><div class='ctx'> 	testb	$3, CS(%rsp)</div><div class='ctx'> 	jz	1f</div><div class='hunk'>@@ -985,6 +983,7 @@ ENTRY(xen_failsafe_callback)</div><div class='ctx'> 	ALLOC_PT_GPREGS_ON_STACK</div><div class='ctx'> 	SAVE_C_REGS</div><div class='ctx'> 	SAVE_EXTRA_REGS</div><div class='add'>+	ENCODE_FRAME_POINTER</div><div class='ctx'> 	jmp	error_exit</div><div class='ctx'> END(xen_failsafe_callback)</div><div class='ctx'> </div><div class='hunk'>@@ -1028,6 +1027,7 @@ ENTRY(paranoid_entry)</div><div class='ctx'> 	cld</div><div class='ctx'> 	SAVE_C_REGS 8</div><div class='ctx'> 	SAVE_EXTRA_REGS 8</div><div class='add'>+	ENCODE_FRAME_POINTER 8</div><div class='ctx'> 	movl	$1, %ebx</div><div class='ctx'> 	movl	$MSR_GS_BASE, %ecx</div><div class='ctx'> 	rdmsr</div><div class='hunk'>@@ -1075,6 +1075,7 @@ ENTRY(error_entry)</div><div class='ctx'> 	cld</div><div class='ctx'> 	SAVE_C_REGS 8</div><div class='ctx'> 	SAVE_EXTRA_REGS 8</div><div class='add'>+	ENCODE_FRAME_POINTER 8</div><div class='ctx'> 	xorl	%ebx, %ebx</div><div class='ctx'> 	testb	$3, CS+8(%rsp)</div><div class='ctx'> 	jz	.Lerror_kernelspace</div><div class='hunk'>@@ -1257,6 +1258,7 @@ ENTRY(nmi)</div><div class='ctx'> 	pushq	%r13		/* pt_regs-&gt;r13 */</div><div class='ctx'> 	pushq	%r14		/* pt_regs-&gt;r14 */</div><div class='ctx'> 	pushq	%r15		/* pt_regs-&gt;r15 */</div><div class='add'>+	ENCODE_FRAME_POINTER</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * At this point we no longer need to worry about stack damage</div><div class='hunk'>@@ -1270,11 +1272,10 @@ ENTRY(nmi)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Return back to user mode.  We must *not* do the normal exit</div><div class='del'>-	 * work, because we don't want to enable interrupts.  Fortunately,</div><div class='del'>-	 * do_nmi doesn't modify pt_regs.</div><div class='add'>+	 * work, because we don't want to enable interrupts.</div><div class='ctx'> 	 */</div><div class='ctx'> 	SWAPGS</div><div class='del'>-	jmp	restore_c_regs_and_iret</div><div class='add'>+	jmp	restore_regs_and_iret</div><div class='ctx'> </div><div class='ctx'> .Lnmi_from_kernel:</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl<br/>index 2b3618542544..9ba050fe47f3 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/entry/syscalls/syscall_32.tbl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/entry/syscalls/syscall_32.tbl</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/entry/syscalls/syscall_32.tbl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/syscalls/syscall_32.tbl</a></div><div class='hunk'>@@ -389,3 +389,4 @@</div><div class='ctx'> 380	i386	pkey_mprotect		sys_pkey_mprotect</div><div class='ctx'> 381	i386	pkey_alloc		sys_pkey_alloc</div><div class='ctx'> 382	i386	pkey_free		sys_pkey_free</div><div class='add'>+383	i386	statx			sys_statx</div><div class='head'>diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl<br/>index e93ef0b38db8..5aef183e2f85 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/entry/syscalls/syscall_64.tbl?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/entry/syscalls/syscall_64.tbl</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/entry/syscalls/syscall_64.tbl?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/syscalls/syscall_64.tbl</a></div><div class='hunk'>@@ -338,6 +338,7 @@</div><div class='ctx'> 329	common	pkey_mprotect		sys_pkey_mprotect</div><div class='ctx'> 330	common	pkey_alloc		sys_pkey_alloc</div><div class='ctx'> 331	common	pkey_free		sys_pkey_free</div><div class='add'>+332	common	statx			sys_statx</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # x32-specific system call numbers start at 512 to avoid cache impact</div><div class='head'>diff --git a/arch/x86/entry/vdso/vclock_gettime.c b/arch/x86/entry/vdso/vclock_gettime.c<br/>index 02223cb4bcfd..9d4d6e138311 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/entry/vdso/vclock_gettime.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/entry/vdso/vclock_gettime.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/entry/vdso/vclock_gettime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/vdso/vclock_gettime.c</a></div><div class='hunk'>@@ -92,10 +92,10 @@ static notrace const struct pvclock_vsyscall_time_info *get_pvti0(void)</div><div class='ctx'> 	return (const struct pvclock_vsyscall_time_info *)&amp;pvclock_page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static notrace cycle_t vread_pvclock(int *mode)</div><div class='add'>+static notrace u64 vread_pvclock(int *mode)</div><div class='ctx'> {</div><div class='ctx'> 	const struct pvclock_vcpu_time_info *pvti = &amp;get_pvti0()-&gt;pvti;</div><div class='del'>-	cycle_t ret;</div><div class='add'>+	u64 ret;</div><div class='ctx'> 	u64 last;</div><div class='ctx'> 	u32 version;</div><div class='ctx'> </div><div class='hunk'>@@ -142,9 +142,9 @@ static notrace cycle_t vread_pvclock(int *mode)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-notrace static cycle_t vread_tsc(void)</div><div class='add'>+notrace static u64 vread_tsc(void)</div><div class='ctx'> {</div><div class='del'>-	cycle_t ret = (cycle_t)rdtsc_ordered();</div><div class='add'>+	u64 ret = (u64)rdtsc_ordered();</div><div class='ctx'> 	u64 last = gtod-&gt;cycle_last;</div><div class='ctx'> </div><div class='ctx'> 	if (likely(ret &gt;= last))</div><div class='head'>diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c<br/>index 23c881caabd1..226ca70dc6bd 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/entry/vdso/vma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/entry/vdso/vma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/entry/vdso/vma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/vdso/vma.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='hunk'>@@ -109,7 +110,7 @@ static int vvar_fault(const struct vm_special_mapping *sm,</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='ctx'> </div><div class='ctx'> 	if (sym_offset == image-&gt;sym_vvar_page) {</div><div class='del'>-		ret = vm_insert_pfn(vma, (unsigned long)vmf-&gt;virtual_address,</div><div class='add'>+		ret = vm_insert_pfn(vma, vmf-&gt;address,</div><div class='ctx'> 				    __pa_symbol(&amp;__vvar_page) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 	} else if (sym_offset == image-&gt;sym_pvclock_page) {</div><div class='ctx'> 		struct pvclock_vsyscall_time_info *pvti =</div><div class='hunk'>@@ -117,7 +118,7 @@ static int vvar_fault(const struct vm_special_mapping *sm,</div><div class='ctx'> 		if (pvti &amp;&amp; vclock_was_used(VCLOCK_PVCLOCK)) {</div><div class='ctx'> 			ret = vm_insert_pfn(</div><div class='ctx'> 				vma,</div><div class='del'>-				(unsigned long)vmf-&gt;virtual_address,</div><div class='add'>+				vmf-&gt;address,</div><div class='ctx'> 				__pa(pvti) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -161,8 +162,6 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	text_start = addr - image-&gt;sym_vvar_start;</div><div class='del'>-	current-&gt;mm-&gt;context.vdso = (void __user *)text_start;</div><div class='del'>-	current-&gt;mm-&gt;context.vdso_image = image;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * MAYWRITE to allow gdb to COW and set breakpoints</div><div class='hunk'>@@ -188,15 +187,13 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(vma)) {</div><div class='ctx'> 		ret = PTR_ERR(vma);</div><div class='del'>-		do_munmap(mm, text_start, image-&gt;size);</div><div class='add'>+		do_munmap(mm, text_start, image-&gt;size, NULL);</div><div class='add'>+	} else {</div><div class='add'>+		current-&gt;mm-&gt;context.vdso = (void __user *)text_start;</div><div class='add'>+		current-&gt;mm-&gt;context.vdso_image = image;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> up_fail:</div><div class='del'>-	if (ret) {</div><div class='del'>-		current-&gt;mm-&gt;context.vdso = NULL;</div><div class='del'>-		current-&gt;mm-&gt;context.vdso_image = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	up_write(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -375,7 +372,7 @@ static int __init init_vdso(void)</div><div class='ctx'> </div><div class='ctx'> 	/* notifier priority &gt; KVM */</div><div class='ctx'> 	return cpuhp_setup_state(CPUHP_AP_X86_VDSO_VMA_ONLINE,</div><div class='del'>-				 "AP_X86_VDSO_VMA_ONLINE", vgetcpu_online, NULL);</div><div class='add'>+				 "x86/vdso/vma:online", vgetcpu_online, NULL);</div><div class='ctx'> }</div><div class='ctx'> subsys_initcall(init_vdso);</div><div class='ctx'> #endif /* CONFIG_X86_64 */</div><div class='head'>diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c<br/>index 636c4b341f36..ce1d7534fa53 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/entry/vsyscall/vsyscall_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/entry/vsyscall/vsyscall_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/entry/vsyscall/vsyscall_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/entry/vsyscall/vsyscall_64.c</a></div><div class='hunk'>@@ -27,6 +27,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile<br/>index 1d392c39fe56..b8ccdb5c9244 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/Makefile</a></div><div class='hunk'>@@ -1,11 +1,4 @@</div><div class='del'>-obj-y			+= core.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_CPU_SUP_AMD)               += amd/core.o amd/uncore.o</div><div class='del'>-obj-$(CONFIG_PERF_EVENTS_AMD_POWER)	+= amd/power.o</div><div class='del'>-obj-$(CONFIG_X86_LOCAL_APIC)            += amd/ibs.o msr.o</div><div class='del'>-ifdef CONFIG_AMD_IOMMU</div><div class='del'>-obj-$(CONFIG_CPU_SUP_AMD)               += amd/iommu.o</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_CPU_SUP_INTEL)		+= msr.o</div><div class='add'>+obj-y					+= core.o</div><div class='add'>+obj-y					+= amd/</div><div class='add'>+obj-$(CONFIG_X86_LOCAL_APIC)            += msr.o</div><div class='ctx'> obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/</div><div class='head'>diff --git a/arch/x86/events/amd/Makefile b/arch/x86/events/amd/Makefile<br/>new file mode 100644<br/>index 000000000000..b1da46f396e0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/amd/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/amd/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+obj-$(CONFIG_CPU_SUP_AMD)		+= core.o uncore.o</div><div class='add'>+obj-$(CONFIG_PERF_EVENTS_AMD_POWER)	+= power.o</div><div class='add'>+obj-$(CONFIG_X86_LOCAL_APIC)		+= ibs.o</div><div class='add'>+ifdef CONFIG_AMD_IOMMU</div><div class='add'>+obj-$(CONFIG_CPU_SUP_AMD)		+= iommu.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c<br/>index b26ee32f73e8..786fd875de92 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/amd/ibs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/amd/ibs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/amd/ibs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/amd/ibs.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -1010,7 +1011,7 @@ static __init int amd_ibs_init(void)</div><div class='ctx'> 	 * all online cpus.</div><div class='ctx'> 	 */</div><div class='ctx'> 	cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_IBS_STARTING,</div><div class='del'>-			  "AP_PERF_X86_AMD_IBS_STARTING",</div><div class='add'>+			  "perf/x86/amd/ibs:starting",</div><div class='ctx'> 			  x86_pmu_amd_ibs_starting_cpu,</div><div class='ctx'> 			  x86_pmu_amd_ibs_dying_cpu);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/events/amd/power.c b/arch/x86/events/amd/power.c<br/>index 9842270ed2f2..a6eee5ac4f58 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/amd/power.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/amd/power.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/amd/power.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/amd/power.c</a></div><div class='hunk'>@@ -291,7 +291,7 @@ static int __init amd_power_pmu_init(void)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_POWER_ONLINE,</div><div class='del'>-			  "AP_PERF_X86_AMD_POWER_ONLINE",</div><div class='add'>+			  "perf/x86/amd/power:online",</div><div class='ctx'> 			  power_cpu_init, power_cpu_exit);</div><div class='ctx'> </div><div class='ctx'> 	ret = perf_pmu_register(&amp;pmu_class, "power", -1);</div><div class='head'>diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c<br/>index 65577f081d07..4d1f7f2d9aff 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/amd/uncore.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/amd/uncore.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/amd/uncore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/amd/uncore.c</a></div><div class='hunk'>@@ -22,13 +22,17 @@</div><div class='ctx'> </div><div class='ctx'> #define NUM_COUNTERS_NB		4</div><div class='ctx'> #define NUM_COUNTERS_L2		4</div><div class='del'>-#define MAX_COUNTERS		NUM_COUNTERS_NB</div><div class='add'>+#define NUM_COUNTERS_L3		6</div><div class='add'>+#define MAX_COUNTERS		6</div><div class='ctx'> </div><div class='ctx'> #define RDPMC_BASE_NB		6</div><div class='del'>-#define RDPMC_BASE_L2		10</div><div class='add'>+#define RDPMC_BASE_LLC		10</div><div class='ctx'> </div><div class='ctx'> #define COUNTER_SHIFT		16</div><div class='ctx'> </div><div class='add'>+static int num_counters_llc;</div><div class='add'>+static int num_counters_nb;</div><div class='add'>+</div><div class='ctx'> static HLIST_HEAD(uncore_unused_list);</div><div class='ctx'> </div><div class='ctx'> struct amd_uncore {</div><div class='hunk'>@@ -45,30 +49,30 @@ struct amd_uncore {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct amd_uncore * __percpu *amd_uncore_nb;</div><div class='del'>-static struct amd_uncore * __percpu *amd_uncore_l2;</div><div class='add'>+static struct amd_uncore * __percpu *amd_uncore_llc;</div><div class='ctx'> </div><div class='ctx'> static struct pmu amd_nb_pmu;</div><div class='del'>-static struct pmu amd_l2_pmu;</div><div class='add'>+static struct pmu amd_llc_pmu;</div><div class='ctx'> </div><div class='ctx'> static cpumask_t amd_nb_active_mask;</div><div class='del'>-static cpumask_t amd_l2_active_mask;</div><div class='add'>+static cpumask_t amd_llc_active_mask;</div><div class='ctx'> </div><div class='ctx'> static bool is_nb_event(struct perf_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	return event-&gt;pmu-&gt;type == amd_nb_pmu.type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool is_l2_event(struct perf_event *event)</div><div class='add'>+static bool is_llc_event(struct perf_event *event)</div><div class='ctx'> {</div><div class='del'>-	return event-&gt;pmu-&gt;type == amd_l2_pmu.type;</div><div class='add'>+	return event-&gt;pmu-&gt;type == amd_llc_pmu.type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct amd_uncore *event_to_amd_uncore(struct perf_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	if (is_nb_event(event) &amp;&amp; amd_uncore_nb)</div><div class='ctx'> 		return *per_cpu_ptr(amd_uncore_nb, event-&gt;cpu);</div><div class='del'>-	else if (is_l2_event(event) &amp;&amp; amd_uncore_l2)</div><div class='del'>-		return *per_cpu_ptr(amd_uncore_l2, event-&gt;cpu);</div><div class='add'>+	else if (is_llc_event(event) &amp;&amp; amd_uncore_llc)</div><div class='add'>+		return *per_cpu_ptr(amd_uncore_llc, event-&gt;cpu);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -183,16 +187,16 @@ static int amd_uncore_event_init(struct perf_event *event)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * NB and L2 counters (MSRs) are shared across all cores that share the</div><div class='del'>-	 * same NB / L2 cache. Interrupts can be directed to a single target</div><div class='del'>-	 * core, however, event counts generated by processes running on other</div><div class='del'>-	 * cores cannot be masked out. So we do not support sampling and</div><div class='del'>-	 * per-thread events.</div><div class='add'>+	 * NB and Last level cache counters (MSRs) are shared across all cores</div><div class='add'>+	 * that share the same NB / Last level cache. Interrupts can be directed</div><div class='add'>+	 * to a single target core, however, event counts generated by processes</div><div class='add'>+	 * running on other cores cannot be masked out. So we do not support</div><div class='add'>+	 * sampling and per-thread events.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (is_sampling_event(event) || event-&gt;attach_state &amp; PERF_ATTACH_TASK)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* NB and L2 counters do not have usr/os/guest/host bits */</div><div class='add'>+	/* NB and Last level cache counters do not have usr/os/guest/host bits */</div><div class='ctx'> 	if (event-&gt;attr.exclude_user || event-&gt;attr.exclude_kernel ||</div><div class='ctx'> 	    event-&gt;attr.exclude_host || event-&gt;attr.exclude_guest)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -226,8 +230,8 @@ static ssize_t amd_uncore_attr_show_cpumask(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (pmu-&gt;type == amd_nb_pmu.type)</div><div class='ctx'> 		active_mask = &amp;amd_nb_active_mask;</div><div class='del'>-	else if (pmu-&gt;type == amd_l2_pmu.type)</div><div class='del'>-		active_mask = &amp;amd_l2_active_mask;</div><div class='add'>+	else if (pmu-&gt;type == amd_llc_pmu.type)</div><div class='add'>+		active_mask = &amp;amd_llc_active_mask;</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -244,30 +248,47 @@ static struct attribute_group amd_uncore_attr_group = {</div><div class='ctx'> 	.attrs = amd_uncore_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-PMU_FORMAT_ATTR(event, "config:0-7,32-35");</div><div class='del'>-PMU_FORMAT_ATTR(umask, "config:8-15");</div><div class='del'>-</div><div class='del'>-static struct attribute *amd_uncore_format_attr[] = {</div><div class='del'>-	&amp;format_attr_event.attr,</div><div class='del'>-	&amp;format_attr_umask.attr,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct attribute_group amd_uncore_format_group = {</div><div class='del'>-	.name = "format",</div><div class='del'>-	.attrs = amd_uncore_format_attr,</div><div class='add'>+/*</div><div class='add'>+ * Similar to PMU_FORMAT_ATTR but allowing for format_attr to be assigned based</div><div class='add'>+ * on family</div><div class='add'>+ */</div><div class='add'>+#define AMD_FORMAT_ATTR(_dev, _name, _format)				     \</div><div class='add'>+static ssize_t								     \</div><div class='add'>+_dev##_show##_name(struct device *dev,					     \</div><div class='add'>+		struct device_attribute *attr,				     \</div><div class='add'>+		char *page)						     \</div><div class='add'>+{									     \</div><div class='add'>+	BUILD_BUG_ON(sizeof(_format) &gt;= PAGE_SIZE);			     \</div><div class='add'>+	return sprintf(page, _format "\n");				     \</div><div class='add'>+}									     \</div><div class='add'>+static struct device_attribute format_attr_##_dev##_name = __ATTR_RO(_dev);</div><div class='add'>+</div><div class='add'>+/* Used for each uncore counter type */</div><div class='add'>+#define AMD_ATTRIBUTE(_name)						     \</div><div class='add'>+static struct attribute *amd_uncore_format_attr_##_name[] = {		     \</div><div class='add'>+	&amp;format_attr_event_##_name.attr,				     \</div><div class='add'>+	&amp;format_attr_umask.attr,					     \</div><div class='add'>+	NULL,								     \</div><div class='add'>+};									     \</div><div class='add'>+static struct attribute_group amd_uncore_format_group_##_name = {	     \</div><div class='add'>+	.name = "format",						     \</div><div class='add'>+	.attrs = amd_uncore_format_attr_##_name,			     \</div><div class='add'>+};									     \</div><div class='add'>+static const struct attribute_group *amd_uncore_attr_groups_##_name[] = {    \</div><div class='add'>+	&amp;amd_uncore_attr_group,						     \</div><div class='add'>+	&amp;amd_uncore_format_group_##_name,				     \</div><div class='add'>+	NULL,								     \</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct attribute_group *amd_uncore_attr_groups[] = {</div><div class='del'>-	&amp;amd_uncore_attr_group,</div><div class='del'>-	&amp;amd_uncore_format_group,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='add'>+AMD_FORMAT_ATTR(event, , "config:0-7,32-35");</div><div class='add'>+AMD_FORMAT_ATTR(umask, , "config:8-15");</div><div class='add'>+AMD_FORMAT_ATTR(event, _df, "config:0-7,32-35,59-60");</div><div class='add'>+AMD_FORMAT_ATTR(event, _l3, "config:0-7");</div><div class='add'>+AMD_ATTRIBUTE(df);</div><div class='add'>+AMD_ATTRIBUTE(l3);</div><div class='ctx'> </div><div class='ctx'> static struct pmu amd_nb_pmu = {</div><div class='ctx'> 	.task_ctx_nr	= perf_invalid_context,</div><div class='del'>-	.attr_groups	= amd_uncore_attr_groups,</div><div class='del'>-	.name		= "amd_nb",</div><div class='ctx'> 	.event_init	= amd_uncore_event_init,</div><div class='ctx'> 	.add		= amd_uncore_add,</div><div class='ctx'> 	.del		= amd_uncore_del,</div><div class='hunk'>@@ -276,10 +297,8 @@ static struct pmu amd_nb_pmu = {</div><div class='ctx'> 	.read		= amd_uncore_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pmu amd_l2_pmu = {</div><div class='add'>+static struct pmu amd_llc_pmu = {</div><div class='ctx'> 	.task_ctx_nr	= perf_invalid_context,</div><div class='del'>-	.attr_groups	= amd_uncore_attr_groups,</div><div class='del'>-	.name		= "amd_l2",</div><div class='ctx'> 	.event_init	= amd_uncore_event_init,</div><div class='ctx'> 	.add		= amd_uncore_add,</div><div class='ctx'> 	.del		= amd_uncore_del,</div><div class='hunk'>@@ -296,14 +315,14 @@ static struct amd_uncore *amd_uncore_alloc(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> static int amd_uncore_cpu_up_prepare(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	struct amd_uncore *uncore_nb = NULL, *uncore_l2;</div><div class='add'>+	struct amd_uncore *uncore_nb = NULL, *uncore_llc;</div><div class='ctx'> </div><div class='ctx'> 	if (amd_uncore_nb) {</div><div class='ctx'> 		uncore_nb = amd_uncore_alloc(cpu);</div><div class='ctx'> 		if (!uncore_nb)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		uncore_nb-&gt;cpu = cpu;</div><div class='del'>-		uncore_nb-&gt;num_counters = NUM_COUNTERS_NB;</div><div class='add'>+		uncore_nb-&gt;num_counters = num_counters_nb;</div><div class='ctx'> 		uncore_nb-&gt;rdpmc_base = RDPMC_BASE_NB;</div><div class='ctx'> 		uncore_nb-&gt;msr_base = MSR_F15H_NB_PERF_CTL;</div><div class='ctx'> 		uncore_nb-&gt;active_mask = &amp;amd_nb_active_mask;</div><div class='hunk'>@@ -312,18 +331,18 @@ static int amd_uncore_cpu_up_prepare(unsigned int cpu)</div><div class='ctx'> 		*per_cpu_ptr(amd_uncore_nb, cpu) = uncore_nb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (amd_uncore_l2) {</div><div class='del'>-		uncore_l2 = amd_uncore_alloc(cpu);</div><div class='del'>-		if (!uncore_l2)</div><div class='add'>+	if (amd_uncore_llc) {</div><div class='add'>+		uncore_llc = amd_uncore_alloc(cpu);</div><div class='add'>+		if (!uncore_llc)</div><div class='ctx'> 			goto fail;</div><div class='del'>-		uncore_l2-&gt;cpu = cpu;</div><div class='del'>-		uncore_l2-&gt;num_counters = NUM_COUNTERS_L2;</div><div class='del'>-		uncore_l2-&gt;rdpmc_base = RDPMC_BASE_L2;</div><div class='del'>-		uncore_l2-&gt;msr_base = MSR_F16H_L2I_PERF_CTL;</div><div class='del'>-		uncore_l2-&gt;active_mask = &amp;amd_l2_active_mask;</div><div class='del'>-		uncore_l2-&gt;pmu = &amp;amd_l2_pmu;</div><div class='del'>-		uncore_l2-&gt;id = -1;</div><div class='del'>-		*per_cpu_ptr(amd_uncore_l2, cpu) = uncore_l2;</div><div class='add'>+		uncore_llc-&gt;cpu = cpu;</div><div class='add'>+		uncore_llc-&gt;num_counters = num_counters_llc;</div><div class='add'>+		uncore_llc-&gt;rdpmc_base = RDPMC_BASE_LLC;</div><div class='add'>+		uncore_llc-&gt;msr_base = MSR_F16H_L2I_PERF_CTL;</div><div class='add'>+		uncore_llc-&gt;active_mask = &amp;amd_llc_active_mask;</div><div class='add'>+		uncore_llc-&gt;pmu = &amp;amd_llc_pmu;</div><div class='add'>+		uncore_llc-&gt;id = -1;</div><div class='add'>+		*per_cpu_ptr(amd_uncore_llc, cpu) = uncore_llc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -376,17 +395,17 @@ static int amd_uncore_cpu_starting(unsigned int cpu)</div><div class='ctx'> 		*per_cpu_ptr(amd_uncore_nb, cpu) = uncore;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (amd_uncore_l2) {</div><div class='add'>+	if (amd_uncore_llc) {</div><div class='ctx'> 		unsigned int apicid = cpu_data(cpu).apicid;</div><div class='ctx'> 		unsigned int nshared;</div><div class='ctx'> </div><div class='del'>-		uncore = *per_cpu_ptr(amd_uncore_l2, cpu);</div><div class='add'>+		uncore = *per_cpu_ptr(amd_uncore_llc, cpu);</div><div class='ctx'> 		cpuid_count(0x8000001d, 2, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='ctx'> 		nshared = ((eax &gt;&gt; 14) &amp; 0xfff) + 1;</div><div class='ctx'> 		uncore-&gt;id = apicid - (apicid % nshared);</div><div class='ctx'> </div><div class='del'>-		uncore = amd_uncore_find_online_sibling(uncore, amd_uncore_l2);</div><div class='del'>-		*per_cpu_ptr(amd_uncore_l2, cpu) = uncore;</div><div class='add'>+		uncore = amd_uncore_find_online_sibling(uncore, amd_uncore_llc);</div><div class='add'>+		*per_cpu_ptr(amd_uncore_llc, cpu) = uncore;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -419,8 +438,8 @@ static int amd_uncore_cpu_online(unsigned int cpu)</div><div class='ctx'> 	if (amd_uncore_nb)</div><div class='ctx'> 		uncore_online(cpu, amd_uncore_nb);</div><div class='ctx'> </div><div class='del'>-	if (amd_uncore_l2)</div><div class='del'>-		uncore_online(cpu, amd_uncore_l2);</div><div class='add'>+	if (amd_uncore_llc)</div><div class='add'>+		uncore_online(cpu, amd_uncore_llc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -456,8 +475,8 @@ static int amd_uncore_cpu_down_prepare(unsigned int cpu)</div><div class='ctx'> 	if (amd_uncore_nb)</div><div class='ctx'> 		uncore_down_prepare(cpu, amd_uncore_nb);</div><div class='ctx'> </div><div class='del'>-	if (amd_uncore_l2)</div><div class='del'>-		uncore_down_prepare(cpu, amd_uncore_l2);</div><div class='add'>+	if (amd_uncore_llc)</div><div class='add'>+		uncore_down_prepare(cpu, amd_uncore_llc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -479,8 +498,8 @@ static int amd_uncore_cpu_dead(unsigned int cpu)</div><div class='ctx'> 	if (amd_uncore_nb)</div><div class='ctx'> 		uncore_dead(cpu, amd_uncore_nb);</div><div class='ctx'> </div><div class='del'>-	if (amd_uncore_l2)</div><div class='del'>-		uncore_dead(cpu, amd_uncore_l2);</div><div class='add'>+	if (amd_uncore_llc)</div><div class='add'>+		uncore_dead(cpu, amd_uncore_llc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -492,6 +511,47 @@ static int __init amd_uncore_init(void)</div><div class='ctx'> 	if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)</div><div class='ctx'> 		goto fail_nodev;</div><div class='ctx'> </div><div class='add'>+	switch(boot_cpu_data.x86) {</div><div class='add'>+		case 23:</div><div class='add'>+			/* Family 17h: */</div><div class='add'>+			num_counters_nb = NUM_COUNTERS_NB;</div><div class='add'>+			num_counters_llc = NUM_COUNTERS_L3;</div><div class='add'>+			/*</div><div class='add'>+			 * For Family17h, the NorthBridge counters are</div><div class='add'>+			 * re-purposed as Data Fabric counters. Also, support is</div><div class='add'>+			 * added for L3 counters. The pmus are exported based on</div><div class='add'>+			 * family as either L2 or L3 and NB or DF.</div><div class='add'>+			 */</div><div class='add'>+			amd_nb_pmu.name = "amd_df";</div><div class='add'>+			amd_llc_pmu.name = "amd_l3";</div><div class='add'>+			format_attr_event_df.show = &amp;event_show_df;</div><div class='add'>+			format_attr_event_l3.show = &amp;event_show_l3;</div><div class='add'>+			break;</div><div class='add'>+		case 22:</div><div class='add'>+			/* Family 16h - may change: */</div><div class='add'>+			num_counters_nb = NUM_COUNTERS_NB;</div><div class='add'>+			num_counters_llc = NUM_COUNTERS_L2;</div><div class='add'>+			amd_nb_pmu.name = "amd_nb";</div><div class='add'>+			amd_llc_pmu.name = "amd_l2";</div><div class='add'>+			format_attr_event_df = format_attr_event;</div><div class='add'>+			format_attr_event_l3 = format_attr_event;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/*</div><div class='add'>+			 * All prior families have the same number of</div><div class='add'>+			 * NorthBridge and Last Level Cache counters</div><div class='add'>+			 */</div><div class='add'>+			num_counters_nb = NUM_COUNTERS_NB;</div><div class='add'>+			num_counters_llc = NUM_COUNTERS_L2;</div><div class='add'>+			amd_nb_pmu.name = "amd_nb";</div><div class='add'>+			amd_llc_pmu.name = "amd_l2";</div><div class='add'>+			format_attr_event_df = format_attr_event;</div><div class='add'>+			format_attr_event_l3 = format_attr_event;</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	amd_nb_pmu.attr_groups = amd_uncore_attr_groups_df;</div><div class='add'>+	amd_llc_pmu.attr_groups = amd_uncore_attr_groups_l3;</div><div class='add'>+</div><div class='ctx'> 	if (!boot_cpu_has(X86_FEATURE_TOPOEXT))</div><div class='ctx'> 		goto fail_nodev;</div><div class='ctx'> </div><div class='hunk'>@@ -510,16 +570,16 @@ static int __init amd_uncore_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (boot_cpu_has(X86_FEATURE_PERFCTR_L2)) {</div><div class='del'>-		amd_uncore_l2 = alloc_percpu(struct amd_uncore *);</div><div class='del'>-		if (!amd_uncore_l2) {</div><div class='add'>+		amd_uncore_llc = alloc_percpu(struct amd_uncore *);</div><div class='add'>+		if (!amd_uncore_llc) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='del'>-			goto fail_l2;</div><div class='add'>+			goto fail_llc;</div><div class='ctx'> 		}</div><div class='del'>-		ret = perf_pmu_register(&amp;amd_l2_pmu, amd_l2_pmu.name, -1);</div><div class='add'>+		ret = perf_pmu_register(&amp;amd_llc_pmu, amd_llc_pmu.name, -1);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto fail_l2;</div><div class='add'>+			goto fail_llc;</div><div class='ctx'> </div><div class='del'>-		pr_info("perf: AMD L2I counters detected\n");</div><div class='add'>+		pr_info("perf: AMD LLC counters detected\n");</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -527,16 +587,16 @@ static int __init amd_uncore_init(void)</div><div class='ctx'> 	 * Install callbacks. Core will call them for each online cpu.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cpuhp_setup_state(CPUHP_PERF_X86_AMD_UNCORE_PREP,</div><div class='del'>-			      "PERF_X86_AMD_UNCORE_PREP",</div><div class='add'>+			      "perf/x86/amd/uncore:prepare",</div><div class='ctx'> 			      amd_uncore_cpu_up_prepare, amd_uncore_cpu_dead))</div><div class='del'>-		goto fail_l2;</div><div class='add'>+		goto fail_llc;</div><div class='ctx'> </div><div class='ctx'> 	if (cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING,</div><div class='del'>-			      "AP_PERF_X86_AMD_UNCORE_STARTING",</div><div class='add'>+			      "perf/x86/amd/uncore:starting",</div><div class='ctx'> 			      amd_uncore_cpu_starting, NULL))</div><div class='ctx'> 		goto fail_prep;</div><div class='ctx'> 	if (cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_UNCORE_ONLINE,</div><div class='del'>-			      "AP_PERF_X86_AMD_UNCORE_ONLINE",</div><div class='add'>+			      "perf/x86/amd/uncore:online",</div><div class='ctx'> 			      amd_uncore_cpu_online,</div><div class='ctx'> 			      amd_uncore_cpu_down_prepare))</div><div class='ctx'> 		goto fail_start;</div><div class='hunk'>@@ -546,11 +606,11 @@ fail_start:</div><div class='ctx'> 	cpuhp_remove_state(CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING);</div><div class='ctx'> fail_prep:</div><div class='ctx'> 	cpuhp_remove_state(CPUHP_PERF_X86_AMD_UNCORE_PREP);</div><div class='del'>-fail_l2:</div><div class='add'>+fail_llc:</div><div class='ctx'> 	if (boot_cpu_has(X86_FEATURE_PERFCTR_NB))</div><div class='ctx'> 		perf_pmu_unregister(&amp;amd_nb_pmu);</div><div class='del'>-	if (amd_uncore_l2)</div><div class='del'>-		free_percpu(amd_uncore_l2);</div><div class='add'>+	if (amd_uncore_llc)</div><div class='add'>+		free_percpu(amd_uncore_llc);</div><div class='ctx'> fail_nb:</div><div class='ctx'> 	if (amd_uncore_nb)</div><div class='ctx'> 		free_percpu(amd_uncore_nb);</div><div class='head'>diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c<br/>index 6e395c996900..349d4d17aa7f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/core.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/core.c</a></div><div class='hunk'>@@ -20,7 +20,8 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='hunk'>@@ -365,7 +366,11 @@ int x86_add_exclusive(unsigned int what)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (x86_pmu.lbr_pt_coexist)</div><div class='add'>+	/*</div><div class='add'>+	 * When lbr_pt_coexist we allow PT to coexist with either LBR or BTS.</div><div class='add'>+	 * LBR and BTS are still mutually exclusive.</div><div class='add'>+	 */</div><div class='add'>+	if (x86_pmu.lbr_pt_coexist &amp;&amp; what == x86_lbr_exclusive_pt)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!atomic_inc_not_zero(&amp;x86_pmu.lbr_exclusive[what])) {</div><div class='hunk'>@@ -388,7 +393,7 @@ fail_unlock:</div><div class='ctx'> </div><div class='ctx'> void x86_del_exclusive(unsigned int what)</div><div class='ctx'> {</div><div class='del'>-	if (x86_pmu.lbr_pt_coexist)</div><div class='add'>+	if (x86_pmu.lbr_pt_coexist &amp;&amp; what == x86_lbr_exclusive_pt)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	atomic_dec(&amp;x86_pmu.lbr_exclusive[what]);</div><div class='hunk'>@@ -501,6 +506,10 @@ int x86_pmu_hw_config(struct perf_event *event)</div><div class='ctx'> </div><div class='ctx'> 		if (event-&gt;attr.precise_ip &gt; precise)</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		/* There's no sense in having PEBS for non sampling events: */</div><div class='add'>+		if (!is_sampling_event(event))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * check that PEBS LBR correction does not conflict with</div><div class='hunk'>@@ -1816,18 +1825,18 @@ static int __init init_hw_perf_events(void)</div><div class='ctx'> 	 * Install callbacks. Core will call them for each online</div><div class='ctx'> 	 * cpu.</div><div class='ctx'> 	 */</div><div class='del'>-	err = cpuhp_setup_state(CPUHP_PERF_X86_PREPARE, "PERF_X86_PREPARE",</div><div class='add'>+	err = cpuhp_setup_state(CPUHP_PERF_X86_PREPARE, "perf/x86:prepare",</div><div class='ctx'> 				x86_pmu_prepare_cpu, x86_pmu_dead_cpu);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = cpuhp_setup_state(CPUHP_AP_PERF_X86_STARTING,</div><div class='del'>-				"AP_PERF_X86_STARTING", x86_pmu_starting_cpu,</div><div class='add'>+				"perf/x86:starting", x86_pmu_starting_cpu,</div><div class='ctx'> 				x86_pmu_dying_cpu);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = cpuhp_setup_state(CPUHP_AP_PERF_X86_ONLINE, "AP_PERF_X86_ONLINE",</div><div class='add'>+	err = cpuhp_setup_state(CPUHP_AP_PERF_X86_ONLINE, "perf/x86:online",</div><div class='ctx'> 				x86_pmu_online_cpu, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out1;</div><div class='hunk'>@@ -2299,7 +2308,7 @@ valid_user_frame(const void __user *fp, unsigned long size)</div><div class='ctx'> static unsigned long get_segment_base(unsigned int segment)</div><div class='ctx'> {</div><div class='ctx'> 	struct desc_struct *desc;</div><div class='del'>-	int idx = segment &gt;&gt; 3;</div><div class='add'>+	unsigned int idx = segment &gt;&gt; 3;</div><div class='ctx'> </div><div class='ctx'> 	if ((segment &amp; SEGMENT_TI_MASK) == SEGMENT_LDT) {</div><div class='ctx'> #ifdef CONFIG_MODIFY_LDT_SYSCALL</div><div class='head'>diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c<br/>index cb8522290e6a..eb1484c86bb4 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/intel/core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/intel/core.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/intel/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/core.c</a></div><div class='hunk'>@@ -2110,6 +2110,27 @@ again:</div><div class='ctx'> 		    GLOBAL_STATUS_LBRS_FROZEN);</div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		goto done;</div><div class='add'>+	/*</div><div class='add'>+	 * In case multiple PEBS events are sampled at the same time,</div><div class='add'>+	 * it is possible to have GLOBAL_STATUS bit 62 set indicating</div><div class='add'>+	 * PEBS buffer overflow and also seeing at most 3 PEBS counters</div><div class='add'>+	 * having their bits set in the status register. This is a sign</div><div class='add'>+	 * that there was at least one PEBS record pending at the time</div><div class='add'>+	 * of the PMU interrupt. PEBS counters must only be processed</div><div class='add'>+	 * via the drain_pebs() calls and not via the regular sample</div><div class='add'>+	 * processing loop coming after that the function, otherwise</div><div class='add'>+	 * phony regular samples may be generated in the sampling buffer</div><div class='add'>+	 * not marked with the EXACT tag. Another possibility is to have</div><div class='add'>+	 * one PEBS event and at least one non-PEBS event whic hoverflows</div><div class='add'>+	 * while PEBS has armed. In this case, bit 62 of GLOBAL_STATUS will</div><div class='add'>+	 * not be set, yet the overflow status bit for the PEBS counter will</div><div class='add'>+	 * be on Skylake.</div><div class='add'>+	 *</div><div class='add'>+	 * To avoid this problem, we systematically ignore the PEBS-enabled</div><div class='add'>+	 * counters from the GLOBAL_STATUS mask and we always process PEBS</div><div class='add'>+	 * events via drain_pebs().</div><div class='add'>+	 */</div><div class='add'>+	status &amp;= ~cpuc-&gt;pebs_enabled;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * PEBS overflow sets bit 62 in the global status register</div><div class='hunk'>@@ -2117,15 +2138,6 @@ again:</div><div class='ctx'> 	if (__test_and_clear_bit(62, (unsigned long *)&amp;status)) {</div><div class='ctx'> 		handled++;</div><div class='ctx'> 		x86_pmu.drain_pebs(regs);</div><div class='del'>-		/*</div><div class='del'>-		 * There are cases where, even though, the PEBS ovfl bit is set</div><div class='del'>-		 * in GLOBAL_OVF_STATUS, the PEBS events may also have their</div><div class='del'>-		 * overflow bits set for their counters. We must clear them</div><div class='del'>-		 * here because they have been processed as exact samples in</div><div class='del'>-		 * the drain_pebs() routine. They must not be processed again</div><div class='del'>-		 * in the for_each_bit_set() loop for regular samples below.</div><div class='del'>-		 */</div><div class='del'>-		status &amp;= ~cpuc-&gt;pebs_enabled;</div><div class='ctx'> 		status &amp;= x86_pmu.intel_ctrl | GLOBAL_STATUS_TRACE_TOPAPMI;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3164,13 +3176,16 @@ static void intel_pmu_cpu_starting(int cpu)</div><div class='ctx'> </div><div class='ctx'> 	if (x86_pmu.flags &amp; PMU_FL_EXCL_CNTRS) {</div><div class='ctx'> 		for_each_cpu(i, topology_sibling_cpumask(cpu)) {</div><div class='add'>+			struct cpu_hw_events *sibling;</div><div class='ctx'> 			struct intel_excl_cntrs *c;</div><div class='ctx'> </div><div class='del'>-			c = per_cpu(cpu_hw_events, i).excl_cntrs;</div><div class='add'>+			sibling = &amp;per_cpu(cpu_hw_events, i);</div><div class='add'>+			c = sibling-&gt;excl_cntrs;</div><div class='ctx'> 			if (c &amp;&amp; c-&gt;core_id == core_id) {</div><div class='ctx'> 				cpuc-&gt;kfree_on_online[1] = cpuc-&gt;excl_cntrs;</div><div class='ctx'> 				cpuc-&gt;excl_cntrs = c;</div><div class='del'>-				cpuc-&gt;excl_thread_id = 1;</div><div class='add'>+				if (!sibling-&gt;excl_thread_id)</div><div class='add'>+					cpuc-&gt;excl_thread_id = 1;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3975,7 +3990,7 @@ __init int intel_pmu_init(void)</div><div class='ctx'> 		     x86_pmu.num_counters, INTEL_PMC_MAX_GENERIC);</div><div class='ctx'> 		x86_pmu.num_counters = INTEL_PMC_MAX_GENERIC;</div><div class='ctx'> 	}</div><div class='del'>-	x86_pmu.intel_ctrl = (1 &lt;&lt; x86_pmu.num_counters) - 1;</div><div class='add'>+	x86_pmu.intel_ctrl = (1ULL &lt;&lt; x86_pmu.num_counters) - 1;</div><div class='ctx'> </div><div class='ctx'> 	if (x86_pmu.num_counters_fixed &gt; INTEL_PMC_MAX_FIXED) {</div><div class='ctx'> 		WARN(1, KERN_ERR "hw perf events fixed %d &gt; max(%d), clipping!",</div><div class='head'>diff --git a/arch/x86/events/intel/cqm.c b/arch/x86/events/intel/cqm.c<br/>index 8f82b02934fa..8c00dc09a5d2 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/intel/cqm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/intel/cqm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/intel/cqm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/cqm.c</a></div><div class='hunk'>@@ -7,9 +7,9 @@</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/cpu_device_id.h&gt;</div><div class='add'>+#include &lt;asm/intel_rdt_common.h&gt;</div><div class='ctx'> #include "../perf_event.h"</div><div class='ctx'> </div><div class='del'>-#define MSR_IA32_PQR_ASSOC	0x0c8f</div><div class='ctx'> #define MSR_IA32_QM_CTR		0x0c8e</div><div class='ctx'> #define MSR_IA32_QM_EVTSEL	0x0c8d</div><div class='ctx'> </div><div class='hunk'>@@ -24,32 +24,13 @@ static unsigned int cqm_l3_scale; /* supposedly cacheline size */</div><div class='ctx'> static bool cqm_enabled, mbm_enabled;</div><div class='ctx'> unsigned int mbm_socket_max;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct intel_pqr_state - State cache for the PQR MSR</div><div class='del'>- * @rmid:		The cached Resource Monitoring ID</div><div class='del'>- * @closid:		The cached Class Of Service ID</div><div class='del'>- * @rmid_usecnt:	The usage counter for rmid</div><div class='del'>- *</div><div class='del'>- * The upper 32 bits of MSR_IA32_PQR_ASSOC contain closid and the</div><div class='del'>- * lower 10 bits rmid. The update to MSR_IA32_PQR_ASSOC always</div><div class='del'>- * contains both parts, so we need to cache them.</div><div class='del'>- *</div><div class='del'>- * The cache also helps to avoid pointless updates if the value does</div><div class='del'>- * not change.</div><div class='del'>- */</div><div class='del'>-struct intel_pqr_state {</div><div class='del'>-	u32			rmid;</div><div class='del'>-	u32			closid;</div><div class='del'>-	int			rmid_usecnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The cached intel_pqr_state is strictly per CPU and can never be</div><div class='ctx'>  * updated from a remote CPU. Both functions which modify the state</div><div class='ctx'>  * (intel_cqm_event_start and intel_cqm_event_stop) are called with</div><div class='ctx'>  * interrupts disabled, which is sufficient for the protection.</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_PER_CPU(struct intel_pqr_state, pqr_state);</div><div class='add'>+DEFINE_PER_CPU(struct intel_pqr_state, pqr_state);</div><div class='ctx'> static struct hrtimer *mbm_timers;</div><div class='ctx'> /**</div><div class='ctx'>  * struct sample - mbm event's (local or total) data</div><div class='hunk'>@@ -1766,9 +1747,9 @@ static int __init intel_cqm_init(void)</div><div class='ctx'> 	 * is enabled to avoid notifier leak.</div><div class='ctx'> 	 */</div><div class='ctx'> 	cpuhp_setup_state(CPUHP_AP_PERF_X86_CQM_STARTING,</div><div class='del'>-			  "AP_PERF_X86_CQM_STARTING",</div><div class='add'>+			  "perf/x86/cqm:starting",</div><div class='ctx'> 			  intel_cqm_cpu_starting, NULL);</div><div class='del'>-	cpuhp_setup_state(CPUHP_AP_PERF_X86_CQM_ONLINE, "AP_PERF_X86_CQM_ONLINE",</div><div class='add'>+	cpuhp_setup_state(CPUHP_AP_PERF_X86_CQM_ONLINE, "perf/x86/cqm:online",</div><div class='ctx'> 			  NULL, intel_cqm_cpu_exit);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='head'>diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c<br/>index da51e5a3e2ff..aff4b5b69d40 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/intel/cstate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/intel/cstate.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/intel/cstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/cstate.c</a></div><div class='hunk'>@@ -434,6 +434,7 @@ static struct pmu cstate_core_pmu = {</div><div class='ctx'> 	.stop		= cstate_pmu_event_stop,</div><div class='ctx'> 	.read		= cstate_pmu_event_update,</div><div class='ctx'> 	.capabilities	= PERF_PMU_CAP_NO_INTERRUPT,</div><div class='add'>+	.module		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pmu cstate_pkg_pmu = {</div><div class='hunk'>@@ -447,6 +448,7 @@ static struct pmu cstate_pkg_pmu = {</div><div class='ctx'> 	.stop		= cstate_pmu_event_stop,</div><div class='ctx'> 	.read		= cstate_pmu_event_update,</div><div class='ctx'> 	.capabilities	= PERF_PMU_CAP_NO_INTERRUPT,</div><div class='add'>+	.module		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct cstate_model nhm_cstates __initconst = {</div><div class='hunk'>@@ -539,6 +541,9 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {</div><div class='ctx'> 	X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_MOBILE,  snb_cstates),</div><div class='ctx'> 	X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, snb_cstates),</div><div class='ctx'> </div><div class='add'>+	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE,  snb_cstates),</div><div class='add'>+	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_DESKTOP, snb_cstates),</div><div class='add'>+</div><div class='ctx'> 	X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNL, knl_cstates),</div><div class='ctx'> 	X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates),</div><div class='ctx'> 	{ },</div><div class='hunk'>@@ -594,6 +599,9 @@ static int __init cstate_probe(const struct cstate_model *cm)</div><div class='ctx'> </div><div class='ctx'> static inline void cstate_cleanup(void)</div><div class='ctx'> {</div><div class='add'>+	cpuhp_remove_state_nocalls(CPUHP_AP_PERF_X86_CSTATE_ONLINE);</div><div class='add'>+	cpuhp_remove_state_nocalls(CPUHP_AP_PERF_X86_CSTATE_STARTING);</div><div class='add'>+</div><div class='ctx'> 	if (has_cstate_core)</div><div class='ctx'> 		perf_pmu_unregister(&amp;cstate_core_pmu);</div><div class='ctx'> </div><div class='hunk'>@@ -606,16 +614,16 @@ static int __init cstate_init(void)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	cpuhp_setup_state(CPUHP_AP_PERF_X86_CSTATE_STARTING,</div><div class='del'>-			  "AP_PERF_X86_CSTATE_STARTING", cstate_cpu_init,</div><div class='del'>-			  NULL);</div><div class='add'>+			  "perf/x86/cstate:starting", cstate_cpu_init, NULL);</div><div class='ctx'> 	cpuhp_setup_state(CPUHP_AP_PERF_X86_CSTATE_ONLINE,</div><div class='del'>-			  "AP_PERF_X86_CSTATE_ONLINE", NULL, cstate_cpu_exit);</div><div class='add'>+			  "perf/x86/cstate:online", NULL, cstate_cpu_exit);</div><div class='ctx'> </div><div class='ctx'> 	if (has_cstate_core) {</div><div class='ctx'> 		err = perf_pmu_register(&amp;cstate_core_pmu, cstate_core_pmu.name, -1);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			has_cstate_core = false;</div><div class='ctx'> 			pr_info("Failed to register cstate core pmu\n");</div><div class='add'>+			cstate_cleanup();</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -629,8 +637,7 @@ static int __init cstate_init(void)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init cstate_pmu_init(void)</div><div class='hunk'>@@ -655,8 +662,6 @@ module_init(cstate_pmu_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit cstate_pmu_exit(void)</div><div class='ctx'> {</div><div class='del'>-	cpuhp_remove_state_nocalls(CPUHP_AP_PERF_X86_CSTATE_ONLINE);</div><div class='del'>-	cpuhp_remove_state_nocalls(CPUHP_AP_PERF_X86_CSTATE_STARTING);</div><div class='ctx'> 	cstate_cleanup();</div><div class='ctx'> }</div><div class='ctx'> module_exit(cstate_pmu_exit);</div><div class='head'>diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c<br/>index be202390bbd3..9dfeeeca0ea8 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/intel/ds.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/intel/ds.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/intel/ds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/ds.c</a></div><div class='hunk'>@@ -1389,9 +1389,13 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* log dropped samples number */</div><div class='del'>-		if (error[bit])</div><div class='add'>+		if (error[bit]) {</div><div class='ctx'> 			perf_log_lost_samples(event, error[bit]);</div><div class='ctx'> </div><div class='add'>+			if (perf_event_account_interrupt(event))</div><div class='add'>+				x86_pmu_stop(event, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (counts[bit]) {</div><div class='ctx'> 			__intel_pmu_pebs_event(event, iregs, base,</div><div class='ctx'> 					       top, bit, counts[bit]);</div><div class='head'>diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c<br/>index c5047b8f777b..5900471ee508 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/intel/pt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/intel/pt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/intel/pt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/pt.c</a></div><div class='hunk'>@@ -36,13 +36,6 @@ static DEFINE_PER_CPU(struct pt, pt_ctx);</div><div class='ctx'> </div><div class='ctx'> static struct pt_pmu pt_pmu;</div><div class='ctx'> </div><div class='del'>-enum cpuid_regs {</div><div class='del'>-	CR_EAX = 0,</div><div class='del'>-	CR_ECX,</div><div class='del'>-	CR_EDX,</div><div class='del'>-	CR_EBX</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Capabilities of Intel PT hardware, such as number of address bits or</div><div class='ctx'>  * supported output schemes, are cached and exported to userspace as "caps"</div><div class='hunk'>@@ -64,21 +57,21 @@ static struct pt_cap_desc {</div><div class='ctx'> 	u8		reg;</div><div class='ctx'> 	u32		mask;</div><div class='ctx'> } pt_caps[] = {</div><div class='del'>-	PT_CAP(max_subleaf,		0, CR_EAX, 0xffffffff),</div><div class='del'>-	PT_CAP(cr3_filtering,		0, CR_EBX, BIT(0)),</div><div class='del'>-	PT_CAP(psb_cyc,			0, CR_EBX, BIT(1)),</div><div class='del'>-	PT_CAP(ip_filtering,		0, CR_EBX, BIT(2)),</div><div class='del'>-	PT_CAP(mtc,			0, CR_EBX, BIT(3)),</div><div class='del'>-	PT_CAP(ptwrite,			0, CR_EBX, BIT(4)),</div><div class='del'>-	PT_CAP(power_event_trace,	0, CR_EBX, BIT(5)),</div><div class='del'>-	PT_CAP(topa_output,		0, CR_ECX, BIT(0)),</div><div class='del'>-	PT_CAP(topa_multiple_entries,	0, CR_ECX, BIT(1)),</div><div class='del'>-	PT_CAP(single_range_output,	0, CR_ECX, BIT(2)),</div><div class='del'>-	PT_CAP(payloads_lip,		0, CR_ECX, BIT(31)),</div><div class='del'>-	PT_CAP(num_address_ranges,	1, CR_EAX, 0x3),</div><div class='del'>-	PT_CAP(mtc_periods,		1, CR_EAX, 0xffff0000),</div><div class='del'>-	PT_CAP(cycle_thresholds,	1, CR_EBX, 0xffff),</div><div class='del'>-	PT_CAP(psb_periods,		1, CR_EBX, 0xffff0000),</div><div class='add'>+	PT_CAP(max_subleaf,		0, CPUID_EAX, 0xffffffff),</div><div class='add'>+	PT_CAP(cr3_filtering,		0, CPUID_EBX, BIT(0)),</div><div class='add'>+	PT_CAP(psb_cyc,			0, CPUID_EBX, BIT(1)),</div><div class='add'>+	PT_CAP(ip_filtering,		0, CPUID_EBX, BIT(2)),</div><div class='add'>+	PT_CAP(mtc,			0, CPUID_EBX, BIT(3)),</div><div class='add'>+	PT_CAP(ptwrite,			0, CPUID_EBX, BIT(4)),</div><div class='add'>+	PT_CAP(power_event_trace,	0, CPUID_EBX, BIT(5)),</div><div class='add'>+	PT_CAP(topa_output,		0, CPUID_ECX, BIT(0)),</div><div class='add'>+	PT_CAP(topa_multiple_entries,	0, CPUID_ECX, BIT(1)),</div><div class='add'>+	PT_CAP(single_range_output,	0, CPUID_ECX, BIT(2)),</div><div class='add'>+	PT_CAP(payloads_lip,		0, CPUID_ECX, BIT(31)),</div><div class='add'>+	PT_CAP(num_address_ranges,	1, CPUID_EAX, 0x3),</div><div class='add'>+	PT_CAP(mtc_periods,		1, CPUID_EAX, 0xffff0000),</div><div class='add'>+	PT_CAP(cycle_thresholds,	1, CPUID_EBX, 0xffff),</div><div class='add'>+	PT_CAP(psb_periods,		1, CPUID_EBX, 0xffff0000),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u32 pt_cap_get(enum pt_capabilities cap)</div><div class='hunk'>@@ -106,18 +99,24 @@ static struct attribute_group pt_cap_group = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> PMU_FORMAT_ATTR(cyc,		"config:1"	);</div><div class='add'>+PMU_FORMAT_ATTR(pwr_evt,	"config:4"	);</div><div class='add'>+PMU_FORMAT_ATTR(fup_on_ptw,	"config:5"	);</div><div class='ctx'> PMU_FORMAT_ATTR(mtc,		"config:9"	);</div><div class='ctx'> PMU_FORMAT_ATTR(tsc,		"config:10"	);</div><div class='ctx'> PMU_FORMAT_ATTR(noretcomp,	"config:11"	);</div><div class='add'>+PMU_FORMAT_ATTR(ptw,		"config:12"	);</div><div class='ctx'> PMU_FORMAT_ATTR(mtc_period,	"config:14-17"	);</div><div class='ctx'> PMU_FORMAT_ATTR(cyc_thresh,	"config:19-22"	);</div><div class='ctx'> PMU_FORMAT_ATTR(psb_period,	"config:24-27"	);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *pt_formats_attr[] = {</div><div class='ctx'> 	&amp;format_attr_cyc.attr,</div><div class='add'>+	&amp;format_attr_pwr_evt.attr,</div><div class='add'>+	&amp;format_attr_fup_on_ptw.attr,</div><div class='ctx'> 	&amp;format_attr_mtc.attr,</div><div class='ctx'> 	&amp;format_attr_tsc.attr,</div><div class='ctx'> 	&amp;format_attr_noretcomp.attr,</div><div class='add'>+	&amp;format_attr_ptw.attr,</div><div class='ctx'> 	&amp;format_attr_mtc_period.attr,</div><div class='ctx'> 	&amp;format_attr_cyc_thresh.attr,</div><div class='ctx'> 	&amp;format_attr_psb_period.attr,</div><div class='hunk'>@@ -213,10 +212,10 @@ static int __init pt_pmu_hw_init(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PT_CPUID_LEAVES; i++) {</div><div class='ctx'> 		cpuid_count(20, i,</div><div class='del'>-			    &amp;pt_pmu.caps[CR_EAX + i*PT_CPUID_REGS_NUM],</div><div class='del'>-			    &amp;pt_pmu.caps[CR_EBX + i*PT_CPUID_REGS_NUM],</div><div class='del'>-			    &amp;pt_pmu.caps[CR_ECX + i*PT_CPUID_REGS_NUM],</div><div class='del'>-			    &amp;pt_pmu.caps[CR_EDX + i*PT_CPUID_REGS_NUM]);</div><div class='add'>+			    &amp;pt_pmu.caps[CPUID_EAX + i*PT_CPUID_REGS_NUM],</div><div class='add'>+			    &amp;pt_pmu.caps[CPUID_EBX + i*PT_CPUID_REGS_NUM],</div><div class='add'>+			    &amp;pt_pmu.caps[CPUID_ECX + i*PT_CPUID_REGS_NUM],</div><div class='add'>+			    &amp;pt_pmu.caps[CPUID_EDX + i*PT_CPUID_REGS_NUM]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENOMEM;</div><div class='head'>diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c<br/>index 0a535cea8ff3..22054ca49026 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/intel/rapl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/intel/rapl.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/intel/rapl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/rapl.c</a></div><div class='hunk'>@@ -161,7 +161,13 @@ static u64 rapl_timer_ms;</div><div class='ctx'> </div><div class='ctx'> static inline struct rapl_pmu *cpu_to_rapl_pmu(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	return rapl_pmus-&gt;pmus[topology_logical_package_id(cpu)];</div><div class='add'>+	unsigned int pkgid = topology_logical_package_id(cpu);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The unsigned check also catches the '-1' return value for non</div><div class='add'>+	 * existent mappings in the topology map.</div><div class='add'>+	 */</div><div class='add'>+	return pkgid &lt; rapl_pmus-&gt;maxpkg ? rapl_pmus-&gt;pmus[pkgid] : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u64 rapl_read_counter(struct perf_event *event)</div><div class='hunk'>@@ -402,6 +408,8 @@ static int rapl_pmu_event_init(struct perf_event *event)</div><div class='ctx'> </div><div class='ctx'> 	/* must be done before validate_group */</div><div class='ctx'> 	pmu = cpu_to_rapl_pmu(event-&gt;cpu);</div><div class='add'>+	if (!pmu)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	event-&gt;cpu = pmu-&gt;cpu;</div><div class='ctx'> 	event-&gt;pmu_private = pmu;</div><div class='ctx'> 	event-&gt;hw.event_base = msr;</div><div class='hunk'>@@ -585,6 +593,20 @@ static int rapl_cpu_online(unsigned int cpu)</div><div class='ctx'> 	struct rapl_pmu *pmu = cpu_to_rapl_pmu(cpu);</div><div class='ctx'> 	int target;</div><div class='ctx'> </div><div class='add'>+	if (!pmu) {</div><div class='add'>+		pmu = kzalloc_node(sizeof(*pmu), GFP_KERNEL, cpu_to_node(cpu));</div><div class='add'>+		if (!pmu)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		raw_spin_lock_init(&amp;pmu-&gt;lock);</div><div class='add'>+		INIT_LIST_HEAD(&amp;pmu-&gt;active_list);</div><div class='add'>+		pmu-&gt;pmu = &amp;rapl_pmus-&gt;pmu;</div><div class='add'>+		pmu-&gt;timer_interval = ms_to_ktime(rapl_timer_ms);</div><div class='add'>+		rapl_hrtimer_init(pmu);</div><div class='add'>+</div><div class='add'>+		rapl_pmus-&gt;pmus[topology_logical_package_id(cpu)] = pmu;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check if there is an online cpu in the package which collects rapl</div><div class='ctx'> 	 * events already.</div><div class='hunk'>@@ -598,27 +620,6 @@ static int rapl_cpu_online(unsigned int cpu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rapl_cpu_prepare(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	struct rapl_pmu *pmu = cpu_to_rapl_pmu(cpu);</div><div class='del'>-</div><div class='del'>-	if (pmu)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pmu = kzalloc_node(sizeof(*pmu), GFP_KERNEL, cpu_to_node(cpu));</div><div class='del'>-	if (!pmu)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	raw_spin_lock_init(&amp;pmu-&gt;lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;pmu-&gt;active_list);</div><div class='del'>-	pmu-&gt;pmu = &amp;rapl_pmus-&gt;pmu;</div><div class='del'>-	pmu-&gt;timer_interval = ms_to_ktime(rapl_timer_ms);</div><div class='del'>-	pmu-&gt;cpu = -1;</div><div class='del'>-	rapl_hrtimer_init(pmu);</div><div class='del'>-	rapl_pmus-&gt;pmus[topology_logical_package_id(cpu)] = pmu;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int rapl_check_hw_unit(bool apply_quirk)</div><div class='ctx'> {</div><div class='ctx'> 	u64 msr_rapl_power_unit_bits;</div><div class='hunk'>@@ -697,6 +698,7 @@ static int __init init_rapl_pmus(void)</div><div class='ctx'> 	rapl_pmus-&gt;pmu.start		= rapl_pmu_event_start;</div><div class='ctx'> 	rapl_pmus-&gt;pmu.stop		= rapl_pmu_event_stop;</div><div class='ctx'> 	rapl_pmus-&gt;pmu.read		= rapl_pmu_event_read;</div><div class='add'>+	rapl_pmus-&gt;pmu.module		= THIS_MODULE;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -769,6 +771,9 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = {</div><div class='ctx'> 	X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_DESKTOP, skl_rapl_init),</div><div class='ctx'> 	X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X,	 hsx_rapl_init),</div><div class='ctx'> </div><div class='add'>+	X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_MOBILE,  skl_rapl_init),</div><div class='add'>+	X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_DESKTOP, skl_rapl_init),</div><div class='add'>+</div><div class='ctx'> 	X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT, hsw_rapl_init),</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='hunk'>@@ -802,29 +807,21 @@ static int __init rapl_pmu_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Install callbacks. Core will call them for each online cpu.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	ret = cpuhp_setup_state(CPUHP_PERF_X86_RAPL_PREP, "PERF_X86_RAPL_PREP",</div><div class='del'>-				rapl_cpu_prepare, NULL);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	ret = cpuhp_setup_state(CPUHP_AP_PERF_X86_RAPL_ONLINE,</div><div class='del'>-				"AP_PERF_X86_RAPL_ONLINE",</div><div class='add'>+				"perf/x86/rapl:online",</div><div class='ctx'> 				rapl_cpu_online, rapl_cpu_offline);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out1;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = perf_pmu_register(&amp;rapl_pmus-&gt;pmu, "power", -1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out2;</div><div class='add'>+		goto out1;</div><div class='ctx'> </div><div class='ctx'> 	rapl_advertise();</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out2:</div><div class='del'>-	cpuhp_remove_state(CPUHP_AP_PERF_X86_RAPL_ONLINE);</div><div class='ctx'> out1:</div><div class='del'>-	cpuhp_remove_state(CPUHP_PERF_X86_RAPL_PREP);</div><div class='add'>+	cpuhp_remove_state(CPUHP_AP_PERF_X86_RAPL_ONLINE);</div><div class='ctx'> out:</div><div class='ctx'> 	pr_warn("Initialization failed (%d), disabled\n", ret);</div><div class='ctx'> 	cleanup_rapl_pmus();</div><div class='hunk'>@@ -835,7 +832,6 @@ module_init(rapl_pmu_init);</div><div class='ctx'> static void __exit intel_rapl_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpuhp_remove_state_nocalls(CPUHP_AP_PERF_X86_RAPL_ONLINE);</div><div class='del'>-	cpuhp_remove_state_nocalls(CPUHP_PERF_X86_RAPL_PREP);</div><div class='ctx'> 	perf_pmu_unregister(&amp;rapl_pmus-&gt;pmu);</div><div class='ctx'> 	cleanup_rapl_pmus();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c<br/>index dbaaf7dc8373..758c1aa5009d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/intel/uncore.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/intel/uncore.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/intel/uncore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/uncore.c</a></div><div class='hunk'>@@ -100,7 +100,13 @@ ssize_t uncore_event_show(struct kobject *kobj,</div><div class='ctx'> </div><div class='ctx'> struct intel_uncore_box *uncore_pmu_to_box(struct intel_uncore_pmu *pmu, int cpu)</div><div class='ctx'> {</div><div class='del'>-	return pmu-&gt;boxes[topology_logical_package_id(cpu)];</div><div class='add'>+	unsigned int pkgid = topology_logical_package_id(cpu);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The unsigned check also catches the '-1' return value for non</div><div class='add'>+	 * existent mappings in the topology map.</div><div class='add'>+	 */</div><div class='add'>+	return pkgid &lt; max_packages ? pmu-&gt;boxes[pkgid] : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u64 uncore_msr_read_counter(struct intel_uncore_box *box, struct perf_event *event)</div><div class='hunk'>@@ -733,6 +739,7 @@ static int uncore_pmu_register(struct intel_uncore_pmu *pmu)</div><div class='ctx'> 			.start		= uncore_pmu_event_start,</div><div class='ctx'> 			.stop		= uncore_pmu_event_stop,</div><div class='ctx'> 			.read		= uncore_pmu_event_read,</div><div class='add'>+			.module		= THIS_MODULE,</div><div class='ctx'> 		};</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pmu-&gt;pmu = *pmu-&gt;type-&gt;pmu;</div><div class='hunk'>@@ -763,30 +770,6 @@ static void uncore_pmu_unregister(struct intel_uncore_pmu *pmu)</div><div class='ctx'> 	pmu-&gt;registered = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __uncore_exit_boxes(struct intel_uncore_type *type, int cpu)</div><div class='del'>-{</div><div class='del'>-	struct intel_uncore_pmu *pmu = type-&gt;pmus;</div><div class='del'>-	struct intel_uncore_box *box;</div><div class='del'>-	int i, pkg;</div><div class='del'>-</div><div class='del'>-	if (pmu) {</div><div class='del'>-		pkg = topology_physical_package_id(cpu);</div><div class='del'>-		for (i = 0; i &lt; type-&gt;num_boxes; i++, pmu++) {</div><div class='del'>-			box = pmu-&gt;boxes[pkg];</div><div class='del'>-			if (box)</div><div class='del'>-				uncore_box_exit(box);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void uncore_exit_boxes(void *dummy)</div><div class='del'>-{</div><div class='del'>-	struct intel_uncore_type **types;</div><div class='del'>-</div><div class='del'>-	for (types = uncore_msr_uncores; *types; types++)</div><div class='del'>-		__uncore_exit_boxes(*types++, smp_processor_id());</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void uncore_free_boxes(struct intel_uncore_pmu *pmu)</div><div class='ctx'> {</div><div class='ctx'> 	int pkg;</div><div class='hunk'>@@ -1057,86 +1040,6 @@ static void uncore_pci_exit(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int uncore_cpu_dying(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	struct intel_uncore_type *type, **types = uncore_msr_uncores;</div><div class='del'>-	struct intel_uncore_pmu *pmu;</div><div class='del'>-	struct intel_uncore_box *box;</div><div class='del'>-	int i, pkg;</div><div class='del'>-</div><div class='del'>-	pkg = topology_logical_package_id(cpu);</div><div class='del'>-	for (; *types; types++) {</div><div class='del'>-		type = *types;</div><div class='del'>-		pmu = type-&gt;pmus;</div><div class='del'>-		for (i = 0; i &lt; type-&gt;num_boxes; i++, pmu++) {</div><div class='del'>-			box = pmu-&gt;boxes[pkg];</div><div class='del'>-			if (box &amp;&amp; atomic_dec_return(&amp;box-&gt;refcnt) == 0)</div><div class='del'>-				uncore_box_exit(box);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int first_init;</div><div class='del'>-</div><div class='del'>-static int uncore_cpu_starting(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	struct intel_uncore_type *type, **types = uncore_msr_uncores;</div><div class='del'>-	struct intel_uncore_pmu *pmu;</div><div class='del'>-	struct intel_uncore_box *box;</div><div class='del'>-	int i, pkg, ncpus = 1;</div><div class='del'>-</div><div class='del'>-	if (first_init) {</div><div class='del'>-		/*</div><div class='del'>-		 * On init we get the number of online cpus in the package</div><div class='del'>-		 * and set refcount for all of them.</div><div class='del'>-		 */</div><div class='del'>-		ncpus = cpumask_weight(topology_core_cpumask(cpu));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pkg = topology_logical_package_id(cpu);</div><div class='del'>-	for (; *types; types++) {</div><div class='del'>-		type = *types;</div><div class='del'>-		pmu = type-&gt;pmus;</div><div class='del'>-		for (i = 0; i &lt; type-&gt;num_boxes; i++, pmu++) {</div><div class='del'>-			box = pmu-&gt;boxes[pkg];</div><div class='del'>-			if (!box)</div><div class='del'>-				continue;</div><div class='del'>-			/* The first cpu on a package activates the box */</div><div class='del'>-			if (atomic_add_return(ncpus, &amp;box-&gt;refcnt) == ncpus)</div><div class='del'>-				uncore_box_init(box);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int uncore_cpu_prepare(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	struct intel_uncore_type *type, **types = uncore_msr_uncores;</div><div class='del'>-	struct intel_uncore_pmu *pmu;</div><div class='del'>-	struct intel_uncore_box *box;</div><div class='del'>-	int i, pkg;</div><div class='del'>-</div><div class='del'>-	pkg = topology_logical_package_id(cpu);</div><div class='del'>-	for (; *types; types++) {</div><div class='del'>-		type = *types;</div><div class='del'>-		pmu = type-&gt;pmus;</div><div class='del'>-		for (i = 0; i &lt; type-&gt;num_boxes; i++, pmu++) {</div><div class='del'>-			if (pmu-&gt;boxes[pkg])</div><div class='del'>-				continue;</div><div class='del'>-			/* First cpu of a package allocates the box */</div><div class='del'>-			box = uncore_alloc_box(type, cpu_to_node(cpu));</div><div class='del'>-			if (!box)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			box-&gt;pmu = pmu;</div><div class='del'>-			box-&gt;pkgid = pkg;</div><div class='del'>-			pmu-&gt;boxes[pkg] = box;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void uncore_change_type_ctx(struct intel_uncore_type *type, int old_cpu,</div><div class='ctx'> 				   int new_cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -1176,12 +1079,14 @@ static void uncore_change_context(struct intel_uncore_type **uncores,</div><div class='ctx'> </div><div class='ctx'> static int uncore_event_cpu_offline(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	int target;</div><div class='add'>+	struct intel_uncore_type *type, **types = uncore_msr_uncores;</div><div class='add'>+	struct intel_uncore_pmu *pmu;</div><div class='add'>+	struct intel_uncore_box *box;</div><div class='add'>+	int i, pkg, target;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if exiting cpu is used for collecting uncore events */</div><div class='ctx'> 	if (!cpumask_test_and_clear_cpu(cpu, &amp;uncore_cpu_mask))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='add'>+		goto unref;</div><div class='ctx'> 	/* Find a new cpu to collect uncore events */</div><div class='ctx'> 	target = cpumask_any_but(topology_core_cpumask(cpu), cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -1193,12 +1098,82 @@ static int uncore_event_cpu_offline(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> 	uncore_change_context(uncore_msr_uncores, cpu, target);</div><div class='ctx'> 	uncore_change_context(uncore_pci_uncores, cpu, target);</div><div class='add'>+</div><div class='add'>+unref:</div><div class='add'>+	/* Clear the references */</div><div class='add'>+	pkg = topology_logical_package_id(cpu);</div><div class='add'>+	for (; *types; types++) {</div><div class='add'>+		type = *types;</div><div class='add'>+		pmu = type-&gt;pmus;</div><div class='add'>+		for (i = 0; i &lt; type-&gt;num_boxes; i++, pmu++) {</div><div class='add'>+			box = pmu-&gt;boxes[pkg];</div><div class='add'>+			if (box &amp;&amp; atomic_dec_return(&amp;box-&gt;refcnt) == 0)</div><div class='add'>+				uncore_box_exit(box);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int allocate_boxes(struct intel_uncore_type **types,</div><div class='add'>+			 unsigned int pkg, unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct intel_uncore_box *box, *tmp;</div><div class='add'>+	struct intel_uncore_type *type;</div><div class='add'>+	struct intel_uncore_pmu *pmu;</div><div class='add'>+	LIST_HEAD(allocated);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Try to allocate all required boxes */</div><div class='add'>+	for (; *types; types++) {</div><div class='add'>+		type = *types;</div><div class='add'>+		pmu = type-&gt;pmus;</div><div class='add'>+		for (i = 0; i &lt; type-&gt;num_boxes; i++, pmu++) {</div><div class='add'>+			if (pmu-&gt;boxes[pkg])</div><div class='add'>+				continue;</div><div class='add'>+			box = uncore_alloc_box(type, cpu_to_node(cpu));</div><div class='add'>+			if (!box)</div><div class='add'>+				goto cleanup;</div><div class='add'>+			box-&gt;pmu = pmu;</div><div class='add'>+			box-&gt;pkgid = pkg;</div><div class='add'>+			list_add(&amp;box-&gt;active_list, &amp;allocated);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Install them in the pmus */</div><div class='add'>+	list_for_each_entry_safe(box, tmp, &amp;allocated, active_list) {</div><div class='add'>+		list_del_init(&amp;box-&gt;active_list);</div><div class='add'>+		box-&gt;pmu-&gt;boxes[pkg] = box;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	list_for_each_entry_safe(box, tmp, &amp;allocated, active_list) {</div><div class='add'>+		list_del_init(&amp;box-&gt;active_list);</div><div class='add'>+		kfree(box);</div><div class='add'>+	}</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int uncore_event_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	int target;</div><div class='add'>+	struct intel_uncore_type *type, **types = uncore_msr_uncores;</div><div class='add'>+	struct intel_uncore_pmu *pmu;</div><div class='add'>+	struct intel_uncore_box *box;</div><div class='add'>+	int i, ret, pkg, target;</div><div class='add'>+</div><div class='add'>+	pkg = topology_logical_package_id(cpu);</div><div class='add'>+	ret = allocate_boxes(types, pkg, cpu);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (; *types; types++) {</div><div class='add'>+		type = *types;</div><div class='add'>+		pmu = type-&gt;pmus;</div><div class='add'>+		for (i = 0; i &lt; type-&gt;num_boxes; i++, pmu++) {</div><div class='add'>+			box = pmu-&gt;boxes[pkg];</div><div class='add'>+			if (!box &amp;&amp; atomic_inc_return(&amp;box-&gt;refcnt) == 1)</div><div class='add'>+				uncore_box_init(box);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check if there is an online cpu in the package</div><div class='hunk'>@@ -1353,6 +1328,8 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {</div><div class='ctx'> 	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_DESKTOP,skl_uncore_init),</div><div class='ctx'> 	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE, skl_uncore_init),</div><div class='ctx'> 	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X,      skx_uncore_init),</div><div class='add'>+	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_MOBILE, skl_uncore_init),</div><div class='add'>+	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_DESKTOP, skl_uncore_init),</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1388,38 +1365,16 @@ static int __init intel_uncore_init(void)</div><div class='ctx'> 	if (cret &amp;&amp; pret)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Install callbacks. Core will call them for each online cpu.</div><div class='del'>-	 *</div><div class='del'>-	 * The first online cpu of each package allocates and takes</div><div class='del'>-	 * the refcounts for all other online cpus in that package.</div><div class='del'>-	 * If msrs are not enabled no allocation is required and</div><div class='del'>-	 * uncore_cpu_prepare() is not called for each online cpu.</div><div class='del'>-	 */</div><div class='del'>-	if (!cret) {</div><div class='del'>-	       ret = cpuhp_setup_state(CPUHP_PERF_X86_UNCORE_PREP,</div><div class='del'>-					"PERF_X86_UNCORE_PREP",</div><div class='del'>-					uncore_cpu_prepare, NULL);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	} else {</div><div class='del'>-		cpuhp_setup_state_nocalls(CPUHP_PERF_X86_UNCORE_PREP,</div><div class='del'>-					  "PERF_X86_UNCORE_PREP",</div><div class='del'>-					  uncore_cpu_prepare, NULL);</div><div class='del'>-	}</div><div class='del'>-	first_init = 1;</div><div class='del'>-	cpuhp_setup_state(CPUHP_AP_PERF_X86_UNCORE_STARTING,</div><div class='del'>-			  "AP_PERF_X86_UNCORE_STARTING",</div><div class='del'>-			  uncore_cpu_starting, uncore_cpu_dying);</div><div class='del'>-	first_init = 0;</div><div class='del'>-	cpuhp_setup_state(CPUHP_AP_PERF_X86_UNCORE_ONLINE,</div><div class='del'>-			  "AP_PERF_X86_UNCORE_ONLINE",</div><div class='del'>-			  uncore_event_cpu_online, uncore_event_cpu_offline);</div><div class='add'>+	/* Install hotplug callbacks to setup the targets for each package */</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_PERF_X86_UNCORE_ONLINE,</div><div class='add'>+				"perf/x86/intel/uncore:online",</div><div class='add'>+				uncore_event_cpu_online,</div><div class='add'>+				uncore_event_cpu_offline);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	/* Undo box-&gt;init_box() */</div><div class='del'>-	on_each_cpu_mask(&amp;uncore_cpu_mask, uncore_exit_boxes, NULL, 1);</div><div class='ctx'> 	uncore_types_exit(uncore_msr_uncores);</div><div class='ctx'> 	uncore_pci_exit();</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1428,9 +1383,7 @@ module_init(intel_uncore_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit intel_uncore_exit(void)</div><div class='ctx'> {</div><div class='del'>-	cpuhp_remove_state_nocalls(CPUHP_AP_PERF_X86_UNCORE_ONLINE);</div><div class='del'>-	cpuhp_remove_state_nocalls(CPUHP_AP_PERF_X86_UNCORE_STARTING);</div><div class='del'>-	cpuhp_remove_state_nocalls(CPUHP_PERF_X86_UNCORE_PREP);</div><div class='add'>+	cpuhp_remove_state(CPUHP_AP_PERF_X86_UNCORE_ONLINE);</div><div class='ctx'> 	uncore_types_exit(uncore_msr_uncores);</div><div class='ctx'> 	uncore_pci_exit();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c<br/>index 272427700d48..dae2fedc1601 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/intel/uncore_snbep.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/intel/uncore_snbep.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/intel/uncore_snbep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/intel/uncore_snbep.c</a></div><div class='hunk'>@@ -669,7 +669,7 @@ static struct event_constraint snbep_uncore_cbox_constraints[] = {</div><div class='ctx'> 	UNCORE_EVENT_CONSTRAINT(0x1c, 0xc),</div><div class='ctx'> 	UNCORE_EVENT_CONSTRAINT(0x1d, 0xc),</div><div class='ctx'> 	UNCORE_EVENT_CONSTRAINT(0x1e, 0xc),</div><div class='del'>-	EVENT_CONSTRAINT_OVERLAP(0x1f, 0xe, 0xff),</div><div class='add'>+	UNCORE_EVENT_CONSTRAINT(0x1f, 0xe),</div><div class='ctx'> 	UNCORE_EVENT_CONSTRAINT(0x21, 0x3),</div><div class='ctx'> 	UNCORE_EVENT_CONSTRAINT(0x23, 0x3),</div><div class='ctx'> 	UNCORE_EVENT_CONSTRAINT(0x31, 0x3),</div><div class='hunk'>@@ -2686,7 +2686,7 @@ static struct intel_uncore_type *hswep_msr_uncores[] = {</div><div class='ctx'> </div><div class='ctx'> void hswep_uncore_cpu_init(void)</div><div class='ctx'> {</div><div class='del'>-	int pkg = topology_phys_to_logical_pkg(0);</div><div class='add'>+	int pkg = boot_cpu_data.logical_proc_id;</div><div class='ctx'> </div><div class='ctx'> 	if (hswep_uncore_cbox.num_boxes &gt; boot_cpu_data.x86_max_cores)</div><div class='ctx'> 		hswep_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;</div><div class='head'>diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h<br/>index a77ee026643d..bcbb1d2ae10b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/events/perf_event.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/events/perf_event.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/events/perf_event.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/events/perf_event.h</a></div><div class='hunk'>@@ -604,7 +604,7 @@ struct x86_pmu {</div><div class='ctx'> 	u64		lbr_sel_mask;		   /* LBR_SELECT valid bits */</div><div class='ctx'> 	const int	*lbr_sel_map;		   /* lbr_select mappings */</div><div class='ctx'> 	bool		lbr_double_abort;	   /* duplicated lbr aborts */</div><div class='del'>-	bool		lbr_pt_coexist;		   /* LBR may coexist with PT */</div><div class='add'>+	bool		lbr_pt_coexist;		   /* (LBR|BTS) may coexist with PT */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Intel PT/LBR/BTS are exclusive</div><div class='head'>diff --git a/arch/x86/hyperv/Makefile b/arch/x86/hyperv/Makefile<br/>new file mode 100644<br/>index 000000000000..171ae09864d7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/hyperv/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/hyperv/Makefile</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+obj-y		:= hv_init.o</div><div class='head'>diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c<br/>new file mode 100644<br/>index 000000000000..db64baf0e500<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/hyperv/hv_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/hyperv/hv_init.c</a></div><div class='hunk'>@@ -0,0 +1,277 @@</div><div class='add'>+/*</div><div class='add'>+ * X86 specific Hyper-V initialization code.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016, Microsoft, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author : K. Y. Srinivasan &lt;kys@microsoft.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License version 2 as published</div><div class='add'>+ * by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or</div><div class='add'>+ * NON INFRINGEMENT.  See the GNU General Public License for more</div><div class='add'>+ * details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;asm/hypervisor.h&gt;</div><div class='add'>+#include &lt;asm/hyperv.h&gt;</div><div class='add'>+#include &lt;asm/mshyperv.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/clockchips.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+</div><div class='add'>+static struct ms_hyperv_tsc_page *tsc_pg;</div><div class='add'>+</div><div class='add'>+static u64 read_hv_clock_tsc(struct clocksource *arg)</div><div class='add'>+{</div><div class='add'>+	u64 current_tick;</div><div class='add'>+</div><div class='add'>+	if (tsc_pg-&gt;tsc_sequence != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Use the tsc page to compute the value.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		while (1) {</div><div class='add'>+			u64 tmp;</div><div class='add'>+			u32 sequence = tsc_pg-&gt;tsc_sequence;</div><div class='add'>+			u64 cur_tsc;</div><div class='add'>+			u64 scale = tsc_pg-&gt;tsc_scale;</div><div class='add'>+			s64 offset = tsc_pg-&gt;tsc_offset;</div><div class='add'>+</div><div class='add'>+			rdtscll(cur_tsc);</div><div class='add'>+			/* current_tick = ((cur_tsc *scale) &gt;&gt; 64) + offset */</div><div class='add'>+			asm("mulq %3"</div><div class='add'>+				: "=d" (current_tick), "=a" (tmp)</div><div class='add'>+				: "a" (cur_tsc), "r" (scale));</div><div class='add'>+</div><div class='add'>+			current_tick += offset;</div><div class='add'>+			if (tsc_pg-&gt;tsc_sequence == sequence)</div><div class='add'>+				return current_tick;</div><div class='add'>+</div><div class='add'>+			if (tsc_pg-&gt;tsc_sequence != 0)</div><div class='add'>+				continue;</div><div class='add'>+			/*</div><div class='add'>+			 * Fallback using MSR method.</div><div class='add'>+			 */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);</div><div class='add'>+	return current_tick;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource hyperv_cs_tsc = {</div><div class='add'>+		.name		= "hyperv_clocksource_tsc_page",</div><div class='add'>+		.rating		= 400,</div><div class='add'>+		.read		= read_hv_clock_tsc,</div><div class='add'>+		.mask		= CLOCKSOURCE_MASK(64),</div><div class='add'>+		.flags		= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static u64 read_hv_clock_msr(struct clocksource *arg)</div><div class='add'>+{</div><div class='add'>+	u64 current_tick;</div><div class='add'>+	/*</div><div class='add'>+	 * Read the partition counter to get the current tick count. This count</div><div class='add'>+	 * is set to 0 when the partition is created and is incremented in</div><div class='add'>+	 * 100 nanosecond units.</div><div class='add'>+	 */</div><div class='add'>+	rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);</div><div class='add'>+	return current_tick;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource hyperv_cs_msr = {</div><div class='add'>+	.name		= "hyperv_clocksource_msr",</div><div class='add'>+	.rating		= 400,</div><div class='add'>+	.read		= read_hv_clock_msr,</div><div class='add'>+	.mask		= CLOCKSOURCE_MASK(64),</div><div class='add'>+	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void *hypercall_pg;</div><div class='add'>+struct clocksource *hyperv_cs;</div><div class='add'>+EXPORT_SYMBOL_GPL(hyperv_cs);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function is to be invoked early in the boot sequence after the</div><div class='add'>+ * hypervisor has been detected.</div><div class='add'>+ *</div><div class='add'>+ * 1. Setup the hypercall page.</div><div class='add'>+ * 2. Register Hyper-V specific clocksource.</div><div class='add'>+ */</div><div class='add'>+void hyperv_init(void)</div><div class='add'>+{</div><div class='add'>+	u64 guest_id;</div><div class='add'>+	union hv_x64_msr_hypercall_contents hypercall_msr;</div><div class='add'>+</div><div class='add'>+	if (x86_hyper != &amp;x86_hyper_ms_hyperv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the hypercall page and enable hypercalls.</div><div class='add'>+	 * 1. Register the guest ID</div><div class='add'>+	 * 2. Enable the hypercall and register the hypercall page</div><div class='add'>+	 */</div><div class='add'>+	guest_id = generate_guest_id(0, LINUX_VERSION_CODE, 0);</div><div class='add'>+	wrmsrl(HV_X64_MSR_GUEST_OS_ID, guest_id);</div><div class='add'>+</div><div class='add'>+	hypercall_pg  = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);</div><div class='add'>+	if (hypercall_pg == NULL) {</div><div class='add'>+		wrmsrl(HV_X64_MSR_GUEST_OS_ID, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);</div><div class='add'>+	hypercall_msr.enable = 1;</div><div class='add'>+	hypercall_msr.guest_physical_address = vmalloc_to_pfn(hypercall_pg);</div><div class='add'>+	wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Register Hyper-V specific clocksource.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	if (ms_hyperv.features &amp; HV_X64_MSR_REFERENCE_TSC_AVAILABLE) {</div><div class='add'>+		union hv_x64_msr_hypercall_contents tsc_msr;</div><div class='add'>+</div><div class='add'>+		tsc_pg = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL);</div><div class='add'>+		if (!tsc_pg)</div><div class='add'>+			goto register_msr_cs;</div><div class='add'>+</div><div class='add'>+		hyperv_cs = &amp;hyperv_cs_tsc;</div><div class='add'>+</div><div class='add'>+		rdmsrl(HV_X64_MSR_REFERENCE_TSC, tsc_msr.as_uint64);</div><div class='add'>+</div><div class='add'>+		tsc_msr.enable = 1;</div><div class='add'>+		tsc_msr.guest_physical_address = vmalloc_to_pfn(tsc_pg);</div><div class='add'>+</div><div class='add'>+		wrmsrl(HV_X64_MSR_REFERENCE_TSC, tsc_msr.as_uint64);</div><div class='add'>+		clocksource_register_hz(&amp;hyperv_cs_tsc, NSEC_PER_SEC/100);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 * For 32 bit guests just use the MSR based mechanism for reading</div><div class='add'>+	 * the partition counter.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+register_msr_cs:</div><div class='add'>+	hyperv_cs = &amp;hyperv_cs_msr;</div><div class='add'>+	if (ms_hyperv.features &amp; HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)</div><div class='add'>+		clocksource_register_hz(&amp;hyperv_cs_msr, NSEC_PER_SEC/100);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This routine is called before kexec/kdump, it does the required cleanup.</div><div class='add'>+ */</div><div class='add'>+void hyperv_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	union hv_x64_msr_hypercall_contents hypercall_msr;</div><div class='add'>+</div><div class='add'>+	/* Reset our OS id */</div><div class='add'>+	wrmsrl(HV_X64_MSR_GUEST_OS_ID, 0);</div><div class='add'>+</div><div class='add'>+	/* Reset the hypercall page */</div><div class='add'>+	hypercall_msr.as_uint64 = 0;</div><div class='add'>+	wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);</div><div class='add'>+</div><div class='add'>+	/* Reset the TSC page */</div><div class='add'>+	hypercall_msr.as_uint64 = 0;</div><div class='add'>+	wrmsrl(HV_X64_MSR_REFERENCE_TSC, hypercall_msr.as_uint64);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hyperv_cleanup);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * hv_do_hypercall- Invoke the specified hypercall</div><div class='add'>+ */</div><div class='add'>+u64 hv_do_hypercall(u64 control, void *input, void *output)</div><div class='add'>+{</div><div class='add'>+	u64 input_address = (input) ? virt_to_phys(input) : 0;</div><div class='add'>+	u64 output_address = (output) ? virt_to_phys(output) : 0;</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	u64 hv_status = 0;</div><div class='add'>+</div><div class='add'>+	if (!hypercall_pg)</div><div class='add'>+		return (u64)ULLONG_MAX;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__("mov %0, %%r8" : : "r" (output_address) : "r8");</div><div class='add'>+	__asm__ __volatile__("call *%3" : "=a" (hv_status) :</div><div class='add'>+			     "c" (control), "d" (input_address),</div><div class='add'>+			     "m" (hypercall_pg));</div><div class='add'>+</div><div class='add'>+	return hv_status;</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+	u32 control_hi = control &gt;&gt; 32;</div><div class='add'>+	u32 control_lo = control &amp; 0xFFFFFFFF;</div><div class='add'>+	u32 hv_status_hi = 1;</div><div class='add'>+	u32 hv_status_lo = 1;</div><div class='add'>+	u32 input_address_hi = input_address &gt;&gt; 32;</div><div class='add'>+	u32 input_address_lo = input_address &amp; 0xFFFFFFFF;</div><div class='add'>+	u32 output_address_hi = output_address &gt;&gt; 32;</div><div class='add'>+	u32 output_address_lo = output_address &amp; 0xFFFFFFFF;</div><div class='add'>+</div><div class='add'>+	if (!hypercall_pg)</div><div class='add'>+		return (u64)ULLONG_MAX;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),</div><div class='add'>+			      "=a"(hv_status_lo) : "d" (control_hi),</div><div class='add'>+			      "a" (control_lo), "b" (input_address_hi),</div><div class='add'>+			      "c" (input_address_lo), "D"(output_address_hi),</div><div class='add'>+			      "S"(output_address_lo), "m" (hypercall_pg));</div><div class='add'>+</div><div class='add'>+	return hv_status_lo | ((u64)hv_status_hi &lt;&lt; 32);</div><div class='add'>+#endif /* !x86_64 */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hv_do_hypercall);</div><div class='add'>+</div><div class='add'>+void hyperv_report_panic(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	static bool panic_reported;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We prefer to report panic on 'die' chain as we have proper</div><div class='add'>+	 * registers to report, but if we miss it (e.g. on BUG()) we need</div><div class='add'>+	 * to report it on 'panic'.</div><div class='add'>+	 */</div><div class='add'>+	if (panic_reported)</div><div class='add'>+		return;</div><div class='add'>+	panic_reported = true;</div><div class='add'>+</div><div class='add'>+	wrmsrl(HV_X64_MSR_CRASH_P0, regs-&gt;ip);</div><div class='add'>+	wrmsrl(HV_X64_MSR_CRASH_P1, regs-&gt;ax);</div><div class='add'>+	wrmsrl(HV_X64_MSR_CRASH_P2, regs-&gt;bx);</div><div class='add'>+	wrmsrl(HV_X64_MSR_CRASH_P3, regs-&gt;cx);</div><div class='add'>+	wrmsrl(HV_X64_MSR_CRASH_P4, regs-&gt;dx);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Let Hyper-V know there is crash data available</div><div class='add'>+	 */</div><div class='add'>+	wrmsrl(HV_X64_MSR_CRASH_CTL, HV_CRASH_CTL_CRASH_NOTIFY);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hyperv_report_panic);</div><div class='add'>+</div><div class='add'>+bool hv_is_hypercall_page_setup(void)</div><div class='add'>+{</div><div class='add'>+	union hv_x64_msr_hypercall_contents hypercall_msr;</div><div class='add'>+</div><div class='add'>+	/* Check if the hypercall page is setup */</div><div class='add'>+	hypercall_msr.as_uint64 = 0;</div><div class='add'>+	rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);</div><div class='add'>+</div><div class='add'>+	if (!hypercall_msr.enable)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hv_is_hypercall_page_setup);</div><div class='head'>diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c<br/>index cb26f18d43af..8d0879f1d42c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/ia32/ia32_aout.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/ia32/ia32_aout.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/ia32/ia32_aout.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/ia32/ia32_aout.c</a></div><div class='hunk'>@@ -26,8 +26,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/user32.h&gt;</div><div class='head'>diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c<br/>index cb13c0564ea7..724153797209 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/ia32/ia32_signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/ia32/ia32_signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/ia32/ia32_signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/ia32/ia32_signal.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -20,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/binfmts.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/internal.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/signal.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c<br/>index 719cd702b0a4..47956c6a4fd8 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/ia32/sys_ia32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/ia32/sys_ia32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/ia32/sys_ia32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/ia32/sys_ia32.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/mman.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/vgtod.h&gt;</div><div class='ctx'> #include &lt;asm/sys_ia32.h&gt;</div><div class='head'>diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild<br/>index 2cfed174e3c9..5d6a53fd7521 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/Kbuild</a></div><div class='hunk'>@@ -6,12 +6,7 @@ generated-y += unistd_32_ia32.h</div><div class='ctx'> generated-y += unistd_64_x32.h</div><div class='ctx'> generated-y += xen-hypercalls.h</div><div class='ctx'> </div><div class='del'>-genhdr-y += unistd_32.h</div><div class='del'>-genhdr-y += unistd_64.h</div><div class='del'>-genhdr-y += unistd_x32.h</div><div class='del'>-</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += dma-contiguous.h</div><div class='ctx'> generic-y += early_ioremap.h</div><div class='ctx'> generic-y += mcs_spinlock.h</div><div class='head'>diff --git a/arch/x86/include/asm/a.out-core.h b/arch/x86/include/asm/a.out-core.h<br/>index 7a15588e45d4..7d3ece8bfb61 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/a.out-core.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/a.out-core.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/a.out-core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/a.out-core.h</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/debugreg.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h<br/>index 5391b0ae7cc3..395b69551fce 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/acpi.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/acpi.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/acpi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/acpi.h</a></div><div class='hunk'>@@ -94,7 +94,7 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)</div><div class='ctx'> 	    boot_cpu_data.x86_model &lt;= 0x05 &amp;&amp;</div><div class='ctx'> 	    boot_cpu_data.x86_mask &lt; 0x0A)</div><div class='ctx'> 		return 1;</div><div class='del'>-	else if (amd_e400_c1e_detected)</div><div class='add'>+	else if (boot_cpu_has(X86_BUG_AMD_APIC_C1E))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		return max_cstate;</div><div class='head'>diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h<br/>index 5e828da2e18f..00c88a01301d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/amd_nb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/amd_nb.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/amd_nb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/amd_nb.h</a></div><div class='hunk'>@@ -21,6 +21,10 @@ extern int amd_numa_init(void);</div><div class='ctx'> extern int amd_get_subcaches(int);</div><div class='ctx'> extern int amd_set_subcaches(int, unsigned long);</div><div class='ctx'> </div><div class='add'>+extern int amd_smn_read(u16 node, u32 address, u32 *value);</div><div class='add'>+extern int amd_smn_write(u16 node, u32 address, u32 value);</div><div class='add'>+extern int amd_df_indirect_read(u16 node, u8 func, u16 reg, u8 instance_id, u32 *lo);</div><div class='add'>+</div><div class='ctx'> struct amd_l3_cache {</div><div class='ctx'> 	unsigned indices;</div><div class='ctx'> 	u8	 subcaches[4];</div><div class='hunk'>@@ -55,6 +59,7 @@ struct threshold_bank {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct amd_northbridge {</div><div class='add'>+	struct pci_dev *root;</div><div class='ctx'> 	struct pci_dev *misc;</div><div class='ctx'> 	struct pci_dev *link;</div><div class='ctx'> 	struct amd_l3_cache l3_cache;</div><div class='hunk'>@@ -66,7 +71,6 @@ struct amd_northbridge_info {</div><div class='ctx'> 	u64 flags;</div><div class='ctx'> 	struct amd_northbridge *nb;</div><div class='ctx'> };</div><div class='del'>-extern struct amd_northbridge_info amd_northbridges;</div><div class='ctx'> </div><div class='ctx'> #define AMD_NB_GART			BIT(0)</div><div class='ctx'> #define AMD_NB_L3_INDEX_DISABLE		BIT(1)</div><div class='hunk'>@@ -74,20 +78,9 @@ extern struct amd_northbridge_info amd_northbridges;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_AMD_NB</div><div class='ctx'> </div><div class='del'>-static inline u16 amd_nb_num(void)</div><div class='del'>-{</div><div class='del'>-	return amd_northbridges.num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool amd_nb_has_feature(unsigned feature)</div><div class='del'>-{</div><div class='del'>-	return ((amd_northbridges.flags &amp; feature) == feature);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct amd_northbridge *node_to_amd_nb(int node)</div><div class='del'>-{</div><div class='del'>-	return (node &lt; amd_northbridges.num) ? &amp;amd_northbridges.nb[node] : NULL;</div><div class='del'>-}</div><div class='add'>+u16 amd_nb_num(void);</div><div class='add'>+bool amd_nb_has_feature(unsigned int feature);</div><div class='add'>+struct amd_northbridge *node_to_amd_nb(int node);</div><div class='ctx'> </div><div class='ctx'> static inline u16 amd_pci_dev_to_node_id(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h<br/>index f5aaf6c83222..730ef65e8393 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/apic.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/apic.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/apic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/apic.h</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> #define _ASM_X86_APIC_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/alternative.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='hunk'>@@ -11,7 +10,6 @@</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ARCH_APICTIMER_STOPS_ON_C3	1</div><div class='ctx'> </div><div class='hunk'>@@ -196,7 +194,7 @@ static inline void native_apic_msr_write(u32 reg, u32 v)</div><div class='ctx'> </div><div class='ctx'> static inline void native_apic_msr_eoi_write(u32 reg, u32 v)</div><div class='ctx'> {</div><div class='del'>-	wrmsr(APIC_BASE_MSR + (APIC_EOI &gt;&gt; 4), APIC_EOI_ACK, 0);</div><div class='add'>+	__wrmsr(APIC_BASE_MSR + (APIC_EOI &gt;&gt; 4), APIC_EOI_ACK, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32 native_apic_msr_read(u32 reg)</div><div class='hunk'>@@ -332,6 +330,7 @@ struct apic {</div><div class='ctx'> 	 * on write for EOI.</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*eoi_write)(u32 reg, u32 v);</div><div class='add'>+	void (*native_eoi_write)(u32 reg, u32 v);</div><div class='ctx'> 	u64 (*icr_read)(void);</div><div class='ctx'> 	void (*icr_write)(u32 low, u32 high);</div><div class='ctx'> 	void (*wait_icr_idle)(void);</div><div class='hunk'>@@ -639,7 +638,6 @@ extern void irq_exit(void);</div><div class='ctx'> static inline void entering_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	irq_enter();</div><div class='del'>-	exit_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void entering_ack_irq(void)</div><div class='head'>diff --git a/arch/x86/include/asm/asm-prototypes.h b/arch/x86/include/asm/asm-prototypes.h<br/>new file mode 100644<br/>index 000000000000..830b19dbfa31<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/asm-prototypes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/asm-prototypes.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+#include &lt;asm/ftrace.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/string.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/checksum.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/asm-prototypes.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/special_insns.h&gt;</div><div class='add'>+#include &lt;asm/preempt.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_X86_CMPXCHG64</div><div class='add'>+extern void cmpxchg8b_emu(void);</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h<br/>index 68557f52b961..854022772c5b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/bitops.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/bitops.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/bitops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/bitops.h</a></div><div class='hunk'>@@ -139,6 +139,19 @@ static __always_inline void __clear_bit(long nr, volatile unsigned long *addr)</div><div class='ctx'> 	asm volatile("btr %1,%0" : ADDR : "Ir" (nr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __always_inline bool clear_bit_unlock_is_negative_byte(long nr, volatile unsigned long *addr)</div><div class='add'>+{</div><div class='add'>+	bool negative;</div><div class='add'>+	asm volatile(LOCK_PREFIX "andb %2,%1\n\t"</div><div class='add'>+		CC_SET(s)</div><div class='add'>+		: CC_OUT(s) (negative), ADDR</div><div class='add'>+		: "ir" ((char) ~(1 &lt;&lt; nr)) : "memory");</div><div class='add'>+	return negative;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Let everybody know we have it</div><div class='add'>+#define clear_bit_unlock_is_negative_byte clear_bit_unlock_is_negative_byte</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * __clear_bit_unlock - Clears a bit in memory</div><div class='ctx'>  * @nr: Bit to clear</div><div class='head'>diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h<br/>index 872877d930de..e7e1942edff7 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/cacheflush.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/cacheflush.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/cacheflush.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/cacheflush.h</a></div><div class='hunk'>@@ -90,18 +90,8 @@ void clflush_cache_range(void *addr, unsigned int size);</div><div class='ctx'> </div><div class='ctx'> #define mmio_flush_range(addr, size) clflush_cache_range(addr, size)</div><div class='ctx'> </div><div class='del'>-extern const int rodata_test_data;</div><div class='ctx'> extern int kernel_set_to_readonly;</div><div class='ctx'> void set_kernel_text_rw(void);</div><div class='ctx'> void set_kernel_text_ro(void);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_RODATA_TEST</div><div class='del'>-int rodata_test(void);</div><div class='del'>-#else</div><div class='del'>-static inline int rodata_test(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif /* _ASM_X86_CACHEFLUSH_H */</div><div class='head'>diff --git a/arch/x86/include/asm/checksum_64.h b/arch/x86/include/asm/checksum_64.h<br/>index c020ee75dce7..08e7efb2c140 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/checksum_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/checksum_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/checksum_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/checksum_64.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h<br/>index 1d2b69fc0ceb..d59c15c3defd 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/cpufeature.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/cpufeature.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/cpufeature.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/cpufeature.h</a></div><div class='hunk'>@@ -204,6 +204,7 @@ static __always_inline __pure bool _static_cpu_has(u16 bit)</div><div class='ctx'> </div><div class='ctx'> #define static_cpu_has_bug(bit)		static_cpu_has((bit))</div><div class='ctx'> #define boot_cpu_has_bug(bit)		cpu_has_bug(&amp;boot_cpu_data, (bit))</div><div class='add'>+#define boot_cpu_set_bug(bit)		set_cpu_cap(&amp;boot_cpu_data, (bit))</div><div class='ctx'> </div><div class='ctx'> #define MAX_CPU_FEATURES		(NCAPINTS * 32)</div><div class='ctx'> #define cpu_have_feature		boot_cpu_has</div><div class='head'>diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h<br/>index a39629206864..4e7772387c6e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/cpufeatures.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/cpufeatures.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/cpufeatures.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/cpufeatures.h</a></div><div class='hunk'>@@ -100,12 +100,12 @@</div><div class='ctx'> #define X86_FEATURE_XTOPOLOGY	( 3*32+22) /* cpu topology enum extensions */</div><div class='ctx'> #define X86_FEATURE_TSC_RELIABLE ( 3*32+23) /* TSC is known to be reliable */</div><div class='ctx'> #define X86_FEATURE_NONSTOP_TSC	( 3*32+24) /* TSC does not stop in C states */</div><div class='del'>-/* free, was #define X86_FEATURE_CLFLUSH_MONITOR ( 3*32+25) * "" clflush reqd with monitor */</div><div class='add'>+#define X86_FEATURE_CPUID	( 3*32+25) /* CPU has CPUID instruction itself */</div><div class='ctx'> #define X86_FEATURE_EXTD_APICID	( 3*32+26) /* has extended APICID (8 bits) */</div><div class='ctx'> #define X86_FEATURE_AMD_DCM     ( 3*32+27) /* multi-node processor */</div><div class='ctx'> #define X86_FEATURE_APERFMPERF	( 3*32+28) /* APERFMPERF */</div><div class='del'>-#define X86_FEATURE_EAGER_FPU	( 3*32+29) /* "eagerfpu" Non lazy FPU restore */</div><div class='ctx'> #define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30) /* TSC doesn't stop in S3 state */</div><div class='add'>+#define X86_FEATURE_TSC_KNOWN_FREQ ( 3*32+31) /* TSC has known frequency */</div><div class='ctx'> </div><div class='ctx'> /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */</div><div class='ctx'> #define X86_FEATURE_XMM3	( 4*32+ 0) /* "pni" SSE-3 */</div><div class='hunk'>@@ -186,13 +186,17 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Reuse free bits when adding new feature flags!</div><div class='ctx'>  */</div><div class='del'>-</div><div class='add'>+#define X86_FEATURE_RING3MWAIT	( 7*32+ 0) /* Ring 3 MONITOR/MWAIT */</div><div class='ctx'> #define X86_FEATURE_CPB		( 7*32+ 2) /* AMD Core Performance Boost */</div><div class='ctx'> #define X86_FEATURE_EPB		( 7*32+ 3) /* IA32_ENERGY_PERF_BIAS support */</div><div class='add'>+#define X86_FEATURE_CAT_L3	( 7*32+ 4) /* Cache Allocation Technology L3 */</div><div class='add'>+#define X86_FEATURE_CAT_L2	( 7*32+ 5) /* Cache Allocation Technology L2 */</div><div class='add'>+#define X86_FEATURE_CDP_L3	( 7*32+ 6) /* Code and Data Prioritization L3 */</div><div class='ctx'> </div><div class='ctx'> #define X86_FEATURE_HW_PSTATE	( 7*32+ 8) /* AMD HW-PState */</div><div class='ctx'> #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */</div><div class='ctx'> </div><div class='add'>+#define X86_FEATURE_INTEL_PPIN	( 7*32+14) /* Intel Processor Inventory Number */</div><div class='ctx'> #define X86_FEATURE_INTEL_PT	( 7*32+15) /* Intel Processor Trace */</div><div class='ctx'> #define X86_FEATURE_AVX512_4VNNIW (7*32+16) /* AVX-512 Neural Network Instructions */</div><div class='ctx'> #define X86_FEATURE_AVX512_4FMAPS (7*32+17) /* AVX-512 Multiply Accumulation Single precision */</div><div class='hunk'>@@ -221,11 +225,13 @@</div><div class='ctx'> #define X86_FEATURE_RTM		( 9*32+11) /* Restricted Transactional Memory */</div><div class='ctx'> #define X86_FEATURE_CQM		( 9*32+12) /* Cache QoS Monitoring */</div><div class='ctx'> #define X86_FEATURE_MPX		( 9*32+14) /* Memory Protection Extension */</div><div class='add'>+#define X86_FEATURE_RDT_A	( 9*32+15) /* Resource Director Technology Allocation */</div><div class='ctx'> #define X86_FEATURE_AVX512F	( 9*32+16) /* AVX-512 Foundation */</div><div class='ctx'> #define X86_FEATURE_AVX512DQ	( 9*32+17) /* AVX-512 DQ (Double/Quad granular) Instructions */</div><div class='ctx'> #define X86_FEATURE_RDSEED	( 9*32+18) /* The RDSEED instruction */</div><div class='ctx'> #define X86_FEATURE_ADX		( 9*32+19) /* The ADCX and ADOX instructions */</div><div class='ctx'> #define X86_FEATURE_SMAP	( 9*32+20) /* Supervisor Mode Access Prevention */</div><div class='add'>+#define X86_FEATURE_AVX512IFMA  ( 9*32+21) /* AVX-512 Integer Fused Multiply-Add instructions */</div><div class='ctx'> #define X86_FEATURE_CLFLUSHOPT	( 9*32+23) /* CLFLUSHOPT instruction */</div><div class='ctx'> #define X86_FEATURE_CLWB	( 9*32+24) /* CLWB instruction */</div><div class='ctx'> #define X86_FEATURE_AVX512PF	( 9*32+26) /* AVX-512 Prefetch */</div><div class='hunk'>@@ -279,8 +285,11 @@</div><div class='ctx'> #define X86_FEATURE_AVIC	(15*32+13) /* Virtual Interrupt Controller */</div><div class='ctx'> </div><div class='ctx'> /* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */</div><div class='add'>+#define X86_FEATURE_AVX512VBMI  (16*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/</div><div class='ctx'> #define X86_FEATURE_PKU		(16*32+ 3) /* Protection Keys for Userspace */</div><div class='ctx'> #define X86_FEATURE_OSPKE	(16*32+ 4) /* OS Protection Keys Enable */</div><div class='add'>+#define X86_FEATURE_AVX512_VPOPCNTDQ (16*32+14) /* POPCNT for vectors of DW/QW */</div><div class='add'>+#define X86_FEATURE_RDPID	(16*32+ 22) /* RDPID instruction */</div><div class='ctx'> </div><div class='ctx'> /* AMD-defined CPU features, CPUID level 0x80000007 (ebx), word 17 */</div><div class='ctx'> #define X86_FEATURE_OVERFLOW_RECOV (17*32+0) /* MCA overflow recovery support */</div><div class='hunk'>@@ -311,4 +320,5 @@</div><div class='ctx'> #define X86_BUG_NULL_SEG	X86_BUG(10) /* Nulling a selector preserves the base */</div><div class='ctx'> #define X86_BUG_SWAPGS_FENCE	X86_BUG(11) /* SWAPGS without input dep on GS */</div><div class='ctx'> #define X86_BUG_MONITOR		X86_BUG(12) /* IPI required to wake up remote CPU */</div><div class='add'>+#define X86_BUG_AMD_E400	X86_BUG(13) /* CPU is among the affected by Erratum 400 */</div><div class='ctx'> #endif /* _ASM_X86_CPUFEATURES_H */</div><div class='head'>diff --git a/arch/x86/include/asm/crypto/glue_helper.h b/arch/x86/include/asm/crypto/glue_helper.h<br/>index 03bb1065c335..29e53ea7d764 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/crypto/glue_helper.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/crypto/glue_helper.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/crypto/glue_helper.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/crypto/glue_helper.h</a></div><div class='hunk'>@@ -5,8 +5,8 @@</div><div class='ctx'> #ifndef _CRYPTO_GLUE_HELPER_H</div><div class='ctx'> #define _CRYPTO_GLUE_HELPER_H</div><div class='ctx'> </div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/api.h&gt;</div><div class='ctx'> #include &lt;crypto/b128ops.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -69,6 +69,31 @@ static inline bool glue_fpu_begin(unsigned int bsize, int fpu_blocks_limit,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool glue_skwalk_fpu_begin(unsigned int bsize,</div><div class='add'>+					 int fpu_blocks_limit,</div><div class='add'>+					 struct skcipher_walk *walk,</div><div class='add'>+					 bool fpu_enabled, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	if (likely(fpu_blocks_limit &lt; 0))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (fpu_enabled)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Vector-registers are only used when chunk to be processed is large</div><div class='add'>+	 * enough, so do not enable FPU until it is necessary.</div><div class='add'>+	 */</div><div class='add'>+	if (nbytes &lt; bsize * (unsigned int)fpu_blocks_limit)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* prevent sleeping if FPU is in use */</div><div class='add'>+	skcipher_walk_atomise(walk);</div><div class='add'>+</div><div class='add'>+	kernel_fpu_begin();</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void glue_fpu_end(bool fpu_enabled)</div><div class='ctx'> {</div><div class='ctx'> 	if (fpu_enabled)</div><div class='hunk'>@@ -139,6 +164,18 @@ extern int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,</div><div class='ctx'> 				 common_glue_func_t tweak_fn, void *tweak_ctx,</div><div class='ctx'> 				 void *crypt_ctx);</div><div class='ctx'> </div><div class='add'>+extern int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,</div><div class='add'>+				 struct blkcipher_desc *desc,</div><div class='add'>+				 struct scatterlist *dst,</div><div class='add'>+				 struct scatterlist *src, unsigned int nbytes,</div><div class='add'>+				 common_glue_func_t tweak_fn, void *tweak_ctx,</div><div class='add'>+				 void *crypt_ctx);</div><div class='add'>+</div><div class='add'>+extern int glue_xts_req_128bit(const struct common_glue_ctx *gctx,</div><div class='add'>+			       struct skcipher_request *req,</div><div class='add'>+			       common_glue_func_t tweak_fn, void *tweak_ctx,</div><div class='add'>+			       void *crypt_ctx);</div><div class='add'>+</div><div class='ctx'> extern void glue_xts_crypt_128bit_one(void *ctx, u128 *dst, const u128 *src,</div><div class='ctx'> 				      le128 *iv, common_glue_func_t fn);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h<br/>index 12080d87da3b..1548ca92ad3f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/desc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/desc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/desc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/desc.h</a></div><div class='hunk'>@@ -177,16 +177,8 @@ static inline void __set_tss_desc(unsigned cpu, unsigned int entry, void *addr)</div><div class='ctx'> 	struct desc_struct *d = get_cpu_gdt_table(cpu);</div><div class='ctx'> 	tss_desc tss;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * sizeof(unsigned long) coming from an extra "long" at the end</div><div class='del'>-	 * of the iobitmap. See tss_struct definition in processor.h</div><div class='del'>-	 *</div><div class='del'>-	 * -1? seg base+limit should be pointing to the address of the</div><div class='del'>-	 * last valid byte</div><div class='del'>-	 */</div><div class='ctx'> 	set_tssldt_descriptor(&amp;tss, (unsigned long)addr, DESC_TSS,</div><div class='del'>-			      IO_BITMAP_OFFSET + IO_BITMAP_BYTES +</div><div class='del'>-			      sizeof(unsigned long) - 1);</div><div class='add'>+			      __KERNEL_TSS_LIMIT);</div><div class='ctx'> 	write_gdt_entry(d, entry, &amp;tss, DESC_TSS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -213,6 +205,58 @@ static inline void native_load_tr_desc(void)</div><div class='ctx'> 	asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DECLARE_PER_CPU(bool, __tss_limit_invalid);</div><div class='add'>+</div><div class='add'>+static inline void force_reload_TR(void)</div><div class='add'>+{</div><div class='add'>+	struct desc_struct *d = get_cpu_gdt_table(smp_processor_id());</div><div class='add'>+	tss_desc tss;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;tss, &amp;d[GDT_ENTRY_TSS], sizeof(tss_desc));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * LTR requires an available TSS, and the TSS is currently</div><div class='add'>+	 * busy.  Make it be available so that LTR will work.</div><div class='add'>+	 */</div><div class='add'>+	tss.type = DESC_TSS;</div><div class='add'>+	write_gdt_entry(d, GDT_ENTRY_TSS, &amp;tss, DESC_TSS);</div><div class='add'>+</div><div class='add'>+	load_TR_desc();</div><div class='add'>+	this_cpu_write(__tss_limit_invalid, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Call this if you need the TSS limit to be correct, which should be the case</div><div class='add'>+ * if and only if you have TIF_IO_BITMAP set or you're switching to a task</div><div class='add'>+ * with TIF_IO_BITMAP set.</div><div class='add'>+ */</div><div class='add'>+static inline void refresh_tss_limit(void)</div><div class='add'>+{</div><div class='add'>+	DEBUG_LOCKS_WARN_ON(preemptible());</div><div class='add'>+</div><div class='add'>+	if (unlikely(this_cpu_read(__tss_limit_invalid)))</div><div class='add'>+		force_reload_TR();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If you do something evil that corrupts the cached TSS limit (I'm looking</div><div class='add'>+ * at you, VMX exits), call this function.</div><div class='add'>+ *</div><div class='add'>+ * The optimization here is that the TSS limit only matters for Linux if the</div><div class='add'>+ * IO bitmap is in use.  If the TSS limit gets forced to its minimum value,</div><div class='add'>+ * everything works except that IO bitmap will be ignored and all CPL 3 IO</div><div class='add'>+ * instructions will #GP, which is exactly what we want for normal tasks.</div><div class='add'>+ */</div><div class='add'>+static inline void invalidate_tss_limit(void)</div><div class='add'>+{</div><div class='add'>+	DEBUG_LOCKS_WARN_ON(preemptible());</div><div class='add'>+</div><div class='add'>+	if (unlikely(test_thread_flag(TIF_IO_BITMAP)))</div><div class='add'>+		force_reload_TR();</div><div class='add'>+	else</div><div class='add'>+		this_cpu_write(__tss_limit_invalid, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void native_load_gdt(const struct desc_ptr *dtr)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile("lgdt %0"::"m" (*dtr));</div><div class='head'>diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h<br/>index eb5deb42484d..49265345d4d2 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/desc_defs.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/desc_defs.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/desc_defs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/desc_defs.h</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  * FIXME: Accessing the desc_struct through its fields is more elegant,</div><div class='ctx'>  * and should be the one valid thing to do. However, a lot of open code</div><div class='ctx'>  * still touches the a and b accessors, and doing this allow us to do it</div><div class='del'>- * incrementally. We keep the signature as a struct, rather than an union,</div><div class='add'>+ * incrementally. We keep the signature as a struct, rather than a union,</div><div class='ctx'>  * so we can get rid of it transparently in the future -- glommer</div><div class='ctx'>  */</div><div class='ctx'> /* 8 byte segment descriptor */</div><div class='head'>diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h<br/>index 684ed6c3aa67..1b3ef26e77df 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/device.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/device.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/device.h</a></div><div class='hunk'>@@ -2,9 +2,6 @@</div><div class='ctx'> #define _ASM_X86_DEVICE_H</div><div class='ctx'> </div><div class='ctx'> struct dev_archdata {</div><div class='del'>-#ifdef CONFIG_X86_DEV_DMA_OPS</div><div class='del'>-	struct dma_map_ops *dma_ops;</div><div class='del'>-#endif</div><div class='ctx'> #if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_AMD_IOMMU)</div><div class='ctx'> 	void *iommu; /* hook for IOMMU specific extension */</div><div class='ctx'> #endif</div><div class='hunk'>@@ -13,7 +10,7 @@ struct dev_archdata {</div><div class='ctx'> #if defined(CONFIG_X86_DEV_DMA_OPS) &amp;&amp; defined(CONFIG_PCI_DOMAINS)</div><div class='ctx'> struct dma_domain {</div><div class='ctx'> 	struct list_head node;</div><div class='del'>-	struct dma_map_ops *dma_ops;</div><div class='add'>+	const struct dma_map_ops *dma_ops;</div><div class='ctx'> 	int domain_nr;</div><div class='ctx'> };</div><div class='ctx'> void add_dma_domain(struct dma_domain *domain);</div><div class='head'>diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h<br/>index ced283ac79df..af95c47d5c9e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/div64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/div64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/div64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/div64.h</a></div><div class='hunk'>@@ -59,6 +59,17 @@ static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)</div><div class='ctx'> }</div><div class='ctx'> #define div_u64_rem	div_u64_rem</div><div class='ctx'> </div><div class='add'>+static inline u64 mul_u32_u32(u32 a, u32 b)</div><div class='add'>+{</div><div class='add'>+	u32 high, low;</div><div class='add'>+</div><div class='add'>+	asm ("mull %[b]" : "=a" (low), "=d" (high)</div><div class='add'>+			 : [a] "a" (a), [b] "rm" (b) );</div><div class='add'>+</div><div class='add'>+	return low | ((u64)high) &lt;&lt; 32;</div><div class='add'>+}</div><div class='add'>+#define mul_u32_u32 mul_u32_u32</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> # include &lt;asm-generic/div64.h&gt;</div><div class='ctx'> #endif /* CONFIG_X86_32 */</div><div class='head'>diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h<br/>index 44461626830e..08a0838b83fb 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -25,18 +25,11 @@ extern int iommu_merge;</div><div class='ctx'> extern struct device x86_dma_fallback_dev;</div><div class='ctx'> extern int panic_on_overflow;</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops *dma_ops;</div><div class='add'>+extern const struct dma_map_ops *dma_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='del'>-#ifndef CONFIG_X86_DEV_DMA_OPS</div><div class='ctx'> 	return dma_ops;</div><div class='del'>-#else</div><div class='del'>-	if (unlikely(!dev) || !dev-&gt;archdata.dma_ops)</div><div class='del'>-		return dma_ops;</div><div class='del'>-	else</div><div class='del'>-		return dev-&gt;archdata.dma_ops;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp);</div><div class='head'>diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h<br/>index 476b574de99e..67313f3a9874 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/e820.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/e820.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/e820.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/e820.h</a></div><div class='hunk'>@@ -1,13 +1,17 @@</div><div class='ctx'> #ifndef _ASM_X86_E820_H</div><div class='ctx'> #define _ASM_X86_E820_H</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_EFI</div><div class='add'>+/*</div><div class='add'>+ * E820_X_MAX is the maximum size of the extended E820 table.  The extended</div><div class='add'>+ * table may contain up to 3 extra E820 entries per possible NUMA node, so we</div><div class='add'>+ * make room for 3 * MAX_NUMNODES possible entries, beyond the standard 128.</div><div class='add'>+ * Also note that E820_X_MAX *must* be defined before we include uapi/asm/e820.h.</div><div class='add'>+ */</div><div class='ctx'> #include &lt;linux/numa.h&gt;</div><div class='ctx'> #define E820_X_MAX (E820MAX + 3 * MAX_NUMNODES)</div><div class='del'>-#else	/* ! CONFIG_EFI */</div><div class='del'>-#define E820_X_MAX E820MAX</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> #include &lt;uapi/asm/e820.h&gt;</div><div class='add'>+</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> /* see comment in arch/x86/kernel/e820.c */</div><div class='ctx'> extern struct e820map *e820;</div><div class='hunk'>@@ -26,8 +30,6 @@ extern u64 e820_remove_range(u64 start, u64 size, unsigned old_type,</div><div class='ctx'> 			     int checktype);</div><div class='ctx'> extern void update_e820(void);</div><div class='ctx'> extern void e820_setup_gap(void);</div><div class='del'>-extern int e820_search_gap(unsigned long *gapstart, unsigned long *gapsize,</div><div class='del'>-			unsigned long start_addr, unsigned long long end_addr);</div><div class='ctx'> struct setup_data;</div><div class='ctx'> extern void parse_e820_ext(u64 phys_addr, u32 data_len);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h<br/>index 389d700b961e..2f77bcefe6b4 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/efi.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/efi.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/efi.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/efi.h</a></div><div class='hunk'>@@ -191,6 +191,7 @@ static inline efi_status_t efi_thunk_set_virtual_address_map(</div><div class='ctx'> struct efi_config {</div><div class='ctx'> 	u64 image_handle;</div><div class='ctx'> 	u64 table;</div><div class='add'>+	u64 runtime_services;</div><div class='ctx'> 	u64 boot_services;</div><div class='ctx'> 	u64 text_output;</div><div class='ctx'> 	efi_status_t (*call)(unsigned long, ...);</div><div class='hunk'>@@ -210,16 +211,26 @@ static inline bool efi_is_64bit(void)</div><div class='ctx'> 	return __efi_early()-&gt;is64;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define efi_table_attr(table, attr, instance)				\</div><div class='add'>+	(efi_is_64bit() ?						\</div><div class='add'>+		((table##_64_t *)(unsigned long)instance)-&gt;attr :	\</div><div class='add'>+		((table##_32_t *)(unsigned long)instance)-&gt;attr)</div><div class='add'>+</div><div class='add'>+#define efi_call_proto(protocol, f, instance, ...)			\</div><div class='add'>+	__efi_early()-&gt;call(efi_table_attr(protocol, f, instance),	\</div><div class='add'>+		instance, ##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> #define efi_call_early(f, ...)						\</div><div class='del'>-	__efi_early()-&gt;call(efi_is_64bit() ?				\</div><div class='del'>-		((efi_boot_services_64_t *)(unsigned long)		\</div><div class='del'>-			__efi_early()-&gt;boot_services)-&gt;f :		\</div><div class='del'>-		((efi_boot_services_32_t *)(unsigned long)		\</div><div class='del'>-			__efi_early()-&gt;boot_services)-&gt;f, __VA_ARGS__)</div><div class='add'>+	__efi_early()-&gt;call(efi_table_attr(efi_boot_services, f,	\</div><div class='add'>+		__efi_early()-&gt;boot_services), __VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define __efi_call_early(f, ...)					\</div><div class='ctx'> 	__efi_early()-&gt;call((unsigned long)f, __VA_ARGS__);</div><div class='ctx'> </div><div class='add'>+#define efi_call_runtime(f, ...)					\</div><div class='add'>+	__efi_early()-&gt;call(efi_table_attr(efi_runtime_services, f,	\</div><div class='add'>+		__efi_early()-&gt;runtime_services), __VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> extern bool efi_reboot_required(void);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h<br/>index e7f155c3045e..9d49c18b5ea9 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/elf.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/elf.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/elf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/elf.h</a></div><div class='hunk'>@@ -258,6 +258,15 @@ extern int force_personality32;</div><div class='ctx'> </div><div class='ctx'> #define ELF_HWCAP		(boot_cpu_data.x86_capability[CPUID_1_EDX])</div><div class='ctx'> </div><div class='add'>+extern u32 elf_hwcap2;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HWCAP2 supplies mask with kernel enabled CPU features, so that</div><div class='add'>+ * the application can discover that it can safely use them.</div><div class='add'>+ * The bits are defined in uapi/asm/hwcap2.h.</div><div class='add'>+ */</div><div class='add'>+#define ELF_HWCAP2		(elf_hwcap2)</div><div class='add'>+</div><div class='ctx'> /* This yields a string that ld.so will use to load implementation</div><div class='ctx'>    specific libraries for optimization.  This is more specific in</div><div class='ctx'>    intent than poking at uname or /proc/cpuinfo.</div><div class='head'>diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h<br/>index 1c7eefe32502..7ec59edde154 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/floppy.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/floppy.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/floppy.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/floppy.h</a></div><div class='hunk'>@@ -229,18 +229,18 @@ static struct fd_routine_l {</div><div class='ctx'> 	int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);</div><div class='ctx'> } fd_routine[] = {</div><div class='ctx'> 	{</div><div class='del'>-		request_dma,</div><div class='del'>-		free_dma,</div><div class='del'>-		get_dma_residue,</div><div class='del'>-		dma_mem_alloc,</div><div class='del'>-		hard_dma_setup</div><div class='add'>+		._request_dma		= request_dma,</div><div class='add'>+		._free_dma		= free_dma,</div><div class='add'>+		._get_dma_residue	= get_dma_residue,</div><div class='add'>+		._dma_mem_alloc		= dma_mem_alloc,</div><div class='add'>+		._dma_setup		= hard_dma_setup</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		vdma_request_dma,</div><div class='del'>-		vdma_nop,</div><div class='del'>-		vdma_get_dma_residue,</div><div class='del'>-		vdma_mem_alloc,</div><div class='del'>-		vdma_dma_setup</div><div class='add'>+		._request_dma		= vdma_request_dma,</div><div class='add'>+		._free_dma		= vdma_nop,</div><div class='add'>+		._get_dma_residue	= vdma_get_dma_residue,</div><div class='add'>+		._dma_mem_alloc		= vdma_mem_alloc,</div><div class='add'>+		._dma_setup		= vdma_dma_setup</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h<br/>index 1429a7c736db..0877ae018fc9 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/fpu/api.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/fpu/api.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/fpu/api.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/fpu/api.h</a></div><div class='hunk'>@@ -27,16 +27,6 @@ extern void kernel_fpu_end(void);</div><div class='ctx'> extern bool irq_fpu_usable(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Some instructions like VIA's padlock instructions generate a spurious</div><div class='del'>- * DNA fault but don't modify SSE registers. And these instructions</div><div class='del'>- * get used from interrupt context as well. To prevent these kernel instructions</div><div class='del'>- * in interrupt context interacting wrongly with other user/kernel fpu usage, we</div><div class='del'>- * should use them only in the context of irq_ts_save/restore()</div><div class='del'>- */</div><div class='del'>-extern int  irq_ts_save(void);</div><div class='del'>-extern void irq_ts_restore(int TS_state);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Query the presence of one or more xfeatures. Works on any legacy CPU as well.</div><div class='ctx'>  *</div><div class='ctx'>  * If 'feature_name' is set then put a human-readable description of</div><div class='head'>diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h<br/>index 2737366ea583..255645f60ca2 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/fpu/internal.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/fpu/internal.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/fpu/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/fpu/internal.h</a></div><div class='hunk'>@@ -60,11 +60,6 @@ extern u64 fpu__get_supported_xfeatures_mask(void);</div><div class='ctx'> /*</div><div class='ctx'>  * FPU related CPU feature flag helper routines:</div><div class='ctx'>  */</div><div class='del'>-static __always_inline __pure bool use_eager_fpu(void)</div><div class='del'>-{</div><div class='del'>-	return static_cpu_has(X86_FEATURE_EAGER_FPU);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static __always_inline __pure bool use_xsaveopt(void)</div><div class='ctx'> {</div><div class='ctx'> 	return static_cpu_has(X86_FEATURE_XSAVEOPT);</div><div class='hunk'>@@ -92,6 +87,16 @@ extern void fpstate_init_soft(struct swregs_state *soft);</div><div class='ctx'> #else</div><div class='ctx'> static inline void fpstate_init_soft(struct swregs_state *soft) {}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+static inline void fpstate_init_xstate(struct xregs_state *xsave)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * XRSTORS requires these bits set in xcomp_bv, or it will</div><div class='add'>+	 * trigger #GP:</div><div class='add'>+	 */</div><div class='add'>+	xsave-&gt;header.xcomp_bv = XCOMP_BV_COMPACTED_FORMAT | xfeatures_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void fpstate_init_fxstate(struct fxregs_state *fx)</div><div class='ctx'> {</div><div class='ctx'> 	fx-&gt;cwd = 0x37f;</div><div class='hunk'>@@ -484,42 +489,42 @@ extern int copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size)</div><div class='ctx'> DECLARE_PER_CPU(struct fpu *, fpu_fpregs_owner_ctx);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Must be run with preemption disabled: this clears the fpu_fpregs_owner_ctx,</div><div class='del'>- * on this CPU.</div><div class='add'>+ * The in-register FPU state for an FPU context on a CPU is assumed to be</div><div class='add'>+ * valid if the fpu-&gt;last_cpu matches the CPU, and the fpu_fpregs_owner_ctx</div><div class='add'>+ * matches the FPU.</div><div class='add'>+ *</div><div class='add'>+ * If the FPU register state is valid, the kernel can skip restoring the</div><div class='add'>+ * FPU state from memory.</div><div class='ctx'>  *</div><div class='del'>- * This will disable any lazy FPU state restore of the current FPU state,</div><div class='del'>- * but if the current thread owns the FPU, it will still be saved by.</div><div class='add'>+ * Any code that clobbers the FPU registers or updates the in-memory</div><div class='add'>+ * FPU state for a task MUST let the rest of the kernel know that the</div><div class='add'>+ * FPU registers are no longer valid for this task.</div><div class='add'>+ *</div><div class='add'>+ * Either one of these invalidation functions is enough. Invalidate</div><div class='add'>+ * a resource you control: CPU if using the CPU for something else</div><div class='add'>+ * (with preemption disabled), FPU for the current task, or a task that</div><div class='add'>+ * is prevented from running by the current task.</div><div class='ctx'>  */</div><div class='del'>-static inline void __cpu_disable_lazy_restore(unsigned int cpu)</div><div class='add'>+static inline void __cpu_invalidate_fpregs_state(void)</div><div class='ctx'> {</div><div class='del'>-	per_cpu(fpu_fpregs_owner_ctx, cpu) = NULL;</div><div class='add'>+	__this_cpu_write(fpu_fpregs_owner_ctx, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int fpu_want_lazy_restore(struct fpu *fpu, unsigned int cpu)</div><div class='add'>+static inline void __fpu_invalidate_fpregs_state(struct fpu *fpu)</div><div class='ctx'> {</div><div class='del'>-	return fpu == this_cpu_read_stable(fpu_fpregs_owner_ctx) &amp;&amp; cpu == fpu-&gt;last_cpu;</div><div class='add'>+	fpu-&gt;last_cpu = -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wrap lazy FPU TS handling in a 'hw fpregs activation/deactivation'</div><div class='del'>- * idiom, which is then paired with the sw-flag (fpregs_active) later on:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline void __fpregs_activate_hw(void)</div><div class='del'>-{</div><div class='del'>-	if (!use_eager_fpu())</div><div class='del'>-		clts();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __fpregs_deactivate_hw(void)</div><div class='add'>+static inline int fpregs_state_valid(struct fpu *fpu, unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	if (!use_eager_fpu())</div><div class='del'>-		stts();</div><div class='add'>+	return fpu == this_cpu_read_stable(fpu_fpregs_owner_ctx) &amp;&amp; cpu == fpu-&gt;last_cpu;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Must be paired with an 'stts' (fpregs_deactivate_hw()) after! */</div><div class='del'>-static inline void __fpregs_deactivate(struct fpu *fpu)</div><div class='add'>+/*</div><div class='add'>+ * These generally need preemption protection to work,</div><div class='add'>+ * do try to avoid using these on their own:</div><div class='add'>+ */</div><div class='add'>+static inline void fpregs_deactivate(struct fpu *fpu)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_FPU(!fpu-&gt;fpregs_active);</div><div class='ctx'> </div><div class='hunk'>@@ -528,8 +533,7 @@ static inline void __fpregs_deactivate(struct fpu *fpu)</div><div class='ctx'> 	trace_x86_fpu_regs_deactivated(fpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Must be paired with a 'clts' (fpregs_activate_hw()) before! */</div><div class='del'>-static inline void __fpregs_activate(struct fpu *fpu)</div><div class='add'>+static inline void fpregs_activate(struct fpu *fpu)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_FPU(fpu-&gt;fpregs_active);</div><div class='ctx'> </div><div class='hunk'>@@ -554,51 +558,19 @@ static inline int fpregs_active(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Encapsulate the CR0.TS handling together with the</div><div class='del'>- * software flag.</div><div class='del'>- *</div><div class='del'>- * These generally need preemption protection to work,</div><div class='del'>- * do try to avoid using these on their own.</div><div class='del'>- */</div><div class='del'>-static inline void fpregs_activate(struct fpu *fpu)</div><div class='del'>-{</div><div class='del'>-	__fpregs_activate_hw();</div><div class='del'>-	__fpregs_activate(fpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void fpregs_deactivate(struct fpu *fpu)</div><div class='del'>-{</div><div class='del'>-	__fpregs_deactivate(fpu);</div><div class='del'>-	__fpregs_deactivate_hw();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * FPU state switching for scheduling.</div><div class='ctx'>  *</div><div class='ctx'>  * This is a two-stage process:</div><div class='ctx'>  *</div><div class='del'>- *  - switch_fpu_prepare() saves the old state and</div><div class='del'>- *    sets the new state of the CR0.TS bit. This is</div><div class='del'>- *    done within the context of the old process.</div><div class='add'>+ *  - switch_fpu_prepare() saves the old state.</div><div class='add'>+ *    This is done within the context of the old process.</div><div class='ctx'>  *</div><div class='ctx'>  *  - switch_fpu_finish() restores the new state as</div><div class='ctx'>  *    necessary.</div><div class='ctx'>  */</div><div class='del'>-typedef struct { int preload; } fpu_switch_t;</div><div class='del'>-</div><div class='del'>-static inline fpu_switch_t</div><div class='del'>-switch_fpu_prepare(struct fpu *old_fpu, struct fpu *new_fpu, int cpu)</div><div class='add'>+static inline void</div><div class='add'>+switch_fpu_prepare(struct fpu *old_fpu, int cpu)</div><div class='ctx'> {</div><div class='del'>-	fpu_switch_t fpu;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the task has used the math, pre-load the FPU on xsave processors</div><div class='del'>-	 * or if the past 5 consecutive context-switches used math.</div><div class='del'>-	 */</div><div class='del'>-	fpu.preload = static_cpu_has(X86_FEATURE_FPU) &amp;&amp;</div><div class='del'>-		      new_fpu-&gt;fpstate_active &amp;&amp;</div><div class='del'>-		      (use_eager_fpu() || new_fpu-&gt;counter &gt; 5);</div><div class='del'>-</div><div class='ctx'> 	if (old_fpu-&gt;fpregs_active) {</div><div class='ctx'> 		if (!copy_fpregs_to_fpstate(old_fpu))</div><div class='ctx'> 			old_fpu-&gt;last_cpu = -1;</div><div class='hunk'>@@ -608,29 +580,8 @@ switch_fpu_prepare(struct fpu *old_fpu, struct fpu *new_fpu, int cpu)</div><div class='ctx'> 		/* But leave fpu_fpregs_owner_ctx! */</div><div class='ctx'> 		old_fpu-&gt;fpregs_active = 0;</div><div class='ctx'> 		trace_x86_fpu_regs_deactivated(old_fpu);</div><div class='del'>-</div><div class='del'>-		/* Don't change CR0.TS if we just switch! */</div><div class='del'>-		if (fpu.preload) {</div><div class='del'>-			new_fpu-&gt;counter++;</div><div class='del'>-			__fpregs_activate(new_fpu);</div><div class='del'>-			trace_x86_fpu_regs_activated(new_fpu);</div><div class='del'>-			prefetch(&amp;new_fpu-&gt;state);</div><div class='del'>-		} else {</div><div class='del'>-			__fpregs_deactivate_hw();</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		old_fpu-&gt;counter = 0;</div><div class='add'>+	} else</div><div class='ctx'> 		old_fpu-&gt;last_cpu = -1;</div><div class='del'>-		if (fpu.preload) {</div><div class='del'>-			new_fpu-&gt;counter++;</div><div class='del'>-			if (fpu_want_lazy_restore(new_fpu, cpu))</div><div class='del'>-				fpu.preload = 0;</div><div class='del'>-			else</div><div class='del'>-				prefetch(&amp;new_fpu-&gt;state);</div><div class='del'>-			fpregs_activate(new_fpu);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return fpu;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -638,15 +589,19 @@ switch_fpu_prepare(struct fpu *old_fpu, struct fpu *new_fpu, int cpu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * By the time this gets called, we've already cleared CR0.TS and</div><div class='del'>- * given the process the FPU if we are going to preload the FPU</div><div class='del'>- * state - all we need to do is to conditionally restore the register</div><div class='del'>- * state itself.</div><div class='add'>+ * Set up the userspace FPU context for the new task, if the task</div><div class='add'>+ * has used the FPU.</div><div class='ctx'>  */</div><div class='del'>-static inline void switch_fpu_finish(struct fpu *new_fpu, fpu_switch_t fpu_switch)</div><div class='add'>+static inline void switch_fpu_finish(struct fpu *new_fpu, int cpu)</div><div class='ctx'> {</div><div class='del'>-	if (fpu_switch.preload)</div><div class='del'>-		copy_kernel_to_fpregs(&amp;new_fpu-&gt;state);</div><div class='add'>+	bool preload = static_cpu_has(X86_FEATURE_FPU) &amp;&amp;</div><div class='add'>+		       new_fpu-&gt;fpstate_active;</div><div class='add'>+</div><div class='add'>+	if (preload) {</div><div class='add'>+		if (!fpregs_state_valid(new_fpu, cpu))</div><div class='add'>+			copy_kernel_to_fpregs(&amp;new_fpu-&gt;state);</div><div class='add'>+		fpregs_activate(new_fpu);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/include/asm/fpu/types.h b/arch/x86/include/asm/fpu/types.h<br/>index 48df486b02f9..3c80f5b9c09d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/fpu/types.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/fpu/types.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/fpu/types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/fpu/types.h</a></div><div class='hunk'>@@ -322,17 +322,6 @@ struct fpu {</div><div class='ctx'> 	unsigned char			fpregs_active;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * @counter:</div><div class='del'>-	 *</div><div class='del'>-	 * This counter contains the number of consecutive context switches</div><div class='del'>-	 * during which the FPU stays used. If this is over a threshold, the</div><div class='del'>-	 * lazy FPU restore logic becomes eager, to save the trap overhead.</div><div class='del'>-	 * This is an unsigned char so that after 256 iterations the counter</div><div class='del'>-	 * wraps and the context switch behavior turns lazy again; this is to</div><div class='del'>-	 * deal with bursty apps that only use the FPU for a short time:</div><div class='del'>-	 */</div><div class='del'>-	unsigned char			counter;</div><div class='del'>-	/*</div><div class='ctx'> 	 * @state:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * In-memory copy of all FPU registers that we save/restore</div><div class='hunk'>@@ -340,29 +329,6 @@ struct fpu {</div><div class='ctx'> 	 * the registers in the FPU are more recent than this state</div><div class='ctx'> 	 * copy. If the task context-switches away then they get</div><div class='ctx'> 	 * saved here and represent the FPU state.</div><div class='del'>-	 *</div><div class='del'>-	 * After context switches there may be a (short) time period</div><div class='del'>-	 * during which the in-FPU hardware registers are unchanged</div><div class='del'>-	 * and still perfectly match this state, if the tasks</div><div class='del'>-	 * scheduled afterwards are not using the FPU.</div><div class='del'>-	 *</div><div class='del'>-	 * This is the 'lazy restore' window of optimization, which</div><div class='del'>-	 * we track though 'fpu_fpregs_owner_ctx' and 'fpu-&gt;last_cpu'.</div><div class='del'>-	 *</div><div class='del'>-	 * We detect whether a subsequent task uses the FPU via setting</div><div class='del'>-	 * CR0::TS to 1, which causes any FPU use to raise a #NM fault.</div><div class='del'>-	 *</div><div class='del'>-	 * During this window, if the task gets scheduled again, we</div><div class='del'>-	 * might be able to skip having to do a restore from this</div><div class='del'>-	 * memory buffer to the hardware registers - at the cost of</div><div class='del'>-	 * incurring the overhead of #NM fault traps.</div><div class='del'>-	 *</div><div class='del'>-	 * Note that on modern CPUs that support the XSAVEOPT (or other</div><div class='del'>-	 * optimized XSAVE instructions), we don't use #NM traps anymore,</div><div class='del'>-	 * as the hardware can track whether FPU registers need saving</div><div class='del'>-	 * or not. On such CPUs we activate the non-lazy ('eagerfpu')</div><div class='del'>-	 * logic, which unconditionally saves/restores all FPU state</div><div class='del'>-	 * across context switches. (if FPU state exists.)</div><div class='ctx'> 	 */</div><div class='ctx'> 	union fpregs_state		state;</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/x86/include/asm/fpu/xstate.h b/arch/x86/include/asm/fpu/xstate.h<br/>index 430bacf73074..1b2799e0699a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/fpu/xstate.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/fpu/xstate.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/fpu/xstate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/fpu/xstate.h</a></div><div class='hunk'>@@ -21,21 +21,16 @@</div><div class='ctx'> /* Supervisor features */</div><div class='ctx'> #define XFEATURE_MASK_SUPERVISOR (XFEATURE_MASK_PT)</div><div class='ctx'> </div><div class='del'>-/* Supported features which support lazy state saving */</div><div class='del'>-#define XFEATURE_MASK_LAZY	(XFEATURE_MASK_FP | \</div><div class='add'>+/* All currently supported features */</div><div class='add'>+#define XCNTXT_MASK		(XFEATURE_MASK_FP | \</div><div class='ctx'> 				 XFEATURE_MASK_SSE | \</div><div class='ctx'> 				 XFEATURE_MASK_YMM | \</div><div class='ctx'> 				 XFEATURE_MASK_OPMASK | \</div><div class='ctx'> 				 XFEATURE_MASK_ZMM_Hi256 | \</div><div class='del'>-				 XFEATURE_MASK_Hi16_ZMM)</div><div class='del'>-</div><div class='del'>-/* Supported features which require eager state saving */</div><div class='del'>-#define XFEATURE_MASK_EAGER	(XFEATURE_MASK_BNDREGS | \</div><div class='del'>-				 XFEATURE_MASK_BNDCSR | \</div><div class='del'>-				 XFEATURE_MASK_PKRU)</div><div class='del'>-</div><div class='del'>-/* All currently supported features */</div><div class='del'>-#define XCNTXT_MASK	(XFEATURE_MASK_LAZY | XFEATURE_MASK_EAGER)</div><div class='add'>+				 XFEATURE_MASK_Hi16_ZMM	 | \</div><div class='add'>+				 XFEATURE_MASK_PKRU | \</div><div class='add'>+				 XFEATURE_MASK_BNDREGS | \</div><div class='add'>+				 XFEATURE_MASK_BNDCSR)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> #define REX_PREFIX	"0x48, "</div><div class='head'>diff --git a/arch/x86/include/asm/idle.h b/arch/x86/include/asm/idle.h<br/>deleted file mode 100644<br/>index c5d1785373ed..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/idle.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/idle.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-#ifndef _ASM_X86_IDLE_H</div><div class='del'>-#define _ASM_X86_IDLE_H</div><div class='del'>-</div><div class='del'>-#define IDLE_START 1</div><div class='del'>-#define IDLE_END 2</div><div class='del'>-</div><div class='del'>-struct notifier_block;</div><div class='del'>-void idle_notifier_register(struct notifier_block *n);</div><div class='del'>-void idle_notifier_unregister(struct notifier_block *n);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-void enter_idle(void);</div><div class='del'>-void exit_idle(void);</div><div class='del'>-#else /* !CONFIG_X86_64 */</div><div class='del'>-static inline void enter_idle(void) { }</div><div class='del'>-static inline void exit_idle(void) { }</div><div class='del'>-static inline void __exit_idle(void) { }</div><div class='del'>-#endif /* CONFIG_X86_64 */</div><div class='del'>-</div><div class='del'>-void amd_e400_remove_cpu(int cpu);</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_X86_IDLE_H */</div><div class='head'>diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h<br/>index 34a46dc076d3..9814db42b790 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/intel-family.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/intel-family.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/intel-family.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/intel-family.h</a></div><div class='hunk'>@@ -57,8 +57,9 @@</div><div class='ctx'> #define INTEL_FAM6_ATOM_SILVERMONT2	0x4D /* Avaton/Rangely */</div><div class='ctx'> #define INTEL_FAM6_ATOM_AIRMONT		0x4C /* CherryTrail / Braswell */</div><div class='ctx'> #define INTEL_FAM6_ATOM_MERRIFIELD	0x4A /* Tangier */</div><div class='del'>-#define INTEL_FAM6_ATOM_MOOREFIELD	0x5A /* Annidale */</div><div class='add'>+#define INTEL_FAM6_ATOM_MOOREFIELD	0x5A /* Anniedale */</div><div class='ctx'> #define INTEL_FAM6_ATOM_GOLDMONT	0x5C</div><div class='add'>+#define INTEL_FAM6_ATOM_GEMINI_LAKE	0x7A</div><div class='ctx'> #define INTEL_FAM6_ATOM_DENVERTON	0x5F /* Goldmont Microserver */</div><div class='ctx'> </div><div class='ctx'> /* Xeon Phi */</div><div class='head'>diff --git a/arch/x86/include/asm/intel-mid.h b/arch/x86/include/asm/intel-mid.h<br/>index 49da9f497b90..fe04491130ae 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/intel-mid.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/intel-mid.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/intel-mid.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/intel-mid.h</a></div><div class='hunk'>@@ -27,7 +27,6 @@ extern void intel_mid_pwr_power_off(void);</div><div class='ctx'> extern int intel_mid_pwr_get_lss_id(struct pci_dev *pdev);</div><div class='ctx'> </div><div class='ctx'> extern int get_gpio_by_name(const char *name);</div><div class='del'>-extern void intel_scu_device_register(struct platform_device *pdev);</div><div class='ctx'> extern int __init sfi_parse_mrtc(struct sfi_table_header *table);</div><div class='ctx'> extern int __init sfi_parse_mtmr(struct sfi_table_header *table);</div><div class='ctx'> extern int sfi_mrtc_num;</div><div class='hunk'>@@ -42,10 +41,8 @@ struct devs_id {</div><div class='ctx'> 	char name[SFI_NAME_LEN + 1];</div><div class='ctx'> 	u8 type;</div><div class='ctx'> 	u8 delay;</div><div class='add'>+	u8 msic;</div><div class='ctx'> 	void *(*get_platform_data)(void *info);</div><div class='del'>-	/* Custom handler for devices */</div><div class='del'>-	void (*device_handler)(struct sfi_device_table_entry *pentry,</div><div class='del'>-			       struct devs_id *dev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define sfi_device(i)								\</div><div class='head'>diff --git a/arch/x86/include/asm/intel_pmc_ipc.h b/arch/x86/include/asm/intel_pmc_ipc.h<br/>index cd0310e186f4..4291b6a5ddf7 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/intel_pmc_ipc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/intel_pmc_ipc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/intel_pmc_ipc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/intel_pmc_ipc.h</a></div><div class='hunk'>@@ -30,6 +30,7 @@ int intel_pmc_ipc_raw_cmd(u32 cmd, u32 sub, u8 *in, u32 inlen,</div><div class='ctx'> 		u32 *out, u32 outlen, u32 dptr, u32 sptr);</div><div class='ctx'> int intel_pmc_ipc_command(u32 cmd, u32 sub, u8 *in, u32 inlen,</div><div class='ctx'> 		u32 *out, u32 outlen);</div><div class='add'>+int intel_pmc_s0ix_counter_read(u64 *data);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='hunk'>@@ -50,6 +51,11 @@ static inline int intel_pmc_ipc_command(u32 cmd, u32 sub, u8 *in, u32 inlen,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int intel_pmc_s0ix_counter_read(u64 *data)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /*CONFIG_INTEL_PMC_IPC*/</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/include/asm/intel_rdt.h b/arch/x86/include/asm/intel_rdt.h<br/>new file mode 100644<br/>index 000000000000..0d64397cee58<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/intel_rdt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/intel_rdt.h</a></div><div class='hunk'>@@ -0,0 +1,225 @@</div><div class='add'>+#ifndef _ASM_X86_INTEL_RDT_H</div><div class='add'>+#define _ASM_X86_INTEL_RDT_H</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INTEL_RDT_A</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/kernfs.h&gt;</div><div class='add'>+#include &lt;linux/jump_label.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/intel_rdt_common.h&gt;</div><div class='add'>+</div><div class='add'>+#define IA32_L3_QOS_CFG		0xc81</div><div class='add'>+#define IA32_L3_CBM_BASE	0xc90</div><div class='add'>+#define IA32_L2_CBM_BASE	0xd10</div><div class='add'>+</div><div class='add'>+#define L3_QOS_CDP_ENABLE	0x01ULL</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rdtgroup - store rdtgroup's data in resctrl file system.</div><div class='add'>+ * @kn:				kernfs node</div><div class='add'>+ * @rdtgroup_list:		linked list for all rdtgroups</div><div class='add'>+ * @closid:			closid for this rdtgroup</div><div class='add'>+ * @cpu_mask:			CPUs assigned to this rdtgroup</div><div class='add'>+ * @flags:			status bits</div><div class='add'>+ * @waitcount:			how many cpus expect to find this</div><div class='add'>+ *				group when they acquire rdtgroup_mutex</div><div class='add'>+ */</div><div class='add'>+struct rdtgroup {</div><div class='add'>+	struct kernfs_node	*kn;</div><div class='add'>+	struct list_head	rdtgroup_list;</div><div class='add'>+	int			closid;</div><div class='add'>+	struct cpumask		cpu_mask;</div><div class='add'>+	int			flags;</div><div class='add'>+	atomic_t		waitcount;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* rdtgroup.flags */</div><div class='add'>+#define	RDT_DELETED		1</div><div class='add'>+</div><div class='add'>+/* List of all resource groups */</div><div class='add'>+extern struct list_head rdt_all_groups;</div><div class='add'>+</div><div class='add'>+int __init rdtgroup_init(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rftype - describe each file in the resctrl file system</div><div class='add'>+ * @name: file name</div><div class='add'>+ * @mode: access mode</div><div class='add'>+ * @kf_ops: operations</div><div class='add'>+ * @seq_show: show content of the file</div><div class='add'>+ * @write: write to the file</div><div class='add'>+ */</div><div class='add'>+struct rftype {</div><div class='add'>+	char			*name;</div><div class='add'>+	umode_t			mode;</div><div class='add'>+	struct kernfs_ops	*kf_ops;</div><div class='add'>+</div><div class='add'>+	int (*seq_show)(struct kernfs_open_file *of,</div><div class='add'>+			struct seq_file *sf, void *v);</div><div class='add'>+	/*</div><div class='add'>+	 * write() is the generic write callback which maps directly to</div><div class='add'>+	 * kernfs write operation and overrides all other operations.</div><div class='add'>+	 * Maximum write size is determined by -&gt;max_write_len.</div><div class='add'>+	 */</div><div class='add'>+	ssize_t (*write)(struct kernfs_open_file *of,</div><div class='add'>+			 char *buf, size_t nbytes, loff_t off);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rdt_resource - attributes of an RDT resource</div><div class='add'>+ * @enabled:			Is this feature enabled on this machine</div><div class='add'>+ * @capable:			Is this feature available on this machine</div><div class='add'>+ * @name:			Name to use in "schemata" file</div><div class='add'>+ * @num_closid:			Number of CLOSIDs available</div><div class='add'>+ * @max_cbm:			Largest Cache Bit Mask allowed</div><div class='add'>+ * @min_cbm_bits:		Minimum number of consecutive bits to be set</div><div class='add'>+ *				in a cache bit mask</div><div class='add'>+ * @domains:			All domains for this resource</div><div class='add'>+ * @num_domains:		Number of domains active</div><div class='add'>+ * @msr_base:			Base MSR address for CBMs</div><div class='add'>+ * @tmp_cbms:			Scratch space when updating schemata</div><div class='add'>+ * @num_tmp_cbms:		Number of CBMs in tmp_cbms</div><div class='add'>+ * @cache_level:		Which cache level defines scope of this domain</div><div class='add'>+ * @cbm_idx_multi:		Multiplier of CBM index</div><div class='add'>+ * @cbm_idx_offset:		Offset of CBM index. CBM index is computed by:</div><div class='add'>+ *				closid * cbm_idx_multi + cbm_idx_offset</div><div class='add'>+ */</div><div class='add'>+struct rdt_resource {</div><div class='add'>+	bool			enabled;</div><div class='add'>+	bool			capable;</div><div class='add'>+	char			*name;</div><div class='add'>+	int			num_closid;</div><div class='add'>+	int			cbm_len;</div><div class='add'>+	int			min_cbm_bits;</div><div class='add'>+	u32			max_cbm;</div><div class='add'>+	struct list_head	domains;</div><div class='add'>+	int			num_domains;</div><div class='add'>+	int			msr_base;</div><div class='add'>+	u32			*tmp_cbms;</div><div class='add'>+	int			num_tmp_cbms;</div><div class='add'>+	int			cache_level;</div><div class='add'>+	int			cbm_idx_multi;</div><div class='add'>+	int			cbm_idx_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rdt_domain - group of cpus sharing an RDT resource</div><div class='add'>+ * @list:	all instances of this resource</div><div class='add'>+ * @id:		unique id for this instance</div><div class='add'>+ * @cpu_mask:	which cpus share this resource</div><div class='add'>+ * @cbm:	array of cache bit masks (indexed by CLOSID)</div><div class='add'>+ */</div><div class='add'>+struct rdt_domain {</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	int			id;</div><div class='add'>+	struct cpumask		cpu_mask;</div><div class='add'>+	u32			*cbm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct msr_param - set a range of MSRs from a domain</div><div class='add'>+ * @res:       The resource to use</div><div class='add'>+ * @low:       Beginning index from base MSR</div><div class='add'>+ * @high:      End index</div><div class='add'>+ */</div><div class='add'>+struct msr_param {</div><div class='add'>+	struct rdt_resource	*res;</div><div class='add'>+	int			low;</div><div class='add'>+	int			high;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct mutex rdtgroup_mutex;</div><div class='add'>+</div><div class='add'>+extern struct rdt_resource rdt_resources_all[];</div><div class='add'>+extern struct rdtgroup rdtgroup_default;</div><div class='add'>+DECLARE_STATIC_KEY_FALSE(rdt_enable_key);</div><div class='add'>+</div><div class='add'>+int __init rdtgroup_init(void);</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	RDT_RESOURCE_L3,</div><div class='add'>+	RDT_RESOURCE_L3DATA,</div><div class='add'>+	RDT_RESOURCE_L3CODE,</div><div class='add'>+	RDT_RESOURCE_L2,</div><div class='add'>+</div><div class='add'>+	/* Must be the last */</div><div class='add'>+	RDT_NUM_RESOURCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define for_each_capable_rdt_resource(r)				      \</div><div class='add'>+	for (r = rdt_resources_all; r &lt; rdt_resources_all + RDT_NUM_RESOURCES;\</div><div class='add'>+	     r++) 							      \</div><div class='add'>+		if (r-&gt;capable)</div><div class='add'>+</div><div class='add'>+#define for_each_enabled_rdt_resource(r)				      \</div><div class='add'>+	for (r = rdt_resources_all; r &lt; rdt_resources_all + RDT_NUM_RESOURCES;\</div><div class='add'>+	     r++)							      \</div><div class='add'>+		if (r-&gt;enabled)</div><div class='add'>+</div><div class='add'>+/* CPUID.(EAX=10H, ECX=ResID=1).EAX */</div><div class='add'>+union cpuid_0x10_1_eax {</div><div class='add'>+	struct {</div><div class='add'>+		unsigned int cbm_len:5;</div><div class='add'>+	} split;</div><div class='add'>+	unsigned int full;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CPUID.(EAX=10H, ECX=ResID=1).EDX */</div><div class='add'>+union cpuid_0x10_1_edx {</div><div class='add'>+	struct {</div><div class='add'>+		unsigned int cos_max:16;</div><div class='add'>+	} split;</div><div class='add'>+	unsigned int full;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DECLARE_PER_CPU_READ_MOSTLY(int, cpu_closid);</div><div class='add'>+</div><div class='add'>+void rdt_cbm_update(void *arg);</div><div class='add'>+struct rdtgroup *rdtgroup_kn_lock_live(struct kernfs_node *kn);</div><div class='add'>+void rdtgroup_kn_unlock(struct kernfs_node *kn);</div><div class='add'>+ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of,</div><div class='add'>+				char *buf, size_t nbytes, loff_t off);</div><div class='add'>+int rdtgroup_schemata_show(struct kernfs_open_file *of,</div><div class='add'>+			   struct seq_file *s, void *v);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * intel_rdt_sched_in() - Writes the task's CLOSid to IA32_PQR_MSR</div><div class='add'>+ *</div><div class='add'>+ * Following considerations are made so that this has minimal impact</div><div class='add'>+ * on scheduler hot path:</div><div class='add'>+ * - This will stay as no-op unless we are running on an Intel SKU</div><div class='add'>+ *   which supports resource control and we enable by mounting the</div><div class='add'>+ *   resctrl file system.</div><div class='add'>+ * - Caches the per cpu CLOSid values and does the MSR write only</div><div class='add'>+ *   when a task with a different CLOSid is scheduled in.</div><div class='add'>+ *</div><div class='add'>+ * Must be called with preemption disabled.</div><div class='add'>+ */</div><div class='add'>+static inline void intel_rdt_sched_in(void)</div><div class='add'>+{</div><div class='add'>+	if (static_branch_likely(&amp;rdt_enable_key)) {</div><div class='add'>+		struct intel_pqr_state *state = this_cpu_ptr(&amp;pqr_state);</div><div class='add'>+		int closid;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If this task has a closid assigned, use it.</div><div class='add'>+		 * Else use the closid assigned to this cpu.</div><div class='add'>+		 */</div><div class='add'>+		closid = current-&gt;closid;</div><div class='add'>+		if (closid == 0)</div><div class='add'>+			closid = this_cpu_read(cpu_closid);</div><div class='add'>+</div><div class='add'>+		if (closid != state-&gt;closid) {</div><div class='add'>+			state-&gt;closid = closid;</div><div class='add'>+			wrmsr(MSR_IA32_PQR_ASSOC, state-&gt;rmid, closid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void intel_rdt_sched_in(void) {}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_INTEL_RDT_A */</div><div class='add'>+#endif /* _ASM_X86_INTEL_RDT_H */</div><div class='head'>diff --git a/arch/x86/include/asm/intel_rdt_common.h b/arch/x86/include/asm/intel_rdt_common.h<br/>new file mode 100644<br/>index 000000000000..b31081b89407<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/intel_rdt_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/intel_rdt_common.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+#ifndef _ASM_X86_INTEL_RDT_COMMON_H</div><div class='add'>+#define _ASM_X86_INTEL_RDT_COMMON_H</div><div class='add'>+</div><div class='add'>+#define MSR_IA32_PQR_ASSOC	0x0c8f</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct intel_pqr_state - State cache for the PQR MSR</div><div class='add'>+ * @rmid:		The cached Resource Monitoring ID</div><div class='add'>+ * @closid:		The cached Class Of Service ID</div><div class='add'>+ * @rmid_usecnt:	The usage counter for rmid</div><div class='add'>+ *</div><div class='add'>+ * The upper 32 bits of MSR_IA32_PQR_ASSOC contain closid and the</div><div class='add'>+ * lower 10 bits rmid. The update to MSR_IA32_PQR_ASSOC always</div><div class='add'>+ * contains both parts, so we need to cache them.</div><div class='add'>+ *</div><div class='add'>+ * The cache also helps to avoid pointless updates if the value does</div><div class='add'>+ * not change.</div><div class='add'>+ */</div><div class='add'>+struct intel_pqr_state {</div><div class='add'>+	u32			rmid;</div><div class='add'>+	u32			closid;</div><div class='add'>+	int			rmid_usecnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DECLARE_PER_CPU(struct intel_pqr_state, pqr_state);</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_X86_INTEL_RDT_COMMON_H */</div><div class='head'>diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h<br/>index d34bd370074b..7afb0e2f07f4 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/io.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/io.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/io.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/io.h</a></div><div class='hunk'>@@ -164,6 +164,17 @@ static inline unsigned int isa_virt_to_bus(volatile void *address)</div><div class='ctx'> #define virt_to_bus virt_to_phys</div><div class='ctx'> #define bus_to_virt phys_to_virt</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The default ioremap() behavior is non-cached; if you need something</div><div class='add'>+ * else, you probably want one of the following.</div><div class='add'>+ */</div><div class='add'>+extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size);</div><div class='add'>+extern void __iomem *ioremap_uc(resource_size_t offset, unsigned long size);</div><div class='add'>+#define ioremap_uc ioremap_uc</div><div class='add'>+</div><div class='add'>+extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size);</div><div class='add'>+extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size, unsigned long prot_val);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * ioremap     -   map bus memory into CPU space</div><div class='ctx'>  * @offset:    bus address of the memory</div><div class='hunk'>@@ -178,17 +189,6 @@ static inline unsigned int isa_virt_to_bus(volatile void *address)</div><div class='ctx'>  * If the area you are trying to map is a PCI BAR you should have a</div><div class='ctx'>  * look at pci_iomap().</div><div class='ctx'>  */</div><div class='del'>-extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size);</div><div class='del'>-extern void __iomem *ioremap_uc(resource_size_t offset, unsigned long size);</div><div class='del'>-#define ioremap_uc ioremap_uc</div><div class='del'>-</div><div class='del'>-extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size);</div><div class='del'>-extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size,</div><div class='del'>-				unsigned long prot_val);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The default ioremap() behavior is non-cached:</div><div class='del'>- */</div><div class='ctx'> static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	return ioremap_nocache(offset, size);</div><div class='hunk'>@@ -207,18 +207,42 @@ extern void set_iounmap_nonlazy(void);</div><div class='ctx'>  */</div><div class='ctx'> #define xlate_dev_kmem_ptr(p)	p</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * memset_io	Set a range of I/O memory to a constant value</div><div class='add'>+ * @addr:	The beginning of the I/O-memory range to set</div><div class='add'>+ * @val:	The value to set the memory to</div><div class='add'>+ * @count:	The number of bytes to set</div><div class='add'>+ *</div><div class='add'>+ * Set a range of I/O memory to a given value.</div><div class='add'>+ */</div><div class='ctx'> static inline void</div><div class='ctx'> memset_io(volatile void __iomem *addr, unsigned char val, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	memset((void __force *)addr, val, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * memcpy_fromio	Copy a block of data from I/O memory</div><div class='add'>+ * @dst:		The (RAM) destination for the copy</div><div class='add'>+ * @src:		The (I/O memory) source for the data</div><div class='add'>+ * @count:		The number of bytes to copy</div><div class='add'>+ *</div><div class='add'>+ * Copy a block of data from I/O memory.</div><div class='add'>+ */</div><div class='ctx'> static inline void</div><div class='ctx'> memcpy_fromio(void *dst, const volatile void __iomem *src, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(dst, (const void __force *)src, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * memcpy_toio		Copy a block of data into I/O memory</div><div class='add'>+ * @dst:		The (I/O memory) destination for the copy</div><div class='add'>+ * @src:		The (RAM) source for the data</div><div class='add'>+ * @count:		The number of bytes to copy</div><div class='add'>+ *</div><div class='add'>+ * Copy a block of data to I/O memory.</div><div class='add'>+ */</div><div class='ctx'> static inline void</div><div class='ctx'> memcpy_toio(volatile void __iomem *dst, const void *src, size_t count)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h<br/>index 345c99cef152..793869879464 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/iommu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/iommu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/iommu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/iommu.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #ifndef _ASM_X86_IOMMU_H</div><div class='ctx'> #define _ASM_X86_IOMMU_H</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops nommu_dma_ops;</div><div class='add'>+extern const struct dma_map_ops nommu_dma_ops;</div><div class='ctx'> extern int force_iommu, no_iommu;</div><div class='ctx'> extern int iommu_detected;</div><div class='ctx'> extern int iommu_pass_through;</div><div class='head'>diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h<br/>index d31881188431..29a594a3b82a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/kdebug.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/kdebug.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/kdebug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kdebug.h</a></div><div class='hunk'>@@ -21,7 +21,6 @@ enum die_val {</div><div class='ctx'> 	DIE_NMIUNKNOWN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern void printk_address(unsigned long address);</div><div class='ctx'> extern void die(const char *, struct pt_regs *,long);</div><div class='ctx'> extern int __must_check __die(const char *, struct pt_regs *, long);</div><div class='ctx'> extern void show_stack_regs(struct pt_regs *regs);</div><div class='head'>diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h<br/>index d1d1e5094c28..200581691c6e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/kprobes.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/kprobes.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/kprobes.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kprobes.h</a></div><div class='hunk'>@@ -21,6 +21,12 @@</div><div class='ctx'>  *</div><div class='ctx'>  * See arch/x86/kernel/kprobes.c for x86 kprobes history.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/kprobes.h&gt;</div><div class='add'>+</div><div class='add'>+#define BREAKPOINT_INSTRUCTION	0xcc</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='hunk'>@@ -32,7 +38,6 @@ struct pt_regs;</div><div class='ctx'> struct kprobe;</div><div class='ctx'> </div><div class='ctx'> typedef u8 kprobe_opcode_t;</div><div class='del'>-#define BREAKPOINT_INSTRUCTION	0xcc</div><div class='ctx'> #define RELATIVEJUMP_OPCODE 0xe9</div><div class='ctx'> #define RELATIVEJUMP_SIZE 5</div><div class='ctx'> #define RELATIVECALL_OPCODE 0xe8</div><div class='hunk'>@@ -116,4 +121,6 @@ extern int kprobe_exceptions_notify(struct notifier_block *self,</div><div class='ctx'> 				    unsigned long val, void *data);</div><div class='ctx'> extern int kprobe_int3_handler(struct pt_regs *regs);</div><div class='ctx'> extern int kprobe_debug_handler(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_KPROBES */</div><div class='ctx'> #endif /* _ASM_X86_KPROBES_H */</div><div class='head'>diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h<br/>index e9cd7befcb76..3e8c287090e4 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/kvm_emulate.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/kvm_emulate.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/kvm_emulate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kvm_emulate.h</a></div><div class='hunk'>@@ -441,5 +441,6 @@ int emulator_task_switch(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> int emulate_int_real(struct x86_emulate_ctxt *ctxt, int irq);</div><div class='ctx'> void emulator_invalidate_register_cache(struct x86_emulate_ctxt *ctxt);</div><div class='ctx'> void emulator_writeback_register_cache(struct x86_emulate_ctxt *ctxt);</div><div class='add'>+bool emulator_can_use_gpa(struct x86_emulate_ctxt *ctxt);</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_X86_KVM_X86_EMULATE_H */</div><div class='head'>diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h<br/>index bdde80731f49..74ef58c8ff53 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/kvm_host.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/kvm_host.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/kvm_host.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kvm_host.h</a></div><div class='hunk'>@@ -55,7 +55,6 @@</div><div class='ctx'> #define KVM_REQ_TRIPLE_FAULT      10</div><div class='ctx'> #define KVM_REQ_MMU_SYNC          11</div><div class='ctx'> #define KVM_REQ_CLOCK_UPDATE      12</div><div class='del'>-#define KVM_REQ_DEACTIVATE_FPU    13</div><div class='ctx'> #define KVM_REQ_EVENT             14</div><div class='ctx'> #define KVM_REQ_APF_HALT          15</div><div class='ctx'> #define KVM_REQ_STEAL_UPDATE      16</div><div class='hunk'>@@ -115,7 +114,7 @@ static inline gfn_t gfn_to_index(gfn_t gfn, gfn_t base_gfn, int level)</div><div class='ctx'> </div><div class='ctx'> #define KVM_PERMILLE_MMU_PAGES 20</div><div class='ctx'> #define KVM_MIN_ALLOC_MMU_PAGES 64</div><div class='del'>-#define KVM_MMU_HASH_SHIFT 10</div><div class='add'>+#define KVM_MMU_HASH_SHIFT 12</div><div class='ctx'> #define KVM_NUM_MMU_PAGES (1 &lt;&lt; KVM_MMU_HASH_SHIFT)</div><div class='ctx'> #define KVM_MIN_FREE_MMU_PAGES 5</div><div class='ctx'> #define KVM_REFILL_PAGES 25</div><div class='hunk'>@@ -191,6 +190,8 @@ enum {</div><div class='ctx'> #define PFERR_RSVD_BIT 3</div><div class='ctx'> #define PFERR_FETCH_BIT 4</div><div class='ctx'> #define PFERR_PK_BIT 5</div><div class='add'>+#define PFERR_GUEST_FINAL_BIT 32</div><div class='add'>+#define PFERR_GUEST_PAGE_BIT 33</div><div class='ctx'> </div><div class='ctx'> #define PFERR_PRESENT_MASK (1U &lt;&lt; PFERR_PRESENT_BIT)</div><div class='ctx'> #define PFERR_WRITE_MASK (1U &lt;&lt; PFERR_WRITE_BIT)</div><div class='hunk'>@@ -198,6 +199,20 @@ enum {</div><div class='ctx'> #define PFERR_RSVD_MASK (1U &lt;&lt; PFERR_RSVD_BIT)</div><div class='ctx'> #define PFERR_FETCH_MASK (1U &lt;&lt; PFERR_FETCH_BIT)</div><div class='ctx'> #define PFERR_PK_MASK (1U &lt;&lt; PFERR_PK_BIT)</div><div class='add'>+#define PFERR_GUEST_FINAL_MASK (1ULL &lt;&lt; PFERR_GUEST_FINAL_BIT)</div><div class='add'>+#define PFERR_GUEST_PAGE_MASK (1ULL &lt;&lt; PFERR_GUEST_PAGE_BIT)</div><div class='add'>+</div><div class='add'>+#define PFERR_NESTED_GUEST_PAGE (PFERR_GUEST_PAGE_MASK |	\</div><div class='add'>+				 PFERR_USER_MASK |		\</div><div class='add'>+				 PFERR_WRITE_MASK |		\</div><div class='add'>+				 PFERR_PRESENT_MASK)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The mask used to denote special SPTEs, which can be either MMIO SPTEs or</div><div class='add'>+ * Access Tracking SPTEs. We use bit 62 instead of bit 63 to avoid conflicting</div><div class='add'>+ * with the SVE bit in EPT PTEs.</div><div class='add'>+ */</div><div class='add'>+#define SPTE_SPECIAL_MASK (1ULL &lt;&lt; 62)</div><div class='ctx'> </div><div class='ctx'> /* apic attention bits */</div><div class='ctx'> #define KVM_APIC_CHECK_VAPIC	0</div><div class='hunk'>@@ -659,6 +674,9 @@ struct kvm_vcpu_arch {</div><div class='ctx'> </div><div class='ctx'> 	int pending_ioapic_eoi;</div><div class='ctx'> 	int pending_external_vector;</div><div class='add'>+</div><div class='add'>+	/* GPA available (AMD only) */</div><div class='add'>+	bool gpa_available;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_lpage_info {</div><div class='hunk'>@@ -695,6 +713,7 @@ struct kvm_apic_map {</div><div class='ctx'> </div><div class='ctx'> /* Hyper-V emulation context */</div><div class='ctx'> struct kvm_hv {</div><div class='add'>+	struct mutex hv_lock;</div><div class='ctx'> 	u64 hv_guest_os_id;</div><div class='ctx'> 	u64 hv_hypercall;</div><div class='ctx'> 	u64 hv_tsc_page;</div><div class='hunk'>@@ -706,6 +725,12 @@ struct kvm_hv {</div><div class='ctx'> 	HV_REFERENCE_TSC_PAGE tsc_ref;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum kvm_irqchip_mode {</div><div class='add'>+	KVM_IRQCHIP_NONE,</div><div class='add'>+	KVM_IRQCHIP_KERNEL,       /* created with KVM_CREATE_IRQCHIP */</div><div class='add'>+	KVM_IRQCHIP_SPLIT,        /* created with KVM_CAP_SPLIT_IRQCHIP */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct kvm_arch {</div><div class='ctx'> 	unsigned int n_used_mmu_pages;</div><div class='ctx'> 	unsigned int n_requested_mmu_pages;</div><div class='hunk'>@@ -758,7 +783,7 @@ struct kvm_arch {</div><div class='ctx'> 	spinlock_t pvclock_gtod_sync_lock;</div><div class='ctx'> 	bool use_master_clock;</div><div class='ctx'> 	u64 master_kernel_ns;</div><div class='del'>-	cycle_t master_cycle_now;</div><div class='add'>+	u64 master_cycle_now;</div><div class='ctx'> 	struct delayed_work kvmclock_update_work;</div><div class='ctx'> 	struct delayed_work kvmclock_sync_work;</div><div class='ctx'> </div><div class='hunk'>@@ -778,7 +803,7 @@ struct kvm_arch {</div><div class='ctx'> </div><div class='ctx'> 	u64 disabled_quirks;</div><div class='ctx'> </div><div class='del'>-	bool irqchip_split;</div><div class='add'>+	enum kvm_irqchip_mode irqchip_mode;</div><div class='ctx'> 	u8 nr_reserved_ioapic_pins;</div><div class='ctx'> </div><div class='ctx'> 	bool disabled_lapic_found;</div><div class='hunk'>@@ -805,6 +830,7 @@ struct kvm_vm_stat {</div><div class='ctx'> 	ulong mmu_unsync;</div><div class='ctx'> 	ulong remote_tlb_flush;</div><div class='ctx'> 	ulong lpages;</div><div class='add'>+	ulong max_mmu_page_hash_collisions;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_vcpu_stat {</div><div class='hunk'>@@ -834,6 +860,7 @@ struct kvm_vcpu_stat {</div><div class='ctx'> 	u64 hypercalls;</div><div class='ctx'> 	u64 irq_injections;</div><div class='ctx'> 	u64 nmi_injections;</div><div class='add'>+	u64 req_event;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct x86_instruction_info;</div><div class='hunk'>@@ -908,8 +935,6 @@ struct kvm_x86_ops {</div><div class='ctx'> 	unsigned long (*get_rflags)(struct kvm_vcpu *vcpu);</div><div class='ctx'> 	void (*set_rflags)(struct kvm_vcpu *vcpu, unsigned long rflags);</div><div class='ctx'> 	u32 (*get_pkru)(struct kvm_vcpu *vcpu);</div><div class='del'>-	void (*fpu_activate)(struct kvm_vcpu *vcpu);</div><div class='del'>-	void (*fpu_deactivate)(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> 	void (*tlb_flush)(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='hunk'>@@ -941,7 +966,7 @@ struct kvm_x86_ops {</div><div class='ctx'> 	void (*set_virtual_x2apic_mode)(struct kvm_vcpu *vcpu, bool set);</div><div class='ctx'> 	void (*set_apic_access_page_addr)(struct kvm_vcpu *vcpu, hpa_t hpa);</div><div class='ctx'> 	void (*deliver_posted_interrupt)(struct kvm_vcpu *vcpu, int vector);</div><div class='del'>-	void (*sync_pir_to_irr)(struct kvm_vcpu *vcpu);</div><div class='add'>+	int (*sync_pir_to_irr)(struct kvm_vcpu *vcpu);</div><div class='ctx'> 	int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);</div><div class='ctx'> 	int (*get_tdp_level)(void);</div><div class='ctx'> 	u64 (*get_mt_mask)(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio);</div><div class='hunk'>@@ -1040,7 +1065,8 @@ void kvm_mmu_setup(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_mmu_init_vm(struct kvm *kvm);</div><div class='ctx'> void kvm_mmu_uninit_vm(struct kvm *kvm);</div><div class='ctx'> void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask,</div><div class='del'>-		u64 dirty_mask, u64 nx_mask, u64 x_mask, u64 p_mask);</div><div class='add'>+		u64 dirty_mask, u64 nx_mask, u64 x_mask, u64 p_mask,</div><div class='add'>+		u64 acc_track_mask);</div><div class='ctx'> </div><div class='ctx'> void kvm_mmu_reset_context(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_mmu_slot_remove_write_access(struct kvm *kvm,</div><div class='hunk'>@@ -1062,6 +1088,7 @@ unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm);</div><div class='ctx'> void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages);</div><div class='ctx'> </div><div class='ctx'> int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3);</div><div class='add'>+bool pdptrs_changed(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='ctx'> 			  const void *val, int bytes);</div><div class='hunk'>@@ -1124,7 +1151,8 @@ int kvm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr);</div><div class='ctx'> struct x86_emulate_ctxt;</div><div class='ctx'> </div><div class='ctx'> int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size, unsigned short port);</div><div class='del'>-void kvm_emulate_cpuid(struct kvm_vcpu *vcpu);</div><div class='add'>+int kvm_fast_pio_in(struct kvm_vcpu *vcpu, int size, unsigned short port);</div><div class='add'>+int kvm_emulate_cpuid(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_emulate_halt(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_vcpu_halt(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_emulate_wbinvd(struct kvm_vcpu *vcpu);</div><div class='hunk'>@@ -1203,7 +1231,7 @@ void kvm_vcpu_deactivate_apicv(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> int kvm_emulate_hypercall(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='del'>-int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code,</div><div class='add'>+int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva, u64 error_code,</div><div class='ctx'> 		       void *insn, int insn_len);</div><div class='ctx'> void kvm_mmu_invlpg(struct kvm_vcpu *vcpu, gva_t gva);</div><div class='ctx'> void kvm_mmu_new_cr3(struct kvm_vcpu *vcpu);</div><div class='hunk'>@@ -1358,7 +1386,8 @@ void kvm_arch_async_page_ready(struct kvm_vcpu *vcpu,</div><div class='ctx'> bool kvm_arch_can_inject_async_page_present(struct kvm_vcpu *vcpu);</div><div class='ctx'> extern bool kvm_find_async_pf_gfn(struct kvm_vcpu *vcpu, gfn_t gfn);</div><div class='ctx'> </div><div class='del'>-void kvm_complete_insn_gp(struct kvm_vcpu *vcpu, int err);</div><div class='add'>+int kvm_skip_emulated_instruction(struct kvm_vcpu *vcpu);</div><div class='add'>+int kvm_complete_insn_gp(struct kvm_vcpu *vcpu, int err);</div><div class='ctx'> </div><div class='ctx'> int kvm_is_in_guest(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/kvm_page_track.h b/arch/x86/include/asm/kvm_page_track.h<br/>index c2b8d24a235c..d74747b031ec 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/kvm_page_track.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/kvm_page_track.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/kvm_page_track.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kvm_page_track.h</a></div><div class='hunk'>@@ -29,9 +29,20 @@ struct kvm_page_track_notifier_node {</div><div class='ctx'> 	 * @gpa: the physical address written by guest.</div><div class='ctx'> 	 * @new: the data was written to the address.</div><div class='ctx'> 	 * @bytes: the written length.</div><div class='add'>+	 * @node: this node</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*track_write)(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new,</div><div class='del'>-			    int bytes);</div><div class='add'>+			    int bytes, struct kvm_page_track_notifier_node *node);</div><div class='add'>+	/*</div><div class='add'>+	 * It is called when memory slot is being moved or removed</div><div class='add'>+	 * users can drop write-protection for the pages in that memory slot</div><div class='add'>+	 *</div><div class='add'>+	 * @kvm: the kvm where memory slot being moved or removed</div><div class='add'>+	 * @slot: the memory slot being moved or removed</div><div class='add'>+	 * @node: this node</div><div class='add'>+	 */</div><div class='add'>+	void (*track_flush_slot)(struct kvm *kvm, struct kvm_memory_slot *slot,</div><div class='add'>+			    struct kvm_page_track_notifier_node *node);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void kvm_page_track_init(struct kvm *kvm);</div><div class='hunk'>@@ -58,4 +69,5 @@ kvm_page_track_unregister_notifier(struct kvm *kvm,</div><div class='ctx'> 				   struct kvm_page_track_notifier_node *n);</div><div class='ctx'> void kvm_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new,</div><div class='ctx'> 			  int bytes);</div><div class='add'>+void kvm_page_track_flush_slot(struct kvm *kvm, struct kvm_memory_slot *slot);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/include/asm/kvmclock.h b/arch/x86/include/asm/kvmclock.h<br/>new file mode 100644<br/>index 000000000000..f260bef63591<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/kvmclock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/kvmclock.h</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+#ifndef _ASM_X86_KVM_CLOCK_H</div><div class='add'>+#define _ASM_X86_KVM_CLOCK_H</div><div class='add'>+</div><div class='add'>+extern struct clocksource kvm_clock;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_X86_KVM_CLOCK_H */</div><div class='head'>diff --git a/arch/x86/include/asm/lguest_hcall.h b/arch/x86/include/asm/lguest_hcall.h<br/>index ef01fef3eebc..6c119cfae218 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/lguest_hcall.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/lguest_hcall.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/lguest_hcall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/lguest_hcall.h</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> #define LHCALL_FLUSH_TLB	5</div><div class='ctx'> #define LHCALL_LOAD_IDT_ENTRY	6</div><div class='ctx'> #define LHCALL_SET_STACK	7</div><div class='del'>-#define LHCALL_TS		8</div><div class='ctx'> #define LHCALL_SET_CLOCKEVENT	9</div><div class='ctx'> #define LHCALL_HALT		10</div><div class='ctx'> #define LHCALL_SET_PMD		13</div><div class='head'>diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h<br/>index 9bd7ff5ffbcc..e63873683d4a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/mce.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/mce.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/mce.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mce.h</a></div><div class='hunk'>@@ -97,10 +97,6 @@</div><div class='ctx'> </div><div class='ctx'> #define MCE_OVERFLOW 0		/* bit 0 in flags means overflow */</div><div class='ctx'> </div><div class='del'>-/* Software defined banks */</div><div class='del'>-#define MCE_EXTENDED_BANK	128</div><div class='del'>-#define MCE_THERMAL_BANK	(MCE_EXTENDED_BANK + 0)</div><div class='del'>-</div><div class='ctx'> #define MCE_LOG_LEN 32</div><div class='ctx'> #define MCE_LOG_SIGNATURE	"MACHINECHECK"</div><div class='ctx'> </div><div class='hunk'>@@ -193,6 +189,15 @@ extern struct mce_vendor_flags mce_flags;</div><div class='ctx'> </div><div class='ctx'> extern struct mca_config mca_cfg;</div><div class='ctx'> extern struct mca_msr_regs msr_ops;</div><div class='add'>+</div><div class='add'>+enum mce_notifier_prios {</div><div class='add'>+	MCE_PRIO_SRAO		= INT_MAX,</div><div class='add'>+	MCE_PRIO_EXTLOG		= INT_MAX - 1,</div><div class='add'>+	MCE_PRIO_NFIT		= INT_MAX - 2,</div><div class='add'>+	MCE_PRIO_EDAC		= INT_MAX - 3,</div><div class='add'>+	MCE_PRIO_LOWEST		= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> extern void mce_register_decode_chain(struct notifier_block *nb);</div><div class='ctx'> extern void mce_unregister_decode_chain(struct notifier_block *nb);</div><div class='ctx'> </div><div class='hunk'>@@ -252,8 +257,10 @@ static inline void cmci_recheck(void) {}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_MCE_AMD</div><div class='ctx'> void mce_amd_feature_init(struct cpuinfo_x86 *c);</div><div class='add'>+int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr);</div><div class='ctx'> #else</div><div class='ctx'> static inline void mce_amd_feature_init(struct cpuinfo_x86 *c) { }</div><div class='add'>+static inline int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr) { return -EINVAL; };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int mce_available(struct cpuinfo_x86 *c);</div><div class='hunk'>@@ -293,9 +300,7 @@ void do_machine_check(struct pt_regs *, long);</div><div class='ctx'> /*</div><div class='ctx'>  * Threshold handler</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> extern void (*mce_threshold_vector)(void);</div><div class='del'>-extern void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);</div><div class='ctx'> </div><div class='ctx'> /* Deferred error interrupt handler */</div><div class='ctx'> extern void (*deferred_error_int_vector)(void);</div><div class='hunk'>@@ -306,8 +311,6 @@ extern void (*deferred_error_int_vector)(void);</div><div class='ctx'> </div><div class='ctx'> void intel_init_thermal(struct cpuinfo_x86 *c);</div><div class='ctx'> </div><div class='del'>-void mce_log_therm_throt_event(__u64 status);</div><div class='del'>-</div><div class='ctx'> /* Interrupt Handler for core thermal thresholds */</div><div class='ctx'> extern int (*platform_thermal_notify)(__u64 msr_val);</div><div class='ctx'> </div><div class='hunk'>@@ -356,27 +359,32 @@ enum smca_bank_types {</div><div class='ctx'> 	N_SMCA_BANK_TYPES</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct smca_bank_name {</div><div class='del'>-	const char *name;	/* Short name for sysfs */</div><div class='del'>-	const char *long_name;	/* Long name for pretty-printing */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct smca_bank_name smca_bank_names[N_SMCA_BANK_TYPES];</div><div class='del'>-</div><div class='del'>-#define HWID_MCATYPE(hwid, mcatype) ((hwid &lt;&lt; 16) | mcatype)</div><div class='add'>+#define HWID_MCATYPE(hwid, mcatype) (((hwid) &lt;&lt; 16) | (mcatype))</div><div class='ctx'> </div><div class='del'>-struct smca_hwid_mcatype {</div><div class='add'>+struct smca_hwid {</div><div class='ctx'> 	unsigned int bank_type;	/* Use with smca_bank_types for easy indexing. */</div><div class='ctx'> 	u32 hwid_mcatype;	/* (hwid,mcatype) tuple */</div><div class='ctx'> 	u32 xec_bitmap;		/* Bitmap of valid ExtErrorCodes; current max is 21. */</div><div class='add'>+	u8 count;		/* Number of instances. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct smca_bank_info {</div><div class='del'>-	struct smca_hwid_mcatype *type;</div><div class='del'>-	u32 type_instance;</div><div class='add'>+struct smca_bank {</div><div class='add'>+	struct smca_hwid *hwid;</div><div class='add'>+	u32 id;			/* Value of MCA_IPID[InstanceId]. */</div><div class='add'>+	u8 sysfs_id;		/* Value used for sysfs name. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct smca_bank_info smca_banks[MAX_NR_BANKS];</div><div class='add'>+extern struct smca_bank smca_banks[MAX_NR_BANKS];</div><div class='add'>+</div><div class='add'>+extern const char *smca_get_long_name(enum smca_bank_types t);</div><div class='add'>+</div><div class='add'>+extern int mce_threshold_create_device(unsigned int cpu);</div><div class='add'>+extern int mce_threshold_remove_device(unsigned int cpu);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int mce_threshold_create_device(unsigned int cpu) { return 0; };</div><div class='add'>+static inline int mce_threshold_remove_device(unsigned int cpu) { return 0; };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h<br/>index da0d81fa0b54..daadeeea00b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/microcode.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/microcode.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/microcode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/microcode.h</a></div><div class='hunk'>@@ -7,18 +7,26 @@</div><div class='ctx'> </div><div class='ctx'> #define native_rdmsr(msr, val1, val2)			\</div><div class='ctx'> do {							\</div><div class='del'>-	u64 __val = native_read_msr((msr));		\</div><div class='add'>+	u64 __val = __rdmsr((msr));			\</div><div class='ctx'> 	(void)((val1) = (u32)__val);			\</div><div class='ctx'> 	(void)((val2) = (u32)(__val &gt;&gt; 32));		\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #define native_wrmsr(msr, low, high)			\</div><div class='del'>-	native_write_msr(msr, low, high)</div><div class='add'>+	__wrmsr(msr, low, high)</div><div class='ctx'> </div><div class='ctx'> #define native_wrmsrl(msr, val)				\</div><div class='del'>-	native_write_msr((msr),				\</div><div class='del'>-			 (u32)((u64)(val)),		\</div><div class='del'>-			 (u32)((u64)(val) &gt;&gt; 32))</div><div class='add'>+	__wrmsr((msr), (u32)((u64)(val)),		\</div><div class='add'>+		       (u32)((u64)(val) &gt;&gt; 32))</div><div class='add'>+</div><div class='add'>+struct ucode_patch {</div><div class='add'>+	struct list_head plist;</div><div class='add'>+	void *data;		/* Intel uses only this one */</div><div class='add'>+	u32 patch_id;</div><div class='add'>+	u16 equiv_cpu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct list_head microcode_cache;</div><div class='ctx'> </div><div class='ctx'> struct cpu_signature {</div><div class='ctx'> 	unsigned int sig;</div><div class='hunk'>@@ -55,12 +63,7 @@ struct ucode_cpu_info {</div><div class='ctx'> 	void			*mc;</div><div class='ctx'> };</div><div class='ctx'> extern struct ucode_cpu_info ucode_cpu_info[];</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MICROCODE</div><div class='del'>-int __init microcode_init(void);</div><div class='del'>-#else</div><div class='del'>-static inline int __init microcode_init(void)	{ return 0; };</div><div class='del'>-#endif</div><div class='add'>+struct cpio_data find_microcode_in_initrd(const char *path, bool use_pa);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MICROCODE_INTEL</div><div class='ctx'> extern struct microcode_ops * __init init_intel_microcode(void);</div><div class='hunk'>@@ -131,11 +134,14 @@ static inline unsigned int x86_cpuid_family(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MICROCODE</div><div class='add'>+int __init microcode_init(void);</div><div class='ctx'> extern void __init load_ucode_bsp(void);</div><div class='ctx'> extern void load_ucode_ap(void);</div><div class='ctx'> void reload_early_microcode(void);</div><div class='ctx'> extern bool get_builtin_firmware(struct cpio_data *cd, const char *name);</div><div class='add'>+extern bool initrd_gone;</div><div class='ctx'> #else</div><div class='add'>+static inline int __init microcode_init(void)			{ return 0; };</div><div class='ctx'> static inline void __init load_ucode_bsp(void)			{ }</div><div class='ctx'> static inline void load_ucode_ap(void)				{ }</div><div class='ctx'> static inline void reload_early_microcode(void)			{ }</div><div class='head'>diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h<br/>index 15eb75484cc0..3d57009e168b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/microcode_amd.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/microcode_amd.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/microcode_amd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/microcode_amd.h</a></div><div class='hunk'>@@ -40,40 +40,18 @@ struct microcode_amd {</div><div class='ctx'> 	unsigned int			mpb[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline u16 find_equiv_id(struct equiv_cpu_entry *equiv_cpu_table,</div><div class='del'>-				unsigned int sig)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	if (!equiv_cpu_table)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	while (equiv_cpu_table[i].installed_cpu != 0) {</div><div class='del'>-		if (sig == equiv_cpu_table[i].installed_cpu)</div><div class='del'>-			return equiv_cpu_table[i].equiv_cpu;</div><div class='del'>-</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern int __apply_microcode_amd(struct microcode_amd *mc_amd);</div><div class='del'>-extern int apply_microcode_amd(int cpu);</div><div class='del'>-extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size);</div><div class='del'>-</div><div class='ctx'> #define PATCH_MAX_SIZE PAGE_SIZE</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MICROCODE_AMD</div><div class='ctx'> extern void __init load_ucode_amd_bsp(unsigned int family);</div><div class='del'>-extern void load_ucode_amd_ap(void);</div><div class='del'>-extern int __init save_microcode_in_initrd_amd(void);</div><div class='add'>+extern void load_ucode_amd_ap(unsigned int family);</div><div class='add'>+extern int __init save_microcode_in_initrd_amd(unsigned int family);</div><div class='ctx'> void reload_ucode_amd(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline void __init load_ucode_amd_bsp(unsigned int family) {}</div><div class='del'>-static inline void load_ucode_amd_ap(void) {}</div><div class='del'>-static inline int __init save_microcode_in_initrd_amd(void) { return -EINVAL; }</div><div class='add'>+static inline void load_ucode_amd_ap(unsigned int family) {}</div><div class='add'>+static inline int __init</div><div class='add'>+save_microcode_in_initrd_amd(unsigned int family) { return -EINVAL; }</div><div class='ctx'> void reload_ucode_amd(void) {}</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-extern bool check_current_patch_level(u32 *rev, bool early);</div><div class='ctx'> #endif /* _ASM_X86_MICROCODE_AMD_H */</div><div class='head'>diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h<br/>index 5e69154c9f07..e793fc9a9b20 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/microcode_intel.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/microcode_intel.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/microcode_intel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/microcode_intel.h</a></div><div class='hunk'>@@ -52,9 +52,20 @@ struct extended_sigtable {</div><div class='ctx'> </div><div class='ctx'> #define exttable_size(et) ((et)-&gt;count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE)</div><div class='ctx'> </div><div class='del'>-extern int has_newer_microcode(void *mc, unsigned int csig, int cpf, int rev);</div><div class='del'>-extern int microcode_sanity_check(void *mc, int print_err);</div><div class='del'>-extern int find_matching_signature(void *mc, unsigned int csig, int cpf);</div><div class='add'>+static inline u32 intel_get_microcode_revision(void)</div><div class='add'>+{</div><div class='add'>+	u32 rev, dummy;</div><div class='add'>+</div><div class='add'>+	native_wrmsrl(MSR_IA32_UCODE_REV, 0);</div><div class='add'>+</div><div class='add'>+	/* As documented in the SDM: Do a CPUID 1 here */</div><div class='add'>+	native_cpuid_eax(1);</div><div class='add'>+</div><div class='add'>+	/* get the current revision from MSR 0x8B */</div><div class='add'>+	native_rdmsr(MSR_IA32_UCODE_REV, dummy, rev);</div><div class='add'>+</div><div class='add'>+	return rev;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MICROCODE_INTEL</div><div class='ctx'> extern void __init load_ucode_intel_bsp(void);</div><div class='head'>diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h<br/>index 72198c64e646..f9813b6d8b80 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/mmu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/mmu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/mmu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mmu.h</a></div><div class='hunk'>@@ -31,6 +31,10 @@ typedef struct {</div><div class='ctx'> 	u16 pkey_allocation_map;</div><div class='ctx'> 	s16 execute_only_pkey;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_X86_INTEL_MPX</div><div class='add'>+	/* address of the bounds directory */</div><div class='add'>+	void __user *bd_addr;</div><div class='add'>+#endif</div><div class='ctx'> } mm_context_t;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='head'>diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h<br/>index 8e0a9fe86de4..306c7e12af55 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -47,7 +47,7 @@ struct ldt_struct {</div><div class='ctx'> 	 * allocations, but it's not worth trying to optimize.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct desc_struct *entries;</div><div class='del'>-	int size;</div><div class='add'>+	unsigned int size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/include/asm/mpx.h b/arch/x86/include/asm/mpx.h<br/>index 7a35495275a9..a0d662be4c5b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/mpx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/mpx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/mpx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mpx.h</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> #define _ASM_X86_MPX_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/insn.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -59,7 +61,7 @@ siginfo_t *mpx_generate_siginfo(struct pt_regs *regs);</div><div class='ctx'> int mpx_handle_bd_fault(void);</div><div class='ctx'> static inline int kernel_managing_mpx_tables(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	return (mm-&gt;bd_addr != MPX_INVALID_BOUNDS_DIR);</div><div class='add'>+	return (mm-&gt;context.bd_addr != MPX_INVALID_BOUNDS_DIR);</div><div class='ctx'> }</div><div class='ctx'> static inline void mpx_mm_init(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='hunk'>@@ -67,7 +69,7 @@ static inline void mpx_mm_init(struct mm_struct *mm)</div><div class='ctx'> 	 * NULL is theoretically a valid place to put the bounds</div><div class='ctx'> 	 * directory, so point this at an invalid address.</div><div class='ctx'> 	 */</div><div class='del'>-	mm-&gt;bd_addr = MPX_INVALID_BOUNDS_DIR;</div><div class='add'>+	mm-&gt;context.bd_addr = MPX_INVALID_BOUNDS_DIR;</div><div class='ctx'> }</div><div class='ctx'> void mpx_notify_unmap(struct mm_struct *mm, struct vm_area_struct *vma,</div><div class='ctx'> 		      unsigned long start, unsigned long end);</div><div class='head'>diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h<br/>index aaf59b7da98a..7c9c895432a9 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/mshyperv.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/mshyperv.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/mshyperv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mshyperv.h</a></div><div class='hunk'>@@ -3,8 +3,28 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;asm/hyperv.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The below CPUID leaves are present if VersionAndFeatures.HypervisorPresent</div><div class='add'>+ * is set by CPUID(HVCPUID_VERSION_FEATURES).</div><div class='add'>+ */</div><div class='add'>+enum hv_cpuid_function {</div><div class='add'>+	HVCPUID_VERSION_FEATURES		= 0x00000001,</div><div class='add'>+	HVCPUID_VENDOR_MAXFUNCTION		= 0x40000000,</div><div class='add'>+	HVCPUID_INTERFACE			= 0x40000001,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The remaining functions depend on the value of</div><div class='add'>+	 * HVCPUID_INTERFACE</div><div class='add'>+	 */</div><div class='add'>+	HVCPUID_VERSION				= 0x40000002,</div><div class='add'>+	HVCPUID_FEATURES			= 0x40000003,</div><div class='add'>+	HVCPUID_ENLIGHTENMENT_INFO		= 0x40000004,</div><div class='add'>+	HVCPUID_IMPLEMENTATION_LIMITS		= 0x40000005,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ms_hyperv_info {</div><div class='ctx'> 	u32 features;</div><div class='ctx'> 	u32 misc_features;</div><div class='hunk'>@@ -13,6 +33,128 @@ struct ms_hyperv_info {</div><div class='ctx'> </div><div class='ctx'> extern struct ms_hyperv_info ms_hyperv;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Declare the MSR used to setup pages used to communicate with the hypervisor.</div><div class='add'>+ */</div><div class='add'>+union hv_x64_msr_hypercall_contents {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 enable:1;</div><div class='add'>+		u64 reserved:11;</div><div class='add'>+		u64 guest_physical_address:52;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TSC page layout.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct ms_hyperv_tsc_page {</div><div class='add'>+	volatile u32 tsc_sequence;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	volatile u64 tsc_scale;</div><div class='add'>+	volatile s64 tsc_offset;</div><div class='add'>+	u64 reserved2[509];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The guest OS needs to register the guest ID with the hypervisor.</div><div class='add'>+ * The guest ID is a 64 bit entity and the structure of this ID is</div><div class='add'>+ * specified in the Hyper-V specification:</div><div class='add'>+ *</div><div class='add'>+ * msdn.microsoft.com/en-us/library/windows/hardware/ff542653%28v=vs.85%29.aspx</div><div class='add'>+ *</div><div class='add'>+ * While the current guideline does not specify how Linux guest ID(s)</div><div class='add'>+ * need to be generated, our plan is to publish the guidelines for</div><div class='add'>+ * Linux and other guest operating systems that currently are hosted</div><div class='add'>+ * on Hyper-V. The implementation here conforms to this yet</div><div class='add'>+ * unpublished guidelines.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Bit(s)</div><div class='add'>+ * 63 - Indicates if the OS is Open Source or not; 1 is Open Source</div><div class='add'>+ * 62:56 - Os Type; Linux is 0x100</div><div class='add'>+ * 55:48 - Distro specific identification</div><div class='add'>+ * 47:16 - Linux kernel version number</div><div class='add'>+ * 15:0  - Distro specific identification</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HV_LINUX_VENDOR_ID              0x8100</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generate the guest ID based on the guideline described above.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline  __u64 generate_guest_id(__u64 d_info1, __u64 kernel_version,</div><div class='add'>+				       __u64 d_info2)</div><div class='add'>+{</div><div class='add'>+	__u64 guest_id = 0;</div><div class='add'>+</div><div class='add'>+	guest_id = (((__u64)HV_LINUX_VENDOR_ID) &lt;&lt; 48);</div><div class='add'>+	guest_id |= (d_info1 &lt;&lt; 48);</div><div class='add'>+	guest_id |= (kernel_version &lt;&lt; 16);</div><div class='add'>+	guest_id |= d_info2;</div><div class='add'>+</div><div class='add'>+	return guest_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Free the message slot and signal end-of-message if required */</div><div class='add'>+static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * On crash we're reading some other CPU's message page and we need</div><div class='add'>+	 * to be careful: this other CPU may already had cleared the header</div><div class='add'>+	 * and the host may already had delivered some other message there.</div><div class='add'>+	 * In case we blindly write msg-&gt;header.message_type we're going</div><div class='add'>+	 * to lose it. We can still lose a message of the same type but</div><div class='add'>+	 * we count on the fact that there can only be one</div><div class='add'>+	 * CHANNELMSG_UNLOAD_RESPONSE and we don't care about other messages</div><div class='add'>+	 * on crash.</div><div class='add'>+	 */</div><div class='add'>+	if (cmpxchg(&amp;msg-&gt;header.message_type, old_msg_type,</div><div class='add'>+		    HVMSG_NONE) != old_msg_type)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the write to MessageType (ie set to</div><div class='add'>+	 * HVMSG_NONE) happens before we read the</div><div class='add'>+	 * MessagePending and EOMing. Otherwise, the EOMing</div><div class='add'>+	 * will not deliver any more messages since there is</div><div class='add'>+	 * no empty slot</div><div class='add'>+	 */</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;header.message_flags.msg_pending) {</div><div class='add'>+		/*</div><div class='add'>+		 * This will cause message queue rescan to</div><div class='add'>+		 * possibly deliver another msg from the</div><div class='add'>+		 * hypervisor</div><div class='add'>+		 */</div><div class='add'>+		wrmsrl(HV_X64_MSR_EOM, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define hv_get_current_tick(tick) rdmsrl(HV_X64_MSR_TIME_REF_COUNT, tick)</div><div class='add'>+#define hv_init_timer(timer, tick) wrmsrl(timer, tick)</div><div class='add'>+#define hv_init_timer_config(config, val) wrmsrl(config, val)</div><div class='add'>+</div><div class='add'>+#define hv_get_simp(val) rdmsrl(HV_X64_MSR_SIMP, val)</div><div class='add'>+#define hv_set_simp(val) wrmsrl(HV_X64_MSR_SIMP, val)</div><div class='add'>+</div><div class='add'>+#define hv_get_siefp(val) rdmsrl(HV_X64_MSR_SIEFP, val)</div><div class='add'>+#define hv_set_siefp(val) wrmsrl(HV_X64_MSR_SIEFP, val)</div><div class='add'>+</div><div class='add'>+#define hv_get_synic_state(val) rdmsrl(HV_X64_MSR_SCONTROL, val)</div><div class='add'>+#define hv_set_synic_state(val) wrmsrl(HV_X64_MSR_SCONTROL, val)</div><div class='add'>+</div><div class='add'>+#define hv_get_vp_index(index) rdmsrl(HV_X64_MSR_VP_INDEX, index)</div><div class='add'>+</div><div class='add'>+#define hv_get_synint_state(int_num, val) rdmsrl(int_num, val)</div><div class='add'>+#define hv_set_synint_state(int_num, val) wrmsrl(int_num, val)</div><div class='add'>+</div><div class='ctx'> void hyperv_callback_vector(void);</div><div class='ctx'> #ifdef CONFIG_TRACING</div><div class='ctx'> #define trace_hyperv_callback_vector hyperv_callback_vector</div><div class='hunk'>@@ -25,4 +167,13 @@ void hv_setup_kexec_handler(void (*handler)(void));</div><div class='ctx'> void hv_remove_kexec_handler(void);</div><div class='ctx'> void hv_setup_crash_handler(void (*handler)(struct pt_regs *regs));</div><div class='ctx'> void hv_remove_crash_handler(void);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_HYPERV)</div><div class='add'>+extern struct clocksource *hyperv_cs;</div><div class='add'>+</div><div class='add'>+void hyperv_init(void);</div><div class='add'>+void hyperv_report_panic(struct pt_regs *regs);</div><div class='add'>+bool hv_is_hypercall_page_setup(void);</div><div class='add'>+void hyperv_cleanup(void);</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h<br/>index 78f3760ca1f2..d8b5f8ab8ef9 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/msr-index.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/msr-index.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/msr-index.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/msr-index.h</a></div><div class='hunk'>@@ -37,12 +37,16 @@</div><div class='ctx'> #define EFER_FFXSR		(1&lt;&lt;_EFER_FFXSR)</div><div class='ctx'> </div><div class='ctx'> /* Intel MSRs. Some also available on other CPUs */</div><div class='add'>+</div><div class='add'>+#define MSR_PPIN_CTL			0x0000004e</div><div class='add'>+#define MSR_PPIN			0x0000004f</div><div class='add'>+</div><div class='ctx'> #define MSR_IA32_PERFCTR0		0x000000c1</div><div class='ctx'> #define MSR_IA32_PERFCTR1		0x000000c2</div><div class='ctx'> #define MSR_FSB_FREQ			0x000000cd</div><div class='ctx'> #define MSR_PLATFORM_INFO		0x000000ce</div><div class='ctx'> </div><div class='del'>-#define MSR_NHM_SNB_PKG_CST_CFG_CTL	0x000000e2</div><div class='add'>+#define MSR_PKG_CST_CONFIG_CONTROL	0x000000e2</div><div class='ctx'> #define NHM_C3_AUTO_DEMOTE		(1UL &lt;&lt; 25)</div><div class='ctx'> #define NHM_C1_AUTO_DEMOTE		(1UL &lt;&lt; 26)</div><div class='ctx'> #define ATM_LNC_C6_AUTO_DEMOTE		(1UL &lt;&lt; 25)</div><div class='hunk'>@@ -143,6 +147,7 @@</div><div class='ctx'> /* C-state Residency Counters */</div><div class='ctx'> #define MSR_PKG_C3_RESIDENCY		0x000003f8</div><div class='ctx'> #define MSR_PKG_C6_RESIDENCY		0x000003f9</div><div class='add'>+#define MSR_ATOM_PKG_C6_RESIDENCY	0x000003fa</div><div class='ctx'> #define MSR_PKG_C7_RESIDENCY		0x000003fa</div><div class='ctx'> #define MSR_CORE_C3_RESIDENCY		0x000003fc</div><div class='ctx'> #define MSR_CORE_C6_RESIDENCY		0x000003fd</div><div class='hunk'>@@ -199,10 +204,17 @@</div><div class='ctx'> #define MSR_PKG_BOTH_CORE_GFXE_C0_RES	0x0000065B</div><div class='ctx'> </div><div class='ctx'> #define MSR_CORE_C1_RES			0x00000660</div><div class='add'>+#define MSR_MODULE_C6_RES_MS		0x00000664</div><div class='ctx'> </div><div class='ctx'> #define MSR_CC6_DEMOTION_POLICY_CONFIG	0x00000668</div><div class='ctx'> #define MSR_MC6_DEMOTION_POLICY_CONFIG	0x00000669</div><div class='ctx'> </div><div class='add'>+#define MSR_ATOM_CORE_RATIOS		0x0000066a</div><div class='add'>+#define MSR_ATOM_CORE_VIDS		0x0000066b</div><div class='add'>+#define MSR_ATOM_CORE_TURBO_RATIOS	0x0000066c</div><div class='add'>+#define MSR_ATOM_CORE_TURBO_VIDS	0x0000066d</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define MSR_CORE_PERF_LIMIT_REASONS	0x00000690</div><div class='ctx'> #define MSR_GFX_PERF_LIMIT_REASONS	0x000006B0</div><div class='ctx'> #define MSR_RING_PERF_LIMIT_REASONS	0x000006B1</div><div class='hunk'>@@ -455,6 +467,7 @@</div><div class='ctx'> </div><div class='ctx'> #define MSR_IA32_TEMPERATURE_TARGET	0x000001a2</div><div class='ctx'> </div><div class='add'>+#define MSR_MISC_FEATURE_CONTROL	0x000001a4</div><div class='ctx'> #define MSR_MISC_PWR_MGMT		0x000001aa</div><div class='ctx'> </div><div class='ctx'> #define MSR_IA32_ENERGY_PERF_BIAS	0x000001b0</div><div class='hunk'>@@ -539,6 +552,11 @@</div><div class='ctx'> #define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT	39</div><div class='ctx'> #define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE		(1ULL &lt;&lt; MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT)</div><div class='ctx'> </div><div class='add'>+/* MISC_FEATURE_ENABLES non-architectural features */</div><div class='add'>+#define MSR_MISC_FEATURE_ENABLES	0x00000140</div><div class='add'>+</div><div class='add'>+#define MSR_MISC_FEATURE_ENABLES_RING3MWAIT_BIT		1</div><div class='add'>+</div><div class='ctx'> #define MSR_IA32_TSC_DEADLINE		0x000006E0</div><div class='ctx'> </div><div class='ctx'> /* P4/Xeon+ specific */</div><div class='head'>diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h<br/>index b5fee97813cd..898dba2e2e2c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/msr.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/msr.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/msr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/msr.h</a></div><div class='hunk'>@@ -70,17 +70,24 @@ extern struct tracepoint __tracepoint_read_msr;</div><div class='ctx'> extern struct tracepoint __tracepoint_write_msr;</div><div class='ctx'> extern struct tracepoint __tracepoint_rdpmc;</div><div class='ctx'> #define msr_tracepoint_active(t) static_key_false(&amp;(t).key)</div><div class='del'>-extern void do_trace_write_msr(unsigned msr, u64 val, int failed);</div><div class='del'>-extern void do_trace_read_msr(unsigned msr, u64 val, int failed);</div><div class='del'>-extern void do_trace_rdpmc(unsigned msr, u64 val, int failed);</div><div class='add'>+extern void do_trace_write_msr(unsigned int msr, u64 val, int failed);</div><div class='add'>+extern void do_trace_read_msr(unsigned int msr, u64 val, int failed);</div><div class='add'>+extern void do_trace_rdpmc(unsigned int msr, u64 val, int failed);</div><div class='ctx'> #else</div><div class='ctx'> #define msr_tracepoint_active(t) false</div><div class='del'>-static inline void do_trace_write_msr(unsigned msr, u64 val, int failed) {}</div><div class='del'>-static inline void do_trace_read_msr(unsigned msr, u64 val, int failed) {}</div><div class='del'>-static inline void do_trace_rdpmc(unsigned msr, u64 val, int failed) {}</div><div class='add'>+static inline void do_trace_write_msr(unsigned int msr, u64 val, int failed) {}</div><div class='add'>+static inline void do_trace_read_msr(unsigned int msr, u64 val, int failed) {}</div><div class='add'>+static inline void do_trace_rdpmc(unsigned int msr, u64 val, int failed) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline unsigned long long native_read_msr(unsigned int msr)</div><div class='add'>+/*</div><div class='add'>+ * __rdmsr() and __wrmsr() are the two primitives which are the bare minimum MSR</div><div class='add'>+ * accessors and should not have any tracing or other functionality piggybacking</div><div class='add'>+ * on them - those are *purely* for accessing MSRs and nothing more. So don't even</div><div class='add'>+ * think of extending them - you will be slapped with a stinking trout or a frozen</div><div class='add'>+ * shark will reach you, wherever you are! You've been warned.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long long notrace __rdmsr(unsigned int msr)</div><div class='ctx'> {</div><div class='ctx'> 	DECLARE_ARGS(val, low, high);</div><div class='ctx'> </div><div class='hunk'>@@ -88,11 +95,30 @@ static inline unsigned long long native_read_msr(unsigned int msr)</div><div class='ctx'> 		     "2:\n"</div><div class='ctx'> 		     _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_rdmsr_unsafe)</div><div class='ctx'> 		     : EAX_EDX_RET(val, low, high) : "c" (msr));</div><div class='del'>-	if (msr_tracepoint_active(__tracepoint_read_msr))</div><div class='del'>-		do_trace_read_msr(msr, EAX_EDX_VAL(val, low, high), 0);</div><div class='add'>+</div><div class='ctx'> 	return EAX_EDX_VAL(val, low, high);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void notrace __wrmsr(unsigned int msr, u32 low, u32 high)</div><div class='add'>+{</div><div class='add'>+	asm volatile("1: wrmsr\n"</div><div class='add'>+		     "2:\n"</div><div class='add'>+		     _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe)</div><div class='add'>+		     : : "c" (msr), "a"(low), "d" (high) : "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long long native_read_msr(unsigned int msr)</div><div class='add'>+{</div><div class='add'>+	unsigned long long val;</div><div class='add'>+</div><div class='add'>+	val = __rdmsr(msr);</div><div class='add'>+</div><div class='add'>+	if (msr_tracepoint_active(__tracepoint_read_msr))</div><div class='add'>+		do_trace_read_msr(msr, val, 0);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline unsigned long long native_read_msr_safe(unsigned int msr,</div><div class='ctx'> 						      int *err)</div><div class='ctx'> {</div><div class='hunk'>@@ -115,22 +141,21 @@ static inline unsigned long long native_read_msr_safe(unsigned int msr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Can be uninlined because referenced by paravirt */</div><div class='del'>-notrace static inline void native_write_msr(unsigned int msr,</div><div class='del'>-					    unsigned low, unsigned high)</div><div class='add'>+static inline void notrace</div><div class='add'>+native_write_msr(unsigned int msr, u32 low, u32 high)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("1: wrmsr\n"</div><div class='del'>-		     "2:\n"</div><div class='del'>-		     _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe)</div><div class='del'>-		     : : "c" (msr), "a"(low), "d" (high) : "memory");</div><div class='add'>+	__wrmsr(msr, low, high);</div><div class='add'>+</div><div class='ctx'> 	if (msr_tracepoint_active(__tracepoint_write_msr))</div><div class='ctx'> 		do_trace_write_msr(msr, ((u64)high &lt;&lt; 32 | low), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Can be uninlined because referenced by paravirt */</div><div class='del'>-notrace static inline int native_write_msr_safe(unsigned int msr,</div><div class='del'>-					unsigned low, unsigned high)</div><div class='add'>+static inline int notrace</div><div class='add'>+native_write_msr_safe(unsigned int msr, u32 low, u32 high)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='add'>+</div><div class='ctx'> 	asm volatile("2: wrmsr ; xor %[err],%[err]\n"</div><div class='ctx'> 		     "1:\n\t"</div><div class='ctx'> 		     ".section .fixup,\"ax\"\n\t"</div><div class='hunk'>@@ -223,7 +248,7 @@ do {								\</div><div class='ctx'> 	(void)((high) = (u32)(__val &gt;&gt; 32));			\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-static inline void wrmsr(unsigned msr, unsigned low, unsigned high)</div><div class='add'>+static inline void wrmsr(unsigned int msr, u32 low, u32 high)</div><div class='ctx'> {</div><div class='ctx'> 	native_write_msr(msr, low, high);</div><div class='ctx'> }</div><div class='hunk'>@@ -231,13 +256,13 @@ static inline void wrmsr(unsigned msr, unsigned low, unsigned high)</div><div class='ctx'> #define rdmsrl(msr, val)			\</div><div class='ctx'> 	((val) = native_read_msr((msr)))</div><div class='ctx'> </div><div class='del'>-static inline void wrmsrl(unsigned msr, u64 val)</div><div class='add'>+static inline void wrmsrl(unsigned int msr, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	native_write_msr(msr, (u32)(val &amp; 0xffffffffULL), (u32)(val &gt;&gt; 32));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* wrmsr with exception handling */</div><div class='del'>-static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high)</div><div class='add'>+static inline int wrmsr_safe(unsigned int msr, u32 low, u32 high)</div><div class='ctx'> {</div><div class='ctx'> 	return native_write_msr_safe(msr, low, high);</div><div class='ctx'> }</div><div class='hunk'>@@ -252,7 +277,7 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high)</div><div class='ctx'> 	__err;							\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-static inline int rdmsrl_safe(unsigned msr, unsigned long long *p)</div><div class='add'>+static inline int rdmsrl_safe(unsigned int msr, unsigned long long *p)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -325,12 +350,12 @@ static inline int wrmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 q)</div><div class='ctx'> static inline void rdmsr_on_cpus(const struct cpumask *m, u32 msr_no,</div><div class='ctx'> 				struct msr *msrs)</div><div class='ctx'> {</div><div class='del'>-       rdmsr_on_cpu(0, msr_no, &amp;(msrs[0].l), &amp;(msrs[0].h));</div><div class='add'>+	rdmsr_on_cpu(0, msr_no, &amp;(msrs[0].l), &amp;(msrs[0].h));</div><div class='ctx'> }</div><div class='ctx'> static inline void wrmsr_on_cpus(const struct cpumask *m, u32 msr_no,</div><div class='ctx'> 				struct msr *msrs)</div><div class='ctx'> {</div><div class='del'>-       wrmsr_on_cpu(0, msr_no, msrs[0].l, msrs[0].h);</div><div class='add'>+	wrmsr_on_cpu(0, msr_no, msrs[0].l, msrs[0].h);</div><div class='ctx'> }</div><div class='ctx'> static inline int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no,</div><div class='ctx'> 				    u32 *l, u32 *h)</div><div class='head'>diff --git a/arch/x86/include/asm/mutex.h b/arch/x86/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 7d3a48275394..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-# include &lt;asm/mutex_32.h&gt;</div><div class='del'>-#else</div><div class='del'>-# include &lt;asm/mutex_64.h&gt;</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/x86/include/asm/mutex_32.h b/arch/x86/include/asm/mutex_32.h<br/>deleted file mode 100644<br/>index e9355a84fc67..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/mutex_32.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/mutex_32.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,110 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Assembly implementation of the mutex fastpath, based on atomic</div><div class='del'>- * decrement/increment.</div><div class='del'>- *</div><div class='del'>- * started by Ingo Molnar:</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar &lt;mingo@redhat.com&gt;</div><div class='del'>- */</div><div class='del'>-#ifndef _ASM_X86_MUTEX_32_H</div><div class='del'>-#define _ASM_X86_MUTEX_32_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/alternative.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  __mutex_fastpath_lock - try to take the lock by moving the count</div><div class='del'>- *                          from 1 to a 0 value</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *  @fn: function to call if the original value was not 1</div><div class='del'>- *</div><div class='del'>- * Change the count from 1 to a value lower than 1, and call &lt;fn&gt; if it</div><div class='del'>- * wasn't 1 originally. This function MUST leave the value lower than 1</div><div class='del'>- * even when the "1" assertion wasn't true.</div><div class='del'>- */</div><div class='del'>-#define __mutex_fastpath_lock(count, fail_fn)			\</div><div class='del'>-do {								\</div><div class='del'>-	unsigned int dummy;					\</div><div class='del'>-								\</div><div class='del'>-	typecheck(atomic_t *, count);				\</div><div class='del'>-	typecheck_fn(void (*)(atomic_t *), fail_fn);		\</div><div class='del'>-								\</div><div class='del'>-	asm volatile(LOCK_PREFIX "   decl (%%eax)\n"		\</div><div class='del'>-		     "   jns 1f	\n"				\</div><div class='del'>-		     "   call " #fail_fn "\n"			\</div><div class='del'>-		     "1:\n"					\</div><div class='del'>-		     : "=a" (dummy)				\</div><div class='del'>-		     : "a" (count)				\</div><div class='del'>-		     : "memory", "ecx", "edx");			\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  __mutex_fastpath_lock_retval - try to take the lock by moving the count</div><div class='del'>- *                                 from 1 to a 0 value</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *</div><div class='del'>- * Change the count from 1 to a value lower than 1. This function returns 0</div><div class='del'>- * if the fastpath succeeds, or -1 otherwise.</div><div class='del'>- */</div><div class='del'>-static inline int __mutex_fastpath_lock_retval(atomic_t *count)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(atomic_dec_return(count) &lt; 0))</div><div class='del'>-		return -1;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  __mutex_fastpath_unlock - try to promote the mutex from 0 to 1</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *  @fail_fn: function to call if the original value was not 0</div><div class='del'>- *</div><div class='del'>- * try to promote the mutex from 0 to 1. if it wasn't 0, call &lt;fail_fn&gt;.</div><div class='del'>- * In the failure case, this function is allowed to either set the value</div><div class='del'>- * to 1, or to set it to a value lower than 1.</div><div class='del'>- *</div><div class='del'>- * If the implementation sets it to a value of lower than 1, the</div><div class='del'>- * __mutex_slowpath_needs_to_unlock() macro needs to return 1, it needs</div><div class='del'>- * to return 0 otherwise.</div><div class='del'>- */</div><div class='del'>-#define __mutex_fastpath_unlock(count, fail_fn)			\</div><div class='del'>-do {								\</div><div class='del'>-	unsigned int dummy;					\</div><div class='del'>-								\</div><div class='del'>-	typecheck(atomic_t *, count);				\</div><div class='del'>-	typecheck_fn(void (*)(atomic_t *), fail_fn);		\</div><div class='del'>-								\</div><div class='del'>-	asm volatile(LOCK_PREFIX "   incl (%%eax)\n"		\</div><div class='del'>-		     "   jg	1f\n"				\</div><div class='del'>-		     "   call " #fail_fn "\n"			\</div><div class='del'>-		     "1:\n"					\</div><div class='del'>-		     : "=a" (dummy)				\</div><div class='del'>-		     : "a" (count)				\</div><div class='del'>-		     : "memory", "ecx", "edx");			\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define __mutex_slowpath_needs_to_unlock()	1</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __mutex_fastpath_trylock - try to acquire the mutex, without waiting</div><div class='del'>- *</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *  @fail_fn: fallback function</div><div class='del'>- *</div><div class='del'>- * Change the count from 1 to a value lower than 1, and return 0 (failure)</div><div class='del'>- * if it wasn't 1 originally, or return 1 (success) otherwise. This function</div><div class='del'>- * MUST leave the value lower than 1 even when the "1" assertion wasn't true.</div><div class='del'>- * Additionally, if the value was &lt; 0 originally, this function must not leave</div><div class='del'>- * it to 0 on failure.</div><div class='del'>- */</div><div class='del'>-static inline int __mutex_fastpath_trylock(atomic_t *count,</div><div class='del'>-					   int (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	/* cmpxchg because it never induces a false contention state. */</div><div class='del'>-	if (likely(atomic_read(count) == 1 &amp;&amp; atomic_cmpxchg(count, 1, 0) == 1))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_X86_MUTEX_32_H */</div><div class='head'>diff --git a/arch/x86/include/asm/mutex_64.h b/arch/x86/include/asm/mutex_64.h<br/>deleted file mode 100644<br/>index d9850758464e..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/mutex_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/mutex_64.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,127 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Assembly implementation of the mutex fastpath, based on atomic</div><div class='del'>- * decrement/increment.</div><div class='del'>- *</div><div class='del'>- * started by Ingo Molnar:</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar &lt;mingo@redhat.com&gt;</div><div class='del'>- */</div><div class='del'>-#ifndef _ASM_X86_MUTEX_64_H</div><div class='del'>-#define _ASM_X86_MUTEX_64_H</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __mutex_fastpath_lock - decrement and call function if negative</div><div class='del'>- * @v: pointer of type atomic_t</div><div class='del'>- * @fail_fn: function to call if the result is negative</div><div class='del'>- *</div><div class='del'>- * Atomically decrements @v and calls &lt;fail_fn&gt; if the result is negative.</div><div class='del'>- */</div><div class='del'>-#ifdef CC_HAVE_ASM_GOTO</div><div class='del'>-static inline void __mutex_fastpath_lock(atomic_t *v,</div><div class='del'>-					 void (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	asm_volatile_goto(LOCK_PREFIX "   decl %0\n"</div><div class='del'>-			  "   jns %l[exit]\n"</div><div class='del'>-			  : : "m" (v-&gt;counter)</div><div class='del'>-			  : "memory", "cc"</div><div class='del'>-			  : exit);</div><div class='del'>-	fail_fn(v);</div><div class='del'>-exit:</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define __mutex_fastpath_lock(v, fail_fn)			\</div><div class='del'>-do {								\</div><div class='del'>-	unsigned long dummy;					\</div><div class='del'>-								\</div><div class='del'>-	typecheck(atomic_t *, v);				\</div><div class='del'>-	typecheck_fn(void (*)(atomic_t *), fail_fn);		\</div><div class='del'>-								\</div><div class='del'>-	asm volatile(LOCK_PREFIX "   decl (%%rdi)\n"		\</div><div class='del'>-		     "   jns 1f		\n"			\</div><div class='del'>-		     "   call " #fail_fn "\n"			\</div><div class='del'>-		     "1:"					\</div><div class='del'>-		     : "=D" (dummy)				\</div><div class='del'>-		     : "D" (v)					\</div><div class='del'>-		     : "rax", "rsi", "rdx", "rcx",		\</div><div class='del'>-		       "r8", "r9", "r10", "r11", "memory");	\</div><div class='del'>-} while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  __mutex_fastpath_lock_retval - try to take the lock by moving the count</div><div class='del'>- *                                 from 1 to a 0 value</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *</div><div class='del'>- * Change the count from 1 to a value lower than 1. This function returns 0</div><div class='del'>- * if the fastpath succeeds, or -1 otherwise.</div><div class='del'>- */</div><div class='del'>-static inline int __mutex_fastpath_lock_retval(atomic_t *count)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(atomic_dec_return(count) &lt; 0))</div><div class='del'>-		return -1;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __mutex_fastpath_unlock - increment and call function if nonpositive</div><div class='del'>- * @v: pointer of type atomic_t</div><div class='del'>- * @fail_fn: function to call if the result is nonpositive</div><div class='del'>- *</div><div class='del'>- * Atomically increments @v and calls &lt;fail_fn&gt; if the result is nonpositive.</div><div class='del'>- */</div><div class='del'>-#ifdef CC_HAVE_ASM_GOTO</div><div class='del'>-static inline void __mutex_fastpath_unlock(atomic_t *v,</div><div class='del'>-					   void (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	asm_volatile_goto(LOCK_PREFIX "   incl %0\n"</div><div class='del'>-			  "   jg %l[exit]\n"</div><div class='del'>-			  : : "m" (v-&gt;counter)</div><div class='del'>-			  : "memory", "cc"</div><div class='del'>-			  : exit);</div><div class='del'>-	fail_fn(v);</div><div class='del'>-exit:</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define __mutex_fastpath_unlock(v, fail_fn)			\</div><div class='del'>-do {								\</div><div class='del'>-	unsigned long dummy;					\</div><div class='del'>-								\</div><div class='del'>-	typecheck(atomic_t *, v);				\</div><div class='del'>-	typecheck_fn(void (*)(atomic_t *), fail_fn);		\</div><div class='del'>-								\</div><div class='del'>-	asm volatile(LOCK_PREFIX "   incl (%%rdi)\n"		\</div><div class='del'>-		     "   jg 1f\n"				\</div><div class='del'>-		     "   call " #fail_fn "\n"			\</div><div class='del'>-		     "1:"					\</div><div class='del'>-		     : "=D" (dummy)				\</div><div class='del'>-		     : "D" (v)					\</div><div class='del'>-		     : "rax", "rsi", "rdx", "rcx",		\</div><div class='del'>-		       "r8", "r9", "r10", "r11", "memory");	\</div><div class='del'>-} while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define __mutex_slowpath_needs_to_unlock()	1</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __mutex_fastpath_trylock - try to acquire the mutex, without waiting</div><div class='del'>- *</div><div class='del'>- *  @count: pointer of type atomic_t</div><div class='del'>- *  @fail_fn: fallback function</div><div class='del'>- *</div><div class='del'>- * Change the count from 1 to 0 and return 1 (success), or return 0 (failure)</div><div class='del'>- * if it wasn't 1 originally. [the fallback function is never used on</div><div class='del'>- * x86_64, because all x86_64 CPUs have a CMPXCHG instruction.]</div><div class='del'>- */</div><div class='del'>-static inline int __mutex_fastpath_trylock(atomic_t *count,</div><div class='del'>-					   int (*fail_fn)(atomic_t *))</div><div class='del'>-{</div><div class='del'>-	if (likely(atomic_read(count) == 1 &amp;&amp; atomic_cmpxchg(count, 1, 0) == 1))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_X86_MUTEX_64_H */</div><div class='head'>diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h<br/>index f37f2d8a2989..bda3c27f0da0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/mwait.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/mwait.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/mwait.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/mwait.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #define _ASM_X86_MWAIT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/idle.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h<br/>index ce932812f142..0489884fdc44 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/paravirt.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/paravirt.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/paravirt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/paravirt.h</a></div><div class='hunk'>@@ -41,11 +41,6 @@ static inline void set_debugreg(unsigned long val, int reg)</div><div class='ctx'> 	PVOP_VCALL2(pv_cpu_ops.set_debugreg, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void clts(void)</div><div class='del'>-{</div><div class='del'>-	PVOP_VCALL0(pv_cpu_ops.clts);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned long read_cr0(void)</div><div class='ctx'> {</div><div class='ctx'> 	return PVOP_CALL0(unsigned long, pv_cpu_ops.read_cr0);</div><div class='hunk'>@@ -480,6 +475,17 @@ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 			    native_pmd_val(pmd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void set_pud_at(struct mm_struct *mm, unsigned long addr,</div><div class='add'>+			      pud_t *pudp, pud_t pud)</div><div class='add'>+{</div><div class='add'>+	if (sizeof(pudval_t) &gt; sizeof(long))</div><div class='add'>+		/* 5 arg words */</div><div class='add'>+		pv_mmu_ops.set_pud_at(mm, addr, pudp, pud);</div><div class='add'>+	else</div><div class='add'>+		PVOP_VCALL4(pv_mmu_ops.set_pud_at, mm, addr, pudp,</div><div class='add'>+			    native_pud_val(pud));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void set_pmd(pmd_t *pmdp, pmd_t pmd)</div><div class='ctx'> {</div><div class='ctx'> 	pmdval_t val = native_pmd_val(pmd);</div><div class='hunk'>@@ -678,6 +684,11 @@ static __always_inline void pv_kick(int cpu)</div><div class='ctx'> 	PVOP_VCALL1(pv_lock_ops.kick, cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __always_inline bool pv_vcpu_is_preempted(long cpu)</div><div class='add'>+{</div><div class='add'>+	return PVOP_CALLEE1(bool, pv_lock_ops.vcpu_is_preempted, cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* SMP &amp;&amp; PARAVIRT_SPINLOCKS */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='head'>diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h<br/>index 0f400c0e4979..b060f962d581 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/paravirt_types.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/paravirt_types.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/paravirt_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/paravirt_types.h</a></div><div class='hunk'>@@ -103,8 +103,6 @@ struct pv_cpu_ops {</div><div class='ctx'> 	unsigned long (*get_debugreg)(int regno);</div><div class='ctx'> 	void (*set_debugreg)(int regno, unsigned long value);</div><div class='ctx'> </div><div class='del'>-	void (*clts)(void);</div><div class='del'>-</div><div class='ctx'> 	unsigned long (*read_cr0)(void);</div><div class='ctx'> 	void (*write_cr0)(unsigned long);</div><div class='ctx'> </div><div class='hunk'>@@ -251,6 +249,8 @@ struct pv_mmu_ops {</div><div class='ctx'> 	void (*set_pmd)(pmd_t *pmdp, pmd_t pmdval);</div><div class='ctx'> 	void (*set_pmd_at)(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 			   pmd_t *pmdp, pmd_t pmdval);</div><div class='add'>+	void (*set_pud_at)(struct mm_struct *mm, unsigned long addr,</div><div class='add'>+			   pud_t *pudp, pud_t pudval);</div><div class='ctx'> 	void (*pte_update)(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 			   pte_t *ptep);</div><div class='ctx'> </div><div class='hunk'>@@ -310,6 +310,8 @@ struct pv_lock_ops {</div><div class='ctx'> </div><div class='ctx'> 	void (*wait)(u8 *ptr, u8 val);</div><div class='ctx'> 	void (*kick)(int cpu);</div><div class='add'>+</div><div class='add'>+	struct paravirt_callee_save vcpu_is_preempted;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This contains all the paravirt structures: we get a convenient</div><div class='hunk'>@@ -508,6 +510,18 @@ int paravirt_disable_iospace(void);</div><div class='ctx'> #define PVOP_TEST_NULL(op)	((void)op)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define PVOP_RETMASK(rettype)						\</div><div class='add'>+	({	unsigned long __mask = ~0UL;				\</div><div class='add'>+		switch (sizeof(rettype)) {				\</div><div class='add'>+		case 1: __mask =       0xffUL; break;			\</div><div class='add'>+		case 2: __mask =     0xffffUL; break;			\</div><div class='add'>+		case 4: __mask = 0xffffffffUL; break;			\</div><div class='add'>+		default: break;						\</div><div class='add'>+		}							\</div><div class='add'>+		__mask;							\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define ____PVOP_CALL(rettype, op, clbr, call_clbr, extra_clbr,		\</div><div class='ctx'> 		      pre, post, ...)					\</div><div class='ctx'> 	({								\</div><div class='hunk'>@@ -535,7 +549,7 @@ int paravirt_disable_iospace(void);</div><div class='ctx'> 				       paravirt_clobber(clbr),		\</div><div class='ctx'> 				       ##__VA_ARGS__			\</div><div class='ctx'> 				     : "memory", "cc" extra_clbr);	\</div><div class='del'>-			__ret = (rettype)__eax;				\</div><div class='add'>+			__ret = (rettype)(__eax &amp; PVOP_RETMASK(rettype));	\</div><div class='ctx'> 		}							\</div><div class='ctx'> 		__ret;							\</div><div class='ctx'> 	})</div><div class='head'>diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h<br/>index 84f58de08c2b..9fa03604b2b3 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/percpu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/percpu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/percpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/percpu.h</a></div><div class='hunk'>@@ -507,17 +507,6 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* This is not atomic against other CPUs -- CPU preemption needs to be off */</div><div class='del'>-#define x86_test_and_clear_bit_percpu(bit, var)				\</div><div class='del'>-({									\</div><div class='del'>-	bool old__;							\</div><div class='del'>-	asm volatile("btr %2,"__percpu_arg(1)"\n\t"			\</div><div class='del'>-		     CC_SET(c)						\</div><div class='del'>-		     : CC_OUT(c) (old__), "+m" (var)			\</div><div class='del'>-		     : "dIr" (bit));					\</div><div class='del'>-	old__;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='ctx'> static __always_inline bool x86_this_cpu_constant_test_bit(unsigned int nr,</div><div class='ctx'>                         const unsigned long __percpu *addr)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h<br/>index fd74a11959de..a8b96e708c2b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/pgtable-2level.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/pgtable-2level.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/pgtable-2level.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pgtable-2level.h</a></div><div class='hunk'>@@ -21,6 +21,10 @@ static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)</div><div class='ctx'> 	*pmdp = pmd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void native_set_pud(pud_t *pudp, pud_t pud)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	native_set_pte(ptep, pte);</div><div class='hunk'>@@ -31,6 +35,10 @@ static inline void native_pmd_clear(pmd_t *pmdp)</div><div class='ctx'> 	native_set_pmd(pmdp, __pmd(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void native_pud_clear(pud_t *pudp)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void native_pte_clear(struct mm_struct *mm,</div><div class='ctx'> 				    unsigned long addr, pte_t *xp)</div><div class='ctx'> {</div><div class='hunk'>@@ -55,6 +63,15 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)</div><div class='ctx'> #define native_pmdp_get_and_clear(xp) native_local_pmdp_get_and_clear(xp)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+static inline pud_t native_pudp_get_and_clear(pud_t *xp)</div><div class='add'>+{</div><div class='add'>+	return __pud(xchg((pudval_t *)xp, 0));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define native_pudp_get_and_clear(xp) native_local_pudp_get_and_clear(xp)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Bit manipulation helper on pte/pgoff entry */</div><div class='ctx'> static inline unsigned long pte_bitop(unsigned long value, unsigned int rightshift,</div><div class='ctx'> 				      unsigned long mask, unsigned int leftshift)</div><div class='head'>diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h<br/>index cdaa58c9b39e..72277b1028a5 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/pgtable-3level.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/pgtable-3level.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/pgtable-3level.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pgtable-3level.h</a></div><div class='hunk'>@@ -121,6 +121,13 @@ static inline void native_pmd_clear(pmd_t *pmd)</div><div class='ctx'> 	*(tmp + 1) = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if !defined(CONFIG_SMP) || (defined(CONFIG_HIGHMEM64G) &amp;&amp; \</div><div class='add'>+		defined(CONFIG_PARAVIRT))</div><div class='add'>+static inline void native_pud_clear(pud_t *pudp)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline void pud_clear(pud_t *pudp)</div><div class='ctx'> {</div><div class='ctx'> 	set_pud(pudp, __pud(0));</div><div class='hunk'>@@ -176,6 +183,30 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *pmdp)</div><div class='ctx'> #define native_pmdp_get_and_clear(xp) native_local_pmdp_get_and_clear(xp)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+union split_pud {</div><div class='add'>+	struct {</div><div class='add'>+		u32 pud_low;</div><div class='add'>+		u32 pud_high;</div><div class='add'>+	};</div><div class='add'>+	pud_t pud;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline pud_t native_pudp_get_and_clear(pud_t *pudp)</div><div class='add'>+{</div><div class='add'>+	union split_pud res, *orig = (union split_pud *)pudp;</div><div class='add'>+</div><div class='add'>+	/* xchg acts as a barrier before setting of the high bits */</div><div class='add'>+	res.pud_low = xchg(&amp;orig-&gt;pud_low, 0);</div><div class='add'>+	res.pud_high = orig-&gt;pud_high;</div><div class='add'>+	orig-&gt;pud_high = 0;</div><div class='add'>+</div><div class='add'>+	return res.pud;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define native_pudp_get_and_clear(xp) native_local_pudp_get_and_clear(xp)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Encode and de-code a swap entry */</div><div class='ctx'> #define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT &gt; 5)</div><div class='ctx'> #define __swp_type(x)			(((x).val) &amp; 0x1f)</div><div class='head'>diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h<br/>index 437feb436efa..1cfb36b8c024 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/pgtable.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/pgtable.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/pgtable.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pgtable.h</a></div><div class='hunk'>@@ -46,6 +46,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);</div><div class='ctx'> #define set_pte(ptep, pte)		native_set_pte(ptep, pte)</div><div class='ctx'> #define set_pte_at(mm, addr, ptep, pte)	native_set_pte_at(mm, addr, ptep, pte)</div><div class='ctx'> #define set_pmd_at(mm, addr, pmdp, pmd)	native_set_pmd_at(mm, addr, pmdp, pmd)</div><div class='add'>+#define set_pud_at(mm, addr, pudp, pud)	native_set_pud_at(mm, addr, pudp, pud)</div><div class='ctx'> </div><div class='ctx'> #define set_pte_atomic(ptep, pte)					\</div><div class='ctx'> 	native_set_pte_atomic(ptep, pte)</div><div class='hunk'>@@ -128,6 +129,16 @@ static inline int pmd_young(pmd_t pmd)</div><div class='ctx'> 	return pmd_flags(pmd) &amp; _PAGE_ACCESSED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int pud_dirty(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_flags(pud) &amp; _PAGE_DIRTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pud_young(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_flags(pud) &amp; _PAGE_ACCESSED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int pte_write(pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	return pte_flags(pte) &amp; _PAGE_RW;</div><div class='hunk'>@@ -181,6 +192,13 @@ static inline int pmd_trans_huge(pmd_t pmd)</div><div class='ctx'> 	return (pmd_val(pmd) &amp; (_PAGE_PSE|_PAGE_DEVMAP)) == _PAGE_PSE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD</div><div class='add'>+static inline int pud_trans_huge(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return (pud_val(pud) &amp; (_PAGE_PSE|_PAGE_DEVMAP)) == _PAGE_PSE;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define has_transparent_hugepage has_transparent_hugepage</div><div class='ctx'> static inline int has_transparent_hugepage(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -192,6 +210,18 @@ static inline int pmd_devmap(pmd_t pmd)</div><div class='ctx'> {</div><div class='ctx'> 	return !!(pmd_val(pmd) &amp; _PAGE_DEVMAP);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD</div><div class='add'>+static inline int pud_devmap(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return !!(pud_val(pud) &amp; _PAGE_DEVMAP);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int pud_devmap(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */</div><div class='ctx'> </div><div class='hunk'>@@ -333,6 +363,65 @@ static inline pmd_t pmd_mknotpresent(pmd_t pmd)</div><div class='ctx'> 	return pmd_clear_flags(pmd, _PAGE_PRESENT | _PAGE_PROTNONE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline pud_t pud_set_flags(pud_t pud, pudval_t set)</div><div class='add'>+{</div><div class='add'>+	pudval_t v = native_pud_val(pud);</div><div class='add'>+</div><div class='add'>+	return __pud(v | set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pud_t pud_clear_flags(pud_t pud, pudval_t clear)</div><div class='add'>+{</div><div class='add'>+	pudval_t v = native_pud_val(pud);</div><div class='add'>+</div><div class='add'>+	return __pud(v &amp; ~clear);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pud_t pud_mkold(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_clear_flags(pud, _PAGE_ACCESSED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pud_t pud_mkclean(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_clear_flags(pud, _PAGE_DIRTY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pud_t pud_wrprotect(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_clear_flags(pud, _PAGE_RW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pud_t pud_mkdirty(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_set_flags(pud, _PAGE_DIRTY | _PAGE_SOFT_DIRTY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pud_t pud_mkdevmap(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_set_flags(pud, _PAGE_DEVMAP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pud_t pud_mkhuge(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_set_flags(pud, _PAGE_PSE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pud_t pud_mkyoung(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_set_flags(pud, _PAGE_ACCESSED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pud_t pud_mkwrite(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_set_flags(pud, _PAGE_RW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pud_t pud_mknotpresent(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_clear_flags(pud, _PAGE_PRESENT | _PAGE_PROTNONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY</div><div class='ctx'> static inline int pte_soft_dirty(pte_t pte)</div><div class='ctx'> {</div><div class='hunk'>@@ -344,6 +433,11 @@ static inline int pmd_soft_dirty(pmd_t pmd)</div><div class='ctx'> 	return pmd_flags(pmd) &amp; _PAGE_SOFT_DIRTY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int pud_soft_dirty(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_flags(pud) &amp; _PAGE_SOFT_DIRTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline pte_t pte_mksoft_dirty(pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	return pte_set_flags(pte, _PAGE_SOFT_DIRTY);</div><div class='hunk'>@@ -354,6 +448,11 @@ static inline pmd_t pmd_mksoft_dirty(pmd_t pmd)</div><div class='ctx'> 	return pmd_set_flags(pmd, _PAGE_SOFT_DIRTY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline pud_t pud_mksoft_dirty(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_set_flags(pud, _PAGE_SOFT_DIRTY);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline pte_t pte_clear_soft_dirty(pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	return pte_clear_flags(pte, _PAGE_SOFT_DIRTY);</div><div class='hunk'>@@ -364,6 +463,11 @@ static inline pmd_t pmd_clear_soft_dirty(pmd_t pmd)</div><div class='ctx'> 	return pmd_clear_flags(pmd, _PAGE_SOFT_DIRTY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline pud_t pud_clear_soft_dirty(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud_clear_flags(pud, _PAGE_SOFT_DIRTY);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_HAVE_ARCH_SOFT_DIRTY */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -392,6 +496,12 @@ static inline pmd_t pfn_pmd(unsigned long page_nr, pgprot_t pgprot)</div><div class='ctx'> 		     massage_pgprot(pgprot));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline pud_t pfn_pud(unsigned long page_nr, pgprot_t pgprot)</div><div class='add'>+{</div><div class='add'>+	return __pud(((phys_addr_t)page_nr &lt;&lt; PAGE_SHIFT) |</div><div class='add'>+		     massage_pgprot(pgprot));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)</div><div class='ctx'> {</div><div class='ctx'> 	pteval_t val = pte_val(pte);</div><div class='hunk'>@@ -771,6 +881,14 @@ static inline pmd_t native_local_pmdp_get_and_clear(pmd_t *pmdp)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline pud_t native_local_pudp_get_and_clear(pud_t *pudp)</div><div class='add'>+{</div><div class='add'>+	pud_t res = *pudp;</div><div class='add'>+</div><div class='add'>+	native_pud_clear(pudp);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void native_set_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 				     pte_t *ptep , pte_t pte)</div><div class='ctx'> {</div><div class='hunk'>@@ -783,6 +901,12 @@ static inline void native_set_pmd_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 	native_set_pmd(pmdp, pmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void native_set_pud_at(struct mm_struct *mm, unsigned long addr,</div><div class='add'>+				     pud_t *pudp, pud_t pud)</div><div class='add'>+{</div><div class='add'>+	native_set_pud(pudp, pud);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_PARAVIRT</div><div class='ctx'> /*</div><div class='ctx'>  * Rules for using pte_update - it must be called after any PTE update which</div><div class='hunk'>@@ -861,10 +985,15 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm,</div><div class='ctx'> extern int pmdp_set_access_flags(struct vm_area_struct *vma,</div><div class='ctx'> 				 unsigned long address, pmd_t *pmdp,</div><div class='ctx'> 				 pmd_t entry, int dirty);</div><div class='add'>+extern int pudp_set_access_flags(struct vm_area_struct *vma,</div><div class='add'>+				 unsigned long address, pud_t *pudp,</div><div class='add'>+				 pud_t entry, int dirty);</div><div class='ctx'> </div><div class='ctx'> #define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG</div><div class='ctx'> extern int pmdp_test_and_clear_young(struct vm_area_struct *vma,</div><div class='ctx'> 				     unsigned long addr, pmd_t *pmdp);</div><div class='add'>+extern int pudp_test_and_clear_young(struct vm_area_struct *vma,</div><div class='add'>+				     unsigned long addr, pud_t *pudp);</div><div class='ctx'> </div><div class='ctx'> #define __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH</div><div class='ctx'> extern int pmdp_clear_flush_young(struct vm_area_struct *vma,</div><div class='hunk'>@@ -884,6 +1013,13 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, unsigned long</div><div class='ctx'> 	return native_pmdp_get_and_clear(pmdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define __HAVE_ARCH_PUDP_HUGE_GET_AND_CLEAR</div><div class='add'>+static inline pud_t pudp_huge_get_and_clear(struct mm_struct *mm,</div><div class='add'>+					unsigned long addr, pud_t *pudp)</div><div class='add'>+{</div><div class='add'>+	return native_pudp_get_and_clear(pudp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define __HAVE_ARCH_PMDP_SET_WRPROTECT</div><div class='ctx'> static inline void pmdp_set_wrprotect(struct mm_struct *mm,</div><div class='ctx'> 				      unsigned long addr, pmd_t *pmdp)</div><div class='hunk'>@@ -932,6 +1068,10 @@ static inline void update_mmu_cache_pmd(struct vm_area_struct *vma,</div><div class='ctx'> 		unsigned long addr, pmd_t *pmd)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+static inline void update_mmu_cache_pud(struct vm_area_struct *vma,</div><div class='add'>+		unsigned long addr, pud_t *pud)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY</div><div class='ctx'> static inline pte_t pte_swp_mksoft_dirty(pte_t pte)</div><div class='head'>diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h<br/>index b6c0b404898a..fbc73360aea0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/pgtable_32.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/pgtable_32.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/pgtable_32.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pgtable_32.h</a></div><div class='hunk'>@@ -27,6 +27,7 @@ struct vm_area_struct;</div><div class='ctx'> </div><div class='ctx'> extern pgd_t swapper_pg_dir[1024];</div><div class='ctx'> extern pgd_t initial_page_table[1024];</div><div class='add'>+extern pmd_t initial_pg_pmd[];</div><div class='ctx'> </div><div class='ctx'> static inline void pgtable_cache_init(void) { }</div><div class='ctx'> static inline void check_pgt_cache(void) { }</div><div class='hunk'>@@ -75,4 +76,35 @@ do {						\</div><div class='ctx'> #define kern_addr_valid(kaddr)	(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This is how much memory in addition to the memory covered up to</div><div class='add'>+ * and including _end we need mapped initially.</div><div class='add'>+ * We need:</div><div class='add'>+ *     (KERNEL_IMAGE_SIZE/4096) / 1024 pages (worst case, non PAE)</div><div class='add'>+ *     (KERNEL_IMAGE_SIZE/4096) / 512 + 4 pages (worst case for PAE)</div><div class='add'>+ *</div><div class='add'>+ * Modulo rounding, each megabyte assigned here requires a kilobyte of</div><div class='add'>+ * memory, which is currently unreclaimed.</div><div class='add'>+ *</div><div class='add'>+ * This should be a multiple of a page.</div><div class='add'>+ *</div><div class='add'>+ * KERNEL_IMAGE_SIZE should be greater than pa(_end)</div><div class='add'>+ * and small than max_low_pfn, otherwise will waste some page table entries</div><div class='add'>+ */</div><div class='add'>+#if PTRS_PER_PMD &gt; 1</div><div class='add'>+#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)</div><div class='add'>+#else</div><div class='add'>+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Number of possible pages in the lowmem region.</div><div class='add'>+ *</div><div class='add'>+ * We shift 2 by 31 instead of 1 by 32 to the left in order to avoid a</div><div class='add'>+ * gas warning about overflowing shift count when gas has been compiled</div><div class='add'>+ * with only a host target support using a 32-bit type for internal</div><div class='add'>+ * representation.</div><div class='add'>+ */</div><div class='add'>+#define LOWMEM_PAGES ((((2&lt;&lt;31) - __PAGE_OFFSET) &gt;&gt; PAGE_SHIFT))</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_X86_PGTABLE_32_H */</div><div class='head'>diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h<br/>index 1cc82ece9ac1..73c7ccc38912 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/pgtable_64.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/pgtable_64.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/pgtable_64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pgtable_64.h</a></div><div class='hunk'>@@ -106,6 +106,21 @@ static inline void native_pud_clear(pud_t *pud)</div><div class='ctx'> 	native_set_pud(pud, native_make_pud(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline pud_t native_pudp_get_and_clear(pud_t *xp)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	return native_make_pud(xchg(&amp;xp-&gt;pud, 0));</div><div class='add'>+#else</div><div class='add'>+	/* native_local_pudp_get_and_clear,</div><div class='add'>+	 * but duplicated because of cyclic dependency</div><div class='add'>+	 */</div><div class='add'>+	pud_t ret = *xp;</div><div class='add'>+</div><div class='add'>+	native_pud_clear(xp);</div><div class='add'>+	return ret;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)</div><div class='ctx'> {</div><div class='ctx'> 	*pgdp = pgd;</div><div class='hunk'>@@ -116,8 +131,7 @@ static inline void native_pgd_clear(pgd_t *pgd)</div><div class='ctx'> 	native_set_pgd(pgd, native_make_pgd(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void sync_global_pgds(unsigned long start, unsigned long end,</div><div class='del'>-			     int removed);</div><div class='add'>+extern void sync_global_pgds(unsigned long start, unsigned long end);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Conversion functions: convert a page and protection to a page entry,</div><div class='head'>diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h<br/>index 17f218645701..ec1f3c651150 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/preempt.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/preempt.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/preempt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/preempt.h</a></div><div class='hunk'>@@ -24,7 +24,13 @@ static __always_inline int preempt_count(void)</div><div class='ctx'> </div><div class='ctx'> static __always_inline void preempt_count_set(int pc)</div><div class='ctx'> {</div><div class='del'>-	raw_cpu_write_4(__preempt_count, pc);</div><div class='add'>+	int old, new;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		old = raw_cpu_read_4(__preempt_count);</div><div class='add'>+		new = (old &amp; PREEMPT_NEED_RESCHED) |</div><div class='add'>+			(pc &amp; ~PREEMPT_NEED_RESCHED);</div><div class='add'>+	} while (raw_cpu_cmpxchg_4(__preempt_count, old, new) != old);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h<br/>index 984a7bf17f6a..f385eca5407a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/processor.h</a></div><div class='hunk'>@@ -104,6 +104,7 @@ struct cpuinfo_x86 {</div><div class='ctx'> 	__u8			x86_phys_bits;</div><div class='ctx'> 	/* CPUID returned core id bits: */</div><div class='ctx'> 	__u8			x86_coreid_bits;</div><div class='add'>+	__u8			cu_id;</div><div class='ctx'> 	/* Max extended CPUID function supported: */</div><div class='ctx'> 	__u32			extended_cpuid_level;</div><div class='ctx'> 	/* Maximum supported CPUID level, -1=no CPUID: */</div><div class='hunk'>@@ -137,6 +138,17 @@ struct cpuinfo_x86 {</div><div class='ctx'> 	u32			microcode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct cpuid_regs {</div><div class='add'>+	u32 eax, ebx, ecx, edx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum cpuid_regs_idx {</div><div class='add'>+	CPUID_EAX = 0,</div><div class='add'>+	CPUID_EBX,</div><div class='add'>+	CPUID_ECX,</div><div class='add'>+	CPUID_EDX,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define X86_VENDOR_INTEL	0</div><div class='ctx'> #define X86_VENDOR_CYRIX	1</div><div class='ctx'> #define X86_VENDOR_AMD		2</div><div class='hunk'>@@ -178,6 +190,9 @@ extern void identify_secondary_cpu(struct cpuinfo_x86 *);</div><div class='ctx'> extern void print_cpu_info(struct cpuinfo_x86 *);</div><div class='ctx'> void print_cpu_msr(struct cpuinfo_x86 *);</div><div class='ctx'> extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c);</div><div class='add'>+extern u32 get_scattered_cpuid_leaf(unsigned int level,</div><div class='add'>+				    unsigned int sub_leaf,</div><div class='add'>+				    enum cpuid_regs_idx reg);</div><div class='ctx'> extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);</div><div class='ctx'> extern void init_amd_cacheinfo(struct cpuinfo_x86 *c);</div><div class='ctx'> </div><div class='hunk'>@@ -205,6 +220,24 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,</div><div class='ctx'> 	    : "memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define native_cpuid_reg(reg)					\</div><div class='add'>+static inline unsigned int native_cpuid_##reg(unsigned int op)	\</div><div class='add'>+{								\</div><div class='add'>+	unsigned int eax = op, ebx, ecx = 0, edx;		\</div><div class='add'>+								\</div><div class='add'>+	native_cpuid(&amp;eax, &amp;ebx, &amp;ecx, &amp;edx);			\</div><div class='add'>+								\</div><div class='add'>+	return reg;						\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Native CPUID functions returning a single datum.</div><div class='add'>+ */</div><div class='add'>+native_cpuid_reg(eax)</div><div class='add'>+native_cpuid_reg(ebx)</div><div class='add'>+native_cpuid_reg(ecx)</div><div class='add'>+native_cpuid_reg(edx)</div><div class='add'>+</div><div class='ctx'> static inline void load_cr3(pgd_t *pgdir)</div><div class='ctx'> {</div><div class='ctx'> 	write_cr3(__pa(pgdir));</div><div class='hunk'>@@ -271,7 +304,7 @@ struct x86_hw_tss {</div><div class='ctx'> 	u16			reserved5;</div><div class='ctx'> 	u16			io_bitmap_base;</div><div class='ctx'> </div><div class='del'>-} __attribute__((packed)) ____cacheline_aligned;</div><div class='add'>+} __attribute__((packed));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -309,6 +342,16 @@ struct tss_struct {</div><div class='ctx'> </div><div class='ctx'> DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * sizeof(unsigned long) coming from an extra "long" at the end</div><div class='add'>+ * of the iobitmap.</div><div class='add'>+ *</div><div class='add'>+ * -1? seg base+limit should be pointing to the address of the</div><div class='add'>+ * last valid byte</div><div class='add'>+ */</div><div class='add'>+#define __KERNEL_TSS_LIMIT	\</div><div class='add'>+	(IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> DECLARE_PER_CPU(unsigned long, cpu_current_top_of_stack);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -588,43 +631,76 @@ static __always_inline void cpu_relax(void)</div><div class='ctx'> 	rep_nop();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='del'>-</div><div class='del'>-/* Stop speculative execution and prefetching of modified code. */</div><div class='add'>+/*</div><div class='add'>+ * This function forces the icache and prefetched instruction stream to</div><div class='add'>+ * catch up with reality in two very specific cases:</div><div class='add'>+ *</div><div class='add'>+ *  a) Text was modified using one virtual address and is about to be executed</div><div class='add'>+ *     from the same physical page at a different virtual address.</div><div class='add'>+ *</div><div class='add'>+ *  b) Text was modified on a different CPU, may subsequently be</div><div class='add'>+ *     executed on this CPU, and you want to make sure the new version</div><div class='add'>+ *     gets executed.  This generally means you're calling this in a IPI.</div><div class='add'>+ *</div><div class='add'>+ * If you're calling this for a different reason, you're probably doing</div><div class='add'>+ * it wrong.</div><div class='add'>+ */</div><div class='ctx'> static inline void sync_core(void)</div><div class='ctx'> {</div><div class='del'>-	int tmp;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_M486</div><div class='ctx'> 	/*</div><div class='del'>-	 * Do a CPUID if available, otherwise do a jump.  The jump</div><div class='del'>-	 * can conveniently enough be the jump around CPUID.</div><div class='add'>+	 * There are quite a few ways to do this.  IRET-to-self is nice</div><div class='add'>+	 * because it works on every CPU, at any CPL (so it's compatible</div><div class='add'>+	 * with paravirtualization), and it never exits to a hypervisor.</div><div class='add'>+	 * The only down sides are that it's a bit slow (it seems to be</div><div class='add'>+	 * a bit more than 2x slower than the fastest options) and that</div><div class='add'>+	 * it unmasks NMIs.  The "push %cs" is needed because, in</div><div class='add'>+	 * paravirtual environments, __KERNEL_CS may not be a valid CS</div><div class='add'>+	 * value when we do IRET directly.</div><div class='add'>+	 *</div><div class='add'>+	 * In case NMI unmasking or performance ever becomes a problem,</div><div class='add'>+	 * the next best option appears to be MOV-to-CR2 and an</div><div class='add'>+	 * unconditional jump.  That sequence also works on all CPUs,</div><div class='add'>+	 * but it will fault at CPL3 (i.e. Xen PV and lguest).</div><div class='add'>+	 *</div><div class='add'>+	 * CPUID is the conventional way, but it's nasty: it doesn't</div><div class='add'>+	 * exist on some 486-like CPUs, and it usually exits to a</div><div class='add'>+	 * hypervisor.</div><div class='add'>+	 *</div><div class='add'>+	 * Like all of Linux's memory ordering operations, this is a</div><div class='add'>+	 * compiler barrier as well.</div><div class='ctx'> 	 */</div><div class='del'>-	asm volatile("cmpl %2,%1\n\t"</div><div class='del'>-		     "jl 1f\n\t"</div><div class='del'>-		     "cpuid\n"</div><div class='del'>-		     "1:"</div><div class='del'>-		     : "=a" (tmp)</div><div class='del'>-		     : "rm" (boot_cpu_data.cpuid_level), "ri" (0), "0" (1)</div><div class='del'>-		     : "ebx", "ecx", "edx", "memory");</div><div class='add'>+	register void *__sp asm(_ASM_SP);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	asm volatile (</div><div class='add'>+		"pushfl\n\t"</div><div class='add'>+		"pushl %%cs\n\t"</div><div class='add'>+		"pushl $1f\n\t"</div><div class='add'>+		"iret\n\t"</div><div class='add'>+		"1:"</div><div class='add'>+		: "+r" (__sp) : : "memory");</div><div class='ctx'> #else</div><div class='del'>-	/*</div><div class='del'>-	 * CPUID is a barrier to speculative execution.</div><div class='del'>-	 * Prefetched instructions are automatically</div><div class='del'>-	 * invalidated when modified.</div><div class='del'>-	 */</div><div class='del'>-	asm volatile("cpuid"</div><div class='del'>-		     : "=a" (tmp)</div><div class='del'>-		     : "0" (1)</div><div class='del'>-		     : "ebx", "ecx", "edx", "memory");</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	asm volatile (</div><div class='add'>+		"mov %%ss, %0\n\t"</div><div class='add'>+		"pushq %q0\n\t"</div><div class='add'>+		"pushq %%rsp\n\t"</div><div class='add'>+		"addq $8, (%%rsp)\n\t"</div><div class='add'>+		"pushfq\n\t"</div><div class='add'>+		"mov %%cs, %0\n\t"</div><div class='add'>+		"pushq %q0\n\t"</div><div class='add'>+		"pushq $1f\n\t"</div><div class='add'>+		"iretq\n\t"</div><div class='add'>+		"1:"</div><div class='add'>+		: "=&amp;r" (tmp), "+r" (__sp) : : "cc", "memory");</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void select_idle_routine(const struct cpuinfo_x86 *c);</div><div class='del'>-extern void init_amd_e400_c1e_mask(void);</div><div class='add'>+extern void amd_e400_c1e_apic_setup(void);</div><div class='ctx'> </div><div class='ctx'> extern unsigned long		boot_option_idle_override;</div><div class='del'>-extern bool			amd_e400_c1e_detected;</div><div class='ctx'> </div><div class='ctx'> enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_NOMWAIT,</div><div class='ctx'> 			 IDLE_POLL};</div><div class='head'>diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h<br/>index 3ad741b84072..448cfe1b48cf 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/pvclock.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/pvclock.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/pvclock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/pvclock.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@ static inline struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* some helper functions for xen and kvm pv clock sources */</div><div class='del'>-cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src);</div><div class='add'>+u64 pvclock_clocksource_read(struct pvclock_vcpu_time_info *src);</div><div class='ctx'> u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src);</div><div class='ctx'> void pvclock_set_flags(u8 flags);</div><div class='ctx'> unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src);</div><div class='hunk'>@@ -87,11 +87,10 @@ static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline</div><div class='del'>-cycle_t __pvclock_read_cycles(const struct pvclock_vcpu_time_info *src,</div><div class='del'>-			      u64 tsc)</div><div class='add'>+u64 __pvclock_read_cycles(const struct pvclock_vcpu_time_info *src, u64 tsc)</div><div class='ctx'> {</div><div class='ctx'> 	u64 delta = tsc - src-&gt;tsc_timestamp;</div><div class='del'>-	cycle_t offset = pvclock_scale_delta(delta, src-&gt;tsc_to_system_mul,</div><div class='add'>+	u64 offset = pvclock_scale_delta(delta, src-&gt;tsc_to_system_mul,</div><div class='ctx'> 					     src-&gt;tsc_shift);</div><div class='ctx'> 	return src-&gt;system_time + offset;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/include/asm/qspinlock.h b/arch/x86/include/asm/qspinlock.h<br/>index eaba08076030..48a706f641f2 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/qspinlock.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/qspinlock.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/qspinlock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/qspinlock.h</a></div><div class='hunk'>@@ -32,6 +32,12 @@ static inline void queued_spin_unlock(struct qspinlock *lock)</div><div class='ctx'> {</div><div class='ctx'> 	pv_queued_spin_unlock(lock);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#define vcpu_is_preempted vcpu_is_preempted</div><div class='add'>+static inline bool vcpu_is_preempted(long cpu)</div><div class='add'>+{</div><div class='add'>+	return pv_vcpu_is_preempted(cpu);</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> static inline void queued_spin_unlock(struct qspinlock *lock)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/include/asm/special_insns.h b/arch/x86/include/asm/special_insns.h<br/>index 19a2224f9e16..12af3e35edfa 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/special_insns.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/special_insns.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/special_insns.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/special_insns.h</a></div><div class='hunk'>@@ -6,11 +6,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/nops.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline void native_clts(void)</div><div class='del'>-{</div><div class='del'>-	asm volatile("clts");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Volatile isn't enough to prevent the compiler from reordering the</div><div class='ctx'>  * read/write functions for the control registers and messing everything up.</div><div class='hunk'>@@ -208,16 +203,8 @@ static inline void load_gs_index(unsigned selector)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Clear the 'TS' bit */</div><div class='del'>-static inline void clts(void)</div><div class='del'>-{</div><div class='del'>-	native_clts();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif/* CONFIG_PARAVIRT */</div><div class='ctx'> </div><div class='del'>-#define stts() write_cr0(read_cr0() | X86_CR0_TS)</div><div class='del'>-</div><div class='ctx'> static inline void clflush(volatile void *__p)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile("clflush %0" : "+m" (*(volatile char __force *)__p));</div><div class='head'>diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h<br/>index 921bea7a2708..6d391909e864 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/spinlock.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/spinlock.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/spinlock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/spinlock.h</a></div><div class='hunk'>@@ -23,9 +23,6 @@</div><div class='ctx'> /* How long a lock should spin before we consider blocking */</div><div class='ctx'> #define SPIN_THRESHOLD	(1 &lt;&lt; 15)</div><div class='ctx'> </div><div class='del'>-extern struct static_key paravirt_ticketlocks_enabled;</div><div class='del'>-static __always_inline bool static_key_false(struct static_key *key);</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/qspinlock.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h<br/>index 37f2e0b377ad..2e41c50ddf47 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/stacktrace.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/stacktrace.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/stacktrace.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/stacktrace.h</a></div><div class='hunk'>@@ -30,8 +30,7 @@ bool in_task_stack(unsigned long *stack, struct task_struct *task,</div><div class='ctx'> int get_stack_info(unsigned long *stack, struct task_struct *task,</div><div class='ctx'> 		   struct stack_info *info, unsigned long *visit_mask);</div><div class='ctx'> </div><div class='del'>-void stack_type_str(enum stack_type type, const char **begin,</div><div class='del'>-		    const char **end);</div><div class='add'>+const char *stack_type_name(enum stack_type type);</div><div class='ctx'> </div><div class='ctx'> static inline bool on_stack(struct stack_info *info, void *addr, size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -43,8 +42,6 @@ static inline bool on_stack(struct stack_info *info, void *addr, size_t len)</div><div class='ctx'> 		addr + len &gt; begin &amp;&amp; addr + len &lt;= end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int kstack_depth_to_print;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> #define STACKSLOTS_PER_LINE 8</div><div class='ctx'> #else</div><div class='hunk'>@@ -61,7 +58,7 @@ get_frame_pointer(struct task_struct *task, struct pt_regs *regs)</div><div class='ctx'> 	if (task == current)</div><div class='ctx'> 		return __builtin_frame_address(0);</div><div class='ctx'> </div><div class='del'>-	return (unsigned long *)((struct inactive_task_frame *)task-&gt;thread.sp)-&gt;bp;</div><div class='add'>+	return &amp;((struct inactive_task_frame *)task-&gt;thread.sp)-&gt;bp;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline unsigned long *</div><div class='hunk'>@@ -86,9 +83,6 @@ get_stack_pointer(struct task_struct *task, struct pt_regs *regs)</div><div class='ctx'> void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'> 			unsigned long *stack, char *log_lvl);</div><div class='ctx'> </div><div class='del'>-void show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-			unsigned long *sp, char *log_lvl);</div><div class='del'>-</div><div class='ctx'> extern unsigned int code_bytes;</div><div class='ctx'> </div><div class='ctx'> /* The form of the top of the frame on the stack */</div><div class='head'>diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h<br/>index 5cb436acd463..fcc5cd387fd1 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/switch_to.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/switch_to.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/switch_to.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/switch_to.h</a></div><div class='hunk'>@@ -36,7 +36,10 @@ static inline void prepare_switch_to(struct task_struct *prev,</div><div class='ctx'> </div><div class='ctx'> asmlinkage void ret_from_fork(void);</div><div class='ctx'> </div><div class='del'>-/* data that is pointed to by thread.sp */</div><div class='add'>+/*</div><div class='add'>+ * This is the structure pointed to by thread.sp for an inactive task.  The</div><div class='add'>+ * order of the fields must match the code in __switch_to_asm().</div><div class='add'>+ */</div><div class='ctx'> struct inactive_task_frame {</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	unsigned long r15;</div><div class='hunk'>@@ -48,6 +51,11 @@ struct inactive_task_frame {</div><div class='ctx'> 	unsigned long di;</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned long bx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * These two fields must be together.  They form a stack frame header,</div><div class='add'>+	 * needed by get_frame_pointer().</div><div class='add'>+	 */</div><div class='ctx'> 	unsigned long bp;</div><div class='ctx'> 	unsigned long ret_addr;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h<br/>index cf75871d2f81..6358a85e2270 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/topology.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/topology.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/topology.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/topology.h</a></div><div class='hunk'>@@ -146,4 +146,36 @@ struct pci_bus;</div><div class='ctx'> int x86_pci_root_bus_node(int bus);</div><div class='ctx'> void x86_pci_root_bus_resources(int bus, struct list_head *resources);</div><div class='ctx'> </div><div class='add'>+extern bool x86_topology_update;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SCHED_MC_PRIO</div><div class='add'>+#include &lt;asm/percpu.h&gt;</div><div class='add'>+</div><div class='add'>+DECLARE_PER_CPU_READ_MOSTLY(int, sched_core_priority);</div><div class='add'>+extern unsigned int __read_mostly sysctl_sched_itmt_enabled;</div><div class='add'>+</div><div class='add'>+/* Interface to set priority of a cpu */</div><div class='add'>+void sched_set_itmt_core_prio(int prio, int core_cpu);</div><div class='add'>+</div><div class='add'>+/* Interface to notify scheduler that system supports ITMT */</div><div class='add'>+int sched_set_itmt_support(void);</div><div class='add'>+</div><div class='add'>+/* Interface to notify scheduler that system revokes ITMT support */</div><div class='add'>+void sched_clear_itmt_support(void);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_SCHED_MC_PRIO */</div><div class='add'>+</div><div class='add'>+#define sysctl_sched_itmt_enabled	0</div><div class='add'>+static inline void sched_set_itmt_core_prio(int prio, int core_cpu)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline int sched_set_itmt_support(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline void sched_clear_itmt_support(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_SCHED_MC_PRIO */</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_X86_TOPOLOGY_H */</div><div class='head'>diff --git a/arch/x86/include/asm/trace/exceptions.h b/arch/x86/include/asm/trace/exceptions.h<br/>index 2fbc66c7885b..2422b14c50a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/trace/exceptions.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/trace/exceptions.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/trace/exceptions.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/trace/exceptions.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/tracepoint.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void trace_irq_vector_regfunc(void);</div><div class='add'>+extern int trace_irq_vector_regfunc(void);</div><div class='ctx'> extern void trace_irq_vector_unregfunc(void);</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(x86_exceptions,</div><div class='head'>diff --git a/arch/x86/include/asm/trace/fpu.h b/arch/x86/include/asm/trace/fpu.h<br/>index 9217ab1f5bf6..342e59789fcd 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/trace/fpu.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/trace/fpu.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/trace/fpu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/trace/fpu.h</a></div><div class='hunk'>@@ -14,7 +14,6 @@ DECLARE_EVENT_CLASS(x86_fpu,</div><div class='ctx'> 		__field(struct fpu *, fpu)</div><div class='ctx'> 		__field(bool, fpregs_active)</div><div class='ctx'> 		__field(bool, fpstate_active)</div><div class='del'>-		__field(int, counter)</div><div class='ctx'> 		__field(u64, xfeatures)</div><div class='ctx'> 		__field(u64, xcomp_bv)</div><div class='ctx'> 		),</div><div class='hunk'>@@ -23,17 +22,15 @@ DECLARE_EVENT_CLASS(x86_fpu,</div><div class='ctx'> 		__entry-&gt;fpu		= fpu;</div><div class='ctx'> 		__entry-&gt;fpregs_active	= fpu-&gt;fpregs_active;</div><div class='ctx'> 		__entry-&gt;fpstate_active	= fpu-&gt;fpstate_active;</div><div class='del'>-		__entry-&gt;counter	= fpu-&gt;counter;</div><div class='ctx'> 		if (boot_cpu_has(X86_FEATURE_OSXSAVE)) {</div><div class='ctx'> 			__entry-&gt;xfeatures = fpu-&gt;state.xsave.header.xfeatures;</div><div class='ctx'> 			__entry-&gt;xcomp_bv  = fpu-&gt;state.xsave.header.xcomp_bv;</div><div class='ctx'> 		}</div><div class='ctx'> 	),</div><div class='del'>-	TP_printk("x86/fpu: %p fpregs_active: %d fpstate_active: %d counter: %d xfeatures: %llx xcomp_bv: %llx",</div><div class='add'>+	TP_printk("x86/fpu: %p fpregs_active: %d fpstate_active: %d xfeatures: %llx xcomp_bv: %llx",</div><div class='ctx'> 			__entry-&gt;fpu,</div><div class='ctx'> 			__entry-&gt;fpregs_active,</div><div class='ctx'> 			__entry-&gt;fpstate_active,</div><div class='del'>-			__entry-&gt;counter,</div><div class='ctx'> 			__entry-&gt;xfeatures,</div><div class='ctx'> 			__entry-&gt;xcomp_bv</div><div class='ctx'> 	)</div><div class='head'>diff --git a/arch/x86/include/asm/trace/irq_vectors.h b/arch/x86/include/asm/trace/irq_vectors.h<br/>index 38a09a13a9bc..32dd6a9e343c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/trace/irq_vectors.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/trace/irq_vectors.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/trace/irq_vectors.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/trace/irq_vectors.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/tracepoint.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void trace_irq_vector_regfunc(void);</div><div class='add'>+extern int trace_irq_vector_regfunc(void);</div><div class='ctx'> extern void trace_irq_vector_unregfunc(void);</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(x86_irq_vector,</div><div class='head'>diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h<br/>index 33b6365c22fe..f5e6f1c417df 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/tsc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/tsc.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/tsc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/tsc.h</a></div><div class='hunk'>@@ -29,7 +29,7 @@ static inline cycles_t get_cycles(void)</div><div class='ctx'> 	return rdtsc();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern struct system_counterval_t convert_art_to_tsc(cycle_t art);</div><div class='add'>+extern struct system_counterval_t convert_art_to_tsc(u64 art);</div><div class='ctx'> </div><div class='ctx'> extern void tsc_init(void);</div><div class='ctx'> extern void mark_tsc_unstable(char *reason);</div><div class='hunk'>@@ -45,8 +45,17 @@ extern int tsc_clocksource_reliable;</div><div class='ctx'>  * Boot-time check whether the TSCs are synchronized across</div><div class='ctx'>  * all CPUs/cores:</div><div class='ctx'>  */</div><div class='add'>+#ifdef CONFIG_X86_TSC</div><div class='add'>+extern bool tsc_store_and_check_tsc_adjust(bool bootcpu);</div><div class='add'>+extern void tsc_verify_tsc_adjust(bool resume);</div><div class='ctx'> extern void check_tsc_sync_source(int cpu);</div><div class='ctx'> extern void check_tsc_sync_target(void);</div><div class='add'>+#else</div><div class='add'>+static inline bool tsc_store_and_check_tsc_adjust(bool bootcpu) { return false; }</div><div class='add'>+static inline void tsc_verify_tsc_adjust(bool resume) { }</div><div class='add'>+static inline void check_tsc_sync_source(int cpu) { }</div><div class='add'>+static inline void check_tsc_sync_target(void) { }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> extern int notsc_setup(char *);</div><div class='ctx'> extern void tsc_save_sched_clock_state(void);</div><div class='head'>diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h<br/>index faf3687f1035..ea148313570f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/uaccess.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/uaccess.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/uaccess.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/uaccess.h</a></div><div class='hunk'>@@ -68,6 +68,12 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un</div><div class='ctx'> 	__chk_range_not_ok((unsigned long __force)(addr), size, limit); \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_ATOMIC_SLEEP</div><div class='add'>+# define WARN_ON_IN_IRQ()	WARN_ON_ONCE(!in_task())</div><div class='add'>+#else</div><div class='add'>+# define WARN_ON_IN_IRQ()</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * access_ok: - Checks if a user space pointer is valid</div><div class='ctx'>  * @type: Type of access: %VERIFY_READ or %VERIFY_WRITE.  Note that</div><div class='hunk'>@@ -88,8 +94,11 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un</div><div class='ctx'>  * checks that the pointer is in the user space range - after calling</div><div class='ctx'>  * this function, memory access functions may still return -EFAULT.</div><div class='ctx'>  */</div><div class='del'>-#define access_ok(type, addr, size) \</div><div class='del'>-	likely(!__range_not_ok(addr, size, user_addr_max()))</div><div class='add'>+#define access_ok(type, addr, size)					\</div><div class='add'>+({									\</div><div class='add'>+	WARN_ON_IN_IRQ();						\</div><div class='add'>+	likely(!__range_not_ok(addr, size, user_addr_max()));		\</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * These are the main single-value transfer routines.  They automatically</div><div class='head'>diff --git a/arch/x86/include/asm/unwind.h b/arch/x86/include/asm/unwind.h<br/>index 46de9ac4b990..6fa75b17aec3 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/unwind.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/unwind.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/unwind.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/unwind.h</a></div><div class='hunk'>@@ -12,7 +12,8 @@ struct unwind_state {</div><div class='ctx'> 	struct task_struct *task;</div><div class='ctx'> 	int graph_idx;</div><div class='ctx'> #ifdef CONFIG_FRAME_POINTER</div><div class='del'>-	unsigned long *bp;</div><div class='add'>+	unsigned long *bp, *orig_sp;</div><div class='add'>+	struct pt_regs *regs;</div><div class='ctx'> #else</div><div class='ctx'> 	unsigned long *sp;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -47,7 +48,15 @@ unsigned long *unwind_get_return_address_ptr(struct unwind_state *state)</div><div class='ctx'> 	if (unwind_done(state))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return state-&gt;bp + 1;</div><div class='add'>+	return state-&gt;regs ? &amp;state-&gt;regs-&gt;ip : state-&gt;bp + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct pt_regs *unwind_get_entry_regs(struct unwind_state *state)</div><div class='add'>+{</div><div class='add'>+	if (unwind_done(state))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return state-&gt;regs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_FRAME_POINTER */</div><div class='hunk'>@@ -58,6 +67,11 @@ unsigned long *unwind_get_return_address_ptr(struct unwind_state *state)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct pt_regs *unwind_get_entry_regs(struct unwind_state *state)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_FRAME_POINTER */</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_X86_UNWIND_H */</div><div class='head'>diff --git a/arch/x86/include/asm/uv/uv.h b/arch/x86/include/asm/uv/uv.h<br/>index 062921ef34e9..6686820feae9 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/uv/uv.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/uv/uv.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/uv/uv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/uv/uv.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@ struct mm_struct;</div><div class='ctx'> </div><div class='ctx'> extern enum uv_system_type get_uv_system_type(void);</div><div class='ctx'> extern int is_uv_system(void);</div><div class='add'>+extern int is_uv_hubless(void);</div><div class='ctx'> extern void uv_cpu_init(void);</div><div class='ctx'> extern void uv_nmi_init(void);</div><div class='ctx'> extern void uv_system_init(void);</div><div class='hunk'>@@ -23,6 +24,7 @@ extern const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,</div><div class='ctx'> </div><div class='ctx'> static inline enum uv_system_type get_uv_system_type(void) { return UV_NONE; }</div><div class='ctx'> static inline int is_uv_system(void)	{ return 0; }</div><div class='add'>+static inline int is_uv_hubless(void)	{ return 0; }</div><div class='ctx'> static inline void uv_cpu_init(void)	{ }</div><div class='ctx'> static inline void uv_system_init(void)	{ }</div><div class='ctx'> static inline const struct cpumask *</div><div class='head'>diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h<br/>index 097b80c989c4..72e8300b1e8a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/uv/uv_hub.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/uv/uv_hub.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/uv/uv_hub.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/uv/uv_hub.h</a></div><div class='hunk'>@@ -772,6 +772,7 @@ static inline int uv_num_possible_blades(void)</div><div class='ctx'> </div><div class='ctx'> /* Per Hub NMI support */</div><div class='ctx'> extern void uv_nmi_setup(void);</div><div class='add'>+extern void uv_nmi_setup_hubless(void);</div><div class='ctx'> </div><div class='ctx'> /* BMC sets a bit this MMR non-zero before sending an NMI */</div><div class='ctx'> #define UVH_NMI_MMR		UVH_SCRATCH5</div><div class='hunk'>@@ -799,6 +800,8 @@ struct uv_hub_nmi_s {</div><div class='ctx'> 	atomic_t	read_mmr_count;	/* count of MMR reads */</div><div class='ctx'> 	atomic_t	nmi_count;	/* count of true UV NMIs */</div><div class='ctx'> 	unsigned long	nmi_value;	/* last value read from NMI MMR */</div><div class='add'>+	bool		hub_present;	/* false means UV hubless system */</div><div class='add'>+	bool		pch_owner;	/* indicates this hub owns PCH */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct uv_cpu_nmi_s {</div><div class='head'>diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h<br/>index e728699db774..022e59714562 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/vgtod.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/vgtod.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/vgtod.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/vgtod.h</a></div><div class='hunk'>@@ -17,8 +17,8 @@ struct vsyscall_gtod_data {</div><div class='ctx'> 	unsigned seq;</div><div class='ctx'> </div><div class='ctx'> 	int vclock_mode;</div><div class='del'>-	cycle_t	cycle_last;</div><div class='del'>-	cycle_t	mask;</div><div class='add'>+	u64	cycle_last;</div><div class='add'>+	u64	mask;</div><div class='ctx'> 	u32	mult;</div><div class='ctx'> 	u32	shift;</div><div class='ctx'> </div><div class='hunk'>@@ -89,8 +89,13 @@ static inline unsigned int __getcpu(void)</div><div class='ctx'> 	 * works on all CPUs.  This is volatile so that it orders</div><div class='ctx'> 	 * correctly wrt barrier() and to keep gcc from cleverly</div><div class='ctx'> 	 * hoisting it out of the calling function.</div><div class='add'>+	 *</div><div class='add'>+	 * If RDPID is available, use it.</div><div class='ctx'> 	 */</div><div class='del'>-	asm volatile ("lsl %1,%0" : "=r" (p) : "r" (__PER_CPU_SEG));</div><div class='add'>+	alternative_io ("lsl %[p],%[seg]",</div><div class='add'>+			".byte 0xf3,0x0f,0xc7,0xf8", /* RDPID %eax/rax */</div><div class='add'>+			X86_FEATURE_RDPID,</div><div class='add'>+			[p] "=a" (p), [seg] "r" (__PER_CPU_SEG));</div><div class='ctx'> </div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h<br/>index a002b07a7099..cc54b7026567 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/vmx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/vmx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/vmx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/vmx.h</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #define VMX_H</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;uapi/asm/vmx.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -60,6 +61,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001</div><div class='ctx'> #define SECONDARY_EXEC_ENABLE_EPT               0x00000002</div><div class='add'>+#define SECONDARY_EXEC_DESC			0x00000004</div><div class='ctx'> #define SECONDARY_EXEC_RDTSCP			0x00000008</div><div class='ctx'> #define SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE   0x00000010</div><div class='ctx'> #define SECONDARY_EXEC_ENABLE_VPID              0x00000020</div><div class='hunk'>@@ -110,6 +112,36 @@</div><div class='ctx'> #define VMX_MISC_SAVE_EFER_LMA			0x00000020</div><div class='ctx'> #define VMX_MISC_ACTIVITY_HLT			0x00000040</div><div class='ctx'> </div><div class='add'>+static inline u32 vmx_basic_vmcs_revision_id(u64 vmx_basic)</div><div class='add'>+{</div><div class='add'>+	return vmx_basic &amp; GENMASK_ULL(30, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 vmx_basic_vmcs_size(u64 vmx_basic)</div><div class='add'>+{</div><div class='add'>+	return (vmx_basic &amp; GENMASK_ULL(44, 32)) &gt;&gt; 32;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int vmx_misc_preemption_timer_rate(u64 vmx_misc)</div><div class='add'>+{</div><div class='add'>+	return vmx_misc &amp; VMX_MISC_PREEMPTION_TIMER_RATE_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int vmx_misc_cr3_count(u64 vmx_misc)</div><div class='add'>+{</div><div class='add'>+	return (vmx_misc &amp; GENMASK_ULL(24, 16)) &gt;&gt; 16;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int vmx_misc_max_msr(u64 vmx_misc)</div><div class='add'>+{</div><div class='add'>+	return (vmx_misc &amp; GENMASK_ULL(27, 25)) &gt;&gt; 25;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int vmx_misc_mseg_revid(u64 vmx_misc)</div><div class='add'>+{</div><div class='add'>+	return (vmx_misc &amp; GENMASK_ULL(63, 32)) &gt;&gt; 32;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* VMCS Encodings */</div><div class='ctx'> enum vmcs_field {</div><div class='ctx'> 	VIRTUAL_PROCESSOR_ID            = 0x00000000,</div><div class='hunk'>@@ -399,10 +431,11 @@ enum vmcs_field {</div><div class='ctx'> #define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT	(KVM_USER_MEM_SLOTS + 2)</div><div class='ctx'> </div><div class='ctx'> #define VMX_NR_VPIDS				(1 &lt;&lt; 16)</div><div class='add'>+#define VMX_VPID_EXTENT_INDIVIDUAL_ADDR		0</div><div class='ctx'> #define VMX_VPID_EXTENT_SINGLE_CONTEXT		1</div><div class='ctx'> #define VMX_VPID_EXTENT_ALL_CONTEXT		2</div><div class='add'>+#define VMX_VPID_EXTENT_SINGLE_NON_GLOBAL	3</div><div class='ctx'> </div><div class='del'>-#define VMX_EPT_EXTENT_INDIVIDUAL_ADDR		0</div><div class='ctx'> #define VMX_EPT_EXTENT_CONTEXT			1</div><div class='ctx'> #define VMX_EPT_EXTENT_GLOBAL			2</div><div class='ctx'> #define VMX_EPT_EXTENT_SHIFT			24</div><div class='hunk'>@@ -419,8 +452,10 @@ enum vmcs_field {</div><div class='ctx'> #define VMX_EPT_EXTENT_GLOBAL_BIT		(1ull &lt;&lt; 26)</div><div class='ctx'> </div><div class='ctx'> #define VMX_VPID_INVVPID_BIT                    (1ull &lt;&lt; 0) /* (32 - 32) */</div><div class='add'>+#define VMX_VPID_EXTENT_INDIVIDUAL_ADDR_BIT     (1ull &lt;&lt; 8) /* (40 - 32) */</div><div class='ctx'> #define VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT      (1ull &lt;&lt; 9) /* (41 - 32) */</div><div class='ctx'> #define VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT      (1ull &lt;&lt; 10) /* (42 - 32) */</div><div class='add'>+#define VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT   (1ull &lt;&lt; 11) /* (43 - 32) */</div><div class='ctx'> </div><div class='ctx'> #define VMX_EPT_DEFAULT_GAW			3</div><div class='ctx'> #define VMX_EPT_MAX_GAW				0x4</div><div class='hunk'>@@ -432,8 +467,16 @@ enum vmcs_field {</div><div class='ctx'> #define VMX_EPT_WRITABLE_MASK			0x2ull</div><div class='ctx'> #define VMX_EPT_EXECUTABLE_MASK			0x4ull</div><div class='ctx'> #define VMX_EPT_IPAT_BIT    			(1ull &lt;&lt; 6)</div><div class='del'>-#define VMX_EPT_ACCESS_BIT				(1ull &lt;&lt; 8)</div><div class='del'>-#define VMX_EPT_DIRTY_BIT				(1ull &lt;&lt; 9)</div><div class='add'>+#define VMX_EPT_ACCESS_BIT			(1ull &lt;&lt; 8)</div><div class='add'>+#define VMX_EPT_DIRTY_BIT			(1ull &lt;&lt; 9)</div><div class='add'>+#define VMX_EPT_RWX_MASK                        (VMX_EPT_READABLE_MASK |       \</div><div class='add'>+						 VMX_EPT_WRITABLE_MASK |       \</div><div class='add'>+						 VMX_EPT_EXECUTABLE_MASK)</div><div class='add'>+#define VMX_EPT_MT_MASK				(7ull &lt;&lt; VMX_EPT_MT_EPTE_SHIFT)</div><div class='add'>+</div><div class='add'>+/* The mask to use to trigger an EPT Misconfiguration in order to track MMIO */</div><div class='add'>+#define VMX_EPT_MISCONFIG_WX_VALUE		(VMX_EPT_WRITABLE_MASK |       \</div><div class='add'>+						 VMX_EPT_EXECUTABLE_MASK)</div><div class='ctx'> </div><div class='ctx'> #define VMX_EPT_IDENTITY_PAGETABLE_ADDR		0xfffbc000ul</div><div class='ctx'> </div><div class='hunk'>@@ -465,6 +508,22 @@ struct vmx_msr_entry {</div><div class='ctx'> #define ENTRY_FAIL_VMCS_LINK_PTR	4</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Exit Qualifications for EPT Violations</div><div class='add'>+ */</div><div class='add'>+#define EPT_VIOLATION_ACC_READ_BIT	0</div><div class='add'>+#define EPT_VIOLATION_ACC_WRITE_BIT	1</div><div class='add'>+#define EPT_VIOLATION_ACC_INSTR_BIT	2</div><div class='add'>+#define EPT_VIOLATION_READABLE_BIT	3</div><div class='add'>+#define EPT_VIOLATION_WRITABLE_BIT	4</div><div class='add'>+#define EPT_VIOLATION_EXECUTABLE_BIT	5</div><div class='add'>+#define EPT_VIOLATION_ACC_READ		(1 &lt;&lt; EPT_VIOLATION_ACC_READ_BIT)</div><div class='add'>+#define EPT_VIOLATION_ACC_WRITE		(1 &lt;&lt; EPT_VIOLATION_ACC_WRITE_BIT)</div><div class='add'>+#define EPT_VIOLATION_ACC_INSTR		(1 &lt;&lt; EPT_VIOLATION_ACC_INSTR_BIT)</div><div class='add'>+#define EPT_VIOLATION_READABLE		(1 &lt;&lt; EPT_VIOLATION_READABLE_BIT)</div><div class='add'>+#define EPT_VIOLATION_WRITABLE		(1 &lt;&lt; EPT_VIOLATION_WRITABLE_BIT)</div><div class='add'>+#define EPT_VIOLATION_EXECUTABLE	(1 &lt;&lt; EPT_VIOLATION_EXECUTABLE_BIT)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * VM-instruction error numbers</div><div class='ctx'>  */</div><div class='ctx'> enum vm_instruction_error_number {</div><div class='head'>diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h<br/>index 6ba793178441..7ba7e90a9ad6 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/x86_init.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/x86_init.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/x86_init.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/x86_init.h</a></div><div class='hunk'>@@ -59,7 +59,7 @@ struct x86_init_irqs {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct x86_init_oem - oem platform specific customizing functions</div><div class='del'>- * @arch_setup:			platform specific architecure setup</div><div class='add'>+ * @arch_setup:			platform specific architecture setup</div><div class='ctx'>  * @banner:			print a platform specific banner</div><div class='ctx'>  */</div><div class='ctx'> struct x86_init_oem {</div><div class='hunk'>@@ -165,8 +165,25 @@ struct x86_legacy_devices {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * enum x86_legacy_i8042_state - i8042 keyboard controller state</div><div class='add'>+ * @X86_LEGACY_I8042_PLATFORM_ABSENT: the controller is always absent on</div><div class='add'>+ *	given platform/subarch.</div><div class='add'>+ * @X86_LEGACY_I8042_FIRMWARE_ABSENT: firmware reports that the controller</div><div class='add'>+ *	is absent.</div><div class='add'>+ * @X86_LEGACY_i8042_EXPECTED_PRESENT: the controller is likely to be</div><div class='add'>+ *	present, the i8042 driver should probe for controller existence.</div><div class='add'>+ */</div><div class='add'>+enum x86_legacy_i8042_state {</div><div class='add'>+	X86_LEGACY_I8042_PLATFORM_ABSENT,</div><div class='add'>+	X86_LEGACY_I8042_FIRMWARE_ABSENT,</div><div class='add'>+	X86_LEGACY_I8042_EXPECTED_PRESENT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct x86_legacy_features - legacy x86 features</div><div class='ctx'>  *</div><div class='add'>+ * @i8042: indicated if we expect the device to have i8042 controller</div><div class='add'>+ *	present.</div><div class='ctx'>  * @rtc: this device has a CMOS real-time clock present</div><div class='ctx'>  * @reserve_bios_regions: boot code will search for the EBDA address and the</div><div class='ctx'>  * 	start of the 640k - 1M BIOS region.  If false, the platform must</div><div class='hunk'>@@ -175,6 +192,7 @@ struct x86_legacy_devices {</div><div class='ctx'>  * 	documentation for further details.</div><div class='ctx'>  */</div><div class='ctx'> struct x86_legacy_features {</div><div class='add'>+	enum x86_legacy_i8042_state i8042;</div><div class='ctx'> 	int rtc;</div><div class='ctx'> 	int reserve_bios_regions;</div><div class='ctx'> 	struct x86_legacy_devices devices;</div><div class='hunk'>@@ -188,15 +206,14 @@ struct x86_legacy_features {</div><div class='ctx'>  * @set_wallclock:		set time back to HW clock</div><div class='ctx'>  * @is_untracked_pat_range	exclude from PAT logic</div><div class='ctx'>  * @nmi_init			enable NMI on cpus</div><div class='del'>- * @i8042_detect		pre-detect if i8042 controller exists</div><div class='ctx'>  * @save_sched_clock_state:	save state for sched_clock() on suspend</div><div class='ctx'>  * @restore_sched_clock_state:	restore state for sched_clock() on resume</div><div class='del'>- * @apic_post_init:		adjust apic if neeeded</div><div class='add'>+ * @apic_post_init:		adjust apic if needed</div><div class='ctx'>  * @legacy:			legacy features</div><div class='ctx'>  * @set_legacy_features:	override legacy features. Use of this callback</div><div class='ctx'>  * 				is highly discouraged. You should only need</div><div class='ctx'>  * 				this if your hardware platform requires further</div><div class='del'>- * 				custom fine tuning far beyong what may be</div><div class='add'>+ * 				custom fine tuning far beyond what may be</div><div class='ctx'>  * 				possible in x86_early_init_platform_quirks() by</div><div class='ctx'>  * 				only using the current x86_hardware_subarch</div><div class='ctx'>  * 				semantics.</div><div class='hunk'>@@ -210,7 +227,6 @@ struct x86_platform_ops {</div><div class='ctx'> 	bool (*is_untracked_pat_range)(u64 start, u64 end);</div><div class='ctx'> 	void (*nmi_init)(void);</div><div class='ctx'> 	unsigned char (*get_nmi_reason)(void);</div><div class='del'>-	int (*i8042_detect)(void);</div><div class='ctx'> 	void (*save_sched_clock_state)(void);</div><div class='ctx'> 	void (*restore_sched_clock_state)(void);</div><div class='ctx'> 	void (*apic_post_init)(void);</div><div class='head'>diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h<br/>index a12a047184ee..f6d20f6cca12 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/xen/hypercall.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/xen/hypercall.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/xen/hypercall.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/xen/hypercall.h</a></div><div class='hunk'>@@ -472,6 +472,13 @@ HYPERVISOR_xenpmu_op(unsigned int op, void *arg)</div><div class='ctx'> 	return _hypercall2(int, xenpmu_op, op, arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int</div><div class='add'>+HYPERVISOR_dm_op(</div><div class='add'>+	domid_t dom, unsigned int nr_bufs, void *bufs)</div><div class='add'>+{</div><div class='add'>+	return _hypercall3(int, dm_op, dom, nr_bufs, bufs);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void</div><div class='ctx'> MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h<br/>index f5fb840b43e8..33cbd3db97b9 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/asm/xen/page.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/asm/xen/page.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/asm/xen/page.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/asm/xen/page.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;linux/pfn.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h<br/>index c18ce67495fa..5138dacf8bb8 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/bootparam.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/uapi/asm/bootparam.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/bootparam.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/bootparam.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #define SETUP_DTB			2</div><div class='ctx'> #define SETUP_PCI			3</div><div class='ctx'> #define SETUP_EFI			4</div><div class='add'>+#define SETUP_APPLE_PROPERTIES		5</div><div class='ctx'> </div><div class='ctx'> /* ram_size flags */</div><div class='ctx'> #define RAMDISK_IMAGE_START_MASK	0x07FF</div><div class='hunk'>@@ -134,7 +135,8 @@ struct boot_params {</div><div class='ctx'> 	__u8  eddbuf_entries;				/* 0x1e9 */</div><div class='ctx'> 	__u8  edd_mbr_sig_buf_entries;			/* 0x1ea */</div><div class='ctx'> 	__u8  kbd_status;				/* 0x1eb */</div><div class='del'>-	__u8  _pad5[3];					/* 0x1ec */</div><div class='add'>+	__u8  secure_boot;				/* 0x1ec */</div><div class='add'>+	__u8  _pad5[2];					/* 0x1ed */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The sentinel is set to a nonzero value (0xff) in header.S.</div><div class='ctx'> 	 *</div><div class='head'>diff --git a/arch/x86/include/uapi/asm/hwcap2.h b/arch/x86/include/uapi/asm/hwcap2.h<br/>new file mode 100644<br/>index 000000000000..0bd2be5c7617<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/hwcap2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/hwcap2.h</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+#ifndef _ASM_X86_HWCAP2_H</div><div class='add'>+#define _ASM_X86_HWCAP2_H</div><div class='add'>+</div><div class='add'>+/* MONITOR/MWAIT enabled in Ring 3 */</div><div class='add'>+#define HWCAP2_RING3MWAIT		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h<br/>index 9b1a91834ac8..3a20ccf787b8 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/hyperv.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/uapi/asm/hyperv.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/hyperv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/hyperv.h</a></div><div class='hunk'>@@ -73,6 +73,9 @@</div><div class='ctx'>   */</div><div class='ctx'> #define HV_X64_MSR_STAT_PAGES_AVAILABLE		(1 &lt;&lt; 8)</div><div class='ctx'> </div><div class='add'>+/* Crash MSR available */</div><div class='add'>+#define HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE (1 &lt;&lt; 10)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Feature identification: EBX indicates which flags were specified at</div><div class='ctx'>  * partition creation. The format is the same as the partition creation</div><div class='hunk'>@@ -144,6 +147,11 @@</div><div class='ctx'>  */</div><div class='ctx'> #define HV_X64_RELAXED_TIMING_RECOMMENDED	(1 &lt;&lt; 5)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Crash notification flag.</div><div class='add'>+ */</div><div class='add'>+#define HV_CRASH_CTL_CRASH_NOTIFY (1ULL &lt;&lt; 63)</div><div class='add'>+</div><div class='ctx'> /* MSR used to identify the guest OS. */</div><div class='ctx'> #define HV_X64_MSR_GUEST_OS_ID			0x40000000</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/uapi/asm/kvm_para.h b/arch/x86/include/uapi/asm/kvm_para.h<br/>index 94dc8ca434e0..cff0bb6556f8 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/kvm_para.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/uapi/asm/kvm_para.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/kvm_para.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/kvm_para.h</a></div><div class='hunk'>@@ -45,7 +45,18 @@ struct kvm_steal_time {</div><div class='ctx'> 	__u64 steal;</div><div class='ctx'> 	__u32 version;</div><div class='ctx'> 	__u32 flags;</div><div class='del'>-	__u32 pad[12];</div><div class='add'>+	__u8  preempted;</div><div class='add'>+	__u8  u8_pad[3];</div><div class='add'>+	__u32 pad[11];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define KVM_CLOCK_PAIRING_WALLCLOCK 0</div><div class='add'>+struct kvm_clock_pairing {</div><div class='add'>+	__s64 sec;</div><div class='add'>+	__s64 nsec;</div><div class='add'>+	__u64 tsc;</div><div class='add'>+	__u32 flags;</div><div class='add'>+	__u32 pad[9];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define KVM_STEAL_ALIGNMENT_BITS 5</div><div class='head'>diff --git a/arch/x86/include/uapi/asm/mce.h b/arch/x86/include/uapi/asm/mce.h<br/>index 69a6e07e3149..eb6247a7009b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/mce.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/uapi/asm/mce.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/mce.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/mce.h</a></div><div class='hunk'>@@ -28,6 +28,7 @@ struct mce {</div><div class='ctx'> 	__u64 mcgcap;	/* MCGCAP MSR: machine check capabilities of CPU */</div><div class='ctx'> 	__u64 synd;	/* MCA_SYND MSR: only valid on SMCA systems */</div><div class='ctx'> 	__u64 ipid;	/* MCA_IPID MSR: only valid on SMCA systems */</div><div class='add'>+	__u64 ppin;	/* Protected Processor Inventory Number */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MCE_GET_RECORD_LEN   _IOR('M', 1, int)</div><div class='head'>diff --git a/arch/x86/include/uapi/asm/prctl.h b/arch/x86/include/uapi/asm/prctl.h<br/>index ae135de547f5..835aa51c7f6e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/prctl.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/uapi/asm/prctl.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/prctl.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/prctl.h</a></div><div class='hunk'>@@ -6,10 +6,8 @@</div><div class='ctx'> #define ARCH_GET_FS 0x1003</div><div class='ctx'> #define ARCH_GET_GS 0x1004</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CHECKPOINT_RESTORE</div><div class='del'>-# define ARCH_MAP_VDSO_X32	0x2001</div><div class='del'>-# define ARCH_MAP_VDSO_32	0x2002</div><div class='del'>-# define ARCH_MAP_VDSO_64	0x2003</div><div class='del'>-#endif</div><div class='add'>+#define ARCH_MAP_VDSO_X32	0x2001</div><div class='add'>+#define ARCH_MAP_VDSO_32	0x2002</div><div class='add'>+#define ARCH_MAP_VDSO_64	0x2003</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_X86_PRCTL_H */</div><div class='head'>diff --git a/arch/x86/include/uapi/asm/vmx.h b/arch/x86/include/uapi/asm/vmx.h<br/>index 37fee272618f..14458658e988 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/vmx.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/include/uapi/asm/vmx.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/include/uapi/asm/vmx.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/include/uapi/asm/vmx.h</a></div><div class='hunk'>@@ -65,6 +65,8 @@</div><div class='ctx'> #define EXIT_REASON_TPR_BELOW_THRESHOLD 43</div><div class='ctx'> #define EXIT_REASON_APIC_ACCESS         44</div><div class='ctx'> #define EXIT_REASON_EOI_INDUCED         45</div><div class='add'>+#define EXIT_REASON_GDTR_IDTR           46</div><div class='add'>+#define EXIT_REASON_LDTR_TR             47</div><div class='ctx'> #define EXIT_REASON_EPT_VIOLATION       48</div><div class='ctx'> #define EXIT_REASON_EPT_MISCONFIG       49</div><div class='ctx'> #define EXIT_REASON_INVEPT              50</div><div class='hunk'>@@ -113,6 +115,8 @@</div><div class='ctx'> 	{ EXIT_REASON_MCE_DURING_VMENTRY,    "MCE_DURING_VMENTRY" }, \</div><div class='ctx'> 	{ EXIT_REASON_TPR_BELOW_THRESHOLD,   "TPR_BELOW_THRESHOLD" }, \</div><div class='ctx'> 	{ EXIT_REASON_APIC_ACCESS,           "APIC_ACCESS" }, \</div><div class='add'>+	{ EXIT_REASON_GDTR_IDTR,	     "GDTR_IDTR" }, \</div><div class='add'>+	{ EXIT_REASON_LDTR_TR,		     "LDTR_TR" }, \</div><div class='ctx'> 	{ EXIT_REASON_EPT_VIOLATION,         "EPT_VIOLATION" }, \</div><div class='ctx'> 	{ EXIT_REASON_EPT_MISCONFIG,         "EPT_MISCONFIG" }, \</div><div class='ctx'> 	{ EXIT_REASON_INVEPT,                "INVEPT" }, \</div><div class='hunk'>@@ -129,6 +133,7 @@</div><div class='ctx'> 	{ EXIT_REASON_XRSTORS,               "XRSTORS" }</div><div class='ctx'> </div><div class='ctx'> #define VMX_ABORT_SAVE_GUEST_MSR_FAIL        1</div><div class='add'>+#define VMX_ABORT_LOAD_HOST_PDPTE_FAIL       2</div><div class='ctx'> #define VMX_ABORT_LOAD_HOST_MSR_FAIL         4</div><div class='ctx'> </div><div class='ctx'> #endif /* _UAPIVMX_H */</div><div class='head'>diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile<br/>index 79076d75bdbf..84c00592d359 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/Makefile</a></div><div class='hunk'>@@ -75,7 +75,7 @@ apm-y				:= apm_32.o</div><div class='ctx'> obj-$(CONFIG_APM)		+= apm.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= smp.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= smpboot.o</div><div class='del'>-obj-$(CONFIG_SMP)		+= tsc_sync.o</div><div class='add'>+obj-$(CONFIG_X86_TSC)		+= tsc_sync.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= setup_percpu.o</div><div class='ctx'> obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o</div><div class='ctx'> obj-y				+= apic/</div><div class='hunk'>@@ -100,8 +100,6 @@ obj-$(CONFIG_HPET_TIMER) 	+= hpet.o</div><div class='ctx'> obj-$(CONFIG_APB_TIMER)		+= apb_timer.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_AMD_NB)		+= amd_nb.o</div><div class='del'>-obj-$(CONFIG_DEBUG_RODATA_TEST)	+= test_rodata.o</div><div class='del'>-obj-$(CONFIG_DEBUG_NX_TEST)	+= test_nx.o</div><div class='ctx'> obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_KVM_GUEST)		+= kvm.o kvmclock.o</div><div class='hunk'>@@ -123,6 +121,7 @@ obj-$(CONFIG_EFI)			+= sysfb_efi.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o</div><div class='ctx'> obj-$(CONFIG_TRACING)			+= tracepoint.o</div><div class='add'>+obj-$(CONFIG_SCHED_MC_PRIO)		+= itmt.o</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_FRAME_POINTER</div><div class='ctx'> obj-y					+= unwind_frame.o</div><div class='head'>diff --git a/arch/x86/kernel/acpi/apei.c b/arch/x86/kernel/acpi/apei.c<br/>index c280df6b2aa2..ea3046e0b0cf 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/acpi/apei.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/acpi/apei.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/acpi/apei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/acpi/apei.c</a></div><div class='hunk'>@@ -24,9 +24,6 @@ int arch_apei_enable_cmcff(struct acpi_hest_header *hest_hdr, void *data)</div><div class='ctx'> 	struct acpi_hest_ia_corrected *cmc;</div><div class='ctx'> 	struct acpi_hest_ia_error_bank *mc_bank;</div><div class='ctx'> </div><div class='del'>-	if (hest_hdr-&gt;type != ACPI_HEST_TYPE_IA32_CORRECTED_CHECK)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	cmc = (struct acpi_hest_ia_corrected *)hest_hdr;</div><div class='ctx'> 	if (!cmc-&gt;enabled)</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c<br/>index 931ced8ca345..ae32838cac5f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/acpi/boot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/acpi/boot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/acpi/boot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/acpi/boot.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/efi-bgrt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irqdomain.h&gt;</div><div class='ctx'> #include &lt;asm/pci_x86.h&gt;</div><div class='hunk'>@@ -76,6 +77,7 @@ int acpi_fix_pin2_polarity __initdata;</div><div class='ctx'> static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_IO_APIC</div><div class='ctx'> /*</div><div class='ctx'>  * Locks related to IOAPIC hotplug</div><div class='ctx'>  * Hotplug side:</div><div class='hunk'>@@ -88,6 +90,7 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;</div><div class='ctx'>  *			-&gt;ioapic_lock</div><div class='ctx'>  */</div><div class='ctx'> static DEFINE_MUTEX(acpi_ioapic_lock);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='ctx'>                               Boot-time Configuration</div><div class='hunk'>@@ -713,7 +716,7 @@ int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)</div><div class='ctx'> 	int nid;</div><div class='ctx'> </div><div class='ctx'> 	nid = acpi_get_node(handle);</div><div class='del'>-	if (nid != -1) {</div><div class='add'>+	if (nid != NUMA_NO_NODE) {</div><div class='ctx'> 		set_apicid_to_node(physid, nid);</div><div class='ctx'> 		numa_set_node(cpu, nid);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -721,11 +724,12 @@ int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu)</div><div class='add'>+int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id,</div><div class='add'>+		 int *pcpu)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='del'>-	cpu = acpi_register_lapic(physid, U32_MAX, ACPI_MADT_ENABLED);</div><div class='add'>+	cpu = acpi_register_lapic(physid, acpi_id, ACPI_MADT_ENABLED);</div><div class='ctx'> 	if (cpu &lt; 0) {</div><div class='ctx'> 		pr_info(PREFIX "Unable to map lapic to logical cpu number\n");</div><div class='ctx'> 		return cpu;</div><div class='hunk'>@@ -928,6 +932,13 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)</div><div class='ctx'> 		x86_platform.legacy.devices.pnpbios = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (acpi_gbl_FADT.header.revision &gt;= FADT2_REVISION_ID &amp;&amp;</div><div class='add'>+	    !(acpi_gbl_FADT.boot_flags &amp; ACPI_FADT_8042) &amp;&amp;</div><div class='add'>+	    x86_platform.legacy.i8042 != X86_LEGACY_I8042_PLATFORM_ABSENT) {</div><div class='add'>+		pr_debug("ACPI: i8042 controller is absent\n");</div><div class='add'>+		x86_platform.legacy.i8042 = X86_LEGACY_I8042_FIRMWARE_ABSENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (acpi_gbl_FADT.boot_flags &amp; ACPI_FADT_NO_CMOS_RTC) {</div><div class='ctx'> 		pr_debug("ACPI: not registering RTC platform device\n");</div><div class='ctx'> 		x86_platform.legacy.rtc = 0;</div><div class='hunk'>@@ -1548,6 +1559,12 @@ int __init early_acpi_boot_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init acpi_parse_bgrt(struct acpi_table_header *table)</div><div class='add'>+{</div><div class='add'>+	efi_bgrt_init(table);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __init acpi_boot_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* those are executed after early-quirks are executed */</div><div class='hunk'>@@ -1572,6 +1589,8 @@ int __init acpi_boot_init(void)</div><div class='ctx'> 	acpi_process_madt();</div><div class='ctx'> </div><div class='ctx'> 	acpi_table_parse(ACPI_SIG_HPET, acpi_parse_hpet);</div><div class='add'>+	if (IS_ENABLED(CONFIG_ACPI_BGRT))</div><div class='add'>+		acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt);</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_noirq)</div><div class='ctx'> 		x86_init.pci.init = pci_acpi_init;</div><div class='head'>diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c<br/>index af15f4444330..8233a630280f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/acpi/cstate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/acpi/cstate.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/acpi/cstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/acpi/cstate.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;acpi/processor.h&gt;</div><div class='del'>-#include &lt;asm/acpi.h&gt;</div><div class='ctx'> #include &lt;asm/mwait.h&gt;</div><div class='ctx'> #include &lt;asm/special_insns.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +88,8 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx)</div><div class='ctx'> 	retval = 0;</div><div class='ctx'> 	/* If the HW does not support any sub-states in this C-state */</div><div class='ctx'> 	if (num_cstate_subtype == 0) {</div><div class='del'>-		pr_warn(FW_BUG "ACPI MWAIT C-state 0x%x not supported by HW (0x%x)\n", cx-&gt;address, edx_part);</div><div class='add'>+		pr_warn(FW_BUG "ACPI MWAIT C-state 0x%x not supported by HW (0x%x)\n",</div><div class='add'>+				cx-&gt;address, edx_part);</div><div class='ctx'> 		retval = -1;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -104,8 +104,8 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx)</div><div class='ctx'> 	if (!mwait_supported[cstate_type]) {</div><div class='ctx'> 		mwait_supported[cstate_type] = 1;</div><div class='ctx'> 		printk(KERN_DEBUG</div><div class='del'>-			"Monitor-Mwait will be used to enter C-%d "</div><div class='del'>-			"state\n", cx-&gt;type);</div><div class='add'>+			"Monitor-Mwait will be used to enter C-%d state\n",</div><div class='add'>+			cx-&gt;type);</div><div class='ctx'> 	}</div><div class='ctx'> 	snprintf(cx-&gt;desc,</div><div class='ctx'> 			ACPI_CX_DESC_LEN, "ACPI FFH INTEL MWAIT 0x%x",</div><div class='hunk'>@@ -166,6 +166,7 @@ EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_enter);</div><div class='ctx'> static int __init ffh_cstate_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpuinfo_x86 *c = &amp;boot_cpu_data;</div><div class='add'>+</div><div class='ctx'> 	if (c-&gt;x86_vendor != X86_VENDOR_INTEL)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S<br/>index 169963f471bb..50b8ed0317a3 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/acpi/wakeup_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/acpi/wakeup_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/acpi/wakeup_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/acpi/wakeup_64.S</a></div><div class='hunk'>@@ -109,6 +109,15 @@ ENTRY(do_suspend_lowlevel)</div><div class='ctx'> 	movq	pt_regs_r14(%rax), %r14</div><div class='ctx'> 	movq	pt_regs_r15(%rax), %r15</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KASAN</div><div class='add'>+	/*</div><div class='add'>+	 * The suspend path may have poisoned some areas deeper in the stack,</div><div class='add'>+	 * which we now need to unpoison.</div><div class='add'>+	 */</div><div class='add'>+	movq	%rsp, %rdi</div><div class='add'>+	call	kasan_unpoison_task_stack_below</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	xorl	%eax, %eax</div><div class='ctx'> 	addq	$8, %rsp</div><div class='ctx'> 	FRAME_END</div><div class='head'>diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c<br/>index 5cb272a7a5a3..c5b8f760473c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/alternative.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/alternative.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/alternative.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/alternative.c</a></div><div class='hunk'>@@ -337,7 +337,11 @@ done:</div><div class='ctx'> 		n_dspl, (unsigned long)orig_insn + n_dspl + repl_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init_or_module optimize_nops(struct alt_instr *a, u8 *instr)</div><div class='add'>+/*</div><div class='add'>+ * "noinline" to cause control flow change and thus invalidate I$ and</div><div class='add'>+ * cause refetch after modification.</div><div class='add'>+ */</div><div class='add'>+static void __init_or_module noinline optimize_nops(struct alt_instr *a, u8 *instr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -346,7 +350,6 @@ static void __init_or_module optimize_nops(struct alt_instr *a, u8 *instr)</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	add_nops(instr + (a-&gt;instrlen - a-&gt;padlen), a-&gt;padlen);</div><div class='del'>-	sync_core();</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 	DUMP_BYTES(instr, a-&gt;instrlen, "%p: [%d:%d) optimized NOPs: ",</div><div class='hunk'>@@ -359,9 +362,12 @@ static void __init_or_module optimize_nops(struct alt_instr *a, u8 *instr)</div><div class='ctx'>  * This implies that asymmetric systems where APs have less capabilities than</div><div class='ctx'>  * the boot processor are not handled. Tough. Make sure you disable such</div><div class='ctx'>  * features by hand.</div><div class='add'>+ *</div><div class='add'>+ * Marked "noinline" to cause control flow change and thus insn cache</div><div class='add'>+ * to refetch changed I$ lines.</div><div class='ctx'>  */</div><div class='del'>-void __init_or_module apply_alternatives(struct alt_instr *start,</div><div class='del'>-					 struct alt_instr *end)</div><div class='add'>+void __init_or_module noinline apply_alternatives(struct alt_instr *start,</div><div class='add'>+						  struct alt_instr *end)</div><div class='ctx'> {</div><div class='ctx'> 	struct alt_instr *a;</div><div class='ctx'> 	u8 *instr, *replacement;</div><div class='hunk'>@@ -667,7 +673,6 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	memcpy(addr, opcode, len);</div><div class='del'>-	sync_core();</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> 	/* Could also do a CLFLUSH here to speed up CPU recovery; but</div><div class='ctx'> 	   that causes hangs on some VIA CPUs. */</div><div class='head'>diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c<br/>index 63ff468a7986..df083efe6ee0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/amd_gart_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/amd_gart_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/amd_gart_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/amd_gart_64.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -695,7 +696,7 @@ static __init int init_amd_gatt(struct agp_kern_info *info)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops gart_dma_ops = {</div><div class='add'>+static const struct dma_map_ops gart_dma_ops = {</div><div class='ctx'> 	.map_sg				= gart_map_sg,</div><div class='ctx'> 	.unmap_sg			= gart_unmap_sg,</div><div class='ctx'> 	.map_page			= gart_map_page,</div><div class='head'>diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c<br/>index 4fdf6230d93c..458da8509b75 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/amd_nb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/amd_nb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/amd_nb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/amd_nb.c</a></div><div class='hunk'>@@ -13,8 +13,20 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/amd_nb.h&gt;</div><div class='ctx'> </div><div class='add'>+#define PCI_DEVICE_ID_AMD_17H_ROOT	0x1450</div><div class='add'>+#define PCI_DEVICE_ID_AMD_17H_DF_F3	0x1463</div><div class='add'>+#define PCI_DEVICE_ID_AMD_17H_DF_F4	0x1464</div><div class='add'>+</div><div class='add'>+/* Protect the PCI config register pairs used for SMN and DF indirect access. */</div><div class='add'>+static DEFINE_MUTEX(smn_mutex);</div><div class='add'>+</div><div class='ctx'> static u32 *flush_words;</div><div class='ctx'> </div><div class='add'>+static const struct pci_device_id amd_root_ids[] = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_ROOT) },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> const struct pci_device_id amd_nb_misc_ids[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },</div><div class='hunk'>@@ -24,9 +36,10 @@ const struct pci_device_id amd_nb_misc_ids[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M60H_NB_F3) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(amd_nb_misc_ids);</div><div class='add'>+EXPORT_SYMBOL_GPL(amd_nb_misc_ids);</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id amd_nb_link_ids[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },</div><div class='hunk'>@@ -34,6 +47,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M60H_NB_F4) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F4) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) },</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -44,8 +58,25 @@ const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[] __initconst = {</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct amd_northbridge_info amd_northbridges;</div><div class='del'>-EXPORT_SYMBOL(amd_northbridges);</div><div class='add'>+static struct amd_northbridge_info amd_northbridges;</div><div class='add'>+</div><div class='add'>+u16 amd_nb_num(void)</div><div class='add'>+{</div><div class='add'>+	return amd_northbridges.num;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amd_nb_num);</div><div class='add'>+</div><div class='add'>+bool amd_nb_has_feature(unsigned int feature)</div><div class='add'>+{</div><div class='add'>+	return ((amd_northbridges.flags &amp; feature) == feature);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amd_nb_has_feature);</div><div class='add'>+</div><div class='add'>+struct amd_northbridge *node_to_amd_nb(int node)</div><div class='add'>+{</div><div class='add'>+	return (node &lt; amd_northbridges.num) ? &amp;amd_northbridges.nb[node] : NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(node_to_amd_nb);</div><div class='ctx'> </div><div class='ctx'> static struct pci_dev *next_northbridge(struct pci_dev *dev,</div><div class='ctx'> 					const struct pci_device_id *ids)</div><div class='hunk'>@@ -58,13 +89,106 @@ static struct pci_dev *next_northbridge(struct pci_dev *dev,</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __amd_smn_rw(u16 node, u32 address, u32 *value, bool write)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *root;</div><div class='add'>+	int err = -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (node &gt;= amd_northbridges.num)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	root = node_to_amd_nb(node)-&gt;root;</div><div class='add'>+	if (!root)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;smn_mutex);</div><div class='add'>+</div><div class='add'>+	err = pci_write_config_dword(root, 0x60, address);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_warn("Error programming SMN address 0x%x.\n", address);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = (write ? pci_write_config_dword(root, 0x64, *value)</div><div class='add'>+		     : pci_read_config_dword(root, 0x64, value));</div><div class='add'>+	if (err)</div><div class='add'>+		pr_warn("Error %s SMN address 0x%x.\n",</div><div class='add'>+			(write ? "writing to" : "reading from"), address);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;smn_mutex);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amd_smn_read(u16 node, u32 address, u32 *value)</div><div class='add'>+{</div><div class='add'>+	return __amd_smn_rw(node, address, value, false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amd_smn_read);</div><div class='add'>+</div><div class='add'>+int amd_smn_write(u16 node, u32 address, u32 value)</div><div class='add'>+{</div><div class='add'>+	return __amd_smn_rw(node, address, &amp;value, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amd_smn_write);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Data Fabric Indirect Access uses FICAA/FICAD.</div><div class='add'>+ *</div><div class='add'>+ * Fabric Indirect Configuration Access Address (FICAA): Constructed based</div><div class='add'>+ * on the device's Instance Id and the PCI function and register offset of</div><div class='add'>+ * the desired register.</div><div class='add'>+ *</div><div class='add'>+ * Fabric Indirect Configuration Access Data (FICAD): There are FICAD LO</div><div class='add'>+ * and FICAD HI registers but so far we only need the LO register.</div><div class='add'>+ */</div><div class='add'>+int amd_df_indirect_read(u16 node, u8 func, u16 reg, u8 instance_id, u32 *lo)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *F4;</div><div class='add'>+	u32 ficaa;</div><div class='add'>+	int err = -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (node &gt;= amd_northbridges.num)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	F4 = node_to_amd_nb(node)-&gt;link;</div><div class='add'>+	if (!F4)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ficaa  = 1;</div><div class='add'>+	ficaa |= reg &amp; 0x3FC;</div><div class='add'>+	ficaa |= (func &amp; 0x7) &lt;&lt; 11;</div><div class='add'>+	ficaa |= instance_id &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;smn_mutex);</div><div class='add'>+</div><div class='add'>+	err = pci_write_config_dword(F4, 0x5C, ficaa);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_warn("Error writing DF Indirect FICAA, FICAA=0x%x\n", ficaa);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_read_config_dword(F4, 0x98, lo);</div><div class='add'>+	if (err)</div><div class='add'>+		pr_warn("Error reading DF Indirect FICAD LO, FICAA=0x%x.\n", ficaa);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;smn_mutex);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amd_df_indirect_read);</div><div class='add'>+</div><div class='ctx'> int amd_cache_northbridges(void)</div><div class='ctx'> {</div><div class='ctx'> 	u16 i = 0;</div><div class='ctx'> 	struct amd_northbridge *nb;</div><div class='del'>-	struct pci_dev *misc, *link;</div><div class='add'>+	struct pci_dev *root, *misc, *link;</div><div class='ctx'> </div><div class='del'>-	if (amd_nb_num())</div><div class='add'>+	if (amd_northbridges.num)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	misc = NULL;</div><div class='hunk'>@@ -74,15 +198,17 @@ int amd_cache_northbridges(void)</div><div class='ctx'> 	if (!i)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	nb = kzalloc(i * sizeof(struct amd_northbridge), GFP_KERNEL);</div><div class='add'>+	nb = kcalloc(i, sizeof(struct amd_northbridge), GFP_KERNEL);</div><div class='ctx'> 	if (!nb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	amd_northbridges.nb = nb;</div><div class='ctx'> 	amd_northbridges.num = i;</div><div class='ctx'> </div><div class='del'>-	link = misc = NULL;</div><div class='del'>-	for (i = 0; i != amd_nb_num(); i++) {</div><div class='add'>+	link = misc = root = NULL;</div><div class='add'>+	for (i = 0; i != amd_northbridges.num; i++) {</div><div class='add'>+		node_to_amd_nb(i)-&gt;root = root =</div><div class='add'>+			next_northbridge(root, amd_root_ids);</div><div class='ctx'> 		node_to_amd_nb(i)-&gt;misc = misc =</div><div class='ctx'> 			next_northbridge(misc, amd_nb_misc_ids);</div><div class='ctx'> 		node_to_amd_nb(i)-&gt;link = link =</div><div class='hunk'>@@ -139,13 +265,13 @@ struct resource *amd_get_mmconfig_range(struct resource *res)</div><div class='ctx'> {</div><div class='ctx'> 	u32 address;</div><div class='ctx'> 	u64 base, msr;</div><div class='del'>-	unsigned segn_busn_bits;</div><div class='add'>+	unsigned int segn_busn_bits;</div><div class='ctx'> </div><div class='ctx'> 	if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* assume all cpus from fam10h have mmconfig */</div><div class='del'>-        if (boot_cpu_data.x86 &lt; 0x10)</div><div class='add'>+	if (boot_cpu_data.x86 &lt; 0x10)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	address = MSR_FAM10H_MMIO_CONF_BASE;</div><div class='hunk'>@@ -226,14 +352,14 @@ static void amd_cache_gart(void)</div><div class='ctx'> 	if (!amd_nb_has_feature(AMD_NB_GART))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	flush_words = kmalloc(amd_nb_num() * sizeof(u32), GFP_KERNEL);</div><div class='add'>+	flush_words = kmalloc_array(amd_northbridges.num, sizeof(u32), GFP_KERNEL);</div><div class='ctx'> 	if (!flush_words) {</div><div class='ctx'> 		amd_northbridges.flags &amp;= ~AMD_NB_GART;</div><div class='ctx'> 		pr_notice("Cannot initialize GART flush words, GART support disabled\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i != amd_nb_num(); i++)</div><div class='add'>+	for (i = 0; i != amd_northbridges.num; i++)</div><div class='ctx'> 		pci_read_config_dword(node_to_amd_nb(i)-&gt;misc, 0x9c, &amp;flush_words[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -246,18 +372,20 @@ void amd_flush_garts(void)</div><div class='ctx'> 	if (!amd_nb_has_feature(AMD_NB_GART))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* Avoid races between AGP and IOMMU. In theory it's not needed</div><div class='del'>-	   but I'm not sure if the hardware won't lose flush requests</div><div class='del'>-	   when another is pending. This whole thing is so expensive anyways</div><div class='del'>-	   that it doesn't matter to serialize more. -AK */</div><div class='add'>+	/*</div><div class='add'>+	 * Avoid races between AGP and IOMMU. In theory it's not needed</div><div class='add'>+	 * but I'm not sure if the hardware won't lose flush requests</div><div class='add'>+	 * when another is pending. This whole thing is so expensive anyways</div><div class='add'>+	 * that it doesn't matter to serialize more. -AK</div><div class='add'>+	 */</div><div class='ctx'> 	spin_lock_irqsave(&amp;gart_lock, flags);</div><div class='ctx'> 	flushed = 0;</div><div class='del'>-	for (i = 0; i &lt; amd_nb_num(); i++) {</div><div class='add'>+	for (i = 0; i &lt; amd_northbridges.num; i++) {</div><div class='ctx'> 		pci_write_config_dword(node_to_amd_nb(i)-&gt;misc, 0x9c,</div><div class='ctx'> 				       flush_words[i] | 1);</div><div class='ctx'> 		flushed++;</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; amd_nb_num(); i++) {</div><div class='add'>+	for (i = 0; i &lt; amd_northbridges.num; i++) {</div><div class='ctx'> 		u32 w;</div><div class='ctx'> 		/* Make sure the hardware actually executed the flush*/</div><div class='ctx'> 		for (;;) {</div><div class='head'>diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c<br/>index 456316f6c868..65721dc73bd8 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/apb_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/apb_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/apb_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apb_timer.c</a></div><div class='hunk'>@@ -234,7 +234,7 @@ static __init int apbt_late_init(void)</div><div class='ctx'> 	if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT ||</div><div class='ctx'> 		!apb_timer_block_enabled)</div><div class='ctx'> 		return 0;</div><div class='del'>-	return cpuhp_setup_state(CPUHP_X86_APB_DEAD, "X86_APB_DEAD", NULL,</div><div class='add'>+	return cpuhp_setup_state(CPUHP_X86_APB_DEAD, "x86/apb:dead", NULL,</div><div class='ctx'> 				 apbt_cpu_dead);</div><div class='ctx'> }</div><div class='ctx'> fs_initcall(apbt_late_init);</div><div class='hunk'>@@ -247,7 +247,7 @@ void apbt_setup_secondary_clock(void) {}</div><div class='ctx'> static int apbt_clocksource_register(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 start, now;</div><div class='del'>-	cycle_t t1;</div><div class='add'>+	u64 t1;</div><div class='ctx'> </div><div class='ctx'> 	/* Start the counter, use timer 2 as source, timer 0/1 for event */</div><div class='ctx'> 	dw_apb_clocksource_start(clocksource_apbt);</div><div class='hunk'>@@ -355,7 +355,7 @@ unsigned long apbt_quick_calibrate(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, scale;</div><div class='ctx'> 	u64 old, new;</div><div class='del'>-	cycle_t t1, t2;</div><div class='add'>+	u64 t1, t2;</div><div class='ctx'> 	unsigned long khz = 0;</div><div class='ctx'> 	u32 loop, shift;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c<br/>index 88c657b057e2..4261b3282ad9 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/apic/apic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/apic/apic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/apic/apic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/apic.c</a></div><div class='hunk'>@@ -48,7 +48,6 @@</div><div class='ctx'> #include &lt;asm/io_apic.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/hpet.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='hunk'>@@ -530,18 +529,19 @@ static void lapic_timer_broadcast(const struct cpumask *mask)</div><div class='ctx'>  * The local apic timer can be used for any function which is CPU local.</div><div class='ctx'>  */</div><div class='ctx'> static struct clock_event_device lapic_clockevent = {</div><div class='del'>-	.name			= "lapic",</div><div class='del'>-	.features		= CLOCK_EVT_FEAT_PERIODIC |</div><div class='del'>-				  CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP</div><div class='del'>-				  | CLOCK_EVT_FEAT_DUMMY,</div><div class='del'>-	.shift			= 32,</div><div class='del'>-	.set_state_shutdown	= lapic_timer_shutdown,</div><div class='del'>-	.set_state_periodic	= lapic_timer_set_periodic,</div><div class='del'>-	.set_state_oneshot	= lapic_timer_set_oneshot,</div><div class='del'>-	.set_next_event		= lapic_next_event,</div><div class='del'>-	.broadcast		= lapic_timer_broadcast,</div><div class='del'>-	.rating			= 100,</div><div class='del'>-	.irq			= -1,</div><div class='add'>+	.name				= "lapic",</div><div class='add'>+	.features			= CLOCK_EVT_FEAT_PERIODIC |</div><div class='add'>+					  CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP</div><div class='add'>+					  | CLOCK_EVT_FEAT_DUMMY,</div><div class='add'>+	.shift				= 32,</div><div class='add'>+	.set_state_shutdown		= lapic_timer_shutdown,</div><div class='add'>+	.set_state_periodic		= lapic_timer_set_periodic,</div><div class='add'>+	.set_state_oneshot		= lapic_timer_set_oneshot,</div><div class='add'>+	.set_state_oneshot_stopped	= lapic_timer_shutdown,</div><div class='add'>+	.set_next_event			= lapic_next_event,</div><div class='add'>+	.broadcast			= lapic_timer_broadcast,</div><div class='add'>+	.rating				= 100,</div><div class='add'>+	.irq				= -1,</div><div class='ctx'> };</div><div class='ctx'> static DEFINE_PER_CPU(struct clock_event_device, lapic_events);</div><div class='ctx'> </div><div class='hunk'>@@ -894,11 +894,13 @@ void __init setup_boot_APIC_clock(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the lapic or request the broadcast */</div><div class='ctx'> 	setup_APIC_timer();</div><div class='add'>+	amd_e400_c1e_apic_setup();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void setup_secondary_APIC_clock(void)</div><div class='ctx'> {</div><div class='ctx'> 	setup_APIC_timer();</div><div class='add'>+	amd_e400_c1e_apic_setup();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1244,7 +1246,7 @@ static void lapic_setup_esr(void)</div><div class='ctx'> /**</div><div class='ctx'>  * setup_local_APIC - setup the local APIC</div><div class='ctx'>  *</div><div class='del'>- * Used to setup local APIC while initializing BSP or bringin up APs.</div><div class='add'>+ * Used to setup local APIC while initializing BSP or bringing up APs.</div><div class='ctx'>  * Always called with preemption disabled.</div><div class='ctx'>  */</div><div class='ctx'> void setup_local_APIC(void)</div><div class='hunk'>@@ -1863,14 +1865,14 @@ static void __smp_spurious_interrupt(u8 vector)</div><div class='ctx'> 		"should never happen.\n", vector, smp_processor_id());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_spurious_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry smp_spurious_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	entering_irq();</div><div class='ctx'> 	__smp_spurious_interrupt(~regs-&gt;orig_ax);</div><div class='ctx'> 	exiting_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_trace_spurious_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry smp_trace_spurious_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	u8 vector = ~regs-&gt;orig_ax;</div><div class='ctx'> </div><div class='hunk'>@@ -1921,14 +1923,14 @@ static void __smp_error_interrupt(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_error_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry smp_error_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	entering_irq();</div><div class='ctx'> 	__smp_error_interrupt(regs);</div><div class='ctx'> 	exiting_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_trace_error_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry smp_trace_error_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	entering_irq();</div><div class='ctx'> 	trace_error_apic_entry(ERROR_APIC_VECTOR);</div><div class='hunk'>@@ -2027,8 +2029,8 @@ void disconnect_bsp_APIC(int virt_wire_setup)</div><div class='ctx'> /*</div><div class='ctx'>  * The number of allocated logical CPU IDs. Since logical CPU IDs are allocated</div><div class='ctx'>  * contiguously, it equals to current allocated max logical CPU ID plus 1.</div><div class='del'>- * All allocated CPU ID should be in [0, nr_logical_cpuidi), so the maximum of</div><div class='del'>- * nr_logical_cpuids is nr_cpu_ids.</div><div class='add'>+ * All allocated CPU IDs should be in the [0, nr_logical_cpuids) range,</div><div class='add'>+ * so the maximum of nr_logical_cpuids is nr_cpu_ids.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: Reserve 0 for BSP.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2093,7 +2095,7 @@ int __generic_processor_info(int apicid, int version, bool enabled)</div><div class='ctx'> 	 * Since fixing handling of boot_cpu_physical_apicid requires</div><div class='ctx'> 	 * another discussion and tests on each platform, we leave it</div><div class='ctx'> 	 * for now and here we use read_apic_id() directly in this</div><div class='del'>-	 * function, generic_processor_info().</div><div class='add'>+	 * function, __generic_processor_info().</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (disabled_cpu_apicid != BAD_APICID &amp;&amp;</div><div class='ctx'> 	    disabled_cpu_apicid != read_apic_id() &amp;&amp;</div><div class='hunk'>@@ -2159,21 +2161,6 @@ int __generic_processor_info(int apicid, int version, bool enabled)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * This can happen on physical hotplug. The sanity check at boot time</div><div class='del'>-	 * is done from native_smp_prepare_cpus() after num_possible_cpus() is</div><div class='del'>-	 * established.</div><div class='del'>-	 */</div><div class='del'>-	if (topology_update_package_map(apicid, cpu) &lt; 0) {</div><div class='del'>-		int thiscpu = max + disabled_cpus;</div><div class='del'>-</div><div class='del'>-		pr_warning("APIC: Package limit reached. Processor %d/0x%x ignored.\n",</div><div class='del'>-			   thiscpu, apicid);</div><div class='del'>-</div><div class='del'>-		disabled_cpus++;</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Validate version</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (version == 0x0) {</div><div class='hunk'>@@ -2263,6 +2250,7 @@ void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v))</div><div class='ctx'> 	for (drv = __apicdrivers; drv &lt; __apicdrivers_end; drv++) {</div><div class='ctx'> 		/* Should happen once for each apic */</div><div class='ctx'> 		WARN_ON((*drv)-&gt;eoi_write == eoi_write);</div><div class='add'>+		(*drv)-&gt;native_eoi_write = (*drv)-&gt;eoi_write;</div><div class='ctx'> 		(*drv)-&gt;eoi_write = eoi_write;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c<br/>index 48e6d84f173e..347bb9f65737 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/apic/io_apic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/apic/io_apic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/apic/io_apic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/io_apic.c</a></div><div class='hunk'>@@ -48,7 +48,6 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irqdomain.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='hunk'>@@ -1108,12 +1107,12 @@ int mp_map_gsi_to_irq(u32 gsi, unsigned int flags, struct irq_alloc_info *info)</div><div class='ctx'> </div><div class='ctx'> 	ioapic = mp_find_ioapic(gsi);</div><div class='ctx'> 	if (ioapic &lt; 0)</div><div class='del'>-		return -1;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	pin = mp_find_ioapic_pin(ioapic, gsi);</div><div class='ctx'> 	idx = find_irq_entry(ioapic, pin, mp_INT);</div><div class='ctx'> 	if ((flags &amp; IOAPIC_MAP_CHECK) &amp;&amp; idx &lt; 0)</div><div class='del'>-		return -1;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	return mp_map_pin_to_irq(gsi, idx, ioapic, pin, flags, info);</div><div class='ctx'> }</div><div class='hunk'>@@ -1876,6 +1875,7 @@ static struct irq_chip ioapic_chip __read_mostly = {</div><div class='ctx'> 	.irq_ack		= irq_chip_ack_parent,</div><div class='ctx'> 	.irq_eoi		= ioapic_ack_level,</div><div class='ctx'> 	.irq_set_affinity	= ioapic_set_affinity,</div><div class='add'>+	.irq_retrigger		= irq_chip_retrigger_hierarchy,</div><div class='ctx'> 	.flags			= IRQCHIP_SKIP_SET_WAKE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1887,6 +1887,7 @@ static struct irq_chip ioapic_ir_chip __read_mostly = {</div><div class='ctx'> 	.irq_ack		= irq_chip_ack_parent,</div><div class='ctx'> 	.irq_eoi		= ioapic_ir_ack_level,</div><div class='ctx'> 	.irq_set_affinity	= ioapic_set_affinity,</div><div class='add'>+	.irq_retrigger		= irq_chip_retrigger_hierarchy,</div><div class='ctx'> 	.flags			= IRQCHIP_SKIP_SET_WAKE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2116,6 +2117,7 @@ static inline void __init check_timer(void)</div><div class='ctx'> 			if (idx != -1 &amp;&amp; irq_trigger(idx))</div><div class='ctx'> 				unmask_ioapic_irq(irq_get_chip_data(0));</div><div class='ctx'> 		}</div><div class='add'>+		irq_domain_deactivate_irq(irq_data);</div><div class='ctx'> 		irq_domain_activate_irq(irq_data);</div><div class='ctx'> 		if (timer_irq_works()) {</div><div class='ctx'> 			if (disable_timer_pin_1 &gt; 0)</div><div class='hunk'>@@ -2137,6 +2139,7 @@ static inline void __init check_timer(void)</div><div class='ctx'> 		 * legacy devices should be connected to IO APIC #0</div><div class='ctx'> 		 */</div><div class='ctx'> 		replace_pin_at_irq_node(data, node, apic1, pin1, apic2, pin2);</div><div class='add'>+		irq_domain_deactivate_irq(irq_data);</div><div class='ctx'> 		irq_domain_activate_irq(irq_data);</div><div class='ctx'> 		legacy_pic-&gt;unmask(0);</div><div class='ctx'> 		if (timer_irq_works()) {</div><div class='head'>diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c<br/>index 015bbf30e3e3..c61aec7e65f4 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/apic/msi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/apic/msi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/apic/msi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/msi.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)</div><div class='ctx'> 	if (domain == NULL)</div><div class='ctx'> 		return -ENOSYS;</div><div class='ctx'> </div><div class='del'>-	return pci_msi_domain_alloc_irqs(domain, dev, nvec, type);</div><div class='add'>+	return msi_domain_alloc_irqs(domain, &amp;dev-&gt;dev, nvec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void native_teardown_msi_irq(unsigned int irq)</div><div class='head'>diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c<br/>index 5d30c5e42bb1..f3557a1eb562 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/apic/vector.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/apic/vector.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/apic/vector.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/vector.c</a></div><div class='hunk'>@@ -559,7 +559,7 @@ void send_cleanup_vector(struct irq_cfg *cfg)</div><div class='ctx'> 		__send_cleanup_vector(data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage __visible void smp_irq_move_cleanup_interrupt(void)</div><div class='add'>+asmlinkage __visible void __irq_entry smp_irq_move_cleanup_interrupt(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned vector, me;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c<br/>index 200af5ae9662..5a35f208ed95 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/apic/x2apic_cluster.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/apic/x2apic_cluster.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/apic/x2apic_cluster.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/x2apic_cluster.c</a></div><div class='hunk'>@@ -191,7 +191,7 @@ static int x2apic_cluster_probe(void)</div><div class='ctx'> 	if (!x2apic_mode)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = cpuhp_setup_state(CPUHP_X2APIC_PREPARE, "X2APIC_PREPARE",</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_X2APIC_PREPARE, "x86/x2apic:prepare",</div><div class='ctx'> 				x2apic_prepare_cpu, x2apic_dead_cpu);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		pr_err("Failed to register X2APIC_PREPARE\n");</div><div class='head'>diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c<br/>index 35690a168cf7..e9f8f8cdd570 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/apic/x2apic_uv_x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/apic/x2apic_uv_x.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/apic/x2apic_uv_x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apic/x2apic_uv_x.c</a></div><div class='hunk'>@@ -41,40 +41,44 @@</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(int, x2apic_extra_bits);</div><div class='ctx'> </div><div class='del'>-#define PR_DEVEL(fmt, args...)	pr_devel("%s: " fmt, __func__, args)</div><div class='del'>-</div><div class='del'>-static enum uv_system_type uv_system_type;</div><div class='del'>-static u64 gru_start_paddr, gru_end_paddr;</div><div class='del'>-static u64 gru_dist_base, gru_first_node_paddr = -1LL, gru_last_node_paddr;</div><div class='del'>-static u64 gru_dist_lmask, gru_dist_umask;</div><div class='del'>-static union uvh_apicid uvh_apicid;</div><div class='del'>-</div><div class='del'>-/* info derived from CPUID */</div><div class='add'>+static enum uv_system_type	uv_system_type;</div><div class='add'>+static bool			uv_hubless_system;</div><div class='add'>+static u64			gru_start_paddr, gru_end_paddr;</div><div class='add'>+static u64			gru_dist_base, gru_first_node_paddr = -1LL, gru_last_node_paddr;</div><div class='add'>+static u64			gru_dist_lmask, gru_dist_umask;</div><div class='add'>+static union uvh_apicid		uvh_apicid;</div><div class='add'>+</div><div class='add'>+/* Information derived from CPUID: */</div><div class='ctx'> static struct {</div><div class='ctx'> 	unsigned int apicid_shift;</div><div class='ctx'> 	unsigned int apicid_mask;</div><div class='ctx'> 	unsigned int socketid_shift;	/* aka pnode_shift for UV1/2/3 */</div><div class='ctx'> 	unsigned int pnode_mask;</div><div class='ctx'> 	unsigned int gpa_shift;</div><div class='add'>+	unsigned int gnode_shift;</div><div class='ctx'> } uv_cpuid;</div><div class='ctx'> </div><div class='ctx'> int uv_min_hub_revision_id;</div><div class='ctx'> EXPORT_SYMBOL_GPL(uv_min_hub_revision_id);</div><div class='add'>+</div><div class='ctx'> unsigned int uv_apicid_hibits;</div><div class='ctx'> EXPORT_SYMBOL_GPL(uv_apicid_hibits);</div><div class='ctx'> </div><div class='ctx'> static struct apic apic_x2apic_uv_x;</div><div class='ctx'> static struct uv_hub_info_s uv_hub_info_node0;</div><div class='ctx'> </div><div class='del'>-/* Set this to use hardware error handler instead of kernel panic */</div><div class='add'>+/* Set this to use hardware error handler instead of kernel panic: */</div><div class='ctx'> static int disable_uv_undefined_panic = 1;</div><div class='add'>+</div><div class='ctx'> unsigned long uv_undefined(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	if (likely(!disable_uv_undefined_panic))</div><div class='ctx'> 		panic("UV: error: undefined MMR: %s\n", str);</div><div class='ctx'> 	else</div><div class='ctx'> 		pr_crit("UV: error: undefined MMR: %s\n", str);</div><div class='del'>-	return ~0ul;	/* cause a machine fault  */</div><div class='add'>+</div><div class='add'>+	/* Cause a machine fault: */</div><div class='add'>+	return ~0ul;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(uv_undefined);</div><div class='ctx'> </div><div class='hunk'>@@ -85,18 +89,19 @@ static unsigned long __init uv_early_read_mmr(unsigned long addr)</div><div class='ctx'> 	mmr = early_ioremap(UV_LOCAL_MMR_BASE | addr, sizeof(*mmr));</div><div class='ctx'> 	val = *mmr;</div><div class='ctx'> 	early_iounmap(mmr, sizeof(*mmr));</div><div class='add'>+</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool is_GRU_range(u64 start, u64 end)</div><div class='ctx'> {</div><div class='ctx'> 	if (gru_dist_base) {</div><div class='del'>-		u64 su = start &amp; gru_dist_umask; /* upper (incl pnode) bits */</div><div class='del'>-		u64 sl = start &amp; gru_dist_lmask; /* base offset bits */</div><div class='add'>+		u64 su = start &amp; gru_dist_umask; /* Upper (incl pnode) bits */</div><div class='add'>+		u64 sl = start &amp; gru_dist_lmask; /* Base offset bits */</div><div class='ctx'> 		u64 eu = end &amp; gru_dist_umask;</div><div class='ctx'> 		u64 el = end &amp; gru_dist_lmask;</div><div class='ctx'> </div><div class='del'>-		/* Must reside completely within a single GRU range */</div><div class='add'>+		/* Must reside completely within a single GRU range: */</div><div class='ctx'> 		return (sl == gru_dist_base &amp;&amp; el == gru_dist_base &amp;&amp;</div><div class='ctx'> 			su &gt;= gru_first_node_paddr &amp;&amp;</div><div class='ctx'> 			su &lt;= gru_last_node_paddr &amp;&amp;</div><div class='hunk'>@@ -133,13 +138,14 @@ static int __init early_get_pnodeid(void)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case UV4_HUB_PART_NUMBER:</div><div class='ctx'> 		uv_min_hub_revision_id += UV4_HUB_REVISION_BASE - 1;</div><div class='add'>+		uv_cpuid.gnode_shift = 2; /* min partition is 4 sockets */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	uv_hub_info-&gt;hub_revision = uv_min_hub_revision_id;</div><div class='ctx'> 	uv_cpuid.pnode_mask = (1 &lt;&lt; m_n_config.s.n_skt) - 1;</div><div class='ctx'> 	pnode = (node_id.s.node_id &gt;&gt; 1) &amp; uv_cpuid.pnode_mask;</div><div class='del'>-	uv_cpuid.gpa_shift = 46;	/* default unless changed */</div><div class='add'>+	uv_cpuid.gpa_shift = 46;	/* Default unless changed */</div><div class='ctx'> </div><div class='ctx'> 	pr_info("UV: rev:%d part#:%x nodeid:%04x n_skt:%d pnmsk:%x pn:%x\n",</div><div class='ctx'> 		node_id.s.revision, node_id.s.part_number, node_id.s.node_id,</div><div class='hunk'>@@ -147,11 +153,12 @@ static int __init early_get_pnodeid(void)</div><div class='ctx'> 	return pnode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* [copied from arch/x86/kernel/cpu/topology.c:detect_extended_topology()] */</div><div class='del'>-#define SMT_LEVEL	0	/* leaf 0xb SMT level */</div><div class='del'>-#define INVALID_TYPE	0	/* leaf 0xb sub-leaf types */</div><div class='del'>-#define SMT_TYPE	1</div><div class='del'>-#define CORE_TYPE	2</div><div class='add'>+/* [Copied from arch/x86/kernel/cpu/topology.c:detect_extended_topology()] */</div><div class='add'>+</div><div class='add'>+#define SMT_LEVEL			0	/* Leaf 0xb SMT level */</div><div class='add'>+#define INVALID_TYPE			0	/* Leaf 0xb sub-leaf types */</div><div class='add'>+#define SMT_TYPE			1</div><div class='add'>+#define CORE_TYPE			2</div><div class='ctx'> #define LEAFB_SUBTYPE(ecx)		(((ecx) &gt;&gt; 8) &amp; 0xff)</div><div class='ctx'> #define BITS_SHIFT_NEXT_LEVEL(eax)	((eax) &amp; 0x1f)</div><div class='ctx'> </div><div class='hunk'>@@ -165,11 +172,13 @@ static void set_x2apic_bits(void)</div><div class='ctx'> 		pr_info("UV: CPU does not have CPUID.11\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	cpuid_count(0xb, SMT_LEVEL, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='ctx'> 	if (ebx == 0 || (LEAFB_SUBTYPE(ecx) != SMT_TYPE)) {</div><div class='ctx'> 		pr_info("UV: CPUID.11 not implemented\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	sid_shift = BITS_SHIFT_NEXT_LEVEL(eax);</div><div class='ctx'> 	sub_index = 1;</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -180,8 +189,9 @@ static void set_x2apic_bits(void)</div><div class='ctx'> 		}</div><div class='ctx'> 		sub_index++;</div><div class='ctx'> 	} while (LEAFB_SUBTYPE(ecx) != INVALID_TYPE);</div><div class='del'>-	uv_cpuid.apicid_shift = 0;</div><div class='del'>-	uv_cpuid.apicid_mask = (~(-1 &lt;&lt; sid_shift));</div><div class='add'>+</div><div class='add'>+	uv_cpuid.apicid_shift	= 0;</div><div class='add'>+	uv_cpuid.apicid_mask	= (~(-1 &lt;&lt; sid_shift));</div><div class='ctx'> 	uv_cpuid.socketid_shift = sid_shift;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -192,10 +202,8 @@ static void __init early_get_apic_socketid_shift(void)</div><div class='ctx'> </div><div class='ctx'> 	set_x2apic_bits();</div><div class='ctx'> </div><div class='del'>-	pr_info("UV: apicid_shift:%d apicid_mask:0x%x\n",</div><div class='del'>-		uv_cpuid.apicid_shift, uv_cpuid.apicid_mask);</div><div class='del'>-	pr_info("UV: socketid_shift:%d pnode_mask:0x%x\n",</div><div class='del'>-		uv_cpuid.socketid_shift, uv_cpuid.pnode_mask);</div><div class='add'>+	pr_info("UV: apicid_shift:%d apicid_mask:0x%x\n", uv_cpuid.apicid_shift, uv_cpuid.apicid_mask);</div><div class='add'>+	pr_info("UV: socketid_shift:%d pnode_mask:0x%x\n", uv_cpuid.socketid_shift, uv_cpuid.pnode_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -208,10 +216,8 @@ static void __init uv_set_apicid_hibit(void)</div><div class='ctx'> 	union uv1h_lb_target_physical_apic_id_mask_u apicid_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (is_uv1_hub()) {</div><div class='del'>-		apicid_mask.v =</div><div class='del'>-			uv_early_read_mmr(UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK);</div><div class='del'>-		uv_apicid_hibits =</div><div class='del'>-			apicid_mask.s1.bit_enables &amp; UV_APICID_HIBIT_MASK;</div><div class='add'>+		apicid_mask.v = uv_early_read_mmr(UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK);</div><div class='add'>+		uv_apicid_hibits = apicid_mask.s1.bit_enables &amp; UV_APICID_HIBIT_MASK;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -220,20 +226,26 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)</div><div class='ctx'> 	int pnodeid;</div><div class='ctx'> 	int uv_apic;</div><div class='ctx'> </div><div class='del'>-	if (strncmp(oem_id, "SGI", 3) != 0)</div><div class='add'>+	if (strncmp(oem_id, "SGI", 3) != 0) {</div><div class='add'>+		if (strncmp(oem_id, "NSGI", 4) == 0) {</div><div class='add'>+			uv_hubless_system = true;</div><div class='add'>+			pr_info("UV: OEM IDs %s/%s, HUBLESS\n",</div><div class='add'>+				oem_id, oem_table_id);</div><div class='add'>+		}</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (numa_off) {</div><div class='ctx'> 		pr_err("UV: NUMA is off, disabling UV support\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Setup early hub type field in uv_hub_info for Node 0 */</div><div class='add'>+	/* Set up early hub type field in uv_hub_info for Node 0 */</div><div class='ctx'> 	uv_cpu_info-&gt;p_uv_hub_info = &amp;uv_hub_info_node0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Determine UV arch type.</div><div class='del'>-	 *   SGI: UV100/1000</div><div class='add'>+	 *   SGI:  UV100/1000</div><div class='ctx'> 	 *   SGI2: UV2000/3000</div><div class='ctx'> 	 *   SGI3: UV300 (truncated to 4 chars because of different varieties)</div><div class='ctx'> 	 *   SGI4: UV400 (truncated to 4 chars because of different varieties)</div><div class='hunk'>@@ -249,31 +261,32 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)</div><div class='ctx'> </div><div class='ctx'> 	pnodeid = early_get_pnodeid();</div><div class='ctx'> 	early_get_apic_socketid_shift();</div><div class='del'>-	x86_platform.is_untracked_pat_range =  uv_is_untracked_pat_range;</div><div class='add'>+</div><div class='add'>+	x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range;</div><div class='ctx'> 	x86_platform.nmi_init = uv_nmi_init;</div><div class='ctx'> </div><div class='del'>-	if (!strcmp(oem_table_id, "UVX")) {		/* most common */</div><div class='add'>+	if (!strcmp(oem_table_id, "UVX")) {</div><div class='add'>+		/* This is the most common hardware variant: */</div><div class='ctx'> 		uv_system_type = UV_X2APIC;</div><div class='ctx'> 		uv_apic = 0;</div><div class='ctx'> </div><div class='del'>-	} else if (!strcmp(oem_table_id, "UVH")) {	/* only UV1 systems */</div><div class='add'>+	} else if (!strcmp(oem_table_id, "UVH")) {</div><div class='add'>+		/* Only UV1 systems: */</div><div class='ctx'> 		uv_system_type = UV_NON_UNIQUE_APIC;</div><div class='del'>-		__this_cpu_write(x2apic_extra_bits,</div><div class='del'>-			pnodeid &lt;&lt; uvh_apicid.s.pnode_shift);</div><div class='add'>+		__this_cpu_write(x2apic_extra_bits, pnodeid &lt;&lt; uvh_apicid.s.pnode_shift);</div><div class='ctx'> 		uv_set_apicid_hibit();</div><div class='ctx'> 		uv_apic = 1;</div><div class='ctx'> </div><div class='del'>-	} else	if (!strcmp(oem_table_id, "UVL")) {	/* only used for */</div><div class='del'>-		uv_system_type = UV_LEGACY_APIC;	/* very small systems */</div><div class='add'>+	} else if (!strcmp(oem_table_id, "UVL")) {</div><div class='add'>+		/* Only used for very small systems:  */</div><div class='add'>+		uv_system_type = UV_LEGACY_APIC;</div><div class='ctx'> 		uv_apic = 0;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		goto badbios;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_info("UV: OEM IDs %s/%s, System/HUB Types %d/%d, uv_apic %d\n",</div><div class='del'>-		oem_id, oem_table_id, uv_system_type,</div><div class='del'>-		uv_min_hub_revision_id, uv_apic);</div><div class='add'>+	pr_info("UV: OEM IDs %s/%s, System/HUB Types %d/%d, uv_apic %d\n", oem_id, oem_table_id, uv_system_type, uv_min_hub_revision_id, uv_apic);</div><div class='ctx'> </div><div class='ctx'> 	return uv_apic;</div><div class='ctx'> </div><div class='hunk'>@@ -294,6 +307,12 @@ int is_uv_system(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(is_uv_system);</div><div class='ctx'> </div><div class='add'>+int is_uv_hubless(void)</div><div class='add'>+{</div><div class='add'>+	return uv_hubless_system;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(is_uv_hubless);</div><div class='add'>+</div><div class='ctx'> void **__uv_hub_info_list;</div><div class='ctx'> EXPORT_SYMBOL_GPL(__uv_hub_info_list);</div><div class='ctx'> </div><div class='hunk'>@@ -306,16 +325,18 @@ EXPORT_SYMBOL_GPL(uv_possible_blades);</div><div class='ctx'> unsigned long sn_rtc_cycles_per_second;</div><div class='ctx'> EXPORT_SYMBOL(sn_rtc_cycles_per_second);</div><div class='ctx'> </div><div class='del'>-/* the following values are used for the per node hub info struct */</div><div class='del'>-static __initdata unsigned short *_node_to_pnode;</div><div class='del'>-static __initdata unsigned short _min_socket, _max_socket;</div><div class='del'>-static __initdata unsigned short _min_pnode, _max_pnode, _gr_table_len;</div><div class='del'>-static __initdata struct uv_gam_range_entry *uv_gre_table;</div><div class='del'>-static __initdata struct uv_gam_parameters *uv_gp_table;</div><div class='del'>-static __initdata unsigned short *_socket_to_node;</div><div class='del'>-static __initdata unsigned short *_socket_to_pnode;</div><div class='del'>-static __initdata unsigned short *_pnode_to_socket;</div><div class='del'>-static __initdata struct uv_gam_range_s *_gr_table;</div><div class='add'>+/* The following values are used for the per node hub info struct */</div><div class='add'>+static __initdata unsigned short		*_node_to_pnode;</div><div class='add'>+static __initdata unsigned short		_min_socket, _max_socket;</div><div class='add'>+static __initdata unsigned short		_min_pnode, _max_pnode, _gr_table_len;</div><div class='add'>+static __initdata struct uv_gam_range_entry	*uv_gre_table;</div><div class='add'>+static __initdata struct uv_gam_parameters	*uv_gp_table;</div><div class='add'>+static __initdata unsigned short		*_socket_to_node;</div><div class='add'>+static __initdata unsigned short		*_socket_to_pnode;</div><div class='add'>+static __initdata unsigned short		*_pnode_to_socket;</div><div class='add'>+</div><div class='add'>+static __initdata struct uv_gam_range_s		*_gr_table;</div><div class='add'>+</div><div class='ctx'> #define	SOCK_EMPTY	((unsigned short)~0)</div><div class='ctx'> </div><div class='ctx'> extern int uv_hub_info_version(void)</div><div class='hunk'>@@ -324,7 +345,7 @@ extern int uv_hub_info_version(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(uv_hub_info_version);</div><div class='ctx'> </div><div class='del'>-/* Build GAM range lookup table */</div><div class='add'>+/* Build GAM range lookup table: */</div><div class='ctx'> static __init void build_uv_gr_table(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct uv_gam_range_entry *gre = uv_gre_table;</div><div class='hunk'>@@ -342,25 +363,24 @@ static __init void build_uv_gr_table(void)</div><div class='ctx'> </div><div class='ctx'> 	for (; gre-&gt;type != UV_GAM_RANGE_TYPE_UNUSED; gre++) {</div><div class='ctx'> 		if (gre-&gt;type == UV_GAM_RANGE_TYPE_HOLE) {</div><div class='del'>-			if (!ram_limit) {   /* mark hole between ram/non-ram */</div><div class='add'>+			if (!ram_limit) {</div><div class='add'>+				/* Mark hole between RAM/non-RAM: */</div><div class='ctx'> 				ram_limit = last_limit;</div><div class='ctx'> 				last_limit = gre-&gt;limit;</div><div class='ctx'> 				lsid++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			last_limit = gre-&gt;limit;</div><div class='del'>-			pr_info("UV: extra hole in GAM RE table @%d\n",</div><div class='del'>-				(int)(gre - uv_gre_table));</div><div class='add'>+			pr_info("UV: extra hole in GAM RE table @%d\n", (int)(gre - uv_gre_table));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (_max_socket &lt; gre-&gt;sockid) {</div><div class='del'>-			pr_err("UV: GAM table sockid(%d) too large(&gt;%d) @%d\n",</div><div class='del'>-				gre-&gt;sockid, _max_socket,</div><div class='del'>-				(int)(gre - uv_gre_table));</div><div class='add'>+			pr_err("UV: GAM table sockid(%d) too large(&gt;%d) @%d\n", gre-&gt;sockid, _max_socket, (int)(gre - uv_gre_table));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		sid = gre-&gt;sockid - _min_socket;</div><div class='del'>-		if (lsid &lt; sid) {		/* new range */</div><div class='add'>+		if (lsid &lt; sid) {</div><div class='add'>+			/* New range: */</div><div class='ctx'> 			grt = &amp;_gr_table[indx];</div><div class='ctx'> 			grt-&gt;base = lindx;</div><div class='ctx'> 			grt-&gt;nasid = gre-&gt;nasid;</div><div class='hunk'>@@ -369,27 +389,32 @@ static __init void build_uv_gr_table(void)</div><div class='ctx'> 			lindx = indx++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (lsid == sid &amp;&amp; !ram_limit) {	/* update range */</div><div class='del'>-			if (grt-&gt;limit == last_limit) {	/* .. if contiguous */</div><div class='add'>+		/* Update range: */</div><div class='add'>+		if (lsid == sid &amp;&amp; !ram_limit) {</div><div class='add'>+			/* .. if contiguous: */</div><div class='add'>+			if (grt-&gt;limit == last_limit) {</div><div class='ctx'> 				grt-&gt;limit = last_limit = gre-&gt;limit;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (!ram_limit) {		/* non-contiguous ram range */</div><div class='add'>+		/* Non-contiguous RAM range: */</div><div class='add'>+		if (!ram_limit) {</div><div class='ctx'> 			grt++;</div><div class='ctx'> 			grt-&gt;base = lindx;</div><div class='ctx'> 			grt-&gt;nasid = gre-&gt;nasid;</div><div class='ctx'> 			grt-&gt;limit = last_limit = gre-&gt;limit;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		grt++;				/* non-contiguous/non-ram */</div><div class='del'>-		grt-&gt;base = grt - _gr_table;	/* base is this entry */</div><div class='add'>+		/* Non-contiguous/non-RAM: */</div><div class='add'>+		grt++;</div><div class='add'>+		/* base is this entry */</div><div class='add'>+		grt-&gt;base = grt - _gr_table;</div><div class='ctx'> 		grt-&gt;nasid = gre-&gt;nasid;</div><div class='ctx'> 		grt-&gt;limit = last_limit = gre-&gt;limit;</div><div class='ctx'> 		lsid++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* shorten table if possible */</div><div class='add'>+	/* Shorten table if possible */</div><div class='ctx'> 	grt++;</div><div class='ctx'> 	i = grt - _gr_table;</div><div class='ctx'> 	if (i &lt; _gr_table_len) {</div><div class='hunk'>@@ -403,16 +428,15 @@ static __init void build_uv_gr_table(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* display resultant gam range table */</div><div class='add'>+	/* Display resultant GAM range table: */</div><div class='ctx'> 	for (i = 0, grt = _gr_table; i &lt; _gr_table_len; i++, grt++) {</div><div class='add'>+		unsigned long start, end;</div><div class='ctx'> 		int gb = grt-&gt;base;</div><div class='del'>-		unsigned long start = gb &lt; 0 ?  0 :</div><div class='del'>-			(unsigned long)_gr_table[gb].limit &lt;&lt; UV_GAM_RANGE_SHFT;</div><div class='del'>-		unsigned long end =</div><div class='del'>-			(unsigned long)grt-&gt;limit &lt;&lt; UV_GAM_RANGE_SHFT;</div><div class='ctx'> </div><div class='del'>-		pr_info("UV: GAM Range %2d %04x 0x%013lx-0x%013lx (%d)\n",</div><div class='del'>-			i, grt-&gt;nasid, start, end, gb);</div><div class='add'>+		start = gb &lt; 0 ?  0 : (unsigned long)_gr_table[gb].limit &lt;&lt; UV_GAM_RANGE_SHFT;</div><div class='add'>+		end = (unsigned long)grt-&gt;limit &lt;&lt; UV_GAM_RANGE_SHFT;</div><div class='add'>+</div><div class='add'>+		pr_info("UV: GAM Range %2d %04x 0x%013lx-0x%013lx (%d)\n", i, grt-&gt;nasid, start, end, gb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -423,16 +447,19 @@ static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)</div><div class='ctx'> </div><div class='ctx'> 	pnode = uv_apicid_to_pnode(phys_apicid);</div><div class='ctx'> 	phys_apicid |= uv_apicid_hibits;</div><div class='add'>+</div><div class='ctx'> 	val = (1UL &lt;&lt; UVH_IPI_INT_SEND_SHFT) |</div><div class='ctx'> 	    (phys_apicid &lt;&lt; UVH_IPI_INT_APIC_ID_SHFT) |</div><div class='ctx'> 	    ((start_rip &lt;&lt; UVH_IPI_INT_VECTOR_SHFT) &gt;&gt; 12) |</div><div class='ctx'> 	    APIC_DM_INIT;</div><div class='add'>+</div><div class='ctx'> 	uv_write_global_mmr64(pnode, UVH_IPI_INT, val);</div><div class='ctx'> </div><div class='ctx'> 	val = (1UL &lt;&lt; UVH_IPI_INT_SEND_SHFT) |</div><div class='ctx'> 	    (phys_apicid &lt;&lt; UVH_IPI_INT_APIC_ID_SHFT) |</div><div class='ctx'> 	    ((start_rip &lt;&lt; UVH_IPI_INT_VECTOR_SHFT) &gt;&gt; 12) |</div><div class='ctx'> 	    APIC_DM_STARTUP;</div><div class='add'>+</div><div class='ctx'> 	uv_write_global_mmr64(pnode, UVH_IPI_INT, val);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -566,7 +593,7 @@ static struct apic apic_x2apic_uv_x __ro_after_init = {</div><div class='ctx'> 	.apic_id_registered		= uv_apic_id_registered,</div><div class='ctx'> </div><div class='ctx'> 	.irq_delivery_mode		= dest_Fixed,</div><div class='del'>-	.irq_dest_mode			= 0, /* physical */</div><div class='add'>+	.irq_dest_mode			= 0, /* Physical */</div><div class='ctx'> </div><div class='ctx'> 	.target_cpus			= online_target_cpus,</div><div class='ctx'> 	.disable_esr			= 0,</div><div class='hunk'>@@ -627,23 +654,22 @@ static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size)</div><div class='ctx'> 		switch (i) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			m_redirect = UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR;</div><div class='del'>-			m_overlay = UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR;</div><div class='add'>+			m_overlay  = UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='ctx'> 			m_redirect = UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR;</div><div class='del'>-			m_overlay = UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR;</div><div class='add'>+			m_overlay  = UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='ctx'> 			m_redirect = UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR;</div><div class='del'>-			m_overlay = UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR;</div><div class='add'>+			m_overlay  = UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		alias.v = uv_read_local_mmr(m_overlay);</div><div class='ctx'> 		if (alias.s.enable &amp;&amp; alias.s.base == 0) {</div><div class='ctx'> 			*size = (1UL &lt;&lt; alias.s.m_alias);</div><div class='ctx'> 			redirect.v = uv_read_local_mmr(m_redirect);</div><div class='del'>-			*base = (unsigned long)redirect.s.dest_base</div><div class='del'>-							&lt;&lt; DEST_SHIFT;</div><div class='add'>+			*base = (unsigned long)redirect.s.dest_base &lt;&lt; DEST_SHIFT;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -652,8 +678,7 @@ static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size)</div><div class='ctx'> </div><div class='ctx'> enum map_type {map_wb, map_uc};</div><div class='ctx'> </div><div class='del'>-static __init void map_high(char *id, unsigned long base, int pshift,</div><div class='del'>-			int bshift, int max_pnode, enum map_type map_type)</div><div class='add'>+static __init void map_high(char *id, unsigned long base, int pshift, int bshift, int max_pnode, enum map_type map_type)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long bytes, paddr;</div><div class='ctx'> </div><div class='hunk'>@@ -678,16 +703,19 @@ static __init void map_gru_distributed(unsigned long c)</div><div class='ctx'> 	int nid;</div><div class='ctx'> </div><div class='ctx'> 	gru.v = c;</div><div class='del'>-	/* only base bits 42:28 relevant in dist mode */</div><div class='add'>+</div><div class='add'>+	/* Only base bits 42:28 relevant in dist mode */</div><div class='ctx'> 	gru_dist_base = gru.v &amp; 0x000007fff0000000UL;</div><div class='ctx'> 	if (!gru_dist_base) {</div><div class='ctx'> 		pr_info("UV: Map GRU_DIST base address NULL\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	bytes = 1UL &lt;&lt; UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT;</div><div class='ctx'> 	gru_dist_lmask = ((1UL &lt;&lt; uv_hub_info-&gt;m_val) - 1) &amp; ~(bytes - 1);</div><div class='ctx'> 	gru_dist_umask = ~((1UL &lt;&lt; uv_hub_info-&gt;m_val) - 1);</div><div class='ctx'> 	gru_dist_base &amp;= gru_dist_lmask; /* Clear bits above M */</div><div class='add'>+</div><div class='ctx'> 	for_each_online_node(nid) {</div><div class='ctx'> 		paddr = ((u64)uv_node_to_pnode(nid) &lt;&lt; uv_hub_info-&gt;m_val) |</div><div class='ctx'> 				gru_dist_base;</div><div class='hunk'>@@ -695,11 +723,12 @@ static __init void map_gru_distributed(unsigned long c)</div><div class='ctx'> 		gru_first_node_paddr = min(paddr, gru_first_node_paddr);</div><div class='ctx'> 		gru_last_node_paddr = max(paddr, gru_last_node_paddr);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* Save upper (63:M) bits of address only for is_GRU_range */</div><div class='ctx'> 	gru_first_node_paddr &amp;= gru_dist_umask;</div><div class='ctx'> 	gru_last_node_paddr &amp;= gru_dist_umask;</div><div class='del'>-	pr_debug("UV: Map GRU_DIST base 0x%016llx  0x%016llx - 0x%016llx\n",</div><div class='del'>-		gru_dist_base, gru_first_node_paddr, gru_last_node_paddr);</div><div class='add'>+</div><div class='add'>+	pr_debug("UV: Map GRU_DIST base 0x%016llx  0x%016llx - 0x%016llx\n", gru_dist_base, gru_first_node_paddr, gru_last_node_paddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init void map_gru_high(int max_pnode)</div><div class='hunk'>@@ -719,6 +748,7 @@ static __init void map_gru_high(int max_pnode)</div><div class='ctx'> 		map_gru_distributed(gru.v);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	base = (gru.v &amp; mask) &gt;&gt; shift;</div><div class='ctx'> 	map_high("GRU", base, shift, shift, max_pnode, map_wb);</div><div class='ctx'> 	gru_start_paddr = ((u64)base &lt;&lt; shift);</div><div class='hunk'>@@ -772,8 +802,8 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)</div><div class='ctx'> </div><div class='ctx'> 	id = mmiohs[index].id;</div><div class='ctx'> 	overlay.v = uv_read_local_mmr(mmiohs[index].overlay);</div><div class='del'>-	pr_info("UV: %s overlay 0x%lx base:0x%x m_io:%d\n",</div><div class='del'>-		id, overlay.v, overlay.s3.base, overlay.s3.m_io);</div><div class='add'>+</div><div class='add'>+	pr_info("UV: %s overlay 0x%lx base:0x%x m_io:%d\n", id, overlay.v, overlay.s3.base, overlay.s3.m_io);</div><div class='ctx'> 	if (!overlay.s3.enable) {</div><div class='ctx'> 		pr_info("UV: %s disabled\n", id);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -784,7 +814,8 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)</div><div class='ctx'> 	m_io = overlay.s3.m_io;</div><div class='ctx'> 	mmr = mmiohs[index].redirect;</div><div class='ctx'> 	n = UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH;</div><div class='del'>-	min_pnode *= 2;				/* convert to NASID */</div><div class='add'>+	/* Convert to NASID: */</div><div class='add'>+	min_pnode *= 2;</div><div class='ctx'> 	max_pnode *= 2;</div><div class='ctx'> 	max_io = lnasid = fi = li = -1;</div><div class='ctx'> </div><div class='hunk'>@@ -793,16 +824,18 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)</div><div class='ctx'> </div><div class='ctx'> 		redirect.v = uv_read_local_mmr(mmr + i * 8);</div><div class='ctx'> 		nasid = redirect.s3.nasid;</div><div class='add'>+		/* Invalid NASID: */</div><div class='ctx'> 		if (nasid &lt; min_pnode || max_pnode &lt; nasid)</div><div class='del'>-			nasid = -1;		/* invalid NASID */</div><div class='add'>+			nasid = -1;</div><div class='ctx'> </div><div class='ctx'> 		if (nasid == lnasid) {</div><div class='ctx'> 			li = i;</div><div class='del'>-			if (i != n-1)		/* last entry check */</div><div class='add'>+			/* Last entry check: */</div><div class='add'>+			if (i != n-1)</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* check if we have a cached (or last) redirect to print */</div><div class='add'>+		/* Check if we have a cached (or last) redirect to print: */</div><div class='ctx'> 		if (lnasid != -1 || (i == n-1 &amp;&amp; nasid != -1))  {</div><div class='ctx'> 			unsigned long addr1, addr2;</div><div class='ctx'> 			int f, l;</div><div class='hunk'>@@ -814,12 +847,9 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)</div><div class='ctx'> 				f = fi;</div><div class='ctx'> 				l = li;</div><div class='ctx'> 			}</div><div class='del'>-			addr1 = (base &lt;&lt; shift) +</div><div class='del'>-				f * (1ULL &lt;&lt; m_io);</div><div class='del'>-			addr2 = (base &lt;&lt; shift) +</div><div class='del'>-				(l + 1) * (1ULL &lt;&lt; m_io);</div><div class='del'>-			pr_info("UV: %s[%03d..%03d] NASID 0x%04x ADDR 0x%016lx - 0x%016lx\n",</div><div class='del'>-				id, fi, li, lnasid, addr1, addr2);</div><div class='add'>+			addr1 = (base &lt;&lt; shift) + f * (1ULL &lt;&lt; m_io);</div><div class='add'>+			addr2 = (base &lt;&lt; shift) + (l + 1) * (1ULL &lt;&lt; m_io);</div><div class='add'>+			pr_info("UV: %s[%03d..%03d] NASID 0x%04x ADDR 0x%016lx - 0x%016lx\n", id, fi, li, lnasid, addr1, addr2);</div><div class='ctx'> 			if (max_io &lt; l)</div><div class='ctx'> 				max_io = l;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -827,8 +857,7 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)</div><div class='ctx'> 		lnasid = nasid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_info("UV: %s base:0x%lx shift:%d M_IO:%d MAX_IO:%d\n",</div><div class='del'>-		id, base, shift, m_io, max_io);</div><div class='add'>+	pr_info("UV: %s base:0x%lx shift:%d M_IO:%d MAX_IO:%d\n", id, base, shift, m_io, max_io);</div><div class='ctx'> </div><div class='ctx'> 	if (max_io &gt;= 0)</div><div class='ctx'> 		map_high(id, base, shift, m_io, max_io, map_uc);</div><div class='hunk'>@@ -841,36 +870,35 @@ static __init void map_mmioh_high(int min_pnode, int max_pnode)</div><div class='ctx'> 	int shift, enable, m_io, n_io;</div><div class='ctx'> </div><div class='ctx'> 	if (is_uv3_hub() || is_uv4_hub()) {</div><div class='del'>-		/* Map both MMIOH Regions */</div><div class='add'>+		/* Map both MMIOH regions: */</div><div class='ctx'> 		map_mmioh_high_uv3(0, min_pnode, max_pnode);</div><div class='ctx'> 		map_mmioh_high_uv3(1, min_pnode, max_pnode);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_uv1_hub()) {</div><div class='del'>-		mmr = UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR;</div><div class='del'>-		shift = UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT;</div><div class='del'>-		mmioh.v = uv_read_local_mmr(mmr);</div><div class='del'>-		enable = !!mmioh.s1.enable;</div><div class='del'>-		base = mmioh.s1.base;</div><div class='del'>-		m_io = mmioh.s1.m_io;</div><div class='del'>-		n_io = mmioh.s1.n_io;</div><div class='add'>+		mmr	= UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR;</div><div class='add'>+		shift	= UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT;</div><div class='add'>+		mmioh.v	= uv_read_local_mmr(mmr);</div><div class='add'>+		enable	= !!mmioh.s1.enable;</div><div class='add'>+		base	= mmioh.s1.base;</div><div class='add'>+		m_io	= mmioh.s1.m_io;</div><div class='add'>+		n_io	= mmioh.s1.n_io;</div><div class='ctx'> 	} else if (is_uv2_hub()) {</div><div class='del'>-		mmr = UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR;</div><div class='del'>-		shift = UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT;</div><div class='del'>-		mmioh.v = uv_read_local_mmr(mmr);</div><div class='del'>-		enable = !!mmioh.s2.enable;</div><div class='del'>-		base = mmioh.s2.base;</div><div class='del'>-		m_io = mmioh.s2.m_io;</div><div class='del'>-		n_io = mmioh.s2.n_io;</div><div class='del'>-	} else</div><div class='add'>+		mmr	= UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR;</div><div class='add'>+		shift	= UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT;</div><div class='add'>+		mmioh.v	= uv_read_local_mmr(mmr);</div><div class='add'>+		enable	= !!mmioh.s2.enable;</div><div class='add'>+		base	= mmioh.s2.base;</div><div class='add'>+		m_io	= mmioh.s2.m_io;</div><div class='add'>+		n_io	= mmioh.s2.n_io;</div><div class='add'>+	} else {</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (enable) {</div><div class='ctx'> 		max_pnode &amp;= (1 &lt;&lt; n_io) - 1;</div><div class='del'>-		pr_info(</div><div class='del'>-		    "UV: base:0x%lx shift:%d N_IO:%d M_IO:%d max_pnode:0x%x\n",</div><div class='del'>-			base, shift, m_io, n_io, max_pnode);</div><div class='add'>+		pr_info("UV: base:0x%lx shift:%d N_IO:%d M_IO:%d max_pnode:0x%x\n", base, shift, m_io, n_io, max_pnode);</div><div class='ctx'> 		map_high("MMIOH", base, shift, m_io, max_pnode, map_uc);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_info("UV: MMIOH disabled\n");</div><div class='hunk'>@@ -888,16 +916,16 @@ static __init void uv_rtc_init(void)</div><div class='ctx'> 	long status;</div><div class='ctx'> 	u64 ticks_per_sec;</div><div class='ctx'> </div><div class='del'>-	status = uv_bios_freq_base(BIOS_FREQ_BASE_REALTIME_CLOCK,</div><div class='del'>-					&amp;ticks_per_sec);</div><div class='add'>+	status = uv_bios_freq_base(BIOS_FREQ_BASE_REALTIME_CLOCK, &amp;ticks_per_sec);</div><div class='add'>+</div><div class='ctx'> 	if (status != BIOS_STATUS_SUCCESS || ticks_per_sec &lt; 100000) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-			"unable to determine platform RTC clock frequency, "</div><div class='del'>-			"guessing.\n");</div><div class='del'>-		/* BIOS gives wrong value for clock freq. so guess */</div><div class='add'>+		pr_warn("UV: unable to determine platform RTC clock frequency, guessing.\n");</div><div class='add'>+</div><div class='add'>+		/* BIOS gives wrong value for clock frequency, so guess: */</div><div class='ctx'> 		sn_rtc_cycles_per_second = 1000000000000UL / 30000UL;</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		sn_rtc_cycles_per_second = ticks_per_sec;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -908,19 +936,19 @@ static void uv_heartbeat(unsigned long ignored)</div><div class='ctx'> 	struct timer_list *timer = &amp;uv_scir_info-&gt;timer;</div><div class='ctx'> 	unsigned char bits = uv_scir_info-&gt;state;</div><div class='ctx'> </div><div class='del'>-	/* flip heartbeat bit */</div><div class='add'>+	/* Flip heartbeat bit: */</div><div class='ctx'> 	bits ^= SCIR_CPU_HEARTBEAT;</div><div class='ctx'> </div><div class='del'>-	/* is this cpu idle? */</div><div class='add'>+	/* Is this CPU idle? */</div><div class='ctx'> 	if (idle_cpu(raw_smp_processor_id()))</div><div class='ctx'> 		bits &amp;= ~SCIR_CPU_ACTIVITY;</div><div class='ctx'> 	else</div><div class='ctx'> 		bits |= SCIR_CPU_ACTIVITY;</div><div class='ctx'> </div><div class='del'>-	/* update system controller interface reg */</div><div class='add'>+	/* Update system controller interface reg: */</div><div class='ctx'> 	uv_set_scir_bits(bits);</div><div class='ctx'> </div><div class='del'>-	/* enable next timer period */</div><div class='add'>+	/* Enable next timer period: */</div><div class='ctx'> 	mod_timer(timer, jiffies + SCIR_CPU_HB_INTERVAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -935,7 +963,7 @@ static int uv_heartbeat_enable(unsigned int cpu)</div><div class='ctx'> 		add_timer_on(timer, cpu);</div><div class='ctx'> 		uv_cpu_scir_info(cpu)-&gt;enabled = 1;</div><div class='ctx'> </div><div class='del'>-		/* also ensure that boot cpu is enabled */</div><div class='add'>+		/* Also ensure that boot CPU is enabled: */</div><div class='ctx'> 		cpu = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -968,9 +996,11 @@ static __init int uv_init_heartbeat(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='del'>-	if (is_uv_system())</div><div class='add'>+	if (is_uv_system()) {</div><div class='ctx'> 		for_each_online_cpu(cpu)</div><div class='ctx'> 			uv_heartbeat_enable(cpu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -979,14 +1009,10 @@ late_initcall(uv_init_heartbeat);</div><div class='ctx'> #endif /* !CONFIG_HOTPLUG_CPU */</div><div class='ctx'> </div><div class='ctx'> /* Direct Legacy VGA I/O traffic to designated IOH */</div><div class='del'>-int uv_set_vga_state(struct pci_dev *pdev, bool decode,</div><div class='del'>-		      unsigned int command_bits, u32 flags)</div><div class='add'>+int uv_set_vga_state(struct pci_dev *pdev, bool decode, unsigned int command_bits, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	int domain, bus, rc;</div><div class='ctx'> </div><div class='del'>-	PR_DEVEL("devfn %x decode %d cmd %x flags %d\n",</div><div class='del'>-			pdev-&gt;devfn, decode, command_bits, flags);</div><div class='del'>-</div><div class='ctx'> 	if (!(flags &amp; PCI_VGA_STATE_CHANGE_BRIDGE))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -997,13 +1023,12 @@ int uv_set_vga_state(struct pci_dev *pdev, bool decode,</div><div class='ctx'> 	bus = pdev-&gt;bus-&gt;number;</div><div class='ctx'> </div><div class='ctx'> 	rc = uv_bios_set_legacy_vga_target(decode, domain, bus);</div><div class='del'>-	PR_DEVEL("vga decode %d %x:%x, rc: %d\n", decode, domain, bus, rc);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Called on each cpu to initialize the per_cpu UV data area.</div><div class='add'>+ * Called on each CPU to initialize the per_cpu UV data area.</div><div class='ctx'>  * FIXME: hotplug not supported yet</div><div class='ctx'>  */</div><div class='ctx'> void uv_cpu_init(void)</div><div class='hunk'>@@ -1030,90 +1055,79 @@ static void get_mn(struct mn *mnp)</div><div class='ctx'> 	union uvh_rh_gam_config_mmr_u m_n_config;</div><div class='ctx'> 	union uv3h_gr0_gam_gr_config_u m_gr_config;</div><div class='ctx'> </div><div class='del'>-	m_n_config.v = uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR);</div><div class='del'>-	mnp-&gt;n_val = m_n_config.s.n_skt;</div><div class='add'>+	/* Make sure the whole structure is well initialized: */</div><div class='add'>+	memset(mnp, 0, sizeof(*mnp));</div><div class='add'>+</div><div class='add'>+	m_n_config.v	= uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR);</div><div class='add'>+	mnp-&gt;n_val	= m_n_config.s.n_skt;</div><div class='add'>+</div><div class='ctx'> 	if (is_uv4_hub()) {</div><div class='del'>-		mnp-&gt;m_val = 0;</div><div class='del'>-		mnp-&gt;n_lshift = 0;</div><div class='add'>+		mnp-&gt;m_val	= 0;</div><div class='add'>+		mnp-&gt;n_lshift	= 0;</div><div class='ctx'> 	} else if (is_uv3_hub()) {</div><div class='del'>-		mnp-&gt;m_val = m_n_config.s3.m_skt;</div><div class='del'>-		m_gr_config.v = uv_read_local_mmr(UV3H_GR0_GAM_GR_CONFIG);</div><div class='del'>-		mnp-&gt;n_lshift = m_gr_config.s3.m_skt;</div><div class='add'>+		mnp-&gt;m_val	= m_n_config.s3.m_skt;</div><div class='add'>+		m_gr_config.v	= uv_read_local_mmr(UV3H_GR0_GAM_GR_CONFIG);</div><div class='add'>+		mnp-&gt;n_lshift	= m_gr_config.s3.m_skt;</div><div class='ctx'> 	} else if (is_uv2_hub()) {</div><div class='del'>-		mnp-&gt;m_val = m_n_config.s2.m_skt;</div><div class='del'>-		mnp-&gt;n_lshift = mnp-&gt;m_val == 40 ? 40 : 39;</div><div class='add'>+		mnp-&gt;m_val	= m_n_config.s2.m_skt;</div><div class='add'>+		mnp-&gt;n_lshift	= mnp-&gt;m_val == 40 ? 40 : 39;</div><div class='ctx'> 	} else if (is_uv1_hub()) {</div><div class='del'>-		mnp-&gt;m_val = m_n_config.s1.m_skt;</div><div class='del'>-		mnp-&gt;n_lshift = mnp-&gt;m_val;</div><div class='add'>+		mnp-&gt;m_val	= m_n_config.s1.m_skt;</div><div class='add'>+		mnp-&gt;n_lshift	= mnp-&gt;m_val;</div><div class='ctx'> 	}</div><div class='ctx'> 	mnp-&gt;m_shift = mnp-&gt;m_val ? 64 - mnp-&gt;m_val : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init uv_init_hub_info(struct uv_hub_info_s *hub_info)</div><div class='add'>+void __init uv_init_hub_info(struct uv_hub_info_s *hi)</div><div class='ctx'> {</div><div class='del'>-	struct mn mn = {0};	/* avoid unitialized warnings */</div><div class='ctx'> 	union uvh_node_id_u node_id;</div><div class='add'>+	struct mn mn;</div><div class='ctx'> </div><div class='ctx'> 	get_mn(&amp;mn);</div><div class='del'>-	hub_info-&gt;m_val = mn.m_val;</div><div class='del'>-	hub_info-&gt;n_val = mn.n_val;</div><div class='del'>-	hub_info-&gt;m_shift = mn.m_shift;</div><div class='del'>-	hub_info-&gt;n_lshift = mn.n_lshift ? mn.n_lshift : 0;</div><div class='del'>-</div><div class='del'>-	hub_info-&gt;hub_revision = uv_hub_info-&gt;hub_revision;</div><div class='del'>-	hub_info-&gt;pnode_mask = uv_cpuid.pnode_mask;</div><div class='del'>-	hub_info-&gt;min_pnode = _min_pnode;</div><div class='del'>-	hub_info-&gt;min_socket = _min_socket;</div><div class='del'>-	hub_info-&gt;pnode_to_socket = _pnode_to_socket;</div><div class='del'>-	hub_info-&gt;socket_to_node = _socket_to_node;</div><div class='del'>-	hub_info-&gt;socket_to_pnode = _socket_to_pnode;</div><div class='del'>-	hub_info-&gt;gr_table_len = _gr_table_len;</div><div class='del'>-	hub_info-&gt;gr_table = _gr_table;</div><div class='del'>-	hub_info-&gt;gpa_mask = mn.m_val ?</div><div class='add'>+	hi-&gt;gpa_mask = mn.m_val ?</div><div class='ctx'> 		(1UL &lt;&lt; (mn.m_val + mn.n_val)) - 1 :</div><div class='ctx'> 		(1UL &lt;&lt; uv_cpuid.gpa_shift) - 1;</div><div class='ctx'> </div><div class='del'>-	node_id.v = uv_read_local_mmr(UVH_NODE_ID);</div><div class='del'>-	hub_info-&gt;gnode_extra =</div><div class='del'>-		(node_id.s.node_id &amp; ~((1 &lt;&lt; mn.n_val) - 1)) &gt;&gt; 1;</div><div class='del'>-</div><div class='del'>-	hub_info-&gt;gnode_upper =</div><div class='del'>-		((unsigned long)hub_info-&gt;gnode_extra &lt;&lt; mn.m_val);</div><div class='add'>+	hi-&gt;m_val		= mn.m_val;</div><div class='add'>+	hi-&gt;n_val		= mn.n_val;</div><div class='add'>+	hi-&gt;m_shift		= mn.m_shift;</div><div class='add'>+	hi-&gt;n_lshift		= mn.n_lshift ? mn.n_lshift : 0;</div><div class='add'>+	hi-&gt;hub_revision	= uv_hub_info-&gt;hub_revision;</div><div class='add'>+	hi-&gt;pnode_mask		= uv_cpuid.pnode_mask;</div><div class='add'>+	hi-&gt;min_pnode		= _min_pnode;</div><div class='add'>+	hi-&gt;min_socket		= _min_socket;</div><div class='add'>+	hi-&gt;pnode_to_socket	= _pnode_to_socket;</div><div class='add'>+	hi-&gt;socket_to_node	= _socket_to_node;</div><div class='add'>+	hi-&gt;socket_to_pnode	= _socket_to_pnode;</div><div class='add'>+	hi-&gt;gr_table_len	= _gr_table_len;</div><div class='add'>+	hi-&gt;gr_table		= _gr_table;</div><div class='add'>+</div><div class='add'>+	node_id.v		= uv_read_local_mmr(UVH_NODE_ID);</div><div class='add'>+	uv_cpuid.gnode_shift	= max_t(unsigned int, uv_cpuid.gnode_shift, mn.n_val);</div><div class='add'>+	hi-&gt;gnode_extra		= (node_id.s.node_id &amp; ~((1 &lt;&lt; uv_cpuid.gnode_shift) - 1)) &gt;&gt; 1;</div><div class='add'>+	hi-&gt;gnode_upper		= (unsigned long)hi-&gt;gnode_extra &lt;&lt; mn.m_val;</div><div class='ctx'> </div><div class='ctx'> 	if (uv_gp_table) {</div><div class='del'>-		hub_info-&gt;global_mmr_base = uv_gp_table-&gt;mmr_base;</div><div class='del'>-		hub_info-&gt;global_mmr_shift = uv_gp_table-&gt;mmr_shift;</div><div class='del'>-		hub_info-&gt;global_gru_base = uv_gp_table-&gt;gru_base;</div><div class='del'>-		hub_info-&gt;global_gru_shift = uv_gp_table-&gt;gru_shift;</div><div class='del'>-		hub_info-&gt;gpa_shift = uv_gp_table-&gt;gpa_shift;</div><div class='del'>-		hub_info-&gt;gpa_mask = (1UL &lt;&lt; hub_info-&gt;gpa_shift) - 1;</div><div class='add'>+		hi-&gt;global_mmr_base	= uv_gp_table-&gt;mmr_base;</div><div class='add'>+		hi-&gt;global_mmr_shift	= uv_gp_table-&gt;mmr_shift;</div><div class='add'>+		hi-&gt;global_gru_base	= uv_gp_table-&gt;gru_base;</div><div class='add'>+		hi-&gt;global_gru_shift	= uv_gp_table-&gt;gru_shift;</div><div class='add'>+		hi-&gt;gpa_shift		= uv_gp_table-&gt;gpa_shift;</div><div class='add'>+		hi-&gt;gpa_mask		= (1UL &lt;&lt; hi-&gt;gpa_shift) - 1;</div><div class='ctx'> 	} else {</div><div class='del'>-		hub_info-&gt;global_mmr_base =</div><div class='del'>-			uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR) &amp;</div><div class='del'>-					~UV_MMR_ENABLE;</div><div class='del'>-		hub_info-&gt;global_mmr_shift = _UV_GLOBAL_MMR64_PNODE_SHIFT;</div><div class='add'>+		hi-&gt;global_mmr_base	= uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR) &amp; ~UV_MMR_ENABLE;</div><div class='add'>+		hi-&gt;global_mmr_shift	= _UV_GLOBAL_MMR64_PNODE_SHIFT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	get_lowmem_redirect(</div><div class='del'>-		&amp;hub_info-&gt;lowmem_remap_base, &amp;hub_info-&gt;lowmem_remap_top);</div><div class='del'>-</div><div class='del'>-	hub_info-&gt;apic_pnode_shift = uv_cpuid.socketid_shift;</div><div class='del'>-</div><div class='del'>-	/* show system specific info */</div><div class='del'>-	pr_info("UV: N:%d M:%d m_shift:%d n_lshift:%d\n",</div><div class='del'>-		hub_info-&gt;n_val, hub_info-&gt;m_val,</div><div class='del'>-		hub_info-&gt;m_shift, hub_info-&gt;n_lshift);</div><div class='del'>-</div><div class='del'>-	pr_info("UV: gpa_mask/shift:0x%lx/%d pnode_mask:0x%x apic_pns:%d\n",</div><div class='del'>-		hub_info-&gt;gpa_mask, hub_info-&gt;gpa_shift,</div><div class='del'>-		hub_info-&gt;pnode_mask, hub_info-&gt;apic_pnode_shift);</div><div class='add'>+	get_lowmem_redirect(&amp;hi-&gt;lowmem_remap_base, &amp;hi-&gt;lowmem_remap_top);</div><div class='ctx'> </div><div class='del'>-	pr_info("UV: mmr_base/shift:0x%lx/%ld gru_base/shift:0x%lx/%ld\n",</div><div class='del'>-		hub_info-&gt;global_mmr_base, hub_info-&gt;global_mmr_shift,</div><div class='del'>-		hub_info-&gt;global_gru_base, hub_info-&gt;global_gru_shift);</div><div class='add'>+	hi-&gt;apic_pnode_shift = uv_cpuid.socketid_shift;</div><div class='ctx'> </div><div class='del'>-	pr_info("UV: gnode_upper:0x%lx gnode_extra:0x%x\n",</div><div class='del'>-		hub_info-&gt;gnode_upper, hub_info-&gt;gnode_extra);</div><div class='add'>+	/* Show system specific info: */</div><div class='add'>+	pr_info("UV: N:%d M:%d m_shift:%d n_lshift:%d\n", hi-&gt;n_val, hi-&gt;m_val, hi-&gt;m_shift, hi-&gt;n_lshift);</div><div class='add'>+	pr_info("UV: gpa_mask/shift:0x%lx/%d pnode_mask:0x%x apic_pns:%d\n", hi-&gt;gpa_mask, hi-&gt;gpa_shift, hi-&gt;pnode_mask, hi-&gt;apic_pnode_shift);</div><div class='add'>+	pr_info("UV: mmr_base/shift:0x%lx/%ld gru_base/shift:0x%lx/%ld\n", hi-&gt;global_mmr_base, hi-&gt;global_mmr_shift, hi-&gt;global_gru_base, hi-&gt;global_gru_shift);</div><div class='add'>+	pr_info("UV: gnode_upper:0x%lx gnode_extra:0x%x\n", hi-&gt;gnode_upper, hi-&gt;gnode_extra);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init decode_gam_params(unsigned long ptr)</div><div class='hunk'>@@ -1139,12 +1153,9 @@ static void __init decode_gam_rng_tbl(unsigned long ptr)</div><div class='ctx'> 	for (; gre-&gt;type != UV_GAM_RANGE_TYPE_UNUSED; gre++) {</div><div class='ctx'> 		if (!index) {</div><div class='ctx'> 			pr_info("UV: GAM Range Table...\n");</div><div class='del'>-			pr_info("UV:  # %20s %14s %5s %4s %5s %3s %2s\n",</div><div class='del'>-				"Range", "", "Size", "Type", "NASID",</div><div class='del'>-				"SID", "PN");</div><div class='add'>+			pr_info("UV:  # %20s %14s %5s %4s %5s %3s %2s\n", "Range", "", "Size", "Type", "NASID", "SID", "PN");</div><div class='ctx'> 		}</div><div class='del'>-		pr_info(</div><div class='del'>-		"UV: %2d: 0x%014lx-0x%014lx %5luG %3d   %04x  %02x %02x\n",</div><div class='add'>+		pr_info("UV: %2d: 0x%014lx-0x%014lx %5luG %3d   %04x  %02x %02x\n",</div><div class='ctx'> 			index++,</div><div class='ctx'> 			(unsigned long)lgre &lt;&lt; UV_GAM_RANGE_SHFT,</div><div class='ctx'> 			(unsigned long)gre-&gt;limit &lt;&lt; UV_GAM_RANGE_SHFT,</div><div class='hunk'>@@ -1162,29 +1173,32 @@ static void __init decode_gam_rng_tbl(unsigned long ptr)</div><div class='ctx'> 		if (pnode_max &lt; gre-&gt;pnode)</div><div class='ctx'> 			pnode_max = gre-&gt;pnode;</div><div class='ctx'> 	}</div><div class='del'>-	_min_socket = sock_min;</div><div class='del'>-	_max_socket = sock_max;</div><div class='del'>-	_min_pnode = pnode_min;</div><div class='del'>-	_max_pnode = pnode_max;</div><div class='del'>-	_gr_table_len = index;</div><div class='del'>-	pr_info(</div><div class='del'>-	"UV: GRT: %d entries, sockets(min:%x,max:%x) pnodes(min:%x,max:%x)\n",</div><div class='del'>-		index, _min_socket, _max_socket, _min_pnode, _max_pnode);</div><div class='add'>+	_min_socket	= sock_min;</div><div class='add'>+	_max_socket	= sock_max;</div><div class='add'>+	_min_pnode	= pnode_min;</div><div class='add'>+	_max_pnode	= pnode_max;</div><div class='add'>+	_gr_table_len	= index;</div><div class='add'>+</div><div class='add'>+	pr_info("UV: GRT: %d entries, sockets(min:%x,max:%x) pnodes(min:%x,max:%x)\n", index, _min_socket, _max_socket, _min_pnode, _max_pnode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init decode_uv_systab(void)</div><div class='add'>+static int __init decode_uv_systab(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct uv_systab *st;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (uv_hub_info-&gt;hub_revision &lt; UV4_HUB_REVISION_BASE)</div><div class='add'>+		return 0;	/* No extended UVsystab required */</div><div class='add'>+</div><div class='ctx'> 	st = uv_systab;</div><div class='del'>-	if ((!st || st-&gt;revision &lt; UV_SYSTAB_VERSION_UV4) &amp;&amp; !is_uv4_hub())</div><div class='del'>-		return;</div><div class='del'>-	if (st-&gt;revision != UV_SYSTAB_VERSION_UV4_LATEST) {</div><div class='del'>-		pr_crit(</div><div class='del'>-		"UV: BIOS UVsystab version(%x) mismatch, expecting(%x)\n",</div><div class='del'>-			st-&gt;revision, UV_SYSTAB_VERSION_UV4_LATEST);</div><div class='del'>-		BUG();</div><div class='add'>+	if ((!st) || (st-&gt;revision &lt; UV_SYSTAB_VERSION_UV4_LATEST)) {</div><div class='add'>+		int rev = st ? st-&gt;revision : 0;</div><div class='add'>+</div><div class='add'>+		pr_err("UV: BIOS UVsystab version(%x) mismatch, expecting(%x)\n", rev, UV_SYSTAB_VERSION_UV4_LATEST);</div><div class='add'>+		pr_err("UV: Cannot support UV operations, switching to generic PC\n");</div><div class='add'>+		uv_system_type = UV_NONE;</div><div class='add'>+</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; st-&gt;entry[i].type != UV_SYSTAB_TYPE_UNUSED; i++) {</div><div class='hunk'>@@ -1205,10 +1219,11 @@ static void __init decode_uv_systab(void)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Setup physical blade translations from UVH_NODE_PRESENT_TABLE</div><div class='add'>+ * Set up physical blade translations from UVH_NODE_PRESENT_TABLE</div><div class='ctx'>  * .. NB: UVH_NODE_PRESENT_TABLE is going away,</div><div class='ctx'>  * .. being replaced by GAM Range Table</div><div class='ctx'>  */</div><div class='hunk'>@@ -1244,14 +1259,13 @@ static void __init build_socket_tables(void)</div><div class='ctx'> 	if (!gre) {</div><div class='ctx'> 		if (is_uv1_hub() || is_uv2_hub() || is_uv3_hub()) {</div><div class='ctx'> 			pr_info("UV: No UVsystab socket table, ignoring\n");</div><div class='del'>-			return;		/* not required */</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='del'>-		pr_crit(</div><div class='del'>-		"UV: Error: UVsystab address translations not available!\n");</div><div class='add'>+		pr_crit("UV: Error: UVsystab address translations not available!\n");</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* build socket id -&gt; node id, pnode */</div><div class='add'>+	/* Build socket id -&gt; node id, pnode */</div><div class='ctx'> 	num = maxsock - minsock + 1;</div><div class='ctx'> 	bytes = num * sizeof(_socket_to_node[0]);</div><div class='ctx'> 	_socket_to_node = kmalloc(bytes, GFP_KERNEL);</div><div class='hunk'>@@ -1268,27 +1282,27 @@ static void __init build_socket_tables(void)</div><div class='ctx'> 	for (i = 0; i &lt; nump; i++)</div><div class='ctx'> 		_pnode_to_socket[i] = SOCK_EMPTY;</div><div class='ctx'> </div><div class='del'>-	/* fill in pnode/node/addr conversion list values */</div><div class='add'>+	/* Fill in pnode/node/addr conversion list values: */</div><div class='ctx'> 	pr_info("UV: GAM Building socket/pnode conversion tables\n");</div><div class='ctx'> 	for (; gre-&gt;type != UV_GAM_RANGE_TYPE_UNUSED; gre++) {</div><div class='ctx'> 		if (gre-&gt;type == UV_GAM_RANGE_TYPE_HOLE)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		i = gre-&gt;sockid - minsock;</div><div class='add'>+		/* Duplicate: */</div><div class='ctx'> 		if (_socket_to_pnode[i] != SOCK_EMPTY)</div><div class='del'>-			continue;	/* duplicate */</div><div class='add'>+			continue;</div><div class='ctx'> 		_socket_to_pnode[i] = gre-&gt;pnode;</div><div class='ctx'> </div><div class='ctx'> 		i = gre-&gt;pnode - minpnode;</div><div class='ctx'> 		_pnode_to_socket[i] = gre-&gt;sockid;</div><div class='ctx'> </div><div class='del'>-		pr_info(</div><div class='del'>-		"UV: sid:%02x type:%d nasid:%04x pn:%02x pn2s:%2x\n",</div><div class='add'>+		pr_info("UV: sid:%02x type:%d nasid:%04x pn:%02x pn2s:%2x\n",</div><div class='ctx'> 			gre-&gt;sockid, gre-&gt;type, gre-&gt;nasid,</div><div class='ctx'> 			_socket_to_pnode[gre-&gt;sockid - minsock],</div><div class='ctx'> 			_pnode_to_socket[gre-&gt;pnode - minpnode]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Set socket -&gt; node values */</div><div class='add'>+	/* Set socket -&gt; node values: */</div><div class='ctx'> 	lnid = -1;</div><div class='ctx'> 	for_each_present_cpu(cpu) {</div><div class='ctx'> 		int nid = cpu_to_node(cpu);</div><div class='hunk'>@@ -1304,7 +1318,7 @@ static void __init build_socket_tables(void)</div><div class='ctx'> 			sockid, apicid, nid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Setup physical blade to pnode translation from GAM Range Table */</div><div class='add'>+	/* Set up physical blade to pnode translation from GAM Range Table: */</div><div class='ctx'> 	bytes = num_possible_nodes() * sizeof(_node_to_pnode[0]);</div><div class='ctx'> 	_node_to_pnode = kmalloc(bytes, GFP_KERNEL);</div><div class='ctx'> 	BUG_ON(!_node_to_pnode);</div><div class='hunk'>@@ -1314,8 +1328,7 @@ static void __init build_socket_tables(void)</div><div class='ctx'> </div><div class='ctx'> 		for (sockid = minsock; sockid &lt;= maxsock; sockid++) {</div><div class='ctx'> 			if (lnid == _socket_to_node[sockid - minsock]) {</div><div class='del'>-				_node_to_pnode[lnid] =</div><div class='del'>-					_socket_to_pnode[sockid - minsock];</div><div class='add'>+				_node_to_pnode[lnid] = _socket_to_pnode[sockid - minsock];</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1332,8 +1345,7 @@ static void __init build_socket_tables(void)</div><div class='ctx'> 	pr_info("UV: Checking socket-&gt;node/pnode for identity maps\n");</div><div class='ctx'> 	if (minsock == 0) {</div><div class='ctx'> 		for (i = 0; i &lt; num; i++)</div><div class='del'>-			if (_socket_to_node[i] == SOCK_EMPTY ||</div><div class='del'>-				i != _socket_to_node[i])</div><div class='add'>+			if (_socket_to_node[i] == SOCK_EMPTY || i != _socket_to_node[i])</div><div class='ctx'> 				break;</div><div class='ctx'> 		if (i &gt;= num) {</div><div class='ctx'> 			kfree(_socket_to_node);</div><div class='hunk'>@@ -1354,7 +1366,7 @@ static void __init build_socket_tables(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init uv_system_init(void)</div><div class='add'>+static void __init uv_system_init_hub(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct uv_hub_info_s hub_info = {0};</div><div class='ctx'> 	int bytes, cpu, nodeid;</div><div class='hunk'>@@ -1372,8 +1384,13 @@ void __init uv_system_init(void)</div><div class='ctx'> </div><div class='ctx'> 	map_low_mmrs();</div><div class='ctx'> </div><div class='del'>-	uv_bios_init();			/* get uv_systab for decoding */</div><div class='del'>-	decode_uv_systab();</div><div class='add'>+	/* Get uv_systab for decoding: */</div><div class='add'>+	uv_bios_init();</div><div class='add'>+</div><div class='add'>+	/* If there's an UVsystab problem then abort UV init: */</div><div class='add'>+	if (decode_uv_systab() &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	build_socket_tables();</div><div class='ctx'> 	build_uv_gr_table();</div><div class='ctx'> 	uv_init_hub_info(&amp;hub_info);</div><div class='hunk'>@@ -1381,14 +1398,10 @@ void __init uv_system_init(void)</div><div class='ctx'> 	if (!_node_to_pnode)</div><div class='ctx'> 		boot_init_possible_blades(&amp;hub_info);</div><div class='ctx'> </div><div class='del'>-	/* uv_num_possible_blades() is really the hub count */</div><div class='del'>-	pr_info("UV: Found %d hubs, %d nodes, %d cpus\n",</div><div class='del'>-			uv_num_possible_blades(),</div><div class='del'>-			num_possible_nodes(),</div><div class='del'>-			num_possible_cpus());</div><div class='add'>+	/* uv_num_possible_blades() is really the hub count: */</div><div class='add'>+	pr_info("UV: Found %d hubs, %d nodes, %d CPUs\n", uv_num_possible_blades(), num_possible_nodes(), num_possible_cpus());</div><div class='ctx'> </div><div class='del'>-	uv_bios_get_sn_info(0, &amp;uv_type, &amp;sn_partition_id, &amp;sn_coherency_id,</div><div class='del'>-			    &amp;sn_region_size, &amp;system_serial_number);</div><div class='add'>+	uv_bios_get_sn_info(0, &amp;uv_type, &amp;sn_partition_id, &amp;sn_coherency_id, &amp;sn_region_size, &amp;system_serial_number);</div><div class='ctx'> 	hub_info.coherency_domain_number = sn_coherency_id;</div><div class='ctx'> 	uv_rtc_init();</div><div class='ctx'> </div><div class='hunk'>@@ -1401,33 +1414,31 @@ void __init uv_system_init(void)</div><div class='ctx'> 		struct uv_hub_info_s *new_hub;</div><div class='ctx'> </div><div class='ctx'> 		if (__uv_hub_info_list[nodeid]) {</div><div class='del'>-			pr_err("UV: Node %d UV HUB already initialized!?\n",</div><div class='del'>-				nodeid);</div><div class='add'>+			pr_err("UV: Node %d UV HUB already initialized!?\n", nodeid);</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate new per hub info list */</div><div class='del'>-		new_hub = (nodeid == 0) ?</div><div class='del'>-			&amp;uv_hub_info_node0 :</div><div class='del'>-			kzalloc_node(bytes, GFP_KERNEL, nodeid);</div><div class='add'>+		new_hub = (nodeid == 0) ?  &amp;uv_hub_info_node0 : kzalloc_node(bytes, GFP_KERNEL, nodeid);</div><div class='ctx'> 		BUG_ON(!new_hub);</div><div class='ctx'> 		__uv_hub_info_list[nodeid] = new_hub;</div><div class='ctx'> 		new_hub = uv_hub_info_list(nodeid);</div><div class='ctx'> 		BUG_ON(!new_hub);</div><div class='ctx'> 		*new_hub = hub_info;</div><div class='ctx'> </div><div class='del'>-		/* Use information from GAM table if available */</div><div class='add'>+		/* Use information from GAM table if available: */</div><div class='ctx'> 		if (_node_to_pnode)</div><div class='ctx'> 			new_hub-&gt;pnode = _node_to_pnode[nodeid];</div><div class='del'>-		else	/* Fill in during cpu loop */</div><div class='add'>+		else /* Or fill in during CPU loop: */</div><div class='ctx'> 			new_hub-&gt;pnode = 0xffff;</div><div class='add'>+</div><div class='ctx'> 		new_hub-&gt;numa_blade_id = uv_node_to_blade_id(nodeid);</div><div class='ctx'> 		new_hub-&gt;memory_nid = -1;</div><div class='ctx'> 		new_hub-&gt;nr_possible_cpus = 0;</div><div class='ctx'> 		new_hub-&gt;nr_online_cpus = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Initialize per cpu info */</div><div class='add'>+	/* Initialize per CPU info: */</div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		int apicid = per_cpu(x86_cpu_to_apicid, cpu);</div><div class='ctx'> 		int numa_node_id;</div><div class='hunk'>@@ -1438,22 +1449,24 @@ void __init uv_system_init(void)</div><div class='ctx'> 		pnode = uv_apicid_to_pnode(apicid);</div><div class='ctx'> </div><div class='ctx'> 		uv_cpu_info_per(cpu)-&gt;p_uv_hub_info = uv_hub_info_list(nodeid);</div><div class='del'>-		uv_cpu_info_per(cpu)-&gt;blade_cpu_id =</div><div class='del'>-			uv_cpu_hub_info(cpu)-&gt;nr_possible_cpus++;</div><div class='add'>+		uv_cpu_info_per(cpu)-&gt;blade_cpu_id = uv_cpu_hub_info(cpu)-&gt;nr_possible_cpus++;</div><div class='ctx'> 		if (uv_cpu_hub_info(cpu)-&gt;memory_nid == -1)</div><div class='ctx'> 			uv_cpu_hub_info(cpu)-&gt;memory_nid = cpu_to_node(cpu);</div><div class='del'>-		if (nodeid != numa_node_id &amp;&amp;	/* init memoryless node */</div><div class='add'>+</div><div class='add'>+		/* Init memoryless node: */</div><div class='add'>+		if (nodeid != numa_node_id &amp;&amp;</div><div class='ctx'> 		    uv_hub_info_list(numa_node_id)-&gt;pnode == 0xffff)</div><div class='ctx'> 			uv_hub_info_list(numa_node_id)-&gt;pnode = pnode;</div><div class='ctx'> 		else if (uv_cpu_hub_info(cpu)-&gt;pnode == 0xffff)</div><div class='ctx'> 			uv_cpu_hub_info(cpu)-&gt;pnode = pnode;</div><div class='add'>+</div><div class='ctx'> 		uv_cpu_scir_info(cpu)-&gt;offset = uv_scir_offset(apicid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for_each_node(nodeid) {</div><div class='ctx'> 		unsigned short pnode = uv_hub_info_list(nodeid)-&gt;pnode;</div><div class='ctx'> </div><div class='del'>-		/* Add pnode info for pre-GAM list nodes without cpus */</div><div class='add'>+		/* Add pnode info for pre-GAM list nodes without CPUs: */</div><div class='ctx'> 		if (pnode == 0xffff) {</div><div class='ctx'> 			unsigned long paddr;</div><div class='ctx'> </div><div class='hunk'>@@ -1479,15 +1492,30 @@ void __init uv_system_init(void)</div><div class='ctx'> 	uv_scir_register_cpu_notifier();</div><div class='ctx'> 	proc_mkdir("sgi_uv", NULL);</div><div class='ctx'> </div><div class='del'>-	/* register Legacy VGA I/O redirection handler */</div><div class='add'>+	/* Register Legacy VGA I/O redirection handler: */</div><div class='ctx'> 	pci_register_set_vga_state(uv_set_vga_state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For a kdump kernel the reset must be BOOT_ACPI, not BOOT_EFI, as</div><div class='del'>-	 * EFI is not enabled in the kdump kernel.</div><div class='add'>+	 * EFI is not enabled in the kdump kernel:</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (is_kdump_kernel())</div><div class='ctx'> 		reboot_type = BOOT_ACPI;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * There is a small amount of UV specific code needed to initialize a</div><div class='add'>+ * UV system that does not have a "UV HUB" (referred to as "hubless").</div><div class='add'>+ */</div><div class='add'>+void __init uv_system_init(void)</div><div class='add'>+{</div><div class='add'>+	if (likely(!is_uv_system() &amp;&amp; !is_uv_hubless()))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (is_uv_system())</div><div class='add'>+		uv_system_init_hub();</div><div class='add'>+	else</div><div class='add'>+		uv_nmi_setup_hubless();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> apic_driver(apic_x2apic_uv_x);</div><div class='head'>diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c<br/>index 51287cd90bf6..5a414545e8a3 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/apm_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/apm_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/apm_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/apm_32.c</a></div><div class='hunk'>@@ -218,7 +218,8 @@</div><div class='ctx'> #include &lt;linux/apm_bios.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/cputime.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -234,7 +235,7 @@</div><div class='ctx'> #include &lt;linux/i8253.h&gt;</div><div class='ctx'> #include &lt;linux/cpuidle.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/olpc.h&gt;</div><div class='ctx'> #include &lt;asm/paravirt.h&gt;</div><div class='hunk'>@@ -905,21 +906,21 @@ static int apm_cpu_idle(struct cpuidle_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	static int use_apm_idle; /* = 0 */</div><div class='ctx'> 	static unsigned int last_jiffies; /* = 0 */</div><div class='del'>-	static unsigned int last_stime; /* = 0 */</div><div class='del'>-	cputime_t stime;</div><div class='add'>+	static u64 last_stime; /* = 0 */</div><div class='add'>+	u64 stime, utime;</div><div class='ctx'> </div><div class='ctx'> 	int apm_idle_done = 0;</div><div class='ctx'> 	unsigned int jiffies_since_last_check = jiffies - last_jiffies;</div><div class='ctx'> 	unsigned int bucket;</div><div class='ctx'> </div><div class='ctx'> recalc:</div><div class='del'>-	task_cputime(current, NULL, &amp;stime);</div><div class='add'>+	task_cputime(current, &amp;utime, &amp;stime);</div><div class='ctx'> 	if (jiffies_since_last_check &gt; IDLE_CALC_LIMIT) {</div><div class='ctx'> 		use_apm_idle = 0;</div><div class='ctx'> 	} else if (jiffies_since_last_check &gt; idle_period) {</div><div class='ctx'> 		unsigned int idle_percentage;</div><div class='ctx'> </div><div class='del'>-		idle_percentage = cputime_to_jiffies(stime - last_stime);</div><div class='add'>+		idle_percentage = nsecs_to_jiffies(stime - last_stime);</div><div class='ctx'> 		idle_percentage *= 100;</div><div class='ctx'> 		idle_percentage /= jiffies_since_last_check;</div><div class='ctx'> 		use_apm_idle = (idle_percentage &gt; idle_threshold);</div><div class='head'>diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c<br/>index c62e015b126c..de827d6ac8c2 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/asm-offsets.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/asm-offsets.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -81,6 +81,7 @@ void common(void) {</div><div class='ctx'> </div><div class='ctx'> 	BLANK();</div><div class='ctx'> 	OFFSET(BP_scratch, boot_params, scratch);</div><div class='add'>+	OFFSET(BP_secure_boot, boot_params, secure_boot);</div><div class='ctx'> 	OFFSET(BP_loadflags, boot_params, hdr.loadflags);</div><div class='ctx'> 	OFFSET(BP_hardware_subarch, boot_params, hdr.hardware_subarch);</div><div class='ctx'> 	OFFSET(BP_version, boot_params, hdr.version);</div><div class='head'>diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c<br/>index 210927ee2e74..99332f550c48 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/asm-offsets_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/asm-offsets_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/asm-offsets_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/asm-offsets_64.c</a></div><div class='hunk'>@@ -13,6 +13,10 @@ static char syscalls_ia32[] = {</div><div class='ctx'> #include &lt;asm/syscalls_32.h&gt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_KVM_GUEST) &amp;&amp; defined(CONFIG_PARAVIRT_SPINLOCKS)</div><div class='add'>+#include &lt;asm/kvm_para.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> int main(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PARAVIRT</div><div class='hunk'>@@ -22,6 +26,11 @@ int main(void)</div><div class='ctx'> 	BLANK();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_KVM_GUEST) &amp;&amp; defined(CONFIG_PARAVIRT_SPINLOCKS)</div><div class='add'>+	OFFSET(KVM_STEAL_TIME_preempted, kvm_steal_time, preempted);</div><div class='add'>+	BLANK();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define ENTRY(entry) OFFSET(pt_regs_ ## entry, pt_regs, entry)</div><div class='ctx'> 	ENTRY(bx);</div><div class='ctx'> 	ENTRY(cx);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile<br/>index 4a8697f7d4ef..52000010c62e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/Makefile</a></div><div class='hunk'>@@ -20,13 +20,11 @@ obj-y			:= intel_cacheinfo.o scattered.o topology.o</div><div class='ctx'> obj-y			+= common.o</div><div class='ctx'> obj-y			+= rdrand.o</div><div class='ctx'> obj-y			+= match.o</div><div class='add'>+obj-y			+= bugs.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PROC_FS)	+= proc.o</div><div class='ctx'> obj-$(CONFIG_X86_FEATURE_NAMES) += capflags.o powerflags.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_X86_32)	+= bugs.o</div><div class='del'>-obj-$(CONFIG_X86_64)	+= bugs_64.o</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_CPU_SUP_INTEL)		+= intel.o</div><div class='ctx'> obj-$(CONFIG_CPU_SUP_AMD)		+= amd.o</div><div class='ctx'> obj-$(CONFIG_CPU_SUP_CYRIX_32)		+= cyrix.o</div><div class='hunk'>@@ -34,6 +32,8 @@ obj-$(CONFIG_CPU_SUP_CENTAUR)		+= centaur.o</div><div class='ctx'> obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o</div><div class='ctx'> obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_INTEL_RDT_A)	+= intel_rdt.o intel_rdt_rdtgroup.o intel_rdt_schemata.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_X86_MCE)			+= mcheck/</div><div class='ctx'> obj-$(CONFIG_MTRR)			+= mtrr/</div><div class='ctx'> obj-$(CONFIG_MICROCODE)			+= microcode/</div><div class='head'>diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c<br/>index 1e81a37c034e..35a5d5dca2fa 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/amd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/amd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/amd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/amd.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='hunk'>@@ -20,6 +21,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "cpu.h"</div><div class='ctx'> </div><div class='add'>+static const int amd_erratum_383[];</div><div class='add'>+static const int amd_erratum_400[];</div><div class='add'>+static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * nodes_per_socket: Stores the number of nodes per socket.</div><div class='ctx'>  * Refer to Fam15h Models 00-0fh BKDG - CPUID Fn8000_001E_ECX</div><div class='hunk'>@@ -308,17 +313,43 @@ static void amd_get_topology(struct cpuinfo_x86 *c)</div><div class='ctx'> 		u32 eax, ebx, ecx, edx;</div><div class='ctx'> </div><div class='ctx'> 		cpuid(0x8000001e, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='del'>-		node_id = ecx &amp; 7;</div><div class='ctx'> </div><div class='del'>-		/* get compute unit information */</div><div class='del'>-		smp_num_siblings = ((ebx &gt;&gt; 8) &amp; 3) + 1;</div><div class='del'>-		c-&gt;x86_max_cores /= smp_num_siblings;</div><div class='del'>-		c-&gt;cpu_core_id = ebx &amp; 0xff;</div><div class='add'>+		node_id  = ecx &amp; 0xff;</div><div class='add'>+		smp_num_siblings = ((ebx &gt;&gt; 8) &amp; 0xff) + 1;</div><div class='add'>+</div><div class='add'>+		if (c-&gt;x86 == 0x15)</div><div class='add'>+			c-&gt;cu_id = ebx &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		if (c-&gt;x86 &gt;= 0x17) {</div><div class='add'>+			c-&gt;cpu_core_id = ebx &amp; 0xff;</div><div class='add'>+</div><div class='add'>+			if (smp_num_siblings &gt; 1)</div><div class='add'>+				c-&gt;x86_max_cores /= smp_num_siblings;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We may have multiple LLCs if L3 caches exist, so check if we</div><div class='add'>+		 * have an L3 cache by looking at the L3 cache CPUID leaf.</div><div class='add'>+		 */</div><div class='add'>+		if (cpuid_edx(0x80000006)) {</div><div class='add'>+			if (c-&gt;x86 == 0x17) {</div><div class='add'>+				/*</div><div class='add'>+				 * LLC is at the core complex level.</div><div class='add'>+				 * Core complex id is ApicId[3].</div><div class='add'>+				 */</div><div class='add'>+				per_cpu(cpu_llc_id, cpu) = c-&gt;apicid &gt;&gt; 3;</div><div class='add'>+			} else {</div><div class='add'>+				/* LLC is at the node level. */</div><div class='add'>+				per_cpu(cpu_llc_id, cpu) = node_id;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	} else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {</div><div class='ctx'> 		u64 value;</div><div class='ctx'> </div><div class='ctx'> 		rdmsrl(MSR_FAM10H_NODE_ID, value);</div><div class='ctx'> 		node_id = value &amp; 7;</div><div class='add'>+</div><div class='add'>+		per_cpu(cpu_llc_id, cpu) = node_id;</div><div class='ctx'> 	} else</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -329,9 +360,6 @@ static void amd_get_topology(struct cpuinfo_x86 *c)</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_AMD_DCM);</div><div class='ctx'> 		cus_per_node = c-&gt;x86_max_cores / nodes_per_socket;</div><div class='ctx'> </div><div class='del'>-		/* store NodeID, use llc_shared_map to store sibling info */</div><div class='del'>-		per_cpu(cpu_llc_id, cpu) = node_id;</div><div class='del'>-</div><div class='ctx'> 		/* core id has to be in the [0 .. cores_per_node - 1] range */</div><div class='ctx'> 		c-&gt;cpu_core_id %= cus_per_node;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -356,15 +384,6 @@ static void amd_detect_cmp(struct cpuinfo_x86 *c)</div><div class='ctx'> 	/* use socket ID also for last level cache */</div><div class='ctx'> 	per_cpu(cpu_llc_id, cpu) = c-&gt;phys_proc_id;</div><div class='ctx'> 	amd_get_topology(c);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Fix percpu cpu_llc_id here as LLC topology is different</div><div class='del'>-	 * for Fam17h systems.</div><div class='del'>-	 */</div><div class='del'>-	 if (c-&gt;x86 != 0x17 || !cpuid_edx(0x80000006))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	per_cpu(cpu_llc_id, cpu) = c-&gt;apicid &gt;&gt; 3;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -537,8 +556,10 @@ static void early_init_amd(struct cpuinfo_x86 *c)</div><div class='ctx'> 	if (c-&gt;x86_power &amp; (1 &lt;&lt; 8)) {</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);</div><div class='del'>-		if (!check_tsc_unstable())</div><div class='del'>-			set_sched_clock_stable();</div><div class='add'>+		if (check_tsc_unstable())</div><div class='add'>+			clear_sched_clock_stable();</div><div class='add'>+	} else {</div><div class='add'>+		clear_sched_clock_stable();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Bit 12 of 8000_0007 edx is accumulated power mechanism. */</div><div class='hunk'>@@ -585,11 +606,16 @@ static void early_init_amd(struct cpuinfo_x86 *c)</div><div class='ctx'> 	/* F16h erratum 793, CVE-2013-6885 */</div><div class='ctx'> 	if (c-&gt;x86 == 0x16 &amp;&amp; c-&gt;x86_model &lt;= 0xf)</div><div class='ctx'> 		msr_set_bit(MSR_AMD64_LS_CFG, 15);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static const int amd_erratum_383[];</div><div class='del'>-static const int amd_erratum_400[];</div><div class='del'>-static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum);</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether the machine is affected by erratum 400. This is</div><div class='add'>+	 * used to select the proper idle routine and to enable the check</div><div class='add'>+	 * whether the machine is affected in arch_post_acpi_init(), which</div><div class='add'>+	 * sets the X86_BUG_AMD_APIC_C1E bug depending on the MSR check.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_has_amd_erratum(c, amd_erratum_400))</div><div class='add'>+		set_cpu_bug(c, X86_BUG_AMD_E400);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void init_amd_k8(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='hunk'>@@ -770,9 +796,6 @@ static void init_amd(struct cpuinfo_x86 *c)</div><div class='ctx'> 	if (c-&gt;x86 &gt; 0x11)</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_ARAT);</div><div class='ctx'> </div><div class='del'>-	if (cpu_has_amd_erratum(c, amd_erratum_400))</div><div class='del'>-		set_cpu_bug(c, X86_BUG_AMD_APIC_C1E);</div><div class='del'>-</div><div class='ctx'> 	rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &amp;c-&gt;microcode, &amp;dummy);</div><div class='ctx'> </div><div class='ctx'> 	/* 3DNow or LM implies PREFETCHW */</div><div class='head'>diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c<br/>index bd17db15a2c1..a44ef52184df 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/bugs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/bugs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/bugs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/bugs.c</a></div><div class='hunk'>@@ -16,15 +16,19 @@</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/paravirt.h&gt;</div><div class='ctx'> #include &lt;asm/alternative.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> void __init check_bugs(void)</div><div class='ctx'> {</div><div class='ctx'> 	identify_boot_cpu();</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-	pr_info("CPU: ");</div><div class='del'>-	print_cpu_info(&amp;boot_cpu_data);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='add'>+	if (!IS_ENABLED(CONFIG_SMP)) {</div><div class='add'>+		pr_info("CPU: ");</div><div class='add'>+		print_cpu_info(&amp;boot_cpu_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check whether we are able to run this kernel safely on SMP.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -40,4 +44,18 @@ void __init check_bugs(void)</div><div class='ctx'> 	alternative_instructions();</div><div class='ctx'> </div><div class='ctx'> 	fpu__init_check_bugs();</div><div class='add'>+#else /* CONFIG_X86_64 */</div><div class='add'>+	alternative_instructions();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the first 2MB area is not mapped by huge pages</div><div class='add'>+	 * There are typically fixed size MTRRs in there and overlapping</div><div class='add'>+	 * MTRRs into large pages causes slow downs.</div><div class='add'>+	 *</div><div class='add'>+	 * Right now we don't do that with gbpages because there seems</div><div class='add'>+	 * very little benefit for that case.</div><div class='add'>+	 */</div><div class='add'>+	if (!direct_gbpages)</div><div class='add'>+		set_memory_4k((unsigned long)__va(0), 1);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/cpu/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c<br/>deleted file mode 100644<br/>index a972ac4c7e7d..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/bugs_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/bugs_64.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 1994  Linus Torvalds</div><div class='del'>- *  Copyright (C) 2000  SuSE</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/alternative.h&gt;</div><div class='del'>-#include &lt;asm/bugs.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/mtrr.h&gt;</div><div class='del'>-#include &lt;asm/cacheflush.h&gt;</div><div class='del'>-</div><div class='del'>-void __init check_bugs(void)</div><div class='del'>-{</div><div class='del'>-	identify_boot_cpu();</div><div class='del'>-#if !defined(CONFIG_SMP)</div><div class='del'>-	pr_info("CPU: ");</div><div class='del'>-	print_cpu_info(&amp;boot_cpu_data);</div><div class='del'>-#endif</div><div class='del'>-	alternative_instructions();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure the first 2MB area is not mapped by huge pages</div><div class='del'>-	 * There are typically fixed size MTRRs in there and overlapping</div><div class='del'>-	 * MTRRs into large pages causes slow downs.</div><div class='del'>-	 *</div><div class='del'>-	 * Right now we don't do that with gbpages because there seems</div><div class='del'>-	 * very little benefit for that case.</div><div class='del'>-	 */</div><div class='del'>-	if (!direct_gbpages)</div><div class='del'>-		set_memory_4k((unsigned long)__va(0), 1);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c<br/>index 1661d8ec9280..adc0ebd8bed0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/centaur.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/centaur.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/centaur.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/centaur.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/e820.h&gt;</div><div class='hunk'>@@ -104,6 +105,8 @@ static void early_init_centaur(struct cpuinfo_x86 *c)</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	set_cpu_cap(c, X86_FEATURE_SYSENTER32);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	clear_sched_clock_stable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_centaur(struct cpuinfo_x86 *c)</div><div class='head'>diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c<br/>index cc9e980c68ec..b11b38c3b0bd 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/common.c</a></div><div class='hunk'>@@ -7,7 +7,9 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/kgdb.h&gt;</div><div class='hunk'>@@ -35,6 +37,7 @@</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/internal.h&gt;</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='add'>+#include &lt;asm/hwcap2.h&gt;</div><div class='ctx'> #include &lt;linux/numa.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/bugs.h&gt;</div><div class='hunk'>@@ -51,6 +54,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "cpu.h"</div><div class='ctx'> </div><div class='add'>+u32 elf_hwcap2 __read_mostly;</div><div class='add'>+</div><div class='ctx'> /* all of these masks are initialized in setup_cpu_local_masks() */</div><div class='ctx'> cpumask_var_t cpu_initialized_mask;</div><div class='ctx'> cpumask_var_t cpu_callout_mask;</div><div class='hunk'>@@ -83,6 +88,7 @@ static void default_init(struct cpuinfo_x86 *c)</div><div class='ctx'> 			strcpy(c-&gt;x86_model_id, "386");</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+	clear_sched_clock_stable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct cpu_dev default_cpu = {</div><div class='hunk'>@@ -655,6 +661,16 @@ void cpu_detect(struct cpuinfo_x86 *c)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void apply_forced_caps(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NCAPINTS; i++) {</div><div class='add'>+		c-&gt;x86_capability[i] &amp;= ~cpu_caps_cleared[i];</div><div class='add'>+		c-&gt;x86_capability[i] |= cpu_caps_set[i];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void get_cpu_cap(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	u32 eax, ebx, ecx, edx;</div><div class='hunk'>@@ -667,13 +683,14 @@ void get_cpu_cap(struct cpuinfo_x86 *c)</div><div class='ctx'> 		c-&gt;x86_capability[CPUID_1_EDX] = edx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Thermal and Power Management Leaf: level 0x00000006 (eax) */</div><div class='add'>+	if (c-&gt;cpuid_level &gt;= 0x00000006)</div><div class='add'>+		c-&gt;x86_capability[CPUID_6_EAX] = cpuid_eax(0x00000006);</div><div class='add'>+</div><div class='ctx'> 	/* Additional Intel-defined flags: level 0x00000007 */</div><div class='ctx'> 	if (c-&gt;cpuid_level &gt;= 0x00000007) {</div><div class='ctx'> 		cpuid_count(0x00000007, 0, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='del'>-</div><div class='ctx'> 		c-&gt;x86_capability[CPUID_7_0_EBX] = ebx;</div><div class='del'>-</div><div class='del'>-		c-&gt;x86_capability[CPUID_6_EAX] = cpuid_eax(0x00000006);</div><div class='ctx'> 		c-&gt;x86_capability[CPUID_7_ECX] = ecx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -747,6 +764,13 @@ void get_cpu_cap(struct cpuinfo_x86 *c)</div><div class='ctx'> 		c-&gt;x86_capability[CPUID_8000_000A_EDX] = cpuid_edx(0x8000000a);</div><div class='ctx'> </div><div class='ctx'> 	init_scattered_cpuid_features(c);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear/Set all flags overridden by options, after probe.</div><div class='add'>+	 * This needs to happen each time we re-probe, which may happen</div><div class='add'>+	 * several times during CPU initialization.</div><div class='add'>+	 */</div><div class='add'>+	apply_forced_caps(c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c)</div><div class='hunk'>@@ -800,14 +824,12 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 	memset(&amp;c-&gt;x86_capability, 0, sizeof c-&gt;x86_capability);</div><div class='ctx'> 	c-&gt;extended_cpuid_level = 0;</div><div class='ctx'> </div><div class='del'>-	if (!have_cpuid_p())</div><div class='del'>-		identify_cpu_without_cpuid(c);</div><div class='del'>-</div><div class='ctx'> 	/* cyrix could have cpuid enabled via c_identify()*/</div><div class='ctx'> 	if (have_cpuid_p()) {</div><div class='ctx'> 		cpu_detect(c);</div><div class='ctx'> 		get_cpu_vendor(c);</div><div class='ctx'> 		get_cpu_cap(c);</div><div class='add'>+		setup_force_cpu_cap(X86_FEATURE_CPUID);</div><div class='ctx'> </div><div class='ctx'> 		if (this_cpu-&gt;c_early_init)</div><div class='ctx'> 			this_cpu-&gt;c_early_init(c);</div><div class='hunk'>@@ -817,6 +839,9 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> 		if (this_cpu-&gt;c_bsp_init)</div><div class='ctx'> 			this_cpu-&gt;c_bsp_init(c);</div><div class='add'>+	} else {</div><div class='add'>+		identify_cpu_without_cpuid(c);</div><div class='add'>+		setup_clear_cpu_cap(X86_FEATURE_CPUID);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_force_cpu_cap(X86_FEATURE_ALWAYS);</div><div class='hunk'>@@ -979,29 +1004,21 @@ static void x86_init_cache_qos(struct cpuinfo_x86 *c)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The physical to logical package id mapping is initialized from the</div><div class='del'>- * acpi/mptables information. Make sure that CPUID actually agrees with</div><div class='del'>- * that.</div><div class='add'>+ * Validate that ACPI/mptables have the same information about the</div><div class='add'>+ * effective APIC id and update the package map.</div><div class='ctx'>  */</div><div class='del'>-static void sanitize_package_id(struct cpuinfo_x86 *c)</div><div class='add'>+static void validate_apic_and_package_id(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	unsigned int pkg, apicid, cpu = smp_processor_id();</div><div class='add'>+	unsigned int apicid, cpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	apicid = apic-&gt;cpu_present_to_apicid(cpu);</div><div class='del'>-	pkg = apicid &gt;&gt; boot_cpu_data.x86_coreid_bits;</div><div class='ctx'> </div><div class='del'>-	if (apicid != c-&gt;initial_apicid) {</div><div class='del'>-		pr_err(FW_BUG "CPU%u: APIC id mismatch. Firmware: %x CPUID: %x\n",</div><div class='add'>+	if (apicid != c-&gt;apicid) {</div><div class='add'>+		pr_err(FW_BUG "CPU%u: APIC id mismatch. Firmware: %x APIC: %x\n",</div><div class='ctx'> 		       cpu, apicid, c-&gt;initial_apicid);</div><div class='del'>-		c-&gt;initial_apicid = apicid;</div><div class='del'>-	}</div><div class='del'>-	if (pkg != c-&gt;phys_proc_id) {</div><div class='del'>-		pr_err(FW_BUG "CPU%u: Using firmware package id %u instead of %u\n",</div><div class='del'>-		       cpu, pkg, c-&gt;phys_proc_id);</div><div class='del'>-		c-&gt;phys_proc_id = pkg;</div><div class='ctx'> 	}</div><div class='del'>-	c-&gt;logical_proc_id = topology_phys_to_logical_pkg(pkg);</div><div class='add'>+	BUG_ON(topology_update_package_map(c-&gt;phys_proc_id, cpu));</div><div class='ctx'> #else</div><div class='ctx'> 	c-&gt;logical_proc_id = 0;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1022,6 +1039,7 @@ static void identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 	c-&gt;x86_model_id[0] = '\0';  /* Unset */</div><div class='ctx'> 	c-&gt;x86_max_cores = 1;</div><div class='ctx'> 	c-&gt;x86_coreid_bits = 0;</div><div class='add'>+	c-&gt;cu_id = 0xff;</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	c-&gt;x86_clflush_size = 64;</div><div class='ctx'> 	c-&gt;x86_phys_bits = 36;</div><div class='hunk'>@@ -1041,10 +1059,7 @@ static void identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 		this_cpu-&gt;c_identify(c);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear/Set all flags overridden by options, after probe */</div><div class='del'>-	for (i = 0; i &lt; NCAPINTS; i++) {</div><div class='del'>-		c-&gt;x86_capability[i] &amp;= ~cpu_caps_cleared[i];</div><div class='del'>-		c-&gt;x86_capability[i] |= cpu_caps_set[i];</div><div class='del'>-	}</div><div class='add'>+	apply_forced_caps(c);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	c-&gt;apicid = apic-&gt;phys_pkg_id(c-&gt;initial_apicid, 0);</div><div class='hunk'>@@ -1062,6 +1077,8 @@ static void identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (this_cpu-&gt;c_init)</div><div class='ctx'> 		this_cpu-&gt;c_init(c);</div><div class='add'>+	else</div><div class='add'>+		clear_sched_clock_stable();</div><div class='ctx'> </div><div class='ctx'> 	/* Disable the PN if appropriate */</div><div class='ctx'> 	squash_the_stupid_serial_number(c);</div><div class='hunk'>@@ -1103,10 +1120,7 @@ static void identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 	 * Clear/Set all flags overridden by options, need do it</div><div class='ctx'> 	 * before following smp all cpus cap AND.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; NCAPINTS; i++) {</div><div class='del'>-		c-&gt;x86_capability[i] &amp;= ~cpu_caps_cleared[i];</div><div class='del'>-		c-&gt;x86_capability[i] |= cpu_caps_set[i];</div><div class='del'>-	}</div><div class='add'>+	apply_forced_caps(c);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On SMP, boot_cpu_data holds the common feature set between</div><div class='hunk'>@@ -1132,7 +1146,6 @@ static void identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> 	numa_add_cpu(smp_processor_id());</div><div class='ctx'> #endif</div><div class='del'>-	sanitize_package_id(c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1172,7 +1185,6 @@ void enable_sep_cpu(void)</div><div class='ctx'> void __init identify_boot_cpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	identify_cpu(&amp;boot_cpu_data);</div><div class='del'>-	init_amd_e400_c1e_mask();</div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> 	sysenter_setup();</div><div class='ctx'> 	enable_sep_cpu();</div><div class='hunk'>@@ -1188,53 +1200,9 @@ void identify_secondary_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 	enable_sep_cpu();</div><div class='ctx'> #endif</div><div class='ctx'> 	mtrr_ap_init();</div><div class='add'>+	validate_apic_and_package_id(c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct msr_range {</div><div class='del'>-	unsigned	min;</div><div class='del'>-	unsigned	max;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct msr_range msr_range_array[] = {</div><div class='del'>-	{ 0x00000000, 0x00000418},</div><div class='del'>-	{ 0xc0000000, 0xc000040b},</div><div class='del'>-	{ 0xc0010000, 0xc0010142},</div><div class='del'>-	{ 0xc0011000, 0xc001103b},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __print_cpu_msr(void)</div><div class='del'>-{</div><div class='del'>-	unsigned index_min, index_max;</div><div class='del'>-	unsigned index;</div><div class='del'>-	u64 val;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(msr_range_array); i++) {</div><div class='del'>-		index_min = msr_range_array[i].min;</div><div class='del'>-		index_max = msr_range_array[i].max;</div><div class='del'>-</div><div class='del'>-		for (index = index_min; index &lt; index_max; index++) {</div><div class='del'>-			if (rdmsrl_safe(index, &amp;val))</div><div class='del'>-				continue;</div><div class='del'>-			pr_info(" MSR%08x: %016llx\n", index, val);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int show_msr;</div><div class='del'>-</div><div class='del'>-static __init int setup_show_msr(char *arg)</div><div class='del'>-{</div><div class='del'>-	int num;</div><div class='del'>-</div><div class='del'>-	get_option(&amp;arg, &amp;num);</div><div class='del'>-</div><div class='del'>-	if (num &gt; 0)</div><div class='del'>-		show_msr = num;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("show_msr=", setup_show_msr);</div><div class='del'>-</div><div class='ctx'> static __init int setup_noclflush(char *arg)</div><div class='ctx'> {</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_CLFLUSH);</div><div class='hunk'>@@ -1268,21 +1236,13 @@ void print_cpu_info(struct cpuinfo_x86 *c)</div><div class='ctx'> 		pr_cont(", stepping: 0x%x)\n", c-&gt;x86_mask);</div><div class='ctx'> 	else</div><div class='ctx'> 		pr_cont(")\n");</div><div class='del'>-</div><div class='del'>-	print_cpu_msr(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void print_cpu_msr(struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;cpu_index &lt; show_msr)</div><div class='del'>-		__print_cpu_msr();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init int setup_disablecpuid(char *arg)</div><div class='ctx'> {</div><div class='ctx'> 	int bit;</div><div class='ctx'> </div><div class='del'>-	if (get_option(&amp;arg, &amp;bit) &amp;&amp; bit &lt; NCAPINTS*32)</div><div class='add'>+	if (get_option(&amp;arg, &amp;bit) &amp;&amp; bit &gt;= 0 &amp;&amp; bit &lt; NCAPINTS * 32)</div><div class='ctx'> 		setup_clear_cpu_cap(bit);</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1490,11 +1450,8 @@ void cpu_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	cr4_init_shadow();</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Load microcode on this cpu if a valid microcode is available.</div><div class='del'>-	 * This is early microcode loading procedure.</div><div class='del'>-	 */</div><div class='del'>-	load_ucode_ap();</div><div class='add'>+	if (cpu)</div><div class='add'>+		load_ucode_ap();</div><div class='ctx'> </div><div class='ctx'> 	t = &amp;per_cpu(cpu_tss, cpu);</div><div class='ctx'> 	oist = &amp;per_cpu(orig_ist, cpu);</div><div class='hunk'>@@ -1555,7 +1512,7 @@ void cpu_init(void)</div><div class='ctx'> 	for (i = 0; i &lt;= IO_BITMAP_LONGS; i++)</div><div class='ctx'> 		t-&gt;io_bitmap[i] = ~0UL;</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	me-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> 	BUG_ON(me-&gt;mm);</div><div class='ctx'> 	enter_lazy_tlb(&amp;init_mm, me);</div><div class='hunk'>@@ -1606,7 +1563,7 @@ void cpu_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set up and load the per-CPU TSS and LDT</div><div class='ctx'> 	 */</div><div class='del'>-	atomic_inc(&amp;init_mm.mm_count);</div><div class='add'>+	mmgrab(&amp;init_mm);</div><div class='ctx'> 	curr-&gt;active_mm = &amp;init_mm;</div><div class='ctx'> 	BUG_ON(curr-&gt;mm);</div><div class='ctx'> 	enter_lazy_tlb(&amp;init_mm, curr);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c<br/>index bd9dcd6b712d..0a3bc19de017 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/cyrix.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/cyrix.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/cyrix.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/cyrix.c</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> #include &lt;asm/pci-direct.h&gt;</div><div class='ctx'> #include &lt;asm/tsc.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cpu.h"</div><div class='ctx'> </div><div class='hunk'>@@ -183,6 +185,7 @@ static void early_init_cyrix(struct cpuinfo_x86 *c)</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_CYRIX_ARR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	clear_sched_clock_stable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_cyrix(struct cpuinfo_x86 *c)</div><div class='head'>diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c<br/>index fcd484d2bb03..fe0a615a051b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/intel.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/intel.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/intel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/intel.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -14,6 +15,9 @@</div><div class='ctx'> #include &lt;asm/bugs.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/intel-family.h&gt;</div><div class='add'>+#include &lt;asm/microcode_intel.h&gt;</div><div class='add'>+#include &lt;asm/hwcap2.h&gt;</div><div class='add'>+#include &lt;asm/elf.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> #include &lt;linux/topology.h&gt;</div><div class='hunk'>@@ -61,6 +65,46 @@ void check_mpx_erratum(struct cpuinfo_x86 *c)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ring3mwait_disabled __read_mostly;</div><div class='add'>+</div><div class='add'>+static int __init ring3mwait_disable(char *__unused)</div><div class='add'>+{</div><div class='add'>+	ring3mwait_disabled = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+__setup("ring3mwait=disable", ring3mwait_disable);</div><div class='add'>+</div><div class='add'>+static void probe_xeon_phi_r3mwait(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Ring 3 MONITOR/MWAIT feature cannot be detected without</div><div class='add'>+	 * cpu model and family comparison.</div><div class='add'>+	 */</div><div class='add'>+	if (c-&gt;x86 != 6)</div><div class='add'>+		return;</div><div class='add'>+	switch (c-&gt;x86_model) {</div><div class='add'>+	case INTEL_FAM6_XEON_PHI_KNL:</div><div class='add'>+	case INTEL_FAM6_XEON_PHI_KNM:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ring3mwait_disabled) {</div><div class='add'>+		msr_clear_bit(MSR_MISC_FEATURE_ENABLES,</div><div class='add'>+			      MSR_MISC_FEATURE_ENABLES_RING3MWAIT_BIT);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msr_set_bit(MSR_MISC_FEATURE_ENABLES,</div><div class='add'>+		    MSR_MISC_FEATURE_ENABLES_RING3MWAIT_BIT);</div><div class='add'>+</div><div class='add'>+	set_cpu_cap(c, X86_FEATURE_RING3MWAIT);</div><div class='add'>+</div><div class='add'>+	if (c == &amp;boot_cpu_data)</div><div class='add'>+		ELF_HWCAP2 |= HWCAP2_RING3MWAIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void early_init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	u64 misc_enable;</div><div class='hunk'>@@ -78,14 +122,8 @@ static void early_init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> 		(c-&gt;x86 == 0x6 &amp;&amp; c-&gt;x86_model &gt;= 0x0e))</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);</div><div class='ctx'> </div><div class='del'>-	if (c-&gt;x86 &gt;= 6 &amp;&amp; !cpu_has(c, X86_FEATURE_IA64)) {</div><div class='del'>-		unsigned lower_word;</div><div class='del'>-</div><div class='del'>-		wrmsr(MSR_IA32_UCODE_REV, 0, 0);</div><div class='del'>-		/* Required by the SDM */</div><div class='del'>-		sync_core();</div><div class='del'>-		rdmsr(MSR_IA32_UCODE_REV, lower_word, c-&gt;microcode);</div><div class='del'>-	}</div><div class='add'>+	if (c-&gt;x86 &gt;= 6 &amp;&amp; !cpu_has(c, X86_FEATURE_IA64))</div><div class='add'>+		c-&gt;microcode = intel_get_microcode_revision();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Atom erratum AAE44/AAF40/AAG38/AAH41:</div><div class='hunk'>@@ -124,8 +162,10 @@ static void early_init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> 	if (c-&gt;x86_power &amp; (1 &lt;&lt; 8)) {</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);</div><div class='ctx'> 		set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);</div><div class='del'>-		if (!check_tsc_unstable())</div><div class='del'>-			set_sched_clock_stable();</div><div class='add'>+		if (check_tsc_unstable())</div><div class='add'>+			clear_sched_clock_stable();</div><div class='add'>+	} else {</div><div class='add'>+		clear_sched_clock_stable();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Penwell and Cloverview have the TSC which doesn't sleep on S3 */</div><div class='hunk'>@@ -565,6 +605,8 @@ static void init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> 		detect_vmx_virtcap(c);</div><div class='ctx'> </div><div class='ctx'> 	init_intel_energy_perf(c);</div><div class='add'>+</div><div class='add'>+	probe_xeon_phi_r3mwait(c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='head'>diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c<br/>index de6626c18e42..c55fb2cb2acc 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/intel_cacheinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/intel_cacheinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/intel_cacheinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/intel_cacheinfo.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/cacheinfo.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -153,6 +154,7 @@ struct _cpuid4_info_regs {</div><div class='ctx'> 	union _cpuid4_leaf_eax eax;</div><div class='ctx'> 	union _cpuid4_leaf_ebx ebx;</div><div class='ctx'> 	union _cpuid4_leaf_ecx ecx;</div><div class='add'>+	unsigned int id;</div><div class='ctx'> 	unsigned long size;</div><div class='ctx'> 	struct amd_northbridge *nb;</div><div class='ctx'> };</div><div class='hunk'>@@ -894,6 +896,8 @@ static void __cache_cpumap_setup(unsigned int cpu, int index,</div><div class='ctx'> static void ci_leaf_init(struct cacheinfo *this_leaf,</div><div class='ctx'> 			 struct _cpuid4_info_regs *base)</div><div class='ctx'> {</div><div class='add'>+	this_leaf-&gt;id = base-&gt;id;</div><div class='add'>+	this_leaf-&gt;attributes = CACHE_ID;</div><div class='ctx'> 	this_leaf-&gt;level = base-&gt;eax.split.level;</div><div class='ctx'> 	this_leaf-&gt;type = cache_type_map[base-&gt;eax.split.type];</div><div class='ctx'> 	this_leaf-&gt;coherency_line_size =</div><div class='hunk'>@@ -920,6 +924,22 @@ static int __init_cache_level(unsigned int cpu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The max shared threads number comes from CPUID.4:EAX[25-14] with input</div><div class='add'>+ * ECX as cache index. Then right shift apicid by the number's order to get</div><div class='add'>+ * cache id for this cache node.</div><div class='add'>+ */</div><div class='add'>+static void get_cache_id(int cpu, struct _cpuid4_info_regs *id4_regs)</div><div class='add'>+{</div><div class='add'>+	struct cpuinfo_x86 *c = &amp;cpu_data(cpu);</div><div class='add'>+	unsigned long num_threads_sharing;</div><div class='add'>+	int index_msb;</div><div class='add'>+</div><div class='add'>+	num_threads_sharing = 1 + id4_regs-&gt;eax.split.num_threads_sharing;</div><div class='add'>+	index_msb = get_count_order(num_threads_sharing);</div><div class='add'>+	id4_regs-&gt;id = c-&gt;apicid &gt;&gt; index_msb;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __populate_cache_leaves(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int idx, ret;</div><div class='hunk'>@@ -931,9 +951,12 @@ static int __populate_cache_leaves(unsigned int cpu)</div><div class='ctx'> 		ret = cpuid4_cache_lookup_regs(idx, &amp;id4_regs);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='add'>+		get_cache_id(cpu, &amp;id4_regs);</div><div class='ctx'> 		ci_leaf_init(this_leaf++, &amp;id4_regs);</div><div class='ctx'> 		__cache_cpumap_setup(cpu, idx, &amp;id4_regs);</div><div class='ctx'> 	}</div><div class='add'>+	this_cpu_ci-&gt;cpu_map_populated = true;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/intel_rdt.c b/arch/x86/kernel/cpu/intel_rdt.c<br/>new file mode 100644<br/>index 000000000000..5a533fefefa0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/intel_rdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/intel_rdt.c</a></div><div class='hunk'>@@ -0,0 +1,403 @@</div><div class='add'>+/*</div><div class='add'>+ * Resource Director Technology(RDT)</div><div class='add'>+ * - Cache Allocation code.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Fenghua Yu &lt;fenghua.yu@intel.com&gt;</div><div class='add'>+ *    Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='add'>+ *    Vikas Shivappa &lt;vikas.shivappa@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * More information about RDT be found in the Intel (R) x86 Architecture</div><div class='add'>+ * Software Developer Manual June 2016, volume 3, section 17.17.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/cacheinfo.h&gt;</div><div class='add'>+#include &lt;linux/cpuhotplug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/intel-family.h&gt;</div><div class='add'>+#include &lt;asm/intel_rdt.h&gt;</div><div class='add'>+</div><div class='add'>+/* Mutex to protect rdtgroup access. */</div><div class='add'>+DEFINE_MUTEX(rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+DEFINE_PER_CPU_READ_MOSTLY(int, cpu_closid);</div><div class='add'>+</div><div class='add'>+#define domain_init(id) LIST_HEAD_INIT(rdt_resources_all[id].domains)</div><div class='add'>+</div><div class='add'>+struct rdt_resource rdt_resources_all[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "L3",</div><div class='add'>+		.domains	= domain_init(RDT_RESOURCE_L3),</div><div class='add'>+		.msr_base	= IA32_L3_CBM_BASE,</div><div class='add'>+		.min_cbm_bits	= 1,</div><div class='add'>+		.cache_level	= 3,</div><div class='add'>+		.cbm_idx_multi	= 1,</div><div class='add'>+		.cbm_idx_offset	= 0</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "L3DATA",</div><div class='add'>+		.domains	= domain_init(RDT_RESOURCE_L3DATA),</div><div class='add'>+		.msr_base	= IA32_L3_CBM_BASE,</div><div class='add'>+		.min_cbm_bits	= 1,</div><div class='add'>+		.cache_level	= 3,</div><div class='add'>+		.cbm_idx_multi	= 2,</div><div class='add'>+		.cbm_idx_offset	= 0</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "L3CODE",</div><div class='add'>+		.domains	= domain_init(RDT_RESOURCE_L3CODE),</div><div class='add'>+		.msr_base	= IA32_L3_CBM_BASE,</div><div class='add'>+		.min_cbm_bits	= 1,</div><div class='add'>+		.cache_level	= 3,</div><div class='add'>+		.cbm_idx_multi	= 2,</div><div class='add'>+		.cbm_idx_offset	= 1</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "L2",</div><div class='add'>+		.domains	= domain_init(RDT_RESOURCE_L2),</div><div class='add'>+		.msr_base	= IA32_L2_CBM_BASE,</div><div class='add'>+		.min_cbm_bits	= 1,</div><div class='add'>+		.cache_level	= 2,</div><div class='add'>+		.cbm_idx_multi	= 1,</div><div class='add'>+		.cbm_idx_offset	= 0</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cbm_idx(struct rdt_resource *r, int closid)</div><div class='add'>+{</div><div class='add'>+	return closid * r-&gt;cbm_idx_multi + r-&gt;cbm_idx_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cache_alloc_hsw_probe() - Have to probe for Intel haswell server CPUs</div><div class='add'>+ * as they do not have CPUID enumeration support for Cache allocation.</div><div class='add'>+ * The check for Vendor/Family/Model is not enough to guarantee that</div><div class='add'>+ * the MSRs won't #GP fault because only the following SKUs support</div><div class='add'>+ * CAT:</div><div class='add'>+ *	Intel(R) Xeon(R)  CPU E5-2658  v3  @  2.20GHz</div><div class='add'>+ *	Intel(R) Xeon(R)  CPU E5-2648L v3  @  1.80GHz</div><div class='add'>+ *	Intel(R) Xeon(R)  CPU E5-2628L v3  @  2.00GHz</div><div class='add'>+ *	Intel(R) Xeon(R)  CPU E5-2618L v3  @  2.30GHz</div><div class='add'>+ *	Intel(R) Xeon(R)  CPU E5-2608L v3  @  2.00GHz</div><div class='add'>+ *	Intel(R) Xeon(R)  CPU E5-2658A v3  @  2.20GHz</div><div class='add'>+ *</div><div class='add'>+ * Probe by trying to write the first of the L3 cach mask registers</div><div class='add'>+ * and checking that the bits stick. Max CLOSids is always 4 and max cbm length</div><div class='add'>+ * is always 20 on hsw server parts. The minimum cache bitmask length</div><div class='add'>+ * allowed for HSW server is always 2 bits. Hardcode all of them.</div><div class='add'>+ */</div><div class='add'>+static inline bool cache_alloc_hsw_probe(void)</div><div class='add'>+{</div><div class='add'>+	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &amp;&amp;</div><div class='add'>+	    boot_cpu_data.x86 == 6 &amp;&amp;</div><div class='add'>+	    boot_cpu_data.x86_model == INTEL_FAM6_HASWELL_X) {</div><div class='add'>+		struct rdt_resource *r  = &amp;rdt_resources_all[RDT_RESOURCE_L3];</div><div class='add'>+		u32 l, h, max_cbm = BIT_MASK(20) - 1;</div><div class='add'>+</div><div class='add'>+		if (wrmsr_safe(IA32_L3_CBM_BASE, max_cbm, 0))</div><div class='add'>+			return false;</div><div class='add'>+		rdmsr(IA32_L3_CBM_BASE, l, h);</div><div class='add'>+</div><div class='add'>+		/* If all the bits were set in MSR, return success */</div><div class='add'>+		if (l != max_cbm)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		r-&gt;num_closid = 4;</div><div class='add'>+		r-&gt;cbm_len = 20;</div><div class='add'>+		r-&gt;max_cbm = max_cbm;</div><div class='add'>+		r-&gt;min_cbm_bits = 2;</div><div class='add'>+		r-&gt;capable = true;</div><div class='add'>+		r-&gt;enabled = true;</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rdt_get_config(int idx, struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	union cpuid_0x10_1_eax eax;</div><div class='add'>+	union cpuid_0x10_1_edx edx;</div><div class='add'>+	u32 ebx, ecx;</div><div class='add'>+</div><div class='add'>+	cpuid_count(0x00000010, idx, &amp;eax.full, &amp;ebx, &amp;ecx, &amp;edx.full);</div><div class='add'>+	r-&gt;num_closid = edx.split.cos_max + 1;</div><div class='add'>+	r-&gt;cbm_len = eax.split.cbm_len + 1;</div><div class='add'>+	r-&gt;max_cbm = BIT_MASK(eax.split.cbm_len + 1) - 1;</div><div class='add'>+	r-&gt;capable = true;</div><div class='add'>+	r-&gt;enabled = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rdt_get_cdp_l3_config(int type)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r_l3 = &amp;rdt_resources_all[RDT_RESOURCE_L3];</div><div class='add'>+	struct rdt_resource *r = &amp;rdt_resources_all[type];</div><div class='add'>+</div><div class='add'>+	r-&gt;num_closid = r_l3-&gt;num_closid / 2;</div><div class='add'>+	r-&gt;cbm_len = r_l3-&gt;cbm_len;</div><div class='add'>+	r-&gt;max_cbm = r_l3-&gt;max_cbm;</div><div class='add'>+	r-&gt;capable = true;</div><div class='add'>+	/*</div><div class='add'>+	 * By default, CDP is disabled. CDP can be enabled by mount parameter</div><div class='add'>+	 * "cdp" during resctrl file system mount time.</div><div class='add'>+	 */</div><div class='add'>+	r-&gt;enabled = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool get_rdt_resources(void)</div><div class='add'>+{</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	if (cache_alloc_hsw_probe())</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_RDT_A))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_CAT_L3)) {</div><div class='add'>+		rdt_get_config(1, &amp;rdt_resources_all[RDT_RESOURCE_L3]);</div><div class='add'>+		if (boot_cpu_has(X86_FEATURE_CDP_L3)) {</div><div class='add'>+			rdt_get_cdp_l3_config(RDT_RESOURCE_L3DATA);</div><div class='add'>+			rdt_get_cdp_l3_config(RDT_RESOURCE_L3CODE);</div><div class='add'>+		}</div><div class='add'>+		ret = true;</div><div class='add'>+	}</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_CAT_L2)) {</div><div class='add'>+		/* CPUID 0x10.2 fields are same format at 0x10.1 */</div><div class='add'>+		rdt_get_config(2, &amp;rdt_resources_all[RDT_RESOURCE_L2]);</div><div class='add'>+		ret = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_cache_id(int cpu, int level)</div><div class='add'>+{</div><div class='add'>+	struct cpu_cacheinfo *ci = get_cpu_cacheinfo(cpu);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ci-&gt;num_leaves; i++) {</div><div class='add'>+		if (ci-&gt;info_list[i].level == level)</div><div class='add'>+			return ci-&gt;info_list[i].id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rdt_cbm_update(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct msr_param *m = (struct msr_param *)arg;</div><div class='add'>+	struct rdt_resource *r = m-&gt;res;</div><div class='add'>+	int i, cpu = smp_processor_id();</div><div class='add'>+	struct rdt_domain *d;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;domains, list) {</div><div class='add'>+		/* Find the domain that contains this CPU */</div><div class='add'>+		if (cpumask_test_cpu(cpu, &amp;d-&gt;cpu_mask))</div><div class='add'>+			goto found;</div><div class='add'>+	}</div><div class='add'>+	pr_info_once("cpu %d not found in any domain for resource %s\n",</div><div class='add'>+		     cpu, r-&gt;name);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+found:</div><div class='add'>+	for (i = m-&gt;low; i &lt; m-&gt;high; i++) {</div><div class='add'>+		int idx = cbm_idx(r, i);</div><div class='add'>+</div><div class='add'>+		wrmsrl(r-&gt;msr_base + idx, d-&gt;cbm[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdt_find_domain - Find a domain in a resource that matches input resource id</div><div class='add'>+ *</div><div class='add'>+ * Search resource r's domain list to find the resource id. If the resource</div><div class='add'>+ * id is found in a domain, return the domain. Otherwise, if requested by</div><div class='add'>+ * caller, return the first domain whose id is bigger than the input id.</div><div class='add'>+ * The domain list is sorted by id in ascending order.</div><div class='add'>+ */</div><div class='add'>+static struct rdt_domain *rdt_find_domain(struct rdt_resource *r, int id,</div><div class='add'>+					  struct list_head **pos)</div><div class='add'>+{</div><div class='add'>+	struct rdt_domain *d;</div><div class='add'>+	struct list_head *l;</div><div class='add'>+</div><div class='add'>+	if (id &lt; 0)</div><div class='add'>+		return ERR_PTR(id);</div><div class='add'>+</div><div class='add'>+	list_for_each(l, &amp;r-&gt;domains) {</div><div class='add'>+		d = list_entry(l, struct rdt_domain, list);</div><div class='add'>+		/* When id is found, return its domain. */</div><div class='add'>+		if (id == d-&gt;id)</div><div class='add'>+			return d;</div><div class='add'>+		/* Stop searching when finding id's position in sorted list. */</div><div class='add'>+		if (id &lt; d-&gt;id)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pos)</div><div class='add'>+		*pos = l;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * domain_add_cpu - Add a cpu to a resource's domain list.</div><div class='add'>+ *</div><div class='add'>+ * If an existing domain in the resource r's domain list matches the cpu's</div><div class='add'>+ * resource id, add the cpu in the domain.</div><div class='add'>+ *</div><div class='add'>+ * Otherwise, a new domain is allocated and inserted into the right position</div><div class='add'>+ * in the domain list sorted by id in ascending order.</div><div class='add'>+ *</div><div class='add'>+ * The order in the domain list is visible to users when we print entries</div><div class='add'>+ * in the schemata file and schemata input is validated to have the same order</div><div class='add'>+ * as this list.</div><div class='add'>+ */</div><div class='add'>+static void domain_add_cpu(int cpu, struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	int i, id = get_cache_id(cpu, r-&gt;cache_level);</div><div class='add'>+	struct list_head *add_pos = NULL;</div><div class='add'>+	struct rdt_domain *d;</div><div class='add'>+</div><div class='add'>+	d = rdt_find_domain(r, id, &amp;add_pos);</div><div class='add'>+	if (IS_ERR(d)) {</div><div class='add'>+		pr_warn("Could't find cache id for cpu %d\n", cpu);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (d) {</div><div class='add'>+		cpumask_set_cpu(cpu, &amp;d-&gt;cpu_mask);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	d = kzalloc_node(sizeof(*d), GFP_KERNEL, cpu_to_node(cpu));</div><div class='add'>+	if (!d)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	d-&gt;id = id;</div><div class='add'>+</div><div class='add'>+	d-&gt;cbm = kmalloc_array(r-&gt;num_closid, sizeof(*d-&gt;cbm), GFP_KERNEL);</div><div class='add'>+	if (!d-&gt;cbm) {</div><div class='add'>+		kfree(d);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; r-&gt;num_closid; i++) {</div><div class='add'>+		int idx = cbm_idx(r, i);</div><div class='add'>+</div><div class='add'>+		d-&gt;cbm[i] = r-&gt;max_cbm;</div><div class='add'>+		wrmsrl(r-&gt;msr_base + idx, d-&gt;cbm[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpumask_set_cpu(cpu, &amp;d-&gt;cpu_mask);</div><div class='add'>+	list_add_tail(&amp;d-&gt;list, add_pos);</div><div class='add'>+	r-&gt;num_domains++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void domain_remove_cpu(int cpu, struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	int id = get_cache_id(cpu, r-&gt;cache_level);</div><div class='add'>+	struct rdt_domain *d;</div><div class='add'>+</div><div class='add'>+	d = rdt_find_domain(r, id, NULL);</div><div class='add'>+	if (IS_ERR_OR_NULL(d)) {</div><div class='add'>+		pr_warn("Could't find cache id for cpu %d\n", cpu);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpumask_clear_cpu(cpu, &amp;d-&gt;cpu_mask);</div><div class='add'>+	if (cpumask_empty(&amp;d-&gt;cpu_mask)) {</div><div class='add'>+		r-&gt;num_domains--;</div><div class='add'>+		kfree(d-&gt;cbm);</div><div class='add'>+		list_del(&amp;d-&gt;list);</div><div class='add'>+		kfree(d);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clear_closid(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct intel_pqr_state *state = this_cpu_ptr(&amp;pqr_state);</div><div class='add'>+</div><div class='add'>+	per_cpu(cpu_closid, cpu) = 0;</div><div class='add'>+	state-&gt;closid = 0;</div><div class='add'>+	wrmsr(MSR_IA32_PQR_ASSOC, state-&gt;rmid, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_rdt_online_cpu(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	for_each_capable_rdt_resource(r)</div><div class='add'>+		domain_add_cpu(cpu, r);</div><div class='add'>+	/* The cpu is set in default rdtgroup after online. */</div><div class='add'>+	cpumask_set_cpu(cpu, &amp;rdtgroup_default.cpu_mask);</div><div class='add'>+	clear_closid(cpu);</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_rdt_offline_cpu(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	for_each_capable_rdt_resource(r)</div><div class='add'>+		domain_remove_cpu(cpu, r);</div><div class='add'>+	list_for_each_entry(rdtgrp, &amp;rdt_all_groups, rdtgroup_list) {</div><div class='add'>+		if (cpumask_test_and_clear_cpu(cpu, &amp;rdtgrp-&gt;cpu_mask))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	clear_closid(cpu);</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init intel_rdt_late_init(void)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	int state, ret;</div><div class='add'>+</div><div class='add'>+	if (!get_rdt_resources())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	state = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,</div><div class='add'>+				  "x86/rdt/cat:online:",</div><div class='add'>+				  intel_rdt_online_cpu, intel_rdt_offline_cpu);</div><div class='add'>+	if (state &lt; 0)</div><div class='add'>+		return state;</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_init();</div><div class='add'>+	if (ret) {</div><div class='add'>+		cpuhp_remove_state(state);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_capable_rdt_resource(r)</div><div class='add'>+		pr_info("Intel RDT %s allocation detected\n", r-&gt;name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(intel_rdt_late_init);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c<br/>new file mode 100644<br/>index 000000000000..0bbe0f3a039f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/intel_rdt_rdtgroup.c</a></div><div class='hunk'>@@ -0,0 +1,1116 @@</div><div class='add'>+/*</div><div class='add'>+ * User interface for Resource Alloction in Resource Director Technology(RDT)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Author: Fenghua Yu &lt;fenghua.yu@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * More information about RDT be found in the Intel (R) x86 Architecture</div><div class='add'>+ * Software Developer Manual.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/kernfs.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/task_work.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/magic.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/intel_rdt.h&gt;</div><div class='add'>+#include &lt;asm/intel_rdt_common.h&gt;</div><div class='add'>+</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(rdt_enable_key);</div><div class='add'>+struct kernfs_root *rdt_root;</div><div class='add'>+struct rdtgroup rdtgroup_default;</div><div class='add'>+LIST_HEAD(rdt_all_groups);</div><div class='add'>+</div><div class='add'>+/* Kernel fs node for "info" directory under root */</div><div class='add'>+static struct kernfs_node *kn_info;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Trivial allocator for CLOSIDs. Since h/w only supports a small number,</div><div class='add'>+ * we can keep a bitmap of free CLOSIDs in a single integer.</div><div class='add'>+ *</div><div class='add'>+ * Using a global CLOSID across all resources has some advantages and</div><div class='add'>+ * some drawbacks:</div><div class='add'>+ * + We can simply set "current-&gt;closid" to assign a task to a resource</div><div class='add'>+ *   group.</div><div class='add'>+ * + Context switch code can avoid extra memory references deciding which</div><div class='add'>+ *   CLOSID to load into the PQR_ASSOC MSR</div><div class='add'>+ * - We give up some options in configuring resource groups across multi-socket</div><div class='add'>+ *   systems.</div><div class='add'>+ * - Our choices on how to configure each resource become progressively more</div><div class='add'>+ *   limited as the number of resources grows.</div><div class='add'>+ */</div><div class='add'>+static int closid_free_map;</div><div class='add'>+</div><div class='add'>+static void closid_init(void)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	int rdt_min_closid = 32;</div><div class='add'>+</div><div class='add'>+	/* Compute rdt_min_closid across all resources */</div><div class='add'>+	for_each_enabled_rdt_resource(r)</div><div class='add'>+		rdt_min_closid = min(rdt_min_closid, r-&gt;num_closid);</div><div class='add'>+</div><div class='add'>+	closid_free_map = BIT_MASK(rdt_min_closid) - 1;</div><div class='add'>+</div><div class='add'>+	/* CLOSID 0 is always reserved for the default group */</div><div class='add'>+	closid_free_map &amp;= ~1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int closid_alloc(void)</div><div class='add'>+{</div><div class='add'>+	int closid = ffs(closid_free_map);</div><div class='add'>+</div><div class='add'>+	if (closid == 0)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	closid--;</div><div class='add'>+	closid_free_map &amp;= ~(1 &lt;&lt; closid);</div><div class='add'>+</div><div class='add'>+	return closid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void closid_free(int closid)</div><div class='add'>+{</div><div class='add'>+	closid_free_map |= 1 &lt;&lt; closid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set uid and gid of rdtgroup dirs and files to that of the creator */</div><div class='add'>+static int rdtgroup_kn_set_ugid(struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	struct iattr iattr = { .ia_valid = ATTR_UID | ATTR_GID,</div><div class='add'>+				.ia_uid = current_fsuid(),</div><div class='add'>+				.ia_gid = current_fsgid(), };</div><div class='add'>+</div><div class='add'>+	if (uid_eq(iattr.ia_uid, GLOBAL_ROOT_UID) &amp;&amp;</div><div class='add'>+	    gid_eq(iattr.ia_gid, GLOBAL_ROOT_GID))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return kernfs_setattr(kn, &amp;iattr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_add_file(struct kernfs_node *parent_kn, struct rftype *rft)</div><div class='add'>+{</div><div class='add'>+	struct kernfs_node *kn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	kn = __kernfs_create_file(parent_kn, rft-&gt;name, rft-&gt;mode,</div><div class='add'>+				  0, rft-&gt;kf_ops, rft, NULL, NULL);</div><div class='add'>+	if (IS_ERR(kn))</div><div class='add'>+		return PTR_ERR(kn);</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_kn_set_ugid(kn);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kernfs_remove(kn);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_add_files(struct kernfs_node *kn, struct rftype *rfts,</div><div class='add'>+			      int len)</div><div class='add'>+{</div><div class='add'>+	struct rftype *rft;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	for (rft = rfts; rft &lt; rfts + len; rft++) {</div><div class='add'>+		ret = rdtgroup_add_file(kn, rft);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	pr_warn("Failed to add %s, err=%d\n", rft-&gt;name, ret);</div><div class='add'>+	while (--rft &gt;= rfts)</div><div class='add'>+		kernfs_remove_by_name(kn, rft-&gt;name);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_seqfile_show(struct seq_file *m, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct kernfs_open_file *of = m-&gt;private;</div><div class='add'>+	struct rftype *rft = of-&gt;kn-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (rft-&gt;seq_show)</div><div class='add'>+		return rft-&gt;seq_show(of, m, arg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rdtgroup_file_write(struct kernfs_open_file *of, char *buf,</div><div class='add'>+				   size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rftype *rft = of-&gt;kn-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (rft-&gt;write)</div><div class='add'>+		return rft-&gt;write(of, buf, nbytes, off);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kernfs_ops rdtgroup_kf_single_ops = {</div><div class='add'>+	.atomic_write_len	= PAGE_SIZE,</div><div class='add'>+	.write			= rdtgroup_file_write,</div><div class='add'>+	.seq_show		= rdtgroup_seqfile_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rdtgroup_cpus_show(struct kernfs_open_file *of,</div><div class='add'>+			      struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	if (rdtgrp)</div><div class='add'>+		seq_printf(s, "%*pb\n", cpumask_pr_args(&amp;rdtgrp-&gt;cpu_mask));</div><div class='add'>+	else</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is safe against intel_rdt_sched_in() called from __switch_to()</div><div class='add'>+ * because __switch_to() is executed with interrupts disabled. A local call</div><div class='add'>+ * from rdt_update_closid() is proteced against __switch_to() because</div><div class='add'>+ * preemption is disabled.</div><div class='add'>+ */</div><div class='add'>+static void rdt_update_cpu_closid(void *closid)</div><div class='add'>+{</div><div class='add'>+	if (closid)</div><div class='add'>+		this_cpu_write(cpu_closid, *(int *)closid);</div><div class='add'>+	/*</div><div class='add'>+	 * We cannot unconditionally write the MSR because the current</div><div class='add'>+	 * executing task might have its own closid selected. Just reuse</div><div class='add'>+	 * the context switch code.</div><div class='add'>+	 */</div><div class='add'>+	intel_rdt_sched_in();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update the PGR_ASSOC MSR on all cpus in @cpu_mask,</div><div class='add'>+ *</div><div class='add'>+ * Per task closids must have been set up before calling this function.</div><div class='add'>+ *</div><div class='add'>+ * The per cpu closids are updated with the smp function call, when @closid</div><div class='add'>+ * is not NULL. If @closid is NULL then all affected percpu closids must</div><div class='add'>+ * have been set up before calling this function.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+rdt_update_closid(const struct cpumask *cpu_mask, int *closid)</div><div class='add'>+{</div><div class='add'>+	int cpu = get_cpu();</div><div class='add'>+</div><div class='add'>+	if (cpumask_test_cpu(cpu, cpu_mask))</div><div class='add'>+		rdt_update_cpu_closid(closid);</div><div class='add'>+	smp_call_function_many(cpu_mask, rdt_update_cpu_closid, closid, 1);</div><div class='add'>+	put_cpu();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,</div><div class='add'>+				   char *buf, size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	cpumask_var_t tmpmask, newmask;</div><div class='add'>+	struct rdtgroup *rdtgrp, *r;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!zalloc_cpumask_var(&amp;tmpmask, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (!zalloc_cpumask_var(&amp;newmask, GFP_KERNEL)) {</div><div class='add'>+		free_cpumask_var(tmpmask);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cpumask_parse(buf, newmask);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	/* check that user didn't specify any offline cpus */</div><div class='add'>+	cpumask_andnot(tmpmask, newmask, cpu_online_mask);</div><div class='add'>+	if (cpumask_weight(tmpmask)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check whether cpus are dropped from this group */</div><div class='add'>+	cpumask_andnot(tmpmask, &amp;rdtgrp-&gt;cpu_mask, newmask);</div><div class='add'>+	if (cpumask_weight(tmpmask)) {</div><div class='add'>+		/* Can't drop from default group */</div><div class='add'>+		if (rdtgrp == &amp;rdtgroup_default) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		/* Give any dropped cpus to rdtgroup_default */</div><div class='add'>+		cpumask_or(&amp;rdtgroup_default.cpu_mask,</div><div class='add'>+			   &amp;rdtgroup_default.cpu_mask, tmpmask);</div><div class='add'>+		rdt_update_closid(tmpmask, &amp;rdtgroup_default.closid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we added cpus, remove them from previous group that owned them</div><div class='add'>+	 * and update per-cpu closid</div><div class='add'>+	 */</div><div class='add'>+	cpumask_andnot(tmpmask, newmask, &amp;rdtgrp-&gt;cpu_mask);</div><div class='add'>+	if (cpumask_weight(tmpmask)) {</div><div class='add'>+		list_for_each_entry(r, &amp;rdt_all_groups, rdtgroup_list) {</div><div class='add'>+			if (r == rdtgrp)</div><div class='add'>+				continue;</div><div class='add'>+			cpumask_andnot(&amp;r-&gt;cpu_mask, &amp;r-&gt;cpu_mask, tmpmask);</div><div class='add'>+		}</div><div class='add'>+		rdt_update_closid(tmpmask, &amp;rdtgrp-&gt;closid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Done pushing/pulling - update this group with new mask */</div><div class='add'>+	cpumask_copy(&amp;rdtgrp-&gt;cpu_mask, newmask);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+	free_cpumask_var(tmpmask);</div><div class='add'>+	free_cpumask_var(newmask);</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct task_move_callback {</div><div class='add'>+	struct callback_head	work;</div><div class='add'>+	struct rdtgroup		*rdtgrp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void move_myself(struct callback_head *head)</div><div class='add'>+{</div><div class='add'>+	struct task_move_callback *callback;</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+</div><div class='add'>+	callback = container_of(head, struct task_move_callback, work);</div><div class='add'>+	rdtgrp = callback-&gt;rdtgrp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If resource group was deleted before this task work callback</div><div class='add'>+	 * was invoked, then assign the task to root group and free the</div><div class='add'>+	 * resource group.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_dec_and_test(&amp;rdtgrp-&gt;waitcount) &amp;&amp;</div><div class='add'>+	    (rdtgrp-&gt;flags &amp; RDT_DELETED)) {</div><div class='add'>+		current-&gt;closid = 0;</div><div class='add'>+		kfree(rdtgrp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	preempt_disable();</div><div class='add'>+	/* update PQR_ASSOC MSR to make resource group go into effect */</div><div class='add'>+	intel_rdt_sched_in();</div><div class='add'>+	preempt_enable();</div><div class='add'>+</div><div class='add'>+	kfree(callback);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __rdtgroup_move_task(struct task_struct *tsk,</div><div class='add'>+				struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	struct task_move_callback *callback;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	callback = kzalloc(sizeof(*callback), GFP_KERNEL);</div><div class='add'>+	if (!callback)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	callback-&gt;work.func = move_myself;</div><div class='add'>+	callback-&gt;rdtgrp = rdtgrp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Take a refcount, so rdtgrp cannot be freed before the</div><div class='add'>+	 * callback has been invoked.</div><div class='add'>+	 */</div><div class='add'>+	atomic_inc(&amp;rdtgrp-&gt;waitcount);</div><div class='add'>+	ret = task_work_add(tsk, &amp;callback-&gt;work, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/*</div><div class='add'>+		 * Task is exiting. Drop the refcount and free the callback.</div><div class='add'>+		 * No need to check the refcount as the group cannot be</div><div class='add'>+		 * deleted before the write function unlocks rdtgroup_mutex.</div><div class='add'>+		 */</div><div class='add'>+		atomic_dec(&amp;rdtgrp-&gt;waitcount);</div><div class='add'>+		kfree(callback);</div><div class='add'>+	} else {</div><div class='add'>+		tsk-&gt;closid = rdtgrp-&gt;closid;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_task_write_permission(struct task_struct *task,</div><div class='add'>+					  struct kernfs_open_file *of)</div><div class='add'>+{</div><div class='add'>+	const struct cred *tcred = get_task_cred(task);</div><div class='add'>+	const struct cred *cred = current_cred();</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Even if we're attaching all tasks in the thread group, we only</div><div class='add'>+	 * need to check permissions on one of them.</div><div class='add'>+	 */</div><div class='add'>+	if (!uid_eq(cred-&gt;euid, GLOBAL_ROOT_UID) &amp;&amp;</div><div class='add'>+	    !uid_eq(cred-&gt;euid, tcred-&gt;uid) &amp;&amp;</div><div class='add'>+	    !uid_eq(cred-&gt;euid, tcred-&gt;suid))</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+</div><div class='add'>+	put_cred(tcred);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_move_task(pid_t pid, struct rdtgroup *rdtgrp,</div><div class='add'>+			      struct kernfs_open_file *of)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *tsk;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (pid) {</div><div class='add'>+		tsk = find_task_by_vpid(pid);</div><div class='add'>+		if (!tsk) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return -ESRCH;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		tsk = current;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	get_task_struct(tsk);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_task_write_permission(tsk, of);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = __rdtgroup_move_task(tsk, rdtgrp);</div><div class='add'>+</div><div class='add'>+	put_task_struct(tsk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rdtgroup_tasks_write(struct kernfs_open_file *of,</div><div class='add'>+				    char *buf, size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	pid_t pid;</div><div class='add'>+</div><div class='add'>+	if (kstrtoint(strstrip(buf), 0, &amp;pid) || pid &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	if (rdtgrp)</div><div class='add'>+		ret = rdtgroup_move_task(pid, rdtgrp, of);</div><div class='add'>+	else</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void show_rdt_tasks(struct rdtgroup *r, struct seq_file *s)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *p, *t;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_process_thread(p, t) {</div><div class='add'>+		if (t-&gt;closid == r-&gt;closid)</div><div class='add'>+			seq_printf(s, "%d\n", t-&gt;pid);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_tasks_show(struct kernfs_open_file *of,</div><div class='add'>+			       struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (rdtgrp)</div><div class='add'>+		show_rdt_tasks(rdtgrp, s);</div><div class='add'>+	else</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Files in each rdtgroup */</div><div class='add'>+static struct rftype rdtgroup_base_files[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "cpus",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.write		= rdtgroup_cpus_write,</div><div class='add'>+		.seq_show	= rdtgroup_cpus_show,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "tasks",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.write		= rdtgroup_tasks_write,</div><div class='add'>+		.seq_show	= rdtgroup_tasks_show,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "schemata",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.write		= rdtgroup_schemata_write,</div><div class='add'>+		.seq_show	= rdtgroup_schemata_show,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rdt_num_closids_show(struct kernfs_open_file *of,</div><div class='add'>+				struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = of-&gt;kn-&gt;parent-&gt;priv;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%d\n", r-&gt;num_closid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_cbm_mask_show(struct kernfs_open_file *of,</div><div class='add'>+			     struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = of-&gt;kn-&gt;parent-&gt;priv;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%x\n", r-&gt;max_cbm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_min_cbm_bits_show(struct kernfs_open_file *of,</div><div class='add'>+			     struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = of-&gt;kn-&gt;parent-&gt;priv;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%d\n", r-&gt;min_cbm_bits);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rdtgroup information files for one cache resource. */</div><div class='add'>+static struct rftype res_info_files[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "num_closids",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_num_closids_show,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "cbm_mask",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_cbm_mask_show,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "min_cbm_bits",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_min_cbm_bits_show,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rdtgroup_create_info_dir(struct kernfs_node *parent_kn)</div><div class='add'>+{</div><div class='add'>+	struct kernfs_node *kn_subdir;</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* create the directory */</div><div class='add'>+	kn_info = kernfs_create_dir(parent_kn, "info", parent_kn-&gt;mode, NULL);</div><div class='add'>+	if (IS_ERR(kn_info))</div><div class='add'>+		return PTR_ERR(kn_info);</div><div class='add'>+	kernfs_get(kn_info);</div><div class='add'>+</div><div class='add'>+	for_each_enabled_rdt_resource(r) {</div><div class='add'>+		kn_subdir = kernfs_create_dir(kn_info, r-&gt;name,</div><div class='add'>+					      kn_info-&gt;mode, r);</div><div class='add'>+		if (IS_ERR(kn_subdir)) {</div><div class='add'>+			ret = PTR_ERR(kn_subdir);</div><div class='add'>+			goto out_destroy;</div><div class='add'>+		}</div><div class='add'>+		kernfs_get(kn_subdir);</div><div class='add'>+		ret = rdtgroup_kn_set_ugid(kn_subdir);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_destroy;</div><div class='add'>+		ret = rdtgroup_add_files(kn_subdir, res_info_files,</div><div class='add'>+					 ARRAY_SIZE(res_info_files));</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_destroy;</div><div class='add'>+		kernfs_activate(kn_subdir);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This extra ref will be put in kernfs_remove() and guarantees</div><div class='add'>+	 * that @rdtgrp-&gt;kn is always accessible.</div><div class='add'>+	 */</div><div class='add'>+	kernfs_get(kn_info);</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_kn_set_ugid(kn_info);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_destroy;</div><div class='add'>+</div><div class='add'>+	kernfs_activate(kn_info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_destroy:</div><div class='add'>+	kernfs_remove(kn_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l3_qos_cfg_update(void *arg)</div><div class='add'>+{</div><div class='add'>+	bool *enable = arg;</div><div class='add'>+</div><div class='add'>+	wrmsrl(IA32_L3_QOS_CFG, *enable ? L3_QOS_CDP_ENABLE : 0ULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_l3_qos_cfg(struct rdt_resource *r, bool enable)</div><div class='add'>+{</div><div class='add'>+	cpumask_var_t cpu_mask;</div><div class='add'>+	struct rdt_domain *d;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	if (!zalloc_cpumask_var(&amp;cpu_mask, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;domains, list) {</div><div class='add'>+		/* Pick one CPU from each domain instance to update MSR */</div><div class='add'>+		cpumask_set_cpu(cpumask_any(&amp;d-&gt;cpu_mask), cpu_mask);</div><div class='add'>+	}</div><div class='add'>+	cpu = get_cpu();</div><div class='add'>+	/* Update QOS_CFG MSR on this cpu if it's in cpu_mask. */</div><div class='add'>+	if (cpumask_test_cpu(cpu, cpu_mask))</div><div class='add'>+		l3_qos_cfg_update(&amp;enable);</div><div class='add'>+	/* Update QOS_CFG MSR on all other cpus in cpu_mask. */</div><div class='add'>+	smp_call_function_many(cpu_mask, l3_qos_cfg_update, &amp;enable, 1);</div><div class='add'>+	put_cpu();</div><div class='add'>+</div><div class='add'>+	free_cpumask_var(cpu_mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdp_enable(void)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r_l3data = &amp;rdt_resources_all[RDT_RESOURCE_L3DATA];</div><div class='add'>+	struct rdt_resource *r_l3code = &amp;rdt_resources_all[RDT_RESOURCE_L3CODE];</div><div class='add'>+	struct rdt_resource *r_l3 = &amp;rdt_resources_all[RDT_RESOURCE_L3];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!r_l3-&gt;capable || !r_l3data-&gt;capable || !r_l3code-&gt;capable)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = set_l3_qos_cfg(r_l3, true);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		r_l3-&gt;enabled = false;</div><div class='add'>+		r_l3data-&gt;enabled = true;</div><div class='add'>+		r_l3code-&gt;enabled = true;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdp_disable(void)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = &amp;rdt_resources_all[RDT_RESOURCE_L3];</div><div class='add'>+</div><div class='add'>+	r-&gt;enabled = r-&gt;capable;</div><div class='add'>+</div><div class='add'>+	if (rdt_resources_all[RDT_RESOURCE_L3DATA].enabled) {</div><div class='add'>+		rdt_resources_all[RDT_RESOURCE_L3DATA].enabled = false;</div><div class='add'>+		rdt_resources_all[RDT_RESOURCE_L3CODE].enabled = false;</div><div class='add'>+		set_l3_qos_cfg(r, false);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_rdtgroupfs_options(char *data)</div><div class='add'>+{</div><div class='add'>+	char *token, *o = data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	while ((token = strsep(&amp;o, ",")) != NULL) {</div><div class='add'>+		if (!*token)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (!strcmp(token, "cdp"))</div><div class='add'>+			ret = cdp_enable();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We don't allow rdtgroup directories to be created anywhere</div><div class='add'>+ * except the root directory. Thus when looking for the rdtgroup</div><div class='add'>+ * structure for a kernfs node we are either looking at a directory,</div><div class='add'>+ * in which case the rdtgroup structure is pointed at by the "priv"</div><div class='add'>+ * field, otherwise we have a file, and need only look to the parent</div><div class='add'>+ * to find the rdtgroup.</div><div class='add'>+ */</div><div class='add'>+static struct rdtgroup *kernfs_to_rdtgroup(struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	if (kernfs_type(kn) == KERNFS_DIR) {</div><div class='add'>+		/*</div><div class='add'>+		 * All the resource directories use "kn-&gt;priv"</div><div class='add'>+		 * to point to the "struct rdtgroup" for the</div><div class='add'>+		 * resource. "info" and its subdirectories don't</div><div class='add'>+		 * have rdtgroup structures, so return NULL here.</div><div class='add'>+		 */</div><div class='add'>+		if (kn == kn_info || kn-&gt;parent == kn_info)</div><div class='add'>+			return NULL;</div><div class='add'>+		else</div><div class='add'>+			return kn-&gt;priv;</div><div class='add'>+	} else {</div><div class='add'>+		return kn-&gt;parent-&gt;priv;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rdtgroup *rdtgroup_kn_lock_live(struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp = kernfs_to_rdtgroup(kn);</div><div class='add'>+</div><div class='add'>+	if (!rdtgrp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;rdtgrp-&gt;waitcount);</div><div class='add'>+	kernfs_break_active_protection(kn);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	/* Was this group deleted while we waited? */</div><div class='add'>+	if (rdtgrp-&gt;flags &amp; RDT_DELETED)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return rdtgrp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rdtgroup_kn_unlock(struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp = kernfs_to_rdtgroup(kn);</div><div class='add'>+</div><div class='add'>+	if (!rdtgrp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_test(&amp;rdtgrp-&gt;waitcount) &amp;&amp;</div><div class='add'>+	    (rdtgrp-&gt;flags &amp; RDT_DELETED)) {</div><div class='add'>+		kernfs_unbreak_active_protection(kn);</div><div class='add'>+		kernfs_put(kn);</div><div class='add'>+		kfree(rdtgrp);</div><div class='add'>+	} else {</div><div class='add'>+		kernfs_unbreak_active_protection(kn);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dentry *rdt_mount(struct file_system_type *fs_type,</div><div class='add'>+				int flags, const char *unused_dev_name,</div><div class='add'>+				void *data)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	/*</div><div class='add'>+	 * resctrl file system can only be mounted once.</div><div class='add'>+	 */</div><div class='add'>+	if (static_branch_unlikely(&amp;rdt_enable_key)) {</div><div class='add'>+		dentry = ERR_PTR(-EBUSY);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = parse_rdtgroupfs_options(data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dentry = ERR_PTR(ret);</div><div class='add'>+		goto out_cdp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	closid_init();</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_create_info_dir(rdtgroup_default.kn);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dentry = ERR_PTR(ret);</div><div class='add'>+		goto out_cdp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dentry = kernfs_mount(fs_type, flags, rdt_root,</div><div class='add'>+			      RDTGROUP_SUPER_MAGIC, NULL);</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		goto out_cdp;</div><div class='add'>+</div><div class='add'>+	static_branch_enable(&amp;rdt_enable_key);</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+out_cdp:</div><div class='add'>+	cdp_disable();</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reset_all_cbms(struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	struct msr_param msr_param;</div><div class='add'>+	cpumask_var_t cpu_mask;</div><div class='add'>+	struct rdt_domain *d;</div><div class='add'>+	int i, cpu;</div><div class='add'>+</div><div class='add'>+	if (!zalloc_cpumask_var(&amp;cpu_mask, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	msr_param.res = r;</div><div class='add'>+	msr_param.low = 0;</div><div class='add'>+	msr_param.high = r-&gt;num_closid;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable resource control for this resource by setting all</div><div class='add'>+	 * CBMs in all domains to the maximum mask value. Pick one CPU</div><div class='add'>+	 * from each domain to update the MSRs below.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;domains, list) {</div><div class='add'>+		cpumask_set_cpu(cpumask_any(&amp;d-&gt;cpu_mask), cpu_mask);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; r-&gt;num_closid; i++)</div><div class='add'>+			d-&gt;cbm[i] = r-&gt;max_cbm;</div><div class='add'>+	}</div><div class='add'>+	cpu = get_cpu();</div><div class='add'>+	/* Update CBM on this cpu if it's in cpu_mask. */</div><div class='add'>+	if (cpumask_test_cpu(cpu, cpu_mask))</div><div class='add'>+		rdt_cbm_update(&amp;msr_param);</div><div class='add'>+	/* Update CBM on all other cpus in cpu_mask. */</div><div class='add'>+	smp_call_function_many(cpu_mask, rdt_cbm_update, &amp;msr_param, 1);</div><div class='add'>+	put_cpu();</div><div class='add'>+</div><div class='add'>+	free_cpumask_var(cpu_mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Move tasks from one to the other group. If @from is NULL, then all tasks</div><div class='add'>+ * in the systems are moved unconditionally (used for teardown).</div><div class='add'>+ *</div><div class='add'>+ * If @mask is not NULL the cpus on which moved tasks are running are set</div><div class='add'>+ * in that mask so the update smp function call is restricted to affected</div><div class='add'>+ * cpus.</div><div class='add'>+ */</div><div class='add'>+static void rdt_move_group_tasks(struct rdtgroup *from, struct rdtgroup *to,</div><div class='add'>+				 struct cpumask *mask)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *p, *t;</div><div class='add'>+</div><div class='add'>+	read_lock(&amp;tasklist_lock);</div><div class='add'>+	for_each_process_thread(p, t) {</div><div class='add'>+		if (!from || t-&gt;closid == from-&gt;closid) {</div><div class='add'>+			t-&gt;closid = to-&gt;closid;</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+			/*</div><div class='add'>+			 * This is safe on x86 w/o barriers as the ordering</div><div class='add'>+			 * of writing to task_cpu() and t-&gt;on_cpu is</div><div class='add'>+			 * reverse to the reading here. The detection is</div><div class='add'>+			 * inaccurate as tasks might move or schedule</div><div class='add'>+			 * before the smp function call takes place. In</div><div class='add'>+			 * such a case the function call is pointless, but</div><div class='add'>+			 * there is no other side effect.</div><div class='add'>+			 */</div><div class='add'>+			if (mask &amp;&amp; t-&gt;on_cpu)</div><div class='add'>+				cpumask_set_cpu(task_cpu(t), mask);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	read_unlock(&amp;tasklist_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Forcibly remove all of subdirectories under root.</div><div class='add'>+ */</div><div class='add'>+static void rmdir_all_sub(void)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp, *tmp;</div><div class='add'>+</div><div class='add'>+	/* Move all tasks to the default resource group */</div><div class='add'>+	rdt_move_group_tasks(NULL, &amp;rdtgroup_default, NULL);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(rdtgrp, tmp, &amp;rdt_all_groups, rdtgroup_list) {</div><div class='add'>+		/* Remove each rdtgroup other than root */</div><div class='add'>+		if (rdtgrp == &amp;rdtgroup_default)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Give any CPUs back to the default group. We cannot copy</div><div class='add'>+		 * cpu_online_mask because a CPU might have executed the</div><div class='add'>+		 * offline callback already, but is still marked online.</div><div class='add'>+		 */</div><div class='add'>+		cpumask_or(&amp;rdtgroup_default.cpu_mask,</div><div class='add'>+			   &amp;rdtgroup_default.cpu_mask, &amp;rdtgrp-&gt;cpu_mask);</div><div class='add'>+</div><div class='add'>+		kernfs_remove(rdtgrp-&gt;kn);</div><div class='add'>+		list_del(&amp;rdtgrp-&gt;rdtgroup_list);</div><div class='add'>+		kfree(rdtgrp);</div><div class='add'>+	}</div><div class='add'>+	/* Notify online CPUs to update per cpu storage and PQR_ASSOC MSR */</div><div class='add'>+	get_online_cpus();</div><div class='add'>+	rdt_update_closid(cpu_online_mask, &amp;rdtgroup_default.closid);</div><div class='add'>+	put_online_cpus();</div><div class='add'>+</div><div class='add'>+	kernfs_remove(kn_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rdt_kill_sb(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	/*Put everything back to default values. */</div><div class='add'>+	for_each_enabled_rdt_resource(r)</div><div class='add'>+		reset_all_cbms(r);</div><div class='add'>+	cdp_disable();</div><div class='add'>+	rmdir_all_sub();</div><div class='add'>+	static_branch_disable(&amp;rdt_enable_key);</div><div class='add'>+	kernfs_kill_sb(sb);</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_system_type rdt_fs_type = {</div><div class='add'>+	.name    = "resctrl",</div><div class='add'>+	.mount   = rdt_mount,</div><div class='add'>+	.kill_sb = rdt_kill_sb,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rdtgroup_mkdir(struct kernfs_node *parent_kn, const char *name,</div><div class='add'>+			  umode_t mode)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *parent, *rdtgrp;</div><div class='add'>+	struct kernfs_node *kn;</div><div class='add'>+	int ret, closid;</div><div class='add'>+</div><div class='add'>+	/* Only allow mkdir in the root directory */</div><div class='add'>+	if (parent_kn != rdtgroup_default.kn)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	/* Do not accept '\n' to avoid unparsable situation. */</div><div class='add'>+	if (strchr(name, '\n'))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	parent = rdtgroup_kn_lock_live(parent_kn);</div><div class='add'>+	if (!parent) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = closid_alloc();</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	closid = ret;</div><div class='add'>+</div><div class='add'>+	/* allocate the rdtgroup. */</div><div class='add'>+	rdtgrp = kzalloc(sizeof(*rdtgrp), GFP_KERNEL);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out_closid_free;</div><div class='add'>+	}</div><div class='add'>+	rdtgrp-&gt;closid = closid;</div><div class='add'>+	list_add(&amp;rdtgrp-&gt;rdtgroup_list, &amp;rdt_all_groups);</div><div class='add'>+</div><div class='add'>+	/* kernfs creates the directory for rdtgrp */</div><div class='add'>+	kn = kernfs_create_dir(parent-&gt;kn, name, mode, rdtgrp);</div><div class='add'>+	if (IS_ERR(kn)) {</div><div class='add'>+		ret = PTR_ERR(kn);</div><div class='add'>+		goto out_cancel_ref;</div><div class='add'>+	}</div><div class='add'>+	rdtgrp-&gt;kn = kn;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * kernfs_remove() will drop the reference count on "kn" which</div><div class='add'>+	 * will free it. But we still need it to stick around for the</div><div class='add'>+	 * rdtgroup_kn_unlock(kn} call below. Take one extra reference</div><div class='add'>+	 * here, which will be dropped inside rdtgroup_kn_unlock().</div><div class='add'>+	 */</div><div class='add'>+	kernfs_get(kn);</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_kn_set_ugid(kn);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_destroy;</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_add_files(kn, rdtgroup_base_files,</div><div class='add'>+				 ARRAY_SIZE(rdtgroup_base_files));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_destroy;</div><div class='add'>+</div><div class='add'>+	kernfs_activate(kn);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	goto out_unlock;</div><div class='add'>+</div><div class='add'>+out_destroy:</div><div class='add'>+	kernfs_remove(rdtgrp-&gt;kn);</div><div class='add'>+out_cancel_ref:</div><div class='add'>+	list_del(&amp;rdtgrp-&gt;rdtgroup_list);</div><div class='add'>+	kfree(rdtgrp);</div><div class='add'>+out_closid_free:</div><div class='add'>+	closid_free(closid);</div><div class='add'>+out_unlock:</div><div class='add'>+	rdtgroup_kn_unlock(parent_kn);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_rmdir(struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	int ret, cpu, closid = rdtgroup_default.closid;</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	cpumask_var_t tmpmask;</div><div class='add'>+</div><div class='add'>+	if (!zalloc_cpumask_var(&amp;tmpmask, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Give any tasks back to the default group */</div><div class='add'>+	rdt_move_group_tasks(rdtgrp, &amp;rdtgroup_default, tmpmask);</div><div class='add'>+</div><div class='add'>+	/* Give any CPUs back to the default group */</div><div class='add'>+	cpumask_or(&amp;rdtgroup_default.cpu_mask,</div><div class='add'>+		   &amp;rdtgroup_default.cpu_mask, &amp;rdtgrp-&gt;cpu_mask);</div><div class='add'>+</div><div class='add'>+	/* Update per cpu closid of the moved CPUs first */</div><div class='add'>+	for_each_cpu(cpu, &amp;rdtgrp-&gt;cpu_mask)</div><div class='add'>+		per_cpu(cpu_closid, cpu) = closid;</div><div class='add'>+	/*</div><div class='add'>+	 * Update the MSR on moved CPUs and CPUs which have moved</div><div class='add'>+	 * task running on them.</div><div class='add'>+	 */</div><div class='add'>+	cpumask_or(tmpmask, tmpmask, &amp;rdtgrp-&gt;cpu_mask);</div><div class='add'>+	rdt_update_closid(tmpmask, NULL);</div><div class='add'>+</div><div class='add'>+	rdtgrp-&gt;flags = RDT_DELETED;</div><div class='add'>+	closid_free(rdtgrp-&gt;closid);</div><div class='add'>+	list_del(&amp;rdtgrp-&gt;rdtgroup_list);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * one extra hold on this, will drop when we kfree(rdtgrp)</div><div class='add'>+	 * in rdtgroup_kn_unlock()</div><div class='add'>+	 */</div><div class='add'>+	kernfs_get(kn);</div><div class='add'>+	kernfs_remove(rdtgrp-&gt;kn);</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	rdtgroup_kn_unlock(kn);</div><div class='add'>+	free_cpumask_var(tmpmask);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_show_options(struct seq_file *seq, struct kernfs_root *kf)</div><div class='add'>+{</div><div class='add'>+	if (rdt_resources_all[RDT_RESOURCE_L3DATA].enabled)</div><div class='add'>+		seq_puts(seq, ",cdp");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kernfs_syscall_ops rdtgroup_kf_syscall_ops = {</div><div class='add'>+	.mkdir		= rdtgroup_mkdir,</div><div class='add'>+	.rmdir		= rdtgroup_rmdir,</div><div class='add'>+	.show_options	= rdtgroup_show_options,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init rdtgroup_setup_root(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rdt_root = kernfs_create_root(&amp;rdtgroup_kf_syscall_ops,</div><div class='add'>+				      KERNFS_ROOT_CREATE_DEACTIVATED,</div><div class='add'>+				      &amp;rdtgroup_default);</div><div class='add'>+	if (IS_ERR(rdt_root))</div><div class='add'>+		return PTR_ERR(rdt_root);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rdtgroup_default.closid = 0;</div><div class='add'>+	list_add(&amp;rdtgroup_default.rdtgroup_list, &amp;rdt_all_groups);</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_add_files(rdt_root-&gt;kn, rdtgroup_base_files,</div><div class='add'>+				 ARRAY_SIZE(rdtgroup_base_files));</div><div class='add'>+	if (ret) {</div><div class='add'>+		kernfs_destroy_root(rdt_root);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdtgroup_default.kn = rdt_root-&gt;kn;</div><div class='add'>+	kernfs_activate(rdtgroup_default.kn);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_init - rdtgroup initialization</div><div class='add'>+ *</div><div class='add'>+ * Setup resctrl file system including set up root, create mount point,</div><div class='add'>+ * register rdtgroup filesystem, and initialize files under root directory.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or -errno</div><div class='add'>+ */</div><div class='add'>+int __init rdtgroup_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_setup_root();</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = sysfs_create_mount_point(fs_kobj, "resctrl");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto cleanup_root;</div><div class='add'>+</div><div class='add'>+	ret = register_filesystem(&amp;rdt_fs_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto cleanup_mountpoint;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cleanup_mountpoint:</div><div class='add'>+	sysfs_remove_mount_point(fs_kobj, "resctrl");</div><div class='add'>+cleanup_root:</div><div class='add'>+	kernfs_destroy_root(rdt_root);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/kernel/cpu/intel_rdt_schemata.c b/arch/x86/kernel/cpu/intel_rdt_schemata.c<br/>new file mode 100644<br/>index 000000000000..f369cb8db0d5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/intel_rdt_schemata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/intel_rdt_schemata.c</a></div><div class='hunk'>@@ -0,0 +1,245 @@</div><div class='add'>+/*</div><div class='add'>+ * Resource Director Technology(RDT)</div><div class='add'>+ * - Cache Allocation code.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Fenghua Yu &lt;fenghua.yu@intel.com&gt;</div><div class='add'>+ *    Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * More information about RDT be found in the Intel (R) x86 Architecture</div><div class='add'>+ * Software Developer Manual June 2016, volume 3, section 17.17.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernfs.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;asm/intel_rdt.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check whether a cache bit mask is valid. The SDM says:</div><div class='add'>+ *	Please note that all (and only) contiguous '1' combinations</div><div class='add'>+ *	are allowed (e.g. FFFFH, 0FF0H, 003CH, etc.).</div><div class='add'>+ * Additionally Haswell requires at least two bits set.</div><div class='add'>+ */</div><div class='add'>+static bool cbm_validate(unsigned long var, struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	unsigned long first_bit, zero_bit;</div><div class='add'>+</div><div class='add'>+	if (var == 0 || var &gt; r-&gt;max_cbm)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	first_bit = find_first_bit(&amp;var, r-&gt;cbm_len);</div><div class='add'>+	zero_bit = find_next_zero_bit(&amp;var, r-&gt;cbm_len, first_bit);</div><div class='add'>+</div><div class='add'>+	if (find_next_bit(&amp;var, r-&gt;cbm_len, zero_bit) &lt; r-&gt;cbm_len)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if ((zero_bit - first_bit) &lt; r-&gt;min_cbm_bits)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read one cache bit mask (hex). Check that it is valid for the current</div><div class='add'>+ * resource type.</div><div class='add'>+ */</div><div class='add'>+static int parse_cbm(char *buf, struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	unsigned long data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtoul(buf, 16, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (!cbm_validate(data, r))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	r-&gt;tmp_cbms[r-&gt;num_tmp_cbms++] = data;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For each domain in this resource we expect to find a series of:</div><div class='add'>+ *	id=mask</div><div class='add'>+ * separated by ";". The "id" is in decimal, and must appear in the</div><div class='add'>+ * right order.</div><div class='add'>+ */</div><div class='add'>+static int parse_line(char *line, struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	char *dom = NULL, *id;</div><div class='add'>+	struct rdt_domain *d;</div><div class='add'>+	unsigned long dom_id;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;domains, list) {</div><div class='add'>+		dom = strsep(&amp;line, ";");</div><div class='add'>+		if (!dom)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		id = strsep(&amp;dom, "=");</div><div class='add'>+		if (kstrtoul(id, 10, &amp;dom_id) || dom_id != d-&gt;id)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (parse_cbm(dom, r))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Any garbage at the end of the line? */</div><div class='add'>+	if (line &amp;&amp; line[0])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update_domains(struct rdt_resource *r, int closid)</div><div class='add'>+{</div><div class='add'>+	struct msr_param msr_param;</div><div class='add'>+	cpumask_var_t cpu_mask;</div><div class='add'>+	struct rdt_domain *d;</div><div class='add'>+	int cpu, idx = 0;</div><div class='add'>+</div><div class='add'>+	if (!zalloc_cpumask_var(&amp;cpu_mask, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	msr_param.low = closid;</div><div class='add'>+	msr_param.high = msr_param.low + 1;</div><div class='add'>+	msr_param.res = r;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;domains, list) {</div><div class='add'>+		cpumask_set_cpu(cpumask_any(&amp;d-&gt;cpu_mask), cpu_mask);</div><div class='add'>+		d-&gt;cbm[msr_param.low] = r-&gt;tmp_cbms[idx++];</div><div class='add'>+	}</div><div class='add'>+	cpu = get_cpu();</div><div class='add'>+	/* Update CBM on this cpu if it's in cpu_mask. */</div><div class='add'>+	if (cpumask_test_cpu(cpu, cpu_mask))</div><div class='add'>+		rdt_cbm_update(&amp;msr_param);</div><div class='add'>+	/* Update CBM on other cpus. */</div><div class='add'>+	smp_call_function_many(cpu_mask, rdt_cbm_update, &amp;msr_param, 1);</div><div class='add'>+	put_cpu();</div><div class='add'>+</div><div class='add'>+	free_cpumask_var(cpu_mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of,</div><div class='add'>+				char *buf, size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	char *tok, *resname;</div><div class='add'>+	int closid, ret = 0;</div><div class='add'>+	u32 *l3_cbms = NULL;</div><div class='add'>+</div><div class='add'>+	/* Valid input requires a trailing newline */</div><div class='add'>+	if (nbytes == 0 || buf[nbytes - 1] != '\n')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	buf[nbytes - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	closid = rdtgrp-&gt;closid;</div><div class='add'>+</div><div class='add'>+	/* get scratch space to save all the masks while we validate input */</div><div class='add'>+	for_each_enabled_rdt_resource(r) {</div><div class='add'>+		r-&gt;tmp_cbms = kcalloc(r-&gt;num_domains, sizeof(*l3_cbms),</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+		if (!r-&gt;tmp_cbms) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		r-&gt;num_tmp_cbms = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while ((tok = strsep(&amp;buf, "\n")) != NULL) {</div><div class='add'>+		resname = strsep(&amp;tok, ":");</div><div class='add'>+		if (!tok) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		for_each_enabled_rdt_resource(r) {</div><div class='add'>+			if (!strcmp(resname, r-&gt;name) &amp;&amp;</div><div class='add'>+			    closid &lt; r-&gt;num_closid) {</div><div class='add'>+				ret = parse_line(tok, r);</div><div class='add'>+				if (ret)</div><div class='add'>+					goto out;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!r-&gt;name) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Did the parser find all the masks we need? */</div><div class='add'>+	for_each_enabled_rdt_resource(r) {</div><div class='add'>+		if (r-&gt;num_tmp_cbms != r-&gt;num_domains) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_enabled_rdt_resource(r) {</div><div class='add'>+		ret = update_domains(r, closid);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+	for_each_enabled_rdt_resource(r) {</div><div class='add'>+		kfree(r-&gt;tmp_cbms);</div><div class='add'>+		r-&gt;tmp_cbms = NULL;</div><div class='add'>+	}</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void show_doms(struct seq_file *s, struct rdt_resource *r, int closid)</div><div class='add'>+{</div><div class='add'>+	struct rdt_domain *dom;</div><div class='add'>+	bool sep = false;</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%s:", r-&gt;name);</div><div class='add'>+	list_for_each_entry(dom, &amp;r-&gt;domains, list) {</div><div class='add'>+		if (sep)</div><div class='add'>+			seq_puts(s, ";");</div><div class='add'>+		seq_printf(s, "%d=%x", dom-&gt;id, dom-&gt;cbm[closid]);</div><div class='add'>+		sep = true;</div><div class='add'>+	}</div><div class='add'>+	seq_puts(s, "\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdtgroup_schemata_show(struct kernfs_open_file *of,</div><div class='add'>+			   struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	int closid, ret = 0;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (rdtgrp) {</div><div class='add'>+		closid = rdtgrp-&gt;closid;</div><div class='add'>+		for_each_enabled_rdt_resource(r) {</div><div class='add'>+			if (closid &lt; r-&gt;num_closid)</div><div class='add'>+				show_doms(s, r, closid);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce-apei.c b/arch/x86/kernel/cpu/mcheck/mce-apei.c<br/>index 83f1a98d37db..2eee85379689 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce-apei.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/mcheck/mce-apei.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce-apei.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce-apei.c</a></div><div class='hunk'>@@ -52,8 +52,11 @@ void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err)</div><div class='ctx'> </div><div class='ctx'> 	if (severity &gt;= GHES_SEV_RECOVERABLE)</div><div class='ctx'> 		m.status |= MCI_STATUS_UC;</div><div class='del'>-	if (severity &gt;= GHES_SEV_PANIC)</div><div class='add'>+</div><div class='add'>+	if (severity &gt;= GHES_SEV_PANIC) {</div><div class='ctx'> 		m.status |= MCI_STATUS_PCC;</div><div class='add'>+		m.tsc = rdtsc();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	m.addr = mem_err-&gt;physical_addr;</div><div class='ctx'> 	mce_log(&amp;m);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce-genpool.c b/arch/x86/kernel/cpu/mcheck/mce-genpool.c<br/>index 93d824ec3120..1e5a50c11d3c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce-genpool.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/mcheck/mce-genpool.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce-genpool.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce-genpool.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ struct llist_node *mce_gen_pool_prepare_records(void)</div><div class='ctx'> 	return new_head.first;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mce_gen_pool_process(void)</div><div class='add'>+void mce_gen_pool_process(struct work_struct *__unused)</div><div class='ctx'> {</div><div class='ctx'> 	struct llist_node *head;</div><div class='ctx'> 	struct mce_evt_llist *node, *tmp;</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c<br/>index 517619ea6498..99165b206df3 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce-inject.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/mcheck/mce-inject.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce-inject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce-inject.c</a></div><div class='hunk'>@@ -152,7 +152,6 @@ static void raise_mce(struct mce *m)</div><div class='ctx'> 	if (context == MCJ_CTX_RANDOM)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_LOCAL_APIC</div><div class='ctx'> 	if (m-&gt;inject_flags &amp; (MCJ_IRQ_BROADCAST | MCJ_NMI_BROADCAST)) {</div><div class='ctx'> 		unsigned long start;</div><div class='ctx'> 		int cpu;</div><div class='hunk'>@@ -192,9 +191,7 @@ static void raise_mce(struct mce *m)</div><div class='ctx'> 		raise_local();</div><div class='ctx'> 		put_cpu();</div><div class='ctx'> 		put_online_cpus();</div><div class='del'>-	} else</div><div class='del'>-#endif</div><div class='del'>-	{</div><div class='add'>+	} else {</div><div class='ctx'> 		preempt_disable();</div><div class='ctx'> 		raise_local();</div><div class='ctx'> 		preempt_enable();</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce-internal.h b/arch/x86/kernel/cpu/mcheck/mce-internal.h<br/>index cd74a3f00aea..903043e6a62b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce-internal.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/mcheck/mce-internal.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce-internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce-internal.h</a></div><div class='hunk'>@@ -31,7 +31,7 @@ struct mce_evt_llist {</div><div class='ctx'> 	struct mce mce;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void mce_gen_pool_process(void);</div><div class='add'>+void mce_gen_pool_process(struct work_struct *__unused);</div><div class='ctx'> bool mce_gen_pool_empty(void);</div><div class='ctx'> int mce_gen_pool_add(struct mce *mce);</div><div class='ctx'> int mce_gen_pool_init(void);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce-severity.c b/arch/x86/kernel/cpu/mcheck/mce-severity.c<br/>index 631356c8cca4..87cc9ab7a13c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce-severity.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/mcheck/mce-severity.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce-severity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce-severity.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mce-internal.h"</div><div class='ctx'> </div><div class='hunk'>@@ -311,7 +311,7 @@ static int mce_severity_intel(struct mce *m, int tolerant, char **msg, bool is_e</div><div class='ctx'> 			*msg = s-&gt;msg;</div><div class='ctx'> 		s-&gt;covered = 1;</div><div class='ctx'> 		if (s-&gt;sev &gt;= MCE_UC_SEVERITY &amp;&amp; ctx == IN_KERNEL) {</div><div class='del'>-			if (panic_on_oops || tolerant &lt; 1)</div><div class='add'>+			if (tolerant &lt; 1)</div><div class='ctx'> 				return MCE_PANIC_SEVERITY;</div><div class='ctx'> 		}</div><div class='ctx'> 		return s-&gt;sev;</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c<br/>index a7fdf453d895..8e9725c607ea 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/mcheck/mce.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce.c</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/jump_label.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/intel-family.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='hunk'>@@ -127,7 +128,6 @@ void mce_setup(struct mce *m)</div><div class='ctx'> {</div><div class='ctx'> 	memset(m, 0, sizeof(struct mce));</div><div class='ctx'> 	m-&gt;cpu = m-&gt;extcpu = smp_processor_id();</div><div class='del'>-	m-&gt;tsc = rdtsc();</div><div class='ctx'> 	/* We hope get_seconds stays lockless */</div><div class='ctx'> 	m-&gt;time = get_seconds();</div><div class='ctx'> 	m-&gt;cpuvendor = boot_cpu_data.x86_vendor;</div><div class='hunk'>@@ -135,6 +135,9 @@ void mce_setup(struct mce *m)</div><div class='ctx'> 	m-&gt;socketid = cpu_data(m-&gt;extcpu).phys_proc_id;</div><div class='ctx'> 	m-&gt;apicid = cpu_data(m-&gt;extcpu).initial_apicid;</div><div class='ctx'> 	rdmsrl(MSR_IA32_MCG_CAP, m-&gt;mcgcap);</div><div class='add'>+</div><div class='add'>+	if (this_cpu_has(X86_FEATURE_INTEL_PPIN))</div><div class='add'>+		rdmsrl(MSR_PPIN, m-&gt;ppin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct mce, injectm);</div><div class='hunk'>@@ -207,11 +210,13 @@ EXPORT_SYMBOL_GPL(mce_inject_log);</div><div class='ctx'> </div><div class='ctx'> static struct notifier_block mce_srao_nb;</div><div class='ctx'> </div><div class='add'>+static atomic_t num_notifiers;</div><div class='add'>+</div><div class='ctx'> void mce_register_decode_chain(struct notifier_block *nb)</div><div class='ctx'> {</div><div class='del'>-	/* Ensure SRAO notifier has the highest priority in the decode chain. */</div><div class='del'>-	if (nb != &amp;mce_srao_nb &amp;&amp; nb-&gt;priority == INT_MAX)</div><div class='del'>-		nb-&gt;priority -= 1;</div><div class='add'>+	atomic_inc(&amp;num_notifiers);</div><div class='add'>+</div><div class='add'>+	WARN_ON(nb-&gt;priority &gt; MCE_PRIO_LOWEST &amp;&amp; nb-&gt;priority &lt; MCE_PRIO_EDAC);</div><div class='ctx'> </div><div class='ctx'> 	atomic_notifier_chain_register(&amp;x86_mce_decoder_chain, nb);</div><div class='ctx'> }</div><div class='hunk'>@@ -219,6 +224,8 @@ EXPORT_SYMBOL_GPL(mce_register_decode_chain);</div><div class='ctx'> </div><div class='ctx'> void mce_unregister_decode_chain(struct notifier_block *nb)</div><div class='ctx'> {</div><div class='add'>+	atomic_dec(&amp;num_notifiers);</div><div class='add'>+</div><div class='ctx'> 	atomic_notifier_chain_unregister(&amp;x86_mce_decoder_chain, nb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mce_unregister_decode_chain);</div><div class='hunk'>@@ -270,17 +277,17 @@ struct mca_msr_regs msr_ops = {</div><div class='ctx'> 	.misc	= misc_reg</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void print_mce(struct mce *m)</div><div class='add'>+static void __print_mce(struct mce *m)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	pr_emerg(HW_ERR "CPU %d: Machine Check Exception: %Lx Bank %d: %016Lx\n",</div><div class='del'>-	       m-&gt;extcpu, m-&gt;mcgstatus, m-&gt;bank, m-&gt;status);</div><div class='add'>+	pr_emerg(HW_ERR "CPU %d: Machine Check%s: %Lx Bank %d: %016Lx\n",</div><div class='add'>+		 m-&gt;extcpu,</div><div class='add'>+		 (m-&gt;mcgstatus &amp; MCG_STATUS_MCIP ? " Exception" : ""),</div><div class='add'>+		 m-&gt;mcgstatus, m-&gt;bank, m-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (m-&gt;ip) {</div><div class='ctx'> 		pr_emerg(HW_ERR "RIP%s %02x:&lt;%016Lx&gt; ",</div><div class='ctx'> 			!(m-&gt;mcgstatus &amp; MCG_STATUS_EIPV) ? " !INEXACT!" : "",</div><div class='del'>-				m-&gt;cs, m-&gt;ip);</div><div class='add'>+			m-&gt;cs, m-&gt;ip);</div><div class='ctx'> </div><div class='ctx'> 		if (m-&gt;cs == __KERNEL_CS)</div><div class='ctx'> 			print_symbol("{%s}", m-&gt;ip);</div><div class='hunk'>@@ -308,6 +315,13 @@ static void print_mce(struct mce *m)</div><div class='ctx'> 	pr_emerg(HW_ERR "PROCESSOR %u:%x TIME %llu SOCKET %u APIC %x microcode %x\n",</div><div class='ctx'> 		m-&gt;cpuvendor, m-&gt;cpuid, m-&gt;time, m-&gt;socketid, m-&gt;apicid,</div><div class='ctx'> 		cpu_data(m-&gt;extcpu).microcode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_mce(struct mce *m)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	__print_mce(m);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Print out human-readable details about the MCE error,</div><div class='hunk'>@@ -499,7 +513,7 @@ int mce_available(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> static void mce_schedule_work(void)</div><div class='ctx'> {</div><div class='del'>-	if (!mce_gen_pool_empty() &amp;&amp; keventd_up())</div><div class='add'>+	if (!mce_gen_pool_empty())</div><div class='ctx'> 		schedule_work(&amp;mce_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -566,7 +580,33 @@ static int srao_decode_notifier(struct notifier_block *nb, unsigned long val,</div><div class='ctx'> }</div><div class='ctx'> static struct notifier_block mce_srao_nb = {</div><div class='ctx'> 	.notifier_call	= srao_decode_notifier,</div><div class='del'>-	.priority = INT_MAX,</div><div class='add'>+	.priority	= MCE_PRIO_SRAO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mce_default_notifier(struct notifier_block *nb, unsigned long val,</div><div class='add'>+				void *data)</div><div class='add'>+{</div><div class='add'>+	struct mce *m = (struct mce *)data;</div><div class='add'>+</div><div class='add'>+	if (!m)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Run the default notifier if we have only the SRAO</div><div class='add'>+	 * notifier and us registered.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_read(&amp;num_notifiers) &gt; 2)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	__print_mce(m);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block mce_default_nb = {</div><div class='add'>+	.notifier_call	= mce_default_notifier,</div><div class='add'>+	/* lowest prio, we want it to run last. */</div><div class='add'>+	.priority	= MCE_PRIO_LOWEST,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -667,6 +707,9 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b)</div><div class='ctx'> </div><div class='ctx'> 	mce_gather_info(&amp;m, NULL);</div><div class='ctx'> </div><div class='add'>+	if (flags &amp; MCP_TIMESTAMP)</div><div class='add'>+		m.tsc = rdtsc();</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; mca_cfg.banks; i++) {</div><div class='ctx'> 		if (!mce_banks[i].ctl || !test_bit(i, *b))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -674,14 +717,12 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b)</div><div class='ctx'> 		m.misc = 0;</div><div class='ctx'> 		m.addr = 0;</div><div class='ctx'> 		m.bank = i;</div><div class='del'>-		m.tsc = 0;</div><div class='ctx'> </div><div class='ctx'> 		barrier();</div><div class='ctx'> 		m.status = mce_rdmsrl(msr_ops.status(i));</div><div class='ctx'> 		if (!(m.status &amp; MCI_STATUS_VAL))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Uncorrected or signalled events are handled by the exception</div><div class='ctx'> 		 * handler when it is enabled, so don't process those here.</div><div class='hunk'>@@ -696,9 +737,6 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b)</div><div class='ctx'> </div><div class='ctx'> 		mce_read_aux(&amp;m, i);</div><div class='ctx'> </div><div class='del'>-		if (!(flags &amp; MCP_TIMESTAMP))</div><div class='del'>-			m.tsc = 0;</div><div class='del'>-</div><div class='ctx'> 		severity = mce_severity(&amp;m, mca_cfg.tolerant, NULL, false);</div><div class='ctx'> </div><div class='ctx'> 		if (severity == MCE_DEFERRED_SEVERITY &amp;&amp; memory_error(&amp;m))</div><div class='hunk'>@@ -1109,6 +1147,7 @@ void do_machine_check(struct pt_regs *regs, long error_code)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	mce_gather_info(&amp;m, regs);</div><div class='add'>+	m.tsc = rdtsc();</div><div class='ctx'> </div><div class='ctx'> 	final = this_cpu_ptr(&amp;mces_seen);</div><div class='ctx'> 	*final = m;</div><div class='hunk'>@@ -1275,41 +1314,6 @@ int memory_failure(unsigned long pfn, int vector, int flags)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Action optional processing happens here (picking up</div><div class='del'>- * from the list of faulting pages that do_machine_check()</div><div class='del'>- * placed into the genpool).</div><div class='del'>- */</div><div class='del'>-static void mce_process_work(struct work_struct *dummy)</div><div class='del'>-{</div><div class='del'>-	mce_gen_pool_process();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_MCE_INTEL</div><div class='del'>-/***</div><div class='del'>- * mce_log_therm_throt_event - Logs the thermal throttling event to mcelog</div><div class='del'>- * @cpu: The CPU on which the event occurred.</div><div class='del'>- * @status: Event status information</div><div class='del'>- *</div><div class='del'>- * This function should be called by the thermal interrupt after the</div><div class='del'>- * event has been processed and the decision was made to log the event</div><div class='del'>- * further.</div><div class='del'>- *</div><div class='del'>- * The status parameter will be saved to the 'status' field of 'struct mce'</div><div class='del'>- * and historically has been the register value of the</div><div class='del'>- * MSR_IA32_THERMAL_STATUS (Intel) msr.</div><div class='del'>- */</div><div class='del'>-void mce_log_therm_throt_event(__u64 status)</div><div class='del'>-{</div><div class='del'>-	struct mce m;</div><div class='del'>-</div><div class='del'>-	mce_setup(&amp;m);</div><div class='del'>-	m.bank = MCE_THERMAL_BANK;</div><div class='del'>-	m.status = status;</div><div class='del'>-	mce_log(&amp;m);</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_X86_MCE_INTEL */</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Periodic polling timer for "silent" machine check errors.  If the</div><div class='ctx'>  * poller finds an MCE, poll 2x faster.  When the poller finds no more</div><div class='ctx'>  * errors, poll 2x slower (up to check_interval seconds).</div><div class='hunk'>@@ -1326,20 +1330,15 @@ static unsigned long mce_adjust_timer_default(unsigned long interval)</div><div class='ctx'> </div><div class='ctx'> static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default;</div><div class='ctx'> </div><div class='del'>-static void __restart_timer(struct timer_list *t, unsigned long interval)</div><div class='add'>+static void __start_timer(struct timer_list *t, unsigned long interval)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long when = jiffies + interval;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='del'>-	if (timer_pending(t)) {</div><div class='del'>-		if (time_before(when, t-&gt;expires))</div><div class='del'>-			mod_timer(t, when);</div><div class='del'>-	} else {</div><div class='del'>-		t-&gt;expires = round_jiffies(when);</div><div class='del'>-		add_timer_on(t, smp_processor_id());</div><div class='del'>-	}</div><div class='add'>+	if (!timer_pending(t) || time_before(when, t-&gt;expires))</div><div class='add'>+		mod_timer(t, round_jiffies(when));</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -1355,7 +1354,7 @@ static void mce_timer_fn(unsigned long data)</div><div class='ctx'> 	iv = __this_cpu_read(mce_next_interval);</div><div class='ctx'> </div><div class='ctx'> 	if (mce_available(this_cpu_ptr(&amp;cpu_info))) {</div><div class='del'>-		machine_check_poll(MCP_TIMESTAMP, this_cpu_ptr(&amp;mce_poll_banks));</div><div class='add'>+		machine_check_poll(0, this_cpu_ptr(&amp;mce_poll_banks));</div><div class='ctx'> </div><div class='ctx'> 		if (mce_intel_cmci_poll()) {</div><div class='ctx'> 			iv = mce_adjust_timer(iv);</div><div class='hunk'>@@ -1374,7 +1373,7 @@ static void mce_timer_fn(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	__this_cpu_write(mce_next_interval, iv);</div><div class='del'>-	__restart_timer(t, iv);</div><div class='add'>+	__start_timer(t, iv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1385,7 +1384,7 @@ void mce_timer_kick(unsigned long interval)</div><div class='ctx'> 	struct timer_list *t = this_cpu_ptr(&amp;mce_timer);</div><div class='ctx'> 	unsigned long iv = __this_cpu_read(mce_next_interval);</div><div class='ctx'> </div><div class='del'>-	__restart_timer(t, interval);</div><div class='add'>+	__start_timer(t, interval);</div><div class='ctx'> </div><div class='ctx'> 	if (interval &lt; iv)</div><div class='ctx'> 		__this_cpu_write(mce_next_interval, interval);</div><div class='hunk'>@@ -1732,17 +1731,23 @@ static void __mcheck_cpu_clear_vendor(struct cpuinfo_x86 *c)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mce_start_timer(unsigned int cpu, struct timer_list *t)</div><div class='add'>+static void mce_start_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long iv = check_interval * HZ;</div><div class='ctx'> </div><div class='ctx'> 	if (mca_cfg.ignore_ce || !iv)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	per_cpu(mce_next_interval, cpu) = iv;</div><div class='add'>+	this_cpu_write(mce_next_interval, iv);</div><div class='add'>+	__start_timer(t, iv);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	t-&gt;expires = round_jiffies(jiffies + iv);</div><div class='del'>-	add_timer_on(t, cpu);</div><div class='add'>+static void __mcheck_cpu_setup_timer(void)</div><div class='add'>+{</div><div class='add'>+	struct timer_list *t = this_cpu_ptr(&amp;mce_timer);</div><div class='add'>+	unsigned int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	setup_pinned_timer(t, mce_timer_fn, cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __mcheck_cpu_init_timer(void)</div><div class='hunk'>@@ -1751,7 +1756,7 @@ static void __mcheck_cpu_init_timer(void)</div><div class='ctx'> 	unsigned int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	setup_pinned_timer(t, mce_timer_fn, cpu);</div><div class='del'>-	mce_start_timer(cpu, t);</div><div class='add'>+	mce_start_timer(t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Handle unconfigured int18 (should never happen) */</div><div class='hunk'>@@ -1796,7 +1801,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)</div><div class='ctx'> 	__mcheck_cpu_init_generic();</div><div class='ctx'> 	__mcheck_cpu_init_vendor(c);</div><div class='ctx'> 	__mcheck_cpu_init_clear_banks();</div><div class='del'>-	__mcheck_cpu_init_timer();</div><div class='add'>+	__mcheck_cpu_setup_timer();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2138,9 +2143,10 @@ int __init mcheck_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	mcheck_intel_therm_init();</div><div class='ctx'> 	mce_register_decode_chain(&amp;mce_srao_nb);</div><div class='add'>+	mce_register_decode_chain(&amp;mce_default_nb);</div><div class='ctx'> 	mcheck_vendor_init_severity();</div><div class='ctx'> </div><div class='del'>-	INIT_WORK(&amp;mce_work, mce_process_work);</div><div class='add'>+	INIT_WORK(&amp;mce_work, mce_gen_pool_process);</div><div class='ctx'> 	init_irq_work(&amp;mce_irq_work, mce_irq_work_cb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2255,8 +2261,6 @@ static struct bus_type mce_subsys = {</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct device *, mce_device);</div><div class='ctx'> </div><div class='del'>-void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);</div><div class='del'>-</div><div class='ctx'> static inline struct mce_bank *attr_to_bank(struct device_attribute *attr)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(attr, struct mce_bank, attr);</div><div class='hunk'>@@ -2409,6 +2413,10 @@ static int mce_device_create(unsigned int cpu)</div><div class='ctx'> 	if (!mce_available(&amp;boot_cpu_data))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='add'>+	dev = per_cpu(mce_device, cpu);</div><div class='add'>+	if (dev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	dev = kzalloc(sizeof *dev, GFP_KERNEL);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -2468,28 +2476,25 @@ static void mce_device_remove(unsigned int cpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Make sure there are no machine checks on offlined CPUs. */</div><div class='del'>-static void mce_disable_cpu(void *h)</div><div class='add'>+static void mce_disable_cpu(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long action = *(unsigned long *)h;</div><div class='del'>-</div><div class='ctx'> 	if (!mce_available(raw_cpu_ptr(&amp;cpu_info)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!(action &amp; CPU_TASKS_FROZEN))</div><div class='add'>+	if (!cpuhp_tasks_frozen)</div><div class='ctx'> 		cmci_clear();</div><div class='ctx'> </div><div class='ctx'> 	vendor_disable_error_reporting();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mce_reenable_cpu(void *h)</div><div class='add'>+static void mce_reenable_cpu(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long action = *(unsigned long *)h;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!mce_available(raw_cpu_ptr(&amp;cpu_info)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!(action &amp; CPU_TASKS_FROZEN))</div><div class='add'>+	if (!cpuhp_tasks_frozen)</div><div class='ctx'> 		cmci_reenable();</div><div class='ctx'> 	for (i = 0; i &lt; mca_cfg.banks; i++) {</div><div class='ctx'> 		struct mce_bank *b = &amp;mce_banks[i];</div><div class='hunk'>@@ -2499,45 +2504,43 @@ static void mce_reenable_cpu(void *h)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Get notified when a cpu comes on/off. Be hotplug friendly. */</div><div class='del'>-static int</div><div class='del'>-mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)</div><div class='add'>+static int mce_cpu_dead(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	struct timer_list *t = &amp;per_cpu(mce_timer, cpu);</div><div class='add'>+	mce_intel_hcpu_update(cpu);</div><div class='ctx'> </div><div class='del'>-	switch (action &amp; ~CPU_TASKS_FROZEN) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-		mce_device_create(cpu);</div><div class='del'>-		if (threshold_cpu_callback)</div><div class='del'>-			threshold_cpu_callback(action, cpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-		if (threshold_cpu_callback)</div><div class='del'>-			threshold_cpu_callback(action, cpu);</div><div class='del'>-		mce_device_remove(cpu);</div><div class='del'>-		mce_intel_hcpu_update(cpu);</div><div class='add'>+	/* intentionally ignoring frozen here */</div><div class='add'>+	if (!cpuhp_tasks_frozen)</div><div class='add'>+		cmci_rediscover();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/* intentionally ignoring frozen here */</div><div class='del'>-		if (!(action &amp; CPU_TASKS_FROZEN))</div><div class='del'>-			cmci_rediscover();</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DOWN_PREPARE:</div><div class='del'>-		smp_call_function_single(cpu, mce_disable_cpu, &amp;action, 1);</div><div class='del'>-		del_timer_sync(t);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DOWN_FAILED:</div><div class='del'>-		smp_call_function_single(cpu, mce_reenable_cpu, &amp;action, 1);</div><div class='del'>-		mce_start_timer(cpu, t);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+static int mce_cpu_online(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct timer_list *t = this_cpu_ptr(&amp;mce_timer);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return NOTIFY_OK;</div><div class='add'>+	mce_device_create(cpu);</div><div class='add'>+</div><div class='add'>+	ret = mce_threshold_create_device(cpu);</div><div class='add'>+	if (ret) {</div><div class='add'>+		mce_device_remove(cpu);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	mce_reenable_cpu();</div><div class='add'>+	mce_start_timer(t);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block mce_cpu_notifier = {</div><div class='del'>-	.notifier_call = mce_cpu_callback,</div><div class='del'>-};</div><div class='add'>+static int mce_cpu_pre_down(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct timer_list *t = this_cpu_ptr(&amp;mce_timer);</div><div class='add'>+</div><div class='add'>+	mce_disable_cpu();</div><div class='add'>+	del_timer_sync(t);</div><div class='add'>+	mce_threshold_remove_device(cpu);</div><div class='add'>+	mce_device_remove(cpu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static __init void mce_init_banks(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -2559,8 +2562,8 @@ static __init void mce_init_banks(void)</div><div class='ctx'> </div><div class='ctx'> static __init int mcheck_init_device(void)</div><div class='ctx'> {</div><div class='add'>+	enum cpuhp_state hp_online;</div><div class='ctx'> 	int err;</div><div class='del'>-	int i = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!mce_available(&amp;boot_cpu_data)) {</div><div class='ctx'> 		err = -EIO;</div><div class='hunk'>@@ -2578,23 +2581,16 @@ static __init int mcheck_init_device(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out_mem;</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-	for_each_online_cpu(i) {</div><div class='del'>-		err = mce_device_create(i);</div><div class='del'>-		if (err) {</div><div class='del'>-			/*</div><div class='del'>-			 * Register notifier anyway (and do not unreg it) so</div><div class='del'>-			 * that we don't leave undeleted timers, see notifier</div><div class='del'>-			 * callback above.</div><div class='del'>-			 */</div><div class='del'>-			__register_hotcpu_notifier(&amp;mce_cpu_notifier);</div><div class='del'>-			cpu_notifier_register_done();</div><div class='del'>-			goto err_device_create;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	err = cpuhp_setup_state(CPUHP_X86_MCE_DEAD, "x86/mce:dead", NULL,</div><div class='add'>+				mce_cpu_dead);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out_mem;</div><div class='ctx'> </div><div class='del'>-	__register_hotcpu_notifier(&amp;mce_cpu_notifier);</div><div class='del'>-	cpu_notifier_register_done();</div><div class='add'>+	err = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/mce:online",</div><div class='add'>+				mce_cpu_online, mce_cpu_pre_down);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_out_online;</div><div class='add'>+	hp_online = err;</div><div class='ctx'> </div><div class='ctx'> 	register_syscore_ops(&amp;mce_syscore_ops);</div><div class='ctx'> </div><div class='hunk'>@@ -2607,16 +2603,10 @@ static __init int mcheck_init_device(void)</div><div class='ctx'> </div><div class='ctx'> err_register:</div><div class='ctx'> 	unregister_syscore_ops(&amp;mce_syscore_ops);</div><div class='add'>+	cpuhp_remove_state(hp_online);</div><div class='ctx'> </div><div class='del'>-err_device_create:</div><div class='del'>-	/*</div><div class='del'>-	 * We didn't keep track of which devices were created above, but</div><div class='del'>-	 * even if we had, the set of online cpus might have changed.</div><div class='del'>-	 * Play safe and remove for every possible cpu, since</div><div class='del'>-	 * mce_device_remove() will do the right thing.</div><div class='del'>-	 */</div><div class='del'>-	for_each_possible_cpu(i)</div><div class='del'>-		mce_device_remove(i);</div><div class='add'>+err_out_online:</div><div class='add'>+	cpuhp_remove_state(CPUHP_X86_MCE_DEAD);</div><div class='ctx'> </div><div class='ctx'> err_out_mem:</div><div class='ctx'> 	free_cpumask_var(mce_device_initialized);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c<br/>index 9b5403462936..524cc5780a77 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce_amd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/mcheck/mce_amd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce_amd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce_amd.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/amd_nb.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/trace/irq_vectors.h&gt;</div><div class='hunk'>@@ -55,6 +54,8 @@</div><div class='ctx'> /* Threshold LVT offset is at MSR0xC0000410[15:12] */</div><div class='ctx'> #define SMCA_THR_LVT_OFF	0xF000</div><div class='ctx'> </div><div class='add'>+static bool thresholding_en;</div><div class='add'>+</div><div class='ctx'> static const char * const th_names[] = {</div><div class='ctx'> 	"load_store",</div><div class='ctx'> 	"insn_fetch",</div><div class='hunk'>@@ -69,7 +70,12 @@ static const char * const smca_umc_block_names[] = {</div><div class='ctx'> 	"misc_umc"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct smca_bank_name smca_bank_names[] = {</div><div class='add'>+struct smca_bank_name {</div><div class='add'>+	const char *name;	/* Short name for sysfs */</div><div class='add'>+	const char *long_name;	/* Long name for pretty-printing */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct smca_bank_name smca_names[] = {</div><div class='ctx'> 	[SMCA_LS]	= { "load_store",	"Load Store Unit" },</div><div class='ctx'> 	[SMCA_IF]	= { "insn_fetch",	"Instruction Fetch Unit" },</div><div class='ctx'> 	[SMCA_L2_CACHE]	= { "l2_cache",		"L2 Cache" },</div><div class='hunk'>@@ -84,9 +90,25 @@ struct smca_bank_name smca_bank_names[] = {</div><div class='ctx'> 	[SMCA_PSP]	= { "psp",		"Platform Security Processor" },</div><div class='ctx'> 	[SMCA_SMU]	= { "smu",		"System Management Unit" },</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL_GPL(smca_bank_names);</div><div class='ctx'> </div><div class='del'>-static struct smca_hwid_mcatype smca_hwid_mcatypes[] = {</div><div class='add'>+const char *smca_get_name(enum smca_bank_types t)</div><div class='add'>+{</div><div class='add'>+	if (t &gt;= N_SMCA_BANK_TYPES)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return smca_names[t].name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *smca_get_long_name(enum smca_bank_types t)</div><div class='add'>+{</div><div class='add'>+	if (t &gt;= N_SMCA_BANK_TYPES)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return smca_names[t].long_name;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(smca_get_long_name);</div><div class='add'>+</div><div class='add'>+static struct smca_hwid smca_hwid_mcatypes[] = {</div><div class='ctx'> 	/* { bank_type, hwid_mcatype, xec_bitmap } */</div><div class='ctx'> </div><div class='ctx'> 	/* ZN Core (HWID=0xB0) MCA types */</div><div class='hunk'>@@ -116,7 +138,7 @@ static struct smca_hwid_mcatype smca_hwid_mcatypes[] = {</div><div class='ctx'> 	{ SMCA_SMU,	 HWID_MCATYPE(0x01, 0x0), 0x1 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct smca_bank_info smca_banks[MAX_NR_BANKS];</div><div class='add'>+struct smca_bank smca_banks[MAX_NR_BANKS];</div><div class='ctx'> EXPORT_SYMBOL_GPL(smca_banks);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -142,35 +164,35 @@ static void default_deferred_error_interrupt(void)</div><div class='ctx'> }</div><div class='ctx'> void (*deferred_error_int_vector)(void) = default_deferred_error_interrupt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * CPU Initialization</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> static void get_smca_bank_info(unsigned int bank)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i, hwid_mcatype, cpu = smp_processor_id();</div><div class='del'>-	struct smca_hwid_mcatype *type;</div><div class='del'>-	u32 high, instanceId;</div><div class='del'>-	u16 hwid, mcatype;</div><div class='add'>+	struct smca_hwid *s_hwid;</div><div class='add'>+	u32 high, instance_id;</div><div class='ctx'> </div><div class='ctx'> 	/* Collect bank_info using CPU 0 for now. */</div><div class='ctx'> 	if (cpu)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (rdmsr_safe_on_cpu(cpu, MSR_AMD64_SMCA_MCx_IPID(bank), &amp;instanceId, &amp;high)) {</div><div class='add'>+	if (rdmsr_safe_on_cpu(cpu, MSR_AMD64_SMCA_MCx_IPID(bank), &amp;instance_id, &amp;high)) {</div><div class='ctx'> 		pr_warn("Failed to read MCA_IPID for bank %d\n", bank);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hwid = high &amp; MCI_IPID_HWID;</div><div class='del'>-	mcatype = (high &amp; MCI_IPID_MCATYPE) &gt;&gt; 16;</div><div class='del'>-	hwid_mcatype = HWID_MCATYPE(hwid, mcatype);</div><div class='add'>+	hwid_mcatype = HWID_MCATYPE(high &amp; MCI_IPID_HWID,</div><div class='add'>+				    (high &amp; MCI_IPID_MCATYPE) &gt;&gt; 16);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(smca_hwid_mcatypes); i++) {</div><div class='del'>-		type = &amp;smca_hwid_mcatypes[i];</div><div class='del'>-		if (hwid_mcatype == type-&gt;hwid_mcatype) {</div><div class='del'>-			smca_banks[bank].type = type;</div><div class='del'>-			smca_banks[bank].type_instance = instanceId;</div><div class='add'>+		s_hwid = &amp;smca_hwid_mcatypes[i];</div><div class='add'>+		if (hwid_mcatype == s_hwid-&gt;hwid_mcatype) {</div><div class='add'>+</div><div class='add'>+			WARN(smca_banks[bank].hwid,</div><div class='add'>+			     "Bank %s already initialized!\n",</div><div class='add'>+			     smca_get_name(s_hwid-&gt;bank_type));</div><div class='add'>+</div><div class='add'>+			smca_banks[bank].hwid = s_hwid;</div><div class='add'>+			smca_banks[bank].id = instance_id;</div><div class='add'>+			smca_banks[bank].sysfs_id = s_hwid-&gt;count++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -533,6 +555,206 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)</div><div class='ctx'> 		deferred_error_interrupt_enable(c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr)</div><div class='add'>+{</div><div class='add'>+	u64 dram_base_addr, dram_limit_addr, dram_hole_base;</div><div class='add'>+	/* We start from the normalized address */</div><div class='add'>+	u64 ret_addr = norm_addr;</div><div class='add'>+</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	u8 die_id_shift, die_id_mask, socket_id_shift, socket_id_mask;</div><div class='add'>+	u8 intlv_num_dies, intlv_num_chan, intlv_num_sockets;</div><div class='add'>+	u8 intlv_addr_sel, intlv_addr_bit;</div><div class='add'>+	u8 num_intlv_bits, hashed_bit;</div><div class='add'>+	u8 lgcy_mmio_hole_en, base = 0;</div><div class='add'>+	u8 cs_mask, cs_id = 0;</div><div class='add'>+	bool hash_enabled = false;</div><div class='add'>+</div><div class='add'>+	/* Read D18F0x1B4 (DramOffset), check if base 1 is used. */</div><div class='add'>+	if (amd_df_indirect_read(nid, 0, 0x1B4, umc, &amp;tmp))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	/* Remove HiAddrOffset from normalized address, if enabled: */</div><div class='add'>+	if (tmp &amp; BIT(0)) {</div><div class='add'>+		u64 hi_addr_offset = (tmp &amp; GENMASK_ULL(31, 20)) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+		if (norm_addr &gt;= hi_addr_offset) {</div><div class='add'>+			ret_addr -= hi_addr_offset;</div><div class='add'>+			base = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read D18F0x110 (DramBaseAddress). */</div><div class='add'>+	if (amd_df_indirect_read(nid, 0, 0x110 + (8 * base), umc, &amp;tmp))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	/* Check if address range is valid. */</div><div class='add'>+	if (!(tmp &amp; BIT(0))) {</div><div class='add'>+		pr_err("%s: Invalid DramBaseAddress range: 0x%x.\n",</div><div class='add'>+			__func__, tmp);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lgcy_mmio_hole_en = tmp &amp; BIT(1);</div><div class='add'>+	intlv_num_chan	  = (tmp &gt;&gt; 4) &amp; 0xF;</div><div class='add'>+	intlv_addr_sel	  = (tmp &gt;&gt; 8) &amp; 0x7;</div><div class='add'>+	dram_base_addr	  = (tmp &amp; GENMASK_ULL(31, 12)) &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	/* {0, 1, 2, 3} map to address bits {8, 9, 10, 11} respectively */</div><div class='add'>+	if (intlv_addr_sel &gt; 3) {</div><div class='add'>+		pr_err("%s: Invalid interleave address select %d.\n",</div><div class='add'>+			__func__, intlv_addr_sel);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read D18F0x114 (DramLimitAddress). */</div><div class='add'>+	if (amd_df_indirect_read(nid, 0, 0x114 + (8 * base), umc, &amp;tmp))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	intlv_num_sockets = (tmp &gt;&gt; 8) &amp; 0x1;</div><div class='add'>+	intlv_num_dies	  = (tmp &gt;&gt; 10) &amp; 0x3;</div><div class='add'>+	dram_limit_addr	  = ((tmp &amp; GENMASK_ULL(31, 12)) &lt;&lt; 16) | GENMASK_ULL(27, 0);</div><div class='add'>+</div><div class='add'>+	intlv_addr_bit = intlv_addr_sel + 8;</div><div class='add'>+</div><div class='add'>+	/* Re-use intlv_num_chan by setting it equal to log2(#channels) */</div><div class='add'>+	switch (intlv_num_chan) {</div><div class='add'>+	case 0:	intlv_num_chan = 0; break;</div><div class='add'>+	case 1: intlv_num_chan = 1; break;</div><div class='add'>+	case 3: intlv_num_chan = 2; break;</div><div class='add'>+	case 5:	intlv_num_chan = 3; break;</div><div class='add'>+	case 7:	intlv_num_chan = 4; break;</div><div class='add'>+</div><div class='add'>+	case 8: intlv_num_chan = 1;</div><div class='add'>+		hash_enabled = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("%s: Invalid number of interleaved channels %d.\n",</div><div class='add'>+			__func__, intlv_num_chan);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_intlv_bits = intlv_num_chan;</div><div class='add'>+</div><div class='add'>+	if (intlv_num_dies &gt; 2) {</div><div class='add'>+		pr_err("%s: Invalid number of interleaved nodes/dies %d.\n",</div><div class='add'>+			__func__, intlv_num_dies);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_intlv_bits += intlv_num_dies;</div><div class='add'>+</div><div class='add'>+	/* Add a bit if sockets are interleaved. */</div><div class='add'>+	num_intlv_bits += intlv_num_sockets;</div><div class='add'>+</div><div class='add'>+	/* Assert num_intlv_bits &lt;= 4 */</div><div class='add'>+	if (num_intlv_bits &gt; 4) {</div><div class='add'>+		pr_err("%s: Invalid interleave bits %d.\n",</div><div class='add'>+			__func__, num_intlv_bits);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_intlv_bits &gt; 0) {</div><div class='add'>+		u64 temp_addr_x, temp_addr_i, temp_addr_y;</div><div class='add'>+		u8 die_id_bit, sock_id_bit, cs_fabric_id;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Read FabricBlockInstanceInformation3_CS[BlockFabricID].</div><div class='add'>+		 * This is the fabric id for this coherent slave. Use</div><div class='add'>+		 * umc/channel# as instance id of the coherent slave</div><div class='add'>+		 * for FICAA.</div><div class='add'>+		 */</div><div class='add'>+		if (amd_df_indirect_read(nid, 0, 0x50, umc, &amp;tmp))</div><div class='add'>+			goto out_err;</div><div class='add'>+</div><div class='add'>+		cs_fabric_id = (tmp &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+		die_id_bit   = 0;</div><div class='add'>+</div><div class='add'>+		/* If interleaved over more than 1 channel: */</div><div class='add'>+		if (intlv_num_chan) {</div><div class='add'>+			die_id_bit = intlv_num_chan;</div><div class='add'>+			cs_mask	   = (1 &lt;&lt; die_id_bit) - 1;</div><div class='add'>+			cs_id	   = cs_fabric_id &amp; cs_mask;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sock_id_bit = die_id_bit;</div><div class='add'>+</div><div class='add'>+		/* Read D18F1x208 (SystemFabricIdMask). */</div><div class='add'>+		if (intlv_num_dies || intlv_num_sockets)</div><div class='add'>+			if (amd_df_indirect_read(nid, 1, 0x208, umc, &amp;tmp))</div><div class='add'>+				goto out_err;</div><div class='add'>+</div><div class='add'>+		/* If interleaved over more than 1 die. */</div><div class='add'>+		if (intlv_num_dies) {</div><div class='add'>+			sock_id_bit  = die_id_bit + intlv_num_dies;</div><div class='add'>+			die_id_shift = (tmp &gt;&gt; 24) &amp; 0xF;</div><div class='add'>+			die_id_mask  = (tmp &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+			cs_id |= ((cs_fabric_id &amp; die_id_mask) &gt;&gt; die_id_shift) &lt;&lt; die_id_bit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If interleaved over more than 1 socket. */</div><div class='add'>+		if (intlv_num_sockets) {</div><div class='add'>+			socket_id_shift	= (tmp &gt;&gt; 28) &amp; 0xF;</div><div class='add'>+			socket_id_mask	= (tmp &gt;&gt; 16) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+			cs_id |= ((cs_fabric_id &amp; socket_id_mask) &gt;&gt; socket_id_shift) &lt;&lt; sock_id_bit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The pre-interleaved address consists of XXXXXXIIIYYYYY</div><div class='add'>+		 * where III is the ID for this CS, and XXXXXXYYYYY are the</div><div class='add'>+		 * address bits from the post-interleaved address.</div><div class='add'>+		 * "num_intlv_bits" has been calculated to tell us how many "I"</div><div class='add'>+		 * bits there are. "intlv_addr_bit" tells us how many "Y" bits</div><div class='add'>+		 * there are (where "I" starts).</div><div class='add'>+		 */</div><div class='add'>+		temp_addr_y = ret_addr &amp; GENMASK_ULL(intlv_addr_bit-1, 0);</div><div class='add'>+		temp_addr_i = (cs_id &lt;&lt; intlv_addr_bit);</div><div class='add'>+		temp_addr_x = (ret_addr &amp; GENMASK_ULL(63, intlv_addr_bit)) &lt;&lt; num_intlv_bits;</div><div class='add'>+		ret_addr    = temp_addr_x | temp_addr_i | temp_addr_y;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add dram base address */</div><div class='add'>+	ret_addr += dram_base_addr;</div><div class='add'>+</div><div class='add'>+	/* If legacy MMIO hole enabled */</div><div class='add'>+	if (lgcy_mmio_hole_en) {</div><div class='add'>+		if (amd_df_indirect_read(nid, 0, 0x104, umc, &amp;tmp))</div><div class='add'>+			goto out_err;</div><div class='add'>+</div><div class='add'>+		dram_hole_base = tmp &amp; GENMASK(31, 24);</div><div class='add'>+		if (ret_addr &gt;= dram_hole_base)</div><div class='add'>+			ret_addr += (BIT_ULL(32) - dram_hole_base);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hash_enabled) {</div><div class='add'>+		/* Save some parentheses and grab ls-bit at the end. */</div><div class='add'>+		hashed_bit =	(ret_addr &gt;&gt; 12) ^</div><div class='add'>+				(ret_addr &gt;&gt; 18) ^</div><div class='add'>+				(ret_addr &gt;&gt; 21) ^</div><div class='add'>+				(ret_addr &gt;&gt; 30) ^</div><div class='add'>+				cs_id;</div><div class='add'>+</div><div class='add'>+		hashed_bit &amp;= BIT(0);</div><div class='add'>+</div><div class='add'>+		if (hashed_bit != ((ret_addr &gt;&gt; intlv_addr_bit) &amp; BIT(0)))</div><div class='add'>+			ret_addr ^= BIT(intlv_addr_bit);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Is calculated system address is above DRAM limit address? */</div><div class='add'>+	if (ret_addr &gt; dram_limit_addr)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	*sys_addr = ret_addr;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(umc_normaddr_to_sysaddr);</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> __log_error(unsigned int bank, bool deferred_err, bool threshold_err, u64 misc)</div><div class='ctx'> {</div><div class='hunk'>@@ -556,7 +778,8 @@ __log_error(unsigned int bank, bool deferred_err, bool threshold_err, u64 misc)</div><div class='ctx'> 	mce_setup(&amp;m);</div><div class='ctx'> </div><div class='ctx'> 	m.status = status;</div><div class='del'>-	m.bank = bank;</div><div class='add'>+	m.bank   = bank;</div><div class='add'>+	m.tsc	 = rdtsc();</div><div class='ctx'> </div><div class='ctx'> 	if (threshold_err)</div><div class='ctx'> 		m.misc = misc;</div><div class='hunk'>@@ -593,14 +816,14 @@ static inline void __smp_deferred_error_interrupt(void)</div><div class='ctx'> 	deferred_error_int_vector();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage __visible void smp_deferred_error_interrupt(void)</div><div class='add'>+asmlinkage __visible void __irq_entry smp_deferred_error_interrupt(void)</div><div class='ctx'> {</div><div class='ctx'> 	entering_irq();</div><div class='ctx'> 	__smp_deferred_error_interrupt();</div><div class='ctx'> 	exiting_ack_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage __visible void smp_trace_deferred_error_interrupt(void)</div><div class='add'>+asmlinkage __visible void __irq_entry smp_trace_deferred_error_interrupt(void)</div><div class='ctx'> {</div><div class='ctx'> 	entering_irq();</div><div class='ctx'> 	trace_deferred_error_apic_entry(DEFERRED_ERROR_VECTOR);</div><div class='hunk'>@@ -645,6 +868,7 @@ static void amd_threshold_interrupt(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 low = 0, high = 0, address = 0;</div><div class='ctx'> 	unsigned int bank, block, cpu = smp_processor_id();</div><div class='add'>+	struct thresh_restart tr;</div><div class='ctx'> </div><div class='ctx'> 	/* assume first bank caused it */</div><div class='ctx'> 	for (bank = 0; bank &lt; mca_cfg.banks; ++bank) {</div><div class='hunk'>@@ -681,6 +905,11 @@ static void amd_threshold_interrupt(void)</div><div class='ctx'> </div><div class='ctx'> log:</div><div class='ctx'> 	__log_error(bank, false, true, ((u64)high &lt;&lt; 32) | low);</div><div class='add'>+</div><div class='add'>+	/* Reset threshold block after logging error. */</div><div class='add'>+	memset(&amp;tr, 0, sizeof(tr));</div><div class='add'>+	tr.b = &amp;per_cpu(threshold_banks, cpu)[bank]-&gt;blocks[block];</div><div class='add'>+	threshold_restart_bank(&amp;tr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -826,10 +1055,10 @@ static const char *get_name(unsigned int bank, struct threshold_block *b)</div><div class='ctx'> 		return th_names[bank];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!smca_banks[bank].type)</div><div class='add'>+	if (!smca_banks[bank].hwid)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	bank_type = smca_banks[bank].type-&gt;bank_type;</div><div class='add'>+	bank_type = smca_banks[bank].hwid-&gt;bank_type;</div><div class='ctx'> </div><div class='ctx'> 	if (b &amp;&amp; bank_type == SMCA_UMC) {</div><div class='ctx'> 		if (b-&gt;block &lt; ARRAY_SIZE(smca_umc_block_names))</div><div class='hunk'>@@ -837,9 +1066,12 @@ static const char *get_name(unsigned int bank, struct threshold_block *b)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (smca_banks[bank].hwid-&gt;count == 1)</div><div class='add'>+		return smca_get_name(bank_type);</div><div class='add'>+</div><div class='ctx'> 	snprintf(buf_mcatype, MAX_MCATYPE_NAME_LEN,</div><div class='del'>-		 "%s_%x", smca_bank_names[bank_type].name,</div><div class='del'>-			  smca_banks[bank].type_instance);</div><div class='add'>+		 "%s_%x", smca_get_name(bank_type),</div><div class='add'>+			  smca_banks[bank].sysfs_id);</div><div class='ctx'> 	return buf_mcatype;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -955,6 +1187,9 @@ static int threshold_create_bank(unsigned int cpu, unsigned int bank)</div><div class='ctx'> 	const char *name = get_name(bank, NULL);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	if (is_shared_bank(bank)) {</div><div class='ctx'> 		nb = node_to_amd_nb(amd_get_nb_id(cpu));</div><div class='ctx'> </div><div class='hunk'>@@ -1010,31 +1245,6 @@ static int threshold_create_bank(unsigned int cpu, unsigned int bank)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* create dir/files for all valid threshold banks */</div><div class='del'>-static int threshold_create_device(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int bank;</div><div class='del'>-	struct threshold_bank **bp;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	bp = kzalloc(sizeof(struct threshold_bank *) * mca_cfg.banks,</div><div class='del'>-		     GFP_KERNEL);</div><div class='del'>-	if (!bp)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	per_cpu(threshold_banks, cpu) = bp;</div><div class='del'>-</div><div class='del'>-	for (bank = 0; bank &lt; mca_cfg.banks; ++bank) {</div><div class='del'>-		if (!(per_cpu(bank_map, cpu) &amp; (1 &lt;&lt; bank)))</div><div class='del'>-			continue;</div><div class='del'>-		err = threshold_create_bank(cpu, bank);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void deallocate_threshold_block(unsigned int cpu,</div><div class='ctx'> 						 unsigned int bank)</div><div class='ctx'> {</div><div class='hunk'>@@ -1102,48 +1312,71 @@ free_out:</div><div class='ctx'> 	per_cpu(threshold_banks, cpu)[bank] = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void threshold_remove_device(unsigned int cpu)</div><div class='add'>+int mce_threshold_remove_device(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int bank;</div><div class='ctx'> </div><div class='add'>+	if (!thresholding_en)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	for (bank = 0; bank &lt; mca_cfg.banks; ++bank) {</div><div class='ctx'> 		if (!(per_cpu(bank_map, cpu) &amp; (1 &lt;&lt; bank)))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		threshold_remove_bank(cpu, bank);</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(per_cpu(threshold_banks, cpu));</div><div class='add'>+	per_cpu(threshold_banks, cpu) = NULL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* get notified when a cpu comes on/off */</div><div class='del'>-static void</div><div class='del'>-amd_64_threshold_cpu_callback(unsigned long action, unsigned int cpu)</div><div class='add'>+/* create dir/files for all valid threshold banks */</div><div class='add'>+int mce_threshold_create_device(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-	case CPU_ONLINE_FROZEN:</div><div class='del'>-		threshold_create_device(cpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-	case CPU_DEAD_FROZEN:</div><div class='del'>-		threshold_remove_device(cpu);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+	unsigned int bank;</div><div class='add'>+	struct threshold_bank **bp;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!thresholding_en)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bp = per_cpu(threshold_banks, cpu);</div><div class='add'>+	if (bp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bp = kzalloc(sizeof(struct threshold_bank *) * mca_cfg.banks,</div><div class='add'>+		     GFP_KERNEL);</div><div class='add'>+	if (!bp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	per_cpu(threshold_banks, cpu) = bp;</div><div class='add'>+</div><div class='add'>+	for (bank = 0; bank &lt; mca_cfg.banks; ++bank) {</div><div class='add'>+		if (!(per_cpu(bank_map, cpu) &amp; (1 &lt;&lt; bank)))</div><div class='add'>+			continue;</div><div class='add'>+		err = threshold_create_bank(cpu, bank);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err;</div><div class='ctx'> 	}</div><div class='add'>+	return err;</div><div class='add'>+err:</div><div class='add'>+	mce_threshold_remove_device(cpu);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init int threshold_init_device(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned lcpu = 0;</div><div class='ctx'> </div><div class='add'>+	if (mce_threshold_vector == amd_threshold_interrupt)</div><div class='add'>+		thresholding_en = true;</div><div class='add'>+</div><div class='ctx'> 	/* to hit CPUs online before the notifier is up */</div><div class='ctx'> 	for_each_online_cpu(lcpu) {</div><div class='del'>-		int err = threshold_create_device(lcpu);</div><div class='add'>+		int err = mce_threshold_create_device(lcpu);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='del'>-	threshold_cpu_callback = amd_64_threshold_cpu_callback;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel.c b/arch/x86/kernel/cpu/mcheck/mce_intel.c<br/>index 1defb8ea882c..190b3e6cef4d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce_intel.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/mcheck/mce_intel.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/mce_intel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/mce_intel.c</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='add'>+#include &lt;asm/cpufeature.h&gt;</div><div class='add'>+#include &lt;asm/intel-family.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='hunk'>@@ -130,7 +132,7 @@ bool mce_intel_cmci_poll(void)</div><div class='ctx'> 	 * Reset the counter if we've logged an error in the last poll</div><div class='ctx'> 	 * during the storm.</div><div class='ctx'> 	 */</div><div class='del'>-	if (machine_check_poll(MCP_TIMESTAMP, this_cpu_ptr(&amp;mce_banks_owned)))</div><div class='add'>+	if (machine_check_poll(0, this_cpu_ptr(&amp;mce_banks_owned)))</div><div class='ctx'> 		this_cpu_write(cmci_backoff_cnt, INITIAL_CHECK_INTERVAL);</div><div class='ctx'> 	else</div><div class='ctx'> 		this_cpu_dec(cmci_backoff_cnt);</div><div class='hunk'>@@ -342,7 +344,7 @@ void cmci_recheck(void)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='del'>-	machine_check_poll(MCP_TIMESTAMP, this_cpu_ptr(&amp;mce_banks_owned));</div><div class='add'>+	machine_check_poll(0, this_cpu_ptr(&amp;mce_banks_owned));</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -464,11 +466,46 @@ static void intel_clear_lmce(void)</div><div class='ctx'> 	wrmsrl(MSR_IA32_MCG_EXT_CTL, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void intel_ppin_init(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	unsigned long long val;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Even if testing the presence of the MSR would be enough, we don't</div><div class='add'>+	 * want to risk the situation where other models reuse this MSR for</div><div class='add'>+	 * other purposes.</div><div class='add'>+	 */</div><div class='add'>+	switch (c-&gt;x86_model) {</div><div class='add'>+	case INTEL_FAM6_IVYBRIDGE_X:</div><div class='add'>+	case INTEL_FAM6_HASWELL_X:</div><div class='add'>+	case INTEL_FAM6_BROADWELL_XEON_D:</div><div class='add'>+	case INTEL_FAM6_BROADWELL_X:</div><div class='add'>+	case INTEL_FAM6_SKYLAKE_X:</div><div class='add'>+		if (rdmsrl_safe(MSR_PPIN_CTL, &amp;val))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if ((val &amp; 3UL) == 1UL) {</div><div class='add'>+			/* PPIN available but disabled: */</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If PPIN is disabled, but not locked, try to enable: */</div><div class='add'>+		if (!(val &amp; 3UL)) {</div><div class='add'>+			wrmsrl_safe(MSR_PPIN_CTL,  val | 2UL);</div><div class='add'>+			rdmsrl_safe(MSR_PPIN_CTL, &amp;val);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((val &amp; 3UL) == 2UL)</div><div class='add'>+			set_cpu_cap(c, X86_FEATURE_INTEL_PPIN);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mce_intel_feature_init(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	intel_init_thermal(c);</div><div class='ctx'> 	intel_init_cmci();</div><div class='ctx'> 	intel_init_lmce();</div><div class='add'>+	intel_ppin_init(c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mce_intel_feature_clear(struct cpuinfo_x86 *c)</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c<br/>index 6b9dc4d18ccc..d7cc190ae457 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/therm_throt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/mcheck/therm_throt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/therm_throt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/therm_throt.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Maintains a counter in /sys that keeps track of the number of thermal</div><div class='ctx'>  * events, such that the user knows how bad the thermal problem might be</div><div class='del'>- * (since the logging to syslog and mcelog is rate limited).</div><div class='add'>+ * (since the logging to syslog is rate limited).</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Dmitriy Zavin (dmitriyz@google.com)</div><div class='ctx'>  *</div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/trace/irq_vectors.h&gt;</div><div class='hunk'>@@ -142,13 +141,8 @@ static struct attribute_group thermal_attr_group = {</div><div class='ctx'>  * IRQ has been acknowledged.</div><div class='ctx'>  *</div><div class='ctx'>  * It will take care of rate limiting and printing messages to the syslog.</div><div class='del'>- *</div><div class='del'>- * Returns: 0 : Event should NOT be further logged, i.e. still in</div><div class='del'>- *              "timeout" from previous log message.</div><div class='del'>- *          1 : Event should be logged further, and a message has been</div><div class='del'>- *              printed to the syslog.</div><div class='ctx'>  */</div><div class='del'>-static int therm_throt_process(bool new_event, int event, int level)</div><div class='add'>+static void therm_throt_process(bool new_event, int event, int level)</div><div class='ctx'> {</div><div class='ctx'> 	struct _thermal_state *state;</div><div class='ctx'> 	unsigned int this_cpu = smp_processor_id();</div><div class='hunk'>@@ -163,16 +157,16 @@ static int therm_throt_process(bool new_event, int event, int level)</div><div class='ctx'> 		else if (event == POWER_LIMIT_EVENT)</div><div class='ctx'> 			state = &amp;pstate-&gt;core_power_limit;</div><div class='ctx'> 		else</div><div class='del'>-			 return 0;</div><div class='add'>+			return;</div><div class='ctx'> 	} else if (level == PACKAGE_LEVEL) {</div><div class='ctx'> 		if (event == THERMAL_THROTTLING_EVENT)</div><div class='ctx'> 			state = &amp;pstate-&gt;package_throttle;</div><div class='ctx'> 		else if (event == POWER_LIMIT_EVENT)</div><div class='ctx'> 			state = &amp;pstate-&gt;package_power_limit;</div><div class='ctx'> 		else</div><div class='del'>-			return 0;</div><div class='add'>+			return;</div><div class='ctx'> 	} else</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	old_event = state-&gt;new_event;</div><div class='ctx'> 	state-&gt;new_event = new_event;</div><div class='hunk'>@@ -182,7 +176,7 @@ static int therm_throt_process(bool new_event, int event, int level)</div><div class='ctx'> </div><div class='ctx'> 	if (time_before64(now, state-&gt;next_check) &amp;&amp;</div><div class='ctx'> 			state-&gt;count != state-&gt;last_count)</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;next_check = now + CHECK_INTERVAL;</div><div class='ctx'> 	state-&gt;last_count = state-&gt;count;</div><div class='hunk'>@@ -194,16 +188,14 @@ static int therm_throt_process(bool new_event, int event, int level)</div><div class='ctx'> 				this_cpu,</div><div class='ctx'> 				level == CORE_LEVEL ? "Core" : "Package",</div><div class='ctx'> 				state-&gt;count);</div><div class='del'>-		return 1;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (old_event) {</div><div class='ctx'> 		if (event == THERMAL_THROTTLING_EVENT)</div><div class='ctx'> 			pr_info("CPU%d: %s temperature/speed normal\n", this_cpu,</div><div class='ctx'> 				level == CORE_LEVEL ? "Core" : "Package");</div><div class='del'>-		return 1;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int thresh_event_valid(int level, int event)</div><div class='hunk'>@@ -271,58 +263,32 @@ static void thermal_throttle_remove_dev(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Get notified when a cpu comes on/off. Be hotplug friendly. */</div><div class='del'>-static int</div><div class='del'>-thermal_throttle_cpu_callback(struct notifier_block *nfb,</div><div class='del'>-			      unsigned long action,</div><div class='del'>-			      void *hcpu)</div><div class='add'>+static int thermal_throttle_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	struct device *dev;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	dev = get_cpu_device(cpu);</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_UP_PREPARE:</div><div class='del'>-	case CPU_UP_PREPARE_FROZEN:</div><div class='del'>-		err = thermal_throttle_add_dev(dev, cpu);</div><div class='del'>-		WARN_ON(err);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_UP_CANCELED:</div><div class='del'>-	case CPU_UP_CANCELED_FROZEN:</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-	case CPU_DEAD_FROZEN:</div><div class='del'>-		thermal_throttle_remove_dev(dev);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return notifier_from_errno(err);</div><div class='add'>+	struct device *dev = get_cpu_device(cpu);</div><div class='add'>+</div><div class='add'>+	return thermal_throttle_add_dev(dev, cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block thermal_throttle_cpu_notifier =</div><div class='add'>+static int thermal_throttle_offline(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	.notifier_call = thermal_throttle_cpu_callback,</div><div class='del'>-};</div><div class='add'>+	struct device *dev = get_cpu_device(cpu);</div><div class='add'>+</div><div class='add'>+	thermal_throttle_remove_dev(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static __init int thermal_throttle_init_device(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = 0;</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!atomic_read(&amp;therm_throt_en))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='del'>-	/* connect live CPUs to sysfs */</div><div class='del'>-	for_each_online_cpu(cpu) {</div><div class='del'>-		err = thermal_throttle_add_dev(get_cpu_device(cpu), cpu);</div><div class='del'>-		WARN_ON(err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__register_hotcpu_notifier(&amp;thermal_throttle_cpu_notifier);</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/therm:online",</div><div class='add'>+				thermal_throttle_online,</div><div class='add'>+				thermal_throttle_offline);</div><div class='add'>+	return ret &lt; 0 ? ret : 0;</div><div class='ctx'> }</div><div class='ctx'> device_initcall(thermal_throttle_init_device);</div><div class='ctx'> </div><div class='hunk'>@@ -392,10 +358,9 @@ static void intel_thermal_interrupt(void)</div><div class='ctx'> 	/* Check for violation of core thermal thresholds*/</div><div class='ctx'> 	notify_thresholds(msr_val);</div><div class='ctx'> </div><div class='del'>-	if (therm_throt_process(msr_val &amp; THERM_STATUS_PROCHOT,</div><div class='del'>-				THERMAL_THROTTLING_EVENT,</div><div class='del'>-				CORE_LEVEL) != 0)</div><div class='del'>-		mce_log_therm_throt_event(msr_val);</div><div class='add'>+	therm_throt_process(msr_val &amp; THERM_STATUS_PROCHOT,</div><div class='add'>+			    THERMAL_THROTTLING_EVENT,</div><div class='add'>+			    CORE_LEVEL);</div><div class='ctx'> </div><div class='ctx'> 	if (this_cpu_has(X86_FEATURE_PLN) &amp;&amp; int_pln_enable)</div><div class='ctx'> 		therm_throt_process(msr_val &amp; THERM_STATUS_POWER_LIMIT,</div><div class='hunk'>@@ -431,14 +396,16 @@ static inline void __smp_thermal_interrupt(void)</div><div class='ctx'> 	smp_thermal_vector();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage __visible void smp_thermal_interrupt(struct pt_regs *regs)</div><div class='add'>+asmlinkage __visible void __irq_entry</div><div class='add'>+smp_thermal_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	entering_irq();</div><div class='ctx'> 	__smp_thermal_interrupt();</div><div class='ctx'> 	exiting_ack_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage __visible void smp_trace_thermal_interrupt(struct pt_regs *regs)</div><div class='add'>+asmlinkage __visible void __irq_entry</div><div class='add'>+smp_trace_thermal_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	entering_irq();</div><div class='ctx'> 	trace_thermal_apic_entry(THERMAL_APIC_VECTOR);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/threshold.c b/arch/x86/kernel/cpu/mcheck/threshold.c<br/>index fcf9ae9384f4..bb0e75eed10a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/threshold.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/mcheck/threshold.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mcheck/threshold.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mcheck/threshold.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq_vectors.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='ctx'> #include &lt;asm/trace/irq_vectors.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -24,14 +23,14 @@ static inline void __smp_threshold_interrupt(void)</div><div class='ctx'> 	mce_threshold_vector();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage __visible void smp_threshold_interrupt(void)</div><div class='add'>+asmlinkage __visible void __irq_entry smp_threshold_interrupt(void)</div><div class='ctx'> {</div><div class='ctx'> 	entering_irq();</div><div class='ctx'> 	__smp_threshold_interrupt();</div><div class='ctx'> 	exiting_ack_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage __visible void smp_trace_threshold_interrupt(void)</div><div class='add'>+asmlinkage __visible void __irq_entry smp_trace_threshold_interrupt(void)</div><div class='ctx'> {</div><div class='ctx'> 	entering_irq();</div><div class='ctx'> 	trace_threshold_apic_entry(THRESHOLD_APIC_VECTOR);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/microcode/Makefile b/arch/x86/kernel/cpu/microcode/Makefile<br/>index 220b1a508513..ba12e8aa4a45 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/microcode/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/microcode/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/microcode/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/microcode/Makefile</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='ctx'> microcode-y				:= core.o</div><div class='ctx'> obj-$(CONFIG_MICROCODE)			+= microcode.o</div><div class='del'>-microcode-$(CONFIG_MICROCODE_INTEL)	+= intel.o intel_lib.o</div><div class='add'>+microcode-$(CONFIG_MICROCODE_INTEL)	+= intel.o</div><div class='ctx'> microcode-$(CONFIG_MICROCODE_AMD)	+= amd.o</div><div class='head'>diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c<br/>index 017bda12caae..7889ae492af0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/microcode/amd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/microcode/amd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/microcode/amd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/microcode/amd.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>  *  CPUs and later.</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2008-2011 Advanced Micro Devices Inc.</div><div class='add'>+ *	          2013-2016 Borislav Petkov &lt;bp@alien8.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Author: Peter Oruba &lt;peter.oruba@amd.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -39,100 +40,149 @@</div><div class='ctx'> </div><div class='ctx'> static struct equiv_cpu_entry *equiv_cpu_table;</div><div class='ctx'> </div><div class='del'>-struct ucode_patch {</div><div class='del'>-	struct list_head plist;</div><div class='del'>-	void *data;</div><div class='del'>-	u32 patch_id;</div><div class='del'>-	u16 equiv_cpu;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static LIST_HEAD(pcache);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This points to the current valid container of microcode patches which we will</div><div class='del'>- * save from the initrd before jettisoning its contents.</div><div class='add'>+ * save from the initrd/builtin before jettisoning its contents. @mc is the</div><div class='add'>+ * microcode patch we found to match.</div><div class='ctx'>  */</div><div class='del'>-static u8 *container;</div><div class='del'>-static size_t container_size;</div><div class='del'>-static bool ucode_builtin;</div><div class='add'>+struct cont_desc {</div><div class='add'>+	struct microcode_amd *mc;</div><div class='add'>+	u32		     cpuid_1_eax;</div><div class='add'>+	u32		     psize;</div><div class='add'>+	u8		     *data;</div><div class='add'>+	size_t		     size;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static u32 ucode_new_rev;</div><div class='ctx'> static u8 amd_ucode_patch[PATCH_MAX_SIZE];</div><div class='del'>-static u16 this_equiv_id;</div><div class='ctx'> </div><div class='del'>-static struct cpio_data ucode_cpio;</div><div class='add'>+/*</div><div class='add'>+ * Microcode patch container file is prepended to the initrd in cpio</div><div class='add'>+ * format. See Documentation/x86/early-microcode.txt</div><div class='add'>+ */</div><div class='add'>+static const char</div><div class='add'>+ucode_path[] __maybe_unused = "kernel/x86/microcode/AuthenticAMD.bin";</div><div class='ctx'> </div><div class='del'>-static struct cpio_data __init find_ucode_in_initrd(void)</div><div class='add'>+static u16 find_equiv_id(struct equiv_cpu_entry *equiv_table, u32 sig)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_BLK_DEV_INITRD</div><div class='del'>-	char *path;</div><div class='del'>-	void *start;</div><div class='del'>-	size_t size;</div><div class='add'>+	for (; equiv_table &amp;&amp; equiv_table-&gt;installed_cpu; equiv_table++) {</div><div class='add'>+		if (sig == equiv_table-&gt;installed_cpu)</div><div class='add'>+			return equiv_table-&gt;equiv_cpu;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Microcode patch container file is prepended to the initrd in cpio</div><div class='del'>-	 * format. See Documentation/x86/early-microcode.txt</div><div class='del'>-	 */</div><div class='del'>-	static __initdata char ucode_path[] = "kernel/x86/microcode/AuthenticAMD.bin";</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-	struct boot_params *p;</div><div class='add'>+/*</div><div class='add'>+ * This scans the ucode blob for the proper container as we can have multiple</div><div class='add'>+ * containers glued together. Returns the equivalence ID from the equivalence</div><div class='add'>+ * table or 0 if none found.</div><div class='add'>+ * Returns the amount of bytes consumed while scanning. @desc contains all the</div><div class='add'>+ * data we're going to use in later stages of the application.</div><div class='add'>+ */</div><div class='add'>+static ssize_t parse_container(u8 *ucode, ssize_t size, struct cont_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct equiv_cpu_entry *eq;</div><div class='add'>+	ssize_t orig_size = size;</div><div class='add'>+	u32 *hdr = (u32 *)ucode;</div><div class='add'>+	u16 eq_id;</div><div class='add'>+	u8 *buf;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * On 32-bit, early load occurs before paging is turned on so we need</div><div class='del'>-	 * to use physical addresses.</div><div class='del'>-	 */</div><div class='del'>-	p       = (struct boot_params *)__pa_nodebug(&amp;boot_params);</div><div class='del'>-	path    = (char *)__pa_nodebug(ucode_path);</div><div class='del'>-	start   = (void *)p-&gt;hdr.ramdisk_image;</div><div class='del'>-	size    = p-&gt;hdr.ramdisk_size;</div><div class='del'>-#else</div><div class='del'>-	path    = ucode_path;</div><div class='del'>-	start   = (void *)(boot_params.hdr.ramdisk_image + PAGE_OFFSET);</div><div class='del'>-	size    = boot_params.hdr.ramdisk_size;</div><div class='del'>-#endif /* !CONFIG_X86_32 */</div><div class='add'>+	/* Am I looking at an equivalence table header? */</div><div class='add'>+	if (hdr[0] != UCODE_MAGIC ||</div><div class='add'>+	    hdr[1] != UCODE_EQUIV_CPU_TABLE_TYPE ||</div><div class='add'>+	    hdr[2] == 0)</div><div class='add'>+		return CONTAINER_HDR_SZ;</div><div class='ctx'> </div><div class='del'>-	return find_cpio_data(path, start, size, NULL);</div><div class='del'>-#else</div><div class='del'>-	return (struct cpio_data){ NULL, 0, "" };</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='add'>+	buf = ucode;</div><div class='ctx'> </div><div class='del'>-static size_t compute_container_size(u8 *data, u32 total_size)</div><div class='del'>-{</div><div class='del'>-	size_t size = 0;</div><div class='del'>-	u32 *header = (u32 *)data;</div><div class='add'>+	eq = (struct equiv_cpu_entry *)(buf + CONTAINER_HDR_SZ);</div><div class='ctx'> </div><div class='del'>-	if (header[0] != UCODE_MAGIC ||</div><div class='del'>-	    header[1] != UCODE_EQUIV_CPU_TABLE_TYPE || /* type */</div><div class='del'>-	    header[2] == 0)                            /* size */</div><div class='del'>-		return size;</div><div class='add'>+	/* Find the equivalence ID of our CPU in this table: */</div><div class='add'>+	eq_id = find_equiv_id(eq, desc-&gt;cpuid_1_eax);</div><div class='ctx'> </div><div class='del'>-	size = header[2] + CONTAINER_HDR_SZ;</div><div class='del'>-	total_size -= size;</div><div class='del'>-	data += size;</div><div class='add'>+	buf  += hdr[2] + CONTAINER_HDR_SZ;</div><div class='add'>+	size -= hdr[2] + CONTAINER_HDR_SZ;</div><div class='ctx'> </div><div class='del'>-	while (total_size) {</div><div class='del'>-		u16 patch_size;</div><div class='add'>+	/*</div><div class='add'>+	 * Scan through the rest of the container to find where it ends. We do</div><div class='add'>+	 * some basic sanity-checking too.</div><div class='add'>+	 */</div><div class='add'>+	while (size &gt; 0) {</div><div class='add'>+		struct microcode_amd *mc;</div><div class='add'>+		u32 patch_size;</div><div class='ctx'> </div><div class='del'>-		header = (u32 *)data;</div><div class='add'>+		hdr = (u32 *)buf;</div><div class='ctx'> </div><div class='del'>-		if (header[0] != UCODE_UCODE_TYPE)</div><div class='add'>+		if (hdr[0] != UCODE_UCODE_TYPE)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Sanity-check patch size.</div><div class='del'>-		 */</div><div class='del'>-		patch_size = header[1];</div><div class='add'>+		/* Sanity-check patch size. */</div><div class='add'>+		patch_size = hdr[1];</div><div class='ctx'> 		if (patch_size &gt; PATCH_MAX_SIZE)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		size	   += patch_size + SECTION_HDR_SIZE;</div><div class='del'>-		data	   += patch_size + SECTION_HDR_SIZE;</div><div class='del'>-		total_size -= patch_size + SECTION_HDR_SIZE;</div><div class='add'>+		/* Skip patch section header: */</div><div class='add'>+		buf  += SECTION_HDR_SIZE;</div><div class='add'>+		size -= SECTION_HDR_SIZE;</div><div class='add'>+</div><div class='add'>+		mc = (struct microcode_amd *)buf;</div><div class='add'>+		if (eq_id == mc-&gt;hdr.processor_rev_id) {</div><div class='add'>+			desc-&gt;psize = patch_size;</div><div class='add'>+			desc-&gt;mc = mc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf  += patch_size;</div><div class='add'>+		size -= patch_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return size;</div><div class='add'>+	/*</div><div class='add'>+	 * If we have found a patch (desc-&gt;mc), it means we're looking at the</div><div class='add'>+	 * container which has a patch for this CPU so return 0 to mean, @ucode</div><div class='add'>+	 * already points to the proper container. Otherwise, we return the size</div><div class='add'>+	 * we scanned so that we can advance to the next container in the</div><div class='add'>+	 * buffer.</div><div class='add'>+	 */</div><div class='add'>+	if (desc-&gt;mc) {</div><div class='add'>+		desc-&gt;data = ucode;</div><div class='add'>+		desc-&gt;size = orig_size - size;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return orig_size - size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Scan the ucode blob for the proper container as we can have multiple</div><div class='add'>+ * containers glued together.</div><div class='add'>+ */</div><div class='add'>+static void scan_containers(u8 *ucode, size_t size, struct cont_desc *desc)</div><div class='add'>+{</div><div class='add'>+	ssize_t rem = size;</div><div class='add'>+</div><div class='add'>+	while (rem &gt;= 0) {</div><div class='add'>+		ssize_t s = parse_container(ucode, rem, desc);</div><div class='add'>+		if (!s)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		ucode += s;</div><div class='add'>+		rem   -= s;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __apply_microcode_amd(struct microcode_amd *mc)</div><div class='add'>+{</div><div class='add'>+	u32 rev, dummy;</div><div class='add'>+</div><div class='add'>+	native_wrmsrl(MSR_AMD64_PATCH_LOADER, (u64)(long)&amp;mc-&gt;hdr.data_code);</div><div class='add'>+</div><div class='add'>+	/* verify patch application was successful */</div><div class='add'>+	native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);</div><div class='add'>+	if (rev != mc-&gt;hdr.patch_id)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -143,128 +193,50 @@ static size_t compute_container_size(u8 *data, u32 total_size)</div><div class='ctx'>  * and on 32-bit during save_microcode_in_initrd_amd() -- we can call</div><div class='ctx'>  * load_microcode_amd() to save equivalent cpu table and microcode patches in</div><div class='ctx'>  * kernel heap memory.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if container found (sets @desc), false otherwise.</div><div class='ctx'>  */</div><div class='del'>-static void apply_ucode_in_initrd(void *ucode, size_t size, bool save_patch)</div><div class='add'>+static bool</div><div class='add'>+apply_microcode_early_amd(u32 cpuid_1_eax, void *ucode, size_t size, bool save_patch)</div><div class='ctx'> {</div><div class='del'>-	struct equiv_cpu_entry *eq;</div><div class='del'>-	size_t *cont_sz;</div><div class='del'>-	u32 *header;</div><div class='del'>-	u8  *data, **cont;</div><div class='add'>+	struct cont_desc desc = { 0 };</div><div class='ctx'> 	u8 (*patch)[PATCH_MAX_SIZE];</div><div class='del'>-	u16 eq_id = 0;</div><div class='del'>-	int offset, left;</div><div class='del'>-	u32 rev, eax, ebx, ecx, edx;</div><div class='del'>-	u32 *new_rev;</div><div class='add'>+	struct microcode_amd *mc;</div><div class='add'>+	u32 rev, dummy, *new_rev;</div><div class='add'>+	bool ret = false;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> 	new_rev = (u32 *)__pa_nodebug(&amp;ucode_new_rev);</div><div class='del'>-	cont_sz = (size_t *)__pa_nodebug(&amp;container_size);</div><div class='del'>-	cont	= (u8 **)__pa_nodebug(&amp;container);</div><div class='ctx'> 	patch	= (u8 (*)[PATCH_MAX_SIZE])__pa_nodebug(&amp;amd_ucode_patch);</div><div class='ctx'> #else</div><div class='ctx'> 	new_rev = &amp;ucode_new_rev;</div><div class='del'>-	cont_sz = &amp;container_size;</div><div class='del'>-	cont	= &amp;container;</div><div class='ctx'> 	patch	= &amp;amd_ucode_patch;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	data   = ucode;</div><div class='del'>-	left   = size;</div><div class='del'>-	header = (u32 *)data;</div><div class='del'>-</div><div class='del'>-	/* find equiv cpu table */</div><div class='del'>-	if (header[0] != UCODE_MAGIC ||</div><div class='del'>-	    header[1] != UCODE_EQUIV_CPU_TABLE_TYPE || /* type */</div><div class='del'>-	    header[2] == 0)                            /* size */</div><div class='del'>-		return;</div><div class='add'>+	desc.cpuid_1_eax = cpuid_1_eax;</div><div class='ctx'> </div><div class='del'>-	eax = 0x00000001;</div><div class='del'>-	ecx = 0;</div><div class='del'>-	native_cpuid(&amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='add'>+	scan_containers(ucode, size, &amp;desc);</div><div class='ctx'> </div><div class='del'>-	while (left &gt; 0) {</div><div class='del'>-		eq = (struct equiv_cpu_entry *)(data + CONTAINER_HDR_SZ);</div><div class='del'>-</div><div class='del'>-		*cont = data;</div><div class='del'>-</div><div class='del'>-		/* Advance past the container header */</div><div class='del'>-		offset = header[2] + CONTAINER_HDR_SZ;</div><div class='del'>-		data  += offset;</div><div class='del'>-		left  -= offset;</div><div class='del'>-</div><div class='del'>-		eq_id = find_equiv_id(eq, eax);</div><div class='del'>-		if (eq_id) {</div><div class='del'>-			this_equiv_id = eq_id;</div><div class='del'>-			*cont_sz = compute_container_size(*cont, left + offset);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * truncate how much we need to iterate over in the</div><div class='del'>-			 * ucode update loop below</div><div class='del'>-			 */</div><div class='del'>-			left = *cont_sz - offset;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	mc = desc.mc;</div><div class='add'>+	if (!mc)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * support multiple container files appended together. if this</div><div class='del'>-		 * one does not have a matching equivalent cpu entry, we fast</div><div class='del'>-		 * forward to the next container file.</div><div class='del'>-		 */</div><div class='del'>-		while (left &gt; 0) {</div><div class='del'>-			header = (u32 *)data;</div><div class='del'>-			if (header[0] == UCODE_MAGIC &amp;&amp;</div><div class='del'>-			    header[1] == UCODE_EQUIV_CPU_TABLE_TYPE)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			offset = header[1] + SECTION_HDR_SIZE;</div><div class='del'>-			data  += offset;</div><div class='del'>-			left  -= offset;</div><div class='del'>-		}</div><div class='add'>+	native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);</div><div class='add'>+	if (rev &gt;= mc-&gt;hdr.patch_id)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-		/* mark where the next microcode container file starts */</div><div class='del'>-		offset    = data - (u8 *)ucode;</div><div class='del'>-		ucode     = data;</div><div class='del'>-	}</div><div class='add'>+	if (!__apply_microcode_amd(mc)) {</div><div class='add'>+		*new_rev = mc-&gt;hdr.patch_id;</div><div class='add'>+		ret      = true;</div><div class='ctx'> </div><div class='del'>-	if (!eq_id) {</div><div class='del'>-		*cont = NULL;</div><div class='del'>-		*cont_sz = 0;</div><div class='del'>-		return;</div><div class='add'>+		if (save_patch)</div><div class='add'>+			memcpy(patch, mc, min_t(u32, desc.psize, PATCH_MAX_SIZE));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (check_current_patch_level(&amp;rev, true))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	while (left &gt; 0) {</div><div class='del'>-		struct microcode_amd *mc;</div><div class='del'>-</div><div class='del'>-		header = (u32 *)data;</div><div class='del'>-		if (header[0] != UCODE_UCODE_TYPE || /* type */</div><div class='del'>-		    header[1] == 0)                  /* size */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		mc = (struct microcode_amd *)(data + SECTION_HDR_SIZE);</div><div class='del'>-</div><div class='del'>-		if (eq_id == mc-&gt;hdr.processor_rev_id &amp;&amp; rev &lt; mc-&gt;hdr.patch_id) {</div><div class='del'>-</div><div class='del'>-			if (!__apply_microcode_amd(mc)) {</div><div class='del'>-				rev = mc-&gt;hdr.patch_id;</div><div class='del'>-				*new_rev = rev;</div><div class='del'>-</div><div class='del'>-				if (save_patch)</div><div class='del'>-					memcpy(patch, mc,</div><div class='del'>-					       min_t(u32, header[1], PATCH_MAX_SIZE));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		offset  = header[1] + SECTION_HDR_SIZE;</div><div class='del'>-		data   += offset;</div><div class='del'>-		left   -= offset;</div><div class='del'>-	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __init load_builtin_amd_microcode(struct cpio_data *cp,</div><div class='del'>-					      unsigned int family)</div><div class='add'>+static bool get_builtin_microcode(struct cpio_data *cp, unsigned int family)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	char fw_name[36] = "amd-ucode/microcode_amd.bin";</div><div class='hunk'>@@ -279,207 +251,113 @@ static bool __init load_builtin_amd_microcode(struct cpio_data *cp,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init load_ucode_amd_bsp(unsigned int family)</div><div class='add'>+void __load_ucode_amd(unsigned int cpuid_1_eax, struct cpio_data *ret)</div><div class='ctx'> {</div><div class='add'>+	struct ucode_cpu_info *uci;</div><div class='ctx'> 	struct cpio_data cp;</div><div class='del'>-	bool *builtin;</div><div class='del'>-	void **data;</div><div class='del'>-	size_t *size;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-	data =  (void **)__pa_nodebug(&amp;ucode_cpio.data);</div><div class='del'>-	size = (size_t *)__pa_nodebug(&amp;ucode_cpio.size);</div><div class='del'>-	builtin = (bool *)__pa_nodebug(&amp;ucode_builtin);</div><div class='del'>-#else</div><div class='del'>-	data = &amp;ucode_cpio.data;</div><div class='del'>-	size = &amp;ucode_cpio.size;</div><div class='del'>-	builtin = &amp;ucode_builtin;</div><div class='del'>-#endif</div><div class='add'>+	const char *path;</div><div class='add'>+	bool use_pa;</div><div class='ctx'> </div><div class='del'>-	*builtin = load_builtin_amd_microcode(&amp;cp, family);</div><div class='del'>-	if (!*builtin)</div><div class='del'>-		cp = find_ucode_in_initrd();</div><div class='add'>+	if (IS_ENABLED(CONFIG_X86_32)) {</div><div class='add'>+		uci	= (struct ucode_cpu_info *)__pa_nodebug(ucode_cpu_info);</div><div class='add'>+		path	= (const char *)__pa_nodebug(ucode_path);</div><div class='add'>+		use_pa	= true;</div><div class='add'>+	} else {</div><div class='add'>+		uci     = ucode_cpu_info;</div><div class='add'>+		path	= ucode_path;</div><div class='add'>+		use_pa	= false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!(cp.data &amp;&amp; cp.size))</div><div class='del'>-		return;</div><div class='add'>+	if (!get_builtin_microcode(&amp;cp, x86_family(cpuid_1_eax)))</div><div class='add'>+		cp = find_microcode_in_initrd(path, use_pa);</div><div class='ctx'> </div><div class='del'>-	*data = cp.data;</div><div class='del'>-	*size = cp.size;</div><div class='add'>+	/* Needed in load_microcode_amd() */</div><div class='add'>+	uci-&gt;cpu_sig.sig = cpuid_1_eax;</div><div class='ctx'> </div><div class='del'>-	apply_ucode_in_initrd(cp.data, cp.size, true);</div><div class='add'>+	*ret = cp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-/*</div><div class='del'>- * On 32-bit, since AP's early load occurs before paging is turned on, we</div><div class='del'>- * cannot traverse cpu_equiv_table and pcache in kernel heap memory. So during</div><div class='del'>- * cold boot, AP will apply_ucode_in_initrd() just like the BSP. During</div><div class='del'>- * save_microcode_in_initrd_amd() BSP's patch is copied to amd_ucode_patch,</div><div class='del'>- * which is used upon resume from suspend.</div><div class='del'>- */</div><div class='del'>-void load_ucode_amd_ap(void)</div><div class='add'>+void __init load_ucode_amd_bsp(unsigned int cpuid_1_eax)</div><div class='ctx'> {</div><div class='del'>-	struct microcode_amd *mc;</div><div class='del'>-	size_t *usize;</div><div class='del'>-	void **ucode;</div><div class='del'>-</div><div class='del'>-	mc = (struct microcode_amd *)__pa_nodebug(amd_ucode_patch);</div><div class='del'>-	if (mc-&gt;hdr.patch_id &amp;&amp; mc-&gt;hdr.processor_rev_id) {</div><div class='del'>-		__apply_microcode_amd(mc);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	struct cpio_data cp = { };</div><div class='ctx'> </div><div class='del'>-	ucode = (void *)__pa_nodebug(&amp;container);</div><div class='del'>-	usize = (size_t *)__pa_nodebug(&amp;container_size);</div><div class='del'>-</div><div class='del'>-	if (!*ucode || !*usize)</div><div class='add'>+	__load_ucode_amd(cpuid_1_eax, &amp;cp);</div><div class='add'>+	if (!(cp.data &amp;&amp; cp.size))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	apply_ucode_in_initrd(*ucode, *usize, false);</div><div class='add'>+	apply_microcode_early_amd(cpuid_1_eax, cp.data, cp.size, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init collect_cpu_sig_on_bsp(void *arg)</div><div class='add'>+void load_ucode_amd_ap(unsigned int cpuid_1_eax)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = smp_processor_id();</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='del'>-</div><div class='del'>-	uci-&gt;cpu_sig.sig = cpuid_eax(0x00000001);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init get_bsp_sig(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int bsp = boot_cpu_data.cpu_index;</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + bsp;</div><div class='del'>-</div><div class='del'>-	if (!uci-&gt;cpu_sig.sig)</div><div class='del'>-		smp_call_function_single(bsp, collect_cpu_sig_on_bsp, NULL, 1);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-void load_ucode_amd_ap(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu = smp_processor_id();</div><div class='del'>-	struct equiv_cpu_entry *eq;</div><div class='ctx'> 	struct microcode_amd *mc;</div><div class='del'>-	u8 *cont = container;</div><div class='del'>-	u32 rev, eax;</div><div class='del'>-	u16 eq_id;</div><div class='del'>-</div><div class='del'>-	/* Exit if called on the BSP. */</div><div class='del'>-	if (!cpu)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!container)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 64-bit runs with paging enabled, thus early==false.</div><div class='del'>-	 */</div><div class='del'>-	if (check_current_patch_level(&amp;rev, false))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Add CONFIG_RANDOMIZE_MEMORY offset. */</div><div class='del'>-	if (!ucode_builtin)</div><div class='del'>-		cont += PAGE_OFFSET - __PAGE_OFFSET_BASE;</div><div class='del'>-</div><div class='del'>-	eax = cpuid_eax(0x00000001);</div><div class='del'>-	eq  = (struct equiv_cpu_entry *)(cont + CONTAINER_HDR_SZ);</div><div class='add'>+	struct cpio_data cp;</div><div class='add'>+	u32 *new_rev, rev, dummy;</div><div class='ctx'> </div><div class='del'>-	eq_id = find_equiv_id(eq, eax);</div><div class='del'>-	if (!eq_id)</div><div class='del'>-		return;</div><div class='add'>+	if (IS_ENABLED(CONFIG_X86_32)) {</div><div class='add'>+		mc	= (struct microcode_amd *)__pa_nodebug(amd_ucode_patch);</div><div class='add'>+		new_rev = (u32 *)__pa_nodebug(&amp;ucode_new_rev);</div><div class='add'>+	} else {</div><div class='add'>+		mc	= (struct microcode_amd *)amd_ucode_patch;</div><div class='add'>+		new_rev = &amp;ucode_new_rev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (eq_id == this_equiv_id) {</div><div class='del'>-		mc = (struct microcode_amd *)amd_ucode_patch;</div><div class='add'>+	native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);</div><div class='ctx'> </div><div class='del'>-		if (mc &amp;&amp; rev &lt; mc-&gt;hdr.patch_id) {</div><div class='del'>-			if (!__apply_microcode_amd(mc))</div><div class='del'>-				ucode_new_rev = mc-&gt;hdr.patch_id;</div><div class='add'>+	/* Check whether we have saved a new patch already: */</div><div class='add'>+	if (*new_rev &amp;&amp; rev &lt; mc-&gt;hdr.patch_id) {</div><div class='add'>+		if (!__apply_microcode_amd(mc)) {</div><div class='add'>+			*new_rev = mc-&gt;hdr.patch_id;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	} else {</div><div class='del'>-		if (!ucode_cpio.data)</div><div class='del'>-			return;</div><div class='add'>+	__load_ucode_amd(cpuid_1_eax, &amp;cp);</div><div class='add'>+	if (!(cp.data &amp;&amp; cp.size))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * AP has a different equivalence ID than BSP, looks like</div><div class='del'>-		 * mixed-steppings silicon so go through the ucode blob anew.</div><div class='del'>-		 */</div><div class='del'>-		apply_ucode_in_initrd(ucode_cpio.data, ucode_cpio.size, false);</div><div class='del'>-	}</div><div class='add'>+	apply_microcode_early_amd(cpuid_1_eax, cp.data, cp.size, false);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-int __init save_microcode_in_initrd_amd(void)</div><div class='add'>+static enum ucode_state</div><div class='add'>+load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size);</div><div class='add'>+</div><div class='add'>+int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)</div><div class='ctx'> {</div><div class='del'>-	unsigned long cont;</div><div class='del'>-	int retval = 0;</div><div class='add'>+	struct cont_desc desc = { 0 };</div><div class='ctx'> 	enum ucode_state ret;</div><div class='del'>-	u8 *cont_va;</div><div class='del'>-	u32 eax;</div><div class='add'>+	struct cpio_data cp;</div><div class='ctx'> </div><div class='del'>-	if (!container)</div><div class='add'>+	cp = find_microcode_in_initrd(ucode_path, false);</div><div class='add'>+	if (!(cp.data &amp;&amp; cp.size))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-	get_bsp_sig();</div><div class='del'>-	cont	= (unsigned long)container;</div><div class='del'>-	cont_va = __va(container);</div><div class='del'>-#else</div><div class='del'>-	/*</div><div class='del'>-	 * We need the physical address of the container for both bitness since</div><div class='del'>-	 * boot_params.hdr.ramdisk_image is a physical address.</div><div class='del'>-	 */</div><div class='del'>-	cont    = __pa_nodebug(container);</div><div class='del'>-	cont_va = container;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Take into account the fact that the ramdisk might get relocated and</div><div class='del'>-	 * therefore we need to recompute the container's position in virtual</div><div class='del'>-	 * memory space.</div><div class='del'>-	 */</div><div class='del'>-	if (relocated_ramdisk)</div><div class='del'>-		container = (u8 *)(__va(relocated_ramdisk) +</div><div class='del'>-			     (cont - boot_params.hdr.ramdisk_image));</div><div class='del'>-	else</div><div class='del'>-		container = cont_va;</div><div class='del'>-</div><div class='del'>-	/* Add CONFIG_RANDOMIZE_MEMORY offset. */</div><div class='del'>-	if (!ucode_builtin)</div><div class='del'>-		container += PAGE_OFFSET - __PAGE_OFFSET_BASE;</div><div class='add'>+	desc.cpuid_1_eax = cpuid_1_eax;</div><div class='ctx'> </div><div class='del'>-	eax   = cpuid_eax(0x00000001);</div><div class='del'>-	eax   = ((eax &gt;&gt; 8) &amp; 0xf) + ((eax &gt;&gt; 20) &amp; 0xff);</div><div class='add'>+	scan_containers(cp.data, cp.size, &amp;desc);</div><div class='add'>+	if (!desc.mc)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = load_microcode_amd(smp_processor_id(), eax, container, container_size);</div><div class='add'>+	ret = load_microcode_amd(smp_processor_id(), x86_family(cpuid_1_eax),</div><div class='add'>+				 desc.data, desc.size);</div><div class='ctx'> 	if (ret != UCODE_OK)</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This will be freed any msec now, stash patches for the current</div><div class='del'>-	 * family and switch to patch cache for cpu hotplug, etc later.</div><div class='del'>-	 */</div><div class='del'>-	container = NULL;</div><div class='del'>-	container_size = 0;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return retval;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void reload_ucode_amd(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct microcode_amd *mc;</div><div class='del'>-	u32 rev;</div><div class='add'>+	u32 rev, dummy;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * early==false because this is a syscore -&gt;resume path and by</div><div class='del'>-	 * that time paging is long enabled.</div><div class='del'>-	 */</div><div class='del'>-	if (check_current_patch_level(&amp;rev, false))</div><div class='add'>+	mc = (struct microcode_amd *)amd_ucode_patch;</div><div class='add'>+	if (!mc)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mc = (struct microcode_amd *)amd_ucode_patch;</div><div class='add'>+	rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);</div><div class='ctx'> </div><div class='del'>-	if (mc &amp;&amp; rev &lt; mc-&gt;hdr.patch_id) {</div><div class='add'>+	if (rev &lt; mc-&gt;hdr.patch_id) {</div><div class='ctx'> 		if (!__apply_microcode_amd(mc)) {</div><div class='ctx'> 			ucode_new_rev = mc-&gt;hdr.patch_id;</div><div class='ctx'> 			pr_info("reload patch_level=0x%08x\n", ucode_new_rev);</div><div class='hunk'>@@ -513,7 +391,7 @@ static struct ucode_patch *cache_find_patch(u16 equiv_cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucode_patch *p;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(p, &amp;pcache, plist)</div><div class='add'>+	list_for_each_entry(p, &amp;microcode_cache, plist)</div><div class='ctx'> 		if (p-&gt;equiv_cpu == equiv_cpu)</div><div class='ctx'> 			return p;</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -523,7 +401,7 @@ static void update_cache(struct ucode_patch *new_patch)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucode_patch *p;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(p, &amp;pcache, plist) {</div><div class='add'>+	list_for_each_entry(p, &amp;microcode_cache, plist) {</div><div class='ctx'> 		if (p-&gt;equiv_cpu == new_patch-&gt;equiv_cpu) {</div><div class='ctx'> 			if (p-&gt;patch_id &gt;= new_patch-&gt;patch_id)</div><div class='ctx'> 				/* we already have the latest patch */</div><div class='hunk'>@@ -536,14 +414,14 @@ static void update_cache(struct ucode_patch *new_patch)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* no patch found, add it */</div><div class='del'>-	list_add_tail(&amp;new_patch-&gt;plist, &amp;pcache);</div><div class='add'>+	list_add_tail(&amp;new_patch-&gt;plist, &amp;microcode_cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void free_cache(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucode_patch *p, *tmp;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(p, tmp, &amp;pcache, plist) {</div><div class='add'>+	list_for_each_entry_safe(p, tmp, &amp;microcode_cache, plist) {</div><div class='ctx'> 		__list_del(p-&gt;plist.prev, p-&gt;plist.next);</div><div class='ctx'> 		kfree(p-&gt;data);</div><div class='ctx'> 		kfree(p);</div><div class='hunk'>@@ -616,74 +494,13 @@ static unsigned int verify_patch_size(u8 family, u32 patch_size,</div><div class='ctx'> 	return patch_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Those patch levels cannot be updated to newer ones and thus should be final.</div><div class='del'>- */</div><div class='del'>-static u32 final_levels[] = {</div><div class='del'>-	0x01000098,</div><div class='del'>-	0x0100009f,</div><div class='del'>-	0x010000af,</div><div class='del'>-	0, /* T-101 terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check the current patch level on this CPU.</div><div class='del'>- *</div><div class='del'>- * @rev: Use it to return the patch level. It is set to 0 in the case of</div><div class='del'>- * error.</div><div class='del'>- *</div><div class='del'>- * Returns:</div><div class='del'>- *  - true: if update should stop</div><div class='del'>- *  - false: otherwise</div><div class='del'>- */</div><div class='del'>-bool check_current_patch_level(u32 *rev, bool early)</div><div class='del'>-{</div><div class='del'>-	u32 lvl, dummy, i;</div><div class='del'>-	bool ret = false;</div><div class='del'>-	u32 *levels;</div><div class='del'>-</div><div class='del'>-	native_rdmsr(MSR_AMD64_PATCH_LEVEL, lvl, dummy);</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_X86_32) &amp;&amp; early)</div><div class='del'>-		levels = (u32 *)__pa_nodebug(&amp;final_levels);</div><div class='del'>-	else</div><div class='del'>-		levels = final_levels;</div><div class='del'>-</div><div class='del'>-	for (i = 0; levels[i]; i++) {</div><div class='del'>-		if (lvl == levels[i]) {</div><div class='del'>-			lvl = 0;</div><div class='del'>-			ret = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rev)</div><div class='del'>-		*rev = lvl;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __apply_microcode_amd(struct microcode_amd *mc_amd)</div><div class='del'>-{</div><div class='del'>-	u32 rev, dummy;</div><div class='del'>-</div><div class='del'>-	native_wrmsrl(MSR_AMD64_PATCH_LOADER, (u64)(long)&amp;mc_amd-&gt;hdr.data_code);</div><div class='del'>-</div><div class='del'>-	/* verify patch application was successful */</div><div class='del'>-	native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);</div><div class='del'>-	if (rev != mc_amd-&gt;hdr.patch_id)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int apply_microcode_amd(int cpu)</div><div class='add'>+static int apply_microcode_amd(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpuinfo_x86 *c = &amp;cpu_data(cpu);</div><div class='ctx'> 	struct microcode_amd *mc_amd;</div><div class='ctx'> 	struct ucode_cpu_info *uci;</div><div class='ctx'> 	struct ucode_patch *p;</div><div class='del'>-	u32 rev;</div><div class='add'>+	u32 rev, dummy;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(raw_smp_processor_id() != cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -696,8 +513,7 @@ int apply_microcode_amd(int cpu)</div><div class='ctx'> 	mc_amd  = p-&gt;data;</div><div class='ctx'> 	uci-&gt;mc = p-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (check_current_patch_level(&amp;rev, false))</div><div class='del'>-		return -1;</div><div class='add'>+	rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);</div><div class='ctx'> </div><div class='ctx'> 	/* need to apply patch? */</div><div class='ctx'> 	if (rev &gt;= mc_amd-&gt;hdr.patch_id) {</div><div class='hunk'>@@ -860,7 +676,8 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data,</div><div class='ctx'> 	return UCODE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size)</div><div class='add'>+static enum ucode_state</div><div class='add'>+load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	enum ucode_state ret;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c<br/>index 5ce5155f0695..b4a4cd39b358 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/microcode/core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/microcode/core.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/microcode/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/microcode/core.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000-2006 Tigran Aivazian &lt;tigran@aivazian.fsnet.co.uk&gt;</div><div class='ctx'>  *	      2006	Shaohua Li &lt;shaohua.li@intel.com&gt;</div><div class='del'>- *	      2013-2015	Borislav Petkov &lt;bp@alien8.de&gt;</div><div class='add'>+ *	      2013-2016	Borislav Petkov &lt;bp@alien8.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * X86 CPU microcode early update for Linux:</div><div class='ctx'>  *</div><div class='hunk'>@@ -39,11 +39,16 @@</div><div class='ctx'> #include &lt;asm/microcode.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/cmdline.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='del'>-#define MICROCODE_VERSION	"2.01"</div><div class='add'>+#define DRIVER_VERSION	"2.2"</div><div class='ctx'> </div><div class='ctx'> static struct microcode_ops	*microcode_ops;</div><div class='del'>-static bool dis_ucode_ldr;</div><div class='add'>+static bool dis_ucode_ldr = true;</div><div class='add'>+</div><div class='add'>+bool initrd_gone;</div><div class='add'>+</div><div class='add'>+LIST_HEAD(microcode_cache);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Synchronization.</div><div class='hunk'>@@ -61,15 +66,47 @@ static DEFINE_MUTEX(microcode_mutex);</div><div class='ctx'> </div><div class='ctx'> struct ucode_cpu_info		ucode_cpu_info[NR_CPUS];</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Operations that are run on a target cpu:</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> struct cpu_info_ctx {</div><div class='ctx'> 	struct cpu_signature	*cpu_sig;</div><div class='ctx'> 	int			err;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Those patch levels cannot be updated to newer ones and thus should be final.</div><div class='add'>+ */</div><div class='add'>+static u32 final_levels[] = {</div><div class='add'>+	0x01000098,</div><div class='add'>+	0x0100009f,</div><div class='add'>+	0x010000af,</div><div class='add'>+	0, /* T-101 terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check the current patch level on this CPU.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *  - true: if update should stop</div><div class='add'>+ *  - false: otherwise</div><div class='add'>+ */</div><div class='add'>+static bool amd_check_current_patch_level(void)</div><div class='add'>+{</div><div class='add'>+	u32 lvl, dummy, i;</div><div class='add'>+	u32 *levels;</div><div class='add'>+</div><div class='add'>+	native_rdmsr(MSR_AMD64_PATCH_LEVEL, lvl, dummy);</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_X86_32))</div><div class='add'>+		levels = (u32 *)__pa_nodebug(&amp;final_levels);</div><div class='add'>+	else</div><div class='add'>+		levels = final_levels;</div><div class='add'>+</div><div class='add'>+	for (i = 0; levels[i]; i++) {</div><div class='add'>+		if (lvl == levels[i])</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool __init check_loader_disabled_bsp(void)</div><div class='ctx'> {</div><div class='ctx'> 	static const char *__dis_opt_str = "dis_ucode_ldr";</div><div class='hunk'>@@ -85,8 +122,24 @@ static bool __init check_loader_disabled_bsp(void)</div><div class='ctx'> 	bool *res = &amp;dis_ucode_ldr;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (cmdline_find_option_bool(cmdline, option))</div><div class='del'>-		*res = true;</div><div class='add'>+	if (!have_cpuid_p())</div><div class='add'>+		return *res;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CPUID(1).ECX[31]: reserved for hypervisor use. This is still not</div><div class='add'>+	 * completely accurate as xen pv guests don't see that CPUID bit set but</div><div class='add'>+	 * that's good enough as they don't land on the BSP path anyway.</div><div class='add'>+	 */</div><div class='add'>+	if (native_cpuid_ecx(1) &amp; BIT(31))</div><div class='add'>+		return *res;</div><div class='add'>+</div><div class='add'>+	if (x86_cpuid_vendor() == X86_VENDOR_AMD) {</div><div class='add'>+		if (amd_check_current_patch_level())</div><div class='add'>+			return *res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmdline_find_option_bool(cmdline, option) &lt;= 0)</div><div class='add'>+		*res = false;</div><div class='ctx'> </div><div class='ctx'> 	return *res;</div><div class='ctx'> }</div><div class='hunk'>@@ -112,26 +165,21 @@ bool get_builtin_firmware(struct cpio_data *cd, const char *name)</div><div class='ctx'> </div><div class='ctx'> void __init load_ucode_bsp(void)</div><div class='ctx'> {</div><div class='del'>-	int vendor;</div><div class='del'>-	unsigned int family;</div><div class='add'>+	unsigned int cpuid_1_eax;</div><div class='ctx'> </div><div class='ctx'> 	if (check_loader_disabled_bsp())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!have_cpuid_p())</div><div class='del'>-		return;</div><div class='add'>+	cpuid_1_eax = native_cpuid_eax(1);</div><div class='ctx'> </div><div class='del'>-	vendor = x86_cpuid_vendor();</div><div class='del'>-	family = x86_cpuid_family();</div><div class='del'>-</div><div class='del'>-	switch (vendor) {</div><div class='add'>+	switch (x86_cpuid_vendor()) {</div><div class='ctx'> 	case X86_VENDOR_INTEL:</div><div class='del'>-		if (family &gt;= 6)</div><div class='add'>+		if (x86_family(cpuid_1_eax) &gt;= 6)</div><div class='ctx'> 			load_ucode_intel_bsp();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case X86_VENDOR_AMD:</div><div class='del'>-		if (family &gt;= 0x10)</div><div class='del'>-			load_ucode_amd_bsp(family);</div><div class='add'>+		if (x86_family(cpuid_1_eax) &gt;= 0x10)</div><div class='add'>+			load_ucode_amd_bsp(cpuid_1_eax);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -149,25 +197,21 @@ static bool check_loader_disabled_ap(void)</div><div class='ctx'> </div><div class='ctx'> void load_ucode_ap(void)</div><div class='ctx'> {</div><div class='del'>-	int vendor, family;</div><div class='add'>+	unsigned int cpuid_1_eax;</div><div class='ctx'> </div><div class='ctx'> 	if (check_loader_disabled_ap())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!have_cpuid_p())</div><div class='del'>-		return;</div><div class='add'>+	cpuid_1_eax = native_cpuid_eax(1);</div><div class='ctx'> </div><div class='del'>-	vendor = x86_cpuid_vendor();</div><div class='del'>-	family = x86_cpuid_family();</div><div class='del'>-</div><div class='del'>-	switch (vendor) {</div><div class='add'>+	switch (x86_cpuid_vendor()) {</div><div class='ctx'> 	case X86_VENDOR_INTEL:</div><div class='del'>-		if (family &gt;= 6)</div><div class='add'>+		if (x86_family(cpuid_1_eax) &gt;= 6)</div><div class='ctx'> 			load_ucode_intel_ap();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case X86_VENDOR_AMD:</div><div class='del'>-		if (family &gt;= 0x10)</div><div class='del'>-			load_ucode_amd_ap();</div><div class='add'>+		if (x86_family(cpuid_1_eax) &gt;= 0x10)</div><div class='add'>+			load_ucode_amd_ap(cpuid_1_eax);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -177,21 +221,81 @@ void load_ucode_ap(void)</div><div class='ctx'> static int __init save_microcode_in_initrd(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpuinfo_x86 *c = &amp;boot_cpu_data;</div><div class='add'>+	int ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (c-&gt;x86_vendor) {</div><div class='ctx'> 	case X86_VENDOR_INTEL:</div><div class='ctx'> 		if (c-&gt;x86 &gt;= 6)</div><div class='del'>-			return save_microcode_in_initrd_intel();</div><div class='add'>+			ret = save_microcode_in_initrd_intel();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case X86_VENDOR_AMD:</div><div class='ctx'> 		if (c-&gt;x86 &gt;= 0x10)</div><div class='del'>-			return save_microcode_in_initrd_amd();</div><div class='add'>+			return save_microcode_in_initrd_amd(cpuid_eax(1));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -EINVAL;</div><div class='add'>+	initrd_gone = true;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cpio_data find_microcode_in_initrd(const char *path, bool use_pa)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BLK_DEV_INITRD</div><div class='add'>+	unsigned long start = 0;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	struct boot_params *params;</div><div class='add'>+</div><div class='add'>+	if (use_pa)</div><div class='add'>+		params = (struct boot_params *)__pa_nodebug(&amp;boot_params);</div><div class='add'>+	else</div><div class='add'>+		params = &amp;boot_params;</div><div class='add'>+</div><div class='add'>+	size = params-&gt;hdr.ramdisk_size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set start only if we have an initrd image. We cannot use initrd_start</div><div class='add'>+	 * because it is not set that early yet.</div><div class='add'>+	 */</div><div class='add'>+	if (size)</div><div class='add'>+		start = params-&gt;hdr.ramdisk_image;</div><div class='add'>+</div><div class='add'>+# else /* CONFIG_X86_64 */</div><div class='add'>+	size  = (unsigned long)boot_params.ext_ramdisk_size &lt;&lt; 32;</div><div class='add'>+	size |= boot_params.hdr.ramdisk_size;</div><div class='add'>+</div><div class='add'>+	if (size) {</div><div class='add'>+		start  = (unsigned long)boot_params.ext_ramdisk_image &lt;&lt; 32;</div><div class='add'>+		start |= boot_params.hdr.ramdisk_image;</div><div class='add'>+</div><div class='add'>+		start += PAGE_OFFSET;</div><div class='add'>+	}</div><div class='add'>+# endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fixup the start address: after reserve_initrd() runs, initrd_start</div><div class='add'>+	 * has the virtual address of the beginning of the initrd. It also</div><div class='add'>+	 * possibly relocates the ramdisk. In either case, initrd_start contains</div><div class='add'>+	 * the updated address so use that instead.</div><div class='add'>+	 *</div><div class='add'>+	 * initrd_gone is for the hotplug case where we've thrown out initrd</div><div class='add'>+	 * already.</div><div class='add'>+	 */</div><div class='add'>+	if (!use_pa) {</div><div class='add'>+		if (initrd_gone)</div><div class='add'>+			return (struct cpio_data){ NULL, 0, "" };</div><div class='add'>+		if (initrd_start)</div><div class='add'>+			start = initrd_start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return find_cpio_data(path, (void *)start, size, NULL);</div><div class='add'>+#else /* !CONFIG_BLK_DEV_INITRD */</div><div class='add'>+	return (struct cpio_data){ NULL, 0, "" };</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void reload_early_microcode(void)</div><div class='hunk'>@@ -453,16 +557,17 @@ static struct attribute_group mc_attr_group = {</div><div class='ctx'> </div><div class='ctx'> static void microcode_fini_cpu(int cpu)</div><div class='ctx'> {</div><div class='del'>-	microcode_ops-&gt;microcode_fini_cpu(cpu);</div><div class='add'>+	if (microcode_ops-&gt;microcode_fini_cpu)</div><div class='add'>+		microcode_ops-&gt;microcode_fini_cpu(cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum ucode_state microcode_resume_cpu(int cpu)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("CPU%d updated upon resume\n", cpu);</div><div class='del'>-</div><div class='ctx'> 	if (apply_microcode_on_target(cpu))</div><div class='ctx'> 		return UCODE_ERROR;</div><div class='ctx'> </div><div class='add'>+	pr_debug("CPU%d updated upon resume\n", cpu);</div><div class='add'>+</div><div class='ctx'> 	return UCODE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -496,6 +601,9 @@ static enum ucode_state microcode_update_cpu(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='ctx'> </div><div class='add'>+	/* Refresh CPU microcode revision after resume. */</div><div class='add'>+	collect_cpu_info(cpu);</div><div class='add'>+</div><div class='ctx'> 	if (uci-&gt;valid)</div><div class='ctx'> 		return microcode_resume_cpu(cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -579,12 +687,7 @@ static int mc_cpu_down_prep(unsigned int cpu)</div><div class='ctx'> 	/* Suspend is in progress, only remove the interface */</div><div class='ctx'> 	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;mc_attr_group);</div><div class='ctx'> 	pr_debug("CPU%d removed\n", cpu);</div><div class='del'>-	/*</div><div class='del'>-	 * When a CPU goes offline, don't free up or invalidate the copy of</div><div class='del'>-	 * the microcode in kernel memory, so that we can reuse it when the</div><div class='del'>-	 * CPU comes back online without unnecessarily requesting the userspace</div><div class='del'>-	 * for it again.</div><div class='del'>-	 */</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -649,8 +752,7 @@ int __init microcode_init(void)</div><div class='ctx'> 	cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/microcode:online",</div><div class='ctx'> 				  mc_cpu_online, mc_cpu_down_prep);</div><div class='ctx'> </div><div class='del'>-	pr_info("Microcode Update Driver: v" MICROCODE_VERSION</div><div class='del'>-		" &lt;tigran@aivazian.fsnet.co.uk&gt;, Peter Oruba\n");</div><div class='add'>+	pr_info("Microcode Update Driver: v%s.", DRIVER_VERSION);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c<br/>index cdc0deab00c9..8325d8a09ab0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/microcode/intel.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/microcode/intel.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/microcode/intel.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/microcode/intel.c</a></div><div class='hunk'>@@ -39,125 +39,83 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Temporary microcode blobs pointers storage. We note here during early load</div><div class='del'>- * the pointers to microcode blobs we've got from whatever storage (detached</div><div class='del'>- * initrd, builtin). Later on, we put those into final storage</div><div class='del'>- * mc_saved_data.mc_saved.</div><div class='del'>- *</div><div class='del'>- * Important: those are offsets from the beginning of initrd or absolute</div><div class='del'>- * addresses within the kernel image when built-in.</div><div class='del'>- */</div><div class='del'>-static unsigned long mc_tmp_ptrs[MAX_UCODE_COUNT];</div><div class='del'>-</div><div class='del'>-static struct mc_saved_data {</div><div class='del'>-	unsigned int num_saved;</div><div class='del'>-	struct microcode_intel **mc_saved;</div><div class='del'>-} mc_saved_data;</div><div class='add'>+static const char ucode_path[] = "kernel/x86/microcode/GenuineIntel.bin";</div><div class='ctx'> </div><div class='del'>-/* Microcode blobs within the initrd. 0 if builtin. */</div><div class='del'>-static struct ucode_blobs {</div><div class='del'>-	unsigned long start;</div><div class='del'>-	bool valid;</div><div class='del'>-} blobs;</div><div class='add'>+/* Current microcode patch used in early patching on the APs. */</div><div class='add'>+struct microcode_intel *intel_ucode_patch;</div><div class='ctx'> </div><div class='del'>-/* Go through saved patches and find the one suitable for the current CPU. */</div><div class='del'>-static enum ucode_state</div><div class='del'>-find_microcode_patch(struct microcode_intel **saved,</div><div class='del'>-		     unsigned int num_saved, struct ucode_cpu_info *uci)</div><div class='add'>+static inline bool cpu_signatures_match(unsigned int s1, unsigned int p1,</div><div class='add'>+					unsigned int s2, unsigned int p2)</div><div class='ctx'> {</div><div class='del'>-	struct microcode_intel *ucode_ptr, *new_mc = NULL;</div><div class='del'>-	struct microcode_header_intel *mc_hdr;</div><div class='del'>-	int new_rev, ret, i;</div><div class='del'>-</div><div class='del'>-	new_rev = uci-&gt;cpu_sig.rev;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_saved; i++) {</div><div class='del'>-		ucode_ptr = saved[i];</div><div class='del'>-		mc_hdr	  = (struct microcode_header_intel *)ucode_ptr;</div><div class='del'>-</div><div class='del'>-		ret = has_newer_microcode(ucode_ptr,</div><div class='del'>-					  uci-&gt;cpu_sig.sig,</div><div class='del'>-					  uci-&gt;cpu_sig.pf,</div><div class='del'>-					  new_rev);</div><div class='del'>-		if (!ret)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		new_rev = mc_hdr-&gt;rev;</div><div class='del'>-		new_mc  = ucode_ptr;</div><div class='del'>-	}</div><div class='add'>+	if (s1 != s2)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	if (!new_mc)</div><div class='del'>-		return UCODE_NFOUND;</div><div class='add'>+	/* Processor flags are either both 0 ... */</div><div class='add'>+	if (!p1 &amp;&amp; !p2)</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='del'>-	uci-&gt;mc = (struct microcode_intel *)new_mc;</div><div class='del'>-	return UCODE_OK;</div><div class='add'>+	/* ... or they intersect. */</div><div class='add'>+	return p1 &amp; p2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-copy_ptrs(struct microcode_intel **mc_saved, unsigned long *mc_ptrs,</div><div class='del'>-	  unsigned long off, int num_saved)</div><div class='add'>+/*</div><div class='add'>+ * Returns 1 if update has been found, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static int find_matching_signature(void *mc, unsigned int csig, int cpf)</div><div class='ctx'> {</div><div class='add'>+	struct microcode_header_intel *mc_hdr = mc;</div><div class='add'>+	struct extended_sigtable *ext_hdr;</div><div class='add'>+	struct extended_signature *ext_sig;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_saved; i++)</div><div class='del'>-		mc_saved[i] = (struct microcode_intel *)(mc_ptrs[i] + off);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-static void</div><div class='del'>-microcode_phys(struct microcode_intel **mc_saved_tmp, struct mc_saved_data *mcs)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct microcode_intel ***mc_saved;</div><div class='add'>+	if (cpu_signatures_match(csig, cpf, mc_hdr-&gt;sig, mc_hdr-&gt;pf))</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-	mc_saved = (struct microcode_intel ***)__pa_nodebug(&amp;mcs-&gt;mc_saved);</div><div class='add'>+	/* Look for ext. headers: */</div><div class='add'>+	if (get_totalsize(mc_hdr) &lt;= get_datasize(mc_hdr) + MC_HEADER_SIZE)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; mcs-&gt;num_saved; i++) {</div><div class='del'>-		struct microcode_intel *p;</div><div class='add'>+	ext_hdr = mc + get_datasize(mc_hdr) + MC_HEADER_SIZE;</div><div class='add'>+	ext_sig = (void *)ext_hdr + EXT_HEADER_SIZE;</div><div class='ctx'> </div><div class='del'>-		p = *(struct microcode_intel **)__pa_nodebug(mcs-&gt;mc_saved + i);</div><div class='del'>-		mc_saved_tmp[i] = (struct microcode_intel *)__pa_nodebug(p);</div><div class='add'>+	for (i = 0; i &lt; ext_hdr-&gt;count; i++) {</div><div class='add'>+		if (cpu_signatures_match(csig, cpf, ext_sig-&gt;sig, ext_sig-&gt;pf))</div><div class='add'>+			return 1;</div><div class='add'>+		ext_sig++;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static enum ucode_state</div><div class='del'>-load_microcode(struct mc_saved_data *mcs, unsigned long *mc_ptrs,</div><div class='del'>-	       unsigned long offset, struct ucode_cpu_info *uci)</div><div class='add'>+/*</div><div class='add'>+ * Returns 1 if update has been found, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static int has_newer_microcode(void *mc, unsigned int csig, int cpf, int new_rev)</div><div class='ctx'> {</div><div class='del'>-	struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT];</div><div class='del'>-	unsigned int count = mcs-&gt;num_saved;</div><div class='add'>+	struct microcode_header_intel *mc_hdr = mc;</div><div class='ctx'> </div><div class='del'>-	if (!mcs-&gt;mc_saved) {</div><div class='del'>-		copy_ptrs(mc_saved_tmp, mc_ptrs, offset, count);</div><div class='add'>+	if (mc_hdr-&gt;rev &lt;= new_rev)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		return find_microcode_patch(mc_saved_tmp, count, uci);</div><div class='del'>-	} else {</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-		microcode_phys(mc_saved_tmp, mcs);</div><div class='del'>-		return find_microcode_patch(mc_saved_tmp, count, uci);</div><div class='del'>-#else</div><div class='del'>-		return find_microcode_patch(mcs-&gt;mc_saved, count, uci);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='add'>+	return find_matching_signature(mc, csig, cpf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Given CPU signature and a microcode patch, this function finds if the</div><div class='ctx'>  * microcode patch has matching family and model with the CPU.</div><div class='add'>+ *</div><div class='add'>+ * %true - if there's a match</div><div class='add'>+ * %false - otherwise</div><div class='ctx'>  */</div><div class='del'>-static enum ucode_state</div><div class='del'>-matching_model_microcode(struct microcode_header_intel *mc_header,</div><div class='del'>-			unsigned long sig)</div><div class='add'>+static bool microcode_matches(struct microcode_header_intel *mc_header,</div><div class='add'>+			      unsigned long sig)</div><div class='ctx'> {</div><div class='del'>-	unsigned int fam, model;</div><div class='del'>-	unsigned int fam_ucode, model_ucode;</div><div class='del'>-	struct extended_sigtable *ext_header;</div><div class='ctx'> 	unsigned long total_size = get_totalsize(mc_header);</div><div class='ctx'> 	unsigned long data_size = get_datasize(mc_header);</div><div class='del'>-	int ext_sigcount, i;</div><div class='add'>+	struct extended_sigtable *ext_header;</div><div class='add'>+	unsigned int fam_ucode, model_ucode;</div><div class='ctx'> 	struct extended_signature *ext_sig;</div><div class='add'>+	unsigned int fam, model;</div><div class='add'>+	int ext_sigcount, i;</div><div class='ctx'> </div><div class='ctx'> 	fam   = x86_family(sig);</div><div class='ctx'> 	model = x86_model(sig);</div><div class='hunk'>@@ -166,11 +124,11 @@ matching_model_microcode(struct microcode_header_intel *mc_header,</div><div class='ctx'> 	model_ucode = x86_model(mc_header-&gt;sig);</div><div class='ctx'> </div><div class='ctx'> 	if (fam == fam_ucode &amp;&amp; model == model_ucode)</div><div class='del'>-		return UCODE_OK;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* Look for ext. headers: */</div><div class='ctx'> 	if (total_size &lt;= data_size + MC_HEADER_SIZE)</div><div class='del'>-		return UCODE_NFOUND;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	ext_header   = (void *) mc_header + data_size + MC_HEADER_SIZE;</div><div class='ctx'> 	ext_sig      = (void *)ext_header + EXT_HEADER_SIZE;</div><div class='hunk'>@@ -181,192 +139,242 @@ matching_model_microcode(struct microcode_header_intel *mc_header,</div><div class='ctx'> 		model_ucode = x86_model(ext_sig-&gt;sig);</div><div class='ctx'> </div><div class='ctx'> 		if (fam == fam_ucode &amp;&amp; model == model_ucode)</div><div class='del'>-			return UCODE_OK;</div><div class='add'>+			return true;</div><div class='ctx'> </div><div class='ctx'> 		ext_sig++;</div><div class='ctx'> 	}</div><div class='del'>-	return UCODE_NFOUND;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-save_microcode(struct mc_saved_data *mcs,</div><div class='del'>-	       struct microcode_intel **mc_saved_src,</div><div class='del'>-	       unsigned int num_saved)</div><div class='add'>+static struct ucode_patch *__alloc_microcode_buf(void *data, unsigned int size)</div><div class='ctx'> {</div><div class='del'>-	int i, j;</div><div class='del'>-	struct microcode_intel **saved_ptr;</div><div class='del'>-	int ret;</div><div class='add'>+	struct ucode_patch *p;</div><div class='ctx'> </div><div class='del'>-	if (!num_saved)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	p = kzalloc(sizeof(struct ucode_patch), GFP_KERNEL);</div><div class='add'>+	if (!p)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Copy new microcode data.</div><div class='del'>-	 */</div><div class='del'>-	saved_ptr = kcalloc(num_saved, sizeof(struct microcode_intel *), GFP_KERNEL);</div><div class='del'>-	if (!saved_ptr)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_saved; i++) {</div><div class='del'>-		struct microcode_header_intel *mc_hdr;</div><div class='del'>-		struct microcode_intel *mc;</div><div class='del'>-		unsigned long size;</div><div class='del'>-</div><div class='del'>-		if (!mc_saved_src[i]) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='add'>+	p-&gt;data = kmemdup(data, size, GFP_KERNEL);</div><div class='add'>+	if (!p-&gt;data) {</div><div class='add'>+		kfree(p);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void save_microcode_patch(void *data, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	struct microcode_header_intel *mc_hdr, *mc_saved_hdr;</div><div class='add'>+	struct ucode_patch *iter, *tmp, *p;</div><div class='add'>+	bool prev_found = false;</div><div class='add'>+	unsigned int sig, pf;</div><div class='add'>+</div><div class='add'>+	mc_hdr = (struct microcode_header_intel *)data;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(iter, tmp, &amp;microcode_cache, plist) {</div><div class='add'>+		mc_saved_hdr = (struct microcode_header_intel *)iter-&gt;data;</div><div class='add'>+		sig	     = mc_saved_hdr-&gt;sig;</div><div class='add'>+		pf	     = mc_saved_hdr-&gt;pf;</div><div class='add'>+</div><div class='add'>+		if (find_matching_signature(data, sig, pf)) {</div><div class='add'>+			prev_found = true;</div><div class='ctx'> </div><div class='del'>-		mc     = mc_saved_src[i];</div><div class='del'>-		mc_hdr = &amp;mc-&gt;hdr;</div><div class='del'>-		size   = get_totalsize(mc_hdr);</div><div class='add'>+			if (mc_hdr-&gt;rev &lt;= mc_saved_hdr-&gt;rev)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-		saved_ptr[i] = kmemdup(mc, size, GFP_KERNEL);</div><div class='del'>-		if (!saved_ptr[i]) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto err;</div><div class='add'>+			p = __alloc_microcode_buf(data, size);</div><div class='add'>+			if (IS_ERR(p))</div><div class='add'>+				pr_err("Error allocating buffer %p\n", data);</div><div class='add'>+			else</div><div class='add'>+				list_replace(&amp;iter-&gt;plist, &amp;p-&gt;plist);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Point to newly saved microcode.</div><div class='add'>+	 * There weren't any previous patches found in the list cache; save the</div><div class='add'>+	 * newly found.</div><div class='ctx'> 	 */</div><div class='del'>-	mcs-&gt;mc_saved  = saved_ptr;</div><div class='del'>-	mcs-&gt;num_saved = num_saved;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	for (j = 0; j &lt;= i; j++)</div><div class='del'>-		kfree(saved_ptr[j]);</div><div class='del'>-	kfree(saved_ptr);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	if (!prev_found) {</div><div class='add'>+		p = __alloc_microcode_buf(data, size);</div><div class='add'>+		if (IS_ERR(p))</div><div class='add'>+			pr_err("Error allocating buffer for %p\n", data);</div><div class='add'>+		else</div><div class='add'>+			list_add_tail(&amp;p-&gt;plist, &amp;microcode_cache);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * A microcode patch in ucode_ptr is saved into mc_saved</div><div class='del'>- * - if it has matching signature and newer revision compared to an existing</div><div class='del'>- *   patch mc_saved.</div><div class='del'>- * - or if it is a newly discovered microcode patch.</div><div class='del'>- *</div><div class='del'>- * The microcode patch should have matching model with CPU.</div><div class='del'>- *</div><div class='del'>- * Returns: The updated number @num_saved of saved microcode patches.</div><div class='del'>- */</div><div class='del'>-static unsigned int _save_mc(struct microcode_intel **mc_saved,</div><div class='del'>-			     u8 *ucode_ptr, unsigned int num_saved)</div><div class='add'>+static int microcode_sanity_check(void *mc, int print_err)</div><div class='ctx'> {</div><div class='del'>-	struct microcode_header_intel *mc_hdr, *mc_saved_hdr;</div><div class='del'>-	unsigned int sig, pf;</div><div class='del'>-	int found = 0, i;</div><div class='add'>+	unsigned long total_size, data_size, ext_table_size;</div><div class='add'>+	struct microcode_header_intel *mc_header = mc;</div><div class='add'>+	struct extended_sigtable *ext_header = NULL;</div><div class='add'>+	u32 sum, orig_sum, ext_sigcount = 0, i;</div><div class='add'>+	struct extended_signature *ext_sig;</div><div class='ctx'> </div><div class='del'>-	mc_hdr = (struct microcode_header_intel *)ucode_ptr;</div><div class='add'>+	total_size = get_totalsize(mc_header);</div><div class='add'>+	data_size = get_datasize(mc_header);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_saved; i++) {</div><div class='del'>-		mc_saved_hdr = (struct microcode_header_intel *)mc_saved[i];</div><div class='del'>-		sig	     = mc_saved_hdr-&gt;sig;</div><div class='del'>-		pf	     = mc_saved_hdr-&gt;pf;</div><div class='add'>+	if (data_size + MC_HEADER_SIZE &gt; total_size) {</div><div class='add'>+		if (print_err)</div><div class='add'>+			pr_err("Error: bad microcode data file size.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (!find_matching_signature(ucode_ptr, sig, pf))</div><div class='del'>-			continue;</div><div class='add'>+	if (mc_header-&gt;ldrver != 1 || mc_header-&gt;hdrver != 1) {</div><div class='add'>+		if (print_err)</div><div class='add'>+			pr_err("Error: invalid/unknown microcode update format.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		found = 1;</div><div class='add'>+	ext_table_size = total_size - (MC_HEADER_SIZE + data_size);</div><div class='add'>+	if (ext_table_size) {</div><div class='add'>+		u32 ext_table_sum = 0;</div><div class='add'>+		u32 *ext_tablep;</div><div class='ctx'> </div><div class='del'>-		if (mc_hdr-&gt;rev &lt;= mc_saved_hdr-&gt;rev)</div><div class='del'>-			continue;</div><div class='add'>+		if ((ext_table_size &lt; EXT_HEADER_SIZE)</div><div class='add'>+		 || ((ext_table_size - EXT_HEADER_SIZE) % EXT_SIGNATURE_SIZE)) {</div><div class='add'>+			if (print_err)</div><div class='add'>+				pr_err("Error: truncated extended signature table.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ext_header = mc + MC_HEADER_SIZE + data_size;</div><div class='add'>+		if (ext_table_size != exttable_size(ext_header)) {</div><div class='add'>+			if (print_err)</div><div class='add'>+				pr_err("Error: extended signature table size mismatch.\n");</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ext_sigcount = ext_header-&gt;count;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Found an older ucode saved earlier. Replace it with</div><div class='del'>-		 * this newer one.</div><div class='add'>+		 * Check extended table checksum: the sum of all dwords that</div><div class='add'>+		 * comprise a valid table must be 0.</div><div class='ctx'> 		 */</div><div class='del'>-		mc_saved[i] = (struct microcode_intel *)ucode_ptr;</div><div class='del'>-		break;</div><div class='add'>+		ext_tablep = (u32 *)ext_header;</div><div class='add'>+</div><div class='add'>+		i = ext_table_size / sizeof(u32);</div><div class='add'>+		while (i--)</div><div class='add'>+			ext_table_sum += ext_tablep[i];</div><div class='add'>+</div><div class='add'>+		if (ext_table_sum) {</div><div class='add'>+			if (print_err)</div><div class='add'>+				pr_warn("Bad extended signature table checksum, aborting.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Calculate the checksum of update data and header. The checksum of</div><div class='add'>+	 * valid update data and header including the extended signature table</div><div class='add'>+	 * must be 0.</div><div class='add'>+	 */</div><div class='add'>+	orig_sum = 0;</div><div class='add'>+	i = (MC_HEADER_SIZE + data_size) / sizeof(u32);</div><div class='add'>+	while (i--)</div><div class='add'>+		orig_sum += ((u32 *)mc)[i];</div><div class='add'>+</div><div class='add'>+	if (orig_sum) {</div><div class='add'>+		if (print_err)</div><div class='add'>+			pr_err("Bad microcode data checksum, aborting.\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Newly detected microcode, save it to memory. */</div><div class='del'>-	if (i &gt;= num_saved &amp;&amp; !found)</div><div class='del'>-		mc_saved[num_saved++] = (struct microcode_intel *)ucode_ptr;</div><div class='add'>+	if (!ext_table_size)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return num_saved;</div><div class='add'>+	/*</div><div class='add'>+	 * Check extended signature checksum: 0 =&gt; valid.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ext_sigcount; i++) {</div><div class='add'>+		ext_sig = (void *)ext_header + EXT_HEADER_SIZE +</div><div class='add'>+			  EXT_SIGNATURE_SIZE * i;</div><div class='add'>+</div><div class='add'>+		sum = (mc_header-&gt;sig + mc_header-&gt;pf + mc_header-&gt;cksum) -</div><div class='add'>+		      (ext_sig-&gt;sig + ext_sig-&gt;pf + ext_sig-&gt;cksum);</div><div class='add'>+		if (sum) {</div><div class='add'>+			if (print_err)</div><div class='add'>+				pr_err("Bad extended signature checksum, aborting.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Get microcode matching with BSP's model. Only CPUs with the same model as</div><div class='ctx'>  * BSP can stay in the platform.</div><div class='ctx'>  */</div><div class='del'>-static enum ucode_state __init</div><div class='del'>-get_matching_model_microcode(unsigned long start, void *data, size_t size,</div><div class='del'>-			     struct mc_saved_data *mcs, unsigned long *mc_ptrs,</div><div class='del'>-			     struct ucode_cpu_info *uci)</div><div class='add'>+static struct microcode_intel *</div><div class='add'>+scan_microcode(void *data, size_t size, struct ucode_cpu_info *uci, bool save)</div><div class='ctx'> {</div><div class='del'>-	struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT];</div><div class='ctx'> 	struct microcode_header_intel *mc_header;</div><div class='del'>-	unsigned int num_saved = mcs-&gt;num_saved;</div><div class='del'>-	enum ucode_state state = UCODE_OK;</div><div class='del'>-	unsigned int leftover = size;</div><div class='del'>-	u8 *ucode_ptr = data;</div><div class='add'>+	struct microcode_intel *patch = NULL;</div><div class='ctx'> 	unsigned int mc_size;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	while (leftover &amp;&amp; num_saved &lt; ARRAY_SIZE(mc_saved_tmp)) {</div><div class='ctx'> </div><div class='del'>-		if (leftover &lt; sizeof(mc_header))</div><div class='add'>+	while (size) {</div><div class='add'>+		if (size &lt; sizeof(struct microcode_header_intel))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		mc_header = (struct microcode_header_intel *)ucode_ptr;</div><div class='add'>+		mc_header = (struct microcode_header_intel *)data;</div><div class='ctx'> </div><div class='ctx'> 		mc_size = get_totalsize(mc_header);</div><div class='del'>-		if (!mc_size || mc_size &gt; leftover ||</div><div class='del'>-			microcode_sanity_check(ucode_ptr, 0) &lt; 0)</div><div class='add'>+		if (!mc_size ||</div><div class='add'>+		    mc_size &gt; size ||</div><div class='add'>+		    microcode_sanity_check(data, 0) &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		leftover -= mc_size;</div><div class='add'>+		size -= mc_size;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Since APs with same family and model as the BSP may boot in</div><div class='del'>-		 * the platform, we need to find and save microcode patches</div><div class='del'>-		 * with the same family and model as the BSP.</div><div class='del'>-		 */</div><div class='del'>-		if (matching_model_microcode(mc_header, uci-&gt;cpu_sig.sig) != UCODE_OK) {</div><div class='del'>-			ucode_ptr += mc_size;</div><div class='add'>+		if (!microcode_matches(mc_header, uci-&gt;cpu_sig.sig)) {</div><div class='add'>+			data += mc_size;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		num_saved = _save_mc(mc_saved_tmp, ucode_ptr, num_saved);</div><div class='add'>+		if (save) {</div><div class='add'>+			save_microcode_patch(data, mc_size);</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		ucode_ptr += mc_size;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (leftover) {</div><div class='del'>-		state = UCODE_ERROR;</div><div class='del'>-		return state;</div><div class='del'>-	}</div><div class='add'>+		if (!patch) {</div><div class='add'>+			if (!has_newer_microcode(data,</div><div class='add'>+						 uci-&gt;cpu_sig.sig,</div><div class='add'>+						 uci-&gt;cpu_sig.pf,</div><div class='add'>+						 uci-&gt;cpu_sig.rev))</div><div class='add'>+				goto next;</div><div class='ctx'> </div><div class='del'>-	if (!num_saved) {</div><div class='del'>-		state = UCODE_NFOUND;</div><div class='del'>-		return state;</div><div class='del'>-	}</div><div class='add'>+		} else {</div><div class='add'>+			struct microcode_header_intel *phdr = &amp;patch-&gt;hdr;</div><div class='add'>+</div><div class='add'>+			if (!has_newer_microcode(data,</div><div class='add'>+						 phdr-&gt;sig,</div><div class='add'>+						 phdr-&gt;pf,</div><div class='add'>+						 phdr-&gt;rev))</div><div class='add'>+				goto next;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_saved; i++)</div><div class='del'>-		mc_ptrs[i] = (unsigned long)mc_saved_tmp[i] - start;</div><div class='add'>+		/* We have a newer patch, save it. */</div><div class='add'>+		patch = data;</div><div class='ctx'> </div><div class='del'>-	mcs-&gt;num_saved = num_saved;</div><div class='add'>+next:</div><div class='add'>+		data += mc_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (size)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	return state;</div><div class='add'>+	return patch;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int collect_cpu_info_early(struct ucode_cpu_info *uci)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val[2];</div><div class='ctx'> 	unsigned int family, model;</div><div class='del'>-	struct cpu_signature csig;</div><div class='add'>+	struct cpu_signature csig = { 0 };</div><div class='ctx'> 	unsigned int eax, ebx, ecx, edx;</div><div class='ctx'> </div><div class='del'>-	csig.sig = 0;</div><div class='del'>-	csig.pf = 0;</div><div class='del'>-	csig.rev = 0;</div><div class='del'>-</div><div class='ctx'> 	memset(uci, 0, sizeof(*uci));</div><div class='ctx'> </div><div class='ctx'> 	eax = 0x00000001;</div><div class='hunk'>@@ -374,23 +382,16 @@ static int collect_cpu_info_early(struct ucode_cpu_info *uci)</div><div class='ctx'> 	native_cpuid(&amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='ctx'> 	csig.sig = eax;</div><div class='ctx'> </div><div class='del'>-	family = x86_family(csig.sig);</div><div class='del'>-	model  = x86_model(csig.sig);</div><div class='add'>+	family = x86_family(eax);</div><div class='add'>+	model  = x86_model(eax);</div><div class='ctx'> </div><div class='ctx'> 	if ((model &gt;= 5) || (family &gt; 6)) {</div><div class='ctx'> 		/* get processor flags from MSR 0x17 */</div><div class='ctx'> 		native_rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]);</div><div class='ctx'> 		csig.pf = 1 &lt;&lt; ((val[1] &gt;&gt; 18) &amp; 7);</div><div class='ctx'> 	}</div><div class='del'>-	native_wrmsrl(MSR_IA32_UCODE_REV, 0);</div><div class='ctx'> </div><div class='del'>-	/* As documented in the SDM: Do a CPUID 1 here */</div><div class='del'>-	sync_core();</div><div class='del'>-</div><div class='del'>-	/* get the current revision from MSR 0x8B */</div><div class='del'>-	native_rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]);</div><div class='del'>-</div><div class='del'>-	csig.rev = val[1];</div><div class='add'>+	csig.rev = intel_get_microcode_revision();</div><div class='ctx'> </div><div class='ctx'> 	uci-&gt;cpu_sig = csig;</div><div class='ctx'> 	uci-&gt;valid = 1;</div><div class='hunk'>@@ -401,40 +402,41 @@ static int collect_cpu_info_early(struct ucode_cpu_info *uci)</div><div class='ctx'> static void show_saved_mc(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-	int i, j;</div><div class='add'>+	int i = 0, j;</div><div class='ctx'> 	unsigned int sig, pf, rev, total_size, data_size, date;</div><div class='ctx'> 	struct ucode_cpu_info uci;</div><div class='add'>+	struct ucode_patch *p;</div><div class='ctx'> </div><div class='del'>-	if (!mc_saved_data.num_saved) {</div><div class='add'>+	if (list_empty(&amp;microcode_cache)) {</div><div class='ctx'> 		pr_debug("no microcode data saved.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	pr_debug("Total microcode saved: %d\n", mc_saved_data.num_saved);</div><div class='ctx'> </div><div class='ctx'> 	collect_cpu_info_early(&amp;uci);</div><div class='ctx'> </div><div class='del'>-	sig = uci.cpu_sig.sig;</div><div class='del'>-	pf = uci.cpu_sig.pf;</div><div class='del'>-	rev = uci.cpu_sig.rev;</div><div class='add'>+	sig	= uci.cpu_sig.sig;</div><div class='add'>+	pf	= uci.cpu_sig.pf;</div><div class='add'>+	rev	= uci.cpu_sig.rev;</div><div class='ctx'> 	pr_debug("CPU: sig=0x%x, pf=0x%x, rev=0x%x\n", sig, pf, rev);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; mc_saved_data.num_saved; i++) {</div><div class='add'>+	list_for_each_entry(p, &amp;microcode_cache, plist) {</div><div class='ctx'> 		struct microcode_header_intel *mc_saved_header;</div><div class='ctx'> 		struct extended_sigtable *ext_header;</div><div class='del'>-		int ext_sigcount;</div><div class='ctx'> 		struct extended_signature *ext_sig;</div><div class='add'>+		int ext_sigcount;</div><div class='ctx'> </div><div class='del'>-		mc_saved_header = (struct microcode_header_intel *)</div><div class='del'>-				  mc_saved_data.mc_saved[i];</div><div class='del'>-		sig = mc_saved_header-&gt;sig;</div><div class='del'>-		pf = mc_saved_header-&gt;pf;</div><div class='del'>-		rev = mc_saved_header-&gt;rev;</div><div class='del'>-		total_size = get_totalsize(mc_saved_header);</div><div class='del'>-		data_size = get_datasize(mc_saved_header);</div><div class='del'>-		date = mc_saved_header-&gt;date;</div><div class='add'>+		mc_saved_header = (struct microcode_header_intel *)p-&gt;data;</div><div class='add'>+</div><div class='add'>+		sig	= mc_saved_header-&gt;sig;</div><div class='add'>+		pf	= mc_saved_header-&gt;pf;</div><div class='add'>+		rev	= mc_saved_header-&gt;rev;</div><div class='add'>+		date	= mc_saved_header-&gt;date;</div><div class='add'>+</div><div class='add'>+		total_size	= get_totalsize(mc_saved_header);</div><div class='add'>+		data_size	= get_datasize(mc_saved_header);</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("mc_saved[%d]: sig=0x%x, pf=0x%x, rev=0x%x, total size=0x%x, date = %04x-%02x-%02x\n",</div><div class='del'>-			 i, sig, pf, rev, total_size,</div><div class='add'>+			 i++, sig, pf, rev, total_size,</div><div class='ctx'> 			 date &amp; 0xffff,</div><div class='ctx'> 			 date &gt;&gt; 24,</div><div class='ctx'> 			 (date &gt;&gt; 16) &amp; 0xff);</div><div class='hunk'>@@ -443,7 +445,7 @@ static void show_saved_mc(void)</div><div class='ctx'> 		if (total_size &lt;= data_size + MC_HEADER_SIZE)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ext_header = (void *) mc_saved_header + data_size + MC_HEADER_SIZE;</div><div class='add'>+		ext_header = (void *)mc_saved_header + data_size + MC_HEADER_SIZE;</div><div class='ctx'> 		ext_sigcount = ext_header-&gt;count;</div><div class='ctx'> 		ext_sig = (void *)ext_header + EXT_HEADER_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -456,85 +458,43 @@ static void show_saved_mc(void)</div><div class='ctx'> </div><div class='ctx'> 			ext_sig++;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Save this mc into mc_saved_data. So it will be loaded early when a CPU is</div><div class='del'>- * hot added or resumes.</div><div class='del'>- *</div><div class='del'>- * Please make sure this mc should be a valid microcode patch before calling</div><div class='del'>- * this function.</div><div class='add'>+ * Save this microcode patch. It will be loaded early when a CPU is</div><div class='add'>+ * hot-added or resumes.</div><div class='ctx'>  */</div><div class='del'>-static void save_mc_for_early(u8 *mc)</div><div class='add'>+static void save_mc_for_early(u8 *mc, unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> 	/* Synchronization during CPU hotplug. */</div><div class='ctx'> 	static DEFINE_MUTEX(x86_cpu_microcode_mutex);</div><div class='ctx'> </div><div class='del'>-	struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT];</div><div class='del'>-	unsigned int mc_saved_count_init;</div><div class='del'>-	unsigned int num_saved;</div><div class='del'>-	struct microcode_intel **mc_saved;</div><div class='del'>-	int ret, i;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;x86_cpu_microcode_mutex);</div><div class='ctx'> </div><div class='del'>-	mc_saved_count_init = mc_saved_data.num_saved;</div><div class='del'>-	num_saved = mc_saved_data.num_saved;</div><div class='del'>-	mc_saved = mc_saved_data.mc_saved;</div><div class='del'>-</div><div class='del'>-	if (mc_saved &amp;&amp; num_saved)</div><div class='del'>-		memcpy(mc_saved_tmp, mc_saved,</div><div class='del'>-		       num_saved * sizeof(struct microcode_intel *));</div><div class='del'>-	/*</div><div class='del'>-	 * Save the microcode patch mc in mc_save_tmp structure if it's a newer</div><div class='del'>-	 * version.</div><div class='del'>-	 */</div><div class='del'>-	num_saved = _save_mc(mc_saved_tmp, mc, num_saved);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Save the mc_save_tmp in global mc_saved_data.</div><div class='del'>-	 */</div><div class='del'>-	ret = save_microcode(&amp;mc_saved_data, mc_saved_tmp, num_saved);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("Cannot save microcode patch.\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	save_microcode_patch(mc, size);</div><div class='ctx'> 	show_saved_mc();</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Free old saved microcode data.</div><div class='del'>-	 */</div><div class='del'>-	if (mc_saved) {</div><div class='del'>-		for (i = 0; i &lt; mc_saved_count_init; i++)</div><div class='del'>-			kfree(mc_saved[i]);</div><div class='del'>-		kfree(mc_saved);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	mutex_unlock(&amp;x86_cpu_microcode_mutex);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __init load_builtin_intel_microcode(struct cpio_data *cp)</div><div class='add'>+static bool load_builtin_intel_microcode(struct cpio_data *cp)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-	unsigned int eax = 0x00000001, ebx, ecx = 0, edx;</div><div class='add'>+	unsigned int eax = 1, ebx, ecx = 0, edx;</div><div class='ctx'> 	char name[30];</div><div class='ctx'> </div><div class='add'>+	if (IS_ENABLED(CONFIG_X86_32))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	native_cpuid(&amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='ctx'> </div><div class='ctx'> 	sprintf(name, "intel-ucode/%02x-%02x-%02x",</div><div class='ctx'> 		      x86_family(eax), x86_model(eax), x86_stepping(eax));</div><div class='ctx'> </div><div class='ctx'> 	return get_builtin_firmware(cp, name);</div><div class='del'>-#else</div><div class='del'>-	return false;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -570,8 +530,7 @@ void show_ucode_info_early(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * At this point, we can not call printk() yet. Keep microcode patch number in</div><div class='del'>- * mc_saved_data.mc_saved and delay printing microcode info in</div><div class='add'>+ * At this point, we can not call printk() yet. Delay printing microcode info in</div><div class='ctx'>  * show_ucode_info_early() until printk() works.</div><div class='ctx'>  */</div><div class='ctx'> static void print_ucode(struct ucode_cpu_info *uci)</div><div class='hunk'>@@ -616,7 +575,7 @@ static inline void print_ucode(struct ucode_cpu_info *uci)</div><div class='ctx'> static int apply_microcode_early(struct ucode_cpu_info *uci, bool early)</div><div class='ctx'> {</div><div class='ctx'> 	struct microcode_intel *mc;</div><div class='del'>-	unsigned int val[2];</div><div class='add'>+	u32 rev;</div><div class='ctx'> </div><div class='ctx'> 	mc = uci-&gt;mc;</div><div class='ctx'> 	if (!mc)</div><div class='hunk'>@@ -624,21 +583,16 @@ static int apply_microcode_early(struct ucode_cpu_info *uci, bool early)</div><div class='ctx'> </div><div class='ctx'> 	/* write microcode via MSR 0x79 */</div><div class='ctx'> 	native_wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)mc-&gt;bits);</div><div class='del'>-	native_wrmsrl(MSR_IA32_UCODE_REV, 0);</div><div class='del'>-</div><div class='del'>-	/* As documented in the SDM: Do a CPUID 1 here */</div><div class='del'>-	sync_core();</div><div class='ctx'> </div><div class='del'>-	/* get the current revision from MSR 0x8B */</div><div class='del'>-	native_rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]);</div><div class='del'>-	if (val[1] != mc-&gt;hdr.rev)</div><div class='add'>+	rev = intel_get_microcode_revision();</div><div class='add'>+	if (rev != mc-&gt;hdr.rev)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	/* Flush global tlb. This is precaution. */</div><div class='ctx'> 	flush_tlb_early();</div><div class='ctx'> #endif</div><div class='del'>-	uci-&gt;cpu_sig.rev = val[1];</div><div class='add'>+	uci-&gt;cpu_sig.rev = rev;</div><div class='ctx'> </div><div class='ctx'> 	if (early)</div><div class='ctx'> 		print_ucode(uci);</div><div class='hunk'>@@ -648,206 +602,133 @@ static int apply_microcode_early(struct ucode_cpu_info *uci, bool early)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This function converts microcode patch offsets previously stored in</div><div class='del'>- * mc_tmp_ptrs to pointers and stores the pointers in mc_saved_data.</div><div class='del'>- */</div><div class='ctx'> int __init save_microcode_in_initrd_intel(void)</div><div class='ctx'> {</div><div class='del'>-	struct microcode_intel *mc_saved[MAX_UCODE_COUNT];</div><div class='del'>-	unsigned int count = mc_saved_data.num_saved;</div><div class='del'>-	unsigned long offset = 0;</div><div class='del'>-	int ret;</div><div class='add'>+	struct ucode_cpu_info uci;</div><div class='add'>+	struct cpio_data cp;</div><div class='add'>+</div><div class='add'>+	if (!load_builtin_intel_microcode(&amp;cp))</div><div class='add'>+		cp = find_microcode_in_initrd(ucode_path, false);</div><div class='ctx'> </div><div class='del'>-	if (!count)</div><div class='add'>+	if (!(cp.data &amp;&amp; cp.size))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We have found a valid initrd but it might've been relocated in the</div><div class='del'>-	 * meantime so get its updated address.</div><div class='del'>-	 */</div><div class='del'>-	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) &amp;&amp; blobs.valid)</div><div class='del'>-		offset = initrd_start;</div><div class='add'>+	collect_cpu_info_early(&amp;uci);</div><div class='ctx'> </div><div class='del'>-	copy_ptrs(mc_saved, mc_tmp_ptrs, offset, count);</div><div class='add'>+	scan_microcode(cp.data, cp.size, &amp;uci, true);</div><div class='ctx'> </div><div class='del'>-	ret = save_microcode(&amp;mc_saved_data, mc_saved, count);</div><div class='del'>-	if (ret)</div><div class='del'>-		pr_err("Cannot save microcode patches from initrd.\n");</div><div class='del'>-	else</div><div class='del'>-		show_saved_mc();</div><div class='add'>+	show_saved_mc();</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __init enum ucode_state</div><div class='del'>-__scan_microcode_initrd(struct cpio_data *cd, struct ucode_blobs *blbp)</div><div class='add'>+/*</div><div class='add'>+ * @res_patch, output: a pointer to the patch we found.</div><div class='add'>+ */</div><div class='add'>+static struct microcode_intel *__load_ucode_intel(struct ucode_cpu_info *uci)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_BLK_DEV_INITRD</div><div class='del'>-	static __initdata char ucode_name[] = "kernel/x86/microcode/GenuineIntel.bin";</div><div class='del'>-	char *p = IS_ENABLED(CONFIG_X86_32) ? (char *)__pa_nodebug(ucode_name)</div><div class='del'>-						    : ucode_name;</div><div class='del'>-# ifdef CONFIG_X86_32</div><div class='del'>-	unsigned long start = 0, size;</div><div class='del'>-	struct boot_params *params;</div><div class='del'>-</div><div class='del'>-	params = (struct boot_params *)__pa_nodebug(&amp;boot_params);</div><div class='del'>-	size   = params-&gt;hdr.ramdisk_size;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set start only if we have an initrd image. We cannot use initrd_start</div><div class='del'>-	 * because it is not set that early yet.</div><div class='del'>-	 */</div><div class='del'>-	start = (size ? params-&gt;hdr.ramdisk_image : 0);</div><div class='del'>-</div><div class='del'>-# else /* CONFIG_X86_64 */</div><div class='del'>-	unsigned long start = 0, size;</div><div class='del'>-</div><div class='del'>-	size  = (u64)boot_params.ext_ramdisk_size &lt;&lt; 32;</div><div class='del'>-	size |= boot_params.hdr.ramdisk_size;</div><div class='del'>-</div><div class='del'>-	if (size) {</div><div class='del'>-		start  = (u64)boot_params.ext_ramdisk_image &lt;&lt; 32;</div><div class='del'>-		start |= boot_params.hdr.ramdisk_image;</div><div class='add'>+	static const char *path;</div><div class='add'>+	struct cpio_data cp;</div><div class='add'>+	bool use_pa;</div><div class='ctx'> </div><div class='del'>-		start += PAGE_OFFSET;</div><div class='add'>+	if (IS_ENABLED(CONFIG_X86_32)) {</div><div class='add'>+		path	  = (const char *)__pa_nodebug(ucode_path);</div><div class='add'>+		use_pa	  = true;</div><div class='add'>+	} else {</div><div class='add'>+		path	  = ucode_path;</div><div class='add'>+		use_pa	  = false;</div><div class='ctx'> 	}</div><div class='del'>-# endif</div><div class='del'>-</div><div class='del'>-	*cd = find_cpio_data(p, (void *)start, size, NULL);</div><div class='del'>-	if (cd-&gt;data) {</div><div class='del'>-		blbp-&gt;start = start;</div><div class='del'>-		blbp-&gt;valid = true;</div><div class='ctx'> </div><div class='del'>-		return UCODE_OK;</div><div class='del'>-	} else</div><div class='del'>-#endif /* CONFIG_BLK_DEV_INITRD */</div><div class='del'>-		return UCODE_ERROR;</div><div class='del'>-}</div><div class='add'>+	/* try built-in microcode first */</div><div class='add'>+	if (!load_builtin_intel_microcode(&amp;cp))</div><div class='add'>+		cp = find_microcode_in_initrd(path, use_pa);</div><div class='ctx'> </div><div class='del'>-static __init enum ucode_state</div><div class='del'>-scan_microcode(struct mc_saved_data *mcs, unsigned long *mc_ptrs,</div><div class='del'>-	       struct ucode_cpu_info *uci, struct ucode_blobs *blbp)</div><div class='del'>-{</div><div class='del'>-	struct cpio_data cd = { NULL, 0, "" };</div><div class='del'>-	enum ucode_state ret;</div><div class='add'>+	if (!(cp.data &amp;&amp; cp.size))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* try built-in microcode first */</div><div class='del'>-	if (load_builtin_intel_microcode(&amp;cd))</div><div class='del'>-		/*</div><div class='del'>-		 * Invalidate blobs as we might've gotten an initrd too,</div><div class='del'>-		 * supplied by the boot loader, by mistake or simply forgotten</div><div class='del'>-		 * there. That's fine, we ignore it since we've found builtin</div><div class='del'>-		 * microcode already.</div><div class='del'>-		 */</div><div class='del'>-		blbp-&gt;valid = false;</div><div class='del'>-	else {</div><div class='del'>-		ret = __scan_microcode_initrd(&amp;cd, blbp);</div><div class='del'>-		if (ret != UCODE_OK)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+	collect_cpu_info_early(uci);</div><div class='ctx'> </div><div class='del'>-	return get_matching_model_microcode(blbp-&gt;start, cd.data, cd.size,</div><div class='del'>-					    mcs, mc_ptrs, uci);</div><div class='add'>+	return scan_microcode(cp.data, cp.size, uci, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init</div><div class='del'>-_load_ucode_intel_bsp(struct mc_saved_data *mcs, unsigned long *mc_ptrs,</div><div class='del'>-		      struct ucode_blobs *blbp)</div><div class='add'>+void __init load_ucode_intel_bsp(void)</div><div class='ctx'> {</div><div class='add'>+	struct microcode_intel *patch;</div><div class='ctx'> 	struct ucode_cpu_info uci;</div><div class='del'>-	enum ucode_state ret;</div><div class='del'>-</div><div class='del'>-	collect_cpu_info_early(&amp;uci);</div><div class='ctx'> </div><div class='del'>-	ret = scan_microcode(mcs, mc_ptrs, &amp;uci, blbp);</div><div class='del'>-	if (ret != UCODE_OK)</div><div class='add'>+	patch = __load_ucode_intel(&amp;uci);</div><div class='add'>+	if (!patch)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ret = load_microcode(mcs, mc_ptrs, blbp-&gt;start, &amp;uci);</div><div class='del'>-	if (ret != UCODE_OK)</div><div class='del'>-		return;</div><div class='add'>+	uci.mc = patch;</div><div class='ctx'> </div><div class='ctx'> 	apply_microcode_early(&amp;uci, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init load_ucode_intel_bsp(void)</div><div class='add'>+void load_ucode_intel_ap(void)</div><div class='ctx'> {</div><div class='del'>-	struct ucode_blobs *blobs_p;</div><div class='del'>-	struct mc_saved_data *mcs;</div><div class='del'>-	unsigned long *ptrs;</div><div class='add'>+	struct microcode_intel *patch, **iup;</div><div class='add'>+	struct ucode_cpu_info uci;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-	mcs	= (struct mc_saved_data *)__pa_nodebug(&amp;mc_saved_data);</div><div class='del'>-	ptrs	= (unsigned long *)__pa_nodebug(&amp;mc_tmp_ptrs);</div><div class='del'>-	blobs_p	= (struct ucode_blobs *)__pa_nodebug(&amp;blobs);</div><div class='del'>-#else</div><div class='del'>-	mcs	= &amp;mc_saved_data;</div><div class='del'>-	ptrs	= mc_tmp_ptrs;</div><div class='del'>-	blobs_p = &amp;blobs;</div><div class='del'>-#endif</div><div class='add'>+	if (IS_ENABLED(CONFIG_X86_32))</div><div class='add'>+		iup = (struct microcode_intel **) __pa_nodebug(&amp;intel_ucode_patch);</div><div class='add'>+	else</div><div class='add'>+		iup = &amp;intel_ucode_patch;</div><div class='add'>+</div><div class='add'>+reget:</div><div class='add'>+	if (!*iup) {</div><div class='add'>+		patch = __load_ucode_intel(&amp;uci);</div><div class='add'>+		if (!patch)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		*iup = patch;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uci.mc = *iup;</div><div class='ctx'> </div><div class='del'>-	_load_ucode_intel_bsp(mcs, ptrs, blobs_p);</div><div class='add'>+	if (apply_microcode_early(&amp;uci, true)) {</div><div class='add'>+		/* Mixed-silicon system? Try to refetch the proper patch: */</div><div class='add'>+		*iup = NULL;</div><div class='add'>+</div><div class='add'>+		goto reget;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void load_ucode_intel_ap(void)</div><div class='add'>+static struct microcode_intel *find_patch(struct ucode_cpu_info *uci)</div><div class='ctx'> {</div><div class='del'>-	struct ucode_blobs *blobs_p;</div><div class='del'>-	unsigned long *ptrs, start = 0;</div><div class='del'>-	struct mc_saved_data *mcs;</div><div class='del'>-	struct ucode_cpu_info uci;</div><div class='del'>-	enum ucode_state ret;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-	mcs	= (struct mc_saved_data *)__pa_nodebug(&amp;mc_saved_data);</div><div class='del'>-	ptrs	= (unsigned long *)__pa_nodebug(mc_tmp_ptrs);</div><div class='del'>-	blobs_p	= (struct ucode_blobs *)__pa_nodebug(&amp;blobs);</div><div class='del'>-#else</div><div class='del'>-	mcs	= &amp;mc_saved_data;</div><div class='del'>-	ptrs	= mc_tmp_ptrs;</div><div class='del'>-	blobs_p = &amp;blobs;</div><div class='del'>-#endif</div><div class='add'>+	struct microcode_header_intel *phdr;</div><div class='add'>+	struct ucode_patch *iter, *tmp;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If there is no valid ucode previously saved in memory, no need to</div><div class='del'>-	 * update ucode on this AP.</div><div class='del'>-	 */</div><div class='del'>-	if (!mcs-&gt;num_saved)</div><div class='del'>-		return;</div><div class='add'>+	list_for_each_entry_safe(iter, tmp, &amp;microcode_cache, plist) {</div><div class='ctx'> </div><div class='del'>-	if (blobs_p-&gt;valid) {</div><div class='del'>-		start = blobs_p-&gt;start;</div><div class='add'>+		phdr = (struct microcode_header_intel *)iter-&gt;data;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Pay attention to CONFIG_RANDOMIZE_MEMORY=y as it shuffles</div><div class='del'>-		 * physmem mapping too and there we have the initrd.</div><div class='del'>-		 */</div><div class='del'>-		start += PAGE_OFFSET - __PAGE_OFFSET_BASE;</div><div class='del'>-	}</div><div class='add'>+		if (phdr-&gt;rev &lt;= uci-&gt;cpu_sig.rev)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	collect_cpu_info_early(&amp;uci);</div><div class='del'>-	ret = load_microcode(mcs, ptrs, start, &amp;uci);</div><div class='del'>-	if (ret != UCODE_OK)</div><div class='del'>-		return;</div><div class='add'>+		if (!find_matching_signature(phdr,</div><div class='add'>+					     uci-&gt;cpu_sig.sig,</div><div class='add'>+					     uci-&gt;cpu_sig.pf))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	apply_microcode_early(&amp;uci, true);</div><div class='add'>+		return iter-&gt;data;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void reload_ucode_intel(void)</div><div class='ctx'> {</div><div class='add'>+	struct microcode_intel *p;</div><div class='ctx'> 	struct ucode_cpu_info uci;</div><div class='del'>-	enum ucode_state ret;</div><div class='del'>-</div><div class='del'>-	if (!mc_saved_data.num_saved)</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='ctx'> 	collect_cpu_info_early(&amp;uci);</div><div class='ctx'> </div><div class='del'>-	ret = find_microcode_patch(mc_saved_data.mc_saved,</div><div class='del'>-				   mc_saved_data.num_saved, &amp;uci);</div><div class='del'>-	if (ret != UCODE_OK)</div><div class='add'>+	p = find_patch(&amp;uci);</div><div class='add'>+	if (!p)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	uci.mc = p;</div><div class='add'>+</div><div class='ctx'> 	apply_microcode_early(&amp;uci, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -879,31 +760,13 @@ static int collect_cpu_info(int cpu_num, struct cpu_signature *csig)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * return 0 - no update found</div><div class='del'>- * return 1 - found update</div><div class='del'>- */</div><div class='del'>-static int get_matching_mc(struct microcode_intel *mc, int cpu)</div><div class='del'>-{</div><div class='del'>-	struct cpu_signature cpu_sig;</div><div class='del'>-	unsigned int csig, cpf, crev;</div><div class='del'>-</div><div class='del'>-	collect_cpu_info(cpu, &amp;cpu_sig);</div><div class='del'>-</div><div class='del'>-	csig = cpu_sig.sig;</div><div class='del'>-	cpf = cpu_sig.pf;</div><div class='del'>-	crev = cpu_sig.rev;</div><div class='del'>-</div><div class='del'>-	return has_newer_microcode(mc, csig, cpf, crev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int apply_microcode_intel(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct microcode_intel *mc;</div><div class='ctx'> 	struct ucode_cpu_info *uci;</div><div class='ctx'> 	struct cpuinfo_x86 *c;</div><div class='del'>-	unsigned int val[2];</div><div class='ctx'> 	static int prev_rev;</div><div class='add'>+	u32 rev;</div><div class='ctx'> </div><div class='ctx'> 	/* We should bind the task to the CPU */</div><div class='ctx'> 	if (WARN_ON(raw_smp_processor_id() != cpu))</div><div class='hunk'>@@ -911,46 +774,37 @@ static int apply_microcode_intel(int cpu)</div><div class='ctx'> </div><div class='ctx'> 	uci = ucode_cpu_info + cpu;</div><div class='ctx'> 	mc = uci-&gt;mc;</div><div class='del'>-	if (!mc)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Microcode on this CPU could be updated earlier. Only apply the</div><div class='del'>-	 * microcode patch in mc when it is newer than the one on this</div><div class='del'>-	 * CPU.</div><div class='del'>-	 */</div><div class='del'>-	if (!get_matching_mc(mc, cpu))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!mc) {</div><div class='add'>+		/* Look for a newer patch in our cache: */</div><div class='add'>+		mc = find_patch(uci);</div><div class='add'>+		if (!mc)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* write microcode via MSR 0x79 */</div><div class='ctx'> 	wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)mc-&gt;bits);</div><div class='del'>-	wrmsrl(MSR_IA32_UCODE_REV, 0);</div><div class='del'>-</div><div class='del'>-	/* As documented in the SDM: Do a CPUID 1 here */</div><div class='del'>-	sync_core();</div><div class='ctx'> </div><div class='del'>-	/* get the current revision from MSR 0x8B */</div><div class='del'>-	rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]);</div><div class='add'>+	rev = intel_get_microcode_revision();</div><div class='ctx'> </div><div class='del'>-	if (val[1] != mc-&gt;hdr.rev) {</div><div class='add'>+	if (rev != mc-&gt;hdr.rev) {</div><div class='ctx'> 		pr_err("CPU%d update to revision 0x%x failed\n",</div><div class='ctx'> 		       cpu, mc-&gt;hdr.rev);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (val[1] != prev_rev) {</div><div class='add'>+	if (rev != prev_rev) {</div><div class='ctx'> 		pr_info("updated to revision 0x%x, date = %04x-%02x-%02x\n",</div><div class='del'>-			val[1],</div><div class='add'>+			rev,</div><div class='ctx'> 			mc-&gt;hdr.date &amp; 0xffff,</div><div class='ctx'> 			mc-&gt;hdr.date &gt;&gt; 24,</div><div class='ctx'> 			(mc-&gt;hdr.date &gt;&gt; 16) &amp; 0xff);</div><div class='del'>-		prev_rev = val[1];</div><div class='add'>+		prev_rev = rev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	c = &amp;cpu_data(cpu);</div><div class='ctx'> </div><div class='del'>-	uci-&gt;cpu_sig.rev = val[1];</div><div class='del'>-	c-&gt;microcode = val[1];</div><div class='add'>+	uci-&gt;cpu_sig.rev = rev;</div><div class='add'>+	c-&gt;microcode = rev;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -962,8 +816,7 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,</div><div class='ctx'> 	u8 *ucode_ptr = data, *new_mc = NULL, *mc = NULL;</div><div class='ctx'> 	int new_rev = uci-&gt;cpu_sig.rev;</div><div class='ctx'> 	unsigned int leftover = size;</div><div class='del'>-	enum ucode_state state = UCODE_OK;</div><div class='del'>-	unsigned int curr_mc_size = 0;</div><div class='add'>+	unsigned int curr_mc_size = 0, new_mc_size = 0;</div><div class='ctx'> 	unsigned int csig, cpf;</div><div class='ctx'> </div><div class='ctx'> 	while (leftover) {</div><div class='hunk'>@@ -1004,6 +857,7 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,</div><div class='ctx'> 			vfree(new_mc);</div><div class='ctx'> 			new_rev = mc_header.rev;</div><div class='ctx'> 			new_mc  = mc;</div><div class='add'>+			new_mc_size = mc_size;</div><div class='ctx'> 			mc = NULL;	/* trigger new vmalloc */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1015,14 +869,11 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,</div><div class='ctx'> </div><div class='ctx'> 	if (leftover) {</div><div class='ctx'> 		vfree(new_mc);</div><div class='del'>-		state = UCODE_ERROR;</div><div class='del'>-		goto out;</div><div class='add'>+		return UCODE_ERROR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!new_mc) {</div><div class='del'>-		state = UCODE_NFOUND;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!new_mc)</div><div class='add'>+		return UCODE_NFOUND;</div><div class='ctx'> </div><div class='ctx'> 	vfree(uci-&gt;mc);</div><div class='ctx'> 	uci-&gt;mc = (struct microcode_intel *)new_mc;</div><div class='hunk'>@@ -1032,12 +883,12 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,</div><div class='ctx'> 	 * permanent memory. So it will be loaded early when a CPU is hot added</div><div class='ctx'> 	 * or resumes.</div><div class='ctx'> 	 */</div><div class='del'>-	save_mc_for_early(new_mc);</div><div class='add'>+	save_mc_for_early(new_mc, new_mc_size);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n",</div><div class='ctx'> 		 cpu, new_rev, uci-&gt;cpu_sig.rev);</div><div class='del'>-out:</div><div class='del'>-	return state;</div><div class='add'>+</div><div class='add'>+	return UCODE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_ucode_fw(void *to, const void *from, size_t n)</div><div class='hunk'>@@ -1081,20 +932,11 @@ request_microcode_user(int cpu, const void __user *buf, size_t size)</div><div class='ctx'> 	return generic_load_microcode(cpu, (void *)buf, size, &amp;get_ucode_user);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void microcode_fini_cpu(int cpu)</div><div class='del'>-{</div><div class='del'>-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;</div><div class='del'>-</div><div class='del'>-	vfree(uci-&gt;mc);</div><div class='del'>-	uci-&gt;mc = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct microcode_ops microcode_intel_ops = {</div><div class='ctx'> 	.request_microcode_user		  = request_microcode_user,</div><div class='ctx'> 	.request_microcode_fw             = request_microcode_fw,</div><div class='ctx'> 	.collect_cpu_info                 = collect_cpu_info,</div><div class='ctx'> 	.apply_microcode                  = apply_microcode_intel,</div><div class='del'>-	.microcode_fini_cpu               = microcode_fini_cpu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct microcode_ops * __init init_intel_microcode(void)</div><div class='hunk'>@@ -1109,4 +951,3 @@ struct microcode_ops * __init init_intel_microcode(void)</div><div class='ctx'> </div><div class='ctx'> 	return &amp;microcode_intel_ops;</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/arch/x86/kernel/cpu/microcode/intel_lib.c b/arch/x86/kernel/cpu/microcode/intel_lib.c<br/>deleted file mode 100644<br/>index 406cb6c0d9dd..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/microcode/intel_lib.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/microcode/intel_lib.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,184 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	Intel CPU Microcode Update Driver for Linux</div><div class='del'>- *</div><div class='del'>- *	Copyright (C) 2012 Fenghua Yu &lt;fenghua.yu@intel.com&gt;</div><div class='del'>- *			   H Peter Anvin" &lt;hpa@zytor.com&gt;</div><div class='del'>- *</div><div class='del'>- *	This driver allows to upgrade microcode on Intel processors</div><div class='del'>- *	belonging to IA-32 family - PentiumPro, Pentium II,</div><div class='del'>- *	Pentium III, Xeon, Pentium 4, etc.</div><div class='del'>- *</div><div class='del'>- *	Reference: Section 8.11 of Volume 3a, IA-32 Intel? Architecture</div><div class='del'>- *	Software Developer's Manual</div><div class='del'>- *	Order Number 253668 or free download from:</div><div class='del'>- *</div><div class='del'>- *	http://developer.intel.com/Assets/PDF/manual/253668.pdf</div><div class='del'>- *</div><div class='del'>- *	For more information, go to http://www.urbanmyth.org/microcode</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or</div><div class='del'>- *	modify it under the terms of the GNU General Public License</div><div class='del'>- *	as published by the Free Software Foundation; either version</div><div class='del'>- *	2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/microcode_intel.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/msr.h&gt;</div><div class='del'>-</div><div class='del'>-static inline bool cpu_signatures_match(unsigned int s1, unsigned int p1,</div><div class='del'>-					unsigned int s2, unsigned int p2)</div><div class='del'>-{</div><div class='del'>-	if (s1 != s2)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* Processor flags are either both 0 ... */</div><div class='del'>-	if (!p1 &amp;&amp; !p2)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* ... or they intersect. */</div><div class='del'>-	return p1 &amp; p2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int microcode_sanity_check(void *mc, int print_err)</div><div class='del'>-{</div><div class='del'>-	unsigned long total_size, data_size, ext_table_size;</div><div class='del'>-	struct microcode_header_intel *mc_header = mc;</div><div class='del'>-	struct extended_sigtable *ext_header = NULL;</div><div class='del'>-	u32 sum, orig_sum, ext_sigcount = 0, i;</div><div class='del'>-	struct extended_signature *ext_sig;</div><div class='del'>-</div><div class='del'>-	total_size = get_totalsize(mc_header);</div><div class='del'>-	data_size = get_datasize(mc_header);</div><div class='del'>-</div><div class='del'>-	if (data_size + MC_HEADER_SIZE &gt; total_size) {</div><div class='del'>-		if (print_err)</div><div class='del'>-			pr_err("Error: bad microcode data file size.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mc_header-&gt;ldrver != 1 || mc_header-&gt;hdrver != 1) {</div><div class='del'>-		if (print_err)</div><div class='del'>-			pr_err("Error: invalid/unknown microcode update format.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ext_table_size = total_size - (MC_HEADER_SIZE + data_size);</div><div class='del'>-	if (ext_table_size) {</div><div class='del'>-		u32 ext_table_sum = 0;</div><div class='del'>-		u32 *ext_tablep;</div><div class='del'>-</div><div class='del'>-		if ((ext_table_size &lt; EXT_HEADER_SIZE)</div><div class='del'>-		 || ((ext_table_size - EXT_HEADER_SIZE) % EXT_SIGNATURE_SIZE)) {</div><div class='del'>-			if (print_err)</div><div class='del'>-				pr_err("Error: truncated extended signature table.\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ext_header = mc + MC_HEADER_SIZE + data_size;</div><div class='del'>-		if (ext_table_size != exttable_size(ext_header)) {</div><div class='del'>-			if (print_err)</div><div class='del'>-				pr_err("Error: extended signature table size mismatch.\n");</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ext_sigcount = ext_header-&gt;count;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Check extended table checksum: the sum of all dwords that</div><div class='del'>-		 * comprise a valid table must be 0.</div><div class='del'>-		 */</div><div class='del'>-		ext_tablep = (u32 *)ext_header;</div><div class='del'>-</div><div class='del'>-		i = ext_table_size / sizeof(u32);</div><div class='del'>-		while (i--)</div><div class='del'>-			ext_table_sum += ext_tablep[i];</div><div class='del'>-</div><div class='del'>-		if (ext_table_sum) {</div><div class='del'>-			if (print_err)</div><div class='del'>-				pr_warn("Bad extended signature table checksum, aborting.\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Calculate the checksum of update data and header. The checksum of</div><div class='del'>-	 * valid update data and header including the extended signature table</div><div class='del'>-	 * must be 0.</div><div class='del'>-	 */</div><div class='del'>-	orig_sum = 0;</div><div class='del'>-	i = (MC_HEADER_SIZE + data_size) / sizeof(u32);</div><div class='del'>-	while (i--)</div><div class='del'>-		orig_sum += ((u32 *)mc)[i];</div><div class='del'>-</div><div class='del'>-	if (orig_sum) {</div><div class='del'>-		if (print_err)</div><div class='del'>-			pr_err("Bad microcode data checksum, aborting.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ext_table_size)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check extended signature checksum: 0 =&gt; valid.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; ext_sigcount; i++) {</div><div class='del'>-		ext_sig = (void *)ext_header + EXT_HEADER_SIZE +</div><div class='del'>-			  EXT_SIGNATURE_SIZE * i;</div><div class='del'>-</div><div class='del'>-		sum = (mc_header-&gt;sig + mc_header-&gt;pf + mc_header-&gt;cksum) -</div><div class='del'>-		      (ext_sig-&gt;sig + ext_sig-&gt;pf + ext_sig-&gt;cksum);</div><div class='del'>-		if (sum) {</div><div class='del'>-			if (print_err)</div><div class='del'>-				pr_err("Bad extended signature checksum, aborting.\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns 1 if update has been found, 0 otherwise.</div><div class='del'>- */</div><div class='del'>-int find_matching_signature(void *mc, unsigned int csig, int cpf)</div><div class='del'>-{</div><div class='del'>-	struct microcode_header_intel *mc_hdr = mc;</div><div class='del'>-	struct extended_sigtable *ext_hdr;</div><div class='del'>-	struct extended_signature *ext_sig;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (cpu_signatures_match(csig, cpf, mc_hdr-&gt;sig, mc_hdr-&gt;pf))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* Look for ext. headers: */</div><div class='del'>-	if (get_totalsize(mc_hdr) &lt;= get_datasize(mc_hdr) + MC_HEADER_SIZE)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ext_hdr = mc + get_datasize(mc_hdr) + MC_HEADER_SIZE;</div><div class='del'>-	ext_sig = (void *)ext_hdr + EXT_HEADER_SIZE;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ext_hdr-&gt;count; i++) {</div><div class='del'>-		if (cpu_signatures_match(csig, cpf, ext_sig-&gt;sig, ext_sig-&gt;pf))</div><div class='del'>-			return 1;</div><div class='del'>-		ext_sig++;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns 1 if update has been found, 0 otherwise.</div><div class='del'>- */</div><div class='del'>-int has_newer_microcode(void *mc, unsigned int csig, int cpf, int new_rev)</div><div class='del'>-{</div><div class='del'>-	struct microcode_header_intel *mc_hdr = mc;</div><div class='del'>-</div><div class='del'>-	if (mc_hdr-&gt;rev &lt;= new_rev)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return find_matching_signature(mc, csig, cpf);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c<br/>index 8f44c5a50ab8..b5375b9497b3 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mshyperv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/mshyperv.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/mshyperv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/mshyperv.c</a></div><div class='hunk'>@@ -25,12 +25,12 @@</div><div class='ctx'> #include &lt;asm/hyperv.h&gt;</div><div class='ctx'> #include &lt;asm/mshyperv.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='ctx'> #include &lt;asm/i8259.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct ms_hyperv_info ms_hyperv;</div><div class='ctx'> EXPORT_SYMBOL_GPL(ms_hyperv);</div><div class='hunk'>@@ -133,33 +133,38 @@ static uint32_t  __init ms_hyperv_platform(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t read_hv_clock(struct clocksource *arg)</div><div class='add'>+static unsigned char hv_get_nmi_reason(void)</div><div class='ctx'> {</div><div class='del'>-	cycle_t current_tick;</div><div class='del'>-	/*</div><div class='del'>-	 * Read the partition counter to get the current tick count. This count</div><div class='del'>-	 * is set to 0 when the partition is created and is incremented in</div><div class='del'>-	 * 100 nanosecond units.</div><div class='del'>-	 */</div><div class='del'>-	rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);</div><div class='del'>-	return current_tick;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct clocksource hyperv_cs = {</div><div class='del'>-	.name		= "hyperv_clocksource",</div><div class='del'>-	.rating		= 400, /* use this when running on Hyperv*/</div><div class='del'>-	.read		= read_hv_clock,</div><div class='del'>-	.mask		= CLOCKSOURCE_MASK(64),</div><div class='del'>-	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char hv_get_nmi_reason(void)</div><div class='add'>+#ifdef CONFIG_X86_LOCAL_APIC</div><div class='add'>+/*</div><div class='add'>+ * Prior to WS2016 Debug-VM sends NMIs to all CPUs which makes</div><div class='add'>+ * it dificult to process CHANNELMSG_UNLOAD in case of crash. Handle</div><div class='add'>+ * unknown NMI on the first CPU which gets it.</div><div class='add'>+ */</div><div class='add'>+static int hv_nmi_unknown(unsigned int val, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	static atomic_t nmi_cpu = ATOMIC_INIT(-1);</div><div class='add'>+</div><div class='add'>+	if (!unknown_nmi_panic)</div><div class='add'>+		return NMI_DONE;</div><div class='add'>+</div><div class='add'>+	if (atomic_cmpxchg(&amp;nmi_cpu, -1, raw_smp_processor_id()) != -1)</div><div class='add'>+		return NMI_HANDLED;</div><div class='add'>+</div><div class='add'>+	return NMI_DONE;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void __init ms_hyperv_init_platform(void)</div><div class='ctx'> {</div><div class='add'>+	int hv_host_info_eax;</div><div class='add'>+	int hv_host_info_ebx;</div><div class='add'>+	int hv_host_info_ecx;</div><div class='add'>+	int hv_host_info_edx;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Extract the features and hints</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -170,6 +175,21 @@ static void __init ms_hyperv_init_platform(void)</div><div class='ctx'> 	pr_info("HyperV: features 0x%x, hints 0x%x\n",</div><div class='ctx'> 		ms_hyperv.features, ms_hyperv.hints);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Extract host information.</div><div class='add'>+	 */</div><div class='add'>+	if (cpuid_eax(HVCPUID_VENDOR_MAXFUNCTION) &gt;= HVCPUID_VERSION) {</div><div class='add'>+		hv_host_info_eax = cpuid_eax(HVCPUID_VERSION);</div><div class='add'>+		hv_host_info_ebx = cpuid_ebx(HVCPUID_VERSION);</div><div class='add'>+		hv_host_info_ecx = cpuid_ecx(HVCPUID_VERSION);</div><div class='add'>+		hv_host_info_edx = cpuid_edx(HVCPUID_VERSION);</div><div class='add'>+</div><div class='add'>+		pr_info("Hyper-V Host Build:%d-%d.%d-%d-%d.%d\n",</div><div class='add'>+			hv_host_info_eax, hv_host_info_ebx &gt;&gt; 16,</div><div class='add'>+			hv_host_info_ebx &amp; 0xFFFF, hv_host_info_ecx,</div><div class='add'>+			hv_host_info_edx &gt;&gt; 24, hv_host_info_edx &amp; 0xFFFFFF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='ctx'> 	if (ms_hyperv.features &amp; HV_X64_MSR_APIC_FREQUENCY_AVAILABLE) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -183,10 +203,10 @@ static void __init ms_hyperv_init_platform(void)</div><div class='ctx'> 		pr_info("HyperV: LAPIC Timer Frequency: %#x\n",</div><div class='ctx'> 			lapic_timer_frequency);</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	if (ms_hyperv.features &amp; HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)</div><div class='del'>-		clocksource_register_hz(&amp;hyperv_cs, NSEC_PER_SEC/100);</div><div class='add'>+	register_nmi_handler(NMI_UNKNOWN, hv_nmi_unknown, NMI_FLAG_FIRST,</div><div class='add'>+			     "hv_nmi_unknown");</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_IO_APIC</div><div class='ctx'> 	no_timer_check = 1;</div><div class='hunk'>@@ -204,6 +224,13 @@ static void __init ms_hyperv_init_platform(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (efi_enabled(EFI_BOOT))</div><div class='ctx'> 		x86_platform.get_nmi_reason = hv_get_nmi_reason;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_HYPERV)</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the hook to get control post apic initialization.</div><div class='add'>+	 */</div><div class='add'>+	x86_platform.apic_post_init = hyperv_init;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {</div><div class='head'>diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c<br/>index 1db8dc490b66..d9794060fe22 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/scattered.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/scattered.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/scattered.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/scattered.c</a></div><div class='hunk'>@@ -17,11 +17,20 @@ struct cpuid_bit {</div><div class='ctx'> 	u32 sub_leaf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum cpuid_regs {</div><div class='del'>-	CR_EAX = 0,</div><div class='del'>-	CR_ECX,</div><div class='del'>-	CR_EDX,</div><div class='del'>-	CR_EBX</div><div class='add'>+/* Please keep the leaf sorted by cpuid_bit.level for faster search. */</div><div class='add'>+static const struct cpuid_bit cpuid_bits[] = {</div><div class='add'>+	{ X86_FEATURE_APERFMPERF,       CPUID_ECX,  0, 0x00000006, 0 },</div><div class='add'>+	{ X86_FEATURE_EPB,		CPUID_ECX,  3, 0x00000006, 0 },</div><div class='add'>+	{ X86_FEATURE_INTEL_PT,		CPUID_EBX, 25, 0x00000007, 0 },</div><div class='add'>+	{ X86_FEATURE_AVX512_4VNNIW,    CPUID_EDX,  2, 0x00000007, 0 },</div><div class='add'>+	{ X86_FEATURE_AVX512_4FMAPS,    CPUID_EDX,  3, 0x00000007, 0 },</div><div class='add'>+	{ X86_FEATURE_CAT_L3,		CPUID_EBX,  1, 0x00000010, 0 },</div><div class='add'>+	{ X86_FEATURE_CAT_L2,		CPUID_EBX,  2, 0x00000010, 0 },</div><div class='add'>+	{ X86_FEATURE_CDP_L3,		CPUID_ECX,  2, 0x00000010, 1 },</div><div class='add'>+	{ X86_FEATURE_HW_PSTATE,	CPUID_EDX,  7, 0x80000007, 0 },</div><div class='add'>+	{ X86_FEATURE_CPB,		CPUID_EDX,  9, 0x80000007, 0 },</div><div class='add'>+	{ X86_FEATURE_PROC_FEEDBACK,    CPUID_EDX, 11, 0x80000007, 0 },</div><div class='add'>+	{ 0, 0, 0, 0, 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void init_scattered_cpuid_features(struct cpuinfo_x86 *c)</div><div class='hunk'>@@ -30,18 +39,6 @@ void init_scattered_cpuid_features(struct cpuinfo_x86 *c)</div><div class='ctx'> 	u32 regs[4];</div><div class='ctx'> 	const struct cpuid_bit *cb;</div><div class='ctx'> </div><div class='del'>-	static const struct cpuid_bit cpuid_bits[] = {</div><div class='del'>-		{ X86_FEATURE_INTEL_PT,		CR_EBX,25, 0x00000007, 0 },</div><div class='del'>-		{ X86_FEATURE_AVX512_4VNNIW,	CR_EDX, 2, 0x00000007, 0 },</div><div class='del'>-		{ X86_FEATURE_AVX512_4FMAPS,	CR_EDX, 3, 0x00000007, 0 },</div><div class='del'>-		{ X86_FEATURE_APERFMPERF,	CR_ECX, 0, 0x00000006, 0 },</div><div class='del'>-		{ X86_FEATURE_EPB,		CR_ECX, 3, 0x00000006, 0 },</div><div class='del'>-		{ X86_FEATURE_HW_PSTATE,	CR_EDX, 7, 0x80000007, 0 },</div><div class='del'>-		{ X86_FEATURE_CPB,		CR_EDX, 9, 0x80000007, 0 },</div><div class='del'>-		{ X86_FEATURE_PROC_FEEDBACK,	CR_EDX,11, 0x80000007, 0 },</div><div class='del'>-		{ 0, 0, 0, 0, 0 }</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	for (cb = cpuid_bits; cb-&gt;feature; cb++) {</div><div class='ctx'> </div><div class='ctx'> 		/* Verify that the level is valid */</div><div class='hunk'>@@ -50,10 +47,35 @@ void init_scattered_cpuid_features(struct cpuinfo_x86 *c)</div><div class='ctx'> 		    max_level &gt; (cb-&gt;level | 0xffff))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		cpuid_count(cb-&gt;level, cb-&gt;sub_leaf, &amp;regs[CR_EAX],</div><div class='del'>-			    &amp;regs[CR_EBX], &amp;regs[CR_ECX], &amp;regs[CR_EDX]);</div><div class='add'>+		cpuid_count(cb-&gt;level, cb-&gt;sub_leaf, &amp;regs[CPUID_EAX],</div><div class='add'>+			    &amp;regs[CPUID_EBX], &amp;regs[CPUID_ECX],</div><div class='add'>+			    &amp;regs[CPUID_EDX]);</div><div class='ctx'> </div><div class='ctx'> 		if (regs[cb-&gt;reg] &amp; (1 &lt;&lt; cb-&gt;bit))</div><div class='ctx'> 			set_cpu_cap(c, cb-&gt;feature);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+u32 get_scattered_cpuid_leaf(unsigned int level, unsigned int sub_leaf,</div><div class='add'>+			     enum cpuid_regs_idx reg)</div><div class='add'>+{</div><div class='add'>+	const struct cpuid_bit *cb;</div><div class='add'>+	u32 cpuid_val = 0;</div><div class='add'>+</div><div class='add'>+	for (cb = cpuid_bits; cb-&gt;feature; cb++) {</div><div class='add'>+</div><div class='add'>+		if (level &gt; cb-&gt;level)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (level &lt; cb-&gt;level)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (reg == cb-&gt;reg &amp;&amp; sub_leaf == cb-&gt;sub_leaf) {</div><div class='add'>+			if (cpu_has(&amp;boot_cpu_data, cb-&gt;feature))</div><div class='add'>+				cpuid_val |= BIT(cb-&gt;bit);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cpuid_val;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(get_scattered_cpuid_leaf);</div><div class='head'>diff --git a/arch/x86/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c<br/>index 34178564be2a..8457b4978668 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/transmeta.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/transmeta.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/transmeta.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/transmeta.c</a></div><div class='hunk'>@@ -1,4 +1,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='hunk'>@@ -14,6 +16,8 @@ static void early_init_transmeta(struct cpuinfo_x86 *c)</div><div class='ctx'> 		if (xlvl &gt;= 0x80860001)</div><div class='ctx'> 			c-&gt;x86_capability[CPUID_8086_0001_EDX] = cpuid_edx(0x80860001);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	clear_sched_clock_stable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_transmeta(struct cpuinfo_x86 *c)</div><div class='head'>diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c<br/>index 5130985b758b..891f4dad7b2c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpu/vmware.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpu/vmware.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpu/vmware.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpu/vmware.c</a></div><div class='hunk'>@@ -24,11 +24,16 @@</div><div class='ctx'> #include &lt;linux/dmi.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;asm/x86_init.h&gt;</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='add'>+#include &lt;asm/timer.h&gt;</div><div class='add'>+</div><div class='add'>+#undef pr_fmt</div><div class='add'>+#define pr_fmt(fmt)	"vmware: " fmt</div><div class='ctx'> </div><div class='ctx'> #define CPUID_VMWARE_INFO_LEAF	0x40000000</div><div class='ctx'> #define VMWARE_HYPERVISOR_MAGIC	0x564D5868</div><div class='hunk'>@@ -48,6 +53,8 @@</div><div class='ctx'> 			"2"(VMWARE_HYPERVISOR_PORT), "3"(UINT_MAX) :	\</div><div class='ctx'> 			"memory");</div><div class='ctx'> </div><div class='add'>+static unsigned long vmware_tsc_khz __ro_after_init;</div><div class='add'>+</div><div class='ctx'> static inline int __vmware_platform(void)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t eax, ebx, ecx, edx;</div><div class='hunk'>@@ -57,35 +64,80 @@ static inline int __vmware_platform(void)</div><div class='ctx'> </div><div class='ctx'> static unsigned long vmware_get_tsc_khz(void)</div><div class='ctx'> {</div><div class='del'>-	uint64_t tsc_hz, lpj;</div><div class='del'>-	uint32_t eax, ebx, ecx, edx;</div><div class='add'>+	return vmware_tsc_khz;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	VMWARE_PORT(GETHZ, eax, ebx, ecx, edx);</div><div class='add'>+#ifdef CONFIG_PARAVIRT</div><div class='add'>+static struct cyc2ns_data vmware_cyc2ns __ro_after_init;</div><div class='add'>+static int vmw_sched_clock __initdata = 1;</div><div class='ctx'> </div><div class='del'>-	tsc_hz = eax | (((uint64_t)ebx) &lt;&lt; 32);</div><div class='del'>-	do_div(tsc_hz, 1000);</div><div class='del'>-	BUG_ON(tsc_hz &gt;&gt; 32);</div><div class='del'>-	pr_info("TSC freq read from hypervisor : %lu.%03lu MHz\n",</div><div class='del'>-			 (unsigned long) tsc_hz / 1000,</div><div class='del'>-			 (unsigned long) tsc_hz % 1000);</div><div class='del'>-</div><div class='del'>-	if (!preset_lpj) {</div><div class='del'>-		lpj = ((u64)tsc_hz * 1000);</div><div class='del'>-		do_div(lpj, HZ);</div><div class='del'>-		preset_lpj = lpj;</div><div class='del'>-	}</div><div class='add'>+static __init int setup_vmw_sched_clock(char *s)</div><div class='add'>+{</div><div class='add'>+	vmw_sched_clock = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("no-vmw-sched-clock", setup_vmw_sched_clock);</div><div class='add'>+</div><div class='add'>+static unsigned long long vmware_sched_clock(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long long ns;</div><div class='ctx'> </div><div class='del'>-	return tsc_hz;</div><div class='add'>+	ns = mul_u64_u32_shr(rdtsc(), vmware_cyc2ns.cyc2ns_mul,</div><div class='add'>+			     vmware_cyc2ns.cyc2ns_shift);</div><div class='add'>+	ns -= vmware_cyc2ns.cyc2ns_offset;</div><div class='add'>+	return ns;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init vmware_sched_clock_setup(void)</div><div class='add'>+{</div><div class='add'>+	struct cyc2ns_data *d = &amp;vmware_cyc2ns;</div><div class='add'>+	unsigned long long tsc_now = rdtsc();</div><div class='add'>+</div><div class='add'>+	clocks_calc_mult_shift(&amp;d-&gt;cyc2ns_mul, &amp;d-&gt;cyc2ns_shift,</div><div class='add'>+			       vmware_tsc_khz, NSEC_PER_MSEC, 0);</div><div class='add'>+	d-&gt;cyc2ns_offset = mul_u64_u32_shr(tsc_now, d-&gt;cyc2ns_mul,</div><div class='add'>+					   d-&gt;cyc2ns_shift);</div><div class='add'>+</div><div class='add'>+	pv_time_ops.sched_clock = vmware_sched_clock;</div><div class='add'>+	pr_info("using sched offset of %llu ns\n", d-&gt;cyc2ns_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init vmware_paravirt_ops_setup(void)</div><div class='add'>+{</div><div class='add'>+	pv_info.name = "VMware hypervisor";</div><div class='add'>+	pv_cpu_ops.io_delay = paravirt_nop;</div><div class='add'>+</div><div class='add'>+	if (vmware_tsc_khz &amp;&amp; vmw_sched_clock)</div><div class='add'>+		vmware_sched_clock_setup();</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define vmware_paravirt_ops_setup() do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void __init vmware_platform_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t eax, ebx, ecx, edx;</div><div class='add'>+	uint64_t lpj, tsc_khz;</div><div class='ctx'> </div><div class='ctx'> 	VMWARE_PORT(GETHZ, eax, ebx, ecx, edx);</div><div class='ctx'> </div><div class='ctx'> 	if (ebx != UINT_MAX) {</div><div class='add'>+		lpj = tsc_khz = eax | (((uint64_t)ebx) &lt;&lt; 32);</div><div class='add'>+		do_div(tsc_khz, 1000);</div><div class='add'>+		WARN_ON(tsc_khz &gt;&gt; 32);</div><div class='add'>+		pr_info("TSC freq read from hypervisor : %lu.%03lu MHz\n",</div><div class='add'>+			(unsigned long) tsc_khz / 1000,</div><div class='add'>+			(unsigned long) tsc_khz % 1000);</div><div class='add'>+</div><div class='add'>+		if (!preset_lpj) {</div><div class='add'>+			do_div(lpj, HZ);</div><div class='add'>+			preset_lpj = lpj;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		vmware_tsc_khz = tsc_khz;</div><div class='ctx'> 		x86_platform.calibrate_tsc = vmware_get_tsc_khz;</div><div class='add'>+		x86_platform.calibrate_cpu = vmware_get_tsc_khz;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='ctx'> 		/* Skip lapic calibration since we know the bus frequency. */</div><div class='ctx'> 		lapic_timer_frequency = ecx / HZ;</div><div class='hunk'>@@ -96,6 +148,8 @@ static void __init vmware_platform_setup(void)</div><div class='ctx'> 		pr_warn("Failed to get TSC freq from the hypervisor\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	vmware_paravirt_ops_setup();</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_IO_APIC</div><div class='ctx'> 	no_timer_check = 1;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c<br/>index 2836de390f95..0931a105ffe1 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/cpuid.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/cpuid.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/cpuid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/cpuid.c</a></div><div class='hunk'>@@ -45,10 +45,7 @@</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct class *cpuid_class;</div><div class='del'>-</div><div class='del'>-struct cpuid_regs {</div><div class='del'>-	u32 eax, ebx, ecx, edx;</div><div class='del'>-};</div><div class='add'>+static enum cpuhp_state cpuhp_cpuid_state;</div><div class='ctx'> </div><div class='ctx'> static void cpuid_smp_cpuid(void *cmd_block)</div><div class='ctx'> {</div><div class='hunk'>@@ -115,7 +112,7 @@ static const struct file_operations cpuid_fops = {</div><div class='ctx'> 	.open = cpuid_open,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int cpuid_device_create(int cpu)</div><div class='add'>+static int cpuid_device_create(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> </div><div class='hunk'>@@ -124,35 +121,12 @@ static int cpuid_device_create(int cpu)</div><div class='ctx'> 	return PTR_ERR_OR_ZERO(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cpuid_device_destroy(int cpu)</div><div class='add'>+static int cpuid_device_destroy(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cpuid_class_cpu_callback(struct notifier_block *nfb,</div><div class='del'>-				    unsigned long action, void *hcpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_UP_PREPARE:</div><div class='del'>-		err = cpuid_device_create(cpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_UP_CANCELED:</div><div class='del'>-	case CPU_UP_CANCELED_FROZEN:</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-		cpuid_device_destroy(cpu);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return notifier_from_errno(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block cpuid_class_cpu_notifier =</div><div class='del'>-{</div><div class='del'>-	.notifier_call = cpuid_class_cpu_callback,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static char *cpuid_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "cpu/%u/cpuid", MINOR(dev-&gt;devt));</div><div class='hunk'>@@ -160,15 +134,13 @@ static char *cpuid_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> </div><div class='ctx'> static int __init cpuid_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i, err = 0;</div><div class='del'>-	i = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (__register_chrdev(CPUID_MAJOR, 0, NR_CPUS,</div><div class='ctx'> 			      "cpu/cpuid", &amp;cpuid_fops)) {</div><div class='ctx'> 		printk(KERN_ERR "cpuid: unable to get major %d for cpuid\n",</div><div class='ctx'> 		       CPUID_MAJOR);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	cpuid_class = class_create(THIS_MODULE, "cpuid");</div><div class='ctx'> 	if (IS_ERR(cpuid_class)) {</div><div class='hunk'>@@ -177,45 +149,28 @@ static int __init cpuid_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	cpuid_class-&gt;devnode = cpuid_devnode;</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-	for_each_online_cpu(i) {</div><div class='del'>-		err = cpuid_device_create(i);</div><div class='del'>-		if (err != 0)</div><div class='del'>-			goto out_class;</div><div class='del'>-	}</div><div class='del'>-	__register_hotcpu_notifier(&amp;cpuid_class_cpu_notifier);</div><div class='del'>-	cpu_notifier_register_done();</div><div class='add'>+	err = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/cpuid:online",</div><div class='add'>+				cpuid_device_create, cpuid_device_destroy);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_class;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='del'>-	goto out;</div><div class='add'>+	cpuhp_cpuid_state = err;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> out_class:</div><div class='del'>-	i = 0;</div><div class='del'>-	for_each_online_cpu(i) {</div><div class='del'>-		cpuid_device_destroy(i);</div><div class='del'>-	}</div><div class='del'>-	cpu_notifier_register_done();</div><div class='ctx'> 	class_destroy(cpuid_class);</div><div class='ctx'> out_chrdev:</div><div class='ctx'> 	__unregister_chrdev(CPUID_MAJOR, 0, NR_CPUS, "cpu/cpuid");</div><div class='del'>-out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+module_init(cpuid_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit cpuid_exit(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu = 0;</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-	for_each_online_cpu(cpu)</div><div class='del'>-		cpuid_device_destroy(cpu);</div><div class='add'>+	cpuhp_remove_state(cpuhp_cpuid_state);</div><div class='ctx'> 	class_destroy(cpuid_class);</div><div class='ctx'> 	__unregister_chrdev(CPUID_MAJOR, 0, NR_CPUS, "cpu/cpuid");</div><div class='del'>-	__unregister_hotcpu_notifier(&amp;cpuid_class_cpu_notifier);</div><div class='del'>-	cpu_notifier_register_done();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-module_init(cpuid_init);</div><div class='ctx'> module_exit(cpuid_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("H. Peter Anvin &lt;hpa@zytor.com&gt;");</div><div class='head'>diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c<br/>index 650830e39e3a..3741461c63a0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/crash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/crash.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/crash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/crash.c</a></div><div class='hunk'>@@ -631,9 +631,9 @@ static int determine_backup_region(u64 start, u64 end, void *arg)</div><div class='ctx'> </div><div class='ctx'> int crash_load_segments(struct kimage *image)</div><div class='ctx'> {</div><div class='del'>-	unsigned long src_start, src_sz, elf_sz;</div><div class='del'>-	void *elf_addr;</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct kexec_buf kbuf = { .image = image, .buf_min = 0,</div><div class='add'>+				  .buf_max = ULONG_MAX, .top_down = false };</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Determine and load a segment for backup area. First 640K RAM</div><div class='hunk'>@@ -647,43 +647,44 @@ int crash_load_segments(struct kimage *image)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	src_start = image-&gt;arch.backup_src_start;</div><div class='del'>-	src_sz = image-&gt;arch.backup_src_sz;</div><div class='del'>-</div><div class='ctx'> 	/* Add backup segment. */</div><div class='del'>-	if (src_sz) {</div><div class='add'>+	if (image-&gt;arch.backup_src_sz) {</div><div class='add'>+		kbuf.buffer = &amp;crash_zero_bytes;</div><div class='add'>+		kbuf.bufsz = sizeof(crash_zero_bytes);</div><div class='add'>+		kbuf.memsz = image-&gt;arch.backup_src_sz;</div><div class='add'>+		kbuf.buf_align = PAGE_SIZE;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Ideally there is no source for backup segment. This is</div><div class='ctx'> 		 * copied in purgatory after crash. Just add a zero filled</div><div class='ctx'> 		 * segment for now to make sure checksum logic works fine.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = kexec_add_buffer(image, (char *)&amp;crash_zero_bytes,</div><div class='del'>-				       sizeof(crash_zero_bytes), src_sz,</div><div class='del'>-				       PAGE_SIZE, 0, -1, 0,</div><div class='del'>-				       &amp;image-&gt;arch.backup_load_addr);</div><div class='add'>+		ret = kexec_add_buffer(&amp;kbuf);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='add'>+		image-&gt;arch.backup_load_addr = kbuf.mem;</div><div class='ctx'> 		pr_debug("Loaded backup region at 0x%lx backup_start=0x%lx memsz=0x%lx\n",</div><div class='del'>-			 image-&gt;arch.backup_load_addr, src_start, src_sz);</div><div class='add'>+			 image-&gt;arch.backup_load_addr,</div><div class='add'>+			 image-&gt;arch.backup_src_start, kbuf.memsz);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Prepare elf headers and add a segment */</div><div class='del'>-	ret = prepare_elf_headers(image, &amp;elf_addr, &amp;elf_sz);</div><div class='add'>+	ret = prepare_elf_headers(image, &amp;kbuf.buffer, &amp;kbuf.bufsz);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	image-&gt;arch.elf_headers = elf_addr;</div><div class='del'>-	image-&gt;arch.elf_headers_sz = elf_sz;</div><div class='add'>+	image-&gt;arch.elf_headers = kbuf.buffer;</div><div class='add'>+	image-&gt;arch.elf_headers_sz = kbuf.bufsz;</div><div class='ctx'> </div><div class='del'>-	ret = kexec_add_buffer(image, (char *)elf_addr, elf_sz, elf_sz,</div><div class='del'>-			ELF_CORE_HEADER_ALIGN, 0, -1, 0,</div><div class='del'>-			&amp;image-&gt;arch.elf_load_addr);</div><div class='add'>+	kbuf.memsz = kbuf.bufsz;</div><div class='add'>+	kbuf.buf_align = ELF_CORE_HEADER_ALIGN;</div><div class='add'>+	ret = kexec_add_buffer(&amp;kbuf);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		vfree((void *)image-&gt;arch.elf_headers);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='add'>+	image-&gt;arch.elf_load_addr = kbuf.mem;</div><div class='ctx'> 	pr_debug("Loaded ELF headers at 0x%lx bufsz=0x%lx memsz=0x%lx\n",</div><div class='del'>-		 image-&gt;arch.elf_load_addr, elf_sz, elf_sz);</div><div class='add'>+		 image-&gt;arch.elf_load_addr, kbuf.bufsz, kbuf.bufsz);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/crash_dump_32.c b/arch/x86/kernel/crash_dump_32.c<br/>index 11891ca7b716..538fedea9b3f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/crash_dump_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/crash_dump_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/crash_dump_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/crash_dump_32.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void *kdump_buf_page;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c<br/>index f6dfd9334b67..f9c324e08d85 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/doublefault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/doublefault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/doublefault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/doublefault.c</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/init_task.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c<br/>index 85f854b98a9d..09d4ac0d2661 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/dumpstack.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/dumpstack.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/dumpstack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/dumpstack.c</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='hunk'>@@ -22,7 +24,6 @@</div><div class='ctx'> int panic_on_unrecovered_nmi;</div><div class='ctx'> int panic_on_io_nmi;</div><div class='ctx'> unsigned int code_bytes = 64;</div><div class='del'>-int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE;</div><div class='ctx'> static int die_counter;</div><div class='ctx'> </div><div class='ctx'> bool in_task_stack(unsigned long *stack, struct task_struct *task,</div><div class='hunk'>@@ -46,14 +47,7 @@ static void printk_stack_address(unsigned long address, int reliable,</div><div class='ctx'> 				 char *log_lvl)</div><div class='ctx'> {</div><div class='ctx'> 	touch_nmi_watchdog();</div><div class='del'>-	printk("%s [&lt;%p&gt;] %s%pB\n",</div><div class='del'>-		log_lvl, (void *)address, reliable ? "" : "? ",</div><div class='del'>-		(void *)address);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void printk_address(unsigned long address)</div><div class='del'>-{</div><div class='del'>-	pr_cont(" [&lt;%p&gt;] %pS\n", (void *)address, (void *)address);</div><div class='add'>+	printk("%s %s%pB\n", log_lvl, reliable ? "" : "? ", (void *)address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='hunk'>@@ -67,6 +61,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'> 	printk("%sCall Trace:\n", log_lvl);</div><div class='ctx'> </div><div class='ctx'> 	unwind_start(&amp;state, task, regs, stack);</div><div class='add'>+	stack = stack ? : get_stack_pointer(task, regs);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Iterate through the stacks, starting with the current stack pointer.</div><div class='hunk'>@@ -82,8 +77,8 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'> 	 * - softirq stack</div><div class='ctx'> 	 * - hardirq stack</div><div class='ctx'> 	 */</div><div class='del'>-	for (; stack; stack = stack_info.next_sp) {</div><div class='del'>-		const char *str_begin, *str_end;</div><div class='add'>+	for (regs = NULL; stack; stack = stack_info.next_sp) {</div><div class='add'>+		const char *stack_name;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we overflowed the task stack into a guard page, jump back</div><div class='hunk'>@@ -95,9 +90,9 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'> 		if (get_stack_info(stack, task, &amp;stack_info, &amp;visit_mask))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		stack_type_str(stack_info.type, &amp;str_begin, &amp;str_end);</div><div class='del'>-		if (str_begin)</div><div class='del'>-			printk("%s &lt;%s&gt; ", log_lvl, str_begin);</div><div class='add'>+		stack_name = stack_type_name(stack_info.type);</div><div class='add'>+		if (stack_name)</div><div class='add'>+			printk("%s &lt;%s&gt;\n", log_lvl, stack_name);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Scan the stack, printing any text addresses we find.  At the</div><div class='hunk'>@@ -119,6 +114,15 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'> 			if (!__kernel_text_address(addr))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='add'>+			/*</div><div class='add'>+			 * Don't print regs-&gt;ip again if it was already printed</div><div class='add'>+			 * by __show_regs() below.</div><div class='add'>+			 */</div><div class='add'>+			if (regs &amp;&amp; stack == &amp;regs-&gt;ip) {</div><div class='add'>+				unwind_next_frame(&amp;state);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			if (stack == ret_addr_p)</div><div class='ctx'> 				reliable = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -146,10 +150,15 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'> 			 * of the addresses will just be printed as unreliable.</div><div class='ctx'> 			 */</div><div class='ctx'> 			unwind_next_frame(&amp;state);</div><div class='add'>+</div><div class='add'>+			/* if the frame has entry regs, print them */</div><div class='add'>+			regs = unwind_get_entry_regs(&amp;state);</div><div class='add'>+			if (regs)</div><div class='add'>+				__show_regs(regs, 0);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (str_end)</div><div class='del'>-			printk("%s &lt;%s&gt; ", log_lvl, str_end);</div><div class='add'>+		if (stack_name)</div><div class='add'>+			printk("%s &lt;/%s&gt;\n", log_lvl, stack_name);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -164,12 +173,12 @@ void show_stack(struct task_struct *task, unsigned long *sp)</div><div class='ctx'> 	if (!sp &amp;&amp; task == current)</div><div class='ctx'> 		sp = get_stack_pointer(current, NULL);</div><div class='ctx'> </div><div class='del'>-	show_stack_log_lvl(task, NULL, sp, "");</div><div class='add'>+	show_trace_log_lvl(task, NULL, sp, KERN_DEFAULT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void show_stack_regs(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	show_stack_log_lvl(current, regs, NULL, "");</div><div class='add'>+	show_trace_log_lvl(current, regs, NULL, KERN_DEFAULT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;</div><div class='hunk'>@@ -261,14 +270,11 @@ int __die(const char *str, struct pt_regs *regs, long err)</div><div class='ctx'> 		sp = kernel_stack_pointer(regs);</div><div class='ctx'> 		savesegment(ss, ss);</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_EMERG "EIP: [&lt;%08lx&gt;] ", regs-&gt;ip);</div><div class='del'>-	print_symbol("%s", regs-&gt;ip);</div><div class='del'>-	printk(" SS:ESP %04x:%08lx\n", ss, sp);</div><div class='add'>+	printk(KERN_EMERG "EIP: %pS SS:ESP: %04x:%08lx\n",</div><div class='add'>+	       (void *)regs-&gt;ip, ss, sp);</div><div class='ctx'> #else</div><div class='ctx'> 	/* Executive summary in case the oops scrolled away */</div><div class='del'>-	printk(KERN_ALERT "RIP ");</div><div class='del'>-	printk_address(regs-&gt;ip);</div><div class='del'>-	printk(" RSP &lt;%016lx&gt;\n", regs-&gt;sp);</div><div class='add'>+	printk(KERN_ALERT "RIP: %pS RSP: %016lx\n", (void *)regs-&gt;ip, regs-&gt;sp);</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -291,22 +297,6 @@ void die(const char *str, struct pt_regs *regs, long err)</div><div class='ctx'> 	oops_end(flags, regs, sig);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init kstack_setup(char *s)</div><div class='del'>-{</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	unsigned long val;</div><div class='del'>-</div><div class='del'>-	if (!s)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ret = kstrtoul(s, 0, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	kstack_depth_to_print = val;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-early_param("kstack", kstack_setup);</div><div class='del'>-</div><div class='ctx'> static int __init code_bytes_setup(char *s)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t ret;</div><div class='head'>diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c<br/>index 06eb322b5f9f..b0b3a3df7c20 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/dumpstack_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/dumpstack_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/dumpstack_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/dumpstack_32.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  *  Copyright (C) 1991, 1992  Linus Torvalds</div><div class='ctx'>  *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -16,18 +17,15 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> </div><div class='del'>-void stack_type_str(enum stack_type type, const char **begin, const char **end)</div><div class='add'>+const char *stack_type_name(enum stack_type type)</div><div class='ctx'> {</div><div class='del'>-	switch (type) {</div><div class='del'>-	case STACK_TYPE_IRQ:</div><div class='del'>-	case STACK_TYPE_SOFTIRQ:</div><div class='del'>-		*begin = "IRQ";</div><div class='del'>-		*end   = "EOI";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		*begin = NULL;</div><div class='del'>-		*end   = NULL;</div><div class='del'>-	}</div><div class='add'>+	if (type == STACK_TYPE_IRQ)</div><div class='add'>+		return "IRQ";</div><div class='add'>+</div><div class='add'>+	if (type == STACK_TYPE_SOFTIRQ)</div><div class='add'>+		return "SOFTIRQ";</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool in_hardirq_stack(unsigned long *stack, struct stack_info *info)</div><div class='hunk'>@@ -109,8 +107,10 @@ recursion_check:</div><div class='ctx'> 	 * just break out and report an unknown stack type.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (visit_mask) {</div><div class='del'>-		if (*visit_mask &amp; (1UL &lt;&lt; info-&gt;type))</div><div class='add'>+		if (*visit_mask &amp; (1UL &lt;&lt; info-&gt;type)) {</div><div class='add'>+			printk_deferred_once(KERN_WARNING "WARNING: stack recursion on stack type %d\n", info-&gt;type);</div><div class='ctx'> 			goto unknown;</div><div class='add'>+		}</div><div class='ctx'> 		*visit_mask |= 1UL &lt;&lt; info-&gt;type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -121,36 +121,6 @@ unknown:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-			unsigned long *sp, char *log_lvl)</div><div class='del'>-{</div><div class='del'>-	unsigned long *stack;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!try_get_task_stack(task))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sp = sp ? : get_stack_pointer(task, regs);</div><div class='del'>-</div><div class='del'>-	stack = sp;</div><div class='del'>-	for (i = 0; i &lt; kstack_depth_to_print; i++) {</div><div class='del'>-		if (kstack_end(stack))</div><div class='del'>-			break;</div><div class='del'>-		if ((i % STACKSLOTS_PER_LINE) == 0) {</div><div class='del'>-			if (i != 0)</div><div class='del'>-				pr_cont("\n");</div><div class='del'>-			printk("%s %08lx", log_lvl, *stack++);</div><div class='del'>-		} else</div><div class='del'>-			pr_cont(" %08lx", *stack++);</div><div class='del'>-		touch_nmi_watchdog();</div><div class='del'>-	}</div><div class='del'>-	pr_cont("\n");</div><div class='del'>-	show_trace_log_lvl(task, regs, sp, log_lvl);</div><div class='del'>-</div><div class='del'>-	put_task_stack(task);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> void show_regs(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -168,8 +138,7 @@ void show_regs(struct pt_regs *regs)</div><div class='ctx'> 		unsigned char c;</div><div class='ctx'> 		u8 *ip;</div><div class='ctx'> </div><div class='del'>-		pr_emerg("Stack:\n");</div><div class='del'>-		show_stack_log_lvl(current, regs, NULL, KERN_EMERG);</div><div class='add'>+		show_trace_log_lvl(current, regs, NULL, KERN_EMERG);</div><div class='ctx'> </div><div class='ctx'> 		pr_emerg("Code:");</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c<br/>index 36cf1a498227..a8b117e93b46 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/dumpstack_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/dumpstack_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/dumpstack_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/dumpstack_64.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  *  Copyright (C) 1991, 1992  Linus Torvalds</div><div class='ctx'>  *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -28,23 +29,17 @@ static unsigned long exception_stack_sizes[N_EXCEPTION_STACKS] = {</div><div class='ctx'> 	[DEBUG_STACK - 1]			= DEBUG_STKSZ</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void stack_type_str(enum stack_type type, const char **begin, const char **end)</div><div class='add'>+const char *stack_type_name(enum stack_type type)</div><div class='ctx'> {</div><div class='ctx'> 	BUILD_BUG_ON(N_EXCEPTION_STACKS != 4);</div><div class='ctx'> </div><div class='del'>-	switch (type) {</div><div class='del'>-	case STACK_TYPE_IRQ:</div><div class='del'>-		*begin = "IRQ";</div><div class='del'>-		*end   = "EOI";</div><div class='del'>-		break;</div><div class='del'>-	case STACK_TYPE_EXCEPTION ... STACK_TYPE_EXCEPTION_LAST:</div><div class='del'>-		*begin = exception_stack_names[type - STACK_TYPE_EXCEPTION];</div><div class='del'>-		*end   = "EOE";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		*begin = NULL;</div><div class='del'>-		*end   = NULL;</div><div class='del'>-	}</div><div class='add'>+	if (type == STACK_TYPE_IRQ)</div><div class='add'>+		return "IRQ";</div><div class='add'>+</div><div class='add'>+	if (type &gt;= STACK_TYPE_EXCEPTION &amp;&amp; type &lt;= STACK_TYPE_EXCEPTION_LAST)</div><div class='add'>+		return exception_stack_names[type - STACK_TYPE_EXCEPTION];</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool in_exception_stack(unsigned long *stack, struct stack_info *info)</div><div class='hunk'>@@ -128,8 +123,10 @@ recursion_check:</div><div class='ctx'> 	 * just break out and report an unknown stack type.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (visit_mask) {</div><div class='del'>-		if (*visit_mask &amp; (1UL &lt;&lt; info-&gt;type))</div><div class='add'>+		if (*visit_mask &amp; (1UL &lt;&lt; info-&gt;type)) {</div><div class='add'>+			printk_deferred_once(KERN_WARNING "WARNING: stack recursion on stack type %d\n", info-&gt;type);</div><div class='ctx'> 			goto unknown;</div><div class='add'>+		}</div><div class='ctx'> 		*visit_mask |= 1UL &lt;&lt; info-&gt;type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -140,56 +137,6 @@ unknown:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='del'>-			unsigned long *sp, char *log_lvl)</div><div class='del'>-{</div><div class='del'>-	unsigned long *irq_stack_end;</div><div class='del'>-	unsigned long *irq_stack;</div><div class='del'>-	unsigned long *stack;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!try_get_task_stack(task))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	irq_stack_end = (unsigned long *)this_cpu_read(irq_stack_ptr);</div><div class='del'>-	irq_stack     = irq_stack_end - (IRQ_STACK_SIZE / sizeof(long));</div><div class='del'>-</div><div class='del'>-	sp = sp ? : get_stack_pointer(task, regs);</div><div class='del'>-</div><div class='del'>-	stack = sp;</div><div class='del'>-	for (i = 0; i &lt; kstack_depth_to_print; i++) {</div><div class='del'>-		unsigned long word;</div><div class='del'>-</div><div class='del'>-		if (stack &gt;= irq_stack &amp;&amp; stack &lt;= irq_stack_end) {</div><div class='del'>-			if (stack == irq_stack_end) {</div><div class='del'>-				stack = (unsigned long *) (irq_stack_end[-1]);</div><div class='del'>-				pr_cont(" &lt;EOI&gt; ");</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-		if (kstack_end(stack))</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (probe_kernel_address(stack, word))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if ((i % STACKSLOTS_PER_LINE) == 0) {</div><div class='del'>-			if (i != 0)</div><div class='del'>-				pr_cont("\n");</div><div class='del'>-			printk("%s %016lx", log_lvl, word);</div><div class='del'>-		} else</div><div class='del'>-			pr_cont(" %016lx", word);</div><div class='del'>-</div><div class='del'>-		stack++;</div><div class='del'>-		touch_nmi_watchdog();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_cont("\n");</div><div class='del'>-	show_trace_log_lvl(task, regs, sp, log_lvl);</div><div class='del'>-</div><div class='del'>-	put_task_stack(task);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void show_regs(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -207,8 +154,7 @@ void show_regs(struct pt_regs *regs)</div><div class='ctx'> 		unsigned char c;</div><div class='ctx'> 		u8 *ip;</div><div class='ctx'> </div><div class='del'>-		printk(KERN_DEFAULT "Stack:\n");</div><div class='del'>-		show_stack_log_lvl(current, regs, NULL, KERN_DEFAULT);</div><div class='add'>+		show_trace_log_lvl(current, regs, NULL, KERN_DEFAULT);</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_DEFAULT "Code: ");</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c<br/>index 90e8dde3ec26..b2bbad6ebe4d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/e820.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/e820.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/e820.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/e820.c</a></div><div class='hunk'>@@ -580,24 +580,19 @@ static void __init update_e820_saved(void)</div><div class='ctx'> }</div><div class='ctx'> #define MAX_GAP_END 0x100000000ull</div><div class='ctx'> /*</div><div class='del'>- * Search for a gap in the e820 memory space from start_addr to end_addr.</div><div class='add'>+ * Search for a gap in the e820 memory space from 0 to MAX_GAP_END.</div><div class='ctx'>  */</div><div class='del'>-__init int e820_search_gap(unsigned long *gapstart, unsigned long *gapsize,</div><div class='del'>-		unsigned long start_addr, unsigned long long end_addr)</div><div class='add'>+static int __init e820_search_gap(unsigned long *gapstart,</div><div class='add'>+		unsigned long *gapsize)</div><div class='ctx'> {</div><div class='del'>-	unsigned long long last;</div><div class='add'>+	unsigned long long last = MAX_GAP_END;</div><div class='ctx'> 	int i = e820-&gt;nr_map;</div><div class='ctx'> 	int found = 0;</div><div class='ctx'> </div><div class='del'>-	last = (end_addr &amp;&amp; end_addr &lt; MAX_GAP_END) ? end_addr : MAX_GAP_END;</div><div class='del'>-</div><div class='ctx'> 	while (--i &gt;= 0) {</div><div class='ctx'> 		unsigned long long start = e820-&gt;map[i].addr;</div><div class='ctx'> 		unsigned long long end = start + e820-&gt;map[i].size;</div><div class='ctx'> </div><div class='del'>-		if (end &lt; start_addr)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Since "last" is at most 4GB, we know we'll</div><div class='ctx'> 		 * fit in 32 bits if this condition is true</div><div class='hunk'>@@ -628,18 +623,19 @@ __init void e820_setup_gap(void)</div><div class='ctx'> 	unsigned long gapstart, gapsize;</div><div class='ctx'> 	int found;</div><div class='ctx'> </div><div class='del'>-	gapstart = 0x10000000;</div><div class='ctx'> 	gapsize = 0x400000;</div><div class='del'>-	found  = e820_search_gap(&amp;gapstart, &amp;gapsize, 0, MAX_GAP_END);</div><div class='add'>+	found  = e820_search_gap(&amp;gapstart, &amp;gapsize);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='ctx'> 	if (!found) {</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='ctx'> 		gapstart = (max_pfn &lt;&lt; PAGE_SHIFT) + 1024*1024;</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 	"e820: cannot find a gap in the 32bit address range\n"</div><div class='ctx'> 	"e820: PCI devices with unassigned 32bit BARs may break!\n");</div><div class='del'>-	}</div><div class='add'>+#else</div><div class='add'>+		gapstart = 0x10000000;</div><div class='ctx'> #endif</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * e820_reserve_resources_late protect stolen RAM already</div><div class='head'>diff --git a/arch/x86/kernel/fpu/bugs.c b/arch/x86/kernel/fpu/bugs.c<br/>index aad34aafc0e0..d913047f832c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/fpu/bugs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/fpu/bugs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/fpu/bugs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/bugs.c</a></div><div class='hunk'>@@ -23,17 +23,12 @@ static double __initdata y = 3145727.0;</div><div class='ctx'>  */</div><div class='ctx'> void __init fpu__init_check_bugs(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cr0_saved;</div><div class='ctx'> 	s32 fdiv_bug;</div><div class='ctx'> </div><div class='ctx'> 	/* kernel_fpu_begin/end() relies on patched alternative instructions. */</div><div class='ctx'> 	if (!boot_cpu_has(X86_FEATURE_FPU))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* We might have CR0::TS set already, clear it: */</div><div class='del'>-	cr0_saved = read_cr0();</div><div class='del'>-	write_cr0(cr0_saved &amp; ~X86_CR0_TS);</div><div class='del'>-</div><div class='ctx'> 	kernel_fpu_begin();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -56,8 +51,6 @@ void __init fpu__init_check_bugs(void)</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_end();</div><div class='ctx'> </div><div class='del'>-	write_cr0(cr0_saved);</div><div class='del'>-</div><div class='ctx'> 	if (fdiv_bug) {</div><div class='ctx'> 		set_cpu_bug(&amp;boot_cpu_data, X86_BUG_FDIV);</div><div class='ctx'> 		pr_warn("Hmm, FPU with FDIV bug\n");</div><div class='head'>diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c<br/>index ebb4e95fbd74..e1114f070c2d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/fpu/core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/fpu/core.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/fpu/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/core.c</a></div><div class='hunk'>@@ -58,27 +58,9 @@ static bool kernel_fpu_disabled(void)</div><div class='ctx'> 	return this_cpu_read(in_kernel_fpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Were we in an interrupt that interrupted kernel mode?</div><div class='del'>- *</div><div class='del'>- * On others, we can do a kernel_fpu_begin/end() pair *ONLY* if that</div><div class='del'>- * pair does nothing at all: the thread must not have fpu (so</div><div class='del'>- * that we don't try to save the FPU state), and TS must</div><div class='del'>- * be set (so that the clts/stts pair does nothing that is</div><div class='del'>- * visible in the interrupted kernel thread).</div><div class='del'>- *</div><div class='del'>- * Except for the eagerfpu case when we return true; in the likely case</div><div class='del'>- * the thread has FPU but we are not going to set/clear TS.</div><div class='del'>- */</div><div class='ctx'> static bool interrupted_kernel_fpu_idle(void)</div><div class='ctx'> {</div><div class='del'>-	if (kernel_fpu_disabled())</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (use_eager_fpu())</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return !current-&gt;thread.fpu.fpregs_active &amp;&amp; (read_cr0() &amp; X86_CR0_TS);</div><div class='add'>+	return !kernel_fpu_disabled();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -125,8 +107,7 @@ void __kernel_fpu_begin(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		copy_fpregs_to_fpstate(fpu);</div><div class='ctx'> 	} else {</div><div class='del'>-		this_cpu_write(fpu_fpregs_owner_ctx, NULL);</div><div class='del'>-		__fpregs_activate_hw();</div><div class='add'>+		__cpu_invalidate_fpregs_state();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__kernel_fpu_begin);</div><div class='hunk'>@@ -137,8 +118,6 @@ void __kernel_fpu_end(void)</div><div class='ctx'> </div><div class='ctx'> 	if (fpu-&gt;fpregs_active)</div><div class='ctx'> 		copy_kernel_to_fpregs(&amp;fpu-&gt;state);</div><div class='del'>-	else</div><div class='del'>-		__fpregs_deactivate_hw();</div><div class='ctx'> </div><div class='ctx'> 	kernel_fpu_enable();</div><div class='ctx'> }</div><div class='hunk'>@@ -159,35 +138,6 @@ void kernel_fpu_end(void)</div><div class='ctx'> EXPORT_SYMBOL_GPL(kernel_fpu_end);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * CR0::TS save/restore functions:</div><div class='del'>- */</div><div class='del'>-int irq_ts_save(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * If in process context and not atomic, we can take a spurious DNA fault.</div><div class='del'>-	 * Otherwise, doing clts() in process context requires disabling preemption</div><div class='del'>-	 * or some heavy lifting like kernel_fpu_begin()</div><div class='del'>-	 */</div><div class='del'>-	if (!in_atomic())</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (read_cr0() &amp; X86_CR0_TS) {</div><div class='del'>-		clts();</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(irq_ts_save);</div><div class='del'>-</div><div class='del'>-void irq_ts_restore(int TS_state)</div><div class='del'>-{</div><div class='del'>-	if (TS_state)</div><div class='del'>-		stts();</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(irq_ts_restore);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Save the FPU state (mark it for reload if necessary):</div><div class='ctx'>  *</div><div class='ctx'>  * This only ever gets called for the current task.</div><div class='hunk'>@@ -200,10 +150,7 @@ void fpu__save(struct fpu *fpu)</div><div class='ctx'> 	trace_x86_fpu_before_save(fpu);</div><div class='ctx'> 	if (fpu-&gt;fpregs_active) {</div><div class='ctx'> 		if (!copy_fpregs_to_fpstate(fpu)) {</div><div class='del'>-			if (use_eager_fpu())</div><div class='del'>-				copy_kernel_to_fpregs(&amp;fpu-&gt;state);</div><div class='del'>-			else</div><div class='del'>-				fpregs_deactivate(fpu);</div><div class='add'>+			copy_kernel_to_fpregs(&amp;fpu-&gt;state);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	trace_x86_fpu_after_save(fpu);</div><div class='hunk'>@@ -231,13 +178,8 @@ void fpstate_init(union fpregs_state *state)</div><div class='ctx'> </div><div class='ctx'> 	memset(state, 0, fpu_kernel_xstate_size);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * XRSTORS requires that this bit is set in xcomp_bv, or</div><div class='del'>-	 * it will #GP. Make sure it is replaced after the memset().</div><div class='del'>-	 */</div><div class='ctx'> 	if (static_cpu_has(X86_FEATURE_XSAVES))</div><div class='del'>-		state-&gt;xsave.header.xcomp_bv = XCOMP_BV_COMPACTED_FORMAT;</div><div class='del'>-</div><div class='add'>+		fpstate_init_xstate(&amp;state-&gt;xsave);</div><div class='ctx'> 	if (static_cpu_has(X86_FEATURE_FXSR))</div><div class='ctx'> 		fpstate_init_fxstate(&amp;state-&gt;fxsave);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -247,7 +189,6 @@ EXPORT_SYMBOL_GPL(fpstate_init);</div><div class='ctx'> </div><div class='ctx'> int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu)</div><div class='ctx'> {</div><div class='del'>-	dst_fpu-&gt;counter = 0;</div><div class='ctx'> 	dst_fpu-&gt;fpregs_active = 0;</div><div class='ctx'> 	dst_fpu-&gt;last_cpu = -1;</div><div class='ctx'> </div><div class='hunk'>@@ -260,8 +201,7 @@ int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu)</div><div class='ctx'> 	 * Don't let 'init optimized' areas of the XSAVE area</div><div class='ctx'> 	 * leak into the child task:</div><div class='ctx'> 	 */</div><div class='del'>-	if (use_eager_fpu())</div><div class='del'>-		memset(&amp;dst_fpu-&gt;state.xsave, 0, fpu_kernel_xstate_size);</div><div class='add'>+	memset(&amp;dst_fpu-&gt;state.xsave, 0, fpu_kernel_xstate_size);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Save current FPU registers directly into the child</div><div class='hunk'>@@ -283,10 +223,7 @@ int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu)</div><div class='ctx'> 		memcpy(&amp;src_fpu-&gt;state, &amp;dst_fpu-&gt;state,</div><div class='ctx'> 		       fpu_kernel_xstate_size);</div><div class='ctx'> </div><div class='del'>-		if (use_eager_fpu())</div><div class='del'>-			copy_kernel_to_fpregs(&amp;src_fpu-&gt;state);</div><div class='del'>-		else</div><div class='del'>-			fpregs_deactivate(src_fpu);</div><div class='add'>+		copy_kernel_to_fpregs(&amp;src_fpu-&gt;state);</div><div class='ctx'> 	}</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +303,7 @@ void fpu__activate_fpstate_write(struct fpu *fpu)</div><div class='ctx'> </div><div class='ctx'> 	if (fpu-&gt;fpstate_active) {</div><div class='ctx'> 		/* Invalidate any lazy state: */</div><div class='del'>-		fpu-&gt;last_cpu = -1;</div><div class='add'>+		__fpu_invalidate_fpregs_state(fpu);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		fpstate_init(&amp;fpu-&gt;state);</div><div class='ctx'> 		trace_x86_fpu_init_state(fpu);</div><div class='hunk'>@@ -409,7 +346,7 @@ void fpu__current_fpstate_write_begin(void)</div><div class='ctx'> 	 * ensures we will not be lazy and skip a XRSTOR in the</div><div class='ctx'> 	 * future.</div><div class='ctx'> 	 */</div><div class='del'>-	fpu-&gt;last_cpu = -1;</div><div class='add'>+	__fpu_invalidate_fpregs_state(fpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -459,7 +396,6 @@ void fpu__restore(struct fpu *fpu)</div><div class='ctx'> 	trace_x86_fpu_before_restore(fpu);</div><div class='ctx'> 	fpregs_activate(fpu);</div><div class='ctx'> 	copy_kernel_to_fpregs(&amp;fpu-&gt;state);</div><div class='del'>-	fpu-&gt;counter++;</div><div class='ctx'> 	trace_x86_fpu_after_restore(fpu);</div><div class='ctx'> 	kernel_fpu_enable();</div><div class='ctx'> }</div><div class='hunk'>@@ -477,7 +413,6 @@ EXPORT_SYMBOL_GPL(fpu__restore);</div><div class='ctx'> void fpu__drop(struct fpu *fpu)</div><div class='ctx'> {</div><div class='ctx'> 	preempt_disable();</div><div class='del'>-	fpu-&gt;counter = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (fpu-&gt;fpregs_active) {</div><div class='ctx'> 		/* Ignore delayed exceptions from user space */</div><div class='head'>diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c<br/>index 2f2b8c7ccb85..c2f8dde3255c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/fpu/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/fpu/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/fpu/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/init.c</a></div><div class='hunk'>@@ -7,21 +7,10 @@</div><div class='ctx'> #include &lt;asm/cmdline.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Initialize the TS bit in CR0 according to the style of context-switches</div><div class='del'>- * we are using:</div><div class='del'>- */</div><div class='del'>-static void fpu__init_cpu_ctx_switch(void)</div><div class='del'>-{</div><div class='del'>-	if (!boot_cpu_has(X86_FEATURE_EAGER_FPU))</div><div class='del'>-		stts();</div><div class='del'>-	else</div><div class='del'>-		clts();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Initialize the registers found in all CPUs, CR0 and CR4:</div><div class='ctx'>  */</div><div class='ctx'> static void fpu__init_cpu_generic(void)</div><div class='hunk'>@@ -58,16 +47,9 @@ void fpu__init_cpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	fpu__init_cpu_generic();</div><div class='ctx'> 	fpu__init_cpu_xstate();</div><div class='del'>-	fpu__init_cpu_ctx_switch();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The earliest FPU detection code.</div><div class='del'>- *</div><div class='del'>- * Set the X86_FEATURE_FPU CPU-capability bit based on</div><div class='del'>- * trying to execute an actual sequence of FPU instructions:</div><div class='del'>- */</div><div class='del'>-static void fpu__init_system_early_generic(struct cpuinfo_x86 *c)</div><div class='add'>+static bool fpu__probe_without_cpuid(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cr0;</div><div class='ctx'> 	u16 fsw, fcw;</div><div class='hunk'>@@ -78,18 +60,25 @@ static void fpu__init_system_early_generic(struct cpuinfo_x86 *c)</div><div class='ctx'> 	cr0 &amp;= ~(X86_CR0_TS | X86_CR0_EM);</div><div class='ctx'> 	write_cr0(cr0);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(X86_FEATURE_FPU, (unsigned long *)cpu_caps_cleared)) {</div><div class='del'>-		asm volatile("fninit ; fnstsw %0 ; fnstcw %1"</div><div class='del'>-			     : "+m" (fsw), "+m" (fcw));</div><div class='add'>+	asm volatile("fninit ; fnstsw %0 ; fnstcw %1" : "+m" (fsw), "+m" (fcw));</div><div class='add'>+</div><div class='add'>+	pr_info("x86/fpu: Probing for FPU: FSW=0x%04hx FCW=0x%04hx\n", fsw, fcw);</div><div class='ctx'> </div><div class='del'>-		if (fsw == 0 &amp;&amp; (fcw &amp; 0x103f) == 0x003f)</div><div class='del'>-			set_cpu_cap(c, X86_FEATURE_FPU);</div><div class='add'>+	return fsw == 0 &amp;&amp; (fcw &amp; 0x103f) == 0x003f;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fpu__init_system_early_generic(struct cpuinfo_x86 *c)</div><div class='add'>+{</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_CPUID) &amp;&amp;</div><div class='add'>+	    !test_bit(X86_FEATURE_FPU, (unsigned long *)cpu_caps_cleared)) {</div><div class='add'>+		if (fpu__probe_without_cpuid())</div><div class='add'>+			setup_force_cpu_cap(X86_FEATURE_FPU);</div><div class='ctx'> 		else</div><div class='del'>-			clear_cpu_cap(c, X86_FEATURE_FPU);</div><div class='add'>+			setup_clear_cpu_cap(X86_FEATURE_FPU);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_MATH_EMULATION</div><div class='del'>-	if (!boot_cpu_has(X86_FEATURE_FPU)) {</div><div class='add'>+	if (!test_cpu_cap(&amp;boot_cpu_data, X86_FEATURE_FPU)) {</div><div class='ctx'> 		pr_emerg("x86/fpu: Giving up, no FPU found and no math emulation present\n");</div><div class='ctx'> 		for (;;)</div><div class='ctx'> 			asm volatile("hlt");</div><div class='hunk'>@@ -233,82 +222,16 @@ static void __init fpu__init_system_xstate_size_legacy(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * FPU context switching strategies:</div><div class='del'>- *</div><div class='del'>- * Against popular belief, we don't do lazy FPU saves, due to the</div><div class='del'>- * task migration complications it brings on SMP - we only do</div><div class='del'>- * lazy FPU restores.</div><div class='del'>- *</div><div class='del'>- * 'lazy' is the traditional strategy, which is based on setting</div><div class='del'>- * CR0::TS to 1 during context-switch (instead of doing a full</div><div class='del'>- * restore of the FPU state), which causes the first FPU instruction</div><div class='del'>- * after the context switch (whenever it is executed) to fault - at</div><div class='del'>- * which point we lazily restore the FPU state into FPU registers.</div><div class='del'>- *</div><div class='del'>- * Tasks are of course under no obligation to execute FPU instructions,</div><div class='del'>- * so it can easily happen that another context-switch occurs without</div><div class='del'>- * a single FPU instruction being executed. If we eventually switch</div><div class='del'>- * back to the original task (that still owns the FPU) then we have</div><div class='del'>- * not only saved the restores along the way, but we also have the</div><div class='del'>- * FPU ready to be used for the original task.</div><div class='del'>- *</div><div class='del'>- * 'lazy' is deprecated because it's almost never a performance win</div><div class='del'>- * and it's much more complicated than 'eager'.</div><div class='del'>- *</div><div class='del'>- * 'eager' switching is by default on all CPUs, there we switch the FPU</div><div class='del'>- * state during every context switch, regardless of whether the task</div><div class='del'>- * has used FPU instructions in that time slice or not. This is done</div><div class='del'>- * because modern FPU context saving instructions are able to optimize</div><div class='del'>- * state saving and restoration in hardware: they can detect both</div><div class='del'>- * unused and untouched FPU state and optimize accordingly.</div><div class='del'>- *</div><div class='del'>- * [ Note that even in 'lazy' mode we might optimize context switches</div><div class='del'>- *   to use 'eager' restores, if we detect that a task is using the FPU</div><div class='del'>- *   frequently. See the fpu-&gt;counter logic in fpu/internal.h for that. ]</div><div class='del'>- */</div><div class='del'>-static enum { ENABLE, DISABLE } eagerfpu = ENABLE;</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Find supported xfeatures based on cpu features and command-line input.</div><div class='ctx'>  * This must be called after fpu__init_parse_early_param() is called and</div><div class='ctx'>  * xfeatures_mask is enumerated.</div><div class='ctx'>  */</div><div class='ctx'> u64 __init fpu__get_supported_xfeatures_mask(void)</div><div class='ctx'> {</div><div class='del'>-	/* Support all xfeatures known to us */</div><div class='del'>-	if (eagerfpu != DISABLE)</div><div class='del'>-		return XCNTXT_MASK;</div><div class='del'>-</div><div class='del'>-	/* Warning of xfeatures being disabled for no eagerfpu mode */</div><div class='del'>-	if (xfeatures_mask &amp; XFEATURE_MASK_EAGER) {</div><div class='del'>-		pr_err("x86/fpu: eagerfpu switching disabled, disabling the following xstate features: 0x%llx.\n",</div><div class='del'>-			xfeatures_mask &amp; XFEATURE_MASK_EAGER);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Return a mask that masks out all features requiring eagerfpu mode */</div><div class='del'>-	return ~XFEATURE_MASK_EAGER;</div><div class='add'>+	return XCNTXT_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Disable features dependent on eagerfpu.</div><div class='del'>- */</div><div class='del'>-static void __init fpu__clear_eager_fpu_features(void)</div><div class='del'>-{</div><div class='del'>-	setup_clear_cpu_cap(X86_FEATURE_MPX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Pick the FPU context switching strategy:</div><div class='del'>- *</div><div class='del'>- * When eagerfpu is AUTO or ENABLE, we ensure it is ENABLE if either of</div><div class='del'>- * the following is true:</div><div class='del'>- *</div><div class='del'>- * (1) the cpu has xsaveopt, as it has the optimization and doing eager</div><div class='del'>- *     FPU switching has a relatively low cost compared to a plain xsave;</div><div class='del'>- * (2) the cpu has xsave features (e.g. MPX) that depend on eager FPU</div><div class='del'>- *     switching. Should the kernel boot with noxsaveopt, we support MPX</div><div class='del'>- *     with eager FPU switching at a higher cost.</div><div class='del'>- */</div><div class='add'>+/* Legacy code to initialize eager fpu mode. */</div><div class='ctx'> static void __init fpu__init_system_ctx_switch(void)</div><div class='ctx'> {</div><div class='ctx'> 	static bool on_boot_cpu __initdata = 1;</div><div class='hunk'>@@ -317,17 +240,6 @@ static void __init fpu__init_system_ctx_switch(void)</div><div class='ctx'> 	on_boot_cpu = 0;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_FPU(current-&gt;thread.fpu.fpstate_active);</div><div class='del'>-</div><div class='del'>-	if (boot_cpu_has(X86_FEATURE_XSAVEOPT) &amp;&amp; eagerfpu != DISABLE)</div><div class='del'>-		eagerfpu = ENABLE;</div><div class='del'>-</div><div class='del'>-	if (xfeatures_mask &amp; XFEATURE_MASK_EAGER)</div><div class='del'>-		eagerfpu = ENABLE;</div><div class='del'>-</div><div class='del'>-	if (eagerfpu == ENABLE)</div><div class='del'>-		setup_force_cpu_cap(X86_FEATURE_EAGER_FPU);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "x86/fpu: Using '%s' FPU context switches.\n", eagerfpu == ENABLE ? "eager" : "lazy");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -336,11 +248,6 @@ static void __init fpu__init_system_ctx_switch(void)</div><div class='ctx'>  */</div><div class='ctx'> static void __init fpu__init_parse_early_param(void)</div><div class='ctx'> {</div><div class='del'>-	if (cmdline_find_option_bool(boot_command_line, "eagerfpu=off")) {</div><div class='del'>-		eagerfpu = DISABLE;</div><div class='del'>-		fpu__clear_eager_fpu_features();</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (cmdline_find_option_bool(boot_command_line, "no387"))</div><div class='ctx'> 		setup_clear_cpu_cap(X86_FEATURE_FPU);</div><div class='ctx'> </div><div class='hunk'>@@ -375,14 +282,6 @@ void __init fpu__init_system(struct cpuinfo_x86 *c)</div><div class='ctx'> 	 */</div><div class='ctx'> 	fpu__init_cpu();</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * But don't leave CR0::TS set yet, as some of the FPU setup</div><div class='del'>-	 * methods depend on being able to execute FPU instructions</div><div class='del'>-	 * that will fault on a set TS, such as the FXSAVE in</div><div class='del'>-	 * fpu__init_system_mxcsr().</div><div class='del'>-	 */</div><div class='del'>-	clts();</div><div class='del'>-</div><div class='ctx'> 	fpu__init_system_generic();</div><div class='ctx'> 	fpu__init_system_xstate_size_legacy();</div><div class='ctx'> 	fpu__init_system_xstate();</div><div class='head'>diff --git a/arch/x86/kernel/fpu/regset.c b/arch/x86/kernel/fpu/regset.c<br/>index c114b132d121..b188b16841e3 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/fpu/regset.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/fpu/regset.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/fpu/regset.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/regset.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> #include &lt;asm/fpu/signal.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/regset.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/xstate.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The xstateregs_active() routine is the same as the regset_fpregs_active() routine,</div><div class='head'>diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c<br/>index a184c210efba..83c23c230b4c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/fpu/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/fpu/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/fpu/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/signal.c</a></div><div class='hunk'>@@ -340,11 +340,9 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		fpu-&gt;fpstate_active = 1;</div><div class='del'>-		if (use_eager_fpu()) {</div><div class='del'>-			preempt_disable();</div><div class='del'>-			fpu__restore(fpu);</div><div class='del'>-			preempt_enable();</div><div class='del'>-		}</div><div class='add'>+		preempt_disable();</div><div class='add'>+		fpu__restore(fpu);</div><div class='add'>+		preempt_enable();</div><div class='ctx'> </div><div class='ctx'> 		return err;</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c<br/>index 095ef7ddd6ae..c24ac1efb12d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/fpu/xstate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/fpu/xstate.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/fpu/xstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/fpu/xstate.c</a></div><div class='hunk'>@@ -65,6 +65,7 @@ void fpu__xstate_clear_all_cpu_caps(void)</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_AVX);</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_AVX2);</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_AVX512F);</div><div class='add'>+	setup_clear_cpu_cap(X86_FEATURE_AVX512IFMA);</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_AVX512PF);</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_AVX512ER);</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_AVX512CD);</div><div class='hunk'>@@ -73,9 +74,11 @@ void fpu__xstate_clear_all_cpu_caps(void)</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_AVX512VL);</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_MPX);</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_XGETBV1);</div><div class='add'>+	setup_clear_cpu_cap(X86_FEATURE_AVX512VBMI);</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_PKU);</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_AVX512_4VNNIW);</div><div class='ctx'> 	setup_clear_cpu_cap(X86_FEATURE_AVX512_4FMAPS);</div><div class='add'>+	setup_clear_cpu_cap(X86_FEATURE_AVX512_VPOPCNTDQ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -703,8 +706,14 @@ void __init fpu__init_system_xstate(void)</div><div class='ctx'> 	WARN_ON_FPU(!on_boot_cpu);</div><div class='ctx'> 	on_boot_cpu = 0;</div><div class='ctx'> </div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_FPU)) {</div><div class='add'>+		pr_info("x86/fpu: No FPU detected\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!boot_cpu_has(X86_FEATURE_XSAVE)) {</div><div class='del'>-		pr_info("x86/fpu: Legacy x87 FPU detected.\n");</div><div class='add'>+		pr_info("x86/fpu: x87 FPU will use %s\n",</div><div class='add'>+			boot_cpu_has(X86_FEATURE_FXSR) ? "FXSAVE" : "FSAVE");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -890,15 +899,6 @@ int arch_set_user_pkey_access(struct task_struct *tsk, int pkey,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!boot_cpu_has(X86_FEATURE_OSPKE))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	/*</div><div class='del'>-	 * For most XSAVE components, this would be an arduous task:</div><div class='del'>-	 * brining fpstate up to date with fpregs, updating fpstate,</div><div class='del'>-	 * then re-populating fpregs.  But, for components that are</div><div class='del'>-	 * never lazily managed, we can just access the fpregs</div><div class='del'>-	 * directly.  PKRU is never managed lazily, so we can just</div><div class='del'>-	 * manipulate it directly.  Make sure it stays that way.</div><div class='del'>-	 */</div><div class='del'>-	WARN_ON_ONCE(!use_eager_fpu());</div><div class='ctx'> </div><div class='ctx'> 	/* Set the bits we need in PKRU:  */</div><div class='ctx'> 	if (init_val &amp; PKEY_DISABLE_ACCESS)</div><div class='head'>diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c<br/>index f16c55bfc090..e5fb436a6548 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/head32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/head32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/head32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/head32.c</a></div><div class='hunk'>@@ -49,3 +49,65 @@ asmlinkage __visible void __init i386_start_kernel(void)</div><div class='ctx'> </div><div class='ctx'> 	start_kernel();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize page tables.  This creates a PDE and a set of page</div><div class='add'>+ * tables, which are located immediately beyond __brk_base.  The variable</div><div class='add'>+ * _brk_end is set up to point to the first "safe" location.</div><div class='add'>+ * Mappings are created both at virtual address 0 (identity mapping)</div><div class='add'>+ * and PAGE_OFFSET for up to _end.</div><div class='add'>+ *</div><div class='add'>+ * In PAE mode initial_page_table is statically defined to contain</div><div class='add'>+ * enough entries to cover the VMSPLIT option (that is the top 1, 2 or 3</div><div class='add'>+ * entries). The identity mapping is handled by pointing two PGD entries</div><div class='add'>+ * to the first kernel PMD. Note the upper half of each PMD or PTE are</div><div class='add'>+ * always zero at this stage.</div><div class='add'>+ */</div><div class='add'>+void __init mk_early_pgtbl_32(void)</div><div class='add'>+{</div><div class='add'>+#ifdef __pa</div><div class='add'>+#undef __pa</div><div class='add'>+#endif</div><div class='add'>+#define __pa(x)  ((unsigned long)(x) - PAGE_OFFSET)</div><div class='add'>+	pte_t pte, *ptep;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long *ptr;</div><div class='add'>+	/* Enough space to fit pagetables for the low memory linear map */</div><div class='add'>+	const unsigned long limit = __pa(_end) +</div><div class='add'>+		(PAGE_TABLE_SIZE(LOWMEM_PAGES) &lt;&lt; PAGE_SHIFT);</div><div class='add'>+#ifdef CONFIG_X86_PAE</div><div class='add'>+	pmd_t pl2, *pl2p = (pmd_t *)__pa(initial_pg_pmd);</div><div class='add'>+#define SET_PL2(pl2, val)    { (pl2).pmd = (val); }</div><div class='add'>+#else</div><div class='add'>+	pgd_t pl2, *pl2p = (pgd_t *)__pa(initial_page_table);</div><div class='add'>+#define SET_PL2(pl2, val)   { (pl2).pgd = (val); }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ptep = (pte_t *)__pa(__brk_base);</div><div class='add'>+	pte.pte = PTE_IDENT_ATTR;</div><div class='add'>+</div><div class='add'>+	while ((pte.pte &amp; PTE_PFN_MASK) &lt; limit) {</div><div class='add'>+</div><div class='add'>+		SET_PL2(pl2, (unsigned long)ptep | PDE_IDENT_ATTR);</div><div class='add'>+		*pl2p = pl2;</div><div class='add'>+#ifndef CONFIG_X86_PAE</div><div class='add'>+		/* Kernel PDE entry */</div><div class='add'>+		*(pl2p +  ((PAGE_OFFSET &gt;&gt; PGDIR_SHIFT))) = pl2;</div><div class='add'>+#endif</div><div class='add'>+		for (i = 0; i &lt; PTRS_PER_PTE; i++) {</div><div class='add'>+			*ptep = pte;</div><div class='add'>+			pte.pte += PAGE_SIZE;</div><div class='add'>+			ptep++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pl2p++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr = (unsigned long *)__pa(&amp;max_pfn_mapped);</div><div class='add'>+	/* Can't use pte_pfn() since it's a call with CONFIG_PARAVIRT */</div><div class='add'>+	*ptr = (pte.pte &amp; PTE_PFN_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	ptr = (unsigned long *)__pa(&amp;_brk_end);</div><div class='add'>+	*ptr = (unsigned long)ptep + PAGE_OFFSET;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S<br/>index 2dabea46f039..1f85ee8f9439 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/head_32.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/head_32.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/head_32.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/head_32.S</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;asm/nops.h&gt;</div><div class='ctx'> #include &lt;asm/bootparam.h&gt;</div><div class='ctx'> #include &lt;asm/export.h&gt;</div><div class='add'>+#include &lt;asm/pgtable_32.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Physical address */</div><div class='ctx'> #define pa(X) ((X) - __PAGE_OFFSET)</div><div class='hunk'>@@ -41,40 +42,8 @@</div><div class='ctx'> #define X86_CAPABILITY	new_cpu_data+CPUINFO_x86_capability</div><div class='ctx'> #define X86_VENDOR_ID	new_cpu_data+CPUINFO_x86_vendor_id</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is how much memory in addition to the memory covered up to</div><div class='del'>- * and including _end we need mapped initially.</div><div class='del'>- * We need:</div><div class='del'>- *     (KERNEL_IMAGE_SIZE/4096) / 1024 pages (worst case, non PAE)</div><div class='del'>- *     (KERNEL_IMAGE_SIZE/4096) / 512 + 4 pages (worst case for PAE)</div><div class='del'>- *</div><div class='del'>- * Modulo rounding, each megabyte assigned here requires a kilobyte of</div><div class='del'>- * memory, which is currently unreclaimed.</div><div class='del'>- *</div><div class='del'>- * This should be a multiple of a page.</div><div class='del'>- *</div><div class='del'>- * KERNEL_IMAGE_SIZE should be greater than pa(_end)</div><div class='del'>- * and small than max_low_pfn, otherwise will waste some page table entries</div><div class='del'>- */</div><div class='ctx'> </div><div class='del'>-#if PTRS_PER_PMD &gt; 1</div><div class='del'>-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)</div><div class='del'>-#else</div><div class='del'>-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Number of possible pages in the lowmem region.</div><div class='del'>- *</div><div class='del'>- * We shift 2 by 31 instead of 1 by 32 to the left in order to avoid a</div><div class='del'>- * gas warning about overflowing shift count when gas has been compiled</div><div class='del'>- * with only a host target support using a 32-bit type for internal</div><div class='del'>- * representation.</div><div class='del'>- */</div><div class='del'>-LOWMEM_PAGES = (((2&lt;&lt;31) - __PAGE_OFFSET) &gt;&gt; PAGE_SHIFT)</div><div class='del'>-</div><div class='del'>-/* Enough space to fit pagetables for the low memory linear map */</div><div class='del'>-MAPPING_BEYOND_END = PAGE_TABLE_SIZE(LOWMEM_PAGES) &lt;&lt; PAGE_SHIFT</div><div class='add'>+#define SIZEOF_PTREGS 17*4</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Worst-case size of the kernel mapping we need to make:</div><div class='hunk'>@@ -158,109 +127,34 @@ ENTRY(startup_32)</div><div class='ctx'> 	call load_ucode_bsp</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Initialize page tables.  This creates a PDE and a set of page</div><div class='del'>- * tables, which are located immediately beyond __brk_base.  The variable</div><div class='del'>- * _brk_end is set up to point to the first "safe" location.</div><div class='del'>- * Mappings are created both at virtual address 0 (identity mapping)</div><div class='del'>- * and PAGE_OFFSET for up to _end.</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_X86_PAE</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * In PAE mode initial_page_table is statically defined to contain</div><div class='del'>-	 * enough entries to cover the VMSPLIT option (that is the top 1, 2 or 3</div><div class='del'>-	 * entries). The identity mapping is handled by pointing two PGD entries</div><div class='del'>-	 * to the first kernel PMD.</div><div class='del'>-	 *</div><div class='del'>-	 * Note the upper half of each PMD or PTE are always zero at this stage.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-#define KPMDS (((-__PAGE_OFFSET) &gt;&gt; 30) &amp; 3) /* Number of kernel PMDs */</div><div class='del'>-</div><div class='del'>-	xorl %ebx,%ebx				/* %ebx is kept at zero */</div><div class='del'>-</div><div class='del'>-	movl $pa(__brk_base), %edi</div><div class='del'>-	movl $pa(initial_pg_pmd), %edx</div><div class='del'>-	movl $PTE_IDENT_ATTR, %eax</div><div class='del'>-10:</div><div class='del'>-	leal PDE_IDENT_ATTR(%edi),%ecx		/* Create PMD entry */</div><div class='del'>-	movl %ecx,(%edx)			/* Store PMD entry */</div><div class='del'>-						/* Upper half already zero */</div><div class='del'>-	addl $8,%edx</div><div class='del'>-	movl $512,%ecx</div><div class='del'>-11:</div><div class='del'>-	stosl</div><div class='del'>-	xchgl %eax,%ebx</div><div class='del'>-	stosl</div><div class='del'>-	xchgl %eax,%ebx</div><div class='del'>-	addl $0x1000,%eax</div><div class='del'>-	loop 11b</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * End condition: we must map up to the end + MAPPING_BEYOND_END.</div><div class='del'>-	 */</div><div class='del'>-	movl $pa(_end) + MAPPING_BEYOND_END + PTE_IDENT_ATTR, %ebp</div><div class='del'>-	cmpl %ebp,%eax</div><div class='del'>-	jb 10b</div><div class='del'>-1:</div><div class='del'>-	addl $__PAGE_OFFSET, %edi</div><div class='del'>-	movl %edi, pa(_brk_end)</div><div class='del'>-	shrl $12, %eax</div><div class='del'>-	movl %eax, pa(max_pfn_mapped)</div><div class='add'>+	/* Create early pagetables. */</div><div class='add'>+	call  mk_early_pgtbl_32</div><div class='ctx'> </div><div class='ctx'> 	/* Do early initialization of the fixmap area */</div><div class='ctx'> 	movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax</div><div class='add'>+#ifdef  CONFIG_X86_PAE</div><div class='add'>+#define KPMDS (((-__PAGE_OFFSET) &gt;&gt; 30) &amp; 3) /* Number of kernel PMDs */</div><div class='ctx'> 	movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)</div><div class='del'>-#else	/* Not PAE */</div><div class='del'>-</div><div class='del'>-page_pde_offset = (__PAGE_OFFSET &gt;&gt; 20);</div><div class='del'>-</div><div class='del'>-	movl $pa(__brk_base), %edi</div><div class='del'>-	movl $pa(initial_page_table), %edx</div><div class='del'>-	movl $PTE_IDENT_ATTR, %eax</div><div class='del'>-10:</div><div class='del'>-	leal PDE_IDENT_ATTR(%edi),%ecx		/* Create PDE entry */</div><div class='del'>-	movl %ecx,(%edx)			/* Store identity PDE entry */</div><div class='del'>-	movl %ecx,page_pde_offset(%edx)		/* Store kernel PDE entry */</div><div class='del'>-	addl $4,%edx</div><div class='del'>-	movl $1024, %ecx</div><div class='del'>-11:</div><div class='del'>-	stosl</div><div class='del'>-	addl $0x1000,%eax</div><div class='del'>-	loop 11b</div><div class='del'>-	/*</div><div class='del'>-	 * End condition: we must map up to the end + MAPPING_BEYOND_END.</div><div class='del'>-	 */</div><div class='del'>-	movl $pa(_end) + MAPPING_BEYOND_END + PTE_IDENT_ATTR, %ebp</div><div class='del'>-	cmpl %ebp,%eax</div><div class='del'>-	jb 10b</div><div class='del'>-	addl $__PAGE_OFFSET, %edi</div><div class='del'>-	movl %edi, pa(_brk_end)</div><div class='del'>-	shrl $12, %eax</div><div class='del'>-	movl %eax, pa(max_pfn_mapped)</div><div class='del'>-</div><div class='del'>-	/* Do early initialization of the fixmap area */</div><div class='del'>-	movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax</div><div class='add'>+#else</div><div class='ctx'> 	movl %eax,pa(initial_page_table+0xffc)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PARAVIRT</div><div class='ctx'> 	/* This is can only trip for a broken bootloader... */</div><div class='ctx'> 	cmpw $0x207, pa(boot_params + BP_version)</div><div class='del'>-	jb default_entry</div><div class='add'>+	jb .Ldefault_entry</div><div class='ctx'> </div><div class='ctx'> 	/* Paravirt-compatible boot parameters.  Look to see what architecture</div><div class='ctx'> 		we're booting under. */</div><div class='ctx'> 	movl pa(boot_params + BP_hardware_subarch), %eax</div><div class='ctx'> 	cmpl $num_subarch_entries, %eax</div><div class='del'>-	jae bad_subarch</div><div class='add'>+	jae .Lbad_subarch</div><div class='ctx'> </div><div class='ctx'> 	movl pa(subarch_entries)(,%eax,4), %eax</div><div class='ctx'> 	subl $__PAGE_OFFSET, %eax</div><div class='ctx'> 	jmp *%eax</div><div class='ctx'> </div><div class='del'>-bad_subarch:</div><div class='add'>+.Lbad_subarch:</div><div class='ctx'> WEAK(lguest_entry)</div><div class='ctx'> WEAK(xen_entry)</div><div class='ctx'> 	/* Unknown implementation; there's really</div><div class='hunk'>@@ -270,14 +164,14 @@ WEAK(xen_entry)</div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='ctx'> subarch_entries:</div><div class='del'>-	.long default_entry		/* normal x86/PC */</div><div class='add'>+	.long .Ldefault_entry		/* normal x86/PC */</div><div class='ctx'> 	.long lguest_entry		/* lguest hypervisor */</div><div class='ctx'> 	.long xen_entry			/* Xen hypervisor */</div><div class='del'>-	.long default_entry		/* Moorestown MID */</div><div class='add'>+	.long .Ldefault_entry		/* Moorestown MID */</div><div class='ctx'> num_subarch_entries = (. - subarch_entries) / 4</div><div class='ctx'> .previous</div><div class='ctx'> #else</div><div class='del'>-	jmp default_entry</div><div class='add'>+	jmp .Ldefault_entry</div><div class='ctx'> #endif /* CONFIG_PARAVIRT */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='hunk'>@@ -289,7 +183,8 @@ num_subarch_entries = (. - subarch_entries) / 4</div><div class='ctx'> ENTRY(start_cpu0)</div><div class='ctx'> 	movl initial_stack, %ecx</div><div class='ctx'> 	movl %ecx, %esp</div><div class='del'>-	jmp  *(initial_code)</div><div class='add'>+	call *(initial_code)</div><div class='add'>+1:	jmp 1b</div><div class='ctx'> ENDPROC(start_cpu0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -317,7 +212,7 @@ ENTRY(startup_32_smp)</div><div class='ctx'> 	call load_ucode_ap</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-default_entry:</div><div class='add'>+.Ldefault_entry:</div><div class='ctx'> #define CR0_STATE	(X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \</div><div class='ctx'> 			 X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \</div><div class='ctx'> 			 X86_CR0_PG)</div><div class='hunk'>@@ -347,7 +242,7 @@ default_entry:</div><div class='ctx'> 	pushfl</div><div class='ctx'> 	popl %eax			# get EFLAGS</div><div class='ctx'> 	testl $X86_EFLAGS_ID,%eax	# did EFLAGS.ID remained set?</div><div class='del'>-	jz enable_paging		# hw disallowed setting of ID bit</div><div class='add'>+	jz .Lenable_paging		# hw disallowed setting of ID bit</div><div class='ctx'> 					# which means no CPUID and no CR4</div><div class='ctx'> </div><div class='ctx'> 	xorl %eax,%eax</div><div class='hunk'>@@ -357,13 +252,13 @@ default_entry:</div><div class='ctx'> 	movl $1,%eax</div><div class='ctx'> 	cpuid</div><div class='ctx'> 	andl $~1,%edx			# Ignore CPUID.FPU</div><div class='del'>-	jz enable_paging		# No flags or only CPUID.FPU = no CR4</div><div class='add'>+	jz .Lenable_paging		# No flags or only CPUID.FPU = no CR4</div><div class='ctx'> </div><div class='ctx'> 	movl pa(mmu_cr4_features),%eax</div><div class='ctx'> 	movl %eax,%cr4</div><div class='ctx'> </div><div class='ctx'> 	testb $X86_CR4_PAE, %al		# check if PAE is enabled</div><div class='del'>-	jz enable_paging</div><div class='add'>+	jz .Lenable_paging</div><div class='ctx'> </div><div class='ctx'> 	/* Check if extended functions are implemented */</div><div class='ctx'> 	movl $0x80000000, %eax</div><div class='hunk'>@@ -371,7 +266,7 @@ default_entry:</div><div class='ctx'> 	/* Value must be in the range 0x80000001 to 0x8000ffff */</div><div class='ctx'> 	subl $0x80000001, %eax</div><div class='ctx'> 	cmpl $(0x8000ffff-0x80000001), %eax</div><div class='del'>-	ja enable_paging</div><div class='add'>+	ja .Lenable_paging</div><div class='ctx'> </div><div class='ctx'> 	/* Clear bogus XD_DISABLE bits */</div><div class='ctx'> 	call verify_cpu</div><div class='hunk'>@@ -380,7 +275,7 @@ default_entry:</div><div class='ctx'> 	cpuid</div><div class='ctx'> 	/* Execute Disable bit supported? */</div><div class='ctx'> 	btl $(X86_FEATURE_NX &amp; 31), %edx</div><div class='del'>-	jnc enable_paging</div><div class='add'>+	jnc .Lenable_paging</div><div class='ctx'> </div><div class='ctx'> 	/* Setup EFER (Extended Feature Enable Register) */</div><div class='ctx'> 	movl $MSR_EFER, %ecx</div><div class='hunk'>@@ -390,7 +285,7 @@ default_entry:</div><div class='ctx'> 	/* Make changes effective */</div><div class='ctx'> 	wrmsr</div><div class='ctx'> </div><div class='del'>-enable_paging:</div><div class='add'>+.Lenable_paging:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Enable paging</div><div class='hunk'>@@ -419,7 +314,7 @@ enable_paging:</div><div class='ctx'>  */</div><div class='ctx'> 	movb $4,X86			# at least 486</div><div class='ctx'> 	cmpl $-1,X86_CPUID</div><div class='del'>-	je is486</div><div class='add'>+	je .Lis486</div><div class='ctx'> </div><div class='ctx'> 	/* get vendor info */</div><div class='ctx'> 	xorl %eax,%eax			# call CPUID with 0 -&gt; return vendor ID</div><div class='hunk'>@@ -430,7 +325,7 @@ enable_paging:</div><div class='ctx'> 	movl %ecx,X86_VENDOR_ID+8	# last 4 chars</div><div class='ctx'> </div><div class='ctx'> 	orl %eax,%eax			# do we have processor info as well?</div><div class='del'>-	je is486</div><div class='add'>+	je .Lis486</div><div class='ctx'> </div><div class='ctx'> 	movl $1,%eax		# Use the CPUID instruction to get CPU type</div><div class='ctx'> 	cpuid</div><div class='hunk'>@@ -444,7 +339,7 @@ enable_paging:</div><div class='ctx'> 	movb %cl,X86_MASK</div><div class='ctx'> 	movl %edx,X86_CAPABILITY</div><div class='ctx'> </div><div class='del'>-is486:</div><div class='add'>+.Lis486:</div><div class='ctx'> 	movl $0x50022,%ecx	# set AM, WP, NE and MP</div><div class='ctx'> 	movl %cr0,%eax</div><div class='ctx'> 	andl $0x80000011,%eax	# Save PG,PE,ET</div><div class='hunk'>@@ -470,8 +365,9 @@ is486:</div><div class='ctx'> 	xorl %eax,%eax			# Clear LDT</div><div class='ctx'> 	lldt %ax</div><div class='ctx'> </div><div class='del'>-	pushl $0		# fake return address for unwinder</div><div class='del'>-	jmp *(initial_code)</div><div class='add'>+	call *(initial_code)</div><div class='add'>+1:	jmp 1b</div><div class='add'>+ENDPROC(startup_32_smp)</div><div class='ctx'> </div><div class='ctx'> #include "verify_cpu.S"</div><div class='ctx'> </div><div class='hunk'>@@ -662,6 +558,7 @@ ENTRY(setup_once_ref)</div><div class='ctx'> __PAGE_ALIGNED_BSS</div><div class='ctx'> 	.align PAGE_SIZE</div><div class='ctx'> #ifdef CONFIG_X86_PAE</div><div class='add'>+.globl initial_pg_pmd</div><div class='ctx'> initial_pg_pmd:</div><div class='ctx'> 	.fill 1024*KPMDS,4,0</div><div class='ctx'> #else</div><div class='hunk'>@@ -709,7 +606,12 @@ ENTRY(initial_page_table)</div><div class='ctx'> .data</div><div class='ctx'> .balign 4</div><div class='ctx'> ENTRY(initial_stack)</div><div class='del'>-	.long init_thread_union+THREAD_SIZE</div><div class='add'>+	/*</div><div class='add'>+	 * The SIZEOF_PTREGS gap is a convention which helps the in-kernel</div><div class='add'>+	 * unwinder reliably detect the end of the stack.</div><div class='add'>+	 */</div><div class='add'>+	.long init_thread_union + THREAD_SIZE - SIZEOF_PTREGS - \</div><div class='add'>+	      TOP_OF_KERNEL_STACK_PADDING;</div><div class='ctx'> </div><div class='ctx'> __INITRODATA</div><div class='ctx'> int_msg:</div><div class='head'>diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S<br/>index b4421cc191b0..b467b14b03eb 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/head_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/head_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/head_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/head_64.S</a></div><div class='hunk'>@@ -66,13 +66,8 @@ startup_64:</div><div class='ctx'> 	 * tables and then reload them.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Setup stack for verify_cpu(). "-8" because initial_stack is defined</div><div class='del'>-	 * this way, see below. Our best guess is a NULL ptr for stack</div><div class='del'>-	 * termination heuristics and we don't want to break anything which</div><div class='del'>-	 * might depend on it (kgdb, ...).</div><div class='del'>-	 */</div><div class='del'>-	leaq	(__end_init_task - 8)(%rip), %rsp</div><div class='add'>+	/* Set up the stack for verify_cpu(), similar to initial_stack below */</div><div class='add'>+	leaq	(__end_init_task - SIZEOF_PTREGS)(%rip), %rsp</div><div class='ctx'> </div><div class='ctx'> 	/* Sanitize CPU configuration */</div><div class='ctx'> 	call verify_cpu</div><div class='hunk'>@@ -117,20 +112,20 @@ startup_64:</div><div class='ctx'> 	movq	%rdi, %rax</div><div class='ctx'> 	shrq	$PGDIR_SHIFT, %rax</div><div class='ctx'> </div><div class='del'>-	leaq	(4096 + _KERNPG_TABLE)(%rbx), %rdx</div><div class='add'>+	leaq	(PAGE_SIZE + _KERNPG_TABLE)(%rbx), %rdx</div><div class='ctx'> 	movq	%rdx, 0(%rbx,%rax,8)</div><div class='ctx'> 	movq	%rdx, 8(%rbx,%rax,8)</div><div class='ctx'> </div><div class='del'>-	addq	$4096, %rdx</div><div class='add'>+	addq	$PAGE_SIZE, %rdx</div><div class='ctx'> 	movq	%rdi, %rax</div><div class='ctx'> 	shrq	$PUD_SHIFT, %rax</div><div class='ctx'> 	andl	$(PTRS_PER_PUD-1), %eax</div><div class='del'>-	movq	%rdx, 4096(%rbx,%rax,8)</div><div class='add'>+	movq	%rdx, PAGE_SIZE(%rbx,%rax,8)</div><div class='ctx'> 	incl	%eax</div><div class='ctx'> 	andl	$(PTRS_PER_PUD-1), %eax</div><div class='del'>-	movq	%rdx, 4096(%rbx,%rax,8)</div><div class='add'>+	movq	%rdx, PAGE_SIZE(%rbx,%rax,8)</div><div class='ctx'> </div><div class='del'>-	addq	$8192, %rbx</div><div class='add'>+	addq	$PAGE_SIZE * 2, %rbx</div><div class='ctx'> 	movq	%rdi, %rax</div><div class='ctx'> 	shrq	$PMD_SHIFT, %rdi</div><div class='ctx'> 	addq	$(__PAGE_KERNEL_LARGE_EXEC &amp; ~_PAGE_GLOBAL), %rax</div><div class='hunk'>@@ -147,6 +142,9 @@ startup_64:</div><div class='ctx'> 	decl	%ecx</div><div class='ctx'> 	jnz	1b</div><div class='ctx'> </div><div class='add'>+	test %rbp, %rbp</div><div class='add'>+	jz .Lskip_fixup</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fixup the kernel text+data virtual addresses. Note that</div><div class='ctx'> 	 * we might write invalid pmds, when the kernel is relocated</div><div class='hunk'>@@ -154,9 +152,9 @@ startup_64:</div><div class='ctx'> 	 * beyond _end.</div><div class='ctx'> 	 */</div><div class='ctx'> 	leaq	level2_kernel_pgt(%rip), %rdi</div><div class='del'>-	leaq	4096(%rdi), %r8</div><div class='add'>+	leaq	PAGE_SIZE(%rdi), %r8</div><div class='ctx'> 	/* See if it is a valid page table entry */</div><div class='del'>-1:	testb	$1, 0(%rdi)</div><div class='add'>+1:	testb	$_PAGE_PRESENT, 0(%rdi)</div><div class='ctx'> 	jz	2f</div><div class='ctx'> 	addq	%rbp, 0(%rdi)</div><div class='ctx'> 	/* Go to the next page */</div><div class='hunk'>@@ -167,6 +165,7 @@ startup_64:</div><div class='ctx'> 	/* Fixup phys_base */</div><div class='ctx'> 	addq	%rbp, phys_base(%rip)</div><div class='ctx'> </div><div class='add'>+.Lskip_fixup:</div><div class='ctx'> 	movq	$(early_level4_pgt - __START_KERNEL_map), %rax</div><div class='ctx'> 	jmp 1f</div><div class='ctx'> ENTRY(secondary_startup_64)</div><div class='hunk'>@@ -265,13 +264,17 @@ ENTRY(secondary_startup_64)</div><div class='ctx'> 	movl	$MSR_GS_BASE,%ecx</div><div class='ctx'> 	movl	initial_gs(%rip),%eax</div><div class='ctx'> 	movl	initial_gs+4(%rip),%edx</div><div class='del'>-	wrmsr	</div><div class='add'>+	wrmsr</div><div class='ctx'> </div><div class='ctx'> 	/* rsi is pointer to real mode structure with interesting info.</div><div class='ctx'> 	   pass it to C */</div><div class='ctx'> 	movq	%rsi, %rdi</div><div class='del'>-	</div><div class='del'>-	/* Finally jump to run C code and to be on real kernel address</div><div class='add'>+	jmp	start_cpu</div><div class='add'>+ENDPROC(secondary_startup_64)</div><div class='add'>+</div><div class='add'>+ENTRY(start_cpu)</div><div class='add'>+	/*</div><div class='add'>+	 * Jump to run C code and to be on a real kernel address.</div><div class='ctx'> 	 * Since we are running on identity-mapped space we have to jump</div><div class='ctx'> 	 * to the full 64bit address, this is only possible as indirect</div><div class='ctx'> 	 * jump.  In addition we need to ensure %cs is set so we make this</div><div class='hunk'>@@ -295,12 +298,14 @@ ENTRY(secondary_startup_64)</div><div class='ctx'> 	 *	REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,</div><div class='ctx'> 	 *		address given in m16:64.</div><div class='ctx'> 	 */</div><div class='del'>-	movq	initial_code(%rip),%rax</div><div class='del'>-	pushq	$0		# fake return address to stop unwinder</div><div class='add'>+	pushq	$.Lafter_lret	# put return address on stack for unwinder</div><div class='add'>+	xorq	%rbp, %rbp	# clear frame pointer</div><div class='add'>+	movq	initial_code(%rip), %rax</div><div class='ctx'> 	pushq	$__KERNEL_CS	# set correct cs</div><div class='ctx'> 	pushq	%rax		# target address in negative space</div><div class='ctx'> 	lretq</div><div class='del'>-ENDPROC(secondary_startup_64)</div><div class='add'>+.Lafter_lret:</div><div class='add'>+ENDPROC(start_cpu)</div><div class='ctx'> </div><div class='ctx'> #include "verify_cpu.S"</div><div class='ctx'> </div><div class='hunk'>@@ -308,15 +313,11 @@ ENDPROC(secondary_startup_64)</div><div class='ctx'> /*</div><div class='ctx'>  * Boot CPU0 entry point. It's called from play_dead(). Everything has been set</div><div class='ctx'>  * up already except stack. We just set up stack here. Then call</div><div class='del'>- * start_secondary().</div><div class='add'>+ * start_secondary() via start_cpu().</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(start_cpu0)</div><div class='del'>-	movq initial_stack(%rip),%rsp</div><div class='del'>-	movq	initial_code(%rip),%rax</div><div class='del'>-	pushq	$0		# fake return address to stop unwinder</div><div class='del'>-	pushq	$__KERNEL_CS	# set correct cs</div><div class='del'>-	pushq	%rax		# target address in negative space</div><div class='del'>-	lretq</div><div class='add'>+	movq	initial_stack(%rip), %rsp</div><div class='add'>+	jmp	start_cpu</div><div class='ctx'> ENDPROC(start_cpu0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -328,7 +329,11 @@ ENDPROC(start_cpu0)</div><div class='ctx'> 	GLOBAL(initial_gs)</div><div class='ctx'> 	.quad	INIT_PER_CPU_VAR(irq_stack_union)</div><div class='ctx'> 	GLOBAL(initial_stack)</div><div class='del'>-	.quad  init_thread_union+THREAD_SIZE-8</div><div class='add'>+	/*</div><div class='add'>+	 * The SIZEOF_PTREGS gap is a convention which helps the in-kernel</div><div class='add'>+	 * unwinder reliably detect the end of the stack.</div><div class='add'>+	 */</div><div class='add'>+	.quad  init_thread_union + THREAD_SIZE - SIZEOF_PTREGS</div><div class='ctx'> 	__FINITDATA</div><div class='ctx'> </div><div class='ctx'> bad_address:</div><div class='head'>diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c<br/>index 274fab99169d..dc6ba5bda9fc 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/hpet.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/hpet.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/hpet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/hpet.c</a></div><div class='hunk'>@@ -352,6 +352,7 @@ static int hpet_resume(struct clock_event_device *evt, int timer)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct hpet_dev *hdev = EVT_TO_HPET_DEV(evt);</div><div class='ctx'> </div><div class='add'>+		irq_domain_deactivate_irq(irq_get_irq_data(hdev-&gt;irq));</div><div class='ctx'> 		irq_domain_activate_irq(irq_get_irq_data(hdev-&gt;irq));</div><div class='ctx'> 		disable_irq(hdev-&gt;irq);</div><div class='ctx'> 		irq_set_affinity(hdev-&gt;irq, cpumask_of(hdev-&gt;cpu));</div><div class='hunk'>@@ -791,7 +792,7 @@ static union hpet_lock hpet __cacheline_aligned = {</div><div class='ctx'> 	{ .lock = __ARCH_SPIN_LOCK_UNLOCKED, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static cycle_t read_hpet(struct clocksource *cs)</div><div class='add'>+static u64 read_hpet(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	union hpet_lock old, new;</div><div class='hunk'>@@ -802,7 +803,7 @@ static cycle_t read_hpet(struct clocksource *cs)</div><div class='ctx'> 	 * Read HPET directly if in NMI.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (in_nmi())</div><div class='del'>-		return (cycle_t)hpet_readl(HPET_COUNTER);</div><div class='add'>+		return (u64)hpet_readl(HPET_COUNTER);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Read the current state of the lock and HPET value atomically.</div><div class='hunk'>@@ -821,7 +822,7 @@ static cycle_t read_hpet(struct clocksource *cs)</div><div class='ctx'> 		WRITE_ONCE(hpet.value, new.value);</div><div class='ctx'> 		arch_spin_unlock(&amp;hpet.lock);</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='del'>-		return (cycle_t)new.value;</div><div class='add'>+		return (u64)new.value;</div><div class='ctx'> 	}</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='hunk'>@@ -843,15 +844,15 @@ contended:</div><div class='ctx'> 		new.lockval = READ_ONCE(hpet.lockval);</div><div class='ctx'> 	} while ((new.value == old.value) &amp;&amp; arch_spin_is_locked(&amp;new.lock));</div><div class='ctx'> </div><div class='del'>-	return (cycle_t)new.value;</div><div class='add'>+	return (u64)new.value;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> /*</div><div class='ctx'>  * For UP or 32-bit.</div><div class='ctx'>  */</div><div class='del'>-static cycle_t read_hpet(struct clocksource *cs)</div><div class='add'>+static u64 read_hpet(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)hpet_readl(HPET_COUNTER);</div><div class='add'>+	return (u64)hpet_readl(HPET_COUNTER);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -867,7 +868,7 @@ static struct clocksource clocksource_hpet = {</div><div class='ctx'> static int hpet_clocksource_register(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 start, now;</div><div class='del'>-	cycle_t t1;</div><div class='add'>+	u64 t1;</div><div class='ctx'> </div><div class='ctx'> 	/* Start the counter */</div><div class='ctx'> 	hpet_restart_counter();</div><div class='hunk'>@@ -1051,11 +1052,11 @@ static __init int hpet_late_init(void)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* This notifier should be called after workqueue is ready */</div><div class='del'>-	ret = cpuhp_setup_state(CPUHP_AP_X86_HPET_ONLINE, "AP_X86_HPET_ONLINE",</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_X86_HPET_ONLINE, "x86/hpet:online",</div><div class='ctx'> 				hpet_cpuhp_online, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = cpuhp_setup_state(CPUHP_X86_HPET_DEAD, "X86_HPET_DEAD", NULL,</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_X86_HPET_DEAD, "x86/hpet:dead", NULL,</div><div class='ctx'> 				hpet_cpuhp_dead);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_cpuhp;</div><div class='head'>diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c<br/>index 589b3193f102..9c3cf0944bce 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/ioport.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/ioport.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/ioport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/ioport.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -16,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='add'>+#include &lt;asm/desc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * this changes the io permissions bitmap in the current task.</div><div class='hunk'>@@ -45,6 +47,16 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)</div><div class='ctx'> 		memset(bitmap, 0xff, IO_BITMAP_BYTES);</div><div class='ctx'> 		t-&gt;io_bitmap_ptr = bitmap;</div><div class='ctx'> 		set_thread_flag(TIF_IO_BITMAP);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Now that we have an IO bitmap, we need our TSS limit to be</div><div class='add'>+		 * correct.  It's fine if we are preempted after doing this:</div><div class='add'>+		 * with TIF_IO_BITMAP set, context switches will keep our TSS</div><div class='add'>+		 * limit correct.</div><div class='add'>+		 */</div><div class='add'>+		preempt_disable();</div><div class='add'>+		refresh_tss_limit();</div><div class='add'>+		preempt_enable();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c<br/>index 9f669fdd2010..4d8183b5f113 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/irq.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> #include &lt;asm/io_apic.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='ctx'> #include &lt;asm/hw_irq.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='hunk'>@@ -265,7 +264,7 @@ void __smp_x86_platform_ipi(void)</div><div class='ctx'> 		x86_platform_ipi_callback();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_x86_platform_ipi(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry smp_x86_platform_ipi(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct pt_regs *old_regs = set_irq_regs(regs);</div><div class='ctx'> </div><div class='hunk'>@@ -316,7 +315,7 @@ __visible void smp_kvm_posted_intr_wakeup_ipi(struct pt_regs *regs)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-__visible void smp_trace_x86_platform_ipi(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry smp_trace_x86_platform_ipi(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct pt_regs *old_regs = set_irq_regs(regs);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c<br/>index 9ebd0b0e73d9..3be74fbdeff2 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/irq_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/irq_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/irq_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/irq_64.c</a></div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;asm/io_apic.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> </div><div class='ctx'> int sysctl_panic_on_stackoverflow;</div><div class='head'>diff --git a/arch/x86/kernel/irq_work.c b/arch/x86/kernel/irq_work.c<br/>index 3512ba607361..275487872be2 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/irq_work.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/irq_work.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/irq_work.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/irq_work.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> #include &lt;asm/trace/irq_vectors.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void __smp_irq_work_interrupt(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -16,14 +17,14 @@ static inline void __smp_irq_work_interrupt(void)</div><div class='ctx'> 	irq_work_run();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_irq_work_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry smp_irq_work_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	ipi_entering_ack_irq();</div><div class='ctx'> 	__smp_irq_work_interrupt();</div><div class='ctx'> 	exiting_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_trace_irq_work_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry smp_trace_irq_work_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	ipi_entering_ack_irq();</div><div class='ctx'> 	trace_irq_work_entry(IRQ_WORK_VECTOR);</div><div class='head'>diff --git a/arch/x86/kernel/itmt.c b/arch/x86/kernel/itmt.c<br/>new file mode 100644<br/>index 000000000000..f73f475d0573<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/itmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/itmt.c</a></div><div class='hunk'>@@ -0,0 +1,213 @@</div><div class='add'>+/*</div><div class='add'>+ * itmt.c: Support Intel Turbo Boost Max Technology 3.0</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright 2016 Intel Corporation</div><div class='add'>+ * Author: Tim Chen &lt;tim.c.chen@linux.intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; version 2</div><div class='add'>+ * of the License.</div><div class='add'>+ *</div><div class='add'>+ * On platforms supporting Intel Turbo Boost Max Technology 3.0, (ITMT),</div><div class='add'>+ * the maximum turbo frequencies of some cores in a CPU package may be</div><div class='add'>+ * higher than for the other cores in the same package.  In that case,</div><div class='add'>+ * better performance can be achieved by making the scheduler prefer</div><div class='add'>+ * to run tasks on the CPUs with higher max turbo frequencies.</div><div class='add'>+ *</div><div class='add'>+ * This file provides functions and data structures for enabling the</div><div class='add'>+ * scheduler to favor scheduling on cores can be boosted to a higher</div><div class='add'>+ * frequency under ITMT.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/cpuset.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sysctl.h&gt;</div><div class='add'>+#include &lt;linux/nodemask.h&gt;</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(itmt_update_mutex);</div><div class='add'>+DEFINE_PER_CPU_READ_MOSTLY(int, sched_core_priority);</div><div class='add'>+</div><div class='add'>+/* Boolean to track if system has ITMT capabilities */</div><div class='add'>+static bool __read_mostly sched_itmt_capable;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Boolean to control whether we want to move processes to cpu capable</div><div class='add'>+ * of higher turbo frequency for cpus supporting Intel Turbo Boost Max</div><div class='add'>+ * Technology 3.0.</div><div class='add'>+ *</div><div class='add'>+ * It can be set via /proc/sys/kernel/sched_itmt_enabled</div><div class='add'>+ */</div><div class='add'>+unsigned int __read_mostly sysctl_sched_itmt_enabled;</div><div class='add'>+</div><div class='add'>+static int sched_itmt_update_handler(struct ctl_table *table, int write,</div><div class='add'>+				     void __user *buffer, size_t *lenp,</div><div class='add'>+				     loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	unsigned int old_sysctl;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;itmt_update_mutex);</div><div class='add'>+</div><div class='add'>+	if (!sched_itmt_capable) {</div><div class='add'>+		mutex_unlock(&amp;itmt_update_mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	old_sysctl = sysctl_sched_itmt_enabled;</div><div class='add'>+	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);</div><div class='add'>+</div><div class='add'>+	if (!ret &amp;&amp; write &amp;&amp; old_sysctl != sysctl_sched_itmt_enabled) {</div><div class='add'>+		x86_topology_update = true;</div><div class='add'>+		rebuild_sched_domains();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;itmt_update_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int zero;</div><div class='add'>+static unsigned int one = 1;</div><div class='add'>+static struct ctl_table itmt_kern_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.procname	= "sched_itmt_enabled",</div><div class='add'>+		.data		= &amp;sysctl_sched_itmt_enabled,</div><div class='add'>+		.maxlen		= sizeof(unsigned int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= sched_itmt_update_handler,</div><div class='add'>+		.extra1		= &amp;zero,</div><div class='add'>+		.extra2		= &amp;one,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ctl_table itmt_root_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.procname	= "kernel",</div><div class='add'>+		.mode		= 0555,</div><div class='add'>+		.child		= itmt_kern_table,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ctl_table_header *itmt_sysctl_header;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sched_set_itmt_support() - Indicate platform supports ITMT</div><div class='add'>+ *</div><div class='add'>+ * This function is used by the OS to indicate to scheduler that the platform</div><div class='add'>+ * is capable of supporting the ITMT feature.</div><div class='add'>+ *</div><div class='add'>+ * The current scheme has the pstate driver detects if the system</div><div class='add'>+ * is ITMT capable and call sched_set_itmt_support.</div><div class='add'>+ *</div><div class='add'>+ * This must be done only after sched_set_itmt_core_prio</div><div class='add'>+ * has been called to set the cpus' priorities.</div><div class='add'>+ * It must not be called with cpu hot plug lock</div><div class='add'>+ * held as we need to acquire the lock to rebuild sched domains</div><div class='add'>+ * later.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success</div><div class='add'>+ */</div><div class='add'>+int sched_set_itmt_support(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;itmt_update_mutex);</div><div class='add'>+</div><div class='add'>+	if (sched_itmt_capable) {</div><div class='add'>+		mutex_unlock(&amp;itmt_update_mutex);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	itmt_sysctl_header = register_sysctl_table(itmt_root_table);</div><div class='add'>+	if (!itmt_sysctl_header) {</div><div class='add'>+		mutex_unlock(&amp;itmt_update_mutex);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sched_itmt_capable = true;</div><div class='add'>+</div><div class='add'>+	sysctl_sched_itmt_enabled = 1;</div><div class='add'>+</div><div class='add'>+	x86_topology_update = true;</div><div class='add'>+	rebuild_sched_domains();</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;itmt_update_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sched_clear_itmt_support() - Revoke platform's support of ITMT</div><div class='add'>+ *</div><div class='add'>+ * This function is used by the OS to indicate that it has</div><div class='add'>+ * revoked the platform's support of ITMT feature.</div><div class='add'>+ *</div><div class='add'>+ * It must not be called with cpu hot plug lock</div><div class='add'>+ * held as we need to acquire the lock to rebuild sched domains</div><div class='add'>+ * later.</div><div class='add'>+ */</div><div class='add'>+void sched_clear_itmt_support(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;itmt_update_mutex);</div><div class='add'>+</div><div class='add'>+	if (!sched_itmt_capable) {</div><div class='add'>+		mutex_unlock(&amp;itmt_update_mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	sched_itmt_capable = false;</div><div class='add'>+</div><div class='add'>+	if (itmt_sysctl_header) {</div><div class='add'>+		unregister_sysctl_table(itmt_sysctl_header);</div><div class='add'>+		itmt_sysctl_header = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sysctl_sched_itmt_enabled) {</div><div class='add'>+		/* disable sched_itmt if we are no longer ITMT capable */</div><div class='add'>+		sysctl_sched_itmt_enabled = 0;</div><div class='add'>+		x86_topology_update = true;</div><div class='add'>+		rebuild_sched_domains();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;itmt_update_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_asym_cpu_priority(int cpu)</div><div class='add'>+{</div><div class='add'>+	return per_cpu(sched_core_priority, cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sched_set_itmt_core_prio() - Set CPU priority based on ITMT</div><div class='add'>+ * @prio:	Priority of cpu core</div><div class='add'>+ * @core_cpu:	The cpu number associated with the core</div><div class='add'>+ *</div><div class='add'>+ * The pstate driver will find out the max boost frequency</div><div class='add'>+ * and call this function to set a priority proportional</div><div class='add'>+ * to the max boost frequency. CPU with higher boost</div><div class='add'>+ * frequency will receive higher priority.</div><div class='add'>+ *</div><div class='add'>+ * No need to rebuild sched domain after updating</div><div class='add'>+ * the CPU priorities. The sched domains have no</div><div class='add'>+ * dependency on CPU priorities.</div><div class='add'>+ */</div><div class='add'>+void sched_set_itmt_core_prio(int prio, int core_cpu)</div><div class='add'>+{</div><div class='add'>+	int cpu, i = 1;</div><div class='add'>+</div><div class='add'>+	for_each_cpu(cpu, topology_sibling_cpumask(core_cpu)) {</div><div class='add'>+		int smt_prio;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Ensure that the siblings are moved to the end</div><div class='add'>+		 * of the priority chain and only used when</div><div class='add'>+		 * all other high priority cpus are out of capacity.</div><div class='add'>+		 */</div><div class='add'>+		smt_prio = prio * smp_num_siblings / i;</div><div class='add'>+		per_cpu(sched_core_priority, cpu) = smt_prio;</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c<br/>index fc25f698d792..c37bd0f39c70 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/jump_label.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/jump_label.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/jump_label.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/jump_label.c</a></div><div class='hunk'>@@ -32,8 +32,7 @@ static void bug_at(unsigned char *ip, int line)</div><div class='ctx'> 	 * Something went wrong. Crash the box, as something could be</div><div class='ctx'> 	 * corrupting the kernel.</div><div class='ctx'> 	 */</div><div class='del'>-	pr_warning("Unexpected op at %pS [%p] (%02x %02x %02x %02x %02x) %s:%d\n",</div><div class='del'>-	       ip, ip, ip[0], ip[1], ip[2], ip[3], ip[4], __FILE__, line);</div><div class='add'>+	pr_crit("jump_label: Fatal kernel bug, unexpected op at %pS [%p] (%5ph) %d\n", ip, ip, ip, line);</div><div class='ctx'> 	BUG();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c<br/>index 3407b148c240..d0a814a9d96a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/kexec-bzimage64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/kexec-bzimage64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/kexec-bzimage64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/kexec-bzimage64.c</a></div><div class='hunk'>@@ -331,17 +331,17 @@ static void *bzImage64_load(struct kimage *image, char *kernel,</div><div class='ctx'> </div><div class='ctx'> 	struct setup_header *header;</div><div class='ctx'> 	int setup_sects, kern16_size, ret = 0;</div><div class='del'>-	unsigned long setup_header_size, params_cmdline_sz, params_misc_sz;</div><div class='add'>+	unsigned long setup_header_size, params_cmdline_sz;</div><div class='ctx'> 	struct boot_params *params;</div><div class='ctx'> 	unsigned long bootparam_load_addr, kernel_load_addr, initrd_load_addr;</div><div class='ctx'> 	unsigned long purgatory_load_addr;</div><div class='del'>-	unsigned long kernel_bufsz, kernel_memsz, kernel_align;</div><div class='del'>-	char *kernel_buf;</div><div class='ctx'> 	struct bzimage64_data *ldata;</div><div class='ctx'> 	struct kexec_entry64_regs regs64;</div><div class='ctx'> 	void *stack;</div><div class='ctx'> 	unsigned int setup_hdr_offset = offsetof(struct boot_params, hdr);</div><div class='ctx'> 	unsigned int efi_map_offset, efi_map_sz, efi_setup_data_offset;</div><div class='add'>+	struct kexec_buf kbuf = { .image = image, .buf_max = ULONG_MAX,</div><div class='add'>+				  .top_down = true };</div><div class='ctx'> </div><div class='ctx'> 	header = (struct setup_header *)(kernel + setup_hdr_offset);</div><div class='ctx'> 	setup_sects = header-&gt;setup_sects;</div><div class='hunk'>@@ -402,11 +402,11 @@ static void *bzImage64_load(struct kimage *image, char *kernel,</div><div class='ctx'> 	params_cmdline_sz = sizeof(struct boot_params) + cmdline_len +</div><div class='ctx'> 				MAX_ELFCOREHDR_STR_LEN;</div><div class='ctx'> 	params_cmdline_sz = ALIGN(params_cmdline_sz, 16);</div><div class='del'>-	params_misc_sz = params_cmdline_sz + efi_map_sz +</div><div class='add'>+	kbuf.bufsz = params_cmdline_sz + efi_map_sz +</div><div class='ctx'> 				sizeof(struct setup_data) +</div><div class='ctx'> 				sizeof(struct efi_setup_data);</div><div class='ctx'> </div><div class='del'>-	params = kzalloc(params_misc_sz, GFP_KERNEL);</div><div class='add'>+	params = kzalloc(kbuf.bufsz, GFP_KERNEL);</div><div class='ctx'> 	if (!params)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	efi_map_offset = params_cmdline_sz;</div><div class='hunk'>@@ -418,37 +418,41 @@ static void *bzImage64_load(struct kimage *image, char *kernel,</div><div class='ctx'> 	/* Is there a limit on setup header size? */</div><div class='ctx'> 	memcpy(&amp;params-&gt;hdr, (kernel + setup_hdr_offset), setup_header_size);</div><div class='ctx'> </div><div class='del'>-	ret = kexec_add_buffer(image, (char *)params, params_misc_sz,</div><div class='del'>-			       params_misc_sz, 16, MIN_BOOTPARAM_ADDR,</div><div class='del'>-			       ULONG_MAX, 1, &amp;bootparam_load_addr);</div><div class='add'>+	kbuf.buffer = params;</div><div class='add'>+	kbuf.memsz = kbuf.bufsz;</div><div class='add'>+	kbuf.buf_align = 16;</div><div class='add'>+	kbuf.buf_min = MIN_BOOTPARAM_ADDR;</div><div class='add'>+	ret = kexec_add_buffer(&amp;kbuf);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_free_params;</div><div class='add'>+	bootparam_load_addr = kbuf.mem;</div><div class='ctx'> 	pr_debug("Loaded boot_param, command line and misc at 0x%lx bufsz=0x%lx memsz=0x%lx\n",</div><div class='del'>-		 bootparam_load_addr, params_misc_sz, params_misc_sz);</div><div class='add'>+		 bootparam_load_addr, kbuf.bufsz, kbuf.bufsz);</div><div class='ctx'> </div><div class='ctx'> 	/* Load kernel */</div><div class='del'>-	kernel_buf = kernel + kern16_size;</div><div class='del'>-	kernel_bufsz =  kernel_len - kern16_size;</div><div class='del'>-	kernel_memsz = PAGE_ALIGN(header-&gt;init_size);</div><div class='del'>-	kernel_align = header-&gt;kernel_alignment;</div><div class='del'>-</div><div class='del'>-	ret = kexec_add_buffer(image, kernel_buf,</div><div class='del'>-			       kernel_bufsz, kernel_memsz, kernel_align,</div><div class='del'>-			       MIN_KERNEL_LOAD_ADDR, ULONG_MAX, 1,</div><div class='del'>-			       &amp;kernel_load_addr);</div><div class='add'>+	kbuf.buffer = kernel + kern16_size;</div><div class='add'>+	kbuf.bufsz =  kernel_len - kern16_size;</div><div class='add'>+	kbuf.memsz = PAGE_ALIGN(header-&gt;init_size);</div><div class='add'>+	kbuf.buf_align = header-&gt;kernel_alignment;</div><div class='add'>+	kbuf.buf_min = MIN_KERNEL_LOAD_ADDR;</div><div class='add'>+	ret = kexec_add_buffer(&amp;kbuf);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_free_params;</div><div class='add'>+	kernel_load_addr = kbuf.mem;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("Loaded 64bit kernel at 0x%lx bufsz=0x%lx memsz=0x%lx\n",</div><div class='del'>-		 kernel_load_addr, kernel_memsz, kernel_memsz);</div><div class='add'>+		 kernel_load_addr, kbuf.bufsz, kbuf.memsz);</div><div class='ctx'> </div><div class='ctx'> 	/* Load initrd high */</div><div class='ctx'> 	if (initrd) {</div><div class='del'>-		ret = kexec_add_buffer(image, initrd, initrd_len, initrd_len,</div><div class='del'>-				       PAGE_SIZE, MIN_INITRD_LOAD_ADDR,</div><div class='del'>-				       ULONG_MAX, 1, &amp;initrd_load_addr);</div><div class='add'>+		kbuf.buffer = initrd;</div><div class='add'>+		kbuf.bufsz = kbuf.memsz = initrd_len;</div><div class='add'>+		kbuf.buf_align = PAGE_SIZE;</div><div class='add'>+		kbuf.buf_min = MIN_INITRD_LOAD_ADDR;</div><div class='add'>+		ret = kexec_add_buffer(&amp;kbuf);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_free_params;</div><div class='add'>+		initrd_load_addr = kbuf.mem;</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",</div><div class='ctx'> 				initrd_load_addr, initrd_len, initrd_len);</div><div class='head'>diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c<br/>index d9d8d16b69db..6384eb754a58 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/kprobes/core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/kprobes/core.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/kprobes/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/kprobes/core.c</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='hunk'>@@ -56,7 +57,7 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/alternative.h&gt;</div><div class='ctx'> #include &lt;asm/insn.h&gt;</div><div class='ctx'> #include &lt;asm/debugreg.h&gt;</div><div class='hunk'>@@ -745,7 +746,7 @@ __visible __used void *trampoline_handler(struct pt_regs *regs)</div><div class='ctx'> 	 *	 will be the real return address, and all the rest will</div><div class='ctx'> 	 *	 point to kretprobe_trampoline.</div><div class='ctx'> 	 */</div><div class='del'>-	hlist_for_each_entry_safe(ri, tmp, head, hlist) {</div><div class='add'>+	hlist_for_each_entry(ri, head, hlist) {</div><div class='ctx'> 		if (ri-&gt;task != current)</div><div class='ctx'> 			/* another task is sharing our hash bucket */</div><div class='ctx'> 			continue;</div><div class='head'>diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c<br/>index 3bb4c5f021f6..3d1bee9d6a72 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/kprobes/opt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/kprobes/opt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/kprobes/opt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/kprobes/opt.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/alternative.h&gt;</div><div class='ctx'> #include &lt;asm/insn.h&gt;</div><div class='ctx'> #include &lt;asm/debugreg.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c<br/>index edbbfc854e39..14f65a5f938e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/kvm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/kvm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/kvm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/kvm.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> #include &lt;asm/apicdef.h&gt;</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='hunk'>@@ -267,13 +266,11 @@ do_async_page_fault(struct pt_regs *regs, unsigned long error_code)</div><div class='ctx'> 	case KVM_PV_REASON_PAGE_NOT_PRESENT:</div><div class='ctx'> 		/* page is swapped out by the host. */</div><div class='ctx'> 		prev_state = exception_enter();</div><div class='del'>-		exit_idle();</div><div class='ctx'> 		kvm_async_pf_task_wait((u32)read_cr2());</div><div class='ctx'> 		exception_exit(prev_state);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KVM_PV_REASON_PAGE_READY:</div><div class='ctx'> 		rcu_irq_enter();</div><div class='del'>-		exit_idle();</div><div class='ctx'> 		kvm_async_pf_task_wake((u32)read_cr2());</div><div class='ctx'> 		rcu_irq_exit();</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -308,7 +305,7 @@ static void kvm_register_steal_time(void)</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(unsigned long, kvm_apic_eoi) = KVM_PV_EOI_DISABLED;</div><div class='ctx'> </div><div class='del'>-static void kvm_guest_apic_eoi_write(u32 reg, u32 val)</div><div class='add'>+static notrace void kvm_guest_apic_eoi_write(u32 reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * This relies on __test_and_clear_bit to modify the memory</div><div class='hunk'>@@ -319,7 +316,7 @@ static void kvm_guest_apic_eoi_write(u32 reg, u32 val)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (__test_and_clear_bit(KVM_PV_EOI_BIT, this_cpu_ptr(&amp;kvm_apic_eoi)))</div><div class='ctx'> 		return;</div><div class='del'>-	apic_write(APIC_EOI, APIC_EOI_ACK);</div><div class='add'>+	apic-&gt;native_eoi_write(APIC_EOI, APIC_EOI_ACK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvm_guest_cpu_init(void)</div><div class='hunk'>@@ -592,6 +589,38 @@ out:</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+__visible bool __kvm_vcpu_is_preempted(long cpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_steal_time *src = &amp;per_cpu(steal_time, cpu);</div><div class='add'>+</div><div class='add'>+	return !!src-&gt;preempted;</div><div class='add'>+}</div><div class='add'>+PV_CALLEE_SAVE_REGS_THUNK(__kvm_vcpu_is_preempted);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+</div><div class='add'>+extern bool __raw_callee_save___kvm_vcpu_is_preempted(long);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Hand-optimize version for x86-64 to avoid 8 64-bit register saving and</div><div class='add'>+ * restoring to/from the stack.</div><div class='add'>+ */</div><div class='add'>+asm(</div><div class='add'>+".pushsection .text;"</div><div class='add'>+".global __raw_callee_save___kvm_vcpu_is_preempted;"</div><div class='add'>+".type __raw_callee_save___kvm_vcpu_is_preempted, @function;"</div><div class='add'>+"__raw_callee_save___kvm_vcpu_is_preempted:"</div><div class='add'>+"movq	__per_cpu_offset(,%rdi,8), %rax;"</div><div class='add'>+"cmpb	$0, " __stringify(KVM_STEAL_TIME_preempted) "+steal_time(%rax);"</div><div class='add'>+"setne	%al;"</div><div class='add'>+"ret;"</div><div class='add'>+".popsection");</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Setup pv_lock_ops to exploit KVM_FEATURE_PV_UNHALT if present.</div><div class='ctx'>  */</div><div class='hunk'>@@ -608,20 +637,11 @@ void __init kvm_spinlock_init(void)</div><div class='ctx'> 	pv_lock_ops.queued_spin_unlock = PV_CALLEE_SAVE(__pv_queued_spin_unlock);</div><div class='ctx'> 	pv_lock_ops.wait = kvm_wait;</div><div class='ctx'> 	pv_lock_ops.kick = kvm_kick_cpu;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static __init int kvm_spinlock_init_jump(void)</div><div class='del'>-{</div><div class='del'>-	if (!kvm_para_available())</div><div class='del'>-		return 0;</div><div class='del'>-	if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	static_key_slow_inc(&amp;paravirt_ticketlocks_enabled);</div><div class='del'>-	printk(KERN_INFO "KVM setup paravirtual spinlock\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	if (kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {</div><div class='add'>+		pv_lock_ops.vcpu_is_preempted =</div><div class='add'>+			PV_CALLEE_SAVE(__kvm_vcpu_is_preempted);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-early_initcall(kvm_spinlock_init_jump);</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_PARAVIRT_SPINLOCKS */</div><div class='head'>diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c<br/>index 60b9949f1e65..d88967659098 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/kvmclock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/kvmclock.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/kvmclock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/kvmclock.c</a></div><div class='hunk'>@@ -25,14 +25,16 @@</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/x86_init.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/kvmclock.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int kvmclock __ro_after_init = 1;</div><div class='ctx'> static int msr_kvm_system_time = MSR_KVM_SYSTEM_TIME;</div><div class='ctx'> static int msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK;</div><div class='del'>-static cycle_t kvm_sched_clock_offset;</div><div class='add'>+static u64 kvm_sched_clock_offset;</div><div class='ctx'> </div><div class='ctx'> static int parse_no_kvmclock(char *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -49,6 +51,7 @@ struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void)</div><div class='ctx'> {</div><div class='ctx'> 	return hv_clock;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(pvclock_pvti_cpu0_va);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The wallclock is the time of day when we booted. Since then, some time may</div><div class='hunk'>@@ -79,10 +82,10 @@ static int kvm_set_wallclock(const struct timespec *now)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t kvm_clock_read(void)</div><div class='add'>+static u64 kvm_clock_read(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pvclock_vcpu_time_info *src;</div><div class='del'>-	cycle_t ret;</div><div class='add'>+	u64 ret;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable_notrace();</div><div class='hunk'>@@ -93,12 +96,12 @@ static cycle_t kvm_clock_read(void)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t kvm_clock_get_cycles(struct clocksource *cs)</div><div class='add'>+static u64 kvm_clock_get_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return kvm_clock_read();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t kvm_sched_clock_read(void)</div><div class='add'>+static u64 kvm_sched_clock_read(void)</div><div class='ctx'> {</div><div class='ctx'> 	return kvm_clock_read() - kvm_sched_clock_offset;</div><div class='ctx'> }</div><div class='hunk'>@@ -107,12 +110,12 @@ static inline void kvm_sched_clock_init(bool stable)</div><div class='ctx'> {</div><div class='ctx'> 	if (!stable) {</div><div class='ctx'> 		pv_time_ops.sched_clock = kvm_clock_read;</div><div class='add'>+		clear_sched_clock_stable();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kvm_sched_clock_offset = kvm_clock_read();</div><div class='ctx'> 	pv_time_ops.sched_clock = kvm_sched_clock_read;</div><div class='del'>-	set_sched_clock_stable();</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "kvm-clock: using sched offset of %llu cycles\n",</div><div class='ctx'> 			kvm_sched_clock_offset);</div><div class='hunk'>@@ -174,13 +177,14 @@ bool kvm_check_and_clear_guest_paused(void)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct clocksource kvm_clock = {</div><div class='add'>+struct clocksource kvm_clock = {</div><div class='ctx'> 	.name = "kvm-clock",</div><div class='ctx'> 	.read = kvm_clock_get_cycles,</div><div class='ctx'> 	.rating = 400,</div><div class='ctx'> 	.mask = CLOCKSOURCE_MASK(64),</div><div class='ctx'> 	.flags = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> };</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_clock);</div><div class='ctx'> </div><div class='ctx'> int kvm_register_clock(char *txt)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c<br/>index 6707039b9032..d4a15831ac58 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/ldt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/ldt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/ldt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/ldt.c</a></div><div class='hunk'>@@ -34,10 +34,10 @@ static void flush_ldt(void *current_mm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The caller must call finalize_ldt_struct on the result. LDT starts zeroed. */</div><div class='del'>-static struct ldt_struct *alloc_ldt_struct(int size)</div><div class='add'>+static struct ldt_struct *alloc_ldt_struct(unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	struct ldt_struct *new_ldt;</div><div class='del'>-	int alloc_size;</div><div class='add'>+	unsigned int alloc_size;</div><div class='ctx'> </div><div class='ctx'> 	if (size &gt; LDT_ENTRIES)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -93,7 +93,7 @@ static void free_ldt_struct(struct ldt_struct *ldt)</div><div class='ctx'> </div><div class='ctx'> 	paravirt_free_ldt(ldt-&gt;entries, ldt-&gt;size);</div><div class='ctx'> 	if (ldt-&gt;size * LDT_ENTRY_SIZE &gt; PAGE_SIZE)</div><div class='del'>-		vfree(ldt-&gt;entries);</div><div class='add'>+		vfree_atomic(ldt-&gt;entries);</div><div class='ctx'> 	else</div><div class='ctx'> 		free_page((unsigned long)ldt-&gt;entries);</div><div class='ctx'> 	kfree(ldt);</div><div class='hunk'>@@ -207,11 +207,11 @@ static int read_default_ldt(void __user *ptr, unsigned long bytecount)</div><div class='ctx'> static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	struct ldt_struct *new_ldt, *old_ldt;</div><div class='add'>+	unsigned int oldsize, newsize;</div><div class='add'>+	struct user_desc ldt_info;</div><div class='ctx'> 	struct desc_struct ldt;</div><div class='ctx'> 	int error;</div><div class='del'>-	struct user_desc ldt_info;</div><div class='del'>-	int oldsize, newsize;</div><div class='del'>-	struct ldt_struct *new_ldt, *old_ldt;</div><div class='ctx'> </div><div class='ctx'> 	error = -EINVAL;</div><div class='ctx'> 	if (bytecount != sizeof(ldt_info))</div><div class='hunk'>@@ -249,7 +249,7 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)</div><div class='ctx'> </div><div class='ctx'> 	old_ldt = mm-&gt;context.ldt;</div><div class='ctx'> 	oldsize = old_ldt ? old_ldt-&gt;size : 0;</div><div class='del'>-	newsize = max((int)(ldt_info.entry_number + 1), oldsize);</div><div class='add'>+	newsize = max(ldt_info.entry_number + 1, oldsize);</div><div class='ctx'> </div><div class='ctx'> 	error = -ENOMEM;</div><div class='ctx'> 	new_ldt = alloc_ldt_struct(newsize);</div><div class='head'>diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c<br/>index 8c1f218926d7..307b1f4543de 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/machine_kexec_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/machine_kexec_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/machine_kexec_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/machine_kexec_64.c</a></div><div class='hunk'>@@ -328,7 +328,7 @@ void machine_kexec(struct kimage *image)</div><div class='ctx'> </div><div class='ctx'> void arch_crash_save_vmcoreinfo(void)</div><div class='ctx'> {</div><div class='del'>-	VMCOREINFO_SYMBOL(phys_base);</div><div class='add'>+	VMCOREINFO_NUMBER(phys_base);</div><div class='ctx'> 	VMCOREINFO_SYMBOL(init_level4_pgt);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='hunk'>@@ -337,9 +337,7 @@ void arch_crash_save_vmcoreinfo(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	vmcoreinfo_append_str("KERNELOFFSET=%lx\n",</div><div class='ctx'> 			      kaslr_offset());</div><div class='del'>-	VMCOREINFO_PAGE_OFFSET(PAGE_OFFSET);</div><div class='del'>-	VMCOREINFO_VMALLOC_START(VMALLOC_START);</div><div class='del'>-	VMCOREINFO_VMEMMAP_START(VMEMMAP_START);</div><div class='add'>+	VMCOREINFO_NUMBER(KERNEL_IMAGE_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* arch-dependent functionality related to kexec file-based syscall */</div><div class='head'>diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c<br/>index 7f3550acde1b..ef688804f80d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/msr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/msr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/msr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/msr.c</a></div><div class='hunk'>@@ -44,6 +44,7 @@</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct class *msr_class;</div><div class='add'>+static enum cpuhp_state cpuhp_msr_state;</div><div class='ctx'> </div><div class='ctx'> static ssize_t msr_read(struct file *file, char __user *buf,</div><div class='ctx'> 			size_t count, loff_t *ppos)</div><div class='hunk'>@@ -180,7 +181,7 @@ static const struct file_operations msr_fops = {</div><div class='ctx'> 	.compat_ioctl = msr_ioctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int msr_device_create(int cpu)</div><div class='add'>+static int msr_device_create(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> </div><div class='hunk'>@@ -189,34 +190,12 @@ static int msr_device_create(int cpu)</div><div class='ctx'> 	return PTR_ERR_OR_ZERO(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void msr_device_destroy(int cpu)</div><div class='add'>+static int msr_device_destroy(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int msr_class_cpu_callback(struct notifier_block *nfb,</div><div class='del'>-				  unsigned long action, void *hcpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_UP_PREPARE:</div><div class='del'>-		err = msr_device_create(cpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_UP_CANCELED:</div><div class='del'>-	case CPU_UP_CANCELED_FROZEN:</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-		msr_device_destroy(cpu);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return notifier_from_errno(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block __refdata msr_class_cpu_notifier = {</div><div class='del'>-	.notifier_call = msr_class_cpu_callback,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static char *msr_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "cpu/%u/msr", MINOR(dev-&gt;devt));</div><div class='hunk'>@@ -224,13 +203,11 @@ static char *msr_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> </div><div class='ctx'> static int __init msr_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i, err = 0;</div><div class='del'>-	i = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (__register_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr", &amp;msr_fops)) {</div><div class='ctx'> 		pr_err("unable to get major %d for msr\n", MSR_MAJOR);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	msr_class = class_create(THIS_MODULE, "msr");</div><div class='ctx'> 	if (IS_ERR(msr_class)) {</div><div class='hunk'>@@ -239,44 +216,27 @@ static int __init msr_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	msr_class-&gt;devnode = msr_devnode;</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-	for_each_online_cpu(i) {</div><div class='del'>-		err = msr_device_create(i);</div><div class='del'>-		if (err != 0)</div><div class='del'>-			goto out_class;</div><div class='del'>-	}</div><div class='del'>-	__register_hotcpu_notifier(&amp;msr_class_cpu_notifier);</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-	goto out;</div><div class='add'>+	err  = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/msr:online",</div><div class='add'>+				 msr_device_create, msr_device_destroy);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_class;</div><div class='add'>+	cpuhp_msr_state = err;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> out_class:</div><div class='del'>-	i = 0;</div><div class='del'>-	for_each_online_cpu(i)</div><div class='del'>-		msr_device_destroy(i);</div><div class='del'>-	cpu_notifier_register_done();</div><div class='ctx'> 	class_destroy(msr_class);</div><div class='ctx'> out_chrdev:</div><div class='ctx'> 	__unregister_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr");</div><div class='del'>-out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+module_init(msr_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit msr_exit(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu = 0;</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-	for_each_online_cpu(cpu)</div><div class='del'>-		msr_device_destroy(cpu);</div><div class='add'>+	cpuhp_remove_state(cpuhp_msr_state);</div><div class='ctx'> 	class_destroy(msr_class);</div><div class='ctx'> 	__unregister_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr");</div><div class='del'>-	__unregister_hotcpu_notifier(&amp;msr_class_cpu_notifier);</div><div class='del'>-	cpu_notifier_register_done();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-module_init(msr_init);</div><div class='ctx'> module_exit(msr_exit)</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("H. Peter Anvin &lt;hpa@zytor.com&gt;");</div><div class='head'>diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c<br/>index bfe4d6c96fbd..f088ea4c66e7 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/nmi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/nmi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/nmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/nmi.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -20,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_EDAC)</div><div class='ctx'> #include &lt;linux/edac.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c<br/>index 2c55a003b793..8f2d1c9d43a8 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/paravirt-spinlocks.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/paravirt-spinlocks.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/paravirt-spinlocks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/paravirt-spinlocks.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@ __visible void __native_queued_spin_unlock(struct qspinlock *lock)</div><div class='ctx'> {</div><div class='ctx'> 	native_queued_spin_unlock(lock);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> PV_CALLEE_SAVE_REGS_THUNK(__native_queued_spin_unlock);</div><div class='ctx'> </div><div class='ctx'> bool pv_is_native_spin_unlock(void)</div><div class='hunk'>@@ -21,15 +20,25 @@ bool pv_is_native_spin_unlock(void)</div><div class='ctx'> 		__raw_callee_save___native_queued_spin_unlock;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+__visible bool __native_vcpu_is_preempted(long cpu)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+PV_CALLEE_SAVE_REGS_THUNK(__native_vcpu_is_preempted);</div><div class='add'>+</div><div class='add'>+bool pv_is_native_vcpu_is_preempted(void)</div><div class='add'>+{</div><div class='add'>+	return pv_lock_ops.vcpu_is_preempted.func ==</div><div class='add'>+		__raw_callee_save___native_vcpu_is_preempted;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct pv_lock_ops pv_lock_ops = {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	.queued_spin_lock_slowpath = native_queued_spin_lock_slowpath,</div><div class='ctx'> 	.queued_spin_unlock = PV_CALLEE_SAVE(__native_queued_spin_unlock),</div><div class='ctx'> 	.wait = paravirt_nop,</div><div class='ctx'> 	.kick = paravirt_nop,</div><div class='add'>+	.vcpu_is_preempted = PV_CALLEE_SAVE(__native_vcpu_is_preempted),</div><div class='ctx'> #endif /* SMP */</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(pv_lock_ops);</div><div class='del'>-</div><div class='del'>-struct static_key paravirt_ticketlocks_enabled = STATIC_KEY_INIT_FALSE;</div><div class='del'>-EXPORT_SYMBOL(paravirt_ticketlocks_enabled);</div><div class='head'>diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c<br/>index bbf3d5933eaa..4797e87b0fb6 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/paravirt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/paravirt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/paravirt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/paravirt.c</a></div><div class='hunk'>@@ -328,7 +328,6 @@ __visible struct pv_cpu_ops pv_cpu_ops = {</div><div class='ctx'> 	.cpuid = native_cpuid,</div><div class='ctx'> 	.get_debugreg = native_get_debugreg,</div><div class='ctx'> 	.set_debugreg = native_set_debugreg,</div><div class='del'>-	.clts = native_clts,</div><div class='ctx'> 	.read_cr0 = native_read_cr0,</div><div class='ctx'> 	.write_cr0 = native_write_cr0,</div><div class='ctx'> 	.read_cr4 = native_read_cr4,</div><div class='hunk'>@@ -426,6 +425,7 @@ struct pv_mmu_ops pv_mmu_ops __ro_after_init = {</div><div class='ctx'> 	.pmd_clear = native_pmd_clear,</div><div class='ctx'> #endif</div><div class='ctx'> 	.set_pud = native_set_pud,</div><div class='add'>+	.set_pud_at = native_set_pud_at,</div><div class='ctx'> </div><div class='ctx'> 	.pmd_val = PTE_IDENT,</div><div class='ctx'> 	.make_pmd = PTE_IDENT,</div><div class='head'>diff --git a/arch/x86/kernel/paravirt_patch_32.c b/arch/x86/kernel/paravirt_patch_32.c<br/>index 920c6ae08592..553acbbb4d32 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/paravirt_patch_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/paravirt_patch_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/paravirt_patch_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/paravirt_patch_32.c</a></div><div class='hunk'>@@ -8,10 +8,10 @@ DEF_NATIVE(pv_cpu_ops, iret, "iret");</div><div class='ctx'> DEF_NATIVE(pv_mmu_ops, read_cr2, "mov %cr2, %eax");</div><div class='ctx'> DEF_NATIVE(pv_mmu_ops, write_cr3, "mov %eax, %cr3");</div><div class='ctx'> DEF_NATIVE(pv_mmu_ops, read_cr3, "mov %cr3, %eax");</div><div class='del'>-DEF_NATIVE(pv_cpu_ops, clts, "clts");</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PARAVIRT_SPINLOCKS)</div><div class='ctx'> DEF_NATIVE(pv_lock_ops, queued_spin_unlock, "movb $0, (%eax)");</div><div class='add'>+DEF_NATIVE(pv_lock_ops, vcpu_is_preempted, "xor %eax, %eax");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> unsigned paravirt_patch_ident_32(void *insnbuf, unsigned len)</div><div class='hunk'>@@ -27,6 +27,7 @@ unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern bool pv_is_native_spin_unlock(void);</div><div class='add'>+extern bool pv_is_native_vcpu_is_preempted(void);</div><div class='ctx'> </div><div class='ctx'> unsigned native_patch(u8 type, u16 clobbers, void *ibuf,</div><div class='ctx'> 		      unsigned long addr, unsigned len)</div><div class='hunk'>@@ -48,7 +49,6 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,</div><div class='ctx'> 		PATCH_SITE(pv_mmu_ops, read_cr2);</div><div class='ctx'> 		PATCH_SITE(pv_mmu_ops, read_cr3);</div><div class='ctx'> 		PATCH_SITE(pv_mmu_ops, write_cr3);</div><div class='del'>-		PATCH_SITE(pv_cpu_ops, clts);</div><div class='ctx'> #if defined(CONFIG_PARAVIRT_SPINLOCKS)</div><div class='ctx'> 		case PARAVIRT_PATCH(pv_lock_ops.queued_spin_unlock):</div><div class='ctx'> 			if (pv_is_native_spin_unlock()) {</div><div class='hunk'>@@ -56,9 +56,19 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,</div><div class='ctx'> 				end   = end_pv_lock_ops_queued_spin_unlock;</div><div class='ctx'> 				goto patch_site;</div><div class='ctx'> 			}</div><div class='add'>+			goto patch_default;</div><div class='add'>+</div><div class='add'>+		case PARAVIRT_PATCH(pv_lock_ops.vcpu_is_preempted):</div><div class='add'>+			if (pv_is_native_vcpu_is_preempted()) {</div><div class='add'>+				start = start_pv_lock_ops_vcpu_is_preempted;</div><div class='add'>+				end   = end_pv_lock_ops_vcpu_is_preempted;</div><div class='add'>+				goto patch_site;</div><div class='add'>+			}</div><div class='add'>+			goto patch_default;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='add'>+patch_default: __maybe_unused</div><div class='ctx'> 		ret = paravirt_patch_default(type, clobbers, ibuf, addr, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c<br/>index bb3840cedb4f..11aaf1eaa0e4 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/paravirt_patch_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/paravirt_patch_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/paravirt_patch_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/paravirt_patch_64.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@ DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");</div><div class='ctx'> DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");</div><div class='ctx'> DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");</div><div class='ctx'> DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");</div><div class='del'>-DEF_NATIVE(pv_cpu_ops, clts, "clts");</div><div class='ctx'> DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");</div><div class='ctx'> </div><div class='ctx'> DEF_NATIVE(pv_cpu_ops, usergs_sysret64, "swapgs; sysretq");</div><div class='hunk'>@@ -21,6 +20,7 @@ DEF_NATIVE(, mov64, "mov %rdi, %rax");</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PARAVIRT_SPINLOCKS)</div><div class='ctx'> DEF_NATIVE(pv_lock_ops, queued_spin_unlock, "movb $0, (%rdi)");</div><div class='add'>+DEF_NATIVE(pv_lock_ops, vcpu_is_preempted, "xor %rax, %rax");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> unsigned paravirt_patch_ident_32(void *insnbuf, unsigned len)</div><div class='hunk'>@@ -36,6 +36,7 @@ unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern bool pv_is_native_spin_unlock(void);</div><div class='add'>+extern bool pv_is_native_vcpu_is_preempted(void);</div><div class='ctx'> </div><div class='ctx'> unsigned native_patch(u8 type, u16 clobbers, void *ibuf,</div><div class='ctx'> 		      unsigned long addr, unsigned len)</div><div class='hunk'>@@ -58,7 +59,6 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,</div><div class='ctx'> 		PATCH_SITE(pv_mmu_ops, read_cr2);</div><div class='ctx'> 		PATCH_SITE(pv_mmu_ops, read_cr3);</div><div class='ctx'> 		PATCH_SITE(pv_mmu_ops, write_cr3);</div><div class='del'>-		PATCH_SITE(pv_cpu_ops, clts);</div><div class='ctx'> 		PATCH_SITE(pv_mmu_ops, flush_tlb_single);</div><div class='ctx'> 		PATCH_SITE(pv_cpu_ops, wbinvd);</div><div class='ctx'> #if defined(CONFIG_PARAVIRT_SPINLOCKS)</div><div class='hunk'>@@ -68,9 +68,19 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,</div><div class='ctx'> 				end   = end_pv_lock_ops_queued_spin_unlock;</div><div class='ctx'> 				goto patch_site;</div><div class='ctx'> 			}</div><div class='add'>+			goto patch_default;</div><div class='add'>+</div><div class='add'>+		case PARAVIRT_PATCH(pv_lock_ops.vcpu_is_preempted):</div><div class='add'>+			if (pv_is_native_vcpu_is_preempted()) {</div><div class='add'>+				start = start_pv_lock_ops_vcpu_is_preempted;</div><div class='add'>+				end   = end_pv_lock_ops_vcpu_is_preempted;</div><div class='add'>+				goto patch_site;</div><div class='add'>+			}</div><div class='add'>+			goto patch_default;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='add'>+patch_default: __maybe_unused</div><div class='ctx'> 		ret = paravirt_patch_default(type, clobbers, ibuf, addr, len);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c<br/>index 5d400ba1349d..0c150c06fa5a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/pci-calgary_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/pci-calgary_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/pci-calgary_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/pci-calgary_64.c</a></div><div class='hunk'>@@ -296,7 +296,7 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,</div><div class='ctx'> </div><div class='ctx'> 	/* were we called with bad_dma_address? */</div><div class='ctx'> 	badend = DMA_ERROR_CODE + (EMERGENCY_PAGES * PAGE_SIZE);</div><div class='del'>-	if (unlikely((dma_addr &gt;= DMA_ERROR_CODE) &amp;&amp; (dma_addr &lt; badend))) {</div><div class='add'>+	if (unlikely(dma_addr &lt; badend)) {</div><div class='ctx'> 		WARN(1, KERN_ERR "Calgary: driver tried unmapping bad DMA "</div><div class='ctx'> 		       "address 0x%Lx\n", dma_addr);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -478,7 +478,7 @@ static void calgary_free_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	free_pages((unsigned long)vaddr, get_order(size));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops calgary_dma_ops = {</div><div class='add'>+static const struct dma_map_ops calgary_dma_ops = {</div><div class='ctx'> 	.alloc = calgary_alloc_coherent,</div><div class='ctx'> 	.free = calgary_free_coherent,</div><div class='ctx'> 	.map_sg = calgary_map_sg,</div><div class='hunk'>@@ -1177,7 +1177,7 @@ static int __init calgary_init(void)</div><div class='ctx'> 		tbl = find_iommu_table(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 		if (translation_enabled(tbl))</div><div class='del'>-			dev-&gt;dev.archdata.dma_ops = &amp;calgary_dma_ops;</div><div class='add'>+			dev-&gt;dev.dma_ops = &amp;calgary_dma_ops;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1201,7 +1201,7 @@ error:</div><div class='ctx'> 		calgary_disable_translation(dev);</div><div class='ctx'> 		calgary_free_bus(dev);</div><div class='ctx'> 		pci_dev_put(dev); /* Undo calgary_init_one()'s pci_dev_get() */</div><div class='del'>-		dev-&gt;dev.archdata.dma_ops = NULL;</div><div class='add'>+		dev-&gt;dev.dma_ops = NULL;</div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c<br/>index d30c37750765..3a216ec869cd 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/pci-dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/pci-dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/pci-dma.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> static int forbid_dac __read_mostly;</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops *dma_ops = &amp;nommu_dma_ops;</div><div class='add'>+const struct dma_map_ops *dma_ops = &amp;nommu_dma_ops;</div><div class='ctx'> EXPORT_SYMBOL(dma_ops);</div><div class='ctx'> </div><div class='ctx'> static int iommu_sac_force __read_mostly;</div><div class='hunk'>@@ -91,7 +91,8 @@ again:</div><div class='ctx'> 	page = NULL;</div><div class='ctx'> 	/* CMA can be used only in the context which permits sleeping */</div><div class='ctx'> 	if (gfpflags_allow_blocking(flag)) {</div><div class='del'>-		page = dma_alloc_from_contiguous(dev, count, get_order(size));</div><div class='add'>+		page = dma_alloc_from_contiguous(dev, count, get_order(size),</div><div class='add'>+						 flag);</div><div class='ctx'> 		if (page &amp;&amp; page_to_phys(page) + size &gt; dma_mask) {</div><div class='ctx'> 			dma_release_from_contiguous(dev, page, count);</div><div class='ctx'> 			page = NULL;</div><div class='hunk'>@@ -214,7 +215,7 @@ early_param("iommu", iommu_setup);</div><div class='ctx'> </div><div class='ctx'> int dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> {</div><div class='del'>-	struct dma_map_ops *ops = get_dma_ops(dev);</div><div class='add'>+	const struct dma_map_ops *ops = get_dma_ops(dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> 	if (mask &gt; 0xffffffff &amp;&amp; forbid_dac &gt; 0) {</div><div class='head'>diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c<br/>index 00e71ce396a8..a88952ef371c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/pci-nommu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/pci-nommu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/pci-nommu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/pci-nommu.c</a></div><div class='hunk'>@@ -88,7 +88,7 @@ static void nommu_sync_sg_for_device(struct device *dev,</div><div class='ctx'> 	flush_write_buffers();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops nommu_dma_ops = {</div><div class='add'>+const struct dma_map_ops nommu_dma_ops = {</div><div class='ctx'> 	.alloc			= dma_generic_alloc_coherent,</div><div class='ctx'> 	.free			= dma_generic_free_coherent,</div><div class='ctx'> 	.map_sg			= nommu_map_sg,</div><div class='head'>diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c<br/>index b47edb8f5256..1e23577e17cf 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/pci-swiotlb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/pci-swiotlb.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/pci-swiotlb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/pci-swiotlb.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,</div><div class='ctx'> 		dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops swiotlb_dma_ops = {</div><div class='add'>+static const struct dma_map_ops swiotlb_dma_ops = {</div><div class='ctx'> 	.mapping_error = swiotlb_dma_mapping_error,</div><div class='ctx'> 	.alloc = x86_swiotlb_alloc_coherent,</div><div class='ctx'> 	.free = x86_swiotlb_free_coherent,</div><div class='hunk'>@@ -68,12 +68,10 @@ static struct dma_map_ops swiotlb_dma_ops = {</div><div class='ctx'>  */</div><div class='ctx'> int __init pci_swiotlb_detect_override(void)</div><div class='ctx'> {</div><div class='del'>-	int use_swiotlb = swiotlb | swiotlb_force;</div><div class='del'>-</div><div class='del'>-	if (swiotlb_force)</div><div class='add'>+	if (swiotlb_force == SWIOTLB_FORCE)</div><div class='ctx'> 		swiotlb = 1;</div><div class='ctx'> </div><div class='del'>-	return use_swiotlb;</div><div class='add'>+	return swiotlb;</div><div class='ctx'> }</div><div class='ctx'> IOMMU_INIT_FINISH(pci_swiotlb_detect_override,</div><div class='ctx'> 		  pci_xen_swiotlb_detect,</div><div class='head'>diff --git a/arch/x86/kernel/perf_regs.c b/arch/x86/kernel/perf_regs.c<br/>index da8cb987b973..587d887f7f17 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/perf_regs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/perf_regs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/perf_regs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/perf_regs.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/platform-quirks.c b/arch/x86/kernel/platform-quirks.c<br/>index 24a50301f150..91271122f0df 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/platform-quirks.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/platform-quirks.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/platform-quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/platform-quirks.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> void __init x86_early_init_platform_quirks(void)</div><div class='ctx'> {</div><div class='add'>+	x86_platform.legacy.i8042 = X86_LEGACY_I8042_EXPECTED_PRESENT;</div><div class='ctx'> 	x86_platform.legacy.rtc = 1;</div><div class='ctx'> 	x86_platform.legacy.reserve_bios_regions = 0;</div><div class='ctx'> 	x86_platform.legacy.devices.pnpbios = 1;</div><div class='hunk'>@@ -16,10 +17,14 @@ void __init x86_early_init_platform_quirks(void)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case X86_SUBARCH_XEN:</div><div class='ctx'> 	case X86_SUBARCH_LGUEST:</div><div class='add'>+		x86_platform.legacy.devices.pnpbios = 0;</div><div class='add'>+		x86_platform.legacy.rtc = 0;</div><div class='add'>+		break;</div><div class='ctx'> 	case X86_SUBARCH_INTEL_MID:</div><div class='ctx'> 	case X86_SUBARCH_CE4100:</div><div class='ctx'> 		x86_platform.legacy.devices.pnpbios = 0;</div><div class='ctx'> 		x86_platform.legacy.rtc = 0;</div><div class='add'>+		x86_platform.legacy.i8042 = X86_LEGACY_I8042_PLATFORM_ABSENT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c<br/>index 0888a879120f..f67591561711 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/process.c</a></div><div class='hunk'>@@ -7,6 +7,10 @@</div><div class='ctx'> #include &lt;linux/prctl.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/idle.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='hunk'>@@ -23,8 +27,7 @@</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mwait.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/internal.h&gt;</div><div class='ctx'> #include &lt;asm/debugreg.h&gt;</div><div class='hunk'>@@ -33,6 +36,7 @@</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='ctx'> #include &lt;asm/vm86.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='add'>+#include &lt;asm/desc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * per-CPU TSS segments. Threads are completely 'soft' on Linux,</div><div class='hunk'>@@ -65,22 +69,8 @@ __visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss) = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_PER_CPU_SYMBOL(cpu_tss);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-static DEFINE_PER_CPU(unsigned char, is_idle);</div><div class='del'>-static ATOMIC_NOTIFIER_HEAD(idle_notifier);</div><div class='del'>-</div><div class='del'>-void idle_notifier_register(struct notifier_block *n)</div><div class='del'>-{</div><div class='del'>-	atomic_notifier_chain_register(&amp;idle_notifier, n);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(idle_notifier_register);</div><div class='del'>-</div><div class='del'>-void idle_notifier_unregister(struct notifier_block *n)</div><div class='del'>-{</div><div class='del'>-	atomic_notifier_chain_unregister(&amp;idle_notifier, n);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(idle_notifier_unregister);</div><div class='del'>-#endif</div><div class='add'>+DEFINE_PER_CPU(bool, __tss_limit_invalid);</div><div class='add'>+EXPORT_PER_CPU_SYMBOL_GPL(__tss_limit_invalid);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * this gets called so that we can store lazy state into memory and copy the</div><div class='hunk'>@@ -227,6 +217,12 @@ void __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,</div><div class='ctx'> 		 */</div><div class='ctx'> 		memcpy(tss-&gt;io_bitmap, next-&gt;io_bitmap_ptr,</div><div class='ctx'> 		       max(prev-&gt;io_bitmap_max, next-&gt;io_bitmap_max));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure that the TSS limit is correct for the CPU</div><div class='add'>+		 * to notice the IO bitmap.</div><div class='add'>+		 */</div><div class='add'>+		refresh_tss_limit();</div><div class='ctx'> 	} else if (test_tsk_thread_flag(prev_p, TIF_IO_BITMAP)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Clear any possible leftover bits:</div><div class='hunk'>@@ -251,39 +247,10 @@ static inline void play_dead(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-void enter_idle(void)</div><div class='del'>-{</div><div class='del'>-	this_cpu_write(is_idle, 1);</div><div class='del'>-	atomic_notifier_call_chain(&amp;idle_notifier, IDLE_START, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit_idle(void)</div><div class='del'>-{</div><div class='del'>-	if (x86_test_and_clear_bit_percpu(0, is_idle) == 0)</div><div class='del'>-		return;</div><div class='del'>-	atomic_notifier_call_chain(&amp;idle_notifier, IDLE_END, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called from interrupts to signify idle end */</div><div class='del'>-void exit_idle(void)</div><div class='del'>-{</div><div class='del'>-	/* idle loop has pid 0 */</div><div class='del'>-	if (current-&gt;pid)</div><div class='del'>-		return;</div><div class='del'>-	__exit_idle();</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> void arch_cpu_idle_enter(void)</div><div class='ctx'> {</div><div class='add'>+	tsc_verify_tsc_adjust(false);</div><div class='ctx'> 	local_touch_nmi();</div><div class='del'>-	enter_idle();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void arch_cpu_idle_exit(void)</div><div class='del'>-{</div><div class='del'>-	__exit_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void arch_cpu_idle_dead(void)</div><div class='hunk'>@@ -336,59 +303,33 @@ void stop_this_cpu(void *dummy)</div><div class='ctx'> 		halt();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool amd_e400_c1e_detected;</div><div class='del'>-EXPORT_SYMBOL(amd_e400_c1e_detected);</div><div class='del'>-</div><div class='del'>-static cpumask_var_t amd_e400_c1e_mask;</div><div class='del'>-</div><div class='del'>-void amd_e400_remove_cpu(int cpu)</div><div class='del'>-{</div><div class='del'>-	if (amd_e400_c1e_mask != NULL)</div><div class='del'>-		cpumask_clear_cpu(cpu, amd_e400_c1e_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * AMD Erratum 400 aware idle routine. We check for C1E active in the interrupt</div><div class='del'>- * pending message MSR. If we detect C1E, then we handle it the same</div><div class='del'>- * way as C3 power states (local apic timer and TSC stop)</div><div class='add'>+ * AMD Erratum 400 aware idle routine. We handle it the same way as C3 power</div><div class='add'>+ * states (local apic timer and TSC stop).</div><div class='ctx'>  */</div><div class='ctx'> static void amd_e400_idle(void)</div><div class='ctx'> {</div><div class='del'>-	if (!amd_e400_c1e_detected) {</div><div class='del'>-		u32 lo, hi;</div><div class='del'>-</div><div class='del'>-		rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi);</div><div class='del'>-</div><div class='del'>-		if (lo &amp; K8_INTP_C1E_ACTIVE_MASK) {</div><div class='del'>-			amd_e400_c1e_detected = true;</div><div class='del'>-			if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC))</div><div class='del'>-				mark_tsc_unstable("TSC halt in AMD C1E");</div><div class='del'>-			pr_info("System has AMD C1E enabled\n");</div><div class='del'>-		}</div><div class='add'>+	/*</div><div class='add'>+	 * We cannot use static_cpu_has_bug() here because X86_BUG_AMD_APIC_C1E</div><div class='add'>+	 * gets set after static_cpu_has() places have been converted via</div><div class='add'>+	 * alternatives.</div><div class='add'>+	 */</div><div class='add'>+	if (!boot_cpu_has_bug(X86_BUG_AMD_APIC_C1E)) {</div><div class='add'>+		default_idle();</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (amd_e400_c1e_detected) {</div><div class='del'>-		int cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-		if (!cpumask_test_cpu(cpu, amd_e400_c1e_mask)) {</div><div class='del'>-			cpumask_set_cpu(cpu, amd_e400_c1e_mask);</div><div class='del'>-			/* Force broadcast so ACPI can not interfere. */</div><div class='del'>-			tick_broadcast_force();</div><div class='del'>-			pr_info("Switch to broadcast mode on CPU%d\n", cpu);</div><div class='del'>-		}</div><div class='del'>-		tick_broadcast_enter();</div><div class='add'>+	tick_broadcast_enter();</div><div class='ctx'> </div><div class='del'>-		default_idle();</div><div class='add'>+	default_idle();</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * The switch back from broadcast mode needs to be</div><div class='del'>-		 * called with interrupts disabled.</div><div class='del'>-		 */</div><div class='del'>-		local_irq_disable();</div><div class='del'>-		tick_broadcast_exit();</div><div class='del'>-		local_irq_enable();</div><div class='del'>-	} else</div><div class='del'>-		default_idle();</div><div class='add'>+	/*</div><div class='add'>+	 * The switch back from broadcast mode needs to be called with</div><div class='add'>+	 * interrupts disabled.</div><div class='add'>+	 */</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	tick_broadcast_exit();</div><div class='add'>+	local_irq_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -448,8 +389,7 @@ void select_idle_routine(const struct cpuinfo_x86 *c)</div><div class='ctx'> 	if (x86_idle || boot_option_idle_override == IDLE_POLL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (cpu_has_bug(c, X86_BUG_AMD_APIC_C1E)) {</div><div class='del'>-		/* E400: APIC timer interrupt does not wake up CPU from C1e */</div><div class='add'>+	if (boot_cpu_has_bug(X86_BUG_AMD_E400)) {</div><div class='ctx'> 		pr_info("using AMD E400 aware idle routine\n");</div><div class='ctx'> 		x86_idle = amd_e400_idle;</div><div class='ctx'> 	} else if (prefer_mwait_c1_over_halt(c)) {</div><div class='hunk'>@@ -459,11 +399,37 @@ void select_idle_routine(const struct cpuinfo_x86 *c)</div><div class='ctx'> 		x86_idle = default_idle;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init init_amd_e400_c1e_mask(void)</div><div class='add'>+void amd_e400_c1e_apic_setup(void)</div><div class='add'>+{</div><div class='add'>+	if (boot_cpu_has_bug(X86_BUG_AMD_APIC_C1E)) {</div><div class='add'>+		pr_info("Switch to broadcast mode on CPU%d\n", smp_processor_id());</div><div class='add'>+		local_irq_disable();</div><div class='add'>+		tick_broadcast_force();</div><div class='add'>+		local_irq_enable();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init arch_post_acpi_subsys_init(void)</div><div class='ctx'> {</div><div class='del'>-	/* If we're using amd_e400_idle, we need to allocate amd_e400_c1e_mask. */</div><div class='del'>-	if (x86_idle == amd_e400_idle)</div><div class='del'>-		zalloc_cpumask_var(&amp;amd_e400_c1e_mask, GFP_KERNEL);</div><div class='add'>+	u32 lo, hi;</div><div class='add'>+</div><div class='add'>+	if (!boot_cpu_has_bug(X86_BUG_AMD_E400))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * AMD E400 detection needs to happen after ACPI has been enabled. If</div><div class='add'>+	 * the machine is affected K8_INTP_C1E_ACTIVE_MASK bits are set in</div><div class='add'>+	 * MSR_K8_INT_PENDING_MSG.</div><div class='add'>+	 */</div><div class='add'>+	rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi);</div><div class='add'>+	if (!(lo &amp; K8_INTP_C1E_ACTIVE_MASK))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	boot_cpu_set_bug(X86_BUG_AMD_APIC_C1E);</div><div class='add'>+</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC))</div><div class='add'>+		mark_tsc_unstable("TSC halt in AMD C1E");</div><div class='add'>+	pr_info("System has AMD C1E enabled\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init idle_setup(char *str)</div><div class='head'>diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c<br/>index bd7be8efdc4c..4c818f8bc135 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/process_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/process_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/process_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/process_32.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -49,11 +51,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> #include &lt;asm/debugreg.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include &lt;asm/vm86.h&gt;</div><div class='add'>+#include &lt;asm/intel_rdt.h&gt;</div><div class='ctx'> </div><div class='ctx'> void __show_regs(struct pt_regs *regs, int all)</div><div class='ctx'> {</div><div class='hunk'>@@ -72,10 +74,9 @@ void __show_regs(struct pt_regs *regs, int all)</div><div class='ctx'> 		savesegment(gs, gs);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEFAULT "EIP: %04x:[&lt;%08lx&gt;] EFLAGS: %08lx CPU: %d\n",</div><div class='del'>-			(u16)regs-&gt;cs, regs-&gt;ip, regs-&gt;flags,</div><div class='del'>-			smp_processor_id());</div><div class='del'>-	print_symbol("EIP is at %s\n", regs-&gt;ip);</div><div class='add'>+	printk(KERN_DEFAULT "EIP: %pS\n", (void *)regs-&gt;ip);</div><div class='add'>+	printk(KERN_DEFAULT "EFLAGS: %08lx CPU: %d\n", regs-&gt;flags,</div><div class='add'>+		smp_processor_id());</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",</div><div class='ctx'> 		regs-&gt;ax, regs-&gt;bx, regs-&gt;cx, regs-&gt;dx);</div><div class='hunk'>@@ -232,11 +233,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	struct fpu *next_fpu = &amp;next-&gt;fpu;</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> 	struct tss_struct *tss = &amp;per_cpu(cpu_tss, cpu);</div><div class='del'>-	fpu_switch_t fpu_switch;</div><div class='ctx'> </div><div class='ctx'> 	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */</div><div class='ctx'> </div><div class='del'>-	fpu_switch = switch_fpu_prepare(prev_fpu, next_fpu, cpu);</div><div class='add'>+	switch_fpu_prepare(prev_fpu, cpu);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Save away %gs. No need to save %fs, as it was saved on the</div><div class='hunk'>@@ -295,9 +295,12 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	if (prev-&gt;gs | next-&gt;gs)</div><div class='ctx'> 		lazy_load_gs(next-&gt;gs);</div><div class='ctx'> </div><div class='del'>-	switch_fpu_finish(next_fpu, fpu_switch);</div><div class='add'>+	switch_fpu_finish(next_fpu, cpu);</div><div class='ctx'> </div><div class='ctx'> 	this_cpu_write(current_task, next_p);</div><div class='ctx'> </div><div class='add'>+	/* Load the Intel cache allocation PQR MSR. */</div><div class='add'>+	intel_rdt_sched_in();</div><div class='add'>+</div><div class='ctx'> 	return prev_p;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c<br/>index b3760b3c1ca0..d6b784a5520d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/process_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/process_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/process_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/process_64.c</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -44,12 +46,12 @@</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm/ia32.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/syscalls.h&gt;</div><div class='ctx'> #include &lt;asm/debugreg.h&gt;</div><div class='ctx'> #include &lt;asm/switch_to.h&gt;</div><div class='ctx'> #include &lt;asm/xen/hypervisor.h&gt;</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='add'>+#include &lt;asm/intel_rdt.h&gt;</div><div class='ctx'> </div><div class='ctx'> __visible DEFINE_PER_CPU(unsigned long, rsp_scratch);</div><div class='ctx'> </div><div class='hunk'>@@ -61,10 +63,15 @@ void __show_regs(struct pt_regs *regs, int all)</div><div class='ctx'> 	unsigned int fsindex, gsindex;</div><div class='ctx'> 	unsigned int ds, cs, es;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEFAULT "RIP: %04lx:[&lt;%016lx&gt;] ", regs-&gt;cs &amp; 0xffff, regs-&gt;ip);</div><div class='del'>-	printk_address(regs-&gt;ip);</div><div class='del'>-	printk(KERN_DEFAULT "RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs-&gt;ss,</div><div class='del'>-			regs-&gt;sp, regs-&gt;flags);</div><div class='add'>+	printk(KERN_DEFAULT "RIP: %04lx:%pS\n", regs-&gt;cs &amp; 0xffff,</div><div class='add'>+		(void *)regs-&gt;ip);</div><div class='add'>+	printk(KERN_DEFAULT "RSP: %04lx:%016lx EFLAGS: %08lx", regs-&gt;ss,</div><div class='add'>+		regs-&gt;sp, regs-&gt;flags);</div><div class='add'>+	if (regs-&gt;orig_ax != -1)</div><div class='add'>+		pr_cont(" ORIG_RAX: %016lx\n", regs-&gt;orig_ax);</div><div class='add'>+	else</div><div class='add'>+		pr_cont("\n");</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n",</div><div class='ctx'> 	       regs-&gt;ax, regs-&gt;bx, regs-&gt;cx);</div><div class='ctx'> 	printk(KERN_DEFAULT "RDX: %016lx RSI: %016lx RDI: %016lx\n",</div><div class='hunk'>@@ -265,9 +272,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> 	struct tss_struct *tss = &amp;per_cpu(cpu_tss, cpu);</div><div class='ctx'> 	unsigned prev_fsindex, prev_gsindex;</div><div class='del'>-	fpu_switch_t fpu_switch;</div><div class='ctx'> </div><div class='del'>-	fpu_switch = switch_fpu_prepare(prev_fpu, next_fpu, cpu);</div><div class='add'>+	switch_fpu_prepare(prev_fpu, cpu);</div><div class='ctx'> </div><div class='ctx'> 	/* We must save %fs and %gs before load_TLS() because</div><div class='ctx'> 	 * %fs and %gs may be cleared by load_TLS().</div><div class='hunk'>@@ -417,7 +423,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 		prev-&gt;gsbase = 0;</div><div class='ctx'> 	prev-&gt;gsindex = prev_gsindex;</div><div class='ctx'> </div><div class='del'>-	switch_fpu_finish(next_fpu, fpu_switch);</div><div class='add'>+	switch_fpu_finish(next_fpu, cpu);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Switch the PDA and FPU contexts.</div><div class='hunk'>@@ -473,6 +479,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)</div><div class='ctx'> 			loadsegment(ss, __KERNEL_DS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Load the Intel cache allocation PQR MSR. */</div><div class='add'>+	intel_rdt_sched_in();</div><div class='add'>+</div><div class='ctx'> 	return prev_p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c<br/>index 0e63c0267f99..2364b23ea3e5 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/ptrace.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -24,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/context_tracking.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/internal.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c<br/>index 5b2cc889ce34..5c3f6d6a5078 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/pvclock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/pvclock.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/pvclock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/pvclock.c</a></div><div class='hunk'>@@ -21,6 +21,8 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/nmi.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #include &lt;asm/pvclock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -71,10 +73,10 @@ u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)</div><div class='ctx'> 	return flags &amp; valid_flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)</div><div class='add'>+u64 pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned version;</div><div class='del'>-	cycle_t ret;</div><div class='add'>+	u64 ret;</div><div class='ctx'> 	u64 last;</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c<br/>index 79c6311cd912..5b21cb7d84d6 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/rtc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/rtc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/rtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/rtc.c</a></div><div class='hunk'>@@ -64,6 +64,15 @@ void mach_get_cmos_time(struct timespec *now)</div><div class='ctx'> 	unsigned int status, year, mon, day, hour, min, sec, century = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If pm_trace abused the RTC as storage, set the timespec to 0,</div><div class='add'>+	 * which tells the caller that this RTC value is unusable.</div><div class='add'>+	 */</div><div class='add'>+	if (!pm_trace_rtc_valid()) {</div><div class='add'>+		now-&gt;tv_sec = now-&gt;tv_nsec = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;rtc_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c<br/>index 9c337b0e8ba7..4bf0c8926a1c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/setup.c</a></div><div class='hunk'>@@ -575,7 +575,9 @@ static void __init reserve_crashkernel(void)</div><div class='ctx'> 	/* 0 means: find the address automatically */</div><div class='ctx'> 	if (crash_base &lt;= 0) {</div><div class='ctx'> 		/*</div><div class='del'>-		 *  kexec want bzImage is below CRASH_KERNEL_ADDR_MAX</div><div class='add'>+		 * Set CRASH_ADDR_LOW_MAX upper bound for crash memory,</div><div class='add'>+		 * as old kexec-tools loads bzImage below that, unless</div><div class='add'>+		 * "crashkernel=size[KMG],high" is specified.</div><div class='ctx'> 		 */</div><div class='ctx'> 		crash_base = memblock_find_in_range(CRASH_ALIGN,</div><div class='ctx'> 						    high ? CRASH_ADDR_HIGH_MAX</div><div class='hunk'>@@ -985,6 +987,30 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> </div><div class='ctx'> 	parse_early_param();</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MEMORY_HOTPLUG</div><div class='add'>+	/*</div><div class='add'>+	 * Memory used by the kernel cannot be hot-removed because Linux</div><div class='add'>+	 * cannot migrate the kernel pages. When memory hotplug is</div><div class='add'>+	 * enabled, we should prevent memblock from allocating memory</div><div class='add'>+	 * for the kernel.</div><div class='add'>+	 *</div><div class='add'>+	 * ACPI SRAT records all hotpluggable memory ranges. But before</div><div class='add'>+	 * SRAT is parsed, we don't know about it.</div><div class='add'>+	 *</div><div class='add'>+	 * The kernel image is loaded into memory at very early time. We</div><div class='add'>+	 * cannot prevent this anyway. So on NUMA system, we set any</div><div class='add'>+	 * node the kernel resides in as un-hotpluggable.</div><div class='add'>+	 *</div><div class='add'>+	 * Since on modern servers, one node could have double-digit</div><div class='add'>+	 * gigabytes memory, we can assume the memory around the kernel</div><div class='add'>+	 * image is also un-hotpluggable. So before SRAT is parsed, just</div><div class='add'>+	 * allocate memory near the kernel image to try the best to keep</div><div class='add'>+	 * the kernel away from hotpluggable memory.</div><div class='add'>+	 */</div><div class='add'>+	if (movable_node_is_enabled())</div><div class='add'>+		memblock_set_bottom_up(true);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	x86_report_nx();</div><div class='ctx'> </div><div class='ctx'> 	/* after early param, so could get panic from serial */</div><div class='hunk'>@@ -1152,6 +1178,20 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	/* Allocate bigger log buffer */</div><div class='ctx'> 	setup_log_buf(1);</div><div class='ctx'> </div><div class='add'>+	if (efi_enabled(EFI_BOOT)) {</div><div class='add'>+		switch (boot_params.secure_boot) {</div><div class='add'>+		case efi_secureboot_mode_disabled:</div><div class='add'>+			pr_info("Secure boot disabled\n");</div><div class='add'>+			break;</div><div class='add'>+		case efi_secureboot_mode_enabled:</div><div class='add'>+			pr_info("Secure boot enabled\n");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			pr_info("Secure boot could not be determined\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	reserve_initrd();</div><div class='ctx'> </div><div class='ctx'> 	acpi_table_upgrade();</div><div class='head'>diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c<br/>index 2bbd27f89802..9820d6d977c6 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/setup_percpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/setup_percpu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/setup_percpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/setup_percpu.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/pfn.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;asm/apicdef.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c<br/>index 763af1d0de64..396c042e9d0e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/signal.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c<br/>index c00cb64bc0a1..d3c66a15bbde 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/smp.c</a></div><div class='hunk'>@@ -259,18 +259,16 @@ static inline void __smp_reschedule_interrupt(void)</div><div class='ctx'> 	scheduler_ipi();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_reschedule_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry smp_reschedule_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	irq_enter();</div><div class='ctx'> 	ack_APIC_irq();</div><div class='ctx'> 	__smp_reschedule_interrupt();</div><div class='del'>-	irq_exit();</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * KVM uses this interrupt to force a cpu out of guest mode</div><div class='ctx'> 	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_trace_reschedule_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry smp_trace_reschedule_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Need to call irq_enter() before calling the trace point.</div><div class='hunk'>@@ -294,14 +292,15 @@ static inline void __smp_call_function_interrupt(void)</div><div class='ctx'> 	inc_irq_stat(irq_call_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_call_function_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry smp_call_function_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	ipi_entering_ack_irq();</div><div class='ctx'> 	__smp_call_function_interrupt();</div><div class='ctx'> 	exiting_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_trace_call_function_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry</div><div class='add'>+smp_trace_call_function_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	ipi_entering_ack_irq();</div><div class='ctx'> 	trace_call_function_entry(CALL_FUNCTION_VECTOR);</div><div class='hunk'>@@ -316,14 +315,16 @@ static inline void __smp_call_function_single_interrupt(void)</div><div class='ctx'> 	inc_irq_stat(irq_call_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_call_function_single_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry</div><div class='add'>+smp_call_function_single_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	ipi_entering_ack_irq();</div><div class='ctx'> 	__smp_call_function_single_interrupt();</div><div class='ctx'> 	exiting_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__visible void smp_trace_call_function_single_interrupt(struct pt_regs *regs)</div><div class='add'>+__visible void __irq_entry</div><div class='add'>+smp_trace_call_function_single_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	ipi_entering_ack_irq();</div><div class='ctx'> 	trace_call_function_single_entry(CALL_FUNCTION_SINGLE_VECTOR);</div><div class='head'>diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c<br/>index 42f5eb7b4f6c..bd1f1ad35284 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/smpboot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/smpboot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/smpboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/smpboot.c</a></div><div class='hunk'>@@ -45,6 +45,9 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/topology.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -58,7 +61,6 @@</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/realmode.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/numa.h&gt;</div><div class='hunk'>@@ -104,11 +106,21 @@ static unsigned int max_physical_pkg_id __read_mostly;</div><div class='ctx'> unsigned int __max_logical_packages __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(__max_logical_packages);</div><div class='ctx'> static unsigned int logical_packages __read_mostly;</div><div class='del'>-static bool logical_packages_frozen __read_mostly;</div><div class='ctx'> </div><div class='ctx'> /* Maximum number of SMT threads on any online core */</div><div class='ctx'> int __max_smt_threads __read_mostly;</div><div class='ctx'> </div><div class='add'>+/* Flag to indicate if a complete sched domain rebuild is required */</div><div class='add'>+bool x86_topology_update;</div><div class='add'>+</div><div class='add'>+int arch_update_cpu_topology(void)</div><div class='add'>+{</div><div class='add'>+	int retval = x86_topology_update;</div><div class='add'>+</div><div class='add'>+	x86_topology_update = false;</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -263,9 +275,14 @@ static void notrace start_secondary(void *unused)</div><div class='ctx'> 	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int topology_update_package_map(unsigned int apicid, unsigned int cpu)</div><div class='add'>+/**</div><div class='add'>+ * topology_update_package_map - Update the physical to logical package map</div><div class='add'>+ * @pkg:	The physical package id as retrieved via CPUID</div><div class='add'>+ * @cpu:	The cpu for which this is updated</div><div class='add'>+ */</div><div class='add'>+int topology_update_package_map(unsigned int pkg, unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int new, pkg = apicid &gt;&gt; boot_cpu_data.x86_coreid_bits;</div><div class='add'>+	unsigned int new;</div><div class='ctx'> </div><div class='ctx'> 	/* Called from early boot ? */</div><div class='ctx'> 	if (!physical_package_map)</div><div class='hunk'>@@ -278,16 +295,17 @@ int topology_update_package_map(unsigned int apicid, unsigned int cpu)</div><div class='ctx'> 	if (test_and_set_bit(pkg, physical_package_map))</div><div class='ctx'> 		goto found;</div><div class='ctx'> </div><div class='del'>-	if (logical_packages_frozen) {</div><div class='del'>-		physical_to_logical_pkg[pkg] = -1;</div><div class='del'>-		pr_warn("APIC(%x) Package %u exceeds logical package max\n",</div><div class='del'>-			apicid, pkg);</div><div class='add'>+	if (logical_packages &gt;= __max_logical_packages) {</div><div class='add'>+		pr_warn("Package %u of CPU %u exceeds BIOS package data %u.\n",</div><div class='add'>+			logical_packages, cpu, __max_logical_packages);</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	new = logical_packages++;</div><div class='del'>-	pr_info("APIC(%x) Converting physical %u to logical package %u\n",</div><div class='del'>-		apicid, pkg, new);</div><div class='add'>+	if (new != pkg) {</div><div class='add'>+		pr_info("CPU %u Converting physical %u to logical package %u\n",</div><div class='add'>+			cpu, pkg, new);</div><div class='add'>+	}</div><div class='ctx'> 	physical_to_logical_pkg[pkg] = new;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='hunk'>@@ -308,9 +326,9 @@ int topology_phys_to_logical_pkg(unsigned int phys_pkg)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(topology_phys_to_logical_pkg);</div><div class='ctx'> </div><div class='del'>-static void __init smp_init_package_map(void)</div><div class='add'>+static void __init smp_init_package_map(struct cpuinfo_x86 *c, unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int ncpus, cpu;</div><div class='add'>+	unsigned int ncpus;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -355,27 +373,9 @@ static void __init smp_init_package_map(void)</div><div class='ctx'> 	size = BITS_TO_LONGS(max_physical_pkg_id) * sizeof(unsigned long);</div><div class='ctx'> 	physical_package_map = kzalloc(size, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	for_each_present_cpu(cpu) {</div><div class='del'>-		unsigned int apicid = apic-&gt;cpu_present_to_apicid(cpu);</div><div class='del'>-</div><div class='del'>-		if (apicid == BAD_APICID || !apic-&gt;apic_id_valid(apicid))</div><div class='del'>-			continue;</div><div class='del'>-		if (!topology_update_package_map(apicid, cpu))</div><div class='del'>-			continue;</div><div class='del'>-		pr_warn("CPU %u APICId %x disabled\n", cpu, apicid);</div><div class='del'>-		per_cpu(x86_bios_cpu_apicid, cpu) = BAD_APICID;</div><div class='del'>-		set_cpu_possible(cpu, false);</div><div class='del'>-		set_cpu_present(cpu, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (logical_packages &gt; __max_logical_packages) {</div><div class='del'>-		pr_warn("Detected more packages (%u), then computed by BIOS data (%u).\n",</div><div class='del'>-			logical_packages, __max_logical_packages);</div><div class='del'>-		logical_packages_frozen = true;</div><div class='del'>-		__max_logical_packages  = logical_packages;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	pr_info("Max logical packages: %u\n", __max_logical_packages);</div><div class='add'>+</div><div class='add'>+	topology_update_package_map(c-&gt;phys_proc_id, cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init smp_store_boot_cpu_info(void)</div><div class='hunk'>@@ -385,7 +385,7 @@ void __init smp_store_boot_cpu_info(void)</div><div class='ctx'> </div><div class='ctx'> 	*c = boot_cpu_data;</div><div class='ctx'> 	c-&gt;cpu_index = id;</div><div class='del'>-	smp_init_package_map();</div><div class='add'>+	smp_init_package_map(c, id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -436,9 +436,15 @@ static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)</div><div class='ctx'> 		int cpu1 = c-&gt;cpu_index, cpu2 = o-&gt;cpu_index;</div><div class='ctx'> </div><div class='ctx'> 		if (c-&gt;phys_proc_id == o-&gt;phys_proc_id &amp;&amp;</div><div class='del'>-		    per_cpu(cpu_llc_id, cpu1) == per_cpu(cpu_llc_id, cpu2) &amp;&amp;</div><div class='del'>-		    c-&gt;cpu_core_id == o-&gt;cpu_core_id)</div><div class='del'>-			return topology_sane(c, o, "smt");</div><div class='add'>+		    per_cpu(cpu_llc_id, cpu1) == per_cpu(cpu_llc_id, cpu2)) {</div><div class='add'>+			if (c-&gt;cpu_core_id == o-&gt;cpu_core_id)</div><div class='add'>+				return topology_sane(c, o, "smt");</div><div class='add'>+</div><div class='add'>+			if ((c-&gt;cu_id != 0xff) &amp;&amp;</div><div class='add'>+			    (o-&gt;cu_id != 0xff) &amp;&amp;</div><div class='add'>+			    (c-&gt;cu_id == o-&gt;cu_id))</div><div class='add'>+				return topology_sane(c, o, "smt");</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	} else if (c-&gt;phys_proc_id == o-&gt;phys_proc_id &amp;&amp;</div><div class='ctx'> 		   c-&gt;cpu_core_id == o-&gt;cpu_core_id) {</div><div class='hunk'>@@ -471,22 +477,42 @@ static bool match_die(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_SCHED_SMT) || defined(CONFIG_SCHED_MC)</div><div class='add'>+static inline int x86_sched_itmt_flags(void)</div><div class='add'>+{</div><div class='add'>+	return sysctl_sched_itmt_enabled ? SD_ASYM_PACKING : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SCHED_MC</div><div class='add'>+static int x86_core_flags(void)</div><div class='add'>+{</div><div class='add'>+	return cpu_core_flags() | x86_sched_itmt_flags();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SCHED_SMT</div><div class='add'>+static int x86_smt_flags(void)</div><div class='add'>+{</div><div class='add'>+	return cpu_smt_flags() | x86_sched_itmt_flags();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct sched_domain_topology_level x86_numa_in_package_topology[] = {</div><div class='ctx'> #ifdef CONFIG_SCHED_SMT</div><div class='del'>-	{ cpu_smt_mask, cpu_smt_flags, SD_INIT_NAME(SMT) },</div><div class='add'>+	{ cpu_smt_mask, x86_smt_flags, SD_INIT_NAME(SMT) },</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_SCHED_MC</div><div class='del'>-	{ cpu_coregroup_mask, cpu_core_flags, SD_INIT_NAME(MC) },</div><div class='add'>+	{ cpu_coregroup_mask, x86_core_flags, SD_INIT_NAME(MC) },</div><div class='ctx'> #endif</div><div class='ctx'> 	{ NULL, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sched_domain_topology_level x86_topology[] = {</div><div class='ctx'> #ifdef CONFIG_SCHED_SMT</div><div class='del'>-	{ cpu_smt_mask, cpu_smt_flags, SD_INIT_NAME(SMT) },</div><div class='add'>+	{ cpu_smt_mask, x86_smt_flags, SD_INIT_NAME(SMT) },</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_SCHED_MC</div><div class='del'>-	{ cpu_coregroup_mask, cpu_core_flags, SD_INIT_NAME(MC) },</div><div class='add'>+	{ cpu_coregroup_mask, x86_core_flags, SD_INIT_NAME(MC) },</div><div class='ctx'> #endif</div><div class='ctx'> 	{ cpu_cpu_mask, SD_INIT_NAME(DIE) },</div><div class='ctx'> 	{ NULL, },</div><div class='hunk'>@@ -821,14 +847,6 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)</div><div class='ctx'> 	return (send_status | accept_status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void smp_announce(void)</div><div class='del'>-{</div><div class='del'>-	int num_nodes = num_online_nodes();</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "x86: Booted up %d node%s, %d CPUs\n",</div><div class='del'>-	       num_nodes, (num_nodes &gt; 1 ? "s" : ""), num_online_cpus());</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* reduce the number of lines printed when booting a large cpu count system */</div><div class='ctx'> static void announce_cpu(int cpu, int apicid)</div><div class='ctx'> {</div><div class='hunk'>@@ -964,9 +982,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)</div><div class='ctx'> 	int cpu0_nmi_registered = 0;</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> </div><div class='del'>-	idle-&gt;thread.sp = (unsigned long) (((struct pt_regs *)</div><div class='del'>-			  (THREAD_SIZE +  task_stack_page(idle))) - 1);</div><div class='del'>-</div><div class='add'>+	idle-&gt;thread.sp = (unsigned long)task_pt_regs(idle);</div><div class='ctx'> 	early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);</div><div class='ctx'> 	initial_code = (unsigned long)start_secondary;</div><div class='ctx'> 	initial_stack  = idle-&gt;thread.sp;</div><div class='hunk'>@@ -1111,7 +1127,7 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* the FPU context is blank, nobody can own it */</div><div class='del'>-	__cpu_disable_lazy_restore(cpu);</div><div class='add'>+	per_cpu(fpu_fpregs_owner_ctx, cpu) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	common_cpu_up(cpu, tidle);</div><div class='ctx'> </div><div class='hunk'>@@ -1331,11 +1347,10 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	default_setup_apic_routing();</div><div class='ctx'> 	cpu0_logical_apicid = apic_bsp_setup(false);</div><div class='ctx'> </div><div class='del'>-	pr_info("CPU%d: ", 0);</div><div class='add'>+	pr_info("CPU0: ");</div><div class='ctx'> 	print_cpu_info(&amp;cpu_data(0));</div><div class='ctx'> </div><div class='del'>-	if (is_uv_system())</div><div class='del'>-		uv_system_init();</div><div class='add'>+	uv_system_init();</div><div class='ctx'> </div><div class='ctx'> 	set_mtrr_aps_delayed_init();</div><div class='ctx'> </div><div class='hunk'>@@ -1456,15 +1471,15 @@ __init void prefill_possible_map(void)</div><div class='ctx'> 		possible = i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	nr_cpu_ids = possible;</div><div class='add'>+</div><div class='ctx'> 	pr_info("Allowing %d CPUs, %d hotplug CPUs\n",</div><div class='ctx'> 		possible, max_t(int, possible - num_processors, 0));</div><div class='ctx'> </div><div class='add'>+	reset_cpu_possible_mask();</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; possible; i++)</div><div class='ctx'> 		set_cpu_possible(i, true);</div><div class='del'>-	for (; i &lt; NR_CPUS; i++)</div><div class='del'>-		set_cpu_possible(i, false);</div><div class='del'>-</div><div class='del'>-	nr_cpu_ids = possible;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='hunk'>@@ -1575,7 +1590,6 @@ void play_dead_common(void)</div><div class='ctx'> {</div><div class='ctx'> 	idle_task_exit();</div><div class='ctx'> 	reset_lazy_tlbstate();</div><div class='del'>-	amd_e400_remove_cpu(raw_smp_processor_id());</div><div class='ctx'> </div><div class='ctx'> 	/* Ack it */</div><div class='ctx'> 	(void)cpu_report_death();</div><div class='head'>diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c<br/>index 0653788026e2..8e2b79b88e51 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/stacktrace.c</a></div><div class='hunk'>@@ -4,6 +4,8 @@</div><div class='ctx'>  *  Copyright (C) 2006-2009 Red Hat, Inc., Ingo Molnar &lt;mingo@redhat.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c<br/>index a23ce84a3f6c..f07f83b3611b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/step.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/step.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/step.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/step.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * x86 single-step support code, common to 32-bit and 64-bit.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c<br/>index a55ed63b9f91..50215a4b9347 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/sys_x86_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/sys_x86_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/sys_x86_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/sys_x86_64.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c<br/>index 8402907825b0..b868fa1b812b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/tboot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/tboot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/tboot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tboot.c</a></div><div class='hunk'>@@ -408,7 +408,7 @@ static __init int tboot_late_init(void)</div><div class='ctx'> 	tboot_create_trampoline();</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;ap_wfs_count, 0);</div><div class='del'>-	cpuhp_setup_state(CPUHP_AP_X86_TBOOT_DYING, "AP_X86_TBOOT_DYING", NULL,</div><div class='add'>+	cpuhp_setup_state(CPUHP_AP_X86_TBOOT_DYING, "x86/tboot:dying", NULL,</div><div class='ctx'> 			  tboot_dying_cpu);</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	debugfs_create_file("tboot_log", S_IRUSR,</div><div class='head'>diff --git a/arch/x86/kernel/test_nx.c b/arch/x86/kernel/test_nx.c<br/>deleted file mode 100644<br/>index 27538f183c3b..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/test_nx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/test_nx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,173 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * test_nx.c: functional test for NX functionality</div><div class='del'>- *</div><div class='del'>- * (C) Copyright 2008 Intel Corporation</div><div class='del'>- * Author: Arjan van de Ven &lt;arjan@linux.intel.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; version 2</div><div class='del'>- * of the License.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/sort.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/asm.h&gt;</div><div class='del'>-</div><div class='del'>-extern int rodata_test_data;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This file checks 4 things:</div><div class='del'>- * 1) Check if the stack is not executable</div><div class='del'>- * 2) Check if kmalloc memory is not executable</div><div class='del'>- * 3) Check if the .rodata section is not executable</div><div class='del'>- * 4) Check if the .data section of a module is not executable</div><div class='del'>- *</div><div class='del'>- * To do this, the test code tries to execute memory in stack/kmalloc/etc,</div><div class='del'>- * and then checks if the expected trap happens.</div><div class='del'>- *</div><div class='del'>- * Sadly, this implies having a dynamic exception handling table entry.</div><div class='del'>- * ... which can be done (and will make Rusty cry)... but it can only</div><div class='del'>- * be done in a stand-alone module with only 1 entry total.</div><div class='del'>- * (otherwise we'd have to sort and that's just too messy)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We want to set up an exception handling point on our stack,</div><div class='del'>- * which means a variable value. This function is rather dirty</div><div class='del'>- * and walks the exception table of the module, looking for a magic</div><div class='del'>- * marker and replaces it with a specific function.</div><div class='del'>- */</div><div class='del'>-static void fudze_exception_table(void *marker, void *new)</div><div class='del'>-{</div><div class='del'>-	struct module *mod = THIS_MODULE;</div><div class='del'>-	struct exception_table_entry *extable;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Note: This module has only 1 exception table entry,</div><div class='del'>-	 * so searching and sorting is not needed. If that changes,</div><div class='del'>-	 * this would be the place to search and re-sort the exception</div><div class='del'>-	 * table.</div><div class='del'>-	 */</div><div class='del'>-	if (mod-&gt;num_exentries &gt; 1) {</div><div class='del'>-		printk(KERN_ERR "test_nx: too many exception table entries!\n");</div><div class='del'>-		printk(KERN_ERR "test_nx: test results are not reliable.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	extable = (struct exception_table_entry *)mod-&gt;extable;</div><div class='del'>-	extable[0].insn = (unsigned long)new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * exception tables get their symbols translated so we need</div><div class='del'>- * to use a fake function to put in there, which we can then</div><div class='del'>- * replace at runtime.</div><div class='del'>- */</div><div class='del'>-void foo_label(void);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * returns 0 for not-executable, negative for executable</div><div class='del'>- *</div><div class='del'>- * Note: we cannot allow this function to be inlined, because</div><div class='del'>- * that would give us more than 1 exception table entry.</div><div class='del'>- * This in turn would break the assumptions above.</div><div class='del'>- */</div><div class='del'>-static noinline int test_address(void *address)</div><div class='del'>-{</div><div class='del'>-	unsigned long result;</div><div class='del'>-</div><div class='del'>-	/* Set up an exception table entry for our address */</div><div class='del'>-	fudze_exception_table(&amp;foo_label, address);</div><div class='del'>-	result = 1;</div><div class='del'>-	asm volatile(</div><div class='del'>-		"foo_label:\n"</div><div class='del'>-		"0:	call *%[fake_code]\n"</div><div class='del'>-		"1:\n"</div><div class='del'>-		".section .fixup,\"ax\"\n"</div><div class='del'>-		"2:	mov %[zero], %[rslt]\n"</div><div class='del'>-		"	ret\n"</div><div class='del'>-		".previous\n"</div><div class='del'>-		_ASM_EXTABLE(0b,2b)</div><div class='del'>-		: [rslt] "=r" (result)</div><div class='del'>-		: [fake_code] "r" (address), [zero] "r" (0UL), "0" (result)</div><div class='del'>-	);</div><div class='del'>-	/* change the exception table back for the next round */</div><div class='del'>-	fudze_exception_table(address, &amp;foo_label);</div><div class='del'>-</div><div class='del'>-	if (result)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned char test_data = 0xC3; /* 0xC3 is the opcode for "ret" */</div><div class='del'>-</div><div class='del'>-static int test_NX(void)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	/* 0xC3 is the opcode for "ret" */</div><div class='del'>-	char stackcode[] = {0xC3, 0x90, 0 };</div><div class='del'>-	char *heap;</div><div class='del'>-</div><div class='del'>-	test_data = 0xC3;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Testing NX protection\n");</div><div class='del'>-</div><div class='del'>-	/* Test 1: check if the stack is not executable */</div><div class='del'>-	if (test_address(&amp;stackcode)) {</div><div class='del'>-		printk(KERN_ERR "test_nx: stack was executable\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Test 2: Check if the heap is executable */</div><div class='del'>-	heap = kmalloc(64, GFP_KERNEL);</div><div class='del'>-	if (!heap)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	heap[0] = 0xC3; /* opcode for "ret" */</div><div class='del'>-</div><div class='del'>-	if (test_address(heap)) {</div><div class='del'>-		printk(KERN_ERR "test_nx: heap was executable\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	kfree(heap);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The following 2 tests currently fail, this needs to get fixed</div><div class='del'>-	 * Until then, don't run them to avoid too many people getting scared</div><div class='del'>-	 * by the error message</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Test 3: Check if the .rodata section is executable */</div><div class='del'>-	if (rodata_test_data != 0xC3) {</div><div class='del'>-		printk(KERN_ERR "test_nx: .rodata marker has invalid value\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-	} else if (test_address(&amp;rodata_test_data)) {</div><div class='del'>-		printk(KERN_ERR "test_nx: .rodata section is executable\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* Test 4: Check if the .data section of a module is executable */</div><div class='del'>-	if (test_address(&amp;test_data)) {</div><div class='del'>-		printk(KERN_ERR "test_nx: .data section is executable\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(test_NX);</div><div class='del'>-module_exit(test_exit);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Testcase for the NX infrastructure");</div><div class='del'>-MODULE_AUTHOR("Arjan van de Ven &lt;arjan@linux.intel.com&gt;");</div><div class='head'>diff --git a/arch/x86/kernel/test_rodata.c b/arch/x86/kernel/test_rodata.c<br/>deleted file mode 100644<br/>index 222e84e2432e..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/test_rodata.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/test_rodata.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * test_rodata.c: functional test for mark_rodata_ro function</div><div class='del'>- *</div><div class='del'>- * (C) Copyright 2008 Intel Corporation</div><div class='del'>- * Author: Arjan van de Ven &lt;arjan@linux.intel.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; version 2</div><div class='del'>- * of the License.</div><div class='del'>- */</div><div class='del'>-#include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/sections.h&gt;</div><div class='del'>-#include &lt;asm/asm.h&gt;</div><div class='del'>-</div><div class='del'>-int rodata_test(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long result;</div><div class='del'>-	unsigned long start, end;</div><div class='del'>-</div><div class='del'>-	/* test 1: read the value */</div><div class='del'>-	/* If this test fails, some previous testrun has clobbered the state */</div><div class='del'>-	if (!rodata_test_data) {</div><div class='del'>-		printk(KERN_ERR "rodata_test: test 1 fails (start data)\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* test 2: write to the variable; this should fault */</div><div class='del'>-	/*</div><div class='del'>-	 * If this test fails, we managed to overwrite the data</div><div class='del'>-	 *</div><div class='del'>-	 * This is written in assembly to be able to catch the</div><div class='del'>-	 * exception that is supposed to happen in the correct</div><div class='del'>-	 * case</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	result = 1;</div><div class='del'>-	asm volatile(</div><div class='del'>-		"0:	mov %[zero],(%[rodata_test])\n"</div><div class='del'>-		"	mov %[zero], %[rslt]\n"</div><div class='del'>-		"1:\n"</div><div class='del'>-		".section .fixup,\"ax\"\n"</div><div class='del'>-		"2:	jmp 1b\n"</div><div class='del'>-		".previous\n"</div><div class='del'>-		_ASM_EXTABLE(0b,2b)</div><div class='del'>-		: [rslt] "=r" (result)</div><div class='del'>-		: [rodata_test] "r" (&amp;rodata_test_data), [zero] "r" (0UL)</div><div class='del'>-	);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (!result) {</div><div class='del'>-		printk(KERN_ERR "rodata_test: test data was not read only\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* test 3: check the value hasn't changed */</div><div class='del'>-	/* If this test fails, we managed to overwrite the data */</div><div class='del'>-	if (!rodata_test_data) {</div><div class='del'>-		printk(KERN_ERR "rodata_test: Test 3 fails (end data)\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	/* test 4: check if the rodata section is 4Kb aligned */</div><div class='del'>-	start = (unsigned long)__start_rodata;</div><div class='del'>-	end = (unsigned long)__end_rodata;</div><div class='del'>-	if (start &amp; (PAGE_SIZE - 1)) {</div><div class='del'>-		printk(KERN_ERR "rodata_test: .rodata is not 4k aligned\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if (end &amp; (PAGE_SIZE - 1)) {</div><div class='del'>-		printk(KERN_ERR "rodata_test: .rodata end is not 4k aligned\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c<br/>index 9692a5e9fdab..6c8934406dc9 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/tls.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/tls.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/tls.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tls.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> #include &lt;linux/regset.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/ldt.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c<br/>index 1c113db9ed57..15515132bf0d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/tracepoint.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/tracepoint.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/tracepoint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tracepoint.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@ static void switch_idt(void *arg)</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void trace_irq_vector_regfunc(void)</div><div class='add'>+int trace_irq_vector_regfunc(void)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;irq_vector_mutex);</div><div class='ctx'> 	if (!trace_irq_vector_refcount) {</div><div class='hunk'>@@ -44,6 +44,7 @@ void trace_irq_vector_regfunc(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	trace_irq_vector_refcount++;</div><div class='ctx'> 	mutex_unlock(&amp;irq_vector_mutex);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void trace_irq_vector_unregfunc(void)</div><div class='head'>diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c<br/>index bd4e3d4d3625..948443e115c1 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/traps.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='hunk'>@@ -563,11 +564,9 @@ dotraplinkage void notrace do_int3(struct pt_regs *regs, long error_code)</div><div class='ctx'> 	 * as we may switch to the interrupt stack.</div><div class='ctx'> 	 */</div><div class='ctx'> 	debug_stack_usage_inc();</div><div class='del'>-	preempt_disable();</div><div class='ctx'> 	cond_local_irq_enable(regs);</div><div class='ctx'> 	do_trap(X86_TRAP_BP, SIGTRAP, "int3", regs, error_code, NULL);</div><div class='ctx'> 	cond_local_irq_disable(regs);</div><div class='del'>-	preempt_enable_no_resched();</div><div class='ctx'> 	debug_stack_usage_dec();</div><div class='ctx'> exit:</div><div class='ctx'> 	ist_exit(regs);</div><div class='hunk'>@@ -742,14 +741,12 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)</div><div class='ctx'> 	debug_stack_usage_inc();</div><div class='ctx'> </div><div class='ctx'> 	/* It's safe to allow irq's after DR6 has been saved */</div><div class='del'>-	preempt_disable();</div><div class='ctx'> 	cond_local_irq_enable(regs);</div><div class='ctx'> </div><div class='ctx'> 	if (v8086_mode(regs)) {</div><div class='ctx'> 		handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,</div><div class='ctx'> 					X86_TRAP_DB);</div><div class='ctx'> 		cond_local_irq_disable(regs);</div><div class='del'>-		preempt_enable_no_resched();</div><div class='ctx'> 		debug_stack_usage_dec();</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -769,7 +766,6 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)</div><div class='ctx'> 	if (tsk-&gt;thread.debugreg6 &amp; (DR_STEP | DR_TRAP_BITS) || user_icebp)</div><div class='ctx'> 		send_sigtrap(tsk, regs, error_code, si_code);</div><div class='ctx'> 	cond_local_irq_disable(regs);</div><div class='del'>-	preempt_enable_no_resched();</div><div class='ctx'> 	debug_stack_usage_dec();</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -853,6 +849,8 @@ do_spurious_interrupt_bug(struct pt_regs *regs, long error_code)</div><div class='ctx'> dotraplinkage void</div><div class='ctx'> do_device_not_available(struct pt_regs *regs, long error_code)</div><div class='ctx'> {</div><div class='add'>+	unsigned long cr0;</div><div class='add'>+</div><div class='ctx'> 	RCU_LOCKDEP_WARN(!rcu_is_watching(), "entry code didn't wake RCU");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MATH_EMULATION</div><div class='hunk'>@@ -866,10 +864,20 @@ do_device_not_available(struct pt_regs *regs, long error_code)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	fpu__restore(&amp;current-&gt;thread.fpu); /* interrupts still off */</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-	cond_local_irq_enable(regs);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	/* This should not happen. */</div><div class='add'>+	cr0 = read_cr0();</div><div class='add'>+	if (WARN(cr0 &amp; X86_CR0_TS, "CR0.TS was set")) {</div><div class='add'>+		/* Try to fix it up and carry on. */</div><div class='add'>+		write_cr0(cr0 &amp; ~X86_CR0_TS);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Something terrible happened, and we're better off trying</div><div class='add'>+		 * to kill the task than getting stuck in a never-ending</div><div class='add'>+		 * loop of #NM faults.</div><div class='add'>+		 */</div><div class='add'>+		die("unexpected #NM exception", regs, error_code);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> NOKPROBE_SYMBOL(do_device_not_available);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c<br/>index 46b2f41f8b05..46bcda4cb1c2 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/tsc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/tsc.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/tsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tsc.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='hunk'>@@ -694,6 +695,7 @@ unsigned long native_calibrate_tsc(void)</div><div class='ctx'> 			crystal_khz = 24000;	/* 24.0 MHz */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case INTEL_FAM6_SKYLAKE_X:</div><div class='add'>+		case INTEL_FAM6_ATOM_DENVERTON:</div><div class='ctx'> 			crystal_khz = 25000;	/* 25.0 MHz */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case INTEL_FAM6_ATOM_GOLDMONT:</div><div class='hunk'>@@ -702,6 +704,20 @@ unsigned long native_calibrate_tsc(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * TSC frequency determined by CPUID is a "hardware reported"</div><div class='add'>+	 * frequency and is the most accurate one so far we have. This</div><div class='add'>+	 * is considered a known frequency.</div><div class='add'>+	 */</div><div class='add'>+	setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For Atom SoCs TSC is the only reliable clocksource.</div><div class='add'>+	 * Mark TSC reliable so no watchdog on it.</div><div class='add'>+	 */</div><div class='add'>+	if (boot_cpu_data.x86_model == INTEL_FAM6_ATOM_GOLDMONT)</div><div class='add'>+		setup_force_cpu_cap(X86_FEATURE_TSC_RELIABLE);</div><div class='add'>+</div><div class='ctx'> 	return crystal_khz * ebx_numerator / eax_denominator;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1043,18 +1059,20 @@ static void detect_art(void)</div><div class='ctx'> 	if (boot_cpu_data.cpuid_level &lt; ART_CPUID_LEAF)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	cpuid(ART_CPUID_LEAF, &amp;art_to_tsc_denominator,</div><div class='del'>-	      &amp;art_to_tsc_numerator, unused, unused+1);</div><div class='del'>-</div><div class='del'>-	/* Don't enable ART in a VM, non-stop TSC required */</div><div class='add'>+	/* Don't enable ART in a VM, non-stop TSC and TSC_ADJUST required */</div><div class='ctx'> 	if (boot_cpu_has(X86_FEATURE_HYPERVISOR) ||</div><div class='ctx'> 	    !boot_cpu_has(X86_FEATURE_NONSTOP_TSC) ||</div><div class='del'>-	    art_to_tsc_denominator &lt; ART_MIN_DENOMINATOR)</div><div class='add'>+	    !boot_cpu_has(X86_FEATURE_TSC_ADJUST))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (rdmsrl_safe(MSR_IA32_TSC_ADJUST, &amp;art_to_tsc_offset))</div><div class='add'>+	cpuid(ART_CPUID_LEAF, &amp;art_to_tsc_denominator,</div><div class='add'>+	      &amp;art_to_tsc_numerator, unused, unused+1);</div><div class='add'>+</div><div class='add'>+	if (art_to_tsc_denominator &lt; ART_MIN_DENOMINATOR)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	rdmsrl(MSR_IA32_TSC_ADJUST, art_to_tsc_offset);</div><div class='add'>+</div><div class='ctx'> 	/* Make this sticky over multiple CPU init calls */</div><div class='ctx'> 	setup_force_cpu_cap(X86_FEATURE_ART);</div><div class='ctx'> }</div><div class='hunk'>@@ -1064,6 +1082,11 @@ static void detect_art(void)</div><div class='ctx'> </div><div class='ctx'> static struct clocksource clocksource_tsc;</div><div class='ctx'> </div><div class='add'>+static void tsc_resume(struct clocksource *cs)</div><div class='add'>+{</div><div class='add'>+	tsc_verify_tsc_adjust(true);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * We used to compare the TSC to the cycle_last value in the clocksource</div><div class='ctx'>  * structure to avoid a nasty time-warp. This can be observed in a</div><div class='hunk'>@@ -1080,9 +1103,19 @@ static struct clocksource clocksource_tsc;</div><div class='ctx'>  * checking the result of read_tsc() - cycle_last for being negative.</div><div class='ctx'>  * That works because CLOCKSOURCE_MASK(64) does not mask out any bit.</div><div class='ctx'>  */</div><div class='del'>-static cycle_t read_tsc(struct clocksource *cs)</div><div class='add'>+static u64 read_tsc(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)rdtsc_ordered();</div><div class='add'>+	return (u64)rdtsc_ordered();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsc_cs_mark_unstable(struct clocksource *cs)</div><div class='add'>+{</div><div class='add'>+	if (tsc_unstable)</div><div class='add'>+		return;</div><div class='add'>+	tsc_unstable = 1;</div><div class='add'>+	clear_sched_clock_stable();</div><div class='add'>+	disable_sched_clock_irqtime();</div><div class='add'>+	pr_info("Marking TSC unstable due to clocksource watchdog\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1096,6 +1129,8 @@ static struct clocksource clocksource_tsc = {</div><div class='ctx'> 	.flags                  = CLOCK_SOURCE_IS_CONTINUOUS |</div><div class='ctx'> 				  CLOCK_SOURCE_MUST_VERIFY,</div><div class='ctx'> 	.archdata               = { .vclock_mode = VCLOCK_TSC },</div><div class='add'>+	.resume			= tsc_resume,</div><div class='add'>+	.mark_unstable		= tsc_cs_mark_unstable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void mark_tsc_unstable(char *reason)</div><div class='hunk'>@@ -1170,7 +1205,7 @@ int unsynchronized_tsc(void)</div><div class='ctx'> /*</div><div class='ctx'>  * Convert ART to TSC given numerator/denominator found in detect_art()</div><div class='ctx'>  */</div><div class='del'>-struct system_counterval_t convert_art_to_tsc(cycle_t art)</div><div class='add'>+struct system_counterval_t convert_art_to_tsc(u64 art)</div><div class='ctx'> {</div><div class='ctx'> 	u64 tmp, res, rem;</div><div class='ctx'> </div><div class='hunk'>@@ -1283,10 +1318,10 @@ static int __init init_tsc_clocksource(void)</div><div class='ctx'> 		clocksource_tsc.flags |= CLOCK_SOURCE_SUSPEND_NONSTOP;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Trust the results of the earlier calibration on systems</div><div class='del'>-	 * exporting a reliable TSC.</div><div class='add'>+	 * When TSC frequency is known (retrieved via MSR or CPUID), we skip</div><div class='add'>+	 * the refined calibration and directly register it as a clocksource.</div><div class='ctx'> 	 */</div><div class='del'>-	if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE)) {</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_TSC_KNOWN_FREQ)) {</div><div class='ctx'> 		clocksource_register_khz(&amp;clocksource_tsc, tsc_khz);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1333,6 +1368,9 @@ void __init tsc_init(void)</div><div class='ctx'> 		(unsigned long)cpu_khz / 1000,</div><div class='ctx'> 		(unsigned long)cpu_khz % 1000);</div><div class='ctx'> </div><div class='add'>+	/* Sanitize TSC ADJUST before cyc2ns gets initialized */</div><div class='add'>+	tsc_store_and_check_tsc_adjust(true);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Secondary CPUs do not run through tsc_init(), so set up</div><div class='ctx'> 	 * all the scale factors for all CPUs, assuming the same</div><div class='head'>diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c<br/>index 0fe720d64fef..19afdbd7d0a7 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/tsc_msr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/tsc_msr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/tsc_msr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tsc_msr.c</a></div><div class='hunk'>@@ -100,5 +100,24 @@ unsigned long cpu_khz_from_msr(void)</div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='ctx'> 	lapic_timer_frequency = (freq * 1000) / HZ;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TSC frequency determined by MSR is always considered "known"</div><div class='add'>+	 * because it is reported by HW.</div><div class='add'>+	 * Another fact is that on MSR capable platforms, PIT/HPET is</div><div class='add'>+	 * generally not available so calibration won't work at all.</div><div class='add'>+	 */</div><div class='add'>+	setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Unfortunately there is no way for hardware to tell whether the</div><div class='add'>+	 * TSC is reliable.  We were told by silicon design team that TSC</div><div class='add'>+	 * on Atom SoCs are always "reliable". TSC is also the only</div><div class='add'>+	 * reliable clocksource on these SoCs (HPET is either not present</div><div class='add'>+	 * or not functional) so mark TSC reliable which removes the</div><div class='add'>+	 * requirement for a watchdog clocksource.</div><div class='add'>+	 */</div><div class='add'>+	setup_force_cpu_cap(X86_FEATURE_TSC_RELIABLE);</div><div class='add'>+</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c<br/>index 78083bf23ed1..728f75378475 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/tsc_sync.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/tsc_sync.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/tsc_sync.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/tsc_sync.c</a></div><div class='hunk'>@@ -14,18 +14,166 @@</div><div class='ctx'>  * ( The serial nature of the boot logic and the CPU hotplug lock</div><div class='ctx'>  *   protects against more than 2 CPUs entering this code. )</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/topology.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/tsc.h&gt;</div><div class='ctx'> </div><div class='add'>+struct tsc_adjust {</div><div class='add'>+	s64		bootval;</div><div class='add'>+	s64		adjusted;</div><div class='add'>+	unsigned long	nextcheck;</div><div class='add'>+	bool		warned;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct tsc_adjust, tsc_adjust);</div><div class='add'>+</div><div class='add'>+void tsc_verify_tsc_adjust(bool resume)</div><div class='add'>+{</div><div class='add'>+	struct tsc_adjust *adj = this_cpu_ptr(&amp;tsc_adjust);</div><div class='add'>+	s64 curval;</div><div class='add'>+</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_TSC_ADJUST))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Rate limit the MSR check */</div><div class='add'>+	if (!resume &amp;&amp; time_before(jiffies, adj-&gt;nextcheck))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	adj-&gt;nextcheck = jiffies + HZ;</div><div class='add'>+</div><div class='add'>+	rdmsrl(MSR_IA32_TSC_ADJUST, curval);</div><div class='add'>+	if (adj-&gt;adjusted == curval)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Restore the original value */</div><div class='add'>+	wrmsrl(MSR_IA32_TSC_ADJUST, adj-&gt;adjusted);</div><div class='add'>+</div><div class='add'>+	if (!adj-&gt;warned || resume) {</div><div class='add'>+		pr_warn(FW_BUG "TSC ADJUST differs: CPU%u %lld --&gt; %lld. Restoring\n",</div><div class='add'>+			smp_processor_id(), adj-&gt;adjusted, curval);</div><div class='add'>+		adj-&gt;warned = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsc_sanitize_first_cpu(struct tsc_adjust *cur, s64 bootval,</div><div class='add'>+				   unsigned int cpu, bool bootcpu)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * First online CPU in a package stores the boot value in the</div><div class='add'>+	 * adjustment value. This value might change later via the sync</div><div class='add'>+	 * mechanism. If that fails we still can yell about boot values not</div><div class='add'>+	 * being consistent.</div><div class='add'>+	 *</div><div class='add'>+	 * On the boot cpu we just force set the ADJUST value to 0 if it's</div><div class='add'>+	 * non zero. We don't do that on non boot cpus because physical</div><div class='add'>+	 * hotplug should have set the ADJUST register to a value &gt; 0 so</div><div class='add'>+	 * the TSC is in sync with the already running cpus.</div><div class='add'>+	 *</div><div class='add'>+	 * But we always force positive ADJUST values. Otherwise the TSC</div><div class='add'>+	 * deadline timer creates an interrupt storm. We also have to</div><div class='add'>+	 * prevent values &gt; 0x7FFFFFFF as those wreckage the timer as well.</div><div class='add'>+	 */</div><div class='add'>+	if ((bootcpu &amp;&amp; bootval != 0) || (!bootcpu &amp;&amp; bootval &lt; 0) ||</div><div class='add'>+	    (bootval &gt; 0x7FFFFFFF)) {</div><div class='add'>+		pr_warn(FW_BUG "TSC ADJUST: CPU%u: %lld force to 0\n", cpu,</div><div class='add'>+			bootval);</div><div class='add'>+		wrmsrl(MSR_IA32_TSC_ADJUST, 0);</div><div class='add'>+		bootval = 0;</div><div class='add'>+	}</div><div class='add'>+	cur-&gt;adjusted = bootval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='add'>+bool __init tsc_store_and_check_tsc_adjust(bool bootcpu)</div><div class='add'>+{</div><div class='add'>+	struct tsc_adjust *cur = this_cpu_ptr(&amp;tsc_adjust);</div><div class='add'>+	s64 bootval;</div><div class='add'>+</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_TSC_ADJUST))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	rdmsrl(MSR_IA32_TSC_ADJUST, bootval);</div><div class='add'>+	cur-&gt;bootval = bootval;</div><div class='add'>+	cur-&gt;nextcheck = jiffies + HZ;</div><div class='add'>+	tsc_sanitize_first_cpu(cur, bootval, smp_processor_id(), bootcpu);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_SMP */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Store and check the TSC ADJUST MSR if available</div><div class='add'>+ */</div><div class='add'>+bool tsc_store_and_check_tsc_adjust(bool bootcpu)</div><div class='add'>+{</div><div class='add'>+	struct tsc_adjust *ref, *cur = this_cpu_ptr(&amp;tsc_adjust);</div><div class='add'>+	unsigned int refcpu, cpu = smp_processor_id();</div><div class='add'>+	struct cpumask *mask;</div><div class='add'>+	s64 bootval;</div><div class='add'>+</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_TSC_ADJUST))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	rdmsrl(MSR_IA32_TSC_ADJUST, bootval);</div><div class='add'>+	cur-&gt;bootval = bootval;</div><div class='add'>+	cur-&gt;nextcheck = jiffies + HZ;</div><div class='add'>+	cur-&gt;warned = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether this CPU is the first in a package to come up. In</div><div class='add'>+	 * this case do not check the boot value against another package</div><div class='add'>+	 * because the new package might have been physically hotplugged,</div><div class='add'>+	 * where TSC_ADJUST is expected to be different. When called on the</div><div class='add'>+	 * boot CPU topology_core_cpumask() might not be available yet.</div><div class='add'>+	 */</div><div class='add'>+	mask = topology_core_cpumask(cpu);</div><div class='add'>+	refcpu = mask ? cpumask_any_but(mask, cpu) : nr_cpu_ids;</div><div class='add'>+</div><div class='add'>+	if (refcpu &gt;= nr_cpu_ids) {</div><div class='add'>+		tsc_sanitize_first_cpu(cur, bootval, smp_processor_id(),</div><div class='add'>+				       bootcpu);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ref = per_cpu_ptr(&amp;tsc_adjust, refcpu);</div><div class='add'>+	/*</div><div class='add'>+	 * Compare the boot value and complain if it differs in the</div><div class='add'>+	 * package.</div><div class='add'>+	 */</div><div class='add'>+	if (bootval != ref-&gt;bootval) {</div><div class='add'>+		pr_warn(FW_BUG "TSC ADJUST differs: Reference CPU%u: %lld CPU%u: %lld\n",</div><div class='add'>+			refcpu, ref-&gt;bootval, cpu, bootval);</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * The TSC_ADJUST values in a package must be the same. If the boot</div><div class='add'>+	 * value on this newly upcoming CPU differs from the adjustment</div><div class='add'>+	 * value of the already online CPU in this package, set it to that</div><div class='add'>+	 * adjusted value.</div><div class='add'>+	 */</div><div class='add'>+	if (bootval != ref-&gt;adjusted) {</div><div class='add'>+		pr_warn("TSC ADJUST synchronize: Reference CPU%u: %lld CPU%u: %lld\n",</div><div class='add'>+			refcpu, ref-&gt;adjusted, cpu, bootval);</div><div class='add'>+		cur-&gt;adjusted = ref-&gt;adjusted;</div><div class='add'>+		wrmsrl(MSR_IA32_TSC_ADJUST, ref-&gt;adjusted);</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * We have the TSCs forced to be in sync on this package. Skip sync</div><div class='add'>+	 * test:</div><div class='add'>+	 */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Entry/exit counters that make sure that both CPUs</div><div class='ctx'>  * run the measurement code at once:</div><div class='ctx'>  */</div><div class='ctx'> static atomic_t start_count;</div><div class='ctx'> static atomic_t stop_count;</div><div class='add'>+static atomic_t skip_test;</div><div class='add'>+static atomic_t test_runs;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We use a raw spinlock in this exceptional case, because</div><div class='hunk'>@@ -37,15 +185,16 @@ static arch_spinlock_t sync_lock = __ARCH_SPIN_LOCK_UNLOCKED;</div><div class='ctx'> static cycles_t last_tsc;</div><div class='ctx'> static cycles_t max_warp;</div><div class='ctx'> static int nr_warps;</div><div class='add'>+static int random_warps;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * TSC-warp measurement loop running on both CPUs.  This is not called</div><div class='ctx'>  * if there is no TSC.</div><div class='ctx'>  */</div><div class='del'>-static void check_tsc_warp(unsigned int timeout)</div><div class='add'>+static cycles_t check_tsc_warp(unsigned int timeout)</div><div class='ctx'> {</div><div class='del'>-	cycles_t start, now, prev, end;</div><div class='del'>-	int i;</div><div class='add'>+	cycles_t start, now, prev, end, cur_max_warp = 0;</div><div class='add'>+	int i, cur_warps = 0;</div><div class='ctx'> </div><div class='ctx'> 	start = rdtsc_ordered();</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -85,13 +234,22 @@ static void check_tsc_warp(unsigned int timeout)</div><div class='ctx'> 		if (unlikely(prev &gt; now)) {</div><div class='ctx'> 			arch_spin_lock(&amp;sync_lock);</div><div class='ctx'> 			max_warp = max(max_warp, prev - now);</div><div class='add'>+			cur_max_warp = max_warp;</div><div class='add'>+			/*</div><div class='add'>+			 * Check whether this bounces back and forth. Only</div><div class='add'>+			 * one CPU should observe time going backwards.</div><div class='add'>+			 */</div><div class='add'>+			if (cur_warps != nr_warps)</div><div class='add'>+				random_warps++;</div><div class='ctx'> 			nr_warps++;</div><div class='add'>+			cur_warps = nr_warps;</div><div class='ctx'> 			arch_spin_unlock(&amp;sync_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	WARN(!(now-start),</div><div class='ctx'> 		"Warning: zero tsc calibration delta: %Ld [max: %Ld]\n",</div><div class='ctx'> 			now-start, end-start);</div><div class='add'>+	return cur_max_warp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -128,23 +286,27 @@ void check_tsc_sync_source(int cpu)</div><div class='ctx'> 	if (unsynchronized_tsc())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (tsc_clocksource_reliable) {</div><div class='del'>-		if (cpu == (nr_cpu_ids-1) || system_state != SYSTEM_BOOTING)</div><div class='del'>-			pr_info(</div><div class='del'>-			"Skipped synchronization checks as TSC is reliable.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * Reset it - in case this is a second bootup:</div><div class='add'>+	 * Set the maximum number of test runs to</div><div class='add'>+	 *  1 if the CPU does not provide the TSC_ADJUST MSR</div><div class='add'>+	 *  3 if the MSR is available, so the target can try to adjust</div><div class='ctx'> 	 */</div><div class='del'>-	atomic_set(&amp;stop_count, 0);</div><div class='del'>-</div><div class='add'>+	if (!boot_cpu_has(X86_FEATURE_TSC_ADJUST))</div><div class='add'>+		atomic_set(&amp;test_runs, 1);</div><div class='add'>+	else</div><div class='add'>+		atomic_set(&amp;test_runs, 3);</div><div class='add'>+retry:</div><div class='ctx'> 	/*</div><div class='del'>-	 * Wait for the target to arrive:</div><div class='add'>+	 * Wait for the target to start or to skip the test:</div><div class='ctx'> 	 */</div><div class='del'>-	while (atomic_read(&amp;start_count) != cpus-1)</div><div class='add'>+	while (atomic_read(&amp;start_count) != cpus - 1) {</div><div class='add'>+		if (atomic_read(&amp;skip_test) &gt; 0) {</div><div class='add'>+			atomic_set(&amp;skip_test, 0);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Trigger the target to continue into the measurement too:</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -155,21 +317,35 @@ void check_tsc_sync_source(int cpu)</div><div class='ctx'> 	while (atomic_read(&amp;stop_count) != cpus-1)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='del'>-	if (nr_warps) {</div><div class='add'>+	/*</div><div class='add'>+	 * If the test was successful set the number of runs to zero and</div><div class='add'>+	 * stop. If not, decrement the number of runs an check if we can</div><div class='add'>+	 * retry. In case of random warps no retry is attempted.</div><div class='add'>+	 */</div><div class='add'>+	if (!nr_warps) {</div><div class='add'>+		atomic_set(&amp;test_runs, 0);</div><div class='add'>+</div><div class='add'>+		pr_debug("TSC synchronization [CPU#%d -&gt; CPU#%d]: passed\n",</div><div class='add'>+			smp_processor_id(), cpu);</div><div class='add'>+</div><div class='add'>+	} else if (atomic_dec_and_test(&amp;test_runs) || random_warps) {</div><div class='add'>+		/* Force it to 0 if random warps brought us here */</div><div class='add'>+		atomic_set(&amp;test_runs, 0);</div><div class='add'>+</div><div class='ctx'> 		pr_warning("TSC synchronization [CPU#%d -&gt; CPU#%d]:\n",</div><div class='ctx'> 			smp_processor_id(), cpu);</div><div class='ctx'> 		pr_warning("Measured %Ld cycles TSC warp between CPUs, "</div><div class='ctx'> 			   "turning off TSC clock.\n", max_warp);</div><div class='add'>+		if (random_warps)</div><div class='add'>+			pr_warning("TSC warped randomly between CPUs\n");</div><div class='ctx'> 		mark_tsc_unstable("check_tsc_sync_source failed");</div><div class='del'>-	} else {</div><div class='del'>-		pr_debug("TSC synchronization [CPU#%d -&gt; CPU#%d]: passed\n",</div><div class='del'>-			smp_processor_id(), cpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reset it - just in case we boot another CPU later:</div><div class='ctx'> 	 */</div><div class='ctx'> 	atomic_set(&amp;start_count, 0);</div><div class='add'>+	random_warps = 0;</div><div class='ctx'> 	nr_warps = 0;</div><div class='ctx'> 	max_warp = 0;</div><div class='ctx'> 	last_tsc = 0;</div><div class='hunk'>@@ -178,6 +354,12 @@ void check_tsc_sync_source(int cpu)</div><div class='ctx'> 	 * Let the target continue with the bootup:</div><div class='ctx'> 	 */</div><div class='ctx'> 	atomic_inc(&amp;stop_count);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Retry, if there is a chance to do so.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_read(&amp;test_runs) &gt; 0)</div><div class='add'>+		goto retry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -185,12 +367,30 @@ void check_tsc_sync_source(int cpu)</div><div class='ctx'>  */</div><div class='ctx'> void check_tsc_sync_target(void)</div><div class='ctx'> {</div><div class='add'>+	struct tsc_adjust *cur = this_cpu_ptr(&amp;tsc_adjust);</div><div class='add'>+	unsigned int cpu = smp_processor_id();</div><div class='add'>+	cycles_t cur_max_warp, gbl_max_warp;</div><div class='ctx'> 	int cpus = 2;</div><div class='ctx'> </div><div class='ctx'> 	/* Also aborts if there is no TSC. */</div><div class='del'>-	if (unsynchronized_tsc() || tsc_clocksource_reliable)</div><div class='add'>+	if (unsynchronized_tsc())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Store, verify and sanitize the TSC adjust register. If</div><div class='add'>+	 * successful skip the test.</div><div class='add'>+	 *</div><div class='add'>+	 * The test is also skipped when the TSC is marked reliable. This</div><div class='add'>+	 * is true for SoCs which have no fallback clocksource. On these</div><div class='add'>+	 * SoCs the TSC is frequency synchronized, but still the TSC ADJUST</div><div class='add'>+	 * register might have been wreckaged by the BIOS..</div><div class='add'>+	 */</div><div class='add'>+	if (tsc_store_and_check_tsc_adjust(false) || tsc_clocksource_reliable) {</div><div class='add'>+		atomic_inc(&amp;skip_test);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+retry:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Register this CPU's participation and wait for the</div><div class='ctx'> 	 * source CPU to start the measurement:</div><div class='hunk'>@@ -199,7 +399,12 @@ void check_tsc_sync_target(void)</div><div class='ctx'> 	while (atomic_read(&amp;start_count) != cpus)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='del'>-	check_tsc_warp(loop_timeout(smp_processor_id()));</div><div class='add'>+	cur_max_warp = check_tsc_warp(loop_timeout(cpu));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Store the maximum observed warp value for a potential retry:</div><div class='add'>+	 */</div><div class='add'>+	gbl_max_warp = max_warp;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ok, we are done:</div><div class='hunk'>@@ -211,4 +416,61 @@ void check_tsc_sync_target(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (atomic_read(&amp;stop_count) != cpus)</div><div class='ctx'> 		cpu_relax();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset it for the next sync test:</div><div class='add'>+	 */</div><div class='add'>+	atomic_set(&amp;stop_count, 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check the number of remaining test runs. If not zero, the test</div><div class='add'>+	 * failed and a retry with adjusted TSC is possible. If zero the</div><div class='add'>+	 * test was either successful or failed terminally.</div><div class='add'>+	 */</div><div class='add'>+	if (!atomic_read(&amp;test_runs))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the warp value of this CPU is 0, then the other CPU</div><div class='add'>+	 * observed time going backwards so this TSC was ahead and</div><div class='add'>+	 * needs to move backwards.</div><div class='add'>+	 */</div><div class='add'>+	if (!cur_max_warp)</div><div class='add'>+		cur_max_warp = -gbl_max_warp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Add the result to the previous adjustment value.</div><div class='add'>+	 *</div><div class='add'>+	 * The adjustement value is slightly off by the overhead of the</div><div class='add'>+	 * sync mechanism (observed values are ~200 TSC cycles), but this</div><div class='add'>+	 * really depends on CPU, node distance and frequency. So</div><div class='add'>+	 * compensating for this is hard to get right. Experiments show</div><div class='add'>+	 * that the warp is not longer detectable when the observed warp</div><div class='add'>+	 * value is used. In the worst case the adjustment needs to go</div><div class='add'>+	 * through a 3rd run for fine tuning.</div><div class='add'>+	 */</div><div class='add'>+	cur-&gt;adjusted += cur_max_warp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TSC deadline timer stops working or creates an interrupt storm</div><div class='add'>+	 * with adjust values &lt; 0 and &gt; x07ffffff.</div><div class='add'>+	 *</div><div class='add'>+	 * To allow adjust values &gt; 0x7FFFFFFF we need to disable the</div><div class='add'>+	 * deadline timer and use the local APIC timer, but that requires</div><div class='add'>+	 * more intrusive changes and we do not have any useful information</div><div class='add'>+	 * from Intel about the underlying HW wreckage yet.</div><div class='add'>+	 */</div><div class='add'>+	if (cur-&gt;adjusted &lt; 0)</div><div class='add'>+		cur-&gt;adjusted = 0;</div><div class='add'>+	if (cur-&gt;adjusted &gt; 0x7FFFFFFF)</div><div class='add'>+		cur-&gt;adjusted = 0x7FFFFFFF;</div><div class='add'>+</div><div class='add'>+	pr_warn("TSC ADJUST compensate: CPU%u observed %lld warp. Adjust: %lld\n",</div><div class='add'>+		cpu, cur_max_warp, cur-&gt;adjusted);</div><div class='add'>+</div><div class='add'>+	wrmsrl(MSR_IA32_TSC_ADJUST, cur-&gt;adjusted);</div><div class='add'>+	goto retry;</div><div class='add'>+</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='head'>diff --git a/arch/x86/kernel/unwind_frame.c b/arch/x86/kernel/unwind_frame.c<br/>index a2456d4d286a..478d15dbaee4 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/unwind_frame.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/unwind_frame.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/unwind_frame.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/unwind_frame.c</a></div><div class='hunk'>@@ -1,4 +1,6 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/bitops.h&gt;</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='hunk'>@@ -6,6 +8,52 @@</div><div class='ctx'> </div><div class='ctx'> #define FRAME_HEADER_SIZE (sizeof(long) * 2)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This disables KASAN checking when reading a value from another task's stack,</div><div class='add'>+ * since the other task could be running on another CPU and could have poisoned</div><div class='add'>+ * the stack in the meantime.</div><div class='add'>+ */</div><div class='add'>+#define READ_ONCE_TASK_STACK(task, x)			\</div><div class='add'>+({							\</div><div class='add'>+	unsigned long val;				\</div><div class='add'>+	if (task == current)				\</div><div class='add'>+		val = READ_ONCE(x);			\</div><div class='add'>+	else						\</div><div class='add'>+		val = READ_ONCE_NOCHECK(x);		\</div><div class='add'>+	val;						\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static void unwind_dump(struct unwind_state *state, unsigned long *sp)</div><div class='add'>+{</div><div class='add'>+	static bool dumped_before = false;</div><div class='add'>+	bool prev_zero, zero = false;</div><div class='add'>+	unsigned long word;</div><div class='add'>+</div><div class='add'>+	if (dumped_before)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dumped_before = true;</div><div class='add'>+</div><div class='add'>+	printk_deferred("unwind stack type:%d next_sp:%p mask:%lx graph_idx:%d\n",</div><div class='add'>+			state-&gt;stack_info.type, state-&gt;stack_info.next_sp,</div><div class='add'>+			state-&gt;stack_mask, state-&gt;graph_idx);</div><div class='add'>+</div><div class='add'>+	for (sp = state-&gt;orig_sp; sp &lt; state-&gt;stack_info.end; sp++) {</div><div class='add'>+		word = READ_ONCE_NOCHECK(*sp);</div><div class='add'>+</div><div class='add'>+		prev_zero = zero;</div><div class='add'>+		zero = word == 0;</div><div class='add'>+</div><div class='add'>+		if (zero) {</div><div class='add'>+			if (!prev_zero)</div><div class='add'>+				printk_deferred("%p: %016x ...\n", sp, 0);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		printk_deferred("%p: %016lx (%pB)\n", sp, word, (void *)word);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> unsigned long unwind_get_return_address(struct unwind_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr;</div><div class='hunk'>@@ -14,17 +62,60 @@ unsigned long unwind_get_return_address(struct unwind_state *state)</div><div class='ctx'> 	if (unwind_done(state))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	addr = ftrace_graph_ret_addr(state-&gt;task, &amp;state-&gt;graph_idx, *addr_p,</div><div class='add'>+	if (state-&gt;regs &amp;&amp; user_mode(state-&gt;regs))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	addr = READ_ONCE_TASK_STACK(state-&gt;task, *addr_p);</div><div class='add'>+	addr = ftrace_graph_ret_addr(state-&gt;task, &amp;state-&gt;graph_idx, addr,</div><div class='ctx'> 				     addr_p);</div><div class='ctx'> </div><div class='ctx'> 	return __kernel_text_address(addr) ? addr : 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(unwind_get_return_address);</div><div class='ctx'> </div><div class='add'>+static size_t regs_size(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	/* x86_32 regs from kernel mode are two words shorter: */</div><div class='add'>+	if (IS_ENABLED(CONFIG_X86_32) &amp;&amp; !user_mode(regs))</div><div class='add'>+		return sizeof(*regs) - 2*sizeof(long);</div><div class='add'>+</div><div class='add'>+	return sizeof(*regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_last_task_frame(struct unwind_state *state)</div><div class='add'>+{</div><div class='add'>+	unsigned long bp = (unsigned long)state-&gt;bp;</div><div class='add'>+	unsigned long regs = (unsigned long)task_pt_regs(state-&gt;task);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We have to check for the last task frame at two different locations</div><div class='add'>+	 * because gcc can occasionally decide to realign the stack pointer and</div><div class='add'>+	 * change the offset of the stack frame by a word in the prologue of a</div><div class='add'>+	 * function called by head/entry code.</div><div class='add'>+	 */</div><div class='add'>+	return bp == regs - FRAME_HEADER_SIZE ||</div><div class='add'>+	       bp == regs - FRAME_HEADER_SIZE - sizeof(long);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This determines if the frame pointer actually contains an encoded pointer to</div><div class='add'>+ * pt_regs on the stack.  See ENCODE_FRAME_POINTER.</div><div class='add'>+ */</div><div class='add'>+static struct pt_regs *decode_frame_pointer(unsigned long *bp)</div><div class='add'>+{</div><div class='add'>+	unsigned long regs = (unsigned long)bp;</div><div class='add'>+</div><div class='add'>+	if (!(regs &amp; 0x1))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return (struct pt_regs *)(regs &amp; ~0x1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool update_stack_state(struct unwind_state *state, void *addr,</div><div class='ctx'> 			       size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct stack_info *info = &amp;state-&gt;stack_info;</div><div class='add'>+	enum stack_type orig_type = info-&gt;type;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If addr isn't on the current stack, switch to the next one.</div><div class='hunk'>@@ -38,31 +129,137 @@ static bool update_stack_state(struct unwind_state *state, void *addr,</div><div class='ctx'> 				   &amp;state-&gt;stack_mask))</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='add'>+	if (!state-&gt;orig_sp || info-&gt;type != orig_type)</div><div class='add'>+		state-&gt;orig_sp = addr;</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool unwind_next_frame(struct unwind_state *state)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *next_bp;</div><div class='add'>+	struct pt_regs *regs;</div><div class='add'>+	unsigned long *next_bp, *next_frame;</div><div class='add'>+	size_t next_len;</div><div class='add'>+	enum stack_type prev_type = state-&gt;stack_info.type;</div><div class='ctx'> </div><div class='ctx'> 	if (unwind_done(state))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	next_bp = (unsigned long *)*state-&gt;bp;</div><div class='add'>+	/* have we reached the end? */</div><div class='add'>+	if (state-&gt;regs &amp;&amp; user_mode(state-&gt;regs))</div><div class='add'>+		goto the_end;</div><div class='add'>+</div><div class='add'>+	if (is_last_task_frame(state)) {</div><div class='add'>+		regs = task_pt_regs(state-&gt;task);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * kthreads (other than the boot CPU's idle thread) have some</div><div class='add'>+		 * partial regs at the end of their stack which were placed</div><div class='add'>+		 * there by copy_thread_tls().  But the regs don't have any</div><div class='add'>+		 * useful information, so we can skip them.</div><div class='add'>+		 *</div><div class='add'>+		 * This user_mode() check is slightly broader than a PF_KTHREAD</div><div class='add'>+		 * check because it also catches the awkward situation where a</div><div class='add'>+		 * newly forked kthread transitions into a user task by calling</div><div class='add'>+		 * do_execve(), which eventually clears PF_KTHREAD.</div><div class='add'>+		 */</div><div class='add'>+		if (!user_mode(regs))</div><div class='add'>+			goto the_end;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We're almost at the end, but not quite: there's still the</div><div class='add'>+		 * syscall regs frame.  Entry code doesn't encode the regs</div><div class='add'>+		 * pointer for syscalls, so we have to set it manually.</div><div class='add'>+		 */</div><div class='add'>+		state-&gt;regs = regs;</div><div class='add'>+		state-&gt;bp = NULL;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get the next frame pointer */</div><div class='add'>+	if (state-&gt;regs)</div><div class='add'>+		next_bp = (unsigned long *)state-&gt;regs-&gt;bp;</div><div class='add'>+	else</div><div class='add'>+		next_bp = (unsigned long *)READ_ONCE_TASK_STACK(state-&gt;task,*state-&gt;bp);</div><div class='add'>+</div><div class='add'>+	/* is the next frame pointer an encoded pointer to pt_regs? */</div><div class='add'>+	regs = decode_frame_pointer(next_bp);</div><div class='add'>+	if (regs) {</div><div class='add'>+		next_frame = (unsigned long *)regs;</div><div class='add'>+		next_len = sizeof(*regs);</div><div class='add'>+	} else {</div><div class='add'>+		next_frame = next_bp;</div><div class='add'>+		next_len = FRAME_HEADER_SIZE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* make sure the next frame's data is accessible */</div><div class='del'>-	if (!update_stack_state(state, next_bp, FRAME_HEADER_SIZE))</div><div class='del'>-		return false;</div><div class='add'>+	if (!update_stack_state(state, next_frame, next_len)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Don't warn on bad regs-&gt;bp.  An interrupt in entry code</div><div class='add'>+		 * might cause a false positive warning.</div><div class='add'>+		 */</div><div class='add'>+		if (state-&gt;regs)</div><div class='add'>+			goto the_end;</div><div class='add'>+</div><div class='add'>+		goto bad_address;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure it only unwinds up and doesn't overlap the last frame: */</div><div class='add'>+	if (state-&gt;stack_info.type == prev_type) {</div><div class='add'>+		if (state-&gt;regs &amp;&amp; (void *)next_frame &lt; (void *)state-&gt;regs + regs_size(state-&gt;regs))</div><div class='add'>+			goto bad_address;</div><div class='add'>+</div><div class='add'>+		if (state-&gt;bp &amp;&amp; (void *)next_frame &lt; (void *)state-&gt;bp + FRAME_HEADER_SIZE)</div><div class='add'>+			goto bad_address;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* move to the next frame */</div><div class='del'>-	state-&gt;bp = next_bp;</div><div class='add'>+	if (regs) {</div><div class='add'>+		state-&gt;regs = regs;</div><div class='add'>+		state-&gt;bp = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		state-&gt;bp = next_bp;</div><div class='add'>+		state-&gt;regs = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='add'>+</div><div class='add'>+bad_address:</div><div class='add'>+	/*</div><div class='add'>+	 * When unwinding a non-current task, the task might actually be</div><div class='add'>+	 * running on another CPU, in which case it could be modifying its</div><div class='add'>+	 * stack while we're reading it.  This is generally not a problem and</div><div class='add'>+	 * can be ignored as long as the caller understands that unwinding</div><div class='add'>+	 * another task will not always succeed.</div><div class='add'>+	 */</div><div class='add'>+	if (state-&gt;task != current)</div><div class='add'>+		goto the_end;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;regs) {</div><div class='add'>+		printk_deferred_once(KERN_WARNING</div><div class='add'>+			"WARNING: kernel stack regs at %p in %s:%d has bad 'bp' value %p\n",</div><div class='add'>+			state-&gt;regs, state-&gt;task-&gt;comm,</div><div class='add'>+			state-&gt;task-&gt;pid, next_frame);</div><div class='add'>+		unwind_dump(state, (unsigned long *)state-&gt;regs);</div><div class='add'>+	} else {</div><div class='add'>+		printk_deferred_once(KERN_WARNING</div><div class='add'>+			"WARNING: kernel stack frame pointer at %p in %s:%d has bad value %p\n",</div><div class='add'>+			state-&gt;bp, state-&gt;task-&gt;comm,</div><div class='add'>+			state-&gt;task-&gt;pid, next_frame);</div><div class='add'>+		unwind_dump(state, state-&gt;bp);</div><div class='add'>+	}</div><div class='add'>+the_end:</div><div class='add'>+	state-&gt;stack_info.type = STACK_TYPE_UNKNOWN;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(unwind_next_frame);</div><div class='ctx'> </div><div class='ctx'> void __unwind_start(struct unwind_state *state, struct task_struct *task,</div><div class='ctx'> 		    struct pt_regs *regs, unsigned long *first_frame)</div><div class='ctx'> {</div><div class='add'>+	unsigned long *bp, *frame;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='ctx'> 	memset(state, 0, sizeof(*state));</div><div class='ctx'> 	state-&gt;task = task;</div><div class='ctx'> </div><div class='hunk'>@@ -73,12 +270,22 @@ void __unwind_start(struct unwind_state *state, struct task_struct *task,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set up the starting stack frame */</div><div class='del'>-	state-&gt;bp = get_frame_pointer(task, regs);</div><div class='add'>+	bp = get_frame_pointer(task, regs);</div><div class='add'>+	regs = decode_frame_pointer(bp);</div><div class='add'>+	if (regs) {</div><div class='add'>+		state-&gt;regs = regs;</div><div class='add'>+		frame = (unsigned long *)regs;</div><div class='add'>+		len = sizeof(*regs);</div><div class='add'>+	} else {</div><div class='add'>+		state-&gt;bp = bp;</div><div class='add'>+		frame = bp;</div><div class='add'>+		len = FRAME_HEADER_SIZE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* initialize stack info and make sure the frame data is accessible */</div><div class='del'>-	get_stack_info(state-&gt;bp, state-&gt;task, &amp;state-&gt;stack_info,</div><div class='add'>+	get_stack_info(frame, state-&gt;task, &amp;state-&gt;stack_info,</div><div class='ctx'> 		       &amp;state-&gt;stack_mask);</div><div class='del'>-	update_stack_state(state, state-&gt;bp, FRAME_HEADER_SIZE);</div><div class='add'>+	update_stack_state(state, frame, len);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The caller can provide the address of the first frame directly</div><div class='head'>diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c<br/>index 01f30e56f99e..23ee89ce59a9 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/vm86_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/vm86_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/vm86_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/vm86_32.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -47,7 +48,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -160,11 +161,12 @@ void save_v86_state(struct kernel_vm86_regs *regs, int retval)</div><div class='ctx'> </div><div class='ctx'> static void mark_screen_rdonly(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	spinlock_t *ptl;</div><div class='ctx'> 	pgd_t *pgd;</div><div class='ctx'> 	pud_t *pud;</div><div class='ctx'> 	pmd_t *pmd;</div><div class='ctx'> 	pte_t *pte;</div><div class='del'>-	spinlock_t *ptl;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;mm-&gt;mmap_sem);</div><div class='hunk'>@@ -177,7 +179,7 @@ static void mark_screen_rdonly(struct mm_struct *mm)</div><div class='ctx'> 	pmd = pmd_offset(pud, 0xA0000);</div><div class='ctx'> </div><div class='ctx'> 	if (pmd_trans_huge(*pmd)) {</div><div class='del'>-		struct vm_area_struct *vma = find_vma(mm, 0xA0000);</div><div class='add'>+		vma = find_vma(mm, 0xA0000);</div><div class='ctx'> 		split_huge_pmd(vma, pmd, 0xA0000);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pmd_none_or_clear_bad(pmd))</div><div class='head'>diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S<br/>index dbf67f64d5ec..c74ae9ce8dc4 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/vmlinux.lds.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -91,10 +91,10 @@ SECTIONS</div><div class='ctx'> 	/* Text and read-only data */</div><div class='ctx'> 	.text :  AT(ADDR(.text) - LOAD_OFFSET) {</div><div class='ctx'> 		_text = .;</div><div class='add'>+		_stext = .;</div><div class='ctx'> 		/* bootstrapping code */</div><div class='ctx'> 		HEAD_TEXT</div><div class='ctx'> 		. = ALIGN(8);</div><div class='del'>-		_stext = .;</div><div class='ctx'> 		TEXT_TEXT</div><div class='ctx'> 		SCHED_TEXT</div><div class='ctx'> 		CPUIDLE_TEXT</div><div class='hunk'>@@ -345,7 +345,6 @@ SECTIONS</div><div class='ctx'> 	DISCARDS</div><div class='ctx'> 	/DISCARD/ : {</div><div class='ctx'> 		*(.eh_frame)</div><div class='del'>-		*(__func_stack_frame_non_standard)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c<br/>index 0bd9f1287f39..11a93f005268 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kernel/x86_init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kernel/x86_init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kernel/x86_init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kernel/x86_init.c</a></div><div class='hunk'>@@ -89,7 +89,6 @@ struct x86_cpuinit_ops x86_cpuinit = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void default_nmi_init(void) { };</div><div class='del'>-static int default_i8042_detect(void) { return 1; };</div><div class='ctx'> </div><div class='ctx'> struct x86_platform_ops x86_platform __ro_after_init = {</div><div class='ctx'> 	.calibrate_cpu			= native_calibrate_cpu,</div><div class='hunk'>@@ -100,7 +99,6 @@ struct x86_platform_ops x86_platform __ro_after_init = {</div><div class='ctx'> 	.is_untracked_pat_range		= is_ISA_range,</div><div class='ctx'> 	.nmi_init			= default_nmi_init,</div><div class='ctx'> 	.get_nmi_reason			= default_get_nmi_reason,</div><div class='del'>-	.i8042_detect			= default_i8042_detect,</div><div class='ctx'> 	.save_sched_clock_state 	= tsc_save_sched_clock_state,</div><div class='ctx'> 	.restore_sched_clock_state 	= tsc_restore_sched_clock_state,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c<br/>index afa7bbb596cd..efde6cc50875 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/cpuid.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/cpuid.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/cpuid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/cpuid.c</a></div><div class='hunk'>@@ -16,7 +16,9 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/fpu/internal.h&gt; /* For use_eager_fpu.  Ugh! */</div><div class='add'>+#include &lt;linux/sched/stat.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/user.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/xstate.h&gt;</div><div class='ctx'> #include "cpuid.h"</div><div class='hunk'>@@ -65,6 +67,11 @@ u64 kvm_supported_xcr0(void)</div><div class='ctx'> </div><div class='ctx'> #define F(x) bit(X86_FEATURE_##x)</div><div class='ctx'> </div><div class='add'>+/* These are scattered features in cpufeatures.h. */</div><div class='add'>+#define KVM_CPUID_BIT_AVX512_4VNNIW     2</div><div class='add'>+#define KVM_CPUID_BIT_AVX512_4FMAPS     3</div><div class='add'>+#define KF(x) bit(KVM_CPUID_BIT_##x)</div><div class='add'>+</div><div class='ctx'> int kvm_update_cpuid(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_cpuid_entry2 *best;</div><div class='hunk'>@@ -81,6 +88,10 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu)</div><div class='ctx'> 			best-&gt;ecx |= F(OSXSAVE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	best-&gt;edx &amp;= ~F(APIC);</div><div class='add'>+	if (vcpu-&gt;arch.apic_base &amp; MSR_IA32_APICBASE_ENABLE)</div><div class='add'>+		best-&gt;edx |= F(APIC);</div><div class='add'>+</div><div class='ctx'> 	if (apic) {</div><div class='ctx'> 		if (best-&gt;ecx &amp; F(TSC_DEADLINE_TIMER))</div><div class='ctx'> 			apic-&gt;lapic_timer.timer_mode_mask = 3 &lt;&lt; 17;</div><div class='hunk'>@@ -114,9 +125,6 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (best &amp;&amp; (best-&gt;eax &amp; (F(XSAVES) | F(XSAVEC))))</div><div class='ctx'> 		best-&gt;ebx = xstate_required_size(vcpu-&gt;arch.xcr0, true);</div><div class='ctx'> </div><div class='del'>-	if (use_eager_fpu())</div><div class='del'>-		kvm_x86_ops-&gt;fpu_activate(vcpu);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The existing code assumes virtual address is 48-bit in the canonical</div><div class='ctx'> 	 * address checks; exit if it is ever changed.</div><div class='hunk'>@@ -365,16 +373,21 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,</div><div class='ctx'> 	const u32 kvm_cpuid_7_0_ebx_x86_features =</div><div class='ctx'> 		F(FSGSBASE) | F(BMI1) | F(HLE) | F(AVX2) | F(SMEP) |</div><div class='ctx'> 		F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | f_mpx | F(RDSEED) |</div><div class='del'>-		F(ADX) | F(SMAP) | F(AVX512F) | F(AVX512PF) | F(AVX512ER) |</div><div class='del'>-		F(AVX512CD) | F(CLFLUSHOPT) | F(CLWB) | F(AVX512DQ) |</div><div class='del'>-		F(AVX512BW) | F(AVX512VL);</div><div class='add'>+		F(ADX) | F(SMAP) | F(AVX512IFMA) | F(AVX512F) | F(AVX512PF) |</div><div class='add'>+		F(AVX512ER) | F(AVX512CD) | F(CLFLUSHOPT) | F(CLWB) | F(AVX512DQ) |</div><div class='add'>+		F(SHA_NI) | F(AVX512BW) | F(AVX512VL);</div><div class='ctx'> </div><div class='ctx'> 	/* cpuid 0xD.1.eax */</div><div class='ctx'> 	const u32 kvm_cpuid_D_1_eax_x86_features =</div><div class='ctx'> 		F(XSAVEOPT) | F(XSAVEC) | F(XGETBV1) | f_xsaves;</div><div class='ctx'> </div><div class='ctx'> 	/* cpuid 7.0.ecx*/</div><div class='del'>-	const u32 kvm_cpuid_7_0_ecx_x86_features = F(PKU) | 0 /*OSPKE*/;</div><div class='add'>+	const u32 kvm_cpuid_7_0_ecx_x86_features =</div><div class='add'>+		F(AVX512VBMI) | F(PKU) | 0 /*OSPKE*/ | F(AVX512_VPOPCNTDQ);</div><div class='add'>+</div><div class='add'>+	/* cpuid 7.0.edx*/</div><div class='add'>+	const u32 kvm_cpuid_7_0_edx_x86_features =</div><div class='add'>+		KF(AVX512_4VNNIW) | KF(AVX512_4FMAPS);</div><div class='ctx'> </div><div class='ctx'> 	/* all calls to cpuid_count() should be made on the same cpu */</div><div class='ctx'> 	get_cpu();</div><div class='hunk'>@@ -458,12 +471,14 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,</div><div class='ctx'> 			/* PKU is not yet implemented for shadow paging. */</div><div class='ctx'> 			if (!tdp_enabled)</div><div class='ctx'> 				entry-&gt;ecx &amp;= ~F(PKU);</div><div class='add'>+			entry-&gt;edx &amp;= kvm_cpuid_7_0_edx_x86_features;</div><div class='add'>+			entry-&gt;edx &amp;= get_scattered_cpuid_leaf(7, 0, CPUID_EDX);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			entry-&gt;ebx = 0;</div><div class='ctx'> 			entry-&gt;ecx = 0;</div><div class='add'>+			entry-&gt;edx = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		entry-&gt;eax = 0;</div><div class='del'>-		entry-&gt;edx = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case 9:</div><div class='hunk'>@@ -846,12 +861,6 @@ void kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)</div><div class='ctx'> 	if (!best)</div><div class='ctx'> 		best = check_cpuid_limit(vcpu, function, index);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Perfmon not yet supported for L2 guest.</div><div class='del'>-	 */</div><div class='del'>-	if (is_guest_mode(vcpu) &amp;&amp; function == 0xa)</div><div class='del'>-		best = NULL;</div><div class='del'>-</div><div class='ctx'> 	if (best) {</div><div class='ctx'> 		*eax = best-&gt;eax;</div><div class='ctx'> 		*ebx = best-&gt;ebx;</div><div class='hunk'>@@ -863,17 +872,17 @@ void kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_cpuid);</div><div class='ctx'> </div><div class='del'>-void kvm_emulate_cpuid(struct kvm_vcpu *vcpu)</div><div class='add'>+int kvm_emulate_cpuid(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	u32 function, eax, ebx, ecx, edx;</div><div class='add'>+	u32 eax, ebx, ecx, edx;</div><div class='ctx'> </div><div class='del'>-	function = eax = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='add'>+	eax = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='ctx'> 	ecx = kvm_register_read(vcpu, VCPU_REGS_RCX);</div><div class='ctx'> 	kvm_cpuid(vcpu, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='ctx'> 	kvm_register_write(vcpu, VCPU_REGS_RAX, eax);</div><div class='ctx'> 	kvm_register_write(vcpu, VCPU_REGS_RBX, ebx);</div><div class='ctx'> 	kvm_register_write(vcpu, VCPU_REGS_RCX, ecx);</div><div class='ctx'> 	kvm_register_write(vcpu, VCPU_REGS_RDX, edx);</div><div class='del'>-	kvm_x86_ops-&gt;skip_emulated_instruction(vcpu);</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_emulate_cpuid);</div><div class='head'>diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c<br/>index a3ce9d260d68..45c7306c8780 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/emulate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/emulate.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/emulate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/emulate.c</a></div><div class='hunk'>@@ -158,9 +158,11 @@</div><div class='ctx'> #define Src2GS      (OpGS &lt;&lt; Src2Shift)</div><div class='ctx'> #define Src2Mask    (OpMask &lt;&lt; Src2Shift)</div><div class='ctx'> #define Mmx         ((u64)1 &lt;&lt; 40)  /* MMX Vector instruction */</div><div class='add'>+#define AlignMask   ((u64)7 &lt;&lt; 41)</div><div class='ctx'> #define Aligned     ((u64)1 &lt;&lt; 41)  /* Explicitly aligned (e.g. MOVDQA) */</div><div class='del'>-#define Unaligned   ((u64)1 &lt;&lt; 42)  /* Explicitly unaligned (e.g. MOVDQU) */</div><div class='del'>-#define Avx         ((u64)1 &lt;&lt; 43)  /* Advanced Vector Extensions */</div><div class='add'>+#define Unaligned   ((u64)2 &lt;&lt; 41)  /* Explicitly unaligned (e.g. MOVDQU) */</div><div class='add'>+#define Avx         ((u64)3 &lt;&lt; 41)  /* Advanced Vector Extensions */</div><div class='add'>+#define Aligned16   ((u64)4 &lt;&lt; 41)  /* Aligned to 16 byte boundary (e.g. FXSAVE) */</div><div class='ctx'> #define Fastop      ((u64)1 &lt;&lt; 44)  /* Use opcode::u.fastop */</div><div class='ctx'> #define NoWrite     ((u64)1 &lt;&lt; 45)  /* No writeback */</div><div class='ctx'> #define SrcWrite    ((u64)1 &lt;&lt; 46)  /* Write back src operand */</div><div class='hunk'>@@ -171,6 +173,7 @@</div><div class='ctx'> #define NearBranch  ((u64)1 &lt;&lt; 52)  /* Near branches */</div><div class='ctx'> #define No16	    ((u64)1 &lt;&lt; 53)  /* No 16 bit operand */</div><div class='ctx'> #define IncSP       ((u64)1 &lt;&lt; 54)  /* SP is incremented before ModRM calc */</div><div class='add'>+#define TwoMemOp    ((u64)1 &lt;&lt; 55)  /* Instruction has two memory operand */</div><div class='ctx'> </div><div class='ctx'> #define DstXacc     (DstAccLo | SrcAccHi | SrcWrite)</div><div class='ctx'> </div><div class='hunk'>@@ -446,6 +449,26 @@ FOP_END;</div><div class='ctx'> FOP_START(salc) "pushf; sbb %al, %al; popf \n\t" FOP_RET</div><div class='ctx'> FOP_END;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * XXX: inoutclob user must know where the argument is being expanded.</div><div class='add'>+ *      Relying on CC_HAVE_ASM_GOTO would allow us to remove _fault.</div><div class='add'>+ */</div><div class='add'>+#define asm_safe(insn, inoutclob...) \</div><div class='add'>+({ \</div><div class='add'>+	int _fault = 0; \</div><div class='add'>+ \</div><div class='add'>+	asm volatile("1:" insn "\n" \</div><div class='add'>+	             "2:\n" \</div><div class='add'>+	             ".pushsection .fixup, \"ax\"\n" \</div><div class='add'>+	             "3: movl $1, %[_fault]\n" \</div><div class='add'>+	             "   jmp  2b\n" \</div><div class='add'>+	             ".popsection\n" \</div><div class='add'>+	             _ASM_EXTABLE(1b, 3b) \</div><div class='add'>+	             : [_fault] "+qm"(_fault) inoutclob ); \</div><div class='add'>+ \</div><div class='add'>+	_fault ? X86EMUL_UNHANDLEABLE : X86EMUL_CONTINUE; \</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> static int emulator_check_intercept(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 				    enum x86_intercept intercept,</div><div class='ctx'> 				    enum x86_intercept_stage stage)</div><div class='hunk'>@@ -632,21 +655,26 @@ static void set_segment_selector(struct x86_emulate_ctxt *ctxt, u16 selector,</div><div class='ctx'>  * depending on whether they're AVX encoded or not.</div><div class='ctx'>  *</div><div class='ctx'>  * Also included is CMPXCHG16B which is not a vector instruction, yet it is</div><div class='del'>- * subject to the same check.</div><div class='add'>+ * subject to the same check.  FXSAVE and FXRSTOR are checked here too as their</div><div class='add'>+ * 512 bytes of data must be aligned to a 16 byte boundary.</div><div class='ctx'>  */</div><div class='del'>-static bool insn_aligned(struct x86_emulate_ctxt *ctxt, unsigned size)</div><div class='add'>+static unsigned insn_alignment(struct x86_emulate_ctxt *ctxt, unsigned size)</div><div class='ctx'> {</div><div class='del'>-	if (likely(size &lt; 16))</div><div class='del'>-		return false;</div><div class='add'>+	u64 alignment = ctxt-&gt;d &amp; AlignMask;</div><div class='ctx'> </div><div class='del'>-	if (ctxt-&gt;d &amp; Aligned)</div><div class='del'>-		return true;</div><div class='del'>-	else if (ctxt-&gt;d &amp; Unaligned)</div><div class='del'>-		return false;</div><div class='del'>-	else if (ctxt-&gt;d &amp; Avx)</div><div class='del'>-		return false;</div><div class='del'>-	else</div><div class='del'>-		return true;</div><div class='add'>+	if (likely(size &lt; 16))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	switch (alignment) {</div><div class='add'>+	case Unaligned:</div><div class='add'>+	case Avx:</div><div class='add'>+		return 1;</div><div class='add'>+	case Aligned16:</div><div class='add'>+		return 16;</div><div class='add'>+	case Aligned:</div><div class='add'>+	default:</div><div class='add'>+		return size;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt,</div><div class='hunk'>@@ -704,7 +732,7 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	if (insn_aligned(ctxt, size) &amp;&amp; ((la &amp; (size - 1)) != 0))</div><div class='add'>+	if (la &amp; (insn_alignment(ctxt, size) - 1))</div><div class='ctx'> 		return emulate_gp(ctxt, 0);</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> bad:</div><div class='hunk'>@@ -791,6 +819,20 @@ static int segmented_read_std(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 	return ctxt-&gt;ops-&gt;read_std(ctxt, linear, data, size, &amp;ctxt-&gt;exception);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int segmented_write_std(struct x86_emulate_ctxt *ctxt,</div><div class='add'>+			       struct segmented_address addr,</div><div class='add'>+			       void *data,</div><div class='add'>+			       unsigned int size)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	ulong linear;</div><div class='add'>+</div><div class='add'>+	rc = linearize(ctxt, addr, size, true, &amp;linear);</div><div class='add'>+	if (rc != X86EMUL_CONTINUE)</div><div class='add'>+		return rc;</div><div class='add'>+	return ctxt-&gt;ops-&gt;write_std(ctxt, linear, data, size, &amp;ctxt-&gt;exception);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Prefetch the remaining bytes of the instruction without crossing page</div><div class='ctx'>  * boundary if they are not in fetch_cache yet.</div><div class='hunk'>@@ -1544,7 +1586,6 @@ static int write_segment_descriptor(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 				    &amp;ctxt-&gt;exception);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Does not support long mode */</div><div class='ctx'> static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 				     u16 selector, int seg, u8 cpl,</div><div class='ctx'> 				     enum x86_transfer_type transfer,</div><div class='hunk'>@@ -1581,20 +1622,34 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> </div><div class='ctx'> 	rpl = selector &amp; 3;</div><div class='ctx'> </div><div class='del'>-	/* NULL selector is not valid for TR, CS and SS (except for long mode) */</div><div class='del'>-	if ((seg == VCPU_SREG_CS</div><div class='del'>-	     || (seg == VCPU_SREG_SS</div><div class='del'>-		 &amp;&amp; (ctxt-&gt;mode != X86EMUL_MODE_PROT64 || rpl != cpl))</div><div class='del'>-	     || seg == VCPU_SREG_TR)</div><div class='del'>-	    &amp;&amp; null_selector)</div><div class='del'>-		goto exception;</div><div class='del'>-</div><div class='ctx'> 	/* TR should be in GDT only */</div><div class='ctx'> 	if (seg == VCPU_SREG_TR &amp;&amp; (selector &amp; (1 &lt;&lt; 2)))</div><div class='ctx'> 		goto exception;</div><div class='ctx'> </div><div class='del'>-	if (null_selector) /* for NULL selector skip all following checks */</div><div class='add'>+	/* NULL selector is not valid for TR, CS and (except for long mode) SS */</div><div class='add'>+	if (null_selector) {</div><div class='add'>+		if (seg == VCPU_SREG_CS || seg == VCPU_SREG_TR)</div><div class='add'>+			goto exception;</div><div class='add'>+</div><div class='add'>+		if (seg == VCPU_SREG_SS) {</div><div class='add'>+			if (ctxt-&gt;mode != X86EMUL_MODE_PROT64 || rpl != cpl)</div><div class='add'>+				goto exception;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * ctxt-&gt;ops-&gt;set_segment expects the CPL to be in</div><div class='add'>+			 * SS.DPL, so fake an expand-up 32-bit data segment.</div><div class='add'>+			 */</div><div class='add'>+			seg_desc.type = 3;</div><div class='add'>+			seg_desc.p = 1;</div><div class='add'>+			seg_desc.s = 1;</div><div class='add'>+			seg_desc.dpl = cpl;</div><div class='add'>+			seg_desc.d = 1;</div><div class='add'>+			seg_desc.g = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Skip all following checks */</div><div class='ctx'> 		goto load;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = read_segment_descriptor(ctxt, selector, &amp;seg_desc, &amp;desc_addr);</div><div class='ctx'> 	if (ret != X86EMUL_CONTINUE)</div><div class='hunk'>@@ -1710,6 +1765,21 @@ static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 				   u16 selector, int seg)</div><div class='ctx'> {</div><div class='ctx'> 	u8 cpl = ctxt-&gt;ops-&gt;cpl(ctxt);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * None of MOV, POP and LSS can load a NULL selector in CPL=3, but</div><div class='add'>+	 * they can load it at CPL&lt;3 (Intel's manual says only LSS can,</div><div class='add'>+	 * but it's wrong).</div><div class='add'>+	 *</div><div class='add'>+	 * However, the Intel manual says that putting IST=1/DPL=3 in</div><div class='add'>+	 * an interrupt gate will result in SS=3 (the AMD manual instead</div><div class='add'>+	 * says it doesn't), so allow SS=3 in __load_segment_descriptor</div><div class='add'>+	 * and only forbid it here.</div><div class='add'>+	 */</div><div class='add'>+	if (seg == VCPU_SREG_SS &amp;&amp; selector == 3 &amp;&amp;</div><div class='add'>+	    ctxt-&gt;mode == X86EMUL_MODE_PROT64)</div><div class='add'>+		return emulate_exception(ctxt, GP_VECTOR, 0, true);</div><div class='add'>+</div><div class='ctx'> 	return __load_segment_descriptor(ctxt, selector, seg, cpl,</div><div class='ctx'> 					 X86_TRANSFER_NONE, NULL);</div><div class='ctx'> }</div><div class='hunk'>@@ -3658,8 +3728,8 @@ static int emulate_store_desc_ptr(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Disable writeback. */</div><div class='ctx'> 	ctxt-&gt;dst.type = OP_NONE;</div><div class='del'>-	return segmented_write(ctxt, ctxt-&gt;dst.addr.mem,</div><div class='del'>-			       &amp;desc_ptr, 2 + ctxt-&gt;op_bytes);</div><div class='add'>+	return segmented_write_std(ctxt, ctxt-&gt;dst.addr.mem,</div><div class='add'>+				   &amp;desc_ptr, 2 + ctxt-&gt;op_bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int em_sgdt(struct x86_emulate_ctxt *ctxt)</div><div class='hunk'>@@ -3842,6 +3912,131 @@ static int em_movsxd(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int check_fxsr(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	u32 eax = 1, ebx, ecx = 0, edx;</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;ops-&gt;get_cpuid(ctxt, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='add'>+	if (!(edx &amp; FFL(FXSR)))</div><div class='add'>+		return emulate_ud(ctxt);</div><div class='add'>+</div><div class='add'>+	if (ctxt-&gt;ops-&gt;get_cr(ctxt, 0) &amp; (X86_CR0_TS | X86_CR0_EM))</div><div class='add'>+		return emulate_nm(ctxt);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Don't emulate a case that should never be hit, instead of working</div><div class='add'>+	 * around a lack of fxsave64/fxrstor64 on old compilers.</div><div class='add'>+	 */</div><div class='add'>+	if (ctxt-&gt;mode &gt;= X86EMUL_MODE_PROT64)</div><div class='add'>+		return X86EMUL_UNHANDLEABLE;</div><div class='add'>+</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FXSAVE and FXRSTOR have 4 different formats depending on execution mode,</div><div class='add'>+ *  1) 16 bit mode</div><div class='add'>+ *  2) 32 bit mode</div><div class='add'>+ *     - like (1), but FIP and FDP (foo) are only 16 bit.  At least Intel CPUs</div><div class='add'>+ *       preserve whole 32 bit values, though, so (1) and (2) are the same wrt.</div><div class='add'>+ *       save and restore</div><div class='add'>+ *  3) 64-bit mode with REX.W prefix</div><div class='add'>+ *     - like (2), but XMM 8-15 are being saved and restored</div><div class='add'>+ *  4) 64-bit mode without REX.W prefix</div><div class='add'>+ *     - like (3), but FIP and FDP are 64 bit</div><div class='add'>+ *</div><div class='add'>+ * Emulation uses (3) for (1) and (2) and preserves XMM 8-15 to reach the</div><div class='add'>+ * desired result.  (4) is not emulated.</div><div class='add'>+ *</div><div class='add'>+ * Note: Guest and host CPUID.(EAX=07H,ECX=0H):EBX[bit 13] (deprecate FPU CS</div><div class='add'>+ * and FPU DS) should match.</div><div class='add'>+ */</div><div class='add'>+static int em_fxsave(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct fxregs_state fx_state;</div><div class='add'>+	size_t size;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = check_fxsr(ctxt);</div><div class='add'>+	if (rc != X86EMUL_CONTINUE)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;ops-&gt;get_fpu(ctxt);</div><div class='add'>+</div><div class='add'>+	rc = asm_safe("fxsave %[fx]", , [fx] "+m"(fx_state));</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;ops-&gt;put_fpu(ctxt);</div><div class='add'>+</div><div class='add'>+	if (rc != X86EMUL_CONTINUE)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (ctxt-&gt;ops-&gt;get_cr(ctxt, 4) &amp; X86_CR4_OSFXSR)</div><div class='add'>+		size = offsetof(struct fxregs_state, xmm_space[8 * 16/4]);</div><div class='add'>+	else</div><div class='add'>+		size = offsetof(struct fxregs_state, xmm_space[0]);</div><div class='add'>+</div><div class='add'>+	return segmented_write_std(ctxt, ctxt-&gt;memop.addr.mem, &amp;fx_state, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fxrstor_fixup(struct x86_emulate_ctxt *ctxt,</div><div class='add'>+		struct fxregs_state *new)</div><div class='add'>+{</div><div class='add'>+	int rc = X86EMUL_CONTINUE;</div><div class='add'>+	struct fxregs_state old;</div><div class='add'>+</div><div class='add'>+	rc = asm_safe("fxsave %[fx]", , [fx] "+m"(old));</div><div class='add'>+	if (rc != X86EMUL_CONTINUE)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 64 bit host will restore XMM 8-15, which is not correct on non-64</div><div class='add'>+	 * bit guests.  Load the current values in order to preserve 64 bit</div><div class='add'>+	 * XMMs after fxrstor.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	/* XXX: accessing XMM 8-15 very awkwardly */</div><div class='add'>+	memcpy(&amp;new-&gt;xmm_space[8 * 16/4], &amp;old.xmm_space[8 * 16/4], 8 * 16);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Hardware doesn't save and restore XMM 0-7 without CR4.OSFXSR, but</div><div class='add'>+	 * does save and restore MXCSR.</div><div class='add'>+	 */</div><div class='add'>+	if (!(ctxt-&gt;ops-&gt;get_cr(ctxt, 4) &amp; X86_CR4_OSFXSR))</div><div class='add'>+		memcpy(new-&gt;xmm_space, old.xmm_space, 8 * 16);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int em_fxrstor(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct fxregs_state fx_state;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = check_fxsr(ctxt);</div><div class='add'>+	if (rc != X86EMUL_CONTINUE)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = segmented_read_std(ctxt, ctxt-&gt;memop.addr.mem, &amp;fx_state, 512);</div><div class='add'>+	if (rc != X86EMUL_CONTINUE)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (fx_state.mxcsr &gt;&gt; 16)</div><div class='add'>+		return emulate_gp(ctxt, 0);</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;ops-&gt;get_fpu(ctxt);</div><div class='add'>+</div><div class='add'>+	if (ctxt-&gt;mode &lt; X86EMUL_MODE_PROT64)</div><div class='add'>+		rc = fxrstor_fixup(ctxt, &amp;fx_state);</div><div class='add'>+</div><div class='add'>+	if (rc == X86EMUL_CONTINUE)</div><div class='add'>+		rc = asm_safe("fxrstor %[fx]", : [fx] "m"(fx_state));</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;ops-&gt;put_fpu(ctxt);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool valid_cr(int nr)</div><div class='ctx'> {</div><div class='ctx'> 	switch (nr) {</div><div class='hunk'>@@ -4104,7 +4299,7 @@ static const struct opcode group1[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct opcode group1A[] = {</div><div class='del'>-	I(DstMem | SrcNone | Mov | Stack | IncSP, em_pop), N, N, N, N, N, N, N,</div><div class='add'>+	I(DstMem | SrcNone | Mov | Stack | IncSP | TwoMemOp, em_pop), N, N, N, N, N, N, N,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct opcode group2[] = {</div><div class='hunk'>@@ -4142,7 +4337,7 @@ static const struct opcode group5[] = {</div><div class='ctx'> 	I(SrcMemFAddr | ImplicitOps,		em_call_far),</div><div class='ctx'> 	I(SrcMem | NearBranch,			em_jmp_abs),</div><div class='ctx'> 	I(SrcMemFAddr | ImplicitOps,		em_jmp_far),</div><div class='del'>-	I(SrcMem | Stack,			em_push), D(Undefined),</div><div class='add'>+	I(SrcMem | Stack | TwoMemOp,		em_push), D(Undefined),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct opcode group6[] = {</div><div class='hunk'>@@ -4194,7 +4389,9 @@ static const struct gprefix pfx_0f_ae_7 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct group_dual group15 = { {</div><div class='del'>-	N, N, N, N, N, N, N, GP(0, &amp;pfx_0f_ae_7),</div><div class='add'>+	I(ModRM | Aligned16, em_fxsave),</div><div class='add'>+	I(ModRM | Aligned16, em_fxrstor),</div><div class='add'>+	N, N, N, N, N, GP(0, &amp;pfx_0f_ae_7),</div><div class='ctx'> }, {</div><div class='ctx'> 	N, N, N, N, N, N, N, N,</div><div class='ctx'> } };</div><div class='hunk'>@@ -4360,8 +4557,8 @@ static const struct opcode opcode_table[256] = {</div><div class='ctx'> 	/* 0xA0 - 0xA7 */</div><div class='ctx'> 	I2bv(DstAcc | SrcMem | Mov | MemAbs, em_mov),</div><div class='ctx'> 	I2bv(DstMem | SrcAcc | Mov | MemAbs | PageTable, em_mov),</div><div class='del'>-	I2bv(SrcSI | DstDI | Mov | String, em_mov),</div><div class='del'>-	F2bv(SrcSI | DstDI | String | NoWrite, em_cmp_r),</div><div class='add'>+	I2bv(SrcSI | DstDI | Mov | String | TwoMemOp, em_mov),</div><div class='add'>+	F2bv(SrcSI | DstDI | String | NoWrite | TwoMemOp, em_cmp_r),</div><div class='ctx'> 	/* 0xA8 - 0xAF */</div><div class='ctx'> 	F2bv(DstAcc | SrcImm | NoWrite, em_test),</div><div class='ctx'> 	I2bv(SrcAcc | DstDI | Mov | String, em_mov),</div><div class='hunk'>@@ -5066,21 +5263,13 @@ static bool string_insn_completed(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> </div><div class='ctx'> static int flush_pending_x87_faults(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='del'>-	bool fault = false;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	ctxt-&gt;ops-&gt;get_fpu(ctxt);</div><div class='del'>-	asm volatile("1: fwait \n\t"</div><div class='del'>-		     "2: \n\t"</div><div class='del'>-		     ".pushsection .fixup,\"ax\" \n\t"</div><div class='del'>-		     "3: \n\t"</div><div class='del'>-		     "movb $1, %[fault] \n\t"</div><div class='del'>-		     "jmp 2b \n\t"</div><div class='del'>-		     ".popsection \n\t"</div><div class='del'>-		     _ASM_EXTABLE(1b, 3b)</div><div class='del'>-		     : [fault]"+qm"(fault));</div><div class='add'>+	rc = asm_safe("fwait");</div><div class='ctx'> 	ctxt-&gt;ops-&gt;put_fpu(ctxt);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(fault))</div><div class='add'>+	if (unlikely(rc != X86EMUL_CONTINUE))</div><div class='ctx'> 		return emulate_exception(ctxt, MF_VECTOR, 0, false);</div><div class='ctx'> </div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='hunk'>@@ -5483,3 +5672,14 @@ void emulator_writeback_register_cache(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	writeback_registers(ctxt);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+bool emulator_can_use_gpa(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	if (ctxt-&gt;rep_prefix &amp;&amp; (ctxt-&gt;d &amp; String))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ctxt-&gt;d &amp; TwoMemOp)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c<br/>index 42b1c83741c8..ebae57ac5902 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/hyperv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/hyperv.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/hyperv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/hyperv.c</a></div><div class='hunk'>@@ -28,6 +28,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/sched/cputime.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/apicdef.h&gt;</div><div class='ctx'> #include &lt;trace/events/kvm.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -291,7 +293,7 @@ static int synic_get_msr(struct kvm_vcpu_hv_synic *synic, u32 msr, u64 *pdata)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int synic_set_irq(struct kvm_vcpu_hv_synic *synic, u32 sint)</div><div class='add'>+static int synic_set_irq(struct kvm_vcpu_hv_synic *synic, u32 sint)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vcpu *vcpu = synic_to_vcpu(synic);</div><div class='ctx'> 	struct kvm_lapic_irq irq;</div><div class='hunk'>@@ -305,13 +307,13 @@ int synic_set_irq(struct kvm_vcpu_hv_synic *synic, u32 sint)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;irq, 0, sizeof(irq));</div><div class='del'>-	irq.dest_id = kvm_apic_id(vcpu-&gt;arch.apic);</div><div class='add'>+	irq.shorthand = APIC_DEST_SELF;</div><div class='ctx'> 	irq.dest_mode = APIC_DEST_PHYSICAL;</div><div class='ctx'> 	irq.delivery_mode = APIC_DM_FIXED;</div><div class='ctx'> 	irq.vector = vector;</div><div class='ctx'> 	irq.level = 1;</div><div class='ctx'> </div><div class='del'>-	ret = kvm_irq_delivery_to_apic(vcpu-&gt;kvm, NULL, &amp;irq, NULL);</div><div class='add'>+	ret = kvm_irq_delivery_to_apic(vcpu-&gt;kvm, vcpu-&gt;arch.apic, &amp;irq, NULL);</div><div class='ctx'> 	trace_kvm_hv_synic_set_irq(vcpu-&gt;vcpu_id, sint, irq.vector, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -852,6 +854,10 @@ void kvm_hv_setup_tsc_page(struct kvm *kvm,</div><div class='ctx'> 	if (!(hv-&gt;hv_tsc_page &amp; HV_X64_MSR_TSC_REFERENCE_ENABLE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;kvm-&gt;arch.hyperv.hv_lock);</div><div class='add'>+	if (!(hv-&gt;hv_tsc_page &amp; HV_X64_MSR_TSC_REFERENCE_ENABLE))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='ctx'> 	gfn = hv-&gt;hv_tsc_page &gt;&gt; HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Because the TSC parameters only vary when there is a</div><div class='hunk'>@@ -859,7 +865,7 @@ void kvm_hv_setup_tsc_page(struct kvm *kvm,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(kvm_read_guest(kvm, gfn_to_gpa(gfn),</div><div class='ctx'> 				    &amp;tsc_seq, sizeof(tsc_seq))))</div><div class='del'>-		return;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * While we're computing and writing the parameters, force the</div><div class='hunk'>@@ -868,15 +874,15 @@ void kvm_hv_setup_tsc_page(struct kvm *kvm,</div><div class='ctx'> 	hv-&gt;tsc_ref.tsc_sequence = 0;</div><div class='ctx'> 	if (kvm_write_guest(kvm, gfn_to_gpa(gfn),</div><div class='ctx'> 			    &amp;hv-&gt;tsc_ref, sizeof(hv-&gt;tsc_ref.tsc_sequence)))</div><div class='del'>-		return;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	if (!compute_tsc_page_parameters(hv_clock, &amp;hv-&gt;tsc_ref))</div><div class='del'>-		return;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure sequence is zero before writing the rest of the struct.  */</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> 	if (kvm_write_guest(kvm, gfn_to_gpa(gfn), &amp;hv-&gt;tsc_ref, sizeof(hv-&gt;tsc_ref)))</div><div class='del'>-		return;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now switch to the TSC page mechanism by writing the sequence.</div><div class='hunk'>@@ -891,6 +897,8 @@ void kvm_hv_setup_tsc_page(struct kvm *kvm,</div><div class='ctx'> 	hv-&gt;tsc_ref.tsc_sequence = tsc_seq;</div><div class='ctx'> 	kvm_write_guest(kvm, gfn_to_gpa(gfn),</div><div class='ctx'> 			&amp;hv-&gt;tsc_ref, sizeof(hv-&gt;tsc_ref.tsc_sequence));</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;kvm-&gt;arch.hyperv.hv_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvm_hv_set_msr_pw(struct kvm_vcpu *vcpu, u32 msr, u64 data,</div><div class='hunk'>@@ -958,10 +966,11 @@ static int kvm_hv_set_msr_pw(struct kvm_vcpu *vcpu, u32 msr, u64 data,</div><div class='ctx'> /* Calculate cpu time spent by current task in 100ns units */</div><div class='ctx'> static u64 current_task_runtime_100ns(void)</div><div class='ctx'> {</div><div class='del'>-	cputime_t utime, stime;</div><div class='add'>+	u64 utime, stime;</div><div class='ctx'> </div><div class='ctx'> 	task_cputime_adjusted(current, &amp;utime, &amp;stime);</div><div class='del'>-	return div_u64(cputime_to_nsecs(utime + stime), 100);</div><div class='add'>+</div><div class='add'>+	return div_u64(utime + stime, 100);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvm_hv_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data, bool host)</div><div class='hunk'>@@ -1142,9 +1151,9 @@ int kvm_hv_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data, bool host)</div><div class='ctx'> 	if (kvm_hv_msr_partition_wide(msr)) {</div><div class='ctx'> 		int r;</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;vcpu-&gt;kvm-&gt;lock);</div><div class='add'>+		mutex_lock(&amp;vcpu-&gt;kvm-&gt;arch.hyperv.hv_lock);</div><div class='ctx'> 		r = kvm_hv_set_msr_pw(vcpu, msr, data, host);</div><div class='del'>-		mutex_unlock(&amp;vcpu-&gt;kvm-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;vcpu-&gt;kvm-&gt;arch.hyperv.hv_lock);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	} else</div><div class='ctx'> 		return kvm_hv_set_msr(vcpu, msr, data, host);</div><div class='hunk'>@@ -1155,9 +1164,9 @@ int kvm_hv_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)</div><div class='ctx'> 	if (kvm_hv_msr_partition_wide(msr)) {</div><div class='ctx'> 		int r;</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;vcpu-&gt;kvm-&gt;lock);</div><div class='add'>+		mutex_lock(&amp;vcpu-&gt;kvm-&gt;arch.hyperv.hv_lock);</div><div class='ctx'> 		r = kvm_hv_get_msr_pw(vcpu, msr, pdata);</div><div class='del'>-		mutex_unlock(&amp;vcpu-&gt;kvm-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;vcpu-&gt;kvm-&gt;arch.hyperv.hv_lock);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	} else</div><div class='ctx'> 		return kvm_hv_get_msr(vcpu, msr, pdata);</div><div class='hunk'>@@ -1165,7 +1174,7 @@ int kvm_hv_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)</div><div class='ctx'> </div><div class='ctx'> bool kvm_hv_hypercall_enabled(struct kvm *kvm)</div><div class='ctx'> {</div><div class='del'>-	return kvm-&gt;arch.hyperv.hv_hypercall &amp; HV_X64_MSR_HYPERCALL_ENABLE;</div><div class='add'>+	return READ_ONCE(kvm-&gt;arch.hyperv.hv_hypercall) &amp; HV_X64_MSR_HYPERCALL_ENABLE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvm_hv_hypercall_set_result(struct kvm_vcpu *vcpu, u64 result)</div><div class='head'>diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c<br/>index 16a7134eedac..a78b445ce411 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/i8254.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/i8254.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/i8254.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/i8254.c</a></div><div class='hunk'>@@ -212,7 +212,7 @@ static void kvm_pit_ack_irq(struct kvm_irq_ack_notifier *kian)</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> 	if (atomic_dec_if_positive(&amp;ps-&gt;pending) &gt; 0)</div><div class='del'>-		kthread_queue_work(&amp;pit-&gt;worker, &amp;pit-&gt;expired);</div><div class='add'>+		kthread_queue_work(pit-&gt;worker, &amp;pit-&gt;expired);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -272,7 +272,7 @@ static enum hrtimer_restart pit_timer_fn(struct hrtimer *data)</div><div class='ctx'> 	if (atomic_read(&amp;ps-&gt;reinject))</div><div class='ctx'> 		atomic_inc(&amp;ps-&gt;pending);</div><div class='ctx'> </div><div class='del'>-	kthread_queue_work(&amp;pt-&gt;worker, &amp;pt-&gt;expired);</div><div class='add'>+	kthread_queue_work(pt-&gt;worker, &amp;pt-&gt;expired);</div><div class='ctx'> </div><div class='ctx'> 	if (ps-&gt;is_periodic) {</div><div class='ctx'> 		hrtimer_add_expires_ns(&amp;ps-&gt;timer, ps-&gt;period);</div><div class='hunk'>@@ -667,10 +667,8 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags)</div><div class='ctx'> 	pid_nr = pid_vnr(pid);</div><div class='ctx'> 	put_pid(pid);</div><div class='ctx'> </div><div class='del'>-	kthread_init_worker(&amp;pit-&gt;worker);</div><div class='del'>-	pit-&gt;worker_task = kthread_run(kthread_worker_fn, &amp;pit-&gt;worker,</div><div class='del'>-				       "kvm-pit/%d", pid_nr);</div><div class='del'>-	if (IS_ERR(pit-&gt;worker_task))</div><div class='add'>+	pit-&gt;worker = kthread_create_worker(0, "kvm-pit/%d", pid_nr);</div><div class='add'>+	if (IS_ERR(pit-&gt;worker))</div><div class='ctx'> 		goto fail_kthread;</div><div class='ctx'> </div><div class='ctx'> 	kthread_init_work(&amp;pit-&gt;expired, pit_do_work);</div><div class='hunk'>@@ -713,7 +711,7 @@ fail_register_speaker:</div><div class='ctx'> fail_register_pit:</div><div class='ctx'> 	mutex_unlock(&amp;kvm-&gt;slots_lock);</div><div class='ctx'> 	kvm_pit_set_reinject(pit, false);</div><div class='del'>-	kthread_stop(pit-&gt;worker_task);</div><div class='add'>+	kthread_destroy_worker(pit-&gt;worker);</div><div class='ctx'> fail_kthread:</div><div class='ctx'> 	kvm_free_irq_source_id(kvm, pit-&gt;irq_source_id);</div><div class='ctx'> fail_request:</div><div class='hunk'>@@ -730,8 +728,7 @@ void kvm_free_pit(struct kvm *kvm)</div><div class='ctx'> 		kvm_io_bus_unregister_dev(kvm, KVM_PIO_BUS, &amp;pit-&gt;speaker_dev);</div><div class='ctx'> 		kvm_pit_set_reinject(pit, false);</div><div class='ctx'> 		hrtimer_cancel(&amp;pit-&gt;pit_state.timer);</div><div class='del'>-		kthread_flush_work(&amp;pit-&gt;expired);</div><div class='del'>-		kthread_stop(pit-&gt;worker_task);</div><div class='add'>+		kthread_destroy_worker(pit-&gt;worker);</div><div class='ctx'> 		kvm_free_irq_source_id(kvm, pit-&gt;irq_source_id);</div><div class='ctx'> 		kfree(pit);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h<br/>index 2f5af0798326..600bee9dcbbd 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/i8254.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/i8254.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/i8254.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/i8254.h</a></div><div class='hunk'>@@ -44,8 +44,7 @@ struct kvm_pit {</div><div class='ctx'> 	struct kvm_kpit_state pit_state;</div><div class='ctx'> 	int irq_source_id;</div><div class='ctx'> 	struct kvm_irq_mask_notifier mask_notifier;</div><div class='del'>-	struct kthread_worker worker;</div><div class='del'>-	struct task_struct *worker_task;</div><div class='add'>+	struct kthread_worker *worker;</div><div class='ctx'> 	struct kthread_work expired;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c<br/>index 7cc2360f1848..73ea24d4f119 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/i8259.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/i8259.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/i8259.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/i8259.c</a></div><div class='hunk'>@@ -598,14 +598,14 @@ static const struct kvm_io_device_ops picdev_eclr_ops = {</div><div class='ctx'> 	.write    = picdev_eclr_write,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct kvm_pic *kvm_create_pic(struct kvm *kvm)</div><div class='add'>+int kvm_pic_init(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_pic *s;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	s = kzalloc(sizeof(struct kvm_pic), GFP_KERNEL);</div><div class='ctx'> 	if (!s)</div><div class='del'>-		return NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	spin_lock_init(&amp;s-&gt;lock);</div><div class='ctx'> 	s-&gt;kvm = kvm;</div><div class='ctx'> 	s-&gt;pics[0].elcr_mask = 0xf8;</div><div class='hunk'>@@ -635,7 +635,9 @@ struct kvm_pic *kvm_create_pic(struct kvm *kvm)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;kvm-&gt;slots_lock);</div><div class='ctx'> </div><div class='del'>-	return s;</div><div class='add'>+	kvm-&gt;arch.vpic = s;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_unreg_1:</div><div class='ctx'> 	kvm_io_bus_unregister_dev(kvm, KVM_PIO_BUS, &amp;s-&gt;dev_slave);</div><div class='hunk'>@@ -648,13 +650,17 @@ fail_unlock:</div><div class='ctx'> </div><div class='ctx'> 	kfree(s);</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void kvm_destroy_pic(struct kvm_pic *vpic)</div><div class='add'>+void kvm_pic_destroy(struct kvm *kvm)</div><div class='ctx'> {</div><div class='add'>+	struct kvm_pic *vpic = kvm-&gt;arch.vpic;</div><div class='add'>+</div><div class='ctx'> 	kvm_io_bus_unregister_dev(vpic-&gt;kvm, KVM_PIO_BUS, &amp;vpic-&gt;dev_master);</div><div class='ctx'> 	kvm_io_bus_unregister_dev(vpic-&gt;kvm, KVM_PIO_BUS, &amp;vpic-&gt;dev_slave);</div><div class='ctx'> 	kvm_io_bus_unregister_dev(vpic-&gt;kvm, KVM_PIO_BUS, &amp;vpic-&gt;dev_eclr);</div><div class='add'>+</div><div class='add'>+	kvm-&gt;arch.vpic = NULL;</div><div class='ctx'> 	kfree(vpic);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h<br/>index 035731eb3897..40d5b2cf6061 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/irq.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/irq.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/irq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/irq.h</a></div><div class='hunk'>@@ -73,8 +73,8 @@ struct kvm_pic {</div><div class='ctx'> 	unsigned long irq_states[PIC_NUM_PINS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct kvm_pic *kvm_create_pic(struct kvm *kvm);</div><div class='del'>-void kvm_destroy_pic(struct kvm_pic *vpic);</div><div class='add'>+int kvm_pic_init(struct kvm *kvm);</div><div class='add'>+void kvm_pic_destroy(struct kvm *kvm);</div><div class='ctx'> int kvm_pic_read_irq(struct kvm *kvm);</div><div class='ctx'> void kvm_pic_update_irq(struct kvm_pic *s);</div><div class='ctx'> </div><div class='hunk'>@@ -93,18 +93,19 @@ static inline int pic_in_kernel(struct kvm *kvm)</div><div class='ctx'> </div><div class='ctx'> static inline int irqchip_split(struct kvm *kvm)</div><div class='ctx'> {</div><div class='del'>-	return kvm-&gt;arch.irqchip_split;</div><div class='add'>+	return kvm-&gt;arch.irqchip_mode == KVM_IRQCHIP_SPLIT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int irqchip_in_kernel(struct kvm *kvm)</div><div class='add'>+static inline int irqchip_kernel(struct kvm *kvm)</div><div class='ctx'> {</div><div class='del'>-	struct kvm_pic *vpic = pic_irqchip(kvm);</div><div class='del'>-	bool ret;</div><div class='add'>+	return kvm-&gt;arch.irqchip_mode == KVM_IRQCHIP_KERNEL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ret = (vpic != NULL);</div><div class='del'>-	ret |= irqchip_split(kvm);</div><div class='add'>+static inline int irqchip_in_kernel(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	bool ret = kvm-&gt;arch.irqchip_mode != KVM_IRQCHIP_NONE;</div><div class='ctx'> </div><div class='del'>-	/* Read vpic before kvm-&gt;irq_routing.  */</div><div class='add'>+	/* Matches with wmb after initializing kvm-&gt;irq_routing. */</div><div class='ctx'> 	smp_rmb();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c<br/>index 6c0191615f23..6825cd36d13b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/irq_comm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/irq_comm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/irq_comm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/irq_comm.c</a></div><div class='hunk'>@@ -23,6 +23,8 @@</div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/rculist.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;trace/events/kvm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/msidef.h&gt;</div><div class='hunk'>@@ -41,15 +43,6 @@ static int kvm_set_pic_irq(struct kvm_kernel_irq_routing_entry *e,</div><div class='ctx'> 			   bool line_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_pic *pic = pic_irqchip(kvm);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: rejecting pic routes when pic isn't in use would be better,</div><div class='del'>-	 * but the default routing table is installed while kvm-&gt;arch.vpic is</div><div class='del'>-	 * NULL and KVM_CREATE_IRQCHIP can race with KVM_IRQ_LINE.</div><div class='del'>-	 */</div><div class='del'>-	if (!pic)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='ctx'> 	return kvm_pic_set_irq(pic, e-&gt;irqchip.pin, irq_source_id, level);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -58,10 +51,6 @@ static int kvm_set_ioapic_irq(struct kvm_kernel_irq_routing_entry *e,</div><div class='ctx'> 			      bool line_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_ioapic *ioapic = kvm-&gt;arch.vioapic;</div><div class='del'>-</div><div class='del'>-	if (!ioapic)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='ctx'> 	return kvm_ioapic_set_irq(ioapic, e-&gt;irqchip.pin, irq_source_id, level,</div><div class='ctx'> 				line_status);</div><div class='ctx'> }</div><div class='hunk'>@@ -297,16 +286,20 @@ int kvm_set_routing_entry(struct kvm *kvm,</div><div class='ctx'> 	case KVM_IRQ_ROUTING_IRQCHIP:</div><div class='ctx'> 		delta = 0;</div><div class='ctx'> 		switch (ue-&gt;u.irqchip.irqchip) {</div><div class='del'>-		case KVM_IRQCHIP_PIC_MASTER:</div><div class='del'>-			e-&gt;set = kvm_set_pic_irq;</div><div class='del'>-			max_pin = PIC_NUM_PINS;</div><div class='del'>-			break;</div><div class='ctx'> 		case KVM_IRQCHIP_PIC_SLAVE:</div><div class='add'>+			delta = 8;</div><div class='add'>+			/* fall through */</div><div class='add'>+		case KVM_IRQCHIP_PIC_MASTER:</div><div class='add'>+			if (!pic_in_kernel(kvm))</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='ctx'> 			e-&gt;set = kvm_set_pic_irq;</div><div class='ctx'> 			max_pin = PIC_NUM_PINS;</div><div class='del'>-			delta = 8;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case KVM_IRQCHIP_IOAPIC:</div><div class='add'>+			if (!ioapic_in_kernel(kvm))</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='ctx'> 			max_pin = KVM_IOAPIC_NUM_PINS;</div><div class='ctx'> 			e-&gt;set = kvm_set_ioapic_irq;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -409,7 +402,7 @@ int kvm_setup_empty_irq_routing(struct kvm *kvm)</div><div class='ctx'> </div><div class='ctx'> void kvm_arch_post_irq_routing_update(struct kvm *kvm)</div><div class='ctx'> {</div><div class='del'>-	if (ioapic_in_kernel(kvm) || !irqchip_in_kernel(kvm))</div><div class='add'>+	if (!irqchip_split(kvm))</div><div class='ctx'> 		return;</div><div class='ctx'> 	kvm_make_scan_ioapic_request(kvm);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c<br/>index 6f69340f9fa3..bad6a25067bc 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/lapic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/lapic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/lapic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/lapic.c</a></div><div class='hunk'>@@ -115,6 +115,16 @@ static inline int apic_enabled(struct kvm_lapic *apic)</div><div class='ctx'> 	(LVT_MASK | APIC_MODE_MASK | APIC_INPUT_POLARITY | \</div><div class='ctx'> 	 APIC_LVT_REMOTE_IRR | APIC_LVT_LEVEL_TRIGGER)</div><div class='ctx'> </div><div class='add'>+static inline u8 kvm_xapic_id(struct kvm_lapic *apic)</div><div class='add'>+{</div><div class='add'>+	return kvm_lapic_get_reg(apic, APIC_ID) &gt;&gt; 24;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 kvm_x2apic_id(struct kvm_lapic *apic)</div><div class='add'>+{</div><div class='add'>+	return apic-&gt;vcpu-&gt;vcpu_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool kvm_apic_map_get_logical_dest(struct kvm_apic_map *map,</div><div class='ctx'> 		u32 dest_id, struct kvm_lapic ***cluster, u16 *mask) {</div><div class='ctx'> 	switch (map-&gt;mode) {</div><div class='hunk'>@@ -159,13 +169,13 @@ static void recalculate_apic_map(struct kvm *kvm)</div><div class='ctx'> 	struct kvm_apic_map *new, *old = NULL;</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	int i;</div><div class='del'>-	u32 max_id = 255;</div><div class='add'>+	u32 max_id = 255; /* enough space for any xAPIC ID */</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;kvm-&gt;arch.apic_map_lock);</div><div class='ctx'> </div><div class='ctx'> 	kvm_for_each_vcpu(i, vcpu, kvm)</div><div class='ctx'> 		if (kvm_apic_present(vcpu))</div><div class='del'>-			max_id = max(max_id, kvm_apic_id(vcpu-&gt;arch.apic));</div><div class='add'>+			max_id = max(max_id, kvm_x2apic_id(vcpu-&gt;arch.apic));</div><div class='ctx'> </div><div class='ctx'> 	new = kvm_kvzalloc(sizeof(struct kvm_apic_map) +</div><div class='ctx'> 	                   sizeof(struct kvm_lapic *) * ((u64)max_id + 1));</div><div class='hunk'>@@ -179,16 +189,28 @@ static void recalculate_apic_map(struct kvm *kvm)</div><div class='ctx'> 		struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='ctx'> 		struct kvm_lapic **cluster;</div><div class='ctx'> 		u16 mask;</div><div class='del'>-		u32 ldr, aid;</div><div class='add'>+		u32 ldr;</div><div class='add'>+		u8 xapic_id;</div><div class='add'>+		u32 x2apic_id;</div><div class='ctx'> </div><div class='ctx'> 		if (!kvm_apic_present(vcpu))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		aid = kvm_apic_id(apic);</div><div class='del'>-		ldr = kvm_lapic_get_reg(apic, APIC_LDR);</div><div class='add'>+		xapic_id = kvm_xapic_id(apic);</div><div class='add'>+		x2apic_id = kvm_x2apic_id(apic);</div><div class='add'>+</div><div class='add'>+		/* Hotplug hack: see kvm_apic_match_physical_addr(), ... */</div><div class='add'>+		if ((apic_x2apic_mode(apic) || x2apic_id &gt; 0xff) &amp;&amp;</div><div class='add'>+				x2apic_id &lt;= new-&gt;max_apic_id)</div><div class='add'>+			new-&gt;phys_map[x2apic_id] = apic;</div><div class='add'>+		/*</div><div class='add'>+		 * ... xAPIC ID of VCPUs with APIC ID &gt; 0xff will wrap-around,</div><div class='add'>+		 * prevent them from masking VCPUs with APIC ID &lt;= 0xff.</div><div class='add'>+		 */</div><div class='add'>+		if (!apic_x2apic_mode(apic) &amp;&amp; !new-&gt;phys_map[xapic_id])</div><div class='add'>+			new-&gt;phys_map[xapic_id] = apic;</div><div class='ctx'> </div><div class='del'>-		if (aid &lt;= new-&gt;max_apic_id)</div><div class='del'>-			new-&gt;phys_map[aid] = apic;</div><div class='add'>+		ldr = kvm_lapic_get_reg(apic, APIC_LDR);</div><div class='ctx'> </div><div class='ctx'> 		if (apic_x2apic_mode(apic)) {</div><div class='ctx'> 			new-&gt;mode |= KVM_APIC_MODE_X2APIC;</div><div class='hunk'>@@ -250,6 +272,8 @@ static inline void kvm_apic_set_x2apic_id(struct kvm_lapic *apic, u32 id)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ldr = ((id &gt;&gt; 4) &lt;&lt; 16) | (1 &lt;&lt; (id &amp; 0xf));</div><div class='ctx'> </div><div class='add'>+	WARN_ON_ONCE(id != apic-&gt;vcpu-&gt;vcpu_id);</div><div class='add'>+</div><div class='ctx'> 	kvm_lapic_set_reg(apic, APIC_ID, id);</div><div class='ctx'> 	kvm_lapic_set_reg(apic, APIC_LDR, ldr);</div><div class='ctx'> 	recalculate_apic_map(apic-&gt;vcpu-&gt;kvm);</div><div class='hunk'>@@ -317,7 +341,7 @@ static int find_highest_vector(void *bitmap)</div><div class='ctx'> 	     vec &gt;= 0; vec -= APIC_VECTORS_PER_REG) {</div><div class='ctx'> 		reg = bitmap + REG_POS(vec);</div><div class='ctx'> 		if (*reg)</div><div class='del'>-			return fls(*reg) - 1 + vec;</div><div class='add'>+			return __fls(*reg) + vec;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return -1;</div><div class='hunk'>@@ -337,25 +361,32 @@ static u8 count_vectors(void *bitmap)</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __kvm_apic_update_irr(u32 *pir, void *regs)</div><div class='add'>+int __kvm_apic_update_irr(u32 *pir, void *regs)</div><div class='ctx'> {</div><div class='del'>-	u32 i, pir_val;</div><div class='add'>+	u32 i, vec;</div><div class='add'>+	u32 pir_val, irr_val;</div><div class='add'>+	int max_irr = -1;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt;= 7; i++) {</div><div class='del'>-		pir_val = xchg(&amp;pir[i], 0);</div><div class='del'>-		if (pir_val)</div><div class='del'>-			*((u32 *)(regs + APIC_IRR + i * 0x10)) |= pir_val;</div><div class='add'>+	for (i = vec = 0; i &lt;= 7; i++, vec += 32) {</div><div class='add'>+		pir_val = READ_ONCE(pir[i]);</div><div class='add'>+		irr_val = *((u32 *)(regs + APIC_IRR + i * 0x10));</div><div class='add'>+		if (pir_val) {</div><div class='add'>+			irr_val |= xchg(&amp;pir[i], 0);</div><div class='add'>+			*((u32 *)(regs + APIC_IRR + i * 0x10)) = irr_val;</div><div class='add'>+		}</div><div class='add'>+		if (irr_val)</div><div class='add'>+			max_irr = __fls(irr_val) + vec;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return max_irr;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__kvm_apic_update_irr);</div><div class='ctx'> </div><div class='del'>-void kvm_apic_update_irr(struct kvm_vcpu *vcpu, u32 *pir)</div><div class='add'>+int kvm_apic_update_irr(struct kvm_vcpu *vcpu, u32 *pir)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='ctx'> </div><div class='del'>-	__kvm_apic_update_irr(pir, apic-&gt;regs);</div><div class='del'>-</div><div class='del'>-	kvm_make_request(KVM_REQ_EVENT, vcpu);</div><div class='add'>+	return __kvm_apic_update_irr(pir, apic-&gt;regs);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_apic_update_irr);</div><div class='ctx'> </div><div class='hunk'>@@ -375,8 +406,6 @@ static inline int apic_find_highest_irr(struct kvm_lapic *apic)</div><div class='ctx'> 	if (!apic-&gt;irr_pending)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (apic-&gt;vcpu-&gt;arch.apicv_active)</div><div class='del'>-		kvm_x86_ops-&gt;sync_pir_to_irr(apic-&gt;vcpu);</div><div class='ctx'> 	result = apic_search_irr(apic);</div><div class='ctx'> 	ASSERT(result == -1 || result &gt;= 16);</div><div class='ctx'> </div><div class='hunk'>@@ -390,9 +419,10 @@ static inline void apic_clear_irr(int vec, struct kvm_lapic *apic)</div><div class='ctx'> 	vcpu = apic-&gt;vcpu;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(vcpu-&gt;arch.apicv_active)) {</div><div class='del'>-		/* try to update RVI */</div><div class='add'>+		/* need to update RVI */</div><div class='ctx'> 		apic_clear_vector(vec, apic-&gt;regs + APIC_IRR);</div><div class='del'>-		kvm_make_request(KVM_REQ_EVENT, vcpu);</div><div class='add'>+		kvm_x86_ops-&gt;hwapic_irr_update(vcpu,</div><div class='add'>+				apic_find_highest_irr(apic));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		apic-&gt;irr_pending = false;</div><div class='ctx'> 		apic_clear_vector(vec, apic-&gt;regs + APIC_IRR);</div><div class='hunk'>@@ -482,6 +512,7 @@ int kvm_lapic_find_highest_irr(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	 */</div><div class='ctx'> 	return apic_find_highest_irr(vcpu-&gt;arch.apic);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_lapic_find_highest_irr);</div><div class='ctx'> </div><div class='ctx'> static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,</div><div class='ctx'> 			     int vector, int level, int trig_mode,</div><div class='hunk'>@@ -498,16 +529,14 @@ int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq,</div><div class='ctx'> </div><div class='ctx'> static int pv_eoi_put_user(struct kvm_vcpu *vcpu, u8 val)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	return kvm_write_guest_cached(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.pv_eoi.data, &amp;val,</div><div class='del'>-				      sizeof(val));</div><div class='add'>+	return kvm_vcpu_write_guest_cached(vcpu, &amp;vcpu-&gt;arch.pv_eoi.data, &amp;val,</div><div class='add'>+					   sizeof(val));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pv_eoi_get_user(struct kvm_vcpu *vcpu, u8 *val)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	return kvm_read_guest_cached(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.pv_eoi.data, val,</div><div class='del'>-				      sizeof(*val));</div><div class='add'>+	return kvm_vcpu_read_guest_cached(vcpu, &amp;vcpu-&gt;arch.pv_eoi.data, val,</div><div class='add'>+					  sizeof(*val));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool pv_eoi_enabled(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -544,7 +573,19 @@ static void pv_eoi_clr_pending(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	__clear_bit(KVM_APIC_PV_EOI_PENDING, &amp;vcpu-&gt;arch.apic_attention);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void apic_update_ppr(struct kvm_lapic *apic)</div><div class='add'>+static int apic_has_interrupt_for_ppr(struct kvm_lapic *apic, u32 ppr)</div><div class='add'>+{</div><div class='add'>+	int highest_irr;</div><div class='add'>+	if (kvm_x86_ops-&gt;sync_pir_to_irr &amp;&amp; apic-&gt;vcpu-&gt;arch.apicv_active)</div><div class='add'>+		highest_irr = kvm_x86_ops-&gt;sync_pir_to_irr(apic-&gt;vcpu);</div><div class='add'>+	else</div><div class='add'>+		highest_irr = apic_find_highest_irr(apic);</div><div class='add'>+	if (highest_irr == -1 || (highest_irr &amp; 0xF0) &lt;= ppr)</div><div class='add'>+		return -1;</div><div class='add'>+	return highest_irr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __apic_update_ppr(struct kvm_lapic *apic, u32 *new_ppr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tpr, isrv, ppr, old_ppr;</div><div class='ctx'> 	int isr;</div><div class='hunk'>@@ -562,13 +603,28 @@ static void apic_update_ppr(struct kvm_lapic *apic)</div><div class='ctx'> 	apic_debug("vlapic %p, ppr 0x%x, isr 0x%x, isrv 0x%x",</div><div class='ctx'> 		   apic, ppr, isr, isrv);</div><div class='ctx'> </div><div class='del'>-	if (old_ppr != ppr) {</div><div class='add'>+	*new_ppr = ppr;</div><div class='add'>+	if (old_ppr != ppr)</div><div class='ctx'> 		kvm_lapic_set_reg(apic, APIC_PROCPRI, ppr);</div><div class='del'>-		if (ppr &lt; old_ppr)</div><div class='del'>-			kvm_make_request(KVM_REQ_EVENT, apic-&gt;vcpu);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	return ppr &lt; old_ppr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void apic_update_ppr(struct kvm_lapic *apic)</div><div class='add'>+{</div><div class='add'>+	u32 ppr;</div><div class='add'>+</div><div class='add'>+	if (__apic_update_ppr(apic, &amp;ppr) &amp;&amp;</div><div class='add'>+	    apic_has_interrupt_for_ppr(apic, ppr) != -1)</div><div class='add'>+		kvm_make_request(KVM_REQ_EVENT, apic-&gt;vcpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_apic_update_ppr(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	apic_update_ppr(vcpu-&gt;arch.apic);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_apic_update_ppr);</div><div class='add'>+</div><div class='ctx'> static void apic_set_tpr(struct kvm_lapic *apic, u32 tpr)</div><div class='ctx'> {</div><div class='ctx'> 	kvm_lapic_set_reg(apic, APIC_TASKPRI, tpr);</div><div class='hunk'>@@ -577,10 +633,8 @@ static void apic_set_tpr(struct kvm_lapic *apic, u32 tpr)</div><div class='ctx'> </div><div class='ctx'> static bool kvm_apic_broadcast(struct kvm_lapic *apic, u32 mda)</div><div class='ctx'> {</div><div class='del'>-	if (apic_x2apic_mode(apic))</div><div class='del'>-		return mda == X2APIC_BROADCAST;</div><div class='del'>-</div><div class='del'>-	return GET_APIC_DEST_FIELD(mda) == APIC_BROADCAST;</div><div class='add'>+	return mda == (apic_x2apic_mode(apic) ?</div><div class='add'>+			X2APIC_BROADCAST : APIC_BROADCAST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool kvm_apic_match_physical_addr(struct kvm_lapic *apic, u32 mda)</div><div class='hunk'>@@ -589,9 +643,18 @@ static bool kvm_apic_match_physical_addr(struct kvm_lapic *apic, u32 mda)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	if (apic_x2apic_mode(apic))</div><div class='del'>-		return mda == kvm_apic_id(apic);</div><div class='add'>+		return mda == kvm_x2apic_id(apic);</div><div class='ctx'> </div><div class='del'>-	return mda == SET_APIC_DEST_FIELD(kvm_apic_id(apic));</div><div class='add'>+	/*</div><div class='add'>+	 * Hotplug hack: Make LAPIC in xAPIC mode also accept interrupts as if</div><div class='add'>+	 * it were in x2APIC mode.  Hotplugged VCPUs start in xAPIC mode and</div><div class='add'>+	 * this allows unique addressing of VCPUs with APIC ID over 0xff.</div><div class='add'>+	 * The 0xff condition is needed because writeable xAPIC ID.</div><div class='add'>+	 */</div><div class='add'>+	if (kvm_x2apic_id(apic) &gt; 0xff &amp;&amp; mda == kvm_x2apic_id(apic))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return mda == kvm_xapic_id(apic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda)</div><div class='hunk'>@@ -608,7 +671,6 @@ static bool kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda)</div><div class='ctx'> 		       &amp;&amp; (logical_id &amp; mda &amp; 0xffff) != 0;</div><div class='ctx'> </div><div class='ctx'> 	logical_id = GET_APIC_LOGICAL_ID(logical_id);</div><div class='del'>-	mda = GET_APIC_DEST_FIELD(mda);</div><div class='ctx'> </div><div class='ctx'> 	switch (kvm_lapic_get_reg(apic, APIC_DFR)) {</div><div class='ctx'> 	case APIC_DFR_FLAT:</div><div class='hunk'>@@ -625,9 +687,9 @@ static bool kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda)</div><div class='ctx'> </div><div class='ctx'> /* The KVM local APIC implementation has two quirks:</div><div class='ctx'>  *</div><div class='del'>- *  - the xAPIC MDA stores the destination at bits 24-31, while this</div><div class='del'>- *    is not true of struct kvm_lapic_irq's dest_id field.  This is</div><div class='del'>- *    just a quirk in the API and is not problematic.</div><div class='add'>+ *  - Real hardware delivers interrupts destined to x2APIC ID &gt; 0xff to LAPICs</div><div class='add'>+ *    in xAPIC mode if the "destination &amp; 0xff" matches its xAPIC ID.</div><div class='add'>+ *    KVM doesn't do that aliasing.</div><div class='ctx'>  *</div><div class='ctx'>  *  - in-kernel IOAPIC messages have to be delivered directly to</div><div class='ctx'>  *    x2APIC, because the kernel does not support interrupt remapping.</div><div class='hunk'>@@ -643,13 +705,12 @@ static u32 kvm_apic_mda(struct kvm_vcpu *vcpu, unsigned int dest_id,</div><div class='ctx'> 		struct kvm_lapic *source, struct kvm_lapic *target)</div><div class='ctx'> {</div><div class='ctx'> 	bool ipi = source != NULL;</div><div class='del'>-	bool x2apic_mda = apic_x2apic_mode(ipi ? source : target);</div><div class='ctx'> </div><div class='ctx'> 	if (!vcpu-&gt;kvm-&gt;arch.x2apic_broadcast_quirk_disabled &amp;&amp;</div><div class='del'>-	    !ipi &amp;&amp; dest_id == APIC_BROADCAST &amp;&amp; x2apic_mda)</div><div class='add'>+	    !ipi &amp;&amp; dest_id == APIC_BROADCAST &amp;&amp; apic_x2apic_mode(target))</div><div class='ctx'> 		return X2APIC_BROADCAST;</div><div class='ctx'> </div><div class='del'>-	return x2apic_mda ? dest_id : SET_APIC_DEST_FIELD(dest_id);</div><div class='add'>+	return dest_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,</div><div class='hunk'>@@ -1090,7 +1151,7 @@ static void apic_send_ipi(struct kvm_lapic *apic)</div><div class='ctx'> </div><div class='ctx'> static u32 apic_get_tmcct(struct kvm_lapic *apic)</div><div class='ctx'> {</div><div class='del'>-	ktime_t remaining;</div><div class='add'>+	ktime_t remaining, now;</div><div class='ctx'> 	s64 ns;</div><div class='ctx'> 	u32 tmcct;</div><div class='ctx'> </div><div class='hunk'>@@ -1101,9 +1162,10 @@ static u32 apic_get_tmcct(struct kvm_lapic *apic)</div><div class='ctx'> 		apic-&gt;lapic_timer.period == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	remaining = hrtimer_get_remaining(&amp;apic-&gt;lapic_timer.timer);</div><div class='add'>+	now = ktime_get();</div><div class='add'>+	remaining = ktime_sub(apic-&gt;lapic_timer.target_expiration, now);</div><div class='ctx'> 	if (ktime_to_ns(remaining) &lt; 0)</div><div class='del'>-		remaining = ktime_set(0, 0);</div><div class='add'>+		remaining = 0;</div><div class='ctx'> </div><div class='ctx'> 	ns = mod_64(ktime_to_ns(remaining), apic-&gt;lapic_timer.period);</div><div class='ctx'> 	tmcct = div64_u64(ns,</div><div class='hunk'>@@ -1332,7 +1394,7 @@ static void start_sw_tscdeadline(struct kvm_lapic *apic)</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='del'>-	now = apic-&gt;lapic_timer.timer.base-&gt;get_time();</div><div class='add'>+	now = ktime_get();</div><div class='ctx'> 	guest_tsc = kvm_read_l1_tsc(vcpu, rdtsc());</div><div class='ctx'> 	if (likely(tscdeadline &gt; guest_tsc)) {</div><div class='ctx'> 		ns = (tscdeadline - guest_tsc) * 1000000ULL;</div><div class='hunk'>@@ -1347,6 +1409,79 @@ static void start_sw_tscdeadline(struct kvm_lapic *apic)</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void start_sw_period(struct kvm_lapic *apic)</div><div class='add'>+{</div><div class='add'>+	if (!apic-&gt;lapic_timer.period)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (apic_lvtt_oneshot(apic) &amp;&amp;</div><div class='add'>+	    ktime_after(ktime_get(),</div><div class='add'>+			apic-&gt;lapic_timer.target_expiration)) {</div><div class='add'>+		apic_timer_expired(apic);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hrtimer_start(&amp;apic-&gt;lapic_timer.timer,</div><div class='add'>+		apic-&gt;lapic_timer.target_expiration,</div><div class='add'>+		HRTIMER_MODE_ABS_PINNED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool set_target_expiration(struct kvm_lapic *apic)</div><div class='add'>+{</div><div class='add'>+	ktime_t now;</div><div class='add'>+	u64 tscl = rdtsc();</div><div class='add'>+</div><div class='add'>+	now = ktime_get();</div><div class='add'>+	apic-&gt;lapic_timer.period = (u64)kvm_lapic_get_reg(apic, APIC_TMICT)</div><div class='add'>+		* APIC_BUS_CYCLE_NS * apic-&gt;divide_count;</div><div class='add'>+</div><div class='add'>+	if (!apic-&gt;lapic_timer.period)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do not allow the guest to program periodic timers with small</div><div class='add'>+	 * interval, since the hrtimers are not throttled by the host</div><div class='add'>+	 * scheduler.</div><div class='add'>+	 */</div><div class='add'>+	if (apic_lvtt_period(apic)) {</div><div class='add'>+		s64 min_period = min_timer_period_us * 1000LL;</div><div class='add'>+</div><div class='add'>+		if (apic-&gt;lapic_timer.period &lt; min_period) {</div><div class='add'>+			pr_info_ratelimited(</div><div class='add'>+			    "kvm: vcpu %i: requested %lld ns "</div><div class='add'>+			    "lapic timer period limited to %lld ns\n",</div><div class='add'>+			    apic-&gt;vcpu-&gt;vcpu_id,</div><div class='add'>+			    apic-&gt;lapic_timer.period, min_period);</div><div class='add'>+			apic-&gt;lapic_timer.period = min_period;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	apic_debug("%s: bus cycle is %" PRId64 "ns, now 0x%016"</div><div class='add'>+		   PRIx64 ", "</div><div class='add'>+		   "timer initial count 0x%x, period %lldns, "</div><div class='add'>+		   "expire @ 0x%016" PRIx64 ".\n", __func__,</div><div class='add'>+		   APIC_BUS_CYCLE_NS, ktime_to_ns(now),</div><div class='add'>+		   kvm_lapic_get_reg(apic, APIC_TMICT),</div><div class='add'>+		   apic-&gt;lapic_timer.period,</div><div class='add'>+		   ktime_to_ns(ktime_add_ns(now,</div><div class='add'>+				apic-&gt;lapic_timer.period)));</div><div class='add'>+</div><div class='add'>+	apic-&gt;lapic_timer.tscdeadline = kvm_read_l1_tsc(apic-&gt;vcpu, tscl) +</div><div class='add'>+		nsec_to_cycles(apic-&gt;vcpu, apic-&gt;lapic_timer.period);</div><div class='add'>+	apic-&gt;lapic_timer.target_expiration = ktime_add_ns(now, apic-&gt;lapic_timer.period);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void advance_periodic_target_expiration(struct kvm_lapic *apic)</div><div class='add'>+{</div><div class='add'>+	apic-&gt;lapic_timer.tscdeadline +=</div><div class='add'>+		nsec_to_cycles(apic-&gt;vcpu, apic-&gt;lapic_timer.period);</div><div class='add'>+	apic-&gt;lapic_timer.target_expiration =</div><div class='add'>+		ktime_add_ns(apic-&gt;lapic_timer.target_expiration,</div><div class='add'>+				apic-&gt;lapic_timer.period);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool kvm_lapic_hv_timer_in_use(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	if (!lapic_in_kernel(vcpu))</div><div class='hunk'>@@ -1356,52 +1491,59 @@ bool kvm_lapic_hv_timer_in_use(struct kvm_vcpu *vcpu)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_lapic_hv_timer_in_use);</div><div class='ctx'> </div><div class='del'>-static void cancel_hv_tscdeadline(struct kvm_lapic *apic)</div><div class='add'>+static void cancel_hv_timer(struct kvm_lapic *apic)</div><div class='ctx'> {</div><div class='ctx'> 	kvm_x86_ops-&gt;cancel_hv_timer(apic-&gt;vcpu);</div><div class='ctx'> 	apic-&gt;lapic_timer.hv_timer_in_use = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void kvm_lapic_expired_hv_timer(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='del'>-</div><div class='del'>-	WARN_ON(!apic-&gt;lapic_timer.hv_timer_in_use);</div><div class='del'>-	WARN_ON(swait_active(&amp;vcpu-&gt;wq));</div><div class='del'>-	cancel_hv_tscdeadline(apic);</div><div class='del'>-	apic_timer_expired(apic);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_lapic_expired_hv_timer);</div><div class='del'>-</div><div class='del'>-static bool start_hv_tscdeadline(struct kvm_lapic *apic)</div><div class='add'>+static bool start_hv_timer(struct kvm_lapic *apic)</div><div class='ctx'> {</div><div class='ctx'> 	u64 tscdeadline = apic-&gt;lapic_timer.tscdeadline;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;apic-&gt;lapic_timer.pending) ||</div><div class='add'>+	if ((atomic_read(&amp;apic-&gt;lapic_timer.pending) &amp;&amp;</div><div class='add'>+		!apic_lvtt_period(apic)) ||</div><div class='ctx'> 		kvm_x86_ops-&gt;set_hv_timer(apic-&gt;vcpu, tscdeadline)) {</div><div class='ctx'> 		if (apic-&gt;lapic_timer.hv_timer_in_use)</div><div class='del'>-			cancel_hv_tscdeadline(apic);</div><div class='add'>+			cancel_hv_timer(apic);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		apic-&gt;lapic_timer.hv_timer_in_use = true;</div><div class='ctx'> 		hrtimer_cancel(&amp;apic-&gt;lapic_timer.timer);</div><div class='ctx'> </div><div class='ctx'> 		/* In case the sw timer triggered in the window */</div><div class='del'>-		if (atomic_read(&amp;apic-&gt;lapic_timer.pending))</div><div class='del'>-			cancel_hv_tscdeadline(apic);</div><div class='add'>+		if (atomic_read(&amp;apic-&gt;lapic_timer.pending) &amp;&amp;</div><div class='add'>+			!apic_lvtt_period(apic))</div><div class='add'>+			cancel_hv_timer(apic);</div><div class='ctx'> 	}</div><div class='ctx'> 	trace_kvm_hv_timer_state(apic-&gt;vcpu-&gt;vcpu_id,</div><div class='ctx'> 			apic-&gt;lapic_timer.hv_timer_in_use);</div><div class='ctx'> 	return apic-&gt;lapic_timer.hv_timer_in_use;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void kvm_lapic_expired_hv_timer(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!apic-&gt;lapic_timer.hv_timer_in_use);</div><div class='add'>+	WARN_ON(swait_active(&amp;vcpu-&gt;wq));</div><div class='add'>+	cancel_hv_timer(apic);</div><div class='add'>+	apic_timer_expired(apic);</div><div class='add'>+</div><div class='add'>+	if (apic_lvtt_period(apic) &amp;&amp; apic-&gt;lapic_timer.period) {</div><div class='add'>+		advance_periodic_target_expiration(apic);</div><div class='add'>+		if (!start_hv_timer(apic))</div><div class='add'>+			start_sw_period(apic);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_lapic_expired_hv_timer);</div><div class='add'>+</div><div class='ctx'> void kvm_lapic_switch_to_hv_timer(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(apic-&gt;lapic_timer.hv_timer_in_use);</div><div class='ctx'> </div><div class='del'>-	if (apic_lvtt_tscdeadline(apic))</div><div class='del'>-		start_hv_tscdeadline(apic);</div><div class='add'>+	start_hv_timer(apic);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_lapic_switch_to_hv_timer);</div><div class='ctx'> </div><div class='hunk'>@@ -1413,62 +1555,28 @@ void kvm_lapic_switch_to_sw_timer(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (!apic-&gt;lapic_timer.hv_timer_in_use)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	cancel_hv_tscdeadline(apic);</div><div class='add'>+	cancel_hv_timer(apic);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;apic-&gt;lapic_timer.pending))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	start_sw_tscdeadline(apic);</div><div class='add'>+	if (apic_lvtt_period(apic) || apic_lvtt_oneshot(apic))</div><div class='add'>+		start_sw_period(apic);</div><div class='add'>+	else if (apic_lvtt_tscdeadline(apic))</div><div class='add'>+		start_sw_tscdeadline(apic);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_lapic_switch_to_sw_timer);</div><div class='ctx'> </div><div class='ctx'> static void start_apic_timer(struct kvm_lapic *apic)</div><div class='ctx'> {</div><div class='del'>-	ktime_t now;</div><div class='del'>-</div><div class='ctx'> 	atomic_set(&amp;apic-&gt;lapic_timer.pending, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (apic_lvtt_period(apic) || apic_lvtt_oneshot(apic)) {</div><div class='del'>-		/* lapic timer in oneshot or periodic mode */</div><div class='del'>-		now = apic-&gt;lapic_timer.timer.base-&gt;get_time();</div><div class='del'>-		apic-&gt;lapic_timer.period = (u64)kvm_lapic_get_reg(apic, APIC_TMICT)</div><div class='del'>-			    * APIC_BUS_CYCLE_NS * apic-&gt;divide_count;</div><div class='del'>-</div><div class='del'>-		if (!apic-&gt;lapic_timer.period)</div><div class='del'>-			return;</div><div class='del'>-		/*</div><div class='del'>-		 * Do not allow the guest to program periodic timers with small</div><div class='del'>-		 * interval, since the hrtimers are not throttled by the host</div><div class='del'>-		 * scheduler.</div><div class='del'>-		 */</div><div class='del'>-		if (apic_lvtt_period(apic)) {</div><div class='del'>-			s64 min_period = min_timer_period_us * 1000LL;</div><div class='del'>-</div><div class='del'>-			if (apic-&gt;lapic_timer.period &lt; min_period) {</div><div class='del'>-				pr_info_ratelimited(</div><div class='del'>-				    "kvm: vcpu %i: requested %lld ns "</div><div class='del'>-				    "lapic timer period limited to %lld ns\n",</div><div class='del'>-				    apic-&gt;vcpu-&gt;vcpu_id,</div><div class='del'>-				    apic-&gt;lapic_timer.period, min_period);</div><div class='del'>-				apic-&gt;lapic_timer.period = min_period;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hrtimer_start(&amp;apic-&gt;lapic_timer.timer,</div><div class='del'>-			      ktime_add_ns(now, apic-&gt;lapic_timer.period),</div><div class='del'>-			      HRTIMER_MODE_ABS_PINNED);</div><div class='del'>-</div><div class='del'>-		apic_debug("%s: bus cycle is %" PRId64 "ns, now 0x%016"</div><div class='del'>-			   PRIx64 ", "</div><div class='del'>-			   "timer initial count 0x%x, period %lldns, "</div><div class='del'>-			   "expire @ 0x%016" PRIx64 ".\n", __func__,</div><div class='del'>-			   APIC_BUS_CYCLE_NS, ktime_to_ns(now),</div><div class='del'>-			   kvm_lapic_get_reg(apic, APIC_TMICT),</div><div class='del'>-			   apic-&gt;lapic_timer.period,</div><div class='del'>-			   ktime_to_ns(ktime_add_ns(now,</div><div class='del'>-					apic-&gt;lapic_timer.period)));</div><div class='add'>+		if (set_target_expiration(apic) &amp;&amp;</div><div class='add'>+			!(kvm_x86_ops-&gt;set_hv_timer &amp;&amp; start_hv_timer(apic)))</div><div class='add'>+			start_sw_period(apic);</div><div class='ctx'> 	} else if (apic_lvtt_tscdeadline(apic)) {</div><div class='del'>-		if (!(kvm_x86_ops-&gt;set_hv_timer &amp;&amp; start_hv_tscdeadline(apic)))</div><div class='add'>+		if (!(kvm_x86_ops-&gt;set_hv_timer &amp;&amp; start_hv_timer(apic)))</div><div class='ctx'> 			start_sw_tscdeadline(apic);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1701,13 +1809,22 @@ void kvm_free_lapic(struct kvm_vcpu *vcpu)</div><div class='ctx'>  * LAPIC interface</div><div class='ctx'>  *----------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='add'>+u64 kvm_get_lapic_target_expiration_tsc(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='add'>+</div><div class='add'>+	if (!lapic_in_kernel(vcpu))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return apic-&gt;lapic_timer.tscdeadline;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> u64 kvm_get_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='ctx'> </div><div class='del'>-	if (!lapic_in_kernel(vcpu) || apic_lvtt_oneshot(apic) ||</div><div class='del'>-			apic_lvtt_period(apic))</div><div class='add'>+	if (!lapic_in_kernel(vcpu) ||</div><div class='add'>+		!apic_lvtt_tscdeadline(apic))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return apic-&gt;lapic_timer.tscdeadline;</div><div class='hunk'>@@ -1748,14 +1865,17 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)</div><div class='ctx'> 	u64 old_value = vcpu-&gt;arch.apic_base;</div><div class='ctx'> 	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='ctx'> </div><div class='del'>-	if (!apic) {</div><div class='add'>+	if (!apic)</div><div class='ctx'> 		value |= MSR_IA32_APICBASE_BSP;</div><div class='del'>-		vcpu-&gt;arch.apic_base = value;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.apic_base = value;</div><div class='ctx'> </div><div class='add'>+	if ((old_value ^ value) &amp; MSR_IA32_APICBASE_ENABLE)</div><div class='add'>+		kvm_update_cpuid(vcpu);</div><div class='add'>+</div><div class='add'>+	if (!apic)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* update jump label if enable bit changes */</div><div class='ctx'> 	if ((old_value ^ value) &amp; MSR_IA32_APICBASE_ENABLE) {</div><div class='ctx'> 		if (value &amp; MSR_IA32_APICBASE_ENABLE) {</div><div class='hunk'>@@ -1846,9 +1966,9 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event)</div><div class='ctx'> 	vcpu-&gt;arch.apic_arb_prio = 0;</div><div class='ctx'> 	vcpu-&gt;arch.apic_attention = 0;</div><div class='ctx'> </div><div class='del'>-	apic_debug("%s: vcpu=%p, id=%d, base_msr="</div><div class='add'>+	apic_debug("%s: vcpu=%p, id=0x%x, base_msr="</div><div class='ctx'> 		   "0x%016" PRIx64 ", base_address=0x%0lx.\n", __func__,</div><div class='del'>-		   vcpu, kvm_apic_id(apic),</div><div class='add'>+		   vcpu, kvm_lapic_get_reg(apic, APIC_ID),</div><div class='ctx'> 		   vcpu-&gt;arch.apic_base, apic-&gt;base_address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1909,6 +2029,7 @@ static enum hrtimer_restart apic_timer_fn(struct hrtimer *data)</div><div class='ctx'> 	apic_timer_expired(apic);</div><div class='ctx'> </div><div class='ctx'> 	if (lapic_is_periodic(apic)) {</div><div class='add'>+		advance_periodic_target_expiration(apic);</div><div class='ctx'> 		hrtimer_add_expires_ns(&amp;ktimer-&gt;timer, ktimer-&gt;period);</div><div class='ctx'> 		return HRTIMER_RESTART;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -1959,17 +2080,13 @@ nomem:</div><div class='ctx'> int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='del'>-	int highest_irr;</div><div class='add'>+	u32 ppr;</div><div class='ctx'> </div><div class='ctx'> 	if (!apic_enabled(apic))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	apic_update_ppr(apic);</div><div class='del'>-	highest_irr = apic_find_highest_irr(apic);</div><div class='del'>-	if ((highest_irr == -1) ||</div><div class='del'>-	    ((highest_irr &amp; 0xF0) &lt;= kvm_lapic_get_reg(apic, APIC_PROCPRI)))</div><div class='del'>-		return -1;</div><div class='del'>-	return highest_irr;</div><div class='add'>+	__apic_update_ppr(apic, &amp;ppr);</div><div class='add'>+	return apic_has_interrupt_for_ppr(apic, ppr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int kvm_apic_accept_pic_intr(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -1993,6 +2110,10 @@ void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		kvm_apic_local_deliver(apic, APIC_LVTT);</div><div class='ctx'> 		if (apic_lvtt_tscdeadline(apic))</div><div class='ctx'> 			apic-&gt;lapic_timer.tscdeadline = 0;</div><div class='add'>+		if (apic_lvtt_oneshot(apic)) {</div><div class='add'>+			apic-&gt;lapic_timer.tscdeadline = 0;</div><div class='add'>+			apic-&gt;lapic_timer.target_expiration = 0;</div><div class='add'>+		}</div><div class='ctx'> 		atomic_set(&amp;apic-&gt;lapic_timer.pending, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2001,6 +2122,7 @@ int kvm_get_apic_interrupt(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	int vector = kvm_apic_has_interrupt(vcpu);</div><div class='ctx'> 	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='add'>+	u32 ppr;</div><div class='ctx'> </div><div class='ctx'> 	if (vector == -1)</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -2012,13 +2134,23 @@ int kvm_get_apic_interrupt(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	 * because the process would deliver it through the IDT.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	apic_set_isr(vector, apic);</div><div class='del'>-	apic_update_ppr(apic);</div><div class='ctx'> 	apic_clear_irr(vector, apic);</div><div class='del'>-</div><div class='ctx'> 	if (test_bit(vector, vcpu_to_synic(vcpu)-&gt;auto_eoi_bitmap)) {</div><div class='del'>-		apic_clear_isr(vector, apic);</div><div class='add'>+		/*</div><div class='add'>+		 * For auto-EOI interrupts, there might be another pending</div><div class='add'>+		 * interrupt above PPR, so check whether to raise another</div><div class='add'>+		 * KVM_REQ_EVENT.</div><div class='add'>+		 */</div><div class='ctx'> 		apic_update_ppr(apic);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * For normal interrupts, PPR has been raised and there cannot</div><div class='add'>+		 * be a higher-priority pending interrupt---except if there was</div><div class='add'>+		 * a concurrent interrupt injection, but that would have</div><div class='add'>+		 * triggered KVM_REQ_EVENT already.</div><div class='add'>+		 */</div><div class='add'>+		apic_set_isr(vector, apic);</div><div class='add'>+		__apic_update_ppr(apic, &amp;ppr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return vector;</div><div class='hunk'>@@ -2079,8 +2211,7 @@ int kvm_apic_set_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s)</div><div class='ctx'> 				1 : count_vectors(apic-&gt;regs + APIC_ISR);</div><div class='ctx'> 	apic-&gt;highest_isr_cache = -1;</div><div class='ctx'> 	if (vcpu-&gt;arch.apicv_active) {</div><div class='del'>-		if (kvm_x86_ops-&gt;apicv_post_state_restore)</div><div class='del'>-			kvm_x86_ops-&gt;apicv_post_state_restore(vcpu);</div><div class='add'>+		kvm_x86_ops-&gt;apicv_post_state_restore(vcpu);</div><div class='ctx'> 		kvm_x86_ops-&gt;hwapic_irr_update(vcpu,</div><div class='ctx'> 				apic_find_highest_irr(apic));</div><div class='ctx'> 		kvm_x86_ops-&gt;hwapic_isr_update(vcpu,</div><div class='hunk'>@@ -2154,8 +2285,8 @@ void kvm_lapic_sync_from_vapic(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (!test_bit(KVM_APIC_CHECK_VAPIC, &amp;vcpu-&gt;arch.apic_attention))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (kvm_read_guest_cached(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.apic-&gt;vapic_cache, &amp;data,</div><div class='del'>-				  sizeof(u32)))</div><div class='add'>+	if (kvm_vcpu_read_guest_cached(vcpu, &amp;vcpu-&gt;arch.apic-&gt;vapic_cache, &amp;data,</div><div class='add'>+				       sizeof(u32)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	apic_set_tpr(vcpu-&gt;arch.apic, data &amp; 0xff);</div><div class='hunk'>@@ -2207,14 +2338,14 @@ void kvm_lapic_sync_to_vapic(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		max_isr = 0;</div><div class='ctx'> 	data = (tpr &amp; 0xff) | ((max_isr &amp; 0xf0) &lt;&lt; 8) | (max_irr &lt;&lt; 24);</div><div class='ctx'> </div><div class='del'>-	kvm_write_guest_cached(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.apic-&gt;vapic_cache, &amp;data,</div><div class='del'>-				sizeof(u32));</div><div class='add'>+	kvm_vcpu_write_guest_cached(vcpu, &amp;vcpu-&gt;arch.apic-&gt;vapic_cache, &amp;data,</div><div class='add'>+				    sizeof(u32));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int kvm_lapic_set_vapic_addr(struct kvm_vcpu *vcpu, gpa_t vapic_addr)</div><div class='ctx'> {</div><div class='ctx'> 	if (vapic_addr) {</div><div class='del'>-		if (kvm_gfn_to_hva_cache_init(vcpu-&gt;kvm,</div><div class='add'>+		if (kvm_vcpu_gfn_to_hva_cache_init(vcpu,</div><div class='ctx'> 					&amp;vcpu-&gt;arch.apic-&gt;vapic_cache,</div><div class='ctx'> 					vapic_addr, sizeof(u32)))</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -2308,7 +2439,7 @@ int kvm_lapic_enable_pv_eoi(struct kvm_vcpu *vcpu, u64 data)</div><div class='ctx'> 	vcpu-&gt;arch.pv_eoi.msr_val = data;</div><div class='ctx'> 	if (!pv_eoi_enabled(vcpu))</div><div class='ctx'> 		return 0;</div><div class='del'>-	return kvm_gfn_to_hva_cache_init(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.pv_eoi.data,</div><div class='add'>+	return kvm_vcpu_gfn_to_hva_cache_init(vcpu, &amp;vcpu-&gt;arch.pv_eoi.data,</div><div class='ctx'> 					 addr, sizeof(u8));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2360,3 +2491,9 @@ void kvm_lapic_init(void)</div><div class='ctx'> 	jump_label_rate_limit(&amp;apic_hw_disabled, HZ);</div><div class='ctx'> 	jump_label_rate_limit(&amp;apic_sw_disabled, HZ);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void kvm_lapic_exit(void)</div><div class='add'>+{</div><div class='add'>+	static_key_deferred_flush(&amp;apic_hw_disabled);</div><div class='add'>+	static_key_deferred_flush(&amp;apic_sw_disabled);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h<br/>index f60d01c29d51..bcbe811f3b97 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/lapic.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/lapic.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/lapic.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/lapic.h</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> struct kvm_timer {</div><div class='ctx'> 	struct hrtimer timer;</div><div class='ctx'> 	s64 period; 				/* unit: ns */</div><div class='add'>+	ktime_t target_expiration;</div><div class='ctx'> 	u32 timer_mode;</div><div class='ctx'> 	u32 timer_mode_mask;</div><div class='ctx'> 	u64 tscdeadline;</div><div class='hunk'>@@ -70,8 +71,9 @@ int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len,</div><div class='ctx'> bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,</div><div class='ctx'> 			   int short_hand, unsigned int dest, int dest_mode);</div><div class='ctx'> </div><div class='del'>-void __kvm_apic_update_irr(u32 *pir, void *regs);</div><div class='del'>-void kvm_apic_update_irr(struct kvm_vcpu *vcpu, u32 *pir);</div><div class='add'>+int __kvm_apic_update_irr(u32 *pir, void *regs);</div><div class='add'>+int kvm_apic_update_irr(struct kvm_vcpu *vcpu, u32 *pir);</div><div class='add'>+void kvm_apic_update_ppr(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq,</div><div class='ctx'> 		     struct dest_map *dest_map);</div><div class='ctx'> int kvm_apic_local_deliver(struct kvm_lapic *apic, int lvt_type);</div><div class='hunk'>@@ -85,6 +87,7 @@ int kvm_apic_get_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s);</div><div class='ctx'> int kvm_apic_set_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s);</div><div class='ctx'> int kvm_lapic_find_highest_irr(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='add'>+u64 kvm_get_lapic_target_expiration_tsc(struct kvm_vcpu *vcpu);</div><div class='ctx'> u64 kvm_get_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_set_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu, u64 data);</div><div class='ctx'> </div><div class='hunk'>@@ -108,6 +111,7 @@ static inline bool kvm_hv_vapic_assist_page_enabled(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> int kvm_lapic_enable_pv_eoi(struct kvm_vcpu *vcpu, u64 data);</div><div class='ctx'> void kvm_lapic_init(void);</div><div class='add'>+void kvm_lapic_exit(void);</div><div class='ctx'> </div><div class='ctx'> #define VEC_POS(v) ((v) &amp; (32 - 1))</div><div class='ctx'> #define REG_POS(v) (((v) &gt;&gt; 5) &lt;&lt; 4)</div><div class='hunk'>@@ -200,17 +204,6 @@ static inline int kvm_lapic_latched_init(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	return lapic_in_kernel(vcpu) &amp;&amp; test_bit(KVM_APIC_INIT, &amp;vcpu-&gt;arch.apic-&gt;pending_events);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 kvm_apic_id(struct kvm_lapic *apic)</div><div class='del'>-{</div><div class='del'>-	/* To avoid a race between apic_base and following APIC_ID update when</div><div class='del'>-	 * switching to x2apic_mode, the x2apic mode returns initial x2apic id.</div><div class='del'>-	 */</div><div class='del'>-	if (apic_x2apic_mode(apic))</div><div class='del'>-		return apic-&gt;vcpu-&gt;vcpu_id;</div><div class='del'>-</div><div class='del'>-	return kvm_lapic_get_reg(apic, APIC_ID) &gt;&gt; 24;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector);</div><div class='ctx'> </div><div class='ctx'> void wait_lapic_expire(struct kvm_vcpu *vcpu);</div><div class='head'>diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c<br/>index d9c7e986b4e4..ac7810513d0e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/mmu.c</a></div><div class='hunk'>@@ -36,7 +36,10 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/srcu.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/hash.h&gt;</div><div class='add'>+#include &lt;linux/kern_levels.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/cmpxchg.h&gt;</div><div class='hunk'>@@ -129,6 +132,10 @@ module_param(dbg, bool, 0644);</div><div class='ctx'> #define ACC_USER_MASK    PT_USER_MASK</div><div class='ctx'> #define ACC_ALL          (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)</div><div class='ctx'> </div><div class='add'>+/* The mask for the R/X bits in EPT PTEs */</div><div class='add'>+#define PT64_EPT_READABLE_MASK			0x1ull</div><div class='add'>+#define PT64_EPT_EXECUTABLE_MASK		0x4ull</div><div class='add'>+</div><div class='ctx'> #include &lt;trace/events/kvm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='hunk'>@@ -178,15 +185,40 @@ static u64 __read_mostly shadow_dirty_mask;</div><div class='ctx'> static u64 __read_mostly shadow_mmio_mask;</div><div class='ctx'> static u64 __read_mostly shadow_present_mask;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The mask/value to distinguish a PTE that has been marked not-present for</div><div class='add'>+ * access tracking purposes.</div><div class='add'>+ * The mask would be either 0 if access tracking is disabled, or</div><div class='add'>+ * SPTE_SPECIAL_MASK|VMX_EPT_RWX_MASK if access tracking is enabled.</div><div class='add'>+ */</div><div class='add'>+static u64 __read_mostly shadow_acc_track_mask;</div><div class='add'>+static const u64 shadow_acc_track_value = SPTE_SPECIAL_MASK;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The mask/shift to use for saving the original R/X bits when marking the PTE</div><div class='add'>+ * as not-present for access tracking purposes. We do not save the W bit as the</div><div class='add'>+ * PTEs being access tracked also need to be dirty tracked, so the W bit will be</div><div class='add'>+ * restored only when a write is attempted to the page.</div><div class='add'>+ */</div><div class='add'>+static const u64 shadow_acc_track_saved_bits_mask = PT64_EPT_READABLE_MASK |</div><div class='add'>+						    PT64_EPT_EXECUTABLE_MASK;</div><div class='add'>+static const u64 shadow_acc_track_saved_bits_shift = PT64_SECOND_AVAIL_BITS_SHIFT;</div><div class='add'>+</div><div class='ctx'> static void mmu_spte_set(u64 *sptep, u64 spte);</div><div class='ctx'> static void mmu_free_roots(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> void kvm_mmu_set_mmio_spte_mask(u64 mmio_mask)</div><div class='ctx'> {</div><div class='del'>-	shadow_mmio_mask = mmio_mask;</div><div class='add'>+	shadow_mmio_mask = mmio_mask | SPTE_SPECIAL_MASK;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_mmu_set_mmio_spte_mask);</div><div class='ctx'> </div><div class='add'>+static inline bool is_access_track_spte(u64 spte)</div><div class='add'>+{</div><div class='add'>+	/* Always false if shadow_acc_track_mask is zero.  */</div><div class='add'>+	return (spte &amp; shadow_acc_track_mask) == shadow_acc_track_value;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * the low bit of the generation number is always presumed to be zero.</div><div class='ctx'>  * This disables mmio caching during memslot updates.  The concept is</div><div class='hunk'>@@ -284,17 +316,35 @@ static bool check_mmio_spte(struct kvm_vcpu *vcpu, u64 spte)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask,</div><div class='del'>-		u64 dirty_mask, u64 nx_mask, u64 x_mask, u64 p_mask)</div><div class='add'>+		u64 dirty_mask, u64 nx_mask, u64 x_mask, u64 p_mask,</div><div class='add'>+		u64 acc_track_mask)</div><div class='ctx'> {</div><div class='add'>+	if (acc_track_mask != 0)</div><div class='add'>+		acc_track_mask |= SPTE_SPECIAL_MASK;</div><div class='add'>+</div><div class='ctx'> 	shadow_user_mask = user_mask;</div><div class='ctx'> 	shadow_accessed_mask = accessed_mask;</div><div class='ctx'> 	shadow_dirty_mask = dirty_mask;</div><div class='ctx'> 	shadow_nx_mask = nx_mask;</div><div class='ctx'> 	shadow_x_mask = x_mask;</div><div class='ctx'> 	shadow_present_mask = p_mask;</div><div class='add'>+	shadow_acc_track_mask = acc_track_mask;</div><div class='add'>+	WARN_ON(shadow_accessed_mask != 0 &amp;&amp; shadow_acc_track_mask != 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_mmu_set_mask_ptes);</div><div class='ctx'> </div><div class='add'>+void kvm_mmu_clear_all_pte_masks(void)</div><div class='add'>+{</div><div class='add'>+	shadow_user_mask = 0;</div><div class='add'>+	shadow_accessed_mask = 0;</div><div class='add'>+	shadow_dirty_mask = 0;</div><div class='add'>+	shadow_nx_mask = 0;</div><div class='add'>+	shadow_x_mask = 0;</div><div class='add'>+	shadow_mmio_mask = 0;</div><div class='add'>+	shadow_present_mask = 0;</div><div class='add'>+	shadow_acc_track_mask = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int is_cpuid_PSE36(void)</div><div class='ctx'> {</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -307,7 +357,7 @@ static int is_nx(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> static int is_shadow_present_pte(u64 pte)</div><div class='ctx'> {</div><div class='del'>-	return (pte &amp; 0xFFFFFFFFull) &amp;&amp; !is_mmio_spte(pte);</div><div class='add'>+	return (pte != 0) &amp;&amp; !is_mmio_spte(pte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int is_large_pte(u64 pte)</div><div class='hunk'>@@ -324,6 +374,11 @@ static int is_last_spte(u64 pte, int level)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool is_executable_pte(u64 spte)</div><div class='add'>+{</div><div class='add'>+	return (spte &amp; (shadow_x_mask | shadow_nx_mask)) == shadow_x_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static kvm_pfn_t spte_to_pfn(u64 pte)</div><div class='ctx'> {</div><div class='ctx'> 	return (pte &amp; PT64_BASE_ADDR_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -473,7 +528,7 @@ retry:</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static bool spte_is_locklessly_modifiable(u64 spte)</div><div class='add'>+static bool spte_can_locklessly_be_made_writable(u64 spte)</div><div class='ctx'> {</div><div class='ctx'> 	return (spte &amp; (SPTE_HOST_WRITEABLE | SPTE_MMU_WRITEABLE)) ==</div><div class='ctx'> 		(SPTE_HOST_WRITEABLE | SPTE_MMU_WRITEABLE);</div><div class='hunk'>@@ -481,36 +536,38 @@ static bool spte_is_locklessly_modifiable(u64 spte)</div><div class='ctx'> </div><div class='ctx'> static bool spte_has_volatile_bits(u64 spte)</div><div class='ctx'> {</div><div class='add'>+	if (!is_shadow_present_pte(spte))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Always atomically update spte if it can be updated</div><div class='ctx'> 	 * out of mmu-lock, it can ensure dirty bit is not lost,</div><div class='ctx'> 	 * also, it can help us to get a stable is_writable_pte()</div><div class='ctx'> 	 * to ensure tlb flush is not missed.</div><div class='ctx'> 	 */</div><div class='del'>-	if (spte_is_locklessly_modifiable(spte))</div><div class='add'>+	if (spte_can_locklessly_be_made_writable(spte) ||</div><div class='add'>+	    is_access_track_spte(spte))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if (!shadow_accessed_mask)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (!is_shadow_present_pte(spte))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if ((spte &amp; shadow_accessed_mask) &amp;&amp;</div><div class='del'>-	      (!is_writable_pte(spte) || (spte &amp; shadow_dirty_mask)))</div><div class='del'>-		return false;</div><div class='add'>+	if (shadow_accessed_mask) {</div><div class='add'>+		if ((spte &amp; shadow_accessed_mask) == 0 ||</div><div class='add'>+	    	    (is_writable_pte(spte) &amp;&amp; (spte &amp; shadow_dirty_mask) == 0))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool spte_is_bit_cleared(u64 old_spte, u64 new_spte, u64 bit_mask)</div><div class='add'>+static bool is_accessed_spte(u64 spte)</div><div class='ctx'> {</div><div class='del'>-	return (old_spte &amp; bit_mask) &amp;&amp; !(new_spte &amp; bit_mask);</div><div class='add'>+	return shadow_accessed_mask ? spte &amp; shadow_accessed_mask</div><div class='add'>+				    : !is_access_track_spte(spte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool spte_is_bit_changed(u64 old_spte, u64 new_spte, u64 bit_mask)</div><div class='add'>+static bool is_dirty_spte(u64 spte)</div><div class='ctx'> {</div><div class='del'>-	return (old_spte &amp; bit_mask) != (new_spte &amp; bit_mask);</div><div class='add'>+	return shadow_dirty_mask ? spte &amp; shadow_dirty_mask</div><div class='add'>+				 : spte &amp; PT_WRITABLE_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Rules for using mmu_spte_set:</div><div class='hunk'>@@ -525,25 +582,19 @@ static void mmu_spte_set(u64 *sptep, u64 new_spte)</div><div class='ctx'> 	__set_spte(sptep, new_spte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Rules for using mmu_spte_update:</div><div class='del'>- * Update the state bits, it means the mapped pfn is not changed.</div><div class='del'>- *</div><div class='del'>- * Whenever we overwrite a writable spte with a read-only one we</div><div class='del'>- * should flush remote TLBs. Otherwise rmap_write_protect</div><div class='del'>- * will find a read-only spte, even though the writable spte</div><div class='del'>- * might be cached on a CPU's TLB, the return value indicates this</div><div class='del'>- * case.</div><div class='add'>+/*</div><div class='add'>+ * Update the SPTE (excluding the PFN), but do not track changes in its</div><div class='add'>+ * accessed/dirty status.</div><div class='ctx'>  */</div><div class='del'>-static bool mmu_spte_update(u64 *sptep, u64 new_spte)</div><div class='add'>+static u64 mmu_spte_update_no_track(u64 *sptep, u64 new_spte)</div><div class='ctx'> {</div><div class='ctx'> 	u64 old_spte = *sptep;</div><div class='del'>-	bool ret = false;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!is_shadow_present_pte(new_spte));</div><div class='ctx'> </div><div class='ctx'> 	if (!is_shadow_present_pte(old_spte)) {</div><div class='ctx'> 		mmu_spte_set(sptep, new_spte);</div><div class='del'>-		return ret;</div><div class='add'>+		return old_spte;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!spte_has_volatile_bits(old_spte))</div><div class='hunk'>@@ -551,45 +602,62 @@ static bool mmu_spte_update(u64 *sptep, u64 new_spte)</div><div class='ctx'> 	else</div><div class='ctx'> 		old_spte = __update_clear_spte_slow(sptep, new_spte);</div><div class='ctx'> </div><div class='add'>+	WARN_ON(spte_to_pfn(old_spte) != spte_to_pfn(new_spte));</div><div class='add'>+</div><div class='add'>+	return old_spte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Rules for using mmu_spte_update:</div><div class='add'>+ * Update the state bits, it means the mapped pfn is not changed.</div><div class='add'>+ *</div><div class='add'>+ * Whenever we overwrite a writable spte with a read-only one we</div><div class='add'>+ * should flush remote TLBs. Otherwise rmap_write_protect</div><div class='add'>+ * will find a read-only spte, even though the writable spte</div><div class='add'>+ * might be cached on a CPU's TLB, the return value indicates this</div><div class='add'>+ * case.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if the TLB needs to be flushed</div><div class='add'>+ */</div><div class='add'>+static bool mmu_spte_update(u64 *sptep, u64 new_spte)</div><div class='add'>+{</div><div class='add'>+	bool flush = false;</div><div class='add'>+	u64 old_spte = mmu_spte_update_no_track(sptep, new_spte);</div><div class='add'>+</div><div class='add'>+	if (!is_shadow_present_pte(old_spte))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For the spte updated out of mmu-lock is safe, since</div><div class='ctx'> 	 * we always atomically update it, see the comments in</div><div class='ctx'> 	 * spte_has_volatile_bits().</div><div class='ctx'> 	 */</div><div class='del'>-	if (spte_is_locklessly_modifiable(old_spte) &amp;&amp;</div><div class='add'>+	if (spte_can_locklessly_be_made_writable(old_spte) &amp;&amp;</div><div class='ctx'> 	      !is_writable_pte(new_spte))</div><div class='del'>-		ret = true;</div><div class='del'>-</div><div class='del'>-	if (!shadow_accessed_mask) {</div><div class='del'>-		/*</div><div class='del'>-		 * We don't set page dirty when dropping non-writable spte.</div><div class='del'>-		 * So do it now if the new spte is becoming non-writable.</div><div class='del'>-		 */</div><div class='del'>-		if (ret)</div><div class='del'>-			kvm_set_pfn_dirty(spte_to_pfn(old_spte));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+		flush = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Flush TLB when accessed/dirty bits are changed in the page tables,</div><div class='add'>+	 * Flush TLB when accessed/dirty states are changed in the page tables,</div><div class='ctx'> 	 * to guarantee consistency between TLB and page tables.</div><div class='ctx'> 	 */</div><div class='del'>-	if (spte_is_bit_changed(old_spte, new_spte,</div><div class='del'>-                                shadow_accessed_mask | shadow_dirty_mask))</div><div class='del'>-		ret = true;</div><div class='ctx'> </div><div class='del'>-	if (spte_is_bit_cleared(old_spte, new_spte, shadow_accessed_mask))</div><div class='add'>+	if (is_accessed_spte(old_spte) &amp;&amp; !is_accessed_spte(new_spte)) {</div><div class='add'>+		flush = true;</div><div class='ctx'> 		kvm_set_pfn_accessed(spte_to_pfn(old_spte));</div><div class='del'>-	if (spte_is_bit_cleared(old_spte, new_spte, shadow_dirty_mask))</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_dirty_spte(old_spte) &amp;&amp; !is_dirty_spte(new_spte)) {</div><div class='add'>+		flush = true;</div><div class='ctx'> 		kvm_set_pfn_dirty(spte_to_pfn(old_spte));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return flush;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Rules for using mmu_spte_clear_track_bits:</div><div class='ctx'>  * It sets the sptep from present to nonpresent, and track the</div><div class='ctx'>  * state bits, it is used to clear the last level sptep.</div><div class='add'>+ * Returns non-zero if the PTE was previously valid.</div><div class='ctx'>  */</div><div class='ctx'> static int mmu_spte_clear_track_bits(u64 *sptep)</div><div class='ctx'> {</div><div class='hunk'>@@ -613,11 +681,12 @@ static int mmu_spte_clear_track_bits(u64 *sptep)</div><div class='ctx'> 	 */</div><div class='ctx'> 	WARN_ON(!kvm_is_reserved_pfn(pfn) &amp;&amp; !page_count(pfn_to_page(pfn)));</div><div class='ctx'> </div><div class='del'>-	if (!shadow_accessed_mask || old_spte &amp; shadow_accessed_mask)</div><div class='add'>+	if (is_accessed_spte(old_spte))</div><div class='ctx'> 		kvm_set_pfn_accessed(pfn);</div><div class='del'>-	if (old_spte &amp; (shadow_dirty_mask ? shadow_dirty_mask :</div><div class='del'>-					    PT_WRITABLE_MASK))</div><div class='add'>+</div><div class='add'>+	if (is_dirty_spte(old_spte))</div><div class='ctx'> 		kvm_set_pfn_dirty(pfn);</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -636,6 +705,78 @@ static u64 mmu_spte_get_lockless(u64 *sptep)</div><div class='ctx'> 	return __get_spte_lockless(sptep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u64 mark_spte_for_access_track(u64 spte)</div><div class='add'>+{</div><div class='add'>+	if (shadow_accessed_mask != 0)</div><div class='add'>+		return spte &amp; ~shadow_accessed_mask;</div><div class='add'>+</div><div class='add'>+	if (shadow_acc_track_mask == 0 || is_access_track_spte(spte))</div><div class='add'>+		return spte;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Making an Access Tracking PTE will result in removal of write access</div><div class='add'>+	 * from the PTE. So, verify that we will be able to restore the write</div><div class='add'>+	 * access in the fast page fault path later on.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ONCE((spte &amp; PT_WRITABLE_MASK) &amp;&amp;</div><div class='add'>+		  !spte_can_locklessly_be_made_writable(spte),</div><div class='add'>+		  "kvm: Writable SPTE is not locklessly dirty-trackable\n");</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(spte &amp; (shadow_acc_track_saved_bits_mask &lt;&lt;</div><div class='add'>+			  shadow_acc_track_saved_bits_shift),</div><div class='add'>+		  "kvm: Access Tracking saved bit locations are not zero\n");</div><div class='add'>+</div><div class='add'>+	spte |= (spte &amp; shadow_acc_track_saved_bits_mask) &lt;&lt;</div><div class='add'>+		shadow_acc_track_saved_bits_shift;</div><div class='add'>+	spte &amp;= ~shadow_acc_track_mask;</div><div class='add'>+	spte |= shadow_acc_track_value;</div><div class='add'>+</div><div class='add'>+	return spte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Restore an acc-track PTE back to a regular PTE */</div><div class='add'>+static u64 restore_acc_track_spte(u64 spte)</div><div class='add'>+{</div><div class='add'>+	u64 new_spte = spte;</div><div class='add'>+	u64 saved_bits = (spte &gt;&gt; shadow_acc_track_saved_bits_shift)</div><div class='add'>+			 &amp; shadow_acc_track_saved_bits_mask;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!is_access_track_spte(spte));</div><div class='add'>+</div><div class='add'>+	new_spte &amp;= ~shadow_acc_track_mask;</div><div class='add'>+	new_spte &amp;= ~(shadow_acc_track_saved_bits_mask &lt;&lt;</div><div class='add'>+		      shadow_acc_track_saved_bits_shift);</div><div class='add'>+	new_spte |= saved_bits;</div><div class='add'>+</div><div class='add'>+	return new_spte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns the Accessed status of the PTE and resets it at the same time. */</div><div class='add'>+static bool mmu_spte_age(u64 *sptep)</div><div class='add'>+{</div><div class='add'>+	u64 spte = mmu_spte_get_lockless(sptep);</div><div class='add'>+</div><div class='add'>+	if (!is_accessed_spte(spte))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (shadow_accessed_mask) {</div><div class='add'>+		clear_bit((ffs(shadow_accessed_mask) - 1),</div><div class='add'>+			  (unsigned long *)sptep);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Capture the dirty status of the page, so that it doesn't get</div><div class='add'>+		 * lost when the SPTE is marked for access tracking.</div><div class='add'>+		 */</div><div class='add'>+		if (is_writable_pte(spte))</div><div class='add'>+			kvm_set_pfn_dirty(spte_to_pfn(spte));</div><div class='add'>+</div><div class='add'>+		spte = mark_spte_for_access_track(spte);</div><div class='add'>+		mmu_spte_update_no_track(sptep, spte);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void walk_shadow_page_lockless_begin(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1212,7 +1353,7 @@ static bool spte_write_protect(u64 *sptep, bool pt_protect)</div><div class='ctx'> 	u64 spte = *sptep;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_writable_pte(spte) &amp;&amp;</div><div class='del'>-	      !(pt_protect &amp;&amp; spte_is_locklessly_modifiable(spte)))</div><div class='add'>+	      !(pt_protect &amp;&amp; spte_can_locklessly_be_made_writable(spte)))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	rmap_printk("rmap_write_protect: spte %p %llx\n", sptep, *sptep);</div><div class='hunk'>@@ -1420,7 +1561,7 @@ static int kvm_set_pte_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,</div><div class='ctx'> restart:</div><div class='ctx'> 	for_each_rmap_spte(rmap_head, &amp;iter, sptep) {</div><div class='ctx'> 		rmap_printk("kvm_set_pte_rmapp: spte %p %llx gfn %llx (%d)\n",</div><div class='del'>-			     sptep, *sptep, gfn, level);</div><div class='add'>+			    sptep, *sptep, gfn, level);</div><div class='ctx'> </div><div class='ctx'> 		need_flush = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1433,7 +1574,8 @@ restart:</div><div class='ctx'> </div><div class='ctx'> 			new_spte &amp;= ~PT_WRITABLE_MASK;</div><div class='ctx'> 			new_spte &amp;= ~SPTE_HOST_WRITEABLE;</div><div class='del'>-			new_spte &amp;= ~shadow_accessed_mask;</div><div class='add'>+</div><div class='add'>+			new_spte = mark_spte_for_access_track(new_spte);</div><div class='ctx'> </div><div class='ctx'> 			mmu_spte_clear_track_bits(sptep);</div><div class='ctx'> 			mmu_spte_set(sptep, new_spte);</div><div class='hunk'>@@ -1595,15 +1737,8 @@ static int kvm_age_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,</div><div class='ctx'> 	struct rmap_iterator uninitialized_var(iter);</div><div class='ctx'> 	int young = 0;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!shadow_accessed_mask);</div><div class='del'>-</div><div class='del'>-	for_each_rmap_spte(rmap_head, &amp;iter, sptep) {</div><div class='del'>-		if (*sptep &amp; shadow_accessed_mask) {</div><div class='del'>-			young = 1;</div><div class='del'>-			clear_bit((ffs(shadow_accessed_mask) - 1),</div><div class='del'>-				 (unsigned long *)sptep);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	for_each_rmap_spte(rmap_head, &amp;iter, sptep)</div><div class='add'>+		young |= mmu_spte_age(sptep);</div><div class='ctx'> </div><div class='ctx'> 	trace_kvm_age_page(gfn, level, slot, young);</div><div class='ctx'> 	return young;</div><div class='hunk'>@@ -1615,24 +1750,20 @@ static int kvm_test_age_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,</div><div class='ctx'> {</div><div class='ctx'> 	u64 *sptep;</div><div class='ctx'> 	struct rmap_iterator iter;</div><div class='del'>-	int young = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If there's no access bit in the secondary pte set by the</div><div class='del'>-	 * hardware it's up to gup-fast/gup to set the access bit in</div><div class='del'>-	 * the primary pte or in the page structure.</div><div class='add'>+	 * If there's no access bit in the secondary pte set by the hardware and</div><div class='add'>+	 * fast access tracking is also not enabled, it's up to gup-fast/gup to</div><div class='add'>+	 * set the access bit in the primary pte or in the page structure.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!shadow_accessed_mask)</div><div class='add'>+	if (!shadow_accessed_mask &amp;&amp; !shadow_acc_track_mask)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	for_each_rmap_spte(rmap_head, &amp;iter, sptep) {</div><div class='del'>-		if (*sptep &amp; shadow_accessed_mask) {</div><div class='del'>-			young = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	for_each_rmap_spte(rmap_head, &amp;iter, sptep)</div><div class='add'>+		if (is_accessed_spte(*sptep))</div><div class='add'>+			return 1;</div><div class='ctx'> out:</div><div class='del'>-	return young;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define RMAP_RECYCLE_THRESHOLD 1000</div><div class='hunk'>@@ -1660,17 +1791,9 @@ int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end)</div><div class='ctx'> 	 * This has some overhead, but not as much as the cost of swapping</div><div class='ctx'> 	 * out actively used pages or breaking up actively used hugepages.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!shadow_accessed_mask) {</div><div class='del'>-		/*</div><div class='del'>-		 * We are holding the kvm-&gt;mmu_lock, and we are blowing up</div><div class='del'>-		 * shadow PTEs. MMU notifier consumers need to be kept at bay.</div><div class='del'>-		 * This is correct as long as we don't decouple the mmu_lock</div><div class='del'>-		 * protected regions (like invalidate_range_start|end does).</div><div class='del'>-		 */</div><div class='del'>-		kvm-&gt;mmu_notifier_seq++;</div><div class='add'>+	if (!shadow_accessed_mask &amp;&amp; !shadow_acc_track_mask)</div><div class='ctx'> 		return kvm_handle_hva_range(kvm, start, end, 0,</div><div class='ctx'> 					    kvm_unmap_rmapp);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return kvm_handle_hva_range(kvm, start, end, 0, kvm_age_rmapp);</div><div class='ctx'> }</div><div class='hunk'>@@ -1721,7 +1844,7 @@ static void kvm_mmu_free_page(struct kvm_mmu_page *sp)</div><div class='ctx'> </div><div class='ctx'> static unsigned kvm_page_table_hashfn(gfn_t gfn)</div><div class='ctx'> {</div><div class='del'>-	return gfn &amp; ((1 &lt;&lt; KVM_MMU_HASH_SHIFT) - 1);</div><div class='add'>+	return hash_64(gfn, KVM_MMU_HASH_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mmu_page_add_parent_pte(struct kvm_vcpu *vcpu,</div><div class='hunk'>@@ -1912,17 +2035,17 @@ static void kvm_mmu_commit_zap_page(struct kvm *kvm,</div><div class='ctx'>  * since it has been deleted from active_mmu_pages but still can be found</div><div class='ctx'>  * at hast list.</div><div class='ctx'>  *</div><div class='del'>- * for_each_gfn_valid_sp() has skipped that kind of pages.</div><div class='add'>+ * for_each_valid_sp() has skipped that kind of pages.</div><div class='ctx'>  */</div><div class='del'>-#define for_each_gfn_valid_sp(_kvm, _sp, _gfn)				\</div><div class='add'>+#define for_each_valid_sp(_kvm, _sp, _gfn)				\</div><div class='ctx'> 	hlist_for_each_entry(_sp,					\</div><div class='ctx'> 	  &amp;(_kvm)-&gt;arch.mmu_page_hash[kvm_page_table_hashfn(_gfn)], hash_link) \</div><div class='del'>-		if ((_sp)-&gt;gfn != (_gfn) || is_obsolete_sp((_kvm), (_sp)) \</div><div class='del'>-			|| (_sp)-&gt;role.invalid) {} else</div><div class='add'>+		if (is_obsolete_sp((_kvm), (_sp)) || (_sp)-&gt;role.invalid) {    \</div><div class='add'>+		} else</div><div class='ctx'> </div><div class='ctx'> #define for_each_gfn_indirect_valid_sp(_kvm, _sp, _gfn)			\</div><div class='del'>-	for_each_gfn_valid_sp(_kvm, _sp, _gfn)				\</div><div class='del'>-		if ((_sp)-&gt;role.direct) {} else</div><div class='add'>+	for_each_valid_sp(_kvm, _sp, _gfn)				\</div><div class='add'>+		if ((_sp)-&gt;gfn != (_gfn) || (_sp)-&gt;role.direct) {} else</div><div class='ctx'> </div><div class='ctx'> /* @sp-&gt;gfn should be write-protected at the call site */</div><div class='ctx'> static bool __kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,</div><div class='hunk'>@@ -2124,6 +2247,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	struct kvm_mmu_page *sp;</div><div class='ctx'> 	bool need_sync = false;</div><div class='ctx'> 	bool flush = false;</div><div class='add'>+	int collisions = 0;</div><div class='ctx'> 	LIST_HEAD(invalid_list);</div><div class='ctx'> </div><div class='ctx'> 	role = vcpu-&gt;arch.mmu.base_role;</div><div class='hunk'>@@ -2138,7 +2262,12 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		quadrant &amp;= (1 &lt;&lt; ((PT32_PT_BITS - PT64_PT_BITS) * level)) - 1;</div><div class='ctx'> 		role.quadrant = quadrant;</div><div class='ctx'> 	}</div><div class='del'>-	for_each_gfn_valid_sp(vcpu-&gt;kvm, sp, gfn) {</div><div class='add'>+	for_each_valid_sp(vcpu-&gt;kvm, sp, gfn) {</div><div class='add'>+		if (sp-&gt;gfn != gfn) {</div><div class='add'>+			collisions++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!need_sync &amp;&amp; sp-&gt;unsync)</div><div class='ctx'> 			need_sync = true;</div><div class='ctx'> </div><div class='hunk'>@@ -2161,7 +2290,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> </div><div class='ctx'> 		__clear_sp_write_flooding_count(sp);</div><div class='ctx'> 		trace_kvm_mmu_get_page(sp, false);</div><div class='del'>-		return sp;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	++vcpu-&gt;kvm-&gt;stat.mmu_cache_miss;</div><div class='hunk'>@@ -2191,6 +2320,9 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	trace_kvm_mmu_get_page(sp, true);</div><div class='ctx'> </div><div class='ctx'> 	kvm_mmu_flush_or_zap(vcpu, &amp;invalid_list, false, flush);</div><div class='add'>+out:</div><div class='add'>+	if (collisions &gt; vcpu-&gt;kvm-&gt;stat.max_mmu_page_hash_collisions)</div><div class='add'>+		vcpu-&gt;kvm-&gt;stat.max_mmu_page_hash_collisions = collisions;</div><div class='ctx'> 	return sp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2591,6 +2723,9 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep,</div><div class='ctx'> 		spte |= shadow_dirty_mask;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (speculative)</div><div class='add'>+		spte = mark_spte_for_access_track(spte);</div><div class='add'>+</div><div class='ctx'> set_pte:</div><div class='ctx'> 	if (mmu_spte_update(sptep, spte))</div><div class='ctx'> 		kvm_flush_remote_tlbs(vcpu-&gt;kvm);</div><div class='hunk'>@@ -2644,7 +2779,7 @@ static bool mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, unsigned pte_access,</div><div class='ctx'> 	pgprintk("%s: setting spte %llx\n", __func__, *sptep);</div><div class='ctx'> 	pgprintk("instantiating %s PTE (%s) at %llx (%llx) addr %p\n",</div><div class='ctx'> 		 is_large_pte(*sptep)? "2MB" : "4kB",</div><div class='del'>-		 *sptep &amp; PT_PRESENT_MASK ?"RW":"R", gfn,</div><div class='add'>+		 *sptep &amp; PT_WRITABLE_MASK ? "RW" : "R", gfn,</div><div class='ctx'> 		 *sptep, sptep);</div><div class='ctx'> 	if (!was_rmapped &amp;&amp; is_large_pte(*sptep))</div><div class='ctx'> 		++vcpu-&gt;kvm-&gt;stat.lpages;</div><div class='hunk'>@@ -2877,33 +3012,43 @@ static bool page_fault_can_be_fast(u32 error_code)</div><div class='ctx'> 	if (unlikely(error_code &amp; PFERR_RSVD_MASK))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	/* See if the page fault is due to an NX violation */</div><div class='add'>+	if (unlikely(((error_code &amp; (PFERR_FETCH_MASK | PFERR_PRESENT_MASK))</div><div class='add'>+		      == (PFERR_FETCH_MASK | PFERR_PRESENT_MASK))))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * #PF can be fast only if the shadow page table is present and it</div><div class='del'>-	 * is caused by write-protect, that means we just need change the</div><div class='del'>-	 * W bit of the spte which can be done out of mmu-lock.</div><div class='add'>+	 * #PF can be fast if:</div><div class='add'>+	 * 1. The shadow page table entry is not present, which could mean that</div><div class='add'>+	 *    the fault is potentially caused by access tracking (if enabled).</div><div class='add'>+	 * 2. The shadow page table entry is present and the fault</div><div class='add'>+	 *    is caused by write-protect, that means we just need change the W</div><div class='add'>+	 *    bit of the spte which can be done out of mmu-lock.</div><div class='add'>+	 *</div><div class='add'>+	 * However, if access tracking is disabled we know that a non-present</div><div class='add'>+	 * page must be a genuine page fault where we have to create a new SPTE.</div><div class='add'>+	 * So, if access tracking is disabled, we return true only for write</div><div class='add'>+	 * accesses to a present page.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(error_code &amp; PFERR_PRESENT_MASK) ||</div><div class='del'>-	      !(error_code &amp; PFERR_WRITE_MASK))</div><div class='del'>-		return false;</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	return shadow_acc_track_mask != 0 ||</div><div class='add'>+	       ((error_code &amp; (PFERR_WRITE_MASK | PFERR_PRESENT_MASK))</div><div class='add'>+		== (PFERR_WRITE_MASK | PFERR_PRESENT_MASK));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Returns true if the SPTE was fixed successfully. Otherwise,</div><div class='add'>+ * someone else modified the SPTE from its original value.</div><div class='add'>+ */</div><div class='ctx'> static bool</div><div class='ctx'> fast_pf_fix_direct_spte(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,</div><div class='del'>-			u64 *sptep, u64 spte)</div><div class='add'>+			u64 *sptep, u64 old_spte, u64 new_spte)</div><div class='ctx'> {</div><div class='ctx'> 	gfn_t gfn;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!sp-&gt;role.direct);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * The gfn of direct spte is stable since it is calculated</div><div class='del'>-	 * by sp-&gt;gfn.</div><div class='del'>-	 */</div><div class='del'>-	gfn = kvm_mmu_page_get_gfn(sp, sptep - sp-&gt;spt);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Theoretically we could also set dirty bit (and flush TLB) here in</div><div class='ctx'> 	 * order to eliminate unnecessary PML logging. See comments in</div><div class='ctx'> 	 * set_spte. But fast_page_fault is very unlikely to happen with PML</div><div class='hunk'>@@ -2915,12 +3060,33 @@ fast_pf_fix_direct_spte(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Compare with set_spte where instead shadow_dirty_mask is set.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cmpxchg64(sptep, spte, spte | PT_WRITABLE_MASK) == spte)</div><div class='add'>+	if (cmpxchg64(sptep, old_spte, new_spte) != old_spte)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (is_writable_pte(new_spte) &amp;&amp; !is_writable_pte(old_spte)) {</div><div class='add'>+		/*</div><div class='add'>+		 * The gfn of direct spte is stable since it is</div><div class='add'>+		 * calculated by sp-&gt;gfn.</div><div class='add'>+		 */</div><div class='add'>+		gfn = kvm_mmu_page_get_gfn(sp, sptep - sp-&gt;spt);</div><div class='ctx'> 		kvm_vcpu_mark_page_dirty(vcpu, gfn);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool is_access_allowed(u32 fault_err_code, u64 spte)</div><div class='add'>+{</div><div class='add'>+	if (fault_err_code &amp; PFERR_FETCH_MASK)</div><div class='add'>+		return is_executable_pte(spte);</div><div class='add'>+</div><div class='add'>+	if (fault_err_code &amp; PFERR_WRITE_MASK)</div><div class='add'>+		return is_writable_pte(spte);</div><div class='add'>+</div><div class='add'>+	/* Fault was on Read access */</div><div class='add'>+	return spte &amp; PT_PRESENT_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Return value:</div><div class='ctx'>  * - true: let the vcpu to access on the same address again.</div><div class='hunk'>@@ -2931,8 +3097,9 @@ static bool fast_page_fault(struct kvm_vcpu *vcpu, gva_t gva, int level,</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_shadow_walk_iterator iterator;</div><div class='ctx'> 	struct kvm_mmu_page *sp;</div><div class='del'>-	bool ret = false;</div><div class='add'>+	bool fault_handled = false;</div><div class='ctx'> 	u64 spte = 0ull;</div><div class='add'>+	uint retry_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!VALID_PAGE(vcpu-&gt;arch.mmu.root_hpa))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -2941,66 +3108,93 @@ static bool fast_page_fault(struct kvm_vcpu *vcpu, gva_t gva, int level,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	walk_shadow_page_lockless_begin(vcpu);</div><div class='del'>-	for_each_shadow_entry_lockless(vcpu, gva, iterator, spte)</div><div class='del'>-		if (!is_shadow_present_pte(spte) || iterator.level &lt; level)</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		u64 new_spte;</div><div class='add'>+</div><div class='add'>+		for_each_shadow_entry_lockless(vcpu, gva, iterator, spte)</div><div class='add'>+			if (!is_shadow_present_pte(spte) ||</div><div class='add'>+			    iterator.level &lt; level)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+		sp = page_header(__pa(iterator.sptep));</div><div class='add'>+		if (!is_last_spte(spte, sp-&gt;role.level))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If the mapping has been changed, let the vcpu fault on the</div><div class='del'>-	 * same address again.</div><div class='del'>-	 */</div><div class='del'>-	if (!is_shadow_present_pte(spte)) {</div><div class='del'>-		ret = true;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='add'>+		/*</div><div class='add'>+		 * Check whether the memory access that caused the fault would</div><div class='add'>+		 * still cause it if it were to be performed right now. If not,</div><div class='add'>+		 * then this is a spurious fault caused by TLB lazily flushed,</div><div class='add'>+		 * or some other CPU has already fixed the PTE after the</div><div class='add'>+		 * current CPU took the fault.</div><div class='add'>+		 *</div><div class='add'>+		 * Need not check the access of upper level table entries since</div><div class='add'>+		 * they are always ACC_ALL.</div><div class='add'>+		 */</div><div class='add'>+		if (is_access_allowed(error_code, spte)) {</div><div class='add'>+			fault_handled = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	sp = page_header(__pa(iterator.sptep));</div><div class='del'>-	if (!is_last_spte(spte, sp-&gt;role.level))</div><div class='del'>-		goto exit;</div><div class='add'>+		new_spte = spte;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Check if it is a spurious fault caused by TLB lazily flushed.</div><div class='del'>-	 *</div><div class='del'>-	 * Need not check the access of upper level table entries since</div><div class='del'>-	 * they are always ACC_ALL.</div><div class='del'>-	 */</div><div class='del'>-	 if (is_writable_pte(spte)) {</div><div class='del'>-		ret = true;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='add'>+		if (is_access_track_spte(spte))</div><div class='add'>+			new_spte = restore_acc_track_spte(new_spte);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Currently, to simplify the code, only the spte write-protected</div><div class='del'>-	 * by dirty-log can be fast fixed.</div><div class='del'>-	 */</div><div class='del'>-	if (!spte_is_locklessly_modifiable(spte))</div><div class='del'>-		goto exit;</div><div class='add'>+		/*</div><div class='add'>+		 * Currently, to simplify the code, write-protection can</div><div class='add'>+		 * be removed in the fast path only if the SPTE was</div><div class='add'>+		 * write-protected for dirty-logging or access tracking.</div><div class='add'>+		 */</div><div class='add'>+		if ((error_code &amp; PFERR_WRITE_MASK) &amp;&amp;</div><div class='add'>+		    spte_can_locklessly_be_made_writable(spte))</div><div class='add'>+		{</div><div class='add'>+			new_spte |= PT_WRITABLE_MASK;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Do not fix write-permission on the large spte since we only dirty</div><div class='del'>-	 * the first page into the dirty-bitmap in fast_pf_fix_direct_spte()</div><div class='del'>-	 * that means other pages are missed if its slot is dirty-logged.</div><div class='del'>-	 *</div><div class='del'>-	 * Instead, we let the slow page fault path create a normal spte to</div><div class='del'>-	 * fix the access.</div><div class='del'>-	 *</div><div class='del'>-	 * See the comments in kvm_arch_commit_memory_region().</div><div class='del'>-	 */</div><div class='del'>-	if (sp-&gt;role.level &gt; PT_PAGE_TABLE_LEVEL)</div><div class='del'>-		goto exit;</div><div class='add'>+			/*</div><div class='add'>+			 * Do not fix write-permission on the large spte.  Since</div><div class='add'>+			 * we only dirty the first page into the dirty-bitmap in</div><div class='add'>+			 * fast_pf_fix_direct_spte(), other pages are missed</div><div class='add'>+			 * if its slot has dirty logging enabled.</div><div class='add'>+			 *</div><div class='add'>+			 * Instead, we let the slow page fault path create a</div><div class='add'>+			 * normal spte to fix the access.</div><div class='add'>+			 *</div><div class='add'>+			 * See the comments in kvm_arch_commit_memory_region().</div><div class='add'>+			 */</div><div class='add'>+			if (sp-&gt;role.level &gt; PT_PAGE_TABLE_LEVEL)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Verify that the fault can be handled in the fast path */</div><div class='add'>+		if (new_spte == spte ||</div><div class='add'>+		    !is_access_allowed(error_code, new_spte))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Currently, fast page fault only works for direct mapping</div><div class='add'>+		 * since the gfn is not stable for indirect shadow page. See</div><div class='add'>+		 * Documentation/virtual/kvm/locking.txt to get more detail.</div><div class='add'>+		 */</div><div class='add'>+		fault_handled = fast_pf_fix_direct_spte(vcpu, sp,</div><div class='add'>+							iterator.sptep, spte,</div><div class='add'>+							new_spte);</div><div class='add'>+		if (fault_handled)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (++retry_count &gt; 4) {</div><div class='add'>+			printk_once(KERN_WARNING</div><div class='add'>+				"kvm: Fast #PF retrying more than 4 times.\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} while (true);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Currently, fast page fault only works for direct mapping since</div><div class='del'>-	 * the gfn is not stable for indirect shadow page.</div><div class='del'>-	 * See Documentation/virtual/kvm/locking.txt to get more detail.</div><div class='del'>-	 */</div><div class='del'>-	ret = fast_pf_fix_direct_spte(vcpu, sp, iterator.sptep, spte);</div><div class='del'>-exit:</div><div class='ctx'> 	trace_fast_page_fault(vcpu, gva, error_code, iterator.sptep,</div><div class='del'>-			      spte, ret);</div><div class='add'>+			      spte, fault_handled);</div><div class='ctx'> 	walk_shadow_page_lockless_end(vcpu);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return fault_handled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool try_async_pf(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn,</div><div class='hunk'>@@ -3909,7 +4103,7 @@ static void update_permission_bitmask(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				 * as a SMAP violation if all of the following</div><div class='ctx'> 				 * conditions are ture:</div><div class='ctx'> 				 *   - X86_CR4_SMAP is set in CR4</div><div class='del'>-				 *   - An user page is accessed</div><div class='add'>+				 *   - A user page is accessed</div><div class='ctx'> 				 *   - Page fault in kernel mode</div><div class='ctx'> 				 *   - if CPL = 3 or X86_EFLAGS_AC is clear</div><div class='ctx'> 				 *</div><div class='hunk'>@@ -4405,7 +4599,8 @@ static u64 *get_written_sptes(struct kvm_mmu_page *sp, gpa_t gpa, int *nspte)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='del'>-			      const u8 *new, int bytes)</div><div class='add'>+			      const u8 *new, int bytes,</div><div class='add'>+			      struct kvm_page_track_notifier_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	gfn_t gfn = gpa &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	struct kvm_mmu_page *sp;</div><div class='hunk'>@@ -4508,7 +4703,7 @@ static void make_mmu_pages_available(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	kvm_mmu_commit_zap_page(vcpu-&gt;kvm, &amp;invalid_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u32 error_code,</div><div class='add'>+int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u64 error_code,</div><div class='ctx'> 		       void *insn, int insn_len)</div><div class='ctx'> {</div><div class='ctx'> 	int r, emulation_type = EMULTYPE_RETRY;</div><div class='hunk'>@@ -4527,12 +4722,28 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u32 error_code,</div><div class='ctx'> 			return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = vcpu-&gt;arch.mmu.page_fault(vcpu, cr2, error_code, false);</div><div class='add'>+	r = vcpu-&gt;arch.mmu.page_fault(vcpu, cr2, lower_32_bits(error_code),</div><div class='add'>+				      false);</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Before emulating the instruction, check if the error code</div><div class='add'>+	 * was due to a RO violation while translating the guest page.</div><div class='add'>+	 * This can occur when using nested virtualization with nested</div><div class='add'>+	 * paging in both guests. If true, we simply unprotect the page</div><div class='add'>+	 * and resume the guest.</div><div class='add'>+	 *</div><div class='add'>+	 * Note: AMD only (since it supports the PFERR_GUEST_PAGE_MASK used</div><div class='add'>+	 *       in PFERR_NEXT_GUEST_PAGE)</div><div class='add'>+	 */</div><div class='add'>+	if (error_code == PFERR_NESTED_GUEST_PAGE) {</div><div class='add'>+		kvm_mmu_unprotect_page(vcpu-&gt;kvm, gpa_to_gfn(cr2));</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (mmio_info_in_cache(vcpu, cr2, direct))</div><div class='ctx'> 		emulation_type = 0;</div><div class='ctx'> emulate:</div><div class='hunk'>@@ -4617,11 +4828,19 @@ void kvm_mmu_setup(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	init_kvm_mmu(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvm_mmu_invalidate_zap_pages_in_memslot(struct kvm *kvm,</div><div class='add'>+			struct kvm_memory_slot *slot,</div><div class='add'>+			struct kvm_page_track_notifier_node *node)</div><div class='add'>+{</div><div class='add'>+	kvm_mmu_invalidate_zap_all_pages(kvm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void kvm_mmu_init_vm(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_page_track_notifier_node *node = &amp;kvm-&gt;arch.mmu_sp_tracker;</div><div class='ctx'> </div><div class='ctx'> 	node-&gt;track_write = kvm_mmu_pte_write;</div><div class='add'>+	node-&gt;track_flush_slot = kvm_mmu_invalidate_zap_pages_in_memslot;</div><div class='ctx'> 	kvm_page_track_register_notifier(kvm, node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4958,7 +5177,7 @@ void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, struct kvm_memslots *slots)</div><div class='ctx'> 	 * zap all shadow pages.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely((slots-&gt;generation &amp; MMIO_GEN_MASK) == 0)) {</div><div class='del'>-		printk_ratelimited(KERN_DEBUG "kvm: zapping shadow pages for mmio generation wraparound\n");</div><div class='add'>+		kvm_debug_ratelimited("kvm: zapping shadow pages for mmio generation wraparound\n");</div><div class='ctx'> 		kvm_mmu_invalidate_zap_all_pages(kvm);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -5046,6 +5265,8 @@ static void mmu_destroy_caches(void)</div><div class='ctx'> </div><div class='ctx'> int kvm_mmu_module_init(void)</div><div class='ctx'> {</div><div class='add'>+	kvm_mmu_clear_all_pte_masks();</div><div class='add'>+</div><div class='ctx'> 	pte_list_desc_cache = kmem_cache_create("pte_list_desc",</div><div class='ctx'> 					    sizeof(struct pte_list_desc),</div><div class='ctx'> 					    0, 0, NULL);</div><div class='head'>diff --git a/arch/x86/kvm/page_track.c b/arch/x86/kvm/page_track.c<br/>index b431539c3714..37942e419c32 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/page_track.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/page_track.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/page_track.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/page_track.c</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='add'>+#include &lt;linux/rculist.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/kvm_host.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_page_track.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -106,6 +108,7 @@ void kvm_slot_page_track_add_page(struct kvm *kvm,</div><div class='ctx'> 		if (kvm_mmu_slot_gfn_write_protect(kvm, slot, gfn))</div><div class='ctx'> 			kvm_flush_remote_tlbs(kvm);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_slot_page_track_add_page);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * remove the guest page from the tracking pool which stops the interception</div><div class='hunk'>@@ -135,6 +138,7 @@ void kvm_slot_page_track_remove_page(struct kvm *kvm,</div><div class='ctx'> 	 */</div><div class='ctx'> 	kvm_mmu_gfn_allow_lpage(slot, gfn);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_slot_page_track_remove_page);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * check if the corresponding access on the specified guest page is tracked.</div><div class='hunk'>@@ -181,6 +185,7 @@ kvm_page_track_register_notifier(struct kvm *kvm,</div><div class='ctx'> 	hlist_add_head_rcu(&amp;n-&gt;node, &amp;head-&gt;track_notifier_list);</div><div class='ctx'> 	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_page_track_register_notifier);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * stop receiving the event interception. It is the opposed operation of</div><div class='hunk'>@@ -199,6 +204,7 @@ kvm_page_track_unregister_notifier(struct kvm *kvm,</div><div class='ctx'> 	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> 	synchronize_srcu(&amp;head-&gt;track_srcu);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_page_track_unregister_notifier);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Notify the node that write access is intercepted and write emulation is</div><div class='hunk'>@@ -222,6 +228,31 @@ void kvm_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new,</div><div class='ctx'> 	idx = srcu_read_lock(&amp;head-&gt;track_srcu);</div><div class='ctx'> 	hlist_for_each_entry_rcu(n, &amp;head-&gt;track_notifier_list, node)</div><div class='ctx'> 		if (n-&gt;track_write)</div><div class='del'>-			n-&gt;track_write(vcpu, gpa, new, bytes);</div><div class='add'>+			n-&gt;track_write(vcpu, gpa, new, bytes, n);</div><div class='add'>+	srcu_read_unlock(&amp;head-&gt;track_srcu, idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Notify the node that memory slot is being removed or moved so that it can</div><div class='add'>+ * drop write-protection for the pages in the memory slot.</div><div class='add'>+ *</div><div class='add'>+ * The node should figure out it has any write-protected pages in this slot</div><div class='add'>+ * by itself.</div><div class='add'>+ */</div><div class='add'>+void kvm_page_track_flush_slot(struct kvm *kvm, struct kvm_memory_slot *slot)</div><div class='add'>+{</div><div class='add'>+	struct kvm_page_track_notifier_head *head;</div><div class='add'>+	struct kvm_page_track_notifier_node *n;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	head = &amp;kvm-&gt;arch.track_notifier_head;</div><div class='add'>+</div><div class='add'>+	if (hlist_empty(&amp;head-&gt;track_notifier_list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	idx = srcu_read_lock(&amp;head-&gt;track_srcu);</div><div class='add'>+	hlist_for_each_entry_rcu(n, &amp;head-&gt;track_notifier_list, node)</div><div class='add'>+		if (n-&gt;track_flush_slot)</div><div class='add'>+			n-&gt;track_flush_slot(kvm, slot, n);</div><div class='ctx'> 	srcu_read_unlock(&amp;head-&gt;track_srcu, idx);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c<br/>index 06ce377dcbc9..026db42a86c3 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/pmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/pmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/pmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/pmu.c</a></div><div class='hunk'>@@ -113,12 +113,19 @@ static void pmc_reprogram_counter(struct kvm_pmc *pmc, u32 type,</div><div class='ctx'> 		.config = config,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	attr.sample_period = (-pmc-&gt;counter) &amp; pmc_bitmask(pmc);</div><div class='add'>+</div><div class='ctx'> 	if (in_tx)</div><div class='ctx'> 		attr.config |= HSW_IN_TX;</div><div class='del'>-	if (in_tx_cp)</div><div class='add'>+	if (in_tx_cp) {</div><div class='add'>+		/*</div><div class='add'>+		 * HSW_IN_TX_CHECKPOINTED is not supported with nonzero</div><div class='add'>+		 * period. Just clear the sample period so at least</div><div class='add'>+		 * allocating the counter doesn't fail.</div><div class='add'>+		 */</div><div class='add'>+		attr.sample_period = 0;</div><div class='ctx'> 		attr.config |= HSW_IN_TX_CHECKPOINTED;</div><div class='del'>-</div><div class='del'>-	attr.sample_period = (-pmc-&gt;counter) &amp; pmc_bitmask(pmc);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	event = perf_event_create_kernel_counter(&amp;attr, -1, current,</div><div class='ctx'> 						 intr ? kvm_perf_overflow_intr :</div><div class='head'>diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c<br/>index 8ca1eca5038d..d1efe2c62b3f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/svm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/svm.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/svm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/svm.c</a></div><div class='hunk'>@@ -971,8 +971,8 @@ static void svm_disable_lbrv(struct vcpu_svm *svm)</div><div class='ctx'>  * a particular vCPU.</div><div class='ctx'>  */</div><div class='ctx'> #define SVM_VM_DATA_HASH_BITS	8</div><div class='del'>-DECLARE_HASHTABLE(svm_vm_data_hash, SVM_VM_DATA_HASH_BITS);</div><div class='del'>-static spinlock_t svm_vm_data_hash_lock;</div><div class='add'>+static DEFINE_HASHTABLE(svm_vm_data_hash, SVM_VM_DATA_HASH_BITS);</div><div class='add'>+static DEFINE_SPINLOCK(svm_vm_data_hash_lock);</div><div class='ctx'> </div><div class='ctx'> /* Note:</div><div class='ctx'>  * This function is called from IOMMU driver to notify</div><div class='hunk'>@@ -1077,8 +1077,6 @@ static __init int svm_hardware_setup(void)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pr_info("AVIC enabled\n");</div><div class='ctx'> </div><div class='del'>-			hash_init(svm_vm_data_hash);</div><div class='del'>-			spin_lock_init(&amp;svm_vm_data_hash_lock);</div><div class='ctx'> 			amd_iommu_register_ga_log_notifier(&amp;avic_ga_log_notifier);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1159,7 +1157,6 @@ static void init_vmcb(struct vcpu_svm *svm)</div><div class='ctx'> 	struct vmcb_control_area *control = &amp;svm-&gt;vmcb-&gt;control;</div><div class='ctx'> 	struct vmcb_save_area *save = &amp;svm-&gt;vmcb-&gt;save;</div><div class='ctx'> </div><div class='del'>-	svm-&gt;vcpu.fpu_active = 1;</div><div class='ctx'> 	svm-&gt;vcpu.arch.hflags = 0;</div><div class='ctx'> </div><div class='ctx'> 	set_cr_intercept(svm, INTERCEPT_CR0_READ);</div><div class='hunk'>@@ -1901,15 +1898,12 @@ static void update_cr0_intercept(struct vcpu_svm *svm)</div><div class='ctx'> 	ulong gcr0 = svm-&gt;vcpu.arch.cr0;</div><div class='ctx'> 	u64 *hcr0 = &amp;svm-&gt;vmcb-&gt;save.cr0;</div><div class='ctx'> </div><div class='del'>-	if (!svm-&gt;vcpu.fpu_active)</div><div class='del'>-		*hcr0 |= SVM_CR0_SELECTIVE_MASK;</div><div class='del'>-	else</div><div class='del'>-		*hcr0 = (*hcr0 &amp; ~SVM_CR0_SELECTIVE_MASK)</div><div class='del'>-			| (gcr0 &amp; SVM_CR0_SELECTIVE_MASK);</div><div class='add'>+	*hcr0 = (*hcr0 &amp; ~SVM_CR0_SELECTIVE_MASK)</div><div class='add'>+		| (gcr0 &amp; SVM_CR0_SELECTIVE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	mark_dirty(svm-&gt;vmcb, VMCB_CR);</div><div class='ctx'> </div><div class='del'>-	if (gcr0 == *hcr0 &amp;&amp; svm-&gt;vcpu.fpu_active) {</div><div class='add'>+	if (gcr0 == *hcr0) {</div><div class='ctx'> 		clr_cr_intercept(svm, INTERCEPT_CR0_READ);</div><div class='ctx'> 		clr_cr_intercept(svm, INTERCEPT_CR0_WRITE);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1940,8 +1934,6 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)</div><div class='ctx'> 	if (!npt_enabled)</div><div class='ctx'> 		cr0 |= X86_CR0_PG | X86_CR0_WP;</div><div class='ctx'> </div><div class='del'>-	if (!vcpu-&gt;fpu_active)</div><div class='del'>-		cr0 |= X86_CR0_TS;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * re-enable caching here because the QEMU bios</div><div class='ctx'> 	 * does not do it - this results in some delay at</div><div class='hunk'>@@ -2074,7 +2066,7 @@ static void svm_set_dr7(struct kvm_vcpu *vcpu, unsigned long value)</div><div class='ctx'> static int pf_interception(struct vcpu_svm *svm)</div><div class='ctx'> {</div><div class='ctx'> 	u64 fault_address = svm-&gt;vmcb-&gt;control.exit_info_2;</div><div class='del'>-	u32 error_code;</div><div class='add'>+	u64 error_code;</div><div class='ctx'> 	int r = 1;</div><div class='ctx'> </div><div class='ctx'> 	switch (svm-&gt;apf_reason) {</div><div class='hunk'>@@ -2160,22 +2152,6 @@ static int ac_interception(struct vcpu_svm *svm)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void svm_fpu_activate(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct vcpu_svm *svm = to_svm(vcpu);</div><div class='del'>-</div><div class='del'>-	clr_exception_intercept(svm, NM_VECTOR);</div><div class='del'>-</div><div class='del'>-	svm-&gt;vcpu.fpu_active = 1;</div><div class='del'>-	update_cr0_intercept(svm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nm_interception(struct vcpu_svm *svm)</div><div class='del'>-{</div><div class='del'>-	svm_fpu_activate(&amp;svm-&gt;vcpu);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool is_erratum_383(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err, i;</div><div class='hunk'>@@ -2270,7 +2246,7 @@ static int io_interception(struct vcpu_svm *svm)</div><div class='ctx'> 	++svm-&gt;vcpu.stat.io_exits;</div><div class='ctx'> 	string = (io_info &amp; SVM_IOIO_STR_MASK) != 0;</div><div class='ctx'> 	in = (io_info &amp; SVM_IOIO_TYPE_MASK) != 0;</div><div class='del'>-	if (string || in)</div><div class='add'>+	if (string)</div><div class='ctx'> 		return emulate_instruction(vcpu, 0) == EMULATE_DONE;</div><div class='ctx'> </div><div class='ctx'> 	port = io_info &gt;&gt; 16;</div><div class='hunk'>@@ -2278,7 +2254,8 @@ static int io_interception(struct vcpu_svm *svm)</div><div class='ctx'> 	svm-&gt;next_rip = svm-&gt;vmcb-&gt;control.exit_info_2;</div><div class='ctx'> 	skip_emulated_instruction(&amp;svm-&gt;vcpu);</div><div class='ctx'> </div><div class='del'>-	return kvm_fast_pio_out(vcpu, size, port);</div><div class='add'>+	return in ? kvm_fast_pio_in(vcpu, size, port)</div><div class='add'>+		  : kvm_fast_pio_out(vcpu, size, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nmi_interception(struct vcpu_svm *svm)</div><div class='hunk'>@@ -2572,9 +2549,6 @@ static int nested_svm_exit_special(struct vcpu_svm *svm)</div><div class='ctx'> 		if (!npt_enabled &amp;&amp; svm-&gt;apf_reason == 0)</div><div class='ctx'> 			return NESTED_EXIT_HOST;</div><div class='ctx'> 		break;</div><div class='del'>-	case SVM_EXIT_EXCP_BASE + NM_VECTOR:</div><div class='del'>-		nm_interception(svm);</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3150,8 +3124,7 @@ static int skinit_interception(struct vcpu_svm *svm)</div><div class='ctx'> </div><div class='ctx'> static int wbinvd_interception(struct vcpu_svm *svm)</div><div class='ctx'> {</div><div class='del'>-	kvm_emulate_wbinvd(&amp;svm-&gt;vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_emulate_wbinvd(&amp;svm-&gt;vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xsetbv_interception(struct vcpu_svm *svm)</div><div class='hunk'>@@ -3238,8 +3211,7 @@ static int task_switch_interception(struct vcpu_svm *svm)</div><div class='ctx'> static int cpuid_interception(struct vcpu_svm *svm)</div><div class='ctx'> {</div><div class='ctx'> 	svm-&gt;next_rip = kvm_rip_read(&amp;svm-&gt;vcpu) + 2;</div><div class='del'>-	kvm_emulate_cpuid(&amp;svm-&gt;vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_emulate_cpuid(&amp;svm-&gt;vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iret_interception(struct vcpu_svm *svm)</div><div class='hunk'>@@ -3275,9 +3247,7 @@ static int rdpmc_interception(struct vcpu_svm *svm)</div><div class='ctx'> 		return emulate_on_interception(svm);</div><div class='ctx'> </div><div class='ctx'> 	err = kvm_rdpmc(&amp;svm-&gt;vcpu);</div><div class='del'>-	kvm_complete_insn_gp(&amp;svm-&gt;vcpu, err);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_complete_insn_gp(&amp;svm-&gt;vcpu, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool check_selective_cr0_intercepted(struct vcpu_svm *svm,</div><div class='hunk'>@@ -3374,9 +3344,7 @@ static int cr_interception(struct vcpu_svm *svm)</div><div class='ctx'> 		}</div><div class='ctx'> 		kvm_register_write(&amp;svm-&gt;vcpu, reg, val);</div><div class='ctx'> 	}</div><div class='del'>-	kvm_complete_insn_gp(&amp;svm-&gt;vcpu, err);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_complete_insn_gp(&amp;svm-&gt;vcpu, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dr_interception(struct vcpu_svm *svm)</div><div class='hunk'>@@ -4025,7 +3993,6 @@ static int (*const svm_exit_handlers[])(struct vcpu_svm *svm) = {</div><div class='ctx'> 	[SVM_EXIT_EXCP_BASE + BP_VECTOR]	= bp_interception,</div><div class='ctx'> 	[SVM_EXIT_EXCP_BASE + UD_VECTOR]	= ud_interception,</div><div class='ctx'> 	[SVM_EXIT_EXCP_BASE + PF_VECTOR]	= pf_interception,</div><div class='del'>-	[SVM_EXIT_EXCP_BASE + NM_VECTOR]	= nm_interception,</div><div class='ctx'> 	[SVM_EXIT_EXCP_BASE + MC_VECTOR]	= mc_interception,</div><div class='ctx'> 	[SVM_EXIT_EXCP_BASE + AC_VECTOR]	= ac_interception,</div><div class='ctx'> 	[SVM_EXIT_INTR]				= intr_interception,</div><div class='hunk'>@@ -4187,6 +4154,8 @@ static int handle_exit(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	trace_kvm_exit(exit_code, vcpu, KVM_ISA_SVM);</div><div class='ctx'> </div><div class='add'>+	vcpu-&gt;arch.gpa_available = (exit_code == SVM_EXIT_NPF);</div><div class='add'>+</div><div class='ctx'> 	if (!is_cr_intercept(svm, INTERCEPT_CR0_WRITE))</div><div class='ctx'> 		vcpu-&gt;arch.cr0 = svm-&gt;vmcb-&gt;save.cr0;</div><div class='ctx'> 	if (npt_enabled)</div><div class='hunk'>@@ -4362,11 +4331,6 @@ static void svm_load_eoi_exitmap(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void svm_sync_pir_to_irr(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void svm_deliver_avic_intr(struct kvm_vcpu *vcpu, int vec)</div><div class='ctx'> {</div><div class='ctx'> 	kvm_lapic_set_irr(vec, vcpu-&gt;arch.apic);</div><div class='hunk'>@@ -5082,14 +5046,6 @@ static bool svm_has_wbinvd_exit(void)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void svm_fpu_deactivate(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct vcpu_svm *svm = to_svm(vcpu);</div><div class='del'>-</div><div class='del'>-	set_exception_intercept(svm, NM_VECTOR);</div><div class='del'>-	update_cr0_intercept(svm);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define PRE_EX(exit)  { .exit_code = (exit), \</div><div class='ctx'> 			.stage = X86_ICPT_PRE_EXCEPT, }</div><div class='ctx'> #define POST_EX(exit) { .exit_code = (exit), \</div><div class='hunk'>@@ -5350,9 +5306,6 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {</div><div class='ctx'> </div><div class='ctx'> 	.get_pkru = svm_get_pkru,</div><div class='ctx'> </div><div class='del'>-	.fpu_activate = svm_fpu_activate,</div><div class='del'>-	.fpu_deactivate = svm_fpu_deactivate,</div><div class='del'>-</div><div class='ctx'> 	.tlb_flush = svm_flush_tlb,</div><div class='ctx'> </div><div class='ctx'> 	.run = svm_vcpu_run,</div><div class='hunk'>@@ -5376,7 +5329,6 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {</div><div class='ctx'> 	.get_enable_apicv = svm_get_enable_apicv,</div><div class='ctx'> 	.refresh_apicv_exec_ctrl = svm_refresh_apicv_exec_ctrl,</div><div class='ctx'> 	.load_eoi_exitmap = svm_load_eoi_exitmap,</div><div class='del'>-	.sync_pir_to_irr = svm_sync_pir_to_irr,</div><div class='ctx'> 	.hwapic_irr_update = svm_hwapic_irr_update,</div><div class='ctx'> 	.hwapic_isr_update = svm_hwapic_isr_update,</div><div class='ctx'> 	.apicv_post_state_restore = avic_post_state_restore,</div><div class='head'>diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c<br/>index 5382b82462fc..283aa8601833 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/vmx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/vmx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/vmx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/vmx.c</a></div><div class='hunk'>@@ -133,6 +133,16 @@ module_param_named(preemption_timer, enable_preemption_timer, bool, S_IRUGO);</div><div class='ctx'> #define VMX_MISC_EMULATED_PREEMPTION_TIMER_RATE 5</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Hyper-V requires all of these, so mark them as supported even though</div><div class='add'>+ * they are just treated the same as all-context.</div><div class='add'>+ */</div><div class='add'>+#define VMX_VPID_EXTENT_SUPPORTED_MASK		\</div><div class='add'>+	(VMX_VPID_EXTENT_INDIVIDUAL_ADDR_BIT |	\</div><div class='add'>+	VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT |	\</div><div class='add'>+	VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT |	\</div><div class='add'>+	VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * These 2 parameters are used to config the controls for Pause-Loop Exiting:</div><div class='ctx'>  * ple_gap:    upper bound on the amount of time between two successive</div><div class='ctx'>  *             executions of PAUSE in a loop. Also indicate if ple enabled.</div><div class='hunk'>@@ -446,23 +456,31 @@ struct nested_vmx {</div><div class='ctx'> 	u16 vpid02;</div><div class='ctx'> 	u16 last_vpid;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We only store the "true" versions of the VMX capability MSRs. We</div><div class='add'>+	 * generate the "non-true" versions by setting the must-be-1 bits</div><div class='add'>+	 * according to the SDM.</div><div class='add'>+	 */</div><div class='ctx'> 	u32 nested_vmx_procbased_ctls_low;</div><div class='ctx'> 	u32 nested_vmx_procbased_ctls_high;</div><div class='del'>-	u32 nested_vmx_true_procbased_ctls_low;</div><div class='ctx'> 	u32 nested_vmx_secondary_ctls_low;</div><div class='ctx'> 	u32 nested_vmx_secondary_ctls_high;</div><div class='ctx'> 	u32 nested_vmx_pinbased_ctls_low;</div><div class='ctx'> 	u32 nested_vmx_pinbased_ctls_high;</div><div class='ctx'> 	u32 nested_vmx_exit_ctls_low;</div><div class='ctx'> 	u32 nested_vmx_exit_ctls_high;</div><div class='del'>-	u32 nested_vmx_true_exit_ctls_low;</div><div class='ctx'> 	u32 nested_vmx_entry_ctls_low;</div><div class='ctx'> 	u32 nested_vmx_entry_ctls_high;</div><div class='del'>-	u32 nested_vmx_true_entry_ctls_low;</div><div class='ctx'> 	u32 nested_vmx_misc_low;</div><div class='ctx'> 	u32 nested_vmx_misc_high;</div><div class='ctx'> 	u32 nested_vmx_ept_caps;</div><div class='ctx'> 	u32 nested_vmx_vpid_caps;</div><div class='add'>+	u64 nested_vmx_basic;</div><div class='add'>+	u64 nested_vmx_cr0_fixed0;</div><div class='add'>+	u64 nested_vmx_cr0_fixed1;</div><div class='add'>+	u64 nested_vmx_cr4_fixed0;</div><div class='add'>+	u64 nested_vmx_cr4_fixed1;</div><div class='add'>+	u64 nested_vmx_vmcs_enum;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define POSTED_INTR_ON  0</div><div class='hunk'>@@ -520,6 +538,12 @@ static inline void pi_set_sn(struct pi_desc *pi_desc)</div><div class='ctx'> 			(unsigned long *)&amp;pi_desc-&gt;control);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void pi_clear_on(struct pi_desc *pi_desc)</div><div class='add'>+{</div><div class='add'>+	clear_bit(POSTED_INTR_ON,</div><div class='add'>+  		  (unsigned long *)&amp;pi_desc-&gt;control);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int pi_test_on(struct pi_desc *pi_desc)</div><div class='ctx'> {</div><div class='ctx'> 	return test_bit(POSTED_INTR_ON,</div><div class='hunk'>@@ -920,16 +944,32 @@ static DEFINE_PER_CPU(struct desc_ptr, host_gdt);</div><div class='ctx'> static DEFINE_PER_CPU(struct list_head, blocked_vcpu_on_cpu);</div><div class='ctx'> static DEFINE_PER_CPU(spinlock_t, blocked_vcpu_on_cpu_lock);</div><div class='ctx'> </div><div class='del'>-static unsigned long *vmx_io_bitmap_a;</div><div class='del'>-static unsigned long *vmx_io_bitmap_b;</div><div class='del'>-static unsigned long *vmx_msr_bitmap_legacy;</div><div class='del'>-static unsigned long *vmx_msr_bitmap_longmode;</div><div class='del'>-static unsigned long *vmx_msr_bitmap_legacy_x2apic;</div><div class='del'>-static unsigned long *vmx_msr_bitmap_longmode_x2apic;</div><div class='del'>-static unsigned long *vmx_msr_bitmap_legacy_x2apic_apicv_inactive;</div><div class='del'>-static unsigned long *vmx_msr_bitmap_longmode_x2apic_apicv_inactive;</div><div class='del'>-static unsigned long *vmx_vmread_bitmap;</div><div class='del'>-static unsigned long *vmx_vmwrite_bitmap;</div><div class='add'>+enum {</div><div class='add'>+	VMX_IO_BITMAP_A,</div><div class='add'>+	VMX_IO_BITMAP_B,</div><div class='add'>+	VMX_MSR_BITMAP_LEGACY,</div><div class='add'>+	VMX_MSR_BITMAP_LONGMODE,</div><div class='add'>+	VMX_MSR_BITMAP_LEGACY_X2APIC_APICV,</div><div class='add'>+	VMX_MSR_BITMAP_LONGMODE_X2APIC_APICV,</div><div class='add'>+	VMX_MSR_BITMAP_LEGACY_X2APIC,</div><div class='add'>+	VMX_MSR_BITMAP_LONGMODE_X2APIC,</div><div class='add'>+	VMX_VMREAD_BITMAP,</div><div class='add'>+	VMX_VMWRITE_BITMAP,</div><div class='add'>+	VMX_BITMAP_NR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long *vmx_bitmap[VMX_BITMAP_NR];</div><div class='add'>+</div><div class='add'>+#define vmx_io_bitmap_a                      (vmx_bitmap[VMX_IO_BITMAP_A])</div><div class='add'>+#define vmx_io_bitmap_b                      (vmx_bitmap[VMX_IO_BITMAP_B])</div><div class='add'>+#define vmx_msr_bitmap_legacy                (vmx_bitmap[VMX_MSR_BITMAP_LEGACY])</div><div class='add'>+#define vmx_msr_bitmap_longmode              (vmx_bitmap[VMX_MSR_BITMAP_LONGMODE])</div><div class='add'>+#define vmx_msr_bitmap_legacy_x2apic_apicv   (vmx_bitmap[VMX_MSR_BITMAP_LEGACY_X2APIC_APICV])</div><div class='add'>+#define vmx_msr_bitmap_longmode_x2apic_apicv (vmx_bitmap[VMX_MSR_BITMAP_LONGMODE_X2APIC_APICV])</div><div class='add'>+#define vmx_msr_bitmap_legacy_x2apic         (vmx_bitmap[VMX_MSR_BITMAP_LEGACY_X2APIC])</div><div class='add'>+#define vmx_msr_bitmap_longmode_x2apic       (vmx_bitmap[VMX_MSR_BITMAP_LONGMODE_X2APIC])</div><div class='add'>+#define vmx_vmread_bitmap                    (vmx_bitmap[VMX_VMREAD_BITMAP])</div><div class='add'>+#define vmx_vmwrite_bitmap                   (vmx_bitmap[VMX_VMWRITE_BITMAP])</div><div class='ctx'> </div><div class='ctx'> static bool cpu_has_load_ia32_efer;</div><div class='ctx'> static bool cpu_has_load_perf_global_ctrl;</div><div class='hunk'>@@ -1343,10 +1383,10 @@ static inline bool nested_cpu_has_posted_intr(struct vmcs12 *vmcs12)</div><div class='ctx'> 	return vmcs12-&gt;pin_based_vm_exec_control &amp; PIN_BASED_POSTED_INTR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_exception(u32 intr_info)</div><div class='add'>+static inline bool is_nmi(u32 intr_info)</div><div class='ctx'> {</div><div class='ctx'> 	return (intr_info &amp; (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))</div><div class='del'>-		== (INTR_TYPE_HARD_EXCEPTION | INTR_INFO_VALID_MASK);</div><div class='add'>+		== (INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,</div><div class='hunk'>@@ -1816,7 +1856,7 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u32 eb;</div><div class='ctx'> </div><div class='ctx'> 	eb = (1u &lt;&lt; PF_VECTOR) | (1u &lt;&lt; UD_VECTOR) | (1u &lt;&lt; MC_VECTOR) |</div><div class='del'>-	     (1u &lt;&lt; NM_VECTOR) | (1u &lt;&lt; DB_VECTOR) | (1u &lt;&lt; AC_VECTOR);</div><div class='add'>+	     (1u &lt;&lt; DB_VECTOR) | (1u &lt;&lt; AC_VECTOR);</div><div class='ctx'> 	if ((vcpu-&gt;guest_debug &amp;</div><div class='ctx'> 	     (KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_USE_SW_BP)) ==</div><div class='ctx'> 	    (KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_USE_SW_BP))</div><div class='hunk'>@@ -1825,8 +1865,6 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		eb = ~0;</div><div class='ctx'> 	if (enable_ept)</div><div class='ctx'> 		eb &amp;= ~(1u &lt;&lt; PF_VECTOR); /* bypass_guest_pf = 0 */</div><div class='del'>-	if (vcpu-&gt;fpu_active)</div><div class='del'>-		eb &amp;= ~(1u &lt;&lt; NM_VECTOR);</div><div class='ctx'> </div><div class='ctx'> 	/* When we are running a nested L2 guest and L1 specified for it a</div><div class='ctx'> 	 * certain exception bitmap, we must trap the same exceptions and pass</div><div class='hunk'>@@ -1952,19 +1990,6 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr,</div><div class='ctx'> 	m-&gt;host[i].value = host_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void reload_tss(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * VT restores TR but not its size.  Useless.</div><div class='del'>-	 */</div><div class='del'>-	struct desc_ptr *gdt = this_cpu_ptr(&amp;host_gdt);</div><div class='del'>-	struct desc_struct *descs;</div><div class='del'>-</div><div class='del'>-	descs = (void *)gdt-&gt;address;</div><div class='del'>-	descs[GDT_ENTRY_TSS].type = 9; /* available TSS */</div><div class='del'>-	load_TR_desc();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool update_transition_efer(struct vcpu_vmx *vmx, int efer_offset)</div><div class='ctx'> {</div><div class='ctx'> 	u64 guest_efer = vmx-&gt;vcpu.arch.efer;</div><div class='hunk'>@@ -2019,41 +2044,35 @@ static bool update_transition_efer(struct vcpu_vmx *vmx, int efer_offset)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+/*</div><div class='add'>+ * On 32-bit kernels, VM exits still load the FS and GS bases from the</div><div class='add'>+ * VMCS rather than the segment table.  KVM uses this helper to figure</div><div class='add'>+ * out the current bases to poke them into the VMCS before entry.</div><div class='add'>+ */</div><div class='ctx'> static unsigned long segment_base(u16 selector)</div><div class='ctx'> {</div><div class='ctx'> 	struct desc_ptr *gdt = this_cpu_ptr(&amp;host_gdt);</div><div class='del'>-	struct desc_struct *d;</div><div class='del'>-	unsigned long table_base;</div><div class='add'>+	struct desc_struct *table;</div><div class='ctx'> 	unsigned long v;</div><div class='ctx'> </div><div class='del'>-	if (!(selector &amp; ~3))</div><div class='add'>+	if (!(selector &amp; ~SEGMENT_RPL_MASK))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	table_base = gdt-&gt;address;</div><div class='add'>+	table = (struct desc_struct *)gdt-&gt;address;</div><div class='ctx'> </div><div class='del'>-	if (selector &amp; 4) {           /* from ldt */</div><div class='add'>+	if ((selector &amp; SEGMENT_TI_MASK) == SEGMENT_LDT) {</div><div class='ctx'> 		u16 ldt_selector = kvm_read_ldt();</div><div class='ctx'> </div><div class='del'>-		if (!(ldt_selector &amp; ~3))</div><div class='add'>+		if (!(ldt_selector &amp; ~SEGMENT_RPL_MASK))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		table_base = segment_base(ldt_selector);</div><div class='add'>+		table = (struct desc_struct *)segment_base(ldt_selector);</div><div class='ctx'> 	}</div><div class='del'>-	d = (struct desc_struct *)(table_base + (selector &amp; ~7));</div><div class='del'>-	v = get_desc_base(d);</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-       if (d-&gt;s == 0 &amp;&amp; (d-&gt;type == 2 || d-&gt;type == 9 || d-&gt;type == 11))</div><div class='del'>-               v |= ((unsigned long)((struct ldttss_desc64 *)d)-&gt;base3) &lt;&lt; 32;</div><div class='del'>-#endif</div><div class='add'>+	v = get_desc_base(&amp;table[selector &gt;&gt; 3]);</div><div class='ctx'> 	return v;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline unsigned long kvm_read_tr_base(void)</div><div class='del'>-{</div><div class='del'>-	u16 tr;</div><div class='del'>-	asm("str %0" : "=g"(tr));</div><div class='del'>-	return segment_base(tr);</div><div class='del'>-}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void vmx_save_host_state(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -2139,18 +2158,12 @@ static void __vmx_load_host_state(struct vcpu_vmx *vmx)</div><div class='ctx'> 		loadsegment(es, vmx-&gt;host_state.es_sel);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	reload_tss();</div><div class='add'>+	invalidate_tss_limit();</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	wrmsrl(MSR_KERNEL_GS_BASE, vmx-&gt;msr_host_kernel_gs_base);</div><div class='ctx'> #endif</div><div class='ctx'> 	if (vmx-&gt;host_state.msr_host_bndcfgs)</div><div class='ctx'> 		wrmsrl(MSR_IA32_BNDCFGS, vmx-&gt;host_state.msr_host_bndcfgs);</div><div class='del'>-	/*</div><div class='del'>-	 * If the FPU is not active (through the host task or</div><div class='del'>-	 * the guest vcpu), then restore the cr0.TS bit.</div><div class='del'>-	 */</div><div class='del'>-	if (!fpregs_active() &amp;&amp; !vmx-&gt;vcpu.guest_fpu_loaded)</div><div class='del'>-		stts();</div><div class='ctx'> 	load_gdt(this_cpu_ptr(&amp;host_gdt));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2260,10 +2273,19 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Linux uses per-cpu TSS and GDT, so set these when switching</div><div class='del'>-		 * processors.</div><div class='add'>+		 * processors.  See 22.2.4.</div><div class='ctx'> 		 */</div><div class='del'>-		vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */</div><div class='del'>-		vmcs_writel(HOST_GDTR_BASE, gdt-&gt;address);   /* 22.2.4 */</div><div class='add'>+		vmcs_writel(HOST_TR_BASE,</div><div class='add'>+			    (unsigned long)this_cpu_ptr(&amp;cpu_tss));</div><div class='add'>+		vmcs_writel(HOST_GDTR_BASE, gdt-&gt;address);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * VM exits change the host TR limit to 0x67 after a VM</div><div class='add'>+		 * exit.  This is okay, since 0x67 covers everything except</div><div class='add'>+		 * the IO bitmap and have have code to handle the IO bitmap</div><div class='add'>+		 * being lost after a VM exit.</div><div class='add'>+		 */</div><div class='add'>+		BUILD_BUG_ON(IO_BITMAP_OFFSET - 1 != 0x67);</div><div class='ctx'> </div><div class='ctx'> 		rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);</div><div class='ctx'> 		vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */</div><div class='hunk'>@@ -2306,25 +2328,6 @@ static void vmx_vcpu_put(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vmx_fpu_activate(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	ulong cr0;</div><div class='del'>-</div><div class='del'>-	if (vcpu-&gt;fpu_active)</div><div class='del'>-		return;</div><div class='del'>-	vcpu-&gt;fpu_active = 1;</div><div class='del'>-	cr0 = vmcs_readl(GUEST_CR0);</div><div class='del'>-	cr0 &amp;= ~(X86_CR0_TS | X86_CR0_MP);</div><div class='del'>-	cr0 |= kvm_read_cr0_bits(vcpu, X86_CR0_TS | X86_CR0_MP);</div><div class='del'>-	vmcs_writel(GUEST_CR0, cr0);</div><div class='del'>-	update_exception_bitmap(vcpu);</div><div class='del'>-	vcpu-&gt;arch.cr0_guest_owned_bits = X86_CR0_TS;</div><div class='del'>-	if (is_guest_mode(vcpu))</div><div class='del'>-		vcpu-&gt;arch.cr0_guest_owned_bits &amp;=</div><div class='del'>-			~get_vmcs12(vcpu)-&gt;cr0_guest_host_mask;</div><div class='del'>-	vmcs_writel(CR0_GUEST_HOST_MASK, ~vcpu-&gt;arch.cr0_guest_owned_bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void vmx_decache_cr0_guest_bits(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2343,33 +2346,6 @@ static inline unsigned long nested_read_cr4(struct vmcs12 *fields)</div><div class='ctx'> 		(fields-&gt;cr4_read_shadow &amp; fields-&gt;cr4_guest_host_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vmx_fpu_deactivate(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	/* Note that there is no vcpu-&gt;fpu_active = 0 here. The caller must</div><div class='del'>-	 * set this *before* calling this function.</div><div class='del'>-	 */</div><div class='del'>-	vmx_decache_cr0_guest_bits(vcpu);</div><div class='del'>-	vmcs_set_bits(GUEST_CR0, X86_CR0_TS | X86_CR0_MP);</div><div class='del'>-	update_exception_bitmap(vcpu);</div><div class='del'>-	vcpu-&gt;arch.cr0_guest_owned_bits = 0;</div><div class='del'>-	vmcs_writel(CR0_GUEST_HOST_MASK, ~vcpu-&gt;arch.cr0_guest_owned_bits);</div><div class='del'>-	if (is_guest_mode(vcpu)) {</div><div class='del'>-		/*</div><div class='del'>-		 * L1's specified read shadow might not contain the TS bit,</div><div class='del'>-		 * so now that we turned on shadowing of this bit, we need to</div><div class='del'>-		 * set this bit of the shadow. Like in nested_vmx_run we need</div><div class='del'>-		 * nested_read_cr0(vmcs12), but vmcs12-&gt;guest_cr0 is not yet</div><div class='del'>-		 * up-to-date here because we just decached cr0.TS (and we'll</div><div class='del'>-		 * only update vmcs12-&gt;guest_cr0 on nested exit).</div><div class='del'>-		 */</div><div class='del'>-		struct vmcs12 *vmcs12 = get_vmcs12(vcpu);</div><div class='del'>-		vmcs12-&gt;guest_cr0 = (vmcs12-&gt;guest_cr0 &amp; ~X86_CR0_TS) |</div><div class='del'>-			(vcpu-&gt;arch.cr0 &amp; X86_CR0_TS);</div><div class='del'>-		vmcs_writel(CR0_READ_SHADOW, nested_read_cr0(vmcs12));</div><div class='del'>-	} else</div><div class='del'>-		vmcs_writel(CR0_READ_SHADOW, vcpu-&gt;arch.cr0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long rflags, save_rflags;</div><div class='hunk'>@@ -2529,14 +2505,14 @@ static void vmx_set_msr_bitmap(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		  SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE)) {</div><div class='ctx'> 		if (enable_apicv &amp;&amp; kvm_vcpu_apicv_active(vcpu)) {</div><div class='ctx'> 			if (is_long_mode(vcpu))</div><div class='del'>-				msr_bitmap = vmx_msr_bitmap_longmode_x2apic;</div><div class='add'>+				msr_bitmap = vmx_msr_bitmap_longmode_x2apic_apicv;</div><div class='ctx'> 			else</div><div class='del'>-				msr_bitmap = vmx_msr_bitmap_legacy_x2apic;</div><div class='add'>+				msr_bitmap = vmx_msr_bitmap_legacy_x2apic_apicv;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (is_long_mode(vcpu))</div><div class='del'>-				msr_bitmap = vmx_msr_bitmap_longmode_x2apic_apicv_inactive;</div><div class='add'>+				msr_bitmap = vmx_msr_bitmap_longmode_x2apic;</div><div class='ctx'> 			else</div><div class='del'>-				msr_bitmap = vmx_msr_bitmap_legacy_x2apic_apicv_inactive;</div><div class='add'>+				msr_bitmap = vmx_msr_bitmap_legacy_x2apic;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (is_long_mode(vcpu))</div><div class='hunk'>@@ -2712,9 +2688,7 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx)</div><div class='ctx'> 		vmx-&gt;nested.nested_vmx_exit_ctls_high |= VM_EXIT_CLEAR_BNDCFGS;</div><div class='ctx'> </div><div class='ctx'> 	/* We support free control of debug control saving. */</div><div class='del'>-	vmx-&gt;nested.nested_vmx_true_exit_ctls_low =</div><div class='del'>-		vmx-&gt;nested.nested_vmx_exit_ctls_low &amp;</div><div class='del'>-		~VM_EXIT_SAVE_DEBUG_CONTROLS;</div><div class='add'>+	vmx-&gt;nested.nested_vmx_exit_ctls_low &amp;= ~VM_EXIT_SAVE_DEBUG_CONTROLS;</div><div class='ctx'> </div><div class='ctx'> 	/* entry controls */</div><div class='ctx'> 	rdmsr(MSR_IA32_VMX_ENTRY_CTLS,</div><div class='hunk'>@@ -2733,9 +2707,7 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx)</div><div class='ctx'> 		vmx-&gt;nested.nested_vmx_entry_ctls_high |= VM_ENTRY_LOAD_BNDCFGS;</div><div class='ctx'> </div><div class='ctx'> 	/* We support free control of debug control loading. */</div><div class='del'>-	vmx-&gt;nested.nested_vmx_true_entry_ctls_low =</div><div class='del'>-		vmx-&gt;nested.nested_vmx_entry_ctls_low &amp;</div><div class='del'>-		~VM_ENTRY_LOAD_DEBUG_CONTROLS;</div><div class='add'>+	vmx-&gt;nested.nested_vmx_entry_ctls_low &amp;= ~VM_ENTRY_LOAD_DEBUG_CONTROLS;</div><div class='ctx'> </div><div class='ctx'> 	/* cpu-based controls */</div><div class='ctx'> 	rdmsr(MSR_IA32_VMX_PROCBASED_CTLS,</div><div class='hunk'>@@ -2768,8 +2740,7 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx)</div><div class='ctx'> 		CPU_BASED_USE_MSR_BITMAPS;</div><div class='ctx'> </div><div class='ctx'> 	/* We support free control of CR3 access interception. */</div><div class='del'>-	vmx-&gt;nested.nested_vmx_true_procbased_ctls_low =</div><div class='del'>-		vmx-&gt;nested.nested_vmx_procbased_ctls_low &amp;</div><div class='add'>+	vmx-&gt;nested.nested_vmx_procbased_ctls_low &amp;=</div><div class='ctx'> 		~(CPU_BASED_CR3_LOAD_EXITING | CPU_BASED_CR3_STORE_EXITING);</div><div class='ctx'> </div><div class='ctx'> 	/* secondary cpu-based controls */</div><div class='hunk'>@@ -2780,6 +2751,7 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx)</div><div class='ctx'> 	vmx-&gt;nested.nested_vmx_secondary_ctls_high &amp;=</div><div class='ctx'> 		SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |</div><div class='ctx'> 		SECONDARY_EXEC_RDTSCP |</div><div class='add'>+		SECONDARY_EXEC_DESC |</div><div class='ctx'> 		SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE |</div><div class='ctx'> 		SECONDARY_EXEC_ENABLE_VPID |</div><div class='ctx'> 		SECONDARY_EXEC_APIC_REGISTER_VIRT |</div><div class='hunk'>@@ -2811,8 +2783,7 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (enable_vpid)</div><div class='ctx'> 		vmx-&gt;nested.nested_vmx_vpid_caps = VMX_VPID_INVVPID_BIT |</div><div class='del'>-				VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT |</div><div class='del'>-				VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT;</div><div class='add'>+			VMX_VPID_EXTENT_SUPPORTED_MASK;</div><div class='ctx'> 	else</div><div class='ctx'> 		vmx-&gt;nested.nested_vmx_vpid_caps = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2829,14 +2800,52 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx)</div><div class='ctx'> 		VMX_MISC_EMULATED_PREEMPTION_TIMER_RATE |</div><div class='ctx'> 		VMX_MISC_ACTIVITY_HLT;</div><div class='ctx'> 	vmx-&gt;nested.nested_vmx_misc_high = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This MSR reports some information about VMX support. We</div><div class='add'>+	 * should return information about the VMX we emulate for the</div><div class='add'>+	 * guest, and the VMCS structure we give it - not about the</div><div class='add'>+	 * VMX support of the underlying hardware.</div><div class='add'>+	 */</div><div class='add'>+	vmx-&gt;nested.nested_vmx_basic =</div><div class='add'>+		VMCS12_REVISION |</div><div class='add'>+		VMX_BASIC_TRUE_CTLS |</div><div class='add'>+		((u64)VMCS12_SIZE &lt;&lt; VMX_BASIC_VMCS_SIZE_SHIFT) |</div><div class='add'>+		(VMX_BASIC_MEM_TYPE_WB &lt;&lt; VMX_BASIC_MEM_TYPE_SHIFT);</div><div class='add'>+</div><div class='add'>+	if (cpu_has_vmx_basic_inout())</div><div class='add'>+		vmx-&gt;nested.nested_vmx_basic |= VMX_BASIC_INOUT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * These MSRs specify bits which the guest must keep fixed on</div><div class='add'>+	 * while L1 is in VMXON mode (in L1's root mode, or running an L2).</div><div class='add'>+	 * We picked the standard core2 setting.</div><div class='add'>+	 */</div><div class='add'>+#define VMXON_CR0_ALWAYSON     (X86_CR0_PE | X86_CR0_PG | X86_CR0_NE)</div><div class='add'>+#define VMXON_CR4_ALWAYSON     X86_CR4_VMXE</div><div class='add'>+	vmx-&gt;nested.nested_vmx_cr0_fixed0 = VMXON_CR0_ALWAYSON;</div><div class='add'>+	vmx-&gt;nested.nested_vmx_cr4_fixed0 = VMXON_CR4_ALWAYSON;</div><div class='add'>+</div><div class='add'>+	/* These MSRs specify bits which the guest must keep fixed off. */</div><div class='add'>+	rdmsrl(MSR_IA32_VMX_CR0_FIXED1, vmx-&gt;nested.nested_vmx_cr0_fixed1);</div><div class='add'>+	rdmsrl(MSR_IA32_VMX_CR4_FIXED1, vmx-&gt;nested.nested_vmx_cr4_fixed1);</div><div class='add'>+</div><div class='add'>+	/* highest index: VMX_PREEMPTION_TIMER_VALUE */</div><div class='add'>+	vmx-&gt;nested.nested_vmx_vmcs_enum = 0x2e;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * if fixed0[i] == 1: val[i] must be 1</div><div class='add'>+ * if fixed1[i] == 0: val[i] must be 0</div><div class='add'>+ */</div><div class='add'>+static inline bool fixed_bits_valid(u64 val, u64 fixed0, u64 fixed1)</div><div class='add'>+{</div><div class='add'>+	return ((val &amp; fixed1) | fixed0) == val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool vmx_control_verify(u32 control, u32 low, u32 high)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * Bits 0 in high must be 0, and bits 1 in low must be 1.</div><div class='del'>-	 */</div><div class='del'>-	return ((control &amp; high) | low) == control;</div><div class='add'>+	return fixed_bits_valid(control, low, high);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u64 vmx_control_msr(u32 low, u32 high)</div><div class='hunk'>@@ -2844,87 +2853,285 @@ static inline u64 vmx_control_msr(u32 low, u32 high)</div><div class='ctx'> 	return low | ((u64)high &lt;&lt; 32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Returns 0 on success, non-0 otherwise. */</div><div class='del'>-static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)</div><div class='add'>+static bool is_bitwise_subset(u64 superset, u64 subset, u64 mask)</div><div class='add'>+{</div><div class='add'>+	superset &amp;= mask;</div><div class='add'>+	subset &amp;= mask;</div><div class='add'>+</div><div class='add'>+	return (superset | subset) == superset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vmx_restore_vmx_basic(struct vcpu_vmx *vmx, u64 data)</div><div class='add'>+{</div><div class='add'>+	const u64 feature_and_reserved =</div><div class='add'>+		/* feature (except bit 48; see below) */</div><div class='add'>+		BIT_ULL(49) | BIT_ULL(54) | BIT_ULL(55) |</div><div class='add'>+		/* reserved */</div><div class='add'>+		BIT_ULL(31) | GENMASK_ULL(47, 45) | GENMASK_ULL(63, 56);</div><div class='add'>+	u64 vmx_basic = vmx-&gt;nested.nested_vmx_basic;</div><div class='add'>+</div><div class='add'>+	if (!is_bitwise_subset(vmx_basic, data, feature_and_reserved))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * KVM does not emulate a version of VMX that constrains physical</div><div class='add'>+	 * addresses of VMX structures (e.g. VMCS) to 32-bits.</div><div class='add'>+	 */</div><div class='add'>+	if (data &amp; BIT_ULL(48))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (vmx_basic_vmcs_revision_id(vmx_basic) !=</div><div class='add'>+	    vmx_basic_vmcs_revision_id(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (vmx_basic_vmcs_size(vmx_basic) &gt; vmx_basic_vmcs_size(data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	vmx-&gt;nested.nested_vmx_basic = data;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+vmx_restore_control_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data)</div><div class='add'>+{</div><div class='add'>+	u64 supported;</div><div class='add'>+	u32 *lowp, *highp;</div><div class='add'>+</div><div class='add'>+	switch (msr_index) {</div><div class='add'>+	case MSR_IA32_VMX_TRUE_PINBASED_CTLS:</div><div class='add'>+		lowp = &amp;vmx-&gt;nested.nested_vmx_pinbased_ctls_low;</div><div class='add'>+		highp = &amp;vmx-&gt;nested.nested_vmx_pinbased_ctls_high;</div><div class='add'>+		break;</div><div class='add'>+	case MSR_IA32_VMX_TRUE_PROCBASED_CTLS:</div><div class='add'>+		lowp = &amp;vmx-&gt;nested.nested_vmx_procbased_ctls_low;</div><div class='add'>+		highp = &amp;vmx-&gt;nested.nested_vmx_procbased_ctls_high;</div><div class='add'>+		break;</div><div class='add'>+	case MSR_IA32_VMX_TRUE_EXIT_CTLS:</div><div class='add'>+		lowp = &amp;vmx-&gt;nested.nested_vmx_exit_ctls_low;</div><div class='add'>+		highp = &amp;vmx-&gt;nested.nested_vmx_exit_ctls_high;</div><div class='add'>+		break;</div><div class='add'>+	case MSR_IA32_VMX_TRUE_ENTRY_CTLS:</div><div class='add'>+		lowp = &amp;vmx-&gt;nested.nested_vmx_entry_ctls_low;</div><div class='add'>+		highp = &amp;vmx-&gt;nested.nested_vmx_entry_ctls_high;</div><div class='add'>+		break;</div><div class='add'>+	case MSR_IA32_VMX_PROCBASED_CTLS2:</div><div class='add'>+		lowp = &amp;vmx-&gt;nested.nested_vmx_secondary_ctls_low;</div><div class='add'>+		highp = &amp;vmx-&gt;nested.nested_vmx_secondary_ctls_high;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	supported = vmx_control_msr(*lowp, *highp);</div><div class='add'>+</div><div class='add'>+	/* Check must-be-1 bits are still 1. */</div><div class='add'>+	if (!is_bitwise_subset(data, supported, GENMASK_ULL(31, 0)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Check must-be-0 bits are still 0. */</div><div class='add'>+	if (!is_bitwise_subset(supported, data, GENMASK_ULL(63, 32)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*lowp = data;</div><div class='add'>+	*highp = data &gt;&gt; 32;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vmx_restore_vmx_misc(struct vcpu_vmx *vmx, u64 data)</div><div class='add'>+{</div><div class='add'>+	const u64 feature_and_reserved_bits =</div><div class='add'>+		/* feature */</div><div class='add'>+		BIT_ULL(5) | GENMASK_ULL(8, 6) | BIT_ULL(14) | BIT_ULL(15) |</div><div class='add'>+		BIT_ULL(28) | BIT_ULL(29) | BIT_ULL(30) |</div><div class='add'>+		/* reserved */</div><div class='add'>+		GENMASK_ULL(13, 9) | BIT_ULL(31);</div><div class='add'>+	u64 vmx_misc;</div><div class='add'>+</div><div class='add'>+	vmx_misc = vmx_control_msr(vmx-&gt;nested.nested_vmx_misc_low,</div><div class='add'>+				   vmx-&gt;nested.nested_vmx_misc_high);</div><div class='add'>+</div><div class='add'>+	if (!is_bitwise_subset(vmx_misc, data, feature_and_reserved_bits))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((vmx-&gt;nested.nested_vmx_pinbased_ctls_high &amp;</div><div class='add'>+	     PIN_BASED_VMX_PREEMPTION_TIMER) &amp;&amp;</div><div class='add'>+	    vmx_misc_preemption_timer_rate(data) !=</div><div class='add'>+	    vmx_misc_preemption_timer_rate(vmx_misc))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (vmx_misc_cr3_count(data) &gt; vmx_misc_cr3_count(vmx_misc))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (vmx_misc_max_msr(data) &gt; vmx_misc_max_msr(vmx_misc))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (vmx_misc_mseg_revid(data) != vmx_misc_mseg_revid(vmx_misc))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	vmx-&gt;nested.nested_vmx_misc_low = data;</div><div class='add'>+	vmx-&gt;nested.nested_vmx_misc_high = data &gt;&gt; 32;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vmx_restore_vmx_ept_vpid_cap(struct vcpu_vmx *vmx, u64 data)</div><div class='add'>+{</div><div class='add'>+	u64 vmx_ept_vpid_cap;</div><div class='add'>+</div><div class='add'>+	vmx_ept_vpid_cap = vmx_control_msr(vmx-&gt;nested.nested_vmx_ept_caps,</div><div class='add'>+					   vmx-&gt;nested.nested_vmx_vpid_caps);</div><div class='add'>+</div><div class='add'>+	/* Every bit is either reserved or a feature bit. */</div><div class='add'>+	if (!is_bitwise_subset(vmx_ept_vpid_cap, data, -1ULL))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	vmx-&gt;nested.nested_vmx_ept_caps = data;</div><div class='add'>+	vmx-&gt;nested.nested_vmx_vpid_caps = data &gt;&gt; 32;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vmx_restore_fixed0_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data)</div><div class='add'>+{</div><div class='add'>+	u64 *msr;</div><div class='add'>+</div><div class='add'>+	switch (msr_index) {</div><div class='add'>+	case MSR_IA32_VMX_CR0_FIXED0:</div><div class='add'>+		msr = &amp;vmx-&gt;nested.nested_vmx_cr0_fixed0;</div><div class='add'>+		break;</div><div class='add'>+	case MSR_IA32_VMX_CR4_FIXED0:</div><div class='add'>+		msr = &amp;vmx-&gt;nested.nested_vmx_cr4_fixed0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 1 bits (which indicates bits which "must-be-1" during VMX operation)</div><div class='add'>+	 * must be 1 in the restored value.</div><div class='add'>+	 */</div><div class='add'>+	if (!is_bitwise_subset(data, *msr, -1ULL))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*msr = data;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called when userspace is restoring VMX MSRs.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, non-0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static int vmx_set_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	switch (msr_index) {</div><div class='ctx'> 	case MSR_IA32_VMX_BASIC:</div><div class='add'>+		return vmx_restore_vmx_basic(vmx, data);</div><div class='add'>+	case MSR_IA32_VMX_PINBASED_CTLS:</div><div class='add'>+	case MSR_IA32_VMX_PROCBASED_CTLS:</div><div class='add'>+	case MSR_IA32_VMX_EXIT_CTLS:</div><div class='add'>+	case MSR_IA32_VMX_ENTRY_CTLS:</div><div class='ctx'> 		/*</div><div class='del'>-		 * This MSR reports some information about VMX support. We</div><div class='del'>-		 * should return information about the VMX we emulate for the</div><div class='del'>-		 * guest, and the VMCS structure we give it - not about the</div><div class='del'>-		 * VMX support of the underlying hardware.</div><div class='add'>+		 * The "non-true" VMX capability MSRs are generated from the</div><div class='add'>+		 * "true" MSRs, so we do not support restoring them directly.</div><div class='add'>+		 *</div><div class='add'>+		 * If userspace wants to emulate VMX_BASIC[55]=0, userspace</div><div class='add'>+		 * should restore the "true" MSRs with the must-be-1 bits</div><div class='add'>+		 * set according to the SDM Vol 3. A.2 "RESERVED CONTROLS AND</div><div class='add'>+		 * DEFAULT SETTINGS".</div><div class='ctx'> 		 */</div><div class='del'>-		*pdata = VMCS12_REVISION | VMX_BASIC_TRUE_CTLS |</div><div class='del'>-			   ((u64)VMCS12_SIZE &lt;&lt; VMX_BASIC_VMCS_SIZE_SHIFT) |</div><div class='del'>-			   (VMX_BASIC_MEM_TYPE_WB &lt;&lt; VMX_BASIC_MEM_TYPE_SHIFT);</div><div class='del'>-		if (cpu_has_vmx_basic_inout())</div><div class='del'>-			*pdata |= VMX_BASIC_INOUT;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case MSR_IA32_VMX_TRUE_PINBASED_CTLS:</div><div class='add'>+	case MSR_IA32_VMX_TRUE_PROCBASED_CTLS:</div><div class='add'>+	case MSR_IA32_VMX_TRUE_EXIT_CTLS:</div><div class='add'>+	case MSR_IA32_VMX_TRUE_ENTRY_CTLS:</div><div class='add'>+	case MSR_IA32_VMX_PROCBASED_CTLS2:</div><div class='add'>+		return vmx_restore_control_msr(vmx, msr_index, data);</div><div class='add'>+	case MSR_IA32_VMX_MISC:</div><div class='add'>+		return vmx_restore_vmx_misc(vmx, data);</div><div class='add'>+	case MSR_IA32_VMX_CR0_FIXED0:</div><div class='add'>+	case MSR_IA32_VMX_CR4_FIXED0:</div><div class='add'>+		return vmx_restore_fixed0_msr(vmx, msr_index, data);</div><div class='add'>+	case MSR_IA32_VMX_CR0_FIXED1:</div><div class='add'>+	case MSR_IA32_VMX_CR4_FIXED1:</div><div class='add'>+		/*</div><div class='add'>+		 * These MSRs are generated based on the vCPU's CPUID, so we</div><div class='add'>+		 * do not support restoring them directly.</div><div class='add'>+		 */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case MSR_IA32_VMX_EPT_VPID_CAP:</div><div class='add'>+		return vmx_restore_vmx_ept_vpid_cap(vmx, data);</div><div class='add'>+	case MSR_IA32_VMX_VMCS_ENUM:</div><div class='add'>+		vmx-&gt;nested.nested_vmx_vmcs_enum = data;</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		/*</div><div class='add'>+		 * The rest of the VMX capability MSRs do not support restore.</div><div class='add'>+		 */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns 0 on success, non-0 otherwise. */</div><div class='add'>+static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)</div><div class='add'>+{</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='add'>+</div><div class='add'>+	switch (msr_index) {</div><div class='add'>+	case MSR_IA32_VMX_BASIC:</div><div class='add'>+		*pdata = vmx-&gt;nested.nested_vmx_basic;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_IA32_VMX_TRUE_PINBASED_CTLS:</div><div class='ctx'> 	case MSR_IA32_VMX_PINBASED_CTLS:</div><div class='ctx'> 		*pdata = vmx_control_msr(</div><div class='ctx'> 			vmx-&gt;nested.nested_vmx_pinbased_ctls_low,</div><div class='ctx'> 			vmx-&gt;nested.nested_vmx_pinbased_ctls_high);</div><div class='add'>+		if (msr_index == MSR_IA32_VMX_PINBASED_CTLS)</div><div class='add'>+			*pdata |= PIN_BASED_ALWAYSON_WITHOUT_TRUE_MSR;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_IA32_VMX_TRUE_PROCBASED_CTLS:</div><div class='del'>-		*pdata = vmx_control_msr(</div><div class='del'>-			vmx-&gt;nested.nested_vmx_true_procbased_ctls_low,</div><div class='del'>-			vmx-&gt;nested.nested_vmx_procbased_ctls_high);</div><div class='del'>-		break;</div><div class='ctx'> 	case MSR_IA32_VMX_PROCBASED_CTLS:</div><div class='ctx'> 		*pdata = vmx_control_msr(</div><div class='ctx'> 			vmx-&gt;nested.nested_vmx_procbased_ctls_low,</div><div class='ctx'> 			vmx-&gt;nested.nested_vmx_procbased_ctls_high);</div><div class='add'>+		if (msr_index == MSR_IA32_VMX_PROCBASED_CTLS)</div><div class='add'>+			*pdata |= CPU_BASED_ALWAYSON_WITHOUT_TRUE_MSR;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_IA32_VMX_TRUE_EXIT_CTLS:</div><div class='del'>-		*pdata = vmx_control_msr(</div><div class='del'>-			vmx-&gt;nested.nested_vmx_true_exit_ctls_low,</div><div class='del'>-			vmx-&gt;nested.nested_vmx_exit_ctls_high);</div><div class='del'>-		break;</div><div class='ctx'> 	case MSR_IA32_VMX_EXIT_CTLS:</div><div class='ctx'> 		*pdata = vmx_control_msr(</div><div class='ctx'> 			vmx-&gt;nested.nested_vmx_exit_ctls_low,</div><div class='ctx'> 			vmx-&gt;nested.nested_vmx_exit_ctls_high);</div><div class='add'>+		if (msr_index == MSR_IA32_VMX_EXIT_CTLS)</div><div class='add'>+			*pdata |= VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_IA32_VMX_TRUE_ENTRY_CTLS:</div><div class='del'>-		*pdata = vmx_control_msr(</div><div class='del'>-			vmx-&gt;nested.nested_vmx_true_entry_ctls_low,</div><div class='del'>-			vmx-&gt;nested.nested_vmx_entry_ctls_high);</div><div class='del'>-		break;</div><div class='ctx'> 	case MSR_IA32_VMX_ENTRY_CTLS:</div><div class='ctx'> 		*pdata = vmx_control_msr(</div><div class='ctx'> 			vmx-&gt;nested.nested_vmx_entry_ctls_low,</div><div class='ctx'> 			vmx-&gt;nested.nested_vmx_entry_ctls_high);</div><div class='add'>+		if (msr_index == MSR_IA32_VMX_ENTRY_CTLS)</div><div class='add'>+			*pdata |= VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_IA32_VMX_MISC:</div><div class='ctx'> 		*pdata = vmx_control_msr(</div><div class='ctx'> 			vmx-&gt;nested.nested_vmx_misc_low,</div><div class='ctx'> 			vmx-&gt;nested.nested_vmx_misc_high);</div><div class='ctx'> 		break;</div><div class='del'>-	/*</div><div class='del'>-	 * These MSRs specify bits which the guest must keep fixed (on or off)</div><div class='del'>-	 * while L1 is in VMXON mode (in L1's root mode, or running an L2).</div><div class='del'>-	 * We picked the standard core2 setting.</div><div class='del'>-	 */</div><div class='del'>-#define VMXON_CR0_ALWAYSON	(X86_CR0_PE | X86_CR0_PG | X86_CR0_NE)</div><div class='del'>-#define VMXON_CR4_ALWAYSON	X86_CR4_VMXE</div><div class='ctx'> 	case MSR_IA32_VMX_CR0_FIXED0:</div><div class='del'>-		*pdata = VMXON_CR0_ALWAYSON;</div><div class='add'>+		*pdata = vmx-&gt;nested.nested_vmx_cr0_fixed0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_IA32_VMX_CR0_FIXED1:</div><div class='del'>-		*pdata = -1ULL;</div><div class='add'>+		*pdata = vmx-&gt;nested.nested_vmx_cr0_fixed1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_IA32_VMX_CR4_FIXED0:</div><div class='del'>-		*pdata = VMXON_CR4_ALWAYSON;</div><div class='add'>+		*pdata = vmx-&gt;nested.nested_vmx_cr4_fixed0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_IA32_VMX_CR4_FIXED1:</div><div class='del'>-		*pdata = -1ULL;</div><div class='add'>+		*pdata = vmx-&gt;nested.nested_vmx_cr4_fixed1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_IA32_VMX_VMCS_ENUM:</div><div class='del'>-		*pdata = 0x2e; /* highest index: VMX_PREEMPTION_TIMER_VALUE */</div><div class='add'>+		*pdata = vmx-&gt;nested.nested_vmx_vmcs_enum;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_IA32_VMX_PROCBASED_CTLS2:</div><div class='ctx'> 		*pdata = vmx_control_msr(</div><div class='hunk'>@@ -3107,7 +3314,11 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)</div><div class='ctx'> 			vmx_leave_nested(vcpu);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_IA32_VMX_BASIC ... MSR_IA32_VMX_VMFUNC:</div><div class='del'>-		return 1; /* they are read-only */</div><div class='add'>+		if (!msr_info-&gt;host_initiated)</div><div class='add'>+			return 1; /* they are read-only */</div><div class='add'>+		if (!nested_vmx_allowed(vcpu))</div><div class='add'>+			return 1;</div><div class='add'>+		return vmx_set_vmx_msr(vcpu, msr_index, data);</div><div class='ctx'> 	case MSR_IA32_XSS:</div><div class='ctx'> 		if (!vmx_xsaves_supported())</div><div class='ctx'> 			return 1;</div><div class='hunk'>@@ -3693,7 +3904,7 @@ static void fix_rmode_seg(int seg, struct kvm_segment *save)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vmcs_write16(sf-&gt;selector, var.selector);</div><div class='del'>-	vmcs_write32(sf-&gt;base, var.base);</div><div class='add'>+	vmcs_writel(sf-&gt;base, var.base);</div><div class='ctx'> 	vmcs_write32(sf-&gt;limit, var.limit);</div><div class='ctx'> 	vmcs_write32(sf-&gt;ar_bytes, vmx_segment_access_rights(&amp;var));</div><div class='ctx'> }</div><div class='hunk'>@@ -3869,6 +4080,40 @@ static void ept_save_pdptrs(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		  (unsigned long *)&amp;vcpu-&gt;arch.regs_dirty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool nested_guest_cr0_valid(struct kvm_vcpu *vcpu, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	u64 fixed0 = to_vmx(vcpu)-&gt;nested.nested_vmx_cr0_fixed0;</div><div class='add'>+	u64 fixed1 = to_vmx(vcpu)-&gt;nested.nested_vmx_cr0_fixed1;</div><div class='add'>+	struct vmcs12 *vmcs12 = get_vmcs12(vcpu);</div><div class='add'>+</div><div class='add'>+	if (to_vmx(vcpu)-&gt;nested.nested_vmx_secondary_ctls_high &amp;</div><div class='add'>+		SECONDARY_EXEC_UNRESTRICTED_GUEST &amp;&amp;</div><div class='add'>+	    nested_cpu_has2(vmcs12, SECONDARY_EXEC_UNRESTRICTED_GUEST))</div><div class='add'>+		fixed0 &amp;= ~(X86_CR0_PE | X86_CR0_PG);</div><div class='add'>+</div><div class='add'>+	return fixed_bits_valid(val, fixed0, fixed1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nested_host_cr0_valid(struct kvm_vcpu *vcpu, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	u64 fixed0 = to_vmx(vcpu)-&gt;nested.nested_vmx_cr0_fixed0;</div><div class='add'>+	u64 fixed1 = to_vmx(vcpu)-&gt;nested.nested_vmx_cr0_fixed1;</div><div class='add'>+</div><div class='add'>+	return fixed_bits_valid(val, fixed0, fixed1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nested_cr4_valid(struct kvm_vcpu *vcpu, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	u64 fixed0 = to_vmx(vcpu)-&gt;nested.nested_vmx_cr4_fixed0;</div><div class='add'>+	u64 fixed1 = to_vmx(vcpu)-&gt;nested.nested_vmx_cr4_fixed1;</div><div class='add'>+</div><div class='add'>+	return fixed_bits_valid(val, fixed0, fixed1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* No difference in the restrictions on guest and host CR4 in VMX operation. */</div><div class='add'>+#define nested_guest_cr4_valid	nested_cr4_valid</div><div class='add'>+#define nested_host_cr4_valid	nested_cr4_valid</div><div class='add'>+</div><div class='ctx'> static int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4);</div><div class='ctx'> </div><div class='ctx'> static void ept_update_paging_mode_cr0(unsigned long *hw_cr0,</div><div class='hunk'>@@ -3929,9 +4174,6 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)</div><div class='ctx'> 	if (enable_ept)</div><div class='ctx'> 		ept_update_paging_mode_cr0(&amp;hw_cr0, cr0, vcpu);</div><div class='ctx'> </div><div class='del'>-	if (!vcpu-&gt;fpu_active)</div><div class='del'>-		hw_cr0 |= X86_CR0_TS | X86_CR0_MP;</div><div class='del'>-</div><div class='ctx'> 	vmcs_writel(CR0_READ_SHADOW, cr0);</div><div class='ctx'> 	vmcs_writel(GUEST_CR0, hw_cr0);</div><div class='ctx'> 	vcpu-&gt;arch.cr0 = cr0;</div><div class='hunk'>@@ -3997,8 +4239,8 @@ static int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)</div><div class='ctx'> 		if (!nested_vmx_allowed(vcpu))</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (to_vmx(vcpu)-&gt;nested.vmxon &amp;&amp;</div><div class='del'>-	    ((cr4 &amp; VMXON_CR4_ALWAYSON) != VMXON_CR4_ALWAYSON))</div><div class='add'>+</div><div class='add'>+	if (to_vmx(vcpu)-&gt;nested.vmxon &amp;&amp; !nested_cr4_valid(vcpu, cr4))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.cr4 = cr4;</div><div class='hunk'>@@ -4575,41 +4817,6 @@ static void __vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __vmx_enable_intercept_for_msr(unsigned long *msr_bitmap,</div><div class='del'>-						u32 msr, int type)</div><div class='del'>-{</div><div class='del'>-	int f = sizeof(unsigned long);</div><div class='del'>-</div><div class='del'>-	if (!cpu_has_vmx_msr_bitmap())</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * See Intel PRM Vol. 3, 20.6.9 (MSR-Bitmap Address). Early manuals</div><div class='del'>-	 * have the write-low and read-high bitmap offsets the wrong way round.</div><div class='del'>-	 * We can control MSRs 0x00000000-0x00001fff and 0xc0000000-0xc0001fff.</div><div class='del'>-	 */</div><div class='del'>-	if (msr &lt;= 0x1fff) {</div><div class='del'>-		if (type &amp; MSR_TYPE_R)</div><div class='del'>-			/* read-low */</div><div class='del'>-			__set_bit(msr, msr_bitmap + 0x000 / f);</div><div class='del'>-</div><div class='del'>-		if (type &amp; MSR_TYPE_W)</div><div class='del'>-			/* write-low */</div><div class='del'>-			__set_bit(msr, msr_bitmap + 0x800 / f);</div><div class='del'>-</div><div class='del'>-	} else if ((msr &gt;= 0xc0000000) &amp;&amp; (msr &lt;= 0xc0001fff)) {</div><div class='del'>-		msr &amp;= 0x1fff;</div><div class='del'>-		if (type &amp; MSR_TYPE_R)</div><div class='del'>-			/* read-high */</div><div class='del'>-			__set_bit(msr, msr_bitmap + 0x400 / f);</div><div class='del'>-</div><div class='del'>-		if (type &amp; MSR_TYPE_W)</div><div class='del'>-			/* write-high */</div><div class='del'>-			__set_bit(msr, msr_bitmap + 0xc00 / f);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * If a msr is allowed by L0, we should check whether it is allowed by L1.</div><div class='ctx'>  * The corresponding bit will be cleared unless both of L0 and L1 allow it.</div><div class='hunk'>@@ -4665,48 +4872,18 @@ static void vmx_disable_intercept_for_msr(u32 msr, bool longmode_only)</div><div class='ctx'> 						msr, MSR_TYPE_R | MSR_TYPE_W);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vmx_enable_intercept_msr_read_x2apic(u32 msr, bool apicv_active)</div><div class='del'>-{</div><div class='del'>-	if (apicv_active) {</div><div class='del'>-		__vmx_enable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic,</div><div class='del'>-				msr, MSR_TYPE_R);</div><div class='del'>-		__vmx_enable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic,</div><div class='del'>-				msr, MSR_TYPE_R);</div><div class='del'>-	} else {</div><div class='del'>-		__vmx_enable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic_apicv_inactive,</div><div class='del'>-				msr, MSR_TYPE_R);</div><div class='del'>-		__vmx_enable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic_apicv_inactive,</div><div class='del'>-				msr, MSR_TYPE_R);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vmx_disable_intercept_msr_read_x2apic(u32 msr, bool apicv_active)</div><div class='add'>+static void vmx_disable_intercept_msr_x2apic(u32 msr, int type, bool apicv_active)</div><div class='ctx'> {</div><div class='ctx'> 	if (apicv_active) {</div><div class='del'>-		__vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic,</div><div class='del'>-				msr, MSR_TYPE_R);</div><div class='del'>-		__vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic,</div><div class='del'>-				msr, MSR_TYPE_R);</div><div class='add'>+		__vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic_apicv,</div><div class='add'>+				msr, type);</div><div class='add'>+		__vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic_apicv,</div><div class='add'>+				msr, type);</div><div class='ctx'> 	} else {</div><div class='del'>-		__vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic_apicv_inactive,</div><div class='del'>-				msr, MSR_TYPE_R);</div><div class='del'>-		__vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic_apicv_inactive,</div><div class='del'>-				msr, MSR_TYPE_R);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vmx_disable_intercept_msr_write_x2apic(u32 msr, bool apicv_active)</div><div class='del'>-{</div><div class='del'>-	if (apicv_active) {</div><div class='ctx'> 		__vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic,</div><div class='del'>-				msr, MSR_TYPE_W);</div><div class='add'>+				msr, type);</div><div class='ctx'> 		__vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic,</div><div class='del'>-				msr, MSR_TYPE_W);</div><div class='del'>-	} else {</div><div class='del'>-		__vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic_apicv_inactive,</div><div class='del'>-				msr, MSR_TYPE_W);</div><div class='del'>-		__vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic_apicv_inactive,</div><div class='del'>-				msr, MSR_TYPE_W);</div><div class='add'>+				msr, type);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4715,7 +4892,7 @@ static bool vmx_get_enable_apicv(void)</div><div class='ctx'> 	return enable_apicv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)</div><div class='add'>+static void vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> 	int max_irr;</div><div class='hunk'>@@ -4726,19 +4903,15 @@ static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	    vmx-&gt;nested.pi_pending) {</div><div class='ctx'> 		vmx-&gt;nested.pi_pending = false;</div><div class='ctx'> 		if (!pi_test_and_clear_on(vmx-&gt;nested.pi_desc))</div><div class='del'>-			return 0;</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='ctx'> 		max_irr = find_last_bit(</div><div class='ctx'> 			(unsigned long *)vmx-&gt;nested.pi_desc-&gt;pir, 256);</div><div class='ctx'> </div><div class='ctx'> 		if (max_irr == 256)</div><div class='del'>-			return 0;</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='ctx'> 		vapic_page = kmap(vmx-&gt;nested.virtual_apic_page);</div><div class='del'>-		if (!vapic_page) {</div><div class='del'>-			WARN_ON(1);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='ctx'> 		__kvm_apic_update_irr(vmx-&gt;nested.pi_desc-&gt;pir, vapic_page);</div><div class='ctx'> 		kunmap(vmx-&gt;nested.virtual_apic_page);</div><div class='ctx'> </div><div class='hunk'>@@ -4749,7 +4922,6 @@ static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)</div><div class='ctx'> 			vmcs_write16(GUEST_INTR_STATUS, status);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -4818,20 +4990,12 @@ static void vmx_deliver_posted_interrupt(struct kvm_vcpu *vcpu, int vector)</div><div class='ctx'> 	if (pi_test_and_set_pir(vector, &amp;vmx-&gt;pi_desc))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	r = pi_test_and_set_on(&amp;vmx-&gt;pi_desc);</div><div class='del'>-	kvm_make_request(KVM_REQ_EVENT, vcpu);</div><div class='del'>-	if (r || !kvm_vcpu_trigger_posted_interrupt(vcpu))</div><div class='del'>-		kvm_vcpu_kick(vcpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vmx_sync_pir_to_irr(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='del'>-</div><div class='del'>-	if (!pi_test_and_clear_on(&amp;vmx-&gt;pi_desc))</div><div class='add'>+	/* If a previous notification has sent the IPI, nothing to do.  */</div><div class='add'>+	if (pi_test_and_set_on(&amp;vmx-&gt;pi_desc))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	kvm_apic_update_irr(vcpu, vmx-&gt;pi_desc.pir);</div><div class='add'>+	if (!kvm_vcpu_trigger_posted_interrupt(vcpu))</div><div class='add'>+		kvm_vcpu_kick(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4845,9 +5009,11 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)</div><div class='ctx'> 	u32 low32, high32;</div><div class='ctx'> 	unsigned long tmpl;</div><div class='ctx'> 	struct desc_ptr dt;</div><div class='del'>-	unsigned long cr4;</div><div class='add'>+	unsigned long cr0, cr4;</div><div class='ctx'> </div><div class='del'>-	vmcs_writel(HOST_CR0, read_cr0() &amp; ~X86_CR0_TS);  /* 22.2.3 */</div><div class='add'>+	cr0 = read_cr0();</div><div class='add'>+	WARN_ON(cr0 &amp; X86_CR0_TS);</div><div class='add'>+	vmcs_writel(HOST_CR0, cr0);  /* 22.2.3 */</div><div class='ctx'> 	vmcs_writel(HOST_CR3, read_cr3());  /* 22.2.3  FIXME: shadow tables */</div><div class='ctx'> </div><div class='ctx'> 	/* Save the most likely value for this task's CR4 in the VMCS. */</div><div class='hunk'>@@ -4990,10 +5156,8 @@ static void ept_set_mmio_spte_mask(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * EPT Misconfigurations can be generated if the value of bits 2:0</div><div class='ctx'> 	 * of an EPT paging-structure entry is 110b (write/execute).</div><div class='del'>-	 * Also, magic bits (0x3ull &lt;&lt; 62) is set to quickly identify mmio</div><div class='del'>-	 * spte.</div><div class='ctx'> 	 */</div><div class='del'>-	kvm_mmu_set_mmio_spte_mask((0x3ull &lt;&lt; 62) | 0x6ull);</div><div class='add'>+	kvm_mmu_set_mmio_spte_mask(VMX_EPT_MISCONFIG_WX_VALUE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define VMX_XSS_EXIT_BITMAP 0</div><div class='hunk'>@@ -5096,7 +5260,9 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)</div><div class='ctx'> 	/* 22.2.1, 20.8.1 */</div><div class='ctx'> 	vm_entry_controls_init(vmx, vmcs_config.vmentry_ctrl);</div><div class='ctx'> </div><div class='del'>-	vmcs_writel(CR0_GUEST_HOST_MASK, ~0UL);</div><div class='add'>+	vmx-&gt;vcpu.arch.cr0_guest_owned_bits = X86_CR0_TS;</div><div class='add'>+	vmcs_writel(CR0_GUEST_HOST_MASK, ~X86_CR0_TS);</div><div class='add'>+</div><div class='ctx'> 	set_cr4_guest_host_mask(vmx);</div><div class='ctx'> </div><div class='ctx'> 	if (vmx_xsaves_supported())</div><div class='hunk'>@@ -5200,7 +5366,7 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)</div><div class='ctx'> 	vmx_set_cr0(vcpu, cr0); /* enter rmode */</div><div class='ctx'> 	vmx_set_cr4(vcpu, 0);</div><div class='ctx'> 	vmx_set_efer(vcpu, 0);</div><div class='del'>-	vmx_fpu_activate(vcpu);</div><div class='add'>+</div><div class='ctx'> 	update_exception_bitmap(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	vpid_sync_context(vmx-&gt;vpid);</div><div class='hunk'>@@ -5234,26 +5400,20 @@ static bool nested_exit_on_nmi(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> static void enable_irq_window(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	u32 cpu_based_vm_exec_control;</div><div class='del'>-</div><div class='del'>-	cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);</div><div class='del'>-	cpu_based_vm_exec_control |= CPU_BASED_VIRTUAL_INTR_PENDING;</div><div class='del'>-	vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control);</div><div class='add'>+	vmcs_set_bits(CPU_BASED_VM_EXEC_CONTROL,</div><div class='add'>+		      CPU_BASED_VIRTUAL_INTR_PENDING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void enable_nmi_window(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	u32 cpu_based_vm_exec_control;</div><div class='del'>-</div><div class='ctx'> 	if (!cpu_has_virtual_nmis() ||</div><div class='ctx'> 	    vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) &amp; GUEST_INTR_STATE_STI) {</div><div class='ctx'> 		enable_irq_window(vcpu);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);</div><div class='del'>-	cpu_based_vm_exec_control |= CPU_BASED_VIRTUAL_NMI_PENDING;</div><div class='del'>-	vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control);</div><div class='add'>+	vmcs_set_bits(CPU_BASED_VM_EXEC_CONTROL,</div><div class='add'>+		      CPU_BASED_VIRTUAL_NMI_PENDING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vmx_inject_irq(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -5476,14 +5636,9 @@ static int handle_exception(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (is_machine_check(intr_info))</div><div class='ctx'> 		return handle_machine_check(vcpu);</div><div class='ctx'> </div><div class='del'>-	if ((intr_info &amp; INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR)</div><div class='add'>+	if (is_nmi(intr_info))</div><div class='ctx'> 		return 1;  /* already handled by vmx_vcpu_run() */</div><div class='ctx'> </div><div class='del'>-	if (is_no_device(intr_info)) {</div><div class='del'>-		vmx_fpu_activate(vcpu);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (is_invalid_opcode(intr_info)) {</div><div class='ctx'> 		if (is_guest_mode(vcpu)) {</div><div class='ctx'> 			kvm_queue_exception(vcpu, UD_VECTOR);</div><div class='hunk'>@@ -5587,7 +5742,7 @@ static int handle_triple_fault(struct kvm_vcpu *vcpu)</div><div class='ctx'> static int handle_io(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long exit_qualification;</div><div class='del'>-	int size, in, string;</div><div class='add'>+	int size, in, string, ret;</div><div class='ctx'> 	unsigned port;</div><div class='ctx'> </div><div class='ctx'> 	exit_qualification = vmcs_readl(EXIT_QUALIFICATION);</div><div class='hunk'>@@ -5601,9 +5756,14 @@ static int handle_io(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	port = exit_qualification &gt;&gt; 16;</div><div class='ctx'> 	size = (exit_qualification &amp; 7) + 1;</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='ctx'> </div><div class='del'>-	return kvm_fast_pio_out(vcpu, size, port);</div><div class='add'>+	ret = kvm_skip_emulated_instruction(vcpu);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: we might be squashing a KVM_GUESTDBG_SINGLESTEP-triggered</div><div class='add'>+	 * KVM_EXIT_DEBUG here.</div><div class='add'>+	 */</div><div class='add'>+	return kvm_fast_pio_out(vcpu, size, port) &amp;&amp; ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -5617,18 +5777,6 @@ vmx_patch_hypercall(struct kvm_vcpu *vcpu, unsigned char *hypercall)</div><div class='ctx'> 	hypercall[2] = 0xc1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool nested_cr0_valid(struct kvm_vcpu *vcpu, unsigned long val)</div><div class='del'>-{</div><div class='del'>-	unsigned long always_on = VMXON_CR0_ALWAYSON;</div><div class='del'>-	struct vmcs12 *vmcs12 = get_vmcs12(vcpu);</div><div class='del'>-</div><div class='del'>-	if (to_vmx(vcpu)-&gt;nested.nested_vmx_secondary_ctls_high &amp;</div><div class='del'>-		SECONDARY_EXEC_UNRESTRICTED_GUEST &amp;&amp;</div><div class='del'>-	    nested_cpu_has2(vmcs12, SECONDARY_EXEC_UNRESTRICTED_GUEST))</div><div class='del'>-		always_on &amp;= ~(X86_CR0_PE | X86_CR0_PG);</div><div class='del'>-	return (val &amp; always_on) == always_on;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* called to set cr0 as appropriate for a mov-to-cr0 exit. */</div><div class='ctx'> static int handle_set_cr0(struct kvm_vcpu *vcpu, unsigned long val)</div><div class='ctx'> {</div><div class='hunk'>@@ -5647,7 +5795,7 @@ static int handle_set_cr0(struct kvm_vcpu *vcpu, unsigned long val)</div><div class='ctx'> 		val = (val &amp; ~vmcs12-&gt;cr0_guest_host_mask) |</div><div class='ctx'> 			(vmcs12-&gt;guest_cr0 &amp; vmcs12-&gt;cr0_guest_host_mask);</div><div class='ctx'> </div><div class='del'>-		if (!nested_cr0_valid(vcpu, val))</div><div class='add'>+		if (!nested_guest_cr0_valid(vcpu, val))</div><div class='ctx'> 			return 1;</div><div class='ctx'> </div><div class='ctx'> 		if (kvm_set_cr0(vcpu, val))</div><div class='hunk'>@@ -5656,8 +5804,9 @@ static int handle_set_cr0(struct kvm_vcpu *vcpu, unsigned long val)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (to_vmx(vcpu)-&gt;nested.vmxon &amp;&amp;</div><div class='del'>-		    ((val &amp; VMXON_CR0_ALWAYSON) != VMXON_CR0_ALWAYSON))</div><div class='add'>+		    !nested_host_cr0_valid(vcpu, val))</div><div class='ctx'> 			return 1;</div><div class='add'>+</div><div class='ctx'> 		return kvm_set_cr0(vcpu, val);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -5679,28 +5828,13 @@ static int handle_set_cr4(struct kvm_vcpu *vcpu, unsigned long val)</div><div class='ctx'> 		return kvm_set_cr4(vcpu, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* called to set cr0 as appropriate for clts instruction exit. */</div><div class='del'>-static void handle_clts(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	if (is_guest_mode(vcpu)) {</div><div class='del'>-		/*</div><div class='del'>-		 * We get here when L2 did CLTS, and L1 didn't shadow CR0.TS</div><div class='del'>-		 * but we did (!fpu_active). We need to keep GUEST_CR0.TS on,</div><div class='del'>-		 * just pretend it's off (also in arch.cr0 for fpu_activate).</div><div class='del'>-		 */</div><div class='del'>-		vmcs_writel(CR0_READ_SHADOW,</div><div class='del'>-			vmcs_readl(CR0_READ_SHADOW) &amp; ~X86_CR0_TS);</div><div class='del'>-		vcpu-&gt;arch.cr0 &amp;= ~X86_CR0_TS;</div><div class='del'>-	} else</div><div class='del'>-		vmx_set_cr0(vcpu, kvm_read_cr0_bits(vcpu, ~X86_CR0_TS));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int handle_cr(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long exit_qualification, val;</div><div class='ctx'> 	int cr;</div><div class='ctx'> 	int reg;</div><div class='ctx'> 	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	exit_qualification = vmcs_readl(EXIT_QUALIFICATION);</div><div class='ctx'> 	cr = exit_qualification &amp; 15;</div><div class='hunk'>@@ -5712,50 +5846,49 @@ static int handle_cr(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		switch (cr) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			err = handle_set_cr0(vcpu, val);</div><div class='del'>-			kvm_complete_insn_gp(vcpu, err);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_complete_insn_gp(vcpu, err);</div><div class='ctx'> 		case 3:</div><div class='ctx'> 			err = kvm_set_cr3(vcpu, val);</div><div class='del'>-			kvm_complete_insn_gp(vcpu, err);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_complete_insn_gp(vcpu, err);</div><div class='ctx'> 		case 4:</div><div class='ctx'> 			err = handle_set_cr4(vcpu, val);</div><div class='del'>-			kvm_complete_insn_gp(vcpu, err);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_complete_insn_gp(vcpu, err);</div><div class='ctx'> 		case 8: {</div><div class='ctx'> 				u8 cr8_prev = kvm_get_cr8(vcpu);</div><div class='ctx'> 				u8 cr8 = (u8)val;</div><div class='ctx'> 				err = kvm_set_cr8(vcpu, cr8);</div><div class='del'>-				kvm_complete_insn_gp(vcpu, err);</div><div class='add'>+				ret = kvm_complete_insn_gp(vcpu, err);</div><div class='ctx'> 				if (lapic_in_kernel(vcpu))</div><div class='del'>-					return 1;</div><div class='add'>+					return ret;</div><div class='ctx'> 				if (cr8_prev &lt;= cr8)</div><div class='del'>-					return 1;</div><div class='add'>+					return ret;</div><div class='add'>+				/*</div><div class='add'>+				 * TODO: we might be squashing a</div><div class='add'>+				 * KVM_GUESTDBG_SINGLESTEP-triggered</div><div class='add'>+				 * KVM_EXIT_DEBUG here.</div><div class='add'>+				 */</div><div class='ctx'> 				vcpu-&gt;run-&gt;exit_reason = KVM_EXIT_SET_TPR;</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2: /* clts */</div><div class='del'>-		handle_clts(vcpu);</div><div class='add'>+		WARN_ONCE(1, "Guest should always own CR0.TS");</div><div class='add'>+		vmx_set_cr0(vcpu, kvm_read_cr0_bits(vcpu, ~X86_CR0_TS));</div><div class='ctx'> 		trace_kvm_cr_write(0, kvm_read_cr0(vcpu));</div><div class='del'>-		skip_emulated_instruction(vcpu);</div><div class='del'>-		vmx_fpu_activate(vcpu);</div><div class='del'>-		return 1;</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	case 1: /*mov from cr*/</div><div class='ctx'> 		switch (cr) {</div><div class='ctx'> 		case 3:</div><div class='ctx'> 			val = kvm_read_cr3(vcpu);</div><div class='ctx'> 			kvm_register_write(vcpu, reg, val);</div><div class='ctx'> 			trace_kvm_cr_read(cr, val);</div><div class='del'>-			skip_emulated_instruction(vcpu);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 		case 8:</div><div class='ctx'> 			val = kvm_get_cr8(vcpu);</div><div class='ctx'> 			kvm_register_write(vcpu, reg, val);</div><div class='ctx'> 			trace_kvm_cr_read(cr, val);</div><div class='del'>-			skip_emulated_instruction(vcpu);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3: /* lmsw */</div><div class='hunk'>@@ -5763,8 +5896,7 @@ static int handle_cr(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		trace_kvm_cr_write(0, (kvm_read_cr0(vcpu) &amp; ~0xful) | val);</div><div class='ctx'> 		kvm_lmsw(vcpu, val);</div><div class='ctx'> </div><div class='del'>-		skip_emulated_instruction(vcpu);</div><div class='del'>-		return 1;</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5835,8 +5967,7 @@ static int handle_dr(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		if (kvm_set_dr(vcpu, dr, kvm_register_readl(vcpu, reg)))</div><div class='ctx'> 			return 1;</div><div class='ctx'> </div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u64 vmx_get_dr6(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -5868,8 +5999,7 @@ static void vmx_set_dr7(struct kvm_vcpu *vcpu, unsigned long val)</div><div class='ctx'> </div><div class='ctx'> static int handle_cpuid(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	kvm_emulate_cpuid(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_emulate_cpuid(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_rdmsr(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -5890,8 +6020,7 @@ static int handle_rdmsr(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	/* FIXME: handling of bits 32:63 of rax, rdx */</div><div class='ctx'> 	vcpu-&gt;arch.regs[VCPU_REGS_RAX] = msr_info.data &amp; -1u;</div><div class='ctx'> 	vcpu-&gt;arch.regs[VCPU_REGS_RDX] = (msr_info.data &gt;&gt; 32) &amp; -1u;</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_wrmsr(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -5911,24 +6040,19 @@ static int handle_wrmsr(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	trace_kvm_msr_write(ecx, data);</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_tpr_below_threshold(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	kvm_make_request(KVM_REQ_EVENT, vcpu);</div><div class='add'>+	kvm_apic_update_ppr(vcpu);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_interrupt_window(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	u32 cpu_based_vm_exec_control;</div><div class='del'>-</div><div class='del'>-	/* clear pending irq */</div><div class='del'>-	cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);</div><div class='del'>-	cpu_based_vm_exec_control &amp;= ~CPU_BASED_VIRTUAL_INTR_PENDING;</div><div class='del'>-	vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control);</div><div class='add'>+	vmcs_clear_bits(CPU_BASED_VM_EXEC_CONTROL,</div><div class='add'>+			CPU_BASED_VIRTUAL_INTR_PENDING);</div><div class='ctx'> </div><div class='ctx'> 	kvm_make_request(KVM_REQ_EVENT, vcpu);</div><div class='ctx'> </div><div class='hunk'>@@ -5956,8 +6080,7 @@ static int handle_invlpg(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	unsigned long exit_qualification = vmcs_readl(EXIT_QUALIFICATION);</div><div class='ctx'> </div><div class='ctx'> 	kvm_mmu_invlpg(vcpu, exit_qualification);</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_rdpmc(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -5965,15 +6088,12 @@ static int handle_rdpmc(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = kvm_rdpmc(vcpu);</div><div class='del'>-	kvm_complete_insn_gp(vcpu, err);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_complete_insn_gp(vcpu, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_wbinvd(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	kvm_emulate_wbinvd(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_emulate_wbinvd(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_xsetbv(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -5982,20 +6102,20 @@ static int handle_xsetbv(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u32 index = kvm_register_read(vcpu, VCPU_REGS_RCX);</div><div class='ctx'> </div><div class='ctx'> 	if (kvm_set_xcr(vcpu, index, new_bv) == 0)</div><div class='del'>-		skip_emulated_instruction(vcpu);</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_xsaves(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='add'>+	kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	WARN(1, "this should never happen\n");</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_xrstors(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='add'>+	kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	WARN(1, "this should never happen\n");</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -6016,8 +6136,7 @@ static int handle_apic_access(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		if ((access_type == TYPE_LINEAR_APIC_INST_WRITE) &amp;&amp;</div><div class='ctx'> 		    (offset == APIC_EOI)) {</div><div class='ctx'> 			kvm_lapic_set_eoi(vcpu);</div><div class='del'>-			skip_emulated_instruction(vcpu);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return emulate_instruction(vcpu, 0) == EMULATE_DONE;</div><div class='hunk'>@@ -6144,15 +6263,22 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS);</div><div class='ctx'> 	trace_kvm_page_fault(gpa, exit_qualification);</div><div class='ctx'> </div><div class='del'>-	/* it is a read fault? */</div><div class='del'>-	error_code = (exit_qualification &lt;&lt; 2) &amp; PFERR_USER_MASK;</div><div class='del'>-	/* it is a write fault? */</div><div class='del'>-	error_code |= exit_qualification &amp; PFERR_WRITE_MASK;</div><div class='del'>-	/* It is a fetch fault? */</div><div class='del'>-	error_code |= (exit_qualification &lt;&lt; 2) &amp; PFERR_FETCH_MASK;</div><div class='del'>-	/* ept page table is present? */</div><div class='del'>-	error_code |= (exit_qualification &amp; 0x38) != 0;</div><div class='del'>-</div><div class='add'>+	/* Is it a read fault? */</div><div class='add'>+	error_code = (exit_qualification &amp; EPT_VIOLATION_ACC_READ)</div><div class='add'>+		     ? PFERR_USER_MASK : 0;</div><div class='add'>+	/* Is it a write fault? */</div><div class='add'>+	error_code |= (exit_qualification &amp; EPT_VIOLATION_ACC_WRITE)</div><div class='add'>+		      ? PFERR_WRITE_MASK : 0;</div><div class='add'>+	/* Is it a fetch fault? */</div><div class='add'>+	error_code |= (exit_qualification &amp; EPT_VIOLATION_ACC_INSTR)</div><div class='add'>+		      ? PFERR_FETCH_MASK : 0;</div><div class='add'>+	/* ept page table entry is present? */</div><div class='add'>+	error_code |= (exit_qualification &amp;</div><div class='add'>+		       (EPT_VIOLATION_READABLE | EPT_VIOLATION_WRITABLE |</div><div class='add'>+			EPT_VIOLATION_EXECUTABLE))</div><div class='add'>+		      ? PFERR_PRESENT_MASK : 0;</div><div class='add'>+</div><div class='add'>+	vcpu-&gt;arch.gpa_available = true;</div><div class='ctx'> 	vcpu-&gt;arch.exit_qualification = exit_qualification;</div><div class='ctx'> </div><div class='ctx'> 	return kvm_mmu_page_fault(vcpu, gpa, error_code, NULL, 0);</div><div class='hunk'>@@ -6165,12 +6291,12 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS);</div><div class='ctx'> 	if (!kvm_io_bus_write(vcpu, KVM_FAST_MMIO_BUS, gpa, 0, NULL)) {</div><div class='del'>-		skip_emulated_instruction(vcpu);</div><div class='ctx'> 		trace_kvm_fast_mmio(gpa);</div><div class='del'>-		return 1;</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = handle_mmio_page_fault(vcpu, gpa, true);</div><div class='add'>+	vcpu-&gt;arch.gpa_available = true;</div><div class='ctx'> 	if (likely(ret == RET_MMIO_PF_EMULATE))</div><div class='ctx'> 		return x86_emulate_instruction(vcpu, gpa, 0, NULL, 0) ==</div><div class='ctx'> 					      EMULATE_DONE;</div><div class='hunk'>@@ -6192,12 +6318,8 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> static int handle_nmi_window(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	u32 cpu_based_vm_exec_control;</div><div class='del'>-</div><div class='del'>-	/* clear pending NMI */</div><div class='del'>-	cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);</div><div class='del'>-	cpu_based_vm_exec_control &amp;= ~CPU_BASED_VIRTUAL_NMI_PENDING;</div><div class='del'>-	vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control);</div><div class='add'>+	vmcs_clear_bits(CPU_BASED_VM_EXEC_CONTROL,</div><div class='add'>+			CPU_BASED_VIRTUAL_NMI_PENDING);</div><div class='ctx'> 	++vcpu-&gt;stat.nmi_window_exits;</div><div class='ctx'> 	kvm_make_request(KVM_REQ_EVENT, vcpu);</div><div class='ctx'> </div><div class='hunk'>@@ -6343,6 +6465,19 @@ static void wakeup_handler(void)</div><div class='ctx'> 	spin_unlock(&amp;per_cpu(blocked_vcpu_on_cpu_lock, cpu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void vmx_enable_tdp(void)</div><div class='add'>+{</div><div class='add'>+	kvm_mmu_set_mask_ptes(VMX_EPT_READABLE_MASK,</div><div class='add'>+		enable_ept_ad_bits ? VMX_EPT_ACCESS_BIT : 0ull,</div><div class='add'>+		enable_ept_ad_bits ? VMX_EPT_DIRTY_BIT : 0ull,</div><div class='add'>+		0ull, VMX_EPT_EXECUTABLE_MASK,</div><div class='add'>+		cpu_has_vmx_ept_execute_only() ? 0ull : VMX_EPT_READABLE_MASK,</div><div class='add'>+		enable_ept_ad_bits ? 0ull : VMX_EPT_RWX_MASK);</div><div class='add'>+</div><div class='add'>+	ept_set_mmio_spte_mask();</div><div class='add'>+	kvm_enable_tdp();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __init int hardware_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int r = -ENOMEM, i, msr;</div><div class='hunk'>@@ -6352,50 +6487,13 @@ static __init int hardware_setup(void)</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(vmx_msr_index); ++i)</div><div class='ctx'> 		kvm_define_shared_msr(i, vmx_msr_index[i]);</div><div class='ctx'> </div><div class='del'>-	vmx_io_bitmap_a = (unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!vmx_io_bitmap_a)</div><div class='del'>-		return r;</div><div class='add'>+	for (i = 0; i &lt; VMX_BITMAP_NR; i++) {</div><div class='add'>+		vmx_bitmap[i] = (unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='add'>+		if (!vmx_bitmap[i])</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	vmx_io_bitmap_b = (unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!vmx_io_bitmap_b)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	vmx_msr_bitmap_legacy = (unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!vmx_msr_bitmap_legacy)</div><div class='del'>-		goto out1;</div><div class='del'>-</div><div class='del'>-	vmx_msr_bitmap_legacy_x2apic =</div><div class='del'>-				(unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!vmx_msr_bitmap_legacy_x2apic)</div><div class='del'>-		goto out2;</div><div class='del'>-</div><div class='del'>-	vmx_msr_bitmap_legacy_x2apic_apicv_inactive =</div><div class='del'>-				(unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!vmx_msr_bitmap_legacy_x2apic_apicv_inactive)</div><div class='del'>-		goto out3;</div><div class='del'>-</div><div class='del'>-	vmx_msr_bitmap_longmode = (unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!vmx_msr_bitmap_longmode)</div><div class='del'>-		goto out4;</div><div class='del'>-</div><div class='del'>-	vmx_msr_bitmap_longmode_x2apic =</div><div class='del'>-				(unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!vmx_msr_bitmap_longmode_x2apic)</div><div class='del'>-		goto out5;</div><div class='del'>-</div><div class='del'>-	vmx_msr_bitmap_longmode_x2apic_apicv_inactive =</div><div class='del'>-				(unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!vmx_msr_bitmap_longmode_x2apic_apicv_inactive)</div><div class='del'>-		goto out6;</div><div class='del'>-</div><div class='del'>-	vmx_vmread_bitmap = (unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!vmx_vmread_bitmap)</div><div class='del'>-		goto out7;</div><div class='del'>-</div><div class='del'>-	vmx_vmwrite_bitmap = (unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!vmx_vmwrite_bitmap)</div><div class='del'>-		goto out8;</div><div class='del'>-</div><div class='ctx'> 	memset(vmx_vmread_bitmap, 0xff, PAGE_SIZE);</div><div class='ctx'> 	memset(vmx_vmwrite_bitmap, 0xff, PAGE_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -6413,7 +6511,7 @@ static __init int hardware_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	if (setup_vmcs_config(&amp;vmcs_config) &lt; 0) {</div><div class='ctx'> 		r = -EIO;</div><div class='del'>-		goto out9;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (boot_cpu_has(X86_FEATURE_NX))</div><div class='hunk'>@@ -6459,8 +6557,10 @@ static __init int hardware_setup(void)</div><div class='ctx'> 	if (!cpu_has_vmx_ple())</div><div class='ctx'> 		ple_gap = 0;</div><div class='ctx'> </div><div class='del'>-	if (!cpu_has_vmx_apicv())</div><div class='add'>+	if (!cpu_has_vmx_apicv()) {</div><div class='ctx'> 		enable_apicv = 0;</div><div class='add'>+		kvm_x86_ops-&gt;sync_pir_to_irr = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_vmx_tsc_scaling()) {</div><div class='ctx'> 		kvm_has_tsc_control = true;</div><div class='hunk'>@@ -6476,50 +6576,38 @@ static __init int hardware_setup(void)</div><div class='ctx'> 	vmx_disable_intercept_for_msr(MSR_IA32_SYSENTER_EIP, false);</div><div class='ctx'> 	vmx_disable_intercept_for_msr(MSR_IA32_BNDCFGS, true);</div><div class='ctx'> </div><div class='del'>-	memcpy(vmx_msr_bitmap_legacy_x2apic,</div><div class='add'>+	memcpy(vmx_msr_bitmap_legacy_x2apic_apicv,</div><div class='ctx'> 			vmx_msr_bitmap_legacy, PAGE_SIZE);</div><div class='del'>-	memcpy(vmx_msr_bitmap_longmode_x2apic,</div><div class='add'>+	memcpy(vmx_msr_bitmap_longmode_x2apic_apicv,</div><div class='ctx'> 			vmx_msr_bitmap_longmode, PAGE_SIZE);</div><div class='del'>-	memcpy(vmx_msr_bitmap_legacy_x2apic_apicv_inactive,</div><div class='add'>+	memcpy(vmx_msr_bitmap_legacy_x2apic,</div><div class='ctx'> 			vmx_msr_bitmap_legacy, PAGE_SIZE);</div><div class='del'>-	memcpy(vmx_msr_bitmap_longmode_x2apic_apicv_inactive,</div><div class='add'>+	memcpy(vmx_msr_bitmap_longmode_x2apic,</div><div class='ctx'> 			vmx_msr_bitmap_longmode, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(0, vmx_vpid_bitmap); /* 0 is reserved for host */</div><div class='ctx'> </div><div class='add'>+	for (msr = 0x800; msr &lt;= 0x8ff; msr++) {</div><div class='add'>+		if (msr == 0x839 /* TMCCT */)</div><div class='add'>+			continue;</div><div class='add'>+		vmx_disable_intercept_msr_x2apic(msr, MSR_TYPE_R, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * enable_apicv &amp;&amp; kvm_vcpu_apicv_active()</div><div class='add'>+	 * TPR reads and writes can be virtualized even if virtual interrupt</div><div class='add'>+	 * delivery is not in use.</div><div class='ctx'> 	 */</div><div class='del'>-	for (msr = 0x800; msr &lt;= 0x8ff; msr++)</div><div class='del'>-		vmx_disable_intercept_msr_read_x2apic(msr, true);</div><div class='add'>+	vmx_disable_intercept_msr_x2apic(0x808, MSR_TYPE_W, true);</div><div class='add'>+	vmx_disable_intercept_msr_x2apic(0x808, MSR_TYPE_R | MSR_TYPE_W, false);</div><div class='ctx'> </div><div class='del'>-	/* TMCCT */</div><div class='del'>-	vmx_enable_intercept_msr_read_x2apic(0x839, true);</div><div class='del'>-	/* TPR */</div><div class='del'>-	vmx_disable_intercept_msr_write_x2apic(0x808, true);</div><div class='ctx'> 	/* EOI */</div><div class='del'>-	vmx_disable_intercept_msr_write_x2apic(0x80b, true);</div><div class='add'>+	vmx_disable_intercept_msr_x2apic(0x80b, MSR_TYPE_W, true);</div><div class='ctx'> 	/* SELF-IPI */</div><div class='del'>-	vmx_disable_intercept_msr_write_x2apic(0x83f, true);</div><div class='add'>+	vmx_disable_intercept_msr_x2apic(0x83f, MSR_TYPE_W, true);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * (enable_apicv &amp;&amp; !kvm_vcpu_apicv_active()) ||</div><div class='del'>-	 * 	!enable_apicv</div><div class='del'>-	 */</div><div class='del'>-	/* TPR */</div><div class='del'>-	vmx_disable_intercept_msr_read_x2apic(0x808, false);</div><div class='del'>-	vmx_disable_intercept_msr_write_x2apic(0x808, false);</div><div class='del'>-</div><div class='del'>-	if (enable_ept) {</div><div class='del'>-		kvm_mmu_set_mask_ptes(VMX_EPT_READABLE_MASK,</div><div class='del'>-			(enable_ept_ad_bits) ? VMX_EPT_ACCESS_BIT : 0ull,</div><div class='del'>-			(enable_ept_ad_bits) ? VMX_EPT_DIRTY_BIT : 0ull,</div><div class='del'>-			0ull, VMX_EPT_EXECUTABLE_MASK,</div><div class='del'>-			cpu_has_vmx_ept_execute_only() ?</div><div class='del'>-				      0ull : VMX_EPT_READABLE_MASK);</div><div class='del'>-		ept_set_mmio_spte_mask();</div><div class='del'>-		kvm_enable_tdp();</div><div class='del'>-	} else</div><div class='add'>+	if (enable_ept)</div><div class='add'>+		vmx_enable_tdp();</div><div class='add'>+	else</div><div class='ctx'> 		kvm_disable_tdp();</div><div class='ctx'> </div><div class='ctx'> 	update_ple_window_actual_max();</div><div class='hunk'>@@ -6555,42 +6643,19 @@ static __init int hardware_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	return alloc_kvm_area();</div><div class='ctx'> </div><div class='del'>-out9:</div><div class='del'>-	free_page((unsigned long)vmx_vmwrite_bitmap);</div><div class='del'>-out8:</div><div class='del'>-	free_page((unsigned long)vmx_vmread_bitmap);</div><div class='del'>-out7:</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_longmode_x2apic_apicv_inactive);</div><div class='del'>-out6:</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_longmode_x2apic);</div><div class='del'>-out5:</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_longmode);</div><div class='del'>-out4:</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_legacy_x2apic_apicv_inactive);</div><div class='del'>-out3:</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_legacy_x2apic);</div><div class='del'>-out2:</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_legacy);</div><div class='del'>-out1:</div><div class='del'>-	free_page((unsigned long)vmx_io_bitmap_b);</div><div class='ctx'> out:</div><div class='del'>-	free_page((unsigned long)vmx_io_bitmap_a);</div><div class='add'>+	for (i = 0; i &lt; VMX_BITMAP_NR; i++)</div><div class='add'>+		free_page((unsigned long)vmx_bitmap[i]);</div><div class='ctx'> </div><div class='ctx'>     return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __exit void hardware_unsetup(void)</div><div class='ctx'> {</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_legacy_x2apic);</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_legacy_x2apic_apicv_inactive);</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_longmode_x2apic);</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_longmode_x2apic_apicv_inactive);</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_legacy);</div><div class='del'>-	free_page((unsigned long)vmx_msr_bitmap_longmode);</div><div class='del'>-	free_page((unsigned long)vmx_io_bitmap_b);</div><div class='del'>-	free_page((unsigned long)vmx_io_bitmap_a);</div><div class='del'>-	free_page((unsigned long)vmx_vmwrite_bitmap);</div><div class='del'>-	free_page((unsigned long)vmx_vmread_bitmap);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VMX_BITMAP_NR; i++)</div><div class='add'>+		free_page((unsigned long)vmx_bitmap[i]);</div><div class='ctx'> </div><div class='ctx'> 	free_kvm_area();</div><div class='ctx'> }</div><div class='hunk'>@@ -6604,16 +6669,13 @@ static int handle_pause(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (ple_gap)</div><div class='ctx'> 		grow_ple_window(vcpu);</div><div class='ctx'> </div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='ctx'> 	kvm_vcpu_on_spin(vcpu);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_nop(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_mwait(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -6920,49 +6982,48 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!PAGE_ALIGNED(vmptr) || (vmptr &gt;&gt; maxphyaddr)) {</div><div class='ctx'> 			nested_vmx_failInvalid(vcpu);</div><div class='del'>-			skip_emulated_instruction(vcpu);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		page = nested_get_page(vcpu, vmptr);</div><div class='del'>-		if (page == NULL ||</div><div class='del'>-		    *(u32 *)kmap(page) != VMCS12_REVISION) {</div><div class='add'>+		if (page == NULL) {</div><div class='ctx'> 			nested_vmx_failInvalid(vcpu);</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='add'>+		}</div><div class='add'>+		if (*(u32 *)kmap(page) != VMCS12_REVISION) {</div><div class='ctx'> 			kunmap(page);</div><div class='del'>-			skip_emulated_instruction(vcpu);</div><div class='del'>-			return 1;</div><div class='add'>+			nested_release_page_clean(page);</div><div class='add'>+			nested_vmx_failInvalid(vcpu);</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> 		kunmap(page);</div><div class='add'>+		nested_release_page_clean(page);</div><div class='ctx'> 		vmx-&gt;nested.vmxon_ptr = vmptr;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case EXIT_REASON_VMCLEAR:</div><div class='ctx'> 		if (!PAGE_ALIGNED(vmptr) || (vmptr &gt;&gt; maxphyaddr)) {</div><div class='ctx'> 			nested_vmx_failValid(vcpu,</div><div class='ctx'> 					     VMXERR_VMCLEAR_INVALID_ADDRESS);</div><div class='del'>-			skip_emulated_instruction(vcpu);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (vmptr == vmx-&gt;nested.vmxon_ptr) {</div><div class='ctx'> 			nested_vmx_failValid(vcpu,</div><div class='ctx'> 					     VMXERR_VMCLEAR_VMXON_POINTER);</div><div class='del'>-			skip_emulated_instruction(vcpu);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case EXIT_REASON_VMPTRLD:</div><div class='ctx'> 		if (!PAGE_ALIGNED(vmptr) || (vmptr &gt;&gt; maxphyaddr)) {</div><div class='ctx'> 			nested_vmx_failValid(vcpu,</div><div class='ctx'> 					     VMXERR_VMPTRLD_INVALID_ADDRESS);</div><div class='del'>-			skip_emulated_instruction(vcpu);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (vmptr == vmx-&gt;nested.vmxon_ptr) {</div><div class='ctx'> 			nested_vmx_failValid(vcpu,</div><div class='del'>-					     VMXERR_VMCLEAR_VMXON_POINTER);</div><div class='del'>-			skip_emulated_instruction(vcpu);</div><div class='del'>-			return 1;</div><div class='add'>+					     VMXERR_VMPTRLD_VMXON_POINTER);</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -6974,6 +7035,53 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int enter_vmx_operation(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='add'>+	struct vmcs *shadow_vmcs;</div><div class='add'>+</div><div class='add'>+	if (cpu_has_vmx_msr_bitmap()) {</div><div class='add'>+		vmx-&gt;nested.msr_bitmap =</div><div class='add'>+				(unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='add'>+		if (!vmx-&gt;nested.msr_bitmap)</div><div class='add'>+			goto out_msr_bitmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vmx-&gt;nested.cached_vmcs12 = kmalloc(VMCS12_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!vmx-&gt;nested.cached_vmcs12)</div><div class='add'>+		goto out_cached_vmcs12;</div><div class='add'>+</div><div class='add'>+	if (enable_shadow_vmcs) {</div><div class='add'>+		shadow_vmcs = alloc_vmcs();</div><div class='add'>+		if (!shadow_vmcs)</div><div class='add'>+			goto out_shadow_vmcs;</div><div class='add'>+		/* mark vmcs as shadow */</div><div class='add'>+		shadow_vmcs-&gt;revision_id |= (1u &lt;&lt; 31);</div><div class='add'>+		/* init shadow vmcs */</div><div class='add'>+		vmcs_clear(shadow_vmcs);</div><div class='add'>+		vmx-&gt;vmcs01.shadow_vmcs = shadow_vmcs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;(vmx-&gt;nested.vmcs02_pool));</div><div class='add'>+	vmx-&gt;nested.vmcs02_num = 0;</div><div class='add'>+</div><div class='add'>+	hrtimer_init(&amp;vmx-&gt;nested.preemption_timer, CLOCK_MONOTONIC,</div><div class='add'>+		     HRTIMER_MODE_REL_PINNED);</div><div class='add'>+	vmx-&gt;nested.preemption_timer.function = vmx_preemption_timer_fn;</div><div class='add'>+</div><div class='add'>+	vmx-&gt;nested.vmxon = true;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_shadow_vmcs:</div><div class='add'>+	kfree(vmx-&gt;nested.cached_vmcs12);</div><div class='add'>+</div><div class='add'>+out_cached_vmcs12:</div><div class='add'>+	free_page((unsigned long)vmx-&gt;nested.msr_bitmap);</div><div class='add'>+</div><div class='add'>+out_msr_bitmap:</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Emulate the VMXON instruction.</div><div class='ctx'>  * Currently, we just remember that VMX is active, and do not save or even</div><div class='hunk'>@@ -6984,9 +7092,9 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason,</div><div class='ctx'>  */</div><div class='ctx'> static int handle_vmon(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct kvm_segment cs;</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='del'>-	struct vmcs *shadow_vmcs;</div><div class='ctx'> 	const u64 VMXON_NEEDED_FEATURES = FEATURE_CONTROL_LOCKED</div><div class='ctx'> 		| FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX;</div><div class='ctx'> </div><div class='hunk'>@@ -7013,13 +7121,9 @@ static int handle_vmon(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nested_vmx_check_vmptr(vcpu, EXIT_REASON_VMON, NULL))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='ctx'> 	if (vmx-&gt;nested.vmxon) {</div><div class='ctx'> 		nested_vmx_failValid(vcpu, VMXERR_VMXON_IN_VMX_ROOT_OPERATION);</div><div class='del'>-		skip_emulated_instruction(vcpu);</div><div class='del'>-		return 1;</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((vmx-&gt;msr_ia32_feature_control &amp; VMXON_NEEDED_FEATURES)</div><div class='hunk'>@@ -7028,49 +7132,15 @@ static int handle_vmon(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cpu_has_vmx_msr_bitmap()) {</div><div class='del'>-		vmx-&gt;nested.msr_bitmap =</div><div class='del'>-				(unsigned long *)__get_free_page(GFP_KERNEL);</div><div class='del'>-		if (!vmx-&gt;nested.msr_bitmap)</div><div class='del'>-			goto out_msr_bitmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vmx-&gt;nested.cached_vmcs12 = kmalloc(VMCS12_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!vmx-&gt;nested.cached_vmcs12)</div><div class='del'>-		goto out_cached_vmcs12;</div><div class='del'>-</div><div class='del'>-	if (enable_shadow_vmcs) {</div><div class='del'>-		shadow_vmcs = alloc_vmcs();</div><div class='del'>-		if (!shadow_vmcs)</div><div class='del'>-			goto out_shadow_vmcs;</div><div class='del'>-		/* mark vmcs as shadow */</div><div class='del'>-		shadow_vmcs-&gt;revision_id |= (1u &lt;&lt; 31);</div><div class='del'>-		/* init shadow vmcs */</div><div class='del'>-		vmcs_clear(shadow_vmcs);</div><div class='del'>-		vmx-&gt;vmcs01.shadow_vmcs = shadow_vmcs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;(vmx-&gt;nested.vmcs02_pool));</div><div class='del'>-	vmx-&gt;nested.vmcs02_num = 0;</div><div class='del'>-</div><div class='del'>-	hrtimer_init(&amp;vmx-&gt;nested.preemption_timer, CLOCK_MONOTONIC,</div><div class='del'>-		     HRTIMER_MODE_REL_PINNED);</div><div class='del'>-	vmx-&gt;nested.preemption_timer.function = vmx_preemption_timer_fn;</div><div class='del'>-</div><div class='del'>-	vmx-&gt;nested.vmxon = true;</div><div class='add'>+	if (nested_vmx_check_vmptr(vcpu, EXIT_REASON_VMON, NULL))</div><div class='add'>+		return 1;</div><div class='add'>+ </div><div class='add'>+	ret = enter_vmx_operation(vcpu);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='ctx'> 	nested_vmx_succeed(vcpu);</div><div class='del'>-	return 1;</div><div class='del'>-</div><div class='del'>-out_shadow_vmcs:</div><div class='del'>-	kfree(vmx-&gt;nested.cached_vmcs12);</div><div class='del'>-</div><div class='del'>-out_cached_vmcs12:</div><div class='del'>-	free_page((unsigned long)vmx-&gt;nested.msr_bitmap);</div><div class='del'>-</div><div class='del'>-out_msr_bitmap:</div><div class='del'>-	return -ENOMEM;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -7180,9 +7250,8 @@ static int handle_vmoff(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (!nested_vmx_check_permission(vcpu))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	free_nested(to_vmx(vcpu));</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='ctx'> 	nested_vmx_succeed(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Emulate the VMCLEAR instruction */</div><div class='hunk'>@@ -7221,9 +7290,8 @@ static int handle_vmclear(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	nested_free_vmcs02(vmx, vmptr);</div><div class='ctx'> </div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='ctx'> 	nested_vmx_succeed(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch);</div><div class='hunk'>@@ -7421,7 +7489,6 @@ static int nested_vmx_check_vmcs12(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> 	if (vmx-&gt;nested.current_vmptr == -1ull) {</div><div class='ctx'> 		nested_vmx_failInvalid(vcpu);</div><div class='del'>-		skip_emulated_instruction(vcpu);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -7435,17 +7502,18 @@ static int handle_vmread(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u32 vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO);</div><div class='ctx'> 	gva_t gva = 0;</div><div class='ctx'> </div><div class='del'>-	if (!nested_vmx_check_permission(vcpu) ||</div><div class='del'>-	    !nested_vmx_check_vmcs12(vcpu))</div><div class='add'>+	if (!nested_vmx_check_permission(vcpu))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='add'>+	if (!nested_vmx_check_vmcs12(vcpu))</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='add'>+</div><div class='ctx'> 	/* Decode instruction info and find the field to read */</div><div class='ctx'> 	field = kvm_register_readl(vcpu, (((vmx_instruction_info) &gt;&gt; 28) &amp; 0xf));</div><div class='ctx'> 	/* Read the field, zero-extended to a u64 field_value */</div><div class='ctx'> 	if (vmcs12_read_any(vcpu, field, &amp;field_value) &lt; 0) {</div><div class='ctx'> 		nested_vmx_failValid(vcpu, VMXERR_UNSUPPORTED_VMCS_COMPONENT);</div><div class='del'>-		skip_emulated_instruction(vcpu);</div><div class='del'>-		return 1;</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now copy part of this value to register or memory, as requested.</div><div class='hunk'>@@ -7465,8 +7533,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nested_vmx_succeed(vcpu);</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -7485,10 +7552,12 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u64 field_value = 0;</div><div class='ctx'> 	struct x86_exception e;</div><div class='ctx'> </div><div class='del'>-	if (!nested_vmx_check_permission(vcpu) ||</div><div class='del'>-	    !nested_vmx_check_vmcs12(vcpu))</div><div class='add'>+	if (!nested_vmx_check_permission(vcpu))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='add'>+	if (!nested_vmx_check_vmcs12(vcpu))</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='add'>+</div><div class='ctx'> 	if (vmx_instruction_info &amp; (1u &lt;&lt; 10))</div><div class='ctx'> 		field_value = kvm_register_readl(vcpu,</div><div class='ctx'> 			(((vmx_instruction_info) &gt;&gt; 3) &amp; 0xf));</div><div class='hunk'>@@ -7508,19 +7577,28 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (vmcs_field_readonly(field)) {</div><div class='ctx'> 		nested_vmx_failValid(vcpu,</div><div class='ctx'> 			VMXERR_VMWRITE_READ_ONLY_VMCS_COMPONENT);</div><div class='del'>-		skip_emulated_instruction(vcpu);</div><div class='del'>-		return 1;</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vmcs12_write_any(vcpu, field, field_value) &lt; 0) {</div><div class='ctx'> 		nested_vmx_failValid(vcpu, VMXERR_UNSUPPORTED_VMCS_COMPONENT);</div><div class='del'>-		skip_emulated_instruction(vcpu);</div><div class='del'>-		return 1;</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nested_vmx_succeed(vcpu);</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_current_vmptr(struct vcpu_vmx *vmx, gpa_t vmptr)</div><div class='add'>+{</div><div class='add'>+	vmx-&gt;nested.current_vmptr = vmptr;</div><div class='add'>+	if (enable_shadow_vmcs) {</div><div class='add'>+		vmcs_set_bits(SECONDARY_VM_EXEC_CONTROL,</div><div class='add'>+			      SECONDARY_EXEC_SHADOW_VMCS);</div><div class='add'>+		vmcs_write64(VMCS_LINK_POINTER,</div><div class='add'>+			     __pa(vmx-&gt;vmcs01.shadow_vmcs));</div><div class='add'>+		vmx-&gt;nested.sync_shadow_vmcs = true;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Emulate the VMPTRLD instruction */</div><div class='hunk'>@@ -7541,8 +7619,7 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		page = nested_get_page(vcpu, vmptr);</div><div class='ctx'> 		if (page == NULL) {</div><div class='ctx'> 			nested_vmx_failInvalid(vcpu);</div><div class='del'>-			skip_emulated_instruction(vcpu);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> 		new_vmcs12 = kmap(page);</div><div class='ctx'> 		if (new_vmcs12-&gt;revision_id != VMCS12_REVISION) {</div><div class='hunk'>@@ -7550,12 +7627,10 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)</div><div class='ctx'> 			nested_release_page_clean(page);</div><div class='ctx'> 			nested_vmx_failValid(vcpu,</div><div class='ctx'> 				VMXERR_VMPTRLD_INCORRECT_VMCS_REVISION_ID);</div><div class='del'>-			skip_emulated_instruction(vcpu);</div><div class='del'>-			return 1;</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		nested_release_vmcs12(vmx);</div><div class='del'>-		vmx-&gt;nested.current_vmptr = vmptr;</div><div class='ctx'> 		vmx-&gt;nested.current_vmcs12 = new_vmcs12;</div><div class='ctx'> 		vmx-&gt;nested.current_vmcs12_page = page;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -7564,19 +7639,11 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		 */</div><div class='ctx'> 		memcpy(vmx-&gt;nested.cached_vmcs12,</div><div class='ctx'> 		       vmx-&gt;nested.current_vmcs12, VMCS12_SIZE);</div><div class='del'>-</div><div class='del'>-		if (enable_shadow_vmcs) {</div><div class='del'>-			vmcs_set_bits(SECONDARY_VM_EXEC_CONTROL,</div><div class='del'>-				      SECONDARY_EXEC_SHADOW_VMCS);</div><div class='del'>-			vmcs_write64(VMCS_LINK_POINTER,</div><div class='del'>-				     __pa(vmx-&gt;vmcs01.shadow_vmcs));</div><div class='del'>-			vmx-&gt;nested.sync_shadow_vmcs = true;</div><div class='del'>-		}</div><div class='add'>+		set_current_vmptr(vmx, vmptr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nested_vmx_succeed(vcpu);</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Emulate the VMPTRST instruction */</div><div class='hunk'>@@ -7601,8 +7668,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	nested_vmx_succeed(vcpu);</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Emulate the INVEPT instruction */</div><div class='hunk'>@@ -7640,8 +7706,7 @@ static int handle_invept(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (type &gt;= 32 || !(types &amp; (1 &lt;&lt; type))) {</div><div class='ctx'> 		nested_vmx_failValid(vcpu,</div><div class='ctx'> 				VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID);</div><div class='del'>-		skip_emulated_instruction(vcpu);</div><div class='del'>-		return 1;</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* According to the Intel VMX instruction reference, the memory</div><div class='hunk'>@@ -7672,8 +7737,7 @@ static int handle_invept(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_invvpid(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -7698,13 +7762,13 @@ static int handle_invvpid(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO);</div><div class='ctx'> 	type = kvm_register_readl(vcpu, (vmx_instruction_info &gt;&gt; 28) &amp; 0xf);</div><div class='ctx'> </div><div class='del'>-	types = (vmx-&gt;nested.nested_vmx_vpid_caps &gt;&gt; 8) &amp; 0x7;</div><div class='add'>+	types = (vmx-&gt;nested.nested_vmx_vpid_caps &amp;</div><div class='add'>+			VMX_VPID_EXTENT_SUPPORTED_MASK) &gt;&gt; 8;</div><div class='ctx'> </div><div class='ctx'> 	if (type &gt;= 32 || !(types &amp; (1 &lt;&lt; type))) {</div><div class='ctx'> 		nested_vmx_failValid(vcpu,</div><div class='ctx'> 			VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID);</div><div class='del'>-		skip_emulated_instruction(vcpu);</div><div class='del'>-		return 1;</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* according to the intel vmx instruction reference, the memory</div><div class='hunk'>@@ -7720,23 +7784,26 @@ static int handle_invvpid(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='add'>+	case VMX_VPID_EXTENT_INDIVIDUAL_ADDR:</div><div class='ctx'> 	case VMX_VPID_EXTENT_SINGLE_CONTEXT:</div><div class='del'>-		/*</div><div class='del'>-		 * Old versions of KVM use the single-context version so we</div><div class='del'>-		 * have to support it; just treat it the same as all-context.</div><div class='del'>-		 */</div><div class='add'>+	case VMX_VPID_EXTENT_SINGLE_NON_GLOBAL:</div><div class='add'>+		if (!vpid) {</div><div class='add'>+			nested_vmx_failValid(vcpu,</div><div class='add'>+				VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID);</div><div class='add'>+			return kvm_skip_emulated_instruction(vcpu);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	case VMX_VPID_EXTENT_ALL_CONTEXT:</div><div class='del'>-		__vmx_flush_tlb(vcpu, to_vmx(vcpu)-&gt;nested.vpid02);</div><div class='del'>-		nested_vmx_succeed(vcpu);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		/* Trap individual address invalidation invvpid calls */</div><div class='del'>-		BUG_ON(1);</div><div class='del'>-		break;</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	return 1;</div><div class='add'>+	__vmx_flush_tlb(vcpu, vmx-&gt;nested.vpid02);</div><div class='add'>+	nested_vmx_succeed(vcpu);</div><div class='add'>+</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_pml_full(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -8018,7 +8085,7 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	switch (exit_reason) {</div><div class='ctx'> 	case EXIT_REASON_EXCEPTION_NMI:</div><div class='del'>-		if (!is_exception(intr_info))</div><div class='add'>+		if (is_nmi(intr_info))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		else if (is_page_fault(intr_info))</div><div class='ctx'> 			return enable_ept;</div><div class='hunk'>@@ -8045,8 +8112,6 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	case EXIT_REASON_TASK_SWITCH:</div><div class='ctx'> 		return true;</div><div class='ctx'> 	case EXIT_REASON_CPUID:</div><div class='del'>-		if (kvm_register_read(vcpu, VCPU_REGS_RAX) == 0xa)</div><div class='del'>-			return false;</div><div class='ctx'> 		return true;</div><div class='ctx'> 	case EXIT_REASON_HLT:</div><div class='ctx'> 		return nested_cpu_has(vmcs12, CPU_BASED_HLT_EXITING);</div><div class='hunk'>@@ -8075,6 +8140,8 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		return nested_cpu_has(vmcs12, CPU_BASED_MOV_DR_EXITING);</div><div class='ctx'> 	case EXIT_REASON_IO_INSTRUCTION:</div><div class='ctx'> 		return nested_vmx_exit_handled_io(vcpu, vmcs12);</div><div class='add'>+	case EXIT_REASON_GDTR_IDTR: case EXIT_REASON_LDTR_TR:</div><div class='add'>+		return nested_cpu_has2(vmcs12, SECONDARY_EXEC_DESC);</div><div class='ctx'> 	case EXIT_REASON_MSR_READ:</div><div class='ctx'> 	case EXIT_REASON_MSR_WRITE:</div><div class='ctx'> 		return nested_vmx_exit_handled_msr(vcpu, vmcs12, exit_reason);</div><div class='hunk'>@@ -8202,7 +8269,7 @@ static void kvm_flush_pml_buffers(struct kvm *kvm)</div><div class='ctx'> static void vmx_dump_sel(char *name, uint32_t sel)</div><div class='ctx'> {</div><div class='ctx'> 	pr_err("%s sel=0x%04x, attr=0x%05x, limit=0x%08x, base=0x%016lx\n",</div><div class='del'>-	       name, vmcs_read32(sel),</div><div class='add'>+	       name, vmcs_read16(sel),</div><div class='ctx'> 	       vmcs_read32(sel + GUEST_ES_AR_BYTES - GUEST_ES_SELECTOR),</div><div class='ctx'> 	       vmcs_read32(sel + GUEST_ES_LIMIT - GUEST_ES_SELECTOR),</div><div class='ctx'> 	       vmcs_readl(sel + GUEST_ES_BASE - GUEST_ES_SELECTOR));</div><div class='hunk'>@@ -8366,6 +8433,7 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u32 vectoring_info = vmx-&gt;idt_vectoring_info;</div><div class='ctx'> </div><div class='ctx'> 	trace_kvm_exit(exit_reason, vcpu, KVM_ISA_VMX);</div><div class='add'>+	vcpu-&gt;arch.gpa_available = false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Flush logged GPAs PML buffer, this will make dirty_bitmap more</div><div class='hunk'>@@ -8584,6 +8652,27 @@ static void vmx_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vmx_sync_pir_to_irr(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='add'>+	int max_irr;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!vcpu-&gt;arch.apicv_active);</div><div class='add'>+	if (pi_test_on(&amp;vmx-&gt;pi_desc)) {</div><div class='add'>+		pi_clear_on(&amp;vmx-&gt;pi_desc);</div><div class='add'>+		/*</div><div class='add'>+		 * IOMMU can write to PIR.ON, so the barrier matters even on UP.</div><div class='add'>+		 * But on x86 this is just a compiler barrier anyway.</div><div class='add'>+		 */</div><div class='add'>+		smp_mb__after_atomic();</div><div class='add'>+		max_irr = kvm_apic_update_irr(vcpu, vmx-&gt;pi_desc.pir);</div><div class='add'>+	} else {</div><div class='add'>+		max_irr = kvm_lapic_find_highest_irr(vcpu);</div><div class='add'>+	}</div><div class='add'>+	vmx_hwapic_irr_update(vcpu, max_irr);</div><div class='add'>+	return max_irr;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void vmx_load_eoi_exitmap(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap)</div><div class='ctx'> {</div><div class='ctx'> 	if (!kvm_vcpu_apicv_active(vcpu))</div><div class='hunk'>@@ -8595,6 +8684,14 @@ static void vmx_load_eoi_exitmap(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap)</div><div class='ctx'> 	vmcs_write64(EOI_EXIT_BITMAP3, eoi_exit_bitmap[3]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void vmx_apicv_post_state_restore(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='add'>+</div><div class='add'>+	pi_clear_on(&amp;vmx-&gt;pi_desc);</div><div class='add'>+	memset(vmx-&gt;pi_desc.pir, 0, sizeof(vmx-&gt;pi_desc.pir));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void vmx_complete_atomic_exit(struct vcpu_vmx *vmx)</div><div class='ctx'> {</div><div class='ctx'> 	u32 exit_intr_info;</div><div class='hunk'>@@ -8611,8 +8708,7 @@ static void vmx_complete_atomic_exit(struct vcpu_vmx *vmx)</div><div class='ctx'> 		kvm_machine_check();</div><div class='ctx'> </div><div class='ctx'> 	/* We need to handle NMIs before interrupts are enabled */</div><div class='del'>-	if ((exit_intr_info &amp; INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR &amp;&amp;</div><div class='del'>-	    (exit_intr_info &amp; INTR_INFO_VALID_MASK)) {</div><div class='add'>+	if (is_nmi(exit_intr_info)) {</div><div class='ctx'> 		kvm_before_handle_nmi(&amp;vmx-&gt;vcpu);</div><div class='ctx'> 		asm("int $2");</div><div class='ctx'> 		kvm_after_handle_nmi(&amp;vmx-&gt;vcpu);</div><div class='hunk'>@@ -8624,11 +8720,6 @@ static void vmx_handle_external_intr(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	u32 exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);</div><div class='ctx'> 	register void *__sp asm(_ASM_SP);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If external interrupt exists, IF bit is set in rflags/eflags on the</div><div class='del'>-	 * interrupt stack frame, and interrupt will be enabled on a return</div><div class='del'>-	 * from interrupt handler.</div><div class='del'>-	 */</div><div class='ctx'> 	if ((exit_intr_info &amp; (INTR_INFO_VALID_MASK | INTR_INFO_INTR_TYPE_MASK))</div><div class='ctx'> 			== (INTR_INFO_VALID_MASK | INTR_TYPE_EXT_INTR)) {</div><div class='ctx'> 		unsigned int vector;</div><div class='hunk'>@@ -8813,7 +8904,7 @@ static void atomic_switch_perf_msrs(struct vcpu_vmx *vmx)</div><div class='ctx'> 					msrs[i].host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void vmx_arm_hv_timer(struct kvm_vcpu *vcpu)</div><div class='add'>+static void vmx_arm_hv_timer(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> 	u64 tscl;</div><div class='hunk'>@@ -9283,6 +9374,50 @@ static void vmcs_set_secondary_exec_control(u32 new_ctl)</div><div class='ctx'> 		     (new_ctl &amp; ~mask) | (cur_ctl &amp; mask));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Generate MSR_IA32_VMX_CR{0,4}_FIXED1 according to CPUID. Only set bits</div><div class='add'>+ * (indicating "allowed-1") if they are supported in the guest's CPUID.</div><div class='add'>+ */</div><div class='add'>+static void nested_vmx_cr_fixed1_bits_update(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='add'>+	struct kvm_cpuid_entry2 *entry;</div><div class='add'>+</div><div class='add'>+	vmx-&gt;nested.nested_vmx_cr0_fixed1 = 0xffffffff;</div><div class='add'>+	vmx-&gt;nested.nested_vmx_cr4_fixed1 = X86_CR4_PCE;</div><div class='add'>+</div><div class='add'>+#define cr4_fixed1_update(_cr4_mask, _reg, _cpuid_mask) do {		\</div><div class='add'>+	if (entry &amp;&amp; (entry-&gt;_reg &amp; (_cpuid_mask)))			\</div><div class='add'>+		vmx-&gt;nested.nested_vmx_cr4_fixed1 |= (_cr4_mask);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+	entry = kvm_find_cpuid_entry(vcpu, 0x1, 0);</div><div class='add'>+	cr4_fixed1_update(X86_CR4_VME,        edx, bit(X86_FEATURE_VME));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_PVI,        edx, bit(X86_FEATURE_VME));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_TSD,        edx, bit(X86_FEATURE_TSC));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_DE,         edx, bit(X86_FEATURE_DE));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_PSE,        edx, bit(X86_FEATURE_PSE));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_PAE,        edx, bit(X86_FEATURE_PAE));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_MCE,        edx, bit(X86_FEATURE_MCE));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_PGE,        edx, bit(X86_FEATURE_PGE));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_OSFXSR,     edx, bit(X86_FEATURE_FXSR));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_OSXMMEXCPT, edx, bit(X86_FEATURE_XMM));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_VMXE,       ecx, bit(X86_FEATURE_VMX));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_SMXE,       ecx, bit(X86_FEATURE_SMX));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_PCIDE,      ecx, bit(X86_FEATURE_PCID));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_OSXSAVE,    ecx, bit(X86_FEATURE_XSAVE));</div><div class='add'>+</div><div class='add'>+	entry = kvm_find_cpuid_entry(vcpu, 0x7, 0);</div><div class='add'>+	cr4_fixed1_update(X86_CR4_FSGSBASE,   ebx, bit(X86_FEATURE_FSGSBASE));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_SMEP,       ebx, bit(X86_FEATURE_SMEP));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_SMAP,       ebx, bit(X86_FEATURE_SMAP));</div><div class='add'>+	cr4_fixed1_update(X86_CR4_PKE,        ecx, bit(X86_FEATURE_PKU));</div><div class='add'>+	/* TODO: Use X86_CR4_UMIP and X86_FEATURE_UMIP macros */</div><div class='add'>+	cr4_fixed1_update(bit(11),            ecx, bit(2));</div><div class='add'>+</div><div class='add'>+#undef cr4_fixed1_update</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void vmx_cpuid_update(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_cpuid_entry2 *best;</div><div class='hunk'>@@ -9324,6 +9459,9 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	else</div><div class='ctx'> 		to_vmx(vcpu)-&gt;msr_ia32_feature_control_valid_bits &amp;=</div><div class='ctx'> 			~FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX;</div><div class='add'>+</div><div class='add'>+	if (nested_vmx_allowed(vcpu))</div><div class='add'>+		nested_vmx_cr_fixed1_bits_update(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)</div><div class='hunk'>@@ -9399,17 +9537,16 @@ static void vmx_inject_page_fault_nested(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		kvm_inject_page_fault(vcpu, fault);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool nested_get_vmcs12_pages(struct kvm_vcpu *vcpu,</div><div class='add'>+static inline bool nested_vmx_merge_msr_bitmap(struct kvm_vcpu *vcpu,</div><div class='add'>+					       struct vmcs12 *vmcs12);</div><div class='add'>+</div><div class='add'>+static void nested_get_vmcs12_pages(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					struct vmcs12 *vmcs12)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='del'>-	int maxphyaddr = cpuid_maxphyaddr(vcpu);</div><div class='add'>+	u64 hpa;</div><div class='ctx'> </div><div class='ctx'> 	if (nested_cpu_has2(vmcs12, SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES)) {</div><div class='del'>-		if (!PAGE_ALIGNED(vmcs12-&gt;apic_access_addr) ||</div><div class='del'>-		    vmcs12-&gt;apic_access_addr &gt;&gt; maxphyaddr)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Translate L1 physical address to host physical</div><div class='ctx'> 		 * address for vmcs02. Keep the page pinned, so this</div><div class='hunk'>@@ -9420,59 +9557,80 @@ static bool nested_get_vmcs12_pages(struct kvm_vcpu *vcpu,</div><div class='ctx'> 			nested_release_page(vmx-&gt;nested.apic_access_page);</div><div class='ctx'> 		vmx-&gt;nested.apic_access_page =</div><div class='ctx'> 			nested_get_page(vcpu, vmcs12-&gt;apic_access_addr);</div><div class='add'>+		/*</div><div class='add'>+		 * If translation failed, no matter: This feature asks</div><div class='add'>+		 * to exit when accessing the given address, and if it</div><div class='add'>+		 * can never be accessed, this feature won't do</div><div class='add'>+		 * anything anyway.</div><div class='add'>+		 */</div><div class='add'>+		if (vmx-&gt;nested.apic_access_page) {</div><div class='add'>+			hpa = page_to_phys(vmx-&gt;nested.apic_access_page);</div><div class='add'>+			vmcs_write64(APIC_ACCESS_ADDR, hpa);</div><div class='add'>+		} else {</div><div class='add'>+			vmcs_clear_bits(SECONDARY_VM_EXEC_CONTROL,</div><div class='add'>+					SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES);</div><div class='add'>+		}</div><div class='add'>+	} else if (!(nested_cpu_has_virt_x2apic_mode(vmcs12)) &amp;&amp;</div><div class='add'>+		   cpu_need_virtualize_apic_accesses(&amp;vmx-&gt;vcpu)) {</div><div class='add'>+		vmcs_set_bits(SECONDARY_VM_EXEC_CONTROL,</div><div class='add'>+			      SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES);</div><div class='add'>+		kvm_vcpu_reload_apic_access_page(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (nested_cpu_has(vmcs12, CPU_BASED_TPR_SHADOW)) {</div><div class='del'>-		if (!PAGE_ALIGNED(vmcs12-&gt;virtual_apic_page_addr) ||</div><div class='del'>-		    vmcs12-&gt;virtual_apic_page_addr &gt;&gt; maxphyaddr)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='ctx'> 		if (vmx-&gt;nested.virtual_apic_page) /* shouldn't happen */</div><div class='ctx'> 			nested_release_page(vmx-&gt;nested.virtual_apic_page);</div><div class='ctx'> 		vmx-&gt;nested.virtual_apic_page =</div><div class='ctx'> 			nested_get_page(vcpu, vmcs12-&gt;virtual_apic_page_addr);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Failing the vm entry is _not_ what the processor does</div><div class='del'>-		 * but it's basically the only possibility we have.</div><div class='del'>-		 * We could still enter the guest if CR8 load exits are</div><div class='del'>-		 * enabled, CR8 store exits are enabled, and virtualize APIC</div><div class='del'>-		 * access is disabled; in this case the processor would never</div><div class='del'>-		 * use the TPR shadow and we could simply clear the bit from</div><div class='del'>-		 * the execution control.  But such a configuration is useless,</div><div class='del'>-		 * so let's keep the code simple.</div><div class='add'>+		 * If translation failed, VM entry will fail because</div><div class='add'>+		 * prepare_vmcs02 set VIRTUAL_APIC_PAGE_ADDR to -1ull.</div><div class='add'>+		 * Failing the vm entry is _not_ what the processor</div><div class='add'>+		 * does but it's basically the only possibility we</div><div class='add'>+		 * have.  We could still enter the guest if CR8 load</div><div class='add'>+		 * exits are enabled, CR8 store exits are enabled, and</div><div class='add'>+		 * virtualize APIC access is disabled; in this case</div><div class='add'>+		 * the processor would never use the TPR shadow and we</div><div class='add'>+		 * could simply clear the bit from the execution</div><div class='add'>+		 * control.  But such a configuration is useless, so</div><div class='add'>+		 * let's keep the code simple.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!vmx-&gt;nested.virtual_apic_page)</div><div class='del'>-			return false;</div><div class='add'>+		if (vmx-&gt;nested.virtual_apic_page) {</div><div class='add'>+			hpa = page_to_phys(vmx-&gt;nested.virtual_apic_page);</div><div class='add'>+			vmcs_write64(VIRTUAL_APIC_PAGE_ADDR, hpa);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (nested_cpu_has_posted_intr(vmcs12)) {</div><div class='del'>-		if (!IS_ALIGNED(vmcs12-&gt;posted_intr_desc_addr, 64) ||</div><div class='del'>-		    vmcs12-&gt;posted_intr_desc_addr &gt;&gt; maxphyaddr)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='ctx'> 		if (vmx-&gt;nested.pi_desc_page) { /* shouldn't happen */</div><div class='ctx'> 			kunmap(vmx-&gt;nested.pi_desc_page);</div><div class='ctx'> 			nested_release_page(vmx-&gt;nested.pi_desc_page);</div><div class='ctx'> 		}</div><div class='ctx'> 		vmx-&gt;nested.pi_desc_page =</div><div class='ctx'> 			nested_get_page(vcpu, vmcs12-&gt;posted_intr_desc_addr);</div><div class='del'>-		if (!vmx-&gt;nested.pi_desc_page)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='ctx'> 		vmx-&gt;nested.pi_desc =</div><div class='ctx'> 			(struct pi_desc *)kmap(vmx-&gt;nested.pi_desc_page);</div><div class='ctx'> 		if (!vmx-&gt;nested.pi_desc) {</div><div class='ctx'> 			nested_release_page_clean(vmx-&gt;nested.pi_desc_page);</div><div class='del'>-			return false;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		vmx-&gt;nested.pi_desc =</div><div class='ctx'> 			(struct pi_desc *)((void *)vmx-&gt;nested.pi_desc +</div><div class='ctx'> 			(unsigned long)(vmcs12-&gt;posted_intr_desc_addr &amp;</div><div class='ctx'> 			(PAGE_SIZE - 1)));</div><div class='add'>+		vmcs_write64(POSTED_INTR_DESC_ADDR,</div><div class='add'>+			page_to_phys(vmx-&gt;nested.pi_desc_page) +</div><div class='add'>+			(unsigned long)(vmcs12-&gt;posted_intr_desc_addr &amp;</div><div class='add'>+			(PAGE_SIZE - 1)));</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='add'>+	if (cpu_has_vmx_msr_bitmap() &amp;&amp;</div><div class='add'>+	    nested_cpu_has(vmcs12, CPU_BASED_USE_MSR_BITMAPS) &amp;&amp;</div><div class='add'>+	    nested_vmx_merge_msr_bitmap(vcpu, vmcs12))</div><div class='add'>+		;</div><div class='add'>+	else</div><div class='add'>+		vmcs_clear_bits(CPU_BASED_VM_EXEC_CONTROL,</div><div class='add'>+				CPU_BASED_USE_MSR_BITMAPS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vmx_start_preemption_timer(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -9541,11 +9699,6 @@ static inline bool nested_vmx_merge_msr_bitmap(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	msr_bitmap_l1 = (unsigned long *)kmap(page);</div><div class='del'>-	if (!msr_bitmap_l1) {</div><div class='del'>-		nested_release_page_clean(page);</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	memset(msr_bitmap_l0, 0xff, PAGE_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -9778,6 +9931,49 @@ static int nested_vmx_store_msr(struct kvm_vcpu *vcpu, u64 gpa, u32 count)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool nested_cr3_valid(struct kvm_vcpu *vcpu, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	unsigned long invalid_mask;</div><div class='add'>+</div><div class='add'>+	invalid_mask = (~0ULL) &lt;&lt; cpuid_maxphyaddr(vcpu);</div><div class='add'>+	return (val &amp; invalid_mask) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Load guest's/host's cr3 at nested entry/exit. nested_ept is true if we are</div><div class='add'>+ * emulating VM entry into a guest with EPT enabled.</div><div class='add'>+ * Returns 0 on success, 1 on failure. Invalid state exit qualification code</div><div class='add'>+ * is assigned to entry_failure_code on failure.</div><div class='add'>+ */</div><div class='add'>+static int nested_vmx_load_cr3(struct kvm_vcpu *vcpu, unsigned long cr3, bool nested_ept,</div><div class='add'>+			       u32 *entry_failure_code)</div><div class='add'>+{</div><div class='add'>+	if (cr3 != kvm_read_cr3(vcpu) || (!nested_ept &amp;&amp; pdptrs_changed(vcpu))) {</div><div class='add'>+		if (!nested_cr3_valid(vcpu, cr3)) {</div><div class='add'>+			*entry_failure_code = ENTRY_FAIL_DEFAULT;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If PAE paging and EPT are both on, CR3 is not used by the CPU and</div><div class='add'>+		 * must not be dereferenced.</div><div class='add'>+		 */</div><div class='add'>+		if (!is_long_mode(vcpu) &amp;&amp; is_pae(vcpu) &amp;&amp; is_paging(vcpu) &amp;&amp;</div><div class='add'>+		    !nested_ept) {</div><div class='add'>+			if (!load_pdptrs(vcpu, vcpu-&gt;arch.walk_mmu, cr3)) {</div><div class='add'>+				*entry_failure_code = ENTRY_FAIL_PDPTE;</div><div class='add'>+				return 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		vcpu-&gt;arch.cr3 = cr3;</div><div class='add'>+		__set_bit(VCPU_EXREG_CR3, (ulong *)&amp;vcpu-&gt;arch.regs_avail);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvm_mmu_reset_context(vcpu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * prepare_vmcs02 is called when the L1 guest hypervisor runs its nested</div><div class='ctx'>  * L2 guest. L1 has a vmcs for L2 (vmcs12), and this function "merges" it</div><div class='hunk'>@@ -9786,11 +9982,15 @@ static int nested_vmx_store_msr(struct kvm_vcpu *vcpu, u64 gpa, u32 count)</div><div class='ctx'>  * needs. In addition to modifying the active vmcs (which is vmcs02), this</div><div class='ctx'>  * function also has additional necessary side-effects, like setting various</div><div class='ctx'>  * vcpu-&gt;arch fields.</div><div class='add'>+ * Returns 0 on success, 1 on failure. Invalid state exit qualification code</div><div class='add'>+ * is assigned to entry_failure_code on failure.</div><div class='ctx'>  */</div><div class='del'>-static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='add'>+static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,</div><div class='add'>+			  bool from_vmentry, u32 *entry_failure_code)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> 	u32 exec_control;</div><div class='add'>+	bool nested_ept_enabled = false;</div><div class='ctx'> </div><div class='ctx'> 	vmcs_write16(GUEST_ES_SELECTOR, vmcs12-&gt;guest_es_selector);</div><div class='ctx'> 	vmcs_write16(GUEST_CS_SELECTOR, vmcs12-&gt;guest_cs_selector);</div><div class='hunk'>@@ -9829,21 +10029,26 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> 	vmcs_writel(GUEST_GDTR_BASE, vmcs12-&gt;guest_gdtr_base);</div><div class='ctx'> 	vmcs_writel(GUEST_IDTR_BASE, vmcs12-&gt;guest_idtr_base);</div><div class='ctx'> </div><div class='del'>-	if (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_LOAD_DEBUG_CONTROLS) {</div><div class='add'>+	if (from_vmentry &amp;&amp;</div><div class='add'>+	    (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_LOAD_DEBUG_CONTROLS)) {</div><div class='ctx'> 		kvm_set_dr(vcpu, 7, vmcs12-&gt;guest_dr7);</div><div class='ctx'> 		vmcs_write64(GUEST_IA32_DEBUGCTL, vmcs12-&gt;guest_ia32_debugctl);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kvm_set_dr(vcpu, 7, vcpu-&gt;arch.dr7);</div><div class='ctx'> 		vmcs_write64(GUEST_IA32_DEBUGCTL, vmx-&gt;nested.vmcs01_debugctl);</div><div class='ctx'> 	}</div><div class='del'>-	vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,</div><div class='del'>-		vmcs12-&gt;vm_entry_intr_info_field);</div><div class='del'>-	vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE,</div><div class='del'>-		vmcs12-&gt;vm_entry_exception_error_code);</div><div class='del'>-	vmcs_write32(VM_ENTRY_INSTRUCTION_LEN,</div><div class='del'>-		vmcs12-&gt;vm_entry_instruction_len);</div><div class='del'>-	vmcs_write32(GUEST_INTERRUPTIBILITY_INFO,</div><div class='del'>-		vmcs12-&gt;guest_interruptibility_info);</div><div class='add'>+	if (from_vmentry) {</div><div class='add'>+		vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,</div><div class='add'>+			     vmcs12-&gt;vm_entry_intr_info_field);</div><div class='add'>+		vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE,</div><div class='add'>+			     vmcs12-&gt;vm_entry_exception_error_code);</div><div class='add'>+		vmcs_write32(VM_ENTRY_INSTRUCTION_LEN,</div><div class='add'>+			     vmcs12-&gt;vm_entry_instruction_len);</div><div class='add'>+		vmcs_write32(GUEST_INTERRUPTIBILITY_INFO,</div><div class='add'>+			     vmcs12-&gt;guest_interruptibility_info);</div><div class='add'>+	} else {</div><div class='add'>+		vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, 0);</div><div class='add'>+	}</div><div class='ctx'> 	vmcs_write32(GUEST_SYSENTER_CS, vmcs12-&gt;guest_sysenter_cs);</div><div class='ctx'> 	vmx_set_rflags(vcpu, vmcs12-&gt;guest_rflags);</div><div class='ctx'> 	vmcs_writel(GUEST_PENDING_DBG_EXCEPTIONS,</div><div class='hunk'>@@ -9872,12 +10077,9 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> 		vmx-&gt;nested.posted_intr_nv = vmcs12-&gt;posted_intr_nv;</div><div class='ctx'> 		vmx-&gt;nested.pi_pending = false;</div><div class='ctx'> 		vmcs_write16(POSTED_INTR_NV, POSTED_INTR_VECTOR);</div><div class='del'>-		vmcs_write64(POSTED_INTR_DESC_ADDR,</div><div class='del'>-			page_to_phys(vmx-&gt;nested.pi_desc_page) +</div><div class='del'>-			(unsigned long)(vmcs12-&gt;posted_intr_desc_addr &amp;</div><div class='del'>-			(PAGE_SIZE - 1)));</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		exec_control &amp;= ~PIN_BASED_POSTED_INTR;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	vmcs_write32(PIN_BASED_VM_EXEC_CONTROL, exec_control);</div><div class='ctx'> </div><div class='hunk'>@@ -9922,26 +10124,6 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> 				CPU_BASED_ACTIVATE_SECONDARY_CONTROLS))</div><div class='ctx'> 			exec_control |= vmcs12-&gt;secondary_vm_exec_control;</div><div class='ctx'> </div><div class='del'>-		if (exec_control &amp; SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES) {</div><div class='del'>-			/*</div><div class='del'>-			 * If translation failed, no matter: This feature asks</div><div class='del'>-			 * to exit when accessing the given address, and if it</div><div class='del'>-			 * can never be accessed, this feature won't do</div><div class='del'>-			 * anything anyway.</div><div class='del'>-			 */</div><div class='del'>-			if (!vmx-&gt;nested.apic_access_page)</div><div class='del'>-				exec_control &amp;=</div><div class='del'>-				  ~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES;</div><div class='del'>-			else</div><div class='del'>-				vmcs_write64(APIC_ACCESS_ADDR,</div><div class='del'>-				  page_to_phys(vmx-&gt;nested.apic_access_page));</div><div class='del'>-		} else if (!(nested_cpu_has_virt_x2apic_mode(vmcs12)) &amp;&amp;</div><div class='del'>-			    cpu_need_virtualize_apic_accesses(&amp;vmx-&gt;vcpu)) {</div><div class='del'>-			exec_control |=</div><div class='del'>-				SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES;</div><div class='del'>-			kvm_vcpu_reload_apic_access_page(vcpu);</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (exec_control &amp; SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY) {</div><div class='ctx'> 			vmcs_write64(EOI_EXIT_BITMAP0,</div><div class='ctx'> 				vmcs12-&gt;eoi_exit_bitmap0);</div><div class='hunk'>@@ -9955,6 +10137,16 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> 				vmcs12-&gt;guest_intr_status);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		nested_ept_enabled = (exec_control &amp; SECONDARY_EXEC_ENABLE_EPT) != 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Write an illegal value to APIC_ACCESS_ADDR. Later,</div><div class='add'>+		 * nested_get_vmcs12_pages will either fix it up or</div><div class='add'>+		 * remove the VM execution control.</div><div class='add'>+		 */</div><div class='add'>+		if (exec_control &amp; SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES)</div><div class='add'>+			vmcs_write64(APIC_ACCESS_ADDR, -1ull);</div><div class='add'>+</div><div class='ctx'> 		vmcs_write32(SECONDARY_VM_EXEC_CONTROL, exec_control);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -9968,6 +10160,15 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> 	vmx_set_constant_host_state(vmx);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Set the MSR load/store lists to match L0's settings.</div><div class='add'>+	 */</div><div class='add'>+	vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);</div><div class='add'>+	vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, vmx-&gt;msr_autoload.nr);</div><div class='add'>+	vmcs_write64(VM_EXIT_MSR_LOAD_ADDR, __pa(vmx-&gt;msr_autoload.host));</div><div class='add'>+	vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, vmx-&gt;msr_autoload.nr);</div><div class='add'>+	vmcs_write64(VM_ENTRY_MSR_LOAD_ADDR, __pa(vmx-&gt;msr_autoload.guest));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * HOST_RSP is normally set correctly in vmx_vcpu_run() just before</div><div class='ctx'> 	 * entry, but only if the current (host) sp changed from the value</div><div class='ctx'> 	 * we wrote last (vmx-&gt;host_rsp). This cache is no longer relevant</div><div class='hunk'>@@ -9982,19 +10183,16 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> 	exec_control &amp;= ~CPU_BASED_TPR_SHADOW;</div><div class='ctx'> 	exec_control |= vmcs12-&gt;cpu_based_vm_exec_control;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Write an illegal value to VIRTUAL_APIC_PAGE_ADDR. Later, if</div><div class='add'>+	 * nested_get_vmcs12_pages can't fix it up, the illegal value</div><div class='add'>+	 * will result in a VM entry failure.</div><div class='add'>+	 */</div><div class='ctx'> 	if (exec_control &amp; CPU_BASED_TPR_SHADOW) {</div><div class='del'>-		vmcs_write64(VIRTUAL_APIC_PAGE_ADDR,</div><div class='del'>-				page_to_phys(vmx-&gt;nested.virtual_apic_page));</div><div class='add'>+		vmcs_write64(VIRTUAL_APIC_PAGE_ADDR, -1ull);</div><div class='ctx'> 		vmcs_write32(TPR_THRESHOLD, vmcs12-&gt;tpr_threshold);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cpu_has_vmx_msr_bitmap() &amp;&amp;</div><div class='del'>-	    exec_control &amp; CPU_BASED_USE_MSR_BITMAPS &amp;&amp;</div><div class='del'>-	    nested_vmx_merge_msr_bitmap(vcpu, vmcs12))</div><div class='del'>-		; /* MSR_BITMAP will be set by following vmx_set_efer. */</div><div class='del'>-	else</div><div class='del'>-		exec_control &amp;= ~CPU_BASED_USE_MSR_BITMAPS;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Merging of IO bitmap not currently supported.</div><div class='ctx'> 	 * Rather, exit every time.</div><div class='hunk'>@@ -10026,16 +10224,18 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> 			~VM_ENTRY_IA32E_MODE) |</div><div class='ctx'> 		(vmcs_config.vmentry_ctrl &amp; ~VM_ENTRY_IA32E_MODE));</div><div class='ctx'> </div><div class='del'>-	if (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_LOAD_IA32_PAT) {</div><div class='add'>+	if (from_vmentry &amp;&amp;</div><div class='add'>+	    (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_LOAD_IA32_PAT)) {</div><div class='ctx'> 		vmcs_write64(GUEST_IA32_PAT, vmcs12-&gt;guest_ia32_pat);</div><div class='ctx'> 		vcpu-&gt;arch.pat = vmcs12-&gt;guest_ia32_pat;</div><div class='del'>-	} else if (vmcs_config.vmentry_ctrl &amp; VM_ENTRY_LOAD_IA32_PAT)</div><div class='add'>+	} else if (vmcs_config.vmentry_ctrl &amp; VM_ENTRY_LOAD_IA32_PAT) {</div><div class='ctx'> 		vmcs_write64(GUEST_IA32_PAT, vmx-&gt;vcpu.arch.pat);</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	set_cr4_guest_host_mask(vmx);</div><div class='ctx'> </div><div class='del'>-	if (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_LOAD_BNDCFGS)</div><div class='add'>+	if (from_vmentry &amp;&amp;</div><div class='add'>+	    vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_LOAD_BNDCFGS)</div><div class='ctx'> 		vmcs_write64(GUEST_BNDCFGS, vmcs12-&gt;guest_bndcfgs);</div><div class='ctx'> </div><div class='ctx'> 	if (vmcs12-&gt;cpu_based_vm_exec_control &amp; CPU_BASED_USE_TSC_OFFSETING)</div><div class='hunk'>@@ -10073,18 +10273,9 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> 		nested_ept_init_mmu_context(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_LOAD_IA32_EFER)</div><div class='del'>-		vcpu-&gt;arch.efer = vmcs12-&gt;guest_ia32_efer;</div><div class='del'>-	else if (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_IA32E_MODE)</div><div class='del'>-		vcpu-&gt;arch.efer |= (EFER_LMA | EFER_LME);</div><div class='del'>-	else</div><div class='del'>-		vcpu-&gt;arch.efer &amp;= ~(EFER_LMA | EFER_LME);</div><div class='del'>-	/* Note: modifies VM_ENTRY/EXIT_CONTROLS and GUEST/HOST_IA32_EFER */</div><div class='del'>-	vmx_set_efer(vcpu, vcpu-&gt;arch.efer);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * This sets GUEST_CR0 to vmcs12-&gt;guest_cr0, with possibly a modified</div><div class='del'>-	 * TS bit (for lazy fpu) and bits which we consider mandatory enabled.</div><div class='add'>+	 * This sets GUEST_CR0 to vmcs12-&gt;guest_cr0, possibly modifying those</div><div class='add'>+	 * bits which we consider mandatory enabled.</div><div class='ctx'> 	 * The CR0_READ_SHADOW is what L2 should have expected to read given</div><div class='ctx'> 	 * the specifications by L1; It's not enough to take</div><div class='ctx'> 	 * vmcs12-&gt;cr0_read_shadow because on our cr0_guest_host_mask we we</div><div class='hunk'>@@ -10096,8 +10287,21 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> 	vmx_set_cr4(vcpu, vmcs12-&gt;guest_cr4);</div><div class='ctx'> 	vmcs_writel(CR4_READ_SHADOW, nested_read_cr4(vmcs12));</div><div class='ctx'> </div><div class='del'>-	/* shadow page tables on either EPT or shadow page tables */</div><div class='del'>-	kvm_set_cr3(vcpu, vmcs12-&gt;guest_cr3);</div><div class='add'>+	if (from_vmentry &amp;&amp;</div><div class='add'>+	    (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_LOAD_IA32_EFER))</div><div class='add'>+		vcpu-&gt;arch.efer = vmcs12-&gt;guest_ia32_efer;</div><div class='add'>+	else if (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_IA32E_MODE)</div><div class='add'>+		vcpu-&gt;arch.efer |= (EFER_LMA | EFER_LME);</div><div class='add'>+	else</div><div class='add'>+		vcpu-&gt;arch.efer &amp;= ~(EFER_LMA | EFER_LME);</div><div class='add'>+	/* Note: modifies VM_ENTRY/EXIT_CONTROLS and GUEST/HOST_IA32_EFER */</div><div class='add'>+	vmx_set_efer(vcpu, vcpu-&gt;arch.efer);</div><div class='add'>+</div><div class='add'>+	/* Shadow page tables on either EPT or shadow page tables. */</div><div class='add'>+	if (nested_vmx_load_cr3(vcpu, vmcs12-&gt;guest_cr3, nested_ept_enabled,</div><div class='add'>+				entry_failure_code))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='ctx'> 	kvm_mmu_reset_context(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	if (!enable_ept)</div><div class='hunk'>@@ -10115,76 +10319,28 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> </div><div class='ctx'> 	kvm_register_write(vcpu, VCPU_REGS_RSP, vmcs12-&gt;guest_rsp);</div><div class='ctx'> 	kvm_register_write(vcpu, VCPU_REGS_RIP, vmcs12-&gt;guest_rip);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * nested_vmx_run() handles a nested entry, i.e., a VMLAUNCH or VMRESUME on L1</div><div class='del'>- * for running an L2 nested guest.</div><div class='del'>- */</div><div class='del'>-static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)</div><div class='add'>+static int check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> {</div><div class='del'>-	struct vmcs12 *vmcs12;</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='del'>-	int cpu;</div><div class='del'>-	struct loaded_vmcs *vmcs02;</div><div class='del'>-	bool ia32e;</div><div class='del'>-	u32 msr_entry_idx;</div><div class='del'>-</div><div class='del'>-	if (!nested_vmx_check_permission(vcpu) ||</div><div class='del'>-	    !nested_vmx_check_vmcs12(vcpu))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	skip_emulated_instruction(vcpu);</div><div class='del'>-	vmcs12 = get_vmcs12(vcpu);</div><div class='del'>-</div><div class='del'>-	if (enable_shadow_vmcs)</div><div class='del'>-		copy_shadow_to_vmcs12(vmx);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The nested entry process starts with enforcing various prerequisites</div><div class='del'>-	 * on vmcs12 as required by the Intel SDM, and act appropriately when</div><div class='del'>-	 * they fail: As the SDM explains, some conditions should cause the</div><div class='del'>-	 * instruction to fail, while others will cause the instruction to seem</div><div class='del'>-	 * to succeed, but return an EXIT_REASON_INVALID_STATE.</div><div class='del'>-	 * To speed up the normal (success) code path, we should avoid checking</div><div class='del'>-	 * for misconfigurations which will anyway be caught by the processor</div><div class='del'>-	 * when using the merged vmcs02.</div><div class='del'>-	 */</div><div class='del'>-	if (vmcs12-&gt;launch_state == launch) {</div><div class='del'>-		nested_vmx_failValid(vcpu,</div><div class='del'>-			launch ? VMXERR_VMLAUNCH_NONCLEAR_VMCS</div><div class='del'>-			       : VMXERR_VMRESUME_NONLAUNCHED_VMCS);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (vmcs12-&gt;guest_activity_state != GUEST_ACTIVITY_ACTIVE &amp;&amp;</div><div class='del'>-	    vmcs12-&gt;guest_activity_state != GUEST_ACTIVITY_HLT) {</div><div class='del'>-		nested_vmx_failValid(vcpu, VMXERR_ENTRY_INVALID_CONTROL_FIELD);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='add'>+	    vmcs12-&gt;guest_activity_state != GUEST_ACTIVITY_HLT)</div><div class='add'>+		return VMXERR_ENTRY_INVALID_CONTROL_FIELD;</div><div class='ctx'> </div><div class='del'>-	if (!nested_get_vmcs12_pages(vcpu, vmcs12)) {</div><div class='del'>-		nested_vmx_failValid(vcpu, VMXERR_ENTRY_INVALID_CONTROL_FIELD);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nested_vmx_check_msr_bitmap_controls(vcpu, vmcs12)) {</div><div class='del'>-		nested_vmx_failValid(vcpu, VMXERR_ENTRY_INVALID_CONTROL_FIELD);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='add'>+	if (nested_vmx_check_msr_bitmap_controls(vcpu, vmcs12))</div><div class='add'>+		return VMXERR_ENTRY_INVALID_CONTROL_FIELD;</div><div class='ctx'> </div><div class='del'>-	if (nested_vmx_check_apicv_controls(vcpu, vmcs12)) {</div><div class='del'>-		nested_vmx_failValid(vcpu, VMXERR_ENTRY_INVALID_CONTROL_FIELD);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='add'>+	if (nested_vmx_check_apicv_controls(vcpu, vmcs12))</div><div class='add'>+		return VMXERR_ENTRY_INVALID_CONTROL_FIELD;</div><div class='ctx'> </div><div class='del'>-	if (nested_vmx_check_msr_switch_controls(vcpu, vmcs12)) {</div><div class='del'>-		nested_vmx_failValid(vcpu, VMXERR_ENTRY_INVALID_CONTROL_FIELD);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='add'>+	if (nested_vmx_check_msr_switch_controls(vcpu, vmcs12))</div><div class='add'>+		return VMXERR_ENTRY_INVALID_CONTROL_FIELD;</div><div class='ctx'> </div><div class='ctx'> 	if (!vmx_control_verify(vmcs12-&gt;cpu_based_vm_exec_control,</div><div class='del'>-				vmx-&gt;nested.nested_vmx_true_procbased_ctls_low,</div><div class='add'>+				vmx-&gt;nested.nested_vmx_procbased_ctls_low,</div><div class='ctx'> 				vmx-&gt;nested.nested_vmx_procbased_ctls_high) ||</div><div class='ctx'> 	    !vmx_control_verify(vmcs12-&gt;secondary_vm_exec_control,</div><div class='ctx'> 				vmx-&gt;nested.nested_vmx_secondary_ctls_low,</div><div class='hunk'>@@ -10193,32 +10349,35 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)</div><div class='ctx'> 				vmx-&gt;nested.nested_vmx_pinbased_ctls_low,</div><div class='ctx'> 				vmx-&gt;nested.nested_vmx_pinbased_ctls_high) ||</div><div class='ctx'> 	    !vmx_control_verify(vmcs12-&gt;vm_exit_controls,</div><div class='del'>-				vmx-&gt;nested.nested_vmx_true_exit_ctls_low,</div><div class='add'>+				vmx-&gt;nested.nested_vmx_exit_ctls_low,</div><div class='ctx'> 				vmx-&gt;nested.nested_vmx_exit_ctls_high) ||</div><div class='ctx'> 	    !vmx_control_verify(vmcs12-&gt;vm_entry_controls,</div><div class='del'>-				vmx-&gt;nested.nested_vmx_true_entry_ctls_low,</div><div class='add'>+				vmx-&gt;nested.nested_vmx_entry_ctls_low,</div><div class='ctx'> 				vmx-&gt;nested.nested_vmx_entry_ctls_high))</div><div class='del'>-	{</div><div class='del'>-		nested_vmx_failValid(vcpu, VMXERR_ENTRY_INVALID_CONTROL_FIELD);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='add'>+		return VMXERR_ENTRY_INVALID_CONTROL_FIELD;</div><div class='ctx'> </div><div class='del'>-	if (((vmcs12-&gt;host_cr0 &amp; VMXON_CR0_ALWAYSON) != VMXON_CR0_ALWAYSON) ||</div><div class='del'>-	    ((vmcs12-&gt;host_cr4 &amp; VMXON_CR4_ALWAYSON) != VMXON_CR4_ALWAYSON)) {</div><div class='del'>-		nested_vmx_failValid(vcpu,</div><div class='del'>-			VMXERR_ENTRY_INVALID_HOST_STATE_FIELD);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='add'>+	if (!nested_host_cr0_valid(vcpu, vmcs12-&gt;host_cr0) ||</div><div class='add'>+	    !nested_host_cr4_valid(vcpu, vmcs12-&gt;host_cr4) ||</div><div class='add'>+	    !nested_cr3_valid(vcpu, vmcs12-&gt;host_cr3))</div><div class='add'>+		return VMXERR_ENTRY_INVALID_HOST_STATE_FIELD;</div><div class='ctx'> </div><div class='del'>-	if (!nested_cr0_valid(vcpu, vmcs12-&gt;guest_cr0) ||</div><div class='del'>-	    ((vmcs12-&gt;guest_cr4 &amp; VMXON_CR4_ALWAYSON) != VMXON_CR4_ALWAYSON)) {</div><div class='del'>-		nested_vmx_entry_failure(vcpu, vmcs12,</div><div class='del'>-			EXIT_REASON_INVALID_STATE, ENTRY_FAIL_DEFAULT);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,</div><div class='add'>+				  u32 *exit_qual)</div><div class='add'>+{</div><div class='add'>+	bool ia32e;</div><div class='add'>+</div><div class='add'>+	*exit_qual = ENTRY_FAIL_DEFAULT;</div><div class='add'>+</div><div class='add'>+	if (!nested_guest_cr0_valid(vcpu, vmcs12-&gt;guest_cr0) ||</div><div class='add'>+	    !nested_guest_cr4_valid(vcpu, vmcs12-&gt;guest_cr4))</div><div class='ctx'> 		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (vmcs12-&gt;vmcs_link_pointer != -1ull) {</div><div class='del'>-		nested_vmx_entry_failure(vcpu, vmcs12,</div><div class='del'>-			EXIT_REASON_INVALID_STATE, ENTRY_FAIL_VMCS_LINK_PTR);</div><div class='add'>+</div><div class='add'>+	if (!nested_cpu_has2(vmcs12, SECONDARY_EXEC_SHADOW_VMCS) &amp;&amp;</div><div class='add'>+	    vmcs12-&gt;vmcs_link_pointer != -1ull) {</div><div class='add'>+		*exit_qual = ENTRY_FAIL_VMCS_LINK_PTR;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -10231,16 +10390,14 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)</div><div class='ctx'> 	 *   to bit 8 (LME) if bit 31 in the CR0 field (corresponding to</div><div class='ctx'> 	 *   CR0.PG) is 1.</div><div class='ctx'> 	 */</div><div class='del'>-	if (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_LOAD_IA32_EFER) {</div><div class='add'>+	if (to_vmx(vcpu)-&gt;nested.nested_run_pending &amp;&amp;</div><div class='add'>+	    (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_LOAD_IA32_EFER)) {</div><div class='ctx'> 		ia32e = (vmcs12-&gt;vm_entry_controls &amp; VM_ENTRY_IA32E_MODE) != 0;</div><div class='ctx'> 		if (!kvm_valid_efer(vcpu, vmcs12-&gt;guest_ia32_efer) ||</div><div class='ctx'> 		    ia32e != !!(vmcs12-&gt;guest_ia32_efer &amp; EFER_LMA) ||</div><div class='ctx'> 		    ((vmcs12-&gt;guest_cr0 &amp; X86_CR0_PG) &amp;&amp;</div><div class='del'>-		     ia32e != !!(vmcs12-&gt;guest_ia32_efer &amp; EFER_LME))) {</div><div class='del'>-			nested_vmx_entry_failure(vcpu, vmcs12,</div><div class='del'>-				EXIT_REASON_INVALID_STATE, ENTRY_FAIL_DEFAULT);</div><div class='add'>+		     ia32e != !!(vmcs12-&gt;guest_ia32_efer &amp; EFER_LME)))</div><div class='ctx'> 			return 1;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -10254,17 +10411,21 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)</div><div class='ctx'> 			 VM_EXIT_HOST_ADDR_SPACE_SIZE) != 0;</div><div class='ctx'> 		if (!kvm_valid_efer(vcpu, vmcs12-&gt;host_ia32_efer) ||</div><div class='ctx'> 		    ia32e != !!(vmcs12-&gt;host_ia32_efer &amp; EFER_LMA) ||</div><div class='del'>-		    ia32e != !!(vmcs12-&gt;host_ia32_efer &amp; EFER_LME)) {</div><div class='del'>-			nested_vmx_entry_failure(vcpu, vmcs12,</div><div class='del'>-				EXIT_REASON_INVALID_STATE, ENTRY_FAIL_DEFAULT);</div><div class='add'>+		    ia32e != !!(vmcs12-&gt;host_ia32_efer &amp; EFER_LME))</div><div class='ctx'> 			return 1;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We're finally done with prerequisite checking, and can start with</div><div class='del'>-	 * the nested entry.</div><div class='del'>-	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu, bool from_vmentry)</div><div class='add'>+{</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='add'>+	struct vmcs12 *vmcs12 = get_vmcs12(vcpu);</div><div class='add'>+	struct loaded_vmcs *vmcs02;</div><div class='add'>+	int cpu;</div><div class='add'>+	u32 msr_entry_idx;</div><div class='add'>+	u32 exit_qual;</div><div class='ctx'> </div><div class='ctx'> 	vmcs02 = nested_get_current_vmcs02(vmx);</div><div class='ctx'> 	if (!vmcs02)</div><div class='hunk'>@@ -10284,7 +10445,15 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)</div><div class='ctx'> </div><div class='ctx'> 	vmx_segment_cache_clear(vmx);</div><div class='ctx'> </div><div class='del'>-	prepare_vmcs02(vcpu, vmcs12);</div><div class='add'>+	if (prepare_vmcs02(vcpu, vmcs12, from_vmentry, &amp;exit_qual)) {</div><div class='add'>+		leave_guest_mode(vcpu);</div><div class='add'>+		vmx_load_vmcs01(vcpu);</div><div class='add'>+		nested_vmx_entry_failure(vcpu, vmcs12,</div><div class='add'>+					 EXIT_REASON_INVALID_STATE, exit_qual);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nested_get_vmcs12_pages(vcpu, vmcs12);</div><div class='ctx'> </div><div class='ctx'> 	msr_entry_idx = nested_vmx_load_msr(vcpu,</div><div class='ctx'> 					    vmcs12-&gt;vm_entry_msr_load_addr,</div><div class='hunk'>@@ -10299,18 +10468,94 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)</div><div class='ctx'> </div><div class='ctx'> 	vmcs12-&gt;launch_state = 1;</div><div class='ctx'> </div><div class='del'>-	if (vmcs12-&gt;guest_activity_state == GUEST_ACTIVITY_HLT)</div><div class='del'>-		return kvm_vcpu_halt(vcpu);</div><div class='del'>-</div><div class='del'>-	vmx-&gt;nested.nested_run_pending = 1;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note no nested_vmx_succeed or nested_vmx_fail here. At this point</div><div class='ctx'> 	 * we are no longer running L1, and VMLAUNCH/VMRESUME has not yet</div><div class='ctx'> 	 * returned as far as L1 is concerned. It will only return (and set</div><div class='ctx'> 	 * the success flag) when L2 exits (see nested_vmx_vmexit()).</div><div class='ctx'> 	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * nested_vmx_run() handles a nested entry, i.e., a VMLAUNCH or VMRESUME on L1</div><div class='add'>+ * for running an L2 nested guest.</div><div class='add'>+ */</div><div class='add'>+static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)</div><div class='add'>+{</div><div class='add'>+	struct vmcs12 *vmcs12;</div><div class='add'>+	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='add'>+	u32 exit_qual;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!nested_vmx_check_permission(vcpu))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (!nested_vmx_check_vmcs12(vcpu))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	vmcs12 = get_vmcs12(vcpu);</div><div class='add'>+</div><div class='add'>+	if (enable_shadow_vmcs)</div><div class='add'>+		copy_shadow_to_vmcs12(vmx);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The nested entry process starts with enforcing various prerequisites</div><div class='add'>+	 * on vmcs12 as required by the Intel SDM, and act appropriately when</div><div class='add'>+	 * they fail: As the SDM explains, some conditions should cause the</div><div class='add'>+	 * instruction to fail, while others will cause the instruction to seem</div><div class='add'>+	 * to succeed, but return an EXIT_REASON_INVALID_STATE.</div><div class='add'>+	 * To speed up the normal (success) code path, we should avoid checking</div><div class='add'>+	 * for misconfigurations which will anyway be caught by the processor</div><div class='add'>+	 * when using the merged vmcs02.</div><div class='add'>+	 */</div><div class='add'>+	if (vmcs12-&gt;launch_state == launch) {</div><div class='add'>+		nested_vmx_failValid(vcpu,</div><div class='add'>+			launch ? VMXERR_VMLAUNCH_NONCLEAR_VMCS</div><div class='add'>+			       : VMXERR_VMRESUME_NONLAUNCHED_VMCS);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = check_vmentry_prereqs(vcpu, vmcs12);</div><div class='add'>+	if (ret) {</div><div class='add'>+		nested_vmx_failValid(vcpu, ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * After this point, the trap flag no longer triggers a singlestep trap</div><div class='add'>+	 * on the vm entry instructions; don't call kvm_skip_emulated_instruction.</div><div class='add'>+	 * This is not 100% correct; for performance reasons, we delegate most</div><div class='add'>+	 * of the checks on host state to the processor.  If those fail,</div><div class='add'>+	 * the singlestep trap is missed.</div><div class='add'>+	 */</div><div class='add'>+	skip_emulated_instruction(vcpu);</div><div class='add'>+</div><div class='add'>+	ret = check_vmentry_postreqs(vcpu, vmcs12, &amp;exit_qual);</div><div class='add'>+	if (ret) {</div><div class='add'>+		nested_vmx_entry_failure(vcpu, vmcs12,</div><div class='add'>+					 EXIT_REASON_INVALID_STATE, exit_qual);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We're finally done with prerequisite checking, and can start with</div><div class='add'>+	 * the nested entry.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ret = enter_vmx_non_root_mode(vcpu, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (vmcs12-&gt;guest_activity_state == GUEST_ACTIVITY_HLT)</div><div class='add'>+		return kvm_vcpu_halt(vcpu);</div><div class='add'>+</div><div class='add'>+	vmx-&gt;nested.nested_run_pending = 1;</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -10396,6 +10641,11 @@ static int vmx_check_nested_events(struct kvm_vcpu *vcpu, bool external_intr)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> </div><div class='add'>+	if (vcpu-&gt;arch.exception.pending ||</div><div class='add'>+		vcpu-&gt;arch.nmi_injected ||</div><div class='add'>+		vcpu-&gt;arch.interrupt.pending)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	if (nested_cpu_has_preemption_timer(get_vmcs12(vcpu)) &amp;&amp;</div><div class='ctx'> 	    vmx-&gt;nested.preemption_timer_expired) {</div><div class='ctx'> 		if (vmx-&gt;nested.nested_run_pending)</div><div class='hunk'>@@ -10405,8 +10655,7 @@ static int vmx_check_nested_events(struct kvm_vcpu *vcpu, bool external_intr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;arch.nmi_pending &amp;&amp; nested_exit_on_nmi(vcpu)) {</div><div class='del'>-		if (vmx-&gt;nested.nested_run_pending ||</div><div class='del'>-		    vcpu-&gt;arch.interrupt.pending)</div><div class='add'>+		if (vmx-&gt;nested.nested_run_pending)</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		nested_vmx_vmexit(vcpu, EXIT_REASON_EXCEPTION_NMI,</div><div class='ctx'> 				  NMI_VECTOR | INTR_TYPE_NMI_INTR |</div><div class='hunk'>@@ -10428,7 +10677,8 @@ static int vmx_check_nested_events(struct kvm_vcpu *vcpu, bool external_intr)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return vmx_complete_nested_posted_interrupt(vcpu);</div><div class='add'>+	vmx_complete_nested_posted_interrupt(vcpu);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 vmx_get_preemption_timer_value(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -10446,21 +10696,13 @@ static u32 vmx_get_preemption_timer_value(struct kvm_vcpu *vcpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * prepare_vmcs12 is part of what we need to do when the nested L2 guest exits</div><div class='del'>- * and we want to prepare to run its L1 parent. L1 keeps a vmcs for L2 (vmcs12),</div><div class='del'>- * and this function updates it to reflect the changes to the guest state while</div><div class='del'>- * L2 was running (and perhaps made some exits which were handled directly by L0</div><div class='del'>- * without going back to L1), and to reflect the exit reason.</div><div class='del'>- * Note that we do not have to copy here all VMCS fields, just those that</div><div class='del'>- * could have changed by the L2 guest or the exit - i.e., the guest-state and</div><div class='del'>- * exit-information fields only. Other fields are modified by L1 with VMWRITE,</div><div class='del'>- * which already writes to vmcs12 directly.</div><div class='add'>+ * Update the guest state fields of vmcs12 to reflect changes that</div><div class='add'>+ * occurred while L2 was running. (The "IA-32e mode guest" bit of the</div><div class='add'>+ * VM-entry controls is also updated, since this is really a guest</div><div class='add'>+ * state bit.)</div><div class='ctx'>  */</div><div class='del'>-static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,</div><div class='del'>-			   u32 exit_reason, u32 exit_intr_info,</div><div class='del'>-			   unsigned long exit_qualification)</div><div class='add'>+static void sync_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)</div><div class='ctx'> {</div><div class='del'>-	/* update guest state fields: */</div><div class='ctx'> 	vmcs12-&gt;guest_cr0 = vmcs12_guest_cr0(vcpu, vmcs12);</div><div class='ctx'> 	vmcs12-&gt;guest_cr4 = vmcs12_guest_cr4(vcpu, vmcs12);</div><div class='ctx'> </div><div class='hunk'>@@ -10566,6 +10808,25 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,</div><div class='ctx'> 		vmcs12-&gt;guest_bndcfgs = vmcs_read64(GUEST_BNDCFGS);</div><div class='ctx'> 	if (nested_cpu_has_xsaves(vmcs12))</div><div class='ctx'> 		vmcs12-&gt;xss_exit_bitmap = vmcs_read64(XSS_EXIT_BITMAP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * prepare_vmcs12 is part of what we need to do when the nested L2 guest exits</div><div class='add'>+ * and we want to prepare to run its L1 parent. L1 keeps a vmcs for L2 (vmcs12),</div><div class='add'>+ * and this function updates it to reflect the changes to the guest state while</div><div class='add'>+ * L2 was running (and perhaps made some exits which were handled directly by L0</div><div class='add'>+ * without going back to L1), and to reflect the exit reason.</div><div class='add'>+ * Note that we do not have to copy here all VMCS fields, just those that</div><div class='add'>+ * could have changed by the L2 guest or the exit - i.e., the guest-state and</div><div class='add'>+ * exit-information fields only. Other fields are modified by L1 with VMWRITE,</div><div class='add'>+ * which already writes to vmcs12 directly.</div><div class='add'>+ */</div><div class='add'>+static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,</div><div class='add'>+			   u32 exit_reason, u32 exit_intr_info,</div><div class='add'>+			   unsigned long exit_qualification)</div><div class='add'>+{</div><div class='add'>+	/* update guest state fields: */</div><div class='add'>+	sync_vmcs12(vcpu, vmcs12);</div><div class='ctx'> </div><div class='ctx'> 	/* update exit information fields: */</div><div class='ctx'> </div><div class='hunk'>@@ -10616,6 +10877,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				   struct vmcs12 *vmcs12)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_segment seg;</div><div class='add'>+	u32 entry_failure_code;</div><div class='ctx'> </div><div class='ctx'> 	if (vmcs12-&gt;vm_exit_controls &amp; VM_EXIT_LOAD_IA32_EFER)</div><div class='ctx'> 		vcpu-&gt;arch.efer = vmcs12-&gt;host_ia32_efer;</div><div class='hunk'>@@ -10630,31 +10892,26 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	vmx_set_rflags(vcpu, X86_EFLAGS_FIXED);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note that calling vmx_set_cr0 is important, even if cr0 hasn't</div><div class='del'>-	 * actually changed, because it depends on the current state of</div><div class='del'>-	 * fpu_active (which may have changed).</div><div class='del'>-	 * Note that vmx_set_cr0 refers to efer set above.</div><div class='add'>+	 * actually changed, because vmx_set_cr0 refers to efer set above.</div><div class='add'>+	 *</div><div class='add'>+	 * CR0_GUEST_HOST_MASK is already set in the original vmcs01</div><div class='add'>+	 * (KVM doesn't change it);</div><div class='ctx'> 	 */</div><div class='add'>+	vcpu-&gt;arch.cr0_guest_owned_bits = X86_CR0_TS;</div><div class='ctx'> 	vmx_set_cr0(vcpu, vmcs12-&gt;host_cr0);</div><div class='del'>-	/*</div><div class='del'>-	 * If we did fpu_activate()/fpu_deactivate() during L2's run, we need</div><div class='del'>-	 * to apply the same changes to L1's vmcs. We just set cr0 correctly,</div><div class='del'>-	 * but we also need to update cr0_guest_host_mask and exception_bitmap.</div><div class='del'>-	 */</div><div class='del'>-	update_exception_bitmap(vcpu);</div><div class='del'>-	vcpu-&gt;arch.cr0_guest_owned_bits = (vcpu-&gt;fpu_active ? X86_CR0_TS : 0);</div><div class='del'>-	vmcs_writel(CR0_GUEST_HOST_MASK, ~vcpu-&gt;arch.cr0_guest_owned_bits);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Note that CR4_GUEST_HOST_MASK is already set in the original vmcs01</div><div class='del'>-	 * (KVM doesn't change it)- no reason to call set_cr4_guest_host_mask();</div><div class='del'>-	 */</div><div class='add'>+	/* Same as above - no reason to call set_cr4_guest_host_mask().  */</div><div class='ctx'> 	vcpu-&gt;arch.cr4_guest_owned_bits = ~vmcs_readl(CR4_GUEST_HOST_MASK);</div><div class='ctx'> 	kvm_set_cr4(vcpu, vmcs12-&gt;host_cr4);</div><div class='ctx'> </div><div class='ctx'> 	nested_ept_uninit_mmu_context(vcpu);</div><div class='ctx'> </div><div class='del'>-	kvm_set_cr3(vcpu, vmcs12-&gt;host_cr3);</div><div class='del'>-	kvm_mmu_reset_context(vcpu);</div><div class='add'>+	/*</div><div class='add'>+	 * Only PDPTE load can fail as the value of cr3 was checked on entry and</div><div class='add'>+	 * couldn't have changed.</div><div class='add'>+	 */</div><div class='add'>+	if (nested_vmx_load_cr3(vcpu, vmcs12-&gt;host_cr3, false, &amp;entry_failure_code))</div><div class='add'>+		nested_vmx_abort(vcpu, VMX_ABORT_LOAD_HOST_PDPTE_FAIL);</div><div class='ctx'> </div><div class='ctx'> 	if (!enable_ept)</div><div class='ctx'> 		vcpu-&gt;arch.walk_mmu-&gt;inject_page_fault = kvm_inject_page_fault;</div><div class='hunk'>@@ -10755,6 +11012,7 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_vmx *vmx = to_vmx(vcpu);</div><div class='ctx'> 	struct vmcs12 *vmcs12 = get_vmcs12(vcpu);</div><div class='add'>+	u32 vm_inst_error = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* trying to cancel vmlaunch/vmresume is a bug */</div><div class='ctx'> 	WARN_ON_ONCE(vmx-&gt;nested.nested_run_pending);</div><div class='hunk'>@@ -10767,6 +11025,9 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,</div><div class='ctx'> 				 vmcs12-&gt;vm_exit_msr_store_count))</div><div class='ctx'> 		nested_vmx_abort(vcpu, VMX_ABORT_SAVE_GUEST_MSR_FAIL);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(vmx-&gt;fail))</div><div class='add'>+		vm_inst_error = vmcs_read32(VM_INSTRUCTION_ERROR);</div><div class='add'>+</div><div class='ctx'> 	vmx_load_vmcs01(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	if ((exit_reason == EXIT_REASON_EXTERNAL_INTERRUPT)</div><div class='hunk'>@@ -10795,6 +11056,8 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,</div><div class='ctx'> 	load_vmcs12_host_state(vcpu, vmcs12);</div><div class='ctx'> </div><div class='ctx'> 	/* Update any VMCS fields that might have changed while L2 ran */</div><div class='add'>+	vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, vmx-&gt;msr_autoload.nr);</div><div class='add'>+	vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, vmx-&gt;msr_autoload.nr);</div><div class='ctx'> 	vmcs_write64(TSC_OFFSET, vcpu-&gt;arch.tsc_offset);</div><div class='ctx'> 	if (vmx-&gt;hv_deadline_tsc == -1)</div><div class='ctx'> 		vmcs_clear_bits(PIN_BASED_VM_EXEC_CONTROL,</div><div class='hunk'>@@ -10843,7 +11106,7 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(vmx-&gt;fail)) {</div><div class='ctx'> 		vmx-&gt;fail = 0;</div><div class='del'>-		nested_vmx_failValid(vcpu, vmcs_read32(VM_INSTRUCTION_ERROR));</div><div class='add'>+		nested_vmx_failValid(vcpu, vm_inst_error);</div><div class='ctx'> 	} else</div><div class='ctx'> 		nested_vmx_succeed(vcpu);</div><div class='ctx'> 	if (enable_shadow_vmcs)</div><div class='hunk'>@@ -11266,9 +11529,6 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {</div><div class='ctx'> </div><div class='ctx'> 	.get_pkru = vmx_get_pkru,</div><div class='ctx'> </div><div class='del'>-	.fpu_activate = vmx_fpu_activate,</div><div class='del'>-	.fpu_deactivate = vmx_fpu_deactivate,</div><div class='del'>-</div><div class='ctx'> 	.tlb_flush = vmx_flush_tlb,</div><div class='ctx'> </div><div class='ctx'> 	.run = vmx_vcpu_run,</div><div class='hunk'>@@ -11293,6 +11553,7 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {</div><div class='ctx'> 	.get_enable_apicv = vmx_get_enable_apicv,</div><div class='ctx'> 	.refresh_apicv_exec_ctrl = vmx_refresh_apicv_exec_ctrl,</div><div class='ctx'> 	.load_eoi_exitmap = vmx_load_eoi_exitmap,</div><div class='add'>+	.apicv_post_state_restore = vmx_apicv_post_state_restore,</div><div class='ctx'> 	.hwapic_irr_update = vmx_hwapic_irr_update,</div><div class='ctx'> 	.hwapic_isr_update = vmx_hwapic_isr_update,</div><div class='ctx'> 	.sync_pir_to_irr = vmx_sync_pir_to_irr,</div><div class='head'>diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c<br/>index 04c5d96b1d67..1faf620a6fdc 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/kvm/x86.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/kvm/x86.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/kvm/x86.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/kvm/x86.c</a></div><div class='hunk'>@@ -54,6 +54,8 @@</div><div class='ctx'> #include &lt;linux/pvclock_gtod.h&gt;</div><div class='ctx'> #include &lt;linux/kvm_irqfd.h&gt;</div><div class='ctx'> #include &lt;linux/irqbypass.h&gt;</div><div class='add'>+#include &lt;linux/sched/stat.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;trace/events/kvm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/debugreg.h&gt;</div><div class='hunk'>@@ -180,6 +182,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {</div><div class='ctx'> 	{ "insn_emulation_fail", VCPU_STAT(insn_emulation_fail) },</div><div class='ctx'> 	{ "irq_injections", VCPU_STAT(irq_injections) },</div><div class='ctx'> 	{ "nmi_injections", VCPU_STAT(nmi_injections) },</div><div class='add'>+	{ "req_event", VCPU_STAT(req_event) },</div><div class='ctx'> 	{ "mmu_shadow_zapped", VM_STAT(mmu_shadow_zapped) },</div><div class='ctx'> 	{ "mmu_pte_write", VM_STAT(mmu_pte_write) },</div><div class='ctx'> 	{ "mmu_pte_updated", VM_STAT(mmu_pte_updated) },</div><div class='hunk'>@@ -190,6 +193,8 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {</div><div class='ctx'> 	{ "mmu_unsync", VM_STAT(mmu_unsync) },</div><div class='ctx'> 	{ "remote_tlb_flush", VM_STAT(remote_tlb_flush) },</div><div class='ctx'> 	{ "largepages", VM_STAT(lpages) },</div><div class='add'>+	{ "max_mmu_page_hash_collisions",</div><div class='add'>+		VM_STAT(max_mmu_page_hash_collisions) },</div><div class='ctx'> 	{ NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -434,12 +439,14 @@ void kvm_requeue_exception(struct kvm_vcpu *vcpu, unsigned nr)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_requeue_exception);</div><div class='ctx'> </div><div class='del'>-void kvm_complete_insn_gp(struct kvm_vcpu *vcpu, int err)</div><div class='add'>+int kvm_complete_insn_gp(struct kvm_vcpu *vcpu, int err)</div><div class='ctx'> {</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		kvm_inject_gp(vcpu, 0);</div><div class='ctx'> 	else</div><div class='del'>-		kvm_x86_ops-&gt;skip_emulated_instruction(vcpu);</div><div class='add'>+		return kvm_skip_emulated_instruction(vcpu);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_complete_insn_gp);</div><div class='ctx'> </div><div class='hunk'>@@ -573,7 +580,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(load_pdptrs);</div><div class='ctx'> </div><div class='del'>-static bool pdptrs_changed(struct kvm_vcpu *vcpu)</div><div class='add'>+bool pdptrs_changed(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	u64 pdpte[ARRAY_SIZE(vcpu-&gt;arch.walk_mmu-&gt;pdptrs)];</div><div class='ctx'> 	bool changed = true;</div><div class='hunk'>@@ -599,6 +606,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(pdptrs_changed);</div><div class='ctx'> </div><div class='ctx'> int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)</div><div class='ctx'> {</div><div class='hunk'>@@ -1128,14 +1136,15 @@ struct pvclock_gtod_data {</div><div class='ctx'> </div><div class='ctx'> 	struct { /* extract of a clocksource struct */</div><div class='ctx'> 		int vclock_mode;</div><div class='del'>-		cycle_t	cycle_last;</div><div class='del'>-		cycle_t	mask;</div><div class='add'>+		u64	cycle_last;</div><div class='add'>+		u64	mask;</div><div class='ctx'> 		u32	mult;</div><div class='ctx'> 		u32	shift;</div><div class='ctx'> 	} clock;</div><div class='ctx'> </div><div class='ctx'> 	u64		boot_ns;</div><div class='ctx'> 	u64		nsec_base;</div><div class='add'>+	u64		wall_time_sec;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pvclock_gtod_data pvclock_gtod_data;</div><div class='hunk'>@@ -1159,6 +1168,8 @@ static void update_pvclock_gtod(struct timekeeper *tk)</div><div class='ctx'> 	vdata-&gt;boot_ns			= boot_ns;</div><div class='ctx'> 	vdata-&gt;nsec_base		= tk-&gt;tkr_mono.xtime_nsec;</div><div class='ctx'> </div><div class='add'>+	vdata-&gt;wall_time_sec            = tk-&gt;xtime_sec;</div><div class='add'>+</div><div class='ctx'> 	write_seqcount_end(&amp;vdata-&gt;seq);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1569,9 +1580,9 @@ static inline void adjust_tsc_offset_host(struct kvm_vcpu *vcpu, s64 adjustment)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> </div><div class='del'>-static cycle_t read_tsc(void)</div><div class='add'>+static u64 read_tsc(void)</div><div class='ctx'> {</div><div class='del'>-	cycle_t ret = (cycle_t)rdtsc_ordered();</div><div class='add'>+	u64 ret = (u64)rdtsc_ordered();</div><div class='ctx'> 	u64 last = pvclock_gtod_data.clock.cycle_last;</div><div class='ctx'> </div><div class='ctx'> 	if (likely(ret &gt;= last))</div><div class='hunk'>@@ -1589,7 +1600,7 @@ static cycle_t read_tsc(void)</div><div class='ctx'> 	return last;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 vgettsc(cycle_t *cycle_now)</div><div class='add'>+static inline u64 vgettsc(u64 *cycle_now)</div><div class='ctx'> {</div><div class='ctx'> 	long v;</div><div class='ctx'> 	struct pvclock_gtod_data *gtod = &amp;pvclock_gtod_data;</div><div class='hunk'>@@ -1600,7 +1611,7 @@ static inline u64 vgettsc(cycle_t *cycle_now)</div><div class='ctx'> 	return v * gtod-&gt;clock.mult;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_monotonic_boot(s64 *t, cycle_t *cycle_now)</div><div class='add'>+static int do_monotonic_boot(s64 *t, u64 *cycle_now)</div><div class='ctx'> {</div><div class='ctx'> 	struct pvclock_gtod_data *gtod = &amp;pvclock_gtod_data;</div><div class='ctx'> 	unsigned long seq;</div><div class='hunk'>@@ -1620,8 +1631,30 @@ static int do_monotonic_boot(s64 *t, cycle_t *cycle_now)</div><div class='ctx'> 	return mode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int do_realtime(struct timespec *ts, u64 *cycle_now)</div><div class='add'>+{</div><div class='add'>+	struct pvclock_gtod_data *gtod = &amp;pvclock_gtod_data;</div><div class='add'>+	unsigned long seq;</div><div class='add'>+	int mode;</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		seq = read_seqcount_begin(&amp;gtod-&gt;seq);</div><div class='add'>+		mode = gtod-&gt;clock.vclock_mode;</div><div class='add'>+		ts-&gt;tv_sec = gtod-&gt;wall_time_sec;</div><div class='add'>+		ns = gtod-&gt;nsec_base;</div><div class='add'>+		ns += vgettsc(cycle_now);</div><div class='add'>+		ns &gt;&gt;= gtod-&gt;clock.shift;</div><div class='add'>+	} while (unlikely(read_seqcount_retry(&amp;gtod-&gt;seq, seq)));</div><div class='add'>+</div><div class='add'>+	ts-&gt;tv_sec += __iter_div_u64_rem(ns, NSEC_PER_SEC, &amp;ns);</div><div class='add'>+	ts-&gt;tv_nsec = ns;</div><div class='add'>+</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* returns true if host is using tsc clocksource */</div><div class='del'>-static bool kvm_get_time_and_clockread(s64 *kernel_ns, cycle_t *cycle_now)</div><div class='add'>+static bool kvm_get_time_and_clockread(s64 *kernel_ns, u64 *cycle_now)</div><div class='ctx'> {</div><div class='ctx'> 	/* checked again under seqlock below */</div><div class='ctx'> 	if (pvclock_gtod_data.clock.vclock_mode != VCLOCK_TSC)</div><div class='hunk'>@@ -1629,6 +1662,17 @@ static bool kvm_get_time_and_clockread(s64 *kernel_ns, cycle_t *cycle_now)</div><div class='ctx'> </div><div class='ctx'> 	return do_monotonic_boot(kernel_ns, cycle_now) == VCLOCK_TSC;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* returns true if host is using tsc clocksource */</div><div class='add'>+static bool kvm_get_walltime_and_clockread(struct timespec *ts,</div><div class='add'>+					   u64 *cycle_now)</div><div class='add'>+{</div><div class='add'>+	/* checked again under seqlock below */</div><div class='add'>+	if (pvclock_gtod_data.clock.vclock_mode != VCLOCK_TSC)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return do_realtime(ts, cycle_now) == VCLOCK_TSC;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1769,7 +1813,7 @@ static void kvm_setup_pvclock_page(struct kvm_vcpu *v)</div><div class='ctx'> 	struct kvm_vcpu_arch *vcpu = &amp;v-&gt;arch;</div><div class='ctx'> 	struct pvclock_vcpu_time_info guest_hv_clock;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(kvm_read_guest_cached(v-&gt;kvm, &amp;vcpu-&gt;pv_time,</div><div class='add'>+	if (unlikely(kvm_vcpu_read_guest_cached(v, &amp;vcpu-&gt;pv_time,</div><div class='ctx'> 		&amp;guest_hv_clock, sizeof(guest_hv_clock))))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -1790,9 +1834,9 @@ static void kvm_setup_pvclock_page(struct kvm_vcpu *v)</div><div class='ctx'> 	BUILD_BUG_ON(offsetof(struct pvclock_vcpu_time_info, version) != 0);</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;hv_clock.version = guest_hv_clock.version + 1;</div><div class='del'>-	kvm_write_guest_cached(v-&gt;kvm, &amp;vcpu-&gt;pv_time,</div><div class='del'>-				&amp;vcpu-&gt;hv_clock,</div><div class='del'>-				sizeof(vcpu-&gt;hv_clock.version));</div><div class='add'>+	kvm_vcpu_write_guest_cached(v, &amp;vcpu-&gt;pv_time,</div><div class='add'>+				    &amp;vcpu-&gt;hv_clock,</div><div class='add'>+				    sizeof(vcpu-&gt;hv_clock.version));</div><div class='ctx'> </div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='hunk'>@@ -1806,16 +1850,16 @@ static void kvm_setup_pvclock_page(struct kvm_vcpu *v)</div><div class='ctx'> </div><div class='ctx'> 	trace_kvm_pvclock_update(v-&gt;vcpu_id, &amp;vcpu-&gt;hv_clock);</div><div class='ctx'> </div><div class='del'>-	kvm_write_guest_cached(v-&gt;kvm, &amp;vcpu-&gt;pv_time,</div><div class='del'>-				&amp;vcpu-&gt;hv_clock,</div><div class='del'>-				sizeof(vcpu-&gt;hv_clock));</div><div class='add'>+	kvm_vcpu_write_guest_cached(v, &amp;vcpu-&gt;pv_time,</div><div class='add'>+				    &amp;vcpu-&gt;hv_clock,</div><div class='add'>+				    sizeof(vcpu-&gt;hv_clock));</div><div class='ctx'> </div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;hv_clock.version++;</div><div class='del'>-	kvm_write_guest_cached(v-&gt;kvm, &amp;vcpu-&gt;pv_time,</div><div class='del'>-				&amp;vcpu-&gt;hv_clock,</div><div class='del'>-				sizeof(vcpu-&gt;hv_clock.version));</div><div class='add'>+	kvm_vcpu_write_guest_cached(v, &amp;vcpu-&gt;pv_time,</div><div class='add'>+				    &amp;vcpu-&gt;hv_clock,</div><div class='add'>+				    sizeof(vcpu-&gt;hv_clock.version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvm_guest_time_update(struct kvm_vcpu *v)</div><div class='hunk'>@@ -2048,7 +2092,7 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (kvm_gfn_to_hva_cache_init(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.apf.data, gpa,</div><div class='add'>+	if (kvm_vcpu_gfn_to_hva_cache_init(vcpu, &amp;vcpu-&gt;arch.apf.data, gpa,</div><div class='ctx'> 					sizeof(u32)))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='hunk'>@@ -2067,16 +2111,18 @@ static void record_steal_time(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (!(vcpu-&gt;arch.st.msr_val &amp; KVM_MSR_ENABLED))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(kvm_read_guest_cached(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.st.stime,</div><div class='add'>+	if (unlikely(kvm_vcpu_read_guest_cached(vcpu, &amp;vcpu-&gt;arch.st.stime,</div><div class='ctx'> 		&amp;vcpu-&gt;arch.st.steal, sizeof(struct kvm_steal_time))))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	vcpu-&gt;arch.st.steal.preempted = 0;</div><div class='add'>+</div><div class='ctx'> 	if (vcpu-&gt;arch.st.steal.version &amp; 1)</div><div class='ctx'> 		vcpu-&gt;arch.st.steal.version += 1;  /* first time write, random junk */</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.st.steal.version += 1;</div><div class='ctx'> </div><div class='del'>-	kvm_write_guest_cached(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.st.stime,</div><div class='add'>+	kvm_vcpu_write_guest_cached(vcpu, &amp;vcpu-&gt;arch.st.stime,</div><div class='ctx'> 		&amp;vcpu-&gt;arch.st.steal, sizeof(struct kvm_steal_time));</div><div class='ctx'> </div><div class='ctx'> 	smp_wmb();</div><div class='hunk'>@@ -2085,14 +2131,14 @@ static void record_steal_time(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		vcpu-&gt;arch.st.last_steal;</div><div class='ctx'> 	vcpu-&gt;arch.st.last_steal = current-&gt;sched_info.run_delay;</div><div class='ctx'> </div><div class='del'>-	kvm_write_guest_cached(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.st.stime,</div><div class='add'>+	kvm_vcpu_write_guest_cached(vcpu, &amp;vcpu-&gt;arch.st.stime,</div><div class='ctx'> 		&amp;vcpu-&gt;arch.st.steal, sizeof(struct kvm_steal_time));</div><div class='ctx'> </div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.st.steal.version += 1;</div><div class='ctx'> </div><div class='del'>-	kvm_write_guest_cached(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.st.stime,</div><div class='add'>+	kvm_vcpu_write_guest_cached(vcpu, &amp;vcpu-&gt;arch.st.stime,</div><div class='ctx'> 		&amp;vcpu-&gt;arch.st.steal, sizeof(struct kvm_steal_time));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2176,7 +2222,6 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MSR_KVM_SYSTEM_TIME_NEW:</div><div class='ctx'> 	case MSR_KVM_SYSTEM_TIME: {</div><div class='del'>-		u64 gpa_offset;</div><div class='ctx'> 		struct kvm_arch *ka = &amp;vcpu-&gt;kvm-&gt;arch;</div><div class='ctx'> </div><div class='ctx'> 		kvmclock_reset(vcpu);</div><div class='hunk'>@@ -2198,9 +2243,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)</div><div class='ctx'> 		if (!(data &amp; 1))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		gpa_offset = data &amp; ~(PAGE_MASK | 1);</div><div class='del'>-</div><div class='del'>-		if (kvm_gfn_to_hva_cache_init(vcpu-&gt;kvm,</div><div class='add'>+		if (kvm_vcpu_gfn_to_hva_cache_init(vcpu,</div><div class='ctx'> 		     &amp;vcpu-&gt;arch.pv_time, data &amp; ~1ULL,</div><div class='ctx'> 		     sizeof(struct pvclock_vcpu_time_info)))</div><div class='ctx'> 			vcpu-&gt;arch.pv_time_enabled = false;</div><div class='hunk'>@@ -2221,7 +2264,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)</div><div class='ctx'> 		if (data &amp; KVM_STEAL_RESERVED_MASK)</div><div class='ctx'> 			return 1;</div><div class='ctx'> </div><div class='del'>-		if (kvm_gfn_to_hva_cache_init(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.st.stime,</div><div class='add'>+		if (kvm_vcpu_gfn_to_hva_cache_init(vcpu, &amp;vcpu-&gt;arch.st.stime,</div><div class='ctx'> 						data &amp; KVM_STEAL_VALID_BITS,</div><div class='ctx'> 						sizeof(struct kvm_steal_time)))</div><div class='ctx'> 			return 1;</div><div class='hunk'>@@ -2294,7 +2337,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)</div><div class='ctx'> 		if (kvm_pmu_is_valid_msr(vcpu, msr))</div><div class='ctx'> 			return kvm_pmu_set_msr(vcpu, msr_info);</div><div class='ctx'> 		if (!ignore_msrs) {</div><div class='del'>-			vcpu_unimpl(vcpu, "unhandled wrmsr: 0x%x data 0x%llx\n",</div><div class='add'>+			vcpu_debug_ratelimited(vcpu, "unhandled wrmsr: 0x%x data 0x%llx\n",</div><div class='ctx'> 				    msr, data);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2506,7 +2549,8 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)</div><div class='ctx'> 		if (kvm_pmu_is_valid_msr(vcpu, msr_info-&gt;index))</div><div class='ctx'> 			return kvm_pmu_get_msr(vcpu, msr_info-&gt;index, &amp;msr_info-&gt;data);</div><div class='ctx'> 		if (!ignore_msrs) {</div><div class='del'>-			vcpu_unimpl(vcpu, "unhandled rdmsr: 0x%x\n", msr_info-&gt;index);</div><div class='add'>+			vcpu_debug_ratelimited(vcpu, "unhandled rdmsr: 0x%x\n",</div><div class='add'>+					       msr_info-&gt;index);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			vcpu_unimpl(vcpu, "ignored rdmsr: 0x%x\n", msr_info-&gt;index);</div><div class='hunk'>@@ -2630,6 +2674,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)</div><div class='ctx'> 	case KVM_CAP_DISABLE_QUIRKS:</div><div class='ctx'> 	case KVM_CAP_SET_BOOT_CPU_ID:</div><div class='ctx'>  	case KVM_CAP_SPLIT_IRQCHIP:</div><div class='add'>+	case KVM_CAP_IMMEDIATE_EXIT:</div><div class='ctx'> #ifdef CONFIG_KVM_DEVICE_ASSIGNMENT</div><div class='ctx'> 	case KVM_CAP_ASSIGN_DEV_IRQ:</div><div class='ctx'> 	case KVM_CAP_PCI_2_3:</div><div class='hunk'>@@ -2810,7 +2855,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (kvm_lapic_hv_timer_in_use(vcpu) &amp;&amp;</div><div class='ctx'> 				kvm_x86_ops-&gt;set_hv_timer(vcpu,</div><div class='del'>-					kvm_get_lapic_tscdeadline_msr(vcpu)))</div><div class='add'>+					kvm_get_lapic_target_expiration_tsc(vcpu)))</div><div class='ctx'> 			kvm_lapic_switch_to_sw_timer(vcpu);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * On a host with synchronized TSC, there is no need to update</div><div class='hunk'>@@ -2826,8 +2871,39 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)</div><div class='ctx'> 	kvm_make_request(KVM_REQ_STEAL_UPDATE, vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	if (!(vcpu-&gt;arch.st.msr_val &amp; KVM_MSR_ENABLED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vcpu-&gt;arch.st.steal.preempted = 1;</div><div class='add'>+</div><div class='add'>+	kvm_vcpu_write_guest_offset_cached(vcpu, &amp;vcpu-&gt;arch.st.stime,</div><div class='add'>+			&amp;vcpu-&gt;arch.st.steal.preempted,</div><div class='add'>+			offsetof(struct kvm_steal_time, preempted),</div><div class='add'>+			sizeof(vcpu-&gt;arch.st.steal.preempted));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='add'>+	int idx;</div><div class='add'>+	/*</div><div class='add'>+	 * Disable page faults because we're in atomic context here.</div><div class='add'>+	 * kvm_write_guest_offset_cached() would call might_fault()</div><div class='add'>+	 * that relies on pagefault_disable() to tell if there's a</div><div class='add'>+	 * bug. NOTE: the write to guest memory may not go through if</div><div class='add'>+	 * during postcopy live migration or if there's heavy guest</div><div class='add'>+	 * paging.</div><div class='add'>+	 */</div><div class='add'>+	pagefault_disable();</div><div class='add'>+	/*</div><div class='add'>+	 * kvm_memslots() will be called by</div><div class='add'>+	 * kvm_write_guest_offset_cached() so take the srcu lock.</div><div class='add'>+	 */</div><div class='add'>+	idx = srcu_read_lock(&amp;vcpu-&gt;kvm-&gt;srcu);</div><div class='add'>+	kvm_steal_time_set_preempted(vcpu);</div><div class='add'>+	srcu_read_unlock(&amp;vcpu-&gt;kvm-&gt;srcu, idx);</div><div class='add'>+	pagefault_enable();</div><div class='ctx'> 	kvm_x86_ops-&gt;vcpu_put(vcpu);</div><div class='ctx'> 	kvm_put_guest_fpu(vcpu);</div><div class='ctx'> 	vcpu-&gt;arch.last_host_tsc = rdtsc();</div><div class='hunk'>@@ -2836,7 +2912,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)</div><div class='ctx'> static int kvm_vcpu_ioctl_get_lapic(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				    struct kvm_lapic_state *s)</div><div class='ctx'> {</div><div class='del'>-	if (vcpu-&gt;arch.apicv_active)</div><div class='add'>+	if (kvm_x86_ops-&gt;sync_pir_to_irr &amp;&amp; vcpu-&gt;arch.apicv_active)</div><div class='ctx'> 		kvm_x86_ops-&gt;sync_pir_to_irr(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	return kvm_apic_get_state(vcpu, s);</div><div class='hunk'>@@ -3036,6 +3112,8 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	memset(&amp;events-&gt;reserved, 0, sizeof(events-&gt;reserved));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvm_set_hflags(struct kvm_vcpu *vcpu, unsigned emul_flags);</div><div class='add'>+</div><div class='ctx'> static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					      struct kvm_vcpu_events *events)</div><div class='ctx'> {</div><div class='hunk'>@@ -3072,10 +3150,13 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		vcpu-&gt;arch.apic-&gt;sipi_vector = events-&gt;sipi_vector;</div><div class='ctx'> </div><div class='ctx'> 	if (events-&gt;flags &amp; KVM_VCPUEVENT_VALID_SMM) {</div><div class='add'>+		u32 hflags = vcpu-&gt;arch.hflags;</div><div class='ctx'> 		if (events-&gt;smi.smm)</div><div class='del'>-			vcpu-&gt;arch.hflags |= HF_SMM_MASK;</div><div class='add'>+			hflags |= HF_SMM_MASK;</div><div class='ctx'> 		else</div><div class='del'>-			vcpu-&gt;arch.hflags &amp;= ~HF_SMM_MASK;</div><div class='add'>+			hflags &amp;= ~HF_SMM_MASK;</div><div class='add'>+		kvm_set_hflags(vcpu, hflags);</div><div class='add'>+</div><div class='ctx'> 		vcpu-&gt;arch.smi_pending = events-&gt;smi.pending;</div><div class='ctx'> 		if (events-&gt;smi.smm_inside_nmi)</div><div class='ctx'> 			vcpu-&gt;arch.hflags |= HF_SMM_INSIDE_NMI_MASK;</div><div class='hunk'>@@ -3143,6 +3224,7 @@ static void fill_xsave(u8 *dest, struct kvm_vcpu *vcpu)</div><div class='ctx'> 	memcpy(dest, xsave, XSAVE_HDR_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	/* Set XSTATE_BV */</div><div class='add'>+	xstate_bv &amp;= vcpu-&gt;arch.guest_supported_xcr0 | XFEATURE_MASK_FPSSE;</div><div class='ctx'> 	*(u64 *)(dest + XSAVE_HDR_OFFSET) = xstate_bv;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3303,6 +3385,8 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,</div><div class='ctx'> </div><div class='ctx'> 	switch (cap-&gt;cap) {</div><div class='ctx'> 	case KVM_CAP_HYPERV_SYNIC:</div><div class='add'>+		if (!irqchip_in_kernel(vcpu-&gt;kvm))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		return kvm_hv_activate_synic(vcpu);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -3855,7 +3939,7 @@ static int kvm_vm_ioctl_enable_cap(struct kvm *kvm,</div><div class='ctx'> 			goto split_irqchip_unlock;</div><div class='ctx'> 		/* Pairs with irqchip_in_kernel. */</div><div class='ctx'> 		smp_wmb();</div><div class='del'>-		kvm-&gt;arch.irqchip_split = true;</div><div class='add'>+		kvm-&gt;arch.irqchip_mode = KVM_IRQCHIP_SPLIT;</div><div class='ctx'> 		kvm-&gt;arch.nr_reserved_ioapic_pins = cap-&gt;args[0];</div><div class='ctx'> 		r = 0;</div><div class='ctx'> split_irqchip_unlock:</div><div class='hunk'>@@ -3918,40 +4002,41 @@ long kvm_arch_vm_ioctl(struct file *filp,</div><div class='ctx'> 		r = kvm_vm_ioctl_get_nr_mmu_pages(kvm);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KVM_CREATE_IRQCHIP: {</div><div class='del'>-		struct kvm_pic *vpic;</div><div class='del'>-</div><div class='ctx'> 		mutex_lock(&amp;kvm-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 		r = -EEXIST;</div><div class='del'>-		if (kvm-&gt;arch.vpic)</div><div class='add'>+		if (irqchip_in_kernel(kvm))</div><div class='ctx'> 			goto create_irqchip_unlock;</div><div class='add'>+</div><div class='ctx'> 		r = -EINVAL;</div><div class='ctx'> 		if (kvm-&gt;created_vcpus)</div><div class='ctx'> 			goto create_irqchip_unlock;</div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		vpic = kvm_create_pic(kvm);</div><div class='del'>-		if (vpic) {</div><div class='del'>-			r = kvm_ioapic_init(kvm);</div><div class='del'>-			if (r) {</div><div class='del'>-				mutex_lock(&amp;kvm-&gt;slots_lock);</div><div class='del'>-				kvm_destroy_pic(vpic);</div><div class='del'>-				mutex_unlock(&amp;kvm-&gt;slots_lock);</div><div class='del'>-				goto create_irqchip_unlock;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='add'>+</div><div class='add'>+		r = kvm_pic_init(kvm);</div><div class='add'>+		if (r)</div><div class='ctx'> 			goto create_irqchip_unlock;</div><div class='add'>+</div><div class='add'>+		r = kvm_ioapic_init(kvm);</div><div class='add'>+		if (r) {</div><div class='add'>+			mutex_lock(&amp;kvm-&gt;slots_lock);</div><div class='add'>+			kvm_pic_destroy(kvm);</div><div class='add'>+			mutex_unlock(&amp;kvm-&gt;slots_lock);</div><div class='add'>+			goto create_irqchip_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		r = kvm_setup_default_irq_routing(kvm);</div><div class='ctx'> 		if (r) {</div><div class='ctx'> 			mutex_lock(&amp;kvm-&gt;slots_lock);</div><div class='ctx'> 			mutex_lock(&amp;kvm-&gt;irq_lock);</div><div class='ctx'> 			kvm_ioapic_destroy(kvm);</div><div class='del'>-			kvm_destroy_pic(vpic);</div><div class='add'>+			kvm_pic_destroy(kvm);</div><div class='ctx'> 			mutex_unlock(&amp;kvm-&gt;irq_lock);</div><div class='ctx'> 			mutex_unlock(&amp;kvm-&gt;slots_lock);</div><div class='ctx'> 			goto create_irqchip_unlock;</div><div class='ctx'> 		}</div><div class='del'>-		/* Write kvm-&gt;irq_routing before kvm-&gt;arch.vpic.  */</div><div class='add'>+		/* Write kvm-&gt;irq_routing before enabling irqchip_in_kernel. */</div><div class='ctx'> 		smp_wmb();</div><div class='del'>-		kvm-&gt;arch.vpic = vpic;</div><div class='add'>+		kvm-&gt;arch.irqchip_mode = KVM_IRQCHIP_KERNEL;</div><div class='ctx'> 	create_irqchip_unlock:</div><div class='ctx'> 		mutex_unlock(&amp;kvm-&gt;lock);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3987,7 +4072,7 @@ long kvm_arch_vm_ioctl(struct file *filp,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		r = -ENXIO;</div><div class='del'>-		if (!irqchip_in_kernel(kvm) || irqchip_split(kvm))</div><div class='add'>+		if (!irqchip_kernel(kvm))</div><div class='ctx'> 			goto get_irqchip_out;</div><div class='ctx'> 		r = kvm_vm_ioctl_get_irqchip(kvm, chip);</div><div class='ctx'> 		if (r)</div><div class='hunk'>@@ -4011,7 +4096,7 @@ long kvm_arch_vm_ioctl(struct file *filp,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		r = -ENXIO;</div><div class='del'>-		if (!irqchip_in_kernel(kvm) || irqchip_split(kvm))</div><div class='add'>+		if (!irqchip_kernel(kvm))</div><div class='ctx'> 			goto set_irqchip_out;</div><div class='ctx'> 		r = kvm_vm_ioctl_set_irqchip(kvm, chip);</div><div class='ctx'> 		if (r)</div><div class='hunk'>@@ -4420,6 +4505,21 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_write_guest_virt_system);</div><div class='ctx'> </div><div class='add'>+static int vcpu_is_mmio_gpa(struct kvm_vcpu *vcpu, unsigned long gva,</div><div class='add'>+			    gpa_t gpa, bool write)</div><div class='add'>+{</div><div class='add'>+	/* For APIC access vmexit */</div><div class='add'>+	if ((gpa &amp; PAGE_MASK) == APIC_DEFAULT_PHYS_BASE)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (vcpu_match_mmio_gpa(vcpu, gpa)) {</div><div class='add'>+		trace_vcpu_match_mmio(gva, gpa, write, true);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vcpu_mmio_gva_to_gpa(struct kvm_vcpu *vcpu, unsigned long gva,</div><div class='ctx'> 				gpa_t *gpa, struct x86_exception *exception,</div><div class='ctx'> 				bool write)</div><div class='hunk'>@@ -4446,16 +4546,7 @@ static int vcpu_mmio_gva_to_gpa(struct kvm_vcpu *vcpu, unsigned long gva,</div><div class='ctx'> 	if (*gpa == UNMAPPED_GVA)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	/* For APIC access vmexit */</div><div class='del'>-	if ((*gpa &amp; PAGE_MASK) == APIC_DEFAULT_PHYS_BASE)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (vcpu_match_mmio_gpa(vcpu, *gpa)) {</div><div class='del'>-		trace_vcpu_match_mmio(gva, *gpa, write, true);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return vcpu_is_mmio_gpa(vcpu, gva, *gpa, write);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='hunk'>@@ -4552,6 +4643,22 @@ static int emulator_read_write_onepage(unsigned long addr, void *val,</div><div class='ctx'> 	int handled, ret;</div><div class='ctx'> 	bool write = ops-&gt;write;</div><div class='ctx'> 	struct kvm_mmio_fragment *frag;</div><div class='add'>+	struct x86_emulate_ctxt *ctxt = &amp;vcpu-&gt;arch.emulate_ctxt;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the exit was due to a NPF we may already have a GPA.</div><div class='add'>+	 * If the GPA is present, use it to avoid the GVA to GPA table walk.</div><div class='add'>+	 * Note, this cannot be used on string operations since string</div><div class='add'>+	 * operation using rep will only have the initial GPA from the NPF</div><div class='add'>+	 * occurred.</div><div class='add'>+	 */</div><div class='add'>+	if (vcpu-&gt;arch.gpa_available &amp;&amp;</div><div class='add'>+	    emulator_can_use_gpa(ctxt) &amp;&amp;</div><div class='add'>+	    vcpu_is_mmio_gpa(vcpu, addr, exception-&gt;address, write) &amp;&amp;</div><div class='add'>+	    (addr &amp; ~PAGE_MASK) == (exception-&gt;address &amp; ~PAGE_MASK)) {</div><div class='add'>+		gpa = exception-&gt;address;</div><div class='add'>+		goto mmio;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = vcpu_mmio_gva_to_gpa(vcpu, addr, &amp;gpa, exception, write);</div><div class='ctx'> </div><div class='hunk'>@@ -4816,7 +4923,7 @@ static void emulator_invlpg(struct x86_emulate_ctxt *ctxt, ulong address)</div><div class='ctx'> 	kvm_mmu_invlpg(emul_to_vcpu(ctxt), address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int kvm_emulate_wbinvd_noskip(struct kvm_vcpu *vcpu)</div><div class='add'>+static int kvm_emulate_wbinvd_noskip(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	if (!need_emulate_wbinvd(vcpu))</div><div class='ctx'> 		return X86EMUL_CONTINUE;</div><div class='hunk'>@@ -4836,8 +4943,8 @@ int kvm_emulate_wbinvd_noskip(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> int kvm_emulate_wbinvd(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	kvm_x86_ops-&gt;skip_emulated_instruction(vcpu);</div><div class='del'>-	return kvm_emulate_wbinvd_noskip(vcpu);</div><div class='add'>+	kvm_emulate_wbinvd_noskip(vcpu);</div><div class='add'>+	return kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_emulate_wbinvd);</div><div class='ctx'> </div><div class='hunk'>@@ -5081,11 +5188,6 @@ static void emulator_get_fpu(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	kvm_load_guest_fpu(emul_to_vcpu(ctxt));</div><div class='del'>-	/*</div><div class='del'>-	 * CR0.TS may reference the host fpu state, not the guest fpu state,</div><div class='del'>-	 * so it may be clear at this point.</div><div class='del'>-	 */</div><div class='del'>-	clts();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void emulator_put_fpu(struct x86_emulate_ctxt *ctxt)</div><div class='hunk'>@@ -5440,7 +5542,6 @@ static void kvm_vcpu_check_singlestep(struct kvm_vcpu *vcpu, unsigned long rflag</div><div class='ctx'> 			kvm_run-&gt;exit_reason = KVM_EXIT_DEBUG;</div><div class='ctx'> 			*r = EMULATE_USER_EXIT;</div><div class='ctx'> 		} else {</div><div class='del'>-			vcpu-&gt;arch.emulate_ctxt.eflags &amp;= ~X86_EFLAGS_TF;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * "Certain debug exceptions may clear bit 0-3.  The</div><div class='ctx'> 			 * remaining contents of the DR6 register are never</div><div class='hunk'>@@ -5453,6 +5554,17 @@ static void kvm_vcpu_check_singlestep(struct kvm_vcpu *vcpu, unsigned long rflag</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int kvm_skip_emulated_instruction(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	unsigned long rflags = kvm_x86_ops-&gt;get_rflags(vcpu);</div><div class='add'>+	int r = EMULATE_DONE;</div><div class='add'>+</div><div class='add'>+	kvm_x86_ops-&gt;skip_emulated_instruction(vcpu);</div><div class='add'>+	kvm_vcpu_check_singlestep(vcpu, rflags, &amp;r);</div><div class='add'>+	return r == EMULATE_DONE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_skip_emulated_instruction);</div><div class='add'>+</div><div class='ctx'> static bool kvm_vcpu_check_breakpoint(struct kvm_vcpu *vcpu, int *r)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(vcpu-&gt;guest_debug &amp; KVM_GUESTDBG_USE_HW_BP) &amp;&amp;</div><div class='hunk'>@@ -5563,6 +5675,9 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> restart:</div><div class='add'>+	/* Save the faulting GPA (cr2) in the address field */</div><div class='add'>+	ctxt-&gt;exception.address = cr2;</div><div class='add'>+</div><div class='ctx'> 	r = x86_emulate_insn(ctxt);</div><div class='ctx'> </div><div class='ctx'> 	if (r == EMULATION_INTERCEPTED)</div><div class='hunk'>@@ -5638,6 +5753,49 @@ int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size, unsigned short port)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_fast_pio_out);</div><div class='ctx'> </div><div class='add'>+static int complete_fast_pio_in(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	/* We should only ever be called with arch.pio.count equal to 1 */</div><div class='add'>+	BUG_ON(vcpu-&gt;arch.pio.count != 1);</div><div class='add'>+</div><div class='add'>+	/* For size less than 4 we merge, else we zero extend */</div><div class='add'>+	val = (vcpu-&gt;arch.pio.size &lt; 4) ? kvm_register_read(vcpu, VCPU_REGS_RAX)</div><div class='add'>+					: 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since vcpu-&gt;arch.pio.count == 1 let emulator_pio_in_emulated perform</div><div class='add'>+	 * the copy and tracing</div><div class='add'>+	 */</div><div class='add'>+	emulator_pio_in_emulated(&amp;vcpu-&gt;arch.emulate_ctxt, vcpu-&gt;arch.pio.size,</div><div class='add'>+				 vcpu-&gt;arch.pio.port, &amp;val, 1);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RAX, val);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_fast_pio_in(struct kvm_vcpu *vcpu, int size, unsigned short port)</div><div class='add'>+{</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* For size less than 4 we merge, else we zero extend */</div><div class='add'>+	val = (size &lt; 4) ? kvm_register_read(vcpu, VCPU_REGS_RAX) : 0;</div><div class='add'>+</div><div class='add'>+	ret = emulator_pio_in_emulated(&amp;vcpu-&gt;arch.emulate_ctxt, size, port,</div><div class='add'>+				       &amp;val, 1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kvm_register_write(vcpu, VCPU_REGS_RAX, val);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vcpu-&gt;arch.complete_userspace_io = complete_fast_pio_in;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_fast_pio_in);</div><div class='add'>+</div><div class='ctx'> static int kvmclock_cpu_down_prep(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	__this_cpu_write(cpu_tsc_khz, 0);</div><div class='hunk'>@@ -5773,7 +5931,7 @@ static void kvm_timer_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	pr_debug("kvm: max_tsc_khz = %ld\n", max_tsc_khz);</div><div class='ctx'> </div><div class='del'>-	cpuhp_setup_state(CPUHP_AP_X86_KVM_CLK_ONLINE, "AP_X86_KVM_CLK_ONLINE",</div><div class='add'>+	cpuhp_setup_state(CPUHP_AP_X86_KVM_CLK_ONLINE, "x86/kvm/clk:online",</div><div class='ctx'> 			  kvmclock_cpu_online, kvmclock_cpu_down_prep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5834,9 +5992,6 @@ static void kvm_set_mmio_spte_mask(void)</div><div class='ctx'> 	 /* Mask the reserved physical address bits. */</div><div class='ctx'> 	mask = rsvd_bits(maxphyaddr, 51);</div><div class='ctx'> </div><div class='del'>-	/* Bit 62 is always reserved for 32bit host. */</div><div class='del'>-	mask |= 0x3ull &lt;&lt; 62;</div><div class='del'>-</div><div class='ctx'> 	/* Set the present bit. */</div><div class='ctx'> 	mask |= 1ull;</div><div class='ctx'> </div><div class='hunk'>@@ -5935,7 +6090,7 @@ int kvm_arch_init(void *opaque)</div><div class='ctx'> </div><div class='ctx'> 	kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK,</div><div class='ctx'> 			PT_DIRTY_MASK, PT64_NX_MASK, 0,</div><div class='del'>-			PT_PRESENT_MASK);</div><div class='add'>+			PT_PRESENT_MASK, 0);</div><div class='ctx'> 	kvm_timer_init();</div><div class='ctx'> </div><div class='ctx'> 	perf_register_guest_info_callbacks(&amp;kvm_guest_cbs);</div><div class='hunk'>@@ -5958,6 +6113,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> void kvm_arch_exit(void)</div><div class='ctx'> {</div><div class='add'>+	kvm_lapic_exit();</div><div class='ctx'> 	perf_unregister_guest_info_callbacks(&amp;kvm_guest_cbs);</div><div class='ctx'> </div><div class='ctx'> 	if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))</div><div class='hunk'>@@ -5987,11 +6143,44 @@ EXPORT_SYMBOL_GPL(kvm_vcpu_halt);</div><div class='ctx'> </div><div class='ctx'> int kvm_emulate_halt(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	kvm_x86_ops-&gt;skip_emulated_instruction(vcpu);</div><div class='del'>-	return kvm_vcpu_halt(vcpu);</div><div class='add'>+	int ret = kvm_skip_emulated_instruction(vcpu);</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: we might be squashing a GUESTDBG_SINGLESTEP-triggered</div><div class='add'>+	 * KVM_EXIT_DEBUG here.</div><div class='add'>+	 */</div><div class='add'>+	return kvm_vcpu_halt(vcpu) &amp;&amp; ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_emulate_halt);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+static int kvm_pv_clock_pairing(struct kvm_vcpu *vcpu, gpa_t paddr,</div><div class='add'>+			        unsigned long clock_type)</div><div class='add'>+{</div><div class='add'>+	struct kvm_clock_pairing clock_pairing;</div><div class='add'>+	struct timespec ts;</div><div class='add'>+	u64 cycle;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (clock_type != KVM_CLOCK_PAIRING_WALLCLOCK)</div><div class='add'>+		return -KVM_EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (kvm_get_walltime_and_clockread(&amp;ts, &amp;cycle) == false)</div><div class='add'>+		return -KVM_EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	clock_pairing.sec = ts.tv_sec;</div><div class='add'>+	clock_pairing.nsec = ts.tv_nsec;</div><div class='add'>+	clock_pairing.tsc = kvm_read_l1_tsc(vcpu, cycle);</div><div class='add'>+	clock_pairing.flags = 0;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	if (kvm_write_guest(vcpu-&gt;kvm, paddr, &amp;clock_pairing,</div><div class='add'>+			    sizeof(struct kvm_clock_pairing)))</div><div class='add'>+		ret = -KVM_EFAULT;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * kvm_pv_kick_cpu_op:  Kick a vcpu.</div><div class='ctx'>  *</div><div class='hunk'>@@ -6019,9 +6208,9 @@ void kvm_vcpu_deactivate_apicv(struct kvm_vcpu *vcpu)</div><div class='ctx'> int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long nr, a0, a1, a2, a3, ret;</div><div class='del'>-	int op_64_bit, r = 1;</div><div class='add'>+	int op_64_bit, r;</div><div class='ctx'> </div><div class='del'>-	kvm_x86_ops-&gt;skip_emulated_instruction(vcpu);</div><div class='add'>+	r = kvm_skip_emulated_instruction(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	if (kvm_hv_hypercall_enabled(vcpu-&gt;kvm))</div><div class='ctx'> 		return kvm_hv_hypercall(vcpu);</div><div class='hunk'>@@ -6056,6 +6245,11 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		kvm_pv_kick_cpu_op(vcpu-&gt;kvm, a0, a1);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		break;</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	case KVM_HC_CLOCK_PAIRING:</div><div class='add'>+		ret = kvm_pv_clock_pairing(vcpu, a0, a1);</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -KVM_ENOSYS;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -6077,7 +6271,8 @@ static int emulator_fix_hypercall(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> </div><div class='ctx'> 	kvm_x86_ops-&gt;patch_hypercall(vcpu, instruction);</div><div class='ctx'> </div><div class='del'>-	return emulator_write_emulated(ctxt, rip, instruction, 3, NULL);</div><div class='add'>+	return emulator_write_emulated(ctxt, rip, instruction, 3,</div><div class='add'>+		&amp;ctxt-&gt;exception);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dm_request_for_irq_injection(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -6468,7 +6663,7 @@ static void vcpu_scan_ioapic(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	if (irqchip_split(vcpu-&gt;kvm))</div><div class='ctx'> 		kvm_scan_ioapic_routes(vcpu, vcpu-&gt;arch.ioapic_handled_vectors);</div><div class='ctx'> 	else {</div><div class='del'>-		if (vcpu-&gt;arch.apicv_active)</div><div class='add'>+		if (kvm_x86_ops-&gt;sync_pir_to_irr &amp;&amp; vcpu-&gt;arch.apicv_active)</div><div class='ctx'> 			kvm_x86_ops-&gt;sync_pir_to_irr(vcpu);</div><div class='ctx'> 		kvm_ioapic_scan_entry(vcpu, vcpu-&gt;arch.ioapic_handled_vectors);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6559,10 +6754,6 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)</div><div class='ctx'> 			r = 0;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		if (kvm_check_request(KVM_REQ_DEACTIVATE_FPU, vcpu)) {</div><div class='del'>-			vcpu-&gt;fpu_active = 0;</div><div class='del'>-			kvm_x86_ops-&gt;fpu_deactivate(vcpu);</div><div class='del'>-		}</div><div class='ctx'> 		if (kvm_check_request(KVM_REQ_APF_HALT, vcpu)) {</div><div class='ctx'> 			/* Page is swapped out. Do synthetic halt */</div><div class='ctx'> 			vcpu-&gt;arch.apf.halted = true;</div><div class='hunk'>@@ -6622,21 +6813,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)</div><div class='ctx'> 			kvm_hv_process_stimers(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * KVM_REQ_EVENT is not set when posted interrupts are set by</div><div class='del'>-	 * VT-d hardware, so we have to update RVI unconditionally.</div><div class='del'>-	 */</div><div class='del'>-	if (kvm_lapic_enabled(vcpu)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Update architecture specific hints for APIC</div><div class='del'>-		 * virtual interrupt delivery.</div><div class='del'>-		 */</div><div class='del'>-		if (vcpu-&gt;arch.apicv_active)</div><div class='del'>-			kvm_x86_ops-&gt;hwapic_irr_update(vcpu,</div><div class='del'>-				kvm_lapic_find_highest_irr(vcpu));</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (kvm_check_request(KVM_REQ_EVENT, vcpu) || req_int_win) {</div><div class='add'>+		++vcpu-&gt;stat.req_event;</div><div class='ctx'> 		kvm_apic_accept_events(vcpu);</div><div class='ctx'> 		if (vcpu-&gt;arch.mp_state == KVM_MP_STATE_INIT_RECEIVED) {</div><div class='ctx'> 			r = 1;</div><div class='hunk'>@@ -6677,22 +6855,40 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> </div><div class='ctx'> 	kvm_x86_ops-&gt;prepare_guest_switch(vcpu);</div><div class='del'>-	if (vcpu-&gt;fpu_active)</div><div class='del'>-		kvm_load_guest_fpu(vcpu);</div><div class='add'>+	kvm_load_guest_fpu(vcpu);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable IRQs before setting IN_GUEST_MODE.  Posted interrupt</div><div class='add'>+	 * IPI are then delayed after guest entry, which ensures that they</div><div class='add'>+	 * result in virtual interrupt delivery.</div><div class='add'>+	 */</div><div class='add'>+	local_irq_disable();</div><div class='ctx'> 	vcpu-&gt;mode = IN_GUEST_MODE;</div><div class='ctx'> </div><div class='ctx'> 	srcu_read_unlock(&amp;vcpu-&gt;kvm-&gt;srcu, vcpu-&gt;srcu_idx);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We should set -&gt;mode before check -&gt;requests,</div><div class='del'>-	 * Please see the comment in kvm_make_all_cpus_request.</div><div class='del'>-	 * This also orders the write to mode from any reads</div><div class='del'>-	 * to the page tables done while the VCPU is running.</div><div class='del'>-	 * Please see the comment in kvm_flush_remote_tlbs.</div><div class='add'>+	 * 1) We should set -&gt;mode before checking -&gt;requests.  Please see</div><div class='add'>+	 * the comment in kvm_make_all_cpus_request.</div><div class='add'>+	 *</div><div class='add'>+	 * 2) For APICv, we should set -&gt;mode before checking PIR.ON.  This</div><div class='add'>+	 * pairs with the memory barrier implicit in pi_test_and_set_on</div><div class='add'>+	 * (see vmx_deliver_posted_interrupt).</div><div class='add'>+	 *</div><div class='add'>+	 * 3) This also orders the write to mode from any reads to the page</div><div class='add'>+	 * tables done while the VCPU is running.  Please see the comment</div><div class='add'>+	 * in kvm_flush_remote_tlbs.</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_mb__after_srcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	local_irq_disable();</div><div class='add'>+	/*</div><div class='add'>+	 * This handles the case where a posted interrupt was</div><div class='add'>+	 * notified with kvm_vcpu_kick.</div><div class='add'>+	 */</div><div class='add'>+	if (kvm_lapic_enabled(vcpu)) {</div><div class='add'>+		if (kvm_x86_ops-&gt;sync_pir_to_irr &amp;&amp; vcpu-&gt;arch.apicv_active)</div><div class='add'>+			kvm_x86_ops-&gt;sync_pir_to_irr(vcpu);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;mode == EXITING_GUEST_MODE || vcpu-&gt;requests</div><div class='ctx'> 	    || need_resched() || signal_pending(current)) {</div><div class='hunk'>@@ -6831,6 +7027,9 @@ static inline int vcpu_block(struct kvm *kvm, struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> static inline bool kvm_vcpu_running(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='add'>+	if (is_guest_mode(vcpu) &amp;&amp; kvm_x86_ops-&gt;check_nested_events)</div><div class='add'>+		kvm_x86_ops-&gt;check_nested_events(vcpu, false);</div><div class='add'>+</div><div class='ctx'> 	return (vcpu-&gt;arch.mp_state == KVM_MP_STATE_RUNNABLE &amp;&amp;</div><div class='ctx'> 		!vcpu-&gt;arch.apf.halted);</div><div class='ctx'> }</div><div class='hunk'>@@ -7002,7 +7201,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	} else</div><div class='ctx'> 		WARN_ON(vcpu-&gt;arch.pio.count || vcpu-&gt;mmio_needed);</div><div class='ctx'> </div><div class='del'>-	r = vcpu_run(vcpu);</div><div class='add'>+	if (kvm_run-&gt;immediate_exit)</div><div class='add'>+		r = -EINTR;</div><div class='add'>+	else</div><div class='add'>+		r = vcpu_run(vcpu);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	post_kvm_run_save(vcpu);</div><div class='hunk'>@@ -7407,25 +7609,13 @@ void kvm_load_guest_fpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> void kvm_put_guest_fpu(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	if (!vcpu-&gt;guest_fpu_loaded) {</div><div class='del'>-		vcpu-&gt;fpu_counter = 0;</div><div class='add'>+	if (!vcpu-&gt;guest_fpu_loaded)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;guest_fpu_loaded = 0;</div><div class='ctx'> 	copy_fpregs_to_fpstate(&amp;vcpu-&gt;arch.guest_fpu);</div><div class='ctx'> 	__kernel_fpu_end();</div><div class='ctx'> 	++vcpu-&gt;stat.fpu_reload;</div><div class='del'>-	/*</div><div class='del'>-	 * If using eager FPU mode, or if the guest is a frequent user</div><div class='del'>-	 * of the FPU, just leave the FPU active for next time.</div><div class='del'>-	 * Every 255 times fpu_counter rolls over to 0; a guest that uses</div><div class='del'>-	 * the FPU in bursts will revert to loading it on demand.</div><div class='del'>-	 */</div><div class='del'>-	if (!use_eager_fpu()) {</div><div class='del'>-		if (++vcpu-&gt;fpu_counter &lt; 5)</div><div class='del'>-			kvm_make_request(KVM_REQ_DEACTIVATE_FPU, vcpu);</div><div class='del'>-	}</div><div class='ctx'> 	trace_kvm_fpu(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7824,6 +8014,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)</div><div class='ctx'> </div><div class='ctx'> 	raw_spin_lock_init(&amp;kvm-&gt;arch.tsc_write_lock);</div><div class='ctx'> 	mutex_init(&amp;kvm-&gt;arch.apic_map_lock);</div><div class='add'>+	mutex_init(&amp;kvm-&gt;arch.hyperv.hv_lock);</div><div class='ctx'> 	spin_lock_init(&amp;kvm-&gt;arch.pvclock_gtod_sync_lock);</div><div class='ctx'> </div><div class='ctx'> 	kvm-&gt;arch.kvmclock_offset = -ktime_get_boot_ns();</div><div class='hunk'>@@ -8176,7 +8367,7 @@ void kvm_arch_flush_shadow_all(struct kvm *kvm)</div><div class='ctx'> void kvm_arch_flush_shadow_memslot(struct kvm *kvm,</div><div class='ctx'> 				   struct kvm_memory_slot *slot)</div><div class='ctx'> {</div><div class='del'>-	kvm_mmu_invalidate_zap_all_pages(kvm);</div><div class='add'>+	kvm_page_track_flush_slot(kvm, slot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -8208,9 +8399,6 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	if (is_guest_mode(vcpu) &amp;&amp; kvm_x86_ops-&gt;check_nested_events)</div><div class='del'>-		kvm_x86_ops-&gt;check_nested_events(vcpu, false);</div><div class='del'>-</div><div class='ctx'> 	return kvm_vcpu_running(vcpu) || kvm_vcpu_has_events(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -8347,9 +8535,8 @@ static void kvm_del_async_pf_gfn(struct kvm_vcpu *vcpu, gfn_t gfn)</div><div class='ctx'> </div><div class='ctx'> static int apf_put_user(struct kvm_vcpu *vcpu, u32 val)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	return kvm_write_guest_cached(vcpu-&gt;kvm, &amp;vcpu-&gt;arch.apf.data, &amp;val,</div><div class='del'>-				      sizeof(val));</div><div class='add'>+	return kvm_vcpu_write_guest_cached(vcpu, &amp;vcpu-&gt;arch.apf.data, &amp;val,</div><div class='add'>+					   sizeof(val));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvm_arch_async_page_not_present(struct kvm_vcpu *vcpu,</div><div class='head'>diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c<br/>index 25da5bc8d83d..d3289d7e78fa 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/lguest/boot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/lguest/boot.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/lguest/boot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lguest/boot.c</a></div><div class='hunk'>@@ -497,38 +497,24 @@ static void lguest_cpuid(unsigned int *ax, unsigned int *bx,</div><div class='ctx'>  * a whole series of functions like read_cr0() and write_cr0().</div><div class='ctx'>  *</div><div class='ctx'>  * We start with cr0.  cr0 allows you to turn on and off all kinds of basic</div><div class='del'>- * features, but Linux only really cares about one: the horrifically-named Task</div><div class='del'>- * Switched (TS) bit at bit 3 (ie. 8)</div><div class='add'>+ * features, but the only cr0 bit that Linux ever used at runtime was the</div><div class='add'>+ * horrifically-named Task Switched (TS) bit at bit 3 (ie. 8)</div><div class='ctx'>  *</div><div class='ctx'>  * What does the TS bit do?  Well, it causes the CPU to trap (interrupt 7) if</div><div class='ctx'>  * the floating point unit is used.  Which allows us to restore FPU state</div><div class='del'>- * lazily after a task switch, and Linux uses that gratefully, but wouldn't a</div><div class='del'>- * name like "FPUTRAP bit" be a little less cryptic?</div><div class='add'>+ * lazily after a task switch if we wanted to, but wouldn't a name like</div><div class='add'>+ * "FPUTRAP bit" be a little less cryptic?</div><div class='ctx'>  *</div><div class='del'>- * We store cr0 locally because the Host never changes it.  The Guest sometimes</div><div class='del'>- * wants to read it and we'd prefer not to bother the Host unnecessarily.</div><div class='add'>+ * Fortunately, Linux keeps it simple and doesn't use TS, so we can ignore</div><div class='add'>+ * cr0.</div><div class='ctx'>  */</div><div class='del'>-static unsigned long current_cr0;</div><div class='ctx'> static void lguest_write_cr0(unsigned long val)</div><div class='ctx'> {</div><div class='del'>-	lazy_hcall1(LHCALL_TS, val &amp; X86_CR0_TS);</div><div class='del'>-	current_cr0 = val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long lguest_read_cr0(void)</div><div class='ctx'> {</div><div class='del'>-	return current_cr0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Intel provided a special instruction to clear the TS bit for people too cool</div><div class='del'>- * to use write_cr0() to do it.  This "clts" instruction is faster, because all</div><div class='del'>- * the vowels have been optimized out.</div><div class='del'>- */</div><div class='del'>-static void lguest_clts(void)</div><div class='del'>-{</div><div class='del'>-	lazy_hcall1(LHCALL_TS, 0);</div><div class='del'>-	current_cr0 &amp;= ~X86_CR0_TS;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -930,7 +916,7 @@ static unsigned long lguest_tsc_khz(void)</div><div class='ctx'>  * If we can't use the TSC, the kernel falls back to our lower-priority</div><div class='ctx'>  * "lguest_clock", where we read the time value given to us by the Host.</div><div class='ctx'>  */</div><div class='del'>-static cycle_t lguest_clock_read(struct clocksource *cs)</div><div class='add'>+static u64 lguest_clock_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long sec, nsec;</div><div class='ctx'> </div><div class='hunk'>@@ -1432,7 +1418,6 @@ __init void lguest_init(void)</div><div class='ctx'> 	pv_cpu_ops.load_tls = lguest_load_tls;</div><div class='ctx'> 	pv_cpu_ops.get_debugreg = lguest_get_debugreg;</div><div class='ctx'> 	pv_cpu_ops.set_debugreg = lguest_set_debugreg;</div><div class='del'>-	pv_cpu_ops.clts = lguest_clts;</div><div class='ctx'> 	pv_cpu_ops.read_cr0 = lguest_read_cr0;</div><div class='ctx'> 	pv_cpu_ops.write_cr0 = lguest_write_cr0;</div><div class='ctx'> 	pv_cpu_ops.read_cr4 = lguest_read_cr4;</div><div class='head'>diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S<br/>index d376e4b48f88..c5959576c315 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/lib/copy_user_64.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/lib/copy_user_64.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/lib/copy_user_64.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lib/copy_user_64.S</a></div><div class='hunk'>@@ -16,53 +16,6 @@</div><div class='ctx'> #include &lt;asm/smap.h&gt;</div><div class='ctx'> #include &lt;asm/export.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Standard copy_to_user with segment limit checking */</div><div class='del'>-ENTRY(_copy_to_user)</div><div class='del'>-	mov PER_CPU_VAR(current_task), %rax</div><div class='del'>-	movq %rdi,%rcx</div><div class='del'>-	addq %rdx,%rcx</div><div class='del'>-	jc bad_to_user</div><div class='del'>-	cmpq TASK_addr_limit(%rax),%rcx</div><div class='del'>-	ja bad_to_user</div><div class='del'>-	ALTERNATIVE_2 "jmp copy_user_generic_unrolled",		\</div><div class='del'>-		      "jmp copy_user_generic_string",		\</div><div class='del'>-		      X86_FEATURE_REP_GOOD,			\</div><div class='del'>-		      "jmp copy_user_enhanced_fast_string",	\</div><div class='del'>-		      X86_FEATURE_ERMS</div><div class='del'>-ENDPROC(_copy_to_user)</div><div class='del'>-EXPORT_SYMBOL(_copy_to_user)</div><div class='del'>-</div><div class='del'>-/* Standard copy_from_user with segment limit checking */</div><div class='del'>-ENTRY(_copy_from_user)</div><div class='del'>-	mov PER_CPU_VAR(current_task), %rax</div><div class='del'>-	movq %rsi,%rcx</div><div class='del'>-	addq %rdx,%rcx</div><div class='del'>-	jc bad_from_user</div><div class='del'>-	cmpq TASK_addr_limit(%rax),%rcx</div><div class='del'>-	ja bad_from_user</div><div class='del'>-	ALTERNATIVE_2 "jmp copy_user_generic_unrolled",		\</div><div class='del'>-		      "jmp copy_user_generic_string",		\</div><div class='del'>-		      X86_FEATURE_REP_GOOD,			\</div><div class='del'>-		      "jmp copy_user_enhanced_fast_string",	\</div><div class='del'>-		      X86_FEATURE_ERMS</div><div class='del'>-ENDPROC(_copy_from_user)</div><div class='del'>-EXPORT_SYMBOL(_copy_from_user)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	.section .fixup,"ax"</div><div class='del'>-	/* must zero dest */</div><div class='del'>-ENTRY(bad_from_user)</div><div class='del'>-bad_from_user:</div><div class='del'>-	movl %edx,%ecx</div><div class='del'>-	xorl %eax,%eax</div><div class='del'>-	rep</div><div class='del'>-	stosb</div><div class='del'>-bad_to_user:</div><div class='del'>-	movl %edx,%eax</div><div class='del'>-	ret</div><div class='del'>-ENDPROC(bad_from_user)</div><div class='del'>-	.previous</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * copy_user_generic_unrolled - memory copy with exception handling.</div><div class='ctx'>  * This version is for CPUs like P4 that don't have efficient micro</div><div class='head'>diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c<br/>index 073d1f1a620b..a8e91ae89fb3 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/lib/delay.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/lib/delay.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/lib/delay.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lib/delay.c</a></div><div class='hunk'>@@ -156,13 +156,13 @@ EXPORT_SYMBOL(__delay);</div><div class='ctx'> </div><div class='ctx'> inline void __const_udelay(unsigned long xloops)</div><div class='ctx'> {</div><div class='add'>+	unsigned long lpj = this_cpu_read(cpu_info.loops_per_jiffy) ? : loops_per_jiffy;</div><div class='ctx'> 	int d0;</div><div class='ctx'> </div><div class='ctx'> 	xloops *= 4;</div><div class='ctx'> 	asm("mull %%edx"</div><div class='ctx'> 		:"=d" (xloops), "=&amp;a" (d0)</div><div class='del'>-		:"1" (xloops), "0"</div><div class='del'>-		(this_cpu_read(cpu_info.loops_per_jiffy) * (HZ/4)));</div><div class='add'>+		:"1" (xloops), "0" (lpj * (HZ / 4)));</div><div class='ctx'> </div><div class='ctx'> 	__delay(++xloops);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/lib/msr.c b/arch/x86/lib/msr.c<br/>index d1dee753b949..07764255b611 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/lib/msr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/lib/msr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/lib/msr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lib/msr.c</a></div><div class='hunk'>@@ -113,14 +113,14 @@ int msr_clear_bit(u32 msr, u8 bit)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TRACEPOINTS</div><div class='del'>-void do_trace_write_msr(unsigned msr, u64 val, int failed)</div><div class='add'>+void do_trace_write_msr(unsigned int msr, u64 val, int failed)</div><div class='ctx'> {</div><div class='ctx'> 	trace_write_msr(msr, val, failed);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(do_trace_write_msr);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL(write_msr);</div><div class='ctx'> </div><div class='del'>-void do_trace_read_msr(unsigned msr, u64 val, int failed)</div><div class='add'>+void do_trace_read_msr(unsigned int msr, u64 val, int failed)</div><div class='ctx'> {</div><div class='ctx'> 	trace_read_msr(msr, val, failed);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c<br/>index b4908789484e..c074799bddae 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/lib/usercopy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/lib/usercopy.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/lib/usercopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lib/usercopy.c</a></div><div class='hunk'>@@ -34,3 +34,52 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(copy_from_user_nmi);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * copy_to_user: - Copy a block of data into user space.</div><div class='add'>+ * @to:   Destination address, in user space.</div><div class='add'>+ * @from: Source address, in kernel space.</div><div class='add'>+ * @n:    Number of bytes to copy.</div><div class='add'>+ *</div><div class='add'>+ * Context: User context only. This function may sleep if pagefaults are</div><div class='add'>+ *          enabled.</div><div class='add'>+ *</div><div class='add'>+ * Copy data from kernel space to user space.</div><div class='add'>+ *</div><div class='add'>+ * Returns number of bytes that could not be copied.</div><div class='add'>+ * On success, this will be zero.</div><div class='add'>+ */</div><div class='add'>+unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)</div><div class='add'>+{</div><div class='add'>+	if (access_ok(VERIFY_WRITE, to, n))</div><div class='add'>+		n = __copy_to_user(to, from, n);</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(_copy_to_user);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * copy_from_user: - Copy a block of data from user space.</div><div class='add'>+ * @to:   Destination address, in kernel space.</div><div class='add'>+ * @from: Source address, in user space.</div><div class='add'>+ * @n:    Number of bytes to copy.</div><div class='add'>+ *</div><div class='add'>+ * Context: User context only. This function may sleep if pagefaults are</div><div class='add'>+ *          enabled.</div><div class='add'>+ *</div><div class='add'>+ * Copy data from user space to kernel space.</div><div class='add'>+ *</div><div class='add'>+ * Returns number of bytes that could not be copied.</div><div class='add'>+ * On success, this will be zero.</div><div class='add'>+ *</div><div class='add'>+ * If some data could not be copied, this function will pad the copied</div><div class='add'>+ * data to the requested size using zero bytes.</div><div class='add'>+ */</div><div class='add'>+unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)</div><div class='add'>+{</div><div class='add'>+	if (access_ok(VERIFY_READ, from, n))</div><div class='add'>+		n = __copy_from_user(to, from, n);</div><div class='add'>+	else</div><div class='add'>+		memset(to, 0, n);</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(_copy_from_user);</div><div class='head'>diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c<br/>index 3bc7baf2a711..1f65ff6540f0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/lib/usercopy_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/lib/usercopy_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/lib/usercopy_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/lib/usercopy_32.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmx.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -640,52 +640,3 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * copy_to_user: - Copy a block of data into user space.</div><div class='del'>- * @to:   Destination address, in user space.</div><div class='del'>- * @from: Source address, in kernel space.</div><div class='del'>- * @n:    Number of bytes to copy.</div><div class='del'>- *</div><div class='del'>- * Context: User context only. This function may sleep if pagefaults are</div><div class='del'>- *          enabled.</div><div class='del'>- *</div><div class='del'>- * Copy data from kernel space to user space.</div><div class='del'>- *</div><div class='del'>- * Returns number of bytes that could not be copied.</div><div class='del'>- * On success, this will be zero.</div><div class='del'>- */</div><div class='del'>-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)</div><div class='del'>-{</div><div class='del'>-	if (access_ok(VERIFY_WRITE, to, n))</div><div class='del'>-		n = __copy_to_user(to, from, n);</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(_copy_to_user);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * copy_from_user: - Copy a block of data from user space.</div><div class='del'>- * @to:   Destination address, in kernel space.</div><div class='del'>- * @from: Source address, in user space.</div><div class='del'>- * @n:    Number of bytes to copy.</div><div class='del'>- *</div><div class='del'>- * Context: User context only. This function may sleep if pagefaults are</div><div class='del'>- *          enabled.</div><div class='del'>- *</div><div class='del'>- * Copy data from user space to kernel space.</div><div class='del'>- *</div><div class='del'>- * Returns number of bytes that could not be copied.</div><div class='del'>- * On success, this will be zero.</div><div class='del'>- *</div><div class='del'>- * If some data could not be copied, this function will pad the copied</div><div class='del'>- * data to the requested size using zero bytes.</div><div class='del'>- */</div><div class='del'>-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)</div><div class='del'>-{</div><div class='del'>-	if (access_ok(VERIFY_READ, from, n))</div><div class='del'>-		n = __copy_from_user(to, from, n);</div><div class='del'>-	else</div><div class='del'>-		memset(to, 0, n);</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(_copy_from_user);</div><div class='head'>diff --git a/arch/x86/math-emu/errors.c b/arch/x86/math-emu/errors.c<br/>index 9e6545f269e5..2ccc424a57d9 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/math-emu/errors.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/math-emu/errors.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/math-emu/errors.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/math-emu/errors.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fpu_emu.h"</div><div class='ctx'> #include "fpu_system.h"</div><div class='head'>diff --git a/arch/x86/math-emu/fpu_entry.c b/arch/x86/math-emu/fpu_entry.c<br/>index e945fedf1de2..0203baefb5c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/math-emu/fpu_entry.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/math-emu/fpu_entry.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/math-emu/fpu_entry.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/math-emu/fpu_entry.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/regset.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/user.h&gt;</div><div class='ctx'> #include &lt;asm/fpu/internal.h&gt;</div><div class='head'>diff --git a/arch/x86/math-emu/get_address.c b/arch/x86/math-emu/get_address.c<br/>index 8db26591d91a..b8ef9f9d2ffc 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/math-emu/get_address.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/math-emu/get_address.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/math-emu/get_address.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/math-emu/get_address.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/vm86.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fpu_system.h"</div><div class='head'>diff --git a/arch/x86/math-emu/load_store.c b/arch/x86/math-emu/load_store.c<br/>index 95228ff042c0..1643054766eb 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/math-emu/load_store.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/math-emu/load_store.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/math-emu/load_store.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/math-emu/load_store.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  |    other processes using the emulator while swapping is in progress.      |</div><div class='ctx'>  +---------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fpu_system.h"</div><div class='ctx'> #include "exception.h"</div><div class='head'>diff --git a/arch/x86/math-emu/reg_ld_str.c b/arch/x86/math-emu/reg_ld_str.c<br/>index d597fe7423c9..2c98965a60ba 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/math-emu/reg_ld_str.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/math-emu/reg_ld_str.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/math-emu/reg_ld_str.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/math-emu/reg_ld_str.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "fpu_emu.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fpu_system.h"</div><div class='ctx'> #include "exception.h"</div><div class='head'>diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c<br/>index ea9c49adaa1f..58b5bee7ea27 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/dump_pagetables.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/dump_pagetables.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/dump_pagetables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/dump_pagetables.c</a></div><div class='hunk'>@@ -15,8 +15,10 @@</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/kasan.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -50,6 +52,10 @@ enum address_markers_idx {</div><div class='ctx'> 	LOW_KERNEL_NR,</div><div class='ctx'> 	VMALLOC_START_NR,</div><div class='ctx'> 	VMEMMAP_START_NR,</div><div class='add'>+#ifdef CONFIG_KASAN</div><div class='add'>+	KASAN_SHADOW_START_NR,</div><div class='add'>+	KASAN_SHADOW_END_NR,</div><div class='add'>+#endif</div><div class='ctx'> # ifdef CONFIG_X86_ESPFIX64</div><div class='ctx'> 	ESPFIX_START_NR,</div><div class='ctx'> # endif</div><div class='hunk'>@@ -75,6 +81,10 @@ static struct addr_marker address_markers[] = {</div><div class='ctx'> 	{ 0/* PAGE_OFFSET */,   "Low Kernel Mapping" },</div><div class='ctx'> 	{ 0/* VMALLOC_START */, "vmalloc() Area" },</div><div class='ctx'> 	{ 0/* VMEMMAP_START */, "Vmemmap" },</div><div class='add'>+#ifdef CONFIG_KASAN</div><div class='add'>+	{ KASAN_SHADOW_START,	"KASAN shadow" },</div><div class='add'>+	{ KASAN_SHADOW_END,	"KASAN shadow end" },</div><div class='add'>+#endif</div><div class='ctx'> # ifdef CONFIG_X86_ESPFIX64</div><div class='ctx'> 	{ ESPFIX_BASE_ADDR,	"ESPfix Area", 16 },</div><div class='ctx'> # endif</div><div class='hunk'>@@ -326,18 +336,31 @@ static void walk_pmd_level(struct seq_file *m, struct pg_state *st, pud_t addr,</div><div class='ctx'> </div><div class='ctx'> #if PTRS_PER_PUD &gt; 1</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This is an optimization for CONFIG_DEBUG_WX=y + CONFIG_KASAN=y</div><div class='add'>+ * KASAN fills page tables with the same values. Since there is no</div><div class='add'>+ * point in checking page table more than once we just skip repeated</div><div class='add'>+ * entries. This saves us dozens of seconds during boot.</div><div class='add'>+ */</div><div class='add'>+static bool pud_already_checked(pud_t *prev_pud, pud_t *pud, bool checkwx)</div><div class='add'>+{</div><div class='add'>+	return checkwx &amp;&amp; prev_pud &amp;&amp; (pud_val(*prev_pud) == pud_val(*pud));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void walk_pud_level(struct seq_file *m, struct pg_state *st, pgd_t addr,</div><div class='ctx'> 							unsigned long P)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	pud_t *start;</div><div class='ctx'> 	pgprotval_t prot;</div><div class='add'>+	pud_t *prev_pud = NULL;</div><div class='ctx'> </div><div class='ctx'> 	start = (pud_t *) pgd_page_vaddr(addr);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PTRS_PER_PUD; i++) {</div><div class='ctx'> 		st-&gt;current_address = normalize_addr(P + i * PUD_LEVEL_MULT);</div><div class='del'>-		if (!pud_none(*start)) {</div><div class='add'>+		if (!pud_none(*start) &amp;&amp;</div><div class='add'>+		    !pud_already_checked(prev_pud, start, st-&gt;check_wx)) {</div><div class='ctx'> 			if (pud_large(*start) || !pud_present(*start)) {</div><div class='ctx'> 				prot = pud_flags(*start);</div><div class='ctx'> 				note_page(m, st, __pgprot(prot), 2);</div><div class='hunk'>@@ -348,6 +371,7 @@ static void walk_pud_level(struct seq_file *m, struct pg_state *st, pgd_t addr,</div><div class='ctx'> 		} else</div><div class='ctx'> 			note_page(m, st, __pgprot(0), 2);</div><div class='ctx'> </div><div class='add'>+		prev_pud = start;</div><div class='ctx'> 		start++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -406,6 +430,7 @@ static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd,</div><div class='ctx'> 		} else</div><div class='ctx'> 			note_page(m, &amp;st, __pgprot(0), 1);</div><div class='ctx'> </div><div class='add'>+		cond_resched();</div><div class='ctx'> 		start++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c<br/>index fcd06f7526de..35ea061010a1 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/extable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/extable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/extable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/extable.c</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> #include &lt;linux/extable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/kdebug.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c<br/>index 9f72ca3b2669..428e31763cb9 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/fault.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  *  Copyright (C) 2008-2009, Red Hat Inc., Ingo Molnar</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;		/* test_thread_flag(), ...	*/</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;	/* task_stack_*(), ...		*/</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;		/* oops_begin/end, ...		*/</div><div class='ctx'> #include &lt;linux/extable.h&gt;		/* search_exception_tables	*/</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;		/* max_low_pfn			*/</div><div class='hunk'>@@ -413,7 +414,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> void vmalloc_sync_all(void)</div><div class='ctx'> {</div><div class='del'>-	sync_global_pgds(VMALLOC_START &amp; PGDIR_MASK, VMALLOC_END, 0);</div><div class='add'>+	sync_global_pgds(VMALLOC_START &amp; PGDIR_MASK, VMALLOC_END);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -679,8 +680,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,</div><div class='ctx'> 		printk(KERN_CONT "paging request");</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_CONT " at %p\n", (void *) address);</div><div class='del'>-	printk(KERN_ALERT "IP:");</div><div class='del'>-	printk_address(regs-&gt;ip);</div><div class='add'>+	printk(KERN_ALERT "IP: %pS\n", (void *)regs-&gt;ip);</div><div class='ctx'> </div><div class='ctx'> 	dump_pagetable(address);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c<br/>index 0d4fb3ebbbac..99c7805a9693 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/gup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/gup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/gup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/gup.c</a></div><div class='hunk'>@@ -154,14 +154,12 @@ static inline void get_head_page_multiple(struct page *page, int nr)</div><div class='ctx'> 	SetPageReferenced(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __gup_device_huge_pmd(pmd_t pmd, unsigned long addr,</div><div class='add'>+static int __gup_device_huge(unsigned long pfn, unsigned long addr,</div><div class='ctx'> 		unsigned long end, struct page **pages, int *nr)</div><div class='ctx'> {</div><div class='ctx'> 	int nr_start = *nr;</div><div class='del'>-	unsigned long pfn = pmd_pfn(pmd);</div><div class='ctx'> 	struct dev_pagemap *pgmap = NULL;</div><div class='ctx'> </div><div class='del'>-	pfn += (addr &amp; ~PMD_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	do {</div><div class='ctx'> 		struct page *page = pfn_to_page(pfn);</div><div class='ctx'> </div><div class='hunk'>@@ -180,6 +178,24 @@ static int __gup_device_huge_pmd(pmd_t pmd, unsigned long addr,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __gup_device_huge_pmd(pmd_t pmd, unsigned long addr,</div><div class='add'>+		unsigned long end, struct page **pages, int *nr)</div><div class='add'>+{</div><div class='add'>+	unsigned long fault_pfn;</div><div class='add'>+</div><div class='add'>+	fault_pfn = pmd_pfn(pmd) + ((addr &amp; ~PMD_MASK) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	return __gup_device_huge(fault_pfn, addr, end, pages, nr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __gup_device_huge_pud(pud_t pud, unsigned long addr,</div><div class='add'>+		unsigned long end, struct page **pages, int *nr)</div><div class='add'>+{</div><div class='add'>+	unsigned long fault_pfn;</div><div class='add'>+</div><div class='add'>+	fault_pfn = pud_pfn(pud) + ((addr &amp; ~PUD_MASK) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	return __gup_device_huge(fault_pfn, addr, end, pages, nr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static noinline int gup_huge_pmd(pmd_t pmd, unsigned long addr,</div><div class='ctx'> 		unsigned long end, int write, struct page **pages, int *nr)</div><div class='ctx'> {</div><div class='hunk'>@@ -251,9 +267,13 @@ static noinline int gup_huge_pud(pud_t pud, unsigned long addr,</div><div class='ctx'> </div><div class='ctx'> 	if (!pte_allows_gup(pud_val(pud), write))</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='add'>+	VM_BUG_ON(!pfn_valid(pud_pfn(pud)));</div><div class='add'>+	if (pud_devmap(pud))</div><div class='add'>+		return __gup_device_huge_pud(pud, addr, end, pages, nr);</div><div class='add'>+</div><div class='ctx'> 	/* hugepages are never "special" */</div><div class='ctx'> 	VM_BUG_ON(pud_flags(pud) &amp; _PAGE_SPECIAL);</div><div class='del'>-	VM_BUG_ON(!pfn_valid(pud_pfn(pud)));</div><div class='ctx'> </div><div class='ctx'> 	refs = 0;</div><div class='ctx'> 	head = pud_page(pud);</div><div class='head'>diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c<br/>index 2ae8584b44c7..c5066a260803 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/hugetlbpage.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/hugetlbpage.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/hugetlbpage.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/hugetlb.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='head'>diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c<br/>index cf8059016ec8..2b4b53e6793f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/init_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/init_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/init_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/init_32.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/bios_ebda.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='hunk'>@@ -864,9 +864,6 @@ static noinline int do_test_wp_bit(void)</div><div class='ctx'> 	return flag;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const int rodata_test_data = 0xC3;</div><div class='del'>-EXPORT_SYMBOL_GPL(rodata_test_data);</div><div class='del'>-</div><div class='ctx'> int kernel_set_to_readonly __read_mostly;</div><div class='ctx'> </div><div class='ctx'> void set_kernel_text_rw(void)</div><div class='hunk'>@@ -939,7 +936,6 @@ void mark_rodata_ro(void)</div><div class='ctx'> 	set_pages_ro(virt_to_page(start), size &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 	printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",</div><div class='ctx'> 		size &gt;&gt; 10);</div><div class='del'>-	rodata_test();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPA_DEBUG</div><div class='ctx'> 	printk(KERN_INFO "Testing CPA: undo %lx-%lx\n", start, start + size);</div><div class='head'>diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c<br/>index 14b9dd71d9e8..15173d37f399 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/init_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/init_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/init_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/init_64.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/bios_ebda.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -89,10 +89,10 @@ static int __init nonx32_setup(char *str)</div><div class='ctx'> __setup("noexec32=", nonx32_setup);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * When memory was added/removed make sure all the processes MM have</div><div class='add'>+ * When memory was added make sure all the processes MM have</div><div class='ctx'>  * suitable PGD entries in the local PGD level page.</div><div class='ctx'>  */</div><div class='del'>-void sync_global_pgds(unsigned long start, unsigned long end, int removed)</div><div class='add'>+void sync_global_pgds(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long address;</div><div class='ctx'> </div><div class='hunk'>@@ -100,12 +100,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)</div><div class='ctx'> 		const pgd_t *pgd_ref = pgd_offset_k(address);</div><div class='ctx'> 		struct page *page;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * When it is called after memory hot remove, pgd_none()</div><div class='del'>-		 * returns true. In this case (removed == 1), we must clear</div><div class='del'>-		 * the PGD entries in the local PGD level page.</div><div class='del'>-		 */</div><div class='del'>-		if (pgd_none(*pgd_ref) &amp;&amp; !removed)</div><div class='add'>+		if (pgd_none(*pgd_ref))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;pgd_lock);</div><div class='hunk'>@@ -122,13 +117,8 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)</div><div class='ctx'> 				BUG_ON(pgd_page_vaddr(*pgd)</div><div class='ctx'> 				       != pgd_page_vaddr(*pgd_ref));</div><div class='ctx'> </div><div class='del'>-			if (removed) {</div><div class='del'>-				if (pgd_none(*pgd_ref) &amp;&amp; !pgd_none(*pgd))</div><div class='del'>-					pgd_clear(pgd);</div><div class='del'>-			} else {</div><div class='del'>-				if (pgd_none(*pgd))</div><div class='del'>-					set_pgd(pgd, *pgd_ref);</div><div class='del'>-			}</div><div class='add'>+			if (pgd_none(*pgd))</div><div class='add'>+				set_pgd(pgd, *pgd_ref);</div><div class='ctx'> </div><div class='ctx'> 			spin_unlock(pgt_lock);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -596,7 +586,7 @@ kernel_physical_mapping_init(unsigned long paddr_start,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pgd_changed)</div><div class='del'>-		sync_global_pgds(vaddr_start, vaddr_end - 1, 0);</div><div class='add'>+		sync_global_pgds(vaddr_start, vaddr_end - 1);</div><div class='ctx'> </div><div class='ctx'> 	__flush_tlb_all();</div><div class='ctx'> </div><div class='hunk'>@@ -689,7 +679,7 @@ static void __meminit free_pagetable(struct page *page, int order)</div><div class='ctx'> 	if (PageReserved(page)) {</div><div class='ctx'> 		__ClearPageReserved(page);</div><div class='ctx'> </div><div class='del'>-		magic = (unsigned long)page-&gt;lru.next;</div><div class='add'>+		magic = (unsigned long)page-&gt;freelist;</div><div class='ctx'> 		if (magic == SECTION_INFO || magic == MIX_SECTION_INFO) {</div><div class='ctx'> 			while (nr_pages--)</div><div class='ctx'> 				put_page_bootmem(page++);</div><div class='hunk'>@@ -1010,9 +1000,6 @@ void __init mem_init(void)</div><div class='ctx'> 	mem_init_print_info(NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const int rodata_test_data = 0xC3;</div><div class='del'>-EXPORT_SYMBOL_GPL(rodata_test_data);</div><div class='del'>-</div><div class='ctx'> int kernel_set_to_readonly;</div><div class='ctx'> </div><div class='ctx'> void set_kernel_text_rw(void)</div><div class='hunk'>@@ -1081,8 +1068,6 @@ void mark_rodata_ro(void)</div><div class='ctx'> 	all_end = roundup((unsigned long)_brk_end, PMD_SIZE);</div><div class='ctx'> 	set_memory_nx(text_end, (all_end - text_end) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='del'>-	rodata_test();</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_CPA_DEBUG</div><div class='ctx'> 	printk(KERN_INFO "Testing CPA: undo %lx-%lx\n", start, end);</div><div class='ctx'> 	set_memory_rw(start, (end-start) &gt;&gt; PAGE_SHIFT);</div><div class='hunk'>@@ -1239,7 +1224,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)</div><div class='ctx'> 	} else</div><div class='ctx'> 		err = vmemmap_populate_basepages(start, end, node);</div><div class='ctx'> 	if (!err)</div><div class='del'>-		sync_global_pgds(start, end - 1, 0);</div><div class='add'>+		sync_global_pgds(start, end - 1);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c<br/>index 0493c17b8a51..8d63d7a104c3 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/kasan_init_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/kasan_init_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/kasan_init_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/kasan_init_64.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='head'>diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c<br/>index d2dc0438d654..7940166c799b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/mmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/mmap.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/mmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/mmap.c</a></div><div class='hunk'>@@ -28,7 +28,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct va_alignment __read_mostly va_align = {</div><div class='head'>diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c<br/>index e4f800999b32..5126dfd52b18 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/mpx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/mpx.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/mpx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/mpx.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/sched/sysctl.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -51,7 +52,7 @@ static unsigned long mpx_mmap(unsigned long len)</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 	addr = do_mmap(NULL, 0, len, PROT_READ | PROT_WRITE,</div><div class='del'>-			MAP_ANONYMOUS | MAP_PRIVATE, VM_MPX, 0, &amp;populate);</div><div class='add'>+		       MAP_ANONYMOUS | MAP_PRIVATE, VM_MPX, 0, &amp;populate, NULL);</div><div class='ctx'> 	up_write(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 	if (populate)</div><div class='ctx'> 		mm_populate(addr, populate);</div><div class='hunk'>@@ -293,7 +294,7 @@ siginfo_t *mpx_generate_siginfo(struct pt_regs *regs)</div><div class='ctx'> 	 * We were not able to extract an address from the instruction,</div><div class='ctx'> 	 * probably because there was something invalid in it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (info-&gt;si_addr == (void *)-1) {</div><div class='add'>+	if (info-&gt;si_addr == (void __user *)-1) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -350,12 +351,12 @@ int mpx_enable_management(void)</div><div class='ctx'> 	 * The copy_xregs_to_kernel() beneath get_xsave_field_ptr() is</div><div class='ctx'> 	 * expected to be relatively expensive. Storing the bounds</div><div class='ctx'> 	 * directory here means that we do not have to do xsave in the</div><div class='del'>-	 * unmap path; we can just use mm-&gt;bd_addr instead.</div><div class='add'>+	 * unmap path; we can just use mm-&gt;context.bd_addr instead.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bd_base = mpx_get_bounds_dir();</div><div class='ctx'> 	down_write(&amp;mm-&gt;mmap_sem);</div><div class='del'>-	mm-&gt;bd_addr = bd_base;</div><div class='del'>-	if (mm-&gt;bd_addr == MPX_INVALID_BOUNDS_DIR)</div><div class='add'>+	mm-&gt;context.bd_addr = bd_base;</div><div class='add'>+	if (mm-&gt;context.bd_addr == MPX_INVALID_BOUNDS_DIR)</div><div class='ctx'> 		ret = -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	up_write(&amp;mm-&gt;mmap_sem);</div><div class='hunk'>@@ -370,7 +371,7 @@ int mpx_disable_management(void)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;mm-&gt;mmap_sem);</div><div class='del'>-	mm-&gt;bd_addr = MPX_INVALID_BOUNDS_DIR;</div><div class='add'>+	mm-&gt;context.bd_addr = MPX_INVALID_BOUNDS_DIR;</div><div class='ctx'> 	up_write(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -796,7 +797,7 @@ static noinline int zap_bt_entries_mapping(struct mm_struct *mm,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		len = min(vma-&gt;vm_end, end) - addr;</div><div class='del'>-		zap_page_range(vma, addr, len, NULL);</div><div class='add'>+		zap_page_range(vma, addr, len);</div><div class='ctx'> 		trace_mpx_unmap_zap(addr, addr+len);</div><div class='ctx'> </div><div class='ctx'> 		vma = vma-&gt;vm_next;</div><div class='hunk'>@@ -893,7 +894,7 @@ static int unmap_entire_bt(struct mm_struct *mm,</div><div class='ctx'> 	 * avoid recursion, do_munmap() will check whether it comes</div><div class='ctx'> 	 * from one bounds table through VM_MPX flag.</div><div class='ctx'> 	 */</div><div class='del'>-	return do_munmap(mm, bt_addr, mpx_bt_size_bytes(mm));</div><div class='add'>+	return do_munmap(mm, bt_addr, mpx_bt_size_bytes(mm), NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int try_unmap_single_bt(struct mm_struct *mm,</div><div class='hunk'>@@ -947,7 +948,7 @@ static int try_unmap_single_bt(struct mm_struct *mm,</div><div class='ctx'> 		end = bta_end_vaddr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bde_vaddr = mm-&gt;bd_addr + mpx_get_bd_entry_offset(mm, start);</div><div class='add'>+	bde_vaddr = mm-&gt;context.bd_addr + mpx_get_bd_entry_offset(mm, start);</div><div class='ctx'> 	ret = get_bt_addr(mm, bde_vaddr, &amp;bt_addr);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * No bounds table there, so nothing to unmap.</div><div class='head'>diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c<br/>index 3f35b48d1d9d..12dcad7297a5 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/numa.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/numa.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/numa.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "numa_internal.h"</div><div class='ctx'> </div><div class='del'>-int __initdata numa_off;</div><div class='add'>+int numa_off;</div><div class='ctx'> nodemask_t numa_nodes_parsed __initdata;</div><div class='ctx'> </div><div class='ctx'> struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;</div><div class='head'>diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c<br/>index e3353c97d086..28d42130243c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/pageattr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/pageattr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/pageattr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/pageattr.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm/pat.h&gt;</div><div class='hunk'>@@ -214,7 +214,20 @@ static void cpa_flush_array(unsigned long *start, int numpages, int cache,</div><div class='ctx'> 			    int in_flags, struct page **pages)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i, level;</div><div class='add'>+#ifdef CONFIG_PREEMPT</div><div class='add'>+	/*</div><div class='add'>+	 * Avoid wbinvd() because it causes latencies on all CPUs,</div><div class='add'>+	 * regardless of any CPU isolation that may be in effect.</div><div class='add'>+	 *</div><div class='add'>+	 * This should be extended for CAT enabled systems independent of</div><div class='add'>+	 * PREEMPT because wbinvd() does not respect the CAT partitions and</div><div class='add'>+	 * this is exposed to unpriviledged users through the graphics</div><div class='add'>+	 * subsystem.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long do_wbinvd = 0;</div><div class='add'>+#else</div><div class='ctx'> 	unsigned long do_wbinvd = cache &amp;&amp; numpages &gt;= 1024; /* 4M threshold */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(irqs_disabled());</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c<br/>index 83e701f160a9..efc32bc6862b 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/pat.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/pat.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/pat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/pat.c</a></div><div class='hunk'>@@ -986,20 +986,17 @@ int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot,</div><div class='del'>-		     pfn_t pfn)</div><div class='add'>+void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot, pfn_t pfn)</div><div class='ctx'> {</div><div class='ctx'> 	enum page_cache_mode pcm;</div><div class='ctx'> </div><div class='ctx'> 	if (!pat_enabled())</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Set prot based on lookup */</div><div class='ctx'> 	pcm = lookup_memtype(pfn_t_to_phys(pfn));</div><div class='ctx'> 	*prot = __pgprot((pgprot_val(*prot) &amp; (~_PAGE_CACHE_MASK)) |</div><div class='ctx'> 			 cachemode2protval(pcm));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c<br/>index 159b52ccd600..d76485b22824 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/pat_rbtree.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/pat_rbtree.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/pat_rbtree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/pat_rbtree.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ static u64 get_subtree_max_end(struct rb_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	u64 ret = 0;</div><div class='ctx'> 	if (node) {</div><div class='del'>-		struct memtype *data = container_of(node, struct memtype, rb);</div><div class='add'>+		struct memtype *data = rb_entry(node, struct memtype, rb);</div><div class='ctx'> 		ret = data-&gt;subtree_max_end;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -79,7 +79,7 @@ static struct memtype *memtype_rb_lowest_match(struct rb_root *root,</div><div class='ctx'> 	struct memtype *last_lower = NULL;</div><div class='ctx'> </div><div class='ctx'> 	while (node) {</div><div class='del'>-		struct memtype *data = container_of(node, struct memtype, rb);</div><div class='add'>+		struct memtype *data = rb_entry(node, struct memtype, rb);</div><div class='ctx'> </div><div class='ctx'> 		if (get_subtree_max_end(node-&gt;rb_left) &gt; start) {</div><div class='ctx'> 			/* Lowest overlap if any must be on left side */</div><div class='hunk'>@@ -121,7 +121,7 @@ static struct memtype *memtype_rb_match(struct rb_root *root,</div><div class='ctx'> </div><div class='ctx'> 		node = rb_next(&amp;match-&gt;rb);</div><div class='ctx'> 		if (node)</div><div class='del'>-			match = container_of(node, struct memtype, rb);</div><div class='add'>+			match = rb_entry(node, struct memtype, rb);</div><div class='ctx'> 		else</div><div class='ctx'> 			match = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -150,7 +150,7 @@ static int memtype_rb_check_conflict(struct rb_root *root,</div><div class='ctx'> </div><div class='ctx'> 	node = rb_next(&amp;match-&gt;rb);</div><div class='ctx'> 	while (node) {</div><div class='del'>-		match = container_of(node, struct memtype, rb);</div><div class='add'>+		match = rb_entry(node, struct memtype, rb);</div><div class='ctx'> </div><div class='ctx'> 		if (match-&gt;start &gt;= end) /* Checked all possible matches */</div><div class='ctx'> 			goto success;</div><div class='hunk'>@@ -181,7 +181,7 @@ static void memtype_rb_insert(struct rb_root *root, struct memtype *newdata)</div><div class='ctx'> 	struct rb_node *parent = NULL;</div><div class='ctx'> </div><div class='ctx'> 	while (*node) {</div><div class='del'>-		struct memtype *data = container_of(*node, struct memtype, rb);</div><div class='add'>+		struct memtype *data = rb_entry(*node, struct memtype, rb);</div><div class='ctx'> </div><div class='ctx'> 		parent = *node;</div><div class='ctx'> 		if (data-&gt;subtree_max_end &lt; newdata-&gt;end)</div><div class='hunk'>@@ -270,7 +270,7 @@ int rbt_memtype_copy_nth_element(struct memtype *out, loff_t pos)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (node) { /* pos == i */</div><div class='del'>-		struct memtype *this = container_of(node, struct memtype, rb);</div><div class='add'>+		struct memtype *this = rb_entry(node, struct memtype, rb);</div><div class='ctx'> 		*out = *this;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c<br/>index 3feec5af4e67..6cbdff26bb96 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/pgtable.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/pgtable.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/pgtable.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/pgtable.c</a></div><div class='hunk'>@@ -445,6 +445,26 @@ int pmdp_set_access_flags(struct vm_area_struct *vma,</div><div class='ctx'> </div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int pudp_set_access_flags(struct vm_area_struct *vma, unsigned long address,</div><div class='add'>+			  pud_t *pudp, pud_t entry, int dirty)</div><div class='add'>+{</div><div class='add'>+	int changed = !pud_same(*pudp, entry);</div><div class='add'>+</div><div class='add'>+	VM_BUG_ON(address &amp; ~HPAGE_PUD_MASK);</div><div class='add'>+</div><div class='add'>+	if (changed &amp;&amp; dirty) {</div><div class='add'>+		*pudp = entry;</div><div class='add'>+		/*</div><div class='add'>+		 * We had a write-protection fault here and changed the pud</div><div class='add'>+		 * to to more permissive. No need to flush the TLB for that,</div><div class='add'>+		 * #PF is architecturally guaranteed to do that and in the</div><div class='add'>+		 * worst-case we'll generate a spurious fault.</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int ptep_test_and_clear_young(struct vm_area_struct *vma,</div><div class='hunk'>@@ -474,6 +494,17 @@ int pmdp_test_and_clear_young(struct vm_area_struct *vma,</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+int pudp_test_and_clear_young(struct vm_area_struct *vma,</div><div class='add'>+			      unsigned long addr, pud_t *pudp)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (pud_young(*pudp))</div><div class='add'>+		ret = test_and_clear_bit(_PAGE_BIT_ACCESSED,</div><div class='add'>+					 (unsigned long *)pudp);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int ptep_clear_flush_young(struct vm_area_struct *vma,</div><div class='head'>diff --git a/arch/x86/mm/pkeys.c b/arch/x86/mm/pkeys.c<br/>index f88ce0e5efd9..2dab69a706ec 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/mm/pkeys.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/mm/pkeys.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/mm/pkeys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/mm/pkeys.c</a></div><div class='hunk'>@@ -141,8 +141,7 @@ u32 init_pkru_value = PKRU_AD_KEY( 1) | PKRU_AD_KEY( 2) | PKRU_AD_KEY( 3) |</div><div class='ctx'>  * Called from the FPU code when creating a fresh set of FPU</div><div class='ctx'>  * registers.  This is called from a very specific context where</div><div class='ctx'>  * we know the FPU regstiers are safe for use and we can use PKRU</div><div class='del'>- * directly.  The fact that PKRU is only available when we are</div><div class='del'>- * using eagerfpu mode makes this possible.</div><div class='add'>+ * directly.</div><div class='ctx'>  */</div><div class='ctx'> void copy_init_pkru_to_fpregs(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c<br/>index fe04a04dab8e..32322ce9b405 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/net/bpf_jit_comp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/net/bpf_jit_comp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/net/bpf_jit_comp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/net/bpf_jit_comp.c</a></div><div class='hunk'>@@ -853,7 +853,7 @@ xadd:			if (is_imm8(insn-&gt;off))</div><div class='ctx'> 			func = (u8 *) __bpf_call_base + imm32;</div><div class='ctx'> 			jmp_offset = func - (image + addrs[i]);</div><div class='ctx'> 			if (seen_ld_abs) {</div><div class='del'>-				reload_skb_data = bpf_helper_changes_skb_data(func);</div><div class='add'>+				reload_skb_data = bpf_helper_changes_pkt_data(func);</div><div class='ctx'> 				if (reload_skb_data) {</div><div class='ctx'> 					EMIT1(0x57); /* push %rdi */</div><div class='ctx'> 					jmp_offset += 22; /* pop, mov, sub, mov */</div><div class='hunk'>@@ -1067,13 +1067,13 @@ common_load:</div><div class='ctx'> </div><div class='ctx'> 		ilen = prog - temp;</div><div class='ctx'> 		if (ilen &gt; BPF_MAX_INSN_SIZE) {</div><div class='del'>-			pr_err("bpf_jit_compile fatal insn size error\n");</div><div class='add'>+			pr_err("bpf_jit: fatal insn size error\n");</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (image) {</div><div class='ctx'> 			if (unlikely(proglen + ilen &gt; oldproglen)) {</div><div class='del'>-				pr_err("bpf_jit_compile fatal error\n");</div><div class='add'>+				pr_err("bpf_jit: fatal error\n");</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			}</div><div class='ctx'> 			memcpy(image + proglen, temp, ilen);</div><div class='hunk'>@@ -1085,10 +1085,6 @@ common_load:</div><div class='ctx'> 	return proglen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bpf_jit_compile(struct bpf_prog *prog)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_binary_header *header = NULL;</div><div class='hunk'>@@ -1169,9 +1165,11 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)</div><div class='ctx'> </div><div class='ctx'> 	if (image) {</div><div class='ctx'> 		bpf_flush_icache(header, image + proglen);</div><div class='del'>-		set_memory_ro((unsigned long)header, header-&gt;pages);</div><div class='add'>+		bpf_jit_binary_lock_ro(header);</div><div class='ctx'> 		prog-&gt;bpf_func = (void *)image;</div><div class='ctx'> 		prog-&gt;jited = 1;</div><div class='add'>+	} else {</div><div class='add'>+		prog = orig_prog;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_addrs:</div><div class='hunk'>@@ -1182,18 +1180,3 @@ out:</div><div class='ctx'> 					   tmp : orig_prog);</div><div class='ctx'> 	return prog;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void bpf_jit_free(struct bpf_prog *fp)</div><div class='del'>-{</div><div class='del'>-	unsigned long addr = (unsigned long)fp-&gt;bpf_func &amp; PAGE_MASK;</div><div class='del'>-	struct bpf_binary_header *header = (void *)addr;</div><div class='del'>-</div><div class='del'>-	if (!fp-&gt;jited)</div><div class='del'>-		goto free_filter;</div><div class='del'>-</div><div class='del'>-	set_memory_rw(addr, header-&gt;pages);</div><div class='del'>-	bpf_jit_binary_free(header);</div><div class='del'>-</div><div class='del'>-free_filter:</div><div class='del'>-	bpf_prog_unlock_free(fp);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c<br/>index 28c04123b6dd..ffdbc4836b4f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/oprofile/nmi_int.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/oprofile/nmi_int.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/oprofile/nmi_int.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/oprofile/nmi_int.c</a></div><div class='hunk'>@@ -339,10 +339,11 @@ fail:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nmi_cpu_setup(void *dummy)</div><div class='add'>+static void nmi_cpu_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> 	struct op_msrs *msrs = &amp;per_cpu(cpu_msrs, cpu);</div><div class='add'>+</div><div class='ctx'> 	nmi_cpu_save_registers(msrs);</div><div class='ctx'> 	raw_spin_lock(&amp;oprofilefs_lock);</div><div class='ctx'> 	model-&gt;setup_ctrs(model, msrs);</div><div class='hunk'>@@ -369,7 +370,7 @@ static void nmi_cpu_restore_registers(struct op_msrs *msrs)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nmi_cpu_shutdown(void *dummy)</div><div class='add'>+static void nmi_cpu_shutdown(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int v;</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='hunk'>@@ -387,20 +388,26 @@ static void nmi_cpu_shutdown(void *dummy)</div><div class='ctx'> 	nmi_cpu_restore_registers(msrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nmi_cpu_up(void *dummy)</div><div class='add'>+static int nmi_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='add'>+	local_irq_disable();</div><div class='ctx'> 	if (nmi_enabled)</div><div class='del'>-		nmi_cpu_setup(dummy);</div><div class='add'>+		nmi_cpu_setup();</div><div class='ctx'> 	if (ctr_running)</div><div class='del'>-		nmi_cpu_start(dummy);</div><div class='add'>+		nmi_cpu_start(NULL);</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nmi_cpu_down(void *dummy)</div><div class='add'>+static int nmi_cpu_down_prep(unsigned int cpu)</div><div class='ctx'> {</div><div class='add'>+	local_irq_disable();</div><div class='ctx'> 	if (ctr_running)</div><div class='del'>-		nmi_cpu_stop(dummy);</div><div class='add'>+		nmi_cpu_stop(NULL);</div><div class='ctx'> 	if (nmi_enabled)</div><div class='del'>-		nmi_cpu_shutdown(dummy);</div><div class='add'>+		nmi_cpu_shutdown();</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nmi_create_files(struct dentry *root)</div><div class='hunk'>@@ -433,26 +440,7 @@ static int nmi_create_files(struct dentry *root)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int oprofile_cpu_notifier(struct notifier_block *b, unsigned long action,</div><div class='del'>-				 void *data)</div><div class='del'>-{</div><div class='del'>-	int cpu = (unsigned long)data;</div><div class='del'>-</div><div class='del'>-	switch (action &amp; ~CPU_TASKS_FROZEN) {</div><div class='del'>-	case CPU_DOWN_FAILED:</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-		smp_call_function_single(cpu, nmi_cpu_up, NULL, 0);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DOWN_PREPARE:</div><div class='del'>-		smp_call_function_single(cpu, nmi_cpu_down, NULL, 1);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block oprofile_cpu_nb = {</div><div class='del'>-	.notifier_call = oprofile_cpu_notifier</div><div class='del'>-};</div><div class='add'>+static enum cpuhp_state cpuhp_nmi_online;</div><div class='ctx'> </div><div class='ctx'> static int nmi_setup(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -495,20 +483,17 @@ static int nmi_setup(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='del'>-	/* Use get/put_online_cpus() to protect 'nmi_enabled' */</div><div class='del'>-	get_online_cpus();</div><div class='ctx'> 	nmi_enabled = 1;</div><div class='ctx'> 	/* make nmi_enabled visible to the nmi handler: */</div><div class='ctx'> 	smp_mb();</div><div class='del'>-	on_each_cpu(nmi_cpu_setup, NULL, 1);</div><div class='del'>-	__register_cpu_notifier(&amp;oprofile_cpu_nb);</div><div class='del'>-	put_online_cpus();</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-</div><div class='add'>+	err = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/oprofile:online",</div><div class='add'>+				nmi_cpu_online, nmi_cpu_down_prep);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto fail_nmi;</div><div class='add'>+	cpuhp_nmi_online = err;</div><div class='ctx'> 	return 0;</div><div class='add'>+fail_nmi:</div><div class='add'>+	unregister_nmi_handler(NMI_LOCAL, "oprofile");</div><div class='ctx'> fail:</div><div class='ctx'> 	free_msrs();</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -518,17 +503,9 @@ static void nmi_shutdown(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct op_msrs *msrs;</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='del'>-	/* Use get/put_online_cpus() to protect 'nmi_enabled' &amp; 'ctr_running' */</div><div class='del'>-	get_online_cpus();</div><div class='del'>-	on_each_cpu(nmi_cpu_shutdown, NULL, 1);</div><div class='add'>+	cpuhp_remove_state(cpuhp_nmi_online);</div><div class='ctx'> 	nmi_enabled = 0;</div><div class='ctx'> 	ctr_running = 0;</div><div class='del'>-	__unregister_cpu_notifier(&amp;oprofile_cpu_nb);</div><div class='del'>-	put_online_cpus();</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_done();</div><div class='ctx'> </div><div class='ctx'> 	/* make variables visible to the nmi handler: */</div><div class='ctx'> 	smp_mb();</div><div class='head'>diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c<br/>index 3cd69832d7f4..3961103e9176 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/pci/acpi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/pci/acpi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/pci/acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/pci/acpi.c</a></div><div class='hunk'>@@ -114,6 +114,16 @@ static const struct dmi_system_id pci_crs_quirks[] __initconst = {</div><div class='ctx'> 			DMI_MATCH(DMI_BIOS_VERSION, "6JET85WW (1.43 )"),</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	/* https://bugzilla.kernel.org/show_bug.cgi?id=42606 */</div><div class='add'>+	{</div><div class='add'>+		.callback = set_nouse_crs,</div><div class='add'>+		.ident = "Supermicro X8DTH",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Supermicro"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "X8DTH-i/6/iF/6F"),</div><div class='add'>+			DMI_MATCH(DMI_BIOS_VERSION, "2.0a"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> </div><div class='ctx'> 	/* https://bugzilla.kernel.org/show_bug.cgi?id=15362 */</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c<br/>index c20d2cc7ef64..ae387e5ee6f7 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/pci/amd_bus.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/pci/amd_bus.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/pci/amd_bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/pci/amd_bus.c</a></div><div class='hunk'>@@ -327,35 +327,18 @@ static int __init early_root_info_init(void)</div><div class='ctx'> </div><div class='ctx'> #define ENABLE_CF8_EXT_CFG      (1ULL &lt;&lt; 46)</div><div class='ctx'> </div><div class='del'>-static void enable_pci_io_ecs(void *unused)</div><div class='add'>+static int amd_bus_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	u64 reg;</div><div class='add'>+</div><div class='ctx'> 	rdmsrl(MSR_AMD64_NB_CFG, reg);</div><div class='ctx'> 	if (!(reg &amp; ENABLE_CF8_EXT_CFG)) {</div><div class='ctx'> 		reg |= ENABLE_CF8_EXT_CFG;</div><div class='ctx'> 		wrmsrl(MSR_AMD64_NB_CFG, reg);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int amd_cpu_notify(struct notifier_block *self, unsigned long action,</div><div class='del'>-			  void *hcpu)</div><div class='del'>-{</div><div class='del'>-	int cpu = (long)hcpu;</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-	case CPU_ONLINE_FROZEN:</div><div class='del'>-		smp_call_function_single(cpu, enable_pci_io_ecs, NULL, 0);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return NOTIFY_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block amd_cpu_notifier = {</div><div class='del'>-	.notifier_call	= amd_cpu_notify,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void __init pci_enable_pci_io_ecs(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_AMD_NB</div><div class='hunk'>@@ -385,7 +368,7 @@ static void __init pci_enable_pci_io_ecs(void)</div><div class='ctx'> </div><div class='ctx'> static int __init pci_io_ecs_init(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* assume all cpus from fam10h have IO ECS */</div><div class='ctx'> 	if (boot_cpu_data.x86 &lt; 0x10)</div><div class='hunk'>@@ -395,12 +378,9 @@ static int __init pci_io_ecs_init(void)</div><div class='ctx'> 	if (early_pci_allowed())</div><div class='ctx'> 		pci_enable_pci_io_ecs();</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-	for_each_online_cpu(cpu)</div><div class='del'>-		amd_cpu_notify(&amp;amd_cpu_notifier, (unsigned long)CPU_ONLINE,</div><div class='del'>-			       (void *)(long)cpu);</div><div class='del'>-	__register_cpu_notifier(&amp;amd_cpu_notifier);</div><div class='del'>-	cpu_notifier_register_done();</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "pci/amd_bus:online",</div><div class='add'>+				amd_bus_cpu_online, NULL);</div><div class='add'>+	WARN_ON(ret &lt; 0);</div><div class='ctx'> </div><div class='ctx'> 	pci_probe |= PCI_HAS_IO_ECS;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c<br/>index a4fdfa7dcc1b..0cb52ae0a8f0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/pci/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/pci/common.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/pci/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/pci/common.c</a></div><div class='hunk'>@@ -667,7 +667,7 @@ static void set_dma_domain_ops(struct pci_dev *pdev)</div><div class='ctx'> 	spin_lock(&amp;dma_domain_list_lock);</div><div class='ctx'> 	list_for_each_entry(domain, &amp;dma_domain_list, node) {</div><div class='ctx'> 		if (pci_domain_nr(pdev-&gt;bus) == domain-&gt;domain_nr) {</div><div class='del'>-			pdev-&gt;dev.archdata.dma_ops = domain-&gt;dma_ops;</div><div class='add'>+			pdev-&gt;dev.dma_ops = domain-&gt;dma_ops;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c<br/>index 052c1cb76305..ec008e800b45 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/pci/sta2x11-fixup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/pci/sta2x11-fixup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/pci/sta2x11-fixup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/pci/sta2x11-fixup.c</a></div><div class='hunk'>@@ -179,7 +179,7 @@ static void *sta2x11_swiotlb_alloc_coherent(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* We have our own dma_ops: the same as swiotlb but from alloc (above) */</div><div class='del'>-static struct dma_map_ops sta2x11_dma_ops = {</div><div class='add'>+static const struct dma_map_ops sta2x11_dma_ops = {</div><div class='ctx'> 	.alloc = sta2x11_swiotlb_alloc_coherent,</div><div class='ctx'> 	.free = x86_swiotlb_free_coherent,</div><div class='ctx'> 	.map_page = swiotlb_map_page,</div><div class='hunk'>@@ -203,7 +203,7 @@ static void sta2x11_setup_pdev(struct pci_dev *pdev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	pci_set_consistent_dma_mask(pdev, STA2X11_AMBA_SIZE - 1);</div><div class='ctx'> 	pci_set_dma_mask(pdev, STA2X11_AMBA_SIZE - 1);</div><div class='del'>-	pdev-&gt;dev.archdata.dma_ops = &amp;sta2x11_dma_ops;</div><div class='add'>+	pdev-&gt;dev.dma_ops = &amp;sta2x11_dma_ops;</div><div class='ctx'> </div><div class='ctx'> 	/* We must enable all devices as master, for audio DMA to work */</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='hunk'>@@ -223,7 +223,7 @@ bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct sta2x11_mapping *map;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;archdata.dma_ops != &amp;sta2x11_dma_ops) {</div><div class='add'>+	if (dev-&gt;dma_ops != &amp;sta2x11_dma_ops) {</div><div class='ctx'> 		if (!dev-&gt;dma_mask)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		return addr + size - 1 &lt;= *dev-&gt;dma_mask;</div><div class='hunk'>@@ -247,7 +247,7 @@ bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)</div><div class='ctx'>  */</div><div class='ctx'> dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)</div><div class='ctx'> {</div><div class='del'>-	if (dev-&gt;archdata.dma_ops != &amp;sta2x11_dma_ops)</div><div class='add'>+	if (dev-&gt;dma_ops != &amp;sta2x11_dma_ops)</div><div class='ctx'> 		return paddr;</div><div class='ctx'> 	return p2a(paddr, to_pci_dev(dev));</div><div class='ctx'> }</div><div class='hunk'>@@ -259,7 +259,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)</div><div class='ctx'>  */</div><div class='ctx'> phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)</div><div class='ctx'> {</div><div class='del'>-	if (dev-&gt;archdata.dma_ops != &amp;sta2x11_dma_ops)</div><div class='add'>+	if (dev-&gt;dma_ops != &amp;sta2x11_dma_ops)</div><div class='ctx'> 		return daddr;</div><div class='ctx'> 	return a2p(daddr, to_pci_dev(dev));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c<br/>index bedfab98077a..e1fb269c87af 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/pci/xen.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/pci/xen.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/pci/xen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/pci/xen.c</a></div><div class='hunk'>@@ -264,8 +264,8 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	dev_err(&amp;dev-&gt;dev,</div><div class='del'>-		"Xen PCI frontend has not registered MSI/MSI-X support!\n");</div><div class='add'>+	dev_err(&amp;dev-&gt;dev, "Failed to create MSI%s! ret=%d!\n",</div><div class='add'>+		type == PCI_CAP_ID_MSI ? "" : "-X", irq);</div><div class='ctx'> 	return irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile<br/>index 3c3c19ea94df..184842ef332e 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/Makefile</a></div><div class='hunk'>@@ -8,7 +8,6 @@ obj-y	+= iris/</div><div class='ctx'> obj-y	+= intel/</div><div class='ctx'> obj-y	+= intel-mid/</div><div class='ctx'> obj-y	+= intel-quark/</div><div class='del'>-obj-y	+= mellanox/</div><div class='ctx'> obj-y	+= olpc/</div><div class='ctx'> obj-y	+= scx200/</div><div class='ctx'> obj-y	+= sfi/</div><div class='head'>diff --git a/arch/x86/platform/atom/Makefile b/arch/x86/platform/atom/Makefile<br/>index 40983f5b0858..57be88fa34bb 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/atom/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/atom/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/atom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/atom/Makefile</a></div><div class='hunk'>@@ -1,2 +1 @@</div><div class='del'>-obj-$(CONFIG_PMC_ATOM)		+= pmc_atom.o</div><div class='ctx'> obj-$(CONFIG_PUNIT_ATOM_DEBUG)	+= punit_atom_debug.o</div><div class='head'>diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c<br/>index b27bccd4390f..ce4b06733c09 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/ce4100/ce4100.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/ce4100/ce4100.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/ce4100/ce4100.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/ce4100/ce4100.c</a></div><div class='hunk'>@@ -23,11 +23,6 @@</div><div class='ctx'> #include &lt;asm/io_apic.h&gt;</div><div class='ctx'> #include &lt;asm/emergency-restart.h&gt;</div><div class='ctx'> </div><div class='del'>-static int ce4100_i8042_detect(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The CE4100 platform has an internal 8051 Microcontroller which is</div><div class='ctx'>  * responsible for signaling to the external Power Management Unit the</div><div class='hunk'>@@ -89,7 +84,7 @@ static void ce4100_mem_serial_out(struct uart_port *p, int offset, int value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ce4100_serial_fixup(int port, struct uart_port *up,</div><div class='del'>-	unsigned short *capabilites)</div><div class='add'>+	u32 *capabilites)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_EARLY_PRINTK</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -145,7 +140,6 @@ static void sdv_pci_init(void)</div><div class='ctx'> void __init x86_ce4100_early_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	x86_init.oem.arch_setup = sdv_arch_setup;</div><div class='del'>-	x86_platform.i8042_detect = ce4100_i8042_detect;</div><div class='ctx'> 	x86_init.resources.probe_roms = x86_init_noop;</div><div class='ctx'> 	x86_init.mpparse.get_smp_config = x86_init_uint_noop;</div><div class='ctx'> 	x86_init.mpparse.find_smp_config = x86_init_noop;</div><div class='head'>diff --git a/arch/x86/platform/efi/efi-bgrt.c b/arch/x86/platform/efi/efi-bgrt.c<br/>index 6aad870e8962..04ca8764f0c0 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/efi/efi-bgrt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/efi/efi-bgrt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/efi/efi-bgrt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/efi/efi-bgrt.c</a></div><div class='hunk'>@@ -19,8 +19,7 @@</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> #include &lt;linux/efi-bgrt.h&gt;</div><div class='ctx'> </div><div class='del'>-struct acpi_table_bgrt *bgrt_tab;</div><div class='del'>-void *__initdata bgrt_image;</div><div class='add'>+struct acpi_table_bgrt bgrt_tab;</div><div class='ctx'> size_t __initdata bgrt_image_size;</div><div class='ctx'> </div><div class='ctx'> struct bmp_header {</div><div class='hunk'>@@ -28,66 +27,58 @@ struct bmp_header {</div><div class='ctx'> 	u32 size;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-void __init efi_bgrt_init(void)</div><div class='add'>+void __init efi_bgrt_init(struct acpi_table_header *table)</div><div class='ctx'> {</div><div class='del'>-	acpi_status status;</div><div class='ctx'> 	void *image;</div><div class='ctx'> 	struct bmp_header bmp_header;</div><div class='add'>+	struct acpi_table_bgrt *bgrt = &amp;bgrt_tab;</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	status = acpi_get_table("BGRT", 0,</div><div class='del'>-	                        (struct acpi_table_header **)&amp;bgrt_tab);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (bgrt_tab-&gt;header.length &lt; sizeof(*bgrt_tab)) {</div><div class='add'>+	if (table-&gt;length &lt; sizeof(bgrt_tab)) {</div><div class='ctx'> 		pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n",</div><div class='del'>-		       bgrt_tab-&gt;header.length, sizeof(*bgrt_tab));</div><div class='add'>+		       table-&gt;length, sizeof(bgrt_tab));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (bgrt_tab-&gt;version != 1) {</div><div class='add'>+	*bgrt = *(struct acpi_table_bgrt *)table;</div><div class='add'>+	if (bgrt-&gt;version != 1) {</div><div class='ctx'> 		pr_notice("Ignoring BGRT: invalid version %u (expected 1)\n",</div><div class='del'>-		       bgrt_tab-&gt;version);</div><div class='del'>-		return;</div><div class='add'>+		       bgrt-&gt;version);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (bgrt_tab-&gt;status &amp; 0xfe) {</div><div class='add'>+	if (bgrt-&gt;status &amp; 0xfe) {</div><div class='ctx'> 		pr_notice("Ignoring BGRT: reserved status bits are non-zero %u\n",</div><div class='del'>-		       bgrt_tab-&gt;status);</div><div class='del'>-		return;</div><div class='add'>+		       bgrt-&gt;status);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (bgrt_tab-&gt;image_type != 0) {</div><div class='add'>+	if (bgrt-&gt;image_type != 0) {</div><div class='ctx'> 		pr_notice("Ignoring BGRT: invalid image type %u (expected 0)\n",</div><div class='del'>-		       bgrt_tab-&gt;image_type);</div><div class='del'>-		return;</div><div class='add'>+		       bgrt-&gt;image_type);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (!bgrt_tab-&gt;image_address) {</div><div class='add'>+	if (!bgrt-&gt;image_address) {</div><div class='ctx'> 		pr_notice("Ignoring BGRT: null image address\n");</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	image = memremap(bgrt_tab-&gt;image_address, sizeof(bmp_header), MEMREMAP_WB);</div><div class='add'>+	image = early_memremap(bgrt-&gt;image_address, sizeof(bmp_header));</div><div class='ctx'> 	if (!image) {</div><div class='ctx'> 		pr_notice("Ignoring BGRT: failed to map image header memory\n");</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;bmp_header, image, sizeof(bmp_header));</div><div class='del'>-	memunmap(image);</div><div class='add'>+	early_memunmap(image, sizeof(bmp_header));</div><div class='ctx'> 	if (bmp_header.id != 0x4d42) {</div><div class='ctx'> 		pr_notice("Ignoring BGRT: Incorrect BMP magic number 0x%x (expected 0x4d42)\n",</div><div class='ctx'> 			bmp_header.id);</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	bgrt_image_size = bmp_header.size;</div><div class='add'>+	efi_mem_reserve(bgrt-&gt;image_address, bgrt_image_size);</div><div class='ctx'> </div><div class='del'>-	bgrt_image = memremap(bgrt_tab-&gt;image_address, bmp_header.size, MEMREMAP_WB);</div><div class='del'>-	if (!bgrt_image) {</div><div class='del'>-		pr_notice("Ignoring BGRT: failed to map image memory\n");</div><div class='del'>-		bgrt_image = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	efi_mem_reserve(bgrt_tab-&gt;image_address, bgrt_image_size);</div><div class='add'>+	return;</div><div class='add'>+out:</div><div class='add'>+	memset(bgrt, 0, sizeof(bgrt_tab));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c<br/>index 936a488d6cf6..565dff3c9a12 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/efi/efi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/efi/efi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/efi/efi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/efi/efi.c</a></div><div class='hunk'>@@ -210,6 +210,70 @@ int __init efi_memblock_x86_reserve_range(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define OVERFLOW_ADDR_SHIFT	(64 - EFI_PAGE_SHIFT)</div><div class='add'>+#define OVERFLOW_ADDR_MASK	(U64_MAX &lt;&lt; OVERFLOW_ADDR_SHIFT)</div><div class='add'>+#define U64_HIGH_BIT		(~(U64_MAX &gt;&gt; 1))</div><div class='add'>+</div><div class='add'>+static bool __init efi_memmap_entry_valid(const efi_memory_desc_t *md, int i)</div><div class='add'>+{</div><div class='add'>+	u64 end = (md-&gt;num_pages &lt;&lt; EFI_PAGE_SHIFT) + md-&gt;phys_addr - 1;</div><div class='add'>+	u64 end_hi = 0;</div><div class='add'>+	char buf[64];</div><div class='add'>+</div><div class='add'>+	if (md-&gt;num_pages == 0) {</div><div class='add'>+		end = 0;</div><div class='add'>+	} else if (md-&gt;num_pages &gt; EFI_PAGES_MAX ||</div><div class='add'>+		   EFI_PAGES_MAX - md-&gt;num_pages &lt;</div><div class='add'>+		   (md-&gt;phys_addr &gt;&gt; EFI_PAGE_SHIFT)) {</div><div class='add'>+		end_hi = (md-&gt;num_pages &amp; OVERFLOW_ADDR_MASK)</div><div class='add'>+			&gt;&gt; OVERFLOW_ADDR_SHIFT;</div><div class='add'>+</div><div class='add'>+		if ((md-&gt;phys_addr &amp; U64_HIGH_BIT) &amp;&amp; !(end &amp; U64_HIGH_BIT))</div><div class='add'>+			end_hi += 1;</div><div class='add'>+	} else {</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_warn_once(FW_BUG "Invalid EFI memory map entries:\n");</div><div class='add'>+</div><div class='add'>+	if (end_hi) {</div><div class='add'>+		pr_warn("mem%02u: %s range=[0x%016llx-0x%llx%016llx] (invalid)\n",</div><div class='add'>+			i, efi_md_typeattr_format(buf, sizeof(buf), md),</div><div class='add'>+			md-&gt;phys_addr, end_hi, end);</div><div class='add'>+	} else {</div><div class='add'>+		pr_warn("mem%02u: %s range=[0x%016llx-0x%016llx] (invalid)\n",</div><div class='add'>+			i, efi_md_typeattr_format(buf, sizeof(buf), md),</div><div class='add'>+			md-&gt;phys_addr, end);</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init efi_clean_memmap(void)</div><div class='add'>+{</div><div class='add'>+	efi_memory_desc_t *out = efi.memmap.map;</div><div class='add'>+	const efi_memory_desc_t *in = out;</div><div class='add'>+	const efi_memory_desc_t *end = efi.memmap.map_end;</div><div class='add'>+	int i, n_removal;</div><div class='add'>+</div><div class='add'>+	for (i = n_removal = 0; in &lt; end; i++) {</div><div class='add'>+		if (efi_memmap_entry_valid(in, i)) {</div><div class='add'>+			if (out != in)</div><div class='add'>+				memcpy(out, in, efi.memmap.desc_size);</div><div class='add'>+			out = (void *)out + efi.memmap.desc_size;</div><div class='add'>+		} else {</div><div class='add'>+			n_removal++;</div><div class='add'>+		}</div><div class='add'>+		in = (void *)in + efi.memmap.desc_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (n_removal &gt; 0) {</div><div class='add'>+		u64 size = efi.memmap.nr_map - n_removal;</div><div class='add'>+</div><div class='add'>+		pr_warn("Removing %d invalid memory map entries.\n", n_removal);</div><div class='add'>+		efi_memmap_install(efi.memmap.phys_map, size);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init efi_print_memmap(void)</div><div class='ctx'> {</div><div class='ctx'> 	efi_memory_desc_t *md;</div><div class='hunk'>@@ -472,15 +536,12 @@ void __init efi_init(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	efi_clean_memmap();</div><div class='add'>+</div><div class='ctx'> 	if (efi_enabled(EFI_DBG))</div><div class='ctx'> 		efi_print_memmap();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init efi_late_init(void)</div><div class='del'>-{</div><div class='del'>-	efi_bgrt_init();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init efi_set_executable(efi_memory_desc_t *md, bool executable)</div><div class='ctx'> {</div><div class='ctx'> 	u64 addr, npages;</div><div class='hunk'>@@ -894,6 +955,11 @@ static void __init __efi_enter_virtual_mode(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (efi_enabled(EFI_DBG)) {</div><div class='add'>+		pr_info("EFI runtime memory map:\n");</div><div class='add'>+		efi_print_memmap();</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	BUG_ON(!efi.systab);</div><div class='ctx'> </div><div class='ctx'> 	if (efi_setup_page_tables(pa, 1 &lt;&lt; pg_shift)) {</div><div class='head'>diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c<br/>index 319148bd4b05..a4695da42d77 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/efi/efi_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/efi/efi_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/efi/efi_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/efi/efi_64.c</a></div><div class='hunk'>@@ -269,6 +269,22 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)</div><div class='ctx'> 	efi_scratch.use_pgd = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Certain firmware versions are way too sentimential and still believe</div><div class='add'>+	 * they are exclusive and unquestionable owners of the first physical page,</div><div class='add'>+	 * even though they explicitly mark it as EFI_CONVENTIONAL_MEMORY</div><div class='add'>+	 * (but then write-access it later during SetVirtualAddressMap()).</div><div class='add'>+	 *</div><div class='add'>+	 * Create a 1:1 mapping for this page, to avoid triple faults during early</div><div class='add'>+	 * boot with such firmware. We are free to hand this page to the BIOS,</div><div class='add'>+	 * as trim_bios_range() will reserve the first page and isolate it away</div><div class='add'>+	 * from memory allocators anyway.</div><div class='add'>+	 */</div><div class='add'>+	if (kernel_map_pages_in_pgd(pgd, 0x0, 0x0, 1, _PAGE_RW)) {</div><div class='add'>+		pr_err("Failed to create 1:1 mapping for the first page!\n");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * When making calls to the firmware everything needs to be 1:1</div><div class='ctx'> 	 * mapped and addressable with 32-bit pointers. Map the kernel</div><div class='ctx'> 	 * text and allocate a new stack because we can't rely on the</div><div class='hunk'>@@ -398,10 +414,44 @@ void __init parse_efi_setup(u64 phys_addr, u32 data_len)</div><div class='ctx'> 	efi_setup = phys_addr + sizeof(struct setup_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init efi_runtime_update_mappings(void)</div><div class='add'>+static int __init efi_update_mappings(efi_memory_desc_t *md, unsigned long pf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pfn;</div><div class='ctx'> 	pgd_t *pgd = efi_pgd;</div><div class='add'>+	int err1, err2;</div><div class='add'>+</div><div class='add'>+	/* Update the 1:1 mapping */</div><div class='add'>+	pfn = md-&gt;phys_addr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	err1 = kernel_map_pages_in_pgd(pgd, pfn, md-&gt;phys_addr, md-&gt;num_pages, pf);</div><div class='add'>+	if (err1) {</div><div class='add'>+		pr_err("Error while updating 1:1 mapping PA 0x%llx -&gt; VA 0x%llx!\n",</div><div class='add'>+			   md-&gt;phys_addr, md-&gt;virt_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err2 = kernel_map_pages_in_pgd(pgd, pfn, md-&gt;virt_addr, md-&gt;num_pages, pf);</div><div class='add'>+	if (err2) {</div><div class='add'>+		pr_err("Error while updating VA mapping PA 0x%llx -&gt; VA 0x%llx!\n",</div><div class='add'>+			   md-&gt;phys_addr, md-&gt;virt_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err1 || err2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init efi_update_mem_attr(struct mm_struct *mm, efi_memory_desc_t *md)</div><div class='add'>+{</div><div class='add'>+	unsigned long pf = 0;</div><div class='add'>+</div><div class='add'>+	if (md-&gt;attribute &amp; EFI_MEMORY_XP)</div><div class='add'>+		pf |= _PAGE_NX;</div><div class='add'>+</div><div class='add'>+	if (!(md-&gt;attribute &amp; EFI_MEMORY_RO))</div><div class='add'>+		pf |= _PAGE_RW;</div><div class='add'>+</div><div class='add'>+	return efi_update_mappings(md, pf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init efi_runtime_update_mappings(void)</div><div class='add'>+{</div><div class='ctx'> 	efi_memory_desc_t *md;</div><div class='ctx'> </div><div class='ctx'> 	if (efi_enabled(EFI_OLD_MEMMAP)) {</div><div class='hunk'>@@ -410,6 +460,24 @@ void __init efi_runtime_update_mappings(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Use the EFI Memory Attribute Table for mapping permissions if it</div><div class='add'>+	 * exists, since it is intended to supersede EFI_PROPERTIES_TABLE.</div><div class='add'>+	 */</div><div class='add'>+	if (efi_enabled(EFI_MEM_ATTR)) {</div><div class='add'>+		efi_memattr_apply_permissions(NULL, efi_update_mem_attr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * EFI_MEMORY_ATTRIBUTES_TABLE is intended to replace</div><div class='add'>+	 * EFI_PROPERTIES_TABLE. So, use EFI_PROPERTIES_TABLE to update</div><div class='add'>+	 * permissions only if EFI_MEMORY_ATTRIBUTES_TABLE is not</div><div class='add'>+	 * published by the firmware. Even if we find a buggy implementation of</div><div class='add'>+	 * EFI_MEMORY_ATTRIBUTES_TABLE, don't fall back to</div><div class='add'>+	 * EFI_PROPERTIES_TABLE, because of the same reason.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	if (!efi_enabled(EFI_NX_PE_DATA))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -430,15 +498,7 @@ void __init efi_runtime_update_mappings(void)</div><div class='ctx'> 			(md-&gt;type != EFI_RUNTIME_SERVICES_CODE))</div><div class='ctx'> 			pf |= _PAGE_RW;</div><div class='ctx'> </div><div class='del'>-		/* Update the 1:1 mapping */</div><div class='del'>-		pfn = md-&gt;phys_addr &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		if (kernel_map_pages_in_pgd(pgd, pfn, md-&gt;phys_addr, md-&gt;num_pages, pf))</div><div class='del'>-			pr_warn("Error mapping PA 0x%llx -&gt; VA 0x%llx!\n",</div><div class='del'>-				   md-&gt;phys_addr, md-&gt;virt_addr);</div><div class='del'>-</div><div class='del'>-		if (kernel_map_pages_in_pgd(pgd, pfn, md-&gt;virt_addr, md-&gt;num_pages, pf))</div><div class='del'>-			pr_warn("Error mapping PA 0x%llx -&gt; VA 0x%llx!\n",</div><div class='del'>-				   md-&gt;phys_addr, md-&gt;virt_addr);</div><div class='add'>+		efi_update_mappings(md, pf);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c<br/>index 10aca63a50d7..30031d5293c4 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/efi/quirks.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/efi/quirks.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/efi/quirks.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/efi/quirks.c</a></div><div class='hunk'>@@ -214,7 +214,7 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size)</div><div class='ctx'> </div><div class='ctx'> 	new_size = efi.memmap.desc_size * num_entries;</div><div class='ctx'> </div><div class='del'>-	new_phys = memblock_alloc(new_size, 0);</div><div class='add'>+	new_phys = efi_memmap_alloc(num_entries);</div><div class='ctx'> 	if (!new_phys) {</div><div class='ctx'> 		pr_err("Could not allocate boot services memmap\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -355,7 +355,7 @@ void __init efi_free_boot_services(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	new_size = efi.memmap.desc_size * num_entries;</div><div class='del'>-	new_phys = memblock_alloc(new_size, 0);</div><div class='add'>+	new_phys = efi_memmap_alloc(num_entries);</div><div class='ctx'> 	if (!new_phys) {</div><div class='ctx'> 		pr_err("Failed to allocate new EFI memmap\n");</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/arch/x86/platform/goldfish/goldfish.c b/arch/x86/platform/goldfish/goldfish.c<br/>index 1693107a518e..0d17c0aafeb1 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/goldfish/goldfish.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/goldfish/goldfish.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/goldfish/goldfish.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/goldfish/goldfish.c</a></div><div class='hunk'>@@ -42,10 +42,22 @@ static struct resource goldfish_pdev_bus_resources[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static bool goldfish_enable __initdata;</div><div class='add'>+</div><div class='add'>+static int __init goldfish_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	goldfish_enable = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+__setup("goldfish", goldfish_setup);</div><div class='add'>+</div><div class='ctx'> static int __init goldfish_init(void)</div><div class='ctx'> {</div><div class='add'>+	if (!goldfish_enable)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	platform_device_register_simple("goldfish_pdev_bus", -1,</div><div class='del'>-						goldfish_pdev_bus_resources, 2);</div><div class='add'>+					goldfish_pdev_bus_resources, 2);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> device_initcall(goldfish_init);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/Makefile b/arch/x86/platform/intel-mid/device_libs/Makefile<br/>index dd6cfa4ad3ac..a7dbec4dce27 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/Makefile</a></div><div class='hunk'>@@ -5,21 +5,19 @@ obj-$(subst m,y,$(CONFIG_MMC_SDHCI_PCI)) += platform_mrfld_sd.o</div><div class='ctx'> # WiFi</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_BRCMFMAC_SDIO)) += platform_bcm43xx.o</div><div class='ctx'> # IPC Devices</div><div class='del'>-obj-y += platform_ipc.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_SND_MFLD_MACHINE)) += platform_msic_audio.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_GPIO_MSIC)) += platform_msic_gpio.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic_ocd.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic_battery.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o</div><div class='del'>-obj-$(subst m,y,$(CONFIG_GPIO_INTEL_PMIC)) += platform_pmic_gpio.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o</div><div class='ctx'> # SPI Devices</div><div class='del'>-obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_spidev.o</div><div class='add'>+obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_mrfld_spidev.o</div><div class='ctx'> # I2C Devices</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_SENSORS_EMC1403)) += platform_emc1403.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_SENSORS_LIS3LV02D)) += platform_lis331.o</div><div class='del'>-obj-$(subst m,y,$(CONFIG_INPUT_MPU3050)) += platform_mpu3050.o</div><div class='add'>+obj-$(subst m,y,$(CONFIG_MPU3050_I2C)) += platform_mpu3050.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_INPUT_BMA150)) += platform_bma023.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_DRM_MEDFIELD)) += platform_tc35876x.o</div><div class='ctx'> # I2C GPIO Expanders</div><div class='hunk'>@@ -28,4 +26,5 @@ obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_pcal9555a.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o</div><div class='ctx'> # MISC Devices</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o</div><div class='add'>+obj-$(subst m,y,$(CONFIG_RTC_DRV_CMOS)) += platform_mrfld_rtc.o</div><div class='ctx'> obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_mrfld_wdt.o</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c b/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c<br/>index 52534ec29765..74283875c7e8 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c</a></div><div class='hunk'>@@ -32,6 +32,9 @@ static struct gpio_keys_button gpio_button[] = {</div><div class='ctx'> 	{SW_LID,		-1, 1, "lid_switch",	EV_SW,  0, 20},</div><div class='ctx'> 	{KEY_VOLUMEUP,		-1, 1, "vol_up",	EV_KEY, 0, 20},</div><div class='ctx'> 	{KEY_VOLUMEDOWN,	-1, 1, "vol_down",	EV_KEY, 0, 20},</div><div class='add'>+	{KEY_MUTE,		-1, 1, "mute_enable",	EV_KEY, 0, 20},</div><div class='add'>+	{KEY_VOLUMEUP,		-1, 1, "volume_up",	EV_KEY, 0, 20},</div><div class='add'>+	{KEY_VOLUMEDOWN,	-1, 1, "volume_down",	EV_KEY, 0, 20},</div><div class='ctx'> 	{KEY_CAMERA,		-1, 1, "camera_full",	EV_KEY, 0, 20},</div><div class='ctx'> 	{KEY_CAMERA_FOCUS,	-1, 1, "camera_half",	EV_KEY, 0, 20},</div><div class='ctx'> 	{SW_KEYPAD_SLIDE,	-1, 1, "MagSw1",	EV_SW,  0, 20},</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_ipc.c b/arch/x86/platform/intel-mid/device_libs/platform_ipc.c<br/>deleted file mode 100644<br/>index a84b73d6c4a0..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_ipc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_ipc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * platform_ipc.c: IPC platform library file</div><div class='del'>- *</div><div class='del'>- * (C) Copyright 2013 Intel Corporation</div><div class='del'>- * Author: Sathyanarayanan Kuppuswamy &lt;sathyanarayanan.kuppuswamy@intel.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; version 2</div><div class='del'>- * of the License.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sfi.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;asm/intel-mid.h&gt;</div><div class='del'>-#include "platform_ipc.h"</div><div class='del'>-</div><div class='del'>-void __init ipc_device_handler(struct sfi_device_table_entry *pentry,</div><div class='del'>-				struct devs_id *dev)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-	void *pdata = NULL;</div><div class='del'>-	static struct resource res __initdata = {</div><div class='del'>-		.name = "IRQ",</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pr_debug("IPC bus, name = %16.16s, irq = 0x%2x\n",</div><div class='del'>-		pentry-&gt;name, pentry-&gt;irq);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We need to call platform init of IPC devices to fill misc_pdata</div><div class='del'>-	 * structure. It will be used in msic_init for initialization.</div><div class='del'>-	 */</div><div class='del'>-	if (dev != NULL)</div><div class='del'>-		pdata = dev-&gt;get_platform_data(pentry);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * On Medfield the platform device creation is handled by the MSIC</div><div class='del'>-	 * MFD driver so we don't need to do it here.</div><div class='del'>-	 */</div><div class='del'>-	if (intel_mid_has_msic())</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pdev = platform_device_alloc(pentry-&gt;name, 0);</div><div class='del'>-	if (pdev == NULL) {</div><div class='del'>-		pr_err("out of memory for SFI platform device '%s'.\n",</div><div class='del'>-			pentry-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	res.start = pentry-&gt;irq;</div><div class='del'>-	platform_device_add_resources(pdev, &amp;res, 1);</div><div class='del'>-</div><div class='del'>-	pdev-&gt;dev.platform_data = pdata;</div><div class='del'>-	intel_scu_device_register(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct devs_id pmic_audio_dev_id __initconst = {</div><div class='del'>-	.name = "pmic_audio",</div><div class='del'>-	.type = SFI_DEV_TYPE_IPC,</div><div class='del'>-	.delay = 1,</div><div class='del'>-	.device_handler = &amp;ipc_device_handler,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-sfi_device(pmic_audio_dev_id);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_ipc.h b/arch/x86/platform/intel-mid/device_libs/platform_ipc.h<br/>deleted file mode 100644<br/>index 79bb09d4f718..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_ipc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_ipc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * platform_ipc.h: IPC platform library header file</div><div class='del'>- *</div><div class='del'>- * (C) Copyright 2013 Intel Corporation</div><div class='del'>- * Author: Sathyanarayanan Kuppuswamy &lt;sathyanarayanan.kuppuswamy@intel.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; version 2</div><div class='del'>- * of the License.</div><div class='del'>- */</div><div class='del'>-#ifndef _PLATFORM_IPC_H_</div><div class='del'>-#define _PLATFORM_IPC_H_</div><div class='del'>-</div><div class='del'>-void __init</div><div class='del'>-ipc_device_handler(struct sfi_device_table_entry *pentry, struct devs_id *dev);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_mrfld_rtc.c b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_rtc.c<br/>new file mode 100644<br/>index 000000000000..3135416df037<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_mrfld_rtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_mrfld_rtc.c</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/*</div><div class='add'>+ * Intel Merrifield legacy RTC initialization file</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright 2017 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Author: Andy Shevchenko &lt;andriy.shevchenko@linux.intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; version 2</div><div class='add'>+ * of the License.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hw_irq.h&gt;</div><div class='add'>+#include &lt;asm/intel-mid.h&gt;</div><div class='add'>+#include &lt;asm/io_apic.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/x86_init.h&gt;</div><div class='add'>+</div><div class='add'>+static int __init mrfld_legacy_rtc_alloc_irq(void)</div><div class='add'>+{</div><div class='add'>+	struct irq_alloc_info info;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!x86_platform.legacy.rtc)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ioapic_set_alloc_attr(&amp;info, NUMA_NO_NODE, 1, 0);</div><div class='add'>+	ret = mp_map_gsi_to_irq(RTC_IRQ, IOAPIC_MAP_ALLOC, &amp;info);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_info("Failed to allocate RTC interrupt. Disabling RTC\n");</div><div class='add'>+		x86_platform.legacy.rtc = 0;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init mrfld_legacy_rtc_init(void)</div><div class='add'>+{</div><div class='add'>+	if (intel_mid_identify_cpu() != INTEL_MID_CPU_CHIP_TANGIER)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return mrfld_legacy_rtc_alloc_irq();</div><div class='add'>+}</div><div class='add'>+arch_initcall(mrfld_legacy_rtc_init);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c<br/>new file mode 100644<br/>index 000000000000..27186ad654c9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/*</div><div class='add'>+ * spidev platform data initilization file</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright 2014, 2016 Intel Corporation</div><div class='add'>+ * Authors: Andy Shevchenko &lt;andriy.shevchenko@linux.intel.com&gt;</div><div class='add'>+ *	    Dan O'Donovan &lt;dan@emutex.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; version 2</div><div class='add'>+ * of the License.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/sfi.h&gt;</div><div class='add'>+#include &lt;linux/spi/pxa2xx_spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/intel-mid.h&gt;</div><div class='add'>+</div><div class='add'>+#define MRFLD_SPI_DEFAULT_DMA_BURST	8</div><div class='add'>+#define MRFLD_SPI_DEFAULT_TIMEOUT	500</div><div class='add'>+</div><div class='add'>+/* GPIO pin for spidev chipselect */</div><div class='add'>+#define MRFLD_SPIDEV_GPIO_CS		111</div><div class='add'>+</div><div class='add'>+static struct pxa2xx_spi_chip spidev_spi_chip = {</div><div class='add'>+	.dma_burst_size		= MRFLD_SPI_DEFAULT_DMA_BURST,</div><div class='add'>+	.timeout		= MRFLD_SPI_DEFAULT_TIMEOUT,</div><div class='add'>+	.gpio_cs		= MRFLD_SPIDEV_GPIO_CS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init *spidev_platform_data(void *info)</div><div class='add'>+{</div><div class='add'>+	struct spi_board_info *spi_info = info;</div><div class='add'>+</div><div class='add'>+	if (intel_mid_identify_cpu() != INTEL_MID_CPU_CHIP_TANGIER)</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	spi_info-&gt;mode = SPI_MODE_0;</div><div class='add'>+	spi_info-&gt;controller_data = &amp;spidev_spi_chip;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devs_id spidev_dev_id __initconst = {</div><div class='add'>+	.name			= "spidev",</div><div class='add'>+	.type			= SFI_DEV_TYPE_SPI,</div><div class='add'>+	.delay			= 0,</div><div class='add'>+	.get_platform_data	= &amp;spidev_platform_data,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+sfi_device(spidev_dev_id);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c<br/>index 3f1f1c77d090..86edd1e941eb 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c</a></div><div class='hunk'>@@ -28,9 +28,9 @@ static struct platform_device wdt_dev = {</div><div class='ctx'> </div><div class='ctx'> static int tangier_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	int gsi;</div><div class='ctx'> 	struct irq_alloc_info info;</div><div class='ctx'> 	struct intel_mid_wdt_pdata *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	int gsi, irq;</div><div class='ctx'> </div><div class='ctx'> 	if (!pdata)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -38,10 +38,10 @@ static int tangier_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* IOAPIC builds identity mapping between GSI and IRQ on MID */</div><div class='ctx'> 	gsi = pdata-&gt;irq;</div><div class='ctx'> 	ioapic_set_alloc_attr(&amp;info, cpu_to_node(0), 1, 0);</div><div class='del'>-	if (mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC, &amp;info) &lt;= 0) {</div><div class='del'>-		dev_warn(&amp;pdev-&gt;dev, "cannot find interrupt %d in ioapic\n",</div><div class='del'>-			 gsi);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC, &amp;info);</div><div class='add'>+	if (irq &lt; 0) {</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev, "cannot find interrupt %d in ioapic\n", gsi);</div><div class='add'>+		return irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -82,4 +82,4 @@ static int __init register_mid_wdt(void)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-rootfs_initcall(register_mid_wdt);</div><div class='add'>+arch_initcall(register_mid_wdt);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c<br/>index cb3490ecb341..d4dc744dd5a5 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #include &lt;asm/intel-mid.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "platform_msic.h"</div><div class='del'>-#include "platform_ipc.h"</div><div class='ctx'> </div><div class='ctx'> static void *msic_audio_platform_data(void *info)</div><div class='ctx'> {</div><div class='hunk'>@@ -40,8 +39,8 @@ static const struct devs_id msic_audio_dev_id __initconst = {</div><div class='ctx'> 	.name = "msic_audio",</div><div class='ctx'> 	.type = SFI_DEV_TYPE_IPC,</div><div class='ctx'> 	.delay = 1,</div><div class='add'>+	.msic = 1,</div><div class='ctx'> 	.get_platform_data = &amp;msic_audio_platform_data,</div><div class='del'>-	.device_handler = &amp;ipc_device_handler,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> sfi_device(msic_audio_dev_id);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c<br/>index 4f72193939a6..5c3e9919633f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;asm/intel-mid.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "platform_msic.h"</div><div class='del'>-#include "platform_ipc.h"</div><div class='ctx'> </div><div class='ctx'> static void __init *msic_battery_platform_data(void *info)</div><div class='ctx'> {</div><div class='hunk'>@@ -30,8 +29,8 @@ static const struct devs_id msic_battery_dev_id __initconst = {</div><div class='ctx'> 	.name = "msic_battery",</div><div class='ctx'> 	.type = SFI_DEV_TYPE_IPC,</div><div class='ctx'> 	.delay = 1,</div><div class='add'>+	.msic = 1,</div><div class='ctx'> 	.get_platform_data = &amp;msic_battery_platform_data,</div><div class='del'>-	.device_handler = &amp;ipc_device_handler,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> sfi_device(msic_battery_dev_id);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c<br/>index 70de5b531ba0..9fdb88d460d7 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #include &lt;asm/intel-mid.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "platform_msic.h"</div><div class='del'>-#include "platform_ipc.h"</div><div class='ctx'> </div><div class='ctx'> static void __init *msic_gpio_platform_data(void *info)</div><div class='ctx'> {</div><div class='hunk'>@@ -41,8 +40,8 @@ static const struct devs_id msic_gpio_dev_id __initconst = {</div><div class='ctx'> 	.name = "msic_gpio",</div><div class='ctx'> 	.type = SFI_DEV_TYPE_IPC,</div><div class='ctx'> 	.delay = 1,</div><div class='add'>+	.msic = 1,</div><div class='ctx'> 	.get_platform_data = &amp;msic_gpio_platform_data,</div><div class='del'>-	.device_handler = &amp;ipc_device_handler,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> sfi_device(msic_gpio_dev_id);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c<br/>index 3d7c2011b6cf..7ae37cdbf256 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #include &lt;asm/intel-mid.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "platform_msic.h"</div><div class='del'>-#include "platform_ipc.h"</div><div class='ctx'> </div><div class='ctx'> static void __init *msic_ocd_platform_data(void *info)</div><div class='ctx'> {</div><div class='hunk'>@@ -42,8 +41,8 @@ static const struct devs_id msic_ocd_dev_id __initconst = {</div><div class='ctx'> 	.name = "msic_ocd",</div><div class='ctx'> 	.type = SFI_DEV_TYPE_IPC,</div><div class='ctx'> 	.delay = 1,</div><div class='add'>+	.msic = 1,</div><div class='ctx'> 	.get_platform_data = &amp;msic_ocd_platform_data,</div><div class='del'>-	.device_handler = &amp;ipc_device_handler,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> sfi_device(msic_ocd_dev_id);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c<br/>index 038f618fbc52..96809b98cf69 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;asm/intel-mid.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "platform_msic.h"</div><div class='del'>-#include "platform_ipc.h"</div><div class='ctx'> </div><div class='ctx'> static void __init *msic_power_btn_platform_data(void *info)</div><div class='ctx'> {</div><div class='hunk'>@@ -29,8 +28,8 @@ static const struct devs_id msic_power_btn_dev_id __initconst = {</div><div class='ctx'> 	.name = "msic_power_btn",</div><div class='ctx'> 	.type = SFI_DEV_TYPE_IPC,</div><div class='ctx'> 	.delay = 1,</div><div class='add'>+	.msic = 1,</div><div class='ctx'> 	.get_platform_data = &amp;msic_power_btn_platform_data,</div><div class='del'>-	.device_handler = &amp;ipc_device_handler,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> sfi_device(msic_power_btn_dev_id);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c<br/>index 114a5755b1e4..3e4167d246cd 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;asm/intel-mid.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "platform_msic.h"</div><div class='del'>-#include "platform_ipc.h"</div><div class='ctx'> </div><div class='ctx'> static void __init *msic_thermal_platform_data(void *info)</div><div class='ctx'> {</div><div class='hunk'>@@ -30,8 +29,8 @@ static const struct devs_id msic_thermal_dev_id __initconst = {</div><div class='ctx'> 	.name = "msic_thermal",</div><div class='ctx'> 	.type = SFI_DEV_TYPE_IPC,</div><div class='ctx'> 	.delay = 1,</div><div class='add'>+	.msic = 1,</div><div class='ctx'> 	.get_platform_data = &amp;msic_thermal_platform_data,</div><div class='del'>-	.device_handler = &amp;ipc_device_handler,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> sfi_device(msic_thermal_dev_id);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c b/arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c<br/>deleted file mode 100644<br/>index e30cb62e3300..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * platform_pmic_gpio.c: PMIC GPIO platform data initialization file</div><div class='del'>- *</div><div class='del'>- * (C) Copyright 2013 Intel Corporation</div><div class='del'>- * Author: Sathyanarayanan Kuppuswamy &lt;sathyanarayanan.kuppuswamy@intel.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; version 2</div><div class='del'>- * of the License.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sfi.h&gt;</div><div class='del'>-#include &lt;linux/intel_pmic_gpio.h&gt;</div><div class='del'>-#include &lt;asm/intel-mid.h&gt;</div><div class='del'>-</div><div class='del'>-#include "platform_ipc.h"</div><div class='del'>-</div><div class='del'>-static void __init *pmic_gpio_platform_data(void *info)</div><div class='del'>-{</div><div class='del'>-	static struct intel_pmic_gpio_platform_data pmic_gpio_pdata;</div><div class='del'>-	int gpio_base = get_gpio_by_name("pmic_gpio_base");</div><div class='del'>-</div><div class='del'>-	if (gpio_base &lt; 0)</div><div class='del'>-		gpio_base = 64;</div><div class='del'>-	pmic_gpio_pdata.gpio_base = gpio_base;</div><div class='del'>-	pmic_gpio_pdata.irq_base = gpio_base + INTEL_MID_IRQ_OFFSET;</div><div class='del'>-	pmic_gpio_pdata.gpiointr = 0xffffeff8;</div><div class='del'>-</div><div class='del'>-	return &amp;pmic_gpio_pdata;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct devs_id pmic_gpio_spi_dev_id __initconst = {</div><div class='del'>-	.name = "pmic_gpio",</div><div class='del'>-	.type = SFI_DEV_TYPE_SPI,</div><div class='del'>-	.delay = 1,</div><div class='del'>-	.get_platform_data = &amp;pmic_gpio_platform_data,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct devs_id pmic_gpio_ipc_dev_id __initconst = {</div><div class='del'>-	.name = "pmic_gpio",</div><div class='del'>-	.type = SFI_DEV_TYPE_IPC,</div><div class='del'>-	.delay = 1,</div><div class='del'>-	.get_platform_data = &amp;pmic_gpio_platform_data,</div><div class='del'>-	.device_handler = &amp;ipc_device_handler</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-sfi_device(pmic_gpio_spi_dev_id);</div><div class='del'>-sfi_device(pmic_gpio_ipc_dev_id);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/device_libs/platform_spidev.c b/arch/x86/platform/intel-mid/device_libs/platform_spidev.c<br/>deleted file mode 100644<br/>index 30c601b399ee..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/device_libs/platform_spidev.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/device_libs/platform_spidev.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * spidev platform data initilization file</div><div class='del'>- *</div><div class='del'>- * (C) Copyright 2014, 2016 Intel Corporation</div><div class='del'>- * Authors: Andy Shevchenko &lt;andriy.shevchenko@linux.intel.com&gt;</div><div class='del'>- *	    Dan O'Donovan &lt;dan@emutex.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; version 2</div><div class='del'>- * of the License.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sfi.h&gt;</div><div class='del'>-#include &lt;linux/spi/pxa2xx_spi.h&gt;</div><div class='del'>-#include &lt;linux/spi/spi.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/intel-mid.h&gt;</div><div class='del'>-</div><div class='del'>-#define MRFLD_SPI_DEFAULT_DMA_BURST	8</div><div class='del'>-#define MRFLD_SPI_DEFAULT_TIMEOUT	500</div><div class='del'>-</div><div class='del'>-/* GPIO pin for spidev chipselect */</div><div class='del'>-#define MRFLD_SPIDEV_GPIO_CS		111</div><div class='del'>-</div><div class='del'>-static struct pxa2xx_spi_chip spidev_spi_chip = {</div><div class='del'>-	.dma_burst_size		= MRFLD_SPI_DEFAULT_DMA_BURST,</div><div class='del'>-	.timeout		= MRFLD_SPI_DEFAULT_TIMEOUT,</div><div class='del'>-	.gpio_cs		= MRFLD_SPIDEV_GPIO_CS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init *spidev_platform_data(void *info)</div><div class='del'>-{</div><div class='del'>-	struct spi_board_info *spi_info = info;</div><div class='del'>-</div><div class='del'>-	spi_info-&gt;mode = SPI_MODE_0;</div><div class='del'>-	spi_info-&gt;controller_data = &amp;spidev_spi_chip;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct devs_id spidev_dev_id __initconst = {</div><div class='del'>-	.name			= "spidev",</div><div class='del'>-	.type			= SFI_DEV_TYPE_SPI,</div><div class='del'>-	.delay			= 0,</div><div class='del'>-	.get_platform_data	= &amp;spidev_platform_data,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-sfi_device(spidev_dev_id);</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c<br/>index 7850128f0026..12a272582cdc 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/intel-mid.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/intel-mid.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/intel-mid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/intel-mid.c</a></div><div class='hunk'>@@ -161,12 +161,6 @@ out:</div><div class='ctx'> 	regulator_has_full_constraints();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* MID systems don't have i8042 controller */</div><div class='del'>-static int intel_mid_i8042_detect(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Moorestown does not have external NMI source nor port 0x61 to report</div><div class='ctx'>  * NMI status. The possible NMI sources are from pmu as a result of NMI</div><div class='hunk'>@@ -197,7 +191,6 @@ void __init x86_intel_mid_early_setup(void)</div><div class='ctx'> 	x86_cpuinit.setup_percpu_clockev = apbt_setup_secondary_clock;</div><div class='ctx'> </div><div class='ctx'> 	x86_platform.calibrate_tsc = intel_mid_calibrate_tsc;</div><div class='del'>-	x86_platform.i8042_detect = intel_mid_i8042_detect;</div><div class='ctx'> 	x86_init.timers.wallclock_init = intel_mid_rtc_init;</div><div class='ctx'> 	x86_platform.get_nmi_reason = intel_mid_get_nmi_reason;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c<br/>index 1eb47b6298c2..e793fe509971 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/mfld.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/mfld.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/mfld.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/mfld.c</a></div><div class='hunk'>@@ -49,8 +49,13 @@ static unsigned long __init mfld_calibrate_tsc(void)</div><div class='ctx'> 	fast_calibrate = ratio * fsb;</div><div class='ctx'> 	pr_debug("read penwell tsc %lu khz\n", fast_calibrate);</div><div class='ctx'> 	lapic_timer_frequency = fsb * 1000 / HZ;</div><div class='del'>-	/* mark tsc clocksource as reliable */</div><div class='del'>-	set_cpu_cap(&amp;boot_cpu_data, X86_FEATURE_TSC_RELIABLE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TSC on Intel Atom SoCs is reliable and of known frequency.</div><div class='add'>+	 * See tsc_msr.c for details.</div><div class='add'>+	 */</div><div class='add'>+	setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ);</div><div class='add'>+	setup_force_cpu_cap(X86_FEATURE_TSC_RELIABLE);</div><div class='ctx'> </div><div class='ctx'> 	return fast_calibrate;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/mrfld.c b/arch/x86/platform/intel-mid/mrfld.c<br/>index 59253db41bbc..ae7bdeb0e507 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/mrfld.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/mrfld.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/mrfld.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/mrfld.c</a></div><div class='hunk'>@@ -78,8 +78,12 @@ static unsigned long __init tangier_calibrate_tsc(void)</div><div class='ctx'> 	pr_debug("Setting lapic_timer_frequency = %d\n",</div><div class='ctx'> 			lapic_timer_frequency);</div><div class='ctx'> </div><div class='del'>-	/* mark tsc clocksource as reliable */</div><div class='del'>-	set_cpu_cap(&amp;boot_cpu_data, X86_FEATURE_TSC_RELIABLE);</div><div class='add'>+	/*</div><div class='add'>+	 * TSC on Intel Atom SoCs is reliable and of known frequency.</div><div class='add'>+	 * See tsc_msr.c for details.</div><div class='add'>+	 */</div><div class='add'>+	setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ);</div><div class='add'>+	setup_force_cpu_cap(X86_FEATURE_TSC_RELIABLE);</div><div class='ctx'> </div><div class='ctx'> 	return fast_calibrate;</div><div class='ctx'> }</div><div class='hunk'>@@ -87,6 +91,7 @@ static unsigned long __init tangier_calibrate_tsc(void)</div><div class='ctx'> static void __init tangier_arch_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	x86_platform.calibrate_tsc = tangier_calibrate_tsc;</div><div class='add'>+	x86_platform.legacy.rtc = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* tangier arch ops */</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/pwr.c b/arch/x86/platform/intel-mid/pwr.c<br/>index 67375dda451c..ef03852ea6e8 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/pwr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/pwr.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/pwr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/pwr.c</a></div><div class='hunk'>@@ -270,7 +270,6 @@ int intel_mid_pci_set_power_state(struct pci_dev *pdev, pci_power_t state)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(intel_mid_pci_set_power_state);</div><div class='ctx'> </div><div class='ctx'> pci_power_t intel_mid_pci_get_power_state(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/platform/intel-mid/sfi.c b/arch/x86/platform/intel-mid/sfi.c<br/>index 051d264fce2e..19b43e3a9f0f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/sfi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-mid/sfi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-mid/sfi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-mid/sfi.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/sfi.h&gt;</div><div class='del'>-#include &lt;linux/intel_pmic_gpio.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -226,7 +225,7 @@ int get_gpio_by_name(const char *name)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init intel_scu_device_register(struct platform_device *pdev)</div><div class='add'>+static void __init intel_scu_ipc_device_register(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (ipc_next_dev == MAX_IPCDEVS)</div><div class='ctx'> 		pr_err("too many SCU IPC devices");</div><div class='hunk'>@@ -335,10 +334,22 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("IPC bus, name = %16.16s, irq = 0x%2x\n",</div><div class='ctx'> 		pentry-&gt;name, pentry-&gt;irq);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need to call platform init of IPC devices to fill misc_pdata</div><div class='add'>+	 * structure. It will be used in msic_init for initialization.</div><div class='add'>+	 */</div><div class='ctx'> 	pdata = intel_mid_sfi_get_pdata(dev, pentry);</div><div class='ctx'> 	if (IS_ERR(pdata))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * On Medfield the platform device creation is handled by the MSIC</div><div class='add'>+	 * MFD driver so we don't need to do it here.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;msic &amp;&amp; intel_mid_has_msic())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	pdev = platform_device_alloc(pentry-&gt;name, 0);</div><div class='ctx'> 	if (pdev == NULL) {</div><div class='ctx'> 		pr_err("out of memory for SFI platform device '%s'.\n",</div><div class='hunk'>@@ -348,7 +359,10 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,</div><div class='ctx'> 	install_irq_resource(pdev, pentry-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;dev.platform_data = pdata;</div><div class='del'>-	platform_device_add(pdev);</div><div class='add'>+	if (dev-&gt;delay)</div><div class='add'>+		intel_scu_ipc_device_register(pdev);</div><div class='add'>+	else</div><div class='add'>+		platform_device_add(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init sfi_handle_spi_dev(struct sfi_device_table_entry *pentry,</div><div class='hunk'>@@ -503,27 +517,23 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)</div><div class='ctx'> 		if (!dev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (dev-&gt;device_handler) {</div><div class='del'>-			dev-&gt;device_handler(pentry, dev);</div><div class='del'>-		} else {</div><div class='del'>-			switch (pentry-&gt;type) {</div><div class='del'>-			case SFI_DEV_TYPE_IPC:</div><div class='del'>-				sfi_handle_ipc_dev(pentry, dev);</div><div class='del'>-				break;</div><div class='del'>-			case SFI_DEV_TYPE_SPI:</div><div class='del'>-				sfi_handle_spi_dev(pentry, dev);</div><div class='del'>-				break;</div><div class='del'>-			case SFI_DEV_TYPE_I2C:</div><div class='del'>-				sfi_handle_i2c_dev(pentry, dev);</div><div class='del'>-				break;</div><div class='del'>-			case SFI_DEV_TYPE_SD:</div><div class='del'>-				sfi_handle_sd_dev(pentry, dev);</div><div class='del'>-				break;</div><div class='del'>-			case SFI_DEV_TYPE_UART:</div><div class='del'>-			case SFI_DEV_TYPE_HSI:</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+		switch (pentry-&gt;type) {</div><div class='add'>+		case SFI_DEV_TYPE_IPC:</div><div class='add'>+			sfi_handle_ipc_dev(pentry, dev);</div><div class='add'>+			break;</div><div class='add'>+		case SFI_DEV_TYPE_SPI:</div><div class='add'>+			sfi_handle_spi_dev(pentry, dev);</div><div class='add'>+			break;</div><div class='add'>+		case SFI_DEV_TYPE_I2C:</div><div class='add'>+			sfi_handle_i2c_dev(pentry, dev);</div><div class='add'>+			break;</div><div class='add'>+		case SFI_DEV_TYPE_SD:</div><div class='add'>+			sfi_handle_sd_dev(pentry, dev);</div><div class='add'>+			break;</div><div class='add'>+		case SFI_DEV_TYPE_UART:</div><div class='add'>+		case SFI_DEV_TYPE_HSI:</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c<br/>index f5bad40936ac..b8f562049cad 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/intel-quark/imr_selftest.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/intel-quark/imr_selftest.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/intel-quark/imr_selftest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/intel-quark/imr_selftest.c</a></div><div class='hunk'>@@ -25,7 +25,8 @@</div><div class='ctx'>  * @fmt:	format string.</div><div class='ctx'>  * ...		variadic argument list.</div><div class='ctx'>  */</div><div class='del'>-static void __init imr_self_test_result(int res, const char *fmt, ...)</div><div class='add'>+static __printf(2, 3)</div><div class='add'>+void __init imr_self_test_result(int res, const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	va_list vlist;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/platform/mellanox/Makefile b/arch/x86/platform/mellanox/Makefile<br/>deleted file mode 100644<br/>index f43c93188a1d..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/mellanox/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/mellanox/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-obj-$(CONFIG_MLX_PLATFORM)	+= mlx-platform.o</div><div class='head'>diff --git a/arch/x86/platform/mellanox/mlx-platform.c b/arch/x86/platform/mellanox/mlx-platform.c<br/>deleted file mode 100644<br/>index 7dcfcca97399..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/mellanox/mlx-platform.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/mellanox/mlx-platform.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,266 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/x86/platform/mellanox/mlx-platform.c</div><div class='del'>- * Copyright (c) 2016 Mellanox Technologies. All rights reserved.</div><div class='del'>- * Copyright (c) 2016 Vadim Pasternak &lt;vadimp@mellanox.com&gt;</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *</div><div class='del'>- * 1. Redistributions of source code must retain the above copyright</div><div class='del'>- *    notice, this list of conditions and the following disclaimer.</div><div class='del'>- * 2. Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *    notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *    documentation and/or other materials provided with the distribution.</div><div class='del'>- * 3. Neither the names of the copyright holders nor the names of its</div><div class='del'>- *    contributors may be used to endorse or promote products derived from</div><div class='del'>- *    this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * Alternatively, this software may be distributed under the terms of the</div><div class='del'>- * GNU General Public License ("GPL") version 2 as published by the Free</div><div class='del'>- * Software Foundation.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE</div><div class='del'>- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</div><div class='del'>- * POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/dmi.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/i2c-mux.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/i2c-mux-reg.h&gt;</div><div class='del'>-</div><div class='del'>-#define MLX_PLAT_DEVICE_NAME		"mlxplat"</div><div class='del'>-</div><div class='del'>-/* LPC bus IO offsets */</div><div class='del'>-#define MLXPLAT_CPLD_LPC_I2C_BASE_ADRR		0x2000</div><div class='del'>-#define MLXPLAT_CPLD_LPC_REG_BASE_ADRR		0x2500</div><div class='del'>-#define MLXPLAT_CPLD_LPC_IO_RANGE		0x100</div><div class='del'>-#define MLXPLAT_CPLD_LPC_I2C_CH1_OFF		0xdb</div><div class='del'>-#define MLXPLAT_CPLD_LPC_I2C_CH2_OFF		0xda</div><div class='del'>-#define MLXPLAT_CPLD_LPC_PIO_OFFSET		0x10000UL</div><div class='del'>-#define MLXPLAT_CPLD_LPC_REG1	((MLXPLAT_CPLD_LPC_REG_BASE_ADRR + \</div><div class='del'>-				  MLXPLAT_CPLD_LPC_I2C_CH1_OFF) | \</div><div class='del'>-				  MLXPLAT_CPLD_LPC_PIO_OFFSET)</div><div class='del'>-#define MLXPLAT_CPLD_LPC_REG2	((MLXPLAT_CPLD_LPC_REG_BASE_ADRR + \</div><div class='del'>-				  MLXPLAT_CPLD_LPC_I2C_CH2_OFF) | \</div><div class='del'>-				  MLXPLAT_CPLD_LPC_PIO_OFFSET)</div><div class='del'>-</div><div class='del'>-/* Start channel numbers */</div><div class='del'>-#define MLXPLAT_CPLD_CH1			2</div><div class='del'>-#define MLXPLAT_CPLD_CH2			10</div><div class='del'>-</div><div class='del'>-/* Number of LPC attached MUX platform devices */</div><div class='del'>-#define MLXPLAT_CPLD_LPC_MUX_DEVS		2</div><div class='del'>-</div><div class='del'>-/* mlxplat_priv - platform private data</div><div class='del'>- * @pdev_i2c - i2c controller platform device</div><div class='del'>- * @pdev_mux - array of mux platform devices</div><div class='del'>- */</div><div class='del'>-struct mlxplat_priv {</div><div class='del'>-	struct platform_device *pdev_i2c;</div><div class='del'>-	struct platform_device *pdev_mux[MLXPLAT_CPLD_LPC_MUX_DEVS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Regions for LPC I2C controller and LPC base register space */</div><div class='del'>-static const struct resource mlxplat_lpc_resources[] = {</div><div class='del'>-	[0] = DEFINE_RES_NAMED(MLXPLAT_CPLD_LPC_I2C_BASE_ADRR,</div><div class='del'>-			       MLXPLAT_CPLD_LPC_IO_RANGE,</div><div class='del'>-			       "mlxplat_cpld_lpc_i2c_ctrl", IORESOURCE_IO),</div><div class='del'>-	[1] = DEFINE_RES_NAMED(MLXPLAT_CPLD_LPC_REG_BASE_ADRR,</div><div class='del'>-			       MLXPLAT_CPLD_LPC_IO_RANGE,</div><div class='del'>-			       "mlxplat_cpld_lpc_regs",</div><div class='del'>-			       IORESOURCE_IO),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Platform default channels */</div><div class='del'>-static const int mlxplat_default_channels[][8] = {</div><div class='del'>-	{</div><div class='del'>-		MLXPLAT_CPLD_CH1, MLXPLAT_CPLD_CH1 + 1, MLXPLAT_CPLD_CH1 + 2,</div><div class='del'>-		MLXPLAT_CPLD_CH1 + 3, MLXPLAT_CPLD_CH1 + 4, MLXPLAT_CPLD_CH1 +</div><div class='del'>-		5, MLXPLAT_CPLD_CH1 + 6, MLXPLAT_CPLD_CH1 + 7</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		MLXPLAT_CPLD_CH2, MLXPLAT_CPLD_CH2 + 1, MLXPLAT_CPLD_CH2 + 2,</div><div class='del'>-		MLXPLAT_CPLD_CH2 + 3, MLXPLAT_CPLD_CH2 + 4, MLXPLAT_CPLD_CH2 +</div><div class='del'>-		5, MLXPLAT_CPLD_CH2 + 6, MLXPLAT_CPLD_CH2 + 7</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Platform channels for MSN21xx system family */</div><div class='del'>-static const int mlxplat_msn21xx_channels[] = { 1, 2, 3, 4, 5, 6, 7, 8 };</div><div class='del'>-</div><div class='del'>-/* Platform mux data */</div><div class='del'>-static struct i2c_mux_reg_platform_data mlxplat_mux_data[] = {</div><div class='del'>-	{</div><div class='del'>-		.parent = 1,</div><div class='del'>-		.base_nr = MLXPLAT_CPLD_CH1,</div><div class='del'>-		.write_only = 1,</div><div class='del'>-		.reg = (void __iomem *)MLXPLAT_CPLD_LPC_REG1,</div><div class='del'>-		.reg_size = 1,</div><div class='del'>-		.idle_in_use = 1,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.parent = 1,</div><div class='del'>-		.base_nr = MLXPLAT_CPLD_CH2,</div><div class='del'>-		.write_only = 1,</div><div class='del'>-		.reg = (void __iomem *)MLXPLAT_CPLD_LPC_REG2,</div><div class='del'>-		.reg_size = 1,</div><div class='del'>-		.idle_in_use = 1,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device *mlxplat_dev;</div><div class='del'>-</div><div class='del'>-static int __init mlxplat_dmi_default_matched(const struct dmi_system_id *dmi)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(mlxplat_mux_data); i++) {</div><div class='del'>-		mlxplat_mux_data[i].values = mlxplat_default_channels[i];</div><div class='del'>-		mlxplat_mux_data[i].n_values =</div><div class='del'>-				ARRAY_SIZE(mlxplat_default_channels[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mlxplat_dmi_msn21xx_matched(const struct dmi_system_id *dmi)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(mlxplat_mux_data); i++) {</div><div class='del'>-		mlxplat_mux_data[i].values = mlxplat_msn21xx_channels;</div><div class='del'>-		mlxplat_mux_data[i].n_values =</div><div class='del'>-				ARRAY_SIZE(mlxplat_msn21xx_channels);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dmi_system_id mlxplat_dmi_table[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.callback = mlxplat_dmi_default_matched,</div><div class='del'>-		.matches = {</div><div class='del'>-			DMI_MATCH(DMI_BOARD_VENDOR, "Mellanox Technologies"),</div><div class='del'>-			DMI_MATCH(DMI_PRODUCT_NAME, "MSN24"),</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.callback = mlxplat_dmi_default_matched,</div><div class='del'>-		.matches = {</div><div class='del'>-			DMI_MATCH(DMI_BOARD_VENDOR, "Mellanox Technologies"),</div><div class='del'>-			DMI_MATCH(DMI_PRODUCT_NAME, "MSN27"),</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.callback = mlxplat_dmi_default_matched,</div><div class='del'>-		.matches = {</div><div class='del'>-			DMI_MATCH(DMI_BOARD_VENDOR, "Mellanox Technologies"),</div><div class='del'>-			DMI_MATCH(DMI_PRODUCT_NAME, "MSB"),</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.callback = mlxplat_dmi_default_matched,</div><div class='del'>-		.matches = {</div><div class='del'>-			DMI_MATCH(DMI_BOARD_VENDOR, "Mellanox Technologies"),</div><div class='del'>-			DMI_MATCH(DMI_PRODUCT_NAME, "MSX"),</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.callback = mlxplat_dmi_msn21xx_matched,</div><div class='del'>-		.matches = {</div><div class='del'>-			DMI_MATCH(DMI_BOARD_VENDOR, "Mellanox Technologies"),</div><div class='del'>-			DMI_MATCH(DMI_PRODUCT_NAME, "MSN21"),</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mlxplat_init(void)</div><div class='del'>-{</div><div class='del'>-	struct mlxplat_priv *priv;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	if (!dmi_check_system(mlxplat_dmi_table))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	mlxplat_dev = platform_device_register_simple(MLX_PLAT_DEVICE_NAME, -1,</div><div class='del'>-					mlxplat_lpc_resources,</div><div class='del'>-					ARRAY_SIZE(mlxplat_lpc_resources));</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(mlxplat_dev))</div><div class='del'>-		return PTR_ERR(mlxplat_dev);</div><div class='del'>-</div><div class='del'>-	priv = devm_kzalloc(&amp;mlxplat_dev-&gt;dev, sizeof(struct mlxplat_priv),</div><div class='del'>-			    GFP_KERNEL);</div><div class='del'>-	if (!priv) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail_alloc;</div><div class='del'>-	}</div><div class='del'>-	platform_set_drvdata(mlxplat_dev, priv);</div><div class='del'>-</div><div class='del'>-	priv-&gt;pdev_i2c = platform_device_register_simple("i2c_mlxcpld", -1,</div><div class='del'>-							 NULL, 0);</div><div class='del'>-	if (IS_ERR(priv-&gt;pdev_i2c)) {</div><div class='del'>-		err = PTR_ERR(priv-&gt;pdev_i2c);</div><div class='del'>-		goto fail_alloc;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(mlxplat_mux_data); i++) {</div><div class='del'>-		priv-&gt;pdev_mux[i] = platform_device_register_resndata(</div><div class='del'>-						&amp;mlxplat_dev-&gt;dev,</div><div class='del'>-						"i2c-mux-reg", i, NULL,</div><div class='del'>-						0, &amp;mlxplat_mux_data[i],</div><div class='del'>-						sizeof(mlxplat_mux_data[i]));</div><div class='del'>-		if (IS_ERR(priv-&gt;pdev_mux[i])) {</div><div class='del'>-			err = PTR_ERR(priv-&gt;pdev_mux[i]);</div><div class='del'>-			goto fail_platform_mux_register;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-fail_platform_mux_register:</div><div class='del'>-	for (i--; i &gt; 0 ; i--)</div><div class='del'>-		platform_device_unregister(priv-&gt;pdev_mux[i]);</div><div class='del'>-	platform_device_unregister(priv-&gt;pdev_i2c);</div><div class='del'>-fail_alloc:</div><div class='del'>-	platform_device_unregister(mlxplat_dev);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-module_init(mlxplat_init);</div><div class='del'>-</div><div class='del'>-static void __exit mlxplat_exit(void)</div><div class='del'>-{</div><div class='del'>-	struct mlxplat_priv *priv = platform_get_drvdata(mlxplat_dev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = ARRAY_SIZE(mlxplat_mux_data) - 1; i &gt;= 0 ; i--)</div><div class='del'>-		platform_device_unregister(priv-&gt;pdev_mux[i]);</div><div class='del'>-</div><div class='del'>-	platform_device_unregister(priv-&gt;pdev_i2c);</div><div class='del'>-	platform_device_unregister(mlxplat_dev);</div><div class='del'>-}</div><div class='del'>-module_exit(mlxplat_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Vadim Pasternak (vadimp@mellanox.com)");</div><div class='del'>-MODULE_DESCRIPTION("Mellanox platform driver");</div><div class='del'>-MODULE_LICENSE("Dual BSD/GPL");</div><div class='del'>-MODULE_ALIAS("dmi:*:*Mellanox*:MSN24*:");</div><div class='del'>-MODULE_ALIAS("dmi:*:*Mellanox*:MSN27*:");</div><div class='del'>-MODULE_ALIAS("dmi:*:*Mellanox*:MSB*:");</div><div class='del'>-MODULE_ALIAS("dmi:*:*Mellanox*:MSX*:");</div><div class='del'>-MODULE_ALIAS("dmi:*:*Mellanox*:MSN21*:");</div><div class='head'>diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c<br/>index 9e42842e924a..766d4d3529a1 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/uv/tlb_uv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/uv/tlb_uv.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/uv/tlb_uv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/uv/tlb_uv.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;asm/uv/uv_hub.h&gt;</div><div class='ctx'> #include &lt;asm/uv/uv_bau.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='del'>-#include &lt;asm/idle.h&gt;</div><div class='ctx'> #include &lt;asm/tsc.h&gt;</div><div class='ctx'> #include &lt;asm/irq_vectors.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='head'>diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c<br/>index cd5173a2733f..c34bd8233f7c 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/uv/uv_nmi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/uv/uv_nmi.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/uv/uv_nmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/uv/uv_nmi.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -45,8 +46,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Handle system-wide NMI events generated by the global 'power nmi' command.</div><div class='ctx'>  *</div><div class='del'>- * Basic operation is to field the NMI interrupt on each cpu and wait</div><div class='del'>- * until all cpus have arrived into the nmi handler.  If some cpus do not</div><div class='add'>+ * Basic operation is to field the NMI interrupt on each CPU and wait</div><div class='add'>+ * until all CPU's have arrived into the nmi handler.  If some CPU's do not</div><div class='ctx'>  * make it into the handler, try and force them in with the IPI(NMI) signal.</div><div class='ctx'>  *</div><div class='ctx'>  * We also have to lessen UV Hub MMR accesses as much as possible as this</div><div class='hunk'>@@ -56,7 +57,7 @@</div><div class='ctx'>  * To do this we register our primary NMI notifier on the NMI_UNKNOWN</div><div class='ctx'>  * chain.  This reduces the number of false NMI calls when the perf</div><div class='ctx'>  * tools are running which generate an enormous number of NMIs per</div><div class='del'>- * second (~4M/s for 1024 cpu threads).  Our secondary NMI handler is</div><div class='add'>+ * second (~4M/s for 1024 CPU threads).  Our secondary NMI handler is</div><div class='ctx'>  * very short as it only checks that if it has been "pinged" with the</div><div class='ctx'>  * IPI(NMI) signal as mentioned above, and does not read the UV Hub's MMR.</div><div class='ctx'>  *</div><div class='hunk'>@@ -65,8 +66,20 @@</div><div class='ctx'> static struct uv_hub_nmi_s **uv_hub_nmi_list;</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct uv_cpu_nmi_s, uv_cpu_nmi);</div><div class='del'>-EXPORT_PER_CPU_SYMBOL_GPL(uv_cpu_nmi);</div><div class='ctx'> </div><div class='add'>+/* UV hubless values */</div><div class='add'>+#define NMI_CONTROL_PORT	0x70</div><div class='add'>+#define NMI_DUMMY_PORT		0x71</div><div class='add'>+#define PAD_OWN_GPP_D_0		0x2c</div><div class='add'>+#define GPI_NMI_STS_GPP_D_0	0x164</div><div class='add'>+#define GPI_NMI_ENA_GPP_D_0	0x174</div><div class='add'>+#define STS_GPP_D_0_MASK	0x1</div><div class='add'>+#define PAD_CFG_DW0_GPP_D_0	0x4c0</div><div class='add'>+#define GPIROUTNMI		(1ul &lt;&lt; 17)</div><div class='add'>+#define PCH_PCR_GPIO_1_BASE	0xfdae0000ul</div><div class='add'>+#define PCH_PCR_GPIO_ADDRESS(offset) (int *)((u64)(pch_base) | (u64)(offset))</div><div class='add'>+</div><div class='add'>+static u64 *pch_base;</div><div class='ctx'> static unsigned long nmi_mmr;</div><div class='ctx'> static unsigned long nmi_mmr_clear;</div><div class='ctx'> static unsigned long nmi_mmr_pending;</div><div class='hunk'>@@ -100,7 +113,7 @@ static int param_get_local64(char *buffer, const struct kernel_param *kp)</div><div class='ctx'> </div><div class='ctx'> static int param_set_local64(const char *val, const struct kernel_param *kp)</div><div class='ctx'> {</div><div class='del'>-	/* clear on any write */</div><div class='add'>+	/* Clear on any write */</div><div class='ctx'> 	local64_set((local64_t *)kp-&gt;arg, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -144,16 +157,80 @@ module_param_named(wait_count, uv_nmi_wait_count, int, 0644);</div><div class='ctx'> static int uv_nmi_retry_count = 500;</div><div class='ctx'> module_param_named(retry_count, uv_nmi_retry_count, int, 0644);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Valid NMI Actions:</div><div class='del'>- *  "dump"	- dump process stack for each cpu</div><div class='del'>- *  "ips"	- dump IP info for each cpu</div><div class='del'>- *  "kdump"	- do crash dump</div><div class='del'>- *  "kdb"	- enter KDB (default)</div><div class='del'>- *  "kgdb"	- enter KGDB</div><div class='del'>- */</div><div class='del'>-static char uv_nmi_action[8] = "kdb";</div><div class='del'>-module_param_string(action, uv_nmi_action, sizeof(uv_nmi_action), 0644);</div><div class='add'>+static bool uv_pch_intr_enable = true;</div><div class='add'>+static bool uv_pch_intr_now_enabled;</div><div class='add'>+module_param_named(pch_intr_enable, uv_pch_intr_enable, bool, 0644);</div><div class='add'>+</div><div class='add'>+static bool uv_pch_init_enable = true;</div><div class='add'>+module_param_named(pch_init_enable, uv_pch_init_enable, bool, 0644);</div><div class='add'>+</div><div class='add'>+static int uv_nmi_debug;</div><div class='add'>+module_param_named(debug, uv_nmi_debug, int, 0644);</div><div class='add'>+</div><div class='add'>+#define nmi_debug(fmt, ...)				\</div><div class='add'>+	do {						\</div><div class='add'>+		if (uv_nmi_debug)			\</div><div class='add'>+			pr_info(fmt, ##__VA_ARGS__);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/* Valid NMI Actions */</div><div class='add'>+#define	ACTION_LEN	16</div><div class='add'>+static struct nmi_action {</div><div class='add'>+	char	*action;</div><div class='add'>+	char	*desc;</div><div class='add'>+} valid_acts[] = {</div><div class='add'>+	{	"kdump",	"do kernel crash dump"			},</div><div class='add'>+	{	"dump",		"dump process stack for each cpu"	},</div><div class='add'>+	{	"ips",		"dump Inst Ptr info for each cpu"	},</div><div class='add'>+	{	"kdb",		"enter KDB (needs kgdboc= assignment)"	},</div><div class='add'>+	{	"kgdb",		"enter KGDB (needs gdb target remote)"	},</div><div class='add'>+	{	"health",	"check if CPUs respond to NMI"		},</div><div class='add'>+};</div><div class='add'>+typedef char action_t[ACTION_LEN];</div><div class='add'>+static action_t uv_nmi_action = { "dump" };</div><div class='add'>+</div><div class='add'>+static int param_get_action(char *buffer, const struct kernel_param *kp)</div><div class='add'>+{</div><div class='add'>+	return sprintf(buffer, "%s\n", uv_nmi_action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int param_set_action(const char *val, const struct kernel_param *kp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int n = ARRAY_SIZE(valid_acts);</div><div class='add'>+	char arg[ACTION_LEN], *p;</div><div class='add'>+</div><div class='add'>+	/* (remove possible '\n') */</div><div class='add'>+	strncpy(arg, val, ACTION_LEN - 1);</div><div class='add'>+	arg[ACTION_LEN - 1] = '\0';</div><div class='add'>+	p = strchr(arg, '\n');</div><div class='add'>+	if (p)</div><div class='add'>+		*p = '\0';</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++)</div><div class='add'>+		if (!strcmp(arg, valid_acts[i].action))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (i &lt; n) {</div><div class='add'>+		strcpy(uv_nmi_action, arg);</div><div class='add'>+		pr_info("UV: New NMI action:%s\n", uv_nmi_action);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_err("UV: Invalid NMI action:%s, valid actions are:\n", arg);</div><div class='add'>+	for (i = 0; i &lt; n; i++)</div><div class='add'>+		pr_err("UV: %-8s - %s\n",</div><div class='add'>+			valid_acts[i].action, valid_acts[i].desc);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct kernel_param_ops param_ops_action = {</div><div class='add'>+	.get = param_get_action,</div><div class='add'>+	.set = param_set_action,</div><div class='add'>+};</div><div class='add'>+#define param_check_action(name, p) __param_check(name, p, action_t)</div><div class='add'>+</div><div class='add'>+module_param_named(action, uv_nmi_action, action, 0644);</div><div class='ctx'> </div><div class='ctx'> static inline bool uv_nmi_action_is(const char *action)</div><div class='ctx'> {</div><div class='hunk'>@@ -192,8 +269,200 @@ static inline void uv_local_mmr_clear_nmi(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * If first cpu in on this hub, set hub_nmi "in_nmi" and "owner" values and</div><div class='del'>- * return true.  If first cpu in on the system, set global "in_nmi" flag.</div><div class='add'>+ * UV hubless NMI handler functions</div><div class='add'>+ */</div><div class='add'>+static inline void uv_reassert_nmi(void)</div><div class='add'>+{</div><div class='add'>+	/* (from arch/x86/include/asm/mach_traps.h) */</div><div class='add'>+	outb(0x8f, NMI_CONTROL_PORT);</div><div class='add'>+	inb(NMI_DUMMY_PORT);		/* dummy read */</div><div class='add'>+	outb(0x0f, NMI_CONTROL_PORT);</div><div class='add'>+	inb(NMI_DUMMY_PORT);		/* dummy read */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uv_init_hubless_pch_io(int offset, int mask, int data)</div><div class='add'>+{</div><div class='add'>+	int *addr = PCH_PCR_GPIO_ADDRESS(offset);</div><div class='add'>+	int readd = readl(addr);</div><div class='add'>+</div><div class='add'>+	if (mask) {			/* OR in new data */</div><div class='add'>+		int writed = (readd &amp; ~mask) | data;</div><div class='add'>+</div><div class='add'>+		nmi_debug("UV:PCH: %p = %x &amp; %x | %x (%x)\n",</div><div class='add'>+			addr, readd, ~mask, data, writed);</div><div class='add'>+		writel(writed, addr);</div><div class='add'>+	} else if (readd &amp; data) {	/* clear status bit */</div><div class='add'>+		nmi_debug("UV:PCH: %p = %x\n", addr, data);</div><div class='add'>+		writel(data, addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	(void)readl(addr);		/* flush write data */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uv_nmi_setup_hubless_intr(void)</div><div class='add'>+{</div><div class='add'>+	uv_pch_intr_now_enabled = uv_pch_intr_enable;</div><div class='add'>+</div><div class='add'>+	uv_init_hubless_pch_io(</div><div class='add'>+		PAD_CFG_DW0_GPP_D_0, GPIROUTNMI,</div><div class='add'>+		uv_pch_intr_now_enabled ? GPIROUTNMI : 0);</div><div class='add'>+</div><div class='add'>+	nmi_debug("UV:NMI: GPP_D_0 interrupt %s\n",</div><div class='add'>+		uv_pch_intr_now_enabled ? "enabled" : "disabled");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct init_nmi {</div><div class='add'>+	unsigned int	offset;</div><div class='add'>+	unsigned int	mask;</div><div class='add'>+	unsigned int	data;</div><div class='add'>+} init_nmi[] = {</div><div class='add'>+	{	/* HOSTSW_OWN_GPP_D_0 */</div><div class='add'>+	.offset = 0x84,</div><div class='add'>+	.mask = 0x1,</div><div class='add'>+	.data = 0x0,	/* ACPI Mode */</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+/* Clear status: */</div><div class='add'>+	{	/* GPI_INT_STS_GPP_D_0 */</div><div class='add'>+	.offset = 0x104,</div><div class='add'>+	.mask = 0x0,</div><div class='add'>+	.data = 0x1,	/* Clear Status */</div><div class='add'>+	},</div><div class='add'>+	{	/* GPI_GPE_STS_GPP_D_0 */</div><div class='add'>+	.offset = 0x124,</div><div class='add'>+	.mask = 0x0,</div><div class='add'>+	.data = 0x1,	/* Clear Status */</div><div class='add'>+	},</div><div class='add'>+	{	/* GPI_SMI_STS_GPP_D_0 */</div><div class='add'>+	.offset = 0x144,</div><div class='add'>+	.mask = 0x0,</div><div class='add'>+	.data = 0x1,	/* Clear Status */</div><div class='add'>+	},</div><div class='add'>+	{	/* GPI_NMI_STS_GPP_D_0 */</div><div class='add'>+	.offset = 0x164,</div><div class='add'>+	.mask = 0x0,</div><div class='add'>+	.data = 0x1,	/* Clear Status */</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+/* Disable interrupts: */</div><div class='add'>+	{	/* GPI_INT_EN_GPP_D_0 */</div><div class='add'>+	.offset = 0x114,</div><div class='add'>+	.mask = 0x1,</div><div class='add'>+	.data = 0x0,	/* Disable interrupt generation */</div><div class='add'>+	},</div><div class='add'>+	{	/* GPI_GPE_EN_GPP_D_0 */</div><div class='add'>+	.offset = 0x134,</div><div class='add'>+	.mask = 0x1,</div><div class='add'>+	.data = 0x0,	/* Disable interrupt generation */</div><div class='add'>+	},</div><div class='add'>+	{	/* GPI_SMI_EN_GPP_D_0 */</div><div class='add'>+	.offset = 0x154,</div><div class='add'>+	.mask = 0x1,</div><div class='add'>+	.data = 0x0,	/* Disable interrupt generation */</div><div class='add'>+	},</div><div class='add'>+	{	/* GPI_NMI_EN_GPP_D_0 */</div><div class='add'>+	.offset = 0x174,</div><div class='add'>+	.mask = 0x1,</div><div class='add'>+	.data = 0x0,	/* Disable interrupt generation */</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+/* Setup GPP_D_0 Pad Config: */</div><div class='add'>+	{	/* PAD_CFG_DW0_GPP_D_0 */</div><div class='add'>+	.offset = 0x4c0,</div><div class='add'>+	.mask = 0xffffffff,</div><div class='add'>+	.data = 0x82020100,</div><div class='add'>+/*</div><div class='add'>+ *  31:30 Pad Reset Config (PADRSTCFG): = 2h  # PLTRST# (default)</div><div class='add'>+ *</div><div class='add'>+ *  29    RX Pad State Select (RXPADSTSEL): = 0 # Raw RX pad state directly</div><div class='add'>+ *                                                from RX buffer (default)</div><div class='add'>+ *</div><div class='add'>+ *  28    RX Raw Override to '1' (RXRAW1): = 0 # No Override</div><div class='add'>+ *</div><div class='add'>+ *  26:25 RX Level/Edge Configuration (RXEVCFG):</div><div class='add'>+ *      = 0h # Level</div><div class='add'>+ *      = 1h # Edge</div><div class='add'>+ *</div><div class='add'>+ *  23    RX Invert (RXINV): = 0 # No Inversion (signal active high)</div><div class='add'>+ *</div><div class='add'>+ *  20    GPIO Input Route IOxAPIC (GPIROUTIOXAPIC):</div><div class='add'>+ * = 0 # Routing does not cause peripheral IRQ...</div><div class='add'>+ *     # (we want an NMI not an IRQ)</div><div class='add'>+ *</div><div class='add'>+ *  19    GPIO Input Route SCI (GPIROUTSCI): = 0 # Routing does not cause SCI.</div><div class='add'>+ *  18    GPIO Input Route SMI (GPIROUTSMI): = 0 # Routing does not cause SMI.</div><div class='add'>+ *  17    GPIO Input Route NMI (GPIROUTNMI): = 1 # Routing can cause NMI.</div><div class='add'>+ *</div><div class='add'>+ *  11:10 Pad Mode (PMODE1/0): = 0h = GPIO control the Pad.</div><div class='add'>+ *   9    GPIO RX Disable (GPIORXDIS):</div><div class='add'>+ * = 0 # Enable the input buffer (active low enable)</div><div class='add'>+ *</div><div class='add'>+ *   8    GPIO TX Disable (GPIOTXDIS):</div><div class='add'>+ * = 1 # Disable the output buffer; i.e. Hi-Z</div><div class='add'>+ *</div><div class='add'>+ *   1 GPIO RX State (GPIORXSTATE): This is the current internal RX pad state..</div><div class='add'>+ *   0 GPIO TX State (GPIOTXSTATE):</div><div class='add'>+ * = 0 # (Leave at default)</div><div class='add'>+ */</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+/* Pad Config DW1 */</div><div class='add'>+	{	/* PAD_CFG_DW1_GPP_D_0 */</div><div class='add'>+	.offset = 0x4c4,</div><div class='add'>+	.mask = 0x3c00,</div><div class='add'>+	.data = 0,	/* Termination = none (default) */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void uv_init_hubless_pch_d0(void)</div><div class='add'>+{</div><div class='add'>+	int i, read;</div><div class='add'>+</div><div class='add'>+	read = *PCH_PCR_GPIO_ADDRESS(PAD_OWN_GPP_D_0);</div><div class='add'>+	if (read != 0) {</div><div class='add'>+		pr_info("UV: Hubless NMI already configured\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nmi_debug("UV: Initializing UV Hubless NMI on PCH\n");</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(init_nmi); i++) {</div><div class='add'>+		uv_init_hubless_pch_io(init_nmi[i].offset,</div><div class='add'>+					init_nmi[i].mask,</div><div class='add'>+					init_nmi[i].data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int uv_nmi_test_hubless(struct uv_hub_nmi_s *hub_nmi)</div><div class='add'>+{</div><div class='add'>+	int *pstat = PCH_PCR_GPIO_ADDRESS(GPI_NMI_STS_GPP_D_0);</div><div class='add'>+	int status = *pstat;</div><div class='add'>+</div><div class='add'>+	hub_nmi-&gt;nmi_value = status;</div><div class='add'>+	atomic_inc(&amp;hub_nmi-&gt;read_mmr_count);</div><div class='add'>+</div><div class='add'>+	if (!(status &amp; STS_GPP_D_0_MASK))	/* Not a UV external NMI */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	*pstat = STS_GPP_D_0_MASK;	/* Is a UV NMI: clear GPP_D_0 status */</div><div class='add'>+	(void)*pstat;			/* Flush write */</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int uv_test_nmi(struct uv_hub_nmi_s *hub_nmi)</div><div class='add'>+{</div><div class='add'>+	if (hub_nmi-&gt;hub_present)</div><div class='add'>+		return uv_nmi_test_mmr(hub_nmi);</div><div class='add'>+</div><div class='add'>+	if (hub_nmi-&gt;pch_owner)		/* Only PCH owner can check status */</div><div class='add'>+		return uv_nmi_test_hubless(hub_nmi);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If first CPU in on this hub, set hub_nmi "in_nmi" and "owner" values and</div><div class='add'>+ * return true.  If first CPU in on the system, set global "in_nmi" flag.</div><div class='ctx'>  */</div><div class='ctx'> static int uv_set_in_nmi(int cpu, struct uv_hub_nmi_s *hub_nmi)</div><div class='ctx'> {</div><div class='hunk'>@@ -214,6 +483,7 @@ static int uv_check_nmi(struct uv_hub_nmi_s *hub_nmi)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> 	int nmi = 0;</div><div class='add'>+	int nmi_detected = 0;</div><div class='ctx'> </div><div class='ctx'> 	local64_inc(&amp;uv_nmi_count);</div><div class='ctx'> 	this_cpu_inc(uv_cpu_nmi.queries);</div><div class='hunk'>@@ -224,35 +494,48 @@ static int uv_check_nmi(struct uv_hub_nmi_s *hub_nmi)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (raw_spin_trylock(&amp;hub_nmi-&gt;nmi_lock)) {</div><div class='add'>+			nmi_detected = uv_test_nmi(hub_nmi);</div><div class='ctx'> </div><div class='del'>-			/* check hub MMR NMI flag */</div><div class='del'>-			if (uv_nmi_test_mmr(hub_nmi)) {</div><div class='add'>+			/* Check flag for UV external NMI */</div><div class='add'>+			if (nmi_detected &gt; 0) {</div><div class='ctx'> 				uv_set_in_nmi(cpu, hub_nmi);</div><div class='ctx'> 				nmi = 1;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* MMR NMI flag is clear */</div><div class='add'>+			/* A non-PCH node in a hubless system waits for NMI */</div><div class='add'>+			else if (nmi_detected &lt; 0)</div><div class='add'>+				goto slave_wait;</div><div class='add'>+</div><div class='add'>+			/* MMR/PCH NMI flag is clear */</div><div class='ctx'> 			raw_spin_unlock(&amp;hub_nmi-&gt;nmi_lock);</div><div class='ctx'> </div><div class='ctx'> 		} else {</div><div class='del'>-			/* wait a moment for the hub nmi locker to set flag */</div><div class='del'>-			cpu_relax();</div><div class='add'>+</div><div class='add'>+			/* Wait a moment for the HUB NMI locker to set flag */</div><div class='add'>+slave_wait:		cpu_relax();</div><div class='ctx'> 			udelay(uv_nmi_slave_delay);</div><div class='ctx'> </div><div class='del'>-			/* re-check hub in_nmi flag */</div><div class='add'>+			/* Re-check hub in_nmi flag */</div><div class='ctx'> 			nmi = atomic_read(&amp;hub_nmi-&gt;in_nmi);</div><div class='ctx'> 			if (nmi)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* check if this BMC missed setting the MMR NMI flag */</div><div class='add'>+		/*</div><div class='add'>+		 * Check if this BMC missed setting the MMR NMI flag (or)</div><div class='add'>+		 * UV hubless system where only PCH owner can check flag</div><div class='add'>+		 */</div><div class='ctx'> 		if (!nmi) {</div><div class='ctx'> 			nmi = atomic_read(&amp;uv_in_nmi);</div><div class='ctx'> 			if (nmi)</div><div class='ctx'> 				uv_set_in_nmi(cpu, hub_nmi);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* If we're holding the hub lock, release it now */</div><div class='add'>+		if (nmi_detected &lt; 0)</div><div class='add'>+			raw_spin_unlock(&amp;hub_nmi-&gt;nmi_lock);</div><div class='add'>+</div><div class='ctx'> 	} while (0);</div><div class='ctx'> </div><div class='ctx'> 	if (!nmi)</div><div class='hunk'>@@ -269,12 +552,15 @@ static inline void uv_clear_nmi(int cpu)</div><div class='ctx'> 	if (cpu == atomic_read(&amp;hub_nmi-&gt;cpu_owner)) {</div><div class='ctx'> 		atomic_set(&amp;hub_nmi-&gt;cpu_owner, -1);</div><div class='ctx'> 		atomic_set(&amp;hub_nmi-&gt;in_nmi, 0);</div><div class='del'>-		uv_local_mmr_clear_nmi();</div><div class='add'>+		if (hub_nmi-&gt;hub_present)</div><div class='add'>+			uv_local_mmr_clear_nmi();</div><div class='add'>+		else</div><div class='add'>+			uv_reassert_nmi();</div><div class='ctx'> 		raw_spin_unlock(&amp;hub_nmi-&gt;nmi_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Ping non-responding cpus attemping to force them into the NMI handler */</div><div class='add'>+/* Ping non-responding CPU's attemping to force them into the NMI handler */</div><div class='ctx'> static void uv_nmi_nr_cpus_ping(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -285,7 +571,7 @@ static void uv_nmi_nr_cpus_ping(void)</div><div class='ctx'> 	apic-&gt;send_IPI_mask(uv_nmi_cpu_mask, APIC_DM_NMI);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Clean up flags for cpus that ignored both NMI and ping */</div><div class='add'>+/* Clean up flags for CPU's that ignored both NMI and ping */</div><div class='ctx'> static void uv_nmi_cleanup_mask(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -297,11 +583,12 @@ static void uv_nmi_cleanup_mask(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Loop waiting as cpus enter nmi handler */</div><div class='add'>+/* Loop waiting as CPU's enter NMI handler */</div><div class='ctx'> static int uv_nmi_wait_cpus(int first)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j, k, n = num_online_cpus();</div><div class='ctx'> 	int last_k = 0, waiting = 0;</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	if (first) {</div><div class='ctx'> 		cpumask_copy(uv_nmi_cpu_mask, cpu_online_mask);</div><div class='hunk'>@@ -310,6 +597,12 @@ static int uv_nmi_wait_cpus(int first)</div><div class='ctx'> 		k = n - cpumask_weight(uv_nmi_cpu_mask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* PCH NMI causes only one CPU to respond */</div><div class='add'>+	if (first &amp;&amp; uv_pch_intr_now_enabled) {</div><div class='add'>+		cpumask_clear_cpu(cpu, uv_nmi_cpu_mask);</div><div class='add'>+		return n - k - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	udelay(uv_nmi_initial_delay);</div><div class='ctx'> 	for (i = 0; i &lt; uv_nmi_retry_count; i++) {</div><div class='ctx'> 		int loop_delay = uv_nmi_loop_delay;</div><div class='hunk'>@@ -325,13 +618,13 @@ static int uv_nmi_wait_cpus(int first)</div><div class='ctx'> 			k = n;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (last_k != k) {	/* abort if no new cpus coming in */</div><div class='add'>+		if (last_k != k) {	/* abort if no new CPU's coming in */</div><div class='ctx'> 			last_k = k;</div><div class='ctx'> 			waiting = 0;</div><div class='ctx'> 		} else if (++waiting &gt; uv_nmi_wait_count)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/* extend delay if waiting only for cpu 0 */</div><div class='add'>+		/* Extend delay if waiting only for CPU 0: */</div><div class='ctx'> 		if (waiting &amp;&amp; (n - k) == 1 &amp;&amp;</div><div class='ctx'> 		    cpumask_test_cpu(0, uv_nmi_cpu_mask))</div><div class='ctx'> 			loop_delay *= 100;</div><div class='hunk'>@@ -342,29 +635,29 @@ static int uv_nmi_wait_cpus(int first)</div><div class='ctx'> 	return n - k;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Wait until all slave cpus have entered UV NMI handler */</div><div class='add'>+/* Wait until all slave CPU's have entered UV NMI handler */</div><div class='ctx'> static void uv_nmi_wait(int master)</div><div class='ctx'> {</div><div class='del'>-	/* indicate this cpu is in */</div><div class='add'>+	/* Indicate this CPU is in: */</div><div class='ctx'> 	this_cpu_write(uv_cpu_nmi.state, UV_NMI_STATE_IN);</div><div class='ctx'> </div><div class='del'>-	/* if not the first cpu in (the master), then we are a slave cpu */</div><div class='add'>+	/* If not the first CPU in (the master), then we are a slave CPU */</div><div class='ctx'> 	if (!master)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		/* wait for all other cpus to gather here */</div><div class='add'>+		/* Wait for all other CPU's to gather here */</div><div class='ctx'> 		if (!uv_nmi_wait_cpus(1))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/* if not all made it in, send IPI NMI to them */</div><div class='del'>-		pr_alert("UV: Sending NMI IPI to %d non-responding CPUs: %*pbl\n",</div><div class='add'>+		/* If not all made it in, send IPI NMI to them */</div><div class='add'>+		pr_alert("UV: Sending NMI IPI to %d CPUs: %*pbl\n",</div><div class='ctx'> 			 cpumask_weight(uv_nmi_cpu_mask),</div><div class='ctx'> 			 cpumask_pr_args(uv_nmi_cpu_mask));</div><div class='ctx'> </div><div class='ctx'> 		uv_nmi_nr_cpus_ping();</div><div class='ctx'> </div><div class='del'>-		/* if all cpus are in, then done */</div><div class='add'>+		/* If all CPU's are in, then done */</div><div class='ctx'> 		if (!uv_nmi_wait_cpus(0))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -387,8 +680,8 @@ static void uv_nmi_dump_cpu_ip_hdr(void)</div><div class='ctx'> /* Dump Instruction Pointer info */</div><div class='ctx'> static void uv_nmi_dump_cpu_ip(int cpu, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	pr_info("UV: %4d %6d %-32.32s ", cpu, current-&gt;pid, current-&gt;comm);</div><div class='del'>-	printk_address(regs-&gt;ip);</div><div class='add'>+	pr_info("UV: %4d %6d %-32.32s %pS",</div><div class='add'>+		cpu, current-&gt;pid, current-&gt;comm, (void *)regs-&gt;ip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -416,7 +709,7 @@ static void uv_nmi_dump_state_cpu(int cpu, struct pt_regs *regs)</div><div class='ctx'> 	this_cpu_write(uv_cpu_nmi.state, UV_NMI_STATE_DUMP_DONE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Trigger a slave cpu to dump it's state */</div><div class='add'>+/* Trigger a slave CPU to dump it's state */</div><div class='ctx'> static void uv_nmi_trigger_dump(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	int retry = uv_nmi_trigger_delay;</div><div class='hunk'>@@ -437,7 +730,7 @@ static void uv_nmi_trigger_dump(int cpu)</div><div class='ctx'> 	uv_cpu_nmi_per(cpu).state = UV_NMI_STATE_DUMP_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Wait until all cpus ready to exit */</div><div class='add'>+/* Wait until all CPU's ready to exit */</div><div class='ctx'> static void uv_nmi_sync_exit(int master)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_dec(&amp;uv_nmi_cpus_in_nmi);</div><div class='hunk'>@@ -451,7 +744,23 @@ static void uv_nmi_sync_exit(int master)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Walk through cpu list and dump state of each */</div><div class='add'>+/* Current "health" check is to check which CPU's are responsive */</div><div class='add'>+static void uv_nmi_action_health(int cpu, struct pt_regs *regs, int master)</div><div class='add'>+{</div><div class='add'>+	if (master) {</div><div class='add'>+		int in = atomic_read(&amp;uv_nmi_cpus_in_nmi);</div><div class='add'>+		int out = num_online_cpus() - in;</div><div class='add'>+</div><div class='add'>+		pr_alert("UV: NMI CPU health check (non-responding:%d)\n", out);</div><div class='add'>+		atomic_set(&amp;uv_nmi_slave_continue, SLAVE_EXIT);</div><div class='add'>+	} else {</div><div class='add'>+		while (!atomic_read(&amp;uv_nmi_slave_continue))</div><div class='add'>+			cpu_relax();</div><div class='add'>+	}</div><div class='add'>+	uv_nmi_sync_exit(master);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Walk through CPU list and dump state of each */</div><div class='ctx'> static void uv_nmi_dump_state(int cpu, struct pt_regs *regs, int master)</div><div class='ctx'> {</div><div class='ctx'> 	if (master) {</div><div class='hunk'>@@ -538,7 +847,7 @@ static inline int uv_nmi_kdb_reason(void)</div><div class='ctx'> #else /* !CONFIG_KGDB_KDB */</div><div class='ctx'> static inline int uv_nmi_kdb_reason(void)</div><div class='ctx'> {</div><div class='del'>-	/* Insure user is expecting to attach gdb remote */</div><div class='add'>+	/* Ensure user is expecting to attach gdb remote */</div><div class='ctx'> 	if (uv_nmi_action_is("kgdb"))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -563,7 +872,7 @@ static void uv_call_kgdb_kdb(int cpu, struct pt_regs *regs, int master)</div><div class='ctx'> 		if (reason &lt; 0)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		/* call KGDB NMI handler as MASTER */</div><div class='add'>+		/* Call KGDB NMI handler as MASTER */</div><div class='ctx'> 		ret = kgdb_nmicallin(cpu, X86_TRAP_NMI, regs, reason,</div><div class='ctx'> 				&amp;uv_nmi_slave_continue);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -571,7 +880,7 @@ static void uv_call_kgdb_kdb(int cpu, struct pt_regs *regs, int master)</div><div class='ctx'> 			atomic_set(&amp;uv_nmi_slave_continue, SLAVE_EXIT);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		/* wait for KGDB signal that it's ready for slaves to enter */</div><div class='add'>+		/* Wait for KGDB signal that it's ready for slaves to enter */</div><div class='ctx'> 		int sig;</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='hunk'>@@ -579,7 +888,7 @@ static void uv_call_kgdb_kdb(int cpu, struct pt_regs *regs, int master)</div><div class='ctx'> 			sig = atomic_read(&amp;uv_nmi_slave_continue);</div><div class='ctx'> 		} while (!sig);</div><div class='ctx'> </div><div class='del'>-		/* call KGDB as slave */</div><div class='add'>+		/* Call KGDB as slave */</div><div class='ctx'> 		if (sig == SLAVE_CONTINUE)</div><div class='ctx'> 			kgdb_nmicallback(cpu, regs);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -623,18 +932,23 @@ int uv_handle_nmi(unsigned int reason, struct pt_regs *regs)</div><div class='ctx'> 			strncpy(uv_nmi_action, "dump", strlen(uv_nmi_action));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Pause as all cpus enter the NMI handler */</div><div class='add'>+	/* Pause as all CPU's enter the NMI handler */</div><div class='ctx'> 	uv_nmi_wait(master);</div><div class='ctx'> </div><div class='del'>-	/* Dump state of each cpu */</div><div class='del'>-	if (uv_nmi_action_is("ips") || uv_nmi_action_is("dump"))</div><div class='add'>+	/* Process actions other than "kdump": */</div><div class='add'>+	if (uv_nmi_action_is("health")) {</div><div class='add'>+		uv_nmi_action_health(cpu, regs, master);</div><div class='add'>+	} else if (uv_nmi_action_is("ips") || uv_nmi_action_is("dump")) {</div><div class='ctx'> 		uv_nmi_dump_state(cpu, regs, master);</div><div class='del'>-</div><div class='del'>-	/* Call KGDB/KDB if enabled */</div><div class='del'>-	else if (uv_nmi_action_is("kdb") || uv_nmi_action_is("kgdb"))</div><div class='add'>+	} else if (uv_nmi_action_is("kdb") || uv_nmi_action_is("kgdb")) {</div><div class='ctx'> 		uv_call_kgdb_kdb(cpu, regs, master);</div><div class='add'>+	} else {</div><div class='add'>+		if (master)</div><div class='add'>+			pr_alert("UV: unknown NMI action: %s\n", uv_nmi_action);</div><div class='add'>+		uv_nmi_sync_exit(master);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Clear per_cpu "in nmi" flag */</div><div class='add'>+	/* Clear per_cpu "in_nmi" flag */</div><div class='ctx'> 	this_cpu_write(uv_cpu_nmi.state, UV_NMI_STATE_OUT);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear MMR NMI flag on each hub */</div><div class='hunk'>@@ -648,6 +962,7 @@ int uv_handle_nmi(unsigned int reason, struct pt_regs *regs)</div><div class='ctx'> 		atomic_set(&amp;uv_nmi_cpu, -1);</div><div class='ctx'> 		atomic_set(&amp;uv_in_nmi, 0);</div><div class='ctx'> 		atomic_set(&amp;uv_nmi_kexec_failed, 0);</div><div class='add'>+		atomic_set(&amp;uv_nmi_slave_continue, SLAVE_CLEAR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	uv_nmi_touch_watchdogs();</div><div class='hunk'>@@ -657,7 +972,7 @@ int uv_handle_nmi(unsigned int reason, struct pt_regs *regs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * NMI handler for pulling in CPUs when perf events are grabbing our NMI</div><div class='add'>+ * NMI handler for pulling in CPU's when perf events are grabbing our NMI</div><div class='ctx'>  */</div><div class='ctx'> static int uv_handle_nmi_ping(unsigned int reason, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -690,35 +1005,62 @@ void uv_nmi_init(void)</div><div class='ctx'> 	unsigned int value;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Unmask NMI on all cpus</div><div class='add'>+	 * Unmask NMI on all CPU's</div><div class='ctx'> 	 */</div><div class='ctx'> 	value = apic_read(APIC_LVT1) | APIC_DM_NMI;</div><div class='ctx'> 	value &amp;= ~APIC_LVT_MASKED;</div><div class='ctx'> 	apic_write(APIC_LVT1, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void uv_nmi_setup(void)</div><div class='add'>+/* Setup HUB NMI info */</div><div class='add'>+void __init uv_nmi_setup_common(bool hubbed)</div><div class='ctx'> {</div><div class='ctx'> 	int size = sizeof(void *) * (1 &lt;&lt; NODES_SHIFT);</div><div class='del'>-	int cpu, nid;</div><div class='add'>+	int cpu;</div><div class='ctx'> </div><div class='del'>-	/* Setup hub nmi info */</div><div class='del'>-	uv_nmi_setup_mmrs();</div><div class='ctx'> 	uv_hub_nmi_list = kzalloc(size, GFP_KERNEL);</div><div class='del'>-	pr_info("UV: NMI hub list @ 0x%p (%d)\n", uv_hub_nmi_list, size);</div><div class='add'>+	nmi_debug("UV: NMI hub list @ 0x%p (%d)\n", uv_hub_nmi_list, size);</div><div class='ctx'> 	BUG_ON(!uv_hub_nmi_list);</div><div class='ctx'> 	size = sizeof(struct uv_hub_nmi_s);</div><div class='ctx'> 	for_each_present_cpu(cpu) {</div><div class='del'>-		nid = cpu_to_node(cpu);</div><div class='add'>+		int nid = cpu_to_node(cpu);</div><div class='ctx'> 		if (uv_hub_nmi_list[nid] == NULL) {</div><div class='ctx'> 			uv_hub_nmi_list[nid] = kzalloc_node(size,</div><div class='ctx'> 							    GFP_KERNEL, nid);</div><div class='ctx'> 			BUG_ON(!uv_hub_nmi_list[nid]);</div><div class='ctx'> 			raw_spin_lock_init(&amp;(uv_hub_nmi_list[nid]-&gt;nmi_lock));</div><div class='ctx'> 			atomic_set(&amp;uv_hub_nmi_list[nid]-&gt;cpu_owner, -1);</div><div class='add'>+			uv_hub_nmi_list[nid]-&gt;hub_present = hubbed;</div><div class='add'>+			uv_hub_nmi_list[nid]-&gt;pch_owner = (nid == 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		uv_hub_nmi_per(cpu) = uv_hub_nmi_list[nid];</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG_ON(!alloc_cpumask_var(&amp;uv_nmi_cpu_mask, GFP_KERNEL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Setup for UV Hub systems */</div><div class='add'>+void __init uv_nmi_setup(void)</div><div class='add'>+{</div><div class='add'>+	uv_nmi_setup_mmrs();</div><div class='add'>+	uv_nmi_setup_common(true);</div><div class='add'>+	uv_register_nmi_notifier();</div><div class='add'>+	pr_info("UV: Hub NMI enabled\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Setup for UV Hubless systems */</div><div class='add'>+void __init uv_nmi_setup_hubless(void)</div><div class='add'>+{</div><div class='add'>+	uv_nmi_setup_common(false);</div><div class='add'>+	pch_base = xlate_dev_mem_ptr(PCH_PCR_GPIO_1_BASE);</div><div class='add'>+	nmi_debug("UV: PCH base:%p from 0x%lx, GPP_D_0\n",</div><div class='add'>+		pch_base, PCH_PCR_GPIO_1_BASE);</div><div class='add'>+	if (uv_pch_init_enable)</div><div class='add'>+		uv_init_hubless_pch_d0();</div><div class='add'>+	uv_init_hubless_pch_io(GPI_NMI_ENA_GPP_D_0,</div><div class='add'>+				STS_GPP_D_0_MASK, STS_GPP_D_0_MASK);</div><div class='add'>+	uv_nmi_setup_hubless_intr();</div><div class='add'>+	/* Ensure NMI enabled in Processor Interface Reg: */</div><div class='add'>+	uv_reassert_nmi();</div><div class='ctx'> 	uv_register_nmi_notifier();</div><div class='add'>+	pr_info("UV: Hubless NMI enabled\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c<br/>index b333fc45f9ec..2ee7632d4916 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/platform/uv/uv_time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/platform/uv/uv_time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/platform/uv/uv_time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/platform/uv/uv_time.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #define RTC_NAME		"sgi_rtc"</div><div class='ctx'> </div><div class='del'>-static cycle_t uv_read_rtc(struct clocksource *cs);</div><div class='add'>+static u64 uv_read_rtc(struct clocksource *cs);</div><div class='ctx'> static int uv_rtc_next_event(unsigned long, struct clock_event_device *);</div><div class='ctx'> static int uv_rtc_shutdown(struct clock_event_device *evt);</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +38,7 @@ static struct clocksource clocksource_uv = {</div><div class='ctx'> 	.name		= RTC_NAME,</div><div class='ctx'> 	.rating		= 299,</div><div class='ctx'> 	.read		= uv_read_rtc,</div><div class='del'>-	.mask		= (cycle_t)UVH_RTC_REAL_TIME_CLOCK_MASK,</div><div class='add'>+	.mask		= (u64)UVH_RTC_REAL_TIME_CLOCK_MASK,</div><div class='ctx'> 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -296,7 +296,7 @@ static int uv_rtc_unset_timer(int cpu, int force)</div><div class='ctx'>  * cachelines of it's own page.  This allows faster simultaneous reads</div><div class='ctx'>  * from a given socket.</div><div class='ctx'>  */</div><div class='del'>-static cycle_t uv_read_rtc(struct clocksource *cs)</div><div class='add'>+static u64 uv_read_rtc(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long offset;</div><div class='ctx'> </div><div class='hunk'>@@ -305,7 +305,7 @@ static cycle_t uv_read_rtc(struct clocksource *cs)</div><div class='ctx'> 	else</div><div class='ctx'> 		offset = (uv_blade_processor_id() * L1_CACHE_BYTES) % PAGE_SIZE;</div><div class='ctx'> </div><div class='del'>-	return (cycle_t)uv_read_local_mmr(UVH_RTC | offset);</div><div class='add'>+	return (u64)uv_read_local_mmr(UVH_RTC | offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c<br/>index 53cace2ec0e2..66ade16c7693 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/power/cpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/power/cpu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/power/cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/power/cpu.c</a></div><div class='hunk'>@@ -252,6 +252,7 @@ static void notrace __restore_processor_state(struct saved_context *ctxt)</div><div class='ctx'> 	fix_processor_context();</div><div class='ctx'> </div><div class='ctx'> 	do_fpu_end();</div><div class='add'>+	tsc_verify_tsc_adjust(true);</div><div class='ctx'> 	x86_platform.restore_sched_clock_state();</div><div class='ctx'> 	mtrr_bp_restore();</div><div class='ctx'> 	perf_restore_debug_store();</div><div class='head'>diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c<br/>index 9634557a5444..ded2e8272382 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/power/hibernate_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/power/hibernate_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/power/hibernate_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/power/hibernate_64.c</a></div><div class='hunk'>@@ -11,6 +11,10 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/kdebug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/init.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='hunk'>@@ -177,14 +181,86 @@ int pfn_is_nosave(unsigned long pfn)</div><div class='ctx'> 	return (pfn &gt;= nosave_begin_pfn) &amp;&amp; (pfn &lt; nosave_end_pfn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define MD5_DIGEST_SIZE 16</div><div class='add'>+</div><div class='ctx'> struct restore_data_record {</div><div class='ctx'> 	unsigned long jump_address;</div><div class='ctx'> 	unsigned long jump_address_phys;</div><div class='ctx'> 	unsigned long cr3;</div><div class='ctx'> 	unsigned long magic;</div><div class='add'>+	u8 e820_digest[MD5_DIGEST_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define RESTORE_MAGIC	0x123456789ABCDEF0UL</div><div class='add'>+#define RESTORE_MAGIC	0x23456789ABCDEF01UL</div><div class='add'>+</div><div class='add'>+#if IS_BUILTIN(CONFIG_CRYPTO_MD5)</div><div class='add'>+/**</div><div class='add'>+ * get_e820_md5 - calculate md5 according to given e820 map</div><div class='add'>+ *</div><div class='add'>+ * @map: the e820 map to be calculated</div><div class='add'>+ * @buf: the md5 result to be stored to</div><div class='add'>+ */</div><div class='add'>+static int get_e820_md5(struct e820map *map, void *buf)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist sg;</div><div class='add'>+	struct crypto_ahash *tfm;</div><div class='add'>+	int size;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_ahash("md5", 0, CRYPTO_ALG_ASYNC);</div><div class='add'>+	if (IS_ERR(tfm))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		AHASH_REQUEST_ON_STACK(req, tfm);</div><div class='add'>+		size = offsetof(struct e820map, map)</div><div class='add'>+			+ sizeof(struct e820entry) * map-&gt;nr_map;</div><div class='add'>+		ahash_request_set_tfm(req, tfm);</div><div class='add'>+		sg_init_one(&amp;sg, (u8 *)map, size);</div><div class='add'>+		ahash_request_set_callback(req, 0, NULL, NULL);</div><div class='add'>+		ahash_request_set_crypt(req, &amp;sg, buf, size);</div><div class='add'>+</div><div class='add'>+		if (crypto_ahash_digest(req))</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		ahash_request_zero(req);</div><div class='add'>+	}</div><div class='add'>+	crypto_free_ahash(tfm);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hibernation_e820_save(void *buf)</div><div class='add'>+{</div><div class='add'>+	get_e820_md5(e820_saved, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hibernation_e820_mismatch(void *buf)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 result[MD5_DIGEST_SIZE];</div><div class='add'>+</div><div class='add'>+	memset(result, 0, MD5_DIGEST_SIZE);</div><div class='add'>+	/* If there is no digest in suspend kernel, let it go. */</div><div class='add'>+	if (!memcmp(result, buf, MD5_DIGEST_SIZE))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ret = get_e820_md5(e820_saved, result);</div><div class='add'>+	if (ret)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return memcmp(result, buf, MD5_DIGEST_SIZE) ? true : false;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void hibernation_e820_save(void *buf)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hibernation_e820_mismatch(void *buf)</div><div class='add'>+{</div><div class='add'>+	/* If md5 is not builtin for restore kernel, let it go. */</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	arch_hibernation_header_save - populate the architecture specific part</div><div class='hunk'>@@ -201,6 +277,9 @@ int arch_hibernation_header_save(void *addr, unsigned int max_size)</div><div class='ctx'> 	rdr-&gt;jump_address_phys = __pa_symbol(&amp;restore_registers);</div><div class='ctx'> 	rdr-&gt;cr3 = restore_cr3;</div><div class='ctx'> 	rdr-&gt;magic = RESTORE_MAGIC;</div><div class='add'>+</div><div class='add'>+	hibernation_e820_save(rdr-&gt;e820_digest);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -216,5 +295,16 @@ int arch_hibernation_header_restore(void *addr)</div><div class='ctx'> 	restore_jump_address = rdr-&gt;jump_address;</div><div class='ctx'> 	jump_address_phys = rdr-&gt;jump_address_phys;</div><div class='ctx'> 	restore_cr3 = rdr-&gt;cr3;</div><div class='del'>-	return (rdr-&gt;magic == RESTORE_MAGIC) ? 0 : -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (rdr-&gt;magic != RESTORE_MAGIC) {</div><div class='add'>+		pr_crit("Unrecognized hibernate image header format!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hibernation_e820_mismatch(rdr-&gt;e820_digest)) {</div><div class='add'>+		pr_crit("Hibernate inconsistent memory map detected!\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/ras/Kconfig b/arch/x86/ras/Kconfig<br/>index d957d5f21a86..0bc60a308730 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/ras/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/ras/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/ras/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/ras/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> config MCE_AMD_INJ</div><div class='ctx'> 	tristate "Simple MCE injection interface for AMD processors"</div><div class='del'>-	depends on RAS &amp;&amp; EDAC_DECODE_MCE &amp;&amp; DEBUG_FS &amp;&amp; AMD_NB</div><div class='add'>+	depends on RAS &amp;&amp; X86_MCE &amp;&amp; DEBUG_FS &amp;&amp; AMD_NB</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is a simple debugfs interface to inject MCEs and test different</div><div class='head'>diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c<br/>index 1ac76479c266..8730c2882fff 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/ras/mce_amd_inj.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/ras/mce_amd_inj.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/ras/mce_amd_inj.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/ras/mce_amd_inj.c</a></div><div class='hunk'>@@ -275,6 +275,8 @@ static void do_inject(void)</div><div class='ctx'> 	unsigned int cpu = i_mce.extcpu;</div><div class='ctx'> 	u8 b = i_mce.bank;</div><div class='ctx'> </div><div class='add'>+	rdtscll(i_mce.tsc);</div><div class='add'>+</div><div class='ctx'> 	if (i_mce.misc)</div><div class='ctx'> 		i_mce.status |= MCI_STATUS_MISCV;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile<br/>index 25012abc3409..4463fa72db94 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/realmode/rm/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/realmode/rm/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/realmode/rm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/realmode/rm/Makefile</a></div><div class='hunk'>@@ -69,7 +69,7 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE</div><div class='ctx'> </div><div class='ctx'> # ---------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-KBUILD_CFLAGS	:= $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \</div><div class='add'>+KBUILD_CFLAGS	:= $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \</div><div class='ctx'> 		   -I$(srctree)/arch/x86/boot</div><div class='ctx'> KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__</div><div class='ctx'> GCOV_PROFILE := n</div><div class='head'>diff --git a/arch/x86/tools/insn_sanity.c b/arch/x86/tools/insn_sanity.c<br/>index ba70ff232917..1972565ab106 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/tools/insn_sanity.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/tools/insn_sanity.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/tools/insn_sanity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/tools/insn_sanity.c</a></div><div class='hunk'>@@ -269,7 +269,8 @@ int main(int argc, char **argv)</div><div class='ctx'> 		insns++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fprintf(stdout, "%s: %s: decoded and checked %d %s instructions with %d errors (seed:0x%x)\n",</div><div class='add'>+	fprintf((errors) ? stderr : stdout,</div><div class='add'>+		"%s: %s: decoded and checked %d %s instructions with %d errors (seed:0x%x)\n",</div><div class='ctx'> 		prog,</div><div class='ctx'> 		(errors) ? "Failure" : "Success",</div><div class='ctx'> 		insns,</div><div class='head'>diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c<br/>index 0c2fae8d929d..73eb7fd4aec4 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/tools/relocs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/tools/relocs.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/tools/relocs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/tools/relocs.c</a></div><div class='hunk'>@@ -992,11 +992,12 @@ static void emit_relocs(int as_text, int use_real_mode)</div><div class='ctx'> 		die("Segment relocations found but --realmode not specified\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Order the relocations for more efficient processing */</div><div class='del'>-	sort_relocs(&amp;relocs16);</div><div class='ctx'> 	sort_relocs(&amp;relocs32);</div><div class='ctx'> #if ELF_BITS == 64</div><div class='ctx'> 	sort_relocs(&amp;relocs32neg);</div><div class='ctx'> 	sort_relocs(&amp;relocs64);</div><div class='add'>+#else</div><div class='add'>+	sort_relocs(&amp;relocs16);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Print the relocations */</div><div class='head'>diff --git a/arch/x86/tools/test_get_len.c b/arch/x86/tools/test_get_len.c<br/>index 56f04db0c9c0..ecf31e0358c8 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/tools/test_get_len.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/tools/test_get_len.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/tools/test_get_len.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/tools/test_get_len.c</a></div><div class='hunk'>@@ -167,7 +167,7 @@ int main(int argc, char **argv)</div><div class='ctx'> 		fprintf(stderr, "Warning: decoded and checked %d"</div><div class='ctx'> 			" instructions with %d warnings\n", insns, warnings);</div><div class='ctx'> 	else</div><div class='del'>-		fprintf(stderr, "Succeed: decoded and checked %d"</div><div class='add'>+		fprintf(stdout, "Success: decoded and checked %d"</div><div class='ctx'> 			" instructions\n", insns);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/um/asm/processor.h b/arch/x86/um/asm/processor.h<br/>index 233ee09c1ce8..c77db2288982 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/um/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/um/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/um/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/asm/processor.h</a></div><div class='hunk'>@@ -26,7 +26,6 @@ static inline void rep_nop(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()		rep_nop()</div><div class='del'>-#define cpu_relax_lowlatency()	cpu_relax()</div><div class='ctx'> </div><div class='ctx'> #define task_pt_regs(t) (&amp;(t)-&gt;thread.regs)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/um/ptrace_32.c b/arch/x86/um/ptrace_32.c<br/>index 60a5a5a85505..2497bac56066 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/um/ptrace_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/um/ptrace_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/um/ptrace_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/ptrace_32.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace-abi.h&gt;</div><div class='ctx'> #include &lt;skas.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/um/ptrace_64.c b/arch/x86/um/ptrace_64.c<br/>index e30202b1716e..a5c9910d234f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/um/ptrace_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/um/ptrace_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/um/ptrace_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/ptrace_64.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #define __FRAME_OFFSETS</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace-abi.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c<br/>index 49e503697022..727ed442e0a5 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/um/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/um/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/um/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/signal.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='ctx'> #include &lt;frame_kern.h&gt;</div><div class='ctx'> #include &lt;skas.h&gt;</div><div class='head'>diff --git a/arch/x86/um/syscalls_64.c b/arch/x86/um/syscalls_64.c<br/>index e6552275320b..10d907098c26 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/um/syscalls_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/um/syscalls_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/um/syscalls_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/syscalls_64.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/prctl.h&gt; /* XXX This should get the constants from libc */</div><div class='ctx'> #include &lt;os.h&gt;</div><div class='head'>diff --git a/arch/x86/um/sysrq_32.c b/arch/x86/um/sysrq_32.c<br/>index 16ee0e450e3e..f2383484840d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/um/sysrq_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/um/sysrq_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/um/sysrq_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/sysrq_32.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/sysrq.h&gt;</div><div class='head'>diff --git a/arch/x86/um/sysrq_64.c b/arch/x86/um/sysrq_64.c<br/>index 38b4e4abd0f8..903ad91b624f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/um/sysrq_64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/um/sysrq_64.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/um/sysrq_64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/sysrq_64.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c<br/>index 48e38584d5c1..5bd949da7a4a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/um/tls_32.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/um/tls_32.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/um/tls_32.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/um/tls_32.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace-abi.h&gt;</div><div class='ctx'> #include &lt;os.h&gt;</div><div class='ctx'> #include &lt;skas.h&gt;</div><div class='head'>diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig<br/>index c7b15f3e2cf3..76b6dbd627df 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/Kconfig</a></div><div class='hunk'>@@ -53,5 +53,5 @@ config XEN_DEBUG_FS</div><div class='ctx'> </div><div class='ctx'> config XEN_PVH</div><div class='ctx'> 	bool "Support for running as a PVH guest"</div><div class='del'>-	depends on X86_64 &amp;&amp; XEN &amp;&amp; XEN_PVHVM</div><div class='add'>+	depends on XEN &amp;&amp; XEN_PVHVM &amp;&amp; ACPI</div><div class='ctx'> 	def_bool n</div><div class='head'>diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile<br/>index e47e52787d32..cb0164aee156 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/Makefile</a></div><div class='hunk'>@@ -23,3 +23,4 @@ obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o</div><div class='ctx'> obj-$(CONFIG_XEN_DOM0)		+= vga.o</div><div class='ctx'> obj-$(CONFIG_SWIOTLB_XEN)	+= pci-swiotlb-xen.o</div><div class='ctx'> obj-$(CONFIG_XEN_EFI)		+= efi.o</div><div class='add'>+obj-$(CONFIG_XEN_PVH)	 	+= xen-pvh.o</div><div class='head'>diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c<br/>index 44c88ad1841a..bcea81f36fc5 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/apic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/apic.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/apic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/apic.c</a></div><div class='hunk'>@@ -145,7 +145,7 @@ static void xen_silent_inquire(int apicid)</div><div class='ctx'> static int xen_cpu_present_to_apicid(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	if (cpu_present(cpu))</div><div class='del'>-		return xen_get_apic_id(xen_apic_read(APIC_ID));</div><div class='add'>+		return cpu_data(cpu).apicid;</div><div class='ctx'> 	else</div><div class='ctx'> 		return BAD_APICID;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c<br/>index bdd855685403..ec1d5c46e58f 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/enlighten.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/enlighten.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/enlighten.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/enlighten.c</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'> #include &lt;xen/interface/memory.h&gt;</div><div class='ctx'> #include &lt;xen/interface/nmi.h&gt;</div><div class='ctx'> #include &lt;xen/interface/xen-mca.h&gt;</div><div class='add'>+#include &lt;xen/interface/hvm/start_info.h&gt;</div><div class='ctx'> #include &lt;xen/features.h&gt;</div><div class='ctx'> #include &lt;xen/page.h&gt;</div><div class='ctx'> #include &lt;xen/hvm.h&gt;</div><div class='hunk'>@@ -176,6 +177,20 @@ struct tls_descs {</div><div class='ctx'>  */</div><div class='ctx'> static DEFINE_PER_CPU(struct tls_descs, shadow_tls_desc);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_XEN_PVH</div><div class='add'>+/*</div><div class='add'>+ * PVH variables.</div><div class='add'>+ *</div><div class='add'>+ * xen_pvh and pvh_bootparams need to live in data segment since they</div><div class='add'>+ * are used after startup_{32|64}, which clear .bss, are invoked.</div><div class='add'>+ */</div><div class='add'>+bool xen_pvh __attribute__((section(".data"))) = 0;</div><div class='add'>+struct boot_params pvh_bootparams __attribute__((section(".data")));</div><div class='add'>+</div><div class='add'>+struct hvm_start_info pvh_start_info;</div><div class='add'>+unsigned int pvh_start_info_sz = sizeof(pvh_start_info);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void clamp_max_cpus(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -980,17 +995,6 @@ static void xen_io_delay(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xen_clts(void)</div><div class='del'>-{</div><div class='del'>-	struct multicall_space mcs;</div><div class='del'>-</div><div class='del'>-	mcs = xen_mc_entry(0);</div><div class='del'>-</div><div class='del'>-	MULTI_fpu_taskswitch(mcs.mc, 0);</div><div class='del'>-</div><div class='del'>-	xen_mc_issue(PARAVIRT_LAZY_CPU);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static DEFINE_PER_CPU(unsigned long, xen_cr0_value);</div><div class='ctx'> </div><div class='ctx'> static unsigned long xen_read_cr0(void)</div><div class='hunk'>@@ -1149,10 +1153,11 @@ void xen_setup_vcpu_info_placement(void)</div><div class='ctx'> 		xen_vcpu_setup(cpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* xen_vcpu_setup managed to place the vcpu_info within the</div><div class='del'>-	 * percpu area for all cpus, so make use of it. Note that for</div><div class='del'>-	 * PVH we want to use native IRQ mechanism. */</div><div class='del'>-	if (have_vcpu_info_placement &amp;&amp; !xen_pvh_domain()) {</div><div class='add'>+	/*</div><div class='add'>+	 * xen_vcpu_setup managed to place the vcpu_info within the</div><div class='add'>+	 * percpu area for all cpus, so make use of it.</div><div class='add'>+	 */</div><div class='add'>+	if (have_vcpu_info_placement) {</div><div class='ctx'> 		pv_irq_ops.save_fl = __PV_IS_CALLEE_SAVE(xen_save_fl_direct);</div><div class='ctx'> 		pv_irq_ops.restore_fl = __PV_IS_CALLEE_SAVE(xen_restore_fl_direct);</div><div class='ctx'> 		pv_irq_ops.irq_disable = __PV_IS_CALLEE_SAVE(xen_irq_disable_direct);</div><div class='hunk'>@@ -1233,8 +1238,6 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = {</div><div class='ctx'> 	.set_debugreg = xen_set_debugreg,</div><div class='ctx'> 	.get_debugreg = xen_get_debugreg,</div><div class='ctx'> </div><div class='del'>-	.clts = xen_clts,</div><div class='del'>-</div><div class='ctx'> 	.read_cr0 = xen_read_cr0,</div><div class='ctx'> 	.write_cr0 = xen_write_cr0,</div><div class='ctx'> </div><div class='hunk'>@@ -1426,49 +1429,9 @@ static void __init xen_boot_params_init_edd(void)</div><div class='ctx'>  * Set up the GDT and segment registers for -fstack-protector.  Until</div><div class='ctx'>  * we do this, we have to be careful not to call any stack-protected</div><div class='ctx'>  * function, which is most of the kernel.</div><div class='del'>- *</div><div class='del'>- * Note, that it is __ref because the only caller of this after init</div><div class='del'>- * is PVH which is not going to use xen_load_gdt_boot or other</div><div class='del'>- * __init functions.</div><div class='ctx'>  */</div><div class='del'>-static void __ref xen_setup_gdt(int cpu)</div><div class='add'>+static void xen_setup_gdt(int cpu)</div><div class='ctx'> {</div><div class='del'>-	if (xen_feature(XENFEAT_auto_translated_physmap)) {</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-		unsigned long dummy;</div><div class='del'>-</div><div class='del'>-		load_percpu_segment(cpu); /* We need to access per-cpu area */</div><div class='del'>-		switch_to_new_gdt(cpu); /* GDT and GS set */</div><div class='del'>-</div><div class='del'>-		/* We are switching of the Xen provided GDT to our HVM mode</div><div class='del'>-		 * GDT. The new GDT has  __KERNEL_CS with CS.L = 1</div><div class='del'>-		 * and we are jumping to reload it.</div><div class='del'>-		 */</div><div class='del'>-		asm volatile ("pushq %0\n"</div><div class='del'>-			      "leaq 1f(%%rip),%0\n"</div><div class='del'>-			      "pushq %0\n"</div><div class='del'>-			      "lretq\n"</div><div class='del'>-			      "1:\n"</div><div class='del'>-			      : "=&amp;r" (dummy) : "0" (__KERNEL_CS));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * While not needed, we also set the %es, %ds, and %fs</div><div class='del'>-		 * to zero. We don't care about %ss as it is NULL.</div><div class='del'>-		 * Strictly speaking this is not needed as Xen zeros those</div><div class='del'>-		 * out (and also MSR_FS_BASE, MSR_GS_BASE, MSR_KERNEL_GS_BASE)</div><div class='del'>-		 *</div><div class='del'>-		 * Linux zeros them in cpu_init() and in secondary_startup_64</div><div class='del'>-		 * (for BSP).</div><div class='del'>-		 */</div><div class='del'>-		loadsegment(es, 0);</div><div class='del'>-		loadsegment(ds, 0);</div><div class='del'>-		loadsegment(fs, 0);</div><div class='del'>-#else</div><div class='del'>-		/* PVH: TODO Implement. */</div><div class='del'>-		BUG();</div><div class='del'>-#endif</div><div class='del'>-		return; /* PVH does not need any PV GDT ops. */</div><div class='del'>-	}</div><div class='ctx'> 	pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;</div><div class='ctx'> 	pv_cpu_ops.load_gdt = xen_load_gdt_boot;</div><div class='ctx'> </div><div class='hunk'>@@ -1479,59 +1442,6 @@ static void __ref xen_setup_gdt(int cpu)</div><div class='ctx'> 	pv_cpu_ops.load_gdt = xen_load_gdt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_XEN_PVH</div><div class='del'>-/*</div><div class='del'>- * A PV guest starts with default flags that are not set for PVH, set them</div><div class='del'>- * here asap.</div><div class='del'>- */</div><div class='del'>-static void xen_pvh_set_cr_flags(int cpu)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/* Some of these are setup in 'secondary_startup_64'. The others:</div><div class='del'>-	 * X86_CR0_TS, X86_CR0_PE, X86_CR0_ET are set by Xen for HVM guests</div><div class='del'>-	 * (which PVH shared codepaths), while X86_CR0_PG is for PVH. */</div><div class='del'>-	write_cr0(read_cr0() | X86_CR0_MP | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM);</div><div class='del'>-</div><div class='del'>-	if (!cpu)</div><div class='del'>-		return;</div><div class='del'>-	/*</div><div class='del'>-	 * For BSP, PSE PGE are set in probe_page_size_mask(), for APs</div><div class='del'>-	 * set them here. For all, OSFXSR OSXMMEXCPT are set in fpu__init_cpu().</div><div class='del'>-	*/</div><div class='del'>-	if (boot_cpu_has(X86_FEATURE_PSE))</div><div class='del'>-		cr4_set_bits_and_update_boot(X86_CR4_PSE);</div><div class='del'>-</div><div class='del'>-	if (boot_cpu_has(X86_FEATURE_PGE))</div><div class='del'>-		cr4_set_bits_and_update_boot(X86_CR4_PGE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Note, that it is ref - because the only caller of this after init</div><div class='del'>- * is PVH which is not going to use xen_load_gdt_boot or other</div><div class='del'>- * __init functions.</div><div class='del'>- */</div><div class='del'>-void __ref xen_pvh_secondary_vcpu_init(int cpu)</div><div class='del'>-{</div><div class='del'>-	xen_setup_gdt(cpu);</div><div class='del'>-	xen_pvh_set_cr_flags(cpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init xen_pvh_early_guest_init(void)</div><div class='del'>-{</div><div class='del'>-	if (!xen_feature(XENFEAT_auto_translated_physmap))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!xen_feature(XENFEAT_hvm_callback_vector));</div><div class='del'>-</div><div class='del'>-	xen_pvh_early_cpu_init(0, false);</div><div class='del'>-	xen_pvh_set_cr_flags(0);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-	BUG(); /* PVH: Implement proper support. */</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-#endif    /* CONFIG_XEN_PVH */</div><div class='del'>-</div><div class='ctx'> static void __init xen_dom0_set_legacy_features(void)</div><div class='ctx'> {</div><div class='ctx'> 	x86_platform.legacy.rtc = 1;</div><div class='hunk'>@@ -1542,11 +1452,11 @@ static int xen_cpuhp_setup(void)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = cpuhp_setup_state_nocalls(CPUHP_XEN_PREPARE,</div><div class='del'>-				       "XEN_HVM_GUEST_PREPARE",</div><div class='add'>+				       "x86/xen/hvm_guest:prepare",</div><div class='ctx'> 				       xen_cpu_up_prepare, xen_cpu_dead);</div><div class='ctx'> 	if (rc &gt;= 0) {</div><div class='ctx'> 		rc = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,</div><div class='del'>-					       "XEN_HVM_GUEST_ONLINE",</div><div class='add'>+					       "x86/xen/hvm_guest:online",</div><div class='ctx'> 					       xen_cpu_up_online, NULL);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			cpuhp_remove_state_nocalls(CPUHP_XEN_PREPARE);</div><div class='hunk'>@@ -1568,24 +1478,17 @@ asmlinkage __visible void __init xen_start_kernel(void)</div><div class='ctx'> 	xen_domain_type = XEN_PV_DOMAIN;</div><div class='ctx'> </div><div class='ctx'> 	xen_setup_features();</div><div class='del'>-#ifdef CONFIG_XEN_PVH</div><div class='del'>-	xen_pvh_early_guest_init();</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	xen_setup_machphys_mapping();</div><div class='ctx'> </div><div class='ctx'> 	/* Install Xen paravirt ops */</div><div class='ctx'> 	pv_info = xen_info;</div><div class='ctx'> 	pv_init_ops = xen_init_ops;</div><div class='del'>-	if (!xen_pvh_domain()) {</div><div class='del'>-		pv_cpu_ops = xen_cpu_ops;</div><div class='add'>+	pv_cpu_ops = xen_cpu_ops;</div><div class='ctx'> </div><div class='del'>-		x86_platform.get_nmi_reason = xen_get_nmi_reason;</div><div class='del'>-	}</div><div class='add'>+	x86_platform.get_nmi_reason = xen_get_nmi_reason;</div><div class='ctx'> </div><div class='del'>-	if (xen_feature(XENFEAT_auto_translated_physmap))</div><div class='del'>-		x86_init.resources.memory_setup = xen_auto_xlated_memory_setup;</div><div class='del'>-	else</div><div class='del'>-		x86_init.resources.memory_setup = xen_memory_setup;</div><div class='add'>+	x86_init.resources.memory_setup = xen_memory_setup;</div><div class='ctx'> 	x86_init.oem.arch_setup = xen_arch_setup;</div><div class='ctx'> 	x86_init.oem.banner = xen_banner;</div><div class='ctx'> </div><div class='hunk'>@@ -1678,18 +1581,15 @@ asmlinkage __visible void __init xen_start_kernel(void)</div><div class='ctx'> 	/* set the limit of our address space */</div><div class='ctx'> 	xen_reserve_top();</div><div class='ctx'> </div><div class='del'>-	/* PVH: runs at default kernel iopl of 0 */</div><div class='del'>-	if (!xen_pvh_domain()) {</div><div class='del'>-		/*</div><div class='del'>-		 * We used to do this in xen_arch_setup, but that is too late</div><div class='del'>-		 * on AMD were early_cpu_init (run before -&gt;arch_setup()) calls</div><div class='del'>-		 * early_amd_init which pokes 0xcf8 port.</div><div class='del'>-		 */</div><div class='del'>-		set_iopl.iopl = 1;</div><div class='del'>-		rc = HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &amp;set_iopl);</div><div class='del'>-		if (rc != 0)</div><div class='del'>-			xen_raw_printk("physdev_op failed %d\n", rc);</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * We used to do this in xen_arch_setup, but that is too late</div><div class='add'>+	 * on AMD were early_cpu_init (run before -&gt;arch_setup()) calls</div><div class='add'>+	 * early_amd_init which pokes 0xcf8 port.</div><div class='add'>+	 */</div><div class='add'>+	set_iopl.iopl = 1;</div><div class='add'>+	rc = HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &amp;set_iopl);</div><div class='add'>+	if (rc != 0)</div><div class='add'>+		xen_raw_printk("physdev_op failed %d\n", rc);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> 	/* set up basic CPUID stuff */</div><div class='hunk'>@@ -1771,6 +1671,102 @@ asmlinkage __visible void __init xen_start_kernel(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_XEN_PVH</div><div class='add'>+</div><div class='add'>+static void xen_pvh_arch_setup(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+	/* Make sure we don't fall back to (default) ACPI_IRQ_MODEL_PIC. */</div><div class='add'>+	if (nr_ioapics == 0)</div><div class='add'>+		acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init init_pvh_bootparams(void)</div><div class='add'>+{</div><div class='add'>+	struct xen_memory_map memmap;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	memset(&amp;pvh_bootparams, 0, sizeof(pvh_bootparams));</div><div class='add'>+</div><div class='add'>+	memmap.nr_entries = ARRAY_SIZE(pvh_bootparams.e820_map);</div><div class='add'>+	set_xen_guest_handle(memmap.buffer, pvh_bootparams.e820_map);</div><div class='add'>+	rc = HYPERVISOR_memory_op(XENMEM_memory_map, &amp;memmap);</div><div class='add'>+	if (rc) {</div><div class='add'>+		xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (memmap.nr_entries &lt; E820MAX - 1) {</div><div class='add'>+		pvh_bootparams.e820_map[memmap.nr_entries].addr =</div><div class='add'>+			ISA_START_ADDRESS;</div><div class='add'>+		pvh_bootparams.e820_map[memmap.nr_entries].size =</div><div class='add'>+			ISA_END_ADDRESS - ISA_START_ADDRESS;</div><div class='add'>+		pvh_bootparams.e820_map[memmap.nr_entries].type =</div><div class='add'>+			E820_RESERVED;</div><div class='add'>+		memmap.nr_entries++;</div><div class='add'>+	} else</div><div class='add'>+		xen_raw_printk("Warning: Can fit ISA range into e820\n");</div><div class='add'>+</div><div class='add'>+	sanitize_e820_map(pvh_bootparams.e820_map,</div><div class='add'>+			  ARRAY_SIZE(pvh_bootparams.e820_map),</div><div class='add'>+			  &amp;memmap.nr_entries);</div><div class='add'>+</div><div class='add'>+	pvh_bootparams.e820_entries = memmap.nr_entries;</div><div class='add'>+	for (i = 0; i &lt; pvh_bootparams.e820_entries; i++)</div><div class='add'>+		e820_add_region(pvh_bootparams.e820_map[i].addr,</div><div class='add'>+				pvh_bootparams.e820_map[i].size,</div><div class='add'>+				pvh_bootparams.e820_map[i].type);</div><div class='add'>+</div><div class='add'>+	pvh_bootparams.hdr.cmd_line_ptr =</div><div class='add'>+		pvh_start_info.cmdline_paddr;</div><div class='add'>+</div><div class='add'>+	/* The first module is always ramdisk. */</div><div class='add'>+	if (pvh_start_info.nr_modules) {</div><div class='add'>+		struct hvm_modlist_entry *modaddr =</div><div class='add'>+			__va(pvh_start_info.modlist_paddr);</div><div class='add'>+		pvh_bootparams.hdr.ramdisk_image = modaddr-&gt;paddr;</div><div class='add'>+		pvh_bootparams.hdr.ramdisk_size = modaddr-&gt;size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * See Documentation/x86/boot.txt.</div><div class='add'>+	 *</div><div class='add'>+	 * Version 2.12 supports Xen entry point but we will use default x86/PC</div><div class='add'>+	 * environment (i.e. hardware_subarch 0).</div><div class='add'>+	 */</div><div class='add'>+	pvh_bootparams.hdr.version = 0x212;</div><div class='add'>+	pvh_bootparams.hdr.type_of_loader = (9 &lt;&lt; 4) | 0; /* Xen loader */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This routine (and those that it might call) should not use</div><div class='add'>+ * anything that lives in .bss since that segment will be cleared later.</div><div class='add'>+ */</div><div class='add'>+void __init xen_prepare_pvh(void)</div><div class='add'>+{</div><div class='add'>+	u32 msr;</div><div class='add'>+	u64 pfn;</div><div class='add'>+</div><div class='add'>+	if (pvh_start_info.magic != XEN_HVM_START_MAGIC_VALUE) {</div><div class='add'>+		xen_raw_printk("Error: Unexpected magic value (0x%08x)\n",</div><div class='add'>+				pvh_start_info.magic);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xen_pvh = 1;</div><div class='add'>+</div><div class='add'>+	msr = cpuid_ebx(xen_cpuid_base() + 2);</div><div class='add'>+	pfn = __pa(hypercall_page);</div><div class='add'>+	wrmsr_safe(msr, (u32)pfn, (u32)(pfn &gt;&gt; 32));</div><div class='add'>+</div><div class='add'>+	init_pvh_bootparams();</div><div class='add'>+</div><div class='add'>+	x86_init.oem.arch_setup = xen_pvh_arch_setup;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void __ref xen_hvm_init_shared_info(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -1810,20 +1806,29 @@ void __ref xen_hvm_init_shared_info(void)</div><div class='ctx'> static void __init init_hvm_pv_info(void)</div><div class='ctx'> {</div><div class='ctx'> 	int major, minor;</div><div class='del'>-	uint32_t eax, ebx, ecx, edx, pages, msr, base;</div><div class='del'>-	u64 pfn;</div><div class='add'>+	uint32_t eax, ebx, ecx, edx, base;</div><div class='ctx'> </div><div class='ctx'> 	base = xen_cpuid_base();</div><div class='del'>-	cpuid(base + 1, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='add'>+	eax = cpuid_eax(base + 1);</div><div class='ctx'> </div><div class='ctx'> 	major = eax &gt;&gt; 16;</div><div class='ctx'> 	minor = eax &amp; 0xffff;</div><div class='ctx'> 	printk(KERN_INFO "Xen version %d.%d.\n", major, minor);</div><div class='ctx'> </div><div class='del'>-	cpuid(base + 2, &amp;pages, &amp;msr, &amp;ecx, &amp;edx);</div><div class='add'>+	xen_domain_type = XEN_HVM_DOMAIN;</div><div class='ctx'> </div><div class='del'>-	pfn = __pa(hypercall_page);</div><div class='del'>-	wrmsr_safe(msr, (u32)pfn, (u32)(pfn &gt;&gt; 32));</div><div class='add'>+	/* PVH set up hypercall page in xen_prepare_pvh(). */</div><div class='add'>+	if (xen_pvh_domain())</div><div class='add'>+		pv_info.name = "Xen PVH";</div><div class='add'>+	else {</div><div class='add'>+		u64 pfn;</div><div class='add'>+		uint32_t msr;</div><div class='add'>+</div><div class='add'>+		pv_info.name = "Xen HVM";</div><div class='add'>+		msr = cpuid_ebx(base + 2);</div><div class='add'>+		pfn = __pa(hypercall_page);</div><div class='add'>+		wrmsr_safe(msr, (u32)pfn, (u32)(pfn &gt;&gt; 32));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	xen_setup_features();</div><div class='ctx'> </div><div class='hunk'>@@ -1832,10 +1837,6 @@ static void __init init_hvm_pv_info(void)</div><div class='ctx'> 		this_cpu_write(xen_vcpu_id, ebx);</div><div class='ctx'> 	else</div><div class='ctx'> 		this_cpu_write(xen_vcpu_id, smp_processor_id());</div><div class='del'>-</div><div class='del'>-	pv_info.name = "Xen HVM";</div><div class='del'>-</div><div class='del'>-	xen_domain_type = XEN_HVM_DOMAIN;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1923,6 +1924,9 @@ static void __init xen_hvm_guest_init(void)</div><div class='ctx'> 	x86_init.irqs.intr_init = xen_init_IRQ;</div><div class='ctx'> 	xen_hvm_init_time_ops();</div><div class='ctx'> 	xen_hvm_init_mmu_ops();</div><div class='add'>+</div><div class='add'>+	if (xen_pvh_domain())</div><div class='add'>+		machine_ops.emergency_restart = xen_emergency_restart;</div><div class='ctx'> #ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> 	machine_ops.shutdown = xen_hvm_shutdown;</div><div class='ctx'> 	machine_ops.crash_shutdown = xen_hvm_crash_shutdown;</div><div class='head'>diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c<br/>index 7d5afdb417cc..37cb5aad71de 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/mmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/mmu.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/mmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/mmu.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Jeremy Fitzhardinge &lt;jeremy@xensource.com&gt;, XenSource Inc, 2007</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='hunk'>@@ -1792,10 +1792,6 @@ static void __init set_page_prot_flags(void *addr, pgprot_t prot,</div><div class='ctx'> 	unsigned long pfn = __pa(addr) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	pte_t pte = pfn_pte(pfn, prot);</div><div class='ctx'> </div><div class='del'>-	/* For PVH no need to set R/O or R/W to pin them or unpin them. */</div><div class='del'>-	if (xen_feature(XENFEAT_auto_translated_physmap))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (HYPERVISOR_update_va_mapping((unsigned long)addr, pte, flags))</div><div class='ctx'> 		BUG();</div><div class='ctx'> }</div><div class='hunk'>@@ -1902,8 +1898,7 @@ static void __init check_pt_base(unsigned long *pt_base, unsigned long *pt_end,</div><div class='ctx'>  * level2_ident_pgt, and level2_kernel_pgt.  This means that only the</div><div class='ctx'>  * kernel has a physical mapping to start with - but that's enough to</div><div class='ctx'>  * get __va working.  We need to fill in the rest of the physical</div><div class='del'>- * mapping once some sort of allocator has been set up.  NOTE: for</div><div class='del'>- * PVH, the page tables are native.</div><div class='add'>+ * mapping once some sort of allocator has been set up.</div><div class='ctx'>  */</div><div class='ctx'> void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)</div><div class='ctx'> {</div><div class='hunk'>@@ -2812,16 +2807,6 @@ static int do_remap_gfn(struct vm_area_struct *vma,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!((vma-&gt;vm_flags &amp; (VM_PFNMAP | VM_IO)) == (VM_PFNMAP | VM_IO)));</div><div class='ctx'> </div><div class='del'>-	if (xen_feature(XENFEAT_auto_translated_physmap)) {</div><div class='del'>-#ifdef CONFIG_XEN_PVH</div><div class='del'>-		/* We need to update the local page tables and the xen HAP */</div><div class='del'>-		return xen_xlate_remap_gfn_array(vma, addr, gfn, nr, err_ptr,</div><div class='del'>-						 prot, domid, pages);</div><div class='del'>-#else</div><div class='del'>-		return -EINVAL;</div><div class='del'>-#endif</div><div class='del'>-        }</div><div class='del'>-</div><div class='ctx'> 	rmd.mfn = gfn;</div><div class='ctx'> 	rmd.prot = prot;</div><div class='ctx'> 	/* We use the err_ptr to indicate if there we are doing a contiguous</div><div class='hunk'>@@ -2915,10 +2900,6 @@ int xen_unmap_domain_gfn_range(struct vm_area_struct *vma,</div><div class='ctx'> 	if (!pages || !xen_feature(XENFEAT_auto_translated_physmap))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_XEN_PVH</div><div class='del'>-	return xen_xlate_unmap_gfn_range(vma, numpgs, pages);</div><div class='del'>-#else</div><div class='ctx'> 	return -EINVAL;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(xen_unmap_domain_gfn_range);</div><div class='head'>diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c<br/>index 37129db76d33..276da636dd39 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/p2m.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/p2m.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/p2m.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/p2m.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/xen/page.h&gt;</div><div class='ctx'> #include &lt;asm/xen/hypercall.h&gt;</div><div class='head'>diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c<br/>index 0e98e5d241d0..42b08f8fc2ca 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/pci-swiotlb-xen.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/pci-swiotlb-xen.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/pci-swiotlb-xen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/pci-swiotlb-xen.c</a></div><div class='hunk'>@@ -18,8 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> int xen_swiotlb __read_mostly;</div><div class='ctx'> </div><div class='del'>-static struct dma_map_ops xen_swiotlb_dma_ops = {</div><div class='del'>-	.mapping_error = xen_swiotlb_dma_mapping_error,</div><div class='add'>+static const struct dma_map_ops xen_swiotlb_dma_ops = {</div><div class='ctx'> 	.alloc = xen_swiotlb_alloc_coherent,</div><div class='ctx'> 	.free = xen_swiotlb_free_coherent,</div><div class='ctx'> 	.sync_single_for_cpu = xen_swiotlb_sync_single_for_cpu,</div><div class='hunk'>@@ -49,7 +48,7 @@ int __init pci_xen_swiotlb_detect(void)</div><div class='ctx'> 	 * activate this IOMMU. If running as PV privileged, activate it</div><div class='ctx'> 	 * irregardless.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((xen_initial_domain() || swiotlb || swiotlb_force))</div><div class='add'>+	if (xen_initial_domain() || swiotlb || swiotlb_force == SWIOTLB_FORCE)</div><div class='ctx'> 		xen_swiotlb = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* If we are running under Xen, we MUST disable the native SWIOTLB.</div><div class='head'>diff --git a/arch/x86/xen/platform-pci-unplug.c b/arch/x86/xen/platform-pci-unplug.c<br/>index 90d1b83cf35f..33a783c77d96 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/platform-pci-unplug.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/platform-pci-unplug.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/platform-pci-unplug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/platform-pci-unplug.c</a></div><div class='hunk'>@@ -73,8 +73,8 @@ bool xen_has_pv_devices(void)</div><div class='ctx'> 	if (!xen_domain())</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	/* PV domains always have them. */</div><div class='del'>-	if (xen_pv_domain())</div><div class='add'>+	/* PV and PVH domains always have them. */</div><div class='add'>+	if (xen_pv_domain() || xen_pvh_domain())</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* And user has xen_platform_pci=0 set in guest config as</div><div class='head'>diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c<br/>index f8960fca0827..a8c306cf8868 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/setup.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS] __initdata;</div><div class='ctx'> unsigned long xen_released_pages;</div><div class='ctx'> </div><div class='ctx'> /* E820 map used during setting up memory. */</div><div class='del'>-static struct e820entry xen_e820_map[E820MAX] __initdata;</div><div class='add'>+static struct e820entry xen_e820_map[E820_X_MAX] __initdata;</div><div class='ctx'> static u32 xen_e820_map_entries __initdata;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -713,10 +713,9 @@ static void __init xen_reserve_xen_mfnlist(void)</div><div class='ctx'> 		size = PFN_PHYS(xen_start_info-&gt;nr_p2m_frames);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!xen_is_e820_reserved(start, size)) {</div><div class='del'>-		memblock_reserve(start, size);</div><div class='add'>+	memblock_reserve(start, size);</div><div class='add'>+	if (!xen_is_e820_reserved(start, size))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -727,6 +726,7 @@ static void __init xen_reserve_xen_mfnlist(void)</div><div class='ctx'> 	BUG();</div><div class='ctx'> #else</div><div class='ctx'> 	xen_relocate_p2m();</div><div class='add'>+	memblock_free(start, size);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -750,7 +750,7 @@ char * __init xen_memory_setup(void)</div><div class='ctx'> 	max_pfn = min(max_pfn, xen_start_info-&gt;nr_pages);</div><div class='ctx'> 	mem_end = PFN_PHYS(max_pfn);</div><div class='ctx'> </div><div class='del'>-	memmap.nr_entries = E820MAX;</div><div class='add'>+	memmap.nr_entries = ARRAY_SIZE(xen_e820_map);</div><div class='ctx'> 	set_xen_guest_handle(memmap.buffer, xen_e820_map);</div><div class='ctx'> </div><div class='ctx'> 	op = xen_initial_domain() ?</div><div class='hunk'>@@ -915,39 +915,6 @@ char * __init xen_memory_setup(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Machine specific memory setup for auto-translated guests.</div><div class='del'>- */</div><div class='del'>-char * __init xen_auto_xlated_memory_setup(void)</div><div class='del'>-{</div><div class='del'>-	struct xen_memory_map memmap;</div><div class='del'>-	int i;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	memmap.nr_entries = E820MAX;</div><div class='del'>-	set_xen_guest_handle(memmap.buffer, xen_e820_map);</div><div class='del'>-</div><div class='del'>-	rc = HYPERVISOR_memory_op(XENMEM_memory_map, &amp;memmap);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		panic("No memory map (%d)\n", rc);</div><div class='del'>-</div><div class='del'>-	xen_e820_map_entries = memmap.nr_entries;</div><div class='del'>-</div><div class='del'>-	sanitize_e820_map(xen_e820_map, ARRAY_SIZE(xen_e820_map),</div><div class='del'>-			  &amp;xen_e820_map_entries);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; xen_e820_map_entries; i++)</div><div class='del'>-		e820_add_region(xen_e820_map[i].addr, xen_e820_map[i].size,</div><div class='del'>-				xen_e820_map[i].type);</div><div class='del'>-</div><div class='del'>-	/* Remove p2m info, it is not needed. */</div><div class='del'>-	xen_start_info-&gt;mfn_list = 0;</div><div class='del'>-	xen_start_info-&gt;first_p2m_pfn = 0;</div><div class='del'>-	xen_start_info-&gt;nr_p2m_frames = 0;</div><div class='del'>-</div><div class='del'>-	return "Xen";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Set the bit indicating "nosegneg" library variants should be used.</div><div class='ctx'>  * We only need to bother in pure 32-bit mode; compat 32-bit processes</div><div class='ctx'>  * can have un-truncated segments, so wrapping around is allowed.</div><div class='hunk'>@@ -1032,8 +999,8 @@ void __init xen_pvmmu_arch_setup(void)</div><div class='ctx'> void __init xen_arch_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	xen_panic_handler_init();</div><div class='del'>-	if (!xen_feature(XENFEAT_auto_translated_physmap))</div><div class='del'>-		xen_pvmmu_arch_setup();</div><div class='add'>+</div><div class='add'>+	xen_pvmmu_arch_setup();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> 	if (!(xen_start_info-&gt;flags &amp; SIF_INITDOMAIN)) {</div><div class='head'>diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c<br/>index 9fa27ceeecfd..7ff2f1bfb7ec 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/smp.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/irq_work.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='add'>+#include &lt;linux/nmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/paravirt.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='hunk'>@@ -87,12 +88,6 @@ static void cpu_bringup(void)</div><div class='ctx'> 	cpu_data(cpu).x86_max_cores = 1;</div><div class='ctx'> 	set_cpu_sibling_map(cpu);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * identify_cpu() may have set logical_pkg_id to -1 due</div><div class='del'>-	 * to incorrect phys_proc_id. Let's re-comupte it.</div><div class='del'>-	 */</div><div class='del'>-	topology_update_package_map(apic-&gt;cpu_present_to_apicid(cpu), cpu);</div><div class='del'>-</div><div class='ctx'> 	xen_setup_cpu_clockevents();</div><div class='ctx'> </div><div class='ctx'> 	notify_cpu_starting(cpu);</div><div class='hunk'>@@ -105,18 +100,8 @@ static void cpu_bringup(void)</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Note: cpu parameter is only relevant for PVH. The reason for passing it</div><div class='del'>- * is we can't do smp_processor_id until the percpu segments are loaded, for</div><div class='del'>- * which we need the cpu number! So we pass it in rdi as first parameter.</div><div class='del'>- */</div><div class='del'>-asmlinkage __visible void cpu_bringup_and_idle(int cpu)</div><div class='add'>+asmlinkage __visible void cpu_bringup_and_idle(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_XEN_PVH</div><div class='del'>-	if (xen_feature(XENFEAT_auto_translated_physmap) &amp;&amp;</div><div class='del'>-	    xen_feature(XENFEAT_supervisor_mode_kernel))</div><div class='del'>-		xen_pvh_secondary_vcpu_init(cpu);</div><div class='del'>-#endif</div><div class='ctx'> 	cpu_bringup();</div><div class='ctx'> 	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);</div><div class='ctx'> }</div><div class='hunk'>@@ -410,61 +395,47 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> 	gdt = get_cpu_gdt_table(cpu);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='del'>-	/* Note: PVH is not yet supported on x86_32. */</div><div class='ctx'> 	ctxt-&gt;user_regs.fs = __KERNEL_PERCPU;</div><div class='ctx'> 	ctxt-&gt;user_regs.gs = __KERNEL_STACK_CANARY;</div><div class='ctx'> #endif</div><div class='ctx'> 	memset(&amp;ctxt-&gt;fpu_ctxt, 0, sizeof(ctxt-&gt;fpu_ctxt));</div><div class='ctx'> </div><div class='del'>-	if (!xen_feature(XENFEAT_auto_translated_physmap)) {</div><div class='del'>-		ctxt-&gt;user_regs.eip = (unsigned long)cpu_bringup_and_idle;</div><div class='del'>-		ctxt-&gt;flags = VGCF_IN_KERNEL;</div><div class='del'>-		ctxt-&gt;user_regs.eflags = 0x1000; /* IOPL_RING1 */</div><div class='del'>-		ctxt-&gt;user_regs.ds = __USER_DS;</div><div class='del'>-		ctxt-&gt;user_regs.es = __USER_DS;</div><div class='del'>-		ctxt-&gt;user_regs.ss = __KERNEL_DS;</div><div class='add'>+	ctxt-&gt;user_regs.eip = (unsigned long)cpu_bringup_and_idle;</div><div class='add'>+	ctxt-&gt;flags = VGCF_IN_KERNEL;</div><div class='add'>+	ctxt-&gt;user_regs.eflags = 0x1000; /* IOPL_RING1 */</div><div class='add'>+	ctxt-&gt;user_regs.ds = __USER_DS;</div><div class='add'>+	ctxt-&gt;user_regs.es = __USER_DS;</div><div class='add'>+	ctxt-&gt;user_regs.ss = __KERNEL_DS;</div><div class='ctx'> </div><div class='del'>-		xen_copy_trap_info(ctxt-&gt;trap_ctxt);</div><div class='add'>+	xen_copy_trap_info(ctxt-&gt;trap_ctxt);</div><div class='ctx'> </div><div class='del'>-		ctxt-&gt;ldt_ents = 0;</div><div class='add'>+	ctxt-&gt;ldt_ents = 0;</div><div class='ctx'> </div><div class='del'>-		BUG_ON((unsigned long)gdt &amp; ~PAGE_MASK);</div><div class='add'>+	BUG_ON((unsigned long)gdt &amp; ~PAGE_MASK);</div><div class='ctx'> </div><div class='del'>-		gdt_mfn = arbitrary_virt_to_mfn(gdt);</div><div class='del'>-		make_lowmem_page_readonly(gdt);</div><div class='del'>-		make_lowmem_page_readonly(mfn_to_virt(gdt_mfn));</div><div class='add'>+	gdt_mfn = arbitrary_virt_to_mfn(gdt);</div><div class='add'>+	make_lowmem_page_readonly(gdt);</div><div class='add'>+	make_lowmem_page_readonly(mfn_to_virt(gdt_mfn));</div><div class='ctx'> </div><div class='del'>-		ctxt-&gt;gdt_frames[0] = gdt_mfn;</div><div class='del'>-		ctxt-&gt;gdt_ents      = GDT_ENTRIES;</div><div class='add'>+	ctxt-&gt;gdt_frames[0] = gdt_mfn;</div><div class='add'>+	ctxt-&gt;gdt_ents      = GDT_ENTRIES;</div><div class='ctx'> </div><div class='del'>-		ctxt-&gt;kernel_ss = __KERNEL_DS;</div><div class='del'>-		ctxt-&gt;kernel_sp = idle-&gt;thread.sp0;</div><div class='add'>+	ctxt-&gt;kernel_ss = __KERNEL_DS;</div><div class='add'>+	ctxt-&gt;kernel_sp = idle-&gt;thread.sp0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='del'>-		ctxt-&gt;event_callback_cs     = __KERNEL_CS;</div><div class='del'>-		ctxt-&gt;failsafe_callback_cs  = __KERNEL_CS;</div><div class='add'>+	ctxt-&gt;event_callback_cs     = __KERNEL_CS;</div><div class='add'>+	ctxt-&gt;failsafe_callback_cs  = __KERNEL_CS;</div><div class='ctx'> #else</div><div class='del'>-		ctxt-&gt;gs_base_kernel = per_cpu_offset(cpu);</div><div class='del'>-#endif</div><div class='del'>-		ctxt-&gt;event_callback_eip    =</div><div class='del'>-					(unsigned long)xen_hypervisor_callback;</div><div class='del'>-		ctxt-&gt;failsafe_callback_eip =</div><div class='del'>-					(unsigned long)xen_failsafe_callback;</div><div class='del'>-		ctxt-&gt;user_regs.cs = __KERNEL_CS;</div><div class='del'>-		per_cpu(xen_cr3, cpu) = __pa(swapper_pg_dir);</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_XEN_PVH</div><div class='del'>-	else {</div><div class='del'>-		/*</div><div class='del'>-		 * The vcpu comes on kernel page tables which have the NX pte</div><div class='del'>-		 * bit set. This means before DS/SS is touched, NX in</div><div class='del'>-		 * EFER must be set. Hence the following assembly glue code.</div><div class='del'>-		 */</div><div class='del'>-		ctxt-&gt;user_regs.eip = (unsigned long)xen_pvh_early_cpu_init;</div><div class='del'>-		ctxt-&gt;user_regs.rdi = cpu;</div><div class='del'>-		ctxt-&gt;user_regs.rsi = true;  /* entry == true */</div><div class='del'>-	}</div><div class='add'>+	ctxt-&gt;gs_base_kernel = per_cpu_offset(cpu);</div><div class='ctx'> #endif</div><div class='add'>+	ctxt-&gt;event_callback_eip    =</div><div class='add'>+		(unsigned long)xen_hypervisor_callback;</div><div class='add'>+	ctxt-&gt;failsafe_callback_eip =</div><div class='add'>+		(unsigned long)xen_failsafe_callback;</div><div class='add'>+	ctxt-&gt;user_regs.cs = __KERNEL_CS;</div><div class='add'>+	per_cpu(xen_cr3, cpu) = __pa(swapper_pg_dir);</div><div class='add'>+</div><div class='ctx'> 	ctxt-&gt;user_regs.esp = idle-&gt;thread.sp0 - sizeof(struct pt_regs);</div><div class='ctx'> 	ctxt-&gt;ctrlreg[3] = xen_pfn_to_cr3(virt_to_gfn(swapper_pg_dir));</div><div class='ctx'> 	if (HYPERVISOR_vcpu_op(VCPUOP_initialise, xen_vcpu_nr(cpu), ctxt))</div><div class='head'>diff --git a/arch/x86/xen/smp.h b/arch/x86/xen/smp.h<br/>index c5c16dc4f694..9beef333584a 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/smp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/smp.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/smp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/smp.h</a></div><div class='hunk'>@@ -21,12 +21,4 @@ static inline int xen_smp_intr_init(unsigned int cpu)</div><div class='ctx'> static inline void xen_smp_intr_free(unsigned int cpu) {}</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_XEN_PVH</div><div class='del'>-extern void xen_pvh_early_cpu_init(int cpu, bool entry);</div><div class='del'>-#else</div><div class='del'>-static inline void xen_pvh_early_cpu_init(int cpu, bool entry)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c<br/>index 3d6e0064cbfc..25a7c4302ce7 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/spinlock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/spinlock.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/spinlock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/spinlock.c</a></div><div class='hunk'>@@ -114,6 +114,7 @@ void xen_uninit_lock_cpu(int cpu)</div><div class='ctx'> 	per_cpu(irq_name, cpu) = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+PV_CALLEE_SAVE_REGS_THUNK(xen_vcpu_stolen);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Our init of PV spinlocks is split in two init functions due to us</div><div class='hunk'>@@ -137,27 +138,9 @@ void __init xen_init_spinlocks(void)</div><div class='ctx'> 	pv_lock_ops.queued_spin_unlock = PV_CALLEE_SAVE(__pv_queued_spin_unlock);</div><div class='ctx'> 	pv_lock_ops.wait = xen_qlock_wait;</div><div class='ctx'> 	pv_lock_ops.kick = xen_qlock_kick;</div><div class='add'>+	pv_lock_ops.vcpu_is_preempted = PV_CALLEE_SAVE(xen_vcpu_stolen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * While the jump_label init code needs to happend _after_ the jump labels are</div><div class='del'>- * enabled and before SMP is started. Hence we use pre-SMP initcall level</div><div class='del'>- * init. We cannot do it in xen_init_spinlocks as that is done before</div><div class='del'>- * jump labels are activated.</div><div class='del'>- */</div><div class='del'>-static __init int xen_init_spinlocks_jump(void)</div><div class='del'>-{</div><div class='del'>-	if (!xen_pvspin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!xen_domain())</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	static_key_slow_inc(&amp;paravirt_ticketlocks_enabled);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-early_initcall(xen_init_spinlocks_jump);</div><div class='del'>-</div><div class='ctx'> static __init int xen_parse_nopvspin(char *arg)</div><div class='ctx'> {</div><div class='ctx'> 	xen_pvspin = false;</div><div class='head'>diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c<br/>index 33d8f6a7829d..1e69956d7852 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/time.c</a></div><div class='hunk'>@@ -39,10 +39,10 @@ static unsigned long xen_tsc_khz(void)</div><div class='ctx'> 	return pvclock_tsc_khz(info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-cycle_t xen_clocksource_read(void)</div><div class='add'>+u64 xen_clocksource_read(void)</div><div class='ctx'> {</div><div class='ctx'>         struct pvclock_vcpu_time_info *src;</div><div class='del'>-	cycle_t ret;</div><div class='add'>+	u64 ret;</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable_notrace();</div><div class='ctx'> 	src = &amp;__this_cpu_read(xen_vcpu)-&gt;time;</div><div class='hunk'>@@ -51,7 +51,7 @@ cycle_t xen_clocksource_read(void)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t xen_clocksource_get_cycles(struct clocksource *cs)</div><div class='add'>+static u64 xen_clocksource_get_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return xen_clocksource_read();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S<br/>index 7f8d8abf4c1a..37794e42b67d 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/xen-head.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/xen-head.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/xen-head.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/xen-head.S</a></div><div class='hunk'>@@ -16,25 +16,6 @@</div><div class='ctx'> #include &lt;xen/interface/xen-mca.h&gt;</div><div class='ctx'> #include &lt;asm/xen/interface.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_XEN_PVH</div><div class='del'>-#define PVH_FEATURES_STR  "|writable_descriptor_tables|auto_translated_physmap|supervisor_mode_kernel"</div><div class='del'>-/* Note the lack of 'hvm_callback_vector'. Older hypervisor will</div><div class='del'>- * balk at this being part of XEN_ELFNOTE_FEATURES, so we put it in</div><div class='del'>- * XEN_ELFNOTE_SUPPORTED_FEATURES which older hypervisors will ignore.</div><div class='del'>- */</div><div class='del'>-#define PVH_FEATURES ((1 &lt;&lt; XENFEAT_writable_page_tables) | \</div><div class='del'>-		      (1 &lt;&lt; XENFEAT_auto_translated_physmap) | \</div><div class='del'>-		      (1 &lt;&lt; XENFEAT_supervisor_mode_kernel) | \</div><div class='del'>-		      (1 &lt;&lt; XENFEAT_hvm_callback_vector))</div><div class='del'>-/* The XENFEAT_writable_page_tables is not stricly necessary as we set that</div><div class='del'>- * up regardless whether this CONFIG option is enabled or not, but it</div><div class='del'>- * clarifies what the right flags need to be.</div><div class='del'>- */</div><div class='del'>-#else</div><div class='del'>-#define PVH_FEATURES_STR  ""</div><div class='del'>-#define PVH_FEATURES (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	__INIT</div><div class='ctx'> ENTRY(startup_xen)</div><div class='ctx'> 	cld</div><div class='hunk'>@@ -54,41 +35,6 @@ ENTRY(startup_xen)</div><div class='ctx'> </div><div class='ctx'> 	__FINIT</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_XEN_PVH</div><div class='del'>-/*</div><div class='del'>- * xen_pvh_early_cpu_init() - early PVH VCPU initialization</div><div class='del'>- * @cpu:   this cpu number (%rdi)</div><div class='del'>- * @entry: true if this is a secondary vcpu coming up on this entry</div><div class='del'>- *         point, false if this is the boot CPU being initialized for</div><div class='del'>- *         the first time (%rsi)</div><div class='del'>- *</div><div class='del'>- * Note: This is called as a function on the boot CPU, and is the entry point</div><div class='del'>- *       on the secondary CPU.</div><div class='del'>- */</div><div class='del'>-ENTRY(xen_pvh_early_cpu_init)</div><div class='del'>-	mov     %rsi, %r11</div><div class='del'>-</div><div class='del'>-	/* Gather features to see if NX implemented. */</div><div class='del'>-	mov     $0x80000001, %eax</div><div class='del'>-	cpuid</div><div class='del'>-	mov     %edx, %esi</div><div class='del'>-</div><div class='del'>-	mov     $MSR_EFER, %ecx</div><div class='del'>-	rdmsr</div><div class='del'>-	bts     $_EFER_SCE, %eax</div><div class='del'>-</div><div class='del'>-	bt      $20, %esi</div><div class='del'>-	jnc     1f      	/* No NX, skip setting it */</div><div class='del'>-	bts     $_EFER_NX, %eax</div><div class='del'>-1:	wrmsr</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	cmp     $0, %r11b</div><div class='del'>-	jne     cpu_bringup_and_idle</div><div class='del'>-#endif</div><div class='del'>-	ret</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_XEN_PVH */</div><div class='del'>-</div><div class='ctx'> .pushsection .text</div><div class='ctx'> 	.balign PAGE_SIZE</div><div class='ctx'> ENTRY(hypercall_page)</div><div class='hunk'>@@ -114,10 +60,10 @@ ENTRY(hypercall_page)</div><div class='ctx'> #endif</div><div class='ctx'> 	ELFNOTE(Xen, XEN_ELFNOTE_ENTRY,          _ASM_PTR startup_xen)</div><div class='ctx'> 	ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page)</div><div class='del'>-	ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,       .ascii "!writable_page_tables|pae_pgdir_above_4gb"; .asciz PVH_FEATURES_STR)</div><div class='del'>-	ELFNOTE(Xen, XEN_ELFNOTE_SUPPORTED_FEATURES, .long (PVH_FEATURES) |</div><div class='del'>-						(1 &lt;&lt; XENFEAT_writable_page_tables) |</div><div class='del'>-						(1 &lt;&lt; XENFEAT_dom0))</div><div class='add'>+	ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,</div><div class='add'>+		.ascii "!writable_page_tables|pae_pgdir_above_4gb")</div><div class='add'>+	ELFNOTE(Xen, XEN_ELFNOTE_SUPPORTED_FEATURES,</div><div class='add'>+		.long (1 &lt;&lt; XENFEAT_writable_page_tables) | (1 &lt;&lt; XENFEAT_dom0))</div><div class='ctx'> 	ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE,       .asciz "yes")</div><div class='ctx'> 	ELFNOTE(Xen, XEN_ELFNOTE_LOADER,         .asciz "generic")</div><div class='ctx'> 	ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID,</div><div class='head'>diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h<br/>index 3cbce3b085e7..f6a41c41ebc7 100644<br/>--- a/<a href='/drm-misc/tree/arch/x86/xen/xen-ops.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/x86/xen/xen-ops.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/xen-ops.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/xen-ops.h</a></div><div class='hunk'>@@ -67,7 +67,7 @@ void xen_init_irq_ops(void);</div><div class='ctx'> void xen_setup_timer(int cpu);</div><div class='ctx'> void xen_setup_runstate_info(int cpu);</div><div class='ctx'> void xen_teardown_timer(int cpu);</div><div class='del'>-cycle_t xen_clocksource_read(void);</div><div class='add'>+u64 xen_clocksource_read(void);</div><div class='ctx'> void xen_setup_cpu_clockevents(void);</div><div class='ctx'> void __init xen_init_time_ops(void);</div><div class='ctx'> void __init xen_hvm_init_time_ops(void);</div><div class='hunk'>@@ -146,5 +146,4 @@ __visible void xen_adjust_exception_frame(void);</div><div class='ctx'> </div><div class='ctx'> extern int xen_panic_handler_init(void);</div><div class='ctx'> </div><div class='del'>-void xen_pvh_secondary_vcpu_init(int cpu);</div><div class='ctx'> #endif /* XEN_OPS_H */</div><div class='head'>diff --git a/arch/x86/xen/xen-pvh.S b/arch/x86/xen/xen-pvh.S<br/>new file mode 100644<br/>index 000000000000..5e246716d58f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/x86/xen/xen-pvh.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/x86/xen/xen-pvh.S</a></div><div class='hunk'>@@ -0,0 +1,161 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright C 2016, Oracle and/or its affiliates. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along</div><div class='add'>+ * with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+	.code32</div><div class='add'>+	.text</div><div class='add'>+#define _pa(x)          ((x) - __START_KERNEL_map)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/elfnote.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/segment.h&gt;</div><div class='add'>+#include &lt;asm/asm.h&gt;</div><div class='add'>+#include &lt;asm/boot.h&gt;</div><div class='add'>+#include &lt;asm/processor-flags.h&gt;</div><div class='add'>+#include &lt;asm/msr.h&gt;</div><div class='add'>+#include &lt;xen/interface/elfnote.h&gt;</div><div class='add'>+</div><div class='add'>+	__HEAD</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Entry point for PVH guests.</div><div class='add'>+ *</div><div class='add'>+ * Xen ABI specifies the following register state when we come here:</div><div class='add'>+ *</div><div class='add'>+ * - `ebx`: contains the physical memory address where the loader has placed</div><div class='add'>+ *          the boot start info structure.</div><div class='add'>+ * - `cr0`: bit 0 (PE) must be set. All the other writeable bits are cleared.</div><div class='add'>+ * - `cr4`: all bits are cleared.</div><div class='add'>+ * - `cs `: must be a 32-bit read/execute code segment with a base of ‘0’</div><div class='add'>+ *          and a limit of ‘0xFFFFFFFF’. The selector value is unspecified.</div><div class='add'>+ * - `ds`, `es`: must be a 32-bit read/write data segment with a base of</div><div class='add'>+ *               ‘0’ and a limit of ‘0xFFFFFFFF’. The selector values are all</div><div class='add'>+ *               unspecified.</div><div class='add'>+ * - `tr`: must be a 32-bit TSS (active) with a base of '0' and a limit</div><div class='add'>+ *         of '0x67'.</div><div class='add'>+ * - `eflags`: bit 17 (VM) must be cleared. Bit 9 (IF) must be cleared.</div><div class='add'>+ *             Bit 8 (TF) must be cleared. Other bits are all unspecified.</div><div class='add'>+ *</div><div class='add'>+ * All other processor registers and flag bits are unspecified. The OS is in</div><div class='add'>+ * charge of setting up it's own stack, GDT and IDT.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+ENTRY(pvh_start_xen)</div><div class='add'>+	cld</div><div class='add'>+</div><div class='add'>+	lgdt (_pa(gdt))</div><div class='add'>+</div><div class='add'>+	mov $(__BOOT_DS),%eax</div><div class='add'>+	mov %eax,%ds</div><div class='add'>+	mov %eax,%es</div><div class='add'>+	mov %eax,%ss</div><div class='add'>+</div><div class='add'>+	/* Stash hvm_start_info. */</div><div class='add'>+	mov $_pa(pvh_start_info), %edi</div><div class='add'>+	mov %ebx, %esi</div><div class='add'>+	mov _pa(pvh_start_info_sz), %ecx</div><div class='add'>+	shr $2,%ecx</div><div class='add'>+	rep</div><div class='add'>+	movsl</div><div class='add'>+</div><div class='add'>+	mov $_pa(early_stack_end), %esp</div><div class='add'>+</div><div class='add'>+	/* Enable PAE mode. */</div><div class='add'>+	mov %cr4, %eax</div><div class='add'>+	orl $X86_CR4_PAE, %eax</div><div class='add'>+	mov %eax, %cr4</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	/* Enable Long mode. */</div><div class='add'>+	mov $MSR_EFER, %ecx</div><div class='add'>+	rdmsr</div><div class='add'>+	btsl $_EFER_LME, %eax</div><div class='add'>+	wrmsr</div><div class='add'>+</div><div class='add'>+	/* Enable pre-constructed page tables. */</div><div class='add'>+	mov $_pa(init_level4_pgt), %eax</div><div class='add'>+	mov %eax, %cr3</div><div class='add'>+	mov $(X86_CR0_PG | X86_CR0_PE), %eax</div><div class='add'>+	mov %eax, %cr0</div><div class='add'>+</div><div class='add'>+	/* Jump to 64-bit mode. */</div><div class='add'>+	ljmp $__KERNEL_CS, $_pa(1f)</div><div class='add'>+</div><div class='add'>+	/* 64-bit entry point. */</div><div class='add'>+	.code64</div><div class='add'>+1:</div><div class='add'>+	call xen_prepare_pvh</div><div class='add'>+</div><div class='add'>+	/* startup_64 expects boot_params in %rsi. */</div><div class='add'>+	mov $_pa(pvh_bootparams), %rsi</div><div class='add'>+	mov $_pa(startup_64), %rax</div><div class='add'>+	jmp *%rax</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_X86_64 */</div><div class='add'>+</div><div class='add'>+	call mk_early_pgtbl_32</div><div class='add'>+</div><div class='add'>+	mov $_pa(initial_page_table), %eax</div><div class='add'>+	mov %eax, %cr3</div><div class='add'>+</div><div class='add'>+	mov %cr0, %eax</div><div class='add'>+	or $(X86_CR0_PG | X86_CR0_PE), %eax</div><div class='add'>+	mov %eax, %cr0</div><div class='add'>+</div><div class='add'>+	ljmp $__BOOT_CS, $1f</div><div class='add'>+1:</div><div class='add'>+	call xen_prepare_pvh</div><div class='add'>+	mov $_pa(pvh_bootparams), %esi</div><div class='add'>+</div><div class='add'>+	/* startup_32 doesn't expect paging and PAE to be on. */</div><div class='add'>+	ljmp $__BOOT_CS, $_pa(2f)</div><div class='add'>+2:</div><div class='add'>+	mov %cr0, %eax</div><div class='add'>+	and $~X86_CR0_PG, %eax</div><div class='add'>+	mov %eax, %cr0</div><div class='add'>+	mov %cr4, %eax</div><div class='add'>+	and $~X86_CR4_PAE, %eax</div><div class='add'>+	mov %eax, %cr4</div><div class='add'>+</div><div class='add'>+	ljmp $__BOOT_CS, $_pa(startup_32)</div><div class='add'>+#endif</div><div class='add'>+END(pvh_start_xen)</div><div class='add'>+</div><div class='add'>+	.section ".init.data","aw"</div><div class='add'>+	.balign 8</div><div class='add'>+gdt:</div><div class='add'>+	.word gdt_end - gdt_start</div><div class='add'>+	.long _pa(gdt_start)</div><div class='add'>+	.word 0</div><div class='add'>+gdt_start:</div><div class='add'>+	.quad 0x0000000000000000            /* NULL descriptor */</div><div class='add'>+	.quad 0x0000000000000000            /* reserved */</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	.quad GDT_ENTRY(0xa09a, 0, 0xfffff) /* __KERNEL_CS */</div><div class='add'>+#else</div><div class='add'>+	.quad GDT_ENTRY(0xc09a, 0, 0xfffff) /* __KERNEL_CS */</div><div class='add'>+#endif</div><div class='add'>+	.quad GDT_ENTRY(0xc092, 0, 0xfffff) /* __KERNEL_DS */</div><div class='add'>+gdt_end:</div><div class='add'>+</div><div class='add'>+	.balign 4</div><div class='add'>+early_stack:</div><div class='add'>+	.fill 256, 1, 0</div><div class='add'>+early_stack_end:</div><div class='add'>+</div><div class='add'>+	ELFNOTE(Xen, XEN_ELFNOTE_PHYS32_ENTRY,</div><div class='add'>+	             _ASM_PTR (pvh_start_xen - __START_KERNEL_map))</div><div class='head'>diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig<br/>index f61058617ada..f4126cf997a4 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/Kconfig</a></div><div class='hunk'>@@ -15,6 +15,7 @@ config XTENSA</div><div class='ctx'> 	select GENERIC_SCHED_CLOCK</div><div class='ctx'> 	select HAVE_DEBUG_KMEMLEAK</div><div class='ctx'> 	select HAVE_DMA_API_DEBUG</div><div class='add'>+	select HAVE_DMA_CONTIGUOUS</div><div class='ctx'> 	select HAVE_EXIT_THREAD</div><div class='ctx'> 	select HAVE_FUNCTION_TRACER</div><div class='ctx'> 	select HAVE_FUTEX_CMPXCHG if !MMU</div><div class='head'>diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile<br/>index e54189427b31..7ee02fe4a63d 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/Makefile</a></div><div class='hunk'>@@ -93,11 +93,7 @@ endif</div><div class='ctx'> </div><div class='ctx'> boot		:= arch/xtensa/boot</div><div class='ctx'> </div><div class='del'>-all: zImage</div><div class='del'>-</div><div class='del'>-bzImage : zImage</div><div class='del'>-</div><div class='del'>-zImage: vmlinux</div><div class='add'>+all Image zImage uImage: vmlinux</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$(boot) $@</div><div class='ctx'> </div><div class='ctx'> %.dtb:</div><div class='hunk'>@@ -107,6 +103,8 @@ dtbs: scripts</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$(boot)/dts</div><div class='ctx'> </div><div class='ctx'> define archhelp</div><div class='add'>+  @echo '* Image       - Kernel ELF image with reset vector'</div><div class='ctx'>   @echo '* zImage      - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'</div><div class='add'>+  @echo '* uImage      - U-Boot wrapped image'</div><div class='ctx'>   @echo '  dtbs        - Build device tree blobs for enabled boards'</div><div class='ctx'> endef</div><div class='head'>diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile<br/>index ca20a892021b..53e4178711e6 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/boot/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/boot/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/boot/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/boot/Makefile</a></div><div class='hunk'>@@ -21,14 +21,17 @@ subdir-y	:= lib</div><div class='ctx'> </div><div class='ctx'> # Subdirs for the boot loader(s)</div><div class='ctx'> </div><div class='del'>-bootdir-$(CONFIG_XTENSA_PLATFORM_ISS)	 += boot-elf</div><div class='del'>-bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf boot-uboot</div><div class='del'>-bootdir-$(CONFIG_XTENSA_PLATFORM_XTFPGA) += boot-redboot boot-elf boot-uboot</div><div class='add'>+boot-$(CONFIG_XTENSA_PLATFORM_ISS)    += Image</div><div class='add'>+boot-$(CONFIG_XTENSA_PLATFORM_XT2000) += Image zImage uImage</div><div class='add'>+boot-$(CONFIG_XTENSA_PLATFORM_XTFPGA) += Image zImage uImage</div><div class='ctx'> </div><div class='del'>-zImage Image: $(bootdir-y)</div><div class='add'>+all: $(boot-y)</div><div class='add'>+Image: boot-elf</div><div class='add'>+zImage: boot-redboot</div><div class='add'>+uImage: $(obj)/uImage</div><div class='ctx'> </div><div class='del'>-$(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \</div><div class='del'>-	      $(addprefix $(obj)/,$(host-progs))</div><div class='add'>+boot-elf boot-redboot: $(addprefix $(obj)/,$(subdir-y)) \</div><div class='add'>+		       $(addprefix $(obj)/,$(host-progs))</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS)</div><div class='ctx'> </div><div class='ctx'> OBJCOPYFLAGS = --strip-all -R .comment -R .note.gnu.build-id -O binary</div><div class='hunk'>@@ -41,4 +44,10 @@ vmlinux.bin.gz: vmlinux.bin FORCE</div><div class='ctx'> </div><div class='ctx'> boot-elf: vmlinux.bin</div><div class='ctx'> boot-redboot: vmlinux.bin.gz</div><div class='del'>-boot-uboot: vmlinux.bin.gz</div><div class='add'>+</div><div class='add'>+UIMAGE_LOADADDR = $(CONFIG_KERNEL_LOAD_ADDRESS)</div><div class='add'>+UIMAGE_COMPRESSION = gzip</div><div class='add'>+</div><div class='add'>+$(obj)/uImage: vmlinux.bin.gz FORCE</div><div class='add'>+	$(call if_changed,uimage)</div><div class='add'>+	$(Q)$(kecho) '  Kernel: $@ is ready'</div><div class='head'>diff --git a/arch/xtensa/boot/boot-elf/Makefile b/arch/xtensa/boot/boot-elf/Makefile<br/>index 89db089f5a12..521471981356 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/boot/boot-elf/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/boot/boot-elf/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/boot/boot-elf/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/boot/boot-elf/Makefile</a></div><div class='hunk'>@@ -31,4 +31,4 @@ $(obj)/../Image.elf: $(obj)/Image.o $(obj)/boot.lds</div><div class='ctx'> 		-o $@ $(obj)/Image.o</div><div class='ctx'> 	$(Q)$(kecho) '  Kernel: $@ is ready'</div><div class='ctx'> </div><div class='del'>-zImage:	$(obj)/../Image.elf</div><div class='add'>+all Image: $(obj)/../Image.elf</div><div class='head'>diff --git a/arch/xtensa/boot/boot-redboot/Makefile b/arch/xtensa/boot/boot-redboot/Makefile<br/>index 8be8b9436981..8632473ad319 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/boot/boot-redboot/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/boot/boot-redboot/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/boot/boot-redboot/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/boot/boot-redboot/Makefile</a></div><div class='hunk'>@@ -32,4 +32,4 @@ $(obj)/../zImage.redboot: $(obj)/zImage.elf</div><div class='ctx'> 	$(Q)$(OBJCOPY) -S -O binary $&lt; $@</div><div class='ctx'> 	$(Q)$(kecho) '  Kernel: $@ is ready'</div><div class='ctx'> </div><div class='del'>-zImage: $(obj)/../zImage.redboot</div><div class='add'>+all zImage: $(obj)/../zImage.redboot</div><div class='head'>diff --git a/arch/xtensa/boot/boot-uboot/Makefile b/arch/xtensa/boot/boot-uboot/Makefile<br/>deleted file mode 100644<br/>index 0f4c417b4196..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/boot/boot-uboot/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/boot/boot-uboot/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>-# License.  See the file "COPYING" in the main directory of this archive</div><div class='del'>-# for more details.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-UIMAGE_LOADADDR = $(CONFIG_KERNEL_LOAD_ADDRESS)</div><div class='del'>-UIMAGE_COMPRESSION = gzip</div><div class='del'>-</div><div class='del'>-$(obj)/../uImage: vmlinux.bin.gz FORCE</div><div class='del'>-	$(call if_changed,uimage)</div><div class='del'>-	$(Q)$(kecho) '  Kernel: $@ is ready'</div><div class='del'>-</div><div class='del'>-zImage: $(obj)/../uImage</div><div class='head'>diff --git a/arch/xtensa/boot/dts/kc705.dts b/arch/xtensa/boot/dts/kc705.dts<br/>index b1f4ee8c9a22..6106bdc097ad 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/boot/dts/kc705.dts?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/boot/dts/kc705.dts</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/boot/dts/kc705.dts?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/boot/dts/kc705.dts</a></div><div class='hunk'>@@ -11,4 +11,20 @@</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt;0x00000000 0x38000000&gt;;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	reserved-memory {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		/* global autoconfigured region for contiguous allocations */</div><div class='add'>+		linux,cma {</div><div class='add'>+			compatible = "shared-dma-pool";</div><div class='add'>+			reusable;</div><div class='add'>+			size = &lt;0x04000000&gt;;</div><div class='add'>+			alignment = &lt;0x2000&gt;;</div><div class='add'>+			alloc-ranges = &lt;0x00000000 0x20000000&gt;;</div><div class='add'>+			linux,cma-default;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild<br/>index 28cf4c5d65ef..f41408c53fe1 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/include/asm/Kbuild?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/include/asm/Kbuild</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/include/asm/Kbuild?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> generic-y += bitsperlong.h</div><div class='ctx'> generic-y += bug.h</div><div class='ctx'> generic-y += clkdev.h</div><div class='del'>-generic-y += cputime.h</div><div class='ctx'> generic-y += div64.h</div><div class='add'>+generic-y += dma-contiguous.h</div><div class='ctx'> generic-y += emergency-restart.h</div><div class='ctx'> generic-y += errno.h</div><div class='ctx'> generic-y += exec.h</div><div class='hunk'>@@ -31,3 +31,4 @@ generic-y += topology.h</div><div class='ctx'> generic-y += trace_clock.h</div><div class='ctx'> generic-y += word-at-a-time.h</div><div class='ctx'> generic-y += xor.h</div><div class='add'>+generic-y += kprobes.h</div><div class='head'>diff --git a/arch/xtensa/include/asm/checksum.h b/arch/xtensa/include/asm/checksum.h<br/>index ec35074fcb03..3ae74d7e074b 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/include/asm/checksum.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/include/asm/checksum.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/include/asm/checksum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/checksum.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #define _XTENSA_CHECKSUM_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;variant/core.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/xtensa/include/asm/device.h b/arch/xtensa/include/asm/device.h<br/>index fe1f5c878493..1deeb8ebbb1b 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/include/asm/device.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/include/asm/device.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/include/asm/device.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/device.h</a></div><div class='hunk'>@@ -6,11 +6,7 @@</div><div class='ctx'> #ifndef _ASM_XTENSA_DEVICE_H</div><div class='ctx'> #define _ASM_XTENSA_DEVICE_H</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops;</div><div class='del'>-</div><div class='ctx'> struct dev_archdata {</div><div class='del'>-	/* DMA operations on that device */</div><div class='del'>-	struct dma_map_ops *dma_ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pdev_archdata {</div><div class='head'>diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h<br/>index 3fc1170a6488..c6140fa8c0be 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/include/asm/dma-mapping.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/include/asm/dma-mapping.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/include/asm/dma-mapping.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -18,14 +18,11 @@</div><div class='ctx'> </div><div class='ctx'> #define DMA_ERROR_CODE		(~(dma_addr_t)0x0)</div><div class='ctx'> </div><div class='del'>-extern struct dma_map_ops xtensa_dma_map_ops;</div><div class='add'>+extern const struct dma_map_ops xtensa_dma_map_ops;</div><div class='ctx'> </div><div class='del'>-static inline struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='add'>+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)</div><div class='ctx'> {</div><div class='del'>-	if (dev &amp;&amp; dev-&gt;archdata.dma_ops)</div><div class='del'>-		return dev-&gt;archdata.dma_ops;</div><div class='del'>-	else</div><div class='del'>-		return &amp;xtensa_dma_map_ops;</div><div class='add'>+	return &amp;xtensa_dma_map_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dma_cache_sync(struct device *dev, void *vaddr, size_t size,</div><div class='head'>diff --git a/arch/xtensa/include/asm/mmu_context.h b/arch/xtensa/include/asm/mmu_context.h<br/>index 04c8ebdc4517..f7e186dfc4e4 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/include/asm/mmu_context.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/include/asm/mmu_context.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/include/asm/mmu_context.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/vectors.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/include/asm/mutex.h b/arch/xtensa/include/asm/mutex.h<br/>deleted file mode 100644<br/>index 458c1f7fbc18..000000000000<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/include/asm/mutex.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/include/asm/mutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pull in the generic implementation for the mutex fastpath.</div><div class='del'>- *</div><div class='del'>- * TODO: implement optimized primitives instead, or leave the generic</div><div class='del'>- * implementation in place, or pick the atomic_xchg() based generic</div><div class='del'>- * implementation. (see asm-generic/mutex-xchg.h for details)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/mutex-dec.h&gt;</div><div class='head'>diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h<br/>index b42d68bfe3cf..86ffcd68e496 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/include/asm/processor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/include/asm/processor.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/include/asm/processor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/processor.h</a></div><div class='hunk'>@@ -206,7 +206,6 @@ extern unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> #define KSTK_ESP(tsk)		(task_pt_regs(tsk)-&gt;areg[1])</div><div class='ctx'> </div><div class='ctx'> #define cpu_relax()  barrier()</div><div class='del'>-#define cpu_relax_lowlatency() cpu_relax()</div><div class='ctx'> </div><div class='ctx'> /* Special register access. */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/include/asm/segment.h b/arch/xtensa/include/asm/segment.h<br/>index a2eb547a1a75..98964ad15ca2 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/include/asm/segment.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/include/asm/segment.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/include/asm/segment.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/segment.h</a></div><div class='hunk'>@@ -11,6 +11,6 @@</div><div class='ctx'> #ifndef _XTENSA_SEGMENT_H</div><div class='ctx'> #define _XTENSA_SEGMENT_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif	/* _XTENSA_SEGEMENT_H */</div><div class='head'>diff --git a/arch/xtensa/include/asm/vectors.h b/arch/xtensa/include/asm/vectors.h<br/>index 77d41cc7a688..65d3da9db19b 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/include/asm/vectors.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/include/asm/vectors.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/include/asm/vectors.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/asm/vectors.h</a></div><div class='hunk'>@@ -67,7 +67,11 @@ static inline unsigned long xtensa_get_kio_paddr(void)</div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='ctx'> </div><div class='ctx'> #define RESET_VECTOR1_VADDR		(XCHAL_RESET_VECTOR1_VADDR)</div><div class='add'>+#ifdef CONFIG_VECTORS_OFFSET</div><div class='ctx'> #define VECBASE_VADDR			(KERNELOFFSET - CONFIG_VECTORS_OFFSET)</div><div class='add'>+#else</div><div class='add'>+#define VECBASE_VADDR			_vecbase</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #if defined(XCHAL_HAVE_VECBASE) &amp;&amp; XCHAL_HAVE_VECBASE</div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/include/uapi/asm/socket.h b/arch/xtensa/include/uapi/asm/socket.h<br/>index 81435d995e11..9fdbe1fe0473 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/include/uapi/asm/socket.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/include/uapi/asm/socket.h</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/include/uapi/asm/socket.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/include/uapi/asm/socket.h</a></div><div class='hunk'>@@ -101,4 +101,6 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_CNX_ADVICE		53</div><div class='ctx'> </div><div class='add'>+#define SCM_TIMESTAMPING_OPT_STATS	54</div><div class='add'>+</div><div class='ctx'> #endif	/* _XTENSA_SOCKET_H */</div><div class='head'>diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile<br/>index c31f5d5afc7d..264fb89c444e 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/Makefile</a></div><div class='hunk'>@@ -14,6 +14,7 @@ obj-$(CONFIG_FUNCTION_TRACER) += mcount.o</div><div class='ctx'> obj-$(CONFIG_SMP) += smp.o mxhead.o</div><div class='ctx'> obj-$(CONFIG_XTENSA_VARIANT_HAVE_PERF_EVENTS) += perf_event.o</div><div class='ctx'> obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o</div><div class='add'>+obj-$(CONFIG_S32C1I_SELFTEST) += s32c1i_selftest.o</div><div class='ctx'> </div><div class='ctx'> AFLAGS_head.o += -mtext-section-literals</div><div class='ctx'> AFLAGS_mxhead.o += -mtext-section-literals</div><div class='head'>diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c<br/>index 8e10e357ee32..bcb5beb81177 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/asm-offsets.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/asm-offsets.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/asm-offsets.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> int main(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c<br/>index 4ac3d23161cf..a265edd6ac37 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/irq.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/irq.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mxregs.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> DECLARE_PER_CPU(unsigned long, nmi_count);</div><div class='head'>diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c<br/>index 1e68806d6695..cec86a1c2acc 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/pci-dma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/pci-dma.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/pci-dma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/pci-dma.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'>  * Joe Taylor &lt;joe@tensilica.com, joetylr@yahoo.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/dma-contiguous.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -146,6 +147,8 @@ static void *xtensa_dma_alloc(struct device *dev, size_t size,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ret;</div><div class='ctx'> 	unsigned long uncached = 0;</div><div class='add'>+	unsigned long count = PAGE_ALIGN(size) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	struct page *page = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* ignore region speicifiers */</div><div class='ctx'> </div><div class='hunk'>@@ -153,11 +156,19 @@ static void *xtensa_dma_alloc(struct device *dev, size_t size,</div><div class='ctx'> </div><div class='ctx'> 	if (dev == NULL || (dev-&gt;coherent_dma_mask &lt; 0xffffffff))</div><div class='ctx'> 		flag |= GFP_DMA;</div><div class='del'>-	ret = (unsigned long)__get_free_pages(flag, get_order(size));</div><div class='ctx'> </div><div class='del'>-	if (ret == 0)</div><div class='add'>+	if (gfpflags_allow_blocking(flag))</div><div class='add'>+		page = dma_alloc_from_contiguous(dev, count, get_order(size),</div><div class='add'>+						 flag);</div><div class='add'>+</div><div class='add'>+	if (!page)</div><div class='add'>+		page = alloc_pages(flag, get_order(size));</div><div class='add'>+</div><div class='add'>+	if (!page)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	ret = (unsigned long)page_address(page);</div><div class='add'>+</div><div class='ctx'> 	/* We currently don't support coherent memory outside KSEG */</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(ret &lt; XCHAL_KSEG_CACHED_VADDR ||</div><div class='hunk'>@@ -170,16 +181,19 @@ static void *xtensa_dma_alloc(struct device *dev, size_t size,</div><div class='ctx'> 	return (void *)uncached;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xtensa_dma_free(struct device *hwdev, size_t size, void *vaddr,</div><div class='add'>+static void xtensa_dma_free(struct device *dev, size_t size, void *vaddr,</div><div class='ctx'> 			    dma_addr_t dma_handle, unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr = (unsigned long)vaddr +</div><div class='ctx'> 		XCHAL_KSEG_CACHED_VADDR - XCHAL_KSEG_BYPASS_VADDR;</div><div class='add'>+	struct page *page = virt_to_page(addr);</div><div class='add'>+	unsigned long count = PAGE_ALIGN(size) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(addr &lt; XCHAL_KSEG_CACHED_VADDR ||</div><div class='ctx'> 	       addr &gt; XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_SIZE - 1);</div><div class='ctx'> </div><div class='del'>-	free_pages(addr, get_order(size));</div><div class='add'>+	if (!dma_release_from_contiguous(dev, page, count))</div><div class='add'>+		__free_pages(page, get_order(size));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static dma_addr_t xtensa_map_page(struct device *dev, struct page *page,</div><div class='hunk'>@@ -189,7 +203,9 @@ static dma_addr_t xtensa_map_page(struct device *dev, struct page *page,</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t dma_handle = page_to_phys(page) + offset;</div><div class='ctx'> </div><div class='del'>-	xtensa_sync_single_for_device(dev, dma_handle, size, dir);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		xtensa_sync_single_for_device(dev, dma_handle, size, dir);</div><div class='add'>+</div><div class='ctx'> 	return dma_handle;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -197,7 +213,8 @@ static void xtensa_unmap_page(struct device *dev, dma_addr_t dma_handle,</div><div class='ctx'> 			      size_t size, enum dma_data_direction dir,</div><div class='ctx'> 			      unsigned long attrs)</div><div class='ctx'> {</div><div class='del'>-	xtensa_sync_single_for_cpu(dev, dma_handle, size, dir);</div><div class='add'>+	if (!(attrs &amp; DMA_ATTR_SKIP_CPU_SYNC))</div><div class='add'>+		xtensa_sync_single_for_cpu(dev, dma_handle, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xtensa_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='hunk'>@@ -233,7 +250,7 @@ int xtensa_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dma_map_ops xtensa_dma_map_ops = {</div><div class='add'>+const struct dma_map_ops xtensa_dma_map_ops = {</div><div class='ctx'> 	.alloc = xtensa_dma_alloc,</div><div class='ctx'> 	.free = xtensa_dma_free,</div><div class='ctx'> 	.map_page = xtensa_map_page,</div><div class='head'>diff --git a/arch/xtensa/kernel/perf_event.c b/arch/xtensa/kernel/perf_event.c<br/>index 0fecc8a2c0b5..ff1d81385ed7 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/perf_event.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/perf_event.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/perf_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/perf_event.c</a></div><div class='hunk'>@@ -422,7 +422,7 @@ static int __init xtensa_pmu_init(void)</div><div class='ctx'> 	int irq = irq_create_mapping(NULL, XCHAL_PROFILING_INTERRUPT);</div><div class='ctx'> </div><div class='ctx'> 	ret = cpuhp_setup_state(CPUHP_AP_PERF_XTENSA_STARTING,</div><div class='del'>-				"AP_PERF_XTENSA_STARTING", xtensa_pmu_setup,</div><div class='add'>+				"perf/xtensa:starting", xtensa_pmu_setup,</div><div class='ctx'> 				NULL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("xtensa_pmu: failed to register CPU-hotplug.\n");</div><div class='head'>diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c<br/>index e0ded48561db..58f96d1230d4 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/process.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/process.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/process.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/process.c</a></div><div class='hunk'>@@ -17,6 +17,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -35,7 +38,7 @@</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/platform.h&gt;</div><div class='head'>diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c<br/>index a651f3a628ee..e0f583fed06a 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/ptrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/ptrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/ptrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/ptrace.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -29,7 +30,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> void user_enable_single_step(struct task_struct *child)</div><div class='head'>diff --git a/arch/xtensa/kernel/s32c1i_selftest.c b/arch/xtensa/kernel/s32c1i_selftest.c<br/>new file mode 100644<br/>index 000000000000..07e56e3a9a8b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/s32c1i_selftest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/s32c1i_selftest.c</a></div><div class='hunk'>@@ -0,0 +1,128 @@</div><div class='add'>+/*</div><div class='add'>+ * S32C1I selftest.</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Cadence Design Systems Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='add'>+</div><div class='add'>+#if XCHAL_HAVE_S32C1I</div><div class='add'>+</div><div class='add'>+static int __initdata rcw_word, rcw_probe_pc, rcw_exc;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Basic atomic compare-and-swap, that records PC of S32C1I for probing.</div><div class='add'>+ *</div><div class='add'>+ * If *v == cmp, set *v = set.  Return previous *v.</div><div class='add'>+ */</div><div class='add'>+static inline int probed_compare_swap(int *v, int cmp, int set)</div><div class='add'>+{</div><div class='add'>+	int tmp;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+			"	movi	%1, 1f\n"</div><div class='add'>+			"	s32i	%1, %4, 0\n"</div><div class='add'>+			"	wsr	%2, scompare1\n"</div><div class='add'>+			"1:	s32c1i	%0, %3, 0\n"</div><div class='add'>+			: "=a" (set), "=&amp;a" (tmp)</div><div class='add'>+			: "a" (cmp), "a" (v), "a" (&amp;rcw_probe_pc), "0" (set)</div><div class='add'>+			: "memory"</div><div class='add'>+			);</div><div class='add'>+	return set;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle probed exception */</div><div class='add'>+</div><div class='add'>+static void __init do_probed_exception(struct pt_regs *regs,</div><div class='add'>+				       unsigned long exccause)</div><div class='add'>+{</div><div class='add'>+	if (regs-&gt;pc == rcw_probe_pc) {	/* exception on s32c1i ? */</div><div class='add'>+		regs-&gt;pc += 3;		/* skip the s32c1i instruction */</div><div class='add'>+		rcw_exc = exccause;</div><div class='add'>+	} else {</div><div class='add'>+		do_unhandled(regs, exccause);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Simple test of S32C1I (soc bringup assist) */</div><div class='add'>+</div><div class='add'>+static int __init check_s32c1i(void)</div><div class='add'>+{</div><div class='add'>+	int n, cause1, cause2;</div><div class='add'>+	void *handbus, *handdata, *handaddr; /* temporarily saved handlers */</div><div class='add'>+</div><div class='add'>+	rcw_probe_pc = 0;</div><div class='add'>+	handbus  = trap_set_handler(EXCCAUSE_LOAD_STORE_ERROR,</div><div class='add'>+			do_probed_exception);</div><div class='add'>+	handdata = trap_set_handler(EXCCAUSE_LOAD_STORE_DATA_ERROR,</div><div class='add'>+			do_probed_exception);</div><div class='add'>+	handaddr = trap_set_handler(EXCCAUSE_LOAD_STORE_ADDR_ERROR,</div><div class='add'>+			do_probed_exception);</div><div class='add'>+</div><div class='add'>+	/* First try an S32C1I that does not store: */</div><div class='add'>+	rcw_exc = 0;</div><div class='add'>+	rcw_word = 1;</div><div class='add'>+	n = probed_compare_swap(&amp;rcw_word, 0, 2);</div><div class='add'>+	cause1 = rcw_exc;</div><div class='add'>+</div><div class='add'>+	/* took exception? */</div><div class='add'>+	if (cause1 != 0) {</div><div class='add'>+		/* unclean exception? */</div><div class='add'>+		if (n != 2 || rcw_word != 1)</div><div class='add'>+			panic("S32C1I exception error");</div><div class='add'>+	} else if (rcw_word != 1 || n != 1) {</div><div class='add'>+		panic("S32C1I compare error");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Then an S32C1I that stores: */</div><div class='add'>+	rcw_exc = 0;</div><div class='add'>+	rcw_word = 0x1234567;</div><div class='add'>+	n = probed_compare_swap(&amp;rcw_word, 0x1234567, 0xabcde);</div><div class='add'>+	cause2 = rcw_exc;</div><div class='add'>+</div><div class='add'>+	if (cause2 != 0) {</div><div class='add'>+		/* unclean exception? */</div><div class='add'>+		if (n != 0xabcde || rcw_word != 0x1234567)</div><div class='add'>+			panic("S32C1I exception error (b)");</div><div class='add'>+	} else if (rcw_word != 0xabcde || n != 0x1234567) {</div><div class='add'>+		panic("S32C1I store error");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify consistency of exceptions: */</div><div class='add'>+	if (cause1 || cause2) {</div><div class='add'>+		pr_warn("S32C1I took exception %d, %d\n", cause1, cause2);</div><div class='add'>+		/* If emulation of S32C1I upon bus error gets implemented,</div><div class='add'>+		 * we can get rid of this panic for single core (not SMP)</div><div class='add'>+		 */</div><div class='add'>+		panic("S32C1I exceptions not currently supported");</div><div class='add'>+	}</div><div class='add'>+	if (cause1 != cause2)</div><div class='add'>+		panic("inconsistent S32C1I exceptions");</div><div class='add'>+</div><div class='add'>+	trap_set_handler(EXCCAUSE_LOAD_STORE_ERROR, handbus);</div><div class='add'>+	trap_set_handler(EXCCAUSE_LOAD_STORE_DATA_ERROR, handdata);</div><div class='add'>+	trap_set_handler(EXCCAUSE_LOAD_STORE_ADDR_ERROR, handaddr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* XCHAL_HAVE_S32C1I */</div><div class='add'>+</div><div class='add'>+/* This condition should not occur with a commercially deployed processor.</div><div class='add'>+ * Display reminder for early engr test or demo chips / FPGA bitstreams</div><div class='add'>+ */</div><div class='add'>+static int __init check_s32c1i(void)</div><div class='add'>+{</div><div class='add'>+	pr_warn("Processor configuration lacks atomic compare-and-swap support!\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* XCHAL_HAVE_S32C1I */</div><div class='add'>+</div><div class='add'>+early_initcall(check_s32c1i);</div><div class='head'>diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c<br/>index 88a044af7504..197e75b400b1 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/setup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/setup.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/setup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/setup.c</a></div><div class='hunk'>@@ -31,10 +31,6 @@</div><div class='ctx'> # include &lt;linux/console.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RTC</div><div class='del'>-# include &lt;linux/timex.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> # include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -48,24 +44,22 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;</div><div class='del'>-#include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/sysmem.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;platform/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)</div><div class='del'>-struct screen_info screen_info = { 0, 24, 0, 0, 0, 80, 0, 0, 0, 24, 1, 16};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BLK_DEV_FD</div><div class='del'>-extern struct fd_ops no_fd_ops;</div><div class='del'>-struct fd_ops *fd_ops;</div><div class='add'>+struct screen_info screen_info = {</div><div class='add'>+	.orig_x = 0,</div><div class='add'>+	.orig_y = 24,</div><div class='add'>+	.orig_video_cols = 80,</div><div class='add'>+	.orig_video_lines = 24,</div><div class='add'>+	.orig_video_isVGA = 1,</div><div class='add'>+	.orig_video_points = 16,</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern struct rtc_ops no_rtc_ops;</div><div class='del'>-struct rtc_ops *rtc_ops;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='ctx'> extern unsigned long initrd_start;</div><div class='ctx'> extern unsigned long initrd_end;</div><div class='hunk'>@@ -77,7 +71,6 @@ extern int initrd_below_start_ok;</div><div class='ctx'> void *dtb_start = __dtb_start;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-unsigned char aux_device_present;</div><div class='ctx'> extern unsigned long loops_per_jiffy;</div><div class='ctx'> </div><div class='ctx'> /* Command line specified as configuration option. */</div><div class='hunk'>@@ -133,6 +126,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag)</div><div class='ctx'> </div><div class='ctx'> __tagtable(BP_TAG_INITRD, parse_tag_initrd);</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_BLK_DEV_INITRD */</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_OF</div><div class='ctx'> </div><div class='ctx'> static int __init parse_tag_fdt(const bp_tag_t *tag)</div><div class='hunk'>@@ -145,8 +140,6 @@ __tagtable(BP_TAG_FDT, parse_tag_fdt);</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_OF */</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_BLK_DEV_INITRD */</div><div class='del'>-</div><div class='ctx'> static int __init parse_tag_cmdline(const bp_tag_t* tag)</div><div class='ctx'> {</div><div class='ctx'> 	strlcpy(command_line, (char *)(tag-&gt;data), COMMAND_LINE_SIZE);</div><div class='hunk'>@@ -317,120 +310,6 @@ extern char _SecondaryResetVector_text_start;</div><div class='ctx'> extern char _SecondaryResetVector_text_end;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_S32C1I_SELFTEST</div><div class='del'>-#if XCHAL_HAVE_S32C1I</div><div class='del'>-</div><div class='del'>-static int __initdata rcw_word, rcw_probe_pc, rcw_exc;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Basic atomic compare-and-swap, that records PC of S32C1I for probing.</div><div class='del'>- *</div><div class='del'>- * If *v == cmp, set *v = set.  Return previous *v.</div><div class='del'>- */</div><div class='del'>-static inline int probed_compare_swap(int *v, int cmp, int set)</div><div class='del'>-{</div><div class='del'>-	int tmp;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-			"	movi	%1, 1f\n"</div><div class='del'>-			"	s32i	%1, %4, 0\n"</div><div class='del'>-			"	wsr	%2, scompare1\n"</div><div class='del'>-			"1:	s32c1i	%0, %3, 0\n"</div><div class='del'>-			: "=a" (set), "=&amp;a" (tmp)</div><div class='del'>-			: "a" (cmp), "a" (v), "a" (&amp;rcw_probe_pc), "0" (set)</div><div class='del'>-			: "memory"</div><div class='del'>-			);</div><div class='del'>-	return set;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handle probed exception */</div><div class='del'>-</div><div class='del'>-static void __init do_probed_exception(struct pt_regs *regs,</div><div class='del'>-		unsigned long exccause)</div><div class='del'>-{</div><div class='del'>-	if (regs-&gt;pc == rcw_probe_pc) {	/* exception on s32c1i ? */</div><div class='del'>-		regs-&gt;pc += 3;		/* skip the s32c1i instruction */</div><div class='del'>-		rcw_exc = exccause;</div><div class='del'>-	} else {</div><div class='del'>-		do_unhandled(regs, exccause);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Simple test of S32C1I (soc bringup assist) */</div><div class='del'>-</div><div class='del'>-static int __init check_s32c1i(void)</div><div class='del'>-{</div><div class='del'>-	int n, cause1, cause2;</div><div class='del'>-	void *handbus, *handdata, *handaddr; /* temporarily saved handlers */</div><div class='del'>-</div><div class='del'>-	rcw_probe_pc = 0;</div><div class='del'>-	handbus  = trap_set_handler(EXCCAUSE_LOAD_STORE_ERROR,</div><div class='del'>-			do_probed_exception);</div><div class='del'>-	handdata = trap_set_handler(EXCCAUSE_LOAD_STORE_DATA_ERROR,</div><div class='del'>-			do_probed_exception);</div><div class='del'>-	handaddr = trap_set_handler(EXCCAUSE_LOAD_STORE_ADDR_ERROR,</div><div class='del'>-			do_probed_exception);</div><div class='del'>-</div><div class='del'>-	/* First try an S32C1I that does not store: */</div><div class='del'>-	rcw_exc = 0;</div><div class='del'>-	rcw_word = 1;</div><div class='del'>-	n = probed_compare_swap(&amp;rcw_word, 0, 2);</div><div class='del'>-	cause1 = rcw_exc;</div><div class='del'>-</div><div class='del'>-	/* took exception? */</div><div class='del'>-	if (cause1 != 0) {</div><div class='del'>-		/* unclean exception? */</div><div class='del'>-		if (n != 2 || rcw_word != 1)</div><div class='del'>-			panic("S32C1I exception error");</div><div class='del'>-	} else if (rcw_word != 1 || n != 1) {</div><div class='del'>-		panic("S32C1I compare error");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Then an S32C1I that stores: */</div><div class='del'>-	rcw_exc = 0;</div><div class='del'>-	rcw_word = 0x1234567;</div><div class='del'>-	n = probed_compare_swap(&amp;rcw_word, 0x1234567, 0xabcde);</div><div class='del'>-	cause2 = rcw_exc;</div><div class='del'>-</div><div class='del'>-	if (cause2 != 0) {</div><div class='del'>-		/* unclean exception? */</div><div class='del'>-		if (n != 0xabcde || rcw_word != 0x1234567)</div><div class='del'>-			panic("S32C1I exception error (b)");</div><div class='del'>-	} else if (rcw_word != 0xabcde || n != 0x1234567) {</div><div class='del'>-		panic("S32C1I store error");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Verify consistency of exceptions: */</div><div class='del'>-	if (cause1 || cause2) {</div><div class='del'>-		pr_warn("S32C1I took exception %d, %d\n", cause1, cause2);</div><div class='del'>-		/* If emulation of S32C1I upon bus error gets implemented,</div><div class='del'>-		   we can get rid of this panic for single core (not SMP) */</div><div class='del'>-		panic("S32C1I exceptions not currently supported");</div><div class='del'>-	}</div><div class='del'>-	if (cause1 != cause2)</div><div class='del'>-		panic("inconsistent S32C1I exceptions");</div><div class='del'>-</div><div class='del'>-	trap_set_handler(EXCCAUSE_LOAD_STORE_ERROR, handbus);</div><div class='del'>-	trap_set_handler(EXCCAUSE_LOAD_STORE_DATA_ERROR, handdata);</div><div class='del'>-	trap_set_handler(EXCCAUSE_LOAD_STORE_ADDR_ERROR, handaddr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* XCHAL_HAVE_S32C1I */</div><div class='del'>-</div><div class='del'>-/* This condition should not occur with a commercially deployed processor.</div><div class='del'>-   Display reminder for early engr test or demo chips / FPGA bitstreams */</div><div class='del'>-static int __init check_s32c1i(void)</div><div class='del'>-{</div><div class='del'>-	pr_warn("Processor configuration lacks atomic compare-and-swap support!\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* XCHAL_HAVE_S32C1I */</div><div class='del'>-early_initcall(check_s32c1i);</div><div class='del'>-#endif /* CONFIG_S32C1I_SELFTEST */</div><div class='del'>-</div><div class='ctx'> static inline int mem_reserve(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	return memblock_reserve(start, end - start);</div><div class='hunk'>@@ -455,6 +334,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> </div><div class='ctx'> 	mem_reserve(__pa(&amp;_stext), __pa(&amp;_end));</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_VECTORS_OFFSET</div><div class='ctx'> 	mem_reserve(__pa(&amp;_WindowVectors_text_start),</div><div class='ctx'> 		    __pa(&amp;_WindowVectors_text_end));</div><div class='ctx'> </div><div class='hunk'>@@ -491,6 +371,8 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 		    __pa(&amp;_Level6InterruptVector_text_end));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_VECTORS_OFFSET */</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	mem_reserve(__pa(&amp;_SecondaryResetVector_text_start),</div><div class='ctx'> 		    __pa(&amp;_SecondaryResetVector_text_end));</div><div class='hunk'>@@ -540,7 +422,7 @@ subsys_initcall(topology_init);</div><div class='ctx'> </div><div class='ctx'> void cpu_reset(void)</div><div class='ctx'> {</div><div class='del'>-#if XCHAL_HAVE_PTP_MMU</div><div class='add'>+#if XCHAL_HAVE_PTP_MMU &amp;&amp; IS_ENABLED(CONFIG_MMU)</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have full MMU: all autoload ways, ways 7, 8 and 9 of DTLB must</div><div class='head'>diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c<br/>index e87adaa07ff3..70a131945443 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/signal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/signal.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/signal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/signal.c</a></div><div class='hunk'>@@ -20,9 +20,10 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/tracehook.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ucontext.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/coprocessor.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='head'>diff --git a/arch/xtensa/kernel/smp.c b/arch/xtensa/kernel/smp.c<br/>index fc4ad21a5ed4..932d64689bac 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/smp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/smp.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/smp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/smp.c</a></div><div class='hunk'>@@ -21,6 +21,9 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched/hotplug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -135,8 +138,8 @@ void secondary_start_kernel(void)</div><div class='ctx'> </div><div class='ctx'> 	/* All kernel threads share the same mm context. */</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_users);</div><div class='del'>-	atomic_inc(&amp;mm-&gt;mm_count);</div><div class='add'>+	mmget(mm);</div><div class='add'>+	mmgrab(mm);</div><div class='ctx'> 	current-&gt;active_mm = mm;</div><div class='ctx'> 	cpumask_set_cpu(cpu, mm_cpumask(mm));</div><div class='ctx'> 	enter_lazy_tlb(mm, current);</div><div class='head'>diff --git a/arch/xtensa/kernel/stacktrace.c b/arch/xtensa/kernel/stacktrace.c<br/>index 7538d802b65a..e7d30ee0fd48 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/stacktrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/stacktrace.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/stacktrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/stacktrace.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_OPROFILE) || IS_ENABLED(CONFIG_PERF_EVENTS)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c<br/>index 83cf49685373..06937928cb72 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/syscall.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/syscall.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/syscall.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/syscall.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  * Kevin Chea</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/syscall.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/shm.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef void (*syscall_t)(void);</div><div class='head'>diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c<br/>index be81e69b25bc..668c1056f9e4 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/time.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/time.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/time.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/time.c</a></div><div class='hunk'>@@ -34,9 +34,9 @@</div><div class='ctx'> unsigned long ccount_freq;		/* ccount Hz */</div><div class='ctx'> EXPORT_SYMBOL(ccount_freq);</div><div class='ctx'> </div><div class='del'>-static cycle_t ccount_read(struct clocksource *cs)</div><div class='add'>+static u64 ccount_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)get_ccount();</div><div class='add'>+	return (u64)get_ccount();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u64 notrace ccount_sched_clock_read(void)</div><div class='head'>diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c<br/>index ce37d5b899fe..c82c43bff296 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/traps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/traps.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/traps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/traps.c</a></div><div class='hunk'>@@ -24,7 +24,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='hunk'>@@ -35,7 +37,7 @@</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/timex.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='head'>diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S<br/>index 31411fc82662..30d9fc21e076 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/vmlinux.lds.S?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/vmlinux.lds.S?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -59,6 +59,7 @@ jiffies = jiffies_64;</div><div class='ctx'>  * garbage.)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_VECTORS_OFFSET</div><div class='ctx'> #define SECTION_VECTOR(sym, section, addr, max_prevsec_size, prevsec)       \</div><div class='ctx'>   section addr : AT((MIN(LOADADDR(prevsec) + max_prevsec_size,		    \</div><div class='ctx'> 		         LOADADDR(prevsec) + SIZEOF(prevsec)) + 3) &amp; ~ 3)   \</div><div class='hunk'>@@ -68,6 +69,11 @@ jiffies = jiffies_64;</div><div class='ctx'>     *(section)								    \</div><div class='ctx'>     sym ## _end = ABSOLUTE(.);						    \</div><div class='ctx'>   }</div><div class='add'>+#else</div><div class='add'>+#define SECTION_VECTOR(section, addr)					    \</div><div class='add'>+  . = addr;								    \</div><div class='add'>+  *(section)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Mapping of input sections to output sections when linking.</div><div class='hunk'>@@ -85,6 +91,37 @@ SECTIONS</div><div class='ctx'>   {</div><div class='ctx'>     /* The HEAD_TEXT section must be the first section! */</div><div class='ctx'>     HEAD_TEXT</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_VECTORS_OFFSET</div><div class='add'>+  . = ALIGN(PAGE_SIZE);</div><div class='add'>+  _vecbase = .;</div><div class='add'>+</div><div class='add'>+  SECTION_VECTOR (.WindowVectors.text, WINDOW_VECTORS_VADDR)</div><div class='add'>+#if XCHAL_EXCM_LEVEL &gt;= 2</div><div class='add'>+  SECTION_VECTOR (.Level2InterruptVector.text, INTLEVEL2_VECTOR_VADDR)</div><div class='add'>+#endif</div><div class='add'>+#if XCHAL_EXCM_LEVEL &gt;= 3</div><div class='add'>+  SECTION_VECTOR (.Level3InterruptVector.text, INTLEVEL3_VECTOR_VADDR)</div><div class='add'>+#endif</div><div class='add'>+#if XCHAL_EXCM_LEVEL &gt;= 4</div><div class='add'>+  SECTION_VECTOR (.Level4InterruptVector.text, INTLEVEL4_VECTOR_VADDR)</div><div class='add'>+#endif</div><div class='add'>+#if XCHAL_EXCM_LEVEL &gt;= 5</div><div class='add'>+  SECTION_VECTOR (.Level5InterruptVector.text, INTLEVEL5_VECTOR_VADDR)</div><div class='add'>+#endif</div><div class='add'>+#if XCHAL_EXCM_LEVEL &gt;= 6</div><div class='add'>+  SECTION_VECTOR (.Level6InterruptVector.text, INTLEVEL6_VECTOR_VADDR)</div><div class='add'>+#endif</div><div class='add'>+  SECTION_VECTOR (.DebugInterruptVector.literal, DEBUG_VECTOR_VADDR - 4)</div><div class='add'>+  SECTION_VECTOR (.DebugInterruptVector.text, DEBUG_VECTOR_VADDR)</div><div class='add'>+  SECTION_VECTOR (.KernelExceptionVector.literal, KERNEL_VECTOR_VADDR - 4)</div><div class='add'>+  SECTION_VECTOR (.KernelExceptionVector.text, KERNEL_VECTOR_VADDR)</div><div class='add'>+  SECTION_VECTOR (.UserExceptionVector.literal, USER_VECTOR_VADDR - 4)</div><div class='add'>+  SECTION_VECTOR (.UserExceptionVector.text, USER_VECTOR_VADDR)</div><div class='add'>+  SECTION_VECTOR (.DoubleExceptionVector.literal, DOUBLEEXC_VECTOR_VADDR - 48)</div><div class='add'>+  SECTION_VECTOR (.DoubleExceptionVector.text, DOUBLEEXC_VECTOR_VADDR)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'>     TEXT_TEXT</div><div class='ctx'>     VMLINUX_SYMBOL(__sched_text_start) = .;</div><div class='ctx'>     *(.sched.literal .sched.text)</div><div class='hunk'>@@ -132,6 +169,7 @@ SECTIONS</div><div class='ctx'>     . = ALIGN(16);</div><div class='ctx'>     __boot_reloc_table_start = ABSOLUTE(.);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_VECTORS_OFFSET</div><div class='ctx'>     RELOCATE_ENTRY(_WindowVectors_text,</div><div class='ctx'> 		   .WindowVectors.text);</div><div class='ctx'> #if XCHAL_EXCM_LEVEL &gt;= 2</div><div class='hunk'>@@ -164,6 +202,7 @@ SECTIONS</div><div class='ctx'> 		   .DoubleExceptionVector.text);</div><div class='ctx'>     RELOCATE_ENTRY(_DebugInterruptVector_text,</div><div class='ctx'> 		   .DebugInterruptVector.text);</div><div class='add'>+#endif</div><div class='ctx'> #if defined(CONFIG_SMP)</div><div class='ctx'>     RELOCATE_ENTRY(_SecondaryResetVector_text,</div><div class='ctx'> 		   .SecondaryResetVector.text);</div><div class='hunk'>@@ -186,6 +225,7 @@ SECTIONS</div><div class='ctx'>   . = ALIGN(4);</div><div class='ctx'>   .dummy : { LONG(0) }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_VECTORS_OFFSET</div><div class='ctx'>   /* The vectors are relocated to the real position at startup time */</div><div class='ctx'> </div><div class='ctx'>   SECTION_VECTOR (_WindowVectors_text,</div><div class='hunk'>@@ -277,6 +317,7 @@ SECTIONS</div><div class='ctx'> </div><div class='ctx'>   . = (LOADADDR( .DoubleExceptionVector.text ) + SIZEOF( .DoubleExceptionVector.text ) + 3) &amp; ~ 3;</div><div class='ctx'> </div><div class='add'>+#endif</div><div class='ctx'> #if defined(CONFIG_SMP)</div><div class='ctx'> </div><div class='ctx'>   SECTION_VECTOR (_SecondaryResetVector_text,</div><div class='head'>diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c<br/>index 4d2872fd9bb5..d159e9b9c018 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/kernel/xtensa_ksyms.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/kernel/xtensa_ksyms.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/kernel/xtensa_ksyms.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/kernel/xtensa_ksyms.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='head'>diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c<br/>index 2725e08ef353..a14df5aa98c8 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/mm/fault.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/mm/fault.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/mm/fault.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/mm/fault.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/extable.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='head'>diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c<br/>index 80e4cfb2471a..720fe4e8b497 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/mm/init.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/mm/init.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/mm/init.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/mm/init.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/of_fdt.h&gt;</div><div class='add'>+#include &lt;linux/dma-contiguous.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bootparam.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -60,6 +61,7 @@ void __init bootmem_init(void)</div><div class='ctx'> 	max_low_pfn = min(max_pfn, MAX_LOW_PFN);</div><div class='ctx'> </div><div class='ctx'> 	memblock_set_current_limit(PFN_PHYS(max_low_pfn));</div><div class='add'>+	dma_contiguous_reserve(PFN_PHYS(max_low_pfn));</div><div class='ctx'> </div><div class='ctx'> 	memblock_dump_all();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c<br/>index c68f1e6158aa..0140a22551c8 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/platforms/iss/console.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/platforms/iss/console.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/platforms/iss/console.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/platforms/iss/console.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;platform/simcall.h&gt;</div><div class='head'>diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c<br/>index ede04cca30dd..02e94bb3ad3e 100644<br/>--- a/<a href='/drm-misc/tree/arch/xtensa/platforms/iss/simdisk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>arch/xtensa/platforms/iss/simdisk.c</a><br/>+++ b/<a href='/drm-misc/tree/arch/xtensa/platforms/iss/simdisk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>arch/xtensa/platforms/iss/simdisk.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;platform/simcall.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SIMDISK_MAJOR 240</div><div class='head'>diff --git a/block/Kconfig b/block/Kconfig<br/>index 1d4d624492fc..e9f780f815f5 100644<br/>--- a/<a href='/drm-misc/tree/block/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/block/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/Kconfig</a></div><div class='hunk'>@@ -5,6 +5,7 @@ menuconfig BLOCK</div><div class='ctx'>        bool "Enable the block layer" if EXPERT</div><div class='ctx'>        default y</div><div class='ctx'>        select SBITMAP</div><div class='add'>+       select SRCU</div><div class='ctx'>        help</div><div class='ctx'> 	 Provide block layer support for the kernel.</div><div class='ctx'> </div><div class='hunk'>@@ -48,9 +49,13 @@ config LBDAF</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='add'>+config BLK_SCSI_REQUEST</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config BLK_DEV_BSG</div><div class='ctx'> 	bool "Block layer SG support v4"</div><div class='ctx'> 	default y</div><div class='add'>+	select BLK_SCSI_REQUEST</div><div class='ctx'> 	help</div><div class='ctx'> 	  Saying Y here will enable generic SG (SCSI generic) v4 support</div><div class='ctx'> 	  for any block device.</div><div class='hunk'>@@ -70,6 +75,7 @@ config BLK_DEV_BSGLIB</div><div class='ctx'> 	bool "Block layer SG support v4 helper lib"</div><div class='ctx'> 	default n</div><div class='ctx'> 	select BLK_DEV_BSG</div><div class='add'>+	select BLK_SCSI_REQUEST</div><div class='ctx'> 	help</div><div class='ctx'> 	  Subsystems will normally enable this if needed. Users will not</div><div class='ctx'> 	  normally need to manually enable this.</div><div class='hunk'>@@ -89,6 +95,14 @@ config BLK_DEV_INTEGRITY</div><div class='ctx'> 	T10/SCSI Data Integrity Field or the T13/ATA External Path</div><div class='ctx'> 	Protection.  If in doubt, say N.</div><div class='ctx'> </div><div class='add'>+config BLK_DEV_ZONED</div><div class='add'>+	bool "Zoned block device support"</div><div class='add'>+	---help---</div><div class='add'>+	Block layer zoned block device support. This option enables</div><div class='add'>+	support for ZAC/ZBC host-managed and host-aware zoned block devices.</div><div class='add'>+</div><div class='add'>+	Say yes here if you have a ZAC or ZBC storage device.</div><div class='add'>+</div><div class='ctx'> config BLK_DEV_THROTTLING</div><div class='ctx'> 	bool "Block layer bio throttling support"</div><div class='ctx'> 	depends on BLK_CGROUP=y</div><div class='hunk'>@@ -112,6 +126,51 @@ config BLK_CMDLINE_PARSER</div><div class='ctx'> </div><div class='ctx'> 	See Documentation/block/cmdline-partition.txt for more information.</div><div class='ctx'> </div><div class='add'>+config BLK_WBT</div><div class='add'>+	bool "Enable support for block device writeback throttling"</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	Enabling this option enables the block layer to throttle buffered</div><div class='add'>+	background writeback from the VM, making it more smooth and having</div><div class='add'>+	less impact on foreground operations. The throttling is done</div><div class='add'>+	dynamically on an algorithm loosely based on CoDel, factoring in</div><div class='add'>+	the realtime performance of the disk.</div><div class='add'>+</div><div class='add'>+config BLK_WBT_SQ</div><div class='add'>+	bool "Single queue writeback throttling"</div><div class='add'>+	default n</div><div class='add'>+	depends on BLK_WBT</div><div class='add'>+	---help---</div><div class='add'>+	Enable writeback throttling by default on legacy single queue devices</div><div class='add'>+</div><div class='add'>+config BLK_WBT_MQ</div><div class='add'>+	bool "Multiqueue writeback throttling"</div><div class='add'>+	default y</div><div class='add'>+	depends on BLK_WBT</div><div class='add'>+	---help---</div><div class='add'>+	Enable writeback throttling by default on multiqueue devices.</div><div class='add'>+	Multiqueue currently doesn't have support for IO scheduling,</div><div class='add'>+	enabling this option is recommended.</div><div class='add'>+</div><div class='add'>+config BLK_DEBUG_FS</div><div class='add'>+	bool "Block layer debugging information in debugfs"</div><div class='add'>+	default y</div><div class='add'>+	depends on DEBUG_FS</div><div class='add'>+	---help---</div><div class='add'>+	Include block layer debugging information in debugfs. This information</div><div class='add'>+	is mostly useful for kernel developers, but it doesn't incur any cost</div><div class='add'>+	at runtime.</div><div class='add'>+</div><div class='add'>+	Unless you are building a kernel for a tiny system, you should</div><div class='add'>+	say Y here.</div><div class='add'>+</div><div class='add'>+config BLK_SED_OPAL</div><div class='add'>+	bool "Logic for interfacing with Opal enabled SEDs"</div><div class='add'>+	---help---</div><div class='add'>+	Builds Logic for interfacing with Opal enabled controllers.</div><div class='add'>+	Enabling this option enables users to setup/unlock/lock</div><div class='add'>+	Locking ranges for SED devices using the Opal protocol.</div><div class='add'>+</div><div class='ctx'> menu "Partition Types"</div><div class='ctx'> </div><div class='ctx'> source "block/partitions/Kconfig"</div><div class='hunk'>@@ -130,4 +189,9 @@ config BLK_MQ_PCI</div><div class='ctx'> 	depends on BLOCK &amp;&amp; PCI</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config BLK_MQ_VIRTIO</div><div class='add'>+	bool</div><div class='add'>+	depends on BLOCK &amp;&amp; VIRTIO</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> source block/Kconfig.iosched</div><div class='head'>diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched<br/>index 421bef9c4c48..58fc8684788d 100644<br/>--- a/<a href='/drm-misc/tree/block/Kconfig.iosched?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/Kconfig.iosched</a><br/>+++ b/<a href='/drm-misc/tree/block/Kconfig.iosched?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/Kconfig.iosched</a></div><div class='hunk'>@@ -63,6 +63,12 @@ config DEFAULT_IOSCHED</div><div class='ctx'> 	default "cfq" if DEFAULT_CFQ</div><div class='ctx'> 	default "noop" if DEFAULT_NOOP</div><div class='ctx'> </div><div class='add'>+config MQ_IOSCHED_DEADLINE</div><div class='add'>+	tristate "MQ deadline I/O scheduler"</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  MQ version of the deadline IO scheduler.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='head'>diff --git a/block/Makefile b/block/Makefile<br/>index 36acdd7545be..081bb680789b 100644<br/>--- a/<a href='/drm-misc/tree/block/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/block/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/Makefile</a></div><div class='hunk'>@@ -5,12 +5,13 @@</div><div class='ctx'> obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.o \</div><div class='ctx'> 			blk-flush.o blk-settings.o blk-ioc.o blk-map.o \</div><div class='ctx'> 			blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \</div><div class='del'>-			blk-lib.o blk-mq.o blk-mq-tag.o \</div><div class='del'>-			blk-mq-sysfs.o blk-mq-cpumap.o ioctl.o \</div><div class='del'>-			genhd.o scsi_ioctl.o partition-generic.o ioprio.o \</div><div class='add'>+			blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \</div><div class='add'>+			blk-mq-sysfs.o blk-mq-cpumap.o blk-mq-sched.o ioctl.o \</div><div class='add'>+			genhd.o partition-generic.o ioprio.o \</div><div class='ctx'> 			badblocks.o partitions/</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_BOUNCE)	+= bounce.o</div><div class='add'>+obj-$(CONFIG_BOUNCE)		+= bounce.o</div><div class='add'>+obj-$(CONFIG_BLK_SCSI_REQUEST)	+= scsi_ioctl.o</div><div class='ctx'> obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o</div><div class='ctx'> obj-$(CONFIG_BLK_DEV_BSGLIB)	+= bsg-lib.o</div><div class='ctx'> obj-$(CONFIG_BLK_CGROUP)	+= blk-cgroup.o</div><div class='hunk'>@@ -18,8 +19,14 @@ obj-$(CONFIG_BLK_DEV_THROTTLING)	+= blk-throttle.o</div><div class='ctx'> obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o</div><div class='ctx'> obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o</div><div class='ctx'> obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o</div><div class='add'>+obj-$(CONFIG_MQ_IOSCHED_DEADLINE)	+= mq-deadline.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o</div><div class='ctx'> obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o</div><div class='ctx'> obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o</div><div class='ctx'> obj-$(CONFIG_BLK_MQ_PCI)	+= blk-mq-pci.o</div><div class='add'>+obj-$(CONFIG_BLK_MQ_VIRTIO)	+= blk-mq-virtio.o</div><div class='add'>+obj-$(CONFIG_BLK_DEV_ZONED)	+= blk-zoned.o</div><div class='add'>+obj-$(CONFIG_BLK_WBT)		+= blk-wbt.o</div><div class='add'>+obj-$(CONFIG_BLK_DEBUG_FS)	+= blk-mq-debugfs.o</div><div class='add'>+obj-$(CONFIG_BLK_SED_OPAL)	+= sed-opal.o</div><div class='head'>diff --git a/block/bio-integrity.c b/block/bio-integrity.c<br/>index 63f72f00c72e..5384713d48bc 100644<br/>--- a/<a href='/drm-misc/tree/block/bio-integrity.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/bio-integrity.c</a><br/>+++ b/<a href='/drm-misc/tree/block/bio-integrity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/bio-integrity.c</a></div><div class='hunk'>@@ -172,7 +172,7 @@ bool bio_integrity_enabled(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct blk_integrity *bi = bdev_get_integrity(bio-&gt;bi_bdev);</div><div class='ctx'> </div><div class='del'>-	if (!bio_is_rw(bio))</div><div class='add'>+	if (bio_op(bio) != REQ_OP_READ &amp;&amp; bio_op(bio) != REQ_OP_WRITE)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* Already protected? */</div><div class='head'>diff --git a/block/bio.c b/block/bio.c<br/>index db85c5753a76..5eec5e08417f 100644<br/>--- a/<a href='/drm-misc/tree/block/bio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/bio.c</a><br/>+++ b/<a href='/drm-misc/tree/block/bio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/bio.c</a></div><div class='hunk'>@@ -270,11 +270,15 @@ static void bio_free(struct bio *bio)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bio_init(struct bio *bio)</div><div class='add'>+void bio_init(struct bio *bio, struct bio_vec *table,</div><div class='add'>+	      unsigned short max_vecs)</div><div class='ctx'> {</div><div class='ctx'> 	memset(bio, 0, sizeof(*bio));</div><div class='ctx'> 	atomic_set(&amp;bio-&gt;__bi_remaining, 1);</div><div class='ctx'> 	atomic_set(&amp;bio-&gt;__bi_cnt, 1);</div><div class='add'>+</div><div class='add'>+	bio-&gt;bi_io_vec = table;</div><div class='add'>+	bio-&gt;bi_max_vecs = max_vecs;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bio_init);</div><div class='ctx'> </div><div class='hunk'>@@ -480,7 +484,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	bio = p + front_pad;</div><div class='del'>-	bio_init(bio);</div><div class='add'>+	bio_init(bio, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (nr_iovecs &gt; inline_vecs) {</div><div class='ctx'> 		unsigned long idx = 0;</div><div class='hunk'>@@ -621,21 +625,20 @@ struct bio *bio_clone_fast(struct bio *bio, gfp_t gfp_mask, struct bio_set *bs)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bio_clone_fast);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * 	bio_clone_bioset - clone a bio</div><div class='del'>- * 	@bio_src: bio to clone</div><div class='del'>- *	@gfp_mask: allocation priority</div><div class='del'>- *	@bs: bio_set to allocate from</div><div class='del'>- *</div><div class='del'>- *	Clone bio. Caller will own the returned bio, but not the actual data it</div><div class='del'>- *	points to. Reference count of returned bio will be one.</div><div class='del'>- */</div><div class='del'>-struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask,</div><div class='del'>-			     struct bio_set *bs)</div><div class='add'>+static struct bio *__bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask,</div><div class='add'>+				      struct bio_set *bs, int offset,</div><div class='add'>+				      int size)</div><div class='ctx'> {</div><div class='ctx'> 	struct bvec_iter iter;</div><div class='ctx'> 	struct bio_vec bv;</div><div class='ctx'> 	struct bio *bio;</div><div class='add'>+	struct bvec_iter iter_src = bio_src-&gt;bi_iter;</div><div class='add'>+</div><div class='add'>+	/* for supporting partial clone */</div><div class='add'>+	if (offset || size != bio_src-&gt;bi_iter.bi_size) {</div><div class='add'>+		bio_advance_iter(bio_src, &amp;iter_src, offset);</div><div class='add'>+		iter_src.bi_size = size;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Pre immutable biovecs, __bio_clone() used to just do a memcpy from</div><div class='hunk'>@@ -659,7 +662,8 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask,</div><div class='ctx'> 	 *    __bio_clone_fast() anyways.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	bio = bio_alloc_bioset(gfp_mask, bio_segments(bio_src), bs);</div><div class='add'>+	bio = bio_alloc_bioset(gfp_mask, __bio_segments(bio_src,</div><div class='add'>+			       &amp;iter_src), bs);</div><div class='ctx'> 	if (!bio)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	bio-&gt;bi_bdev		= bio_src-&gt;bi_bdev;</div><div class='hunk'>@@ -670,12 +674,13 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask,</div><div class='ctx'> 	switch (bio_op(bio)) {</div><div class='ctx'> 	case REQ_OP_DISCARD:</div><div class='ctx'> 	case REQ_OP_SECURE_ERASE:</div><div class='add'>+	case REQ_OP_WRITE_ZEROES:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case REQ_OP_WRITE_SAME:</div><div class='ctx'> 		bio-&gt;bi_io_vec[bio-&gt;bi_vcnt++] = bio_src-&gt;bi_io_vec[0];</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		bio_for_each_segment(bv, bio_src, iter)</div><div class='add'>+		__bio_for_each_segment(bv, bio_src, iter, iter_src)</div><div class='ctx'> 			bio-&gt;bi_io_vec[bio-&gt;bi_vcnt++] = bv;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -694,9 +699,44 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask,</div><div class='ctx'> </div><div class='ctx'> 	return bio;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * 	bio_clone_bioset - clone a bio</div><div class='add'>+ * 	@bio_src: bio to clone</div><div class='add'>+ *	@gfp_mask: allocation priority</div><div class='add'>+ *	@bs: bio_set to allocate from</div><div class='add'>+ *</div><div class='add'>+ *	Clone bio. Caller will own the returned bio, but not the actual data it</div><div class='add'>+ *	points to. Reference count of returned bio will be one.</div><div class='add'>+ */</div><div class='add'>+struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask,</div><div class='add'>+			     struct bio_set *bs)</div><div class='add'>+{</div><div class='add'>+	return __bio_clone_bioset(bio_src, gfp_mask, bs, 0,</div><div class='add'>+				  bio_src-&gt;bi_iter.bi_size);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(bio_clone_bioset);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * 	bio_clone_bioset_partial - clone a partial bio</div><div class='add'>+ * 	@bio_src: bio to clone</div><div class='add'>+ *	@gfp_mask: allocation priority</div><div class='add'>+ *	@bs: bio_set to allocate from</div><div class='add'>+ *	@offset: cloned starting from the offset</div><div class='add'>+ *	@size: size for the cloned bio</div><div class='add'>+ *</div><div class='add'>+ *	Clone bio. Caller will own the returned bio, but not the actual data it</div><div class='add'>+ *	points to. Reference count of returned bio will be one.</div><div class='add'>+ */</div><div class='add'>+struct bio *bio_clone_bioset_partial(struct bio *bio_src, gfp_t gfp_mask,</div><div class='add'>+				     struct bio_set *bs, int offset,</div><div class='add'>+				     int size)</div><div class='add'>+{</div><div class='add'>+	return __bio_clone_bioset(bio_src, gfp_mask, bs, offset, size);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bio_clone_bioset_partial);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	bio_add_pc_page	-	attempt to add page to bio</div><div class='ctx'>  *	@q: the target queue</div><div class='ctx'>  *	@bio: destination bio</div><div class='hunk'>@@ -847,6 +887,55 @@ done:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bio_add_page);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * bio_iov_iter_get_pages - pin user or kernel pages and add them to a bio</div><div class='add'>+ * @bio: bio to add pages to</div><div class='add'>+ * @iter: iov iterator describing the region to be mapped</div><div class='add'>+ *</div><div class='add'>+ * Pins as many pages from *iter and appends them to @bio's bvec array. The</div><div class='add'>+ * pages will have to be released using put_page() when done.</div><div class='add'>+ */</div><div class='add'>+int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)</div><div class='add'>+{</div><div class='add'>+	unsigned short nr_pages = bio-&gt;bi_max_vecs - bio-&gt;bi_vcnt;</div><div class='add'>+	struct bio_vec *bv = bio-&gt;bi_io_vec + bio-&gt;bi_vcnt;</div><div class='add'>+	struct page **pages = (struct page **)bv;</div><div class='add'>+	size_t offset, diff;</div><div class='add'>+	ssize_t size;</div><div class='add'>+</div><div class='add'>+	size = iov_iter_get_pages(iter, pages, LONG_MAX, nr_pages, &amp;offset);</div><div class='add'>+	if (unlikely(size &lt;= 0))</div><div class='add'>+		return size ? size : -EFAULT;</div><div class='add'>+	nr_pages = (size + offset + PAGE_SIZE - 1) / PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Deep magic below:  We need to walk the pinned pages backwards</div><div class='add'>+	 * because we are abusing the space allocated for the bio_vecs</div><div class='add'>+	 * for the page array.  Because the bio_vecs are larger than the</div><div class='add'>+	 * page pointers by definition this will always work.  But it also</div><div class='add'>+	 * means we can't use bio_add_page, so any changes to it's semantics</div><div class='add'>+	 * need to be reflected here as well.</div><div class='add'>+	 */</div><div class='add'>+	bio-&gt;bi_iter.bi_size += size;</div><div class='add'>+	bio-&gt;bi_vcnt += nr_pages;</div><div class='add'>+</div><div class='add'>+	diff = (nr_pages * PAGE_SIZE - offset) - size;</div><div class='add'>+	while (nr_pages--) {</div><div class='add'>+		bv[nr_pages].bv_page = pages[nr_pages];</div><div class='add'>+		bv[nr_pages].bv_len = PAGE_SIZE;</div><div class='add'>+		bv[nr_pages].bv_offset = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bv[0].bv_offset += offset;</div><div class='add'>+	bv[0].bv_len -= offset;</div><div class='add'>+	if (diff)</div><div class='add'>+		bv[bio-&gt;bi_vcnt - 1].bv_len -= diff;</div><div class='add'>+</div><div class='add'>+	iov_iter_advance(iter, size);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bio_iov_iter_get_pages);</div><div class='add'>+</div><div class='ctx'> struct submit_bio_ret {</div><div class='ctx'> 	struct completion event;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -1173,9 +1262,6 @@ struct bio *bio_copy_user_iov(struct request_queue *q,</div><div class='ctx'> 	if (!bio)</div><div class='ctx'> 		goto out_bmd;</div><div class='ctx'> </div><div class='del'>-	if (iter-&gt;type &amp; WRITE)</div><div class='del'>-		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);</div><div class='del'>-</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (map_data) {</div><div class='hunk'>@@ -1340,16 +1426,10 @@ struct bio *bio_map_user_iov(struct request_queue *q,</div><div class='ctx'> </div><div class='ctx'> 	kfree(pages);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * set data direction, and check if mapped pages need bouncing</div><div class='del'>-	 */</div><div class='del'>-	if (iter-&gt;type &amp; WRITE)</div><div class='del'>-		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);</div><div class='del'>-</div><div class='ctx'> 	bio_set_flag(bio, BIO_USER_MAPPED);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * subtle -- if __bio_map_user() ended up bouncing a bio,</div><div class='add'>+	 * subtle -- if bio_map_user_iov() ended up bouncing a bio,</div><div class='ctx'> 	 * it would normally disappear when its bi_end_io is run.</div><div class='ctx'> 	 * however, we need it for the unmap, so grab an extra</div><div class='ctx'> 	 * reference to it</div><div class='hunk'>@@ -1391,8 +1471,8 @@ static void __bio_unmap_user(struct bio *bio)</div><div class='ctx'>  *	bio_unmap_user	-	unmap a bio</div><div class='ctx'>  *	@bio:		the bio being unmapped</div><div class='ctx'>  *</div><div class='del'>- *	Unmap a bio previously mapped by bio_map_user(). Must be called with</div><div class='del'>- *	a process context.</div><div class='add'>+ *	Unmap a bio previously mapped by bio_map_user_iov(). Must be called from</div><div class='add'>+ *	process context.</div><div class='ctx'>  *</div><div class='ctx'>  *	bio_unmap_user() may sleep.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1536,7 +1616,6 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len,</div><div class='ctx'> 		bio-&gt;bi_private = data;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bio-&gt;bi_end_io = bio_copy_kern_endio;</div><div class='del'>-		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return bio;</div><div class='hunk'>@@ -1786,15 +1865,7 @@ struct bio *bio_split(struct bio *bio, int sectors,</div><div class='ctx'> 	BUG_ON(sectors &lt;= 0);</div><div class='ctx'> 	BUG_ON(sectors &gt;= bio_sectors(bio));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Discards need a mutable bio_vec to accommodate the payload</div><div class='del'>-	 * required by the DSM TRIM and UNMAP commands.</div><div class='del'>-	 */</div><div class='del'>-	if (bio_op(bio) == REQ_OP_DISCARD || bio_op(bio) == REQ_OP_SECURE_ERASE)</div><div class='del'>-		split = bio_clone_bioset(bio, gfp, bs);</div><div class='del'>-	else</div><div class='del'>-		split = bio_clone_fast(bio, gfp, bs);</div><div class='del'>-</div><div class='add'>+	split = bio_clone_fast(bio, gfp, bs);</div><div class='ctx'> 	if (!split)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c<br/>index b08ccbb9393a..bbe7ee00bd3d 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-cgroup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-cgroup.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-cgroup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-cgroup.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/ioprio.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='hunk'>@@ -184,8 +185,9 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg,</div><div class='ctx'> 		goto err_free_blkg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wb_congested = wb_congested_get_create(&amp;q-&gt;backing_dev_info,</div><div class='del'>-					       blkcg-&gt;css.id, GFP_NOWAIT);</div><div class='add'>+	wb_congested = wb_congested_get_create(q-&gt;backing_dev_info,</div><div class='add'>+					       blkcg-&gt;css.id,</div><div class='add'>+					       GFP_NOWAIT | __GFP_NOWARN);</div><div class='ctx'> 	if (!wb_congested) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto err_put_css;</div><div class='hunk'>@@ -193,7 +195,7 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg,</div><div class='ctx'> </div><div class='ctx'> 	/* allocate */</div><div class='ctx'> 	if (!new_blkg) {</div><div class='del'>-		new_blkg = blkg_alloc(blkcg, q, GFP_NOWAIT);</div><div class='add'>+		new_blkg = blkg_alloc(blkcg, q, GFP_NOWAIT | __GFP_NOWARN);</div><div class='ctx'> 		if (unlikely(!new_blkg)) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto err_put_congested;</div><div class='hunk'>@@ -468,8 +470,8 @@ static int blkcg_reset_stats(struct cgroup_subsys_state *css,</div><div class='ctx'> const char *blkg_dev_name(struct blkcg_gq *blkg)</div><div class='ctx'> {</div><div class='ctx'> 	/* some drivers (floppy) instantiate a queue w/o disk registered */</div><div class='del'>-	if (blkg-&gt;q-&gt;backing_dev_info.dev)</div><div class='del'>-		return dev_name(blkg-&gt;q-&gt;backing_dev_info.dev);</div><div class='add'>+	if (blkg-&gt;q-&gt;backing_dev_info-&gt;dev)</div><div class='add'>+		return dev_name(blkg-&gt;q-&gt;backing_dev_info-&gt;dev);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(blkg_dev_name);</div><div class='hunk'>@@ -1022,7 +1024,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;blkcg-&gt;lock);</div><div class='del'>-	INIT_RADIX_TREE(&amp;blkcg-&gt;blkg_tree, GFP_NOWAIT);</div><div class='add'>+	INIT_RADIX_TREE(&amp;blkcg-&gt;blkg_tree, GFP_NOWAIT | __GFP_NOWARN);</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;blkcg-&gt;blkg_list);</div><div class='ctx'> #ifdef CONFIG_CGROUP_WRITEBACK</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;blkcg-&gt;cgwb_list);</div><div class='hunk'>@@ -1078,10 +1080,8 @@ int blkcg_init_queue(struct request_queue *q)</div><div class='ctx'> 	if (preloaded)</div><div class='ctx'> 		radix_tree_preload_end();</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(blkg)) {</div><div class='del'>-		blkg_free(new_blkg);</div><div class='add'>+	if (IS_ERR(blkg))</div><div class='ctx'> 		return PTR_ERR(blkg);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;root_blkg = blkg;</div><div class='ctx'> 	q-&gt;root_rl.blkg = blkg;</div><div class='hunk'>@@ -1222,7 +1222,10 @@ int blkcg_activate_policy(struct request_queue *q,</div><div class='ctx'> 	if (blkcg_policy_enabled(q, pol))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	blk_queue_bypass_start(q);</div><div class='add'>+	if (q-&gt;mq_ops)</div><div class='add'>+		blk_mq_freeze_queue(q);</div><div class='add'>+	else</div><div class='add'>+		blk_queue_bypass_start(q);</div><div class='ctx'> pd_prealloc:</div><div class='ctx'> 	if (!pd_prealloc) {</div><div class='ctx'> 		pd_prealloc = pol-&gt;pd_alloc_fn(GFP_KERNEL, q-&gt;node);</div><div class='hunk'>@@ -1240,7 +1243,7 @@ pd_prealloc:</div><div class='ctx'> 		if (blkg-&gt;pd[pol-&gt;plid])</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		pd = pol-&gt;pd_alloc_fn(GFP_NOWAIT, q-&gt;node);</div><div class='add'>+		pd = pol-&gt;pd_alloc_fn(GFP_NOWAIT | __GFP_NOWARN, q-&gt;node);</div><div class='ctx'> 		if (!pd)</div><div class='ctx'> 			swap(pd, pd_prealloc);</div><div class='ctx'> 		if (!pd) {</div><div class='hunk'>@@ -1260,7 +1263,10 @@ pd_prealloc:</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> out_bypass_end:</div><div class='del'>-	blk_queue_bypass_end(q);</div><div class='add'>+	if (q-&gt;mq_ops)</div><div class='add'>+		blk_mq_unfreeze_queue(q);</div><div class='add'>+	else</div><div class='add'>+		blk_queue_bypass_end(q);</div><div class='ctx'> 	if (pd_prealloc)</div><div class='ctx'> 		pol-&gt;pd_free_fn(pd_prealloc);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1283,7 +1289,11 @@ void blkcg_deactivate_policy(struct request_queue *q,</div><div class='ctx'> 	if (!blkcg_policy_enabled(q, pol))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	blk_queue_bypass_start(q);</div><div class='add'>+	if (q-&gt;mq_ops)</div><div class='add'>+		blk_mq_freeze_queue(q);</div><div class='add'>+	else</div><div class='add'>+		blk_queue_bypass_start(q);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='ctx'> 	__clear_bit(pol-&gt;plid, q-&gt;blkcg_pols);</div><div class='hunk'>@@ -1303,7 +1313,11 @@ void blkcg_deactivate_policy(struct request_queue *q,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(q-&gt;queue_lock);</div><div class='del'>-	blk_queue_bypass_end(q);</div><div class='add'>+</div><div class='add'>+	if (q-&gt;mq_ops)</div><div class='add'>+		blk_mq_unfreeze_queue(q);</div><div class='add'>+	else</div><div class='add'>+		blk_queue_bypass_end(q);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(blkcg_deactivate_policy);</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-core.c b/block/blk-core.c<br/>index 14d7c0740dc0..1086dac8724c 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-core.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-core.c</a></div><div class='hunk'>@@ -33,12 +33,19 @@</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/blk-cgroup.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include &lt;trace/events/block.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "blk.h"</div><div class='ctx'> #include "blk-mq.h"</div><div class='add'>+#include "blk-mq-sched.h"</div><div class='add'>+#include "blk-wbt.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+struct dentry *blk_debugfs_root;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_remap);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap);</div><div class='hunk'>@@ -73,7 +80,7 @@ static void blk_clear_congested(struct request_list *rl, int sync)</div><div class='ctx'> 	 * flip its congestion state for events on other blkcgs.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (rl == &amp;rl-&gt;q-&gt;root_rl)</div><div class='del'>-		clear_wb_congested(rl-&gt;q-&gt;backing_dev_info.wb.congested, sync);</div><div class='add'>+		clear_wb_congested(rl-&gt;q-&gt;backing_dev_info-&gt;wb.congested, sync);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +91,7 @@ static void blk_set_congested(struct request_list *rl, int sync)</div><div class='ctx'> #else</div><div class='ctx'> 	/* see blk_clear_congested() */</div><div class='ctx'> 	if (rl == &amp;rl-&gt;q-&gt;root_rl)</div><div class='del'>-		set_wb_congested(rl-&gt;q-&gt;backing_dev_info.wb.congested, sync);</div><div class='add'>+		set_wb_congested(rl-&gt;q-&gt;backing_dev_info-&gt;wb.congested, sync);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -103,22 +110,6 @@ void blk_queue_congestion_threshold(struct request_queue *q)</div><div class='ctx'> 	q-&gt;nr_congestion_off = nr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * blk_get_backing_dev_info - get the address of a queue's backing_dev_info</div><div class='del'>- * @bdev:	device</div><div class='del'>- *</div><div class='del'>- * Locates the passed device's request queue and returns the address of its</div><div class='del'>- * backing_dev_info.  This function can only be called if @bdev is opened</div><div class='del'>- * and the return value is never NULL.</div><div class='del'>- */</div><div class='del'>-struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev)</div><div class='del'>-{</div><div class='del'>-	struct request_queue *q = bdev_get_queue(bdev);</div><div class='del'>-</div><div class='del'>-	return &amp;q-&gt;backing_dev_info;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(blk_get_backing_dev_info);</div><div class='del'>-</div><div class='ctx'> void blk_rq_init(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	memset(rq, 0, sizeof(*rq));</div><div class='hunk'>@@ -130,9 +121,8 @@ void blk_rq_init(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	rq-&gt;__sector = (sector_t) -1;</div><div class='ctx'> 	INIT_HLIST_NODE(&amp;rq-&gt;hash);</div><div class='ctx'> 	RB_CLEAR_NODE(&amp;rq-&gt;rb_node);</div><div class='del'>-	rq-&gt;cmd = rq-&gt;__cmd;</div><div class='del'>-	rq-&gt;cmd_len = BLK_MAX_CDB;</div><div class='ctx'> 	rq-&gt;tag = -1;</div><div class='add'>+	rq-&gt;internal_tag = -1;</div><div class='ctx'> 	rq-&gt;start_time = jiffies;</div><div class='ctx'> 	set_start_time_ns(rq);</div><div class='ctx'> 	rq-&gt;part = NULL;</div><div class='hunk'>@@ -145,22 +135,20 @@ static void req_bio_endio(struct request *rq, struct bio *bio,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		bio-&gt;bi_error = error;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(rq-&gt;cmd_flags &amp; REQ_QUIET))</div><div class='add'>+	if (unlikely(rq-&gt;rq_flags &amp; RQF_QUIET))</div><div class='ctx'> 		bio_set_flag(bio, BIO_QUIET);</div><div class='ctx'> </div><div class='ctx'> 	bio_advance(bio, nbytes);</div><div class='ctx'> </div><div class='ctx'> 	/* don't actually finish bio if it's part of flush sequence */</div><div class='del'>-	if (bio-&gt;bi_iter.bi_size == 0 &amp;&amp; !(rq-&gt;cmd_flags &amp; REQ_FLUSH_SEQ))</div><div class='add'>+	if (bio-&gt;bi_iter.bi_size == 0 &amp;&amp; !(rq-&gt;rq_flags &amp; RQF_FLUSH_SEQ))</div><div class='ctx'> 		bio_endio(bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void blk_dump_rq_flags(struct request *rq, char *msg)</div><div class='ctx'> {</div><div class='del'>-	int bit;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s: dev %s: type=%x, flags=%llx\n", msg,</div><div class='del'>-		rq-&gt;rq_disk ? rq-&gt;rq_disk-&gt;disk_name : "?", rq-&gt;cmd_type,</div><div class='add'>+	printk(KERN_INFO "%s: dev %s: flags=%llx\n", msg,</div><div class='add'>+		rq-&gt;rq_disk ? rq-&gt;rq_disk-&gt;disk_name : "?",</div><div class='ctx'> 		(unsigned long long) rq-&gt;cmd_flags);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "  sector %llu, nr/cnr %u/%u\n",</div><div class='hunk'>@@ -168,13 +156,6 @@ void blk_dump_rq_flags(struct request *rq, char *msg)</div><div class='ctx'> 	       blk_rq_sectors(rq), blk_rq_cur_sectors(rq));</div><div class='ctx'> 	printk(KERN_INFO "  bio %p, biotail %p, len %u\n",</div><div class='ctx'> 	       rq-&gt;bio, rq-&gt;biotail, blk_rq_bytes(rq));</div><div class='del'>-</div><div class='del'>-	if (rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) {</div><div class='del'>-		printk(KERN_INFO "  cdb: ");</div><div class='del'>-		for (bit = 0; bit &lt; BLK_MAX_CDB; bit++)</div><div class='del'>-			printk("%02x ", rq-&gt;cmd[bit]);</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_dump_rq_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -524,12 +505,14 @@ void blk_set_queue_dying(struct request_queue *q)</div><div class='ctx'> 	else {</div><div class='ctx'> 		struct request_list *rl;</div><div class='ctx'> </div><div class='add'>+		spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> 		blk_queue_for_each_rl(rl, q) {</div><div class='ctx'> 			if (rl-&gt;rq_pool) {</div><div class='ctx'> 				wake_up(&amp;rl-&gt;wait[BLK_RW_SYNC]);</div><div class='ctx'> 				wake_up(&amp;rl-&gt;wait[BLK_RW_ASYNC]);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_set_queue_dying);</div><div class='hunk'>@@ -583,7 +566,7 @@ void blk_cleanup_queue(struct request_queue *q)</div><div class='ctx'> 	blk_flush_integrity();</div><div class='ctx'> </div><div class='ctx'> 	/* @q won't process any more request, flush async actions */</div><div class='del'>-	del_timer_sync(&amp;q-&gt;backing_dev_info.laptop_mode_wb_timer);</div><div class='add'>+	del_timer_sync(&amp;q-&gt;backing_dev_info-&gt;laptop_mode_wb_timer);</div><div class='ctx'> 	blk_sync_queue(q);</div><div class='ctx'> </div><div class='ctx'> 	if (q-&gt;mq_ops)</div><div class='hunk'>@@ -595,7 +578,7 @@ void blk_cleanup_queue(struct request_queue *q)</div><div class='ctx'> 		q-&gt;queue_lock = &amp;q-&gt;__queue_lock;</div><div class='ctx'> 	spin_unlock_irq(lock);</div><div class='ctx'> </div><div class='del'>-	bdi_unregister(&amp;q-&gt;backing_dev_info);</div><div class='add'>+	put_disk_devt(q-&gt;disk_devt);</div><div class='ctx'> </div><div class='ctx'> 	/* @q is and will stay empty, shutdown and put */</div><div class='ctx'> 	blk_put_queue(q);</div><div class='hunk'>@@ -603,17 +586,41 @@ void blk_cleanup_queue(struct request_queue *q)</div><div class='ctx'> EXPORT_SYMBOL(blk_cleanup_queue);</div><div class='ctx'> </div><div class='ctx'> /* Allocate memory local to the request queue */</div><div class='del'>-static void *alloc_request_struct(gfp_t gfp_mask, void *data)</div><div class='add'>+static void *alloc_request_simple(gfp_t gfp_mask, void *data)</div><div class='ctx'> {</div><div class='del'>-	int nid = (int)(long)data;</div><div class='del'>-	return kmem_cache_alloc_node(request_cachep, gfp_mask, nid);</div><div class='add'>+	struct request_queue *q = data;</div><div class='add'>+</div><div class='add'>+	return kmem_cache_alloc_node(request_cachep, gfp_mask, q-&gt;node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_request_struct(void *element, void *unused)</div><div class='add'>+static void free_request_simple(void *element, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	kmem_cache_free(request_cachep, element);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void *alloc_request_size(gfp_t gfp_mask, void *data)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = data;</div><div class='add'>+	struct request *rq;</div><div class='add'>+</div><div class='add'>+	rq = kmalloc_node(sizeof(struct request) + q-&gt;cmd_size, gfp_mask,</div><div class='add'>+			q-&gt;node);</div><div class='add'>+	if (rq &amp;&amp; q-&gt;init_rq_fn &amp;&amp; q-&gt;init_rq_fn(q, rq, gfp_mask) &lt; 0) {</div><div class='add'>+		kfree(rq);</div><div class='add'>+		rq = NULL;</div><div class='add'>+	}</div><div class='add'>+	return rq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_request_size(void *element, void *data)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = data;</div><div class='add'>+</div><div class='add'>+	if (q-&gt;exit_rq_fn)</div><div class='add'>+		q-&gt;exit_rq_fn(q, element);</div><div class='add'>+	kfree(element);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int blk_init_rl(struct request_list *rl, struct request_queue *q,</div><div class='ctx'> 		gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -626,10 +633,15 @@ int blk_init_rl(struct request_list *rl, struct request_queue *q,</div><div class='ctx'> 	init_waitqueue_head(&amp;rl-&gt;wait[BLK_RW_SYNC]);</div><div class='ctx'> 	init_waitqueue_head(&amp;rl-&gt;wait[BLK_RW_ASYNC]);</div><div class='ctx'> </div><div class='del'>-	rl-&gt;rq_pool = mempool_create_node(BLKDEV_MIN_RQ, alloc_request_struct,</div><div class='del'>-					  free_request_struct,</div><div class='del'>-					  (void *)(long)q-&gt;node, gfp_mask,</div><div class='del'>-					  q-&gt;node);</div><div class='add'>+	if (q-&gt;cmd_size) {</div><div class='add'>+		rl-&gt;rq_pool = mempool_create_node(BLKDEV_MIN_RQ,</div><div class='add'>+				alloc_request_size, free_request_size,</div><div class='add'>+				q, gfp_mask, q-&gt;node);</div><div class='add'>+	} else {</div><div class='add'>+		rl-&gt;rq_pool = mempool_create_node(BLKDEV_MIN_RQ,</div><div class='add'>+				alloc_request_simple, free_request_simple,</div><div class='add'>+				q, gfp_mask, q-&gt;node);</div><div class='add'>+	}</div><div class='ctx'> 	if (!rl-&gt;rq_pool)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -692,7 +704,6 @@ static void blk_rq_timed_out_timer(unsigned long data)</div><div class='ctx'> struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	q = kmem_cache_alloc_node(blk_requestq_cachep,</div><div class='ctx'> 				gfp_mask | __GFP_ZERO, node_id);</div><div class='hunk'>@@ -707,17 +718,17 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)</div><div class='ctx'> 	if (!q-&gt;bio_split)</div><div class='ctx'> 		goto fail_id;</div><div class='ctx'> </div><div class='del'>-	q-&gt;backing_dev_info.ra_pages =</div><div class='add'>+	q-&gt;backing_dev_info = bdi_alloc_node(gfp_mask, node_id);</div><div class='add'>+	if (!q-&gt;backing_dev_info)</div><div class='add'>+		goto fail_split;</div><div class='add'>+</div><div class='add'>+	q-&gt;backing_dev_info-&gt;ra_pages =</div><div class='ctx'> 			(VM_MAX_READAHEAD * 1024) / PAGE_SIZE;</div><div class='del'>-	q-&gt;backing_dev_info.capabilities = BDI_CAP_CGROUP_WRITEBACK;</div><div class='del'>-	q-&gt;backing_dev_info.name = "block";</div><div class='add'>+	q-&gt;backing_dev_info-&gt;capabilities = BDI_CAP_CGROUP_WRITEBACK;</div><div class='add'>+	q-&gt;backing_dev_info-&gt;name = "block";</div><div class='ctx'> 	q-&gt;node = node_id;</div><div class='ctx'> </div><div class='del'>-	err = bdi_init(&amp;q-&gt;backing_dev_info);</div><div class='del'>-	if (err)</div><div class='del'>-		goto fail_split;</div><div class='del'>-</div><div class='del'>-	setup_timer(&amp;q-&gt;backing_dev_info.laptop_mode_wb_timer,</div><div class='add'>+	setup_timer(&amp;q-&gt;backing_dev_info-&gt;laptop_mode_wb_timer,</div><div class='ctx'> 		    laptop_mode_timer_fn, (unsigned long) q);</div><div class='ctx'> 	setup_timer(&amp;q-&gt;timeout, blk_rq_timed_out_timer, (unsigned long) q);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;q-&gt;queue_head);</div><div class='hunk'>@@ -767,7 +778,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)</div><div class='ctx'> fail_ref:</div><div class='ctx'> 	percpu_ref_exit(&amp;q-&gt;q_usage_counter);</div><div class='ctx'> fail_bdi:</div><div class='del'>-	bdi_destroy(&amp;q-&gt;backing_dev_info);</div><div class='add'>+	bdi_put(q-&gt;backing_dev_info);</div><div class='ctx'> fail_split:</div><div class='ctx'> 	bioset_free(q-&gt;bio_split);</div><div class='ctx'> fail_id:</div><div class='hunk'>@@ -820,15 +831,19 @@ EXPORT_SYMBOL(blk_init_queue);</div><div class='ctx'> struct request_queue *</div><div class='ctx'> blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)</div><div class='ctx'> {</div><div class='del'>-	struct request_queue *uninit_q, *q;</div><div class='add'>+	struct request_queue *q;</div><div class='ctx'> </div><div class='del'>-	uninit_q = blk_alloc_queue_node(GFP_KERNEL, node_id);</div><div class='del'>-	if (!uninit_q)</div><div class='add'>+	q = blk_alloc_queue_node(GFP_KERNEL, node_id);</div><div class='add'>+	if (!q)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	q = blk_init_allocated_queue(uninit_q, rfn, lock);</div><div class='del'>-	if (!q)</div><div class='del'>-		blk_cleanup_queue(uninit_q);</div><div class='add'>+	q-&gt;request_fn = rfn;</div><div class='add'>+	if (lock)</div><div class='add'>+		q-&gt;queue_lock = lock;</div><div class='add'>+	if (blk_init_allocated_queue(q) &lt; 0) {</div><div class='add'>+		blk_cleanup_queue(q);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return q;</div><div class='ctx'> }</div><div class='hunk'>@@ -836,30 +851,22 @@ EXPORT_SYMBOL(blk_init_queue_node);</div><div class='ctx'> </div><div class='ctx'> static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio);</div><div class='ctx'> </div><div class='del'>-struct request_queue *</div><div class='del'>-blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,</div><div class='del'>-			 spinlock_t *lock)</div><div class='del'>-{</div><div class='del'>-	if (!q)</div><div class='del'>-		return NULL;</div><div class='ctx'> </div><div class='del'>-	q-&gt;fq = blk_alloc_flush_queue(q, NUMA_NO_NODE, 0);</div><div class='add'>+int blk_init_allocated_queue(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	q-&gt;fq = blk_alloc_flush_queue(q, NUMA_NO_NODE, q-&gt;cmd_size);</div><div class='ctx'> 	if (!q-&gt;fq)</div><div class='del'>-		return NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (q-&gt;init_rq_fn &amp;&amp; q-&gt;init_rq_fn(q, q-&gt;fq-&gt;flush_rq, GFP_KERNEL))</div><div class='add'>+		goto out_free_flush_queue;</div><div class='ctx'> </div><div class='ctx'> 	if (blk_init_rl(&amp;q-&gt;root_rl, q, GFP_KERNEL))</div><div class='del'>-		goto fail;</div><div class='add'>+		goto out_exit_flush_rq;</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;q-&gt;timeout_work, blk_timeout_work);</div><div class='del'>-	q-&gt;request_fn		= rfn;</div><div class='del'>-	q-&gt;prep_rq_fn		= NULL;</div><div class='del'>-	q-&gt;unprep_rq_fn		= NULL;</div><div class='ctx'> 	q-&gt;queue_flags		|= QUEUE_FLAG_DEFAULT;</div><div class='ctx'> </div><div class='del'>-	/* Override internal queue lock with supplied lock pointer */</div><div class='del'>-	if (lock)</div><div class='del'>-		q-&gt;queue_lock		= lock;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This also sets hw/phys segments, boundary and size</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -873,16 +880,19 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,</div><div class='ctx'> 	/* init elevator */</div><div class='ctx'> 	if (elevator_init(q, NULL)) {</div><div class='ctx'> 		mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='del'>-		goto fail;</div><div class='add'>+		goto out_exit_flush_rq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-	return q;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='add'>+out_exit_flush_rq:</div><div class='add'>+	if (q-&gt;exit_rq_fn)</div><div class='add'>+		q-&gt;exit_rq_fn(q, q-&gt;fq-&gt;flush_rq);</div><div class='add'>+out_free_flush_queue:</div><div class='ctx'> 	blk_free_flush_queue(q-&gt;fq);</div><div class='del'>-	return NULL;</div><div class='add'>+	wbt_exit(q);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_init_allocated_queue);</div><div class='ctx'> </div><div class='hunk'>@@ -899,7 +909,7 @@ EXPORT_SYMBOL(blk_get_queue);</div><div class='ctx'> </div><div class='ctx'> static inline void blk_free_request(struct request_list *rl, struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	if (rq-&gt;cmd_flags &amp; REQ_ELVPRIV) {</div><div class='add'>+	if (rq-&gt;rq_flags &amp; RQF_ELVPRIV) {</div><div class='ctx'> 		elv_put_request(rl-&gt;q, rq);</div><div class='ctx'> 		if (rq-&gt;elv.icq)</div><div class='ctx'> 			put_io_context(rq-&gt;elv.icq-&gt;ioc);</div><div class='hunk'>@@ -961,14 +971,14 @@ static void __freed_request(struct request_list *rl, int sync)</div><div class='ctx'>  * A request has just been released.  Account for it, update the full and</div><div class='ctx'>  * congestion status, wake up any waiters.   Called under q-&gt;queue_lock.</div><div class='ctx'>  */</div><div class='del'>-static void freed_request(struct request_list *rl, int op, unsigned int flags)</div><div class='add'>+static void freed_request(struct request_list *rl, bool sync,</div><div class='add'>+		req_flags_t rq_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = rl-&gt;q;</div><div class='del'>-	int sync = rw_is_sync(op, flags);</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;nr_rqs[sync]--;</div><div class='ctx'> 	rl-&gt;count[sync]--;</div><div class='del'>-	if (flags &amp; REQ_ELVPRIV)</div><div class='add'>+	if (rq_flags &amp; RQF_ELVPRIV)</div><div class='ctx'> 		q-&gt;nr_rqs_elvpriv--;</div><div class='ctx'> </div><div class='ctx'> 	__freed_request(rl, sync);</div><div class='hunk'>@@ -1018,46 +1028,10 @@ int blk_update_nr_requests(struct request_queue *q, unsigned int nr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Determine if elevator data should be initialized when allocating the</div><div class='del'>- * request associated with @bio.</div><div class='del'>- */</div><div class='del'>-static bool blk_rq_should_init_elevator(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	if (!bio)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Flush requests do not use the elevator so skip initialization.</div><div class='del'>-	 * This allows a request to share the flush and elevator data.</div><div class='del'>-	 */</div><div class='del'>-	if (bio-&gt;bi_opf &amp; (REQ_PREFLUSH | REQ_FUA))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * rq_ioc - determine io_context for request allocation</div><div class='del'>- * @bio: request being allocated is for this bio (can be %NULL)</div><div class='del'>- *</div><div class='del'>- * Determine io_context to use for request allocation for @bio.  May return</div><div class='del'>- * %NULL if %current-&gt;io_context doesn't exist.</div><div class='del'>- */</div><div class='del'>-static struct io_context *rq_ioc(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BLK_CGROUP</div><div class='del'>-	if (bio &amp;&amp; bio-&gt;bi_ioc)</div><div class='del'>-		return bio-&gt;bi_ioc;</div><div class='del'>-#endif</div><div class='del'>-	return current-&gt;io_context;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * __get_request - get a free request</div><div class='ctx'>  * @rl: request list to allocate from</div><div class='del'>- * @op: REQ_OP_READ/REQ_OP_WRITE</div><div class='del'>- * @op_flags: rq_flag_bits</div><div class='add'>+ * @op: operation and flags</div><div class='ctx'>  * @bio: bio to allocate request for (can be %NULL)</div><div class='ctx'>  * @gfp_mask: allocation mask</div><div class='ctx'>  *</div><div class='hunk'>@@ -1068,22 +1042,22 @@ static struct io_context *rq_ioc(struct bio *bio)</div><div class='ctx'>  * Returns ERR_PTR on failure, with @q-&gt;queue_lock held.</div><div class='ctx'>  * Returns request pointer on success, with @q-&gt;queue_lock *not held*.</div><div class='ctx'>  */</div><div class='del'>-static struct request *__get_request(struct request_list *rl, int op,</div><div class='del'>-				     int op_flags, struct bio *bio,</div><div class='del'>-				     gfp_t gfp_mask)</div><div class='add'>+static struct request *__get_request(struct request_list *rl, unsigned int op,</div><div class='add'>+		struct bio *bio, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = rl-&gt;q;</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> 	struct elevator_type *et = q-&gt;elevator-&gt;type;</div><div class='ctx'> 	struct io_context *ioc = rq_ioc(bio);</div><div class='ctx'> 	struct io_cq *icq = NULL;</div><div class='del'>-	const bool is_sync = rw_is_sync(op, op_flags) != 0;</div><div class='add'>+	const bool is_sync = op_is_sync(op);</div><div class='ctx'> 	int may_queue;</div><div class='add'>+	req_flags_t rq_flags = RQF_ALLOCED;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(blk_queue_dying(q)))</div><div class='ctx'> 		return ERR_PTR(-ENODEV);</div><div class='ctx'> </div><div class='del'>-	may_queue = elv_may_queue(q, op, op_flags);</div><div class='add'>+	may_queue = elv_may_queue(q, op);</div><div class='ctx'> 	if (may_queue == ELV_MQUEUE_NO)</div><div class='ctx'> 		goto rq_starved;</div><div class='ctx'> </div><div class='hunk'>@@ -1127,23 +1101,26 @@ static struct request *__get_request(struct request_list *rl, int op,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Decide whether the new request will be managed by elevator.  If</div><div class='del'>-	 * so, mark @op_flags and increment elvpriv.  Non-zero elvpriv will</div><div class='add'>+	 * so, mark @rq_flags and increment elvpriv.  Non-zero elvpriv will</div><div class='ctx'> 	 * prevent the current elevator from being destroyed until the new</div><div class='ctx'> 	 * request is freed.  This guarantees icq's won't be destroyed and</div><div class='ctx'> 	 * makes creating new ones safe.</div><div class='ctx'> 	 *</div><div class='add'>+	 * Flush requests do not use the elevator so skip initialization.</div><div class='add'>+	 * This allows a request to share the flush and elevator data.</div><div class='add'>+	 *</div><div class='ctx'> 	 * Also, lookup icq while holding queue_lock.  If it doesn't exist,</div><div class='ctx'> 	 * it will be created after releasing queue_lock.</div><div class='ctx'> 	 */</div><div class='del'>-	if (blk_rq_should_init_elevator(bio) &amp;&amp; !blk_queue_bypass(q)) {</div><div class='del'>-		op_flags |= REQ_ELVPRIV;</div><div class='add'>+	if (!op_is_flush(op) &amp;&amp; !blk_queue_bypass(q)) {</div><div class='add'>+		rq_flags |= RQF_ELVPRIV;</div><div class='ctx'> 		q-&gt;nr_rqs_elvpriv++;</div><div class='ctx'> 		if (et-&gt;icq_cache &amp;&amp; ioc)</div><div class='ctx'> 			icq = ioc_lookup_icq(ioc, q);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (blk_queue_io_stat(q))</div><div class='del'>-		op_flags |= REQ_IO_STAT;</div><div class='add'>+		rq_flags |= RQF_IO_STAT;</div><div class='ctx'> 	spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate and init request */</div><div class='hunk'>@@ -1153,10 +1130,12 @@ static struct request *__get_request(struct request_list *rl, int op,</div><div class='ctx'> </div><div class='ctx'> 	blk_rq_init(q, rq);</div><div class='ctx'> 	blk_rq_set_rl(rq, rl);</div><div class='del'>-	req_set_op_attrs(rq, op, op_flags | REQ_ALLOCED);</div><div class='add'>+	blk_rq_set_prio(rq, ioc);</div><div class='add'>+	rq-&gt;cmd_flags = op;</div><div class='add'>+	rq-&gt;rq_flags = rq_flags;</div><div class='ctx'> </div><div class='ctx'> 	/* init elvpriv */</div><div class='del'>-	if (op_flags &amp; REQ_ELVPRIV) {</div><div class='add'>+	if (rq_flags &amp; RQF_ELVPRIV) {</div><div class='ctx'> 		if (unlikely(et-&gt;icq_cache &amp;&amp; !icq)) {</div><div class='ctx'> 			if (ioc)</div><div class='ctx'> 				icq = ioc_create_icq(ioc, q, gfp_mask);</div><div class='hunk'>@@ -1193,9 +1172,9 @@ fail_elvpriv:</div><div class='ctx'> 	 * disturb iosched and blkcg but weird is bettern than dead.</div><div class='ctx'> 	 */</div><div class='ctx'> 	printk_ratelimited(KERN_WARNING "%s: dev %s: request aux data allocation failed, iosched may be disturbed\n",</div><div class='del'>-			   __func__, dev_name(q-&gt;backing_dev_info.dev));</div><div class='add'>+			   __func__, dev_name(q-&gt;backing_dev_info-&gt;dev));</div><div class='ctx'> </div><div class='del'>-	rq-&gt;cmd_flags &amp;= ~REQ_ELVPRIV;</div><div class='add'>+	rq-&gt;rq_flags &amp;= ~RQF_ELVPRIV;</div><div class='ctx'> 	rq-&gt;elv.icq = NULL;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='hunk'>@@ -1212,7 +1191,7 @@ fail_alloc:</div><div class='ctx'> 	 * queue, but this is pretty rare.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='del'>-	freed_request(rl, op, op_flags);</div><div class='add'>+	freed_request(rl, is_sync, rq_flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * in the very unlikely event that allocation failed and no</div><div class='hunk'>@@ -1230,8 +1209,7 @@ rq_starved:</div><div class='ctx'> /**</div><div class='ctx'>  * get_request - get a free request</div><div class='ctx'>  * @q: request_queue to allocate request from</div><div class='del'>- * @op: REQ_OP_READ/REQ_OP_WRITE</div><div class='del'>- * @op_flags: rq_flag_bits</div><div class='add'>+ * @op: operation and flags</div><div class='ctx'>  * @bio: bio to allocate request for (can be %NULL)</div><div class='ctx'>  * @gfp_mask: allocation mask</div><div class='ctx'>  *</div><div class='hunk'>@@ -1242,18 +1220,17 @@ rq_starved:</div><div class='ctx'>  * Returns ERR_PTR on failure, with @q-&gt;queue_lock held.</div><div class='ctx'>  * Returns request pointer on success, with @q-&gt;queue_lock *not held*.</div><div class='ctx'>  */</div><div class='del'>-static struct request *get_request(struct request_queue *q, int op,</div><div class='del'>-				   int op_flags, struct bio *bio,</div><div class='del'>-				   gfp_t gfp_mask)</div><div class='add'>+static struct request *get_request(struct request_queue *q, unsigned int op,</div><div class='add'>+		struct bio *bio, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='del'>-	const bool is_sync = rw_is_sync(op, op_flags) != 0;</div><div class='add'>+	const bool is_sync = op_is_sync(op);</div><div class='ctx'> 	DEFINE_WAIT(wait);</div><div class='ctx'> 	struct request_list *rl;</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> </div><div class='ctx'> 	rl = blk_get_rl(q, bio);	/* transferred to @rq on success */</div><div class='ctx'> retry:</div><div class='del'>-	rq = __get_request(rl, op, op_flags, bio, gfp_mask);</div><div class='add'>+	rq = __get_request(rl, op, bio, gfp_mask);</div><div class='ctx'> 	if (!IS_ERR(rq))</div><div class='ctx'> 		return rq;</div><div class='ctx'> </div><div class='hunk'>@@ -1289,13 +1266,11 @@ static struct request *blk_old_get_request(struct request_queue *q, int rw,</div><div class='ctx'> {</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(rw != READ &amp;&amp; rw != WRITE);</div><div class='del'>-</div><div class='ctx'> 	/* create ioc upfront */</div><div class='ctx'> 	create_io_context(gfp_mask, q-&gt;node);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='del'>-	rq = get_request(q, rw, 0, NULL, gfp_mask);</div><div class='add'>+	rq = get_request(q, rw, NULL, gfp_mask);</div><div class='ctx'> 	if (IS_ERR(rq)) {</div><div class='ctx'> 		spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> 		return rq;</div><div class='hunk'>@@ -1320,18 +1295,6 @@ struct request *blk_get_request(struct request_queue *q, int rw, gfp_t gfp_mask)</div><div class='ctx'> EXPORT_SYMBOL(blk_get_request);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blk_rq_set_block_pc - initialize a request to type BLOCK_PC</div><div class='del'>- * @rq:		request to be initialized</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-void blk_rq_set_block_pc(struct request *rq)</div><div class='del'>-{</div><div class='del'>-	rq-&gt;cmd_type = REQ_TYPE_BLOCK_PC;</div><div class='del'>-	memset(rq-&gt;__cmd, 0, sizeof(rq-&gt;__cmd));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(blk_rq_set_block_pc);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * blk_requeue_request - put a request back on queue</div><div class='ctx'>  * @q:		request queue where request should be inserted</div><div class='ctx'>  * @rq:		request to be inserted</div><div class='hunk'>@@ -1346,8 +1309,9 @@ void blk_requeue_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	blk_delete_timer(rq);</div><div class='ctx'> 	blk_clear_rq_complete(rq);</div><div class='ctx'> 	trace_block_rq_requeue(q, rq);</div><div class='add'>+	wbt_requeue(q-&gt;rq_wb, &amp;rq-&gt;issue_stat);</div><div class='ctx'> </div><div class='del'>-	if (rq-&gt;cmd_flags &amp; REQ_QUEUED)</div><div class='add'>+	if (rq-&gt;rq_flags &amp; RQF_QUEUED)</div><div class='ctx'> 		blk_queue_end_tag(q, rq);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(blk_queued_rq(rq));</div><div class='hunk'>@@ -1409,7 +1373,7 @@ EXPORT_SYMBOL_GPL(part_round_stats);</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static void blk_pm_put_request(struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	if (rq-&gt;q-&gt;dev &amp;&amp; !(rq-&gt;cmd_flags &amp; REQ_PM) &amp;&amp; !--rq-&gt;q-&gt;nr_pending)</div><div class='add'>+	if (rq-&gt;q-&gt;dev &amp;&amp; !(rq-&gt;rq_flags &amp; RQF_PM) &amp;&amp; !--rq-&gt;q-&gt;nr_pending)</div><div class='ctx'> 		pm_runtime_mark_last_busy(rq-&gt;q-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -1421,6 +1385,8 @@ static inline void blk_pm_put_request(struct request *rq) {}</div><div class='ctx'>  */</div><div class='ctx'> void __blk_put_request(struct request_queue *q, struct request *req)</div><div class='ctx'> {</div><div class='add'>+	req_flags_t rq_flags = req-&gt;rq_flags;</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(!q))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -1436,20 +1402,21 @@ void __blk_put_request(struct request_queue *q, struct request *req)</div><div class='ctx'> 	/* this is a bio leak */</div><div class='ctx'> 	WARN_ON(req-&gt;bio != NULL);</div><div class='ctx'> </div><div class='add'>+	wbt_done(q-&gt;rq_wb, &amp;req-&gt;issue_stat);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Request may not have originated from ll_rw_blk. if not,</div><div class='ctx'> 	 * it didn't come out of our reserved rq pools</div><div class='ctx'> 	 */</div><div class='del'>-	if (req-&gt;cmd_flags &amp; REQ_ALLOCED) {</div><div class='del'>-		unsigned int flags = req-&gt;cmd_flags;</div><div class='del'>-		int op = req_op(req);</div><div class='add'>+	if (rq_flags &amp; RQF_ALLOCED) {</div><div class='ctx'> 		struct request_list *rl = blk_rq_rl(req);</div><div class='add'>+		bool sync = op_is_sync(req-&gt;cmd_flags);</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(!list_empty(&amp;req-&gt;queuelist));</div><div class='ctx'> 		BUG_ON(ELV_ON_HASH(req));</div><div class='ctx'> </div><div class='ctx'> 		blk_free_request(rl, req);</div><div class='del'>-		freed_request(rl, op, flags);</div><div class='add'>+		freed_request(rl, sync, rq_flags);</div><div class='ctx'> 		blk_put_rl(rl);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1471,38 +1438,6 @@ void blk_put_request(struct request *req)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_put_request);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * blk_add_request_payload - add a payload to a request</div><div class='del'>- * @rq: request to update</div><div class='del'>- * @page: page backing the payload</div><div class='del'>- * @offset: offset in page</div><div class='del'>- * @len: length of the payload.</div><div class='del'>- *</div><div class='del'>- * This allows to later add a payload to an already submitted request by</div><div class='del'>- * a block driver.  The driver needs to take care of freeing the payload</div><div class='del'>- * itself.</div><div class='del'>- *</div><div class='del'>- * Note that this is a quite horrible hack and nothing but handling of</div><div class='del'>- * discard requests should ever use it.</div><div class='del'>- */</div><div class='del'>-void blk_add_request_payload(struct request *rq, struct page *page,</div><div class='del'>-		int offset, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct bio *bio = rq-&gt;bio;</div><div class='del'>-</div><div class='del'>-	bio-&gt;bi_io_vec-&gt;bv_page = page;</div><div class='del'>-	bio-&gt;bi_io_vec-&gt;bv_offset = offset;</div><div class='del'>-	bio-&gt;bi_io_vec-&gt;bv_len = len;</div><div class='del'>-</div><div class='del'>-	bio-&gt;bi_iter.bi_size = len;</div><div class='del'>-	bio-&gt;bi_vcnt = 1;</div><div class='del'>-	bio-&gt;bi_phys_segments = 1;</div><div class='del'>-</div><div class='del'>-	rq-&gt;__data_len = rq-&gt;resid_len = len;</div><div class='del'>-	rq-&gt;nr_phys_segments = 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(blk_add_request_payload);</div><div class='del'>-</div><div class='ctx'> bool bio_attempt_back_merge(struct request_queue *q, struct request *req,</div><div class='ctx'> 			    struct bio *bio)</div><div class='ctx'> {</div><div class='hunk'>@@ -1549,6 +1484,30 @@ bool bio_attempt_front_merge(struct request_queue *q, struct request *req,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool bio_attempt_discard_merge(struct request_queue *q, struct request *req,</div><div class='add'>+		struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	unsigned short segments = blk_rq_nr_discard_segments(req);</div><div class='add'>+</div><div class='add'>+	if (segments &gt;= queue_max_discard_segments(q))</div><div class='add'>+		goto no_merge;</div><div class='add'>+	if (blk_rq_sectors(req) + bio_sectors(bio) &gt;</div><div class='add'>+	    blk_rq_get_max_sectors(req, blk_rq_pos(req)))</div><div class='add'>+		goto no_merge;</div><div class='add'>+</div><div class='add'>+	req-&gt;biotail-&gt;bi_next = bio;</div><div class='add'>+	req-&gt;biotail = bio;</div><div class='add'>+	req-&gt;__data_len += bio-&gt;bi_iter.bi_size;</div><div class='add'>+	req-&gt;ioprio = ioprio_best(req-&gt;ioprio, bio_prio(bio));</div><div class='add'>+	req-&gt;nr_phys_segments = segments + 1;</div><div class='add'>+</div><div class='add'>+	blk_account_io_start(req, false);</div><div class='add'>+	return true;</div><div class='add'>+no_merge:</div><div class='add'>+	req_set_nomerge(q, req);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * blk_attempt_plug_merge - try to merge with %current's plugged list</div><div class='ctx'>  * @q: request_queue new bio is being queued at</div><div class='hunk'>@@ -1577,12 +1536,11 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio,</div><div class='ctx'> {</div><div class='ctx'> 	struct blk_plug *plug;</div><div class='ctx'> 	struct request *rq;</div><div class='del'>-	bool ret = false;</div><div class='ctx'> 	struct list_head *plug_list;</div><div class='ctx'> </div><div class='ctx'> 	plug = current-&gt;plug;</div><div class='ctx'> 	if (!plug)</div><div class='del'>-		goto out;</div><div class='add'>+		return false;</div><div class='ctx'> 	*request_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (q-&gt;mq_ops)</div><div class='hunk'>@@ -1591,7 +1549,7 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio,</div><div class='ctx'> 		plug_list = &amp;plug-&gt;list;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_reverse(rq, plug_list, queuelist) {</div><div class='del'>-		int el_ret;</div><div class='add'>+		bool merged = false;</div><div class='ctx'> </div><div class='ctx'> 		if (rq-&gt;q == q) {</div><div class='ctx'> 			(*request_count)++;</div><div class='hunk'>@@ -1607,19 +1565,25 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio,</div><div class='ctx'> 		if (rq-&gt;q != q || !blk_rq_merge_ok(rq, bio))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		el_ret = blk_try_merge(rq, bio);</div><div class='del'>-		if (el_ret == ELEVATOR_BACK_MERGE) {</div><div class='del'>-			ret = bio_attempt_back_merge(q, rq, bio);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		} else if (el_ret == ELEVATOR_FRONT_MERGE) {</div><div class='del'>-			ret = bio_attempt_front_merge(q, rq, bio);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='add'>+		switch (blk_try_merge(rq, bio)) {</div><div class='add'>+		case ELEVATOR_BACK_MERGE:</div><div class='add'>+			merged = bio_attempt_back_merge(q, rq, bio);</div><div class='add'>+			break;</div><div class='add'>+		case ELEVATOR_FRONT_MERGE:</div><div class='add'>+			merged = bio_attempt_front_merge(q, rq, bio);</div><div class='add'>+			break;</div><div class='add'>+		case ELEVATOR_DISCARD_MERGE:</div><div class='add'>+			merged = bio_attempt_discard_merge(q, rq, bio);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (merged)</div><div class='add'>+			return true;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned int blk_plug_queued_count(struct request_queue *q)</div><div class='hunk'>@@ -1648,25 +1612,23 @@ out:</div><div class='ctx'> </div><div class='ctx'> void init_request_from_bio(struct request *req, struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	req-&gt;cmd_type = REQ_TYPE_FS;</div><div class='del'>-</div><div class='del'>-	req-&gt;cmd_flags |= bio-&gt;bi_opf &amp; REQ_COMMON_MASK;</div><div class='ctx'> 	if (bio-&gt;bi_opf &amp; REQ_RAHEAD)</div><div class='ctx'> 		req-&gt;cmd_flags |= REQ_FAILFAST_MASK;</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;errors = 0;</div><div class='ctx'> 	req-&gt;__sector = bio-&gt;bi_iter.bi_sector;</div><div class='del'>-	req-&gt;ioprio = bio_prio(bio);</div><div class='add'>+	if (ioprio_valid(bio_prio(bio)))</div><div class='add'>+		req-&gt;ioprio = bio_prio(bio);</div><div class='ctx'> 	blk_rq_bio_prep(req-&gt;q, req, bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	const bool sync = !!(bio-&gt;bi_opf &amp; REQ_SYNC);</div><div class='ctx'> 	struct blk_plug *plug;</div><div class='del'>-	int el_ret, rw_flags = 0, where = ELEVATOR_INSERT_SORT;</div><div class='del'>-	struct request *req;</div><div class='add'>+	int where = ELEVATOR_INSERT_SORT;</div><div class='add'>+	struct request *req, *free;</div><div class='ctx'> 	unsigned int request_count = 0;</div><div class='add'>+	unsigned int wb_acct;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * low level driver can indicate that it wants pages above a</div><div class='hunk'>@@ -1683,7 +1645,7 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 		return BLK_QC_T_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bio-&gt;bi_opf &amp; (REQ_PREFLUSH | REQ_FUA)) {</div><div class='add'>+	if (op_is_flush(bio-&gt;bi_opf)) {</div><div class='ctx'> 		spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> 		where = ELEVATOR_INSERT_FLUSH;</div><div class='ctx'> 		goto get_rq;</div><div class='hunk'>@@ -1701,48 +1663,48 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='del'>-	el_ret = elv_merge(q, &amp;req, bio);</div><div class='del'>-	if (el_ret == ELEVATOR_BACK_MERGE) {</div><div class='del'>-		if (bio_attempt_back_merge(q, req, bio)) {</div><div class='del'>-			elv_bio_merged(q, req, bio);</div><div class='del'>-			if (!attempt_back_merge(q, req))</div><div class='del'>-				elv_merged_request(q, req, el_ret);</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='del'>-	} else if (el_ret == ELEVATOR_FRONT_MERGE) {</div><div class='del'>-		if (bio_attempt_front_merge(q, req, bio)) {</div><div class='del'>-			elv_bio_merged(q, req, bio);</div><div class='del'>-			if (!attempt_front_merge(q, req))</div><div class='del'>-				elv_merged_request(q, req, el_ret);</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+	switch (elv_merge(q, &amp;req, bio)) {</div><div class='add'>+	case ELEVATOR_BACK_MERGE:</div><div class='add'>+		if (!bio_attempt_back_merge(q, req, bio))</div><div class='add'>+			break;</div><div class='add'>+		elv_bio_merged(q, req, bio);</div><div class='add'>+		free = attempt_back_merge(q, req);</div><div class='add'>+		if (free)</div><div class='add'>+			__blk_put_request(q, free);</div><div class='add'>+		else</div><div class='add'>+			elv_merged_request(q, req, ELEVATOR_BACK_MERGE);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	case ELEVATOR_FRONT_MERGE:</div><div class='add'>+		if (!bio_attempt_front_merge(q, req, bio))</div><div class='add'>+			break;</div><div class='add'>+		elv_bio_merged(q, req, bio);</div><div class='add'>+		free = attempt_front_merge(q, req);</div><div class='add'>+		if (free)</div><div class='add'>+			__blk_put_request(q, free);</div><div class='add'>+		else</div><div class='add'>+			elv_merged_request(q, req, ELEVATOR_FRONT_MERGE);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> get_rq:</div><div class='del'>-	/*</div><div class='del'>-	 * This sync check and mask will be re-done in init_request_from_bio(),</div><div class='del'>-	 * but we need to set it earlier to expose the sync flag to the</div><div class='del'>-	 * rq allocator and io schedulers.</div><div class='del'>-	 */</div><div class='del'>-	if (sync)</div><div class='del'>-		rw_flags |= REQ_SYNC;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Add in META/PRIO flags, if set, before we get to the IO scheduler</div><div class='del'>-	 */</div><div class='del'>-	rw_flags |= (bio-&gt;bi_opf &amp; (REQ_META | REQ_PRIO));</div><div class='add'>+	wb_acct = wbt_wait(q-&gt;rq_wb, bio, q-&gt;queue_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Grab a free request. This is might sleep but can not fail.</div><div class='ctx'> 	 * Returns with the queue unlocked.</div><div class='ctx'> 	 */</div><div class='del'>-	req = get_request(q, bio_data_dir(bio), rw_flags, bio, GFP_NOIO);</div><div class='add'>+	req = get_request(q, bio-&gt;bi_opf, bio, GFP_NOIO);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='add'>+		__wbt_done(q-&gt;rq_wb, wb_acct);</div><div class='ctx'> 		bio-&gt;bi_error = PTR_ERR(req);</div><div class='ctx'> 		bio_endio(bio);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	wbt_track(&amp;req-&gt;issue_stat, wb_acct);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * After dropping the lock and possibly sleeping here, our request</div><div class='ctx'> 	 * may now be mergeable after it had proven unmergeable (above).</div><div class='hunk'>@@ -1759,11 +1721,16 @@ get_rq:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If this is the first request added after a plug, fire</div><div class='ctx'> 		 * of a plug trace.</div><div class='add'>+		 *</div><div class='add'>+		 * @request_count may become stale because of schedule</div><div class='add'>+		 * out, so check plug list again.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!request_count)</div><div class='add'>+		if (!request_count || list_empty(&amp;plug-&gt;list))</div><div class='ctx'> 			trace_block_plug(q);</div><div class='ctx'> 		else {</div><div class='del'>-			if (request_count &gt;= BLK_MAX_REQUEST_COUNT) {</div><div class='add'>+			struct request *last = list_entry_rq(plug-&gt;list.prev);</div><div class='add'>+			if (request_count &gt;= BLK_MAX_REQUEST_COUNT ||</div><div class='add'>+			    blk_rq_bytes(last) &gt;= BLK_PLUG_FLUSH_SIZE) {</div><div class='ctx'> 				blk_flush_plug_list(plug, false);</div><div class='ctx'> 				trace_block_plug(q);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1788,7 +1755,12 @@ static inline void blk_partition_remap(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct block_device *bdev = bio-&gt;bi_bdev;</div><div class='ctx'> </div><div class='del'>-	if (bio_sectors(bio) &amp;&amp; bdev != bdev-&gt;bd_contains) {</div><div class='add'>+	/*</div><div class='add'>+	 * Zone reset does not include bi_size so bio_sectors() is always 0.</div><div class='add'>+	 * Include a test for the reset op code and perform the remap if needed.</div><div class='add'>+	 */</div><div class='add'>+	if (bdev != bdev-&gt;bd_contains &amp;&amp;</div><div class='add'>+	    (bio_sectors(bio) || bio_op(bio) == REQ_OP_ZONE_RESET)) {</div><div class='ctx'> 		struct hd_struct *p = bdev-&gt;bd_part;</div><div class='ctx'> </div><div class='ctx'> 		bio-&gt;bi_iter.bi_sector += p-&gt;start_sect;</div><div class='hunk'>@@ -1920,7 +1892,7 @@ generic_make_request_checks(struct bio *bio)</div><div class='ctx'> 	 * drivers without flush support don't have to worry</div><div class='ctx'> 	 * about them.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((bio-&gt;bi_opf &amp; (REQ_PREFLUSH | REQ_FUA)) &amp;&amp;</div><div class='add'>+	if (op_is_flush(bio-&gt;bi_opf) &amp;&amp;</div><div class='ctx'> 	    !test_bit(QUEUE_FLAG_WC, &amp;q-&gt;queue_flags)) {</div><div class='ctx'> 		bio-&gt;bi_opf &amp;= ~(REQ_PREFLUSH | REQ_FUA);</div><div class='ctx'> 		if (!nr_sectors) {</div><div class='hunk'>@@ -1942,6 +1914,15 @@ generic_make_request_checks(struct bio *bio)</div><div class='ctx'> 		if (!bdev_write_same(bio-&gt;bi_bdev))</div><div class='ctx'> 			goto not_supported;</div><div class='ctx'> 		break;</div><div class='add'>+	case REQ_OP_ZONE_REPORT:</div><div class='add'>+	case REQ_OP_ZONE_RESET:</div><div class='add'>+		if (!bdev_is_zoned(bio-&gt;bi_bdev))</div><div class='add'>+			goto not_supported;</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_WRITE_ZEROES:</div><div class='add'>+		if (!bdev_write_zeroes_sectors(bio-&gt;bi_bdev))</div><div class='add'>+			goto not_supported;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2160,7 +2141,7 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	if (q-&gt;mq_ops) {</div><div class='ctx'> 		if (blk_queue_io_stat(q))</div><div class='ctx'> 			blk_account_io_start(rq, true);</div><div class='del'>-		blk_mq_insert_request(rq, false, true, false);</div><div class='add'>+		blk_mq_sched_insert_request(rq, false, true, false, false);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2176,7 +2157,7 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	 */</div><div class='ctx'> 	BUG_ON(blk_queued_rq(rq));</div><div class='ctx'> </div><div class='del'>-	if (rq-&gt;cmd_flags &amp; (REQ_PREFLUSH | REQ_FUA))</div><div class='add'>+	if (op_is_flush(rq-&gt;cmd_flags))</div><div class='ctx'> 		where = ELEVATOR_INSERT_FLUSH;</div><div class='ctx'> </div><div class='ctx'> 	add_acct_request(q, rq, where);</div><div class='hunk'>@@ -2210,7 +2191,7 @@ unsigned int blk_rq_err_bytes(const struct request *rq)</div><div class='ctx'> 	unsigned int bytes = 0;</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> </div><div class='del'>-	if (!(rq-&gt;cmd_flags &amp; REQ_MIXED_MERGE))</div><div class='add'>+	if (!(rq-&gt;rq_flags &amp; RQF_MIXED_MERGE))</div><div class='ctx'> 		return blk_rq_bytes(rq);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2253,7 +2234,7 @@ void blk_account_io_done(struct request *req)</div><div class='ctx'> 	 * normal IO on queueing nor completion.  Accounting the</div><div class='ctx'> 	 * containing request is enough.</div><div class='ctx'> 	 */</div><div class='del'>-	if (blk_do_io_stat(req) &amp;&amp; !(req-&gt;cmd_flags &amp; REQ_FLUSH_SEQ)) {</div><div class='add'>+	if (blk_do_io_stat(req) &amp;&amp; !(req-&gt;rq_flags &amp; RQF_FLUSH_SEQ)) {</div><div class='ctx'> 		unsigned long duration = jiffies - req-&gt;start_time;</div><div class='ctx'> 		const int rw = rq_data_dir(req);</div><div class='ctx'> 		struct hd_struct *part;</div><div class='hunk'>@@ -2281,7 +2262,7 @@ static struct request *blk_pm_peek_request(struct request_queue *q,</div><div class='ctx'> 					   struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	if (q-&gt;dev &amp;&amp; (q-&gt;rpm_status == RPM_SUSPENDED ||</div><div class='del'>-	    (q-&gt;rpm_status != RPM_ACTIVE &amp;&amp; !(rq-&gt;cmd_flags &amp; REQ_PM))))</div><div class='add'>+	    (q-&gt;rpm_status != RPM_ACTIVE &amp;&amp; !(rq-&gt;rq_flags &amp; RQF_PM))))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	else</div><div class='ctx'> 		return rq;</div><div class='hunk'>@@ -2357,13 +2338,13 @@ struct request *blk_peek_request(struct request_queue *q)</div><div class='ctx'> 		if (!rq)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (!(rq-&gt;cmd_flags &amp; REQ_STARTED)) {</div><div class='add'>+		if (!(rq-&gt;rq_flags &amp; RQF_STARTED)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * This is the first time the device driver</div><div class='ctx'> 			 * sees this request (possibly after</div><div class='ctx'> 			 * requeueing).  Notify IO scheduler.</div><div class='ctx'> 			 */</div><div class='del'>-			if (rq-&gt;cmd_flags &amp; REQ_SORTED)</div><div class='add'>+			if (rq-&gt;rq_flags &amp; RQF_SORTED)</div><div class='ctx'> 				elv_activate_rq(q, rq);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2371,7 +2352,7 @@ struct request *blk_peek_request(struct request_queue *q)</div><div class='ctx'> 			 * it, a request that has been delayed should</div><div class='ctx'> 			 * not be passed by new incoming requests</div><div class='ctx'> 			 */</div><div class='del'>-			rq-&gt;cmd_flags |= REQ_STARTED;</div><div class='add'>+			rq-&gt;rq_flags |= RQF_STARTED;</div><div class='ctx'> 			trace_block_rq_issue(q, rq);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2380,7 +2361,7 @@ struct request *blk_peek_request(struct request_queue *q)</div><div class='ctx'> 			q-&gt;boundary_rq = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (rq-&gt;cmd_flags &amp; REQ_DONTPREP)</div><div class='add'>+		if (rq-&gt;rq_flags &amp; RQF_DONTPREP)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (q-&gt;dma_drain_size &amp;&amp; blk_rq_bytes(rq)) {</div><div class='hunk'>@@ -2403,11 +2384,11 @@ struct request *blk_peek_request(struct request_queue *q)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * the request may have been (partially) prepped.</div><div class='ctx'> 			 * we need to keep this request in the front to</div><div class='del'>-			 * avoid resource deadlock.  REQ_STARTED will</div><div class='add'>+			 * avoid resource deadlock.  RQF_STARTED will</div><div class='ctx'> 			 * prevent other fs requests from passing this one.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (q-&gt;dma_drain_size &amp;&amp; blk_rq_bytes(rq) &amp;&amp;</div><div class='del'>-			    !(rq-&gt;cmd_flags &amp; REQ_DONTPREP)) {</div><div class='add'>+			    !(rq-&gt;rq_flags &amp; RQF_DONTPREP)) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * remove the space for the drain we added</div><div class='ctx'> 				 * so that we don't add it again</div><div class='hunk'>@@ -2420,7 +2401,7 @@ struct request *blk_peek_request(struct request_queue *q)</div><div class='ctx'> 		} else if (ret == BLKPREP_KILL || ret == BLKPREP_INVALID) {</div><div class='ctx'> 			int err = (ret == BLKPREP_INVALID) ? -EREMOTEIO : -EIO;</div><div class='ctx'> </div><div class='del'>-			rq-&gt;cmd_flags |= REQ_QUIET;</div><div class='add'>+			rq-&gt;rq_flags |= RQF_QUIET;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Mark this request as started so we don't trigger</div><div class='ctx'> 			 * any debug logic in the end I/O path.</div><div class='hunk'>@@ -2475,13 +2456,11 @@ void blk_start_request(struct request *req)</div><div class='ctx'> {</div><div class='ctx'> 	blk_dequeue_request(req);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We are now handing the request to the hardware, initialize</div><div class='del'>-	 * resid_len to full count and add the timeout handler.</div><div class='del'>-	 */</div><div class='del'>-	req-&gt;resid_len = blk_rq_bytes(req);</div><div class='del'>-	if (unlikely(blk_bidi_rq(req)))</div><div class='del'>-		req-&gt;next_rq-&gt;resid_len = blk_rq_bytes(req-&gt;next_rq);</div><div class='add'>+	if (test_bit(QUEUE_FLAG_STATS, &amp;req-&gt;q-&gt;queue_flags)) {</div><div class='add'>+		blk_stat_set_issue_time(&amp;req-&gt;issue_stat);</div><div class='add'>+		req-&gt;rq_flags |= RQF_STATS;</div><div class='add'>+		wbt_issue(req-&gt;q-&gt;rq_wb, &amp;req-&gt;issue_stat);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(test_bit(REQ_ATOM_COMPLETE, &amp;req-&gt;atomic_flags));</div><div class='ctx'> 	blk_add_timer(req);</div><div class='hunk'>@@ -2553,11 +2532,11 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)</div><div class='ctx'> 	 * TODO: tj: This is too subtle.  It would be better to let</div><div class='ctx'> 	 * low level drivers do what they see fit.</div><div class='ctx'> 	 */</div><div class='del'>-	if (req-&gt;cmd_type == REQ_TYPE_FS)</div><div class='add'>+	if (!blk_rq_is_passthrough(req))</div><div class='ctx'> 		req-&gt;errors = 0;</div><div class='ctx'> </div><div class='del'>-	if (error &amp;&amp; req-&gt;cmd_type == REQ_TYPE_FS &amp;&amp;</div><div class='del'>-	    !(req-&gt;cmd_flags &amp; REQ_QUIET)) {</div><div class='add'>+	if (error &amp;&amp; !blk_rq_is_passthrough(req) &amp;&amp;</div><div class='add'>+	    !(req-&gt;rq_flags &amp; RQF_QUIET)) {</div><div class='ctx'> 		char *error_type;</div><div class='ctx'> </div><div class='ctx'> 		switch (error) {</div><div class='hunk'>@@ -2623,14 +2602,16 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	WARN_ON_ONCE(req-&gt;rq_flags &amp; RQF_SPECIAL_PAYLOAD);</div><div class='add'>+</div><div class='ctx'> 	req-&gt;__data_len -= total_bytes;</div><div class='ctx'> </div><div class='ctx'> 	/* update sector only for requests with clear definition of sector */</div><div class='del'>-	if (req-&gt;cmd_type == REQ_TYPE_FS)</div><div class='add'>+	if (!blk_rq_is_passthrough(req))</div><div class='ctx'> 		req-&gt;__sector += total_bytes &gt;&gt; 9;</div><div class='ctx'> </div><div class='ctx'> 	/* mixed attributes always follow the first bio */</div><div class='del'>-	if (req-&gt;cmd_flags &amp; REQ_MIXED_MERGE) {</div><div class='add'>+	if (req-&gt;rq_flags &amp; RQF_MIXED_MERGE) {</div><div class='ctx'> 		req-&gt;cmd_flags &amp;= ~REQ_FAILFAST_MASK;</div><div class='ctx'> 		req-&gt;cmd_flags |= req-&gt;bio-&gt;bi_opf &amp; REQ_FAILFAST_MASK;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2683,7 +2664,7 @@ void blk_unprep_request(struct request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = req-&gt;q;</div><div class='ctx'> </div><div class='del'>-	req-&gt;cmd_flags &amp;= ~REQ_DONTPREP;</div><div class='add'>+	req-&gt;rq_flags &amp;= ~RQF_DONTPREP;</div><div class='ctx'> 	if (q-&gt;unprep_rq_fn)</div><div class='ctx'> 		q-&gt;unprep_rq_fn(q, req);</div><div class='ctx'> }</div><div class='hunk'>@@ -2694,28 +2675,34 @@ EXPORT_SYMBOL_GPL(blk_unprep_request);</div><div class='ctx'>  */</div><div class='ctx'> void blk_finish_request(struct request *req, int error)</div><div class='ctx'> {</div><div class='del'>-	if (req-&gt;cmd_flags &amp; REQ_QUEUED)</div><div class='del'>-		blk_queue_end_tag(req-&gt;q, req);</div><div class='add'>+	struct request_queue *q = req-&gt;q;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;rq_flags &amp; RQF_STATS)</div><div class='add'>+		blk_stat_add(&amp;q-&gt;rq_stats[rq_data_dir(req)], req);</div><div class='add'>+</div><div class='add'>+	if (req-&gt;rq_flags &amp; RQF_QUEUED)</div><div class='add'>+		blk_queue_end_tag(q, req);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(blk_queued_rq(req));</div><div class='ctx'> </div><div class='del'>-	if (unlikely(laptop_mode) &amp;&amp; req-&gt;cmd_type == REQ_TYPE_FS)</div><div class='del'>-		laptop_io_completion(&amp;req-&gt;q-&gt;backing_dev_info);</div><div class='add'>+	if (unlikely(laptop_mode) &amp;&amp; !blk_rq_is_passthrough(req))</div><div class='add'>+		laptop_io_completion(req-&gt;q-&gt;backing_dev_info);</div><div class='ctx'> </div><div class='ctx'> 	blk_delete_timer(req);</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;cmd_flags &amp; REQ_DONTPREP)</div><div class='add'>+	if (req-&gt;rq_flags &amp; RQF_DONTPREP)</div><div class='ctx'> 		blk_unprep_request(req);</div><div class='ctx'> </div><div class='ctx'> 	blk_account_io_done(req);</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;end_io)</div><div class='add'>+	if (req-&gt;end_io) {</div><div class='add'>+		wbt_done(req-&gt;q-&gt;rq_wb, &amp;req-&gt;issue_stat);</div><div class='ctx'> 		req-&gt;end_io(req, error);</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='ctx'> 		if (blk_bidi_rq(req))</div><div class='ctx'> 			__blk_put_request(req-&gt;next_rq-&gt;q, req-&gt;next_rq);</div><div class='ctx'> </div><div class='del'>-		__blk_put_request(req-&gt;q, req);</div><div class='add'>+		__blk_put_request(q, req);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_finish_request);</div><div class='hunk'>@@ -2939,8 +2926,6 @@ EXPORT_SYMBOL_GPL(__blk_end_request_err);</div><div class='ctx'> void blk_rq_bio_prep(struct request_queue *q, struct request *rq,</div><div class='ctx'> 		     struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	req_set_op(rq, bio_op(bio));</div><div class='del'>-</div><div class='ctx'> 	if (bio_has_data(bio))</div><div class='ctx'> 		rq-&gt;nr_phys_segments = bio_phys_segments(q, bio);</div><div class='ctx'> </div><div class='hunk'>@@ -3024,9 +3009,6 @@ EXPORT_SYMBOL_GPL(blk_rq_unprep_clone);</div><div class='ctx'> static void __blk_rq_prep_clone(struct request *dst, struct request *src)</div><div class='ctx'> {</div><div class='ctx'> 	dst-&gt;cpu = src-&gt;cpu;</div><div class='del'>-	req_set_op_attrs(dst, req_op(src),</div><div class='del'>-			 (src-&gt;cmd_flags &amp; REQ_CLONE_MASK) | REQ_NOMERGE);</div><div class='del'>-	dst-&gt;cmd_type = src-&gt;cmd_type;</div><div class='ctx'> 	dst-&gt;__sector = blk_rq_pos(src);</div><div class='ctx'> 	dst-&gt;__data_len = blk_rq_bytes(src);</div><div class='ctx'> 	dst-&gt;nr_phys_segments = src-&gt;nr_phys_segments;</div><div class='hunk'>@@ -3276,7 +3258,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * rq is already accounted, so use raw insert</div><div class='ctx'> 		 */</div><div class='del'>-		if (rq-&gt;cmd_flags &amp; (REQ_PREFLUSH | REQ_FUA))</div><div class='add'>+		if (op_is_flush(rq-&gt;cmd_flags))</div><div class='ctx'> 			__elv_add_request(q, rq, ELEVATOR_INSERT_FLUSH);</div><div class='ctx'> 		else</div><div class='ctx'> 			__elv_add_request(q, rq, ELEVATOR_INSERT_SORT_MERGE);</div><div class='hunk'>@@ -3303,52 +3285,6 @@ void blk_finish_plug(struct blk_plug *plug)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_finish_plug);</div><div class='ctx'> </div><div class='del'>-bool blk_poll(struct request_queue *q, blk_qc_t cookie)</div><div class='del'>-{</div><div class='del'>-	struct blk_plug *plug;</div><div class='del'>-	long state;</div><div class='del'>-	unsigned int queue_num;</div><div class='del'>-	struct blk_mq_hw_ctx *hctx;</div><div class='del'>-</div><div class='del'>-	if (!q-&gt;mq_ops || !q-&gt;mq_ops-&gt;poll || !blk_qc_t_valid(cookie) ||</div><div class='del'>-	    !test_bit(QUEUE_FLAG_POLL, &amp;q-&gt;queue_flags))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	queue_num = blk_qc_t_to_queue_num(cookie);</div><div class='del'>-	hctx = q-&gt;queue_hw_ctx[queue_num];</div><div class='del'>-	hctx-&gt;poll_considered++;</div><div class='del'>-</div><div class='del'>-	plug = current-&gt;plug;</div><div class='del'>-	if (plug)</div><div class='del'>-		blk_flush_plug_list(plug, false);</div><div class='del'>-</div><div class='del'>-	state = current-&gt;state;</div><div class='del'>-	while (!need_resched()) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		hctx-&gt;poll_invoked++;</div><div class='del'>-</div><div class='del'>-		ret = q-&gt;mq_ops-&gt;poll(hctx, blk_qc_t_to_tag(cookie));</div><div class='del'>-		if (ret &gt; 0) {</div><div class='del'>-			hctx-&gt;poll_success++;</div><div class='del'>-			set_current_state(TASK_RUNNING);</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (signal_pending_state(state, current))</div><div class='del'>-			set_current_state(TASK_RUNNING);</div><div class='del'>-</div><div class='del'>-		if (current-&gt;state == TASK_RUNNING)</div><div class='del'>-			return true;</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		cpu_relax();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(blk_poll);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> /**</div><div class='ctx'>  * blk_pm_runtime_init - Block layer runtime PM initialization routine</div><div class='hunk'>@@ -3530,8 +3466,11 @@ EXPORT_SYMBOL(blk_set_runtime_active);</div><div class='ctx'> </div><div class='ctx'> int __init blk_dev_init(void)</div><div class='ctx'> {</div><div class='del'>-	BUILD_BUG_ON(__REQ_NR_BITS &gt; 8 *</div><div class='add'>+	BUILD_BUG_ON(REQ_OP_LAST &gt;= (1 &lt;&lt; REQ_OP_BITS));</div><div class='add'>+	BUILD_BUG_ON(REQ_OP_BITS + REQ_FLAG_BITS &gt; 8 *</div><div class='ctx'> 			FIELD_SIZEOF(struct request, cmd_flags));</div><div class='add'>+	BUILD_BUG_ON(REQ_OP_BITS + REQ_FLAG_BITS &gt; 8 *</div><div class='add'>+			FIELD_SIZEOF(struct bio, bi_opf));</div><div class='ctx'> </div><div class='ctx'> 	/* used for unplugging and affects IO latency/throughput - HIGHPRI */</div><div class='ctx'> 	kblockd_workqueue = alloc_workqueue("kblockd",</div><div class='hunk'>@@ -3545,5 +3484,9 @@ int __init blk_dev_init(void)</div><div class='ctx'> 	blk_requestq_cachep = kmem_cache_create("request_queue",</div><div class='ctx'> 			sizeof(struct request_queue), 0, SLAB_PANIC, NULL);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+	blk_debugfs_root = debugfs_create_dir("block", NULL);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/block/blk-exec.c b/block/blk-exec.c<br/>index 7ea04325d02f..8cd0e9bc8dc8 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-exec.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-exec.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-exec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-exec.c</a></div><div class='hunk'>@@ -9,11 +9,7 @@</div><div class='ctx'> #include &lt;linux/sched/sysctl.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "blk.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * for max sense size</div><div class='del'>- */</div><div class='del'>-#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='add'>+#include "blk-mq-sched.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * blk_end_sync_rq - executes a completion event on a request</div><div class='hunk'>@@ -55,7 +51,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,</div><div class='ctx'> 	int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(irqs_disabled());</div><div class='del'>-	WARN_ON(rq-&gt;cmd_type == REQ_TYPE_FS);</div><div class='add'>+	WARN_ON(!blk_rq_is_passthrough(rq));</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;rq_disk = bd_disk;</div><div class='ctx'> 	rq-&gt;end_io = done;</div><div class='hunk'>@@ -65,14 +61,14 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,</div><div class='ctx'> 	 * be reused after dying flag is set</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (q-&gt;mq_ops) {</div><div class='del'>-		blk_mq_insert_request(rq, at_head, true, false);</div><div class='add'>+		blk_mq_sched_insert_request(rq, at_head, true, false, false);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(blk_queue_dying(q))) {</div><div class='del'>-		rq-&gt;cmd_flags |= REQ_QUIET; </div><div class='add'>+		rq-&gt;rq_flags |= RQF_QUIET;</div><div class='ctx'> 		rq-&gt;errors = -ENXIO;</div><div class='ctx'> 		__blk_end_request_all(rq, rq-&gt;errors);</div><div class='ctx'> 		spin_unlock_irq(q-&gt;queue_lock);</div><div class='hunk'>@@ -100,16 +96,9 @@ int blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk,</div><div class='ctx'> 		   struct request *rq, int at_head)</div><div class='ctx'> {</div><div class='ctx'> 	DECLARE_COMPLETION_ONSTACK(wait);</div><div class='del'>-	char sense[SCSI_SENSE_BUFFERSIZE];</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	unsigned long hang_check;</div><div class='ctx'> </div><div class='del'>-	if (!rq-&gt;sense) {</div><div class='del'>-		memset(sense, 0, sizeof(sense));</div><div class='del'>-		rq-&gt;sense = sense;</div><div class='del'>-		rq-&gt;sense_len = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	rq-&gt;end_io_data = &amp;wait;</div><div class='ctx'> 	blk_execute_rq_nowait(q, bd_disk, rq, at_head, blk_end_sync_rq);</div><div class='ctx'> </div><div class='hunk'>@@ -123,11 +112,6 @@ int blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk,</div><div class='ctx'> 	if (rq-&gt;errors)</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> </div><div class='del'>-	if (rq-&gt;sense == sense)	{</div><div class='del'>-		rq-&gt;sense = NULL;</div><div class='del'>-		rq-&gt;sense_len = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_execute_rq);</div><div class='head'>diff --git a/block/blk-flush.c b/block/blk-flush.c<br/>index 3c882cbc7541..0d5a9c1da1fc 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-flush.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-flush.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-flush.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-flush.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@</div><div class='ctx'>  * Once while executing DATA and again after the whole sequence is</div><div class='ctx'>  * complete.  The first completion updates the contained bio but doesn't</div><div class='ctx'>  * finish it so that the bio submitter is notified only after the whole</div><div class='del'>- * sequence is complete.  This is implemented by testing REQ_FLUSH_SEQ in</div><div class='add'>+ * sequence is complete.  This is implemented by testing RQF_FLUSH_SEQ in</div><div class='ctx'>  * req_bio_endio().</div><div class='ctx'>  *</div><div class='ctx'>  * The above peculiarity requires that each FLUSH/FUA request has only one</div><div class='hunk'>@@ -74,6 +74,7 @@</div><div class='ctx'> #include "blk.h"</div><div class='ctx'> #include "blk-mq.h"</div><div class='ctx'> #include "blk-mq-tag.h"</div><div class='add'>+#include "blk-mq-sched.h"</div><div class='ctx'> </div><div class='ctx'> /* FLUSH/FUA sequences */</div><div class='ctx'> enum {</div><div class='hunk'>@@ -127,17 +128,14 @@ static void blk_flush_restore_request(struct request *rq)</div><div class='ctx'> 	rq-&gt;bio = rq-&gt;biotail;</div><div class='ctx'> </div><div class='ctx'> 	/* make @rq a normal request */</div><div class='del'>-	rq-&gt;cmd_flags &amp;= ~REQ_FLUSH_SEQ;</div><div class='add'>+	rq-&gt;rq_flags &amp;= ~RQF_FLUSH_SEQ;</div><div class='ctx'> 	rq-&gt;end_io = rq-&gt;flush.saved_end_io;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool blk_flush_queue_rq(struct request *rq, bool add_front)</div><div class='ctx'> {</div><div class='ctx'> 	if (rq-&gt;q-&gt;mq_ops) {</div><div class='del'>-		struct request_queue *q = rq-&gt;q;</div><div class='del'>-</div><div class='del'>-		blk_mq_add_to_requeue_list(rq, add_front);</div><div class='del'>-		blk_mq_kick_requeue_list(q);</div><div class='add'>+		blk_mq_add_to_requeue_list(rq, add_front, true);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (add_front)</div><div class='hunk'>@@ -299,8 +297,14 @@ static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq)</div><div class='ctx'> 	if (fq-&gt;flush_pending_idx != fq-&gt;flush_running_idx || list_empty(pending))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	/* C2 and C3 */</div><div class='add'>+	/* C2 and C3</div><div class='add'>+	 *</div><div class='add'>+	 * For blk-mq + scheduling, we can risk having all driver tags</div><div class='add'>+	 * assigned to empty flushes, and we deadlock if we are expecting</div><div class='add'>+	 * other requests to make progress. Don't defer for that case.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!list_empty(&amp;fq-&gt;flush_data_in_flight) &amp;&amp;</div><div class='add'>+	    !(q-&gt;mq_ops &amp;&amp; q-&gt;elevator) &amp;&amp;</div><div class='ctx'> 	    time_before(jiffies,</div><div class='ctx'> 			fq-&gt;flush_pending_since + FLUSH_PENDING_TIMEOUT))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -329,8 +333,8 @@ static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq)</div><div class='ctx'> 		blk_mq_tag_set_rq(hctx, first_rq-&gt;tag, flush_rq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	flush_rq-&gt;cmd_type = REQ_TYPE_FS;</div><div class='del'>-	req_set_op_attrs(flush_rq, REQ_OP_FLUSH, WRITE_FLUSH | REQ_FLUSH_SEQ);</div><div class='add'>+	flush_rq-&gt;cmd_flags = REQ_OP_FLUSH | REQ_PREFLUSH;</div><div class='add'>+	flush_rq-&gt;rq_flags |= RQF_FLUSH_SEQ;</div><div class='ctx'> 	flush_rq-&gt;rq_disk = first_rq-&gt;rq_disk;</div><div class='ctx'> 	flush_rq-&gt;end_io = flush_end_io;</div><div class='ctx'> </div><div class='hunk'>@@ -368,7 +372,7 @@ static void flush_data_end_io(struct request *rq, int error)</div><div class='ctx'> 	elv_completed_request(q, rq);</div><div class='ctx'> </div><div class='ctx'> 	/* for avoiding double accounting */</div><div class='del'>-	rq-&gt;cmd_flags &amp;= ~REQ_STARTED;</div><div class='add'>+	rq-&gt;rq_flags &amp;= ~RQF_STARTED;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * After populating an empty queue, kick it to avoid stall.  Read</div><div class='hunk'>@@ -393,9 +397,10 @@ static void mq_flush_data_end_io(struct request *rq, int error)</div><div class='ctx'> 	 * the comment in flush_end_io().</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_irqsave(&amp;fq-&gt;mq_flush_lock, flags);</div><div class='del'>-	if (blk_flush_complete_seq(rq, fq, REQ_FSEQ_DATA, error))</div><div class='del'>-		blk_mq_run_hw_queue(hctx, true);</div><div class='add'>+	blk_flush_complete_seq(rq, fq, REQ_FSEQ_DATA, error);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;fq-&gt;mq_flush_lock, flags);</div><div class='add'>+</div><div class='add'>+	blk_mq_run_hw_queue(hctx, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -426,6 +431,13 @@ void blk_insert_flush(struct request *rq)</div><div class='ctx'> 		rq-&gt;cmd_flags &amp;= ~REQ_FUA;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * REQ_PREFLUSH|REQ_FUA implies REQ_SYNC, so if we clear any</div><div class='add'>+	 * of those flags, we have to set REQ_SYNC to avoid skewing</div><div class='add'>+	 * the request accounting.</div><div class='add'>+	 */</div><div class='add'>+	rq-&gt;cmd_flags |= REQ_SYNC;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * An empty flush handed down from a stacking driver may</div><div class='ctx'> 	 * translate into nothing if the underlying device does not</div><div class='ctx'> 	 * advertise a write-back cache.  In this case, simply</div><div class='hunk'>@@ -448,9 +460,9 @@ void blk_insert_flush(struct request *rq)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((policy &amp; REQ_FSEQ_DATA) &amp;&amp;</div><div class='ctx'> 	    !(policy &amp; (REQ_FSEQ_PREFLUSH | REQ_FSEQ_POSTFLUSH))) {</div><div class='del'>-		if (q-&gt;mq_ops) {</div><div class='del'>-			blk_mq_insert_request(rq, false, false, true);</div><div class='del'>-		} else</div><div class='add'>+		if (q-&gt;mq_ops)</div><div class='add'>+			blk_mq_sched_insert_request(rq, false, true, false, false);</div><div class='add'>+		else</div><div class='ctx'> 			list_add_tail(&amp;rq-&gt;queuelist, &amp;q-&gt;queue_head);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -461,7 +473,7 @@ void blk_insert_flush(struct request *rq)</div><div class='ctx'> 	 */</div><div class='ctx'> 	memset(&amp;rq-&gt;flush, 0, sizeof(rq-&gt;flush));</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rq-&gt;flush.list);</div><div class='del'>-	rq-&gt;cmd_flags |= REQ_FLUSH_SEQ;</div><div class='add'>+	rq-&gt;rq_flags |= RQF_FLUSH_SEQ;</div><div class='ctx'> 	rq-&gt;flush.saved_end_io = rq-&gt;end_io; /* Usually NULL */</div><div class='ctx'> 	if (q-&gt;mq_ops) {</div><div class='ctx'> 		rq-&gt;end_io = mq_flush_data_end_io;</div><div class='hunk'>@@ -513,7 +525,7 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,</div><div class='ctx'> </div><div class='ctx'> 	bio = bio_alloc(gfp_mask, 0);</div><div class='ctx'> 	bio-&gt;bi_bdev = bdev;</div><div class='del'>-	bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_FLUSH);</div><div class='add'>+	bio-&gt;bi_opf = REQ_OP_WRITE | REQ_PREFLUSH;</div><div class='ctx'> </div><div class='ctx'> 	ret = submit_bio_wait(bio);</div><div class='ctx'> </div><div class='hunk'>@@ -540,11 +552,10 @@ struct blk_flush_queue *blk_alloc_flush_queue(struct request_queue *q,</div><div class='ctx'> 	if (!fq)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	if (q-&gt;mq_ops) {</div><div class='add'>+	if (q-&gt;mq_ops)</div><div class='ctx'> 		spin_lock_init(&amp;fq-&gt;mq_flush_lock);</div><div class='del'>-		rq_sz = round_up(rq_sz + cmd_size, cache_line_size());</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	rq_sz = round_up(rq_sz + cmd_size, cache_line_size());</div><div class='ctx'> 	fq-&gt;flush_rq = kzalloc_node(rq_sz, GFP_KERNEL, node);</div><div class='ctx'> 	if (!fq-&gt;flush_rq)</div><div class='ctx'> 		goto fail_rq;</div><div class='head'>diff --git a/block/blk-integrity.c b/block/blk-integrity.c<br/>index d69c5c79f98e..9f0ff5ba4f84 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-integrity.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-integrity.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-integrity.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-integrity.c</a></div><div class='hunk'>@@ -443,10 +443,10 @@ void blk_integrity_revalidate(struct gendisk *disk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (bi-&gt;profile)</div><div class='del'>-		disk-&gt;queue-&gt;backing_dev_info.capabilities |=</div><div class='add'>+		disk-&gt;queue-&gt;backing_dev_info-&gt;capabilities |=</div><div class='ctx'> 			BDI_CAP_STABLE_WRITES;</div><div class='ctx'> 	else</div><div class='del'>-		disk-&gt;queue-&gt;backing_dev_info.capabilities &amp;=</div><div class='add'>+		disk-&gt;queue-&gt;backing_dev_info-&gt;capabilities &amp;=</div><div class='ctx'> 			~BDI_CAP_STABLE_WRITES;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-ioc.c b/block/blk-ioc.c<br/>index 381cb50a673c..63898d229cb9 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-ioc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-ioc.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-ioc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-ioc.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "blk.h"</div><div class='ctx'> </div><div class='hunk'>@@ -35,7 +36,10 @@ static void icq_free_icq_rcu(struct rcu_head *head)</div><div class='ctx'> 	kmem_cache_free(icq-&gt;__rcu_icq_cache, icq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Exit an icq. Called with both ioc and q locked. */</div><div class='add'>+/*</div><div class='add'>+ * Exit an icq. Called with ioc locked for blk-mq, and with both ioc</div><div class='add'>+ * and queue locked for legacy.</div><div class='add'>+ */</div><div class='ctx'> static void ioc_exit_icq(struct io_cq *icq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_type *et = icq-&gt;q-&gt;elevator-&gt;type;</div><div class='hunk'>@@ -43,13 +47,18 @@ static void ioc_exit_icq(struct io_cq *icq)</div><div class='ctx'> 	if (icq-&gt;flags &amp; ICQ_EXITED)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (et-&gt;ops.elevator_exit_icq_fn)</div><div class='del'>-		et-&gt;ops.elevator_exit_icq_fn(icq);</div><div class='add'>+	if (et-&gt;uses_mq &amp;&amp; et-&gt;ops.mq.exit_icq)</div><div class='add'>+		et-&gt;ops.mq.exit_icq(icq);</div><div class='add'>+	else if (!et-&gt;uses_mq &amp;&amp; et-&gt;ops.sq.elevator_exit_icq_fn)</div><div class='add'>+		et-&gt;ops.sq.elevator_exit_icq_fn(icq);</div><div class='ctx'> </div><div class='ctx'> 	icq-&gt;flags |= ICQ_EXITED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Release an icq.  Called with both ioc and q locked. */</div><div class='add'>+/*</div><div class='add'>+ * Release an icq. Called with ioc locked for blk-mq, and with both ioc</div><div class='add'>+ * and queue locked for legacy.</div><div class='add'>+ */</div><div class='ctx'> static void ioc_destroy_icq(struct io_cq *icq)</div><div class='ctx'> {</div><div class='ctx'> 	struct io_context *ioc = icq-&gt;ioc;</div><div class='hunk'>@@ -57,7 +66,6 @@ static void ioc_destroy_icq(struct io_cq *icq)</div><div class='ctx'> 	struct elevator_type *et = q-&gt;elevator-&gt;type;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ioc-&gt;lock);</div><div class='del'>-	lockdep_assert_held(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='ctx'> 	radix_tree_delete(&amp;ioc-&gt;icq_tree, icq-&gt;q-&gt;id);</div><div class='ctx'> 	hlist_del_init(&amp;icq-&gt;ioc_node);</div><div class='hunk'>@@ -164,6 +172,7 @@ EXPORT_SYMBOL(put_io_context);</div><div class='ctx'>  */</div><div class='ctx'> void put_io_context_active(struct io_context *ioc)</div><div class='ctx'> {</div><div class='add'>+	struct elevator_type *et;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct io_cq *icq;</div><div class='ctx'> </div><div class='hunk'>@@ -182,13 +191,19 @@ retry:</div><div class='ctx'> 	hlist_for_each_entry(icq, &amp;ioc-&gt;icq_list, ioc_node) {</div><div class='ctx'> 		if (icq-&gt;flags &amp; ICQ_EXITED)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (spin_trylock(icq-&gt;q-&gt;queue_lock)) {</div><div class='add'>+</div><div class='add'>+		et = icq-&gt;q-&gt;elevator-&gt;type;</div><div class='add'>+		if (et-&gt;uses_mq) {</div><div class='ctx'> 			ioc_exit_icq(icq);</div><div class='del'>-			spin_unlock(icq-&gt;q-&gt;queue_lock);</div><div class='ctx'> 		} else {</div><div class='del'>-			spin_unlock_irqrestore(&amp;ioc-&gt;lock, flags);</div><div class='del'>-			cpu_relax();</div><div class='del'>-			goto retry;</div><div class='add'>+			if (spin_trylock(icq-&gt;q-&gt;queue_lock)) {</div><div class='add'>+				ioc_exit_icq(icq);</div><div class='add'>+				spin_unlock(icq-&gt;q-&gt;queue_lock);</div><div class='add'>+			} else {</div><div class='add'>+				spin_unlock_irqrestore(&amp;ioc-&gt;lock, flags);</div><div class='add'>+				cpu_relax();</div><div class='add'>+				goto retry;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ioc-&gt;lock, flags);</div><div class='hunk'>@@ -210,24 +225,40 @@ void exit_io_context(struct task_struct *task)</div><div class='ctx'> 	put_io_context_active(ioc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __ioc_clear_queue(struct list_head *icq_list)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	while (!list_empty(icq_list)) {</div><div class='add'>+		struct io_cq *icq = list_entry(icq_list-&gt;next,</div><div class='add'>+					       struct io_cq, q_node);</div><div class='add'>+		struct io_context *ioc = icq-&gt;ioc;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;ioc-&gt;lock, flags);</div><div class='add'>+		ioc_destroy_icq(icq);</div><div class='add'>+		spin_unlock_irqrestore(&amp;ioc-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * ioc_clear_queue - break any ioc association with the specified queue</div><div class='ctx'>  * @q: request_queue being cleared</div><div class='ctx'>  *</div><div class='del'>- * Walk @q-&gt;icq_list and exit all io_cq's.  Must be called with @q locked.</div><div class='add'>+ * Walk @q-&gt;icq_list and exit all io_cq's.</div><div class='ctx'>  */</div><div class='ctx'> void ioc_clear_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	lockdep_assert_held(q-&gt;queue_lock);</div><div class='add'>+	LIST_HEAD(icq_list);</div><div class='ctx'> </div><div class='del'>-	while (!list_empty(&amp;q-&gt;icq_list)) {</div><div class='del'>-		struct io_cq *icq = list_entry(q-&gt;icq_list.next,</div><div class='del'>-					       struct io_cq, q_node);</div><div class='del'>-		struct io_context *ioc = icq-&gt;ioc;</div><div class='add'>+	spin_lock_irq(q-&gt;queue_lock);</div><div class='add'>+	list_splice_init(&amp;q-&gt;icq_list, &amp;icq_list);</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;ioc-&gt;lock);</div><div class='del'>-		ioc_destroy_icq(icq);</div><div class='del'>-		spin_unlock(&amp;ioc-&gt;lock);</div><div class='add'>+	if (q-&gt;mq_ops) {</div><div class='add'>+		spin_unlock_irq(q-&gt;queue_lock);</div><div class='add'>+		__ioc_clear_queue(&amp;icq_list);</div><div class='add'>+	} else {</div><div class='add'>+		__ioc_clear_queue(&amp;icq_list);</div><div class='add'>+		spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -383,8 +414,10 @@ struct io_cq *ioc_create_icq(struct io_context *ioc, struct request_queue *q,</div><div class='ctx'> 	if (likely(!radix_tree_insert(&amp;ioc-&gt;icq_tree, q-&gt;id, icq))) {</div><div class='ctx'> 		hlist_add_head(&amp;icq-&gt;ioc_node, &amp;ioc-&gt;icq_list);</div><div class='ctx'> 		list_add(&amp;icq-&gt;q_node, &amp;q-&gt;icq_list);</div><div class='del'>-		if (et-&gt;ops.elevator_init_icq_fn)</div><div class='del'>-			et-&gt;ops.elevator_init_icq_fn(icq);</div><div class='add'>+		if (et-&gt;uses_mq &amp;&amp; et-&gt;ops.mq.init_icq)</div><div class='add'>+			et-&gt;ops.mq.init_icq(icq);</div><div class='add'>+		else if (!et-&gt;uses_mq &amp;&amp; et-&gt;ops.sq.elevator_init_icq_fn)</div><div class='add'>+			et-&gt;ops.sq.elevator_init_icq_fn(icq);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kmem_cache_free(et-&gt;icq_cache, icq);</div><div class='ctx'> 		icq = ioc_lookup_icq(ioc, q);</div><div class='head'>diff --git a/block/blk-lib.c b/block/blk-lib.c<br/>index 46fe9248410d..ed1e78e24db0 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-lib.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-lib.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-lib.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,</div><div class='ctx'> 	struct request_queue *q = bdev_get_queue(bdev);</div><div class='ctx'> 	struct bio *bio = *biop;</div><div class='ctx'> 	unsigned int granularity;</div><div class='del'>-	enum req_op op;</div><div class='add'>+	unsigned int op;</div><div class='ctx'> 	int alignment;</div><div class='ctx'> 	sector_t bs_mask;</div><div class='ctx'> </div><div class='hunk'>@@ -80,7 +80,7 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,</div><div class='ctx'> 			req_sects = end_sect - sector;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		bio = next_bio(bio, 1, gfp_mask);</div><div class='add'>+		bio = next_bio(bio, 0, gfp_mask);</div><div class='ctx'> 		bio-&gt;bi_iter.bi_sector = sector;</div><div class='ctx'> 		bio-&gt;bi_bdev = bdev;</div><div class='ctx'> 		bio_set_op_attrs(bio, op, 0);</div><div class='hunk'>@@ -137,24 +137,24 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,</div><div class='ctx'> EXPORT_SYMBOL(blkdev_issue_discard);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blkdev_issue_write_same - queue a write same operation</div><div class='add'>+ * __blkdev_issue_write_same - generate number of bios with same page</div><div class='ctx'>  * @bdev:	target blockdev</div><div class='ctx'>  * @sector:	start sector</div><div class='ctx'>  * @nr_sects:	number of sectors to write</div><div class='ctx'>  * @gfp_mask:	memory allocation flags (for bio_alloc)</div><div class='ctx'>  * @page:	page containing data to write</div><div class='add'>+ * @biop:	pointer to anchor bio</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- *    Issue a write same request for the sectors in question.</div><div class='add'>+ *  Generate and issue number of bios(REQ_OP_WRITE_SAME) with same page.</div><div class='ctx'>  */</div><div class='del'>-int blkdev_issue_write_same(struct block_device *bdev, sector_t sector,</div><div class='del'>-			    sector_t nr_sects, gfp_t gfp_mask,</div><div class='del'>-			    struct page *page)</div><div class='add'>+static int __blkdev_issue_write_same(struct block_device *bdev, sector_t sector,</div><div class='add'>+		sector_t nr_sects, gfp_t gfp_mask, struct page *page,</div><div class='add'>+		struct bio **biop)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = bdev_get_queue(bdev);</div><div class='ctx'> 	unsigned int max_write_same_sectors;</div><div class='del'>-	struct bio *bio = NULL;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct bio *bio = *biop;</div><div class='ctx'> 	sector_t bs_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (!q)</div><div class='hunk'>@@ -164,6 +164,9 @@ int blkdev_issue_write_same(struct block_device *bdev, sector_t sector,</div><div class='ctx'> 	if ((sector | nr_sects) &amp; bs_mask)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (!bdev_write_same(bdev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	/* Ensure that max_write_same_sectors doesn't overflow bi_size */</div><div class='ctx'> 	max_write_same_sectors = UINT_MAX &gt;&gt; 9;</div><div class='ctx'> </div><div class='hunk'>@@ -185,32 +188,112 @@ int blkdev_issue_write_same(struct block_device *bdev, sector_t sector,</div><div class='ctx'> 			bio-&gt;bi_iter.bi_size = nr_sects &lt;&lt; 9;</div><div class='ctx'> 			nr_sects = 0;</div><div class='ctx'> 		}</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bio) {</div><div class='add'>+	*biop = bio;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blkdev_issue_write_same - queue a write same operation</div><div class='add'>+ * @bdev:	target blockdev</div><div class='add'>+ * @sector:	start sector</div><div class='add'>+ * @nr_sects:	number of sectors to write</div><div class='add'>+ * @gfp_mask:	memory allocation flags (for bio_alloc)</div><div class='add'>+ * @page:	page containing data</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *    Issue a write same request for the sectors in question.</div><div class='add'>+ */</div><div class='add'>+int blkdev_issue_write_same(struct block_device *bdev, sector_t sector,</div><div class='add'>+				sector_t nr_sects, gfp_t gfp_mask,</div><div class='add'>+				struct page *page)</div><div class='add'>+{</div><div class='add'>+	struct bio *bio = NULL;</div><div class='add'>+	struct blk_plug plug;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	blk_start_plug(&amp;plug);</div><div class='add'>+	ret = __blkdev_issue_write_same(bdev, sector, nr_sects, gfp_mask, page,</div><div class='add'>+			&amp;bio);</div><div class='add'>+	if (ret == 0 &amp;&amp; bio) {</div><div class='ctx'> 		ret = submit_bio_wait(bio);</div><div class='ctx'> 		bio_put(bio);</div><div class='ctx'> 	}</div><div class='add'>+	blk_finish_plug(&amp;plug);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blkdev_issue_write_same);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blkdev_issue_zeroout - generate number of zero filed write bios</div><div class='add'>+ * __blkdev_issue_write_zeroes - generate number of bios with WRITE ZEROES</div><div class='ctx'>  * @bdev:	blockdev to issue</div><div class='ctx'>  * @sector:	start sector</div><div class='ctx'>  * @nr_sects:	number of sectors to write</div><div class='ctx'>  * @gfp_mask:	memory allocation flags (for bio_alloc)</div><div class='add'>+ * @biop:	pointer to anchor bio</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- *  Generate and issue number of bios with zerofiled pages.</div><div class='add'>+ *  Generate and issue number of bios(REQ_OP_WRITE_ZEROES) with zerofiled pages.</div><div class='ctx'>  */</div><div class='add'>+static int __blkdev_issue_write_zeroes(struct block_device *bdev,</div><div class='add'>+		sector_t sector, sector_t nr_sects, gfp_t gfp_mask,</div><div class='add'>+		struct bio **biop)</div><div class='add'>+{</div><div class='add'>+	struct bio *bio = *biop;</div><div class='add'>+	unsigned int max_write_zeroes_sectors;</div><div class='add'>+	struct request_queue *q = bdev_get_queue(bdev);</div><div class='add'>+</div><div class='add'>+	if (!q)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	/* Ensure that max_write_zeroes_sectors doesn't overflow bi_size */</div><div class='add'>+	max_write_zeroes_sectors = bdev_write_zeroes_sectors(bdev);</div><div class='add'>+</div><div class='add'>+	if (max_write_zeroes_sectors == 0)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	while (nr_sects) {</div><div class='add'>+		bio = next_bio(bio, 0, gfp_mask);</div><div class='add'>+		bio-&gt;bi_iter.bi_sector = sector;</div><div class='add'>+		bio-&gt;bi_bdev = bdev;</div><div class='add'>+		bio_set_op_attrs(bio, REQ_OP_WRITE_ZEROES, 0);</div><div class='add'>+</div><div class='add'>+		if (nr_sects &gt; max_write_zeroes_sectors) {</div><div class='add'>+			bio-&gt;bi_iter.bi_size = max_write_zeroes_sectors &lt;&lt; 9;</div><div class='add'>+			nr_sects -= max_write_zeroes_sectors;</div><div class='add'>+			sector += max_write_zeroes_sectors;</div><div class='add'>+		} else {</div><div class='add'>+			bio-&gt;bi_iter.bi_size = nr_sects &lt;&lt; 9;</div><div class='add'>+			nr_sects = 0;</div><div class='add'>+		}</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,</div><div class='del'>-				  sector_t nr_sects, gfp_t gfp_mask)</div><div class='add'>+	*biop = bio;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __blkdev_issue_zeroout - generate number of zero filed write bios</div><div class='add'>+ * @bdev:	blockdev to issue</div><div class='add'>+ * @sector:	start sector</div><div class='add'>+ * @nr_sects:	number of sectors to write</div><div class='add'>+ * @gfp_mask:	memory allocation flags (for bio_alloc)</div><div class='add'>+ * @biop:	pointer to anchor bio</div><div class='add'>+ * @discard:	discard flag</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *  Generate and issue number of bios with zerofiled pages.</div><div class='add'>+ */</div><div class='add'>+int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,</div><div class='add'>+		sector_t nr_sects, gfp_t gfp_mask, struct bio **biop,</div><div class='add'>+		bool discard)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct bio *bio = NULL;</div><div class='add'>+	int bi_size = 0;</div><div class='add'>+	struct bio *bio = *biop;</div><div class='ctx'> 	unsigned int sz;</div><div class='ctx'> 	sector_t bs_mask;</div><div class='ctx'> </div><div class='hunk'>@@ -218,6 +301,12 @@ static int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,</div><div class='ctx'> 	if ((sector | nr_sects) &amp; bs_mask)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	ret = __blkdev_issue_write_zeroes(bdev, sector, nr_sects, gfp_mask,</div><div class='add'>+			biop);</div><div class='add'>+	if (ret == 0 || (ret &amp;&amp; ret != -EOPNOTSUPP))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='ctx'> 	while (nr_sects != 0) {</div><div class='ctx'> 		bio = next_bio(bio, min(nr_sects, (sector_t)BIO_MAX_PAGES),</div><div class='ctx'> 				gfp_mask);</div><div class='hunk'>@@ -227,21 +316,20 @@ static int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,</div><div class='ctx'> </div><div class='ctx'> 		while (nr_sects != 0) {</div><div class='ctx'> 			sz = min((sector_t) PAGE_SIZE &gt;&gt; 9 , nr_sects);</div><div class='del'>-			ret = bio_add_page(bio, ZERO_PAGE(0), sz &lt;&lt; 9, 0);</div><div class='del'>-			nr_sects -= ret &gt;&gt; 9;</div><div class='del'>-			sector += ret &gt;&gt; 9;</div><div class='del'>-			if (ret &lt; (sz &lt;&lt; 9))</div><div class='add'>+			bi_size = bio_add_page(bio, ZERO_PAGE(0), sz &lt;&lt; 9, 0);</div><div class='add'>+			nr_sects -= bi_size &gt;&gt; 9;</div><div class='add'>+			sector += bi_size &gt;&gt; 9;</div><div class='add'>+			if (bi_size &lt; (sz &lt;&lt; 9))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bio) {</div><div class='del'>-		ret = submit_bio_wait(bio);</div><div class='del'>-		bio_put(bio);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	*biop = bio;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__blkdev_issue_zeroout);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * blkdev_issue_zeroout - zero-fill a block range</div><div class='hunk'>@@ -258,26 +346,37 @@ static int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,</div><div class='ctx'>  *  the discard request fail, if the discard flag is not set, or if</div><div class='ctx'>  *  discard_zeroes_data is not supported, this function will resort to</div><div class='ctx'>  *  zeroing the blocks manually, thus provisioning (allocating,</div><div class='del'>- *  anchoring) them. If the block device supports the WRITE SAME command</div><div class='del'>- *  blkdev_issue_zeroout() will use it to optimize the process of</div><div class='add'>+ *  anchoring) them. If the block device supports WRITE ZEROES or WRITE SAME</div><div class='add'>+ *  command(s), blkdev_issue_zeroout() will use it to optimize the process of</div><div class='ctx'>  *  clearing the block range. Otherwise the zeroing will be performed</div><div class='ctx'>  *  using regular WRITE calls.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,</div><div class='ctx'> 			 sector_t nr_sects, gfp_t gfp_mask, bool discard)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+	struct bio *bio = NULL;</div><div class='add'>+	struct blk_plug plug;</div><div class='add'>+</div><div class='ctx'> 	if (discard) {</div><div class='ctx'> 		if (!blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask,</div><div class='ctx'> 				BLKDEV_DISCARD_ZERO))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bdev_write_same(bdev) &amp;&amp;</div><div class='del'>-	    blkdev_issue_write_same(bdev, sector, nr_sects, gfp_mask,</div><div class='del'>-				    ZERO_PAGE(0)) == 0)</div><div class='add'>+	if (!blkdev_issue_write_same(bdev, sector, nr_sects, gfp_mask,</div><div class='add'>+			ZERO_PAGE(0)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return __blkdev_issue_zeroout(bdev, sector, nr_sects, gfp_mask);</div><div class='add'>+	blk_start_plug(&amp;plug);</div><div class='add'>+	ret = __blkdev_issue_zeroout(bdev, sector, nr_sects, gfp_mask,</div><div class='add'>+			&amp;bio, discard);</div><div class='add'>+	if (ret == 0 &amp;&amp; bio) {</div><div class='add'>+		ret = submit_bio_wait(bio);</div><div class='add'>+		bio_put(bio);</div><div class='add'>+	}</div><div class='add'>+	blk_finish_plug(&amp;plug);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blkdev_issue_zeroout);</div><div class='head'>diff --git a/block/blk-map.c b/block/blk-map.c<br/>index 27fd8d92892d..3b5cb863318f 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-map.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-map.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-map.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-map.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * Functions related to mapping data to requests</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/task_stack.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='hunk'>@@ -60,6 +61,9 @@ static int __blk_rq_map_user_iov(struct request *rq,</div><div class='ctx'> 	if (IS_ERR(bio))</div><div class='ctx'> 		return PTR_ERR(bio);</div><div class='ctx'> </div><div class='add'>+	bio-&gt;bi_opf &amp;= ~REQ_OP_MASK;</div><div class='add'>+	bio-&gt;bi_opf |= req_op(rq);</div><div class='add'>+</div><div class='ctx'> 	if (map_data &amp;&amp; map_data-&gt;null_mapped)</div><div class='ctx'> 		bio_set_flag(bio, BIO_NULL_MAPPED);</div><div class='ctx'> </div><div class='hunk'>@@ -88,7 +92,7 @@ static int __blk_rq_map_user_iov(struct request *rq,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blk_rq_map_user_iov - map user data to a request, for REQ_TYPE_BLOCK_PC usage</div><div class='add'>+ * blk_rq_map_user_iov - map user data to a request, for passthrough requests</div><div class='ctx'>  * @q:		request queue where request should be inserted</div><div class='ctx'>  * @rq:		request to map data to</div><div class='ctx'>  * @map_data:   pointer to the rq_map_data holding pages (if necessary)</div><div class='hunk'>@@ -138,7 +142,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,</div><div class='ctx'> 	} while (iov_iter_count(&amp;i));</div><div class='ctx'> </div><div class='ctx'> 	if (!bio_flagged(bio, BIO_USER_MAPPED))</div><div class='del'>-		rq-&gt;cmd_flags |= REQ_COPY_USER;</div><div class='add'>+		rq-&gt;rq_flags |= RQF_COPY_USER;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> unmap_rq:</div><div class='hunk'>@@ -197,7 +201,7 @@ int blk_rq_unmap_user(struct bio *bio)</div><div class='ctx'> EXPORT_SYMBOL(blk_rq_unmap_user);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * blk_rq_map_kern - map kernel data to a request, for REQ_TYPE_BLOCK_PC usage</div><div class='add'>+ * blk_rq_map_kern - map kernel data to a request, for passthrough requests</div><div class='ctx'>  * @q:		request queue where request should be inserted</div><div class='ctx'>  * @rq:		request to fill</div><div class='ctx'>  * @kbuf:	the kernel buffer</div><div class='hunk'>@@ -232,11 +236,11 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,</div><div class='ctx'> 	if (IS_ERR(bio))</div><div class='ctx'> 		return PTR_ERR(bio);</div><div class='ctx'> </div><div class='del'>-	if (!reading)</div><div class='del'>-		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);</div><div class='add'>+	bio-&gt;bi_opf &amp;= ~REQ_OP_MASK;</div><div class='add'>+	bio-&gt;bi_opf |= req_op(rq);</div><div class='ctx'> </div><div class='ctx'> 	if (do_copy)</div><div class='del'>-		rq-&gt;cmd_flags |= REQ_COPY_USER;</div><div class='add'>+		rq-&gt;rq_flags |= RQF_COPY_USER;</div><div class='ctx'> </div><div class='ctx'> 	ret = blk_rq_append_bio(rq, bio);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='head'>diff --git a/block/blk-merge.c b/block/blk-merge.c<br/>index 2642e5fc8b69..2afa262425d1 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-merge.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-merge.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-merge.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-merge.c</a></div><div class='hunk'>@@ -199,6 +199,10 @@ void blk_queue_split(struct request_queue *q, struct bio **bio,</div><div class='ctx'> 	case REQ_OP_SECURE_ERASE:</div><div class='ctx'> 		split = blk_bio_discard_split(q, *bio, bs, &amp;nsegs);</div><div class='ctx'> 		break;</div><div class='add'>+	case REQ_OP_WRITE_ZEROES:</div><div class='add'>+		split = NULL;</div><div class='add'>+		nsegs = (*bio)-&gt;bi_phys_segments;</div><div class='add'>+		break;</div><div class='ctx'> 	case REQ_OP_WRITE_SAME:</div><div class='ctx'> 		split = blk_bio_write_same_split(q, *bio, bs, &amp;nsegs);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -237,15 +241,14 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q,</div><div class='ctx'> 	if (!bio)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * This should probably be returning 0, but blk_add_request_payload()</div><div class='del'>-	 * (Christoph!!!!)</div><div class='del'>-	 */</div><div class='del'>-	if (bio_op(bio) == REQ_OP_DISCARD || bio_op(bio) == REQ_OP_SECURE_ERASE)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (bio_op(bio) == REQ_OP_WRITE_SAME)</div><div class='add'>+	switch (bio_op(bio)) {</div><div class='add'>+	case REQ_OP_DISCARD:</div><div class='add'>+	case REQ_OP_SECURE_ERASE:</div><div class='add'>+	case REQ_OP_WRITE_ZEROES:</div><div class='add'>+		return 0;</div><div class='add'>+	case REQ_OP_WRITE_SAME:</div><div class='ctx'> 		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	fbio = bio;</div><div class='ctx'> 	cluster = blk_queue_cluster(q);</div><div class='hunk'>@@ -402,38 +405,21 @@ new_segment:</div><div class='ctx'> 	*bvprv = *bvec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int __blk_bvec_map_sg(struct request_queue *q, struct bio_vec bv,</div><div class='add'>+		struct scatterlist *sglist, struct scatterlist **sg)</div><div class='add'>+{</div><div class='add'>+	*sg = sglist;</div><div class='add'>+	sg_set_page(*sg, bv.bv_page, bv.bv_len, bv.bv_offset);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio,</div><div class='ctx'> 			     struct scatterlist *sglist,</div><div class='ctx'> 			     struct scatterlist **sg)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio_vec bvec, bvprv = { NULL };</div><div class='ctx'> 	struct bvec_iter iter;</div><div class='del'>-	int nsegs, cluster;</div><div class='del'>-</div><div class='del'>-	nsegs = 0;</div><div class='del'>-	cluster = blk_queue_cluster(q);</div><div class='del'>-</div><div class='del'>-	switch (bio_op(bio)) {</div><div class='del'>-	case REQ_OP_DISCARD:</div><div class='del'>-	case REQ_OP_SECURE_ERASE:</div><div class='del'>-		/*</div><div class='del'>-		 * This is a hack - drivers should be neither modifying the</div><div class='del'>-		 * biovec, nor relying on bi_vcnt - but because of</div><div class='del'>-		 * blk_add_request_payload(), a discard bio may or may not have</div><div class='del'>-		 * a payload we need to set up here (thank you Christoph) and</div><div class='del'>-		 * bi_vcnt is really the only way of telling if we need to.</div><div class='del'>-		 */</div><div class='del'>-		if (!bio-&gt;bi_vcnt)</div><div class='del'>-			return 0;</div><div class='del'>-		/* Fall through */</div><div class='del'>-	case REQ_OP_WRITE_SAME:</div><div class='del'>-		*sg = sglist;</div><div class='del'>-		bvec = bio_iovec(bio);</div><div class='del'>-		sg_set_page(*sg, bvec.bv_page, bvec.bv_len, bvec.bv_offset);</div><div class='del'>-		return 1;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	int cluster = blk_queue_cluster(q), nsegs = 0;</div><div class='ctx'> </div><div class='ctx'> 	for_each_bio(bio)</div><div class='ctx'> 		bio_for_each_segment(bvec, bio, iter)</div><div class='hunk'>@@ -453,10 +439,14 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,</div><div class='ctx'> 	struct scatterlist *sg = NULL;</div><div class='ctx'> 	int nsegs = 0;</div><div class='ctx'> </div><div class='del'>-	if (rq-&gt;bio)</div><div class='add'>+	if (rq-&gt;rq_flags &amp; RQF_SPECIAL_PAYLOAD)</div><div class='add'>+		nsegs = __blk_bvec_map_sg(q, rq-&gt;special_vec, sglist, &amp;sg);</div><div class='add'>+	else if (rq-&gt;bio &amp;&amp; bio_op(rq-&gt;bio) == REQ_OP_WRITE_SAME)</div><div class='add'>+		nsegs = __blk_bvec_map_sg(q, bio_iovec(rq-&gt;bio), sglist, &amp;sg);</div><div class='add'>+	else if (rq-&gt;bio)</div><div class='ctx'> 		nsegs = __blk_bios_map_sg(q, rq-&gt;bio, sglist, &amp;sg);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(rq-&gt;cmd_flags &amp; REQ_COPY_USER) &amp;&amp;</div><div class='add'>+	if (unlikely(rq-&gt;rq_flags &amp; RQF_COPY_USER) &amp;&amp;</div><div class='ctx'> 	    (blk_rq_bytes(rq) &amp; q-&gt;dma_pad_mask)) {</div><div class='ctx'> 		unsigned int pad_len =</div><div class='ctx'> 			(q-&gt;dma_pad_mask &amp; ~blk_rq_bytes(rq)) + 1;</div><div class='hunk'>@@ -486,7 +476,7 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,</div><div class='ctx'> 	 * Something must have been wrong if the figured number of</div><div class='ctx'> 	 * segment is bigger than number of req's physical segments</div><div class='ctx'> 	 */</div><div class='del'>-	WARN_ON(nsegs &gt; rq-&gt;nr_phys_segments);</div><div class='add'>+	WARN_ON(nsegs &gt; blk_rq_nr_phys_segments(rq));</div><div class='ctx'> </div><div class='ctx'> 	return nsegs;</div><div class='ctx'> }</div><div class='hunk'>@@ -512,9 +502,7 @@ static inline int ll_new_hw_segment(struct request_queue *q,</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='ctx'> no_merge:</div><div class='del'>-	req-&gt;cmd_flags |= REQ_NOMERGE;</div><div class='del'>-	if (req == q-&gt;last_merge)</div><div class='del'>-		q-&gt;last_merge = NULL;</div><div class='add'>+	req_set_nomerge(q, req);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -528,9 +516,7 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (blk_rq_sectors(req) + bio_sectors(bio) &gt;</div><div class='ctx'> 	    blk_rq_get_max_sectors(req, blk_rq_pos(req))) {</div><div class='del'>-		req-&gt;cmd_flags |= REQ_NOMERGE;</div><div class='del'>-		if (req == q-&gt;last_merge)</div><div class='del'>-			q-&gt;last_merge = NULL;</div><div class='add'>+		req_set_nomerge(q, req);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!bio_flagged(req-&gt;biotail, BIO_SEG_VALID))</div><div class='hunk'>@@ -552,9 +538,7 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (blk_rq_sectors(req) + bio_sectors(bio) &gt;</div><div class='ctx'> 	    blk_rq_get_max_sectors(req, bio-&gt;bi_iter.bi_sector)) {</div><div class='del'>-		req-&gt;cmd_flags |= REQ_NOMERGE;</div><div class='del'>-		if (req == q-&gt;last_merge)</div><div class='del'>-			q-&gt;last_merge = NULL;</div><div class='add'>+		req_set_nomerge(q, req);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!bio_flagged(bio, BIO_SEG_VALID))</div><div class='hunk'>@@ -634,7 +618,7 @@ void blk_rq_set_mixed_merge(struct request *rq)</div><div class='ctx'> 	unsigned int ff = rq-&gt;cmd_flags &amp; REQ_FAILFAST_MASK;</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> </div><div class='del'>-	if (rq-&gt;cmd_flags &amp; REQ_MIXED_MERGE)</div><div class='add'>+	if (rq-&gt;rq_flags &amp; RQF_MIXED_MERGE)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -647,7 +631,7 @@ void blk_rq_set_mixed_merge(struct request *rq)</div><div class='ctx'> 			     (bio-&gt;bi_opf &amp; REQ_FAILFAST_MASK) != ff);</div><div class='ctx'> 		bio-&gt;bi_opf |= ff;</div><div class='ctx'> 	}</div><div class='del'>-	rq-&gt;cmd_flags |= REQ_MIXED_MERGE;</div><div class='add'>+	rq-&gt;rq_flags |= RQF_MIXED_MERGE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void blk_account_io_merge(struct request *req)</div><div class='hunk'>@@ -668,31 +652,32 @@ static void blk_account_io_merge(struct request *req)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Has to be called with the request spinlock acquired</div><div class='add'>+ * For non-mq, this has to be called with the request spinlock acquired.</div><div class='add'>+ * For mq with scheduling, the appropriate queue wide lock should be held.</div><div class='ctx'>  */</div><div class='del'>-static int attempt_merge(struct request_queue *q, struct request *req,</div><div class='del'>-			  struct request *next)</div><div class='add'>+static struct request *attempt_merge(struct request_queue *q,</div><div class='add'>+				     struct request *req, struct request *next)</div><div class='ctx'> {</div><div class='ctx'> 	if (!rq_mergeable(req) || !rq_mergeable(next))</div><div class='del'>-		return 0;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (req_op(req) != req_op(next))</div><div class='del'>-		return 0;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * not contiguous</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (blk_rq_pos(req) + blk_rq_sectors(req) != blk_rq_pos(next))</div><div class='del'>-		return 0;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (rq_data_dir(req) != rq_data_dir(next)</div><div class='ctx'> 	    || req-&gt;rq_disk != next-&gt;rq_disk</div><div class='ctx'> 	    || req_no_special_merge(next))</div><div class='del'>-		return 0;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (req_op(req) == REQ_OP_WRITE_SAME &amp;&amp;</div><div class='ctx'> 	    !blk_write_same_mergeable(req-&gt;bio, next-&gt;bio))</div><div class='del'>-		return 0;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are allowed to merge, then append bio list</div><div class='hunk'>@@ -701,7 +686,7 @@ static int attempt_merge(struct request_queue *q, struct request *req,</div><div class='ctx'> 	 * counts here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!ll_merge_requests_fn(q, req, next))</div><div class='del'>-		return 0;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If failfast settings disagree or any of the two is already</div><div class='hunk'>@@ -709,7 +694,7 @@ static int attempt_merge(struct request_queue *q, struct request *req,</div><div class='ctx'> 	 * makes sure that all involved bios have mixable attributes</div><div class='ctx'> 	 * set properly.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((req-&gt;cmd_flags | next-&gt;cmd_flags) &amp; REQ_MIXED_MERGE ||</div><div class='add'>+	if (((req-&gt;rq_flags | next-&gt;rq_flags) &amp; RQF_MIXED_MERGE) ||</div><div class='ctx'> 	    (req-&gt;cmd_flags &amp; REQ_FAILFAST_MASK) !=</div><div class='ctx'> 	    (next-&gt;cmd_flags &amp; REQ_FAILFAST_MASK)) {</div><div class='ctx'> 		blk_rq_set_mixed_merge(req);</div><div class='hunk'>@@ -741,42 +726,51 @@ static int attempt_merge(struct request_queue *q, struct request *req,</div><div class='ctx'> 	if (blk_rq_cpu_valid(next))</div><div class='ctx'> 		req-&gt;cpu = next-&gt;cpu;</div><div class='ctx'> </div><div class='del'>-	/* owner-ship of bio passed from next to req */</div><div class='add'>+	/*</div><div class='add'>+	 * ownership of bio passed from next to req, return 'next' for</div><div class='add'>+	 * the caller to free</div><div class='add'>+	 */</div><div class='ctx'> 	next-&gt;bio = NULL;</div><div class='del'>-	__blk_put_request(q, next);</div><div class='del'>-	return 1;</div><div class='add'>+	return next;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int attempt_back_merge(struct request_queue *q, struct request *rq)</div><div class='add'>+struct request *attempt_back_merge(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *next = elv_latter_request(q, rq);</div><div class='ctx'> </div><div class='ctx'> 	if (next)</div><div class='ctx'> 		return attempt_merge(q, rq, next);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int attempt_front_merge(struct request_queue *q, struct request *rq)</div><div class='add'>+struct request *attempt_front_merge(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *prev = elv_former_request(q, rq);</div><div class='ctx'> </div><div class='ctx'> 	if (prev)</div><div class='ctx'> 		return attempt_merge(q, prev, rq);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int blk_attempt_req_merge(struct request_queue *q, struct request *rq,</div><div class='ctx'> 			  struct request *next)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+	struct request *free;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_allow_rq_merge_fn)</div><div class='del'>-		if (!e-&gt;type-&gt;ops.elevator_allow_rq_merge_fn(q, rq, next))</div><div class='add'>+	if (!e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.sq.elevator_allow_rq_merge_fn)</div><div class='add'>+		if (!e-&gt;type-&gt;ops.sq.elevator_allow_rq_merge_fn(q, rq, next))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-	return attempt_merge(q, rq, next);</div><div class='add'>+	free = attempt_merge(q, rq, next);</div><div class='add'>+	if (free) {</div><div class='add'>+		__blk_put_request(q, free);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool blk_rq_merge_ok(struct request *rq, struct bio *bio)</div><div class='hunk'>@@ -807,9 +801,12 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int blk_try_merge(struct request *rq, struct bio *bio)</div><div class='add'>+enum elv_merge blk_try_merge(struct request *rq, struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	if (blk_rq_pos(rq) + blk_rq_sectors(rq) == bio-&gt;bi_iter.bi_sector)</div><div class='add'>+	if (req_op(rq) == REQ_OP_DISCARD &amp;&amp;</div><div class='add'>+	    queue_max_discard_segments(rq-&gt;q) &gt; 1)</div><div class='add'>+		return ELEVATOR_DISCARD_MERGE;</div><div class='add'>+	else if (blk_rq_pos(rq) + blk_rq_sectors(rq) == bio-&gt;bi_iter.bi_sector)</div><div class='ctx'> 		return ELEVATOR_BACK_MERGE;</div><div class='ctx'> 	else if (blk_rq_pos(rq) - bio_sectors(bio) == bio-&gt;bi_iter.bi_sector)</div><div class='ctx'> 		return ELEVATOR_FRONT_MERGE;</div><div class='head'>diff --git a/block/blk-mq-cpumap.c b/block/blk-mq-cpumap.c<br/>index 19b1d9c5f07e..8e61e8640e17 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-mq-cpumap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-mq-cpumap.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-mq-cpumap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-cpumap.c</a></div><div class='hunk'>@@ -87,6 +87,7 @@ int blk_mq_map_queues(struct blk_mq_tag_set *set)</div><div class='ctx'> 	free_cpumask_var(cpus);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_map_queues);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We have no quick way of doing reverse lookups. This is only used at</div><div class='head'>diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c<br/>new file mode 100644<br/>index 000000000000..f6d917977b33<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/blk-mq-debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,772 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2017 Facebook</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public</div><div class='add'>+ * License v2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/blk-mq.h&gt;</div><div class='add'>+#include "blk.h"</div><div class='add'>+#include "blk-mq.h"</div><div class='add'>+#include "blk-mq-tag.h"</div><div class='add'>+</div><div class='add'>+struct blk_mq_debugfs_attr {</div><div class='add'>+	const char *name;</div><div class='add'>+	umode_t mode;</div><div class='add'>+	const struct file_operations *fops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int blk_mq_debugfs_seq_open(struct inode *inode, struct file *file,</div><div class='add'>+				   const struct seq_operations *ops)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *m;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = seq_open(file, ops);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		m = file-&gt;private_data;</div><div class='add'>+		m-&gt;private = inode-&gt;i_private;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_state_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "0x%lx\n", hctx-&gt;state);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_state_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_state_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_state_fops = {</div><div class='add'>+	.open		= hctx_state_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hctx_flags_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "0x%lx\n", hctx-&gt;flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_flags_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_flags_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_flags_fops = {</div><div class='add'>+	.open		= hctx_flags_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int blk_mq_debugfs_rq_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct request *rq = list_entry_rq(v);</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "%p {.cmd_flags=0x%x, .rq_flags=0x%x, .tag=%d, .internal_tag=%d}\n",</div><div class='add'>+		   rq, rq-&gt;cmd_flags, (__force unsigned int)rq-&gt;rq_flags,</div><div class='add'>+		   rq-&gt;tag, rq-&gt;internal_tag);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *hctx_dispatch_start(struct seq_file *m, loff_t *pos)</div><div class='add'>+	__acquires(&amp;hctx-&gt;lock)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;hctx-&gt;lock);</div><div class='add'>+	return seq_list_start(&amp;hctx-&gt;dispatch, *pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *hctx_dispatch_next(struct seq_file *m, void *v, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	return seq_list_next(v, &amp;hctx-&gt;dispatch, pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hctx_dispatch_stop(struct seq_file *m, void *v)</div><div class='add'>+	__releases(&amp;hctx-&gt;lock)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;hctx-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct seq_operations hctx_dispatch_seq_ops = {</div><div class='add'>+	.start	= hctx_dispatch_start,</div><div class='add'>+	.next	= hctx_dispatch_next,</div><div class='add'>+	.stop	= hctx_dispatch_stop,</div><div class='add'>+	.show	= blk_mq_debugfs_rq_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hctx_dispatch_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return blk_mq_debugfs_seq_open(inode, file, &amp;hctx_dispatch_seq_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_dispatch_fops = {</div><div class='add'>+	.open		= hctx_dispatch_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= seq_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hctx_ctx_map_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	sbitmap_bitmap_show(&amp;hctx-&gt;ctx_map, m);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_ctx_map_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_ctx_map_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_ctx_map_fops = {</div><div class='add'>+	.open		= hctx_ctx_map_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void blk_mq_debugfs_tags_show(struct seq_file *m,</div><div class='add'>+				     struct blk_mq_tags *tags)</div><div class='add'>+{</div><div class='add'>+	seq_printf(m, "nr_tags=%u\n", tags-&gt;nr_tags);</div><div class='add'>+	seq_printf(m, "nr_reserved_tags=%u\n", tags-&gt;nr_reserved_tags);</div><div class='add'>+	seq_printf(m, "active_queues=%d\n",</div><div class='add'>+		   atomic_read(&amp;tags-&gt;active_queues));</div><div class='add'>+</div><div class='add'>+	seq_puts(m, "\nbitmap_tags:\n");</div><div class='add'>+	sbitmap_queue_show(&amp;tags-&gt;bitmap_tags, m);</div><div class='add'>+</div><div class='add'>+	if (tags-&gt;nr_reserved_tags) {</div><div class='add'>+		seq_puts(m, "\nbreserved_tags:\n");</div><div class='add'>+		sbitmap_queue_show(&amp;tags-&gt;breserved_tags, m);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_tags_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = mutex_lock_interruptible(&amp;q-&gt;sysfs_lock);</div><div class='add'>+	if (res)</div><div class='add'>+		goto out;</div><div class='add'>+	if (hctx-&gt;tags)</div><div class='add'>+		blk_mq_debugfs_tags_show(m, hctx-&gt;tags);</div><div class='add'>+	mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_tags_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_tags_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_tags_fops = {</div><div class='add'>+	.open		= hctx_tags_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hctx_tags_bitmap_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = mutex_lock_interruptible(&amp;q-&gt;sysfs_lock);</div><div class='add'>+	if (res)</div><div class='add'>+		goto out;</div><div class='add'>+	if (hctx-&gt;tags)</div><div class='add'>+		sbitmap_bitmap_show(&amp;hctx-&gt;tags-&gt;bitmap_tags.sb, m);</div><div class='add'>+	mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_tags_bitmap_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_tags_bitmap_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_tags_bitmap_fops = {</div><div class='add'>+	.open		= hctx_tags_bitmap_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hctx_sched_tags_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = mutex_lock_interruptible(&amp;q-&gt;sysfs_lock);</div><div class='add'>+	if (res)</div><div class='add'>+		goto out;</div><div class='add'>+	if (hctx-&gt;sched_tags)</div><div class='add'>+		blk_mq_debugfs_tags_show(m, hctx-&gt;sched_tags);</div><div class='add'>+	mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_sched_tags_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_sched_tags_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_sched_tags_fops = {</div><div class='add'>+	.open		= hctx_sched_tags_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hctx_sched_tags_bitmap_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = mutex_lock_interruptible(&amp;q-&gt;sysfs_lock);</div><div class='add'>+	if (res)</div><div class='add'>+		goto out;</div><div class='add'>+	if (hctx-&gt;sched_tags)</div><div class='add'>+		sbitmap_bitmap_show(&amp;hctx-&gt;sched_tags-&gt;bitmap_tags.sb, m);</div><div class='add'>+	mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_sched_tags_bitmap_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_sched_tags_bitmap_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_sched_tags_bitmap_fops = {</div><div class='add'>+	.open		= hctx_sched_tags_bitmap_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hctx_io_poll_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "considered=%lu\n", hctx-&gt;poll_considered);</div><div class='add'>+	seq_printf(m, "invoked=%lu\n", hctx-&gt;poll_invoked);</div><div class='add'>+	seq_printf(m, "success=%lu\n", hctx-&gt;poll_success);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_io_poll_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_io_poll_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hctx_io_poll_write(struct file *file, const char __user *buf,</div><div class='add'>+				  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *m = file-&gt;private_data;</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	hctx-&gt;poll_considered = hctx-&gt;poll_invoked = hctx-&gt;poll_success = 0;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_io_poll_fops = {</div><div class='add'>+	.open		= hctx_io_poll_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.write		= hctx_io_poll_write,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void print_stat(struct seq_file *m, struct blk_rq_stat *stat)</div><div class='add'>+{</div><div class='add'>+	seq_printf(m, "samples=%d, mean=%lld, min=%llu, max=%llu",</div><div class='add'>+		   stat-&gt;nr_samples, stat-&gt;mean, stat-&gt;min, stat-&gt;max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_stats_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+	struct blk_rq_stat stat[2];</div><div class='add'>+</div><div class='add'>+	blk_stat_init(&amp;stat[BLK_STAT_READ]);</div><div class='add'>+	blk_stat_init(&amp;stat[BLK_STAT_WRITE]);</div><div class='add'>+</div><div class='add'>+	blk_hctx_stat_get(hctx, stat);</div><div class='add'>+</div><div class='add'>+	seq_puts(m, "read: ");</div><div class='add'>+	print_stat(m, &amp;stat[BLK_STAT_READ]);</div><div class='add'>+	seq_puts(m, "\n");</div><div class='add'>+</div><div class='add'>+	seq_puts(m, "write: ");</div><div class='add'>+	print_stat(m, &amp;stat[BLK_STAT_WRITE]);</div><div class='add'>+	seq_puts(m, "\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_stats_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_stats_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hctx_stats_write(struct file *file, const char __user *buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *m = file-&gt;private_data;</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+	struct blk_mq_ctx *ctx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hctx_for_each_ctx(hctx, ctx, i) {</div><div class='add'>+		blk_stat_init(&amp;ctx-&gt;stat[BLK_STAT_READ]);</div><div class='add'>+		blk_stat_init(&amp;ctx-&gt;stat[BLK_STAT_WRITE]);</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_stats_fops = {</div><div class='add'>+	.open		= hctx_stats_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.write		= hctx_stats_write,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hctx_dispatched_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "%8u\t%lu\n", 0U, hctx-&gt;dispatched[0]);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; BLK_MQ_MAX_DISPATCH_ORDER - 1; i++) {</div><div class='add'>+		unsigned int d = 1U &lt;&lt; (i - 1);</div><div class='add'>+</div><div class='add'>+		seq_printf(m, "%8u\t%lu\n", d, hctx-&gt;dispatched[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "%8u+\t%lu\n", 1U &lt;&lt; (i - 1), hctx-&gt;dispatched[i]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_dispatched_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_dispatched_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hctx_dispatched_write(struct file *file, const char __user *buf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *m = file-&gt;private_data;</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BLK_MQ_MAX_DISPATCH_ORDER; i++)</div><div class='add'>+		hctx-&gt;dispatched[i] = 0;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_dispatched_fops = {</div><div class='add'>+	.open		= hctx_dispatched_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.write		= hctx_dispatched_write,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hctx_queued_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "%lu\n", hctx-&gt;queued);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_queued_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_queued_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hctx_queued_write(struct file *file, const char __user *buf,</div><div class='add'>+				 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *m = file-&gt;private_data;</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	hctx-&gt;queued = 0;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_queued_fops = {</div><div class='add'>+	.open		= hctx_queued_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.write		= hctx_queued_write,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hctx_run_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "%lu\n", hctx-&gt;run);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_run_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_run_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hctx_run_write(struct file *file, const char __user *buf,</div><div class='add'>+				 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *m = file-&gt;private_data;</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	hctx-&gt;run = 0;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_run_fops = {</div><div class='add'>+	.open		= hctx_run_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.write		= hctx_run_write,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hctx_active_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "%d\n", atomic_read(&amp;hctx-&gt;nr_active));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hctx_active_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, hctx_active_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations hctx_active_fops = {</div><div class='add'>+	.open		= hctx_active_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void *ctx_rq_list_start(struct seq_file *m, loff_t *pos)</div><div class='add'>+	__acquires(&amp;ctx-&gt;lock)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_ctx *ctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ctx-&gt;lock);</div><div class='add'>+	return seq_list_start(&amp;ctx-&gt;rq_list, *pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *ctx_rq_list_next(struct seq_file *m, void *v, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_ctx *ctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	return seq_list_next(v, &amp;ctx-&gt;rq_list, pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ctx_rq_list_stop(struct seq_file *m, void *v)</div><div class='add'>+	__releases(&amp;ctx-&gt;lock)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_ctx *ctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;ctx-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct seq_operations ctx_rq_list_seq_ops = {</div><div class='add'>+	.start	= ctx_rq_list_start,</div><div class='add'>+	.next	= ctx_rq_list_next,</div><div class='add'>+	.stop	= ctx_rq_list_stop,</div><div class='add'>+	.show	= blk_mq_debugfs_rq_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ctx_rq_list_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return blk_mq_debugfs_seq_open(inode, file, &amp;ctx_rq_list_seq_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations ctx_rq_list_fops = {</div><div class='add'>+	.open		= ctx_rq_list_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= seq_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ctx_dispatched_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_ctx *ctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "%lu %lu\n", ctx-&gt;rq_dispatched[1], ctx-&gt;rq_dispatched[0]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctx_dispatched_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, ctx_dispatched_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ctx_dispatched_write(struct file *file, const char __user *buf,</div><div class='add'>+				    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *m = file-&gt;private_data;</div><div class='add'>+	struct blk_mq_ctx *ctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;rq_dispatched[0] = ctx-&gt;rq_dispatched[1] = 0;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations ctx_dispatched_fops = {</div><div class='add'>+	.open		= ctx_dispatched_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.write		= ctx_dispatched_write,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ctx_merged_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_ctx *ctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "%lu\n", ctx-&gt;rq_merged);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctx_merged_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, ctx_merged_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ctx_merged_write(struct file *file, const char __user *buf,</div><div class='add'>+				    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *m = file-&gt;private_data;</div><div class='add'>+	struct blk_mq_ctx *ctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;rq_merged = 0;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations ctx_merged_fops = {</div><div class='add'>+	.open		= ctx_merged_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.write		= ctx_merged_write,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ctx_completed_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_ctx *ctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "%lu %lu\n", ctx-&gt;rq_completed[1], ctx-&gt;rq_completed[0]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctx_completed_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, ctx_completed_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ctx_completed_write(struct file *file, const char __user *buf,</div><div class='add'>+				   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *m = file-&gt;private_data;</div><div class='add'>+	struct blk_mq_ctx *ctx = m-&gt;private;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;rq_completed[0] = ctx-&gt;rq_completed[1] = 0;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations ctx_completed_fops = {</div><div class='add'>+	.open		= ctx_completed_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.write		= ctx_completed_write,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct blk_mq_debugfs_attr blk_mq_debugfs_hctx_attrs[] = {</div><div class='add'>+	{"state", 0400, &amp;hctx_state_fops},</div><div class='add'>+	{"flags", 0400, &amp;hctx_flags_fops},</div><div class='add'>+	{"dispatch", 0400, &amp;hctx_dispatch_fops},</div><div class='add'>+	{"ctx_map", 0400, &amp;hctx_ctx_map_fops},</div><div class='add'>+	{"tags", 0400, &amp;hctx_tags_fops},</div><div class='add'>+	{"tags_bitmap", 0400, &amp;hctx_tags_bitmap_fops},</div><div class='add'>+	{"sched_tags", 0400, &amp;hctx_sched_tags_fops},</div><div class='add'>+	{"sched_tags_bitmap", 0400, &amp;hctx_sched_tags_bitmap_fops},</div><div class='add'>+	{"io_poll", 0600, &amp;hctx_io_poll_fops},</div><div class='add'>+	{"stats", 0600, &amp;hctx_stats_fops},</div><div class='add'>+	{"dispatched", 0600, &amp;hctx_dispatched_fops},</div><div class='add'>+	{"queued", 0600, &amp;hctx_queued_fops},</div><div class='add'>+	{"run", 0600, &amp;hctx_run_fops},</div><div class='add'>+	{"active", 0400, &amp;hctx_active_fops},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct blk_mq_debugfs_attr blk_mq_debugfs_ctx_attrs[] = {</div><div class='add'>+	{"rq_list", 0400, &amp;ctx_rq_list_fops},</div><div class='add'>+	{"dispatched", 0600, &amp;ctx_dispatched_fops},</div><div class='add'>+	{"merged", 0600, &amp;ctx_merged_fops},</div><div class='add'>+	{"completed", 0600, &amp;ctx_completed_fops},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int blk_mq_debugfs_register(struct request_queue *q, const char *name)</div><div class='add'>+{</div><div class='add'>+	if (!blk_debugfs_root)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	q-&gt;debugfs_dir = debugfs_create_dir(name, blk_debugfs_root);</div><div class='add'>+	if (!q-&gt;debugfs_dir)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (blk_mq_debugfs_register_hctxs(q))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	blk_mq_debugfs_unregister(q);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_mq_debugfs_unregister(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(q-&gt;debugfs_dir);</div><div class='add'>+	q-&gt;mq_debugfs_dir = NULL;</div><div class='add'>+	q-&gt;debugfs_dir = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool debugfs_create_files(struct dentry *parent, void *data,</div><div class='add'>+				const struct blk_mq_debugfs_attr *attr)</div><div class='add'>+{</div><div class='add'>+	for (; attr-&gt;name; attr++) {</div><div class='add'>+		if (!debugfs_create_file(attr-&gt;name, attr-&gt;mode, parent,</div><div class='add'>+					 data, attr-&gt;fops))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int blk_mq_debugfs_register_ctx(struct request_queue *q,</div><div class='add'>+				       struct blk_mq_ctx *ctx,</div><div class='add'>+				       struct dentry *hctx_dir)</div><div class='add'>+{</div><div class='add'>+	struct dentry *ctx_dir;</div><div class='add'>+	char name[20];</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "cpu%u", ctx-&gt;cpu);</div><div class='add'>+	ctx_dir = debugfs_create_dir(name, hctx_dir);</div><div class='add'>+	if (!ctx_dir)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!debugfs_create_files(ctx_dir, ctx, blk_mq_debugfs_ctx_attrs))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int blk_mq_debugfs_register_hctx(struct request_queue *q,</div><div class='add'>+					struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_ctx *ctx;</div><div class='add'>+	struct dentry *hctx_dir;</div><div class='add'>+	char name[20];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "%u", hctx-&gt;queue_num);</div><div class='add'>+	hctx_dir = debugfs_create_dir(name, q-&gt;mq_debugfs_dir);</div><div class='add'>+	if (!hctx_dir)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!debugfs_create_files(hctx_dir, hctx, blk_mq_debugfs_hctx_attrs))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hctx_for_each_ctx(hctx, ctx, i) {</div><div class='add'>+		if (blk_mq_debugfs_register_ctx(q, ctx, hctx_dir))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int blk_mq_debugfs_register_hctxs(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!q-&gt;debugfs_dir)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	q-&gt;mq_debugfs_dir = debugfs_create_dir("mq", q-&gt;debugfs_dir);</div><div class='add'>+	if (!q-&gt;mq_debugfs_dir)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='add'>+		if (blk_mq_debugfs_register_hctx(q, hctx))</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	blk_mq_debugfs_unregister_hctxs(q);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_mq_debugfs_unregister_hctxs(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(q-&gt;mq_debugfs_dir);</div><div class='add'>+	q-&gt;mq_debugfs_dir = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c<br/>new file mode 100644<br/>index 000000000000..09af8ff18719<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/blk-mq-sched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-sched.c</a></div><div class='hunk'>@@ -0,0 +1,500 @@</div><div class='add'>+/*</div><div class='add'>+ * blk-mq scheduling framework</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Jens Axboe</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/blk-mq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;trace/events/block.h&gt;</div><div class='add'>+</div><div class='add'>+#include "blk.h"</div><div class='add'>+#include "blk-mq.h"</div><div class='add'>+#include "blk-mq-sched.h"</div><div class='add'>+#include "blk-mq-tag.h"</div><div class='add'>+#include "blk-wbt.h"</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_free_hctx_data(struct request_queue *q,</div><div class='add'>+				 void (*exit)(struct blk_mq_hw_ctx *))</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='add'>+		if (exit &amp;&amp; hctx-&gt;sched_data)</div><div class='add'>+			exit(hctx);</div><div class='add'>+		kfree(hctx-&gt;sched_data);</div><div class='add'>+		hctx-&gt;sched_data = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_sched_free_hctx_data);</div><div class='add'>+</div><div class='add'>+int blk_mq_sched_init_hctx_data(struct request_queue *q, size_t size,</div><div class='add'>+				int (*init)(struct blk_mq_hw_ctx *),</div><div class='add'>+				void (*exit)(struct blk_mq_hw_ctx *))</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='add'>+		hctx-&gt;sched_data = kmalloc_node(size, GFP_KERNEL, hctx-&gt;numa_node);</div><div class='add'>+		if (!hctx-&gt;sched_data) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (init) {</div><div class='add'>+			ret = init(hctx);</div><div class='add'>+			if (ret) {</div><div class='add'>+				/*</div><div class='add'>+				 * We don't want to give exit() a partially</div><div class='add'>+				 * initialized sched_data. init() must clean up</div><div class='add'>+				 * if it fails.</div><div class='add'>+				 */</div><div class='add'>+				kfree(hctx-&gt;sched_data);</div><div class='add'>+				hctx-&gt;sched_data = NULL;</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	blk_mq_sched_free_hctx_data(q, exit);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_sched_init_hctx_data);</div><div class='add'>+</div><div class='add'>+static void __blk_mq_sched_assign_ioc(struct request_queue *q,</div><div class='add'>+				      struct request *rq,</div><div class='add'>+				      struct bio *bio,</div><div class='add'>+				      struct io_context *ioc)</div><div class='add'>+{</div><div class='add'>+	struct io_cq *icq;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(q-&gt;queue_lock);</div><div class='add'>+	icq = ioc_lookup_icq(ioc, q);</div><div class='add'>+	spin_unlock_irq(q-&gt;queue_lock);</div><div class='add'>+</div><div class='add'>+	if (!icq) {</div><div class='add'>+		icq = ioc_create_icq(ioc, q, GFP_ATOMIC);</div><div class='add'>+		if (!icq)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rq-&gt;elv.icq = icq;</div><div class='add'>+	if (!blk_mq_sched_get_rq_priv(q, rq, bio)) {</div><div class='add'>+		rq-&gt;rq_flags |= RQF_ELVPRIV;</div><div class='add'>+		get_io_context(icq-&gt;ioc);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rq-&gt;elv.icq = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void blk_mq_sched_assign_ioc(struct request_queue *q,</div><div class='add'>+				    struct request *rq, struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct io_context *ioc;</div><div class='add'>+</div><div class='add'>+	ioc = rq_ioc(bio);</div><div class='add'>+	if (ioc)</div><div class='add'>+		__blk_mq_sched_assign_ioc(q, rq, bio, ioc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct request *blk_mq_sched_get_request(struct request_queue *q,</div><div class='add'>+					 struct bio *bio,</div><div class='add'>+					 unsigned int op,</div><div class='add'>+					 struct blk_mq_alloc_data *data)</div><div class='add'>+{</div><div class='add'>+	struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+	struct request *rq;</div><div class='add'>+</div><div class='add'>+	blk_queue_enter_live(q);</div><div class='add'>+	data-&gt;q = q;</div><div class='add'>+	if (likely(!data-&gt;ctx))</div><div class='add'>+		data-&gt;ctx = blk_mq_get_ctx(q);</div><div class='add'>+	if (likely(!data-&gt;hctx))</div><div class='add'>+		data-&gt;hctx = blk_mq_map_queue(q, data-&gt;ctx-&gt;cpu);</div><div class='add'>+</div><div class='add'>+	if (e) {</div><div class='add'>+		data-&gt;flags |= BLK_MQ_REQ_INTERNAL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Flush requests are special and go directly to the</div><div class='add'>+		 * dispatch list.</div><div class='add'>+		 */</div><div class='add'>+		if (!op_is_flush(op) &amp;&amp; e-&gt;type-&gt;ops.mq.get_request) {</div><div class='add'>+			rq = e-&gt;type-&gt;ops.mq.get_request(q, op, data);</div><div class='add'>+			if (rq)</div><div class='add'>+				rq-&gt;rq_flags |= RQF_QUEUED;</div><div class='add'>+		} else</div><div class='add'>+			rq = __blk_mq_alloc_request(data, op);</div><div class='add'>+	} else {</div><div class='add'>+		rq = __blk_mq_alloc_request(data, op);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rq) {</div><div class='add'>+		if (!op_is_flush(op)) {</div><div class='add'>+			rq-&gt;elv.icq = NULL;</div><div class='add'>+			if (e &amp;&amp; e-&gt;type-&gt;icq_cache)</div><div class='add'>+				blk_mq_sched_assign_ioc(q, rq, bio);</div><div class='add'>+		}</div><div class='add'>+		data-&gt;hctx-&gt;queued++;</div><div class='add'>+		return rq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	blk_queue_exit(q);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_put_request(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = rq-&gt;q;</div><div class='add'>+	struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+</div><div class='add'>+	if (rq-&gt;rq_flags &amp; RQF_ELVPRIV) {</div><div class='add'>+		blk_mq_sched_put_rq_priv(rq-&gt;q, rq);</div><div class='add'>+		if (rq-&gt;elv.icq) {</div><div class='add'>+			put_io_context(rq-&gt;elv.icq-&gt;ioc);</div><div class='add'>+			rq-&gt;elv.icq = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((rq-&gt;rq_flags &amp; RQF_QUEUED) &amp;&amp; e &amp;&amp; e-&gt;type-&gt;ops.mq.put_request)</div><div class='add'>+		e-&gt;type-&gt;ops.mq.put_request(rq);</div><div class='add'>+	else</div><div class='add'>+		blk_mq_finish_request(rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	struct elevator_queue *e = hctx-&gt;queue-&gt;elevator;</div><div class='add'>+	const bool has_sched_dispatch = e &amp;&amp; e-&gt;type-&gt;ops.mq.dispatch_request;</div><div class='add'>+	bool did_work = false;</div><div class='add'>+	LIST_HEAD(rq_list);</div><div class='add'>+</div><div class='add'>+	if (unlikely(blk_mq_hctx_stopped(hctx)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hctx-&gt;run++;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we have previous entries on our dispatch list, grab them first for</div><div class='add'>+	 * more fair dispatch.</div><div class='add'>+	 */</div><div class='add'>+	if (!list_empty_careful(&amp;hctx-&gt;dispatch)) {</div><div class='add'>+		spin_lock(&amp;hctx-&gt;lock);</div><div class='add'>+		if (!list_empty(&amp;hctx-&gt;dispatch))</div><div class='add'>+			list_splice_init(&amp;hctx-&gt;dispatch, &amp;rq_list);</div><div class='add'>+		spin_unlock(&amp;hctx-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only ask the scheduler for requests, if we didn't have residual</div><div class='add'>+	 * requests from the dispatch list. This is to avoid the case where</div><div class='add'>+	 * we only ever dispatch a fraction of the requests available because</div><div class='add'>+	 * of low device queue depth. Once we pull requests out of the IO</div><div class='add'>+	 * scheduler, we can no longer merge or sort them. So it's best to</div><div class='add'>+	 * leave them there for as long as we can. Mark the hw queue as</div><div class='add'>+	 * needing a restart in that case.</div><div class='add'>+	 */</div><div class='add'>+	if (!list_empty(&amp;rq_list)) {</div><div class='add'>+		blk_mq_sched_mark_restart_hctx(hctx);</div><div class='add'>+		did_work = blk_mq_dispatch_rq_list(hctx, &amp;rq_list);</div><div class='add'>+	} else if (!has_sched_dispatch) {</div><div class='add'>+		blk_mq_flush_busy_ctxs(hctx, &amp;rq_list);</div><div class='add'>+		blk_mq_dispatch_rq_list(hctx, &amp;rq_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We want to dispatch from the scheduler if we had no work left</div><div class='add'>+	 * on the dispatch list, OR if we did have work but weren't able</div><div class='add'>+	 * to make progress.</div><div class='add'>+	 */</div><div class='add'>+	if (!did_work &amp;&amp; has_sched_dispatch) {</div><div class='add'>+		do {</div><div class='add'>+			struct request *rq;</div><div class='add'>+</div><div class='add'>+			rq = e-&gt;type-&gt;ops.mq.dispatch_request(hctx);</div><div class='add'>+			if (!rq)</div><div class='add'>+				break;</div><div class='add'>+			list_add(&amp;rq-&gt;queuelist, &amp;rq_list);</div><div class='add'>+		} while (blk_mq_dispatch_rq_list(hctx, &amp;rq_list));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_move_to_dispatch(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+				   struct list_head *rq_list,</div><div class='add'>+				   struct request *(*get_rq)(struct blk_mq_hw_ctx *))</div><div class='add'>+{</div><div class='add'>+	do {</div><div class='add'>+		struct request *rq;</div><div class='add'>+</div><div class='add'>+		rq = get_rq(hctx);</div><div class='add'>+		if (!rq)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;rq-&gt;queuelist, rq_list);</div><div class='add'>+	} while (1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_sched_move_to_dispatch);</div><div class='add'>+</div><div class='add'>+bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,</div><div class='add'>+			    struct request **merged_request)</div><div class='add'>+{</div><div class='add'>+	struct request *rq;</div><div class='add'>+</div><div class='add'>+	switch (elv_merge(q, &amp;rq, bio)) {</div><div class='add'>+	case ELEVATOR_BACK_MERGE:</div><div class='add'>+		if (!blk_mq_sched_allow_merge(q, rq, bio))</div><div class='add'>+			return false;</div><div class='add'>+		if (!bio_attempt_back_merge(q, rq, bio))</div><div class='add'>+			return false;</div><div class='add'>+		*merged_request = attempt_back_merge(q, rq);</div><div class='add'>+		if (!*merged_request)</div><div class='add'>+			elv_merged_request(q, rq, ELEVATOR_BACK_MERGE);</div><div class='add'>+		return true;</div><div class='add'>+	case ELEVATOR_FRONT_MERGE:</div><div class='add'>+		if (!blk_mq_sched_allow_merge(q, rq, bio))</div><div class='add'>+			return false;</div><div class='add'>+		if (!bio_attempt_front_merge(q, rq, bio))</div><div class='add'>+			return false;</div><div class='add'>+		*merged_request = attempt_front_merge(q, rq);</div><div class='add'>+		if (!*merged_request)</div><div class='add'>+			elv_merged_request(q, rq, ELEVATOR_FRONT_MERGE);</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_sched_try_merge);</div><div class='add'>+</div><div class='add'>+bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+</div><div class='add'>+	if (e-&gt;type-&gt;ops.mq.bio_merge) {</div><div class='add'>+		struct blk_mq_ctx *ctx = blk_mq_get_ctx(q);</div><div class='add'>+		struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, ctx-&gt;cpu);</div><div class='add'>+</div><div class='add'>+		blk_mq_put_ctx(ctx);</div><div class='add'>+		return e-&gt;type-&gt;ops.mq.bio_merge(hctx, bio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	return rq_mergeable(rq) &amp;&amp; elv_attempt_insert_merge(q, rq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_sched_try_insert_merge);</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_request_inserted(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	trace_block_rq_insert(rq-&gt;q, rq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_sched_request_inserted);</div><div class='add'>+</div><div class='add'>+static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+				       struct request *rq)</div><div class='add'>+{</div><div class='add'>+	if (rq-&gt;tag == -1) {</div><div class='add'>+		rq-&gt;rq_flags |= RQF_SORTED;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we already have a real request tag, send directly to</div><div class='add'>+	 * the dispatch list.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;hctx-&gt;lock);</div><div class='add'>+	list_add(&amp;rq-&gt;queuelist, &amp;hctx-&gt;dispatch);</div><div class='add'>+	spin_unlock(&amp;hctx-&gt;lock);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void blk_mq_sched_restart_hctx(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(BLK_MQ_S_SCHED_RESTART, &amp;hctx-&gt;state)) {</div><div class='add'>+		clear_bit(BLK_MQ_S_SCHED_RESTART, &amp;hctx-&gt;state);</div><div class='add'>+		if (blk_mq_hctx_has_pending(hctx))</div><div class='add'>+			blk_mq_run_hw_queue(hctx, true);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_restart_queues(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (test_bit(QUEUE_FLAG_RESTART, &amp;q-&gt;queue_flags)) {</div><div class='add'>+		if (test_and_clear_bit(QUEUE_FLAG_RESTART, &amp;q-&gt;queue_flags)) {</div><div class='add'>+			queue_for_each_hw_ctx(q, hctx, i)</div><div class='add'>+				blk_mq_sched_restart_hctx(hctx);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		blk_mq_sched_restart_hctx(hctx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add flush/fua to the queue. If we fail getting a driver tag, then</div><div class='add'>+ * punt to the requeue list. Requeue will re-invoke us from a context</div><div class='add'>+ * that's safe to block from.</div><div class='add'>+ */</div><div class='add'>+static void blk_mq_sched_insert_flush(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+				      struct request *rq, bool can_block)</div><div class='add'>+{</div><div class='add'>+	if (blk_mq_get_driver_tag(rq, &amp;hctx, can_block)) {</div><div class='add'>+		blk_insert_flush(rq);</div><div class='add'>+		blk_mq_run_hw_queue(hctx, true);</div><div class='add'>+	} else</div><div class='add'>+		blk_mq_add_to_requeue_list(rq, false, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_insert_request(struct request *rq, bool at_head,</div><div class='add'>+				 bool run_queue, bool async, bool can_block)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = rq-&gt;q;</div><div class='add'>+	struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+	struct blk_mq_ctx *ctx = rq-&gt;mq_ctx;</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, ctx-&gt;cpu);</div><div class='add'>+</div><div class='add'>+	if (rq-&gt;tag == -1 &amp;&amp; op_is_flush(rq-&gt;cmd_flags)) {</div><div class='add'>+		blk_mq_sched_insert_flush(hctx, rq, can_block);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (e &amp;&amp; blk_mq_sched_bypass_insert(hctx, rq))</div><div class='add'>+		goto run;</div><div class='add'>+</div><div class='add'>+	if (e &amp;&amp; e-&gt;type-&gt;ops.mq.insert_requests) {</div><div class='add'>+		LIST_HEAD(list);</div><div class='add'>+</div><div class='add'>+		list_add(&amp;rq-&gt;queuelist, &amp;list);</div><div class='add'>+		e-&gt;type-&gt;ops.mq.insert_requests(hctx, &amp;list, at_head);</div><div class='add'>+	} else {</div><div class='add'>+		spin_lock(&amp;ctx-&gt;lock);</div><div class='add'>+		__blk_mq_insert_request(hctx, rq, at_head);</div><div class='add'>+		spin_unlock(&amp;ctx-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+run:</div><div class='add'>+	if (run_queue)</div><div class='add'>+		blk_mq_run_hw_queue(hctx, async);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_insert_requests(struct request_queue *q,</div><div class='add'>+				  struct blk_mq_ctx *ctx,</div><div class='add'>+				  struct list_head *list, bool run_queue_async)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, ctx-&gt;cpu);</div><div class='add'>+	struct elevator_queue *e = hctx-&gt;queue-&gt;elevator;</div><div class='add'>+</div><div class='add'>+	if (e) {</div><div class='add'>+		struct request *rq, *next;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We bypass requests that already have a driver tag assigned,</div><div class='add'>+		 * which should only be flushes. Flushes are only ever inserted</div><div class='add'>+		 * as single requests, so we shouldn't ever hit the</div><div class='add'>+		 * WARN_ON_ONCE() below (but let's handle it just in case).</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry_safe(rq, next, list, queuelist) {</div><div class='add'>+			if (WARN_ON_ONCE(rq-&gt;tag != -1)) {</div><div class='add'>+				list_del_init(&amp;rq-&gt;queuelist);</div><div class='add'>+				blk_mq_sched_bypass_insert(hctx, rq);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (e &amp;&amp; e-&gt;type-&gt;ops.mq.insert_requests)</div><div class='add'>+		e-&gt;type-&gt;ops.mq.insert_requests(hctx, list, false);</div><div class='add'>+	else</div><div class='add'>+		blk_mq_insert_requests(hctx, ctx, list);</div><div class='add'>+</div><div class='add'>+	blk_mq_run_hw_queue(hctx, run_queue_async);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void blk_mq_sched_free_tags(struct blk_mq_tag_set *set,</div><div class='add'>+				   struct blk_mq_hw_ctx *hctx,</div><div class='add'>+				   unsigned int hctx_idx)</div><div class='add'>+{</div><div class='add'>+	if (hctx-&gt;sched_tags) {</div><div class='add'>+		blk_mq_free_rqs(set, hctx-&gt;sched_tags, hctx_idx);</div><div class='add'>+		blk_mq_free_rq_map(hctx-&gt;sched_tags);</div><div class='add'>+		hctx-&gt;sched_tags = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int blk_mq_sched_setup(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_tag_set *set = q-&gt;tag_set;</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Default to 256, since we don't split into sync/async like the</div><div class='add'>+	 * old code did. Additionally, this is a per-hw queue depth.</div><div class='add'>+	 */</div><div class='add'>+	q-&gt;nr_requests = 2 * BLKDEV_MAX_RQ;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We're switching to using an IO scheduler, so setup the hctx</div><div class='add'>+	 * scheduler tags and switch the request map from the regular</div><div class='add'>+	 * tags to scheduler tags. First allocate what we need, so we</div><div class='add'>+	 * can safely fail and fallback, if needed.</div><div class='add'>+	 */</div><div class='add'>+	ret = 0;</div><div class='add'>+	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='add'>+		hctx-&gt;sched_tags = blk_mq_alloc_rq_map(set, i,</div><div class='add'>+				q-&gt;nr_requests, set-&gt;reserved_tags);</div><div class='add'>+		if (!hctx-&gt;sched_tags) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = blk_mq_alloc_rqs(set, hctx-&gt;sched_tags, i, q-&gt;nr_requests);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we failed, free what we did allocate</div><div class='add'>+	 */</div><div class='add'>+	if (ret) {</div><div class='add'>+		queue_for_each_hw_ctx(q, hctx, i) {</div><div class='add'>+			if (!hctx-&gt;sched_tags)</div><div class='add'>+				continue;</div><div class='add'>+			blk_mq_sched_free_tags(set, hctx, i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_teardown(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_tag_set *set = q-&gt;tag_set;</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	queue_for_each_hw_ctx(q, hctx, i)</div><div class='add'>+		blk_mq_sched_free_tags(set, hctx, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int blk_mq_sched_init(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;q-&gt;sysfs_lock);</div><div class='add'>+	ret = elevator_init(q, NULL);</div><div class='add'>+	mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h<br/>new file mode 100644<br/>index 000000000000..a75b16b123f7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/blk-mq-sched.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-sched.h</a></div><div class='hunk'>@@ -0,0 +1,153 @@</div><div class='add'>+#ifndef BLK_MQ_SCHED_H</div><div class='add'>+#define BLK_MQ_SCHED_H</div><div class='add'>+</div><div class='add'>+#include "blk-mq.h"</div><div class='add'>+#include "blk-mq-tag.h"</div><div class='add'>+</div><div class='add'>+int blk_mq_sched_init_hctx_data(struct request_queue *q, size_t size,</div><div class='add'>+				int (*init)(struct blk_mq_hw_ctx *),</div><div class='add'>+				void (*exit)(struct blk_mq_hw_ctx *));</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_free_hctx_data(struct request_queue *q,</div><div class='add'>+				 void (*exit)(struct blk_mq_hw_ctx *));</div><div class='add'>+</div><div class='add'>+struct request *blk_mq_sched_get_request(struct request_queue *q, struct bio *bio, unsigned int op, struct blk_mq_alloc_data *data);</div><div class='add'>+void blk_mq_sched_put_request(struct request *rq);</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_request_inserted(struct request *rq);</div><div class='add'>+bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,</div><div class='add'>+				struct request **merged_request);</div><div class='add'>+bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio);</div><div class='add'>+bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq);</div><div class='add'>+void blk_mq_sched_restart_queues(struct blk_mq_hw_ctx *hctx);</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_insert_request(struct request *rq, bool at_head,</div><div class='add'>+				 bool run_queue, bool async, bool can_block);</div><div class='add'>+void blk_mq_sched_insert_requests(struct request_queue *q,</div><div class='add'>+				  struct blk_mq_ctx *ctx,</div><div class='add'>+				  struct list_head *list, bool run_queue_async);</div><div class='add'>+</div><div class='add'>+void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx);</div><div class='add'>+void blk_mq_sched_move_to_dispatch(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+			struct list_head *rq_list,</div><div class='add'>+			struct request *(*get_rq)(struct blk_mq_hw_ctx *));</div><div class='add'>+</div><div class='add'>+int blk_mq_sched_setup(struct request_queue *q);</div><div class='add'>+void blk_mq_sched_teardown(struct request_queue *q);</div><div class='add'>+</div><div class='add'>+int blk_mq_sched_init(struct request_queue *q);</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+</div><div class='add'>+	if (!e || blk_queue_nomerges(q) || !bio_mergeable(bio))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return __blk_mq_sched_bio_merge(q, bio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int blk_mq_sched_get_rq_priv(struct request_queue *q,</div><div class='add'>+					   struct request *rq,</div><div class='add'>+					   struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+</div><div class='add'>+	if (e &amp;&amp; e-&gt;type-&gt;ops.mq.get_rq_priv)</div><div class='add'>+		return e-&gt;type-&gt;ops.mq.get_rq_priv(q, rq, bio);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void blk_mq_sched_put_rq_priv(struct request_queue *q,</div><div class='add'>+					    struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+</div><div class='add'>+	if (e &amp;&amp; e-&gt;type-&gt;ops.mq.put_rq_priv)</div><div class='add'>+		e-&gt;type-&gt;ops.mq.put_rq_priv(q, rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+blk_mq_sched_allow_merge(struct request_queue *q, struct request *rq,</div><div class='add'>+			 struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+</div><div class='add'>+	if (e &amp;&amp; e-&gt;type-&gt;ops.mq.allow_merge)</div><div class='add'>+		return e-&gt;type-&gt;ops.mq.allow_merge(q, rq, bio);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+blk_mq_sched_completed_request(struct blk_mq_hw_ctx *hctx, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct elevator_queue *e = hctx-&gt;queue-&gt;elevator;</div><div class='add'>+</div><div class='add'>+	if (e &amp;&amp; e-&gt;type-&gt;ops.mq.completed_request)</div><div class='add'>+		e-&gt;type-&gt;ops.mq.completed_request(hctx, rq);</div><div class='add'>+</div><div class='add'>+	BUG_ON(rq-&gt;internal_tag == -1);</div><div class='add'>+</div><div class='add'>+	blk_mq_put_tag(hctx, hctx-&gt;sched_tags, rq-&gt;mq_ctx, rq-&gt;internal_tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void blk_mq_sched_started_request(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = rq-&gt;q;</div><div class='add'>+	struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+</div><div class='add'>+	if (e &amp;&amp; e-&gt;type-&gt;ops.mq.started_request)</div><div class='add'>+		e-&gt;type-&gt;ops.mq.started_request(rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void blk_mq_sched_requeue_request(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = rq-&gt;q;</div><div class='add'>+	struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+</div><div class='add'>+	if (e &amp;&amp; e-&gt;type-&gt;ops.mq.requeue_request)</div><div class='add'>+		e-&gt;type-&gt;ops.mq.requeue_request(rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool blk_mq_sched_has_work(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	struct elevator_queue *e = hctx-&gt;queue-&gt;elevator;</div><div class='add'>+</div><div class='add'>+	if (e &amp;&amp; e-&gt;type-&gt;ops.mq.has_work)</div><div class='add'>+		return e-&gt;type-&gt;ops.mq.has_work(hctx);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mark a hardware queue as needing a restart.</div><div class='add'>+ */</div><div class='add'>+static inline void blk_mq_sched_mark_restart_hctx(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	if (!test_bit(BLK_MQ_S_SCHED_RESTART, &amp;hctx-&gt;state))</div><div class='add'>+		set_bit(BLK_MQ_S_SCHED_RESTART, &amp;hctx-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mark a hardware queue and the request queue it belongs to as needing a</div><div class='add'>+ * restart.</div><div class='add'>+ */</div><div class='add'>+static inline void blk_mq_sched_mark_restart_queue(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(BLK_MQ_S_SCHED_RESTART, &amp;hctx-&gt;state))</div><div class='add'>+		set_bit(BLK_MQ_S_SCHED_RESTART, &amp;hctx-&gt;state);</div><div class='add'>+	if (!test_bit(QUEUE_FLAG_RESTART, &amp;q-&gt;queue_flags))</div><div class='add'>+		set_bit(QUEUE_FLAG_RESTART, &amp;q-&gt;queue_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool blk_mq_sched_needs_restart(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	return test_bit(BLK_MQ_S_SCHED_RESTART, &amp;hctx-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c<br/>index 01fb455d3377..295e69670c39 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-mq-sysfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-mq-sysfs.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-mq-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-sysfs.c</a></div><div class='hunk'>@@ -122,123 +122,16 @@ static ssize_t blk_mq_hw_sysfs_store(struct kobject *kobj,</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t blk_mq_sysfs_dispatched_show(struct blk_mq_ctx *ctx, char *page)</div><div class='del'>-{</div><div class='del'>-	return sprintf(page, "%lu %lu\n", ctx-&gt;rq_dispatched[1],</div><div class='del'>-				ctx-&gt;rq_dispatched[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t blk_mq_sysfs_merged_show(struct blk_mq_ctx *ctx, char *page)</div><div class='del'>-{</div><div class='del'>-	return sprintf(page, "%lu\n", ctx-&gt;rq_merged);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t blk_mq_sysfs_completed_show(struct blk_mq_ctx *ctx, char *page)</div><div class='del'>-{</div><div class='del'>-	return sprintf(page, "%lu %lu\n", ctx-&gt;rq_completed[1],</div><div class='del'>-				ctx-&gt;rq_completed[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t sysfs_list_show(char *page, struct list_head *list, char *msg)</div><div class='del'>-{</div><div class='del'>-	struct request *rq;</div><div class='del'>-	int len = snprintf(page, PAGE_SIZE - 1, "%s:\n", msg);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(rq, list, queuelist) {</div><div class='del'>-		const int rq_len = 2 * sizeof(rq) + 2;</div><div class='del'>-</div><div class='del'>-		/* if the output will be truncated */</div><div class='del'>-		if (PAGE_SIZE - 1 &lt; len + rq_len) {</div><div class='del'>-			/* backspacing if it can't hold '\t...\n' */</div><div class='del'>-			if (PAGE_SIZE - 1 &lt; len + 5)</div><div class='del'>-				len -= rq_len;</div><div class='del'>-			len += snprintf(page + len, PAGE_SIZE - 1 - len,</div><div class='del'>-					"\t...\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		len += snprintf(page + len, PAGE_SIZE - 1 - len,</div><div class='del'>-				"\t%p\n", rq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t blk_mq_sysfs_rq_list_show(struct blk_mq_ctx *ctx, char *page)</div><div class='del'>-{</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ctx-&gt;lock);</div><div class='del'>-	ret = sysfs_list_show(page, &amp;ctx-&gt;rq_list, "CTX pending");</div><div class='del'>-	spin_unlock(&amp;ctx-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t blk_mq_hw_sysfs_poll_show(struct blk_mq_hw_ctx *hctx, char *page)</div><div class='del'>-{</div><div class='del'>-	return sprintf(page, "considered=%lu, invoked=%lu, success=%lu\n",</div><div class='del'>-		       hctx-&gt;poll_considered, hctx-&gt;poll_invoked,</div><div class='del'>-		       hctx-&gt;poll_success);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t blk_mq_hw_sysfs_poll_store(struct blk_mq_hw_ctx *hctx,</div><div class='del'>-					  const char *page, size_t size)</div><div class='del'>-{</div><div class='del'>-	hctx-&gt;poll_considered = hctx-&gt;poll_invoked = hctx-&gt;poll_success = 0;</div><div class='del'>-</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t blk_mq_hw_sysfs_queued_show(struct blk_mq_hw_ctx *hctx,</div><div class='del'>-					   char *page)</div><div class='del'>-{</div><div class='del'>-	return sprintf(page, "%lu\n", hctx-&gt;queued);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t blk_mq_hw_sysfs_run_show(struct blk_mq_hw_ctx *hctx, char *page)</div><div class='del'>-{</div><div class='del'>-	return sprintf(page, "%lu\n", hctx-&gt;run);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t blk_mq_hw_sysfs_dispatched_show(struct blk_mq_hw_ctx *hctx,</div><div class='del'>-					       char *page)</div><div class='del'>-{</div><div class='del'>-	char *start_page = page;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	page += sprintf(page, "%8u\t%lu\n", 0U, hctx-&gt;dispatched[0]);</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; BLK_MQ_MAX_DISPATCH_ORDER - 1; i++) {</div><div class='del'>-		unsigned int d = 1U &lt;&lt; (i - 1);</div><div class='del'>-</div><div class='del'>-		page += sprintf(page, "%8u\t%lu\n", d, hctx-&gt;dispatched[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	page += sprintf(page, "%8u+\t%lu\n", 1U &lt;&lt; (i - 1),</div><div class='del'>-						hctx-&gt;dispatched[i]);</div><div class='del'>-	return page - start_page;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t blk_mq_hw_sysfs_rq_list_show(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+static ssize_t blk_mq_hw_sysfs_nr_tags_show(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 					    char *page)</div><div class='ctx'> {</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;hctx-&gt;lock);</div><div class='del'>-	ret = sysfs_list_show(page, &amp;hctx-&gt;dispatch, "HCTX pending");</div><div class='del'>-	spin_unlock(&amp;hctx-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return sprintf(page, "%u\n", hctx-&gt;tags-&gt;nr_tags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t blk_mq_hw_sysfs_tags_show(struct blk_mq_hw_ctx *hctx, char *page)</div><div class='add'>+static ssize_t blk_mq_hw_sysfs_nr_reserved_tags_show(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+						     char *page)</div><div class='ctx'> {</div><div class='del'>-	return blk_mq_tag_sysfs_show(hctx-&gt;tags, page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t blk_mq_hw_sysfs_active_show(struct blk_mq_hw_ctx *hctx, char *page)</div><div class='del'>-{</div><div class='del'>-	return sprintf(page, "%u\n", atomic_read(&amp;hctx-&gt;nr_active));</div><div class='add'>+	return sprintf(page, "%u\n", hctx-&gt;tags-&gt;nr_reserved_tags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t blk_mq_hw_sysfs_cpus_show(struct blk_mq_hw_ctx *hctx, char *page)</div><div class='hunk'>@@ -259,74 +152,27 @@ static ssize_t blk_mq_hw_sysfs_cpus_show(struct blk_mq_hw_ctx *hctx, char *page)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct blk_mq_ctx_sysfs_entry blk_mq_sysfs_dispatched = {</div><div class='del'>-	.attr = {.name = "dispatched", .mode = S_IRUGO },</div><div class='del'>-	.show = blk_mq_sysfs_dispatched_show,</div><div class='del'>-};</div><div class='del'>-static struct blk_mq_ctx_sysfs_entry blk_mq_sysfs_merged = {</div><div class='del'>-	.attr = {.name = "merged", .mode = S_IRUGO },</div><div class='del'>-	.show = blk_mq_sysfs_merged_show,</div><div class='del'>-};</div><div class='del'>-static struct blk_mq_ctx_sysfs_entry blk_mq_sysfs_completed = {</div><div class='del'>-	.attr = {.name = "completed", .mode = S_IRUGO },</div><div class='del'>-	.show = blk_mq_sysfs_completed_show,</div><div class='del'>-};</div><div class='del'>-static struct blk_mq_ctx_sysfs_entry blk_mq_sysfs_rq_list = {</div><div class='del'>-	.attr = {.name = "rq_list", .mode = S_IRUGO },</div><div class='del'>-	.show = blk_mq_sysfs_rq_list_show,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct attribute *default_ctx_attrs[] = {</div><div class='del'>-	&amp;blk_mq_sysfs_dispatched.attr,</div><div class='del'>-	&amp;blk_mq_sysfs_merged.attr,</div><div class='del'>-	&amp;blk_mq_sysfs_completed.attr,</div><div class='del'>-	&amp;blk_mq_sysfs_rq_list.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_queued = {</div><div class='del'>-	.attr = {.name = "queued", .mode = S_IRUGO },</div><div class='del'>-	.show = blk_mq_hw_sysfs_queued_show,</div><div class='del'>-};</div><div class='del'>-static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_run = {</div><div class='del'>-	.attr = {.name = "run", .mode = S_IRUGO },</div><div class='del'>-	.show = blk_mq_hw_sysfs_run_show,</div><div class='del'>-};</div><div class='del'>-static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_dispatched = {</div><div class='del'>-	.attr = {.name = "dispatched", .mode = S_IRUGO },</div><div class='del'>-	.show = blk_mq_hw_sysfs_dispatched_show,</div><div class='add'>+static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_nr_tags = {</div><div class='add'>+	.attr = {.name = "nr_tags", .mode = S_IRUGO },</div><div class='add'>+	.show = blk_mq_hw_sysfs_nr_tags_show,</div><div class='ctx'> };</div><div class='del'>-static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_active = {</div><div class='del'>-	.attr = {.name = "active", .mode = S_IRUGO },</div><div class='del'>-	.show = blk_mq_hw_sysfs_active_show,</div><div class='del'>-};</div><div class='del'>-static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_pending = {</div><div class='del'>-	.attr = {.name = "pending", .mode = S_IRUGO },</div><div class='del'>-	.show = blk_mq_hw_sysfs_rq_list_show,</div><div class='del'>-};</div><div class='del'>-static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_tags = {</div><div class='del'>-	.attr = {.name = "tags", .mode = S_IRUGO },</div><div class='del'>-	.show = blk_mq_hw_sysfs_tags_show,</div><div class='add'>+static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_nr_reserved_tags = {</div><div class='add'>+	.attr = {.name = "nr_reserved_tags", .mode = S_IRUGO },</div><div class='add'>+	.show = blk_mq_hw_sysfs_nr_reserved_tags_show,</div><div class='ctx'> };</div><div class='ctx'> static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_cpus = {</div><div class='ctx'> 	.attr = {.name = "cpu_list", .mode = S_IRUGO },</div><div class='ctx'> 	.show = blk_mq_hw_sysfs_cpus_show,</div><div class='ctx'> };</div><div class='del'>-static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_poll = {</div><div class='del'>-	.attr = {.name = "io_poll", .mode = S_IWUSR | S_IRUGO },</div><div class='del'>-	.show = blk_mq_hw_sysfs_poll_show,</div><div class='del'>-	.store = blk_mq_hw_sysfs_poll_store,</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static struct attribute *default_hw_ctx_attrs[] = {</div><div class='del'>-	&amp;blk_mq_hw_sysfs_queued.attr,</div><div class='del'>-	&amp;blk_mq_hw_sysfs_run.attr,</div><div class='del'>-	&amp;blk_mq_hw_sysfs_dispatched.attr,</div><div class='del'>-	&amp;blk_mq_hw_sysfs_pending.attr,</div><div class='del'>-	&amp;blk_mq_hw_sysfs_tags.attr,</div><div class='add'>+	&amp;blk_mq_hw_sysfs_nr_tags.attr,</div><div class='add'>+	&amp;blk_mq_hw_sysfs_nr_reserved_tags.attr,</div><div class='ctx'> 	&amp;blk_mq_hw_sysfs_cpus.attr,</div><div class='del'>-	&amp;blk_mq_hw_sysfs_active.attr,</div><div class='del'>-	&amp;blk_mq_hw_sysfs_poll.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -408,6 +254,8 @@ static void __blk_mq_unregister_dev(struct device *dev, struct request_queue *q)</div><div class='ctx'> 		kobject_put(&amp;hctx-&gt;kobj);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	blk_mq_debugfs_unregister_hctxs(q);</div><div class='add'>+</div><div class='ctx'> 	kobject_uevent(&amp;q-&gt;mq_kobj, KOBJ_REMOVE);</div><div class='ctx'> 	kobject_del(&amp;q-&gt;mq_kobj);</div><div class='ctx'> 	kobject_put(&amp;q-&gt;mq_kobj);</div><div class='hunk'>@@ -457,6 +305,8 @@ int blk_mq_register_dev(struct device *dev, struct request_queue *q)</div><div class='ctx'> </div><div class='ctx'> 	kobject_uevent(&amp;q-&gt;mq_kobj, KOBJ_ADD);</div><div class='ctx'> </div><div class='add'>+	blk_mq_debugfs_register(q, kobject_name(&amp;dev-&gt;kobj));</div><div class='add'>+</div><div class='ctx'> 	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='ctx'> 		ret = blk_mq_register_hctx(hctx);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -482,6 +332,8 @@ void blk_mq_sysfs_unregister(struct request_queue *q)</div><div class='ctx'> 	if (!q-&gt;mq_sysfs_init_done)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	blk_mq_debugfs_unregister_hctxs(q);</div><div class='add'>+</div><div class='ctx'> 	queue_for_each_hw_ctx(q, hctx, i)</div><div class='ctx'> 		blk_mq_unregister_hctx(hctx);</div><div class='ctx'> }</div><div class='hunk'>@@ -494,6 +346,8 @@ int blk_mq_sysfs_register(struct request_queue *q)</div><div class='ctx'> 	if (!q-&gt;mq_sysfs_init_done)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	blk_mq_debugfs_register_hctxs(q);</div><div class='add'>+</div><div class='ctx'> 	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='ctx'> 		ret = blk_mq_register_hctx(hctx);</div><div class='ctx'> 		if (ret)</div><div class='head'>diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c<br/>index dcf5ce3ba4bf..e48bc2c72615 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-mq-tag.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-mq-tag.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-mq-tag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-tag.c</a></div><div class='hunk'>@@ -90,114 +90,98 @@ static inline bool hctx_may_queue(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	return atomic_read(&amp;hctx-&gt;nr_active) &lt; depth;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __bt_get(struct blk_mq_hw_ctx *hctx, struct sbitmap_queue *bt)</div><div class='add'>+static int __blk_mq_get_tag(struct blk_mq_alloc_data *data,</div><div class='add'>+			    struct sbitmap_queue *bt)</div><div class='ctx'> {</div><div class='del'>-	if (!hctx_may_queue(hctx, bt))</div><div class='add'>+	if (!(data-&gt;flags &amp; BLK_MQ_REQ_INTERNAL) &amp;&amp;</div><div class='add'>+	    !hctx_may_queue(data-&gt;hctx, bt))</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	return __sbitmap_queue_get(bt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bt_get(struct blk_mq_alloc_data *data, struct sbitmap_queue *bt,</div><div class='del'>-		  struct blk_mq_hw_ctx *hctx, struct blk_mq_tags *tags)</div><div class='add'>+unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data)</div><div class='ctx'> {</div><div class='add'>+	struct blk_mq_tags *tags = blk_mq_tags_from_data(data);</div><div class='add'>+	struct sbitmap_queue *bt;</div><div class='ctx'> 	struct sbq_wait_state *ws;</div><div class='ctx'> 	DEFINE_WAIT(wait);</div><div class='add'>+	unsigned int tag_offset;</div><div class='add'>+	bool drop_ctx;</div><div class='ctx'> 	int tag;</div><div class='ctx'> </div><div class='del'>-	tag = __bt_get(hctx, bt);</div><div class='add'>+	if (data-&gt;flags &amp; BLK_MQ_REQ_RESERVED) {</div><div class='add'>+		if (unlikely(!tags-&gt;nr_reserved_tags)) {</div><div class='add'>+			WARN_ON_ONCE(1);</div><div class='add'>+			return BLK_MQ_TAG_FAIL;</div><div class='add'>+		}</div><div class='add'>+		bt = &amp;tags-&gt;breserved_tags;</div><div class='add'>+		tag_offset = 0;</div><div class='add'>+	} else {</div><div class='add'>+		bt = &amp;tags-&gt;bitmap_tags;</div><div class='add'>+		tag_offset = tags-&gt;nr_reserved_tags;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tag = __blk_mq_get_tag(data, bt);</div><div class='ctx'> 	if (tag != -1)</div><div class='del'>-		return tag;</div><div class='add'>+		goto found_tag;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;flags &amp; BLK_MQ_REQ_NOWAIT)</div><div class='del'>-		return -1;</div><div class='add'>+		return BLK_MQ_TAG_FAIL;</div><div class='ctx'> </div><div class='del'>-	ws = bt_wait_ptr(bt, hctx);</div><div class='add'>+	ws = bt_wait_ptr(bt, data-&gt;hctx);</div><div class='add'>+	drop_ctx = data-&gt;ctx == NULL;</div><div class='ctx'> 	do {</div><div class='ctx'> 		prepare_to_wait(&amp;ws-&gt;wait, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='ctx'> </div><div class='del'>-		tag = __bt_get(hctx, bt);</div><div class='add'>+		tag = __blk_mq_get_tag(data, bt);</div><div class='ctx'> 		if (tag != -1)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We're out of tags on this hardware queue, kick any</div><div class='ctx'> 		 * pending IO submits before going to sleep waiting for</div><div class='del'>-		 * some to complete. Note that hctx can be NULL here for</div><div class='del'>-		 * reserved tag allocation.</div><div class='add'>+		 * some to complete.</div><div class='ctx'> 		 */</div><div class='del'>-		if (hctx)</div><div class='del'>-			blk_mq_run_hw_queue(hctx, false);</div><div class='add'>+		blk_mq_run_hw_queue(data-&gt;hctx, false);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Retry tag allocation after running the hardware queue,</div><div class='ctx'> 		 * as running the queue may also have found completions.</div><div class='ctx'> 		 */</div><div class='del'>-		tag = __bt_get(hctx, bt);</div><div class='add'>+		tag = __blk_mq_get_tag(data, bt);</div><div class='ctx'> 		if (tag != -1)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		blk_mq_put_ctx(data-&gt;ctx);</div><div class='add'>+		if (data-&gt;ctx)</div><div class='add'>+			blk_mq_put_ctx(data-&gt;ctx);</div><div class='ctx'> </div><div class='ctx'> 		io_schedule();</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;ctx = blk_mq_get_ctx(data-&gt;q);</div><div class='ctx'> 		data-&gt;hctx = blk_mq_map_queue(data-&gt;q, data-&gt;ctx-&gt;cpu);</div><div class='del'>-		if (data-&gt;flags &amp; BLK_MQ_REQ_RESERVED) {</div><div class='del'>-			bt = &amp;data-&gt;hctx-&gt;tags-&gt;breserved_tags;</div><div class='del'>-		} else {</div><div class='del'>-			hctx = data-&gt;hctx;</div><div class='del'>-			bt = &amp;hctx-&gt;tags-&gt;bitmap_tags;</div><div class='del'>-		}</div><div class='add'>+		tags = blk_mq_tags_from_data(data);</div><div class='add'>+		if (data-&gt;flags &amp; BLK_MQ_REQ_RESERVED)</div><div class='add'>+			bt = &amp;tags-&gt;breserved_tags;</div><div class='add'>+		else</div><div class='add'>+			bt = &amp;tags-&gt;bitmap_tags;</div><div class='add'>+</div><div class='ctx'> 		finish_wait(&amp;ws-&gt;wait, &amp;wait);</div><div class='del'>-		ws = bt_wait_ptr(bt, hctx);</div><div class='add'>+		ws = bt_wait_ptr(bt, data-&gt;hctx);</div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='del'>-	finish_wait(&amp;ws-&gt;wait, &amp;wait);</div><div class='del'>-	return tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int __blk_mq_get_tag(struct blk_mq_alloc_data *data)</div><div class='del'>-{</div><div class='del'>-	int tag;</div><div class='del'>-</div><div class='del'>-	tag = bt_get(data, &amp;data-&gt;hctx-&gt;tags-&gt;bitmap_tags, data-&gt;hctx,</div><div class='del'>-		     data-&gt;hctx-&gt;tags);</div><div class='del'>-	if (tag &gt;= 0)</div><div class='del'>-		return tag + data-&gt;hctx-&gt;tags-&gt;nr_reserved_tags;</div><div class='del'>-</div><div class='del'>-	return BLK_MQ_TAG_FAIL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int __blk_mq_get_reserved_tag(struct blk_mq_alloc_data *data)</div><div class='del'>-{</div><div class='del'>-	int tag;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!data-&gt;hctx-&gt;tags-&gt;nr_reserved_tags)) {</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-		return BLK_MQ_TAG_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tag = bt_get(data, &amp;data-&gt;hctx-&gt;tags-&gt;breserved_tags, NULL,</div><div class='del'>-		     data-&gt;hctx-&gt;tags);</div><div class='del'>-	if (tag &lt; 0)</div><div class='del'>-		return BLK_MQ_TAG_FAIL;</div><div class='add'>+	if (drop_ctx &amp;&amp; data-&gt;ctx)</div><div class='add'>+		blk_mq_put_ctx(data-&gt;ctx);</div><div class='ctx'> </div><div class='del'>-	return tag;</div><div class='del'>-}</div><div class='add'>+	finish_wait(&amp;ws-&gt;wait, &amp;wait);</div><div class='ctx'> </div><div class='del'>-unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data)</div><div class='del'>-{</div><div class='del'>-	if (data-&gt;flags &amp; BLK_MQ_REQ_RESERVED)</div><div class='del'>-		return __blk_mq_get_reserved_tag(data);</div><div class='del'>-	return __blk_mq_get_tag(data);</div><div class='add'>+found_tag:</div><div class='add'>+	return tag + tag_offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void blk_mq_put_tag(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx,</div><div class='del'>-		    unsigned int tag)</div><div class='add'>+void blk_mq_put_tag(struct blk_mq_hw_ctx *hctx, struct blk_mq_tags *tags,</div><div class='add'>+		    struct blk_mq_ctx *ctx, unsigned int tag)</div><div class='ctx'> {</div><div class='del'>-	struct blk_mq_tags *tags = hctx-&gt;tags;</div><div class='del'>-</div><div class='del'>-	if (tag &gt;= tags-&gt;nr_reserved_tags) {</div><div class='add'>+	if (!blk_mq_tag_is_reserved(tags, tag)) {</div><div class='ctx'> 		const int real_tag = tag - tags-&gt;nr_reserved_tags;</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(real_tag &gt;= tags-&gt;nr_tags);</div><div class='hunk'>@@ -312,11 +296,11 @@ int blk_mq_reinit_tagset(struct blk_mq_tag_set *set)</div><div class='ctx'> 		struct blk_mq_tags *tags = set-&gt;tags[i];</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; tags-&gt;nr_tags; j++) {</div><div class='del'>-			if (!tags-&gt;rqs[j])</div><div class='add'>+			if (!tags-&gt;static_rqs[j])</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			ret = set-&gt;ops-&gt;reinit_request(set-&gt;driver_data,</div><div class='del'>-						tags-&gt;rqs[j]);</div><div class='add'>+						tags-&gt;static_rqs[j]);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -351,11 +335,6 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int bt_unused_tags(const struct sbitmap_queue *bt)</div><div class='del'>-{</div><div class='del'>-	return bt-&gt;sb.depth - sbitmap_weight(&amp;bt-&gt;sb);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int bt_alloc(struct sbitmap_queue *bt, unsigned int depth,</div><div class='ctx'> 		    bool round_robin, int node)</div><div class='ctx'> {</div><div class='hunk'>@@ -411,19 +390,56 @@ void blk_mq_free_tags(struct blk_mq_tags *tags)</div><div class='ctx'> 	kfree(tags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int blk_mq_tag_update_depth(struct blk_mq_tags *tags, unsigned int tdepth)</div><div class='add'>+int blk_mq_tag_update_depth(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+			    struct blk_mq_tags **tagsptr, unsigned int tdepth,</div><div class='add'>+			    bool can_grow)</div><div class='ctx'> {</div><div class='del'>-	tdepth -= tags-&gt;nr_reserved_tags;</div><div class='del'>-	if (tdepth &gt; tags-&gt;nr_tags)</div><div class='add'>+	struct blk_mq_tags *tags = *tagsptr;</div><div class='add'>+</div><div class='add'>+	if (tdepth &lt;= tags-&gt;nr_reserved_tags)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	tdepth -= tags-&gt;nr_reserved_tags;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * Don't need (or can't) update reserved tags here, they remain</div><div class='del'>-	 * static and should never need resizing.</div><div class='add'>+	 * If we are allowed to grow beyond the original size, allocate</div><div class='add'>+	 * a new set of tags before freeing the old one.</div><div class='ctx'> 	 */</div><div class='del'>-	sbitmap_queue_resize(&amp;tags-&gt;bitmap_tags, tdepth);</div><div class='add'>+	if (tdepth &gt; tags-&gt;nr_tags) {</div><div class='add'>+		struct blk_mq_tag_set *set = hctx-&gt;queue-&gt;tag_set;</div><div class='add'>+		struct blk_mq_tags *new;</div><div class='add'>+		bool ret;</div><div class='add'>+</div><div class='add'>+		if (!can_grow)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We need some sort of upper limit, set it high enough that</div><div class='add'>+		 * no valid use cases should require more.</div><div class='add'>+		 */</div><div class='add'>+		if (tdepth &gt; 16 * BLKDEV_MAX_RQ)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		new = blk_mq_alloc_rq_map(set, hctx-&gt;queue_num, tdepth, 0);</div><div class='add'>+		if (!new)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		ret = blk_mq_alloc_rqs(set, new, hctx-&gt;queue_num, tdepth);</div><div class='add'>+		if (ret) {</div><div class='add'>+			blk_mq_free_rq_map(new);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		blk_mq_free_rqs(set, *tagsptr, hctx-&gt;queue_num);</div><div class='add'>+		blk_mq_free_rq_map(*tagsptr);</div><div class='add'>+		*tagsptr = new;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Don't need (or can't) update reserved tags here, they</div><div class='add'>+		 * remain static and should never need resizing.</div><div class='add'>+		 */</div><div class='add'>+		sbitmap_queue_resize(&amp;tags-&gt;bitmap_tags, tdepth);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	blk_mq_tag_wakeup_all(tags, false);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -454,25 +470,3 @@ u32 blk_mq_unique_tag(struct request *rq)</div><div class='ctx'> 		(rq-&gt;tag &amp; BLK_MQ_UNIQUE_TAG_MASK);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_mq_unique_tag);</div><div class='del'>-</div><div class='del'>-ssize_t blk_mq_tag_sysfs_show(struct blk_mq_tags *tags, char *page)</div><div class='del'>-{</div><div class='del'>-	char *orig_page = page;</div><div class='del'>-	unsigned int free, res;</div><div class='del'>-</div><div class='del'>-	if (!tags)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	page += sprintf(page, "nr_tags=%u, reserved_tags=%u, "</div><div class='del'>-			"bits_per_word=%u\n",</div><div class='del'>-			tags-&gt;nr_tags, tags-&gt;nr_reserved_tags,</div><div class='del'>-			1U &lt;&lt; tags-&gt;bitmap_tags.sb.shift);</div><div class='del'>-</div><div class='del'>-	free = bt_unused_tags(&amp;tags-&gt;bitmap_tags);</div><div class='del'>-	res = bt_unused_tags(&amp;tags-&gt;breserved_tags);</div><div class='del'>-</div><div class='del'>-	page += sprintf(page, "nr_free=%u, nr_reserved=%u\n", free, res);</div><div class='del'>-	page += sprintf(page, "active_queues=%u\n", atomic_read(&amp;tags-&gt;active_queues));</div><div class='del'>-</div><div class='del'>-	return page - orig_page;</div><div class='del'>-}</div><div class='head'>diff --git a/block/blk-mq-tag.h b/block/blk-mq-tag.h<br/>index d1662734dc53..5cb51e53cc03 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-mq-tag.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-mq-tag.h</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-mq-tag.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-tag.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@ struct blk_mq_tags {</div><div class='ctx'> 	struct sbitmap_queue breserved_tags;</div><div class='ctx'> </div><div class='ctx'> 	struct request **rqs;</div><div class='add'>+	struct request **static_rqs;</div><div class='ctx'> 	struct list_head page_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -24,11 +25,12 @@ extern struct blk_mq_tags *blk_mq_init_tags(unsigned int nr_tags, unsigned int r</div><div class='ctx'> extern void blk_mq_free_tags(struct blk_mq_tags *tags);</div><div class='ctx'> </div><div class='ctx'> extern unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data);</div><div class='del'>-extern void blk_mq_put_tag(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx,</div><div class='del'>-			   unsigned int tag);</div><div class='add'>+extern void blk_mq_put_tag(struct blk_mq_hw_ctx *hctx, struct blk_mq_tags *tags,</div><div class='add'>+			   struct blk_mq_ctx *ctx, unsigned int tag);</div><div class='ctx'> extern bool blk_mq_has_free_tags(struct blk_mq_tags *tags);</div><div class='del'>-extern ssize_t blk_mq_tag_sysfs_show(struct blk_mq_tags *tags, char *page);</div><div class='del'>-extern int blk_mq_tag_update_depth(struct blk_mq_tags *tags, unsigned int depth);</div><div class='add'>+extern int blk_mq_tag_update_depth(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+					struct blk_mq_tags **tags,</div><div class='add'>+					unsigned int depth, bool can_grow);</div><div class='ctx'> extern void blk_mq_tag_wakeup_all(struct blk_mq_tags *tags, bool);</div><div class='ctx'> void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn,</div><div class='ctx'> 		void *priv);</div><div class='hunk'>@@ -83,4 +85,10 @@ static inline void blk_mq_tag_set_rq(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	hctx-&gt;tags-&gt;rqs[tag] = rq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool blk_mq_tag_is_reserved(struct blk_mq_tags *tags,</div><div class='add'>+					  unsigned int tag)</div><div class='add'>+{</div><div class='add'>+	return tag &lt; tags-&gt;nr_reserved_tags;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/block/blk-mq-virtio.c b/block/blk-mq-virtio.c<br/>new file mode 100644<br/>index 000000000000..c3afbca11299<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/blk-mq-virtio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq-virtio.c</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Christoph Hellwig.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/blk-mq.h&gt;</div><div class='add'>+#include &lt;linux/blk-mq-virtio.h&gt;</div><div class='add'>+#include &lt;linux/virtio_config.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "blk-mq.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blk_mq_virtio_map_queues - provide a default queue mapping for virtio device</div><div class='add'>+ * @set:	tagset to provide the mapping for</div><div class='add'>+ * @vdev:	virtio device associated with @set.</div><div class='add'>+ * @first_vec:	first interrupt vectors to use for queues (usually 0)</div><div class='add'>+ *</div><div class='add'>+ * This function assumes the virtio device @vdev has at least as many available</div><div class='add'>+ * interrupt vetors as @set has queues.  It will then queuery the vector</div><div class='add'>+ * corresponding to each queue for it's affinity mask and built queue mapping</div><div class='add'>+ * that maps a queue to the CPUs that have irq affinity for the corresponding</div><div class='add'>+ * vector.</div><div class='add'>+ */</div><div class='add'>+int blk_mq_virtio_map_queues(struct blk_mq_tag_set *set,</div><div class='add'>+		struct virtio_device *vdev, int first_vec)</div><div class='add'>+{</div><div class='add'>+	const struct cpumask *mask;</div><div class='add'>+	unsigned int queue, cpu;</div><div class='add'>+</div><div class='add'>+	if (!vdev-&gt;config-&gt;get_vq_affinity)</div><div class='add'>+		goto fallback;</div><div class='add'>+</div><div class='add'>+	for (queue = 0; queue &lt; set-&gt;nr_hw_queues; queue++) {</div><div class='add'>+		mask = vdev-&gt;config-&gt;get_vq_affinity(vdev, first_vec + queue);</div><div class='add'>+		if (!mask)</div><div class='add'>+			goto fallback;</div><div class='add'>+</div><div class='add'>+		for_each_cpu(cpu, mask)</div><div class='add'>+			set-&gt;mq_map[cpu] = queue;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fallback:</div><div class='add'>+	return blk_mq_map_queues(set);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_virtio_map_queues);</div><div class='head'>diff --git a/block/blk-mq.c b/block/blk-mq.c<br/>index f3d27a6dee09..b2fd175e84d7 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-mq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-mq.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-mq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq.c</a></div><div class='hunk'>@@ -20,6 +20,8 @@</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/sched/sysctl.h&gt;</div><div class='add'>+#include &lt;linux/sched/topology.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='hunk'>@@ -30,6 +32,9 @@</div><div class='ctx'> #include "blk.h"</div><div class='ctx'> #include "blk-mq.h"</div><div class='ctx'> #include "blk-mq-tag.h"</div><div class='add'>+#include "blk-stat.h"</div><div class='add'>+#include "blk-wbt.h"</div><div class='add'>+#include "blk-mq-sched.h"</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(all_q_mutex);</div><div class='ctx'> static LIST_HEAD(all_q_list);</div><div class='hunk'>@@ -37,9 +42,11 @@ static LIST_HEAD(all_q_list);</div><div class='ctx'> /*</div><div class='ctx'>  * Check if any of the ctx's have pending work in this hardware queue</div><div class='ctx'>  */</div><div class='del'>-static bool blk_mq_hctx_has_pending(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+bool blk_mq_hctx_has_pending(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> {</div><div class='del'>-	return sbitmap_any_bit_set(&amp;hctx-&gt;ctx_map);</div><div class='add'>+	return sbitmap_any_bit_set(&amp;hctx-&gt;ctx_map) ||</div><div class='add'>+			!list_empty_careful(&amp;hctx-&gt;dispatch) ||</div><div class='add'>+			blk_mq_sched_has_work(hctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -70,10 +77,20 @@ void blk_mq_freeze_queue_start(struct request_queue *q)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start);</div><div class='ctx'> </div><div class='del'>-static void blk_mq_freeze_queue_wait(struct request_queue *q)</div><div class='add'>+void blk_mq_freeze_queue_wait(struct request_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	wait_event(q-&gt;mq_freeze_wq, percpu_ref_is_zero(&amp;q-&gt;q_usage_counter));</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_wait);</div><div class='add'>+</div><div class='add'>+int blk_mq_freeze_queue_wait_timeout(struct request_queue *q,</div><div class='add'>+				     unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	return wait_event_timeout(q-&gt;mq_freeze_wq,</div><div class='add'>+					percpu_ref_is_zero(&amp;q-&gt;q_usage_counter),</div><div class='add'>+					timeout);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_wait_timeout);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Guarantee no request is in use, so we can change any data structure of</div><div class='hunk'>@@ -115,6 +132,33 @@ void blk_mq_unfreeze_queue(struct request_queue *q)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * blk_mq_quiesce_queue() - wait until all ongoing queue_rq calls have finished</div><div class='add'>+ * @q: request queue.</div><div class='add'>+ *</div><div class='add'>+ * Note: this function does not prevent that the struct request end_io()</div><div class='add'>+ * callback function is invoked. Additionally, it is not prevented that</div><div class='add'>+ * new queue_rq() calls occur unless the queue has been stopped first.</div><div class='add'>+ */</div><div class='add'>+void blk_mq_quiesce_queue(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	bool rcu = false;</div><div class='add'>+</div><div class='add'>+	blk_mq_stop_hw_queues(q);</div><div class='add'>+</div><div class='add'>+	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='add'>+		if (hctx-&gt;flags &amp; BLK_MQ_F_BLOCKING)</div><div class='add'>+			synchronize_srcu(&amp;hctx-&gt;queue_rq_srcu);</div><div class='add'>+		else</div><div class='add'>+			rcu = true;</div><div class='add'>+	}</div><div class='add'>+	if (rcu)</div><div class='add'>+		synchronize_rcu();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_quiesce_queue);</div><div class='add'>+</div><div class='ctx'> void blk_mq_wake_waiters(struct request_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	struct blk_mq_hw_ctx *hctx;</div><div class='hunk'>@@ -138,18 +182,16 @@ bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_mq_can_queue);</div><div class='ctx'> </div><div class='del'>-static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx,</div><div class='del'>-			       struct request *rq, int op,</div><div class='del'>-			       unsigned int op_flags)</div><div class='add'>+void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx,</div><div class='add'>+			struct request *rq, unsigned int op)</div><div class='ctx'> {</div><div class='del'>-	if (blk_queue_io_stat(q))</div><div class='del'>-		op_flags |= REQ_IO_STAT;</div><div class='del'>-</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rq-&gt;queuelist);</div><div class='ctx'> 	/* csd/requeue_work/fifo_time is initialized before use */</div><div class='ctx'> 	rq-&gt;q = q;</div><div class='ctx'> 	rq-&gt;mq_ctx = ctx;</div><div class='del'>-	req_set_op_attrs(rq, op, op_flags);</div><div class='add'>+	rq-&gt;cmd_flags = op;</div><div class='add'>+	if (blk_queue_io_stat(q))</div><div class='add'>+		rq-&gt;rq_flags |= RQF_IO_STAT;</div><div class='ctx'> 	/* do not touch atomic flags, it needs atomic ops against the timer */</div><div class='ctx'> 	rq-&gt;cpu = -1;</div><div class='ctx'> 	INIT_HLIST_NODE(&amp;rq-&gt;hash);</div><div class='hunk'>@@ -169,13 +211,7 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx,</div><div class='ctx'> 	rq-&gt;special = NULL;</div><div class='ctx'> 	/* tag was already set */</div><div class='ctx'> 	rq-&gt;errors = 0;</div><div class='del'>-</div><div class='del'>-	rq-&gt;cmd = rq-&gt;__cmd;</div><div class='del'>-</div><div class='ctx'> 	rq-&gt;extra_len = 0;</div><div class='del'>-	rq-&gt;sense_len = 0;</div><div class='del'>-	rq-&gt;resid_len = 0;</div><div class='del'>-	rq-&gt;sense = NULL;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rq-&gt;timeout_list);</div><div class='ctx'> 	rq-&gt;timeout = 0;</div><div class='hunk'>@@ -184,55 +220,61 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx,</div><div class='ctx'> 	rq-&gt;end_io_data = NULL;</div><div class='ctx'> 	rq-&gt;next_rq = NULL;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;rq_dispatched[rw_is_sync(op, op_flags)]++;</div><div class='add'>+	ctx-&gt;rq_dispatched[op_is_sync(op)]++;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_rq_ctx_init);</div><div class='ctx'> </div><div class='del'>-static struct request *</div><div class='del'>-__blk_mq_alloc_request(struct blk_mq_alloc_data *data, int op, int op_flags)</div><div class='add'>+struct request *__blk_mq_alloc_request(struct blk_mq_alloc_data *data,</div><div class='add'>+				       unsigned int op)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> 	unsigned int tag;</div><div class='ctx'> </div><div class='ctx'> 	tag = blk_mq_get_tag(data);</div><div class='ctx'> 	if (tag != BLK_MQ_TAG_FAIL) {</div><div class='del'>-		rq = data-&gt;hctx-&gt;tags-&gt;rqs[tag];</div><div class='add'>+		struct blk_mq_tags *tags = blk_mq_tags_from_data(data);</div><div class='ctx'> </div><div class='del'>-		if (blk_mq_tag_busy(data-&gt;hctx)) {</div><div class='del'>-			rq-&gt;cmd_flags = REQ_MQ_INFLIGHT;</div><div class='del'>-			atomic_inc(&amp;data-&gt;hctx-&gt;nr_active);</div><div class='add'>+		rq = tags-&gt;static_rqs[tag];</div><div class='add'>+</div><div class='add'>+		if (data-&gt;flags &amp; BLK_MQ_REQ_INTERNAL) {</div><div class='add'>+			rq-&gt;tag = -1;</div><div class='add'>+			rq-&gt;internal_tag = tag;</div><div class='add'>+		} else {</div><div class='add'>+			if (blk_mq_tag_busy(data-&gt;hctx)) {</div><div class='add'>+				rq-&gt;rq_flags = RQF_MQ_INFLIGHT;</div><div class='add'>+				atomic_inc(&amp;data-&gt;hctx-&gt;nr_active);</div><div class='add'>+			}</div><div class='add'>+			rq-&gt;tag = tag;</div><div class='add'>+			rq-&gt;internal_tag = -1;</div><div class='add'>+			data-&gt;hctx-&gt;tags-&gt;rqs[rq-&gt;tag] = rq;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rq-&gt;tag = tag;</div><div class='del'>-		blk_mq_rq_ctx_init(data-&gt;q, data-&gt;ctx, rq, op, op_flags);</div><div class='add'>+		blk_mq_rq_ctx_init(data-&gt;q, data-&gt;ctx, rq, op);</div><div class='ctx'> 		return rq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__blk_mq_alloc_request);</div><div class='ctx'> </div><div class='ctx'> struct request *blk_mq_alloc_request(struct request_queue *q, int rw,</div><div class='ctx'> 		unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct blk_mq_ctx *ctx;</div><div class='del'>-	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	struct blk_mq_alloc_data alloc_data = { .flags = flags };</div><div class='ctx'> 	struct request *rq;</div><div class='del'>-	struct blk_mq_alloc_data alloc_data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = blk_queue_enter(q, flags &amp; BLK_MQ_REQ_NOWAIT);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='del'>-	ctx = blk_mq_get_ctx(q);</div><div class='del'>-	hctx = blk_mq_map_queue(q, ctx-&gt;cpu);</div><div class='del'>-	blk_mq_set_alloc_data(&amp;alloc_data, q, flags, ctx, hctx);</div><div class='del'>-	rq = __blk_mq_alloc_request(&amp;alloc_data, rw, 0);</div><div class='del'>-	blk_mq_put_ctx(ctx);</div><div class='add'>+	rq = blk_mq_sched_get_request(q, NULL, rw, &amp;alloc_data);</div><div class='ctx'> </div><div class='del'>-	if (!rq) {</div><div class='del'>-		blk_queue_exit(q);</div><div class='add'>+	blk_mq_put_ctx(alloc_data.ctx);</div><div class='add'>+	blk_queue_exit(q);</div><div class='add'>+</div><div class='add'>+	if (!rq)</div><div class='ctx'> 		return ERR_PTR(-EWOULDBLOCK);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;__data_len = 0;</div><div class='ctx'> 	rq-&gt;__sector = (sector_t) -1;</div><div class='hunk'>@@ -244,10 +286,9 @@ EXPORT_SYMBOL(blk_mq_alloc_request);</div><div class='ctx'> struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int rw,</div><div class='ctx'> 		unsigned int flags, unsigned int hctx_idx)</div><div class='ctx'> {</div><div class='del'>-	struct blk_mq_hw_ctx *hctx;</div><div class='del'>-	struct blk_mq_ctx *ctx;</div><div class='add'>+	struct blk_mq_alloc_data alloc_data = { .flags = flags };</div><div class='ctx'> 	struct request *rq;</div><div class='del'>-	struct blk_mq_alloc_data alloc_data;</div><div class='add'>+	unsigned int cpu;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -270,56 +311,65 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int rw,</div><div class='ctx'> 	 * Check if the hardware context is actually mapped to anything.</div><div class='ctx'> 	 * If not tell the caller that it should skip this queue.</div><div class='ctx'> 	 */</div><div class='del'>-	hctx = q-&gt;queue_hw_ctx[hctx_idx];</div><div class='del'>-	if (!blk_mq_hw_queue_mapped(hctx)) {</div><div class='del'>-		ret = -EXDEV;</div><div class='del'>-		goto out_queue_exit;</div><div class='add'>+	alloc_data.hctx = q-&gt;queue_hw_ctx[hctx_idx];</div><div class='add'>+	if (!blk_mq_hw_queue_mapped(alloc_data.hctx)) {</div><div class='add'>+		blk_queue_exit(q);</div><div class='add'>+		return ERR_PTR(-EXDEV);</div><div class='ctx'> 	}</div><div class='del'>-	ctx = __blk_mq_get_ctx(q, cpumask_first(hctx-&gt;cpumask));</div><div class='add'>+	cpu = cpumask_first(alloc_data.hctx-&gt;cpumask);</div><div class='add'>+	alloc_data.ctx = __blk_mq_get_ctx(q, cpu);</div><div class='ctx'> </div><div class='del'>-	blk_mq_set_alloc_data(&amp;alloc_data, q, flags, ctx, hctx);</div><div class='del'>-	rq = __blk_mq_alloc_request(&amp;alloc_data, rw, 0);</div><div class='del'>-	if (!rq) {</div><div class='del'>-		ret = -EWOULDBLOCK;</div><div class='del'>-		goto out_queue_exit;</div><div class='del'>-	}</div><div class='add'>+	rq = blk_mq_sched_get_request(q, NULL, rw, &amp;alloc_data);</div><div class='ctx'> </div><div class='del'>-	return rq;</div><div class='del'>-</div><div class='del'>-out_queue_exit:</div><div class='add'>+	blk_mq_put_ctx(alloc_data.ctx);</div><div class='ctx'> 	blk_queue_exit(q);</div><div class='del'>-	return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	if (!rq)</div><div class='add'>+		return ERR_PTR(-EWOULDBLOCK);</div><div class='add'>+</div><div class='add'>+	return rq;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_mq_alloc_request_hctx);</div><div class='ctx'> </div><div class='del'>-static void __blk_mq_free_request(struct blk_mq_hw_ctx *hctx,</div><div class='del'>-				  struct blk_mq_ctx *ctx, struct request *rq)</div><div class='add'>+void __blk_mq_finish_request(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx,</div><div class='add'>+			     struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	const int tag = rq-&gt;tag;</div><div class='add'>+	const int sched_tag = rq-&gt;internal_tag;</div><div class='ctx'> 	struct request_queue *q = rq-&gt;q;</div><div class='ctx'> </div><div class='del'>-	if (rq-&gt;cmd_flags &amp; REQ_MQ_INFLIGHT)</div><div class='add'>+	if (rq-&gt;rq_flags &amp; RQF_MQ_INFLIGHT)</div><div class='ctx'> 		atomic_dec(&amp;hctx-&gt;nr_active);</div><div class='del'>-	rq-&gt;cmd_flags = 0;</div><div class='add'>+</div><div class='add'>+	wbt_done(q-&gt;rq_wb, &amp;rq-&gt;issue_stat);</div><div class='add'>+	rq-&gt;rq_flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(REQ_ATOM_STARTED, &amp;rq-&gt;atomic_flags);</div><div class='del'>-	blk_mq_put_tag(hctx, ctx, tag);</div><div class='add'>+	clear_bit(REQ_ATOM_POLL_SLEPT, &amp;rq-&gt;atomic_flags);</div><div class='add'>+	if (rq-&gt;tag != -1)</div><div class='add'>+		blk_mq_put_tag(hctx, hctx-&gt;tags, ctx, rq-&gt;tag);</div><div class='add'>+	if (sched_tag != -1)</div><div class='add'>+		blk_mq_sched_completed_request(hctx, rq);</div><div class='add'>+	blk_mq_sched_restart_queues(hctx);</div><div class='ctx'> 	blk_queue_exit(q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void blk_mq_free_hctx_request(struct blk_mq_hw_ctx *hctx, struct request *rq)</div><div class='add'>+static void blk_mq_finish_hctx_request(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+				     struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct blk_mq_ctx *ctx = rq-&gt;mq_ctx;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;rq_completed[rq_is_sync(rq)]++;</div><div class='del'>-	__blk_mq_free_request(hctx, ctx, rq);</div><div class='add'>+	__blk_mq_finish_request(hctx, ctx, rq);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+void blk_mq_finish_request(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	blk_mq_finish_hctx_request(blk_mq_map_queue(rq-&gt;q, rq-&gt;mq_ctx-&gt;cpu), rq);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(blk_mq_free_hctx_request);</div><div class='ctx'> </div><div class='ctx'> void blk_mq_free_request(struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	blk_mq_free_hctx_request(blk_mq_map_queue(rq-&gt;q, rq-&gt;mq_ctx-&gt;cpu), rq);</div><div class='add'>+	blk_mq_sched_put_request(rq);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_mq_free_request);</div><div class='ctx'> </div><div class='hunk'>@@ -328,6 +378,7 @@ inline void __blk_mq_end_request(struct request *rq, int error)</div><div class='ctx'> 	blk_account_io_done(rq);</div><div class='ctx'> </div><div class='ctx'> 	if (rq-&gt;end_io) {</div><div class='add'>+		wbt_done(rq-&gt;q-&gt;rq_wb, &amp;rq-&gt;issue_stat);</div><div class='ctx'> 		rq-&gt;end_io(rq, error);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (unlikely(blk_bidi_rq(rq)))</div><div class='hunk'>@@ -378,10 +429,27 @@ static void blk_mq_ipi_complete_request(struct request *rq)</div><div class='ctx'> 	put_cpu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void blk_mq_stat_add(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	if (rq-&gt;rq_flags &amp; RQF_STATS) {</div><div class='add'>+		/*</div><div class='add'>+		 * We could rq-&gt;mq_ctx here, but there's less of a risk</div><div class='add'>+		 * of races if we have the completion event add the stats</div><div class='add'>+		 * to the local software queue.</div><div class='add'>+		 */</div><div class='add'>+		struct blk_mq_ctx *ctx;</div><div class='add'>+</div><div class='add'>+		ctx = __blk_mq_get_ctx(rq-&gt;q, raw_smp_processor_id());</div><div class='add'>+		blk_stat_add(&amp;ctx-&gt;stat[rq_data_dir(rq)], rq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __blk_mq_complete_request(struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = rq-&gt;q;</div><div class='ctx'> </div><div class='add'>+	blk_mq_stat_add(rq);</div><div class='add'>+</div><div class='ctx'> 	if (!q-&gt;softirq_done_fn)</div><div class='ctx'> 		blk_mq_end_request(rq, rq-&gt;errors);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -419,11 +487,15 @@ void blk_mq_start_request(struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = rq-&gt;q;</div><div class='ctx'> </div><div class='add'>+	blk_mq_sched_started_request(rq);</div><div class='add'>+</div><div class='ctx'> 	trace_block_rq_issue(q, rq);</div><div class='ctx'> </div><div class='del'>-	rq-&gt;resid_len = blk_rq_bytes(rq);</div><div class='del'>-	if (unlikely(blk_bidi_rq(rq)))</div><div class='del'>-		rq-&gt;next_rq-&gt;resid_len = blk_rq_bytes(rq-&gt;next_rq);</div><div class='add'>+	if (test_bit(QUEUE_FLAG_STATS, &amp;q-&gt;queue_flags)) {</div><div class='add'>+		blk_stat_set_issue_time(&amp;rq-&gt;issue_stat);</div><div class='add'>+		rq-&gt;rq_flags |= RQF_STATS;</div><div class='add'>+		wbt_issue(q-&gt;rq_wb, &amp;rq-&gt;issue_stat);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	blk_add_timer(rq);</div><div class='ctx'> </div><div class='hunk'>@@ -460,6 +532,8 @@ static void __blk_mq_requeue_request(struct request *rq)</div><div class='ctx'> 	struct request_queue *q = rq-&gt;q;</div><div class='ctx'> </div><div class='ctx'> 	trace_block_rq_requeue(q, rq);</div><div class='add'>+	wbt_requeue(q-&gt;rq_wb, &amp;rq-&gt;issue_stat);</div><div class='add'>+	blk_mq_sched_requeue_request(rq);</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_clear_bit(REQ_ATOM_STARTED, &amp;rq-&gt;atomic_flags)) {</div><div class='ctx'> 		if (q-&gt;dma_drain_size &amp;&amp; blk_rq_bytes(rq))</div><div class='hunk'>@@ -467,12 +541,12 @@ static void __blk_mq_requeue_request(struct request *rq)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void blk_mq_requeue_request(struct request *rq)</div><div class='add'>+void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list)</div><div class='ctx'> {</div><div class='ctx'> 	__blk_mq_requeue_request(rq);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(blk_queued_rq(rq));</div><div class='del'>-	blk_mq_add_to_requeue_list(rq, true);</div><div class='add'>+	blk_mq_add_to_requeue_list(rq, true, kick_requeue_list);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_mq_requeue_request);</div><div class='ctx'> </div><div class='hunk'>@@ -489,28 +563,25 @@ static void blk_mq_requeue_work(struct work_struct *work)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;q-&gt;requeue_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(rq, next, &amp;rq_list, queuelist) {</div><div class='del'>-		if (!(rq-&gt;cmd_flags &amp; REQ_SOFTBARRIER))</div><div class='add'>+		if (!(rq-&gt;rq_flags &amp; RQF_SOFTBARRIER))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		rq-&gt;cmd_flags &amp;= ~REQ_SOFTBARRIER;</div><div class='add'>+		rq-&gt;rq_flags &amp;= ~RQF_SOFTBARRIER;</div><div class='ctx'> 		list_del_init(&amp;rq-&gt;queuelist);</div><div class='del'>-		blk_mq_insert_request(rq, true, false, false);</div><div class='add'>+		blk_mq_sched_insert_request(rq, true, false, false, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;rq_list)) {</div><div class='ctx'> 		rq = list_entry(rq_list.next, struct request, queuelist);</div><div class='ctx'> 		list_del_init(&amp;rq-&gt;queuelist);</div><div class='del'>-		blk_mq_insert_request(rq, false, false, false);</div><div class='add'>+		blk_mq_sched_insert_request(rq, false, false, false, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Use the start variant of queue running here, so that running</div><div class='del'>-	 * the requeue work will kick stopped queues.</div><div class='del'>-	 */</div><div class='del'>-	blk_mq_start_hw_queues(q);</div><div class='add'>+	blk_mq_run_hw_queues(q, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void blk_mq_add_to_requeue_list(struct request *rq, bool at_head)</div><div class='add'>+void blk_mq_add_to_requeue_list(struct request *rq, bool at_head,</div><div class='add'>+				bool kick_requeue_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = rq-&gt;q;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -519,24 +590,21 @@ void blk_mq_add_to_requeue_list(struct request *rq, bool at_head)</div><div class='ctx'> 	 * We abuse this flag that is otherwise used by the I/O scheduler to</div><div class='ctx'> 	 * request head insertation from the workqueue.</div><div class='ctx'> 	 */</div><div class='del'>-	BUG_ON(rq-&gt;cmd_flags &amp; REQ_SOFTBARRIER);</div><div class='add'>+	BUG_ON(rq-&gt;rq_flags &amp; RQF_SOFTBARRIER);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;q-&gt;requeue_lock, flags);</div><div class='ctx'> 	if (at_head) {</div><div class='del'>-		rq-&gt;cmd_flags |= REQ_SOFTBARRIER;</div><div class='add'>+		rq-&gt;rq_flags |= RQF_SOFTBARRIER;</div><div class='ctx'> 		list_add(&amp;rq-&gt;queuelist, &amp;q-&gt;requeue_list);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		list_add_tail(&amp;rq-&gt;queuelist, &amp;q-&gt;requeue_list);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;q-&gt;requeue_lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(blk_mq_add_to_requeue_list);</div><div class='ctx'> </div><div class='del'>-void blk_mq_cancel_requeue_work(struct request_queue *q)</div><div class='del'>-{</div><div class='del'>-	cancel_delayed_work_sync(&amp;q-&gt;requeue_work);</div><div class='add'>+	if (kick_requeue_list)</div><div class='add'>+		blk_mq_kick_requeue_list(q);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(blk_mq_cancel_requeue_work);</div><div class='add'>+EXPORT_SYMBOL(blk_mq_add_to_requeue_list);</div><div class='ctx'> </div><div class='ctx'> void blk_mq_kick_requeue_list(struct request_queue *q)</div><div class='ctx'> {</div><div class='hunk'>@@ -590,7 +658,7 @@ struct blk_mq_timeout_data {</div><div class='ctx'> </div><div class='ctx'> void blk_mq_rq_timed_out(struct request *req, bool reserved)</div><div class='ctx'> {</div><div class='del'>-	struct blk_mq_ops *ops = req-&gt;q-&gt;mq_ops;</div><div class='add'>+	const struct blk_mq_ops *ops = req-&gt;q-&gt;mq_ops;</div><div class='ctx'> 	enum blk_eh_timer_return ret = BLK_EH_RESET_TIMER;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -705,7 +773,7 @@ static bool blk_mq_attempt_merge(struct request_queue *q,</div><div class='ctx'> 	int checked = 8;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_reverse(rq, &amp;ctx-&gt;rq_list, queuelist) {</div><div class='del'>-		int el_ret;</div><div class='add'>+		bool merged = false;</div><div class='ctx'> </div><div class='ctx'> 		if (!checked--)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -713,20 +781,25 @@ static bool blk_mq_attempt_merge(struct request_queue *q,</div><div class='ctx'> 		if (!blk_rq_merge_ok(rq, bio))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		el_ret = blk_try_merge(rq, bio);</div><div class='del'>-		if (el_ret == ELEVATOR_BACK_MERGE) {</div><div class='del'>-			if (bio_attempt_back_merge(q, rq, bio)) {</div><div class='del'>-				ctx-&gt;rq_merged++;</div><div class='del'>-				return true;</div><div class='del'>-			}</div><div class='add'>+		switch (blk_try_merge(rq, bio)) {</div><div class='add'>+		case ELEVATOR_BACK_MERGE:</div><div class='add'>+			if (blk_mq_sched_allow_merge(q, rq, bio))</div><div class='add'>+				merged = bio_attempt_back_merge(q, rq, bio);</div><div class='ctx'> 			break;</div><div class='del'>-		} else if (el_ret == ELEVATOR_FRONT_MERGE) {</div><div class='del'>-			if (bio_attempt_front_merge(q, rq, bio)) {</div><div class='del'>-				ctx-&gt;rq_merged++;</div><div class='del'>-				return true;</div><div class='del'>-			}</div><div class='add'>+		case ELEVATOR_FRONT_MERGE:</div><div class='add'>+			if (blk_mq_sched_allow_merge(q, rq, bio))</div><div class='add'>+				merged = bio_attempt_front_merge(q, rq, bio);</div><div class='ctx'> 			break;</div><div class='add'>+		case ELEVATOR_DISCARD_MERGE:</div><div class='add'>+			merged = bio_attempt_discard_merge(q, rq, bio);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (merged)</div><div class='add'>+			ctx-&gt;rq_merged++;</div><div class='add'>+		return merged;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -754,7 +827,7 @@ static bool flush_busy_ctx(struct sbitmap *sb, unsigned int bitnr, void *data)</div><div class='ctx'>  * Process software queues that have been marked busy, splicing them</div><div class='ctx'>  * to the for-dispatch</div><div class='ctx'>  */</div><div class='del'>-static void flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list)</div><div class='add'>+void blk_mq_flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list)</div><div class='ctx'> {</div><div class='ctx'> 	struct flush_busy_ctx_data data = {</div><div class='ctx'> 		.hctx = hctx,</div><div class='hunk'>@@ -763,6 +836,7 @@ static void flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list)</div><div class='ctx'> </div><div class='ctx'> 	sbitmap_for_each_set(&amp;hctx-&gt;ctx_map, flush_busy_ctx, &amp;data);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_flush_busy_ctxs);</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int queued_to_index(unsigned int queued)</div><div class='ctx'> {</div><div class='hunk'>@@ -772,44 +846,139 @@ static inline unsigned int queued_to_index(unsigned int queued)</div><div class='ctx'> 	return min(BLK_MQ_MAX_DISPATCH_ORDER - 1, ilog2(queued) + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool blk_mq_get_driver_tag(struct request *rq, struct blk_mq_hw_ctx **hctx,</div><div class='add'>+			   bool wait)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_alloc_data data = {</div><div class='add'>+		.q = rq-&gt;q,</div><div class='add'>+		.hctx = blk_mq_map_queue(rq-&gt;q, rq-&gt;mq_ctx-&gt;cpu),</div><div class='add'>+		.flags = wait ? 0 : BLK_MQ_REQ_NOWAIT,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (rq-&gt;tag != -1) {</div><div class='add'>+done:</div><div class='add'>+		if (hctx)</div><div class='add'>+			*hctx = data.hctx;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (blk_mq_tag_is_reserved(data.hctx-&gt;sched_tags, rq-&gt;internal_tag))</div><div class='add'>+		data.flags |= BLK_MQ_REQ_RESERVED;</div><div class='add'>+</div><div class='add'>+	rq-&gt;tag = blk_mq_get_tag(&amp;data);</div><div class='add'>+	if (rq-&gt;tag &gt;= 0) {</div><div class='add'>+		if (blk_mq_tag_busy(data.hctx)) {</div><div class='add'>+			rq-&gt;rq_flags |= RQF_MQ_INFLIGHT;</div><div class='add'>+			atomic_inc(&amp;data.hctx-&gt;nr_active);</div><div class='add'>+		}</div><div class='add'>+		data.hctx-&gt;tags-&gt;rqs[rq-&gt;tag] = rq;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __blk_mq_put_driver_tag(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+				    struct request *rq)</div><div class='add'>+{</div><div class='add'>+	blk_mq_put_tag(hctx, hctx-&gt;tags, rq-&gt;mq_ctx, rq-&gt;tag);</div><div class='add'>+	rq-&gt;tag = -1;</div><div class='add'>+</div><div class='add'>+	if (rq-&gt;rq_flags &amp; RQF_MQ_INFLIGHT) {</div><div class='add'>+		rq-&gt;rq_flags &amp;= ~RQF_MQ_INFLIGHT;</div><div class='add'>+		atomic_dec(&amp;hctx-&gt;nr_active);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void blk_mq_put_driver_tag_hctx(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+				       struct request *rq)</div><div class='add'>+{</div><div class='add'>+	if (rq-&gt;tag == -1 || rq-&gt;internal_tag == -1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__blk_mq_put_driver_tag(hctx, rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void blk_mq_put_driver_tag(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+</div><div class='add'>+	if (rq-&gt;tag == -1 || rq-&gt;internal_tag == -1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hctx = blk_mq_map_queue(rq-&gt;q, rq-&gt;mq_ctx-&gt;cpu);</div><div class='add'>+	__blk_mq_put_driver_tag(hctx, rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Run this hardware queue, pulling any software queues mapped to it in.</div><div class='del'>- * Note that this function currently has various problems around ordering</div><div class='del'>- * of IO. In particular, we'd like FIFO behaviour on handling existing</div><div class='del'>- * items on the hctx-&gt;dispatch list. Ignore that for now.</div><div class='add'>+ * If we fail getting a driver tag because all the driver tags are already</div><div class='add'>+ * assigned and on the dispatch list, BUT the first entry does not have a</div><div class='add'>+ * tag, then we could deadlock. For that case, move entries with assigned</div><div class='add'>+ * driver tags to the front, leaving the set of tagged requests in the</div><div class='add'>+ * same order, and the untagged set in the same order.</div><div class='ctx'>  */</div><div class='del'>-static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+static bool reorder_tags_to_front(struct list_head *list)</div><div class='ctx'> {</div><div class='del'>-	struct request_queue *q = hctx-&gt;queue;</div><div class='del'>-	struct request *rq;</div><div class='del'>-	LIST_HEAD(rq_list);</div><div class='del'>-	LIST_HEAD(driver_list);</div><div class='del'>-	struct list_head *dptr;</div><div class='del'>-	int queued;</div><div class='add'>+	struct request *rq, *tmp, *first = NULL;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(test_bit(BLK_MQ_S_STOPPED, &amp;hctx-&gt;state)))</div><div class='del'>-		return;</div><div class='add'>+	list_for_each_entry_safe_reverse(rq, tmp, list, queuelist) {</div><div class='add'>+		if (rq == first)</div><div class='add'>+			break;</div><div class='add'>+		if (rq-&gt;tag != -1) {</div><div class='add'>+			list_move(&amp;rq-&gt;queuelist, list);</div><div class='add'>+			if (!first)</div><div class='add'>+				first = rq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!cpumask_test_cpu(raw_smp_processor_id(), hctx-&gt;cpumask) &amp;&amp;</div><div class='del'>-		cpu_online(hctx-&gt;next_cpu));</div><div class='add'>+	return first != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int blk_mq_dispatch_wake(wait_queue_t *wait, unsigned mode, int flags,</div><div class='add'>+				void *key)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='ctx'> </div><div class='del'>-	hctx-&gt;run++;</div><div class='add'>+	hctx = container_of(wait, struct blk_mq_hw_ctx, dispatch_wait);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;wait-&gt;task_list);</div><div class='add'>+	clear_bit_unlock(BLK_MQ_S_TAG_WAITING, &amp;hctx-&gt;state);</div><div class='add'>+	blk_mq_run_hw_queue(hctx, true);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool blk_mq_dispatch_wait_add(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	struct sbq_wait_state *ws;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Touch any software queue that has pending entries.</div><div class='add'>+	 * The TAG_WAITING bit serves as a lock protecting hctx-&gt;dispatch_wait.</div><div class='add'>+	 * The thread which wins the race to grab this bit adds the hardware</div><div class='add'>+	 * queue to the wait queue.</div><div class='ctx'> 	 */</div><div class='del'>-	flush_busy_ctxs(hctx, &amp;rq_list);</div><div class='add'>+	if (test_bit(BLK_MQ_S_TAG_WAITING, &amp;hctx-&gt;state) ||</div><div class='add'>+	    test_and_set_bit_lock(BLK_MQ_S_TAG_WAITING, &amp;hctx-&gt;state))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_func_entry(&amp;hctx-&gt;dispatch_wait, blk_mq_dispatch_wake);</div><div class='add'>+	ws = bt_wait_ptr(&amp;hctx-&gt;tags-&gt;bitmap_tags, hctx);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If we have previous entries on our dispatch list, grab them</div><div class='del'>-	 * and stuff them at the front for more fair dispatch.</div><div class='add'>+	 * As soon as this returns, it's no longer safe to fiddle with</div><div class='add'>+	 * hctx-&gt;dispatch_wait, since a completion can wake up the wait queue</div><div class='add'>+	 * and unlock the bit.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!list_empty_careful(&amp;hctx-&gt;dispatch)) {</div><div class='del'>-		spin_lock(&amp;hctx-&gt;lock);</div><div class='del'>-		if (!list_empty(&amp;hctx-&gt;dispatch))</div><div class='del'>-			list_splice_init(&amp;hctx-&gt;dispatch, &amp;rq_list);</div><div class='del'>-		spin_unlock(&amp;hctx-&gt;lock);</div><div class='del'>-	}</div><div class='add'>+	add_wait_queue(&amp;ws-&gt;wait, &amp;hctx-&gt;dispatch_wait);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+	struct request *rq;</div><div class='add'>+	LIST_HEAD(driver_list);</div><div class='add'>+	struct list_head *dptr;</div><div class='add'>+	int queued, ret = BLK_MQ_RQ_QUEUE_OK;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start off with dptr being NULL, so we start the first request</div><div class='hunk'>@@ -821,16 +990,48 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> 	 * Now process all the entries, sending them to the driver.</div><div class='ctx'> 	 */</div><div class='ctx'> 	queued = 0;</div><div class='del'>-	while (!list_empty(&amp;rq_list)) {</div><div class='add'>+	while (!list_empty(list)) {</div><div class='ctx'> 		struct blk_mq_queue_data bd;</div><div class='del'>-		int ret;</div><div class='ctx'> </div><div class='del'>-		rq = list_first_entry(&amp;rq_list, struct request, queuelist);</div><div class='add'>+		rq = list_first_entry(list, struct request, queuelist);</div><div class='add'>+		if (!blk_mq_get_driver_tag(rq, &amp;hctx, false)) {</div><div class='add'>+			if (!queued &amp;&amp; reorder_tags_to_front(list))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * The initial allocation attempt failed, so we need to</div><div class='add'>+			 * rerun the hardware queue when a tag is freed.</div><div class='add'>+			 */</div><div class='add'>+			if (blk_mq_dispatch_wait_add(hctx)) {</div><div class='add'>+				/*</div><div class='add'>+				 * It's possible that a tag was freed in the</div><div class='add'>+				 * window between the allocation failure and</div><div class='add'>+				 * adding the hardware queue to the wait queue.</div><div class='add'>+				 */</div><div class='add'>+				if (!blk_mq_get_driver_tag(rq, &amp;hctx, false))</div><div class='add'>+					break;</div><div class='add'>+			} else {</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		list_del_init(&amp;rq-&gt;queuelist);</div><div class='ctx'> </div><div class='ctx'> 		bd.rq = rq;</div><div class='ctx'> 		bd.list = dptr;</div><div class='del'>-		bd.last = list_empty(&amp;rq_list);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Flag last if we have no more requests, or if we have more</div><div class='add'>+		 * but can't assign a driver tag to it.</div><div class='add'>+		 */</div><div class='add'>+		if (list_empty(list))</div><div class='add'>+			bd.last = true;</div><div class='add'>+		else {</div><div class='add'>+			struct request *nxt;</div><div class='add'>+</div><div class='add'>+			nxt = list_first_entry(list, struct request, queuelist);</div><div class='add'>+			bd.last = !blk_mq_get_driver_tag(nxt, NULL, false);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ret = q-&gt;mq_ops-&gt;queue_rq(hctx, &amp;bd);</div><div class='ctx'> 		switch (ret) {</div><div class='hunk'>@@ -838,7 +1039,8 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> 			queued++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BLK_MQ_RQ_QUEUE_BUSY:</div><div class='del'>-			list_add(&amp;rq-&gt;queuelist, &amp;rq_list);</div><div class='add'>+			blk_mq_put_driver_tag_hctx(hctx, rq);</div><div class='add'>+			list_add(&amp;rq-&gt;queuelist, list);</div><div class='ctx'> 			__blk_mq_requeue_request(rq);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -856,7 +1058,7 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> 		 * We've done the first request. If we have more than 1</div><div class='ctx'> 		 * left in the list, set dptr to defer issue.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!dptr &amp;&amp; rq_list.next != rq_list.prev)</div><div class='add'>+		if (!dptr &amp;&amp; list-&gt;next != list-&gt;prev)</div><div class='ctx'> 			dptr = &amp;driver_list;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -866,10 +1068,18 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> 	 * Any items that need requeuing? Stuff them into hctx-&gt;dispatch,</div><div class='ctx'> 	 * that is where we will continue on next queue run.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!list_empty(&amp;rq_list)) {</div><div class='add'>+	if (!list_empty(list)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we got a driver tag for the next request already,</div><div class='add'>+		 * free it again.</div><div class='add'>+		 */</div><div class='add'>+		rq = list_first_entry(list, struct request, queuelist);</div><div class='add'>+		blk_mq_put_driver_tag(rq);</div><div class='add'>+</div><div class='ctx'> 		spin_lock(&amp;hctx-&gt;lock);</div><div class='del'>-		list_splice(&amp;rq_list, &amp;hctx-&gt;dispatch);</div><div class='add'>+		list_splice_init(list, &amp;hctx-&gt;dispatch);</div><div class='ctx'> 		spin_unlock(&amp;hctx-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * the queue is expected stopped with BLK_MQ_RQ_QUEUE_BUSY, but</div><div class='ctx'> 		 * it's possible the queue is stopped and restarted again</div><div class='hunk'>@@ -878,8 +1088,33 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> 		 * the requests in rq_list might get lost.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * blk_mq_run_hw_queue() already checks the STOPPED bit</div><div class='del'>-		 **/</div><div class='del'>-		blk_mq_run_hw_queue(hctx, true);</div><div class='add'>+		 *</div><div class='add'>+		 * If RESTART or TAG_WAITING is set, then let completion restart</div><div class='add'>+		 * the queue instead of potentially looping here.</div><div class='add'>+		 */</div><div class='add'>+		if (!blk_mq_sched_needs_restart(hctx) &amp;&amp;</div><div class='add'>+		    !test_bit(BLK_MQ_S_TAG_WAITING, &amp;hctx-&gt;state))</div><div class='add'>+			blk_mq_run_hw_queue(hctx, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return queued != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	int srcu_idx;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!cpumask_test_cpu(raw_smp_processor_id(), hctx-&gt;cpumask) &amp;&amp;</div><div class='add'>+		cpu_online(hctx-&gt;next_cpu));</div><div class='add'>+</div><div class='add'>+	if (!(hctx-&gt;flags &amp; BLK_MQ_F_BLOCKING)) {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		blk_mq_sched_dispatch_requests(hctx);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		srcu_idx = srcu_read_lock(&amp;hctx-&gt;queue_rq_srcu);</div><div class='add'>+		blk_mq_sched_dispatch_requests(hctx);</div><div class='add'>+		srcu_read_unlock(&amp;hctx-&gt;queue_rq_srcu, srcu_idx);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -895,7 +1130,7 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> 		return WORK_CPU_UNBOUND;</div><div class='ctx'> </div><div class='ctx'> 	if (--hctx-&gt;next_cpu_batch &lt;= 0) {</div><div class='del'>-		int cpu = hctx-&gt;next_cpu, next_cpu;</div><div class='add'>+		int next_cpu;</div><div class='ctx'> </div><div class='ctx'> 		next_cpu = cpumask_next(hctx-&gt;next_cpu, hctx-&gt;cpumask);</div><div class='ctx'> 		if (next_cpu &gt;= nr_cpu_ids)</div><div class='hunk'>@@ -903,8 +1138,6 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> </div><div class='ctx'> 		hctx-&gt;next_cpu = next_cpu;</div><div class='ctx'> 		hctx-&gt;next_cpu_batch = BLK_MQ_CPU_WORK_BATCH;</div><div class='del'>-</div><div class='del'>-		return cpu;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return hctx-&gt;next_cpu;</div><div class='hunk'>@@ -912,8 +1145,8 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> </div><div class='ctx'> void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(test_bit(BLK_MQ_S_STOPPED, &amp;hctx-&gt;state) ||</div><div class='del'>-	    !blk_mq_hw_queue_mapped(hctx)))</div><div class='add'>+	if (unlikely(blk_mq_hctx_stopped(hctx) ||</div><div class='add'>+		     !blk_mq_hw_queue_mapped(hctx)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!async &amp;&amp; !(hctx-&gt;flags &amp; BLK_MQ_F_BLOCKING)) {</div><div class='hunk'>@@ -936,9 +1169,8 @@ void blk_mq_run_hw_queues(struct request_queue *q, bool async)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='del'>-		if ((!blk_mq_hctx_has_pending(hctx) &amp;&amp;</div><div class='del'>-		    list_empty_careful(&amp;hctx-&gt;dispatch)) ||</div><div class='del'>-		    test_bit(BLK_MQ_S_STOPPED, &amp;hctx-&gt;state))</div><div class='add'>+		if (!blk_mq_hctx_has_pending(hctx) ||</div><div class='add'>+		    blk_mq_hctx_stopped(hctx))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		blk_mq_run_hw_queue(hctx, async);</div><div class='hunk'>@@ -946,6 +1178,26 @@ void blk_mq_run_hw_queues(struct request_queue *q, bool async)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_mq_run_hw_queues);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * blk_mq_queue_stopped() - check whether one or more hctxs have been stopped</div><div class='add'>+ * @q: request queue.</div><div class='add'>+ *</div><div class='add'>+ * The caller is responsible for serializing this function against</div><div class='add'>+ * blk_mq_{start,stop}_hw_queue().</div><div class='add'>+ */</div><div class='add'>+bool blk_mq_queue_stopped(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	queue_for_each_hw_ctx(q, hctx, i)</div><div class='add'>+		if (blk_mq_hctx_stopped(hctx))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(blk_mq_queue_stopped);</div><div class='add'>+</div><div class='ctx'> void blk_mq_stop_hw_queue(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> {</div><div class='ctx'> 	cancel_work(&amp;hctx-&gt;run_work);</div><div class='hunk'>@@ -982,18 +1234,23 @@ void blk_mq_start_hw_queues(struct request_queue *q)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_mq_start_hw_queues);</div><div class='ctx'> </div><div class='add'>+void blk_mq_start_stopped_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)</div><div class='add'>+{</div><div class='add'>+	if (!blk_mq_hctx_stopped(hctx))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	clear_bit(BLK_MQ_S_STOPPED, &amp;hctx-&gt;state);</div><div class='add'>+	blk_mq_run_hw_queue(hctx, async);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_start_stopped_hw_queue);</div><div class='add'>+</div><div class='ctx'> void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async)</div><div class='ctx'> {</div><div class='ctx'> 	struct blk_mq_hw_ctx *hctx;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='del'>-		if (!test_bit(BLK_MQ_S_STOPPED, &amp;hctx-&gt;state))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		clear_bit(BLK_MQ_S_STOPPED, &amp;hctx-&gt;state);</div><div class='del'>-		blk_mq_run_hw_queue(hctx, async);</div><div class='del'>-	}</div><div class='add'>+	queue_for_each_hw_ctx(q, hctx, i)</div><div class='add'>+		blk_mq_start_stopped_hw_queue(hctx, async);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_mq_start_stopped_hw_queues);</div><div class='ctx'> </div><div class='hunk'>@@ -1021,6 +1278,7 @@ void blk_mq_delay_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs)</div><div class='ctx'> 	if (unlikely(!blk_mq_hw_queue_mapped(hctx)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	blk_mq_stop_hw_queue(hctx);</div><div class='ctx'> 	kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx),</div><div class='ctx'> 			&amp;hctx-&gt;delay_work, msecs_to_jiffies(msecs));</div><div class='ctx'> }</div><div class='hunk'>@@ -1040,8 +1298,8 @@ static inline void __blk_mq_insert_req_list(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 		list_add_tail(&amp;rq-&gt;queuelist, &amp;ctx-&gt;rq_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx,</div><div class='del'>-				    struct request *rq, bool at_head)</div><div class='add'>+void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,</div><div class='add'>+			     bool at_head)</div><div class='ctx'> {</div><div class='ctx'> 	struct blk_mq_ctx *ctx = rq-&gt;mq_ctx;</div><div class='ctx'> </div><div class='hunk'>@@ -1049,32 +1307,10 @@ static void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	blk_mq_hctx_mark_pending(hctx, ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void blk_mq_insert_request(struct request *rq, bool at_head, bool run_queue,</div><div class='del'>-			   bool async)</div><div class='del'>-{</div><div class='del'>-	struct blk_mq_ctx *ctx = rq-&gt;mq_ctx;</div><div class='del'>-	struct request_queue *q = rq-&gt;q;</div><div class='del'>-	struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, ctx-&gt;cpu);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ctx-&gt;lock);</div><div class='del'>-	__blk_mq_insert_request(hctx, rq, at_head);</div><div class='del'>-	spin_unlock(&amp;ctx-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (run_queue)</div><div class='del'>-		blk_mq_run_hw_queue(hctx, async);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void blk_mq_insert_requests(struct request_queue *q,</div><div class='del'>-				     struct blk_mq_ctx *ctx,</div><div class='del'>-				     struct list_head *list,</div><div class='del'>-				     int depth,</div><div class='del'>-				     bool from_schedule)</div><div class='add'>+void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx,</div><div class='add'>+			    struct list_head *list)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, ctx-&gt;cpu);</div><div class='del'>-</div><div class='del'>-	trace_block_unplug(q, depth, !from_schedule);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * preemption doesn't flush plug list, so it's possible ctx-&gt;cpu is</div><div class='ctx'> 	 * offline now</div><div class='hunk'>@@ -1090,8 +1326,6 @@ static void blk_mq_insert_requests(struct request_queue *q,</div><div class='ctx'> 	}</div><div class='ctx'> 	blk_mq_hctx_mark_pending(hctx, ctx);</div><div class='ctx'> 	spin_unlock(&amp;ctx-&gt;lock);</div><div class='del'>-</div><div class='del'>-	blk_mq_run_hw_queue(hctx, from_schedule);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int plug_ctx_cmp(void *priv, struct list_head *a, struct list_head *b)</div><div class='hunk'>@@ -1127,9 +1361,10 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)</div><div class='ctx'> 		BUG_ON(!rq-&gt;q);</div><div class='ctx'> 		if (rq-&gt;mq_ctx != this_ctx) {</div><div class='ctx'> 			if (this_ctx) {</div><div class='del'>-				blk_mq_insert_requests(this_q, this_ctx,</div><div class='del'>-							&amp;ctx_list, depth,</div><div class='del'>-							from_schedule);</div><div class='add'>+				trace_block_unplug(this_q, depth, from_schedule);</div><div class='add'>+				blk_mq_sched_insert_requests(this_q, this_ctx,</div><div class='add'>+								&amp;ctx_list,</div><div class='add'>+								from_schedule);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			this_ctx = rq-&gt;mq_ctx;</div><div class='hunk'>@@ -1146,8 +1381,9 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)</div><div class='ctx'> 	 * on 'ctx_list'. Do those.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (this_ctx) {</div><div class='del'>-		blk_mq_insert_requests(this_q, this_ctx, &amp;ctx_list, depth,</div><div class='del'>-				       from_schedule);</div><div class='add'>+		trace_block_unplug(this_q, depth, from_schedule);</div><div class='add'>+		blk_mq_sched_insert_requests(this_q, this_ctx, &amp;ctx_list,</div><div class='add'>+						from_schedule);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1155,7 +1391,7 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	init_request_from_bio(rq, bio);</div><div class='ctx'> </div><div class='del'>-	blk_account_io_start(rq, 1);</div><div class='add'>+	blk_account_io_start(rq, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool hctx_allow_merges(struct blk_mq_hw_ctx *hctx)</div><div class='hunk'>@@ -1185,55 +1421,38 @@ insert_rq:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock(&amp;ctx-&gt;lock);</div><div class='del'>-		__blk_mq_free_request(hctx, ctx, rq);</div><div class='add'>+		__blk_mq_finish_request(hctx, ctx, rq);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct blk_map_ctx {</div><div class='del'>-	struct blk_mq_hw_ctx *hctx;</div><div class='del'>-	struct blk_mq_ctx *ctx;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct request *blk_mq_map_request(struct request_queue *q,</div><div class='del'>-					  struct bio *bio,</div><div class='del'>-					  struct blk_map_ctx *data)</div><div class='add'>+static blk_qc_t request_to_qc_t(struct blk_mq_hw_ctx *hctx, struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	struct blk_mq_hw_ctx *hctx;</div><div class='del'>-	struct blk_mq_ctx *ctx;</div><div class='del'>-	struct request *rq;</div><div class='del'>-	int op = bio_data_dir(bio);</div><div class='del'>-	int op_flags = 0;</div><div class='del'>-	struct blk_mq_alloc_data alloc_data;</div><div class='del'>-</div><div class='del'>-	blk_queue_enter_live(q);</div><div class='del'>-	ctx = blk_mq_get_ctx(q);</div><div class='del'>-	hctx = blk_mq_map_queue(q, ctx-&gt;cpu);</div><div class='del'>-</div><div class='del'>-	if (rw_is_sync(bio_op(bio), bio-&gt;bi_opf))</div><div class='del'>-		op_flags |= REQ_SYNC;</div><div class='del'>-</div><div class='del'>-	trace_block_getrq(q, bio, op);</div><div class='del'>-	blk_mq_set_alloc_data(&amp;alloc_data, q, 0, ctx, hctx);</div><div class='del'>-	rq = __blk_mq_alloc_request(&amp;alloc_data, op, op_flags);</div><div class='add'>+	if (rq-&gt;tag != -1)</div><div class='add'>+		return blk_tag_to_qc_t(rq-&gt;tag, hctx-&gt;queue_num, false);</div><div class='ctx'> </div><div class='del'>-	data-&gt;hctx = alloc_data.hctx;</div><div class='del'>-	data-&gt;ctx = alloc_data.ctx;</div><div class='del'>-	data-&gt;hctx-&gt;queued++;</div><div class='del'>-	return rq;</div><div class='add'>+	return blk_tag_to_qc_t(rq-&gt;internal_tag, hctx-&gt;queue_num, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie)</div><div class='add'>+static void blk_mq_try_issue_directly(struct request *rq, blk_qc_t *cookie)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct request_queue *q = rq-&gt;q;</div><div class='del'>-	struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, rq-&gt;mq_ctx-&gt;cpu);</div><div class='ctx'> 	struct blk_mq_queue_data bd = {</div><div class='ctx'> 		.rq = rq,</div><div class='ctx'> 		.list = NULL,</div><div class='ctx'> 		.last = 1</div><div class='ctx'> 	};</div><div class='del'>-	blk_qc_t new_cookie = blk_tag_to_qc_t(rq-&gt;tag, hctx-&gt;queue_num);</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	blk_qc_t new_cookie;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (q-&gt;elevator)</div><div class='add'>+		goto insert;</div><div class='add'>+</div><div class='add'>+	if (!blk_mq_get_driver_tag(rq, &amp;hctx, false))</div><div class='add'>+		goto insert;</div><div class='add'>+</div><div class='add'>+	new_cookie = request_to_qc_t(hctx, rq);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For OK queue, we are done. For error, kill it. Any other</div><div class='hunk'>@@ -1243,7 +1462,7 @@ static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie)</div><div class='ctx'> 	ret = q-&gt;mq_ops-&gt;queue_rq(hctx, &amp;bd);</div><div class='ctx'> 	if (ret == BLK_MQ_RQ_QUEUE_OK) {</div><div class='ctx'> 		*cookie = new_cookie;</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	__blk_mq_requeue_request(rq);</div><div class='hunk'>@@ -1252,10 +1471,11 @@ static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie)</div><div class='ctx'> 		*cookie = BLK_QC_T_NONE;</div><div class='ctx'> 		rq-&gt;errors = -EIO;</div><div class='ctx'> 		blk_mq_end_request(rq, rq-&gt;errors);</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -1;</div><div class='add'>+insert:</div><div class='add'>+	blk_mq_sched_insert_request(rq, false, true, true, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1265,14 +1485,15 @@ static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie)</div><div class='ctx'>  */</div><div class='ctx'> static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	const int is_sync = rw_is_sync(bio_op(bio), bio-&gt;bi_opf);</div><div class='del'>-	const int is_flush_fua = bio-&gt;bi_opf &amp; (REQ_PREFLUSH | REQ_FUA);</div><div class='del'>-	struct blk_map_ctx data;</div><div class='add'>+	const int is_sync = op_is_sync(bio-&gt;bi_opf);</div><div class='add'>+	const int is_flush_fua = op_is_flush(bio-&gt;bi_opf);</div><div class='add'>+	struct blk_mq_alloc_data data = { .flags = 0 };</div><div class='ctx'> 	struct request *rq;</div><div class='del'>-	unsigned int request_count = 0;</div><div class='add'>+	unsigned int request_count = 0, srcu_idx;</div><div class='ctx'> 	struct blk_plug *plug;</div><div class='ctx'> 	struct request *same_queue_rq = NULL;</div><div class='ctx'> 	blk_qc_t cookie;</div><div class='add'>+	unsigned int wb_acct;</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_bounce(q, &amp;bio);</div><div class='ctx'> </div><div class='hunk'>@@ -1287,13 +1508,26 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	    blk_attempt_plug_merge(q, bio, &amp;request_count, &amp;same_queue_rq))</div><div class='ctx'> 		return BLK_QC_T_NONE;</div><div class='ctx'> </div><div class='del'>-	rq = blk_mq_map_request(q, bio, &amp;data);</div><div class='del'>-	if (unlikely(!rq))</div><div class='add'>+	if (blk_mq_sched_bio_merge(q, bio))</div><div class='ctx'> 		return BLK_QC_T_NONE;</div><div class='ctx'> </div><div class='del'>-	cookie = blk_tag_to_qc_t(rq-&gt;tag, data.hctx-&gt;queue_num);</div><div class='add'>+	wb_acct = wbt_wait(q-&gt;rq_wb, bio, NULL);</div><div class='add'>+</div><div class='add'>+	trace_block_getrq(q, bio, bio-&gt;bi_opf);</div><div class='add'>+</div><div class='add'>+	rq = blk_mq_sched_get_request(q, bio, bio-&gt;bi_opf, &amp;data);</div><div class='add'>+	if (unlikely(!rq)) {</div><div class='add'>+		__wbt_done(q-&gt;rq_wb, wb_acct);</div><div class='add'>+		return BLK_QC_T_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wbt_track(&amp;rq-&gt;issue_stat, wb_acct);</div><div class='add'>+</div><div class='add'>+	cookie = request_to_qc_t(data.hctx, rq);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(is_flush_fua)) {</div><div class='add'>+		if (q-&gt;elevator)</div><div class='add'>+			goto elv_insert;</div><div class='ctx'> 		blk_mq_bio_to_request(rq, bio);</div><div class='ctx'> 		blk_insert_flush(rq);</div><div class='ctx'> 		goto run_queue;</div><div class='hunk'>@@ -1312,7 +1546,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 		blk_mq_bio_to_request(rq, bio);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * We do limited pluging. If the bio can be merged, do that.</div><div class='add'>+		 * We do limited plugging. If the bio can be merged, do that.</div><div class='ctx'> 		 * Otherwise the existing request in the plug list will be</div><div class='ctx'> 		 * issued. So the plug list will have one request at most</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1332,12 +1566,27 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 		blk_mq_put_ctx(data.ctx);</div><div class='ctx'> 		if (!old_rq)</div><div class='ctx'> 			goto done;</div><div class='del'>-		if (!blk_mq_direct_issue_request(old_rq, &amp;cookie))</div><div class='del'>-			goto done;</div><div class='del'>-		blk_mq_insert_request(old_rq, false, true, true);</div><div class='add'>+</div><div class='add'>+		if (!(data.hctx-&gt;flags &amp; BLK_MQ_F_BLOCKING)) {</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			blk_mq_try_issue_directly(old_rq, &amp;cookie);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+		} else {</div><div class='add'>+			srcu_idx = srcu_read_lock(&amp;data.hctx-&gt;queue_rq_srcu);</div><div class='add'>+			blk_mq_try_issue_directly(old_rq, &amp;cookie);</div><div class='add'>+			srcu_read_unlock(&amp;data.hctx-&gt;queue_rq_srcu, srcu_idx);</div><div class='add'>+		}</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (q-&gt;elevator) {</div><div class='add'>+elv_insert:</div><div class='add'>+		blk_mq_put_ctx(data.ctx);</div><div class='add'>+		blk_mq_bio_to_request(rq, bio);</div><div class='add'>+		blk_mq_sched_insert_request(rq, false, true,</div><div class='add'>+						!is_sync || is_flush_fua, true);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='ctx'> 	if (!blk_mq_merge_queue_io(data.hctx, data.ctx, rq, bio)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For a SYNC request, send it to the hardware immediately. For</div><div class='hunk'>@@ -1359,13 +1608,14 @@ done:</div><div class='ctx'>  */</div><div class='ctx'> static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	const int is_sync = rw_is_sync(bio_op(bio), bio-&gt;bi_opf);</div><div class='del'>-	const int is_flush_fua = bio-&gt;bi_opf &amp; (REQ_PREFLUSH | REQ_FUA);</div><div class='add'>+	const int is_sync = op_is_sync(bio-&gt;bi_opf);</div><div class='add'>+	const int is_flush_fua = op_is_flush(bio-&gt;bi_opf);</div><div class='ctx'> 	struct blk_plug *plug;</div><div class='ctx'> 	unsigned int request_count = 0;</div><div class='del'>-	struct blk_map_ctx data;</div><div class='add'>+	struct blk_mq_alloc_data data = { .flags = 0 };</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> 	blk_qc_t cookie;</div><div class='add'>+	unsigned int wb_acct;</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_bounce(q, &amp;bio);</div><div class='ctx'> </div><div class='hunk'>@@ -1382,13 +1632,26 @@ static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	} else</div><div class='ctx'> 		request_count = blk_plug_queued_count(q);</div><div class='ctx'> </div><div class='del'>-	rq = blk_mq_map_request(q, bio, &amp;data);</div><div class='del'>-	if (unlikely(!rq))</div><div class='add'>+	if (blk_mq_sched_bio_merge(q, bio))</div><div class='ctx'> 		return BLK_QC_T_NONE;</div><div class='ctx'> </div><div class='del'>-	cookie = blk_tag_to_qc_t(rq-&gt;tag, data.hctx-&gt;queue_num);</div><div class='add'>+	wb_acct = wbt_wait(q-&gt;rq_wb, bio, NULL);</div><div class='add'>+</div><div class='add'>+	trace_block_getrq(q, bio, bio-&gt;bi_opf);</div><div class='add'>+</div><div class='add'>+	rq = blk_mq_sched_get_request(q, bio, bio-&gt;bi_opf, &amp;data);</div><div class='add'>+	if (unlikely(!rq)) {</div><div class='add'>+		__wbt_done(q-&gt;rq_wb, wb_acct);</div><div class='add'>+		return BLK_QC_T_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wbt_track(&amp;rq-&gt;issue_stat, wb_acct);</div><div class='add'>+</div><div class='add'>+	cookie = request_to_qc_t(data.hctx, rq);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(is_flush_fua)) {</div><div class='add'>+		if (q-&gt;elevator)</div><div class='add'>+			goto elv_insert;</div><div class='ctx'> 		blk_mq_bio_to_request(rq, bio);</div><div class='ctx'> 		blk_insert_flush(rq);</div><div class='ctx'> 		goto run_queue;</div><div class='hunk'>@@ -1401,13 +1664,25 @@ static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	 */</div><div class='ctx'> 	plug = current-&gt;plug;</div><div class='ctx'> 	if (plug) {</div><div class='add'>+		struct request *last = NULL;</div><div class='add'>+</div><div class='ctx'> 		blk_mq_bio_to_request(rq, bio);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * @request_count may become stale because of schedule</div><div class='add'>+		 * out, so check the list again.</div><div class='add'>+		 */</div><div class='add'>+		if (list_empty(&amp;plug-&gt;mq_list))</div><div class='add'>+			request_count = 0;</div><div class='ctx'> 		if (!request_count)</div><div class='ctx'> 			trace_block_plug(q);</div><div class='add'>+		else</div><div class='add'>+			last = list_entry_rq(plug-&gt;mq_list.prev);</div><div class='ctx'> </div><div class='ctx'> 		blk_mq_put_ctx(data.ctx);</div><div class='ctx'> </div><div class='del'>-		if (request_count &gt;= BLK_MAX_REQUEST_COUNT) {</div><div class='add'>+		if (request_count &gt;= BLK_MAX_REQUEST_COUNT || (last &amp;&amp;</div><div class='add'>+		    blk_rq_bytes(last) &gt;= BLK_PLUG_FLUSH_SIZE)) {</div><div class='ctx'> 			blk_flush_plug_list(plug, false);</div><div class='ctx'> 			trace_block_plug(q);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1416,6 +1691,14 @@ static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 		return cookie;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (q-&gt;elevator) {</div><div class='add'>+elv_insert:</div><div class='add'>+		blk_mq_put_ctx(data.ctx);</div><div class='add'>+		blk_mq_bio_to_request(rq, bio);</div><div class='add'>+		blk_mq_sched_insert_request(rq, false, true,</div><div class='add'>+						!is_sync || is_flush_fua, true);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='ctx'> 	if (!blk_mq_merge_queue_io(data.hctx, data.ctx, rq, bio)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For a SYNC request, send it to the hardware immediately. For</div><div class='hunk'>@@ -1428,11 +1711,12 @@ run_queue:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	blk_mq_put_ctx(data.ctx);</div><div class='add'>+done:</div><div class='ctx'> 	return cookie;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void blk_mq_free_rq_map(struct blk_mq_tag_set *set,</div><div class='del'>-		struct blk_mq_tags *tags, unsigned int hctx_idx)</div><div class='add'>+void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,</div><div class='add'>+		     unsigned int hctx_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='hunk'>@@ -1440,11 +1724,13 @@ static void blk_mq_free_rq_map(struct blk_mq_tag_set *set,</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; tags-&gt;nr_tags; i++) {</div><div class='del'>-			if (!tags-&gt;rqs[i])</div><div class='add'>+			struct request *rq = tags-&gt;static_rqs[i];</div><div class='add'>+</div><div class='add'>+			if (!rq)</div><div class='ctx'> 				continue;</div><div class='del'>-			set-&gt;ops-&gt;exit_request(set-&gt;driver_data, tags-&gt;rqs[i],</div><div class='add'>+			set-&gt;ops-&gt;exit_request(set-&gt;driver_data, rq,</div><div class='ctx'> 						hctx_idx, i);</div><div class='del'>-			tags-&gt;rqs[i] = NULL;</div><div class='add'>+			tags-&gt;static_rqs[i] = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1458,49 +1744,82 @@ static void blk_mq_free_rq_map(struct blk_mq_tag_set *set,</div><div class='ctx'> 		kmemleak_free(page_address(page));</div><div class='ctx'> 		__free_pages(page, page-&gt;private);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+void blk_mq_free_rq_map(struct blk_mq_tags *tags)</div><div class='add'>+{</div><div class='ctx'> 	kfree(tags-&gt;rqs);</div><div class='add'>+	tags-&gt;rqs = NULL;</div><div class='add'>+	kfree(tags-&gt;static_rqs);</div><div class='add'>+	tags-&gt;static_rqs = NULL;</div><div class='ctx'> </div><div class='ctx'> 	blk_mq_free_tags(tags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static size_t order_to_size(unsigned int order)</div><div class='del'>-{</div><div class='del'>-	return (size_t)PAGE_SIZE &lt;&lt; order;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,</div><div class='del'>-		unsigned int hctx_idx)</div><div class='add'>+struct blk_mq_tags *blk_mq_alloc_rq_map(struct blk_mq_tag_set *set,</div><div class='add'>+					unsigned int hctx_idx,</div><div class='add'>+					unsigned int nr_tags,</div><div class='add'>+					unsigned int reserved_tags)</div><div class='ctx'> {</div><div class='ctx'> 	struct blk_mq_tags *tags;</div><div class='del'>-	unsigned int i, j, entries_per_page, max_order = 4;</div><div class='del'>-	size_t rq_size, left;</div><div class='add'>+	int node;</div><div class='ctx'> </div><div class='del'>-	tags = blk_mq_init_tags(set-&gt;queue_depth, set-&gt;reserved_tags,</div><div class='del'>-				set-&gt;numa_node,</div><div class='add'>+	node = blk_mq_hw_queue_to_node(set-&gt;mq_map, hctx_idx);</div><div class='add'>+	if (node == NUMA_NO_NODE)</div><div class='add'>+		node = set-&gt;numa_node;</div><div class='add'>+</div><div class='add'>+	tags = blk_mq_init_tags(nr_tags, reserved_tags, node,</div><div class='ctx'> 				BLK_MQ_FLAG_TO_ALLOC_POLICY(set-&gt;flags));</div><div class='ctx'> 	if (!tags)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;tags-&gt;page_list);</div><div class='del'>-</div><div class='del'>-	tags-&gt;rqs = kzalloc_node(set-&gt;queue_depth * sizeof(struct request *),</div><div class='del'>-				 GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY,</div><div class='del'>-				 set-&gt;numa_node);</div><div class='add'>+	tags-&gt;rqs = kzalloc_node(nr_tags * sizeof(struct request *),</div><div class='add'>+				 GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY,</div><div class='add'>+				 node);</div><div class='ctx'> 	if (!tags-&gt;rqs) {</div><div class='ctx'> 		blk_mq_free_tags(tags);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	tags-&gt;static_rqs = kzalloc_node(nr_tags * sizeof(struct request *),</div><div class='add'>+				 GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY,</div><div class='add'>+				 node);</div><div class='add'>+	if (!tags-&gt;static_rqs) {</div><div class='add'>+		kfree(tags-&gt;rqs);</div><div class='add'>+		blk_mq_free_tags(tags);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t order_to_size(unsigned int order)</div><div class='add'>+{</div><div class='add'>+	return (size_t)PAGE_SIZE &lt;&lt; order;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int blk_mq_alloc_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,</div><div class='add'>+		     unsigned int hctx_idx, unsigned int depth)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, j, entries_per_page, max_order = 4;</div><div class='add'>+	size_t rq_size, left;</div><div class='add'>+	int node;</div><div class='add'>+</div><div class='add'>+	node = blk_mq_hw_queue_to_node(set-&gt;mq_map, hctx_idx);</div><div class='add'>+	if (node == NUMA_NO_NODE)</div><div class='add'>+		node = set-&gt;numa_node;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;tags-&gt;page_list);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * rq_size is the size of the request plus driver payload, rounded</div><div class='ctx'> 	 * to the cacheline size</div><div class='ctx'> 	 */</div><div class='ctx'> 	rq_size = round_up(sizeof(struct request) + set-&gt;cmd_size,</div><div class='ctx'> 				cache_line_size());</div><div class='del'>-	left = rq_size * set-&gt;queue_depth;</div><div class='add'>+	left = rq_size * depth;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; set-&gt;queue_depth; ) {</div><div class='add'>+	for (i = 0; i &lt; depth; ) {</div><div class='ctx'> 		int this_order = max_order;</div><div class='ctx'> 		struct page *page;</div><div class='ctx'> 		int to_do;</div><div class='hunk'>@@ -1510,8 +1829,8 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,</div><div class='ctx'> 			this_order--;</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			page = alloc_pages_node(set-&gt;numa_node,</div><div class='del'>-				GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO,</div><div class='add'>+			page = alloc_pages_node(node,</div><div class='add'>+				GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO,</div><div class='ctx'> 				this_order);</div><div class='ctx'> 			if (page)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1532,17 +1851,19 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,</div><div class='ctx'> 		 * Allow kmemleak to scan these pages as they contain pointers</div><div class='ctx'> 		 * to additional allocations like via ops-&gt;init_request().</div><div class='ctx'> 		 */</div><div class='del'>-		kmemleak_alloc(p, order_to_size(this_order), 1, GFP_KERNEL);</div><div class='add'>+		kmemleak_alloc(p, order_to_size(this_order), 1, GFP_NOIO);</div><div class='ctx'> 		entries_per_page = order_to_size(this_order) / rq_size;</div><div class='del'>-		to_do = min(entries_per_page, set-&gt;queue_depth - i);</div><div class='add'>+		to_do = min(entries_per_page, depth - i);</div><div class='ctx'> 		left -= to_do * rq_size;</div><div class='ctx'> 		for (j = 0; j &lt; to_do; j++) {</div><div class='del'>-			tags-&gt;rqs[i] = p;</div><div class='add'>+			struct request *rq = p;</div><div class='add'>+</div><div class='add'>+			tags-&gt;static_rqs[i] = rq;</div><div class='ctx'> 			if (set-&gt;ops-&gt;init_request) {</div><div class='ctx'> 				if (set-&gt;ops-&gt;init_request(set-&gt;driver_data,</div><div class='del'>-						tags-&gt;rqs[i], hctx_idx, i,</div><div class='del'>-						set-&gt;numa_node)) {</div><div class='del'>-					tags-&gt;rqs[i] = NULL;</div><div class='add'>+						rq, hctx_idx, i,</div><div class='add'>+						node)) {</div><div class='add'>+					tags-&gt;static_rqs[i] = NULL;</div><div class='ctx'> 					goto fail;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1551,11 +1872,11 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,</div><div class='ctx'> 			i++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return tags;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	blk_mq_free_rq_map(set, tags, hctx_idx);</div><div class='del'>-	return NULL;</div><div class='add'>+	blk_mq_free_rqs(set, tags, hctx_idx);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1613,6 +1934,9 @@ static void blk_mq_exit_hctx(struct request_queue *q,</div><div class='ctx'> 	if (set-&gt;ops-&gt;exit_hctx)</div><div class='ctx'> 		set-&gt;ops-&gt;exit_hctx(hctx, hctx_idx);</div><div class='ctx'> </div><div class='add'>+	if (hctx-&gt;flags &amp; BLK_MQ_F_BLOCKING)</div><div class='add'>+		cleanup_srcu_struct(&amp;hctx-&gt;queue_rq_srcu);</div><div class='add'>+</div><div class='ctx'> 	blk_mq_remove_cpuhp(hctx);</div><div class='ctx'> 	blk_free_flush_queue(hctx-&gt;fq);</div><div class='ctx'> 	sbitmap_free(&amp;hctx-&gt;ctx_map);</div><div class='hunk'>@@ -1693,6 +2017,9 @@ static int blk_mq_init_hctx(struct request_queue *q,</div><div class='ctx'> 				   flush_start_tag + hctx_idx, node))</div><div class='ctx'> 		goto free_fq;</div><div class='ctx'> </div><div class='add'>+	if (hctx-&gt;flags &amp; BLK_MQ_F_BLOCKING)</div><div class='add'>+		init_srcu_struct(&amp;hctx-&gt;queue_rq_srcu);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  free_fq:</div><div class='hunk'>@@ -1723,6 +2050,8 @@ static void blk_mq_init_cpu_queues(struct request_queue *q,</div><div class='ctx'> 		spin_lock_init(&amp;__ctx-&gt;lock);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;__ctx-&gt;rq_list);</div><div class='ctx'> 		__ctx-&gt;queue = q;</div><div class='add'>+		blk_stat_init(&amp;__ctx-&gt;stat[BLK_STAT_READ]);</div><div class='add'>+		blk_stat_init(&amp;__ctx-&gt;stat[BLK_STAT_WRITE]);</div><div class='ctx'> </div><div class='ctx'> 		/* If the cpu isn't online, the cpu is mapped to first hctx */</div><div class='ctx'> 		if (!cpu_online(i))</div><div class='hunk'>@@ -1739,10 +2068,39 @@ static void blk_mq_init_cpu_queues(struct request_queue *q,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool __blk_mq_alloc_rq_map(struct blk_mq_tag_set *set, int hctx_idx)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	set-&gt;tags[hctx_idx] = blk_mq_alloc_rq_map(set, hctx_idx,</div><div class='add'>+					set-&gt;queue_depth, set-&gt;reserved_tags);</div><div class='add'>+	if (!set-&gt;tags[hctx_idx])</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ret = blk_mq_alloc_rqs(set, set-&gt;tags[hctx_idx], hctx_idx,</div><div class='add'>+				set-&gt;queue_depth);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	blk_mq_free_rq_map(set-&gt;tags[hctx_idx]);</div><div class='add'>+	set-&gt;tags[hctx_idx] = NULL;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void blk_mq_free_map_and_requests(struct blk_mq_tag_set *set,</div><div class='add'>+					 unsigned int hctx_idx)</div><div class='add'>+{</div><div class='add'>+	if (set-&gt;tags[hctx_idx]) {</div><div class='add'>+		blk_mq_free_rqs(set, set-&gt;tags[hctx_idx], hctx_idx);</div><div class='add'>+		blk_mq_free_rq_map(set-&gt;tags[hctx_idx]);</div><div class='add'>+		set-&gt;tags[hctx_idx] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void blk_mq_map_swqueue(struct request_queue *q,</div><div class='ctx'> 			       const struct cpumask *online_mask)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='add'>+	unsigned int i, hctx_idx;</div><div class='ctx'> 	struct blk_mq_hw_ctx *hctx;</div><div class='ctx'> 	struct blk_mq_ctx *ctx;</div><div class='ctx'> 	struct blk_mq_tag_set *set = q-&gt;tag_set;</div><div class='hunk'>@@ -1765,6 +2123,19 @@ static void blk_mq_map_swqueue(struct request_queue *q,</div><div class='ctx'> 		if (!cpumask_test_cpu(i, online_mask))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		hctx_idx = q-&gt;mq_map[i];</div><div class='add'>+		/* unmapped hw queue can be remapped after CPU topo changed */</div><div class='add'>+		if (!set-&gt;tags[hctx_idx] &amp;&amp;</div><div class='add'>+		    !__blk_mq_alloc_rq_map(set, hctx_idx)) {</div><div class='add'>+			/*</div><div class='add'>+			 * If tags initialization fail for some hctx,</div><div class='add'>+			 * that hctx won't be brought online.  In this</div><div class='add'>+			 * case, remap the current ctx to hctx[0] which</div><div class='add'>+			 * is guaranteed to always have tags allocated</div><div class='add'>+			 */</div><div class='add'>+			q-&gt;mq_map[i] = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ctx = per_cpu_ptr(q-&gt;queue_ctx, i);</div><div class='ctx'> 		hctx = blk_mq_map_queue(q, i);</div><div class='ctx'> </div><div class='hunk'>@@ -1781,17 +2152,17 @@ static void blk_mq_map_swqueue(struct request_queue *q,</div><div class='ctx'> 		 * disable it and free the request entries.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!hctx-&gt;nr_ctx) {</div><div class='del'>-			if (set-&gt;tags[i]) {</div><div class='del'>-				blk_mq_free_rq_map(set, set-&gt;tags[i], i);</div><div class='del'>-				set-&gt;tags[i] = NULL;</div><div class='del'>-			}</div><div class='add'>+			/* Never unmap queue 0.  We need it as a</div><div class='add'>+			 * fallback in case of a new remap fails</div><div class='add'>+			 * allocation</div><div class='add'>+			 */</div><div class='add'>+			if (i &amp;&amp; set-&gt;tags[i])</div><div class='add'>+				blk_mq_free_map_and_requests(set, i);</div><div class='add'>+</div><div class='ctx'> 			hctx-&gt;tags = NULL;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* unmapped hw queue can be remapped after CPU topo changed */</div><div class='del'>-		if (!set-&gt;tags[i])</div><div class='del'>-			set-&gt;tags[i] = blk_mq_init_rq_map(set, i);</div><div class='ctx'> 		hctx-&gt;tags = set-&gt;tags[i];</div><div class='ctx'> 		WARN_ON(!hctx-&gt;tags);</div><div class='ctx'> </div><div class='hunk'>@@ -1880,6 +2251,8 @@ void blk_mq_release(struct request_queue *q)</div><div class='ctx'> 	struct blk_mq_hw_ctx *hctx;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	blk_mq_sched_teardown(q);</div><div class='add'>+</div><div class='ctx'> 	/* hctx kobj stays in hctx */</div><div class='ctx'> 	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='ctx'> 		if (!hctx)</div><div class='hunk'>@@ -1954,10 +2327,8 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,</div><div class='ctx'> 		struct blk_mq_hw_ctx *hctx = hctxs[j];</div><div class='ctx'> </div><div class='ctx'> 		if (hctx) {</div><div class='del'>-			if (hctx-&gt;tags) {</div><div class='del'>-				blk_mq_free_rq_map(set, hctx-&gt;tags, j);</div><div class='del'>-				set-&gt;tags[j] = NULL;</div><div class='del'>-			}</div><div class='add'>+			if (hctx-&gt;tags)</div><div class='add'>+				blk_mq_free_map_and_requests(set, j);</div><div class='ctx'> 			blk_mq_exit_hctx(q, set, hctx, j);</div><div class='ctx'> 			free_cpumask_var(hctx-&gt;cpumask);</div><div class='ctx'> 			kobject_put(&amp;hctx-&gt;kobj);</div><div class='hunk'>@@ -2018,6 +2389,11 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,</div><div class='ctx'> 	 */</div><div class='ctx'> 	q-&gt;nr_requests = set-&gt;queue_depth;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Default to classic polling</div><div class='add'>+	 */</div><div class='add'>+	q-&gt;poll_nsec = -1;</div><div class='add'>+</div><div class='ctx'> 	if (set-&gt;ops-&gt;complete)</div><div class='ctx'> 		blk_queue_softirq_done(q, set-&gt;ops-&gt;complete);</div><div class='ctx'> </div><div class='hunk'>@@ -2033,6 +2409,14 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,</div><div class='ctx'> 	mutex_unlock(&amp;all_q_mutex);</div><div class='ctx'> 	put_online_cpus();</div><div class='ctx'> </div><div class='add'>+	if (!(set-&gt;flags &amp; BLK_MQ_F_NO_SCHED)) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = blk_mq_sched_init(q);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return q;</div><div class='ctx'> </div><div class='ctx'> err_hctxs:</div><div class='hunk'>@@ -2053,6 +2437,8 @@ void blk_mq_free_queue(struct request_queue *q)</div><div class='ctx'> 	list_del_init(&amp;q-&gt;all_q_node);</div><div class='ctx'> 	mutex_unlock(&amp;all_q_mutex);</div><div class='ctx'> </div><div class='add'>+	wbt_exit(q);</div><div class='add'>+</div><div class='ctx'> 	blk_mq_del_queue_tag_set(q);</div><div class='ctx'> </div><div class='ctx'> 	blk_mq_exit_hw_queues(q, set, set-&gt;nr_hw_queues);</div><div class='hunk'>@@ -2099,16 +2485,9 @@ static void blk_mq_queue_reinit_work(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry(q, &amp;all_q_list, all_q_node)</div><div class='ctx'> 		blk_mq_freeze_queue_start(q);</div><div class='del'>-	list_for_each_entry(q, &amp;all_q_list, all_q_node) {</div><div class='add'>+	list_for_each_entry(q, &amp;all_q_list, all_q_node)</div><div class='ctx'> 		blk_mq_freeze_queue_wait(q);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * timeout handler can't touch hw queue during the</div><div class='del'>-		 * reinitialization</div><div class='del'>-		 */</div><div class='del'>-		del_timer_sync(&amp;q-&gt;timeout);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	list_for_each_entry(q, &amp;all_q_list, all_q_node)</div><div class='ctx'> 		blk_mq_queue_reinit(q, &amp;cpuhp_online_new);</div><div class='ctx'> </div><div class='hunk'>@@ -2136,10 +2515,10 @@ static int blk_mq_queue_reinit_dead(unsigned int cpu)</div><div class='ctx'>  * Now CPU1 is just onlined and a request is inserted into ctx1-&gt;rq_list</div><div class='ctx'>  * and set bit0 in pending bitmap as ctx1-&gt;index_hw is still zero.</div><div class='ctx'>  *</div><div class='del'>- * And then while running hw queue, flush_busy_ctxs() finds bit0 is set in</div><div class='del'>- * pending bitmap and tries to retrieve requests in hctx-&gt;ctxs[0]-&gt;rq_list.</div><div class='del'>- * But htx-&gt;ctxs[0] is a pointer to ctx0, so the request in ctx1-&gt;rq_list</div><div class='del'>- * is ignored.</div><div class='add'>+ * And then while running hw queue, blk_mq_flush_busy_ctxs() finds bit0 is set</div><div class='add'>+ * in pending bitmap and tries to retrieve requests in hctx-&gt;ctxs[0]-&gt;rq_list.</div><div class='add'>+ * But htx-&gt;ctxs[0] is a pointer to ctx0, so the request in ctx1-&gt;rq_list is</div><div class='add'>+ * ignored.</div><div class='ctx'>  */</div><div class='ctx'> static int blk_mq_queue_reinit_prepare(unsigned int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -2153,17 +2532,15 @@ static int __blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; set-&gt;nr_hw_queues; i++) {</div><div class='del'>-		set-&gt;tags[i] = blk_mq_init_rq_map(set, i);</div><div class='del'>-		if (!set-&gt;tags[i])</div><div class='add'>+	for (i = 0; i &lt; set-&gt;nr_hw_queues; i++)</div><div class='add'>+		if (!__blk_mq_alloc_rq_map(set, i))</div><div class='ctx'> 			goto out_unwind;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_unwind:</div><div class='ctx'> 	while (--i &gt;= 0)</div><div class='del'>-		blk_mq_free_rq_map(set, set-&gt;tags[i], i);</div><div class='add'>+		blk_mq_free_rq_map(set-&gt;tags[i]);</div><div class='ctx'> </div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -2287,10 +2664,8 @@ void blk_mq_free_tag_set(struct blk_mq_tag_set *set)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nr_cpu_ids; i++) {</div><div class='del'>-		if (set-&gt;tags[i])</div><div class='del'>-			blk_mq_free_rq_map(set, set-&gt;tags[i], i);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; nr_cpu_ids; i++)</div><div class='add'>+		blk_mq_free_map_and_requests(set, i);</div><div class='ctx'> </div><div class='ctx'> 	kfree(set-&gt;mq_map);</div><div class='ctx'> 	set-&gt;mq_map = NULL;</div><div class='hunk'>@@ -2306,14 +2681,28 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr)</div><div class='ctx'> 	struct blk_mq_hw_ctx *hctx;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='del'>-	if (!set || nr &gt; set-&gt;queue_depth)</div><div class='add'>+	if (!set)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	blk_mq_freeze_queue(q);</div><div class='add'>+	blk_mq_quiesce_queue(q);</div><div class='add'>+</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	queue_for_each_hw_ctx(q, hctx, i) {</div><div class='ctx'> 		if (!hctx-&gt;tags)</div><div class='ctx'> 			continue;</div><div class='del'>-		ret = blk_mq_tag_update_depth(hctx-&gt;tags, nr);</div><div class='add'>+		/*</div><div class='add'>+		 * If we're using an MQ scheduler, just update the scheduler</div><div class='add'>+		 * queue depth. This is similar to what the old code would do.</div><div class='add'>+		 */</div><div class='add'>+		if (!hctx-&gt;sched_tags) {</div><div class='add'>+			ret = blk_mq_tag_update_depth(hctx, &amp;hctx-&gt;tags,</div><div class='add'>+							min(nr, set-&gt;queue_depth),</div><div class='add'>+							false);</div><div class='add'>+		} else {</div><div class='add'>+			ret = blk_mq_tag_update_depth(hctx, &amp;hctx-&gt;sched_tags,</div><div class='add'>+							nr, true);</div><div class='add'>+		}</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2321,6 +2710,9 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr)</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		q-&gt;nr_requests = nr;</div><div class='ctx'> </div><div class='add'>+	blk_mq_unfreeze_queue(q);</div><div class='add'>+	blk_mq_start_stopped_hw_queues(q, true);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2340,10 +2732,14 @@ void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues)</div><div class='ctx'> 	list_for_each_entry(q, &amp;set-&gt;tag_list, tag_set_list) {</div><div class='ctx'> 		blk_mq_realloc_hw_ctxs(set, q);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Manually set the make_request_fn as blk_queue_make_request</div><div class='add'>+		 * resets a lot of the queue settings.</div><div class='add'>+		 */</div><div class='ctx'> 		if (q-&gt;nr_hw_queues &gt; 1)</div><div class='del'>-			blk_queue_make_request(q, blk_mq_make_request);</div><div class='add'>+			q-&gt;make_request_fn = blk_mq_make_request;</div><div class='ctx'> 		else</div><div class='del'>-			blk_queue_make_request(q, blk_sq_make_request);</div><div class='add'>+			q-&gt;make_request_fn = blk_sq_make_request;</div><div class='ctx'> </div><div class='ctx'> 		blk_mq_queue_reinit(q, cpu_online_mask);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2353,6 +2749,168 @@ void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_mq_update_nr_hw_queues);</div><div class='ctx'> </div><div class='add'>+static unsigned long blk_mq_poll_nsecs(struct request_queue *q,</div><div class='add'>+				       struct blk_mq_hw_ctx *hctx,</div><div class='add'>+				       struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct blk_rq_stat stat[2];</div><div class='add'>+	unsigned long ret = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If stats collection isn't on, don't sleep but turn it on for</div><div class='add'>+	 * future users</div><div class='add'>+	 */</div><div class='add'>+	if (!blk_stat_enable(q))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We don't have to do this once per IO, should optimize this</div><div class='add'>+	 * to just use the current window of stats until it changes</div><div class='add'>+	 */</div><div class='add'>+	memset(&amp;stat, 0, sizeof(stat));</div><div class='add'>+	blk_hctx_stat_get(hctx, stat);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * As an optimistic guess, use half of the mean service time</div><div class='add'>+	 * for this type of request. We can (and should) make this smarter.</div><div class='add'>+	 * For instance, if the completion latencies are tight, we can</div><div class='add'>+	 * get closer than just half the mean. This is especially</div><div class='add'>+	 * important on devices where the completion latencies are longer</div><div class='add'>+	 * than ~10 usec.</div><div class='add'>+	 */</div><div class='add'>+	if (req_op(rq) == REQ_OP_READ &amp;&amp; stat[BLK_STAT_READ].nr_samples)</div><div class='add'>+		ret = (stat[BLK_STAT_READ].mean + 1) / 2;</div><div class='add'>+	else if (req_op(rq) == REQ_OP_WRITE &amp;&amp; stat[BLK_STAT_WRITE].nr_samples)</div><div class='add'>+		ret = (stat[BLK_STAT_WRITE].mean + 1) / 2;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool blk_mq_poll_hybrid_sleep(struct request_queue *q,</div><div class='add'>+				     struct blk_mq_hw_ctx *hctx,</div><div class='add'>+				     struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct hrtimer_sleeper hs;</div><div class='add'>+	enum hrtimer_mode mode;</div><div class='add'>+	unsigned int nsecs;</div><div class='add'>+	ktime_t kt;</div><div class='add'>+</div><div class='add'>+	if (test_bit(REQ_ATOM_POLL_SLEPT, &amp;rq-&gt;atomic_flags))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * poll_nsec can be:</div><div class='add'>+	 *</div><div class='add'>+	 * -1:	don't ever hybrid sleep</div><div class='add'>+	 *  0:	use half of prev avg</div><div class='add'>+	 * &gt;0:	use this specific value</div><div class='add'>+	 */</div><div class='add'>+	if (q-&gt;poll_nsec == -1)</div><div class='add'>+		return false;</div><div class='add'>+	else if (q-&gt;poll_nsec &gt; 0)</div><div class='add'>+		nsecs = q-&gt;poll_nsec;</div><div class='add'>+	else</div><div class='add'>+		nsecs = blk_mq_poll_nsecs(q, hctx, rq);</div><div class='add'>+</div><div class='add'>+	if (!nsecs)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	set_bit(REQ_ATOM_POLL_SLEPT, &amp;rq-&gt;atomic_flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This will be replaced with the stats tracking code, using</div><div class='add'>+	 * 'avg_completion_time / 2' as the pre-sleep target.</div><div class='add'>+	 */</div><div class='add'>+	kt = nsecs;</div><div class='add'>+</div><div class='add'>+	mode = HRTIMER_MODE_REL;</div><div class='add'>+	hrtimer_init_on_stack(&amp;hs.timer, CLOCK_MONOTONIC, mode);</div><div class='add'>+	hrtimer_set_expires(&amp;hs.timer, kt);</div><div class='add'>+</div><div class='add'>+	hrtimer_init_sleeper(&amp;hs, current);</div><div class='add'>+	do {</div><div class='add'>+		if (test_bit(REQ_ATOM_COMPLETE, &amp;rq-&gt;atomic_flags))</div><div class='add'>+			break;</div><div class='add'>+		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='add'>+		hrtimer_start_expires(&amp;hs.timer, mode);</div><div class='add'>+		if (hs.task)</div><div class='add'>+			io_schedule();</div><div class='add'>+		hrtimer_cancel(&amp;hs.timer);</div><div class='add'>+		mode = HRTIMER_MODE_ABS;</div><div class='add'>+	} while (hs.task &amp;&amp; !signal_pending(current));</div><div class='add'>+</div><div class='add'>+	__set_current_state(TASK_RUNNING);</div><div class='add'>+	destroy_hrtimer_on_stack(&amp;hs.timer);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __blk_mq_poll(struct blk_mq_hw_ctx *hctx, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+	long state;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we sleep, have the caller restart the poll loop to reset</div><div class='add'>+	 * the state. Like for the other success return cases, the</div><div class='add'>+	 * caller is responsible for checking if the IO completed. If</div><div class='add'>+	 * the IO isn't complete, we'll get called again and will go</div><div class='add'>+	 * straight to the busy poll loop.</div><div class='add'>+	 */</div><div class='add'>+	if (blk_mq_poll_hybrid_sleep(q, hctx, rq))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	hctx-&gt;poll_considered++;</div><div class='add'>+</div><div class='add'>+	state = current-&gt;state;</div><div class='add'>+	while (!need_resched()) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		hctx-&gt;poll_invoked++;</div><div class='add'>+</div><div class='add'>+		ret = q-&gt;mq_ops-&gt;poll(hctx, rq-&gt;tag);</div><div class='add'>+		if (ret &gt; 0) {</div><div class='add'>+			hctx-&gt;poll_success++;</div><div class='add'>+			set_current_state(TASK_RUNNING);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (signal_pending_state(state, current))</div><div class='add'>+			set_current_state(TASK_RUNNING);</div><div class='add'>+</div><div class='add'>+		if (current-&gt;state == TASK_RUNNING)</div><div class='add'>+			return true;</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool blk_mq_poll(struct request_queue *q, blk_qc_t cookie)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	struct blk_plug *plug;</div><div class='add'>+	struct request *rq;</div><div class='add'>+</div><div class='add'>+	if (!q-&gt;mq_ops || !q-&gt;mq_ops-&gt;poll || !blk_qc_t_valid(cookie) ||</div><div class='add'>+	    !test_bit(QUEUE_FLAG_POLL, &amp;q-&gt;queue_flags))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	plug = current-&gt;plug;</div><div class='add'>+	if (plug)</div><div class='add'>+		blk_flush_plug_list(plug, false);</div><div class='add'>+</div><div class='add'>+	hctx = q-&gt;queue_hw_ctx[blk_qc_t_to_queue_num(cookie)];</div><div class='add'>+	if (!blk_qc_t_is_internal(cookie))</div><div class='add'>+		rq = blk_mq_tag_to_rq(hctx-&gt;tags, blk_qc_t_to_tag(cookie));</div><div class='add'>+	else</div><div class='add'>+		rq = blk_mq_tag_to_rq(hctx-&gt;sched_tags, blk_qc_t_to_tag(cookie));</div><div class='add'>+</div><div class='add'>+	return __blk_mq_poll(hctx, rq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_mq_poll);</div><div class='add'>+</div><div class='ctx'> void blk_mq_disable_hotplug(void)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;all_q_mutex);</div><div class='head'>diff --git a/block/blk-mq.h b/block/blk-mq.h<br/>index e5d25249028c..088ced003c13 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-mq.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-mq.h</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-mq.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-mq.h</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> #ifndef INT_BLK_MQ_H</div><div class='ctx'> #define INT_BLK_MQ_H</div><div class='ctx'> </div><div class='add'>+#include "blk-stat.h"</div><div class='add'>+</div><div class='ctx'> struct blk_mq_tag_set;</div><div class='ctx'> </div><div class='ctx'> struct blk_mq_ctx {</div><div class='hunk'>@@ -18,6 +20,7 @@ struct blk_mq_ctx {</div><div class='ctx'> </div><div class='ctx'> 	/* incremented at completion time */</div><div class='ctx'> 	unsigned long		____cacheline_aligned_in_smp rq_completed[2];</div><div class='add'>+	struct blk_rq_stat	stat[2];</div><div class='ctx'> </div><div class='ctx'> 	struct request_queue	*queue;</div><div class='ctx'> 	struct kobject		kobj;</div><div class='hunk'>@@ -28,8 +31,33 @@ void blk_mq_freeze_queue(struct request_queue *q);</div><div class='ctx'> void blk_mq_free_queue(struct request_queue *q);</div><div class='ctx'> int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr);</div><div class='ctx'> void blk_mq_wake_waiters(struct request_queue *q);</div><div class='add'>+bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *, struct list_head *);</div><div class='add'>+void blk_mq_flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list);</div><div class='add'>+bool blk_mq_hctx_has_pending(struct blk_mq_hw_ctx *hctx);</div><div class='add'>+bool blk_mq_get_driver_tag(struct request *rq, struct blk_mq_hw_ctx **hctx,</div><div class='add'>+				bool wait);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Internal helpers for allocating/freeing the request map</div><div class='add'>+ */</div><div class='add'>+void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,</div><div class='add'>+		     unsigned int hctx_idx);</div><div class='add'>+void blk_mq_free_rq_map(struct blk_mq_tags *tags);</div><div class='add'>+struct blk_mq_tags *blk_mq_alloc_rq_map(struct blk_mq_tag_set *set,</div><div class='add'>+					unsigned int hctx_idx,</div><div class='add'>+					unsigned int nr_tags,</div><div class='add'>+					unsigned int reserved_tags);</div><div class='add'>+int blk_mq_alloc_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,</div><div class='add'>+		     unsigned int hctx_idx, unsigned int depth);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Internal helpers for request insertion into sw queues</div><div class='add'>+ */</div><div class='add'>+void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,</div><div class='add'>+				bool at_head);</div><div class='add'>+void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx,</div><div class='add'>+				struct list_head *list);</div><div class='add'>+/*</div><div class='ctx'>  * CPU hotplug helpers</div><div class='ctx'>  */</div><div class='ctx'> void blk_mq_enable_hotplug(void);</div><div class='hunk'>@@ -38,7 +66,6 @@ void blk_mq_disable_hotplug(void);</div><div class='ctx'> /*</div><div class='ctx'>  * CPU -&gt; queue mappings</div><div class='ctx'>  */</div><div class='del'>-int blk_mq_map_queues(struct blk_mq_tag_set *set);</div><div class='ctx'> extern int blk_mq_hw_queue_to_node(unsigned int *map, unsigned int);</div><div class='ctx'> </div><div class='ctx'> static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q,</div><div class='hunk'>@@ -54,6 +81,35 @@ extern int blk_mq_sysfs_register(struct request_queue *q);</div><div class='ctx'> extern void blk_mq_sysfs_unregister(struct request_queue *q);</div><div class='ctx'> extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * debugfs helpers</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_BLK_DEBUG_FS</div><div class='add'>+int blk_mq_debugfs_register(struct request_queue *q, const char *name);</div><div class='add'>+void blk_mq_debugfs_unregister(struct request_queue *q);</div><div class='add'>+int blk_mq_debugfs_register_hctxs(struct request_queue *q);</div><div class='add'>+void blk_mq_debugfs_unregister_hctxs(struct request_queue *q);</div><div class='add'>+#else</div><div class='add'>+static inline int blk_mq_debugfs_register(struct request_queue *q,</div><div class='add'>+					  const char *name)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void blk_mq_debugfs_unregister(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int blk_mq_debugfs_register_hctxs(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void blk_mq_debugfs_unregister_hctxs(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> extern void blk_mq_rq_timed_out(struct request *req, bool reserved);</div><div class='ctx'> </div><div class='ctx'> void blk_mq_release(struct request_queue *q);</div><div class='hunk'>@@ -90,14 +146,28 @@ struct blk_mq_alloc_data {</div><div class='ctx'> 	struct blk_mq_hw_ctx *hctx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void blk_mq_set_alloc_data(struct blk_mq_alloc_data *data,</div><div class='del'>-		struct request_queue *q, unsigned int flags,</div><div class='del'>-		struct blk_mq_ctx *ctx, struct blk_mq_hw_ctx *hctx)</div><div class='add'>+static inline struct blk_mq_tags *blk_mq_tags_from_data(struct blk_mq_alloc_data *data)</div><div class='add'>+{</div><div class='add'>+	if (data-&gt;flags &amp; BLK_MQ_REQ_INTERNAL)</div><div class='add'>+		return data-&gt;hctx-&gt;sched_tags;</div><div class='add'>+</div><div class='add'>+	return data-&gt;hctx-&gt;tags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Internal helpers for request allocation/init/free</div><div class='add'>+ */</div><div class='add'>+void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx,</div><div class='add'>+			struct request *rq, unsigned int op);</div><div class='add'>+void __blk_mq_finish_request(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx,</div><div class='add'>+				struct request *rq);</div><div class='add'>+void blk_mq_finish_request(struct request *rq);</div><div class='add'>+struct request *__blk_mq_alloc_request(struct blk_mq_alloc_data *data,</div><div class='add'>+					unsigned int op);</div><div class='add'>+</div><div class='add'>+static inline bool blk_mq_hctx_stopped(struct blk_mq_hw_ctx *hctx)</div><div class='ctx'> {</div><div class='del'>-	data-&gt;q = q;</div><div class='del'>-	data-&gt;flags = flags;</div><div class='del'>-	data-&gt;ctx = ctx;</div><div class='del'>-	data-&gt;hctx = hctx;</div><div class='add'>+	return test_bit(BLK_MQ_S_STOPPED, &amp;hctx-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool blk_mq_hw_queue_mapped(struct blk_mq_hw_ctx *hctx)</div><div class='head'>diff --git a/block/blk-settings.c b/block/blk-settings.c<br/>index f679ae122843..1e7174ffc9d4 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-settings.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-settings.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-settings.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-settings.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "blk.h"</div><div class='add'>+#include "blk-wbt.h"</div><div class='ctx'> </div><div class='ctx'> unsigned long blk_max_low_pfn;</div><div class='ctx'> EXPORT_SYMBOL(blk_max_low_pfn);</div><div class='hunk'>@@ -87,6 +88,7 @@ EXPORT_SYMBOL_GPL(blk_queue_lld_busy);</div><div class='ctx'> void blk_set_default_limits(struct queue_limits *lim)</div><div class='ctx'> {</div><div class='ctx'> 	lim-&gt;max_segments = BLK_MAX_SEGMENTS;</div><div class='add'>+	lim-&gt;max_discard_segments = 1;</div><div class='ctx'> 	lim-&gt;max_integrity_segments = 0;</div><div class='ctx'> 	lim-&gt;seg_boundary_mask = BLK_SEG_BOUNDARY_MASK;</div><div class='ctx'> 	lim-&gt;virt_boundary_mask = 0;</div><div class='hunk'>@@ -95,6 +97,7 @@ void blk_set_default_limits(struct queue_limits *lim)</div><div class='ctx'> 	lim-&gt;max_dev_sectors = 0;</div><div class='ctx'> 	lim-&gt;chunk_sectors = 0;</div><div class='ctx'> 	lim-&gt;max_write_same_sectors = 0;</div><div class='add'>+	lim-&gt;max_write_zeroes_sectors = 0;</div><div class='ctx'> 	lim-&gt;max_discard_sectors = 0;</div><div class='ctx'> 	lim-&gt;max_hw_discard_sectors = 0;</div><div class='ctx'> 	lim-&gt;discard_granularity = 0;</div><div class='hunk'>@@ -107,6 +110,7 @@ void blk_set_default_limits(struct queue_limits *lim)</div><div class='ctx'> 	lim-&gt;io_opt = 0;</div><div class='ctx'> 	lim-&gt;misaligned = 0;</div><div class='ctx'> 	lim-&gt;cluster = 1;</div><div class='add'>+	lim-&gt;zoned = BLK_ZONED_NONE;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_set_default_limits);</div><div class='ctx'> </div><div class='hunk'>@@ -125,11 +129,13 @@ void blk_set_stacking_limits(struct queue_limits *lim)</div><div class='ctx'> 	/* Inherit limits from component devices */</div><div class='ctx'> 	lim-&gt;discard_zeroes_data = 1;</div><div class='ctx'> 	lim-&gt;max_segments = USHRT_MAX;</div><div class='add'>+	lim-&gt;max_discard_segments = 1;</div><div class='ctx'> 	lim-&gt;max_hw_sectors = UINT_MAX;</div><div class='ctx'> 	lim-&gt;max_segment_size = UINT_MAX;</div><div class='ctx'> 	lim-&gt;max_sectors = UINT_MAX;</div><div class='ctx'> 	lim-&gt;max_dev_sectors = UINT_MAX;</div><div class='ctx'> 	lim-&gt;max_write_same_sectors = UINT_MAX;</div><div class='add'>+	lim-&gt;max_write_zeroes_sectors = UINT_MAX;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_set_stacking_limits);</div><div class='ctx'> </div><div class='hunk'>@@ -249,6 +255,7 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto</div><div class='ctx'> 	max_sectors = min_not_zero(max_hw_sectors, limits-&gt;max_dev_sectors);</div><div class='ctx'> 	max_sectors = min_t(unsigned int, max_sectors, BLK_DEF_MAX_SECTORS);</div><div class='ctx'> 	limits-&gt;max_sectors = max_sectors;</div><div class='add'>+	q-&gt;backing_dev_info-&gt;io_pages = max_sectors &gt;&gt; (PAGE_SHIFT - 9);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_queue_max_hw_sectors);</div><div class='ctx'> </div><div class='hunk'>@@ -298,6 +305,19 @@ void blk_queue_max_write_same_sectors(struct request_queue *q,</div><div class='ctx'> EXPORT_SYMBOL(blk_queue_max_write_same_sectors);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * blk_queue_max_write_zeroes_sectors - set max sectors for a single</div><div class='add'>+ *                                      write zeroes</div><div class='add'>+ * @q:  the request queue for the device</div><div class='add'>+ * @max_write_zeroes_sectors: maximum number of sectors to write per command</div><div class='add'>+ **/</div><div class='add'>+void blk_queue_max_write_zeroes_sectors(struct request_queue *q,</div><div class='add'>+		unsigned int max_write_zeroes_sectors)</div><div class='add'>+{</div><div class='add'>+	q-&gt;limits.max_write_zeroes_sectors = max_write_zeroes_sectors;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(blk_queue_max_write_zeroes_sectors);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * blk_queue_max_segments - set max hw segments for a request for this queue</div><div class='ctx'>  * @q:  the request queue for the device</div><div class='ctx'>  * @max_segments:  max number of segments</div><div class='hunk'>@@ -319,6 +339,22 @@ void blk_queue_max_segments(struct request_queue *q, unsigned short max_segments</div><div class='ctx'> EXPORT_SYMBOL(blk_queue_max_segments);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * blk_queue_max_discard_segments - set max segments for discard requests</div><div class='add'>+ * @q:  the request queue for the device</div><div class='add'>+ * @max_segments:  max number of segments</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *    Enables a low level driver to set an upper limit on the number of</div><div class='add'>+ *    segments in a discard request.</div><div class='add'>+ **/</div><div class='add'>+void blk_queue_max_discard_segments(struct request_queue *q,</div><div class='add'>+		unsigned short max_segments)</div><div class='add'>+{</div><div class='add'>+	q-&gt;limits.max_discard_segments = max_segments;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blk_queue_max_discard_segments);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * blk_queue_max_segment_size - set max segment size for blk_rq_map_sg</div><div class='ctx'>  * @q:  the request queue for the device</div><div class='ctx'>  * @max_size:  max size of segment in bytes</div><div class='hunk'>@@ -525,6 +561,8 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,</div><div class='ctx'> 	t-&gt;max_dev_sectors = min_not_zero(t-&gt;max_dev_sectors, b-&gt;max_dev_sectors);</div><div class='ctx'> 	t-&gt;max_write_same_sectors = min(t-&gt;max_write_same_sectors,</div><div class='ctx'> 					b-&gt;max_write_same_sectors);</div><div class='add'>+	t-&gt;max_write_zeroes_sectors = min(t-&gt;max_write_zeroes_sectors,</div><div class='add'>+					b-&gt;max_write_zeroes_sectors);</div><div class='ctx'> 	t-&gt;bounce_pfn = min_not_zero(t-&gt;bounce_pfn, b-&gt;bounce_pfn);</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;seg_boundary_mask = min_not_zero(t-&gt;seg_boundary_mask,</div><div class='hunk'>@@ -533,6 +571,8 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,</div><div class='ctx'> 					    b-&gt;virt_boundary_mask);</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;max_segments = min_not_zero(t-&gt;max_segments, b-&gt;max_segments);</div><div class='add'>+	t-&gt;max_discard_segments = min_not_zero(t-&gt;max_discard_segments,</div><div class='add'>+					       b-&gt;max_discard_segments);</div><div class='ctx'> 	t-&gt;max_integrity_segments = min_not_zero(t-&gt;max_integrity_segments,</div><div class='ctx'> 						 b-&gt;max_integrity_segments);</div><div class='ctx'> </div><div class='hunk'>@@ -630,6 +670,10 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,</div><div class='ctx'> 			t-&gt;discard_granularity;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (b-&gt;chunk_sectors)</div><div class='add'>+		t-&gt;chunk_sectors = min_not_zero(t-&gt;chunk_sectors,</div><div class='add'>+						b-&gt;chunk_sectors);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_stack_limits);</div><div class='hunk'>@@ -832,6 +876,19 @@ void blk_queue_flush_queueable(struct request_queue *q, bool queueable)</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_queue_flush_queueable);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * blk_set_queue_depth - tell the block layer about the device queue depth</div><div class='add'>+ * @q:		the request queue for the device</div><div class='add'>+ * @depth:		queue depth</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void blk_set_queue_depth(struct request_queue *q, unsigned int depth)</div><div class='add'>+{</div><div class='add'>+	q-&gt;queue_depth = depth;</div><div class='add'>+	wbt_set_queue_depth(q-&gt;rq_wb, depth);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(blk_set_queue_depth);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * blk_queue_write_cache - configure queue's write cache</div><div class='ctx'>  * @q:		the request queue for the device</div><div class='ctx'>  * @wc:		write back cache on or off</div><div class='hunk'>@@ -851,6 +908,8 @@ void blk_queue_write_cache(struct request_queue *q, bool wc, bool fua)</div><div class='ctx'> 	else</div><div class='ctx'> 		queue_flag_clear(QUEUE_FLAG_FUA, q);</div><div class='ctx'> 	spin_unlock_irq(q-&gt;queue_lock);</div><div class='add'>+</div><div class='add'>+	wbt_set_write_cache(q-&gt;rq_wb, test_bit(QUEUE_FLAG_WC, &amp;q-&gt;queue_flags));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(blk_queue_write_cache);</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-softirq.c b/block/blk-softirq.c<br/>index 06cf9807f49a..87b7df4851bf 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-softirq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-softirq.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-softirq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-softirq.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/topology.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "blk.h"</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-stat.c b/block/blk-stat.c<br/>new file mode 100644<br/>index 000000000000..9b43efb8933f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/blk-stat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-stat.c</a></div><div class='hunk'>@@ -0,0 +1,256 @@</div><div class='add'>+/*</div><div class='add'>+ * Block stat tracking code</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Jens Axboe</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/blk-mq.h&gt;</div><div class='add'>+</div><div class='add'>+#include "blk-stat.h"</div><div class='add'>+#include "blk-mq.h"</div><div class='add'>+</div><div class='add'>+static void blk_stat_flush_batch(struct blk_rq_stat *stat)</div><div class='add'>+{</div><div class='add'>+	const s32 nr_batch = READ_ONCE(stat-&gt;nr_batch);</div><div class='add'>+	const s32 nr_samples = READ_ONCE(stat-&gt;nr_samples);</div><div class='add'>+</div><div class='add'>+	if (!nr_batch)</div><div class='add'>+		return;</div><div class='add'>+	if (!nr_samples)</div><div class='add'>+		stat-&gt;mean = div64_s64(stat-&gt;batch, nr_batch);</div><div class='add'>+	else {</div><div class='add'>+		stat-&gt;mean = div64_s64((stat-&gt;mean * nr_samples) +</div><div class='add'>+					stat-&gt;batch,</div><div class='add'>+					nr_batch + nr_samples);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stat-&gt;nr_samples += nr_batch;</div><div class='add'>+	stat-&gt;nr_batch = stat-&gt;batch = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void blk_stat_sum(struct blk_rq_stat *dst, struct blk_rq_stat *src)</div><div class='add'>+{</div><div class='add'>+	if (!src-&gt;nr_samples)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	blk_stat_flush_batch(src);</div><div class='add'>+</div><div class='add'>+	dst-&gt;min = min(dst-&gt;min, src-&gt;min);</div><div class='add'>+	dst-&gt;max = max(dst-&gt;max, src-&gt;max);</div><div class='add'>+</div><div class='add'>+	if (!dst-&gt;nr_samples)</div><div class='add'>+		dst-&gt;mean = src-&gt;mean;</div><div class='add'>+	else {</div><div class='add'>+		dst-&gt;mean = div64_s64((src-&gt;mean * src-&gt;nr_samples) +</div><div class='add'>+					(dst-&gt;mean * dst-&gt;nr_samples),</div><div class='add'>+					dst-&gt;nr_samples + src-&gt;nr_samples);</div><div class='add'>+	}</div><div class='add'>+	dst-&gt;nr_samples += src-&gt;nr_samples;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void blk_mq_stat_get(struct request_queue *q, struct blk_rq_stat *dst)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+	struct blk_mq_ctx *ctx;</div><div class='add'>+	uint64_t latest = 0;</div><div class='add'>+	int i, j, nr;</div><div class='add'>+</div><div class='add'>+	blk_stat_init(&amp;dst[BLK_STAT_READ]);</div><div class='add'>+	blk_stat_init(&amp;dst[BLK_STAT_WRITE]);</div><div class='add'>+</div><div class='add'>+	nr = 0;</div><div class='add'>+	do {</div><div class='add'>+		uint64_t newest = 0;</div><div class='add'>+</div><div class='add'>+		queue_for_each_hw_ctx(q, hctx, i) {</div><div class='add'>+			hctx_for_each_ctx(hctx, ctx, j) {</div><div class='add'>+				blk_stat_flush_batch(&amp;ctx-&gt;stat[BLK_STAT_READ]);</div><div class='add'>+				blk_stat_flush_batch(&amp;ctx-&gt;stat[BLK_STAT_WRITE]);</div><div class='add'>+</div><div class='add'>+				if (!ctx-&gt;stat[BLK_STAT_READ].nr_samples &amp;&amp;</div><div class='add'>+				    !ctx-&gt;stat[BLK_STAT_WRITE].nr_samples)</div><div class='add'>+					continue;</div><div class='add'>+				if (ctx-&gt;stat[BLK_STAT_READ].time &gt; newest)</div><div class='add'>+					newest = ctx-&gt;stat[BLK_STAT_READ].time;</div><div class='add'>+				if (ctx-&gt;stat[BLK_STAT_WRITE].time &gt; newest)</div><div class='add'>+					newest = ctx-&gt;stat[BLK_STAT_WRITE].time;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * No samples</div><div class='add'>+		 */</div><div class='add'>+		if (!newest)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (newest &gt; latest)</div><div class='add'>+			latest = newest;</div><div class='add'>+</div><div class='add'>+		queue_for_each_hw_ctx(q, hctx, i) {</div><div class='add'>+			hctx_for_each_ctx(hctx, ctx, j) {</div><div class='add'>+				if (ctx-&gt;stat[BLK_STAT_READ].time == newest) {</div><div class='add'>+					blk_stat_sum(&amp;dst[BLK_STAT_READ],</div><div class='add'>+						     &amp;ctx-&gt;stat[BLK_STAT_READ]);</div><div class='add'>+					nr++;</div><div class='add'>+				}</div><div class='add'>+				if (ctx-&gt;stat[BLK_STAT_WRITE].time == newest) {</div><div class='add'>+					blk_stat_sum(&amp;dst[BLK_STAT_WRITE],</div><div class='add'>+						     &amp;ctx-&gt;stat[BLK_STAT_WRITE]);</div><div class='add'>+					nr++;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * If we race on finding an entry, just loop back again.</div><div class='add'>+		 * Should be very rare.</div><div class='add'>+		 */</div><div class='add'>+	} while (!nr);</div><div class='add'>+</div><div class='add'>+	dst[BLK_STAT_READ].time = dst[BLK_STAT_WRITE].time = latest;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_queue_stat_get(struct request_queue *q, struct blk_rq_stat *dst)</div><div class='add'>+{</div><div class='add'>+	if (q-&gt;mq_ops)</div><div class='add'>+		blk_mq_stat_get(q, dst);</div><div class='add'>+	else {</div><div class='add'>+		blk_stat_flush_batch(&amp;q-&gt;rq_stats[BLK_STAT_READ]);</div><div class='add'>+		blk_stat_flush_batch(&amp;q-&gt;rq_stats[BLK_STAT_WRITE]);</div><div class='add'>+		memcpy(&amp;dst[BLK_STAT_READ], &amp;q-&gt;rq_stats[BLK_STAT_READ],</div><div class='add'>+				sizeof(struct blk_rq_stat));</div><div class='add'>+		memcpy(&amp;dst[BLK_STAT_WRITE], &amp;q-&gt;rq_stats[BLK_STAT_WRITE],</div><div class='add'>+				sizeof(struct blk_rq_stat));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_hctx_stat_get(struct blk_mq_hw_ctx *hctx, struct blk_rq_stat *dst)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_ctx *ctx;</div><div class='add'>+	unsigned int i, nr;</div><div class='add'>+</div><div class='add'>+	nr = 0;</div><div class='add'>+	do {</div><div class='add'>+		uint64_t newest = 0;</div><div class='add'>+</div><div class='add'>+		hctx_for_each_ctx(hctx, ctx, i) {</div><div class='add'>+			blk_stat_flush_batch(&amp;ctx-&gt;stat[BLK_STAT_READ]);</div><div class='add'>+			blk_stat_flush_batch(&amp;ctx-&gt;stat[BLK_STAT_WRITE]);</div><div class='add'>+</div><div class='add'>+			if (!ctx-&gt;stat[BLK_STAT_READ].nr_samples &amp;&amp;</div><div class='add'>+			    !ctx-&gt;stat[BLK_STAT_WRITE].nr_samples)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (ctx-&gt;stat[BLK_STAT_READ].time &gt; newest)</div><div class='add'>+				newest = ctx-&gt;stat[BLK_STAT_READ].time;</div><div class='add'>+			if (ctx-&gt;stat[BLK_STAT_WRITE].time &gt; newest)</div><div class='add'>+				newest = ctx-&gt;stat[BLK_STAT_WRITE].time;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!newest)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		hctx_for_each_ctx(hctx, ctx, i) {</div><div class='add'>+			if (ctx-&gt;stat[BLK_STAT_READ].time == newest) {</div><div class='add'>+				blk_stat_sum(&amp;dst[BLK_STAT_READ],</div><div class='add'>+						&amp;ctx-&gt;stat[BLK_STAT_READ]);</div><div class='add'>+				nr++;</div><div class='add'>+			}</div><div class='add'>+			if (ctx-&gt;stat[BLK_STAT_WRITE].time == newest) {</div><div class='add'>+				blk_stat_sum(&amp;dst[BLK_STAT_WRITE],</div><div class='add'>+						&amp;ctx-&gt;stat[BLK_STAT_WRITE]);</div><div class='add'>+				nr++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * If we race on finding an entry, just loop back again.</div><div class='add'>+		 * Should be very rare, as the window is only updated</div><div class='add'>+		 * occasionally</div><div class='add'>+		 */</div><div class='add'>+	} while (!nr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __blk_stat_init(struct blk_rq_stat *stat, s64 time_now)</div><div class='add'>+{</div><div class='add'>+	stat-&gt;min = -1ULL;</div><div class='add'>+	stat-&gt;max = stat-&gt;nr_samples = stat-&gt;mean = 0;</div><div class='add'>+	stat-&gt;batch = stat-&gt;nr_batch = 0;</div><div class='add'>+	stat-&gt;time = time_now &amp; BLK_STAT_NSEC_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_stat_init(struct blk_rq_stat *stat)</div><div class='add'>+{</div><div class='add'>+	__blk_stat_init(stat, ktime_to_ns(ktime_get()));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __blk_stat_is_current(struct blk_rq_stat *stat, s64 now)</div><div class='add'>+{</div><div class='add'>+	return (now &amp; BLK_STAT_NSEC_MASK) == (stat-&gt;time &amp; BLK_STAT_NSEC_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool blk_stat_is_current(struct blk_rq_stat *stat)</div><div class='add'>+{</div><div class='add'>+	return __blk_stat_is_current(stat, ktime_to_ns(ktime_get()));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_stat_add(struct blk_rq_stat *stat, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	s64 now, value;</div><div class='add'>+</div><div class='add'>+	now = __blk_stat_time(ktime_to_ns(ktime_get()));</div><div class='add'>+	if (now &lt; blk_stat_time(&amp;rq-&gt;issue_stat))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!__blk_stat_is_current(stat, now))</div><div class='add'>+		__blk_stat_init(stat, now);</div><div class='add'>+</div><div class='add'>+	value = now - blk_stat_time(&amp;rq-&gt;issue_stat);</div><div class='add'>+	if (value &gt; stat-&gt;max)</div><div class='add'>+		stat-&gt;max = value;</div><div class='add'>+	if (value &lt; stat-&gt;min)</div><div class='add'>+		stat-&gt;min = value;</div><div class='add'>+</div><div class='add'>+	if (stat-&gt;batch + value &lt; stat-&gt;batch ||</div><div class='add'>+	    stat-&gt;nr_batch + 1 == BLK_RQ_STAT_BATCH)</div><div class='add'>+		blk_stat_flush_batch(stat);</div><div class='add'>+</div><div class='add'>+	stat-&gt;batch += value;</div><div class='add'>+	stat-&gt;nr_batch++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_stat_clear(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	if (q-&gt;mq_ops) {</div><div class='add'>+		struct blk_mq_hw_ctx *hctx;</div><div class='add'>+		struct blk_mq_ctx *ctx;</div><div class='add'>+		int i, j;</div><div class='add'>+</div><div class='add'>+		queue_for_each_hw_ctx(q, hctx, i) {</div><div class='add'>+			hctx_for_each_ctx(hctx, ctx, j) {</div><div class='add'>+				blk_stat_init(&amp;ctx-&gt;stat[BLK_STAT_READ]);</div><div class='add'>+				blk_stat_init(&amp;ctx-&gt;stat[BLK_STAT_WRITE]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		blk_stat_init(&amp;q-&gt;rq_stats[BLK_STAT_READ]);</div><div class='add'>+		blk_stat_init(&amp;q-&gt;rq_stats[BLK_STAT_WRITE]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void blk_stat_set_issue_time(struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+	stat-&gt;time = (stat-&gt;time &amp; BLK_STAT_MASK) |</div><div class='add'>+			(ktime_to_ns(ktime_get()) &amp; BLK_STAT_TIME_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable stat tracking, return whether it was enabled</div><div class='add'>+ */</div><div class='add'>+bool blk_stat_enable(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	if (!test_bit(QUEUE_FLAG_STATS, &amp;q-&gt;queue_flags)) {</div><div class='add'>+		set_bit(QUEUE_FLAG_STATS, &amp;q-&gt;queue_flags);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='head'>diff --git a/block/blk-stat.h b/block/blk-stat.h<br/>new file mode 100644<br/>index 000000000000..a2050a0a5314<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/blk-stat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-stat.h</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+#ifndef BLK_STAT_H</div><div class='add'>+#define BLK_STAT_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ~0.13s window as a power-of-2 (2^27 nsecs)</div><div class='add'>+ */</div><div class='add'>+#define BLK_STAT_NSEC		134217728ULL</div><div class='add'>+#define BLK_STAT_NSEC_MASK	~(BLK_STAT_NSEC - 1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Upper 3 bits can be used elsewhere</div><div class='add'>+ */</div><div class='add'>+#define BLK_STAT_RES_BITS	3</div><div class='add'>+#define BLK_STAT_SHIFT		(64 - BLK_STAT_RES_BITS)</div><div class='add'>+#define BLK_STAT_TIME_MASK	((1ULL &lt;&lt; BLK_STAT_SHIFT) - 1)</div><div class='add'>+#define BLK_STAT_MASK		~BLK_STAT_TIME_MASK</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BLK_STAT_READ	= 0,</div><div class='add'>+	BLK_STAT_WRITE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void blk_stat_add(struct blk_rq_stat *, struct request *);</div><div class='add'>+void blk_hctx_stat_get(struct blk_mq_hw_ctx *, struct blk_rq_stat *);</div><div class='add'>+void blk_queue_stat_get(struct request_queue *, struct blk_rq_stat *);</div><div class='add'>+void blk_stat_clear(struct request_queue *);</div><div class='add'>+void blk_stat_init(struct blk_rq_stat *);</div><div class='add'>+bool blk_stat_is_current(struct blk_rq_stat *);</div><div class='add'>+void blk_stat_set_issue_time(struct blk_issue_stat *);</div><div class='add'>+bool blk_stat_enable(struct request_queue *);</div><div class='add'>+</div><div class='add'>+static inline u64 __blk_stat_time(u64 time)</div><div class='add'>+{</div><div class='add'>+	return time &amp; BLK_STAT_TIME_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 blk_stat_time(struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+	return __blk_stat_time(stat-&gt;time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c<br/>index 9cc8d7c5439a..c44b321335f3 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-sysfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-sysfs.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-sysfs.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "blk.h"</div><div class='ctx'> #include "blk-mq.h"</div><div class='add'>+#include "blk-wbt.h"</div><div class='ctx'> </div><div class='ctx'> struct queue_sysfs_entry {</div><div class='ctx'> 	struct attribute attr;</div><div class='hunk'>@@ -41,6 +42,19 @@ queue_var_store(unsigned long *var, const char *page, size_t count)</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t queue_var_store64(s64 *var, const char *page)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	s64 v;</div><div class='add'>+</div><div class='add'>+	err = kstrtos64(page, 10, &amp;v);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*var = v;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t queue_requests_show(struct request_queue *q, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return queue_var_show(q-&gt;nr_requests, (page));</div><div class='hunk'>@@ -75,7 +89,7 @@ queue_requests_store(struct request_queue *q, const char *page, size_t count)</div><div class='ctx'> </div><div class='ctx'> static ssize_t queue_ra_show(struct request_queue *q, char *page)</div><div class='ctx'> {</div><div class='del'>-	unsigned long ra_kb = q-&gt;backing_dev_info.ra_pages &lt;&lt;</div><div class='add'>+	unsigned long ra_kb = q-&gt;backing_dev_info-&gt;ra_pages &lt;&lt;</div><div class='ctx'> 					(PAGE_SHIFT - 10);</div><div class='ctx'> </div><div class='ctx'> 	return queue_var_show(ra_kb, (page));</div><div class='hunk'>@@ -90,7 +104,7 @@ queue_ra_store(struct request_queue *q, const char *page, size_t count)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	q-&gt;backing_dev_info.ra_pages = ra_kb &gt;&gt; (PAGE_SHIFT - 10);</div><div class='add'>+	q-&gt;backing_dev_info-&gt;ra_pages = ra_kb &gt;&gt; (PAGE_SHIFT - 10);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -107,6 +121,12 @@ static ssize_t queue_max_segments_show(struct request_queue *q, char *page)</div><div class='ctx'> 	return queue_var_show(queue_max_segments(q), (page));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t queue_max_discard_segments_show(struct request_queue *q,</div><div class='add'>+		char *page)</div><div class='add'>+{</div><div class='add'>+	return queue_var_show(queue_max_discard_segments(q), (page));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t queue_max_integrity_segments_show(struct request_queue *q, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return queue_var_show(q-&gt;limits.max_integrity_segments, (page));</div><div class='hunk'>@@ -130,6 +150,11 @@ static ssize_t queue_physical_block_size_show(struct request_queue *q, char *pag</div><div class='ctx'> 	return queue_var_show(queue_physical_block_size(q), page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t queue_chunk_sectors_show(struct request_queue *q, char *page)</div><div class='add'>+{</div><div class='add'>+	return queue_var_show(q-&gt;limits.chunk_sectors, page);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t queue_io_min_show(struct request_queue *q, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return queue_var_show(queue_io_min(q), page);</div><div class='hunk'>@@ -192,6 +217,11 @@ static ssize_t queue_write_same_max_show(struct request_queue *q, char *page)</div><div class='ctx'> 		(unsigned long long)q-&gt;limits.max_write_same_sectors &lt;&lt; 9);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t queue_write_zeroes_max_show(struct request_queue *q, char *page)</div><div class='add'>+{</div><div class='add'>+	return sprintf(page, "%llu\n",</div><div class='add'>+		(unsigned long long)q-&gt;limits.max_write_zeroes_sectors &lt;&lt; 9);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)</div><div class='hunk'>@@ -212,6 +242,7 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> 	q-&gt;limits.max_sectors = max_sectors_kb &lt;&lt; 1;</div><div class='add'>+	q-&gt;backing_dev_info-&gt;io_pages = max_sectors_kb &gt;&gt; (PAGE_SHIFT - 10);</div><div class='ctx'> 	spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -257,6 +288,18 @@ QUEUE_SYSFS_BIT_FNS(random, ADD_RANDOM, 0);</div><div class='ctx'> QUEUE_SYSFS_BIT_FNS(iostats, IO_STAT, 0);</div><div class='ctx'> #undef QUEUE_SYSFS_BIT_FNS</div><div class='ctx'> </div><div class='add'>+static ssize_t queue_zoned_show(struct request_queue *q, char *page)</div><div class='add'>+{</div><div class='add'>+	switch (blk_queue_zoned_model(q)) {</div><div class='add'>+	case BLK_ZONED_HA:</div><div class='add'>+		return sprintf(page, "host-aware\n");</div><div class='add'>+	case BLK_ZONED_HM:</div><div class='add'>+		return sprintf(page, "host-managed\n");</div><div class='add'>+	default:</div><div class='add'>+		return sprintf(page, "none\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t queue_nomerges_show(struct request_queue *q, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return queue_var_show((blk_queue_nomerges(q) &lt;&lt; 1) |</div><div class='hunk'>@@ -319,6 +362,38 @@ queue_rq_affinity_store(struct request_queue *q, const char *page, size_t count)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t queue_poll_delay_show(struct request_queue *q, char *page)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (q-&gt;poll_nsec == -1)</div><div class='add'>+		val = -1;</div><div class='add'>+	else</div><div class='add'>+		val = q-&gt;poll_nsec / 1000;</div><div class='add'>+</div><div class='add'>+	return sprintf(page, "%d\n", val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t queue_poll_delay_store(struct request_queue *q, const char *page,</div><div class='add'>+				size_t count)</div><div class='add'>+{</div><div class='add'>+	int err, val;</div><div class='add'>+</div><div class='add'>+	if (!q-&gt;mq_ops || !q-&gt;mq_ops-&gt;poll)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = kstrtoint(page, 10, &amp;val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (val == -1)</div><div class='add'>+		q-&gt;poll_nsec = -1;</div><div class='add'>+	else</div><div class='add'>+		q-&gt;poll_nsec = val * 1000;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t queue_poll_show(struct request_queue *q, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return queue_var_show(test_bit(QUEUE_FLAG_POLL, &amp;q-&gt;queue_flags), page);</div><div class='hunk'>@@ -347,6 +422,50 @@ static ssize_t queue_poll_store(struct request_queue *q, const char *page,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t queue_wb_lat_show(struct request_queue *q, char *page)</div><div class='add'>+{</div><div class='add'>+	if (!q-&gt;rq_wb)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return sprintf(page, "%llu\n", div_u64(q-&gt;rq_wb-&gt;min_lat_nsec, 1000));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t queue_wb_lat_store(struct request_queue *q, const char *page,</div><div class='add'>+				  size_t count)</div><div class='add'>+{</div><div class='add'>+	struct rq_wb *rwb;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	s64 val;</div><div class='add'>+</div><div class='add'>+	ret = queue_var_store64(&amp;val, page);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (val &lt; -1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rwb = q-&gt;rq_wb;</div><div class='add'>+	if (!rwb) {</div><div class='add'>+		ret = wbt_init(q);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		rwb = q-&gt;rq_wb;</div><div class='add'>+		if (!rwb)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val == -1)</div><div class='add'>+		rwb-&gt;min_lat_nsec = wbt_default_latency_nsec(q);</div><div class='add'>+	else if (val &gt;= 0)</div><div class='add'>+		rwb-&gt;min_lat_nsec = val * 1000ULL;</div><div class='add'>+</div><div class='add'>+	if (rwb-&gt;enable_state == WBT_STATE_ON_DEFAULT)</div><div class='add'>+		rwb-&gt;enable_state = WBT_STATE_ON_MANUAL;</div><div class='add'>+</div><div class='add'>+	wbt_update_limits(rwb);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t queue_wc_show(struct request_queue *q, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_bit(QUEUE_FLAG_WC, &amp;q-&gt;queue_flags))</div><div class='hunk'>@@ -384,6 +503,26 @@ static ssize_t queue_dax_show(struct request_queue *q, char *page)</div><div class='ctx'> 	return queue_var_show(blk_queue_dax(q), page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t print_stat(char *page, struct blk_rq_stat *stat, const char *pre)</div><div class='add'>+{</div><div class='add'>+	return sprintf(page, "%s samples=%llu, mean=%lld, min=%lld, max=%lld\n",</div><div class='add'>+			pre, (long long) stat-&gt;nr_samples,</div><div class='add'>+			(long long) stat-&gt;mean, (long long) stat-&gt;min,</div><div class='add'>+			(long long) stat-&gt;max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t queue_stats_show(struct request_queue *q, char *page)</div><div class='add'>+{</div><div class='add'>+	struct blk_rq_stat stat[2];</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	blk_queue_stat_get(q, stat);</div><div class='add'>+</div><div class='add'>+	ret = print_stat(page, &amp;stat[BLK_STAT_READ], "read :");</div><div class='add'>+	ret += print_stat(page + ret, &amp;stat[BLK_STAT_WRITE], "write:");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct queue_sysfs_entry queue_requests_entry = {</div><div class='ctx'> 	.attr = {.name = "nr_requests", .mode = S_IRUGO | S_IWUSR },</div><div class='ctx'> 	.show = queue_requests_show,</div><div class='hunk'>@@ -412,6 +551,11 @@ static struct queue_sysfs_entry queue_max_segments_entry = {</div><div class='ctx'> 	.show = queue_max_segments_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct queue_sysfs_entry queue_max_discard_segments_entry = {</div><div class='add'>+	.attr = {.name = "max_discard_segments", .mode = S_IRUGO },</div><div class='add'>+	.show = queue_max_discard_segments_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct queue_sysfs_entry queue_max_integrity_segments_entry = {</div><div class='ctx'> 	.attr = {.name = "max_integrity_segments", .mode = S_IRUGO },</div><div class='ctx'> 	.show = queue_max_integrity_segments_show,</div><div class='hunk'>@@ -443,6 +587,11 @@ static struct queue_sysfs_entry queue_physical_block_size_entry = {</div><div class='ctx'> 	.show = queue_physical_block_size_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct queue_sysfs_entry queue_chunk_sectors_entry = {</div><div class='add'>+	.attr = {.name = "chunk_sectors", .mode = S_IRUGO },</div><div class='add'>+	.show = queue_chunk_sectors_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct queue_sysfs_entry queue_io_min_entry = {</div><div class='ctx'> 	.attr = {.name = "minimum_io_size", .mode = S_IRUGO },</div><div class='ctx'> 	.show = queue_io_min_show,</div><div class='hunk'>@@ -479,12 +628,22 @@ static struct queue_sysfs_entry queue_write_same_max_entry = {</div><div class='ctx'> 	.show = queue_write_same_max_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct queue_sysfs_entry queue_write_zeroes_max_entry = {</div><div class='add'>+	.attr = {.name = "write_zeroes_max_bytes", .mode = S_IRUGO },</div><div class='add'>+	.show = queue_write_zeroes_max_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct queue_sysfs_entry queue_nonrot_entry = {</div><div class='ctx'> 	.attr = {.name = "rotational", .mode = S_IRUGO | S_IWUSR },</div><div class='ctx'> 	.show = queue_show_nonrot,</div><div class='ctx'> 	.store = queue_store_nonrot,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct queue_sysfs_entry queue_zoned_entry = {</div><div class='add'>+	.attr = {.name = "zoned", .mode = S_IRUGO },</div><div class='add'>+	.show = queue_zoned_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct queue_sysfs_entry queue_nomerges_entry = {</div><div class='ctx'> 	.attr = {.name = "nomerges", .mode = S_IRUGO | S_IWUSR },</div><div class='ctx'> 	.show = queue_nomerges_show,</div><div class='hunk'>@@ -515,6 +674,12 @@ static struct queue_sysfs_entry queue_poll_entry = {</div><div class='ctx'> 	.store = queue_poll_store,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct queue_sysfs_entry queue_poll_delay_entry = {</div><div class='add'>+	.attr = {.name = "io_poll_delay", .mode = S_IRUGO | S_IWUSR },</div><div class='add'>+	.show = queue_poll_delay_show,</div><div class='add'>+	.store = queue_poll_delay_store,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct queue_sysfs_entry queue_wc_entry = {</div><div class='ctx'> 	.attr = {.name = "write_cache", .mode = S_IRUGO | S_IWUSR },</div><div class='ctx'> 	.show = queue_wc_show,</div><div class='hunk'>@@ -526,18 +691,31 @@ static struct queue_sysfs_entry queue_dax_entry = {</div><div class='ctx'> 	.show = queue_dax_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct queue_sysfs_entry queue_stats_entry = {</div><div class='add'>+	.attr = {.name = "stats", .mode = S_IRUGO },</div><div class='add'>+	.show = queue_stats_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct queue_sysfs_entry queue_wb_lat_entry = {</div><div class='add'>+	.attr = {.name = "wbt_lat_usec", .mode = S_IRUGO | S_IWUSR },</div><div class='add'>+	.show = queue_wb_lat_show,</div><div class='add'>+	.store = queue_wb_lat_store,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct attribute *default_attrs[] = {</div><div class='ctx'> 	&amp;queue_requests_entry.attr,</div><div class='ctx'> 	&amp;queue_ra_entry.attr,</div><div class='ctx'> 	&amp;queue_max_hw_sectors_entry.attr,</div><div class='ctx'> 	&amp;queue_max_sectors_entry.attr,</div><div class='ctx'> 	&amp;queue_max_segments_entry.attr,</div><div class='add'>+	&amp;queue_max_discard_segments_entry.attr,</div><div class='ctx'> 	&amp;queue_max_integrity_segments_entry.attr,</div><div class='ctx'> 	&amp;queue_max_segment_size_entry.attr,</div><div class='ctx'> 	&amp;queue_iosched_entry.attr,</div><div class='ctx'> 	&amp;queue_hw_sector_size_entry.attr,</div><div class='ctx'> 	&amp;queue_logical_block_size_entry.attr,</div><div class='ctx'> 	&amp;queue_physical_block_size_entry.attr,</div><div class='add'>+	&amp;queue_chunk_sectors_entry.attr,</div><div class='ctx'> 	&amp;queue_io_min_entry.attr,</div><div class='ctx'> 	&amp;queue_io_opt_entry.attr,</div><div class='ctx'> 	&amp;queue_discard_granularity_entry.attr,</div><div class='hunk'>@@ -545,7 +723,9 @@ static struct attribute *default_attrs[] = {</div><div class='ctx'> 	&amp;queue_discard_max_hw_entry.attr,</div><div class='ctx'> 	&amp;queue_discard_zeroes_data_entry.attr,</div><div class='ctx'> 	&amp;queue_write_same_max_entry.attr,</div><div class='add'>+	&amp;queue_write_zeroes_max_entry.attr,</div><div class='ctx'> 	&amp;queue_nonrot_entry.attr,</div><div class='add'>+	&amp;queue_zoned_entry.attr,</div><div class='ctx'> 	&amp;queue_nomerges_entry.attr,</div><div class='ctx'> 	&amp;queue_rq_affinity_entry.attr,</div><div class='ctx'> 	&amp;queue_iostats_entry.attr,</div><div class='hunk'>@@ -553,6 +733,9 @@ static struct attribute *default_attrs[] = {</div><div class='ctx'> 	&amp;queue_poll_entry.attr,</div><div class='ctx'> 	&amp;queue_wc_entry.attr,</div><div class='ctx'> 	&amp;queue_dax_entry.attr,</div><div class='add'>+	&amp;queue_stats_entry.attr,</div><div class='add'>+	&amp;queue_wb_lat_entry.attr,</div><div class='add'>+	&amp;queue_poll_delay_entry.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -627,13 +810,12 @@ static void blk_release_queue(struct kobject *kobj)</div><div class='ctx'> 	struct request_queue *q =</div><div class='ctx'> 		container_of(kobj, struct request_queue, kobj);</div><div class='ctx'> </div><div class='del'>-	bdi_exit(&amp;q-&gt;backing_dev_info);</div><div class='add'>+	wbt_exit(q);</div><div class='add'>+	bdi_put(q-&gt;backing_dev_info);</div><div class='ctx'> 	blkcg_exit_queue(q);</div><div class='ctx'> </div><div class='ctx'> 	if (q-&gt;elevator) {</div><div class='del'>-		spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> 		ioc_clear_queue(q);</div><div class='del'>-		spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> 		elevator_exit(q-&gt;elevator);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -642,13 +824,19 @@ static void blk_release_queue(struct kobject *kobj)</div><div class='ctx'> 	if (q-&gt;queue_tags)</div><div class='ctx'> 		__blk_queue_free_tags(q);</div><div class='ctx'> </div><div class='del'>-	if (!q-&gt;mq_ops)</div><div class='add'>+	if (!q-&gt;mq_ops) {</div><div class='add'>+		if (q-&gt;exit_rq_fn)</div><div class='add'>+			q-&gt;exit_rq_fn(q, q-&gt;fq-&gt;flush_rq);</div><div class='ctx'> 		blk_free_flush_queue(q-&gt;fq);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		blk_mq_release(q);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	blk_trace_shutdown(q);</div><div class='ctx'> </div><div class='add'>+	if (q-&gt;mq_ops)</div><div class='add'>+		blk_mq_debugfs_unregister(q);</div><div class='add'>+</div><div class='ctx'> 	if (q-&gt;bio_split)</div><div class='ctx'> 		bioset_free(q-&gt;bio_split);</div><div class='ctx'> </div><div class='hunk'>@@ -667,6 +855,23 @@ struct kobj_type blk_queue_ktype = {</div><div class='ctx'> 	.release	= blk_release_queue,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void blk_wb_init(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+#ifndef CONFIG_BLK_WBT_MQ</div><div class='add'>+	if (q-&gt;mq_ops)</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+#ifndef CONFIG_BLK_WBT_SQ</div><div class='add'>+	if (q-&gt;request_fn)</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If this fails, we don't get throttling</div><div class='add'>+	 */</div><div class='add'>+	wbt_init(q);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int blk_register_queue(struct gendisk *disk)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -695,30 +900,36 @@ int blk_register_queue(struct gendisk *disk)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (q-&gt;mq_ops)</div><div class='add'>+		blk_mq_register_dev(dev, q);</div><div class='add'>+</div><div class='add'>+	/* Prevent changes through sysfs until registration is completed. */</div><div class='add'>+	mutex_lock(&amp;q-&gt;sysfs_lock);</div><div class='add'>+</div><div class='ctx'> 	ret = kobject_add(&amp;q-&gt;kobj, kobject_get(&amp;dev-&gt;kobj), "%s", "queue");</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		blk_trace_remove_sysfs(dev);</div><div class='del'>-		return ret;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kobject_uevent(&amp;q-&gt;kobj, KOBJ_ADD);</div><div class='ctx'> </div><div class='del'>-	if (q-&gt;mq_ops)</div><div class='del'>-		blk_mq_register_dev(dev, q);</div><div class='del'>-</div><div class='del'>-	if (!q-&gt;request_fn)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = elv_register_queue(q);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kobject_uevent(&amp;q-&gt;kobj, KOBJ_REMOVE);</div><div class='del'>-		kobject_del(&amp;q-&gt;kobj);</div><div class='del'>-		blk_trace_remove_sysfs(dev);</div><div class='del'>-		kobject_put(&amp;dev-&gt;kobj);</div><div class='del'>-		return ret;</div><div class='add'>+	blk_wb_init(q);</div><div class='add'>+</div><div class='add'>+	if (q-&gt;request_fn || (q-&gt;mq_ops &amp;&amp; q-&gt;elevator)) {</div><div class='add'>+		ret = elv_register_queue(q);</div><div class='add'>+		if (ret) {</div><div class='add'>+			kobject_uevent(&amp;q-&gt;kobj, KOBJ_REMOVE);</div><div class='add'>+			kobject_del(&amp;q-&gt;kobj);</div><div class='add'>+			blk_trace_remove_sysfs(dev);</div><div class='add'>+			kobject_put(&amp;dev-&gt;kobj);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	ret = 0;</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void blk_unregister_queue(struct gendisk *disk)</div><div class='hunk'>@@ -731,7 +942,7 @@ void blk_unregister_queue(struct gendisk *disk)</div><div class='ctx'> 	if (q-&gt;mq_ops)</div><div class='ctx'> 		blk_mq_unregister_dev(disk_to_dev(disk), q);</div><div class='ctx'> </div><div class='del'>-	if (q-&gt;request_fn)</div><div class='add'>+	if (q-&gt;request_fn || (q-&gt;mq_ops &amp;&amp; q-&gt;elevator))</div><div class='ctx'> 		elv_unregister_queue(q);</div><div class='ctx'> </div><div class='ctx'> 	kobject_uevent(&amp;q-&gt;kobj, KOBJ_REMOVE);</div><div class='head'>diff --git a/block/blk-tag.c b/block/blk-tag.c<br/>index f0344e6939d5..07cc329fa4b0 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-tag.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-tag.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-tag.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-tag.c</a></div><div class='hunk'>@@ -270,8 +270,9 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	BUG_ON(tag &gt;= bqt-&gt;real_max_depth);</div><div class='ctx'> </div><div class='ctx'> 	list_del_init(&amp;rq-&gt;queuelist);</div><div class='del'>-	rq-&gt;cmd_flags &amp;= ~REQ_QUEUED;</div><div class='add'>+	rq-&gt;rq_flags &amp;= ~RQF_QUEUED;</div><div class='ctx'> 	rq-&gt;tag = -1;</div><div class='add'>+	rq-&gt;internal_tag = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(bqt-&gt;tag_index[tag] == NULL))</div><div class='ctx'> 		printk(KERN_ERR "%s: tag %d is missing\n",</div><div class='hunk'>@@ -316,7 +317,7 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	unsigned max_depth;</div><div class='ctx'> 	int tag;</div><div class='ctx'> </div><div class='del'>-	if (unlikely((rq-&gt;cmd_flags &amp; REQ_QUEUED))) {</div><div class='add'>+	if (unlikely((rq-&gt;rq_flags &amp; RQF_QUEUED))) {</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 		       "%s: request %p for device [%s] already tagged %d",</div><div class='ctx'> 		       __func__, rq,</div><div class='hunk'>@@ -371,7 +372,7 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	bqt-&gt;next_tag = (tag + 1) % bqt-&gt;max_depth;</div><div class='del'>-	rq-&gt;cmd_flags |= REQ_QUEUED;</div><div class='add'>+	rq-&gt;rq_flags |= RQF_QUEUED;</div><div class='ctx'> 	rq-&gt;tag = tag;</div><div class='ctx'> 	bqt-&gt;tag_index[tag] = rq;</div><div class='ctx'> 	blk_start_request(rq);</div><div class='head'>diff --git a/block/blk-throttle.c b/block/blk-throttle.c<br/>index a3ea8260c94c..8fab716e4059 100644<br/>--- a/<a href='/drm-misc/tree/block/blk-throttle.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk-throttle.c</a><br/>+++ b/<a href='/drm-misc/tree/block/blk-throttle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-throttle.c</a></div><div class='hunk'>@@ -185,7 +185,7 @@ static struct throtl_grp *sq_to_tg(struct throtl_service_queue *sq)</div><div class='ctx'>  * sq_to_td - return throtl_data the specified service queue belongs to</div><div class='ctx'>  * @sq: the throtl_service_queue of interest</div><div class='ctx'>  *</div><div class='del'>- * A service_queue can be embeded in either a throtl_grp or throtl_data.</div><div class='add'>+ * A service_queue can be embedded in either a throtl_grp or throtl_data.</div><div class='ctx'>  * Determine the associated throtl_data accordingly and return it.</div><div class='ctx'>  */</div><div class='ctx'> static struct throtl_data *sq_to_td(struct throtl_service_queue *sq)</div><div class='hunk'>@@ -818,13 +818,13 @@ static void throtl_charge_bio(struct throtl_grp *tg, struct bio *bio)</div><div class='ctx'> 	tg-&gt;io_disp[rw]++;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * REQ_THROTTLED is used to prevent the same bio to be throttled</div><div class='add'>+	 * BIO_THROTTLED is used to prevent the same bio to be throttled</div><div class='ctx'> 	 * more than once as a throttled bio will go through blk-throtl the</div><div class='ctx'> 	 * second time when it eventually gets issued.  Set it when a bio</div><div class='ctx'> 	 * is being charged to a tg.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(bio-&gt;bi_opf &amp; REQ_THROTTLED))</div><div class='del'>-		bio-&gt;bi_opf |= REQ_THROTTLED;</div><div class='add'>+	if (!bio_flagged(bio, BIO_THROTTLED))</div><div class='add'>+		bio_set_flag(bio, BIO_THROTTLED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -866,10 +866,12 @@ static void tg_update_disptime(struct throtl_grp *tg)</div><div class='ctx'> 	unsigned long read_wait = -1, write_wait = -1, min_wait = -1, disptime;</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> </div><div class='del'>-	if ((bio = throtl_peek_queued(&amp;sq-&gt;queued[READ])))</div><div class='add'>+	bio = throtl_peek_queued(&amp;sq-&gt;queued[READ]);</div><div class='add'>+	if (bio)</div><div class='ctx'> 		tg_may_dispatch(tg, bio, &amp;read_wait);</div><div class='ctx'> </div><div class='del'>-	if ((bio = throtl_peek_queued(&amp;sq-&gt;queued[WRITE])))</div><div class='add'>+	bio = throtl_peek_queued(&amp;sq-&gt;queued[WRITE]);</div><div class='add'>+	if (bio)</div><div class='ctx'> 		tg_may_dispatch(tg, bio, &amp;write_wait);</div><div class='ctx'> </div><div class='ctx'> 	min_wait = min(read_wait, write_wait);</div><div class='hunk'>@@ -1401,7 +1403,7 @@ bool blk_throtl_bio(struct request_queue *q, struct blkcg_gq *blkg,</div><div class='ctx'> 	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='ctx'> </div><div class='ctx'> 	/* see throtl_charge_bio() */</div><div class='del'>-	if ((bio-&gt;bi_opf &amp; REQ_THROTTLED) || !tg-&gt;has_rules[rw])</div><div class='add'>+	if (bio_flagged(bio, BIO_THROTTLED) || !tg-&gt;has_rules[rw])</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='hunk'>@@ -1480,7 +1482,7 @@ out:</div><div class='ctx'> 	 * being issued.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!throttled)</div><div class='del'>-		bio-&gt;bi_opf &amp;= ~REQ_THROTTLED;</div><div class='add'>+		bio_clear_flag(bio, BIO_THROTTLED);</div><div class='ctx'> 	return throttled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-wbt.c b/block/blk-wbt.c<br/>new file mode 100644<br/>index 000000000000..1aedb1f7ee0c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/blk-wbt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-wbt.c</a></div><div class='hunk'>@@ -0,0 +1,751 @@</div><div class='add'>+/*</div><div class='add'>+ * buffered writeback throttling. loosely based on CoDel. We can't drop</div><div class='add'>+ * packets for IO scheduling, so the logic is something like this:</div><div class='add'>+ *</div><div class='add'>+ * - Monitor latencies in a defined window of time.</div><div class='add'>+ * - If the minimum latency in the above window exceeds some target, increment</div><div class='add'>+ *   scaling step and scale down queue depth by a factor of 2x. The monitoring</div><div class='add'>+ *   window is then shrunk to 100 / sqrt(scaling step + 1).</div><div class='add'>+ * - For any window where we don't have solid data on what the latencies</div><div class='add'>+ *   look like, retain status quo.</div><div class='add'>+ * - If latencies look good, decrement scaling step.</div><div class='add'>+ * - If we're only doing writes, allow the scaling step to go negative. This</div><div class='add'>+ *   will temporarily boost write performance, snapping back to a stable</div><div class='add'>+ *   scaling step of 0 if reads show up or the heavy writers finish. Unlike</div><div class='add'>+ *   positive scaling steps where we shrink the monitoring window, a negative</div><div class='add'>+ *   scaling step retains the default step==0 window size.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Jens Axboe</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/blk_types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/backing-dev.h&gt;</div><div class='add'>+#include &lt;linux/swap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "blk-wbt.h"</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include &lt;trace/events/wbt.h&gt;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	/*</div><div class='add'>+	 * Default setting, we'll scale up (to 75% of QD max) or down (min 1)</div><div class='add'>+	 * from here depending on device stats</div><div class='add'>+	 */</div><div class='add'>+	RWB_DEF_DEPTH	= 16,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 100msec window</div><div class='add'>+	 */</div><div class='add'>+	RWB_WINDOW_NSEC		= 100 * 1000 * 1000ULL,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disregard stats, if we don't meet this minimum</div><div class='add'>+	 */</div><div class='add'>+	RWB_MIN_WRITE_SAMPLES	= 3,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we have this number of consecutive windows with not enough</div><div class='add'>+	 * information to scale up or down, scale up.</div><div class='add'>+	 */</div><div class='add'>+	RWB_UNKNOWN_BUMP	= 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool rwb_enabled(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+	return rwb &amp;&amp; rwb-&gt;wb_normal != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Increment 'v', if 'v' is below 'below'. Returns true if we succeeded,</div><div class='add'>+ * false if 'v' + 1 would be bigger than 'below'.</div><div class='add'>+ */</div><div class='add'>+static bool atomic_inc_below(atomic_t *v, int below)</div><div class='add'>+{</div><div class='add'>+	int cur = atomic_read(v);</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		int old;</div><div class='add'>+</div><div class='add'>+		if (cur &gt;= below)</div><div class='add'>+			return false;</div><div class='add'>+		old = atomic_cmpxchg(v, cur, cur + 1);</div><div class='add'>+		if (old == cur)</div><div class='add'>+			break;</div><div class='add'>+		cur = old;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wb_timestamp(struct rq_wb *rwb, unsigned long *var)</div><div class='add'>+{</div><div class='add'>+	if (rwb_enabled(rwb)) {</div><div class='add'>+		const unsigned long cur = jiffies;</div><div class='add'>+</div><div class='add'>+		if (cur != *var)</div><div class='add'>+			*var = cur;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If a task was rate throttled in balance_dirty_pages() within the last</div><div class='add'>+ * second or so, use that to indicate a higher cleaning rate.</div><div class='add'>+ */</div><div class='add'>+static bool wb_recent_wait(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+	struct bdi_writeback *wb = &amp;rwb-&gt;queue-&gt;backing_dev_info-&gt;wb;</div><div class='add'>+</div><div class='add'>+	return time_before(jiffies, wb-&gt;dirty_sleep + HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct rq_wait *get_rq_wait(struct rq_wb *rwb, bool is_kswapd)</div><div class='add'>+{</div><div class='add'>+	return &amp;rwb-&gt;rq_wait[is_kswapd];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rwb_wake_all(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WBT_NUM_RWQ; i++) {</div><div class='add'>+		struct rq_wait *rqw = &amp;rwb-&gt;rq_wait[i];</div><div class='add'>+</div><div class='add'>+		if (waitqueue_active(&amp;rqw-&gt;wait))</div><div class='add'>+			wake_up_all(&amp;rqw-&gt;wait);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __wbt_done(struct rq_wb *rwb, enum wbt_flags wb_acct)</div><div class='add'>+{</div><div class='add'>+	struct rq_wait *rqw;</div><div class='add'>+	int inflight, limit;</div><div class='add'>+</div><div class='add'>+	if (!(wb_acct &amp; WBT_TRACKED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rqw = get_rq_wait(rwb, wb_acct &amp; WBT_KSWAPD);</div><div class='add'>+	inflight = atomic_dec_return(&amp;rqw-&gt;inflight);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * wbt got disabled with IO in flight. Wake up any potential</div><div class='add'>+	 * waiters, we don't have to do more than that.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!rwb_enabled(rwb))) {</div><div class='add'>+		rwb_wake_all(rwb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the device does write back caching, drop further down</div><div class='add'>+	 * before we wake people up.</div><div class='add'>+	 */</div><div class='add'>+	if (rwb-&gt;wc &amp;&amp; !wb_recent_wait(rwb))</div><div class='add'>+		limit = 0;</div><div class='add'>+	else</div><div class='add'>+		limit = rwb-&gt;wb_normal;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Don't wake anyone up if we are above the normal limit.</div><div class='add'>+	 */</div><div class='add'>+	if (inflight &amp;&amp; inflight &gt;= limit)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (waitqueue_active(&amp;rqw-&gt;wait)) {</div><div class='add'>+		int diff = limit - inflight;</div><div class='add'>+</div><div class='add'>+		if (!inflight || diff &gt;= rwb-&gt;wb_background / 2)</div><div class='add'>+			wake_up_all(&amp;rqw-&gt;wait);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called on completion of a request. Note that it's also called when</div><div class='add'>+ * a request is merged, when the request gets freed.</div><div class='add'>+ */</div><div class='add'>+void wbt_done(struct rq_wb *rwb, struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+	if (!rwb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!wbt_is_tracked(stat)) {</div><div class='add'>+		if (rwb-&gt;sync_cookie == stat) {</div><div class='add'>+			rwb-&gt;sync_issue = 0;</div><div class='add'>+			rwb-&gt;sync_cookie = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (wbt_is_read(stat))</div><div class='add'>+			wb_timestamp(rwb, &amp;rwb-&gt;last_comp);</div><div class='add'>+		wbt_clear_state(stat);</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON_ONCE(stat == rwb-&gt;sync_cookie);</div><div class='add'>+		__wbt_done(rwb, wbt_stat_to_mask(stat));</div><div class='add'>+		wbt_clear_state(stat);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return true, if we can't increase the depth further by scaling</div><div class='add'>+ */</div><div class='add'>+static bool calc_wb_limits(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+	unsigned int depth;</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	if (!rwb-&gt;min_lat_nsec) {</div><div class='add'>+		rwb-&gt;wb_max = rwb-&gt;wb_normal = rwb-&gt;wb_background = 0;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For QD=1 devices, this is a special case. It's important for those</div><div class='add'>+	 * to have one request ready when one completes, so force a depth of</div><div class='add'>+	 * 2 for those devices. On the backend, it'll be a depth of 1 anyway,</div><div class='add'>+	 * since the device can't have more than that in flight. If we're</div><div class='add'>+	 * scaling down, then keep a setting of 1/1/1.</div><div class='add'>+	 */</div><div class='add'>+	if (rwb-&gt;queue_depth == 1) {</div><div class='add'>+		if (rwb-&gt;scale_step &gt; 0)</div><div class='add'>+			rwb-&gt;wb_max = rwb-&gt;wb_normal = 1;</div><div class='add'>+		else {</div><div class='add'>+			rwb-&gt;wb_max = rwb-&gt;wb_normal = 2;</div><div class='add'>+			ret = true;</div><div class='add'>+		}</div><div class='add'>+		rwb-&gt;wb_background = 1;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * scale_step == 0 is our default state. If we have suffered</div><div class='add'>+		 * latency spikes, step will be &gt; 0, and we shrink the</div><div class='add'>+		 * allowed write depths. If step is &lt; 0, we're only doing</div><div class='add'>+		 * writes, and we allow a temporarily higher depth to</div><div class='add'>+		 * increase performance.</div><div class='add'>+		 */</div><div class='add'>+		depth = min_t(unsigned int, RWB_DEF_DEPTH, rwb-&gt;queue_depth);</div><div class='add'>+		if (rwb-&gt;scale_step &gt; 0)</div><div class='add'>+			depth = 1 + ((depth - 1) &gt;&gt; min(31, rwb-&gt;scale_step));</div><div class='add'>+		else if (rwb-&gt;scale_step &lt; 0) {</div><div class='add'>+			unsigned int maxd = 3 * rwb-&gt;queue_depth / 4;</div><div class='add'>+</div><div class='add'>+			depth = 1 + ((depth - 1) &lt;&lt; -rwb-&gt;scale_step);</div><div class='add'>+			if (depth &gt; maxd) {</div><div class='add'>+				depth = maxd;</div><div class='add'>+				ret = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set our max/normal/bg queue depths based on how far</div><div class='add'>+		 * we have scaled down (-&gt;scale_step).</div><div class='add'>+		 */</div><div class='add'>+		rwb-&gt;wb_max = depth;</div><div class='add'>+		rwb-&gt;wb_normal = (rwb-&gt;wb_max + 1) / 2;</div><div class='add'>+		rwb-&gt;wb_background = (rwb-&gt;wb_max + 3) / 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool stat_sample_valid(struct blk_rq_stat *stat)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * We need at least one read sample, and a minimum of</div><div class='add'>+	 * RWB_MIN_WRITE_SAMPLES. We require some write samples to know</div><div class='add'>+	 * that it's writes impacting us, and not just some sole read on</div><div class='add'>+	 * a device that is in a lower power state.</div><div class='add'>+	 */</div><div class='add'>+	return stat[BLK_STAT_READ].nr_samples &gt;= 1 &amp;&amp;</div><div class='add'>+		stat[BLK_STAT_WRITE].nr_samples &gt;= RWB_MIN_WRITE_SAMPLES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 rwb_sync_issue_lat(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+	u64 now, issue = ACCESS_ONCE(rwb-&gt;sync_issue);</div><div class='add'>+</div><div class='add'>+	if (!issue || !rwb-&gt;sync_cookie)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	now = ktime_to_ns(ktime_get());</div><div class='add'>+	return now - issue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	LAT_OK = 1,</div><div class='add'>+	LAT_UNKNOWN,</div><div class='add'>+	LAT_UNKNOWN_WRITES,</div><div class='add'>+	LAT_EXCEEDED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __latency_exceeded(struct rq_wb *rwb, struct blk_rq_stat *stat)</div><div class='add'>+{</div><div class='add'>+	struct backing_dev_info *bdi = rwb-&gt;queue-&gt;backing_dev_info;</div><div class='add'>+	u64 thislat;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If our stored sync issue exceeds the window size, or it</div><div class='add'>+	 * exceeds our min target AND we haven't logged any entries,</div><div class='add'>+	 * flag the latency as exceeded. wbt works off completion latencies,</div><div class='add'>+	 * but for a flooded device, a single sync IO can take a long time</div><div class='add'>+	 * to complete after being issued. If this time exceeds our</div><div class='add'>+	 * monitoring window AND we didn't see any other completions in that</div><div class='add'>+	 * window, then count that sync IO as a violation of the latency.</div><div class='add'>+	 */</div><div class='add'>+	thislat = rwb_sync_issue_lat(rwb);</div><div class='add'>+	if (thislat &gt; rwb-&gt;cur_win_nsec ||</div><div class='add'>+	    (thislat &gt; rwb-&gt;min_lat_nsec &amp;&amp; !stat[BLK_STAT_READ].nr_samples)) {</div><div class='add'>+		trace_wbt_lat(bdi, thislat);</div><div class='add'>+		return LAT_EXCEEDED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No read/write mix, if stat isn't valid</div><div class='add'>+	 */</div><div class='add'>+	if (!stat_sample_valid(stat)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we had writes in this stat window and the window is</div><div class='add'>+		 * current, we're only doing writes. If a task recently</div><div class='add'>+		 * waited or still has writes in flights, consider us doing</div><div class='add'>+		 * just writes as well.</div><div class='add'>+		 */</div><div class='add'>+		if ((stat[BLK_STAT_WRITE].nr_samples &amp;&amp; blk_stat_is_current(stat)) ||</div><div class='add'>+		    wb_recent_wait(rwb) || wbt_inflight(rwb))</div><div class='add'>+			return LAT_UNKNOWN_WRITES;</div><div class='add'>+		return LAT_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the 'min' latency exceeds our target, step down.</div><div class='add'>+	 */</div><div class='add'>+	if (stat[BLK_STAT_READ].min &gt; rwb-&gt;min_lat_nsec) {</div><div class='add'>+		trace_wbt_lat(bdi, stat[BLK_STAT_READ].min);</div><div class='add'>+		trace_wbt_stat(bdi, stat);</div><div class='add'>+		return LAT_EXCEEDED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rwb-&gt;scale_step)</div><div class='add'>+		trace_wbt_stat(bdi, stat);</div><div class='add'>+</div><div class='add'>+	return LAT_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int latency_exceeded(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+	struct blk_rq_stat stat[2];</div><div class='add'>+</div><div class='add'>+	blk_queue_stat_get(rwb-&gt;queue, stat);</div><div class='add'>+	return __latency_exceeded(rwb, stat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rwb_trace_step(struct rq_wb *rwb, const char *msg)</div><div class='add'>+{</div><div class='add'>+	struct backing_dev_info *bdi = rwb-&gt;queue-&gt;backing_dev_info;</div><div class='add'>+</div><div class='add'>+	trace_wbt_step(bdi, msg, rwb-&gt;scale_step, rwb-&gt;cur_win_nsec,</div><div class='add'>+			rwb-&gt;wb_background, rwb-&gt;wb_normal, rwb-&gt;wb_max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void scale_up(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Hit max in previous round, stop here</div><div class='add'>+	 */</div><div class='add'>+	if (rwb-&gt;scaled_max)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rwb-&gt;scale_step--;</div><div class='add'>+	rwb-&gt;unknown_cnt = 0;</div><div class='add'>+	blk_stat_clear(rwb-&gt;queue);</div><div class='add'>+</div><div class='add'>+	rwb-&gt;scaled_max = calc_wb_limits(rwb);</div><div class='add'>+</div><div class='add'>+	rwb_wake_all(rwb);</div><div class='add'>+</div><div class='add'>+	rwb_trace_step(rwb, "step up");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Scale rwb down. If 'hard_throttle' is set, do it quicker, since we</div><div class='add'>+ * had a latency violation.</div><div class='add'>+ */</div><div class='add'>+static void scale_down(struct rq_wb *rwb, bool hard_throttle)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Stop scaling down when we've hit the limit. This also prevents</div><div class='add'>+	 * -&gt;scale_step from going to crazy values, if the device can't</div><div class='add'>+	 * keep up.</div><div class='add'>+	 */</div><div class='add'>+	if (rwb-&gt;wb_max == 1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rwb-&gt;scale_step &lt; 0 &amp;&amp; hard_throttle)</div><div class='add'>+		rwb-&gt;scale_step = 0;</div><div class='add'>+	else</div><div class='add'>+		rwb-&gt;scale_step++;</div><div class='add'>+</div><div class='add'>+	rwb-&gt;scaled_max = false;</div><div class='add'>+	rwb-&gt;unknown_cnt = 0;</div><div class='add'>+	blk_stat_clear(rwb-&gt;queue);</div><div class='add'>+	calc_wb_limits(rwb);</div><div class='add'>+	rwb_trace_step(rwb, "step down");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rwb_arm_timer(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+	unsigned long expires;</div><div class='add'>+</div><div class='add'>+	if (rwb-&gt;scale_step &gt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * We should speed this up, using some variant of a fast</div><div class='add'>+		 * integer inverse square root calculation. Since we only do</div><div class='add'>+		 * this for every window expiration, it's not a huge deal,</div><div class='add'>+		 * though.</div><div class='add'>+		 */</div><div class='add'>+		rwb-&gt;cur_win_nsec = div_u64(rwb-&gt;win_nsec &lt;&lt; 4,</div><div class='add'>+					int_sqrt((rwb-&gt;scale_step + 1) &lt;&lt; 8));</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * For step &lt; 0, we don't want to increase/decrease the</div><div class='add'>+		 * window size.</div><div class='add'>+		 */</div><div class='add'>+		rwb-&gt;cur_win_nsec = rwb-&gt;win_nsec;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	expires = jiffies + nsecs_to_jiffies(rwb-&gt;cur_win_nsec);</div><div class='add'>+	mod_timer(&amp;rwb-&gt;window_timer, expires);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wb_timer_fn(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct rq_wb *rwb = (struct rq_wb *) data;</div><div class='add'>+	unsigned int inflight = wbt_inflight(rwb);</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = latency_exceeded(rwb);</div><div class='add'>+</div><div class='add'>+	trace_wbt_timer(rwb-&gt;queue-&gt;backing_dev_info, status, rwb-&gt;scale_step,</div><div class='add'>+			inflight);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we exceeded the latency target, step down. If we did not,</div><div class='add'>+	 * step one level up. If we don't know enough to say either exceeded</div><div class='add'>+	 * or ok, then don't do anything.</div><div class='add'>+	 */</div><div class='add'>+	switch (status) {</div><div class='add'>+	case LAT_EXCEEDED:</div><div class='add'>+		scale_down(rwb, true);</div><div class='add'>+		break;</div><div class='add'>+	case LAT_OK:</div><div class='add'>+		scale_up(rwb);</div><div class='add'>+		break;</div><div class='add'>+	case LAT_UNKNOWN_WRITES:</div><div class='add'>+		/*</div><div class='add'>+		 * We started a the center step, but don't have a valid</div><div class='add'>+		 * read/write sample, but we do have writes going on.</div><div class='add'>+		 * Allow step to go negative, to increase write perf.</div><div class='add'>+		 */</div><div class='add'>+		scale_up(rwb);</div><div class='add'>+		break;</div><div class='add'>+	case LAT_UNKNOWN:</div><div class='add'>+		if (++rwb-&gt;unknown_cnt &lt; RWB_UNKNOWN_BUMP)</div><div class='add'>+			break;</div><div class='add'>+		/*</div><div class='add'>+		 * We get here when previously scaled reduced depth, and we</div><div class='add'>+		 * currently don't have a valid read/write sample. For that</div><div class='add'>+		 * case, slowly return to center state (step == 0).</div><div class='add'>+		 */</div><div class='add'>+		if (rwb-&gt;scale_step &gt; 0)</div><div class='add'>+			scale_up(rwb);</div><div class='add'>+		else if (rwb-&gt;scale_step &lt; 0)</div><div class='add'>+			scale_down(rwb, false);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Re-arm timer, if we have IO in flight</div><div class='add'>+	 */</div><div class='add'>+	if (rwb-&gt;scale_step || inflight)</div><div class='add'>+		rwb_arm_timer(rwb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wbt_update_limits(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+	rwb-&gt;scale_step = 0;</div><div class='add'>+	rwb-&gt;scaled_max = false;</div><div class='add'>+	calc_wb_limits(rwb);</div><div class='add'>+</div><div class='add'>+	rwb_wake_all(rwb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool close_io(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+	const unsigned long now = jiffies;</div><div class='add'>+</div><div class='add'>+	return time_before(now, rwb-&gt;last_issue + HZ / 10) ||</div><div class='add'>+		time_before(now, rwb-&gt;last_comp + HZ / 10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define REQ_HIPRIO	(REQ_SYNC | REQ_META | REQ_PRIO)</div><div class='add'>+</div><div class='add'>+static inline unsigned int get_limit(struct rq_wb *rwb, unsigned long rw)</div><div class='add'>+{</div><div class='add'>+	unsigned int limit;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * At this point we know it's a buffered write. If this is</div><div class='add'>+	 * kswapd trying to free memory, or REQ_SYNC is set, set, then</div><div class='add'>+	 * it's WB_SYNC_ALL writeback, and we'll use the max limit for</div><div class='add'>+	 * that. If the write is marked as a background write, then use</div><div class='add'>+	 * the idle limit, or go to normal if we haven't had competing</div><div class='add'>+	 * IO for a bit.</div><div class='add'>+	 */</div><div class='add'>+	if ((rw &amp; REQ_HIPRIO) || wb_recent_wait(rwb) || current_is_kswapd())</div><div class='add'>+		limit = rwb-&gt;wb_max;</div><div class='add'>+	else if ((rw &amp; REQ_BACKGROUND) || close_io(rwb)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If less than 100ms since we completed unrelated IO,</div><div class='add'>+		 * limit us to half the depth for background writeback.</div><div class='add'>+		 */</div><div class='add'>+		limit = rwb-&gt;wb_background;</div><div class='add'>+	} else</div><div class='add'>+		limit = rwb-&gt;wb_normal;</div><div class='add'>+</div><div class='add'>+	return limit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool may_queue(struct rq_wb *rwb, struct rq_wait *rqw,</div><div class='add'>+			     wait_queue_t *wait, unsigned long rw)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * inc it here even if disabled, since we'll dec it at completion.</div><div class='add'>+	 * this only happens if the task was sleeping in __wbt_wait(),</div><div class='add'>+	 * and someone turned it off at the same time.</div><div class='add'>+	 */</div><div class='add'>+	if (!rwb_enabled(rwb)) {</div><div class='add'>+		atomic_inc(&amp;rqw-&gt;inflight);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the waitqueue is already active and we are not the next</div><div class='add'>+	 * in line to be woken up, wait for our turn.</div><div class='add'>+	 */</div><div class='add'>+	if (waitqueue_active(&amp;rqw-&gt;wait) &amp;&amp;</div><div class='add'>+	    rqw-&gt;wait.task_list.next != &amp;wait-&gt;task_list)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return atomic_inc_below(&amp;rqw-&gt;inflight, get_limit(rwb, rw));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Block if we will exceed our limit, or if we are currently waiting for</div><div class='add'>+ * the timer to kick off queuing again.</div><div class='add'>+ */</div><div class='add'>+static void __wbt_wait(struct rq_wb *rwb, unsigned long rw, spinlock_t *lock)</div><div class='add'>+	__releases(lock)</div><div class='add'>+	__acquires(lock)</div><div class='add'>+{</div><div class='add'>+	struct rq_wait *rqw = get_rq_wait(rwb, current_is_kswapd());</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+</div><div class='add'>+	if (may_queue(rwb, rqw, &amp;wait, rw))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		prepare_to_wait_exclusive(&amp;rqw-&gt;wait, &amp;wait,</div><div class='add'>+						TASK_UNINTERRUPTIBLE);</div><div class='add'>+</div><div class='add'>+		if (may_queue(rwb, rqw, &amp;wait, rw))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (lock) {</div><div class='add'>+			spin_unlock_irq(lock);</div><div class='add'>+			io_schedule();</div><div class='add'>+			spin_lock_irq(lock);</div><div class='add'>+		} else</div><div class='add'>+			io_schedule();</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	finish_wait(&amp;rqw-&gt;wait, &amp;wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool wbt_should_throttle(struct rq_wb *rwb, struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	const int op = bio_op(bio);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If not a WRITE, do nothing</div><div class='add'>+	 */</div><div class='add'>+	if (op != REQ_OP_WRITE)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Don't throttle WRITE_ODIRECT</div><div class='add'>+	 */</div><div class='add'>+	if ((bio-&gt;bi_opf &amp; (REQ_SYNC | REQ_IDLE)) == (REQ_SYNC | REQ_IDLE))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns true if the IO request should be accounted, false if not.</div><div class='add'>+ * May sleep, if we have exceeded the writeback limits. Caller can pass</div><div class='add'>+ * in an irq held spinlock, if it holds one when calling this function.</div><div class='add'>+ * If we do sleep, we'll release and re-grab it.</div><div class='add'>+ */</div><div class='add'>+enum wbt_flags wbt_wait(struct rq_wb *rwb, struct bio *bio, spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	unsigned int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!rwb_enabled(rwb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (bio_op(bio) == REQ_OP_READ)</div><div class='add'>+		ret = WBT_READ;</div><div class='add'>+</div><div class='add'>+	if (!wbt_should_throttle(rwb, bio)) {</div><div class='add'>+		if (ret &amp; WBT_READ)</div><div class='add'>+			wb_timestamp(rwb, &amp;rwb-&gt;last_issue);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__wbt_wait(rwb, bio-&gt;bi_opf, lock);</div><div class='add'>+</div><div class='add'>+	if (!timer_pending(&amp;rwb-&gt;window_timer))</div><div class='add'>+		rwb_arm_timer(rwb);</div><div class='add'>+</div><div class='add'>+	if (current_is_kswapd())</div><div class='add'>+		ret |= WBT_KSWAPD;</div><div class='add'>+</div><div class='add'>+	return ret | WBT_TRACKED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wbt_issue(struct rq_wb *rwb, struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+	if (!rwb_enabled(rwb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Track sync issue, in case it takes a long time to complete. Allows</div><div class='add'>+	 * us to react quicker, if a sync IO takes a long time to complete.</div><div class='add'>+	 * Note that this is just a hint. 'stat' can go away when the</div><div class='add'>+	 * request completes, so it's important we never dereference it. We</div><div class='add'>+	 * only use the address to compare with, which is why we store the</div><div class='add'>+	 * sync_issue time locally.</div><div class='add'>+	 */</div><div class='add'>+	if (wbt_is_read(stat) &amp;&amp; !rwb-&gt;sync_issue) {</div><div class='add'>+		rwb-&gt;sync_cookie = stat;</div><div class='add'>+		rwb-&gt;sync_issue = blk_stat_time(stat);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wbt_requeue(struct rq_wb *rwb, struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+	if (!rwb_enabled(rwb))</div><div class='add'>+		return;</div><div class='add'>+	if (stat == rwb-&gt;sync_cookie) {</div><div class='add'>+		rwb-&gt;sync_issue = 0;</div><div class='add'>+		rwb-&gt;sync_cookie = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wbt_set_queue_depth(struct rq_wb *rwb, unsigned int depth)</div><div class='add'>+{</div><div class='add'>+	if (rwb) {</div><div class='add'>+		rwb-&gt;queue_depth = depth;</div><div class='add'>+		wbt_update_limits(rwb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wbt_set_write_cache(struct rq_wb *rwb, bool write_cache_on)</div><div class='add'>+{</div><div class='add'>+	if (rwb)</div><div class='add'>+		rwb-&gt;wc = write_cache_on;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ /*</div><div class='add'>+ * Disable wbt, if enabled by default. Only called from CFQ, if we have</div><div class='add'>+ * cgroups enabled</div><div class='add'>+ */</div><div class='add'>+void wbt_disable_default(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct rq_wb *rwb = q-&gt;rq_wb;</div><div class='add'>+</div><div class='add'>+	if (rwb &amp;&amp; rwb-&gt;enable_state == WBT_STATE_ON_DEFAULT) {</div><div class='add'>+		del_timer_sync(&amp;rwb-&gt;window_timer);</div><div class='add'>+		rwb-&gt;win_nsec = rwb-&gt;min_lat_nsec = 0;</div><div class='add'>+		wbt_update_limits(rwb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wbt_disable_default);</div><div class='add'>+</div><div class='add'>+u64 wbt_default_latency_nsec(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * We default to 2msec for non-rotational storage, and 75msec</div><div class='add'>+	 * for rotational storage.</div><div class='add'>+	 */</div><div class='add'>+	if (blk_queue_nonrot(q))</div><div class='add'>+		return 2000000ULL;</div><div class='add'>+	else</div><div class='add'>+		return 75000000ULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wbt_init(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct rq_wb *rwb;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For now, we depend on the stats window being larger than</div><div class='add'>+	 * our monitoring window. Ensure that this isn't inadvertently</div><div class='add'>+	 * violated.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(RWB_WINDOW_NSEC &gt; BLK_STAT_NSEC);</div><div class='add'>+	BUILD_BUG_ON(WBT_NR_BITS &gt; BLK_STAT_RES_BITS);</div><div class='add'>+</div><div class='add'>+	rwb = kzalloc(sizeof(*rwb), GFP_KERNEL);</div><div class='add'>+	if (!rwb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WBT_NUM_RWQ; i++) {</div><div class='add'>+		atomic_set(&amp;rwb-&gt;rq_wait[i].inflight, 0);</div><div class='add'>+		init_waitqueue_head(&amp;rwb-&gt;rq_wait[i].wait);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	setup_timer(&amp;rwb-&gt;window_timer, wb_timer_fn, (unsigned long) rwb);</div><div class='add'>+	rwb-&gt;wc = 1;</div><div class='add'>+	rwb-&gt;queue_depth = RWB_DEF_DEPTH;</div><div class='add'>+	rwb-&gt;last_comp = rwb-&gt;last_issue = jiffies;</div><div class='add'>+	rwb-&gt;queue = q;</div><div class='add'>+	rwb-&gt;win_nsec = RWB_WINDOW_NSEC;</div><div class='add'>+	rwb-&gt;enable_state = WBT_STATE_ON_DEFAULT;</div><div class='add'>+	wbt_update_limits(rwb);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assign rwb, and turn on stats tracking for this queue</div><div class='add'>+	 */</div><div class='add'>+	q-&gt;rq_wb = rwb;</div><div class='add'>+	blk_stat_enable(q);</div><div class='add'>+</div><div class='add'>+	rwb-&gt;min_lat_nsec = wbt_default_latency_nsec(q);</div><div class='add'>+</div><div class='add'>+	wbt_set_queue_depth(rwb, blk_queue_depth(q));</div><div class='add'>+	wbt_set_write_cache(rwb, test_bit(QUEUE_FLAG_WC, &amp;q-&gt;queue_flags));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wbt_exit(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct rq_wb *rwb = q-&gt;rq_wb;</div><div class='add'>+</div><div class='add'>+	if (rwb) {</div><div class='add'>+		del_timer_sync(&amp;rwb-&gt;window_timer);</div><div class='add'>+		q-&gt;rq_wb = NULL;</div><div class='add'>+		kfree(rwb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/block/blk-wbt.h b/block/blk-wbt.h<br/>new file mode 100644<br/>index 000000000000..65f1de519f67<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/blk-wbt.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-wbt.h</a></div><div class='hunk'>@@ -0,0 +1,171 @@</div><div class='add'>+#ifndef WB_THROTTLE_H</div><div class='add'>+#define WB_THROTTLE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/ktime.h&gt;</div><div class='add'>+</div><div class='add'>+#include "blk-stat.h"</div><div class='add'>+</div><div class='add'>+enum wbt_flags {</div><div class='add'>+	WBT_TRACKED		= 1,	/* write, tracked for throttling */</div><div class='add'>+	WBT_READ		= 2,	/* read */</div><div class='add'>+	WBT_KSWAPD		= 4,	/* write, from kswapd */</div><div class='add'>+</div><div class='add'>+	WBT_NR_BITS		= 3,	/* number of bits */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	WBT_NUM_RWQ		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable states. Either off, or on by default (done at init time),</div><div class='add'>+ * or on through manual setup in sysfs.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	WBT_STATE_ON_DEFAULT	= 1,</div><div class='add'>+	WBT_STATE_ON_MANUAL	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void wbt_clear_state(struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+	stat-&gt;time &amp;= BLK_STAT_TIME_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum wbt_flags wbt_stat_to_mask(struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+	return (stat-&gt;time &amp; BLK_STAT_MASK) &gt;&gt; BLK_STAT_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void wbt_track(struct blk_issue_stat *stat, enum wbt_flags wb_acct)</div><div class='add'>+{</div><div class='add'>+	stat-&gt;time |= ((u64) wb_acct) &lt;&lt; BLK_STAT_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool wbt_is_tracked(struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+	return (stat-&gt;time &gt;&gt; BLK_STAT_SHIFT) &amp; WBT_TRACKED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool wbt_is_read(struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+	return (stat-&gt;time &gt;&gt; BLK_STAT_SHIFT) &amp; WBT_READ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rq_wait {</div><div class='add'>+	wait_queue_head_t wait;</div><div class='add'>+	atomic_t inflight;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rq_wb {</div><div class='add'>+	/*</div><div class='add'>+	 * Settings that govern how we throttle</div><div class='add'>+	 */</div><div class='add'>+	unsigned int wb_background;		/* background writeback */</div><div class='add'>+	unsigned int wb_normal;			/* normal writeback */</div><div class='add'>+	unsigned int wb_max;			/* max throughput writeback */</div><div class='add'>+	int scale_step;</div><div class='add'>+	bool scaled_max;</div><div class='add'>+</div><div class='add'>+	short enable_state;			/* WBT_STATE_* */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Number of consecutive periods where we don't have enough</div><div class='add'>+	 * information to make a firm scale up/down decision.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int unknown_cnt;</div><div class='add'>+</div><div class='add'>+	u64 win_nsec;				/* default window size */</div><div class='add'>+	u64 cur_win_nsec;			/* current window size */</div><div class='add'>+</div><div class='add'>+	struct timer_list window_timer;</div><div class='add'>+</div><div class='add'>+	s64 sync_issue;</div><div class='add'>+	void *sync_cookie;</div><div class='add'>+</div><div class='add'>+	unsigned int wc;</div><div class='add'>+	unsigned int queue_depth;</div><div class='add'>+</div><div class='add'>+	unsigned long last_issue;		/* last non-throttled issue */</div><div class='add'>+	unsigned long last_comp;		/* last non-throttled comp */</div><div class='add'>+	unsigned long min_lat_nsec;</div><div class='add'>+	struct request_queue *queue;</div><div class='add'>+	struct rq_wait rq_wait[WBT_NUM_RWQ];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline unsigned int wbt_inflight(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WBT_NUM_RWQ; i++)</div><div class='add'>+		ret += atomic_read(&amp;rwb-&gt;rq_wait[i].inflight);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLK_WBT</div><div class='add'>+</div><div class='add'>+void __wbt_done(struct rq_wb *, enum wbt_flags);</div><div class='add'>+void wbt_done(struct rq_wb *, struct blk_issue_stat *);</div><div class='add'>+enum wbt_flags wbt_wait(struct rq_wb *, struct bio *, spinlock_t *);</div><div class='add'>+int wbt_init(struct request_queue *);</div><div class='add'>+void wbt_exit(struct request_queue *);</div><div class='add'>+void wbt_update_limits(struct rq_wb *);</div><div class='add'>+void wbt_requeue(struct rq_wb *, struct blk_issue_stat *);</div><div class='add'>+void wbt_issue(struct rq_wb *, struct blk_issue_stat *);</div><div class='add'>+void wbt_disable_default(struct request_queue *);</div><div class='add'>+</div><div class='add'>+void wbt_set_queue_depth(struct rq_wb *, unsigned int);</div><div class='add'>+void wbt_set_write_cache(struct rq_wb *, bool);</div><div class='add'>+</div><div class='add'>+u64 wbt_default_latency_nsec(struct request_queue *);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void __wbt_done(struct rq_wb *rwb, enum wbt_flags flags)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void wbt_done(struct rq_wb *rwb, struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline enum wbt_flags wbt_wait(struct rq_wb *rwb, struct bio *bio,</div><div class='add'>+				      spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline int wbt_init(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+static inline void wbt_exit(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void wbt_update_limits(struct rq_wb *rwb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void wbt_requeue(struct rq_wb *rwb, struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void wbt_issue(struct rq_wb *rwb, struct blk_issue_stat *stat)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void wbt_disable_default(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void wbt_set_queue_depth(struct rq_wb *rwb, unsigned int depth)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void wbt_set_write_cache(struct rq_wb *rwb, bool wc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline u64 wbt_default_latency_nsec(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_BLK_WBT */</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/block/blk-zoned.c b/block/blk-zoned.c<br/>new file mode 100644<br/>index 000000000000..3bd15d8095b1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/blk-zoned.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk-zoned.c</a></div><div class='hunk'>@@ -0,0 +1,348 @@</div><div class='add'>+/*</div><div class='add'>+ * Zoned block device handling</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015, Hannes Reinecke</div><div class='add'>+ * Copyright (c) 2015, SUSE Linux GmbH</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016, Damien Le Moal</div><div class='add'>+ * Copyright (c) 2016, Western Digital</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+</div><div class='add'>+static inline sector_t blk_zone_start(struct request_queue *q,</div><div class='add'>+				      sector_t sector)</div><div class='add'>+{</div><div class='add'>+	sector_t zone_mask = blk_queue_zone_sectors(q) - 1;</div><div class='add'>+</div><div class='add'>+	return sector &amp; ~zone_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check that a zone report belongs to the partition.</div><div class='add'>+ * If yes, fix its start sector and write pointer, copy it in the</div><div class='add'>+ * zone information array and return true. Return false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool blkdev_report_zone(struct block_device *bdev,</div><div class='add'>+			       struct blk_zone *rep,</div><div class='add'>+			       struct blk_zone *zone)</div><div class='add'>+{</div><div class='add'>+	sector_t offset = get_start_sect(bdev);</div><div class='add'>+</div><div class='add'>+	if (rep-&gt;start &lt; offset)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	rep-&gt;start -= offset;</div><div class='add'>+	if (rep-&gt;start + rep-&gt;len &gt; bdev-&gt;bd_part-&gt;nr_sects)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (rep-&gt;type == BLK_ZONE_TYPE_CONVENTIONAL)</div><div class='add'>+		rep-&gt;wp = rep-&gt;start + rep-&gt;len;</div><div class='add'>+	else</div><div class='add'>+		rep-&gt;wp -= offset;</div><div class='add'>+	memcpy(zone, rep, sizeof(struct blk_zone));</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blkdev_report_zones - Get zones information</div><div class='add'>+ * @bdev:	Target block device</div><div class='add'>+ * @sector:	Sector from which to report zones</div><div class='add'>+ * @zones:	Array of zone structures where to return the zones information</div><div class='add'>+ * @nr_zones:	Number of zone structures in the zone array</div><div class='add'>+ * @gfp_mask:	Memory allocation flags (for bio_alloc)</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *    Get zone information starting from the zone containing @sector.</div><div class='add'>+ *    The number of zone information reported may be less than the number</div><div class='add'>+ *    requested by @nr_zones. The number of zones actually reported is</div><div class='add'>+ *    returned in @nr_zones.</div><div class='add'>+ */</div><div class='add'>+int blkdev_report_zones(struct block_device *bdev,</div><div class='add'>+			sector_t sector,</div><div class='add'>+			struct blk_zone *zones,</div><div class='add'>+			unsigned int *nr_zones,</div><div class='add'>+			gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = bdev_get_queue(bdev);</div><div class='add'>+	struct blk_zone_report_hdr *hdr;</div><div class='add'>+	unsigned int nrz = *nr_zones;</div><div class='add'>+	struct page *page;</div><div class='add'>+	unsigned int nr_rep;</div><div class='add'>+	size_t rep_bytes;</div><div class='add'>+	unsigned int nr_pages;</div><div class='add'>+	struct bio *bio;</div><div class='add'>+	struct bio_vec *bv;</div><div class='add'>+	unsigned int i, n, nz;</div><div class='add'>+	unsigned int ofst;</div><div class='add'>+	void *addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!q)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (!blk_queue_is_zoned(q))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!nrz)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (sector &gt; bdev-&gt;bd_part-&gt;nr_sects) {</div><div class='add'>+		*nr_zones = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The zone report has a header. So make room for it in the</div><div class='add'>+	 * payload. Also make sure that the report fits in a single BIO</div><div class='add'>+	 * that will not be split down the stack.</div><div class='add'>+	 */</div><div class='add'>+	rep_bytes = sizeof(struct blk_zone_report_hdr) +</div><div class='add'>+		sizeof(struct blk_zone) * nrz;</div><div class='add'>+	rep_bytes = (rep_bytes + PAGE_SIZE - 1) &amp; PAGE_MASK;</div><div class='add'>+	if (rep_bytes &gt; (queue_max_sectors(q) &lt;&lt; 9))</div><div class='add'>+		rep_bytes = queue_max_sectors(q) &lt;&lt; 9;</div><div class='add'>+</div><div class='add'>+	nr_pages = min_t(unsigned int, BIO_MAX_PAGES,</div><div class='add'>+			 rep_bytes &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	nr_pages = min_t(unsigned int, nr_pages,</div><div class='add'>+			 queue_max_segments(q));</div><div class='add'>+</div><div class='add'>+	bio = bio_alloc(gfp_mask, nr_pages);</div><div class='add'>+	if (!bio)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	bio-&gt;bi_bdev = bdev;</div><div class='add'>+	bio-&gt;bi_iter.bi_sector = blk_zone_start(q, sector);</div><div class='add'>+	bio_set_op_attrs(bio, REQ_OP_ZONE_REPORT, 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr_pages; i++) {</div><div class='add'>+		page = alloc_page(gfp_mask);</div><div class='add'>+		if (!page) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (!bio_add_page(bio, page, PAGE_SIZE, 0)) {</div><div class='add'>+			__free_page(page);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == 0)</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+	else</div><div class='add'>+		ret = submit_bio_wait(bio);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Process the report result: skip the header and go through the</div><div class='add'>+	 * reported zones to fixup and fixup the zone information for</div><div class='add'>+	 * partitions. At the same time, return the zone information into</div><div class='add'>+	 * the zone array.</div><div class='add'>+	 */</div><div class='add'>+	n = 0;</div><div class='add'>+	nz = 0;</div><div class='add'>+	nr_rep = 0;</div><div class='add'>+	bio_for_each_segment_all(bv, bio, i) {</div><div class='add'>+</div><div class='add'>+		if (!bv-&gt;bv_page)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		addr = kmap_atomic(bv-&gt;bv_page);</div><div class='add'>+</div><div class='add'>+		/* Get header in the first page */</div><div class='add'>+		ofst = 0;</div><div class='add'>+		if (!nr_rep) {</div><div class='add'>+			hdr = (struct blk_zone_report_hdr *) addr;</div><div class='add'>+			nr_rep = hdr-&gt;nr_zones;</div><div class='add'>+			ofst = sizeof(struct blk_zone_report_hdr);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Fixup and report zones */</div><div class='add'>+		while (ofst &lt; bv-&gt;bv_len &amp;&amp;</div><div class='add'>+		       n &lt; nr_rep &amp;&amp; nz &lt; nrz) {</div><div class='add'>+			if (blkdev_report_zone(bdev, addr + ofst, &amp;zones[nz]))</div><div class='add'>+				nz++;</div><div class='add'>+			ofst += sizeof(struct blk_zone);</div><div class='add'>+			n++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kunmap_atomic(addr);</div><div class='add'>+</div><div class='add'>+		if (n &gt;= nr_rep || nz &gt;= nrz)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*nr_zones = nz;</div><div class='add'>+out:</div><div class='add'>+	bio_for_each_segment_all(bv, bio, i)</div><div class='add'>+		__free_page(bv-&gt;bv_page);</div><div class='add'>+	bio_put(bio);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blkdev_report_zones);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blkdev_reset_zones - Reset zones write pointer</div><div class='add'>+ * @bdev:	Target block device</div><div class='add'>+ * @sector:	Start sector of the first zone to reset</div><div class='add'>+ * @nr_sectors:	Number of sectors, at least the length of one zone</div><div class='add'>+ * @gfp_mask:	Memory allocation flags (for bio_alloc)</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *    Reset the write pointer of the zones contained in the range</div><div class='add'>+ *    @sector..@sector+@nr_sectors. Specifying the entire disk sector range</div><div class='add'>+ *    is valid, but the specified range should not contain conventional zones.</div><div class='add'>+ */</div><div class='add'>+int blkdev_reset_zones(struct block_device *bdev,</div><div class='add'>+		       sector_t sector, sector_t nr_sectors,</div><div class='add'>+		       gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = bdev_get_queue(bdev);</div><div class='add'>+	sector_t zone_sectors;</div><div class='add'>+	sector_t end_sector = sector + nr_sectors;</div><div class='add'>+	struct bio *bio;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!q)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (!blk_queue_is_zoned(q))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (end_sector &gt; bdev-&gt;bd_part-&gt;nr_sects)</div><div class='add'>+		/* Out of range */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Check alignment (handle eventual smaller last zone) */</div><div class='add'>+	zone_sectors = blk_queue_zone_sectors(q);</div><div class='add'>+	if (sector &amp; (zone_sectors - 1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((nr_sectors &amp; (zone_sectors - 1)) &amp;&amp;</div><div class='add'>+	    end_sector != bdev-&gt;bd_part-&gt;nr_sects)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	while (sector &lt; end_sector) {</div><div class='add'>+</div><div class='add'>+		bio = bio_alloc(gfp_mask, 0);</div><div class='add'>+		bio-&gt;bi_iter.bi_sector = sector;</div><div class='add'>+		bio-&gt;bi_bdev = bdev;</div><div class='add'>+		bio_set_op_attrs(bio, REQ_OP_ZONE_RESET, 0);</div><div class='add'>+</div><div class='add'>+		ret = submit_bio_wait(bio);</div><div class='add'>+		bio_put(bio);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		sector += zone_sectors;</div><div class='add'>+</div><div class='add'>+		/* This may take a while, so be nice to others */</div><div class='add'>+		cond_resched();</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(blkdev_reset_zones);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * BLKREPORTZONE ioctl processing.</div><div class='add'>+ * Called from blkdev_ioctl.</div><div class='add'>+ */</div><div class='add'>+int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='add'>+			      unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='add'>+	struct request_queue *q;</div><div class='add'>+	struct blk_zone_report rep;</div><div class='add'>+	struct blk_zone *zones;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!argp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	q = bdev_get_queue(bdev);</div><div class='add'>+	if (!q)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (!blk_queue_is_zoned(q))</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;rep, argp, sizeof(struct blk_zone_report)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (!rep.nr_zones)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	zones = kcalloc(rep.nr_zones, sizeof(struct blk_zone), GFP_KERNEL);</div><div class='add'>+	if (!zones)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = blkdev_report_zones(bdev, rep.sector,</div><div class='add'>+				  zones, &amp;rep.nr_zones,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(argp, &amp;rep, sizeof(struct blk_zone_report))) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rep.nr_zones) {</div><div class='add'>+		if (copy_to_user(argp + sizeof(struct blk_zone_report), zones,</div><div class='add'>+				 sizeof(struct blk_zone) * rep.nr_zones))</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	kfree(zones);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * BLKRESETZONE ioctl processing.</div><div class='add'>+ * Called from blkdev_ioctl.</div><div class='add'>+ */</div><div class='add'>+int blkdev_reset_zones_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='add'>+			     unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='add'>+	struct request_queue *q;</div><div class='add'>+	struct blk_zone_range zrange;</div><div class='add'>+</div><div class='add'>+	if (!argp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	q = bdev_get_queue(bdev);</div><div class='add'>+	if (!q)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (!blk_queue_is_zoned(q))</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	if (!(mode &amp; FMODE_WRITE))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;zrange, argp, sizeof(struct blk_zone_range)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return blkdev_reset_zones(bdev, zrange.sector, zrange.nr_sectors,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+}</div><div class='head'>diff --git a/block/blk.h b/block/blk.h<br/>index 74444c49078f..d1ea4bd9b9a3 100644<br/>--- a/<a href='/drm-misc/tree/block/blk.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/blk.h</a><br/>+++ b/<a href='/drm-misc/tree/block/blk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/blk.h</a></div><div class='hunk'>@@ -14,6 +14,10 @@</div><div class='ctx'> /* Max future timer expiry for timeouts */</div><div class='ctx'> #define BLK_MAX_TIMEOUT		(5 * HZ)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+extern struct dentry *blk_debugfs_root;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct blk_flush_queue {</div><div class='ctx'> 	unsigned int		flush_queue_delayed:1;</div><div class='ctx'> 	unsigned int		flush_pending_idx:1;</div><div class='hunk'>@@ -96,6 +100,8 @@ bool bio_attempt_front_merge(struct request_queue *q, struct request *req,</div><div class='ctx'> 			     struct bio *bio);</div><div class='ctx'> bool bio_attempt_back_merge(struct request_queue *q, struct request *req,</div><div class='ctx'> 			    struct bio *bio);</div><div class='add'>+bool bio_attempt_discard_merge(struct request_queue *q, struct request *req,</div><div class='add'>+		struct bio *bio);</div><div class='ctx'> bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio,</div><div class='ctx'> 			    unsigned int *request_count,</div><div class='ctx'> 			    struct request **same_queue_rq);</div><div class='hunk'>@@ -111,6 +117,7 @@ void blk_account_io_done(struct request *req);</div><div class='ctx'> enum rq_atomic_flags {</div><div class='ctx'> 	REQ_ATOM_COMPLETE = 0,</div><div class='ctx'> 	REQ_ATOM_STARTED,</div><div class='add'>+	REQ_ATOM_POLL_SLEPT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -130,7 +137,7 @@ static inline void blk_clear_rq_complete(struct request *rq)</div><div class='ctx'> /*</div><div class='ctx'>  * Internal elevator interface</div><div class='ctx'>  */</div><div class='del'>-#define ELV_ON_HASH(rq) ((rq)-&gt;cmd_flags &amp; REQ_HASHED)</div><div class='add'>+#define ELV_ON_HASH(rq) ((rq)-&gt;rq_flags &amp; RQF_HASHED)</div><div class='ctx'> </div><div class='ctx'> void blk_insert_flush(struct request *rq);</div><div class='ctx'> </div><div class='hunk'>@@ -166,7 +173,7 @@ static inline struct request *__elv_next_request(struct request_queue *q)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (unlikely(blk_queue_bypass(q)) ||</div><div class='del'>-		    !q-&gt;elevator-&gt;type-&gt;ops.elevator_dispatch_fn(q, 0))</div><div class='add'>+		    !q-&gt;elevator-&gt;type-&gt;ops.sq.elevator_dispatch_fn(q, 0))</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -175,16 +182,16 @@ static inline void elv_activate_rq(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_activate_req_fn)</div><div class='del'>-		e-&gt;type-&gt;ops.elevator_activate_req_fn(q, rq);</div><div class='add'>+	if (e-&gt;type-&gt;ops.sq.elevator_activate_req_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.sq.elevator_activate_req_fn(q, rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void elv_deactivate_rq(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_deactivate_req_fn)</div><div class='del'>-		e-&gt;type-&gt;ops.elevator_deactivate_req_fn(q, rq);</div><div class='add'>+	if (e-&gt;type-&gt;ops.sq.elevator_deactivate_req_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.sq.elevator_deactivate_req_fn(q, rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FAIL_IO_TIMEOUT</div><div class='hunk'>@@ -203,14 +210,14 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req,</div><div class='ctx'> 		     struct bio *bio);</div><div class='ctx'> int ll_front_merge_fn(struct request_queue *q, struct request *req, </div><div class='ctx'> 		      struct bio *bio);</div><div class='del'>-int attempt_back_merge(struct request_queue *q, struct request *rq);</div><div class='del'>-int attempt_front_merge(struct request_queue *q, struct request *rq);</div><div class='add'>+struct request *attempt_back_merge(struct request_queue *q, struct request *rq);</div><div class='add'>+struct request *attempt_front_merge(struct request_queue *q, struct request *rq);</div><div class='ctx'> int blk_attempt_req_merge(struct request_queue *q, struct request *rq,</div><div class='ctx'> 				struct request *next);</div><div class='ctx'> void blk_recalc_rq_segments(struct request *rq);</div><div class='ctx'> void blk_rq_set_mixed_merge(struct request *rq);</div><div class='ctx'> bool blk_rq_merge_ok(struct request *rq, struct bio *bio);</div><div class='del'>-int blk_try_merge(struct request *rq, struct bio *bio);</div><div class='add'>+enum elv_merge blk_try_merge(struct request *rq, struct bio *bio);</div><div class='ctx'> </div><div class='ctx'> void blk_queue_congestion_threshold(struct request_queue *q);</div><div class='ctx'> </div><div class='hunk'>@@ -247,8 +254,15 @@ extern int blk_update_nr_requests(struct request_queue *, unsigned int);</div><div class='ctx'> static inline int blk_do_io_stat(struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	return rq-&gt;rq_disk &amp;&amp;</div><div class='del'>-	       (rq-&gt;cmd_flags &amp; REQ_IO_STAT) &amp;&amp;</div><div class='del'>-		(rq-&gt;cmd_type == REQ_TYPE_FS);</div><div class='add'>+	       (rq-&gt;rq_flags &amp; RQF_IO_STAT) &amp;&amp;</div><div class='add'>+		!blk_rq_is_passthrough(rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void req_set_nomerge(struct request_queue *q, struct request *req)</div><div class='add'>+{</div><div class='add'>+	req-&gt;cmd_flags |= REQ_NOMERGE;</div><div class='add'>+	if (req == q-&gt;last_merge)</div><div class='add'>+		q-&gt;last_merge = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -263,6 +277,22 @@ void ioc_clear_queue(struct request_queue *q);</div><div class='ctx'> int create_task_io_context(struct task_struct *task, gfp_t gfp_mask, int node);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * rq_ioc - determine io_context for request allocation</div><div class='add'>+ * @bio: request being allocated is for this bio (can be %NULL)</div><div class='add'>+ *</div><div class='add'>+ * Determine io_context to use for request allocation for @bio.  May return</div><div class='add'>+ * %NULL if %current-&gt;io_context doesn't exist.</div><div class='add'>+ */</div><div class='add'>+static inline struct io_context *rq_ioc(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BLK_CGROUP</div><div class='add'>+	if (bio &amp;&amp; bio-&gt;bi_ioc)</div><div class='add'>+		return bio-&gt;bi_ioc;</div><div class='add'>+#endif</div><div class='add'>+	return current-&gt;io_context;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * create_io_context - try to create task-&gt;io_context</div><div class='ctx'>  * @gfp_mask: allocation mask</div><div class='ctx'>  * @node: allocation node</div><div class='head'>diff --git a/block/bsg-lib.c b/block/bsg-lib.c<br/>index 650f427d915b..cd15f9dbb147 100644<br/>--- a/<a href='/drm-misc/tree/block/bsg-lib.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/bsg-lib.c</a><br/>+++ b/<a href='/drm-misc/tree/block/bsg-lib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/bsg-lib.c</a></div><div class='hunk'>@@ -32,8 +32,13 @@</div><div class='ctx'>  * bsg_destroy_job - routine to teardown/delete a bsg job</div><div class='ctx'>  * @job: bsg_job that is to be torn down</div><div class='ctx'>  */</div><div class='del'>-static void bsg_destroy_job(struct bsg_job *job)</div><div class='add'>+static void bsg_destroy_job(struct kref *kref)</div><div class='ctx'> {</div><div class='add'>+	struct bsg_job *job = container_of(kref, struct bsg_job, kref);</div><div class='add'>+	struct request *rq = job-&gt;req;</div><div class='add'>+</div><div class='add'>+	blk_end_request_all(rq, rq-&gt;errors);</div><div class='add'>+</div><div class='ctx'> 	put_device(job-&gt;dev);	/* release reference for the request */</div><div class='ctx'> </div><div class='ctx'> 	kfree(job-&gt;request_payload.sg_list);</div><div class='hunk'>@@ -41,6 +46,18 @@ static void bsg_destroy_job(struct bsg_job *job)</div><div class='ctx'> 	kfree(job);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void bsg_job_put(struct bsg_job *job)</div><div class='add'>+{</div><div class='add'>+	kref_put(&amp;job-&gt;kref, bsg_destroy_job);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bsg_job_put);</div><div class='add'>+</div><div class='add'>+int bsg_job_get(struct bsg_job *job)</div><div class='add'>+{</div><div class='add'>+	return kref_get_unless_zero(&amp;job-&gt;kref);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bsg_job_get);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * bsg_job_done - completion routine for bsg requests</div><div class='ctx'>  * @job: bsg_job that is complete</div><div class='hunk'>@@ -54,22 +71,24 @@ void bsg_job_done(struct bsg_job *job, int result,</div><div class='ctx'> {</div><div class='ctx'> 	struct request *req = job-&gt;req;</div><div class='ctx'> 	struct request *rsp = req-&gt;next_rq;</div><div class='add'>+	struct scsi_request *rq = scsi_req(req);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = job-&gt;req-&gt;errors = result;</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		/* we're only returning the result field in the reply */</div><div class='del'>-		job-&gt;req-&gt;sense_len = sizeof(u32);</div><div class='add'>+		rq-&gt;sense_len = sizeof(u32);</div><div class='ctx'> 	else</div><div class='del'>-		job-&gt;req-&gt;sense_len = job-&gt;reply_len;</div><div class='add'>+		rq-&gt;sense_len = job-&gt;reply_len;</div><div class='ctx'> 	/* we assume all request payload was transferred, residual == 0 */</div><div class='del'>-	req-&gt;resid_len = 0;</div><div class='add'>+	rq-&gt;resid_len = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (rsp) {</div><div class='del'>-		WARN_ON(reply_payload_rcv_len &gt; rsp-&gt;resid_len);</div><div class='add'>+		WARN_ON(reply_payload_rcv_len &gt; scsi_req(rsp)-&gt;resid_len);</div><div class='ctx'> </div><div class='ctx'> 		/* set reply (bidi) residual */</div><div class='del'>-		rsp-&gt;resid_len -= min(reply_payload_rcv_len, rsp-&gt;resid_len);</div><div class='add'>+		scsi_req(rsp)-&gt;resid_len -=</div><div class='add'>+			min(reply_payload_rcv_len, scsi_req(rsp)-&gt;resid_len);</div><div class='ctx'> 	}</div><div class='ctx'> 	blk_complete_request(req);</div><div class='ctx'> }</div><div class='hunk'>@@ -83,8 +102,7 @@ static void bsg_softirq_done(struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct bsg_job *job = rq-&gt;special;</div><div class='ctx'> </div><div class='del'>-	blk_end_request_all(rq, rq-&gt;errors);</div><div class='del'>-	bsg_destroy_job(job);</div><div class='add'>+	bsg_job_put(job);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bsg_map_buffer(struct bsg_buffer *buf, struct request *req)</div><div class='hunk'>@@ -97,6 +115,7 @@ static int bsg_map_buffer(struct bsg_buffer *buf, struct request *req)</div><div class='ctx'> 	if (!buf-&gt;sg_list)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	sg_init_table(buf-&gt;sg_list, req-&gt;nr_phys_segments);</div><div class='add'>+	scsi_req(req)-&gt;resid_len = blk_rq_bytes(req);</div><div class='ctx'> 	buf-&gt;sg_cnt = blk_rq_map_sg(req-&gt;q, req, buf-&gt;sg_list);</div><div class='ctx'> 	buf-&gt;payload_len = blk_rq_bytes(req);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -111,6 +130,7 @@ static int bsg_create_job(struct device *dev, struct request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *rsp = req-&gt;next_rq;</div><div class='ctx'> 	struct request_queue *q = req-&gt;q;</div><div class='add'>+	struct scsi_request *rq = scsi_req(req);</div><div class='ctx'> 	struct bsg_job *job;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -124,9 +144,9 @@ static int bsg_create_job(struct device *dev, struct request *req)</div><div class='ctx'> 	job-&gt;req = req;</div><div class='ctx'> 	if (q-&gt;bsg_job_size)</div><div class='ctx'> 		job-&gt;dd_data = (void *)&amp;job[1];</div><div class='del'>-	job-&gt;request = req-&gt;cmd;</div><div class='del'>-	job-&gt;request_len = req-&gt;cmd_len;</div><div class='del'>-	job-&gt;reply = req-&gt;sense;</div><div class='add'>+	job-&gt;request = rq-&gt;cmd;</div><div class='add'>+	job-&gt;request_len = rq-&gt;cmd_len;</div><div class='add'>+	job-&gt;reply = rq-&gt;sense;</div><div class='ctx'> 	job-&gt;reply_len = SCSI_SENSE_BUFFERSIZE;	/* Size of sense buffer</div><div class='ctx'> 						 * allocated */</div><div class='ctx'> 	if (req-&gt;bio) {</div><div class='hunk'>@@ -142,6 +162,7 @@ static int bsg_create_job(struct device *dev, struct request *req)</div><div class='ctx'> 	job-&gt;dev = dev;</div><div class='ctx'> 	/* take a reference for the request */</div><div class='ctx'> 	get_device(job-&gt;dev);</div><div class='add'>+	kref_init(&amp;job-&gt;kref);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> failjob_rls_rqst_payload:</div><div class='hunk'>@@ -160,7 +181,9 @@ failjob_rls_job:</div><div class='ctx'>  *</div><div class='ctx'>  * Drivers/subsys should pass this to the queue init function.</div><div class='ctx'>  */</div><div class='del'>-void bsg_request_fn(struct request_queue *q)</div><div class='add'>+static void bsg_request_fn(struct request_queue *q)</div><div class='add'>+	__releases(q-&gt;queue_lock)</div><div class='add'>+	__acquires(q-&gt;queue_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = q-&gt;queuedata;</div><div class='ctx'> 	struct request *req;</div><div class='hunk'>@@ -195,24 +218,30 @@ void bsg_request_fn(struct request_queue *q)</div><div class='ctx'> 	put_device(dev);</div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(bsg_request_fn);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * bsg_setup_queue - Create and add the bsg hooks so we can receive requests</div><div class='ctx'>  * @dev: device to attach bsg device to</div><div class='del'>- * @q: request queue setup by caller</div><div class='ctx'>  * @name: device to give bsg device</div><div class='ctx'>  * @job_fn: bsg job handler</div><div class='ctx'>  * @dd_job_size: size of LLD data needed for each job</div><div class='del'>- *</div><div class='del'>- * The caller should have setup the reuqest queue with bsg_request_fn</div><div class='del'>- * as the request_fn.</div><div class='ctx'>  */</div><div class='del'>-int bsg_setup_queue(struct device *dev, struct request_queue *q,</div><div class='del'>-		    char *name, bsg_job_fn *job_fn, int dd_job_size)</div><div class='add'>+struct request_queue *bsg_setup_queue(struct device *dev, char *name,</div><div class='add'>+		bsg_job_fn *job_fn, int dd_job_size)</div><div class='ctx'> {</div><div class='add'>+	struct request_queue *q;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	q = blk_alloc_queue(GFP_KERNEL);</div><div class='add'>+	if (!q)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	q-&gt;cmd_size = sizeof(struct scsi_request);</div><div class='add'>+	q-&gt;request_fn = bsg_request_fn;</div><div class='add'>+</div><div class='add'>+	ret = blk_init_allocated_queue(q);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_cleanup_queue;</div><div class='add'>+</div><div class='ctx'> 	q-&gt;queuedata = dev;</div><div class='ctx'> 	q-&gt;bsg_job_size = dd_job_size;</div><div class='ctx'> 	q-&gt;bsg_job_fn = job_fn;</div><div class='hunk'>@@ -224,9 +253,12 @@ int bsg_setup_queue(struct device *dev, struct request_queue *q,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "%s: bsg interface failed to "</div><div class='ctx'> 		       "initialize - register queue\n", dev-&gt;kobj.name);</div><div class='del'>-		return ret;</div><div class='add'>+		goto out_cleanup_queue;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return q;</div><div class='add'>+out_cleanup_queue:</div><div class='add'>+	blk_cleanup_queue(q);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(bsg_setup_queue);</div><div class='head'>diff --git a/block/bsg.c b/block/bsg.c<br/>index d214e929ce18..74835dbf0c47 100644<br/>--- a/<a href='/drm-misc/tree/block/bsg.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/bsg.c</a><br/>+++ b/<a href='/drm-misc/tree/block/bsg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/bsg.c</a></div><div class='hunk'>@@ -85,7 +85,6 @@ struct bsg_command {</div><div class='ctx'> 	struct bio *bidi_bio;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct sg_io_v4 hdr;</div><div class='del'>-	char sense[SCSI_SENSE_BUFFERSIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void bsg_free_command(struct bsg_command *bc)</div><div class='hunk'>@@ -140,18 +139,20 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,</div><div class='ctx'> 				struct sg_io_v4 *hdr, struct bsg_device *bd,</div><div class='ctx'> 				fmode_t has_write_perm)</div><div class='ctx'> {</div><div class='add'>+	struct scsi_request *req = scsi_req(rq);</div><div class='add'>+</div><div class='ctx'> 	if (hdr-&gt;request_len &gt; BLK_MAX_CDB) {</div><div class='del'>-		rq-&gt;cmd = kzalloc(hdr-&gt;request_len, GFP_KERNEL);</div><div class='del'>-		if (!rq-&gt;cmd)</div><div class='add'>+		req-&gt;cmd = kzalloc(hdr-&gt;request_len, GFP_KERNEL);</div><div class='add'>+		if (!req-&gt;cmd)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(rq-&gt;cmd, (void __user *)(unsigned long)hdr-&gt;request,</div><div class='add'>+	if (copy_from_user(req-&gt;cmd, (void __user *)(unsigned long)hdr-&gt;request,</div><div class='ctx'> 			   hdr-&gt;request_len))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {</div><div class='del'>-		if (blk_verify_command(rq-&gt;cmd, has_write_perm))</div><div class='add'>+		if (blk_verify_command(req-&gt;cmd, has_write_perm))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 	} else if (!capable(CAP_SYS_RAWIO))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -159,7 +160,7 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * fill in request structure</div><div class='ctx'> 	 */</div><div class='del'>-	rq-&gt;cmd_len = hdr-&gt;request_len;</div><div class='add'>+	req-&gt;cmd_len = hdr-&gt;request_len;</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;timeout = msecs_to_jiffies(hdr-&gt;timeout);</div><div class='ctx'> 	if (!rq-&gt;timeout)</div><div class='hunk'>@@ -176,7 +177,7 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,</div><div class='ctx'>  * Check if sg_io_v4 from user is allowed and valid</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw)</div><div class='add'>+bsg_validate_sgv4_hdr(struct sg_io_v4 *hdr, int *op)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -197,7 +198,7 @@ bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw)</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*rw = hdr-&gt;dout_xfer_len ? WRITE : READ;</div><div class='add'>+	*op = hdr-&gt;dout_xfer_len ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -205,13 +206,12 @@ bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw)</div><div class='ctx'>  * map sg_io_v4 to a request.</div><div class='ctx'>  */</div><div class='ctx'> static struct request *</div><div class='del'>-bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,</div><div class='del'>-	    u8 *sense)</div><div class='add'>+bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = bd-&gt;queue;</div><div class='ctx'> 	struct request *rq, *next_rq = NULL;</div><div class='del'>-	int ret, rw;</div><div class='del'>-	unsigned int dxfer_len;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int op, dxfer_len;</div><div class='ctx'> 	void __user *dxferp = NULL;</div><div class='ctx'> 	struct bsg_class_device *bcd = &amp;q-&gt;bsg_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -226,36 +226,35 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,</div><div class='ctx'> 		hdr-&gt;dout_xfer_len, (unsigned long long) hdr-&gt;din_xferp,</div><div class='ctx'> 		hdr-&gt;din_xfer_len);</div><div class='ctx'> </div><div class='del'>-	ret = bsg_validate_sgv4_hdr(q, hdr, &amp;rw);</div><div class='add'>+	ret = bsg_validate_sgv4_hdr(hdr, &amp;op);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * map scatter-gather elements separately and string them to request</div><div class='ctx'> 	 */</div><div class='del'>-	rq = blk_get_request(q, rw, GFP_KERNEL);</div><div class='add'>+	rq = blk_get_request(q, op, GFP_KERNEL);</div><div class='ctx'> 	if (IS_ERR(rq))</div><div class='ctx'> 		return rq;</div><div class='del'>-	blk_rq_set_block_pc(rq);</div><div class='add'>+	scsi_req_init(rq);</div><div class='ctx'> </div><div class='ctx'> 	ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd, has_write_perm);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (rw == WRITE &amp;&amp; hdr-&gt;din_xfer_len) {</div><div class='add'>+	if (op == REQ_OP_SCSI_OUT &amp;&amp; hdr-&gt;din_xfer_len) {</div><div class='ctx'> 		if (!test_bit(QUEUE_FLAG_BIDI, &amp;q-&gt;queue_flags)) {</div><div class='ctx'> 			ret = -EOPNOTSUPP;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		next_rq = blk_get_request(q, READ, GFP_KERNEL);</div><div class='add'>+		next_rq = blk_get_request(q, REQ_OP_SCSI_IN, GFP_KERNEL);</div><div class='ctx'> 		if (IS_ERR(next_rq)) {</div><div class='ctx'> 			ret = PTR_ERR(next_rq);</div><div class='ctx'> 			next_rq = NULL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		rq-&gt;next_rq = next_rq;</div><div class='del'>-		next_rq-&gt;cmd_type = rq-&gt;cmd_type;</div><div class='ctx'> </div><div class='ctx'> 		dxferp = (void __user *)(unsigned long)hdr-&gt;din_xferp;</div><div class='ctx'> 		ret =  blk_rq_map_user(q, next_rq, NULL, dxferp,</div><div class='hunk'>@@ -280,13 +279,9 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rq-&gt;sense = sense;</div><div class='del'>-	rq-&gt;sense_len = 0;</div><div class='del'>-</div><div class='ctx'> 	return rq;</div><div class='ctx'> out:</div><div class='del'>-	if (rq-&gt;cmd != rq-&gt;__cmd)</div><div class='del'>-		kfree(rq-&gt;cmd);</div><div class='add'>+	scsi_req_free_cmd(scsi_req(rq));</div><div class='ctx'> 	blk_put_request(rq);</div><div class='ctx'> 	if (next_rq) {</div><div class='ctx'> 		blk_rq_unmap_user(next_rq-&gt;bio);</div><div class='hunk'>@@ -393,6 +388,7 @@ static struct bsg_command *bsg_get_done_cmd(struct bsg_device *bd)</div><div class='ctx'> static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,</div><div class='ctx'> 				    struct bio *bio, struct bio *bidi_bio)</div><div class='ctx'> {</div><div class='add'>+	struct scsi_request *req = scsi_req(rq);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("rq %p bio %p 0x%x\n", rq, bio, rq-&gt;errors);</div><div class='hunk'>@@ -407,12 +403,12 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,</div><div class='ctx'> 		hdr-&gt;info |= SG_INFO_CHECK;</div><div class='ctx'> 	hdr-&gt;response_len = 0;</div><div class='ctx'> </div><div class='del'>-	if (rq-&gt;sense_len &amp;&amp; hdr-&gt;response) {</div><div class='add'>+	if (req-&gt;sense_len &amp;&amp; hdr-&gt;response) {</div><div class='ctx'> 		int len = min_t(unsigned int, hdr-&gt;max_response_len,</div><div class='del'>-					rq-&gt;sense_len);</div><div class='add'>+					req-&gt;sense_len);</div><div class='ctx'> </div><div class='ctx'> 		ret = copy_to_user((void __user *)(unsigned long)hdr-&gt;response,</div><div class='del'>-				   rq-&gt;sense, len);</div><div class='add'>+				   req-&gt;sense, len);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			hdr-&gt;response_len = len;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -420,14 +416,14 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rq-&gt;next_rq) {</div><div class='del'>-		hdr-&gt;dout_resid = rq-&gt;resid_len;</div><div class='del'>-		hdr-&gt;din_resid = rq-&gt;next_rq-&gt;resid_len;</div><div class='add'>+		hdr-&gt;dout_resid = req-&gt;resid_len;</div><div class='add'>+		hdr-&gt;din_resid = scsi_req(rq-&gt;next_rq)-&gt;resid_len;</div><div class='ctx'> 		blk_rq_unmap_user(bidi_bio);</div><div class='ctx'> 		blk_put_request(rq-&gt;next_rq);</div><div class='ctx'> 	} else if (rq_data_dir(rq) == READ)</div><div class='del'>-		hdr-&gt;din_resid = rq-&gt;resid_len;</div><div class='add'>+		hdr-&gt;din_resid = req-&gt;resid_len;</div><div class='ctx'> 	else</div><div class='del'>-		hdr-&gt;dout_resid = rq-&gt;resid_len;</div><div class='add'>+		hdr-&gt;dout_resid = req-&gt;resid_len;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the request generated a negative error number, return it</div><div class='hunk'>@@ -439,8 +435,7 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,</div><div class='ctx'> 		ret = rq-&gt;errors;</div><div class='ctx'> </div><div class='ctx'> 	blk_rq_unmap_user(bio);</div><div class='del'>-	if (rq-&gt;cmd != rq-&gt;__cmd)</div><div class='del'>-		kfree(rq-&gt;cmd);</div><div class='add'>+	scsi_req_free_cmd(req);</div><div class='ctx'> 	blk_put_request(rq);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -578,7 +573,7 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	ssize_t bytes_read;</div><div class='ctx'> </div><div class='del'>-	dprintk("%s: read %Zd bytes\n", bd-&gt;name, count);</div><div class='add'>+	dprintk("%s: read %zd bytes\n", bd-&gt;name, count);</div><div class='ctx'> </div><div class='ctx'> 	bsg_set_block(bd, file);</div><div class='ctx'> </div><div class='hunk'>@@ -625,7 +620,7 @@ static int __bsg_write(struct bsg_device *bd, const char __user *buf,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * get a request, fill in the blanks, and add to request queue</div><div class='ctx'> 		 */</div><div class='del'>-		rq = bsg_map_hdr(bd, &amp;bc-&gt;hdr, has_write_perm, bc-&gt;sense);</div><div class='add'>+		rq = bsg_map_hdr(bd, &amp;bc-&gt;hdr, has_write_perm);</div><div class='ctx'> 		if (IS_ERR(rq)) {</div><div class='ctx'> 			ret = PTR_ERR(rq);</div><div class='ctx'> 			rq = NULL;</div><div class='hunk'>@@ -653,7 +648,10 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)</div><div class='ctx'> 	ssize_t bytes_written;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dprintk("%s: write %Zd bytes\n", bd-&gt;name, count);</div><div class='add'>+	dprintk("%s: write %zd bytes\n", bd-&gt;name, count);</div><div class='add'>+</div><div class='add'>+	if (unlikely(segment_eq(get_fs(), KERNEL_DS)))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	bsg_set_block(bd, file);</div><div class='ctx'> </div><div class='hunk'>@@ -669,7 +667,7 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)</div><div class='ctx'> 	if (!bytes_written || err_block_err(ret))</div><div class='ctx'> 		bytes_written = ret;</div><div class='ctx'> </div><div class='del'>-	dprintk("%s: returning %Zd\n", bd-&gt;name, bytes_written);</div><div class='add'>+	dprintk("%s: returning %zd\n", bd-&gt;name, bytes_written);</div><div class='ctx'> 	return bytes_written;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -908,12 +906,11 @@ static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		struct bio *bio, *bidi_bio = NULL;</div><div class='ctx'> 		struct sg_io_v4 hdr;</div><div class='ctx'> 		int at_head;</div><div class='del'>-		u8 sense[SCSI_SENSE_BUFFERSIZE];</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user(&amp;hdr, uarg, sizeof(hdr)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		rq = bsg_map_hdr(bd, &amp;hdr, file-&gt;f_mode &amp; FMODE_WRITE, sense);</div><div class='add'>+		rq = bsg_map_hdr(bd, &amp;hdr, file-&gt;f_mode &amp; FMODE_WRITE);</div><div class='ctx'> 		if (IS_ERR(rq))</div><div class='ctx'> 			return PTR_ERR(rq);</div><div class='ctx'> </div><div class='head'>diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c<br/>index 5e24d880306c..440b95ee593c 100644<br/>--- a/<a href='/drm-misc/tree/block/cfq-iosched.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/cfq-iosched.c</a><br/>+++ b/<a href='/drm-misc/tree/block/cfq-iosched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/cfq-iosched.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/elevator.h&gt;</div><div class='ctx'> #include &lt;linux/ktime.h&gt;</div><div class='hunk'>@@ -16,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/blktrace_api.h&gt;</div><div class='ctx'> #include &lt;linux/blk-cgroup.h&gt;</div><div class='ctx'> #include "blk.h"</div><div class='add'>+#include "blk-wbt.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * tunables</div><div class='hunk'>@@ -667,10 +669,10 @@ static inline void cfqg_put(struct cfq_group *cfqg)</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> static inline void cfqg_stats_update_io_add(struct cfq_group *cfqg,</div><div class='del'>-					    struct cfq_group *curr_cfqg, int op,</div><div class='del'>-					    int op_flags)</div><div class='add'>+					    struct cfq_group *curr_cfqg,</div><div class='add'>+					    unsigned int op)</div><div class='ctx'> {</div><div class='del'>-	blkg_rwstat_add(&amp;cfqg-&gt;stats.queued, op, op_flags, 1);</div><div class='add'>+	blkg_rwstat_add(&amp;cfqg-&gt;stats.queued, op, 1);</div><div class='ctx'> 	cfqg_stats_end_empty_time(&amp;cfqg-&gt;stats);</div><div class='ctx'> 	cfqg_stats_set_start_group_wait_time(cfqg, curr_cfqg);</div><div class='ctx'> }</div><div class='hunk'>@@ -684,30 +686,29 @@ static inline void cfqg_stats_update_timeslice_used(struct cfq_group *cfqg,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void cfqg_stats_update_io_remove(struct cfq_group *cfqg, int op,</div><div class='del'>-					       int op_flags)</div><div class='add'>+static inline void cfqg_stats_update_io_remove(struct cfq_group *cfqg,</div><div class='add'>+					       unsigned int op)</div><div class='ctx'> {</div><div class='del'>-	blkg_rwstat_add(&amp;cfqg-&gt;stats.queued, op, op_flags, -1);</div><div class='add'>+	blkg_rwstat_add(&amp;cfqg-&gt;stats.queued, op, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void cfqg_stats_update_io_merged(struct cfq_group *cfqg, int op,</div><div class='del'>-					       int op_flags)</div><div class='add'>+static inline void cfqg_stats_update_io_merged(struct cfq_group *cfqg,</div><div class='add'>+					       unsigned int op)</div><div class='ctx'> {</div><div class='del'>-	blkg_rwstat_add(&amp;cfqg-&gt;stats.merged, op, op_flags, 1);</div><div class='add'>+	blkg_rwstat_add(&amp;cfqg-&gt;stats.merged, op, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void cfqg_stats_update_completion(struct cfq_group *cfqg,</div><div class='del'>-			uint64_t start_time, uint64_t io_start_time, int op,</div><div class='del'>-			int op_flags)</div><div class='add'>+			uint64_t start_time, uint64_t io_start_time,</div><div class='add'>+			unsigned int op)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfqg_stats *stats = &amp;cfqg-&gt;stats;</div><div class='ctx'> 	unsigned long long now = sched_clock();</div><div class='ctx'> </div><div class='ctx'> 	if (time_after64(now, io_start_time))</div><div class='del'>-		blkg_rwstat_add(&amp;stats-&gt;service_time, op, op_flags,</div><div class='del'>-				now - io_start_time);</div><div class='add'>+		blkg_rwstat_add(&amp;stats-&gt;service_time, op, now - io_start_time);</div><div class='ctx'> 	if (time_after64(io_start_time, start_time))</div><div class='del'>-		blkg_rwstat_add(&amp;stats-&gt;wait_time, op, op_flags,</div><div class='add'>+		blkg_rwstat_add(&amp;stats-&gt;wait_time, op,</div><div class='ctx'> 				io_start_time - start_time);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -786,16 +787,16 @@ static inline void cfqg_put(struct cfq_group *cfqg) { }</div><div class='ctx'> #define cfq_log_cfqg(cfqd, cfqg, fmt, args...)		do {} while (0)</div><div class='ctx'> </div><div class='ctx'> static inline void cfqg_stats_update_io_add(struct cfq_group *cfqg,</div><div class='del'>-			struct cfq_group *curr_cfqg, int op, int op_flags) { }</div><div class='add'>+			struct cfq_group *curr_cfqg, unsigned int op) { }</div><div class='ctx'> static inline void cfqg_stats_update_timeslice_used(struct cfq_group *cfqg,</div><div class='ctx'> 			uint64_t time, unsigned long unaccounted_time) { }</div><div class='del'>-static inline void cfqg_stats_update_io_remove(struct cfq_group *cfqg, int op,</div><div class='del'>-			int op_flags) { }</div><div class='del'>-static inline void cfqg_stats_update_io_merged(struct cfq_group *cfqg, int op,</div><div class='del'>-			int op_flags) { }</div><div class='add'>+static inline void cfqg_stats_update_io_remove(struct cfq_group *cfqg,</div><div class='add'>+			unsigned int op) { }</div><div class='add'>+static inline void cfqg_stats_update_io_merged(struct cfq_group *cfqg,</div><div class='add'>+			unsigned int op) { }</div><div class='ctx'> static inline void cfqg_stats_update_completion(struct cfq_group *cfqg,</div><div class='del'>-			uint64_t start_time, uint64_t io_start_time, int op,</div><div class='del'>-			int op_flags) { }</div><div class='add'>+			uint64_t start_time, uint64_t io_start_time,</div><div class='add'>+			unsigned int op) { }</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_CFQ_GROUP_IOSCHED */</div><div class='ctx'> </div><div class='hunk'>@@ -913,15 +914,6 @@ static inline struct cfq_data *cic_to_cfqd(struct cfq_io_cq *cic)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * We regard a request as SYNC, if it's either a read or has the SYNC bit</div><div class='del'>- * set (in which case it could also be direct WRITE).</div><div class='del'>- */</div><div class='del'>-static inline bool cfq_bio_sync(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	return bio_data_dir(bio) == READ || (bio-&gt;bi_opf &amp; REQ_SYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * scheduler run of queue, if there are requests pending and no one in the</div><div class='ctx'>  * driver that will restart queueing</div><div class='ctx'>  */</div><div class='hunk'>@@ -1596,7 +1588,7 @@ static struct blkcg_policy_data *cfq_cpd_alloc(gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_group_data *cgd;</div><div class='ctx'> </div><div class='del'>-	cgd = kzalloc(sizeof(*cgd), GFP_KERNEL);</div><div class='add'>+	cgd = kzalloc(sizeof(*cgd), gfp);</div><div class='ctx'> 	if (!cgd)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	return &amp;cgd-&gt;cpd;</div><div class='hunk'>@@ -2474,10 +2466,10 @@ static void cfq_reposition_rq_rb(struct cfq_queue *cfqq, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	elv_rb_del(&amp;cfqq-&gt;sort_list, rq);</div><div class='ctx'> 	cfqq-&gt;queued[rq_is_sync(rq)]--;</div><div class='del'>-	cfqg_stats_update_io_remove(RQ_CFQG(rq), req_op(rq), rq-&gt;cmd_flags);</div><div class='add'>+	cfqg_stats_update_io_remove(RQ_CFQG(rq), rq-&gt;cmd_flags);</div><div class='ctx'> 	cfq_add_rq_rb(rq);</div><div class='ctx'> 	cfqg_stats_update_io_add(RQ_CFQG(rq), cfqq-&gt;cfqd-&gt;serving_group,</div><div class='del'>-				 req_op(rq), rq-&gt;cmd_flags);</div><div class='add'>+				 rq-&gt;cmd_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct request *</div><div class='hunk'>@@ -2491,7 +2483,7 @@ cfq_find_rq_fmerge(struct cfq_data *cfqd, struct bio *bio)</div><div class='ctx'> 	if (!cic)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	cfqq = cic_to_cfqq(cic, cfq_bio_sync(bio));</div><div class='add'>+	cfqq = cic_to_cfqq(cic, op_is_sync(bio-&gt;bi_opf));</div><div class='ctx'> 	if (cfqq)</div><div class='ctx'> 		return elv_rb_find(&amp;cfqq-&gt;sort_list, bio_end_sector(bio));</div><div class='ctx'> </div><div class='hunk'>@@ -2530,14 +2522,14 @@ static void cfq_remove_request(struct request *rq)</div><div class='ctx'> 	cfq_del_rq_rb(rq);</div><div class='ctx'> </div><div class='ctx'> 	cfqq-&gt;cfqd-&gt;rq_queued--;</div><div class='del'>-	cfqg_stats_update_io_remove(RQ_CFQG(rq), req_op(rq), rq-&gt;cmd_flags);</div><div class='add'>+	cfqg_stats_update_io_remove(RQ_CFQG(rq), rq-&gt;cmd_flags);</div><div class='ctx'> 	if (rq-&gt;cmd_flags &amp; REQ_PRIO) {</div><div class='ctx'> 		WARN_ON(!cfqq-&gt;prio_pending);</div><div class='ctx'> 		cfqq-&gt;prio_pending--;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cfq_merge(struct request_queue *q, struct request **req,</div><div class='add'>+static enum elv_merge cfq_merge(struct request_queue *q, struct request **req,</div><div class='ctx'> 		     struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = q-&gt;elevator-&gt;elevator_data;</div><div class='hunk'>@@ -2553,7 +2545,7 @@ static int cfq_merge(struct request_queue *q, struct request **req,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cfq_merged_request(struct request_queue *q, struct request *req,</div><div class='del'>-			       int type)</div><div class='add'>+			       enum elv_merge type)</div><div class='ctx'> {</div><div class='ctx'> 	if (type == ELEVATOR_FRONT_MERGE) {</div><div class='ctx'> 		struct cfq_queue *cfqq = RQ_CFQQ(req);</div><div class='hunk'>@@ -2565,7 +2557,7 @@ static void cfq_merged_request(struct request_queue *q, struct request *req,</div><div class='ctx'> static void cfq_bio_merged(struct request_queue *q, struct request *req,</div><div class='ctx'> 				struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	cfqg_stats_update_io_merged(RQ_CFQG(req), bio_op(bio), bio-&gt;bi_opf);</div><div class='add'>+	cfqg_stats_update_io_merged(RQ_CFQG(req), bio-&gt;bi_opf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -2588,7 +2580,7 @@ cfq_merged_requests(struct request_queue *q, struct request *rq,</div><div class='ctx'> 	if (cfqq-&gt;next_rq == next)</div><div class='ctx'> 		cfqq-&gt;next_rq = rq;</div><div class='ctx'> 	cfq_remove_request(next);</div><div class='del'>-	cfqg_stats_update_io_merged(RQ_CFQG(rq), req_op(next), next-&gt;cmd_flags);</div><div class='add'>+	cfqg_stats_update_io_merged(RQ_CFQG(rq), next-&gt;cmd_flags);</div><div class='ctx'> </div><div class='ctx'> 	cfqq = RQ_CFQQ(next);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2605,13 +2597,14 @@ static int cfq_allow_bio_merge(struct request_queue *q, struct request *rq,</div><div class='ctx'> 			       struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = q-&gt;elevator-&gt;elevator_data;</div><div class='add'>+	bool is_sync = op_is_sync(bio-&gt;bi_opf);</div><div class='ctx'> 	struct cfq_io_cq *cic;</div><div class='ctx'> 	struct cfq_queue *cfqq;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disallow merge of a sync bio into an async request.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cfq_bio_sync(bio) &amp;&amp; !rq_is_sync(rq))</div><div class='add'>+	if (is_sync &amp;&amp; !rq_is_sync(rq))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2622,7 +2615,7 @@ static int cfq_allow_bio_merge(struct request_queue *q, struct request *rq,</div><div class='ctx'> 	if (!cic)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	cfqq = cic_to_cfqq(cic, cfq_bio_sync(bio));</div><div class='add'>+	cfqq = cic_to_cfqq(cic, is_sync);</div><div class='ctx'> 	return cfqq == RQ_CFQQ(rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2757,9 +2750,11 @@ static struct cfq_queue *cfq_get_next_queue_forced(struct cfq_data *cfqd)</div><div class='ctx'> 	if (!cfqg)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	for_each_cfqg_st(cfqg, i, j, st)</div><div class='del'>-		if ((cfqq = cfq_rb_first(st)) != NULL)</div><div class='add'>+	for_each_cfqg_st(cfqg, i, j, st) {</div><div class='add'>+		cfqq = cfq_rb_first(st);</div><div class='add'>+		if (cfqq)</div><div class='ctx'> 			return cfqq;</div><div class='add'>+	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3766,14 +3761,16 @@ static void cfq_init_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CFQ_GROUP_IOSCHED</div><div class='del'>-static void check_blkcg_changed(struct cfq_io_cq *cic, struct bio *bio)</div><div class='add'>+static bool check_blkcg_changed(struct cfq_io_cq *cic, struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = cic_to_cfqd(cic);</div><div class='ctx'> 	struct cfq_queue *cfqq;</div><div class='ctx'> 	uint64_t serial_nr;</div><div class='add'>+	bool nonroot_cg;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	serial_nr = bio_blkcg(bio)-&gt;css.serial_nr;</div><div class='add'>+	nonroot_cg = bio_blkcg(bio) != &amp;blkcg_root;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3781,7 +3778,7 @@ static void check_blkcg_changed(struct cfq_io_cq *cic, struct bio *bio)</div><div class='ctx'> 	 * spuriously on a newly created cic but there's no harm.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(!cfqd) || likely(cic-&gt;blkcg_serial_nr == serial_nr))</div><div class='del'>-		return;</div><div class='add'>+		return nonroot_cg;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Drop reference to queues.  New queues will be assigned in new</div><div class='hunk'>@@ -3802,9 +3799,13 @@ static void check_blkcg_changed(struct cfq_io_cq *cic, struct bio *bio)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cic-&gt;blkcg_serial_nr = serial_nr;</div><div class='add'>+	return nonroot_cg;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline void check_blkcg_changed(struct cfq_io_cq *cic, struct bio *bio) { }</div><div class='add'>+static inline bool check_blkcg_changed(struct cfq_io_cq *cic, struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> #endif  /* CONFIG_CFQ_GROUP_IOSCHED */</div><div class='ctx'> </div><div class='ctx'> static struct cfq_queue **</div><div class='hunk'>@@ -3854,13 +3855,16 @@ cfq_get_queue(struct cfq_data *cfqd, bool is_sync, struct cfq_io_cq *cic,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cfqq = kmem_cache_alloc_node(cfq_pool, GFP_NOWAIT | __GFP_ZERO,</div><div class='add'>+	cfqq = kmem_cache_alloc_node(cfq_pool,</div><div class='add'>+				     GFP_NOWAIT | __GFP_ZERO | __GFP_NOWARN,</div><div class='ctx'> 				     cfqd-&gt;queue-&gt;node);</div><div class='ctx'> 	if (!cfqq) {</div><div class='ctx'> 		cfqq = &amp;cfqd-&gt;oom_cfqq;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* cfq_init_cfqq() assumes cfqq-&gt;ioprio_class is initialized. */</div><div class='add'>+	cfqq-&gt;ioprio_class = IOPRIO_CLASS_NONE;</div><div class='ctx'> 	cfq_init_cfqq(cfqd, cfqq, current-&gt;pid, is_sync);</div><div class='ctx'> 	cfq_init_prio_data(cfqq, cic);</div><div class='ctx'> 	cfq_link_cfqq_cfqg(cfqq, cfqg);</div><div class='hunk'>@@ -3923,6 +3927,12 @@ cfq_update_io_seektime(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> 		cfqq-&gt;seek_history |= (sdist &gt; CFQQ_SEEK_THR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool req_noidle(struct request *req)</div><div class='add'>+{</div><div class='add'>+	return req_op(req) == REQ_OP_WRITE &amp;&amp;</div><div class='add'>+		(req-&gt;cmd_flags &amp; (REQ_SYNC | REQ_IDLE)) == REQ_SYNC;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Disable idle window if the process thinks too long or seeks so much that</div><div class='ctx'>  * it doesn't matter</div><div class='hunk'>@@ -3944,7 +3954,7 @@ cfq_update_idle_window(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> 	if (cfqq-&gt;queued[0] + cfqq-&gt;queued[1] &gt;= 4)</div><div class='ctx'> 		cfq_mark_cfqq_deep(cfqq);</div><div class='ctx'> </div><div class='del'>-	if (cfqq-&gt;next_rq &amp;&amp; (cfqq-&gt;next_rq-&gt;cmd_flags &amp; REQ_NOIDLE))</div><div class='add'>+	if (cfqq-&gt;next_rq &amp;&amp; req_noidle(cfqq-&gt;next_rq))</div><div class='ctx'> 		enable_idle = 0;</div><div class='ctx'> 	else if (!atomic_read(&amp;cic-&gt;icq.ioc-&gt;active_ref) ||</div><div class='ctx'> 		 !cfqd-&gt;cfq_slice_idle ||</div><div class='hunk'>@@ -4142,7 +4152,7 @@ static void cfq_insert_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	rq-&gt;fifo_time = ktime_get_ns() + cfqd-&gt;cfq_fifo_expire[rq_is_sync(rq)];</div><div class='ctx'> 	list_add_tail(&amp;rq-&gt;queuelist, &amp;cfqq-&gt;fifo);</div><div class='ctx'> 	cfq_add_rq_rb(rq);</div><div class='del'>-	cfqg_stats_update_io_add(RQ_CFQG(rq), cfqd-&gt;serving_group, req_op(rq),</div><div class='add'>+	cfqg_stats_update_io_add(RQ_CFQG(rq), cfqd-&gt;serving_group,</div><div class='ctx'> 				 rq-&gt;cmd_flags);</div><div class='ctx'> 	cfq_rq_enqueued(cfqd, cfqq, rq);</div><div class='ctx'> }</div><div class='hunk'>@@ -4229,8 +4239,7 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	const int sync = rq_is_sync(rq);</div><div class='ctx'> 	u64 now = ktime_get_ns();</div><div class='ctx'> </div><div class='del'>-	cfq_log_cfqq(cfqd, cfqq, "complete rqnoidle %d",</div><div class='del'>-		     !!(rq-&gt;cmd_flags &amp; REQ_NOIDLE));</div><div class='add'>+	cfq_log_cfqq(cfqd, cfqq, "complete rqnoidle %d", req_noidle(rq));</div><div class='ctx'> </div><div class='ctx'> 	cfq_update_hw_tag(cfqd);</div><div class='ctx'> </div><div class='hunk'>@@ -4240,8 +4249,7 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	cfqq-&gt;dispatched--;</div><div class='ctx'> 	(RQ_CFQG(rq))-&gt;dispatched--;</div><div class='ctx'> 	cfqg_stats_update_completion(cfqq-&gt;cfqg, rq_start_time_ns(rq),</div><div class='del'>-				     rq_io_start_time_ns(rq), req_op(rq),</div><div class='del'>-				     rq-&gt;cmd_flags);</div><div class='add'>+				     rq_io_start_time_ns(rq), rq-&gt;cmd_flags);</div><div class='ctx'> </div><div class='ctx'> 	cfqd-&gt;rq_in_flight[cfq_cfqq_sync(cfqq)]--;</div><div class='ctx'> </div><div class='hunk'>@@ -4319,14 +4327,14 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 		cfq_schedule_dispatch(cfqd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cfqq_boost_on_prio(struct cfq_queue *cfqq, int op_flags)</div><div class='add'>+static void cfqq_boost_on_prio(struct cfq_queue *cfqq, unsigned int op)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If REQ_PRIO is set, boost class and prio level, if it's below</div><div class='ctx'> 	 * BE/NORM. If prio is not set, restore the potentially boosted</div><div class='ctx'> 	 * class/prio level.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(op_flags &amp; REQ_PRIO)) {</div><div class='add'>+	if (!(op &amp; REQ_PRIO)) {</div><div class='ctx'> 		cfqq-&gt;ioprio_class = cfqq-&gt;org_ioprio_class;</div><div class='ctx'> 		cfqq-&gt;ioprio = cfqq-&gt;org_ioprio;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -4347,7 +4355,7 @@ static inline int __cfq_may_queue(struct cfq_queue *cfqq)</div><div class='ctx'> 	return ELV_MQUEUE_MAY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cfq_may_queue(struct request_queue *q, int op, int op_flags)</div><div class='add'>+static int cfq_may_queue(struct request_queue *q, unsigned int op)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = q-&gt;elevator-&gt;elevator_data;</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='hunk'>@@ -4364,10 +4372,10 @@ static int cfq_may_queue(struct request_queue *q, int op, int op_flags)</div><div class='ctx'> 	if (!cic)</div><div class='ctx'> 		return ELV_MQUEUE_MAY;</div><div class='ctx'> </div><div class='del'>-	cfqq = cic_to_cfqq(cic, rw_is_sync(op, op_flags));</div><div class='add'>+	cfqq = cic_to_cfqq(cic, op_is_sync(op));</div><div class='ctx'> 	if (cfqq) {</div><div class='ctx'> 		cfq_init_prio_data(cfqq, cic);</div><div class='del'>-		cfqq_boost_on_prio(cfqq, op_flags);</div><div class='add'>+		cfqq_boost_on_prio(cfqq, op);</div><div class='ctx'> </div><div class='ctx'> 		return __cfq_may_queue(cfqq);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4441,11 +4449,12 @@ cfq_set_request(struct request_queue *q, struct request *rq, struct bio *bio,</div><div class='ctx'> 	const int rw = rq_data_dir(rq);</div><div class='ctx'> 	const bool is_sync = rq_is_sync(rq);</div><div class='ctx'> 	struct cfq_queue *cfqq;</div><div class='add'>+	bool disable_wbt;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='ctx'> 	check_ioprio_changed(cic, bio);</div><div class='del'>-	check_blkcg_changed(cic, bio);</div><div class='add'>+	disable_wbt = check_blkcg_changed(cic, bio);</div><div class='ctx'> new_queue:</div><div class='ctx'> 	cfqq = cic_to_cfqq(cic, is_sync);</div><div class='ctx'> 	if (!cfqq || cfqq == &amp;cfqd-&gt;oom_cfqq) {</div><div class='hunk'>@@ -4481,6 +4490,10 @@ new_queue:</div><div class='ctx'> 	rq-&gt;elv.priv[0] = cfqq;</div><div class='ctx'> 	rq-&gt;elv.priv[1] = cfqq-&gt;cfqg;</div><div class='ctx'> 	spin_unlock_irq(q-&gt;queue_lock);</div><div class='add'>+</div><div class='add'>+	if (disable_wbt)</div><div class='add'>+		wbt_disable_default(q);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4830,7 +4843,7 @@ static struct elv_fs_entry cfq_attrs[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct elevator_type iosched_cfq = {</div><div class='del'>-	.ops = {</div><div class='add'>+	.ops.sq = {</div><div class='ctx'> 		.elevator_merge_fn = 		cfq_merge,</div><div class='ctx'> 		.elevator_merged_fn =		cfq_merged_request,</div><div class='ctx'> 		.elevator_merge_req_fn =	cfq_merged_requests,</div><div class='head'>diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c<br/>index 556826ac7cb4..570021a0dc1c 100644<br/>--- a/<a href='/drm-misc/tree/block/compat_ioctl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/compat_ioctl.c</a><br/>+++ b/<a href='/drm-misc/tree/block/compat_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/compat_ioctl.c</a></div><div class='hunk'>@@ -661,7 +661,6 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)</div><div class='ctx'> 	struct block_device *bdev = inode-&gt;i_bdev;</div><div class='ctx'> 	struct gendisk *disk = bdev-&gt;bd_disk;</div><div class='ctx'> 	fmode_t mode = file-&gt;f_mode;</div><div class='del'>-	struct backing_dev_info *bdi;</div><div class='ctx'> 	loff_t size;</div><div class='ctx'> 	unsigned int max_sectors;</div><div class='ctx'> </div><div class='hunk'>@@ -708,9 +707,8 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)</div><div class='ctx'> 	case BLKFRAGET:</div><div class='ctx'> 		if (!arg)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		bdi = blk_get_backing_dev_info(bdev);</div><div class='ctx'> 		return compat_put_long(arg,</div><div class='del'>-				       (bdi-&gt;ra_pages * PAGE_SIZE) / 512);</div><div class='add'>+			       (bdev-&gt;bd_bdi-&gt;ra_pages * PAGE_SIZE) / 512);</div><div class='ctx'> 	case BLKROGET: /* compatible */</div><div class='ctx'> 		return compat_put_int(arg, bdev_read_only(bdev) != 0);</div><div class='ctx'> 	case BLKBSZGET_32: /* get the logical block size (cf. BLKSSZGET) */</div><div class='hunk'>@@ -728,8 +726,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)</div><div class='ctx'> 	case BLKFRASET:</div><div class='ctx'> 		if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 			return -EACCES;</div><div class='del'>-		bdi = blk_get_backing_dev_info(bdev);</div><div class='del'>-		bdi-&gt;ra_pages = (arg * 512) / PAGE_SIZE;</div><div class='add'>+		bdev-&gt;bd_bdi-&gt;ra_pages = (arg * 512) / PAGE_SIZE;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case BLKGETSIZE:</div><div class='ctx'> 		size = i_size_read(bdev-&gt;bd_inode);</div><div class='head'>diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c<br/>index 55e0bb6d7da7..c68f6bbc0dcd 100644<br/>--- a/<a href='/drm-misc/tree/block/deadline-iosched.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/deadline-iosched.c</a><br/>+++ b/<a href='/drm-misc/tree/block/deadline-iosched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/deadline-iosched.c</a></div><div class='hunk'>@@ -120,12 +120,11 @@ static void deadline_remove_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	deadline_del_rq_rb(dd, rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static enum elv_merge</div><div class='ctx'> deadline_merge(struct request_queue *q, struct request **req, struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct deadline_data *dd = q-&gt;elevator-&gt;elevator_data;</div><div class='ctx'> 	struct request *__rq;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * check for front merge</div><div class='hunk'>@@ -138,20 +137,17 @@ deadline_merge(struct request_queue *q, struct request **req, struct bio *bio)</div><div class='ctx'> 			BUG_ON(sector != blk_rq_pos(__rq));</div><div class='ctx'> </div><div class='ctx'> 			if (elv_bio_merge_ok(__rq, bio)) {</div><div class='del'>-				ret = ELEVATOR_FRONT_MERGE;</div><div class='del'>-				goto out;</div><div class='add'>+				*req = __rq;</div><div class='add'>+				return ELEVATOR_FRONT_MERGE;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ELEVATOR_NO_MERGE;</div><div class='del'>-out:</div><div class='del'>-	*req = __rq;</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void deadline_merged_request(struct request_queue *q,</div><div class='del'>-				    struct request *req, int type)</div><div class='add'>+				    struct request *req, enum elv_merge type)</div><div class='ctx'> {</div><div class='ctx'> 	struct deadline_data *dd = q-&gt;elevator-&gt;elevator_data;</div><div class='ctx'> </div><div class='hunk'>@@ -439,7 +435,7 @@ static struct elv_fs_entry deadline_attrs[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct elevator_type iosched_deadline = {</div><div class='del'>-	.ops = {</div><div class='add'>+	.ops.sq = {</div><div class='ctx'> 		.elevator_merge_fn = 		deadline_merge,</div><div class='ctx'> 		.elevator_merged_fn =		deadline_merged_request,</div><div class='ctx'> 		.elevator_merge_req_fn =	deadline_merged_requests,</div><div class='head'>diff --git a/block/elevator.c b/block/elevator.c<br/>index f7d973a56fd7..01139f549b5b 100644<br/>--- a/<a href='/drm-misc/tree/block/elevator.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/elevator.c</a><br/>+++ b/<a href='/drm-misc/tree/block/elevator.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/elevator.c</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #include &lt;trace/events/block.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "blk.h"</div><div class='add'>+#include "blk-mq-sched.h"</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(elv_list_lock);</div><div class='ctx'> static LIST_HEAD(elv_list);</div><div class='hunk'>@@ -58,8 +59,10 @@ static int elv_iosched_allow_bio_merge(struct request *rq, struct bio *bio)</div><div class='ctx'> 	struct request_queue *q = rq-&gt;q;</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_allow_bio_merge_fn)</div><div class='del'>-		return e-&gt;type-&gt;ops.elevator_allow_bio_merge_fn(q, rq, bio);</div><div class='add'>+	if (e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.mq.allow_merge)</div><div class='add'>+		return e-&gt;type-&gt;ops.mq.allow_merge(q, rq, bio);</div><div class='add'>+	else if (!e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.sq.elevator_allow_bio_merge_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.sq.elevator_allow_bio_merge_fn(q, rq, bio);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -163,6 +166,7 @@ struct elevator_queue *elevator_alloc(struct request_queue *q,</div><div class='ctx'> 	kobject_init(&amp;eq-&gt;kobj, &amp;elv_ktype);</div><div class='ctx'> 	mutex_init(&amp;eq-&gt;sysfs_lock);</div><div class='ctx'> 	hash_init(eq-&gt;hash);</div><div class='add'>+	eq-&gt;uses_mq = e-&gt;uses_mq;</div><div class='ctx'> </div><div class='ctx'> 	return eq;</div><div class='ctx'> }</div><div class='hunk'>@@ -203,11 +207,12 @@ int elevator_init(struct request_queue *q, char *name)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Use the default elevator specified by config boot param or</div><div class='del'>-	 * config option.  Don't try to load modules as we could be running</div><div class='del'>-	 * off async and request_module() isn't allowed from async.</div><div class='add'>+	 * Use the default elevator specified by config boot param for</div><div class='add'>+	 * non-mq devices, or by config option. Don't try to load modules</div><div class='add'>+	 * as we could be running off async and request_module() isn't</div><div class='add'>+	 * allowed from async.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!e &amp;&amp; *chosen_elevator) {</div><div class='add'>+	if (!e &amp;&amp; !q-&gt;mq_ops &amp;&amp; *chosen_elevator) {</div><div class='ctx'> 		e = elevator_get(chosen_elevator, false);</div><div class='ctx'> 		if (!e)</div><div class='ctx'> 			printk(KERN_ERR "I/O scheduler %s not found\n",</div><div class='hunk'>@@ -215,7 +220,20 @@ int elevator_init(struct request_queue *q, char *name)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!e) {</div><div class='del'>-		e = elevator_get(CONFIG_DEFAULT_IOSCHED, false);</div><div class='add'>+		/*</div><div class='add'>+		 * For blk-mq devices, we default to using mq-deadline,</div><div class='add'>+		 * if available, for single queue devices. If deadline</div><div class='add'>+		 * isn't available OR we have multiple queues, default</div><div class='add'>+		 * to "none".</div><div class='add'>+		 */</div><div class='add'>+		if (q-&gt;mq_ops) {</div><div class='add'>+			if (q-&gt;nr_hw_queues == 1)</div><div class='add'>+				e = elevator_get("mq-deadline", false);</div><div class='add'>+			if (!e)</div><div class='add'>+				return 0;</div><div class='add'>+		} else</div><div class='add'>+			e = elevator_get(CONFIG_DEFAULT_IOSCHED, false);</div><div class='add'>+</div><div class='ctx'> 		if (!e) {</div><div class='ctx'> 			printk(KERN_ERR</div><div class='ctx'> 				"Default I/O scheduler not found. " \</div><div class='hunk'>@@ -224,9 +242,17 @@ int elevator_init(struct request_queue *q, char *name)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = e-&gt;ops.elevator_init_fn(q, e);</div><div class='del'>-	if (err)</div><div class='add'>+	if (e-&gt;uses_mq) {</div><div class='add'>+		err = blk_mq_sched_setup(q);</div><div class='add'>+		if (!err)</div><div class='add'>+			err = e-&gt;ops.mq.init_sched(q, e);</div><div class='add'>+	} else</div><div class='add'>+		err = e-&gt;ops.sq.elevator_init_fn(q, e);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (e-&gt;uses_mq)</div><div class='add'>+			blk_mq_sched_teardown(q);</div><div class='ctx'> 		elevator_put(e);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(elevator_init);</div><div class='hunk'>@@ -234,8 +260,10 @@ EXPORT_SYMBOL(elevator_init);</div><div class='ctx'> void elevator_exit(struct elevator_queue *e)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;e-&gt;sysfs_lock);</div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_exit_fn)</div><div class='del'>-		e-&gt;type-&gt;ops.elevator_exit_fn(e);</div><div class='add'>+	if (e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.mq.exit_sched)</div><div class='add'>+		e-&gt;type-&gt;ops.mq.exit_sched(e);</div><div class='add'>+	else if (!e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.sq.elevator_exit_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.sq.elevator_exit_fn(e);</div><div class='ctx'> 	mutex_unlock(&amp;e-&gt;sysfs_lock);</div><div class='ctx'> </div><div class='ctx'> 	kobject_put(&amp;e-&gt;kobj);</div><div class='hunk'>@@ -245,31 +273,33 @@ EXPORT_SYMBOL(elevator_exit);</div><div class='ctx'> static inline void __elv_rqhash_del(struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	hash_del(&amp;rq-&gt;hash);</div><div class='del'>-	rq-&gt;cmd_flags &amp;= ~REQ_HASHED;</div><div class='add'>+	rq-&gt;rq_flags &amp;= ~RQF_HASHED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void elv_rqhash_del(struct request_queue *q, struct request *rq)</div><div class='add'>+void elv_rqhash_del(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	if (ELV_ON_HASH(rq))</div><div class='ctx'> 		__elv_rqhash_del(rq);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(elv_rqhash_del);</div><div class='ctx'> </div><div class='del'>-static void elv_rqhash_add(struct request_queue *q, struct request *rq)</div><div class='add'>+void elv_rqhash_add(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(ELV_ON_HASH(rq));</div><div class='ctx'> 	hash_add(e-&gt;hash, &amp;rq-&gt;hash, rq_hash_key(rq));</div><div class='del'>-	rq-&gt;cmd_flags |= REQ_HASHED;</div><div class='add'>+	rq-&gt;rq_flags |= RQF_HASHED;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(elv_rqhash_add);</div><div class='ctx'> </div><div class='del'>-static void elv_rqhash_reposition(struct request_queue *q, struct request *rq)</div><div class='add'>+void elv_rqhash_reposition(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	__elv_rqhash_del(rq);</div><div class='ctx'> 	elv_rqhash_add(q, rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct request *elv_rqhash_find(struct request_queue *q, sector_t offset)</div><div class='add'>+struct request *elv_rqhash_find(struct request_queue *q, sector_t offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> 	struct hlist_node *next;</div><div class='hunk'>@@ -352,7 +382,6 @@ void elv_dispatch_sort(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	sector_t boundary;</div><div class='ctx'> 	struct list_head *entry;</div><div class='del'>-	int stop_flags;</div><div class='ctx'> </div><div class='ctx'> 	if (q-&gt;last_merge == rq)</div><div class='ctx'> 		q-&gt;last_merge = NULL;</div><div class='hunk'>@@ -362,7 +391,6 @@ void elv_dispatch_sort(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	q-&gt;nr_sorted--;</div><div class='ctx'> </div><div class='ctx'> 	boundary = q-&gt;end_sector;</div><div class='del'>-	stop_flags = REQ_SOFTBARRIER | REQ_STARTED;</div><div class='ctx'> 	list_for_each_prev(entry, &amp;q-&gt;queue_head) {</div><div class='ctx'> 		struct request *pos = list_entry_rq(entry);</div><div class='ctx'> </div><div class='hunk'>@@ -370,7 +398,7 @@ void elv_dispatch_sort(struct request_queue *q, struct request *rq)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (rq_data_dir(rq) != rq_data_dir(pos))</div><div class='ctx'> 			break;</div><div class='del'>-		if (pos-&gt;cmd_flags &amp; stop_flags)</div><div class='add'>+		if (pos-&gt;rq_flags &amp; (RQF_STARTED | RQF_SOFTBARRIER))</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (blk_rq_pos(rq) &gt;= boundary) {</div><div class='ctx'> 			if (blk_rq_pos(pos) &lt; boundary)</div><div class='hunk'>@@ -407,11 +435,11 @@ void elv_dispatch_add_tail(struct request_queue *q, struct request *rq)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(elv_dispatch_add_tail);</div><div class='ctx'> </div><div class='del'>-int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)</div><div class='add'>+enum elv_merge elv_merge(struct request_queue *q, struct request **req,</div><div class='add'>+		struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> 	struct request *__rq;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Levels of merges:</div><div class='hunk'>@@ -426,7 +454,8 @@ int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)</div><div class='ctx'> 	 * First try one-hit cache.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (q-&gt;last_merge &amp;&amp; elv_bio_merge_ok(q-&gt;last_merge, bio)) {</div><div class='del'>-		ret = blk_try_merge(q-&gt;last_merge, bio);</div><div class='add'>+		enum elv_merge ret = blk_try_merge(q-&gt;last_merge, bio);</div><div class='add'>+</div><div class='ctx'> 		if (ret != ELEVATOR_NO_MERGE) {</div><div class='ctx'> 			*req = q-&gt;last_merge;</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -445,8 +474,10 @@ int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)</div><div class='ctx'> 		return ELEVATOR_BACK_MERGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_merge_fn)</div><div class='del'>-		return e-&gt;type-&gt;ops.elevator_merge_fn(q, req, bio);</div><div class='add'>+	if (e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.mq.request_merge)</div><div class='add'>+		return e-&gt;type-&gt;ops.mq.request_merge(q, req, bio);</div><div class='add'>+	else if (!e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.sq.elevator_merge_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.sq.elevator_merge_fn(q, req, bio);</div><div class='ctx'> </div><div class='ctx'> 	return ELEVATOR_NO_MERGE;</div><div class='ctx'> }</div><div class='hunk'>@@ -458,8 +489,7 @@ int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns true if we merged, false otherwise</div><div class='ctx'>  */</div><div class='del'>-static bool elv_attempt_insert_merge(struct request_queue *q,</div><div class='del'>-				     struct request *rq)</div><div class='add'>+bool elv_attempt_insert_merge(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *__rq;</div><div class='ctx'> 	bool ret;</div><div class='hunk'>@@ -493,12 +523,15 @@ static bool elv_attempt_insert_merge(struct request_queue *q,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void elv_merged_request(struct request_queue *q, struct request *rq, int type)</div><div class='add'>+void elv_merged_request(struct request_queue *q, struct request *rq,</div><div class='add'>+		enum elv_merge type)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_merged_fn)</div><div class='del'>-		e-&gt;type-&gt;ops.elevator_merged_fn(q, rq, type);</div><div class='add'>+	if (e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.mq.request_merged)</div><div class='add'>+		e-&gt;type-&gt;ops.mq.request_merged(q, rq, type);</div><div class='add'>+	else if (!e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.sq.elevator_merged_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.sq.elevator_merged_fn(q, rq, type);</div><div class='ctx'> </div><div class='ctx'> 	if (type == ELEVATOR_BACK_MERGE)</div><div class='ctx'> 		elv_rqhash_reposition(q, rq);</div><div class='hunk'>@@ -510,10 +543,15 @@ void elv_merge_requests(struct request_queue *q, struct request *rq,</div><div class='ctx'> 			     struct request *next)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='del'>-	const int next_sorted = next-&gt;cmd_flags &amp; REQ_SORTED;</div><div class='del'>-</div><div class='del'>-	if (next_sorted &amp;&amp; e-&gt;type-&gt;ops.elevator_merge_req_fn)</div><div class='del'>-		e-&gt;type-&gt;ops.elevator_merge_req_fn(q, rq, next);</div><div class='add'>+	bool next_sorted = false;</div><div class='add'>+</div><div class='add'>+	if (e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.mq.requests_merged)</div><div class='add'>+		e-&gt;type-&gt;ops.mq.requests_merged(q, rq, next);</div><div class='add'>+	else if (e-&gt;type-&gt;ops.sq.elevator_merge_req_fn) {</div><div class='add'>+		next_sorted = (__force bool)(next-&gt;rq_flags &amp; RQF_SORTED);</div><div class='add'>+		if (next_sorted)</div><div class='add'>+			e-&gt;type-&gt;ops.sq.elevator_merge_req_fn(q, rq, next);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	elv_rqhash_reposition(q, rq);</div><div class='ctx'> </div><div class='hunk'>@@ -530,20 +568,23 @@ void elv_bio_merged(struct request_queue *q, struct request *rq,</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_bio_merged_fn)</div><div class='del'>-		e-&gt;type-&gt;ops.elevator_bio_merged_fn(q, rq, bio);</div><div class='add'>+	if (WARN_ON_ONCE(e-&gt;uses_mq))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (e-&gt;type-&gt;ops.sq.elevator_bio_merged_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.sq.elevator_bio_merged_fn(q, rq, bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static void blk_pm_requeue_request(struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	if (rq-&gt;q-&gt;dev &amp;&amp; !(rq-&gt;cmd_flags &amp; REQ_PM))</div><div class='add'>+	if (rq-&gt;q-&gt;dev &amp;&amp; !(rq-&gt;rq_flags &amp; RQF_PM))</div><div class='ctx'> 		rq-&gt;q-&gt;nr_pending--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void blk_pm_add_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	if (q-&gt;dev &amp;&amp; !(rq-&gt;cmd_flags &amp; REQ_PM) &amp;&amp; q-&gt;nr_pending++ == 0 &amp;&amp;</div><div class='add'>+	if (q-&gt;dev &amp;&amp; !(rq-&gt;rq_flags &amp; RQF_PM) &amp;&amp; q-&gt;nr_pending++ == 0 &amp;&amp;</div><div class='ctx'> 	    (q-&gt;rpm_status == RPM_SUSPENDED || q-&gt;rpm_status == RPM_SUSPENDING))</div><div class='ctx'> 		pm_request_resume(q-&gt;dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -563,11 +604,11 @@ void elv_requeue_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (blk_account_rq(rq)) {</div><div class='ctx'> 		q-&gt;in_flight[rq_is_sync(rq)]--;</div><div class='del'>-		if (rq-&gt;cmd_flags &amp; REQ_SORTED)</div><div class='add'>+		if (rq-&gt;rq_flags &amp; RQF_SORTED)</div><div class='ctx'> 			elv_deactivate_rq(q, rq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rq-&gt;cmd_flags &amp;= ~REQ_STARTED;</div><div class='add'>+	rq-&gt;rq_flags &amp;= ~RQF_STARTED;</div><div class='ctx'> </div><div class='ctx'> 	blk_pm_requeue_request(rq);</div><div class='ctx'> </div><div class='hunk'>@@ -576,11 +617,15 @@ void elv_requeue_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> </div><div class='ctx'> void elv_drain_elevator(struct request_queue *q)</div><div class='ctx'> {</div><div class='add'>+	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> 	static int printed;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(e-&gt;uses_mq))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	lockdep_assert_held(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='del'>-	while (q-&gt;elevator-&gt;type-&gt;ops.elevator_dispatch_fn(q, 1))</div><div class='add'>+	while (e-&gt;type-&gt;ops.sq.elevator_dispatch_fn(q, 1))</div><div class='ctx'> 		;</div><div class='ctx'> 	if (q-&gt;nr_sorted &amp;&amp; printed++ &lt; 10) {</div><div class='ctx'> 		printk(KERN_ERR "%s: forced dispatching is broken "</div><div class='hunk'>@@ -597,13 +642,13 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;q = q;</div><div class='ctx'> </div><div class='del'>-	if (rq-&gt;cmd_flags &amp; REQ_SOFTBARRIER) {</div><div class='add'>+	if (rq-&gt;rq_flags &amp; RQF_SOFTBARRIER) {</div><div class='ctx'> 		/* barriers are scheduling boundary, update end_sector */</div><div class='del'>-		if (rq-&gt;cmd_type == REQ_TYPE_FS) {</div><div class='add'>+		if (!blk_rq_is_passthrough(rq)) {</div><div class='ctx'> 			q-&gt;end_sector = rq_end_sector(rq);</div><div class='ctx'> 			q-&gt;boundary_rq = rq;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (!(rq-&gt;cmd_flags &amp; REQ_ELVPRIV) &amp;&amp;</div><div class='add'>+	} else if (!(rq-&gt;rq_flags &amp; RQF_ELVPRIV) &amp;&amp;</div><div class='ctx'> 		    (where == ELEVATOR_INSERT_SORT ||</div><div class='ctx'> 		     where == ELEVATOR_INSERT_SORT_MERGE))</div><div class='ctx'> 		where = ELEVATOR_INSERT_BACK;</div><div class='hunk'>@@ -611,12 +656,12 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)</div><div class='ctx'> 	switch (where) {</div><div class='ctx'> 	case ELEVATOR_INSERT_REQUEUE:</div><div class='ctx'> 	case ELEVATOR_INSERT_FRONT:</div><div class='del'>-		rq-&gt;cmd_flags |= REQ_SOFTBARRIER;</div><div class='add'>+		rq-&gt;rq_flags |= RQF_SOFTBARRIER;</div><div class='ctx'> 		list_add(&amp;rq-&gt;queuelist, &amp;q-&gt;queue_head);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ELEVATOR_INSERT_BACK:</div><div class='del'>-		rq-&gt;cmd_flags |= REQ_SOFTBARRIER;</div><div class='add'>+		rq-&gt;rq_flags |= RQF_SOFTBARRIER;</div><div class='ctx'> 		elv_drain_elevator(q);</div><div class='ctx'> 		list_add_tail(&amp;rq-&gt;queuelist, &amp;q-&gt;queue_head);</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -641,8 +686,8 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)</div><div class='ctx'> 		if (elv_attempt_insert_merge(q, rq))</div><div class='ctx'> 			break;</div><div class='ctx'> 	case ELEVATOR_INSERT_SORT:</div><div class='del'>-		BUG_ON(rq-&gt;cmd_type != REQ_TYPE_FS);</div><div class='del'>-		rq-&gt;cmd_flags |= REQ_SORTED;</div><div class='add'>+		BUG_ON(blk_rq_is_passthrough(rq));</div><div class='add'>+		rq-&gt;rq_flags |= RQF_SORTED;</div><div class='ctx'> 		q-&gt;nr_sorted++;</div><div class='ctx'> 		if (rq_mergeable(rq)) {</div><div class='ctx'> 			elv_rqhash_add(q, rq);</div><div class='hunk'>@@ -655,11 +700,11 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)</div><div class='ctx'> 		 * rq cannot be accessed after calling</div><div class='ctx'> 		 * elevator_add_req_fn.</div><div class='ctx'> 		 */</div><div class='del'>-		q-&gt;elevator-&gt;type-&gt;ops.elevator_add_req_fn(q, rq);</div><div class='add'>+		q-&gt;elevator-&gt;type-&gt;ops.sq.elevator_add_req_fn(q, rq);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ELEVATOR_INSERT_FLUSH:</div><div class='del'>-		rq-&gt;cmd_flags |= REQ_SOFTBARRIER;</div><div class='add'>+		rq-&gt;rq_flags |= RQF_SOFTBARRIER;</div><div class='ctx'> 		blk_insert_flush(rq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -684,8 +729,11 @@ struct request *elv_latter_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_latter_req_fn)</div><div class='del'>-		return e-&gt;type-&gt;ops.elevator_latter_req_fn(q, rq);</div><div class='add'>+	if (e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.mq.next_request)</div><div class='add'>+		return e-&gt;type-&gt;ops.mq.next_request(q, rq);</div><div class='add'>+	else if (!e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.sq.elevator_latter_req_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.sq.elevator_latter_req_fn(q, rq);</div><div class='add'>+</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -693,8 +741,10 @@ struct request *elv_former_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_former_req_fn)</div><div class='del'>-		return e-&gt;type-&gt;ops.elevator_former_req_fn(q, rq);</div><div class='add'>+	if (e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.mq.former_request)</div><div class='add'>+		return e-&gt;type-&gt;ops.mq.former_request(q, rq);</div><div class='add'>+	if (!e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.sq.elevator_former_req_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.sq.elevator_former_req_fn(q, rq);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -703,8 +753,11 @@ int elv_set_request(struct request_queue *q, struct request *rq,</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_set_req_fn)</div><div class='del'>-		return e-&gt;type-&gt;ops.elevator_set_req_fn(q, rq, bio, gfp_mask);</div><div class='add'>+	if (WARN_ON_ONCE(e-&gt;uses_mq))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (e-&gt;type-&gt;ops.sq.elevator_set_req_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.sq.elevator_set_req_fn(q, rq, bio, gfp_mask);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -712,16 +765,22 @@ void elv_put_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_put_req_fn)</div><div class='del'>-		e-&gt;type-&gt;ops.elevator_put_req_fn(rq);</div><div class='add'>+	if (WARN_ON_ONCE(e-&gt;uses_mq))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (e-&gt;type-&gt;ops.sq.elevator_put_req_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.sq.elevator_put_req_fn(rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int elv_may_queue(struct request_queue *q, int op, int op_flags)</div><div class='add'>+int elv_may_queue(struct request_queue *q, unsigned int op)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;type-&gt;ops.elevator_may_queue_fn)</div><div class='del'>-		return e-&gt;type-&gt;ops.elevator_may_queue_fn(q, op, op_flags);</div><div class='add'>+	if (WARN_ON_ONCE(e-&gt;uses_mq))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (e-&gt;type-&gt;ops.sq.elevator_may_queue_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.sq.elevator_may_queue_fn(q, op);</div><div class='ctx'> </div><div class='ctx'> 	return ELV_MQUEUE_MAY;</div><div class='ctx'> }</div><div class='hunk'>@@ -730,14 +789,17 @@ void elv_completed_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(e-&gt;uses_mq))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * request is released from the driver, io must be done</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (blk_account_rq(rq)) {</div><div class='ctx'> 		q-&gt;in_flight[rq_is_sync(rq)]--;</div><div class='del'>-		if ((rq-&gt;cmd_flags &amp; REQ_SORTED) &amp;&amp;</div><div class='del'>-		    e-&gt;type-&gt;ops.elevator_completed_req_fn)</div><div class='del'>-			e-&gt;type-&gt;ops.elevator_completed_req_fn(q, rq);</div><div class='add'>+		if ((rq-&gt;rq_flags &amp; RQF_SORTED) &amp;&amp;</div><div class='add'>+		    e-&gt;type-&gt;ops.sq.elevator_completed_req_fn)</div><div class='add'>+			e-&gt;type-&gt;ops.sq.elevator_completed_req_fn(q, rq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -805,8 +867,8 @@ int elv_register_queue(struct request_queue *q)</div><div class='ctx'> 		}</div><div class='ctx'> 		kobject_uevent(&amp;e-&gt;kobj, KOBJ_ADD);</div><div class='ctx'> 		e-&gt;registered = 1;</div><div class='del'>-		if (e-&gt;type-&gt;ops.elevator_registered_fn)</div><div class='del'>-			e-&gt;type-&gt;ops.elevator_registered_fn(q);</div><div class='add'>+		if (!e-&gt;uses_mq &amp;&amp; e-&gt;type-&gt;ops.sq.elevator_registered_fn)</div><div class='add'>+			e-&gt;type-&gt;ops.sq.elevator_registered_fn(q);</div><div class='ctx'> 	}</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -893,9 +955,14 @@ EXPORT_SYMBOL_GPL(elv_unregister);</div><div class='ctx'> static int elevator_switch(struct request_queue *q, struct elevator_type *new_e)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *old = q-&gt;elevator;</div><div class='del'>-	bool registered = old-&gt;registered;</div><div class='add'>+	bool old_registered = false;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (q-&gt;mq_ops) {</div><div class='add'>+		blk_mq_freeze_queue(q);</div><div class='add'>+		blk_mq_quiesce_queue(q);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Turn on BYPASS and drain all requests w/ elevator private data.</div><div class='ctx'> 	 * Block layer doesn't call into a quiesced elevator - all requests</div><div class='hunk'>@@ -903,42 +970,74 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e)</div><div class='ctx'> 	 * using INSERT_BACK.  All requests have SOFTBARRIER set and no</div><div class='ctx'> 	 * merge happens either.</div><div class='ctx'> 	 */</div><div class='del'>-	blk_queue_bypass_start(q);</div><div class='add'>+	if (old) {</div><div class='add'>+		old_registered = old-&gt;registered;</div><div class='add'>+</div><div class='add'>+		if (old-&gt;uses_mq)</div><div class='add'>+			blk_mq_sched_teardown(q);</div><div class='ctx'> </div><div class='del'>-	/* unregister and clear all auxiliary data of the old elevator */</div><div class='del'>-	if (registered)</div><div class='del'>-		elv_unregister_queue(q);</div><div class='add'>+		if (!q-&gt;mq_ops)</div><div class='add'>+			blk_queue_bypass_start(q);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(q-&gt;queue_lock);</div><div class='del'>-	ioc_clear_queue(q);</div><div class='del'>-	spin_unlock_irq(q-&gt;queue_lock);</div><div class='add'>+		/* unregister and clear all auxiliary data of the old elevator */</div><div class='add'>+		if (old_registered)</div><div class='add'>+			elv_unregister_queue(q);</div><div class='add'>+</div><div class='add'>+		ioc_clear_queue(q);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* allocate, init and register new elevator */</div><div class='del'>-	err = new_e-&gt;ops.elevator_init_fn(q, new_e);</div><div class='del'>-	if (err)</div><div class='del'>-		goto fail_init;</div><div class='add'>+	if (new_e) {</div><div class='add'>+		if (new_e-&gt;uses_mq) {</div><div class='add'>+			err = blk_mq_sched_setup(q);</div><div class='add'>+			if (!err)</div><div class='add'>+				err = new_e-&gt;ops.mq.init_sched(q, new_e);</div><div class='add'>+		} else</div><div class='add'>+			err = new_e-&gt;ops.sq.elevator_init_fn(q, new_e);</div><div class='add'>+		if (err)</div><div class='add'>+			goto fail_init;</div><div class='ctx'> </div><div class='del'>-	if (registered) {</div><div class='ctx'> 		err = elv_register_queue(q);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto fail_register;</div><div class='del'>-	}</div><div class='add'>+	} else</div><div class='add'>+		q-&gt;elevator = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* done, kill the old one and finish */</div><div class='del'>-	elevator_exit(old);</div><div class='del'>-	blk_queue_bypass_end(q);</div><div class='add'>+	if (old) {</div><div class='add'>+		elevator_exit(old);</div><div class='add'>+		if (!q-&gt;mq_ops)</div><div class='add'>+			blk_queue_bypass_end(q);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	blk_add_trace_msg(q, "elv switch: %s", new_e-&gt;elevator_name);</div><div class='add'>+	if (q-&gt;mq_ops) {</div><div class='add'>+		blk_mq_unfreeze_queue(q);</div><div class='add'>+		blk_mq_start_stopped_hw_queues(q, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (new_e)</div><div class='add'>+		blk_add_trace_msg(q, "elv switch: %s", new_e-&gt;elevator_name);</div><div class='add'>+	else</div><div class='add'>+		blk_add_trace_msg(q, "elv switch: none");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_register:</div><div class='add'>+	if (q-&gt;mq_ops)</div><div class='add'>+		blk_mq_sched_teardown(q);</div><div class='ctx'> 	elevator_exit(q-&gt;elevator);</div><div class='ctx'> fail_init:</div><div class='ctx'> 	/* switch failed, restore and re-register old elevator */</div><div class='del'>-	q-&gt;elevator = old;</div><div class='del'>-	elv_register_queue(q);</div><div class='del'>-	blk_queue_bypass_end(q);</div><div class='add'>+	if (old) {</div><div class='add'>+		q-&gt;elevator = old;</div><div class='add'>+		elv_register_queue(q);</div><div class='add'>+		if (!q-&gt;mq_ops)</div><div class='add'>+			blk_queue_bypass_end(q);</div><div class='add'>+	}</div><div class='add'>+	if (q-&gt;mq_ops) {</div><div class='add'>+		blk_mq_unfreeze_queue(q);</div><div class='add'>+		blk_mq_start_stopped_hw_queues(q, true);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -951,8 +1050,11 @@ static int __elevator_change(struct request_queue *q, const char *name)</div><div class='ctx'> 	char elevator_name[ELV_NAME_MAX];</div><div class='ctx'> 	struct elevator_type *e;</div><div class='ctx'> </div><div class='del'>-	if (!q-&gt;elevator)</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	/*</div><div class='add'>+	 * Special case for mq, turn off scheduling</div><div class='add'>+	 */</div><div class='add'>+	if (q-&gt;mq_ops &amp;&amp; !strncmp(name, "none", 4))</div><div class='add'>+		return elevator_switch(q, NULL);</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(elevator_name, name, sizeof(elevator_name));</div><div class='ctx'> 	e = elevator_get(strstrip(elevator_name), true);</div><div class='hunk'>@@ -961,11 +1063,21 @@ static int __elevator_change(struct request_queue *q, const char *name)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!strcmp(elevator_name, q-&gt;elevator-&gt;type-&gt;elevator_name)) {</div><div class='add'>+	if (q-&gt;elevator &amp;&amp;</div><div class='add'>+	    !strcmp(elevator_name, q-&gt;elevator-&gt;type-&gt;elevator_name)) {</div><div class='ctx'> 		elevator_put(e);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!e-&gt;uses_mq &amp;&amp; q-&gt;mq_ops) {</div><div class='add'>+		elevator_put(e);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (e-&gt;uses_mq &amp;&amp; !q-&gt;mq_ops) {</div><div class='add'>+		elevator_put(e);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return elevator_switch(q, e);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -987,7 +1099,7 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!q-&gt;elevator)</div><div class='add'>+	if (!(q-&gt;mq_ops || q-&gt;request_fn))</div><div class='ctx'> 		return count;</div><div class='ctx'> </div><div class='ctx'> 	ret = __elevator_change(q, name);</div><div class='hunk'>@@ -1001,24 +1113,34 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name,</div><div class='ctx'> ssize_t elv_iosched_show(struct request_queue *q, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='del'>-	struct elevator_type *elv;</div><div class='add'>+	struct elevator_type *elv = NULL;</div><div class='ctx'> 	struct elevator_type *__e;</div><div class='ctx'> 	int len = 0;</div><div class='ctx'> </div><div class='del'>-	if (!q-&gt;elevator || !blk_queue_stackable(q))</div><div class='add'>+	if (!blk_queue_stackable(q))</div><div class='ctx'> 		return sprintf(name, "none\n");</div><div class='ctx'> </div><div class='del'>-	elv = e-&gt;type;</div><div class='add'>+	if (!q-&gt;elevator)</div><div class='add'>+		len += sprintf(name+len, "[none] ");</div><div class='add'>+	else</div><div class='add'>+		elv = e-&gt;type;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;elv_list_lock);</div><div class='ctx'> 	list_for_each_entry(__e, &amp;elv_list, list) {</div><div class='del'>-		if (!strcmp(elv-&gt;elevator_name, __e-&gt;elevator_name))</div><div class='add'>+		if (elv &amp;&amp; !strcmp(elv-&gt;elevator_name, __e-&gt;elevator_name)) {</div><div class='ctx'> 			len += sprintf(name+len, "[%s] ", elv-&gt;elevator_name);</div><div class='del'>-		else</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (__e-&gt;uses_mq &amp;&amp; q-&gt;mq_ops)</div><div class='add'>+			len += sprintf(name+len, "%s ", __e-&gt;elevator_name);</div><div class='add'>+		else if (!__e-&gt;uses_mq &amp;&amp; !q-&gt;mq_ops)</div><div class='ctx'> 			len += sprintf(name+len, "%s ", __e-&gt;elevator_name);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;elv_list_lock);</div><div class='ctx'> </div><div class='add'>+	if (q-&gt;mq_ops &amp;&amp; q-&gt;elevator)</div><div class='add'>+		len += sprintf(name+len, "none");</div><div class='add'>+</div><div class='ctx'> 	len += sprintf(len+name, "\n");</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='head'>diff --git a/block/genhd.c b/block/genhd.c<br/>index fcd6d4fae657..b26a5ea115d0 100644<br/>--- a/<a href='/drm-misc/tree/block/genhd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/genhd.c</a><br/>+++ b/<a href='/drm-misc/tree/block/genhd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/genhd.c</a></div><div class='hunk'>@@ -572,6 +572,20 @@ exit:</div><div class='ctx'> 	disk_part_iter_exit(&amp;piter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void put_disk_devt(struct disk_devt *disk_devt)</div><div class='add'>+{</div><div class='add'>+	if (disk_devt &amp;&amp; atomic_dec_and_test(&amp;disk_devt-&gt;count))</div><div class='add'>+		disk_devt-&gt;release(disk_devt);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(put_disk_devt);</div><div class='add'>+</div><div class='add'>+void get_disk_devt(struct disk_devt *disk_devt)</div><div class='add'>+{</div><div class='add'>+	if (disk_devt)</div><div class='add'>+		atomic_inc(&amp;disk_devt-&gt;count);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(get_disk_devt);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * device_add_disk - add partitioning information to kernel list</div><div class='ctx'>  * @parent: parent device for the disk</div><div class='hunk'>@@ -612,8 +626,15 @@ void device_add_disk(struct device *parent, struct gendisk *disk)</div><div class='ctx'> </div><div class='ctx'> 	disk_alloc_events(disk);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Take a reference on the devt and assign it to queue since it</div><div class='add'>+	 * must not be reallocated while the bdi is registered</div><div class='add'>+	 */</div><div class='add'>+	disk-&gt;queue-&gt;disk_devt = disk-&gt;disk_devt;</div><div class='add'>+	get_disk_devt(disk-&gt;disk_devt);</div><div class='add'>+</div><div class='ctx'> 	/* Register BDI before referencing it from bdev */</div><div class='del'>-	bdi = &amp;disk-&gt;queue-&gt;backing_dev_info;</div><div class='add'>+	bdi = disk-&gt;queue-&gt;backing_dev_info;</div><div class='ctx'> 	bdi_register_owner(bdi, disk_to_dev(disk));</div><div class='ctx'> </div><div class='ctx'> 	blk_register_region(disk_devt(disk), disk-&gt;minors, NULL,</div><div class='hunk'>@@ -649,15 +670,22 @@ void del_gendisk(struct gendisk *disk)</div><div class='ctx'> 			     DISK_PITER_INCL_EMPTY | DISK_PITER_REVERSE);</div><div class='ctx'> 	while ((part = disk_part_iter_next(&amp;piter))) {</div><div class='ctx'> 		invalidate_partition(disk, part-&gt;partno);</div><div class='add'>+		bdev_unhash_inode(part_devt(part));</div><div class='ctx'> 		delete_partition(disk, part-&gt;partno);</div><div class='ctx'> 	}</div><div class='ctx'> 	disk_part_iter_exit(&amp;piter);</div><div class='ctx'> </div><div class='ctx'> 	invalidate_partition(disk, 0);</div><div class='add'>+	bdev_unhash_inode(disk_devt(disk));</div><div class='ctx'> 	set_capacity(disk, 0);</div><div class='ctx'> 	disk-&gt;flags &amp;= ~GENHD_FL_UP;</div><div class='ctx'> </div><div class='ctx'> 	sysfs_remove_link(&amp;disk_to_dev(disk)-&gt;kobj, "bdi");</div><div class='add'>+	/*</div><div class='add'>+	 * Unregister bdi before releasing device numbers (as they can get</div><div class='add'>+	 * reused and we'd get clashes in sysfs).</div><div class='add'>+	 */</div><div class='add'>+	bdi_unregister(disk-&gt;queue-&gt;backing_dev_info);</div><div class='ctx'> 	blk_unregister_queue(disk);</div><div class='ctx'> 	blk_unregister_region(disk_devt(disk), disk-&gt;minors);</div><div class='ctx'> </div><div class='head'>diff --git a/block/ioctl.c b/block/ioctl.c<br/>index 755119c3c1b9..7b88820b93d9 100644<br/>--- a/<a href='/drm-misc/tree/block/ioctl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/ioctl.c</a><br/>+++ b/<a href='/drm-misc/tree/block/ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/ioctl.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/blktrace_api.h&gt;</div><div class='ctx'> #include &lt;linux/pr.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -45,6 +45,9 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user</div><div class='ctx'> 				    || pstart &lt; 0 || plength &lt; 0 || partno &gt; 65535)</div><div class='ctx'> 					return -EINVAL;</div><div class='ctx'> 			}</div><div class='add'>+			/* check if partition is aligned to blocksize */</div><div class='add'>+			if (p.start &amp; (bdev_logical_block_size(bdev) - 1))</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 			mutex_lock(&amp;bdev-&gt;bd_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -502,7 +505,6 @@ static int blkdev_bszset(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,</div><div class='ctx'> 			unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct backing_dev_info *bdi;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	loff_t size;</div><div class='ctx'> 	unsigned int max_sectors;</div><div class='hunk'>@@ -519,14 +521,17 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,</div><div class='ctx'> 				BLKDEV_DISCARD_SECURE);</div><div class='ctx'> 	case BLKZEROOUT:</div><div class='ctx'> 		return blk_ioctl_zeroout(bdev, mode, arg);</div><div class='add'>+	case BLKREPORTZONE:</div><div class='add'>+		return blkdev_report_zones_ioctl(bdev, mode, cmd, arg);</div><div class='add'>+	case BLKRESETZONE:</div><div class='add'>+		return blkdev_reset_zones_ioctl(bdev, mode, cmd, arg);</div><div class='ctx'> 	case HDIO_GETGEO:</div><div class='ctx'> 		return blkdev_getgeo(bdev, argp);</div><div class='ctx'> 	case BLKRAGET:</div><div class='ctx'> 	case BLKFRAGET:</div><div class='ctx'> 		if (!arg)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		bdi = blk_get_backing_dev_info(bdev);</div><div class='del'>-		return put_long(arg, (bdi-&gt;ra_pages * PAGE_SIZE) / 512);</div><div class='add'>+		return put_long(arg, (bdev-&gt;bd_bdi-&gt;ra_pages*PAGE_SIZE) / 512);</div><div class='ctx'> 	case BLKROGET:</div><div class='ctx'> 		return put_int(arg, bdev_read_only(bdev) != 0);</div><div class='ctx'> 	case BLKBSZGET: /* get block device soft block size (cf. BLKSSZGET) */</div><div class='hunk'>@@ -553,8 +558,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,</div><div class='ctx'> 	case BLKFRASET:</div><div class='ctx'> 		if(!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 			return -EACCES;</div><div class='del'>-		bdi = blk_get_backing_dev_info(bdev);</div><div class='del'>-		bdi-&gt;ra_pages = (arg * 512) / PAGE_SIZE;</div><div class='add'>+		bdev-&gt;bd_bdi-&gt;ra_pages = (arg * 512) / PAGE_SIZE;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case BLKBSZSET:</div><div class='ctx'> 		return blkdev_bszset(bdev, mode, argp);</div><div class='head'>diff --git a/block/ioprio.c b/block/ioprio.c<br/>index 01b8116298a1..0c47a00f92a8 100644<br/>--- a/<a href='/drm-misc/tree/block/ioprio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/ioprio.c</a><br/>+++ b/<a href='/drm-misc/tree/block/ioprio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/ioprio.c</a></div><div class='hunk'>@@ -23,8 +23,11 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/ioprio.h&gt;</div><div class='add'>+#include &lt;linux/cred.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='add'>+#include &lt;linux/sched/user.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/pid_namespace.h&gt;</div><div class='hunk'>@@ -122,14 +125,14 @@ SYSCALL_DEFINE3(ioprio_set, int, which, int, who, int, ioprio)</div><div class='ctx'> 			if (!user)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			do_each_thread(g, p) {</div><div class='add'>+			for_each_process_thread(g, p) {</div><div class='ctx'> 				if (!uid_eq(task_uid(p), uid) ||</div><div class='ctx'> 				    !task_pid_vnr(p))</div><div class='ctx'> 					continue;</div><div class='ctx'> 				ret = set_task_ioprio(p, ioprio);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					goto free_uid;</div><div class='del'>-			} while_each_thread(g, p);</div><div class='add'>+			}</div><div class='ctx'> free_uid:</div><div class='ctx'> 			if (who)</div><div class='ctx'> 				free_uid(user);</div><div class='hunk'>@@ -222,7 +225,7 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who)</div><div class='ctx'> 			if (!user)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			do_each_thread(g, p) {</div><div class='add'>+			for_each_process_thread(g, p) {</div><div class='ctx'> 				if (!uid_eq(task_uid(p), user-&gt;uid) ||</div><div class='ctx'> 				    !task_pid_vnr(p))</div><div class='ctx'> 					continue;</div><div class='hunk'>@@ -233,7 +236,7 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who)</div><div class='ctx'> 					ret = tmpio;</div><div class='ctx'> 				else</div><div class='ctx'> 					ret = ioprio_best(ret, tmpio);</div><div class='del'>-			} while_each_thread(g, p);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			if (who)</div><div class='ctx'> 				free_uid(user);</div><div class='head'>diff --git a/block/mq-deadline.c b/block/mq-deadline.c<br/>new file mode 100644<br/>index 000000000000..236121633ca0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/mq-deadline.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/mq-deadline.c</a></div><div class='hunk'>@@ -0,0 +1,556 @@</div><div class='add'>+/*</div><div class='add'>+ *  MQ Deadline i/o scheduler - adaptation of the legacy deadline scheduler,</div><div class='add'>+ *  for the blk-mq scheduling framework</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2016 Jens Axboe &lt;axboe@kernel.dk&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/blk-mq.h&gt;</div><div class='add'>+#include &lt;linux/elevator.h&gt;</div><div class='add'>+#include &lt;linux/bio.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/sbitmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "blk.h"</div><div class='add'>+#include "blk-mq.h"</div><div class='add'>+#include "blk-mq-tag.h"</div><div class='add'>+#include "blk-mq-sched.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * See Documentation/block/deadline-iosched.txt</div><div class='add'>+ */</div><div class='add'>+static const int read_expire = HZ / 2;  /* max time before a read is submitted. */</div><div class='add'>+static const int write_expire = 5 * HZ; /* ditto for writes, these limits are SOFT! */</div><div class='add'>+static const int writes_starved = 2;    /* max times reads can starve a write */</div><div class='add'>+static const int fifo_batch = 16;       /* # of sequential requests treated as one</div><div class='add'>+				     by the above parameters. For throughput. */</div><div class='add'>+</div><div class='add'>+struct deadline_data {</div><div class='add'>+	/*</div><div class='add'>+	 * run time data</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * requests (deadline_rq s) are present on both sort_list and fifo_list</div><div class='add'>+	 */</div><div class='add'>+	struct rb_root sort_list[2];</div><div class='add'>+	struct list_head fifo_list[2];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * next in sort order. read, write or both are NULL</div><div class='add'>+	 */</div><div class='add'>+	struct request *next_rq[2];</div><div class='add'>+	unsigned int batching;		/* number of sequential requests made */</div><div class='add'>+	unsigned int starved;		/* times reads have starved writes */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * settings that change how the i/o scheduler behaves</div><div class='add'>+	 */</div><div class='add'>+	int fifo_expire[2];</div><div class='add'>+	int fifo_batch;</div><div class='add'>+	int writes_starved;</div><div class='add'>+	int front_merges;</div><div class='add'>+</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct list_head dispatch;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct rb_root *</div><div class='add'>+deadline_rb_root(struct deadline_data *dd, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	return &amp;dd-&gt;sort_list[rq_data_dir(rq)];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * get the request after `rq' in sector-sorted order</div><div class='add'>+ */</div><div class='add'>+static inline struct request *</div><div class='add'>+deadline_latter_request(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *node = rb_next(&amp;rq-&gt;rb_node);</div><div class='add'>+</div><div class='add'>+	if (node)</div><div class='add'>+		return rb_entry_rq(node);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+deadline_add_rq_rb(struct deadline_data *dd, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct rb_root *root = deadline_rb_root(dd, rq);</div><div class='add'>+</div><div class='add'>+	elv_rb_add(root, rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+deadline_del_rq_rb(struct deadline_data *dd, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	const int data_dir = rq_data_dir(rq);</div><div class='add'>+</div><div class='add'>+	if (dd-&gt;next_rq[data_dir] == rq)</div><div class='add'>+		dd-&gt;next_rq[data_dir] = deadline_latter_request(rq);</div><div class='add'>+</div><div class='add'>+	elv_rb_del(deadline_rb_root(dd, rq), rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * remove rq from rbtree and fifo.</div><div class='add'>+ */</div><div class='add'>+static void deadline_remove_request(struct request_queue *q, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct deadline_data *dd = q-&gt;elevator-&gt;elevator_data;</div><div class='add'>+</div><div class='add'>+	list_del_init(&amp;rq-&gt;queuelist);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We might not be on the rbtree, if we are doing an insert merge</div><div class='add'>+	 */</div><div class='add'>+	if (!RB_EMPTY_NODE(&amp;rq-&gt;rb_node))</div><div class='add'>+		deadline_del_rq_rb(dd, rq);</div><div class='add'>+</div><div class='add'>+	elv_rqhash_del(q, rq);</div><div class='add'>+	if (q-&gt;last_merge == rq)</div><div class='add'>+		q-&gt;last_merge = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dd_request_merged(struct request_queue *q, struct request *req,</div><div class='add'>+			      enum elv_merge type)</div><div class='add'>+{</div><div class='add'>+	struct deadline_data *dd = q-&gt;elevator-&gt;elevator_data;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if the merge was a front merge, we need to reposition request</div><div class='add'>+	 */</div><div class='add'>+	if (type == ELEVATOR_FRONT_MERGE) {</div><div class='add'>+		elv_rb_del(deadline_rb_root(dd, req), req);</div><div class='add'>+		deadline_add_rq_rb(dd, req);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dd_merged_requests(struct request_queue *q, struct request *req,</div><div class='add'>+			       struct request *next)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * if next expires before rq, assign its expire time to rq</div><div class='add'>+	 * and move into next position (next will be deleted) in fifo</div><div class='add'>+	 */</div><div class='add'>+	if (!list_empty(&amp;req-&gt;queuelist) &amp;&amp; !list_empty(&amp;next-&gt;queuelist)) {</div><div class='add'>+		if (time_before((unsigned long)next-&gt;fifo_time,</div><div class='add'>+				(unsigned long)req-&gt;fifo_time)) {</div><div class='add'>+			list_move(&amp;req-&gt;queuelist, &amp;next-&gt;queuelist);</div><div class='add'>+			req-&gt;fifo_time = next-&gt;fifo_time;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * kill knowledge of next, this one is a goner</div><div class='add'>+	 */</div><div class='add'>+	deadline_remove_request(q, next);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * move an entry to dispatch queue</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+deadline_move_request(struct deadline_data *dd, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	const int data_dir = rq_data_dir(rq);</div><div class='add'>+</div><div class='add'>+	dd-&gt;next_rq[READ] = NULL;</div><div class='add'>+	dd-&gt;next_rq[WRITE] = NULL;</div><div class='add'>+	dd-&gt;next_rq[data_dir] = deadline_latter_request(rq);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * take it off the sort and fifo list</div><div class='add'>+	 */</div><div class='add'>+	deadline_remove_request(rq-&gt;q, rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * deadline_check_fifo returns 0 if there are no expired requests on the fifo,</div><div class='add'>+ * 1 otherwise. Requires !list_empty(&amp;dd-&gt;fifo_list[data_dir])</div><div class='add'>+ */</div><div class='add'>+static inline int deadline_check_fifo(struct deadline_data *dd, int ddir)</div><div class='add'>+{</div><div class='add'>+	struct request *rq = rq_entry_fifo(dd-&gt;fifo_list[ddir].next);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * rq is expired!</div><div class='add'>+	 */</div><div class='add'>+	if (time_after_eq(jiffies, (unsigned long)rq-&gt;fifo_time))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * deadline_dispatch_requests selects the best request according to</div><div class='add'>+ * read/write expire, fifo_batch, etc</div><div class='add'>+ */</div><div class='add'>+static struct request *__dd_dispatch_request(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	struct deadline_data *dd = hctx-&gt;queue-&gt;elevator-&gt;elevator_data;</div><div class='add'>+	struct request *rq;</div><div class='add'>+	bool reads, writes;</div><div class='add'>+	int data_dir;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;dd-&gt;dispatch)) {</div><div class='add'>+		rq = list_first_entry(&amp;dd-&gt;dispatch, struct request, queuelist);</div><div class='add'>+		list_del_init(&amp;rq-&gt;queuelist);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reads = !list_empty(&amp;dd-&gt;fifo_list[READ]);</div><div class='add'>+	writes = !list_empty(&amp;dd-&gt;fifo_list[WRITE]);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * batches are currently reads XOR writes</div><div class='add'>+	 */</div><div class='add'>+	if (dd-&gt;next_rq[WRITE])</div><div class='add'>+		rq = dd-&gt;next_rq[WRITE];</div><div class='add'>+	else</div><div class='add'>+		rq = dd-&gt;next_rq[READ];</div><div class='add'>+</div><div class='add'>+	if (rq &amp;&amp; dd-&gt;batching &lt; dd-&gt;fifo_batch)</div><div class='add'>+		/* we have a next request are still entitled to batch */</div><div class='add'>+		goto dispatch_request;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * at this point we are not running a batch. select the appropriate</div><div class='add'>+	 * data direction (read / write)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (reads) {</div><div class='add'>+		BUG_ON(RB_EMPTY_ROOT(&amp;dd-&gt;sort_list[READ]));</div><div class='add'>+</div><div class='add'>+		if (writes &amp;&amp; (dd-&gt;starved++ &gt;= dd-&gt;writes_starved))</div><div class='add'>+			goto dispatch_writes;</div><div class='add'>+</div><div class='add'>+		data_dir = READ;</div><div class='add'>+</div><div class='add'>+		goto dispatch_find_request;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * there are either no reads or writes have been starved</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (writes) {</div><div class='add'>+dispatch_writes:</div><div class='add'>+		BUG_ON(RB_EMPTY_ROOT(&amp;dd-&gt;sort_list[WRITE]));</div><div class='add'>+</div><div class='add'>+		dd-&gt;starved = 0;</div><div class='add'>+</div><div class='add'>+		data_dir = WRITE;</div><div class='add'>+</div><div class='add'>+		goto dispatch_find_request;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+</div><div class='add'>+dispatch_find_request:</div><div class='add'>+	/*</div><div class='add'>+	 * we are not running a batch, find best request for selected data_dir</div><div class='add'>+	 */</div><div class='add'>+	if (deadline_check_fifo(dd, data_dir) || !dd-&gt;next_rq[data_dir]) {</div><div class='add'>+		/*</div><div class='add'>+		 * A deadline has expired, the last request was in the other</div><div class='add'>+		 * direction, or we have run out of higher-sectored requests.</div><div class='add'>+		 * Start again from the request with the earliest expiry time.</div><div class='add'>+		 */</div><div class='add'>+		rq = rq_entry_fifo(dd-&gt;fifo_list[data_dir].next);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * The last req was the same dir and we have a next request in</div><div class='add'>+		 * sort order. No expired requests so continue on from here.</div><div class='add'>+		 */</div><div class='add'>+		rq = dd-&gt;next_rq[data_dir];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dd-&gt;batching = 0;</div><div class='add'>+</div><div class='add'>+dispatch_request:</div><div class='add'>+	/*</div><div class='add'>+	 * rq is the selected appropriate request.</div><div class='add'>+	 */</div><div class='add'>+	dd-&gt;batching++;</div><div class='add'>+	deadline_move_request(dd, rq);</div><div class='add'>+done:</div><div class='add'>+	rq-&gt;rq_flags |= RQF_STARTED;</div><div class='add'>+	return rq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct request *dd_dispatch_request(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	struct deadline_data *dd = hctx-&gt;queue-&gt;elevator-&gt;elevator_data;</div><div class='add'>+	struct request *rq;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dd-&gt;lock);</div><div class='add'>+	rq = __dd_dispatch_request(hctx);</div><div class='add'>+	spin_unlock(&amp;dd-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return rq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dd_exit_queue(struct elevator_queue *e)</div><div class='add'>+{</div><div class='add'>+	struct deadline_data *dd = e-&gt;elevator_data;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!list_empty(&amp;dd-&gt;fifo_list[READ]));</div><div class='add'>+	BUG_ON(!list_empty(&amp;dd-&gt;fifo_list[WRITE]));</div><div class='add'>+</div><div class='add'>+	kfree(dd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * initialize elevator private data (deadline_data).</div><div class='add'>+ */</div><div class='add'>+static int dd_init_queue(struct request_queue *q, struct elevator_type *e)</div><div class='add'>+{</div><div class='add'>+	struct deadline_data *dd;</div><div class='add'>+	struct elevator_queue *eq;</div><div class='add'>+</div><div class='add'>+	eq = elevator_alloc(q, e);</div><div class='add'>+	if (!eq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dd = kzalloc_node(sizeof(*dd), GFP_KERNEL, q-&gt;node);</div><div class='add'>+	if (!dd) {</div><div class='add'>+		kobject_put(&amp;eq-&gt;kobj);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	eq-&gt;elevator_data = dd;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dd-&gt;fifo_list[READ]);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dd-&gt;fifo_list[WRITE]);</div><div class='add'>+	dd-&gt;sort_list[READ] = RB_ROOT;</div><div class='add'>+	dd-&gt;sort_list[WRITE] = RB_ROOT;</div><div class='add'>+	dd-&gt;fifo_expire[READ] = read_expire;</div><div class='add'>+	dd-&gt;fifo_expire[WRITE] = write_expire;</div><div class='add'>+	dd-&gt;writes_starved = writes_starved;</div><div class='add'>+	dd-&gt;front_merges = 1;</div><div class='add'>+	dd-&gt;fifo_batch = fifo_batch;</div><div class='add'>+	spin_lock_init(&amp;dd-&gt;lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dd-&gt;dispatch);</div><div class='add'>+</div><div class='add'>+	q-&gt;elevator = eq;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dd_request_merge(struct request_queue *q, struct request **rq,</div><div class='add'>+			    struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct deadline_data *dd = q-&gt;elevator-&gt;elevator_data;</div><div class='add'>+	sector_t sector = bio_end_sector(bio);</div><div class='add'>+	struct request *__rq;</div><div class='add'>+</div><div class='add'>+	if (!dd-&gt;front_merges)</div><div class='add'>+		return ELEVATOR_NO_MERGE;</div><div class='add'>+</div><div class='add'>+	__rq = elv_rb_find(&amp;dd-&gt;sort_list[bio_data_dir(bio)], sector);</div><div class='add'>+	if (__rq) {</div><div class='add'>+		BUG_ON(sector != blk_rq_pos(__rq));</div><div class='add'>+</div><div class='add'>+		if (elv_bio_merge_ok(__rq, bio)) {</div><div class='add'>+			*rq = __rq;</div><div class='add'>+			return ELEVATOR_FRONT_MERGE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ELEVATOR_NO_MERGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool dd_bio_merge(struct blk_mq_hw_ctx *hctx, struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+	struct deadline_data *dd = q-&gt;elevator-&gt;elevator_data;</div><div class='add'>+	struct request *free = NULL;</div><div class='add'>+	bool ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dd-&gt;lock);</div><div class='add'>+	ret = blk_mq_sched_try_merge(q, bio, &amp;free);</div><div class='add'>+	spin_unlock(&amp;dd-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (free)</div><div class='add'>+		blk_mq_free_request(free);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * add rq to rbtree and fifo</div><div class='add'>+ */</div><div class='add'>+static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,</div><div class='add'>+			      bool at_head)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+	struct deadline_data *dd = q-&gt;elevator-&gt;elevator_data;</div><div class='add'>+	const int data_dir = rq_data_dir(rq);</div><div class='add'>+</div><div class='add'>+	if (blk_mq_sched_try_insert_merge(q, rq))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	blk_mq_sched_request_inserted(rq);</div><div class='add'>+</div><div class='add'>+	if (at_head || blk_rq_is_passthrough(rq)) {</div><div class='add'>+		if (at_head)</div><div class='add'>+			list_add(&amp;rq-&gt;queuelist, &amp;dd-&gt;dispatch);</div><div class='add'>+		else</div><div class='add'>+			list_add_tail(&amp;rq-&gt;queuelist, &amp;dd-&gt;dispatch);</div><div class='add'>+	} else {</div><div class='add'>+		deadline_add_rq_rb(dd, rq);</div><div class='add'>+</div><div class='add'>+		if (rq_mergeable(rq)) {</div><div class='add'>+			elv_rqhash_add(q, rq);</div><div class='add'>+			if (!q-&gt;last_merge)</div><div class='add'>+				q-&gt;last_merge = rq;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * set expire time and add to fifo list</div><div class='add'>+		 */</div><div class='add'>+		rq-&gt;fifo_time = jiffies + dd-&gt;fifo_expire[data_dir];</div><div class='add'>+		list_add_tail(&amp;rq-&gt;queuelist, &amp;dd-&gt;fifo_list[data_dir]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dd_insert_requests(struct blk_mq_hw_ctx *hctx,</div><div class='add'>+			       struct list_head *list, bool at_head)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *q = hctx-&gt;queue;</div><div class='add'>+	struct deadline_data *dd = q-&gt;elevator-&gt;elevator_data;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dd-&gt;lock);</div><div class='add'>+	while (!list_empty(list)) {</div><div class='add'>+		struct request *rq;</div><div class='add'>+</div><div class='add'>+		rq = list_first_entry(list, struct request, queuelist);</div><div class='add'>+		list_del_init(&amp;rq-&gt;queuelist);</div><div class='add'>+		dd_insert_request(hctx, rq, at_head);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;dd-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool dd_has_work(struct blk_mq_hw_ctx *hctx)</div><div class='add'>+{</div><div class='add'>+	struct deadline_data *dd = hctx-&gt;queue-&gt;elevator-&gt;elevator_data;</div><div class='add'>+</div><div class='add'>+	return !list_empty_careful(&amp;dd-&gt;dispatch) ||</div><div class='add'>+		!list_empty_careful(&amp;dd-&gt;fifo_list[0]) ||</div><div class='add'>+		!list_empty_careful(&amp;dd-&gt;fifo_list[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sysfs parts below</div><div class='add'>+ */</div><div class='add'>+static ssize_t</div><div class='add'>+deadline_var_show(int var, char *page)</div><div class='add'>+{</div><div class='add'>+	return sprintf(page, "%d\n", var);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+deadline_var_store(int *var, const char *page, size_t count)</div><div class='add'>+{</div><div class='add'>+	char *p = (char *) page;</div><div class='add'>+</div><div class='add'>+	*var = simple_strtol(p, &amp;p, 10);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SHOW_FUNCTION(__FUNC, __VAR, __CONV)				\</div><div class='add'>+static ssize_t __FUNC(struct elevator_queue *e, char *page)		\</div><div class='add'>+{									\</div><div class='add'>+	struct deadline_data *dd = e-&gt;elevator_data;			\</div><div class='add'>+	int __data = __VAR;						\</div><div class='add'>+	if (__CONV)							\</div><div class='add'>+		__data = jiffies_to_msecs(__data);			\</div><div class='add'>+	return deadline_var_show(__data, (page));			\</div><div class='add'>+}</div><div class='add'>+SHOW_FUNCTION(deadline_read_expire_show, dd-&gt;fifo_expire[READ], 1);</div><div class='add'>+SHOW_FUNCTION(deadline_write_expire_show, dd-&gt;fifo_expire[WRITE], 1);</div><div class='add'>+SHOW_FUNCTION(deadline_writes_starved_show, dd-&gt;writes_starved, 0);</div><div class='add'>+SHOW_FUNCTION(deadline_front_merges_show, dd-&gt;front_merges, 0);</div><div class='add'>+SHOW_FUNCTION(deadline_fifo_batch_show, dd-&gt;fifo_batch, 0);</div><div class='add'>+#undef SHOW_FUNCTION</div><div class='add'>+</div><div class='add'>+#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV)			\</div><div class='add'>+static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count)	\</div><div class='add'>+{									\</div><div class='add'>+	struct deadline_data *dd = e-&gt;elevator_data;			\</div><div class='add'>+	int __data;							\</div><div class='add'>+	int ret = deadline_var_store(&amp;__data, (page), count);		\</div><div class='add'>+	if (__data &lt; (MIN))						\</div><div class='add'>+		__data = (MIN);						\</div><div class='add'>+	else if (__data &gt; (MAX))					\</div><div class='add'>+		__data = (MAX);						\</div><div class='add'>+	if (__CONV)							\</div><div class='add'>+		*(__PTR) = msecs_to_jiffies(__data);			\</div><div class='add'>+	else								\</div><div class='add'>+		*(__PTR) = __data;					\</div><div class='add'>+	return ret;							\</div><div class='add'>+}</div><div class='add'>+STORE_FUNCTION(deadline_read_expire_store, &amp;dd-&gt;fifo_expire[READ], 0, INT_MAX, 1);</div><div class='add'>+STORE_FUNCTION(deadline_write_expire_store, &amp;dd-&gt;fifo_expire[WRITE], 0, INT_MAX, 1);</div><div class='add'>+STORE_FUNCTION(deadline_writes_starved_store, &amp;dd-&gt;writes_starved, INT_MIN, INT_MAX, 0);</div><div class='add'>+STORE_FUNCTION(deadline_front_merges_store, &amp;dd-&gt;front_merges, 0, 1, 0);</div><div class='add'>+STORE_FUNCTION(deadline_fifo_batch_store, &amp;dd-&gt;fifo_batch, 0, INT_MAX, 0);</div><div class='add'>+#undef STORE_FUNCTION</div><div class='add'>+</div><div class='add'>+#define DD_ATTR(name) \</div><div class='add'>+	__ATTR(name, S_IRUGO|S_IWUSR, deadline_##name##_show, \</div><div class='add'>+				      deadline_##name##_store)</div><div class='add'>+</div><div class='add'>+static struct elv_fs_entry deadline_attrs[] = {</div><div class='add'>+	DD_ATTR(read_expire),</div><div class='add'>+	DD_ATTR(write_expire),</div><div class='add'>+	DD_ATTR(writes_starved),</div><div class='add'>+	DD_ATTR(front_merges),</div><div class='add'>+	DD_ATTR(fifo_batch),</div><div class='add'>+	__ATTR_NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct elevator_type mq_deadline = {</div><div class='add'>+	.ops.mq = {</div><div class='add'>+		.insert_requests	= dd_insert_requests,</div><div class='add'>+		.dispatch_request	= dd_dispatch_request,</div><div class='add'>+		.next_request		= elv_rb_latter_request,</div><div class='add'>+		.former_request		= elv_rb_former_request,</div><div class='add'>+		.bio_merge		= dd_bio_merge,</div><div class='add'>+		.request_merge		= dd_request_merge,</div><div class='add'>+		.requests_merged	= dd_merged_requests,</div><div class='add'>+		.request_merged		= dd_request_merged,</div><div class='add'>+		.has_work		= dd_has_work,</div><div class='add'>+		.init_sched		= dd_init_queue,</div><div class='add'>+		.exit_sched		= dd_exit_queue,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.uses_mq	= true,</div><div class='add'>+	.elevator_attrs = deadline_attrs,</div><div class='add'>+	.elevator_name = "mq-deadline",</div><div class='add'>+	.elevator_owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init deadline_init(void)</div><div class='add'>+{</div><div class='add'>+	return elv_register(&amp;mq_deadline);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit deadline_exit(void)</div><div class='add'>+{</div><div class='add'>+	elv_unregister(&amp;mq_deadline);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(deadline_init);</div><div class='add'>+module_exit(deadline_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Jens Axboe");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("MQ deadline IO scheduler");</div><div class='head'>diff --git a/block/noop-iosched.c b/block/noop-iosched.c<br/>index a163c487cf38..2d1b15d89b45 100644<br/>--- a/<a href='/drm-misc/tree/block/noop-iosched.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/noop-iosched.c</a><br/>+++ b/<a href='/drm-misc/tree/block/noop-iosched.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/noop-iosched.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ static void noop_exit_queue(struct elevator_queue *e)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct elevator_type elevator_noop = {</div><div class='del'>-	.ops = {</div><div class='add'>+	.ops.sq = {</div><div class='ctx'> 		.elevator_merge_req_fn		= noop_merged_requests,</div><div class='ctx'> 		.elevator_dispatch_fn		= noop_dispatch,</div><div class='ctx'> 		.elevator_add_req_fn		= noop_add_request,</div><div class='head'>diff --git a/block/opal_proto.h b/block/opal_proto.h<br/>new file mode 100644<br/>index 000000000000..f40c9acf8895<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/opal_proto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/opal_proto.h</a></div><div class='hunk'>@@ -0,0 +1,452 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2016 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Rafael Antognolli &lt;rafael.antognolli@intel.com&gt;</div><div class='add'>+ *    Scott  Bauer      &lt;scott.bauer@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef _OPAL_PROTO_H</div><div class='add'>+#define _OPAL_PROTO_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These constant values come from:</div><div class='add'>+ * SPC-4 section</div><div class='add'>+ * 6.30 SECURITY PROTOCOL IN command / table 265.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	TCG_SECP_00 = 0,</div><div class='add'>+	TCG_SECP_01,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Token defs derived from:</div><div class='add'>+ * TCG_Storage_Architecture_Core_Spec_v2.01_r1.00</div><div class='add'>+ * 3.2.2 Data Stream Encoding</div><div class='add'>+ */</div><div class='add'>+enum opal_response_token {</div><div class='add'>+	OPAL_DTA_TOKENID_BYTESTRING = 0xe0,</div><div class='add'>+	OPAL_DTA_TOKENID_SINT = 0xe1,</div><div class='add'>+	OPAL_DTA_TOKENID_UINT = 0xe2,</div><div class='add'>+	OPAL_DTA_TOKENID_TOKEN = 0xe3, /* actual token is returned */</div><div class='add'>+	OPAL_DTA_TOKENID_INVALID = 0X0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DTAERROR_NO_METHOD_STATUS 0x89</div><div class='add'>+#define GENERIC_HOST_SESSION_NUM 0x41</div><div class='add'>+</div><div class='add'>+#define TPER_SYNC_SUPPORTED 0x01</div><div class='add'>+</div><div class='add'>+#define TINY_ATOM_DATA_MASK 0x3F</div><div class='add'>+#define TINY_ATOM_SIGNED 0x40</div><div class='add'>+</div><div class='add'>+#define SHORT_ATOM_ID 0x80</div><div class='add'>+#define SHORT_ATOM_BYTESTRING 0x20</div><div class='add'>+#define SHORT_ATOM_SIGNED 0x10</div><div class='add'>+#define SHORT_ATOM_LEN_MASK 0xF</div><div class='add'>+</div><div class='add'>+#define MEDIUM_ATOM_ID 0xC0</div><div class='add'>+#define MEDIUM_ATOM_BYTESTRING 0x10</div><div class='add'>+#define MEDIUM_ATOM_SIGNED 0x8</div><div class='add'>+#define MEDIUM_ATOM_LEN_MASK 0x7</div><div class='add'>+</div><div class='add'>+#define LONG_ATOM_ID 0xe0</div><div class='add'>+#define LONG_ATOM_BYTESTRING 0x2</div><div class='add'>+#define LONG_ATOM_SIGNED 0x1</div><div class='add'>+</div><div class='add'>+/* Derived from TCG Core spec 2.01 Section:</div><div class='add'>+ * 3.2.2.1</div><div class='add'>+ * Data Type</div><div class='add'>+ */</div><div class='add'>+#define TINY_ATOM_BYTE   0x7F</div><div class='add'>+#define SHORT_ATOM_BYTE  0xBF</div><div class='add'>+#define MEDIUM_ATOM_BYTE 0xDF</div><div class='add'>+#define LONG_ATOM_BYTE   0xE3</div><div class='add'>+</div><div class='add'>+#define OPAL_INVAL_PARAM 12</div><div class='add'>+#define OPAL_MANUFACTURED_INACTIVE 0x08</div><div class='add'>+#define OPAL_DISCOVERY_COMID 0x0001</div><div class='add'>+</div><div class='add'>+#define LOCKING_RANGE_NON_GLOBAL 0x03</div><div class='add'>+/*</div><div class='add'>+ * User IDs used in the TCG storage SSCs</div><div class='add'>+ * Derived from: TCG_Storage_Architecture_Core_Spec_v2.01_r1.00</div><div class='add'>+ * Section: 6.3 Assigned UIDs</div><div class='add'>+ */</div><div class='add'>+#define OPAL_UID_LENGTH 8</div><div class='add'>+#define OPAL_METHOD_LENGTH 8</div><div class='add'>+#define OPAL_MSID_KEYLEN 15</div><div class='add'>+#define OPAL_UID_LENGTH_HALF 4</div><div class='add'>+</div><div class='add'>+/* Enum to index OPALUID array */</div><div class='add'>+enum opal_uid {</div><div class='add'>+	/* users */</div><div class='add'>+	OPAL_SMUID_UID,</div><div class='add'>+	OPAL_THISSP_UID,</div><div class='add'>+	OPAL_ADMINSP_UID,</div><div class='add'>+	OPAL_LOCKINGSP_UID,</div><div class='add'>+	OPAL_ENTERPRISE_LOCKINGSP_UID,</div><div class='add'>+	OPAL_ANYBODY_UID,</div><div class='add'>+	OPAL_SID_UID,</div><div class='add'>+	OPAL_ADMIN1_UID,</div><div class='add'>+	OPAL_USER1_UID,</div><div class='add'>+	OPAL_USER2_UID,</div><div class='add'>+	OPAL_PSID_UID,</div><div class='add'>+	OPAL_ENTERPRISE_BANDMASTER0_UID,</div><div class='add'>+	OPAL_ENTERPRISE_ERASEMASTER_UID,</div><div class='add'>+	/* tables */</div><div class='add'>+	OPAL_LOCKINGRANGE_GLOBAL,</div><div class='add'>+	OPAL_LOCKINGRANGE_ACE_RDLOCKED,</div><div class='add'>+	OPAL_LOCKINGRANGE_ACE_WRLOCKED,</div><div class='add'>+	OPAL_MBRCONTROL,</div><div class='add'>+	OPAL_MBR,</div><div class='add'>+	OPAL_AUTHORITY_TABLE,</div><div class='add'>+	OPAL_C_PIN_TABLE,</div><div class='add'>+	OPAL_LOCKING_INFO_TABLE,</div><div class='add'>+	OPAL_ENTERPRISE_LOCKING_INFO_TABLE,</div><div class='add'>+	/* C_PIN_TABLE object ID's */</div><div class='add'>+	OPAL_C_PIN_MSID,</div><div class='add'>+	OPAL_C_PIN_SID,</div><div class='add'>+	OPAL_C_PIN_ADMIN1,</div><div class='add'>+	/* half UID's (only first 4 bytes used) */</div><div class='add'>+	OPAL_HALF_UID_AUTHORITY_OBJ_REF,</div><div class='add'>+	OPAL_HALF_UID_BOOLEAN_ACE,</div><div class='add'>+	/* omitted optional parameter */</div><div class='add'>+	OPAL_UID_HEXFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define OPAL_METHOD_LENGTH 8</div><div class='add'>+</div><div class='add'>+/* Enum for indexing the OPALMETHOD array */</div><div class='add'>+enum opal_method {</div><div class='add'>+	OPAL_PROPERTIES,</div><div class='add'>+	OPAL_STARTSESSION,</div><div class='add'>+	OPAL_REVERT,</div><div class='add'>+	OPAL_ACTIVATE,</div><div class='add'>+	OPAL_EGET,</div><div class='add'>+	OPAL_ESET,</div><div class='add'>+	OPAL_NEXT,</div><div class='add'>+	OPAL_EAUTHENTICATE,</div><div class='add'>+	OPAL_GETACL,</div><div class='add'>+	OPAL_GENKEY,</div><div class='add'>+	OPAL_REVERTSP,</div><div class='add'>+	OPAL_GET,</div><div class='add'>+	OPAL_SET,</div><div class='add'>+	OPAL_AUTHENTICATE,</div><div class='add'>+	OPAL_RANDOM,</div><div class='add'>+	OPAL_ERASE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum opal_token {</div><div class='add'>+	/* Boolean */</div><div class='add'>+	OPAL_TRUE = 0x01,</div><div class='add'>+	OPAL_FALSE = 0x00,</div><div class='add'>+	OPAL_BOOLEAN_EXPR = 0x03,</div><div class='add'>+	/* cellblocks */</div><div class='add'>+	OPAL_TABLE = 0x00,</div><div class='add'>+	OPAL_STARTROW = 0x01,</div><div class='add'>+	OPAL_ENDROW = 0x02,</div><div class='add'>+	OPAL_STARTCOLUMN = 0x03,</div><div class='add'>+	OPAL_ENDCOLUMN = 0x04,</div><div class='add'>+	OPAL_VALUES = 0x01,</div><div class='add'>+	/* authority table */</div><div class='add'>+	OPAL_PIN = 0x03,</div><div class='add'>+	/* locking tokens */</div><div class='add'>+	OPAL_RANGESTART = 0x03,</div><div class='add'>+	OPAL_RANGELENGTH = 0x04,</div><div class='add'>+	OPAL_READLOCKENABLED = 0x05,</div><div class='add'>+	OPAL_WRITELOCKENABLED = 0x06,</div><div class='add'>+	OPAL_READLOCKED = 0x07,</div><div class='add'>+	OPAL_WRITELOCKED = 0x08,</div><div class='add'>+	OPAL_ACTIVEKEY = 0x0A,</div><div class='add'>+	/* locking info table */</div><div class='add'>+	OPAL_MAXRANGES = 0x04,</div><div class='add'>+	 /* mbr control */</div><div class='add'>+	OPAL_MBRENABLE = 0x01,</div><div class='add'>+	OPAL_MBRDONE = 0x02,</div><div class='add'>+	/* properties */</div><div class='add'>+	OPAL_HOSTPROPERTIES = 0x00,</div><div class='add'>+	/* atoms */</div><div class='add'>+	OPAL_STARTLIST = 0xf0,</div><div class='add'>+	OPAL_ENDLIST = 0xf1,</div><div class='add'>+	OPAL_STARTNAME = 0xf2,</div><div class='add'>+	OPAL_ENDNAME = 0xf3,</div><div class='add'>+	OPAL_CALL = 0xf8,</div><div class='add'>+	OPAL_ENDOFDATA = 0xf9,</div><div class='add'>+	OPAL_ENDOFSESSION = 0xfa,</div><div class='add'>+	OPAL_STARTTRANSACTON = 0xfb,</div><div class='add'>+	OPAL_ENDTRANSACTON = 0xfC,</div><div class='add'>+	OPAL_EMPTYATOM = 0xff,</div><div class='add'>+	OPAL_WHERE = 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Locking state for a locking range */</div><div class='add'>+enum opal_lockingstate {</div><div class='add'>+	OPAL_LOCKING_READWRITE = 0x01,</div><div class='add'>+	OPAL_LOCKING_READONLY = 0x02,</div><div class='add'>+	OPAL_LOCKING_LOCKED = 0x03,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Packets derived from:</div><div class='add'>+ * TCG_Storage_Architecture_Core_Spec_v2.01_r1.00</div><div class='add'>+ * Secion: 3.2.3 ComPackets, Packets &amp; Subpackets</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Comm Packet (header) for transmissions. */</div><div class='add'>+struct opal_compacket {</div><div class='add'>+	__be32 reserved0;</div><div class='add'>+	u8 extendedComID[4];</div><div class='add'>+	__be32 outstandingData;</div><div class='add'>+	__be32 minTransfer;</div><div class='add'>+	__be32 length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Packet structure. */</div><div class='add'>+struct opal_packet {</div><div class='add'>+	__be32 tsn;</div><div class='add'>+	__be32 hsn;</div><div class='add'>+	__be32 seq_number;</div><div class='add'>+	__be16 reserved0;</div><div class='add'>+	__be16 ack_type;</div><div class='add'>+	__be32 acknowledgment;</div><div class='add'>+	__be32 length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Data sub packet header */</div><div class='add'>+struct opal_data_subpacket {</div><div class='add'>+	u8 reserved0[6];</div><div class='add'>+	__be16 kind;</div><div class='add'>+	__be32 length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* header of a response */</div><div class='add'>+struct opal_header {</div><div class='add'>+	struct opal_compacket cp;</div><div class='add'>+	struct opal_packet pkt;</div><div class='add'>+	struct opal_data_subpacket subpkt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FC_TPER       0x0001</div><div class='add'>+#define FC_LOCKING    0x0002</div><div class='add'>+#define FC_GEOMETRY   0x0003</div><div class='add'>+#define FC_ENTERPRISE 0x0100</div><div class='add'>+#define FC_DATASTORE  0x0202</div><div class='add'>+#define FC_SINGLEUSER 0x0201</div><div class='add'>+#define FC_OPALV100   0x0200</div><div class='add'>+#define FC_OPALV200   0x0203</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Discovery 0 Header. As defined in</div><div class='add'>+ * Opal SSC Documentation</div><div class='add'>+ * Section: 3.3.5 Capability Discovery</div><div class='add'>+ */</div><div class='add'>+struct d0_header {</div><div class='add'>+	__be32 length; /* the length of the header 48 in 2.00.100 */</div><div class='add'>+	__be32 revision; /**&lt; revision of the header 1 in 2.00.100 */</div><div class='add'>+	__be32 reserved01;</div><div class='add'>+	__be32 reserved02;</div><div class='add'>+	/*</div><div class='add'>+	 * the remainder of the structure is vendor specific and will not be</div><div class='add'>+	 * addressed now</div><div class='add'>+	 */</div><div class='add'>+	u8 ignored[32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TPer Feature Descriptor. Contains flags indicating support for the</div><div class='add'>+ * TPer features described in the OPAL specification. The names match the</div><div class='add'>+ * OPAL terminology</div><div class='add'>+ *</div><div class='add'>+ * code == 0x001 in 2.00.100</div><div class='add'>+ */</div><div class='add'>+struct d0_tper_features {</div><div class='add'>+	/*</div><div class='add'>+	 * supported_features bits:</div><div class='add'>+	 * bit 7: reserved</div><div class='add'>+	 * bit 6: com ID management</div><div class='add'>+	 * bit 5: reserved</div><div class='add'>+	 * bit 4: streaming support</div><div class='add'>+	 * bit 3: buffer management</div><div class='add'>+	 * bit 2: ACK/NACK</div><div class='add'>+	 * bit 1: async</div><div class='add'>+	 * bit 0: sync</div><div class='add'>+	 */</div><div class='add'>+	u8 supported_features;</div><div class='add'>+	/*</div><div class='add'>+	 * bytes 5 through 15 are reserved, but we represent the first 3 as</div><div class='add'>+	 * u8 to keep the other two 32bits integers aligned.</div><div class='add'>+	 */</div><div class='add'>+	u8 reserved01[3];</div><div class='add'>+	__be32 reserved02;</div><div class='add'>+	__be32 reserved03;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Locking Feature Descriptor. Contains flags indicating support for the</div><div class='add'>+ * locking features described in the OPAL specification. The names match the</div><div class='add'>+ * OPAL terminology</div><div class='add'>+ *</div><div class='add'>+ * code == 0x0002 in 2.00.100</div><div class='add'>+ */</div><div class='add'>+struct d0_locking_features {</div><div class='add'>+	/*</div><div class='add'>+	 * supported_features bits:</div><div class='add'>+	 * bits 6-7: reserved</div><div class='add'>+	 * bit 5: MBR done</div><div class='add'>+	 * bit 4: MBR enabled</div><div class='add'>+	 * bit 3: media encryption</div><div class='add'>+	 * bit 2: locked</div><div class='add'>+	 * bit 1: locking enabled</div><div class='add'>+	 * bit 0: locking supported</div><div class='add'>+	 */</div><div class='add'>+	u8 supported_features;</div><div class='add'>+	/*</div><div class='add'>+	 * bytes 5 through 15 are reserved, but we represent the first 3 as</div><div class='add'>+	 * u8 to keep the other two 32bits integers aligned.</div><div class='add'>+	 */</div><div class='add'>+	u8 reserved01[3];</div><div class='add'>+	__be32 reserved02;</div><div class='add'>+	__be32 reserved03;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Geometry Feature Descriptor. Contains flags indicating support for the</div><div class='add'>+ * geometry features described in the OPAL specification. The names match the</div><div class='add'>+ * OPAL terminology</div><div class='add'>+ *</div><div class='add'>+ * code == 0x0003 in 2.00.100</div><div class='add'>+ */</div><div class='add'>+struct d0_geometry_features {</div><div class='add'>+	/*</div><div class='add'>+	 * skip 32 bits from header, needed to align the struct to 64 bits.</div><div class='add'>+	 */</div><div class='add'>+	u8 header[4];</div><div class='add'>+	/*</div><div class='add'>+	 * reserved01:</div><div class='add'>+	 * bits 1-6: reserved</div><div class='add'>+	 * bit 0: align</div><div class='add'>+	 */</div><div class='add'>+	u8 reserved01;</div><div class='add'>+	u8 reserved02[7];</div><div class='add'>+	__be32 logical_block_size;</div><div class='add'>+	__be64 alignment_granularity;</div><div class='add'>+	__be64 lowest_aligned_lba;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enterprise SSC Feature</div><div class='add'>+ *</div><div class='add'>+ * code == 0x0100</div><div class='add'>+ */</div><div class='add'>+struct d0_enterprise_ssc {</div><div class='add'>+	__be16 baseComID;</div><div class='add'>+	__be16 numComIDs;</div><div class='add'>+	/* range_crossing:</div><div class='add'>+	 * bits 1-6: reserved</div><div class='add'>+	 * bit 0: range crossing</div><div class='add'>+	 */</div><div class='add'>+	u8 range_crossing;</div><div class='add'>+	u8 reserved01;</div><div class='add'>+	__be16 reserved02;</div><div class='add'>+	__be32 reserved03;</div><div class='add'>+	__be32 reserved04;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Opal V1 feature</div><div class='add'>+ *</div><div class='add'>+ * code == 0x0200</div><div class='add'>+ */</div><div class='add'>+struct d0_opal_v100 {</div><div class='add'>+	__be16 baseComID;</div><div class='add'>+	__be16 numComIDs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Single User Mode feature</div><div class='add'>+ *</div><div class='add'>+ * code == 0x0201</div><div class='add'>+ */</div><div class='add'>+struct d0_single_user_mode {</div><div class='add'>+	__be32 num_locking_objects;</div><div class='add'>+	/* reserved01:</div><div class='add'>+	 * bit 0: any</div><div class='add'>+	 * bit 1: all</div><div class='add'>+	 * bit 2: policy</div><div class='add'>+	 * bits 3-7: reserved</div><div class='add'>+	 */</div><div class='add'>+	u8 reserved01;</div><div class='add'>+	u8 reserved02;</div><div class='add'>+	__be16 reserved03;</div><div class='add'>+	__be32 reserved04;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Additonal Datastores feature</div><div class='add'>+ *</div><div class='add'>+ * code == 0x0202</div><div class='add'>+ */</div><div class='add'>+struct d0_datastore_table {</div><div class='add'>+	__be16 reserved01;</div><div class='add'>+	__be16 max_tables;</div><div class='add'>+	__be32 max_size_tables;</div><div class='add'>+	__be32 table_size_alignment;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * OPAL 2.0 feature</div><div class='add'>+ *</div><div class='add'>+ * code == 0x0203</div><div class='add'>+ */</div><div class='add'>+struct d0_opal_v200 {</div><div class='add'>+	__be16 baseComID;</div><div class='add'>+	__be16 numComIDs;</div><div class='add'>+	/* range_crossing:</div><div class='add'>+	 * bits 1-6: reserved</div><div class='add'>+	 * bit 0: range crossing</div><div class='add'>+	 */</div><div class='add'>+	u8 range_crossing;</div><div class='add'>+	/* num_locking_admin_auth:</div><div class='add'>+	 * not aligned to 16 bits, so use two u8.</div><div class='add'>+	 * stored in big endian:</div><div class='add'>+	 * 0: MSB</div><div class='add'>+	 * 1: LSB</div><div class='add'>+	 */</div><div class='add'>+	u8 num_locking_admin_auth[2];</div><div class='add'>+	/* num_locking_user_auth:</div><div class='add'>+	 * not aligned to 16 bits, so use two u8.</div><div class='add'>+	 * stored in big endian:</div><div class='add'>+	 * 0: MSB</div><div class='add'>+	 * 1: LSB</div><div class='add'>+	 */</div><div class='add'>+	u8 num_locking_user_auth[2];</div><div class='add'>+	u8 initialPIN;</div><div class='add'>+	u8 revertedPIN;</div><div class='add'>+	u8 reserved01;</div><div class='add'>+	__be32 reserved02;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Union of features used to parse the discovery 0 response */</div><div class='add'>+struct d0_features {</div><div class='add'>+	__be16 code;</div><div class='add'>+	/*</div><div class='add'>+	 * r_version bits:</div><div class='add'>+	 * bits 4-7: version</div><div class='add'>+	 * bits 0-3: reserved</div><div class='add'>+	 */</div><div class='add'>+	u8 r_version;</div><div class='add'>+	u8 length;</div><div class='add'>+	u8 features[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _OPAL_PROTO_H */</div><div class='head'>diff --git a/block/partition-generic.c b/block/partition-generic.c<br/>index 71d9ed9df8da..7afb9907821f 100644<br/>--- a/<a href='/drm-misc/tree/block/partition-generic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/partition-generic.c</a><br/>+++ b/<a href='/drm-misc/tree/block/partition-generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/partition-generic.c</a></div><div class='hunk'>@@ -430,6 +430,56 @@ static int drop_partitions(struct gendisk *disk, struct block_device *bdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool part_zone_aligned(struct gendisk *disk,</div><div class='add'>+			      struct block_device *bdev,</div><div class='add'>+			      sector_t from, sector_t size)</div><div class='add'>+{</div><div class='add'>+	unsigned int zone_sectors = bdev_zone_sectors(bdev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If this function is called, then the disk is a zoned block device</div><div class='add'>+	 * (host-aware or host-managed). This can be detected even if the</div><div class='add'>+	 * zoned block device support is disabled (CONFIG_BLK_DEV_ZONED not</div><div class='add'>+	 * set). In this case, however, only host-aware devices will be seen</div><div class='add'>+	 * as a block device is not created for host-managed devices. Without</div><div class='add'>+	 * zoned block device support, host-aware drives can still be used as</div><div class='add'>+	 * regular block devices (no zone operation) and their zone size will</div><div class='add'>+	 * be reported as 0. Allow this case.</div><div class='add'>+	 */</div><div class='add'>+	if (!zone_sectors)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check partition start and size alignement. If the drive has a</div><div class='add'>+	 * smaller last runt zone, ignore it and allow the partition to</div><div class='add'>+	 * use it. Check the zone size too: it should be a power of 2 number</div><div class='add'>+	 * of sectors.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON_ONCE(!is_power_of_2(zone_sectors))) {</div><div class='add'>+		u32 rem;</div><div class='add'>+</div><div class='add'>+		div_u64_rem(from, zone_sectors, &amp;rem);</div><div class='add'>+		if (rem)</div><div class='add'>+			return false;</div><div class='add'>+		if ((from + size) &lt; get_capacity(disk)) {</div><div class='add'>+			div_u64_rem(size, zone_sectors, &amp;rem);</div><div class='add'>+			if (rem)</div><div class='add'>+				return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		if (from &amp; (zone_sectors - 1))</div><div class='add'>+			return false;</div><div class='add'>+		if ((from + size) &lt; get_capacity(disk) &amp;&amp;</div><div class='add'>+		    (size &amp; (zone_sectors - 1)))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int rescan_partitions(struct gendisk *disk, struct block_device *bdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct parsed_partitions *state = NULL;</div><div class='hunk'>@@ -529,6 +579,21 @@ rescan:</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * On a zoned block device, partitions should be aligned on the</div><div class='add'>+		 * device zone size (i.e. zone boundary crossing not allowed).</div><div class='add'>+		 * Otherwise, resetting the write pointer of the last zone of</div><div class='add'>+		 * one partition may impact the following partition.</div><div class='add'>+		 */</div><div class='add'>+		if (bdev_is_zoned(bdev) &amp;&amp;</div><div class='add'>+		    !part_zone_aligned(disk, bdev, from, size)) {</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "%s: p%d start %llu+%llu is not zone aligned\n",</div><div class='add'>+			       disk-&gt;disk_name, p, (unsigned long long) from,</div><div class='add'>+			       (unsigned long long) size);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		part = add_partition(disk, p, from, size,</div><div class='ctx'> 				     state-&gt;parts[p].flags,</div><div class='ctx'> 				     &amp;state-&gt;parts[p].info);</div><div class='head'>diff --git a/block/partitions/efi.c b/block/partitions/efi.c<br/>index bcd86e5cd546..39f70d968754 100644<br/>--- a/<a href='/drm-misc/tree/block/partitions/efi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/partitions/efi.c</a><br/>+++ b/<a href='/drm-misc/tree/block/partitions/efi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/partitions/efi.c</a></div><div class='hunk'>@@ -293,7 +293,7 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,</div><div class='ctx'> 	if (!gpt)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	count = le32_to_cpu(gpt-&gt;num_partition_entries) *</div><div class='add'>+	count = (size_t)le32_to_cpu(gpt-&gt;num_partition_entries) *</div><div class='ctx'>                 le32_to_cpu(gpt-&gt;sizeof_partition_entry);</div><div class='ctx'> 	if (!count)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -352,7 +352,7 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba,</div><div class='ctx'> 			gpt_header **gpt, gpt_entry **ptes)</div><div class='ctx'> {</div><div class='ctx'> 	u32 crc, origcrc;</div><div class='del'>-	u64 lastlba;</div><div class='add'>+	u64 lastlba, pt_size;</div><div class='ctx'> </div><div class='ctx'> 	if (!ptes)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -434,13 +434,20 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Sanity check partition table size */</div><div class='add'>+	pt_size = (u64)le32_to_cpu((*gpt)-&gt;num_partition_entries) *</div><div class='add'>+		le32_to_cpu((*gpt)-&gt;sizeof_partition_entry);</div><div class='add'>+	if (pt_size &gt; KMALLOC_MAX_SIZE) {</div><div class='add'>+		pr_debug("GUID Partition Table is too large: %llu &gt; %lu bytes\n",</div><div class='add'>+			 (unsigned long long)pt_size, KMALLOC_MAX_SIZE);</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!(*ptes = alloc_read_gpt_entries(state, *gpt)))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	/* Check the GUID Partition Entry Array CRC */</div><div class='del'>-	crc = efi_crc32((const unsigned char *) (*ptes),</div><div class='del'>-			le32_to_cpu((*gpt)-&gt;num_partition_entries) *</div><div class='del'>-			le32_to_cpu((*gpt)-&gt;sizeof_partition_entry));</div><div class='add'>+	crc = efi_crc32((const unsigned char *) (*ptes), pt_size);</div><div class='ctx'> </div><div class='ctx'> 	if (crc != le32_to_cpu((*gpt)-&gt;partition_entry_array_crc32)) {</div><div class='ctx'> 		pr_debug("GUID Partition Entry Array CRC check failed.\n");</div><div class='head'>diff --git a/block/partitions/ibm.c b/block/partitions/ibm.c<br/>index 47a61474e795..14b081af8d61 100644<br/>--- a/<a href='/drm-misc/tree/block/partitions/ibm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/partitions/ibm.c</a><br/>+++ b/<a href='/drm-misc/tree/block/partitions/ibm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/partitions/ibm.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/dasd.h&gt;</div><div class='ctx'> #include &lt;asm/ebcdic.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/vtoc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "check.h"</div><div class='head'>diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c<br/>index 0774799942e0..2a2fc768b27a 100644<br/>--- a/<a href='/drm-misc/tree/block/scsi_ioctl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>block/scsi_ioctl.c</a><br/>+++ b/<a href='/drm-misc/tree/block/scsi_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/scsi_ioctl.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/times.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_ioctl.h&gt;</div><div class='hunk'>@@ -182,6 +182,9 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)</div><div class='ctx'> 	__set_bit(WRITE_16, filter-&gt;write_ok);</div><div class='ctx'> 	__set_bit(WRITE_LONG, filter-&gt;write_ok);</div><div class='ctx'> 	__set_bit(WRITE_LONG_2, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(WRITE_SAME, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(WRITE_SAME_16, filter-&gt;write_ok);</div><div class='add'>+	__set_bit(WRITE_SAME_32, filter-&gt;write_ok);</div><div class='ctx'> 	__set_bit(ERASE, filter-&gt;write_ok);</div><div class='ctx'> 	__set_bit(GPCMD_MODE_SELECT_10, filter-&gt;write_ok);</div><div class='ctx'> 	__set_bit(MODE_SELECT, filter-&gt;write_ok);</div><div class='hunk'>@@ -227,15 +230,17 @@ EXPORT_SYMBOL(blk_verify_command);</div><div class='ctx'> static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,</div><div class='ctx'> 			     struct sg_io_hdr *hdr, fmode_t mode)</div><div class='ctx'> {</div><div class='del'>-	if (copy_from_user(rq-&gt;cmd, hdr-&gt;cmdp, hdr-&gt;cmd_len))</div><div class='add'>+	struct scsi_request *req = scsi_req(rq);</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(req-&gt;cmd, hdr-&gt;cmdp, hdr-&gt;cmd_len))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (blk_verify_command(rq-&gt;cmd, mode &amp; FMODE_WRITE))</div><div class='add'>+	if (blk_verify_command(req-&gt;cmd, mode &amp; FMODE_WRITE))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * fill in request structure</div><div class='ctx'> 	 */</div><div class='del'>-	rq-&gt;cmd_len = hdr-&gt;cmd_len;</div><div class='add'>+	req-&gt;cmd_len = hdr-&gt;cmd_len;</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;timeout = msecs_to_jiffies(hdr-&gt;timeout);</div><div class='ctx'> 	if (!rq-&gt;timeout)</div><div class='hunk'>@@ -251,6 +256,7 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,</div><div class='ctx'> static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,</div><div class='ctx'> 				 struct bio *bio)</div><div class='ctx'> {</div><div class='add'>+	struct scsi_request *req = scsi_req(rq);</div><div class='ctx'> 	int r, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -264,13 +270,13 @@ static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,</div><div class='ctx'> 	hdr-&gt;info = 0;</div><div class='ctx'> 	if (hdr-&gt;masked_status || hdr-&gt;host_status || hdr-&gt;driver_status)</div><div class='ctx'> 		hdr-&gt;info |= SG_INFO_CHECK;</div><div class='del'>-	hdr-&gt;resid = rq-&gt;resid_len;</div><div class='add'>+	hdr-&gt;resid = req-&gt;resid_len;</div><div class='ctx'> 	hdr-&gt;sb_len_wr = 0;</div><div class='ctx'> </div><div class='del'>-	if (rq-&gt;sense_len &amp;&amp; hdr-&gt;sbp) {</div><div class='del'>-		int len = min((unsigned int) hdr-&gt;mx_sb_len, rq-&gt;sense_len);</div><div class='add'>+	if (req-&gt;sense_len &amp;&amp; hdr-&gt;sbp) {</div><div class='add'>+		int len = min((unsigned int) hdr-&gt;mx_sb_len, req-&gt;sense_len);</div><div class='ctx'> </div><div class='del'>-		if (!copy_to_user(hdr-&gt;sbp, rq-&gt;sense, len))</div><div class='add'>+		if (!copy_to_user(hdr-&gt;sbp, req-&gt;sense, len))</div><div class='ctx'> 			hdr-&gt;sb_len_wr = len;</div><div class='ctx'> 		else</div><div class='ctx'> 			ret = -EFAULT;</div><div class='hunk'>@@ -291,7 +297,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,</div><div class='ctx'> 	int writing = 0;</div><div class='ctx'> 	int at_head = 0;</div><div class='ctx'> 	struct request *rq;</div><div class='del'>-	char sense[SCSI_SENSE_BUFFERSIZE];</div><div class='add'>+	struct scsi_request *req;</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;interface_id != 'S')</div><div class='hunk'>@@ -315,14 +321,16 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,</div><div class='ctx'> 		at_head = 1;</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENOMEM;</div><div class='del'>-	rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);</div><div class='add'>+	rq = blk_get_request(q, writing ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN,</div><div class='add'>+			GFP_KERNEL);</div><div class='ctx'> 	if (IS_ERR(rq))</div><div class='ctx'> 		return PTR_ERR(rq);</div><div class='del'>-	blk_rq_set_block_pc(rq);</div><div class='add'>+	req = scsi_req(rq);</div><div class='add'>+	scsi_req_init(rq);</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;cmd_len &gt; BLK_MAX_CDB) {</div><div class='del'>-		rq-&gt;cmd = kzalloc(hdr-&gt;cmd_len, GFP_KERNEL);</div><div class='del'>-		if (!rq-&gt;cmd)</div><div class='add'>+		req-&gt;cmd = kzalloc(hdr-&gt;cmd_len, GFP_KERNEL);</div><div class='add'>+		if (!req-&gt;cmd)</div><div class='ctx'> 			goto out_put_request;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -354,9 +362,6 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,</div><div class='ctx'> 		goto out_free_cdb;</div><div class='ctx'> </div><div class='ctx'> 	bio = rq-&gt;bio;</div><div class='del'>-	memset(sense, 0, sizeof(sense));</div><div class='del'>-	rq-&gt;sense = sense;</div><div class='del'>-	rq-&gt;sense_len = 0;</div><div class='ctx'> 	rq-&gt;retries = 0;</div><div class='ctx'> </div><div class='ctx'> 	start_time = jiffies;</div><div class='hunk'>@@ -372,8 +377,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,</div><div class='ctx'> 	ret = blk_complete_sghdr_rq(rq, hdr, bio);</div><div class='ctx'> </div><div class='ctx'> out_free_cdb:</div><div class='del'>-	if (rq-&gt;cmd != rq-&gt;__cmd)</div><div class='del'>-		kfree(rq-&gt;cmd);</div><div class='add'>+	scsi_req_free_cmd(req);</div><div class='ctx'> out_put_request:</div><div class='ctx'> 	blk_put_request(rq);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -417,9 +421,10 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,</div><div class='ctx'> 		struct scsi_ioctl_command __user *sic)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *rq;</div><div class='add'>+	struct scsi_request *req;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int in_len, out_len, bytes, opcode, cmdlen;</div><div class='del'>-	char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];</div><div class='add'>+	char *buffer = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!sic)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -444,12 +449,14 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_RECLAIM);</div><div class='add'>+	rq = blk_get_request(q, in_len ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN,</div><div class='add'>+			__GFP_RECLAIM);</div><div class='ctx'> 	if (IS_ERR(rq)) {</div><div class='ctx'> 		err = PTR_ERR(rq);</div><div class='ctx'> 		goto error_free_buffer;</div><div class='ctx'> 	}</div><div class='del'>-	blk_rq_set_block_pc(rq);</div><div class='add'>+	req = scsi_req(rq);</div><div class='add'>+	scsi_req_init(rq);</div><div class='ctx'> </div><div class='ctx'> 	cmdlen = COMMAND_SIZE(opcode);</div><div class='ctx'> </div><div class='hunk'>@@ -457,14 +464,14 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,</div><div class='ctx'> 	 * get command and data to send to device, if any</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = -EFAULT;</div><div class='del'>-	rq-&gt;cmd_len = cmdlen;</div><div class='del'>-	if (copy_from_user(rq-&gt;cmd, sic-&gt;data, cmdlen))</div><div class='add'>+	req-&gt;cmd_len = cmdlen;</div><div class='add'>+	if (copy_from_user(req-&gt;cmd, sic-&gt;data, cmdlen))</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	if (in_len &amp;&amp; copy_from_user(buffer, sic-&gt;data + cmdlen, in_len))</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	err = blk_verify_command(rq-&gt;cmd, mode &amp; FMODE_WRITE);</div><div class='add'>+	err = blk_verify_command(req-&gt;cmd, mode &amp; FMODE_WRITE);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -500,18 +507,14 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(sense, 0, sizeof(sense));</div><div class='del'>-	rq-&gt;sense = sense;</div><div class='del'>-	rq-&gt;sense_len = 0;</div><div class='del'>-</div><div class='ctx'> 	blk_execute_rq(q, disk, rq, 0);</div><div class='ctx'> </div><div class='ctx'> 	err = rq-&gt;errors &amp; 0xff;	/* only 8 bit SCSI status */</div><div class='ctx'> 	if (err) {</div><div class='del'>-		if (rq-&gt;sense_len &amp;&amp; rq-&gt;sense) {</div><div class='del'>-			bytes = (OMAX_SB_LEN &gt; rq-&gt;sense_len) ?</div><div class='del'>-				rq-&gt;sense_len : OMAX_SB_LEN;</div><div class='del'>-			if (copy_to_user(sic-&gt;data, rq-&gt;sense, bytes))</div><div class='add'>+		if (req-&gt;sense_len &amp;&amp; req-&gt;sense) {</div><div class='add'>+			bytes = (OMAX_SB_LEN &gt; req-&gt;sense_len) ?</div><div class='add'>+				req-&gt;sense_len : OMAX_SB_LEN;</div><div class='add'>+			if (copy_to_user(sic-&gt;data, req-&gt;sense, bytes))</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -536,14 +539,14 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk,</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	rq = blk_get_request(q, WRITE, __GFP_RECLAIM);</div><div class='add'>+	rq = blk_get_request(q, REQ_OP_SCSI_OUT, __GFP_RECLAIM);</div><div class='ctx'> 	if (IS_ERR(rq))</div><div class='ctx'> 		return PTR_ERR(rq);</div><div class='del'>-	blk_rq_set_block_pc(rq);</div><div class='add'>+	scsi_req_init(rq);</div><div class='ctx'> 	rq-&gt;timeout = BLK_DEFAULT_SG_TIMEOUT;</div><div class='del'>-	rq-&gt;cmd[0] = cmd;</div><div class='del'>-	rq-&gt;cmd[4] = data;</div><div class='del'>-	rq-&gt;cmd_len = 6;</div><div class='add'>+	scsi_req(rq)-&gt;cmd[0] = cmd;</div><div class='add'>+	scsi_req(rq)-&gt;cmd[4] = data;</div><div class='add'>+	scsi_req(rq)-&gt;cmd_len = 6;</div><div class='ctx'> 	err = blk_execute_rq(q, bd_disk, rq, 0);</div><div class='ctx'> 	blk_put_request(rq);</div><div class='ctx'> </div><div class='hunk'>@@ -740,6 +743,17 @@ int scsi_cmd_blk_ioctl(struct block_device *bd, fmode_t mode,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(scsi_cmd_blk_ioctl);</div><div class='ctx'> </div><div class='add'>+void scsi_req_init(struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct scsi_request *req = scsi_req(rq);</div><div class='add'>+</div><div class='add'>+	memset(req-&gt;__cmd, 0, sizeof(req-&gt;__cmd));</div><div class='add'>+	req-&gt;cmd = req-&gt;__cmd;</div><div class='add'>+	req-&gt;cmd_len = BLK_MAX_CDB;</div><div class='add'>+	req-&gt;sense_len = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(scsi_req_init);</div><div class='add'>+</div><div class='ctx'> static int __init blk_scsi_ioctl_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	blk_set_cmd_filter_defaults(&amp;blk_default_cmd_filter);</div><div class='head'>diff --git a/block/sed-opal.c b/block/sed-opal.c<br/>new file mode 100644<br/>index 000000000000..1e18dca360fc<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/block/sed-opal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>block/sed-opal.c</a></div><div class='hunk'>@@ -0,0 +1,2425 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2016 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Scott  Bauer      &lt;scott.bauer@intel.com&gt;</div><div class='add'>+ *    Rafael Antognolli &lt;rafael.antognolli@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ":OPAL: " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/genhd.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;uapi/linux/sed-opal.h&gt;</div><div class='add'>+#include &lt;linux/sed-opal.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kdev_t.h&gt;</div><div class='add'>+</div><div class='add'>+#include "opal_proto.h"</div><div class='add'>+</div><div class='add'>+#define IO_BUFFER_LENGTH 2048</div><div class='add'>+#define MAX_TOKS 64</div><div class='add'>+</div><div class='add'>+struct opal_step {</div><div class='add'>+	int (*fn)(struct opal_dev *dev, void *data);</div><div class='add'>+	void *data;</div><div class='add'>+};</div><div class='add'>+typedef int (cont_fn)(struct opal_dev *dev);</div><div class='add'>+</div><div class='add'>+enum opal_atom_width {</div><div class='add'>+	OPAL_WIDTH_TINY,</div><div class='add'>+	OPAL_WIDTH_SHORT,</div><div class='add'>+	OPAL_WIDTH_MEDIUM,</div><div class='add'>+	OPAL_WIDTH_LONG,</div><div class='add'>+	OPAL_WIDTH_TOKEN</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On the parsed response, we don't store again the toks that are already</div><div class='add'>+ * stored in the response buffer. Instead, for each token, we just store a</div><div class='add'>+ * pointer to the position in the buffer where the token starts, and the size</div><div class='add'>+ * of the token in bytes.</div><div class='add'>+ */</div><div class='add'>+struct opal_resp_tok {</div><div class='add'>+	const u8 *pos;</div><div class='add'>+	size_t len;</div><div class='add'>+	enum opal_response_token type;</div><div class='add'>+	enum opal_atom_width width;</div><div class='add'>+	union {</div><div class='add'>+		u64 u;</div><div class='add'>+		s64 s;</div><div class='add'>+	} stored;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * From the response header it's not possible to know how many tokens there are</div><div class='add'>+ * on the payload. So we hardcode that the maximum will be MAX_TOKS, and later</div><div class='add'>+ * if we start dealing with messages that have more than that, we can increase</div><div class='add'>+ * this number. This is done to avoid having to make two passes through the</div><div class='add'>+ * response, the first one counting how many tokens we have and the second one</div><div class='add'>+ * actually storing the positions.</div><div class='add'>+ */</div><div class='add'>+struct parsed_resp {</div><div class='add'>+	int num;</div><div class='add'>+	struct opal_resp_tok toks[MAX_TOKS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct opal_dev {</div><div class='add'>+	bool supported;</div><div class='add'>+</div><div class='add'>+	void *data;</div><div class='add'>+	sec_send_recv *send_recv;</div><div class='add'>+</div><div class='add'>+	const struct opal_step *steps;</div><div class='add'>+	struct mutex dev_lock;</div><div class='add'>+	u16 comid;</div><div class='add'>+	u32 hsn;</div><div class='add'>+	u32 tsn;</div><div class='add'>+	u64 align;</div><div class='add'>+	u64 lowest_lba;</div><div class='add'>+</div><div class='add'>+	size_t pos;</div><div class='add'>+	u8 cmd[IO_BUFFER_LENGTH];</div><div class='add'>+	u8 resp[IO_BUFFER_LENGTH];</div><div class='add'>+</div><div class='add'>+	struct parsed_resp parsed;</div><div class='add'>+	size_t prev_d_len;</div><div class='add'>+	void *prev_data;</div><div class='add'>+</div><div class='add'>+	struct list_head unlk_lst;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const u8 opaluid[][OPAL_UID_LENGTH] = {</div><div class='add'>+	/* users */</div><div class='add'>+	[OPAL_SMUID_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff },</div><div class='add'>+	[OPAL_THISSP_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },</div><div class='add'>+	[OPAL_ADMINSP_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x02, 0x05, 0x00, 0x00, 0x00, 0x01 },</div><div class='add'>+	[OPAL_LOCKINGSP_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x02, 0x05, 0x00, 0x00, 0x00, 0x02 },</div><div class='add'>+	[OPAL_ENTERPRISE_LOCKINGSP_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x02, 0x05, 0x00, 0x01, 0x00, 0x01 },</div><div class='add'>+	[OPAL_ANYBODY_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x01 },</div><div class='add'>+	[OPAL_SID_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x06 },</div><div class='add'>+	[OPAL_ADMIN1_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x09, 0x00, 0x01, 0x00, 0x01 },</div><div class='add'>+	[OPAL_USER1_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x09, 0x00, 0x03, 0x00, 0x01 },</div><div class='add'>+	[OPAL_USER2_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x09, 0x00, 0x03, 0x00, 0x02 },</div><div class='add'>+	[OPAL_PSID_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x09, 0x00, 0x01, 0xff, 0x01 },</div><div class='add'>+	[OPAL_ENTERPRISE_BANDMASTER0_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x80, 0x01 },</div><div class='add'>+	[OPAL_ENTERPRISE_ERASEMASTER_UID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x84, 0x01 },</div><div class='add'>+</div><div class='add'>+	/* tables */</div><div class='add'>+</div><div class='add'>+	[OPAL_LOCKINGRANGE_GLOBAL] =</div><div class='add'>+		{ 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x01 },</div><div class='add'>+	[OPAL_LOCKINGRANGE_ACE_RDLOCKED] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x08, 0x00, 0x03, 0xE0, 0x01 },</div><div class='add'>+	[OPAL_LOCKINGRANGE_ACE_WRLOCKED] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x08, 0x00, 0x03, 0xE8, 0x01 },</div><div class='add'>+	[OPAL_MBRCONTROL] =</div><div class='add'>+		{ 0x00, 0x00, 0x08, 0x03, 0x00, 0x00, 0x00, 0x01 },</div><div class='add'>+	[OPAL_MBR] =</div><div class='add'>+		{ 0x00, 0x00, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00 },</div><div class='add'>+	[OPAL_AUTHORITY_TABLE] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00},</div><div class='add'>+	[OPAL_C_PIN_TABLE] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00},</div><div class='add'>+	[OPAL_LOCKING_INFO_TABLE] =</div><div class='add'>+		{ 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x01 },</div><div class='add'>+	[OPAL_ENTERPRISE_LOCKING_INFO_TABLE] =</div><div class='add'>+		{ 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00 },</div><div class='add'>+</div><div class='add'>+	/* C_PIN_TABLE object ID's */</div><div class='add'>+</div><div class='add'>+        [OPAL_C_PIN_MSID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x84, 0x02},</div><div class='add'>+	[OPAL_C_PIN_SID] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01},</div><div class='add'>+	[OPAL_C_PIN_ADMIN1] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x0B, 0x00, 0x01, 0x00, 0x01},</div><div class='add'>+</div><div class='add'>+	/* half UID's (only first 4 bytes used) */</div><div class='add'>+</div><div class='add'>+	[OPAL_HALF_UID_AUTHORITY_OBJ_REF] =</div><div class='add'>+		{ 0x00, 0x00, 0x0C, 0x05, 0xff, 0xff, 0xff, 0xff },</div><div class='add'>+	[OPAL_HALF_UID_BOOLEAN_ACE] =</div><div class='add'>+		{ 0x00, 0x00, 0x04, 0x0E, 0xff, 0xff, 0xff, 0xff },</div><div class='add'>+</div><div class='add'>+	/* special value for omitted optional parameter */</div><div class='add'>+	[OPAL_UID_HEXFF] =</div><div class='add'>+		{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TCG Storage SSC Methods.</div><div class='add'>+ * Derived from: TCG_Storage_Architecture_Core_Spec_v2.01_r1.00</div><div class='add'>+ * Section: 6.3 Assigned UIDs</div><div class='add'>+ */</div><div class='add'>+static const u8 opalmethod[][OPAL_UID_LENGTH] = {</div><div class='add'>+	[OPAL_PROPERTIES] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x01 },</div><div class='add'>+	[OPAL_STARTSESSION] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x02 },</div><div class='add'>+	[OPAL_REVERT] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x02, 0x02 },</div><div class='add'>+	[OPAL_ACTIVATE] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x02, 0x03 },</div><div class='add'>+	[OPAL_EGET] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06 },</div><div class='add'>+	[OPAL_ESET] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07 },</div><div class='add'>+	[OPAL_NEXT] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x08 },</div><div class='add'>+	[OPAL_EAUTHENTICATE] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0c },</div><div class='add'>+	[OPAL_GETACL] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0d },</div><div class='add'>+	[OPAL_GENKEY] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10 },</div><div class='add'>+	[OPAL_REVERTSP] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x11 },</div><div class='add'>+	[OPAL_GET] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x16 },</div><div class='add'>+	[OPAL_SET] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x17 },</div><div class='add'>+	[OPAL_AUTHENTICATE] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1c },</div><div class='add'>+	[OPAL_RANDOM] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x06, 0x01 },</div><div class='add'>+	[OPAL_ERASE] =</div><div class='add'>+		{ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x08, 0x03 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int end_opal_session_error(struct opal_dev *dev);</div><div class='add'>+</div><div class='add'>+struct opal_suspend_data {</div><div class='add'>+	struct opal_lock_unlock unlk;</div><div class='add'>+	u8 lr;</div><div class='add'>+	struct list_head node;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Derived from:</div><div class='add'>+ * TCG_Storage_Architecture_Core_Spec_v2.01_r1.00</div><div class='add'>+ * Section: 5.1.5 Method Status Codes</div><div class='add'>+ */</div><div class='add'>+static const char * const opal_errors[] = {</div><div class='add'>+	"Success",</div><div class='add'>+	"Not Authorized",</div><div class='add'>+	"Unknown Error",</div><div class='add'>+	"SP Busy",</div><div class='add'>+	"SP Failed",</div><div class='add'>+	"SP Disabled",</div><div class='add'>+	"SP Frozen",</div><div class='add'>+	"No Sessions Available",</div><div class='add'>+	"Uniqueness Conflict",</div><div class='add'>+	"Insufficient Space",</div><div class='add'>+	"Insufficient Rows",</div><div class='add'>+	"Invalid Function",</div><div class='add'>+	"Invalid Parameter",</div><div class='add'>+	"Invalid Reference",</div><div class='add'>+	"Unknown Error",</div><div class='add'>+	"TPER Malfunction",</div><div class='add'>+	"Transaction Failure",</div><div class='add'>+	"Response Overflow",</div><div class='add'>+	"Authority Locked Out",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *opal_error_to_human(int error)</div><div class='add'>+{</div><div class='add'>+	if (error == 0x3f)</div><div class='add'>+		return "Failed";</div><div class='add'>+</div><div class='add'>+	if (error &gt;= ARRAY_SIZE(opal_errors) || error &lt; 0)</div><div class='add'>+		return "Unknown Error";</div><div class='add'>+</div><div class='add'>+	return opal_errors[error];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_buffer(const u8 *ptr, u32 length)</div><div class='add'>+{</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump_bytes("OPAL: ", DUMP_PREFIX_OFFSET, ptr, length);</div><div class='add'>+	pr_debug("\n");</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_tper(const void *data)</div><div class='add'>+{</div><div class='add'>+	const struct d0_tper_features *tper = data;</div><div class='add'>+	u8 flags = tper-&gt;supported_features;</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; TPER_SYNC_SUPPORTED)) {</div><div class='add'>+		pr_err("TPer sync not supported. flags = %d\n",</div><div class='add'>+		       tper-&gt;supported_features);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_sum(const void *data)</div><div class='add'>+{</div><div class='add'>+	const struct d0_single_user_mode *sum = data;</div><div class='add'>+	u32 nlo = be32_to_cpu(sum-&gt;num_locking_objects);</div><div class='add'>+</div><div class='add'>+	if (nlo == 0) {</div><div class='add'>+		pr_err("Need at least one locking object.\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("Number of locking objects: %d\n", nlo);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 get_comid_v100(const void *data)</div><div class='add'>+{</div><div class='add'>+	const struct d0_opal_v100 *v100 = data;</div><div class='add'>+</div><div class='add'>+	return be16_to_cpu(v100-&gt;baseComID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 get_comid_v200(const void *data)</div><div class='add'>+{</div><div class='add'>+	const struct d0_opal_v200 *v200 = data;</div><div class='add'>+</div><div class='add'>+	return be16_to_cpu(v200-&gt;baseComID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_send_cmd(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;send_recv(dev-&gt;data, dev-&gt;comid, TCG_SECP_01,</div><div class='add'>+			      dev-&gt;cmd, IO_BUFFER_LENGTH,</div><div class='add'>+			      true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_recv_cmd(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;send_recv(dev-&gt;data, dev-&gt;comid, TCG_SECP_01,</div><div class='add'>+			      dev-&gt;resp, IO_BUFFER_LENGTH,</div><div class='add'>+			      false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_recv_check(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	size_t buflen = IO_BUFFER_LENGTH;</div><div class='add'>+	void *buffer = dev-&gt;resp;</div><div class='add'>+	struct opal_header *hdr = buffer;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		pr_debug("Sent OPAL command: outstanding=%d, minTransfer=%d\n",</div><div class='add'>+			 hdr-&gt;cp.outstandingData,</div><div class='add'>+			 hdr-&gt;cp.minTransfer);</div><div class='add'>+</div><div class='add'>+		if (hdr-&gt;cp.outstandingData == 0 ||</div><div class='add'>+		    hdr-&gt;cp.minTransfer != 0)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		memset(buffer, 0, buflen);</div><div class='add'>+		ret = opal_recv_cmd(dev);</div><div class='add'>+	} while (!ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_send_recv(struct opal_dev *dev, cont_fn *cont)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = opal_send_cmd(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = opal_recv_cmd(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = opal_recv_check(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return cont(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_geometry(struct opal_dev *dev, const void *data)</div><div class='add'>+{</div><div class='add'>+	const struct d0_geometry_features *geo = data;</div><div class='add'>+</div><div class='add'>+	dev-&gt;align = geo-&gt;alignment_granularity;</div><div class='add'>+	dev-&gt;lowest_lba = geo-&gt;lowest_aligned_lba;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int next(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step *step;</div><div class='add'>+	int state = 0, error = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		step = &amp;dev-&gt;steps[state];</div><div class='add'>+		if (!step-&gt;fn)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		error = step-&gt;fn(dev, step-&gt;data);</div><div class='add'>+		if (error) {</div><div class='add'>+			pr_err("Error on step function: %d with error %d: %s\n",</div><div class='add'>+			       state, error,</div><div class='add'>+			       opal_error_to_human(error));</div><div class='add'>+</div><div class='add'>+			/* For each OPAL command we do a discovery0 then we</div><div class='add'>+			 * start some sort of session.</div><div class='add'>+			 * If we haven't passed state 1 then there was an error</div><div class='add'>+			 * on discovery0 or during the attempt to start a</div><div class='add'>+			 * session. Therefore we shouldn't attempt to terminate</div><div class='add'>+			 * a session, as one has not yet been created.</div><div class='add'>+			 */</div><div class='add'>+			if (state &gt; 1) {</div><div class='add'>+				end_opal_session_error(dev);</div><div class='add'>+				return error;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+		state++;</div><div class='add'>+	} while (!error);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_discovery0_end(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	bool found_com_id = false, supported = true, single_user = false;</div><div class='add'>+	const struct d0_header *hdr = (struct d0_header *)dev-&gt;resp;</div><div class='add'>+	const u8 *epos = dev-&gt;resp, *cpos = dev-&gt;resp;</div><div class='add'>+	u16 comid = 0;</div><div class='add'>+	u32 hlen = be32_to_cpu(hdr-&gt;length);</div><div class='add'>+</div><div class='add'>+	print_buffer(dev-&gt;resp, hlen);</div><div class='add'>+</div><div class='add'>+	if (hlen &gt; IO_BUFFER_LENGTH - sizeof(*hdr)) {</div><div class='add'>+		pr_warn("Discovery length overflows buffer (%zu+%u)/%u\n",</div><div class='add'>+			sizeof(*hdr), hlen, IO_BUFFER_LENGTH);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	epos += hlen; /* end of buffer */</div><div class='add'>+	cpos += sizeof(*hdr); /* current position on buffer */</div><div class='add'>+</div><div class='add'>+	while (cpos &lt; epos &amp;&amp; supported) {</div><div class='add'>+		const struct d0_features *body =</div><div class='add'>+			(const struct d0_features *)cpos;</div><div class='add'>+</div><div class='add'>+		switch (be16_to_cpu(body-&gt;code)) {</div><div class='add'>+		case FC_TPER:</div><div class='add'>+			supported = check_tper(body-&gt;features);</div><div class='add'>+			break;</div><div class='add'>+		case FC_SINGLEUSER:</div><div class='add'>+			single_user = check_sum(body-&gt;features);</div><div class='add'>+			break;</div><div class='add'>+		case FC_GEOMETRY:</div><div class='add'>+			check_geometry(dev, body);</div><div class='add'>+			break;</div><div class='add'>+		case FC_LOCKING:</div><div class='add'>+		case FC_ENTERPRISE:</div><div class='add'>+		case FC_DATASTORE:</div><div class='add'>+			/* some ignored properties */</div><div class='add'>+			pr_debug("Found OPAL feature description: %d\n",</div><div class='add'>+				 be16_to_cpu(body-&gt;code));</div><div class='add'>+			break;</div><div class='add'>+		case FC_OPALV100:</div><div class='add'>+			comid = get_comid_v100(body-&gt;features);</div><div class='add'>+			found_com_id = true;</div><div class='add'>+			break;</div><div class='add'>+		case FC_OPALV200:</div><div class='add'>+			comid = get_comid_v200(body-&gt;features);</div><div class='add'>+			found_com_id = true;</div><div class='add'>+			break;</div><div class='add'>+		case 0xbfff ... 0xffff:</div><div class='add'>+			/* vendor specific, just ignore */</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			pr_debug("OPAL Unknown feature: %d\n",</div><div class='add'>+				 be16_to_cpu(body-&gt;code));</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+		cpos += body-&gt;length + 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!supported) {</div><div class='add'>+		pr_debug("This device is not Opal enabled. Not Supported!\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!single_user)</div><div class='add'>+		pr_debug("Device doesn't support single user mode\n");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (!found_com_id) {</div><div class='add'>+		pr_debug("Could not find OPAL comid for device. Returning early\n");</div><div class='add'>+		return -EOPNOTSUPP;;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;comid = comid;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_discovery0(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(dev-&gt;resp, 0, IO_BUFFER_LENGTH);</div><div class='add'>+	dev-&gt;comid = OPAL_DISCOVERY_COMID;</div><div class='add'>+	ret = opal_recv_cmd(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return opal_discovery0_end(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_token_u8(int *err, struct opal_dev *cmd, u8 tok)</div><div class='add'>+{</div><div class='add'>+	if (*err)</div><div class='add'>+		return;</div><div class='add'>+	if (cmd-&gt;pos &gt;= IO_BUFFER_LENGTH - 1) {</div><div class='add'>+		pr_err("Error adding u8: end of buffer.\n");</div><div class='add'>+		*err = -ERANGE;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	cmd-&gt;cmd[cmd-&gt;pos++] = tok;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_short_atom_header(struct opal_dev *cmd, bool bytestring,</div><div class='add'>+				  bool has_sign, int len)</div><div class='add'>+{</div><div class='add'>+	u8 atom;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	atom = SHORT_ATOM_ID;</div><div class='add'>+	atom |= bytestring ? SHORT_ATOM_BYTESTRING : 0;</div><div class='add'>+	atom |= has_sign ? SHORT_ATOM_SIGNED : 0;</div><div class='add'>+	atom |= len &amp; SHORT_ATOM_LEN_MASK;</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, cmd, atom);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_medium_atom_header(struct opal_dev *cmd, bool bytestring,</div><div class='add'>+				   bool has_sign, int len)</div><div class='add'>+{</div><div class='add'>+	u8 header0;</div><div class='add'>+</div><div class='add'>+	header0 = MEDIUM_ATOM_ID;</div><div class='add'>+	header0 |= bytestring ? MEDIUM_ATOM_BYTESTRING : 0;</div><div class='add'>+	header0 |= has_sign ? MEDIUM_ATOM_SIGNED : 0;</div><div class='add'>+	header0 |= (len &gt;&gt; 8) &amp; MEDIUM_ATOM_LEN_MASK;</div><div class='add'>+	cmd-&gt;cmd[cmd-&gt;pos++] = header0;</div><div class='add'>+	cmd-&gt;cmd[cmd-&gt;pos++] = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_token_u64(int *err, struct opal_dev *cmd, u64 number)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	size_t len;</div><div class='add'>+	int msb;</div><div class='add'>+	u8 n;</div><div class='add'>+</div><div class='add'>+	if (!(number &amp; ~TINY_ATOM_DATA_MASK)) {</div><div class='add'>+		add_token_u8(err, cmd, number);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msb = fls(number);</div><div class='add'>+	len = DIV_ROUND_UP(msb, 4);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;pos &gt;= IO_BUFFER_LENGTH - len - 1) {</div><div class='add'>+		pr_err("Error adding u64: end of buffer.\n");</div><div class='add'>+		*err = -ERANGE;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	add_short_atom_header(cmd, false, false, len);</div><div class='add'>+	while (len--) {</div><div class='add'>+		n = number &gt;&gt; (len * 8);</div><div class='add'>+		add_token_u8(err, cmd, n);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_token_bytestring(int *err, struct opal_dev *cmd,</div><div class='add'>+				 const u8 *bytestring, size_t len)</div><div class='add'>+{</div><div class='add'>+	size_t header_len = 1;</div><div class='add'>+	bool is_short_atom = true;</div><div class='add'>+</div><div class='add'>+	if (*err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (len &amp; ~SHORT_ATOM_LEN_MASK) {</div><div class='add'>+		header_len = 2;</div><div class='add'>+		is_short_atom = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len &gt;= IO_BUFFER_LENGTH - cmd-&gt;pos - header_len) {</div><div class='add'>+		pr_err("Error adding bytestring: end of buffer.\n");</div><div class='add'>+		*err = -ERANGE;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_short_atom)</div><div class='add'>+		add_short_atom_header(cmd, true, false, len);</div><div class='add'>+	else</div><div class='add'>+		add_medium_atom_header(cmd, true, false, len);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cmd-&gt;cmd[cmd-&gt;pos], bytestring, len);</div><div class='add'>+	cmd-&gt;pos += len;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int build_locking_range(u8 *buffer, size_t length, u8 lr)</div><div class='add'>+{</div><div class='add'>+	if (length &gt; OPAL_UID_LENGTH) {</div><div class='add'>+		pr_err("Can't build locking range. Length OOB\n");</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(buffer, opaluid[OPAL_LOCKINGRANGE_GLOBAL], OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	if (lr == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	buffer[5] = LOCKING_RANGE_NON_GLOBAL;</div><div class='add'>+	buffer[7] = lr;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int build_locking_user(u8 *buffer, size_t length, u8 lr)</div><div class='add'>+{</div><div class='add'>+	if (length &gt; OPAL_UID_LENGTH) {</div><div class='add'>+		pr_err("Can't build locking range user, Length OOB\n");</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(buffer, opaluid[OPAL_USER1_UID], OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	buffer[7] = lr + 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_comid(struct opal_dev *cmd, u16 comid)</div><div class='add'>+{</div><div class='add'>+	struct opal_header *hdr = (struct opal_header *)cmd-&gt;cmd;</div><div class='add'>+</div><div class='add'>+	hdr-&gt;cp.extendedComID[0] = comid &gt;&gt; 8;</div><div class='add'>+	hdr-&gt;cp.extendedComID[1] = comid;</div><div class='add'>+	hdr-&gt;cp.extendedComID[2] = 0;</div><div class='add'>+	hdr-&gt;cp.extendedComID[3] = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmd_finalize(struct opal_dev *cmd, u32 hsn, u32 tsn)</div><div class='add'>+{</div><div class='add'>+	struct opal_header *hdr;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, cmd, OPAL_ENDOFDATA);</div><div class='add'>+	add_token_u8(&amp;err, cmd, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, cmd, 0);</div><div class='add'>+	add_token_u8(&amp;err, cmd, 0);</div><div class='add'>+	add_token_u8(&amp;err, cmd, 0);</div><div class='add'>+	add_token_u8(&amp;err, cmd, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error finalizing command.\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (struct opal_header *) cmd-&gt;cmd;</div><div class='add'>+</div><div class='add'>+	hdr-&gt;pkt.tsn = cpu_to_be32(tsn);</div><div class='add'>+	hdr-&gt;pkt.hsn = cpu_to_be32(hsn);</div><div class='add'>+</div><div class='add'>+	hdr-&gt;subpkt.length = cpu_to_be32(cmd-&gt;pos - sizeof(*hdr));</div><div class='add'>+	while (cmd-&gt;pos % 4) {</div><div class='add'>+		if (cmd-&gt;pos &gt;= IO_BUFFER_LENGTH) {</div><div class='add'>+			pr_err("Error: Buffer overrun\n");</div><div class='add'>+			return -ERANGE;</div><div class='add'>+		}</div><div class='add'>+		cmd-&gt;cmd[cmd-&gt;pos++] = 0;</div><div class='add'>+	}</div><div class='add'>+	hdr-&gt;pkt.length = cpu_to_be32(cmd-&gt;pos - sizeof(hdr-&gt;cp) -</div><div class='add'>+				      sizeof(hdr-&gt;pkt));</div><div class='add'>+	hdr-&gt;cp.length = cpu_to_be32(cmd-&gt;pos - sizeof(hdr-&gt;cp));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct opal_resp_tok *response_get_token(</div><div class='add'>+				const struct parsed_resp *resp,</div><div class='add'>+				int n)</div><div class='add'>+{</div><div class='add'>+	const struct opal_resp_tok *tok;</div><div class='add'>+</div><div class='add'>+	if (n &gt;= resp-&gt;num) {</div><div class='add'>+		pr_err("Token number doesn't exist: %d, resp: %d\n",</div><div class='add'>+		       n, resp-&gt;num);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tok = &amp;resp-&gt;toks[n];</div><div class='add'>+	if (tok-&gt;len == 0) {</div><div class='add'>+		pr_err("Token length must be non-zero\n");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tok;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t response_parse_tiny(struct opal_resp_tok *tok,</div><div class='add'>+				   const u8 *pos)</div><div class='add'>+{</div><div class='add'>+	tok-&gt;pos = pos;</div><div class='add'>+	tok-&gt;len = 1;</div><div class='add'>+	tok-&gt;width = OPAL_WIDTH_TINY;</div><div class='add'>+</div><div class='add'>+	if (pos[0] &amp; TINY_ATOM_SIGNED) {</div><div class='add'>+		tok-&gt;type = OPAL_DTA_TOKENID_SINT;</div><div class='add'>+	} else {</div><div class='add'>+		tok-&gt;type = OPAL_DTA_TOKENID_UINT;</div><div class='add'>+		tok-&gt;stored.u = pos[0] &amp; 0x3f;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tok-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t response_parse_short(struct opal_resp_tok *tok,</div><div class='add'>+				    const u8 *pos)</div><div class='add'>+{</div><div class='add'>+	tok-&gt;pos = pos;</div><div class='add'>+	tok-&gt;len = (pos[0] &amp; SHORT_ATOM_LEN_MASK) + 1;</div><div class='add'>+	tok-&gt;width = OPAL_WIDTH_SHORT;</div><div class='add'>+</div><div class='add'>+	if (pos[0] &amp; SHORT_ATOM_BYTESTRING) {</div><div class='add'>+		tok-&gt;type = OPAL_DTA_TOKENID_BYTESTRING;</div><div class='add'>+	} else if (pos[0] &amp; SHORT_ATOM_SIGNED) {</div><div class='add'>+		tok-&gt;type = OPAL_DTA_TOKENID_SINT;</div><div class='add'>+	} else {</div><div class='add'>+		u64 u_integer = 0;</div><div class='add'>+		ssize_t i, b = 0;</div><div class='add'>+</div><div class='add'>+		tok-&gt;type = OPAL_DTA_TOKENID_UINT;</div><div class='add'>+		if (tok-&gt;len &gt; 9) {</div><div class='add'>+			pr_warn("uint64 with more than 8 bytes\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		for (i = tok-&gt;len - 1; i &gt; 0; i--) {</div><div class='add'>+			u_integer |= ((u64)pos[i] &lt;&lt; (8 * b));</div><div class='add'>+			b++;</div><div class='add'>+		}</div><div class='add'>+		tok-&gt;stored.u = u_integer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tok-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t response_parse_medium(struct opal_resp_tok *tok,</div><div class='add'>+				     const u8 *pos)</div><div class='add'>+{</div><div class='add'>+	tok-&gt;pos = pos;</div><div class='add'>+	tok-&gt;len = (((pos[0] &amp; MEDIUM_ATOM_LEN_MASK) &lt;&lt; 8) | pos[1]) + 2;</div><div class='add'>+	tok-&gt;width = OPAL_WIDTH_MEDIUM;</div><div class='add'>+</div><div class='add'>+	if (pos[0] &amp; MEDIUM_ATOM_BYTESTRING)</div><div class='add'>+		tok-&gt;type = OPAL_DTA_TOKENID_BYTESTRING;</div><div class='add'>+	else if (pos[0] &amp; MEDIUM_ATOM_SIGNED)</div><div class='add'>+		tok-&gt;type = OPAL_DTA_TOKENID_SINT;</div><div class='add'>+	else</div><div class='add'>+		tok-&gt;type = OPAL_DTA_TOKENID_UINT;</div><div class='add'>+</div><div class='add'>+	return tok-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t response_parse_long(struct opal_resp_tok *tok,</div><div class='add'>+				   const u8 *pos)</div><div class='add'>+{</div><div class='add'>+	tok-&gt;pos = pos;</div><div class='add'>+	tok-&gt;len = ((pos[1] &lt;&lt; 16) | (pos[2] &lt;&lt; 8) | pos[3]) + 4;</div><div class='add'>+	tok-&gt;width = OPAL_WIDTH_LONG;</div><div class='add'>+</div><div class='add'>+	if (pos[0] &amp; LONG_ATOM_BYTESTRING)</div><div class='add'>+		tok-&gt;type = OPAL_DTA_TOKENID_BYTESTRING;</div><div class='add'>+	else if (pos[0] &amp; LONG_ATOM_SIGNED)</div><div class='add'>+		tok-&gt;type = OPAL_DTA_TOKENID_SINT;</div><div class='add'>+	else</div><div class='add'>+		tok-&gt;type = OPAL_DTA_TOKENID_UINT;</div><div class='add'>+</div><div class='add'>+	return tok-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t response_parse_token(struct opal_resp_tok *tok,</div><div class='add'>+				    const u8 *pos)</div><div class='add'>+{</div><div class='add'>+	tok-&gt;pos = pos;</div><div class='add'>+	tok-&gt;len = 1;</div><div class='add'>+	tok-&gt;type = OPAL_DTA_TOKENID_TOKEN;</div><div class='add'>+	tok-&gt;width = OPAL_WIDTH_TOKEN;</div><div class='add'>+</div><div class='add'>+	return tok-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int response_parse(const u8 *buf, size_t length,</div><div class='add'>+			  struct parsed_resp *resp)</div><div class='add'>+{</div><div class='add'>+	const struct opal_header *hdr;</div><div class='add'>+	struct opal_resp_tok *iter;</div><div class='add'>+	int num_entries = 0;</div><div class='add'>+	int total;</div><div class='add'>+	ssize_t token_length;</div><div class='add'>+	const u8 *pos;</div><div class='add'>+	u32 clen, plen, slen;</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (!resp)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	hdr = (struct opal_header *)buf;</div><div class='add'>+	pos = buf;</div><div class='add'>+	pos += sizeof(*hdr);</div><div class='add'>+</div><div class='add'>+	clen = be32_to_cpu(hdr-&gt;cp.length);</div><div class='add'>+	plen = be32_to_cpu(hdr-&gt;pkt.length);</div><div class='add'>+	slen = be32_to_cpu(hdr-&gt;subpkt.length);</div><div class='add'>+	pr_debug("Response size: cp: %u, pkt: %u, subpkt: %u\n",</div><div class='add'>+		 clen, plen, slen);</div><div class='add'>+</div><div class='add'>+	if (clen == 0 || plen == 0 || slen == 0 ||</div><div class='add'>+	    slen &gt; IO_BUFFER_LENGTH - sizeof(*hdr)) {</div><div class='add'>+		pr_err("Bad header length. cp: %u, pkt: %u, subpkt: %u\n",</div><div class='add'>+		       clen, plen, slen);</div><div class='add'>+		print_buffer(pos, sizeof(*hdr));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pos &gt; buf + length)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	iter = resp-&gt;toks;</div><div class='add'>+	total = slen;</div><div class='add'>+	print_buffer(pos, total);</div><div class='add'>+	while (total &gt; 0) {</div><div class='add'>+		if (pos[0] &lt;= TINY_ATOM_BYTE) /* tiny atom */</div><div class='add'>+			token_length = response_parse_tiny(iter, pos);</div><div class='add'>+		else if (pos[0] &lt;= SHORT_ATOM_BYTE) /* short atom */</div><div class='add'>+			token_length = response_parse_short(iter, pos);</div><div class='add'>+		else if (pos[0] &lt;= MEDIUM_ATOM_BYTE) /* medium atom */</div><div class='add'>+			token_length = response_parse_medium(iter, pos);</div><div class='add'>+		else if (pos[0] &lt;= LONG_ATOM_BYTE) /* long atom */</div><div class='add'>+			token_length = response_parse_long(iter, pos);</div><div class='add'>+		else /* TOKEN */</div><div class='add'>+			token_length = response_parse_token(iter, pos);</div><div class='add'>+</div><div class='add'>+		if (token_length &lt; 0)</div><div class='add'>+			return token_length;</div><div class='add'>+</div><div class='add'>+		pos += token_length;</div><div class='add'>+		total -= token_length;</div><div class='add'>+		iter++;</div><div class='add'>+		num_entries++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_entries == 0) {</div><div class='add'>+		pr_err("Couldn't parse response.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	resp-&gt;num = num_entries;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t response_get_string(const struct parsed_resp *resp, int n,</div><div class='add'>+				  const char **store)</div><div class='add'>+{</div><div class='add'>+	*store = NULL;</div><div class='add'>+	if (!resp) {</div><div class='add'>+		pr_err("Response is NULL\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (n &gt; resp-&gt;num) {</div><div class='add'>+		pr_err("Response has %d tokens. Can't access %d\n",</div><div class='add'>+		       resp-&gt;num, n);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp-&gt;toks[n].type != OPAL_DTA_TOKENID_BYTESTRING) {</div><div class='add'>+		pr_err("Token is not a byte string!\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*store = resp-&gt;toks[n].pos + 1;</div><div class='add'>+	return resp-&gt;toks[n].len - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 response_get_u64(const struct parsed_resp *resp, int n)</div><div class='add'>+{</div><div class='add'>+	if (!resp) {</div><div class='add'>+		pr_err("Response is NULL\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (n &gt; resp-&gt;num) {</div><div class='add'>+		pr_err("Response has %d tokens. Can't access %d\n",</div><div class='add'>+		       resp-&gt;num, n);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp-&gt;toks[n].type != OPAL_DTA_TOKENID_UINT) {</div><div class='add'>+		pr_err("Token is not unsigned it: %d\n",</div><div class='add'>+		       resp-&gt;toks[n].type);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(resp-&gt;toks[n].width == OPAL_WIDTH_TINY ||</div><div class='add'>+	      resp-&gt;toks[n].width == OPAL_WIDTH_SHORT)) {</div><div class='add'>+		pr_err("Atom is not short or tiny: %d\n",</div><div class='add'>+		       resp-&gt;toks[n].width);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return resp-&gt;toks[n].stored.u;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool response_token_matches(const struct opal_resp_tok *token, u8 match)</div><div class='add'>+{</div><div class='add'>+	if (IS_ERR(token) ||</div><div class='add'>+	    token-&gt;type != OPAL_DTA_TOKENID_TOKEN ||</div><div class='add'>+	    token-&gt;pos[0] != match)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 response_status(const struct parsed_resp *resp)</div><div class='add'>+{</div><div class='add'>+	const struct opal_resp_tok *tok;</div><div class='add'>+</div><div class='add'>+	tok = response_get_token(resp, 0);</div><div class='add'>+	if (response_token_matches(tok, OPAL_ENDOFSESSION))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (resp-&gt;num &lt; 5)</div><div class='add'>+		return DTAERROR_NO_METHOD_STATUS;</div><div class='add'>+</div><div class='add'>+	tok = response_get_token(resp, resp-&gt;num - 5);</div><div class='add'>+	if (!response_token_matches(tok, OPAL_STARTLIST))</div><div class='add'>+		return DTAERROR_NO_METHOD_STATUS;</div><div class='add'>+</div><div class='add'>+	tok = response_get_token(resp, resp-&gt;num - 1);</div><div class='add'>+	if (!response_token_matches(tok, OPAL_ENDLIST))</div><div class='add'>+		return DTAERROR_NO_METHOD_STATUS;</div><div class='add'>+</div><div class='add'>+	return response_get_u64(resp, resp-&gt;num - 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Parses and checks for errors */</div><div class='add'>+static int parse_and_check_status(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	print_buffer(dev-&gt;cmd, dev-&gt;pos);</div><div class='add'>+</div><div class='add'>+	error = response_parse(dev-&gt;resp, IO_BUFFER_LENGTH, &amp;dev-&gt;parsed);</div><div class='add'>+	if (error) {</div><div class='add'>+		pr_err("Couldn't parse response.\n");</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return response_status(&amp;dev-&gt;parsed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clear_opal_cmd(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;pos = sizeof(struct opal_header);</div><div class='add'>+	memset(dev-&gt;cmd, 0, IO_BUFFER_LENGTH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int start_opal_session_cont(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 hsn, tsn;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	error = parse_and_check_status(dev);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	hsn = response_get_u64(&amp;dev-&gt;parsed, 4);</div><div class='add'>+	tsn = response_get_u64(&amp;dev-&gt;parsed, 5);</div><div class='add'>+</div><div class='add'>+	if (hsn == 0 &amp;&amp; tsn == 0) {</div><div class='add'>+		pr_err("Couldn't authenticate session\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;hsn = hsn;</div><div class='add'>+	dev-&gt;tsn = tsn;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_suspend_info(struct opal_dev *dev,</div><div class='add'>+			     struct opal_suspend_data *sus)</div><div class='add'>+{</div><div class='add'>+	struct opal_suspend_data *iter;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(iter, &amp;dev-&gt;unlk_lst, node) {</div><div class='add'>+		if (iter-&gt;lr == sus-&gt;lr) {</div><div class='add'>+			list_del(&amp;iter-&gt;node);</div><div class='add'>+			kfree(iter);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	list_add_tail(&amp;sus-&gt;node, &amp;dev-&gt;unlk_lst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int end_session_cont(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;hsn = 0;</div><div class='add'>+	dev-&gt;tsn = 0;</div><div class='add'>+	return parse_and_check_status(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int finalize_and_send(struct opal_dev *dev, cont_fn cont)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cmd_finalize(dev, dev-&gt;hsn, dev-&gt;tsn);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Error finalizing command buffer: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	print_buffer(dev-&gt;cmd, dev-&gt;pos);</div><div class='add'>+</div><div class='add'>+	return opal_send_recv(dev, cont);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gen_key(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	const u8 *method;</div><div class='add'>+	u8 uid[OPAL_UID_LENGTH];</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	memcpy(uid, dev-&gt;prev_data, min(sizeof(uid), dev-&gt;prev_d_len));</div><div class='add'>+	method = opalmethod[OPAL_GENKEY];</div><div class='add'>+	kfree(dev-&gt;prev_data);</div><div class='add'>+	dev-&gt;prev_data = NULL;</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_GENKEY],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building gen key command\n");</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_active_key_cont(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	const char *activekey;</div><div class='add'>+	size_t keylen;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	error = parse_and_check_status(dev);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+	keylen = response_get_string(&amp;dev-&gt;parsed, 4, &amp;activekey);</div><div class='add'>+	if (!activekey) {</div><div class='add'>+		pr_err("%s: Couldn't extract the Activekey from the response\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		return OPAL_INVAL_PARAM;</div><div class='add'>+	}</div><div class='add'>+	dev-&gt;prev_data = kmemdup(activekey, keylen, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;prev_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;prev_d_len = keylen;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_active_key(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 uid[OPAL_UID_LENGTH];</div><div class='add'>+	int err = 0;</div><div class='add'>+	u8 *lr = data;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	err = build_locking_range(uid, sizeof(uid), *lr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_GET], OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 3); /* startCloumn */</div><div class='add'>+	add_token_u8(&amp;err, dev, 10); /* ActiveKey */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 4); /* endColumn */</div><div class='add'>+	add_token_u8(&amp;err, dev, 10); /* ActiveKey */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building get active key command\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, get_active_key_cont);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int generic_lr_enable_disable(struct opal_dev *dev,</div><div class='add'>+				     u8 *uid, bool rle, bool wle,</div><div class='add'>+				     bool rl, bool wl)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET], OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 5); /* ReadLockEnabled */</div><div class='add'>+	add_token_u8(&amp;err, dev, rle);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 6); /* WriteLockEnabled */</div><div class='add'>+	add_token_u8(&amp;err, dev, wle);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_READLOCKED);</div><div class='add'>+	add_token_u8(&amp;err, dev, rl);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_WRITELOCKED);</div><div class='add'>+	add_token_u8(&amp;err, dev, wl);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int enable_global_lr(struct opal_dev *dev, u8 *uid,</div><div class='add'>+				   struct opal_user_lr_setup *setup)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = generic_lr_enable_disable(dev, uid, !!setup-&gt;RLE, !!setup-&gt;WLE,</div><div class='add'>+					0, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		pr_err("Failed to create enable global lr command\n");</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_locking_range(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 uid[OPAL_UID_LENGTH];</div><div class='add'>+	struct opal_user_lr_setup *setup = data;</div><div class='add'>+	u8 lr;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	lr = setup-&gt;session.opal_key.lr;</div><div class='add'>+	err = build_locking_range(uid, sizeof(uid), lr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (lr == 0)</div><div class='add'>+		err = enable_global_lr(dev, uid, setup);</div><div class='add'>+	else {</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+		add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='add'>+		add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET],</div><div class='add'>+				     OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, 3); /* Ranges Start */</div><div class='add'>+		add_token_u64(&amp;err, dev, setup-&gt;range_start);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, 4); /* Ranges length */</div><div class='add'>+		add_token_u64(&amp;err, dev, setup-&gt;range_length);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, 5); /*ReadLockEnabled */</div><div class='add'>+		add_token_u64(&amp;err, dev, !!setup-&gt;RLE);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, 6); /*WriteLockEnabled*/</div><div class='add'>+		add_token_u64(&amp;err, dev, !!setup-&gt;WLE);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building Setup Locking range command.\n");</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int start_generic_opal_session(struct opal_dev *dev,</div><div class='add'>+				      enum opal_uid auth,</div><div class='add'>+				      enum opal_uid sp_type,</div><div class='add'>+				      const char *key,</div><div class='add'>+				      u8 key_len)</div><div class='add'>+{</div><div class='add'>+	u32 hsn;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (key == NULL &amp;&amp; auth != OPAL_ANYBODY_UID) {</div><div class='add'>+		pr_err("%s: Attempted to open ADMIN_SP Session without a Host" \</div><div class='add'>+		       "Challenge, and not as the Anybody UID\n", __func__);</div><div class='add'>+		return OPAL_INVAL_PARAM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+	hsn = GENERIC_HOST_SESSION_NUM;</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opaluid[OPAL_SMUID_UID],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_STARTSESSION],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u64(&amp;err, dev, hsn);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opaluid[sp_type], OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, 1);</div><div class='add'>+</div><div class='add'>+	switch (auth) {</div><div class='add'>+	case OPAL_ANYBODY_UID:</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+		break;</div><div class='add'>+	case OPAL_ADMIN1_UID:</div><div class='add'>+	case OPAL_SID_UID:</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, 0); /* HostChallenge */</div><div class='add'>+		add_token_bytestring(&amp;err, dev, key, key_len);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, 3); /* HostSignAuth */</div><div class='add'>+		add_token_bytestring(&amp;err, dev, opaluid[auth],</div><div class='add'>+				     OPAL_UID_LENGTH);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("Cannot start Admin SP session with auth %d\n", auth);</div><div class='add'>+		return OPAL_INVAL_PARAM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building start adminsp session command.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, start_opal_session_cont);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int start_anybodyASP_opal_session(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	return start_generic_opal_session(dev, OPAL_ANYBODY_UID,</div><div class='add'>+					  OPAL_ADMINSP_UID, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int start_SIDASP_opal_session(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	const u8 *key = dev-&gt;prev_data;</div><div class='add'>+</div><div class='add'>+	if (!key) {</div><div class='add'>+		const struct opal_key *okey = data;</div><div class='add'>+		ret = start_generic_opal_session(dev, OPAL_SID_UID,</div><div class='add'>+						 OPAL_ADMINSP_UID,</div><div class='add'>+						 okey-&gt;key,</div><div class='add'>+						 okey-&gt;key_len);</div><div class='add'>+	} else {</div><div class='add'>+		ret = start_generic_opal_session(dev, OPAL_SID_UID,</div><div class='add'>+						 OPAL_ADMINSP_UID,</div><div class='add'>+						 key, dev-&gt;prev_d_len);</div><div class='add'>+		kfree(key);</div><div class='add'>+		dev-&gt;prev_data = NULL;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int start_admin1LSP_opal_session(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct opal_key *key = data;</div><div class='add'>+	return start_generic_opal_session(dev, OPAL_ADMIN1_UID,</div><div class='add'>+					  OPAL_LOCKINGSP_UID,</div><div class='add'>+					  key-&gt;key, key-&gt;key_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int start_auth_opal_session(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct opal_session_info *session = data;</div><div class='add'>+	u8 lk_ul_user[OPAL_UID_LENGTH];</div><div class='add'>+	size_t keylen = session-&gt;opal_key.key_len;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	u8 *key = session-&gt;opal_key.key;</div><div class='add'>+	u32 hsn = GENERIC_HOST_SESSION_NUM;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	if (session-&gt;sum) {</div><div class='add'>+		err = build_locking_user(lk_ul_user, sizeof(lk_ul_user),</div><div class='add'>+					 session-&gt;opal_key.lr);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+	} else if (session-&gt;who != OPAL_ADMIN1 &amp;&amp; !session-&gt;sum) {</div><div class='add'>+		err = build_locking_user(lk_ul_user, sizeof(lk_ul_user),</div><div class='add'>+					 session-&gt;who - 1);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else</div><div class='add'>+		memcpy(lk_ul_user, opaluid[OPAL_ADMIN1_UID], OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opaluid[OPAL_SMUID_UID],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_STARTSESSION],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u64(&amp;err, dev, hsn);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opaluid[OPAL_LOCKINGSP_UID],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, 1);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 0);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, key, keylen);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 3);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, lk_ul_user, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building STARTSESSION command.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, start_opal_session_cont);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int revert_tper(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opaluid[OPAL_ADMINSP_UID],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_REVERT],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building REVERT TPER command.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int internal_activate_user(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct opal_session_info *session = data;</div><div class='add'>+	u8 uid[OPAL_UID_LENGTH];</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	memcpy(uid, opaluid[OPAL_USER1_UID], OPAL_UID_LENGTH);</div><div class='add'>+	uid[7] = session-&gt;who;</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET], OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 5); /* Enabled */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_TRUE);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building Activate UserN command.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int erase_locking_range(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct opal_session_info *session = data;</div><div class='add'>+	u8 uid[OPAL_UID_LENGTH];</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	if (build_locking_range(uid, sizeof(uid), session-&gt;opal_key.lr) &lt; 0)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, uid, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_ERASE],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building Erase Locking Range Command.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_mbr_done(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 *mbr_done_tf = data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opaluid[OPAL_MBRCONTROL],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET], OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 2); /* Done */</div><div class='add'>+	add_token_u8(&amp;err, dev, *mbr_done_tf); /* Done T or F */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error Building set MBR Done command\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_mbr_enable_disable(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 *mbr_en_dis = data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opaluid[OPAL_MBRCONTROL],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET], OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 1);</div><div class='add'>+	add_token_u8(&amp;err, dev, *mbr_en_dis);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error Building set MBR done command\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int generic_pw_cmd(u8 *key, size_t key_len, u8 *cpin_uid,</div><div class='add'>+			  struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, cpin_uid, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 3); /* PIN */</div><div class='add'>+	add_token_bytestring(&amp;err, dev, key, key_len);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_new_pw(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 cpin_uid[OPAL_UID_LENGTH];</div><div class='add'>+	struct opal_session_info *usr = data;</div><div class='add'>+</div><div class='add'>+	memcpy(cpin_uid, opaluid[OPAL_C_PIN_ADMIN1], OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	if (usr-&gt;who != OPAL_ADMIN1) {</div><div class='add'>+		cpin_uid[5] = 0x03;</div><div class='add'>+		if (usr-&gt;sum)</div><div class='add'>+			cpin_uid[7] = usr-&gt;opal_key.lr + 1;</div><div class='add'>+		else</div><div class='add'>+			cpin_uid[7] = usr-&gt;who;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (generic_pw_cmd(usr-&gt;opal_key.key, usr-&gt;opal_key.key_len,</div><div class='add'>+			   cpin_uid, dev)) {</div><div class='add'>+		pr_err("Error building set password command.\n");</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_sid_cpin_pin(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 cpin_uid[OPAL_UID_LENGTH];</div><div class='add'>+	struct opal_key *key = data;</div><div class='add'>+</div><div class='add'>+	memcpy(cpin_uid, opaluid[OPAL_C_PIN_SID], OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	if (generic_pw_cmd(key-&gt;key, key-&gt;key_len, cpin_uid, dev)) {</div><div class='add'>+		pr_err("Error building Set SID cpin\n");</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_user_to_lr(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 lr_buffer[OPAL_UID_LENGTH];</div><div class='add'>+	u8 user_uid[OPAL_UID_LENGTH];</div><div class='add'>+	struct opal_lock_unlock *lkul = data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	memcpy(lr_buffer, opaluid[OPAL_LOCKINGRANGE_ACE_RDLOCKED],</div><div class='add'>+	       OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	if (lkul-&gt;l_state == OPAL_RW)</div><div class='add'>+		memcpy(lr_buffer, opaluid[OPAL_LOCKINGRANGE_ACE_WRLOCKED],</div><div class='add'>+		       OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	lr_buffer[7] = lkul-&gt;session.opal_key.lr;</div><div class='add'>+</div><div class='add'>+	memcpy(user_uid, opaluid[OPAL_USER1_UID], OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	user_uid[7] = lkul-&gt;session.who;</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, lr_buffer, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 3);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_bytestring(&amp;err, dev,</div><div class='add'>+			     opaluid[OPAL_HALF_UID_AUTHORITY_OBJ_REF],</div><div class='add'>+			     OPAL_UID_LENGTH/2);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, user_uid, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_bytestring(&amp;err, dev,</div><div class='add'>+			     opaluid[OPAL_HALF_UID_AUTHORITY_OBJ_REF],</div><div class='add'>+			     OPAL_UID_LENGTH/2);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, user_uid, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opaluid[OPAL_HALF_UID_BOOLEAN_ACE],</div><div class='add'>+			     OPAL_UID_LENGTH/2);</div><div class='add'>+	add_token_u8(&amp;err, dev, 1);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building add user to locking range command.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lock_unlock_locking_range(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 lr_buffer[OPAL_UID_LENGTH];</div><div class='add'>+	const u8 *method;</div><div class='add'>+	struct opal_lock_unlock *lkul = data;</div><div class='add'>+	u8 read_locked = 1, write_locked = 1;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	method = opalmethod[OPAL_SET];</div><div class='add'>+	if (build_locking_range(lr_buffer, sizeof(lr_buffer),</div><div class='add'>+				lkul-&gt;session.opal_key.lr) &lt; 0)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	switch (lkul-&gt;l_state) {</div><div class='add'>+	case OPAL_RO:</div><div class='add'>+		read_locked = 0;</div><div class='add'>+		write_locked = 1;</div><div class='add'>+		break;</div><div class='add'>+	case OPAL_RW:</div><div class='add'>+		read_locked = 0;</div><div class='add'>+		write_locked = 0;</div><div class='add'>+		break;</div><div class='add'>+	case OPAL_LK:</div><div class='add'>+		/* vars are initalized to locked */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("Tried to set an invalid locking state... returning to uland\n");</div><div class='add'>+		return OPAL_INVAL_PARAM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, lr_buffer, OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_SET], OPAL_UID_LENGTH);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_VALUES);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_READLOCKED);</div><div class='add'>+	add_token_u8(&amp;err, dev, read_locked);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_WRITELOCKED);</div><div class='add'>+	add_token_u8(&amp;err, dev, write_locked);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building SET command.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int lock_unlock_locking_range_sum(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 lr_buffer[OPAL_UID_LENGTH];</div><div class='add'>+	u8 read_locked = 1, write_locked = 1;</div><div class='add'>+	const u8 *method;</div><div class='add'>+	struct opal_lock_unlock *lkul = data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	method = opalmethod[OPAL_SET];</div><div class='add'>+	if (build_locking_range(lr_buffer, sizeof(lr_buffer),</div><div class='add'>+				lkul-&gt;session.opal_key.lr) &lt; 0)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	switch (lkul-&gt;l_state) {</div><div class='add'>+	case OPAL_RO:</div><div class='add'>+		read_locked = 0;</div><div class='add'>+		write_locked = 1;</div><div class='add'>+		break;</div><div class='add'>+	case OPAL_RW:</div><div class='add'>+		read_locked = 0;</div><div class='add'>+		write_locked = 0;</div><div class='add'>+		break;</div><div class='add'>+	case OPAL_LK:</div><div class='add'>+		/* vars are initalized to locked */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("Tried to set an invalid locking state.\n");</div><div class='add'>+		return OPAL_INVAL_PARAM;</div><div class='add'>+	}</div><div class='add'>+	ret = generic_lr_enable_disable(dev, lr_buffer, 1, 1,</div><div class='add'>+					read_locked, write_locked);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("Error building SET command.\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int activate_lsp(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct opal_lr_act *opal_act = data;</div><div class='add'>+	u8 user_lr[OPAL_UID_LENGTH];</div><div class='add'>+	u8 uint_3 = 0x83;</div><div class='add'>+	int err = 0, i;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opaluid[OPAL_LOCKINGSP_UID],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_ACTIVATE],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (opal_act-&gt;sum) {</div><div class='add'>+		err = build_locking_range(user_lr, sizeof(user_lr),</div><div class='add'>+					  opal_act-&gt;lr[0]);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, uint_3);</div><div class='add'>+		add_token_u8(&amp;err, dev, 6);</div><div class='add'>+		add_token_u8(&amp;err, dev, 0);</div><div class='add'>+		add_token_u8(&amp;err, dev, 0);</div><div class='add'>+</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+		add_token_bytestring(&amp;err, dev, user_lr, OPAL_UID_LENGTH);</div><div class='add'>+		for (i = 1; i &lt; opal_act-&gt;num_lrs; i++) {</div><div class='add'>+			user_lr[7] = opal_act-&gt;lr[i];</div><div class='add'>+			add_token_bytestring(&amp;err, dev, user_lr, OPAL_UID_LENGTH);</div><div class='add'>+		}</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+		add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building Activate LockingSP command.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, parse_and_check_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_lsp_lifecycle_cont(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u8 lc_status;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	error = parse_and_check_status(dev);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	lc_status = response_get_u64(&amp;dev-&gt;parsed, 4);</div><div class='add'>+	/* 0x08 is Manufacured Inactive */</div><div class='add'>+	/* 0x09 is Manufactured */</div><div class='add'>+	if (lc_status != OPAL_MANUFACTURED_INACTIVE) {</div><div class='add'>+		pr_err("Couldn't determine the status of the Lifcycle state\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Determine if we're in the Manufactured Inactive or Active state */</div><div class='add'>+static int get_lsp_lifecycle(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opaluid[OPAL_LOCKINGSP_UID],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_GET], OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 3); /* Start Column */</div><div class='add'>+	add_token_u8(&amp;err, dev, 6); /* Lifecycle Column */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 4); /* End Column */</div><div class='add'>+	add_token_u8(&amp;err, dev, 6); /* Lifecycle Column */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error Building GET Lifecycle Status command\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, get_lsp_lifecycle_cont);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_msid_cpin_pin_cont(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	const char *msid_pin;</div><div class='add'>+	size_t strlen;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	error = parse_and_check_status(dev);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	strlen = response_get_string(&amp;dev-&gt;parsed, 4, &amp;msid_pin);</div><div class='add'>+	if (!msid_pin) {</div><div class='add'>+		pr_err("%s: Couldn't extract PIN from response\n", __func__);</div><div class='add'>+		return OPAL_INVAL_PARAM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;prev_data = kmemdup(msid_pin, strlen, GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;prev_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;prev_d_len = strlen;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_msid_cpin_pin(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_CALL);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opaluid[OPAL_C_PIN_MSID],</div><div class='add'>+			     OPAL_UID_LENGTH);</div><div class='add'>+	add_token_bytestring(&amp;err, dev, opalmethod[OPAL_GET], OPAL_UID_LENGTH);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTLIST);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 3); /* Start Column */</div><div class='add'>+	add_token_u8(&amp;err, dev, 3); /* PIN */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_STARTNAME);</div><div class='add'>+	add_token_u8(&amp;err, dev, 4); /* End Column */</div><div class='add'>+	add_token_u8(&amp;err, dev, 3); /* Lifecycle Column */</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDNAME);</div><div class='add'>+</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDLIST);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("Error building Get MSID CPIN PIN command.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return finalize_and_send(dev, get_msid_cpin_pin_cont);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int end_opal_session(struct opal_dev *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	clear_opal_cmd(dev);</div><div class='add'>+	set_comid(dev, dev-&gt;comid);</div><div class='add'>+	add_token_u8(&amp;err, dev, OPAL_ENDOFSESSION);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return finalize_and_send(dev, end_session_cont);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int end_opal_session_error(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step error_end_session[] = {</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	dev-&gt;steps = error_end_session;</div><div class='add'>+	return next(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void setup_opal_dev(struct opal_dev *dev,</div><div class='add'>+				  const struct opal_step *steps)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;steps = steps;</div><div class='add'>+	dev-&gt;tsn = 0;</div><div class='add'>+	dev-&gt;hsn = 0;</div><div class='add'>+	dev-&gt;prev_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_opal_support(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, steps);</div><div class='add'>+	ret = next(dev);</div><div class='add'>+	dev-&gt;supported = !ret;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clean_opal_dev(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct opal_suspend_data *suspend, *next;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	list_for_each_entry_safe(suspend, next, &amp;dev-&gt;unlk_lst, node) {</div><div class='add'>+		list_del(&amp;suspend-&gt;node);</div><div class='add'>+		kfree(suspend);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void free_opal_dev(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='add'>+	clean_opal_dev(dev);</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(free_opal_dev);</div><div class='add'>+</div><div class='add'>+struct opal_dev *init_opal_dev(void *data, sec_send_recv *send_recv)</div><div class='add'>+{</div><div class='add'>+	struct opal_dev *dev;</div><div class='add'>+</div><div class='add'>+	dev = kmalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;unlk_lst);</div><div class='add'>+	mutex_init(&amp;dev-&gt;dev_lock);</div><div class='add'>+	dev-&gt;data = data;</div><div class='add'>+	dev-&gt;send_recv = send_recv;</div><div class='add'>+	if (check_opal_support(dev) != 0) {</div><div class='add'>+		pr_debug("Opal is not supported on this device\n");</div><div class='add'>+		kfree(dev);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(init_opal_dev);</div><div class='add'>+</div><div class='add'>+static int opal_secure_erase_locking_range(struct opal_dev *dev,</div><div class='add'>+					   struct opal_session_info *opal_session)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step erase_steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_auth_opal_session, opal_session },</div><div class='add'>+		{ get_active_key, &amp;opal_session-&gt;opal_key.lr },</div><div class='add'>+		{ gen_key, },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, erase_steps);</div><div class='add'>+	ret = next(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_erase_locking_range(struct opal_dev *dev,</div><div class='add'>+				    struct opal_session_info *opal_session)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step erase_steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_auth_opal_session, opal_session },</div><div class='add'>+		{ erase_locking_range, opal_session },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, erase_steps);</div><div class='add'>+	ret = next(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_enable_disable_shadow_mbr(struct opal_dev *dev,</div><div class='add'>+					  struct opal_mbr_data *opal_mbr)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step mbr_steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_admin1LSP_opal_session, &amp;opal_mbr-&gt;key },</div><div class='add'>+		{ set_mbr_done, &amp;opal_mbr-&gt;enable_disable },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ start_admin1LSP_opal_session, &amp;opal_mbr-&gt;key },</div><div class='add'>+		{ set_mbr_enable_disable, &amp;opal_mbr-&gt;enable_disable },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (opal_mbr-&gt;enable_disable != OPAL_MBR_ENABLE &amp;&amp;</div><div class='add'>+	    opal_mbr-&gt;enable_disable != OPAL_MBR_DISABLE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, mbr_steps);</div><div class='add'>+	ret = next(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_save(struct opal_dev *dev, struct opal_lock_unlock *lk_unlk)</div><div class='add'>+{</div><div class='add'>+	struct opal_suspend_data *suspend;</div><div class='add'>+</div><div class='add'>+	suspend = kzalloc(sizeof(*suspend), GFP_KERNEL);</div><div class='add'>+	if (!suspend)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	suspend-&gt;unlk = *lk_unlk;</div><div class='add'>+	suspend-&gt;lr = lk_unlk-&gt;session.opal_key.lr;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, NULL);</div><div class='add'>+	add_suspend_info(dev, suspend);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_add_user_to_lr(struct opal_dev *dev,</div><div class='add'>+			       struct opal_lock_unlock *lk_unlk)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_admin1LSP_opal_session, &amp;lk_unlk-&gt;session.opal_key },</div><div class='add'>+		{ add_user_to_lr, lk_unlk },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (lk_unlk-&gt;l_state != OPAL_RO &amp;&amp;</div><div class='add'>+	    lk_unlk-&gt;l_state != OPAL_RW) {</div><div class='add'>+		pr_err("Locking state was not RO or RW\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (lk_unlk-&gt;session.who &lt; OPAL_USER1 &amp;&amp;</div><div class='add'>+	    lk_unlk-&gt;session.who &gt; OPAL_USER9) {</div><div class='add'>+		pr_err("Authority was not within the range of users: %d\n",</div><div class='add'>+		       lk_unlk-&gt;session.who);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (lk_unlk-&gt;session.sum) {</div><div class='add'>+		pr_err("%s not supported in sum. Use setup locking range\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, steps);</div><div class='add'>+	ret = next(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_reverttper(struct opal_dev *dev, struct opal_key *opal)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step revert_steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_SIDASP_opal_session, opal },</div><div class='add'>+		{ revert_tper, }, /* controller will terminate session */</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, revert_steps);</div><div class='add'>+	ret = next(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we successfully reverted lets clean</div><div class='add'>+	 * any saved locking ranges.</div><div class='add'>+	 */</div><div class='add'>+	if (!ret)</div><div class='add'>+		clean_opal_dev(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __opal_lock_unlock(struct opal_dev *dev,</div><div class='add'>+			      struct opal_lock_unlock *lk_unlk)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step unlock_steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_auth_opal_session, &amp;lk_unlk-&gt;session },</div><div class='add'>+		{ lock_unlock_locking_range, lk_unlk },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	const struct opal_step unlock_sum_steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_auth_opal_session, &amp;lk_unlk-&gt;session },</div><div class='add'>+		{ lock_unlock_locking_range_sum, lk_unlk },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dev-&gt;steps = lk_unlk-&gt;session.sum ? unlock_sum_steps : unlock_steps;</div><div class='add'>+	return next(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_lock_unlock(struct opal_dev *dev,</div><div class='add'>+			    struct opal_lock_unlock *lk_unlk)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (lk_unlk-&gt;session.who &lt; OPAL_ADMIN1 ||</div><div class='add'>+	    lk_unlk-&gt;session.who &gt; OPAL_USER9)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	ret = __opal_lock_unlock(dev, lk_unlk);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_take_ownership(struct opal_dev *dev, struct opal_key *opal)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step owner_steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_anybodyASP_opal_session, },</div><div class='add'>+		{ get_msid_cpin_pin, },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ start_SIDASP_opal_session, opal },</div><div class='add'>+		{ set_sid_cpin_pin, opal },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, owner_steps);</div><div class='add'>+	ret = next(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_activate_lsp(struct opal_dev *dev, struct opal_lr_act *opal_lr_act)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step active_steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_SIDASP_opal_session, &amp;opal_lr_act-&gt;key },</div><div class='add'>+		{ get_lsp_lifecycle, },</div><div class='add'>+		{ activate_lsp, opal_lr_act },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!opal_lr_act-&gt;num_lrs || opal_lr_act-&gt;num_lrs &gt; OPAL_MAX_LRS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, active_steps);</div><div class='add'>+	ret = next(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_setup_locking_range(struct opal_dev *dev,</div><div class='add'>+				    struct opal_user_lr_setup *opal_lrs)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step lr_steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_auth_opal_session, &amp;opal_lrs-&gt;session },</div><div class='add'>+		{ setup_locking_range, opal_lrs },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, lr_steps);</div><div class='add'>+	ret = next(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_set_new_pw(struct opal_dev *dev, struct opal_new_pw *opal_pw)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step pw_steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_auth_opal_session, &amp;opal_pw-&gt;session },</div><div class='add'>+		{ set_new_pw, &amp;opal_pw-&gt;new_user_pw },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (opal_pw-&gt;session.who &lt; OPAL_ADMIN1 ||</div><div class='add'>+	    opal_pw-&gt;session.who &gt; OPAL_USER9  ||</div><div class='add'>+	    opal_pw-&gt;new_user_pw.who &lt; OPAL_ADMIN1 ||</div><div class='add'>+	    opal_pw-&gt;new_user_pw.who &gt; OPAL_USER9)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, pw_steps);</div><div class='add'>+	ret = next(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opal_activate_user(struct opal_dev *dev,</div><div class='add'>+			      struct opal_session_info *opal_session)</div><div class='add'>+{</div><div class='add'>+	const struct opal_step act_steps[] = {</div><div class='add'>+		{ opal_discovery0, },</div><div class='add'>+		{ start_admin1LSP_opal_session, &amp;opal_session-&gt;opal_key },</div><div class='add'>+		{ internal_activate_user, opal_session },</div><div class='add'>+		{ end_opal_session, },</div><div class='add'>+		{ NULL, }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* We can't activate Admin1 it's active as manufactured */</div><div class='add'>+	if (opal_session-&gt;who &lt; OPAL_USER1 &amp;&amp;</div><div class='add'>+	    opal_session-&gt;who &gt; OPAL_USER9) {</div><div class='add'>+		pr_err("Who was not a valid user: %d\n", opal_session-&gt;who);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, act_steps);</div><div class='add'>+	ret = next(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool opal_unlock_from_suspend(struct opal_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct opal_suspend_data *suspend;</div><div class='add'>+	bool was_failure = false;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return false;</div><div class='add'>+	if (!dev-&gt;supported)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	setup_opal_dev(dev, NULL);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(suspend, &amp;dev-&gt;unlk_lst, node) {</div><div class='add'>+		dev-&gt;tsn = 0;</div><div class='add'>+		dev-&gt;hsn = 0;</div><div class='add'>+</div><div class='add'>+		ret = __opal_lock_unlock(dev, &amp;suspend-&gt;unlk);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_warn("Failed to unlock LR %hhu with sum %d\n",</div><div class='add'>+				suspend-&gt;unlk.session.opal_key.lr,</div><div class='add'>+				suspend-&gt;unlk.session.sum);</div><div class='add'>+			was_failure = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;dev_lock);</div><div class='add'>+	return was_failure;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(opal_unlock_from_suspend);</div><div class='add'>+</div><div class='add'>+int sed_ioctl(struct opal_dev *dev, unsigned int cmd, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	void *p;</div><div class='add'>+	int ret = -ENOTTY;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EACCES;</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	if (!dev-&gt;supported) {</div><div class='add'>+		pr_err("Not supported\n");</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = memdup_user(arg, _IOC_SIZE(cmd));</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case IOC_OPAL_SAVE:</div><div class='add'>+		ret = opal_save(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	case IOC_OPAL_LOCK_UNLOCK:</div><div class='add'>+		ret = opal_lock_unlock(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	case IOC_OPAL_TAKE_OWNERSHIP:</div><div class='add'>+		ret = opal_take_ownership(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	case IOC_OPAL_ACTIVATE_LSP:</div><div class='add'>+		ret = opal_activate_lsp(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	case IOC_OPAL_SET_PW:</div><div class='add'>+		ret = opal_set_new_pw(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	case IOC_OPAL_ACTIVATE_USR:</div><div class='add'>+		ret = opal_activate_user(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	case IOC_OPAL_REVERT_TPR:</div><div class='add'>+		ret = opal_reverttper(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	case IOC_OPAL_LR_SETUP:</div><div class='add'>+		ret = opal_setup_locking_range(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	case IOC_OPAL_ADD_USR_TO_LR:</div><div class='add'>+		ret = opal_add_user_to_lr(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	case IOC_OPAL_ENABLE_DISABLE_MBR:</div><div class='add'>+		ret = opal_enable_disable_shadow_mbr(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	case IOC_OPAL_ERASE_LR:</div><div class='add'>+		ret = opal_erase_locking_range(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	case IOC_OPAL_SECURE_ERASE_LR:</div><div class='add'>+		ret = opal_secure_erase_locking_range(dev, p);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_warn("No such Opal Ioctl %u\n", cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(p);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sed_ioctl);</div><div class='head'>diff --git a/crypto/842.c b/crypto/842.c<br/>index 98e387efb8c8..bc26dc942821 100644<br/>--- a/<a href='/drm-misc/tree/crypto/842.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/842.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/842.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/842.c</a></div><div class='hunk'>@@ -31,11 +31,46 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/sw842.h&gt;</div><div class='add'>+#include &lt;crypto/internal/scompress.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct crypto842_ctx {</div><div class='del'>-	char wmem[SW842_MEM_COMPRESS];	/* working memory for compress */</div><div class='add'>+	void *wmem;	/* working memory for compress */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void *crypto842_alloc_ctx(struct crypto_scomp *tfm)</div><div class='add'>+{</div><div class='add'>+	void *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kmalloc(SW842_MEM_COMPRESS, GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crypto842_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct crypto842_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;wmem = crypto842_alloc_ctx(NULL);</div><div class='add'>+	if (IS_ERR(ctx-&gt;wmem))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto842_free_ctx(struct crypto_scomp *tfm, void *ctx)</div><div class='add'>+{</div><div class='add'>+	kfree(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto842_exit(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct crypto842_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	crypto842_free_ctx(NULL, ctx-&gt;wmem);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int crypto842_compress(struct crypto_tfm *tfm,</div><div class='ctx'> 			      const u8 *src, unsigned int slen,</div><div class='ctx'> 			      u8 *dst, unsigned int *dlen)</div><div class='hunk'>@@ -45,6 +80,13 @@ static int crypto842_compress(struct crypto_tfm *tfm,</div><div class='ctx'> 	return sw842_compress(src, slen, dst, dlen, ctx-&gt;wmem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int crypto842_scompress(struct crypto_scomp *tfm,</div><div class='add'>+			       const u8 *src, unsigned int slen,</div><div class='add'>+			       u8 *dst, unsigned int *dlen, void *ctx)</div><div class='add'>+{</div><div class='add'>+	return sw842_compress(src, slen, dst, dlen, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int crypto842_decompress(struct crypto_tfm *tfm,</div><div class='ctx'> 				const u8 *src, unsigned int slen,</div><div class='ctx'> 				u8 *dst, unsigned int *dlen)</div><div class='hunk'>@@ -52,6 +94,13 @@ static int crypto842_decompress(struct crypto_tfm *tfm,</div><div class='ctx'> 	return sw842_decompress(src, slen, dst, dlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int crypto842_sdecompress(struct crypto_scomp *tfm,</div><div class='add'>+				 const u8 *src, unsigned int slen,</div><div class='add'>+				 u8 *dst, unsigned int *dlen, void *ctx)</div><div class='add'>+{</div><div class='add'>+	return sw842_decompress(src, slen, dst, dlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct crypto_alg alg = {</div><div class='ctx'> 	.cra_name		= "842",</div><div class='ctx'> 	.cra_driver_name	= "842-generic",</div><div class='hunk'>@@ -59,20 +108,48 @@ static struct crypto_alg alg = {</div><div class='ctx'> 	.cra_flags		= CRYPTO_ALG_TYPE_COMPRESS,</div><div class='ctx'> 	.cra_ctxsize		= sizeof(struct crypto842_ctx),</div><div class='ctx'> 	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_init		= crypto842_init,</div><div class='add'>+	.cra_exit		= crypto842_exit,</div><div class='ctx'> 	.cra_u			= { .compress = {</div><div class='ctx'> 	.coa_compress		= crypto842_compress,</div><div class='ctx'> 	.coa_decompress		= crypto842_decompress } }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct scomp_alg scomp = {</div><div class='add'>+	.alloc_ctx		= crypto842_alloc_ctx,</div><div class='add'>+	.free_ctx		= crypto842_free_ctx,</div><div class='add'>+	.compress		= crypto842_scompress,</div><div class='add'>+	.decompress		= crypto842_sdecompress,</div><div class='add'>+	.base			= {</div><div class='add'>+		.cra_name	= "842",</div><div class='add'>+		.cra_driver_name = "842-scomp",</div><div class='add'>+		.cra_priority	 = 100,</div><div class='add'>+		.cra_module	 = THIS_MODULE,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init crypto842_mod_init(void)</div><div class='ctx'> {</div><div class='del'>-	return crypto_register_alg(&amp;alg);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_alg(&amp;alg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_scomp(&amp;scomp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		crypto_unregister_alg(&amp;alg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> module_init(crypto842_mod_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit crypto842_mod_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	crypto_unregister_alg(&amp;alg);</div><div class='add'>+	crypto_unregister_scomp(&amp;scomp);</div><div class='ctx'> }</div><div class='ctx'> module_exit(crypto842_mod_exit);</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/Kconfig b/crypto/Kconfig<br/>index 84d71482bf08..f37e9cca50e1 100644<br/>--- a/<a href='/drm-misc/tree/crypto/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/crypto/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/Kconfig</a></div><div class='hunk'>@@ -24,7 +24,7 @@ comment "Crypto core or helper"</div><div class='ctx'> config CRYPTO_FIPS</div><div class='ctx'> 	bool "FIPS 200 compliance"</div><div class='ctx'> 	depends on (CRYPTO_ANSI_CPRNG || CRYPTO_DRBG) &amp;&amp; !CRYPTO_MANAGER_DISABLE_TESTS</div><div class='del'>-	depends on MODULE_SIG</div><div class='add'>+	depends on (MODULE_SIG || !MODULES)</div><div class='ctx'> 	help</div><div class='ctx'> 	  This options enables the fips boot option which is</div><div class='ctx'> 	  required if you want to system to operate in a FIPS 200</div><div class='hunk'>@@ -102,6 +102,15 @@ config CRYPTO_KPP</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='ctx'> 	select CRYPTO_KPP2</div><div class='ctx'> </div><div class='add'>+config CRYPTO_ACOMP2</div><div class='add'>+	tristate</div><div class='add'>+	select CRYPTO_ALGAPI2</div><div class='add'>+</div><div class='add'>+config CRYPTO_ACOMP</div><div class='add'>+	tristate</div><div class='add'>+	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_ACOMP2</div><div class='add'>+</div><div class='ctx'> config CRYPTO_RSA</div><div class='ctx'> 	tristate "RSA algorithm"</div><div class='ctx'> 	select CRYPTO_AKCIPHER</div><div class='hunk'>@@ -138,6 +147,7 @@ config CRYPTO_MANAGER2</div><div class='ctx'> 	select CRYPTO_BLKCIPHER2</div><div class='ctx'> 	select CRYPTO_AKCIPHER2</div><div class='ctx'> 	select CRYPTO_KPP2</div><div class='add'>+	select CRYPTO_ACOMP2</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_USER</div><div class='ctx'> 	tristate "Userspace cryptographic algorithm configuration"</div><div class='hunk'>@@ -236,10 +246,14 @@ config CRYPTO_ABLK_HELPER</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select CRYPTO_CRYPTD</div><div class='ctx'> </div><div class='add'>+config CRYPTO_SIMD</div><div class='add'>+	tristate</div><div class='add'>+	select CRYPTO_CRYPTD</div><div class='add'>+</div><div class='ctx'> config CRYPTO_GLUE_HELPER_X86</div><div class='ctx'> 	tristate</div><div class='ctx'> 	depends on X86</div><div class='del'>-	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_BLKCIPHER</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_ENGINE</div><div class='ctx'> 	tristate</div><div class='hunk'>@@ -249,6 +263,7 @@ comment "Authenticated Encryption with Associated Data"</div><div class='ctx'> config CRYPTO_CCM</div><div class='ctx'> 	tristate "CCM support"</div><div class='ctx'> 	select CRYPTO_CTR</div><div class='add'>+	select CRYPTO_HASH</div><div class='ctx'> 	select CRYPTO_AEAD</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Counter with CBC MAC. Required for IPsec.</div><div class='hunk'>@@ -360,6 +375,7 @@ config CRYPTO_XTS</div><div class='ctx'> 	select CRYPTO_BLKCIPHER</div><div class='ctx'> 	select CRYPTO_MANAGER</div><div class='ctx'> 	select CRYPTO_GF128MUL</div><div class='add'>+	select CRYPTO_ECB</div><div class='ctx'> 	help</div><div class='ctx'> 	  XTS: IEEE1619/D16 narrow block cipher use with aes-xts-plain,</div><div class='ctx'> 	  key size 256, 384 or 512 bits. This implementation currently</div><div class='hunk'>@@ -437,7 +453,7 @@ config CRYPTO_CRC32C_INTEL</div><div class='ctx'> 	  gain performance compared with software implementation.</div><div class='ctx'> 	  Module will be crc32c-intel.</div><div class='ctx'> </div><div class='del'>-config CRYPT_CRC32C_VPMSUM</div><div class='add'>+config CRYPTO_CRC32C_VPMSUM</div><div class='ctx'> 	tristate "CRC32c CRC algorithm (powerpc64)"</div><div class='ctx'> 	depends on PPC64 &amp;&amp; ALTIVEC</div><div class='ctx'> 	select CRYPTO_HASH</div><div class='hunk'>@@ -881,6 +897,23 @@ config CRYPTO_AES</div><div class='ctx'> </div><div class='ctx'> 	  See &lt;http://csrc.nist.gov/CryptoToolkit/aes/&gt; for more information.</div><div class='ctx'> </div><div class='add'>+config CRYPTO_AES_TI</div><div class='add'>+	tristate "Fixed time AES cipher"</div><div class='add'>+	select CRYPTO_ALGAPI</div><div class='add'>+	help</div><div class='add'>+	  This is a generic implementation of AES that attempts to eliminate</div><div class='add'>+	  data dependent latencies as much as possible without affecting</div><div class='add'>+	  performance too much. It is intended for use by the generic CCM</div><div class='add'>+	  and GCM drivers, and other CTR or CMAC/XCBC based modes that rely</div><div class='add'>+	  solely on encryption (although decryption is supported as well, but</div><div class='add'>+	  with a more dramatic performance hit)</div><div class='add'>+</div><div class='add'>+	  Instead of using 16 lookup tables of 1 KB each, (8 for encryption and</div><div class='add'>+	  8 for decryption), this implementation only uses just two S-boxes of</div><div class='add'>+	  256 bytes each, and attempts to eliminate data dependent latencies by</div><div class='add'>+	  prefetching the entire table into the cache at the start of each</div><div class='add'>+	  block.</div><div class='add'>+</div><div class='ctx'> config CRYPTO_AES_586</div><div class='ctx'> 	tristate "AES cipher algorithms (i586)"</div><div class='ctx'> 	depends on (X86 || UML_X86) &amp;&amp; !64BIT</div><div class='hunk'>@@ -928,14 +961,13 @@ config CRYPTO_AES_X86_64</div><div class='ctx'> config CRYPTO_AES_NI_INTEL</div><div class='ctx'> 	tristate "AES cipher algorithms (AES-NI)"</div><div class='ctx'> 	depends on X86</div><div class='add'>+	select CRYPTO_AEAD</div><div class='ctx'> 	select CRYPTO_AES_X86_64 if 64BIT</div><div class='ctx'> 	select CRYPTO_AES_586 if !64BIT</div><div class='del'>-	select CRYPTO_CRYPTD</div><div class='del'>-	select CRYPTO_ABLK_HELPER</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_BLKCIPHER</div><div class='ctx'> 	select CRYPTO_GLUE_HELPER_X86 if 64BIT</div><div class='del'>-	select CRYPTO_LRW</div><div class='del'>-	select CRYPTO_XTS</div><div class='add'>+	select CRYPTO_SIMD</div><div class='ctx'> 	help</div><div class='ctx'> 	  Use Intel AES-NI instructions for AES algorithm.</div><div class='ctx'> </div><div class='hunk'>@@ -1568,6 +1600,7 @@ comment "Compression"</div><div class='ctx'> config CRYPTO_DEFLATE</div><div class='ctx'> 	tristate "Deflate compression algorithm"</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_ACOMP2</div><div class='ctx'> 	select ZLIB_INFLATE</div><div class='ctx'> 	select ZLIB_DEFLATE</div><div class='ctx'> 	help</div><div class='hunk'>@@ -1579,6 +1612,7 @@ config CRYPTO_DEFLATE</div><div class='ctx'> config CRYPTO_LZO</div><div class='ctx'> 	tristate "LZO compression algorithm"</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_ACOMP2</div><div class='ctx'> 	select LZO_COMPRESS</div><div class='ctx'> 	select LZO_DECOMPRESS</div><div class='ctx'> 	help</div><div class='hunk'>@@ -1587,6 +1621,7 @@ config CRYPTO_LZO</div><div class='ctx'> config CRYPTO_842</div><div class='ctx'> 	tristate "842 compression algorithm"</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_ACOMP2</div><div class='ctx'> 	select 842_COMPRESS</div><div class='ctx'> 	select 842_DECOMPRESS</div><div class='ctx'> 	help</div><div class='hunk'>@@ -1595,6 +1630,7 @@ config CRYPTO_842</div><div class='ctx'> config CRYPTO_LZ4</div><div class='ctx'> 	tristate "LZ4 compression algorithm"</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_ACOMP2</div><div class='ctx'> 	select LZ4_COMPRESS</div><div class='ctx'> 	select LZ4_DECOMPRESS</div><div class='ctx'> 	help</div><div class='hunk'>@@ -1603,6 +1639,7 @@ config CRYPTO_LZ4</div><div class='ctx'> config CRYPTO_LZ4HC</div><div class='ctx'> 	tristate "LZ4HC compression algorithm"</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_ACOMP2</div><div class='ctx'> 	select LZ4HC_COMPRESS</div><div class='ctx'> 	select LZ4_DECOMPRESS</div><div class='ctx'> 	help</div><div class='head'>diff --git a/crypto/Makefile b/crypto/Makefile<br/>index bd6a029094e6..8a44057240d5 100644<br/>--- a/<a href='/drm-misc/tree/crypto/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/Makefile</a></div><div class='hunk'>@@ -51,6 +51,10 @@ rsa_generic-y += rsa_helper.o</div><div class='ctx'> rsa_generic-y += rsa-pkcs1pad.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_RSA) += rsa_generic.o</div><div class='ctx'> </div><div class='add'>+crypto_acompress-y := acompress.o</div><div class='add'>+crypto_acompress-y += scompress.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_ACOMP2) += crypto_acompress.o</div><div class='add'>+</div><div class='ctx'> cryptomgr-y := algboss.o testmgr.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o</div><div class='hunk'>@@ -71,6 +75,7 @@ obj-$(CONFIG_CRYPTO_SHA256) += sha256_generic.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SHA512) += sha512_generic.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SHA3) += sha3_generic.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_WP512) += wp512.o</div><div class='add'>+CFLAGS_wp512.o := $(call cc-option,-fno-schedule-insns)  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149</div><div class='ctx'> obj-$(CONFIG_CRYPTO_TGR192) += tgr192.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_GF128MUL) += gf128mul.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_ECB) += ecb.o</div><div class='hunk'>@@ -94,7 +99,9 @@ obj-$(CONFIG_CRYPTO_BLOWFISH_COMMON) += blowfish_common.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o</div><div class='add'>+CFLAGS_serpent_generic.o := $(call cc-option,-fsched-pressure)  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149</div><div class='ctx'> obj-$(CONFIG_CRYPTO_AES) += aes_generic.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_AES_TI) += aes_ti.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia_generic.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_CAST_COMMON) += cast_common.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_CAST5) += cast5_generic.o</div><div class='hunk'>@@ -139,3 +146,5 @@ obj-$(CONFIG_ASYNC_CORE) += async_tx/</div><div class='ctx'> obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/</div><div class='ctx'> obj-$(CONFIG_CRYPTO_HASH_INFO) += hash_info.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_ABLK_HELPER) += ablk_helper.o</div><div class='add'>+crypto_simd-y := simd.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_SIMD) += crypto_simd.o</div><div class='head'>diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c<br/>index d676fc59521a..d880a4897159 100644<br/>--- a/<a href='/drm-misc/tree/crypto/ablkcipher.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/ablkcipher.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/ablkcipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/ablkcipher.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/cryptouser.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='hunk'>@@ -394,7 +395,7 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='del'>-	__attribute__ ((unused));</div><div class='add'>+	__maybe_unused;</div><div class='ctx'> static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	struct ablkcipher_alg *ablkcipher = &amp;alg-&gt;cra_ablkcipher;</div><div class='hunk'>@@ -468,7 +469,7 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void crypto_givcipher_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='del'>-	__attribute__ ((unused));</div><div class='add'>+	__maybe_unused;</div><div class='ctx'> static void crypto_givcipher_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	struct ablkcipher_alg *ablkcipher = &amp;alg-&gt;cra_ablkcipher;</div><div class='head'>diff --git a/crypto/acompress.c b/crypto/acompress.c<br/>new file mode 100644<br/>index 000000000000..47d11627cd20<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/crypto/acompress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/acompress.c</a></div><div class='hunk'>@@ -0,0 +1,170 @@</div><div class='add'>+/*</div><div class='add'>+ * Asynchronous Compression operations</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016, Intel Corporation</div><div class='add'>+ * Authors: Weigang Li &lt;weigang.li@intel.com&gt;</div><div class='add'>+ *          Giovanni Cabiddu &lt;giovanni.cabiddu@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;linux/cryptouser.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;crypto/internal/acompress.h&gt;</div><div class='add'>+#include &lt;crypto/internal/scompress.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+static const struct crypto_type crypto_acomp_type;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET</div><div class='add'>+static int crypto_acomp_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	struct crypto_report_acomp racomp;</div><div class='add'>+</div><div class='add'>+	strncpy(racomp.type, "acomp", sizeof(racomp.type));</div><div class='add'>+</div><div class='add'>+	if (nla_put(skb, CRYPTOCFGA_REPORT_ACOMP,</div><div class='add'>+		    sizeof(struct crypto_report_acomp), &amp;racomp))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int crypto_acomp_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void crypto_acomp_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='add'>+	__maybe_unused;</div><div class='add'>+</div><div class='add'>+static void crypto_acomp_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	seq_puts(m, "type         : acomp\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto_acomp_exit_tfm(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct crypto_acomp *acomp = __crypto_acomp_tfm(tfm);</div><div class='add'>+	struct acomp_alg *alg = crypto_acomp_alg(acomp);</div><div class='add'>+</div><div class='add'>+	alg-&gt;exit(acomp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crypto_acomp_init_tfm(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct crypto_acomp *acomp = __crypto_acomp_tfm(tfm);</div><div class='add'>+	struct acomp_alg *alg = crypto_acomp_alg(acomp);</div><div class='add'>+</div><div class='add'>+	if (tfm-&gt;__crt_alg-&gt;cra_type != &amp;crypto_acomp_type)</div><div class='add'>+		return crypto_init_scomp_ops_async(tfm);</div><div class='add'>+</div><div class='add'>+	acomp-&gt;compress = alg-&gt;compress;</div><div class='add'>+	acomp-&gt;decompress = alg-&gt;decompress;</div><div class='add'>+	acomp-&gt;dst_free = alg-&gt;dst_free;</div><div class='add'>+	acomp-&gt;reqsize = alg-&gt;reqsize;</div><div class='add'>+</div><div class='add'>+	if (alg-&gt;exit)</div><div class='add'>+		acomp-&gt;base.exit = crypto_acomp_exit_tfm;</div><div class='add'>+</div><div class='add'>+	if (alg-&gt;init)</div><div class='add'>+		return alg-&gt;init(acomp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int crypto_acomp_extsize(struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	int extsize = crypto_alg_extsize(alg);</div><div class='add'>+</div><div class='add'>+	if (alg-&gt;cra_type != &amp;crypto_acomp_type)</div><div class='add'>+		extsize += sizeof(struct crypto_scomp *);</div><div class='add'>+</div><div class='add'>+	return extsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct crypto_type crypto_acomp_type = {</div><div class='add'>+	.extsize = crypto_acomp_extsize,</div><div class='add'>+	.init_tfm = crypto_acomp_init_tfm,</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	.show = crypto_acomp_show,</div><div class='add'>+#endif</div><div class='add'>+	.report = crypto_acomp_report,</div><div class='add'>+	.maskclear = ~CRYPTO_ALG_TYPE_MASK,</div><div class='add'>+	.maskset = CRYPTO_ALG_TYPE_ACOMPRESS_MASK,</div><div class='add'>+	.type = CRYPTO_ALG_TYPE_ACOMPRESS,</div><div class='add'>+	.tfmsize = offsetof(struct crypto_acomp, base),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct crypto_acomp *crypto_alloc_acomp(const char *alg_name, u32 type,</div><div class='add'>+					u32 mask)</div><div class='add'>+{</div><div class='add'>+	return crypto_alloc_tfm(alg_name, &amp;crypto_acomp_type, type, mask);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_alloc_acomp);</div><div class='add'>+</div><div class='add'>+struct acomp_req *acomp_request_alloc(struct crypto_acomp *acomp)</div><div class='add'>+{</div><div class='add'>+	struct crypto_tfm *tfm = crypto_acomp_tfm(acomp);</div><div class='add'>+	struct acomp_req *req;</div><div class='add'>+</div><div class='add'>+	req = __acomp_request_alloc(acomp);</div><div class='add'>+	if (req &amp;&amp; (tfm-&gt;__crt_alg-&gt;cra_type != &amp;crypto_acomp_type))</div><div class='add'>+		return crypto_acomp_scomp_alloc_ctx(req);</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(acomp_request_alloc);</div><div class='add'>+</div><div class='add'>+void acomp_request_free(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_acomp *acomp = crypto_acomp_reqtfm(req);</div><div class='add'>+	struct crypto_tfm *tfm = crypto_acomp_tfm(acomp);</div><div class='add'>+</div><div class='add'>+	if (tfm-&gt;__crt_alg-&gt;cra_type != &amp;crypto_acomp_type)</div><div class='add'>+		crypto_acomp_scomp_free_ctx(req);</div><div class='add'>+</div><div class='add'>+	if (req-&gt;flags &amp; CRYPTO_ACOMP_ALLOC_OUTPUT) {</div><div class='add'>+		acomp-&gt;dst_free(req-&gt;dst);</div><div class='add'>+		req-&gt;dst = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__acomp_request_free(req);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(acomp_request_free);</div><div class='add'>+</div><div class='add'>+int crypto_register_acomp(struct acomp_alg *alg)</div><div class='add'>+{</div><div class='add'>+	struct crypto_alg *base = &amp;alg-&gt;base;</div><div class='add'>+</div><div class='add'>+	base-&gt;cra_type = &amp;crypto_acomp_type;</div><div class='add'>+	base-&gt;cra_flags &amp;= ~CRYPTO_ALG_TYPE_MASK;</div><div class='add'>+	base-&gt;cra_flags |= CRYPTO_ALG_TYPE_ACOMPRESS;</div><div class='add'>+</div><div class='add'>+	return crypto_register_alg(base);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_register_acomp);</div><div class='add'>+</div><div class='add'>+int crypto_unregister_acomp(struct acomp_alg *alg)</div><div class='add'>+{</div><div class='add'>+	return crypto_unregister_alg(&amp;alg-&gt;base);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_unregister_acomp);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Asynchronous compression type");</div><div class='head'>diff --git a/crypto/aead.c b/crypto/aead.c<br/>index 3f5c5ff004ab..f794b30a9407 100644<br/>--- a/<a href='/drm-misc/tree/crypto/aead.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/aead.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/aead.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/aead.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/cryptouser.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -132,7 +133,7 @@ static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='del'>-	__attribute__ ((unused));</div><div class='add'>+	__maybe_unused;</div><div class='ctx'> static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	struct aead_alg *aead = container_of(alg, struct aead_alg, base);</div><div class='head'>diff --git a/crypto/aes_generic.c b/crypto/aes_generic.c<br/>index 3dd101144a58..ca554d57d01e 100644<br/>--- a/<a href='/drm-misc/tree/crypto/aes_generic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/aes_generic.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/aes_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/aes_generic.c</a></div><div class='hunk'>@@ -54,6 +54,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline u8 byte(const u32 x, const unsigned n)</div><div class='ctx'> {</div><div class='hunk'>@@ -1216,7 +1217,6 @@ EXPORT_SYMBOL_GPL(crypto_il_tab);</div><div class='ctx'> int crypto_aes_expand_key(struct crypto_aes_ctx *ctx, const u8 *in_key,</div><div class='ctx'> 		unsigned int key_len)</div><div class='ctx'> {</div><div class='del'>-	const __le32 *key = (const __le32 *)in_key;</div><div class='ctx'> 	u32 i, t, u, v, w, j;</div><div class='ctx'> </div><div class='ctx'> 	if (key_len != AES_KEYSIZE_128 &amp;&amp; key_len != AES_KEYSIZE_192 &amp;&amp;</div><div class='hunk'>@@ -1225,10 +1225,15 @@ int crypto_aes_expand_key(struct crypto_aes_ctx *ctx, const u8 *in_key,</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;key_length = key_len;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;key_dec[key_len + 24] = ctx-&gt;key_enc[0] = le32_to_cpu(key[0]);</div><div class='del'>-	ctx-&gt;key_dec[key_len + 25] = ctx-&gt;key_enc[1] = le32_to_cpu(key[1]);</div><div class='del'>-	ctx-&gt;key_dec[key_len + 26] = ctx-&gt;key_enc[2] = le32_to_cpu(key[2]);</div><div class='del'>-	ctx-&gt;key_dec[key_len + 27] = ctx-&gt;key_enc[3] = le32_to_cpu(key[3]);</div><div class='add'>+	ctx-&gt;key_enc[0] = get_unaligned_le32(in_key);</div><div class='add'>+	ctx-&gt;key_enc[1] = get_unaligned_le32(in_key + 4);</div><div class='add'>+	ctx-&gt;key_enc[2] = get_unaligned_le32(in_key + 8);</div><div class='add'>+	ctx-&gt;key_enc[3] = get_unaligned_le32(in_key + 12);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;key_dec[key_len + 24] = ctx-&gt;key_enc[0];</div><div class='add'>+	ctx-&gt;key_dec[key_len + 25] = ctx-&gt;key_enc[1];</div><div class='add'>+	ctx-&gt;key_dec[key_len + 26] = ctx-&gt;key_enc[2];</div><div class='add'>+	ctx-&gt;key_dec[key_len + 27] = ctx-&gt;key_enc[3];</div><div class='ctx'> </div><div class='ctx'> 	switch (key_len) {</div><div class='ctx'> 	case AES_KEYSIZE_128:</div><div class='hunk'>@@ -1238,17 +1243,17 @@ int crypto_aes_expand_key(struct crypto_aes_ctx *ctx, const u8 *in_key,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AES_KEYSIZE_192:</div><div class='del'>-		ctx-&gt;key_enc[4] = le32_to_cpu(key[4]);</div><div class='del'>-		t = ctx-&gt;key_enc[5] = le32_to_cpu(key[5]);</div><div class='add'>+		ctx-&gt;key_enc[4] = get_unaligned_le32(in_key + 16);</div><div class='add'>+		t = ctx-&gt;key_enc[5] = get_unaligned_le32(in_key + 20);</div><div class='ctx'> 		for (i = 0; i &lt; 8; ++i)</div><div class='ctx'> 			loop6(i);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AES_KEYSIZE_256:</div><div class='del'>-		ctx-&gt;key_enc[4] = le32_to_cpu(key[4]);</div><div class='del'>-		ctx-&gt;key_enc[5] = le32_to_cpu(key[5]);</div><div class='del'>-		ctx-&gt;key_enc[6] = le32_to_cpu(key[6]);</div><div class='del'>-		t = ctx-&gt;key_enc[7] = le32_to_cpu(key[7]);</div><div class='add'>+		ctx-&gt;key_enc[4] = get_unaligned_le32(in_key + 16);</div><div class='add'>+		ctx-&gt;key_enc[5] = get_unaligned_le32(in_key + 20);</div><div class='add'>+		ctx-&gt;key_enc[6] = get_unaligned_le32(in_key + 24);</div><div class='add'>+		t = ctx-&gt;key_enc[7] = get_unaligned_le32(in_key + 28);</div><div class='ctx'> 		for (i = 0; i &lt; 6; ++i)</div><div class='ctx'> 			loop8(i);</div><div class='ctx'> 		loop8tophalf(i);</div><div class='hunk'>@@ -1329,16 +1334,14 @@ EXPORT_SYMBOL_GPL(crypto_aes_set_key);</div><div class='ctx'> static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='ctx'> 	const struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	const __le32 *src = (const __le32 *)in;</div><div class='del'>-	__le32 *dst = (__le32 *)out;</div><div class='ctx'> 	u32 b0[4], b1[4];</div><div class='ctx'> 	const u32 *kp = ctx-&gt;key_enc + 4;</div><div class='ctx'> 	const int key_len = ctx-&gt;key_length;</div><div class='ctx'> </div><div class='del'>-	b0[0] = le32_to_cpu(src[0]) ^ ctx-&gt;key_enc[0];</div><div class='del'>-	b0[1] = le32_to_cpu(src[1]) ^ ctx-&gt;key_enc[1];</div><div class='del'>-	b0[2] = le32_to_cpu(src[2]) ^ ctx-&gt;key_enc[2];</div><div class='del'>-	b0[3] = le32_to_cpu(src[3]) ^ ctx-&gt;key_enc[3];</div><div class='add'>+	b0[0] = ctx-&gt;key_enc[0] ^ get_unaligned_le32(in);</div><div class='add'>+	b0[1] = ctx-&gt;key_enc[1] ^ get_unaligned_le32(in + 4);</div><div class='add'>+	b0[2] = ctx-&gt;key_enc[2] ^ get_unaligned_le32(in + 8);</div><div class='add'>+	b0[3] = ctx-&gt;key_enc[3] ^ get_unaligned_le32(in + 12);</div><div class='ctx'> </div><div class='ctx'> 	if (key_len &gt; 24) {</div><div class='ctx'> 		f_nround(b1, b0, kp);</div><div class='hunk'>@@ -1361,10 +1364,10 @@ static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> 	f_nround(b1, b0, kp);</div><div class='ctx'> 	f_lround(b0, b1, kp);</div><div class='ctx'> </div><div class='del'>-	dst[0] = cpu_to_le32(b0[0]);</div><div class='del'>-	dst[1] = cpu_to_le32(b0[1]);</div><div class='del'>-	dst[2] = cpu_to_le32(b0[2]);</div><div class='del'>-	dst[3] = cpu_to_le32(b0[3]);</div><div class='add'>+	put_unaligned_le32(b0[0], out);</div><div class='add'>+	put_unaligned_le32(b0[1], out + 4);</div><div class='add'>+	put_unaligned_le32(b0[2], out + 8);</div><div class='add'>+	put_unaligned_le32(b0[3], out + 12);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* decrypt a block of text */</div><div class='hunk'>@@ -1401,16 +1404,14 @@ static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='ctx'> 	const struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	const __le32 *src = (const __le32 *)in;</div><div class='del'>-	__le32 *dst = (__le32 *)out;</div><div class='ctx'> 	u32 b0[4], b1[4];</div><div class='ctx'> 	const int key_len = ctx-&gt;key_length;</div><div class='ctx'> 	const u32 *kp = ctx-&gt;key_dec + 4;</div><div class='ctx'> </div><div class='del'>-	b0[0] = le32_to_cpu(src[0]) ^  ctx-&gt;key_dec[0];</div><div class='del'>-	b0[1] = le32_to_cpu(src[1]) ^  ctx-&gt;key_dec[1];</div><div class='del'>-	b0[2] = le32_to_cpu(src[2]) ^  ctx-&gt;key_dec[2];</div><div class='del'>-	b0[3] = le32_to_cpu(src[3]) ^  ctx-&gt;key_dec[3];</div><div class='add'>+	b0[0] = ctx-&gt;key_dec[0] ^ get_unaligned_le32(in);</div><div class='add'>+	b0[1] = ctx-&gt;key_dec[1] ^ get_unaligned_le32(in + 4);</div><div class='add'>+	b0[2] = ctx-&gt;key_dec[2] ^ get_unaligned_le32(in + 8);</div><div class='add'>+	b0[3] = ctx-&gt;key_dec[3] ^ get_unaligned_le32(in + 12);</div><div class='ctx'> </div><div class='ctx'> 	if (key_len &gt; 24) {</div><div class='ctx'> 		i_nround(b1, b0, kp);</div><div class='hunk'>@@ -1433,10 +1434,10 @@ static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> 	i_nround(b1, b0, kp);</div><div class='ctx'> 	i_lround(b0, b1, kp);</div><div class='ctx'> </div><div class='del'>-	dst[0] = cpu_to_le32(b0[0]);</div><div class='del'>-	dst[1] = cpu_to_le32(b0[1]);</div><div class='del'>-	dst[2] = cpu_to_le32(b0[2]);</div><div class='del'>-	dst[3] = cpu_to_le32(b0[3]);</div><div class='add'>+	put_unaligned_le32(b0[0], out);</div><div class='add'>+	put_unaligned_le32(b0[1], out + 4);</div><div class='add'>+	put_unaligned_le32(b0[2], out + 8);</div><div class='add'>+	put_unaligned_le32(b0[3], out + 12);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_alg aes_alg = {</div><div class='hunk'>@@ -1446,7 +1447,6 @@ static struct crypto_alg aes_alg = {</div><div class='ctx'> 	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,</div><div class='ctx'> 	.cra_blocksize		=	AES_BLOCK_SIZE,</div><div class='ctx'> 	.cra_ctxsize		=	sizeof(struct crypto_aes_ctx),</div><div class='del'>-	.cra_alignmask		=	3,</div><div class='ctx'> 	.cra_module		=	THIS_MODULE,</div><div class='ctx'> 	.cra_u			=	{</div><div class='ctx'> 		.cipher = {</div><div class='head'>diff --git a/crypto/aes_ti.c b/crypto/aes_ti.c<br/>new file mode 100644<br/>index 000000000000..92644fd1ac19<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/crypto/aes_ti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/aes_ti.c</a></div><div class='hunk'>@@ -0,0 +1,375 @@</div><div class='add'>+/*</div><div class='add'>+ * Scalar fixed time AES core transform</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Emit the sbox as volatile const to prevent the compiler from doing</div><div class='add'>+ * constant folding on sbox references involving fixed indexes.</div><div class='add'>+ */</div><div class='add'>+static volatile const u8 __cacheline_aligned __aesti_sbox[] = {</div><div class='add'>+	0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,</div><div class='add'>+	0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,</div><div class='add'>+	0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,</div><div class='add'>+	0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,</div><div class='add'>+	0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,</div><div class='add'>+	0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,</div><div class='add'>+	0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,</div><div class='add'>+	0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,</div><div class='add'>+	0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,</div><div class='add'>+	0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,</div><div class='add'>+	0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,</div><div class='add'>+	0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,</div><div class='add'>+	0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,</div><div class='add'>+	0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,</div><div class='add'>+	0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,</div><div class='add'>+	0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,</div><div class='add'>+	0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,</div><div class='add'>+	0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,</div><div class='add'>+	0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,</div><div class='add'>+	0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,</div><div class='add'>+	0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,</div><div class='add'>+	0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,</div><div class='add'>+	0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,</div><div class='add'>+	0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,</div><div class='add'>+	0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,</div><div class='add'>+	0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,</div><div class='add'>+	0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,</div><div class='add'>+	0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,</div><div class='add'>+	0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,</div><div class='add'>+	0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,</div><div class='add'>+	0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,</div><div class='add'>+	0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static volatile const u8 __cacheline_aligned __aesti_inv_sbox[] = {</div><div class='add'>+	0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38,</div><div class='add'>+	0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,</div><div class='add'>+	0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,</div><div class='add'>+	0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb,</div><div class='add'>+	0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d,</div><div class='add'>+	0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,</div><div class='add'>+	0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2,</div><div class='add'>+	0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25,</div><div class='add'>+	0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,</div><div class='add'>+	0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92,</div><div class='add'>+	0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda,</div><div class='add'>+	0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,</div><div class='add'>+	0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a,</div><div class='add'>+	0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06,</div><div class='add'>+	0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,</div><div class='add'>+	0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b,</div><div class='add'>+	0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea,</div><div class='add'>+	0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,</div><div class='add'>+	0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85,</div><div class='add'>+	0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e,</div><div class='add'>+	0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,</div><div class='add'>+	0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b,</div><div class='add'>+	0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20,</div><div class='add'>+	0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,</div><div class='add'>+	0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31,</div><div class='add'>+	0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f,</div><div class='add'>+	0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,</div><div class='add'>+	0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef,</div><div class='add'>+	0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0,</div><div class='add'>+	0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,</div><div class='add'>+	0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26,</div><div class='add'>+	0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 mul_by_x(u32 w)</div><div class='add'>+{</div><div class='add'>+	u32 x = w &amp; 0x7f7f7f7f;</div><div class='add'>+	u32 y = w &amp; 0x80808080;</div><div class='add'>+</div><div class='add'>+	/* multiply by polynomial 'x' (0b10) in GF(2^8) */</div><div class='add'>+	return (x &lt;&lt; 1) ^ (y &gt;&gt; 7) * 0x1b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mul_by_x2(u32 w)</div><div class='add'>+{</div><div class='add'>+	u32 x = w &amp; 0x3f3f3f3f;</div><div class='add'>+	u32 y = w &amp; 0x80808080;</div><div class='add'>+	u32 z = w &amp; 0x40404040;</div><div class='add'>+</div><div class='add'>+	/* multiply by polynomial 'x^2' (0b100) in GF(2^8) */</div><div class='add'>+	return (x &lt;&lt; 2) ^ (y &gt;&gt; 7) * 0x36 ^ (z &gt;&gt; 6) * 0x1b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mix_columns(u32 x)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Perform the following matrix multiplication in GF(2^8)</div><div class='add'>+	 *</div><div class='add'>+	 * | 0x2 0x3 0x1 0x1 |   | x[0] |</div><div class='add'>+	 * | 0x1 0x2 0x3 0x1 |   | x[1] |</div><div class='add'>+	 * | 0x1 0x1 0x2 0x3 | x | x[2] |</div><div class='add'>+	 * | 0x3 0x1 0x1 0x3 |   | x[3] |</div><div class='add'>+	 */</div><div class='add'>+	u32 y = mul_by_x(x) ^ ror32(x, 16);</div><div class='add'>+</div><div class='add'>+	return y ^ ror32(x ^ y, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 inv_mix_columns(u32 x)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Perform the following matrix multiplication in GF(2^8)</div><div class='add'>+	 *</div><div class='add'>+	 * | 0xe 0xb 0xd 0x9 |   | x[0] |</div><div class='add'>+	 * | 0x9 0xe 0xb 0xd |   | x[1] |</div><div class='add'>+	 * | 0xd 0x9 0xe 0xb | x | x[2] |</div><div class='add'>+	 * | 0xb 0xd 0x9 0xe |   | x[3] |</div><div class='add'>+	 *</div><div class='add'>+	 * which can conveniently be reduced to</div><div class='add'>+	 *</div><div class='add'>+	 * | 0x2 0x3 0x1 0x1 |   | 0x5 0x0 0x4 0x0 |   | x[0] |</div><div class='add'>+	 * | 0x1 0x2 0x3 0x1 |   | 0x0 0x5 0x0 0x4 |   | x[1] |</div><div class='add'>+	 * | 0x1 0x1 0x2 0x3 | x | 0x4 0x0 0x5 0x0 | x | x[2] |</div><div class='add'>+	 * | 0x3 0x1 0x1 0x2 |   | 0x0 0x4 0x0 0x5 |   | x[3] |</div><div class='add'>+	 */</div><div class='add'>+	u32 y = mul_by_x2(x);</div><div class='add'>+</div><div class='add'>+	return mix_columns(x ^ y ^ ror32(y, 16));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline u32 subshift(u32 in[], int pos)</div><div class='add'>+{</div><div class='add'>+	return (__aesti_sbox[in[pos] &amp; 0xff]) ^</div><div class='add'>+	       (__aesti_sbox[(in[(pos + 1) % 4] &gt;&gt;  8) &amp; 0xff] &lt;&lt;  8) ^</div><div class='add'>+	       (__aesti_sbox[(in[(pos + 2) % 4] &gt;&gt; 16) &amp; 0xff] &lt;&lt; 16) ^</div><div class='add'>+	       (__aesti_sbox[(in[(pos + 3) % 4] &gt;&gt; 24) &amp; 0xff] &lt;&lt; 24);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline u32 inv_subshift(u32 in[], int pos)</div><div class='add'>+{</div><div class='add'>+	return (__aesti_inv_sbox[in[pos] &amp; 0xff]) ^</div><div class='add'>+	       (__aesti_inv_sbox[(in[(pos + 3) % 4] &gt;&gt;  8) &amp; 0xff] &lt;&lt;  8) ^</div><div class='add'>+	       (__aesti_inv_sbox[(in[(pos + 2) % 4] &gt;&gt; 16) &amp; 0xff] &lt;&lt; 16) ^</div><div class='add'>+	       (__aesti_inv_sbox[(in[(pos + 1) % 4] &gt;&gt; 24) &amp; 0xff] &lt;&lt; 24);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 subw(u32 in)</div><div class='add'>+{</div><div class='add'>+	return (__aesti_sbox[in &amp; 0xff]) ^</div><div class='add'>+	       (__aesti_sbox[(in &gt;&gt;  8) &amp; 0xff] &lt;&lt;  8) ^</div><div class='add'>+	       (__aesti_sbox[(in &gt;&gt; 16) &amp; 0xff] &lt;&lt; 16) ^</div><div class='add'>+	       (__aesti_sbox[(in &gt;&gt; 24) &amp; 0xff] &lt;&lt; 24);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aesti_expand_key(struct crypto_aes_ctx *ctx, const u8 *in_key,</div><div class='add'>+			    unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	u32 kwords = key_len / sizeof(u32);</div><div class='add'>+	u32 rc, i, j;</div><div class='add'>+</div><div class='add'>+	if (key_len != AES_KEYSIZE_128 &amp;&amp;</div><div class='add'>+	    key_len != AES_KEYSIZE_192 &amp;&amp;</div><div class='add'>+	    key_len != AES_KEYSIZE_256)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;key_length = key_len;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; kwords; i++)</div><div class='add'>+		ctx-&gt;key_enc[i] = get_unaligned_le32(in_key + i * sizeof(u32));</div><div class='add'>+</div><div class='add'>+	for (i = 0, rc = 1; i &lt; 10; i++, rc = mul_by_x(rc)) {</div><div class='add'>+		u32 *rki = ctx-&gt;key_enc + (i * kwords);</div><div class='add'>+		u32 *rko = rki + kwords;</div><div class='add'>+</div><div class='add'>+		rko[0] = ror32(subw(rki[kwords - 1]), 8) ^ rc ^ rki[0];</div><div class='add'>+		rko[1] = rko[0] ^ rki[1];</div><div class='add'>+		rko[2] = rko[1] ^ rki[2];</div><div class='add'>+		rko[3] = rko[2] ^ rki[3];</div><div class='add'>+</div><div class='add'>+		if (key_len == 24) {</div><div class='add'>+			if (i &gt;= 7)</div><div class='add'>+				break;</div><div class='add'>+			rko[4] = rko[3] ^ rki[4];</div><div class='add'>+			rko[5] = rko[4] ^ rki[5];</div><div class='add'>+		} else if (key_len == 32) {</div><div class='add'>+			if (i &gt;= 6)</div><div class='add'>+				break;</div><div class='add'>+			rko[4] = subw(rko[3]) ^ rki[4];</div><div class='add'>+			rko[5] = rko[4] ^ rki[5];</div><div class='add'>+			rko[6] = rko[5] ^ rki[6];</div><div class='add'>+			rko[7] = rko[6] ^ rki[7];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Generate the decryption keys for the Equivalent Inverse Cipher.</div><div class='add'>+	 * This involves reversing the order of the round keys, and applying</div><div class='add'>+	 * the Inverse Mix Columns transformation to all but the first and</div><div class='add'>+	 * the last one.</div><div class='add'>+	 */</div><div class='add'>+	ctx-&gt;key_dec[0] = ctx-&gt;key_enc[key_len + 24];</div><div class='add'>+	ctx-&gt;key_dec[1] = ctx-&gt;key_enc[key_len + 25];</div><div class='add'>+	ctx-&gt;key_dec[2] = ctx-&gt;key_enc[key_len + 26];</div><div class='add'>+	ctx-&gt;key_dec[3] = ctx-&gt;key_enc[key_len + 27];</div><div class='add'>+</div><div class='add'>+	for (i = 4, j = key_len + 20; j &gt; 0; i += 4, j -= 4) {</div><div class='add'>+		ctx-&gt;key_dec[i]     = inv_mix_columns(ctx-&gt;key_enc[j]);</div><div class='add'>+		ctx-&gt;key_dec[i + 1] = inv_mix_columns(ctx-&gt;key_enc[j + 1]);</div><div class='add'>+		ctx-&gt;key_dec[i + 2] = inv_mix_columns(ctx-&gt;key_enc[j + 2]);</div><div class='add'>+		ctx-&gt;key_dec[i + 3] = inv_mix_columns(ctx-&gt;key_enc[j + 3]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;key_dec[i]     = ctx-&gt;key_enc[0];</div><div class='add'>+	ctx-&gt;key_dec[i + 1] = ctx-&gt;key_enc[1];</div><div class='add'>+	ctx-&gt;key_dec[i + 2] = ctx-&gt;key_enc[2];</div><div class='add'>+	ctx-&gt;key_dec[i + 3] = ctx-&gt;key_enc[3];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aesti_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+			 unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = aesti_expand_key(ctx, in_key, key_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In order to force the compiler to emit data independent Sbox lookups</div><div class='add'>+	 * at the start of each block, xor the first round key with values at</div><div class='add'>+	 * fixed indexes in the Sbox. This will need to be repeated each time</div><div class='add'>+	 * the key is used, which will pull the entire Sbox into the D-cache</div><div class='add'>+	 * before any data dependent Sbox lookups are performed.</div><div class='add'>+	 */</div><div class='add'>+	ctx-&gt;key_enc[0] ^= __aesti_sbox[ 0] ^ __aesti_sbox[128];</div><div class='add'>+	ctx-&gt;key_enc[1] ^= __aesti_sbox[32] ^ __aesti_sbox[160];</div><div class='add'>+	ctx-&gt;key_enc[2] ^= __aesti_sbox[64] ^ __aesti_sbox[192];</div><div class='add'>+	ctx-&gt;key_enc[3] ^= __aesti_sbox[96] ^ __aesti_sbox[224];</div><div class='add'>+</div><div class='add'>+	ctx-&gt;key_dec[0] ^= __aesti_inv_sbox[ 0] ^ __aesti_inv_sbox[128];</div><div class='add'>+	ctx-&gt;key_dec[1] ^= __aesti_inv_sbox[32] ^ __aesti_inv_sbox[160];</div><div class='add'>+	ctx-&gt;key_dec[2] ^= __aesti_inv_sbox[64] ^ __aesti_inv_sbox[192];</div><div class='add'>+	ctx-&gt;key_dec[3] ^= __aesti_inv_sbox[96] ^ __aesti_inv_sbox[224];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='add'>+{</div><div class='add'>+	const struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	const u32 *rkp = ctx-&gt;key_enc + 4;</div><div class='add'>+	int rounds = 6 + ctx-&gt;key_length / 4;</div><div class='add'>+	u32 st0[4], st1[4];</div><div class='add'>+	int round;</div><div class='add'>+</div><div class='add'>+	st0[0] = ctx-&gt;key_enc[0] ^ get_unaligned_le32(in);</div><div class='add'>+	st0[1] = ctx-&gt;key_enc[1] ^ get_unaligned_le32(in + 4);</div><div class='add'>+	st0[2] = ctx-&gt;key_enc[2] ^ get_unaligned_le32(in + 8);</div><div class='add'>+	st0[3] = ctx-&gt;key_enc[3] ^ get_unaligned_le32(in + 12);</div><div class='add'>+</div><div class='add'>+	st0[0] ^= __aesti_sbox[ 0] ^ __aesti_sbox[128];</div><div class='add'>+	st0[1] ^= __aesti_sbox[32] ^ __aesti_sbox[160];</div><div class='add'>+	st0[2] ^= __aesti_sbox[64] ^ __aesti_sbox[192];</div><div class='add'>+	st0[3] ^= __aesti_sbox[96] ^ __aesti_sbox[224];</div><div class='add'>+</div><div class='add'>+	for (round = 0;; round += 2, rkp += 8) {</div><div class='add'>+		st1[0] = mix_columns(subshift(st0, 0)) ^ rkp[0];</div><div class='add'>+		st1[1] = mix_columns(subshift(st0, 1)) ^ rkp[1];</div><div class='add'>+		st1[2] = mix_columns(subshift(st0, 2)) ^ rkp[2];</div><div class='add'>+		st1[3] = mix_columns(subshift(st0, 3)) ^ rkp[3];</div><div class='add'>+</div><div class='add'>+		if (round == rounds - 2)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		st0[0] = mix_columns(subshift(st1, 0)) ^ rkp[4];</div><div class='add'>+		st0[1] = mix_columns(subshift(st1, 1)) ^ rkp[5];</div><div class='add'>+		st0[2] = mix_columns(subshift(st1, 2)) ^ rkp[6];</div><div class='add'>+		st0[3] = mix_columns(subshift(st1, 3)) ^ rkp[7];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(subshift(st1, 0) ^ rkp[4], out);</div><div class='add'>+	put_unaligned_le32(subshift(st1, 1) ^ rkp[5], out + 4);</div><div class='add'>+	put_unaligned_le32(subshift(st1, 2) ^ rkp[6], out + 8);</div><div class='add'>+	put_unaligned_le32(subshift(st1, 3) ^ rkp[7], out + 12);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='add'>+{</div><div class='add'>+	const struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	const u32 *rkp = ctx-&gt;key_dec + 4;</div><div class='add'>+	int rounds = 6 + ctx-&gt;key_length / 4;</div><div class='add'>+	u32 st0[4], st1[4];</div><div class='add'>+	int round;</div><div class='add'>+</div><div class='add'>+	st0[0] = ctx-&gt;key_dec[0] ^ get_unaligned_le32(in);</div><div class='add'>+	st0[1] = ctx-&gt;key_dec[1] ^ get_unaligned_le32(in + 4);</div><div class='add'>+	st0[2] = ctx-&gt;key_dec[2] ^ get_unaligned_le32(in + 8);</div><div class='add'>+	st0[3] = ctx-&gt;key_dec[3] ^ get_unaligned_le32(in + 12);</div><div class='add'>+</div><div class='add'>+	st0[0] ^= __aesti_inv_sbox[ 0] ^ __aesti_inv_sbox[128];</div><div class='add'>+	st0[1] ^= __aesti_inv_sbox[32] ^ __aesti_inv_sbox[160];</div><div class='add'>+	st0[2] ^= __aesti_inv_sbox[64] ^ __aesti_inv_sbox[192];</div><div class='add'>+	st0[3] ^= __aesti_inv_sbox[96] ^ __aesti_inv_sbox[224];</div><div class='add'>+</div><div class='add'>+	for (round = 0;; round += 2, rkp += 8) {</div><div class='add'>+		st1[0] = inv_mix_columns(inv_subshift(st0, 0)) ^ rkp[0];</div><div class='add'>+		st1[1] = inv_mix_columns(inv_subshift(st0, 1)) ^ rkp[1];</div><div class='add'>+		st1[2] = inv_mix_columns(inv_subshift(st0, 2)) ^ rkp[2];</div><div class='add'>+		st1[3] = inv_mix_columns(inv_subshift(st0, 3)) ^ rkp[3];</div><div class='add'>+</div><div class='add'>+		if (round == rounds - 2)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		st0[0] = inv_mix_columns(inv_subshift(st1, 0)) ^ rkp[4];</div><div class='add'>+		st0[1] = inv_mix_columns(inv_subshift(st1, 1)) ^ rkp[5];</div><div class='add'>+		st0[2] = inv_mix_columns(inv_subshift(st1, 2)) ^ rkp[6];</div><div class='add'>+		st0[3] = inv_mix_columns(inv_subshift(st1, 3)) ^ rkp[7];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(inv_subshift(st1, 0) ^ rkp[4], out);</div><div class='add'>+	put_unaligned_le32(inv_subshift(st1, 1) ^ rkp[5], out + 4);</div><div class='add'>+	put_unaligned_le32(inv_subshift(st1, 2) ^ rkp[6], out + 8);</div><div class='add'>+	put_unaligned_le32(inv_subshift(st1, 3) ^ rkp[7], out + 12);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg aes_alg = {</div><div class='add'>+	.cra_name			= "aes",</div><div class='add'>+	.cra_driver_name		= "aes-fixed-time",</div><div class='add'>+	.cra_priority			= 100 + 1,</div><div class='add'>+	.cra_flags			= CRYPTO_ALG_TYPE_CIPHER,</div><div class='add'>+	.cra_blocksize			= AES_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize			= sizeof(struct crypto_aes_ctx),</div><div class='add'>+	.cra_module			= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.cra_cipher.cia_min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+	.cra_cipher.cia_max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+	.cra_cipher.cia_setkey		= aesti_set_key,</div><div class='add'>+	.cra_cipher.cia_encrypt		= aesti_encrypt,</div><div class='add'>+	.cra_cipher.cia_decrypt		= aesti_decrypt</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init aes_init(void)</div><div class='add'>+{</div><div class='add'>+	return crypto_register_alg(&amp;aes_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit aes_fini(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_alg(&amp;aes_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(aes_init);</div><div class='add'>+module_exit(aes_fini);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Generic fixed time AES");</div><div class='add'>+MODULE_AUTHOR("Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/crypto/ahash.c b/crypto/ahash.c<br/>index 2ce8bcb9049c..e58c4970c22b 100644<br/>--- a/<a href='/drm-misc/tree/crypto/ahash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/ahash.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/ahash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/ahash.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/cryptouser.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -493,7 +494,7 @@ static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='del'>-	__attribute__ ((unused));</div><div class='add'>+	__maybe_unused;</div><div class='ctx'> static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	seq_printf(m, "type         : ahash\n");</div><div class='head'>diff --git a/crypto/akcipher.c b/crypto/akcipher.c<br/>index def301ed1288..cfbdb06d8ca8 100644<br/>--- a/<a href='/drm-misc/tree/crypto/akcipher.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/akcipher.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/akcipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/akcipher.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;linux/cryptouser.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='hunk'>@@ -47,7 +48,7 @@ static int crypto_akcipher_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void crypto_akcipher_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='del'>-	__attribute__ ((unused));</div><div class='add'>+	__maybe_unused;</div><div class='ctx'> </div><div class='ctx'> static void crypto_akcipher_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='head'>diff --git a/crypto/algapi.c b/crypto/algapi.c<br/>index df939b54b09f..6b52e8f0b95f 100644<br/>--- a/<a href='/drm-misc/tree/crypto/algapi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/algapi.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/algapi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/algapi.c</a></div><div class='hunk'>@@ -356,6 +356,7 @@ int crypto_register_alg(struct crypto_alg *alg)</div><div class='ctx'> 	struct crypto_larval *larval;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	alg-&gt;cra_flags &amp;= ~CRYPTO_ALG_DEAD;</div><div class='ctx'> 	err = crypto_check_alg(alg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -961,34 +962,66 @@ void crypto_inc(u8 *a, unsigned int size)</div><div class='ctx'> 	__be32 *b = (__be32 *)(a + size);</div><div class='ctx'> 	u32 c;</div><div class='ctx'> </div><div class='del'>-	for (; size &gt;= 4; size -= 4) {</div><div class='del'>-		c = be32_to_cpu(*--b) + 1;</div><div class='del'>-		*b = cpu_to_be32(c);</div><div class='del'>-		if (c)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) ||</div><div class='add'>+	    !((unsigned long)b &amp; (__alignof__(*b) - 1)))</div><div class='add'>+		for (; size &gt;= 4; size -= 4) {</div><div class='add'>+			c = be32_to_cpu(*--b) + 1;</div><div class='add'>+			*b = cpu_to_be32(c);</div><div class='add'>+			if (c)</div><div class='add'>+				return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	crypto_inc_byte(a, size);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_inc);</div><div class='ctx'> </div><div class='del'>-static inline void crypto_xor_byte(u8 *a, const u8 *b, unsigned int size)</div><div class='add'>+void __crypto_xor(u8 *dst, const u8 *src, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	for (; size; size--)</div><div class='del'>-		*a++ ^= *b++;</div><div class='del'>-}</div><div class='add'>+	int relalign = 0;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)) {</div><div class='add'>+		int size = sizeof(unsigned long);</div><div class='add'>+		int d = ((unsigned long)dst ^ (unsigned long)src) &amp; (size - 1);</div><div class='add'>+</div><div class='add'>+		relalign = d ? 1 &lt;&lt; __ffs(d) : size;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If we care about alignment, process as many bytes as</div><div class='add'>+		 * needed to advance dst and src to values whose alignments</div><div class='add'>+		 * equal their relative alignment. This will allow us to</div><div class='add'>+		 * process the remainder of the input using optimal strides.</div><div class='add'>+		 */</div><div class='add'>+		while (((unsigned long)dst &amp; (relalign - 1)) &amp;&amp; len &gt; 0) {</div><div class='add'>+			*dst++ ^= *src++;</div><div class='add'>+			len--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-void crypto_xor(u8 *dst, const u8 *src, unsigned int size)</div><div class='del'>-{</div><div class='del'>-	u32 *a = (u32 *)dst;</div><div class='del'>-	u32 *b = (u32 *)src;</div><div class='add'>+	while (IS_ENABLED(CONFIG_64BIT) &amp;&amp; len &gt;= 8 &amp;&amp; !(relalign &amp; 7)) {</div><div class='add'>+		*(u64 *)dst ^= *(u64 *)src;</div><div class='add'>+		dst += 8;</div><div class='add'>+		src += 8;</div><div class='add'>+		len -= 8;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (; size &gt;= 4; size -= 4)</div><div class='del'>-		*a++ ^= *b++;</div><div class='add'>+	while (len &gt;= 4 &amp;&amp; !(relalign &amp; 3)) {</div><div class='add'>+		*(u32 *)dst ^= *(u32 *)src;</div><div class='add'>+		dst += 4;</div><div class='add'>+		src += 4;</div><div class='add'>+		len -= 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (len &gt;= 2 &amp;&amp; !(relalign &amp; 1)) {</div><div class='add'>+		*(u16 *)dst ^= *(u16 *)src;</div><div class='add'>+		dst += 2;</div><div class='add'>+		src += 2;</div><div class='add'>+		len -= 2;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	crypto_xor_byte((u8 *)a, (u8 *)b, size);</div><div class='add'>+	while (len--)</div><div class='add'>+		*dst++ ^= *src++;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(crypto_xor);</div><div class='add'>+EXPORT_SYMBOL_GPL(__crypto_xor);</div><div class='ctx'> </div><div class='ctx'> unsigned int crypto_alg_extsize(struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='head'>diff --git a/crypto/algboss.c b/crypto/algboss.c<br/>index 6e39d9c05b98..960d8548171b 100644<br/>--- a/<a href='/drm-misc/tree/crypto/algboss.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/algboss.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/algboss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/algboss.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -247,12 +247,8 @@ static int cryptomgr_schedule_test(struct crypto_alg *alg)</div><div class='ctx'> 	memcpy(param-&gt;alg, alg-&gt;cra_name, sizeof(param-&gt;alg));</div><div class='ctx'> 	type = alg-&gt;cra_flags;</div><div class='ctx'> </div><div class='del'>-	/* This piece of crap needs to disappear into per-type test hooks. */</div><div class='del'>-	if (!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &amp;</div><div class='del'>-	      CRYPTO_ALG_TYPE_BLKCIPHER_MASK) &amp;&amp; !(type &amp; CRYPTO_ALG_GENIV) &amp;&amp;</div><div class='del'>-	    ((alg-&gt;cra_flags &amp; CRYPTO_ALG_TYPE_MASK) ==</div><div class='del'>-	     CRYPTO_ALG_TYPE_BLKCIPHER ? alg-&gt;cra_blkcipher.ivsize :</div><div class='del'>-					 alg-&gt;cra_ablkcipher.ivsize))</div><div class='add'>+	/* Do not test internal algorithms. */</div><div class='add'>+	if (type &amp; CRYPTO_ALG_INTERNAL)</div><div class='ctx'> 		type |= CRYPTO_ALG_TESTED;</div><div class='ctx'> </div><div class='ctx'> 	param-&gt;type = type;</div><div class='head'>diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c<br/>index e9c0993b131d..5a8053758657 100644<br/>--- a/<a href='/drm-misc/tree/crypto/algif_aead.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/algif_aead.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/algif_aead.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/algif_aead.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='hunk'>@@ -136,28 +137,27 @@ static void aead_wmem_wakeup(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> static int aead_wait_for_data(struct sock *sk, unsigned flags)</div><div class='ctx'> {</div><div class='add'>+	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='ctx'> 	struct alg_sock *ask = alg_sk(sk);</div><div class='ctx'> 	struct aead_ctx *ctx = ask-&gt;private;</div><div class='ctx'> 	long timeout;</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='ctx'> 	int err = -ERESTARTSYS;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; MSG_DONTWAIT)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='del'>-</div><div class='add'>+	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		if (signal_pending(current))</div><div class='ctx'> 			break;</div><div class='del'>-		prepare_to_wait(sk_sleep(sk), &amp;wait, TASK_INTERRUPTIBLE);</div><div class='ctx'> 		timeout = MAX_SCHEDULE_TIMEOUT;</div><div class='del'>-		if (sk_wait_event(sk, &amp;timeout, !ctx-&gt;more)) {</div><div class='add'>+		if (sk_wait_event(sk, &amp;timeout, !ctx-&gt;more, &amp;wait)) {</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	finish_wait(sk_sleep(sk), &amp;wait);</div><div class='add'>+	remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> </div><div class='ctx'> 	sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='ctx'> </div><div class='hunk'>@@ -455,12 +455,13 @@ static int aead_recvmsg_async(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 	used -= ctx-&gt;aead_assoclen;</div><div class='ctx'> </div><div class='ctx'> 	/* take over all tx sgls from ctx */</div><div class='del'>-	areq-&gt;tsgl = sock_kmalloc(sk, sizeof(*areq-&gt;tsgl) * sgl-&gt;cur,</div><div class='add'>+	areq-&gt;tsgl = sock_kmalloc(sk,</div><div class='add'>+				  sizeof(*areq-&gt;tsgl) * max_t(u32, sgl-&gt;cur, 1),</div><div class='ctx'> 				  GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!areq-&gt;tsgl))</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='del'>-	sg_init_table(areq-&gt;tsgl, sgl-&gt;cur);</div><div class='add'>+	sg_init_table(areq-&gt;tsgl, max_t(u32, sgl-&gt;cur, 1));</div><div class='ctx'> 	for (i = 0; i &lt; sgl-&gt;cur; i++)</div><div class='ctx'> 		sg_set_page(&amp;areq-&gt;tsgl[i], sg_page(&amp;sgl-&gt;sg[i]),</div><div class='ctx'> 			    sgl-&gt;sg[i].length, sgl-&gt;sg[i].offset);</div><div class='hunk'>@@ -556,18 +557,8 @@ static int aead_recvmsg_sync(struct socket *sock, struct msghdr *msg, int flags)</div><div class='ctx'> 	lock_sock(sk);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * AEAD memory structure: For encryption, the tag is appended to the</div><div class='del'>-	 * ciphertext which implies that the memory allocated for the ciphertext</div><div class='del'>-	 * must be increased by the tag length. For decryption, the tag</div><div class='del'>-	 * is expected to be concatenated to the ciphertext. The plaintext</div><div class='del'>-	 * therefore has a memory size of the ciphertext minus the tag length.</div><div class='del'>-	 *</div><div class='del'>-	 * The memory structure for cipher operation has the following</div><div class='del'>-	 * structure:</div><div class='del'>-	 *	AEAD encryption input:  assoc data || plaintext</div><div class='del'>-	 *	AEAD encryption output: cipherntext || auth tag</div><div class='del'>-	 *	AEAD decryption input:  assoc data || ciphertext || auth tag</div><div class='del'>-	 *	AEAD decryption output: plaintext</div><div class='add'>+	 * Please see documentation of aead_request_set_crypt for the</div><div class='add'>+	 * description of the AEAD memory structure expected from the caller.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;more) {</div><div class='hunk'>@@ -671,9 +662,9 @@ static int aead_recvmsg_sync(struct socket *sock, struct msghdr *msg, int flags)</div><div class='ctx'> unlock:</div><div class='ctx'> 	list_for_each_entry_safe(rsgl, tmp, &amp;ctx-&gt;list, list) {</div><div class='ctx'> 		af_alg_free_sg(&amp;rsgl-&gt;sgl);</div><div class='add'>+		list_del(&amp;rsgl-&gt;list);</div><div class='ctx'> 		if (rsgl != &amp;ctx-&gt;first_rsgl)</div><div class='ctx'> 			sock_kfree_s(sk, rsgl, sizeof(*rsgl));</div><div class='del'>-		list_del(&amp;rsgl-&gt;list);</div><div class='ctx'> 	}</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ctx-&gt;list);</div><div class='ctx'> 	aead_wmem_wakeup(sk);</div><div class='head'>diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c<br/>index d19b09cdf284..54fc90e8339c 100644<br/>--- a/<a href='/drm-misc/tree/crypto/algif_hash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/algif_hash.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/algif_hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/algif_hash.c</a></div><div class='hunk'>@@ -245,7 +245,7 @@ static int hash_accept(struct socket *sock, struct socket *newsock, int flags)</div><div class='ctx'> 	struct alg_sock *ask = alg_sk(sk);</div><div class='ctx'> 	struct hash_ctx *ctx = ask-&gt;private;</div><div class='ctx'> 	struct ahash_request *req = &amp;ctx-&gt;req;</div><div class='del'>-	char state[crypto_ahash_statesize(crypto_ahash_reqtfm(req))];</div><div class='add'>+	char state[crypto_ahash_statesize(crypto_ahash_reqtfm(req)) ? : 1];</div><div class='ctx'> 	struct sock *sk2;</div><div class='ctx'> 	struct alg_sock *ask2;</div><div class='ctx'> 	struct hash_ctx *ctx2;</div><div class='head'>diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c<br/>index 28556fce4267..43839b00fe6c 100644<br/>--- a/<a href='/drm-misc/tree/crypto/algif_skcipher.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/algif_skcipher.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/algif_skcipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/algif_skcipher.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='hunk'>@@ -199,26 +200,26 @@ static void skcipher_free_sgl(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> static int skcipher_wait_for_wmem(struct sock *sk, unsigned flags)</div><div class='ctx'> {</div><div class='del'>-	long timeout;</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='add'>+	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='ctx'> 	int err = -ERESTARTSYS;</div><div class='add'>+	long timeout;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; MSG_DONTWAIT)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);</div><div class='ctx'> </div><div class='add'>+	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		if (signal_pending(current))</div><div class='ctx'> 			break;</div><div class='del'>-		prepare_to_wait(sk_sleep(sk), &amp;wait, TASK_INTERRUPTIBLE);</div><div class='ctx'> 		timeout = MAX_SCHEDULE_TIMEOUT;</div><div class='del'>-		if (sk_wait_event(sk, &amp;timeout, skcipher_writable(sk))) {</div><div class='add'>+		if (sk_wait_event(sk, &amp;timeout, skcipher_writable(sk), &amp;wait)) {</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	finish_wait(sk_sleep(sk), &amp;wait);</div><div class='add'>+	remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -242,10 +243,10 @@ static void skcipher_wmem_wakeup(struct sock *sk)</div><div class='ctx'> </div><div class='ctx'> static int skcipher_wait_for_data(struct sock *sk, unsigned flags)</div><div class='ctx'> {</div><div class='add'>+	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='ctx'> 	struct alg_sock *ask = alg_sk(sk);</div><div class='ctx'> 	struct skcipher_ctx *ctx = ask-&gt;private;</div><div class='ctx'> 	long timeout;</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='ctx'> 	int err = -ERESTARTSYS;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; MSG_DONTWAIT) {</div><div class='hunk'>@@ -254,17 +255,17 @@ static int skcipher_wait_for_data(struct sock *sk, unsigned flags)</div><div class='ctx'> </div><div class='ctx'> 	sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='ctx'> </div><div class='add'>+	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		if (signal_pending(current))</div><div class='ctx'> 			break;</div><div class='del'>-		prepare_to_wait(sk_sleep(sk), &amp;wait, TASK_INTERRUPTIBLE);</div><div class='ctx'> 		timeout = MAX_SCHEDULE_TIMEOUT;</div><div class='del'>-		if (sk_wait_event(sk, &amp;timeout, ctx-&gt;used)) {</div><div class='add'>+		if (sk_wait_event(sk, &amp;timeout, ctx-&gt;used, &amp;wait)) {</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	finish_wait(sk_sleep(sk), &amp;wait);</div><div class='add'>+	remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='ctx'> </div><div class='ctx'> 	sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);</div><div class='ctx'> </div><div class='hunk'>@@ -566,8 +567,10 @@ static int skcipher_recvmsg_async(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 			 * need to expand */</div><div class='ctx'> 			tmp = kcalloc(tx_nents * 2, sizeof(*tmp),</div><div class='ctx'> 				      GFP_KERNEL);</div><div class='del'>-			if (!tmp)</div><div class='add'>+			if (!tmp) {</div><div class='add'>+				err = -ENOMEM;</div><div class='ctx'> 				goto free;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			sg_init_table(tmp, tx_nents * 2);</div><div class='ctx'> 			for (x = 0; x &lt; tx_nents; x++)</div><div class='head'>diff --git a/crypto/api.c b/crypto/api.c<br/>index bbc147cb5dec..941cd4c6c7ec 100644<br/>--- a/<a href='/drm-misc/tree/crypto/api.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/api.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/api.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/api.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -211,8 +211,8 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)</div><div class='ctx'> 	if (!name)</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> </div><div class='add'>+	type &amp;= ~(CRYPTO_ALG_LARVAL | CRYPTO_ALG_DEAD);</div><div class='ctx'> 	mask &amp;= ~(CRYPTO_ALG_LARVAL | CRYPTO_ALG_DEAD);</div><div class='del'>-	type &amp;= mask;</div><div class='ctx'> </div><div class='ctx'> 	alg = crypto_alg_lookup(name, type, mask);</div><div class='ctx'> 	if (!alg) {</div><div class='hunk'>@@ -310,24 +310,8 @@ static void crypto_exit_ops(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	const struct crypto_type *type = tfm-&gt;__crt_alg-&gt;cra_type;</div><div class='ctx'> </div><div class='del'>-	if (type) {</div><div class='del'>-		if (tfm-&gt;exit)</div><div class='del'>-			tfm-&gt;exit(tfm);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (crypto_tfm_alg_type(tfm)) {</div><div class='del'>-	case CRYPTO_ALG_TYPE_CIPHER:</div><div class='del'>-		crypto_exit_cipher_ops(tfm);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CRYPTO_ALG_TYPE_COMPRESS:</div><div class='del'>-		crypto_exit_compress_ops(tfm);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='add'>+	if (type &amp;&amp; tfm-&gt;exit)</div><div class='add'>+		tfm-&gt;exit(tfm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int crypto_ctxsize(struct crypto_alg *alg, u32 type, u32 mask)</div><div class='head'>diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c<br/>index fd76b5fc3b3a..d3a989e718f5 100644<br/>--- a/<a href='/drm-misc/tree/crypto/asymmetric_keys/public_key.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/asymmetric_keys/public_key.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/asymmetric_keys/public_key.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/asymmetric_keys/public_key.c</a></div><div class='hunk'>@@ -121,6 +121,7 @@ int public_key_verify_signature(const struct public_key *pkey,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error_free_req;</div><div class='ctx'> </div><div class='add'>+	ret = -ENOMEM;</div><div class='ctx'> 	outlen = crypto_akcipher_maxsize(tfm);</div><div class='ctx'> 	output = kmalloc(outlen, GFP_KERNEL);</div><div class='ctx'> 	if (!output)</div><div class='head'>diff --git a/crypto/authenc.c b/crypto/authenc.c<br/>index a7e1ac786c5d..875470b0e026 100644<br/>--- a/<a href='/drm-misc/tree/crypto/authenc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/authenc.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/authenc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/authenc.c</a></div><div class='hunk'>@@ -324,7 +324,7 @@ static int crypto_authenc_init_tfm(struct crypto_aead *tfm)</div><div class='ctx'> 	if (IS_ERR(auth))</div><div class='ctx'> 		return PTR_ERR(auth);</div><div class='ctx'> </div><div class='del'>-	enc = crypto_spawn_skcipher2(&amp;ictx-&gt;enc);</div><div class='add'>+	enc = crypto_spawn_skcipher(&amp;ictx-&gt;enc);</div><div class='ctx'> 	err = PTR_ERR(enc);</div><div class='ctx'> 	if (IS_ERR(enc))</div><div class='ctx'> 		goto err_free_ahash;</div><div class='hunk'>@@ -420,9 +420,9 @@ static int crypto_authenc_create(struct crypto_template *tmpl,</div><div class='ctx'> 		goto err_free_inst;</div><div class='ctx'> </div><div class='ctx'> 	crypto_set_skcipher_spawn(&amp;ctx-&gt;enc, aead_crypto_instance(inst));</div><div class='del'>-	err = crypto_grab_skcipher2(&amp;ctx-&gt;enc, enc_name, 0,</div><div class='del'>-				    crypto_requires_sync(algt-&gt;type,</div><div class='del'>-							 algt-&gt;mask));</div><div class='add'>+	err = crypto_grab_skcipher(&amp;ctx-&gt;enc, enc_name, 0,</div><div class='add'>+				   crypto_requires_sync(algt-&gt;type,</div><div class='add'>+							algt-&gt;mask));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_drop_auth;</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/authencesn.c b/crypto/authencesn.c<br/>index 121010ac9962..6f8f6b86bfe2 100644<br/>--- a/<a href='/drm-misc/tree/crypto/authencesn.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/authencesn.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/authencesn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/authencesn.c</a></div><div class='hunk'>@@ -342,7 +342,7 @@ static int crypto_authenc_esn_init_tfm(struct crypto_aead *tfm)</div><div class='ctx'> 	if (IS_ERR(auth))</div><div class='ctx'> 		return PTR_ERR(auth);</div><div class='ctx'> </div><div class='del'>-	enc = crypto_spawn_skcipher2(&amp;ictx-&gt;enc);</div><div class='add'>+	enc = crypto_spawn_skcipher(&amp;ictx-&gt;enc);</div><div class='ctx'> 	err = PTR_ERR(enc);</div><div class='ctx'> 	if (IS_ERR(enc))</div><div class='ctx'> 		goto err_free_ahash;</div><div class='hunk'>@@ -441,9 +441,9 @@ static int crypto_authenc_esn_create(struct crypto_template *tmpl,</div><div class='ctx'> 		goto err_free_inst;</div><div class='ctx'> </div><div class='ctx'> 	crypto_set_skcipher_spawn(&amp;ctx-&gt;enc, aead_crypto_instance(inst));</div><div class='del'>-	err = crypto_grab_skcipher2(&amp;ctx-&gt;enc, enc_name, 0,</div><div class='del'>-				    crypto_requires_sync(algt-&gt;type,</div><div class='del'>-							 algt-&gt;mask));</div><div class='add'>+	err = crypto_grab_skcipher(&amp;ctx-&gt;enc, enc_name, 0,</div><div class='add'>+				   crypto_requires_sync(algt-&gt;type,</div><div class='add'>+							algt-&gt;mask));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_drop_auth;</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c<br/>index a832426820e8..6c43a0a17a55 100644<br/>--- a/<a href='/drm-misc/tree/crypto/blkcipher.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/blkcipher.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/blkcipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/blkcipher.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Block chaining cipher operations.</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Generic encrypt/decrypt wrapper for ciphers, handles operations across</div><div class='ctx'>  * multiple page boundaries by using temporary blocks.  In user context,</div><div class='ctx'>  * the kernel is given a chance to schedule us once per page.</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>  * under the terms of the GNU General Public License as published by the Free</div><div class='del'>- * Software Foundation; either version 2 of the License, or (at your option) </div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='ctx'>  * any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/cryptouser.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -534,7 +535,7 @@ static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void crypto_blkcipher_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='del'>-	__attribute__ ((unused));</div><div class='add'>+	__maybe_unused;</div><div class='ctx'> static void crypto_blkcipher_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	seq_printf(m, "type         : blkcipher\n");</div><div class='head'>diff --git a/crypto/cbc.c b/crypto/cbc.c<br/>index 780ee27b2d43..bc160a3186dc 100644<br/>--- a/<a href='/drm-misc/tree/crypto/cbc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/cbc.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/cbc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/cbc.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * CBC: Cipher Block Chaining mode</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2006 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='add'>+ * Copyright (c) 2006-2016 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>  * under the terms of the GNU General Public License as published by the Free</div><div class='hunk'>@@ -10,191 +10,78 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/cbc.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct crypto_cbc_ctx {</div><div class='ctx'> 	struct crypto_cipher *child;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int crypto_cbc_setkey(struct crypto_tfm *parent, const u8 *key,</div><div class='add'>+static int crypto_cbc_setkey(struct crypto_skcipher *parent, const u8 *key,</div><div class='ctx'> 			     unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_cbc_ctx *ctx = crypto_tfm_ctx(parent);</div><div class='add'>+	struct crypto_cbc_ctx *ctx = crypto_skcipher_ctx(parent);</div><div class='ctx'> 	struct crypto_cipher *child = ctx-&gt;child;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	crypto_cipher_set_flags(child, crypto_tfm_get_flags(parent) &amp;</div><div class='add'>+	crypto_cipher_set_flags(child, crypto_skcipher_get_flags(parent) &amp;</div><div class='ctx'> 				       CRYPTO_TFM_REQ_MASK);</div><div class='ctx'> 	err = crypto_cipher_setkey(child, key, keylen);</div><div class='del'>-	crypto_tfm_set_flags(parent, crypto_cipher_get_flags(child) &amp;</div><div class='del'>-				     CRYPTO_TFM_RES_MASK);</div><div class='add'>+	crypto_skcipher_set_flags(parent, crypto_cipher_get_flags(child) &amp;</div><div class='add'>+					  CRYPTO_TFM_RES_MASK);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_cbc_encrypt_segment(struct blkcipher_desc *desc,</div><div class='del'>-				      struct blkcipher_walk *walk,</div><div class='del'>-				      struct crypto_cipher *tfm)</div><div class='add'>+static inline void crypto_cbc_encrypt_one(struct crypto_skcipher *tfm,</div><div class='add'>+					  const u8 *src, u8 *dst)</div><div class='ctx'> {</div><div class='del'>-	void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =</div><div class='del'>-		crypto_cipher_alg(tfm)-&gt;cia_encrypt;</div><div class='del'>-	int bsize = crypto_cipher_blocksize(tfm);</div><div class='del'>-	unsigned int nbytes = walk-&gt;nbytes;</div><div class='del'>-	u8 *src = walk-&gt;src.virt.addr;</div><div class='del'>-	u8 *dst = walk-&gt;dst.virt.addr;</div><div class='del'>-	u8 *iv = walk-&gt;iv;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		crypto_xor(iv, src, bsize);</div><div class='del'>-		fn(crypto_cipher_tfm(tfm), dst, iv);</div><div class='del'>-		memcpy(iv, dst, bsize);</div><div class='del'>-</div><div class='del'>-		src += bsize;</div><div class='del'>-		dst += bsize;</div><div class='del'>-	} while ((nbytes -= bsize) &gt;= bsize);</div><div class='del'>-</div><div class='del'>-	return nbytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int crypto_cbc_encrypt_inplace(struct blkcipher_desc *desc,</div><div class='del'>-				      struct blkcipher_walk *walk,</div><div class='del'>-				      struct crypto_cipher *tfm)</div><div class='del'>-{</div><div class='del'>-	void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =</div><div class='del'>-		crypto_cipher_alg(tfm)-&gt;cia_encrypt;</div><div class='del'>-	int bsize = crypto_cipher_blocksize(tfm);</div><div class='del'>-	unsigned int nbytes = walk-&gt;nbytes;</div><div class='del'>-	u8 *src = walk-&gt;src.virt.addr;</div><div class='del'>-	u8 *iv = walk-&gt;iv;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		crypto_xor(src, iv, bsize);</div><div class='del'>-		fn(crypto_cipher_tfm(tfm), src, src);</div><div class='del'>-		iv = src;</div><div class='del'>-</div><div class='del'>-		src += bsize;</div><div class='del'>-	} while ((nbytes -= bsize) &gt;= bsize);</div><div class='del'>-</div><div class='del'>-	memcpy(walk-&gt;iv, iv, bsize);</div><div class='del'>-</div><div class='del'>-	return nbytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int crypto_cbc_encrypt(struct blkcipher_desc *desc,</div><div class='del'>-			      struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-			      unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='del'>-	struct crypto_blkcipher *tfm = desc-&gt;tfm;</div><div class='del'>-	struct crypto_cbc_ctx *ctx = crypto_blkcipher_ctx(tfm);</div><div class='del'>-	struct crypto_cipher *child = ctx-&gt;child;</div><div class='del'>-	int err;</div><div class='add'>+	struct crypto_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='del'>-</div><div class='del'>-	while ((nbytes = walk.nbytes)) {</div><div class='del'>-		if (walk.src.virt.addr == walk.dst.virt.addr)</div><div class='del'>-			nbytes = crypto_cbc_encrypt_inplace(desc, &amp;walk, child);</div><div class='del'>-		else</div><div class='del'>-			nbytes = crypto_cbc_encrypt_segment(desc, &amp;walk, child);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	crypto_cipher_encrypt_one(ctx-&gt;child, dst, src);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_cbc_decrypt_segment(struct blkcipher_desc *desc,</div><div class='del'>-				      struct blkcipher_walk *walk,</div><div class='del'>-				      struct crypto_cipher *tfm)</div><div class='add'>+static int crypto_cbc_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =</div><div class='del'>-		crypto_cipher_alg(tfm)-&gt;cia_decrypt;</div><div class='del'>-	int bsize = crypto_cipher_blocksize(tfm);</div><div class='del'>-	unsigned int nbytes = walk-&gt;nbytes;</div><div class='del'>-	u8 *src = walk-&gt;src.virt.addr;</div><div class='del'>-	u8 *dst = walk-&gt;dst.virt.addr;</div><div class='del'>-	u8 *iv = walk-&gt;iv;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		fn(crypto_cipher_tfm(tfm), dst, src);</div><div class='del'>-		crypto_xor(dst, iv, bsize);</div><div class='del'>-		iv = src;</div><div class='del'>-</div><div class='del'>-		src += bsize;</div><div class='del'>-		dst += bsize;</div><div class='del'>-	} while ((nbytes -= bsize) &gt;= bsize);</div><div class='del'>-</div><div class='del'>-	memcpy(walk-&gt;iv, iv, bsize);</div><div class='del'>-</div><div class='del'>-	return nbytes;</div><div class='add'>+	return crypto_cbc_encrypt_walk(req, crypto_cbc_encrypt_one);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_cbc_decrypt_inplace(struct blkcipher_desc *desc,</div><div class='del'>-				      struct blkcipher_walk *walk,</div><div class='del'>-				      struct crypto_cipher *tfm)</div><div class='add'>+static inline void crypto_cbc_decrypt_one(struct crypto_skcipher *tfm,</div><div class='add'>+					  const u8 *src, u8 *dst)</div><div class='ctx'> {</div><div class='del'>-	void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =</div><div class='del'>-		crypto_cipher_alg(tfm)-&gt;cia_decrypt;</div><div class='del'>-	int bsize = crypto_cipher_blocksize(tfm);</div><div class='del'>-	unsigned int nbytes = walk-&gt;nbytes;</div><div class='del'>-	u8 *src = walk-&gt;src.virt.addr;</div><div class='del'>-	u8 last_iv[bsize];</div><div class='del'>-</div><div class='del'>-	/* Start of the last block. */</div><div class='del'>-	src += nbytes - (nbytes &amp; (bsize - 1)) - bsize;</div><div class='del'>-	memcpy(last_iv, src, bsize);</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		fn(crypto_cipher_tfm(tfm), src, src);</div><div class='del'>-		if ((nbytes -= bsize) &lt; bsize)</div><div class='del'>-			break;</div><div class='del'>-		crypto_xor(src, src - bsize, bsize);</div><div class='del'>-		src -= bsize;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	crypto_xor(src, walk-&gt;iv, bsize);</div><div class='del'>-	memcpy(walk-&gt;iv, last_iv, bsize);</div><div class='add'>+	struct crypto_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	return nbytes;</div><div class='add'>+	crypto_cipher_decrypt_one(ctx-&gt;child, dst, src);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_cbc_decrypt(struct blkcipher_desc *desc,</div><div class='del'>-			      struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-			      unsigned int nbytes)</div><div class='add'>+static int crypto_cbc_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='del'>-	struct crypto_blkcipher *tfm = desc-&gt;tfm;</div><div class='del'>-	struct crypto_cbc_ctx *ctx = crypto_blkcipher_ctx(tfm);</div><div class='del'>-	struct crypto_cipher *child = ctx-&gt;child;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, false);</div><div class='ctx'> </div><div class='del'>-	while ((nbytes = walk.nbytes)) {</div><div class='del'>-		if (walk.src.virt.addr == walk.dst.virt.addr)</div><div class='del'>-			nbytes = crypto_cbc_decrypt_inplace(desc, &amp;walk, child);</div><div class='del'>-		else</div><div class='del'>-			nbytes = crypto_cbc_decrypt_segment(desc, &amp;walk, child);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+	while (walk.nbytes) {</div><div class='add'>+		err = crypto_cbc_decrypt_blocks(&amp;walk, tfm,</div><div class='add'>+						crypto_cbc_decrypt_one);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_cbc_init_tfm(struct crypto_tfm *tfm)</div><div class='add'>+static int crypto_cbc_init_tfm(struct crypto_skcipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_instance *inst = (void *)tfm-&gt;__crt_alg;</div><div class='del'>-	struct crypto_spawn *spawn = crypto_instance_ctx(inst);</div><div class='del'>-	struct crypto_cbc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct skcipher_instance *inst = skcipher_alg_instance(tfm);</div><div class='add'>+	struct crypto_spawn *spawn = skcipher_instance_ctx(inst);</div><div class='add'>+	struct crypto_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	struct crypto_cipher *cipher;</div><div class='ctx'> </div><div class='ctx'> 	cipher = crypto_spawn_cipher(spawn);</div><div class='hunk'>@@ -205,72 +92,91 @@ static int crypto_cbc_init_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void crypto_cbc_exit_tfm(struct crypto_tfm *tfm)</div><div class='add'>+static void crypto_cbc_exit_tfm(struct crypto_skcipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_cbc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct crypto_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+</div><div class='ctx'> 	crypto_free_cipher(ctx-&gt;child);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct crypto_instance *crypto_cbc_alloc(struct rtattr **tb)</div><div class='add'>+static void crypto_cbc_free(struct skcipher_instance *inst)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_instance *inst;</div><div class='add'>+	crypto_drop_skcipher(skcipher_instance_ctx(inst));</div><div class='add'>+	kfree(inst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crypto_cbc_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='add'>+{</div><div class='add'>+	struct skcipher_instance *inst;</div><div class='add'>+	struct crypto_spawn *spawn;</div><div class='ctx'> 	struct crypto_alg *alg;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);</div><div class='add'>+	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SKCIPHER);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return ERR_PTR(err);</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);</div><div class='add'>+	if (!inst)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,</div><div class='ctx'> 				  CRYPTO_ALG_TYPE_MASK);</div><div class='add'>+	err = PTR_ERR(alg);</div><div class='ctx'> 	if (IS_ERR(alg))</div><div class='del'>-		return ERR_CAST(alg);</div><div class='add'>+		goto err_free_inst;</div><div class='ctx'> </div><div class='del'>-	inst = ERR_PTR(-EINVAL);</div><div class='add'>+	spawn = skcipher_instance_ctx(inst);</div><div class='add'>+	err = crypto_init_spawn(spawn, alg, skcipher_crypto_instance(inst),</div><div class='add'>+				CRYPTO_ALG_TYPE_MASK);</div><div class='add'>+	crypto_mod_put(alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_inst;</div><div class='add'>+</div><div class='add'>+	err = crypto_inst_setname(skcipher_crypto_instance(inst), "cbc", alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_drop_spawn;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='ctx'> 	if (!is_power_of_2(alg-&gt;cra_blocksize))</div><div class='del'>-		goto out_put_alg;</div><div class='add'>+		goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-	inst = crypto_alloc_instance("cbc", alg);</div><div class='del'>-	if (IS_ERR(inst))</div><div class='del'>-		goto out_put_alg;</div><div class='add'>+	inst-&gt;alg.base.cra_priority = alg-&gt;cra_priority;</div><div class='add'>+	inst-&gt;alg.base.cra_blocksize = alg-&gt;cra_blocksize;</div><div class='add'>+	inst-&gt;alg.base.cra_alignmask = alg-&gt;cra_alignmask;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER;</div><div class='del'>-	inst-&gt;alg.cra_priority = alg-&gt;cra_priority;</div><div class='del'>-	inst-&gt;alg.cra_blocksize = alg-&gt;cra_blocksize;</div><div class='del'>-	inst-&gt;alg.cra_alignmask = alg-&gt;cra_alignmask;</div><div class='del'>-	inst-&gt;alg.cra_type = &amp;crypto_blkcipher_type;</div><div class='add'>+	inst-&gt;alg.ivsize = alg-&gt;cra_blocksize;</div><div class='add'>+	inst-&gt;alg.min_keysize = alg-&gt;cra_cipher.cia_min_keysize;</div><div class='add'>+	inst-&gt;alg.max_keysize = alg-&gt;cra_cipher.cia_max_keysize;</div><div class='ctx'> </div><div class='del'>-	/* We access the data as u32s when xoring. */</div><div class='del'>-	inst-&gt;alg.cra_alignmask |= __alignof__(u32) - 1;</div><div class='add'>+	inst-&gt;alg.base.cra_ctxsize = sizeof(struct crypto_cbc_ctx);</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_blkcipher.ivsize = alg-&gt;cra_blocksize;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.min_keysize = alg-&gt;cra_cipher.cia_min_keysize;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.max_keysize = alg-&gt;cra_cipher.cia_max_keysize;</div><div class='add'>+	inst-&gt;alg.init = crypto_cbc_init_tfm;</div><div class='add'>+	inst-&gt;alg.exit = crypto_cbc_exit_tfm;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_ctxsize = sizeof(struct crypto_cbc_ctx);</div><div class='add'>+	inst-&gt;alg.setkey = crypto_cbc_setkey;</div><div class='add'>+	inst-&gt;alg.encrypt = crypto_cbc_encrypt;</div><div class='add'>+	inst-&gt;alg.decrypt = crypto_cbc_decrypt;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_init = crypto_cbc_init_tfm;</div><div class='del'>-	inst-&gt;alg.cra_exit = crypto_cbc_exit_tfm;</div><div class='add'>+	inst-&gt;free = crypto_cbc_free;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_blkcipher.setkey = crypto_cbc_setkey;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.encrypt = crypto_cbc_encrypt;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.decrypt = crypto_cbc_decrypt;</div><div class='add'>+	err = skcipher_register_instance(tmpl, inst);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-out_put_alg:</div><div class='del'>-	crypto_mod_put(alg);</div><div class='del'>-	return inst;</div><div class='del'>-}</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='ctx'> </div><div class='del'>-static void crypto_cbc_free(struct crypto_instance *inst)</div><div class='del'>-{</div><div class='del'>-	crypto_drop_spawn(crypto_instance_ctx(inst));</div><div class='add'>+err_drop_spawn:</div><div class='add'>+	crypto_drop_spawn(spawn);</div><div class='add'>+err_free_inst:</div><div class='ctx'> 	kfree(inst);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_template crypto_cbc_tmpl = {</div><div class='ctx'> 	.name = "cbc",</div><div class='del'>-	.alloc = crypto_cbc_alloc,</div><div class='del'>-	.free = crypto_cbc_free,</div><div class='add'>+	.create = crypto_cbc_create,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/ccm.c b/crypto/ccm.c<br/>index 006d8575ef5c..1ce37ae0ce56 100644<br/>--- a/<a href='/drm-misc/tree/crypto/ccm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/ccm.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/ccm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/ccm.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -23,11 +24,11 @@</div><div class='ctx'> </div><div class='ctx'> struct ccm_instance_ctx {</div><div class='ctx'> 	struct crypto_skcipher_spawn ctr;</div><div class='del'>-	struct crypto_spawn cipher;</div><div class='add'>+	struct crypto_ahash_spawn mac;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct crypto_ccm_ctx {</div><div class='del'>-	struct crypto_cipher *cipher;</div><div class='add'>+	struct crypto_ahash *mac;</div><div class='ctx'> 	struct crypto_skcipher *ctr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -46,13 +47,20 @@ struct crypto_ccm_req_priv_ctx {</div><div class='ctx'> 	u8 odata[16];</div><div class='ctx'> 	u8 idata[16];</div><div class='ctx'> 	u8 auth_tag[16];</div><div class='del'>-	u32 ilen;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	struct scatterlist src[3];</div><div class='ctx'> 	struct scatterlist dst[3];</div><div class='ctx'> 	struct skcipher_request skreq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct cbcmac_tfm_ctx {</div><div class='add'>+	struct crypto_cipher *child;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cbcmac_desc_ctx {</div><div class='add'>+	unsigned int len;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline struct crypto_ccm_req_priv_ctx *crypto_ccm_reqctx(</div><div class='ctx'> 	struct aead_request *req)</div><div class='ctx'> {</div><div class='hunk'>@@ -84,7 +92,7 @@ static int crypto_ccm_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_ccm_ctx *ctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	struct crypto_skcipher *ctr = ctx-&gt;ctr;</div><div class='del'>-	struct crypto_cipher *tfm = ctx-&gt;cipher;</div><div class='add'>+	struct crypto_ahash *mac = ctx-&gt;mac;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	crypto_skcipher_clear_flags(ctr, CRYPTO_TFM_REQ_MASK);</div><div class='hunk'>@@ -96,11 +104,11 @@ static int crypto_ccm_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	crypto_cipher_clear_flags(tfm, CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	crypto_cipher_set_flags(tfm, crypto_aead_get_flags(aead) &amp;</div><div class='add'>+	crypto_ahash_clear_flags(mac, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_ahash_set_flags(mac, crypto_aead_get_flags(aead) &amp;</div><div class='ctx'> 				    CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	err = crypto_cipher_setkey(tfm, key, keylen);</div><div class='del'>-	crypto_aead_set_flags(aead, crypto_cipher_get_flags(tfm) &amp;</div><div class='add'>+	err = crypto_ahash_setkey(mac, key, keylen);</div><div class='add'>+	crypto_aead_set_flags(aead, crypto_ahash_get_flags(mac) &amp;</div><div class='ctx'> 			      CRYPTO_TFM_RES_MASK);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -167,119 +175,61 @@ static int format_adata(u8 *adata, unsigned int a)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void compute_mac(struct crypto_cipher *tfm, u8 *data, int n,</div><div class='del'>-		       struct crypto_ccm_req_priv_ctx *pctx)</div><div class='del'>-{</div><div class='del'>-	unsigned int bs = 16;</div><div class='del'>-	u8 *odata = pctx-&gt;odata;</div><div class='del'>-	u8 *idata = pctx-&gt;idata;</div><div class='del'>-	int datalen, getlen;</div><div class='del'>-</div><div class='del'>-	datalen = n;</div><div class='del'>-</div><div class='del'>-	/* first time in here, block may be partially filled. */</div><div class='del'>-	getlen = bs - pctx-&gt;ilen;</div><div class='del'>-	if (datalen &gt;= getlen) {</div><div class='del'>-		memcpy(idata + pctx-&gt;ilen, data, getlen);</div><div class='del'>-		crypto_xor(odata, idata, bs);</div><div class='del'>-		crypto_cipher_encrypt_one(tfm, odata, odata);</div><div class='del'>-		datalen -= getlen;</div><div class='del'>-		data += getlen;</div><div class='del'>-		pctx-&gt;ilen = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now encrypt rest of data */</div><div class='del'>-	while (datalen &gt;= bs) {</div><div class='del'>-		crypto_xor(odata, data, bs);</div><div class='del'>-		crypto_cipher_encrypt_one(tfm, odata, odata);</div><div class='del'>-</div><div class='del'>-		datalen -= bs;</div><div class='del'>-		data += bs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check and see if there's leftover data that wasn't</div><div class='del'>-	 * enough to fill a block.</div><div class='del'>-	 */</div><div class='del'>-	if (datalen) {</div><div class='del'>-		memcpy(idata + pctx-&gt;ilen, data, datalen);</div><div class='del'>-		pctx-&gt;ilen += datalen;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void get_data_to_compute(struct crypto_cipher *tfm,</div><div class='del'>-			       struct crypto_ccm_req_priv_ctx *pctx,</div><div class='del'>-			       struct scatterlist *sg, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct scatter_walk walk;</div><div class='del'>-	u8 *data_src;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	scatterwalk_start(&amp;walk, sg);</div><div class='del'>-</div><div class='del'>-	while (len) {</div><div class='del'>-		n = scatterwalk_clamp(&amp;walk, len);</div><div class='del'>-		if (!n) {</div><div class='del'>-			scatterwalk_start(&amp;walk, sg_next(walk.sg));</div><div class='del'>-			n = scatterwalk_clamp(&amp;walk, len);</div><div class='del'>-		}</div><div class='del'>-		data_src = scatterwalk_map(&amp;walk);</div><div class='del'>-</div><div class='del'>-		compute_mac(tfm, data_src, n, pctx);</div><div class='del'>-		len -= n;</div><div class='del'>-</div><div class='del'>-		scatterwalk_unmap(data_src);</div><div class='del'>-		scatterwalk_advance(&amp;walk, n);</div><div class='del'>-		scatterwalk_done(&amp;walk, 0, len);</div><div class='del'>-		if (len)</div><div class='del'>-			crypto_yield(pctx-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* any leftover needs padding and then encrypted */</div><div class='del'>-	if (pctx-&gt;ilen) {</div><div class='del'>-		int padlen;</div><div class='del'>-		u8 *odata = pctx-&gt;odata;</div><div class='del'>-		u8 *idata = pctx-&gt;idata;</div><div class='del'>-</div><div class='del'>-		padlen = 16 - pctx-&gt;ilen;</div><div class='del'>-		memset(idata + pctx-&gt;ilen, 0, padlen);</div><div class='del'>-		crypto_xor(odata, idata, 16);</div><div class='del'>-		crypto_cipher_encrypt_one(tfm, odata, odata);</div><div class='del'>-		pctx-&gt;ilen = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int crypto_ccm_auth(struct aead_request *req, struct scatterlist *plain,</div><div class='ctx'> 			   unsigned int cryptlen)</div><div class='ctx'> {</div><div class='add'>+	struct crypto_ccm_req_priv_ctx *pctx = crypto_ccm_reqctx(req);</div><div class='ctx'> 	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='ctx'> 	struct crypto_ccm_ctx *ctx = crypto_aead_ctx(aead);</div><div class='del'>-	struct crypto_ccm_req_priv_ctx *pctx = crypto_ccm_reqctx(req);</div><div class='del'>-	struct crypto_cipher *cipher = ctx-&gt;cipher;</div><div class='add'>+	AHASH_REQUEST_ON_STACK(ahreq, ctx-&gt;mac);</div><div class='ctx'> 	unsigned int assoclen = req-&gt;assoclen;</div><div class='add'>+	struct scatterlist sg[3];</div><div class='ctx'> 	u8 *odata = pctx-&gt;odata;</div><div class='ctx'> 	u8 *idata = pctx-&gt;idata;</div><div class='del'>-	int err;</div><div class='add'>+	int ilen, err;</div><div class='ctx'> </div><div class='ctx'> 	/* format control data for input */</div><div class='ctx'> 	err = format_input(odata, req, cryptlen);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* encrypt first block to use as start in computing mac  */</div><div class='del'>-	crypto_cipher_encrypt_one(cipher, odata, odata);</div><div class='add'>+	sg_init_table(sg, 3);</div><div class='add'>+	sg_set_buf(&amp;sg[0], odata, 16);</div><div class='ctx'> </div><div class='ctx'> 	/* format associated data and compute into mac */</div><div class='ctx'> 	if (assoclen) {</div><div class='del'>-		pctx-&gt;ilen = format_adata(idata, assoclen);</div><div class='del'>-		get_data_to_compute(cipher, pctx, req-&gt;src, req-&gt;assoclen);</div><div class='add'>+		ilen = format_adata(idata, assoclen);</div><div class='add'>+		sg_set_buf(&amp;sg[1], idata, ilen);</div><div class='add'>+		sg_chain(sg, 3, req-&gt;src);</div><div class='ctx'> 	} else {</div><div class='del'>-		pctx-&gt;ilen = 0;</div><div class='add'>+		ilen = 0;</div><div class='add'>+		sg_chain(sg, 2, req-&gt;src);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* compute plaintext into mac */</div><div class='del'>-	if (cryptlen)</div><div class='del'>-		get_data_to_compute(cipher, pctx, plain, cryptlen);</div><div class='add'>+	ahash_request_set_tfm(ahreq, ctx-&gt;mac);</div><div class='add'>+	ahash_request_set_callback(ahreq, pctx-&gt;flags, NULL, NULL);</div><div class='add'>+	ahash_request_set_crypt(ahreq, sg, NULL, assoclen + ilen + 16);</div><div class='add'>+	err = crypto_ahash_init(ahreq);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = crypto_ahash_update(ahreq);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* we need to pad the MAC input to a round multiple of the block size */</div><div class='add'>+	ilen = 16 - (assoclen + ilen) % 16;</div><div class='add'>+	if (ilen &lt; 16) {</div><div class='add'>+		memset(idata, 0, ilen);</div><div class='add'>+		sg_init_table(sg, 2);</div><div class='add'>+		sg_set_buf(&amp;sg[0], idata, ilen);</div><div class='add'>+		if (plain)</div><div class='add'>+			sg_chain(sg, 2, plain);</div><div class='add'>+		plain = sg;</div><div class='add'>+		cryptlen += ilen;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	ahash_request_set_crypt(ahreq, plain, pctx-&gt;odata, cryptlen);</div><div class='add'>+	err = crypto_ahash_finup(ahreq);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -453,21 +403,21 @@ static int crypto_ccm_init_tfm(struct crypto_aead *tfm)</div><div class='ctx'> 	struct aead_instance *inst = aead_alg_instance(tfm);</div><div class='ctx'> 	struct ccm_instance_ctx *ictx = aead_instance_ctx(inst);</div><div class='ctx'> 	struct crypto_ccm_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='del'>-	struct crypto_cipher *cipher;</div><div class='add'>+	struct crypto_ahash *mac;</div><div class='ctx'> 	struct crypto_skcipher *ctr;</div><div class='ctx'> 	unsigned long align;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cipher = crypto_spawn_cipher(&amp;ictx-&gt;cipher);</div><div class='del'>-	if (IS_ERR(cipher))</div><div class='del'>-		return PTR_ERR(cipher);</div><div class='add'>+	mac = crypto_spawn_ahash(&amp;ictx-&gt;mac);</div><div class='add'>+	if (IS_ERR(mac))</div><div class='add'>+		return PTR_ERR(mac);</div><div class='ctx'> </div><div class='del'>-	ctr = crypto_spawn_skcipher2(&amp;ictx-&gt;ctr);</div><div class='add'>+	ctr = crypto_spawn_skcipher(&amp;ictx-&gt;ctr);</div><div class='ctx'> 	err = PTR_ERR(ctr);</div><div class='ctx'> 	if (IS_ERR(ctr))</div><div class='del'>-		goto err_free_cipher;</div><div class='add'>+		goto err_free_mac;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;cipher = cipher;</div><div class='add'>+	ctx-&gt;mac = mac;</div><div class='ctx'> 	ctx-&gt;ctr = ctr;</div><div class='ctx'> </div><div class='ctx'> 	align = crypto_aead_alignmask(tfm);</div><div class='hunk'>@@ -479,8 +429,8 @@ static int crypto_ccm_init_tfm(struct crypto_aead *tfm)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_free_cipher:</div><div class='del'>-	crypto_free_cipher(cipher);</div><div class='add'>+err_free_mac:</div><div class='add'>+	crypto_free_ahash(mac);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -488,7 +438,7 @@ static void crypto_ccm_exit_tfm(struct crypto_aead *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_ccm_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	crypto_free_cipher(ctx-&gt;cipher);</div><div class='add'>+	crypto_free_ahash(ctx-&gt;mac);</div><div class='ctx'> 	crypto_free_skcipher(ctx-&gt;ctr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -496,7 +446,7 @@ static void crypto_ccm_free(struct aead_instance *inst)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccm_instance_ctx *ctx = aead_instance_ctx(inst);</div><div class='ctx'> </div><div class='del'>-	crypto_drop_spawn(&amp;ctx-&gt;cipher);</div><div class='add'>+	crypto_drop_ahash(&amp;ctx-&gt;mac);</div><div class='ctx'> 	crypto_drop_skcipher(&amp;ctx-&gt;ctr);</div><div class='ctx'> 	kfree(inst);</div><div class='ctx'> }</div><div class='hunk'>@@ -505,12 +455,13 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,</div><div class='ctx'> 				    struct rtattr **tb,</div><div class='ctx'> 				    const char *full_name,</div><div class='ctx'> 				    const char *ctr_name,</div><div class='del'>-				    const char *cipher_name)</div><div class='add'>+				    const char *mac_name)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_attr_type *algt;</div><div class='ctx'> 	struct aead_instance *inst;</div><div class='ctx'> 	struct skcipher_alg *ctr;</div><div class='del'>-	struct crypto_alg *cipher;</div><div class='add'>+	struct crypto_alg *mac_alg;</div><div class='add'>+	struct hash_alg_common *mac;</div><div class='ctx'> 	struct ccm_instance_ctx *ictx;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -521,34 +472,35 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,</div><div class='ctx'> 	if ((algt-&gt;type ^ CRYPTO_ALG_TYPE_AEAD) &amp; algt-&gt;mask)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	cipher = crypto_alg_mod_lookup(cipher_name,  CRYPTO_ALG_TYPE_CIPHER,</div><div class='del'>-				       CRYPTO_ALG_TYPE_MASK);</div><div class='del'>-	if (IS_ERR(cipher))</div><div class='del'>-		return PTR_ERR(cipher);</div><div class='add'>+	mac_alg = crypto_find_alg(mac_name, &amp;crypto_ahash_type,</div><div class='add'>+				  CRYPTO_ALG_TYPE_HASH,</div><div class='add'>+				  CRYPTO_ALG_TYPE_AHASH_MASK |</div><div class='add'>+				  CRYPTO_ALG_ASYNC);</div><div class='add'>+	if (IS_ERR(mac_alg))</div><div class='add'>+		return PTR_ERR(mac_alg);</div><div class='ctx'> </div><div class='add'>+	mac = __crypto_hash_alg_common(mac_alg);</div><div class='ctx'> 	err = -EINVAL;</div><div class='del'>-	if (cipher-&gt;cra_blocksize != 16)</div><div class='del'>-		goto out_put_cipher;</div><div class='add'>+	if (mac-&gt;digestsize != 16)</div><div class='add'>+		goto out_put_mac;</div><div class='ctx'> </div><div class='ctx'> 	inst = kzalloc(sizeof(*inst) + sizeof(*ictx), GFP_KERNEL);</div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	if (!inst)</div><div class='del'>-		goto out_put_cipher;</div><div class='add'>+		goto out_put_mac;</div><div class='ctx'> </div><div class='ctx'> 	ictx = aead_instance_ctx(inst);</div><div class='del'>-</div><div class='del'>-	err = crypto_init_spawn(&amp;ictx-&gt;cipher, cipher,</div><div class='del'>-				aead_crypto_instance(inst),</div><div class='del'>-				CRYPTO_ALG_TYPE_MASK);</div><div class='add'>+	err = crypto_init_ahash_spawn(&amp;ictx-&gt;mac, mac,</div><div class='add'>+				      aead_crypto_instance(inst));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free_inst;</div><div class='ctx'> </div><div class='ctx'> 	crypto_set_skcipher_spawn(&amp;ictx-&gt;ctr, aead_crypto_instance(inst));</div><div class='del'>-	err = crypto_grab_skcipher2(&amp;ictx-&gt;ctr, ctr_name, 0,</div><div class='del'>-				    crypto_requires_sync(algt-&gt;type,</div><div class='del'>-							 algt-&gt;mask));</div><div class='add'>+	err = crypto_grab_skcipher(&amp;ictx-&gt;ctr, ctr_name, 0,</div><div class='add'>+				   crypto_requires_sync(algt-&gt;type,</div><div class='add'>+							algt-&gt;mask));</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_drop_cipher;</div><div class='add'>+		goto err_drop_mac;</div><div class='ctx'> </div><div class='ctx'> 	ctr = crypto_spawn_skcipher_alg(&amp;ictx-&gt;ctr);</div><div class='ctx'> </div><div class='hunk'>@@ -564,18 +516,17 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,</div><div class='ctx'> 	err = -ENAMETOOLONG;</div><div class='ctx'> 	if (snprintf(inst-&gt;alg.base.cra_driver_name, CRYPTO_MAX_ALG_NAME,</div><div class='ctx'> 		     "ccm_base(%s,%s)", ctr-&gt;base.cra_driver_name,</div><div class='del'>-		     cipher-&gt;cra_driver_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		     mac-&gt;base.cra_driver_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='ctx'> 		goto err_drop_ctr;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(inst-&gt;alg.base.cra_name, full_name, CRYPTO_MAX_ALG_NAME);</div><div class='ctx'> </div><div class='ctx'> 	inst-&gt;alg.base.cra_flags = ctr-&gt;base.cra_flags &amp; CRYPTO_ALG_ASYNC;</div><div class='del'>-	inst-&gt;alg.base.cra_priority = (cipher-&gt;cra_priority +</div><div class='add'>+	inst-&gt;alg.base.cra_priority = (mac-&gt;base.cra_priority +</div><div class='ctx'> 				       ctr-&gt;base.cra_priority) / 2;</div><div class='ctx'> 	inst-&gt;alg.base.cra_blocksize = 1;</div><div class='del'>-	inst-&gt;alg.base.cra_alignmask = cipher-&gt;cra_alignmask |</div><div class='del'>-				       ctr-&gt;base.cra_alignmask |</div><div class='del'>-				       (__alignof__(u32) - 1);</div><div class='add'>+	inst-&gt;alg.base.cra_alignmask = mac-&gt;base.cra_alignmask |</div><div class='add'>+				       ctr-&gt;base.cra_alignmask;</div><div class='ctx'> 	inst-&gt;alg.ivsize = 16;</div><div class='ctx'> 	inst-&gt;alg.chunksize = crypto_skcipher_alg_chunksize(ctr);</div><div class='ctx'> 	inst-&gt;alg.maxauthsize = 16;</div><div class='hunk'>@@ -593,23 +544,24 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_drop_ctr;</div><div class='ctx'> </div><div class='del'>-out_put_cipher:</div><div class='del'>-	crypto_mod_put(cipher);</div><div class='add'>+out_put_mac:</div><div class='add'>+	crypto_mod_put(mac_alg);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> err_drop_ctr:</div><div class='ctx'> 	crypto_drop_skcipher(&amp;ictx-&gt;ctr);</div><div class='del'>-err_drop_cipher:</div><div class='del'>-	crypto_drop_spawn(&amp;ictx-&gt;cipher);</div><div class='add'>+err_drop_mac:</div><div class='add'>+	crypto_drop_ahash(&amp;ictx-&gt;mac);</div><div class='ctx'> err_free_inst:</div><div class='ctx'> 	kfree(inst);</div><div class='del'>-	goto out_put_cipher;</div><div class='add'>+	goto out_put_mac;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crypto_ccm_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> {</div><div class='ctx'> 	const char *cipher_name;</div><div class='ctx'> 	char ctr_name[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+	char mac_name[CRYPTO_MAX_ALG_NAME];</div><div class='ctx'> 	char full_name[CRYPTO_MAX_ALG_NAME];</div><div class='ctx'> </div><div class='ctx'> 	cipher_name = crypto_attr_alg_name(tb[1]);</div><div class='hunk'>@@ -620,12 +572,16 @@ static int crypto_ccm_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> 		     cipher_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='ctx'> 		return -ENAMETOOLONG;</div><div class='ctx'> </div><div class='add'>+	if (snprintf(mac_name, CRYPTO_MAX_ALG_NAME, "cbcmac(%s)",</div><div class='add'>+		     cipher_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		return -ENAMETOOLONG;</div><div class='add'>+</div><div class='ctx'> 	if (snprintf(full_name, CRYPTO_MAX_ALG_NAME, "ccm(%s)", cipher_name) &gt;=</div><div class='ctx'> 	    CRYPTO_MAX_ALG_NAME)</div><div class='ctx'> 		return -ENAMETOOLONG;</div><div class='ctx'> </div><div class='ctx'> 	return crypto_ccm_create_common(tmpl, tb, full_name, ctr_name,</div><div class='del'>-					cipher_name);</div><div class='add'>+					mac_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_template crypto_ccm_tmpl = {</div><div class='hunk'>@@ -899,14 +855,164 @@ static struct crypto_template crypto_rfc4309_tmpl = {</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int crypto_cbcmac_digest_setkey(struct crypto_shash *parent,</div><div class='add'>+				     const u8 *inkey, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct cbcmac_tfm_ctx *ctx = crypto_shash_ctx(parent);</div><div class='add'>+</div><div class='add'>+	return crypto_cipher_setkey(ctx-&gt;child, inkey, keylen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crypto_cbcmac_digest_init(struct shash_desc *pdesc)</div><div class='add'>+{</div><div class='add'>+	struct cbcmac_desc_ctx *ctx = shash_desc_ctx(pdesc);</div><div class='add'>+	int bs = crypto_shash_digestsize(pdesc-&gt;tfm);</div><div class='add'>+	u8 *dg = (u8 *)ctx + crypto_shash_descsize(pdesc-&gt;tfm) - bs;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;len = 0;</div><div class='add'>+	memset(dg, 0, bs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crypto_cbcmac_digest_update(struct shash_desc *pdesc, const u8 *p,</div><div class='add'>+				       unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct crypto_shash *parent = pdesc-&gt;tfm;</div><div class='add'>+	struct cbcmac_tfm_ctx *tctx = crypto_shash_ctx(parent);</div><div class='add'>+	struct cbcmac_desc_ctx *ctx = shash_desc_ctx(pdesc);</div><div class='add'>+	struct crypto_cipher *tfm = tctx-&gt;child;</div><div class='add'>+	int bs = crypto_shash_digestsize(parent);</div><div class='add'>+	u8 *dg = (u8 *)ctx + crypto_shash_descsize(parent) - bs;</div><div class='add'>+</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+		unsigned int l = min(len, bs - ctx-&gt;len);</div><div class='add'>+</div><div class='add'>+		crypto_xor(dg + ctx-&gt;len, p, l);</div><div class='add'>+		ctx-&gt;len +=l;</div><div class='add'>+		len -= l;</div><div class='add'>+		p += l;</div><div class='add'>+</div><div class='add'>+		if (ctx-&gt;len == bs) {</div><div class='add'>+			crypto_cipher_encrypt_one(tfm, dg, dg);</div><div class='add'>+			ctx-&gt;len = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crypto_cbcmac_digest_final(struct shash_desc *pdesc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	struct crypto_shash *parent = pdesc-&gt;tfm;</div><div class='add'>+	struct cbcmac_tfm_ctx *tctx = crypto_shash_ctx(parent);</div><div class='add'>+	struct cbcmac_desc_ctx *ctx = shash_desc_ctx(pdesc);</div><div class='add'>+	struct crypto_cipher *tfm = tctx-&gt;child;</div><div class='add'>+	int bs = crypto_shash_digestsize(parent);</div><div class='add'>+	u8 *dg = (u8 *)ctx + crypto_shash_descsize(parent) - bs;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;len)</div><div class='add'>+		crypto_cipher_encrypt_one(tfm, dg, dg);</div><div class='add'>+</div><div class='add'>+	memcpy(out, dg, bs);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbcmac_init_tfm(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct crypto_cipher *cipher;</div><div class='add'>+	struct crypto_instance *inst = (void *)tfm-&gt;__crt_alg;</div><div class='add'>+	struct crypto_spawn *spawn = crypto_instance_ctx(inst);</div><div class='add'>+	struct cbcmac_tfm_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	cipher = crypto_spawn_cipher(spawn);</div><div class='add'>+	if (IS_ERR(cipher))</div><div class='add'>+		return PTR_ERR(cipher);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;child = cipher;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cbcmac_exit_tfm(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct cbcmac_tfm_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	crypto_free_cipher(ctx-&gt;child);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbcmac_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='add'>+{</div><div class='add'>+	struct shash_instance *inst;</div><div class='add'>+	struct crypto_alg *alg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,</div><div class='add'>+				  CRYPTO_ALG_TYPE_MASK);</div><div class='add'>+	if (IS_ERR(alg))</div><div class='add'>+		return PTR_ERR(alg);</div><div class='add'>+</div><div class='add'>+	inst = shash_alloc_instance("cbcmac", alg);</div><div class='add'>+	err = PTR_ERR(inst);</div><div class='add'>+	if (IS_ERR(inst))</div><div class='add'>+		goto out_put_alg;</div><div class='add'>+</div><div class='add'>+	err = crypto_init_spawn(shash_instance_ctx(inst), alg,</div><div class='add'>+				shash_crypto_instance(inst),</div><div class='add'>+				CRYPTO_ALG_TYPE_MASK);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_inst;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.base.cra_priority = alg-&gt;cra_priority;</div><div class='add'>+	inst-&gt;alg.base.cra_blocksize = 1;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.digestsize = alg-&gt;cra_blocksize;</div><div class='add'>+	inst-&gt;alg.descsize = ALIGN(sizeof(struct cbcmac_desc_ctx),</div><div class='add'>+				   alg-&gt;cra_alignmask + 1) +</div><div class='add'>+			     alg-&gt;cra_blocksize;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.base.cra_ctxsize = sizeof(struct cbcmac_tfm_ctx);</div><div class='add'>+	inst-&gt;alg.base.cra_init = cbcmac_init_tfm;</div><div class='add'>+	inst-&gt;alg.base.cra_exit = cbcmac_exit_tfm;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.init = crypto_cbcmac_digest_init;</div><div class='add'>+	inst-&gt;alg.update = crypto_cbcmac_digest_update;</div><div class='add'>+	inst-&gt;alg.final = crypto_cbcmac_digest_final;</div><div class='add'>+	inst-&gt;alg.setkey = crypto_cbcmac_digest_setkey;</div><div class='add'>+</div><div class='add'>+	err = shash_register_instance(tmpl, inst);</div><div class='add'>+</div><div class='add'>+out_free_inst:</div><div class='add'>+	if (err)</div><div class='add'>+		shash_free_instance(shash_crypto_instance(inst));</div><div class='add'>+</div><div class='add'>+out_put_alg:</div><div class='add'>+	crypto_mod_put(alg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_template crypto_cbcmac_tmpl = {</div><div class='add'>+	.name = "cbcmac",</div><div class='add'>+	.create = cbcmac_create,</div><div class='add'>+	.free = shash_free_instance,</div><div class='add'>+	.module = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init crypto_ccm_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = crypto_register_template(&amp;crypto_ccm_base_tmpl);</div><div class='add'>+	err = crypto_register_template(&amp;crypto_cbcmac_tmpl);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	err = crypto_register_template(&amp;crypto_ccm_base_tmpl);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_undo_cbcmac;</div><div class='add'>+</div><div class='ctx'> 	err = crypto_register_template(&amp;crypto_ccm_tmpl);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_undo_base;</div><div class='hunk'>@@ -922,6 +1028,8 @@ out_undo_ccm:</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_ccm_tmpl);</div><div class='ctx'> out_undo_base:</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_ccm_base_tmpl);</div><div class='add'>+out_undo_cbcmac:</div><div class='add'>+	crypto_register_template(&amp;crypto_cbcmac_tmpl);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -930,6 +1038,7 @@ static void __exit crypto_ccm_module_exit(void)</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_rfc4309_tmpl);</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_ccm_tmpl);</div><div class='ctx'> 	crypto_unregister_template(&amp;crypto_ccm_base_tmpl);</div><div class='add'>+	crypto_unregister_template(&amp;crypto_cbcmac_tmpl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(crypto_ccm_module_init);</div><div class='head'>diff --git a/crypto/chacha20_generic.c b/crypto/chacha20_generic.c<br/>index 1cab83146e33..8b3c04d625c3 100644<br/>--- a/<a href='/drm-misc/tree/crypto/chacha20_generic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/chacha20_generic.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/chacha20_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/chacha20_generic.c</a></div><div class='hunk'>@@ -10,10 +10,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;crypto/chacha20.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline u32 le32_to_cpuvp(const void *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -63,10 +62,10 @@ void crypto_chacha20_init(u32 *state, struct chacha20_ctx *ctx, u8 *iv)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_chacha20_init);</div><div class='ctx'> </div><div class='del'>-int crypto_chacha20_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='ctx'> 			   unsigned int keysize)</div><div class='ctx'> {</div><div class='del'>-	struct chacha20_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct chacha20_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (keysize != CHACHA20_KEY_SIZE)</div><div class='hunk'>@@ -79,66 +78,54 @@ int crypto_chacha20_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_chacha20_setkey);</div><div class='ctx'> </div><div class='del'>-int crypto_chacha20_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-			  struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+int crypto_chacha20_crypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct chacha20_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_walk walk;</div><div class='ctx'> 	u32 state[16];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt_block(desc, &amp;walk, CHACHA20_BLOCK_SIZE);</div><div class='del'>-</div><div class='del'>-	crypto_chacha20_init(state, crypto_blkcipher_ctx(desc-&gt;tfm), walk.iv);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, true);</div><div class='ctx'> </div><div class='del'>-	while (walk.nbytes &gt;= CHACHA20_BLOCK_SIZE) {</div><div class='del'>-		chacha20_docrypt(state, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='del'>-				 rounddown(walk.nbytes, CHACHA20_BLOCK_SIZE));</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk,</div><div class='del'>-					  walk.nbytes % CHACHA20_BLOCK_SIZE);</div><div class='del'>-	}</div><div class='add'>+	crypto_chacha20_init(state, ctx, walk.iv);</div><div class='ctx'> </div><div class='del'>-	if (walk.nbytes) {</div><div class='add'>+	while (walk.nbytes &gt; 0) {</div><div class='ctx'> 		chacha20_docrypt(state, walk.dst.virt.addr, walk.src.virt.addr,</div><div class='ctx'> 				 walk.nbytes);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, 0);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_chacha20_crypt);</div><div class='ctx'> </div><div class='del'>-static struct crypto_alg alg = {</div><div class='del'>-	.cra_name		= "chacha20",</div><div class='del'>-	.cra_driver_name	= "chacha20-generic",</div><div class='del'>-	.cra_priority		= 100,</div><div class='del'>-	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='del'>-	.cra_blocksize		= 1,</div><div class='del'>-	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='del'>-	.cra_ctxsize		= sizeof(struct chacha20_ctx),</div><div class='del'>-	.cra_alignmask		= sizeof(u32) - 1,</div><div class='del'>-	.cra_module		= THIS_MODULE,</div><div class='del'>-	.cra_u			= {</div><div class='del'>-		.blkcipher = {</div><div class='del'>-			.min_keysize	= CHACHA20_KEY_SIZE,</div><div class='del'>-			.max_keysize	= CHACHA20_KEY_SIZE,</div><div class='del'>-			.ivsize		= CHACHA20_IV_SIZE,</div><div class='del'>-			.geniv		= "seqiv",</div><div class='del'>-			.setkey		= crypto_chacha20_setkey,</div><div class='del'>-			.encrypt	= crypto_chacha20_crypt,</div><div class='del'>-			.decrypt	= crypto_chacha20_crypt,</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='add'>+static struct skcipher_alg alg = {</div><div class='add'>+	.base.cra_name		= "chacha20",</div><div class='add'>+	.base.cra_driver_name	= "chacha20-generic",</div><div class='add'>+	.base.cra_priority	= 100,</div><div class='add'>+	.base.cra_blocksize	= 1,</div><div class='add'>+	.base.cra_ctxsize	= sizeof(struct chacha20_ctx),</div><div class='add'>+	.base.cra_alignmask	= sizeof(u32) - 1,</div><div class='add'>+	.base.cra_module	= THIS_MODULE,</div><div class='add'>+</div><div class='add'>+	.min_keysize		= CHACHA20_KEY_SIZE,</div><div class='add'>+	.max_keysize		= CHACHA20_KEY_SIZE,</div><div class='add'>+	.ivsize			= CHACHA20_IV_SIZE,</div><div class='add'>+	.chunksize		= CHACHA20_BLOCK_SIZE,</div><div class='add'>+	.setkey			= crypto_chacha20_setkey,</div><div class='add'>+	.encrypt		= crypto_chacha20_crypt,</div><div class='add'>+	.decrypt		= crypto_chacha20_crypt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init chacha20_generic_mod_init(void)</div><div class='ctx'> {</div><div class='del'>-	return crypto_register_alg(&amp;alg);</div><div class='add'>+	return crypto_register_skcipher(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit chacha20_generic_mod_fini(void)</div><div class='ctx'> {</div><div class='del'>-	crypto_unregister_alg(&amp;alg);</div><div class='add'>+	crypto_unregister_skcipher(&amp;alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(chacha20_generic_mod_init);</div><div class='head'>diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c<br/>index e899ef51dc8e..db1bc3147bc4 100644<br/>--- a/<a href='/drm-misc/tree/crypto/chacha20poly1305.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/chacha20poly1305.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/chacha20poly1305.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/chacha20poly1305.c</a></div><div class='hunk'>@@ -532,7 +532,7 @@ static int chachapoly_init(struct crypto_aead *tfm)</div><div class='ctx'> 	if (IS_ERR(poly))</div><div class='ctx'> 		return PTR_ERR(poly);</div><div class='ctx'> </div><div class='del'>-	chacha = crypto_spawn_skcipher2(&amp;ictx-&gt;chacha);</div><div class='add'>+	chacha = crypto_spawn_skcipher(&amp;ictx-&gt;chacha);</div><div class='ctx'> 	if (IS_ERR(chacha)) {</div><div class='ctx'> 		crypto_free_ahash(poly);</div><div class='ctx'> 		return PTR_ERR(chacha);</div><div class='hunk'>@@ -625,9 +625,9 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb,</div><div class='ctx'> 		goto err_free_inst;</div><div class='ctx'> </div><div class='ctx'> 	crypto_set_skcipher_spawn(&amp;ctx-&gt;chacha, aead_crypto_instance(inst));</div><div class='del'>-	err = crypto_grab_skcipher2(&amp;ctx-&gt;chacha, chacha_name, 0,</div><div class='del'>-				    crypto_requires_sync(algt-&gt;type,</div><div class='del'>-							 algt-&gt;mask));</div><div class='add'>+	err = crypto_grab_skcipher(&amp;ctx-&gt;chacha, chacha_name, 0,</div><div class='add'>+				   crypto_requires_sync(algt-&gt;type,</div><div class='add'>+							algt-&gt;mask));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_drop_poly;</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/cipher.c b/crypto/cipher.c<br/>index 39541e0e537d..94fa3551476b 100644<br/>--- a/<a href='/drm-misc/tree/crypto/cipher.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/cipher.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/cipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/cipher.c</a></div><div class='hunk'>@@ -116,7 +116,3 @@ int crypto_init_cipher_ops(struct crypto_tfm *tfm)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void crypto_exit_cipher_ops(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-}</div><div class='head'>diff --git a/crypto/cmac.c b/crypto/cmac.c<br/>index 7a8bfbd548f6..16301f52858c 100644<br/>--- a/<a href='/drm-misc/tree/crypto/cmac.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/cmac.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/cmac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/cmac.c</a></div><div class='hunk'>@@ -57,7 +57,8 @@ static int crypto_cmac_digest_setkey(struct crypto_shash *parent,</div><div class='ctx'> 	unsigned long alignmask = crypto_shash_alignmask(parent);</div><div class='ctx'> 	struct cmac_tfm_ctx *ctx = crypto_shash_ctx(parent);</div><div class='ctx'> 	unsigned int bs = crypto_shash_blocksize(parent);</div><div class='del'>-	__be64 *consts = PTR_ALIGN((void *)ctx-&gt;ctx, alignmask + 1);</div><div class='add'>+	__be64 *consts = PTR_ALIGN((void *)ctx-&gt;ctx,</div><div class='add'>+				   (alignmask | (__alignof__(__be64) - 1)) + 1);</div><div class='ctx'> 	u64 _const[2];</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> 	u8 msb_mask, gfmask;</div><div class='hunk'>@@ -173,7 +174,8 @@ static int crypto_cmac_digest_final(struct shash_desc *pdesc, u8 *out)</div><div class='ctx'> 	struct cmac_desc_ctx *ctx = shash_desc_ctx(pdesc);</div><div class='ctx'> 	struct crypto_cipher *tfm = tctx-&gt;child;</div><div class='ctx'> 	int bs = crypto_shash_blocksize(parent);</div><div class='del'>-	u8 *consts = PTR_ALIGN((void *)tctx-&gt;ctx, alignmask + 1);</div><div class='add'>+	u8 *consts = PTR_ALIGN((void *)tctx-&gt;ctx,</div><div class='add'>+			       (alignmask | (__alignof__(__be64) - 1)) + 1);</div><div class='ctx'> 	u8 *odds = PTR_ALIGN((void *)ctx-&gt;ctx, alignmask + 1);</div><div class='ctx'> 	u8 *prev = odds + bs;</div><div class='ctx'> 	unsigned int offset = 0;</div><div class='hunk'>@@ -243,6 +245,7 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> 	case 8:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> 		goto out_put_alg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -257,7 +260,7 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_free_inst;</div><div class='ctx'> </div><div class='del'>-	alignmask = alg-&gt;cra_alignmask | (sizeof(long) - 1);</div><div class='add'>+	alignmask = alg-&gt;cra_alignmask;</div><div class='ctx'> 	inst-&gt;alg.base.cra_alignmask = alignmask;</div><div class='ctx'> 	inst-&gt;alg.base.cra_priority = alg-&gt;cra_priority;</div><div class='ctx'> 	inst-&gt;alg.base.cra_blocksize = alg-&gt;cra_blocksize;</div><div class='hunk'>@@ -269,7 +272,9 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> 		+ alg-&gt;cra_blocksize * 2;</div><div class='ctx'> </div><div class='ctx'> 	inst-&gt;alg.base.cra_ctxsize =</div><div class='del'>-		ALIGN(sizeof(struct cmac_tfm_ctx), alignmask + 1)</div><div class='add'>+		ALIGN(sizeof(struct cmac_tfm_ctx), crypto_tfm_ctx_alignment())</div><div class='add'>+		+ ((alignmask | (__alignof__(__be64) - 1)) &amp;</div><div class='add'>+		   ~(crypto_tfm_ctx_alignment() - 1))</div><div class='ctx'> 		+ alg-&gt;cra_blocksize * 2;</div><div class='ctx'> </div><div class='ctx'> 	inst-&gt;alg.base.cra_init = cmac_init_tfm;</div><div class='head'>diff --git a/crypto/compress.c b/crypto/compress.c<br/>index c33f0763a956..f2d522924a07 100644<br/>--- a/<a href='/drm-misc/tree/crypto/compress.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/compress.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/compress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/compress.c</a></div><div class='hunk'>@@ -42,7 +42,3 @@ int crypto_init_compress_ops(struct crypto_tfm *tfm)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void crypto_exit_compress_ops(struct crypto_tfm *tfm)</div><div class='del'>-{</div><div class='del'>-}</div><div class='head'>diff --git a/crypto/cryptd.c b/crypto/cryptd.c<br/>index 0c654e59f215..0508c48a45c4 100644<br/>--- a/<a href='/drm-misc/tree/crypto/cryptd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/cryptd.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/cryptd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/cryptd.c</a></div><div class='hunk'>@@ -17,9 +17,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;crypto/cryptd.h&gt;</div><div class='ctx'> #include &lt;crypto/crypto_wq.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='hunk'>@@ -48,6 +48,11 @@ struct cryptd_instance_ctx {</div><div class='ctx'> 	struct cryptd_queue *queue;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct skcipherd_instance_ctx {</div><div class='add'>+	struct crypto_skcipher_spawn spawn;</div><div class='add'>+	struct cryptd_queue *queue;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hashd_instance_ctx {</div><div class='ctx'> 	struct crypto_shash_spawn spawn;</div><div class='ctx'> 	struct cryptd_queue *queue;</div><div class='hunk'>@@ -67,6 +72,15 @@ struct cryptd_blkcipher_request_ctx {</div><div class='ctx'> 	crypto_completion_t complete;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct cryptd_skcipher_ctx {</div><div class='add'>+	atomic_t refcnt;</div><div class='add'>+	struct crypto_skcipher *child;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cryptd_skcipher_request_ctx {</div><div class='add'>+	crypto_completion_t complete;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct cryptd_hash_ctx {</div><div class='ctx'> 	atomic_t refcnt;</div><div class='ctx'> 	struct crypto_shash *child;</div><div class='hunk'>@@ -122,7 +136,6 @@ static int cryptd_enqueue_request(struct cryptd_queue *queue,</div><div class='ctx'> {</div><div class='ctx'> 	int cpu, err;</div><div class='ctx'> 	struct cryptd_cpu_queue *cpu_queue;</div><div class='del'>-	struct crypto_tfm *tfm;</div><div class='ctx'> 	atomic_t *refcnt;</div><div class='ctx'> 	bool may_backlog;</div><div class='ctx'> </div><div class='hunk'>@@ -141,7 +154,6 @@ static int cryptd_enqueue_request(struct cryptd_queue *queue,</div><div class='ctx'> 	if (!atomic_read(refcnt))</div><div class='ctx'> 		goto out_put_cpu;</div><div class='ctx'> </div><div class='del'>-	tfm = request-&gt;tfm;</div><div class='ctx'> 	atomic_inc(refcnt);</div><div class='ctx'> </div><div class='ctx'> out_put_cpu:</div><div class='hunk'>@@ -432,6 +444,216 @@ out_put_alg:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cryptd_skcipher_setkey(struct crypto_skcipher *parent,</div><div class='add'>+				  const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(parent);</div><div class='add'>+	struct crypto_skcipher *child = ctx-&gt;child;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	crypto_skcipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_skcipher_set_flags(child, crypto_skcipher_get_flags(parent) &amp;</div><div class='add'>+					 CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	err = crypto_skcipher_setkey(child, key, keylen);</div><div class='add'>+	crypto_skcipher_set_flags(parent, crypto_skcipher_get_flags(child) &amp;</div><div class='add'>+					  CRYPTO_TFM_RES_MASK);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cryptd_skcipher_complete(struct skcipher_request *req, int err)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct cryptd_skcipher_request_ctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	int refcnt = atomic_read(&amp;ctx-&gt;refcnt);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	rctx-&gt;complete(&amp;req-&gt;base, err);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	if (err != -EINPROGRESS &amp;&amp; refcnt &amp;&amp; atomic_dec_and_test(&amp;ctx-&gt;refcnt))</div><div class='add'>+		crypto_free_skcipher(tfm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cryptd_skcipher_encrypt(struct crypto_async_request *base,</div><div class='add'>+				    int err)</div><div class='add'>+{</div><div class='add'>+	struct skcipher_request *req = skcipher_request_cast(base);</div><div class='add'>+	struct cryptd_skcipher_request_ctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_skcipher *child = ctx-&gt;child;</div><div class='add'>+	SKCIPHER_REQUEST_ON_STACK(subreq, child);</div><div class='add'>+</div><div class='add'>+	if (unlikely(err == -EINPROGRESS))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skcipher_request_set_tfm(subreq, child);</div><div class='add'>+	skcipher_request_set_callback(subreq, CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='add'>+				      NULL, NULL);</div><div class='add'>+	skcipher_request_set_crypt(subreq, req-&gt;src, req-&gt;dst, req-&gt;cryptlen,</div><div class='add'>+				   req-&gt;iv);</div><div class='add'>+</div><div class='add'>+	err = crypto_skcipher_encrypt(subreq);</div><div class='add'>+	skcipher_request_zero(subreq);</div><div class='add'>+</div><div class='add'>+	req-&gt;base.complete = rctx-&gt;complete;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	cryptd_skcipher_complete(req, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cryptd_skcipher_decrypt(struct crypto_async_request *base,</div><div class='add'>+				    int err)</div><div class='add'>+{</div><div class='add'>+	struct skcipher_request *req = skcipher_request_cast(base);</div><div class='add'>+	struct cryptd_skcipher_request_ctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_skcipher *child = ctx-&gt;child;</div><div class='add'>+	SKCIPHER_REQUEST_ON_STACK(subreq, child);</div><div class='add'>+</div><div class='add'>+	if (unlikely(err == -EINPROGRESS))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skcipher_request_set_tfm(subreq, child);</div><div class='add'>+	skcipher_request_set_callback(subreq, CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='add'>+				      NULL, NULL);</div><div class='add'>+	skcipher_request_set_crypt(subreq, req-&gt;src, req-&gt;dst, req-&gt;cryptlen,</div><div class='add'>+				   req-&gt;iv);</div><div class='add'>+</div><div class='add'>+	err = crypto_skcipher_decrypt(subreq);</div><div class='add'>+	skcipher_request_zero(subreq);</div><div class='add'>+</div><div class='add'>+	req-&gt;base.complete = rctx-&gt;complete;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	cryptd_skcipher_complete(req, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cryptd_skcipher_enqueue(struct skcipher_request *req,</div><div class='add'>+				   crypto_completion_t compl)</div><div class='add'>+{</div><div class='add'>+	struct cryptd_skcipher_request_ctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct cryptd_queue *queue;</div><div class='add'>+</div><div class='add'>+	queue = cryptd_get_queue(crypto_skcipher_tfm(tfm));</div><div class='add'>+	rctx-&gt;complete = req-&gt;base.complete;</div><div class='add'>+	req-&gt;base.complete = compl;</div><div class='add'>+</div><div class='add'>+	return cryptd_enqueue_request(queue, &amp;req-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cryptd_skcipher_encrypt_enqueue(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return cryptd_skcipher_enqueue(req, cryptd_skcipher_encrypt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cryptd_skcipher_decrypt_enqueue(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return cryptd_skcipher_enqueue(req, cryptd_skcipher_decrypt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cryptd_skcipher_init_tfm(struct crypto_skcipher *tfm)</div><div class='add'>+{</div><div class='add'>+	struct skcipher_instance *inst = skcipher_alg_instance(tfm);</div><div class='add'>+	struct skcipherd_instance_ctx *ictx = skcipher_instance_ctx(inst);</div><div class='add'>+	struct crypto_skcipher_spawn *spawn = &amp;ictx-&gt;spawn;</div><div class='add'>+	struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_skcipher *cipher;</div><div class='add'>+</div><div class='add'>+	cipher = crypto_spawn_skcipher(spawn);</div><div class='add'>+	if (IS_ERR(cipher))</div><div class='add'>+		return PTR_ERR(cipher);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;child = cipher;</div><div class='add'>+	crypto_skcipher_set_reqsize(</div><div class='add'>+		tfm, sizeof(struct cryptd_skcipher_request_ctx));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cryptd_skcipher_exit_tfm(struct crypto_skcipher *tfm)</div><div class='add'>+{</div><div class='add'>+	struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	crypto_free_skcipher(ctx-&gt;child);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cryptd_skcipher_free(struct skcipher_instance *inst)</div><div class='add'>+{</div><div class='add'>+	struct skcipherd_instance_ctx *ctx = skcipher_instance_ctx(inst);</div><div class='add'>+</div><div class='add'>+	crypto_drop_skcipher(&amp;ctx-&gt;spawn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cryptd_create_skcipher(struct crypto_template *tmpl,</div><div class='add'>+				  struct rtattr **tb,</div><div class='add'>+				  struct cryptd_queue *queue)</div><div class='add'>+{</div><div class='add'>+	struct skcipherd_instance_ctx *ctx;</div><div class='add'>+	struct skcipher_instance *inst;</div><div class='add'>+	struct skcipher_alg *alg;</div><div class='add'>+	const char *name;</div><div class='add'>+	u32 type;</div><div class='add'>+	u32 mask;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	type = 0;</div><div class='add'>+	mask = CRYPTO_ALG_ASYNC;</div><div class='add'>+</div><div class='add'>+	cryptd_check_internal(tb, &amp;type, &amp;mask);</div><div class='add'>+</div><div class='add'>+	name = crypto_attr_alg_name(tb[1]);</div><div class='add'>+	if (IS_ERR(name))</div><div class='add'>+		return PTR_ERR(name);</div><div class='add'>+</div><div class='add'>+	inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!inst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ctx = skcipher_instance_ctx(inst);</div><div class='add'>+	ctx-&gt;queue = queue;</div><div class='add'>+</div><div class='add'>+	crypto_set_skcipher_spawn(&amp;ctx-&gt;spawn, skcipher_crypto_instance(inst));</div><div class='add'>+	err = crypto_grab_skcipher(&amp;ctx-&gt;spawn, name, type, mask);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_inst;</div><div class='add'>+</div><div class='add'>+	alg = crypto_spawn_skcipher_alg(&amp;ctx-&gt;spawn);</div><div class='add'>+	err = cryptd_init_instance(skcipher_crypto_instance(inst), &amp;alg-&gt;base);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_drop_skcipher;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.base.cra_flags = CRYPTO_ALG_ASYNC |</div><div class='add'>+				   (alg-&gt;base.cra_flags &amp; CRYPTO_ALG_INTERNAL);</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.ivsize = crypto_skcipher_alg_ivsize(alg);</div><div class='add'>+	inst-&gt;alg.chunksize = crypto_skcipher_alg_chunksize(alg);</div><div class='add'>+	inst-&gt;alg.min_keysize = crypto_skcipher_alg_min_keysize(alg);</div><div class='add'>+	inst-&gt;alg.max_keysize = crypto_skcipher_alg_max_keysize(alg);</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.base.cra_ctxsize = sizeof(struct cryptd_skcipher_ctx);</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.init = cryptd_skcipher_init_tfm;</div><div class='add'>+	inst-&gt;alg.exit = cryptd_skcipher_exit_tfm;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.setkey = cryptd_skcipher_setkey;</div><div class='add'>+	inst-&gt;alg.encrypt = cryptd_skcipher_encrypt_enqueue;</div><div class='add'>+	inst-&gt;alg.decrypt = cryptd_skcipher_decrypt_enqueue;</div><div class='add'>+</div><div class='add'>+	inst-&gt;free = cryptd_skcipher_free;</div><div class='add'>+</div><div class='add'>+	err = skcipher_register_instance(tmpl, inst);</div><div class='add'>+	if (err) {</div><div class='add'>+out_drop_skcipher:</div><div class='add'>+		crypto_drop_skcipher(&amp;ctx-&gt;spawn);</div><div class='add'>+out_free_inst:</div><div class='add'>+		kfree(inst);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cryptd_hash_init_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_instance *inst = crypto_tfm_alg_instance(tfm);</div><div class='hunk'>@@ -895,7 +1117,11 @@ static int cryptd_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> </div><div class='ctx'> 	switch (algt-&gt;type &amp; algt-&gt;mask &amp; CRYPTO_ALG_TYPE_MASK) {</div><div class='ctx'> 	case CRYPTO_ALG_TYPE_BLKCIPHER:</div><div class='del'>-		return cryptd_create_blkcipher(tmpl, tb, &amp;queue);</div><div class='add'>+		if ((algt-&gt;type &amp; CRYPTO_ALG_TYPE_MASK) ==</div><div class='add'>+		    CRYPTO_ALG_TYPE_BLKCIPHER)</div><div class='add'>+			return cryptd_create_blkcipher(tmpl, tb, &amp;queue);</div><div class='add'>+</div><div class='add'>+		return cryptd_create_skcipher(tmpl, tb, &amp;queue);</div><div class='ctx'> 	case CRYPTO_ALG_TYPE_DIGEST:</div><div class='ctx'> 		return cryptd_create_hash(tmpl, tb, &amp;queue);</div><div class='ctx'> 	case CRYPTO_ALG_TYPE_AEAD:</div><div class='hunk'>@@ -985,6 +1211,58 @@ void cryptd_free_ablkcipher(struct cryptd_ablkcipher *tfm)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(cryptd_free_ablkcipher);</div><div class='ctx'> </div><div class='add'>+struct cryptd_skcipher *cryptd_alloc_skcipher(const char *alg_name,</div><div class='add'>+					      u32 type, u32 mask)</div><div class='add'>+{</div><div class='add'>+	char cryptd_alg_name[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+	struct cryptd_skcipher_ctx *ctx;</div><div class='add'>+	struct crypto_skcipher *tfm;</div><div class='add'>+</div><div class='add'>+	if (snprintf(cryptd_alg_name, CRYPTO_MAX_ALG_NAME,</div><div class='add'>+		     "cryptd(%s)", alg_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_skcipher(cryptd_alg_name, type, mask);</div><div class='add'>+	if (IS_ERR(tfm))</div><div class='add'>+		return ERR_CAST(tfm);</div><div class='add'>+</div><div class='add'>+	if (tfm-&gt;base.__crt_alg-&gt;cra_module != THIS_MODULE) {</div><div class='add'>+		crypto_free_skcipher(tfm);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	atomic_set(&amp;ctx-&gt;refcnt, 1);</div><div class='add'>+</div><div class='add'>+	return container_of(tfm, struct cryptd_skcipher, base);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cryptd_alloc_skcipher);</div><div class='add'>+</div><div class='add'>+struct crypto_skcipher *cryptd_skcipher_child(struct cryptd_skcipher *tfm)</div><div class='add'>+{</div><div class='add'>+	struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(&amp;tfm-&gt;base);</div><div class='add'>+</div><div class='add'>+	return ctx-&gt;child;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cryptd_skcipher_child);</div><div class='add'>+</div><div class='add'>+bool cryptd_skcipher_queued(struct cryptd_skcipher *tfm)</div><div class='add'>+{</div><div class='add'>+	struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(&amp;tfm-&gt;base);</div><div class='add'>+</div><div class='add'>+	return atomic_read(&amp;ctx-&gt;refcnt) - 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cryptd_skcipher_queued);</div><div class='add'>+</div><div class='add'>+void cryptd_free_skcipher(struct cryptd_skcipher *tfm)</div><div class='add'>+{</div><div class='add'>+	struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(&amp;tfm-&gt;base);</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_test(&amp;ctx-&gt;refcnt))</div><div class='add'>+		crypto_free_skcipher(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cryptd_free_skcipher);</div><div class='add'>+</div><div class='ctx'> struct cryptd_ahash *cryptd_alloc_ahash(const char *alg_name,</div><div class='ctx'> 					u32 type, u32 mask)</div><div class='ctx'> {</div><div class='head'>diff --git a/crypto/crypto_engine.c b/crypto/crypto_engine.c<br/>index 6989ba0046df..727bd5c3569e 100644<br/>--- a/<a href='/drm-misc/tree/crypto/crypto_engine.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/crypto_engine.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/crypto_engine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/crypto_engine.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;crypto/engine.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;uapi/linux/sched/types.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> #define CRYPTO_ENGINE_MAX_QLEN 10</div><div class='hunk'>@@ -47,7 +48,7 @@ static void crypto_pump_requests(struct crypto_engine *engine,</div><div class='ctx'> </div><div class='ctx'> 	/* If another context is idling then defer */</div><div class='ctx'> 	if (engine-&gt;idling) {</div><div class='del'>-		kthread_queue_work(&amp;engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='add'>+		kthread_queue_work(engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -58,7 +59,7 @@ static void crypto_pump_requests(struct crypto_engine *engine,</div><div class='ctx'> </div><div class='ctx'> 		/* Only do teardown in the thread */</div><div class='ctx'> 		if (!in_kthread) {</div><div class='del'>-			kthread_queue_work(&amp;engine-&gt;kworker,</div><div class='add'>+			kthread_queue_work(engine-&gt;kworker,</div><div class='ctx'> 					   &amp;engine-&gt;pump_requests);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -189,7 +190,7 @@ int crypto_transfer_cipher_request(struct crypto_engine *engine,</div><div class='ctx'> 	ret = ablkcipher_enqueue_request(&amp;engine-&gt;queue, req);</div><div class='ctx'> </div><div class='ctx'> 	if (!engine-&gt;busy &amp;&amp; need_pump)</div><div class='del'>-		kthread_queue_work(&amp;engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='add'>+		kthread_queue_work(engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;engine-&gt;queue_lock, flags);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -231,7 +232,7 @@ int crypto_transfer_hash_request(struct crypto_engine *engine,</div><div class='ctx'> 	ret = ahash_enqueue_request(&amp;engine-&gt;queue, req);</div><div class='ctx'> </div><div class='ctx'> 	if (!engine-&gt;busy &amp;&amp; need_pump)</div><div class='del'>-		kthread_queue_work(&amp;engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='add'>+		kthread_queue_work(engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;engine-&gt;queue_lock, flags);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -284,7 +285,7 @@ void crypto_finalize_cipher_request(struct crypto_engine *engine,</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;base.complete(&amp;req-&gt;base, err);</div><div class='ctx'> </div><div class='del'>-	kthread_queue_work(&amp;engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='add'>+	kthread_queue_work(engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_finalize_cipher_request);</div><div class='ctx'> </div><div class='hunk'>@@ -321,7 +322,7 @@ void crypto_finalize_hash_request(struct crypto_engine *engine,</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;base.complete(&amp;req-&gt;base, err);</div><div class='ctx'> </div><div class='del'>-	kthread_queue_work(&amp;engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='add'>+	kthread_queue_work(engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_finalize_hash_request);</div><div class='ctx'> </div><div class='hunk'>@@ -345,7 +346,7 @@ int crypto_engine_start(struct crypto_engine *engine)</div><div class='ctx'> 	engine-&gt;running = true;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;engine-&gt;queue_lock, flags);</div><div class='ctx'> </div><div class='del'>-	kthread_queue_work(&amp;engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='add'>+	kthread_queue_work(engine-&gt;kworker, &amp;engine-&gt;pump_requests);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -422,11 +423,8 @@ struct crypto_engine *crypto_engine_alloc_init(struct device *dev, bool rt)</div><div class='ctx'> 	crypto_init_queue(&amp;engine-&gt;queue, CRYPTO_ENGINE_MAX_QLEN);</div><div class='ctx'> 	spin_lock_init(&amp;engine-&gt;queue_lock);</div><div class='ctx'> </div><div class='del'>-	kthread_init_worker(&amp;engine-&gt;kworker);</div><div class='del'>-	engine-&gt;kworker_task = kthread_run(kthread_worker_fn,</div><div class='del'>-					   &amp;engine-&gt;kworker, "%s",</div><div class='del'>-					   engine-&gt;name);</div><div class='del'>-	if (IS_ERR(engine-&gt;kworker_task)) {</div><div class='add'>+	engine-&gt;kworker = kthread_create_worker(0, "%s", engine-&gt;name);</div><div class='add'>+	if (IS_ERR(engine-&gt;kworker)) {</div><div class='ctx'> 		dev_err(dev, "failed to create crypto request pump task\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -434,7 +432,7 @@ struct crypto_engine *crypto_engine_alloc_init(struct device *dev, bool rt)</div><div class='ctx'> </div><div class='ctx'> 	if (engine-&gt;rt) {</div><div class='ctx'> 		dev_info(dev, "will run requests pump with realtime priority\n");</div><div class='del'>-		sched_setscheduler(engine-&gt;kworker_task, SCHED_FIFO, &amp;param);</div><div class='add'>+		sched_setscheduler(engine-&gt;kworker-&gt;task, SCHED_FIFO, &amp;param);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return engine;</div><div class='hunk'>@@ -455,8 +453,7 @@ int crypto_engine_exit(struct crypto_engine *engine)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	kthread_flush_worker(&amp;engine-&gt;kworker);</div><div class='del'>-	kthread_stop(engine-&gt;kworker_task);</div><div class='add'>+	kthread_destroy_worker(engine-&gt;kworker);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c<br/>index 1c5705481c69..a90404a0c5ff 100644<br/>--- a/<a href='/drm-misc/tree/crypto/crypto_user.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/crypto_user.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/crypto_user.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/crypto_user.c</a></div><div class='hunk'>@@ -112,6 +112,21 @@ nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	struct crypto_report_acomp racomp;</div><div class='add'>+</div><div class='add'>+	strncpy(racomp.type, "acomp", sizeof(racomp.type));</div><div class='add'>+</div><div class='add'>+	if (nla_put(skb, CRYPTOCFGA_REPORT_ACOMP,</div><div class='add'>+		    sizeof(struct crypto_report_acomp), &amp;racomp))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_report_akcipher rakcipher;</div><div class='hunk'>@@ -186,7 +201,11 @@ static int crypto_report_one(struct crypto_alg *alg,</div><div class='ctx'> 			goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='add'>+	case CRYPTO_ALG_TYPE_ACOMPRESS:</div><div class='add'>+		if (crypto_report_acomp(skb, alg))</div><div class='add'>+			goto nla_put_failure;</div><div class='ctx'> </div><div class='add'>+		break;</div><div class='ctx'> 	case CRYPTO_ALG_TYPE_AKCIPHER:</div><div class='ctx'> 		if (crypto_report_akcipher(skb, alg))</div><div class='ctx'> 			goto nla_put_failure;</div><div class='head'>diff --git a/crypto/ctr.c b/crypto/ctr.c<br/>index ff4d21eddb83..a4f4a8983169 100644<br/>--- a/<a href='/drm-misc/tree/crypto/ctr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/ctr.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/ctr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/ctr.c</a></div><div class='hunk'>@@ -209,7 +209,7 @@ static struct crypto_instance *crypto_ctr_alloc(struct rtattr **tb)</div><div class='ctx'> 	inst-&gt;alg.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER;</div><div class='ctx'> 	inst-&gt;alg.cra_priority = alg-&gt;cra_priority;</div><div class='ctx'> 	inst-&gt;alg.cra_blocksize = 1;</div><div class='del'>-	inst-&gt;alg.cra_alignmask = alg-&gt;cra_alignmask | (__alignof__(u32) - 1);</div><div class='add'>+	inst-&gt;alg.cra_alignmask = alg-&gt;cra_alignmask;</div><div class='ctx'> 	inst-&gt;alg.cra_type = &amp;crypto_blkcipher_type;</div><div class='ctx'> </div><div class='ctx'> 	inst-&gt;alg.cra_blkcipher.ivsize = alg-&gt;cra_blocksize;</div><div class='hunk'>@@ -312,7 +312,7 @@ static int crypto_rfc3686_init_tfm(struct crypto_skcipher *tfm)</div><div class='ctx'> 	unsigned long align;</div><div class='ctx'> 	unsigned int reqsize;</div><div class='ctx'> </div><div class='del'>-	cipher = crypto_spawn_skcipher2(spawn);</div><div class='add'>+	cipher = crypto_spawn_skcipher(spawn);</div><div class='ctx'> 	if (IS_ERR(cipher))</div><div class='ctx'> 		return PTR_ERR(cipher);</div><div class='ctx'> </div><div class='hunk'>@@ -370,9 +370,9 @@ static int crypto_rfc3686_create(struct crypto_template *tmpl,</div><div class='ctx'> 	spawn = skcipher_instance_ctx(inst);</div><div class='ctx'> </div><div class='ctx'> 	crypto_set_skcipher_spawn(spawn, skcipher_crypto_instance(inst));</div><div class='del'>-	err = crypto_grab_skcipher2(spawn, cipher_name, 0,</div><div class='del'>-				    crypto_requires_sync(algt-&gt;type,</div><div class='del'>-							 algt-&gt;mask));</div><div class='add'>+	err = crypto_grab_skcipher(spawn, cipher_name, 0,</div><div class='add'>+				   crypto_requires_sync(algt-&gt;type,</div><div class='add'>+							algt-&gt;mask));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free_inst;</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/cts.c b/crypto/cts.c<br/>index 51976187b2bf..243f591dc409 100644<br/>--- a/<a href='/drm-misc/tree/crypto/cts.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/cts.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/cts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/cts.c</a></div><div class='hunk'>@@ -49,6 +49,7 @@</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct crypto_cts_ctx {</div><div class='ctx'> 	struct crypto_skcipher *child;</div><div class='hunk'>@@ -103,7 +104,7 @@ static int cts_cbc_encrypt(struct skcipher_request *req)</div><div class='ctx'> 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='ctx'> 	struct skcipher_request *subreq = &amp;rctx-&gt;subreq;</div><div class='ctx'> 	int bsize = crypto_skcipher_blocksize(tfm);</div><div class='del'>-	u8 d[bsize * 2] __attribute__ ((aligned(__alignof__(u32))));</div><div class='add'>+	u8 d[bsize * 2] __aligned(__alignof__(u32));</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> 	int lastn;</div><div class='hunk'>@@ -183,7 +184,7 @@ static int cts_cbc_decrypt(struct skcipher_request *req)</div><div class='ctx'> 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='ctx'> 	struct skcipher_request *subreq = &amp;rctx-&gt;subreq;</div><div class='ctx'> 	int bsize = crypto_skcipher_blocksize(tfm);</div><div class='del'>-	u8 d[bsize * 2] __attribute__ ((aligned(__alignof__(u32))));</div><div class='add'>+	u8 d[bsize * 2] __aligned(__alignof__(u32));</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> 	u8 *space;</div><div class='hunk'>@@ -290,7 +291,7 @@ static int crypto_cts_init_tfm(struct crypto_skcipher *tfm)</div><div class='ctx'> 	unsigned bsize;</div><div class='ctx'> 	unsigned align;</div><div class='ctx'> </div><div class='del'>-	cipher = crypto_spawn_skcipher2(spawn);</div><div class='add'>+	cipher = crypto_spawn_skcipher(spawn);</div><div class='ctx'> 	if (IS_ERR(cipher))</div><div class='ctx'> 		return PTR_ERR(cipher);</div><div class='ctx'> </div><div class='hunk'>@@ -348,9 +349,9 @@ static int crypto_cts_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> 	spawn = skcipher_instance_ctx(inst);</div><div class='ctx'> </div><div class='ctx'> 	crypto_set_skcipher_spawn(spawn, skcipher_crypto_instance(inst));</div><div class='del'>-	err = crypto_grab_skcipher2(spawn, cipher_name, 0,</div><div class='del'>-				    crypto_requires_sync(algt-&gt;type,</div><div class='del'>-							 algt-&gt;mask));</div><div class='add'>+	err = crypto_grab_skcipher(spawn, cipher_name, 0,</div><div class='add'>+				   crypto_requires_sync(algt-&gt;type,</div><div class='add'>+							algt-&gt;mask));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free_inst;</div><div class='ctx'> </div><div class='hunk'>@@ -373,9 +374,6 @@ static int crypto_cts_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> 	inst-&gt;alg.base.cra_blocksize = alg-&gt;base.cra_blocksize;</div><div class='ctx'> 	inst-&gt;alg.base.cra_alignmask = alg-&gt;base.cra_alignmask;</div><div class='ctx'> </div><div class='del'>-	/* We access the data as u32s when xoring. */</div><div class='del'>-	inst-&gt;alg.base.cra_alignmask |= __alignof__(u32) - 1;</div><div class='del'>-</div><div class='ctx'> 	inst-&gt;alg.ivsize = alg-&gt;base.cra_blocksize;</div><div class='ctx'> 	inst-&gt;alg.chunksize = crypto_skcipher_alg_chunksize(alg);</div><div class='ctx'> 	inst-&gt;alg.min_keysize = crypto_skcipher_alg_min_keysize(alg);</div><div class='head'>diff --git a/crypto/deflate.c b/crypto/deflate.c<br/>index 95d8d37c5021..f942cb391890 100644<br/>--- a/<a href='/drm-misc/tree/crypto/deflate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/deflate.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/deflate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/deflate.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;crypto/internal/scompress.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEFLATE_DEF_LEVEL		Z_DEFAULT_COMPRESSION</div><div class='ctx'> #define DEFLATE_DEF_WINBITS		11</div><div class='hunk'>@@ -101,9 +102,8 @@ static void deflate_decomp_exit(struct deflate_ctx *ctx)</div><div class='ctx'> 	vfree(ctx-&gt;decomp_stream.workspace);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int deflate_init(struct crypto_tfm *tfm)</div><div class='add'>+static int __deflate_init(void *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct deflate_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = deflate_comp_init(ctx);</div><div class='hunk'>@@ -116,19 +116,55 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void deflate_exit(struct crypto_tfm *tfm)</div><div class='add'>+static void *deflate_alloc_ctx(struct crypto_scomp *tfm)</div><div class='add'>+{</div><div class='add'>+	struct deflate_ctx *ctx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ret = __deflate_init(ctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(ctx);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int deflate_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct deflate_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='add'>+	return __deflate_init(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __deflate_exit(void *ctx)</div><div class='add'>+{</div><div class='ctx'> 	deflate_comp_exit(ctx);</div><div class='ctx'> 	deflate_decomp_exit(ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int deflate_compress(struct crypto_tfm *tfm, const u8 *src,</div><div class='del'>-			    unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+static void deflate_free_ctx(struct crypto_scomp *tfm, void *ctx)</div><div class='add'>+{</div><div class='add'>+	__deflate_exit(ctx);</div><div class='add'>+	kzfree(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void deflate_exit(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct deflate_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	__deflate_exit(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __deflate_compress(const u8 *src, unsigned int slen,</div><div class='add'>+			      u8 *dst, unsigned int *dlen, void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct deflate_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct deflate_ctx *dctx = ctx;</div><div class='ctx'> 	struct z_stream_s *stream = &amp;dctx-&gt;comp_stream;</div><div class='ctx'> </div><div class='ctx'> 	ret = zlib_deflateReset(stream);</div><div class='hunk'>@@ -153,12 +189,27 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int deflate_decompress(struct crypto_tfm *tfm, const u8 *src,</div><div class='del'>-			      unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+static int deflate_compress(struct crypto_tfm *tfm, const u8 *src,</div><div class='add'>+			    unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+{</div><div class='add'>+	struct deflate_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	return __deflate_compress(src, slen, dst, dlen, dctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int deflate_scompress(struct crypto_scomp *tfm, const u8 *src,</div><div class='add'>+			     unsigned int slen, u8 *dst, unsigned int *dlen,</div><div class='add'>+			     void *ctx)</div><div class='add'>+{</div><div class='add'>+	return __deflate_compress(src, slen, dst, dlen, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __deflate_decompress(const u8 *src, unsigned int slen,</div><div class='add'>+				u8 *dst, unsigned int *dlen, void *ctx)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct deflate_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct deflate_ctx *dctx = ctx;</div><div class='ctx'> 	struct z_stream_s *stream = &amp;dctx-&gt;decomp_stream;</div><div class='ctx'> </div><div class='ctx'> 	ret = zlib_inflateReset(stream);</div><div class='hunk'>@@ -194,6 +245,21 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int deflate_decompress(struct crypto_tfm *tfm, const u8 *src,</div><div class='add'>+			      unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+{</div><div class='add'>+	struct deflate_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	return __deflate_decompress(src, slen, dst, dlen, dctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int deflate_sdecompress(struct crypto_scomp *tfm, const u8 *src,</div><div class='add'>+			       unsigned int slen, u8 *dst, unsigned int *dlen,</div><div class='add'>+			       void *ctx)</div><div class='add'>+{</div><div class='add'>+	return __deflate_decompress(src, slen, dst, dlen, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct crypto_alg alg = {</div><div class='ctx'> 	.cra_name		= "deflate",</div><div class='ctx'> 	.cra_flags		= CRYPTO_ALG_TYPE_COMPRESS,</div><div class='hunk'>@@ -206,14 +272,39 @@ static struct crypto_alg alg = {</div><div class='ctx'> 	.coa_decompress  	= deflate_decompress } }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct scomp_alg scomp = {</div><div class='add'>+	.alloc_ctx		= deflate_alloc_ctx,</div><div class='add'>+	.free_ctx		= deflate_free_ctx,</div><div class='add'>+	.compress		= deflate_scompress,</div><div class='add'>+	.decompress		= deflate_sdecompress,</div><div class='add'>+	.base			= {</div><div class='add'>+		.cra_name	= "deflate",</div><div class='add'>+		.cra_driver_name = "deflate-scomp",</div><div class='add'>+		.cra_module	 = THIS_MODULE,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init deflate_mod_init(void)</div><div class='ctx'> {</div><div class='del'>-	return crypto_register_alg(&amp;alg);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_alg(&amp;alg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_scomp(&amp;scomp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		crypto_unregister_alg(&amp;alg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit deflate_mod_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	crypto_unregister_alg(&amp;alg);</div><div class='add'>+	crypto_unregister_scomp(&amp;scomp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(deflate_mod_init);</div><div class='head'>diff --git a/crypto/dh.c b/crypto/dh.c<br/>index 9d19360e7189..ddcb528ab2cc 100644<br/>--- a/<a href='/drm-misc/tree/crypto/dh.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/dh.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/dh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/dh.c</a></div><div class='hunk'>@@ -118,7 +118,7 @@ static int dh_compute_value(struct kpp_request *req)</div><div class='ctx'> 	if (req-&gt;src) {</div><div class='ctx'> 		base = mpi_read_raw_from_sgl(req-&gt;src, req-&gt;src_len);</div><div class='ctx'> 		if (!base) {</div><div class='del'>-			ret = EINVAL;</div><div class='add'>+			ret = -EINVAL;</div><div class='ctx'> 			goto err_free_val;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/crypto/drbg.c b/crypto/drbg.c<br/>index 053035b5c8f8..8a4d98b4adba 100644<br/>--- a/<a href='/drm-misc/tree/crypto/drbg.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/drbg.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/drbg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/drbg.c</a></div><div class='hunk'>@@ -1782,6 +1782,7 @@ static int drbg_kcapi_sym_ctr(struct drbg_state *drbg,</div><div class='ctx'> 		memcpy(outbuf, drbg-&gt;outscratchpad, cryptlen);</div><div class='ctx'> </div><div class='ctx'> 		outlen -= cryptlen;</div><div class='add'>+		outbuf += cryptlen;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/gcm.c b/crypto/gcm.c<br/>index f624ac98c94e..b7ad808be3d4 100644<br/>--- a/<a href='/drm-misc/tree/crypto/gcm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/gcm.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/gcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/gcm.c</a></div><div class='hunk'>@@ -575,7 +575,7 @@ static int crypto_gcm_init_tfm(struct crypto_aead *tfm)</div><div class='ctx'> 	if (IS_ERR(ghash))</div><div class='ctx'> 		return PTR_ERR(ghash);</div><div class='ctx'> </div><div class='del'>-	ctr = crypto_spawn_skcipher2(&amp;ictx-&gt;ctr);</div><div class='add'>+	ctr = crypto_spawn_skcipher(&amp;ictx-&gt;ctr);</div><div class='ctx'> 	err = PTR_ERR(ctr);</div><div class='ctx'> 	if (IS_ERR(ctr))</div><div class='ctx'> 		goto err_free_hash;</div><div class='hunk'>@@ -663,20 +663,20 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl,</div><div class='ctx'> 		goto err_drop_ghash;</div><div class='ctx'> </div><div class='ctx'> 	crypto_set_skcipher_spawn(&amp;ctx-&gt;ctr, aead_crypto_instance(inst));</div><div class='del'>-	err = crypto_grab_skcipher2(&amp;ctx-&gt;ctr, ctr_name, 0,</div><div class='del'>-				    crypto_requires_sync(algt-&gt;type,</div><div class='del'>-							 algt-&gt;mask));</div><div class='add'>+	err = crypto_grab_skcipher(&amp;ctx-&gt;ctr, ctr_name, 0,</div><div class='add'>+				   crypto_requires_sync(algt-&gt;type,</div><div class='add'>+							algt-&gt;mask));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_drop_ghash;</div><div class='ctx'> </div><div class='ctx'> 	ctr = crypto_spawn_skcipher_alg(&amp;ctx-&gt;ctr);</div><div class='ctx'> </div><div class='ctx'> 	/* We only support 16-byte blocks. */</div><div class='add'>+	err = -EINVAL;</div><div class='ctx'> 	if (crypto_skcipher_alg_ivsize(ctr) != 16)</div><div class='ctx'> 		goto out_put_ctr;</div><div class='ctx'> </div><div class='ctx'> 	/* Not a stream cipher? */</div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	if (ctr-&gt;base.cra_blocksize != 1)</div><div class='ctx'> 		goto out_put_ctr;</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/gf128mul.c b/crypto/gf128mul.c<br/>index 5276607c72d0..72015fee533d 100644<br/>--- a/<a href='/drm-misc/tree/crypto/gf128mul.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/gf128mul.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/gf128mul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/gf128mul.c</a></div><div class='hunk'>@@ -263,48 +263,6 @@ EXPORT_SYMBOL(gf128mul_bbe);</div><div class='ctx'>  * t[1][BYTE] contains g*x^8*BYTE</div><div class='ctx'>  *  ..</div><div class='ctx'>  * t[15][BYTE] contains g*x^120*BYTE */</div><div class='del'>-struct gf128mul_64k *gf128mul_init_64k_lle(const be128 *g)</div><div class='del'>-{</div><div class='del'>-	struct gf128mul_64k *t;</div><div class='del'>-	int i, j, k;</div><div class='del'>-</div><div class='del'>-	t = kzalloc(sizeof(*t), GFP_KERNEL);</div><div class='del'>-	if (!t)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		t-&gt;t[i] = kzalloc(sizeof(*t-&gt;t[i]), GFP_KERNEL);</div><div class='del'>-		if (!t-&gt;t[i]) {</div><div class='del'>-			gf128mul_free_64k(t);</div><div class='del'>-			t = NULL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	t-&gt;t[0]-&gt;t[128] = *g;</div><div class='del'>-	for (j = 64; j &gt; 0; j &gt;&gt;= 1)</div><div class='del'>-		gf128mul_x_lle(&amp;t-&gt;t[0]-&gt;t[j], &amp;t-&gt;t[0]-&gt;t[j + j]);</div><div class='del'>-</div><div class='del'>-	for (i = 0;;) {</div><div class='del'>-		for (j = 2; j &lt; 256; j += j)</div><div class='del'>-			for (k = 1; k &lt; j; ++k)</div><div class='del'>-				be128_xor(&amp;t-&gt;t[i]-&gt;t[j + k],</div><div class='del'>-					  &amp;t-&gt;t[i]-&gt;t[j], &amp;t-&gt;t[i]-&gt;t[k]);</div><div class='del'>-</div><div class='del'>-		if (++i &gt;= 16)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		for (j = 128; j &gt; 0; j &gt;&gt;= 1) {</div><div class='del'>-			t-&gt;t[i]-&gt;t[j] = t-&gt;t[i - 1]-&gt;t[j];</div><div class='del'>-			gf128mul_x8_lle(&amp;t-&gt;t[i]-&gt;t[j]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(gf128mul_init_64k_lle);</div><div class='del'>-</div><div class='ctx'> struct gf128mul_64k *gf128mul_init_64k_bbe(const be128 *g)</div><div class='ctx'> {</div><div class='ctx'> 	struct gf128mul_64k *t;</div><div class='hunk'>@@ -352,24 +310,11 @@ void gf128mul_free_64k(struct gf128mul_64k *t)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 16; i++)</div><div class='del'>-		kfree(t-&gt;t[i]);</div><div class='del'>-	kfree(t);</div><div class='add'>+		kzfree(t-&gt;t[i]);</div><div class='add'>+	kzfree(t);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(gf128mul_free_64k);</div><div class='ctx'> </div><div class='del'>-void gf128mul_64k_lle(be128 *a, struct gf128mul_64k *t)</div><div class='del'>-{</div><div class='del'>-	u8 *ap = (u8 *)a;</div><div class='del'>-	be128 r[1];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	*r = t-&gt;t[0]-&gt;t[ap[0]];</div><div class='del'>-	for (i = 1; i &lt; 16; ++i)</div><div class='del'>-		be128_xor(r, r, &amp;t-&gt;t[i]-&gt;t[ap[i]]);</div><div class='del'>-	*a = *r;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(gf128mul_64k_lle);</div><div class='del'>-</div><div class='ctx'> void gf128mul_64k_bbe(be128 *a, struct gf128mul_64k *t)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *ap = (u8 *)a;</div><div class='head'>diff --git a/crypto/internal.h b/crypto/internal.h<br/>index 7eefcdb00227..f07320423191 100644<br/>--- a/<a href='/drm-misc/tree/crypto/internal.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/internal.h</a><br/>+++ b/<a href='/drm-misc/tree/crypto/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/internal.h</a></div><div class='hunk'>@@ -76,9 +76,6 @@ struct crypto_alg *crypto_alg_mod_lookup(const char *name, u32 type, u32 mask);</div><div class='ctx'> int crypto_init_cipher_ops(struct crypto_tfm *tfm);</div><div class='ctx'> int crypto_init_compress_ops(struct crypto_tfm *tfm);</div><div class='ctx'> </div><div class='del'>-void crypto_exit_cipher_ops(struct crypto_tfm *tfm);</div><div class='del'>-void crypto_exit_compress_ops(struct crypto_tfm *tfm);</div><div class='del'>-</div><div class='ctx'> struct crypto_larval *crypto_larval_alloc(const char *name, u32 type, u32 mask);</div><div class='ctx'> void crypto_larval_kill(struct crypto_alg *alg);</div><div class='ctx'> struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask);</div><div class='head'>diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c<br/>index c4938497eedb..787dccca3715 100644<br/>--- a/<a href='/drm-misc/tree/crypto/jitterentropy-kcapi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/jitterentropy-kcapi.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/jitterentropy-kcapi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/jitterentropy-kcapi.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fips.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='head'>diff --git a/crypto/kpp.c b/crypto/kpp.c<br/>index d36ce05eee43..a90edc27af77 100644<br/>--- a/<a href='/drm-misc/tree/crypto/kpp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/kpp.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/kpp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/kpp.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;linux/cryptouser.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;crypto/kpp.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/kpp.h&gt;</div><div class='hunk'>@@ -47,7 +48,7 @@ static int crypto_kpp_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void crypto_kpp_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='del'>-	__attribute__ ((unused));</div><div class='add'>+	__maybe_unused;</div><div class='ctx'> </div><div class='ctx'> static void crypto_kpp_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='head'>diff --git a/crypto/lrw.c b/crypto/lrw.c<br/>index 6f9908a7ebcb..ecd8474018e3 100644<br/>--- a/<a href='/drm-misc/tree/crypto/lrw.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/lrw.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/lrw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/lrw.c</a></div><div class='hunk'>@@ -17,7 +17,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * The test vectors are included in the testing module tcrypt.[ch] */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -29,11 +30,30 @@</div><div class='ctx'> #include &lt;crypto/gf128mul.h&gt;</div><div class='ctx'> #include &lt;crypto/lrw.h&gt;</div><div class='ctx'> </div><div class='add'>+#define LRW_BUFFER_SIZE 128u</div><div class='add'>+</div><div class='ctx'> struct priv {</div><div class='del'>-	struct crypto_cipher *child;</div><div class='add'>+	struct crypto_skcipher *child;</div><div class='ctx'> 	struct lrw_table_ctx table;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct rctx {</div><div class='add'>+	be128 buf[LRW_BUFFER_SIZE / sizeof(be128)];</div><div class='add'>+</div><div class='add'>+	be128 t;</div><div class='add'>+</div><div class='add'>+	be128 *ext;</div><div class='add'>+</div><div class='add'>+	struct scatterlist srcbuf[2];</div><div class='add'>+	struct scatterlist dstbuf[2];</div><div class='add'>+	struct scatterlist *src;</div><div class='add'>+	struct scatterlist *dst;</div><div class='add'>+</div><div class='add'>+	unsigned int left;</div><div class='add'>+</div><div class='add'>+	struct skcipher_request subreq;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline void setbit128_bbe(void *b, int bit)</div><div class='ctx'> {</div><div class='ctx'> 	__set_bit(bit ^ (0x80 -</div><div class='hunk'>@@ -76,32 +96,26 @@ void lrw_free_table(struct lrw_table_ctx *ctx)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(lrw_free_table);</div><div class='ctx'> </div><div class='del'>-static int setkey(struct crypto_tfm *parent, const u8 *key,</div><div class='add'>+static int setkey(struct crypto_skcipher *parent, const u8 *key,</div><div class='ctx'> 		  unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	struct priv *ctx = crypto_tfm_ctx(parent);</div><div class='del'>-	struct crypto_cipher *child = ctx-&gt;child;</div><div class='add'>+	struct priv *ctx = crypto_skcipher_ctx(parent);</div><div class='add'>+	struct crypto_skcipher *child = ctx-&gt;child;</div><div class='ctx'> 	int err, bsize = LRW_BLOCK_SIZE;</div><div class='ctx'> 	const u8 *tweak = key + keylen - bsize;</div><div class='ctx'> </div><div class='del'>-	crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	crypto_cipher_set_flags(child, crypto_tfm_get_flags(parent) &amp;</div><div class='del'>-				       CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	err = crypto_cipher_setkey(child, key, keylen - bsize);</div><div class='add'>+	crypto_skcipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_skcipher_set_flags(child, crypto_skcipher_get_flags(parent) &amp;</div><div class='add'>+					 CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	err = crypto_skcipher_setkey(child, key, keylen - bsize);</div><div class='add'>+	crypto_skcipher_set_flags(parent, crypto_skcipher_get_flags(child) &amp;</div><div class='add'>+					  CRYPTO_TFM_RES_MASK);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	crypto_tfm_set_flags(parent, crypto_cipher_get_flags(child) &amp;</div><div class='del'>-				     CRYPTO_TFM_RES_MASK);</div><div class='ctx'> </div><div class='ctx'> 	return lrw_init_table(&amp;ctx-&gt;table, tweak);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sinfo {</div><div class='del'>-	be128 t;</div><div class='del'>-	struct crypto_tfm *tfm;</div><div class='del'>-	void (*fn)(struct crypto_tfm *, u8 *, const u8 *);</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static inline void inc(be128 *iv)</div><div class='ctx'> {</div><div class='ctx'> 	be64_add_cpu(&amp;iv-&gt;b, 1);</div><div class='hunk'>@@ -109,13 +123,6 @@ static inline void inc(be128 *iv)</div><div class='ctx'> 		be64_add_cpu(&amp;iv-&gt;a, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void lrw_round(struct sinfo *s, void *dst, const void *src)</div><div class='del'>-{</div><div class='del'>-	be128_xor(dst, &amp;s-&gt;t, src);		/* PP &lt;- T xor P */</div><div class='del'>-	s-&gt;fn(s-&gt;tfm, dst, dst);		/* CC &lt;- E(Key2,PP) */</div><div class='del'>-	be128_xor(dst, dst, &amp;s-&gt;t);		/* C &lt;- T xor CC */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* this returns the number of consequative 1 bits starting</div><div class='ctx'>  * from the right, get_index128(00 00 00 00 00 00 ... 00 00 10 FB) = 2 */</div><div class='ctx'> static inline int get_index128(be128 *block)</div><div class='hunk'>@@ -135,83 +142,263 @@ static inline int get_index128(be128 *block)</div><div class='ctx'> 	return x;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypt(struct blkcipher_desc *d,</div><div class='del'>-		 struct blkcipher_walk *w, struct priv *ctx,</div><div class='del'>-		 void (*fn)(struct crypto_tfm *, u8 *, const u8 *))</div><div class='add'>+static int post_crypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	be128 *buf = rctx-&gt;ext ?: rctx-&gt;buf;</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+	const int bs = LRW_BLOCK_SIZE;</div><div class='add'>+	struct skcipher_walk w;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	unsigned offset;</div><div class='ctx'> 	int err;</div><div class='del'>-	unsigned int avail;</div><div class='add'>+</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+	err = skcipher_walk_virt(&amp;w, subreq, false);</div><div class='add'>+</div><div class='add'>+	while (w.nbytes) {</div><div class='add'>+		unsigned int avail = w.nbytes;</div><div class='add'>+		be128 *wdst;</div><div class='add'>+</div><div class='add'>+		wdst = w.dst.virt.addr;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			be128_xor(wdst, buf++, wdst);</div><div class='add'>+			wdst++;</div><div class='add'>+		} while ((avail -= bs) &gt;= bs);</div><div class='add'>+</div><div class='add'>+		err = skcipher_walk_done(&amp;w, avail);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rctx-&gt;left -= subreq-&gt;cryptlen;</div><div class='add'>+</div><div class='add'>+	if (err || !rctx-&gt;left)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rctx-&gt;dst = rctx-&gt;dstbuf;</div><div class='add'>+</div><div class='add'>+	scatterwalk_done(&amp;w.out, 0, 1);</div><div class='add'>+	sg = w.out.sg;</div><div class='add'>+	offset = w.out.offset;</div><div class='add'>+</div><div class='add'>+	if (rctx-&gt;dst != sg) {</div><div class='add'>+		rctx-&gt;dst[0] = *sg;</div><div class='add'>+		sg_unmark_end(rctx-&gt;dst);</div><div class='add'>+		scatterwalk_crypto_chain(rctx-&gt;dst, sg_next(sg), 0, 2);</div><div class='add'>+	}</div><div class='add'>+	rctx-&gt;dst[0].length -= offset - sg-&gt;offset;</div><div class='add'>+	rctx-&gt;dst[0].offset = offset;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pre_crypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	struct priv *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	be128 *buf = rctx-&gt;ext ?: rctx-&gt;buf;</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='ctx'> 	const int bs = LRW_BLOCK_SIZE;</div><div class='del'>-	struct sinfo s = {</div><div class='del'>-		.tfm = crypto_cipher_tfm(ctx-&gt;child),</div><div class='del'>-		.fn = fn</div><div class='del'>-	};</div><div class='add'>+	struct skcipher_walk w;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	unsigned cryptlen;</div><div class='add'>+	unsigned offset;</div><div class='ctx'> 	be128 *iv;</div><div class='del'>-	u8 *wsrc;</div><div class='del'>-	u8 *wdst;</div><div class='add'>+	bool more;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = blkcipher_walk_virt(d, w);</div><div class='del'>-	if (!(avail = w-&gt;nbytes))</div><div class='del'>-		return err;</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+	skcipher_request_set_tfm(subreq, tfm);</div><div class='ctx'> </div><div class='del'>-	wsrc = w-&gt;src.virt.addr;</div><div class='del'>-	wdst = w-&gt;dst.virt.addr;</div><div class='add'>+	cryptlen = subreq-&gt;cryptlen;</div><div class='add'>+	more = rctx-&gt;left &gt; cryptlen;</div><div class='add'>+	if (!more)</div><div class='add'>+		cryptlen = rctx-&gt;left;</div><div class='ctx'> </div><div class='del'>-	/* calculate first value of T */</div><div class='del'>-	iv = (be128 *)w-&gt;iv;</div><div class='del'>-	s.t = *iv;</div><div class='add'>+	skcipher_request_set_crypt(subreq, rctx-&gt;src, rctx-&gt;dst,</div><div class='add'>+				   cryptlen, req-&gt;iv);</div><div class='ctx'> </div><div class='del'>-	/* T &lt;- I*Key2 */</div><div class='del'>-	gf128mul_64k_bbe(&amp;s.t, ctx-&gt;table.table);</div><div class='add'>+	err = skcipher_walk_virt(&amp;w, subreq, false);</div><div class='add'>+	iv = w.iv;</div><div class='ctx'> </div><div class='del'>-	goto first;</div><div class='add'>+	while (w.nbytes) {</div><div class='add'>+		unsigned int avail = w.nbytes;</div><div class='add'>+		be128 *wsrc;</div><div class='add'>+		be128 *wdst;</div><div class='add'>+</div><div class='add'>+		wsrc = w.src.virt.addr;</div><div class='add'>+		wdst = w.dst.virt.addr;</div><div class='ctx'> </div><div class='del'>-	for (;;) {</div><div class='ctx'> 		do {</div><div class='add'>+			*buf++ = rctx-&gt;t;</div><div class='add'>+			be128_xor(wdst++, &amp;rctx-&gt;t, wsrc++);</div><div class='add'>+</div><div class='ctx'> 			/* T &lt;- I*Key2, using the optimization</div><div class='ctx'> 			 * discussed in the specification */</div><div class='del'>-			be128_xor(&amp;s.t, &amp;s.t,</div><div class='add'>+			be128_xor(&amp;rctx-&gt;t, &amp;rctx-&gt;t,</div><div class='ctx'> 				  &amp;ctx-&gt;table.mulinc[get_index128(iv)]);</div><div class='ctx'> 			inc(iv);</div><div class='add'>+		} while ((avail -= bs) &gt;= bs);</div><div class='ctx'> </div><div class='del'>-first:</div><div class='del'>-			lrw_round(&amp;s, wdst, wsrc);</div><div class='add'>+		err = skcipher_walk_done(&amp;w, avail);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			wsrc += bs;</div><div class='del'>-			wdst += bs;</div><div class='del'>-		} while ((avail -= bs) &gt;= bs);</div><div class='add'>+	skcipher_request_set_tfm(subreq, ctx-&gt;child);</div><div class='add'>+	skcipher_request_set_crypt(subreq, rctx-&gt;dst, rctx-&gt;dst,</div><div class='add'>+				   cryptlen, NULL);</div><div class='ctx'> </div><div class='del'>-		err = blkcipher_walk_done(d, w, avail);</div><div class='del'>-		if (!(avail = w-&gt;nbytes))</div><div class='del'>-			break;</div><div class='add'>+	if (err || !more)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rctx-&gt;src = rctx-&gt;srcbuf;</div><div class='add'>+</div><div class='add'>+	scatterwalk_done(&amp;w.in, 0, 1);</div><div class='add'>+	sg = w.in.sg;</div><div class='add'>+	offset = w.in.offset;</div><div class='add'>+</div><div class='add'>+	if (rctx-&gt;src != sg) {</div><div class='add'>+		rctx-&gt;src[0] = *sg;</div><div class='add'>+		sg_unmark_end(rctx-&gt;src);</div><div class='add'>+		scatterwalk_crypto_chain(rctx-&gt;src, sg_next(sg), 0, 2);</div><div class='add'>+	}</div><div class='add'>+	rctx-&gt;src[0].length -= offset - sg-&gt;offset;</div><div class='add'>+	rctx-&gt;src[0].offset = offset;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_crypt(struct skcipher_request *req, crypto_completion_t done)</div><div class='add'>+{</div><div class='add'>+	struct priv *ctx = crypto_skcipher_ctx(crypto_skcipher_reqtfm(req));</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+	gfp_t gfp;</div><div class='add'>+</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+	skcipher_request_set_callback(subreq, req-&gt;base.flags, done, req);</div><div class='add'>+</div><div class='add'>+	gfp = req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :</div><div class='add'>+							   GFP_ATOMIC;</div><div class='add'>+	rctx-&gt;ext = NULL;</div><div class='add'>+</div><div class='add'>+	subreq-&gt;cryptlen = LRW_BUFFER_SIZE;</div><div class='add'>+	if (req-&gt;cryptlen &gt; LRW_BUFFER_SIZE) {</div><div class='add'>+		subreq-&gt;cryptlen = min(req-&gt;cryptlen, (unsigned)PAGE_SIZE);</div><div class='add'>+		rctx-&gt;ext = kmalloc(subreq-&gt;cryptlen, gfp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rctx-&gt;src = req-&gt;src;</div><div class='add'>+	rctx-&gt;dst = req-&gt;dst;</div><div class='add'>+	rctx-&gt;left = req-&gt;cryptlen;</div><div class='add'>+</div><div class='add'>+	/* calculate first value of T */</div><div class='add'>+	memcpy(&amp;rctx-&gt;t, req-&gt;iv, sizeof(rctx-&gt;t));</div><div class='add'>+</div><div class='add'>+	/* T &lt;- I*Key2 */</div><div class='add'>+	gf128mul_64k_bbe(&amp;rctx-&gt;t, ctx-&gt;table.table);</div><div class='ctx'> </div><div class='del'>-		wsrc = w-&gt;src.virt.addr;</div><div class='del'>-		wdst = w-&gt;dst.virt.addr;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void exit_crypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	rctx-&gt;left = 0;</div><div class='add'>+</div><div class='add'>+	if (rctx-&gt;ext)</div><div class='add'>+		kfree(rctx-&gt;ext);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_encrypt(struct skcipher_request *req, int err)</div><div class='add'>+{</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+</div><div class='add'>+	while (!err &amp;&amp; rctx-&gt;left) {</div><div class='add'>+		err = pre_crypt(req) ?:</div><div class='add'>+		      crypto_skcipher_encrypt(subreq) ?:</div><div class='add'>+		      post_crypt(req);</div><div class='add'>+</div><div class='add'>+		if (err == -EINPROGRESS ||</div><div class='add'>+		    (err == -EBUSY &amp;&amp;</div><div class='add'>+		     req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_BACKLOG))</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	exit_crypt(req);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		   struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static void encrypt_done(struct crypto_async_request *areq, int err)</div><div class='add'>+{</div><div class='add'>+	struct skcipher_request *req = areq-&gt;data;</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+	struct rctx *rctx;</div><div class='add'>+</div><div class='add'>+	rctx = skcipher_request_ctx(req);</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+	subreq-&gt;base.flags &amp;= CRYPTO_TFM_REQ_MAY_BACKLOG;</div><div class='add'>+</div><div class='add'>+	err = do_encrypt(req, err ?: post_crypt(req));</div><div class='add'>+	if (rctx-&gt;left)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skcipher_request_complete(req, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int encrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return do_encrypt(req, init_crypt(req, encrypt_done));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_decrypt(struct skcipher_request *req, int err)</div><div class='ctx'> {</div><div class='del'>-	struct priv *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk w;</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+</div><div class='add'>+	while (!err &amp;&amp; rctx-&gt;left) {</div><div class='add'>+		err = pre_crypt(req) ?:</div><div class='add'>+		      crypto_skcipher_decrypt(subreq) ?:</div><div class='add'>+		      post_crypt(req);</div><div class='add'>+</div><div class='add'>+		if (err == -EINPROGRESS ||</div><div class='add'>+		    (err == -EBUSY &amp;&amp;</div><div class='add'>+		     req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_BACKLOG))</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;w, dst, src, nbytes);</div><div class='del'>-	return crypt(desc, &amp;w, ctx,</div><div class='del'>-		     crypto_cipher_alg(ctx-&gt;child)-&gt;cia_encrypt);</div><div class='add'>+	exit_crypt(req);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		   struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static void decrypt_done(struct crypto_async_request *areq, int err)</div><div class='ctx'> {</div><div class='del'>-	struct priv *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk w;</div><div class='add'>+	struct skcipher_request *req = areq-&gt;data;</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+	struct rctx *rctx;</div><div class='add'>+</div><div class='add'>+	rctx = skcipher_request_ctx(req);</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+	subreq-&gt;base.flags &amp;= CRYPTO_TFM_REQ_MAY_BACKLOG;</div><div class='add'>+</div><div class='add'>+	err = do_decrypt(req, err ?: post_crypt(req));</div><div class='add'>+	if (rctx-&gt;left)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;w, dst, src, nbytes);</div><div class='del'>-	return crypt(desc, &amp;w, ctx,</div><div class='del'>-		     crypto_cipher_alg(ctx-&gt;child)-&gt;cia_decrypt);</div><div class='add'>+	skcipher_request_complete(req, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return do_decrypt(req, init_crypt(req, decrypt_done));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int lrw_crypt(struct blkcipher_desc *desc, struct scatterlist *sdst,</div><div class='hunk'>@@ -293,95 +480,161 @@ first:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(lrw_crypt);</div><div class='ctx'> </div><div class='del'>-static int init_tfm(struct crypto_tfm *tfm)</div><div class='add'>+static int init_tfm(struct crypto_skcipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_cipher *cipher;</div><div class='del'>-	struct crypto_instance *inst = (void *)tfm-&gt;__crt_alg;</div><div class='del'>-	struct crypto_spawn *spawn = crypto_instance_ctx(inst);</div><div class='del'>-	struct priv *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	u32 *flags = &amp;tfm-&gt;crt_flags;</div><div class='add'>+	struct skcipher_instance *inst = skcipher_alg_instance(tfm);</div><div class='add'>+	struct crypto_skcipher_spawn *spawn = skcipher_instance_ctx(inst);</div><div class='add'>+	struct priv *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_skcipher *cipher;</div><div class='ctx'> </div><div class='del'>-	cipher = crypto_spawn_cipher(spawn);</div><div class='add'>+	cipher = crypto_spawn_skcipher(spawn);</div><div class='ctx'> 	if (IS_ERR(cipher))</div><div class='ctx'> 		return PTR_ERR(cipher);</div><div class='ctx'> </div><div class='del'>-	if (crypto_cipher_blocksize(cipher) != LRW_BLOCK_SIZE) {</div><div class='del'>-		*flags |= CRYPTO_TFM_RES_BAD_BLOCK_LEN;</div><div class='del'>-		crypto_free_cipher(cipher);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ctx-&gt;child = cipher;</div><div class='add'>+</div><div class='add'>+	crypto_skcipher_set_reqsize(tfm, crypto_skcipher_reqsize(cipher) +</div><div class='add'>+					 sizeof(struct rctx));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void exit_tfm(struct crypto_tfm *tfm)</div><div class='add'>+static void exit_tfm(struct crypto_skcipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct priv *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct priv *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	lrw_free_table(&amp;ctx-&gt;table);</div><div class='del'>-	crypto_free_cipher(ctx-&gt;child);</div><div class='add'>+	crypto_free_skcipher(ctx-&gt;child);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free(struct skcipher_instance *inst)</div><div class='add'>+{</div><div class='add'>+	crypto_drop_skcipher(skcipher_instance_ctx(inst));</div><div class='add'>+	kfree(inst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct crypto_instance *alloc(struct rtattr **tb)</div><div class='add'>+static int create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_instance *inst;</div><div class='del'>-	struct crypto_alg *alg;</div><div class='add'>+	struct crypto_skcipher_spawn *spawn;</div><div class='add'>+	struct skcipher_instance *inst;</div><div class='add'>+	struct crypto_attr_type *algt;</div><div class='add'>+	struct skcipher_alg *alg;</div><div class='add'>+	const char *cipher_name;</div><div class='add'>+	char ecb_name[CRYPTO_MAX_ALG_NAME];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);</div><div class='add'>+	algt = crypto_get_attr_type(tb);</div><div class='add'>+	if (IS_ERR(algt))</div><div class='add'>+		return PTR_ERR(algt);</div><div class='add'>+</div><div class='add'>+	if ((algt-&gt;type ^ CRYPTO_ALG_TYPE_SKCIPHER) &amp; algt-&gt;mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cipher_name = crypto_attr_alg_name(tb[1]);</div><div class='add'>+	if (IS_ERR(cipher_name))</div><div class='add'>+		return PTR_ERR(cipher_name);</div><div class='add'>+</div><div class='add'>+	inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);</div><div class='add'>+	if (!inst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spawn = skcipher_instance_ctx(inst);</div><div class='add'>+</div><div class='add'>+	crypto_set_skcipher_spawn(spawn, skcipher_crypto_instance(inst));</div><div class='add'>+	err = crypto_grab_skcipher(spawn, cipher_name, 0,</div><div class='add'>+				   crypto_requires_sync(algt-&gt;type,</div><div class='add'>+							algt-&gt;mask));</div><div class='add'>+	if (err == -ENOENT) {</div><div class='add'>+		err = -ENAMETOOLONG;</div><div class='add'>+		if (snprintf(ecb_name, CRYPTO_MAX_ALG_NAME, "ecb(%s)",</div><div class='add'>+			     cipher_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+			goto err_free_inst;</div><div class='add'>+</div><div class='add'>+		err = crypto_grab_skcipher(spawn, ecb_name, 0,</div><div class='add'>+					   crypto_requires_sync(algt-&gt;type,</div><div class='add'>+								algt-&gt;mask));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (err)</div><div class='del'>-		return ERR_PTR(err);</div><div class='add'>+		goto err_free_inst;</div><div class='ctx'> </div><div class='del'>-	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,</div><div class='del'>-				  CRYPTO_ALG_TYPE_MASK);</div><div class='del'>-	if (IS_ERR(alg))</div><div class='del'>-		return ERR_CAST(alg);</div><div class='add'>+	alg = crypto_skcipher_spawn_alg(spawn);</div><div class='ctx'> </div><div class='del'>-	inst = crypto_alloc_instance("lrw", alg);</div><div class='del'>-	if (IS_ERR(inst))</div><div class='del'>-		goto out_put_alg;</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (alg-&gt;base.cra_blocksize != LRW_BLOCK_SIZE)</div><div class='add'>+		goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER;</div><div class='del'>-	inst-&gt;alg.cra_priority = alg-&gt;cra_priority;</div><div class='del'>-	inst-&gt;alg.cra_blocksize = alg-&gt;cra_blocksize;</div><div class='add'>+	if (crypto_skcipher_alg_ivsize(alg))</div><div class='add'>+		goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-	if (alg-&gt;cra_alignmask &lt; 7) inst-&gt;alg.cra_alignmask = 7;</div><div class='del'>-	else inst-&gt;alg.cra_alignmask = alg-&gt;cra_alignmask;</div><div class='del'>-	inst-&gt;alg.cra_type = &amp;crypto_blkcipher_type;</div><div class='add'>+	err = crypto_inst_setname(skcipher_crypto_instance(inst), "lrw",</div><div class='add'>+				  &amp;alg-&gt;base);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-	if (!(alg-&gt;cra_blocksize % 4))</div><div class='del'>-		inst-&gt;alg.cra_alignmask |= 3;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.ivsize = alg-&gt;cra_blocksize;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.min_keysize =</div><div class='del'>-		alg-&gt;cra_cipher.cia_min_keysize + alg-&gt;cra_blocksize;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.max_keysize =</div><div class='del'>-		alg-&gt;cra_cipher.cia_max_keysize + alg-&gt;cra_blocksize;</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	cipher_name = alg-&gt;base.cra_name;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_ctxsize = sizeof(struct priv);</div><div class='add'>+	/* Alas we screwed up the naming so we have to mangle the</div><div class='add'>+	 * cipher name.</div><div class='add'>+	 */</div><div class='add'>+	if (!strncmp(cipher_name, "ecb(", 4)) {</div><div class='add'>+		unsigned len;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_init = init_tfm;</div><div class='del'>-	inst-&gt;alg.cra_exit = exit_tfm;</div><div class='add'>+		len = strlcpy(ecb_name, cipher_name + 4, sizeof(ecb_name));</div><div class='add'>+		if (len &lt; 2 || len &gt;= sizeof(ecb_name))</div><div class='add'>+			goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_blkcipher.setkey = setkey;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.encrypt = encrypt;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.decrypt = decrypt;</div><div class='add'>+		if (ecb_name[len - 1] != ')')</div><div class='add'>+			goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-out_put_alg:</div><div class='del'>-	crypto_mod_put(alg);</div><div class='del'>-	return inst;</div><div class='del'>-}</div><div class='add'>+		ecb_name[len - 1] = 0;</div><div class='ctx'> </div><div class='del'>-static void free(struct crypto_instance *inst)</div><div class='del'>-{</div><div class='del'>-	crypto_drop_spawn(crypto_instance_ctx(inst));</div><div class='add'>+		if (snprintf(inst-&gt;alg.base.cra_name, CRYPTO_MAX_ALG_NAME,</div><div class='add'>+			     "lrw(%s)", ecb_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+			return -ENAMETOOLONG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.base.cra_flags = alg-&gt;base.cra_flags &amp; CRYPTO_ALG_ASYNC;</div><div class='add'>+	inst-&gt;alg.base.cra_priority = alg-&gt;base.cra_priority;</div><div class='add'>+	inst-&gt;alg.base.cra_blocksize = LRW_BLOCK_SIZE;</div><div class='add'>+	inst-&gt;alg.base.cra_alignmask = alg-&gt;base.cra_alignmask |</div><div class='add'>+				       (__alignof__(u64) - 1);</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.ivsize = LRW_BLOCK_SIZE;</div><div class='add'>+	inst-&gt;alg.min_keysize = crypto_skcipher_alg_min_keysize(alg) +</div><div class='add'>+				LRW_BLOCK_SIZE;</div><div class='add'>+	inst-&gt;alg.max_keysize = crypto_skcipher_alg_max_keysize(alg) +</div><div class='add'>+				LRW_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.base.cra_ctxsize = sizeof(struct priv);</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.init = init_tfm;</div><div class='add'>+	inst-&gt;alg.exit = exit_tfm;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.setkey = setkey;</div><div class='add'>+	inst-&gt;alg.encrypt = encrypt;</div><div class='add'>+	inst-&gt;alg.decrypt = decrypt;</div><div class='add'>+</div><div class='add'>+	inst-&gt;free = free;</div><div class='add'>+</div><div class='add'>+	err = skcipher_register_instance(tmpl, inst);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_drop_spawn;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_drop_spawn:</div><div class='add'>+	crypto_drop_skcipher(spawn);</div><div class='add'>+err_free_inst:</div><div class='ctx'> 	kfree(inst);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_template crypto_tmpl = {</div><div class='ctx'> 	.name = "lrw",</div><div class='del'>-	.alloc = alloc,</div><div class='del'>-	.free = free,</div><div class='add'>+	.create = create,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/lz4.c b/crypto/lz4.c<br/>index aefbceaf3104..71eff9b01b12 100644<br/>--- a/<a href='/drm-misc/tree/crypto/lz4.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/lz4.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/lz4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/lz4.c</a></div><div class='hunk'>@@ -23,57 +23,98 @@</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/lz4.h&gt;</div><div class='add'>+#include &lt;crypto/internal/scompress.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct lz4_ctx {</div><div class='ctx'> 	void *lz4_comp_mem;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void *lz4_alloc_ctx(struct crypto_scomp *tfm)</div><div class='add'>+{</div><div class='add'>+	void *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = vmalloc(LZ4_MEM_COMPRESS);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int lz4_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct lz4_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;lz4_comp_mem = vmalloc(LZ4_MEM_COMPRESS);</div><div class='del'>-	if (!ctx-&gt;lz4_comp_mem)</div><div class='add'>+	ctx-&gt;lz4_comp_mem = lz4_alloc_ctx(NULL);</div><div class='add'>+	if (IS_ERR(ctx-&gt;lz4_comp_mem))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void lz4_free_ctx(struct crypto_scomp *tfm, void *ctx)</div><div class='add'>+{</div><div class='add'>+	vfree(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void lz4_exit(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct lz4_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	vfree(ctx-&gt;lz4_comp_mem);</div><div class='add'>+</div><div class='add'>+	lz4_free_ctx(NULL, ctx-&gt;lz4_comp_mem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __lz4_compress_crypto(const u8 *src, unsigned int slen,</div><div class='add'>+				 u8 *dst, unsigned int *dlen, void *ctx)</div><div class='add'>+{</div><div class='add'>+	int out_len = LZ4_compress_default(src, dst,</div><div class='add'>+		slen, *dlen, ctx);</div><div class='add'>+</div><div class='add'>+	if (!out_len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*dlen = out_len;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lz4_scompress(struct crypto_scomp *tfm, const u8 *src,</div><div class='add'>+			 unsigned int slen, u8 *dst, unsigned int *dlen,</div><div class='add'>+			 void *ctx)</div><div class='add'>+{</div><div class='add'>+	return __lz4_compress_crypto(src, slen, dst, dlen, ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lz4_compress_crypto(struct crypto_tfm *tfm, const u8 *src,</div><div class='del'>-			    unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+			       unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct lz4_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	size_t tmp_len = *dlen;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	err = lz4_compress(src, slen, dst, &amp;tmp_len, ctx-&gt;lz4_comp_mem);</div><div class='add'>+	return __lz4_compress_crypto(src, slen, dst, dlen, ctx-&gt;lz4_comp_mem);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+static int __lz4_decompress_crypto(const u8 *src, unsigned int slen,</div><div class='add'>+				   u8 *dst, unsigned int *dlen, void *ctx)</div><div class='add'>+{</div><div class='add'>+	int out_len = LZ4_decompress_safe(src, dst, slen, *dlen);</div><div class='ctx'> </div><div class='del'>-	*dlen = tmp_len;</div><div class='add'>+	if (out_len &lt; 0)</div><div class='add'>+		return out_len;</div><div class='add'>+</div><div class='add'>+	*dlen = out_len;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lz4_decompress_crypto(struct crypto_tfm *tfm, const u8 *src,</div><div class='del'>-			      unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+static int lz4_sdecompress(struct crypto_scomp *tfm, const u8 *src,</div><div class='add'>+			   unsigned int slen, u8 *dst, unsigned int *dlen,</div><div class='add'>+			   void *ctx)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	size_t tmp_len = *dlen;</div><div class='del'>-	size_t __slen = slen;</div><div class='del'>-</div><div class='del'>-	err = lz4_decompress_unknownoutputsize(src, __slen, dst, &amp;tmp_len);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	return __lz4_decompress_crypto(src, slen, dst, dlen, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	*dlen = tmp_len;</div><div class='del'>-	return err;</div><div class='add'>+static int lz4_decompress_crypto(struct crypto_tfm *tfm, const u8 *src,</div><div class='add'>+				 unsigned int slen, u8 *dst,</div><div class='add'>+				 unsigned int *dlen)</div><div class='add'>+{</div><div class='add'>+	return __lz4_decompress_crypto(src, slen, dst, dlen, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_alg alg_lz4 = {</div><div class='hunk'>@@ -89,14 +130,39 @@ static struct crypto_alg alg_lz4 = {</div><div class='ctx'> 	.coa_decompress		= lz4_decompress_crypto } }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct scomp_alg scomp = {</div><div class='add'>+	.alloc_ctx		= lz4_alloc_ctx,</div><div class='add'>+	.free_ctx		= lz4_free_ctx,</div><div class='add'>+	.compress		= lz4_scompress,</div><div class='add'>+	.decompress		= lz4_sdecompress,</div><div class='add'>+	.base			= {</div><div class='add'>+		.cra_name	= "lz4",</div><div class='add'>+		.cra_driver_name = "lz4-scomp",</div><div class='add'>+		.cra_module	 = THIS_MODULE,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init lz4_mod_init(void)</div><div class='ctx'> {</div><div class='del'>-	return crypto_register_alg(&amp;alg_lz4);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_alg(&amp;alg_lz4);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_scomp(&amp;scomp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		crypto_unregister_alg(&amp;alg_lz4);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit lz4_mod_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	crypto_unregister_alg(&amp;alg_lz4);</div><div class='add'>+	crypto_unregister_scomp(&amp;scomp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(lz4_mod_init);</div><div class='head'>diff --git a/crypto/lz4hc.c b/crypto/lz4hc.c<br/>index a1d3b5bd3d85..03a34a8109c0 100644<br/>--- a/<a href='/drm-misc/tree/crypto/lz4hc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/lz4hc.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/lz4hc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/lz4hc.c</a></div><div class='hunk'>@@ -22,58 +22,100 @@</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/lz4.h&gt;</div><div class='add'>+#include &lt;crypto/internal/scompress.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct lz4hc_ctx {</div><div class='ctx'> 	void *lz4hc_comp_mem;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void *lz4hc_alloc_ctx(struct crypto_scomp *tfm)</div><div class='add'>+{</div><div class='add'>+	void *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = vmalloc(LZ4HC_MEM_COMPRESS);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int lz4hc_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;lz4hc_comp_mem = vmalloc(LZ4HC_MEM_COMPRESS);</div><div class='del'>-	if (!ctx-&gt;lz4hc_comp_mem)</div><div class='add'>+	ctx-&gt;lz4hc_comp_mem = lz4hc_alloc_ctx(NULL);</div><div class='add'>+	if (IS_ERR(ctx-&gt;lz4hc_comp_mem))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void lz4hc_free_ctx(struct crypto_scomp *tfm, void *ctx)</div><div class='add'>+{</div><div class='add'>+	vfree(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void lz4hc_exit(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	vfree(ctx-&gt;lz4hc_comp_mem);</div><div class='add'>+	lz4hc_free_ctx(NULL, ctx-&gt;lz4hc_comp_mem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __lz4hc_compress_crypto(const u8 *src, unsigned int slen,</div><div class='add'>+				   u8 *dst, unsigned int *dlen, void *ctx)</div><div class='add'>+{</div><div class='add'>+	int out_len = LZ4_compress_HC(src, dst, slen,</div><div class='add'>+		*dlen, LZ4HC_DEFAULT_CLEVEL, ctx);</div><div class='add'>+</div><div class='add'>+	if (!out_len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*dlen = out_len;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lz4hc_scompress(struct crypto_scomp *tfm, const u8 *src,</div><div class='add'>+			   unsigned int slen, u8 *dst, unsigned int *dlen,</div><div class='add'>+			   void *ctx)</div><div class='add'>+{</div><div class='add'>+	return __lz4hc_compress_crypto(src, slen, dst, dlen, ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lz4hc_compress_crypto(struct crypto_tfm *tfm, const u8 *src,</div><div class='del'>-			    unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+				 unsigned int slen, u8 *dst,</div><div class='add'>+				 unsigned int *dlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	size_t tmp_len = *dlen;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	err = lz4hc_compress(src, slen, dst, &amp;tmp_len, ctx-&gt;lz4hc_comp_mem);</div><div class='add'>+	return __lz4hc_compress_crypto(src, slen, dst, dlen,</div><div class='add'>+					ctx-&gt;lz4hc_comp_mem);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+static int __lz4hc_decompress_crypto(const u8 *src, unsigned int slen,</div><div class='add'>+				     u8 *dst, unsigned int *dlen, void *ctx)</div><div class='add'>+{</div><div class='add'>+	int out_len = LZ4_decompress_safe(src, dst, slen, *dlen);</div><div class='ctx'> </div><div class='del'>-	*dlen = tmp_len;</div><div class='add'>+	if (out_len &lt; 0)</div><div class='add'>+		return out_len;</div><div class='add'>+</div><div class='add'>+	*dlen = out_len;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lz4hc_decompress_crypto(struct crypto_tfm *tfm, const u8 *src,</div><div class='del'>-			      unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+static int lz4hc_sdecompress(struct crypto_scomp *tfm, const u8 *src,</div><div class='add'>+			     unsigned int slen, u8 *dst, unsigned int *dlen,</div><div class='add'>+			     void *ctx)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	size_t tmp_len = *dlen;</div><div class='del'>-	size_t __slen = slen;</div><div class='del'>-</div><div class='del'>-	err = lz4_decompress_unknownoutputsize(src, __slen, dst, &amp;tmp_len);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	return __lz4hc_decompress_crypto(src, slen, dst, dlen, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	*dlen = tmp_len;</div><div class='del'>-	return err;</div><div class='add'>+static int lz4hc_decompress_crypto(struct crypto_tfm *tfm, const u8 *src,</div><div class='add'>+				   unsigned int slen, u8 *dst,</div><div class='add'>+				   unsigned int *dlen)</div><div class='add'>+{</div><div class='add'>+	return __lz4hc_decompress_crypto(src, slen, dst, dlen, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_alg alg_lz4hc = {</div><div class='hunk'>@@ -89,14 +131,39 @@ static struct crypto_alg alg_lz4hc = {</div><div class='ctx'> 	.coa_decompress		= lz4hc_decompress_crypto } }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct scomp_alg scomp = {</div><div class='add'>+	.alloc_ctx		= lz4hc_alloc_ctx,</div><div class='add'>+	.free_ctx		= lz4hc_free_ctx,</div><div class='add'>+	.compress		= lz4hc_scompress,</div><div class='add'>+	.decompress		= lz4hc_sdecompress,</div><div class='add'>+	.base			= {</div><div class='add'>+		.cra_name	= "lz4hc",</div><div class='add'>+		.cra_driver_name = "lz4hc-scomp",</div><div class='add'>+		.cra_module	 = THIS_MODULE,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init lz4hc_mod_init(void)</div><div class='ctx'> {</div><div class='del'>-	return crypto_register_alg(&amp;alg_lz4hc);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_alg(&amp;alg_lz4hc);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_scomp(&amp;scomp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		crypto_unregister_alg(&amp;alg_lz4hc);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit lz4hc_mod_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	crypto_unregister_alg(&amp;alg_lz4hc);</div><div class='add'>+	crypto_unregister_scomp(&amp;scomp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(lz4hc_mod_init);</div><div class='head'>diff --git a/crypto/lzo.c b/crypto/lzo.c<br/>index c3f3dd9a28c5..168df784da84 100644<br/>--- a/<a href='/drm-misc/tree/crypto/lzo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/lzo.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/lzo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/lzo.c</a></div><div class='hunk'>@@ -22,40 +22,55 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/lzo.h&gt;</div><div class='add'>+#include &lt;crypto/internal/scompress.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct lzo_ctx {</div><div class='ctx'> 	void *lzo_comp_mem;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void *lzo_alloc_ctx(struct crypto_scomp *tfm)</div><div class='add'>+{</div><div class='add'>+	void *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kmalloc(LZO1X_MEM_COMPRESS, GFP_KERNEL | __GFP_NOWARN);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		ctx = vmalloc(LZO1X_MEM_COMPRESS);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int lzo_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;lzo_comp_mem = kmalloc(LZO1X_MEM_COMPRESS,</div><div class='del'>-				    GFP_KERNEL | __GFP_NOWARN);</div><div class='del'>-	if (!ctx-&gt;lzo_comp_mem)</div><div class='del'>-		ctx-&gt;lzo_comp_mem = vmalloc(LZO1X_MEM_COMPRESS);</div><div class='del'>-	if (!ctx-&gt;lzo_comp_mem)</div><div class='add'>+	ctx-&gt;lzo_comp_mem = lzo_alloc_ctx(NULL);</div><div class='add'>+	if (IS_ERR(ctx-&gt;lzo_comp_mem))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void lzo_free_ctx(struct crypto_scomp *tfm, void *ctx)</div><div class='add'>+{</div><div class='add'>+	kvfree(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void lzo_exit(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	kvfree(ctx-&gt;lzo_comp_mem);</div><div class='add'>+	lzo_free_ctx(NULL, ctx-&gt;lzo_comp_mem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lzo_compress(struct crypto_tfm *tfm, const u8 *src,</div><div class='del'>-			    unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+static int __lzo_compress(const u8 *src, unsigned int slen,</div><div class='add'>+			  u8 *dst, unsigned int *dlen, void *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	size_t tmp_len = *dlen; /* size_t(ulong) &lt;-&gt; uint on 64 bit */</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = lzo1x_1_compress(src, slen, dst, &amp;tmp_len, ctx-&gt;lzo_comp_mem);</div><div class='add'>+	err = lzo1x_1_compress(src, slen, dst, &amp;tmp_len, ctx);</div><div class='ctx'> </div><div class='ctx'> 	if (err != LZO_E_OK)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -64,8 +79,23 @@ static int lzo_compress(struct crypto_tfm *tfm, const u8 *src,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lzo_decompress(struct crypto_tfm *tfm, const u8 *src,</div><div class='del'>-			      unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+static int lzo_compress(struct crypto_tfm *tfm, const u8 *src,</div><div class='add'>+			unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+{</div><div class='add'>+	struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	return __lzo_compress(src, slen, dst, dlen, ctx-&gt;lzo_comp_mem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lzo_scompress(struct crypto_scomp *tfm, const u8 *src,</div><div class='add'>+			 unsigned int slen, u8 *dst, unsigned int *dlen,</div><div class='add'>+			 void *ctx)</div><div class='add'>+{</div><div class='add'>+	return __lzo_compress(src, slen, dst, dlen, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __lzo_decompress(const u8 *src, unsigned int slen,</div><div class='add'>+			    u8 *dst, unsigned int *dlen)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	size_t tmp_len = *dlen; /* size_t(ulong) &lt;-&gt; uint on 64 bit */</div><div class='hunk'>@@ -77,7 +107,19 @@ static int lzo_decompress(struct crypto_tfm *tfm, const u8 *src,</div><div class='ctx'> </div><div class='ctx'> 	*dlen = tmp_len;</div><div class='ctx'> 	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int lzo_decompress(struct crypto_tfm *tfm, const u8 *src,</div><div class='add'>+			  unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='add'>+{</div><div class='add'>+	return __lzo_decompress(src, slen, dst, dlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lzo_sdecompress(struct crypto_scomp *tfm, const u8 *src,</div><div class='add'>+			   unsigned int slen, u8 *dst, unsigned int *dlen,</div><div class='add'>+			   void *ctx)</div><div class='add'>+{</div><div class='add'>+	return __lzo_decompress(src, slen, dst, dlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_alg alg = {</div><div class='hunk'>@@ -88,18 +130,43 @@ static struct crypto_alg alg = {</div><div class='ctx'> 	.cra_init		= lzo_init,</div><div class='ctx'> 	.cra_exit		= lzo_exit,</div><div class='ctx'> 	.cra_u			= { .compress = {</div><div class='del'>-	.coa_compress 		= lzo_compress,</div><div class='del'>-	.coa_decompress  	= lzo_decompress } }</div><div class='add'>+	.coa_compress		= lzo_compress,</div><div class='add'>+	.coa_decompress		= lzo_decompress } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct scomp_alg scomp = {</div><div class='add'>+	.alloc_ctx		= lzo_alloc_ctx,</div><div class='add'>+	.free_ctx		= lzo_free_ctx,</div><div class='add'>+	.compress		= lzo_scompress,</div><div class='add'>+	.decompress		= lzo_sdecompress,</div><div class='add'>+	.base			= {</div><div class='add'>+		.cra_name	= "lzo",</div><div class='add'>+		.cra_driver_name = "lzo-scomp",</div><div class='add'>+		.cra_module	 = THIS_MODULE,</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init lzo_mod_init(void)</div><div class='ctx'> {</div><div class='del'>-	return crypto_register_alg(&amp;alg);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_alg(&amp;alg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_scomp(&amp;scomp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		crypto_unregister_alg(&amp;alg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit lzo_mod_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	crypto_unregister_alg(&amp;alg);</div><div class='add'>+	crypto_unregister_scomp(&amp;scomp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(lzo_mod_init);</div><div class='head'>diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c<br/>index c207458d6299..4e6472658852 100644<br/>--- a/<a href='/drm-misc/tree/crypto/mcryptd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/mcryptd.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/mcryptd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/mcryptd.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/stat.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/pcbc.c b/crypto/pcbc.c<br/>index f654965f0933..29dd2b4a3b85 100644<br/>--- a/<a href='/drm-misc/tree/crypto/pcbc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/pcbc.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/pcbc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/pcbc.c</a></div><div class='hunk'>@@ -14,40 +14,38 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct crypto_pcbc_ctx {</div><div class='ctx'> 	struct crypto_cipher *child;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int crypto_pcbc_setkey(struct crypto_tfm *parent, const u8 *key,</div><div class='add'>+static int crypto_pcbc_setkey(struct crypto_skcipher *parent, const u8 *key,</div><div class='ctx'> 			      unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_pcbc_ctx *ctx = crypto_tfm_ctx(parent);</div><div class='add'>+	struct crypto_pcbc_ctx *ctx = crypto_skcipher_ctx(parent);</div><div class='ctx'> 	struct crypto_cipher *child = ctx-&gt;child;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	crypto_cipher_set_flags(child, crypto_tfm_get_flags(parent) &amp;</div><div class='del'>-				CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_cipher_set_flags(child, crypto_skcipher_get_flags(parent) &amp;</div><div class='add'>+				       CRYPTO_TFM_REQ_MASK);</div><div class='ctx'> 	err = crypto_cipher_setkey(child, key, keylen);</div><div class='del'>-	crypto_tfm_set_flags(parent, crypto_cipher_get_flags(child) &amp;</div><div class='del'>-			     CRYPTO_TFM_RES_MASK);</div><div class='add'>+	crypto_skcipher_set_flags(parent, crypto_cipher_get_flags(child) &amp;</div><div class='add'>+					  CRYPTO_TFM_RES_MASK);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_pcbc_encrypt_segment(struct blkcipher_desc *desc,</div><div class='del'>-				       struct blkcipher_walk *walk,</div><div class='add'>+static int crypto_pcbc_encrypt_segment(struct skcipher_request *req,</div><div class='add'>+				       struct skcipher_walk *walk,</div><div class='ctx'> 				       struct crypto_cipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =</div><div class='del'>-		crypto_cipher_alg(tfm)-&gt;cia_encrypt;</div><div class='ctx'> 	int bsize = crypto_cipher_blocksize(tfm);</div><div class='ctx'> 	unsigned int nbytes = walk-&gt;nbytes;</div><div class='ctx'> 	u8 *src = walk-&gt;src.virt.addr;</div><div class='hunk'>@@ -56,7 +54,7 @@ static int crypto_pcbc_encrypt_segment(struct blkcipher_desc *desc,</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		crypto_xor(iv, src, bsize);</div><div class='del'>-		fn(crypto_cipher_tfm(tfm), dst, iv);</div><div class='add'>+		crypto_cipher_encrypt_one(tfm, dst, iv);</div><div class='ctx'> 		memcpy(iv, dst, bsize);</div><div class='ctx'> 		crypto_xor(iv, src, bsize);</div><div class='ctx'> </div><div class='hunk'>@@ -67,12 +65,10 @@ static int crypto_pcbc_encrypt_segment(struct blkcipher_desc *desc,</div><div class='ctx'> 	return nbytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_pcbc_encrypt_inplace(struct blkcipher_desc *desc,</div><div class='del'>-				       struct blkcipher_walk *walk,</div><div class='add'>+static int crypto_pcbc_encrypt_inplace(struct skcipher_request *req,</div><div class='add'>+				       struct skcipher_walk *walk,</div><div class='ctx'> 				       struct crypto_cipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =</div><div class='del'>-		crypto_cipher_alg(tfm)-&gt;cia_encrypt;</div><div class='ctx'> 	int bsize = crypto_cipher_blocksize(tfm);</div><div class='ctx'> 	unsigned int nbytes = walk-&gt;nbytes;</div><div class='ctx'> 	u8 *src = walk-&gt;src.virt.addr;</div><div class='hunk'>@@ -82,7 +78,7 @@ static int crypto_pcbc_encrypt_inplace(struct blkcipher_desc *desc,</div><div class='ctx'> 	do {</div><div class='ctx'> 		memcpy(tmpbuf, src, bsize);</div><div class='ctx'> 		crypto_xor(iv, src, bsize);</div><div class='del'>-		fn(crypto_cipher_tfm(tfm), src, iv);</div><div class='add'>+		crypto_cipher_encrypt_one(tfm, src, iv);</div><div class='ctx'> 		memcpy(iv, tmpbuf, bsize);</div><div class='ctx'> 		crypto_xor(iv, src, bsize);</div><div class='ctx'> </div><div class='hunk'>@@ -94,38 +90,34 @@ static int crypto_pcbc_encrypt_inplace(struct blkcipher_desc *desc,</div><div class='ctx'> 	return nbytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_pcbc_encrypt(struct blkcipher_desc *desc,</div><div class='del'>-			       struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-			       unsigned int nbytes)</div><div class='add'>+static int crypto_pcbc_encrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='del'>-	struct crypto_blkcipher *tfm = desc-&gt;tfm;</div><div class='del'>-	struct crypto_pcbc_ctx *ctx = crypto_blkcipher_ctx(tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_pcbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	struct crypto_cipher *child = ctx-&gt;child;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	unsigned int nbytes;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, false);</div><div class='ctx'> </div><div class='ctx'> 	while ((nbytes = walk.nbytes)) {</div><div class='ctx'> 		if (walk.src.virt.addr == walk.dst.virt.addr)</div><div class='del'>-			nbytes = crypto_pcbc_encrypt_inplace(desc, &amp;walk,</div><div class='add'>+			nbytes = crypto_pcbc_encrypt_inplace(req, &amp;walk,</div><div class='ctx'> 							     child);</div><div class='ctx'> 		else</div><div class='del'>-			nbytes = crypto_pcbc_encrypt_segment(desc, &amp;walk,</div><div class='add'>+			nbytes = crypto_pcbc_encrypt_segment(req, &amp;walk,</div><div class='ctx'> 							     child);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, nbytes);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_pcbc_decrypt_segment(struct blkcipher_desc *desc,</div><div class='del'>-				       struct blkcipher_walk *walk,</div><div class='add'>+static int crypto_pcbc_decrypt_segment(struct skcipher_request *req,</div><div class='add'>+				       struct skcipher_walk *walk,</div><div class='ctx'> 				       struct crypto_cipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =</div><div class='del'>-		crypto_cipher_alg(tfm)-&gt;cia_decrypt;</div><div class='ctx'> 	int bsize = crypto_cipher_blocksize(tfm);</div><div class='ctx'> 	unsigned int nbytes = walk-&gt;nbytes;</div><div class='ctx'> 	u8 *src = walk-&gt;src.virt.addr;</div><div class='hunk'>@@ -133,7 +125,7 @@ static int crypto_pcbc_decrypt_segment(struct blkcipher_desc *desc,</div><div class='ctx'> 	u8 *iv = walk-&gt;iv;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		fn(crypto_cipher_tfm(tfm), dst, src);</div><div class='add'>+		crypto_cipher_decrypt_one(tfm, dst, src);</div><div class='ctx'> 		crypto_xor(dst, iv, bsize);</div><div class='ctx'> 		memcpy(iv, src, bsize);</div><div class='ctx'> 		crypto_xor(iv, dst, bsize);</div><div class='hunk'>@@ -147,21 +139,19 @@ static int crypto_pcbc_decrypt_segment(struct blkcipher_desc *desc,</div><div class='ctx'> 	return nbytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_pcbc_decrypt_inplace(struct blkcipher_desc *desc,</div><div class='del'>-				       struct blkcipher_walk *walk,</div><div class='add'>+static int crypto_pcbc_decrypt_inplace(struct skcipher_request *req,</div><div class='add'>+				       struct skcipher_walk *walk,</div><div class='ctx'> 				       struct crypto_cipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =</div><div class='del'>-		crypto_cipher_alg(tfm)-&gt;cia_decrypt;</div><div class='ctx'> 	int bsize = crypto_cipher_blocksize(tfm);</div><div class='ctx'> 	unsigned int nbytes = walk-&gt;nbytes;</div><div class='ctx'> 	u8 *src = walk-&gt;src.virt.addr;</div><div class='ctx'> 	u8 *iv = walk-&gt;iv;</div><div class='del'>-	u8 tmpbuf[bsize];</div><div class='add'>+	u8 tmpbuf[bsize] __aligned(__alignof__(u32));</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		memcpy(tmpbuf, src, bsize);</div><div class='del'>-		fn(crypto_cipher_tfm(tfm), src, src);</div><div class='add'>+		crypto_cipher_decrypt_one(tfm, src, src);</div><div class='ctx'> 		crypto_xor(src, iv, bsize);</div><div class='ctx'> 		memcpy(iv, tmpbuf, bsize);</div><div class='ctx'> 		crypto_xor(iv, src, bsize);</div><div class='hunk'>@@ -174,37 +164,35 @@ static int crypto_pcbc_decrypt_inplace(struct blkcipher_desc *desc,</div><div class='ctx'> 	return nbytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_pcbc_decrypt(struct blkcipher_desc *desc,</div><div class='del'>-			       struct scatterlist *dst, struct scatterlist *src,</div><div class='del'>-			       unsigned int nbytes)</div><div class='add'>+static int crypto_pcbc_decrypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct blkcipher_walk walk;</div><div class='del'>-	struct crypto_blkcipher *tfm = desc-&gt;tfm;</div><div class='del'>-	struct crypto_pcbc_ctx *ctx = crypto_blkcipher_ctx(tfm);</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct crypto_pcbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	struct crypto_cipher *child = ctx-&gt;child;</div><div class='add'>+	struct skcipher_walk walk;</div><div class='add'>+	unsigned int nbytes;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='del'>-	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	err = skcipher_walk_virt(&amp;walk, req, false);</div><div class='ctx'> </div><div class='ctx'> 	while ((nbytes = walk.nbytes)) {</div><div class='ctx'> 		if (walk.src.virt.addr == walk.dst.virt.addr)</div><div class='del'>-			nbytes = crypto_pcbc_decrypt_inplace(desc, &amp;walk,</div><div class='add'>+			nbytes = crypto_pcbc_decrypt_inplace(req, &amp;walk,</div><div class='ctx'> 							     child);</div><div class='ctx'> 		else</div><div class='del'>-			nbytes = crypto_pcbc_decrypt_segment(desc, &amp;walk,</div><div class='add'>+			nbytes = crypto_pcbc_decrypt_segment(req, &amp;walk,</div><div class='ctx'> 							     child);</div><div class='del'>-		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+		err = skcipher_walk_done(&amp;walk, nbytes);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypto_pcbc_init_tfm(struct crypto_tfm *tfm)</div><div class='add'>+static int crypto_pcbc_init_tfm(struct crypto_skcipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_instance *inst = (void *)tfm-&gt;__crt_alg;</div><div class='del'>-	struct crypto_spawn *spawn = crypto_instance_ctx(inst);</div><div class='del'>-	struct crypto_pcbc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct skcipher_instance *inst = skcipher_alg_instance(tfm);</div><div class='add'>+	struct crypto_spawn *spawn = skcipher_instance_ctx(inst);</div><div class='add'>+	struct crypto_pcbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='ctx'> 	struct crypto_cipher *cipher;</div><div class='ctx'> </div><div class='ctx'> 	cipher = crypto_spawn_cipher(spawn);</div><div class='hunk'>@@ -215,68 +203,95 @@ static int crypto_pcbc_init_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void crypto_pcbc_exit_tfm(struct crypto_tfm *tfm)</div><div class='add'>+static void crypto_pcbc_exit_tfm(struct crypto_skcipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_pcbc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct crypto_pcbc_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+</div><div class='ctx'> 	crypto_free_cipher(ctx-&gt;child);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct crypto_instance *crypto_pcbc_alloc(struct rtattr **tb)</div><div class='add'>+static void crypto_pcbc_free(struct skcipher_instance *inst)</div><div class='add'>+{</div><div class='add'>+	crypto_drop_skcipher(skcipher_instance_ctx(inst));</div><div class='add'>+	kfree(inst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crypto_pcbc_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_instance *inst;</div><div class='add'>+	struct skcipher_instance *inst;</div><div class='add'>+	struct crypto_attr_type *algt;</div><div class='add'>+	struct crypto_spawn *spawn;</div><div class='ctx'> 	struct crypto_alg *alg;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);</div><div class='del'>-	if (err)</div><div class='del'>-		return ERR_PTR(err);</div><div class='add'>+	algt = crypto_get_attr_type(tb);</div><div class='add'>+	if (IS_ERR(algt))</div><div class='add'>+		return PTR_ERR(algt);</div><div class='add'>+</div><div class='add'>+	if (((algt-&gt;type ^ CRYPTO_ALG_TYPE_SKCIPHER) &amp; algt-&gt;mask) &amp;</div><div class='add'>+	    ~CRYPTO_ALG_INTERNAL)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,</div><div class='del'>-				  CRYPTO_ALG_TYPE_MASK);</div><div class='add'>+	inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);</div><div class='add'>+	if (!inst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER |</div><div class='add'>+				      (algt-&gt;type &amp; CRYPTO_ALG_INTERNAL),</div><div class='add'>+				  CRYPTO_ALG_TYPE_MASK |</div><div class='add'>+				  (algt-&gt;mask &amp; CRYPTO_ALG_INTERNAL));</div><div class='add'>+	err = PTR_ERR(alg);</div><div class='ctx'> 	if (IS_ERR(alg))</div><div class='del'>-		return ERR_CAST(alg);</div><div class='add'>+		goto err_free_inst;</div><div class='ctx'> </div><div class='del'>-	inst = crypto_alloc_instance("pcbc", alg);</div><div class='del'>-	if (IS_ERR(inst))</div><div class='del'>-		goto out_put_alg;</div><div class='add'>+	spawn = skcipher_instance_ctx(inst);</div><div class='add'>+	err = crypto_init_spawn(spawn, alg, skcipher_crypto_instance(inst),</div><div class='add'>+				CRYPTO_ALG_TYPE_MASK);</div><div class='add'>+	crypto_mod_put(alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_inst;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER;</div><div class='del'>-	inst-&gt;alg.cra_priority = alg-&gt;cra_priority;</div><div class='del'>-	inst-&gt;alg.cra_blocksize = alg-&gt;cra_blocksize;</div><div class='del'>-	inst-&gt;alg.cra_alignmask = alg-&gt;cra_alignmask;</div><div class='del'>-	inst-&gt;alg.cra_type = &amp;crypto_blkcipher_type;</div><div class='add'>+	err = crypto_inst_setname(skcipher_crypto_instance(inst), "pcbc", alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-	/* We access the data as u32s when xoring. */</div><div class='del'>-	inst-&gt;alg.cra_alignmask |= __alignof__(u32) - 1;</div><div class='add'>+	inst-&gt;alg.base.cra_flags = alg-&gt;cra_flags &amp; CRYPTO_ALG_INTERNAL;</div><div class='add'>+	inst-&gt;alg.base.cra_priority = alg-&gt;cra_priority;</div><div class='add'>+	inst-&gt;alg.base.cra_blocksize = alg-&gt;cra_blocksize;</div><div class='add'>+	inst-&gt;alg.base.cra_alignmask = alg-&gt;cra_alignmask;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_blkcipher.ivsize = alg-&gt;cra_blocksize;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.min_keysize = alg-&gt;cra_cipher.cia_min_keysize;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.max_keysize = alg-&gt;cra_cipher.cia_max_keysize;</div><div class='add'>+	inst-&gt;alg.ivsize = alg-&gt;cra_blocksize;</div><div class='add'>+	inst-&gt;alg.min_keysize = alg-&gt;cra_cipher.cia_min_keysize;</div><div class='add'>+	inst-&gt;alg.max_keysize = alg-&gt;cra_cipher.cia_max_keysize;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_ctxsize = sizeof(struct crypto_pcbc_ctx);</div><div class='add'>+	inst-&gt;alg.base.cra_ctxsize = sizeof(struct crypto_pcbc_ctx);</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_init = crypto_pcbc_init_tfm;</div><div class='del'>-	inst-&gt;alg.cra_exit = crypto_pcbc_exit_tfm;</div><div class='add'>+	inst-&gt;alg.init = crypto_pcbc_init_tfm;</div><div class='add'>+	inst-&gt;alg.exit = crypto_pcbc_exit_tfm;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_blkcipher.setkey = crypto_pcbc_setkey;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.encrypt = crypto_pcbc_encrypt;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.decrypt = crypto_pcbc_decrypt;</div><div class='add'>+	inst-&gt;alg.setkey = crypto_pcbc_setkey;</div><div class='add'>+	inst-&gt;alg.encrypt = crypto_pcbc_encrypt;</div><div class='add'>+	inst-&gt;alg.decrypt = crypto_pcbc_decrypt;</div><div class='ctx'> </div><div class='del'>-out_put_alg:</div><div class='del'>-	crypto_mod_put(alg);</div><div class='del'>-	return inst;</div><div class='del'>-}</div><div class='add'>+	inst-&gt;free = crypto_pcbc_free;</div><div class='ctx'> </div><div class='del'>-static void crypto_pcbc_free(struct crypto_instance *inst)</div><div class='del'>-{</div><div class='del'>-	crypto_drop_spawn(crypto_instance_ctx(inst));</div><div class='add'>+	err = skcipher_register_instance(tmpl, inst);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_drop_spawn;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_drop_spawn:</div><div class='add'>+	crypto_drop_spawn(spawn);</div><div class='add'>+err_free_inst:</div><div class='ctx'> 	kfree(inst);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_template crypto_pcbc_tmpl = {</div><div class='ctx'> 	.name = "pcbc",</div><div class='del'>-	.alloc = crypto_pcbc_alloc,</div><div class='del'>-	.free = crypto_pcbc_free,</div><div class='add'>+	.create = crypto_pcbc_create,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/poly1305_generic.c b/crypto/poly1305_generic.c<br/>index 2df9835dfbc0..b1c2d57dc734 100644<br/>--- a/<a href='/drm-misc/tree/crypto/poly1305_generic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/poly1305_generic.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/poly1305_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/poly1305_generic.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline u64 mlt(u64 a, u64 b)</div><div class='ctx'> {</div><div class='hunk'>@@ -33,11 +34,6 @@ static inline u32 and(u32 v, u32 mask)</div><div class='ctx'> 	return v &amp; mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 le32_to_cpuvp(const void *p)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpup(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int crypto_poly1305_init(struct shash_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);</div><div class='hunk'>@@ -65,19 +61,19 @@ EXPORT_SYMBOL_GPL(crypto_poly1305_setkey);</div><div class='ctx'> static void poly1305_setrkey(struct poly1305_desc_ctx *dctx, const u8 *key)</div><div class='ctx'> {</div><div class='ctx'> 	/* r &amp;= 0xffffffc0ffffffc0ffffffc0fffffff */</div><div class='del'>-	dctx-&gt;r[0] = (le32_to_cpuvp(key +  0) &gt;&gt; 0) &amp; 0x3ffffff;</div><div class='del'>-	dctx-&gt;r[1] = (le32_to_cpuvp(key +  3) &gt;&gt; 2) &amp; 0x3ffff03;</div><div class='del'>-	dctx-&gt;r[2] = (le32_to_cpuvp(key +  6) &gt;&gt; 4) &amp; 0x3ffc0ff;</div><div class='del'>-	dctx-&gt;r[3] = (le32_to_cpuvp(key +  9) &gt;&gt; 6) &amp; 0x3f03fff;</div><div class='del'>-	dctx-&gt;r[4] = (le32_to_cpuvp(key + 12) &gt;&gt; 8) &amp; 0x00fffff;</div><div class='add'>+	dctx-&gt;r[0] = (get_unaligned_le32(key +  0) &gt;&gt; 0) &amp; 0x3ffffff;</div><div class='add'>+	dctx-&gt;r[1] = (get_unaligned_le32(key +  3) &gt;&gt; 2) &amp; 0x3ffff03;</div><div class='add'>+	dctx-&gt;r[2] = (get_unaligned_le32(key +  6) &gt;&gt; 4) &amp; 0x3ffc0ff;</div><div class='add'>+	dctx-&gt;r[3] = (get_unaligned_le32(key +  9) &gt;&gt; 6) &amp; 0x3f03fff;</div><div class='add'>+	dctx-&gt;r[4] = (get_unaligned_le32(key + 12) &gt;&gt; 8) &amp; 0x00fffff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void poly1305_setskey(struct poly1305_desc_ctx *dctx, const u8 *key)</div><div class='ctx'> {</div><div class='del'>-	dctx-&gt;s[0] = le32_to_cpuvp(key +  0);</div><div class='del'>-	dctx-&gt;s[1] = le32_to_cpuvp(key +  4);</div><div class='del'>-	dctx-&gt;s[2] = le32_to_cpuvp(key +  8);</div><div class='del'>-	dctx-&gt;s[3] = le32_to_cpuvp(key + 12);</div><div class='add'>+	dctx-&gt;s[0] = get_unaligned_le32(key +  0);</div><div class='add'>+	dctx-&gt;s[1] = get_unaligned_le32(key +  4);</div><div class='add'>+	dctx-&gt;s[2] = get_unaligned_le32(key +  8);</div><div class='add'>+	dctx-&gt;s[3] = get_unaligned_le32(key + 12);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned int crypto_poly1305_setdesckey(struct poly1305_desc_ctx *dctx,</div><div class='hunk'>@@ -137,11 +133,11 @@ static unsigned int poly1305_blocks(struct poly1305_desc_ctx *dctx,</div><div class='ctx'> 	while (likely(srclen &gt;= POLY1305_BLOCK_SIZE)) {</div><div class='ctx'> </div><div class='ctx'> 		/* h += m[i] */</div><div class='del'>-		h0 += (le32_to_cpuvp(src +  0) &gt;&gt; 0) &amp; 0x3ffffff;</div><div class='del'>-		h1 += (le32_to_cpuvp(src +  3) &gt;&gt; 2) &amp; 0x3ffffff;</div><div class='del'>-		h2 += (le32_to_cpuvp(src +  6) &gt;&gt; 4) &amp; 0x3ffffff;</div><div class='del'>-		h3 += (le32_to_cpuvp(src +  9) &gt;&gt; 6) &amp; 0x3ffffff;</div><div class='del'>-		h4 += (le32_to_cpuvp(src + 12) &gt;&gt; 8) | hibit;</div><div class='add'>+		h0 += (get_unaligned_le32(src +  0) &gt;&gt; 0) &amp; 0x3ffffff;</div><div class='add'>+		h1 += (get_unaligned_le32(src +  3) &gt;&gt; 2) &amp; 0x3ffffff;</div><div class='add'>+		h2 += (get_unaligned_le32(src +  6) &gt;&gt; 4) &amp; 0x3ffffff;</div><div class='add'>+		h3 += (get_unaligned_le32(src +  9) &gt;&gt; 6) &amp; 0x3ffffff;</div><div class='add'>+		h4 += (get_unaligned_le32(src + 12) &gt;&gt; 8) | hibit;</div><div class='ctx'> </div><div class='ctx'> 		/* h *= r */</div><div class='ctx'> 		d0 = mlt(h0, r0) + mlt(h1, s4) + mlt(h2, s3) +</div><div class='head'>diff --git a/crypto/rng.c b/crypto/rng.c<br/>index b81cffb13bab..f46dac5288b9 100644<br/>--- a/<a href='/drm-misc/tree/crypto/rng.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/rng.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/rng.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/cryptouser.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -95,7 +96,7 @@ static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='del'>-	__attribute__ ((unused));</div><div class='add'>+	__maybe_unused;</div><div class='ctx'> static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	seq_printf(m, "type         : rng\n");</div><div class='head'>diff --git a/crypto/scompress.c b/crypto/scompress.c<br/>new file mode 100644<br/>index 000000000000..6b048b36312d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/crypto/scompress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/scompress.c</a></div><div class='hunk'>@@ -0,0 +1,357 @@</div><div class='add'>+/*</div><div class='add'>+ * Synchronous Compression operations</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2015 LG Electronics Inc.</div><div class='add'>+ * Copyright (c) 2016, Intel Corporation</div><div class='add'>+ * Author: Giovanni Cabiddu &lt;giovanni.cabiddu@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;linux/cryptouser.h&gt;</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;crypto/scatterwalk.h&gt;</div><div class='add'>+#include &lt;crypto/internal/acompress.h&gt;</div><div class='add'>+#include &lt;crypto/internal/scompress.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+static const struct crypto_type crypto_scomp_type;</div><div class='add'>+static void * __percpu *scomp_src_scratches;</div><div class='add'>+static void * __percpu *scomp_dst_scratches;</div><div class='add'>+static int scomp_scratch_users;</div><div class='add'>+static DEFINE_MUTEX(scomp_lock);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET</div><div class='add'>+static int crypto_scomp_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	struct crypto_report_comp rscomp;</div><div class='add'>+</div><div class='add'>+	strncpy(rscomp.type, "scomp", sizeof(rscomp.type));</div><div class='add'>+</div><div class='add'>+	if (nla_put(skb, CRYPTOCFGA_REPORT_COMPRESS,</div><div class='add'>+		    sizeof(struct crypto_report_comp), &amp;rscomp))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int crypto_scomp_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void crypto_scomp_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='add'>+	__maybe_unused;</div><div class='add'>+</div><div class='add'>+static void crypto_scomp_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	seq_puts(m, "type         : scomp\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crypto_scomp_init_tfm(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto_scomp_free_scratches(void * __percpu *scratches)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!scratches)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i)</div><div class='add'>+		vfree(*per_cpu_ptr(scratches, i));</div><div class='add'>+</div><div class='add'>+	free_percpu(scratches);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void * __percpu *crypto_scomp_alloc_scratches(void)</div><div class='add'>+{</div><div class='add'>+	void * __percpu *scratches;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	scratches = alloc_percpu(void *);</div><div class='add'>+	if (!scratches)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		void *scratch;</div><div class='add'>+</div><div class='add'>+		scratch = vmalloc_node(SCOMP_SCRATCH_SIZE, cpu_to_node(i));</div><div class='add'>+		if (!scratch)</div><div class='add'>+			goto error;</div><div class='add'>+		*per_cpu_ptr(scratches, i) = scratch;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return scratches;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	crypto_scomp_free_scratches(scratches);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto_scomp_free_all_scratches(void)</div><div class='add'>+{</div><div class='add'>+	if (!--scomp_scratch_users) {</div><div class='add'>+		crypto_scomp_free_scratches(scomp_src_scratches);</div><div class='add'>+		crypto_scomp_free_scratches(scomp_dst_scratches);</div><div class='add'>+		scomp_src_scratches = NULL;</div><div class='add'>+		scomp_dst_scratches = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crypto_scomp_alloc_all_scratches(void)</div><div class='add'>+{</div><div class='add'>+	if (!scomp_scratch_users++) {</div><div class='add'>+		scomp_src_scratches = crypto_scomp_alloc_scratches();</div><div class='add'>+		if (!scomp_src_scratches)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		scomp_dst_scratches = crypto_scomp_alloc_scratches();</div><div class='add'>+		if (!scomp_dst_scratches)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto_scomp_sg_free(struct scatterlist *sgl)</div><div class='add'>+{</div><div class='add'>+	int i, n;</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	if (!sgl)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	n = sg_nents(sgl);</div><div class='add'>+	for_each_sg(sgl, sgl, n, i) {</div><div class='add'>+		page = sg_page(sgl);</div><div class='add'>+		if (page)</div><div class='add'>+			__free_page(page);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(sgl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct scatterlist *crypto_scomp_sg_alloc(size_t size, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sgl;</div><div class='add'>+	struct page *page;</div><div class='add'>+	int i, n;</div><div class='add'>+</div><div class='add'>+	n = ((size - 1) &gt;&gt; PAGE_SHIFT) + 1;</div><div class='add'>+</div><div class='add'>+	sgl = kmalloc_array(n, sizeof(struct scatterlist), gfp);</div><div class='add'>+	if (!sgl)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	sg_init_table(sgl, n);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++) {</div><div class='add'>+		page = alloc_page(gfp);</div><div class='add'>+		if (!page)</div><div class='add'>+			goto err;</div><div class='add'>+		sg_set_page(sgl + i, page, PAGE_SIZE, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sgl;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	sg_mark_end(sgl + i);</div><div class='add'>+	crypto_scomp_sg_free(sgl);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)</div><div class='add'>+{</div><div class='add'>+	struct crypto_acomp *tfm = crypto_acomp_reqtfm(req);</div><div class='add'>+	void **tfm_ctx = acomp_tfm_ctx(tfm);</div><div class='add'>+	struct crypto_scomp *scomp = *tfm_ctx;</div><div class='add'>+	void **ctx = acomp_request_ctx(req);</div><div class='add'>+	const int cpu = get_cpu();</div><div class='add'>+	u8 *scratch_src = *per_cpu_ptr(scomp_src_scratches, cpu);</div><div class='add'>+	u8 *scratch_dst = *per_cpu_ptr(scomp_dst_scratches, cpu);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!req-&gt;src || !req-&gt;slen || req-&gt;slen &gt; SCOMP_SCRATCH_SIZE) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (req-&gt;dst &amp;&amp; !req-&gt;dlen) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!req-&gt;dlen || req-&gt;dlen &gt; SCOMP_SCRATCH_SIZE)</div><div class='add'>+		req-&gt;dlen = SCOMP_SCRATCH_SIZE;</div><div class='add'>+</div><div class='add'>+	scatterwalk_map_and_copy(scratch_src, req-&gt;src, 0, req-&gt;slen, 0);</div><div class='add'>+	if (dir)</div><div class='add'>+		ret = crypto_scomp_compress(scomp, scratch_src, req-&gt;slen,</div><div class='add'>+					    scratch_dst, &amp;req-&gt;dlen, *ctx);</div><div class='add'>+	else</div><div class='add'>+		ret = crypto_scomp_decompress(scomp, scratch_src, req-&gt;slen,</div><div class='add'>+					      scratch_dst, &amp;req-&gt;dlen, *ctx);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!req-&gt;dst) {</div><div class='add'>+			req-&gt;dst = crypto_scomp_sg_alloc(req-&gt;dlen,</div><div class='add'>+				   req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP ?</div><div class='add'>+				   GFP_KERNEL : GFP_ATOMIC);</div><div class='add'>+			if (!req-&gt;dst)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		scatterwalk_map_and_copy(scratch_dst, req-&gt;dst, 0, req-&gt;dlen,</div><div class='add'>+					 1);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	put_cpu();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int scomp_acomp_compress(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	return scomp_acomp_comp_decomp(req, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int scomp_acomp_decompress(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	return scomp_acomp_comp_decomp(req, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void crypto_exit_scomp_ops_async(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct crypto_scomp **ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	crypto_free_scomp(*ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int crypto_init_scomp_ops_async(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct crypto_alg *calg = tfm-&gt;__crt_alg;</div><div class='add'>+	struct crypto_acomp *crt = __crypto_acomp_tfm(tfm);</div><div class='add'>+	struct crypto_scomp **ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct crypto_scomp *scomp;</div><div class='add'>+</div><div class='add'>+	if (!crypto_mod_get(calg))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	scomp = crypto_create_tfm(calg, &amp;crypto_scomp_type);</div><div class='add'>+	if (IS_ERR(scomp)) {</div><div class='add'>+		crypto_mod_put(calg);</div><div class='add'>+		return PTR_ERR(scomp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*ctx = scomp;</div><div class='add'>+	tfm-&gt;exit = crypto_exit_scomp_ops_async;</div><div class='add'>+</div><div class='add'>+	crt-&gt;compress = scomp_acomp_compress;</div><div class='add'>+	crt-&gt;decompress = scomp_acomp_decompress;</div><div class='add'>+	crt-&gt;dst_free = crypto_scomp_sg_free;</div><div class='add'>+	crt-&gt;reqsize = sizeof(void *);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct acomp_req *crypto_acomp_scomp_alloc_ctx(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_acomp *acomp = crypto_acomp_reqtfm(req);</div><div class='add'>+	struct crypto_tfm *tfm = crypto_acomp_tfm(acomp);</div><div class='add'>+	struct crypto_scomp **tfm_ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct crypto_scomp *scomp = *tfm_ctx;</div><div class='add'>+	void *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = crypto_scomp_alloc_ctx(scomp);</div><div class='add'>+	if (IS_ERR(ctx)) {</div><div class='add'>+		kfree(req);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*req-&gt;__ctx = ctx;</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void crypto_acomp_scomp_free_ctx(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_acomp *acomp = crypto_acomp_reqtfm(req);</div><div class='add'>+	struct crypto_tfm *tfm = crypto_acomp_tfm(acomp);</div><div class='add'>+	struct crypto_scomp **tfm_ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct crypto_scomp *scomp = *tfm_ctx;</div><div class='add'>+	void *ctx = *req-&gt;__ctx;</div><div class='add'>+</div><div class='add'>+	if (ctx)</div><div class='add'>+		crypto_scomp_free_ctx(scomp, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct crypto_type crypto_scomp_type = {</div><div class='add'>+	.extsize = crypto_alg_extsize,</div><div class='add'>+	.init_tfm = crypto_scomp_init_tfm,</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	.show = crypto_scomp_show,</div><div class='add'>+#endif</div><div class='add'>+	.report = crypto_scomp_report,</div><div class='add'>+	.maskclear = ~CRYPTO_ALG_TYPE_MASK,</div><div class='add'>+	.maskset = CRYPTO_ALG_TYPE_MASK,</div><div class='add'>+	.type = CRYPTO_ALG_TYPE_SCOMPRESS,</div><div class='add'>+	.tfmsize = offsetof(struct crypto_scomp, base),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int crypto_register_scomp(struct scomp_alg *alg)</div><div class='add'>+{</div><div class='add'>+	struct crypto_alg *base = &amp;alg-&gt;base;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;scomp_lock);</div><div class='add'>+	if (crypto_scomp_alloc_all_scratches())</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	base-&gt;cra_type = &amp;crypto_scomp_type;</div><div class='add'>+	base-&gt;cra_flags &amp;= ~CRYPTO_ALG_TYPE_MASK;</div><div class='add'>+	base-&gt;cra_flags |= CRYPTO_ALG_TYPE_SCOMPRESS;</div><div class='add'>+</div><div class='add'>+	ret = crypto_register_alg(base);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;scomp_lock);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	crypto_scomp_free_all_scratches();</div><div class='add'>+	mutex_unlock(&amp;scomp_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_register_scomp);</div><div class='add'>+</div><div class='add'>+int crypto_unregister_scomp(struct scomp_alg *alg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;scomp_lock);</div><div class='add'>+	ret = crypto_unregister_alg(&amp;alg-&gt;base);</div><div class='add'>+	crypto_scomp_free_all_scratches();</div><div class='add'>+	mutex_unlock(&amp;scomp_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_unregister_scomp);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Synchronous compression type");</div><div class='head'>diff --git a/crypto/seqiv.c b/crypto/seqiv.c<br/>index c7049231861f..570b7d1aa0ca 100644<br/>--- a/<a href='/drm-misc/tree/crypto/seqiv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/seqiv.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/seqiv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/seqiv.c</a></div><div class='hunk'>@@ -153,8 +153,6 @@ static int seqiv_aead_create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> 	if (IS_ERR(inst))</div><div class='ctx'> 		return PTR_ERR(inst);</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.base.cra_alignmask |= __alignof__(u32) - 1;</div><div class='del'>-</div><div class='ctx'> 	spawn = aead_instance_ctx(inst);</div><div class='ctx'> 	alg = crypto_spawn_aead_alg(spawn);</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/shash.c b/crypto/shash.c<br/>index a051541a4a17..5e31c8d776df 100644<br/>--- a/<a href='/drm-misc/tree/crypto/shash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/shash.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/shash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/shash.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/cryptouser.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='hunk'>@@ -67,7 +68,7 @@ EXPORT_SYMBOL_GPL(crypto_shash_setkey);</div><div class='ctx'> static inline unsigned int shash_align_buffer_size(unsigned len,</div><div class='ctx'> 						   unsigned long mask)</div><div class='ctx'> {</div><div class='del'>-	typedef u8 __attribute__ ((aligned)) u8_aligned;</div><div class='add'>+	typedef u8 __aligned_largest u8_aligned;</div><div class='ctx'> 	return len + (mask &amp; ~(__alignof__(u8_aligned) - 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -80,7 +81,7 @@ static int shash_update_unaligned(struct shash_desc *desc, const u8 *data,</div><div class='ctx'> 	unsigned int unaligned_len = alignmask + 1 -</div><div class='ctx'> 				     ((unsigned long)data &amp; alignmask);</div><div class='ctx'> 	u8 ubuf[shash_align_buffer_size(unaligned_len, alignmask)]</div><div class='del'>-		__attribute__ ((aligned));</div><div class='add'>+		__aligned_largest;</div><div class='ctx'> 	u8 *buf = PTR_ALIGN(&amp;ubuf[0], alignmask + 1);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +117,7 @@ static int shash_final_unaligned(struct shash_desc *desc, u8 *out)</div><div class='ctx'> 	struct shash_alg *shash = crypto_shash_alg(tfm);</div><div class='ctx'> 	unsigned int ds = crypto_shash_digestsize(tfm);</div><div class='ctx'> 	u8 ubuf[shash_align_buffer_size(ds, alignmask)]</div><div class='del'>-		__attribute__ ((aligned));</div><div class='add'>+		__aligned_largest;</div><div class='ctx'> 	u8 *buf = PTR_ALIGN(&amp;ubuf[0], alignmask + 1);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -403,7 +404,7 @@ static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='del'>-	__attribute__ ((unused));</div><div class='add'>+	__maybe_unused;</div><div class='ctx'> static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	struct shash_alg *salg = __crypto_shash_alg(alg);</div><div class='head'>diff --git a/crypto/simd.c b/crypto/simd.c<br/>new file mode 100644<br/>index 000000000000..88203370a62f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/crypto/simd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/simd.c</a></div><div class='hunk'>@@ -0,0 +1,226 @@</div><div class='add'>+/*</div><div class='add'>+ * Shared crypto simd helpers</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2012 Jussi Kivilinna &lt;jussi.kivilinna@mbnet.fi&gt;</div><div class='add'>+ * Copyright (c) 2016 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on aesni-intel_glue.c by:</div><div class='add'>+ *  Copyright (C) 2008, Intel Corp.</div><div class='add'>+ *    Author: Huang Ying &lt;ying.huang@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307</div><div class='add'>+ * USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/cryptd.h&gt;</div><div class='add'>+#include &lt;crypto/internal/simd.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/preempt.h&gt;</div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='add'>+</div><div class='add'>+struct simd_skcipher_alg {</div><div class='add'>+	const char *ialg_name;</div><div class='add'>+	struct skcipher_alg alg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct simd_skcipher_ctx {</div><div class='add'>+	struct cryptd_skcipher *cryptd_tfm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int simd_skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='add'>+				unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct simd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_skcipher *child = &amp;ctx-&gt;cryptd_tfm-&gt;base;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	crypto_skcipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_skcipher_set_flags(child, crypto_skcipher_get_flags(tfm) &amp;</div><div class='add'>+					 CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	err = crypto_skcipher_setkey(child, key, key_len);</div><div class='add'>+	crypto_skcipher_set_flags(tfm, crypto_skcipher_get_flags(child) &amp;</div><div class='add'>+				       CRYPTO_TFM_RES_MASK);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int simd_skcipher_encrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct simd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+	struct crypto_skcipher *child;</div><div class='add'>+</div><div class='add'>+	subreq = skcipher_request_ctx(req);</div><div class='add'>+	*subreq = *req;</div><div class='add'>+</div><div class='add'>+	if (!may_use_simd() ||</div><div class='add'>+	    (in_atomic() &amp;&amp; cryptd_skcipher_queued(ctx-&gt;cryptd_tfm)))</div><div class='add'>+		child = &amp;ctx-&gt;cryptd_tfm-&gt;base;</div><div class='add'>+	else</div><div class='add'>+		child = cryptd_skcipher_child(ctx-&gt;cryptd_tfm);</div><div class='add'>+</div><div class='add'>+	skcipher_request_set_tfm(subreq, child);</div><div class='add'>+</div><div class='add'>+	return crypto_skcipher_encrypt(subreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int simd_skcipher_decrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+	struct simd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+	struct crypto_skcipher *child;</div><div class='add'>+</div><div class='add'>+	subreq = skcipher_request_ctx(req);</div><div class='add'>+	*subreq = *req;</div><div class='add'>+</div><div class='add'>+	if (!may_use_simd() ||</div><div class='add'>+	    (in_atomic() &amp;&amp; cryptd_skcipher_queued(ctx-&gt;cryptd_tfm)))</div><div class='add'>+		child = &amp;ctx-&gt;cryptd_tfm-&gt;base;</div><div class='add'>+	else</div><div class='add'>+		child = cryptd_skcipher_child(ctx-&gt;cryptd_tfm);</div><div class='add'>+</div><div class='add'>+	skcipher_request_set_tfm(subreq, child);</div><div class='add'>+</div><div class='add'>+	return crypto_skcipher_decrypt(subreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void simd_skcipher_exit(struct crypto_skcipher *tfm)</div><div class='add'>+{</div><div class='add'>+	struct simd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	cryptd_free_skcipher(ctx-&gt;cryptd_tfm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int simd_skcipher_init(struct crypto_skcipher *tfm)</div><div class='add'>+{</div><div class='add'>+	struct simd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct cryptd_skcipher *cryptd_tfm;</div><div class='add'>+	struct simd_skcipher_alg *salg;</div><div class='add'>+	struct skcipher_alg *alg;</div><div class='add'>+	unsigned reqsize;</div><div class='add'>+</div><div class='add'>+	alg = crypto_skcipher_alg(tfm);</div><div class='add'>+	salg = container_of(alg, struct simd_skcipher_alg, alg);</div><div class='add'>+</div><div class='add'>+	cryptd_tfm = cryptd_alloc_skcipher(salg-&gt;ialg_name,</div><div class='add'>+					   CRYPTO_ALG_INTERNAL,</div><div class='add'>+					   CRYPTO_ALG_INTERNAL);</div><div class='add'>+	if (IS_ERR(cryptd_tfm))</div><div class='add'>+		return PTR_ERR(cryptd_tfm);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;cryptd_tfm = cryptd_tfm;</div><div class='add'>+</div><div class='add'>+	reqsize = sizeof(struct skcipher_request);</div><div class='add'>+	reqsize += crypto_skcipher_reqsize(&amp;cryptd_tfm-&gt;base);</div><div class='add'>+</div><div class='add'>+	crypto_skcipher_set_reqsize(tfm, reqsize);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,</div><div class='add'>+						      const char *drvname,</div><div class='add'>+						      const char *basename)</div><div class='add'>+{</div><div class='add'>+	struct simd_skcipher_alg *salg;</div><div class='add'>+	struct crypto_skcipher *tfm;</div><div class='add'>+	struct skcipher_alg *ialg;</div><div class='add'>+	struct skcipher_alg *alg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_skcipher(basename, CRYPTO_ALG_INTERNAL,</div><div class='add'>+				    CRYPTO_ALG_INTERNAL | CRYPTO_ALG_ASYNC);</div><div class='add'>+	if (IS_ERR(tfm))</div><div class='add'>+		return ERR_CAST(tfm);</div><div class='add'>+</div><div class='add'>+	ialg = crypto_skcipher_alg(tfm);</div><div class='add'>+</div><div class='add'>+	salg = kzalloc(sizeof(*salg), GFP_KERNEL);</div><div class='add'>+	if (!salg) {</div><div class='add'>+		salg = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto out_put_tfm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	salg-&gt;ialg_name = basename;</div><div class='add'>+	alg = &amp;salg-&gt;alg;</div><div class='add'>+</div><div class='add'>+	err = -ENAMETOOLONG;</div><div class='add'>+	if (snprintf(alg-&gt;base.cra_name, CRYPTO_MAX_ALG_NAME, "%s", algname) &gt;=</div><div class='add'>+	    CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		goto out_free_salg;</div><div class='add'>+</div><div class='add'>+	if (snprintf(alg-&gt;base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",</div><div class='add'>+		     drvname) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		goto out_free_salg;</div><div class='add'>+</div><div class='add'>+	alg-&gt;base.cra_flags = CRYPTO_ALG_ASYNC;</div><div class='add'>+	alg-&gt;base.cra_priority = ialg-&gt;base.cra_priority;</div><div class='add'>+	alg-&gt;base.cra_blocksize = ialg-&gt;base.cra_blocksize;</div><div class='add'>+	alg-&gt;base.cra_alignmask = ialg-&gt;base.cra_alignmask;</div><div class='add'>+	alg-&gt;base.cra_module = ialg-&gt;base.cra_module;</div><div class='add'>+	alg-&gt;base.cra_ctxsize = sizeof(struct simd_skcipher_ctx);</div><div class='add'>+</div><div class='add'>+	alg-&gt;ivsize = ialg-&gt;ivsize;</div><div class='add'>+	alg-&gt;chunksize = ialg-&gt;chunksize;</div><div class='add'>+	alg-&gt;min_keysize = ialg-&gt;min_keysize;</div><div class='add'>+	alg-&gt;max_keysize = ialg-&gt;max_keysize;</div><div class='add'>+</div><div class='add'>+	alg-&gt;init = simd_skcipher_init;</div><div class='add'>+	alg-&gt;exit = simd_skcipher_exit;</div><div class='add'>+</div><div class='add'>+	alg-&gt;setkey = simd_skcipher_setkey;</div><div class='add'>+	alg-&gt;encrypt = simd_skcipher_encrypt;</div><div class='add'>+	alg-&gt;decrypt = simd_skcipher_decrypt;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_skcipher(alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_salg;</div><div class='add'>+</div><div class='add'>+out_put_tfm:</div><div class='add'>+	crypto_free_skcipher(tfm);</div><div class='add'>+	return salg;</div><div class='add'>+</div><div class='add'>+out_free_salg:</div><div class='add'>+	kfree(salg);</div><div class='add'>+	salg = ERR_PTR(err);</div><div class='add'>+	goto out_put_tfm;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(simd_skcipher_create_compat);</div><div class='add'>+</div><div class='add'>+struct simd_skcipher_alg *simd_skcipher_create(const char *algname,</div><div class='add'>+					       const char *basename)</div><div class='add'>+{</div><div class='add'>+	char drvname[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+</div><div class='add'>+	if (snprintf(drvname, CRYPTO_MAX_ALG_NAME, "simd-%s", basename) &gt;=</div><div class='add'>+	    CRYPTO_MAX_ALG_NAME)</div><div class='add'>+		return ERR_PTR(-ENAMETOOLONG);</div><div class='add'>+</div><div class='add'>+	return simd_skcipher_create_compat(algname, drvname, basename);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(simd_skcipher_create);</div><div class='add'>+</div><div class='add'>+void simd_skcipher_free(struct simd_skcipher_alg *salg)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_skcipher(&amp;salg-&gt;alg);</div><div class='add'>+	kfree(salg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(simd_skcipher_free);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/crypto/skcipher.c b/crypto/skcipher.c<br/>index f7d0018dcaee..014af741fc6a 100644<br/>--- a/<a href='/drm-misc/tree/crypto/skcipher.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/skcipher.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/skcipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/skcipher.c</a></div><div class='hunk'>@@ -14,9 +14,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;crypto/internal/aead.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/cryptouser.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='hunk'>@@ -24,6 +28,545 @@</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	SKCIPHER_WALK_PHYS = 1 &lt;&lt; 0,</div><div class='add'>+	SKCIPHER_WALK_SLOW = 1 &lt;&lt; 1,</div><div class='add'>+	SKCIPHER_WALK_COPY = 1 &lt;&lt; 2,</div><div class='add'>+	SKCIPHER_WALK_DIFF = 1 &lt;&lt; 3,</div><div class='add'>+	SKCIPHER_WALK_SLEEP = 1 &lt;&lt; 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct skcipher_walk_buffer {</div><div class='add'>+	struct list_head entry;</div><div class='add'>+	struct scatter_walk dst;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	u8 *data;</div><div class='add'>+	u8 buffer[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int skcipher_walk_next(struct skcipher_walk *walk);</div><div class='add'>+</div><div class='add'>+static inline void skcipher_unmap(struct scatter_walk *walk, void *vaddr)</div><div class='add'>+{</div><div class='add'>+	if (PageHighMem(scatterwalk_page(walk)))</div><div class='add'>+		kunmap_atomic(vaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *skcipher_map(struct scatter_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct page *page = scatterwalk_page(walk);</div><div class='add'>+</div><div class='add'>+	return (PageHighMem(page) ? kmap_atomic(page) : page_address(page)) +</div><div class='add'>+	       offset_in_page(walk-&gt;offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void skcipher_map_src(struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	walk-&gt;src.virt.addr = skcipher_map(&amp;walk-&gt;in);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void skcipher_map_dst(struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	walk-&gt;dst.virt.addr = skcipher_map(&amp;walk-&gt;out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void skcipher_unmap_src(struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	skcipher_unmap(&amp;walk-&gt;in, walk-&gt;src.virt.addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void skcipher_unmap_dst(struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	skcipher_unmap(&amp;walk-&gt;out, walk-&gt;dst.virt.addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline gfp_t skcipher_walk_gfp(struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	return walk-&gt;flags &amp; SKCIPHER_WALK_SLEEP ? GFP_KERNEL : GFP_ATOMIC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get a spot of the specified length that does not straddle a page.</div><div class='add'>+ * The caller needs to ensure that there is enough space for this operation.</div><div class='add'>+ */</div><div class='add'>+static inline u8 *skcipher_get_spot(u8 *start, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	u8 *end_page = (u8 *)(((unsigned long)(start + len - 1)) &amp; PAGE_MASK);</div><div class='add'>+</div><div class='add'>+	return max(start, end_page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int skcipher_done_slow(struct skcipher_walk *walk, unsigned int bsize)</div><div class='add'>+{</div><div class='add'>+	u8 *addr;</div><div class='add'>+</div><div class='add'>+	addr = (u8 *)ALIGN((unsigned long)walk-&gt;buffer, walk-&gt;alignmask + 1);</div><div class='add'>+	addr = skcipher_get_spot(addr, bsize);</div><div class='add'>+	scatterwalk_copychunks(addr, &amp;walk-&gt;out, bsize,</div><div class='add'>+			       (walk-&gt;flags &amp; SKCIPHER_WALK_PHYS) ? 2 : 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int skcipher_walk_done(struct skcipher_walk *walk, int err)</div><div class='add'>+{</div><div class='add'>+	unsigned int n = walk-&gt;nbytes - err;</div><div class='add'>+	unsigned int nbytes;</div><div class='add'>+</div><div class='add'>+	nbytes = walk-&gt;total - n;</div><div class='add'>+</div><div class='add'>+	if (unlikely(err &lt; 0)) {</div><div class='add'>+		nbytes = 0;</div><div class='add'>+		n = 0;</div><div class='add'>+	} else if (likely(!(walk-&gt;flags &amp; (SKCIPHER_WALK_PHYS |</div><div class='add'>+					   SKCIPHER_WALK_SLOW |</div><div class='add'>+					   SKCIPHER_WALK_COPY |</div><div class='add'>+					   SKCIPHER_WALK_DIFF)))) {</div><div class='add'>+unmap_src:</div><div class='add'>+		skcipher_unmap_src(walk);</div><div class='add'>+	} else if (walk-&gt;flags &amp; SKCIPHER_WALK_DIFF) {</div><div class='add'>+		skcipher_unmap_dst(walk);</div><div class='add'>+		goto unmap_src;</div><div class='add'>+	} else if (walk-&gt;flags &amp; SKCIPHER_WALK_COPY) {</div><div class='add'>+		skcipher_map_dst(walk);</div><div class='add'>+		memcpy(walk-&gt;dst.virt.addr, walk-&gt;page, n);</div><div class='add'>+		skcipher_unmap_dst(walk);</div><div class='add'>+	} else if (unlikely(walk-&gt;flags &amp; SKCIPHER_WALK_SLOW)) {</div><div class='add'>+		if (WARN_ON(err)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			nbytes = 0;</div><div class='add'>+		} else</div><div class='add'>+			n = skcipher_done_slow(walk, n);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &gt; 0)</div><div class='add'>+		err = 0;</div><div class='add'>+</div><div class='add'>+	walk-&gt;total = nbytes;</div><div class='add'>+	walk-&gt;nbytes = nbytes;</div><div class='add'>+</div><div class='add'>+	scatterwalk_advance(&amp;walk-&gt;in, n);</div><div class='add'>+	scatterwalk_advance(&amp;walk-&gt;out, n);</div><div class='add'>+	scatterwalk_done(&amp;walk-&gt;in, 0, nbytes);</div><div class='add'>+	scatterwalk_done(&amp;walk-&gt;out, 1, nbytes);</div><div class='add'>+</div><div class='add'>+	if (nbytes) {</div><div class='add'>+		crypto_yield(walk-&gt;flags &amp; SKCIPHER_WALK_SLEEP ?</div><div class='add'>+			     CRYPTO_TFM_REQ_MAY_SLEEP : 0);</div><div class='add'>+		return skcipher_walk_next(walk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Short-circuit for the common/fast path. */</div><div class='add'>+	if (!((unsigned long)walk-&gt;buffer | (unsigned long)walk-&gt;page))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (walk-&gt;flags &amp; SKCIPHER_WALK_PHYS)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (walk-&gt;iv != walk-&gt;oiv)</div><div class='add'>+		memcpy(walk-&gt;oiv, walk-&gt;iv, walk-&gt;ivsize);</div><div class='add'>+	if (walk-&gt;buffer != walk-&gt;page)</div><div class='add'>+		kfree(walk-&gt;buffer);</div><div class='add'>+	if (walk-&gt;page)</div><div class='add'>+		free_page((unsigned long)walk-&gt;page);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skcipher_walk_done);</div><div class='add'>+</div><div class='add'>+void skcipher_walk_complete(struct skcipher_walk *walk, int err)</div><div class='add'>+{</div><div class='add'>+	struct skcipher_walk_buffer *p, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(p, tmp, &amp;walk-&gt;buffers, entry) {</div><div class='add'>+		u8 *data;</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		data = p-&gt;data;</div><div class='add'>+		if (!data) {</div><div class='add'>+			data = PTR_ALIGN(&amp;p-&gt;buffer[0], walk-&gt;alignmask + 1);</div><div class='add'>+			data = skcipher_get_spot(data, walk-&gt;stride);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		scatterwalk_copychunks(data, &amp;p-&gt;dst, p-&gt;len, 1);</div><div class='add'>+</div><div class='add'>+		if (offset_in_page(p-&gt;data) + p-&gt;len + walk-&gt;stride &gt;</div><div class='add'>+		    PAGE_SIZE)</div><div class='add'>+			free_page((unsigned long)p-&gt;data);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+		list_del(&amp;p-&gt;entry);</div><div class='add'>+		kfree(p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; walk-&gt;iv != walk-&gt;oiv)</div><div class='add'>+		memcpy(walk-&gt;oiv, walk-&gt;iv, walk-&gt;ivsize);</div><div class='add'>+	if (walk-&gt;buffer != walk-&gt;page)</div><div class='add'>+		kfree(walk-&gt;buffer);</div><div class='add'>+	if (walk-&gt;page)</div><div class='add'>+		free_page((unsigned long)walk-&gt;page);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skcipher_walk_complete);</div><div class='add'>+</div><div class='add'>+static void skcipher_queue_write(struct skcipher_walk *walk,</div><div class='add'>+				 struct skcipher_walk_buffer *p)</div><div class='add'>+{</div><div class='add'>+	p-&gt;dst = walk-&gt;out;</div><div class='add'>+	list_add_tail(&amp;p-&gt;entry, &amp;walk-&gt;buffers);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int skcipher_next_slow(struct skcipher_walk *walk, unsigned int bsize)</div><div class='add'>+{</div><div class='add'>+	bool phys = walk-&gt;flags &amp; SKCIPHER_WALK_PHYS;</div><div class='add'>+	unsigned alignmask = walk-&gt;alignmask;</div><div class='add'>+	struct skcipher_walk_buffer *p;</div><div class='add'>+	unsigned a;</div><div class='add'>+	unsigned n;</div><div class='add'>+	u8 *buffer;</div><div class='add'>+	void *v;</div><div class='add'>+</div><div class='add'>+	if (!phys) {</div><div class='add'>+		if (!walk-&gt;buffer)</div><div class='add'>+			walk-&gt;buffer = walk-&gt;page;</div><div class='add'>+		buffer = walk-&gt;buffer;</div><div class='add'>+		if (buffer)</div><div class='add'>+			goto ok;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start with the minimum alignment of kmalloc. */</div><div class='add'>+	a = crypto_tfm_ctx_alignment() - 1;</div><div class='add'>+	n = bsize;</div><div class='add'>+</div><div class='add'>+	if (phys) {</div><div class='add'>+		/* Calculate the minimum alignment of p-&gt;buffer. */</div><div class='add'>+		a &amp;= (sizeof(*p) ^ (sizeof(*p) - 1)) &gt;&gt; 1;</div><div class='add'>+		n += sizeof(*p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Minimum size to align p-&gt;buffer by alignmask. */</div><div class='add'>+	n += alignmask &amp; ~a;</div><div class='add'>+</div><div class='add'>+	/* Minimum size to ensure p-&gt;buffer does not straddle a page. */</div><div class='add'>+	n += (bsize - 1) &amp; ~(alignmask | a);</div><div class='add'>+</div><div class='add'>+	v = kzalloc(n, skcipher_walk_gfp(walk));</div><div class='add'>+	if (!v)</div><div class='add'>+		return skcipher_walk_done(walk, -ENOMEM);</div><div class='add'>+</div><div class='add'>+	if (phys) {</div><div class='add'>+		p = v;</div><div class='add'>+		p-&gt;len = bsize;</div><div class='add'>+		skcipher_queue_write(walk, p);</div><div class='add'>+		buffer = p-&gt;buffer;</div><div class='add'>+	} else {</div><div class='add'>+		walk-&gt;buffer = v;</div><div class='add'>+		buffer = v;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ok:</div><div class='add'>+	walk-&gt;dst.virt.addr = PTR_ALIGN(buffer, alignmask + 1);</div><div class='add'>+	walk-&gt;dst.virt.addr = skcipher_get_spot(walk-&gt;dst.virt.addr, bsize);</div><div class='add'>+	walk-&gt;src.virt.addr = walk-&gt;dst.virt.addr;</div><div class='add'>+</div><div class='add'>+	scatterwalk_copychunks(walk-&gt;src.virt.addr, &amp;walk-&gt;in, bsize, 0);</div><div class='add'>+</div><div class='add'>+	walk-&gt;nbytes = bsize;</div><div class='add'>+	walk-&gt;flags |= SKCIPHER_WALK_SLOW;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int skcipher_next_copy(struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct skcipher_walk_buffer *p;</div><div class='add'>+	u8 *tmp = walk-&gt;page;</div><div class='add'>+</div><div class='add'>+	skcipher_map_src(walk);</div><div class='add'>+	memcpy(tmp, walk-&gt;src.virt.addr, walk-&gt;nbytes);</div><div class='add'>+	skcipher_unmap_src(walk);</div><div class='add'>+</div><div class='add'>+	walk-&gt;src.virt.addr = tmp;</div><div class='add'>+	walk-&gt;dst.virt.addr = tmp;</div><div class='add'>+</div><div class='add'>+	if (!(walk-&gt;flags &amp; SKCIPHER_WALK_PHYS))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	p = kmalloc(sizeof(*p), skcipher_walk_gfp(walk));</div><div class='add'>+	if (!p)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	p-&gt;data = walk-&gt;page;</div><div class='add'>+	p-&gt;len = walk-&gt;nbytes;</div><div class='add'>+	skcipher_queue_write(walk, p);</div><div class='add'>+</div><div class='add'>+	if (offset_in_page(walk-&gt;page) + walk-&gt;nbytes + walk-&gt;stride &gt;</div><div class='add'>+	    PAGE_SIZE)</div><div class='add'>+		walk-&gt;page = NULL;</div><div class='add'>+	else</div><div class='add'>+		walk-&gt;page += walk-&gt;nbytes;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int skcipher_next_fast(struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	unsigned long diff;</div><div class='add'>+</div><div class='add'>+	walk-&gt;src.phys.page = scatterwalk_page(&amp;walk-&gt;in);</div><div class='add'>+	walk-&gt;src.phys.offset = offset_in_page(walk-&gt;in.offset);</div><div class='add'>+	walk-&gt;dst.phys.page = scatterwalk_page(&amp;walk-&gt;out);</div><div class='add'>+	walk-&gt;dst.phys.offset = offset_in_page(walk-&gt;out.offset);</div><div class='add'>+</div><div class='add'>+	if (walk-&gt;flags &amp; SKCIPHER_WALK_PHYS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	diff = walk-&gt;src.phys.offset - walk-&gt;dst.phys.offset;</div><div class='add'>+	diff |= walk-&gt;src.virt.page - walk-&gt;dst.virt.page;</div><div class='add'>+</div><div class='add'>+	skcipher_map_src(walk);</div><div class='add'>+	walk-&gt;dst.virt.addr = walk-&gt;src.virt.addr;</div><div class='add'>+</div><div class='add'>+	if (diff) {</div><div class='add'>+		walk-&gt;flags |= SKCIPHER_WALK_DIFF;</div><div class='add'>+		skcipher_map_dst(walk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int skcipher_walk_next(struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	unsigned int bsize;</div><div class='add'>+	unsigned int n;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	walk-&gt;flags &amp;= ~(SKCIPHER_WALK_SLOW | SKCIPHER_WALK_COPY |</div><div class='add'>+			 SKCIPHER_WALK_DIFF);</div><div class='add'>+</div><div class='add'>+	n = walk-&gt;total;</div><div class='add'>+	bsize = min(walk-&gt;stride, max(n, walk-&gt;blocksize));</div><div class='add'>+	n = scatterwalk_clamp(&amp;walk-&gt;in, n);</div><div class='add'>+	n = scatterwalk_clamp(&amp;walk-&gt;out, n);</div><div class='add'>+</div><div class='add'>+	if (unlikely(n &lt; bsize)) {</div><div class='add'>+		if (unlikely(walk-&gt;total &lt; walk-&gt;blocksize))</div><div class='add'>+			return skcipher_walk_done(walk, -EINVAL);</div><div class='add'>+</div><div class='add'>+slow_path:</div><div class='add'>+		err = skcipher_next_slow(walk, bsize);</div><div class='add'>+		goto set_phys_lowmem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely((walk-&gt;in.offset | walk-&gt;out.offset) &amp; walk-&gt;alignmask)) {</div><div class='add'>+		if (!walk-&gt;page) {</div><div class='add'>+			gfp_t gfp = skcipher_walk_gfp(walk);</div><div class='add'>+</div><div class='add'>+			walk-&gt;page = (void *)__get_free_page(gfp);</div><div class='add'>+			if (!walk-&gt;page)</div><div class='add'>+				goto slow_path;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		walk-&gt;nbytes = min_t(unsigned, n,</div><div class='add'>+				     PAGE_SIZE - offset_in_page(walk-&gt;page));</div><div class='add'>+		walk-&gt;flags |= SKCIPHER_WALK_COPY;</div><div class='add'>+		err = skcipher_next_copy(walk);</div><div class='add'>+		goto set_phys_lowmem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	walk-&gt;nbytes = n;</div><div class='add'>+</div><div class='add'>+	return skcipher_next_fast(walk);</div><div class='add'>+</div><div class='add'>+set_phys_lowmem:</div><div class='add'>+	if (!err &amp;&amp; (walk-&gt;flags &amp; SKCIPHER_WALK_PHYS)) {</div><div class='add'>+		walk-&gt;src.phys.page = virt_to_page(walk-&gt;src.virt.addr);</div><div class='add'>+		walk-&gt;dst.phys.page = virt_to_page(walk-&gt;dst.virt.addr);</div><div class='add'>+		walk-&gt;src.phys.offset &amp;= PAGE_SIZE - 1;</div><div class='add'>+		walk-&gt;dst.phys.offset &amp;= PAGE_SIZE - 1;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skcipher_walk_next);</div><div class='add'>+</div><div class='add'>+static int skcipher_copy_iv(struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	unsigned a = crypto_tfm_ctx_alignment() - 1;</div><div class='add'>+	unsigned alignmask = walk-&gt;alignmask;</div><div class='add'>+	unsigned ivsize = walk-&gt;ivsize;</div><div class='add'>+	unsigned bs = walk-&gt;stride;</div><div class='add'>+	unsigned aligned_bs;</div><div class='add'>+	unsigned size;</div><div class='add'>+	u8 *iv;</div><div class='add'>+</div><div class='add'>+	aligned_bs = ALIGN(bs, alignmask);</div><div class='add'>+</div><div class='add'>+	/* Minimum size to align buffer by alignmask. */</div><div class='add'>+	size = alignmask &amp; ~a;</div><div class='add'>+</div><div class='add'>+	if (walk-&gt;flags &amp; SKCIPHER_WALK_PHYS)</div><div class='add'>+		size += ivsize;</div><div class='add'>+	else {</div><div class='add'>+		size += aligned_bs + ivsize;</div><div class='add'>+</div><div class='add'>+		/* Minimum size to ensure buffer does not straddle a page. */</div><div class='add'>+		size += (bs - 1) &amp; ~(alignmask | a);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	walk-&gt;buffer = kmalloc(size, skcipher_walk_gfp(walk));</div><div class='add'>+	if (!walk-&gt;buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	iv = PTR_ALIGN(walk-&gt;buffer, alignmask + 1);</div><div class='add'>+	iv = skcipher_get_spot(iv, bs) + aligned_bs;</div><div class='add'>+</div><div class='add'>+	walk-&gt;iv = memcpy(iv, walk-&gt;iv, walk-&gt;ivsize);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int skcipher_walk_first(struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	walk-&gt;nbytes = 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(in_irq()))</div><div class='add'>+		return -EDEADLK;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!walk-&gt;total))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	walk-&gt;buffer = NULL;</div><div class='add'>+	if (unlikely(((unsigned long)walk-&gt;iv &amp; walk-&gt;alignmask))) {</div><div class='add'>+		int err = skcipher_copy_iv(walk);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	walk-&gt;page = NULL;</div><div class='add'>+	walk-&gt;nbytes = walk-&gt;total;</div><div class='add'>+</div><div class='add'>+	return skcipher_walk_next(walk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int skcipher_walk_skcipher(struct skcipher_walk *walk,</div><div class='add'>+				  struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='add'>+</div><div class='add'>+	scatterwalk_start(&amp;walk-&gt;in, req-&gt;src);</div><div class='add'>+	scatterwalk_start(&amp;walk-&gt;out, req-&gt;dst);</div><div class='add'>+</div><div class='add'>+	walk-&gt;total = req-&gt;cryptlen;</div><div class='add'>+	walk-&gt;iv = req-&gt;iv;</div><div class='add'>+	walk-&gt;oiv = req-&gt;iv;</div><div class='add'>+</div><div class='add'>+	walk-&gt;flags &amp;= ~SKCIPHER_WALK_SLEEP;</div><div class='add'>+	walk-&gt;flags |= req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP ?</div><div class='add'>+		       SKCIPHER_WALK_SLEEP : 0;</div><div class='add'>+</div><div class='add'>+	walk-&gt;blocksize = crypto_skcipher_blocksize(tfm);</div><div class='add'>+	walk-&gt;stride = crypto_skcipher_walksize(tfm);</div><div class='add'>+	walk-&gt;ivsize = crypto_skcipher_ivsize(tfm);</div><div class='add'>+	walk-&gt;alignmask = crypto_skcipher_alignmask(tfm);</div><div class='add'>+</div><div class='add'>+	return skcipher_walk_first(walk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int skcipher_walk_virt(struct skcipher_walk *walk,</div><div class='add'>+		       struct skcipher_request *req, bool atomic)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	walk-&gt;flags &amp;= ~SKCIPHER_WALK_PHYS;</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_skcipher(walk, req);</div><div class='add'>+</div><div class='add'>+	walk-&gt;flags &amp;= atomic ? ~SKCIPHER_WALK_SLEEP : ~0;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skcipher_walk_virt);</div><div class='add'>+</div><div class='add'>+void skcipher_walk_atomise(struct skcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	walk-&gt;flags &amp;= ~SKCIPHER_WALK_SLEEP;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skcipher_walk_atomise);</div><div class='add'>+</div><div class='add'>+int skcipher_walk_async(struct skcipher_walk *walk,</div><div class='add'>+			struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	walk-&gt;flags |= SKCIPHER_WALK_PHYS;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;walk-&gt;buffers);</div><div class='add'>+</div><div class='add'>+	return skcipher_walk_skcipher(walk, req);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skcipher_walk_async);</div><div class='add'>+</div><div class='add'>+static int skcipher_walk_aead_common(struct skcipher_walk *walk,</div><div class='add'>+				     struct aead_request *req, bool atomic)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	walk-&gt;flags &amp;= ~SKCIPHER_WALK_PHYS;</div><div class='add'>+</div><div class='add'>+	scatterwalk_start(&amp;walk-&gt;in, req-&gt;src);</div><div class='add'>+	scatterwalk_start(&amp;walk-&gt;out, req-&gt;dst);</div><div class='add'>+</div><div class='add'>+	scatterwalk_copychunks(NULL, &amp;walk-&gt;in, req-&gt;assoclen, 2);</div><div class='add'>+	scatterwalk_copychunks(NULL, &amp;walk-&gt;out, req-&gt;assoclen, 2);</div><div class='add'>+</div><div class='add'>+	walk-&gt;iv = req-&gt;iv;</div><div class='add'>+	walk-&gt;oiv = req-&gt;iv;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP)</div><div class='add'>+		walk-&gt;flags |= SKCIPHER_WALK_SLEEP;</div><div class='add'>+	else</div><div class='add'>+		walk-&gt;flags &amp;= ~SKCIPHER_WALK_SLEEP;</div><div class='add'>+</div><div class='add'>+	walk-&gt;blocksize = crypto_aead_blocksize(tfm);</div><div class='add'>+	walk-&gt;stride = crypto_aead_chunksize(tfm);</div><div class='add'>+	walk-&gt;ivsize = crypto_aead_ivsize(tfm);</div><div class='add'>+	walk-&gt;alignmask = crypto_aead_alignmask(tfm);</div><div class='add'>+</div><div class='add'>+	err = skcipher_walk_first(walk);</div><div class='add'>+</div><div class='add'>+	if (atomic)</div><div class='add'>+		walk-&gt;flags &amp;= ~SKCIPHER_WALK_SLEEP;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int skcipher_walk_aead(struct skcipher_walk *walk, struct aead_request *req,</div><div class='add'>+		       bool atomic)</div><div class='add'>+{</div><div class='add'>+	walk-&gt;total = req-&gt;cryptlen;</div><div class='add'>+</div><div class='add'>+	return skcipher_walk_aead_common(walk, req, atomic);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skcipher_walk_aead);</div><div class='add'>+</div><div class='add'>+int skcipher_walk_aead_encrypt(struct skcipher_walk *walk,</div><div class='add'>+			       struct aead_request *req, bool atomic)</div><div class='add'>+{</div><div class='add'>+	walk-&gt;total = req-&gt;cryptlen;</div><div class='add'>+</div><div class='add'>+	return skcipher_walk_aead_common(walk, req, atomic);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skcipher_walk_aead_encrypt);</div><div class='add'>+</div><div class='add'>+int skcipher_walk_aead_decrypt(struct skcipher_walk *walk,</div><div class='add'>+			       struct aead_request *req, bool atomic)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+</div><div class='add'>+	walk-&gt;total = req-&gt;cryptlen - crypto_aead_authsize(tfm);</div><div class='add'>+</div><div class='add'>+	return skcipher_walk_aead_common(walk, req, atomic);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(skcipher_walk_aead_decrypt);</div><div class='add'>+</div><div class='ctx'> static unsigned int crypto_skcipher_extsize(struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	if (alg-&gt;cra_type == &amp;crypto_blkcipher_type)</div><div class='hunk'>@@ -265,7 +808,7 @@ static void crypto_skcipher_free_instance(struct crypto_instance *inst)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void crypto_skcipher_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='del'>-	__attribute__ ((unused));</div><div class='add'>+	__maybe_unused;</div><div class='ctx'> static void crypto_skcipher_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	struct skcipher_alg *skcipher = container_of(alg, struct skcipher_alg,</div><div class='hunk'>@@ -279,6 +822,7 @@ static void crypto_skcipher_show(struct seq_file *m, struct crypto_alg *alg)</div><div class='ctx'> 	seq_printf(m, "max keysize  : %u\n", skcipher-&gt;max_keysize);</div><div class='ctx'> 	seq_printf(m, "ivsize       : %u\n", skcipher-&gt;ivsize);</div><div class='ctx'> 	seq_printf(m, "chunksize    : %u\n", skcipher-&gt;chunksize);</div><div class='add'>+	seq_printf(m, "walksize     : %u\n", skcipher-&gt;walksize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET</div><div class='hunk'>@@ -351,11 +895,14 @@ static int skcipher_prepare_alg(struct skcipher_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_alg *base = &amp;alg-&gt;base;</div><div class='ctx'> </div><div class='del'>-	if (alg-&gt;ivsize &gt; PAGE_SIZE / 8 || alg-&gt;chunksize &gt; PAGE_SIZE / 8)</div><div class='add'>+	if (alg-&gt;ivsize &gt; PAGE_SIZE / 8 || alg-&gt;chunksize &gt; PAGE_SIZE / 8 ||</div><div class='add'>+	    alg-&gt;walksize &gt; PAGE_SIZE / 8)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!alg-&gt;chunksize)</div><div class='ctx'> 		alg-&gt;chunksize = base-&gt;cra_blocksize;</div><div class='add'>+	if (!alg-&gt;walksize)</div><div class='add'>+		alg-&gt;walksize = alg-&gt;chunksize;</div><div class='ctx'> </div><div class='ctx'> 	base-&gt;cra_type = &amp;crypto_skcipher_type2;</div><div class='ctx'> 	base-&gt;cra_flags &amp;= ~CRYPTO_ALG_TYPE_MASK;</div><div class='head'>diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c<br/>index ae22f05d5936..9a11f3c2bf98 100644<br/>--- a/<a href='/drm-misc/tree/crypto/tcrypt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/tcrypt.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/tcrypt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/tcrypt.c</a></div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;crypto/aead.h&gt;</div><div class='ctx'> #include &lt;crypto/hash.h&gt;</div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='hunk'>@@ -1010,6 +1012,8 @@ static inline int tcrypt_test(const char *alg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	pr_debug("testing %s\n", alg);</div><div class='add'>+</div><div class='ctx'> 	ret = alg_test(alg, alg, 0, 0);</div><div class='ctx'> 	/* non-fips algs return -EINVAL in fips mode */</div><div class='ctx'> 	if (fips_enabled &amp;&amp; ret == -EINVAL)</div><div class='hunk'>@@ -2059,6 +2063,8 @@ static int __init tcrypt_mod_init(void)</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "tcrypt: one or more tests failed!\n");</div><div class='ctx'> 		goto err_free_tv;</div><div class='add'>+	} else {</div><div class='add'>+		pr_debug("all tests passed\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We intentionaly return -EAGAIN to prevent keeping the module,</div><div class='head'>diff --git a/crypto/testmgr.c b/crypto/testmgr.c<br/>index 62dffa0028ac..f9c378af3907 100644<br/>--- a/<a href='/drm-misc/tree/crypto/testmgr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/testmgr.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/testmgr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/testmgr.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;crypto/drbg.h&gt;</div><div class='ctx'> #include &lt;crypto/akcipher.h&gt;</div><div class='ctx'> #include &lt;crypto/kpp.h&gt;</div><div class='add'>+#include &lt;crypto/acompress.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='hunk'>@@ -62,7 +63,7 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)</div><div class='ctx'>  */</div><div class='ctx'> #define IDX1		32</div><div class='ctx'> #define IDX2		32400</div><div class='del'>-#define IDX3		1</div><div class='add'>+#define IDX3		1511</div><div class='ctx'> #define IDX4		8193</div><div class='ctx'> #define IDX5		22222</div><div class='ctx'> #define IDX6		17101</div><div class='hunk'>@@ -264,6 +265,7 @@ static int __test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,</div><div class='ctx'> 		       const int align_offset)</div><div class='ctx'> {</div><div class='ctx'> 	const char *algo = crypto_tfm_alg_driver_name(crypto_ahash_tfm(tfm));</div><div class='add'>+	size_t digest_size = crypto_ahash_digestsize(tfm);</div><div class='ctx'> 	unsigned int i, j, k, temp;</div><div class='ctx'> 	struct scatterlist sg[8];</div><div class='ctx'> 	char *result;</div><div class='hunk'>@@ -274,7 +276,7 @@ static int __test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,</div><div class='ctx'> 	char *xbuf[XBUFSIZE];</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	result = kmalloc(MAX_DIGEST_SIZE, GFP_KERNEL);</div><div class='add'>+	result = kmalloc(digest_size, GFP_KERNEL);</div><div class='ctx'> 	if (!result)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	key = kmalloc(MAX_KEYLEN, GFP_KERNEL);</div><div class='hunk'>@@ -304,7 +306,7 @@ static int __test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		j++;</div><div class='del'>-		memset(result, 0, MAX_DIGEST_SIZE);</div><div class='add'>+		memset(result, 0, digest_size);</div><div class='ctx'> </div><div class='ctx'> 		hash_buff = xbuf[0];</div><div class='ctx'> 		hash_buff += align_offset;</div><div class='hunk'>@@ -379,7 +381,7 @@ static int __test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		j++;</div><div class='del'>-		memset(result, 0, MAX_DIGEST_SIZE);</div><div class='add'>+		memset(result, 0, digest_size);</div><div class='ctx'> </div><div class='ctx'> 		temp = 0;</div><div class='ctx'> 		sg_init_table(sg, template[i].np);</div><div class='hunk'>@@ -457,7 +459,7 @@ static int __test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		j++;</div><div class='del'>-		memset(result, 0, MAX_DIGEST_SIZE);</div><div class='add'>+		memset(result, 0, digest_size);</div><div class='ctx'> </div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		hash_buff = xbuf[0];</div><div class='hunk'>@@ -1442,6 +1444,150 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate,</div><div class='add'>+		      struct comp_testvec *dtemplate, int ctcount, int dtcount)</div><div class='add'>+{</div><div class='add'>+	const char *algo = crypto_tfm_alg_driver_name(crypto_acomp_tfm(tfm));</div><div class='add'>+	unsigned int i;</div><div class='add'>+	char *output;</div><div class='add'>+	int ret;</div><div class='add'>+	struct scatterlist src, dst;</div><div class='add'>+	struct acomp_req *req;</div><div class='add'>+	struct tcrypt_result result;</div><div class='add'>+</div><div class='add'>+	output = kmalloc(COMP_BUF_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!output)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ctcount; i++) {</div><div class='add'>+		unsigned int dlen = COMP_BUF_SIZE;</div><div class='add'>+		int ilen = ctemplate[i].inlen;</div><div class='add'>+		void *input_vec;</div><div class='add'>+</div><div class='add'>+		input_vec = kmemdup(ctemplate[i].input, ilen, GFP_KERNEL);</div><div class='add'>+		if (!input_vec) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memset(output, 0, dlen);</div><div class='add'>+		init_completion(&amp;result.completion);</div><div class='add'>+		sg_init_one(&amp;src, input_vec, ilen);</div><div class='add'>+		sg_init_one(&amp;dst, output, dlen);</div><div class='add'>+</div><div class='add'>+		req = acomp_request_alloc(tfm);</div><div class='add'>+		if (!req) {</div><div class='add'>+			pr_err("alg: acomp: request alloc failed for %s\n",</div><div class='add'>+			       algo);</div><div class='add'>+			kfree(input_vec);</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		acomp_request_set_params(req, &amp;src, &amp;dst, ilen, dlen);</div><div class='add'>+		acomp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='add'>+					   tcrypt_complete, &amp;result);</div><div class='add'>+</div><div class='add'>+		ret = wait_async_op(&amp;result, crypto_acomp_compress(req));</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("alg: acomp: compression failed on test %d for %s: ret=%d\n",</div><div class='add'>+			       i + 1, algo, -ret);</div><div class='add'>+			kfree(input_vec);</div><div class='add'>+			acomp_request_free(req);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (req-&gt;dlen != ctemplate[i].outlen) {</div><div class='add'>+			pr_err("alg: acomp: Compression test %d failed for %s: output len = %d\n",</div><div class='add'>+			       i + 1, algo, req-&gt;dlen);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			kfree(input_vec);</div><div class='add'>+			acomp_request_free(req);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (memcmp(output, ctemplate[i].output, req-&gt;dlen)) {</div><div class='add'>+			pr_err("alg: acomp: Compression test %d failed for %s\n",</div><div class='add'>+			       i + 1, algo);</div><div class='add'>+			hexdump(output, req-&gt;dlen);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			kfree(input_vec);</div><div class='add'>+			acomp_request_free(req);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(input_vec);</div><div class='add'>+		acomp_request_free(req);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dtcount; i++) {</div><div class='add'>+		unsigned int dlen = COMP_BUF_SIZE;</div><div class='add'>+		int ilen = dtemplate[i].inlen;</div><div class='add'>+		void *input_vec;</div><div class='add'>+</div><div class='add'>+		input_vec = kmemdup(dtemplate[i].input, ilen, GFP_KERNEL);</div><div class='add'>+		if (!input_vec) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memset(output, 0, dlen);</div><div class='add'>+		init_completion(&amp;result.completion);</div><div class='add'>+		sg_init_one(&amp;src, input_vec, ilen);</div><div class='add'>+		sg_init_one(&amp;dst, output, dlen);</div><div class='add'>+</div><div class='add'>+		req = acomp_request_alloc(tfm);</div><div class='add'>+		if (!req) {</div><div class='add'>+			pr_err("alg: acomp: request alloc failed for %s\n",</div><div class='add'>+			       algo);</div><div class='add'>+			kfree(input_vec);</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		acomp_request_set_params(req, &amp;src, &amp;dst, ilen, dlen);</div><div class='add'>+		acomp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='add'>+					   tcrypt_complete, &amp;result);</div><div class='add'>+</div><div class='add'>+		ret = wait_async_op(&amp;result, crypto_acomp_decompress(req));</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("alg: acomp: decompression failed on test %d for %s: ret=%d\n",</div><div class='add'>+			       i + 1, algo, -ret);</div><div class='add'>+			kfree(input_vec);</div><div class='add'>+			acomp_request_free(req);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (req-&gt;dlen != dtemplate[i].outlen) {</div><div class='add'>+			pr_err("alg: acomp: Decompression test %d failed for %s: output len = %d\n",</div><div class='add'>+			       i + 1, algo, req-&gt;dlen);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			kfree(input_vec);</div><div class='add'>+			acomp_request_free(req);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (memcmp(output, dtemplate[i].output, req-&gt;dlen)) {</div><div class='add'>+			pr_err("alg: acomp: Decompression test %d failed for %s\n",</div><div class='add'>+			       i + 1, algo);</div><div class='add'>+			hexdump(output, req-&gt;dlen);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			kfree(input_vec);</div><div class='add'>+			acomp_request_free(req);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(input_vec);</div><div class='add'>+		acomp_request_free(req);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(output);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int test_cprng(struct crypto_rng *tfm, struct cprng_testvec *template,</div><div class='ctx'> 		      unsigned int tcount)</div><div class='ctx'> {</div><div class='hunk'>@@ -1509,7 +1655,7 @@ static int alg_test_aead(const struct alg_test_desc *desc, const char *driver,</div><div class='ctx'> 	struct crypto_aead *tfm;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	tfm = crypto_alloc_aead(driver, type | CRYPTO_ALG_INTERNAL, mask);</div><div class='add'>+	tfm = crypto_alloc_aead(driver, type, mask);</div><div class='ctx'> 	if (IS_ERR(tfm)) {</div><div class='ctx'> 		printk(KERN_ERR "alg: aead: Failed to load transform for %s: "</div><div class='ctx'> 		       "%ld\n", driver, PTR_ERR(tfm));</div><div class='hunk'>@@ -1538,7 +1684,7 @@ static int alg_test_cipher(const struct alg_test_desc *desc,</div><div class='ctx'> 	struct crypto_cipher *tfm;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	tfm = crypto_alloc_cipher(driver, type | CRYPTO_ALG_INTERNAL, mask);</div><div class='add'>+	tfm = crypto_alloc_cipher(driver, type, mask);</div><div class='ctx'> 	if (IS_ERR(tfm)) {</div><div class='ctx'> 		printk(KERN_ERR "alg: cipher: Failed to load transform for "</div><div class='ctx'> 		       "%s: %ld\n", driver, PTR_ERR(tfm));</div><div class='hunk'>@@ -1567,7 +1713,7 @@ static int alg_test_skcipher(const struct alg_test_desc *desc,</div><div class='ctx'> 	struct crypto_skcipher *tfm;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	tfm = crypto_alloc_skcipher(driver, type | CRYPTO_ALG_INTERNAL, mask);</div><div class='add'>+	tfm = crypto_alloc_skcipher(driver, type, mask);</div><div class='ctx'> 	if (IS_ERR(tfm)) {</div><div class='ctx'> 		printk(KERN_ERR "alg: skcipher: Failed to load transform for "</div><div class='ctx'> 		       "%s: %ld\n", driver, PTR_ERR(tfm));</div><div class='hunk'>@@ -1593,22 +1739,38 @@ out:</div><div class='ctx'> static int alg_test_comp(const struct alg_test_desc *desc, const char *driver,</div><div class='ctx'> 			 u32 type, u32 mask)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_comp *tfm;</div><div class='add'>+	struct crypto_comp *comp;</div><div class='add'>+	struct crypto_acomp *acomp;</div><div class='ctx'> 	int err;</div><div class='add'>+	u32 algo_type = type &amp; CRYPTO_ALG_TYPE_ACOMPRESS_MASK;</div><div class='add'>+</div><div class='add'>+	if (algo_type == CRYPTO_ALG_TYPE_ACOMPRESS) {</div><div class='add'>+		acomp = crypto_alloc_acomp(driver, type, mask);</div><div class='add'>+		if (IS_ERR(acomp)) {</div><div class='add'>+			pr_err("alg: acomp: Failed to load transform for %s: %ld\n",</div><div class='add'>+			       driver, PTR_ERR(acomp));</div><div class='add'>+			return PTR_ERR(acomp);</div><div class='add'>+		}</div><div class='add'>+		err = test_acomp(acomp, desc-&gt;suite.comp.comp.vecs,</div><div class='add'>+				 desc-&gt;suite.comp.decomp.vecs,</div><div class='add'>+				 desc-&gt;suite.comp.comp.count,</div><div class='add'>+				 desc-&gt;suite.comp.decomp.count);</div><div class='add'>+		crypto_free_acomp(acomp);</div><div class='add'>+	} else {</div><div class='add'>+		comp = crypto_alloc_comp(driver, type, mask);</div><div class='add'>+		if (IS_ERR(comp)) {</div><div class='add'>+			pr_err("alg: comp: Failed to load transform for %s: %ld\n",</div><div class='add'>+			       driver, PTR_ERR(comp));</div><div class='add'>+			return PTR_ERR(comp);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	tfm = crypto_alloc_comp(driver, type, mask);</div><div class='del'>-	if (IS_ERR(tfm)) {</div><div class='del'>-		printk(KERN_ERR "alg: comp: Failed to load transform for %s: "</div><div class='del'>-		       "%ld\n", driver, PTR_ERR(tfm));</div><div class='del'>-		return PTR_ERR(tfm);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = test_comp(tfm, desc-&gt;suite.comp.comp.vecs,</div><div class='del'>-			desc-&gt;suite.comp.decomp.vecs,</div><div class='del'>-			desc-&gt;suite.comp.comp.count,</div><div class='del'>-			desc-&gt;suite.comp.decomp.count);</div><div class='add'>+		err = test_comp(comp, desc-&gt;suite.comp.comp.vecs,</div><div class='add'>+				desc-&gt;suite.comp.decomp.vecs,</div><div class='add'>+				desc-&gt;suite.comp.comp.count,</div><div class='add'>+				desc-&gt;suite.comp.decomp.count);</div><div class='ctx'> </div><div class='del'>-	crypto_free_comp(tfm);</div><div class='add'>+		crypto_free_comp(comp);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1618,7 +1780,7 @@ static int alg_test_hash(const struct alg_test_desc *desc, const char *driver,</div><div class='ctx'> 	struct crypto_ahash *tfm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	tfm = crypto_alloc_ahash(driver, type | CRYPTO_ALG_INTERNAL, mask);</div><div class='add'>+	tfm = crypto_alloc_ahash(driver, type, mask);</div><div class='ctx'> 	if (IS_ERR(tfm)) {</div><div class='ctx'> 		printk(KERN_ERR "alg: hash: Failed to load transform for %s: "</div><div class='ctx'> 		       "%ld\n", driver, PTR_ERR(tfm));</div><div class='hunk'>@@ -1646,7 +1808,7 @@ static int alg_test_crc32c(const struct alg_test_desc *desc,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	tfm = crypto_alloc_shash(driver, type | CRYPTO_ALG_INTERNAL, mask);</div><div class='add'>+	tfm = crypto_alloc_shash(driver, type, mask);</div><div class='ctx'> 	if (IS_ERR(tfm)) {</div><div class='ctx'> 		printk(KERN_ERR "alg: crc32c: Failed to load transform for %s: "</div><div class='ctx'> 		       "%ld\n", driver, PTR_ERR(tfm));</div><div class='hunk'>@@ -1688,7 +1850,7 @@ static int alg_test_cprng(const struct alg_test_desc *desc, const char *driver,</div><div class='ctx'> 	struct crypto_rng *rng;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	rng = crypto_alloc_rng(driver, type | CRYPTO_ALG_INTERNAL, mask);</div><div class='add'>+	rng = crypto_alloc_rng(driver, type, mask);</div><div class='ctx'> 	if (IS_ERR(rng)) {</div><div class='ctx'> 		printk(KERN_ERR "alg: cprng: Failed to load transform for %s: "</div><div class='ctx'> 		       "%ld\n", driver, PTR_ERR(rng));</div><div class='hunk'>@@ -1715,7 +1877,7 @@ static int drbg_cavs_test(struct drbg_testvec *test, int pr,</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	drng = crypto_alloc_rng(driver, type | CRYPTO_ALG_INTERNAL, mask);</div><div class='add'>+	drng = crypto_alloc_rng(driver, type, mask);</div><div class='ctx'> 	if (IS_ERR(drng)) {</div><div class='ctx'> 		printk(KERN_ERR "alg: drbg: could not allocate DRNG handle for "</div><div class='ctx'> 		       "%s\n", driver);</div><div class='hunk'>@@ -1909,7 +2071,7 @@ static int alg_test_kpp(const struct alg_test_desc *desc, const char *driver,</div><div class='ctx'> 	struct crypto_kpp *tfm;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	tfm = crypto_alloc_kpp(driver, type | CRYPTO_ALG_INTERNAL, mask);</div><div class='add'>+	tfm = crypto_alloc_kpp(driver, type, mask);</div><div class='ctx'> 	if (IS_ERR(tfm)) {</div><div class='ctx'> 		pr_err("alg: kpp: Failed to load tfm for %s: %ld\n",</div><div class='ctx'> 		       driver, PTR_ERR(tfm));</div><div class='hunk'>@@ -2068,7 +2230,7 @@ static int alg_test_akcipher(const struct alg_test_desc *desc,</div><div class='ctx'> 	struct crypto_akcipher *tfm;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	tfm = crypto_alloc_akcipher(driver, type | CRYPTO_ALG_INTERNAL, mask);</div><div class='add'>+	tfm = crypto_alloc_akcipher(driver, type, mask);</div><div class='ctx'> 	if (IS_ERR(tfm)) {</div><div class='ctx'> 		pr_err("alg: akcipher: Failed to load tfm for %s: %ld\n",</div><div class='ctx'> 		       driver, PTR_ERR(tfm));</div><div class='hunk'>@@ -2088,112 +2250,23 @@ static int alg_test_null(const struct alg_test_desc *desc,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define __VECS(tv)	{ .vecs = tv, .count = ARRAY_SIZE(tv) }</div><div class='add'>+</div><div class='ctx'> /* Please keep this list sorted by algorithm name. */</div><div class='ctx'> static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.alg = "__cbc-cast5-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__cbc-cast6-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__cbc-serpent-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__cbc-serpent-avx2",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__cbc-serpent-sse2",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__cbc-twofish-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-cbc-aes-aesni",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-		.fips_allowed = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-cbc-camellia-aesni",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-cbc-camellia-aesni-avx2",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-cbc-cast5-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-cbc-cast6-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-cbc-serpent-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-cbc-serpent-avx2",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-cbc-serpent-sse2",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-cbc-twofish-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-ecb-aes-aesni",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-		.fips_allowed = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-ecb-camellia-aesni",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-ecb-camellia-aesni-avx2",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-ecb-cast5-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-ecb-cast6-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-ecb-serpent-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-ecb-serpent-avx2",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-ecb-serpent-sse2",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-ecb-twofish-avx",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__driver-gcm-aes-aesni",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-		.fips_allowed = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "__ghash-pclmulqdqni",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-		.fips_allowed = 1,</div><div class='del'>-	}, {</div><div class='ctx'> 		.alg = "ansi_cprng",</div><div class='ctx'> 		.test = alg_test_cprng,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.cprng = {</div><div class='del'>-				.vecs = ansi_cprng_aes_tv_template,</div><div class='del'>-				.count = ANSI_CPRNG_AES_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.cprng = __VECS(ansi_cprng_aes_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "authenc(hmac(md5),ecb(cipher_null))",</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = hmac_md5_ecb_cipher_null_enc_tv_template,</div><div class='del'>-					.count = HMAC_MD5_ECB_CIPHER_NULL_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = hmac_md5_ecb_cipher_null_dec_tv_template,</div><div class='del'>-					.count = HMAC_MD5_ECB_CIPHER_NULL_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_md5_ecb_cipher_null_enc_tv_template),</div><div class='add'>+				.dec = __VECS(hmac_md5_ecb_cipher_null_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2201,12 +2274,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha1_aes_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA1_AES_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha1_aes_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2214,12 +2282,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha1_des_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA1_DES_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha1_des_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2228,12 +2291,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha1_des3_ede_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA1_DES3_EDE_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha1_des3_ede_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2245,18 +2303,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha1_ecb_cipher_null_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA1_ECB_CIPHER_NULL_ENC_TEST_VEC</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha1_ecb_cipher_null_dec_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA1_ECB_CIPHER_NULL_DEC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha1_ecb_cipher_null_enc_tv_temp),</div><div class='add'>+				.dec = __VECS(hmac_sha1_ecb_cipher_null_dec_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2268,12 +2316,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha224_des_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA224_DES_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha224_des_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2282,12 +2325,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha224_des3_ede_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA224_DES3_EDE_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha224_des3_ede_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2296,12 +2334,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha256_aes_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA256_AES_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha256_aes_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2309,12 +2342,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha256_des_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA256_DES_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha256_des_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2323,12 +2351,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha256_des3_ede_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA256_DES3_EDE_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha256_des3_ede_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2344,12 +2367,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha384_des_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA384_DES_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha384_des_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2358,12 +2376,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha384_des3_ede_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA384_DES3_EDE_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha384_des3_ede_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2380,12 +2393,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha512_aes_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA512_AES_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha512_aes_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2393,12 +2401,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha512_des_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA512_DES_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha512_des_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2407,12 +2410,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs =</div><div class='del'>-					hmac_sha512_des3_ede_cbc_enc_tv_temp,</div><div class='del'>-					.count =</div><div class='del'>-					HMAC_SHA512_DES3_EDE_CBC_ENC_TEST_VEC</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(hmac_sha512_des3_ede_cbc_enc_tv_temp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2429,14 +2427,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_cbc_enc_tv_template,</div><div class='del'>-					.count = AES_CBC_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_cbc_dec_tv_template,</div><div class='del'>-					.count = AES_CBC_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_cbc_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_cbc_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2444,14 +2436,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = anubis_cbc_enc_tv_template,</div><div class='del'>-					.count = ANUBIS_CBC_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = anubis_cbc_dec_tv_template,</div><div class='del'>-					.count = ANUBIS_CBC_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(anubis_cbc_enc_tv_template),</div><div class='add'>+				.dec = __VECS(anubis_cbc_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2459,14 +2445,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = bf_cbc_enc_tv_template,</div><div class='del'>-					.count = BF_CBC_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = bf_cbc_dec_tv_template,</div><div class='del'>-					.count = BF_CBC_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(bf_cbc_enc_tv_template),</div><div class='add'>+				.dec = __VECS(bf_cbc_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2474,14 +2454,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = camellia_cbc_enc_tv_template,</div><div class='del'>-					.count = CAMELLIA_CBC_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = camellia_cbc_dec_tv_template,</div><div class='del'>-					.count = CAMELLIA_CBC_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(camellia_cbc_enc_tv_template),</div><div class='add'>+				.dec = __VECS(camellia_cbc_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2489,14 +2463,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = cast5_cbc_enc_tv_template,</div><div class='del'>-					.count = CAST5_CBC_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = cast5_cbc_dec_tv_template,</div><div class='del'>-					.count = CAST5_CBC_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(cast5_cbc_enc_tv_template),</div><div class='add'>+				.dec = __VECS(cast5_cbc_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2504,14 +2472,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = cast6_cbc_enc_tv_template,</div><div class='del'>-					.count = CAST6_CBC_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = cast6_cbc_dec_tv_template,</div><div class='del'>-					.count = CAST6_CBC_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(cast6_cbc_enc_tv_template),</div><div class='add'>+				.dec = __VECS(cast6_cbc_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2519,14 +2481,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = des_cbc_enc_tv_template,</div><div class='del'>-					.count = DES_CBC_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = des_cbc_dec_tv_template,</div><div class='del'>-					.count = DES_CBC_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(des_cbc_enc_tv_template),</div><div class='add'>+				.dec = __VECS(des_cbc_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2535,14 +2491,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = des3_ede_cbc_enc_tv_template,</div><div class='del'>-					.count = DES3_EDE_CBC_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = des3_ede_cbc_dec_tv_template,</div><div class='del'>-					.count = DES3_EDE_CBC_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(des3_ede_cbc_enc_tv_template),</div><div class='add'>+				.dec = __VECS(des3_ede_cbc_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2550,14 +2500,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = serpent_cbc_enc_tv_template,</div><div class='del'>-					.count = SERPENT_CBC_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = serpent_cbc_dec_tv_template,</div><div class='del'>-					.count = SERPENT_CBC_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(serpent_cbc_enc_tv_template),</div><div class='add'>+				.dec = __VECS(serpent_cbc_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2565,30 +2509,25 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = tf_cbc_enc_tv_template,</div><div class='del'>-					.count = TF_CBC_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = tf_cbc_dec_tv_template,</div><div class='del'>-					.count = TF_CBC_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(tf_cbc_enc_tv_template),</div><div class='add'>+				.dec = __VECS(tf_cbc_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='add'>+		.alg = "cbcmac(aes)",</div><div class='add'>+		.fips_allowed = 1,</div><div class='add'>+		.test = alg_test_hash,</div><div class='add'>+		.suite = {</div><div class='add'>+			.hash = __VECS(aes_cbcmac_tv_template)</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "ccm(aes)",</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_ccm_enc_tv_template,</div><div class='del'>-					.count = AES_CCM_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_ccm_dec_tv_template,</div><div class='del'>-					.count = AES_CCM_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_ccm_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_ccm_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2596,14 +2535,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = chacha20_enc_tv_template,</div><div class='del'>-					.count = CHACHA20_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = chacha20_enc_tv_template,</div><div class='del'>-					.count = CHACHA20_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='add'>+				.enc = __VECS(chacha20_enc_tv_template),</div><div class='add'>+				.dec = __VECS(chacha20_enc_tv_template),</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2611,20 +2544,14 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = aes_cmac128_tv_template,</div><div class='del'>-				.count = CMAC_AES_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(aes_cmac128_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "cmac(des3_ede)",</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = des3_ede_cmac64_tv_template,</div><div class='del'>-				.count = CMAC_DES3_EDE_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(des3_ede_cmac64_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "compress_null",</div><div class='hunk'>@@ -2633,94 +2560,30 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.alg = "crc32",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = crc32_tv_template,</div><div class='del'>-				.count = CRC32_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(crc32_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "crc32c",</div><div class='ctx'> 		.test = alg_test_crc32c,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = crc32c_tv_template,</div><div class='del'>-				.count = CRC32C_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(crc32c_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "crct10dif",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = crct10dif_tv_template,</div><div class='del'>-				.count = CRCT10DIF_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(crct10dif_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='del'>-		.alg = "cryptd(__driver-cbc-aes-aesni)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-		.fips_allowed = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-cbc-camellia-aesni)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-cbc-camellia-aesni-avx2)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-cbc-serpent-avx2)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-ecb-aes-aesni)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-		.fips_allowed = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-ecb-camellia-aesni)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-ecb-camellia-aesni-avx2)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-ecb-cast5-avx)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-ecb-cast6-avx)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-ecb-serpent-avx)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-ecb-serpent-avx2)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-ecb-serpent-sse2)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-ecb-twofish-avx)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__driver-gcm-aes-aesni)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-		.fips_allowed = 1,</div><div class='del'>-	}, {</div><div class='del'>-		.alg = "cryptd(__ghash-pclmulqdqni)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-		.fips_allowed = 1,</div><div class='del'>-	}, {</div><div class='ctx'> 		.alg = "ctr(aes)",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_ctr_enc_tv_template,</div><div class='del'>-					.count = AES_CTR_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_ctr_dec_tv_template,</div><div class='del'>-					.count = AES_CTR_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_ctr_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_ctr_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2728,14 +2591,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = bf_ctr_enc_tv_template,</div><div class='del'>-					.count = BF_CTR_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = bf_ctr_dec_tv_template,</div><div class='del'>-					.count = BF_CTR_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(bf_ctr_enc_tv_template),</div><div class='add'>+				.dec = __VECS(bf_ctr_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2743,14 +2600,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = camellia_ctr_enc_tv_template,</div><div class='del'>-					.count = CAMELLIA_CTR_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = camellia_ctr_dec_tv_template,</div><div class='del'>-					.count = CAMELLIA_CTR_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(camellia_ctr_enc_tv_template),</div><div class='add'>+				.dec = __VECS(camellia_ctr_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2758,14 +2609,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = cast5_ctr_enc_tv_template,</div><div class='del'>-					.count = CAST5_CTR_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = cast5_ctr_dec_tv_template,</div><div class='del'>-					.count = CAST5_CTR_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(cast5_ctr_enc_tv_template),</div><div class='add'>+				.dec = __VECS(cast5_ctr_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2773,14 +2618,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = cast6_ctr_enc_tv_template,</div><div class='del'>-					.count = CAST6_CTR_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = cast6_ctr_dec_tv_template,</div><div class='del'>-					.count = CAST6_CTR_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(cast6_ctr_enc_tv_template),</div><div class='add'>+				.dec = __VECS(cast6_ctr_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2788,14 +2627,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = des_ctr_enc_tv_template,</div><div class='del'>-					.count = DES_CTR_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = des_ctr_dec_tv_template,</div><div class='del'>-					.count = DES_CTR_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(des_ctr_enc_tv_template),</div><div class='add'>+				.dec = __VECS(des_ctr_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2803,14 +2636,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = des3_ede_ctr_enc_tv_template,</div><div class='del'>-					.count = DES3_EDE_CTR_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = des3_ede_ctr_dec_tv_template,</div><div class='del'>-					.count = DES3_EDE_CTR_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(des3_ede_ctr_enc_tv_template),</div><div class='add'>+				.dec = __VECS(des3_ede_ctr_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2818,14 +2645,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = serpent_ctr_enc_tv_template,</div><div class='del'>-					.count = SERPENT_CTR_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = serpent_ctr_dec_tv_template,</div><div class='del'>-					.count = SERPENT_CTR_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(serpent_ctr_enc_tv_template),</div><div class='add'>+				.dec = __VECS(serpent_ctr_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2833,14 +2654,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = tf_ctr_enc_tv_template,</div><div class='del'>-					.count = TF_CTR_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = tf_ctr_dec_tv_template,</div><div class='del'>-					.count = TF_CTR_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(tf_ctr_enc_tv_template),</div><div class='add'>+				.dec = __VECS(tf_ctr_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2848,14 +2663,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = cts_mode_enc_tv_template,</div><div class='del'>-					.count = CTS_MODE_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = cts_mode_dec_tv_template,</div><div class='del'>-					.count = CTS_MODE_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(cts_mode_enc_tv_template),</div><div class='add'>+				.dec = __VECS(cts_mode_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2864,14 +2673,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.comp = {</div><div class='del'>-				.comp = {</div><div class='del'>-					.vecs = deflate_comp_tv_template,</div><div class='del'>-					.count = DEFLATE_COMP_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.decomp = {</div><div class='del'>-					.vecs = deflate_decomp_tv_template,</div><div class='del'>-					.count = DEFLATE_DECOMP_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.comp = __VECS(deflate_comp_tv_template),</div><div class='add'>+				.decomp = __VECS(deflate_decomp_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2879,10 +2682,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_kpp,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.kpp = {</div><div class='del'>-				.vecs = dh_tv_template,</div><div class='del'>-				.count = DH_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.kpp = __VECS(dh_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "digest_null",</div><div class='hunk'>@@ -2892,30 +2692,21 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_drbg,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.drbg = {</div><div class='del'>-				.vecs = drbg_nopr_ctr_aes128_tv_template,</div><div class='del'>-				.count = ARRAY_SIZE(drbg_nopr_ctr_aes128_tv_template)</div><div class='del'>-			}</div><div class='add'>+			.drbg = __VECS(drbg_nopr_ctr_aes128_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "drbg_nopr_ctr_aes192",</div><div class='ctx'> 		.test = alg_test_drbg,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.drbg = {</div><div class='del'>-				.vecs = drbg_nopr_ctr_aes192_tv_template,</div><div class='del'>-				.count = ARRAY_SIZE(drbg_nopr_ctr_aes192_tv_template)</div><div class='del'>-			}</div><div class='add'>+			.drbg = __VECS(drbg_nopr_ctr_aes192_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "drbg_nopr_ctr_aes256",</div><div class='ctx'> 		.test = alg_test_drbg,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.drbg = {</div><div class='del'>-				.vecs = drbg_nopr_ctr_aes256_tv_template,</div><div class='del'>-				.count = ARRAY_SIZE(drbg_nopr_ctr_aes256_tv_template)</div><div class='del'>-			}</div><div class='add'>+			.drbg = __VECS(drbg_nopr_ctr_aes256_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2930,11 +2721,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_drbg,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.drbg = {</div><div class='del'>-				.vecs = drbg_nopr_hmac_sha256_tv_template,</div><div class='del'>-				.count =</div><div class='del'>-				ARRAY_SIZE(drbg_nopr_hmac_sha256_tv_template)</div><div class='del'>-			}</div><div class='add'>+			.drbg = __VECS(drbg_nopr_hmac_sha256_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		/* covered by drbg_nopr_hmac_sha256 test */</div><div class='hunk'>@@ -2954,10 +2741,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_drbg,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.drbg = {</div><div class='del'>-				.vecs = drbg_nopr_sha256_tv_template,</div><div class='del'>-				.count = ARRAY_SIZE(drbg_nopr_sha256_tv_template)</div><div class='del'>-			}</div><div class='add'>+			.drbg = __VECS(drbg_nopr_sha256_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		/* covered by drbg_nopr_sha256 test */</div><div class='hunk'>@@ -2973,10 +2757,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_drbg,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.drbg = {</div><div class='del'>-				.vecs = drbg_pr_ctr_aes128_tv_template,</div><div class='del'>-				.count = ARRAY_SIZE(drbg_pr_ctr_aes128_tv_template)</div><div class='del'>-			}</div><div class='add'>+			.drbg = __VECS(drbg_pr_ctr_aes128_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		/* covered by drbg_pr_ctr_aes128 test */</div><div class='hunk'>@@ -2996,10 +2777,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_drbg,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.drbg = {</div><div class='del'>-				.vecs = drbg_pr_hmac_sha256_tv_template,</div><div class='del'>-				.count = ARRAY_SIZE(drbg_pr_hmac_sha256_tv_template)</div><div class='del'>-			}</div><div class='add'>+			.drbg = __VECS(drbg_pr_hmac_sha256_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		/* covered by drbg_pr_hmac_sha256 test */</div><div class='hunk'>@@ -3019,10 +2797,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_drbg,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.drbg = {</div><div class='del'>-				.vecs = drbg_pr_sha256_tv_template,</div><div class='del'>-				.count = ARRAY_SIZE(drbg_pr_sha256_tv_template)</div><div class='del'>-			}</div><div class='add'>+			.drbg = __VECS(drbg_pr_sha256_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		/* covered by drbg_pr_sha256 test */</div><div class='hunk'>@@ -3034,23 +2809,13 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.test = alg_test_null,</div><div class='ctx'> 	}, {</div><div class='del'>-		.alg = "ecb(__aes-aesni)",</div><div class='del'>-		.test = alg_test_null,</div><div class='del'>-		.fips_allowed = 1,</div><div class='del'>-	}, {</div><div class='ctx'> 		.alg = "ecb(aes)",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_enc_tv_template,</div><div class='del'>-					.count = AES_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_dec_tv_template,</div><div class='del'>-					.count = AES_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3058,14 +2823,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = anubis_enc_tv_template,</div><div class='del'>-					.count = ANUBIS_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = anubis_dec_tv_template,</div><div class='del'>-					.count = ANUBIS_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(anubis_enc_tv_template),</div><div class='add'>+				.dec = __VECS(anubis_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3073,14 +2832,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = arc4_enc_tv_template,</div><div class='del'>-					.count = ARC4_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = arc4_dec_tv_template,</div><div class='del'>-					.count = ARC4_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(arc4_enc_tv_template),</div><div class='add'>+				.dec = __VECS(arc4_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3088,14 +2841,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = bf_enc_tv_template,</div><div class='del'>-					.count = BF_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = bf_dec_tv_template,</div><div class='del'>-					.count = BF_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(bf_enc_tv_template),</div><div class='add'>+				.dec = __VECS(bf_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3103,14 +2850,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = camellia_enc_tv_template,</div><div class='del'>-					.count = CAMELLIA_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = camellia_dec_tv_template,</div><div class='del'>-					.count = CAMELLIA_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(camellia_enc_tv_template),</div><div class='add'>+				.dec = __VECS(camellia_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3118,14 +2859,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = cast5_enc_tv_template,</div><div class='del'>-					.count = CAST5_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = cast5_dec_tv_template,</div><div class='del'>-					.count = CAST5_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(cast5_enc_tv_template),</div><div class='add'>+				.dec = __VECS(cast5_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3133,14 +2868,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = cast6_enc_tv_template,</div><div class='del'>-					.count = CAST6_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = cast6_dec_tv_template,</div><div class='del'>-					.count = CAST6_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(cast6_enc_tv_template),</div><div class='add'>+				.dec = __VECS(cast6_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3151,14 +2880,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = des_enc_tv_template,</div><div class='del'>-					.count = DES_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = des_dec_tv_template,</div><div class='del'>-					.count = DES_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(des_enc_tv_template),</div><div class='add'>+				.dec = __VECS(des_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3167,14 +2890,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = des3_ede_enc_tv_template,</div><div class='del'>-					.count = DES3_EDE_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = des3_ede_dec_tv_template,</div><div class='del'>-					.count = DES3_EDE_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(des3_ede_enc_tv_template),</div><div class='add'>+				.dec = __VECS(des3_ede_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3197,14 +2914,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = khazad_enc_tv_template,</div><div class='del'>-					.count = KHAZAD_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = khazad_dec_tv_template,</div><div class='del'>-					.count = KHAZAD_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(khazad_enc_tv_template),</div><div class='add'>+				.dec = __VECS(khazad_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3212,14 +2923,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = seed_enc_tv_template,</div><div class='del'>-					.count = SEED_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = seed_dec_tv_template,</div><div class='del'>-					.count = SEED_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(seed_enc_tv_template),</div><div class='add'>+				.dec = __VECS(seed_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3227,14 +2932,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = serpent_enc_tv_template,</div><div class='del'>-					.count = SERPENT_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = serpent_dec_tv_template,</div><div class='del'>-					.count = SERPENT_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(serpent_enc_tv_template),</div><div class='add'>+				.dec = __VECS(serpent_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3242,14 +2941,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = tea_enc_tv_template,</div><div class='del'>-					.count = TEA_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = tea_dec_tv_template,</div><div class='del'>-					.count = TEA_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(tea_enc_tv_template),</div><div class='add'>+				.dec = __VECS(tea_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3257,14 +2950,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = tnepres_enc_tv_template,</div><div class='del'>-					.count = TNEPRES_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = tnepres_dec_tv_template,</div><div class='del'>-					.count = TNEPRES_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(tnepres_enc_tv_template),</div><div class='add'>+				.dec = __VECS(tnepres_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3272,14 +2959,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = tf_enc_tv_template,</div><div class='del'>-					.count = TF_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = tf_dec_tv_template,</div><div class='del'>-					.count = TF_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(tf_enc_tv_template),</div><div class='add'>+				.dec = __VECS(tf_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3287,14 +2968,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = xeta_enc_tv_template,</div><div class='del'>-					.count = XETA_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = xeta_dec_tv_template,</div><div class='del'>-					.count = XETA_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(xeta_enc_tv_template),</div><div class='add'>+				.dec = __VECS(xeta_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3302,14 +2977,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = xtea_enc_tv_template,</div><div class='del'>-					.count = XTEA_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = xtea_dec_tv_template,</div><div class='del'>-					.count = XTEA_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(xtea_enc_tv_template),</div><div class='add'>+				.dec = __VECS(xtea_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3317,10 +2986,7 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_kpp,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.kpp = {</div><div class='del'>-				.vecs = ecdh_tv_template,</div><div class='del'>-				.count = ECDH_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.kpp = __VECS(ecdh_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "gcm(aes)",</div><div class='hunk'>@@ -3328,14 +2994,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_gcm_enc_tv_template,</div><div class='del'>-					.count = AES_GCM_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_gcm_dec_tv_template,</div><div class='del'>-					.count = AES_GCM_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_gcm_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_gcm_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3343,136 +3003,94 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = ghash_tv_template,</div><div class='del'>-				.count = GHASH_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(ghash_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(crc32)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = bfin_crc_tv_template,</div><div class='del'>-				.count = BFIN_CRC_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(bfin_crc_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(md5)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_md5_tv_template,</div><div class='del'>-				.count = HMAC_MD5_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_md5_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(rmd128)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_rmd128_tv_template,</div><div class='del'>-				.count = HMAC_RMD128_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_rmd128_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(rmd160)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_rmd160_tv_template,</div><div class='del'>-				.count = HMAC_RMD160_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_rmd160_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(sha1)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_sha1_tv_template,</div><div class='del'>-				.count = HMAC_SHA1_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_sha1_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(sha224)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_sha224_tv_template,</div><div class='del'>-				.count = HMAC_SHA224_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_sha224_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(sha256)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_sha256_tv_template,</div><div class='del'>-				.count = HMAC_SHA256_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_sha256_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(sha3-224)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_sha3_224_tv_template,</div><div class='del'>-				.count = HMAC_SHA3_224_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_sha3_224_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(sha3-256)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_sha3_256_tv_template,</div><div class='del'>-				.count = HMAC_SHA3_256_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_sha3_256_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(sha3-384)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_sha3_384_tv_template,</div><div class='del'>-				.count = HMAC_SHA3_384_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_sha3_384_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(sha3-512)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_sha3_512_tv_template,</div><div class='del'>-				.count = HMAC_SHA3_512_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_sha3_512_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(sha384)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_sha384_tv_template,</div><div class='del'>-				.count = HMAC_SHA384_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_sha384_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "hmac(sha512)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = hmac_sha512_tv_template,</div><div class='del'>-				.count = HMAC_SHA512_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(hmac_sha512_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "jitterentropy_rng",</div><div class='hunk'>@@ -3484,14 +3102,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_kw_enc_tv_template,</div><div class='del'>-					.count = ARRAY_SIZE(aes_kw_enc_tv_template)</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_kw_dec_tv_template,</div><div class='del'>-					.count = ARRAY_SIZE(aes_kw_dec_tv_template)</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_kw_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_kw_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3499,14 +3111,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_lrw_enc_tv_template,</div><div class='del'>-					.count = AES_LRW_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_lrw_dec_tv_template,</div><div class='del'>-					.count = AES_LRW_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_lrw_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_lrw_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3514,14 +3120,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = camellia_lrw_enc_tv_template,</div><div class='del'>-					.count = CAMELLIA_LRW_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = camellia_lrw_dec_tv_template,</div><div class='del'>-					.count = CAMELLIA_LRW_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(camellia_lrw_enc_tv_template),</div><div class='add'>+				.dec = __VECS(camellia_lrw_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3529,14 +3129,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = cast6_lrw_enc_tv_template,</div><div class='del'>-					.count = CAST6_LRW_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = cast6_lrw_dec_tv_template,</div><div class='del'>-					.count = CAST6_LRW_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(cast6_lrw_enc_tv_template),</div><div class='add'>+				.dec = __VECS(cast6_lrw_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3544,14 +3138,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = serpent_lrw_enc_tv_template,</div><div class='del'>-					.count = SERPENT_LRW_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = serpent_lrw_dec_tv_template,</div><div class='del'>-					.count = SERPENT_LRW_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(serpent_lrw_enc_tv_template),</div><div class='add'>+				.dec = __VECS(serpent_lrw_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3559,14 +3147,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = tf_lrw_enc_tv_template,</div><div class='del'>-					.count = TF_LRW_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = tf_lrw_dec_tv_template,</div><div class='del'>-					.count = TF_LRW_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(tf_lrw_enc_tv_template),</div><div class='add'>+				.dec = __VECS(tf_lrw_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3575,14 +3157,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.comp = {</div><div class='del'>-				.comp = {</div><div class='del'>-					.vecs = lz4_comp_tv_template,</div><div class='del'>-					.count = LZ4_COMP_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.decomp = {</div><div class='del'>-					.vecs = lz4_decomp_tv_template,</div><div class='del'>-					.count = LZ4_DECOMP_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.comp = __VECS(lz4_comp_tv_template),</div><div class='add'>+				.decomp = __VECS(lz4_decomp_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3591,14 +3167,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.comp = {</div><div class='del'>-				.comp = {</div><div class='del'>-					.vecs = lz4hc_comp_tv_template,</div><div class='del'>-					.count = LZ4HC_COMP_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.decomp = {</div><div class='del'>-					.vecs = lz4hc_decomp_tv_template,</div><div class='del'>-					.count = LZ4HC_DECOMP_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.comp = __VECS(lz4hc_comp_tv_template),</div><div class='add'>+				.decomp = __VECS(lz4hc_decomp_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3607,42 +3177,27 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.comp = {</div><div class='del'>-				.comp = {</div><div class='del'>-					.vecs = lzo_comp_tv_template,</div><div class='del'>-					.count = LZO_COMP_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.decomp = {</div><div class='del'>-					.vecs = lzo_decomp_tv_template,</div><div class='del'>-					.count = LZO_DECOMP_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.comp = __VECS(lzo_comp_tv_template),</div><div class='add'>+				.decomp = __VECS(lzo_decomp_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "md4",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = md4_tv_template,</div><div class='del'>-				.count = MD4_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(md4_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "md5",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = md5_tv_template,</div><div class='del'>-				.count = MD5_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(md5_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "michael_mic",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = michael_mic_tv_template,</div><div class='del'>-				.count = MICHAEL_MIC_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(michael_mic_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "ofb(aes)",</div><div class='hunk'>@@ -3650,14 +3205,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_ofb_enc_tv_template,</div><div class='del'>-					.count = AES_OFB_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_ofb_dec_tv_template,</div><div class='del'>-					.count = AES_OFB_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_ofb_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_ofb_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3665,24 +3214,15 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = fcrypt_pcbc_enc_tv_template,</div><div class='del'>-					.count = FCRYPT_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = fcrypt_pcbc_dec_tv_template,</div><div class='del'>-					.count = FCRYPT_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(fcrypt_pcbc_enc_tv_template),</div><div class='add'>+				.dec = __VECS(fcrypt_pcbc_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "poly1305",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = poly1305_tv_template,</div><div class='del'>-				.count = POLY1305_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(poly1305_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "rfc3686(ctr(aes))",</div><div class='hunk'>@@ -3690,14 +3230,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_ctr_rfc3686_enc_tv_template,</div><div class='del'>-					.count = AES_CTR_3686_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_ctr_rfc3686_dec_tv_template,</div><div class='del'>-					.count = AES_CTR_3686_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_ctr_rfc3686_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_ctr_rfc3686_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3706,14 +3240,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_gcm_rfc4106_enc_tv_template,</div><div class='del'>-					.count = AES_GCM_4106_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_gcm_rfc4106_dec_tv_template,</div><div class='del'>-					.count = AES_GCM_4106_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_gcm_rfc4106_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_gcm_rfc4106_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3722,14 +3250,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_ccm_rfc4309_enc_tv_template,</div><div class='del'>-					.count = AES_CCM_4309_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_ccm_rfc4309_dec_tv_template,</div><div class='del'>-					.count = AES_CCM_4309_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_ccm_rfc4309_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_ccm_rfc4309_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3737,14 +3259,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_gcm_rfc4543_enc_tv_template,</div><div class='del'>-					.count = AES_GCM_4543_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_gcm_rfc4543_dec_tv_template,</div><div class='del'>-					.count = AES_GCM_4543_DEC_TEST_VECTORS</div><div class='del'>-				},</div><div class='add'>+				.enc = __VECS(aes_gcm_rfc4543_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_gcm_rfc4543_dec_tv_template),</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3752,14 +3268,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = rfc7539_enc_tv_template,</div><div class='del'>-					.count = RFC7539_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = rfc7539_dec_tv_template,</div><div class='del'>-					.count = RFC7539_DEC_TEST_VECTORS</div><div class='del'>-				},</div><div class='add'>+				.enc = __VECS(rfc7539_enc_tv_template),</div><div class='add'>+				.dec = __VECS(rfc7539_dec_tv_template),</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3767,71 +3277,47 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_aead,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.aead = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = rfc7539esp_enc_tv_template,</div><div class='del'>-					.count = RFC7539ESP_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = rfc7539esp_dec_tv_template,</div><div class='del'>-					.count = RFC7539ESP_DEC_TEST_VECTORS</div><div class='del'>-				},</div><div class='add'>+				.enc = __VECS(rfc7539esp_enc_tv_template),</div><div class='add'>+				.dec = __VECS(rfc7539esp_dec_tv_template),</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "rmd128",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = rmd128_tv_template,</div><div class='del'>-				.count = RMD128_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(rmd128_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "rmd160",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = rmd160_tv_template,</div><div class='del'>-				.count = RMD160_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(rmd160_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "rmd256",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = rmd256_tv_template,</div><div class='del'>-				.count = RMD256_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(rmd256_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "rmd320",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = rmd320_tv_template,</div><div class='del'>-				.count = RMD320_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(rmd320_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "rsa",</div><div class='ctx'> 		.test = alg_test_akcipher,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.akcipher = {</div><div class='del'>-				.vecs = rsa_tv_template,</div><div class='del'>-				.count = RSA_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.akcipher = __VECS(rsa_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "salsa20",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = salsa20_stream_enc_tv_template,</div><div class='del'>-					.count = SALSA20_STREAM_ENC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(salsa20_stream_enc_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -3839,162 +3325,111 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = sha1_tv_template,</div><div class='del'>-				.count = SHA1_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(sha1_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "sha224",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = sha224_tv_template,</div><div class='del'>-				.count = SHA224_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(sha224_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "sha256",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = sha256_tv_template,</div><div class='del'>-				.count = SHA256_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(sha256_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "sha3-224",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = sha3_224_tv_template,</div><div class='del'>-				.count = SHA3_224_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(sha3_224_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "sha3-256",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = sha3_256_tv_template,</div><div class='del'>-				.count = SHA3_256_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(sha3_256_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "sha3-384",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = sha3_384_tv_template,</div><div class='del'>-				.count = SHA3_384_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(sha3_384_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "sha3-512",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = sha3_512_tv_template,</div><div class='del'>-				.count = SHA3_512_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(sha3_512_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "sha384",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = sha384_tv_template,</div><div class='del'>-				.count = SHA384_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(sha384_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "sha512",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = sha512_tv_template,</div><div class='del'>-				.count = SHA512_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(sha512_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "tgr128",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = tgr128_tv_template,</div><div class='del'>-				.count = TGR128_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(tgr128_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "tgr160",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = tgr160_tv_template,</div><div class='del'>-				.count = TGR160_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(tgr160_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "tgr192",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = tgr192_tv_template,</div><div class='del'>-				.count = TGR192_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(tgr192_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "vmac(aes)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = aes_vmac128_tv_template,</div><div class='del'>-				.count = VMAC_AES_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(aes_vmac128_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "wp256",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = wp256_tv_template,</div><div class='del'>-				.count = WP256_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(wp256_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "wp384",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = wp384_tv_template,</div><div class='del'>-				.count = WP384_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(wp384_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "wp512",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = wp512_tv_template,</div><div class='del'>-				.count = WP512_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(wp512_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "xcbc(aes)",</div><div class='ctx'> 		.test = alg_test_hash,</div><div class='ctx'> 		.suite = {</div><div class='del'>-			.hash = {</div><div class='del'>-				.vecs = aes_xcbc128_tv_template,</div><div class='del'>-				.count = XCBC_AES_TEST_VECTORS</div><div class='del'>-			}</div><div class='add'>+			.hash = __VECS(aes_xcbc128_tv_template)</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.alg = "xts(aes)",</div><div class='hunk'>@@ -4002,14 +3437,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.fips_allowed = 1,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = aes_xts_enc_tv_template,</div><div class='del'>-					.count = AES_XTS_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = aes_xts_dec_tv_template,</div><div class='del'>-					.count = AES_XTS_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(aes_xts_enc_tv_template),</div><div class='add'>+				.dec = __VECS(aes_xts_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -4017,14 +3446,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = camellia_xts_enc_tv_template,</div><div class='del'>-					.count = CAMELLIA_XTS_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = camellia_xts_dec_tv_template,</div><div class='del'>-					.count = CAMELLIA_XTS_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(camellia_xts_enc_tv_template),</div><div class='add'>+				.dec = __VECS(camellia_xts_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -4032,14 +3455,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = cast6_xts_enc_tv_template,</div><div class='del'>-					.count = CAST6_XTS_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = cast6_xts_dec_tv_template,</div><div class='del'>-					.count = CAST6_XTS_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(cast6_xts_enc_tv_template),</div><div class='add'>+				.dec = __VECS(cast6_xts_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -4047,14 +3464,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = serpent_xts_enc_tv_template,</div><div class='del'>-					.count = SERPENT_XTS_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = serpent_xts_dec_tv_template,</div><div class='del'>-					.count = SERPENT_XTS_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(serpent_xts_enc_tv_template),</div><div class='add'>+				.dec = __VECS(serpent_xts_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -4062,14 +3473,8 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='ctx'> 			.cipher = {</div><div class='del'>-				.enc = {</div><div class='del'>-					.vecs = tf_xts_enc_tv_template,</div><div class='del'>-					.count = TF_XTS_ENC_TEST_VECTORS</div><div class='del'>-				},</div><div class='del'>-				.dec = {</div><div class='del'>-					.vecs = tf_xts_dec_tv_template,</div><div class='del'>-					.count = TF_XTS_DEC_TEST_VECTORS</div><div class='del'>-				}</div><div class='add'>+				.enc = __VECS(tf_xts_enc_tv_template),</div><div class='add'>+				.dec = __VECS(tf_xts_dec_tv_template)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/crypto/testmgr.h b/crypto/testmgr.h<br/>index e64a4ef9d8ca..03f473116f78 100644<br/>--- a/<a href='/drm-misc/tree/crypto/testmgr.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/testmgr.h</a><br/>+++ b/<a href='/drm-misc/tree/crypto/testmgr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/testmgr.h</a></div><div class='hunk'>@@ -151,11 +151,6 @@ static char zeroed_string[48];</div><div class='ctx'> /*</div><div class='ctx'>  * RSA test vectors. Borrowed from openSSL.</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_CRYPTO_FIPS</div><div class='del'>-#define RSA_TEST_VECTORS	2</div><div class='del'>-#else</div><div class='del'>-#define RSA_TEST_VECTORS	5</div><div class='del'>-#endif</div><div class='ctx'> static struct akcipher_testvec rsa_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> #ifndef CONFIG_CRYPTO_FIPS</div><div class='hunk'>@@ -340,6 +335,7 @@ static struct akcipher_testvec rsa_tv_template[] = {</div><div class='ctx'> 	.m_size = 8,</div><div class='ctx'> 	.c_size = 256,</div><div class='ctx'> 	.public_key_vec = true,</div><div class='add'>+#ifndef CONFIG_CRYPTO_FIPS</div><div class='ctx'> 	}, {</div><div class='ctx'> 	.key =</div><div class='ctx'> 	"\x30\x82\x09\x29" /* sequence of 2345 bytes */</div><div class='hunk'>@@ -538,11 +534,10 @@ static struct akcipher_testvec rsa_tv_template[] = {</div><div class='ctx'> 	.key_len = 2349,</div><div class='ctx'> 	.m_size = 8,</div><div class='ctx'> 	.c_size = 512,</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define DH_TEST_VECTORS 2</div><div class='del'>-</div><div class='ctx'> struct kpp_testvec dh_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 	.secret =</div><div class='hunk'>@@ -760,11 +755,6 @@ struct kpp_testvec dh_tv_template[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CRYPTO_FIPS</div><div class='del'>-#define ECDH_TEST_VECTORS 1</div><div class='del'>-#else</div><div class='del'>-#define ECDH_TEST_VECTORS 2</div><div class='del'>-#endif</div><div class='ctx'> struct kpp_testvec ecdh_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> #ifndef CONFIG_CRYPTO_FIPS</div><div class='hunk'>@@ -856,8 +846,6 @@ struct kpp_testvec ecdh_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * MD4 test vectors from RFC1320</div><div class='ctx'>  */</div><div class='del'>-#define MD4_TEST_VECTORS	7</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec md4_tv_template [] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -899,7 +887,6 @@ static struct hash_testvec md4_tv_template [] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SHA3_224_TEST_VECTORS	3</div><div class='ctx'> static struct hash_testvec sha3_224_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -925,7 +912,6 @@ static struct hash_testvec sha3_224_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SHA3_256_TEST_VECTORS	3</div><div class='ctx'> static struct hash_testvec sha3_256_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -952,7 +938,6 @@ static struct hash_testvec sha3_256_tv_template[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define SHA3_384_TEST_VECTORS	3</div><div class='ctx'> static struct hash_testvec sha3_384_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -985,7 +970,6 @@ static struct hash_testvec sha3_384_tv_template[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define SHA3_512_TEST_VECTORS	3</div><div class='ctx'> static struct hash_testvec sha3_512_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -1027,8 +1011,6 @@ static struct hash_testvec sha3_512_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * MD5 test vectors from RFC1321</div><div class='ctx'>  */</div><div class='del'>-#define MD5_TEST_VECTORS	7</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec md5_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.digest	= "\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04"</div><div class='hunk'>@@ -1073,8 +1055,6 @@ static struct hash_testvec md5_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * RIPEMD-128 test vectors from ISO/IEC 10118-3:2004(E)</div><div class='ctx'>  */</div><div class='del'>-#define RMD128_TEST_VECTORS     10</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec rmd128_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.digest	= "\xcd\xf2\x62\x13\xa1\x50\xdc\x3e"</div><div class='hunk'>@@ -1137,8 +1117,6 @@ static struct hash_testvec rmd128_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * RIPEMD-160 test vectors from ISO/IEC 10118-3:2004(E)</div><div class='ctx'>  */</div><div class='del'>-#define RMD160_TEST_VECTORS     10</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec rmd160_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.digest	= "\x9c\x11\x85\xa5\xc5\xe9\xfc\x54\x61\x28"</div><div class='hunk'>@@ -1201,8 +1179,6 @@ static struct hash_testvec rmd160_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * RIPEMD-256 test vectors</div><div class='ctx'>  */</div><div class='del'>-#define RMD256_TEST_VECTORS     8</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec rmd256_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.digest	= "\x02\xba\x4c\x4e\x5f\x8e\xcd\x18"</div><div class='hunk'>@@ -1269,8 +1245,6 @@ static struct hash_testvec rmd256_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * RIPEMD-320 test vectors</div><div class='ctx'>  */</div><div class='del'>-#define RMD320_TEST_VECTORS     8</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec rmd320_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.digest	= "\x22\xd6\x5d\x56\x61\x53\x6c\xdc\x75\xc1"</div><div class='hunk'>@@ -1334,36 +1308,49 @@ static struct hash_testvec rmd320_tv_template[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CRCT10DIF_TEST_VECTORS	3</div><div class='ctx'> static struct hash_testvec crct10dif_tv_template[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.plaintext = "abc",</div><div class='del'>-		.psize  = 3,</div><div class='del'>-#ifdef __LITTLE_ENDIAN</div><div class='del'>-		.digest = "\x3b\x44",</div><div class='del'>-#else</div><div class='del'>-		.digest = "\x44\x3b",</div><div class='del'>-#endif</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext = "1234567890123456789012345678901234567890"</div><div class='del'>-			     "123456789012345678901234567890123456789",</div><div class='del'>-		.psize	= 79,</div><div class='del'>-#ifdef __LITTLE_ENDIAN</div><div class='del'>-		.digest	= "\x70\x4b",</div><div class='del'>-#else</div><div class='del'>-		.digest	= "\x4b\x70",</div><div class='del'>-#endif</div><div class='del'>-	}, {</div><div class='del'>-		.plaintext =</div><div class='del'>-		"abcddddddddddddddddddddddddddddddddddddddddddddddddddddd",</div><div class='del'>-		.psize  = 56,</div><div class='del'>-#ifdef __LITTLE_ENDIAN</div><div class='del'>-		.digest = "\xe3\x9c",</div><div class='del'>-#else</div><div class='del'>-		.digest = "\x9c\xe3",</div><div class='del'>-#endif</div><div class='del'>-		.np     = 2,</div><div class='del'>-		.tap    = { 28, 28 }</div><div class='add'>+		.plaintext	= "abc",</div><div class='add'>+		.psize		= 3,</div><div class='add'>+		.digest		= (u8 *)(u16 []){ 0x443b },</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext 	= "1234567890123456789012345678901234567890"</div><div class='add'>+				  "123456789012345678901234567890123456789",</div><div class='add'>+		.psize		= 79,</div><div class='add'>+		.digest 	= (u8 *)(u16 []){ 0x4b70 },</div><div class='add'>+		.np		= 2,</div><div class='add'>+		.tap		= { 63, 16 },</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext	= "abcdddddddddddddddddddddddddddddddddddddddd"</div><div class='add'>+				  "ddddddddddddd",</div><div class='add'>+		.psize		= 56,</div><div class='add'>+		.digest		= (u8 *)(u16 []){ 0x9ce3 },</div><div class='add'>+		.np		= 8,</div><div class='add'>+		.tap		= { 1, 2, 28, 7, 6, 5, 4, 3 },</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext 	= "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "123456789012345678901234567890123456789",</div><div class='add'>+		.psize		= 319,</div><div class='add'>+		.digest		= (u8 *)(u16 []){ 0x44c6 },</div><div class='add'>+	}, {</div><div class='add'>+		.plaintext 	= "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "1234567890123456789012345678901234567890"</div><div class='add'>+				  "123456789012345678901234567890123456789",</div><div class='add'>+		.psize		= 319,</div><div class='add'>+		.digest		= (u8 *)(u16 []){ 0x44c6 },</div><div class='add'>+		.np		= 4,</div><div class='add'>+		.tap		= { 1, 255, 57, 6 },</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1371,8 +1358,6 @@ static struct hash_testvec crct10dif_tv_template[] = {</div><div class='ctx'>  * SHA1 test vectors  from from FIPS PUB 180-1</div><div class='ctx'>  * Long vector from CAVS 5.0</div><div class='ctx'>  */</div><div class='del'>-#define SHA1_TEST_VECTORS	6</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec sha1_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -1563,8 +1548,6 @@ static struct hash_testvec sha1_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * SHA224 test vectors from from FIPS PUB 180-2</div><div class='ctx'>  */</div><div class='del'>-#define SHA224_TEST_VECTORS     5</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec sha224_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -1737,8 +1720,6 @@ static struct hash_testvec sha224_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * SHA256 test vectors from from NIST</div><div class='ctx'>  */</div><div class='del'>-#define SHA256_TEST_VECTORS	5</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec sha256_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -1910,8 +1891,6 @@ static struct hash_testvec sha256_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * SHA384 test vectors from from NIST and kerneli</div><div class='ctx'>  */</div><div class='del'>-#define SHA384_TEST_VECTORS	6</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec sha384_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -2104,8 +2083,6 @@ static struct hash_testvec sha384_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * SHA512 test vectors from from NIST and kerneli</div><div class='ctx'>  */</div><div class='del'>-#define SHA512_TEST_VECTORS	6</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec sha512_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -2313,8 +2290,6 @@ static struct hash_testvec sha512_tv_template[] = {</div><div class='ctx'>  * by Vincent Rijmen and Paulo S. L. M. Barreto as part of the NESSIE</div><div class='ctx'>  * submission</div><div class='ctx'>  */</div><div class='del'>-#define WP512_TEST_VECTORS	8</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec wp512_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -2411,8 +2386,6 @@ static struct hash_testvec wp512_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define WP384_TEST_VECTORS	8</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec wp384_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -2493,8 +2466,6 @@ static struct hash_testvec wp384_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define WP256_TEST_VECTORS	8</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec wp256_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -2562,8 +2533,6 @@ static struct hash_testvec wp256_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * TIGER test vectors from Tiger website</div><div class='ctx'>  */</div><div class='del'>-#define TGR192_TEST_VECTORS	6</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec tgr192_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -2607,8 +2576,6 @@ static struct hash_testvec tgr192_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define TGR160_TEST_VECTORS	6</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec tgr160_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -2652,8 +2619,6 @@ static struct hash_testvec tgr160_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define TGR128_TEST_VECTORS	6</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec tgr128_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.plaintext = "",</div><div class='hunk'>@@ -2691,8 +2656,6 @@ static struct hash_testvec tgr128_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define GHASH_TEST_VECTORS 6</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec ghash_tv_template[] =</div><div class='ctx'> {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -2808,8 +2771,6 @@ static struct hash_testvec ghash_tv_template[] =</div><div class='ctx'>  * HMAC-MD5 test vectors from RFC2202</div><div class='ctx'>  * (These need to be fixed to not use strlen).</div><div class='ctx'>  */</div><div class='del'>-#define HMAC_MD5_TEST_VECTORS	7</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_md5_tv_template[] =</div><div class='ctx'> {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -2890,8 +2851,6 @@ static struct hash_testvec hmac_md5_tv_template[] =</div><div class='ctx'> /*</div><div class='ctx'>  * HMAC-RIPEMD128 test vectors from RFC2286</div><div class='ctx'>  */</div><div class='del'>-#define HMAC_RMD128_TEST_VECTORS	7</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_rmd128_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='hunk'>@@ -2971,8 +2930,6 @@ static struct hash_testvec hmac_rmd128_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * HMAC-RIPEMD160 test vectors from RFC2286</div><div class='ctx'>  */</div><div class='del'>-#define HMAC_RMD160_TEST_VECTORS	7</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_rmd160_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='hunk'>@@ -3052,8 +3009,6 @@ static struct hash_testvec hmac_rmd160_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * HMAC-SHA1 test vectors from RFC2202</div><div class='ctx'>  */</div><div class='del'>-#define HMAC_SHA1_TEST_VECTORS	7</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_sha1_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",</div><div class='hunk'>@@ -3135,8 +3090,6 @@ static struct hash_testvec hmac_sha1_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * SHA224 HMAC test vectors from RFC4231</div><div class='ctx'>  */</div><div class='del'>-#define HMAC_SHA224_TEST_VECTORS    4</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_sha224_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key    = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='hunk'>@@ -3250,8 +3203,6 @@ static struct hash_testvec hmac_sha224_tv_template[] = {</div><div class='ctx'>  * HMAC-SHA256 test vectors from</div><div class='ctx'>  * draft-ietf-ipsec-ciph-sha-256-01.txt</div><div class='ctx'>  */</div><div class='del'>-#define HMAC_SHA256_TEST_VECTORS	10</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_sha256_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x01\x02\x03\x04\x05\x06\x07\x08"</div><div class='hunk'>@@ -3387,8 +3338,6 @@ static struct hash_testvec hmac_sha256_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CMAC_AES_TEST_VECTORS 6</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec aes_cmac128_tv_template[] = {</div><div class='ctx'> 	{ /* From NIST Special Publication 800-38B, AES-128 */</div><div class='ctx'> 		.key		= "\x2b\x7e\x15\x16\x28\xae\xd2\xa6"</div><div class='hunk'>@@ -3464,7 +3413,65 @@ static struct hash_testvec aes_cmac128_tv_template[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CMAC_DES3_EDE_TEST_VECTORS 4</div><div class='add'>+static struct hash_testvec aes_cbcmac_tv_template[] = {</div><div class='add'>+	{</div><div class='add'>+		.key		= "\x2b\x7e\x15\x16\x28\xae\xd2\xa6"</div><div class='add'>+				  "\xab\xf7\x15\x88\x09\xcf\x4f\x3c",</div><div class='add'>+		.plaintext	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='add'>+				  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a",</div><div class='add'>+		.digest		= "\x3a\xd7\x7b\xb4\x0d\x7a\x36\x60"</div><div class='add'>+				  "\xa8\x9e\xca\xf3\x24\x66\xef\x97",</div><div class='add'>+		.psize		= 16,</div><div class='add'>+		.ksize		= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key		= "\x2b\x7e\x15\x16\x28\xae\xd2\xa6"</div><div class='add'>+				  "\xab\xf7\x15\x88\x09\xcf\x4f\x3c",</div><div class='add'>+		.plaintext	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='add'>+				  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"</div><div class='add'>+				  "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"</div><div class='add'>+				  "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"</div><div class='add'>+				  "\x30",</div><div class='add'>+		.digest		= "\x9d\x0d\xd0\x63\xfb\xcb\x24\x43"</div><div class='add'>+				  "\xf8\xf2\x76\x03\xac\x39\xb0\x9d",</div><div class='add'>+		.psize		= 33,</div><div class='add'>+		.ksize		= 16,</div><div class='add'>+		.np		= 2,</div><div class='add'>+		.tap		= { 7, 26 },</div><div class='add'>+	}, {</div><div class='add'>+		.key		= "\x2b\x7e\x15\x16\x28\xae\xd2\xa6"</div><div class='add'>+				  "\xab\xf7\x15\x88\x09\xcf\x4f\x3c",</div><div class='add'>+		.plaintext	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='add'>+				  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"</div><div class='add'>+				  "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"</div><div class='add'>+				  "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"</div><div class='add'>+				  "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"</div><div class='add'>+				  "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"</div><div class='add'>+				  "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"</div><div class='add'>+				  "\xad\x2b\x41\x7b\xe6\x6c\x37",</div><div class='add'>+		.digest		= "\xc0\x71\x73\xb8\xa0\x2c\x11\x7c"</div><div class='add'>+				  "\xaf\xdc\xb2\xf8\x89\x32\xa3\x3a",</div><div class='add'>+		.psize		= 63,</div><div class='add'>+		.ksize		= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key		= "\x60\x3d\xeb\x10\x15\xca\x71\xbe"</div><div class='add'>+				  "\x2b\x73\xae\xf0\x85\x7d\x77\x81"</div><div class='add'>+				  "\x1f\x35\x2c\x07\x3b\x61\x08\xd7"</div><div class='add'>+				  "\x2d\x98\x10\xa3\x09\x14\xdf\xf4",</div><div class='add'>+		.plaintext	= "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"</div><div class='add'>+				  "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"</div><div class='add'>+				  "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"</div><div class='add'>+				  "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"</div><div class='add'>+				  "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"</div><div class='add'>+				  "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"</div><div class='add'>+				  "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"</div><div class='add'>+				  "\xad\x2b\x41\x7b\xe6\x6c\x37\x10"</div><div class='add'>+				  "\x1c",</div><div class='add'>+		.digest		= "\x6a\x4e\xdb\x21\x47\x51\xdf\x4f"</div><div class='add'>+				  "\xa8\x4d\x4c\x10\x3b\x72\x7d\xd6",</div><div class='add'>+		.psize		= 65,</div><div class='add'>+		.ksize		= 32,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct hash_testvec des3_ede_cmac64_tv_template[] = {</div><div class='ctx'> /*</div><div class='hunk'>@@ -3512,8 +3519,6 @@ static struct hash_testvec des3_ede_cmac64_tv_template[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define XCBC_AES_TEST_VECTORS 6</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec aes_xcbc128_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='hunk'>@@ -3580,7 +3585,6 @@ static struct hash_testvec aes_xcbc128_tv_template[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define VMAC_AES_TEST_VECTORS	11</div><div class='ctx'> static char vmac_string1[128] = {'\x01', '\x01', '\x01', '\x01',</div><div class='ctx'> 				'\x02', '\x03', '\x02', '\x02',</div><div class='ctx'> 				'\x02', '\x04', '\x01', '\x07',</div><div class='hunk'>@@ -3687,8 +3691,6 @@ static struct hash_testvec aes_vmac128_tv_template[] = {</div><div class='ctx'>  * SHA384 HMAC test vectors from RFC4231</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA384_TEST_VECTORS	4</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_sha384_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='hunk'>@@ -3787,8 +3789,6 @@ static struct hash_testvec hmac_sha384_tv_template[] = {</div><div class='ctx'>  * SHA512 HMAC test vectors from RFC4231</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA512_TEST_VECTORS	4</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_sha512_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='hunk'>@@ -3894,8 +3894,6 @@ static struct hash_testvec hmac_sha512_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA3_224_TEST_VECTORS	4</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_sha3_224_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='hunk'>@@ -3985,8 +3983,6 @@ static struct hash_testvec hmac_sha3_224_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA3_256_TEST_VECTORS	4</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_sha3_256_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='hunk'>@@ -4076,8 +4072,6 @@ static struct hash_testvec hmac_sha3_256_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA3_384_TEST_VECTORS	4</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_sha3_384_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='hunk'>@@ -4175,8 +4169,6 @@ static struct hash_testvec hmac_sha3_384_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA3_512_TEST_VECTORS	4</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec hmac_sha3_512_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"</div><div class='hunk'>@@ -4286,8 +4278,6 @@ static struct hash_testvec hmac_sha3_512_tv_template[] = {</div><div class='ctx'>  * Poly1305 test vectors from RFC7539 A.3.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define POLY1305_TEST_VECTORS	11</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec poly1305_tv_template[] = {</div><div class='ctx'> 	{ /* Test Vector #1 */</div><div class='ctx'> 		.plaintext	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='hunk'>@@ -4533,19 +4523,6 @@ static struct hash_testvec poly1305_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * DES test vectors.</div><div class='ctx'>  */</div><div class='del'>-#define DES_ENC_TEST_VECTORS		11</div><div class='del'>-#define DES_DEC_TEST_VECTORS		5</div><div class='del'>-#define DES_CBC_ENC_TEST_VECTORS	6</div><div class='del'>-#define DES_CBC_DEC_TEST_VECTORS	5</div><div class='del'>-#define DES_CTR_ENC_TEST_VECTORS	2</div><div class='del'>-#define DES_CTR_DEC_TEST_VECTORS	2</div><div class='del'>-#define DES3_EDE_ENC_TEST_VECTORS	4</div><div class='del'>-#define DES3_EDE_DEC_TEST_VECTORS	4</div><div class='del'>-#define DES3_EDE_CBC_ENC_TEST_VECTORS	2</div><div class='del'>-#define DES3_EDE_CBC_DEC_TEST_VECTORS	2</div><div class='del'>-#define DES3_EDE_CTR_ENC_TEST_VECTORS	2</div><div class='del'>-#define DES3_EDE_CTR_DEC_TEST_VECTORS	2</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec des_enc_tv_template[] = {</div><div class='ctx'> 	{ /* From Applied Cryptography */</div><div class='ctx'> 		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='hunk'>@@ -6606,13 +6583,6 @@ static struct cipher_testvec des3_ede_ctr_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * Blowfish test vectors.</div><div class='ctx'>  */</div><div class='del'>-#define BF_ENC_TEST_VECTORS	7</div><div class='del'>-#define BF_DEC_TEST_VECTORS	7</div><div class='del'>-#define BF_CBC_ENC_TEST_VECTORS	2</div><div class='del'>-#define BF_CBC_DEC_TEST_VECTORS	2</div><div class='del'>-#define BF_CTR_ENC_TEST_VECTORS	2</div><div class='del'>-#define BF_CTR_DEC_TEST_VECTORS	2</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec bf_enc_tv_template[] = {</div><div class='ctx'> 	{ /* DES test vectors from OpenSSL */</div><div class='ctx'> 		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='hunk'>@@ -8138,17 +8108,6 @@ static struct cipher_testvec bf_ctr_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * Twofish test vectors.</div><div class='ctx'>  */</div><div class='del'>-#define TF_ENC_TEST_VECTORS		4</div><div class='del'>-#define TF_DEC_TEST_VECTORS		4</div><div class='del'>-#define TF_CBC_ENC_TEST_VECTORS		5</div><div class='del'>-#define TF_CBC_DEC_TEST_VECTORS		5</div><div class='del'>-#define TF_CTR_ENC_TEST_VECTORS		2</div><div class='del'>-#define TF_CTR_DEC_TEST_VECTORS		2</div><div class='del'>-#define TF_LRW_ENC_TEST_VECTORS		8</div><div class='del'>-#define TF_LRW_DEC_TEST_VECTORS		8</div><div class='del'>-#define TF_XTS_ENC_TEST_VECTORS		5</div><div class='del'>-#define TF_XTS_DEC_TEST_VECTORS		5</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec tf_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= zeroed_string,</div><div class='hunk'>@@ -10867,24 +10826,6 @@ static struct cipher_testvec tf_xts_dec_tv_template[] = {</div><div class='ctx'>  * Serpent test vectors.  These are backwards because Serpent writes</div><div class='ctx'>  * octet sequences in right-to-left mode.</div><div class='ctx'>  */</div><div class='del'>-#define SERPENT_ENC_TEST_VECTORS	5</div><div class='del'>-#define SERPENT_DEC_TEST_VECTORS	5</div><div class='del'>-</div><div class='del'>-#define TNEPRES_ENC_TEST_VECTORS	4</div><div class='del'>-#define TNEPRES_DEC_TEST_VECTORS	4</div><div class='del'>-</div><div class='del'>-#define SERPENT_CBC_ENC_TEST_VECTORS	1</div><div class='del'>-#define SERPENT_CBC_DEC_TEST_VECTORS	1</div><div class='del'>-</div><div class='del'>-#define SERPENT_CTR_ENC_TEST_VECTORS	2</div><div class='del'>-#define SERPENT_CTR_DEC_TEST_VECTORS	2</div><div class='del'>-</div><div class='del'>-#define SERPENT_LRW_ENC_TEST_VECTORS	8</div><div class='del'>-#define SERPENT_LRW_DEC_TEST_VECTORS	8</div><div class='del'>-</div><div class='del'>-#define SERPENT_XTS_ENC_TEST_VECTORS	5</div><div class='del'>-#define SERPENT_XTS_DEC_TEST_VECTORS	5</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec serpent_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='hunk'>@@ -13623,17 +13564,6 @@ static struct cipher_testvec serpent_xts_dec_tv_template[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Cast6 test vectors from RFC 2612 */</div><div class='del'>-#define CAST6_ENC_TEST_VECTORS		4</div><div class='del'>-#define CAST6_DEC_TEST_VECTORS		4</div><div class='del'>-#define CAST6_CBC_ENC_TEST_VECTORS	1</div><div class='del'>-#define CAST6_CBC_DEC_TEST_VECTORS	1</div><div class='del'>-#define CAST6_CTR_ENC_TEST_VECTORS	2</div><div class='del'>-#define CAST6_CTR_DEC_TEST_VECTORS	2</div><div class='del'>-#define CAST6_LRW_ENC_TEST_VECTORS	1</div><div class='del'>-#define CAST6_LRW_DEC_TEST_VECTORS	1</div><div class='del'>-#define CAST6_XTS_ENC_TEST_VECTORS	1</div><div class='del'>-#define CAST6_XTS_DEC_TEST_VECTORS	1</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec cast6_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"</div><div class='hunk'>@@ -15168,38 +15098,6 @@ static struct cipher_testvec cast6_xts_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * AES test vectors.</div><div class='ctx'>  */</div><div class='del'>-#define AES_ENC_TEST_VECTORS 4</div><div class='del'>-#define AES_DEC_TEST_VECTORS 4</div><div class='del'>-#define AES_CBC_ENC_TEST_VECTORS 5</div><div class='del'>-#define AES_CBC_DEC_TEST_VECTORS 5</div><div class='del'>-#define HMAC_MD5_ECB_CIPHER_NULL_ENC_TEST_VECTORS 2</div><div class='del'>-#define HMAC_MD5_ECB_CIPHER_NULL_DEC_TEST_VECTORS 2</div><div class='del'>-#define HMAC_SHA1_ECB_CIPHER_NULL_ENC_TEST_VEC 2</div><div class='del'>-#define HMAC_SHA1_ECB_CIPHER_NULL_DEC_TEST_VEC 2</div><div class='del'>-#define HMAC_SHA1_AES_CBC_ENC_TEST_VEC 7</div><div class='del'>-#define HMAC_SHA256_AES_CBC_ENC_TEST_VEC 7</div><div class='del'>-#define HMAC_SHA512_AES_CBC_ENC_TEST_VEC 7</div><div class='del'>-#define AES_LRW_ENC_TEST_VECTORS 8</div><div class='del'>-#define AES_LRW_DEC_TEST_VECTORS 8</div><div class='del'>-#define AES_XTS_ENC_TEST_VECTORS 5</div><div class='del'>-#define AES_XTS_DEC_TEST_VECTORS 5</div><div class='del'>-#define AES_CTR_ENC_TEST_VECTORS 5</div><div class='del'>-#define AES_CTR_DEC_TEST_VECTORS 5</div><div class='del'>-#define AES_OFB_ENC_TEST_VECTORS 1</div><div class='del'>-#define AES_OFB_DEC_TEST_VECTORS 1</div><div class='del'>-#define AES_CTR_3686_ENC_TEST_VECTORS 7</div><div class='del'>-#define AES_CTR_3686_DEC_TEST_VECTORS 6</div><div class='del'>-#define AES_GCM_ENC_TEST_VECTORS 9</div><div class='del'>-#define AES_GCM_DEC_TEST_VECTORS 8</div><div class='del'>-#define AES_GCM_4106_ENC_TEST_VECTORS 23</div><div class='del'>-#define AES_GCM_4106_DEC_TEST_VECTORS 23</div><div class='del'>-#define AES_GCM_4543_ENC_TEST_VECTORS 1</div><div class='del'>-#define AES_GCM_4543_DEC_TEST_VECTORS 2</div><div class='del'>-#define AES_CCM_ENC_TEST_VECTORS 8</div><div class='del'>-#define AES_CCM_DEC_TEST_VECTORS 7</div><div class='del'>-#define AES_CCM_4309_ENC_TEST_VECTORS 7</div><div class='del'>-#define AES_CCM_4309_DEC_TEST_VECTORS 10</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec aes_enc_tv_template[] = {</div><div class='ctx'> 	{ /* From FIPS-197 */</div><div class='ctx'> 		.key	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='hunk'>@@ -17055,8 +16953,6 @@ static struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA1_DES_CBC_ENC_TEST_VEC	1</div><div class='del'>-</div><div class='ctx'> static struct aead_testvec hmac_sha1_des_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	{ /*Generated with cryptopp*/</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='hunk'>@@ -17116,8 +17012,6 @@ static struct aead_testvec hmac_sha1_des_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA224_DES_CBC_ENC_TEST_VEC	1</div><div class='del'>-</div><div class='ctx'> static struct aead_testvec hmac_sha224_des_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	{ /*Generated with cryptopp*/</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='hunk'>@@ -17177,8 +17071,6 @@ static struct aead_testvec hmac_sha224_des_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA256_DES_CBC_ENC_TEST_VEC	1</div><div class='del'>-</div><div class='ctx'> static struct aead_testvec hmac_sha256_des_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	{ /*Generated with cryptopp*/</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='hunk'>@@ -17240,8 +17132,6 @@ static struct aead_testvec hmac_sha256_des_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA384_DES_CBC_ENC_TEST_VEC	1</div><div class='del'>-</div><div class='ctx'> static struct aead_testvec hmac_sha384_des_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	{ /*Generated with cryptopp*/</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='hunk'>@@ -17307,8 +17197,6 @@ static struct aead_testvec hmac_sha384_des_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA512_DES_CBC_ENC_TEST_VEC	1</div><div class='del'>-</div><div class='ctx'> static struct aead_testvec hmac_sha512_des_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	{ /*Generated with cryptopp*/</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='hunk'>@@ -17378,8 +17266,6 @@ static struct aead_testvec hmac_sha512_des_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA1_DES3_EDE_CBC_ENC_TEST_VEC	1</div><div class='del'>-</div><div class='ctx'> static struct aead_testvec hmac_sha1_des3_ede_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	{ /*Generated with cryptopp*/</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='hunk'>@@ -17441,8 +17327,6 @@ static struct aead_testvec hmac_sha1_des3_ede_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA224_DES3_EDE_CBC_ENC_TEST_VEC	1</div><div class='del'>-</div><div class='ctx'> static struct aead_testvec hmac_sha224_des3_ede_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	{ /*Generated with cryptopp*/</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='hunk'>@@ -17504,8 +17388,6 @@ static struct aead_testvec hmac_sha224_des3_ede_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA256_DES3_EDE_CBC_ENC_TEST_VEC	1</div><div class='del'>-</div><div class='ctx'> static struct aead_testvec hmac_sha256_des3_ede_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	{ /*Generated with cryptopp*/</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='hunk'>@@ -17569,8 +17451,6 @@ static struct aead_testvec hmac_sha256_des3_ede_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA384_DES3_EDE_CBC_ENC_TEST_VEC	1</div><div class='del'>-</div><div class='ctx'> static struct aead_testvec hmac_sha384_des3_ede_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	{ /*Generated with cryptopp*/</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='hunk'>@@ -17638,8 +17518,6 @@ static struct aead_testvec hmac_sha384_des3_ede_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HMAC_SHA512_DES3_EDE_CBC_ENC_TEST_VEC	1</div><div class='del'>-</div><div class='ctx'> static struct aead_testvec hmac_sha512_des3_ede_cbc_enc_tv_temp[] = {</div><div class='ctx'> 	{ /*Generated with cryptopp*/</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='hunk'>@@ -22813,7 +22691,7 @@ static struct aead_testvec aes_ccm_enc_tv_template[] = {</div><div class='ctx'> 			  "\x09\x75\x9a\x9b\x3c\x9b\x27\x39",</div><div class='ctx'> 		.klen	= 32,</div><div class='ctx'> 		.iv	= "\x03\xf9\xd9\x4e\x63\xb5\x3d\x9d"</div><div class='del'>-			  "\x43\xf6\x1e\x50",</div><div class='add'>+			  "\x43\xf6\x1e\x50\0\0\0\0",</div><div class='ctx'> 		.assoc	= "\x57\xf5\x6b\x8b\x57\x5c\x3d\x3b"</div><div class='ctx'> 			  "\x13\x02\x01\x0c\x83\x4c\x96\x35"</div><div class='ctx'> 			  "\x8e\xd6\x39\xcf\x7d\x14\x9b\x94"</div><div class='hunk'>@@ -24420,8 +24298,6 @@ static struct aead_testvec aes_ccm_rfc4309_dec_tv_template[]	= {</div><div class='ctx'> /*</div><div class='ctx'>  * ChaCha20-Poly1305 AEAD test vectors from RFC7539 2.8.2./A.5.</div><div class='ctx'>  */</div><div class='del'>-#define RFC7539_ENC_TEST_VECTORS 2</div><div class='del'>-#define RFC7539_DEC_TEST_VECTORS 2</div><div class='ctx'> static struct aead_testvec rfc7539_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='hunk'>@@ -24689,8 +24565,6 @@ static struct aead_testvec rfc7539_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * draft-irtf-cfrg-chacha20-poly1305</div><div class='ctx'>  */</div><div class='del'>-#define RFC7539ESP_DEC_TEST_VECTORS 1</div><div class='del'>-#define RFC7539ESP_ENC_TEST_VECTORS 1</div><div class='ctx'> static struct aead_testvec rfc7539esp_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x1c\x92\x40\xa5\xeb\x55\xd3\x8a"</div><div class='hunk'>@@ -24913,8 +24787,6 @@ static struct cipher_testvec aes_kw_dec_tv_template[] = {</div><div class='ctx'>  *     http://csrc.nist.gov/groups/STM/cavp/documents/rng/RNGVS.pdf</div><div class='ctx'>  * Only AES-128 is supported at this time.</div><div class='ctx'>  */</div><div class='del'>-#define ANSI_CPRNG_AES_TEST_VECTORS	6</div><div class='del'>-</div><div class='ctx'> static struct cprng_testvec ansi_cprng_aes_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\xf3\xb1\x66\x6d\x13\x60\x72\x42"</div><div class='hunk'>@@ -25832,13 +25704,6 @@ static struct drbg_testvec drbg_nopr_ctr_aes128_tv_template[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Cast5 test vectors from RFC 2144 */</div><div class='del'>-#define CAST5_ENC_TEST_VECTORS		4</div><div class='del'>-#define CAST5_DEC_TEST_VECTORS		4</div><div class='del'>-#define CAST5_CBC_ENC_TEST_VECTORS	1</div><div class='del'>-#define CAST5_CBC_DEC_TEST_VECTORS	1</div><div class='del'>-#define CAST5_CTR_ENC_TEST_VECTORS	2</div><div class='del'>-#define CAST5_CTR_DEC_TEST_VECTORS	2</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec cast5_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x01\x23\x45\x67\x12\x34\x56\x78"</div><div class='hunk'>@@ -26742,9 +26607,6 @@ static struct cipher_testvec cast5_ctr_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * ARC4 test vectors from OpenSSL</div><div class='ctx'>  */</div><div class='del'>-#define ARC4_ENC_TEST_VECTORS	7</div><div class='del'>-#define ARC4_DEC_TEST_VECTORS	7</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec arc4_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef",</div><div class='hunk'>@@ -26880,9 +26742,6 @@ static struct cipher_testvec arc4_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * TEA test vectors</div><div class='ctx'>  */</div><div class='del'>-#define TEA_ENC_TEST_VECTORS	4</div><div class='del'>-#define TEA_DEC_TEST_VECTORS	4</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec tea_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key    = zeroed_string,</div><div class='hunk'>@@ -26972,9 +26831,6 @@ static struct cipher_testvec tea_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * XTEA test vectors</div><div class='ctx'>  */</div><div class='del'>-#define XTEA_ENC_TEST_VECTORS	4</div><div class='del'>-#define XTEA_DEC_TEST_VECTORS	4</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec xtea_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key    = zeroed_string,</div><div class='hunk'>@@ -27064,9 +26920,6 @@ static struct cipher_testvec xtea_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * KHAZAD test vectors.</div><div class='ctx'>  */</div><div class='del'>-#define KHAZAD_ENC_TEST_VECTORS 5</div><div class='del'>-#define KHAZAD_DEC_TEST_VECTORS 5</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec khazad_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x80\x00\x00\x00\x00\x00\x00\x00"</div><div class='hunk'>@@ -27163,11 +27016,6 @@ static struct cipher_testvec khazad_dec_tv_template[] = {</div><div class='ctx'>  * Anubis test vectors.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define ANUBIS_ENC_TEST_VECTORS			5</div><div class='del'>-#define ANUBIS_DEC_TEST_VECTORS			5</div><div class='del'>-#define ANUBIS_CBC_ENC_TEST_VECTORS		2</div><div class='del'>-#define ANUBIS_CBC_DEC_TEST_VECTORS		2</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec anubis_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\xfe\xfe\xfe\xfe\xfe\xfe\xfe\xfe"</div><div class='hunk'>@@ -27367,9 +27215,6 @@ static struct cipher_testvec anubis_cbc_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * XETA test vectors</div><div class='ctx'>  */</div><div class='del'>-#define XETA_ENC_TEST_VECTORS	4</div><div class='del'>-#define XETA_DEC_TEST_VECTORS	4</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec xeta_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key    = zeroed_string,</div><div class='hunk'>@@ -27459,9 +27304,6 @@ static struct cipher_testvec xeta_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * FCrypt test vectors</div><div class='ctx'>  */</div><div class='del'>-#define FCRYPT_ENC_TEST_VECTORS	ARRAY_SIZE(fcrypt_pcbc_enc_tv_template)</div><div class='del'>-#define FCRYPT_DEC_TEST_VECTORS	ARRAY_SIZE(fcrypt_pcbc_dec_tv_template)</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec fcrypt_pcbc_enc_tv_template[] = {</div><div class='ctx'> 	{ /* http://www.openafs.org/pipermail/openafs-devel/2000-December/005320.html */</div><div class='ctx'> 		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='hunk'>@@ -27587,17 +27429,6 @@ static struct cipher_testvec fcrypt_pcbc_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * CAMELLIA test vectors.</div><div class='ctx'>  */</div><div class='del'>-#define CAMELLIA_ENC_TEST_VECTORS 4</div><div class='del'>-#define CAMELLIA_DEC_TEST_VECTORS 4</div><div class='del'>-#define CAMELLIA_CBC_ENC_TEST_VECTORS 3</div><div class='del'>-#define CAMELLIA_CBC_DEC_TEST_VECTORS 3</div><div class='del'>-#define CAMELLIA_CTR_ENC_TEST_VECTORS 2</div><div class='del'>-#define CAMELLIA_CTR_DEC_TEST_VECTORS 2</div><div class='del'>-#define CAMELLIA_LRW_ENC_TEST_VECTORS 8</div><div class='del'>-#define CAMELLIA_LRW_DEC_TEST_VECTORS 8</div><div class='del'>-#define CAMELLIA_XTS_ENC_TEST_VECTORS 5</div><div class='del'>-#define CAMELLIA_XTS_DEC_TEST_VECTORS 5</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec camellia_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key	= "\x01\x23\x45\x67\x89\xab\xcd\xef"</div><div class='hunk'>@@ -31317,9 +31148,6 @@ static struct cipher_testvec camellia_xts_dec_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * SEED test vectors</div><div class='ctx'>  */</div><div class='del'>-#define SEED_ENC_TEST_VECTORS	4</div><div class='del'>-#define SEED_DEC_TEST_VECTORS	4</div><div class='del'>-</div><div class='ctx'> static struct cipher_testvec seed_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key    = zeroed_string,</div><div class='hunk'>@@ -31404,7 +31232,6 @@ static struct cipher_testvec seed_dec_tv_template[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SALSA20_STREAM_ENC_TEST_VECTORS 5</div><div class='ctx'> static struct cipher_testvec salsa20_stream_enc_tv_template[] = {</div><div class='ctx'> 	/*</div><div class='ctx'> 	* Testvectors from verified.test-vectors submitted to ECRYPT.</div><div class='hunk'>@@ -32574,7 +32401,6 @@ static struct cipher_testvec salsa20_stream_enc_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CHACHA20_ENC_TEST_VECTORS 4</div><div class='ctx'> static struct cipher_testvec chacha20_enc_tv_template[] = {</div><div class='ctx'> 	{ /* RFC7539 A.2. Test Vector #1 */</div><div class='ctx'> 		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='hunk'>@@ -33086,8 +32912,6 @@ static struct cipher_testvec chacha20_enc_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * CTS (Cipher Text Stealing) mode tests</div><div class='ctx'>  */</div><div class='del'>-#define CTS_MODE_ENC_TEST_VECTORS 6</div><div class='del'>-#define CTS_MODE_DEC_TEST_VECTORS 6</div><div class='ctx'> static struct cipher_testvec cts_mode_enc_tv_template[] = {</div><div class='ctx'> 	{ /* from rfc3962 */</div><div class='ctx'> 		.klen	= 16,</div><div class='hunk'>@@ -33308,9 +33132,6 @@ struct comp_testvec {</div><div class='ctx'>  * Params: winbits=-11, Z_DEFAULT_COMPRESSION, MAX_MEM_LEVEL.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define DEFLATE_COMP_TEST_VECTORS 2</div><div class='del'>-#define DEFLATE_DECOMP_TEST_VECTORS 2</div><div class='del'>-</div><div class='ctx'> static struct comp_testvec deflate_comp_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.inlen	= 70,</div><div class='hunk'>@@ -33386,9 +33207,6 @@ static struct comp_testvec deflate_decomp_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * LZO test vectors (null-terminated strings).</div><div class='ctx'>  */</div><div class='del'>-#define LZO_COMP_TEST_VECTORS 2</div><div class='del'>-#define LZO_DECOMP_TEST_VECTORS 2</div><div class='del'>-</div><div class='ctx'> static struct comp_testvec lzo_comp_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.inlen	= 70,</div><div class='hunk'>@@ -33520,8 +33338,6 @@ static struct hash_testvec michael_mic_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * CRC32 test vectors</div><div class='ctx'>  */</div><div class='del'>-#define CRC32_TEST_VECTORS 14</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec crc32_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.key = "\x87\xa9\xcb\xed",</div><div class='hunk'>@@ -33954,8 +33770,6 @@ static struct hash_testvec crc32_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * CRC32C test vectors</div><div class='ctx'>  */</div><div class='del'>-#define CRC32C_TEST_VECTORS 15</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec crc32c_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.psize = 0,</div><div class='hunk'>@@ -34392,8 +34206,6 @@ static struct hash_testvec crc32c_tv_template[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * Blakcifn CRC test vectors</div><div class='ctx'>  */</div><div class='del'>-#define BFIN_CRC_TEST_VECTORS 6</div><div class='del'>-</div><div class='ctx'> static struct hash_testvec bfin_crc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.psize = 0,</div><div class='hunk'>@@ -34479,69 +34291,125 @@ static struct hash_testvec bfin_crc_tv_template[] = {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define LZ4_COMP_TEST_VECTORS 1</div><div class='del'>-#define LZ4_DECOMP_TEST_VECTORS 1</div><div class='del'>-</div><div class='ctx'> static struct comp_testvec lz4_comp_tv_template[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.inlen	= 70,</div><div class='del'>-		.outlen	= 45,</div><div class='del'>-		.input	= "Join us now and share the software "</div><div class='del'>-			  "Join us now and share the software ",</div><div class='del'>-		.output = "\xf0\x10\x4a\x6f\x69\x6e\x20\x75"</div><div class='del'>-			  "\x73\x20\x6e\x6f\x77\x20\x61\x6e"</div><div class='del'>-			  "\x64\x20\x73\x68\x61\x72\x65\x20"</div><div class='del'>-			  "\x74\x68\x65\x20\x73\x6f\x66\x74"</div><div class='del'>-			  "\x77\x0d\x00\x0f\x23\x00\x0b\x50"</div><div class='del'>-			  "\x77\x61\x72\x65\x20",</div><div class='add'>+		.inlen	= 255,</div><div class='add'>+		.outlen	= 218,</div><div class='add'>+		.input	= "LZ4 is lossless compression algorithm, providing"</div><div class='add'>+			 " compression speed at 400 MB/s per core, scalable "</div><div class='add'>+			 "with multi-cores CPU. It features an extremely fast "</div><div class='add'>+			 "decoder, with speed in multiple GB/s per core, "</div><div class='add'>+			 "typically reaching RAM speed limits on multi-core "</div><div class='add'>+			 "systems.",</div><div class='add'>+		.output	= "\xf9\x21\x4c\x5a\x34\x20\x69\x73\x20\x6c\x6f\x73\x73"</div><div class='add'>+			  "\x6c\x65\x73\x73\x20\x63\x6f\x6d\x70\x72\x65\x73\x73"</div><div class='add'>+			  "\x69\x6f\x6e\x20\x61\x6c\x67\x6f\x72\x69\x74\x68\x6d"</div><div class='add'>+			  "\x2c\x20\x70\x72\x6f\x76\x69\x64\x69\x6e\x67\x21\x00"</div><div class='add'>+			  "\xf0\x21\x73\x70\x65\x65\x64\x20\x61\x74\x20\x34\x30"</div><div class='add'>+			  "\x30\x20\x4d\x42\x2f\x73\x20\x70\x65\x72\x20\x63\x6f"</div><div class='add'>+			  "\x72\x65\x2c\x20\x73\x63\x61\x6c\x61\x62\x6c\x65\x20"</div><div class='add'>+			  "\x77\x69\x74\x68\x20\x6d\x75\x6c\x74\x69\x2d\x1a\x00"</div><div class='add'>+			  "\xf0\x00\x73\x20\x43\x50\x55\x2e\x20\x49\x74\x20\x66"</div><div class='add'>+			  "\x65\x61\x74\x75\x11\x00\xf2\x0b\x61\x6e\x20\x65\x78"</div><div class='add'>+			  "\x74\x72\x65\x6d\x65\x6c\x79\x20\x66\x61\x73\x74\x20"</div><div class='add'>+			  "\x64\x65\x63\x6f\x64\x65\x72\x2c\x3d\x00\x02\x67\x00"</div><div class='add'>+			  "\x22\x69\x6e\x46\x00\x5a\x70\x6c\x65\x20\x47\x6c\x00"</div><div class='add'>+			  "\xf0\x00\x74\x79\x70\x69\x63\x61\x6c\x6c\x79\x20\x72"</div><div class='add'>+			  "\x65\x61\x63\x68\xa7\x00\x33\x52\x41\x4d\x38\x00\x83"</div><div class='add'>+			  "\x6c\x69\x6d\x69\x74\x73\x20\x6f\x3f\x00\x01\x85\x00"</div><div class='add'>+			  "\x90\x20\x73\x79\x73\x74\x65\x6d\x73\x2e",</div><div class='add'>+</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct comp_testvec lz4_decomp_tv_template[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.inlen	= 45,</div><div class='del'>-		.outlen	= 70,</div><div class='del'>-		.input  = "\xf0\x10\x4a\x6f\x69\x6e\x20\x75"</div><div class='del'>-			  "\x73\x20\x6e\x6f\x77\x20\x61\x6e"</div><div class='del'>-			  "\x64\x20\x73\x68\x61\x72\x65\x20"</div><div class='del'>-			  "\x74\x68\x65\x20\x73\x6f\x66\x74"</div><div class='del'>-			  "\x77\x0d\x00\x0f\x23\x00\x0b\x50"</div><div class='del'>-			  "\x77\x61\x72\x65\x20",</div><div class='del'>-		.output	= "Join us now and share the software "</div><div class='del'>-			  "Join us now and share the software ",</div><div class='add'>+		.inlen	= 218,</div><div class='add'>+		.outlen	= 255,</div><div class='add'>+		.input	= "\xf9\x21\x4c\x5a\x34\x20\x69\x73\x20\x6c\x6f\x73\x73"</div><div class='add'>+			  "\x6c\x65\x73\x73\x20\x63\x6f\x6d\x70\x72\x65\x73\x73"</div><div class='add'>+			  "\x69\x6f\x6e\x20\x61\x6c\x67\x6f\x72\x69\x74\x68\x6d"</div><div class='add'>+			  "\x2c\x20\x70\x72\x6f\x76\x69\x64\x69\x6e\x67\x21\x00"</div><div class='add'>+			  "\xf0\x21\x73\x70\x65\x65\x64\x20\x61\x74\x20\x34\x30"</div><div class='add'>+			  "\x30\x20\x4d\x42\x2f\x73\x20\x70\x65\x72\x20\x63\x6f"</div><div class='add'>+			  "\x72\x65\x2c\x20\x73\x63\x61\x6c\x61\x62\x6c\x65\x20"</div><div class='add'>+			  "\x77\x69\x74\x68\x20\x6d\x75\x6c\x74\x69\x2d\x1a\x00"</div><div class='add'>+			  "\xf0\x00\x73\x20\x43\x50\x55\x2e\x20\x49\x74\x20\x66"</div><div class='add'>+			  "\x65\x61\x74\x75\x11\x00\xf2\x0b\x61\x6e\x20\x65\x78"</div><div class='add'>+			  "\x74\x72\x65\x6d\x65\x6c\x79\x20\x66\x61\x73\x74\x20"</div><div class='add'>+			  "\x64\x65\x63\x6f\x64\x65\x72\x2c\x3d\x00\x02\x67\x00"</div><div class='add'>+			  "\x22\x69\x6e\x46\x00\x5a\x70\x6c\x65\x20\x47\x6c\x00"</div><div class='add'>+			  "\xf0\x00\x74\x79\x70\x69\x63\x61\x6c\x6c\x79\x20\x72"</div><div class='add'>+			  "\x65\x61\x63\x68\xa7\x00\x33\x52\x41\x4d\x38\x00\x83"</div><div class='add'>+			  "\x6c\x69\x6d\x69\x74\x73\x20\x6f\x3f\x00\x01\x85\x00"</div><div class='add'>+			  "\x90\x20\x73\x79\x73\x74\x65\x6d\x73\x2e",</div><div class='add'>+		.output	= "LZ4 is lossless compression algorithm, providing"</div><div class='add'>+			 " compression speed at 400 MB/s per core, scalable "</div><div class='add'>+			 "with multi-cores CPU. It features an extremely fast "</div><div class='add'>+			 "decoder, with speed in multiple GB/s per core, "</div><div class='add'>+			 "typically reaching RAM speed limits on multi-core "</div><div class='add'>+			 "systems.",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define LZ4HC_COMP_TEST_VECTORS 1</div><div class='del'>-#define LZ4HC_DECOMP_TEST_VECTORS 1</div><div class='del'>-</div><div class='ctx'> static struct comp_testvec lz4hc_comp_tv_template[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.inlen	= 70,</div><div class='del'>-		.outlen	= 45,</div><div class='del'>-		.input	= "Join us now and share the software "</div><div class='del'>-			  "Join us now and share the software ",</div><div class='del'>-		.output = "\xf0\x10\x4a\x6f\x69\x6e\x20\x75"</div><div class='del'>-			  "\x73\x20\x6e\x6f\x77\x20\x61\x6e"</div><div class='del'>-			  "\x64\x20\x73\x68\x61\x72\x65\x20"</div><div class='del'>-			  "\x74\x68\x65\x20\x73\x6f\x66\x74"</div><div class='del'>-			  "\x77\x0d\x00\x0f\x23\x00\x0b\x50"</div><div class='del'>-			  "\x77\x61\x72\x65\x20",</div><div class='add'>+		.inlen	= 255,</div><div class='add'>+		.outlen	= 216,</div><div class='add'>+		.input	= "LZ4 is lossless compression algorithm, providing"</div><div class='add'>+			 " compression speed at 400 MB/s per core, scalable "</div><div class='add'>+			 "with multi-cores CPU. It features an extremely fast "</div><div class='add'>+			 "decoder, with speed in multiple GB/s per core, "</div><div class='add'>+			 "typically reaching RAM speed limits on multi-core "</div><div class='add'>+			 "systems.",</div><div class='add'>+		.output = "\xf9\x21\x4c\x5a\x34\x20\x69\x73\x20\x6c\x6f\x73\x73"</div><div class='add'>+			  "\x6c\x65\x73\x73\x20\x63\x6f\x6d\x70\x72\x65\x73\x73"</div><div class='add'>+			  "\x69\x6f\x6e\x20\x61\x6c\x67\x6f\x72\x69\x74\x68\x6d"</div><div class='add'>+			  "\x2c\x20\x70\x72\x6f\x76\x69\x64\x69\x6e\x67\x21\x00"</div><div class='add'>+			  "\xf0\x21\x73\x70\x65\x65\x64\x20\x61\x74\x20\x34\x30"</div><div class='add'>+			  "\x30\x20\x4d\x42\x2f\x73\x20\x70\x65\x72\x20\x63\x6f"</div><div class='add'>+			  "\x72\x65\x2c\x20\x73\x63\x61\x6c\x61\x62\x6c\x65\x20"</div><div class='add'>+			  "\x77\x69\x74\x68\x20\x6d\x75\x6c\x74\x69\x2d\x1a\x00"</div><div class='add'>+			  "\xf0\x00\x73\x20\x43\x50\x55\x2e\x20\x49\x74\x20\x66"</div><div class='add'>+			  "\x65\x61\x74\x75\x11\x00\xf2\x0b\x61\x6e\x20\x65\x78"</div><div class='add'>+			  "\x74\x72\x65\x6d\x65\x6c\x79\x20\x66\x61\x73\x74\x20"</div><div class='add'>+			  "\x64\x65\x63\x6f\x64\x65\x72\x2c\x3d\x00\x02\x67\x00"</div><div class='add'>+			  "\x22\x69\x6e\x46\x00\x5a\x70\x6c\x65\x20\x47\x6c\x00"</div><div class='add'>+			  "\xf0\x00\x74\x79\x70\x69\x63\x61\x6c\x6c\x79\x20\x72"</div><div class='add'>+			  "\x65\x61\x63\x68\xa7\x00\x33\x52\x41\x4d\x38\x00\x97"</div><div class='add'>+			  "\x6c\x69\x6d\x69\x74\x73\x20\x6f\x6e\x85\x00\x90\x20"</div><div class='add'>+			  "\x73\x79\x73\x74\x65\x6d\x73\x2e",</div><div class='add'>+</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct comp_testvec lz4hc_decomp_tv_template[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.inlen	= 45,</div><div class='del'>-		.outlen	= 70,</div><div class='del'>-		.input  = "\xf0\x10\x4a\x6f\x69\x6e\x20\x75"</div><div class='del'>-			  "\x73\x20\x6e\x6f\x77\x20\x61\x6e"</div><div class='del'>-			  "\x64\x20\x73\x68\x61\x72\x65\x20"</div><div class='del'>-			  "\x74\x68\x65\x20\x73\x6f\x66\x74"</div><div class='del'>-			  "\x77\x0d\x00\x0f\x23\x00\x0b\x50"</div><div class='del'>-			  "\x77\x61\x72\x65\x20",</div><div class='del'>-		.output	= "Join us now and share the software "</div><div class='del'>-			  "Join us now and share the software ",</div><div class='add'>+		.inlen	= 216,</div><div class='add'>+		.outlen	= 255,</div><div class='add'>+		.input	= "\xf9\x21\x4c\x5a\x34\x20\x69\x73\x20\x6c\x6f\x73\x73"</div><div class='add'>+			  "\x6c\x65\x73\x73\x20\x63\x6f\x6d\x70\x72\x65\x73\x73"</div><div class='add'>+			  "\x69\x6f\x6e\x20\x61\x6c\x67\x6f\x72\x69\x74\x68\x6d"</div><div class='add'>+			  "\x2c\x20\x70\x72\x6f\x76\x69\x64\x69\x6e\x67\x21\x00"</div><div class='add'>+			  "\xf0\x21\x73\x70\x65\x65\x64\x20\x61\x74\x20\x34\x30"</div><div class='add'>+			  "\x30\x20\x4d\x42\x2f\x73\x20\x70\x65\x72\x20\x63\x6f"</div><div class='add'>+			  "\x72\x65\x2c\x20\x73\x63\x61\x6c\x61\x62\x6c\x65\x20"</div><div class='add'>+			  "\x77\x69\x74\x68\x20\x6d\x75\x6c\x74\x69\x2d\x1a\x00"</div><div class='add'>+			  "\xf0\x00\x73\x20\x43\x50\x55\x2e\x20\x49\x74\x20\x66"</div><div class='add'>+			  "\x65\x61\x74\x75\x11\x00\xf2\x0b\x61\x6e\x20\x65\x78"</div><div class='add'>+			  "\x74\x72\x65\x6d\x65\x6c\x79\x20\x66\x61\x73\x74\x20"</div><div class='add'>+			  "\x64\x65\x63\x6f\x64\x65\x72\x2c\x3d\x00\x02\x67\x00"</div><div class='add'>+			  "\x22\x69\x6e\x46\x00\x5a\x70\x6c\x65\x20\x47\x6c\x00"</div><div class='add'>+			  "\xf0\x00\x74\x79\x70\x69\x63\x61\x6c\x6c\x79\x20\x72"</div><div class='add'>+			  "\x65\x61\x63\x68\xa7\x00\x33\x52\x41\x4d\x38\x00\x97"</div><div class='add'>+			  "\x6c\x69\x6d\x69\x74\x73\x20\x6f\x6e\x85\x00\x90\x20"</div><div class='add'>+			  "\x73\x79\x73\x74\x65\x6d\x73\x2e",</div><div class='add'>+		.output	= "LZ4 is lossless compression algorithm, providing"</div><div class='add'>+			 " compression speed at 400 MB/s per core, scalable "</div><div class='add'>+			 "with multi-cores CPU. It features an extremely fast "</div><div class='add'>+			 "decoder, with speed in multiple GB/s per core, "</div><div class='add'>+			 "typically reaching RAM speed limits on multi-core "</div><div class='add'>+			 "systems.",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/xts.c b/crypto/xts.c<br/>index 305343f22a02..baeb34dd8582 100644<br/>--- a/<a href='/drm-misc/tree/crypto/xts.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>crypto/xts.c</a><br/>+++ b/<a href='/drm-misc/tree/crypto/xts.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>crypto/xts.c</a></div><div class='hunk'>@@ -13,7 +13,8 @@</div><div class='ctx'>  * Software Foundation; either version 2 of the License, or (at your option)</div><div class='ctx'>  * any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -25,140 +26,320 @@</div><div class='ctx'> #include &lt;crypto/b128ops.h&gt;</div><div class='ctx'> #include &lt;crypto/gf128mul.h&gt;</div><div class='ctx'> </div><div class='add'>+#define XTS_BUFFER_SIZE 128u</div><div class='add'>+</div><div class='ctx'> struct priv {</div><div class='del'>-	struct crypto_cipher *child;</div><div class='add'>+	struct crypto_skcipher *child;</div><div class='ctx'> 	struct crypto_cipher *tweak;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int setkey(struct crypto_tfm *parent, const u8 *key,</div><div class='add'>+struct xts_instance_ctx {</div><div class='add'>+	struct crypto_skcipher_spawn spawn;</div><div class='add'>+	char name[CRYPTO_MAX_ALG_NAME];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rctx {</div><div class='add'>+	be128 buf[XTS_BUFFER_SIZE / sizeof(be128)];</div><div class='add'>+</div><div class='add'>+	be128 t;</div><div class='add'>+</div><div class='add'>+	be128 *ext;</div><div class='add'>+</div><div class='add'>+	struct scatterlist srcbuf[2];</div><div class='add'>+	struct scatterlist dstbuf[2];</div><div class='add'>+	struct scatterlist *src;</div><div class='add'>+	struct scatterlist *dst;</div><div class='add'>+</div><div class='add'>+	unsigned int left;</div><div class='add'>+</div><div class='add'>+	struct skcipher_request subreq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int setkey(struct crypto_skcipher *parent, const u8 *key,</div><div class='ctx'> 		  unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	struct priv *ctx = crypto_tfm_ctx(parent);</div><div class='del'>-	struct crypto_cipher *child = ctx-&gt;tweak;</div><div class='add'>+	struct priv *ctx = crypto_skcipher_ctx(parent);</div><div class='add'>+	struct crypto_skcipher *child;</div><div class='add'>+	struct crypto_cipher *tweak;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = xts_check_key(parent, key, keylen);</div><div class='add'>+	err = xts_verify_key(parent, key, keylen);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	keylen /= 2;</div><div class='add'>+</div><div class='ctx'> 	/* we need two cipher instances: one to compute the initial 'tweak'</div><div class='ctx'> 	 * by encrypting the IV (usually the 'plain' iv) and the other</div><div class='ctx'> 	 * one to encrypt and decrypt the data */</div><div class='ctx'> </div><div class='ctx'> 	/* tweak cipher, uses Key2 i.e. the second half of *key */</div><div class='del'>-	crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	crypto_cipher_set_flags(child, crypto_tfm_get_flags(parent) &amp;</div><div class='add'>+	tweak = ctx-&gt;tweak;</div><div class='add'>+	crypto_cipher_clear_flags(tweak, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_cipher_set_flags(tweak, crypto_skcipher_get_flags(parent) &amp;</div><div class='ctx'> 				       CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	err = crypto_cipher_setkey(child, key + keylen/2, keylen/2);</div><div class='add'>+	err = crypto_cipher_setkey(tweak, key + keylen, keylen);</div><div class='add'>+	crypto_skcipher_set_flags(parent, crypto_cipher_get_flags(tweak) &amp;</div><div class='add'>+					  CRYPTO_TFM_RES_MASK);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	crypto_tfm_set_flags(parent, crypto_cipher_get_flags(child) &amp;</div><div class='del'>-				     CRYPTO_TFM_RES_MASK);</div><div class='del'>-</div><div class='add'>+	/* data cipher, uses Key1 i.e. the first half of *key */</div><div class='ctx'> 	child = ctx-&gt;child;</div><div class='add'>+	crypto_skcipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_skcipher_set_flags(child, crypto_skcipher_get_flags(parent) &amp;</div><div class='add'>+					 CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	err = crypto_skcipher_setkey(child, key, keylen);</div><div class='add'>+	crypto_skcipher_set_flags(parent, crypto_skcipher_get_flags(child) &amp;</div><div class='add'>+					  CRYPTO_TFM_RES_MASK);</div><div class='ctx'> </div><div class='del'>-	/* data cipher, uses Key1 i.e. the first half of *key */</div><div class='del'>-	crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	crypto_cipher_set_flags(child, crypto_tfm_get_flags(parent) &amp;</div><div class='del'>-				       CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	err = crypto_cipher_setkey(child, key, keylen/2);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	crypto_tfm_set_flags(parent, crypto_cipher_get_flags(child) &amp;</div><div class='del'>-				     CRYPTO_TFM_RES_MASK);</div><div class='add'>+static int post_crypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	be128 *buf = rctx-&gt;ext ?: rctx-&gt;buf;</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+	const int bs = XTS_BLOCK_SIZE;</div><div class='add'>+	struct skcipher_walk w;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	unsigned offset;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+	err = skcipher_walk_virt(&amp;w, subreq, false);</div><div class='ctx'> </div><div class='del'>-struct sinfo {</div><div class='del'>-	be128 *t;</div><div class='del'>-	struct crypto_tfm *tfm;</div><div class='del'>-	void (*fn)(struct crypto_tfm *, u8 *, const u8 *);</div><div class='del'>-};</div><div class='add'>+	while (w.nbytes) {</div><div class='add'>+		unsigned int avail = w.nbytes;</div><div class='add'>+		be128 *wdst;</div><div class='ctx'> </div><div class='del'>-static inline void xts_round(struct sinfo *s, void *dst, const void *src)</div><div class='del'>-{</div><div class='del'>-	be128_xor(dst, s-&gt;t, src);		/* PP &lt;- T xor P */</div><div class='del'>-	s-&gt;fn(s-&gt;tfm, dst, dst);		/* CC &lt;- E(Key1,PP) */</div><div class='del'>-	be128_xor(dst, dst, s-&gt;t);		/* C &lt;- T xor CC */</div><div class='add'>+		wdst = w.dst.virt.addr;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			be128_xor(wdst, buf++, wdst);</div><div class='add'>+			wdst++;</div><div class='add'>+		} while ((avail -= bs) &gt;= bs);</div><div class='add'>+</div><div class='add'>+		err = skcipher_walk_done(&amp;w, avail);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rctx-&gt;left -= subreq-&gt;cryptlen;</div><div class='add'>+</div><div class='add'>+	if (err || !rctx-&gt;left)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rctx-&gt;dst = rctx-&gt;dstbuf;</div><div class='add'>+</div><div class='add'>+	scatterwalk_done(&amp;w.out, 0, 1);</div><div class='add'>+	sg = w.out.sg;</div><div class='add'>+	offset = w.out.offset;</div><div class='add'>+</div><div class='add'>+	if (rctx-&gt;dst != sg) {</div><div class='add'>+		rctx-&gt;dst[0] = *sg;</div><div class='add'>+		sg_unmark_end(rctx-&gt;dst);</div><div class='add'>+		scatterwalk_crypto_chain(rctx-&gt;dst, sg_next(sg), 0, 2);</div><div class='add'>+	}</div><div class='add'>+	rctx-&gt;dst[0].length -= offset - sg-&gt;offset;</div><div class='add'>+	rctx-&gt;dst[0].offset = offset;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int crypt(struct blkcipher_desc *d,</div><div class='del'>-		 struct blkcipher_walk *w, struct priv *ctx,</div><div class='del'>-		 void (*tw)(struct crypto_tfm *, u8 *, const u8 *),</div><div class='del'>-		 void (*fn)(struct crypto_tfm *, u8 *, const u8 *))</div><div class='add'>+static int pre_crypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	unsigned int avail;</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	be128 *buf = rctx-&gt;ext ?: rctx-&gt;buf;</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='ctx'> 	const int bs = XTS_BLOCK_SIZE;</div><div class='del'>-	struct sinfo s = {</div><div class='del'>-		.tfm = crypto_cipher_tfm(ctx-&gt;child),</div><div class='del'>-		.fn = fn</div><div class='del'>-	};</div><div class='del'>-	u8 *wsrc;</div><div class='del'>-	u8 *wdst;</div><div class='del'>-</div><div class='del'>-	err = blkcipher_walk_virt(d, w);</div><div class='del'>-	if (!w-&gt;nbytes)</div><div class='del'>-		return err;</div><div class='add'>+	struct skcipher_walk w;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	unsigned cryptlen;</div><div class='add'>+	unsigned offset;</div><div class='add'>+	bool more;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	s.t = (be128 *)w-&gt;iv;</div><div class='del'>-	avail = w-&gt;nbytes;</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+	cryptlen = subreq-&gt;cryptlen;</div><div class='ctx'> </div><div class='del'>-	wsrc = w-&gt;src.virt.addr;</div><div class='del'>-	wdst = w-&gt;dst.virt.addr;</div><div class='add'>+	more = rctx-&gt;left &gt; cryptlen;</div><div class='add'>+	if (!more)</div><div class='add'>+		cryptlen = rctx-&gt;left;</div><div class='ctx'> </div><div class='del'>-	/* calculate first value of T */</div><div class='del'>-	tw(crypto_cipher_tfm(ctx-&gt;tweak), w-&gt;iv, w-&gt;iv);</div><div class='add'>+	skcipher_request_set_crypt(subreq, rctx-&gt;src, rctx-&gt;dst,</div><div class='add'>+				   cryptlen, NULL);</div><div class='ctx'> </div><div class='del'>-	goto first;</div><div class='add'>+	err = skcipher_walk_virt(&amp;w, subreq, false);</div><div class='ctx'> </div><div class='del'>-	for (;;) {</div><div class='del'>-		do {</div><div class='del'>-			gf128mul_x_ble(s.t, s.t);</div><div class='add'>+	while (w.nbytes) {</div><div class='add'>+		unsigned int avail = w.nbytes;</div><div class='add'>+		be128 *wsrc;</div><div class='add'>+		be128 *wdst;</div><div class='ctx'> </div><div class='del'>-first:</div><div class='del'>-			xts_round(&amp;s, wdst, wsrc);</div><div class='add'>+		wsrc = w.src.virt.addr;</div><div class='add'>+		wdst = w.dst.virt.addr;</div><div class='ctx'> </div><div class='del'>-			wsrc += bs;</div><div class='del'>-			wdst += bs;</div><div class='add'>+		do {</div><div class='add'>+			*buf++ = rctx-&gt;t;</div><div class='add'>+			be128_xor(wdst++, &amp;rctx-&gt;t, wsrc++);</div><div class='add'>+			gf128mul_x_ble(&amp;rctx-&gt;t, &amp;rctx-&gt;t);</div><div class='ctx'> 		} while ((avail -= bs) &gt;= bs);</div><div class='ctx'> </div><div class='del'>-		err = blkcipher_walk_done(d, w, avail);</div><div class='del'>-		if (!w-&gt;nbytes)</div><div class='del'>-			break;</div><div class='add'>+		err = skcipher_walk_done(&amp;w, avail);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skcipher_request_set_crypt(subreq, rctx-&gt;dst, rctx-&gt;dst,</div><div class='add'>+				   cryptlen, NULL);</div><div class='add'>+</div><div class='add'>+	if (err || !more)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rctx-&gt;src = rctx-&gt;srcbuf;</div><div class='ctx'> </div><div class='del'>-		avail = w-&gt;nbytes;</div><div class='add'>+	scatterwalk_done(&amp;w.in, 0, 1);</div><div class='add'>+	sg = w.in.sg;</div><div class='add'>+	offset = w.in.offset;</div><div class='ctx'> </div><div class='del'>-		wsrc = w-&gt;src.virt.addr;</div><div class='del'>-		wdst = w-&gt;dst.virt.addr;</div><div class='add'>+	if (rctx-&gt;src != sg) {</div><div class='add'>+		rctx-&gt;src[0] = *sg;</div><div class='add'>+		sg_unmark_end(rctx-&gt;src);</div><div class='add'>+		scatterwalk_crypto_chain(rctx-&gt;src, sg_next(sg), 0, 2);</div><div class='ctx'> 	}</div><div class='add'>+	rctx-&gt;src[0].length -= offset - sg-&gt;offset;</div><div class='add'>+	rctx-&gt;src[0].offset = offset;</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		   struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static int init_crypt(struct skcipher_request *req, crypto_completion_t done)</div><div class='ctx'> {</div><div class='del'>-	struct priv *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk w;</div><div class='add'>+	struct priv *ctx = crypto_skcipher_ctx(crypto_skcipher_reqtfm(req));</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+	gfp_t gfp;</div><div class='add'>+</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+	skcipher_request_set_tfm(subreq, ctx-&gt;child);</div><div class='add'>+	skcipher_request_set_callback(subreq, req-&gt;base.flags, done, req);</div><div class='add'>+</div><div class='add'>+	gfp = req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :</div><div class='add'>+							   GFP_ATOMIC;</div><div class='add'>+	rctx-&gt;ext = NULL;</div><div class='add'>+</div><div class='add'>+	subreq-&gt;cryptlen = XTS_BUFFER_SIZE;</div><div class='add'>+	if (req-&gt;cryptlen &gt; XTS_BUFFER_SIZE) {</div><div class='add'>+		subreq-&gt;cryptlen = min(req-&gt;cryptlen, (unsigned)PAGE_SIZE);</div><div class='add'>+		rctx-&gt;ext = kmalloc(subreq-&gt;cryptlen, gfp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rctx-&gt;src = req-&gt;src;</div><div class='add'>+	rctx-&gt;dst = req-&gt;dst;</div><div class='add'>+	rctx-&gt;left = req-&gt;cryptlen;</div><div class='add'>+</div><div class='add'>+	/* calculate first value of T */</div><div class='add'>+	crypto_cipher_encrypt_one(ctx-&gt;tweak, (u8 *)&amp;rctx-&gt;t, req-&gt;iv);</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;w, dst, src, nbytes);</div><div class='del'>-	return crypt(desc, &amp;w, ctx, crypto_cipher_alg(ctx-&gt;tweak)-&gt;cia_encrypt,</div><div class='del'>-		     crypto_cipher_alg(ctx-&gt;child)-&gt;cia_encrypt);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='del'>-		   struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+static void exit_crypt(struct skcipher_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct priv *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blkcipher_walk w;</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	rctx-&gt;left = 0;</div><div class='ctx'> </div><div class='del'>-	blkcipher_walk_init(&amp;w, dst, src, nbytes);</div><div class='del'>-	return crypt(desc, &amp;w, ctx, crypto_cipher_alg(ctx-&gt;tweak)-&gt;cia_encrypt,</div><div class='del'>-		     crypto_cipher_alg(ctx-&gt;child)-&gt;cia_decrypt);</div><div class='add'>+	if (rctx-&gt;ext)</div><div class='add'>+		kzfree(rctx-&gt;ext);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_encrypt(struct skcipher_request *req, int err)</div><div class='add'>+{</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+</div><div class='add'>+	while (!err &amp;&amp; rctx-&gt;left) {</div><div class='add'>+		err = pre_crypt(req) ?:</div><div class='add'>+		      crypto_skcipher_encrypt(subreq) ?:</div><div class='add'>+		      post_crypt(req);</div><div class='add'>+</div><div class='add'>+		if (err == -EINPROGRESS ||</div><div class='add'>+		    (err == -EBUSY &amp;&amp;</div><div class='add'>+		     req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_BACKLOG))</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	exit_crypt(req);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void encrypt_done(struct crypto_async_request *areq, int err)</div><div class='add'>+{</div><div class='add'>+	struct skcipher_request *req = areq-&gt;data;</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+	struct rctx *rctx;</div><div class='add'>+</div><div class='add'>+	rctx = skcipher_request_ctx(req);</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+	subreq-&gt;base.flags &amp;= CRYPTO_TFM_REQ_MAY_BACKLOG;</div><div class='add'>+</div><div class='add'>+	err = do_encrypt(req, err ?: post_crypt(req));</div><div class='add'>+	if (rctx-&gt;left)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skcipher_request_complete(req, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int encrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return do_encrypt(req, init_crypt(req, encrypt_done));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_decrypt(struct skcipher_request *req, int err)</div><div class='add'>+{</div><div class='add'>+	struct rctx *rctx = skcipher_request_ctx(req);</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+</div><div class='add'>+	while (!err &amp;&amp; rctx-&gt;left) {</div><div class='add'>+		err = pre_crypt(req) ?:</div><div class='add'>+		      crypto_skcipher_decrypt(subreq) ?:</div><div class='add'>+		      post_crypt(req);</div><div class='add'>+</div><div class='add'>+		if (err == -EINPROGRESS ||</div><div class='add'>+		    (err == -EBUSY &amp;&amp;</div><div class='add'>+		     req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_BACKLOG))</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	exit_crypt(req);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void decrypt_done(struct crypto_async_request *areq, int err)</div><div class='add'>+{</div><div class='add'>+	struct skcipher_request *req = areq-&gt;data;</div><div class='add'>+	struct skcipher_request *subreq;</div><div class='add'>+	struct rctx *rctx;</div><div class='add'>+</div><div class='add'>+	rctx = skcipher_request_ctx(req);</div><div class='add'>+	subreq = &amp;rctx-&gt;subreq;</div><div class='add'>+	subreq-&gt;base.flags &amp;= CRYPTO_TFM_REQ_MAY_BACKLOG;</div><div class='add'>+</div><div class='add'>+	err = do_decrypt(req, err ?: post_crypt(req));</div><div class='add'>+	if (rctx-&gt;left)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skcipher_request_complete(req, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decrypt(struct skcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return do_decrypt(req, init_crypt(req, decrypt_done));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int xts_crypt(struct blkcipher_desc *desc, struct scatterlist *sdst,</div><div class='hunk'>@@ -233,112 +414,170 @@ first:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(xts_crypt);</div><div class='ctx'> </div><div class='del'>-static int init_tfm(struct crypto_tfm *tfm)</div><div class='add'>+static int init_tfm(struct crypto_skcipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_cipher *cipher;</div><div class='del'>-	struct crypto_instance *inst = (void *)tfm-&gt;__crt_alg;</div><div class='del'>-	struct crypto_spawn *spawn = crypto_instance_ctx(inst);</div><div class='del'>-	struct priv *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	u32 *flags = &amp;tfm-&gt;crt_flags;</div><div class='del'>-</div><div class='del'>-	cipher = crypto_spawn_cipher(spawn);</div><div class='del'>-	if (IS_ERR(cipher))</div><div class='del'>-		return PTR_ERR(cipher);</div><div class='del'>-</div><div class='del'>-	if (crypto_cipher_blocksize(cipher) != XTS_BLOCK_SIZE) {</div><div class='del'>-		*flags |= CRYPTO_TFM_RES_BAD_BLOCK_LEN;</div><div class='del'>-		crypto_free_cipher(cipher);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	struct skcipher_instance *inst = skcipher_alg_instance(tfm);</div><div class='add'>+	struct xts_instance_ctx *ictx = skcipher_instance_ctx(inst);</div><div class='add'>+	struct priv *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+	struct crypto_skcipher *child;</div><div class='add'>+	struct crypto_cipher *tweak;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;child = cipher;</div><div class='add'>+	child = crypto_spawn_skcipher(&amp;ictx-&gt;spawn);</div><div class='add'>+	if (IS_ERR(child))</div><div class='add'>+		return PTR_ERR(child);</div><div class='ctx'> </div><div class='del'>-	cipher = crypto_spawn_cipher(spawn);</div><div class='del'>-	if (IS_ERR(cipher)) {</div><div class='del'>-		crypto_free_cipher(ctx-&gt;child);</div><div class='del'>-		return PTR_ERR(cipher);</div><div class='del'>-	}</div><div class='add'>+	ctx-&gt;child = child;</div><div class='ctx'> </div><div class='del'>-	/* this check isn't really needed, leave it here just in case */</div><div class='del'>-	if (crypto_cipher_blocksize(cipher) != XTS_BLOCK_SIZE) {</div><div class='del'>-		crypto_free_cipher(cipher);</div><div class='del'>-		crypto_free_cipher(ctx-&gt;child);</div><div class='del'>-		*flags |= CRYPTO_TFM_RES_BAD_BLOCK_LEN;</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	tweak = crypto_alloc_cipher(ictx-&gt;name, 0, 0);</div><div class='add'>+	if (IS_ERR(tweak)) {</div><div class='add'>+		crypto_free_skcipher(ctx-&gt;child);</div><div class='add'>+		return PTR_ERR(tweak);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;tweak = cipher;</div><div class='add'>+	ctx-&gt;tweak = tweak;</div><div class='add'>+</div><div class='add'>+	crypto_skcipher_set_reqsize(tfm, crypto_skcipher_reqsize(child) +</div><div class='add'>+					 sizeof(struct rctx));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void exit_tfm(struct crypto_tfm *tfm)</div><div class='add'>+static void exit_tfm(struct crypto_skcipher *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct priv *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	crypto_free_cipher(ctx-&gt;child);</div><div class='add'>+	struct priv *ctx = crypto_skcipher_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	crypto_free_skcipher(ctx-&gt;child);</div><div class='ctx'> 	crypto_free_cipher(ctx-&gt;tweak);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct crypto_instance *alloc(struct rtattr **tb)</div><div class='add'>+static void free(struct skcipher_instance *inst)</div><div class='add'>+{</div><div class='add'>+	crypto_drop_skcipher(skcipher_instance_ctx(inst));</div><div class='add'>+	kfree(inst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create(struct crypto_template *tmpl, struct rtattr **tb)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_instance *inst;</div><div class='del'>-	struct crypto_alg *alg;</div><div class='add'>+	struct skcipher_instance *inst;</div><div class='add'>+	struct crypto_attr_type *algt;</div><div class='add'>+	struct xts_instance_ctx *ctx;</div><div class='add'>+	struct skcipher_alg *alg;</div><div class='add'>+	const char *cipher_name;</div><div class='add'>+	u32 mask;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);</div><div class='add'>+	algt = crypto_get_attr_type(tb);</div><div class='add'>+	if (IS_ERR(algt))</div><div class='add'>+		return PTR_ERR(algt);</div><div class='add'>+</div><div class='add'>+	if ((algt-&gt;type ^ CRYPTO_ALG_TYPE_SKCIPHER) &amp; algt-&gt;mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cipher_name = crypto_attr_alg_name(tb[1]);</div><div class='add'>+	if (IS_ERR(cipher_name))</div><div class='add'>+		return PTR_ERR(cipher_name);</div><div class='add'>+</div><div class='add'>+	inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!inst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ctx = skcipher_instance_ctx(inst);</div><div class='add'>+</div><div class='add'>+	crypto_set_skcipher_spawn(&amp;ctx-&gt;spawn, skcipher_crypto_instance(inst));</div><div class='add'>+</div><div class='add'>+	mask = crypto_requires_off(algt-&gt;type, algt-&gt;mask,</div><div class='add'>+				   CRYPTO_ALG_NEED_FALLBACK |</div><div class='add'>+				   CRYPTO_ALG_ASYNC);</div><div class='add'>+</div><div class='add'>+	err = crypto_grab_skcipher(&amp;ctx-&gt;spawn, cipher_name, 0, mask);</div><div class='add'>+	if (err == -ENOENT) {</div><div class='add'>+		err = -ENAMETOOLONG;</div><div class='add'>+		if (snprintf(ctx-&gt;name, CRYPTO_MAX_ALG_NAME, "ecb(%s)",</div><div class='add'>+			     cipher_name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+			goto err_free_inst;</div><div class='add'>+</div><div class='add'>+		err = crypto_grab_skcipher(&amp;ctx-&gt;spawn, ctx-&gt;name, 0, mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (err)</div><div class='del'>-		return ERR_PTR(err);</div><div class='add'>+		goto err_free_inst;</div><div class='add'>+</div><div class='add'>+	alg = crypto_skcipher_spawn_alg(&amp;ctx-&gt;spawn);</div><div class='ctx'> </div><div class='del'>-	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,</div><div class='del'>-				  CRYPTO_ALG_TYPE_MASK);</div><div class='del'>-	if (IS_ERR(alg))</div><div class='del'>-		return ERR_CAST(alg);</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (alg-&gt;base.cra_blocksize != XTS_BLOCK_SIZE)</div><div class='add'>+		goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-	inst = crypto_alloc_instance("xts", alg);</div><div class='del'>-	if (IS_ERR(inst))</div><div class='del'>-		goto out_put_alg;</div><div class='add'>+	if (crypto_skcipher_alg_ivsize(alg))</div><div class='add'>+		goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER;</div><div class='del'>-	inst-&gt;alg.cra_priority = alg-&gt;cra_priority;</div><div class='del'>-	inst-&gt;alg.cra_blocksize = alg-&gt;cra_blocksize;</div><div class='add'>+	err = crypto_inst_setname(skcipher_crypto_instance(inst), "xts",</div><div class='add'>+				  &amp;alg-&gt;base);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-	if (alg-&gt;cra_alignmask &lt; 7)</div><div class='del'>-		inst-&gt;alg.cra_alignmask = 7;</div><div class='del'>-	else</div><div class='del'>-		inst-&gt;alg.cra_alignmask = alg-&gt;cra_alignmask;</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	cipher_name = alg-&gt;base.cra_name;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_type = &amp;crypto_blkcipher_type;</div><div class='add'>+	/* Alas we screwed up the naming so we have to mangle the</div><div class='add'>+	 * cipher name.</div><div class='add'>+	 */</div><div class='add'>+	if (!strncmp(cipher_name, "ecb(", 4)) {</div><div class='add'>+		unsigned len;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_blkcipher.ivsize = alg-&gt;cra_blocksize;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.min_keysize =</div><div class='del'>-		2 * alg-&gt;cra_cipher.cia_min_keysize;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.max_keysize =</div><div class='del'>-		2 * alg-&gt;cra_cipher.cia_max_keysize;</div><div class='add'>+		len = strlcpy(ctx-&gt;name, cipher_name + 4, sizeof(ctx-&gt;name));</div><div class='add'>+		if (len &lt; 2 || len &gt;= sizeof(ctx-&gt;name))</div><div class='add'>+			goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_ctxsize = sizeof(struct priv);</div><div class='add'>+		if (ctx-&gt;name[len - 1] != ')')</div><div class='add'>+			goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_init = init_tfm;</div><div class='del'>-	inst-&gt;alg.cra_exit = exit_tfm;</div><div class='add'>+		ctx-&gt;name[len - 1] = 0;</div><div class='ctx'> </div><div class='del'>-	inst-&gt;alg.cra_blkcipher.setkey = setkey;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.encrypt = encrypt;</div><div class='del'>-	inst-&gt;alg.cra_blkcipher.decrypt = decrypt;</div><div class='add'>+		if (snprintf(inst-&gt;alg.base.cra_name, CRYPTO_MAX_ALG_NAME,</div><div class='add'>+			     "xts(%s)", ctx-&gt;name) &gt;= CRYPTO_MAX_ALG_NAME)</div><div class='add'>+			return -ENAMETOOLONG;</div><div class='add'>+	} else</div><div class='add'>+		goto err_drop_spawn;</div><div class='ctx'> </div><div class='del'>-out_put_alg:</div><div class='del'>-	crypto_mod_put(alg);</div><div class='del'>-	return inst;</div><div class='del'>-}</div><div class='add'>+	inst-&gt;alg.base.cra_flags = alg-&gt;base.cra_flags &amp; CRYPTO_ALG_ASYNC;</div><div class='add'>+	inst-&gt;alg.base.cra_priority = alg-&gt;base.cra_priority;</div><div class='add'>+	inst-&gt;alg.base.cra_blocksize = XTS_BLOCK_SIZE;</div><div class='add'>+	inst-&gt;alg.base.cra_alignmask = alg-&gt;base.cra_alignmask |</div><div class='add'>+				       (__alignof__(u64) - 1);</div><div class='ctx'> </div><div class='del'>-static void free(struct crypto_instance *inst)</div><div class='del'>-{</div><div class='del'>-	crypto_drop_spawn(crypto_instance_ctx(inst));</div><div class='add'>+	inst-&gt;alg.ivsize = XTS_BLOCK_SIZE;</div><div class='add'>+	inst-&gt;alg.min_keysize = crypto_skcipher_alg_min_keysize(alg) * 2;</div><div class='add'>+	inst-&gt;alg.max_keysize = crypto_skcipher_alg_max_keysize(alg) * 2;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.base.cra_ctxsize = sizeof(struct priv);</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.init = init_tfm;</div><div class='add'>+	inst-&gt;alg.exit = exit_tfm;</div><div class='add'>+</div><div class='add'>+	inst-&gt;alg.setkey = setkey;</div><div class='add'>+	inst-&gt;alg.encrypt = encrypt;</div><div class='add'>+	inst-&gt;alg.decrypt = decrypt;</div><div class='add'>+</div><div class='add'>+	inst-&gt;free = free;</div><div class='add'>+</div><div class='add'>+	err = skcipher_register_instance(tmpl, inst);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_drop_spawn;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_drop_spawn:</div><div class='add'>+	crypto_drop_skcipher(&amp;ctx-&gt;spawn);</div><div class='add'>+err_free_inst:</div><div class='ctx'> 	kfree(inst);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct crypto_template crypto_tmpl = {</div><div class='ctx'> 	.name = "xts",</div><div class='del'>-	.alloc = alloc,</div><div class='del'>-	.free = free,</div><div class='add'>+	.create = create,</div><div class='ctx'> 	.module = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/Kconfig b/drivers/Kconfig<br/>index e1e2066cecdb..117ca14ccf85 100644<br/>--- a/<a href='/drm-misc/tree/drivers/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/Kconfig</a></div><div class='hunk'>@@ -202,4 +202,6 @@ source "drivers/hwtracing/intel_th/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/fpga/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/fsi/Kconfig"</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/Makefile b/drivers/Makefile<br/>index 194d20bee7dc..2eced9afba53 100644<br/>--- a/<a href='/drm-misc/tree/drivers/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/Makefile</a></div><div class='hunk'>@@ -15,6 +15,9 @@ obj-$(CONFIG_PINCTRL)		+= pinctrl/</div><div class='ctx'> obj-$(CONFIG_GPIOLIB)		+= gpio/</div><div class='ctx'> obj-y				+= pwm/</div><div class='ctx'> obj-$(CONFIG_PCI)		+= pci/</div><div class='add'>+# PCI dwc controller drivers</div><div class='add'>+obj-y				+= pci/dwc/</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_PARISC)		+= parisc/</div><div class='ctx'> obj-$(CONFIG_RAPIDIO)		+= rapidio/</div><div class='ctx'> obj-y				+= video/</div><div class='hunk'>@@ -107,7 +110,7 @@ obj-$(CONFIG_INPUT)		+= input/</div><div class='ctx'> obj-$(CONFIG_RTC_LIB)		+= rtc/</div><div class='ctx'> obj-y				+= i2c/ media/</div><div class='ctx'> obj-$(CONFIG_PPS)		+= pps/</div><div class='del'>-obj-$(CONFIG_PTP_1588_CLOCK)	+= ptp/</div><div class='add'>+obj-y				+= ptp/</div><div class='ctx'> obj-$(CONFIG_W1)		+= w1/</div><div class='ctx'> obj-y				+= power/</div><div class='ctx'> obj-$(CONFIG_HWMON)		+= hwmon/</div><div class='hunk'>@@ -173,3 +176,4 @@ obj-$(CONFIG_STM)		+= hwtracing/stm/</div><div class='ctx'> obj-$(CONFIG_ANDROID)		+= android/</div><div class='ctx'> obj-$(CONFIG_NVMEM)		+= nvmem/</div><div class='ctx'> obj-$(CONFIG_FPGA)		+= fpga/</div><div class='add'>+obj-$(CONFIG_FSI)		+= fsi/</div><div class='head'>diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig<br/>index 535e7828445a..83e5f7e1a20d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/Kconfig</a></div><div class='hunk'>@@ -104,7 +104,7 @@ config ACPI_PROCFS_POWER</div><div class='ctx'> 	  Say N to delete power /proc/acpi/ directories that have moved to /sys/</div><div class='ctx'> </div><div class='ctx'> config ACPI_REV_OVERRIDE_POSSIBLE</div><div class='del'>-	bool "Allow supported ACPI revision to be overriden"</div><div class='add'>+	bool "Allow supported ACPI revision to be overridden"</div><div class='ctx'> 	depends on X86</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='hunk'>@@ -342,7 +342,7 @@ config ACPI_DEBUG</div><div class='ctx'> </div><div class='ctx'> 	  Use the acpi.debug_layer and acpi.debug_level kernel command-line</div><div class='ctx'> 	  parameters documented in Documentation/acpi/debug.txt and</div><div class='del'>-	  Documentation/kernel-parameters.txt to control the type and</div><div class='add'>+	  Documentation/admin-guide/kernel-parameters.rst to control the type and</div><div class='ctx'> 	  amount of debug output.</div><div class='ctx'> </div><div class='ctx'> config ACPI_PCI_SLOT</div><div class='head'>diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile<br/>index 9ed087853dee..a391bbc48105 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/Makefile</a></div><div class='hunk'>@@ -55,7 +55,7 @@ acpi-$(CONFIG_DEBUG_FS)		+= debugfs.o</div><div class='ctx'> acpi-$(CONFIG_ACPI_NUMA)	+= numa.o</div><div class='ctx'> acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o</div><div class='ctx'> acpi-y				+= acpi_lpat.o</div><div class='del'>-acpi-$(CONFIG_ACPI_GENERIC_GSI) += gsi.o</div><div class='add'>+acpi-$(CONFIG_ACPI_GENERIC_GSI) += irq.o</div><div class='ctx'> acpi-$(CONFIG_ACPI_WATCHDOG)	+= acpi_watchdog.o</div><div class='ctx'> </div><div class='ctx'> # These are (potentially) separate modules</div><div class='head'>diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c<br/>index 7dd70927991e..26696b693e63 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpi_apd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpi_apd.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpi_apd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_apd.c</a></div><div class='hunk'>@@ -77,6 +77,11 @@ static const struct apd_device_desc cz_i2c_desc = {</div><div class='ctx'> 	.fixed_clk_rate = 133000000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct apd_device_desc wt_i2c_desc = {</div><div class='add'>+	.setup = acpi_apd_setup,</div><div class='add'>+	.fixed_clk_rate = 150000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct property_entry uart_properties[] = {</div><div class='ctx'> 	PROPERTY_ENTRY_U32("reg-io-width", 4),</div><div class='ctx'> 	PROPERTY_ENTRY_U32("reg-shift", 2),</div><div class='hunk'>@@ -156,7 +161,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {</div><div class='ctx'> 	/* Generic apd devices */</div><div class='ctx'> #ifdef CONFIG_X86_AMD_PLATFORM_DEVICE</div><div class='ctx'> 	{ "AMD0010", APD_ADDR(cz_i2c_desc) },</div><div class='del'>-	{ "AMDI0010", APD_ADDR(cz_i2c_desc) },</div><div class='add'>+	{ "AMDI0010", APD_ADDR(wt_i2c_desc) },</div><div class='ctx'> 	{ "AMD0020", APD_ADDR(cz_uart_desc) },</div><div class='ctx'> 	{ "AMDI0020", APD_ADDR(cz_uart_desc) },</div><div class='ctx'> 	{ "AMD0030", },</div><div class='head'>diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c<br/>index b3842ffc19ba..a15270a806fc 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpi_extlog.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpi_extlog.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpi_extlog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_extlog.c</a></div><div class='hunk'>@@ -212,6 +212,7 @@ static bool __init extlog_get_l1addr(void)</div><div class='ctx'> }</div><div class='ctx'> static struct notifier_block extlog_mce_dec = {</div><div class='ctx'> 	.notifier_call	= extlog_print,</div><div class='add'>+	.priority	= MCE_PRIO_EXTLOG,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init extlog_init(void)</div><div class='head'>diff --git a/drivers/acpi/acpi_ipmi.c b/drivers/acpi/acpi_ipmi.c<br/>index f77956c3fd45..747c2ba98534 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpi_ipmi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpi_ipmi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpi_ipmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_ipmi.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ struct acpi_ipmi_device {</div><div class='ctx'> struct ipmi_driver_data {</div><div class='ctx'> 	struct list_head ipmi_devices;</div><div class='ctx'> 	struct ipmi_smi_watcher bmc_events;</div><div class='del'>-	struct ipmi_user_hndl ipmi_hndlrs;</div><div class='add'>+	const struct ipmi_user_hndl ipmi_hndlrs;</div><div class='ctx'> 	struct mutex ipmi_lock;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c<br/>index 373657f7e35a..5edfd9c49044 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpi_lpss.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpi_lpss.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpi_lpss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_lpss.c</a></div><div class='hunk'>@@ -18,8 +18,10 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/clk-lpss.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/x86/pmc_atom.h&gt;</div><div class='ctx'> #include &lt;linux/pm_domain.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/pwm.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -31,7 +33,6 @@ ACPI_MODULE_NAME("acpi_lpss");</div><div class='ctx'> #include &lt;asm/cpu_device_id.h&gt;</div><div class='ctx'> #include &lt;asm/intel-family.h&gt;</div><div class='ctx'> #include &lt;asm/iosf_mbi.h&gt;</div><div class='del'>-#include &lt;asm/pmc_atom.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define LPSS_ADDR(desc) ((unsigned long)&amp;desc)</div><div class='ctx'> </div><div class='hunk'>@@ -154,6 +155,18 @@ static void byt_i2c_setup(struct lpss_private_data *pdata)</div><div class='ctx'> 	writel(0, pdata-&gt;mmio_base + LPSS_I2C_ENABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* BSW PWM used for backlight control by the i915 driver */</div><div class='add'>+static struct pwm_lookup bsw_pwm_lookup[] = {</div><div class='add'>+	PWM_LOOKUP_WITH_MODULE("80862288:00", 0, "0000:00:02.0",</div><div class='add'>+			       "pwm_backlight", 0, PWM_POLARITY_NORMAL,</div><div class='add'>+			       "pwm-lpss-platform"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bsw_pwm_setup(struct lpss_private_data *pdata)</div><div class='add'>+{</div><div class='add'>+	pwm_add_table(bsw_pwm_lookup, ARRAY_SIZE(bsw_pwm_lookup));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct lpss_device_desc lpt_dev_desc = {</div><div class='ctx'> 	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR,</div><div class='ctx'> 	.prv_offset = 0x800,</div><div class='hunk'>@@ -191,6 +204,7 @@ static const struct lpss_device_desc byt_pwm_dev_desc = {</div><div class='ctx'> </div><div class='ctx'> static const struct lpss_device_desc bsw_pwm_dev_desc = {</div><div class='ctx'> 	.flags = LPSS_SAVE_CTX | LPSS_NO_D3_DELAY,</div><div class='add'>+	.setup = bsw_pwm_setup,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct lpss_device_desc byt_uart_dev_desc = {</div><div class='hunk'>@@ -718,13 +732,14 @@ static int acpi_lpss_resume_early(struct device *dev)</div><div class='ctx'> #define LPSS_GPIODEF0_DMA1_D3		BIT(2)</div><div class='ctx'> #define LPSS_GPIODEF0_DMA2_D3		BIT(3)</div><div class='ctx'> #define LPSS_GPIODEF0_DMA_D3_MASK	GENMASK(3, 2)</div><div class='add'>+#define LPSS_GPIODEF0_DMA_LLP		BIT(13)</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(lpss_iosf_mutex);</div><div class='ctx'> </div><div class='ctx'> static void lpss_iosf_enter_d3_state(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 value1 = 0;</div><div class='del'>-	u32 mask1 = LPSS_GPIODEF0_DMA_D3_MASK;</div><div class='add'>+	u32 mask1 = LPSS_GPIODEF0_DMA_D3_MASK | LPSS_GPIODEF0_DMA_LLP;</div><div class='ctx'> 	u32 value2 = LPSS_PMCSR_D3hot;</div><div class='ctx'> 	u32 mask2 = LPSS_PMCSR_Dx_MASK;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -768,8 +783,9 @@ exit:</div><div class='ctx'> </div><div class='ctx'> static void lpss_iosf_exit_d3_state(void)</div><div class='ctx'> {</div><div class='del'>-	u32 value1 = LPSS_GPIODEF0_DMA1_D3 | LPSS_GPIODEF0_DMA2_D3;</div><div class='del'>-	u32 mask1 = LPSS_GPIODEF0_DMA_D3_MASK;</div><div class='add'>+	u32 value1 = LPSS_GPIODEF0_DMA1_D3 | LPSS_GPIODEF0_DMA2_D3 |</div><div class='add'>+		     LPSS_GPIODEF0_DMA_LLP;</div><div class='add'>+	u32 mask1 = LPSS_GPIODEF0_DMA_D3_MASK | LPSS_GPIODEF0_DMA_LLP;</div><div class='ctx'> 	u32 value2 = LPSS_PMCSR_D0;</div><div class='ctx'> 	u32 mask2 = LPSS_PMCSR_Dx_MASK;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c<br/>index eb76a4c10dbf..754431031282 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpi_pad.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpi_pad.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpi_pad.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_pad.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;uapi/linux/sched/types.h&gt;</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='head'>diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c<br/>index 3de3b6b8f0f1..4467a8089ab8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpi_processor.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpi_processor.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpi_processor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_processor.c</a></div><div class='hunk'>@@ -165,7 +165,7 @@ static int acpi_processor_errata(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI_HOTPLUG_CPU</div><div class='ctx'> int __weak acpi_map_cpu(acpi_handle handle,</div><div class='del'>-		phys_cpuid_t physid, int *pcpu)</div><div class='add'>+		phys_cpuid_t physid, u32 acpi_id, int *pcpu)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='hunk'>@@ -203,7 +203,7 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr)</div><div class='ctx'> 	cpu_maps_update_begin();</div><div class='ctx'> 	cpu_hotplug_begin();</div><div class='ctx'> </div><div class='del'>-	ret = acpi_map_cpu(pr-&gt;handle, pr-&gt;phys_id, &amp;pr-&gt;id);</div><div class='add'>+	ret = acpi_map_cpu(pr-&gt;handle, pr-&gt;phys_id, pr-&gt;acpi_id, &amp;pr-&gt;id);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c<br/>index c5557d070954..d00bc0ef87a6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpi_video.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpi_video.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpi_video.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_video.c</a></div><div class='hunk'>@@ -37,23 +37,12 @@</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/video.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PREFIX "ACPI: "</div><div class='ctx'> </div><div class='ctx'> #define ACPI_VIDEO_BUS_NAME		"Video Bus"</div><div class='ctx'> #define ACPI_VIDEO_DEVICE_NAME		"Video Device"</div><div class='del'>-#define ACPI_VIDEO_NOTIFY_SWITCH	0x80</div><div class='del'>-#define ACPI_VIDEO_NOTIFY_PROBE		0x81</div><div class='del'>-#define ACPI_VIDEO_NOTIFY_CYCLE		0x82</div><div class='del'>-#define ACPI_VIDEO_NOTIFY_NEXT_OUTPUT	0x83</div><div class='del'>-#define ACPI_VIDEO_NOTIFY_PREV_OUTPUT	0x84</div><div class='del'>-</div><div class='del'>-#define ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS	0x85</div><div class='del'>-#define	ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS	0x86</div><div class='del'>-#define ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS	0x87</div><div class='del'>-#define ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS	0x88</div><div class='del'>-#define ACPI_VIDEO_NOTIFY_DISPLAY_OFF		0x89</div><div class='ctx'> </div><div class='ctx'> #define MAX_NAME_LEN	20</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c<br/>index 13caebd679f5..8c4e0a18460a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpi_watchdog.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpi_watchdog.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpi_watchdog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpi_watchdog.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ void __init acpi_watchdog_init(void)</div><div class='ctx'> 	pdev = platform_device_register_simple("wdat_wdt", PLATFORM_DEVID_NONE,</div><div class='ctx'> 					       resources, nresources);</div><div class='ctx'> 	if (IS_ERR(pdev))</div><div class='del'>-		pr_err("Failed to create platform device\n");</div><div class='add'>+		pr_err("Device creation failed: %ld\n", PTR_ERR(pdev));</div><div class='ctx'> </div><div class='ctx'> 	kfree(resources);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/acapps.h b/drivers/acpi/acpica/acapps.h<br/>index 0bd6307e1f3c..b65f2731e9e2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acapps.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acapps.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acapps.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acapps.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -51,26 +51,26 @@</div><div class='ctx'> /* Common info for tool signons */</div><div class='ctx'> </div><div class='ctx'> #define ACPICA_NAME                 "Intel ACPI Component Architecture"</div><div class='del'>-#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2016 Intel Corporation"</div><div class='add'>+#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2017 Intel Corporation"</div><div class='ctx'> </div><div class='ctx'> #if ACPI_MACHINE_WIDTH == 64</div><div class='del'>-#define ACPI_WIDTH          "-64"</div><div class='add'>+#define ACPI_WIDTH          " (64-bit version)"</div><div class='ctx'> </div><div class='ctx'> #elif ACPI_MACHINE_WIDTH == 32</div><div class='del'>-#define ACPI_WIDTH          "-32"</div><div class='add'>+#define ACPI_WIDTH          " (32-bit version)"</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> #error unknown ACPI_MACHINE_WIDTH</div><div class='del'>-#define ACPI_WIDTH          "-??"</div><div class='add'>+#define ACPI_WIDTH          " (unknown bit width, not 32 or 64)"</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Macros for signons and file headers */</div><div class='ctx'> </div><div class='ctx'> #define ACPI_COMMON_SIGNON(utility_name) \</div><div class='del'>-	"\n%s\n%s version %8.8X%s\n%s\n\n", \</div><div class='add'>+	"\n%s\n%s version %8.8X\n%s\n\n", \</div><div class='ctx'> 	ACPICA_NAME, \</div><div class='del'>-	utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, \</div><div class='add'>+	utility_name, ((u32) ACPI_CA_VERSION), \</div><div class='ctx'> 	ACPICA_COPYRIGHT</div><div class='ctx'> </div><div class='ctx'> #define ACPI_COMMON_HEADER(utility_name, prefix) \</div><div class='head'>diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h<br/>index 19d6ec815d12..49bf47ca5477 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/accommon.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/accommon.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/accommon.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/accommon.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h<br/>index 94737f8845ac..71743e5252f5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acdebug.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acdebug.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acdebug.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acdebug.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h<br/>index dcd48bfedb4d..0d95c85cce06 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acdispat.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acdispat.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acdispat.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acdispat.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h<br/>index 92fa47c6498c..a2adfd42f85c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acevents.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acevents.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acevents.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acevents.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -243,9 +243,7 @@ acpi_ev_default_region_setup(acpi_handle handle,</div><div class='ctx'> 			     u32 function,</div><div class='ctx'> 			     void *handler_context, void **region_context);</div><div class='ctx'> </div><div class='del'>-acpi_status</div><div class='del'>-acpi_ev_initialize_region(union acpi_operand_object *region_obj,</div><div class='del'>-			  u8 acpi_ns_locked);</div><div class='add'>+acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * evsci - SCI (System Control Interrupt) handling/dispatch</div><div class='head'>diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h<br/>index 750fa824d42c..1d955fe216c4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acglobal.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acglobal.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acglobal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acglobal.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -240,10 +240,6 @@ ACPI_INIT_GLOBAL(u32, acpi_gbl_nesting_level, 0);</div><div class='ctx'> </div><div class='ctx'> ACPI_GLOBAL(struct acpi_thread_state *, acpi_gbl_current_walk_list);</div><div class='ctx'> </div><div class='del'>-/* Maximum number of While() loop iterations before forced abort */</div><div class='del'>-</div><div class='del'>-ACPI_GLOBAL(u16, acpi_gbl_max_loop_iterations);</div><div class='del'>-</div><div class='ctx'> /* Control method single step flag */</div><div class='ctx'> </div><div class='ctx'> ACPI_GLOBAL(u8, acpi_gbl_cm_single_step);</div><div class='hunk'>@@ -318,6 +314,7 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_cstyle_disassembly, TRUE);</div><div class='ctx'> ACPI_INIT_GLOBAL(u8, acpi_gbl_force_aml_disassembly, FALSE);</div><div class='ctx'> ACPI_INIT_GLOBAL(u8, acpi_gbl_dm_opt_verbose, TRUE);</div><div class='ctx'> ACPI_INIT_GLOBAL(u8, acpi_gbl_dm_emit_external_opcodes, FALSE);</div><div class='add'>+ACPI_INIT_GLOBAL(u8, acpi_gbl_do_disassembler_optimizations, TRUE);</div><div class='ctx'> </div><div class='ctx'> ACPI_GLOBAL(u8, acpi_gbl_dm_opt_disasm);</div><div class='ctx'> ACPI_GLOBAL(u8, acpi_gbl_dm_opt_listing);</div><div class='head'>diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h<br/>index 27addcf50c37..fd4f3cacb356 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/achware.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/achware.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/achware.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/achware.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h<br/>index 7ead235555cf..29a863c85318 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acinterp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acinterp.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acinterp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acinterp.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h<br/>index dff1207a6078..8fd495e8fdce 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/aclocal.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/aclocal.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/aclocal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/aclocal.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -765,12 +765,12 @@ union acpi_parse_value {</div><div class='ctx'> 	union acpi_parse_value          value;          /* Value or args associated with the opcode */\</div><div class='ctx'> 	u8                              arg_list_length; /* Number of elements in the arg list */\</div><div class='ctx'> 	ACPI_DISASM_ONLY_MEMBERS (\</div><div class='del'>-	u8                              disasm_flags;   /* Used during AML disassembly */\</div><div class='add'>+	u16                             disasm_flags;   /* Used during AML disassembly */\</div><div class='ctx'> 	u8                              disasm_opcode;  /* Subtype used for disassembly */\</div><div class='ctx'> 	char                            *operator_symbol;/* Used for C-style operator name strings */\</div><div class='ctx'> 	char                            aml_op_name[16])	/* Op name (debug only) */</div><div class='ctx'> </div><div class='del'>-/* Flags for disasm_flags field above */</div><div class='add'>+/* Internal opcodes for disasm_opcode field above */</div><div class='ctx'> </div><div class='ctx'> #define ACPI_DASM_BUFFER                0x00	/* Buffer is a simple data buffer */</div><div class='ctx'> #define ACPI_DASM_RESOURCE              0x01	/* Buffer is a Resource Descriptor */</div><div class='hunk'>@@ -783,7 +783,10 @@ union acpi_parse_value {</div><div class='ctx'> #define ACPI_DASM_LNOT_PREFIX           0x08	/* Start of a Lnot_equal (etc.) pair of opcodes */</div><div class='ctx'> #define ACPI_DASM_LNOT_SUFFIX           0x09	/* End  of a Lnot_equal (etc.) pair of opcodes */</div><div class='ctx'> #define ACPI_DASM_HID_STRING            0x0A	/* String is a _HID or _CID */</div><div class='del'>-#define ACPI_DASM_IGNORE                0x0B	/* Not used at this time */</div><div class='add'>+#define ACPI_DASM_IGNORE_SINGLE         0x0B	/* Ignore the opcode but not it's children */</div><div class='add'>+#define ACPI_DASM_SWITCH_PREDICATE      0x0C	/* Object is a predicate for a Switch or Case block */</div><div class='add'>+#define ACPI_DASM_CASE                  0x0D	/* If/Else is a Case in a Switch/Case block */</div><div class='add'>+#define ACPI_DASM_DEFAULT               0x0E	/* Else is a Default in a Switch/Case block */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Generic operation (for example:  If, While, Store)</div><div class='hunk'>@@ -868,14 +871,15 @@ struct acpi_parse_state {</div><div class='ctx'> </div><div class='ctx'> /* Parse object disasm_flags */</div><div class='ctx'> </div><div class='del'>-#define ACPI_PARSEOP_IGNORE                 0x01</div><div class='del'>-#define ACPI_PARSEOP_PARAMETER_LIST         0x02</div><div class='del'>-#define ACPI_PARSEOP_EMPTY_TERMLIST         0x04</div><div class='del'>-#define ACPI_PARSEOP_PREDEFINED_CHECKED     0x08</div><div class='del'>-#define ACPI_PARSEOP_CLOSING_PAREN          0x10</div><div class='del'>-#define ACPI_PARSEOP_COMPOUND_ASSIGNMENT    0x20</div><div class='del'>-#define ACPI_PARSEOP_ASSIGNMENT             0x40</div><div class='del'>-#define ACPI_PARSEOP_ELSEIF                 0x80</div><div class='add'>+#define ACPI_PARSEOP_IGNORE                 0x0001</div><div class='add'>+#define ACPI_PARSEOP_PARAMETER_LIST         0x0002</div><div class='add'>+#define ACPI_PARSEOP_EMPTY_TERMLIST         0x0004</div><div class='add'>+#define ACPI_PARSEOP_PREDEFINED_CHECKED     0x0008</div><div class='add'>+#define ACPI_PARSEOP_CLOSING_PAREN          0x0010</div><div class='add'>+#define ACPI_PARSEOP_COMPOUND_ASSIGNMENT    0x0020</div><div class='add'>+#define ACPI_PARSEOP_ASSIGNMENT             0x0040</div><div class='add'>+#define ACPI_PARSEOP_ELSEIF                 0x0080</div><div class='add'>+#define ACPI_PARSEOP_LEGACY_ASL_ONLY        0x0100</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h<br/>index a3b95431b7c5..c3337514e0ed 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acmacros.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acmacros.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acmacros.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acmacros.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Extract data using a pointer. Any more than a byte and we</div><div class='del'>- * get into potential aligment issues -- see the STORE macros below.</div><div class='add'>+ * get into potential alignment issues -- see the STORE macros below.</div><div class='ctx'>  * Use with care.</div><div class='ctx'>  */</div><div class='ctx'> #define ACPI_CAST8(ptr)                 ACPI_CAST_PTR (u8, (ptr))</div><div class='hunk'>@@ -63,7 +63,7 @@</div><div class='ctx'> #define ACPI_SET64(ptr, val)            (*ACPI_CAST64 (ptr) = (u64) (val))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * printf() format helper. This macros is a workaround for the difficulties</div><div class='add'>+ * printf() format helper. This macro is a workaround for the difficulties</div><div class='ctx'>  * with emitting 64-bit integers and 64-bit pointers with the same code</div><div class='ctx'>  * for both 32-bit and 64-bit hosts.</div><div class='ctx'>  */</div><div class='hunk'>@@ -260,8 +260,70 @@</div><div class='ctx'> </div><div class='ctx'> #define ACPI_IS_MISALIGNED(value)           (((acpi_size) value) &amp; (sizeof(acpi_size)-1))</div><div class='ctx'> </div><div class='add'>+/* Generic bit manipulation */</div><div class='add'>+</div><div class='add'>+#ifndef ACPI_USE_NATIVE_BIT_FINDER</div><div class='add'>+</div><div class='add'>+#define __ACPI_FIND_LAST_BIT_2(a, r)        ((((u8)  (a)) &amp; 0x02) ? (r)+1 : (r))</div><div class='add'>+#define __ACPI_FIND_LAST_BIT_4(a, r)        ((((u8)  (a)) &amp; 0x0C) ? \</div><div class='add'>+											 __ACPI_FIND_LAST_BIT_2  ((a)&gt;&gt;2,  (r)+2) : \</div><div class='add'>+											 __ACPI_FIND_LAST_BIT_2  ((a), (r)))</div><div class='add'>+#define __ACPI_FIND_LAST_BIT_8(a, r)        ((((u8)  (a)) &amp; 0xF0) ? \</div><div class='add'>+											 __ACPI_FIND_LAST_BIT_4  ((a)&gt;&gt;4,  (r)+4) : \</div><div class='add'>+											 __ACPI_FIND_LAST_BIT_4  ((a), (r)))</div><div class='add'>+#define __ACPI_FIND_LAST_BIT_16(a, r)       ((((u16) (a)) &amp; 0xFF00) ? \</div><div class='add'>+											 __ACPI_FIND_LAST_BIT_8  ((a)&gt;&gt;8,  (r)+8) : \</div><div class='add'>+											 __ACPI_FIND_LAST_BIT_8  ((a), (r)))</div><div class='add'>+#define __ACPI_FIND_LAST_BIT_32(a, r)       ((((u32) (a)) &amp; 0xFFFF0000) ? \</div><div class='add'>+											 __ACPI_FIND_LAST_BIT_16 ((a)&gt;&gt;16, (r)+16) : \</div><div class='add'>+											 __ACPI_FIND_LAST_BIT_16 ((a), (r)))</div><div class='add'>+#define __ACPI_FIND_LAST_BIT_64(a, r)       ((((u64) (a)) &amp; 0xFFFFFFFF00000000) ? \</div><div class='add'>+											 __ACPI_FIND_LAST_BIT_32 ((a)&gt;&gt;32, (r)+32) : \</div><div class='add'>+											 __ACPI_FIND_LAST_BIT_32 ((a), (r)))</div><div class='add'>+</div><div class='add'>+#define ACPI_FIND_LAST_BIT_8(a)             ((a) ? __ACPI_FIND_LAST_BIT_8 (a, 1) : 0)</div><div class='add'>+#define ACPI_FIND_LAST_BIT_16(a)            ((a) ? __ACPI_FIND_LAST_BIT_16 (a, 1) : 0)</div><div class='add'>+#define ACPI_FIND_LAST_BIT_32(a)            ((a) ? __ACPI_FIND_LAST_BIT_32 (a, 1) : 0)</div><div class='add'>+#define ACPI_FIND_LAST_BIT_64(a)            ((a) ? __ACPI_FIND_LAST_BIT_64 (a, 1) : 0)</div><div class='add'>+</div><div class='add'>+#define __ACPI_FIND_FIRST_BIT_2(a, r)       ((((u8) (a)) &amp; 0x01) ? (r) : (r)+1)</div><div class='add'>+#define __ACPI_FIND_FIRST_BIT_4(a, r)       ((((u8) (a)) &amp; 0x03) ? \</div><div class='add'>+											 __ACPI_FIND_FIRST_BIT_2  ((a), (r)) : \</div><div class='add'>+											 __ACPI_FIND_FIRST_BIT_2  ((a)&gt;&gt;2, (r)+2))</div><div class='add'>+#define __ACPI_FIND_FIRST_BIT_8(a, r)       ((((u8) (a)) &amp; 0x0F) ? \</div><div class='add'>+											 __ACPI_FIND_FIRST_BIT_4  ((a), (r)) : \</div><div class='add'>+											 __ACPI_FIND_FIRST_BIT_4  ((a)&gt;&gt;4, (r)+4))</div><div class='add'>+#define __ACPI_FIND_FIRST_BIT_16(a, r)      ((((u16) (a)) &amp; 0x00FF) ? \</div><div class='add'>+											 __ACPI_FIND_FIRST_BIT_8  ((a), (r)) : \</div><div class='add'>+											 __ACPI_FIND_FIRST_BIT_8  ((a)&gt;&gt;8, (r)+8))</div><div class='add'>+#define __ACPI_FIND_FIRST_BIT_32(a, r)      ((((u32) (a)) &amp; 0x0000FFFF) ? \</div><div class='add'>+											 __ACPI_FIND_FIRST_BIT_16 ((a), (r)) : \</div><div class='add'>+											 __ACPI_FIND_FIRST_BIT_16 ((a)&gt;&gt;16, (r)+16))</div><div class='add'>+#define __ACPI_FIND_FIRST_BIT_64(a, r)      ((((u64) (a)) &amp; 0x00000000FFFFFFFF) ? \</div><div class='add'>+											 __ACPI_FIND_FIRST_BIT_32 ((a), (r)) : \</div><div class='add'>+											 __ACPI_FIND_FIRST_BIT_32 ((a)&gt;&gt;32, (r)+32))</div><div class='add'>+</div><div class='add'>+#define ACPI_FIND_FIRST_BIT_8(a)            ((a) ? __ACPI_FIND_FIRST_BIT_8 (a, 1) : 0)</div><div class='add'>+#define ACPI_FIND_FIRST_BIT_16(a)           ((a) ? __ACPI_FIND_FIRST_BIT_16 (a, 1) : 0)</div><div class='add'>+#define ACPI_FIND_FIRST_BIT_32(a)           ((a) ? __ACPI_FIND_FIRST_BIT_32 (a, 1) : 0)</div><div class='add'>+#define ACPI_FIND_FIRST_BIT_64(a)           ((a) ? __ACPI_FIND_FIRST_BIT_64 (a, 1) : 0)</div><div class='add'>+</div><div class='add'>+#endif				/* ACPI_USE_NATIVE_BIT_FINDER */</div><div class='add'>+</div><div class='ctx'> /* Generic (power-of-two) rounding */</div><div class='ctx'> </div><div class='add'>+#define ACPI_ROUND_UP_POWER_OF_TWO_8(a)     ((u8) \</div><div class='add'>+											(((u16) 1) &lt;&lt;  ACPI_FIND_LAST_BIT_8  ((a)  - 1)))</div><div class='add'>+#define ACPI_ROUND_DOWN_POWER_OF_TWO_8(a)   ((u8) \</div><div class='add'>+											(((u16) 1) &lt;&lt; (ACPI_FIND_LAST_BIT_8  ((a)) - 1)))</div><div class='add'>+#define ACPI_ROUND_UP_POWER_OF_TWO_16(a)    ((u16) \</div><div class='add'>+											(((u32) 1) &lt;&lt;  ACPI_FIND_LAST_BIT_16 ((a)  - 1)))</div><div class='add'>+#define ACPI_ROUND_DOWN_POWER_OF_TWO_16(a)  ((u16) \</div><div class='add'>+											(((u32) 1) &lt;&lt; (ACPI_FIND_LAST_BIT_16 ((a)) - 1)))</div><div class='add'>+#define ACPI_ROUND_UP_POWER_OF_TWO_32(a)    ((u32) \</div><div class='add'>+											(((u64) 1) &lt;&lt;  ACPI_FIND_LAST_BIT_32 ((a)  - 1)))</div><div class='add'>+#define ACPI_ROUND_DOWN_POWER_OF_TWO_32(a)  ((u32) \</div><div class='add'>+											(((u64) 1) &lt;&lt; (ACPI_FIND_LAST_BIT_32 ((a)) - 1)))</div><div class='ctx'> #define ACPI_IS_ALIGNED(a, s)               (((a) &amp; ((s) - 1)) == 0)</div><div class='ctx'> #define ACPI_IS_POWER_OF_TWO(a)             ACPI_IS_ALIGNED(a, a)</div><div class='ctx'> </div><div class='hunk'>@@ -270,8 +332,8 @@</div><div class='ctx'>  * Bit positions start at zero.</div><div class='ctx'>  * MASK_BITS_ABOVE creates a mask starting AT the position and above</div><div class='ctx'>  * MASK_BITS_BELOW creates a mask starting one bit BELOW the position</div><div class='del'>- * MASK_BITS_ABOVE/BELOW accpets a bit offset to create a mask</div><div class='del'>- * MASK_BITS_ABOVE/BELOW_32/64 accpets a bit width to create a mask</div><div class='add'>+ * MASK_BITS_ABOVE/BELOW accepts a bit offset to create a mask</div><div class='add'>+ * MASK_BITS_ABOVE/BELOW_32/64 accepts a bit width to create a mask</div><div class='ctx'>  * Note: The ACPI_INTEGER_BIT_SIZE check is used to bypass compiler</div><div class='ctx'>  * differences with the shift operator</div><div class='ctx'>  */</div><div class='hunk'>@@ -389,7 +451,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #ifndef ACPI_NO_ERROR_MESSAGES</div><div class='ctx'> /*</div><div class='del'>- * Error reporting. Callers module and line number are inserted by AE_INFO,</div><div class='add'>+ * Error reporting. The callers module and line number are inserted by AE_INFO,</div><div class='ctx'>  * the plist contains a set of parens to allow variable-length lists.</div><div class='ctx'>  * These macros are used for both the debug and non-debug versions of the code.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h<br/>index bb7fca1c8ba3..54a0c51b3e37 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acnamesp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acnamesp.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acnamesp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acnamesp.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -292,6 +292,9 @@ char *acpi_ns_get_normalized_pathname(struct acpi_namespace_node *node,</div><div class='ctx'> char *acpi_ns_name_of_current_scope(struct acpi_walk_state *walk_state);</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='add'>+acpi_ns_handle_to_name(acpi_handle target_handle, struct acpi_buffer *buffer);</div><div class='add'>+</div><div class='add'>+acpi_status</div><div class='ctx'> acpi_ns_handle_to_pathname(acpi_handle target_handle,</div><div class='ctx'> 			   struct acpi_buffer *buffer, u8 no_trailing);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h<br/>index 094b042678f7..27c3f982d810 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acobject.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acobject.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acobject.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acobject.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h<br/>index ca4bda1a60be..e758f098ff4b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acopcode.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acopcode.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acopcode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acopcode.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -92,7 +92,7 @@</div><div class='ctx'> #define ARGP_BYTELIST_OP                ARGP_LIST1 (ARGP_NAMESTRING)</div><div class='ctx'> #define ARGP_CONCAT_OP                  ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)</div><div class='ctx'> #define ARGP_CONCAT_RES_OP              ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)</div><div class='del'>-#define ARGP_COND_REF_OF_OP             ARGP_LIST2 (ARGP_NAME_OR_REF,ARGP_TARGET)</div><div class='add'>+#define ARGP_COND_REF_OF_OP             ARGP_LIST2 (ARGP_SIMPLENAME, ARGP_TARGET)</div><div class='ctx'> #define ARGP_CONNECTFIELD_OP            ARGP_LIST1 (ARGP_NAMESTRING)</div><div class='ctx'> #define ARGP_CONTINUE_OP                ARG_NONE</div><div class='ctx'> #define ARGP_COPY_OP                    ARGP_LIST2 (ARGP_TERMARG,    ARGP_SIMPLENAME)</div><div class='hunk'>@@ -105,7 +105,7 @@</div><div class='ctx'> #define ARGP_DATA_REGION_OP             ARGP_LIST4 (ARGP_NAME,       ARGP_TERMARG,       ARGP_TERMARG,   ARGP_TERMARG)</div><div class='ctx'> #define ARGP_DEBUG_OP                   ARG_NONE</div><div class='ctx'> #define ARGP_DECREMENT_OP               ARGP_LIST1 (ARGP_SUPERNAME)</div><div class='del'>-#define ARGP_DEREF_OF_OP                ARGP_LIST1 (ARGP_TERMARG)</div><div class='add'>+#define ARGP_DEREF_OF_OP                ARGP_LIST1 (ARGP_SUPERNAME)</div><div class='ctx'> #define ARGP_DEVICE_OP                  ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_OBJLIST)</div><div class='ctx'> #define ARGP_DIVIDE_OP                  ARGP_LIST4 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET,    ARGP_TARGET)</div><div class='ctx'> #define ARGP_DWORD_OP                   ARGP_LIST1 (ARGP_DWORDDATA)</div><div class='hunk'>@@ -152,14 +152,14 @@</div><div class='ctx'> #define ARGP_NAMEPATH_OP                ARGP_LIST1 (ARGP_NAMESTRING)</div><div class='ctx'> #define ARGP_NOOP_OP                    ARG_NONE</div><div class='ctx'> #define ARGP_NOTIFY_OP                  ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_TERMARG)</div><div class='del'>-#define ARGP_OBJECT_TYPE_OP             ARGP_LIST1 (ARGP_NAME_OR_REF)</div><div class='add'>+#define ARGP_OBJECT_TYPE_OP             ARGP_LIST1 (ARGP_SIMPLENAME)</div><div class='ctx'> #define ARGP_ONE_OP                     ARG_NONE</div><div class='ctx'> #define ARGP_ONES_OP                    ARG_NONE</div><div class='ctx'> #define ARGP_PACKAGE_OP                 ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_BYTEDATA,      ARGP_DATAOBJLIST)</div><div class='ctx'> #define ARGP_POWER_RES_OP               ARGP_LIST5 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_BYTEDATA,  ARGP_WORDDATA,  ARGP_OBJLIST)</div><div class='ctx'> #define ARGP_PROCESSOR_OP               ARGP_LIST6 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_BYTEDATA,  ARGP_DWORDDATA, ARGP_BYTEDATA,  ARGP_OBJLIST)</div><div class='ctx'> #define ARGP_QWORD_OP                   ARGP_LIST1 (ARGP_QWORDDATA)</div><div class='del'>-#define ARGP_REF_OF_OP                  ARGP_LIST1 (ARGP_NAME_OR_REF)</div><div class='add'>+#define ARGP_REF_OF_OP                  ARGP_LIST1 (ARGP_SIMPLENAME)</div><div class='ctx'> #define ARGP_REGION_OP                  ARGP_LIST4 (ARGP_NAME,       ARGP_BYTEDATA,      ARGP_TERMARG,   ARGP_TERMARG)</div><div class='ctx'> #define ARGP_RELEASE_OP                 ARGP_LIST1 (ARGP_SUPERNAME)</div><div class='ctx'> #define ARGP_RESERVEDFIELD_OP           ARGP_LIST1 (ARGP_NAMESTRING)</div><div class='hunk'>@@ -249,7 +249,7 @@</div><div class='ctx'> #define ARGI_FIELD_OP                   ARGI_INVALID_OPCODE</div><div class='ctx'> #define ARGI_FIND_SET_LEFT_BIT_OP       ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)</div><div class='ctx'> #define ARGI_FIND_SET_RIGHT_BIT_OP      ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)</div><div class='del'>-#define ARGI_FROM_BCD_OP                ARGI_LIST2 (ARGI_INTEGER,    ARGI_FIXED_TARGET)</div><div class='add'>+#define ARGI_FROM_BCD_OP                ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)</div><div class='ctx'> #define ARGI_IF_OP                      ARGI_INVALID_OPCODE</div><div class='ctx'> #define ARGI_INCREMENT_OP               ARGI_LIST1 (ARGI_TARGETREF)</div><div class='ctx'> #define ARGI_INDEX_FIELD_OP             ARGI_INVALID_OPCODE</div><div class='hunk'>@@ -313,12 +313,12 @@</div><div class='ctx'> #define ARGI_SUBTRACT_OP                ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)</div><div class='ctx'> #define ARGI_THERMAL_ZONE_OP            ARGI_INVALID_OPCODE</div><div class='ctx'> #define ARGI_TIMER_OP                   ARG_NONE</div><div class='del'>-#define ARGI_TO_BCD_OP                  ARGI_LIST2 (ARGI_INTEGER,    ARGI_FIXED_TARGET)</div><div class='del'>-#define ARGI_TO_BUFFER_OP               ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)</div><div class='del'>-#define ARGI_TO_DEC_STR_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)</div><div class='del'>-#define ARGI_TO_HEX_STR_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)</div><div class='del'>-#define ARGI_TO_INTEGER_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)</div><div class='del'>-#define ARGI_TO_STRING_OP               ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_FIXED_TARGET)</div><div class='add'>+#define ARGI_TO_BCD_OP                  ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)</div><div class='add'>+#define ARGI_TO_BUFFER_OP               ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_TARGETREF)</div><div class='add'>+#define ARGI_TO_DEC_STR_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_TARGETREF)</div><div class='add'>+#define ARGI_TO_HEX_STR_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_TARGETREF)</div><div class='add'>+#define ARGI_TO_INTEGER_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_TARGETREF)</div><div class='add'>+#define ARGI_TO_STRING_OP               ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_TARGETREF)</div><div class='ctx'> #define ARGI_UNLOAD_OP                  ARGI_LIST1 (ARGI_DDBHANDLE)</div><div class='ctx'> #define ARGI_VAR_PACKAGE_OP             ARGI_LIST1 (ARGI_INTEGER)</div><div class='ctx'> #define ARGI_WAIT_OP                    ARGI_LIST2 (ARGI_EVENT,      ARGI_INTEGER)</div><div class='head'>diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h<br/>index 939d41113970..c23c47328060 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acparser.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acparser.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acparser.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acparser.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h<br/>index 888440b2cf2e..dcfc05d40e36 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acpredef.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acpredef.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acpredef.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acpredef.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h<br/>index 63da1e37caba..b4d22f6e48e2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acresrc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acresrc.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acresrc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acresrc.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h<br/>index 6235642e31d3..62134bdbeda6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acstruct.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acstruct.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acstruct.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acstruct.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h<br/>index e85953b6fa0e..c8da453bd960 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/actables.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/actables.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/actables.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/actables.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -127,10 +127,11 @@ acpi_status</div><div class='ctx'> acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node);</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='del'>-acpi_tb_install_and_load_table(struct acpi_table_header *table,</div><div class='del'>-			       acpi_physical_address address,</div><div class='add'>+acpi_tb_install_and_load_table(acpi_physical_address address,</div><div class='ctx'> 			       u8 flags, u8 override, u32 *table_index);</div><div class='ctx'> </div><div class='add'>+acpi_status acpi_tb_unload_table(u32 table_index);</div><div class='add'>+</div><div class='ctx'> void acpi_tb_terminate(void);</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_tb_delete_namespace_by_owner(u32 table_index);</div><div class='hunk'>@@ -165,6 +166,12 @@ acpi_tb_install_table_with_override(struct acpi_table_desc *new_table_desc,</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_tb_parse_root_table(acpi_physical_address rsdp_address);</div><div class='ctx'> </div><div class='add'>+acpi_status</div><div class='add'>+acpi_tb_get_table(struct acpi_table_desc *table_desc,</div><div class='add'>+		  struct acpi_table_header **out_table);</div><div class='add'>+</div><div class='add'>+void acpi_tb_put_table(struct acpi_table_desc *table_desc);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * tbxfload</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h<br/>index 0a1b53c9ee0e..6f28cfae2212 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/acutils.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/acutils.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/acutils.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/acutils.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -232,6 +232,8 @@ const char *acpi_ut_get_region_name(u8 space_id);</div><div class='ctx'> </div><div class='ctx'> const char *acpi_ut_get_event_name(u32 event_id);</div><div class='ctx'> </div><div class='add'>+const char *acpi_ut_get_argument_type_name(u32 arg_type);</div><div class='add'>+</div><div class='ctx'> char acpi_ut_hex_to_ascii_char(u64 integer, u32 position);</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_ut_ascii_to_hex_byte(char *two_ascii_chars, u8 *return_byte);</div><div class='head'>diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h<br/>index ceb4f7365f7f..b536fd471292 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/amlcode.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/amlcode.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/amlcode.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/amlcode.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -240,6 +240,7 @@</div><div class='ctx'> #define ARGP_QWORDDATA              0x11</div><div class='ctx'> #define ARGP_SIMPLENAME             0x12	/* name_string | local_term | arg_term */</div><div class='ctx'> #define ARGP_NAME_OR_REF            0x13	/* For object_type only */</div><div class='add'>+#define ARGP_MAX                    0x13</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Resolved argument types for the AML Interpreter</div><div class='hunk'>@@ -276,9 +277,23 @@</div><div class='ctx'> #define ARGI_DEVICE_REF             0x0D</div><div class='ctx'> #define ARGI_REFERENCE              0x0E</div><div class='ctx'> #define ARGI_TARGETREF              0x0F	/* Target, subject to implicit conversion */</div><div class='del'>-#define ARGI_FIXED_TARGET           0x10	/* Target, no implicit conversion */</div><div class='del'>-#define ARGI_SIMPLE_TARGET          0x11	/* Name, Local, Arg -- no implicit conversion */</div><div class='del'>-#define ARGI_STORE_TARGET           0x12	/* Target for store is TARGETREF + package objects */</div><div class='add'>+#define ARGI_SIMPLE_TARGET          0x10	/* Name, Local, Arg -- no implicit conversion */</div><div class='add'>+#define ARGI_STORE_TARGET           0x11	/* Target for store is TARGETREF + package objects */</div><div class='add'>+/*</div><div class='add'>+ * #define ARGI_FIXED_TARGET           0x10     Target, no implicit conversion</div><div class='add'>+ *</div><div class='add'>+ * Removed 10/2016. ARGI_FIXED_TARGET was used for these operators:</div><div class='add'>+ *      from_BCD</div><div class='add'>+ *      to_BCD</div><div class='add'>+ *      to_decimal_string</div><div class='add'>+ *      to_hex_string</div><div class='add'>+ *      to_integer</div><div class='add'>+ *      to_buffer</div><div class='add'>+ * The purpose of this type was to disable "implicit result conversion",</div><div class='add'>+ * but this was incorrect per the ACPI spec and other ACPI implementations.</div><div class='add'>+ * These operators now have the target operand defined as a normal</div><div class='add'>+ * ARGI_TARGETREF.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> /* Multiple/complex types */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h<br/>index dee6c7ea4773..653a3d1ef5d5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/amlresrc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/amlresrc.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/amlresrc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/amlresrc.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbcmds.c b/drivers/acpi/acpica/dbcmds.c<br/>index 62bd446535f5..5984b90eb590 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbcmds.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbcmds.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbcmds.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbcmds.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbconvert.c b/drivers/acpi/acpica/dbconvert.c<br/>index 147ce8894f76..857dbc43a9b1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbconvert.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbconvert.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbconvert.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbconvert.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -242,7 +242,7 @@ acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object)</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Convert a typed and tokenized string to an union acpi_object. Typing:</div><div class='add'>+ * DESCRIPTION: Convert a typed and tokenized string to a union acpi_object. Typing:</div><div class='ctx'>  *              1) String objects were surrounded by quotes.</div><div class='ctx'>  *              2) Buffer objects were surrounded by parentheses.</div><div class='ctx'>  *              3) Package objects were surrounded by brackets "[]".</div><div class='head'>diff --git a/drivers/acpi/acpica/dbdisply.c b/drivers/acpi/acpica/dbdisply.c<br/>index 502bb587f112..46bf270ac525 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbdisply.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbdisply.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbdisply.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbdisply.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbexec.c b/drivers/acpi/acpica/dbexec.c<br/>index fe3da7c31bb7..b611cd92b5f5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbexec.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbexec.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbexec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbexec.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbfileio.c b/drivers/acpi/acpica/dbfileio.c<br/>index 6f05b8c271a5..4d81ea291d93 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbfileio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbfileio.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbfileio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbfileio.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbhistry.c b/drivers/acpi/acpica/dbhistry.c<br/>index 46bd65d38df9..7d08974c64c2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbhistry.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbhistry.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbhistry.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbhistry.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbinput.c b/drivers/acpi/acpica/dbinput.c<br/>index 068214f9cc9d..2626d79db064 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbinput.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbinput.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbinput.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbinput.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbmethod.c b/drivers/acpi/acpica/dbmethod.c<br/>index 314b94cf086a..15c8237b8a80 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbmethod.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbmethod.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbmethod.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbmethod.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbnames.c b/drivers/acpi/acpica/dbnames.c<br/>index 8667f14d535e..8c207c772517 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbnames.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbnames.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbnames.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbnames.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbobject.c b/drivers/acpi/acpica/dbobject.c<br/>index 08eaaf350b24..f2252b1ac0b3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbobject.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbobject.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbobject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbobject.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbstats.c b/drivers/acpi/acpica/dbstats.c<br/>index a414e1fa6f9d..99fb0160b8fb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbstats.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbstats.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbstats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbstats.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbtest.c b/drivers/acpi/acpica/dbtest.c<br/>index 74aa38156cdc..c6bee6143266 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbtest.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbtest.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbtest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbtest.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbutils.c b/drivers/acpi/acpica/dbutils.c<br/>index ae80106d1000..bfa972b64171 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbutils.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbutils.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbutils.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dbxface.c b/drivers/acpi/acpica/dbxface.c<br/>index 124db237775d..205b8e0eded5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dbxface.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dbxface.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dbxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dbxface.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -430,7 +430,7 @@ acpi_status acpi_initialize_debugger(void)</div><div class='ctx'> </div><div class='ctx'> 		/* These were created with one unit, grab it */</div><div class='ctx'> </div><div class='del'>-		status = acpi_os_initialize_command_signals();</div><div class='add'>+		status = acpi_os_initialize_debugger();</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			acpi_os_printf("Could not get debugger mutex\n");</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='hunk'>@@ -482,7 +482,7 @@ void acpi_terminate_debugger(void)</div><div class='ctx'> 			acpi_os_sleep(100);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		acpi_os_terminate_command_signals();</div><div class='add'>+		acpi_os_terminate_debugger();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_gbl_db_buffer) {</div><div class='head'>diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c<br/>index ad0413beeeae..287b3fd73cfc 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dsargs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dsargs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dsargs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsargs.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dscontrol.c b/drivers/acpi/acpica/dscontrol.c<br/>index 4ddcbf100234..d31b49feaa79 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dscontrol.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dscontrol.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dscontrol.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dscontrol.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dsdebug.c b/drivers/acpi/acpica/dsdebug.c<br/>index 56c3aadb4cba..4d885eb8eda9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dsdebug.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dsdebug.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dsdebug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsdebug.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c<br/>index 6a4b603d0e83..c5dccc54307d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dsfield.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dsfield.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dsfield.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsfield.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c<br/>index 54d48b90de2c..b1842dd4edf7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dsinit.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dsinit.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dsinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsinit.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -221,8 +221,8 @@ acpi_ds_initialize_objects(u32 table_index,</div><div class='ctx'> 	 */</div><div class='ctx'> 	status =</div><div class='ctx'> 	    acpi_ns_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX,</div><div class='del'>-				   0, acpi_ds_init_one_object, NULL, &amp;info,</div><div class='del'>-				   NULL);</div><div class='add'>+				   ACPI_NS_WALK_NO_UNLOCK,</div><div class='add'>+				   acpi_ds_init_one_object, NULL, &amp;info, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c<br/>index 2b3210f42a46..31c9c7aec3d5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dsmethod.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dsmethod.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dsmethod.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsmethod.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c<br/>index 45cbebaa32c0..adcc72cd53a7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dsmthdat.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dsmthdat.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dsmthdat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsmthdat.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c<br/>index a91de2b4603c..8deaa16493a0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dsobject.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dsobject.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dsobject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsobject.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c<br/>index 4cc9d989a114..148523205d41 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dsopcode.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dsopcode.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dsopcode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsopcode.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -84,7 +84,7 @@ acpi_status acpi_ds_initialize_region(acpi_handle obj_handle)</div><div class='ctx'> </div><div class='ctx'> 	/* Namespace is NOT locked */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ev_initialize_region(obj_desc, FALSE);</div><div class='add'>+	status = acpi_ev_initialize_region(obj_desc);</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c<br/>index 7d8ef52fb88d..049fbab4e5a6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dsutils.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dsutils.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dsutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dsutils.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c<br/>index 438597cf6cc5..78f8e6a4f72f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dswexec.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dswexec.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dswexec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dswexec.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c<br/>index fd34040d4f44..cafb3ab567ab 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dswload.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dswload.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dswload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dswload.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c<br/>index e36218206bb0..44d4553dfbdd 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dswload2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dswload2.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dswload2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dswload2.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -609,18 +609,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 			status =</div><div class='ctx'> 			    acpi_ev_initialize_region</div><div class='del'>-			    (acpi_ns_get_attached_object(node), FALSE);</div><div class='del'>-</div><div class='del'>-			if (ACPI_FAILURE(status)) {</div><div class='del'>-				/*</div><div class='del'>-				 *  If AE_NOT_EXIST is returned, it is not fatal</div><div class='del'>-				 *  because many regions get created before a handler</div><div class='del'>-				 *  is installed for said region.</div><div class='del'>-				 */</div><div class='del'>-				if (AE_NOT_EXIST == status) {</div><div class='del'>-					status = AE_OK;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+			    (acpi_ns_get_attached_object(node));</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case AML_NAME_OP:</div><div class='head'>diff --git a/drivers/acpi/acpica/dswscope.c b/drivers/acpi/acpica/dswscope.c<br/>index 9f32e08a07d9..3e081983d2ee 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dswscope.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dswscope.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dswscope.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dswscope.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c<br/>index e3338698e56b..da111a1f5bfb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/dswstate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/dswstate.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/dswstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/dswstate.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evevent.c b/drivers/acpi/acpica/evevent.c<br/>index 80fc0b9b11e5..d3b6b314fa50 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evevent.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evevent.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evevent.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evevent.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evglock.c b/drivers/acpi/acpica/evglock.c<br/>index 9f015782cdd3..0ce33b0f430c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evglock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evglock.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evglock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evglock.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c<br/>index bdb10bee13ce..229382035550 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evgpe.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evgpe.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evgpe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evgpe.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c<br/>index d54014cab01d..9c941947a063 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evgpeblk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evgpeblk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evgpeblk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evgpeblk.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c<br/>index 16ce4835e7d0..8649c6242478 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evgpeinit.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evgpeinit.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evgpeinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evgpeinit.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c<br/>index 3f150d567e64..c8adb400330a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evgpeutil.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evgpeutil.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evgpeutil.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evgpeutil.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evhandler.c b/drivers/acpi/acpica/evhandler.c<br/>index 24768ca03f19..2db61ef1b4a3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evhandler.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evhandler.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evhandler.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evhandler.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c<br/>index f51d43adb7d1..4f6bb3f016ab 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evmisc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evmisc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evmisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evmisc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c<br/>index 4c6f79514040..28b447ff92df 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evregion.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evregion.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evregion.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evregion.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c<br/>index 75ddd160a716..93ec528bcd9a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evrgnini.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evrgnini.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evrgnini.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evrgnini.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -479,7 +479,6 @@ acpi_ev_default_region_setup(acpi_handle handle,</div><div class='ctx'>  * FUNCTION:    acpi_ev_initialize_region</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  region_obj      - Region we are initializing</div><div class='del'>- *              acpi_ns_locked  - Is namespace locked?</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='hunk'>@@ -497,19 +496,28 @@ acpi_ev_default_region_setup(acpi_handle handle,</div><div class='ctx'>  * MUTEX:       Interpreter should be unlocked, because we may run the _REG</div><div class='ctx'>  *              method for this region.</div><div class='ctx'>  *</div><div class='add'>+ * NOTE:        Possible incompliance:</div><div class='add'>+ *              There is a behavior conflict in automatic _REG execution:</div><div class='add'>+ *              1. When the interpreter is evaluating a method, we can only</div><div class='add'>+ *                 automatically run _REG for the following case:</div><div class='add'>+ *                   operation_region (OPR1, 0x80, 0x1000010, 0x4)</div><div class='add'>+ *              2. When the interpreter is loading a table, we can also</div><div class='add'>+ *                 automatically run _REG for the following case:</div><div class='add'>+ *                   operation_region (OPR1, 0x80, 0x1000010, 0x4)</div><div class='add'>+ *              Though this may not be compliant to the de-facto standard, the</div><div class='add'>+ *              logic is kept in order not to trigger regressions. And keeping</div><div class='add'>+ *              this logic should be taken care by the caller of this function.</div><div class='add'>+ *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-acpi_status</div><div class='del'>-acpi_ev_initialize_region(union acpi_operand_object *region_obj,</div><div class='del'>-			  u8 acpi_ns_locked)</div><div class='add'>+acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_operand_object *handler_obj;</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_adr_space_type space_id;</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='del'>-	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32(ev_initialize_region, acpi_ns_locked);</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_initialize_region);</div><div class='ctx'> </div><div class='ctx'> 	if (!region_obj) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -580,39 +588,17 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,</div><div class='ctx'> 						  handler_obj, region_obj,</div><div class='ctx'> 						  obj_desc));</div><div class='ctx'> </div><div class='del'>-				status =</div><div class='del'>-				    acpi_ev_attach_region(handler_obj,</div><div class='del'>-							  region_obj,</div><div class='del'>-							  acpi_ns_locked);</div><div class='add'>+				(void)acpi_ev_attach_region(handler_obj,</div><div class='add'>+							    region_obj, FALSE);</div><div class='ctx'> </div><div class='ctx'> 				/*</div><div class='ctx'> 				 * Tell all users that this region is usable by</div><div class='ctx'> 				 * running the _REG method</div><div class='ctx'> 				 */</div><div class='del'>-				if (acpi_ns_locked) {</div><div class='del'>-					status =</div><div class='del'>-					    acpi_ut_release_mutex</div><div class='del'>-					    (ACPI_MTX_NAMESPACE);</div><div class='del'>-					if (ACPI_FAILURE(status)) {</div><div class='del'>-						return_ACPI_STATUS(status);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-</div><div class='ctx'> 				acpi_ex_exit_interpreter();</div><div class='del'>-				status =</div><div class='del'>-				    acpi_ev_execute_reg_method(region_obj,</div><div class='del'>-							       ACPI_REG_CONNECT);</div><div class='add'>+				(void)acpi_ev_execute_reg_method(region_obj,</div><div class='add'>+								 ACPI_REG_CONNECT);</div><div class='ctx'> 				acpi_ex_enter_interpreter();</div><div class='del'>-</div><div class='del'>-				if (acpi_ns_locked) {</div><div class='del'>-					status =</div><div class='del'>-					    acpi_ut_acquire_mutex</div><div class='del'>-					    (ACPI_MTX_NAMESPACE);</div><div class='del'>-					if (ACPI_FAILURE(status)) {</div><div class='del'>-						return_ACPI_STATUS(status);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-</div><div class='ctx'> 				return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -622,12 +608,15 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,</div><div class='ctx'> 		node = node-&gt;parent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If we get here, there is no handler for this region */</div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * If we get here, there is no handler for this region. This is not</div><div class='add'>+	 * fatal because many regions get created before a handler is installed</div><div class='add'>+	 * for said region.</div><div class='add'>+	 */</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,</div><div class='ctx'> 			  "No handler for RegionType %s(%X) (RegionObj %p)\n",</div><div class='ctx'> 			  acpi_ut_get_region_name(space_id), space_id,</div><div class='ctx'> 			  region_obj));</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_NOT_EXIST);</div><div class='add'>+	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c<br/>index 3b7757c9c916..8ce73b962006 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evsci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evsci.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evsci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evsci.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c<br/>index e4e9260cdc57..dd1b9dd64cef 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evxface.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evxface.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evxface.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c<br/>index 9179e9abe3db..82e8971f23a4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evxfevnt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evxfevnt.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evxfevnt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evxfevnt.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c<br/>index d7a3b2775505..57718a3e029a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evxfgpe.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evxfgpe.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evxfgpe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evxfgpe.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c<br/>index d2743067126a..beba9d56a0d8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/evxfregn.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/evxfregn.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/evxfregn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/evxfregn.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exconcat.c b/drivers/acpi/acpica/exconcat.c<br/>index 5429c2a6bc41..76bfb7dcae2f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exconcat.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exconcat.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exconcat.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exconcat.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c<br/>index 718428ba0b89..61813bd43f9e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exconfig.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exconfig.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exconfig.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exconfig.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -437,10 +437,9 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,</div><div class='ctx'> </div><div class='ctx'> 	ACPI_INFO(("Dynamic OEM Table Load:"));</div><div class='ctx'> 	acpi_ex_exit_interpreter();</div><div class='del'>-	status =</div><div class='del'>-	    acpi_tb_install_and_load_table(table, ACPI_PTR_TO_PHYSADDR(table),</div><div class='del'>-					   ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL,</div><div class='del'>-					   TRUE, &amp;table_index);</div><div class='add'>+	status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table),</div><div class='add'>+						ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL,</div><div class='add'>+						TRUE, &amp;table_index);</div><div class='ctx'> 	acpi_ex_enter_interpreter();</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> </div><div class='hunk'>@@ -500,7 +499,6 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_operand_object *table_desc = ddb_handle;</div><div class='ctx'> 	u32 table_index;</div><div class='del'>-	struct acpi_table_header *table;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(ex_unload_table);</div><div class='ctx'> </div><div class='hunk'>@@ -537,39 +535,7 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)</div><div class='ctx'> 	 * strict order requirement against it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	acpi_ex_exit_interpreter();</div><div class='del'>-</div><div class='del'>-	/* Ensure the table is still loaded */</div><div class='del'>-</div><div class='del'>-	if (!acpi_tb_is_table_loaded(table_index)) {</div><div class='del'>-		status = AE_NOT_EXIST;</div><div class='del'>-		goto lock_and_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Invoke table handler if present */</div><div class='del'>-</div><div class='del'>-	if (acpi_gbl_table_handler) {</div><div class='del'>-		status = acpi_get_table_by_index(table_index, &amp;table);</div><div class='del'>-		if (ACPI_SUCCESS(status)) {</div><div class='del'>-			(void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_UNLOAD,</div><div class='del'>-						     table,</div><div class='del'>-						     acpi_gbl_table_handler_context);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Delete the portion of the namespace owned by this table */</div><div class='del'>-</div><div class='del'>-	status = acpi_tb_delete_namespace_by_owner(table_index);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		goto lock_and_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	(void)acpi_tb_release_owner_id(table_index);</div><div class='del'>-	acpi_tb_set_table_loaded_flag(table_index, FALSE);</div><div class='del'>-</div><div class='del'>-lock_and_exit:</div><div class='del'>-</div><div class='del'>-	/* Re-acquire the interpreter lock */</div><div class='del'>-</div><div class='add'>+	status = acpi_tb_unload_table(table_index);</div><div class='ctx'> 	acpi_ex_enter_interpreter();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c<br/>index 588ad1409dbe..f71028e334ee 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exconvrt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exconvrt.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exconvrt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exconvrt.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -592,7 +592,6 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (GET_CURRENT_ARG_TYPE(walk_state-&gt;op_info-&gt;runtime_args)) {</div><div class='ctx'> 	case ARGI_SIMPLE_TARGET:</div><div class='del'>-	case ARGI_FIXED_TARGET:</div><div class='ctx'> 	case ARGI_INTEGER_REF:	/* Handles Increment, Decrement cases */</div><div class='ctx'> </div><div class='ctx'> 		switch (destination_type) {</div><div class='head'>diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c<br/>index 613ba6eb08bb..d43d7da4c734 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/excreate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/excreate.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/excreate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/excreate.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c<br/>index 37a509d016da..ec614f5a3bcb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exdebug.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exdebug.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exdebug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exdebug.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c<br/>index fce6b2e10209..970dc6c53994 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exdump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exdump.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exdump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exdump.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c<br/>index d7d3ee36338b..5fda981f6498 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exfield.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exfield.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exfield.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exfield.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c<br/>index ee76d299b3d0..a656608dca84 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exfldio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exfldio.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exfldio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exfldio.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c<br/>index 37c88b424a02..1a6f59079ea5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exmisc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exmisc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exmisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exmisc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c<br/>index 26faa91e930c..ecd95b3f35f1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exmutex.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exmutex.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exmutex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exmutex.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c<br/>index 3d6af93fe561..ee7b62a86661 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exnames.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exnames.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exnames.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exnames.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c<br/>index 007300433cde..af73fcde7e5c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exoparg1.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exoparg1.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exoparg1.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exoparg1.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c<br/>index 79ef3b6811a9..44ecba50c0da 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exoparg2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exoparg2.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exoparg2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exoparg2.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c<br/>index 69e4e269ad2f..ce857addc8db 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exoparg3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exoparg3.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exoparg3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exoparg3.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exoparg6.c b/drivers/acpi/acpica/exoparg6.c<br/>index 786d53b0bb37..31e4df97cbe1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exoparg6.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exoparg6.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exoparg6.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exoparg6.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c<br/>index aed8d3459220..8de060664204 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exprep.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exprep.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exprep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exprep.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c<br/>index 31b381cae94d..7bcc9d809b7e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exregion.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exregion.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exregion.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exregion.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c<br/>index a183cb740d24..91c1de046442 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exresnte.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exresnte.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exresnte.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exresnte.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c<br/>index e1d3878be2c6..7fecefc2e1b4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exresolv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exresolv.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exresolv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exresolv.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c<br/>index f29eba1dc5e9..c4852429e2ff 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exresop.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exresop.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exresop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exresop.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -305,7 +305,6 @@ acpi_ex_resolve_operands(u16 opcode,</div><div class='ctx'> 		case ARGI_OBJECT_REF:</div><div class='ctx'> 		case ARGI_DEVICE_REF:</div><div class='ctx'> 		case ARGI_TARGETREF:	/* Allows implicit conversion rules before store */</div><div class='del'>-		case ARGI_FIXED_TARGET:	/* No implicit conversion before store to target */</div><div class='ctx'> 		case ARGI_SIMPLE_TARGET:	/* Name, Local, or arg - no implicit conversion  */</div><div class='ctx'> 		case ARGI_STORE_TARGET:</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c<br/>index cd70cbcf6de6..a2f8001aeb86 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exstore.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exstore.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exstore.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exstore.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exstoren.c b/drivers/acpi/acpica/exstoren.c<br/>index 13bbb2b241a3..85db4716a043 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exstoren.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exstoren.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exstoren.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exstoren.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exstorob.c b/drivers/acpi/acpica/exstorob.c<br/>index 1dab82746d06..4ba7fcbf23b0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exstorob.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exstorob.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exstorob.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exstorob.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c<br/>index ac09c31cc70e..ad3b610057f3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exsystem.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exsystem.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exsystem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exsystem.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/extrace.c b/drivers/acpi/acpica/extrace.c<br/>index c9ca82610d77..ae9df8672d9e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/extrace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/extrace.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/extrace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/extrace.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c<br/>index a8b857a7e9fb..34d608358eaf 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/exutils.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/exutils.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/exutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/exutils.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c<br/>index 3ebbb09030b4..fad249e774b4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/hwacpi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/hwacpi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/hwacpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwacpi.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/hwesleep.c b/drivers/acpi/acpica/hwesleep.c<br/>index 3f2fb4b31fdc..12626d021a9b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/hwesleep.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/hwesleep.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/hwesleep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwesleep.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -43,7 +43,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='del'>-#include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include "accommon.h"</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_HARDWARE</div><div class='hunk'>@@ -103,7 +102,7 @@ void acpi_hw_execute_sleep_method(char *method_pathname, u32 integer_argument)</div><div class='ctx'> acpi_status acpi_hw_extended_sleep(u8 sleep_state)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	u8 sleep_type_value;</div><div class='add'>+	u8 sleep_control;</div><div class='ctx'> 	u64 sleep_status;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(hw_extended_sleep);</div><div class='hunk'>@@ -125,18 +124,6 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state)</div><div class='ctx'> </div><div class='ctx'> 	acpi_gbl_system_awake_and_running = FALSE;</div><div class='ctx'> </div><div class='del'>-	/* Flush caches, as per ACPI specification */</div><div class='del'>-</div><div class='del'>-	ACPI_FLUSH_CPU_CACHE();</div><div class='del'>-</div><div class='del'>-	status = acpi_os_prepare_extended_sleep(sleep_state,</div><div class='del'>-						acpi_gbl_sleep_type_a,</div><div class='del'>-						acpi_gbl_sleep_type_b);</div><div class='del'>-	if (ACPI_SKIP(status))</div><div class='del'>-		return_ACPI_STATUS(AE_OK);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set the SLP_TYP and SLP_EN bits.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -146,12 +133,22 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state)</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INIT,</div><div class='ctx'> 			  "Entering sleep state [S%u]\n", sleep_state));</div><div class='ctx'> </div><div class='del'>-	sleep_type_value =</div><div class='del'>-	    ((acpi_gbl_sleep_type_a &lt;&lt; ACPI_X_SLEEP_TYPE_POSITION) &amp;</div><div class='del'>-	     ACPI_X_SLEEP_TYPE_MASK);</div><div class='add'>+	sleep_control = ((acpi_gbl_sleep_type_a &lt;&lt; ACPI_X_SLEEP_TYPE_POSITION) &amp;</div><div class='add'>+			 ACPI_X_SLEEP_TYPE_MASK) | ACPI_X_SLEEP_ENABLE;</div><div class='add'>+</div><div class='add'>+	/* Flush caches, as per ACPI specification */</div><div class='add'>+</div><div class='add'>+	ACPI_FLUSH_CPU_CACHE();</div><div class='add'>+</div><div class='add'>+	status = acpi_os_enter_sleep(sleep_state, sleep_control, 0);</div><div class='add'>+	if (status == AE_CTRL_TERMINATE) {</div><div class='add'>+		return_ACPI_STATUS(AE_OK);</div><div class='add'>+	}</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_write((u64)(sleep_type_value | ACPI_X_SLEEP_ENABLE),</div><div class='del'>-			    &amp;acpi_gbl_FADT.sleep_control);</div><div class='add'>+	status = acpi_write((u64)sleep_control, &amp;acpi_gbl_FADT.sleep_control);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c<br/>index 76b0e350f5bb..5eb11b30a79e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/hwgpe.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/hwgpe.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/hwgpe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwgpe.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/hwpci.c b/drivers/acpi/acpica/hwpci.c<br/>index 3dd60c96aa07..283819930be6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/hwpci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/hwpci.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/hwpci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwpci.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c<br/>index 3b7fb99362b6..de74a4c25085 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/hwregs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/hwregs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/hwregs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwregs.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -52,7 +52,8 @@ ACPI_MODULE_NAME("hwregs")</div><div class='ctx'> #if (!ACPI_REDUCED_HARDWARE)</div><div class='ctx'> /* Local Prototypes */</div><div class='ctx'> static u8</div><div class='del'>-acpi_hw_get_access_bit_width(struct acpi_generic_address *reg,</div><div class='add'>+acpi_hw_get_access_bit_width(u64 address,</div><div class='add'>+			     struct acpi_generic_address *reg,</div><div class='ctx'> 			     u8 max_bit_width);</div><div class='ctx'> </div><div class='ctx'> static acpi_status</div><div class='hunk'>@@ -71,7 +72,8 @@ acpi_hw_write_multiple(u32 value,</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_hw_get_access_bit_width</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  reg                 - GAS register structure</div><div class='add'>+ * PARAMETERS:  address             - GAS register address</div><div class='add'>+ *              reg                 - GAS register structure</div><div class='ctx'>  *              max_bit_width       - Max bit_width supported (32 or 64)</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='hunk'>@@ -81,27 +83,59 @@ acpi_hw_write_multiple(u32 value,</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static u8</div><div class='del'>-acpi_hw_get_access_bit_width(struct acpi_generic_address *reg, u8 max_bit_width)</div><div class='add'>+acpi_hw_get_access_bit_width(u64 address,</div><div class='add'>+			     struct acpi_generic_address *reg, u8 max_bit_width)</div><div class='ctx'> {</div><div class='del'>-	if (!reg-&gt;access_width) {</div><div class='del'>-		if (reg-&gt;space_id == ACPI_ADR_SPACE_SYSTEM_IO) {</div><div class='del'>-			max_bit_width = 32;</div><div class='del'>-		}</div><div class='add'>+	u8 access_bit_width;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Detect old register descriptors where only the bit_width field</div><div class='del'>-		 * makes senses.</div><div class='del'>-		 */</div><div class='del'>-		if (reg-&gt;bit_width &lt; max_bit_width &amp;&amp;</div><div class='del'>-		    !reg-&gt;bit_offset &amp;&amp; reg-&gt;bit_width &amp;&amp;</div><div class='del'>-		    ACPI_IS_POWER_OF_TWO(reg-&gt;bit_width) &amp;&amp;</div><div class='del'>-		    ACPI_IS_ALIGNED(reg-&gt;bit_width, 8)) {</div><div class='del'>-			return (reg-&gt;bit_width);</div><div class='del'>-		}</div><div class='del'>-		return (max_bit_width);</div><div class='add'>+	/*</div><div class='add'>+	 * GAS format "register", used by FADT:</div><div class='add'>+	 *  1. Detected if bit_offset is 0 and bit_width is 8/16/32/64;</div><div class='add'>+	 *  2. access_size field is ignored and bit_width field is used for</div><div class='add'>+	 *     determining the boundary of the IO accesses.</div><div class='add'>+	 * GAS format "region", used by APEI registers:</div><div class='add'>+	 *  1. Detected if bit_offset is not 0 or bit_width is not 8/16/32/64;</div><div class='add'>+	 *  2. access_size field is used for determining the boundary of the</div><div class='add'>+	 *     IO accesses;</div><div class='add'>+	 *  3. bit_offset/bit_width fields are used to describe the "region".</div><div class='add'>+	 *</div><div class='add'>+	 * Note: This algorithm assumes that the "Address" fields should always</div><div class='add'>+	 *       contain aligned values.</div><div class='add'>+	 */</div><div class='add'>+	if (!reg-&gt;bit_offset &amp;&amp; reg-&gt;bit_width &amp;&amp;</div><div class='add'>+	    ACPI_IS_POWER_OF_TWO(reg-&gt;bit_width) &amp;&amp;</div><div class='add'>+	    ACPI_IS_ALIGNED(reg-&gt;bit_width, 8)) {</div><div class='add'>+		access_bit_width = reg-&gt;bit_width;</div><div class='add'>+	} else if (reg-&gt;access_width) {</div><div class='add'>+		access_bit_width = (1 &lt;&lt; (reg-&gt;access_width + 2));</div><div class='ctx'> 	} else {</div><div class='del'>-		return (1 &lt;&lt; (reg-&gt;access_width + 2));</div><div class='add'>+		access_bit_width =</div><div class='add'>+		    ACPI_ROUND_UP_POWER_OF_TWO_8(reg-&gt;bit_offset +</div><div class='add'>+						 reg-&gt;bit_width);</div><div class='add'>+		if (access_bit_width &lt;= 8) {</div><div class='add'>+			access_bit_width = 8;</div><div class='add'>+		} else {</div><div class='add'>+			while (!ACPI_IS_ALIGNED(address, access_bit_width &gt;&gt; 3)) {</div><div class='add'>+				access_bit_width &gt;&gt;= 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Maximum IO port access bit width is 32 */</div><div class='add'>+</div><div class='add'>+	if (reg-&gt;space_id == ACPI_ADR_SPACE_SYSTEM_IO) {</div><div class='add'>+		max_bit_width = 32;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Return access width according to the requested maximum access bit width,</div><div class='add'>+	 * as the caller should know the format of the register and may enforce</div><div class='add'>+	 * a 32-bit accesses.</div><div class='add'>+	 */</div><div class='add'>+	if (access_bit_width &lt; max_bit_width) {</div><div class='add'>+		return (access_bit_width);</div><div class='add'>+	}</div><div class='add'>+	return (max_bit_width);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='hunk'>@@ -163,7 +197,8 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,</div><div class='ctx'> </div><div class='ctx'> 	/* Validate the bit_width, convert access_width into number of bits */</div><div class='ctx'> </div><div class='del'>-	access_width = acpi_hw_get_access_bit_width(reg, max_bit_width);</div><div class='add'>+	access_width =</div><div class='add'>+	    acpi_hw_get_access_bit_width(*address, reg, max_bit_width);</div><div class='ctx'> 	bit_width =</div><div class='ctx'> 	    ACPI_ROUND_UP(reg-&gt;bit_offset + reg-&gt;bit_width, access_width);</div><div class='ctx'> 	if (max_bit_width &lt; bit_width) {</div><div class='hunk'>@@ -219,7 +254,7 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)</div><div class='ctx'> 	 * into number of bits based</div><div class='ctx'> 	 */</div><div class='ctx'> 	*value = 0;</div><div class='del'>-	access_width = acpi_hw_get_access_bit_width(reg, 32);</div><div class='add'>+	access_width = acpi_hw_get_access_bit_width(address, reg, 32);</div><div class='ctx'> 	bit_width = reg-&gt;bit_offset + reg-&gt;bit_width;</div><div class='ctx'> 	bit_offset = reg-&gt;bit_offset;</div><div class='ctx'> </div><div class='hunk'>@@ -252,20 +287,6 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)</div><div class='ctx'> 							   &amp;value32,</div><div class='ctx'> 							   access_width);</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Use offset style bit masks because:</div><div class='del'>-			 * bit_offset &lt; access_width/bit_width &lt; access_width, and</div><div class='del'>-			 * access_width is ensured to be less than 32-bits by</div><div class='del'>-			 * acpi_hw_validate_register().</div><div class='del'>-			 */</div><div class='del'>-			if (bit_offset) {</div><div class='del'>-				value32 &amp;= ACPI_MASK_BITS_BELOW(bit_offset);</div><div class='del'>-				bit_offset = 0;</div><div class='del'>-			}</div><div class='del'>-			if (bit_width &lt; access_width) {</div><div class='del'>-				value32 &amp;= ACPI_MASK_BITS_ABOVE(bit_width);</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -306,6 +327,12 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)</div><div class='ctx'> acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)</div><div class='ctx'> {</div><div class='ctx'> 	u64 address;</div><div class='add'>+	u8 access_width;</div><div class='add'>+	u32 bit_width;</div><div class='add'>+	u8 bit_offset;</div><div class='add'>+	u64 value64;</div><div class='add'>+	u32 value32;</div><div class='add'>+	u8 index;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_NAME(hw_write);</div><div class='hunk'>@@ -317,23 +344,61 @@ acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)</div><div class='ctx'> 		return (status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Convert access_width into number of bits based */</div><div class='add'>+</div><div class='add'>+	access_width = acpi_hw_get_access_bit_width(address, reg, 32);</div><div class='add'>+	bit_width = reg-&gt;bit_offset + reg-&gt;bit_width;</div><div class='add'>+	bit_offset = reg-&gt;bit_offset;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Two address spaces supported: Memory or IO. PCI_Config is</div><div class='ctx'> 	 * not supported here because the GAS structure is insufficient</div><div class='ctx'> 	 */</div><div class='del'>-	if (reg-&gt;space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {</div><div class='del'>-		status = acpi_os_write_memory((acpi_physical_address)</div><div class='del'>-					      address, (u64)value,</div><div class='del'>-					      reg-&gt;bit_width);</div><div class='del'>-	} else {		/* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */</div><div class='del'>-</div><div class='del'>-		status = acpi_hw_write_port((acpi_io_address)</div><div class='del'>-					    address, value, reg-&gt;bit_width);</div><div class='add'>+	index = 0;</div><div class='add'>+	while (bit_width) {</div><div class='add'>+		/*</div><div class='add'>+		 * Use offset style bit reads because "Index * AccessWidth" is</div><div class='add'>+		 * ensured to be less than 32-bits by acpi_hw_validate_register().</div><div class='add'>+		 */</div><div class='add'>+		value32 = ACPI_GET_BITS(&amp;value, index * access_width,</div><div class='add'>+					ACPI_MASK_BITS_ABOVE_32(access_width));</div><div class='add'>+</div><div class='add'>+		if (bit_offset &gt;= access_width) {</div><div class='add'>+			bit_offset -= access_width;</div><div class='add'>+		} else {</div><div class='add'>+			if (reg-&gt;space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {</div><div class='add'>+				value64 = (u64)value32;</div><div class='add'>+				status =</div><div class='add'>+				    acpi_os_write_memory((acpi_physical_address)</div><div class='add'>+							 address +</div><div class='add'>+							 index *</div><div class='add'>+							 ACPI_DIV_8</div><div class='add'>+							 (access_width),</div><div class='add'>+							 value64, access_width);</div><div class='add'>+			} else {	/* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */</div><div class='add'>+</div><div class='add'>+				status = acpi_hw_write_port((acpi_io_address)</div><div class='add'>+							    address +</div><div class='add'>+							    index *</div><div class='add'>+							    ACPI_DIV_8</div><div class='add'>+							    (access_width),</div><div class='add'>+							    value32,</div><div class='add'>+							    access_width);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Index * access_width is ensured to be less than 32-bits by</div><div class='add'>+		 * acpi_hw_validate_register().</div><div class='add'>+		 */</div><div class='add'>+		bit_width -=</div><div class='add'>+		    bit_width &gt; access_width ? access_width : bit_width;</div><div class='add'>+		index++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_IO,</div><div class='ctx'> 			  "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",</div><div class='del'>-			  value, reg-&gt;bit_width, ACPI_FORMAT_UINT64(address),</div><div class='add'>+			  value, access_width, ACPI_FORMAT_UINT64(address),</div><div class='ctx'> 			  acpi_ut_get_region_name(reg-&gt;space_id)));</div><div class='ctx'> </div><div class='ctx'> 	return (status);</div><div class='head'>diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c<br/>index d00c9810845b..1fe7387a00e6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/hwsleep.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/hwsleep.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/hwsleep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwsleep.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -43,7 +43,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='del'>-#include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include "accommon.h"</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_HARDWARE</div><div class='hunk'>@@ -152,12 +151,14 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state)</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FLUSH_CPU_CACHE();</div><div class='ctx'> </div><div class='del'>-	status = acpi_os_prepare_sleep(sleep_state, pm1a_control,</div><div class='del'>-				       pm1b_control);</div><div class='del'>-	if (ACPI_SKIP(status))</div><div class='add'>+	status = acpi_os_enter_sleep(sleep_state, pm1a_control, pm1b_control);</div><div class='add'>+	if (status == AE_CTRL_TERMINATE) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='add'>+	}</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Write #2: Write both SLP_TYP + SLP_EN */</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_hw_write_pm1_control(pm1a_control, pm1b_control);</div><div class='head'>diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c<br/>index 04cc9406c7d8..b3c5d8c754bb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/hwtimer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/hwtimer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/hwtimer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwtimer.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c<br/>index ad0a745712a9..531620abed80 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/hwvalid.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/hwvalid.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/hwvalid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwvalid.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c<br/>index 98c26ff39409..34684ae89981 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/hwxface.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/hwxface.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/hwxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwxface.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c<br/>index f76e0eab32b8..5733b1167e46 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/hwxfsleep.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/hwxfsleep.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/hwxfsleep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/hwxfsleep.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c<br/>index 73f98d3fed25..498bb8f70e6b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsaccess.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsaccess.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsaccess.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsaccess.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c<br/>index c2cf73fd3918..8ba5b32c9f71 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsalloc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsalloc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsalloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsalloc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsarguments.c b/drivers/acpi/acpica/nsarguments.c<br/>index f45bff632692..9095d51f6b37 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsarguments.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsarguments.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsarguments.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsarguments.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsconvert.c b/drivers/acpi/acpica/nsconvert.c<br/>index 2b85dee6d4c0..e4a7da8a11f0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsconvert.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsconvert.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsconvert.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsconvert.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c<br/>index 84f35dd27033..4123b5077a7d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsdump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsdump.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsdump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsdump.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c<br/>index 7060a5668989..5026594763ea 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsdumpdv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsdumpdv.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsdumpdv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsdumpdv.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c<br/>index 5d59cfcef6f4..d22167cbd0ca 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nseval.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nseval.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nseval.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nseval.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c<br/>index 36643a8cf65a..ce33e7297ea7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsinit.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsinit.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsinit.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c<br/>index d1f20143bb11..d2915e186ae1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsload.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsload.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsload.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c<br/>index f03dd41e86d0..3db9ca25a620 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsnames.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsnames.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsnames.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsnames.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -97,6 +97,51 @@ acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * FUNCTION:    acpi_ns_handle_to_name</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  target_handle           - Handle of named object whose name is</div><div class='add'>+ *                                        to be found</div><div class='add'>+ *              buffer                  - Where the name is returned</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status, Buffer is filled with name if status is AE_OK</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Build and return a full namespace name</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+acpi_status</div><div class='add'>+acpi_ns_handle_to_name(acpi_handle target_handle, struct acpi_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	struct acpi_namespace_node *node;</div><div class='add'>+	const char *node_name;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ns_handle_to_name, target_handle);</div><div class='add'>+</div><div class='add'>+	node = acpi_ns_validate_handle(target_handle);</div><div class='add'>+	if (!node) {</div><div class='add'>+		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Validate/Allocate/Clear caller buffer */</div><div class='add'>+</div><div class='add'>+	status = acpi_ut_initialize_buffer(buffer, ACPI_PATH_SEGMENT_LENGTH);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Just copy the ACPI name from the Node and zero terminate it */</div><div class='add'>+</div><div class='add'>+	node_name = acpi_ut_get_node_name(node);</div><div class='add'>+	ACPI_MOVE_NAME(buffer-&gt;pointer, node_name);</div><div class='add'>+	((char *)buffer-&gt;pointer)[ACPI_NAME_SIZE] = 0;</div><div class='add'>+</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%4.4s\n", (char *)buffer-&gt;pointer));</div><div class='add'>+	return_ACPI_STATUS(AE_OK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * FUNCTION:    acpi_ns_handle_to_pathname</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  target_handle           - Handle of named object whose name is</div><div class='head'>diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c<br/>index cfa2bb7162d8..707b2aa501e1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsobject.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsobject.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsobject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsobject.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c<br/>index 4f14e9205bff..2fc33a5203f4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsparse.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsparse.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsparse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsparse.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c<br/>index 6d7844580b2a..9d14b509529e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nspredef.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nspredef.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nspredef.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nspredef.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -323,7 +323,7 @@ acpi_ns_check_reference(struct acpi_evaluate_info *info,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check the reference object for the correct reference type (opcode).</div><div class='del'>-	 * The only type of reference that can be converted to an union acpi_object is</div><div class='add'>+	 * The only type of reference that can be converted to a union acpi_object is</div><div class='ctx'> 	 * a reference to a named object (reference class: NAME)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (return_object-&gt;reference.class == ACPI_REFCLASS_NAME) {</div><div class='head'>diff --git a/drivers/acpi/acpica/nsprepkg.c b/drivers/acpi/acpica/nsprepkg.c<br/>index fbedc6e8ab36..4954cb6c9090 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsprepkg.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsprepkg.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsprepkg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsprepkg.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c<br/>index 9523d41c7ae9..38316266521e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsrepair.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsrepair.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsrepair.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsrepair.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c<br/>index d5336122486b..352265498e90 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsrepair2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsrepair2.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsrepair2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsrepair2.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c<br/>index 61036d210274..5de8957f5ef0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nssearch.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nssearch.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nssearch.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nssearch.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c<br/>index 691814dfed31..661676714f7b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsutils.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsutils.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsutils.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c<br/>index ebd731fe8e45..6b6e6f498cff 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nswalk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nswalk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nswalk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nswalk.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c<br/>index d2a9b4fd739f..c944ff5c9c3d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsxfeval.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsxfeval.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsxfeval.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsxfeval.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -495,9 +495,9 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Two types of references are supported - those created by Index and</div><div class='ctx'> 	 * ref_of operators. A name reference (AML_NAMEPATH_OP) can be converted</div><div class='del'>-	 * to an union acpi_object, so it is not dereferenced here. A ddb_handle</div><div class='add'>+	 * to a union acpi_object, so it is not dereferenced here. A ddb_handle</div><div class='ctx'> 	 * (AML_LOAD_OP) cannot be dereferenced, nor can it be converted to</div><div class='del'>-	 * an union acpi_object.</div><div class='add'>+	 * a union acpi_object.</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (info-&gt;return_object-&gt;reference.class) {</div><div class='ctx'> 	case ACPI_REFCLASS_INDEX:</div><div class='head'>diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c<br/>index 76a1bd4bb070..106966235805 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsxfname.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsxfname.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsxfname.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsxfname.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -158,8 +158,6 @@ acpi_status</div><div class='ctx'> acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	struct acpi_namespace_node *node;</div><div class='del'>-	const char *node_name;</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -172,18 +170,6 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer *buffer)</div><div class='ctx'> 		return (status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (name_type == ACPI_FULL_PATHNAME ||</div><div class='del'>-	    name_type == ACPI_FULL_PATHNAME_NO_TRAILING) {</div><div class='del'>-</div><div class='del'>-		/* Get the full pathname (From the namespace root) */</div><div class='del'>-</div><div class='del'>-		status = acpi_ns_handle_to_pathname(handle, buffer,</div><div class='del'>-						    name_type ==</div><div class='del'>-						    ACPI_FULL_PATHNAME ? FALSE :</div><div class='del'>-						    TRUE);</div><div class='del'>-		return (status);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Wants the single segment ACPI name.</div><div class='ctx'> 	 * Validate handle and convert to a namespace Node</div><div class='hunk'>@@ -193,27 +179,20 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer *buffer)</div><div class='ctx'> 		return (status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	node = acpi_ns_validate_handle(handle);</div><div class='del'>-	if (!node) {</div><div class='del'>-		status = AE_BAD_PARAMETER;</div><div class='del'>-		goto unlock_and_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Validate/Allocate/Clear caller buffer */</div><div class='del'>-</div><div class='del'>-	status = acpi_ut_initialize_buffer(buffer, ACPI_PATH_SEGMENT_LENGTH);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		goto unlock_and_exit;</div><div class='del'>-	}</div><div class='add'>+	if (name_type == ACPI_FULL_PATHNAME ||</div><div class='add'>+	    name_type == ACPI_FULL_PATHNAME_NO_TRAILING) {</div><div class='ctx'> </div><div class='del'>-	/* Just copy the ACPI name from the Node and zero terminate it */</div><div class='add'>+		/* Get the full pathname (From the namespace root) */</div><div class='ctx'> </div><div class='del'>-	node_name = acpi_ut_get_node_name(node);</div><div class='del'>-	ACPI_MOVE_NAME(buffer-&gt;pointer, node_name);</div><div class='del'>-	((char *)buffer-&gt;pointer)[ACPI_NAME_SIZE] = 0;</div><div class='del'>-	status = AE_OK;</div><div class='add'>+		status = acpi_ns_handle_to_pathname(handle, buffer,</div><div class='add'>+						    name_type ==</div><div class='add'>+						    ACPI_FULL_PATHNAME ? FALSE :</div><div class='add'>+						    TRUE);</div><div class='add'>+	} else {</div><div class='add'>+		/* Get the single name */</div><div class='ctx'> </div><div class='del'>-unlock_and_exit:</div><div class='add'>+		status = acpi_ns_handle_to_name(handle, buffer);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> 	return (status);</div><div class='head'>diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c<br/>index 32d372b85243..47f689ec3fcb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/nsxfobj.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/nsxfobj.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/nsxfobj.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/nsxfobj.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c<br/>index c29c930ffa08..05b62ad44c3e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/psargs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/psargs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/psargs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psargs.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -269,23 +269,27 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ACPI_SUCCESS(status) &amp;&amp;</div><div class='ctx'> 	    possible_method_call &amp;&amp; (node-&gt;type == ACPI_TYPE_METHOD)) {</div><div class='del'>-		if (walk_state-&gt;opcode == AML_UNLOAD_OP) {</div><div class='add'>+		if ((GET_CURRENT_ARG_TYPE(walk_state-&gt;arg_types) ==</div><div class='add'>+		     ARGP_SUPERNAME)</div><div class='add'>+		    || (GET_CURRENT_ARG_TYPE(walk_state-&gt;arg_types) ==</div><div class='add'>+			ARGP_TARGET)) {</div><div class='ctx'> 			/*</div><div class='del'>-			 * acpi_ps_get_next_namestring has increased the AML pointer,</div><div class='del'>-			 * so we need to restore the saved AML pointer for method call.</div><div class='add'>+			 * acpi_ps_get_next_namestring has increased the AML pointer past</div><div class='add'>+			 * the method invocation namestring, so we need to restore the</div><div class='add'>+			 * saved AML pointer back to the original method invocation</div><div class='add'>+			 * namestring.</div><div class='ctx'> 			 */</div><div class='ctx'> 			walk_state-&gt;parser_state.aml = start;</div><div class='ctx'> 			walk_state-&gt;arg_count = 1;</div><div class='ctx'> 			acpi_ps_init_op(arg, AML_INT_METHODCALL_OP);</div><div class='del'>-			return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* This name is actually a control method invocation */</div><div class='ctx'> </div><div class='ctx'> 		method_desc = acpi_ns_get_attached_object(node);</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='del'>-				  "Control Method - %p Desc %p Path=%p\n", node,</div><div class='del'>-				  method_desc, path));</div><div class='add'>+				  "Control Method invocation %4.4s - %p Desc %p Path=%p\n",</div><div class='add'>+				  node-&gt;name.ascii, node, method_desc, path));</div><div class='ctx'> </div><div class='ctx'> 		name_op = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP, start);</div><div class='ctx'> 		if (!name_op) {</div><div class='hunk'>@@ -719,6 +723,10 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE_PTR(ps_get_next_arg, parser_state);</div><div class='ctx'> </div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='add'>+			  "Expected argument type ARGP: %s (%2.2X)\n",</div><div class='add'>+			  acpi_ut_get_argument_type_name(arg_type), arg_type));</div><div class='add'>+</div><div class='ctx'> 	switch (arg_type) {</div><div class='ctx'> 	case ARGP_BYTEDATA:</div><div class='ctx'> 	case ARGP_WORDDATA:</div><div class='hunk'>@@ -796,11 +804,14 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case ARGP_TARGET:</div><div class='del'>-	case ARGP_SUPERNAME:</div><div class='ctx'> 	case ARGP_SIMPLENAME:</div><div class='ctx'> 	case ARGP_NAME_OR_REF:</div><div class='ctx'> </div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='add'>+				  "**** SimpleName/NameOrRef: %s (%2.2X)\n",</div><div class='add'>+				  acpi_ut_get_argument_type_name(arg_type),</div><div class='add'>+				  arg_type));</div><div class='add'>+</div><div class='ctx'> 		subop = acpi_ps_peek_opcode(parser_state);</div><div class='ctx'> 		if (subop == 0 ||</div><div class='ctx'> 		    acpi_ps_is_leading_char(subop) ||</div><div class='hunk'>@@ -816,28 +827,49 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,</div><div class='ctx'> 				return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* To support super_name arg of Unload */</div><div class='del'>-</div><div class='del'>-			if (walk_state-&gt;opcode == AML_UNLOAD_OP) {</div><div class='del'>-				status =</div><div class='del'>-				    acpi_ps_get_next_namepath(walk_state,</div><div class='del'>-							      parser_state, arg,</div><div class='del'>-							      ACPI_POSSIBLE_METHOD_CALL);</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * If the super_name argument is a method call, we have</div><div class='del'>-				 * already restored the AML pointer, just free this Arg</div><div class='del'>-				 */</div><div class='del'>-				if (arg-&gt;common.aml_opcode ==</div><div class='del'>-				    AML_INT_METHODCALL_OP) {</div><div class='del'>-					acpi_ps_free_op(arg);</div><div class='del'>-					arg = NULL;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				status =</div><div class='del'>-				    acpi_ps_get_next_namepath(walk_state,</div><div class='del'>-							      parser_state, arg,</div><div class='del'>-							      ACPI_NOT_METHOD_CALL);</div><div class='add'>+			status =</div><div class='add'>+			    acpi_ps_get_next_namepath(walk_state, parser_state,</div><div class='add'>+						      arg,</div><div class='add'>+						      ACPI_NOT_METHOD_CALL);</div><div class='add'>+		} else {</div><div class='add'>+			/* Single complex argument, nothing returned */</div><div class='add'>+</div><div class='add'>+			walk_state-&gt;arg_count = 1;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ARGP_TARGET:</div><div class='add'>+	case ARGP_SUPERNAME:</div><div class='add'>+</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='add'>+				  "**** Target/Supername: %s (%2.2X)\n",</div><div class='add'>+				  acpi_ut_get_argument_type_name(arg_type),</div><div class='add'>+				  arg_type));</div><div class='add'>+</div><div class='add'>+		subop = acpi_ps_peek_opcode(parser_state);</div><div class='add'>+		if (subop == 0 ||</div><div class='add'>+		    acpi_ps_is_leading_char(subop) ||</div><div class='add'>+		    ACPI_IS_ROOT_PREFIX(subop) ||</div><div class='add'>+		    ACPI_IS_PARENT_PREFIX(subop)) {</div><div class='add'>+</div><div class='add'>+			/* NULL target (zero). Convert to a NULL namepath */</div><div class='add'>+</div><div class='add'>+			arg =</div><div class='add'>+			    acpi_ps_alloc_op(AML_INT_NAMEPATH_OP,</div><div class='add'>+					     parser_state-&gt;aml);</div><div class='add'>+			if (!arg) {</div><div class='add'>+				return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			status =</div><div class='add'>+			    acpi_ps_get_next_namepath(walk_state, parser_state,</div><div class='add'>+						      arg,</div><div class='add'>+						      ACPI_POSSIBLE_METHOD_CALL);</div><div class='add'>+</div><div class='add'>+			if (arg-&gt;common.aml_opcode == AML_INT_METHODCALL_OP) {</div><div class='add'>+				acpi_ps_free_op(arg);</div><div class='add'>+				arg = NULL;</div><div class='add'>+				walk_state-&gt;arg_count = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Single complex argument, nothing returned */</div><div class='hunk'>@@ -849,6 +881,11 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	case ARGP_DATAOBJ:</div><div class='ctx'> 	case ARGP_TERMARG:</div><div class='ctx'> </div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='add'>+				  "**** TermArg/DataObj: %s (%2.2X)\n",</div><div class='add'>+				  acpi_ut_get_argument_type_name(arg_type),</div><div class='add'>+				  arg_type));</div><div class='add'>+</div><div class='ctx'> 		/* Single complex argument, nothing returned */</div><div class='ctx'> </div><div class='ctx'> 		walk_state-&gt;arg_count = 1;</div><div class='head'>diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c<br/>index 6a9f5059f682..14d689606d2f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/psloop.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/psloop.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/psloop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psloop.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -92,6 +92,10 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE_PTR(ps_get_arguments, walk_state);</div><div class='ctx'> </div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='add'>+			  "Get arguments for opcode [%s]\n",</div><div class='add'>+			  op-&gt;common.aml_op_name));</div><div class='add'>+</div><div class='ctx'> 	switch (op-&gt;common.aml_opcode) {</div><div class='ctx'> 	case AML_BYTE_OP:	/* AML_BYTEDATA_ARG */</div><div class='ctx'> 	case AML_WORD_OP:	/* AML_WORDDATA_ARG */</div><div class='head'>diff --git a/drivers/acpi/acpica/psobject.c b/drivers/acpi/acpica/psobject.c<br/>index db0e90342e82..5c4aff0f4f26 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/psobject.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/psobject.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/psobject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psobject.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -348,7 +348,15 @@ acpi_ps_create_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 			    argument_count) {</div><div class='ctx'> 				op-&gt;common.flags |= ACPI_PARSEOP_TARGET;</div><div class='ctx'> 			}</div><div class='del'>-		} else if (parent_scope-&gt;common.aml_opcode == AML_INCREMENT_OP) {</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Special case for both Increment() and Decrement(), where</div><div class='add'>+		 * the lone argument is both a source and a target.</div><div class='add'>+		 */</div><div class='add'>+		else if ((parent_scope-&gt;common.aml_opcode == AML_INCREMENT_OP)</div><div class='add'>+			 || (parent_scope-&gt;common.aml_opcode ==</div><div class='add'>+			     AML_DECREMENT_OP)) {</div><div class='ctx'> 			op-&gt;common.flags |= ACPI_PARSEOP_TARGET;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c<br/>index 8e0c97dca01f..451b672915f1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/psopcode.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/psopcode.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/psopcode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psopcode.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/psopinfo.c b/drivers/acpi/acpica/psopinfo.c<br/>index 177b05b239b7..89f95b7f26e9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/psopinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/psopinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/psopinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psopinfo.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c<br/>index 1ce26d9f8ff6..a813bbbd5a8b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/psparse.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/psparse.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/psparse.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psparse.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/psscope.c b/drivers/acpi/acpica/psscope.c<br/>index 560c3684ef43..22d7f1d6849b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/psscope.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/psscope.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/psscope.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psscope.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/pstree.c b/drivers/acpi/acpica/pstree.c<br/>index 0288cdbda88e..9677fff8fd47 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/pstree.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/pstree.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/pstree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/pstree.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -129,10 +129,10 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)</div><div class='ctx'> 	union acpi_parse_object *prev_arg;</div><div class='ctx'> 	const struct acpi_opcode_info *op_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_ENTRY();</div><div class='add'>+	ACPI_FUNCTION_TRACE(ps_append_arg);</div><div class='ctx'> </div><div class='ctx'> 	if (!op) {</div><div class='del'>-		return;</div><div class='add'>+		return_VOID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get the info structure for this opcode */</div><div class='hunk'>@@ -144,7 +144,7 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)</div><div class='ctx'> </div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Invalid AML Opcode: 0x%2.2X",</div><div class='ctx'> 			    op-&gt;common.aml_opcode));</div><div class='del'>-		return;</div><div class='add'>+		return_VOID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check if this opcode requires argument sub-objects */</div><div class='hunk'>@@ -153,7 +153,7 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)</div><div class='ctx'> </div><div class='ctx'> 		/* Has no linked argument objects */</div><div class='ctx'> </div><div class='del'>-		return;</div><div class='add'>+		return_VOID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Append the argument to the linked argument list */</div><div class='hunk'>@@ -181,6 +181,8 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)</div><div class='ctx'> </div><div class='ctx'> 		op-&gt;common.arg_list_length++;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return_VOID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='head'>diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c<br/>index 89cb4bffcc7c..2fa38bb76a55 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/psutils.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/psutils.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/psutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psutils.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/pswalk.c b/drivers/acpi/acpica/pswalk.c<br/>index 04f98c0a7684..22a37c82af19 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/pswalk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/pswalk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/pswalk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/pswalk.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c<br/>index f3c87264bd1b..c88a681586bf 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/psxface.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/psxface.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/psxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/psxface.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rsaddr.c b/drivers/acpi/acpica/rsaddr.c<br/>index 492d5b011f33..a131a28bb09d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rsaddr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rsaddr.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rsaddr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsaddr.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c<br/>index f1e83addd5b4..74e47f829ccb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rscalc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rscalc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rscalc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rscalc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c<br/>index 809b61c114fe..f72ff0b54a63 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rscreate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rscreate.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rscreate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rscreate.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c<br/>index 5ffdb5602d8d..f4cdf8d832dc 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rsdump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rsdump.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rsdump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsdump.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rsdumpinfo.c b/drivers/acpi/acpica/rsdumpinfo.c<br/>index 61e8f16c857d..8aacd28293fa 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rsdumpinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rsdumpinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rsdumpinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsdumpinfo.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rsinfo.c b/drivers/acpi/acpica/rsinfo.c<br/>index 8e067cb73973..475da9d6aed5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rsinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rsinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rsinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsinfo.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rsio.c b/drivers/acpi/acpica/rsio.c<br/>index 07dfbed10d55..b7a47fbc519b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rsio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rsio.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rsio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsio.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rsirq.c b/drivers/acpi/acpica/rsirq.c<br/>index bc8f34590d95..092a733c42b8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rsirq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rsirq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rsirq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsirq.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c<br/>index 8c42dd734559..36a6657dd34d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rslist.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rslist.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rslist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rslist.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rsmemory.c b/drivers/acpi/acpica/rsmemory.c<br/>index 88b53ef9105d..273eecb3001b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rsmemory.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rsmemory.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rsmemory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsmemory.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c<br/>index 25165ca42051..2ae79613f6b7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rsmisc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rsmisc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rsmisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsmisc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rsserial.c b/drivers/acpi/acpica/rsserial.c<br/>index b82c061f205a..c20e6d07928d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rsserial.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rsserial.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rsserial.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsserial.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c<br/>index fa491c64c040..b2aeca01204a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rsutils.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rsutils.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rsutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsutils.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c<br/>index 465ed8137167..59a4f9ed06a7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/rsxface.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/rsxface.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/rsxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/rsxface.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/tbdata.c b/drivers/acpi/acpica/tbdata.c<br/>index d9ca8c2aa2d3..27c5c27d4818 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/tbdata.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/tbdata.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/tbdata.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbdata.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -832,9 +832,9 @@ acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node)</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_tb_install_and_load_table</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  table                   - Pointer to the table</div><div class='del'>- *              address                 - Physical address of the table</div><div class='add'>+ * PARAMETERS:  address                 - Physical address of the table</div><div class='ctx'>  *              flags                   - Allocation flags of the table</div><div class='add'>+ *              override                - Whether override should be performed</div><div class='ctx'>  *              table_index             - Where table index is returned</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='hunk'>@@ -844,65 +844,73 @@ acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node)</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='del'>-acpi_tb_install_and_load_table(struct acpi_table_header *table,</div><div class='del'>-			       acpi_physical_address address,</div><div class='add'>+acpi_tb_install_and_load_table(acpi_physical_address address,</div><div class='ctx'> 			       u8 flags, u8 override, u32 *table_index)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u32 i;</div><div class='del'>-	acpi_owner_id owner_id;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE(acpi_load_table);</div><div class='del'>-</div><div class='del'>-	(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_install_and_load_table);</div><div class='ctx'> </div><div class='ctx'> 	/* Install the table and load it into the namespace */</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_tb_install_standard_table(address, flags, TRUE,</div><div class='ctx'> 						override, &amp;i);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		goto unlock_and_exit;</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Note: Now table is "INSTALLED", it must be validated before</div><div class='del'>-	 * using.</div><div class='del'>-	 */</div><div class='del'>-	status = acpi_tb_validate_table(&amp;acpi_gbl_root_table_list.tables[i]);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		goto unlock_and_exit;</div><div class='del'>-	}</div><div class='add'>+	status = acpi_tb_load_table(i, acpi_gbl_root_node);</div><div class='ctx'> </div><div class='del'>-	(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='del'>-	status = acpi_ns_load_table(i, acpi_gbl_root_node);</div><div class='add'>+exit:</div><div class='add'>+	*table_index = i;</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Execute any module-level code that was found in the table */</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_tb_unload_table</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  table_index             - Table index</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Unload an ACPI table</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-	if (!acpi_gbl_parse_table_as_term_list</div><div class='del'>-	    &amp;&amp; acpi_gbl_group_module_level_code) {</div><div class='del'>-		acpi_ns_exec_module_code_list();</div><div class='del'>-	}</div><div class='add'>+acpi_status acpi_tb_unload_table(u32 table_index)</div><div class='add'>+{</div><div class='add'>+	acpi_status status = AE_OK;</div><div class='add'>+	struct acpi_table_header *table;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Update GPEs for any new _Lxx/_Exx methods. Ignore errors. The host is</div><div class='del'>-	 * responsible for discovering any new wake GPEs by running _PRW methods</div><div class='del'>-	 * that may have been loaded by this table.</div><div class='del'>-	 */</div><div class='del'>-	status = acpi_tb_get_owner_id(i, &amp;owner_id);</div><div class='del'>-	if (ACPI_SUCCESS(status)) {</div><div class='del'>-		acpi_ev_update_gpes(owner_id);</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_unload_table);</div><div class='add'>+</div><div class='add'>+	/* Ensure the table is still loaded */</div><div class='add'>+</div><div class='add'>+	if (!acpi_tb_is_table_loaded(table_index)) {</div><div class='add'>+		return_ACPI_STATUS(AE_NOT_EXIST);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Invoke table handler if present */</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_gbl_table_handler) {</div><div class='del'>-		(void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_LOAD, table,</div><div class='del'>-					     acpi_gbl_table_handler_context);</div><div class='add'>+		status = acpi_get_table_by_index(table_index, &amp;table);</div><div class='add'>+		if (ACPI_SUCCESS(status)) {</div><div class='add'>+			(void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_UNLOAD,</div><div class='add'>+						     table,</div><div class='add'>+						     acpi_gbl_table_handler_context);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);</div><div class='ctx'> </div><div class='del'>-unlock_and_exit:</div><div class='del'>-	*table_index = i;</div><div class='del'>-	(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='add'>+	/* Delete the portion of the namespace owned by this table */</div><div class='add'>+</div><div class='add'>+	status = acpi_tb_delete_namespace_by_owner(table_index);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	(void)acpi_tb_release_owner_id(table_index);</div><div class='add'>+	acpi_tb_set_table_loaded_flag(table_index, FALSE);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c<br/>index 5fb838e592dc..51860bfc111e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/tbfadt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/tbfadt.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/tbfadt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbfadt.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -311,6 +311,8 @@ void acpi_tb_parse_fadt(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 length;</div><div class='ctx'> 	struct acpi_table_header *table;</div><div class='add'>+	struct acpi_table_desc *fadt_desc;</div><div class='add'>+	acpi_status status;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The FADT has multiple versions with different lengths,</div><div class='hunk'>@@ -319,14 +321,12 @@ void acpi_tb_parse_fadt(void)</div><div class='ctx'> 	 * Get a local copy of the FADT and convert it to a common format</div><div class='ctx'> 	 * Map entire FADT, assumed to be smaller than one page.</div><div class='ctx'> 	 */</div><div class='del'>-	length = acpi_gbl_root_table_list.tables[acpi_gbl_fadt_index].length;</div><div class='del'>-</div><div class='del'>-	table =</div><div class='del'>-	    acpi_os_map_memory(acpi_gbl_root_table_list.</div><div class='del'>-			       tables[acpi_gbl_fadt_index].address, length);</div><div class='del'>-	if (!table) {</div><div class='add'>+	fadt_desc = &amp;acpi_gbl_root_table_list.tables[acpi_gbl_fadt_index];</div><div class='add'>+	status = acpi_tb_get_table(fadt_desc, &amp;table);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	length = fadt_desc-&gt;length;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Validate the FADT checksum before we copy the table. Ignore</div><div class='hunk'>@@ -340,7 +340,7 @@ void acpi_tb_parse_fadt(void)</div><div class='ctx'> </div><div class='ctx'> 	/* All done with the real FADT, unmap it */</div><div class='ctx'> </div><div class='del'>-	acpi_os_unmap_memory(table, length);</div><div class='add'>+	acpi_tb_put_table(fadt_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* Obtain the DSDT and FACS tables via their addresses within the FADT */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c<br/>index f6b9b4e4298b..fea89c8d305c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/tbfind.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/tbfind.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/tbfind.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbfind.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c<br/>index 5fdf251a9f97..4620f3c68c13 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/tbinstal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/tbinstal.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/tbinstal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbinstal.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -217,6 +217,10 @@ acpi_tb_install_standard_table(acpi_physical_address address,</div><div class='ctx'> 		goto release_and_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Acquire the table lock */</div><div class='add'>+</div><div class='add'>+	(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);</div><div class='add'>+</div><div class='ctx'> 	if (reload) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Validate the incoming table signature.</div><div class='hunk'>@@ -244,7 +248,7 @@ acpi_tb_install_standard_table(acpi_physical_address address,</div><div class='ctx'> 					 new_table_desc.signature.integer));</div><div class='ctx'> </div><div class='ctx'> 			status = AE_BAD_SIGNATURE;</div><div class='del'>-			goto release_and_exit;</div><div class='add'>+			goto unlock_and_exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check if table is already registered */</div><div class='hunk'>@@ -279,7 +283,7 @@ acpi_tb_install_standard_table(acpi_physical_address address,</div><div class='ctx'> 				/* Table is still loaded, this is an error */</div><div class='ctx'> </div><div class='ctx'> 				status = AE_ALREADY_EXISTS;</div><div class='del'>-				goto release_and_exit;</div><div class='add'>+				goto unlock_and_exit;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * Table was unloaded, allow it to be reloaded.</div><div class='hunk'>@@ -290,6 +294,7 @@ acpi_tb_install_standard_table(acpi_physical_address address,</div><div class='ctx'> 				 * indicate the re-installation.</div><div class='ctx'> 				 */</div><div class='ctx'> 				acpi_tb_uninstall_table(&amp;new_table_desc);</div><div class='add'>+				(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='ctx'> 				*table_index = i;</div><div class='ctx'> 				return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -303,11 +308,19 @@ acpi_tb_install_standard_table(acpi_physical_address address,</div><div class='ctx'> </div><div class='ctx'> 	/* Invoke table handler if present */</div><div class='ctx'> </div><div class='add'>+	(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='ctx'> 	if (acpi_gbl_table_handler) {</div><div class='ctx'> 		(void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_INSTALL,</div><div class='ctx'> 					     new_table_desc.pointer,</div><div class='ctx'> 					     acpi_gbl_table_handler_context);</div><div class='ctx'> 	}</div><div class='add'>+	(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);</div><div class='add'>+</div><div class='add'>+unlock_and_exit:</div><div class='add'>+</div><div class='add'>+	/* Release the table lock */</div><div class='add'>+</div><div class='add'>+	(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='ctx'> </div><div class='ctx'> release_and_exit:</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/tbprint.c b/drivers/acpi/acpica/tbprint.c<br/>index 26d61dbace0a..edfd7b10be19 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/tbprint.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/tbprint.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/tbprint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbprint.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c<br/>index 51eb07cf9898..5a968a78652b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/tbutils.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/tbutils.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/tbutils.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbutils.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -381,3 +381,88 @@ next_table:</div><div class='ctx'> 	acpi_os_unmap_memory(table, length);</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_tb_get_table</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  table_desc          - Table descriptor</div><div class='add'>+ *              out_table           - Where the pointer to the table is returned</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status and pointer to the requested table</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Increase a reference to a table descriptor and return the</div><div class='add'>+ *              validated table pointer.</div><div class='add'>+ *              If the table descriptor is an entry of the root table list,</div><div class='add'>+ *              this API must be invoked with ACPI_MTX_TABLES acquired.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+acpi_status</div><div class='add'>+acpi_tb_get_table(struct acpi_table_desc *table_desc,</div><div class='add'>+		  struct acpi_table_header **out_table)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_tb_get_table);</div><div class='add'>+</div><div class='add'>+	if (table_desc-&gt;validation_count == 0) {</div><div class='add'>+</div><div class='add'>+		/* Table need to be "VALIDATED" */</div><div class='add'>+</div><div class='add'>+		status = acpi_tb_validate_table(table_desc);</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			return_ACPI_STATUS(status);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	table_desc-&gt;validation_count++;</div><div class='add'>+	if (table_desc-&gt;validation_count == 0) {</div><div class='add'>+		ACPI_ERROR((AE_INFO,</div><div class='add'>+			    "Table %p, Validation count is zero after increment\n",</div><div class='add'>+			    table_desc));</div><div class='add'>+		table_desc-&gt;validation_count--;</div><div class='add'>+		return_ACPI_STATUS(AE_LIMIT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*out_table = table_desc-&gt;pointer;</div><div class='add'>+	return_ACPI_STATUS(AE_OK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_tb_put_table</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  table_desc          - Table descriptor</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      None</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Decrease a reference to a table descriptor and release the</div><div class='add'>+ *              validated table pointer if no references.</div><div class='add'>+ *              If the table descriptor is an entry of the root table list,</div><div class='add'>+ *              this API must be invoked with ACPI_MTX_TABLES acquired.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+void acpi_tb_put_table(struct acpi_table_desc *table_desc)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_tb_put_table);</div><div class='add'>+</div><div class='add'>+	if (table_desc-&gt;validation_count == 0) {</div><div class='add'>+		ACPI_WARNING((AE_INFO,</div><div class='add'>+			      "Table %p, Validation count is zero before decrement\n",</div><div class='add'>+			      table_desc));</div><div class='add'>+		return_VOID;</div><div class='add'>+	}</div><div class='add'>+	table_desc-&gt;validation_count--;</div><div class='add'>+</div><div class='add'>+	if (table_desc-&gt;validation_count == 0) {</div><div class='add'>+</div><div class='add'>+		/* Table need to be "INVALIDATED" */</div><div class='add'>+</div><div class='add'>+		acpi_tb_invalidate_table(table_desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return_VOID;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c<br/>index 4ab6b9cd0aec..010b1c43df92 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/tbxface.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/tbxface.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/tbxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbxface.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -167,6 +167,7 @@ ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_tables)</div><div class='ctx'> acpi_status ACPI_INIT_FUNCTION acpi_reallocate_root_table(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='add'>+	u32 i;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(acpi_reallocate_root_table);</div><div class='ctx'> </div><div class='hunk'>@@ -178,6 +179,21 @@ acpi_status ACPI_INIT_FUNCTION acpi_reallocate_root_table(void)</div><div class='ctx'> 		return_ACPI_STATUS(AE_SUPPORT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Ensure OS early boot logic, which is required by some hosts. If the</div><div class='add'>+	 * table state is reported to be wrong, developers should fix the</div><div class='add'>+	 * issue by invoking acpi_put_table() for the reported table during the</div><div class='add'>+	 * early stage.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; acpi_gbl_root_table_list.current_table_count; ++i) {</div><div class='add'>+		if (acpi_gbl_root_table_list.tables[i].pointer) {</div><div class='add'>+			ACPI_ERROR((AE_INFO,</div><div class='add'>+				    "Table [%4.4s] is not invalidated during early boot stage",</div><div class='add'>+				    acpi_gbl_root_table_list.tables[i].</div><div class='add'>+				    signature.ascii));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	acpi_gbl_root_table_list.flags |= ACPI_ROOT_ALLOW_RESIZE;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_tb_resize_root_table_list();</div><div class='hunk'>@@ -266,7 +282,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_header)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_get_table_with_size</div><div class='add'>+ * FUNCTION:    acpi_get_table</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  signature           - ACPI signature of needed table</div><div class='ctx'>  *              instance            - Which instance (for SSDTs)</div><div class='hunk'>@@ -276,16 +292,21 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_header)</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: Finds and verifies an ACPI table. Table must be in the</div><div class='ctx'>  *              RSDT/XSDT.</div><div class='add'>+ *              Note that an early stage acpi_get_table() call must be paired</div><div class='add'>+ *              with an early stage acpi_put_table() call. otherwise the table</div><div class='add'>+ *              pointer mapped by the early stage mapping implementation may be</div><div class='add'>+ *              erroneously unmapped by the late stage unmapping implementation</div><div class='add'>+ *              in an acpi_put_table() invoked during the late stage.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> acpi_status</div><div class='del'>-acpi_get_table_with_size(char *signature,</div><div class='del'>-	       u32 instance, struct acpi_table_header **out_table,</div><div class='del'>-	       acpi_size *tbl_size)</div><div class='add'>+acpi_get_table(char *signature,</div><div class='add'>+	       u32 instance, struct acpi_table_header ** out_table)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	u32 j;</div><div class='del'>-	acpi_status status;</div><div class='add'>+	acpi_status status = AE_NOT_FOUND;</div><div class='add'>+	struct acpi_table_desc *table_desc;</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -293,13 +314,22 @@ acpi_get_table_with_size(char *signature,</div><div class='ctx'> 		return (AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Note that the following line is required by some OSPMs, they only</div><div class='add'>+	 * check if the returned table is NULL instead of the returned status</div><div class='add'>+	 * to determined if this function is succeeded.</div><div class='add'>+	 */</div><div class='add'>+	*out_table = NULL;</div><div class='add'>+</div><div class='add'>+	(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);</div><div class='add'>+</div><div class='ctx'> 	/* Walk the root table list */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, j = 0; i &lt; acpi_gbl_root_table_list.current_table_count;</div><div class='ctx'> 	     i++) {</div><div class='del'>-		if (!ACPI_COMPARE_NAME</div><div class='del'>-		    (&amp;(acpi_gbl_root_table_list.tables[i].signature),</div><div class='del'>-		     signature)) {</div><div class='add'>+		table_desc = &amp;acpi_gbl_root_table_list.tables[i];</div><div class='add'>+</div><div class='add'>+		if (!ACPI_COMPARE_NAME(&amp;table_desc-&gt;signature, signature)) {</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -307,43 +337,65 @@ acpi_get_table_with_size(char *signature,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		status =</div><div class='del'>-		    acpi_tb_validate_table(&amp;acpi_gbl_root_table_list.tables[i]);</div><div class='del'>-		if (ACPI_SUCCESS(status)) {</div><div class='del'>-			*out_table = acpi_gbl_root_table_list.tables[i].pointer;</div><div class='del'>-			*tbl_size = acpi_gbl_root_table_list.tables[i].length;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!acpi_gbl_permanent_mmap) {</div><div class='del'>-			acpi_gbl_root_table_list.tables[i].pointer = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return (status);</div><div class='add'>+		status = acpi_tb_get_table(table_desc, out_table);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return (AE_NOT_FOUND);</div><div class='add'>+	(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='add'>+	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ACPI_EXPORT_SYMBOL(acpi_get_table_with_size)</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_table)</div><div class='ctx'> </div><div class='del'>-acpi_status</div><div class='del'>-acpi_get_table(char *signature,</div><div class='del'>-	       u32 instance, struct acpi_table_header **out_table)</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_put_table</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  table               - The pointer to the table</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      None</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Release a table returned by acpi_get_table() and its clones.</div><div class='add'>+ *              Note that it is not safe if this function was invoked after an</div><div class='add'>+ *              uninstallation happened to the original table descriptor.</div><div class='add'>+ *              Currently there is no OSPMs' requirement to handle such</div><div class='add'>+ *              situations.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+void acpi_put_table(struct acpi_table_header *table)</div><div class='ctx'> {</div><div class='del'>-	acpi_size tbl_size;</div><div class='add'>+	u32 i;</div><div class='add'>+	struct acpi_table_desc *table_desc;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_put_table);</div><div class='add'>+</div><div class='add'>+	(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);</div><div class='add'>+</div><div class='add'>+	/* Walk the root table list */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; acpi_gbl_root_table_list.current_table_count; i++) {</div><div class='add'>+		table_desc = &amp;acpi_gbl_root_table_list.tables[i];</div><div class='add'>+</div><div class='add'>+		if (table_desc-&gt;pointer != table) {</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		acpi_tb_put_table(table_desc);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return acpi_get_table_with_size(signature,</div><div class='del'>-		       instance, out_table, &amp;tbl_size);</div><div class='add'>+	(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='add'>+	return_VOID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ACPI_EXPORT_SYMBOL(acpi_get_table)</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_put_table)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_get_table_by_index</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  table_index         - Table index</div><div class='del'>- *              table               - Where the pointer to the table is returned</div><div class='add'>+ *              out_table           - Where the pointer to the table is returned</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status and pointer to the requested table</div><div class='ctx'>  *</div><div class='hunk'>@@ -352,7 +404,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> acpi_status</div><div class='del'>-acpi_get_table_by_index(u32 table_index, struct acpi_table_header **table)</div><div class='add'>+acpi_get_table_by_index(u32 table_index, struct acpi_table_header **out_table)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='hunk'>@@ -360,35 +412,33 @@ acpi_get_table_by_index(u32 table_index, struct acpi_table_header **table)</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='del'>-	if (!table) {</div><div class='add'>+	if (!out_table) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Note that the following line is required by some OSPMs, they only</div><div class='add'>+	 * check if the returned table is NULL instead of the returned status</div><div class='add'>+	 * to determined if this function is succeeded.</div><div class='add'>+	 */</div><div class='add'>+	*out_table = NULL;</div><div class='add'>+</div><div class='ctx'> 	(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate index */</div><div class='ctx'> </div><div class='ctx'> 	if (table_index &gt;= acpi_gbl_root_table_list.current_table_count) {</div><div class='del'>-		(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		status = AE_BAD_PARAMETER;</div><div class='add'>+		goto unlock_and_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!acpi_gbl_root_table_list.tables[table_index].pointer) {</div><div class='add'>+	status =</div><div class='add'>+	    acpi_tb_get_table(&amp;acpi_gbl_root_table_list.tables[table_index],</div><div class='add'>+			      out_table);</div><div class='ctx'> </div><div class='del'>-		/* Table is not mapped, map it */</div><div class='del'>-</div><div class='del'>-		status =</div><div class='del'>-		    acpi_tb_validate_table(&amp;acpi_gbl_root_table_list.</div><div class='del'>-					   tables[table_index]);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*table = acpi_gbl_root_table_list.tables[table_index].pointer;</div><div class='add'>+unlock_and_exit:</div><div class='ctx'> 	(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ACPI_EXPORT_SYMBOL(acpi_get_table_by_index)</div><div class='head'>diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c<br/>index 5569f637f669..b71ce3b817ea 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/tbxfload.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/tbxfload.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/tbxfload.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbxfload.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -239,7 +239,7 @@ acpi_status acpi_tb_load_namespace(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!tables_failed) {</div><div class='del'>-		ACPI_INFO(("%u ACPI AML tables successfully acquired and loaded\n", tables_loaded));</div><div class='add'>+		ACPI_INFO(("%u ACPI AML tables successfully acquired and loaded", tables_loaded));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='ctx'> 			    "%u table load failures, %u successful",</div><div class='hunk'>@@ -250,6 +250,10 @@ acpi_status acpi_tb_load_namespace(void)</div><div class='ctx'> 		status = AE_CTRL_TERMINATE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef ACPI_APPLICATION</div><div class='add'>+	ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "\n"));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> unlock_and_exit:</div><div class='ctx'> 	(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='hunk'>@@ -326,10 +330,9 @@ acpi_status acpi_load_table(struct acpi_table_header *table)</div><div class='ctx'> 	/* Install the table and load it into the namespace */</div><div class='ctx'> </div><div class='ctx'> 	ACPI_INFO(("Host-directed Dynamic ACPI Table Load:"));</div><div class='del'>-	status =</div><div class='del'>-	    acpi_tb_install_and_load_table(table, ACPI_PTR_TO_PHYSADDR(table),</div><div class='del'>-					   ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,</div><div class='del'>-					   FALSE, &amp;table_index);</div><div class='add'>+	status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table),</div><div class='add'>+						ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,</div><div class='add'>+						FALSE, &amp;table_index);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -405,37 +408,8 @@ acpi_status acpi_unload_parent_table(acpi_handle object)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Ensure the table is actually loaded */</div><div class='del'>-</div><div class='ctx'> 		(void)acpi_ut_release_mutex(ACPI_MTX_TABLES);</div><div class='del'>-		if (!acpi_tb_is_table_loaded(i)) {</div><div class='del'>-			status = AE_NOT_EXIST;</div><div class='del'>-			(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Invoke table handler if present */</div><div class='del'>-</div><div class='del'>-		if (acpi_gbl_table_handler) {</div><div class='del'>-			(void)acpi_gbl_table_handler(ACPI_TABLE_EVENT_UNLOAD,</div><div class='del'>-						     acpi_gbl_root_table_list.</div><div class='del'>-						     tables[i].pointer,</div><div class='del'>-						     acpi_gbl_table_handler_context);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Delete all namespace objects owned by this table. Note that</div><div class='del'>-		 * these objects can appear anywhere in the namespace by virtue</div><div class='del'>-		 * of the AML "Scope" operator. Thus, we need to track ownership</div><div class='del'>-		 * by an ID, not simply a position within the hierarchy.</div><div class='del'>-		 */</div><div class='del'>-		status = acpi_tb_delete_namespace_by_owner(i);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		status = acpi_tb_release_owner_id(i);</div><div class='del'>-		acpi_tb_set_table_loaded_flag(i, FALSE);</div><div class='add'>+		status = acpi_tb_unload_table(i);</div><div class='ctx'> 		(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c<br/>index 0adb1c78d863..f9f9a7da2cad 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/tbxfroot.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/tbxfroot.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/tbxfroot.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/tbxfroot.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c<br/>index 433d822798b6..26a0633115be 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utaddress.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utaddress.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utaddress.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utaddress.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c<br/>index 13324a27b99b..a3401bd29413 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utalloc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utalloc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utalloc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utalloc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utascii.c b/drivers/acpi/acpica/utascii.c<br/>index 706c1f346490..909bdb198651 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utascii.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utascii.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utascii.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utascii.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utbuffer.c b/drivers/acpi/acpica/utbuffer.c<br/>index ff2981275b9a..f17eaa009dde 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utbuffer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utbuffer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utbuffer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utbuffer.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utcache.c b/drivers/acpi/acpica/utcache.c<br/>index 3b8d23ef351f..11c7f72f2d56 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utcache.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utcache.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utcache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utcache.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c<br/>index 82f971402d85..e9382255d6c6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utcopy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utcopy.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utcopy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utcopy.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c<br/>index 044df9b0356e..bd5ea3101eb7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utdebug.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utdebug.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utdebug.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utdebug.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c<br/>index 15728ad8356b..60868309e326 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utdecode.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utdecode.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utdecode.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utdecode.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -44,6 +44,7 @@</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include "accommon.h"</div><div class='ctx'> #include "acnamesp.h"</div><div class='add'>+#include "amlcode.h"</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_UTILITIES</div><div class='ctx'> ACPI_MODULE_NAME("utdecode")</div><div class='hunk'>@@ -237,7 +238,7 @@ const char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)</div><div class='ctx'> </div><div class='ctx'> 	if (!obj_desc) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Null Object Descriptor\n"));</div><div class='del'>-		return_PTR("[NULL Object Descriptor]");</div><div class='add'>+		return_STR("[NULL Object Descriptor]");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* These descriptor types share a common area */</div><div class='hunk'>@@ -250,7 +251,7 @@ const char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)</div><div class='ctx'> 				  acpi_ut_get_descriptor_name(obj_desc),</div><div class='ctx'> 				  obj_desc));</div><div class='ctx'> </div><div class='del'>-		return_PTR("Invalid object");</div><div class='add'>+		return_STR("Invalid object");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return_STR(acpi_ut_get_type_name(obj_desc-&gt;common.type));</div><div class='hunk'>@@ -532,6 +533,54 @@ const char *acpi_ut_get_notify_name(u32 notify_value, acpi_object_type type)</div><div class='ctx'> </div><div class='ctx'> 	return ("Hardware-Specific");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_ut_get_argument_type_name</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  arg_type            - an ARGP_* parser argument type</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Decoded ARGP_* type</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Decode an ARGP_* parser type, as defined in the amlcode.h file,</div><div class='add'>+ *              and used in the acopcode.h file. For example, ARGP_TERMARG.</div><div class='add'>+ *              Used for debug only.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+static const char *acpi_gbl_argument_type[20] = {</div><div class='add'>+	/* 00 */ "Unknown ARGP",</div><div class='add'>+	/* 01 */ "ByteData",</div><div class='add'>+	/* 02 */ "ByteList",</div><div class='add'>+	/* 03 */ "CharList",</div><div class='add'>+	/* 04 */ "DataObject",</div><div class='add'>+	/* 05 */ "DataObjectList",</div><div class='add'>+	/* 06 */ "DWordData",</div><div class='add'>+	/* 07 */ "FieldList",</div><div class='add'>+	/* 08 */ "Name",</div><div class='add'>+	/* 09 */ "NameString",</div><div class='add'>+	/* 0A */ "ObjectList",</div><div class='add'>+	/* 0B */ "PackageLength",</div><div class='add'>+	/* 0C */ "SuperName",</div><div class='add'>+	/* 0D */ "Target",</div><div class='add'>+	/* 0E */ "TermArg",</div><div class='add'>+	/* 0F */ "TermList",</div><div class='add'>+	/* 10 */ "WordData",</div><div class='add'>+	/* 11 */ "QWordData",</div><div class='add'>+	/* 12 */ "SimpleName",</div><div class='add'>+	/* 13 */ "NameOrRef"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char *acpi_ut_get_argument_type_name(u32 arg_type)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (arg_type &gt; ARGP_MAX) {</div><div class='add'>+		return ("Unknown ARGP");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (acpi_gbl_argument_type[arg_type]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='head'>diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c<br/>index 529d6c38ea7c..c6eb9fae70f9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utdelete.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utdelete.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utdelete.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utdelete.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -421,8 +421,10 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,</div><div class='del'>-				  "Obj %p Type %.2X Refs %.2X [Incremented]\n",</div><div class='del'>-				  object, object-&gt;common.type, new_count));</div><div class='add'>+				  "Obj %p Type %.2X [%s] Refs %.2X [Incremented]\n",</div><div class='add'>+				  object, object-&gt;common.type,</div><div class='add'>+				  acpi_ut_get_object_type_name(object),</div><div class='add'>+				  new_count));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case REF_DECREMENT:</div><div class='head'>diff --git a/drivers/acpi/acpica/uterror.c b/drivers/acpi/acpica/uterror.c<br/>index 475932cecf1a..e3368186e1c1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/uterror.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/uterror.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/uterror.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/uterror.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c<br/>index 7bad13f2e518..3fce7519c690 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/uteval.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/uteval.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/uteval.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/uteval.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utexcep.c b/drivers/acpi/acpica/utexcep.c<br/>index 695240338e00..eb6dcab33d2f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utexcep.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utexcep.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utexcep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utexcep.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c<br/>index dd3fd7f97f8e..230a50c82f22 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utglobal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utglobal.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utglobal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utglobal.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/uthex.c b/drivers/acpi/acpica/uthex.c<br/>index 36d2fc789088..6600bc257516 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/uthex.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/uthex.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/uthex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/uthex.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c<br/>index f7cd2d52643b..a6eb580ee21d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utids.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utids.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utids.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utids.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utinit.c b/drivers/acpi/acpica/utinit.c<br/>index 1711fdf41709..23e766d1691d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utinit.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utinit.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utinit.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utlock.c b/drivers/acpi/acpica/utlock.c<br/>index 3cd0978925ef..db2d9910866e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utlock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utlock.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utlock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utlock.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c<br/>index 2d6530ee7e51..aa0502d1d019 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utmath.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utmath.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utmath.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utmath.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c<br/>index 389de3bd1ff1..443ffad01209 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utmisc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utmisc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utmisc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utmisc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c<br/>index 15073375bd00..586354788018 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utmutex.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utmutex.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utmutex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utmutex.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utnonansi.c b/drivers/acpi/acpica/utnonansi.c<br/>index 2514239282c2..792664982ea3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utnonansi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utnonansi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utnonansi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utnonansi.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c<br/>index 72b9a062bbab..64e6641bfe82 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utobject.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utobject.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utobject.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utobject.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c<br/>index f0484b058c44..3175b133c0e4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utosi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utosi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utosi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utosi.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utownerid.c b/drivers/acpi/acpica/utownerid.c<br/>index 3cd573c5f7f9..c82399f9b456 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utownerid.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utownerid.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utownerid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utownerid.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utpredef.c b/drivers/acpi/acpica/utpredef.c<br/>index ce18346b6144..350709f23e4c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utpredef.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utpredef.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utpredef.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utpredef.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utprint.c b/drivers/acpi/acpica/utprint.c<br/>index 40eba804d49c..7e6e1ae6140f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utprint.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utprint.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utprint.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utprint.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c<br/>index 1de3376da66a..c86bae7b1d0f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utresrc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utresrc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utresrc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utresrc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='hunk'>@@ -421,8 +421,10 @@ acpi_ut_walk_aml_resources(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(ut_walk_aml_resources);</div><div class='ctx'> </div><div class='del'>-	/* The absolute minimum resource template is one end_tag descriptor */</div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * The absolute minimum resource template is one end_tag descriptor.</div><div class='add'>+	 * However, we will treat a lone end_tag as just a simple buffer.</div><div class='add'>+	 */</div><div class='ctx'> 	if (aml_length &lt; sizeof(struct aml_resource_end_tag)) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -454,9 +456,8 @@ acpi_ut_walk_aml_resources(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		/* Invoke the user function */</div><div class='ctx'> </div><div class='ctx'> 		if (user_function) {</div><div class='del'>-			status =</div><div class='del'>-			    user_function(aml, length, offset, resource_index,</div><div class='del'>-					  context);</div><div class='add'>+			status = user_function(aml, length, offset,</div><div class='add'>+					       resource_index, context);</div><div class='ctx'> 			if (ACPI_FAILURE(status)) {</div><div class='ctx'> 				return_ACPI_STATUS(status);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -480,6 +481,12 @@ acpi_ut_walk_aml_resources(struct acpi_walk_state *walk_state,</div><div class='ctx'> 				*context = aml;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			/* Check if buffer is defined to be longer than the resource length */</div><div class='add'>+</div><div class='add'>+			if (aml_length &gt; (offset + length)) {</div><div class='add'>+				return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			/* Normal exit */</div><div class='ctx'> </div><div class='ctx'> 			return_ACPI_STATUS(AE_OK);</div><div class='head'>diff --git a/drivers/acpi/acpica/utstate.c b/drivers/acpi/acpica/utstate.c<br/>index f3d4dbd5fac0..64308c304ade 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utstate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utstate.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utstate.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utstring.c b/drivers/acpi/acpica/utstring.c<br/>index 288913a0e709..9eacbcb9e4f4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utstring.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utstring.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utstring.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utstring.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utstrtoul64.c b/drivers/acpi/acpica/utstrtoul64.c<br/>index b4f341c98a95..f42be01d99fd 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utstrtoul64.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utstrtoul64.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utstrtoul64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utstrtoul64.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/uttrack.c b/drivers/acpi/acpica/uttrack.c<br/>index df31d71ce596..9a07a42cae34 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/uttrack.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/uttrack.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/uttrack.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/uttrack.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utuuid.c b/drivers/acpi/acpica/utuuid.c<br/>index 81088ff9d67b..5028e06718b1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utuuid.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utuuid.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utuuid.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utuuid.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c<br/>index ec503c862961..6b9ba4029f8e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utxface.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utxface.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utxface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utxface.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c<br/>index d9f15cbcd8a0..a16bd9eac653 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utxferror.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utxferror.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utxferror.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utxferror.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c<br/>index a5ca0f57cd08..6d5180601cf2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utxfinit.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utxfinit.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utxfinit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utxfinit.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/acpica/utxfmutex.c b/drivers/acpi/acpica/utxfmutex.c<br/>index 850de0155528..c016211c35ae 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/acpica/utxfmutex.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/acpica/utxfmutex.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/acpica/utxfmutex.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/acpica/utxfmutex.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2016, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2017, Intel Corp.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * Redistribution and use in source and binary forms, with or without</div><div class='head'>diff --git a/drivers/acpi/apei/bert.c b/drivers/acpi/apei/bert.c<br/>index a05b5c0cf181..12771fcf0417 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/apei/bert.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/apei/bert.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/apei/bert.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/apei/bert.c</a></div><div class='hunk'>@@ -97,6 +97,7 @@ static int __init bert_check_table(struct acpi_table_bert *bert_tab)</div><div class='ctx'> </div><div class='ctx'> static int __init bert_init(void)</div><div class='ctx'> {</div><div class='add'>+	struct apei_resources bert_resources;</div><div class='ctx'> 	struct acpi_bert_region *boot_error_region;</div><div class='ctx'> 	struct acpi_table_bert *bert_tab;</div><div class='ctx'> 	unsigned int region_len;</div><div class='hunk'>@@ -127,13 +128,14 @@ static int __init bert_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	region_len = bert_tab-&gt;region_length;</div><div class='del'>-	if (!request_mem_region(bert_tab-&gt;address, region_len, "APEI BERT")) {</div><div class='del'>-		pr_err("Can't request iomem region &lt;%016llx-%016llx&gt;.\n",</div><div class='del'>-		       (unsigned long long)bert_tab-&gt;address,</div><div class='del'>-		       (unsigned long long)bert_tab-&gt;address + region_len - 1);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	apei_resources_init(&amp;bert_resources);</div><div class='add'>+	rc = apei_resources_add(&amp;bert_resources, bert_tab-&gt;address,</div><div class='add'>+				region_len, true);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = apei_resources_request(&amp;bert_resources, "APEI BERT");</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_fini;</div><div class='ctx'> 	boot_error_region = ioremap_cache(bert_tab-&gt;address, region_len);</div><div class='ctx'> 	if (boot_error_region) {</div><div class='ctx'> 		bert_print_all(boot_error_region, region_len);</div><div class='hunk'>@@ -142,7 +144,9 @@ static int __init bert_init(void)</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	release_mem_region(bert_tab-&gt;address, region_len);</div><div class='add'>+	apei_resources_release(&amp;bert_resources);</div><div class='add'>+out_fini:</div><div class='add'>+	apei_resources_fini(&amp;bert_resources);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c<br/>index eebb7e39c49c..ec50c32ea3da 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/apei/einj.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/apei/einj.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/apei/einj.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/apei/einj.c</a></div><div class='hunk'>@@ -711,7 +711,7 @@ static int __init einj_init(void)</div><div class='ctx'> </div><div class='ctx'> 	rc = einj_check_table(einj_tab);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		pr_warn(FW_BUG "Invalid EINJ table.n");</div><div class='add'>+		pr_warn(FW_BUG "Invalid EINJ table.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c<br/>index 0d099a24f776..b192b42a8351 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/apei/ghes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/apei/ghes.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/apei/ghes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/apei/ghes.c</a></div><div class='hunk'>@@ -44,6 +44,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/aer.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;acpi/ghes.h&gt;</div><div class='ctx'> #include &lt;acpi/apei.h&gt;</div><div class='hunk'>@@ -852,6 +853,8 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)</div><div class='ctx'> 		if (ghes_read_estatus(ghes, 1)) {</div><div class='ctx'> 			ghes_clear_estatus(ghes);</div><div class='ctx'> 			continue;</div><div class='add'>+		} else {</div><div class='add'>+			ret = NMI_HANDLED;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		sev = ghes_severity(ghes-&gt;estatus-&gt;error_severity);</div><div class='hunk'>@@ -863,12 +866,11 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 		__process_error(ghes);</div><div class='ctx'> 		ghes_clear_estatus(ghes);</div><div class='del'>-</div><div class='del'>-		ret = NMI_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG</div><div class='del'>-	irq_work_queue(&amp;ghes_proc_irq_work);</div><div class='add'>+	if (ret == NMI_HANDLED)</div><div class='add'>+		irq_work_queue(&amp;ghes_proc_irq_work);</div><div class='ctx'> #endif</div><div class='ctx'> 	atomic_dec(&amp;ghes_in_nmi);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c<br/>index 20b3fcf4007c..8f2a98e23bba 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/apei/hest.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/apei/hest.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/apei/hest.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/apei/hest.c</a></div><div class='hunk'>@@ -123,7 +123,13 @@ EXPORT_SYMBOL_GPL(apei_hest_parse);</div><div class='ctx'>  */</div><div class='ctx'> static int __init hest_parse_cmc(struct acpi_hest_header *hest_hdr, void *data)</div><div class='ctx'> {</div><div class='del'>-	return arch_apei_enable_cmcff(hest_hdr, data);</div><div class='add'>+	if (hest_hdr-&gt;type != ACPI_HEST_TYPE_IA32_CORRECTED_CHECK)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!acpi_disable_cmcff)</div><div class='add'>+		return !arch_apei_enable_cmcff(hest_hdr, data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ghes_arr {</div><div class='hunk'>@@ -232,8 +238,9 @@ void __init acpi_hest_init(void)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!acpi_disable_cmcff)</div><div class='del'>-		apei_hest_parse(hest_parse_cmc, NULL);</div><div class='add'>+	rc = apei_hest_parse(hest_parse_cmc, NULL);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ghes_disable) {</div><div class='ctx'> 		rc = apei_hest_parse(hest_parse_ghes_count, &amp;ghes_count);</div><div class='head'>diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c<br/>index 6b81746cd13c..4a5bb967250b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/arm64/iort.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/arm64/iort.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/arm64/iort.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/arm64/iort.c</a></div><div class='hunk'>@@ -19,8 +19,17 @@</div><div class='ctx'> #define pr_fmt(fmt)	"ACPI: IORT: " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/acpi_iort.h&gt;</div><div class='add'>+#include &lt;linux/iommu.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#define IORT_TYPE_MASK(type)	(1 &lt;&lt; (type))</div><div class='add'>+#define IORT_MSI_TYPE		(1 &lt;&lt; ACPI_IORT_NODE_ITS_GROUP)</div><div class='add'>+#define IORT_IOMMU_TYPE		((1 &lt;&lt; ACPI_IORT_NODE_SMMU) |	\</div><div class='add'>+				(1 &lt;&lt; ACPI_IORT_NODE_SMMU_V3))</div><div class='ctx'> </div><div class='ctx'> struct iort_its_msi_chip {</div><div class='ctx'> 	struct list_head	list;</div><div class='hunk'>@@ -28,6 +37,90 @@ struct iort_its_msi_chip {</div><div class='ctx'> 	u32			translation_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct iort_fwnode {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct acpi_iort_node *iort_node;</div><div class='add'>+	struct fwnode_handle *fwnode;</div><div class='add'>+};</div><div class='add'>+static LIST_HEAD(iort_fwnode_list);</div><div class='add'>+static DEFINE_SPINLOCK(iort_fwnode_lock);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iort_set_fwnode() - Create iort_fwnode and use it to register</div><div class='add'>+ *		       iommu data in the iort_fwnode_list</div><div class='add'>+ *</div><div class='add'>+ * @node: IORT table node associated with the IOMMU</div><div class='add'>+ * @fwnode: fwnode associated with the IORT node</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success</div><div class='add'>+ *          &lt;0 on failure</div><div class='add'>+ */</div><div class='add'>+static inline int iort_set_fwnode(struct acpi_iort_node *iort_node,</div><div class='add'>+				  struct fwnode_handle *fwnode)</div><div class='add'>+{</div><div class='add'>+	struct iort_fwnode *np;</div><div class='add'>+</div><div class='add'>+	np = kzalloc(sizeof(struct iort_fwnode), GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!np))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;np-&gt;list);</div><div class='add'>+	np-&gt;iort_node = iort_node;</div><div class='add'>+	np-&gt;fwnode = fwnode;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;iort_fwnode_lock);</div><div class='add'>+	list_add_tail(&amp;np-&gt;list, &amp;iort_fwnode_list);</div><div class='add'>+	spin_unlock(&amp;iort_fwnode_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iort_get_fwnode() - Retrieve fwnode associated with an IORT node</div><div class='add'>+ *</div><div class='add'>+ * @node: IORT table node to be looked-up</div><div class='add'>+ *</div><div class='add'>+ * Returns: fwnode_handle pointer on success, NULL on failure</div><div class='add'>+ */</div><div class='add'>+static inline</div><div class='add'>+struct fwnode_handle *iort_get_fwnode(struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	struct iort_fwnode *curr;</div><div class='add'>+	struct fwnode_handle *fwnode = NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;iort_fwnode_lock);</div><div class='add'>+	list_for_each_entry(curr, &amp;iort_fwnode_list, list) {</div><div class='add'>+		if (curr-&gt;iort_node == node) {</div><div class='add'>+			fwnode = curr-&gt;fwnode;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;iort_fwnode_lock);</div><div class='add'>+</div><div class='add'>+	return fwnode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iort_delete_fwnode() - Delete fwnode associated with an IORT node</div><div class='add'>+ *</div><div class='add'>+ * @node: IORT table node associated with fwnode to delete</div><div class='add'>+ */</div><div class='add'>+static inline void iort_delete_fwnode(struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	struct iort_fwnode *curr, *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;iort_fwnode_lock);</div><div class='add'>+	list_for_each_entry_safe(curr, tmp, &amp;iort_fwnode_list, list) {</div><div class='add'>+		if (curr-&gt;iort_node == node) {</div><div class='add'>+			list_del(&amp;curr-&gt;list);</div><div class='add'>+			kfree(curr);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;iort_fwnode_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> typedef acpi_status (*iort_find_node_callback)</div><div class='ctx'> 	(struct acpi_iort_node *node, void *context);</div><div class='ctx'> </div><div class='hunk'>@@ -141,6 +234,21 @@ static struct acpi_iort_node *iort_scan_node(enum acpi_iort_node_type type,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static acpi_status</div><div class='add'>+iort_match_type_callback(struct acpi_iort_node *node, void *context)</div><div class='add'>+{</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool iort_node_match(u8 type)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_node *node;</div><div class='add'>+</div><div class='add'>+	node = iort_scan_node(type, iort_match_type_callback, NULL);</div><div class='add'>+</div><div class='add'>+	return node != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static acpi_status iort_match_node_callback(struct acpi_iort_node *node,</div><div class='ctx'> 					    void *context)</div><div class='ctx'> {</div><div class='hunk'>@@ -212,9 +320,48 @@ static int iort_id_map(struct acpi_iort_id_mapping *map, u8 type, u32 rid_in,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static</div><div class='add'>+struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,</div><div class='add'>+					u32 *id_out, u8 type_mask,</div><div class='add'>+					int index)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_node *parent;</div><div class='add'>+	struct acpi_iort_id_mapping *map;</div><div class='add'>+</div><div class='add'>+	if (!node-&gt;mapping_offset || !node-&gt;mapping_count ||</div><div class='add'>+				     index &gt;= node-&gt;mapping_count)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	map = ACPI_ADD_PTR(struct acpi_iort_id_mapping, node,</div><div class='add'>+			   node-&gt;mapping_offset + index * sizeof(*map));</div><div class='add'>+</div><div class='add'>+	/* Firmware bug! */</div><div class='add'>+	if (!map-&gt;output_reference) {</div><div class='add'>+		pr_err(FW_BUG "[node %p type %d] ID map has NULL parent reference\n",</div><div class='add'>+		       node, node-&gt;type);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	parent = ACPI_ADD_PTR(struct acpi_iort_node, iort_table,</div><div class='add'>+			       map-&gt;output_reference);</div><div class='add'>+</div><div class='add'>+	if (!(IORT_TYPE_MASK(parent-&gt;type) &amp; type_mask))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (map-&gt;flags &amp; ACPI_IORT_ID_SINGLE_MAPPING) {</div><div class='add'>+		if (node-&gt;type == ACPI_IORT_NODE_NAMED_COMPONENT ||</div><div class='add'>+		    node-&gt;type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX) {</div><div class='add'>+			*id_out = map-&gt;output_base;</div><div class='add'>+			return parent;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct acpi_iort_node *iort_node_map_rid(struct acpi_iort_node *node,</div><div class='ctx'> 						u32 rid_in, u32 *rid_out,</div><div class='del'>-						u8 type)</div><div class='add'>+						u8 type_mask)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rid = rid_in;</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +370,7 @@ static struct acpi_iort_node *iort_node_map_rid(struct acpi_iort_node *node,</div><div class='ctx'> 		struct acpi_iort_id_mapping *map;</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		if (node-&gt;type == type) {</div><div class='add'>+		if (IORT_TYPE_MASK(node-&gt;type) &amp; type_mask) {</div><div class='ctx'> 			if (rid_out)</div><div class='ctx'> 				*rid_out = rid;</div><div class='ctx'> 			return node;</div><div class='hunk'>@@ -296,7 +443,7 @@ u32 iort_msi_map_rid(struct device *dev, u32 req_id)</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		return req_id;</div><div class='ctx'> </div><div class='del'>-	iort_node_map_rid(node, req_id, &amp;dev_id, ACPI_IORT_NODE_ITS_GROUP);</div><div class='add'>+	iort_node_map_rid(node, req_id, &amp;dev_id, IORT_MSI_TYPE);</div><div class='ctx'> 	return dev_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -318,7 +465,7 @@ static int iort_dev_find_its_id(struct device *dev, u32 req_id,</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	node = iort_node_map_rid(node, req_id, NULL, ACPI_IORT_NODE_ITS_GROUP);</div><div class='add'>+	node = iort_node_map_rid(node, req_id, NULL, IORT_MSI_TYPE);</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='hunk'>@@ -356,13 +503,459 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id)</div><div class='ctx'> 	return irq_find_matching_fwnode(handle, DOMAIN_BUS_PCI_MSI);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __get_pci_rid(struct pci_dev *pdev, u16 alias, void *data)</div><div class='add'>+{</div><div class='add'>+	u32 *rid = data;</div><div class='add'>+</div><div class='add'>+	*rid = alias;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int arm_smmu_iort_xlate(struct device *dev, u32 streamid,</div><div class='add'>+			       struct fwnode_handle *fwnode,</div><div class='add'>+			       const struct iommu_ops *ops)</div><div class='add'>+{</div><div class='add'>+	int ret = iommu_fwspec_init(dev, fwnode, ops);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = iommu_fwspec_add_ids(dev, &amp;streamid, 1);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iommu_ops *iort_iommu_xlate(struct device *dev,</div><div class='add'>+					struct acpi_iort_node *node,</div><div class='add'>+					u32 streamid)</div><div class='add'>+{</div><div class='add'>+	const struct iommu_ops *ops = NULL;</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+	struct fwnode_handle *iort_fwnode;</div><div class='add'>+</div><div class='add'>+	if (node) {</div><div class='add'>+		iort_fwnode = iort_get_fwnode(node);</div><div class='add'>+		if (!iort_fwnode)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		ops = iommu_ops_from_fwnode(iort_fwnode);</div><div class='add'>+		if (!ops)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		ret = arm_smmu_iort_xlate(dev, streamid, iort_fwnode, ops);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret ? NULL : ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iort_set_dma_mask - Set-up dma mask for a device.</div><div class='add'>+ *</div><div class='add'>+ * @dev: device to configure</div><div class='add'>+ */</div><div class='add'>+void iort_set_dma_mask(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Set default coherent_dma_mask to 32 bit.  Drivers are expected to</div><div class='add'>+	 * setup the correct supported mask.</div><div class='add'>+	 */</div><div class='add'>+	if (!dev-&gt;coherent_dma_mask)</div><div class='add'>+		dev-&gt;coherent_dma_mask = DMA_BIT_MASK(32);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set it to coherent_dma_mask by default if the architecture</div><div class='add'>+	 * code has not set it.</div><div class='add'>+	 */</div><div class='add'>+	if (!dev-&gt;dma_mask)</div><div class='add'>+		dev-&gt;dma_mask = &amp;dev-&gt;coherent_dma_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iort_iommu_configure - Set-up IOMMU configuration for a device.</div><div class='add'>+ *</div><div class='add'>+ * @dev: device to configure</div><div class='add'>+ *</div><div class='add'>+ * Returns: iommu_ops pointer on configuration success</div><div class='add'>+ *          NULL on configuration failure</div><div class='add'>+ */</div><div class='add'>+const struct iommu_ops *iort_iommu_configure(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_node *node, *parent;</div><div class='add'>+	const struct iommu_ops *ops = NULL;</div><div class='add'>+	u32 streamid = 0;</div><div class='add'>+</div><div class='add'>+	if (dev_is_pci(dev)) {</div><div class='add'>+		struct pci_bus *bus = to_pci_dev(dev)-&gt;bus;</div><div class='add'>+		u32 rid;</div><div class='add'>+</div><div class='add'>+		pci_for_each_dma_alias(to_pci_dev(dev), __get_pci_rid,</div><div class='add'>+				       &amp;rid);</div><div class='add'>+</div><div class='add'>+		node = iort_scan_node(ACPI_IORT_NODE_PCI_ROOT_COMPLEX,</div><div class='add'>+				      iort_match_node_callback, &amp;bus-&gt;dev);</div><div class='add'>+		if (!node)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		parent = iort_node_map_rid(node, rid, &amp;streamid,</div><div class='add'>+					   IORT_IOMMU_TYPE);</div><div class='add'>+</div><div class='add'>+		ops = iort_iommu_xlate(dev, parent, streamid);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		int i = 0;</div><div class='add'>+</div><div class='add'>+		node = iort_scan_node(ACPI_IORT_NODE_NAMED_COMPONENT,</div><div class='add'>+				      iort_match_node_callback, dev);</div><div class='add'>+		if (!node)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		parent = iort_node_get_id(node, &amp;streamid,</div><div class='add'>+					  IORT_IOMMU_TYPE, i++);</div><div class='add'>+</div><div class='add'>+		while (parent) {</div><div class='add'>+			ops = iort_iommu_xlate(dev, parent, streamid);</div><div class='add'>+</div><div class='add'>+			parent = iort_node_get_id(node, &amp;streamid,</div><div class='add'>+						  IORT_IOMMU_TYPE, i++);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init acpi_iort_register_irq(int hwirq, const char *name,</div><div class='add'>+					  int trigger,</div><div class='add'>+					  struct resource *res)</div><div class='add'>+{</div><div class='add'>+	int irq = acpi_register_gsi(NULL, hwirq, trigger,</div><div class='add'>+				    ACPI_ACTIVE_HIGH);</div><div class='add'>+</div><div class='add'>+	if (irq &lt;= 0) {</div><div class='add'>+		pr_err("could not register gsi hwirq %d name [%s]\n", hwirq,</div><div class='add'>+								      name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res-&gt;start = irq;</div><div class='add'>+	res-&gt;end = irq;</div><div class='add'>+	res-&gt;flags = IORESOURCE_IRQ;</div><div class='add'>+	res-&gt;name = name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init arm_smmu_v3_count_resources(struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_smmu_v3 *smmu;</div><div class='add'>+	/* Always present mem resource */</div><div class='add'>+	int num_res = 1;</div><div class='add'>+</div><div class='add'>+	/* Retrieve SMMUv3 specific data */</div><div class='add'>+	smmu = (struct acpi_iort_smmu_v3 *)node-&gt;node_data;</div><div class='add'>+</div><div class='add'>+	if (smmu-&gt;event_gsiv)</div><div class='add'>+		num_res++;</div><div class='add'>+</div><div class='add'>+	if (smmu-&gt;pri_gsiv)</div><div class='add'>+		num_res++;</div><div class='add'>+</div><div class='add'>+	if (smmu-&gt;gerr_gsiv)</div><div class='add'>+		num_res++;</div><div class='add'>+</div><div class='add'>+	if (smmu-&gt;sync_gsiv)</div><div class='add'>+		num_res++;</div><div class='add'>+</div><div class='add'>+	return num_res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init arm_smmu_v3_init_resources(struct resource *res,</div><div class='add'>+					      struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_smmu_v3 *smmu;</div><div class='add'>+	int num_res = 0;</div><div class='add'>+</div><div class='add'>+	/* Retrieve SMMUv3 specific data */</div><div class='add'>+	smmu = (struct acpi_iort_smmu_v3 *)node-&gt;node_data;</div><div class='add'>+</div><div class='add'>+	res[num_res].start = smmu-&gt;base_address;</div><div class='add'>+	res[num_res].end = smmu-&gt;base_address + SZ_128K - 1;</div><div class='add'>+	res[num_res].flags = IORESOURCE_MEM;</div><div class='add'>+</div><div class='add'>+	num_res++;</div><div class='add'>+</div><div class='add'>+	if (smmu-&gt;event_gsiv)</div><div class='add'>+		acpi_iort_register_irq(smmu-&gt;event_gsiv, "eventq",</div><div class='add'>+				       ACPI_EDGE_SENSITIVE,</div><div class='add'>+				       &amp;res[num_res++]);</div><div class='add'>+</div><div class='add'>+	if (smmu-&gt;pri_gsiv)</div><div class='add'>+		acpi_iort_register_irq(smmu-&gt;pri_gsiv, "priq",</div><div class='add'>+				       ACPI_EDGE_SENSITIVE,</div><div class='add'>+				       &amp;res[num_res++]);</div><div class='add'>+</div><div class='add'>+	if (smmu-&gt;gerr_gsiv)</div><div class='add'>+		acpi_iort_register_irq(smmu-&gt;gerr_gsiv, "gerror",</div><div class='add'>+				       ACPI_EDGE_SENSITIVE,</div><div class='add'>+				       &amp;res[num_res++]);</div><div class='add'>+</div><div class='add'>+	if (smmu-&gt;sync_gsiv)</div><div class='add'>+		acpi_iort_register_irq(smmu-&gt;sync_gsiv, "cmdq-sync",</div><div class='add'>+				       ACPI_EDGE_SENSITIVE,</div><div class='add'>+				       &amp;res[num_res++]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __init arm_smmu_v3_is_coherent(struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_smmu_v3 *smmu;</div><div class='add'>+</div><div class='add'>+	/* Retrieve SMMUv3 specific data */</div><div class='add'>+	smmu = (struct acpi_iort_smmu_v3 *)node-&gt;node_data;</div><div class='add'>+</div><div class='add'>+	return smmu-&gt;flags &amp; ACPI_IORT_SMMU_V3_COHACC_OVERRIDE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init arm_smmu_count_resources(struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_smmu *smmu;</div><div class='add'>+</div><div class='add'>+	/* Retrieve SMMU specific data */</div><div class='add'>+	smmu = (struct acpi_iort_smmu *)node-&gt;node_data;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only consider the global fault interrupt and ignore the</div><div class='add'>+	 * configuration access interrupt.</div><div class='add'>+	 *</div><div class='add'>+	 * MMIO address and global fault interrupt resources are always</div><div class='add'>+	 * present so add them to the context interrupt count as a static</div><div class='add'>+	 * value.</div><div class='add'>+	 */</div><div class='add'>+	return smmu-&gt;context_interrupt_count + 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init arm_smmu_init_resources(struct resource *res,</div><div class='add'>+					   struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_smmu *smmu;</div><div class='add'>+	int i, hw_irq, trigger, num_res = 0;</div><div class='add'>+	u64 *ctx_irq, *glb_irq;</div><div class='add'>+</div><div class='add'>+	/* Retrieve SMMU specific data */</div><div class='add'>+	smmu = (struct acpi_iort_smmu *)node-&gt;node_data;</div><div class='add'>+</div><div class='add'>+	res[num_res].start = smmu-&gt;base_address;</div><div class='add'>+	res[num_res].end = smmu-&gt;base_address + smmu-&gt;span - 1;</div><div class='add'>+	res[num_res].flags = IORESOURCE_MEM;</div><div class='add'>+	num_res++;</div><div class='add'>+</div><div class='add'>+	glb_irq = ACPI_ADD_PTR(u64, node, smmu-&gt;global_interrupt_offset);</div><div class='add'>+	/* Global IRQs */</div><div class='add'>+	hw_irq = IORT_IRQ_MASK(glb_irq[0]);</div><div class='add'>+	trigger = IORT_IRQ_TRIGGER_MASK(glb_irq[0]);</div><div class='add'>+</div><div class='add'>+	acpi_iort_register_irq(hw_irq, "arm-smmu-global", trigger,</div><div class='add'>+				     &amp;res[num_res++]);</div><div class='add'>+</div><div class='add'>+	/* Context IRQs */</div><div class='add'>+	ctx_irq = ACPI_ADD_PTR(u64, node, smmu-&gt;context_interrupt_offset);</div><div class='add'>+	for (i = 0; i &lt; smmu-&gt;context_interrupt_count; i++) {</div><div class='add'>+		hw_irq = IORT_IRQ_MASK(ctx_irq[i]);</div><div class='add'>+		trigger = IORT_IRQ_TRIGGER_MASK(ctx_irq[i]);</div><div class='add'>+</div><div class='add'>+		acpi_iort_register_irq(hw_irq, "arm-smmu-context", trigger,</div><div class='add'>+				       &amp;res[num_res++]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __init arm_smmu_is_coherent(struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_smmu *smmu;</div><div class='add'>+</div><div class='add'>+	/* Retrieve SMMU specific data */</div><div class='add'>+	smmu = (struct acpi_iort_smmu *)node-&gt;node_data;</div><div class='add'>+</div><div class='add'>+	return smmu-&gt;flags &amp; ACPI_IORT_SMMU_COHERENT_WALK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iort_iommu_config {</div><div class='add'>+	const char *name;</div><div class='add'>+	int (*iommu_init)(struct acpi_iort_node *node);</div><div class='add'>+	bool (*iommu_is_coherent)(struct acpi_iort_node *node);</div><div class='add'>+	int (*iommu_count_resources)(struct acpi_iort_node *node);</div><div class='add'>+	void (*iommu_init_resources)(struct resource *res,</div><div class='add'>+				     struct acpi_iort_node *node);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iort_iommu_config iort_arm_smmu_v3_cfg __initconst = {</div><div class='add'>+	.name = "arm-smmu-v3",</div><div class='add'>+	.iommu_is_coherent = arm_smmu_v3_is_coherent,</div><div class='add'>+	.iommu_count_resources = arm_smmu_v3_count_resources,</div><div class='add'>+	.iommu_init_resources = arm_smmu_v3_init_resources</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iort_iommu_config iort_arm_smmu_cfg __initconst = {</div><div class='add'>+	.name = "arm-smmu",</div><div class='add'>+	.iommu_is_coherent = arm_smmu_is_coherent,</div><div class='add'>+	.iommu_count_resources = arm_smmu_count_resources,</div><div class='add'>+	.iommu_init_resources = arm_smmu_init_resources</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init</div><div class='add'>+const struct iort_iommu_config *iort_get_iommu_cfg(struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	switch (node-&gt;type) {</div><div class='add'>+	case ACPI_IORT_NODE_SMMU_V3:</div><div class='add'>+		return &amp;iort_arm_smmu_v3_cfg;</div><div class='add'>+	case ACPI_IORT_NODE_SMMU:</div><div class='add'>+		return &amp;iort_arm_smmu_cfg;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iort_add_smmu_platform_device() - Allocate a platform device for SMMU</div><div class='add'>+ * @node: Pointer to SMMU ACPI IORT node</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success, &lt;0 failure</div><div class='add'>+ */</div><div class='add'>+static int __init iort_add_smmu_platform_device(struct acpi_iort_node *node)</div><div class='add'>+{</div><div class='add'>+	struct fwnode_handle *fwnode;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	struct resource *r;</div><div class='add'>+	enum dev_dma_attr attr;</div><div class='add'>+	int ret, count;</div><div class='add'>+	const struct iort_iommu_config *ops = iort_get_iommu_cfg(node);</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	pdev = platform_device_alloc(ops-&gt;name, PLATFORM_DEVID_AUTO);</div><div class='add'>+	if (!pdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	count = ops-&gt;iommu_count_resources(node);</div><div class='add'>+</div><div class='add'>+	r = kcalloc(count, sizeof(*r), GFP_KERNEL);</div><div class='add'>+	if (!r) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto dev_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ops-&gt;iommu_init_resources(r, node);</div><div class='add'>+</div><div class='add'>+	ret = platform_device_add_resources(pdev, r, count);</div><div class='add'>+	/*</div><div class='add'>+	 * Resources are duplicated in platform_device_add_resources,</div><div class='add'>+	 * free their allocated memory</div><div class='add'>+	 */</div><div class='add'>+	kfree(r);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto dev_put;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Add a copy of IORT node pointer to platform_data to</div><div class='add'>+	 * be used to retrieve IORT data information.</div><div class='add'>+	 */</div><div class='add'>+	ret = platform_device_add_data(pdev, &amp;node, sizeof(node));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto dev_put;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We expect the dma masks to be equivalent for</div><div class='add'>+	 * all SMMUs set-ups</div><div class='add'>+	 */</div><div class='add'>+	pdev-&gt;dev.dma_mask = &amp;pdev-&gt;dev.coherent_dma_mask;</div><div class='add'>+</div><div class='add'>+	fwnode = iort_get_fwnode(node);</div><div class='add'>+</div><div class='add'>+	if (!fwnode) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto dev_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdev-&gt;dev.fwnode = fwnode;</div><div class='add'>+</div><div class='add'>+	attr = ops-&gt;iommu_is_coherent(node) ?</div><div class='add'>+			     DEV_DMA_COHERENT : DEV_DMA_NON_COHERENT;</div><div class='add'>+</div><div class='add'>+	/* Configure DMA for the page table walker */</div><div class='add'>+	acpi_dma_configure(&amp;pdev-&gt;dev, attr);</div><div class='add'>+</div><div class='add'>+	ret = platform_device_add(pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto dma_deconfigure;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+dma_deconfigure:</div><div class='add'>+	acpi_dma_deconfigure(&amp;pdev-&gt;dev);</div><div class='add'>+dev_put:</div><div class='add'>+	platform_device_put(pdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init iort_init_platform_devices(void)</div><div class='add'>+{</div><div class='add'>+	struct acpi_iort_node *iort_node, *iort_end;</div><div class='add'>+	struct acpi_table_iort *iort;</div><div class='add'>+	struct fwnode_handle *fwnode;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * iort_table and iort both point to the start of IORT table, but</div><div class='add'>+	 * have different struct types</div><div class='add'>+	 */</div><div class='add'>+	iort = (struct acpi_table_iort *)iort_table;</div><div class='add'>+</div><div class='add'>+	/* Get the first IORT node */</div><div class='add'>+	iort_node = ACPI_ADD_PTR(struct acpi_iort_node, iort,</div><div class='add'>+				 iort-&gt;node_offset);</div><div class='add'>+	iort_end = ACPI_ADD_PTR(struct acpi_iort_node, iort,</div><div class='add'>+				iort_table-&gt;length);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; iort-&gt;node_count; i++) {</div><div class='add'>+		if (iort_node &gt;= iort_end) {</div><div class='add'>+			pr_err("iort node pointer overflows, bad table\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((iort_node-&gt;type == ACPI_IORT_NODE_SMMU) ||</div><div class='add'>+			(iort_node-&gt;type == ACPI_IORT_NODE_SMMU_V3)) {</div><div class='add'>+</div><div class='add'>+			fwnode = acpi_alloc_fwnode_static();</div><div class='add'>+			if (!fwnode)</div><div class='add'>+				return;</div><div class='add'>+</div><div class='add'>+			iort_set_fwnode(iort_node, fwnode);</div><div class='add'>+</div><div class='add'>+			ret = iort_add_smmu_platform_device(iort_node);</div><div class='add'>+			if (ret) {</div><div class='add'>+				iort_delete_fwnode(iort_node);</div><div class='add'>+				acpi_free_fwnode_static(fwnode);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iort_node = ACPI_ADD_PTR(struct acpi_iort_node, iort_node,</div><div class='add'>+					 iort_node-&gt;length);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init acpi_iort_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_table(ACPI_SIG_IORT, 0, &amp;iort_table);</div><div class='del'>-	if (ACPI_FAILURE(status) &amp;&amp; status != AE_NOT_FOUND) {</div><div class='del'>-		const char *msg = acpi_format_exception(status);</div><div class='del'>-		pr_err("Failed to get table, %s\n", msg);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		if (status != AE_NOT_FOUND) {</div><div class='add'>+			const char *msg = acpi_format_exception(status);</div><div class='add'>+</div><div class='add'>+			pr_err("Failed to get table, %s\n", msg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	iort_init_platform_devices();</div><div class='add'>+</div><div class='add'>+	acpi_probe_device_table(iort);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c<br/>index 93ecae55fe6a..4ef1e4624b2b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/battery.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/battery.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/battery.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/battery.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #ifdef CONFIG_ACPI_PROCFS_POWER</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='hunk'>@@ -430,39 +430,24 @@ static int acpi_battery_get_status(struct acpi_battery *battery)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int acpi_battery_get_info(struct acpi_battery *battery)</div><div class='add'>+</div><div class='add'>+static int extract_battery_info(const int use_bix,</div><div class='add'>+			 struct acpi_battery *battery,</div><div class='add'>+			 const struct acpi_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	int result = -EFAULT;</div><div class='del'>-	acpi_status status = 0;</div><div class='del'>-	char *name = test_bit(ACPI_BATTERY_XINFO_PRESENT, &amp;battery-&gt;flags) ?</div><div class='del'>-			"_BIX" : "_BIF";</div><div class='del'>-</div><div class='del'>-	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> </div><div class='del'>-	if (!acpi_battery_present(battery))</div><div class='del'>-		return 0;</div><div class='del'>-	mutex_lock(&amp;battery-&gt;lock);</div><div class='del'>-	status = acpi_evaluate_object(battery-&gt;device-&gt;handle, name,</div><div class='del'>-						NULL, &amp;buffer);</div><div class='del'>-	mutex_unlock(&amp;battery-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_EXCEPTION((AE_INFO, status, "Evaluating %s", name));</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (battery_bix_broken_package)</div><div class='del'>-		result = extract_package(battery, buffer.pointer,</div><div class='add'>+	if (use_bix &amp;&amp; battery_bix_broken_package)</div><div class='add'>+		result = extract_package(battery, buffer-&gt;pointer,</div><div class='ctx'> 				extended_info_offsets + 1,</div><div class='ctx'> 				ARRAY_SIZE(extended_info_offsets) - 1);</div><div class='del'>-	else if (test_bit(ACPI_BATTERY_XINFO_PRESENT, &amp;battery-&gt;flags))</div><div class='del'>-		result = extract_package(battery, buffer.pointer,</div><div class='add'>+	else if (use_bix)</div><div class='add'>+		result = extract_package(battery, buffer-&gt;pointer,</div><div class='ctx'> 				extended_info_offsets,</div><div class='ctx'> 				ARRAY_SIZE(extended_info_offsets));</div><div class='ctx'> 	else</div><div class='del'>-		result = extract_package(battery, buffer.pointer,</div><div class='add'>+		result = extract_package(battery, buffer-&gt;pointer,</div><div class='ctx'> 				info_offsets, ARRAY_SIZE(info_offsets));</div><div class='del'>-	kfree(buffer.pointer);</div><div class='ctx'> 	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &amp;battery-&gt;flags))</div><div class='ctx'> 		battery-&gt;full_charge_capacity = battery-&gt;design_capacity;</div><div class='ctx'> 	if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &amp;battery-&gt;flags) &amp;&amp;</div><div class='hunk'>@@ -483,6 +468,45 @@ static int acpi_battery_get_info(struct acpi_battery *battery)</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int acpi_battery_get_info(struct acpi_battery *battery)</div><div class='add'>+{</div><div class='add'>+	const int xinfo = test_bit(ACPI_BATTERY_XINFO_PRESENT, &amp;battery-&gt;flags);</div><div class='add'>+	int use_bix;</div><div class='add'>+	int result = -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!acpi_battery_present(battery))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	for (use_bix = xinfo ? 1 : 0; use_bix &gt;= 0; use_bix--) {</div><div class='add'>+		struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='add'>+		acpi_status status = AE_ERROR;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;battery-&gt;lock);</div><div class='add'>+		status = acpi_evaluate_object(battery-&gt;device-&gt;handle,</div><div class='add'>+					      use_bix ? "_BIX":"_BIF",</div><div class='add'>+					      NULL, &amp;buffer);</div><div class='add'>+		mutex_unlock(&amp;battery-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			ACPI_EXCEPTION((AE_INFO, status, "Evaluating %s",</div><div class='add'>+					use_bix ? "_BIX":"_BIF"));</div><div class='add'>+		} else {</div><div class='add'>+			result = extract_battery_info(use_bix,</div><div class='add'>+						      battery,</div><div class='add'>+						      &amp;buffer);</div><div class='add'>+</div><div class='add'>+			kfree(buffer.pointer);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!result &amp;&amp; !use_bix &amp;&amp; xinfo)</div><div class='add'>+		pr_warn(FW_BUG "The _BIX method is broken, using _BIF.\n");</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int acpi_battery_get_state(struct acpi_battery *battery)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='head'>diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c<br/>index 75f128e766a9..ca28aa572aa9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/bgrt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/bgrt.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/bgrt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/bgrt.c</a></div><div class='hunk'>@@ -15,40 +15,41 @@</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/efi-bgrt.h&gt;</div><div class='ctx'> </div><div class='add'>+static void *bgrt_image;</div><div class='ctx'> static struct kobject *bgrt_kobj;</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_version(struct device *dev,</div><div class='ctx'> 			    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab-&gt;version);</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.version);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_status(struct device *dev,</div><div class='ctx'> 			   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab-&gt;status);</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.status);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_type(struct device *dev,</div><div class='ctx'> 			 struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab-&gt;image_type);</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_type);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(type, S_IRUGO, show_type, NULL);</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_xoffset(struct device *dev,</div><div class='ctx'> 			    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab-&gt;image_offset_x);</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_offset_x);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(xoffset, S_IRUGO, show_xoffset, NULL);</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_yoffset(struct device *dev,</div><div class='ctx'> 			    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab-&gt;image_offset_y);</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_offset_y);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(yoffset, S_IRUGO, show_yoffset, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -84,15 +85,24 @@ static int __init bgrt_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!bgrt_image)</div><div class='add'>+	if (!bgrt_tab.image_address)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	bgrt_image = memremap(bgrt_tab.image_address, bgrt_image_size,</div><div class='add'>+			      MEMREMAP_WB);</div><div class='add'>+	if (!bgrt_image) {</div><div class='add'>+		pr_notice("Ignoring BGRT: failed to map image memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	bin_attr_image.private = bgrt_image;</div><div class='ctx'> 	bin_attr_image.size = bgrt_image_size;</div><div class='ctx'> </div><div class='ctx'> 	bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);</div><div class='del'>-	if (!bgrt_kobj)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (!bgrt_kobj) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_memmap;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = sysfs_create_group(bgrt_kobj, &amp;bgrt_attribute_group);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -102,6 +112,8 @@ static int __init bgrt_init(void)</div><div class='ctx'> </div><div class='ctx'> out_kobject:</div><div class='ctx'> 	kobject_put(bgrt_kobj);</div><div class='add'>+out_memmap:</div><div class='add'>+	memunmap(bgrt_image);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> device_initcall(bgrt_init);</div><div class='head'>diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c<br/>index bdc67bad61a7..4421f7c9981c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/blacklist.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/blacklist.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/blacklist.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/blacklist.c</a></div><div class='hunk'>@@ -160,6 +160,34 @@ static struct dmi_system_id acpi_rev_dmi_table[] __initdata = {</div><div class='ctx'> 		      DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9343"),</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+	 .callback = dmi_enable_rev_override,</div><div class='add'>+	 .ident = "DELL Precision 5520",</div><div class='add'>+	 .matches = {</div><div class='add'>+		      DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+		      DMI_MATCH(DMI_PRODUCT_NAME, "Precision 5520"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	 .callback = dmi_enable_rev_override,</div><div class='add'>+	 .ident = "DELL Precision 3520",</div><div class='add'>+	 .matches = {</div><div class='add'>+		      DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+		      DMI_MATCH(DMI_PRODUCT_NAME, "Precision 3520"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	/*</div><div class='add'>+	 * Resolves a quirk with the Dell Latitude 3350 that</div><div class='add'>+	 * causes the ethernet adapter to not function.</div><div class='add'>+	 */</div><div class='add'>+	{</div><div class='add'>+	 .callback = dmi_enable_rev_override,</div><div class='add'>+	 .ident = "DELL Latitude 3350",</div><div class='add'>+	 .matches = {</div><div class='add'>+		      DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+		      DMI_MATCH(DMI_PRODUCT_NAME, "Latitude 3350"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> #endif</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c<br/>index 56190d00fd87..80cb5eb75b63 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/bus.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/bus.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/bus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/bus.c</a></div><div class='hunk'>@@ -331,6 +331,16 @@ static void acpi_bus_osc_support(void)</div><div class='ctx'> 	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;</div><div class='ctx'> 	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PCLPI_SUPPORT;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_HWP)) {</div><div class='add'>+		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_CPC_SUPPORT;</div><div class='add'>+		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_CPCV2_SUPPORT;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_SCHED_MC_PRIO))</div><div class='add'>+		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_CPC_DIVERSE_HIGH_SUPPORT;</div><div class='add'>+</div><div class='ctx'> 	if (!ghes_disable)</div><div class='ctx'> 		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_APEI_SUPPORT;</div><div class='ctx'> 	if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &amp;handle)))</div><div class='hunk'>@@ -667,6 +677,48 @@ static bool acpi_of_match_device(struct acpi_device *adev,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool acpi_of_modalias(struct acpi_device *adev,</div><div class='add'>+			     char *modalias, size_t len)</div><div class='add'>+{</div><div class='add'>+	const union acpi_object *of_compatible;</div><div class='add'>+	const union acpi_object *obj;</div><div class='add'>+	const char *str, *chr;</div><div class='add'>+</div><div class='add'>+	of_compatible = adev-&gt;data.of_compatible;</div><div class='add'>+	if (!of_compatible)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (of_compatible-&gt;type == ACPI_TYPE_PACKAGE)</div><div class='add'>+		obj = of_compatible-&gt;package.elements;</div><div class='add'>+	else /* Must be ACPI_TYPE_STRING. */</div><div class='add'>+		obj = of_compatible;</div><div class='add'>+</div><div class='add'>+	str = obj-&gt;string.pointer;</div><div class='add'>+	chr = strchr(str, ',');</div><div class='add'>+	strlcpy(modalias, chr ? chr + 1 : str, len);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_set_modalias - Set modalias using "compatible" property or supplied ID</div><div class='add'>+ * @adev:	ACPI device object to match</div><div class='add'>+ * @default_id:	ID string to use as default if no compatible string found</div><div class='add'>+ * @modalias:   Pointer to buffer that modalias value will be copied into</div><div class='add'>+ * @len:	Length of modalias buffer</div><div class='add'>+ *</div><div class='add'>+ * This is a counterpart of of_modalias_node() for struct acpi_device objects.</div><div class='add'>+ * If there is a compatible string for @adev, it will be copied to @modalias</div><div class='add'>+ * with the vendor prefix stripped; otherwise, @default_id will be used.</div><div class='add'>+ */</div><div class='add'>+void acpi_set_modalias(struct acpi_device *adev, const char *default_id,</div><div class='add'>+		       char *modalias, size_t len)</div><div class='add'>+{</div><div class='add'>+	if (!acpi_of_modalias(adev, modalias, len))</div><div class='add'>+		strlcpy(modalias, default_id, len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(acpi_set_modalias);</div><div class='add'>+</div><div class='ctx'> static bool __acpi_match_device_cls(const struct acpi_device_id *id,</div><div class='ctx'> 				    struct acpi_hardware_id *hwid)</div><div class='ctx'> {</div><div class='hunk'>@@ -964,7 +1016,7 @@ void __init acpi_early_init(void)</div><div class='ctx'> 	if (!acpi_strict)</div><div class='ctx'> 		acpi_gbl_enable_interpreter_slack = TRUE;</div><div class='ctx'> </div><div class='del'>-	acpi_gbl_permanent_mmap = 1;</div><div class='add'>+	acpi_permanent_mmap = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the machine falls into the DMI check table,</div><div class='head'>diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c<br/>index e19f530f1083..668137e4a069 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/button.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/button.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/button.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/button.c</a></div><div class='hunk'>@@ -57,7 +57,6 @@</div><div class='ctx'> </div><div class='ctx'> #define ACPI_BUTTON_LID_INIT_IGNORE	0x00</div><div class='ctx'> #define ACPI_BUTTON_LID_INIT_OPEN	0x01</div><div class='del'>-#define ACPI_BUTTON_LID_INIT_METHOD	0x02</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT		ACPI_BUTTON_COMPONENT</div><div class='ctx'> ACPI_MODULE_NAME("button");</div><div class='hunk'>@@ -113,7 +112,7 @@ struct acpi_button {</div><div class='ctx'> </div><div class='ctx'> static BLOCKING_NOTIFIER_HEAD(acpi_lid_notifier);</div><div class='ctx'> static struct acpi_device *lid_device;</div><div class='del'>-static u8 lid_init_state = ACPI_BUTTON_LID_INIT_METHOD;</div><div class='add'>+static u8 lid_init_state = ACPI_BUTTON_LID_INIT_OPEN;</div><div class='ctx'> </div><div class='ctx'> static unsigned long lid_report_interval __read_mostly = 500;</div><div class='ctx'> module_param(lid_report_interval, ulong, 0644);</div><div class='hunk'>@@ -377,9 +376,6 @@ static void acpi_lid_initialize_state(struct acpi_device *device)</div><div class='ctx'> 	case ACPI_BUTTON_LID_INIT_OPEN:</div><div class='ctx'> 		(void)acpi_lid_notify_state(device, 1);</div><div class='ctx'> 		break;</div><div class='del'>-	case ACPI_BUTTON_LID_INIT_METHOD:</div><div class='del'>-		(void)acpi_lid_update_state(device);</div><div class='del'>-		break;</div><div class='ctx'> 	case ACPI_BUTTON_LID_INIT_IGNORE:</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -563,9 +559,6 @@ static int param_set_lid_init_state(const char *val, struct kernel_param *kp)</div><div class='ctx'> 	if (!strncmp(val, "open", sizeof("open") - 1)) {</div><div class='ctx'> 		lid_init_state = ACPI_BUTTON_LID_INIT_OPEN;</div><div class='ctx'> 		pr_info("Notify initial lid state as open\n");</div><div class='del'>-	} else if (!strncmp(val, "method", sizeof("method") - 1)) {</div><div class='del'>-		lid_init_state = ACPI_BUTTON_LID_INIT_METHOD;</div><div class='del'>-		pr_info("Notify initial lid state with _LID return value\n");</div><div class='ctx'> 	} else if (!strncmp(val, "ignore", sizeof("ignore") - 1)) {</div><div class='ctx'> 		lid_init_state = ACPI_BUTTON_LID_INIT_IGNORE;</div><div class='ctx'> 		pr_info("Do not notify initial lid state\n");</div><div class='hunk'>@@ -579,8 +572,6 @@ static int param_get_lid_init_state(char *buffer, struct kernel_param *kp)</div><div class='ctx'> 	switch (lid_init_state) {</div><div class='ctx'> 	case ACPI_BUTTON_LID_INIT_OPEN:</div><div class='ctx'> 		return sprintf(buffer, "open");</div><div class='del'>-	case ACPI_BUTTON_LID_INIT_METHOD:</div><div class='del'>-		return sprintf(buffer, "method");</div><div class='ctx'> 	case ACPI_BUTTON_LID_INIT_IGNORE:</div><div class='ctx'> 		return sprintf(buffer, "ignore");</div><div class='ctx'> 	default:</div><div class='head'>diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c<br/>index d0d0504b7c89..3ca0729f7e0e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/cppc_acpi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/cppc_acpi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/cppc_acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/cppc_acpi.c</a></div><div class='hunk'>@@ -776,21 +776,25 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)</div><div class='ctx'> 		init_waitqueue_head(&amp;pcc_data.pcc_write_wait_q);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Plug PSD data into this CPUs CPC descriptor. */</div><div class='del'>-	per_cpu(cpc_desc_ptr, pr-&gt;id) = cpc_ptr;</div><div class='del'>-</div><div class='ctx'> 	/* Everything looks okay */</div><div class='ctx'> 	pr_debug("Parsed CPC struct for CPU: %d\n", pr-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	/* Add per logical CPU nodes for reading its feedback counters. */</div><div class='ctx'> 	cpu_dev = get_cpu_device(pr-&gt;id);</div><div class='del'>-	if (!cpu_dev)</div><div class='add'>+	if (!cpu_dev) {</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Plug PSD data into this CPUs CPC descriptor. */</div><div class='add'>+	per_cpu(cpc_desc_ptr, pr-&gt;id) = cpc_ptr;</div><div class='ctx'> </div><div class='ctx'> 	ret = kobject_init_and_add(&amp;cpc_ptr-&gt;kobj, &amp;cppc_ktype, &amp;cpu_dev-&gt;kobj,</div><div class='ctx'> 			"acpi_cppc");</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		per_cpu(cpc_desc_ptr, pr-&gt;id) = NULL;</div><div class='ctx'> 		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(output.pointer);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -824,6 +828,8 @@ void acpi_cppc_processor_exit(struct acpi_processor *pr)</div><div class='ctx'> 	void __iomem *addr;</div><div class='ctx'> </div><div class='ctx'> 	cpc_ptr = per_cpu(cpc_desc_ptr, pr-&gt;id);</div><div class='add'>+	if (!cpc_ptr)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Free all the mapped sys mem areas for this CPU */</div><div class='ctx'> 	for (i = 2; i &lt; cpc_ptr-&gt;num_entries; i++) {</div><div class='head'>diff --git a/drivers/acpi/device_sysfs.c b/drivers/acpi/device_sysfs.c<br/>index 7b2c48fde4e2..24418932612e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/device_sysfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/device_sysfs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/device_sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/device_sysfs.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ struct acpi_data_node_attr {</div><div class='ctx'> </div><div class='ctx'> static ssize_t data_node_show_path(struct acpi_data_node *dn, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return acpi_object_path(dn-&gt;handle, buf);</div><div class='add'>+	return dn-&gt;handle ? acpi_object_path(dn-&gt;handle, buf) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DATA_NODE_ATTR(path);</div><div class='hunk'>@@ -105,10 +105,10 @@ static void acpi_expose_nondev_subnodes(struct kobject *kobj,</div><div class='ctx'> 		init_completion(&amp;dn-&gt;kobj_done);</div><div class='ctx'> 		ret = kobject_init_and_add(&amp;dn-&gt;kobj, &amp;acpi_data_node_ktype,</div><div class='ctx'> 					   kobj, "%s", dn-&gt;name);</div><div class='del'>-		if (ret)</div><div class='del'>-			acpi_handle_err(dn-&gt;handle, "Failed to expose (%d)\n", ret);</div><div class='del'>-		else</div><div class='add'>+		if (!ret)</div><div class='ctx'> 			acpi_expose_nondev_subnodes(&amp;dn-&gt;kobj, &amp;dn-&gt;data);</div><div class='add'>+		else if (dn-&gt;handle)</div><div class='add'>+			acpi_handle_err(dn-&gt;handle, "Failed to expose (%d)\n", ret);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c<br/>index 48e19d013170..c24235d8fb52 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/ec.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/ec.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/ec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/ec.c</a></div><div class='hunk'>@@ -188,7 +188,6 @@ EXPORT_SYMBOL(first_ec);</div><div class='ctx'> static bool boot_ec_is_ecdt = false;</div><div class='ctx'> static struct workqueue_struct *ec_query_wq;</div><div class='ctx'> </div><div class='del'>-static int EC_FLAGS_CLEAR_ON_RESUME; /* Needs acpi_ec_clear() on boot/resume */</div><div class='ctx'> static int EC_FLAGS_QUERY_HANDSHAKE; /* Needs QR_EC issued when SCI_EVT set */</div><div class='ctx'> static int EC_FLAGS_CORRECT_ECDT; /* Needs ECDT port address correction */</div><div class='ctx'> </div><div class='hunk'>@@ -492,26 +491,6 @@ static inline void __acpi_ec_disable_event(struct acpi_ec *ec)</div><div class='ctx'> 		ec_log_drv("event blocked");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Process _Q events that might have accumulated in the EC.</div><div class='del'>- * Run with locked ec mutex.</div><div class='del'>- */</div><div class='del'>-static void acpi_ec_clear(struct acpi_ec *ec)</div><div class='del'>-{</div><div class='del'>-	int i, status;</div><div class='del'>-	u8 value = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ACPI_EC_CLEAR_MAX; i++) {</div><div class='del'>-		status = acpi_ec_query(ec, &amp;value);</div><div class='del'>-		if (status || !value)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(i == ACPI_EC_CLEAR_MAX))</div><div class='del'>-		pr_warn("Warning: Maximum of %d stale EC events cleared\n", i);</div><div class='del'>-	else</div><div class='del'>-		pr_info("%d stale EC events cleared\n", i);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void acpi_ec_enable_event(struct acpi_ec *ec)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -520,10 +499,6 @@ static void acpi_ec_enable_event(struct acpi_ec *ec)</div><div class='ctx'> 	if (acpi_ec_started(ec))</div><div class='ctx'> 		__acpi_ec_enable_event(ec);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ec-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Drain additional events if hardware requires that */</div><div class='del'>-	if (EC_FLAGS_CLEAR_ON_RESUME)</div><div class='del'>-		acpi_ec_clear(ec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='hunk'>@@ -729,12 +704,12 @@ static void start_transaction(struct acpi_ec *ec)</div><div class='ctx'> </div><div class='ctx'> static int ec_guard(struct acpi_ec *ec)</div><div class='ctx'> {</div><div class='del'>-	unsigned long guard = usecs_to_jiffies(ec_polling_guard);</div><div class='add'>+	unsigned long guard = usecs_to_jiffies(ec-&gt;polling_guard);</div><div class='ctx'> 	unsigned long timeout = ec-&gt;timestamp + guard;</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure guarding period before polling EC status */</div><div class='ctx'> 	do {</div><div class='del'>-		if (ec_busy_polling) {</div><div class='add'>+		if (ec-&gt;busy_polling) {</div><div class='ctx'> 			/* Perform busy polling */</div><div class='ctx'> 			if (ec_transaction_completed(ec))</div><div class='ctx'> 				return 0;</div><div class='hunk'>@@ -998,6 +973,28 @@ static void acpi_ec_stop(struct acpi_ec *ec, bool suspending)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ec-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void acpi_ec_enter_noirq(struct acpi_ec *ec)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ec-&gt;lock, flags);</div><div class='add'>+	ec-&gt;busy_polling = true;</div><div class='add'>+	ec-&gt;polling_guard = 0;</div><div class='add'>+	ec_log_drv("interrupt blocked");</div><div class='add'>+	spin_unlock_irqrestore(&amp;ec-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void acpi_ec_leave_noirq(struct acpi_ec *ec)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ec-&gt;lock, flags);</div><div class='add'>+	ec-&gt;busy_polling = ec_busy_polling;</div><div class='add'>+	ec-&gt;polling_guard = ec_polling_guard;</div><div class='add'>+	ec_log_drv("interrupt unblocked");</div><div class='add'>+	spin_unlock_irqrestore(&amp;ec-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void acpi_ec_block_transactions(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_ec *ec = first_ec;</div><div class='hunk'>@@ -1278,7 +1275,7 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,</div><div class='ctx'> 	if (function != ACPI_READ &amp;&amp; function != ACPI_WRITE)</div><div class='ctx'> 		return AE_BAD_PARAMETER;</div><div class='ctx'> </div><div class='del'>-	if (ec_busy_polling || bits &gt; 8)</div><div class='add'>+	if (ec-&gt;busy_polling || bits &gt; 8)</div><div class='ctx'> 		acpi_ec_burst_enable(ec);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; bytes; ++i, ++address, ++value)</div><div class='hunk'>@@ -1286,7 +1283,7 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,</div><div class='ctx'> 			acpi_ec_read(ec, address, value) :</div><div class='ctx'> 			acpi_ec_write(ec, address, *value);</div><div class='ctx'> </div><div class='del'>-	if (ec_busy_polling || bits &gt; 8)</div><div class='add'>+	if (ec-&gt;busy_polling || bits &gt; 8)</div><div class='ctx'> 		acpi_ec_burst_disable(ec);</div><div class='ctx'> </div><div class='ctx'> 	switch (result) {</div><div class='hunk'>@@ -1329,6 +1326,8 @@ static struct acpi_ec *acpi_ec_alloc(void)</div><div class='ctx'> 	spin_lock_init(&amp;ec-&gt;lock);</div><div class='ctx'> 	INIT_WORK(&amp;ec-&gt;work, acpi_ec_event_handler);</div><div class='ctx'> 	ec-&gt;timestamp = jiffies;</div><div class='add'>+	ec-&gt;busy_polling = true;</div><div class='add'>+	ec-&gt;polling_guard = 0;</div><div class='ctx'> 	return ec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1390,6 +1389,7 @@ static int ec_install_handlers(struct acpi_ec *ec, bool handle_events)</div><div class='ctx'> 	acpi_ec_start(ec, false);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(EC_FLAGS_EC_HANDLER_INSTALLED, &amp;ec-&gt;flags)) {</div><div class='add'>+		acpi_ec_enter_noirq(ec);</div><div class='ctx'> 		status = acpi_install_address_space_handler(ec-&gt;handle,</div><div class='ctx'> 							    ACPI_ADR_SPACE_EC,</div><div class='ctx'> 							    &amp;acpi_ec_space_handler,</div><div class='hunk'>@@ -1429,6 +1429,7 @@ static int ec_install_handlers(struct acpi_ec *ec, bool handle_events)</div><div class='ctx'> 		/* This is not fatal as we can poll EC events */</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='ctx'> 			set_bit(EC_FLAGS_GPE_HANDLER_INSTALLED, &amp;ec-&gt;flags);</div><div class='add'>+			acpi_ec_leave_noirq(ec);</div><div class='ctx'> 			if (test_bit(EC_FLAGS_STARTED, &amp;ec-&gt;flags) &amp;&amp;</div><div class='ctx'> 			    ec-&gt;reference_count &gt;= 1)</div><div class='ctx'> 				acpi_ec_enable_gpe(ec, true);</div><div class='hunk'>@@ -1741,31 +1742,6 @@ static int ec_flag_query_handshake(const struct dmi_system_id *id)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * On some hardware it is necessary to clear events accumulated by the EC during</div><div class='del'>- * sleep. These ECs stop reporting GPEs until they are manually polled, if too</div><div class='del'>- * many events are accumulated. (e.g. Samsung Series 5/9 notebooks)</div><div class='del'>- *</div><div class='del'>- * https://bugzilla.kernel.org/show_bug.cgi?id=44161</div><div class='del'>- *</div><div class='del'>- * Ideally, the EC should also be instructed NOT to accumulate events during</div><div class='del'>- * sleep (which Windows seems to do somehow), but the interface to control this</div><div class='del'>- * behaviour is not known at this time.</div><div class='del'>- *</div><div class='del'>- * Models known to be affected are Samsung 530Uxx/535Uxx/540Uxx/550Pxx/900Xxx,</div><div class='del'>- * however it is very likely that other Samsung models are affected.</div><div class='del'>- *</div><div class='del'>- * On systems which don't accumulate _Q events during sleep, this extra check</div><div class='del'>- * should be harmless.</div><div class='del'>- */</div><div class='del'>-static int ec_clear_on_resume(const struct dmi_system_id *id)</div><div class='del'>-{</div><div class='del'>-	pr_debug("Detected system needing EC poll on resume.\n");</div><div class='del'>-	EC_FLAGS_CLEAR_ON_RESUME = 1;</div><div class='del'>-	ec_event_clearing = ACPI_EC_EVT_TIMING_STATUS;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Some ECDTs contain wrong register addresses.</div><div class='ctx'>  * MSI MS-171F</div><div class='ctx'>  * https://bugzilla.kernel.org/show_bug.cgi?id=12461</div><div class='hunk'>@@ -1782,9 +1758,6 @@ static struct dmi_system_id ec_dmi_table[] __initdata = {</div><div class='ctx'> 	ec_correct_ecdt, "MSI MS-171F", {</div><div class='ctx'> 	DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star"),</div><div class='ctx'> 	DMI_MATCH(DMI_PRODUCT_NAME, "MS-171F"),}, NULL},</div><div class='del'>-	{</div><div class='del'>-	ec_clear_on_resume, "Samsung hardware", {</div><div class='del'>-	DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD.")}, NULL},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1839,34 +1812,6 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='del'>-static void acpi_ec_enter_noirq(struct acpi_ec *ec)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (ec == first_ec) {</div><div class='del'>-		spin_lock_irqsave(&amp;ec-&gt;lock, flags);</div><div class='del'>-		ec-&gt;saved_busy_polling = ec_busy_polling;</div><div class='del'>-		ec-&gt;saved_polling_guard = ec_polling_guard;</div><div class='del'>-		ec_busy_polling = true;</div><div class='del'>-		ec_polling_guard = 0;</div><div class='del'>-		ec_log_drv("interrupt blocked");</div><div class='del'>-		spin_unlock_irqrestore(&amp;ec-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void acpi_ec_leave_noirq(struct acpi_ec *ec)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (ec == first_ec) {</div><div class='del'>-		spin_lock_irqsave(&amp;ec-&gt;lock, flags);</div><div class='del'>-		ec_busy_polling = ec-&gt;saved_busy_polling;</div><div class='del'>-		ec_polling_guard = ec-&gt;saved_polling_guard;</div><div class='del'>-		ec_log_drv("interrupt unblocked");</div><div class='del'>-		spin_unlock_irqrestore(&amp;ec-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int acpi_ec_suspend_noirq(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_ec *ec =</div><div class='head'>diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c<br/>index e24ea4e796e4..7fceb3b4691b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/event.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/event.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/event.c</a></div><div class='hunk'>@@ -82,8 +82,8 @@ static const struct genl_multicast_group acpi_event_mcgrps[] = {</div><div class='ctx'> 	{ .name = ACPI_GENL_MCAST_GROUP_NAME, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct genl_family acpi_event_genl_family = {</div><div class='del'>-	.id = GENL_ID_GENERATE,</div><div class='add'>+static struct genl_family acpi_event_genl_family __ro_after_init = {</div><div class='add'>+	.module = THIS_MODULE,</div><div class='ctx'> 	.name = ACPI_GENL_FAMILY_NAME,</div><div class='ctx'> 	.version = ACPI_GENL_VERSION,</div><div class='ctx'> 	.maxattr = ACPI_GENL_ATTR_MAX,</div><div class='hunk'>@@ -144,7 +144,7 @@ int acpi_bus_generate_netlink_event(const char *device_class,</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_bus_generate_netlink_event);</div><div class='ctx'> </div><div class='del'>-static int acpi_event_genetlink_init(void)</div><div class='add'>+static int __init acpi_event_genetlink_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return genl_register_family(&amp;acpi_event_genl_family);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c<br/>index 5ea5dc219f56..fb19e1cdb641 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/glue.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/glue.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/glue.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/glue.c</a></div><div class='hunk'>@@ -98,7 +98,15 @@ static int find_child_checks(struct acpi_device *adev, bool check_children)</div><div class='ctx'> 	if (check_children &amp;&amp; list_empty(&amp;adev-&gt;children))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return sta_present ? FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE;</div><div class='add'>+	/*</div><div class='add'>+	 * If the device has a _HID (or _CID) returning a valid ACPI/PNP</div><div class='add'>+	 * device ID, it is better to make it look less attractive here, so that</div><div class='add'>+	 * the other device with the same _ADR value (that may not have a valid</div><div class='add'>+	 * device ID) can be matched going forward.  [This means a second spec</div><div class='add'>+	 * violation in a row, so whatever we do here is best effort anyway.]</div><div class='add'>+	 */</div><div class='add'>+	return sta_present &amp;&amp; list_empty(&amp;adev-&gt;pnp.ids) ?</div><div class='add'>+			FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct acpi_device *acpi_find_child_device(struct acpi_device *parent,</div><div class='hunk'>@@ -227,8 +235,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev)</div><div class='ctx'> </div><div class='ctx'> 	attr = acpi_get_dma_attr(acpi_dev);</div><div class='ctx'> 	if (attr != DEV_DMA_NOT_SUPPORTED)</div><div class='del'>-		arch_setup_dma_ops(dev, 0, 0, NULL,</div><div class='del'>-				   attr == DEV_DMA_COHERENT);</div><div class='add'>+		acpi_dma_configure(dev, attr);</div><div class='ctx'> </div><div class='ctx'> 	acpi_physnode_link_name(physical_node_name, node_id);</div><div class='ctx'> 	retval = sysfs_create_link(&amp;acpi_dev-&gt;dev.kobj, &amp;dev-&gt;kobj,</div><div class='head'>diff --git a/drivers/acpi/gsi.c b/drivers/acpi/gsi.c<br/>deleted file mode 100644<br/>index ee9e0f27b2bf..000000000000<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/gsi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/gsi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * ACPI GSI IRQ layer</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2015 ARM Ltd.</div><div class='del'>- * Author: Lorenzo Pieralisi &lt;lorenzo.pieralisi@arm.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/acpi.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/irqdomain.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-</div><div class='del'>-enum acpi_irq_model_id acpi_irq_model;</div><div class='del'>-</div><div class='del'>-static struct fwnode_handle *acpi_gsi_domain_id;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * acpi_gsi_to_irq() - Retrieve the linux irq number for a given GSI</div><div class='del'>- * @gsi: GSI IRQ number to map</div><div class='del'>- * @irq: pointer where linux IRQ number is stored</div><div class='del'>- *</div><div class='del'>- * irq location updated with irq value [&gt;0 on success, 0 on failure]</div><div class='del'>- *</div><div class='del'>- * Returns: linux IRQ number on success (&gt;0)</div><div class='del'>- *          -EINVAL on failure</div><div class='del'>- */</div><div class='del'>-int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)</div><div class='del'>-{</div><div class='del'>-	struct irq_domain *d = irq_find_matching_fwnode(acpi_gsi_domain_id,</div><div class='del'>-							DOMAIN_BUS_ANY);</div><div class='del'>-</div><div class='del'>-	*irq = irq_find_mapping(d, gsi);</div><div class='del'>-	/*</div><div class='del'>-	 * *irq == 0 means no mapping, that should</div><div class='del'>-	 * be reported as a failure</div><div class='del'>-	 */</div><div class='del'>-	return (*irq &gt; 0) ? *irq : -EINVAL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * acpi_register_gsi() - Map a GSI to a linux IRQ number</div><div class='del'>- * @dev: device for which IRQ has to be mapped</div><div class='del'>- * @gsi: GSI IRQ number</div><div class='del'>- * @trigger: trigger type of the GSI number to be mapped</div><div class='del'>- * @polarity: polarity of the GSI to be mapped</div><div class='del'>- *</div><div class='del'>- * Returns: a valid linux IRQ number on success</div><div class='del'>- *          -EINVAL on failure</div><div class='del'>- */</div><div class='del'>-int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,</div><div class='del'>-		      int polarity)</div><div class='del'>-{</div><div class='del'>-	struct irq_fwspec fwspec;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!acpi_gsi_domain_id)) {</div><div class='del'>-		pr_warn("GSI: No registered irqchip, giving up\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fwspec.fwnode = acpi_gsi_domain_id;</div><div class='del'>-	fwspec.param[0] = gsi;</div><div class='del'>-	fwspec.param[1] = acpi_dev_get_irq_type(trigger, polarity);</div><div class='del'>-	fwspec.param_count = 2;</div><div class='del'>-</div><div class='del'>-	return irq_create_fwspec_mapping(&amp;fwspec);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(acpi_register_gsi);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * acpi_unregister_gsi() - Free a GSI&lt;-&gt;linux IRQ number mapping</div><div class='del'>- * @gsi: GSI IRQ number</div><div class='del'>- */</div><div class='del'>-void acpi_unregister_gsi(u32 gsi)</div><div class='del'>-{</div><div class='del'>-	struct irq_domain *d = irq_find_matching_fwnode(acpi_gsi_domain_id,</div><div class='del'>-							DOMAIN_BUS_ANY);</div><div class='del'>-	int irq = irq_find_mapping(d, gsi);</div><div class='del'>-</div><div class='del'>-	irq_dispose_mapping(irq);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(acpi_unregister_gsi);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * acpi_set_irq_model - Setup the GSI irqdomain information</div><div class='del'>- * @model: the value assigned to acpi_irq_model</div><div class='del'>- * @fwnode: the irq_domain identifier for mapping and looking up</div><div class='del'>- *          GSI interrupts</div><div class='del'>- */</div><div class='del'>-void __init acpi_set_irq_model(enum acpi_irq_model_id model,</div><div class='del'>-			       struct fwnode_handle *fwnode)</div><div class='del'>-{</div><div class='del'>-	acpi_irq_model = model;</div><div class='del'>-	acpi_gsi_domain_id = fwnode;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h<br/>index 1b41a2739dac..219b90bc0922 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/internal.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/internal.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/internal.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/internal.h</a></div><div class='hunk'>@@ -37,6 +37,7 @@ void acpi_amba_init(void);</div><div class='ctx'> static inline void acpi_amba_init(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> int acpi_sysfs_init(void);</div><div class='add'>+void acpi_gpe_apply_masked_gpes(void);</div><div class='ctx'> void acpi_container_init(void);</div><div class='ctx'> void acpi_memory_hotplug_init(void);</div><div class='ctx'> #ifdef	CONFIG_ACPI_HOTPLUG_IOAPIC</div><div class='hunk'>@@ -171,8 +172,8 @@ struct acpi_ec {</div><div class='ctx'> 	struct work_struct work;</div><div class='ctx'> 	unsigned long timestamp;</div><div class='ctx'> 	unsigned long nr_pending_queries;</div><div class='del'>-	bool saved_busy_polling;</div><div class='del'>-	unsigned int saved_polling_guard;</div><div class='add'>+	bool busy_polling;</div><div class='add'>+	unsigned int polling_guard;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct acpi_ec *first_ec;</div><div class='head'>diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c<br/>new file mode 100644<br/>index 000000000000..830299a74b84<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/irq.c</a></div><div class='hunk'>@@ -0,0 +1,297 @@</div><div class='add'>+/*</div><div class='add'>+ * ACPI GSI IRQ layer</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015 ARM Ltd.</div><div class='add'>+ * Author: Lorenzo Pieralisi &lt;lorenzo.pieralisi@arm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/irqdomain.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+</div><div class='add'>+enum acpi_irq_model_id acpi_irq_model;</div><div class='add'>+</div><div class='add'>+static struct fwnode_handle *acpi_gsi_domain_id;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_gsi_to_irq() - Retrieve the linux irq number for a given GSI</div><div class='add'>+ * @gsi: GSI IRQ number to map</div><div class='add'>+ * @irq: pointer where linux IRQ number is stored</div><div class='add'>+ *</div><div class='add'>+ * irq location updated with irq value [&gt;0 on success, 0 on failure]</div><div class='add'>+ *</div><div class='add'>+ * Returns: linux IRQ number on success (&gt;0)</div><div class='add'>+ *          -EINVAL on failure</div><div class='add'>+ */</div><div class='add'>+int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)</div><div class='add'>+{</div><div class='add'>+	struct irq_domain *d = irq_find_matching_fwnode(acpi_gsi_domain_id,</div><div class='add'>+							DOMAIN_BUS_ANY);</div><div class='add'>+</div><div class='add'>+	*irq = irq_find_mapping(d, gsi);</div><div class='add'>+	/*</div><div class='add'>+	 * *irq == 0 means no mapping, that should</div><div class='add'>+	 * be reported as a failure</div><div class='add'>+	 */</div><div class='add'>+	return (*irq &gt; 0) ? *irq : -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_register_gsi() - Map a GSI to a linux IRQ number</div><div class='add'>+ * @dev: device for which IRQ has to be mapped</div><div class='add'>+ * @gsi: GSI IRQ number</div><div class='add'>+ * @trigger: trigger type of the GSI number to be mapped</div><div class='add'>+ * @polarity: polarity of the GSI to be mapped</div><div class='add'>+ *</div><div class='add'>+ * Returns: a valid linux IRQ number on success</div><div class='add'>+ *          -EINVAL on failure</div><div class='add'>+ */</div><div class='add'>+int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,</div><div class='add'>+		      int polarity)</div><div class='add'>+{</div><div class='add'>+	struct irq_fwspec fwspec;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!acpi_gsi_domain_id)) {</div><div class='add'>+		pr_warn("GSI: No registered irqchip, giving up\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwspec.fwnode = acpi_gsi_domain_id;</div><div class='add'>+	fwspec.param[0] = gsi;</div><div class='add'>+	fwspec.param[1] = acpi_dev_get_irq_type(trigger, polarity);</div><div class='add'>+	fwspec.param_count = 2;</div><div class='add'>+</div><div class='add'>+	return irq_create_fwspec_mapping(&amp;fwspec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(acpi_register_gsi);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_unregister_gsi() - Free a GSI&lt;-&gt;linux IRQ number mapping</div><div class='add'>+ * @gsi: GSI IRQ number</div><div class='add'>+ */</div><div class='add'>+void acpi_unregister_gsi(u32 gsi)</div><div class='add'>+{</div><div class='add'>+	struct irq_domain *d = irq_find_matching_fwnode(acpi_gsi_domain_id,</div><div class='add'>+							DOMAIN_BUS_ANY);</div><div class='add'>+	int irq = irq_find_mapping(d, gsi);</div><div class='add'>+</div><div class='add'>+	irq_dispose_mapping(irq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(acpi_unregister_gsi);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_get_irq_source_fwhandle() - Retrieve fwhandle from IRQ resource source.</div><div class='add'>+ * @source: acpi_resource_source to use for the lookup.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Retrieve the fwhandle of the device referenced by the given IRQ resource</div><div class='add'>+ * source.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * The referenced device fwhandle or NULL on failure</div><div class='add'>+ */</div><div class='add'>+static struct fwnode_handle *</div><div class='add'>+acpi_get_irq_source_fwhandle(const struct acpi_resource_source *source)</div><div class='add'>+{</div><div class='add'>+	struct fwnode_handle *result;</div><div class='add'>+	struct acpi_device *device;</div><div class='add'>+	acpi_handle handle;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	if (!source-&gt;string_length)</div><div class='add'>+		return acpi_gsi_domain_id;</div><div class='add'>+</div><div class='add'>+	status = acpi_get_handle(NULL, source-&gt;string_ptr, &amp;handle);</div><div class='add'>+	if (WARN_ON(ACPI_FAILURE(status)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	device = acpi_bus_get_acpi_device(handle);</div><div class='add'>+	if (WARN_ON(!device))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	result = &amp;device-&gt;fwnode;</div><div class='add'>+	acpi_bus_put_acpi_device(device);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Context for the resource walk used to lookup IRQ resources.</div><div class='add'>+ * Contains a return code, the lookup index, and references to the flags</div><div class='add'>+ * and fwspec where the result is returned.</div><div class='add'>+ */</div><div class='add'>+struct acpi_irq_parse_one_ctx {</div><div class='add'>+	int rc;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	unsigned long *res_flags;</div><div class='add'>+	struct irq_fwspec *fwspec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_irq_parse_one_match - Handle a matching IRQ resource.</div><div class='add'>+ * @fwnode: matching fwnode</div><div class='add'>+ * @hwirq: hardware IRQ number</div><div class='add'>+ * @triggering: triggering attributes of hwirq</div><div class='add'>+ * @polarity: polarity attributes of hwirq</div><div class='add'>+ * @polarity: polarity attributes of hwirq</div><div class='add'>+ * @shareable: shareable attributes of hwirq</div><div class='add'>+ * @ctx: acpi_irq_parse_one_ctx updated by this function</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Handle a matching IRQ resource by populating the given ctx with</div><div class='add'>+ * the information passed.</div><div class='add'>+ */</div><div class='add'>+static inline void acpi_irq_parse_one_match(struct fwnode_handle *fwnode,</div><div class='add'>+					    u32 hwirq, u8 triggering,</div><div class='add'>+					    u8 polarity, u8 shareable,</div><div class='add'>+					    struct acpi_irq_parse_one_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	if (!fwnode)</div><div class='add'>+		return;</div><div class='add'>+	ctx-&gt;rc = 0;</div><div class='add'>+	*ctx-&gt;res_flags = acpi_dev_irq_flags(triggering, polarity, shareable);</div><div class='add'>+	ctx-&gt;fwspec-&gt;fwnode = fwnode;</div><div class='add'>+	ctx-&gt;fwspec-&gt;param[0] = hwirq;</div><div class='add'>+	ctx-&gt;fwspec-&gt;param[1] = acpi_dev_get_irq_type(triggering, polarity);</div><div class='add'>+	ctx-&gt;fwspec-&gt;param_count = 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_irq_parse_one_cb - Handle the given resource.</div><div class='add'>+ * @ares: resource to handle</div><div class='add'>+ * @context: context for the walk</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * This is called by acpi_walk_resources passing each resource returned by</div><div class='add'>+ * the _CRS method. We only inspect IRQ resources. Since IRQ resources</div><div class='add'>+ * might contain multiple interrupts we check if the index is within this</div><div class='add'>+ * one's interrupt array, otherwise we subtract the current resource IRQ</div><div class='add'>+ * count from the lookup index to prepare for the next resource.</div><div class='add'>+ * Once a match is found we call acpi_irq_parse_one_match to populate</div><div class='add'>+ * the result and end the walk by returning AE_CTRL_TERMINATE.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * AE_OK if the walk should continue, AE_CTRL_TERMINATE if a matching</div><div class='add'>+ * IRQ resource was found.</div><div class='add'>+ */</div><div class='add'>+static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,</div><div class='add'>+					 void *context)</div><div class='add'>+{</div><div class='add'>+	struct acpi_irq_parse_one_ctx *ctx = context;</div><div class='add'>+	struct acpi_resource_irq *irq;</div><div class='add'>+	struct acpi_resource_extended_irq *eirq;</div><div class='add'>+	struct fwnode_handle *fwnode;</div><div class='add'>+</div><div class='add'>+	switch (ares-&gt;type) {</div><div class='add'>+	case ACPI_RESOURCE_TYPE_IRQ:</div><div class='add'>+		irq = &amp;ares-&gt;data.irq;</div><div class='add'>+		if (ctx-&gt;index &gt;= irq-&gt;interrupt_count) {</div><div class='add'>+			ctx-&gt;index -= irq-&gt;interrupt_count;</div><div class='add'>+			return AE_OK;</div><div class='add'>+		}</div><div class='add'>+		fwnode = acpi_gsi_domain_id;</div><div class='add'>+		acpi_irq_parse_one_match(fwnode, irq-&gt;interrupts[ctx-&gt;index],</div><div class='add'>+					 irq-&gt;triggering, irq-&gt;polarity,</div><div class='add'>+					 irq-&gt;sharable, ctx);</div><div class='add'>+		return AE_CTRL_TERMINATE;</div><div class='add'>+	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:</div><div class='add'>+		eirq = &amp;ares-&gt;data.extended_irq;</div><div class='add'>+		if (eirq-&gt;producer_consumer == ACPI_PRODUCER)</div><div class='add'>+			return AE_OK;</div><div class='add'>+		if (ctx-&gt;index &gt;= eirq-&gt;interrupt_count) {</div><div class='add'>+			ctx-&gt;index -= eirq-&gt;interrupt_count;</div><div class='add'>+			return AE_OK;</div><div class='add'>+		}</div><div class='add'>+		fwnode = acpi_get_irq_source_fwhandle(&amp;eirq-&gt;resource_source);</div><div class='add'>+		acpi_irq_parse_one_match(fwnode, eirq-&gt;interrupts[ctx-&gt;index],</div><div class='add'>+					 eirq-&gt;triggering, eirq-&gt;polarity,</div><div class='add'>+					 eirq-&gt;sharable, ctx);</div><div class='add'>+		return AE_CTRL_TERMINATE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_irq_parse_one - Resolve an interrupt for a device</div><div class='add'>+ * @handle: the device whose interrupt is to be resolved</div><div class='add'>+ * @index: index of the interrupt to resolve</div><div class='add'>+ * @fwspec: structure irq_fwspec filled by this function</div><div class='add'>+ * @flags: resource flags filled by this function</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Resolves an interrupt for a device by walking its CRS resources to find</div><div class='add'>+ * the appropriate ACPI IRQ resource and populating the given struct irq_fwspec</div><div class='add'>+ * and flags.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * The result stored in ctx.rc by the callback, or the default -EINVAL value</div><div class='add'>+ * if an error occurs.</div><div class='add'>+ */</div><div class='add'>+static int acpi_irq_parse_one(acpi_handle handle, unsigned int index,</div><div class='add'>+			      struct irq_fwspec *fwspec, unsigned long *flags)</div><div class='add'>+{</div><div class='add'>+	struct acpi_irq_parse_one_ctx ctx = { -EINVAL, index, flags, fwspec };</div><div class='add'>+</div><div class='add'>+	acpi_walk_resources(handle, METHOD_NAME__CRS, acpi_irq_parse_one_cb, &amp;ctx);</div><div class='add'>+	return ctx.rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_irq_get - Lookup an ACPI IRQ resource and use it to initialize resource.</div><div class='add'>+ * @handle: ACPI device handle</div><div class='add'>+ * @index:  ACPI IRQ resource index to lookup</div><div class='add'>+ * @res:    Linux IRQ resource to initialize</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Look for the ACPI IRQ resource with the given index and use it to initialize</div><div class='add'>+ * the given Linux IRQ resource.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * 0 on success</div><div class='add'>+ * -EINVAL if an error occurs</div><div class='add'>+ * -EPROBE_DEFER if the IRQ lookup/conversion failed</div><div class='add'>+ */</div><div class='add'>+int acpi_irq_get(acpi_handle handle, unsigned int index, struct resource *res)</div><div class='add'>+{</div><div class='add'>+	struct irq_fwspec fwspec;</div><div class='add'>+	struct irq_domain *domain;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = acpi_irq_parse_one(handle, index, &amp;fwspec, &amp;flags);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	domain = irq_find_matching_fwnode(fwspec.fwnode, DOMAIN_BUS_ANY);</div><div class='add'>+	if (!domain)</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='add'>+</div><div class='add'>+	rc = irq_create_fwspec_mapping(&amp;fwspec);</div><div class='add'>+	if (rc &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	res-&gt;start = rc;</div><div class='add'>+	res-&gt;end = rc;</div><div class='add'>+	res-&gt;flags = flags;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(acpi_irq_get);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_set_irq_model - Setup the GSI irqdomain information</div><div class='add'>+ * @model: the value assigned to acpi_irq_model</div><div class='add'>+ * @fwnode: the irq_domain identifier for mapping and looking up</div><div class='add'>+ *          GSI interrupts</div><div class='add'>+ */</div><div class='add'>+void __init acpi_set_irq_model(enum acpi_irq_model_id model,</div><div class='add'>+			       struct fwnode_handle *fwnode)</div><div class='add'>+{</div><div class='add'>+	acpi_irq_model = model;</div><div class='add'>+	acpi_gsi_domain_id = fwnode;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c<br/>index 312c4b4dc363..662036bdc65e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/nfit/core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/nfit/core.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/nfit/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/nfit/core.c</a></div><div class='hunk'>@@ -1603,7 +1603,7 @@ static size_t sizeof_nfit_set_info(int num_mappings)</div><div class='ctx'> 		+ num_mappings * sizeof(struct nfit_set_info_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cmp_map(const void *m0, const void *m1)</div><div class='add'>+static int cmp_map_compat(const void *m0, const void *m1)</div><div class='ctx'> {</div><div class='ctx'> 	const struct nfit_set_info_map *map0 = m0;</div><div class='ctx'> 	const struct nfit_set_info_map *map1 = m1;</div><div class='hunk'>@@ -1612,6 +1612,14 @@ static int cmp_map(const void *m0, const void *m1)</div><div class='ctx'> 			sizeof(u64));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cmp_map(const void *m0, const void *m1)</div><div class='add'>+{</div><div class='add'>+	const struct nfit_set_info_map *map0 = m0;</div><div class='add'>+	const struct nfit_set_info_map *map1 = m1;</div><div class='add'>+</div><div class='add'>+	return map0-&gt;region_offset - map1-&gt;region_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Retrieve the nth entry referencing this spa */</div><div class='ctx'> static struct acpi_nfit_memory_map *memdev_from_spa(</div><div class='ctx'> 		struct acpi_nfit_desc *acpi_desc, u16 range_index, int n)</div><div class='hunk'>@@ -1667,6 +1675,12 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,</div><div class='ctx'> 	sort(&amp;info-&gt;mapping[0], nr, sizeof(struct nfit_set_info_map),</div><div class='ctx'> 			cmp_map, NULL);</div><div class='ctx'> 	nd_set-&gt;cookie = nd_fletcher64(info, sizeof_nfit_set_info(nr), 0);</div><div class='add'>+</div><div class='add'>+	/* support namespaces created with the wrong sort order */</div><div class='add'>+	sort(&amp;info-&gt;mapping[0], nr, sizeof(struct nfit_set_info_map),</div><div class='add'>+			cmp_map_compat, NULL);</div><div class='add'>+	nd_set-&gt;altcookie = nd_fletcher64(info, sizeof_nfit_set_info(nr), 0);</div><div class='add'>+</div><div class='ctx'> 	ndr_desc-&gt;nd_set = nd_set;</div><div class='ctx'> 	devm_kfree(dev, info);</div><div class='ctx'> </div><div class='hunk'>@@ -2704,6 +2718,7 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)</div><div class='ctx'> 	struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);</div><div class='ctx'> 	struct device *dev = acpi_desc-&gt;dev;</div><div class='ctx'> 	struct acpi_nfit_flush_work flush;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */</div><div class='ctx'> 	device_lock(dev);</div><div class='hunk'>@@ -2716,7 +2731,10 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)</div><div class='ctx'> 	INIT_WORK_ONSTACK(&amp;flush.work, flush_probe);</div><div class='ctx'> 	COMPLETION_INITIALIZER_ONSTACK(flush.cmp);</div><div class='ctx'> 	queue_work(nfit_wq, &amp;flush.work);</div><div class='del'>-	return wait_for_completion_interruptible(&amp;flush.cmp);</div><div class='add'>+</div><div class='add'>+	rc = wait_for_completion_interruptible(&amp;flush.cmp);</div><div class='add'>+	cancel_work_sync(&amp;flush.work);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,</div><div class='hunk'>@@ -2806,12 +2824,13 @@ static int acpi_nfit_add(struct acpi_device *adev)</div><div class='ctx'> 	acpi_size sz;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	status = acpi_get_table_with_size(ACPI_SIG_NFIT, 0, &amp;tbl, &amp;sz);</div><div class='add'>+	status = acpi_get_table(ACPI_SIG_NFIT, 0, &amp;tbl);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		/* This is ok, we could have an nvdimm hotplugged later */</div><div class='ctx'> 		dev_dbg(dev, "failed to find NFIT at startup\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	sz = tbl-&gt;length;</div><div class='ctx'> </div><div class='ctx'> 	acpi_desc = devm_kzalloc(dev, sizeof(*acpi_desc), GFP_KERNEL);</div><div class='ctx'> 	if (!acpi_desc)</div><div class='head'>diff --git a/drivers/acpi/nfit/mce.c b/drivers/acpi/nfit/mce.c<br/>index e5ce81c38eed..3ba1c3472cf9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/nfit/mce.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/nfit/mce.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/nfit/mce.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/nfit/mce.c</a></div><div class='hunk'>@@ -90,6 +90,7 @@ static int nfit_handle_mce(struct notifier_block *nb, unsigned long val,</div><div class='ctx'> </div><div class='ctx'> static struct notifier_block nfit_mce_dec = {</div><div class='ctx'> 	.notifier_call	= nfit_handle_mce,</div><div class='add'>+	.priority	= MCE_PRIO_NFIT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void nfit_mce_register(void)</div><div class='head'>diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c<br/>index ce3a7a16f03f..edb0c79f7c64 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/numa.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/numa.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/numa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/numa.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ int acpi_map_pxm_to_node(int pxm)</div><div class='ctx'> {</div><div class='ctx'> 	int node;</div><div class='ctx'> </div><div class='del'>-	if (pxm &lt; 0 || pxm &gt;= MAX_PXM_DOMAINS)</div><div class='add'>+	if (pxm &lt; 0 || pxm &gt;= MAX_PXM_DOMAINS || numa_off)</div><div class='ctx'> 		return NUMA_NO_NODE;</div><div class='ctx'> </div><div class='ctx'> 	node = pxm_to_node_map[pxm];</div><div class='head'>diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c<br/>index 416953a42510..db78d353bab1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/osl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/osl.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/osl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/osl.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> #include &lt;linux/semaphore.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -76,6 +76,7 @@ static struct workqueue_struct *kacpi_notify_wq;</div><div class='ctx'> static struct workqueue_struct *kacpi_hotplug_wq;</div><div class='ctx'> static bool acpi_os_initialized;</div><div class='ctx'> unsigned int acpi_sci_irq = INVALID_ACPI_IRQ;</div><div class='add'>+bool acpi_permanent_mmap = false;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This list of permanent mappings is for memory that may be accessed from</div><div class='hunk'>@@ -181,15 +182,15 @@ void acpi_os_vprintf(const char *fmt, va_list args)</div><div class='ctx'> static unsigned long acpi_rsdp;</div><div class='ctx'> static int __init setup_acpi_rsdp(char *arg)</div><div class='ctx'> {</div><div class='del'>-	if (kstrtoul(arg, 16, &amp;acpi_rsdp))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='add'>+	return kstrtoul(arg, 16, &amp;acpi_rsdp);</div><div class='ctx'> }</div><div class='ctx'> early_param("acpi_rsdp", setup_acpi_rsdp);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> acpi_physical_address __init acpi_os_get_root_pointer(void)</div><div class='ctx'> {</div><div class='add'>+	acpi_physical_address pa = 0;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_KEXEC</div><div class='ctx'> 	if (acpi_rsdp)</div><div class='ctx'> 		return acpi_rsdp;</div><div class='hunk'>@@ -198,21 +199,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)</div><div class='ctx'> 	if (efi_enabled(EFI_CONFIG_TABLES)) {</div><div class='ctx'> 		if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)</div><div class='ctx'> 			return efi.acpi20;</div><div class='del'>-		else if (efi.acpi != EFI_INVALID_TABLE_ADDR)</div><div class='add'>+		if (efi.acpi != EFI_INVALID_TABLE_ADDR)</div><div class='ctx'> 			return efi.acpi;</div><div class='del'>-		else {</div><div class='del'>-			printk(KERN_ERR PREFIX</div><div class='del'>-			       "System description tables not found\n");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+		pr_err(PREFIX "System description tables not found\n");</div><div class='ctx'> 	} else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) {</div><div class='del'>-		acpi_physical_address pa = 0;</div><div class='del'>-</div><div class='ctx'> 		acpi_find_root_pointer(&amp;pa);</div><div class='del'>-		return pa;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return pa;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */</div><div class='hunk'>@@ -313,7 +307,7 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr)</div><div class='ctx'>  * virtual address).  If not found, map it, add it to that list and return a</div><div class='ctx'>  * pointer to it.</div><div class='ctx'>  *</div><div class='del'>- * During early init (when acpi_gbl_permanent_mmap has not been set yet) this</div><div class='add'>+ * During early init (when acpi_permanent_mmap has not been set yet) this</div><div class='ctx'>  * routine simply calls __acpi_map_table() to get the job done.</div><div class='ctx'>  */</div><div class='ctx'> void __iomem *__ref</div><div class='hunk'>@@ -329,7 +323,7 @@ acpi_os_map_iomem(acpi_physical_address phys, acpi_size size)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!acpi_gbl_permanent_mmap)</div><div class='add'>+	if (!acpi_permanent_mmap)</div><div class='ctx'> 		return __acpi_map_table((unsigned long)phys, size);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;acpi_ioremap_lock);</div><div class='hunk'>@@ -399,7 +393,7 @@ static void acpi_os_map_cleanup(struct acpi_ioremap *map)</div><div class='ctx'>  * mappings, drop a reference to it and unmap it if there are no more active</div><div class='ctx'>  * references to it.</div><div class='ctx'>  *</div><div class='del'>- * During early init (when acpi_gbl_permanent_mmap has not been set yet) this</div><div class='add'>+ * During early init (when acpi_permanent_mmap has not been set yet) this</div><div class='ctx'>  * routine simply calls __acpi_unmap_table() to get the job done.  Since</div><div class='ctx'>  * __acpi_unmap_table() is an __init function, the __ref annotation is needed</div><div class='ctx'>  * here.</div><div class='hunk'>@@ -408,7 +402,7 @@ void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_ioremap *map;</div><div class='ctx'> </div><div class='del'>-	if (!acpi_gbl_permanent_mmap) {</div><div class='add'>+	if (!acpi_permanent_mmap) {</div><div class='ctx'> 		__acpi_unmap_table(virt, size);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -433,12 +427,6 @@ void __ref acpi_os_unmap_memory(void *virt, acpi_size size)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(acpi_os_unmap_memory);</div><div class='ctx'> </div><div class='del'>-void __init early_acpi_os_unmap_memory(void __iomem *virt, acpi_size size)</div><div class='del'>-{</div><div class='del'>-	if (!acpi_gbl_permanent_mmap)</div><div class='del'>-		__acpi_unmap_table(virt, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int acpi_os_map_generic_address(struct acpi_generic_address *gas)</div><div class='ctx'> {</div><div class='ctx'> 	u64 addr;</div><div class='hunk'>@@ -1698,7 +1686,7 @@ acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 pm1a_control,</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return AE_ERROR;</div><div class='ctx'> 	else if (rc &gt; 0)</div><div class='del'>-		return AE_CTRL_SKIP;</div><div class='add'>+		return AE_CTRL_TERMINATE;</div><div class='ctx'> </div><div class='ctx'> 	return AE_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -1709,6 +1697,7 @@ void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state,</div><div class='ctx'> 	__acpi_os_prepare_sleep = func;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if (ACPI_REDUCED_HARDWARE)</div><div class='ctx'> acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state, u32 val_a,</div><div class='ctx'> 				  u32 val_b)</div><div class='ctx'> {</div><div class='hunk'>@@ -1719,13 +1708,35 @@ acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state, u32 val_a,</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return AE_ERROR;</div><div class='ctx'> 	else if (rc &gt; 0)</div><div class='del'>-		return AE_CTRL_SKIP;</div><div class='add'>+		return AE_CTRL_TERMINATE;</div><div class='ctx'> </div><div class='ctx'> 	return AE_OK;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state, u32 val_a,</div><div class='add'>+				  u32 val_b)</div><div class='add'>+{</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state,</div><div class='ctx'> 			       u32 val_a, u32 val_b))</div><div class='ctx'> {</div><div class='ctx'> 	__acpi_os_prepare_extended_sleep = func;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+acpi_status acpi_os_enter_sleep(u8 sleep_state,</div><div class='add'>+				u32 reg_a_value, u32 reg_b_value)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	if (acpi_gbl_reduced_hardware)</div><div class='add'>+		status = acpi_os_prepare_extended_sleep(sleep_state,</div><div class='add'>+							reg_a_value,</div><div class='add'>+							reg_b_value);</div><div class='add'>+	else</div><div class='add'>+		status = acpi_os_prepare_sleep(sleep_state,</div><div class='add'>+					       reg_a_value, reg_b_value);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c<br/>index b5b376e081f5..2944353253ed 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/pci_mcfg.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/pci_mcfg.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/pci_mcfg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/pci_mcfg.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/pci-acpi.h&gt;</div><div class='add'>+#include &lt;linux/pci-ecam.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Structure to hold entries from the MCFG table */</div><div class='ctx'> struct mcfg_entry {</div><div class='hunk'>@@ -32,23 +33,198 @@ struct mcfg_entry {</div><div class='ctx'> 	u8			bus_end;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCI_QUIRKS</div><div class='add'>+struct mcfg_fixup {</div><div class='add'>+	char oem_id[ACPI_OEM_ID_SIZE + 1];</div><div class='add'>+	char oem_table_id[ACPI_OEM_TABLE_ID_SIZE + 1];</div><div class='add'>+	u32 oem_revision;</div><div class='add'>+	u16 segment;</div><div class='add'>+	struct resource bus_range;</div><div class='add'>+	struct pci_ecam_ops *ops;</div><div class='add'>+	struct resource cfgres;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MCFG_BUS_RANGE(start, end)	DEFINE_RES_NAMED((start),	\</div><div class='add'>+						((end) - (start) + 1),	\</div><div class='add'>+						NULL, IORESOURCE_BUS)</div><div class='add'>+#define MCFG_BUS_ANY			MCFG_BUS_RANGE(0x0, 0xff)</div><div class='add'>+</div><div class='add'>+static struct mcfg_fixup mcfg_quirks[] = {</div><div class='add'>+/*	{ OEM_ID, OEM_TABLE_ID, REV, SEGMENT, BUS_RANGE, ops, cfgres }, */</div><div class='add'>+</div><div class='add'>+#define QCOM_ECAM32(seg) \</div><div class='add'>+	{ "QCOM  ", "QDF2432 ", 1, seg, MCFG_BUS_ANY, &amp;pci_32b_ops }</div><div class='add'>+	QCOM_ECAM32(0),</div><div class='add'>+	QCOM_ECAM32(1),</div><div class='add'>+	QCOM_ECAM32(2),</div><div class='add'>+	QCOM_ECAM32(3),</div><div class='add'>+	QCOM_ECAM32(4),</div><div class='add'>+	QCOM_ECAM32(5),</div><div class='add'>+	QCOM_ECAM32(6),</div><div class='add'>+	QCOM_ECAM32(7),</div><div class='add'>+</div><div class='add'>+#define HISI_QUAD_DOM(table_id, seg, ops) \</div><div class='add'>+	{ "HISI  ", table_id, 0, (seg) + 0, MCFG_BUS_ANY, ops }, \</div><div class='add'>+	{ "HISI  ", table_id, 0, (seg) + 1, MCFG_BUS_ANY, ops }, \</div><div class='add'>+	{ "HISI  ", table_id, 0, (seg) + 2, MCFG_BUS_ANY, ops }, \</div><div class='add'>+	{ "HISI  ", table_id, 0, (seg) + 3, MCFG_BUS_ANY, ops }</div><div class='add'>+	HISI_QUAD_DOM("HIP05   ",  0, &amp;hisi_pcie_ops),</div><div class='add'>+	HISI_QUAD_DOM("HIP06   ",  0, &amp;hisi_pcie_ops),</div><div class='add'>+	HISI_QUAD_DOM("HIP07   ",  0, &amp;hisi_pcie_ops),</div><div class='add'>+	HISI_QUAD_DOM("HIP07   ",  4, &amp;hisi_pcie_ops),</div><div class='add'>+	HISI_QUAD_DOM("HIP07   ",  8, &amp;hisi_pcie_ops),</div><div class='add'>+	HISI_QUAD_DOM("HIP07   ", 12, &amp;hisi_pcie_ops),</div><div class='add'>+</div><div class='add'>+#define THUNDER_PEM_RES(addr, node) \</div><div class='add'>+	DEFINE_RES_MEM((addr) + ((u64) (node) &lt;&lt; 44), 0x39 * SZ_16M)</div><div class='add'>+#define THUNDER_PEM_QUIRK(rev, node) \</div><div class='add'>+	{ "CAVIUM", "THUNDERX", rev, 4 + (10 * (node)), MCFG_BUS_ANY,	    \</div><div class='add'>+	  &amp;thunder_pem_ecam_ops, THUNDER_PEM_RES(0x88001f000000UL, node) },  \</div><div class='add'>+	{ "CAVIUM", "THUNDERX", rev, 5 + (10 * (node)), MCFG_BUS_ANY,	    \</div><div class='add'>+	  &amp;thunder_pem_ecam_ops, THUNDER_PEM_RES(0x884057000000UL, node) },  \</div><div class='add'>+	{ "CAVIUM", "THUNDERX", rev, 6 + (10 * (node)), MCFG_BUS_ANY,	    \</div><div class='add'>+	  &amp;thunder_pem_ecam_ops, THUNDER_PEM_RES(0x88808f000000UL, node) },  \</div><div class='add'>+	{ "CAVIUM", "THUNDERX", rev, 7 + (10 * (node)), MCFG_BUS_ANY,	    \</div><div class='add'>+	  &amp;thunder_pem_ecam_ops, THUNDER_PEM_RES(0x89001f000000UL, node) },  \</div><div class='add'>+	{ "CAVIUM", "THUNDERX", rev, 8 + (10 * (node)), MCFG_BUS_ANY,	    \</div><div class='add'>+	  &amp;thunder_pem_ecam_ops, THUNDER_PEM_RES(0x894057000000UL, node) },  \</div><div class='add'>+	{ "CAVIUM", "THUNDERX", rev, 9 + (10 * (node)), MCFG_BUS_ANY,	    \</div><div class='add'>+	  &amp;thunder_pem_ecam_ops, THUNDER_PEM_RES(0x89808f000000UL, node) }</div><div class='add'>+	/* SoC pass2.x */</div><div class='add'>+	THUNDER_PEM_QUIRK(1, 0),</div><div class='add'>+	THUNDER_PEM_QUIRK(1, 1),</div><div class='add'>+</div><div class='add'>+#define THUNDER_ECAM_QUIRK(rev, seg)					\</div><div class='add'>+	{ "CAVIUM", "THUNDERX", rev, seg, MCFG_BUS_ANY,			\</div><div class='add'>+	&amp;pci_thunder_ecam_ops }</div><div class='add'>+	/* SoC pass1.x */</div><div class='add'>+	THUNDER_PEM_QUIRK(2, 0),	/* off-chip devices */</div><div class='add'>+	THUNDER_PEM_QUIRK(2, 1),	/* off-chip devices */</div><div class='add'>+	THUNDER_ECAM_QUIRK(2,  0),</div><div class='add'>+	THUNDER_ECAM_QUIRK(2,  1),</div><div class='add'>+	THUNDER_ECAM_QUIRK(2,  2),</div><div class='add'>+	THUNDER_ECAM_QUIRK(2,  3),</div><div class='add'>+	THUNDER_ECAM_QUIRK(2, 10),</div><div class='add'>+	THUNDER_ECAM_QUIRK(2, 11),</div><div class='add'>+	THUNDER_ECAM_QUIRK(2, 12),</div><div class='add'>+	THUNDER_ECAM_QUIRK(2, 13),</div><div class='add'>+</div><div class='add'>+#define XGENE_V1_ECAM_MCFG(rev, seg) \</div><div class='add'>+	{"APM   ", "XGENE   ", rev, seg, MCFG_BUS_ANY, \</div><div class='add'>+		&amp;xgene_v1_pcie_ecam_ops }</div><div class='add'>+#define XGENE_V2_ECAM_MCFG(rev, seg) \</div><div class='add'>+	{"APM   ", "XGENE   ", rev, seg, MCFG_BUS_ANY, \</div><div class='add'>+		&amp;xgene_v2_pcie_ecam_ops }</div><div class='add'>+	/* X-Gene SoC with v1 PCIe controller */</div><div class='add'>+	XGENE_V1_ECAM_MCFG(1, 0),</div><div class='add'>+	XGENE_V1_ECAM_MCFG(1, 1),</div><div class='add'>+	XGENE_V1_ECAM_MCFG(1, 2),</div><div class='add'>+	XGENE_V1_ECAM_MCFG(1, 3),</div><div class='add'>+	XGENE_V1_ECAM_MCFG(1, 4),</div><div class='add'>+	XGENE_V1_ECAM_MCFG(2, 0),</div><div class='add'>+	XGENE_V1_ECAM_MCFG(2, 1),</div><div class='add'>+	XGENE_V1_ECAM_MCFG(2, 2),</div><div class='add'>+	XGENE_V1_ECAM_MCFG(2, 3),</div><div class='add'>+	XGENE_V1_ECAM_MCFG(2, 4),</div><div class='add'>+	/* X-Gene SoC with v2.1 PCIe controller */</div><div class='add'>+	XGENE_V2_ECAM_MCFG(3, 0),</div><div class='add'>+	XGENE_V2_ECAM_MCFG(3, 1),</div><div class='add'>+	/* X-Gene SoC with v2.2 PCIe controller */</div><div class='add'>+	XGENE_V2_ECAM_MCFG(4, 0),</div><div class='add'>+	XGENE_V2_ECAM_MCFG(4, 1),</div><div class='add'>+	XGENE_V2_ECAM_MCFG(4, 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char mcfg_oem_id[ACPI_OEM_ID_SIZE];</div><div class='add'>+static char mcfg_oem_table_id[ACPI_OEM_TABLE_ID_SIZE];</div><div class='add'>+static u32 mcfg_oem_revision;</div><div class='add'>+</div><div class='add'>+static int pci_mcfg_quirk_matches(struct mcfg_fixup *f, u16 segment,</div><div class='add'>+				  struct resource *bus_range)</div><div class='add'>+{</div><div class='add'>+	if (!memcmp(f-&gt;oem_id, mcfg_oem_id, ACPI_OEM_ID_SIZE) &amp;&amp;</div><div class='add'>+	    !memcmp(f-&gt;oem_table_id, mcfg_oem_table_id,</div><div class='add'>+	            ACPI_OEM_TABLE_ID_SIZE) &amp;&amp;</div><div class='add'>+	    f-&gt;oem_revision == mcfg_oem_revision &amp;&amp;</div><div class='add'>+	    f-&gt;segment == segment &amp;&amp;</div><div class='add'>+	    resource_contains(&amp;f-&gt;bus_range, bus_range))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void pci_mcfg_apply_quirks(struct acpi_pci_root *root,</div><div class='add'>+				  struct resource *cfgres,</div><div class='add'>+				  struct pci_ecam_ops **ecam_ops)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PCI_QUIRKS</div><div class='add'>+	u16 segment = root-&gt;segment;</div><div class='add'>+	struct resource *bus_range = &amp;root-&gt;secondary;</div><div class='add'>+	struct mcfg_fixup *f;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0, f = mcfg_quirks; i &lt; ARRAY_SIZE(mcfg_quirks); i++, f++) {</div><div class='add'>+		if (pci_mcfg_quirk_matches(f, segment, bus_range)) {</div><div class='add'>+			if (f-&gt;cfgres.start)</div><div class='add'>+				*cfgres = f-&gt;cfgres;</div><div class='add'>+			if (f-&gt;ops)</div><div class='add'>+				*ecam_ops =  f-&gt;ops;</div><div class='add'>+			dev_info(&amp;root-&gt;device-&gt;dev, "MCFG quirk: ECAM at %pR for %pR with %ps\n",</div><div class='add'>+				 cfgres, bus_range, *ecam_ops);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* List to save MCFG entries */</div><div class='ctx'> static LIST_HEAD(pci_mcfg_list);</div><div class='ctx'> </div><div class='del'>-phys_addr_t pci_mcfg_lookup(u16 seg, struct resource *bus_res)</div><div class='add'>+int pci_mcfg_lookup(struct acpi_pci_root *root, struct resource *cfgres,</div><div class='add'>+		    struct pci_ecam_ops **ecam_ops)</div><div class='ctx'> {</div><div class='add'>+	struct pci_ecam_ops *ops = &amp;pci_generic_ecam_ops;</div><div class='add'>+	struct resource *bus_res = &amp;root-&gt;secondary;</div><div class='add'>+	u16 seg = root-&gt;segment;</div><div class='ctx'> 	struct mcfg_entry *e;</div><div class='add'>+	struct resource res;</div><div class='add'>+</div><div class='add'>+	/* Use address from _CBA if present, otherwise lookup MCFG */</div><div class='add'>+	if (root-&gt;mcfg_addr)</div><div class='add'>+		goto skip_lookup;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We expect exact match, unless MCFG entry end bus covers more than</div><div class='del'>-	 * specified by caller.</div><div class='add'>+	 * We expect the range in bus_res in the coverage of MCFG bus range.</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry(e, &amp;pci_mcfg_list, list) {</div><div class='del'>-		if (e-&gt;segment == seg &amp;&amp; e-&gt;bus_start == bus_res-&gt;start &amp;&amp;</div><div class='del'>-		    e-&gt;bus_end &gt;= bus_res-&gt;end)</div><div class='del'>-			return e-&gt;addr;</div><div class='add'>+		if (e-&gt;segment == seg &amp;&amp; e-&gt;bus_start &lt;= bus_res-&gt;start &amp;&amp;</div><div class='add'>+		    e-&gt;bus_end &gt;= bus_res-&gt;end) {</div><div class='add'>+			root-&gt;mcfg_addr = e-&gt;addr;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+skip_lookup:</div><div class='add'>+	memset(&amp;res, 0, sizeof(res));</div><div class='add'>+	if (root-&gt;mcfg_addr) {</div><div class='add'>+		res.start = root-&gt;mcfg_addr + (bus_res-&gt;start &lt;&lt; 20);</div><div class='add'>+		res.end = res.start + (resource_size(bus_res) &lt;&lt; 20) - 1;</div><div class='add'>+		res.flags = IORESOURCE_MEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Allow quirks to override default ECAM ops and CFG resource</div><div class='add'>+	 * range.  This may even fabricate a CFG resource range in case</div><div class='add'>+	 * MCFG does not have it.  Invalid CFG start address means MCFG</div><div class='add'>+	 * firmware bug or we need another quirk in array.</div><div class='add'>+	 */</div><div class='add'>+	pci_mcfg_apply_quirks(root, &amp;res, &amp;ops);</div><div class='add'>+	if (!res.start)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	*cfgres = res;</div><div class='add'>+	*ecam_ops = ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -79,6 +255,13 @@ static __init int pci_mcfg_parse(struct acpi_table_header *header)</div><div class='ctx'> 		list_add(&amp;e-&gt;list, &amp;pci_mcfg_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCI_QUIRKS</div><div class='add'>+	/* Save MCFG IDs and revision for quirks matching */</div><div class='add'>+	memcpy(mcfg_oem_id, header-&gt;oem_id, ACPI_OEM_ID_SIZE);</div><div class='add'>+	memcpy(mcfg_oem_table_id, header-&gt;oem_table_id, ACPI_OEM_TABLE_ID_SIZE);</div><div class='add'>+	mcfg_oem_revision = header-&gt;oem_revision;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	pr_info("MCFG table detected, %d entries\n", n);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c<br/>index 2a358154b770..a34669cc823b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/proc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/proc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/proc.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sleep.h"</div><div class='ctx'> #include "internal.h"</div><div class='head'>diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c<br/>index 5c78ee1860b0..611a5585a902 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/processor_core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/processor_core.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/processor_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/processor_core.c</a></div><div class='hunk'>@@ -154,18 +154,16 @@ static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt,</div><div class='ctx'> phys_cpuid_t __init acpi_map_madt_entry(u32 acpi_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_madt *madt = NULL;</div><div class='del'>-	acpi_size tbl_size;</div><div class='ctx'> 	phys_cpuid_t rv;</div><div class='ctx'> </div><div class='del'>-	acpi_get_table_with_size(ACPI_SIG_MADT, 0,</div><div class='del'>-				 (struct acpi_table_header **)&amp;madt,</div><div class='del'>-				 &amp;tbl_size);</div><div class='add'>+	acpi_get_table(ACPI_SIG_MADT, 0,</div><div class='add'>+		       (struct acpi_table_header **)&amp;madt);</div><div class='ctx'> 	if (!madt)</div><div class='ctx'> 		return PHYS_CPUID_INVALID;</div><div class='ctx'> </div><div class='ctx'> 	rv = map_madt_entry(madt, 1, acpi_id, true);</div><div class='ctx'> </div><div class='del'>-	early_acpi_os_unmap_memory(madt, tbl_size);</div><div class='add'>+	acpi_put_table((struct acpi_table_header *)madt);</div><div class='ctx'> </div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c<br/>index 2237d3f24f0e..5c8aa9cf62d7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/processor_idle.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/processor_idle.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/processor_idle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/processor_idle.c</a></div><div class='hunk'>@@ -141,7 +141,7 @@ static void lapic_timer_check_state(int state, struct acpi_processor *pr,</div><div class='ctx'> 	if (cpu_has(&amp;cpu_data(pr-&gt;id), X86_FEATURE_ARAT))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (amd_e400_c1e_detected)</div><div class='add'>+	if (boot_cpu_has_bug(X86_BUG_AMD_APIC_C1E))</div><div class='ctx'> 		type = ACPI_STATE_C1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c<br/>index bb01dea39fdc..18b72eec3507 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/processor_perflib.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/processor_perflib.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/processor_perflib.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/processor_perflib.c</a></div><div class='hunk'>@@ -75,10 +75,8 @@ static int acpi_processor_ppc_notifier(struct notifier_block *nb,</div><div class='ctx'> 	struct acpi_processor *pr;</div><div class='ctx'> 	unsigned int ppc = 0;</div><div class='ctx'> </div><div class='del'>-	if (event == CPUFREQ_START &amp;&amp; ignore_ppc &lt;= 0) {</div><div class='add'>+	if (ignore_ppc &lt; 0)</div><div class='ctx'> 		ignore_ppc = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (ignore_ppc)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -157,7 +155,7 @@ static void acpi_processor_ppc_ost(acpi_handle handle, int status)</div><div class='ctx'> 				  status, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag)</div><div class='add'>+void acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -168,7 +166,7 @@ int acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (event_flag)</div><div class='ctx'> 			acpi_processor_ppc_ost(pr-&gt;handle, 1);</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = acpi_processor_get_platform_limit(pr);</div><div class='hunk'>@@ -182,10 +180,8 @@ int acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag)</div><div class='ctx'> 		else</div><div class='ctx'> 			acpi_processor_ppc_ost(pr-&gt;handle, 0);</div><div class='ctx'> 	}</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return (ret);</div><div class='del'>-	else</div><div class='del'>-		return cpufreq_update_policy(pr-&gt;id);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		cpufreq_update_policy(pr-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)</div><div class='hunk'>@@ -465,11 +461,33 @@ int acpi_processor_get_performance_info(struct acpi_processor *pr)</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(acpi_processor_get_performance_info);</div><div class='del'>-int acpi_processor_notify_smm(struct module *calling_module)</div><div class='add'>+</div><div class='add'>+int acpi_processor_pstate_control(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	static int is_done = 0;</div><div class='ctx'> </div><div class='add'>+	if (!acpi_gbl_FADT.smi_command || !acpi_gbl_FADT.pstate_control)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='add'>+			  "Writing pstate_control [0x%x] to smi_command [0x%x]\n",</div><div class='add'>+			  acpi_gbl_FADT.pstate_control, acpi_gbl_FADT.smi_command));</div><div class='add'>+</div><div class='add'>+	status = acpi_os_write_port(acpi_gbl_FADT.smi_command,</div><div class='add'>+				    (u32)acpi_gbl_FADT.pstate_control, 8);</div><div class='add'>+	if (ACPI_SUCCESS(status))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+			"Failed to write pstate_control [0x%x] to smi_command [0x%x]",</div><div class='add'>+			acpi_gbl_FADT.pstate_control, acpi_gbl_FADT.smi_command));</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int acpi_processor_notify_smm(struct module *calling_module)</div><div class='add'>+{</div><div class='add'>+	static int is_done = 0;</div><div class='add'>+	int result;</div><div class='ctx'> </div><div class='ctx'> 	if (!(acpi_processor_ppc_status &amp; PPC_REGISTERED))</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -492,26 +510,15 @@ int acpi_processor_notify_smm(struct module *calling_module)</div><div class='ctx'> </div><div class='ctx'> 	is_done = -EIO;</div><div class='ctx'> </div><div class='del'>-	/* Can't write pstate_control to smi_command if either value is zero */</div><div class='del'>-	if ((!acpi_gbl_FADT.smi_command) || (!acpi_gbl_FADT.pstate_control)) {</div><div class='add'>+	result = acpi_processor_pstate_control();</div><div class='add'>+	if (!result) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No SMI port or pstate_control\n"));</div><div class='ctx'> 		module_put(calling_module);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='del'>-			  "Writing pstate_control [0x%x] to smi_command [0x%x]\n",</div><div class='del'>-			  acpi_gbl_FADT.pstate_control, acpi_gbl_FADT.smi_command));</div><div class='del'>-</div><div class='del'>-	status = acpi_os_write_port(acpi_gbl_FADT.smi_command,</div><div class='del'>-				    (u32) acpi_gbl_FADT.pstate_control, 8);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_EXCEPTION((AE_INFO, status,</div><div class='del'>-				"Failed to write pstate_control [0x%x] to "</div><div class='del'>-				"smi_command [0x%x]", acpi_gbl_FADT.pstate_control,</div><div class='del'>-				acpi_gbl_FADT.smi_command));</div><div class='add'>+	if (result &lt; 0) {</div><div class='ctx'> 		module_put(calling_module);</div><div class='del'>-		return status;</div><div class='add'>+		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Success. If there's no _PPC, we need to fear nothing, so</div><div class='head'>diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c<br/>index 1fed84a092c2..59c3a5d1e600 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/processor_thermal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/processor_thermal.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/processor_thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/processor_thermal.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PREFIX "ACPI: "</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c<br/>index d51ca1c05619..a12f96cc93ff 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/processor_throttling.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/processor_throttling.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/processor_throttling.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/processor_throttling.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/processor.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PREFIX "ACPI: "</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c<br/>index 03f5ec11ab31..3afddcd834ef 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/property.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/property.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/property.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/property.c</a></div><div class='hunk'>@@ -41,14 +41,13 @@ static bool acpi_enumerate_nondev_subnodes(acpi_handle scope,</div><div class='ctx'> static bool acpi_extract_properties(const union acpi_object *desc,</div><div class='ctx'> 				    struct acpi_device_data *data);</div><div class='ctx'> </div><div class='del'>-static bool acpi_nondev_subnode_ok(acpi_handle scope,</div><div class='del'>-				   const union acpi_object *link,</div><div class='del'>-				   struct list_head *list)</div><div class='add'>+static bool acpi_nondev_subnode_extract(const union acpi_object *desc,</div><div class='add'>+					acpi_handle handle,</div><div class='add'>+					const union acpi_object *link,</div><div class='add'>+					struct list_head *list)</div><div class='ctx'> {</div><div class='del'>-	struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER };</div><div class='ctx'> 	struct acpi_data_node *dn;</div><div class='del'>-	acpi_handle handle;</div><div class='del'>-	acpi_status status;</div><div class='add'>+	bool result;</div><div class='ctx'> </div><div class='ctx'> 	dn = kzalloc(sizeof(*dn), GFP_KERNEL);</div><div class='ctx'> 	if (!dn)</div><div class='hunk'>@@ -58,43 +57,75 @@ static bool acpi_nondev_subnode_ok(acpi_handle scope,</div><div class='ctx'> 	dn-&gt;fwnode.type = FWNODE_ACPI_DATA;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dn-&gt;data.subnodes);</div><div class='ctx'> </div><div class='del'>-	status = acpi_get_handle(scope, link-&gt;package.elements[1].string.pointer,</div><div class='del'>-				 &amp;handle);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		goto fail;</div><div class='add'>+	result = acpi_extract_properties(desc, &amp;dn-&gt;data);</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_object_typed(handle, NULL, NULL, &amp;buf,</div><div class='del'>-					    ACPI_TYPE_PACKAGE);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		goto fail;</div><div class='add'>+	if (handle) {</div><div class='add'>+		acpi_handle scope;</div><div class='add'>+		acpi_status status;</div><div class='ctx'> </div><div class='del'>-	if (acpi_extract_properties(buf.pointer, &amp;dn-&gt;data))</div><div class='del'>-		dn-&gt;handle = handle;</div><div class='add'>+		/*</div><div class='add'>+		 * The scope for the subnode object lookup is the one of the</div><div class='add'>+		 * namespace node (device) containing the object that has</div><div class='add'>+		 * returned the package.  That is, it's the scope of that</div><div class='add'>+		 * object's parent.</div><div class='add'>+		 */</div><div class='add'>+		status = acpi_get_parent(handle, &amp;scope);</div><div class='add'>+		if (ACPI_SUCCESS(status)</div><div class='add'>+		    &amp;&amp; acpi_enumerate_nondev_subnodes(scope, desc, &amp;dn-&gt;data))</div><div class='add'>+			result = true;</div><div class='add'>+	} else if (acpi_enumerate_nondev_subnodes(NULL, desc, &amp;dn-&gt;data)) {</div><div class='add'>+		result = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The scope for the subnode object lookup is the one of the namespace</div><div class='del'>-	 * node (device) containing the object that has returned the package.</div><div class='del'>-	 * That is, it's the scope of that object's parent.</div><div class='del'>-	 */</div><div class='del'>-	status = acpi_get_parent(handle, &amp;scope);</div><div class='del'>-	if (ACPI_SUCCESS(status)</div><div class='del'>-	    &amp;&amp; acpi_enumerate_nondev_subnodes(scope, buf.pointer, &amp;dn-&gt;data))</div><div class='add'>+	if (result) {</div><div class='ctx'> 		dn-&gt;handle = handle;</div><div class='del'>-</div><div class='del'>-	if (dn-&gt;handle) {</div><div class='del'>-		dn-&gt;data.pointer = buf.pointer;</div><div class='add'>+		dn-&gt;data.pointer = desc;</div><div class='ctx'> 		list_add_tail(&amp;dn-&gt;sibling, list);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	kfree(dn);</div><div class='ctx'> 	acpi_handle_debug(handle, "Invalid properties/subnodes data, skipping\n");</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool acpi_nondev_subnode_data_ok(acpi_handle handle,</div><div class='add'>+					const union acpi_object *link,</div><div class='add'>+					struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER };</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	status = acpi_evaluate_object_typed(handle, NULL, NULL, &amp;buf,</div><div class='add'>+					    ACPI_TYPE_PACKAGE);</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (acpi_nondev_subnode_extract(buf.pointer, handle, link, list))</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='del'>- fail:</div><div class='ctx'> 	ACPI_FREE(buf.pointer);</div><div class='del'>-	kfree(dn);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool acpi_nondev_subnode_ok(acpi_handle scope,</div><div class='add'>+				   const union acpi_object *link,</div><div class='add'>+				   struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	acpi_handle handle;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	if (!scope)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	status = acpi_get_handle(scope, link-&gt;package.elements[1].string.pointer,</div><div class='add'>+				 &amp;handle);</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return acpi_nondev_subnode_data_ok(handle, link, list);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int acpi_add_nondev_subnodes(acpi_handle scope,</div><div class='ctx'> 				    const union acpi_object *links,</div><div class='ctx'> 				    struct list_head *list)</div><div class='hunk'>@@ -103,15 +134,37 @@ static int acpi_add_nondev_subnodes(acpi_handle scope,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; links-&gt;package.count; i++) {</div><div class='del'>-		const union acpi_object *link;</div><div class='add'>+		const union acpi_object *link, *desc;</div><div class='add'>+		acpi_handle handle;</div><div class='add'>+		bool result;</div><div class='ctx'> </div><div class='ctx'> 		link = &amp;links-&gt;package.elements[i];</div><div class='del'>-		/* Only two elements allowed, both must be strings. */</div><div class='del'>-		if (link-&gt;package.count == 2</div><div class='del'>-		    &amp;&amp; link-&gt;package.elements[0].type == ACPI_TYPE_STRING</div><div class='del'>-		    &amp;&amp; link-&gt;package.elements[1].type == ACPI_TYPE_STRING</div><div class='del'>-		    &amp;&amp; acpi_nondev_subnode_ok(scope, link, list))</div><div class='del'>-			ret = true;</div><div class='add'>+		/* Only two elements allowed. */</div><div class='add'>+		if (link-&gt;package.count != 2)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* The first one must be a string. */</div><div class='add'>+		if (link-&gt;package.elements[0].type != ACPI_TYPE_STRING)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* The second one may be a string, a reference or a package. */</div><div class='add'>+		switch (link-&gt;package.elements[1].type) {</div><div class='add'>+		case ACPI_TYPE_STRING:</div><div class='add'>+			result = acpi_nondev_subnode_ok(scope, link, list);</div><div class='add'>+			break;</div><div class='add'>+		case ACPI_TYPE_LOCAL_REFERENCE:</div><div class='add'>+			handle = link-&gt;package.elements[1].reference.handle;</div><div class='add'>+			result = acpi_nondev_subnode_data_ok(handle, link, list);</div><div class='add'>+			break;</div><div class='add'>+		case ACPI_TYPE_PACKAGE:</div><div class='add'>+			desc = &amp;link-&gt;package.elements[1];</div><div class='add'>+			result = acpi_nondev_subnode_extract(desc, NULL, link, list);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			result = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = ret || result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c<br/>index 56241eb341f4..cd4c4271dc4c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/resource.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/resource.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/resource.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/resource.c</a></div><div class='hunk'>@@ -43,6 +43,19 @@ static inline bool</div><div class='ctx'> acpi_iospace_resource_valid(struct resource *res) { return true; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_ACPI_GENERIC_GSI)</div><div class='add'>+static inline bool is_gsi(struct acpi_resource_extended_irq *ext_irq)</div><div class='add'>+{</div><div class='add'>+	return ext_irq-&gt;resource_source.string_length == 0 &amp;&amp;</div><div class='add'>+	       ext_irq-&gt;producer_consumer == ACPI_CONSUMER;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline bool is_gsi(struct acpi_resource_extended_irq *ext_irq)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static bool acpi_dev_resource_len_valid(u64 start, u64 end, u64 len, bool io)</div><div class='ctx'> {</div><div class='ctx'> 	u64 reslen = end - start + 1;</div><div class='hunk'>@@ -393,7 +406,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * In IO-APIC mode, use overrided attribute. Two reasons:</div><div class='add'>+	 * In IO-APIC mode, use overridden attribute. Two reasons:</div><div class='ctx'> 	 * 1. BIOS bug in DSDT</div><div class='ctx'> 	 * 2. BIOS uses IO-APIC mode Interrupt Source Override</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -470,9 +483,12 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,</div><div class='ctx'> 			acpi_dev_irqresource_disabled(res, 0);</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='del'>-		acpi_dev_get_irqresource(res, ext_irq-&gt;interrupts[index],</div><div class='add'>+		if (is_gsi(ext_irq))</div><div class='add'>+			acpi_dev_get_irqresource(res, ext_irq-&gt;interrupts[index],</div><div class='ctx'> 					 ext_irq-&gt;triggering, ext_irq-&gt;polarity,</div><div class='ctx'> 					 ext_irq-&gt;sharable, false);</div><div class='add'>+		else</div><div class='add'>+			acpi_dev_irqresource_disabled(res, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		res-&gt;flags = 0;</div><div class='hunk'>@@ -664,3 +680,60 @@ int acpi_dev_filter_resource_type(struct acpi_resource *ares,</div><div class='ctx'> 	return (type &amp; types) ? 0 : 1;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(acpi_dev_filter_resource_type);</div><div class='add'>+</div><div class='add'>+static int acpi_dev_consumes_res(struct acpi_device *adev, struct resource *res)</div><div class='add'>+{</div><div class='add'>+	struct list_head resource_list;</div><div class='add'>+	struct resource_entry *rentry;</div><div class='add'>+	int ret, found = 0;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;resource_list);</div><div class='add'>+	ret = acpi_dev_get_resources(adev, &amp;resource_list, NULL, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rentry, &amp;resource_list, node) {</div><div class='add'>+		if (resource_contains(rentry-&gt;res, res)) {</div><div class='add'>+			found = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_dev_free_resource_list(&amp;resource_list);</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static acpi_status acpi_res_consumer_cb(acpi_handle handle, u32 depth,</div><div class='add'>+					 void *context, void **ret)</div><div class='add'>+{</div><div class='add'>+	struct resource *res = context;</div><div class='add'>+	struct acpi_device **consumer = (struct acpi_device **) ret;</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+</div><div class='add'>+	if (acpi_bus_get_device(handle, &amp;adev))</div><div class='add'>+		return AE_OK;</div><div class='add'>+</div><div class='add'>+	if (acpi_dev_consumes_res(adev, res)) {</div><div class='add'>+		*consumer = adev;</div><div class='add'>+		return AE_CTRL_TERMINATE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_resource_consumer - Find the ACPI device that consumes @res.</div><div class='add'>+ * @res: Resource to search for.</div><div class='add'>+ *</div><div class='add'>+ * Search the current resource settings (_CRS) of every ACPI device node</div><div class='add'>+ * for @res.  If we find an ACPI device whose _CRS includes @res, return</div><div class='add'>+ * it.  Otherwise, return NULL.</div><div class='add'>+ */</div><div class='add'>+struct acpi_device *acpi_resource_consumer(struct resource *res)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device *consumer = NULL;</div><div class='add'>+</div><div class='add'>+	acpi_get_devices(NULL, acpi_res_consumer_cb, res, (void **) &amp;consumer);</div><div class='add'>+	return consumer;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c<br/>index 3d1856f1f4d0..192691880d55 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/scan.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/scan.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/scan.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/scan.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/acpi_iort.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/dmi.h&gt;</div><div class='hunk'>@@ -1119,9 +1120,6 @@ acpi_backlight_cap_match(acpi_handle handle, u32 level, void *context,</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found generic backlight "</div><div class='ctx'> 				  "support\n"));</div><div class='ctx'> 		*cap |= ACPI_VIDEO_BACKLIGHT;</div><div class='del'>-		if (!acpi_has_method(handle, "_BQC"))</div><div class='del'>-			printk(KERN_WARNING FW_BUG PREFIX "No _BQC method, "</div><div class='del'>-				"cannot determine initial brightness\n");</div><div class='ctx'> 		/* We have backlight support, no need to scan further */</div><div class='ctx'> 		return AE_CTRL_TERMINATE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1370,6 +1368,38 @@ enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev)</div><div class='ctx'> 		return DEV_DMA_NON_COHERENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * acpi_dma_configure - Set-up DMA configuration for the device.</div><div class='add'>+ * @dev: The pointer to the device</div><div class='add'>+ * @attr: device dma attributes</div><div class='add'>+ */</div><div class='add'>+void acpi_dma_configure(struct device *dev, enum dev_dma_attr attr)</div><div class='add'>+{</div><div class='add'>+	const struct iommu_ops *iommu;</div><div class='add'>+</div><div class='add'>+	iort_set_dma_mask(dev);</div><div class='add'>+</div><div class='add'>+	iommu = iort_iommu_configure(dev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assume dma valid range starts at 0 and covers the whole</div><div class='add'>+	 * coherent_dma_mask.</div><div class='add'>+	 */</div><div class='add'>+	arch_setup_dma_ops(dev, 0, dev-&gt;coherent_dma_mask + 1, iommu,</div><div class='add'>+			   attr == DEV_DMA_COHERENT);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(acpi_dma_configure);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_dma_deconfigure - Tear-down DMA configuration for the device.</div><div class='add'>+ * @dev: The pointer to the device</div><div class='add'>+ */</div><div class='add'>+void acpi_dma_deconfigure(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	arch_teardown_dma_ops(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(acpi_dma_deconfigure);</div><div class='add'>+</div><div class='ctx'> static void acpi_init_coherency(struct acpi_device *adev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long long cca = 0;</div><div class='hunk'>@@ -2044,6 +2074,7 @@ int __init acpi_scan_init(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	acpi_gpe_apply_masked_gpes();</div><div class='ctx'> 	acpi_update_all_gpes();</div><div class='ctx'> 	acpi_ec_ecdt_start();</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c<br/>index 54abb26b7366..a4327af676fe 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/sleep.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/sleep.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/sleep.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/sleep.c</a></div><div class='hunk'>@@ -130,6 +130,12 @@ void __init acpi_nvs_nosave_s3(void)</div><div class='ctx'> 	nvs_nosave_s3 = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init init_nvs_save_s3(const struct dmi_system_id *d)</div><div class='add'>+{</div><div class='add'>+	nvs_nosave_s3 = false;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * ACPI 1.0 wants us to execute _PTS before suspending devices, so we allow the</div><div class='ctx'>  * user to request that behavior by using the 'acpi_old_suspend_ordering'</div><div class='hunk'>@@ -324,6 +330,19 @@ static struct dmi_system_id acpisleep_dmi_table[] __initdata = {</div><div class='ctx'> 		DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	/*</div><div class='add'>+	 * https://bugzilla.kernel.org/show_bug.cgi?id=189431</div><div class='add'>+	 * Lenovo G50-45 is a platform later than 2012, but needs nvs memory</div><div class='add'>+	 * saving during S3.</div><div class='add'>+	 */</div><div class='add'>+	{</div><div class='add'>+	.callback = init_nvs_save_s3,</div><div class='add'>+	.ident = "Lenovo G50-45",</div><div class='add'>+	.matches = {</div><div class='add'>+		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),</div><div class='add'>+		DMI_MATCH(DMI_PRODUCT_NAME, "80E3"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c<br/>index e8d7bc7d4da8..01c94669a2b0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/spcr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/spcr.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/spcr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/spcr.c</a></div><div class='hunk'>@@ -16,6 +16,26 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Some Qualcomm Datacenter Technologies SoCs have a defective UART BUSY bit.</div><div class='add'>+ * Detect them by examining the OEM fields in the SPCR header, similiar to PCI</div><div class='add'>+ * quirk detection in pci_mcfg.c.</div><div class='add'>+ */</div><div class='add'>+static bool qdf2400_erratum_44_present(struct acpi_table_header *h)</div><div class='add'>+{</div><div class='add'>+	if (memcmp(h-&gt;oem_id, "QCOM  ", ACPI_OEM_ID_SIZE))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!memcmp(h-&gt;oem_table_id, "QDF2432 ", ACPI_OEM_TABLE_ID_SIZE))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!memcmp(h-&gt;oem_table_id, "QDF2400 ", ACPI_OEM_TABLE_ID_SIZE) &amp;&amp;</div><div class='add'>+			h-&gt;oem_revision == 0)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * parse_spcr() - parse ACPI SPCR table and add preferred console</div><div class='ctx'>  *</div><div class='hunk'>@@ -26,14 +46,13 @@</div><div class='ctx'>  * console is registered and if @earlycon is true, earlycon is set up.</div><div class='ctx'>  *</div><div class='ctx'>  * When CONFIG_ACPI_SPCR_TABLE is defined, this function should be called</div><div class='del'>- * from arch inintialization code as soon as the DT/ACPI decision is made.</div><div class='add'>+ * from arch initialization code as soon as the DT/ACPI decision is made.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> int __init parse_spcr(bool earlycon)</div><div class='ctx'> {</div><div class='ctx'> 	static char opts[64];</div><div class='ctx'> 	struct acpi_table_spcr *table;</div><div class='del'>-	acpi_size table_size;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	char *uart;</div><div class='ctx'> 	char *iotype;</div><div class='hunk'>@@ -43,9 +62,8 @@ int __init parse_spcr(bool earlycon)</div><div class='ctx'> 	if (acpi_disabled)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	status = acpi_get_table_with_size(ACPI_SIG_SPCR, 0,</div><div class='del'>-					  (struct acpi_table_header **)&amp;table,</div><div class='del'>-					  &amp;table_size);</div><div class='add'>+	status = acpi_get_table(ACPI_SIG_SPCR, 0,</div><div class='add'>+				(struct acpi_table_header **)&amp;table);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='ctx'> 		return -ENOENT;</div><div class='hunk'>@@ -95,6 +113,9 @@ int __init parse_spcr(bool earlycon)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (qdf2400_erratum_44_present(&amp;table-&gt;header))</div><div class='add'>+		uart = "qdf2400_e44";</div><div class='add'>+</div><div class='ctx'> 	snprintf(opts, sizeof(opts), "%s,%s,0x%llx,%d", uart, iotype,</div><div class='ctx'> 		 table-&gt;serial_port.address, baud_rate);</div><div class='ctx'> </div><div class='hunk'>@@ -106,6 +127,6 @@ int __init parse_spcr(bool earlycon)</div><div class='ctx'> 	err = add_preferred_console(uart, 0, opts + strlen(uart) + 1);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	early_acpi_os_unmap_memory((void __iomem *)table, table_size);</div><div class='add'>+	acpi_put_table((struct acpi_table_header *)table);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c<br/>index 703c26e7022c..cf05ae973381 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/sysfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/sysfs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/sysfs.c</a></div><div class='hunk'>@@ -708,6 +708,62 @@ end:</div><div class='ctx'> 	return result ? result : size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * A Quirk Mechanism for GPE Flooding Prevention:</div><div class='add'>+ *</div><div class='add'>+ * Quirks may be needed to prevent GPE flooding on a specific GPE. The</div><div class='add'>+ * flooding typically cannot be detected and automatically prevented by</div><div class='add'>+ * ACPI_GPE_DISPATCH_NONE check because there is a _Lxx/_Exx prepared in</div><div class='add'>+ * the AML tables. This normally indicates a feature gap in Linux, thus</div><div class='add'>+ * instead of providing endless quirk tables, we provide a boot parameter</div><div class='add'>+ * for those who want this quirk. For example, if the users want to prevent</div><div class='add'>+ * the GPE flooding for GPE 00, they need to specify the following boot</div><div class='add'>+ * parameter:</div><div class='add'>+ *   acpi_mask_gpe=0x00</div><div class='add'>+ * The masking status can be modified by the following runtime controlling</div><div class='add'>+ * interface:</div><div class='add'>+ *   echo unmask &gt; /sys/firmware/acpi/interrupts/gpe00</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Currently, the GPE flooding prevention only supports to mask the GPEs</div><div class='add'>+ * numbered from 00 to 7f.</div><div class='add'>+ */</div><div class='add'>+#define ACPI_MASKABLE_GPE_MAX	0x80</div><div class='add'>+</div><div class='add'>+static u64 __initdata acpi_masked_gpes;</div><div class='add'>+</div><div class='add'>+static int __init acpi_gpe_set_masked_gpes(char *val)</div><div class='add'>+{</div><div class='add'>+	u8 gpe;</div><div class='add'>+</div><div class='add'>+	if (kstrtou8(val, 0, &amp;gpe) || gpe &gt; ACPI_MASKABLE_GPE_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	acpi_masked_gpes |= ((u64)1&lt;&lt;gpe);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("acpi_mask_gpe=", acpi_gpe_set_masked_gpes);</div><div class='add'>+</div><div class='add'>+void __init acpi_gpe_apply_masked_gpes(void)</div><div class='add'>+{</div><div class='add'>+	acpi_handle handle;</div><div class='add'>+	acpi_status status;</div><div class='add'>+	u8 gpe;</div><div class='add'>+</div><div class='add'>+	for (gpe = 0;</div><div class='add'>+	     gpe &lt; min_t(u8, ACPI_MASKABLE_GPE_MAX, acpi_current_gpe_count);</div><div class='add'>+	     gpe++) {</div><div class='add'>+		if (acpi_masked_gpes &amp; ((u64)1&lt;&lt;gpe)) {</div><div class='add'>+			status = acpi_get_gpe_device(gpe, &amp;handle);</div><div class='add'>+			if (ACPI_SUCCESS(status)) {</div><div class='add'>+				pr_info("Masking GPE 0x%x.\n", gpe);</div><div class='add'>+				(void)acpi_mask_gpe(handle, gpe, TRUE);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void acpi_irq_stats_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='head'>diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c<br/>index cdd56c4657e0..2604189d6cd1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/tables.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/tables.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/tables.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/tables.c</a></div><div class='hunk'>@@ -333,7 +333,6 @@ acpi_table_parse_entries_array(char *id,</div><div class='ctx'> 			 unsigned int max_entries)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_header *table_header = NULL;</div><div class='del'>-	acpi_size tbl_size;</div><div class='ctx'> 	int count;</div><div class='ctx'> 	u32 instance = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -346,7 +345,7 @@ acpi_table_parse_entries_array(char *id,</div><div class='ctx'> 	if (!strncmp(id, ACPI_SIG_MADT, 4))</div><div class='ctx'> 		instance = acpi_apic_instance;</div><div class='ctx'> </div><div class='del'>-	acpi_get_table_with_size(id, instance, &amp;table_header, &amp;tbl_size);</div><div class='add'>+	acpi_get_table(id, instance, &amp;table_header);</div><div class='ctx'> 	if (!table_header) {</div><div class='ctx'> 		pr_warn("%4.4s not present\n", id);</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -355,7 +354,7 @@ acpi_table_parse_entries_array(char *id,</div><div class='ctx'> 	count = acpi_parse_entries_array(id, table_size, table_header,</div><div class='ctx'> 			proc, proc_num, max_entries);</div><div class='ctx'> </div><div class='del'>-	early_acpi_os_unmap_memory((char *)table_header, tbl_size);</div><div class='add'>+	acpi_put_table(table_header);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -397,7 +396,6 @@ acpi_table_parse_madt(enum acpi_madt_type id,</div><div class='ctx'> int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_header *table = NULL;</div><div class='del'>-	acpi_size tbl_size;</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -406,13 +404,13 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (strncmp(id, ACPI_SIG_MADT, 4) == 0)</div><div class='del'>-		acpi_get_table_with_size(id, acpi_apic_instance, &amp;table, &amp;tbl_size);</div><div class='add'>+		acpi_get_table(id, acpi_apic_instance, &amp;table);</div><div class='ctx'> 	else</div><div class='del'>-		acpi_get_table_with_size(id, 0, &amp;table, &amp;tbl_size);</div><div class='add'>+		acpi_get_table(id, 0, &amp;table);</div><div class='ctx'> </div><div class='ctx'> 	if (table) {</div><div class='ctx'> 		handler(table);</div><div class='del'>-		early_acpi_os_unmap_memory(table, tbl_size);</div><div class='add'>+		acpi_put_table(table);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -426,16 +424,15 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)</div><div class='ctx'> static void __init check_multiple_madt(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_header *table = NULL;</div><div class='del'>-	acpi_size tbl_size;</div><div class='ctx'> </div><div class='del'>-	acpi_get_table_with_size(ACPI_SIG_MADT, 2, &amp;table, &amp;tbl_size);</div><div class='add'>+	acpi_get_table(ACPI_SIG_MADT, 2, &amp;table);</div><div class='ctx'> 	if (table) {</div><div class='ctx'> 		pr_warn("BIOS bug: multiple APIC/MADT found, using %d\n",</div><div class='ctx'> 			acpi_apic_instance);</div><div class='ctx'> 		pr_warn("If \"acpi_apic_instance=%d\" works better, "</div><div class='ctx'> 			"notify linux-acpi@vger.kernel.org\n",</div><div class='ctx'> 			acpi_apic_instance ? 0 : 2);</div><div class='del'>-		early_acpi_os_unmap_memory(table, tbl_size);</div><div class='add'>+		acpi_put_table(table);</div><div class='ctx'> </div><div class='ctx'> 	} else</div><div class='ctx'> 		acpi_apic_instance = 0;</div><div class='head'>diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c<br/>index 35e8fbca10ad..1d0417b87cb7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/thermal.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/thermal.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/thermal.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/thermal.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> #include &lt;linux/thermal.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PREFIX "ACPI: "</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c<br/>index a6b36fc53aec..7f48156cbc0c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/acpi/video_detect.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/acpi/video_detect.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/acpi/video_detect.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/acpi/video_detect.c</a></div><div class='hunk'>@@ -296,6 +296,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = {</div><div class='ctx'> 		DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"),</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1123661 */</div><div class='add'>+	 .callback = video_detect_force_native,</div><div class='add'>+	 .ident = "Dell XPS 17 L702X",</div><div class='add'>+	 .matches = {</div><div class='add'>+		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+		DMI_MATCH(DMI_PRODUCT_NAME, "Dell System XPS L702X"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig<br/>index bdfc6c6f4f5a..a82fc022d34b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/android/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/android/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/android/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/android/Kconfig</a></div><div class='hunk'>@@ -19,6 +19,18 @@ config ANDROID_BINDER_IPC</div><div class='ctx'> 	  Android process, using Binder to identify, invoke and pass arguments</div><div class='ctx'> 	  between said processes.</div><div class='ctx'> </div><div class='add'>+config ANDROID_BINDER_DEVICES</div><div class='add'>+	string "Android Binder devices"</div><div class='add'>+	depends on ANDROID_BINDER_IPC</div><div class='add'>+	default "binder"</div><div class='add'>+	---help---</div><div class='add'>+	  Default value for the binder.devices parameter.</div><div class='add'>+</div><div class='add'>+	  The binder.devices parameter is a comma-separated list of strings</div><div class='add'>+	  that specifies the names of the binder device nodes that will be</div><div class='add'>+	  created. Each binder device has its own context manager, and is</div><div class='add'>+	  therefore logically separated from the other devices.</div><div class='add'>+</div><div class='ctx'> config ANDROID_BINDER_IPC_32BIT</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on !64BIT &amp;&amp; ANDROID_BINDER_IPC</div><div class='head'>diff --git a/drivers/android/binder.c b/drivers/android/binder.c<br/>index 3c71b982bf2a..aae4d8d4be36 100644<br/>--- a/<a href='/drm-misc/tree/drivers/android/binder.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/android/binder.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/android/binder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/android/binder.c</a></div><div class='hunk'>@@ -31,7 +31,8 @@</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='hunk'>@@ -50,14 +51,13 @@ static DEFINE_MUTEX(binder_main_lock);</div><div class='ctx'> static DEFINE_MUTEX(binder_deferred_lock);</div><div class='ctx'> static DEFINE_MUTEX(binder_mmap_lock);</div><div class='ctx'> </div><div class='add'>+static HLIST_HEAD(binder_devices);</div><div class='ctx'> static HLIST_HEAD(binder_procs);</div><div class='ctx'> static HLIST_HEAD(binder_deferred_list);</div><div class='ctx'> static HLIST_HEAD(binder_dead_nodes);</div><div class='ctx'> </div><div class='ctx'> static struct dentry *binder_debugfs_dir_entry_root;</div><div class='ctx'> static struct dentry *binder_debugfs_dir_entry_proc;</div><div class='del'>-static struct binder_node *binder_context_mgr_node;</div><div class='del'>-static kuid_t binder_context_mgr_uid = INVALID_UID;</div><div class='ctx'> static int binder_last_id;</div><div class='ctx'> </div><div class='ctx'> #define BINDER_DEBUG_ENTRY(name) \</div><div class='hunk'>@@ -115,6 +115,9 @@ module_param_named(debug_mask, binder_debug_mask, uint, S_IWUSR | S_IRUGO);</div><div class='ctx'> static bool binder_debug_no_lock;</div><div class='ctx'> module_param_named(proc_no_lock, binder_debug_no_lock, bool, S_IWUSR | S_IRUGO);</div><div class='ctx'> </div><div class='add'>+static char *binder_devices_param = CONFIG_ANDROID_BINDER_DEVICES;</div><div class='add'>+module_param_named(devices, binder_devices_param, charp, 0444);</div><div class='add'>+</div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait);</div><div class='ctx'> static int binder_stop_on_user_error;</div><div class='ctx'> </div><div class='hunk'>@@ -145,6 +148,17 @@ module_param_call(stop_on_user_error, binder_set_stop_on_user_error,</div><div class='ctx'> 			binder_stop_on_user_error = 2; \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+#define to_flat_binder_object(hdr) \</div><div class='add'>+	container_of(hdr, struct flat_binder_object, hdr)</div><div class='add'>+</div><div class='add'>+#define to_binder_fd_object(hdr) container_of(hdr, struct binder_fd_object, hdr)</div><div class='add'>+</div><div class='add'>+#define to_binder_buffer_object(hdr) \</div><div class='add'>+	container_of(hdr, struct binder_buffer_object, hdr)</div><div class='add'>+</div><div class='add'>+#define to_binder_fd_array_object(hdr) \</div><div class='add'>+	container_of(hdr, struct binder_fd_array_object, hdr)</div><div class='add'>+</div><div class='ctx'> enum binder_stat_types {</div><div class='ctx'> 	BINDER_STAT_PROC,</div><div class='ctx'> 	BINDER_STAT_THREAD,</div><div class='hunk'>@@ -158,7 +172,7 @@ enum binder_stat_types {</div><div class='ctx'> </div><div class='ctx'> struct binder_stats {</div><div class='ctx'> 	int br[_IOC_NR(BR_FAILED_REPLY) + 1];</div><div class='del'>-	int bc[_IOC_NR(BC_DEAD_BINDER_DONE) + 1];</div><div class='add'>+	int bc[_IOC_NR(BC_REPLY_SG) + 1];</div><div class='ctx'> 	int obj_created[BINDER_STAT_COUNT];</div><div class='ctx'> 	int obj_deleted[BINDER_STAT_COUNT];</div><div class='ctx'> };</div><div class='hunk'>@@ -186,6 +200,7 @@ struct binder_transaction_log_entry {</div><div class='ctx'> 	int to_node;</div><div class='ctx'> 	int data_size;</div><div class='ctx'> 	int offsets_size;</div><div class='add'>+	const char *context_name;</div><div class='ctx'> };</div><div class='ctx'> struct binder_transaction_log {</div><div class='ctx'> 	int next;</div><div class='hunk'>@@ -210,6 +225,18 @@ static struct binder_transaction_log_entry *binder_transaction_log_add(</div><div class='ctx'> 	return e;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct binder_context {</div><div class='add'>+	struct binder_node *binder_context_mgr_node;</div><div class='add'>+	kuid_t binder_context_mgr_uid;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_device {</div><div class='add'>+	struct hlist_node hlist;</div><div class='add'>+	struct miscdevice miscdev;</div><div class='add'>+	struct binder_context context;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct binder_work {</div><div class='ctx'> 	struct list_head entry;</div><div class='ctx'> 	enum {</div><div class='hunk'>@@ -282,6 +309,7 @@ struct binder_buffer {</div><div class='ctx'> 	struct binder_node *target_node;</div><div class='ctx'> 	size_t data_size;</div><div class='ctx'> 	size_t offsets_size;</div><div class='add'>+	size_t extra_buffers_size;</div><div class='ctx'> 	uint8_t data[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -325,6 +353,7 @@ struct binder_proc {</div><div class='ctx'> 	int ready_threads;</div><div class='ctx'> 	long default_priority;</div><div class='ctx'> 	struct dentry *debugfs_entry;</div><div class='add'>+	struct binder_context *context;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -629,7 +658,7 @@ free_range:</div><div class='ctx'> 		page = &amp;proc-&gt;pages[(page_addr - proc-&gt;buffer) / PAGE_SIZE];</div><div class='ctx'> 		if (vma)</div><div class='ctx'> 			zap_page_range(vma, (uintptr_t)page_addr +</div><div class='del'>-				proc-&gt;user_buffer_offset, PAGE_SIZE, NULL);</div><div class='add'>+				proc-&gt;user_buffer_offset, PAGE_SIZE);</div><div class='ctx'> err_vm_insert_page_failed:</div><div class='ctx'> 		unmap_kernel_range((unsigned long)page_addr, PAGE_SIZE);</div><div class='ctx'> err_map_kernel_failed:</div><div class='hunk'>@@ -648,7 +677,9 @@ err_no_vma:</div><div class='ctx'> </div><div class='ctx'> static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,</div><div class='ctx'> 					      size_t data_size,</div><div class='del'>-					      size_t offsets_size, int is_async)</div><div class='add'>+					      size_t offsets_size,</div><div class='add'>+					      size_t extra_buffers_size,</div><div class='add'>+					      int is_async)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *n = proc-&gt;free_buffers.rb_node;</div><div class='ctx'> 	struct binder_buffer *buffer;</div><div class='hunk'>@@ -656,7 +687,7 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,</div><div class='ctx'> 	struct rb_node *best_fit = NULL;</div><div class='ctx'> 	void *has_page_addr;</div><div class='ctx'> 	void *end_page_addr;</div><div class='del'>-	size_t size;</div><div class='add'>+	size_t size, data_offsets_size;</div><div class='ctx'> </div><div class='ctx'> 	if (proc-&gt;vma == NULL) {</div><div class='ctx'> 		pr_err("%d: binder_alloc_buf, no vma\n",</div><div class='hunk'>@@ -664,15 +695,20 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	size = ALIGN(data_size, sizeof(void *)) +</div><div class='add'>+	data_offsets_size = ALIGN(data_size, sizeof(void *)) +</div><div class='ctx'> 		ALIGN(offsets_size, sizeof(void *));</div><div class='ctx'> </div><div class='del'>-	if (size &lt; data_size || size &lt; offsets_size) {</div><div class='add'>+	if (data_offsets_size &lt; data_size || data_offsets_size &lt; offsets_size) {</div><div class='ctx'> 		binder_user_error("%d: got transaction with invalid size %zd-%zd\n",</div><div class='ctx'> 				proc-&gt;pid, data_size, offsets_size);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	size = data_offsets_size + ALIGN(extra_buffers_size, sizeof(void *));</div><div class='add'>+	if (size &lt; data_offsets_size || size &lt; extra_buffers_size) {</div><div class='add'>+		binder_user_error("%d: got transaction with invalid extra_buffers_size %zd\n",</div><div class='add'>+				  proc-&gt;pid, extra_buffers_size);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> 	if (is_async &amp;&amp;</div><div class='ctx'> 	    proc-&gt;free_async_space &lt; size + sizeof(struct binder_buffer)) {</div><div class='ctx'> 		binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='hunk'>@@ -741,6 +777,7 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,</div><div class='ctx'> 		      proc-&gt;pid, size, buffer);</div><div class='ctx'> 	buffer-&gt;data_size = data_size;</div><div class='ctx'> 	buffer-&gt;offsets_size = offsets_size;</div><div class='add'>+	buffer-&gt;extra_buffers_size = extra_buffers_size;</div><div class='ctx'> 	buffer-&gt;async_transaction = is_async;</div><div class='ctx'> 	if (is_async) {</div><div class='ctx'> 		proc-&gt;free_async_space -= size + sizeof(struct binder_buffer);</div><div class='hunk'>@@ -815,7 +852,8 @@ static void binder_free_buf(struct binder_proc *proc,</div><div class='ctx'> 	buffer_size = binder_buffer_size(proc, buffer);</div><div class='ctx'> </div><div class='ctx'> 	size = ALIGN(buffer-&gt;data_size, sizeof(void *)) +</div><div class='del'>-		ALIGN(buffer-&gt;offsets_size, sizeof(void *));</div><div class='add'>+		ALIGN(buffer-&gt;offsets_size, sizeof(void *)) +</div><div class='add'>+		ALIGN(buffer-&gt;extra_buffers_size, sizeof(void *));</div><div class='ctx'> </div><div class='ctx'> 	binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='ctx'> 		     "%d: binder_free_buf %p size %zd buffer_size %zd\n",</div><div class='hunk'>@@ -929,8 +967,9 @@ static int binder_inc_node(struct binder_node *node, int strong, int internal,</div><div class='ctx'> 		if (internal) {</div><div class='ctx'> 			if (target_list == NULL &amp;&amp;</div><div class='ctx'> 			    node-&gt;internal_strong_refs == 0 &amp;&amp;</div><div class='del'>-			    !(node == binder_context_mgr_node &amp;&amp;</div><div class='del'>-			    node-&gt;has_strong_ref)) {</div><div class='add'>+			    !(node-&gt;proc &amp;&amp;</div><div class='add'>+			      node == node-&gt;proc-&gt;context-&gt;binder_context_mgr_node &amp;&amp;</div><div class='add'>+			      node-&gt;has_strong_ref)) {</div><div class='ctx'> 				pr_err("invalid inc strong node for %d\n",</div><div class='ctx'> 					node-&gt;debug_id);</div><div class='ctx'> 				return -EINVAL;</div><div class='hunk'>@@ -1031,6 +1070,7 @@ static struct binder_ref *binder_get_ref_for_node(struct binder_proc *proc,</div><div class='ctx'> 	struct rb_node **p = &amp;proc-&gt;refs_by_node.rb_node;</div><div class='ctx'> 	struct rb_node *parent = NULL;</div><div class='ctx'> 	struct binder_ref *ref, *new_ref;</div><div class='add'>+	struct binder_context *context = proc-&gt;context;</div><div class='ctx'> </div><div class='ctx'> 	while (*p) {</div><div class='ctx'> 		parent = *p;</div><div class='hunk'>@@ -1053,7 +1093,7 @@ static struct binder_ref *binder_get_ref_for_node(struct binder_proc *proc,</div><div class='ctx'> 	rb_link_node(&amp;new_ref-&gt;rb_node_node, parent, p);</div><div class='ctx'> 	rb_insert_color(&amp;new_ref-&gt;rb_node_node, &amp;proc-&gt;refs_by_node);</div><div class='ctx'> </div><div class='del'>-	new_ref-&gt;desc = (node == binder_context_mgr_node) ? 0 : 1;</div><div class='add'>+	new_ref-&gt;desc = (node == context-&gt;binder_context_mgr_node) ? 0 : 1;</div><div class='ctx'> 	for (n = rb_first(&amp;proc-&gt;refs_by_desc); n != NULL; n = rb_next(n)) {</div><div class='ctx'> 		ref = rb_entry(n, struct binder_ref, rb_node_desc);</div><div class='ctx'> 		if (ref-&gt;desc &gt; new_ref-&gt;desc)</div><div class='hunk'>@@ -1240,11 +1280,158 @@ static void binder_send_failed_reply(struct binder_transaction *t,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * binder_validate_object() - checks for a valid metadata object in a buffer.</div><div class='add'>+ * @buffer:	binder_buffer that we're parsing.</div><div class='add'>+ * @offset:	offset in the buffer at which to validate an object.</div><div class='add'>+ *</div><div class='add'>+ * Return:	If there's a valid metadata object at @offset in @buffer, the</div><div class='add'>+ *		size of that object. Otherwise, it returns zero.</div><div class='add'>+ */</div><div class='add'>+static size_t binder_validate_object(struct binder_buffer *buffer, u64 offset)</div><div class='add'>+{</div><div class='add'>+	/* Check if we can read a header first */</div><div class='add'>+	struct binder_object_header *hdr;</div><div class='add'>+	size_t object_size = 0;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; buffer-&gt;data_size - sizeof(*hdr) ||</div><div class='add'>+	    buffer-&gt;data_size &lt; sizeof(*hdr) ||</div><div class='add'>+	    !IS_ALIGNED(offset, sizeof(u32)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Ok, now see if we can read a complete object. */</div><div class='add'>+	hdr = (struct binder_object_header *)(buffer-&gt;data + offset);</div><div class='add'>+	switch (hdr-&gt;type) {</div><div class='add'>+	case BINDER_TYPE_BINDER:</div><div class='add'>+	case BINDER_TYPE_WEAK_BINDER:</div><div class='add'>+	case BINDER_TYPE_HANDLE:</div><div class='add'>+	case BINDER_TYPE_WEAK_HANDLE:</div><div class='add'>+		object_size = sizeof(struct flat_binder_object);</div><div class='add'>+		break;</div><div class='add'>+	case BINDER_TYPE_FD:</div><div class='add'>+		object_size = sizeof(struct binder_fd_object);</div><div class='add'>+		break;</div><div class='add'>+	case BINDER_TYPE_PTR:</div><div class='add'>+		object_size = sizeof(struct binder_buffer_object);</div><div class='add'>+		break;</div><div class='add'>+	case BINDER_TYPE_FDA:</div><div class='add'>+		object_size = sizeof(struct binder_fd_array_object);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (offset &lt;= buffer-&gt;data_size - object_size &amp;&amp;</div><div class='add'>+	    buffer-&gt;data_size &gt;= object_size)</div><div class='add'>+		return object_size;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * binder_validate_ptr() - validates binder_buffer_object in a binder_buffer.</div><div class='add'>+ * @b:		binder_buffer containing the object</div><div class='add'>+ * @index:	index in offset array at which the binder_buffer_object is</div><div class='add'>+ *		located</div><div class='add'>+ * @start:	points to the start of the offset array</div><div class='add'>+ * @num_valid:	the number of valid offsets in the offset array</div><div class='add'>+ *</div><div class='add'>+ * Return:	If @index is within the valid range of the offset array</div><div class='add'>+ *		described by @start and @num_valid, and if there's a valid</div><div class='add'>+ *		binder_buffer_object at the offset found in index @index</div><div class='add'>+ *		of the offset array, that object is returned. Otherwise,</div><div class='add'>+ *		%NULL is returned.</div><div class='add'>+ *		Note that the offset found in index @index itself is not</div><div class='add'>+ *		verified; this function assumes that @num_valid elements</div><div class='add'>+ *		from @start were previously verified to have valid offsets.</div><div class='add'>+ */</div><div class='add'>+static struct binder_buffer_object *binder_validate_ptr(struct binder_buffer *b,</div><div class='add'>+							binder_size_t index,</div><div class='add'>+							binder_size_t *start,</div><div class='add'>+							binder_size_t num_valid)</div><div class='add'>+{</div><div class='add'>+	struct binder_buffer_object *buffer_obj;</div><div class='add'>+	binder_size_t *offp;</div><div class='add'>+</div><div class='add'>+	if (index &gt;= num_valid)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	offp = start + index;</div><div class='add'>+	buffer_obj = (struct binder_buffer_object *)(b-&gt;data + *offp);</div><div class='add'>+	if (buffer_obj-&gt;hdr.type != BINDER_TYPE_PTR)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return buffer_obj;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * binder_validate_fixup() - validates pointer/fd fixups happen in order.</div><div class='add'>+ * @b:			transaction buffer</div><div class='add'>+ * @objects_start	start of objects buffer</div><div class='add'>+ * @buffer:		binder_buffer_object in which to fix up</div><div class='add'>+ * @offset:		start offset in @buffer to fix up</div><div class='add'>+ * @last_obj:		last binder_buffer_object that we fixed up in</div><div class='add'>+ * @last_min_offset:	minimum fixup offset in @last_obj</div><div class='add'>+ *</div><div class='add'>+ * Return:		%true if a fixup in buffer @buffer at offset @offset is</div><div class='add'>+ *			allowed.</div><div class='add'>+ *</div><div class='add'>+ * For safety reasons, we only allow fixups inside a buffer to happen</div><div class='add'>+ * at increasing offsets; additionally, we only allow fixup on the last</div><div class='add'>+ * buffer object that was verified, or one of its parents.</div><div class='add'>+ *</div><div class='add'>+ * Example of what is allowed:</div><div class='add'>+ *</div><div class='add'>+ * A</div><div class='add'>+ *   B (parent = A, offset = 0)</div><div class='add'>+ *   C (parent = A, offset = 16)</div><div class='add'>+ *     D (parent = C, offset = 0)</div><div class='add'>+ *   E (parent = A, offset = 32) // min_offset is 16 (C.parent_offset)</div><div class='add'>+ *</div><div class='add'>+ * Examples of what is not allowed:</div><div class='add'>+ *</div><div class='add'>+ * Decreasing offsets within the same parent:</div><div class='add'>+ * A</div><div class='add'>+ *   C (parent = A, offset = 16)</div><div class='add'>+ *   B (parent = A, offset = 0) // decreasing offset within A</div><div class='add'>+ *</div><div class='add'>+ * Referring to a parent that wasn't the last object or any of its parents:</div><div class='add'>+ * A</div><div class='add'>+ *   B (parent = A, offset = 0)</div><div class='add'>+ *   C (parent = A, offset = 0)</div><div class='add'>+ *   C (parent = A, offset = 16)</div><div class='add'>+ *     D (parent = B, offset = 0) // B is not A or any of A's parents</div><div class='add'>+ */</div><div class='add'>+static bool binder_validate_fixup(struct binder_buffer *b,</div><div class='add'>+				  binder_size_t *objects_start,</div><div class='add'>+				  struct binder_buffer_object *buffer,</div><div class='add'>+				  binder_size_t fixup_offset,</div><div class='add'>+				  struct binder_buffer_object *last_obj,</div><div class='add'>+				  binder_size_t last_min_offset)</div><div class='add'>+{</div><div class='add'>+	if (!last_obj) {</div><div class='add'>+		/* Nothing to fix up in */</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (last_obj != buffer) {</div><div class='add'>+		/*</div><div class='add'>+		 * Safe to retrieve the parent of last_obj, since it</div><div class='add'>+		 * was already previously verified by the driver.</div><div class='add'>+		 */</div><div class='add'>+		if ((last_obj-&gt;flags &amp; BINDER_BUFFER_FLAG_HAS_PARENT) == 0)</div><div class='add'>+			return false;</div><div class='add'>+		last_min_offset = last_obj-&gt;parent_offset + sizeof(uintptr_t);</div><div class='add'>+		last_obj = (struct binder_buffer_object *)</div><div class='add'>+			(b-&gt;data + *(objects_start + last_obj-&gt;parent));</div><div class='add'>+	}</div><div class='add'>+	return (fixup_offset &gt;= last_min_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void binder_transaction_buffer_release(struct binder_proc *proc,</div><div class='ctx'> 					      struct binder_buffer *buffer,</div><div class='ctx'> 					      binder_size_t *failed_at)</div><div class='ctx'> {</div><div class='del'>-	binder_size_t *offp, *off_end;</div><div class='add'>+	binder_size_t *offp, *off_start, *off_end;</div><div class='ctx'> 	int debug_id = buffer-&gt;debug_id;</div><div class='ctx'> </div><div class='ctx'> 	binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='hunk'>@@ -1255,28 +1442,30 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,</div><div class='ctx'> 	if (buffer-&gt;target_node)</div><div class='ctx'> 		binder_dec_node(buffer-&gt;target_node, 1, 0);</div><div class='ctx'> </div><div class='del'>-	offp = (binder_size_t *)(buffer-&gt;data +</div><div class='del'>-				 ALIGN(buffer-&gt;data_size, sizeof(void *)));</div><div class='add'>+	off_start = (binder_size_t *)(buffer-&gt;data +</div><div class='add'>+				      ALIGN(buffer-&gt;data_size, sizeof(void *)));</div><div class='ctx'> 	if (failed_at)</div><div class='ctx'> 		off_end = failed_at;</div><div class='ctx'> 	else</div><div class='del'>-		off_end = (void *)offp + buffer-&gt;offsets_size;</div><div class='del'>-	for (; offp &lt; off_end; offp++) {</div><div class='del'>-		struct flat_binder_object *fp;</div><div class='add'>+		off_end = (void *)off_start + buffer-&gt;offsets_size;</div><div class='add'>+	for (offp = off_start; offp &lt; off_end; offp++) {</div><div class='add'>+		struct binder_object_header *hdr;</div><div class='add'>+		size_t object_size = binder_validate_object(buffer, *offp);</div><div class='ctx'> </div><div class='del'>-		if (*offp &gt; buffer-&gt;data_size - sizeof(*fp) ||</div><div class='del'>-		    buffer-&gt;data_size &lt; sizeof(*fp) ||</div><div class='del'>-		    !IS_ALIGNED(*offp, sizeof(u32))) {</div><div class='del'>-			pr_err("transaction release %d bad offset %lld, size %zd\n",</div><div class='add'>+		if (object_size == 0) {</div><div class='add'>+			pr_err("transaction release %d bad object at offset %lld, size %zd\n",</div><div class='ctx'> 			       debug_id, (u64)*offp, buffer-&gt;data_size);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		fp = (struct flat_binder_object *)(buffer-&gt;data + *offp);</div><div class='del'>-		switch (fp-&gt;type) {</div><div class='add'>+		hdr = (struct binder_object_header *)(buffer-&gt;data + *offp);</div><div class='add'>+		switch (hdr-&gt;type) {</div><div class='ctx'> 		case BINDER_TYPE_BINDER:</div><div class='ctx'> 		case BINDER_TYPE_WEAK_BINDER: {</div><div class='del'>-			struct binder_node *node = binder_get_node(proc, fp-&gt;binder);</div><div class='add'>+			struct flat_binder_object *fp;</div><div class='add'>+			struct binder_node *node;</div><div class='ctx'> </div><div class='add'>+			fp = to_flat_binder_object(hdr);</div><div class='add'>+			node = binder_get_node(proc, fp-&gt;binder);</div><div class='ctx'> 			if (node == NULL) {</div><div class='ctx'> 				pr_err("transaction release %d bad node %016llx\n",</div><div class='ctx'> 				       debug_id, (u64)fp-&gt;binder);</div><div class='hunk'>@@ -1285,15 +1474,17 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,</div><div class='ctx'> 			binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='ctx'> 				     "        node %d u%016llx\n",</div><div class='ctx'> 				     node-&gt;debug_id, (u64)node-&gt;ptr);</div><div class='del'>-			binder_dec_node(node, fp-&gt;type == BINDER_TYPE_BINDER, 0);</div><div class='add'>+			binder_dec_node(node, hdr-&gt;type == BINDER_TYPE_BINDER,</div><div class='add'>+					0);</div><div class='ctx'> 		} break;</div><div class='ctx'> 		case BINDER_TYPE_HANDLE:</div><div class='ctx'> 		case BINDER_TYPE_WEAK_HANDLE: {</div><div class='add'>+			struct flat_binder_object *fp;</div><div class='ctx'> 			struct binder_ref *ref;</div><div class='ctx'> </div><div class='add'>+			fp = to_flat_binder_object(hdr);</div><div class='ctx'> 			ref = binder_get_ref(proc, fp-&gt;handle,</div><div class='del'>-					     fp-&gt;type == BINDER_TYPE_HANDLE);</div><div class='del'>-</div><div class='add'>+					     hdr-&gt;type == BINDER_TYPE_HANDLE);</div><div class='ctx'> 			if (ref == NULL) {</div><div class='ctx'> 				pr_err("transaction release %d bad handle %d\n",</div><div class='ctx'> 				 debug_id, fp-&gt;handle);</div><div class='hunk'>@@ -1302,32 +1493,348 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,</div><div class='ctx'> 			binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='ctx'> 				     "        ref %d desc %d (node %d)\n",</div><div class='ctx'> 				     ref-&gt;debug_id, ref-&gt;desc, ref-&gt;node-&gt;debug_id);</div><div class='del'>-			binder_dec_ref(ref, fp-&gt;type == BINDER_TYPE_HANDLE);</div><div class='add'>+			binder_dec_ref(ref, hdr-&gt;type == BINDER_TYPE_HANDLE);</div><div class='ctx'> 		} break;</div><div class='ctx'> </div><div class='del'>-		case BINDER_TYPE_FD:</div><div class='add'>+		case BINDER_TYPE_FD: {</div><div class='add'>+			struct binder_fd_object *fp = to_binder_fd_object(hdr);</div><div class='add'>+</div><div class='ctx'> 			binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='del'>-				     "        fd %d\n", fp-&gt;handle);</div><div class='add'>+				     "        fd %d\n", fp-&gt;fd);</div><div class='ctx'> 			if (failed_at)</div><div class='del'>-				task_close_fd(proc, fp-&gt;handle);</div><div class='add'>+				task_close_fd(proc, fp-&gt;fd);</div><div class='add'>+		} break;</div><div class='add'>+		case BINDER_TYPE_PTR:</div><div class='add'>+			/*</div><div class='add'>+			 * Nothing to do here, this will get cleaned up when the</div><div class='add'>+			 * transaction buffer gets freed</div><div class='add'>+			 */</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='add'>+		case BINDER_TYPE_FDA: {</div><div class='add'>+			struct binder_fd_array_object *fda;</div><div class='add'>+			struct binder_buffer_object *parent;</div><div class='add'>+			uintptr_t parent_buffer;</div><div class='add'>+			u32 *fd_array;</div><div class='add'>+			size_t fd_index;</div><div class='add'>+			binder_size_t fd_buf_size;</div><div class='add'>+</div><div class='add'>+			fda = to_binder_fd_array_object(hdr);</div><div class='add'>+			parent = binder_validate_ptr(buffer, fda-&gt;parent,</div><div class='add'>+						     off_start,</div><div class='add'>+						     offp - off_start);</div><div class='add'>+			if (!parent) {</div><div class='add'>+				pr_err("transaction release %d bad parent offset",</div><div class='add'>+				       debug_id);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			/*</div><div class='add'>+			 * Since the parent was already fixed up, convert it</div><div class='add'>+			 * back to kernel address space to access it</div><div class='add'>+			 */</div><div class='add'>+			parent_buffer = parent-&gt;buffer -</div><div class='add'>+				proc-&gt;user_buffer_offset;</div><div class='add'>+</div><div class='add'>+			fd_buf_size = sizeof(u32) * fda-&gt;num_fds;</div><div class='add'>+			if (fda-&gt;num_fds &gt;= SIZE_MAX / sizeof(u32)) {</div><div class='add'>+				pr_err("transaction release %d invalid number of fds (%lld)\n",</div><div class='add'>+				       debug_id, (u64)fda-&gt;num_fds);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			if (fd_buf_size &gt; parent-&gt;length ||</div><div class='add'>+			    fda-&gt;parent_offset &gt; parent-&gt;length - fd_buf_size) {</div><div class='add'>+				/* No space for all file descriptors here. */</div><div class='add'>+				pr_err("transaction release %d not enough space for %lld fds in buffer\n",</div><div class='add'>+				       debug_id, (u64)fda-&gt;num_fds);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			fd_array = (u32 *)(parent_buffer + fda-&gt;parent_offset);</div><div class='add'>+			for (fd_index = 0; fd_index &lt; fda-&gt;num_fds; fd_index++)</div><div class='add'>+				task_close_fd(proc, fd_array[fd_index]);</div><div class='add'>+		} break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			pr_err("transaction release %d bad object type %x\n",</div><div class='del'>-				debug_id, fp-&gt;type);</div><div class='add'>+				debug_id, hdr-&gt;type);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int binder_translate_binder(struct flat_binder_object *fp,</div><div class='add'>+				   struct binder_transaction *t,</div><div class='add'>+				   struct binder_thread *thread)</div><div class='add'>+{</div><div class='add'>+	struct binder_node *node;</div><div class='add'>+	struct binder_ref *ref;</div><div class='add'>+	struct binder_proc *proc = thread-&gt;proc;</div><div class='add'>+	struct binder_proc *target_proc = t-&gt;to_proc;</div><div class='add'>+</div><div class='add'>+	node = binder_get_node(proc, fp-&gt;binder);</div><div class='add'>+	if (!node) {</div><div class='add'>+		node = binder_new_node(proc, fp-&gt;binder, fp-&gt;cookie);</div><div class='add'>+		if (!node)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		node-&gt;min_priority = fp-&gt;flags &amp; FLAT_BINDER_FLAG_PRIORITY_MASK;</div><div class='add'>+		node-&gt;accept_fds = !!(fp-&gt;flags &amp; FLAT_BINDER_FLAG_ACCEPTS_FDS);</div><div class='add'>+	}</div><div class='add'>+	if (fp-&gt;cookie != node-&gt;cookie) {</div><div class='add'>+		binder_user_error("%d:%d sending u%016llx node %d, cookie mismatch %016llx != %016llx\n",</div><div class='add'>+				  proc-&gt;pid, thread-&gt;pid, (u64)fp-&gt;binder,</div><div class='add'>+				  node-&gt;debug_id, (u64)fp-&gt;cookie,</div><div class='add'>+				  (u64)node-&gt;cookie);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (security_binder_transfer_binder(proc-&gt;tsk, target_proc-&gt;tsk))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	ref = binder_get_ref_for_node(target_proc, node);</div><div class='add'>+	if (!ref)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (fp-&gt;hdr.type == BINDER_TYPE_BINDER)</div><div class='add'>+		fp-&gt;hdr.type = BINDER_TYPE_HANDLE;</div><div class='add'>+	else</div><div class='add'>+		fp-&gt;hdr.type = BINDER_TYPE_WEAK_HANDLE;</div><div class='add'>+	fp-&gt;binder = 0;</div><div class='add'>+	fp-&gt;handle = ref-&gt;desc;</div><div class='add'>+	fp-&gt;cookie = 0;</div><div class='add'>+	binder_inc_ref(ref, fp-&gt;hdr.type == BINDER_TYPE_HANDLE, &amp;thread-&gt;todo);</div><div class='add'>+</div><div class='add'>+	trace_binder_transaction_node_to_ref(t, node, ref);</div><div class='add'>+	binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+		     "        node %d u%016llx -&gt; ref %d desc %d\n",</div><div class='add'>+		     node-&gt;debug_id, (u64)node-&gt;ptr,</div><div class='add'>+		     ref-&gt;debug_id, ref-&gt;desc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_translate_handle(struct flat_binder_object *fp,</div><div class='add'>+				   struct binder_transaction *t,</div><div class='add'>+				   struct binder_thread *thread)</div><div class='add'>+{</div><div class='add'>+	struct binder_ref *ref;</div><div class='add'>+	struct binder_proc *proc = thread-&gt;proc;</div><div class='add'>+	struct binder_proc *target_proc = t-&gt;to_proc;</div><div class='add'>+</div><div class='add'>+	ref = binder_get_ref(proc, fp-&gt;handle,</div><div class='add'>+			     fp-&gt;hdr.type == BINDER_TYPE_HANDLE);</div><div class='add'>+	if (!ref) {</div><div class='add'>+		binder_user_error("%d:%d got transaction with invalid handle, %d\n",</div><div class='add'>+				  proc-&gt;pid, thread-&gt;pid, fp-&gt;handle);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (security_binder_transfer_binder(proc-&gt;tsk, target_proc-&gt;tsk))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (ref-&gt;node-&gt;proc == target_proc) {</div><div class='add'>+		if (fp-&gt;hdr.type == BINDER_TYPE_HANDLE)</div><div class='add'>+			fp-&gt;hdr.type = BINDER_TYPE_BINDER;</div><div class='add'>+		else</div><div class='add'>+			fp-&gt;hdr.type = BINDER_TYPE_WEAK_BINDER;</div><div class='add'>+		fp-&gt;binder = ref-&gt;node-&gt;ptr;</div><div class='add'>+		fp-&gt;cookie = ref-&gt;node-&gt;cookie;</div><div class='add'>+		binder_inc_node(ref-&gt;node, fp-&gt;hdr.type == BINDER_TYPE_BINDER,</div><div class='add'>+				0, NULL);</div><div class='add'>+		trace_binder_transaction_ref_to_node(t, ref);</div><div class='add'>+		binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+			     "        ref %d desc %d -&gt; node %d u%016llx\n",</div><div class='add'>+			     ref-&gt;debug_id, ref-&gt;desc, ref-&gt;node-&gt;debug_id,</div><div class='add'>+			     (u64)ref-&gt;node-&gt;ptr);</div><div class='add'>+	} else {</div><div class='add'>+		struct binder_ref *new_ref;</div><div class='add'>+</div><div class='add'>+		new_ref = binder_get_ref_for_node(target_proc, ref-&gt;node);</div><div class='add'>+		if (!new_ref)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		fp-&gt;binder = 0;</div><div class='add'>+		fp-&gt;handle = new_ref-&gt;desc;</div><div class='add'>+		fp-&gt;cookie = 0;</div><div class='add'>+		binder_inc_ref(new_ref, fp-&gt;hdr.type == BINDER_TYPE_HANDLE,</div><div class='add'>+			       NULL);</div><div class='add'>+		trace_binder_transaction_ref_to_ref(t, ref, new_ref);</div><div class='add'>+		binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+			     "        ref %d desc %d -&gt; ref %d desc %d (node %d)\n",</div><div class='add'>+			     ref-&gt;debug_id, ref-&gt;desc, new_ref-&gt;debug_id,</div><div class='add'>+			     new_ref-&gt;desc, ref-&gt;node-&gt;debug_id);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_translate_fd(int fd,</div><div class='add'>+			       struct binder_transaction *t,</div><div class='add'>+			       struct binder_thread *thread,</div><div class='add'>+			       struct binder_transaction *in_reply_to)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc = thread-&gt;proc;</div><div class='add'>+	struct binder_proc *target_proc = t-&gt;to_proc;</div><div class='add'>+	int target_fd;</div><div class='add'>+	struct file *file;</div><div class='add'>+	int ret;</div><div class='add'>+	bool target_allows_fd;</div><div class='add'>+</div><div class='add'>+	if (in_reply_to)</div><div class='add'>+		target_allows_fd = !!(in_reply_to-&gt;flags &amp; TF_ACCEPT_FDS);</div><div class='add'>+	else</div><div class='add'>+		target_allows_fd = t-&gt;buffer-&gt;target_node-&gt;accept_fds;</div><div class='add'>+	if (!target_allows_fd) {</div><div class='add'>+		binder_user_error("%d:%d got %s with fd, %d, but target does not allow fds\n",</div><div class='add'>+				  proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+				  in_reply_to ? "reply" : "transaction",</div><div class='add'>+				  fd);</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		goto err_fd_not_accepted;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	file = fget(fd);</div><div class='add'>+	if (!file) {</div><div class='add'>+		binder_user_error("%d:%d got transaction with invalid fd, %d\n",</div><div class='add'>+				  proc-&gt;pid, thread-&gt;pid, fd);</div><div class='add'>+		ret = -EBADF;</div><div class='add'>+		goto err_fget;</div><div class='add'>+	}</div><div class='add'>+	ret = security_binder_transfer_file(proc-&gt;tsk, target_proc-&gt;tsk, file);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		goto err_security;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	target_fd = task_get_unused_fd_flags(target_proc, O_CLOEXEC);</div><div class='add'>+	if (target_fd &lt; 0) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_get_unused_fd;</div><div class='add'>+	}</div><div class='add'>+	task_fd_install(target_proc, target_fd, file);</div><div class='add'>+	trace_binder_transaction_fd(t, fd, target_fd);</div><div class='add'>+	binder_debug(BINDER_DEBUG_TRANSACTION, "        fd %d -&gt; %d\n",</div><div class='add'>+		     fd, target_fd);</div><div class='add'>+</div><div class='add'>+	return target_fd;</div><div class='add'>+</div><div class='add'>+err_get_unused_fd:</div><div class='add'>+err_security:</div><div class='add'>+	fput(file);</div><div class='add'>+err_fget:</div><div class='add'>+err_fd_not_accepted:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_translate_fd_array(struct binder_fd_array_object *fda,</div><div class='add'>+				     struct binder_buffer_object *parent,</div><div class='add'>+				     struct binder_transaction *t,</div><div class='add'>+				     struct binder_thread *thread,</div><div class='add'>+				     struct binder_transaction *in_reply_to)</div><div class='add'>+{</div><div class='add'>+	binder_size_t fdi, fd_buf_size, num_installed_fds;</div><div class='add'>+	int target_fd;</div><div class='add'>+	uintptr_t parent_buffer;</div><div class='add'>+	u32 *fd_array;</div><div class='add'>+	struct binder_proc *proc = thread-&gt;proc;</div><div class='add'>+	struct binder_proc *target_proc = t-&gt;to_proc;</div><div class='add'>+</div><div class='add'>+	fd_buf_size = sizeof(u32) * fda-&gt;num_fds;</div><div class='add'>+	if (fda-&gt;num_fds &gt;= SIZE_MAX / sizeof(u32)) {</div><div class='add'>+		binder_user_error("%d:%d got transaction with invalid number of fds (%lld)\n",</div><div class='add'>+				  proc-&gt;pid, thread-&gt;pid, (u64)fda-&gt;num_fds);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (fd_buf_size &gt; parent-&gt;length ||</div><div class='add'>+	    fda-&gt;parent_offset &gt; parent-&gt;length - fd_buf_size) {</div><div class='add'>+		/* No space for all file descriptors here. */</div><div class='add'>+		binder_user_error("%d:%d not enough space to store %lld fds in buffer\n",</div><div class='add'>+				  proc-&gt;pid, thread-&gt;pid, (u64)fda-&gt;num_fds);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Since the parent was already fixed up, convert it</div><div class='add'>+	 * back to the kernel address space to access it</div><div class='add'>+	 */</div><div class='add'>+	parent_buffer = parent-&gt;buffer - target_proc-&gt;user_buffer_offset;</div><div class='add'>+	fd_array = (u32 *)(parent_buffer + fda-&gt;parent_offset);</div><div class='add'>+	if (!IS_ALIGNED((unsigned long)fd_array, sizeof(u32))) {</div><div class='add'>+		binder_user_error("%d:%d parent offset not aligned correctly.\n",</div><div class='add'>+				  proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	for (fdi = 0; fdi &lt; fda-&gt;num_fds; fdi++) {</div><div class='add'>+		target_fd = binder_translate_fd(fd_array[fdi], t, thread,</div><div class='add'>+						in_reply_to);</div><div class='add'>+		if (target_fd &lt; 0)</div><div class='add'>+			goto err_translate_fd_failed;</div><div class='add'>+		fd_array[fdi] = target_fd;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_translate_fd_failed:</div><div class='add'>+	/*</div><div class='add'>+	 * Failed to allocate fd or security error, free fds</div><div class='add'>+	 * installed so far.</div><div class='add'>+	 */</div><div class='add'>+	num_installed_fds = fdi;</div><div class='add'>+	for (fdi = 0; fdi &lt; num_installed_fds; fdi++)</div><div class='add'>+		task_close_fd(target_proc, fd_array[fdi]);</div><div class='add'>+	return target_fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_fixup_parent(struct binder_transaction *t,</div><div class='add'>+			       struct binder_thread *thread,</div><div class='add'>+			       struct binder_buffer_object *bp,</div><div class='add'>+			       binder_size_t *off_start,</div><div class='add'>+			       binder_size_t num_valid,</div><div class='add'>+			       struct binder_buffer_object *last_fixup_obj,</div><div class='add'>+			       binder_size_t last_fixup_min_off)</div><div class='add'>+{</div><div class='add'>+	struct binder_buffer_object *parent;</div><div class='add'>+	u8 *parent_buffer;</div><div class='add'>+	struct binder_buffer *b = t-&gt;buffer;</div><div class='add'>+	struct binder_proc *proc = thread-&gt;proc;</div><div class='add'>+	struct binder_proc *target_proc = t-&gt;to_proc;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;flags &amp; BINDER_BUFFER_FLAG_HAS_PARENT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	parent = binder_validate_ptr(b, bp-&gt;parent, off_start, num_valid);</div><div class='add'>+	if (!parent) {</div><div class='add'>+		binder_user_error("%d:%d got transaction with invalid parent offset or type\n",</div><div class='add'>+				  proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!binder_validate_fixup(b, off_start,</div><div class='add'>+				   parent, bp-&gt;parent_offset,</div><div class='add'>+				   last_fixup_obj,</div><div class='add'>+				   last_fixup_min_off)) {</div><div class='add'>+		binder_user_error("%d:%d got transaction with out-of-order buffer fixup\n",</div><div class='add'>+				  proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (parent-&gt;length &lt; sizeof(binder_uintptr_t) ||</div><div class='add'>+	    bp-&gt;parent_offset &gt; parent-&gt;length - sizeof(binder_uintptr_t)) {</div><div class='add'>+		/* No space for a pointer here! */</div><div class='add'>+		binder_user_error("%d:%d got transaction with invalid parent offset\n",</div><div class='add'>+				  proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	parent_buffer = (u8 *)(parent-&gt;buffer -</div><div class='add'>+			       target_proc-&gt;user_buffer_offset);</div><div class='add'>+	*(binder_uintptr_t *)(parent_buffer + bp-&gt;parent_offset) = bp-&gt;buffer;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void binder_transaction(struct binder_proc *proc,</div><div class='ctx'> 			       struct binder_thread *thread,</div><div class='del'>-			       struct binder_transaction_data *tr, int reply)</div><div class='add'>+			       struct binder_transaction_data *tr, int reply,</div><div class='add'>+			       binder_size_t extra_buffers_size)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct binder_transaction *t;</div><div class='ctx'> 	struct binder_work *tcomplete;</div><div class='del'>-	binder_size_t *offp, *off_end;</div><div class='add'>+	binder_size_t *offp, *off_end, *off_start;</div><div class='ctx'> 	binder_size_t off_min;</div><div class='add'>+	u8 *sg_bufp, *sg_buf_end;</div><div class='ctx'> 	struct binder_proc *target_proc;</div><div class='ctx'> 	struct binder_thread *target_thread = NULL;</div><div class='ctx'> 	struct binder_node *target_node = NULL;</div><div class='hunk'>@@ -1336,6 +1843,9 @@ static void binder_transaction(struct binder_proc *proc,</div><div class='ctx'> 	struct binder_transaction *in_reply_to = NULL;</div><div class='ctx'> 	struct binder_transaction_log_entry *e;</div><div class='ctx'> 	uint32_t return_error;</div><div class='add'>+	struct binder_buffer_object *last_fixup_obj = NULL;</div><div class='add'>+	binder_size_t last_fixup_min_off = 0;</div><div class='add'>+	struct binder_context *context = proc-&gt;context;</div><div class='ctx'> </div><div class='ctx'> 	e = binder_transaction_log_add(&amp;binder_transaction_log);</div><div class='ctx'> 	e-&gt;call_type = reply ? 2 : !!(tr-&gt;flags &amp; TF_ONE_WAY);</div><div class='hunk'>@@ -1344,6 +1854,7 @@ static void binder_transaction(struct binder_proc *proc,</div><div class='ctx'> 	e-&gt;target_handle = tr-&gt;target.handle;</div><div class='ctx'> 	e-&gt;data_size = tr-&gt;data_size;</div><div class='ctx'> 	e-&gt;offsets_size = tr-&gt;offsets_size;</div><div class='add'>+	e-&gt;context_name = proc-&gt;context-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	if (reply) {</div><div class='ctx'> 		in_reply_to = thread-&gt;transaction_stack;</div><div class='hunk'>@@ -1396,7 +1907,7 @@ static void binder_transaction(struct binder_proc *proc,</div><div class='ctx'> 			}</div><div class='ctx'> 			target_node = ref-&gt;node;</div><div class='ctx'> 		} else {</div><div class='del'>-			target_node = binder_context_mgr_node;</div><div class='add'>+			target_node = context-&gt;binder_context_mgr_node;</div><div class='ctx'> 			if (target_node == NULL) {</div><div class='ctx'> 				return_error = BR_DEAD_REPLY;</div><div class='ctx'> 				goto err_no_context_mgr_node;</div><div class='hunk'>@@ -1463,20 +1974,22 @@ static void binder_transaction(struct binder_proc *proc,</div><div class='ctx'> </div><div class='ctx'> 	if (reply)</div><div class='ctx'> 		binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='del'>-			     "%d:%d BC_REPLY %d -&gt; %d:%d, data %016llx-%016llx size %lld-%lld\n",</div><div class='add'>+			     "%d:%d BC_REPLY %d -&gt; %d:%d, data %016llx-%016llx size %lld-%lld-%lld\n",</div><div class='ctx'> 			     proc-&gt;pid, thread-&gt;pid, t-&gt;debug_id,</div><div class='ctx'> 			     target_proc-&gt;pid, target_thread-&gt;pid,</div><div class='ctx'> 			     (u64)tr-&gt;data.ptr.buffer,</div><div class='ctx'> 			     (u64)tr-&gt;data.ptr.offsets,</div><div class='del'>-			     (u64)tr-&gt;data_size, (u64)tr-&gt;offsets_size);</div><div class='add'>+			     (u64)tr-&gt;data_size, (u64)tr-&gt;offsets_size,</div><div class='add'>+			     (u64)extra_buffers_size);</div><div class='ctx'> 	else</div><div class='ctx'> 		binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='del'>-			     "%d:%d BC_TRANSACTION %d -&gt; %d - node %d, data %016llx-%016llx size %lld-%lld\n",</div><div class='add'>+			     "%d:%d BC_TRANSACTION %d -&gt; %d - node %d, data %016llx-%016llx size %lld-%lld-%lld\n",</div><div class='ctx'> 			     proc-&gt;pid, thread-&gt;pid, t-&gt;debug_id,</div><div class='ctx'> 			     target_proc-&gt;pid, target_node-&gt;debug_id,</div><div class='ctx'> 			     (u64)tr-&gt;data.ptr.buffer,</div><div class='ctx'> 			     (u64)tr-&gt;data.ptr.offsets,</div><div class='del'>-			     (u64)tr-&gt;data_size, (u64)tr-&gt;offsets_size);</div><div class='add'>+			     (u64)tr-&gt;data_size, (u64)tr-&gt;offsets_size,</div><div class='add'>+			     (u64)extra_buffers_size);</div><div class='ctx'> </div><div class='ctx'> 	if (!reply &amp;&amp; !(tr-&gt;flags &amp; TF_ONE_WAY))</div><div class='ctx'> 		t-&gt;from = thread;</div><div class='hunk'>@@ -1492,7 +2005,8 @@ static void binder_transaction(struct binder_proc *proc,</div><div class='ctx'> 	trace_binder_transaction(reply, t, target_node);</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;buffer = binder_alloc_buf(target_proc, tr-&gt;data_size,</div><div class='del'>-		tr-&gt;offsets_size, !reply &amp;&amp; (t-&gt;flags &amp; TF_ONE_WAY));</div><div class='add'>+		tr-&gt;offsets_size, extra_buffers_size,</div><div class='add'>+		!reply &amp;&amp; (t-&gt;flags &amp; TF_ONE_WAY));</div><div class='ctx'> 	if (t-&gt;buffer == NULL) {</div><div class='ctx'> 		return_error = BR_FAILED_REPLY;</div><div class='ctx'> 		goto err_binder_alloc_buf_failed;</div><div class='hunk'>@@ -1505,8 +2019,9 @@ static void binder_transaction(struct binder_proc *proc,</div><div class='ctx'> 	if (target_node)</div><div class='ctx'> 		binder_inc_node(target_node, 1, 0, NULL);</div><div class='ctx'> </div><div class='del'>-	offp = (binder_size_t *)(t-&gt;buffer-&gt;data +</div><div class='del'>-				 ALIGN(tr-&gt;data_size, sizeof(void *)));</div><div class='add'>+	off_start = (binder_size_t *)(t-&gt;buffer-&gt;data +</div><div class='add'>+				      ALIGN(tr-&gt;data_size, sizeof(void *)));</div><div class='add'>+	offp = off_start;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(t-&gt;buffer-&gt;data, (const void __user *)(uintptr_t)</div><div class='ctx'> 			   tr-&gt;data.ptr.buffer, tr-&gt;data_size)) {</div><div class='hunk'>@@ -1528,177 +2043,138 @@ static void binder_transaction(struct binder_proc *proc,</div><div class='ctx'> 		return_error = BR_FAILED_REPLY;</div><div class='ctx'> 		goto err_bad_offset;</div><div class='ctx'> 	}</div><div class='del'>-	off_end = (void *)offp + tr-&gt;offsets_size;</div><div class='add'>+	if (!IS_ALIGNED(extra_buffers_size, sizeof(u64))) {</div><div class='add'>+		binder_user_error("%d:%d got transaction with unaligned buffers size, %lld\n",</div><div class='add'>+				  proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+				  (u64)extra_buffers_size);</div><div class='add'>+		return_error = BR_FAILED_REPLY;</div><div class='add'>+		goto err_bad_offset;</div><div class='add'>+	}</div><div class='add'>+	off_end = (void *)off_start + tr-&gt;offsets_size;</div><div class='add'>+	sg_bufp = (u8 *)(PTR_ALIGN(off_end, sizeof(void *)));</div><div class='add'>+	sg_buf_end = sg_bufp + extra_buffers_size;</div><div class='ctx'> 	off_min = 0;</div><div class='ctx'> 	for (; offp &lt; off_end; offp++) {</div><div class='del'>-		struct flat_binder_object *fp;</div><div class='add'>+		struct binder_object_header *hdr;</div><div class='add'>+		size_t object_size = binder_validate_object(t-&gt;buffer, *offp);</div><div class='ctx'> </div><div class='del'>-		if (*offp &gt; t-&gt;buffer-&gt;data_size - sizeof(*fp) ||</div><div class='del'>-		    *offp &lt; off_min ||</div><div class='del'>-		    t-&gt;buffer-&gt;data_size &lt; sizeof(*fp) ||</div><div class='del'>-		    !IS_ALIGNED(*offp, sizeof(u32))) {</div><div class='del'>-			binder_user_error("%d:%d got transaction with invalid offset, %lld (min %lld, max %lld)\n",</div><div class='add'>+		if (object_size == 0 || *offp &lt; off_min) {</div><div class='add'>+			binder_user_error("%d:%d got transaction with invalid offset (%lld, min %lld max %lld) or object.\n",</div><div class='ctx'> 					  proc-&gt;pid, thread-&gt;pid, (u64)*offp,</div><div class='ctx'> 					  (u64)off_min,</div><div class='del'>-					  (u64)(t-&gt;buffer-&gt;data_size -</div><div class='del'>-					  sizeof(*fp)));</div><div class='add'>+					  (u64)t-&gt;buffer-&gt;data_size);</div><div class='ctx'> 			return_error = BR_FAILED_REPLY;</div><div class='ctx'> 			goto err_bad_offset;</div><div class='ctx'> 		}</div><div class='del'>-		fp = (struct flat_binder_object *)(t-&gt;buffer-&gt;data + *offp);</div><div class='del'>-		off_min = *offp + sizeof(struct flat_binder_object);</div><div class='del'>-		switch (fp-&gt;type) {</div><div class='add'>+</div><div class='add'>+		hdr = (struct binder_object_header *)(t-&gt;buffer-&gt;data + *offp);</div><div class='add'>+		off_min = *offp + object_size;</div><div class='add'>+		switch (hdr-&gt;type) {</div><div class='ctx'> 		case BINDER_TYPE_BINDER:</div><div class='ctx'> 		case BINDER_TYPE_WEAK_BINDER: {</div><div class='del'>-			struct binder_ref *ref;</div><div class='del'>-			struct binder_node *node = binder_get_node(proc, fp-&gt;binder);</div><div class='add'>+			struct flat_binder_object *fp;</div><div class='ctx'> </div><div class='del'>-			if (node == NULL) {</div><div class='del'>-				node = binder_new_node(proc, fp-&gt;binder, fp-&gt;cookie);</div><div class='del'>-				if (node == NULL) {</div><div class='del'>-					return_error = BR_FAILED_REPLY;</div><div class='del'>-					goto err_binder_new_node_failed;</div><div class='del'>-				}</div><div class='del'>-				node-&gt;min_priority = fp-&gt;flags &amp; FLAT_BINDER_FLAG_PRIORITY_MASK;</div><div class='del'>-				node-&gt;accept_fds = !!(fp-&gt;flags &amp; FLAT_BINDER_FLAG_ACCEPTS_FDS);</div><div class='del'>-			}</div><div class='del'>-			if (fp-&gt;cookie != node-&gt;cookie) {</div><div class='del'>-				binder_user_error("%d:%d sending u%016llx node %d, cookie mismatch %016llx != %016llx\n",</div><div class='del'>-					proc-&gt;pid, thread-&gt;pid,</div><div class='del'>-					(u64)fp-&gt;binder, node-&gt;debug_id,</div><div class='del'>-					(u64)fp-&gt;cookie, (u64)node-&gt;cookie);</div><div class='del'>-				return_error = BR_FAILED_REPLY;</div><div class='del'>-				goto err_binder_get_ref_for_node_failed;</div><div class='del'>-			}</div><div class='del'>-			if (security_binder_transfer_binder(proc-&gt;tsk,</div><div class='del'>-							    target_proc-&gt;tsk)) {</div><div class='add'>+			fp = to_flat_binder_object(hdr);</div><div class='add'>+			ret = binder_translate_binder(fp, t, thread);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='ctx'> 				return_error = BR_FAILED_REPLY;</div><div class='del'>-				goto err_binder_get_ref_for_node_failed;</div><div class='add'>+				goto err_translate_failed;</div><div class='ctx'> 			}</div><div class='del'>-			ref = binder_get_ref_for_node(target_proc, node);</div><div class='del'>-			if (ref == NULL) {</div><div class='del'>-				return_error = BR_FAILED_REPLY;</div><div class='del'>-				goto err_binder_get_ref_for_node_failed;</div><div class='del'>-			}</div><div class='del'>-			if (fp-&gt;type == BINDER_TYPE_BINDER)</div><div class='del'>-				fp-&gt;type = BINDER_TYPE_HANDLE;</div><div class='del'>-			else</div><div class='del'>-				fp-&gt;type = BINDER_TYPE_WEAK_HANDLE;</div><div class='del'>-			fp-&gt;binder = 0;</div><div class='del'>-			fp-&gt;handle = ref-&gt;desc;</div><div class='del'>-			fp-&gt;cookie = 0;</div><div class='del'>-			binder_inc_ref(ref, fp-&gt;type == BINDER_TYPE_HANDLE,</div><div class='del'>-				       &amp;thread-&gt;todo);</div><div class='del'>-</div><div class='del'>-			trace_binder_transaction_node_to_ref(t, node, ref);</div><div class='del'>-			binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='del'>-				     "        node %d u%016llx -&gt; ref %d desc %d\n",</div><div class='del'>-				     node-&gt;debug_id, (u64)node-&gt;ptr,</div><div class='del'>-				     ref-&gt;debug_id, ref-&gt;desc);</div><div class='ctx'> 		} break;</div><div class='ctx'> 		case BINDER_TYPE_HANDLE:</div><div class='ctx'> 		case BINDER_TYPE_WEAK_HANDLE: {</div><div class='del'>-			struct binder_ref *ref;</div><div class='add'>+			struct flat_binder_object *fp;</div><div class='ctx'> </div><div class='del'>-			ref = binder_get_ref(proc, fp-&gt;handle,</div><div class='del'>-					     fp-&gt;type == BINDER_TYPE_HANDLE);</div><div class='add'>+			fp = to_flat_binder_object(hdr);</div><div class='add'>+			ret = binder_translate_handle(fp, t, thread);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				return_error = BR_FAILED_REPLY;</div><div class='add'>+				goto err_translate_failed;</div><div class='add'>+			}</div><div class='add'>+		} break;</div><div class='ctx'> </div><div class='del'>-			if (ref == NULL) {</div><div class='del'>-				binder_user_error("%d:%d got transaction with invalid handle, %d\n",</div><div class='del'>-						proc-&gt;pid,</div><div class='del'>-						thread-&gt;pid, fp-&gt;handle);</div><div class='add'>+		case BINDER_TYPE_FD: {</div><div class='add'>+			struct binder_fd_object *fp = to_binder_fd_object(hdr);</div><div class='add'>+			int target_fd = binder_translate_fd(fp-&gt;fd, t, thread,</div><div class='add'>+							    in_reply_to);</div><div class='add'>+</div><div class='add'>+			if (target_fd &lt; 0) {</div><div class='ctx'> 				return_error = BR_FAILED_REPLY;</div><div class='del'>-				goto err_binder_get_ref_failed;</div><div class='add'>+				goto err_translate_failed;</div><div class='ctx'> 			}</div><div class='del'>-			if (security_binder_transfer_binder(proc-&gt;tsk,</div><div class='del'>-							    target_proc-&gt;tsk)) {</div><div class='add'>+			fp-&gt;pad_binder = 0;</div><div class='add'>+			fp-&gt;fd = target_fd;</div><div class='add'>+		} break;</div><div class='add'>+		case BINDER_TYPE_FDA: {</div><div class='add'>+			struct binder_fd_array_object *fda =</div><div class='add'>+				to_binder_fd_array_object(hdr);</div><div class='add'>+			struct binder_buffer_object *parent =</div><div class='add'>+				binder_validate_ptr(t-&gt;buffer, fda-&gt;parent,</div><div class='add'>+						    off_start,</div><div class='add'>+						    offp - off_start);</div><div class='add'>+			if (!parent) {</div><div class='add'>+				binder_user_error("%d:%d got transaction with invalid parent offset or type\n",</div><div class='add'>+						  proc-&gt;pid, thread-&gt;pid);</div><div class='ctx'> 				return_error = BR_FAILED_REPLY;</div><div class='del'>-				goto err_binder_get_ref_failed;</div><div class='add'>+				goto err_bad_parent;</div><div class='ctx'> 			}</div><div class='del'>-			if (ref-&gt;node-&gt;proc == target_proc) {</div><div class='del'>-				if (fp-&gt;type == BINDER_TYPE_HANDLE)</div><div class='del'>-					fp-&gt;type = BINDER_TYPE_BINDER;</div><div class='del'>-				else</div><div class='del'>-					fp-&gt;type = BINDER_TYPE_WEAK_BINDER;</div><div class='del'>-				fp-&gt;binder = ref-&gt;node-&gt;ptr;</div><div class='del'>-				fp-&gt;cookie = ref-&gt;node-&gt;cookie;</div><div class='del'>-				binder_inc_node(ref-&gt;node, fp-&gt;type == BINDER_TYPE_BINDER, 0, NULL);</div><div class='del'>-				trace_binder_transaction_ref_to_node(t, ref);</div><div class='del'>-				binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='del'>-					     "        ref %d desc %d -&gt; node %d u%016llx\n",</div><div class='del'>-					     ref-&gt;debug_id, ref-&gt;desc, ref-&gt;node-&gt;debug_id,</div><div class='del'>-					     (u64)ref-&gt;node-&gt;ptr);</div><div class='del'>-			} else {</div><div class='del'>-				struct binder_ref *new_ref;</div><div class='del'>-</div><div class='del'>-				new_ref = binder_get_ref_for_node(target_proc, ref-&gt;node);</div><div class='del'>-				if (new_ref == NULL) {</div><div class='del'>-					return_error = BR_FAILED_REPLY;</div><div class='del'>-					goto err_binder_get_ref_for_node_failed;</div><div class='del'>-				}</div><div class='del'>-				fp-&gt;binder = 0;</div><div class='del'>-				fp-&gt;handle = new_ref-&gt;desc;</div><div class='del'>-				fp-&gt;cookie = 0;</div><div class='del'>-				binder_inc_ref(new_ref, fp-&gt;type == BINDER_TYPE_HANDLE, NULL);</div><div class='del'>-				trace_binder_transaction_ref_to_ref(t, ref,</div><div class='del'>-								    new_ref);</div><div class='del'>-				binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='del'>-					     "        ref %d desc %d -&gt; ref %d desc %d (node %d)\n",</div><div class='del'>-					     ref-&gt;debug_id, ref-&gt;desc, new_ref-&gt;debug_id,</div><div class='del'>-					     new_ref-&gt;desc, ref-&gt;node-&gt;debug_id);</div><div class='add'>+			if (!binder_validate_fixup(t-&gt;buffer, off_start,</div><div class='add'>+						   parent, fda-&gt;parent_offset,</div><div class='add'>+						   last_fixup_obj,</div><div class='add'>+						   last_fixup_min_off)) {</div><div class='add'>+				binder_user_error("%d:%d got transaction with out-of-order buffer fixup\n",</div><div class='add'>+						  proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+				return_error = BR_FAILED_REPLY;</div><div class='add'>+				goto err_bad_parent;</div><div class='ctx'> 			}</div><div class='del'>-		} break;</div><div class='del'>-</div><div class='del'>-		case BINDER_TYPE_FD: {</div><div class='del'>-			int target_fd;</div><div class='del'>-			struct file *file;</div><div class='del'>-</div><div class='del'>-			if (reply) {</div><div class='del'>-				if (!(in_reply_to-&gt;flags &amp; TF_ACCEPT_FDS)) {</div><div class='del'>-					binder_user_error("%d:%d got reply with fd, %d, but target does not allow fds\n",</div><div class='del'>-						proc-&gt;pid, thread-&gt;pid, fp-&gt;handle);</div><div class='del'>-					return_error = BR_FAILED_REPLY;</div><div class='del'>-					goto err_fd_not_allowed;</div><div class='del'>-				}</div><div class='del'>-			} else if (!target_node-&gt;accept_fds) {</div><div class='del'>-				binder_user_error("%d:%d got transaction with fd, %d, but target does not allow fds\n",</div><div class='del'>-					proc-&gt;pid, thread-&gt;pid, fp-&gt;handle);</div><div class='add'>+			ret = binder_translate_fd_array(fda, parent, t, thread,</div><div class='add'>+							in_reply_to);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='ctx'> 				return_error = BR_FAILED_REPLY;</div><div class='del'>-				goto err_fd_not_allowed;</div><div class='add'>+				goto err_translate_failed;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			file = fget(fp-&gt;handle);</div><div class='del'>-			if (file == NULL) {</div><div class='del'>-				binder_user_error("%d:%d got transaction with invalid fd, %d\n",</div><div class='del'>-					proc-&gt;pid, thread-&gt;pid, fp-&gt;handle);</div><div class='add'>+			last_fixup_obj = parent;</div><div class='add'>+			last_fixup_min_off =</div><div class='add'>+				fda-&gt;parent_offset + sizeof(u32) * fda-&gt;num_fds;</div><div class='add'>+		} break;</div><div class='add'>+		case BINDER_TYPE_PTR: {</div><div class='add'>+			struct binder_buffer_object *bp =</div><div class='add'>+				to_binder_buffer_object(hdr);</div><div class='add'>+			size_t buf_left = sg_buf_end - sg_bufp;</div><div class='add'>+</div><div class='add'>+			if (bp-&gt;length &gt; buf_left) {</div><div class='add'>+				binder_user_error("%d:%d got transaction with too large buffer\n",</div><div class='add'>+						  proc-&gt;pid, thread-&gt;pid);</div><div class='ctx'> 				return_error = BR_FAILED_REPLY;</div><div class='del'>-				goto err_fget_failed;</div><div class='add'>+				goto err_bad_offset;</div><div class='ctx'> 			}</div><div class='del'>-			if (security_binder_transfer_file(proc-&gt;tsk,</div><div class='del'>-							  target_proc-&gt;tsk,</div><div class='del'>-							  file) &lt; 0) {</div><div class='del'>-				fput(file);</div><div class='add'>+			if (copy_from_user(sg_bufp,</div><div class='add'>+					   (const void __user *)(uintptr_t)</div><div class='add'>+					   bp-&gt;buffer, bp-&gt;length)) {</div><div class='add'>+				binder_user_error("%d:%d got transaction with invalid offsets ptr\n",</div><div class='add'>+						  proc-&gt;pid, thread-&gt;pid);</div><div class='ctx'> 				return_error = BR_FAILED_REPLY;</div><div class='del'>-				goto err_get_unused_fd_failed;</div><div class='add'>+				goto err_copy_data_failed;</div><div class='ctx'> 			}</div><div class='del'>-			target_fd = task_get_unused_fd_flags(target_proc, O_CLOEXEC);</div><div class='del'>-			if (target_fd &lt; 0) {</div><div class='del'>-				fput(file);</div><div class='add'>+			/* Fixup buffer pointer to target proc address space */</div><div class='add'>+			bp-&gt;buffer = (uintptr_t)sg_bufp +</div><div class='add'>+				target_proc-&gt;user_buffer_offset;</div><div class='add'>+			sg_bufp += ALIGN(bp-&gt;length, sizeof(u64));</div><div class='add'>+</div><div class='add'>+			ret = binder_fixup_parent(t, thread, bp, off_start,</div><div class='add'>+						  offp - off_start,</div><div class='add'>+						  last_fixup_obj,</div><div class='add'>+						  last_fixup_min_off);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='ctx'> 				return_error = BR_FAILED_REPLY;</div><div class='del'>-				goto err_get_unused_fd_failed;</div><div class='add'>+				goto err_translate_failed;</div><div class='ctx'> 			}</div><div class='del'>-			task_fd_install(target_proc, target_fd, file);</div><div class='del'>-			trace_binder_transaction_fd(t, fp-&gt;handle, target_fd);</div><div class='del'>-			binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='del'>-				     "        fd %d -&gt; %d\n", fp-&gt;handle, target_fd);</div><div class='del'>-			/* TODO: fput? */</div><div class='del'>-			fp-&gt;binder = 0;</div><div class='del'>-			fp-&gt;handle = target_fd;</div><div class='add'>+			last_fixup_obj = bp;</div><div class='add'>+			last_fixup_min_off = 0;</div><div class='ctx'> 		} break;</div><div class='del'>-</div><div class='ctx'> 		default:</div><div class='ctx'> 			binder_user_error("%d:%d got transaction with invalid object type, %x\n",</div><div class='del'>-				proc-&gt;pid, thread-&gt;pid, fp-&gt;type);</div><div class='add'>+				proc-&gt;pid, thread-&gt;pid, hdr-&gt;type);</div><div class='ctx'> 			return_error = BR_FAILED_REPLY;</div><div class='ctx'> 			goto err_bad_object_type;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1728,14 +2204,10 @@ static void binder_transaction(struct binder_proc *proc,</div><div class='ctx'> 		wake_up_interruptible(target_wait);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='del'>-err_get_unused_fd_failed:</div><div class='del'>-err_fget_failed:</div><div class='del'>-err_fd_not_allowed:</div><div class='del'>-err_binder_get_ref_for_node_failed:</div><div class='del'>-err_binder_get_ref_failed:</div><div class='del'>-err_binder_new_node_failed:</div><div class='add'>+err_translate_failed:</div><div class='ctx'> err_bad_object_type:</div><div class='ctx'> err_bad_offset:</div><div class='add'>+err_bad_parent:</div><div class='ctx'> err_copy_data_failed:</div><div class='ctx'> 	trace_binder_transaction_failed_buffer_release(t-&gt;buffer);</div><div class='ctx'> 	binder_transaction_buffer_release(target_proc, t-&gt;buffer, offp);</div><div class='hunk'>@@ -1779,6 +2251,7 @@ static int binder_thread_write(struct binder_proc *proc,</div><div class='ctx'> 			binder_size_t *consumed)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t cmd;</div><div class='add'>+	struct binder_context *context = proc-&gt;context;</div><div class='ctx'> 	void __user *buffer = (void __user *)(uintptr_t)binder_buffer;</div><div class='ctx'> 	void __user *ptr = buffer + *consumed;</div><div class='ctx'> 	void __user *end = buffer + size;</div><div class='hunk'>@@ -1805,10 +2278,10 @@ static int binder_thread_write(struct binder_proc *proc,</div><div class='ctx'> 			if (get_user(target, (uint32_t __user *)ptr))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			ptr += sizeof(uint32_t);</div><div class='del'>-			if (target == 0 &amp;&amp; binder_context_mgr_node &amp;&amp;</div><div class='add'>+			if (target == 0 &amp;&amp; context-&gt;binder_context_mgr_node &amp;&amp;</div><div class='ctx'> 			    (cmd == BC_INCREFS || cmd == BC_ACQUIRE)) {</div><div class='ctx'> 				ref = binder_get_ref_for_node(proc,</div><div class='del'>-					       binder_context_mgr_node);</div><div class='add'>+					context-&gt;binder_context_mgr_node);</div><div class='ctx'> 				if (ref-&gt;desc != target) {</div><div class='ctx'> 					binder_user_error("%d:%d tried to acquire reference to desc 0, got %d instead\n",</div><div class='ctx'> 						proc-&gt;pid, thread-&gt;pid,</div><div class='hunk'>@@ -1953,6 +2426,17 @@ static int binder_thread_write(struct binder_proc *proc,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		case BC_TRANSACTION_SG:</div><div class='add'>+		case BC_REPLY_SG: {</div><div class='add'>+			struct binder_transaction_data_sg tr;</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(&amp;tr, ptr, sizeof(tr)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(tr);</div><div class='add'>+			binder_transaction(proc, thread, &amp;tr.transaction_data,</div><div class='add'>+					   cmd == BC_REPLY_SG, tr.buffers_size);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		case BC_TRANSACTION:</div><div class='ctx'> 		case BC_REPLY: {</div><div class='ctx'> 			struct binder_transaction_data tr;</div><div class='hunk'>@@ -1960,7 +2444,8 @@ static int binder_thread_write(struct binder_proc *proc,</div><div class='ctx'> 			if (copy_from_user(&amp;tr, ptr, sizeof(tr)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			ptr += sizeof(tr);</div><div class='del'>-			binder_transaction(proc, thread, &amp;tr, cmd == BC_REPLY);</div><div class='add'>+			binder_transaction(proc, thread, &amp;tr,</div><div class='add'>+					   cmd == BC_REPLY, 0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2714,9 +3199,11 @@ static int binder_ioctl_set_ctx_mgr(struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct binder_proc *proc = filp-&gt;private_data;</div><div class='add'>+	struct binder_context *context = proc-&gt;context;</div><div class='add'>+</div><div class='ctx'> 	kuid_t curr_euid = current_euid();</div><div class='ctx'> </div><div class='del'>-	if (binder_context_mgr_node != NULL) {</div><div class='add'>+	if (context-&gt;binder_context_mgr_node) {</div><div class='ctx'> 		pr_err("BINDER_SET_CONTEXT_MGR already set\n");</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2724,27 +3211,27 @@ static int binder_ioctl_set_ctx_mgr(struct file *filp)</div><div class='ctx'> 	ret = security_binder_set_context_mgr(proc-&gt;tsk);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (uid_valid(binder_context_mgr_uid)) {</div><div class='del'>-		if (!uid_eq(binder_context_mgr_uid, curr_euid)) {</div><div class='add'>+	if (uid_valid(context-&gt;binder_context_mgr_uid)) {</div><div class='add'>+		if (!uid_eq(context-&gt;binder_context_mgr_uid, curr_euid)) {</div><div class='ctx'> 			pr_err("BINDER_SET_CONTEXT_MGR bad uid %d != %d\n",</div><div class='ctx'> 			       from_kuid(&amp;init_user_ns, curr_euid),</div><div class='ctx'> 			       from_kuid(&amp;init_user_ns,</div><div class='del'>-					binder_context_mgr_uid));</div><div class='add'>+					 context-&gt;binder_context_mgr_uid));</div><div class='ctx'> 			ret = -EPERM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		binder_context_mgr_uid = curr_euid;</div><div class='add'>+		context-&gt;binder_context_mgr_uid = curr_euid;</div><div class='ctx'> 	}</div><div class='del'>-	binder_context_mgr_node = binder_new_node(proc, 0, 0);</div><div class='del'>-	if (binder_context_mgr_node == NULL) {</div><div class='add'>+	context-&gt;binder_context_mgr_node = binder_new_node(proc, 0, 0);</div><div class='add'>+	if (!context-&gt;binder_context_mgr_node) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	binder_context_mgr_node-&gt;local_weak_refs++;</div><div class='del'>-	binder_context_mgr_node-&gt;local_strong_refs++;</div><div class='del'>-	binder_context_mgr_node-&gt;has_strong_ref = 1;</div><div class='del'>-	binder_context_mgr_node-&gt;has_weak_ref = 1;</div><div class='add'>+	context-&gt;binder_context_mgr_node-&gt;local_weak_refs++;</div><div class='add'>+	context-&gt;binder_context_mgr_node-&gt;local_strong_refs++;</div><div class='add'>+	context-&gt;binder_context_mgr_node-&gt;has_strong_ref = 1;</div><div class='add'>+	context-&gt;binder_context_mgr_node-&gt;has_weak_ref = 1;</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2856,7 +3343,7 @@ static void binder_vma_close(struct vm_area_struct *vma)</div><div class='ctx'> 	binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int binder_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+static int binder_vm_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='ctx'> 	return VM_FAULT_SIGBUS;</div><div class='ctx'> }</div><div class='hunk'>@@ -2969,6 +3456,7 @@ err_bad_arg:</div><div class='ctx'> static int binder_open(struct inode *nodp, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct binder_proc *proc;</div><div class='add'>+	struct binder_device *binder_dev;</div><div class='ctx'> </div><div class='ctx'> 	binder_debug(BINDER_DEBUG_OPEN_CLOSE, "binder_open: %d:%d\n",</div><div class='ctx'> 		     current-&gt;group_leader-&gt;pid, current-&gt;pid);</div><div class='hunk'>@@ -2982,6 +3470,9 @@ static int binder_open(struct inode *nodp, struct file *filp)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;proc-&gt;todo);</div><div class='ctx'> 	init_waitqueue_head(&amp;proc-&gt;wait);</div><div class='ctx'> 	proc-&gt;default_priority = task_nice(current);</div><div class='add'>+	binder_dev = container_of(filp-&gt;private_data, struct binder_device,</div><div class='add'>+				  miscdev);</div><div class='add'>+	proc-&gt;context = &amp;binder_dev-&gt;context;</div><div class='ctx'> </div><div class='ctx'> 	binder_lock(__func__);</div><div class='ctx'> </div><div class='hunk'>@@ -2997,8 +3488,17 @@ static int binder_open(struct inode *nodp, struct file *filp)</div><div class='ctx'> 		char strbuf[11];</div><div class='ctx'> </div><div class='ctx'> 		snprintf(strbuf, sizeof(strbuf), "%u", proc-&gt;pid);</div><div class='add'>+		/*</div><div class='add'>+		 * proc debug entries are shared between contexts, so</div><div class='add'>+		 * this will fail if the process tries to open the driver</div><div class='add'>+		 * again with a different context. The priting code will</div><div class='add'>+		 * anyway print all contexts that a given PID has, so this</div><div class='add'>+		 * is not a problem.</div><div class='add'>+		 */</div><div class='ctx'> 		proc-&gt;debugfs_entry = debugfs_create_file(strbuf, S_IRUGO,</div><div class='del'>-			binder_debugfs_dir_entry_proc, proc, &amp;binder_proc_fops);</div><div class='add'>+			binder_debugfs_dir_entry_proc,</div><div class='add'>+			(void *)(unsigned long)proc-&gt;pid,</div><div class='add'>+			&amp;binder_proc_fops);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3091,6 +3591,7 @@ static int binder_node_release(struct binder_node *node, int refs)</div><div class='ctx'> static void binder_deferred_release(struct binder_proc *proc)</div><div class='ctx'> {</div><div class='ctx'> 	struct binder_transaction *t;</div><div class='add'>+	struct binder_context *context = proc-&gt;context;</div><div class='ctx'> 	struct rb_node *n;</div><div class='ctx'> 	int threads, nodes, incoming_refs, outgoing_refs, buffers,</div><div class='ctx'> 		active_transactions, page_count;</div><div class='hunk'>@@ -3100,11 +3601,12 @@ static void binder_deferred_release(struct binder_proc *proc)</div><div class='ctx'> </div><div class='ctx'> 	hlist_del(&amp;proc-&gt;proc_node);</div><div class='ctx'> </div><div class='del'>-	if (binder_context_mgr_node &amp;&amp; binder_context_mgr_node-&gt;proc == proc) {</div><div class='add'>+	if (context-&gt;binder_context_mgr_node &amp;&amp;</div><div class='add'>+	    context-&gt;binder_context_mgr_node-&gt;proc == proc) {</div><div class='ctx'> 		binder_debug(BINDER_DEBUG_DEAD_BINDER,</div><div class='ctx'> 			     "%s: %d context_mgr_node gone\n",</div><div class='ctx'> 			     __func__, proc-&gt;pid);</div><div class='del'>-		binder_context_mgr_node = NULL;</div><div class='add'>+		context-&gt;binder_context_mgr_node = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	threads = 0;</div><div class='hunk'>@@ -3391,6 +3893,7 @@ static void print_binder_proc(struct seq_file *m,</div><div class='ctx'> 	size_t header_pos;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "proc %d\n", proc-&gt;pid);</div><div class='add'>+	seq_printf(m, "context %s\n", proc-&gt;context-&gt;name);</div><div class='ctx'> 	header_pos = m-&gt;count;</div><div class='ctx'> </div><div class='ctx'> 	for (n = rb_first(&amp;proc-&gt;threads); n != NULL; n = rb_next(n))</div><div class='hunk'>@@ -3460,7 +3963,9 @@ static const char * const binder_command_strings[] = {</div><div class='ctx'> 	"BC_EXIT_LOOPER",</div><div class='ctx'> 	"BC_REQUEST_DEATH_NOTIFICATION",</div><div class='ctx'> 	"BC_CLEAR_DEATH_NOTIFICATION",</div><div class='del'>-	"BC_DEAD_BINDER_DONE"</div><div class='add'>+	"BC_DEAD_BINDER_DONE",</div><div class='add'>+	"BC_TRANSACTION_SG",</div><div class='add'>+	"BC_REPLY_SG",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char * const binder_objstat_strings[] = {</div><div class='hunk'>@@ -3515,6 +4020,7 @@ static void print_binder_proc_stats(struct seq_file *m,</div><div class='ctx'> 	int count, strong, weak;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "proc %d\n", proc-&gt;pid);</div><div class='add'>+	seq_printf(m, "context %s\n", proc-&gt;context-&gt;name);</div><div class='ctx'> 	count = 0;</div><div class='ctx'> 	for (n = rb_first(&amp;proc-&gt;threads); n != NULL; n = rb_next(n))</div><div class='ctx'> 		count++;</div><div class='hunk'>@@ -3622,23 +4128,18 @@ static int binder_transactions_show(struct seq_file *m, void *unused)</div><div class='ctx'> static int binder_proc_show(struct seq_file *m, void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	struct binder_proc *itr;</div><div class='del'>-	struct binder_proc *proc = m-&gt;private;</div><div class='add'>+	int pid = (unsigned long)m-&gt;private;</div><div class='ctx'> 	int do_lock = !binder_debug_no_lock;</div><div class='del'>-	bool valid_proc = false;</div><div class='ctx'> </div><div class='ctx'> 	if (do_lock)</div><div class='ctx'> 		binder_lock(__func__);</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry(itr, &amp;binder_procs, proc_node) {</div><div class='del'>-		if (itr == proc) {</div><div class='del'>-			valid_proc = true;</div><div class='del'>-			break;</div><div class='add'>+		if (itr-&gt;pid == pid) {</div><div class='add'>+			seq_puts(m, "binder proc state:\n");</div><div class='add'>+			print_binder_proc(m, itr, 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (valid_proc) {</div><div class='del'>-		seq_puts(m, "binder proc state:\n");</div><div class='del'>-		print_binder_proc(m, proc, 1);</div><div class='del'>-	}</div><div class='ctx'> 	if (do_lock)</div><div class='ctx'> 		binder_unlock(__func__);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3648,11 +4149,11 @@ static void print_binder_transaction_log_entry(struct seq_file *m,</div><div class='ctx'> 					struct binder_transaction_log_entry *e)</div><div class='ctx'> {</div><div class='ctx'> 	seq_printf(m,</div><div class='del'>-		   "%d: %s from %d:%d to %d:%d node %d handle %d size %d:%d\n",</div><div class='add'>+		   "%d: %s from %d:%d to %d:%d context %s node %d handle %d size %d:%d\n",</div><div class='ctx'> 		   e-&gt;debug_id, (e-&gt;call_type == 2) ? "reply" :</div><div class='ctx'> 		   ((e-&gt;call_type == 1) ? "async" : "call "), e-&gt;from_proc,</div><div class='del'>-		   e-&gt;from_thread, e-&gt;to_proc, e-&gt;to_thread, e-&gt;to_node,</div><div class='del'>-		   e-&gt;target_handle, e-&gt;data_size, e-&gt;offsets_size);</div><div class='add'>+		   e-&gt;from_thread, e-&gt;to_proc, e-&gt;to_thread, e-&gt;context_name,</div><div class='add'>+		   e-&gt;to_node, e-&gt;target_handle, e-&gt;data_size, e-&gt;offsets_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int binder_transaction_log_show(struct seq_file *m, void *unused)</div><div class='hunk'>@@ -3680,26 +4181,50 @@ static const struct file_operations binder_fops = {</div><div class='ctx'> 	.release = binder_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct miscdevice binder_miscdev = {</div><div class='del'>-	.minor = MISC_DYNAMIC_MINOR,</div><div class='del'>-	.name = "binder",</div><div class='del'>-	.fops = &amp;binder_fops</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> BINDER_DEBUG_ENTRY(state);</div><div class='ctx'> BINDER_DEBUG_ENTRY(stats);</div><div class='ctx'> BINDER_DEBUG_ENTRY(transactions);</div><div class='ctx'> BINDER_DEBUG_ENTRY(transaction_log);</div><div class='ctx'> </div><div class='add'>+static int __init init_binder_device(const char *name)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct binder_device *binder_device;</div><div class='add'>+</div><div class='add'>+	binder_device = kzalloc(sizeof(*binder_device), GFP_KERNEL);</div><div class='add'>+	if (!binder_device)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	binder_device-&gt;miscdev.fops = &amp;binder_fops;</div><div class='add'>+	binder_device-&gt;miscdev.minor = MISC_DYNAMIC_MINOR;</div><div class='add'>+	binder_device-&gt;miscdev.name = name;</div><div class='add'>+</div><div class='add'>+	binder_device-&gt;context.binder_context_mgr_uid = INVALID_UID;</div><div class='add'>+	binder_device-&gt;context.name = name;</div><div class='add'>+</div><div class='add'>+	ret = misc_register(&amp;binder_device-&gt;miscdev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		kfree(binder_device);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hlist_add_head(&amp;binder_device-&gt;hlist, &amp;binder_devices);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init binder_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	char *device_name, *device_names;</div><div class='add'>+	struct binder_device *device;</div><div class='add'>+	struct hlist_node *tmp;</div><div class='ctx'> </div><div class='ctx'> 	binder_debugfs_dir_entry_root = debugfs_create_dir("binder", NULL);</div><div class='ctx'> 	if (binder_debugfs_dir_entry_root)</div><div class='ctx'> 		binder_debugfs_dir_entry_proc = debugfs_create_dir("proc",</div><div class='ctx'> 						 binder_debugfs_dir_entry_root);</div><div class='del'>-	ret = misc_register(&amp;binder_miscdev);</div><div class='add'>+</div><div class='ctx'> 	if (binder_debugfs_dir_entry_root) {</div><div class='ctx'> 		debugfs_create_file("state",</div><div class='ctx'> 				    S_IRUGO,</div><div class='hunk'>@@ -3727,6 +4252,35 @@ static int __init binder_init(void)</div><div class='ctx'> 				    &amp;binder_transaction_log_failed,</div><div class='ctx'> 				    &amp;binder_transaction_log_fops);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Copy the module_parameter string, because we don't want to</div><div class='add'>+	 * tokenize it in-place.</div><div class='add'>+	 */</div><div class='add'>+	device_names = kzalloc(strlen(binder_devices_param) + 1, GFP_KERNEL);</div><div class='add'>+	if (!device_names) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_alloc_device_names_failed;</div><div class='add'>+	}</div><div class='add'>+	strcpy(device_names, binder_devices_param);</div><div class='add'>+</div><div class='add'>+	while ((device_name = strsep(&amp;device_names, ","))) {</div><div class='add'>+		ret = init_binder_device(device_name);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_init_binder_device_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_init_binder_device_failed:</div><div class='add'>+	hlist_for_each_entry_safe(device, tmp, &amp;binder_devices, hlist) {</div><div class='add'>+		misc_deregister(&amp;device-&gt;miscdev);</div><div class='add'>+		hlist_del(&amp;device-&gt;hlist);</div><div class='add'>+		kfree(device);</div><div class='add'>+	}</div><div class='add'>+err_alloc_device_names_failed:</div><div class='add'>+	debugfs_remove_recursive(binder_debugfs_dir_entry_root);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig<br/>index 2c8be74f401d..70b57d2229d6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/Kconfig</a></div><div class='hunk'>@@ -14,7 +14,7 @@ menuconfig ATA</div><div class='ctx'> 	tristate "Serial ATA and Parallel ATA drivers (libata)"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	depends on BLOCK</div><div class='del'>-	depends on !(M32R || M68K || S390) || BROKEN</div><div class='add'>+	depends on !(M32R || S390) || BROKEN</div><div class='ctx'> 	select SCSI</div><div class='ctx'> 	select GLOB</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -80,6 +80,8 @@ config SATA_PMP</div><div class='ctx'> 	  This option adds support for SATA Port Multipliers</div><div class='ctx'> 	  (the SATA version of an ethernet hub, or SAS expander).</div><div class='ctx'> </div><div class='add'>+if HAS_DMA</div><div class='add'>+</div><div class='ctx'> comment "Controllers with non-SFF native interface"</div><div class='ctx'> </div><div class='ctx'> config SATA_AHCI</div><div class='hunk'>@@ -127,6 +129,7 @@ config AHCI_ST</div><div class='ctx'> config AHCI_IMX</div><div class='ctx'> 	tristate "Freescale i.MX AHCI SATA support"</div><div class='ctx'> 	depends on MFD_SYSCON &amp;&amp; (ARCH_MXC || COMPILE_TEST)</div><div class='add'>+	depends on (HWMON &amp;&amp; (THERMAL || !THERMAL_OF)) || !HWMON</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the Freescale i.MX SoC's</div><div class='ctx'> 	  onboard AHCI SATA.</div><div class='hunk'>@@ -232,6 +235,8 @@ config SATA_SIL24</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+endif # HAS_DMA</div><div class='add'>+</div><div class='ctx'> config ATA_SFF</div><div class='ctx'> 	bool "ATA SFF support (for legacy IDE and PATA)"</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -289,6 +294,7 @@ config SATA_SX4</div><div class='ctx'> </div><div class='ctx'> config ATA_BMDMA</div><div class='ctx'> 	bool "ATA BMDMA support"</div><div class='add'>+	depends on HAS_DMA</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option adds support for SFF ATA controllers with BMDMA</div><div class='hunk'>@@ -344,6 +350,7 @@ config SATA_DWC_VDEBUG</div><div class='ctx'> </div><div class='ctx'> config SATA_HIGHBANK</div><div class='ctx'> 	tristate "Calxeda Highbank SATA support"</div><div class='add'>+	depends on HAS_DMA</div><div class='ctx'> 	depends on ARCH_HIGHBANK || COMPILE_TEST</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the Calxeda Highbank SoC's</div><div class='hunk'>@@ -353,6 +360,7 @@ config SATA_HIGHBANK</div><div class='ctx'> </div><div class='ctx'> config SATA_MV</div><div class='ctx'> 	tristate "Marvell SATA support"</div><div class='add'>+	depends on HAS_DMA</div><div class='ctx'> 	depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \</div><div class='ctx'> 		   ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST</div><div class='ctx'> 	select GENERIC_PHY</div><div class='hunk'>@@ -895,6 +903,15 @@ config PATA_CMD640_PCI</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config PATA_FALCON</div><div class='add'>+	tristate "Atari Falcon PATA support"</div><div class='add'>+	depends on M68K &amp;&amp; ATARI</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the on-board IDE</div><div class='add'>+	  interface on the Atari Falcon.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config PATA_ISAPNP</div><div class='ctx'> 	tristate "ISA Plug and Play PATA support"</div><div class='ctx'> 	depends on ISAPNP</div><div class='head'>diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile<br/>index a46e6b784bda..89a0a1915d36 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/Makefile</a></div><div class='hunk'>@@ -93,6 +93,7 @@ obj-$(CONFIG_PATA_WINBOND)	+= pata_sl82c105.o</div><div class='ctx'> obj-$(CONFIG_PATA_AT32)		+= pata_at32.o</div><div class='ctx'> obj-$(CONFIG_PATA_AT91)		+= pata_at91.o</div><div class='ctx'> obj-$(CONFIG_PATA_CMD640_PCI)	+= pata_cmd640.o</div><div class='add'>+obj-$(CONFIG_PATA_FALCON)	+= pata_falcon.o</div><div class='ctx'> obj-$(CONFIG_PATA_ISAPNP)	+= pata_isapnp.o</div><div class='ctx'> obj-$(CONFIG_PATA_IXP4XX_CF)	+= pata_ixp4xx_cf.o</div><div class='ctx'> obj-$(CONFIG_PATA_MPIIX)	+= pata_mpiix.o</div><div class='head'>diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c<br/>index 74f4c662f776..2fc52407306c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/ahci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/ahci.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/ahci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci.c</a></div><div class='hunk'>@@ -46,6 +46,8 @@</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='add'>+#include &lt;linux/ahci-remap.h&gt;</div><div class='add'>+#include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='ctx'> #include "ahci.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"ahci"</div><div class='hunk'>@@ -1400,6 +1402,40 @@ static irqreturn_t ahci_thunderx_irq_handler(int irq, void *dev_instance)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void ahci_remap_check(struct pci_dev *pdev, int bar,</div><div class='add'>+		struct ahci_host_priv *hpriv)</div><div class='add'>+{</div><div class='add'>+	int i, count = 0;</div><div class='add'>+	u32 cap;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if this device might have remapped nvme devices.</div><div class='add'>+	 */</div><div class='add'>+	if (pdev-&gt;vendor != PCI_VENDOR_ID_INTEL ||</div><div class='add'>+	    pci_resource_len(pdev, bar) &lt; SZ_512K ||</div><div class='add'>+	    bar != AHCI_PCI_BAR_STANDARD ||</div><div class='add'>+	    !(readl(hpriv-&gt;mmio + AHCI_VSCAP) &amp; 1))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cap = readq(hpriv-&gt;mmio + AHCI_REMAP_CAP);</div><div class='add'>+	for (i = 0; i &lt; AHCI_MAX_REMAP; i++) {</div><div class='add'>+		if ((cap &amp; (1 &lt;&lt; i)) == 0)</div><div class='add'>+			continue;</div><div class='add'>+		if (readl(hpriv-&gt;mmio + ahci_remap_dcc(i))</div><div class='add'>+				!= PCI_CLASS_STORAGE_EXPRESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* We've found a remapped device */</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!count)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_warn(&amp;pdev-&gt;dev, "Found %d remapped NVMe devices.\n", count);</div><div class='add'>+	dev_warn(&amp;pdev-&gt;dev, "Switch your BIOS from RAID to AHCI mode to use them.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ahci_get_irq_vector(struct ata_host *host, int port)</div><div class='ctx'> {</div><div class='ctx'> 	return pci_irq_vector(to_pci_dev(host-&gt;dev), port);</div><div class='hunk'>@@ -1541,6 +1577,9 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	hpriv-&gt;mmio = pcim_iomap_table(pdev)[ahci_pci_bar];</div><div class='ctx'> </div><div class='add'>+	/* detect remapped nvme devices */</div><div class='add'>+	ahci_remap_check(pdev, ahci_pci_bar, hpriv);</div><div class='add'>+</div><div class='ctx'> 	/* must set flag prior to save config in order to take effect */</div><div class='ctx'> 	if (ahci_broken_devslp(pdev))</div><div class='ctx'> 		hpriv-&gt;flags |= AHCI_HFLAG_NO_DEVSLP;</div><div class='head'>diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h<br/>index 0cc08f892fea..5db6ab261643 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/ahci.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/ahci.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/ahci.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci.h</a></div><div class='hunk'>@@ -398,6 +398,9 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,</div><div class='ctx'> 		      int pmp, unsigned long deadline,</div><div class='ctx'> 		      int (*check_ready)(struct ata_link *link));</div><div class='ctx'> </div><div class='add'>+int ahci_do_hardreset(struct ata_link *link, unsigned int *class,</div><div class='add'>+		      unsigned long deadline, bool *online);</div><div class='add'>+</div><div class='ctx'> unsigned int ahci_qc_issue(struct ata_queued_cmd *qc);</div><div class='ctx'> int ahci_stop_engine(struct ata_port *ap);</div><div class='ctx'> void ahci_start_fis_rx(struct ata_port *ap);</div><div class='head'>diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c<br/>index 267a3d3e79f4..1a50cd3b4233 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/ahci_da850.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/ahci_da850.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/ahci_da850.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci_da850.c</a></div><div class='hunk'>@@ -16,7 +16,8 @@</div><div class='ctx'> #include &lt;linux/ahci_platform.h&gt;</div><div class='ctx'> #include "ahci.h"</div><div class='ctx'> </div><div class='del'>-#define DRV_NAME "ahci_da850"</div><div class='add'>+#define DRV_NAME		"ahci_da850"</div><div class='add'>+#define HARDRESET_RETRIES	5</div><div class='ctx'> </div><div class='ctx'> /* SATA PHY Control Register offset from AHCI base */</div><div class='ctx'> #define SATA_P0PHYCR_REG	0x178</div><div class='hunk'>@@ -28,17 +29,8 @@</div><div class='ctx'> #define SATA_PHY_TXSWING(x)	((x) &lt;&lt; 19)</div><div class='ctx'> #define SATA_PHY_ENPLL(x)	((x) &lt;&lt; 31)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The multiplier needed for 1.5GHz PLL output.</div><div class='del'>- *</div><div class='del'>- * NOTE: This is currently hardcoded to be suitable for 100MHz crystal</div><div class='del'>- * frequency (which is used by DA850 EVM board) and may need to be changed</div><div class='del'>- * if you would like to use this driver on some other board.</div><div class='del'>- */</div><div class='del'>-#define DA850_SATA_CLK_MULTIPLIER	7</div><div class='del'>-</div><div class='ctx'> static void da850_sata_init(struct device *dev, void __iomem *pwrdn_reg,</div><div class='del'>-			    void __iomem *ahci_base)</div><div class='add'>+			    void __iomem *ahci_base, u32 mpy)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='hunk'>@@ -47,18 +39,122 @@ static void da850_sata_init(struct device *dev, void __iomem *pwrdn_reg,</div><div class='ctx'> 	val &amp;= ~BIT(0);</div><div class='ctx'> 	writel(val, pwrdn_reg);</div><div class='ctx'> </div><div class='del'>-	val = SATA_PHY_MPY(DA850_SATA_CLK_MULTIPLIER + 1) | SATA_PHY_LOS(1) |</div><div class='del'>-	      SATA_PHY_RXCDR(4) | SATA_PHY_RXEQ(1) | SATA_PHY_TXSWING(3) |</div><div class='del'>-	      SATA_PHY_ENPLL(1);</div><div class='add'>+	val = SATA_PHY_MPY(mpy) | SATA_PHY_LOS(1) | SATA_PHY_RXCDR(4) |</div><div class='add'>+	      SATA_PHY_RXEQ(1) | SATA_PHY_TXSWING(3) | SATA_PHY_ENPLL(1);</div><div class='ctx'> </div><div class='ctx'> 	writel(val, ahci_base + SATA_P0PHYCR_REG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 ahci_da850_calculate_mpy(unsigned long refclk_rate)</div><div class='add'>+{</div><div class='add'>+	u32 pll_output = 1500000000, needed;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need to determine the value of the multiplier (MPY) bits.</div><div class='add'>+	 * In order to include the 12.5 multiplier we need to first divide</div><div class='add'>+	 * the refclk rate by ten.</div><div class='add'>+	 *</div><div class='add'>+	 * __div64_32() turned out to be unreliable, sometimes returning</div><div class='add'>+	 * false results.</div><div class='add'>+	 */</div><div class='add'>+	WARN((refclk_rate % 10) != 0, "refclk must be divisible by 10");</div><div class='add'>+	needed = pll_output / (refclk_rate / 10);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * What we have now is (multiplier * 10).</div><div class='add'>+	 *</div><div class='add'>+	 * Let's determine the actual register value we need to write.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (needed) {</div><div class='add'>+	case 50:</div><div class='add'>+		return 0x1;</div><div class='add'>+	case 60:</div><div class='add'>+		return 0x2;</div><div class='add'>+	case 80:</div><div class='add'>+		return 0x4;</div><div class='add'>+	case 100:</div><div class='add'>+		return 0x5;</div><div class='add'>+	case 120:</div><div class='add'>+		return 0x6;</div><div class='add'>+	case 125:</div><div class='add'>+		return 0x7;</div><div class='add'>+	case 150:</div><div class='add'>+		return 0x8;</div><div class='add'>+	case 200:</div><div class='add'>+		return 0x9;</div><div class='add'>+	case 250:</div><div class='add'>+		return 0xa;</div><div class='add'>+	default:</div><div class='add'>+		/*</div><div class='add'>+		 * We should have divided evenly - if not, return an invalid</div><div class='add'>+		 * value.</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahci_da850_softreset(struct ata_link *link,</div><div class='add'>+				unsigned int *class, unsigned long deadline)</div><div class='add'>+{</div><div class='add'>+	int pmp, ret;</div><div class='add'>+</div><div class='add'>+	pmp = sata_srst_pmp(link);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There's an issue with the SATA controller on da850 SoCs: if we</div><div class='add'>+	 * enable Port Multiplier support, but the drive is connected directly</div><div class='add'>+	 * to the board, it can't be detected. As a workaround: if PMP is</div><div class='add'>+	 * enabled, we first call ahci_do_softreset() and pass it the result of</div><div class='add'>+	 * sata_srst_pmp(). If this call fails, we retry with pmp = 0.</div><div class='add'>+	 */</div><div class='add'>+	ret = ahci_do_softreset(link, class, pmp, deadline, ahci_check_ready);</div><div class='add'>+	if (pmp &amp;&amp; ret == -EBUSY)</div><div class='add'>+		return ahci_do_softreset(link, class, 0,</div><div class='add'>+					 deadline, ahci_check_ready);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahci_da850_hardreset(struct ata_link *link,</div><div class='add'>+				unsigned int *class, unsigned long deadline)</div><div class='add'>+{</div><div class='add'>+	int ret, retry = HARDRESET_RETRIES;</div><div class='add'>+	bool online;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In order to correctly service the LCD controller of the da850 SoC,</div><div class='add'>+	 * we increased the PLL0 frequency to 456MHz from the default 300MHz.</div><div class='add'>+	 *</div><div class='add'>+	 * This made the SATA controller unstable and the hardreset operation</div><div class='add'>+	 * does not always succeed the first time. Before really giving up to</div><div class='add'>+	 * bring up the link, retry the reset a couple times.</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		ret = ahci_do_hardreset(link, class, deadline, &amp;online);</div><div class='add'>+		if (online)</div><div class='add'>+			return ret;</div><div class='add'>+	} while (retry--);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ata_port_operations ahci_da850_port_ops = {</div><div class='add'>+	.inherits = &amp;ahci_platform_ops,</div><div class='add'>+	.softreset = ahci_da850_softreset,</div><div class='add'>+	/*</div><div class='add'>+	 * No need to override .pmp_softreset - it's only used for actual</div><div class='add'>+	 * PMP-enabled ports.</div><div class='add'>+	 */</div><div class='add'>+	.hardreset = ahci_da850_hardreset,</div><div class='add'>+	.pmp_hardreset = ahci_da850_hardreset,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct ata_port_info ahci_da850_port_info = {</div><div class='ctx'> 	.flags		= AHCI_FLAG_COMMON,</div><div class='ctx'> 	.pio_mask	= ATA_PIO4,</div><div class='ctx'> 	.udma_mask	= ATA_UDMA6,</div><div class='del'>-	.port_ops	= &amp;ahci_platform_ops,</div><div class='add'>+	.port_ops	= &amp;ahci_da850_port_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct scsi_host_template ahci_platform_sht = {</div><div class='hunk'>@@ -69,14 +165,52 @@ static int ahci_da850_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct ahci_host_priv *hpriv;</div><div class='del'>-	struct resource *res;</div><div class='ctx'> 	void __iomem *pwrdn_reg;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	u32 mpy;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	hpriv = ahci_platform_get_resources(pdev);</div><div class='ctx'> 	if (IS_ERR(hpriv))</div><div class='ctx'> 		return PTR_ERR(hpriv);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Internally ahci_platform_get_resources() calls clk_get(dev, NULL)</div><div class='add'>+	 * when trying to obtain the functional clock. This SATA controller</div><div class='add'>+	 * uses two clocks for which we specify two connection ids. If we don't</div><div class='add'>+	 * have the functional clock at this point - call clk_get() again with</div><div class='add'>+	 * con_id = "fck".</div><div class='add'>+	 */</div><div class='add'>+	if (!hpriv-&gt;clks[0]) {</div><div class='add'>+		clk = clk_get(dev, "fck");</div><div class='add'>+		if (IS_ERR(clk))</div><div class='add'>+			return PTR_ERR(clk);</div><div class='add'>+</div><div class='add'>+		hpriv-&gt;clks[0] = clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The second clock used by ahci-da850 is the external REFCLK. If we</div><div class='add'>+	 * didn't get it from ahci_platform_get_resources(), let's try to</div><div class='add'>+	 * specify the con_id in clk_get().</div><div class='add'>+	 */</div><div class='add'>+	if (!hpriv-&gt;clks[1]) {</div><div class='add'>+		clk = clk_get(dev, "refclk");</div><div class='add'>+		if (IS_ERR(clk)) {</div><div class='add'>+			dev_err(dev, "unable to obtain the reference clock");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hpriv-&gt;clks[1] = clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mpy = ahci_da850_calculate_mpy(clk_get_rate(hpriv-&gt;clks[1]));</div><div class='add'>+	if (mpy == 0) {</div><div class='add'>+		dev_err(dev, "invalid REFCLK multiplier value: 0x%x", mpy);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rc = ahci_platform_enable_resources(hpriv);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -89,7 +223,7 @@ static int ahci_da850_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!pwrdn_reg)</div><div class='ctx'> 		goto disable_resources;</div><div class='ctx'> </div><div class='del'>-	da850_sata_init(dev, pwrdn_reg, hpriv-&gt;mmio);</div><div class='add'>+	da850_sata_init(dev, pwrdn_reg, hpriv-&gt;mmio, mpy);</div><div class='ctx'> </div><div class='ctx'> 	rc = ahci_platform_init_host(pdev, hpriv, &amp;ahci_da850_port_info,</div><div class='ctx'> 				     &amp;ahci_platform_sht);</div><div class='hunk'>@@ -105,11 +239,18 @@ disable_resources:</div><div class='ctx'> static SIMPLE_DEV_PM_OPS(ahci_da850_pm_ops, ahci_platform_suspend,</div><div class='ctx'> 			 ahci_platform_resume);</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id ahci_da850_of_match[] = {</div><div class='add'>+	{ .compatible = "ti,da850-ahci", },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ahci_da850_of_match);</div><div class='add'>+</div><div class='ctx'> static struct platform_driver ahci_da850_driver = {</div><div class='ctx'> 	.probe = ahci_da850_probe,</div><div class='ctx'> 	.remove = ata_platform_remove_one,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = DRV_NAME,</div><div class='add'>+		.of_match_table = ahci_da850_of_match,</div><div class='ctx'> 		.pm = &amp;ahci_da850_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c<br/>index 3f3a7db208ae..787567e840bd 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/ahci_imx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/ahci_imx.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/ahci_imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci_imx.c</a></div><div class='hunk'>@@ -26,6 +26,9 @@</div><div class='ctx'> #include &lt;linux/mfd/syscon.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/syscon/imx6q-iomuxc-gpr.h&gt;</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/thermal.h&gt;</div><div class='ctx'> #include "ahci.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "ahci-imx"</div><div class='hunk'>@@ -214,6 +217,180 @@ static int imx_sata_phy_reset(struct ahci_host_priv *hpriv)</div><div class='ctx'> 	return timeout ? 0 : -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	/* SATA PHY Register */</div><div class='add'>+	SATA_PHY_CR_CLOCK_CRCMP_LT_LIMIT = 0x0001,</div><div class='add'>+	SATA_PHY_CR_CLOCK_DAC_CTL = 0x0008,</div><div class='add'>+	SATA_PHY_CR_CLOCK_RTUNE_CTL = 0x0009,</div><div class='add'>+	SATA_PHY_CR_CLOCK_ADC_OUT = 0x000A,</div><div class='add'>+	SATA_PHY_CR_CLOCK_MPLL_TST = 0x0017,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int read_adc_sum(void *dev, u16 rtune_ctl_reg, void __iomem * mmio)</div><div class='add'>+{</div><div class='add'>+	u16 adc_out_reg, read_sum;</div><div class='add'>+	u32 index, read_attempt;</div><div class='add'>+	const u32 attempt_limit = 100;</div><div class='add'>+</div><div class='add'>+	imx_phy_reg_addressing(SATA_PHY_CR_CLOCK_RTUNE_CTL, mmio);</div><div class='add'>+	imx_phy_reg_write(rtune_ctl_reg, mmio);</div><div class='add'>+</div><div class='add'>+	/* two dummy read */</div><div class='add'>+	index = 0;</div><div class='add'>+	read_attempt = 0;</div><div class='add'>+	adc_out_reg = 0;</div><div class='add'>+	imx_phy_reg_addressing(SATA_PHY_CR_CLOCK_ADC_OUT, mmio);</div><div class='add'>+	while (index &lt; 2) {</div><div class='add'>+		imx_phy_reg_read(&amp;adc_out_reg, mmio);</div><div class='add'>+		/* check if valid */</div><div class='add'>+		if (adc_out_reg &amp; 0x400)</div><div class='add'>+			index++;</div><div class='add'>+</div><div class='add'>+		read_attempt++;</div><div class='add'>+		if (read_attempt &gt; attempt_limit) {</div><div class='add'>+			dev_err(dev, "Read REG more than %d times!\n",</div><div class='add'>+				attempt_limit);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	index = 0;</div><div class='add'>+	read_attempt = 0;</div><div class='add'>+	read_sum = 0;</div><div class='add'>+	while (index &lt; 80) {</div><div class='add'>+		imx_phy_reg_read(&amp;adc_out_reg, mmio);</div><div class='add'>+		if (adc_out_reg &amp; 0x400) {</div><div class='add'>+			read_sum = read_sum + (adc_out_reg &amp; 0x3FF);</div><div class='add'>+			index++;</div><div class='add'>+		}</div><div class='add'>+		read_attempt++;</div><div class='add'>+		if (read_attempt &gt; attempt_limit) {</div><div class='add'>+			dev_err(dev, "Read REG more than %d times!\n",</div><div class='add'>+				attempt_limit);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use the U32 to make 1000 precision */</div><div class='add'>+	return (read_sum * 1000) / 80;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* SATA AHCI temperature monitor */</div><div class='add'>+static int sata_ahci_read_temperature(void *dev, int *temp)</div><div class='add'>+{</div><div class='add'>+	u16 mpll_test_reg, rtune_ctl_reg, dac_ctl_reg, read_sum;</div><div class='add'>+	u32 str1, str2, str3, str4;</div><div class='add'>+	int m1, m2, a;</div><div class='add'>+	struct ahci_host_priv *hpriv = dev_get_drvdata(dev);</div><div class='add'>+	void __iomem *mmio = hpriv-&gt;mmio;</div><div class='add'>+</div><div class='add'>+	/* check rd-wr to reg */</div><div class='add'>+	read_sum = 0;</div><div class='add'>+	imx_phy_reg_addressing(SATA_PHY_CR_CLOCK_CRCMP_LT_LIMIT, mmio);</div><div class='add'>+	imx_phy_reg_write(read_sum, mmio);</div><div class='add'>+	imx_phy_reg_read(&amp;read_sum, mmio);</div><div class='add'>+	if ((read_sum &amp; 0xffff) != 0)</div><div class='add'>+		dev_err(dev, "Read/Write REG error, 0x%x!\n", read_sum);</div><div class='add'>+</div><div class='add'>+	imx_phy_reg_write(0x5A5A, mmio);</div><div class='add'>+	imx_phy_reg_read(&amp;read_sum, mmio);</div><div class='add'>+	if ((read_sum &amp; 0xffff) != 0x5A5A)</div><div class='add'>+		dev_err(dev, "Read/Write REG error, 0x%x!\n", read_sum);</div><div class='add'>+</div><div class='add'>+	imx_phy_reg_write(0x1234, mmio);</div><div class='add'>+	imx_phy_reg_read(&amp;read_sum, mmio);</div><div class='add'>+	if ((read_sum &amp; 0xffff) != 0x1234)</div><div class='add'>+		dev_err(dev, "Read/Write REG error, 0x%x!\n", read_sum);</div><div class='add'>+</div><div class='add'>+	/* start temperature test */</div><div class='add'>+	imx_phy_reg_addressing(SATA_PHY_CR_CLOCK_MPLL_TST, mmio);</div><div class='add'>+	imx_phy_reg_read(&amp;mpll_test_reg, mmio);</div><div class='add'>+	imx_phy_reg_addressing(SATA_PHY_CR_CLOCK_RTUNE_CTL, mmio);</div><div class='add'>+	imx_phy_reg_read(&amp;rtune_ctl_reg, mmio);</div><div class='add'>+	imx_phy_reg_addressing(SATA_PHY_CR_CLOCK_DAC_CTL, mmio);</div><div class='add'>+	imx_phy_reg_read(&amp;dac_ctl_reg, mmio);</div><div class='add'>+</div><div class='add'>+	/* mpll_tst.meas_iv   ([12:2]) */</div><div class='add'>+	str1 = (mpll_test_reg &gt;&gt; 2) &amp; 0x7FF;</div><div class='add'>+	/* rtune_ctl.mode     ([1:0]) */</div><div class='add'>+	str2 = (rtune_ctl_reg) &amp; 0x3;</div><div class='add'>+	/* dac_ctl.dac_mode   ([14:12]) */</div><div class='add'>+	str3 = (dac_ctl_reg &gt;&gt; 12)  &amp; 0x7;</div><div class='add'>+	/* rtune_ctl.sel_atbp ([4]) */</div><div class='add'>+	str4 = (rtune_ctl_reg &gt;&gt; 4);</div><div class='add'>+</div><div class='add'>+	/* Calculate the m1 */</div><div class='add'>+	/* mpll_tst.meas_iv */</div><div class='add'>+	mpll_test_reg = (mpll_test_reg &amp; 0xE03) | (512) &lt;&lt; 2;</div><div class='add'>+	/* rtune_ctl.mode */</div><div class='add'>+	rtune_ctl_reg = (rtune_ctl_reg &amp; 0xFFC) | (1);</div><div class='add'>+	/* dac_ctl.dac_mode */</div><div class='add'>+	dac_ctl_reg = (dac_ctl_reg &amp; 0x8FF) | (4) &lt;&lt; 12;</div><div class='add'>+	/* rtune_ctl.sel_atbp */</div><div class='add'>+	rtune_ctl_reg = (rtune_ctl_reg &amp; 0xFEF) | (0) &lt;&lt; 4;</div><div class='add'>+	imx_phy_reg_addressing(SATA_PHY_CR_CLOCK_MPLL_TST, mmio);</div><div class='add'>+	imx_phy_reg_write(mpll_test_reg, mmio);</div><div class='add'>+	imx_phy_reg_addressing(SATA_PHY_CR_CLOCK_DAC_CTL, mmio);</div><div class='add'>+	imx_phy_reg_write(dac_ctl_reg, mmio);</div><div class='add'>+	m1 = read_adc_sum(dev, rtune_ctl_reg, mmio);</div><div class='add'>+</div><div class='add'>+	/* Calculate the m2 */</div><div class='add'>+	/* rtune_ctl.sel_atbp */</div><div class='add'>+	rtune_ctl_reg = (rtune_ctl_reg &amp; 0xFEF) | (1) &lt;&lt; 4;</div><div class='add'>+	m2 = read_adc_sum(dev, rtune_ctl_reg, mmio);</div><div class='add'>+</div><div class='add'>+	/* restore the status  */</div><div class='add'>+	/* mpll_tst.meas_iv */</div><div class='add'>+	mpll_test_reg = (mpll_test_reg &amp; 0xE03) | (str1) &lt;&lt; 2;</div><div class='add'>+	/* rtune_ctl.mode */</div><div class='add'>+	rtune_ctl_reg = (rtune_ctl_reg &amp; 0xFFC) | (str2);</div><div class='add'>+	/* dac_ctl.dac_mode */</div><div class='add'>+	dac_ctl_reg = (dac_ctl_reg &amp; 0x8FF) | (str3) &lt;&lt; 12;</div><div class='add'>+	/* rtune_ctl.sel_atbp */</div><div class='add'>+	rtune_ctl_reg = (rtune_ctl_reg &amp; 0xFEF) | (str4) &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	imx_phy_reg_addressing(SATA_PHY_CR_CLOCK_MPLL_TST, mmio);</div><div class='add'>+	imx_phy_reg_write(mpll_test_reg, mmio);</div><div class='add'>+	imx_phy_reg_addressing(SATA_PHY_CR_CLOCK_DAC_CTL, mmio);</div><div class='add'>+	imx_phy_reg_write(dac_ctl_reg, mmio);</div><div class='add'>+	imx_phy_reg_addressing(SATA_PHY_CR_CLOCK_RTUNE_CTL, mmio);</div><div class='add'>+	imx_phy_reg_write(rtune_ctl_reg, mmio);</div><div class='add'>+</div><div class='add'>+	/* Compute temperature */</div><div class='add'>+	if (!(m2 / 1000))</div><div class='add'>+		m2 = 1000;</div><div class='add'>+	a = (m2 - m1) / (m2/1000);</div><div class='add'>+	*temp = ((-559) * a * a) / 1000 + (1379) * a + (-458000);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t sata_ahci_show_temp(struct device *dev,</div><div class='add'>+				   struct device_attribute *da,</div><div class='add'>+				   char *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned int temp = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = sata_ahci_read_temperature(dev, &amp;temp);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", temp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct thermal_zone_of_device_ops fsl_sata_ahci_of_thermal_ops = {</div><div class='add'>+	.get_temp = sata_ahci_read_temperature,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, sata_ahci_show_temp, NULL, 0);</div><div class='add'>+</div><div class='add'>+static struct attribute *fsl_sata_ahci_attrs[] = {</div><div class='add'>+	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(fsl_sata_ahci);</div><div class='add'>+</div><div class='ctx'> static int imx_sata_enable(struct ahci_host_priv *hpriv)</div><div class='ctx'> {</div><div class='ctx'> 	struct imx_ahci_priv *imxpriv = hpriv-&gt;plat_data;</div><div class='hunk'>@@ -597,6 +774,25 @@ static int imx_ahci_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (imxpriv-&gt;type == AHCI_IMX53 &amp;&amp;</div><div class='add'>+	    IS_ENABLED(CONFIG_HWMON)) {</div><div class='add'>+		/* Add the temperature monitor */</div><div class='add'>+		struct device *hwmon_dev;</div><div class='add'>+</div><div class='add'>+		hwmon_dev =</div><div class='add'>+			devm_hwmon_device_register_with_groups(dev,</div><div class='add'>+							"sata_ahci",</div><div class='add'>+							hpriv,</div><div class='add'>+							fsl_sata_ahci_groups);</div><div class='add'>+		if (IS_ERR(hwmon_dev)) {</div><div class='add'>+			ret = PTR_ERR(hwmon_dev);</div><div class='add'>+			goto disable_clk;</div><div class='add'>+		}</div><div class='add'>+		devm_thermal_zone_of_sensor_register(hwmon_dev, 0, hwmon_dev,</div><div class='add'>+					     &amp;fsl_sata_ahci_of_thermal_ops);</div><div class='add'>+		dev_info(dev, "%s: sensor 'sata_ahci'\n", dev_name(hwmon_dev));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = imx_sata_enable(hpriv);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto disable_clk;</div><div class='head'>diff --git a/drivers/ata/ahci_qoriq.c b/drivers/ata/ahci_qoriq.c<br/>index 1eba8dff875e..85d833289f28 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/ahci_qoriq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/ahci_qoriq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/ahci_qoriq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci_qoriq.c</a></div><div class='hunk'>@@ -46,23 +46,29 @@</div><div class='ctx'> #define LS1021A_AXICC_ADDR	0xC0</div><div class='ctx'> </div><div class='ctx'> #define SATA_ECC_DISABLE	0x00020000</div><div class='add'>+#define ECC_DIS_ARMV8_CH2	0x80000000</div><div class='ctx'> </div><div class='ctx'> enum ahci_qoriq_type {</div><div class='ctx'> 	AHCI_LS1021A,</div><div class='ctx'> 	AHCI_LS1043A,</div><div class='ctx'> 	AHCI_LS2080A,</div><div class='add'>+	AHCI_LS1046A,</div><div class='add'>+	AHCI_LS2088A,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ahci_qoriq_priv {</div><div class='ctx'> 	struct ccsr_ahci *reg_base;</div><div class='ctx'> 	enum ahci_qoriq_type type;</div><div class='ctx'> 	void __iomem *ecc_addr;</div><div class='add'>+	bool is_dmacoherent;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id ahci_qoriq_of_match[] = {</div><div class='ctx'> 	{ .compatible = "fsl,ls1021a-ahci", .data = (void *)AHCI_LS1021A},</div><div class='ctx'> 	{ .compatible = "fsl,ls1043a-ahci", .data = (void *)AHCI_LS1043A},</div><div class='ctx'> 	{ .compatible = "fsl,ls2080a-ahci", .data = (void *)AHCI_LS2080A},</div><div class='add'>+	{ .compatible = "fsl,ls1046a-ahci", .data = (void *)AHCI_LS1046A},</div><div class='add'>+	{ .compatible = "fsl,ls2088a-ahci", .data = (void *)AHCI_LS2088A},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match);</div><div class='hunk'>@@ -154,6 +160,8 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)</div><div class='ctx'> </div><div class='ctx'> 	switch (qpriv-&gt;type) {</div><div class='ctx'> 	case AHCI_LS1021A:</div><div class='add'>+		if (!qpriv-&gt;ecc_addr)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		writel(SATA_ECC_DISABLE, qpriv-&gt;ecc_addr);</div><div class='ctx'> 		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);</div><div class='ctx'> 		writel(LS1021A_PORT_PHY2, reg_base + PORT_PHY2);</div><div class='hunk'>@@ -161,19 +169,43 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)</div><div class='ctx'> 		writel(LS1021A_PORT_PHY4, reg_base + PORT_PHY4);</div><div class='ctx'> 		writel(LS1021A_PORT_PHY5, reg_base + PORT_PHY5);</div><div class='ctx'> 		writel(AHCI_PORT_TRANS_CFG, reg_base + PORT_TRANS);</div><div class='del'>-		writel(AHCI_PORT_AXICC_CFG, reg_base + LS1021A_AXICC_ADDR);</div><div class='add'>+		if (qpriv-&gt;is_dmacoherent)</div><div class='add'>+			writel(AHCI_PORT_AXICC_CFG,</div><div class='add'>+					reg_base + LS1021A_AXICC_ADDR);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AHCI_LS1043A:</div><div class='add'>+		if (!qpriv-&gt;ecc_addr)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		writel(ECC_DIS_ARMV8_CH2, qpriv-&gt;ecc_addr);</div><div class='ctx'> 		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);</div><div class='ctx'> 		writel(AHCI_PORT_TRANS_CFG, reg_base + PORT_TRANS);</div><div class='del'>-		writel(AHCI_PORT_AXICC_CFG, reg_base + PORT_AXICC);</div><div class='add'>+		if (qpriv-&gt;is_dmacoherent)</div><div class='add'>+			writel(AHCI_PORT_AXICC_CFG, reg_base + PORT_AXICC);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AHCI_LS2080A:</div><div class='ctx'> 		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);</div><div class='ctx'> 		writel(AHCI_PORT_TRANS_CFG, reg_base + PORT_TRANS);</div><div class='del'>-		writel(AHCI_PORT_AXICC_CFG, reg_base + PORT_AXICC);</div><div class='add'>+		if (qpriv-&gt;is_dmacoherent)</div><div class='add'>+			writel(AHCI_PORT_AXICC_CFG, reg_base + PORT_AXICC);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AHCI_LS1046A:</div><div class='add'>+		if (!qpriv-&gt;ecc_addr)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		writel(ECC_DIS_ARMV8_CH2, qpriv-&gt;ecc_addr);</div><div class='add'>+		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);</div><div class='add'>+		writel(AHCI_PORT_TRANS_CFG, reg_base + PORT_TRANS);</div><div class='add'>+		if (qpriv-&gt;is_dmacoherent)</div><div class='add'>+			writel(AHCI_PORT_AXICC_CFG, reg_base + PORT_AXICC);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AHCI_LS2088A:</div><div class='add'>+		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);</div><div class='add'>+		writel(AHCI_PORT_TRANS_CFG, reg_base + PORT_TRANS);</div><div class='add'>+		if (qpriv-&gt;is_dmacoherent)</div><div class='add'>+			writel(AHCI_PORT_AXICC_CFG, reg_base + PORT_AXICC);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -204,13 +236,14 @@ static int ahci_qoriq_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	qoriq_priv-&gt;type = (enum ahci_qoriq_type)of_id-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (qoriq_priv-&gt;type == AHCI_LS1021A) {</div><div class='del'>-		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,</div><div class='del'>-				"sata-ecc");</div><div class='add'>+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,</div><div class='add'>+			"sata-ecc");</div><div class='add'>+	if (res) {</div><div class='ctx'> 		qoriq_priv-&gt;ecc_addr = devm_ioremap_resource(dev, res);</div><div class='ctx'> 		if (IS_ERR(qoriq_priv-&gt;ecc_addr))</div><div class='ctx'> 			return PTR_ERR(qoriq_priv-&gt;ecc_addr);</div><div class='ctx'> 	}</div><div class='add'>+	qoriq_priv-&gt;is_dmacoherent = of_dma_is_coherent(np);</div><div class='ctx'> </div><div class='ctx'> 	rc = ahci_platform_enable_resources(hpriv);</div><div class='ctx'> 	if (rc)</div><div class='head'>diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c<br/>index 73b19b277138..c2b5941d9184 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/ahci_xgene.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/ahci_xgene.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/ahci_xgene.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/ahci_xgene.c</a></div><div class='hunk'>@@ -821,8 +821,10 @@ static int xgene_ahci_probe(struct platform_device *pdev)</div><div class='ctx'> 				dev_warn(&amp;pdev-&gt;dev, "%s: Error reading device info. Assume version1\n",</div><div class='ctx'> 					__func__);</div><div class='ctx'> 				version = XGENE_AHCI_V1;</div><div class='del'>-			} else if (info-&gt;valid &amp; ACPI_VALID_CID) {</div><div class='del'>-				version = XGENE_AHCI_V2;</div><div class='add'>+			} else {</div><div class='add'>+				if (info-&gt;valid &amp; ACPI_VALID_CID)</div><div class='add'>+					version = XGENE_AHCI_V2;</div><div class='add'>+				kfree(info);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c<br/>index 0d028ead99e8..3159f9e66d8f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/libahci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/libahci.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/libahci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libahci.c</a></div><div class='hunk'>@@ -140,6 +140,7 @@ EXPORT_SYMBOL_GPL(ahci_shost_attrs);</div><div class='ctx'> struct device_attribute *ahci_sdev_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_sw_activity,</div><div class='ctx'> 	&amp;dev_attr_unload_heads,</div><div class='add'>+	&amp;dev_attr_ncq_prio_enable,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(ahci_sdev_attrs);</div><div class='hunk'>@@ -1518,8 +1519,8 @@ static int ahci_pmp_retry_softreset(struct ata_link *link, unsigned int *class,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ahci_hardreset(struct ata_link *link, unsigned int *class,</div><div class='del'>-			  unsigned long deadline)</div><div class='add'>+int ahci_do_hardreset(struct ata_link *link, unsigned int *class,</div><div class='add'>+		      unsigned long deadline, bool *online)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned long *timing = sata_ehc_deb_timing(&amp;link-&gt;eh_context);</div><div class='ctx'> 	struct ata_port *ap = link-&gt;ap;</div><div class='hunk'>@@ -1527,7 +1528,6 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class,</div><div class='ctx'> 	struct ahci_host_priv *hpriv = ap-&gt;host-&gt;private_data;</div><div class='ctx'> 	u8 *d2h_fis = pp-&gt;rx_fis + RX_FIS_D2H_REG;</div><div class='ctx'> 	struct ata_taskfile tf;</div><div class='del'>-	bool online;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='hunk'>@@ -1539,17 +1539,26 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class,</div><div class='ctx'> 	tf.command = ATA_BUSY;</div><div class='ctx'> 	ata_tf_to_fis(&amp;tf, 0, 0, d2h_fis);</div><div class='ctx'> </div><div class='del'>-	rc = sata_link_hardreset(link, timing, deadline, &amp;online,</div><div class='add'>+	rc = sata_link_hardreset(link, timing, deadline, online,</div><div class='ctx'> 				 ahci_check_ready);</div><div class='ctx'> </div><div class='ctx'> 	hpriv-&gt;start_engine(ap);</div><div class='ctx'> </div><div class='del'>-	if (online)</div><div class='add'>+	if (*online)</div><div class='ctx'> 		*class = ahci_dev_classify(ap);</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(ahci_do_hardreset);</div><div class='add'>+</div><div class='add'>+static int ahci_hardreset(struct ata_link *link, unsigned int *class,</div><div class='add'>+			  unsigned long deadline)</div><div class='add'>+{</div><div class='add'>+	bool online;</div><div class='add'>+</div><div class='add'>+	return ahci_do_hardreset(link, class, deadline, &amp;online);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void ahci_postreset(struct ata_link *link, unsigned int *class)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c<br/>index 223a770f78f3..ca75823697dd 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/libata-core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/libata-core.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/libata-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata-core.c</a></div><div class='hunk'>@@ -129,7 +129,7 @@ static int ata_force_tbl_size;</div><div class='ctx'> static char ata_force_param_buf[PAGE_SIZE] __initdata;</div><div class='ctx'> /* param_buf is thrown away after initialization, disallow read */</div><div class='ctx'> module_param_string(force, ata_force_param_buf, sizeof(ata_force_param_buf), 0);</div><div class='del'>-MODULE_PARM_DESC(force, "Force ATA configurations including cable type, link speed and transfer mode (see Documentation/kernel-parameters.txt for details)");</div><div class='add'>+MODULE_PARM_DESC(force, "Force ATA configurations including cable type, link speed and transfer mode (see Documentation/admin-guide/kernel-parameters.rst for details)");</div><div class='ctx'> </div><div class='ctx'> static int atapi_enabled = 1;</div><div class='ctx'> module_param(atapi_enabled, int, 0444);</div><div class='hunk'>@@ -739,6 +739,7 @@ u64 ata_tf_read_block(const struct ata_taskfile *tf, struct ata_device *dev)</div><div class='ctx'>  *	@n_block: Number of blocks</div><div class='ctx'>  *	@tf_flags: RW/FUA etc...</div><div class='ctx'>  *	@tag: tag</div><div class='add'>+ *	@class: IO priority class</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	None.</div><div class='hunk'>@@ -753,7 +754,7 @@ u64 ata_tf_read_block(const struct ata_taskfile *tf, struct ata_device *dev)</div><div class='ctx'>  */</div><div class='ctx'> int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,</div><div class='ctx'> 		    u64 block, u32 n_block, unsigned int tf_flags,</div><div class='del'>-		    unsigned int tag)</div><div class='add'>+		    unsigned int tag, int class)</div><div class='ctx'> {</div><div class='ctx'> 	tf-&gt;flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;</div><div class='ctx'> 	tf-&gt;flags |= tf_flags;</div><div class='hunk'>@@ -785,6 +786,12 @@ int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,</div><div class='ctx'> 		tf-&gt;device = ATA_LBA;</div><div class='ctx'> 		if (tf-&gt;flags &amp; ATA_TFLAG_FUA)</div><div class='ctx'> 			tf-&gt;device |= 1 &lt;&lt; 7;</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;flags &amp; ATA_DFLAG_NCQ_PRIO) {</div><div class='add'>+			if (class == IOPRIO_CLASS_RT)</div><div class='add'>+				tf-&gt;hob_nsect |= ATA_PRIO_HIGH &lt;&lt;</div><div class='add'>+						 ATA_SHIFT_PRIO;</div><div class='add'>+		}</div><div class='ctx'> 	} else if (dev-&gt;flags &amp; ATA_DFLAG_LBA) {</div><div class='ctx'> 		tf-&gt;flags |= ATA_TFLAG_LBA;</div><div class='ctx'> </div><div class='hunk'>@@ -1695,6 +1702,8 @@ unsigned ata_exec_internal_sg(struct ata_device *dev,</div><div class='ctx'> </div><div class='ctx'> 		if (qc-&gt;err_mask &amp; ~AC_ERR_OTHER)</div><div class='ctx'> 			qc-&gt;err_mask &amp;= ~AC_ERR_OTHER;</div><div class='add'>+	} else if (qc-&gt;tf.command == ATA_CMD_REQ_SENSE_DATA) {</div><div class='add'>+		qc-&gt;result_tf.command |= ATA_SENSE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* finish up */</div><div class='hunk'>@@ -2156,6 +2165,37 @@ static void ata_dev_config_ncq_non_data(struct ata_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ata_dev_config_ncq_prio(struct ata_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='add'>+	unsigned int err_mask;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;flags &amp; ATA_DFLAG_NCQ_PRIO_ENABLE)) {</div><div class='add'>+		dev-&gt;flags &amp;= ~ATA_DFLAG_NCQ_PRIO;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err_mask = ata_read_log_page(dev,</div><div class='add'>+				     ATA_LOG_SATA_ID_DEV_DATA,</div><div class='add'>+				     ATA_LOG_SATA_SETTINGS,</div><div class='add'>+				     ap-&gt;sector_buf,</div><div class='add'>+				     1);</div><div class='add'>+	if (err_mask) {</div><div class='add'>+		ata_dev_dbg(dev,</div><div class='add'>+			    "failed to get Identify Device data, Emask 0x%x\n",</div><div class='add'>+			    err_mask);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;sector_buf[ATA_LOG_NCQ_PRIO_OFFSET] &amp; BIT(3)) {</div><div class='add'>+		dev-&gt;flags |= ATA_DFLAG_NCQ_PRIO;</div><div class='add'>+	} else {</div><div class='add'>+		dev-&gt;flags &amp;= ~ATA_DFLAG_NCQ_PRIO;</div><div class='add'>+		ata_dev_dbg(dev, "SATA page does not support priority\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ata_dev_config_ncq(struct ata_device *dev,</div><div class='ctx'> 			       char *desc, size_t desc_sz)</div><div class='ctx'> {</div><div class='hunk'>@@ -2205,6 +2245,8 @@ static int ata_dev_config_ncq(struct ata_device *dev,</div><div class='ctx'> 			ata_dev_config_ncq_send_recv(dev);</div><div class='ctx'> 		if (ata_id_has_ncq_non_data(dev-&gt;id))</div><div class='ctx'> 			ata_dev_config_ncq_non_data(dev);</div><div class='add'>+		if (ata_id_has_ncq_prio(dev-&gt;id))</div><div class='add'>+			ata_dev_config_ncq_prio(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -4316,10 +4358,10 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {</div><div class='ctx'> 	{ "ST380013AS",		"3.20",		ATA_HORKAGE_MAX_SEC_1024 },</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Device times out with higher max sects.</div><div class='add'>+	 * These devices time out with higher max sects.</div><div class='ctx'> 	 * https://bugzilla.kernel.org/show_bug.cgi?id=121671</div><div class='ctx'> 	 */</div><div class='del'>-	{ "LITEON CX1-JB256-HP", NULL,		ATA_HORKAGE_MAX_SEC_1024 },</div><div class='add'>+	{ "LITEON CX1-JB*-HP",	NULL,		ATA_HORKAGE_MAX_SEC_1024 },</div><div class='ctx'> </div><div class='ctx'> 	/* Devices we expect to fail diagnostics */</div><div class='ctx'> </div><div class='hunk'>@@ -4774,32 +4816,6 @@ static unsigned int ata_dev_init_params(struct ata_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_sg_clean - Unmap DMA memory associated with command</div><div class='del'>- *	@qc: Command containing DMA memory to be released</div><div class='del'>- *</div><div class='del'>- *	Unmap all mapped DMA memory associated with this command.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	spin_lock_irqsave(host lock)</div><div class='del'>- */</div><div class='del'>-void ata_sg_clean(struct ata_queued_cmd *qc)</div><div class='del'>-{</div><div class='del'>-	struct ata_port *ap = qc-&gt;ap;</div><div class='del'>-	struct scatterlist *sg = qc-&gt;sg;</div><div class='del'>-	int dir = qc-&gt;dma_dir;</div><div class='del'>-</div><div class='del'>-	WARN_ON_ONCE(sg == NULL);</div><div class='del'>-</div><div class='del'>-	VPRINTK("unmapping %u sg elements\n", qc-&gt;n_elem);</div><div class='del'>-</div><div class='del'>-	if (qc-&gt;n_elem)</div><div class='del'>-		dma_unmap_sg(ap-&gt;dev, sg, qc-&gt;orig_n_elem, dir);</div><div class='del'>-</div><div class='del'>-	qc-&gt;flags &amp;= ~ATA_QCFLAG_DMAMAP;</div><div class='del'>-	qc-&gt;sg = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *	atapi_check_dma - Check whether ATAPI DMA can be supported</div><div class='ctx'>  *	@qc: Metadata associated with taskfile to check</div><div class='ctx'>  *</div><div class='hunk'>@@ -4883,6 +4899,34 @@ void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,</div><div class='ctx'> 	qc-&gt;cursg = qc-&gt;sg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HAS_DMA</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_sg_clean - Unmap DMA memory associated with command</div><div class='add'>+ *	@qc: Command containing DMA memory to be released</div><div class='add'>+ *</div><div class='add'>+ *	Unmap all mapped DMA memory associated with this command.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	spin_lock_irqsave(host lock)</div><div class='add'>+ */</div><div class='add'>+void ata_sg_clean(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+	struct scatterlist *sg = qc-&gt;sg;</div><div class='add'>+	int dir = qc-&gt;dma_dir;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(sg == NULL);</div><div class='add'>+</div><div class='add'>+	VPRINTK("unmapping %u sg elements\n", qc-&gt;n_elem);</div><div class='add'>+</div><div class='add'>+	if (qc-&gt;n_elem)</div><div class='add'>+		dma_unmap_sg(ap-&gt;dev, sg, qc-&gt;orig_n_elem, dir);</div><div class='add'>+</div><div class='add'>+	qc-&gt;flags &amp;= ~ATA_QCFLAG_DMAMAP;</div><div class='add'>+	qc-&gt;sg = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	ata_sg_setup - DMA-map the scatter-gather table associated with a command.</div><div class='ctx'>  *	@qc: Command with scatter-gather table to be mapped.</div><div class='hunk'>@@ -4915,6 +4959,13 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#else /* !CONFIG_HAS_DMA */</div><div class='add'>+</div><div class='add'>+static inline void ata_sg_clean(struct ata_queued_cmd *qc) {}</div><div class='add'>+static inline int ata_sg_setup(struct ata_queued_cmd *qc) { return -1; }</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_HAS_DMA */</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	swap_buf_le16 - swap halves of 16-bit words in place</div><div class='ctx'>  *	@buf:  Buffer to swap</div><div class='head'>diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c<br/>index 0e1ec37070d1..ef68232b5222 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/libata-eh.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/libata-eh.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/libata-eh.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata-eh.c</a></div><div class='hunk'>@@ -549,6 +549,7 @@ enum blk_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd)</div><div class='ctx'> 	DPRINTK("EXIT, ret=%d\n", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ata_scsi_timed_out);</div><div class='ctx'> </div><div class='ctx'> static void ata_eh_unload(struct ata_port *ap)</div><div class='ctx'> {</div><div class='hunk'>@@ -2033,7 +2034,7 @@ static int speed_down_verdict_cb(struct ata_ering_entry *ent, void *void_arg)</div><div class='ctx'>  *	This is to expedite speed down decisions right after device is</div><div class='ctx'>  *	initially configured.</div><div class='ctx'>  *</div><div class='del'>- *	The followings are speed down rules.  #1 and #2 deal with</div><div class='add'>+ *	The following are speed down rules.  #1 and #2 deal with</div><div class='ctx'>  *	DUBIOUS errors.</div><div class='ctx'>  *</div><div class='ctx'>  *	1. If more than one DUBIOUS_ATA_BUS or DUBIOUS_TOUT_HSM errors</div><div class='hunk'>@@ -2606,21 +2607,39 @@ static void ata_eh_link_report(struct ata_link *link)</div><div class='ctx'> 				[DMA_TO_DEVICE]		= "out",</div><div class='ctx'> 				[DMA_FROM_DEVICE]	= "in",</div><div class='ctx'> 			};</div><div class='del'>-			static const char *prot_str[] = {</div><div class='del'>-				[ATA_PROT_UNKNOWN]	= "unknown",</div><div class='del'>-				[ATA_PROT_NODATA]	= "nodata",</div><div class='del'>-				[ATA_PROT_PIO]		= "pio",</div><div class='del'>-				[ATA_PROT_DMA]		= "dma",</div><div class='del'>-				[ATA_PROT_NCQ]		= "ncq dma",</div><div class='del'>-				[ATA_PROT_NCQ_NODATA]	= "ncq nodata",</div><div class='del'>-				[ATAPI_PROT_NODATA]	= "nodata",</div><div class='del'>-				[ATAPI_PROT_PIO]	= "pio",</div><div class='del'>-				[ATAPI_PROT_DMA]	= "dma",</div><div class='del'>-			};</div><div class='add'>+			const char *prot_str = NULL;</div><div class='ctx'> </div><div class='add'>+			switch (qc-&gt;tf.protocol) {</div><div class='add'>+			case ATA_PROT_UNKNOWN:</div><div class='add'>+				prot_str = "unknown";</div><div class='add'>+				break;</div><div class='add'>+			case ATA_PROT_NODATA:</div><div class='add'>+				prot_str = "nodata";</div><div class='add'>+				break;</div><div class='add'>+			case ATA_PROT_PIO:</div><div class='add'>+				prot_str = "pio";</div><div class='add'>+				break;</div><div class='add'>+			case ATA_PROT_DMA:</div><div class='add'>+				prot_str = "dma";</div><div class='add'>+				break;</div><div class='add'>+			case ATA_PROT_NCQ:</div><div class='add'>+				prot_str = "ncq dma";</div><div class='add'>+				break;</div><div class='add'>+			case ATA_PROT_NCQ_NODATA:</div><div class='add'>+				prot_str = "ncq nodata";</div><div class='add'>+				break;</div><div class='add'>+			case ATAPI_PROT_NODATA:</div><div class='add'>+				prot_str = "nodata";</div><div class='add'>+				break;</div><div class='add'>+			case ATAPI_PROT_PIO:</div><div class='add'>+				prot_str = "pio";</div><div class='add'>+				break;</div><div class='add'>+			case ATAPI_PROT_DMA:</div><div class='add'>+				prot_str = "dma";</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			snprintf(data_buf, sizeof(data_buf), " %s %u %s",</div><div class='del'>-				 prot_str[qc-&gt;tf.protocol], qc-&gt;nbytes,</div><div class='del'>-				 dma_str[qc-&gt;dma_dir]);</div><div class='add'>+				 prot_str, qc-&gt;nbytes, dma_str[qc-&gt;dma_dir]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ata_is_atapi(qc-&gt;tf.protocol)) {</div><div class='head'>diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c<br/>index 8e575fbdf31d..1ac70744ae7b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/libata-scsi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/libata-scsi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/libata-scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata-scsi.c</a></div><div class='hunk'>@@ -50,6 +50,7 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/ioprio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "libata.h"</div><div class='ctx'> #include "libata-transport.h"</div><div class='hunk'>@@ -270,6 +271,83 @@ DEVICE_ATTR(unload_heads, S_IRUGO | S_IWUSR,</div><div class='ctx'> 	    ata_scsi_park_show, ata_scsi_park_store);</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_attr_unload_heads);</div><div class='ctx'> </div><div class='add'>+static ssize_t ata_ncq_prio_enable_show(struct device *device,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					char *buf)</div><div class='add'>+{</div><div class='add'>+	struct scsi_device *sdev = to_scsi_device(device);</div><div class='add'>+	struct ata_port *ap;</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	bool ncq_prio_enable;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	ap = ata_shost_to_port(sdev-&gt;host);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(ap-&gt;lock);</div><div class='add'>+	dev = ata_scsi_find_dev(ap, sdev);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ncq_prio_enable = dev-&gt;flags &amp; ATA_DFLAG_NCQ_PRIO_ENABLE;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_irq(ap-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return rc ? rc : snprintf(buf, 20, "%u\n", ncq_prio_enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ata_ncq_prio_enable_store(struct device *device,</div><div class='add'>+					 struct device_attribute *attr,</div><div class='add'>+					 const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct scsi_device *sdev = to_scsi_device(device);</div><div class='add'>+	struct ata_port *ap;</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	long int input;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = kstrtol(buf, 10, &amp;input);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	if ((input &lt; 0) || (input &gt; 1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ap = ata_shost_to_port(sdev-&gt;host);</div><div class='add'>+	dev = ata_scsi_find_dev(ap, sdev);</div><div class='add'>+	if (unlikely(!dev))</div><div class='add'>+		return  -ENODEV;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(ap-&gt;lock);</div><div class='add'>+	if (input)</div><div class='add'>+		dev-&gt;flags |= ATA_DFLAG_NCQ_PRIO_ENABLE;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;flags &amp;= ~ATA_DFLAG_NCQ_PRIO_ENABLE;</div><div class='add'>+</div><div class='add'>+	dev-&gt;link-&gt;eh_info.action |= ATA_EH_REVALIDATE;</div><div class='add'>+	dev-&gt;link-&gt;eh_info.flags |= ATA_EHI_QUIET;</div><div class='add'>+	ata_port_schedule_eh(ap);</div><div class='add'>+	spin_unlock_irq(ap-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ata_port_wait_eh(ap);</div><div class='add'>+</div><div class='add'>+	if (input) {</div><div class='add'>+		spin_lock_irq(ap-&gt;lock);</div><div class='add'>+		if (!(dev-&gt;flags &amp; ATA_DFLAG_NCQ_PRIO)) {</div><div class='add'>+			dev-&gt;flags &amp;= ~ATA_DFLAG_NCQ_PRIO_ENABLE;</div><div class='add'>+			rc = -EIO;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irq(ap-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc ? rc : len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR,</div><div class='add'>+	    ata_ncq_prio_enable_show, ata_ncq_prio_enable_store);</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_attr_ncq_prio_enable);</div><div class='add'>+</div><div class='ctx'> void ata_scsi_set_sense(struct ata_device *dev, struct scsi_cmnd *cmd,</div><div class='ctx'> 			u8 sk, u8 asc, u8 ascq)</div><div class='ctx'> {</div><div class='hunk'>@@ -401,17 +479,11 @@ EXPORT_SYMBOL_GPL(dev_attr_sw_activity);</div><div class='ctx'> </div><div class='ctx'> struct device_attribute *ata_common_sdev_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_unload_heads,</div><div class='add'>+	&amp;dev_attr_ncq_prio_enable,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_common_sdev_attrs);</div><div class='ctx'> </div><div class='del'>-static void ata_scsi_invalid_field(struct ata_device *dev,</div><div class='del'>-				   struct scsi_cmnd *cmd, u16 field)</div><div class='del'>-{</div><div class='del'>-	ata_scsi_set_invalid_field(dev, cmd, field, 0xff);</div><div class='del'>-	cmd-&gt;scsi_done(cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	ata_std_bios_param - generic bios head/sector/cylinder calculator used by sd.</div><div class='ctx'>  *	@sdev: SCSI device for which BIOS geometry is to be determined</div><div class='hunk'>@@ -528,6 +600,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)</div><div class='ctx'> 	u8 args[4], *argbuf = NULL, *sensebuf = NULL;</div><div class='ctx'> 	int argsize = 0;</div><div class='ctx'> 	enum dma_data_direction data_dir;</div><div class='add'>+	struct scsi_sense_hdr sshdr;</div><div class='ctx'> 	int cmd_result;</div><div class='ctx'> </div><div class='ctx'> 	if (arg == NULL)</div><div class='hunk'>@@ -576,7 +649,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)</div><div class='ctx'> 	/* Good values for timeout and retries?  Values below</div><div class='ctx'> 	   from scsi_ioctl_send_command() for default case... */</div><div class='ctx'> 	cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize,</div><div class='del'>-				  sensebuf, (10*HZ), 5, 0, NULL);</div><div class='add'>+				  sensebuf, &amp;sshdr, (10*HZ), 5, 0, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */</div><div class='ctx'> 		u8 *desc = sensebuf + 8;</div><div class='hunk'>@@ -585,9 +658,6 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)</div><div class='ctx'> 		/* If we set cc then ATA pass-through will cause a</div><div class='ctx'> 		 * check condition even if no error. Filter that. */</div><div class='ctx'> 		if (cmd_result &amp; SAM_STAT_CHECK_CONDITION) {</div><div class='del'>-			struct scsi_sense_hdr sshdr;</div><div class='del'>-			scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE,</div><div class='del'>-					     &amp;sshdr);</div><div class='ctx'> 			if (sshdr.sense_key == RECOVERED_ERROR &amp;&amp;</div><div class='ctx'> 			    sshdr.asc == 0 &amp;&amp; sshdr.ascq == 0x1d)</div><div class='ctx'> 				cmd_result &amp;= ~SAM_STAT_CHECK_CONDITION;</div><div class='hunk'>@@ -635,6 +705,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg)</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	u8 scsi_cmd[MAX_COMMAND_SIZE];</div><div class='ctx'> 	u8 args[7], *sensebuf = NULL;</div><div class='add'>+	struct scsi_sense_hdr sshdr;</div><div class='ctx'> 	int cmd_result;</div><div class='ctx'> </div><div class='ctx'> 	if (arg == NULL)</div><div class='hunk'>@@ -662,7 +733,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg)</div><div class='ctx'> 	/* Good values for timeout and retries?  Values below</div><div class='ctx'> 	   from scsi_ioctl_send_command() for default case... */</div><div class='ctx'> 	cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0,</div><div class='del'>-				sensebuf, (10*HZ), 5, 0, NULL);</div><div class='add'>+				sensebuf, &amp;sshdr, (10*HZ), 5, 0, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */</div><div class='ctx'> 		u8 *desc = sensebuf + 8;</div><div class='hunk'>@@ -671,9 +742,6 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg)</div><div class='ctx'> 		/* If we set cc then ATA pass-through will cause a</div><div class='ctx'> 		 * check condition even if no error. Filter that. */</div><div class='ctx'> 		if (cmd_result &amp; SAM_STAT_CHECK_CONDITION) {</div><div class='del'>-			struct scsi_sense_hdr sshdr;</div><div class='del'>-			scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE,</div><div class='del'>-						&amp;sshdr);</div><div class='ctx'> 			if (sshdr.sense_key == RECOVERED_ERROR &amp;&amp;</div><div class='ctx'> 			    sshdr.asc == 0 &amp;&amp; sshdr.ascq == 0x1d)</div><div class='ctx'> 				cmd_result &amp;= ~SAM_STAT_CHECK_CONDITION;</div><div class='hunk'>@@ -1186,13 +1254,13 @@ static void ata_scsi_sdev_config(struct scsi_device *sdev)</div><div class='ctx'>  */</div><div class='ctx'> static int atapi_drain_needed(struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	if (likely(rq-&gt;cmd_type != REQ_TYPE_BLOCK_PC))</div><div class='add'>+	if (likely(!blk_rq_is_passthrough(rq)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!blk_rq_bytes(rq) || op_is_write(req_op(rq)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return atapi_cmd_type(rq-&gt;cmd[0]) == ATAPI_MISC;</div><div class='add'>+	return atapi_cmd_type(scsi_req(rq)-&gt;cmd[0]) == ATAPI_MISC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ata_scsi_dev_config(struct scsi_device *sdev,</div><div class='hunk'>@@ -1756,6 +1824,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_cmnd *scmd = qc-&gt;scsicmd;</div><div class='ctx'> 	const u8 *cdb = scmd-&gt;cmnd;</div><div class='add'>+	struct request *rq = scmd-&gt;request;</div><div class='add'>+	int class = IOPRIO_PRIO_CLASS(req_get_ioprio(rq));</div><div class='ctx'> 	unsigned int tf_flags = 0;</div><div class='ctx'> 	u64 block;</div><div class='ctx'> 	u32 n_block;</div><div class='hunk'>@@ -1822,7 +1892,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc)</div><div class='ctx'> 	qc-&gt;nbytes = n_block * scmd-&gt;device-&gt;sector_size;</div><div class='ctx'> </div><div class='ctx'> 	rc = ata_build_rw_tf(&amp;qc-&gt;tf, qc-&gt;dev, block, n_block, tf_flags,</div><div class='del'>-			     qc-&gt;tag);</div><div class='add'>+			     qc-&gt;tag, class);</div><div class='add'>+</div><div class='ctx'> 	if (likely(rc == 0))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1975,6 +2046,12 @@ defer:</div><div class='ctx'> 		return SCSI_MLQUEUE_HOST_BUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct ata_scsi_args {</div><div class='add'>+	struct ata_device	*dev;</div><div class='add'>+	u16			*id;</div><div class='add'>+	struct scsi_cmnd	*cmd;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	ata_scsi_rbuf_get - Map response buffer.</div><div class='ctx'>  *	@cmd: SCSI command containing buffer to be mapped.</div><div class='hunk'>@@ -2051,7 +2128,6 @@ static void ata_scsi_rbuf_fill(struct ata_scsi_args *args,</div><div class='ctx'> </div><div class='ctx'> 	if (rc == 0)</div><div class='ctx'> 		cmd-&gt;result = SAM_STAT_GOOD;</div><div class='del'>-	args-&gt;done(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2373,23 +2449,6 @@ static unsigned int ata_scsiop_inq_b6(struct ata_scsi_args *args, u8 *rbuf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_scsiop_noop - Command handler that simply returns success.</div><div class='del'>- *	@args: device IDENTIFY data / SCSI command of interest.</div><div class='del'>- *	@rbuf: Response buffer, to which simulated SCSI cmd output is sent.</div><div class='del'>- *</div><div class='del'>- *	No operation.  Simply returns success to caller, to indicate</div><div class='del'>- *	that the caller should successfully complete this SCSI command.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	spin_lock_irqsave(host lock)</div><div class='del'>- */</div><div class='del'>-static unsigned int ata_scsiop_noop(struct ata_scsi_args *args, u8 *rbuf)</div><div class='del'>-{</div><div class='del'>-	VPRINTK("ENTER\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *	modecpy - Prepare response for MODE SENSE</div><div class='ctx'>  *	@dest: output buffer</div><div class='ctx'>  *	@src: data being copied</div><div class='hunk'>@@ -2791,6 +2850,26 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)</div><div class='ctx'> 	DPRINTK("EXIT\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * ATAPI devices typically report zero for their SCSI version, and sometimes</div><div class='add'>+ * deviate from the spec WRT response data format.  If SCSI version is</div><div class='add'>+ * reported as zero like normal, then we make the following fixups:</div><div class='add'>+ *   1) Fake MMC-5 version, to indicate to the Linux scsi midlayer this is a</div><div class='add'>+ *	modern device.</div><div class='add'>+ *   2) Ensure response data format / ATAPI information are always correct.</div><div class='add'>+ */</div><div class='add'>+static void atapi_fixup_inquiry(struct scsi_cmnd *cmd)</div><div class='add'>+{</div><div class='add'>+	u8 buf[4];</div><div class='add'>+</div><div class='add'>+	sg_copy_to_buffer(scsi_sglist(cmd), scsi_sg_count(cmd), buf, 4);</div><div class='add'>+	if (buf[2] == 0) {</div><div class='add'>+		buf[2] = 0x5;</div><div class='add'>+		buf[3] = 0x32;</div><div class='add'>+	}</div><div class='add'>+	sg_copy_from_buffer(scsi_sglist(cmd), scsi_sg_count(cmd), buf, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void atapi_qc_complete(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_cmnd *cmd = qc-&gt;scsicmd;</div><div class='hunk'>@@ -2845,30 +2924,8 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ata_gen_passthru_sense(qc);</div><div class='ctx'> 	} else {</div><div class='del'>-		u8 *scsicmd = cmd-&gt;cmnd;</div><div class='del'>-</div><div class='del'>-		if ((scsicmd[0] == INQUIRY) &amp;&amp; ((scsicmd[1] &amp; 0x03) == 0)) {</div><div class='del'>-			unsigned long flags;</div><div class='del'>-			u8 *buf;</div><div class='del'>-</div><div class='del'>-			buf = ata_scsi_rbuf_get(cmd, true, &amp;flags);</div><div class='del'>-</div><div class='del'>-	/* ATAPI devices typically report zero for their SCSI version,</div><div class='del'>-	 * and sometimes deviate from the spec WRT response data</div><div class='del'>-	 * format.  If SCSI version is reported as zero like normal,</div><div class='del'>-	 * then we make the following fixups:  1) Fake MMC-5 version,</div><div class='del'>-	 * to indicate to the Linux scsi midlayer this is a modern</div><div class='del'>-	 * device.  2) Ensure response data format / ATAPI information</div><div class='del'>-	 * are always correct.</div><div class='del'>-	 */</div><div class='del'>-			if (buf[2] == 0) {</div><div class='del'>-				buf[2] = 0x5;</div><div class='del'>-				buf[3] = 0x32;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ata_scsi_rbuf_put(cmd, true, &amp;flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		if (cmd-&gt;cmnd[0] == INQUIRY &amp;&amp; (cmd-&gt;cmnd[1] &amp; 0x03) == 0)</div><div class='add'>+			atapi_fixup_inquiry(cmd);</div><div class='ctx'> 		cmd-&gt;result = SAM_STAT_GOOD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4270,12 +4327,11 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 	args.dev = dev;</div><div class='ctx'> 	args.id = dev-&gt;id;</div><div class='ctx'> 	args.cmd = cmd;</div><div class='del'>-	args.done = cmd-&gt;scsi_done;</div><div class='ctx'> </div><div class='ctx'> 	switch(scsicmd[0]) {</div><div class='ctx'> 	case INQUIRY:</div><div class='ctx'> 		if (scsicmd[1] &amp; 2)		   /* is CmdDt set?  */</div><div class='del'>-		    ata_scsi_invalid_field(dev, cmd, 1);</div><div class='add'>+			ata_scsi_set_invalid_field(dev, cmd, 1, 0xff);</div><div class='ctx'> 		else if ((scsicmd[1] &amp; 1) == 0)    /* is EVPD clear? */</div><div class='ctx'> 			ata_scsi_rbuf_fill(&amp;args, ata_scsiop_inq_std);</div><div class='ctx'> 		else switch (scsicmd[2]) {</div><div class='hunk'>@@ -4307,7 +4363,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Fallthrough */</div><div class='ctx'> 		default:</div><div class='del'>-			ata_scsi_invalid_field(dev, cmd, 2);</div><div class='add'>+			ata_scsi_set_invalid_field(dev, cmd, 2, 0xff);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -4325,7 +4381,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 		if ((scsicmd[1] &amp; 0x1f) == SAI_READ_CAPACITY_16)</div><div class='ctx'> 			ata_scsi_rbuf_fill(&amp;args, ata_scsiop_read_cap);</div><div class='ctx'> 		else</div><div class='del'>-			ata_scsi_invalid_field(dev, cmd, 1);</div><div class='add'>+			ata_scsi_set_invalid_field(dev, cmd, 1, 0xff);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case REPORT_LUNS:</div><div class='hunk'>@@ -4335,7 +4391,6 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 	case REQUEST_SENSE:</div><div class='ctx'> 		ata_scsi_set_sense(dev, cmd, 0, 0, 0);</div><div class='ctx'> 		cmd-&gt;result = (DRIVER_SENSE &lt;&lt; 24);</div><div class='del'>-		cmd-&gt;scsi_done(cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	/* if we reach this, then writeback caching is disabled,</div><div class='hunk'>@@ -4349,31 +4404,29 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 	case SEEK_6:</div><div class='ctx'> 	case SEEK_10:</div><div class='ctx'> 	case TEST_UNIT_READY:</div><div class='del'>-		ata_scsi_rbuf_fill(&amp;args, ata_scsiop_noop);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SEND_DIAGNOSTIC:</div><div class='ctx'> 		tmp8 = scsicmd[1] &amp; ~(1 &lt;&lt; 3);</div><div class='del'>-		if ((tmp8 == 0x4) &amp;&amp; (!scsicmd[3]) &amp;&amp; (!scsicmd[4]))</div><div class='del'>-			ata_scsi_rbuf_fill(&amp;args, ata_scsiop_noop);</div><div class='del'>-		else</div><div class='del'>-			ata_scsi_invalid_field(dev, cmd, 1);</div><div class='add'>+		if (tmp8 != 0x4 || scsicmd[3] || scsicmd[4])</div><div class='add'>+			ata_scsi_set_invalid_field(dev, cmd, 1, 0xff);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MAINTENANCE_IN:</div><div class='ctx'> 		if (scsicmd[1] == MI_REPORT_SUPPORTED_OPERATION_CODES)</div><div class='ctx'> 			ata_scsi_rbuf_fill(&amp;args, ata_scsiop_maint_in);</div><div class='ctx'> 		else</div><div class='del'>-			ata_scsi_invalid_field(dev, cmd, 1);</div><div class='add'>+			ata_scsi_set_invalid_field(dev, cmd, 1, 0xff);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	/* all other commands */</div><div class='ctx'> 	default:</div><div class='ctx'> 		ata_scsi_set_sense(dev, cmd, ILLEGAL_REQUEST, 0x20, 0x0);</div><div class='ctx'> 		/* "Invalid command operation code" */</div><div class='del'>-		cmd-&gt;scsi_done(cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;scsi_done(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)</div><div class='head'>diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c<br/>index 051b6158d1b7..2bd92dca3e62 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/libata-sff.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/libata-sff.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/libata-sff.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata-sff.c</a></div><div class='hunk'>@@ -542,7 +542,7 @@ static inline void ata_tf_to_host(struct ata_port *ap,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_sff_data_xfer - Transfer data by PIO</div><div class='del'>- *	@dev: device to target</div><div class='add'>+ *	@qc: queued command</div><div class='ctx'>  *	@buf: data buffer</div><div class='ctx'>  *	@buflen: buffer length</div><div class='ctx'>  *	@rw: read/write</div><div class='hunk'>@@ -555,10 +555,10 @@ static inline void ata_tf_to_host(struct ata_port *ap,</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	Bytes consumed.</div><div class='ctx'>  */</div><div class='del'>-unsigned int ata_sff_data_xfer(struct ata_device *dev, unsigned char *buf,</div><div class='add'>+unsigned int ata_sff_data_xfer(struct ata_queued_cmd *qc, unsigned char *buf,</div><div class='ctx'> 			       unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='add'>+	struct ata_port *ap = qc-&gt;dev-&gt;link-&gt;ap;</div><div class='ctx'> 	void __iomem *data_addr = ap-&gt;ioaddr.data_addr;</div><div class='ctx'> 	unsigned int words = buflen &gt;&gt; 1;</div><div class='ctx'> </div><div class='hunk'>@@ -595,7 +595,7 @@ EXPORT_SYMBOL_GPL(ata_sff_data_xfer);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_sff_data_xfer32 - Transfer data by PIO</div><div class='del'>- *	@dev: device to target</div><div class='add'>+ *	@qc: queued command</div><div class='ctx'>  *	@buf: data buffer</div><div class='ctx'>  *	@buflen: buffer length</div><div class='ctx'>  *	@rw: read/write</div><div class='hunk'>@@ -610,16 +610,17 @@ EXPORT_SYMBOL_GPL(ata_sff_data_xfer);</div><div class='ctx'>  *	Bytes consumed.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-unsigned int ata_sff_data_xfer32(struct ata_device *dev, unsigned char *buf,</div><div class='add'>+unsigned int ata_sff_data_xfer32(struct ata_queued_cmd *qc, unsigned char *buf,</div><div class='ctx'> 			       unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='add'>+	struct ata_device *dev = qc-&gt;dev;</div><div class='ctx'> 	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='ctx'> 	void __iomem *data_addr = ap-&gt;ioaddr.data_addr;</div><div class='ctx'> 	unsigned int words = buflen &gt;&gt; 2;</div><div class='ctx'> 	int slop = buflen &amp; 3;</div><div class='ctx'> </div><div class='ctx'> 	if (!(ap-&gt;pflags &amp; ATA_PFLAG_PIO32))</div><div class='del'>-		return ata_sff_data_xfer(dev, buf, buflen, rw);</div><div class='add'>+		return ata_sff_data_xfer(qc, buf, buflen, rw);</div><div class='ctx'> </div><div class='ctx'> 	/* Transfer multiple of 4 bytes */</div><div class='ctx'> 	if (rw == READ)</div><div class='hunk'>@@ -658,7 +659,7 @@ EXPORT_SYMBOL_GPL(ata_sff_data_xfer32);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_sff_data_xfer_noirq - Transfer data by PIO</div><div class='del'>- *	@dev: device to target</div><div class='add'>+ *	@qc: queued command</div><div class='ctx'>  *	@buf: data buffer</div><div class='ctx'>  *	@buflen: buffer length</div><div class='ctx'>  *	@rw: read/write</div><div class='hunk'>@@ -672,14 +673,14 @@ EXPORT_SYMBOL_GPL(ata_sff_data_xfer32);</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	Bytes consumed.</div><div class='ctx'>  */</div><div class='del'>-unsigned int ata_sff_data_xfer_noirq(struct ata_device *dev, unsigned char *buf,</div><div class='add'>+unsigned int ata_sff_data_xfer_noirq(struct ata_queued_cmd *qc, unsigned char *buf,</div><div class='ctx'> 				     unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int consumed;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='del'>-	consumed = ata_sff_data_xfer32(dev, buf, buflen, rw);</div><div class='add'>+	consumed = ata_sff_data_xfer32(qc, buf, buflen, rw);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 	return consumed;</div><div class='hunk'>@@ -723,14 +724,14 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)</div><div class='ctx'> 		buf = kmap_atomic(page);</div><div class='ctx'> </div><div class='ctx'> 		/* do the actual data transfer */</div><div class='del'>-		ap-&gt;ops-&gt;sff_data_xfer(qc-&gt;dev, buf + offset, qc-&gt;sect_size,</div><div class='add'>+		ap-&gt;ops-&gt;sff_data_xfer(qc, buf + offset, qc-&gt;sect_size,</div><div class='ctx'> 				       do_write);</div><div class='ctx'> </div><div class='ctx'> 		kunmap_atomic(buf);</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		buf = page_address(page);</div><div class='del'>-		ap-&gt;ops-&gt;sff_data_xfer(qc-&gt;dev, buf + offset, qc-&gt;sect_size,</div><div class='add'>+		ap-&gt;ops-&gt;sff_data_xfer(qc, buf + offset, qc-&gt;sect_size,</div><div class='ctx'> 				       do_write);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -791,7 +792,7 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc)</div><div class='ctx'> 	DPRINTK("send cdb\n");</div><div class='ctx'> 	WARN_ON_ONCE(qc-&gt;dev-&gt;cdb_len &lt; 12);</div><div class='ctx'> </div><div class='del'>-	ap-&gt;ops-&gt;sff_data_xfer(qc-&gt;dev, qc-&gt;cdb, qc-&gt;dev-&gt;cdb_len, 1);</div><div class='add'>+	ap-&gt;ops-&gt;sff_data_xfer(qc, qc-&gt;cdb, qc-&gt;dev-&gt;cdb_len, 1);</div><div class='ctx'> 	ata_sff_sync(ap);</div><div class='ctx'> 	/* FIXME: If the CDB is for DMA do we need to do the transition delay</div><div class='ctx'> 	   or is bmdma_start guaranteed to do it ? */</div><div class='hunk'>@@ -868,14 +869,14 @@ next_sg:</div><div class='ctx'> 		buf = kmap_atomic(page);</div><div class='ctx'> </div><div class='ctx'> 		/* do the actual data transfer */</div><div class='del'>-		consumed = ap-&gt;ops-&gt;sff_data_xfer(dev,  buf + offset,</div><div class='add'>+		consumed = ap-&gt;ops-&gt;sff_data_xfer(qc, buf + offset,</div><div class='ctx'> 								count, rw);</div><div class='ctx'> </div><div class='ctx'> 		kunmap_atomic(buf);</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		buf = page_address(page);</div><div class='del'>-		consumed = ap-&gt;ops-&gt;sff_data_xfer(dev,  buf + offset,</div><div class='add'>+		consumed = ap-&gt;ops-&gt;sff_data_xfer(qc, buf + offset,</div><div class='ctx'> 								count, rw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2427,11 +2428,21 @@ int ata_pci_sff_activate_host(struct ata_host *host,</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	if ((pdev-&gt;class &gt;&gt; 8) == PCI_CLASS_STORAGE_IDE) {</div><div class='del'>-		u8 tmp8, mask;</div><div class='add'>+		u8 tmp8, mask = 0;</div><div class='ctx'> </div><div class='del'>-		/* TODO: What if one channel is in native mode ... */</div><div class='add'>+		/*</div><div class='add'>+		 * ATA spec says we should use legacy mode when one</div><div class='add'>+		 * port is in legacy mode, but disabled ports on some</div><div class='add'>+		 * PCI hosts appear as fixed legacy ports, e.g SB600/700</div><div class='add'>+		 * on which the secondary port is not wired, so</div><div class='add'>+		 * ignore ports that are marked as 'dummy' during</div><div class='add'>+		 * this check</div><div class='add'>+		 */</div><div class='ctx'> 		pci_read_config_byte(pdev, PCI_CLASS_PROG, &amp;tmp8);</div><div class='del'>-		mask = (1 &lt;&lt; 2) | (1 &lt;&lt; 0);</div><div class='add'>+		if (!ata_port_is_dummy(host-&gt;ports[0]))</div><div class='add'>+			mask |= (1 &lt;&lt; 0);</div><div class='add'>+		if (!ata_port_is_dummy(host-&gt;ports[1]))</div><div class='add'>+			mask |= (1 &lt;&lt; 2);</div><div class='ctx'> 		if ((tmp8 &amp; mask) != mask)</div><div class='ctx'> 			legacy_mode = 1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c<br/>index 7ef16c085058..46698232e6bf 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/libata-transport.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/libata-transport.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/libata-transport.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata-transport.c</a></div><div class='hunk'>@@ -716,7 +716,6 @@ struct scsi_transport_template *ata_attach_transport(void)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	i-&gt;t.eh_strategy_handler	= ata_scsi_error;</div><div class='del'>-	i-&gt;t.eh_timed_out		= ata_scsi_timed_out;</div><div class='ctx'> 	i-&gt;t.user_scan			= ata_scsi_user_scan;</div><div class='ctx'> </div><div class='ctx'> 	i-&gt;t.host_attrs.ac.attrs = &amp;i-&gt;port_attrs[0];</div><div class='head'>diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h<br/>index 3b301a48007c..120fce0befd3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/libata.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/libata.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/libata.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/libata.h</a></div><div class='hunk'>@@ -31,13 +31,6 @@</div><div class='ctx'> #define DRV_NAME	"libata"</div><div class='ctx'> #define DRV_VERSION	"3.00"	/* must be exactly four chars */</div><div class='ctx'> </div><div class='del'>-struct ata_scsi_args {</div><div class='del'>-	struct ata_device	*dev;</div><div class='del'>-	u16			*id;</div><div class='del'>-	struct scsi_cmnd	*cmd;</div><div class='del'>-	void			(*done)(struct scsi_cmnd *);</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* libata-core.c */</div><div class='ctx'> enum {</div><div class='ctx'> 	/* flags for ata_dev_read_id() */</div><div class='hunk'>@@ -66,7 +59,7 @@ extern u64 ata_tf_to_lba48(const struct ata_taskfile *tf);</div><div class='ctx'> extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev, int tag);</div><div class='ctx'> extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,</div><div class='ctx'> 			   u64 block, u32 n_block, unsigned int tf_flags,</div><div class='del'>-			   unsigned int tag);</div><div class='add'>+			   unsigned int tag, int class);</div><div class='ctx'> extern u64 ata_tf_read_block(const struct ata_taskfile *tf,</div><div class='ctx'> 			     struct ata_device *dev);</div><div class='ctx'> extern unsigned ata_exec_internal(struct ata_device *dev,</div><div class='hunk'>@@ -89,7 +82,6 @@ extern int sata_down_spd_limit(struct ata_link *link, u32 spd_limit);</div><div class='ctx'> extern int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel);</div><div class='ctx'> extern unsigned int ata_dev_set_feature(struct ata_device *dev,</div><div class='ctx'> 					u8 enable, u8 feature);</div><div class='del'>-extern void ata_sg_clean(struct ata_queued_cmd *qc);</div><div class='ctx'> extern void ata_qc_free(struct ata_queued_cmd *qc);</div><div class='ctx'> extern void ata_qc_issue(struct ata_queued_cmd *qc);</div><div class='ctx'> extern void __ata_qc_complete(struct ata_queued_cmd *qc);</div><div class='hunk'>@@ -159,7 +151,6 @@ extern unsigned long ata_internal_cmd_timeout(struct ata_device *dev, u8 cmd);</div><div class='ctx'> extern void ata_internal_cmd_timed_out(struct ata_device *dev, u8 cmd);</div><div class='ctx'> extern void ata_eh_acquire(struct ata_port *ap);</div><div class='ctx'> extern void ata_eh_release(struct ata_port *ap);</div><div class='del'>-extern enum blk_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);</div><div class='ctx'> extern void ata_scsi_error(struct Scsi_Host *host);</div><div class='ctx'> extern void ata_eh_fastdrain_timerfn(unsigned long arg);</div><div class='ctx'> extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc);</div><div class='head'>diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c<br/>index 1611e0e8d767..fd5b34f0d007 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/pata_at91.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/pata_at91.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_at91.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_at91.c</a></div><div class='hunk'>@@ -286,10 +286,10 @@ static void pata_at91_set_piomode(struct ata_port *ap, struct ata_device *adev)</div><div class='ctx'> 	set_smc_timing(ap-&gt;dev, adev, info, &amp;timing);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int pata_at91_data_xfer_noirq(struct ata_device *dev,</div><div class='add'>+static unsigned int pata_at91_data_xfer_noirq(struct ata_queued_cmd *qc,</div><div class='ctx'> 		unsigned char *buf, unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='del'>-	struct at91_ide_info *info = dev-&gt;link-&gt;ap-&gt;host-&gt;private_data;</div><div class='add'>+	struct at91_ide_info *info = qc-&gt;dev-&gt;link-&gt;ap-&gt;host-&gt;private_data;</div><div class='ctx'> 	unsigned int consumed;</div><div class='ctx'> 	unsigned int mode;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -301,7 +301,7 @@ static unsigned int pata_at91_data_xfer_noirq(struct ata_device *dev,</div><div class='ctx'> 	regmap_fields_write(fields.mode, info-&gt;cs, (mode &amp; ~AT91_SMC_DBW) |</div><div class='ctx'> 			    AT91_SMC_DBW_16);</div><div class='ctx'> </div><div class='del'>-	consumed = ata_sff_data_xfer(dev, buf, buflen, rw);</div><div class='add'>+	consumed = ata_sff_data_xfer(qc, buf, buflen, rw);</div><div class='ctx'> </div><div class='ctx'> 	/* restore 8bit mode after data is written */</div><div class='ctx'> 	regmap_fields_write(fields.mode, info-&gt;cs, (mode &amp; ~AT91_SMC_DBW) |</div><div class='head'>diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c<br/>index 49d705c9f0f7..6c9aa95a9a05 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/pata_atiixp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/pata_atiixp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_atiixp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_atiixp.c</a></div><div class='hunk'>@@ -278,6 +278,11 @@ static int atiixp_init_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	};</div><div class='ctx'> 	const struct ata_port_info *ppi[] = { &amp;info, &amp;info };</div><div class='ctx'> </div><div class='add'>+	/* SB600/700 don't have secondary port wired */</div><div class='add'>+	if ((pdev-&gt;device == PCI_DEVICE_ID_ATI_IXP600_IDE) ||</div><div class='add'>+		(pdev-&gt;device == PCI_DEVICE_ID_ATI_IXP700_IDE))</div><div class='add'>+		ppi[1] = &amp;ata_dummy_port_info;</div><div class='add'>+</div><div class='ctx'> 	return ata_pci_bmdma_init_one(pdev, ppi, &amp;atiixp_sht, NULL,</div><div class='ctx'> 				      ATA_HOST_PARALLEL_SCAN);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c<br/>index ec748d31928d..9c5780a7e1b9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/pata_bf54x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/pata_bf54x.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_bf54x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_bf54x.c</a></div><div class='hunk'>@@ -1143,7 +1143,7 @@ static unsigned char bfin_bmdma_status(struct ata_port *ap)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	bfin_data_xfer - Transfer data by PIO</div><div class='del'>- *	@adev: device for this I/O</div><div class='add'>+ *	@qc: queued command</div><div class='ctx'>  *	@buf: data buffer</div><div class='ctx'>  *	@buflen: buffer length</div><div class='ctx'>  *	@write_data: read/write</div><div class='hunk'>@@ -1151,10 +1151,11 @@ static unsigned char bfin_bmdma_status(struct ata_port *ap)</div><div class='ctx'>  *	Note: Original code is ata_sff_data_xfer().</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int bfin_data_xfer(struct ata_device *dev, unsigned char *buf,</div><div class='add'>+static unsigned int bfin_data_xfer(struct ata_queued_cmd *qc,</div><div class='add'>+				   unsigned char *buf,</div><div class='ctx'> 				   unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='add'>+	struct ata_port *ap = qc-&gt;dev-&gt;link-&gt;ap;</div><div class='ctx'> 	void __iomem *base = (void __iomem *)ap-&gt;ioaddr.ctl_addr;</div><div class='ctx'> 	unsigned int words = buflen &gt;&gt; 1;</div><div class='ctx'> 	unsigned short *buf16 = (u16 *)buf;</div><div class='head'>diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c<br/>index bd6b089c67a3..bf1b910c5d69 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/pata_ep93xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/pata_ep93xx.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_ep93xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_ep93xx.c</a></div><div class='hunk'>@@ -474,11 +474,11 @@ static void ep93xx_pata_set_devctl(struct ata_port *ap, u8 ctl)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Note: original code is ata_sff_data_xfer */</div><div class='del'>-static unsigned int ep93xx_pata_data_xfer(struct ata_device *adev,</div><div class='add'>+static unsigned int ep93xx_pata_data_xfer(struct ata_queued_cmd *qc,</div><div class='ctx'> 					  unsigned char *buf,</div><div class='ctx'> 					  unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap = adev-&gt;link-&gt;ap;</div><div class='add'>+	struct ata_port *ap = qc-&gt;dev-&gt;link-&gt;ap;</div><div class='ctx'> 	struct ep93xx_pata_data *drv_data = ap-&gt;host-&gt;private_data;</div><div class='ctx'> 	u16 *data = (u16 *)buf;</div><div class='ctx'> 	unsigned int words = buflen &gt;&gt; 1;</div><div class='head'>diff --git a/drivers/ata/pata_falcon.c b/drivers/ata/pata_falcon.c<br/>new file mode 100644<br/>index 000000000000..5b0c57d1c59f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_falcon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_falcon.c</a></div><div class='hunk'>@@ -0,0 +1,184 @@</div><div class='add'>+/*</div><div class='add'>+ * Atari Falcon PATA controller driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Based on falconide.c:</div><div class='add'>+ *</div><div class='add'>+ *     Created 12 Jul 1997 by Geert Uytterhoeven</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_host.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='add'>+#include &lt;linux/ata.h&gt;</div><div class='add'>+#include &lt;linux/libata.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/atarihw.h&gt;</div><div class='add'>+#include &lt;asm/atariints.h&gt;</div><div class='add'>+#include &lt;asm/atari_stdma.h&gt;</div><div class='add'>+#include &lt;asm/ide.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_NAME "pata_falcon"</div><div class='add'>+#define DRV_VERSION "0.1.0"</div><div class='add'>+</div><div class='add'>+#define ATA_HD_BASE	0xfff00000</div><div class='add'>+#define ATA_HD_CONTROL	0x39</div><div class='add'>+</div><div class='add'>+static struct scsi_host_template pata_falcon_sht = {</div><div class='add'>+	ATA_PIO_SHT(DRV_NAME),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int pata_falcon_data_xfer(struct ata_queued_cmd *qc,</div><div class='add'>+					  unsigned char *buf,</div><div class='add'>+					  unsigned int buflen, int rw)</div><div class='add'>+{</div><div class='add'>+	struct ata_device *dev = qc-&gt;dev;</div><div class='add'>+	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='add'>+	void __iomem *data_addr = ap-&gt;ioaddr.data_addr;</div><div class='add'>+	unsigned int words = buflen &gt;&gt; 1;</div><div class='add'>+	struct scsi_cmnd *cmd = qc-&gt;scsicmd;</div><div class='add'>+	bool swap = 1;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;class == ATA_DEV_ATA &amp;&amp; cmd &amp;&amp; cmd-&gt;request &amp;&amp;</div><div class='add'>+	    !blk_rq_is_passthrough(cmd-&gt;request))</div><div class='add'>+		swap = 0;</div><div class='add'>+</div><div class='add'>+	/* Transfer multiple of 2 bytes */</div><div class='add'>+	if (rw == READ) {</div><div class='add'>+		if (swap)</div><div class='add'>+			raw_insw_swapw((u16 *)data_addr, (u16 *)buf, words);</div><div class='add'>+		else</div><div class='add'>+			raw_insw((u16 *)data_addr, (u16 *)buf, words);</div><div class='add'>+	} else {</div><div class='add'>+		if (swap)</div><div class='add'>+			raw_outsw_swapw((u16 *)data_addr, (u16 *)buf, words);</div><div class='add'>+		else</div><div class='add'>+			raw_outsw((u16 *)data_addr, (u16 *)buf, words);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Transfer trailing byte, if any. */</div><div class='add'>+	if (unlikely(buflen &amp; 0x01)) {</div><div class='add'>+		unsigned char pad[2] = { };</div><div class='add'>+</div><div class='add'>+		/* Point buf to the tail of buffer */</div><div class='add'>+		buf += buflen - 1;</div><div class='add'>+</div><div class='add'>+		if (rw == READ) {</div><div class='add'>+			if (swap)</div><div class='add'>+				raw_insw_swapw((u16 *)data_addr, (u16 *)pad, 1);</div><div class='add'>+			else</div><div class='add'>+				raw_insw((u16 *)data_addr, (u16 *)pad, 1);</div><div class='add'>+			*buf = pad[0];</div><div class='add'>+		} else {</div><div class='add'>+			pad[0] = *buf;</div><div class='add'>+			if (swap)</div><div class='add'>+				raw_outsw_swapw((u16 *)data_addr, (u16 *)pad, 1);</div><div class='add'>+			else</div><div class='add'>+				raw_outsw((u16 *)data_addr, (u16 *)pad, 1);</div><div class='add'>+		}</div><div class='add'>+		words++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return words &lt;&lt; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Provide our own set_mode() as we don't want to change anything that has</div><div class='add'>+ * already been configured..</div><div class='add'>+ */</div><div class='add'>+static int pata_falcon_set_mode(struct ata_link *link,</div><div class='add'>+				struct ata_device **unused)</div><div class='add'>+{</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+</div><div class='add'>+	ata_for_each_dev(dev, link, ENABLED) {</div><div class='add'>+		/* We don't really care */</div><div class='add'>+		dev-&gt;pio_mode = dev-&gt;xfer_mode = XFER_PIO_0;</div><div class='add'>+		dev-&gt;xfer_shift = ATA_SHIFT_PIO;</div><div class='add'>+		dev-&gt;flags |= ATA_DFLAG_PIO;</div><div class='add'>+		ata_dev_info(dev, "configured for PIO\n");</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ata_port_operations pata_falcon_ops = {</div><div class='add'>+	.inherits	= &amp;ata_sff_port_ops,</div><div class='add'>+	.sff_data_xfer	= pata_falcon_data_xfer,</div><div class='add'>+	.cable_detect	= ata_cable_unknown,</div><div class='add'>+	.set_mode	= pata_falcon_set_mode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pata_falcon_init_one(void)</div><div class='add'>+{</div><div class='add'>+	struct ata_host *host;</div><div class='add'>+	struct ata_port *ap;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+</div><div class='add'>+	if (!MACH_IS_ATARI || !ATARIHW_PRESENT(IDE))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	pr_info(DRV_NAME ": Atari Falcon PATA controller\n");</div><div class='add'>+</div><div class='add'>+	pdev = platform_device_register_simple(DRV_NAME, 0, NULL, 0);</div><div class='add'>+	if (IS_ERR(pdev))</div><div class='add'>+		return PTR_ERR(pdev);</div><div class='add'>+</div><div class='add'>+	if (!devm_request_mem_region(&amp;pdev-&gt;dev, ATA_HD_BASE, 0x40, DRV_NAME)) {</div><div class='add'>+		pr_err(DRV_NAME ": resources busy\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allocate host */</div><div class='add'>+	host = ata_host_alloc(&amp;pdev-&gt;dev, 1);</div><div class='add'>+	if (!host)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ap = host-&gt;ports[0];</div><div class='add'>+</div><div class='add'>+	ap-&gt;ops = &amp;pata_falcon_ops;</div><div class='add'>+	ap-&gt;pio_mask = ATA_PIO4;</div><div class='add'>+	ap-&gt;flags |= ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_IORDY;</div><div class='add'>+	ap-&gt;flags |= ATA_FLAG_PIO_POLLING;</div><div class='add'>+</div><div class='add'>+	base = (void __iomem *)ATA_HD_BASE;</div><div class='add'>+	ap-&gt;ioaddr.data_addr		= base;</div><div class='add'>+	ap-&gt;ioaddr.error_addr		= base + 1 + 1 * 4;</div><div class='add'>+	ap-&gt;ioaddr.feature_addr		= base + 1 + 1 * 4;</div><div class='add'>+	ap-&gt;ioaddr.nsect_addr		= base + 1 + 2 * 4;</div><div class='add'>+	ap-&gt;ioaddr.lbal_addr		= base + 1 + 3 * 4;</div><div class='add'>+	ap-&gt;ioaddr.lbam_addr		= base + 1 + 4 * 4;</div><div class='add'>+	ap-&gt;ioaddr.lbah_addr		= base + 1 + 5 * 4;</div><div class='add'>+	ap-&gt;ioaddr.device_addr		= base + 1 + 6 * 4;</div><div class='add'>+	ap-&gt;ioaddr.status_addr		= base + 1 + 7 * 4;</div><div class='add'>+	ap-&gt;ioaddr.command_addr		= base + 1 + 7 * 4;</div><div class='add'>+</div><div class='add'>+	ap-&gt;ioaddr.altstatus_addr	= base + ATA_HD_CONTROL;</div><div class='add'>+	ap-&gt;ioaddr.ctl_addr		= base + ATA_HD_CONTROL;</div><div class='add'>+</div><div class='add'>+	ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", (unsigned long)base,</div><div class='add'>+		      (unsigned long)base + ATA_HD_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* activate */</div><div class='add'>+	return ata_host_activate(host, 0, NULL, 0, &amp;pata_falcon_sht);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(pata_falcon_init_one);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Bartlomiej Zolnierkiewicz");</div><div class='add'>+MODULE_DESCRIPTION("low-level driver for Atari Falcon PATA");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='head'>diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c<br/>index 139d20778b29..d4caa23f5a88 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/pata_imx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/pata_imx.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_imx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_imx.c</a></div><div class='hunk'>@@ -11,19 +11,26 @@</div><div class='ctx'>  *</div><div class='ctx'>  * TODO:</div><div class='ctx'>  * - dmaengine support</div><div class='del'>- * - check if timing stuff needed</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_host.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/ata.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "pata_imx"</div><div class='ctx'> </div><div class='add'>+#define PATA_IMX_ATA_TIME_OFF		0x00</div><div class='add'>+#define PATA_IMX_ATA_TIME_ON		0x01</div><div class='add'>+#define PATA_IMX_ATA_TIME_1		0x02</div><div class='add'>+#define PATA_IMX_ATA_TIME_2W		0x03</div><div class='add'>+#define PATA_IMX_ATA_TIME_2R		0x04</div><div class='add'>+#define PATA_IMX_ATA_TIME_AX		0x05</div><div class='add'>+#define PATA_IMX_ATA_TIME_PIO_RDX	0x06</div><div class='add'>+#define PATA_IMX_ATA_TIME_4		0x07</div><div class='add'>+#define PATA_IMX_ATA_TIME_9		0x08</div><div class='add'>+</div><div class='ctx'> #define PATA_IMX_ATA_CONTROL		0x24</div><div class='ctx'> #define PATA_IMX_ATA_CTRL_FIFO_RST_B	(1&lt;&lt;7)</div><div class='ctx'> #define PATA_IMX_ATA_CTRL_ATA_RST_B	(1&lt;&lt;6)</div><div class='hunk'>@@ -33,6 +40,10 @@</div><div class='ctx'> #define PATA_IMX_DRIVE_DATA		0xA0</div><div class='ctx'> #define PATA_IMX_DRIVE_CONTROL		0xD8</div><div class='ctx'> </div><div class='add'>+static u32 pio_t4[] = { 30,  20,  15,  10,  10 };</div><div class='add'>+static u32 pio_t9[] = { 20,  15,  10,  10,  10 };</div><div class='add'>+static u32 pio_tA[] = { 35,  35,  35,  35,  35 };</div><div class='add'>+</div><div class='ctx'> struct pata_imx_priv {</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> 	/* timings/interrupt/control regs */</div><div class='hunk'>@@ -40,28 +51,49 @@ struct pata_imx_priv {</div><div class='ctx'> 	u32 ata_ctl;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int pata_imx_set_mode(struct ata_link *link, struct ata_device **unused)</div><div class='add'>+static void pata_imx_set_timing(struct ata_device *adev,</div><div class='add'>+				struct pata_imx_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct ata_timing timing;</div><div class='add'>+	unsigned long clkrate;</div><div class='add'>+	u32 T, mode;</div><div class='add'>+</div><div class='add'>+	clkrate = clk_get_rate(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	if (adev-&gt;pio_mode &lt; XFER_PIO_0 || adev-&gt;pio_mode &gt; XFER_PIO_4 ||</div><div class='add'>+	    !clkrate)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	T = 1000000000 / clkrate;</div><div class='add'>+	ata_timing_compute(adev, adev-&gt;pio_mode, &amp;timing, T * 1000, 0);</div><div class='add'>+</div><div class='add'>+	mode = adev-&gt;pio_mode - XFER_PIO_0;</div><div class='add'>+</div><div class='add'>+	writeb(3, priv-&gt;host_regs + PATA_IMX_ATA_TIME_OFF);</div><div class='add'>+	writeb(3, priv-&gt;host_regs + PATA_IMX_ATA_TIME_ON);</div><div class='add'>+	writeb(timing.setup, priv-&gt;host_regs + PATA_IMX_ATA_TIME_1);</div><div class='add'>+	writeb(timing.act8b, priv-&gt;host_regs + PATA_IMX_ATA_TIME_2W);</div><div class='add'>+	writeb(timing.act8b, priv-&gt;host_regs + PATA_IMX_ATA_TIME_2R);</div><div class='add'>+	writeb(1, priv-&gt;host_regs + PATA_IMX_ATA_TIME_PIO_RDX);</div><div class='add'>+</div><div class='add'>+	writeb(pio_t4[mode] / T + 1, priv-&gt;host_regs + PATA_IMX_ATA_TIME_4);</div><div class='add'>+	writeb(pio_t9[mode] / T + 1, priv-&gt;host_regs + PATA_IMX_ATA_TIME_9);</div><div class='add'>+	writeb(pio_tA[mode] / T + 1, priv-&gt;host_regs + PATA_IMX_ATA_TIME_AX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pata_imx_set_piomode(struct ata_port *ap, struct ata_device *adev)</div><div class='ctx'> {</div><div class='del'>-	struct ata_device *dev;</div><div class='del'>-	struct ata_port *ap = link-&gt;ap;</div><div class='ctx'> 	struct pata_imx_priv *priv = ap-&gt;host-&gt;private_data;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	ata_for_each_dev(dev, link, ENABLED) {</div><div class='del'>-		dev-&gt;pio_mode = dev-&gt;xfer_mode = XFER_PIO_0;</div><div class='del'>-		dev-&gt;xfer_shift = ATA_SHIFT_PIO;</div><div class='del'>-		dev-&gt;flags |= ATA_DFLAG_PIO;</div><div class='del'>-</div><div class='del'>-		val = __raw_readl(priv-&gt;host_regs + PATA_IMX_ATA_CONTROL);</div><div class='del'>-		if (ata_pio_need_iordy(dev))</div><div class='del'>-			val |= PATA_IMX_ATA_CTRL_IORDY_EN;</div><div class='del'>-		else</div><div class='del'>-			val &amp;= ~PATA_IMX_ATA_CTRL_IORDY_EN;</div><div class='del'>-		__raw_writel(val, priv-&gt;host_regs + PATA_IMX_ATA_CONTROL);</div><div class='add'>+	pata_imx_set_timing(adev, priv);</div><div class='ctx'> </div><div class='del'>-		ata_dev_info(dev, "configured for PIO\n");</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	val = __raw_readl(priv-&gt;host_regs + PATA_IMX_ATA_CONTROL);</div><div class='add'>+	if (ata_pio_need_iordy(adev))</div><div class='add'>+		val |= PATA_IMX_ATA_CTRL_IORDY_EN;</div><div class='add'>+	else</div><div class='add'>+		val &amp;= ~PATA_IMX_ATA_CTRL_IORDY_EN;</div><div class='add'>+	__raw_writel(val, priv-&gt;host_regs + PATA_IMX_ATA_CONTROL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct scsi_host_template pata_imx_sht = {</div><div class='hunk'>@@ -72,7 +104,7 @@ static struct ata_port_operations pata_imx_port_ops = {</div><div class='ctx'> 	.inherits		= &amp;ata_sff_port_ops,</div><div class='ctx'> 	.sff_data_xfer		= ata_sff_data_xfer_noirq,</div><div class='ctx'> 	.cable_detect		= ata_cable_unknown,</div><div class='del'>-	.set_mode		= pata_imx_set_mode,</div><div class='add'>+	.set_piomode		= pata_imx_set_piomode,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void pata_imx_setup_port(struct ata_ioports *ioaddr)</div><div class='hunk'>@@ -128,7 +160,7 @@ static int pata_imx_probe(struct platform_device *pdev)</div><div class='ctx'> 	ap = host-&gt;ports[0];</div><div class='ctx'> </div><div class='ctx'> 	ap-&gt;ops = &amp;pata_imx_port_ops;</div><div class='del'>-	ap-&gt;pio_mask = ATA_PIO0;</div><div class='add'>+	ap-&gt;pio_mask = ATA_PIO4;</div><div class='ctx'> 	ap-&gt;flags |= ATA_FLAG_SLAVE_POSS;</div><div class='ctx'> </div><div class='ctx'> 	io_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='head'>diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c<br/>index abda44183512..0b0d93065f5a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/pata_ixp4xx_cf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/pata_ixp4xx_cf.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_ixp4xx_cf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_ixp4xx_cf.c</a></div><div class='hunk'>@@ -40,13 +40,13 @@ static int ixp4xx_set_mode(struct ata_link *link, struct ata_device **error)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int ixp4xx_mmio_data_xfer(struct ata_device *dev,</div><div class='add'>+static unsigned int ixp4xx_mmio_data_xfer(struct ata_queued_cmd *qc,</div><div class='ctx'> 				unsigned char *buf, unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	unsigned int words = buflen &gt;&gt; 1;</div><div class='ctx'> 	u16 *buf16 = (u16 *) buf;</div><div class='del'>-	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='add'>+	struct ata_port *ap = qc-&gt;dev-&gt;link-&gt;ap;</div><div class='ctx'> 	void __iomem *mmio = ap-&gt;ioaddr.data_addr;</div><div class='ctx'> 	struct ixp4xx_pata_data *data = dev_get_platdata(ap-&gt;host-&gt;dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c<br/>index bce2a8ca4678..53828b6c3044 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/pata_legacy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/pata_legacy.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_legacy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_legacy.c</a></div><div class='hunk'>@@ -303,11 +303,12 @@ static void pdc20230_set_piomode(struct ata_port *ap, struct ata_device *adev)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int pdc_data_xfer_vlb(struct ata_device *dev,</div><div class='add'>+static unsigned int pdc_data_xfer_vlb(struct ata_queued_cmd *qc,</div><div class='ctx'> 			unsigned char *buf, unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='del'>-	int slop = buflen &amp; 3;</div><div class='add'>+	struct ata_device *dev = qc-&gt;dev;</div><div class='ctx'> 	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='add'>+	int slop = buflen &amp; 3;</div><div class='ctx'> </div><div class='ctx'> 	/* 32bit I/O capable *and* we need to write a whole number of dwords */</div><div class='ctx'> 	if (ata_id_has_dword_io(dev-&gt;id) &amp;&amp; (slop == 0 || slop == 3)</div><div class='hunk'>@@ -340,7 +341,7 @@ static unsigned int pdc_data_xfer_vlb(struct ata_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> 	} else</div><div class='del'>-		buflen = ata_sff_data_xfer_noirq(dev, buf, buflen, rw);</div><div class='add'>+		buflen = ata_sff_data_xfer_noirq(qc, buf, buflen, rw);</div><div class='ctx'> </div><div class='ctx'> 	return buflen;</div><div class='ctx'> }</div><div class='hunk'>@@ -702,9 +703,11 @@ static unsigned int qdi_qc_issue(struct ata_queued_cmd *qc)</div><div class='ctx'> 	return ata_sff_qc_issue(qc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int vlb32_data_xfer(struct ata_device *adev, unsigned char *buf,</div><div class='del'>-					unsigned int buflen, int rw)</div><div class='add'>+static unsigned int vlb32_data_xfer(struct ata_queued_cmd *qc,</div><div class='add'>+				    unsigned char *buf,</div><div class='add'>+				    unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='add'>+	struct ata_device *adev = qc-&gt;dev;</div><div class='ctx'> 	struct ata_port *ap = adev-&gt;link-&gt;ap;</div><div class='ctx'> 	int slop = buflen &amp; 3;</div><div class='ctx'> </div><div class='hunk'>@@ -727,7 +730,7 @@ static unsigned int vlb32_data_xfer(struct ata_device *adev, unsigned char *buf,</div><div class='ctx'> 		}</div><div class='ctx'> 		return (buflen + 3) &amp; ~3;</div><div class='ctx'> 	} else</div><div class='del'>-		return ata_sff_data_xfer(adev, buf, buflen, rw);</div><div class='add'>+		return ata_sff_data_xfer(qc, buf, buflen, rw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qdi_port(struct platform_device *dev,</div><div class='head'>diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c<br/>index 475a00669427..f524a9099d01 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/pata_octeon_cf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/pata_octeon_cf.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_octeon_cf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_octeon_cf.c</a></div><div class='hunk'>@@ -138,9 +138,7 @@ static void octeon_cf_set_piomode(struct ata_port *ap, struct ata_device *dev)</div><div class='ctx'> 	int trh;</div><div class='ctx'> 	int pause;</div><div class='ctx'> 	/* These names are timing parameters from the ATA spec */</div><div class='del'>-	int t1;</div><div class='ctx'> 	int t2;</div><div class='del'>-	int t2i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * A divisor value of four will overflow the timing fields at</div><div class='hunk'>@@ -154,15 +152,9 @@ static void octeon_cf_set_piomode(struct ata_port *ap, struct ata_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(ata_timing_compute(dev, dev-&gt;pio_mode, &amp;timing, T, T));</div><div class='ctx'> </div><div class='del'>-	t1 = timing.setup;</div><div class='del'>-	if (t1)</div><div class='del'>-		t1--;</div><div class='ctx'> 	t2 = timing.active;</div><div class='ctx'> 	if (t2)</div><div class='ctx'> 		t2--;</div><div class='del'>-	t2i = timing.act8b;</div><div class='del'>-	if (t2i)</div><div class='del'>-		t2i--;</div><div class='ctx'> </div><div class='ctx'> 	trh = ns_to_tim_reg(div, 20);</div><div class='ctx'> 	if (trh)</div><div class='hunk'>@@ -293,17 +285,17 @@ static void octeon_cf_set_dmamode(struct ata_port *ap, struct ata_device *dev)</div><div class='ctx'> /**</div><div class='ctx'>  * Handle an 8 bit I/O request.</div><div class='ctx'>  *</div><div class='del'>- * @dev:        Device to access</div><div class='add'>+ * @qc:         Queued command</div><div class='ctx'>  * @buffer:     Data buffer</div><div class='ctx'>  * @buflen:     Length of the buffer.</div><div class='ctx'>  * @rw:         True to write.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int octeon_cf_data_xfer8(struct ata_device *dev,</div><div class='add'>+static unsigned int octeon_cf_data_xfer8(struct ata_queued_cmd *qc,</div><div class='ctx'> 					 unsigned char *buffer,</div><div class='ctx'> 					 unsigned int buflen,</div><div class='ctx'> 					 int rw)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap		= dev-&gt;link-&gt;ap;</div><div class='add'>+	struct ata_port *ap		= qc-&gt;dev-&gt;link-&gt;ap;</div><div class='ctx'> 	void __iomem *data_addr		= ap-&gt;ioaddr.data_addr;</div><div class='ctx'> 	unsigned long words;</div><div class='ctx'> 	int count;</div><div class='hunk'>@@ -332,17 +324,17 @@ static unsigned int octeon_cf_data_xfer8(struct ata_device *dev,</div><div class='ctx'> /**</div><div class='ctx'>  * Handle a 16 bit I/O request.</div><div class='ctx'>  *</div><div class='del'>- * @dev:        Device to access</div><div class='add'>+ * @qc:         Queued command</div><div class='ctx'>  * @buffer:     Data buffer</div><div class='ctx'>  * @buflen:     Length of the buffer.</div><div class='ctx'>  * @rw:         True to write.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int octeon_cf_data_xfer16(struct ata_device *dev,</div><div class='add'>+static unsigned int octeon_cf_data_xfer16(struct ata_queued_cmd *qc,</div><div class='ctx'> 					  unsigned char *buffer,</div><div class='ctx'> 					  unsigned int buflen,</div><div class='ctx'> 					  int rw)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap		= dev-&gt;link-&gt;ap;</div><div class='add'>+	struct ata_port *ap		= qc-&gt;dev-&gt;link-&gt;ap;</div><div class='ctx'> 	void __iomem *data_addr		= ap-&gt;ioaddr.data_addr;</div><div class='ctx'> 	unsigned long words;</div><div class='ctx'> 	int count;</div><div class='head'>diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c<br/>index b6b7af894d9d..201a32d0627f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/pata_of_platform.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/pata_of_platform.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_of_platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_of_platform.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@ static int pata_of_platform_probe(struct platform_device *ofdev)</div><div class='ctx'> 	unsigned int reg_shift = 0;</div><div class='ctx'> 	int pio_mode = 0;</div><div class='ctx'> 	int pio_mask;</div><div class='del'>-	const u32 *prop;</div><div class='ctx'> </div><div class='ctx'> 	ret = of_address_to_resource(dn, 0, &amp;io_res);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -50,13 +49,9 @@ static int pata_of_platform_probe(struct platform_device *ofdev)</div><div class='ctx'> </div><div class='ctx'> 	irq_res = platform_get_resource(ofdev, IORESOURCE_IRQ, 0);</div><div class='ctx'> </div><div class='del'>-	prop = of_get_property(dn, "reg-shift", NULL);</div><div class='del'>-	if (prop)</div><div class='del'>-		reg_shift = be32_to_cpup(prop);</div><div class='add'>+	of_property_read_u32(dn, "reg-shift", &amp;reg_shift);</div><div class='ctx'> </div><div class='del'>-	prop = of_get_property(dn, "pio-mode", NULL);</div><div class='del'>-	if (prop) {</div><div class='del'>-		pio_mode = be32_to_cpup(prop);</div><div class='add'>+	if (!of_property_read_u32(dn, "pio-mode", &amp;pio_mode)) {</div><div class='ctx'> 		if (pio_mode &gt; 6) {</div><div class='ctx'> 			dev_err(&amp;ofdev-&gt;dev, "invalid pio-mode\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='head'>diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c<br/>index bcc4b968c049..a541eacc5e95 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/pata_pcmcia.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/pata_pcmcia.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_pcmcia.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_pcmcia.c</a></div><div class='hunk'>@@ -90,7 +90,7 @@ static int pcmcia_set_mode_8bit(struct ata_link *link,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_data_xfer_8bit	 -	Transfer data by 8bit PIO</div><div class='del'>- *	@dev: device to target</div><div class='add'>+ *	@qc: queued command</div><div class='ctx'>  *	@buf: data buffer</div><div class='ctx'>  *	@buflen: buffer length</div><div class='ctx'>  *	@rw: read/write</div><div class='hunk'>@@ -101,10 +101,10 @@ static int pcmcia_set_mode_8bit(struct ata_link *link,</div><div class='ctx'>  *	Inherited from caller.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int ata_data_xfer_8bit(struct ata_device *dev,</div><div class='add'>+static unsigned int ata_data_xfer_8bit(struct ata_queued_cmd *qc,</div><div class='ctx'> 				unsigned char *buf, unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='add'>+	struct ata_port *ap = qc-&gt;dev-&gt;link-&gt;ap;</div><div class='ctx'> </div><div class='ctx'> 	if (rw == READ)</div><div class='ctx'> 		ioread8_rep(ap-&gt;ioaddr.data_addr, buf, buflen);</div><div class='head'>diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c<br/>index f6facd686f94..431c7de30ce6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/pata_samsung_cf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/pata_samsung_cf.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/pata_samsung_cf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/pata_samsung_cf.c</a></div><div class='hunk'>@@ -263,10 +263,10 @@ static u8 pata_s3c_check_altstatus(struct ata_port *ap)</div><div class='ctx'> /*</div><div class='ctx'>  * pata_s3c_data_xfer - Transfer data by PIO</div><div class='ctx'>  */</div><div class='del'>-static unsigned int pata_s3c_data_xfer(struct ata_device *dev,</div><div class='add'>+static unsigned int pata_s3c_data_xfer(struct ata_queued_cmd *qc,</div><div class='ctx'> 				unsigned char *buf, unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='add'>+	struct ata_port *ap = qc-&gt;dev-&gt;link-&gt;ap;</div><div class='ctx'> 	struct s3c_ide_info *info = ap-&gt;host-&gt;private_data;</div><div class='ctx'> 	void __iomem *data_addr = ap-&gt;ioaddr.data_addr;</div><div class='ctx'> 	unsigned int words = buflen &gt;&gt; 1, i;</div><div class='head'>diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c<br/>index 823e938c9a78..00ce26d0c047 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/sata_mv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/sata_mv.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/sata_mv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/sata_mv.c</a></div><div class='hunk'>@@ -4067,6 +4067,7 @@ static int mv_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct ata_host *host;</div><div class='ctx'> 	struct mv_host_priv *hpriv;</div><div class='ctx'> 	struct resource *res;</div><div class='add'>+	void __iomem *mmio;</div><div class='ctx'> 	int n_ports = 0, irq = 0;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	int port;</div><div class='hunk'>@@ -4085,8 +4086,9 @@ static int mv_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 	 * Get the register base first</div><div class='ctx'> 	 */</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (res == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	mmio = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(mmio))</div><div class='add'>+		return PTR_ERR(mmio);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate host */</div><div class='ctx'> 	if (pdev-&gt;dev.of_node) {</div><div class='hunk'>@@ -4130,9 +4132,7 @@ static int mv_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 	hpriv-&gt;board_idx = chip_soc;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;iomap = NULL;</div><div class='del'>-	hpriv-&gt;base = devm_ioremap(&amp;pdev-&gt;dev, res-&gt;start,</div><div class='del'>-				   resource_size(res));</div><div class='del'>-	hpriv-&gt;base -= SATAHC0_REG_BASE;</div><div class='add'>+	hpriv-&gt;base = mmio - SATAHC0_REG_BASE;</div><div class='ctx'> </div><div class='ctx'> 	hpriv-&gt;clk = clk_get(&amp;pdev-&gt;dev, NULL);</div><div class='ctx'> 	if (IS_ERR(hpriv-&gt;clk))</div><div class='hunk'>@@ -4526,7 +4526,7 @@ static void __exit mv_exit(void)</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Brett Russ");</div><div class='ctx'> MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, mv_pci_tbl);</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_ALIAS("platform:" DRV_NAME);</div><div class='head'>diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c<br/>index f72d601e300a..5d38245a7a73 100644<br/>--- a/<a href='/drm-misc/tree/drivers/ata/sata_rcar.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/ata/sata_rcar.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/ata/sata_rcar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/ata/sata_rcar.c</a></div><div class='hunk'>@@ -447,11 +447,11 @@ static void sata_rcar_exec_command(struct ata_port *ap,</div><div class='ctx'> 	ata_sff_pause(ap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int sata_rcar_data_xfer(struct ata_device *dev,</div><div class='add'>+static unsigned int sata_rcar_data_xfer(struct ata_queued_cmd *qc,</div><div class='ctx'> 					      unsigned char *buf,</div><div class='ctx'> 					      unsigned int buflen, int rw)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap = dev-&gt;link-&gt;ap;</div><div class='add'>+	struct ata_port *ap = qc-&gt;dev-&gt;link-&gt;ap;</div><div class='ctx'> 	void __iomem *data_addr = ap-&gt;ioaddr.data_addr;</div><div class='ctx'> 	unsigned int words = buflen &gt;&gt; 1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c<br/>index f9b983ae6877..1fd25e872ece 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/adummy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/adummy.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/adummy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/adummy.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atmdev.h&gt;</div><div class='ctx'> #include &lt;linux/atm.h&gt;</div><div class='head'>diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c<br/>index f1a9198dfe5a..4a610795b585 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/ambassador.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/ambassador.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/ambassador.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/ambassador.c</a></div><div class='hunk'>@@ -2394,12 +2394,7 @@ static int __init amb_module_init (void)</div><div class='ctx'> {</div><div class='ctx'>   PRINTD (DBG_FLOW|DBG_INIT, "init_module");</div><div class='ctx'>   </div><div class='del'>-  // sanity check - cast needed as printk does not support %Zu</div><div class='del'>-  if (sizeof(amb_mem) != 4*16 + 4*12) {</div><div class='del'>-    PRINTK (KERN_ERR, "Fix amb_mem (is %lu words).",</div><div class='del'>-	    (unsigned long) sizeof(amb_mem));</div><div class='del'>-    return -ENOMEM;</div><div class='del'>-  }</div><div class='add'>+  BUILD_BUG_ON(sizeof(amb_mem) != 4*16 + 4*12);</div><div class='ctx'>   </div><div class='ctx'>   show_version();</div><div class='ctx'>   </div><div class='head'>diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c<br/>index 480fa6ffbc09..3ef6253e1cce 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/atmtcp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/atmtcp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/atmtcp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/atmtcp.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c<br/>index 40c2d561417b..b042ec458544 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/eni.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/eni.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/eni.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/eni.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/string.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -1779,7 +1779,7 @@ static int eni_do_init(struct atm_dev *dev)</div><div class='ctx'> 	printk(")\n");</div><div class='ctx'> 	printk(KERN_NOTICE DEV_LABEL "(itf %d): %s,%s\n",dev-&gt;number,</div><div class='ctx'> 	    eni_in(MID_RES_ID_MCON) &amp; 0x200 ? "ASIC" : "FPGA",</div><div class='del'>-	    media_name[eni_in(MID_RES_ID_MCON) &amp; DAUGTHER_ID]);</div><div class='add'>+	    media_name[eni_in(MID_RES_ID_MCON) &amp; DAUGHTER_ID]);</div><div class='ctx'> </div><div class='ctx'> 	error = suni_init(dev);</div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -2326,11 +2326,7 @@ static int __init eni_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb; /* dummy for sizeof */</div><div class='ctx'> </div><div class='del'>-	if (sizeof(skb-&gt;cb) &lt; sizeof(struct eni_skb_prv)) {</div><div class='del'>-		printk(KERN_ERR "eni_detect: skb-&gt;cb is too small (%Zd &lt; %Zd)\n",</div><div class='del'>-		    sizeof(skb-&gt;cb),sizeof(struct eni_skb_prv));</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+	BUILD_BUG_ON(sizeof(skb-&gt;cb) &lt; sizeof(struct eni_skb_prv));</div><div class='ctx'> 	return pci_register_driver(&amp;eni_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c<br/>index 85aaf2222587..22dcab952a24 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/firestream.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/firestream.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/firestream.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/firestream.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> #include &lt;asm/string.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "firestream.h"</div><div class='hunk'>@@ -895,7 +895,7 @@ static int fs_open(struct atm_vcc *atm_vcc)</div><div class='ctx'> 	/* XXX handle qos parameters (rate limiting) ? */</div><div class='ctx'> </div><div class='ctx'> 	vcc = kmalloc(sizeof(struct fs_vcc), GFP_KERNEL);</div><div class='del'>-	fs_dprintk (FS_DEBUG_ALLOC, "Alloc VCC: %p(%Zd)\n", vcc, sizeof(struct fs_vcc));</div><div class='add'>+	fs_dprintk (FS_DEBUG_ALLOC, "Alloc VCC: %p(%zd)\n", vcc, sizeof(struct fs_vcc));</div><div class='ctx'> 	if (!vcc) {</div><div class='ctx'> 		clear_bit(ATM_VF_ADDR, &amp;atm_vcc-&gt;flags);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -946,7 +946,7 @@ static int fs_open(struct atm_vcc *atm_vcc)</div><div class='ctx'> </div><div class='ctx'> 	if (DO_DIRECTION (txtp)) {</div><div class='ctx'> 		tc = kmalloc (sizeof (struct fs_transmit_config), GFP_KERNEL);</div><div class='del'>-		fs_dprintk (FS_DEBUG_ALLOC, "Alloc tc: %p(%Zd)\n",</div><div class='add'>+		fs_dprintk (FS_DEBUG_ALLOC, "Alloc tc: %p(%zd)\n",</div><div class='ctx'> 			    tc, sizeof (struct fs_transmit_config));</div><div class='ctx'> 		if (!tc) {</div><div class='ctx'> 			fs_dprintk (FS_DEBUG_OPEN, "fs: can't alloc transmit_config.\n");</div><div class='hunk'>@@ -1185,7 +1185,7 @@ static int fs_send (struct atm_vcc *atm_vcc, struct sk_buff *skb)</div><div class='ctx'> 	vcc-&gt;last_skb = skb;</div><div class='ctx'> </div><div class='ctx'> 	td = kmalloc (sizeof (struct FS_BPENTRY), GFP_ATOMIC);</div><div class='del'>-	fs_dprintk (FS_DEBUG_ALLOC, "Alloc transd: %p(%Zd)\n", td, sizeof (struct FS_BPENTRY));</div><div class='add'>+	fs_dprintk (FS_DEBUG_ALLOC, "Alloc transd: %p(%zd)\n", td, sizeof (struct FS_BPENTRY));</div><div class='ctx'> 	if (!td) {</div><div class='ctx'> 		/* Oops out of mem */</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1492,7 +1492,7 @@ static void top_off_fp (struct fs_dev *dev, struct freepool *fp,</div><div class='ctx'> 		fs_dprintk (FS_DEBUG_ALLOC, "Alloc rec-skb: %p(%d)\n", skb, fp-&gt;bufsize);</div><div class='ctx'> 		if (!skb) break;</div><div class='ctx'> 		ne = kmalloc (sizeof (struct FS_BPENTRY), gfp_flags);</div><div class='del'>-		fs_dprintk (FS_DEBUG_ALLOC, "Alloc rec-d: %p(%Zd)\n", ne, sizeof (struct FS_BPENTRY));</div><div class='add'>+		fs_dprintk (FS_DEBUG_ALLOC, "Alloc rec-d: %p(%zd)\n", ne, sizeof (struct FS_BPENTRY));</div><div class='ctx'> 		if (!ne) {</div><div class='ctx'> 			fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p\n", skb);</div><div class='ctx'> 			dev_kfree_skb_any (skb);</div><div class='hunk'>@@ -1803,7 +1803,7 @@ static int fs_init(struct fs_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;atm_vccs = kcalloc (dev-&gt;nchannels, sizeof (struct atm_vcc *),</div><div class='ctx'> 				 GFP_KERNEL);</div><div class='del'>-	fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%Zd)\n",</div><div class='add'>+	fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%zd)\n",</div><div class='ctx'> 		    dev-&gt;atm_vccs, dev-&gt;nchannels * sizeof (struct atm_vcc *));</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;atm_vccs) {</div><div class='hunk'>@@ -1911,7 +1911,7 @@ static int firestream_init_one(struct pci_dev *pci_dev,</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='ctx'> 	fs_dev = kzalloc (sizeof (struct fs_dev), GFP_KERNEL);</div><div class='del'>-	fs_dprintk (FS_DEBUG_ALLOC, "Alloc fs-dev: %p(%Zd)\n",</div><div class='add'>+	fs_dprintk (FS_DEBUG_ALLOC, "Alloc fs-dev: %p(%zd)\n",</div><div class='ctx'> 		    fs_dev, sizeof (struct fs_dev));</div><div class='ctx'> 	if (!fs_dev)</div><div class='ctx'> 		goto err_out;</div><div class='head'>diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c<br/>index 81aaa505862c..637c3e6b0f9e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/fore200e.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/fore200e.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/fore200e.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/fore200e.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='head'>diff --git a/drivers/atm/he.c b/drivers/atm/he.c<br/>index 31b513a23ae0..3617659b9184 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/he.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/he.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/he.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/he.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atmdev.h&gt;</div><div class='ctx'> #include &lt;linux/atm.h&gt;</div><div class='head'>diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c<br/>index 5fc81e240c24..0f18480b33b5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/horizon.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/horizon.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/horizon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/horizon.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -45,7 +46,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/string.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -2884,12 +2885,7 @@ static struct pci_driver hrz_driver = {</div><div class='ctx'> /********** module entry **********/</div><div class='ctx'> </div><div class='ctx'> static int __init hrz_module_init (void) {</div><div class='del'>-  // sanity check - cast is needed since printk does not support %Zu</div><div class='del'>-  if (sizeof(struct MEMMAP) != 128*1024/4) {</div><div class='del'>-    PRINTK (KERN_ERR, "Fix struct MEMMAP (is %lu fakewords).",</div><div class='del'>-	    (unsigned long) sizeof(struct MEMMAP));</div><div class='del'>-    return -ENOMEM;</div><div class='del'>-  }</div><div class='add'>+  BUILD_BUG_ON(sizeof(struct MEMMAP) != 128*1024/4);</div><div class='ctx'>   </div><div class='ctx'>   show_version();</div><div class='ctx'>   </div><div class='head'>diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c<br/>index feb023d7eebd..082aa02abc57 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/idt77105.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/idt77105.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/idt77105.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/idt77105.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "idt77105.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c<br/>index 074616b39f4d..5ec109533bb9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/idt77252.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/idt77252.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/idt77252.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/idt77252.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -2132,12 +2132,8 @@ idt77252_init_est(struct vc_map *vc, int pcr)</div><div class='ctx'> </div><div class='ctx'> 	est-&gt;interval = 2;		/* XXX: make this configurable */</div><div class='ctx'> 	est-&gt;ewma_log = 2;		/* XXX: make this configurable */</div><div class='del'>-	init_timer(&amp;est-&gt;timer);</div><div class='del'>-	est-&gt;timer.data = (unsigned long)vc;</div><div class='del'>-	est-&gt;timer.function = idt77252_est_timer;</div><div class='del'>-</div><div class='del'>-	est-&gt;timer.expires = jiffies + ((HZ / 4) &lt;&lt; est-&gt;interval);</div><div class='del'>-	add_timer(&amp;est-&gt;timer);</div><div class='add'>+	setup_timer(&amp;est-&gt;timer, idt77252_est_timer, (unsigned long)vc);</div><div class='add'>+	mod_timer(&amp;est-&gt;timer, jiffies + ((HZ / 4) &lt;&lt; est-&gt;interval));</div><div class='ctx'> </div><div class='ctx'> 	return est;</div><div class='ctx'> }</div><div class='hunk'>@@ -3638,9 +3634,7 @@ static int idt77252_init_one(struct pci_dev *pcidev,</div><div class='ctx'> 	spin_lock_init(&amp;card-&gt;cmd_lock);</div><div class='ctx'> 	spin_lock_init(&amp;card-&gt;tst_lock);</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;card-&gt;tst_timer);</div><div class='del'>-	card-&gt;tst_timer.data = (unsigned long)card;</div><div class='del'>-	card-&gt;tst_timer.function = tst_timer;</div><div class='add'>+	setup_timer(&amp;card-&gt;tst_timer, tst_timer, (unsigned long)card);</div><div class='ctx'> </div><div class='ctx'> 	/* Do the I/O remapping... */</div><div class='ctx'> 	card-&gt;membase = ioremap(membase, 1024);</div><div class='head'>diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c<br/>index b2756765950e..a4fa6c82261e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/iphase.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/iphase.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/iphase.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/iphase.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'>       supports a variety of varients of Interphase ATM PCI (i)Chip adapter </div><div class='ctx'>       card family (See www.iphase.com/products/ClassSheet.cfm?ClassID=ATM) </div><div class='ctx'>       in terms of PHY type, the size of control memory and the size of </div><div class='del'>-      packet memory. The followings are the change log and history:</div><div class='add'>+      packet memory. The following are the change log and history:</div><div class='ctx'>      </div><div class='ctx'>           Bugfix the Mona's UBR driver.</div><div class='ctx'>           Modify the basic memory allocation and dma logic.</div><div class='hunk'>@@ -58,7 +58,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;  </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;  </div><div class='add'>+#include &lt;linux/uaccess.h&gt;  </div><div class='ctx'> #include &lt;asm/string.h&gt;  </div><div class='ctx'> #include &lt;asm/byteorder.h&gt;  </div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='head'>diff --git a/drivers/atm/iphase.h b/drivers/atm/iphase.h<br/>index 53ecac5a2161..2beacf2fc1ec 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/iphase.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/iphase.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/iphase.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/iphase.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'>       supports a variety of varients of Interphase ATM PCI (i)Chip adapter </div><div class='ctx'>       card family (See www.iphase.com/products/ClassSheet.cfm?ClassID=ATM) </div><div class='ctx'>       in terms of PHY type, the size of control memory and the size of </div><div class='del'>-      packet memory. The followings are the change log and history:</div><div class='add'>+      packet memory. The following are the change log and history:</div><div class='ctx'>      </div><div class='ctx'>           Bugfix the Mona's UBR driver.</div><div class='ctx'>           Modify the basic memory allocation and dma logic.</div><div class='head'>diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c<br/>index 445505d9ea07..1a9bc51284b0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/lanai.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/lanai.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/lanai.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/lanai.c</a></div><div class='hunk'>@@ -1389,7 +1389,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)</div><div class='ctx'> 	if (n &lt; 0)</div><div class='ctx'> 		n += lanai_buf_size(&amp;lvcc-&gt;rx.buf);</div><div class='ctx'> 	APRINTK(n &gt;= 0 &amp;&amp; n &lt; lanai_buf_size(&amp;lvcc-&gt;rx.buf) &amp;&amp; !(n &amp; 15),</div><div class='del'>-	    "vcc_rx_aal5: n out of range (%d/%Zu)\n",</div><div class='add'>+	    "vcc_rx_aal5: n out of range (%d/%zu)\n",</div><div class='ctx'> 	    n, lanai_buf_size(&amp;lvcc-&gt;rx.buf));</div><div class='ctx'> 	/* Recover the second-to-last word to get true pdu length */</div><div class='ctx'> 	if ((x = &amp;end[-2]) &lt; lvcc-&gt;rx.buf.start)</div><div class='hunk'>@@ -1493,9 +1493,9 @@ static int lanai_get_sized_buffer(struct lanai_dev *lanai,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (unlikely(lanai_buf_size(buf) &lt; size))</div><div class='ctx'> 		printk(KERN_WARNING DEV_LABEL "(itf %d): wanted %d bytes "</div><div class='del'>-		    "for %s buffer, got only %Zu\n", lanai-&gt;number, size,</div><div class='add'>+		    "for %s buffer, got only %zu\n", lanai-&gt;number, size,</div><div class='ctx'> 		    name, lanai_buf_size(buf));</div><div class='del'>-	DPRINTK("Allocated %Zu byte %s buffer\n", lanai_buf_size(buf), name);</div><div class='add'>+	DPRINTK("Allocated %zu byte %s buffer\n", lanai_buf_size(buf), name);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1586,7 +1586,7 @@ static int service_buffer_allocate(struct lanai_dev *lanai)</div><div class='ctx'> 	    lanai-&gt;pci);</div><div class='ctx'> 	if (unlikely(lanai-&gt;service.start == NULL))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	DPRINTK("allocated service buffer at 0x%08lX, size %Zu(%d)\n",</div><div class='add'>+	DPRINTK("allocated service buffer at 0x%08lX, size %zu(%d)\n",</div><div class='ctx'> 	    (unsigned long) lanai-&gt;service.start,</div><div class='ctx'> 	    lanai_buf_size(&amp;lanai-&gt;service),</div><div class='ctx'> 	    lanai_buf_size_cardorder(&amp;lanai-&gt;service));</div><div class='hunk'>@@ -2467,8 +2467,8 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)</div><div class='ctx'> 		    (lanai-&gt;status &amp; STATUS_LED) ? 1 : 0,</div><div class='ctx'> 		    (lanai-&gt;status &amp; STATUS_GPIN) ? 1 : 0);</div><div class='ctx'> 	if (left-- == 0)</div><div class='del'>-		return sprintf(page, "global buffer sizes: service=%Zu, "</div><div class='del'>-		    "aal0_rx=%Zu\n", lanai_buf_size(&amp;lanai-&gt;service),</div><div class='add'>+		return sprintf(page, "global buffer sizes: service=%zu, "</div><div class='add'>+		    "aal0_rx=%zu\n", lanai_buf_size(&amp;lanai-&gt;service),</div><div class='ctx'> 		    lanai-&gt;naal0 ? lanai_buf_size(&amp;lanai-&gt;aal0buf) : 0);</div><div class='ctx'> 	if (left-- == 0) {</div><div class='ctx'> 		get_statistics(lanai);</div><div class='hunk'>@@ -2513,7 +2513,7 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)</div><div class='ctx'> 		left += sprintf(&amp;page[left], ",\n          rx_AAL=%d",</div><div class='ctx'> 		    lvcc-&gt;rx.atmvcc-&gt;qos.aal == ATM_AAL5 ? 5 : 0);</div><div class='ctx'> 		if (lvcc-&gt;rx.atmvcc-&gt;qos.aal == ATM_AAL5)</div><div class='del'>-			left += sprintf(&amp;page[left], ", rx_buf_size=%Zu, "</div><div class='add'>+			left += sprintf(&amp;page[left], ", rx_buf_size=%zu, "</div><div class='ctx'> 			    "rx_bad_len=%u,\n          rx_service_trash=%u, "</div><div class='ctx'> 			    "rx_service_stream=%u, rx_bad_crc=%u",</div><div class='ctx'> 			    lanai_buf_size(&amp;lvcc-&gt;rx.buf),</div><div class='hunk'>@@ -2524,7 +2524,7 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (lvcc-&gt;tx.atmvcc != NULL)</div><div class='ctx'> 		left += sprintf(&amp;page[left], ",\n          tx_AAL=%d, "</div><div class='del'>-		    "tx_buf_size=%Zu, tx_qos=%cBR, tx_backlogged=%c",</div><div class='add'>+		    "tx_buf_size=%zu, tx_qos=%cBR, tx_backlogged=%c",</div><div class='ctx'> 		    lvcc-&gt;tx.atmvcc-&gt;qos.aal == ATM_AAL5 ? 5 : 0,</div><div class='ctx'> 		    lanai_buf_size(&amp;lvcc-&gt;tx.buf),</div><div class='ctx'> 		    lvcc-&gt;tx.atmvcc == lanai-&gt;cbrvcc ? 'C' : 'U',</div><div class='head'>diff --git a/drivers/atm/midway.h b/drivers/atm/midway.h<br/>index 432525ad5e46..d8bec0f2a71c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/midway.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/midway.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/midway.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/midway.h</a></div><div class='hunk'>@@ -56,7 +56,7 @@</div><div class='ctx'> #define MID_CON_SUNI	0x00000040	/* 0: UTOPIA; 1: SUNI */</div><div class='ctx'> #define MID_CON_V6	0x00000020	/* 0: non-pipel UTOPIA (required iff</div><div class='ctx'> 					   !CON_SUNI; 1: UTOPIA */</div><div class='del'>-#define DAUGTHER_ID	0x0000001f	/* daugther board id */</div><div class='add'>+#define DAUGHTER_ID	0x0000001f	/* daughter board id */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Interrupt Status Acknowledge, Interrupt Status &amp; Interrupt Enable</div><div class='head'>diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c<br/>index c7296b583787..d879f3bca107 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/nicstar.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/nicstar.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/nicstar.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/nicstar.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include "nicstar.h"</div><div class='hunk'>@@ -1980,13 +1980,12 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)</div><div class='ctx'> 	card-&gt;lbfqc = ns_stat_lfbqc_get(stat);</div><div class='ctx'> </div><div class='ctx'> 	id = le32_to_cpu(rsqe-&gt;buffer_handle);</div><div class='del'>-	skb = idr_find(&amp;card-&gt;idr, id);</div><div class='add'>+	skb = idr_remove(&amp;card-&gt;idr, id);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		RXPRINTK(KERN_ERR</div><div class='del'>-			 "nicstar%d: idr_find() failed!\n", card-&gt;index);</div><div class='add'>+			 "nicstar%d: skb not found!\n", card-&gt;index);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	idr_remove(&amp;card-&gt;idr, id);</div><div class='ctx'> 	dma_sync_single_for_cpu(&amp;card-&gt;pcidev-&gt;dev,</div><div class='ctx'> 				NS_PRV_DMA(skb),</div><div class='ctx'> 				(NS_PRV_BUFTYPE(skb) == BUF_SM</div><div class='head'>diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c<br/>index 6ac2b2b1e8de..5ad037c07ec7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/solos-pci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/solos-pci.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/solos-pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/solos-pci.c</a></div><div class='hunk'>@@ -584,7 +584,7 @@ static ssize_t hardware_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return sprintf(buf, "%d\n", data32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(console, 0644, console_show, console_store);</div><div class='add'>+static DEVICE_ATTR_RW(console);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define SOLOS_ATTR_RO(x) static DEVICE_ATTR(x, 0444, solos_param_show, NULL);</div><div class='head'>diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c<br/>index 02159345566c..b0363149b2fd 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/suni.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/suni.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/suni.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/suni.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/atm_suni.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "suni.h"</div><div class='head'>diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c<br/>index 5120a96b3a89..4fa13a807873 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/uPD98402.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/uPD98402.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/uPD98402.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/uPD98402.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/sonet.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "uPD98402.h"</div><div class='head'>diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c<br/>index d3dc95484161..292dec18ffb8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/atm/zatm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/atm/zatm.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/atm/zatm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/atm/zatm.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;asm/string.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "uPD98401.h"</div><div class='ctx'> #include "uPD98402.h"</div><div class='head'>diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig<br/>index 10e1b9eee10e..8a8e403644d6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/auxdisplay/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/auxdisplay/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/auxdisplay/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/auxdisplay/Kconfig</a></div><div class='hunk'>@@ -128,4 +128,17 @@ config IMG_ASCII_LCD</div><div class='ctx'> 	  development boards such as the MIPS Boston, MIPS Malta &amp; MIPS SEAD3</div><div class='ctx'> 	  from Imagination Technologies.</div><div class='ctx'> </div><div class='add'>+config HT16K33</div><div class='add'>+	tristate "Holtek Ht16K33 LED controller with keyscan"</div><div class='add'>+	depends on FB &amp;&amp; OF &amp;&amp; I2C &amp;&amp; INPUT</div><div class='add'>+	select FB_SYS_FOPS</div><div class='add'>+	select FB_SYS_FILLRECT</div><div class='add'>+	select FB_SYS_COPYAREA</div><div class='add'>+	select FB_SYS_IMAGEBLIT</div><div class='add'>+	select INPUT_MATRIXKMAP</div><div class='add'>+	select FB_BACKLIGHT</div><div class='add'>+	help</div><div class='add'>+	  Say yes here to add support for Holtek HT16K33, RAM mapping 16*8</div><div class='add'>+	  LED controller driver with keyscan.</div><div class='add'>+</div><div class='ctx'> endif # AUXDISPLAY</div><div class='head'>diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile<br/>index 3127175c89df..cb3dd847713b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/auxdisplay/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/auxdisplay/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/auxdisplay/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/auxdisplay/Makefile</a></div><div class='hunk'>@@ -5,3 +5,4 @@</div><div class='ctx'> obj-$(CONFIG_KS0108)		+= ks0108.o</div><div class='ctx'> obj-$(CONFIG_CFAG12864B)	+= cfag12864b.o cfag12864bfb.o</div><div class='ctx'> obj-$(CONFIG_IMG_ASCII_LCD)	+= img-ascii-lcd.o</div><div class='add'>+obj-$(CONFIG_HT16K33)		+= ht16k33.o</div><div class='head'>diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c<br/>new file mode 100644<br/>index 000000000000..f66b45b235b0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/auxdisplay/ht16k33.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/auxdisplay/ht16k33.c</a></div><div class='hunk'>@@ -0,0 +1,543 @@</div><div class='add'>+/*</div><div class='add'>+ * HT16K33 driver</div><div class='add'>+ *</div><div class='add'>+ * Author: Robin van der Gracht &lt;robin@protonic.nl&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright: (C) 2016 Protonic Holland.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/input/matrix_keypad.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+/* Registers */</div><div class='add'>+#define REG_SYSTEM_SETUP		0x20</div><div class='add'>+#define REG_SYSTEM_SETUP_OSC_ON		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_DISPLAY_SETUP		0x80</div><div class='add'>+#define REG_DISPLAY_SETUP_ON		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_ROWINT_SET			0xA0</div><div class='add'>+#define REG_ROWINT_SET_INT_EN		BIT(0)</div><div class='add'>+#define REG_ROWINT_SET_INT_ACT_HIGH	BIT(1)</div><div class='add'>+</div><div class='add'>+#define REG_BRIGHTNESS			0xE0</div><div class='add'>+</div><div class='add'>+/* Defines */</div><div class='add'>+#define DRIVER_NAME			"ht16k33"</div><div class='add'>+</div><div class='add'>+#define MIN_BRIGHTNESS			0x1</div><div class='add'>+#define MAX_BRIGHTNESS			0x10</div><div class='add'>+</div><div class='add'>+#define HT16K33_MATRIX_LED_MAX_COLS	8</div><div class='add'>+#define HT16K33_MATRIX_LED_MAX_ROWS	16</div><div class='add'>+#define HT16K33_MATRIX_KEYPAD_MAX_COLS	3</div><div class='add'>+#define HT16K33_MATRIX_KEYPAD_MAX_ROWS	12</div><div class='add'>+</div><div class='add'>+#define BYTES_PER_ROW		(HT16K33_MATRIX_LED_MAX_ROWS / 8)</div><div class='add'>+#define HT16K33_FB_SIZE		(HT16K33_MATRIX_LED_MAX_COLS * BYTES_PER_ROW)</div><div class='add'>+</div><div class='add'>+struct ht16k33_keypad {</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct input_dev *dev;</div><div class='add'>+	uint32_t cols;</div><div class='add'>+	uint32_t rows;</div><div class='add'>+	uint32_t row_shift;</div><div class='add'>+	uint32_t debounce_ms;</div><div class='add'>+	uint16_t last_key_state[HT16K33_MATRIX_KEYPAD_MAX_COLS];</div><div class='add'>+</div><div class='add'>+	wait_queue_head_t wait;</div><div class='add'>+	bool stopped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ht16k33_fbdev {</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	uint32_t refresh_rate;</div><div class='add'>+	uint8_t *buffer;</div><div class='add'>+	uint8_t *cache;</div><div class='add'>+	struct delayed_work work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ht16k33_priv {</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct ht16k33_keypad keypad;</div><div class='add'>+	struct ht16k33_fbdev fbdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fb_fix_screeninfo ht16k33_fb_fix = {</div><div class='add'>+	.id		= DRIVER_NAME,</div><div class='add'>+	.type		= FB_TYPE_PACKED_PIXELS,</div><div class='add'>+	.visual		= FB_VISUAL_MONO10,</div><div class='add'>+	.xpanstep	= 0,</div><div class='add'>+	.ypanstep	= 0,</div><div class='add'>+	.ywrapstep	= 0,</div><div class='add'>+	.line_length	= HT16K33_MATRIX_LED_MAX_ROWS,</div><div class='add'>+	.accel		= FB_ACCEL_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fb_var_screeninfo ht16k33_fb_var = {</div><div class='add'>+	.xres = HT16K33_MATRIX_LED_MAX_ROWS,</div><div class='add'>+	.yres = HT16K33_MATRIX_LED_MAX_COLS,</div><div class='add'>+	.xres_virtual = HT16K33_MATRIX_LED_MAX_ROWS,</div><div class='add'>+	.yres_virtual = HT16K33_MATRIX_LED_MAX_COLS,</div><div class='add'>+	.bits_per_pixel = 1,</div><div class='add'>+	.red = { 0, 1, 0 },</div><div class='add'>+	.green = { 0, 1, 0 },</div><div class='add'>+	.blue = { 0, 1, 0 },</div><div class='add'>+	.left_margin = 0,</div><div class='add'>+	.right_margin = 0,</div><div class='add'>+	.upper_margin = 0,</div><div class='add'>+	.lower_margin = 0,</div><div class='add'>+	.vmode = FB_VMODE_NONINTERLACED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ht16k33_display_on(struct ht16k33_priv *priv)</div><div class='add'>+{</div><div class='add'>+	uint8_t data = REG_DISPLAY_SETUP | REG_DISPLAY_SETUP_ON;</div><div class='add'>+</div><div class='add'>+	return i2c_smbus_write_byte(priv-&gt;client, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ht16k33_display_off(struct ht16k33_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return i2c_smbus_write_byte(priv-&gt;client, REG_DISPLAY_SETUP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ht16k33_fb_queue(struct ht16k33_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct ht16k33_fbdev *fbdev = &amp;priv-&gt;fbdev;</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;fbdev-&gt;work,</div><div class='add'>+			      msecs_to_jiffies(HZ / fbdev-&gt;refresh_rate));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This gets the fb data from cache and copies it to ht16k33 display RAM</div><div class='add'>+ */</div><div class='add'>+static void ht16k33_fb_update(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ht16k33_fbdev *fbdev =</div><div class='add'>+		container_of(work, struct ht16k33_fbdev, work.work);</div><div class='add'>+	struct ht16k33_priv *priv =</div><div class='add'>+		container_of(fbdev, struct ht16k33_priv, fbdev);</div><div class='add'>+</div><div class='add'>+	uint8_t *p1, *p2;</div><div class='add'>+	int len, pos = 0, first = -1;</div><div class='add'>+</div><div class='add'>+	p1 = fbdev-&gt;cache;</div><div class='add'>+	p2 = fbdev-&gt;buffer;</div><div class='add'>+</div><div class='add'>+	/* Search for the first byte with changes */</div><div class='add'>+	while (pos &lt; HT16K33_FB_SIZE &amp;&amp; first &lt; 0) {</div><div class='add'>+		if (*(p1++) - *(p2++))</div><div class='add'>+			first = pos;</div><div class='add'>+		pos++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No changes found */</div><div class='add'>+	if (first &lt; 0)</div><div class='add'>+		goto requeue;</div><div class='add'>+</div><div class='add'>+	len = HT16K33_FB_SIZE - first;</div><div class='add'>+	p1 = fbdev-&gt;cache + HT16K33_FB_SIZE - 1;</div><div class='add'>+	p2 = fbdev-&gt;buffer + HT16K33_FB_SIZE - 1;</div><div class='add'>+</div><div class='add'>+	/* Determine i2c transfer length */</div><div class='add'>+	while (len &gt; 1) {</div><div class='add'>+		if (*(p1--) - *(p2--))</div><div class='add'>+			break;</div><div class='add'>+		len--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p1 = fbdev-&gt;cache + first;</div><div class='add'>+	p2 = fbdev-&gt;buffer + first;</div><div class='add'>+	if (!i2c_smbus_write_i2c_block_data(priv-&gt;client, first, len, p2))</div><div class='add'>+		memcpy(p1, p2, len);</div><div class='add'>+requeue:</div><div class='add'>+	ht16k33_fb_queue(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ht16k33_initialize(struct ht16k33_priv *priv)</div><div class='add'>+{</div><div class='add'>+	uint8_t byte;</div><div class='add'>+	int err;</div><div class='add'>+	uint8_t data[HT16K33_MATRIX_LED_MAX_COLS * 2];</div><div class='add'>+</div><div class='add'>+	/* Clear RAM (8 * 16 bits) */</div><div class='add'>+	memset(data, 0, sizeof(data));</div><div class='add'>+	err = i2c_smbus_write_block_data(priv-&gt;client, 0, sizeof(data), data);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Turn on internal oscillator */</div><div class='add'>+	byte = REG_SYSTEM_SETUP_OSC_ON | REG_SYSTEM_SETUP;</div><div class='add'>+	err = i2c_smbus_write_byte(priv-&gt;client, byte);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Configure INT pin */</div><div class='add'>+	byte = REG_ROWINT_SET | REG_ROWINT_SET_INT_ACT_HIGH;</div><div class='add'>+	if (priv-&gt;client-&gt;irq &gt; 0)</div><div class='add'>+		byte |= REG_ROWINT_SET_INT_EN;</div><div class='add'>+	return i2c_smbus_write_byte(priv-&gt;client, byte);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ht16k33_bl_update_status(struct backlight_device *bl)</div><div class='add'>+{</div><div class='add'>+	int brightness = bl-&gt;props.brightness;</div><div class='add'>+	struct ht16k33_priv *priv = bl_get_data(bl);</div><div class='add'>+</div><div class='add'>+	if (bl-&gt;props.power != FB_BLANK_UNBLANK ||</div><div class='add'>+	    bl-&gt;props.fb_blank != FB_BLANK_UNBLANK ||</div><div class='add'>+	    bl-&gt;props.state &amp; BL_CORE_FBBLANK || brightness == 0) {</div><div class='add'>+		return ht16k33_display_off(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ht16k33_display_on(priv);</div><div class='add'>+	return i2c_smbus_write_byte(priv-&gt;client,</div><div class='add'>+				    REG_BRIGHTNESS | (brightness - 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ht16k33_bl_check_fb(struct backlight_device *bl, struct fb_info *fi)</div><div class='add'>+{</div><div class='add'>+	struct ht16k33_priv *priv = bl_get_data(bl);</div><div class='add'>+</div><div class='add'>+	return (fi == NULL) || (fi-&gt;par == priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct backlight_ops ht16k33_bl_ops = {</div><div class='add'>+	.update_status	= ht16k33_bl_update_status,</div><div class='add'>+	.check_fb	= ht16k33_bl_check_fb,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ht16k33_mmap(struct fb_info *info, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct ht16k33_priv *priv = info-&gt;par;</div><div class='add'>+</div><div class='add'>+	return vm_insert_page(vma, vma-&gt;vm_start,</div><div class='add'>+			      virt_to_page(priv-&gt;fbdev.buffer));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fb_ops ht16k33_fb_ops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.fb_read = fb_sys_read,</div><div class='add'>+	.fb_write = fb_sys_write,</div><div class='add'>+	.fb_fillrect = sys_fillrect,</div><div class='add'>+	.fb_copyarea = sys_copyarea,</div><div class='add'>+	.fb_imageblit = sys_imageblit,</div><div class='add'>+	.fb_mmap = ht16k33_mmap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This gets the keys from keypad and reports it to input subsystem.</div><div class='add'>+ * Returns true if a key is pressed.</div><div class='add'>+ */</div><div class='add'>+static bool ht16k33_keypad_scan(struct ht16k33_keypad *keypad)</div><div class='add'>+{</div><div class='add'>+	const unsigned short *keycodes = keypad-&gt;dev-&gt;keycode;</div><div class='add'>+	u16 new_state[HT16K33_MATRIX_KEYPAD_MAX_COLS];</div><div class='add'>+	u8 data[HT16K33_MATRIX_KEYPAD_MAX_COLS * 2];</div><div class='add'>+	unsigned long bits_changed;</div><div class='add'>+	int row, col, code;</div><div class='add'>+	bool pressed = false;</div><div class='add'>+</div><div class='add'>+	if (i2c_smbus_read_i2c_block_data(keypad-&gt;client, 0x40, 6, data) != 6) {</div><div class='add'>+		dev_err(&amp;keypad-&gt;client-&gt;dev, "Failed to read key data\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (col = 0; col &lt; keypad-&gt;cols; col++) {</div><div class='add'>+		new_state[col] = (data[col * 2 + 1] &lt;&lt; 8) | data[col * 2];</div><div class='add'>+		if (new_state[col])</div><div class='add'>+			pressed = true;</div><div class='add'>+		bits_changed = keypad-&gt;last_key_state[col] ^ new_state[col];</div><div class='add'>+</div><div class='add'>+		for_each_set_bit(row, &amp;bits_changed, BITS_PER_LONG) {</div><div class='add'>+			code = MATRIX_SCAN_CODE(row, col, keypad-&gt;row_shift);</div><div class='add'>+			input_event(keypad-&gt;dev, EV_MSC, MSC_SCAN, code);</div><div class='add'>+			input_report_key(keypad-&gt;dev, keycodes[code],</div><div class='add'>+					 new_state[col] &amp; BIT(row));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	input_sync(keypad-&gt;dev);</div><div class='add'>+	memcpy(keypad-&gt;last_key_state, new_state, sizeof(new_state));</div><div class='add'>+</div><div class='add'>+	return pressed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ht16k33_keypad_irq_thread(int irq, void *dev)</div><div class='add'>+{</div><div class='add'>+	struct ht16k33_keypad *keypad = dev;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		wait_event_timeout(keypad-&gt;wait, keypad-&gt;stopped,</div><div class='add'>+				    msecs_to_jiffies(keypad-&gt;debounce_ms));</div><div class='add'>+		if (keypad-&gt;stopped)</div><div class='add'>+			break;</div><div class='add'>+	} while (ht16k33_keypad_scan(keypad));</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ht16k33_keypad_start(struct input_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct ht16k33_keypad *keypad = input_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	keypad-&gt;stopped = false;</div><div class='add'>+	mb();</div><div class='add'>+	enable_irq(keypad-&gt;client-&gt;irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ht16k33_keypad_stop(struct input_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct ht16k33_keypad *keypad = input_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	keypad-&gt;stopped = true;</div><div class='add'>+	mb();</div><div class='add'>+	wake_up(&amp;keypad-&gt;wait);</div><div class='add'>+	disable_irq(keypad-&gt;client-&gt;irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ht16k33_keypad_probe(struct i2c_client *client,</div><div class='add'>+				struct ht16k33_keypad *keypad)</div><div class='add'>+{</div><div class='add'>+	struct device_node *node = client-&gt;dev.of_node;</div><div class='add'>+	u32 rows = HT16K33_MATRIX_KEYPAD_MAX_ROWS;</div><div class='add'>+	u32 cols = HT16K33_MATRIX_KEYPAD_MAX_COLS;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	keypad-&gt;client = client;</div><div class='add'>+	init_waitqueue_head(&amp;keypad-&gt;wait);</div><div class='add'>+</div><div class='add'>+	keypad-&gt;dev = devm_input_allocate_device(&amp;client-&gt;dev);</div><div class='add'>+	if (!keypad-&gt;dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	input_set_drvdata(keypad-&gt;dev, keypad);</div><div class='add'>+</div><div class='add'>+	keypad-&gt;dev-&gt;name = DRIVER_NAME"-keypad";</div><div class='add'>+	keypad-&gt;dev-&gt;id.bustype = BUS_I2C;</div><div class='add'>+	keypad-&gt;dev-&gt;open = ht16k33_keypad_start;</div><div class='add'>+	keypad-&gt;dev-&gt;close = ht16k33_keypad_stop;</div><div class='add'>+</div><div class='add'>+	if (!of_get_property(node, "linux,no-autorepeat", NULL))</div><div class='add'>+		__set_bit(EV_REP, keypad-&gt;dev-&gt;evbit);</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(node, "debounce-delay-ms",</div><div class='add'>+				   &amp;keypad-&gt;debounce_ms);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "key debounce delay not specified\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = matrix_keypad_parse_of_params(&amp;client-&gt;dev, &amp;rows, &amp;cols);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	keypad-&gt;rows = rows;</div><div class='add'>+	keypad-&gt;cols = cols;</div><div class='add'>+	keypad-&gt;row_shift = get_count_order(cols);</div><div class='add'>+</div><div class='add'>+	err = matrix_keypad_build_keymap(NULL, NULL, rows, cols, NULL,</div><div class='add'>+					 keypad-&gt;dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "failed to build keymap\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devm_request_threaded_irq(&amp;client-&gt;dev, client-&gt;irq,</div><div class='add'>+					NULL, ht16k33_keypad_irq_thread,</div><div class='add'>+					IRQF_TRIGGER_HIGH | IRQF_ONESHOT,</div><div class='add'>+					DRIVER_NAME, keypad);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "irq request failed %d, error %d\n",</div><div class='add'>+			client-&gt;irq, err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ht16k33_keypad_stop(keypad-&gt;dev);</div><div class='add'>+</div><div class='add'>+	err = input_register_device(keypad-&gt;dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ht16k33_probe(struct i2c_client *client,</div><div class='add'>+				  const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	uint32_t dft_brightness;</div><div class='add'>+	struct backlight_device *bl;</div><div class='add'>+	struct backlight_properties bl_props;</div><div class='add'>+	struct ht16k33_priv *priv;</div><div class='add'>+	struct ht16k33_fbdev *fbdev;</div><div class='add'>+	struct device_node *node = client-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_I2C)) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "i2c_check_functionality error\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (client-&gt;irq &lt;= 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "No IRQ specified\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(&amp;client-&gt;dev, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;client = client;</div><div class='add'>+	i2c_set_clientdata(client, priv);</div><div class='add'>+	fbdev = &amp;priv-&gt;fbdev;</div><div class='add'>+</div><div class='add'>+	err = ht16k33_initialize(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Framebuffer (2 bytes per column) */</div><div class='add'>+	BUILD_BUG_ON(PAGE_SIZE &lt; HT16K33_FB_SIZE);</div><div class='add'>+	fbdev-&gt;buffer = (unsigned char *) get_zeroed_page(GFP_KERNEL);</div><div class='add'>+	if (!fbdev-&gt;buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fbdev-&gt;cache = devm_kmalloc(&amp;client-&gt;dev, HT16K33_FB_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!fbdev-&gt;cache) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_fbdev_buffer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fbdev-&gt;info = framebuffer_alloc(0, &amp;client-&gt;dev);</div><div class='add'>+	if (!fbdev-&gt;info) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_fbdev_buffer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(node, "refresh-rate-hz",</div><div class='add'>+		&amp;fbdev-&gt;refresh_rate);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "refresh rate not specified\n");</div><div class='add'>+		goto err_fbdev_info;</div><div class='add'>+	}</div><div class='add'>+	fb_bl_default_curve(fbdev-&gt;info, 0, MIN_BRIGHTNESS, MAX_BRIGHTNESS);</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;fbdev-&gt;work, ht16k33_fb_update);</div><div class='add'>+	fbdev-&gt;info-&gt;fbops = &amp;ht16k33_fb_ops;</div><div class='add'>+	fbdev-&gt;info-&gt;screen_base = (char __iomem *) fbdev-&gt;buffer;</div><div class='add'>+	fbdev-&gt;info-&gt;screen_size = HT16K33_FB_SIZE;</div><div class='add'>+	fbdev-&gt;info-&gt;fix = ht16k33_fb_fix;</div><div class='add'>+	fbdev-&gt;info-&gt;var = ht16k33_fb_var;</div><div class='add'>+	fbdev-&gt;info-&gt;pseudo_palette = NULL;</div><div class='add'>+	fbdev-&gt;info-&gt;flags = FBINFO_FLAG_DEFAULT;</div><div class='add'>+	fbdev-&gt;info-&gt;par = priv;</div><div class='add'>+</div><div class='add'>+	err = register_framebuffer(fbdev-&gt;info);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_fbdev_info;</div><div class='add'>+</div><div class='add'>+	err = ht16k33_keypad_probe(client, &amp;priv-&gt;keypad);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_fbdev_unregister;</div><div class='add'>+</div><div class='add'>+	/* Backlight */</div><div class='add'>+	memset(&amp;bl_props, 0, sizeof(struct backlight_properties));</div><div class='add'>+	bl_props.type = BACKLIGHT_RAW;</div><div class='add'>+	bl_props.max_brightness = MAX_BRIGHTNESS;</div><div class='add'>+</div><div class='add'>+	bl = devm_backlight_device_register(&amp;client-&gt;dev, DRIVER_NAME"-bl",</div><div class='add'>+					    &amp;client-&gt;dev, priv,</div><div class='add'>+					    &amp;ht16k33_bl_ops, &amp;bl_props);</div><div class='add'>+	if (IS_ERR(bl)) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "failed to register backlight\n");</div><div class='add'>+		err = PTR_ERR(bl);</div><div class='add'>+		goto err_fbdev_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(node, "default-brightness-level",</div><div class='add'>+				   &amp;dft_brightness);</div><div class='add'>+	if (err) {</div><div class='add'>+		dft_brightness = MAX_BRIGHTNESS;</div><div class='add'>+	} else if (dft_brightness &gt; MAX_BRIGHTNESS) {</div><div class='add'>+		dev_warn(&amp;client-&gt;dev,</div><div class='add'>+			 "invalid default brightness level: %u, using %u\n",</div><div class='add'>+			 dft_brightness, MAX_BRIGHTNESS);</div><div class='add'>+		dft_brightness = MAX_BRIGHTNESS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bl-&gt;props.brightness = dft_brightness;</div><div class='add'>+	ht16k33_bl_update_status(bl);</div><div class='add'>+</div><div class='add'>+	ht16k33_fb_queue(priv);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_fbdev_unregister:</div><div class='add'>+	unregister_framebuffer(fbdev-&gt;info);</div><div class='add'>+err_fbdev_info:</div><div class='add'>+	framebuffer_release(fbdev-&gt;info);</div><div class='add'>+err_fbdev_buffer:</div><div class='add'>+	free_page((unsigned long) fbdev-&gt;buffer);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ht16k33_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct ht16k33_priv *priv = i2c_get_clientdata(client);</div><div class='add'>+	struct ht16k33_fbdev *fbdev = &amp;priv-&gt;fbdev;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;fbdev-&gt;work);</div><div class='add'>+	unregister_framebuffer(fbdev-&gt;info);</div><div class='add'>+	framebuffer_release(fbdev-&gt;info);</div><div class='add'>+	free_page((unsigned long) fbdev-&gt;buffer);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id ht16k33_i2c_match[] = {</div><div class='add'>+	{ "ht16k33", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, ht16k33_i2c_match);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ht16k33_of_match[] = {</div><div class='add'>+	{ .compatible = "holtek,ht16k33", },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ht16k33_of_match);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver ht16k33_driver = {</div><div class='add'>+	.probe		= ht16k33_probe,</div><div class='add'>+	.remove		= ht16k33_remove,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name		= DRIVER_NAME,</div><div class='add'>+		.of_match_table	= of_match_ptr(ht16k33_of_match),</div><div class='add'>+	},</div><div class='add'>+	.id_table = ht16k33_i2c_match,</div><div class='add'>+};</div><div class='add'>+module_i2c_driver(ht16k33_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Holtek HT16K33 driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Robin van der Gracht &lt;robin@protonic.nl&gt;");</div><div class='head'>diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig<br/>index d02e7c0f5bfd..d718ae4b907a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/Kconfig</a></div><div class='hunk'>@@ -224,6 +224,8 @@ config DEBUG_TEST_DRIVER_REMOVE</div><div class='ctx'> 	  unusable. You should say N here unless you are explicitly looking to</div><div class='ctx'> 	  test this functionality.</div><div class='ctx'> </div><div class='add'>+source "drivers/base/test/Kconfig"</div><div class='add'>+</div><div class='ctx'> config SYS_HYPERVISOR</div><div class='ctx'> 	bool</div><div class='ctx'> 	default n</div><div class='hunk'>@@ -237,6 +239,7 @@ config GENERIC_CPU_AUTOPROBE</div><div class='ctx'> </div><div class='ctx'> config SOC_BUS</div><div class='ctx'> 	bool</div><div class='add'>+	select GLOB</div><div class='ctx'> </div><div class='ctx'> source "drivers/base/regmap/Kconfig"</div><div class='ctx'> </div><div class='hunk'>@@ -250,11 +253,11 @@ config DMA_SHARED_BUFFER</div><div class='ctx'> 	  APIs extension; the file's descriptor can then be passed on to other</div><div class='ctx'> 	  driver.</div><div class='ctx'> </div><div class='del'>-config FENCE_TRACE</div><div class='del'>-	bool "Enable verbose FENCE_TRACE messages"</div><div class='add'>+config DMA_FENCE_TRACE</div><div class='add'>+	bool "Enable verbose DMA_FENCE_TRACE messages"</div><div class='ctx'> 	depends on DMA_SHARED_BUFFER</div><div class='ctx'> 	help</div><div class='del'>-	  Enable the FENCE_TRACE printks. This will add extra</div><div class='add'>+	  Enable the DMA_FENCE_TRACE printks. This will add extra</div><div class='ctx'> 	  spam to the console log, but will make it easier to diagnose</div><div class='ctx'> 	  lockup related problems for dma-buffers shared across multiple</div><div class='ctx'> 	  devices.</div><div class='head'>diff --git a/drivers/base/Makefile b/drivers/base/Makefile<br/>index 2609ba20b396..f2816f6ff76a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/Makefile</a></div><div class='hunk'>@@ -24,5 +24,7 @@ obj-$(CONFIG_PINCTRL) += pinctrl.o</div><div class='ctx'> obj-$(CONFIG_DEV_COREDUMP) += devcoredump.o</div><div class='ctx'> obj-$(CONFIG_GENERIC_MSI_IRQ_DOMAIN) += platform-msi.o</div><div class='ctx'> </div><div class='add'>+obj-y			+= test/</div><div class='add'>+</div><div class='ctx'> ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/base.h b/drivers/base/base.h<br/>index e05db388bd1c..e19b1008e5fb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/base.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/base.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/base.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/base.h</a></div><div class='hunk'>@@ -107,6 +107,9 @@ extern void bus_remove_device(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> extern int bus_add_driver(struct device_driver *drv);</div><div class='ctx'> extern void bus_remove_driver(struct device_driver *drv);</div><div class='add'>+extern void device_release_driver_internal(struct device *dev,</div><div class='add'>+					   struct device_driver *drv,</div><div class='add'>+					   struct device *parent);</div><div class='ctx'> </div><div class='ctx'> extern void driver_detach(struct device_driver *drv);</div><div class='ctx'> extern int driver_probe_device(struct device_driver *drv, struct device *dev);</div><div class='hunk'>@@ -152,3 +155,13 @@ extern int devtmpfs_init(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline int devtmpfs_init(void) { return 0; }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+/* Device links support */</div><div class='add'>+extern int device_links_read_lock(void);</div><div class='add'>+extern void device_links_read_unlock(int idx);</div><div class='add'>+extern int device_links_check_suppliers(struct device *dev);</div><div class='add'>+extern void device_links_driver_bound(struct device *dev);</div><div class='add'>+extern void device_links_driver_cleanup(struct device *dev);</div><div class='add'>+extern void device_links_no_driver(struct device *dev);</div><div class='add'>+extern bool device_links_busy(struct device *dev);</div><div class='add'>+extern void device_links_unbind_consumers(struct device *dev);</div><div class='head'>diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c<br/>index e9fd32e91668..eb3af2739537 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/cacheinfo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/cacheinfo.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/cacheinfo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/cacheinfo.c</a></div><div class='hunk'>@@ -16,6 +16,9 @@</div><div class='ctx'>  * You should have received a copy of the GNU General Public License</div><div class='ctx'>  * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/cacheinfo.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='hunk'>@@ -85,7 +88,120 @@ static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf,</div><div class='ctx'> {</div><div class='ctx'> 	return sib_leaf-&gt;of_node == this_leaf-&gt;of_node;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* OF properties to query for a given cache type */</div><div class='add'>+struct cache_type_info {</div><div class='add'>+	const char *size_prop;</div><div class='add'>+	const char *line_size_props[2];</div><div class='add'>+	const char *nr_sets_prop;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cache_type_info cache_type_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.size_prop       = "cache-size",</div><div class='add'>+		.line_size_props = { "cache-line-size",</div><div class='add'>+				     "cache-block-size", },</div><div class='add'>+		.nr_sets_prop    = "cache-sets",</div><div class='add'>+	}, {</div><div class='add'>+		.size_prop       = "i-cache-size",</div><div class='add'>+		.line_size_props = { "i-cache-line-size",</div><div class='add'>+				     "i-cache-block-size", },</div><div class='add'>+		.nr_sets_prop    = "i-cache-sets",</div><div class='add'>+	}, {</div><div class='add'>+		.size_prop       = "d-cache-size",</div><div class='add'>+		.line_size_props = { "d-cache-line-size",</div><div class='add'>+				     "d-cache-block-size", },</div><div class='add'>+		.nr_sets_prop    = "d-cache-sets",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int get_cacheinfo_idx(enum cache_type type)</div><div class='add'>+{</div><div class='add'>+	if (type == CACHE_TYPE_UNIFIED)</div><div class='add'>+		return 0;</div><div class='add'>+	return type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cache_size(struct cacheinfo *this_leaf)</div><div class='add'>+{</div><div class='add'>+	const char *propname;</div><div class='add'>+	const __be32 *cache_size;</div><div class='add'>+	int ct_idx;</div><div class='add'>+</div><div class='add'>+	ct_idx = get_cacheinfo_idx(this_leaf-&gt;type);</div><div class='add'>+	propname = cache_type_info[ct_idx].size_prop;</div><div class='add'>+</div><div class='add'>+	cache_size = of_get_property(this_leaf-&gt;of_node, propname, NULL);</div><div class='add'>+	if (cache_size)</div><div class='add'>+		this_leaf-&gt;size = of_read_number(cache_size, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* not cache_line_size() because that's a macro in include/linux/cache.h */</div><div class='add'>+static void cache_get_line_size(struct cacheinfo *this_leaf)</div><div class='add'>+{</div><div class='add'>+	const __be32 *line_size;</div><div class='add'>+	int i, lim, ct_idx;</div><div class='add'>+</div><div class='add'>+	ct_idx = get_cacheinfo_idx(this_leaf-&gt;type);</div><div class='add'>+	lim = ARRAY_SIZE(cache_type_info[ct_idx].line_size_props);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; lim; i++) {</div><div class='add'>+		const char *propname;</div><div class='add'>+</div><div class='add'>+		propname = cache_type_info[ct_idx].line_size_props[i];</div><div class='add'>+		line_size = of_get_property(this_leaf-&gt;of_node, propname, NULL);</div><div class='add'>+		if (line_size)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (line_size)</div><div class='add'>+		this_leaf-&gt;coherency_line_size = of_read_number(line_size, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cache_nr_sets(struct cacheinfo *this_leaf)</div><div class='add'>+{</div><div class='add'>+	const char *propname;</div><div class='add'>+	const __be32 *nr_sets;</div><div class='add'>+	int ct_idx;</div><div class='add'>+</div><div class='add'>+	ct_idx = get_cacheinfo_idx(this_leaf-&gt;type);</div><div class='add'>+	propname = cache_type_info[ct_idx].nr_sets_prop;</div><div class='add'>+</div><div class='add'>+	nr_sets = of_get_property(this_leaf-&gt;of_node, propname, NULL);</div><div class='add'>+	if (nr_sets)</div><div class='add'>+		this_leaf-&gt;number_of_sets = of_read_number(nr_sets, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cache_associativity(struct cacheinfo *this_leaf)</div><div class='add'>+{</div><div class='add'>+	unsigned int line_size = this_leaf-&gt;coherency_line_size;</div><div class='add'>+	unsigned int nr_sets = this_leaf-&gt;number_of_sets;</div><div class='add'>+	unsigned int size = this_leaf-&gt;size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the cache is fully associative, there is no need to</div><div class='add'>+	 * check the other properties.</div><div class='add'>+	 */</div><div class='add'>+	if (!(nr_sets == 1) &amp;&amp; (nr_sets &gt; 0 &amp;&amp; size &gt; 0 &amp;&amp; line_size &gt; 0))</div><div class='add'>+		this_leaf-&gt;ways_of_associativity = (size / nr_sets) / line_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cache_of_override_properties(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+	struct cacheinfo *this_leaf;</div><div class='add'>+	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);</div><div class='add'>+</div><div class='add'>+	for (index = 0; index &lt; cache_leaves(cpu); index++) {</div><div class='add'>+		this_leaf = this_cpu_ci-&gt;info_list + index;</div><div class='add'>+		cache_size(this_leaf);</div><div class='add'>+		cache_get_line_size(this_leaf);</div><div class='add'>+		cache_nr_sets(this_leaf);</div><div class='add'>+		cache_associativity(this_leaf);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='add'>+static void cache_of_override_properties(unsigned int cpu) { }</div><div class='ctx'> static inline int cache_setup_of_node(unsigned int cpu) { return 0; }</div><div class='ctx'> static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf,</div><div class='ctx'> 					   struct cacheinfo *sib_leaf)</div><div class='hunk'>@@ -104,9 +220,16 @@ static int cache_shared_cpu_map_setup(unsigned int cpu)</div><div class='ctx'> 	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);</div><div class='ctx'> 	struct cacheinfo *this_leaf, *sib_leaf;</div><div class='ctx'> 	unsigned int index;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (this_cpu_ci-&gt;cpu_map_populated)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = cache_setup_of_node(cpu);</div><div class='add'>+	if (of_have_populated_dt())</div><div class='add'>+		ret = cache_setup_of_node(cpu);</div><div class='add'>+	else if (!acpi_disabled)</div><div class='add'>+		/* No cache property/hierarchy support yet in ACPI */</div><div class='add'>+		ret = -ENOTSUPP;</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -161,6 +284,12 @@ static void cache_shared_cpu_map_remove(unsigned int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cache_override_properties(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	if (of_have_populated_dt())</div><div class='add'>+		return cache_of_override_properties(cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void free_cache_attributes(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	if (!per_cpu_cacheinfo(cpu))</div><div class='hunk'>@@ -203,10 +332,11 @@ static int detect_cache_attributes(unsigned int cpu)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = cache_shared_cpu_map_setup(cpu);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		pr_warn("Unable to detect cache hierarchy from DT for CPU %d\n",</div><div class='del'>-			cpu);</div><div class='add'>+		pr_warn("Unable to detect cache hierarchy for CPU %d\n", cpu);</div><div class='ctx'> 		goto free_ci;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	cache_override_properties(cpu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> free_ci:</div><div class='hunk'>@@ -233,6 +363,7 @@ static ssize_t file_name##_show(struct device *dev,		\</div><div class='ctx'> 	return sprintf(buf, "%u\n", this_leaf-&gt;object);		\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+show_one(id, id);</div><div class='ctx'> show_one(level, level);</div><div class='ctx'> show_one(coherency_line_size, coherency_line_size);</div><div class='ctx'> show_one(number_of_sets, number_of_sets);</div><div class='hunk'>@@ -314,6 +445,7 @@ static ssize_t write_policy_show(struct device *dev,</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static DEVICE_ATTR_RO(id);</div><div class='ctx'> static DEVICE_ATTR_RO(level);</div><div class='ctx'> static DEVICE_ATTR_RO(type);</div><div class='ctx'> static DEVICE_ATTR_RO(coherency_line_size);</div><div class='hunk'>@@ -327,6 +459,7 @@ static DEVICE_ATTR_RO(shared_cpu_list);</div><div class='ctx'> static DEVICE_ATTR_RO(physical_line_partition);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *cache_default_attrs[] = {</div><div class='add'>+	&amp;dev_attr_id.attr,</div><div class='ctx'> 	&amp;dev_attr_type.attr,</div><div class='ctx'> 	&amp;dev_attr_level.attr,</div><div class='ctx'> 	&amp;dev_attr_shared_cpu_map.attr,</div><div class='hunk'>@@ -350,6 +483,8 @@ cache_default_attrs_is_visible(struct kobject *kobj,</div><div class='ctx'> 	const struct cpumask *mask = &amp;this_leaf-&gt;shared_cpu_map;</div><div class='ctx'> 	umode_t mode = attr-&gt;mode;</div><div class='ctx'> </div><div class='add'>+	if ((attr == &amp;dev_attr_id.attr) &amp;&amp; (this_leaf-&gt;attributes &amp; CACHE_ID))</div><div class='add'>+		return mode;</div><div class='ctx'> 	if ((attr == &amp;dev_attr_type.attr) &amp;&amp; this_leaf-&gt;type)</div><div class='ctx'> 		return mode;</div><div class='ctx'> 	if ((attr == &amp;dev_attr_level.attr) &amp;&amp; this_leaf-&gt;level)</div><div class='hunk'>@@ -498,57 +633,30 @@ err:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cache_remove_dev(unsigned int cpu)</div><div class='add'>+static int cacheinfo_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	if (!cpumask_test_cpu(cpu, &amp;cache_dev_map))</div><div class='del'>-		return;</div><div class='del'>-	cpumask_clear_cpu(cpu, &amp;cache_dev_map);</div><div class='add'>+	int rc = detect_cache_attributes(cpu);</div><div class='ctx'> </div><div class='del'>-	cpu_cache_sysfs_exit(cpu);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = cache_add_dev(cpu);</div><div class='add'>+	if (rc)</div><div class='add'>+		free_cache_attributes(cpu);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cacheinfo_cpu_callback(struct notifier_block *nfb,</div><div class='del'>-				  unsigned long action, void *hcpu)</div><div class='add'>+static int cacheinfo_cpu_pre_down(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	int rc = 0;</div><div class='add'>+	if (cpumask_test_and_clear_cpu(cpu, &amp;cache_dev_map))</div><div class='add'>+		cpu_cache_sysfs_exit(cpu);</div><div class='ctx'> </div><div class='del'>-	switch (action &amp; ~CPU_TASKS_FROZEN) {</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-		rc = detect_cache_attributes(cpu);</div><div class='del'>-		if (!rc)</div><div class='del'>-			rc = cache_add_dev(cpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-		cache_remove_dev(cpu);</div><div class='del'>-		free_cache_attributes(cpu);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return notifier_from_errno(rc);</div><div class='add'>+	free_cache_attributes(cpu);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init cacheinfo_sysfs_init(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu, rc = 0;</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='del'>-	for_each_online_cpu(cpu) {</div><div class='del'>-		rc = detect_cache_attributes(cpu);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto out;</div><div class='del'>-		rc = cache_add_dev(cpu);</div><div class='del'>-		if (rc) {</div><div class='del'>-			free_cache_attributes(cpu);</div><div class='del'>-			pr_err("error populating cacheinfo..cpu%d\n", cpu);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	__hotcpu_notifier(cacheinfo_cpu_callback, 0);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-	return rc;</div><div class='add'>+	return cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "base/cacheinfo:online",</div><div class='add'>+				 cacheinfo_cpu_online, cacheinfo_cpu_pre_down);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> device_initcall(cacheinfo_sysfs_init);</div><div class='head'>diff --git a/drivers/base/class.c b/drivers/base/class.c<br/>index 71059e32bebc..a2b2896693d6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/class.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/class.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/class.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/class.c</a></div><div class='hunk'>@@ -163,6 +163,18 @@ static void klist_class_dev_put(struct klist_node *n)</div><div class='ctx'> 	put_device(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int class_add_groups(struct class *cls,</div><div class='add'>+			    const struct attribute_group **groups)</div><div class='add'>+{</div><div class='add'>+	return sysfs_create_groups(&amp;cls-&gt;p-&gt;subsys.kobj, groups);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void class_remove_groups(struct class *cls,</div><div class='add'>+				const struct attribute_group **groups)</div><div class='add'>+{</div><div class='add'>+	return sysfs_remove_groups(&amp;cls-&gt;p-&gt;subsys.kobj, groups);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __class_register(struct class *cls, struct lock_class_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct subsys_private *cp;</div><div class='hunk'>@@ -203,6 +215,8 @@ int __class_register(struct class *cls, struct lock_class_key *key)</div><div class='ctx'> 		kfree(cp);</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='add'>+	error = class_add_groups(class_get(cls), cls-&gt;class_groups);</div><div class='add'>+	class_put(cls);</div><div class='ctx'> 	error = add_class_attrs(class_get(cls));</div><div class='ctx'> 	class_put(cls);</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -213,6 +227,7 @@ void class_unregister(struct class *cls)</div><div class='ctx'> {</div><div class='ctx'> 	pr_debug("device class '%s': unregistering\n", cls-&gt;name);</div><div class='ctx'> 	remove_class_attrs(cls);</div><div class='add'>+	class_remove_groups(cls, cls-&gt;class_groups);</div><div class='ctx'> 	kset_unregister(&amp;cls-&gt;p-&gt;subsys);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/core.c b/drivers/base/core.c<br/>index ce057a568673..684bda4d14a1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/core.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/core.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "base.h"</div><div class='hunk'>@@ -44,6 +45,572 @@ static int __init sysfs_deprecated_setup(char *arg)</div><div class='ctx'> early_param("sysfs.deprecated", sysfs_deprecated_setup);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Device links support. */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SRCU</div><div class='add'>+static DEFINE_MUTEX(device_links_lock);</div><div class='add'>+DEFINE_STATIC_SRCU(device_links_srcu);</div><div class='add'>+</div><div class='add'>+static inline void device_links_write_lock(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;device_links_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void device_links_write_unlock(void)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;device_links_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int device_links_read_lock(void)</div><div class='add'>+{</div><div class='add'>+	return srcu_read_lock(&amp;device_links_srcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void device_links_read_unlock(int idx)</div><div class='add'>+{</div><div class='add'>+	srcu_read_unlock(&amp;device_links_srcu, idx);</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_SRCU */</div><div class='add'>+static DECLARE_RWSEM(device_links_lock);</div><div class='add'>+</div><div class='add'>+static inline void device_links_write_lock(void)</div><div class='add'>+{</div><div class='add'>+	down_write(&amp;device_links_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void device_links_write_unlock(void)</div><div class='add'>+{</div><div class='add'>+	up_write(&amp;device_links_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int device_links_read_lock(void)</div><div class='add'>+{</div><div class='add'>+	down_read(&amp;device_links_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void device_links_read_unlock(int not_used)</div><div class='add'>+{</div><div class='add'>+	up_read(&amp;device_links_lock);</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_SRCU */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_is_dependent - Check if one device depends on another one</div><div class='add'>+ * @dev: Device to check dependencies for.</div><div class='add'>+ * @target: Device to check against.</div><div class='add'>+ *</div><div class='add'>+ * Check if @target depends on @dev or any device dependent on it (its child or</div><div class='add'>+ * its consumer etc).  Return 1 if that is the case or 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static int device_is_dependent(struct device *dev, void *target)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(dev == target))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	ret = device_for_each_child(dev, target, device_is_dependent);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;dev-&gt;links.consumers, s_node) {</div><div class='add'>+		if (WARN_ON(link-&gt;consumer == target))</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		ret = device_is_dependent(link-&gt;consumer, target);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int device_reorder_to_tail(struct device *dev, void *not_used)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Devices that have not been registered yet will be put to the ends</div><div class='add'>+	 * of the lists during the registration, so skip them here.</div><div class='add'>+	 */</div><div class='add'>+	if (device_is_registered(dev))</div><div class='add'>+		devices_kset_move_last(dev);</div><div class='add'>+</div><div class='add'>+	if (device_pm_initialized(dev))</div><div class='add'>+		device_pm_move_last(dev);</div><div class='add'>+</div><div class='add'>+	device_for_each_child(dev, NULL, device_reorder_to_tail);</div><div class='add'>+	list_for_each_entry(link, &amp;dev-&gt;links.consumers, s_node)</div><div class='add'>+		device_reorder_to_tail(link-&gt;consumer, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_link_add - Create a link between two devices.</div><div class='add'>+ * @consumer: Consumer end of the link.</div><div class='add'>+ * @supplier: Supplier end of the link.</div><div class='add'>+ * @flags: Link flags.</div><div class='add'>+ *</div><div class='add'>+ * The caller is responsible for the proper synchronization of the link creation</div><div class='add'>+ * with runtime PM.  First, setting the DL_FLAG_PM_RUNTIME flag will cause the</div><div class='add'>+ * runtime PM framework to take the link into account.  Second, if the</div><div class='add'>+ * DL_FLAG_RPM_ACTIVE flag is set in addition to it, the supplier devices will</div><div class='add'>+ * be forced into the active metastate and reference-counted upon the creation</div><div class='add'>+ * of the link.  If DL_FLAG_PM_RUNTIME is not set, DL_FLAG_RPM_ACTIVE will be</div><div class='add'>+ * ignored.</div><div class='add'>+ *</div><div class='add'>+ * If the DL_FLAG_AUTOREMOVE is set, the link will be removed automatically</div><div class='add'>+ * when the consumer device driver unbinds from it.  The combination of both</div><div class='add'>+ * DL_FLAG_AUTOREMOVE and DL_FLAG_STATELESS set is invalid and will cause NULL</div><div class='add'>+ * to be returned.</div><div class='add'>+ *</div><div class='add'>+ * A side effect of the link creation is re-ordering of dpm_list and the</div><div class='add'>+ * devices_kset list by moving the consumer device and all devices depending</div><div class='add'>+ * on it to the ends of these lists (that does not happen to devices that have</div><div class='add'>+ * not been registered when this function is called).</div><div class='add'>+ *</div><div class='add'>+ * The supplier device is required to be registered when this function is called</div><div class='add'>+ * and NULL will be returned if that is not the case.  The consumer device need</div><div class='add'>+ * not be registered, however.</div><div class='add'>+ */</div><div class='add'>+struct device_link *device_link_add(struct device *consumer,</div><div class='add'>+				    struct device *supplier, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+</div><div class='add'>+	if (!consumer || !supplier ||</div><div class='add'>+	    ((flags &amp; DL_FLAG_STATELESS) &amp;&amp; (flags &amp; DL_FLAG_AUTOREMOVE)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	device_links_write_lock();</div><div class='add'>+	device_pm_lock();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the supplier has not been fully registered yet or there is a</div><div class='add'>+	 * reverse dependency between the consumer and the supplier already in</div><div class='add'>+	 * the graph, return NULL.</div><div class='add'>+	 */</div><div class='add'>+	if (!device_pm_initialized(supplier)</div><div class='add'>+	    || device_is_dependent(consumer, supplier)) {</div><div class='add'>+		link = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;supplier-&gt;links.consumers, s_node)</div><div class='add'>+		if (link-&gt;consumer == consumer)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+	link = kzalloc(sizeof(*link), GFP_KERNEL);</div><div class='add'>+	if (!link)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; DL_FLAG_PM_RUNTIME) {</div><div class='add'>+		if (flags &amp; DL_FLAG_RPM_ACTIVE) {</div><div class='add'>+			if (pm_runtime_get_sync(supplier) &lt; 0) {</div><div class='add'>+				pm_runtime_put_noidle(supplier);</div><div class='add'>+				kfree(link);</div><div class='add'>+				link = NULL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			link-&gt;rpm_active = true;</div><div class='add'>+		}</div><div class='add'>+		pm_runtime_new_link(consumer);</div><div class='add'>+	}</div><div class='add'>+	get_device(supplier);</div><div class='add'>+	link-&gt;supplier = supplier;</div><div class='add'>+	INIT_LIST_HEAD(&amp;link-&gt;s_node);</div><div class='add'>+	get_device(consumer);</div><div class='add'>+	link-&gt;consumer = consumer;</div><div class='add'>+	INIT_LIST_HEAD(&amp;link-&gt;c_node);</div><div class='add'>+	link-&gt;flags = flags;</div><div class='add'>+</div><div class='add'>+	/* Determine the initial link state. */</div><div class='add'>+	if (flags &amp; DL_FLAG_STATELESS) {</div><div class='add'>+		link-&gt;status = DL_STATE_NONE;</div><div class='add'>+	} else {</div><div class='add'>+		switch (supplier-&gt;links.status) {</div><div class='add'>+		case DL_DEV_DRIVER_BOUND:</div><div class='add'>+			switch (consumer-&gt;links.status) {</div><div class='add'>+			case DL_DEV_PROBING:</div><div class='add'>+				/*</div><div class='add'>+				 * Balance the decrementation of the supplier's</div><div class='add'>+				 * runtime PM usage counter after consumer probe</div><div class='add'>+				 * in driver_probe_device().</div><div class='add'>+				 */</div><div class='add'>+				if (flags &amp; DL_FLAG_PM_RUNTIME)</div><div class='add'>+					pm_runtime_get_sync(supplier);</div><div class='add'>+</div><div class='add'>+				link-&gt;status = DL_STATE_CONSUMER_PROBE;</div><div class='add'>+				break;</div><div class='add'>+			case DL_DEV_DRIVER_BOUND:</div><div class='add'>+				link-&gt;status = DL_STATE_ACTIVE;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				link-&gt;status = DL_STATE_AVAILABLE;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case DL_DEV_UNBINDING:</div><div class='add'>+			link-&gt;status = DL_STATE_SUPPLIER_UNBIND;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			link-&gt;status = DL_STATE_DORMANT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Move the consumer and all of the devices depending on it to the end</div><div class='add'>+	 * of dpm_list and the devices_kset list.</div><div class='add'>+	 *</div><div class='add'>+	 * It is necessary to hold dpm_list locked throughout all that or else</div><div class='add'>+	 * we may end up suspending with a wrong ordering of it.</div><div class='add'>+	 */</div><div class='add'>+	device_reorder_to_tail(consumer, NULL);</div><div class='add'>+</div><div class='add'>+	list_add_tail_rcu(&amp;link-&gt;s_node, &amp;supplier-&gt;links.consumers);</div><div class='add'>+	list_add_tail_rcu(&amp;link-&gt;c_node, &amp;consumer-&gt;links.suppliers);</div><div class='add'>+</div><div class='add'>+	dev_info(consumer, "Linked as a consumer to %s\n", dev_name(supplier));</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	device_pm_unlock();</div><div class='add'>+	device_links_write_unlock();</div><div class='add'>+	return link;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(device_link_add);</div><div class='add'>+</div><div class='add'>+static void device_link_free(struct device_link *link)</div><div class='add'>+{</div><div class='add'>+	put_device(link-&gt;consumer);</div><div class='add'>+	put_device(link-&gt;supplier);</div><div class='add'>+	kfree(link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SRCU</div><div class='add'>+static void __device_link_free_srcu(struct rcu_head *rhead)</div><div class='add'>+{</div><div class='add'>+	device_link_free(container_of(rhead, struct device_link, rcu_head));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __device_link_del(struct device_link *link)</div><div class='add'>+{</div><div class='add'>+	dev_info(link-&gt;consumer, "Dropping the link to %s\n",</div><div class='add'>+		 dev_name(link-&gt;supplier));</div><div class='add'>+</div><div class='add'>+	if (link-&gt;flags &amp; DL_FLAG_PM_RUNTIME)</div><div class='add'>+		pm_runtime_drop_link(link-&gt;consumer);</div><div class='add'>+</div><div class='add'>+	list_del_rcu(&amp;link-&gt;s_node);</div><div class='add'>+	list_del_rcu(&amp;link-&gt;c_node);</div><div class='add'>+	call_srcu(&amp;device_links_srcu, &amp;link-&gt;rcu_head, __device_link_free_srcu);</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_SRCU */</div><div class='add'>+static void __device_link_del(struct device_link *link)</div><div class='add'>+{</div><div class='add'>+	dev_info(link-&gt;consumer, "Dropping the link to %s\n",</div><div class='add'>+		 dev_name(link-&gt;supplier));</div><div class='add'>+</div><div class='add'>+	list_del(&amp;link-&gt;s_node);</div><div class='add'>+	list_del(&amp;link-&gt;c_node);</div><div class='add'>+	device_link_free(link);</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_SRCU */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_link_del - Delete a link between two devices.</div><div class='add'>+ * @link: Device link to delete.</div><div class='add'>+ *</div><div class='add'>+ * The caller must ensure proper synchronization of this function with runtime</div><div class='add'>+ * PM.</div><div class='add'>+ */</div><div class='add'>+void device_link_del(struct device_link *link)</div><div class='add'>+{</div><div class='add'>+	device_links_write_lock();</div><div class='add'>+	device_pm_lock();</div><div class='add'>+	__device_link_del(link);</div><div class='add'>+	device_pm_unlock();</div><div class='add'>+	device_links_write_unlock();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(device_link_del);</div><div class='add'>+</div><div class='add'>+static void device_links_missing_supplier(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;dev-&gt;links.suppliers, c_node)</div><div class='add'>+		if (link-&gt;status == DL_STATE_CONSUMER_PROBE)</div><div class='add'>+			WRITE_ONCE(link-&gt;status, DL_STATE_AVAILABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_links_check_suppliers - Check presence of supplier drivers.</div><div class='add'>+ * @dev: Consumer device.</div><div class='add'>+ *</div><div class='add'>+ * Check links from this device to any suppliers.  Walk the list of the device's</div><div class='add'>+ * links to suppliers and see if all of them are available.  If not, simply</div><div class='add'>+ * return -EPROBE_DEFER.</div><div class='add'>+ *</div><div class='add'>+ * We need to guarantee that the supplier will not go away after the check has</div><div class='add'>+ * been positive here.  It only can go away in __device_release_driver() and</div><div class='add'>+ * that function  checks the device's links to consumers.  This means we need to</div><div class='add'>+ * mark the link as "consumer probe in progress" to make the supplier removal</div><div class='add'>+ * wait for us to complete (or bad things may happen).</div><div class='add'>+ *</div><div class='add'>+ * Links with the DL_FLAG_STATELESS flag set are ignored.</div><div class='add'>+ */</div><div class='add'>+int device_links_check_suppliers(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	device_links_write_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;dev-&gt;links.suppliers, c_node) {</div><div class='add'>+		if (link-&gt;flags &amp; DL_FLAG_STATELESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link-&gt;status != DL_STATE_AVAILABLE) {</div><div class='add'>+			device_links_missing_supplier(dev);</div><div class='add'>+			ret = -EPROBE_DEFER;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		WRITE_ONCE(link-&gt;status, DL_STATE_CONSUMER_PROBE);</div><div class='add'>+	}</div><div class='add'>+	dev-&gt;links.status = DL_DEV_PROBING;</div><div class='add'>+</div><div class='add'>+	device_links_write_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_links_driver_bound - Update device links after probing its driver.</div><div class='add'>+ * @dev: Device to update the links for.</div><div class='add'>+ *</div><div class='add'>+ * The probe has been successful, so update links from this device to any</div><div class='add'>+ * consumers by changing their status to "available".</div><div class='add'>+ *</div><div class='add'>+ * Also change the status of @dev's links to suppliers to "active".</div><div class='add'>+ *</div><div class='add'>+ * Links with the DL_FLAG_STATELESS flag set are ignored.</div><div class='add'>+ */</div><div class='add'>+void device_links_driver_bound(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+</div><div class='add'>+	device_links_write_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;dev-&gt;links.consumers, s_node) {</div><div class='add'>+		if (link-&gt;flags &amp; DL_FLAG_STATELESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		WARN_ON(link-&gt;status != DL_STATE_DORMANT);</div><div class='add'>+		WRITE_ONCE(link-&gt;status, DL_STATE_AVAILABLE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;dev-&gt;links.suppliers, c_node) {</div><div class='add'>+		if (link-&gt;flags &amp; DL_FLAG_STATELESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		WARN_ON(link-&gt;status != DL_STATE_CONSUMER_PROBE);</div><div class='add'>+		WRITE_ONCE(link-&gt;status, DL_STATE_ACTIVE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;links.status = DL_DEV_DRIVER_BOUND;</div><div class='add'>+</div><div class='add'>+	device_links_write_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __device_links_no_driver - Update links of a device without a driver.</div><div class='add'>+ * @dev: Device without a drvier.</div><div class='add'>+ *</div><div class='add'>+ * Delete all non-persistent links from this device to any suppliers.</div><div class='add'>+ *</div><div class='add'>+ * Persistent links stay around, but their status is changed to "available",</div><div class='add'>+ * unless they already are in the "supplier unbind in progress" state in which</div><div class='add'>+ * case they need not be updated.</div><div class='add'>+ *</div><div class='add'>+ * Links with the DL_FLAG_STATELESS flag set are ignored.</div><div class='add'>+ */</div><div class='add'>+static void __device_links_no_driver(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link, *ln;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe_reverse(link, ln, &amp;dev-&gt;links.suppliers, c_node) {</div><div class='add'>+		if (link-&gt;flags &amp; DL_FLAG_STATELESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link-&gt;flags &amp; DL_FLAG_AUTOREMOVE)</div><div class='add'>+			__device_link_del(link);</div><div class='add'>+		else if (link-&gt;status != DL_STATE_SUPPLIER_UNBIND)</div><div class='add'>+			WRITE_ONCE(link-&gt;status, DL_STATE_AVAILABLE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;links.status = DL_DEV_NO_DRIVER;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void device_links_no_driver(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	device_links_write_lock();</div><div class='add'>+	__device_links_no_driver(dev);</div><div class='add'>+	device_links_write_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_links_driver_cleanup - Update links after driver removal.</div><div class='add'>+ * @dev: Device whose driver has just gone away.</div><div class='add'>+ *</div><div class='add'>+ * Update links to consumers for @dev by changing their status to "dormant" and</div><div class='add'>+ * invoke %__device_links_no_driver() to update links to suppliers for it as</div><div class='add'>+ * appropriate.</div><div class='add'>+ *</div><div class='add'>+ * Links with the DL_FLAG_STATELESS flag set are ignored.</div><div class='add'>+ */</div><div class='add'>+void device_links_driver_cleanup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+</div><div class='add'>+	device_links_write_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;dev-&gt;links.consumers, s_node) {</div><div class='add'>+		if (link-&gt;flags &amp; DL_FLAG_STATELESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		WARN_ON(link-&gt;flags &amp; DL_FLAG_AUTOREMOVE);</div><div class='add'>+		WARN_ON(link-&gt;status != DL_STATE_SUPPLIER_UNBIND);</div><div class='add'>+		WRITE_ONCE(link-&gt;status, DL_STATE_DORMANT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__device_links_no_driver(dev);</div><div class='add'>+</div><div class='add'>+	device_links_write_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_links_busy - Check if there are any busy links to consumers.</div><div class='add'>+ * @dev: Device to check.</div><div class='add'>+ *</div><div class='add'>+ * Check each consumer of the device and return 'true' if its link's status</div><div class='add'>+ * is one of "consumer probe" or "active" (meaning that the given consumer is</div><div class='add'>+ * probing right now or its driver is present).  Otherwise, change the link</div><div class='add'>+ * state to "supplier unbind" to prevent the consumer from being probed</div><div class='add'>+ * successfully going forward.</div><div class='add'>+ *</div><div class='add'>+ * Return 'false' if there are no probing or active consumers.</div><div class='add'>+ *</div><div class='add'>+ * Links with the DL_FLAG_STATELESS flag set are ignored.</div><div class='add'>+ */</div><div class='add'>+bool device_links_busy(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	device_links_write_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;dev-&gt;links.consumers, s_node) {</div><div class='add'>+		if (link-&gt;flags &amp; DL_FLAG_STATELESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link-&gt;status == DL_STATE_CONSUMER_PROBE</div><div class='add'>+		    || link-&gt;status == DL_STATE_ACTIVE) {</div><div class='add'>+			ret = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		WRITE_ONCE(link-&gt;status, DL_STATE_SUPPLIER_UNBIND);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;links.status = DL_DEV_UNBINDING;</div><div class='add'>+</div><div class='add'>+	device_links_write_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_links_unbind_consumers - Force unbind consumers of the given device.</div><div class='add'>+ * @dev: Device to unbind the consumers of.</div><div class='add'>+ *</div><div class='add'>+ * Walk the list of links to consumers for @dev and if any of them is in the</div><div class='add'>+ * "consumer probe" state, wait for all device probes in progress to complete</div><div class='add'>+ * and start over.</div><div class='add'>+ *</div><div class='add'>+ * If that's not the case, change the status of the link to "supplier unbind"</div><div class='add'>+ * and check if the link was in the "active" state.  If so, force the consumer</div><div class='add'>+ * driver to unbind and start over (the consumer will not re-probe as we have</div><div class='add'>+ * changed the state of the link already).</div><div class='add'>+ *</div><div class='add'>+ * Links with the DL_FLAG_STATELESS flag set are ignored.</div><div class='add'>+ */</div><div class='add'>+void device_links_unbind_consumers(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+</div><div class='add'>+ start:</div><div class='add'>+	device_links_write_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;dev-&gt;links.consumers, s_node) {</div><div class='add'>+		enum device_link_state status;</div><div class='add'>+</div><div class='add'>+		if (link-&gt;flags &amp; DL_FLAG_STATELESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		status = link-&gt;status;</div><div class='add'>+		if (status == DL_STATE_CONSUMER_PROBE) {</div><div class='add'>+			device_links_write_unlock();</div><div class='add'>+</div><div class='add'>+			wait_for_device_probe();</div><div class='add'>+			goto start;</div><div class='add'>+		}</div><div class='add'>+		WRITE_ONCE(link-&gt;status, DL_STATE_SUPPLIER_UNBIND);</div><div class='add'>+		if (status == DL_STATE_ACTIVE) {</div><div class='add'>+			struct device *consumer = link-&gt;consumer;</div><div class='add'>+</div><div class='add'>+			get_device(consumer);</div><div class='add'>+</div><div class='add'>+			device_links_write_unlock();</div><div class='add'>+</div><div class='add'>+			device_release_driver_internal(consumer, NULL,</div><div class='add'>+						       consumer-&gt;parent);</div><div class='add'>+			put_device(consumer);</div><div class='add'>+			goto start;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_links_write_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_links_purge - Delete existing links to other devices.</div><div class='add'>+ * @dev: Target device.</div><div class='add'>+ */</div><div class='add'>+static void device_links_purge(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link, *ln;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Delete all of the remaining links from this device to any other</div><div class='add'>+	 * devices (either consumers or suppliers).</div><div class='add'>+	 */</div><div class='add'>+	device_links_write_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe_reverse(link, ln, &amp;dev-&gt;links.suppliers, c_node) {</div><div class='add'>+		WARN_ON(link-&gt;status == DL_STATE_ACTIVE);</div><div class='add'>+		__device_link_del(link);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe_reverse(link, ln, &amp;dev-&gt;links.consumers, s_node) {</div><div class='add'>+		WARN_ON(link-&gt;status != DL_STATE_DORMANT &amp;&amp;</div><div class='add'>+			link-&gt;status != DL_STATE_NONE);</div><div class='add'>+		__device_link_del(link);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_links_write_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Device links support end. */</div><div class='add'>+</div><div class='ctx'> int (*platform_notify)(struct device *dev) = NULL;</div><div class='ctx'> int (*platform_notify_remove)(struct device *dev) = NULL;</div><div class='ctx'> static struct kobject *dev_kobj;</div><div class='hunk'>@@ -72,6 +639,11 @@ int lock_device_hotplug_sysfs(void)</div><div class='ctx'> 	return restart_syscall();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void assert_held_device_hotplug(void)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;device_hotplug_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BLOCK</div><div class='ctx'> static inline int device_is_not_partition(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -711,6 +1283,9 @@ void device_initialize(struct device *dev)</div><div class='ctx'> #ifdef CONFIG_GENERIC_MSI_IRQ</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;msi_list);</div><div class='ctx'> #endif</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;links.consumers);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;links.suppliers);</div><div class='add'>+	dev-&gt;links.status = DL_DEV_NO_DRIVER;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(device_initialize);</div><div class='ctx'> </div><div class='hunk'>@@ -1258,6 +1833,8 @@ void device_del(struct device *dev)</div><div class='ctx'> 	if (dev-&gt;bus)</div><div class='ctx'> 		blocking_notifier_call_chain(&amp;dev-&gt;bus-&gt;p-&gt;bus_notifier,</div><div class='ctx'> 					     BUS_NOTIFY_DEL_DEVICE, dev);</div><div class='add'>+</div><div class='add'>+	device_links_purge(dev);</div><div class='ctx'> 	dpm_sysfs_remove(dev);</div><div class='ctx'> 	if (parent)</div><div class='ctx'> 		klist_del(&amp;dev-&gt;p-&gt;knode_parent);</div><div class='head'>diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c<br/>index 4c28e1a09786..2c3b359b3536 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/cpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/cpu.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/cpu.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/cpufeature.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='add'>+#include &lt;linux/pm_qos.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "base.h"</div><div class='ctx'> </div><div class='hunk'>@@ -376,6 +377,7 @@ int register_cpu(struct cpu *cpu, int num)</div><div class='ctx'> </div><div class='ctx'> 	per_cpu(cpu_sys_devices, num) = &amp;cpu-&gt;dev;</div><div class='ctx'> 	register_cpu_under_node(num, cpu_to_node(num));</div><div class='add'>+	dev_pm_qos_expose_latency_limit(&amp;cpu-&gt;dev, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/dd.c b/drivers/base/dd.c<br/>index d76cd97a98b6..a1fbf55c4d3a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/dd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/dd.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/dd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/dd.c</a></div><div class='hunk'>@@ -244,6 +244,7 @@ static void driver_bound(struct device *dev)</div><div class='ctx'> 		 __func__, dev_name(dev));</div><div class='ctx'> </div><div class='ctx'> 	klist_add_tail(&amp;dev-&gt;p-&gt;knode_driver, &amp;dev-&gt;driver-&gt;p-&gt;klist_devices);</div><div class='add'>+	device_links_driver_bound(dev);</div><div class='ctx'> </div><div class='ctx'> 	device_pm_check_callbacks(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -338,6 +339,10 @@ static int really_probe(struct device *dev, struct device_driver *drv)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = device_links_check_suppliers(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	atomic_inc(&amp;probe_count);</div><div class='ctx'> 	pr_debug("bus: '%s': %s: probing driver %s with device %s\n",</div><div class='ctx'> 		 drv-&gt;bus-&gt;name, __func__, drv-&gt;name, dev_name(dev));</div><div class='hunk'>@@ -416,6 +421,7 @@ probe_failed:</div><div class='ctx'> 		blocking_notifier_call_chain(&amp;dev-&gt;bus-&gt;p-&gt;bus_notifier,</div><div class='ctx'> 					     BUS_NOTIFY_DRIVER_NOT_BOUND, dev);</div><div class='ctx'> pinctrl_bind_failed:</div><div class='add'>+	device_links_no_driver(dev);</div><div class='ctx'> 	devres_release_all(dev);</div><div class='ctx'> 	driver_sysfs_remove(dev);</div><div class='ctx'> 	dev-&gt;driver = NULL;</div><div class='hunk'>@@ -508,6 +514,7 @@ int driver_probe_device(struct device_driver *drv, struct device *dev)</div><div class='ctx'> 	pr_debug("bus: '%s': %s: matched device %s with driver %s\n",</div><div class='ctx'> 		 drv-&gt;bus-&gt;name, __func__, dev_name(dev), drv-&gt;name);</div><div class='ctx'> </div><div class='add'>+	pm_runtime_get_suppliers(dev);</div><div class='ctx'> 	if (dev-&gt;parent)</div><div class='ctx'> 		pm_runtime_get_sync(dev-&gt;parent);</div><div class='ctx'> </div><div class='hunk'>@@ -518,6 +525,7 @@ int driver_probe_device(struct device_driver *drv, struct device *dev)</div><div class='ctx'> 	if (dev-&gt;parent)</div><div class='ctx'> 		pm_runtime_put(dev-&gt;parent);</div><div class='ctx'> </div><div class='add'>+	pm_runtime_put_suppliers(dev);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -772,7 +780,7 @@ EXPORT_SYMBOL_GPL(driver_attach);</div><div class='ctx'>  * __device_release_driver() must be called with @dev lock held.</div><div class='ctx'>  * When called for a USB interface, @dev-&gt;parent lock must be held as well.</div><div class='ctx'>  */</div><div class='del'>-static void __device_release_driver(struct device *dev)</div><div class='add'>+static void __device_release_driver(struct device *dev, struct device *parent)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_driver *drv;</div><div class='ctx'> </div><div class='hunk'>@@ -781,7 +789,27 @@ static void __device_release_driver(struct device *dev)</div><div class='ctx'> 		if (driver_allows_async_probing(drv))</div><div class='ctx'> 			async_synchronize_full();</div><div class='ctx'> </div><div class='add'>+		while (device_links_busy(dev)) {</div><div class='add'>+			device_unlock(dev);</div><div class='add'>+			if (parent)</div><div class='add'>+				device_unlock(parent);</div><div class='add'>+</div><div class='add'>+			device_links_unbind_consumers(dev);</div><div class='add'>+			if (parent)</div><div class='add'>+				device_lock(parent);</div><div class='add'>+</div><div class='add'>+			device_lock(dev);</div><div class='add'>+			/*</div><div class='add'>+			 * A concurrent invocation of the same function might</div><div class='add'>+			 * have released the driver successfully while this one</div><div class='add'>+			 * was waiting, so check for that.</div><div class='add'>+			 */</div><div class='add'>+			if (dev-&gt;driver != drv)</div><div class='add'>+				return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		pm_runtime_get_sync(dev);</div><div class='add'>+		pm_runtime_clean_up_links(dev);</div><div class='ctx'> </div><div class='ctx'> 		driver_sysfs_remove(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -796,6 +824,8 @@ static void __device_release_driver(struct device *dev)</div><div class='ctx'> 			dev-&gt;bus-&gt;remove(dev);</div><div class='ctx'> 		else if (drv-&gt;remove)</div><div class='ctx'> 			drv-&gt;remove(dev);</div><div class='add'>+</div><div class='add'>+		device_links_driver_cleanup(dev);</div><div class='ctx'> 		devres_release_all(dev);</div><div class='ctx'> 		dev-&gt;driver = NULL;</div><div class='ctx'> 		dev_set_drvdata(dev, NULL);</div><div class='hunk'>@@ -812,12 +842,32 @@ static void __device_release_driver(struct device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void device_release_driver_internal(struct device *dev,</div><div class='add'>+				    struct device_driver *drv,</div><div class='add'>+				    struct device *parent)</div><div class='add'>+{</div><div class='add'>+	if (parent)</div><div class='add'>+		device_lock(parent);</div><div class='add'>+</div><div class='add'>+	device_lock(dev);</div><div class='add'>+	if (!drv || drv == dev-&gt;driver)</div><div class='add'>+		__device_release_driver(dev, parent);</div><div class='add'>+</div><div class='add'>+	device_unlock(dev);</div><div class='add'>+	if (parent)</div><div class='add'>+		device_unlock(parent);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * device_release_driver - manually detach device from driver.</div><div class='ctx'>  * @dev: device.</div><div class='ctx'>  *</div><div class='ctx'>  * Manually detach device from driver.</div><div class='ctx'>  * When called for a USB interface, @dev-&gt;parent lock must be held.</div><div class='add'>+ *</div><div class='add'>+ * If this function is to be called with @dev-&gt;parent lock held, ensure that</div><div class='add'>+ * the device's consumers are unbound in advance or that their locks can be</div><div class='add'>+ * acquired under the @dev-&gt;parent lock.</div><div class='ctx'>  */</div><div class='ctx'> void device_release_driver(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -826,9 +876,7 @@ void device_release_driver(struct device *dev)</div><div class='ctx'> 	 * within their -&gt;remove callback for the same device, they</div><div class='ctx'> 	 * will deadlock right here.</div><div class='ctx'> 	 */</div><div class='del'>-	device_lock(dev);</div><div class='del'>-	__device_release_driver(dev);</div><div class='del'>-	device_unlock(dev);</div><div class='add'>+	device_release_driver_internal(dev, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(device_release_driver);</div><div class='ctx'> </div><div class='hunk'>@@ -853,15 +901,7 @@ void driver_detach(struct device_driver *drv)</div><div class='ctx'> 		dev = dev_prv-&gt;device;</div><div class='ctx'> 		get_device(dev);</div><div class='ctx'> 		spin_unlock(&amp;drv-&gt;p-&gt;klist_devices.k_lock);</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;parent)	/* Needed for USB */</div><div class='del'>-			device_lock(dev-&gt;parent);</div><div class='del'>-		device_lock(dev);</div><div class='del'>-		if (dev-&gt;driver == drv)</div><div class='del'>-			__device_release_driver(dev);</div><div class='del'>-		device_unlock(dev);</div><div class='del'>-		if (dev-&gt;parent)</div><div class='del'>-			device_unlock(dev-&gt;parent);</div><div class='add'>+		device_release_driver_internal(dev, drv, dev-&gt;parent);</div><div class='ctx'> 		put_device(dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/devcoredump.c b/drivers/base/devcoredump.c<br/>index 240374fd1838..7be310f7db73 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/devcoredump.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/devcoredump.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/devcoredump.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/devcoredump.c</a></div><div class='hunk'>@@ -160,18 +160,20 @@ static ssize_t disabled_store(struct class *class, struct class_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='add'>+static CLASS_ATTR_RW(disabled);</div><div class='ctx'> </div><div class='del'>-static struct class_attribute devcd_class_attrs[] = {</div><div class='del'>-	__ATTR_RW(disabled),</div><div class='del'>-	__ATTR_NULL</div><div class='add'>+static struct attribute *devcd_class_attrs[] = {</div><div class='add'>+	&amp;class_attr_disabled.attr,</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='add'>+ATTRIBUTE_GROUPS(devcd_class);</div><div class='ctx'> </div><div class='ctx'> static struct class devcd_class = {</div><div class='ctx'> 	.name		= "devcoredump",</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.dev_release	= devcd_dev_release,</div><div class='ctx'> 	.dev_groups	= devcd_dev_groups,</div><div class='del'>-	.class_attrs	= devcd_class_attrs,</div><div class='add'>+	.class_groups	= devcd_class_groups,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static ssize_t devcd_readv(char *buffer, loff_t offset, size_t count,</div><div class='head'>diff --git a/drivers/base/devres.c b/drivers/base/devres.c<br/>index 8fc654f0807b..71d577025285 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/devres.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/devres.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/devres.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/devres.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "base.h"</div><div class='ctx'> </div><div class='hunk'>@@ -985,3 +986,68 @@ void devm_free_pages(struct device *dev, unsigned long addr)</div><div class='ctx'> 			       &amp;devres));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(devm_free_pages);</div><div class='add'>+</div><div class='add'>+static void devm_percpu_release(struct device *dev, void *pdata)</div><div class='add'>+{</div><div class='add'>+	void __percpu *p;</div><div class='add'>+</div><div class='add'>+	p = *(void __percpu **)pdata;</div><div class='add'>+	free_percpu(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devm_percpu_match(struct device *dev, void *data, void *p)</div><div class='add'>+{</div><div class='add'>+	struct devres *devr = container_of(data, struct devres, data);</div><div class='add'>+</div><div class='add'>+	return *(void **)devr-&gt;data == p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __devm_alloc_percpu - Resource-managed alloc_percpu</div><div class='add'>+ * @dev: Device to allocate per-cpu memory for</div><div class='add'>+ * @size: Size of per-cpu memory to allocate</div><div class='add'>+ * @align: Alignment of per-cpu memory to allocate</div><div class='add'>+ *</div><div class='add'>+ * Managed alloc_percpu. Per-cpu memory allocated with this function is</div><div class='add'>+ * automatically freed on driver detach.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * Pointer to allocated memory on success, NULL on failure.</div><div class='add'>+ */</div><div class='add'>+void __percpu *__devm_alloc_percpu(struct device *dev, size_t size,</div><div class='add'>+		size_t align)</div><div class='add'>+{</div><div class='add'>+	void *p;</div><div class='add'>+	void __percpu *pcpu;</div><div class='add'>+</div><div class='add'>+	pcpu = __alloc_percpu(size, align);</div><div class='add'>+	if (!pcpu)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	p = devres_alloc(devm_percpu_release, sizeof(void *), GFP_KERNEL);</div><div class='add'>+	if (!p) {</div><div class='add'>+		free_percpu(pcpu);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*(void __percpu **)p = pcpu;</div><div class='add'>+</div><div class='add'>+	devres_add(dev, p);</div><div class='add'>+</div><div class='add'>+	return pcpu;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__devm_alloc_percpu);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_free_percpu - Resource-managed free_percpu</div><div class='add'>+ * @dev: Device this memory belongs to</div><div class='add'>+ * @pdata: Per-cpu memory to free</div><div class='add'>+ *</div><div class='add'>+ * Free memory allocated with devm_alloc_percpu().</div><div class='add'>+ */</div><div class='add'>+void devm_free_percpu(struct device *dev, void __percpu *pdata)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(devres_destroy(dev, devm_percpu_release, devm_percpu_match,</div><div class='add'>+			       (void *)pdata));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(devm_free_percpu);</div><div class='head'>diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c<br/>index 44a74cf1372c..d2fb9c8ed205 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/devtmpfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/devtmpfs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/devtmpfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/devtmpfs.c</a></div><div class='hunk'>@@ -309,7 +309,8 @@ static int handle_remove(const char *nodename, struct device *dev)</div><div class='ctx'> 	if (d_really_is_positive(dentry)) {</div><div class='ctx'> 		struct kstat stat;</div><div class='ctx'> 		struct path p = {.mnt = parent.mnt, .dentry = dentry};</div><div class='del'>-		err = vfs_getattr(&amp;p, &amp;stat);</div><div class='add'>+		err = vfs_getattr(&amp;p, &amp;stat, STATX_TYPE | STATX_MODE,</div><div class='add'>+				  AT_STATX_SYNC_AS_STAT);</div><div class='ctx'> 		if (!err &amp;&amp; dev_mynode(dev, d_inode(dentry), &amp;stat)) {</div><div class='ctx'> 			struct iattr newattrs;</div><div class='ctx'> 			/*</div><div class='head'>diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c<br/>index e167a1e1bccb..b55804cac4c4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/dma-contiguous.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/dma-contiguous.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/dma-contiguous.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/dma-contiguous.c</a></div><div class='hunk'>@@ -181,6 +181,7 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,</div><div class='ctx'>  * @dev:   Pointer to device for which the allocation is performed.</div><div class='ctx'>  * @count: Requested number of pages.</div><div class='ctx'>  * @align: Requested alignment of pages (in PAGE_SIZE order).</div><div class='add'>+ * @gfp_mask: GFP flags to use for this allocation.</div><div class='ctx'>  *</div><div class='ctx'>  * This function allocates memory buffer for specified device. It uses</div><div class='ctx'>  * device specific contiguous memory area if available or the default</div><div class='hunk'>@@ -188,12 +189,12 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,</div><div class='ctx'>  * function.</div><div class='ctx'>  */</div><div class='ctx'> struct page *dma_alloc_from_contiguous(struct device *dev, size_t count,</div><div class='del'>-				       unsigned int align)</div><div class='add'>+				       unsigned int align, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	if (align &gt; CONFIG_CMA_ALIGNMENT)</div><div class='ctx'> 		align = CONFIG_CMA_ALIGNMENT;</div><div class='ctx'> </div><div class='del'>-	return cma_alloc(dev_get_cma_area(dev), count, align);</div><div class='add'>+	return cma_alloc(dev_get_cma_area(dev), count, align, gfp_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c<br/>index 8f8b68c80986..efd71cf4fdea 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/dma-mapping.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/dma-mapping.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/dma-mapping.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/dma-mapping.c</a></div><div class='hunk'>@@ -108,13 +108,13 @@ void dmam_free_coherent(struct device *dev, size_t size, void *vaddr,</div><div class='ctx'> EXPORT_SYMBOL(dmam_free_coherent);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dmam_alloc_non_coherent - Managed dma_alloc_non_coherent()</div><div class='add'>+ * dmam_alloc_non_coherent - Managed dma_alloc_noncoherent()</div><div class='ctx'>  * @dev: Device to allocate non_coherent memory for</div><div class='ctx'>  * @size: Size of allocation</div><div class='ctx'>  * @dma_handle: Out argument for allocated DMA handle</div><div class='ctx'>  * @gfp: Allocation flags</div><div class='ctx'>  *</div><div class='del'>- * Managed dma_alloc_non_coherent().  Memory allocated using this</div><div class='add'>+ * Managed dma_alloc_noncoherent().  Memory allocated using this</div><div class='ctx'>  * function will be automatically released on driver detach.</div><div class='ctx'>  *</div><div class='ctx'>  * RETURNS:</div><div class='head'>diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c<br/>index 22d1760a4278..ac350c518e0c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/firmware_class.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/firmware_class.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/firmware_class.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/firmware_class.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='add'>+#include &lt;linux/swait.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;generated/utsrelease.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -91,10 +92,11 @@ static inline bool fw_is_builtin_firmware(const struct firmware *fw)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='add'>+enum fw_status {</div><div class='add'>+	FW_STATUS_UNKNOWN,</div><div class='ctx'> 	FW_STATUS_LOADING,</div><div class='ctx'> 	FW_STATUS_DONE,</div><div class='del'>-	FW_STATUS_ABORT,</div><div class='add'>+	FW_STATUS_ABORTED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int loading_timeout = 60;	/* In seconds */</div><div class='hunk'>@@ -104,6 +106,82 @@ static inline long firmware_loading_timeout(void)</div><div class='ctx'> 	return loading_timeout &gt; 0 ? loading_timeout * HZ : MAX_JIFFY_OFFSET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Concurrent request_firmware() for the same firmware need to be</div><div class='add'>+ * serialized.  struct fw_state is simple state machine which hold the</div><div class='add'>+ * state of the firmware loading.</div><div class='add'>+ */</div><div class='add'>+struct fw_state {</div><div class='add'>+	struct swait_queue_head wq;</div><div class='add'>+	enum fw_status status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void fw_state_init(struct fw_state *fw_st)</div><div class='add'>+{</div><div class='add'>+	init_swait_queue_head(&amp;fw_st-&gt;wq);</div><div class='add'>+	fw_st-&gt;status = FW_STATUS_UNKNOWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool __fw_state_is_done(enum fw_status status)</div><div class='add'>+{</div><div class='add'>+	return status == FW_STATUS_DONE || status == FW_STATUS_ABORTED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __fw_state_wait_common(struct fw_state *fw_st, long timeout)</div><div class='add'>+{</div><div class='add'>+	long ret;</div><div class='add'>+</div><div class='add'>+	ret = swait_event_interruptible_timeout(fw_st-&gt;wq,</div><div class='add'>+				__fw_state_is_done(READ_ONCE(fw_st-&gt;status)),</div><div class='add'>+				timeout);</div><div class='add'>+	if (ret != 0 &amp;&amp; fw_st-&gt;status == FW_STATUS_ABORTED)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	if (!ret)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return ret &lt; 0 ? ret : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __fw_state_set(struct fw_state *fw_st,</div><div class='add'>+			   enum fw_status status)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(fw_st-&gt;status, status);</div><div class='add'>+</div><div class='add'>+	if (status == FW_STATUS_DONE || status == FW_STATUS_ABORTED)</div><div class='add'>+		swake_up(&amp;fw_st-&gt;wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define fw_state_start(fw_st)					\</div><div class='add'>+	__fw_state_set(fw_st, FW_STATUS_LOADING)</div><div class='add'>+#define fw_state_done(fw_st)					\</div><div class='add'>+	__fw_state_set(fw_st, FW_STATUS_DONE)</div><div class='add'>+#define fw_state_wait(fw_st)					\</div><div class='add'>+	__fw_state_wait_common(fw_st, MAX_SCHEDULE_TIMEOUT)</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_FW_LOADER_USER_HELPER</div><div class='add'>+</div><div class='add'>+#define fw_state_is_aborted(fw_st)	false</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_FW_LOADER_USER_HELPER */</div><div class='add'>+</div><div class='add'>+static int __fw_state_check(struct fw_state *fw_st, enum fw_status status)</div><div class='add'>+{</div><div class='add'>+	return fw_st-&gt;status == status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define fw_state_aborted(fw_st)					\</div><div class='add'>+	__fw_state_set(fw_st, FW_STATUS_ABORTED)</div><div class='add'>+#define fw_state_is_done(fw_st)					\</div><div class='add'>+	__fw_state_check(fw_st, FW_STATUS_DONE)</div><div class='add'>+#define fw_state_is_loading(fw_st)				\</div><div class='add'>+	__fw_state_check(fw_st, FW_STATUS_LOADING)</div><div class='add'>+#define fw_state_is_aborted(fw_st)				\</div><div class='add'>+	__fw_state_check(fw_st, FW_STATUS_ABORTED)</div><div class='add'>+#define fw_state_wait_timeout(fw_st, timeout)			\</div><div class='add'>+	__fw_state_wait_common(fw_st, timeout)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_FW_LOADER_USER_HELPER */</div><div class='add'>+</div><div class='ctx'> /* firmware behavior options */</div><div class='ctx'> #define FW_OPT_UEVENT	(1U &lt;&lt; 0)</div><div class='ctx'> #define FW_OPT_NOWAIT	(1U &lt;&lt; 1)</div><div class='hunk'>@@ -145,9 +223,8 @@ struct firmware_cache {</div><div class='ctx'> struct firmware_buf {</div><div class='ctx'> 	struct kref ref;</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-	struct completion completion;</div><div class='ctx'> 	struct firmware_cache *fwc;</div><div class='del'>-	unsigned long status;</div><div class='add'>+	struct fw_state fw_st;</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> 	size_t allocated_size;</div><div class='hunk'>@@ -205,7 +282,7 @@ static struct firmware_buf *__allocate_fw_buf(const char *fw_name,</div><div class='ctx'> 	buf-&gt;fwc = fwc;</div><div class='ctx'> 	buf-&gt;data = dbuf;</div><div class='ctx'> 	buf-&gt;allocated_size = size;</div><div class='del'>-	init_completion(&amp;buf-&gt;completion);</div><div class='add'>+	fw_state_init(&amp;buf-&gt;fw_st);</div><div class='ctx'> #ifdef CONFIG_FW_LOADER_USER_HELPER</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;buf-&gt;pending_list);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -305,15 +382,6 @@ static const char * const fw_path[] = {</div><div class='ctx'> module_param_string(path, fw_path_para, sizeof(fw_path_para), 0644);</div><div class='ctx'> MODULE_PARM_DESC(path, "customized firmware image search path with a higher priority than default path");</div><div class='ctx'> </div><div class='del'>-static void fw_finish_direct_load(struct device *device,</div><div class='del'>-				  struct firmware_buf *buf)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;fw_lock);</div><div class='del'>-	set_bit(FW_STATUS_DONE, &amp;buf-&gt;status);</div><div class='del'>-	complete_all(&amp;buf-&gt;completion);</div><div class='del'>-	mutex_unlock(&amp;fw_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> fw_get_filesystem_firmware(struct device *device, struct firmware_buf *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -360,7 +428,7 @@ fw_get_filesystem_firmware(struct device *device, struct firmware_buf *buf)</div><div class='ctx'> 		}</div><div class='ctx'> 		dev_dbg(device, "direct-loading %s\n", buf-&gt;fw_id);</div><div class='ctx'> 		buf-&gt;size = size;</div><div class='del'>-		fw_finish_direct_load(device, buf);</div><div class='add'>+		fw_state_done(&amp;buf-&gt;fw_st);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	__putname(path);</div><div class='hunk'>@@ -478,12 +546,11 @@ static void __fw_load_abort(struct firmware_buf *buf)</div><div class='ctx'> 	 * There is a small window in which user can write to 'loading'</div><div class='ctx'> 	 * between loading done and disappearance of 'loading'</div><div class='ctx'> 	 */</div><div class='del'>-	if (test_bit(FW_STATUS_DONE, &amp;buf-&gt;status))</div><div class='add'>+	if (fw_state_is_done(&amp;buf-&gt;fw_st))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	list_del_init(&amp;buf-&gt;pending_list);</div><div class='del'>-	set_bit(FW_STATUS_ABORT, &amp;buf-&gt;status);</div><div class='del'>-	complete_all(&amp;buf-&gt;completion);</div><div class='add'>+	fw_state_aborted(&amp;buf-&gt;fw_st);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fw_load_abort(struct firmware_priv *fw_priv)</div><div class='hunk'>@@ -491,14 +558,8 @@ static void fw_load_abort(struct firmware_priv *fw_priv)</div><div class='ctx'> 	struct firmware_buf *buf = fw_priv-&gt;buf;</div><div class='ctx'> </div><div class='ctx'> 	__fw_load_abort(buf);</div><div class='del'>-</div><div class='del'>-	/* avoid user action after loading abort */</div><div class='del'>-	fw_priv-&gt;buf = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define is_fw_load_aborted(buf)	\</div><div class='del'>-	test_bit(FW_STATUS_ABORT, &amp;(buf)-&gt;status)</div><div class='del'>-</div><div class='ctx'> static LIST_HEAD(pending_fw_head);</div><div class='ctx'> </div><div class='ctx'> /* reboot notifier for avoid deadlock with usermode_lock */</div><div class='hunk'>@@ -546,11 +607,13 @@ static ssize_t timeout_store(struct class *class, struct class_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='add'>+static CLASS_ATTR_RW(timeout);</div><div class='ctx'> </div><div class='del'>-static struct class_attribute firmware_class_attrs[] = {</div><div class='del'>-	__ATTR_RW(timeout),</div><div class='del'>-	__ATTR_NULL</div><div class='add'>+static struct attribute *firmware_class_attrs[] = {</div><div class='add'>+	&amp;class_attr_timeout.attr,</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='add'>+ATTRIBUTE_GROUPS(firmware_class);</div><div class='ctx'> </div><div class='ctx'> static void fw_dev_release(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -585,7 +648,7 @@ static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env)</div><div class='ctx'> </div><div class='ctx'> static struct class firmware_class = {</div><div class='ctx'> 	.name		= "firmware",</div><div class='del'>-	.class_attrs	= firmware_class_attrs,</div><div class='add'>+	.class_groups	= firmware_class_groups,</div><div class='ctx'> 	.dev_uevent	= firmware_uevent,</div><div class='ctx'> 	.dev_release	= fw_dev_release,</div><div class='ctx'> };</div><div class='hunk'>@@ -598,7 +661,7 @@ static ssize_t firmware_loading_show(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fw_lock);</div><div class='ctx'> 	if (fw_priv-&gt;buf)</div><div class='del'>-		loading = test_bit(FW_STATUS_LOADING, &amp;fw_priv-&gt;buf-&gt;status);</div><div class='add'>+		loading = fw_state_is_loading(&amp;fw_priv-&gt;buf-&gt;fw_st);</div><div class='ctx'> 	mutex_unlock(&amp;fw_lock);</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "%d\n", loading);</div><div class='hunk'>@@ -647,29 +710,26 @@ static ssize_t firmware_loading_store(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fw_lock);</div><div class='ctx'> 	fw_buf = fw_priv-&gt;buf;</div><div class='del'>-	if (!fw_buf)</div><div class='add'>+	if (fw_state_is_aborted(&amp;fw_buf-&gt;fw_st))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	switch (loading) {</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		/* discarding any previous partial load */</div><div class='del'>-		if (!test_bit(FW_STATUS_DONE, &amp;fw_buf-&gt;status)) {</div><div class='add'>+		if (!fw_state_is_done(&amp;fw_buf-&gt;fw_st)) {</div><div class='ctx'> 			for (i = 0; i &lt; fw_buf-&gt;nr_pages; i++)</div><div class='ctx'> 				__free_page(fw_buf-&gt;pages[i]);</div><div class='ctx'> 			vfree(fw_buf-&gt;pages);</div><div class='ctx'> 			fw_buf-&gt;pages = NULL;</div><div class='ctx'> 			fw_buf-&gt;page_array_size = 0;</div><div class='ctx'> 			fw_buf-&gt;nr_pages = 0;</div><div class='del'>-			set_bit(FW_STATUS_LOADING, &amp;fw_buf-&gt;status);</div><div class='add'>+			fw_state_start(&amp;fw_buf-&gt;fw_st);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0:</div><div class='del'>-		if (test_bit(FW_STATUS_LOADING, &amp;fw_buf-&gt;status)) {</div><div class='add'>+		if (fw_state_is_loading(&amp;fw_buf-&gt;fw_st)) {</div><div class='ctx'> 			int rc;</div><div class='ctx'> </div><div class='del'>-			set_bit(FW_STATUS_DONE, &amp;fw_buf-&gt;status);</div><div class='del'>-			clear_bit(FW_STATUS_LOADING, &amp;fw_buf-&gt;status);</div><div class='del'>-</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Several loading requests may be pending on</div><div class='ctx'> 			 * one same firmware buf, so let all requests</div><div class='hunk'>@@ -691,10 +751,11 @@ static ssize_t firmware_loading_store(struct device *dev,</div><div class='ctx'> 			 */</div><div class='ctx'> 			list_del_init(&amp;fw_buf-&gt;pending_list);</div><div class='ctx'> 			if (rc) {</div><div class='del'>-				set_bit(FW_STATUS_ABORT, &amp;fw_buf-&gt;status);</div><div class='add'>+				fw_state_aborted(&amp;fw_buf-&gt;fw_st);</div><div class='ctx'> 				written = rc;</div><div class='add'>+			} else {</div><div class='add'>+				fw_state_done(&amp;fw_buf-&gt;fw_st);</div><div class='ctx'> 			}</div><div class='del'>-			complete_all(&amp;fw_buf-&gt;completion);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* fallthrough */</div><div class='hunk'>@@ -755,7 +816,7 @@ static ssize_t firmware_data_read(struct file *filp, struct kobject *kobj,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fw_lock);</div><div class='ctx'> 	buf = fw_priv-&gt;buf;</div><div class='del'>-	if (!buf || test_bit(FW_STATUS_DONE, &amp;buf-&gt;status)) {</div><div class='add'>+	if (!buf || fw_state_is_done(&amp;buf-&gt;fw_st)) {</div><div class='ctx'> 		ret_count = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -842,7 +903,7 @@ static ssize_t firmware_data_write(struct file *filp, struct kobject *kobj,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fw_lock);</div><div class='ctx'> 	buf = fw_priv-&gt;buf;</div><div class='del'>-	if (!buf || test_bit(FW_STATUS_DONE, &amp;buf-&gt;status)) {</div><div class='add'>+	if (!buf || fw_state_is_done(&amp;buf-&gt;fw_st)) {</div><div class='ctx'> 		retval = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -955,17 +1016,14 @@ static int _request_firmware_load(struct firmware_priv *fw_priv,</div><div class='ctx'> 		timeout = MAX_JIFFY_OFFSET;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	retval = wait_for_completion_interruptible_timeout(&amp;buf-&gt;completion,</div><div class='del'>-			timeout);</div><div class='del'>-	if (retval == -ERESTARTSYS || !retval) {</div><div class='add'>+	retval = fw_state_wait_timeout(&amp;buf-&gt;fw_st, timeout);</div><div class='add'>+	if (retval &lt; 0) {</div><div class='ctx'> 		mutex_lock(&amp;fw_lock);</div><div class='ctx'> 		fw_load_abort(fw_priv);</div><div class='ctx'> 		mutex_unlock(&amp;fw_lock);</div><div class='del'>-	} else if (retval &gt; 0) {</div><div class='del'>-		retval = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_fw_load_aborted(buf))</div><div class='add'>+	if (fw_state_is_aborted(&amp;buf-&gt;fw_st))</div><div class='ctx'> 		retval = -EAGAIN;</div><div class='ctx'> 	else if (buf-&gt;is_paged_buf &amp;&amp; !buf-&gt;data)</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='hunk'>@@ -1015,35 +1073,12 @@ fw_load_from_user_helper(struct firmware *firmware, const char *name,</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* No abort during direct loading */</div><div class='del'>-#define is_fw_load_aborted(buf) false</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static inline void kill_requests_without_uevent(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_FW_LOADER_USER_HELPER */</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* wait until the shared firmware_buf becomes ready (or error) */</div><div class='del'>-static int sync_cached_firmware_buf(struct firmware_buf *buf)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;fw_lock);</div><div class='del'>-	while (!test_bit(FW_STATUS_DONE, &amp;buf-&gt;status)) {</div><div class='del'>-		if (is_fw_load_aborted(buf)) {</div><div class='del'>-			ret = -ENOENT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;fw_lock);</div><div class='del'>-		ret = wait_for_completion_interruptible(&amp;buf-&gt;completion);</div><div class='del'>-		mutex_lock(&amp;fw_lock);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;fw_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* prepare firmware and firmware_buf structs;</div><div class='ctx'>  * return 0 if a firmware is already assigned, 1 if need to load one,</div><div class='ctx'>  * or a negative error code</div><div class='hunk'>@@ -1077,7 +1112,7 @@ _request_firmware_prepare(struct firmware **firmware_p, const char *name,</div><div class='ctx'> 	firmware-&gt;priv = buf;</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt; 0) {</div><div class='del'>-		ret = sync_cached_firmware_buf(buf);</div><div class='add'>+		ret = fw_state_wait(&amp;buf-&gt;fw_st);</div><div class='ctx'> 		if (!ret) {</div><div class='ctx'> 			fw_set_page_data(buf, firmware);</div><div class='ctx'> 			return 0; /* assigned */</div><div class='hunk'>@@ -1095,7 +1130,7 @@ static int assign_firmware_buf(struct firmware *fw, struct device *device,</div><div class='ctx'> 	struct firmware_buf *buf = fw-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fw_lock);</div><div class='del'>-	if (!buf-&gt;size || is_fw_load_aborted(buf)) {</div><div class='add'>+	if (!buf-&gt;size || fw_state_is_aborted(&amp;buf-&gt;fw_st)) {</div><div class='ctx'> 		mutex_unlock(&amp;fw_lock);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1345,9 +1380,9 @@ static void request_firmware_work_func(struct work_struct *work)</div><div class='ctx'>  *</div><div class='ctx'>  *	Asynchronous variant of request_firmware() for user contexts:</div><div class='ctx'>  *		- sleep for as small periods as possible since it may</div><div class='del'>- *		increase kernel boot time of built-in device drivers</div><div class='del'>- *		requesting firmware in their -&gt;probe() methods, if</div><div class='del'>- *		@gfp is GFP_KERNEL.</div><div class='add'>+ *		  increase kernel boot time of built-in device drivers</div><div class='add'>+ *		  requesting firmware in their -&gt;probe() methods, if</div><div class='add'>+ *		  @gfp is GFP_KERNEL.</div><div class='ctx'>  *</div><div class='ctx'>  *		- can't sleep at all if @gfp is GFP_ATOMIC.</div><div class='ctx'>  **/</div><div class='head'>diff --git a/drivers/base/memory.c b/drivers/base/memory.c<br/>index 62c63c0c5c22..cc4f1d0cbffe 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/memory.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/memory.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/memory.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/memory.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(mem_sysfs_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -226,11 +226,9 @@ memory_block_action(unsigned long phys_index, unsigned long action, int online_t</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long start_pfn;</div><div class='ctx'> 	unsigned long nr_pages = PAGES_PER_SECTION * sections_per_block;</div><div class='del'>-	struct page *first_page;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	start_pfn = section_nr_to_pfn(phys_index);</div><div class='del'>-	first_page = pfn_to_page(start_pfn);</div><div class='ctx'> </div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case MEM_ONLINE:</div><div class='hunk'>@@ -251,7 +249,7 @@ memory_block_action(unsigned long phys_index, unsigned long action, int online_t</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int memory_block_change_state(struct memory_block *mem,</div><div class='add'>+static int memory_block_change_state(struct memory_block *mem,</div><div class='ctx'> 		unsigned long to_state, unsigned long from_state_req)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -391,33 +389,33 @@ static ssize_t show_valid_zones(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct memory_block *mem = to_memory_block(dev);</div><div class='ctx'> 	unsigned long start_pfn, end_pfn;</div><div class='add'>+	unsigned long valid_start, valid_end, valid_pages;</div><div class='ctx'> 	unsigned long nr_pages = PAGES_PER_SECTION * sections_per_block;</div><div class='del'>-	struct page *first_page;</div><div class='ctx'> 	struct zone *zone;</div><div class='ctx'> 	int zone_shift = 0;</div><div class='ctx'> </div><div class='ctx'> 	start_pfn = section_nr_to_pfn(mem-&gt;start_section_nr);</div><div class='ctx'> 	end_pfn = start_pfn + nr_pages;</div><div class='del'>-	first_page = pfn_to_page(start_pfn);</div><div class='ctx'> </div><div class='ctx'> 	/* The block contains more than one zone can not be offlined. */</div><div class='del'>-	if (!test_pages_in_a_zone(start_pfn, end_pfn))</div><div class='add'>+	if (!test_pages_in_a_zone(start_pfn, end_pfn, &amp;valid_start, &amp;valid_end))</div><div class='ctx'> 		return sprintf(buf, "none\n");</div><div class='ctx'> </div><div class='del'>-	zone = page_zone(first_page);</div><div class='add'>+	zone = page_zone(pfn_to_page(valid_start));</div><div class='add'>+	valid_pages = valid_end - valid_start;</div><div class='ctx'> </div><div class='ctx'> 	/* MMOP_ONLINE_KEEP */</div><div class='ctx'> 	sprintf(buf, "%s", zone-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* MMOP_ONLINE_KERNEL */</div><div class='del'>-	zone_shift = zone_can_shift(start_pfn, nr_pages, ZONE_NORMAL);</div><div class='add'>+	zone_can_shift(valid_start, valid_pages, ZONE_NORMAL, &amp;zone_shift);</div><div class='ctx'> 	if (zone_shift) {</div><div class='ctx'> 		strcat(buf, " ");</div><div class='ctx'> 		strcat(buf, (zone + zone_shift)-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* MMOP_ONLINE_MOVABLE */</div><div class='del'>-	zone_shift = zone_can_shift(start_pfn, nr_pages, ZONE_MOVABLE);</div><div class='add'>+	zone_can_shift(valid_start, valid_pages, ZONE_MOVABLE, &amp;zone_shift);</div><div class='ctx'> 	if (zone_shift) {</div><div class='ctx'> 		strcat(buf, " ");</div><div class='ctx'> 		strcat(buf, (zone + zone_shift)-&gt;name);</div><div class='head'>diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c<br/>index be6a599bc0c1..0fc7c4da7756 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/platform-msi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/platform-msi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/platform-msi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/platform-msi.c</a></div><div class='hunk'>@@ -206,7 +206,7 @@ platform_msi_alloc_priv_data(struct device *dev, unsigned int nvec,</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_msi_priv_data *datap;</div><div class='ctx'> 	/*</div><div class='del'>-	 * Limit the number of interrupts to 256 per device. Should we</div><div class='add'>+	 * Limit the number of interrupts to 2048 per device. Should we</div><div class='ctx'> 	 * need to bump this up, DEV_ID_SHIFT should be adjusted</div><div class='ctx'> 	 * accordingly (which would impact the max number of MSI</div><div class='ctx'> 	 * capable devices).</div><div class='head'>diff --git a/drivers/base/platform.c b/drivers/base/platform.c<br/>index c4af00385502..c2456839214a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/platform.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/platform.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/platform.c</a></div><div class='hunk'>@@ -102,6 +102,16 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r = platform_get_resource(dev, IORESOURCE_IRQ, num);</div><div class='add'>+	if (has_acpi_companion(&amp;dev-&gt;dev)) {</div><div class='add'>+		if (r &amp;&amp; r-&gt;flags &amp; IORESOURCE_DISABLED) {</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			ret = acpi_irq_get(ACPI_HANDLE(&amp;dev-&gt;dev), num, r);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The resources may pass trigger flags to the irqs that need</div><div class='ctx'> 	 * to be set up. It so happens that the trigger flags for</div><div class='hunk'>@@ -396,7 +406,7 @@ int platform_device_add(struct platform_device *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (p &amp;&amp; insert_resource(p, r)) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "failed to claim resource %d\n", i);</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "failed to claim resource %d: %pR\n", i, r);</div><div class='ctx'> 			ret = -EBUSY;</div><div class='ctx'> 			goto failed;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c<br/>index e023066e4215..e697dec9d25b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/domain.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/domain.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/domain.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/domain.c</a></div><div class='hunk'>@@ -39,6 +39,105 @@</div><div class='ctx'> static LIST_HEAD(gpd_list);</div><div class='ctx'> static DEFINE_MUTEX(gpd_list_lock);</div><div class='ctx'> </div><div class='add'>+struct genpd_lock_ops {</div><div class='add'>+	void (*lock)(struct generic_pm_domain *genpd);</div><div class='add'>+	void (*lock_nested)(struct generic_pm_domain *genpd, int depth);</div><div class='add'>+	int (*lock_interruptible)(struct generic_pm_domain *genpd);</div><div class='add'>+	void (*unlock)(struct generic_pm_domain *genpd);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void genpd_lock_mtx(struct generic_pm_domain *genpd)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;genpd-&gt;mlock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void genpd_lock_nested_mtx(struct generic_pm_domain *genpd,</div><div class='add'>+					int depth)</div><div class='add'>+{</div><div class='add'>+	mutex_lock_nested(&amp;genpd-&gt;mlock, depth);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_lock_interruptible_mtx(struct generic_pm_domain *genpd)</div><div class='add'>+{</div><div class='add'>+	return mutex_lock_interruptible(&amp;genpd-&gt;mlock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void genpd_unlock_mtx(struct generic_pm_domain *genpd)</div><div class='add'>+{</div><div class='add'>+	return mutex_unlock(&amp;genpd-&gt;mlock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct genpd_lock_ops genpd_mtx_ops = {</div><div class='add'>+	.lock = genpd_lock_mtx,</div><div class='add'>+	.lock_nested = genpd_lock_nested_mtx,</div><div class='add'>+	.lock_interruptible = genpd_lock_interruptible_mtx,</div><div class='add'>+	.unlock = genpd_unlock_mtx,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void genpd_lock_spin(struct generic_pm_domain *genpd)</div><div class='add'>+	__acquires(&amp;genpd-&gt;slock)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;genpd-&gt;slock, flags);</div><div class='add'>+	genpd-&gt;lock_flags = flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void genpd_lock_nested_spin(struct generic_pm_domain *genpd,</div><div class='add'>+					int depth)</div><div class='add'>+	__acquires(&amp;genpd-&gt;slock)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave_nested(&amp;genpd-&gt;slock, flags, depth);</div><div class='add'>+	genpd-&gt;lock_flags = flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_lock_interruptible_spin(struct generic_pm_domain *genpd)</div><div class='add'>+	__acquires(&amp;genpd-&gt;slock)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;genpd-&gt;slock, flags);</div><div class='add'>+	genpd-&gt;lock_flags = flags;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void genpd_unlock_spin(struct generic_pm_domain *genpd)</div><div class='add'>+	__releases(&amp;genpd-&gt;slock)</div><div class='add'>+{</div><div class='add'>+	spin_unlock_irqrestore(&amp;genpd-&gt;slock, genpd-&gt;lock_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct genpd_lock_ops genpd_spin_ops = {</div><div class='add'>+	.lock = genpd_lock_spin,</div><div class='add'>+	.lock_nested = genpd_lock_nested_spin,</div><div class='add'>+	.lock_interruptible = genpd_lock_interruptible_spin,</div><div class='add'>+	.unlock = genpd_unlock_spin,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define genpd_lock(p)			p-&gt;lock_ops-&gt;lock(p)</div><div class='add'>+#define genpd_lock_nested(p, d)		p-&gt;lock_ops-&gt;lock_nested(p, d)</div><div class='add'>+#define genpd_lock_interruptible(p)	p-&gt;lock_ops-&gt;lock_interruptible(p)</div><div class='add'>+#define genpd_unlock(p)			p-&gt;lock_ops-&gt;unlock(p)</div><div class='add'>+</div><div class='add'>+#define genpd_is_irq_safe(genpd)	(genpd-&gt;flags &amp; GENPD_FLAG_IRQ_SAFE)</div><div class='add'>+</div><div class='add'>+static inline bool irq_safe_dev_in_no_sleep_domain(struct device *dev,</div><div class='add'>+		struct generic_pm_domain *genpd)</div><div class='add'>+{</div><div class='add'>+	bool ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_is_irq_safe(dev) &amp;&amp; !genpd_is_irq_safe(genpd);</div><div class='add'>+</div><div class='add'>+	/* Warn once if IRQ safe dev in no sleep domain */</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_warn_once(dev, "PM domain %s will not be powered off\n",</div><div class='add'>+				genpd-&gt;name);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Get the generic PM domain for a particular struct device.</div><div class='ctx'>  * This validates the struct device pointer, the PM domain pointer,</div><div class='hunk'>@@ -102,7 +201,7 @@ static void genpd_sd_counter_inc(struct generic_pm_domain *genpd)</div><div class='ctx'> 	smp_mb__after_atomic();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int genpd_power_on(struct generic_pm_domain *genpd, bool timed)</div><div class='add'>+static int _genpd_power_on(struct generic_pm_domain *genpd, bool timed)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int state_idx = genpd-&gt;state_idx;</div><div class='ctx'> 	ktime_t time_start;</div><div class='hunk'>@@ -132,7 +231,7 @@ static int genpd_power_on(struct generic_pm_domain *genpd, bool timed)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int genpd_power_off(struct generic_pm_domain *genpd, bool timed)</div><div class='add'>+static int _genpd_power_off(struct generic_pm_domain *genpd, bool timed)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int state_idx = genpd-&gt;state_idx;</div><div class='ctx'> 	ktime_t time_start;</div><div class='hunk'>@@ -163,10 +262,10 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool timed)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * genpd_queue_power_off_work - Queue up the execution of genpd_poweroff().</div><div class='add'>+ * genpd_queue_power_off_work - Queue up the execution of genpd_power_off().</div><div class='ctx'>  * @genpd: PM domain to power off.</div><div class='ctx'>  *</div><div class='del'>- * Queue up the execution of genpd_poweroff() unless it's already been done</div><div class='add'>+ * Queue up the execution of genpd_power_off() unless it's already been done</div><div class='ctx'>  * before.</div><div class='ctx'>  */</div><div class='ctx'> static void genpd_queue_power_off_work(struct generic_pm_domain *genpd)</div><div class='hunk'>@@ -175,14 +274,101 @@ static void genpd_queue_power_off_work(struct generic_pm_domain *genpd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * genpd_poweron - Restore power to a given PM domain and its masters.</div><div class='add'>+ * genpd_power_off - Remove power from a given PM domain.</div><div class='add'>+ * @genpd: PM domain to power down.</div><div class='add'>+ * @one_dev_on: If invoked from genpd's -&gt;runtime_suspend|resume() callback, the</div><div class='add'>+ * RPM status of the releated device is in an intermediate state, not yet turned</div><div class='add'>+ * into RPM_SUSPENDED. This means genpd_power_off() must allow one device to not</div><div class='add'>+ * be RPM_SUSPENDED, while it tries to power off the PM domain.</div><div class='add'>+ *</div><div class='add'>+ * If all of the @genpd's devices have been suspended and all of its subdomains</div><div class='add'>+ * have been powered down, remove power from @genpd.</div><div class='add'>+ */</div><div class='add'>+static int genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on,</div><div class='add'>+			   unsigned int depth)</div><div class='add'>+{</div><div class='add'>+	struct pm_domain_data *pdd;</div><div class='add'>+	struct gpd_link *link;</div><div class='add'>+	unsigned int not_suspended = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do not try to power off the domain in the following situations:</div><div class='add'>+	 * (1) The domain is already in the "power off" state.</div><div class='add'>+	 * (2) System suspend is in progress.</div><div class='add'>+	 */</div><div class='add'>+	if (genpd-&gt;status == GPD_STATE_POWER_OFF</div><div class='add'>+	    || genpd-&gt;prepared_count &gt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;genpd-&gt;sd_count) &gt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(pdd, &amp;genpd-&gt;dev_list, list_node) {</div><div class='add'>+		enum pm_qos_flags_status stat;</div><div class='add'>+</div><div class='add'>+		stat = dev_pm_qos_flags(pdd-&gt;dev,</div><div class='add'>+					PM_QOS_FLAG_NO_POWER_OFF</div><div class='add'>+						| PM_QOS_FLAG_REMOTE_WAKEUP);</div><div class='add'>+		if (stat &gt; PM_QOS_FLAGS_NONE)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Do not allow PM domain to be powered off, when an IRQ safe</div><div class='add'>+		 * device is part of a non-IRQ safe domain.</div><div class='add'>+		 */</div><div class='add'>+		if (!pm_runtime_suspended(pdd-&gt;dev) ||</div><div class='add'>+			irq_safe_dev_in_no_sleep_domain(pdd-&gt;dev, genpd))</div><div class='add'>+			not_suspended++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (not_suspended &gt; 1 || (not_suspended == 1 &amp;&amp; !one_dev_on))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (genpd-&gt;gov &amp;&amp; genpd-&gt;gov-&gt;power_down_ok) {</div><div class='add'>+		if (!genpd-&gt;gov-&gt;power_down_ok(&amp;genpd-&gt;domain))</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (genpd-&gt;power_off) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		if (atomic_read(&amp;genpd-&gt;sd_count) &gt; 0)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If sd_count &gt; 0 at this point, one of the subdomains hasn't</div><div class='add'>+		 * managed to call genpd_power_on() for the master yet after</div><div class='add'>+		 * incrementing it.  In that case genpd_power_on() will wait</div><div class='add'>+		 * for us to drop the lock, so we can call .power_off() and let</div><div class='add'>+		 * the genpd_power_on() restore power for us (this shouldn't</div><div class='add'>+		 * happen very often).</div><div class='add'>+		 */</div><div class='add'>+		ret = _genpd_power_off(genpd, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genpd-&gt;status = GPD_STATE_POWER_OFF;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(link, &amp;genpd-&gt;slave_links, slave_node) {</div><div class='add'>+		genpd_sd_counter_dec(link-&gt;master);</div><div class='add'>+		genpd_lock_nested(link-&gt;master, depth + 1);</div><div class='add'>+		genpd_power_off(link-&gt;master, false, depth + 1);</div><div class='add'>+		genpd_unlock(link-&gt;master);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * genpd_power_on - Restore power to a given PM domain and its masters.</div><div class='ctx'>  * @genpd: PM domain to power up.</div><div class='ctx'>  * @depth: nesting count for lockdep.</div><div class='ctx'>  *</div><div class='ctx'>  * Restore power to @genpd and all of its masters so that it is possible to</div><div class='ctx'>  * resume a device belonging to it.</div><div class='ctx'>  */</div><div class='del'>-static int genpd_poweron(struct generic_pm_domain *genpd, unsigned int depth)</div><div class='add'>+static int genpd_power_on(struct generic_pm_domain *genpd, unsigned int depth)</div><div class='ctx'> {</div><div class='ctx'> 	struct gpd_link *link;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -200,9 +386,9 @@ static int genpd_poweron(struct generic_pm_domain *genpd, unsigned int depth)</div><div class='ctx'> </div><div class='ctx'> 		genpd_sd_counter_inc(master);</div><div class='ctx'> </div><div class='del'>-		mutex_lock_nested(&amp;master-&gt;lock, depth + 1);</div><div class='del'>-		ret = genpd_poweron(master, depth + 1);</div><div class='del'>-		mutex_unlock(&amp;master-&gt;lock);</div><div class='add'>+		genpd_lock_nested(master, depth + 1);</div><div class='add'>+		ret = genpd_power_on(master, depth + 1);</div><div class='add'>+		genpd_unlock(master);</div><div class='ctx'> </div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			genpd_sd_counter_dec(master);</div><div class='hunk'>@@ -210,7 +396,7 @@ static int genpd_poweron(struct generic_pm_domain *genpd, unsigned int depth)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = genpd_power_on(genpd, true);</div><div class='add'>+	ret = _genpd_power_on(genpd, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -222,7 +408,9 @@ static int genpd_poweron(struct generic_pm_domain *genpd, unsigned int depth)</div><div class='ctx'> 					&amp;genpd-&gt;slave_links,</div><div class='ctx'> 					slave_node) {</div><div class='ctx'> 		genpd_sd_counter_dec(link-&gt;master);</div><div class='del'>-		genpd_queue_power_off_work(link-&gt;master);</div><div class='add'>+		genpd_lock_nested(link-&gt;master, depth + 1);</div><div class='add'>+		genpd_power_off(link-&gt;master, false, depth + 1);</div><div class='add'>+		genpd_unlock(link-&gt;master);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -255,9 +443,9 @@ static int genpd_dev_pm_qos_notifier(struct notifier_block *nb,</div><div class='ctx'> 		spin_unlock_irq(&amp;dev-&gt;power.lock);</div><div class='ctx'> </div><div class='ctx'> 		if (!IS_ERR(genpd)) {</div><div class='del'>-			mutex_lock(&amp;genpd-&gt;lock);</div><div class='add'>+			genpd_lock(genpd);</div><div class='ctx'> 			genpd-&gt;max_off_time_changed = true;</div><div class='del'>-			mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+			genpd_unlock(genpd);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dev = dev-&gt;parent;</div><div class='hunk'>@@ -269,82 +457,6 @@ static int genpd_dev_pm_qos_notifier(struct notifier_block *nb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * genpd_poweroff - Remove power from a given PM domain.</div><div class='del'>- * @genpd: PM domain to power down.</div><div class='del'>- * @is_async: PM domain is powered down from a scheduled work</div><div class='del'>- *</div><div class='del'>- * If all of the @genpd's devices have been suspended and all of its subdomains</div><div class='del'>- * have been powered down, remove power from @genpd.</div><div class='del'>- */</div><div class='del'>-static int genpd_poweroff(struct generic_pm_domain *genpd, bool is_async)</div><div class='del'>-{</div><div class='del'>-	struct pm_domain_data *pdd;</div><div class='del'>-	struct gpd_link *link;</div><div class='del'>-	unsigned int not_suspended = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Do not try to power off the domain in the following situations:</div><div class='del'>-	 * (1) The domain is already in the "power off" state.</div><div class='del'>-	 * (2) System suspend is in progress.</div><div class='del'>-	 */</div><div class='del'>-	if (genpd-&gt;status == GPD_STATE_POWER_OFF</div><div class='del'>-	    || genpd-&gt;prepared_count &gt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;genpd-&gt;sd_count) &gt; 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(pdd, &amp;genpd-&gt;dev_list, list_node) {</div><div class='del'>-		enum pm_qos_flags_status stat;</div><div class='del'>-</div><div class='del'>-		stat = dev_pm_qos_flags(pdd-&gt;dev,</div><div class='del'>-					PM_QOS_FLAG_NO_POWER_OFF</div><div class='del'>-						| PM_QOS_FLAG_REMOTE_WAKEUP);</div><div class='del'>-		if (stat &gt; PM_QOS_FLAGS_NONE)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-</div><div class='del'>-		if (!pm_runtime_suspended(pdd-&gt;dev) || pdd-&gt;dev-&gt;power.irq_safe)</div><div class='del'>-			not_suspended++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (not_suspended &gt; 1 || (not_suspended == 1 &amp;&amp; is_async))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if (genpd-&gt;gov &amp;&amp; genpd-&gt;gov-&gt;power_down_ok) {</div><div class='del'>-		if (!genpd-&gt;gov-&gt;power_down_ok(&amp;genpd-&gt;domain))</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (genpd-&gt;power_off) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		if (atomic_read(&amp;genpd-&gt;sd_count) &gt; 0)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If sd_count &gt; 0 at this point, one of the subdomains hasn't</div><div class='del'>-		 * managed to call genpd_poweron() for the master yet after</div><div class='del'>-		 * incrementing it.  In that case genpd_poweron() will wait</div><div class='del'>-		 * for us to drop the lock, so we can call .power_off() and let</div><div class='del'>-		 * the genpd_poweron() restore power for us (this shouldn't</div><div class='del'>-		 * happen very often).</div><div class='del'>-		 */</div><div class='del'>-		ret = genpd_power_off(genpd, true);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	genpd-&gt;status = GPD_STATE_POWER_OFF;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(link, &amp;genpd-&gt;slave_links, slave_node) {</div><div class='del'>-		genpd_sd_counter_dec(link-&gt;master);</div><div class='del'>-		genpd_queue_power_off_work(link-&gt;master);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * genpd_power_off_work_fn - Power off PM domain whose subdomain count is 0.</div><div class='ctx'>  * @work: Work structure used for scheduling the execution of this function.</div><div class='ctx'>  */</div><div class='hunk'>@@ -354,9 +466,9 @@ static void genpd_power_off_work_fn(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	genpd = container_of(work, struct generic_pm_domain, power_off_work);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;genpd-&gt;lock);</div><div class='del'>-	genpd_poweroff(genpd, true);</div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_lock(genpd);</div><div class='add'>+	genpd_power_off(genpd, false, 0);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -440,6 +552,7 @@ static int genpd_runtime_suspend(struct device *dev)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	/* Measure suspend latency. */</div><div class='add'>+	time_start = 0;</div><div class='ctx'> 	if (runtime_pm)</div><div class='ctx'> 		time_start = ktime_get();</div><div class='ctx'> </div><div class='hunk'>@@ -466,15 +579,15 @@ static int genpd_runtime_suspend(struct device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If power.irq_safe is set, this routine will be run with interrupts</div><div class='del'>-	 * off, so it can't use mutexes.</div><div class='add'>+	 * If power.irq_safe is set, this routine may be run with</div><div class='add'>+	 * IRQs disabled, so suspend only if the PM domain also is irq_safe.</div><div class='ctx'> 	 */</div><div class='del'>-	if (dev-&gt;power.irq_safe)</div><div class='add'>+	if (irq_safe_dev_in_no_sleep_domain(dev, genpd))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;genpd-&gt;lock);</div><div class='del'>-	genpd_poweroff(genpd, false);</div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_lock(genpd);</div><div class='add'>+	genpd_power_off(genpd, true, 0);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -503,21 +616,25 @@ static int genpd_runtime_resume(struct device *dev)</div><div class='ctx'> 	if (IS_ERR(genpd))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* If power.irq_safe, the PM domain is never powered off. */</div><div class='del'>-	if (dev-&gt;power.irq_safe) {</div><div class='add'>+	/*</div><div class='add'>+	 * As we don't power off a non IRQ safe domain, which holds</div><div class='add'>+	 * an IRQ safe device, we don't need to restore power to it.</div><div class='add'>+	 */</div><div class='add'>+	if (irq_safe_dev_in_no_sleep_domain(dev, genpd)) {</div><div class='ctx'> 		timed = false;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;genpd-&gt;lock);</div><div class='del'>-	ret = genpd_poweron(genpd, 0);</div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_lock(genpd);</div><div class='add'>+	ret = genpd_power_on(genpd, 0);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='ctx'> 	/* Measure resume latency. */</div><div class='add'>+	time_start = 0;</div><div class='ctx'> 	if (timed &amp;&amp; runtime_pm)</div><div class='ctx'> 		time_start = ktime_get();</div><div class='ctx'> </div><div class='hunk'>@@ -546,10 +663,11 @@ static int genpd_runtime_resume(struct device *dev)</div><div class='ctx'> err_stop:</div><div class='ctx'> 	genpd_stop_dev(genpd, dev);</div><div class='ctx'> err_poweroff:</div><div class='del'>-	if (!dev-&gt;power.irq_safe) {</div><div class='del'>-		mutex_lock(&amp;genpd-&gt;lock);</div><div class='del'>-		genpd_poweroff(genpd, 0);</div><div class='del'>-		mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+	if (!pm_runtime_is_irq_safe(dev) ||</div><div class='add'>+		(pm_runtime_is_irq_safe(dev) &amp;&amp; genpd_is_irq_safe(genpd))) {</div><div class='add'>+		genpd_lock(genpd);</div><div class='add'>+		genpd_power_off(genpd, true, 0);</div><div class='add'>+		genpd_unlock(genpd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -564,9 +682,9 @@ static int __init pd_ignore_unused_setup(char *__unused)</div><div class='ctx'> __setup("pd_ignore_unused", pd_ignore_unused_setup);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * genpd_poweroff_unused - Power off all PM domains with no devices in use.</div><div class='add'>+ * genpd_power_off_unused - Power off all PM domains with no devices in use.</div><div class='ctx'>  */</div><div class='del'>-static int __init genpd_poweroff_unused(void)</div><div class='add'>+static int __init genpd_power_off_unused(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct generic_pm_domain *genpd;</div><div class='ctx'> </div><div class='hunk'>@@ -584,7 +702,7 @@ static int __init genpd_poweroff_unused(void)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-late_initcall(genpd_poweroff_unused);</div><div class='add'>+late_initcall(genpd_power_off_unused);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_GENERIC_DOMAINS_OF)</div><div class='ctx'> </div><div class='hunk'>@@ -617,18 +735,20 @@ static bool genpd_dev_active_wakeup(struct generic_pm_domain *genpd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * genpd_sync_poweroff - Synchronously power off a PM domain and its masters.</div><div class='add'>+ * genpd_sync_power_off - Synchronously power off a PM domain and its masters.</div><div class='ctx'>  * @genpd: PM domain to power off, if possible.</div><div class='add'>+ * @use_lock: use the lock.</div><div class='add'>+ * @depth: nesting count for lockdep.</div><div class='ctx'>  *</div><div class='ctx'>  * Check if the given PM domain can be powered off (during system suspend or</div><div class='ctx'>  * hibernation) and do that if so.  Also, in that case propagate to its masters.</div><div class='ctx'>  *</div><div class='ctx'>  * This function is only called in "noirq" and "syscore" stages of system power</div><div class='del'>- * transitions, so it need not acquire locks (all of the "noirq" callbacks are</div><div class='del'>- * executed sequentially, so it is guaranteed that it will never run twice in</div><div class='del'>- * parallel).</div><div class='add'>+ * transitions. The "noirq" callbacks may be executed asynchronously, thus in</div><div class='add'>+ * these cases the lock must be held.</div><div class='ctx'>  */</div><div class='del'>-static void genpd_sync_poweroff(struct generic_pm_domain *genpd)</div><div class='add'>+static void genpd_sync_power_off(struct generic_pm_domain *genpd, bool use_lock,</div><div class='add'>+				 unsigned int depth)</div><div class='ctx'> {</div><div class='ctx'> 	struct gpd_link *link;</div><div class='ctx'> </div><div class='hunk'>@@ -641,26 +761,35 @@ static void genpd_sync_poweroff(struct generic_pm_domain *genpd)</div><div class='ctx'> </div><div class='ctx'> 	/* Choose the deepest state when suspending */</div><div class='ctx'> 	genpd-&gt;state_idx = genpd-&gt;state_count - 1;</div><div class='del'>-	genpd_power_off(genpd, false);</div><div class='add'>+	_genpd_power_off(genpd, false);</div><div class='ctx'> </div><div class='ctx'> 	genpd-&gt;status = GPD_STATE_POWER_OFF;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(link, &amp;genpd-&gt;slave_links, slave_node) {</div><div class='ctx'> 		genpd_sd_counter_dec(link-&gt;master);</div><div class='del'>-		genpd_sync_poweroff(link-&gt;master);</div><div class='add'>+</div><div class='add'>+		if (use_lock)</div><div class='add'>+			genpd_lock_nested(link-&gt;master, depth + 1);</div><div class='add'>+</div><div class='add'>+		genpd_sync_power_off(link-&gt;master, use_lock, depth + 1);</div><div class='add'>+</div><div class='add'>+		if (use_lock)</div><div class='add'>+			genpd_unlock(link-&gt;master);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * genpd_sync_poweron - Synchronously power on a PM domain and its masters.</div><div class='add'>+ * genpd_sync_power_on - Synchronously power on a PM domain and its masters.</div><div class='ctx'>  * @genpd: PM domain to power on.</div><div class='add'>+ * @use_lock: use the lock.</div><div class='add'>+ * @depth: nesting count for lockdep.</div><div class='ctx'>  *</div><div class='ctx'>  * This function is only called in "noirq" and "syscore" stages of system power</div><div class='del'>- * transitions, so it need not acquire locks (all of the "noirq" callbacks are</div><div class='del'>- * executed sequentially, so it is guaranteed that it will never run twice in</div><div class='del'>- * parallel).</div><div class='add'>+ * transitions. The "noirq" callbacks may be executed asynchronously, thus in</div><div class='add'>+ * these cases the lock must be held.</div><div class='ctx'>  */</div><div class='del'>-static void genpd_sync_poweron(struct generic_pm_domain *genpd)</div><div class='add'>+static void genpd_sync_power_on(struct generic_pm_domain *genpd, bool use_lock,</div><div class='add'>+				unsigned int depth)</div><div class='ctx'> {</div><div class='ctx'> 	struct gpd_link *link;</div><div class='ctx'> </div><div class='hunk'>@@ -668,11 +797,18 @@ static void genpd_sync_poweron(struct generic_pm_domain *genpd)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(link, &amp;genpd-&gt;slave_links, slave_node) {</div><div class='del'>-		genpd_sync_poweron(link-&gt;master);</div><div class='ctx'> 		genpd_sd_counter_inc(link-&gt;master);</div><div class='add'>+</div><div class='add'>+		if (use_lock)</div><div class='add'>+			genpd_lock_nested(link-&gt;master, depth + 1);</div><div class='add'>+</div><div class='add'>+		genpd_sync_power_on(link-&gt;master, use_lock, depth + 1);</div><div class='add'>+</div><div class='add'>+		if (use_lock)</div><div class='add'>+			genpd_unlock(link-&gt;master);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	genpd_power_on(genpd, false);</div><div class='add'>+	_genpd_power_on(genpd, false);</div><div class='ctx'> </div><div class='ctx'> 	genpd-&gt;status = GPD_STATE_ACTIVE;</div><div class='ctx'> }</div><div class='hunk'>@@ -732,20 +868,20 @@ static int pm_genpd_prepare(struct device *dev)</div><div class='ctx'> 	if (resume_needed(dev, genpd))</div><div class='ctx'> 		pm_runtime_resume(dev);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_lock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	if (genpd-&gt;prepared_count++ == 0)</div><div class='ctx'> 		genpd-&gt;suspended_count = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	ret = pm_generic_prepare(dev);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		mutex_lock(&amp;genpd-&gt;lock);</div><div class='add'>+		genpd_lock(genpd);</div><div class='ctx'> </div><div class='ctx'> 		genpd-&gt;prepared_count--;</div><div class='ctx'> </div><div class='del'>-		mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+		genpd_unlock(genpd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -778,13 +914,10 @@ static int pm_genpd_suspend_noirq(struct device *dev)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Since all of the "noirq" callbacks are executed sequentially, it is</div><div class='del'>-	 * guaranteed that this function will never run twice in parallel for</div><div class='del'>-	 * the same PM domain, so it is not necessary to use locking here.</div><div class='del'>-	 */</div><div class='add'>+	genpd_lock(genpd);</div><div class='ctx'> 	genpd-&gt;suspended_count++;</div><div class='del'>-	genpd_sync_poweroff(genpd);</div><div class='add'>+	genpd_sync_power_off(genpd, true, 0);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -809,13 +942,10 @@ static int pm_genpd_resume_noirq(struct device *dev)</div><div class='ctx'> 	if (dev-&gt;power.wakeup_path &amp;&amp; genpd_dev_active_wakeup(genpd, dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Since all of the "noirq" callbacks are executed sequentially, it is</div><div class='del'>-	 * guaranteed that this function will never run twice in parallel for</div><div class='del'>-	 * the same PM domain, so it is not necessary to use locking here.</div><div class='del'>-	 */</div><div class='del'>-	genpd_sync_poweron(genpd);</div><div class='add'>+	genpd_lock(genpd);</div><div class='add'>+	genpd_sync_power_on(genpd, true, 0);</div><div class='ctx'> 	genpd-&gt;suspended_count--;</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	if (genpd-&gt;dev_ops.stop &amp;&amp; genpd-&gt;dev_ops.start)</div><div class='ctx'> 		ret = pm_runtime_force_resume(dev);</div><div class='hunk'>@@ -892,22 +1022,20 @@ static int pm_genpd_restore_noirq(struct device *dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Since all of the "noirq" callbacks are executed sequentially, it is</div><div class='del'>-	 * guaranteed that this function will never run twice in parallel for</div><div class='del'>-	 * the same PM domain, so it is not necessary to use locking here.</div><div class='del'>-	 *</div><div class='ctx'> 	 * At this point suspended_count == 0 means we are being run for the</div><div class='ctx'> 	 * first time for the given domain in the present cycle.</div><div class='ctx'> 	 */</div><div class='add'>+	genpd_lock(genpd);</div><div class='ctx'> 	if (genpd-&gt;suspended_count++ == 0)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The boot kernel might put the domain into arbitrary state,</div><div class='del'>-		 * so make it appear as powered off to genpd_sync_poweron(),</div><div class='add'>+		 * so make it appear as powered off to genpd_sync_power_on(),</div><div class='ctx'> 		 * so that it tries to power it on in case it was really off.</div><div class='ctx'> 		 */</div><div class='ctx'> 		genpd-&gt;status = GPD_STATE_POWER_OFF;</div><div class='ctx'> </div><div class='del'>-	genpd_sync_poweron(genpd);</div><div class='add'>+	genpd_sync_power_on(genpd, true, 0);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	if (genpd-&gt;dev_ops.stop &amp;&amp; genpd-&gt;dev_ops.start)</div><div class='ctx'> 		ret = pm_runtime_force_resume(dev);</div><div class='hunk'>@@ -936,13 +1064,13 @@ static void pm_genpd_complete(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	pm_generic_complete(dev);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_lock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	genpd-&gt;prepared_count--;</div><div class='ctx'> 	if (!genpd-&gt;prepared_count)</div><div class='ctx'> 		genpd_queue_power_off_work(genpd);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -962,9 +1090,9 @@ static void genpd_syscore_switch(struct device *dev, bool suspend)</div><div class='ctx'> </div><div class='ctx'> 	if (suspend) {</div><div class='ctx'> 		genpd-&gt;suspended_count++;</div><div class='del'>-		genpd_sync_poweroff(genpd);</div><div class='add'>+		genpd_sync_power_off(genpd, false, 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		genpd_sync_poweron(genpd);</div><div class='add'>+		genpd_sync_power_on(genpd, false, 0);</div><div class='ctx'> 		genpd-&gt;suspended_count--;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1071,7 +1199,7 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,</div><div class='ctx'> 	if (IS_ERR(gpd_data))</div><div class='ctx'> 		return PTR_ERR(gpd_data);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_lock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	if (genpd-&gt;prepared_count &gt; 0) {</div><div class='ctx'> 		ret = -EAGAIN;</div><div class='hunk'>@@ -1088,7 +1216,7 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,</div><div class='ctx'> 	list_add_tail(&amp;gpd_data-&gt;base.list_node, &amp;genpd-&gt;dev_list);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		genpd_free_dev_data(dev, gpd_data);</div><div class='hunk'>@@ -1130,7 +1258,7 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,</div><div class='ctx'> 	gpd_data = to_gpd_data(pdd);</div><div class='ctx'> 	dev_pm_qos_remove_notifier(dev, &amp;gpd_data-&gt;nb);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_lock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	if (genpd-&gt;prepared_count &gt; 0) {</div><div class='ctx'> 		ret = -EAGAIN;</div><div class='hunk'>@@ -1145,14 +1273,14 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,</div><div class='ctx'> </div><div class='ctx'> 	list_del_init(&amp;pdd-&gt;list_node);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	genpd_free_dev_data(dev, gpd_data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> 	dev_pm_qos_add_notifier(dev, &amp;gpd_data-&gt;nb);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1183,12 +1311,23 @@ static int genpd_add_subdomain(struct generic_pm_domain *genpd,</div><div class='ctx'> 	    || genpd == subdomain)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If the domain can be powered on/off in an IRQ safe</div><div class='add'>+	 * context, ensure that the subdomain can also be</div><div class='add'>+	 * powered on/off in that context.</div><div class='add'>+	 */</div><div class='add'>+	if (!genpd_is_irq_safe(genpd) &amp;&amp; genpd_is_irq_safe(subdomain)) {</div><div class='add'>+		WARN(1, "Parent %s of subdomain %s must be IRQ safe\n",</div><div class='add'>+				genpd-&gt;name, subdomain-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	link = kzalloc(sizeof(*link), GFP_KERNEL);</div><div class='ctx'> 	if (!link)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;subdomain-&gt;lock);</div><div class='del'>-	mutex_lock_nested(&amp;genpd-&gt;lock, SINGLE_DEPTH_NESTING);</div><div class='add'>+	genpd_lock(subdomain);</div><div class='add'>+	genpd_lock_nested(genpd, SINGLE_DEPTH_NESTING);</div><div class='ctx'> </div><div class='ctx'> 	if (genpd-&gt;status == GPD_STATE_POWER_OFF</div><div class='ctx'> 	    &amp;&amp;  subdomain-&gt;status != GPD_STATE_POWER_OFF) {</div><div class='hunk'>@@ -1211,8 +1350,8 @@ static int genpd_add_subdomain(struct generic_pm_domain *genpd,</div><div class='ctx'> 		genpd_sd_counter_inc(genpd);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='del'>-	mutex_unlock(&amp;subdomain-&gt;lock);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='add'>+	genpd_unlock(subdomain);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		kfree(link);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1250,8 +1389,8 @@ int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,</div><div class='ctx'> 	if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(subdomain))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;subdomain-&gt;lock);</div><div class='del'>-	mutex_lock_nested(&amp;genpd-&gt;lock, SINGLE_DEPTH_NESTING);</div><div class='add'>+	genpd_lock(subdomain);</div><div class='add'>+	genpd_lock_nested(genpd, SINGLE_DEPTH_NESTING);</div><div class='ctx'> </div><div class='ctx'> 	if (!list_empty(&amp;subdomain-&gt;master_links) || subdomain-&gt;device_count) {</div><div class='ctx'> 		pr_warn("%s: unable to remove subdomain %s\n", genpd-&gt;name,</div><div class='hunk'>@@ -1275,13 +1414,39 @@ int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='del'>-	mutex_unlock(&amp;subdomain-&gt;lock);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='add'>+	genpd_unlock(subdomain);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pm_genpd_remove_subdomain);</div><div class='ctx'> </div><div class='add'>+static int genpd_set_default_power_state(struct generic_pm_domain *genpd)</div><div class='add'>+{</div><div class='add'>+	struct genpd_power_state *state;</div><div class='add'>+</div><div class='add'>+	state = kzalloc(sizeof(*state), GFP_KERNEL);</div><div class='add'>+	if (!state)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	genpd-&gt;states = state;</div><div class='add'>+	genpd-&gt;state_count = 1;</div><div class='add'>+	genpd-&gt;free = state;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void genpd_lock_init(struct generic_pm_domain *genpd)</div><div class='add'>+{</div><div class='add'>+	if (genpd-&gt;flags &amp; GENPD_FLAG_IRQ_SAFE) {</div><div class='add'>+		spin_lock_init(&amp;genpd-&gt;slock);</div><div class='add'>+		genpd-&gt;lock_ops = &amp;genpd_spin_ops;</div><div class='add'>+	} else {</div><div class='add'>+		mutex_init(&amp;genpd-&gt;mlock);</div><div class='add'>+		genpd-&gt;lock_ops = &amp;genpd_mtx_ops;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * pm_genpd_init - Initialize a generic I/O PM domain object.</div><div class='ctx'>  * @genpd: PM domain object to initialize.</div><div class='hunk'>@@ -1293,13 +1458,15 @@ EXPORT_SYMBOL_GPL(pm_genpd_remove_subdomain);</div><div class='ctx'> int pm_genpd_init(struct generic_pm_domain *genpd,</div><div class='ctx'> 		  struct dev_power_governor *gov, bool is_off)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	if (IS_ERR_OR_NULL(genpd))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;genpd-&gt;master_links);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;genpd-&gt;slave_links);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;genpd-&gt;dev_list);</div><div class='del'>-	mutex_init(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_lock_init(genpd);</div><div class='ctx'> 	genpd-&gt;gov = gov;</div><div class='ctx'> 	INIT_WORK(&amp;genpd-&gt;power_off_work, genpd_power_off_work_fn);</div><div class='ctx'> 	atomic_set(&amp;genpd-&gt;sd_count, 0);</div><div class='hunk'>@@ -1325,19 +1492,12 @@ int pm_genpd_init(struct generic_pm_domain *genpd,</div><div class='ctx'> 		genpd-&gt;dev_ops.start = pm_clk_resume;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (genpd-&gt;state_idx &gt;= GENPD_MAX_NUM_STATES) {</div><div class='del'>-		pr_warn("Initial state index out of bounds.\n");</div><div class='del'>-		genpd-&gt;state_idx = GENPD_MAX_NUM_STATES - 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (genpd-&gt;state_count &gt; GENPD_MAX_NUM_STATES) {</div><div class='del'>-		pr_warn("Limiting states to  %d\n", GENPD_MAX_NUM_STATES);</div><div class='del'>-		genpd-&gt;state_count = GENPD_MAX_NUM_STATES;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Use only one "off" state if there were no states declared */</div><div class='del'>-	if (genpd-&gt;state_count == 0)</div><div class='del'>-		genpd-&gt;state_count = 1;</div><div class='add'>+	if (genpd-&gt;state_count == 0) {</div><div class='add'>+		ret = genpd_set_default_power_state(genpd);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;gpd_list_lock);</div><div class='ctx'> 	list_add(&amp;genpd-&gt;gpd_list_node, &amp;gpd_list);</div><div class='hunk'>@@ -1354,16 +1514,16 @@ static int genpd_remove(struct generic_pm_domain *genpd)</div><div class='ctx'> 	if (IS_ERR_OR_NULL(genpd))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_lock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	if (genpd-&gt;has_provider) {</div><div class='del'>-		mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+		genpd_unlock(genpd);</div><div class='ctx'> 		pr_err("Provider present, unable to remove %s\n", genpd-&gt;name);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!list_empty(&amp;genpd-&gt;master_links) || genpd-&gt;device_count) {</div><div class='del'>-		mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+		genpd_unlock(genpd);</div><div class='ctx'> 		pr_err("%s: unable to remove %s\n", __func__, genpd-&gt;name);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1375,8 +1535,9 @@ static int genpd_remove(struct generic_pm_domain *genpd)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_del(&amp;genpd-&gt;gpd_list_node);</div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> 	cancel_work_sync(&amp;genpd-&gt;power_off_work);</div><div class='add'>+	kfree(genpd-&gt;free);</div><div class='ctx'> 	pr_debug("%s: removed %s\n", __func__, genpd-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1890,21 +2051,117 @@ int genpd_dev_pm_attach(struct device *dev)</div><div class='ctx'> 	mutex_unlock(&amp;gpd_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_err(dev, "failed to add to PM domain %s: %d",</div><div class='del'>-			pd-&gt;name, ret);</div><div class='add'>+		if (ret != -EPROBE_DEFER)</div><div class='add'>+			dev_err(dev, "failed to add to PM domain %s: %d",</div><div class='add'>+				pd-&gt;name, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;pm_domain-&gt;detach = genpd_dev_pm_detach;</div><div class='ctx'> 	dev-&gt;pm_domain-&gt;sync = genpd_dev_pm_sync;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;pd-&gt;lock);</div><div class='del'>-	ret = genpd_poweron(pd, 0);</div><div class='del'>-	mutex_unlock(&amp;pd-&gt;lock);</div><div class='add'>+	genpd_lock(pd);</div><div class='add'>+	ret = genpd_power_on(pd, 0);</div><div class='add'>+	genpd_unlock(pd);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret ? -EPROBE_DEFER : 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(genpd_dev_pm_attach);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id idle_state_match[] = {</div><div class='add'>+	{ .compatible = "domain-idle-state", },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int genpd_parse_state(struct genpd_power_state *genpd_state,</div><div class='add'>+				    struct device_node *state_node)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u32 residency;</div><div class='add'>+	u32 entry_latency, exit_latency;</div><div class='add'>+	const struct of_device_id *match_id;</div><div class='add'>+</div><div class='add'>+	match_id = of_match_node(idle_state_match, state_node);</div><div class='add'>+	if (!match_id)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(state_node, "entry-latency-us",</div><div class='add'>+						&amp;entry_latency);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_debug(" * %s missing entry-latency-us property\n",</div><div class='add'>+						state_node-&gt;full_name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(state_node, "exit-latency-us",</div><div class='add'>+						&amp;exit_latency);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_debug(" * %s missing exit-latency-us property\n",</div><div class='add'>+						state_node-&gt;full_name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(state_node, "min-residency-us", &amp;residency);</div><div class='add'>+	if (!err)</div><div class='add'>+		genpd_state-&gt;residency_ns = 1000 * residency;</div><div class='add'>+</div><div class='add'>+	genpd_state-&gt;power_on_latency_ns = 1000 * exit_latency;</div><div class='add'>+	genpd_state-&gt;power_off_latency_ns = 1000 * entry_latency;</div><div class='add'>+	genpd_state-&gt;fwnode = &amp;state_node-&gt;fwnode;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_genpd_parse_idle_states: Return array of idle states for the genpd.</div><div class='add'>+ *</div><div class='add'>+ * @dn: The genpd device node</div><div class='add'>+ * @states: The pointer to which the state array will be saved.</div><div class='add'>+ * @n: The count of elements in the array returned from this function.</div><div class='add'>+ *</div><div class='add'>+ * Returns the device states parsed from the OF node. The memory for the states</div><div class='add'>+ * is allocated by this function and is the responsibility of the caller to</div><div class='add'>+ * free the memory after use.</div><div class='add'>+ */</div><div class='add'>+int of_genpd_parse_idle_states(struct device_node *dn,</div><div class='add'>+			struct genpd_power_state **states, int *n)</div><div class='add'>+{</div><div class='add'>+	struct genpd_power_state *st;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	int i = 0;</div><div class='add'>+	int err, ret;</div><div class='add'>+	int count;</div><div class='add'>+	struct of_phandle_iterator it;</div><div class='add'>+</div><div class='add'>+	count = of_count_phandle_with_args(dn, "domain-idle-states", NULL);</div><div class='add'>+	if (count &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	st = kcalloc(count, sizeof(*st), GFP_KERNEL);</div><div class='add'>+	if (!st)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Loop over the phandles until all the requested entry is found */</div><div class='add'>+	of_for_each_phandle(&amp;it, err, dn, "domain-idle-states", NULL, 0) {</div><div class='add'>+		np = it.node;</div><div class='add'>+		ret = genpd_parse_state(&amp;st[i++], np);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err</div><div class='add'>+			("Parsing idle state node %s failed with err %d\n",</div><div class='add'>+							np-&gt;full_name, ret);</div><div class='add'>+			of_node_put(np);</div><div class='add'>+			kfree(st);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*n = count;</div><div class='add'>+	*states = st;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(of_genpd_parse_idle_states);</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_PM_GENERIC_DOMAINS_OF */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1958,7 +2215,7 @@ static int pm_genpd_summary_one(struct seq_file *s,</div><div class='ctx'> 	char state[16];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = mutex_lock_interruptible(&amp;genpd-&gt;lock);</div><div class='add'>+	ret = genpd_lock_interruptible(genpd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='ctx'> </div><div class='hunk'>@@ -1984,7 +2241,9 @@ static int pm_genpd_summary_one(struct seq_file *s,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(pm_data, &amp;genpd-&gt;dev_list, list_node) {</div><div class='del'>-		kobj_path = kobject_get_path(&amp;pm_data-&gt;dev-&gt;kobj, GFP_KERNEL);</div><div class='add'>+		kobj_path = kobject_get_path(&amp;pm_data-&gt;dev-&gt;kobj,</div><div class='add'>+				genpd_is_irq_safe(genpd) ?</div><div class='add'>+				GFP_ATOMIC : GFP_KERNEL);</div><div class='ctx'> 		if (kobj_path == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1995,7 +2254,7 @@ static int pm_genpd_summary_one(struct seq_file *s,</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(s, "\n");</div><div class='ctx'> exit:</div><div class='del'>-	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='add'>+	genpd_unlock(genpd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c<br/>index 2932a5bd892f..9faee1c893e5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/main.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/main.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/main.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/pm_wakeirq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/debug.h&gt;</div><div class='ctx'> #include &lt;linux/async.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;trace/events/power.h&gt;</div><div class='hunk'>@@ -131,6 +132,7 @@ void device_pm_add(struct device *dev)</div><div class='ctx'> 		dev_warn(dev, "parent %s should not be sleeping\n",</div><div class='ctx'> 			dev_name(dev-&gt;parent));</div><div class='ctx'> 	list_add_tail(&amp;dev-&gt;power.entry, &amp;dpm_list);</div><div class='add'>+	dev-&gt;power.in_dpm_list = true;</div><div class='ctx'> 	mutex_unlock(&amp;dpm_list_mtx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -145,6 +147,7 @@ void device_pm_remove(struct device *dev)</div><div class='ctx'> 	complete_all(&amp;dev-&gt;power.completion);</div><div class='ctx'> 	mutex_lock(&amp;dpm_list_mtx);</div><div class='ctx'> 	list_del_init(&amp;dev-&gt;power.entry);</div><div class='add'>+	dev-&gt;power.in_dpm_list = false;</div><div class='ctx'> 	mutex_unlock(&amp;dpm_list_mtx);</div><div class='ctx'> 	device_wakeup_disable(dev);</div><div class='ctx'> 	pm_runtime_remove(dev);</div><div class='hunk'>@@ -192,7 +195,7 @@ void device_pm_move_last(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static ktime_t initcall_debug_start(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	ktime_t calltime = ktime_set(0, 0);</div><div class='add'>+	ktime_t calltime = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (pm_print_times_enabled) {</div><div class='ctx'> 		pr_info("calling  %s+ @ %i, parent: %s\n",</div><div class='hunk'>@@ -244,6 +247,62 @@ static void dpm_wait_for_children(struct device *dev, bool async)</div><div class='ctx'>        device_for_each_child(dev, &amp;async, dpm_wait_fn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dpm_wait_for_suppliers(struct device *dev, bool async)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = device_links_read_lock();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the supplier goes away right after we've checked the link to it,</div><div class='add'>+	 * we'll wait for its completion to change the state, but that's fine,</div><div class='add'>+	 * because the only things that will block as a result are the SRCU</div><div class='add'>+	 * callbacks freeing the link objects for the links in the list we're</div><div class='add'>+	 * walking.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry_rcu(link, &amp;dev-&gt;links.suppliers, c_node)</div><div class='add'>+		if (READ_ONCE(link-&gt;status) != DL_STATE_DORMANT)</div><div class='add'>+			dpm_wait(link-&gt;supplier, async);</div><div class='add'>+</div><div class='add'>+	device_links_read_unlock(idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpm_wait_for_superior(struct device *dev, bool async)</div><div class='add'>+{</div><div class='add'>+	dpm_wait(dev-&gt;parent, async);</div><div class='add'>+	dpm_wait_for_suppliers(dev, async);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpm_wait_for_consumers(struct device *dev, bool async)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = device_links_read_lock();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The status of a device link can only be changed from "dormant" by a</div><div class='add'>+	 * probe, but that cannot happen during system suspend/resume.  In</div><div class='add'>+	 * theory it can change to "dormant" at that time, but then it is</div><div class='add'>+	 * reasonable to wait for the target device anyway (eg. if it goes</div><div class='add'>+	 * away, it's better to wait for it to go away completely and then</div><div class='add'>+	 * continue instead of trying to continue in parallel with its</div><div class='add'>+	 * unregistration).</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry_rcu(link, &amp;dev-&gt;links.consumers, s_node)</div><div class='add'>+		if (READ_ONCE(link-&gt;status) != DL_STATE_DORMANT)</div><div class='add'>+			dpm_wait(link-&gt;consumer, async);</div><div class='add'>+</div><div class='add'>+	device_links_read_unlock(idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpm_wait_for_subordinate(struct device *dev, bool async)</div><div class='add'>+{</div><div class='add'>+	dpm_wait_for_children(dev, async);</div><div class='add'>+	dpm_wait_for_consumers(dev, async);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * pm_op - Return the PM operation appropriate for given PM event.</div><div class='ctx'>  * @ops: PM operations to choose from.</div><div class='hunk'>@@ -488,7 +547,7 @@ static int device_resume_noirq(struct device *dev, pm_message_t state, bool asyn</div><div class='ctx'> 	if (!dev-&gt;power.is_noirq_suspended)</div><div class='ctx'> 		goto Out;</div><div class='ctx'> </div><div class='del'>-	dpm_wait(dev-&gt;parent, async);</div><div class='add'>+	dpm_wait_for_superior(dev, async);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;pm_domain) {</div><div class='ctx'> 		info = "noirq power domain ";</div><div class='hunk'>@@ -618,7 +677,7 @@ static int device_resume_early(struct device *dev, pm_message_t state, bool asyn</div><div class='ctx'> 	if (!dev-&gt;power.is_late_suspended)</div><div class='ctx'> 		goto Out;</div><div class='ctx'> </div><div class='del'>-	dpm_wait(dev-&gt;parent, async);</div><div class='add'>+	dpm_wait_for_superior(dev, async);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;pm_domain) {</div><div class='ctx'> 		info = "early power domain ";</div><div class='hunk'>@@ -750,7 +809,7 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)</div><div class='ctx'> 		goto Complete;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dpm_wait(dev-&gt;parent, async);</div><div class='add'>+	dpm_wait_for_superior(dev, async);</div><div class='ctx'> 	dpm_watchdog_set(&amp;wd, dev);</div><div class='ctx'> 	device_lock(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1027,7 +1086,7 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a</div><div class='ctx'> 	TRACE_DEVICE(dev);</div><div class='ctx'> 	TRACE_SUSPEND(0);</div><div class='ctx'> </div><div class='del'>-	dpm_wait_for_children(dev, async);</div><div class='add'>+	dpm_wait_for_subordinate(dev, async);</div><div class='ctx'> </div><div class='ctx'> 	if (async_error)</div><div class='ctx'> 		goto Complete;</div><div class='hunk'>@@ -1174,7 +1233,7 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as</div><div class='ctx'> </div><div class='ctx'> 	__pm_runtime_disable(dev, false);</div><div class='ctx'> </div><div class='del'>-	dpm_wait_for_children(dev, async);</div><div class='add'>+	dpm_wait_for_subordinate(dev, async);</div><div class='ctx'> </div><div class='ctx'> 	if (async_error)</div><div class='ctx'> 		goto Complete;</div><div class='hunk'>@@ -1342,6 +1401,22 @@ static int legacy_suspend(struct device *dev, pm_message_t state,</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dpm_clear_suppliers_direct_complete(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = device_links_read_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(link, &amp;dev-&gt;links.suppliers, c_node) {</div><div class='add'>+		spin_lock_irq(&amp;link-&gt;supplier-&gt;power.lock);</div><div class='add'>+		link-&gt;supplier-&gt;power.direct_complete = false;</div><div class='add'>+		spin_unlock_irq(&amp;link-&gt;supplier-&gt;power.lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_links_read_unlock(idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * device_suspend - Execute "suspend" callbacks for given device.</div><div class='ctx'>  * @dev: Device to handle.</div><div class='hunk'>@@ -1358,7 +1433,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)</div><div class='ctx'> 	TRACE_DEVICE(dev);</div><div class='ctx'> 	TRACE_SUSPEND(0);</div><div class='ctx'> </div><div class='del'>-	dpm_wait_for_children(dev, async);</div><div class='add'>+	dpm_wait_for_subordinate(dev, async);</div><div class='ctx'> </div><div class='ctx'> 	if (async_error)</div><div class='ctx'> 		goto Complete;</div><div class='hunk'>@@ -1454,16 +1529,17 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)</div><div class='ctx'> </div><div class='ctx'> 			spin_unlock_irq(&amp;parent-&gt;power.lock);</div><div class='ctx'> 		}</div><div class='add'>+		dpm_clear_suppliers_direct_complete(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	device_unlock(dev);</div><div class='ctx'> 	dpm_watchdog_clear(&amp;wd);</div><div class='ctx'> </div><div class='ctx'>  Complete:</div><div class='del'>-	complete_all(&amp;dev-&gt;power.completion);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		async_error = error;</div><div class='ctx'> </div><div class='add'>+	complete_all(&amp;dev-&gt;power.completion);</div><div class='ctx'> 	TRACE_SUSPEND(error);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c<br/>index 4c7c6da7a989..dae61720b314 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/opp/core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/opp/core.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/opp/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/opp/core.c</a></div><div class='hunk'>@@ -32,13 +32,7 @@ LIST_HEAD(opp_tables);</div><div class='ctx'> /* Lock to allow exclusive modification to the device and opp lists */</div><div class='ctx'> DEFINE_MUTEX(opp_table_lock);</div><div class='ctx'> </div><div class='del'>-#define opp_rcu_lockdep_assert()					\</div><div class='del'>-do {									\</div><div class='del'>-	RCU_LOCKDEP_WARN(!rcu_read_lock_held() &amp;&amp;			\</div><div class='del'>-			 !lockdep_is_held(&amp;opp_table_lock),		\</div><div class='del'>-			 "Missing rcu_read_lock() or "			\</div><div class='del'>-			 "opp_table_lock protection");			\</div><div class='del'>-} while (0)</div><div class='add'>+static void dev_pm_opp_get(struct dev_pm_opp *opp);</div><div class='ctx'> </div><div class='ctx'> static struct opp_device *_find_opp_dev(const struct device *dev,</div><div class='ctx'> 					struct opp_table *opp_table)</div><div class='hunk'>@@ -52,38 +46,46 @@ static struct opp_device *_find_opp_dev(const struct device *dev,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct opp_table *_find_opp_table_unlocked(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct opp_table *opp_table;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(opp_table, &amp;opp_tables, node) {</div><div class='add'>+		if (_find_opp_dev(dev, opp_table)) {</div><div class='add'>+			_get_opp_table_kref(opp_table);</div><div class='add'>+</div><div class='add'>+			return opp_table;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * _find_opp_table() - find opp_table struct using device pointer</div><div class='ctx'>  * @dev:	device pointer used to lookup OPP table</div><div class='ctx'>  *</div><div class='del'>- * Search OPP table for one containing matching device. Does a RCU reader</div><div class='del'>- * operation to grab the pointer needed.</div><div class='add'>+ * Search OPP table for one containing matching device.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: pointer to 'struct opp_table' if found, otherwise -ENODEV or</div><div class='ctx'>  * -EINVAL based on type of error.</div><div class='ctx'>  *</div><div class='del'>- * Locking: For readers, this function must be called under rcu_read_lock().</div><div class='del'>- * opp_table is a RCU protected pointer, which means that opp_table is valid</div><div class='del'>- * as long as we are under RCU lock.</div><div class='del'>- *</div><div class='del'>- * For Writers, this function must be called with opp_table_lock held.</div><div class='add'>+ * The callers must call dev_pm_opp_put_opp_table() after the table is used.</div><div class='ctx'>  */</div><div class='ctx'> struct opp_table *_find_opp_table(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='ctx'> </div><div class='del'>-	opp_rcu_lockdep_assert();</div><div class='del'>-</div><div class='ctx'> 	if (IS_ERR_OR_NULL(dev)) {</div><div class='ctx'> 		pr_err("%s: Invalid parameters\n", __func__);</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(opp_table, &amp;opp_tables, node)</div><div class='del'>-		if (_find_opp_dev(dev, opp_table))</div><div class='del'>-			return opp_table;</div><div class='add'>+	mutex_lock(&amp;opp_table_lock);</div><div class='add'>+	opp_table = _find_opp_table_unlocked(dev);</div><div class='add'>+	mutex_unlock(&amp;opp_table_lock);</div><div class='ctx'> </div><div class='del'>-	return ERR_PTR(-ENODEV);</div><div class='add'>+	return opp_table;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -93,28 +95,16 @@ struct opp_table *_find_opp_table(struct device *dev)</div><div class='ctx'>  * Return: voltage in micro volt corresponding to the opp, else</div><div class='ctx'>  * return 0</div><div class='ctx'>  *</div><div class='del'>- * Locking: This function must be called under rcu_read_lock(). opp is a rcu</div><div class='del'>- * protected pointer. This means that opp which could have been fetched by</div><div class='del'>- * opp_find_freq_{exact,ceil,floor} functions is valid as long as we are</div><div class='del'>- * under RCU lock. The pointer returned by the opp_find_freq family must be</div><div class='del'>- * used in the same section as the usage of this function with the pointer</div><div class='del'>- * prior to unlocking with rcu_read_unlock() to maintain the integrity of the</div><div class='del'>- * pointer.</div><div class='add'>+ * This is useful only for devices with single power supply.</div><div class='ctx'>  */</div><div class='ctx'> unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp)</div><div class='ctx'> {</div><div class='del'>-	struct dev_pm_opp *tmp_opp;</div><div class='del'>-	unsigned long v = 0;</div><div class='del'>-</div><div class='del'>-	opp_rcu_lockdep_assert();</div><div class='del'>-</div><div class='del'>-	tmp_opp = rcu_dereference(opp);</div><div class='del'>-	if (IS_ERR_OR_NULL(tmp_opp))</div><div class='add'>+	if (IS_ERR_OR_NULL(opp)) {</div><div class='ctx'> 		pr_err("%s: Invalid parameters\n", __func__);</div><div class='del'>-	else</div><div class='del'>-		v = tmp_opp-&gt;u_volt;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return v;</div><div class='add'>+	return opp-&gt;supplies[0].u_volt;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_get_voltage);</div><div class='ctx'> </div><div class='hunk'>@@ -124,29 +114,15 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_voltage);</div><div class='ctx'>  *</div><div class='ctx'>  * Return: frequency in hertz corresponding to the opp, else</div><div class='ctx'>  * return 0</div><div class='del'>- *</div><div class='del'>- * Locking: This function must be called under rcu_read_lock(). opp is a rcu</div><div class='del'>- * protected pointer. This means that opp which could have been fetched by</div><div class='del'>- * opp_find_freq_{exact,ceil,floor} functions is valid as long as we are</div><div class='del'>- * under RCU lock. The pointer returned by the opp_find_freq family must be</div><div class='del'>- * used in the same section as the usage of this function with the pointer</div><div class='del'>- * prior to unlocking with rcu_read_unlock() to maintain the integrity of the</div><div class='del'>- * pointer.</div><div class='ctx'>  */</div><div class='ctx'> unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)</div><div class='ctx'> {</div><div class='del'>-	struct dev_pm_opp *tmp_opp;</div><div class='del'>-	unsigned long f = 0;</div><div class='del'>-</div><div class='del'>-	opp_rcu_lockdep_assert();</div><div class='del'>-</div><div class='del'>-	tmp_opp = rcu_dereference(opp);</div><div class='del'>-	if (IS_ERR_OR_NULL(tmp_opp) || !tmp_opp-&gt;available)</div><div class='add'>+	if (IS_ERR_OR_NULL(opp) || !opp-&gt;available) {</div><div class='ctx'> 		pr_err("%s: Invalid parameters\n", __func__);</div><div class='del'>-	else</div><div class='del'>-		f = tmp_opp-&gt;rate;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return f;</div><div class='add'>+	return opp-&gt;rate;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_get_freq);</div><div class='ctx'> </div><div class='hunk'>@@ -159,28 +135,15 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_freq);</div><div class='ctx'>  * quickly. Running on them for longer times may overheat the chip.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if opp is turbo opp, else false.</div><div class='del'>- *</div><div class='del'>- * Locking: This function must be called under rcu_read_lock(). opp is a rcu</div><div class='del'>- * protected pointer. This means that opp which could have been fetched by</div><div class='del'>- * opp_find_freq_{exact,ceil,floor} functions is valid as long as we are</div><div class='del'>- * under RCU lock. The pointer returned by the opp_find_freq family must be</div><div class='del'>- * used in the same section as the usage of this function with the pointer</div><div class='del'>- * prior to unlocking with rcu_read_unlock() to maintain the integrity of the</div><div class='del'>- * pointer.</div><div class='ctx'>  */</div><div class='ctx'> bool dev_pm_opp_is_turbo(struct dev_pm_opp *opp)</div><div class='ctx'> {</div><div class='del'>-	struct dev_pm_opp *tmp_opp;</div><div class='del'>-</div><div class='del'>-	opp_rcu_lockdep_assert();</div><div class='del'>-</div><div class='del'>-	tmp_opp = rcu_dereference(opp);</div><div class='del'>-	if (IS_ERR_OR_NULL(tmp_opp) || !tmp_opp-&gt;available) {</div><div class='add'>+	if (IS_ERR_OR_NULL(opp) || !opp-&gt;available) {</div><div class='ctx'> 		pr_err("%s: Invalid parameters\n", __func__);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return tmp_opp-&gt;turbo;</div><div class='add'>+	return opp-&gt;turbo;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_is_turbo);</div><div class='ctx'> </div><div class='hunk'>@@ -189,23 +152,20 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_is_turbo);</div><div class='ctx'>  * @dev:	device for which we do this operation</div><div class='ctx'>  *</div><div class='ctx'>  * Return: This function returns the max clock latency in nanoseconds.</div><div class='del'>- *</div><div class='del'>- * Locking: This function takes rcu_read_lock().</div><div class='ctx'>  */</div><div class='ctx'> unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='ctx'> 	unsigned long clock_latency_ns;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='ctx'> 	opp_table = _find_opp_table(dev);</div><div class='ctx'> 	if (IS_ERR(opp_table))</div><div class='del'>-		clock_latency_ns = 0;</div><div class='del'>-	else</div><div class='del'>-		clock_latency_ns = opp_table-&gt;clock_latency_ns_max;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	clock_latency_ns = opp_table-&gt;clock_latency_ns_max;</div><div class='add'>+</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	return clock_latency_ns;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_clock_latency);</div><div class='hunk'>@@ -215,52 +175,74 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_clock_latency);</div><div class='ctx'>  * @dev: device for which we do this operation</div><div class='ctx'>  *</div><div class='ctx'>  * Return: This function returns the max voltage latency in nanoseconds.</div><div class='del'>- *</div><div class='del'>- * Locking: This function takes rcu_read_lock().</div><div class='ctx'>  */</div><div class='ctx'> unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='ctx'> 	struct dev_pm_opp *opp;</div><div class='del'>-	struct regulator *reg;</div><div class='add'>+	struct regulator *reg, **regulators;</div><div class='ctx'> 	unsigned long latency_ns = 0;</div><div class='del'>-	unsigned long min_uV = ~0, max_uV = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	int ret, i, count;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned long min;</div><div class='add'>+		unsigned long max;</div><div class='add'>+	} *uV;</div><div class='ctx'> </div><div class='ctx'> 	opp_table = _find_opp_table(dev);</div><div class='del'>-	if (IS_ERR(opp_table)) {</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+	if (IS_ERR(opp_table))</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	reg = opp_table-&gt;regulator;</div><div class='del'>-	if (IS_ERR(reg)) {</div><div class='del'>-		/* Regulator may not be required for device */</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	count = opp_table-&gt;regulator_count;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='del'>-		if (!opp-&gt;available)</div><div class='del'>-			continue;</div><div class='add'>+	/* Regulator may not be required for the device */</div><div class='add'>+	if (!count)</div><div class='add'>+		goto put_opp_table;</div><div class='add'>+</div><div class='add'>+	regulators = kmalloc_array(count, sizeof(*regulators), GFP_KERNEL);</div><div class='add'>+	if (!regulators)</div><div class='add'>+		goto put_opp_table;</div><div class='add'>+</div><div class='add'>+	uV = kmalloc_array(count, sizeof(*uV), GFP_KERNEL);</div><div class='add'>+	if (!uV)</div><div class='add'>+		goto free_regulators;</div><div class='ctx'> </div><div class='del'>-		if (opp-&gt;u_volt_min &lt; min_uV)</div><div class='del'>-			min_uV = opp-&gt;u_volt_min;</div><div class='del'>-		if (opp-&gt;u_volt_max &gt; max_uV)</div><div class='del'>-			max_uV = opp-&gt;u_volt_max;</div><div class='add'>+	memcpy(regulators, opp_table-&gt;regulators, count * sizeof(*regulators));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;opp_table-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		uV[i].min = ~0;</div><div class='add'>+		uV[i].max = 0;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='add'>+			if (!opp-&gt;available)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (opp-&gt;supplies[i].u_volt_min &lt; uV[i].min)</div><div class='add'>+				uV[i].min = opp-&gt;supplies[i].u_volt_min;</div><div class='add'>+			if (opp-&gt;supplies[i].u_volt_max &gt; uV[i].max)</div><div class='add'>+				uV[i].max = opp-&gt;supplies[i].u_volt_max;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	mutex_unlock(&amp;opp_table-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The caller needs to ensure that opp_table (and hence the regulator)</div><div class='ctx'> 	 * isn't freed, while we are executing this routine.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = regulator_set_voltage_time(reg, min_uV, max_uV);</div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		latency_ns = ret * 1000;</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		reg = regulators[i];</div><div class='add'>+		ret = regulator_set_voltage_time(reg, uV[i].min, uV[i].max);</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			latency_ns += ret * 1000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(uV);</div><div class='add'>+free_regulators:</div><div class='add'>+	kfree(regulators);</div><div class='add'>+put_opp_table:</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> </div><div class='ctx'> 	return latency_ns;</div><div class='ctx'> }</div><div class='hunk'>@@ -273,8 +255,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_volt_latency);</div><div class='ctx'>  *</div><div class='ctx'>  * Return: This function returns the max transition latency, in nanoseconds, to</div><div class='ctx'>  * switch from one OPP to other.</div><div class='del'>- *</div><div class='del'>- * Locking: This function takes rcu_read_lock().</div><div class='ctx'>  */</div><div class='ctx'> unsigned long dev_pm_opp_get_max_transition_latency(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -284,32 +264,29 @@ unsigned long dev_pm_opp_get_max_transition_latency(struct device *dev)</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_transition_latency);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dev_pm_opp_get_suspend_opp() - Get suspend opp</div><div class='add'>+ * dev_pm_opp_get_suspend_opp_freq() - Get frequency of suspend opp in Hz</div><div class='ctx'>  * @dev:	device for which we do this operation</div><div class='ctx'>  *</div><div class='del'>- * Return: This function returns pointer to the suspend opp if it is</div><div class='del'>- * defined and available, otherwise it returns NULL.</div><div class='del'>- *</div><div class='del'>- * Locking: This function must be called under rcu_read_lock(). opp is a rcu</div><div class='del'>- * protected pointer. The reason for the same is that the opp pointer which is</div><div class='del'>- * returned will remain valid for use with opp_get_{voltage, freq} only while</div><div class='del'>- * under the locked area. The pointer returned must be used prior to unlocking</div><div class='del'>- * with rcu_read_unlock() to maintain the integrity of the pointer.</div><div class='add'>+ * Return: This function returns the frequency of the OPP marked as suspend_opp</div><div class='add'>+ * if one is available, else returns 0;</div><div class='ctx'>  */</div><div class='del'>-struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev)</div><div class='add'>+unsigned long dev_pm_opp_get_suspend_opp_freq(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='del'>-</div><div class='del'>-	opp_rcu_lockdep_assert();</div><div class='add'>+	unsigned long freq = 0;</div><div class='ctx'> </div><div class='ctx'> 	opp_table = _find_opp_table(dev);</div><div class='del'>-	if (IS_ERR(opp_table) || !opp_table-&gt;suspend_opp ||</div><div class='del'>-	    !opp_table-&gt;suspend_opp-&gt;available)</div><div class='del'>-		return NULL;</div><div class='add'>+	if (IS_ERR(opp_table))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return opp_table-&gt;suspend_opp;</div><div class='add'>+	if (opp_table-&gt;suspend_opp &amp;&amp; opp_table-&gt;suspend_opp-&gt;available)</div><div class='add'>+		freq = dev_pm_opp_get_freq(opp_table-&gt;suspend_opp);</div><div class='add'>+</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='add'>+</div><div class='add'>+	return freq;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(dev_pm_opp_get_suspend_opp);</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_opp_get_suspend_opp_freq);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dev_pm_opp_get_opp_count() - Get number of opps available in the opp table</div><div class='hunk'>@@ -317,8 +294,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_suspend_opp);</div><div class='ctx'>  *</div><div class='ctx'>  * Return: This function returns the number of available opps if there are any,</div><div class='ctx'>  * else returns 0 if none or the corresponding error value.</div><div class='del'>- *</div><div class='del'>- * Locking: This function takes rcu_read_lock().</div><div class='ctx'>  */</div><div class='ctx'> int dev_pm_opp_get_opp_count(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -326,23 +301,24 @@ int dev_pm_opp_get_opp_count(struct device *dev)</div><div class='ctx'> 	struct dev_pm_opp *temp_opp;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='ctx'> 	opp_table = _find_opp_table(dev);</div><div class='ctx'> 	if (IS_ERR(opp_table)) {</div><div class='ctx'> 		count = PTR_ERR(opp_table);</div><div class='ctx'> 		dev_err(dev, "%s: OPP table not found (%d)\n",</div><div class='ctx'> 			__func__, count);</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(temp_opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='add'>+	mutex_lock(&amp;opp_table-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(temp_opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='ctx'> 		if (temp_opp-&gt;available)</div><div class='ctx'> 			count++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	mutex_unlock(&amp;opp_table-&gt;lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='add'>+</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_get_opp_count);</div><div class='hunk'>@@ -367,11 +343,8 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_opp_count);</div><div class='ctx'>  * This provides a mechanism to enable an opp which is not available currently</div><div class='ctx'>  * or the opposite as well.</div><div class='ctx'>  *</div><div class='del'>- * Locking: This function must be called under rcu_read_lock(). opp is a rcu</div><div class='del'>- * protected pointer. The reason for the same is that the opp pointer which is</div><div class='del'>- * returned will remain valid for use with opp_get_{voltage, freq} only while</div><div class='del'>- * under the locked area. The pointer returned must be used prior to unlocking</div><div class='del'>- * with rcu_read_unlock() to maintain the integrity of the pointer.</div><div class='add'>+ * The callers are required to call dev_pm_opp_put() for the returned OPP after</div><div class='add'>+ * use.</div><div class='ctx'>  */</div><div class='ctx'> struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,</div><div class='ctx'> 					      unsigned long freq,</div><div class='hunk'>@@ -380,8 +353,6 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='ctx'> 	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);</div><div class='ctx'> </div><div class='del'>-	opp_rcu_lockdep_assert();</div><div class='del'>-</div><div class='ctx'> 	opp_table = _find_opp_table(dev);</div><div class='ctx'> 	if (IS_ERR(opp_table)) {</div><div class='ctx'> 		int r = PTR_ERR(opp_table);</div><div class='hunk'>@@ -390,14 +361,22 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,</div><div class='ctx'> 		return ERR_PTR(r);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(temp_opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='add'>+	mutex_lock(&amp;opp_table-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(temp_opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='ctx'> 		if (temp_opp-&gt;available == available &amp;&amp;</div><div class='ctx'> 				temp_opp-&gt;rate == freq) {</div><div class='ctx'> 			opp = temp_opp;</div><div class='add'>+</div><div class='add'>+			/* Increment the reference count of OPP */</div><div class='add'>+			dev_pm_opp_get(opp);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;opp_table-&gt;lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='add'>+</div><div class='ctx'> 	return opp;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_exact);</div><div class='hunk'>@@ -407,14 +386,21 @@ static noinline struct dev_pm_opp *_find_freq_ceil(struct opp_table *opp_table,</div><div class='ctx'> {</div><div class='ctx'> 	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(temp_opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='add'>+	mutex_lock(&amp;opp_table-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(temp_opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='ctx'> 		if (temp_opp-&gt;available &amp;&amp; temp_opp-&gt;rate &gt;= *freq) {</div><div class='ctx'> 			opp = temp_opp;</div><div class='ctx'> 			*freq = opp-&gt;rate;</div><div class='add'>+</div><div class='add'>+			/* Increment the reference count of OPP */</div><div class='add'>+			dev_pm_opp_get(opp);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;opp_table-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	return opp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -433,18 +419,14 @@ static noinline struct dev_pm_opp *_find_freq_ceil(struct opp_table *opp_table,</div><div class='ctx'>  * ERANGE:	no match found for search</div><div class='ctx'>  * ENODEV:	if device not found in list of registered devices</div><div class='ctx'>  *</div><div class='del'>- * Locking: This function must be called under rcu_read_lock(). opp is a rcu</div><div class='del'>- * protected pointer. The reason for the same is that the opp pointer which is</div><div class='del'>- * returned will remain valid for use with opp_get_{voltage, freq} only while</div><div class='del'>- * under the locked area. The pointer returned must be used prior to unlocking</div><div class='del'>- * with rcu_read_unlock() to maintain the integrity of the pointer.</div><div class='add'>+ * The callers are required to call dev_pm_opp_put() for the returned OPP after</div><div class='add'>+ * use.</div><div class='ctx'>  */</div><div class='ctx'> struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,</div><div class='ctx'> 					     unsigned long *freq)</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='del'>-</div><div class='del'>-	opp_rcu_lockdep_assert();</div><div class='add'>+	struct dev_pm_opp *opp;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev || !freq) {</div><div class='ctx'> 		dev_err(dev, "%s: Invalid argument freq=%p\n", __func__, freq);</div><div class='hunk'>@@ -455,7 +437,11 @@ struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,</div><div class='ctx'> 	if (IS_ERR(opp_table))</div><div class='ctx'> 		return ERR_CAST(opp_table);</div><div class='ctx'> </div><div class='del'>-	return _find_freq_ceil(opp_table, freq);</div><div class='add'>+	opp = _find_freq_ceil(opp_table, freq);</div><div class='add'>+</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='add'>+</div><div class='add'>+	return opp;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_ceil);</div><div class='ctx'> </div><div class='hunk'>@@ -474,11 +460,8 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_ceil);</div><div class='ctx'>  * ERANGE:	no match found for search</div><div class='ctx'>  * ENODEV:	if device not found in list of registered devices</div><div class='ctx'>  *</div><div class='del'>- * Locking: This function must be called under rcu_read_lock(). opp is a rcu</div><div class='del'>- * protected pointer. The reason for the same is that the opp pointer which is</div><div class='del'>- * returned will remain valid for use with opp_get_{voltage, freq} only while</div><div class='del'>- * under the locked area. The pointer returned must be used prior to unlocking</div><div class='del'>- * with rcu_read_unlock() to maintain the integrity of the pointer.</div><div class='add'>+ * The callers are required to call dev_pm_opp_put() for the returned OPP after</div><div class='add'>+ * use.</div><div class='ctx'>  */</div><div class='ctx'> struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,</div><div class='ctx'> 					      unsigned long *freq)</div><div class='hunk'>@@ -486,8 +469,6 @@ struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='ctx'> 	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);</div><div class='ctx'> </div><div class='del'>-	opp_rcu_lockdep_assert();</div><div class='del'>-</div><div class='ctx'> 	if (!dev || !freq) {</div><div class='ctx'> 		dev_err(dev, "%s: Invalid argument freq=%p\n", __func__, freq);</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -497,7 +478,9 @@ struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,</div><div class='ctx'> 	if (IS_ERR(opp_table))</div><div class='ctx'> 		return ERR_CAST(opp_table);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(temp_opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='add'>+	mutex_lock(&amp;opp_table-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(temp_opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='ctx'> 		if (temp_opp-&gt;available) {</div><div class='ctx'> 			/* go to the next node, before choosing prev */</div><div class='ctx'> 			if (temp_opp-&gt;rate &gt; *freq)</div><div class='hunk'>@@ -506,6 +489,13 @@ struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,</div><div class='ctx'> 				opp = temp_opp;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Increment the reference count of OPP */</div><div class='add'>+	if (!IS_ERR(opp))</div><div class='add'>+		dev_pm_opp_get(opp);</div><div class='add'>+	mutex_unlock(&amp;opp_table-&gt;lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='add'>+</div><div class='ctx'> 	if (!IS_ERR(opp))</div><div class='ctx'> 		*freq = opp-&gt;rate;</div><div class='ctx'> </div><div class='hunk'>@@ -513,37 +503,8 @@ struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_floor);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The caller needs to ensure that opp_table (and hence the clk) isn't freed,</div><div class='del'>- * while clk returned here is used.</div><div class='del'>- */</div><div class='del'>-static struct clk *_get_opp_clk(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct opp_table *opp_table;</div><div class='del'>-	struct clk *clk;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	opp_table = _find_opp_table(dev);</div><div class='del'>-	if (IS_ERR(opp_table)) {</div><div class='del'>-		dev_err(dev, "%s: device opp doesn't exist\n", __func__);</div><div class='del'>-		clk = ERR_CAST(opp_table);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clk = opp_table-&gt;clk;</div><div class='del'>-	if (IS_ERR(clk))</div><div class='del'>-		dev_err(dev, "%s: No clock available for the device\n",</div><div class='del'>-			__func__);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return clk;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int _set_opp_voltage(struct device *dev, struct regulator *reg,</div><div class='del'>-			    unsigned long u_volt, unsigned long u_volt_min,</div><div class='del'>-			    unsigned long u_volt_max)</div><div class='add'>+			    struct dev_pm_opp_supply *supply)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -554,14 +515,78 @@ static int _set_opp_voltage(struct device *dev, struct regulator *reg,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "%s: voltages (mV): %lu %lu %lu\n", __func__, u_volt_min,</div><div class='del'>-		u_volt, u_volt_max);</div><div class='add'>+	dev_dbg(dev, "%s: voltages (mV): %lu %lu %lu\n", __func__,</div><div class='add'>+		supply-&gt;u_volt_min, supply-&gt;u_volt, supply-&gt;u_volt_max);</div><div class='ctx'> </div><div class='del'>-	ret = regulator_set_voltage_triplet(reg, u_volt_min, u_volt,</div><div class='del'>-					    u_volt_max);</div><div class='add'>+	ret = regulator_set_voltage_triplet(reg, supply-&gt;u_volt_min,</div><div class='add'>+					    supply-&gt;u_volt, supply-&gt;u_volt_max);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		dev_err(dev, "%s: failed to set voltage (%lu %lu %lu mV): %d\n",</div><div class='del'>-			__func__, u_volt_min, u_volt, u_volt_max, ret);</div><div class='add'>+			__func__, supply-&gt;u_volt_min, supply-&gt;u_volt,</div><div class='add'>+			supply-&gt;u_volt_max, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+_generic_set_opp_clk_only(struct device *dev, struct clk *clk,</div><div class='add'>+			  unsigned long old_freq, unsigned long freq)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_set_rate(clk, freq);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "%s: failed to set clock rate: %d\n", __func__,</div><div class='add'>+			ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _generic_set_opp(struct dev_pm_set_opp_data *data)</div><div class='add'>+{</div><div class='add'>+	struct dev_pm_opp_supply *old_supply = data-&gt;old_opp.supplies;</div><div class='add'>+	struct dev_pm_opp_supply *new_supply = data-&gt;new_opp.supplies;</div><div class='add'>+	unsigned long old_freq = data-&gt;old_opp.rate, freq = data-&gt;new_opp.rate;</div><div class='add'>+	struct regulator *reg = data-&gt;regulators[0];</div><div class='add'>+	struct device *dev= data-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* This function only supports single regulator per device */</div><div class='add'>+	if (WARN_ON(data-&gt;regulator_count &gt; 1)) {</div><div class='add'>+		dev_err(dev, "multiple regulators are not supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Scaling up? Scale voltage before frequency */</div><div class='add'>+	if (freq &gt; old_freq) {</div><div class='add'>+		ret = _set_opp_voltage(dev, reg, new_supply);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto restore_voltage;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Change frequency */</div><div class='add'>+	ret = _generic_set_opp_clk_only(dev, data-&gt;clk, old_freq, freq);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto restore_voltage;</div><div class='add'>+</div><div class='add'>+	/* Scaling down? Scale voltage after frequency */</div><div class='add'>+	if (freq &lt; old_freq) {</div><div class='add'>+		ret = _set_opp_voltage(dev, reg, new_supply);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto restore_freq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+restore_freq:</div><div class='add'>+	if (_generic_set_opp_clk_only(dev, data-&gt;clk, freq, old_freq))</div><div class='add'>+		dev_err(dev, "%s: failed to restore old-freq (%lu Hz)\n",</div><div class='add'>+			__func__, old_freq);</div><div class='add'>+restore_voltage:</div><div class='add'>+	/* This shouldn't harm even if the voltages weren't updated earlier */</div><div class='add'>+	if (old_supply-&gt;u_volt)</div><div class='add'>+		_set_opp_voltage(dev, reg, old_supply);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -573,18 +598,17 @@ static int _set_opp_voltage(struct device *dev, struct regulator *reg,</div><div class='ctx'>  *</div><div class='ctx'>  * This configures the power-supplies and clock source to the levels specified</div><div class='ctx'>  * by the OPP corresponding to the target_freq.</div><div class='del'>- *</div><div class='del'>- * Locking: This function takes rcu_read_lock().</div><div class='ctx'>  */</div><div class='ctx'> int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='add'>+	unsigned long freq, old_freq;</div><div class='add'>+	int (*set_opp)(struct dev_pm_set_opp_data *data);</div><div class='ctx'> 	struct dev_pm_opp *old_opp, *opp;</div><div class='del'>-	struct regulator *reg;</div><div class='add'>+	struct regulator **regulators;</div><div class='add'>+	struct dev_pm_set_opp_data *data;</div><div class='ctx'> 	struct clk *clk;</div><div class='del'>-	unsigned long freq, old_freq;</div><div class='del'>-	unsigned long u_volt, u_volt_min, u_volt_max;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, size;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!target_freq)) {</div><div class='ctx'> 		dev_err(dev, "%s: Invalid target frequency %lu\n", __func__,</div><div class='hunk'>@@ -592,9 +616,19 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	clk = _get_opp_clk(dev);</div><div class='del'>-	if (IS_ERR(clk))</div><div class='del'>-		return PTR_ERR(clk);</div><div class='add'>+	opp_table = _find_opp_table(dev);</div><div class='add'>+	if (IS_ERR(opp_table)) {</div><div class='add'>+		dev_err(dev, "%s: device opp doesn't exist\n", __func__);</div><div class='add'>+		return PTR_ERR(opp_table);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk = opp_table-&gt;clk;</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		dev_err(dev, "%s: No clock available for the device\n",</div><div class='add'>+			__func__);</div><div class='add'>+		ret = PTR_ERR(clk);</div><div class='add'>+		goto put_opp_table;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	freq = clk_round_rate(clk, target_freq);</div><div class='ctx'> 	if ((long)freq &lt;= 0)</div><div class='hunk'>@@ -606,16 +640,8 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)</div><div class='ctx'> 	if (old_freq == freq) {</div><div class='ctx'> 		dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n",</div><div class='ctx'> 			__func__, freq);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	opp_table = _find_opp_table(dev);</div><div class='del'>-	if (IS_ERR(opp_table)) {</div><div class='del'>-		dev_err(dev, "%s: device opp doesn't exist\n", __func__);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return PTR_ERR(opp_table);</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto put_opp_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	old_opp = _find_freq_ceil(opp_table, &amp;old_freq);</div><div class='hunk'>@@ -629,78 +655,61 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)</div><div class='ctx'> 		ret = PTR_ERR(opp);</div><div class='ctx'> 		dev_err(dev, "%s: failed to find OPP for freq %lu (%d)\n",</div><div class='ctx'> 			__func__, freq, ret);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return ret;</div><div class='add'>+		goto put_old_opp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	u_volt = opp-&gt;u_volt;</div><div class='del'>-	u_volt_min = opp-&gt;u_volt_min;</div><div class='del'>-	u_volt_max = opp-&gt;u_volt_max;</div><div class='add'>+	dev_dbg(dev, "%s: switching OPP: %lu Hz --&gt; %lu Hz\n", __func__,</div><div class='add'>+		old_freq, freq);</div><div class='ctx'> </div><div class='del'>-	reg = opp_table-&gt;regulator;</div><div class='add'>+	regulators = opp_table-&gt;regulators;</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	/* Scaling up? Scale voltage before frequency */</div><div class='del'>-	if (freq &gt; old_freq) {</div><div class='del'>-		ret = _set_opp_voltage(dev, reg, u_volt, u_volt_min,</div><div class='del'>-				       u_volt_max);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto restore_voltage;</div><div class='add'>+	/* Only frequency scaling */</div><div class='add'>+	if (!regulators) {</div><div class='add'>+		ret = _generic_set_opp_clk_only(dev, clk, old_freq, freq);</div><div class='add'>+		goto put_opps;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Change frequency */</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "%s: switching OPP: %lu Hz --&gt; %lu Hz\n",</div><div class='del'>-		__func__, old_freq, freq);</div><div class='del'>-</div><div class='del'>-	ret = clk_set_rate(clk, freq);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "%s: failed to set clock rate: %d\n", __func__,</div><div class='del'>-			ret);</div><div class='del'>-		goto restore_voltage;</div><div class='del'>-	}</div><div class='add'>+	if (opp_table-&gt;set_opp)</div><div class='add'>+		set_opp = opp_table-&gt;set_opp;</div><div class='add'>+	else</div><div class='add'>+		set_opp = _generic_set_opp;</div><div class='add'>+</div><div class='add'>+	data = opp_table-&gt;set_opp_data;</div><div class='add'>+	data-&gt;regulators = regulators;</div><div class='add'>+	data-&gt;regulator_count = opp_table-&gt;regulator_count;</div><div class='add'>+	data-&gt;clk = clk;</div><div class='add'>+	data-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	data-&gt;old_opp.rate = old_freq;</div><div class='add'>+	size = sizeof(*opp-&gt;supplies) * opp_table-&gt;regulator_count;</div><div class='add'>+	if (IS_ERR(old_opp))</div><div class='add'>+		memset(data-&gt;old_opp.supplies, 0, size);</div><div class='add'>+	else</div><div class='add'>+		memcpy(data-&gt;old_opp.supplies, old_opp-&gt;supplies, size);</div><div class='ctx'> </div><div class='del'>-	/* Scaling down? Scale voltage after frequency */</div><div class='del'>-	if (freq &lt; old_freq) {</div><div class='del'>-		ret = _set_opp_voltage(dev, reg, u_volt, u_volt_min,</div><div class='del'>-				       u_volt_max);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto restore_freq;</div><div class='del'>-	}</div><div class='add'>+	data-&gt;new_opp.rate = freq;</div><div class='add'>+	memcpy(data-&gt;new_opp.supplies, opp-&gt;supplies, size);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	ret = set_opp(data);</div><div class='ctx'> </div><div class='del'>-restore_freq:</div><div class='del'>-	if (clk_set_rate(clk, old_freq))</div><div class='del'>-		dev_err(dev, "%s: failed to restore old-freq (%lu Hz)\n",</div><div class='del'>-			__func__, old_freq);</div><div class='del'>-restore_voltage:</div><div class='del'>-	/* This shouldn't harm even if the voltages weren't updated earlier */</div><div class='add'>+put_opps:</div><div class='add'>+	dev_pm_opp_put(opp);</div><div class='add'>+put_old_opp:</div><div class='ctx'> 	if (!IS_ERR(old_opp))</div><div class='del'>-		_set_opp_voltage(dev, reg, old_opp-&gt;u_volt,</div><div class='del'>-				 old_opp-&gt;u_volt_min, old_opp-&gt;u_volt_max);</div><div class='del'>-</div><div class='add'>+		dev_pm_opp_put(old_opp);</div><div class='add'>+put_opp_table:</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_set_rate);</div><div class='ctx'> </div><div class='ctx'> /* OPP-dev Helpers */</div><div class='del'>-static void _kfree_opp_dev_rcu(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	struct opp_device *opp_dev;</div><div class='del'>-</div><div class='del'>-	opp_dev = container_of(head, struct opp_device, rcu_head);</div><div class='del'>-	kfree_rcu(opp_dev, rcu_head);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void _remove_opp_dev(struct opp_device *opp_dev,</div><div class='ctx'> 			    struct opp_table *opp_table)</div><div class='ctx'> {</div><div class='ctx'> 	opp_debug_unregister(opp_dev, opp_table);</div><div class='ctx'> 	list_del(&amp;opp_dev-&gt;node);</div><div class='del'>-	call_srcu(&amp;opp_table-&gt;srcu_head.srcu, &amp;opp_dev-&gt;rcu_head,</div><div class='del'>-		  _kfree_opp_dev_rcu);</div><div class='add'>+	kfree(opp_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct opp_device *_add_opp_dev(const struct device *dev,</div><div class='hunk'>@@ -715,7 +724,7 @@ struct opp_device *_add_opp_dev(const struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize opp-dev */</div><div class='ctx'> 	opp_dev-&gt;dev = dev;</div><div class='del'>-	list_add_rcu(&amp;opp_dev-&gt;node, &amp;opp_table-&gt;dev_list);</div><div class='add'>+	list_add(&amp;opp_dev-&gt;node, &amp;opp_table-&gt;dev_list);</div><div class='ctx'> </div><div class='ctx'> 	/* Create debugfs entries for the opp_table */</div><div class='ctx'> 	ret = opp_debug_register(opp_dev, opp_table);</div><div class='hunk'>@@ -726,26 +735,12 @@ struct opp_device *_add_opp_dev(const struct device *dev,</div><div class='ctx'> 	return opp_dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * _add_opp_table() - Find OPP table or allocate a new one</div><div class='del'>- * @dev:	device for which we do this operation</div><div class='del'>- *</div><div class='del'>- * It tries to find an existing table first, if it couldn't find one, it</div><div class='del'>- * allocates a new OPP table and returns that.</div><div class='del'>- *</div><div class='del'>- * Return: valid opp_table pointer if success, else NULL.</div><div class='del'>- */</div><div class='del'>-static struct opp_table *_add_opp_table(struct device *dev)</div><div class='add'>+static struct opp_table *_allocate_opp_table(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='ctx'> 	struct opp_device *opp_dev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Check for existing table for 'dev' first */</div><div class='del'>-	opp_table = _find_opp_table(dev);</div><div class='del'>-	if (!IS_ERR(opp_table))</div><div class='del'>-		return opp_table;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate a new OPP table. In the infrequent case where a new</div><div class='ctx'> 	 * device is needed to be added, we pay this penalty.</div><div class='hunk'>@@ -764,9 +759,6 @@ static struct opp_table *_add_opp_table(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	_of_init_opp_table(opp_table, dev);</div><div class='ctx'> </div><div class='del'>-	/* Set regulator to a non-NULL error value */</div><div class='del'>-	opp_table-&gt;regulator = ERR_PTR(-ENXIO);</div><div class='del'>-</div><div class='ctx'> 	/* Find clk for the device */</div><div class='ctx'> 	opp_table-&gt;clk = clk_get(dev, NULL);</div><div class='ctx'> 	if (IS_ERR(opp_table-&gt;clk)) {</div><div class='hunk'>@@ -776,47 +768,45 @@ static struct opp_table *_add_opp_table(struct device *dev)</div><div class='ctx'> 				ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	srcu_init_notifier_head(&amp;opp_table-&gt;srcu_head);</div><div class='add'>+	BLOCKING_INIT_NOTIFIER_HEAD(&amp;opp_table-&gt;head);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;opp_table-&gt;opp_list);</div><div class='add'>+	mutex_init(&amp;opp_table-&gt;lock);</div><div class='add'>+	kref_init(&amp;opp_table-&gt;kref);</div><div class='ctx'> </div><div class='ctx'> 	/* Secure the device table modification */</div><div class='del'>-	list_add_rcu(&amp;opp_table-&gt;node, &amp;opp_tables);</div><div class='add'>+	list_add(&amp;opp_table-&gt;node, &amp;opp_tables);</div><div class='ctx'> 	return opp_table;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * _kfree_device_rcu() - Free opp_table RCU handler</div><div class='del'>- * @head:	RCU head</div><div class='del'>- */</div><div class='del'>-static void _kfree_device_rcu(struct rcu_head *head)</div><div class='add'>+void _get_opp_table_kref(struct opp_table *opp_table)</div><div class='ctx'> {</div><div class='del'>-	struct opp_table *opp_table = container_of(head, struct opp_table,</div><div class='del'>-						   rcu_head);</div><div class='del'>-</div><div class='del'>-	kfree_rcu(opp_table, rcu_head);</div><div class='add'>+	kref_get(&amp;opp_table-&gt;kref);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * _remove_opp_table() - Removes a OPP table</div><div class='del'>- * @opp_table: OPP table to be removed.</div><div class='del'>- *</div><div class='del'>- * Removes/frees OPP table if it doesn't contain any OPPs.</div><div class='del'>- */</div><div class='del'>-static void _remove_opp_table(struct opp_table *opp_table)</div><div class='add'>+struct opp_table *dev_pm_opp_get_opp_table(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct opp_device *opp_dev;</div><div class='add'>+	struct opp_table *opp_table;</div><div class='ctx'> </div><div class='del'>-	if (!list_empty(&amp;opp_table-&gt;opp_list))</div><div class='del'>-		return;</div><div class='add'>+	/* Hold our table modification lock here */</div><div class='add'>+	mutex_lock(&amp;opp_table_lock);</div><div class='ctx'> </div><div class='del'>-	if (opp_table-&gt;supported_hw)</div><div class='del'>-		return;</div><div class='add'>+	opp_table = _find_opp_table_unlocked(dev);</div><div class='add'>+	if (!IS_ERR(opp_table))</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='del'>-	if (opp_table-&gt;prop_name)</div><div class='del'>-		return;</div><div class='add'>+	opp_table = _allocate_opp_table(dev);</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR(opp_table-&gt;regulator))</div><div class='del'>-		return;</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+</div><div class='add'>+	return opp_table;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_opp_get_opp_table);</div><div class='add'>+</div><div class='add'>+static void _opp_table_kref_release(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct opp_table *opp_table = container_of(kref, struct opp_table, kref);</div><div class='add'>+	struct opp_device *opp_dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Release clk */</div><div class='ctx'> 	if (!IS_ERR(opp_table-&gt;clk))</div><div class='hunk'>@@ -830,63 +820,60 @@ static void _remove_opp_table(struct opp_table *opp_table)</div><div class='ctx'> 	/* dev_list must be empty now */</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;opp_table-&gt;dev_list));</div><div class='ctx'> </div><div class='del'>-	list_del_rcu(&amp;opp_table-&gt;node);</div><div class='del'>-	call_srcu(&amp;opp_table-&gt;srcu_head.srcu, &amp;opp_table-&gt;rcu_head,</div><div class='del'>-		  _kfree_device_rcu);</div><div class='add'>+	mutex_destroy(&amp;opp_table-&gt;lock);</div><div class='add'>+	list_del(&amp;opp_table-&gt;node);</div><div class='add'>+	kfree(opp_table);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;opp_table_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * _kfree_opp_rcu() - Free OPP RCU handler</div><div class='del'>- * @head:	RCU head</div><div class='del'>- */</div><div class='del'>-static void _kfree_opp_rcu(struct rcu_head *head)</div><div class='add'>+void dev_pm_opp_put_opp_table(struct opp_table *opp_table)</div><div class='ctx'> {</div><div class='del'>-	struct dev_pm_opp *opp = container_of(head, struct dev_pm_opp, rcu_head);</div><div class='add'>+	kref_put_mutex(&amp;opp_table-&gt;kref, _opp_table_kref_release,</div><div class='add'>+		       &amp;opp_table_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_opp_put_opp_table);</div><div class='ctx'> </div><div class='del'>-	kfree_rcu(opp, rcu_head);</div><div class='add'>+void _opp_free(struct dev_pm_opp *opp)</div><div class='add'>+{</div><div class='add'>+	kfree(opp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * _opp_remove()  - Remove an OPP from a table definition</div><div class='del'>- * @opp_table:	points back to the opp_table struct this opp belongs to</div><div class='del'>- * @opp:	pointer to the OPP to remove</div><div class='del'>- * @notify:	OPP_EVENT_REMOVE notification should be sent or not</div><div class='del'>- *</div><div class='del'>- * This function removes an opp definition from the opp table.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * It is assumed that the caller holds required mutex for an RCU updater</div><div class='del'>- * strategy.</div><div class='del'>- */</div><div class='del'>-void _opp_remove(struct opp_table *opp_table, struct dev_pm_opp *opp,</div><div class='del'>-		 bool notify)</div><div class='add'>+static void _opp_kref_release(struct kref *kref)</div><div class='ctx'> {</div><div class='add'>+	struct dev_pm_opp *opp = container_of(kref, struct dev_pm_opp, kref);</div><div class='add'>+	struct opp_table *opp_table = opp-&gt;opp_table;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Notify the changes in the availability of the operable</div><div class='ctx'> 	 * frequency/voltage list.</div><div class='ctx'> 	 */</div><div class='del'>-	if (notify)</div><div class='del'>-		srcu_notifier_call_chain(&amp;opp_table-&gt;srcu_head,</div><div class='del'>-					 OPP_EVENT_REMOVE, opp);</div><div class='add'>+	blocking_notifier_call_chain(&amp;opp_table-&gt;head, OPP_EVENT_REMOVE, opp);</div><div class='ctx'> 	opp_debug_remove_one(opp);</div><div class='del'>-	list_del_rcu(&amp;opp-&gt;node);</div><div class='del'>-	call_srcu(&amp;opp_table-&gt;srcu_head.srcu, &amp;opp-&gt;rcu_head, _kfree_opp_rcu);</div><div class='add'>+	list_del(&amp;opp-&gt;node);</div><div class='add'>+	kfree(opp);</div><div class='ctx'> </div><div class='del'>-	_remove_opp_table(opp_table);</div><div class='add'>+	mutex_unlock(&amp;opp_table-&gt;lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dev_pm_opp_get(struct dev_pm_opp *opp)</div><div class='add'>+{</div><div class='add'>+	kref_get(&amp;opp-&gt;kref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dev_pm_opp_put(struct dev_pm_opp *opp)</div><div class='add'>+{</div><div class='add'>+	kref_put_mutex(&amp;opp-&gt;kref, _opp_kref_release, &amp;opp-&gt;opp_table-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_opp_put);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * dev_pm_opp_remove()  - Remove an OPP from OPP table</div><div class='ctx'>  * @dev:	device for which we do this operation</div><div class='ctx'>  * @freq:	OPP to remove with matching 'freq'</div><div class='ctx'>  *</div><div class='ctx'>  * This function removes an opp from the opp table.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='ctx'> void dev_pm_opp_remove(struct device *dev, unsigned long freq)</div><div class='ctx'> {</div><div class='hunk'>@@ -894,12 +881,11 @@ void dev_pm_opp_remove(struct device *dev, unsigned long freq)</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='ctx'> 	bool found = false;</div><div class='ctx'> </div><div class='del'>-	/* Hold our table modification lock here */</div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='ctx'> 	opp_table = _find_opp_table(dev);</div><div class='ctx'> 	if (IS_ERR(opp_table))</div><div class='del'>-		goto unlock;</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;opp_table-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='ctx'> 		if (opp-&gt;rate == freq) {</div><div class='hunk'>@@ -908,60 +894,77 @@ void dev_pm_opp_remove(struct device *dev, unsigned long freq)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!found) {</div><div class='add'>+	mutex_unlock(&amp;opp_table-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (found) {</div><div class='add'>+		dev_pm_opp_put(opp);</div><div class='add'>+	} else {</div><div class='ctx'> 		dev_warn(dev, "%s: Couldn't find OPP with freq: %lu\n",</div><div class='ctx'> 			 __func__, freq);</div><div class='del'>-		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_opp_remove(opp_table, opp, true);</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_remove);</div><div class='ctx'> </div><div class='del'>-struct dev_pm_opp *_allocate_opp(struct device *dev,</div><div class='del'>-				 struct opp_table **opp_table)</div><div class='add'>+struct dev_pm_opp *_opp_allocate(struct opp_table *table)</div><div class='ctx'> {</div><div class='ctx'> 	struct dev_pm_opp *opp;</div><div class='add'>+	int count, supply_size;</div><div class='add'>+</div><div class='add'>+	/* Allocate space for at least one supply */</div><div class='add'>+	count = table-&gt;regulator_count ? table-&gt;regulator_count : 1;</div><div class='add'>+	supply_size = sizeof(*opp-&gt;supplies) * count;</div><div class='ctx'> </div><div class='del'>-	/* allocate new OPP node */</div><div class='del'>-	opp = kzalloc(sizeof(*opp), GFP_KERNEL);</div><div class='add'>+	/* allocate new OPP node and supplies structures */</div><div class='add'>+	opp = kzalloc(sizeof(*opp) + supply_size, GFP_KERNEL);</div><div class='ctx'> 	if (!opp)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	/* Put the supplies at the end of the OPP structure as an empty array */</div><div class='add'>+	opp-&gt;supplies = (struct dev_pm_opp_supply *)(opp + 1);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;opp-&gt;node);</div><div class='ctx'> </div><div class='del'>-	*opp_table = _add_opp_table(dev);</div><div class='del'>-	if (!*opp_table) {</div><div class='del'>-		kfree(opp);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return opp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool _opp_supported_by_regulators(struct dev_pm_opp *opp,</div><div class='ctx'> 					 struct opp_table *opp_table)</div><div class='ctx'> {</div><div class='del'>-	struct regulator *reg = opp_table-&gt;regulator;</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(reg) &amp;&amp;</div><div class='del'>-	    !regulator_is_supported_voltage(reg, opp-&gt;u_volt_min,</div><div class='del'>-					    opp-&gt;u_volt_max)) {</div><div class='del'>-		pr_warn("%s: OPP minuV: %lu maxuV: %lu, not supported by regulator\n",</div><div class='del'>-			__func__, opp-&gt;u_volt_min, opp-&gt;u_volt_max);</div><div class='del'>-		return false;</div><div class='add'>+	struct regulator *reg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; opp_table-&gt;regulator_count; i++) {</div><div class='add'>+		reg = opp_table-&gt;regulators[i];</div><div class='add'>+</div><div class='add'>+		if (!regulator_is_supported_voltage(reg,</div><div class='add'>+					opp-&gt;supplies[i].u_volt_min,</div><div class='add'>+					opp-&gt;supplies[i].u_volt_max)) {</div><div class='add'>+			pr_warn("%s: OPP minuV: %lu maxuV: %lu, not supported by regulator\n",</div><div class='add'>+				__func__, opp-&gt;supplies[i].u_volt_min,</div><div class='add'>+				opp-&gt;supplies[i].u_volt_max);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Returns:</div><div class='add'>+ * 0: On success. And appropriate error message for duplicate OPPs.</div><div class='add'>+ * -EBUSY: For OPP with same freq/volt and is available. The callers of</div><div class='add'>+ *  _opp_add() must return 0 if they receive -EBUSY from it. This is to make</div><div class='add'>+ *  sure we don't print error messages unnecessarily if different parts of</div><div class='add'>+ *  kernel try to initialize the OPP table.</div><div class='add'>+ * -EEXIST: For OPP with same freq but different volt or is unavailable. This</div><div class='add'>+ *  should be considered an error by the callers of _opp_add().</div><div class='add'>+ */</div><div class='ctx'> int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,</div><div class='ctx'> 	     struct opp_table *opp_table)</div><div class='ctx'> {</div><div class='ctx'> 	struct dev_pm_opp *opp;</div><div class='del'>-	struct list_head *head = &amp;opp_table-&gt;opp_list;</div><div class='add'>+	struct list_head *head;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -972,7 +975,10 @@ int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,</div><div class='ctx'> 	 * loop, don't replace it with head otherwise it will become an infinite</div><div class='ctx'> 	 * loop.</div><div class='ctx'> 	 */</div><div class='del'>-	list_for_each_entry_rcu(opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='add'>+	mutex_lock(&amp;opp_table-&gt;lock);</div><div class='add'>+	head = &amp;opp_table-&gt;opp_list;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='ctx'> 		if (new_opp-&gt;rate &gt; opp-&gt;rate) {</div><div class='ctx'> 			head = &amp;opp-&gt;node;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -983,15 +989,26 @@ int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,</div><div class='ctx'> </div><div class='ctx'> 		/* Duplicate OPPs */</div><div class='ctx'> 		dev_warn(dev, "%s: duplicate OPPs detected. Existing: freq: %lu, volt: %lu, enabled: %d. New: freq: %lu, volt: %lu, enabled: %d\n",</div><div class='del'>-			 __func__, opp-&gt;rate, opp-&gt;u_volt, opp-&gt;available,</div><div class='del'>-			 new_opp-&gt;rate, new_opp-&gt;u_volt, new_opp-&gt;available);</div><div class='add'>+			 __func__, opp-&gt;rate, opp-&gt;supplies[0].u_volt,</div><div class='add'>+			 opp-&gt;available, new_opp-&gt;rate,</div><div class='add'>+			 new_opp-&gt;supplies[0].u_volt, new_opp-&gt;available);</div><div class='add'>+</div><div class='add'>+		/* Should we compare voltages for all regulators here ? */</div><div class='add'>+		ret = opp-&gt;available &amp;&amp;</div><div class='add'>+		      new_opp-&gt;supplies[0].u_volt == opp-&gt;supplies[0].u_volt ? -EBUSY : -EEXIST;</div><div class='ctx'> </div><div class='del'>-		return opp-&gt;available &amp;&amp; new_opp-&gt;u_volt == opp-&gt;u_volt ?</div><div class='del'>-			0 : -EEXIST;</div><div class='add'>+		mutex_unlock(&amp;opp_table-&gt;lock);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	list_add(&amp;new_opp-&gt;node, head);</div><div class='add'>+	mutex_unlock(&amp;opp_table-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	new_opp-&gt;opp_table = opp_table;</div><div class='del'>-	list_add_rcu(&amp;new_opp-&gt;node, head);</div><div class='add'>+	kref_init(&amp;new_opp-&gt;kref);</div><div class='add'>+</div><div class='add'>+	/* Get a reference to the OPP table */</div><div class='add'>+	_get_opp_table_kref(opp_table);</div><div class='ctx'> </div><div class='ctx'> 	ret = opp_debug_create_one(new_opp, opp_table);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1009,6 +1026,7 @@ int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * _opp_add_v1() - Allocate a OPP based on v1 bindings.</div><div class='add'>+ * @opp_table:	OPP table</div><div class='ctx'>  * @dev:	device for which we do this operation</div><div class='ctx'>  * @freq:	Frequency in Hz for this OPP</div><div class='ctx'>  * @u_volt:	Voltage in uVolts for this OPP</div><div class='hunk'>@@ -1021,12 +1039,6 @@ int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,</div><div class='ctx'>  * NOTE: "dynamic" parameter impacts OPPs added by the dev_pm_opp_of_add_table</div><div class='ctx'>  * and freed by dev_pm_opp_of_remove_table.</div><div class='ctx'>  *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='del'>- *</div><div class='ctx'>  * Return:</div><div class='ctx'>  * 0		On success OR</div><div class='ctx'>  *		Duplicate OPPs (both freq and volt are same) and opp-&gt;available</div><div class='hunk'>@@ -1034,49 +1046,44 @@ int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,</div><div class='ctx'>  *		Duplicate OPPs (both freq and volt are same) and !opp-&gt;available</div><div class='ctx'>  * -ENOMEM	Memory allocation failure</div><div class='ctx'>  */</div><div class='del'>-int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt,</div><div class='del'>-		bool dynamic)</div><div class='add'>+int _opp_add_v1(struct opp_table *opp_table, struct device *dev,</div><div class='add'>+		unsigned long freq, long u_volt, bool dynamic)</div><div class='ctx'> {</div><div class='del'>-	struct opp_table *opp_table;</div><div class='ctx'> 	struct dev_pm_opp *new_opp;</div><div class='ctx'> 	unsigned long tol;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Hold our table modification lock here */</div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='del'>-	new_opp = _allocate_opp(dev, &amp;opp_table);</div><div class='del'>-	if (!new_opp) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	new_opp = _opp_allocate(opp_table);</div><div class='add'>+	if (!new_opp)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* populate the opp table */</div><div class='ctx'> 	new_opp-&gt;rate = freq;</div><div class='ctx'> 	tol = u_volt * opp_table-&gt;voltage_tolerance_v1 / 100;</div><div class='del'>-	new_opp-&gt;u_volt = u_volt;</div><div class='del'>-	new_opp-&gt;u_volt_min = u_volt - tol;</div><div class='del'>-	new_opp-&gt;u_volt_max = u_volt + tol;</div><div class='add'>+	new_opp-&gt;supplies[0].u_volt = u_volt;</div><div class='add'>+	new_opp-&gt;supplies[0].u_volt_min = u_volt - tol;</div><div class='add'>+	new_opp-&gt;supplies[0].u_volt_max = u_volt + tol;</div><div class='ctx'> 	new_opp-&gt;available = true;</div><div class='ctx'> 	new_opp-&gt;dynamic = dynamic;</div><div class='ctx'> </div><div class='ctx'> 	ret = _opp_add(dev, new_opp, opp_table);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Don't return error for duplicate OPPs */</div><div class='add'>+		if (ret == -EBUSY)</div><div class='add'>+			ret = 0;</div><div class='ctx'> 		goto free_opp;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Notify the changes in the availability of the operable</div><div class='ctx'> 	 * frequency/voltage list.</div><div class='ctx'> 	 */</div><div class='del'>-	srcu_notifier_call_chain(&amp;opp_table-&gt;srcu_head, OPP_EVENT_ADD, new_opp);</div><div class='add'>+	blocking_notifier_call_chain(&amp;opp_table-&gt;head, OPP_EVENT_ADD, new_opp);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> free_opp:</div><div class='del'>-	_opp_remove(opp_table, new_opp, false);</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+	_opp_free(new_opp);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1090,27 +1097,16 @@ unlock:</div><div class='ctx'>  * specify the hierarchy of versions it supports. OPP layer will then enable</div><div class='ctx'>  * OPPs, which are available for those versions, based on its 'opp-supported-hw'</div><div class='ctx'>  * property.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='del'>-int dev_pm_opp_set_supported_hw(struct device *dev, const u32 *versions,</div><div class='del'>-				unsigned int count)</div><div class='add'>+struct opp_table *dev_pm_opp_set_supported_hw(struct device *dev,</div><div class='add'>+			const u32 *versions, unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* Hold our table modification lock here */</div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	opp_table = _add_opp_table(dev);</div><div class='del'>-	if (!opp_table) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	opp_table = dev_pm_opp_get_opp_table(dev);</div><div class='add'>+	if (!opp_table)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure there are no concurrent readers while updating opp_table */</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;opp_table-&gt;opp_list));</div><div class='hunk'>@@ -1131,65 +1127,40 @@ int dev_pm_opp_set_supported_hw(struct device *dev, const u32 *versions,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	opp_table-&gt;supported_hw_count = count;</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	return opp_table;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	_remove_opp_table(opp_table);</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_set_supported_hw);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dev_pm_opp_put_supported_hw() - Releases resources blocked for supported hw</div><div class='del'>- * @dev: Device for which supported-hw has to be put.</div><div class='add'>+ * @opp_table: OPP table returned by dev_pm_opp_set_supported_hw().</div><div class='ctx'>  *</div><div class='ctx'>  * This is required only for the V2 bindings, and is called for a matching</div><div class='ctx'>  * dev_pm_opp_set_supported_hw(). Until this is called, the opp_table structure</div><div class='ctx'>  * will not be freed.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='del'>-void dev_pm_opp_put_supported_hw(struct device *dev)</div><div class='add'>+void dev_pm_opp_put_supported_hw(struct opp_table *opp_table)</div><div class='ctx'> {</div><div class='del'>-	struct opp_table *opp_table;</div><div class='del'>-</div><div class='del'>-	/* Hold our table modification lock here */</div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='del'>-	/* Check for existing table for 'dev' first */</div><div class='del'>-	opp_table = _find_opp_table(dev);</div><div class='del'>-	if (IS_ERR(opp_table)) {</div><div class='del'>-		dev_err(dev, "Failed to find opp_table: %ld\n",</div><div class='del'>-			PTR_ERR(opp_table));</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Make sure there are no concurrent readers while updating opp_table */</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;opp_table-&gt;opp_list));</div><div class='ctx'> </div><div class='ctx'> 	if (!opp_table-&gt;supported_hw) {</div><div class='del'>-		dev_err(dev, "%s: Doesn't have supported hardware list\n",</div><div class='del'>-			__func__);</div><div class='del'>-		goto unlock;</div><div class='add'>+		pr_err("%s: Doesn't have supported hardware list\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(opp_table-&gt;supported_hw);</div><div class='ctx'> 	opp_table-&gt;supported_hw = NULL;</div><div class='ctx'> 	opp_table-&gt;supported_hw_count = 0;</div><div class='ctx'> </div><div class='del'>-	/* Try freeing opp_table if this was the last blocking resource */</div><div class='del'>-	_remove_opp_table(opp_table);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_put_supported_hw);</div><div class='ctx'> </div><div class='hunk'>@@ -1202,26 +1173,15 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_put_supported_hw);</div><div class='ctx'>  * specify the extn to be used for certain property names. The properties to</div><div class='ctx'>  * which the extension will apply are opp-microvolt and opp-microamp. OPP core</div><div class='ctx'>  * should postfix the property name with -&lt;name&gt; while looking for them.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='del'>-int dev_pm_opp_set_prop_name(struct device *dev, const char *name)</div><div class='add'>+struct opp_table *dev_pm_opp_set_prop_name(struct device *dev, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* Hold our table modification lock here */</div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	opp_table = _add_opp_table(dev);</div><div class='del'>-	if (!opp_table) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	opp_table = dev_pm_opp_get_opp_table(dev);</div><div class='add'>+	if (!opp_table)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure there are no concurrent readers while updating opp_table */</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;opp_table-&gt;opp_list));</div><div class='hunk'>@@ -1240,95 +1200,95 @@ int dev_pm_opp_set_prop_name(struct device *dev, const char *name)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='del'>-	return 0;</div><div class='add'>+	return opp_table;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	_remove_opp_table(opp_table);</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_set_prop_name);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dev_pm_opp_put_prop_name() - Releases resources blocked for prop-name</div><div class='del'>- * @dev: Device for which the prop-name has to be put.</div><div class='add'>+ * @opp_table: OPP table returned by dev_pm_opp_set_prop_name().</div><div class='ctx'>  *</div><div class='ctx'>  * This is required only for the V2 bindings, and is called for a matching</div><div class='ctx'>  * dev_pm_opp_set_prop_name(). Until this is called, the opp_table structure</div><div class='ctx'>  * will not be freed.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='del'>-void dev_pm_opp_put_prop_name(struct device *dev)</div><div class='add'>+void dev_pm_opp_put_prop_name(struct opp_table *opp_table)</div><div class='ctx'> {</div><div class='del'>-	struct opp_table *opp_table;</div><div class='del'>-</div><div class='del'>-	/* Hold our table modification lock here */</div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='del'>-	/* Check for existing table for 'dev' first */</div><div class='del'>-	opp_table = _find_opp_table(dev);</div><div class='del'>-	if (IS_ERR(opp_table)) {</div><div class='del'>-		dev_err(dev, "Failed to find opp_table: %ld\n",</div><div class='del'>-			PTR_ERR(opp_table));</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Make sure there are no concurrent readers while updating opp_table */</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;opp_table-&gt;opp_list));</div><div class='ctx'> </div><div class='ctx'> 	if (!opp_table-&gt;prop_name) {</div><div class='del'>-		dev_err(dev, "%s: Doesn't have a prop-name\n", __func__);</div><div class='del'>-		goto unlock;</div><div class='add'>+		pr_err("%s: Doesn't have a prop-name\n", __func__);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(opp_table-&gt;prop_name);</div><div class='ctx'> 	opp_table-&gt;prop_name = NULL;</div><div class='ctx'> </div><div class='del'>-	/* Try freeing opp_table if this was the last blocking resource */</div><div class='del'>-	_remove_opp_table(opp_table);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_put_prop_name);</div><div class='ctx'> </div><div class='add'>+static int _allocate_set_opp_data(struct opp_table *opp_table)</div><div class='add'>+{</div><div class='add'>+	struct dev_pm_set_opp_data *data;</div><div class='add'>+	int len, count = opp_table-&gt;regulator_count;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!count))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* space for set_opp_data */</div><div class='add'>+	len = sizeof(*data);</div><div class='add'>+</div><div class='add'>+	/* space for old_opp.supplies and new_opp.supplies */</div><div class='add'>+	len += 2 * sizeof(struct dev_pm_opp_supply) * count;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(len, GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	data-&gt;old_opp.supplies = (void *)(data + 1);</div><div class='add'>+	data-&gt;new_opp.supplies = data-&gt;old_opp.supplies + count;</div><div class='add'>+</div><div class='add'>+	opp_table-&gt;set_opp_data = data;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _free_set_opp_data(struct opp_table *opp_table)</div><div class='add'>+{</div><div class='add'>+	kfree(opp_table-&gt;set_opp_data);</div><div class='add'>+	opp_table-&gt;set_opp_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * dev_pm_opp_set_regulator() - Set regulator name for the device</div><div class='add'>+ * dev_pm_opp_set_regulators() - Set regulator names for the device</div><div class='ctx'>  * @dev: Device for which regulator name is being set.</div><div class='del'>- * @name: Name of the regulator.</div><div class='add'>+ * @names: Array of pointers to the names of the regulator.</div><div class='add'>+ * @count: Number of regulators.</div><div class='ctx'>  *</div><div class='ctx'>  * In order to support OPP switching, OPP layer needs to know the name of the</div><div class='del'>- * device's regulator, as the core would be required to switch voltages as well.</div><div class='add'>+ * device's regulators, as the core would be required to switch voltages as</div><div class='add'>+ * well.</div><div class='ctx'>  *</div><div class='ctx'>  * This must be called before any OPPs are initialized for the device.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='del'>-int dev_pm_opp_set_regulator(struct device *dev, const char *name)</div><div class='add'>+struct opp_table *dev_pm_opp_set_regulators(struct device *dev,</div><div class='add'>+					    const char * const names[],</div><div class='add'>+					    unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='ctx'> 	struct regulator *reg;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='del'>-	opp_table = _add_opp_table(dev);</div><div class='del'>-	if (!opp_table) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	opp_table = dev_pm_opp_get_opp_table(dev);</div><div class='add'>+	if (!opp_table)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	/* This should be called before OPPs are initialized */</div><div class='ctx'> 	if (WARN_ON(!list_empty(&amp;opp_table-&gt;opp_list))) {</div><div class='hunk'>@@ -1336,77 +1296,154 @@ int dev_pm_opp_set_regulator(struct device *dev, const char *name)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Already have a regulator set */</div><div class='del'>-	if (WARN_ON(!IS_ERR(opp_table-&gt;regulator))) {</div><div class='add'>+	/* Already have regulators set */</div><div class='add'>+	if (opp_table-&gt;regulators) {</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='del'>-	/* Allocate the regulator */</div><div class='del'>-	reg = regulator_get_optional(dev, name);</div><div class='del'>-	if (IS_ERR(reg)) {</div><div class='del'>-		ret = PTR_ERR(reg);</div><div class='del'>-		if (ret != -EPROBE_DEFER)</div><div class='del'>-			dev_err(dev, "%s: no regulator (%s) found: %d\n",</div><div class='del'>-				__func__, name, ret);</div><div class='add'>+</div><div class='add'>+	opp_table-&gt;regulators = kmalloc_array(count,</div><div class='add'>+					      sizeof(*opp_table-&gt;regulators),</div><div class='add'>+					      GFP_KERNEL);</div><div class='add'>+	if (!opp_table-&gt;regulators) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	opp_table-&gt;regulator = reg;</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		reg = regulator_get_optional(dev, names[i]);</div><div class='add'>+		if (IS_ERR(reg)) {</div><div class='add'>+			ret = PTR_ERR(reg);</div><div class='add'>+			if (ret != -EPROBE_DEFER)</div><div class='add'>+				dev_err(dev, "%s: no regulator (%s) found: %d\n",</div><div class='add'>+					__func__, names[i], ret);</div><div class='add'>+			goto free_regulators;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='del'>-	return 0;</div><div class='add'>+		opp_table-&gt;regulators[i] = reg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opp_table-&gt;regulator_count = count;</div><div class='add'>+</div><div class='add'>+	/* Allocate block only once to pass to set_opp() routines */</div><div class='add'>+	ret = _allocate_set_opp_data(opp_table);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_regulators;</div><div class='add'>+</div><div class='add'>+	return opp_table;</div><div class='ctx'> </div><div class='add'>+free_regulators:</div><div class='add'>+	while (i != 0)</div><div class='add'>+		regulator_put(opp_table-&gt;regulators[--i]);</div><div class='add'>+</div><div class='add'>+	kfree(opp_table-&gt;regulators);</div><div class='add'>+	opp_table-&gt;regulators = NULL;</div><div class='add'>+	opp_table-&gt;regulator_count = 0;</div><div class='ctx'> err:</div><div class='del'>-	_remove_opp_table(opp_table);</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_opp_set_regulators);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_pm_opp_put_regulators() - Releases resources blocked for regulator</div><div class='add'>+ * @opp_table: OPP table returned from dev_pm_opp_set_regulators().</div><div class='add'>+ */</div><div class='add'>+void dev_pm_opp_put_regulators(struct opp_table *opp_table)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!opp_table-&gt;regulators) {</div><div class='add'>+		pr_err("%s: Doesn't have regulators set\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure there are no concurrent readers while updating opp_table */</div><div class='add'>+	WARN_ON(!list_empty(&amp;opp_table-&gt;opp_list));</div><div class='add'>+</div><div class='add'>+	for (i = opp_table-&gt;regulator_count - 1; i &gt;= 0; i--)</div><div class='add'>+		regulator_put(opp_table-&gt;regulators[i]);</div><div class='add'>+</div><div class='add'>+	_free_set_opp_data(opp_table);</div><div class='add'>+</div><div class='add'>+	kfree(opp_table-&gt;regulators);</div><div class='add'>+	opp_table-&gt;regulators = NULL;</div><div class='add'>+	opp_table-&gt;regulator_count = 0;</div><div class='add'>+</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(dev_pm_opp_set_regulator);</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_opp_put_regulators);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dev_pm_opp_put_regulator() - Releases resources blocked for regulator</div><div class='del'>- * @dev: Device for which regulator was set.</div><div class='add'>+ * dev_pm_opp_register_set_opp_helper() - Register custom set OPP helper</div><div class='add'>+ * @dev: Device for which the helper is getting registered.</div><div class='add'>+ * @set_opp: Custom set OPP helper.</div><div class='ctx'>  *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='add'>+ * This is useful to support complex platforms (like platforms with multiple</div><div class='add'>+ * regulators per device), instead of the generic OPP set rate helper.</div><div class='add'>+ *</div><div class='add'>+ * This must be called before any OPPs are initialized for the device.</div><div class='ctx'>  */</div><div class='del'>-void dev_pm_opp_put_regulator(struct device *dev)</div><div class='add'>+struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev,</div><div class='add'>+			int (*set_opp)(struct dev_pm_set_opp_data *data))</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='add'>+	if (!set_opp)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	/* Check for existing table for 'dev' first */</div><div class='del'>-	opp_table = _find_opp_table(dev);</div><div class='del'>-	if (IS_ERR(opp_table)) {</div><div class='del'>-		dev_err(dev, "Failed to find opp_table: %ld\n",</div><div class='del'>-			PTR_ERR(opp_table));</div><div class='del'>-		goto unlock;</div><div class='add'>+	opp_table = dev_pm_opp_get_opp_table(dev);</div><div class='add'>+	if (!opp_table)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	/* This should be called before OPPs are initialized */</div><div class='add'>+	if (WARN_ON(!list_empty(&amp;opp_table-&gt;opp_list))) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(opp_table-&gt;regulator)) {</div><div class='del'>-		dev_err(dev, "%s: Doesn't have regulator set\n", __func__);</div><div class='del'>-		goto unlock;</div><div class='add'>+	/* Already have custom set_opp helper */</div><div class='add'>+	if (WARN_ON(opp_table-&gt;set_opp)) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opp_table-&gt;set_opp = set_opp;</div><div class='add'>+</div><div class='add'>+	return opp_table;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_opp_register_set_opp_helper);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_pm_opp_register_put_opp_helper() - Releases resources blocked for</div><div class='add'>+ *					   set_opp helper</div><div class='add'>+ * @opp_table: OPP table returned from dev_pm_opp_register_set_opp_helper().</div><div class='add'>+ *</div><div class='add'>+ * Release resources blocked for platform specific set_opp helper.</div><div class='add'>+ */</div><div class='add'>+void dev_pm_opp_register_put_opp_helper(struct opp_table *opp_table)</div><div class='add'>+{</div><div class='add'>+	if (!opp_table-&gt;set_opp) {</div><div class='add'>+		pr_err("%s: Doesn't have custom set_opp helper set\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure there are no concurrent readers while updating opp_table */</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;opp_table-&gt;opp_list));</div><div class='ctx'> </div><div class='del'>-	regulator_put(opp_table-&gt;regulator);</div><div class='del'>-	opp_table-&gt;regulator = ERR_PTR(-ENXIO);</div><div class='add'>+	opp_table-&gt;set_opp = NULL;</div><div class='ctx'> </div><div class='del'>-	/* Try freeing opp_table if this was the last blocking resource */</div><div class='del'>-	_remove_opp_table(opp_table);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(dev_pm_opp_put_regulator);</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_opp_register_put_opp_helper);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dev_pm_opp_add()  - Add an OPP table from a table definitions</div><div class='hunk'>@@ -1418,12 +1455,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_put_regulator);</div><div class='ctx'>  * The opp is made available by default and it can be controlled using</div><div class='ctx'>  * dev_pm_opp_enable/disable functions.</div><div class='ctx'>  *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='del'>- *</div><div class='ctx'>  * Return:</div><div class='ctx'>  * 0		On success OR</div><div class='ctx'>  *		Duplicate OPPs (both freq and volt are same) and opp-&gt;available</div><div class='hunk'>@@ -1433,7 +1464,17 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_put_regulator);</div><div class='ctx'>  */</div><div class='ctx'> int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt)</div><div class='ctx'> {</div><div class='del'>-	return _opp_add_v1(dev, freq, u_volt, true);</div><div class='add'>+	struct opp_table *opp_table;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	opp_table = dev_pm_opp_get_opp_table(dev);</div><div class='add'>+	if (!opp_table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = _opp_add_v1(opp_table, dev, freq, u_volt, true);</div><div class='add'>+</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_add);</div><div class='ctx'> </div><div class='hunk'>@@ -1443,41 +1484,30 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_add);</div><div class='ctx'>  * @freq:		OPP frequency to modify availability</div><div class='ctx'>  * @availability_req:	availability status requested for this opp</div><div class='ctx'>  *</div><div class='del'>- * Set the availability of an OPP with an RCU operation, opp_{enable,disable}</div><div class='del'>- * share a common logic which is isolated here.</div><div class='add'>+ * Set the availability of an OPP, opp_{enable,disable} share a common logic</div><div class='add'>+ * which is isolated here.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: -EINVAL for bad pointers, -ENOMEM if no memory available for the</div><div class='ctx'>  * copy operation, returns 0 if no modification was done OR modification was</div><div class='ctx'>  * successful.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks to</div><div class='del'>- * keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex locking or synchronize_rcu() blocking calls cannot be used.</div><div class='ctx'>  */</div><div class='ctx'> static int _opp_set_availability(struct device *dev, unsigned long freq,</div><div class='ctx'> 				 bool availability_req)</div><div class='ctx'> {</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='del'>-	struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV);</div><div class='add'>+	struct dev_pm_opp *tmp_opp, *opp = ERR_PTR(-ENODEV);</div><div class='ctx'> 	int r = 0;</div><div class='ctx'> </div><div class='del'>-	/* keep the node allocated */</div><div class='del'>-	new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL);</div><div class='del'>-	if (!new_opp)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='ctx'> 	/* Find the opp_table */</div><div class='ctx'> 	opp_table = _find_opp_table(dev);</div><div class='ctx'> 	if (IS_ERR(opp_table)) {</div><div class='ctx'> 		r = PTR_ERR(opp_table);</div><div class='ctx'> 		dev_warn(dev, "%s: Device OPP not found (%d)\n", __func__, r);</div><div class='del'>-		goto unlock;</div><div class='add'>+		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;opp_table-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	/* Do we have the frequency? */</div><div class='ctx'> 	list_for_each_entry(tmp_opp, &amp;opp_table-&gt;opp_list, node) {</div><div class='ctx'> 		if (tmp_opp-&gt;rate == freq) {</div><div class='hunk'>@@ -1485,6 +1515,7 @@ static int _opp_set_availability(struct device *dev, unsigned long freq,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (IS_ERR(opp)) {</div><div class='ctx'> 		r = PTR_ERR(opp);</div><div class='ctx'> 		goto unlock;</div><div class='hunk'>@@ -1493,29 +1524,20 @@ static int _opp_set_availability(struct device *dev, unsigned long freq,</div><div class='ctx'> 	/* Is update really needed? */</div><div class='ctx'> 	if (opp-&gt;available == availability_req)</div><div class='ctx'> 		goto unlock;</div><div class='del'>-	/* copy the old data over */</div><div class='del'>-	*new_opp = *opp;</div><div class='ctx'> </div><div class='del'>-	/* plug in new node */</div><div class='del'>-	new_opp-&gt;available = availability_req;</div><div class='del'>-</div><div class='del'>-	list_replace_rcu(&amp;opp-&gt;node, &amp;new_opp-&gt;node);</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='del'>-	call_srcu(&amp;opp_table-&gt;srcu_head.srcu, &amp;opp-&gt;rcu_head, _kfree_opp_rcu);</div><div class='add'>+	opp-&gt;available = availability_req;</div><div class='ctx'> </div><div class='ctx'> 	/* Notify the change of the OPP availability */</div><div class='ctx'> 	if (availability_req)</div><div class='del'>-		srcu_notifier_call_chain(&amp;opp_table-&gt;srcu_head,</div><div class='del'>-					 OPP_EVENT_ENABLE, new_opp);</div><div class='add'>+		blocking_notifier_call_chain(&amp;opp_table-&gt;head, OPP_EVENT_ENABLE,</div><div class='add'>+					     opp);</div><div class='ctx'> 	else</div><div class='del'>-		srcu_notifier_call_chain(&amp;opp_table-&gt;srcu_head,</div><div class='del'>-					 OPP_EVENT_DISABLE, new_opp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+		blocking_notifier_call_chain(&amp;opp_table-&gt;head,</div><div class='add'>+					     OPP_EVENT_DISABLE, opp);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='del'>-	kfree(new_opp);</div><div class='add'>+	mutex_unlock(&amp;opp_table-&gt;lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1528,12 +1550,6 @@ unlock:</div><div class='ctx'>  * corresponding error value. It is meant to be used for users an OPP available</div><div class='ctx'>  * after being temporarily made unavailable with dev_pm_opp_disable.</div><div class='ctx'>  *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function indirectly uses RCU and mutex locks to keep the</div><div class='del'>- * integrity of the internal data structures. Callers should ensure that</div><div class='del'>- * this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex locking or synchronize_rcu() blocking calls cannot be used.</div><div class='del'>- *</div><div class='ctx'>  * Return: -EINVAL for bad pointers, -ENOMEM if no memory available for the</div><div class='ctx'>  * copy operation, returns 0 if no modification was done OR modification was</div><div class='ctx'>  * successful.</div><div class='hunk'>@@ -1554,12 +1570,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_enable);</div><div class='ctx'>  * control by users to make this OPP not available until the circumstances are</div><div class='ctx'>  * right to make it available again (with a call to dev_pm_opp_enable).</div><div class='ctx'>  *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function indirectly uses RCU and mutex locks to keep the</div><div class='del'>- * integrity of the internal data structures. Callers should ensure that</div><div class='del'>- * this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex locking or synchronize_rcu() blocking calls cannot be used.</div><div class='del'>- *</div><div class='ctx'>  * Return: -EINVAL for bad pointers, -ENOMEM if no memory available for the</div><div class='ctx'>  * copy operation, returns 0 if no modification was done OR modification was</div><div class='ctx'>  * successful.</div><div class='hunk'>@@ -1571,41 +1581,78 @@ int dev_pm_opp_disable(struct device *dev, unsigned long freq)</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_disable);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dev_pm_opp_get_notifier() - find notifier_head of the device with opp</div><div class='del'>- * @dev:	device pointer used to lookup OPP table.</div><div class='add'>+ * dev_pm_opp_register_notifier() - Register OPP notifier for the device</div><div class='add'>+ * @dev:	Device for which notifier needs to be registered</div><div class='add'>+ * @nb:		Notifier block to be registered</div><div class='ctx'>  *</div><div class='del'>- * Return: pointer to  notifier head if found, otherwise -ENODEV or</div><div class='del'>- * -EINVAL based on type of error casted as pointer. value must be checked</div><div class='del'>- *  with IS_ERR to determine valid pointer or error result.</div><div class='add'>+ * Return: 0 on success or a negative error value.</div><div class='add'>+ */</div><div class='add'>+int dev_pm_opp_register_notifier(struct device *dev, struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	struct opp_table *opp_table;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	opp_table = _find_opp_table(dev);</div><div class='add'>+	if (IS_ERR(opp_table))</div><div class='add'>+		return PTR_ERR(opp_table);</div><div class='add'>+</div><div class='add'>+	ret = blocking_notifier_chain_register(&amp;opp_table-&gt;head, nb);</div><div class='add'>+</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dev_pm_opp_register_notifier);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_pm_opp_unregister_notifier() - Unregister OPP notifier for the device</div><div class='add'>+ * @dev:	Device for which notifier needs to be unregistered</div><div class='add'>+ * @nb:		Notifier block to be unregistered</div><div class='ctx'>  *</div><div class='del'>- * Locking: This function must be called under rcu_read_lock(). opp_table is a</div><div class='del'>- * RCU protected pointer. The reason for the same is that the opp pointer which</div><div class='del'>- * is returned will remain valid for use with opp_get_{voltage, freq} only while</div><div class='del'>- * under the locked area. The pointer returned must be used prior to unlocking</div><div class='del'>- * with rcu_read_unlock() to maintain the integrity of the pointer.</div><div class='add'>+ * Return: 0 on success or a negative error value.</div><div class='ctx'>  */</div><div class='del'>-struct srcu_notifier_head *dev_pm_opp_get_notifier(struct device *dev)</div><div class='add'>+int dev_pm_opp_unregister_notifier(struct device *dev,</div><div class='add'>+				   struct notifier_block *nb)</div><div class='ctx'> {</div><div class='del'>-	struct opp_table *opp_table = _find_opp_table(dev);</div><div class='add'>+	struct opp_table *opp_table;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='add'>+	opp_table = _find_opp_table(dev);</div><div class='ctx'> 	if (IS_ERR(opp_table))</div><div class='del'>-		return ERR_CAST(opp_table); /* matching type */</div><div class='add'>+		return PTR_ERR(opp_table);</div><div class='ctx'> </div><div class='del'>-	return &amp;opp_table-&gt;srcu_head;</div><div class='add'>+	ret = blocking_notifier_chain_unregister(&amp;opp_table-&gt;head, nb);</div><div class='add'>+</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(dev_pm_opp_get_notifier);</div><div class='add'>+EXPORT_SYMBOL(dev_pm_opp_unregister_notifier);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Free OPPs either created using static entries present in DT or even the</div><div class='ctx'>  * dynamically added entries based on remove_all param.</div><div class='ctx'>  */</div><div class='del'>-void _dev_pm_opp_remove_table(struct device *dev, bool remove_all)</div><div class='add'>+void _dev_pm_opp_remove_table(struct opp_table *opp_table, struct device *dev,</div><div class='add'>+			      bool remove_all)</div><div class='ctx'> {</div><div class='del'>-	struct opp_table *opp_table;</div><div class='ctx'> 	struct dev_pm_opp *opp, *tmp;</div><div class='ctx'> </div><div class='del'>-	/* Hold our table modification lock here */</div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='add'>+	/* Find if opp_table manages a single device */</div><div class='add'>+	if (list_is_singular(&amp;opp_table-&gt;dev_list)) {</div><div class='add'>+		/* Free static OPPs */</div><div class='add'>+		list_for_each_entry_safe(opp, tmp, &amp;opp_table-&gt;opp_list, node) {</div><div class='add'>+			if (remove_all || !opp-&gt;dynamic)</div><div class='add'>+				dev_pm_opp_put(opp);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		_remove_opp_dev(_find_opp_dev(dev, opp_table), opp_table);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void _dev_pm_opp_find_and_remove_table(struct device *dev, bool remove_all)</div><div class='add'>+{</div><div class='add'>+	struct opp_table *opp_table;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for existing table for 'dev' */</div><div class='ctx'> 	opp_table = _find_opp_table(dev);</div><div class='hunk'>@@ -1617,22 +1664,12 @@ void _dev_pm_opp_remove_table(struct device *dev, bool remove_all)</div><div class='ctx'> 			     IS_ERR_OR_NULL(dev) ?</div><div class='ctx'> 					"Invalid device" : dev_name(dev),</div><div class='ctx'> 			     error);</div><div class='del'>-		goto unlock;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Find if opp_table manages a single device */</div><div class='del'>-	if (list_is_singular(&amp;opp_table-&gt;dev_list)) {</div><div class='del'>-		/* Free static OPPs */</div><div class='del'>-		list_for_each_entry_safe(opp, tmp, &amp;opp_table-&gt;opp_list, node) {</div><div class='del'>-			if (remove_all || !opp-&gt;dynamic)</div><div class='del'>-				_opp_remove(opp_table, opp, true);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		_remove_opp_dev(_find_opp_dev(dev, opp_table), opp_table);</div><div class='del'>-	}</div><div class='add'>+	_dev_pm_opp_remove_table(opp_table, dev, remove_all);</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1641,15 +1678,9 @@ unlock:</div><div class='ctx'>  *</div><div class='ctx'>  * Free both OPPs created using static entries present in DT and the</div><div class='ctx'>  * dynamically added entries.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function indirectly uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='ctx'> void dev_pm_opp_remove_table(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	_dev_pm_opp_remove_table(dev, true);</div><div class='add'>+	_dev_pm_opp_find_and_remove_table(dev, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_remove_table);</div><div class='head'>diff --git a/drivers/base/power/opp/cpu.c b/drivers/base/power/opp/cpu.c<br/>index 8c3434bdb26d..2d87bc1adf38 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/opp/cpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/opp/cpu.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/opp/cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/opp/cpu.c</a></div><div class='hunk'>@@ -42,11 +42,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * WARNING: It is  important for the callers to ensure refreshing their copy of</div><div class='ctx'>  * the table if any of the mentioned functions have been invoked in the interim.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Since we just use the regular accessor functions to access the internal data</div><div class='del'>- * structures, we use RCU read lock inside this function. As a result, users of</div><div class='del'>- * this function DONOT need to use explicit locks for invoking.</div><div class='ctx'>  */</div><div class='ctx'> int dev_pm_opp_init_cpufreq_table(struct device *dev,</div><div class='ctx'> 				  struct cpufreq_frequency_table **table)</div><div class='hunk'>@@ -56,19 +51,13 @@ int dev_pm_opp_init_cpufreq_table(struct device *dev,</div><div class='ctx'> 	int i, max_opps, ret = 0;</div><div class='ctx'> 	unsigned long rate;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='ctx'> 	max_opps = dev_pm_opp_get_opp_count(dev);</div><div class='del'>-	if (max_opps &lt;= 0) {</div><div class='del'>-		ret = max_opps ? max_opps : -ENODATA;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (max_opps &lt;= 0)</div><div class='add'>+		return max_opps ? max_opps : -ENODATA;</div><div class='ctx'> </div><div class='ctx'> 	freq_table = kcalloc((max_opps + 1), sizeof(*freq_table), GFP_ATOMIC);</div><div class='del'>-	if (!freq_table) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!freq_table)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, rate = 0; i &lt; max_opps; i++, rate++) {</div><div class='ctx'> 		/* find next rate */</div><div class='hunk'>@@ -83,6 +72,8 @@ int dev_pm_opp_init_cpufreq_table(struct device *dev,</div><div class='ctx'> 		/* Is Boost/turbo opp ? */</div><div class='ctx'> 		if (dev_pm_opp_is_turbo(opp))</div><div class='ctx'> 			freq_table[i].flags = CPUFREQ_BOOST_FREQ;</div><div class='add'>+</div><div class='add'>+		dev_pm_opp_put(opp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	freq_table[i].driver_data = i;</div><div class='hunk'>@@ -91,7 +82,6 @@ int dev_pm_opp_init_cpufreq_table(struct device *dev,</div><div class='ctx'> 	*table = &amp;freq_table[0];</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		kfree(freq_table);</div><div class='ctx'> </div><div class='hunk'>@@ -147,12 +137,6 @@ void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, bool of)</div><div class='ctx'>  * This removes the OPP tables for CPUs present in the @cpumask.</div><div class='ctx'>  * This should be used to remove all the OPPs entries associated with</div><div class='ctx'>  * the cpus in @cpumask.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='ctx'> void dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask)</div><div class='ctx'> {</div><div class='hunk'>@@ -169,12 +153,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_cpumask_remove_table);</div><div class='ctx'>  * @cpumask.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns -ENODEV if OPP table isn't already present.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='ctx'> int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev,</div><div class='ctx'> 				const struct cpumask *cpumask)</div><div class='hunk'>@@ -184,13 +162,9 @@ int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev,</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	int cpu, ret = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='ctx'> 	opp_table = _find_opp_table(cpu_dev);</div><div class='del'>-	if (IS_ERR(opp_table)) {</div><div class='del'>-		ret = PTR_ERR(opp_table);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(opp_table))</div><div class='add'>+		return PTR_ERR(opp_table);</div><div class='ctx'> </div><div class='ctx'> 	for_each_cpu(cpu, cpumask) {</div><div class='ctx'> 		if (cpu == cpu_dev-&gt;id)</div><div class='hunk'>@@ -213,8 +187,8 @@ int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev,</div><div class='ctx'> 		/* Mark opp-table as multiple CPUs are sharing it now */</div><div class='ctx'> 		opp_table-&gt;shared_opp = OPP_TABLE_ACCESS_SHARED;</div><div class='ctx'> 	}</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -229,12 +203,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_set_sharing_cpus);</div><div class='ctx'>  *</div><div class='ctx'>  * Returns -ENODEV if OPP table isn't already present and -EINVAL if the OPP</div><div class='ctx'>  * table's status is access-unknown.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='ctx'> int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask)</div><div class='ctx'> {</div><div class='hunk'>@@ -242,17 +210,13 @@ int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask)</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='ctx'> 	opp_table = _find_opp_table(cpu_dev);</div><div class='del'>-	if (IS_ERR(opp_table)) {</div><div class='del'>-		ret = PTR_ERR(opp_table);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(opp_table))</div><div class='add'>+		return PTR_ERR(opp_table);</div><div class='ctx'> </div><div class='ctx'> 	if (opp_table-&gt;shared_opp == OPP_TABLE_ACCESS_UNKNOWN) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='del'>-		goto unlock;</div><div class='add'>+		goto put_opp_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpumask_clear(cpumask);</div><div class='hunk'>@@ -264,8 +228,8 @@ int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask)</div><div class='ctx'> 		cpumask_set_cpu(cpu_dev-&gt;id, cpumask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+put_opp_table:</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/power/opp/debugfs.c b/drivers/base/power/opp/debugfs.c<br/>index ef1ae6b52042..95f433db4ac7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/opp/debugfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/opp/debugfs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/opp/debugfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/opp/debugfs.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "opp.h"</div><div class='ctx'> </div><div class='hunk'>@@ -34,6 +35,46 @@ void opp_debug_remove_one(struct dev_pm_opp *opp)</div><div class='ctx'> 	debugfs_remove_recursive(opp-&gt;dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool opp_debug_create_supplies(struct dev_pm_opp *opp,</div><div class='add'>+				      struct opp_table *opp_table,</div><div class='add'>+				      struct dentry *pdentry)</div><div class='add'>+{</div><div class='add'>+	struct dentry *d;</div><div class='add'>+	int i = 0;</div><div class='add'>+	char *name;</div><div class='add'>+</div><div class='add'>+	/* Always create at least supply-0 directory */</div><div class='add'>+	do {</div><div class='add'>+		name = kasprintf(GFP_KERNEL, "supply-%d", i);</div><div class='add'>+</div><div class='add'>+		/* Create per-opp directory */</div><div class='add'>+		d = debugfs_create_dir(name, pdentry);</div><div class='add'>+</div><div class='add'>+		kfree(name);</div><div class='add'>+</div><div class='add'>+		if (!d)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (!debugfs_create_ulong("u_volt_target", S_IRUGO, d,</div><div class='add'>+					  &amp;opp-&gt;supplies[i].u_volt))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (!debugfs_create_ulong("u_volt_min", S_IRUGO, d,</div><div class='add'>+					  &amp;opp-&gt;supplies[i].u_volt_min))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (!debugfs_create_ulong("u_volt_max", S_IRUGO, d,</div><div class='add'>+					  &amp;opp-&gt;supplies[i].u_volt_max))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (!debugfs_create_ulong("u_amp", S_IRUGO, d,</div><div class='add'>+					  &amp;opp-&gt;supplies[i].u_amp))</div><div class='add'>+			return false;</div><div class='add'>+	} while (++i &lt; opp_table-&gt;regulator_count);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *pdentry = opp_table-&gt;dentry;</div><div class='hunk'>@@ -63,16 +104,7 @@ int opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)</div><div class='ctx'> 	if (!debugfs_create_ulong("rate_hz", S_IRUGO, d, &amp;opp-&gt;rate))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (!debugfs_create_ulong("u_volt_target", S_IRUGO, d, &amp;opp-&gt;u_volt))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!debugfs_create_ulong("u_volt_min", S_IRUGO, d, &amp;opp-&gt;u_volt_min))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!debugfs_create_ulong("u_volt_max", S_IRUGO, d, &amp;opp-&gt;u_volt_max))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!debugfs_create_ulong("u_amp", S_IRUGO, d, &amp;opp-&gt;u_amp))</div><div class='add'>+	if (!opp_debug_create_supplies(opp, opp_table, d))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (!debugfs_create_ulong("clock_latency_ns", S_IRUGO, d,</div><div class='head'>diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c<br/>index 5552211e6fcd..779428676f63 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/opp/of.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/opp/of.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/opp/of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/opp/of.c</a></div><div class='hunk'>@@ -17,15 +17,18 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "opp.h"</div><div class='ctx'> </div><div class='ctx'> static struct opp_table *_managed_opp(const struct device_node *np)</div><div class='ctx'> {</div><div class='del'>-	struct opp_table *opp_table;</div><div class='add'>+	struct opp_table *opp_table, *managed_table = NULL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;opp_table_lock);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(opp_table, &amp;opp_tables, node) {</div><div class='add'>+	list_for_each_entry(opp_table, &amp;opp_tables, node) {</div><div class='ctx'> 		if (opp_table-&gt;np == np) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Multiple devices can point to the same OPP table and</div><div class='hunk'>@@ -34,14 +37,18 @@ static struct opp_table *_managed_opp(const struct device_node *np)</div><div class='ctx'> 			 * But the OPPs will be considered as shared only if the</div><div class='ctx'> 			 * OPP table contains a "opp-shared" property.</div><div class='ctx'> 			 */</div><div class='del'>-			if (opp_table-&gt;shared_opp == OPP_TABLE_ACCESS_SHARED)</div><div class='del'>-				return opp_table;</div><div class='add'>+			if (opp_table-&gt;shared_opp == OPP_TABLE_ACCESS_SHARED) {</div><div class='add'>+				_get_opp_table_kref(opp_table);</div><div class='add'>+				managed_table = opp_table;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			return NULL;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+</div><div class='add'>+	return managed_table;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void _of_init_opp_table(struct opp_table *opp_table, struct device *dev)</div><div class='hunk'>@@ -101,16 +108,16 @@ static bool _opp_is_supported(struct device *dev, struct opp_table *opp_table,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* TODO: Support multiple regulators */</div><div class='ctx'> static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev,</div><div class='ctx'> 			      struct opp_table *opp_table)</div><div class='ctx'> {</div><div class='del'>-	u32 microvolt[3] = {0};</div><div class='del'>-	u32 val;</div><div class='del'>-	int count, ret;</div><div class='add'>+	u32 *microvolt, *microamp = NULL;</div><div class='add'>+	int supplies, vcount, icount, ret, i, j;</div><div class='ctx'> 	struct property *prop = NULL;</div><div class='ctx'> 	char name[NAME_MAX];</div><div class='ctx'> </div><div class='add'>+	supplies = opp_table-&gt;regulator_count ? opp_table-&gt;regulator_count : 1;</div><div class='add'>+</div><div class='ctx'> 	/* Search for "opp-microvolt-&lt;name&gt;" */</div><div class='ctx'> 	if (opp_table-&gt;prop_name) {</div><div class='ctx'> 		snprintf(name, sizeof(name), "opp-microvolt-%s",</div><div class='hunk'>@@ -128,34 +135,29 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	count = of_property_count_u32_elems(opp-&gt;np, name);</div><div class='del'>-	if (count &lt; 0) {</div><div class='add'>+	vcount = of_property_count_u32_elems(opp-&gt;np, name);</div><div class='add'>+	if (vcount &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "%s: Invalid %s property (%d)\n",</div><div class='del'>-			__func__, name, count);</div><div class='del'>-		return count;</div><div class='add'>+			__func__, name, vcount);</div><div class='add'>+		return vcount;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* There can be one or three elements here */</div><div class='del'>-	if (count != 1 &amp;&amp; count != 3) {</div><div class='del'>-		dev_err(dev, "%s: Invalid number of elements in %s property (%d)\n",</div><div class='del'>-			__func__, name, count);</div><div class='add'>+	/* There can be one or three elements per supply */</div><div class='add'>+	if (vcount != supplies &amp;&amp; vcount != supplies * 3) {</div><div class='add'>+		dev_err(dev, "%s: Invalid number of elements in %s property (%d) with supplies (%d)\n",</div><div class='add'>+			__func__, name, vcount, supplies);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = of_property_read_u32_array(opp-&gt;np, name, microvolt, count);</div><div class='add'>+	microvolt = kmalloc_array(vcount, sizeof(*microvolt), GFP_KERNEL);</div><div class='add'>+	if (!microvolt)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_u32_array(opp-&gt;np, name, microvolt, vcount);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "%s: error parsing %s: %d\n", __func__, name, ret);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	opp-&gt;u_volt = microvolt[0];</div><div class='del'>-</div><div class='del'>-	if (count == 1) {</div><div class='del'>-		opp-&gt;u_volt_min = opp-&gt;u_volt;</div><div class='del'>-		opp-&gt;u_volt_max = opp-&gt;u_volt;</div><div class='del'>-	} else {</div><div class='del'>-		opp-&gt;u_volt_min = microvolt[1];</div><div class='del'>-		opp-&gt;u_volt_max = microvolt[2];</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto free_microvolt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Search for "opp-microamp-&lt;name&gt;" */</div><div class='hunk'>@@ -172,10 +174,59 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev,</div><div class='ctx'> 		prop = of_find_property(opp-&gt;np, name, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (prop &amp;&amp; !of_property_read_u32(opp-&gt;np, name, &amp;val))</div><div class='del'>-		opp-&gt;u_amp = val;</div><div class='add'>+	if (prop) {</div><div class='add'>+		icount = of_property_count_u32_elems(opp-&gt;np, name);</div><div class='add'>+		if (icount &lt; 0) {</div><div class='add'>+			dev_err(dev, "%s: Invalid %s property (%d)\n", __func__,</div><div class='add'>+				name, icount);</div><div class='add'>+			ret = icount;</div><div class='add'>+			goto free_microvolt;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+		if (icount != supplies) {</div><div class='add'>+			dev_err(dev, "%s: Invalid number of elements in %s property (%d) with supplies (%d)\n",</div><div class='add'>+				__func__, name, icount, supplies);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto free_microvolt;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		microamp = kmalloc_array(icount, sizeof(*microamp), GFP_KERNEL);</div><div class='add'>+		if (!microamp) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto free_microvolt;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = of_property_read_u32_array(opp-&gt;np, name, microamp,</div><div class='add'>+						 icount);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev, "%s: error parsing %s: %d\n", __func__,</div><div class='add'>+				name, ret);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto free_microamp;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; supplies; i++) {</div><div class='add'>+		opp-&gt;supplies[i].u_volt = microvolt[j++];</div><div class='add'>+</div><div class='add'>+		if (vcount == supplies) {</div><div class='add'>+			opp-&gt;supplies[i].u_volt_min = opp-&gt;supplies[i].u_volt;</div><div class='add'>+			opp-&gt;supplies[i].u_volt_max = opp-&gt;supplies[i].u_volt;</div><div class='add'>+		} else {</div><div class='add'>+			opp-&gt;supplies[i].u_volt_min = microvolt[j++];</div><div class='add'>+			opp-&gt;supplies[i].u_volt_max = microvolt[j++];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (microamp)</div><div class='add'>+			opp-&gt;supplies[i].u_amp = microamp[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+free_microamp:</div><div class='add'>+	kfree(microamp);</div><div class='add'>+free_microvolt:</div><div class='add'>+	kfree(microvolt);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -184,34 +235,28 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev,</div><div class='ctx'>  * @dev:	device pointer used to lookup OPP table.</div><div class='ctx'>  *</div><div class='ctx'>  * Free OPPs created using static entries present in DT.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function indirectly uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='ctx'> void dev_pm_opp_of_remove_table(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	_dev_pm_opp_remove_table(dev, false);</div><div class='add'>+	_dev_pm_opp_find_and_remove_table(dev, false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_opp_of_remove_table);</div><div class='ctx'> </div><div class='ctx'> /* Returns opp descriptor node for a device, caller must do of_node_put() */</div><div class='del'>-struct device_node *_of_get_opp_desc_node(struct device *dev)</div><div class='add'>+struct device_node *dev_pm_opp_of_get_opp_desc_node(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * TODO: Support for multiple OPP tables.</div><div class='del'>-	 *</div><div class='ctx'> 	 * There should be only ONE phandle present in "operating-points-v2"</div><div class='ctx'> 	 * property.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	return of_parse_phandle(dev-&gt;of_node, "operating-points-v2", 0);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_opp_of_get_opp_desc_node);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * _opp_add_static_v2() - Allocate static OPPs (As per 'v2' DT bindings)</div><div class='add'>+ * @opp_table:	OPP table</div><div class='ctx'>  * @dev:	device for which we do this operation</div><div class='ctx'>  * @np:		device node</div><div class='ctx'>  *</div><div class='hunk'>@@ -219,12 +264,6 @@ struct device_node *_of_get_opp_desc_node(struct device *dev)</div><div class='ctx'>  * opp can be controlled using dev_pm_opp_enable/disable functions and may be</div><div class='ctx'>  * removed by dev_pm_opp_remove.</div><div class='ctx'>  *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='del'>- *</div><div class='ctx'>  * Return:</div><div class='ctx'>  * 0		On success OR</div><div class='ctx'>  *		Duplicate OPPs (both freq and volt are same) and opp-&gt;available</div><div class='hunk'>@@ -233,22 +272,17 @@ struct device_node *_of_get_opp_desc_node(struct device *dev)</div><div class='ctx'>  * -ENOMEM	Memory allocation failure</div><div class='ctx'>  * -EINVAL	Failed parsing the OPP node</div><div class='ctx'>  */</div><div class='del'>-static int _opp_add_static_v2(struct device *dev, struct device_node *np)</div><div class='add'>+static int _opp_add_static_v2(struct opp_table *opp_table, struct device *dev,</div><div class='add'>+			      struct device_node *np)</div><div class='ctx'> {</div><div class='del'>-	struct opp_table *opp_table;</div><div class='ctx'> 	struct dev_pm_opp *new_opp;</div><div class='ctx'> 	u64 rate;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Hold our table modification lock here */</div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='del'>-	new_opp = _allocate_opp(dev, &amp;opp_table);</div><div class='del'>-	if (!new_opp) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	new_opp = _opp_allocate(opp_table);</div><div class='add'>+	if (!new_opp)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ret = of_property_read_u64(np, "opp-hz", &amp;rate);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -282,8 +316,12 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np)</div><div class='ctx'> 		goto free_opp;</div><div class='ctx'> </div><div class='ctx'> 	ret = _opp_add(dev, new_opp, opp_table);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Don't return error for duplicate OPPs */</div><div class='add'>+		if (ret == -EBUSY)</div><div class='add'>+			ret = 0;</div><div class='ctx'> 		goto free_opp;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* OPP to select on device suspend */</div><div class='ctx'> 	if (of_property_read_bool(np, "opp-suspend")) {</div><div class='hunk'>@@ -300,24 +338,21 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np)</div><div class='ctx'> 	if (new_opp-&gt;clock_latency_ns &gt; opp_table-&gt;clock_latency_ns_max)</div><div class='ctx'> 		opp_table-&gt;clock_latency_ns_max = new_opp-&gt;clock_latency_ns;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='ctx'> 	pr_debug("%s: turbo:%d rate:%lu uv:%lu uvmin:%lu uvmax:%lu latency:%lu\n",</div><div class='del'>-		 __func__, new_opp-&gt;turbo, new_opp-&gt;rate, new_opp-&gt;u_volt,</div><div class='del'>-		 new_opp-&gt;u_volt_min, new_opp-&gt;u_volt_max,</div><div class='del'>-		 new_opp-&gt;clock_latency_ns);</div><div class='add'>+		 __func__, new_opp-&gt;turbo, new_opp-&gt;rate,</div><div class='add'>+		 new_opp-&gt;supplies[0].u_volt, new_opp-&gt;supplies[0].u_volt_min,</div><div class='add'>+		 new_opp-&gt;supplies[0].u_volt_max, new_opp-&gt;clock_latency_ns);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Notify the changes in the availability of the operable</div><div class='ctx'> 	 * frequency/voltage list.</div><div class='ctx'> 	 */</div><div class='del'>-	srcu_notifier_call_chain(&amp;opp_table-&gt;srcu_head, OPP_EVENT_ADD, new_opp);</div><div class='add'>+	blocking_notifier_call_chain(&amp;opp_table-&gt;head, OPP_EVENT_ADD, new_opp);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> free_opp:</div><div class='del'>-	_opp_remove(opp_table, new_opp, false);</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+	_opp_free(new_opp);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -328,41 +363,35 @@ static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np)</div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='ctx'> 	int ret = 0, count = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='ctx'> 	opp_table = _managed_opp(opp_np);</div><div class='ctx'> 	if (opp_table) {</div><div class='ctx'> 		/* OPPs are already managed */</div><div class='ctx'> 		if (!_add_opp_dev(dev, opp_table))</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='del'>-		mutex_unlock(&amp;opp_table_lock);</div><div class='del'>-		return ret;</div><div class='add'>+		goto put_opp_table;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='add'>+</div><div class='add'>+	opp_table = dev_pm_opp_get_opp_table(dev);</div><div class='add'>+	if (!opp_table)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* We have opp-table node now, iterate over it and add OPPs */</div><div class='ctx'> 	for_each_available_child_of_node(opp_np, np) {</div><div class='ctx'> 		count++;</div><div class='ctx'> </div><div class='del'>-		ret = _opp_add_static_v2(dev, np);</div><div class='add'>+		ret = _opp_add_static_v2(opp_table, dev, np);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			dev_err(dev, "%s: Failed to add OPP, %d\n", __func__,</div><div class='ctx'> 				ret);</div><div class='del'>-			goto free_table;</div><div class='add'>+			_dev_pm_opp_remove_table(opp_table, dev, false);</div><div class='add'>+			goto put_opp_table;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* There should be one of more OPP defined */</div><div class='del'>-	if (WARN_ON(!count))</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='del'>-	opp_table = _find_opp_table(dev);</div><div class='del'>-	if (WARN_ON(IS_ERR(opp_table))) {</div><div class='del'>-		ret = PTR_ERR(opp_table);</div><div class='del'>-		mutex_unlock(&amp;opp_table_lock);</div><div class='del'>-		goto free_table;</div><div class='add'>+	if (WARN_ON(!count)) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto put_opp_table;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	opp_table-&gt;np = opp_np;</div><div class='hunk'>@@ -371,12 +400,8 @@ static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np)</div><div class='ctx'> 	else</div><div class='ctx'> 		opp_table-&gt;shared_opp = OPP_TABLE_ACCESS_EXCLUSIVE;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;opp_table_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-free_table:</div><div class='del'>-	dev_pm_opp_of_remove_table(dev);</div><div class='add'>+put_opp_table:</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -384,9 +409,10 @@ free_table:</div><div class='ctx'> /* Initializes OPP tables based on old-deprecated bindings */</div><div class='ctx'> static int _of_add_opp_table_v1(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct opp_table *opp_table;</div><div class='ctx'> 	const struct property *prop;</div><div class='ctx'> 	const __be32 *val;</div><div class='del'>-	int nr;</div><div class='add'>+	int nr, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	prop = of_find_property(dev-&gt;of_node, "operating-points", NULL);</div><div class='ctx'> 	if (!prop)</div><div class='hunk'>@@ -404,18 +430,27 @@ static int _of_add_opp_table_v1(struct device *dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	opp_table = dev_pm_opp_get_opp_table(dev);</div><div class='add'>+	if (!opp_table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	val = prop-&gt;value;</div><div class='ctx'> 	while (nr) {</div><div class='ctx'> 		unsigned long freq = be32_to_cpup(val++) * 1000;</div><div class='ctx'> 		unsigned long volt = be32_to_cpup(val++);</div><div class='ctx'> </div><div class='del'>-		if (_opp_add_v1(dev, freq, volt, false))</div><div class='del'>-			dev_warn(dev, "%s: Failed to add OPP %ld\n",</div><div class='del'>-				 __func__, freq);</div><div class='add'>+		ret = _opp_add_v1(opp_table, dev, freq, volt, false);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev, "%s: Failed to add OPP %ld (%d)\n",</div><div class='add'>+				__func__, freq, ret);</div><div class='add'>+			_dev_pm_opp_remove_table(opp_table, dev, false);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		nr -= 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	dev_pm_opp_put_opp_table(opp_table);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -424,12 +459,6 @@ static int _of_add_opp_table_v1(struct device *dev)</div><div class='ctx'>  *</div><div class='ctx'>  * Register the initial OPP table with the OPP library for given device.</div><div class='ctx'>  *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function indirectly uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='del'>- *</div><div class='ctx'>  * Return:</div><div class='ctx'>  * 0		On success OR</div><div class='ctx'>  *		Duplicate OPPs (both freq and volt are same) and opp-&gt;available</div><div class='hunk'>@@ -450,7 +479,7 @@ int dev_pm_opp_of_add_table(struct device *dev)</div><div class='ctx'> 	 * OPPs have two version of bindings now. The older one is deprecated,</div><div class='ctx'> 	 * try for the new binding first.</div><div class='ctx'> 	 */</div><div class='del'>-	opp_np = _of_get_opp_desc_node(dev);</div><div class='add'>+	opp_np = dev_pm_opp_of_get_opp_desc_node(dev);</div><div class='ctx'> 	if (!opp_np) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Try old-deprecated bindings for backward compatibility with</div><div class='hunk'>@@ -474,12 +503,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table);</div><div class='ctx'>  *</div><div class='ctx'>  * This removes the OPP tables for CPUs present in the @cpumask.</div><div class='ctx'>  * This should be used only to remove static entries created from DT.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='ctx'> void dev_pm_opp_of_cpumask_remove_table(const struct cpumask *cpumask)</div><div class='ctx'> {</div><div class='hunk'>@@ -492,12 +515,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_of_cpumask_remove_table);</div><div class='ctx'>  * @cpumask:	cpumask for which OPP table needs to be added.</div><div class='ctx'>  *</div><div class='ctx'>  * This adds the OPP tables for CPUs present in the @cpumask.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='ctx'> int dev_pm_opp_of_cpumask_add_table(const struct cpumask *cpumask)</div><div class='ctx'> {</div><div class='hunk'>@@ -545,12 +562,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_of_cpumask_add_table);</div><div class='ctx'>  * This updates the @cpumask with CPUs that are sharing OPPs with @cpu_dev.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns -ENOENT if operating-points-v2 isn't present for @cpu_dev.</div><div class='del'>- *</div><div class='del'>- * Locking: The internal opp_table and opp structures are RCU protected.</div><div class='del'>- * Hence this function internally uses RCU updater strategy with mutex locks</div><div class='del'>- * to keep the integrity of the internal data structures. Callers should ensure</div><div class='del'>- * that this function is *NOT* called under RCU protection or in contexts where</div><div class='del'>- * mutex cannot be locked.</div><div class='ctx'>  */</div><div class='ctx'> int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev,</div><div class='ctx'> 				   struct cpumask *cpumask)</div><div class='hunk'>@@ -560,9 +571,9 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev,</div><div class='ctx'> 	int cpu, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Get OPP descriptor node */</div><div class='del'>-	np = _of_get_opp_desc_node(cpu_dev);</div><div class='add'>+	np = dev_pm_opp_of_get_opp_desc_node(cpu_dev);</div><div class='ctx'> 	if (!np) {</div><div class='del'>-		dev_dbg(cpu_dev, "%s: Couldn't find cpu_dev node.\n", __func__);</div><div class='add'>+		dev_dbg(cpu_dev, "%s: Couldn't find opp node.\n", __func__);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -585,9 +596,9 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Get OPP descriptor node */</div><div class='del'>-		tmp_np = _of_get_opp_desc_node(tcpu_dev);</div><div class='add'>+		tmp_np = dev_pm_opp_of_get_opp_desc_node(tcpu_dev);</div><div class='ctx'> 		if (!tmp_np) {</div><div class='del'>-			dev_err(tcpu_dev, "%s: Couldn't find tcpu_dev node.\n",</div><div class='add'>+			dev_err(tcpu_dev, "%s: Couldn't find opp node.\n",</div><div class='ctx'> 				__func__);</div><div class='ctx'> 			ret = -ENOENT;</div><div class='ctx'> 			goto put_cpu_node;</div><div class='head'>diff --git a/drivers/base/power/opp/opp.h b/drivers/base/power/opp/opp.h<br/>index fabd5ca1a083..166eef990599 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/opp/opp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/opp/opp.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/opp/opp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/opp/opp.h</a></div><div class='hunk'>@@ -16,11 +16,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='ctx'> #include &lt;linux/pm_opp.h&gt;</div><div class='del'>-#include &lt;linux/rculist.h&gt;</div><div class='del'>-#include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct clk;</div><div class='ctx'> struct regulator;</div><div class='hunk'>@@ -51,24 +51,18 @@ extern struct list_head opp_tables;</div><div class='ctx'>  * @node:	opp table node. The nodes are maintained throughout the lifetime</div><div class='ctx'>  *		of boot. It is expected only an optimal set of OPPs are</div><div class='ctx'>  *		added to the library by the SoC framework.</div><div class='del'>- *		RCU usage: opp table is traversed with RCU locks. node</div><div class='del'>- *		modification is possible realtime, hence the modifications</div><div class='del'>- *		are protected by the opp_table_lock for integrity.</div><div class='ctx'>  *		IMPORTANT: the opp nodes should be maintained in increasing</div><div class='ctx'>  *		order.</div><div class='add'>+ * @kref:	for reference count of the OPP.</div><div class='ctx'>  * @available:	true/false - marks if this OPP as available or not</div><div class='ctx'>  * @dynamic:	not-created from static DT entries.</div><div class='ctx'>  * @turbo:	true if turbo (boost) OPP</div><div class='ctx'>  * @suspend:	true if suspend OPP</div><div class='ctx'>  * @rate:	Frequency in hertz</div><div class='del'>- * @u_volt:	Target voltage in microvolts corresponding to this OPP</div><div class='del'>- * @u_volt_min:	Minimum voltage in microvolts corresponding to this OPP</div><div class='del'>- * @u_volt_max:	Maximum voltage in microvolts corresponding to this OPP</div><div class='del'>- * @u_amp:	Maximum current drawn by the device in microamperes</div><div class='add'>+ * @supplies:	Power supplies voltage/current values</div><div class='ctx'>  * @clock_latency_ns: Latency (in nanoseconds) of switching to this OPP's</div><div class='ctx'>  *		frequency from any other OPP's frequency.</div><div class='ctx'>  * @opp_table:	points back to the opp_table struct this opp belongs to</div><div class='del'>- * @rcu_head:	RCU callback head used for deferred freeing</div><div class='ctx'>  * @np:		OPP's device node.</div><div class='ctx'>  * @dentry:	debugfs dentry pointer (per opp)</div><div class='ctx'>  *</div><div class='hunk'>@@ -76,6 +70,7 @@ extern struct list_head opp_tables;</div><div class='ctx'>  */</div><div class='ctx'> struct dev_pm_opp {</div><div class='ctx'> 	struct list_head node;</div><div class='add'>+	struct kref kref;</div><div class='ctx'> </div><div class='ctx'> 	bool available;</div><div class='ctx'> 	bool dynamic;</div><div class='hunk'>@@ -83,14 +78,11 @@ struct dev_pm_opp {</div><div class='ctx'> 	bool suspend;</div><div class='ctx'> 	unsigned long rate;</div><div class='ctx'> </div><div class='del'>-	unsigned long u_volt;</div><div class='del'>-	unsigned long u_volt_min;</div><div class='del'>-	unsigned long u_volt_max;</div><div class='del'>-	unsigned long u_amp;</div><div class='add'>+	struct dev_pm_opp_supply *supplies;</div><div class='add'>+</div><div class='ctx'> 	unsigned long clock_latency_ns;</div><div class='ctx'> </div><div class='ctx'> 	struct opp_table *opp_table;</div><div class='del'>-	struct rcu_head rcu_head;</div><div class='ctx'> </div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> </div><div class='hunk'>@@ -103,7 +95,6 @@ struct dev_pm_opp {</div><div class='ctx'>  * struct opp_device - devices managed by 'struct opp_table'</div><div class='ctx'>  * @node:	list node</div><div class='ctx'>  * @dev:	device to which the struct object belongs</div><div class='del'>- * @rcu_head:	RCU callback head used for deferred freeing</div><div class='ctx'>  * @dentry:	debugfs dentry pointer (per device)</div><div class='ctx'>  *</div><div class='ctx'>  * This is an internal data structure maintaining the devices that are managed</div><div class='hunk'>@@ -112,7 +103,6 @@ struct dev_pm_opp {</div><div class='ctx'> struct opp_device {</div><div class='ctx'> 	struct list_head node;</div><div class='ctx'> 	const struct device *dev;</div><div class='del'>-	struct rcu_head rcu_head;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	struct dentry *dentry;</div><div class='hunk'>@@ -130,12 +120,11 @@ enum opp_table_access {</div><div class='ctx'>  * @node:	table node - contains the devices with OPPs that</div><div class='ctx'>  *		have been registered. Nodes once added are not modified in this</div><div class='ctx'>  *		table.</div><div class='del'>- *		RCU usage: nodes are not modified in the table of opp_table,</div><div class='del'>- *		however addition is possible and is secured by opp_table_lock</div><div class='del'>- * @srcu_head:	notifier head to notify the OPP availability changes.</div><div class='del'>- * @rcu_head:	RCU callback head used for deferred freeing</div><div class='add'>+ * @head:	notifier head to notify the OPP availability changes.</div><div class='ctx'>  * @dev_list:	list of devices that share these OPPs</div><div class='ctx'>  * @opp_list:	table of opps</div><div class='add'>+ * @kref:	for reference count of the table.</div><div class='add'>+ * @lock:	mutex protecting the opp_list.</div><div class='ctx'>  * @np:		struct device_node pointer for opp's DT node.</div><div class='ctx'>  * @clock_latency_ns_max: Max clock latency in nanoseconds.</div><div class='ctx'>  * @shared_opp: OPP is shared between multiple devices.</div><div class='hunk'>@@ -144,7 +133,10 @@ enum opp_table_access {</div><div class='ctx'>  * @supported_hw_count: Number of elements in supported_hw array.</div><div class='ctx'>  * @prop_name: A name to postfix to many DT properties, while parsing them.</div><div class='ctx'>  * @clk: Device's clock handle</div><div class='del'>- * @regulator: Supply regulator</div><div class='add'>+ * @regulators: Supply regulators</div><div class='add'>+ * @regulator_count: Number of power supply regulators</div><div class='add'>+ * @set_opp: Platform specific set_opp callback</div><div class='add'>+ * @set_opp_data: Data to be passed to set_opp callback</div><div class='ctx'>  * @dentry:	debugfs dentry pointer of the real device directory (not links).</div><div class='ctx'>  * @dentry_name: Name of the real dentry.</div><div class='ctx'>  *</div><div class='hunk'>@@ -153,18 +145,15 @@ enum opp_table_access {</div><div class='ctx'>  * This is an internal data structure maintaining the link to opps attached to</div><div class='ctx'>  * a device. This structure is not meant to be shared to users as it is</div><div class='ctx'>  * meant for book keeping and private to OPP library.</div><div class='del'>- *</div><div class='del'>- * Because the opp structures can be used from both rcu and srcu readers, we</div><div class='del'>- * need to wait for the grace period of both of them before freeing any</div><div class='del'>- * resources. And so we have used kfree_rcu() from within call_srcu() handlers.</div><div class='ctx'>  */</div><div class='ctx'> struct opp_table {</div><div class='ctx'> 	struct list_head node;</div><div class='ctx'> </div><div class='del'>-	struct srcu_notifier_head srcu_head;</div><div class='del'>-	struct rcu_head rcu_head;</div><div class='add'>+	struct blocking_notifier_head head;</div><div class='ctx'> 	struct list_head dev_list;</div><div class='ctx'> 	struct list_head opp_list;</div><div class='add'>+	struct kref kref;</div><div class='add'>+	struct mutex lock;</div><div class='ctx'> </div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> 	unsigned long clock_latency_ns_max;</div><div class='hunk'>@@ -179,7 +168,11 @@ struct opp_table {</div><div class='ctx'> 	unsigned int supported_hw_count;</div><div class='ctx'> 	const char *prop_name;</div><div class='ctx'> 	struct clk *clk;</div><div class='del'>-	struct regulator *regulator;</div><div class='add'>+	struct regulator **regulators;</div><div class='add'>+	unsigned int regulator_count;</div><div class='add'>+</div><div class='add'>+	int (*set_opp)(struct dev_pm_set_opp_data *data);</div><div class='add'>+	struct dev_pm_set_opp_data *set_opp_data;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	struct dentry *dentry;</div><div class='hunk'>@@ -188,15 +181,17 @@ struct opp_table {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Routines internal to opp core */</div><div class='add'>+void _get_opp_table_kref(struct opp_table *opp_table);</div><div class='ctx'> struct opp_table *_find_opp_table(struct device *dev);</div><div class='ctx'> struct opp_device *_add_opp_dev(const struct device *dev, struct opp_table *opp_table);</div><div class='del'>-struct device_node *_of_get_opp_desc_node(struct device *dev);</div><div class='del'>-void _dev_pm_opp_remove_table(struct device *dev, bool remove_all);</div><div class='del'>-struct dev_pm_opp *_allocate_opp(struct device *dev, struct opp_table **opp_table);</div><div class='add'>+void _dev_pm_opp_remove_table(struct opp_table *opp_table, struct device *dev, bool remove_all);</div><div class='add'>+void _dev_pm_opp_find_and_remove_table(struct device *dev, bool remove_all);</div><div class='add'>+struct dev_pm_opp *_opp_allocate(struct opp_table *opp_table);</div><div class='add'>+void _opp_free(struct dev_pm_opp *opp);</div><div class='ctx'> int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, struct opp_table *opp_table);</div><div class='del'>-void _opp_remove(struct opp_table *opp_table, struct dev_pm_opp *opp, bool notify);</div><div class='del'>-int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt, bool dynamic);</div><div class='add'>+int _opp_add_v1(struct opp_table *opp_table, struct device *dev, unsigned long freq, long u_volt, bool dynamic);</div><div class='ctx'> void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, bool of);</div><div class='add'>+struct opp_table *_add_opp_table(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OF</div><div class='ctx'> void _of_init_opp_table(struct opp_table *opp_table, struct device *dev);</div><div class='head'>diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h<br/>index 50e30e7b059d..a46e97e515c5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/power.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/power.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/power.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/power.h</a></div><div class='hunk'>@@ -21,14 +21,22 @@ extern void pm_runtime_init(struct device *dev);</div><div class='ctx'> extern void pm_runtime_reinit(struct device *dev);</div><div class='ctx'> extern void pm_runtime_remove(struct device *dev);</div><div class='ctx'> </div><div class='add'>+#define WAKE_IRQ_DEDICATED_ALLOCATED	BIT(0)</div><div class='add'>+#define WAKE_IRQ_DEDICATED_MANAGED	BIT(1)</div><div class='add'>+#define WAKE_IRQ_DEDICATED_MASK		(WAKE_IRQ_DEDICATED_ALLOCATED | \</div><div class='add'>+					 WAKE_IRQ_DEDICATED_MANAGED)</div><div class='add'>+</div><div class='ctx'> struct wake_irq {</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	unsigned int status;</div><div class='ctx'> 	int irq;</div><div class='del'>-	bool dedicated_irq:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern void dev_pm_arm_wake_irq(struct wake_irq *wirq);</div><div class='ctx'> extern void dev_pm_disarm_wake_irq(struct wake_irq *wirq);</div><div class='add'>+extern void dev_pm_enable_wake_irq_check(struct device *dev,</div><div class='add'>+					 bool can_change_status);</div><div class='add'>+extern void dev_pm_disable_wake_irq_check(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> </div><div class='hunk'>@@ -104,6 +112,15 @@ static inline void dev_pm_disarm_wake_irq(struct wake_irq *wirq)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void dev_pm_enable_wake_irq_check(struct device *dev,</div><div class='add'>+						bool can_change_status)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dev_pm_disable_wake_irq_check(struct device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='hunk'>@@ -127,6 +144,11 @@ extern void device_pm_move_after(struct device *, struct device *);</div><div class='ctx'> extern void device_pm_move_last(struct device *);</div><div class='ctx'> extern void device_pm_check_callbacks(struct device *dev);</div><div class='ctx'> </div><div class='add'>+static inline bool device_pm_initialized(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;power.in_dpm_list;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else /* !CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> static inline void device_pm_sleep_init(struct device *dev) {}</div><div class='hunk'>@@ -146,6 +168,11 @@ static inline void device_pm_move_last(struct device *dev) {}</div><div class='ctx'> </div><div class='ctx'> static inline void device_pm_check_callbacks(struct device *dev) {}</div><div class='ctx'> </div><div class='add'>+static inline bool device_pm_initialized(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return device_is_registered(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* !CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> static inline void device_pm_init(struct device *dev)</div><div class='head'>diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c<br/>index 7f3646e459cb..f850daeffba4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/qos.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/qos.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/qos.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/qos.c</a></div><div class='hunk'>@@ -17,12 +17,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  * This QoS design is best effort based. Dependents register their QoS needs.</div><div class='ctx'>  * Watchers register to keep track of the current QoS needs of the system.</div><div class='del'>- * Watchers can register different types of notification callbacks:</div><div class='del'>- *  . a per-device notification callback using the dev_pm_qos_*_notifier API.</div><div class='del'>- *    The notification chain data is stored in the per-device constraint</div><div class='del'>- *    data struct.</div><div class='del'>- *  . a system-wide notification callback using the dev_pm_qos_*_global_notifier</div><div class='del'>- *    API. The notification chain data is stored in a static variable.</div><div class='add'>+ * Watchers can register a per-device notification callback using the</div><div class='add'>+ * dev_pm_qos_*_notifier API. The notification chain data is stored in the</div><div class='add'>+ * per-device constraint data struct.</div><div class='ctx'>  *</div><div class='ctx'>  * Note about the per-device constraint data struct allocation:</div><div class='ctx'>  * . The per-device constraints data struct ptr is tored into the device</div><div class='hunk'>@@ -49,8 +46,6 @@</div><div class='ctx'> static DEFINE_MUTEX(dev_pm_qos_mtx);</div><div class='ctx'> static DEFINE_MUTEX(dev_pm_qos_sysfs_mtx);</div><div class='ctx'> </div><div class='del'>-static BLOCKING_NOTIFIER_HEAD(dev_pm_notifiers);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * __dev_pm_qos_flags - Check PM QoS flags for a given device.</div><div class='ctx'>  * @dev: Device to check the PM QoS flags for.</div><div class='hunk'>@@ -108,8 +103,7 @@ s32 __dev_pm_qos_read_value(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;dev-&gt;power.lock);</div><div class='ctx'> </div><div class='del'>-	return IS_ERR_OR_NULL(dev-&gt;power.qos) ?</div><div class='del'>-		0 : pm_qos_read_value(&amp;dev-&gt;power.qos-&gt;resume_latency);</div><div class='add'>+	return dev_pm_qos_raw_read_value(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -135,8 +129,7 @@ s32 dev_pm_qos_read_value(struct device *dev)</div><div class='ctx'>  * @value: Value to assign to the QoS request.</div><div class='ctx'>  *</div><div class='ctx'>  * Internal function to update the constraints list using the PM QoS core</div><div class='del'>- * code and if needed call the per-device and the global notification</div><div class='del'>- * callbacks</div><div class='add'>+ * code and if needed call the per-device callbacks.</div><div class='ctx'>  */</div><div class='ctx'> static int apply_constraint(struct dev_pm_qos_request *req,</div><div class='ctx'> 			    enum pm_qos_req_action action, s32 value)</div><div class='hunk'>@@ -148,12 +141,6 @@ static int apply_constraint(struct dev_pm_qos_request *req,</div><div class='ctx'> 	case DEV_PM_QOS_RESUME_LATENCY:</div><div class='ctx'> 		ret = pm_qos_update_target(&amp;qos-&gt;resume_latency,</div><div class='ctx'> 					   &amp;req-&gt;data.pnode, action, value);</div><div class='del'>-		if (ret) {</div><div class='del'>-			value = pm_qos_read_value(&amp;qos-&gt;resume_latency);</div><div class='del'>-			blocking_notifier_call_chain(&amp;dev_pm_notifiers,</div><div class='del'>-						     (unsigned long)value,</div><div class='del'>-						     req);</div><div class='del'>-		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DEV_PM_QOS_LATENCY_TOLERANCE:</div><div class='ctx'> 		ret = pm_qos_update_target(&amp;qos-&gt;latency_tolerance,</div><div class='hunk'>@@ -281,7 +268,7 @@ void dev_pm_qos_constraints_destroy(struct device *dev)</div><div class='ctx'> 	dev-&gt;power.qos = ERR_PTR(-ENODEV);</div><div class='ctx'> 	spin_unlock_irq(&amp;dev-&gt;power.lock);</div><div class='ctx'> </div><div class='del'>-	kfree(c-&gt;notifiers);</div><div class='add'>+	kfree(qos-&gt;resume_latency.notifiers);</div><div class='ctx'> 	kfree(qos);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='hunk'>@@ -536,36 +523,6 @@ int dev_pm_qos_remove_notifier(struct device *dev,</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_qos_remove_notifier);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dev_pm_qos_add_global_notifier - sets notification entry for changes to</div><div class='del'>- * target value of the PM QoS constraints for any device</div><div class='del'>- *</div><div class='del'>- * @notifier: notifier block managed by caller.</div><div class='del'>- *</div><div class='del'>- * Will register the notifier into a notification chain that gets called</div><div class='del'>- * upon changes to the target value for any device.</div><div class='del'>- */</div><div class='del'>-int dev_pm_qos_add_global_notifier(struct notifier_block *notifier)</div><div class='del'>-{</div><div class='del'>-	return blocking_notifier_chain_register(&amp;dev_pm_notifiers, notifier);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dev_pm_qos_add_global_notifier);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * dev_pm_qos_remove_global_notifier - deletes notification for changes to</div><div class='del'>- * target value of PM QoS constraints for any device</div><div class='del'>- *</div><div class='del'>- * @notifier: notifier block to be removed.</div><div class='del'>- *</div><div class='del'>- * Will remove the notifier from the notification chain that gets called</div><div class='del'>- * upon changes to the target value for any device.</div><div class='del'>- */</div><div class='del'>-int dev_pm_qos_remove_global_notifier(struct notifier_block *notifier)</div><div class='del'>-{</div><div class='del'>-	return blocking_notifier_chain_unregister(&amp;dev_pm_notifiers, notifier);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dev_pm_qos_remove_global_notifier);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * dev_pm_qos_add_ancestor_request - Add PM QoS request for device's ancestor.</div><div class='ctx'>  * @dev: Device whose ancestor to add the request for.</div><div class='ctx'>  * @req: Pointer to the preallocated handle.</div><div class='hunk'>@@ -856,7 +813,10 @@ int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val)</div><div class='ctx'> 		struct dev_pm_qos_request *req;</div><div class='ctx'> </div><div class='ctx'> 		if (val &lt; 0) {</div><div class='del'>-			ret = -EINVAL;</div><div class='add'>+			if (val == PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT)</div><div class='add'>+				ret = 0;</div><div class='add'>+			else</div><div class='add'>+				ret = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		req = kzalloc(sizeof(*req), GFP_KERNEL);</div><div class='hunk'>@@ -883,6 +843,7 @@ int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val)</div><div class='ctx'> 	mutex_unlock(&amp;dev_pm_qos_mtx);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_qos_update_user_latency_tolerance);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dev_pm_qos_expose_latency_tolerance - Expose latency tolerance to userspace</div><div class='head'>diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c<br/>index 82a081ea4317..7bcf80fa9ada 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/runtime.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/runtime.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/runtime.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/runtime.c</a></div><div class='hunk'>@@ -7,11 +7,13 @@</div><div class='ctx'>  * This file is released under the GPLv2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/pm_wakeirq.h&gt;</div><div class='ctx'> #include &lt;trace/events/rpm.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../base.h"</div><div class='ctx'> #include "power.h"</div><div class='ctx'> </div><div class='ctx'> typedef int (*pm_callback_t)(struct device *);</div><div class='hunk'>@@ -241,7 +243,8 @@ static int rpm_check_suspend_allowed(struct device *dev)</div><div class='ctx'> 		retval = -EACCES;</div><div class='ctx'> 	else if (atomic_read(&amp;dev-&gt;power.usage_count) &gt; 0)</div><div class='ctx'> 		retval = -EAGAIN;</div><div class='del'>-	else if (!pm_children_suspended(dev))</div><div class='add'>+	else if (!dev-&gt;power.ignore_children &amp;&amp;</div><div class='add'>+			atomic_read(&amp;dev-&gt;power.child_count))</div><div class='ctx'> 		retval = -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	/* Pending resume requests take precedence over suspends. */</div><div class='hunk'>@@ -258,6 +261,42 @@ static int rpm_check_suspend_allowed(struct device *dev)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rpm_get_suppliers(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(link, &amp;dev-&gt;links.suppliers, c_node) {</div><div class='add'>+		int retval;</div><div class='add'>+</div><div class='add'>+		if (!(link-&gt;flags &amp; DL_FLAG_PM_RUNTIME))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(link-&gt;status) == DL_STATE_SUPPLIER_UNBIND ||</div><div class='add'>+		    link-&gt;rpm_active)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		retval = pm_runtime_get_sync(link-&gt;supplier);</div><div class='add'>+		if (retval &lt; 0) {</div><div class='add'>+			pm_runtime_put_noidle(link-&gt;supplier);</div><div class='add'>+			return retval;</div><div class='add'>+		}</div><div class='add'>+		link-&gt;rpm_active = true;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rpm_put_suppliers(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(link, &amp;dev-&gt;links.suppliers, c_node)</div><div class='add'>+		if (link-&gt;rpm_active &amp;&amp;</div><div class='add'>+		    READ_ONCE(link-&gt;status) != DL_STATE_SUPPLIER_UNBIND) {</div><div class='add'>+			pm_runtime_put(link-&gt;supplier);</div><div class='add'>+			link-&gt;rpm_active = false;</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * __rpm_callback - Run a given runtime PM callback for a given device.</div><div class='ctx'>  * @cb: Runtime PM callback to run.</div><div class='hunk'>@@ -266,19 +305,57 @@ static int rpm_check_suspend_allowed(struct device *dev)</div><div class='ctx'> static int __rpm_callback(int (*cb)(struct device *), struct device *dev)</div><div class='ctx'> 	__releases(&amp;dev-&gt;power.lock) __acquires(&amp;dev-&gt;power.lock)</div><div class='ctx'> {</div><div class='del'>-	int retval;</div><div class='add'>+	int retval, idx;</div><div class='add'>+	bool use_links = dev-&gt;power.links_count &gt; 0;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;power.irq_safe)</div><div class='add'>+	if (dev-&gt;power.irq_safe) {</div><div class='ctx'> 		spin_unlock(&amp;dev-&gt;power.lock);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		spin_unlock_irq(&amp;dev-&gt;power.lock);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Resume suppliers if necessary.</div><div class='add'>+		 *</div><div class='add'>+		 * The device's runtime PM status cannot change until this</div><div class='add'>+		 * routine returns, so it is safe to read the status outside of</div><div class='add'>+		 * the lock.</div><div class='add'>+		 */</div><div class='add'>+		if (use_links &amp;&amp; dev-&gt;power.runtime_status == RPM_RESUMING) {</div><div class='add'>+			idx = device_links_read_lock();</div><div class='add'>+</div><div class='add'>+			retval = rpm_get_suppliers(dev);</div><div class='add'>+			if (retval)</div><div class='add'>+				goto fail;</div><div class='add'>+</div><div class='add'>+			device_links_read_unlock(idx);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	retval = cb(dev);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;power.irq_safe)</div><div class='add'>+	if (dev-&gt;power.irq_safe) {</div><div class='ctx'> 		spin_lock(&amp;dev-&gt;power.lock);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * If the device is suspending and the callback has returned</div><div class='add'>+		 * success, drop the usage counters of the suppliers that have</div><div class='add'>+		 * been reference counted on its resume.</div><div class='add'>+		 *</div><div class='add'>+		 * Do that if resume fails too.</div><div class='add'>+		 */</div><div class='add'>+		if (use_links</div><div class='add'>+		    &amp;&amp; ((dev-&gt;power.runtime_status == RPM_SUSPENDING &amp;&amp; !retval)</div><div class='add'>+		    || (dev-&gt;power.runtime_status == RPM_RESUMING &amp;&amp; retval))) {</div><div class='add'>+			idx = device_links_read_lock();</div><div class='add'>+</div><div class='add'>+ fail:</div><div class='add'>+			rpm_put_suppliers(dev);</div><div class='add'>+</div><div class='add'>+			device_links_read_unlock(idx);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		spin_lock_irq(&amp;dev-&gt;power.lock);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -515,7 +592,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)</div><div class='ctx'> </div><div class='ctx'> 	callback = RPM_GET_CALLBACK(dev, runtime_suspend);</div><div class='ctx'> </div><div class='del'>-	dev_pm_enable_wake_irq(dev);</div><div class='add'>+	dev_pm_enable_wake_irq_check(dev, true);</div><div class='ctx'> 	retval = rpm_callback(callback, dev);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -554,7 +631,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)</div><div class='ctx'> 	return retval;</div><div class='ctx'> </div><div class='ctx'>  fail:</div><div class='del'>-	dev_pm_disable_wake_irq(dev);</div><div class='add'>+	dev_pm_disable_wake_irq_check(dev);</div><div class='ctx'> 	__update_runtime_status(dev, RPM_ACTIVE);</div><div class='ctx'> 	dev-&gt;power.deferred_resume = false;</div><div class='ctx'> 	wake_up_all(&amp;dev-&gt;power.wait_queue);</div><div class='hunk'>@@ -712,8 +789,8 @@ static int rpm_resume(struct device *dev, int rpmflags)</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;parent-&gt;power.lock);</div><div class='ctx'> 		/*</div><div class='del'>-		 * We can resume if the parent's runtime PM is disabled or it</div><div class='del'>-		 * is set to ignore children.</div><div class='add'>+		 * Resume the parent if it has runtime PM enabled and not been</div><div class='add'>+		 * set to ignore its children.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!parent-&gt;power.disable_depth</div><div class='ctx'> 		    &amp;&amp; !parent-&gt;power.ignore_children) {</div><div class='hunk'>@@ -737,12 +814,12 @@ static int rpm_resume(struct device *dev, int rpmflags)</div><div class='ctx'> </div><div class='ctx'> 	callback = RPM_GET_CALLBACK(dev, runtime_resume);</div><div class='ctx'> </div><div class='del'>-	dev_pm_disable_wake_irq(dev);</div><div class='add'>+	dev_pm_disable_wake_irq_check(dev);</div><div class='ctx'> 	retval = rpm_callback(callback, dev);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		__update_runtime_status(dev, RPM_SUSPENDED);</div><div class='ctx'> 		pm_runtime_cancel_pending(dev);</div><div class='del'>-		dev_pm_enable_wake_irq(dev);</div><div class='add'>+		dev_pm_enable_wake_irq_check(dev, false);</div><div class='ctx'> 	} else {</div><div class='ctx'>  no_callback:</div><div class='ctx'> 		__update_runtime_status(dev, RPM_ACTIVE);</div><div class='hunk'>@@ -889,13 +966,13 @@ int __pm_runtime_idle(struct device *dev, int rpmflags)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	might_sleep_if(!(rpmflags &amp; RPM_ASYNC) &amp;&amp; !dev-&gt;power.irq_safe);</div><div class='del'>-</div><div class='ctx'> 	if (rpmflags &amp; RPM_GET_PUT) {</div><div class='ctx'> 		if (!atomic_dec_and_test(&amp;dev-&gt;power.usage_count))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	might_sleep_if(!(rpmflags &amp; RPM_ASYNC) &amp;&amp; !dev-&gt;power.irq_safe);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;dev-&gt;power.lock, flags);</div><div class='ctx'> 	retval = rpm_idle(dev, rpmflags);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;power.lock, flags);</div><div class='hunk'>@@ -921,13 +998,13 @@ int __pm_runtime_suspend(struct device *dev, int rpmflags)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	might_sleep_if(!(rpmflags &amp; RPM_ASYNC) &amp;&amp; !dev-&gt;power.irq_safe);</div><div class='del'>-</div><div class='ctx'> 	if (rpmflags &amp; RPM_GET_PUT) {</div><div class='ctx'> 		if (!atomic_dec_and_test(&amp;dev-&gt;power.usage_count))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	might_sleep_if(!(rpmflags &amp; RPM_ASYNC) &amp;&amp; !dev-&gt;power.irq_safe);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;dev-&gt;power.lock, flags);</div><div class='ctx'> 	retval = rpm_suspend(dev, rpmflags);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;power.lock, flags);</div><div class='hunk'>@@ -952,7 +1029,8 @@ int __pm_runtime_resume(struct device *dev, int rpmflags)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	might_sleep_if(!(rpmflags &amp; RPM_ASYNC) &amp;&amp; !dev-&gt;power.irq_safe);</div><div class='add'>+	might_sleep_if(!(rpmflags &amp; RPM_ASYNC) &amp;&amp; !dev-&gt;power.irq_safe &amp;&amp;</div><div class='add'>+			dev-&gt;power.runtime_status != RPM_ACTIVE);</div><div class='ctx'> </div><div class='ctx'> 	if (rpmflags &amp; RPM_GET_PUT)</div><div class='ctx'> 		atomic_inc(&amp;dev-&gt;power.usage_count);</div><div class='hunk'>@@ -1027,7 +1105,17 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status)</div><div class='ctx'> 		goto out_set;</div><div class='ctx'> </div><div class='ctx'> 	if (status == RPM_SUSPENDED) {</div><div class='del'>-		/* It always is possible to set the status to 'suspended'. */</div><div class='add'>+		/*</div><div class='add'>+		 * It is invalid to suspend a device with an active child,</div><div class='add'>+		 * unless it has been set to ignore its children.</div><div class='add'>+		 */</div><div class='add'>+		if (!dev-&gt;power.ignore_children &amp;&amp;</div><div class='add'>+			atomic_read(&amp;dev-&gt;power.child_count)) {</div><div class='add'>+			dev_err(dev, "runtime PM trying to suspend device but active child\n");</div><div class='add'>+			error = -EBUSY;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (parent) {</div><div class='ctx'> 			atomic_add_unless(&amp;parent-&gt;power.child_count, -1, 0);</div><div class='ctx'> 			notify_parent = !parent-&gt;power.ignore_children;</div><div class='hunk'>@@ -1447,6 +1535,94 @@ void pm_runtime_remove(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * pm_runtime_clean_up_links - Prepare links to consumers for driver removal.</div><div class='add'>+ * @dev: Device whose driver is going to be removed.</div><div class='add'>+ *</div><div class='add'>+ * Check links from this device to any consumers and if any of them have active</div><div class='add'>+ * runtime PM references to the device, drop the usage counter of the device</div><div class='add'>+ * (once per link).</div><div class='add'>+ *</div><div class='add'>+ * Links with the DL_FLAG_STATELESS flag set are ignored.</div><div class='add'>+ *</div><div class='add'>+ * Since the device is guaranteed to be runtime-active at the point this is</div><div class='add'>+ * called, nothing else needs to be done here.</div><div class='add'>+ *</div><div class='add'>+ * Moreover, this is called after device_links_busy() has returned 'false', so</div><div class='add'>+ * the status of each link is guaranteed to be DL_STATE_SUPPLIER_UNBIND and</div><div class='add'>+ * therefore rpm_active can't be manipulated concurrently.</div><div class='add'>+ */</div><div class='add'>+void pm_runtime_clean_up_links(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = device_links_read_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(link, &amp;dev-&gt;links.consumers, s_node) {</div><div class='add'>+		if (link-&gt;flags &amp; DL_FLAG_STATELESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (link-&gt;rpm_active) {</div><div class='add'>+			pm_runtime_put_noidle(dev);</div><div class='add'>+			link-&gt;rpm_active = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_links_read_unlock(idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_runtime_get_suppliers - Resume and reference-count supplier devices.</div><div class='add'>+ * @dev: Consumer device.</div><div class='add'>+ */</div><div class='add'>+void pm_runtime_get_suppliers(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = device_links_read_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(link, &amp;dev-&gt;links.suppliers, c_node)</div><div class='add'>+		if (link-&gt;flags &amp; DL_FLAG_PM_RUNTIME)</div><div class='add'>+			pm_runtime_get_sync(link-&gt;supplier);</div><div class='add'>+</div><div class='add'>+	device_links_read_unlock(idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_runtime_put_suppliers - Drop references to supplier devices.</div><div class='add'>+ * @dev: Consumer device.</div><div class='add'>+ */</div><div class='add'>+void pm_runtime_put_suppliers(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_link *link;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = device_links_read_lock();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(link, &amp;dev-&gt;links.suppliers, c_node)</div><div class='add'>+		if (link-&gt;flags &amp; DL_FLAG_PM_RUNTIME)</div><div class='add'>+			pm_runtime_put(link-&gt;supplier);</div><div class='add'>+</div><div class='add'>+	device_links_read_unlock(idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pm_runtime_new_link(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	spin_lock_irq(&amp;dev-&gt;power.lock);</div><div class='add'>+	dev-&gt;power.links_count++;</div><div class='add'>+	spin_unlock_irq(&amp;dev-&gt;power.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pm_runtime_drop_link(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	spin_lock_irq(&amp;dev-&gt;power.lock);</div><div class='add'>+	WARN_ON(dev-&gt;power.links_count == 0);</div><div class='add'>+	dev-&gt;power.links_count--;</div><div class='add'>+	spin_unlock_irq(&amp;dev-&gt;power.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * pm_runtime_force_suspend - Force a device into suspend state if needed.</div><div class='ctx'>  * @dev: Device to suspend.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1478,6 +1654,16 @@ int pm_runtime_force_suspend(struct device *dev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Increase the runtime PM usage count for the device's parent, in case</div><div class='add'>+	 * when we find the device being used when system suspend was invoked.</div><div class='add'>+	 * This informs pm_runtime_force_resume() to resume the parent</div><div class='add'>+	 * immediately, which is needed to be able to resume its children,</div><div class='add'>+	 * when not deferring the resume to be managed via runtime PM.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;parent &amp;&amp; atomic_read(&amp;dev-&gt;power.usage_count) &gt; 1)</div><div class='add'>+		pm_runtime_get_noresume(dev-&gt;parent);</div><div class='add'>+</div><div class='ctx'> 	pm_runtime_set_suspended(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='hunk'>@@ -1487,16 +1673,20 @@ err:</div><div class='ctx'> EXPORT_SYMBOL_GPL(pm_runtime_force_suspend);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pm_runtime_force_resume - Force a device into resume state.</div><div class='add'>+ * pm_runtime_force_resume - Force a device into resume state if needed.</div><div class='ctx'>  * @dev: Device to resume.</div><div class='ctx'>  *</div><div class='ctx'>  * Prior invoking this function we expect the user to have brought the device</div><div class='ctx'>  * into low power state by a call to pm_runtime_force_suspend(). Here we reverse</div><div class='del'>- * those actions and brings the device into full power. We update the runtime PM</div><div class='del'>- * status and re-enables runtime PM.</div><div class='add'>+ * those actions and brings the device into full power, if it is expected to be</div><div class='add'>+ * used on system resume. To distinguish that, we check whether the runtime PM</div><div class='add'>+ * usage count is greater than 1 (the PM core increases the usage count in the</div><div class='add'>+ * system PM prepare phase), as that indicates a real user (such as a subsystem,</div><div class='add'>+ * driver, userspace, etc.) is using it. If that is the case, the device is</div><div class='add'>+ * expected to be used on system resume as well, so then we resume it. In the</div><div class='add'>+ * other case, we defer the resume to be managed via runtime PM.</div><div class='ctx'>  *</div><div class='del'>- * Typically this function may be invoked from a system resume callback to make</div><div class='del'>- * sure the device is put into full power state.</div><div class='add'>+ * Typically this function may be invoked from a system resume callback.</div><div class='ctx'>  */</div><div class='ctx'> int pm_runtime_force_resume(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1513,6 +1703,17 @@ int pm_runtime_force_resume(struct device *dev)</div><div class='ctx'> 	if (!pm_runtime_status_suspended(dev))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Decrease the parent's runtime PM usage count, if we increased it</div><div class='add'>+	 * during system suspend in pm_runtime_force_suspend().</div><div class='add'>+	*/</div><div class='add'>+	if (atomic_read(&amp;dev-&gt;power.usage_count) &gt; 1) {</div><div class='add'>+		if (dev-&gt;parent)</div><div class='add'>+			pm_runtime_put_noidle(dev-&gt;parent);</div><div class='add'>+	} else {</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = pm_runtime_set_active(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c<br/>index a7b46798c81d..33b4b902741a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/sysfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/sysfs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/sysfs.c</a></div><div class='hunk'>@@ -263,7 +263,11 @@ static ssize_t pm_qos_latency_tolerance_store(struct device *dev,</div><div class='ctx'> 	s32 value;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (kstrtos32(buf, 0, &amp;value)) {</div><div class='add'>+	if (kstrtos32(buf, 0, &amp;value) == 0) {</div><div class='add'>+		/* Users can't write negative values directly */</div><div class='add'>+		if (value &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='ctx'> 		if (!strcmp(buf, "auto") || !strcmp(buf, "auto\n"))</div><div class='ctx'> 			value = PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT;</div><div class='ctx'> 		else if (!strcmp(buf, "any") || !strcmp(buf, "any\n"))</div><div class='head'>diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c<br/>index efec10b49d59..1cda505d6a85 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/trace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/trace.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/trace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/trace.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/pm-trace.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/suspend.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mc146818rtc.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -74,6 +75,9 @@</div><div class='ctx'> </div><div class='ctx'> #define DEVSEED (7919)</div><div class='ctx'> </div><div class='add'>+bool pm_trace_rtc_abused __read_mostly;</div><div class='add'>+EXPORT_SYMBOL_GPL(pm_trace_rtc_abused);</div><div class='add'>+</div><div class='ctx'> static unsigned int dev_hash_value;</div><div class='ctx'> </div><div class='ctx'> static int set_magic_time(unsigned int user, unsigned int file, unsigned int device)</div><div class='hunk'>@@ -104,6 +108,7 @@ static int set_magic_time(unsigned int user, unsigned int file, unsigned int dev</div><div class='ctx'> 	time.tm_min = (n % 20) * 3;</div><div class='ctx'> 	n /= 20;</div><div class='ctx'> 	mc146818_set_time(&amp;time);</div><div class='add'>+	pm_trace_rtc_abused = true;</div><div class='ctx'> 	return n ? -1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -239,9 +244,31 @@ int show_trace_dev_match(char *buf, size_t size)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+pm_trace_notify(struct notifier_block *nb, unsigned long mode, void *_unused)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case PM_POST_HIBERNATION:</div><div class='add'>+	case PM_POST_SUSPEND:</div><div class='add'>+		if (pm_trace_rtc_abused) {</div><div class='add'>+			pm_trace_rtc_abused = false;</div><div class='add'>+			pr_warn("Possible incorrect RTC due to pm_trace, please use 'ntpdate' or 'rdate' to reset it.\n");</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block pm_trace_nb = {</div><div class='add'>+	.notifier_call = pm_trace_notify,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int early_resume_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	hash_value_early_read = read_magic_time();</div><div class='add'>+	register_pm_notifier(&amp;pm_trace_nb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c<br/>index 0d77cd6fd8d1..ae0429827f31 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/wakeirq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/wakeirq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/wakeirq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/wakeirq.c</a></div><div class='hunk'>@@ -110,8 +110,10 @@ void dev_pm_clear_wake_irq(struct device *dev)</div><div class='ctx'> 	dev-&gt;power.wakeirq = NULL;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;power.lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (wirq-&gt;dedicated_irq)</div><div class='add'>+	if (wirq-&gt;status &amp; WAKE_IRQ_DEDICATED_ALLOCATED) {</div><div class='ctx'> 		free_irq(wirq-&gt;irq, wirq);</div><div class='add'>+		wirq-&gt;status &amp;= ~WAKE_IRQ_DEDICATED_MASK;</div><div class='add'>+	}</div><div class='ctx'> 	kfree(wirq);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_clear_wake_irq);</div><div class='hunk'>@@ -139,6 +141,13 @@ static irqreturn_t handle_threaded_wake_irq(int irq, void *_wirq)</div><div class='ctx'> 	struct wake_irq *wirq = _wirq;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='add'>+	/* Maybe abort suspend? */</div><div class='add'>+	if (irqd_is_wakeup_set(irq_get_irq_data(irq))) {</div><div class='add'>+		pm_wakeup_event(wirq-&gt;dev, 0);</div><div class='add'>+</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* We don't want RPM_ASYNC or RPM_NOWAIT here */</div><div class='ctx'> 	res = pm_runtime_resume(wirq-&gt;dev);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='hunk'>@@ -179,9 +188,11 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)</div><div class='ctx'> </div><div class='ctx'> 	wirq-&gt;dev = dev;</div><div class='ctx'> 	wirq-&gt;irq = irq;</div><div class='del'>-	wirq-&gt;dedicated_irq = true;</div><div class='ctx'> 	irq_set_status_flags(irq, IRQ_NOAUTOEN);</div><div class='ctx'> </div><div class='add'>+	/* Prevent deferred spurious wakeirqs with disable_irq_nosync() */</div><div class='add'>+	irq_set_status_flags(irq, IRQ_DISABLE_UNLAZY);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Consumer device may need to power up and restore state</div><div class='ctx'> 	 * so we use a threaded irq.</div><div class='hunk'>@@ -195,6 +206,8 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free_irq;</div><div class='ctx'> </div><div class='add'>+	wirq-&gt;status = WAKE_IRQ_DEDICATED_ALLOCATED;</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> err_free_irq:</div><div class='hunk'>@@ -210,9 +223,9 @@ EXPORT_SYMBOL_GPL(dev_pm_set_dedicated_wake_irq);</div><div class='ctx'>  * dev_pm_enable_wake_irq - Enable device wake-up interrupt</div><div class='ctx'>  * @dev: Device</div><div class='ctx'>  *</div><div class='del'>- * Called from the bus code or the device driver for</div><div class='del'>- * runtime_suspend() to enable the wake-up interrupt while</div><div class='del'>- * the device is running.</div><div class='add'>+ * Optionally called from the bus code or the device driver for</div><div class='add'>+ * runtime_resume() to override the PM runtime core managed wake-up</div><div class='add'>+ * interrupt handling to enable the wake-up interrupt.</div><div class='ctx'>  *</div><div class='ctx'>  * Note that for runtime_suspend()) the wake-up interrupts</div><div class='ctx'>  * should be unconditionally enabled unlike for suspend()</div><div class='hunk'>@@ -222,7 +235,7 @@ void dev_pm_enable_wake_irq(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct wake_irq *wirq = dev-&gt;power.wakeirq;</div><div class='ctx'> </div><div class='del'>-	if (wirq &amp;&amp; wirq-&gt;dedicated_irq)</div><div class='add'>+	if (wirq &amp;&amp; (wirq-&gt;status &amp; WAKE_IRQ_DEDICATED_ALLOCATED))</div><div class='ctx'> 		enable_irq(wirq-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_enable_wake_irq);</div><div class='hunk'>@@ -231,20 +244,73 @@ EXPORT_SYMBOL_GPL(dev_pm_enable_wake_irq);</div><div class='ctx'>  * dev_pm_disable_wake_irq - Disable device wake-up interrupt</div><div class='ctx'>  * @dev: Device</div><div class='ctx'>  *</div><div class='del'>- * Called from the bus code or the device driver for</div><div class='del'>- * runtime_resume() to disable the wake-up interrupt while</div><div class='del'>- * the device is running.</div><div class='add'>+ * Optionally called from the bus code or the device driver for</div><div class='add'>+ * runtime_suspend() to override the PM runtime core managed wake-up</div><div class='add'>+ * interrupt handling to disable the wake-up interrupt.</div><div class='ctx'>  */</div><div class='ctx'> void dev_pm_disable_wake_irq(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct wake_irq *wirq = dev-&gt;power.wakeirq;</div><div class='ctx'> </div><div class='del'>-	if (wirq &amp;&amp; wirq-&gt;dedicated_irq)</div><div class='add'>+	if (wirq &amp;&amp; (wirq-&gt;status &amp; WAKE_IRQ_DEDICATED_ALLOCATED))</div><div class='ctx'> 		disable_irq_nosync(wirq-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_disable_wake_irq);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * dev_pm_enable_wake_irq_check - Checks and enables wake-up interrupt</div><div class='add'>+ * @dev: Device</div><div class='add'>+ * @can_change_status: Can change wake-up interrupt status</div><div class='add'>+ *</div><div class='add'>+ * Enables wakeirq conditionally. We need to enable wake-up interrupt</div><div class='add'>+ * lazily on the first rpm_suspend(). This is needed as the consumer device</div><div class='add'>+ * starts in RPM_SUSPENDED state, and the the first pm_runtime_get() would</div><div class='add'>+ * otherwise try to disable already disabled wakeirq. The wake-up interrupt</div><div class='add'>+ * starts disabled with IRQ_NOAUTOEN set.</div><div class='add'>+ *</div><div class='add'>+ * Should be only called from rpm_suspend() and rpm_resume() path.</div><div class='add'>+ * Caller must hold &amp;dev-&gt;power.lock to change wirq-&gt;status</div><div class='add'>+ */</div><div class='add'>+void dev_pm_enable_wake_irq_check(struct device *dev,</div><div class='add'>+				  bool can_change_status)</div><div class='add'>+{</div><div class='add'>+	struct wake_irq *wirq = dev-&gt;power.wakeirq;</div><div class='add'>+</div><div class='add'>+	if (!wirq || !((wirq-&gt;status &amp; WAKE_IRQ_DEDICATED_MASK)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (likely(wirq-&gt;status &amp; WAKE_IRQ_DEDICATED_MANAGED)) {</div><div class='add'>+		goto enable;</div><div class='add'>+	} else if (can_change_status) {</div><div class='add'>+		wirq-&gt;status |= WAKE_IRQ_DEDICATED_MANAGED;</div><div class='add'>+		goto enable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+enable:</div><div class='add'>+	enable_irq(wirq-&gt;irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_pm_disable_wake_irq_check - Checks and disables wake-up interrupt</div><div class='add'>+ * @dev: Device</div><div class='add'>+ *</div><div class='add'>+ * Disables wake-up interrupt conditionally based on status.</div><div class='add'>+ * Should be only called from rpm_suspend() and rpm_resume() path.</div><div class='add'>+ */</div><div class='add'>+void dev_pm_disable_wake_irq_check(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct wake_irq *wirq = dev-&gt;power.wakeirq;</div><div class='add'>+</div><div class='add'>+	if (!wirq || !((wirq-&gt;status &amp; WAKE_IRQ_DEDICATED_MASK)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (wirq-&gt;status &amp; WAKE_IRQ_DEDICATED_MANAGED)</div><div class='add'>+		disable_irq_nosync(wirq-&gt;irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * dev_pm_arm_wake_irq - Arm device wake-up</div><div class='ctx'>  * @wirq: Device wake-up interrupt</div><div class='ctx'>  *</div><div class='hunk'>@@ -256,8 +322,12 @@ void dev_pm_arm_wake_irq(struct wake_irq *wirq)</div><div class='ctx'> 	if (!wirq)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (device_may_wakeup(wirq-&gt;dev))</div><div class='add'>+	if (device_may_wakeup(wirq-&gt;dev)) {</div><div class='add'>+		if (wirq-&gt;status &amp; WAKE_IRQ_DEDICATED_ALLOCATED)</div><div class='add'>+			enable_irq(wirq-&gt;irq);</div><div class='add'>+</div><div class='ctx'> 		enable_irq_wake(wirq-&gt;irq);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -272,6 +342,10 @@ void dev_pm_disarm_wake_irq(struct wake_irq *wirq)</div><div class='ctx'> 	if (!wirq)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (device_may_wakeup(wirq-&gt;dev))</div><div class='add'>+	if (device_may_wakeup(wirq-&gt;dev)) {</div><div class='ctx'> 		disable_irq_wake(wirq-&gt;irq);</div><div class='add'>+</div><div class='add'>+		if (wirq-&gt;status &amp; WAKE_IRQ_DEDICATED_ALLOCATED)</div><div class='add'>+			disable_irq_nosync(wirq-&gt;irq);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c<br/>index 62e4de2aa8d1..136854970489 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/power/wakeup.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/power/wakeup.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/power/wakeup.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/power/wakeup.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='hunk'>@@ -811,7 +811,7 @@ void pm_print_active_wakeup_sources(void)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	list_for_each_entry_rcu(ws, &amp;wakeup_sources, entry) {</div><div class='ctx'> 		if (ws-&gt;active) {</div><div class='del'>-			pr_info("active wakeup source: %s\n", ws-&gt;name);</div><div class='add'>+			pr_debug("active wakeup source: %s\n", ws-&gt;name);</div><div class='ctx'> 			active = 1;</div><div class='ctx'> 		} else if (!active &amp;&amp;</div><div class='ctx'> 			   (!last_activity_ws ||</div><div class='hunk'>@@ -822,7 +822,7 @@ void pm_print_active_wakeup_sources(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!active &amp;&amp; last_activity_ws)</div><div class='del'>-		pr_info("last active wakeup source: %s\n",</div><div class='add'>+		pr_debug("last active wakeup source: %s\n",</div><div class='ctx'> 			last_activity_ws-&gt;name);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -905,7 +905,7 @@ bool pm_get_wakeup_count(unsigned int *count, bool block)</div><div class='ctx'> 			split_counters(&amp;cnt, &amp;inpr);</div><div class='ctx'> 			if (inpr == 0 || signal_pending(current))</div><div class='ctx'> 				break;</div><div class='del'>-</div><div class='add'>+			pm_print_active_wakeup_sources();</div><div class='ctx'> 			schedule();</div><div class='ctx'> 		}</div><div class='ctx'> 		finish_wait(&amp;wakeup_count_wait_queue, &amp;wait);</div><div class='hunk'>@@ -998,14 +998,14 @@ static int print_wakeup_source_stats(struct seq_file *m,</div><div class='ctx'> </div><div class='ctx'> 		active_time = ktime_sub(now, ws-&gt;last_time);</div><div class='ctx'> 		total_time = ktime_add(total_time, active_time);</div><div class='del'>-		if (active_time.tv64 &gt; max_time.tv64)</div><div class='add'>+		if (active_time &gt; max_time)</div><div class='ctx'> 			max_time = active_time;</div><div class='ctx'> </div><div class='ctx'> 		if (ws-&gt;autosleep_enabled)</div><div class='ctx'> 			prevent_sleep_time = ktime_add(prevent_sleep_time,</div><div class='ctx'> 				ktime_sub(now, ws-&gt;start_prevent_time));</div><div class='ctx'> 	} else {</div><div class='del'>-		active_time = ktime_set(0, 0);</div><div class='add'>+		active_time = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "%-12s\t%lu\t\t%lu\t\t%lu\t\t%lu\t\t%lld\t\t%lld\t\t%lld\t\t%lld\t\t%lld\n",</div><div class='head'>diff --git a/drivers/base/property.c b/drivers/base/property.c<br/>index 43a36d68c3fd..c458c63e353f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/property.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/property.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/property.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/property.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> struct property_set {</div><div class='ctx'> 	struct fwnode_handle fwnode;</div><div class='del'>-	struct property_entry *properties;</div><div class='add'>+	const struct property_entry *properties;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline bool is_pset_node(struct fwnode_handle *fwnode)</div><div class='hunk'>@@ -35,10 +35,10 @@ static inline struct property_set *to_pset_node(struct fwnode_handle *fwnode)</div><div class='ctx'> 		container_of(fwnode, struct property_set, fwnode) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct property_entry *pset_prop_get(struct property_set *pset,</div><div class='del'>-					    const char *name)</div><div class='add'>+static const struct property_entry *pset_prop_get(struct property_set *pset,</div><div class='add'>+						  const char *name)</div><div class='ctx'> {</div><div class='del'>-	struct property_entry *prop;</div><div class='add'>+	const struct property_entry *prop;</div><div class='ctx'> </div><div class='ctx'> 	if (!pset || !pset-&gt;properties)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -50,11 +50,11 @@ static struct property_entry *pset_prop_get(struct property_set *pset,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *pset_prop_find(struct property_set *pset, const char *propname,</div><div class='del'>-			    size_t length)</div><div class='add'>+static const void *pset_prop_find(struct property_set *pset,</div><div class='add'>+				  const char *propname, size_t length)</div><div class='ctx'> {</div><div class='del'>-	struct property_entry *prop;</div><div class='del'>-	void *pointer;</div><div class='add'>+	const struct property_entry *prop;</div><div class='add'>+	const void *pointer;</div><div class='ctx'> </div><div class='ctx'> 	prop = pset_prop_get(pset, propname);</div><div class='ctx'> 	if (!prop)</div><div class='hunk'>@@ -74,7 +74,7 @@ static int pset_prop_read_u8_array(struct property_set *pset,</div><div class='ctx'> 				   const char *propname,</div><div class='ctx'> 				   u8 *values, size_t nval)</div><div class='ctx'> {</div><div class='del'>-	void *pointer;</div><div class='add'>+	const void *pointer;</div><div class='ctx'> 	size_t length = nval * sizeof(*values);</div><div class='ctx'> </div><div class='ctx'> 	pointer = pset_prop_find(pset, propname, length);</div><div class='hunk'>@@ -89,7 +89,7 @@ static int pset_prop_read_u16_array(struct property_set *pset,</div><div class='ctx'> 				    const char *propname,</div><div class='ctx'> 				    u16 *values, size_t nval)</div><div class='ctx'> {</div><div class='del'>-	void *pointer;</div><div class='add'>+	const void *pointer;</div><div class='ctx'> 	size_t length = nval * sizeof(*values);</div><div class='ctx'> </div><div class='ctx'> 	pointer = pset_prop_find(pset, propname, length);</div><div class='hunk'>@@ -104,7 +104,7 @@ static int pset_prop_read_u32_array(struct property_set *pset,</div><div class='ctx'> 				    const char *propname,</div><div class='ctx'> 				    u32 *values, size_t nval)</div><div class='ctx'> {</div><div class='del'>-	void *pointer;</div><div class='add'>+	const void *pointer;</div><div class='ctx'> 	size_t length = nval * sizeof(*values);</div><div class='ctx'> </div><div class='ctx'> 	pointer = pset_prop_find(pset, propname, length);</div><div class='hunk'>@@ -119,7 +119,7 @@ static int pset_prop_read_u64_array(struct property_set *pset,</div><div class='ctx'> 				    const char *propname,</div><div class='ctx'> 				    u64 *values, size_t nval)</div><div class='ctx'> {</div><div class='del'>-	void *pointer;</div><div class='add'>+	const void *pointer;</div><div class='ctx'> 	size_t length = nval * sizeof(*values);</div><div class='ctx'> </div><div class='ctx'> 	pointer = pset_prop_find(pset, propname, length);</div><div class='hunk'>@@ -133,7 +133,7 @@ static int pset_prop_read_u64_array(struct property_set *pset,</div><div class='ctx'> static int pset_prop_count_elems_of_size(struct property_set *pset,</div><div class='ctx'> 					 const char *propname, size_t length)</div><div class='ctx'> {</div><div class='del'>-	struct property_entry *prop;</div><div class='add'>+	const struct property_entry *prop;</div><div class='ctx'> </div><div class='ctx'> 	prop = pset_prop_get(pset, propname);</div><div class='ctx'> 	if (!prop)</div><div class='hunk'>@@ -146,7 +146,7 @@ static int pset_prop_read_string_array(struct property_set *pset,</div><div class='ctx'> 				       const char *propname,</div><div class='ctx'> 				       const char **strings, size_t nval)</div><div class='ctx'> {</div><div class='del'>-	void *pointer;</div><div class='add'>+	const void *pointer;</div><div class='ctx'> 	size_t length = nval * sizeof(*strings);</div><div class='ctx'> </div><div class='ctx'> 	pointer = pset_prop_find(pset, propname, length);</div><div class='hunk'>@@ -160,8 +160,8 @@ static int pset_prop_read_string_array(struct property_set *pset,</div><div class='ctx'> static int pset_prop_read_string(struct property_set *pset,</div><div class='ctx'> 				 const char *propname, const char **strings)</div><div class='ctx'> {</div><div class='del'>-	struct property_entry *prop;</div><div class='del'>-	const char **pointer;</div><div class='add'>+	const struct property_entry *prop;</div><div class='add'>+	const char * const *pointer;</div><div class='ctx'> </div><div class='ctx'> 	prop = pset_prop_get(pset, propname);</div><div class='ctx'> 	if (!prop)</div><div class='hunk'>@@ -682,77 +682,64 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fwnode_property_match_string);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * pset_free_set - releases memory allocated for copied property set</div><div class='del'>- * @pset: Property set to release</div><div class='del'>- *</div><div class='del'>- * Function takes previously copied property set and releases all the</div><div class='del'>- * memory allocated to it.</div><div class='del'>- */</div><div class='del'>-static void pset_free_set(struct property_set *pset)</div><div class='add'>+static int property_copy_string_array(struct property_entry *dst,</div><div class='add'>+				      const struct property_entry *src)</div><div class='ctx'> {</div><div class='del'>-	const struct property_entry *prop;</div><div class='del'>-	size_t i, nval;</div><div class='add'>+	char **d;</div><div class='add'>+	size_t nval = src-&gt;length / sizeof(*d);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (!pset)</div><div class='del'>-		return;</div><div class='add'>+	d = kcalloc(nval, sizeof(*d), GFP_KERNEL);</div><div class='add'>+	if (!d)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (prop = pset-&gt;properties; prop-&gt;name; prop++) {</div><div class='del'>-		if (prop-&gt;is_array) {</div><div class='del'>-			if (prop-&gt;is_string &amp;&amp; prop-&gt;pointer.str) {</div><div class='del'>-				nval = prop-&gt;length / sizeof(const char *);</div><div class='del'>-				for (i = 0; i &lt; nval; i++)</div><div class='del'>-					kfree(prop-&gt;pointer.str[i]);</div><div class='del'>-			}</div><div class='del'>-			kfree(prop-&gt;pointer.raw_data);</div><div class='del'>-		} else if (prop-&gt;is_string) {</div><div class='del'>-			kfree(prop-&gt;value.str);</div><div class='add'>+	for (i = 0; i &lt; nval; i++) {</div><div class='add'>+		d[i] = kstrdup(src-&gt;pointer.str[i], GFP_KERNEL);</div><div class='add'>+		if (!d[i] &amp;&amp; src-&gt;pointer.str[i]) {</div><div class='add'>+			while (--i &gt;= 0)</div><div class='add'>+				kfree(d[i]);</div><div class='add'>+			kfree(d);</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='del'>-		kfree(prop-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(pset-&gt;properties);</div><div class='del'>-	kfree(pset);</div><div class='add'>+	dst-&gt;pointer.raw_data = d;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pset_copy_entry(struct property_entry *dst,</div><div class='del'>-			   const struct property_entry *src)</div><div class='add'>+static int property_entry_copy_data(struct property_entry *dst,</div><div class='add'>+				    const struct property_entry *src)</div><div class='ctx'> {</div><div class='del'>-	const char **d, **s;</div><div class='del'>-	size_t i, nval;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	dst-&gt;name = kstrdup(src-&gt;name, GFP_KERNEL);</div><div class='ctx'> 	if (!dst-&gt;name)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (src-&gt;is_array) {</div><div class='del'>-		if (!src-&gt;length)</div><div class='del'>-			return -ENODATA;</div><div class='add'>+		if (!src-&gt;length) {</div><div class='add'>+			error = -ENODATA;</div><div class='add'>+			goto out_free_name;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (src-&gt;is_string) {</div><div class='del'>-			nval = src-&gt;length / sizeof(const char *);</div><div class='del'>-			dst-&gt;pointer.str = kcalloc(nval, sizeof(const char *),</div><div class='del'>-						   GFP_KERNEL);</div><div class='del'>-			if (!dst-&gt;pointer.str)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-</div><div class='del'>-			d = dst-&gt;pointer.str;</div><div class='del'>-			s = src-&gt;pointer.str;</div><div class='del'>-			for (i = 0; i &lt; nval; i++) {</div><div class='del'>-				d[i] = kstrdup(s[i], GFP_KERNEL);</div><div class='del'>-				if (!d[i] &amp;&amp; s[i])</div><div class='del'>-					return -ENOMEM;</div><div class='del'>-			}</div><div class='add'>+			error = property_copy_string_array(dst, src);</div><div class='add'>+			if (error)</div><div class='add'>+				goto out_free_name;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dst-&gt;pointer.raw_data = kmemdup(src-&gt;pointer.raw_data,</div><div class='ctx'> 							src-&gt;length, GFP_KERNEL);</div><div class='del'>-			if (!dst-&gt;pointer.raw_data)</div><div class='del'>-				return -ENOMEM;</div><div class='add'>+			if (!dst-&gt;pointer.raw_data) {</div><div class='add'>+				error = -ENOMEM;</div><div class='add'>+				goto out_free_name;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (src-&gt;is_string) {</div><div class='ctx'> 		dst-&gt;value.str = kstrdup(src-&gt;value.str, GFP_KERNEL);</div><div class='del'>-		if (!dst-&gt;value.str &amp;&amp; src-&gt;value.str)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		if (!dst-&gt;value.str &amp;&amp; src-&gt;value.str) {</div><div class='add'>+			error = -ENOMEM;</div><div class='add'>+			goto out_free_name;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dst-&gt;value.raw_data = src-&gt;value.raw_data;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -762,6 +749,95 @@ static int pset_copy_entry(struct property_entry *dst,</div><div class='ctx'> 	dst-&gt;is_string = src-&gt;is_string;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_free_name:</div><div class='add'>+	kfree(dst-&gt;name);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void property_entry_free_data(const struct property_entry *p)</div><div class='add'>+{</div><div class='add'>+	size_t i, nval;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;is_array) {</div><div class='add'>+		if (p-&gt;is_string &amp;&amp; p-&gt;pointer.str) {</div><div class='add'>+			nval = p-&gt;length / sizeof(const char *);</div><div class='add'>+			for (i = 0; i &lt; nval; i++)</div><div class='add'>+				kfree(p-&gt;pointer.str[i]);</div><div class='add'>+		}</div><div class='add'>+		kfree(p-&gt;pointer.raw_data);</div><div class='add'>+	} else if (p-&gt;is_string) {</div><div class='add'>+		kfree(p-&gt;value.str);</div><div class='add'>+	}</div><div class='add'>+	kfree(p-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * property_entries_dup - duplicate array of properties</div><div class='add'>+ * @properties: array of properties to copy</div><div class='add'>+ *</div><div class='add'>+ * This function creates a deep copy of the given NULL-terminated array</div><div class='add'>+ * of property entries.</div><div class='add'>+ */</div><div class='add'>+struct property_entry *</div><div class='add'>+property_entries_dup(const struct property_entry *properties)</div><div class='add'>+{</div><div class='add'>+	struct property_entry *p;</div><div class='add'>+	int i, n = 0;</div><div class='add'>+</div><div class='add'>+	while (properties[n].name)</div><div class='add'>+		n++;</div><div class='add'>+</div><div class='add'>+	p = kcalloc(n + 1, sizeof(*p), GFP_KERNEL);</div><div class='add'>+	if (!p)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++) {</div><div class='add'>+		int ret = property_entry_copy_data(&amp;p[i], &amp;properties[i]);</div><div class='add'>+		if (ret) {</div><div class='add'>+			while (--i &gt;= 0)</div><div class='add'>+				property_entry_free_data(&amp;p[i]);</div><div class='add'>+			kfree(p);</div><div class='add'>+			return ERR_PTR(ret);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(property_entries_dup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * property_entries_free - free previously allocated array of properties</div><div class='add'>+ * @properties: array of properties to destroy</div><div class='add'>+ *</div><div class='add'>+ * This function frees given NULL-terminated array of property entries,</div><div class='add'>+ * along with their data.</div><div class='add'>+ */</div><div class='add'>+void property_entries_free(const struct property_entry *properties)</div><div class='add'>+{</div><div class='add'>+	const struct property_entry *p;</div><div class='add'>+</div><div class='add'>+	for (p = properties; p-&gt;name; p++)</div><div class='add'>+		property_entry_free_data(p);</div><div class='add'>+</div><div class='add'>+	kfree(properties);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(property_entries_free);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pset_free_set - releases memory allocated for copied property set</div><div class='add'>+ * @pset: Property set to release</div><div class='add'>+ *</div><div class='add'>+ * Function takes previously copied property set and releases all the</div><div class='add'>+ * memory allocated to it.</div><div class='add'>+ */</div><div class='add'>+static void pset_free_set(struct property_set *pset)</div><div class='add'>+{</div><div class='add'>+	if (!pset)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	property_entries_free(pset-&gt;properties);</div><div class='add'>+	kfree(pset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -776,32 +852,20 @@ static int pset_copy_entry(struct property_entry *dst,</div><div class='ctx'>  */</div><div class='ctx'> static struct property_set *pset_copy_set(const struct property_set *pset)</div><div class='ctx'> {</div><div class='del'>-	const struct property_entry *entry;</div><div class='add'>+	struct property_entry *properties;</div><div class='ctx'> 	struct property_set *p;</div><div class='del'>-	size_t i, n = 0;</div><div class='ctx'> </div><div class='ctx'> 	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	while (pset-&gt;properties[n].name)</div><div class='del'>-		n++;</div><div class='del'>-</div><div class='del'>-	p-&gt;properties = kcalloc(n + 1, sizeof(*entry), GFP_KERNEL);</div><div class='del'>-	if (!p-&gt;properties) {</div><div class='add'>+	properties = property_entries_dup(pset-&gt;properties);</div><div class='add'>+	if (IS_ERR(properties)) {</div><div class='ctx'> 		kfree(p);</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n; i++) {</div><div class='del'>-		int ret = pset_copy_entry(&amp;p-&gt;properties[i],</div><div class='del'>-					  &amp;pset-&gt;properties[i]);</div><div class='del'>-		if (ret) {</div><div class='del'>-			pset_free_set(p);</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-		}</div><div class='add'>+		return ERR_CAST(properties);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	p-&gt;properties = properties;</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -847,7 +911,8 @@ EXPORT_SYMBOL_GPL(device_remove_properties);</div><div class='ctx'>  * @dev as its secondary firmware node. The function takes a copy of</div><div class='ctx'>  * @properties.</div><div class='ctx'>  */</div><div class='del'>-int device_add_properties(struct device *dev, struct property_entry *properties)</div><div class='add'>+int device_add_properties(struct device *dev,</div><div class='add'>+			  const struct property_entry *properties)</div><div class='ctx'> {</div><div class='ctx'> 	struct property_set *p, pset;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c<br/>index 6f77d7319fc6..4ff311374c4a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/regmap/regcache-lzo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/regmap/regcache-lzo.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/regmap/regcache-lzo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/regmap/regcache-lzo.c</a></div><div class='hunk'>@@ -236,15 +236,13 @@ static int regcache_lzo_read(struct regmap *map,</div><div class='ctx'> {</div><div class='ctx'> 	struct regcache_lzo_ctx *lzo_block, **lzo_blocks;</div><div class='ctx'> 	int ret, blkindex, blkpos;</div><div class='del'>-	size_t blksize, tmp_dst_len;</div><div class='add'>+	size_t tmp_dst_len;</div><div class='ctx'> 	void *tmp_dst;</div><div class='ctx'> </div><div class='ctx'> 	/* index of the compressed lzo block */</div><div class='ctx'> 	blkindex = regcache_lzo_get_blkindex(map, reg);</div><div class='ctx'> 	/* register index within the decompressed block */</div><div class='ctx'> 	blkpos = regcache_lzo_get_blkpos(map, reg);</div><div class='del'>-	/* size of the compressed block */</div><div class='del'>-	blksize = regcache_lzo_get_blksize(map);</div><div class='ctx'> 	lzo_blocks = map-&gt;cache;</div><div class='ctx'> 	lzo_block = lzo_blocks[blkindex];</div><div class='ctx'> </div><div class='hunk'>@@ -275,15 +273,13 @@ static int regcache_lzo_write(struct regmap *map,</div><div class='ctx'> {</div><div class='ctx'> 	struct regcache_lzo_ctx *lzo_block, **lzo_blocks;</div><div class='ctx'> 	int ret, blkindex, blkpos;</div><div class='del'>-	size_t blksize, tmp_dst_len;</div><div class='add'>+	size_t tmp_dst_len;</div><div class='ctx'> 	void *tmp_dst;</div><div class='ctx'> </div><div class='ctx'> 	/* index of the compressed lzo block */</div><div class='ctx'> 	blkindex = regcache_lzo_get_blkindex(map, reg);</div><div class='ctx'> 	/* register index within the decompressed block */</div><div class='ctx'> 	blkpos = regcache_lzo_get_blkpos(map, reg);</div><div class='del'>-	/* size of the compressed block */</div><div class='del'>-	blksize = regcache_lzo_get_blksize(map);</div><div class='ctx'> 	lzo_blocks = map-&gt;cache;</div><div class='ctx'> 	lzo_block = lzo_blocks[blkindex];</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c<br/>index b11af3f2c1db..b1e9aae9a5d0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/regmap/regcache-rbtree.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/regmap/regcache-rbtree.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/regmap/regcache-rbtree.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/regmap/regcache-rbtree.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ static struct regcache_rbtree_node *regcache_rbtree_lookup(struct regmap *map,</div><div class='ctx'> </div><div class='ctx'> 	node = rbtree_ctx-&gt;root.rb_node;</div><div class='ctx'> 	while (node) {</div><div class='del'>-		rbnode = container_of(node, struct regcache_rbtree_node, node);</div><div class='add'>+		rbnode = rb_entry(node, struct regcache_rbtree_node, node);</div><div class='ctx'> 		regcache_rbtree_get_base_top_reg(map, rbnode, &amp;base_reg,</div><div class='ctx'> 						 &amp;top_reg);</div><div class='ctx'> 		if (reg &gt;= base_reg &amp;&amp; reg &lt;= top_reg) {</div><div class='hunk'>@@ -108,8 +108,7 @@ static int regcache_rbtree_insert(struct regmap *map, struct rb_root *root,</div><div class='ctx'> 	parent = NULL;</div><div class='ctx'> 	new = &amp;root-&gt;rb_node;</div><div class='ctx'> 	while (*new) {</div><div class='del'>-		rbnode_tmp = container_of(*new, struct regcache_rbtree_node,</div><div class='del'>-					  node);</div><div class='add'>+		rbnode_tmp = rb_entry(*new, struct regcache_rbtree_node, node);</div><div class='ctx'> 		/* base and top registers of the current rbnode */</div><div class='ctx'> 		regcache_rbtree_get_base_top_reg(map, rbnode_tmp, &amp;base_reg_tmp,</div><div class='ctx'> 						 &amp;top_reg_tmp);</div><div class='hunk'>@@ -152,7 +151,7 @@ static int rbtree_show(struct seq_file *s, void *ignored)</div><div class='ctx'> </div><div class='ctx'> 	for (node = rb_first(&amp;rbtree_ctx-&gt;root); node != NULL;</div><div class='ctx'> 	     node = rb_next(node)) {</div><div class='del'>-		n = container_of(node, struct regcache_rbtree_node, node);</div><div class='add'>+		n = rb_entry(node, struct regcache_rbtree_node, node);</div><div class='ctx'> 		mem_size += sizeof(*n);</div><div class='ctx'> 		mem_size += (n-&gt;blklen * map-&gt;cache_word_size);</div><div class='ctx'> 		mem_size += BITS_TO_LONGS(n-&gt;blklen) * sizeof(long);</div><div class='head'>diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c<br/>index 4e582561e1e7..b0a0dcf32fb7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/regmap/regcache.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/regmap/regcache.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/regmap/regcache.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/regmap/regcache.c</a></div><div class='hunk'>@@ -224,7 +224,7 @@ void regcache_exit(struct regmap *map)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regcache_read: Fetch the value of a given register from the cache.</div><div class='add'>+ * regcache_read - Fetch the value of a given register from the cache.</div><div class='ctx'>  *</div><div class='ctx'>  * @map: map to configure.</div><div class='ctx'>  * @reg: The register index.</div><div class='hunk'>@@ -255,7 +255,7 @@ int regcache_read(struct regmap *map,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regcache_write: Set the value of a given register in the cache.</div><div class='add'>+ * regcache_write - Set the value of a given register in the cache.</div><div class='ctx'>  *</div><div class='ctx'>  * @map: map to configure.</div><div class='ctx'>  * @reg: The register index.</div><div class='hunk'>@@ -328,7 +328,7 @@ static int regcache_default_sync(struct regmap *map, unsigned int min,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regcache_sync: Sync the register cache with the hardware.</div><div class='add'>+ * regcache_sync - Sync the register cache with the hardware.</div><div class='ctx'>  *</div><div class='ctx'>  * @map: map to configure.</div><div class='ctx'>  *</div><div class='hunk'>@@ -396,7 +396,7 @@ out:</div><div class='ctx'> EXPORT_SYMBOL_GPL(regcache_sync);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regcache_sync_region: Sync part  of the register cache with the hardware.</div><div class='add'>+ * regcache_sync_region - Sync part  of the register cache with the hardware.</div><div class='ctx'>  *</div><div class='ctx'>  * @map: map to sync.</div><div class='ctx'>  * @min: first register to sync</div><div class='hunk'>@@ -452,7 +452,7 @@ out:</div><div class='ctx'> EXPORT_SYMBOL_GPL(regcache_sync_region);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regcache_drop_region: Discard part of the register cache</div><div class='add'>+ * regcache_drop_region - Discard part of the register cache</div><div class='ctx'>  *</div><div class='ctx'>  * @map: map to operate on</div><div class='ctx'>  * @min: first register to discard</div><div class='hunk'>@@ -483,10 +483,10 @@ int regcache_drop_region(struct regmap *map, unsigned int min,</div><div class='ctx'> EXPORT_SYMBOL_GPL(regcache_drop_region);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regcache_cache_only: Put a register map into cache only mode</div><div class='add'>+ * regcache_cache_only - Put a register map into cache only mode</div><div class='ctx'>  *</div><div class='ctx'>  * @map: map to configure</div><div class='del'>- * @cache_only: flag if changes should be written to the hardware</div><div class='add'>+ * @enable: flag if changes should be written to the hardware</div><div class='ctx'>  *</div><div class='ctx'>  * When a register map is marked as cache only writes to the register</div><div class='ctx'>  * map API will only update the register cache, they will not cause</div><div class='hunk'>@@ -505,7 +505,7 @@ void regcache_cache_only(struct regmap *map, bool enable)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regcache_cache_only);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regcache_mark_dirty: Indicate that HW registers were reset to default values</div><div class='add'>+ * regcache_mark_dirty - Indicate that HW registers were reset to default values</div><div class='ctx'>  *</div><div class='ctx'>  * @map: map to mark</div><div class='ctx'>  *</div><div class='hunk'>@@ -527,10 +527,10 @@ void regcache_mark_dirty(struct regmap *map)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regcache_mark_dirty);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regcache_cache_bypass: Put a register map into cache bypass mode</div><div class='add'>+ * regcache_cache_bypass - Put a register map into cache bypass mode</div><div class='ctx'>  *</div><div class='ctx'>  * @map: map to configure</div><div class='del'>- * @cache_bypass: flag if changes should not be written to the cache</div><div class='add'>+ * @enable: flag if changes should not be written to the cache</div><div class='ctx'>  *</div><div class='ctx'>  * When a register map is marked with the cache bypass option, writes</div><div class='ctx'>  * to the register map API will only update the hardware and not the</div><div class='head'>diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c<br/>index ec262476d043..cd54189f2b1d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/regmap/regmap-irq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/regmap/regmap-irq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/regmap/regmap-irq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/regmap/regmap-irq.c</a></div><div class='hunk'>@@ -398,13 +398,14 @@ static const struct irq_domain_ops regmap_domain_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_add_irq_chip(): Use standard regmap IRQ controller handling</div><div class='add'>+ * regmap_add_irq_chip() - Use standard regmap IRQ controller handling</div><div class='ctx'>  *</div><div class='del'>- * map:       The regmap for the device.</div><div class='del'>- * irq:       The IRQ the device uses to signal interrupts</div><div class='del'>- * irq_flags: The IRQF_ flags to use for the primary interrupt.</div><div class='del'>- * chip:      Configuration for the interrupt controller.</div><div class='del'>- * data:      Runtime data structure for the controller, allocated on success</div><div class='add'>+ * @map: The regmap for the device.</div><div class='add'>+ * @irq: The IRQ the device uses to signal interrupts.</div><div class='add'>+ * @irq_flags: The IRQF_ flags to use for the primary interrupt.</div><div class='add'>+ * @irq_base: Allocate at specific IRQ number if irq_base &gt; 0.</div><div class='add'>+ * @chip: Configuration for the interrupt controller.</div><div class='add'>+ * @data: Runtime data structure for the controller, allocated on success.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success or an errno on failure.</div><div class='ctx'>  *</div><div class='hunk'>@@ -659,12 +660,12 @@ err_alloc:</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_add_irq_chip);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_del_irq_chip(): Stop interrupt handling for a regmap IRQ chip</div><div class='add'>+ * regmap_del_irq_chip() - Stop interrupt handling for a regmap IRQ chip</div><div class='ctx'>  *</div><div class='ctx'>  * @irq: Primary IRQ for the device</div><div class='del'>- * @d:   regmap_irq_chip_data allocated by regmap_add_irq_chip()</div><div class='add'>+ * @d: &amp;regmap_irq_chip_data allocated by regmap_add_irq_chip()</div><div class='ctx'>  *</div><div class='del'>- * This function also dispose all mapped irq on chip.</div><div class='add'>+ * This function also disposes of all mapped IRQs on the chip.</div><div class='ctx'>  */</div><div class='ctx'> void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *d)</div><div class='ctx'> {</div><div class='hunk'>@@ -723,18 +724,19 @@ static int devm_regmap_irq_chip_match(struct device *dev, void *res, void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * devm_regmap_add_irq_chip(): Resource manager regmap_add_irq_chip()</div><div class='add'>+ * devm_regmap_add_irq_chip() - Resource manager regmap_add_irq_chip()</div><div class='ctx'>  *</div><div class='del'>- * @dev:       The device pointer on which irq_chip belongs to.</div><div class='del'>- * @map:       The regmap for the device.</div><div class='del'>- * @irq:       The IRQ the device uses to signal interrupts</div><div class='add'>+ * @dev: The device pointer on which irq_chip belongs to.</div><div class='add'>+ * @map: The regmap for the device.</div><div class='add'>+ * @irq: The IRQ the device uses to signal interrupts</div><div class='ctx'>  * @irq_flags: The IRQF_ flags to use for the primary interrupt.</div><div class='del'>- * @chip:      Configuration for the interrupt controller.</div><div class='del'>- * @data:      Runtime data structure for the controller, allocated on success</div><div class='add'>+ * @irq_base: Allocate at specific IRQ number if irq_base &gt; 0.</div><div class='add'>+ * @chip: Configuration for the interrupt controller.</div><div class='add'>+ * @data: Runtime data structure for the controller, allocated on success</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success or an errno on failure.</div><div class='ctx'>  *</div><div class='del'>- * The regmap_irq_chip data automatically be released when the device is</div><div class='add'>+ * The &amp;regmap_irq_chip_data will be automatically released when the device is</div><div class='ctx'>  * unbound.</div><div class='ctx'>  */</div><div class='ctx'> int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,</div><div class='hunk'>@@ -765,11 +767,13 @@ int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,</div><div class='ctx'> EXPORT_SYMBOL_GPL(devm_regmap_add_irq_chip);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * devm_regmap_del_irq_chip(): Resource managed regmap_del_irq_chip()</div><div class='add'>+ * devm_regmap_del_irq_chip() - Resource managed regmap_del_irq_chip()</div><div class='ctx'>  *</div><div class='ctx'>  * @dev: Device for which which resource was allocated.</div><div class='del'>- * @irq: Primary IRQ for the device</div><div class='del'>- * @d:   regmap_irq_chip_data allocated by regmap_add_irq_chip()</div><div class='add'>+ * @irq: Primary IRQ for the device.</div><div class='add'>+ * @data: &amp;regmap_irq_chip_data allocated by regmap_add_irq_chip().</div><div class='add'>+ *</div><div class='add'>+ * A resource managed version of regmap_del_irq_chip().</div><div class='ctx'>  */</div><div class='ctx'> void devm_regmap_del_irq_chip(struct device *dev, int irq,</div><div class='ctx'> 			      struct regmap_irq_chip_data *data)</div><div class='hunk'>@@ -786,11 +790,11 @@ void devm_regmap_del_irq_chip(struct device *dev, int irq,</div><div class='ctx'> EXPORT_SYMBOL_GPL(devm_regmap_del_irq_chip);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_irq_chip_get_base(): Retrieve interrupt base for a regmap IRQ chip</div><div class='add'>+ * regmap_irq_chip_get_base() - Retrieve interrupt base for a regmap IRQ chip</div><div class='ctx'>  *</div><div class='del'>- * Useful for drivers to request their own IRQs.</div><div class='add'>+ * @data: regmap irq controller to operate on.</div><div class='ctx'>  *</div><div class='del'>- * @data: regmap_irq controller to operate on.</div><div class='add'>+ * Useful for drivers to request their own IRQs.</div><div class='ctx'>  */</div><div class='ctx'> int regmap_irq_chip_get_base(struct regmap_irq_chip_data *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -800,12 +804,12 @@ int regmap_irq_chip_get_base(struct regmap_irq_chip_data *data)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_irq_chip_get_base);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_irq_get_virq(): Map an interrupt on a chip to a virtual IRQ</div><div class='add'>+ * regmap_irq_get_virq() - Map an interrupt on a chip to a virtual IRQ</div><div class='ctx'>  *</div><div class='del'>- * Useful for drivers to request their own IRQs.</div><div class='add'>+ * @data: regmap irq controller to operate on.</div><div class='add'>+ * @irq: index of the interrupt requested in the chip IRQs.</div><div class='ctx'>  *</div><div class='del'>- * @data: regmap_irq controller to operate on.</div><div class='del'>- * @irq: index of the interrupt requested in the chip IRQs</div><div class='add'>+ * Useful for drivers to request their own IRQs.</div><div class='ctx'>  */</div><div class='ctx'> int regmap_irq_get_virq(struct regmap_irq_chip_data *data, int irq)</div><div class='ctx'> {</div><div class='hunk'>@@ -818,14 +822,14 @@ int regmap_irq_get_virq(struct regmap_irq_chip_data *data, int irq)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_irq_get_virq);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_irq_get_domain(): Retrieve the irq_domain for the chip</div><div class='add'>+ * regmap_irq_get_domain() - Retrieve the irq_domain for the chip</div><div class='add'>+ *</div><div class='add'>+ * @data: regmap_irq controller to operate on.</div><div class='ctx'>  *</div><div class='ctx'>  * Useful for drivers to request their own IRQs and for integration</div><div class='ctx'>  * with subsystems.  For ease of integration NULL is accepted as a</div><div class='ctx'>  * domain, allowing devices to just call this even if no domain is</div><div class='ctx'>  * allocated.</div><div class='del'>- *</div><div class='del'>- * @data: regmap_irq controller to operate on.</div><div class='ctx'>  */</div><div class='ctx'> struct irq_domain *regmap_irq_get_domain(struct regmap_irq_chip_data *data)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c<br/>index ae63bb0875ea..b9a779a4a739 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/regmap/regmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/regmap/regmap.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/regmap/regmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/regmap/regmap.c</a></div><div class='hunk'>@@ -459,7 +459,7 @@ static bool _regmap_range_add(struct regmap *map,</div><div class='ctx'> </div><div class='ctx'> 	while (*new) {</div><div class='ctx'> 		struct regmap_range_node *this =</div><div class='del'>-			container_of(*new, struct regmap_range_node, node);</div><div class='add'>+			rb_entry(*new, struct regmap_range_node, node);</div><div class='ctx'> </div><div class='ctx'> 		parent = *new;</div><div class='ctx'> 		if (data-&gt;range_max &lt; this-&gt;range_min)</div><div class='hunk'>@@ -483,7 +483,7 @@ static struct regmap_range_node *_regmap_range_lookup(struct regmap *map,</div><div class='ctx'> </div><div class='ctx'> 	while (node) {</div><div class='ctx'> 		struct regmap_range_node *this =</div><div class='del'>-			container_of(node, struct regmap_range_node, node);</div><div class='add'>+			rb_entry(node, struct regmap_range_node, node);</div><div class='ctx'> </div><div class='ctx'> 		if (reg &lt; this-&gt;range_min)</div><div class='ctx'> 			node = node-&gt;rb_left;</div><div class='hunk'>@@ -1091,8 +1091,7 @@ static void regmap_field_init(struct regmap_field *rm_field,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * devm_regmap_field_alloc(): Allocate and initialise a register field</div><div class='del'>- * in a register map.</div><div class='add'>+ * devm_regmap_field_alloc() - Allocate and initialise a register field.</div><div class='ctx'>  *</div><div class='ctx'>  * @dev: Device that will be interacted with</div><div class='ctx'>  * @regmap: regmap bank in which this register field is located.</div><div class='hunk'>@@ -1118,13 +1117,15 @@ struct regmap_field *devm_regmap_field_alloc(struct device *dev,</div><div class='ctx'> EXPORT_SYMBOL_GPL(devm_regmap_field_alloc);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * devm_regmap_field_free(): Free register field allocated using</div><div class='del'>- * devm_regmap_field_alloc. Usally drivers need not call this function,</div><div class='del'>- * as the memory allocated via devm will be freed as per device-driver</div><div class='del'>- * life-cyle.</div><div class='add'>+ * devm_regmap_field_free() - Free a register field allocated using</div><div class='add'>+ *                            devm_regmap_field_alloc.</div><div class='ctx'>  *</div><div class='ctx'>  * @dev: Device that will be interacted with</div><div class='ctx'>  * @field: regmap field which should be freed.</div><div class='add'>+ *</div><div class='add'>+ * Free register field allocated using devm_regmap_field_alloc(). Usually</div><div class='add'>+ * drivers need not call this function, as the memory allocated via devm</div><div class='add'>+ * will be freed as per device-driver life-cyle.</div><div class='ctx'>  */</div><div class='ctx'> void devm_regmap_field_free(struct device *dev,</div><div class='ctx'> 	struct regmap_field *field)</div><div class='hunk'>@@ -1134,8 +1135,7 @@ void devm_regmap_field_free(struct device *dev,</div><div class='ctx'> EXPORT_SYMBOL_GPL(devm_regmap_field_free);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_field_alloc(): Allocate and initialise a register field</div><div class='del'>- * in a register map.</div><div class='add'>+ * regmap_field_alloc() - Allocate and initialise a register field.</div><div class='ctx'>  *</div><div class='ctx'>  * @regmap: regmap bank in which this register field is located.</div><div class='ctx'>  * @reg_field: Register field with in the bank.</div><div class='hunk'>@@ -1159,7 +1159,8 @@ struct regmap_field *regmap_field_alloc(struct regmap *regmap,</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_field_alloc);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_field_free(): Free register field allocated using regmap_field_alloc</div><div class='add'>+ * regmap_field_free() - Free register field allocated using</div><div class='add'>+ *                       regmap_field_alloc.</div><div class='ctx'>  *</div><div class='ctx'>  * @field: regmap field which should be freed.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1170,7 +1171,7 @@ void regmap_field_free(struct regmap_field *field)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_field_free);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_reinit_cache(): Reinitialise the current register cache</div><div class='add'>+ * regmap_reinit_cache() - Reinitialise the current register cache</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to operate on.</div><div class='ctx'>  * @config: New configuration.  Only the cache data will be used.</div><div class='hunk'>@@ -1205,7 +1206,9 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_reinit_cache);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_exit(): Free a previously allocated register map</div><div class='add'>+ * regmap_exit() - Free a previously allocated register map</div><div class='add'>+ *</div><div class='add'>+ * @map: Register map to operate on.</div><div class='ctx'>  */</div><div class='ctx'> void regmap_exit(struct regmap *map)</div><div class='ctx'> {</div><div class='hunk'>@@ -1245,7 +1248,7 @@ static int dev_get_regmap_match(struct device *dev, void *res, void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dev_get_regmap(): Obtain the regmap (if any) for a device</div><div class='add'>+ * dev_get_regmap() - Obtain the regmap (if any) for a device</div><div class='ctx'>  *</div><div class='ctx'>  * @dev: Device to retrieve the map for</div><div class='ctx'>  * @name: Optional name for the register map, usually NULL.</div><div class='hunk'>@@ -1268,7 +1271,7 @@ struct regmap *dev_get_regmap(struct device *dev, const char *name)</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_get_regmap);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_get_device(): Obtain the device from a regmap</div><div class='add'>+ * regmap_get_device() - Obtain the device from a regmap</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to operate on.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1654,7 +1657,7 @@ int _regmap_write(struct regmap *map, unsigned int reg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_write(): Write a value to a single register</div><div class='add'>+ * regmap_write() - Write a value to a single register</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to write to</div><div class='ctx'>  * @reg: Register to write to</div><div class='hunk'>@@ -1681,7 +1684,7 @@ int regmap_write(struct regmap *map, unsigned int reg, unsigned int val)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_write);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_write_async(): Write a value to a single register asynchronously</div><div class='add'>+ * regmap_write_async() - Write a value to a single register asynchronously</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to write to</div><div class='ctx'>  * @reg: Register to write to</div><div class='hunk'>@@ -1712,7 +1715,7 @@ int regmap_write_async(struct regmap *map, unsigned int reg, unsigned int val)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_write_async);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_raw_write(): Write raw values to one or more registers</div><div class='add'>+ * regmap_raw_write() - Write raw values to one or more registers</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to write to</div><div class='ctx'>  * @reg: Initial register to write to</div><div class='hunk'>@@ -1750,9 +1753,8 @@ int regmap_raw_write(struct regmap *map, unsigned int reg,</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_raw_write);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_field_update_bits_base():</div><div class='del'>- *	Perform a read/modify/write cycle on the register field</div><div class='del'>- *	with change, async, force option</div><div class='add'>+ * regmap_field_update_bits_base() - Perform a read/modify/write cycle a</div><div class='add'>+ *                                   register field.</div><div class='ctx'>  *</div><div class='ctx'>  * @field: Register field to write to</div><div class='ctx'>  * @mask: Bitmask to change</div><div class='hunk'>@@ -1761,6 +1763,9 @@ EXPORT_SYMBOL_GPL(regmap_raw_write);</div><div class='ctx'>  * @async: Boolean indicating asynchronously</div><div class='ctx'>  * @force: Boolean indicating use force update</div><div class='ctx'>  *</div><div class='add'>+ * Perform a read/modify/write cycle on the register field with change,</div><div class='add'>+ * async, force option.</div><div class='add'>+ *</div><div class='ctx'>  * A value of zero will be returned on success, a negative errno will</div><div class='ctx'>  * be returned in error cases.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1777,9 +1782,8 @@ int regmap_field_update_bits_base(struct regmap_field *field,</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_field_update_bits_base);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_fields_update_bits_base():</div><div class='del'>- *	Perform a read/modify/write cycle on the register field</div><div class='del'>- *	with change, async, force option</div><div class='add'>+ * regmap_fields_update_bits_base() - Perform a read/modify/write cycle a</div><div class='add'>+ *                                    register field with port ID</div><div class='ctx'>  *</div><div class='ctx'>  * @field: Register field to write to</div><div class='ctx'>  * @id: port ID</div><div class='hunk'>@@ -1808,8 +1812,8 @@ int regmap_fields_update_bits_base(struct regmap_field *field,  unsigned int id,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_fields_update_bits_base);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * regmap_bulk_write(): Write multiple registers to the device</div><div class='add'>+/**</div><div class='add'>+ * regmap_bulk_write() - Write multiple registers to the device</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to write to</div><div class='ctx'>  * @reg: First register to be write from</div><div class='hunk'>@@ -2174,18 +2178,18 @@ static int _regmap_multi_reg_write(struct regmap *map,</div><div class='ctx'> 	return _regmap_raw_multi_reg_write(map, regs, num_regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * regmap_multi_reg_write(): Write multiple registers to the device</div><div class='del'>- *</div><div class='del'>- * where the set of register,value pairs are supplied in any order,</div><div class='del'>- * possibly not all in a single range.</div><div class='add'>+/**</div><div class='add'>+ * regmap_multi_reg_write() - Write multiple registers to the device</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to write to</div><div class='ctx'>  * @regs: Array of structures containing register,value to be written</div><div class='ctx'>  * @num_regs: Number of registers to write</div><div class='ctx'>  *</div><div class='add'>+ * Write multiple registers to the device where the set of register, value</div><div class='add'>+ * pairs are supplied in any order, possibly not all in a single range.</div><div class='add'>+ *</div><div class='ctx'>  * The 'normal' block write mode will send ultimately send data on the</div><div class='del'>- * target bus as R,V1,V2,V3,..,Vn where successively higer registers are</div><div class='add'>+ * target bus as R,V1,V2,V3,..,Vn where successively higher registers are</div><div class='ctx'>  * addressed. However, this alternative block multi write mode will send</div><div class='ctx'>  * the data as R1,V1,R2,V2,..,Rn,Vn on the target bus. The target device</div><div class='ctx'>  * must of course support the mode.</div><div class='hunk'>@@ -2208,16 +2212,17 @@ int regmap_multi_reg_write(struct regmap *map, const struct reg_sequence *regs,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_multi_reg_write);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * regmap_multi_reg_write_bypassed(): Write multiple registers to the</div><div class='del'>- *                                    device but not the cache</div><div class='del'>- *</div><div class='del'>- * where the set of register are supplied in any order</div><div class='add'>+/**</div><div class='add'>+ * regmap_multi_reg_write_bypassed() - Write multiple registers to the</div><div class='add'>+ *                                     device but not the cache</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to write to</div><div class='ctx'>  * @regs: Array of structures containing register,value to be written</div><div class='ctx'>  * @num_regs: Number of registers to write</div><div class='ctx'>  *</div><div class='add'>+ * Write multiple registers to the device but not the cache where the set</div><div class='add'>+ * of register are supplied in any order.</div><div class='add'>+ *</div><div class='ctx'>  * This function is intended to be used for writing a large block of data</div><div class='ctx'>  * atomically to the device in single transfer for those I2C client devices</div><div class='ctx'>  * that implement this alternative block write mode.</div><div class='hunk'>@@ -2248,8 +2253,8 @@ int regmap_multi_reg_write_bypassed(struct regmap *map,</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_multi_reg_write_bypassed);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_raw_write_async(): Write raw values to one or more registers</div><div class='del'>- *                           asynchronously</div><div class='add'>+ * regmap_raw_write_async() - Write raw values to one or more registers</div><div class='add'>+ *                            asynchronously</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to write to</div><div class='ctx'>  * @reg: Initial register to write to</div><div class='hunk'>@@ -2385,7 +2390,7 @@ static int _regmap_read(struct regmap *map, unsigned int reg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_read(): Read a value from a single register</div><div class='add'>+ * regmap_read() - Read a value from a single register</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to read from</div><div class='ctx'>  * @reg: Register to be read from</div><div class='hunk'>@@ -2412,7 +2417,7 @@ int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_read);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_raw_read(): Read raw data from the device</div><div class='add'>+ * regmap_raw_read() - Read raw data from the device</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to read from</div><div class='ctx'>  * @reg: First register to be read from</div><div class='hunk'>@@ -2477,7 +2482,7 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, void *val,</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_raw_read);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_field_read(): Read a value to a single register field</div><div class='add'>+ * regmap_field_read() - Read a value to a single register field</div><div class='ctx'>  *</div><div class='ctx'>  * @field: Register field to read from</div><div class='ctx'>  * @val: Pointer to store read value</div><div class='hunk'>@@ -2502,7 +2507,7 @@ int regmap_field_read(struct regmap_field *field, unsigned int *val)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_field_read);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_fields_read(): Read a value to a single register field with port ID</div><div class='add'>+ * regmap_fields_read() - Read a value to a single register field with port ID</div><div class='ctx'>  *</div><div class='ctx'>  * @field: Register field to read from</div><div class='ctx'>  * @id: port ID</div><div class='hunk'>@@ -2535,7 +2540,7 @@ int regmap_fields_read(struct regmap_field *field, unsigned int id,</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_fields_read);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_bulk_read(): Read multiple registers from the device</div><div class='add'>+ * regmap_bulk_read() - Read multiple registers from the device</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to read from</div><div class='ctx'>  * @reg: First register to be read from</div><div class='hunk'>@@ -2692,9 +2697,7 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_update_bits_base:</div><div class='del'>- *	Perform a read/modify/write cycle on the</div><div class='del'>- *	register map with change, async, force option</div><div class='add'>+ * regmap_update_bits_base() - Perform a read/modify/write cycle on a register</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to update</div><div class='ctx'>  * @reg: Register to update</div><div class='hunk'>@@ -2704,10 +2707,14 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg,</div><div class='ctx'>  * @async: Boolean indicating asynchronously</div><div class='ctx'>  * @force: Boolean indicating use force update</div><div class='ctx'>  *</div><div class='del'>- * if async was true,</div><div class='del'>- * With most buses the read must be done synchronously so this is most</div><div class='del'>- * useful for devices with a cache which do not need to interact with</div><div class='del'>- * the hardware to determine the current register value.</div><div class='add'>+ * Perform a read/modify/write cycle on a register map with change, async, force</div><div class='add'>+ * options.</div><div class='add'>+ *</div><div class='add'>+ * If async is true:</div><div class='add'>+ *</div><div class='add'>+ * With most buses the read must be done synchronously so this is most useful</div><div class='add'>+ * for devices with a cache which do not need to interact with the hardware to</div><div class='add'>+ * determine the current register value.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero for success, a negative number on error.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2765,7 +2772,7 @@ static int regmap_async_is_done(struct regmap *map)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_async_complete: Ensure all asynchronous I/O has completed.</div><div class='add'>+ * regmap_async_complete - Ensure all asynchronous I/O has completed.</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Map to operate on.</div><div class='ctx'>  *</div><div class='hunk'>@@ -2797,8 +2804,8 @@ int regmap_async_complete(struct regmap *map)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_async_complete);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_register_patch: Register and apply register updates to be applied</div><div class='del'>- *                        on device initialistion</div><div class='add'>+ * regmap_register_patch - Register and apply register updates to be applied</div><div class='add'>+ *                         on device initialistion</div><div class='ctx'>  *</div><div class='ctx'>  * @map: Register map to apply updates to.</div><div class='ctx'>  * @regs: Values to update.</div><div class='hunk'>@@ -2855,8 +2862,10 @@ int regmap_register_patch(struct regmap *map, const struct reg_sequence *regs,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_register_patch);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * regmap_get_val_bytes(): Report the size of a register value</div><div class='add'>+/**</div><div class='add'>+ * regmap_get_val_bytes() - Report the size of a register value</div><div class='add'>+ *</div><div class='add'>+ * @map: Register map to operate on.</div><div class='ctx'>  *</div><div class='ctx'>  * Report the size of a register value, mainly intended to for use by</div><div class='ctx'>  * generic infrastructure built on top of regmap.</div><div class='hunk'>@@ -2871,7 +2880,9 @@ int regmap_get_val_bytes(struct regmap *map)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_get_val_bytes);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_get_max_register(): Report the max register value</div><div class='add'>+ * regmap_get_max_register() - Report the max register value</div><div class='add'>+ *</div><div class='add'>+ * @map: Register map to operate on.</div><div class='ctx'>  *</div><div class='ctx'>  * Report the max register value, mainly intended to for use by</div><div class='ctx'>  * generic infrastructure built on top of regmap.</div><div class='hunk'>@@ -2883,7 +2894,9 @@ int regmap_get_max_register(struct regmap *map)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_get_max_register);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * regmap_get_reg_stride(): Report the register address stride</div><div class='add'>+ * regmap_get_reg_stride() - Report the register address stride</div><div class='add'>+ *</div><div class='add'>+ * @map: Register map to operate on.</div><div class='ctx'>  *</div><div class='ctx'>  * Report the register address stride, mainly intended to for use by</div><div class='ctx'>  * generic infrastructure built on top of regmap.</div><div class='head'>diff --git a/drivers/base/soc.c b/drivers/base/soc.c<br/>index b63f23e6ad61..dc26e5949a32 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/soc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/soc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/soc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/soc.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/sys_soc.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/glob.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_IDA(soc_ida);</div><div class='ctx'> </div><div class='hunk'>@@ -113,6 +114,12 @@ struct soc_device *soc_device_register(struct soc_device_attribute *soc_dev_attr</div><div class='ctx'> 	struct soc_device *soc_dev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (!soc_bus_type.p) {</div><div class='add'>+		ret = bus_register(&amp;soc_bus_type);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	soc_dev = kzalloc(sizeof(*soc_dev), GFP_KERNEL);</div><div class='ctx'> 	if (!soc_dev) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -156,6 +163,78 @@ void soc_device_unregister(struct soc_device *soc_dev)</div><div class='ctx'> </div><div class='ctx'> static int __init soc_bus_register(void)</div><div class='ctx'> {</div><div class='add'>+	if (soc_bus_type.p)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	return bus_register(&amp;soc_bus_type);</div><div class='ctx'> }</div><div class='ctx'> core_initcall(soc_bus_register);</div><div class='add'>+</div><div class='add'>+static int soc_device_match_one(struct device *dev, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct soc_device *soc_dev = container_of(dev, struct soc_device, dev);</div><div class='add'>+	const struct soc_device_attribute *match = arg;</div><div class='add'>+</div><div class='add'>+	if (match-&gt;machine &amp;&amp;</div><div class='add'>+	    (!soc_dev-&gt;attr-&gt;machine ||</div><div class='add'>+	     !glob_match(match-&gt;machine, soc_dev-&gt;attr-&gt;machine)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (match-&gt;family &amp;&amp;</div><div class='add'>+	    (!soc_dev-&gt;attr-&gt;family ||</div><div class='add'>+	     !glob_match(match-&gt;family, soc_dev-&gt;attr-&gt;family)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (match-&gt;revision &amp;&amp;</div><div class='add'>+	    (!soc_dev-&gt;attr-&gt;revision ||</div><div class='add'>+	     !glob_match(match-&gt;revision, soc_dev-&gt;attr-&gt;revision)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (match-&gt;soc_id &amp;&amp;</div><div class='add'>+	    (!soc_dev-&gt;attr-&gt;soc_id ||</div><div class='add'>+	     !glob_match(match-&gt;soc_id, soc_dev-&gt;attr-&gt;soc_id)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * soc_device_match - identify the SoC in the machine</div><div class='add'>+ * @matches: zero-terminated array of possible matches</div><div class='add'>+ *</div><div class='add'>+ * returns the first matching entry of the argument array, or NULL</div><div class='add'>+ * if none of them match.</div><div class='add'>+ *</div><div class='add'>+ * This function is meant as a helper in place of of_match_node()</div><div class='add'>+ * in cases where either no device tree is available or the information</div><div class='add'>+ * in a device node is insufficient to identify a particular variant</div><div class='add'>+ * by its compatible strings or other properties. For new devices,</div><div class='add'>+ * the DT binding should always provide unique compatible strings</div><div class='add'>+ * that allow the use of of_match_node() instead.</div><div class='add'>+ *</div><div class='add'>+ * The calling function can use the .data entry of the</div><div class='add'>+ * soc_device_attribute to pass a structure or function pointer for</div><div class='add'>+ * each entry.</div><div class='add'>+ */</div><div class='add'>+const struct soc_device_attribute *soc_device_match(</div><div class='add'>+	const struct soc_device_attribute *matches)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!matches)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	while (!ret) {</div><div class='add'>+		if (!(matches-&gt;machine || matches-&gt;family ||</div><div class='add'>+		      matches-&gt;revision || matches-&gt;soc_id))</div><div class='add'>+			break;</div><div class='add'>+		ret = bus_for_each_dev(&amp;soc_bus_type, NULL, (void *)matches,</div><div class='add'>+				       soc_device_match_one);</div><div class='add'>+		if (!ret)</div><div class='add'>+			matches++;</div><div class='add'>+		else</div><div class='add'>+			return matches;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(soc_device_match);</div><div class='head'>diff --git a/drivers/base/test/Kconfig b/drivers/base/test/Kconfig<br/>new file mode 100644<br/>index 000000000000..9aa0d45a60db<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/base/test/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/test/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+config TEST_ASYNC_DRIVER_PROBE</div><div class='add'>+	tristate "Build kernel module to test asynchronous driver probing"</div><div class='add'>+	depends on m</div><div class='add'>+	help</div><div class='add'>+	  Enabling this option produces a kernel module that allows</div><div class='add'>+	  testing asynchronous driver probing by the device core.</div><div class='add'>+	  The module name will be test_async_driver_probe.ko</div><div class='add'>+</div><div class='add'>+	  If unsure say N.</div><div class='head'>diff --git a/drivers/base/test/Makefile b/drivers/base/test/Makefile<br/>new file mode 100644<br/>index 000000000000..90477c5fd9f9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/base/test/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/test/Makefile</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+obj-$(CONFIG_TEST_ASYNC_DRIVER_PROBE)	+= test_async_driver_probe.o</div><div class='head'>diff --git a/drivers/base/test/test_async_driver_probe.c b/drivers/base/test/test_async_driver_probe.c<br/>new file mode 100644<br/>index 000000000000..304d5c2bd5e9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/base/test/test_async_driver_probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/test/test_async_driver_probe.c</a></div><div class='hunk'>@@ -0,0 +1,169 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2014 Google, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+</div><div class='add'>+#define TEST_PROBE_DELAY	(5 * 1000)	/* 5 sec */</div><div class='add'>+#define TEST_PROBE_THRESHOLD	(TEST_PROBE_DELAY / 2)</div><div class='add'>+</div><div class='add'>+static int test_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "sleeping for %d msecs in probe\n",</div><div class='add'>+		 TEST_PROBE_DELAY);</div><div class='add'>+	msleep(TEST_PROBE_DELAY);</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "done sleeping\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver async_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "test_async_driver",</div><div class='add'>+		.probe_type = PROBE_PREFER_ASYNCHRONOUS,</div><div class='add'>+	},</div><div class='add'>+	.probe = test_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver sync_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "test_sync_driver",</div><div class='add'>+		.probe_type = PROBE_FORCE_SYNCHRONOUS,</div><div class='add'>+	},</div><div class='add'>+	.probe = test_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *async_dev_1, *async_dev_2;</div><div class='add'>+static struct platform_device *sync_dev_1;</div><div class='add'>+</div><div class='add'>+static int __init test_async_probe_init(void)</div><div class='add'>+{</div><div class='add'>+	ktime_t calltime, delta;</div><div class='add'>+	unsigned long long duration;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	pr_info("registering first asynchronous device...\n");</div><div class='add'>+</div><div class='add'>+	async_dev_1 = platform_device_register_simple("test_async_driver", 1,</div><div class='add'>+						      NULL, 0);</div><div class='add'>+	if (IS_ERR(async_dev_1)) {</div><div class='add'>+		error = PTR_ERR(async_dev_1);</div><div class='add'>+		pr_err("failed to create async_dev_1: %d", error);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("registering asynchronous driver...\n");</div><div class='add'>+	calltime = ktime_get();</div><div class='add'>+	error = platform_driver_register(&amp;async_driver);</div><div class='add'>+	if (error) {</div><div class='add'>+		pr_err("Failed to register async_driver: %d\n", error);</div><div class='add'>+		goto err_unregister_async_dev_1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delta = ktime_sub(ktime_get(), calltime);</div><div class='add'>+	duration = (unsigned long long) ktime_to_ms(delta);</div><div class='add'>+	pr_info("registration took %lld msecs\n", duration);</div><div class='add'>+	if (duration &gt; TEST_PROBE_THRESHOLD) {</div><div class='add'>+		pr_err("test failed: probe took too long\n");</div><div class='add'>+		error = -ETIMEDOUT;</div><div class='add'>+		goto err_unregister_async_driver;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("registering second asynchronous device...\n");</div><div class='add'>+	calltime = ktime_get();</div><div class='add'>+	async_dev_2 = platform_device_register_simple("test_async_driver", 2,</div><div class='add'>+						      NULL, 0);</div><div class='add'>+	if (IS_ERR(async_dev_2)) {</div><div class='add'>+		error = PTR_ERR(async_dev_2);</div><div class='add'>+		pr_err("failed to create async_dev_2: %d", error);</div><div class='add'>+		goto err_unregister_async_driver;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delta = ktime_sub(ktime_get(), calltime);</div><div class='add'>+	duration = (unsigned long long) ktime_to_ms(delta);</div><div class='add'>+	pr_info("registration took %lld msecs\n", duration);</div><div class='add'>+	if (duration &gt; TEST_PROBE_THRESHOLD) {</div><div class='add'>+		pr_err("test failed: probe took too long\n");</div><div class='add'>+		error = -ETIMEDOUT;</div><div class='add'>+		goto err_unregister_async_dev_2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("registering synchronous driver...\n");</div><div class='add'>+</div><div class='add'>+	error = platform_driver_register(&amp;sync_driver);</div><div class='add'>+	if (error) {</div><div class='add'>+		pr_err("Failed to register async_driver: %d\n", error);</div><div class='add'>+		goto err_unregister_async_dev_2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("registering synchronous device...\n");</div><div class='add'>+	calltime = ktime_get();</div><div class='add'>+	sync_dev_1 = platform_device_register_simple("test_sync_driver", 1,</div><div class='add'>+						     NULL, 0);</div><div class='add'>+	if (IS_ERR(sync_dev_1)) {</div><div class='add'>+		error = PTR_ERR(sync_dev_1);</div><div class='add'>+		pr_err("failed to create sync_dev_1: %d", error);</div><div class='add'>+		goto err_unregister_sync_driver;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delta = ktime_sub(ktime_get(), calltime);</div><div class='add'>+	duration = (unsigned long long) ktime_to_ms(delta);</div><div class='add'>+	pr_info("registration took %lld msecs\n", duration);</div><div class='add'>+	if (duration &lt; TEST_PROBE_THRESHOLD) {</div><div class='add'>+		pr_err("test failed: probe was too quick\n");</div><div class='add'>+		error = -ETIMEDOUT;</div><div class='add'>+		goto err_unregister_sync_dev_1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("completed successfully");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unregister_sync_dev_1:</div><div class='add'>+	platform_device_unregister(sync_dev_1);</div><div class='add'>+</div><div class='add'>+err_unregister_sync_driver:</div><div class='add'>+	platform_driver_unregister(&amp;sync_driver);</div><div class='add'>+</div><div class='add'>+err_unregister_async_dev_2:</div><div class='add'>+	platform_device_unregister(async_dev_2);</div><div class='add'>+</div><div class='add'>+err_unregister_async_driver:</div><div class='add'>+	platform_driver_unregister(&amp;async_driver);</div><div class='add'>+</div><div class='add'>+err_unregister_async_dev_1:</div><div class='add'>+	platform_device_unregister(async_dev_1);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+module_init(test_async_probe_init);</div><div class='add'>+</div><div class='add'>+static void __exit test_async_probe_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;async_driver);</div><div class='add'>+	platform_driver_unregister(&amp;sync_driver);</div><div class='add'>+	platform_device_unregister(async_dev_1);</div><div class='add'>+	platform_device_unregister(async_dev_2);</div><div class='add'>+	platform_device_unregister(sync_dev_1);</div><div class='add'>+}</div><div class='add'>+module_exit(test_async_probe_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Test module for asynchronous driver probing");</div><div class='add'>+MODULE_AUTHOR("Dmitry Torokhov &lt;dtor@chromium.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/base/topology.c b/drivers/base/topology.c<br/>index df3c97cb4c99..d6ec1c546f5b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/base/topology.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/base/topology.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/base/topology.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/base/topology.c</a></div><div class='hunk'>@@ -118,51 +118,19 @@ static int topology_add_dev(unsigned int cpu)</div><div class='ctx'> 	return sysfs_create_group(&amp;dev-&gt;kobj, &amp;topology_attr_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void topology_remove_dev(unsigned int cpu)</div><div class='add'>+static int topology_remove_dev(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = get_cpu_device(cpu);</div><div class='ctx'> </div><div class='ctx'> 	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;topology_attr_group);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int topology_cpu_callback(struct notifier_block *nfb,</div><div class='del'>-				 unsigned long action, void *hcpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_UP_PREPARE:</div><div class='del'>-	case CPU_UP_PREPARE_FROZEN:</div><div class='del'>-		rc = topology_add_dev(cpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_UP_CANCELED:</div><div class='del'>-	case CPU_UP_CANCELED_FROZEN:</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-	case CPU_DEAD_FROZEN:</div><div class='del'>-		topology_remove_dev(cpu);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return notifier_from_errno(rc);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int topology_sysfs_init(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-</div><div class='del'>-	for_each_online_cpu(cpu) {</div><div class='del'>-		rc = topology_add_dev(cpu);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-	__hotcpu_notifier(topology_cpu_callback, 0);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-	return rc;</div><div class='add'>+	return cpuhp_setup_state(CPUHP_TOPOLOGY_PREPARE,</div><div class='add'>+				 "base/topology:prepare", topology_add_dev,</div><div class='add'>+				 topology_remove_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> device_initcall(topology_sysfs_init);</div><div class='head'>diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h<br/>index f642c4264c27..168fa175d65a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bcma/bcma_private.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bcma/bcma_private.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bcma/bcma_private.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bcma/bcma_private.h</a></div><div class='hunk'>@@ -45,6 +45,9 @@ int bcma_sprom_get(struct bcma_bus *bus);</div><div class='ctx'> void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc);</div><div class='ctx'> void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);</div><div class='ctx'> void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);</div><div class='add'>+#ifdef CONFIG_BCMA_DRIVER_MIPS</div><div class='add'>+void bcma_chipco_serial_init(struct bcma_drv_cc *cc);</div><div class='add'>+#endif /* CONFIG_BCMA_DRIVER_MIPS */</div><div class='ctx'> </div><div class='ctx'> /* driver_chipcommon_b.c */</div><div class='ctx'> int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);</div><div class='head'>diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c<br/>index b4f6520e74f0..62f5bfa5065d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bcma/driver_chipcommon.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bcma/driver_chipcommon.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bcma/driver_chipcommon.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bcma/driver_chipcommon.c</a></div><div class='hunk'>@@ -15,8 +15,6 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/bcma/bcma.h&gt;</div><div class='ctx'> </div><div class='del'>-static void bcma_chipco_serial_init(struct bcma_drv_cc *cc);</div><div class='del'>-</div><div class='ctx'> static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,</div><div class='ctx'> 					 u32 mask, u32 value)</div><div class='ctx'> {</div><div class='hunk'>@@ -186,9 +184,6 @@ void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)</div><div class='ctx'> 	if (cc-&gt;capabilities &amp; BCMA_CC_CAP_PMU)</div><div class='ctx'> 		bcma_pmu_early_init(cc);</div><div class='ctx'> </div><div class='del'>-	if (IS_BUILTIN(CONFIG_BCM47XX) &amp;&amp; bus-&gt;hosttype == BCMA_HOSTTYPE_SOC)</div><div class='del'>-		bcma_chipco_serial_init(cc);</div><div class='del'>-</div><div class='ctx'> 	if (bus-&gt;hosttype == BCMA_HOSTTYPE_SOC)</div><div class='ctx'> 		bcma_core_chipcommon_flash_detect(cc);</div><div class='ctx'> </div><div class='hunk'>@@ -378,9 +373,9 @@ u32 bcma_chipco_gpio_pulldown(struct bcma_drv_cc *cc, u32 mask, u32 value)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcma_chipco_serial_init(struct bcma_drv_cc *cc)</div><div class='add'>+#ifdef CONFIG_BCMA_DRIVER_MIPS</div><div class='add'>+void bcma_chipco_serial_init(struct bcma_drv_cc *cc)</div><div class='ctx'> {</div><div class='del'>-#if IS_BUILTIN(CONFIG_BCM47XX)</div><div class='ctx'> 	unsigned int irq;</div><div class='ctx'> 	u32 baud_base;</div><div class='ctx'> 	u32 i;</div><div class='hunk'>@@ -422,5 +417,5 @@ static void bcma_chipco_serial_init(struct bcma_drv_cc *cc)</div><div class='ctx'> 		ports[i].baud_base = baud_base;</div><div class='ctx'> 		ports[i].reg_shift = 0;</div><div class='ctx'> 	}</div><div class='del'>-#endif /* CONFIG_BCM47XX */</div><div class='ctx'> }</div><div class='add'>+#endif /* CONFIG_BCMA_DRIVER_MIPS */</div><div class='head'>diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c<br/>index 96f171328200..89af807cf29c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bcma/driver_mips.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bcma/driver_mips.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bcma/driver_mips.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bcma/driver_mips.c</a></div><div class='hunk'>@@ -278,9 +278,12 @@ static void bcma_core_mips_nvram_init(struct bcma_drv_mips *mcore)</div><div class='ctx'> </div><div class='ctx'> void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)</div><div class='ctx'> {</div><div class='add'>+	struct bcma_bus *bus = mcore-&gt;core-&gt;bus;</div><div class='add'>+</div><div class='ctx'> 	if (mcore-&gt;early_setup_done)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	bcma_chipco_serial_init(&amp;bus-&gt;drv_cc);</div><div class='ctx'> 	bcma_core_mips_nvram_init(mcore);</div><div class='ctx'> </div><div class='ctx'> 	mcore-&gt;early_setup_done = true;</div><div class='head'>diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c<br/>index bd46569e0e52..925842996986 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bcma/host_pci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bcma/host_pci.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bcma/host_pci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bcma/host_pci.c</a></div><div class='hunk'>@@ -295,6 +295,7 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4360) },</div><div class='ctx'> 	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_DELL, 0x0016) },</div><div class='add'>+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_DELL, 0x0018) },</div><div class='ctx'> 	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_FOXCONN, 0xe092) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a0) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },</div><div class='head'>diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c<br/>index 2c1798e38abd..12da68ec48ba 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bcma/main.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bcma/main.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bcma/main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bcma/main.c</a></div><div class='hunk'>@@ -136,17 +136,17 @@ static bool bcma_is_core_needed_early(u16 core_id)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device_node *bcma_of_find_child_device(struct platform_device *parent,</div><div class='add'>+static struct device_node *bcma_of_find_child_device(struct device *parent,</div><div class='ctx'> 						     struct bcma_device *core)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *node;</div><div class='ctx'> 	u64 size;</div><div class='ctx'> 	const __be32 *reg;</div><div class='ctx'> </div><div class='del'>-	if (!parent || !parent-&gt;dev.of_node)</div><div class='add'>+	if (!parent-&gt;of_node)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	for_each_child_of_node(parent-&gt;dev.of_node, node) {</div><div class='add'>+	for_each_child_of_node(parent-&gt;of_node, node) {</div><div class='ctx'> 		reg = of_get_address(node, 0, &amp;size, NULL);</div><div class='ctx'> 		if (!reg)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -156,7 +156,7 @@ static struct device_node *bcma_of_find_child_device(struct platform_device *par</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcma_of_irq_parse(struct platform_device *parent,</div><div class='add'>+static int bcma_of_irq_parse(struct device *parent,</div><div class='ctx'> 			     struct bcma_device *core,</div><div class='ctx'> 			     struct of_phandle_args *out_irq, int num)</div><div class='ctx'> {</div><div class='hunk'>@@ -169,7 +169,7 @@ static int bcma_of_irq_parse(struct platform_device *parent,</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	out_irq-&gt;np = parent-&gt;dev.of_node;</div><div class='add'>+	out_irq-&gt;np = parent-&gt;of_node;</div><div class='ctx'> 	out_irq-&gt;args_count = 1;</div><div class='ctx'> 	out_irq-&gt;args[0] = num;</div><div class='ctx'> </div><div class='hunk'>@@ -177,13 +177,13 @@ static int bcma_of_irq_parse(struct platform_device *parent,</div><div class='ctx'> 	return of_irq_parse_raw(laddr, out_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int bcma_of_get_irq(struct platform_device *parent,</div><div class='add'>+static unsigned int bcma_of_get_irq(struct device *parent,</div><div class='ctx'> 				    struct bcma_device *core, int num)</div><div class='ctx'> {</div><div class='ctx'> 	struct of_phandle_args out_irq;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ENABLED(CONFIG_OF_IRQ) || !parent || !parent-&gt;dev.of_node)</div><div class='add'>+	if (!IS_ENABLED(CONFIG_OF_IRQ) || !parent-&gt;of_node)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = bcma_of_irq_parse(parent, core, &amp;out_irq, num);</div><div class='hunk'>@@ -196,7 +196,7 @@ static unsigned int bcma_of_get_irq(struct platform_device *parent,</div><div class='ctx'> 	return irq_create_of_mapping(&amp;out_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcma_of_fill_device(struct platform_device *parent,</div><div class='add'>+static void bcma_of_fill_device(struct device *parent,</div><div class='ctx'> 				struct bcma_device *core)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *node;</div><div class='hunk'>@@ -227,7 +227,7 @@ unsigned int bcma_core_irq(struct bcma_device *core, int num)</div><div class='ctx'> 			return mips_irq &lt;= 4 ? mips_irq + 2 : 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (bus-&gt;host_pdev)</div><div class='del'>-			return bcma_of_get_irq(bus-&gt;host_pdev, core, num);</div><div class='add'>+			return bcma_of_get_irq(&amp;bus-&gt;host_pdev-&gt;dev, core, num);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case BCMA_HOSTTYPE_SDIO:</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -253,7 +253,8 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)</div><div class='ctx'> 		if (IS_ENABLED(CONFIG_OF) &amp;&amp; bus-&gt;host_pdev) {</div><div class='ctx'> 			core-&gt;dma_dev = &amp;bus-&gt;host_pdev-&gt;dev;</div><div class='ctx'> 			core-&gt;dev.parent = &amp;bus-&gt;host_pdev-&gt;dev;</div><div class='del'>-			bcma_of_fill_device(bus-&gt;host_pdev, core);</div><div class='add'>+			if (core-&gt;dev.parent)</div><div class='add'>+				bcma_of_fill_device(core-&gt;dev.parent, core);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			core-&gt;dev.dma_mask = &amp;core-&gt;dev.coherent_dma_mask;</div><div class='ctx'> 			core-&gt;dma_dev = &amp;core-&gt;dev;</div><div class='hunk'>@@ -633,8 +634,11 @@ static int bcma_device_probe(struct device *dev)</div><div class='ctx'> 					       drv);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	get_device(dev);</div><div class='ctx'> 	if (adrv-&gt;probe)</div><div class='ctx'> 		err = adrv-&gt;probe(core);</div><div class='add'>+	if (err)</div><div class='add'>+		put_device(dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -647,6 +651,7 @@ static int bcma_device_remove(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (adrv-&gt;remove)</div><div class='ctx'> 		adrv-&gt;remove(core);</div><div class='add'>+	put_device(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c<br/>index 0809cda93cc0..26a51be77227 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/DAC960.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/DAC960.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/DAC960.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/DAC960.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include "DAC960.h"</div><div class='ctx'> </div><div class='ctx'> #define DAC960_GAM_MINOR	252</div><div class='head'>diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig<br/>index 39dd30b6ef86..f744de7a0f9b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/Kconfig</a></div><div class='hunk'>@@ -69,6 +69,7 @@ config AMIGA_Z2RAM</div><div class='ctx'> config GDROM</div><div class='ctx'> 	tristate "SEGA Dreamcast GD-ROM drive"</div><div class='ctx'> 	depends on SH_DREAMCAST</div><div class='add'>+	select BLK_SCSI_REQUEST # only for the generic cdrom code</div><div class='ctx'> 	help</div><div class='ctx'> 	  A standard SEGA Dreamcast comes with a modified CD ROM drive called a</div><div class='ctx'> 	  "GD-ROM" by SEGA to signify it is capable of reading special disks</div><div class='hunk'>@@ -114,6 +115,7 @@ config BLK_CPQ_CISS_DA</div><div class='ctx'> 	tristate "Compaq Smart Array 5xxx support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CHECK_SIGNATURE</div><div class='add'>+	select BLK_SCSI_REQUEST</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is the driver for Compaq Smart Array 5xxx controllers.</div><div class='ctx'> 	  Everyone using these boards should say Y here.</div><div class='hunk'>@@ -384,9 +386,13 @@ config BLK_DEV_RAM_DAX</div><div class='ctx'> 	  allocated from highmem (only a problem for highmem systems).</div><div class='ctx'> </div><div class='ctx'> config CDROM_PKTCDVD</div><div class='del'>-	tristate "Packet writing on CD/DVD media"</div><div class='add'>+	tristate "Packet writing on CD/DVD media (DEPRECATED)"</div><div class='ctx'> 	depends on !UML</div><div class='add'>+	select BLK_SCSI_REQUEST</div><div class='ctx'> 	help</div><div class='add'>+	  Note: This driver is deprecated and will be removed from the</div><div class='add'>+	  kernel in the near future!</div><div class='add'>+</div><div class='ctx'> 	  If you have a CDROM/DVD drive that supports packet writing, say</div><div class='ctx'> 	  Y to include support. It should work with any MMC/Mt Fuji</div><div class='ctx'> 	  compliant ATAPI or SCSI drive, which is just about any newer</div><div class='hunk'>@@ -498,6 +504,16 @@ config VIRTIO_BLK</div><div class='ctx'> 	  This is the virtual block driver for virtio.  It can be used with</div><div class='ctx'>           lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.</div><div class='ctx'> </div><div class='add'>+config VIRTIO_BLK_SCSI</div><div class='add'>+	bool "SCSI passthrough request for the Virtio block driver"</div><div class='add'>+	depends on VIRTIO_BLK</div><div class='add'>+	select BLK_SCSI_REQUEST</div><div class='add'>+	---help---</div><div class='add'>+	  Enable support for SCSI passthrough (e.g. the SG_IO ioctl) on</div><div class='add'>+	  virtio-blk devices.  This is only supported for the legacy</div><div class='add'>+	  virtio protocol and not enabled by default by any hypervisor.</div><div class='add'>+	  Your probably want to virtio-scsi instead.</div><div class='add'>+</div><div class='ctx'> config BLK_DEV_HD</div><div class='ctx'> 	bool "Very old hard disk (MFM/RLL/IDE) driver"</div><div class='ctx'> 	depends on HAVE_IDE</div><div class='head'>diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c<br/>index 5fd50a284168..a328f673adfe 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/amiflop.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/amiflop.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/amiflop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/amiflop.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/amigahw.h&gt;</div><div class='ctx'> #include &lt;asm/amigaints.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c<br/>index ec9d8610b25f..027b876370bc 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/aoe/aoeblk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/aoe/aoeblk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/aoe/aoeblk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/aoe/aoeblk.c</a></div><div class='hunk'>@@ -396,8 +396,8 @@ aoeblk_gdalloc(void *vp)</div><div class='ctx'> 	WARN_ON(d-&gt;gd);</div><div class='ctx'> 	WARN_ON(d-&gt;flags &amp; DEVFL_UP);</div><div class='ctx'> 	blk_queue_max_hw_sectors(q, BLK_DEF_MAX_SECTORS);</div><div class='del'>-	q-&gt;backing_dev_info.name = "aoe";</div><div class='del'>-	q-&gt;backing_dev_info.ra_pages = READ_AHEAD / PAGE_SIZE;</div><div class='add'>+	q-&gt;backing_dev_info-&gt;name = "aoe";</div><div class='add'>+	q-&gt;backing_dev_info-&gt;ra_pages = READ_AHEAD / PAGE_SIZE;</div><div class='ctx'> 	d-&gt;bufpool = mp;</div><div class='ctx'> 	d-&gt;blkq = gd-&gt;queue = q;</div><div class='ctx'> 	q-&gt;queuedata = d;</div><div class='head'>diff --git a/drivers/block/brd.c b/drivers/block/brd.c<br/>index 0c76d4016eeb..3adc32a3153b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/brd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/brd.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/brd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/brd.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/pfn_t.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SECTOR_SHIFT		9</div><div class='ctx'> #define PAGE_SECTORS_SHIFT	(PAGE_SHIFT - SECTOR_SHIFT)</div><div class='hunk'>@@ -395,44 +395,9 @@ static long brd_direct_access(struct block_device *bdev, sector_t sector,</div><div class='ctx'> #define brd_direct_access NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int brd_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='del'>-			unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-	struct brd_device *brd = bdev-&gt;bd_disk-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (cmd != BLKFLSBUF)</div><div class='del'>-		return -ENOTTY;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * ram device BLKFLSBUF has special semantics, we want to actually</div><div class='del'>-	 * release and destroy the ramdisk data.</div><div class='del'>-	 */</div><div class='del'>-	mutex_lock(&amp;brd_mutex);</div><div class='del'>-	mutex_lock(&amp;bdev-&gt;bd_mutex);</div><div class='del'>-	error = -EBUSY;</div><div class='del'>-	if (bdev-&gt;bd_openers &lt;= 1) {</div><div class='del'>-		/*</div><div class='del'>-		 * Kill the cache first, so it isn't written back to the</div><div class='del'>-		 * device.</div><div class='del'>-		 *</div><div class='del'>-		 * Another thread might instantiate more buffercache here,</div><div class='del'>-		 * but there is not much we can do to close that race.</div><div class='del'>-		 */</div><div class='del'>-		kill_bdev(bdev);</div><div class='del'>-		brd_free_pages(brd);</div><div class='del'>-		error = 0;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;bdev-&gt;bd_mutex);</div><div class='del'>-	mutex_unlock(&amp;brd_mutex);</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct block_device_operations brd_fops = {</div><div class='ctx'> 	.owner =		THIS_MODULE,</div><div class='ctx'> 	.rw_page =		brd_rw_page,</div><div class='del'>-	.ioctl =		brd_ioctl,</div><div class='ctx'> 	.direct_access =	brd_direct_access,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -443,8 +408,8 @@ static int rd_nr = CONFIG_BLK_DEV_RAM_COUNT;</div><div class='ctx'> module_param(rd_nr, int, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(rd_nr, "Maximum number of brd devices");</div><div class='ctx'> </div><div class='del'>-int rd_size = CONFIG_BLK_DEV_RAM_SIZE;</div><div class='del'>-module_param(rd_size, int, S_IRUGO);</div><div class='add'>+unsigned long rd_size = CONFIG_BLK_DEV_RAM_SIZE;</div><div class='add'>+module_param(rd_size, ulong, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(rd_size, "Size of each RAM disk in kbytes.");</div><div class='ctx'> </div><div class='ctx'> static int max_part = 1;</div><div class='head'>diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c<br/>index db9d6bb6352d..8e1a4554951c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/cciss.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/cciss.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/cciss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/cciss.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/sg.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_ioctl.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='hunk'>@@ -347,7 +348,7 @@ static void cciss_unmap_sg_chain_block(ctlr_info_t *h, CommandList_struct *c)</div><div class='ctx'> 	pci_unmap_single(h-&gt;pdev, temp64.val, chain_sg-&gt;Len, PCI_DMA_TODEVICE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cciss_map_sg_chain_block(ctlr_info_t *h, CommandList_struct *c,</div><div class='add'>+static int cciss_map_sg_chain_block(ctlr_info_t *h, CommandList_struct *c,</div><div class='ctx'> 	SGDescriptor_struct *chain_block, int len)</div><div class='ctx'> {</div><div class='ctx'> 	SGDescriptor_struct *chain_sg;</div><div class='hunk'>@@ -358,8 +359,16 @@ static void cciss_map_sg_chain_block(ctlr_info_t *h, CommandList_struct *c,</div><div class='ctx'> 	chain_sg-&gt;Len = len;</div><div class='ctx'> 	temp64.val = pci_map_single(h-&gt;pdev, chain_block, len,</div><div class='ctx'> 				PCI_DMA_TODEVICE);</div><div class='add'>+	if (dma_mapping_error(&amp;h-&gt;pdev-&gt;dev, temp64.val)) {</div><div class='add'>+		dev_warn(&amp;h-&gt;pdev-&gt;dev,</div><div class='add'>+			"%s: error mapping chain block for DMA\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='ctx'> 	chain_sg-&gt;Addr.lower = temp64.val32.lower;</div><div class='ctx'> 	chain_sg-&gt;Addr.upper = temp64.val32.upper;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #include "cciss_scsi.c"		/* For SCSI tape support */</div><div class='hunk'>@@ -1853,8 +1862,8 @@ static void cciss_softirq_done(struct request *rq)</div><div class='ctx'> 	dev_dbg(&amp;h-&gt;pdev-&gt;dev, "Done with %p\n", rq);</div><div class='ctx'> </div><div class='ctx'> 	/* set the residual count for pc requests */</div><div class='del'>-	if (rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC)</div><div class='del'>-		rq-&gt;resid_len = c-&gt;err_info-&gt;ResidualCnt;</div><div class='add'>+	if (blk_rq_is_passthrough(rq))</div><div class='add'>+		scsi_req(rq)-&gt;resid_len = c-&gt;err_info-&gt;ResidualCnt;</div><div class='ctx'> </div><div class='ctx'> 	blk_end_request_all(rq, (rq-&gt;errors == 0) ? 0 : -EIO);</div><div class='ctx'> </div><div class='hunk'>@@ -1941,9 +1950,16 @@ static void cciss_get_serial_no(ctlr_info_t *h, int logvol,</div><div class='ctx'> static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,</div><div class='ctx'> 				int drv_index)</div><div class='ctx'> {</div><div class='del'>-	disk-&gt;queue = blk_init_queue(do_cciss_request, &amp;h-&gt;lock);</div><div class='add'>+	disk-&gt;queue = blk_alloc_queue(GFP_KERNEL);</div><div class='ctx'> 	if (!disk-&gt;queue)</div><div class='ctx'> 		goto init_queue_failure;</div><div class='add'>+</div><div class='add'>+	disk-&gt;queue-&gt;cmd_size = sizeof(struct scsi_request);</div><div class='add'>+	disk-&gt;queue-&gt;request_fn = do_cciss_request;</div><div class='add'>+	disk-&gt;queue-&gt;queue_lock = &amp;h-&gt;lock;</div><div class='add'>+	if (blk_init_allocated_queue(disk-&gt;queue) &lt; 0)</div><div class='add'>+		goto cleanup_queue;</div><div class='add'>+</div><div class='ctx'> 	sprintf(disk-&gt;disk_name, "cciss/c%dd%d", h-&gt;ctlr, drv_index);</div><div class='ctx'> 	disk-&gt;major = h-&gt;major;</div><div class='ctx'> 	disk-&gt;first_minor = drv_index &lt;&lt; NWD_SHIFT;</div><div class='hunk'>@@ -3075,7 +3091,7 @@ static inline int evaluate_target_status(ctlr_info_t *h,</div><div class='ctx'> 	driver_byte = DRIVER_OK;</div><div class='ctx'> 	msg_byte = cmd-&gt;err_info-&gt;CommandStatus; /* correct?  seems too device specific */</div><div class='ctx'> </div><div class='del'>-	if (cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC)</div><div class='add'>+	if (blk_rq_is_passthrough(cmd-&gt;rq))</div><div class='ctx'> 		host_byte = DID_PASSTHROUGH;</div><div class='ctx'> 	else</div><div class='ctx'> 		host_byte = DID_OK;</div><div class='hunk'>@@ -3084,7 +3100,7 @@ static inline int evaluate_target_status(ctlr_info_t *h,</div><div class='ctx'> 		host_byte, driver_byte);</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;err_info-&gt;ScsiStatus != SAM_STAT_CHECK_CONDITION) {</div><div class='del'>-		if (cmd-&gt;rq-&gt;cmd_type != REQ_TYPE_BLOCK_PC)</div><div class='add'>+		if (!blk_rq_is_passthrough(cmd-&gt;rq))</div><div class='ctx'> 			dev_warn(&amp;h-&gt;pdev-&gt;dev, "cmd %p "</div><div class='ctx'> 			       "has SCSI Status 0x%x\n",</div><div class='ctx'> 			       cmd, cmd-&gt;err_info-&gt;ScsiStatus);</div><div class='hunk'>@@ -3095,31 +3111,23 @@ static inline int evaluate_target_status(ctlr_info_t *h,</div><div class='ctx'> 	sense_key = 0xf &amp; cmd-&gt;err_info-&gt;SenseInfo[2];</div><div class='ctx'> 	/* no status or recovered error */</div><div class='ctx'> 	if (((sense_key == 0x0) || (sense_key == 0x1)) &amp;&amp;</div><div class='del'>-	    (cmd-&gt;rq-&gt;cmd_type != REQ_TYPE_BLOCK_PC))</div><div class='add'>+	    !blk_rq_is_passthrough(cmd-&gt;rq))</div><div class='ctx'> 		error_value = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (check_for_unit_attention(h, cmd)) {</div><div class='del'>-		*retry_cmd = !(cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC);</div><div class='add'>+		*retry_cmd = !blk_rq_is_passthrough(cmd-&gt;rq);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Not SG_IO or similar? */</div><div class='del'>-	if (cmd-&gt;rq-&gt;cmd_type != REQ_TYPE_BLOCK_PC) {</div><div class='add'>+	if (!blk_rq_is_passthrough(cmd-&gt;rq)) {</div><div class='ctx'> 		if (error_value != 0)</div><div class='ctx'> 			dev_warn(&amp;h-&gt;pdev-&gt;dev, "cmd %p has CHECK CONDITION"</div><div class='ctx'> 			       " sense key = 0x%x\n", cmd, sense_key);</div><div class='ctx'> 		return error_value;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* SG_IO or similar, copy sense data back */</div><div class='del'>-	if (cmd-&gt;rq-&gt;sense) {</div><div class='del'>-		if (cmd-&gt;rq-&gt;sense_len &gt; cmd-&gt;err_info-&gt;SenseLen)</div><div class='del'>-			cmd-&gt;rq-&gt;sense_len = cmd-&gt;err_info-&gt;SenseLen;</div><div class='del'>-		memcpy(cmd-&gt;rq-&gt;sense, cmd-&gt;err_info-&gt;SenseInfo,</div><div class='del'>-			cmd-&gt;rq-&gt;sense_len);</div><div class='del'>-	} else</div><div class='del'>-		cmd-&gt;rq-&gt;sense_len = 0;</div><div class='del'>-</div><div class='add'>+	scsi_req(cmd-&gt;rq)-&gt;sense_len = cmd-&gt;err_info-&gt;SenseLen;</div><div class='ctx'> 	return error_value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3146,15 +3154,14 @@ static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,</div><div class='ctx'> 		rq-&gt;errors = evaluate_target_status(h, cmd, &amp;retry_cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_DATA_UNDERRUN:</div><div class='del'>-		if (cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_FS) {</div><div class='add'>+		if (!blk_rq_is_passthrough(cmd-&gt;rq)) {</div><div class='ctx'> 			dev_warn(&amp;h-&gt;pdev-&gt;dev, "cmd %p has"</div><div class='ctx'> 			       " completed with data underrun "</div><div class='ctx'> 			       "reported\n", cmd);</div><div class='del'>-			cmd-&gt;rq-&gt;resid_len = cmd-&gt;err_info-&gt;ResidualCnt;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_DATA_OVERRUN:</div><div class='del'>-		if (cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_FS)</div><div class='add'>+		if (!blk_rq_is_passthrough(cmd-&gt;rq))</div><div class='ctx'> 			dev_warn(&amp;h-&gt;pdev-&gt;dev, "cciss: cmd %p has"</div><div class='ctx'> 			       " completed with data overrun "</div><div class='ctx'> 			       "reported\n", cmd);</div><div class='hunk'>@@ -3164,7 +3171,7 @@ static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,</div><div class='ctx'> 		       "reported invalid\n", cmd);</div><div class='ctx'> 		rq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='ctx'> 			cmd-&gt;err_info-&gt;CommandStatus, DRIVER_OK,</div><div class='del'>-			(cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) ?</div><div class='add'>+			blk_rq_is_passthrough(cmd-&gt;rq) ?</div><div class='ctx'> 				DID_PASSTHROUGH : DID_ERROR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_PROTOCOL_ERR:</div><div class='hunk'>@@ -3172,7 +3179,7 @@ static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,</div><div class='ctx'> 		       "protocol error\n", cmd);</div><div class='ctx'> 		rq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='ctx'> 			cmd-&gt;err_info-&gt;CommandStatus, DRIVER_OK,</div><div class='del'>-			(cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) ?</div><div class='add'>+			blk_rq_is_passthrough(cmd-&gt;rq) ?</div><div class='ctx'> 				DID_PASSTHROUGH : DID_ERROR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_HARDWARE_ERR:</div><div class='hunk'>@@ -3180,7 +3187,7 @@ static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,</div><div class='ctx'> 		       " hardware error\n", cmd);</div><div class='ctx'> 		rq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='ctx'> 			cmd-&gt;err_info-&gt;CommandStatus, DRIVER_OK,</div><div class='del'>-			(cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) ?</div><div class='add'>+			blk_rq_is_passthrough(cmd-&gt;rq) ?</div><div class='ctx'> 				DID_PASSTHROUGH : DID_ERROR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_CONNECTION_LOST:</div><div class='hunk'>@@ -3188,7 +3195,7 @@ static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,</div><div class='ctx'> 		       "connection lost\n", cmd);</div><div class='ctx'> 		rq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='ctx'> 			cmd-&gt;err_info-&gt;CommandStatus, DRIVER_OK,</div><div class='del'>-			(cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) ?</div><div class='add'>+			blk_rq_is_passthrough(cmd-&gt;rq) ?</div><div class='ctx'> 				DID_PASSTHROUGH : DID_ERROR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_ABORTED:</div><div class='hunk'>@@ -3196,7 +3203,7 @@ static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,</div><div class='ctx'> 		       "aborted\n", cmd);</div><div class='ctx'> 		rq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='ctx'> 			cmd-&gt;err_info-&gt;CommandStatus, DRIVER_OK,</div><div class='del'>-			(cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) ?</div><div class='add'>+			blk_rq_is_passthrough(cmd-&gt;rq) ?</div><div class='ctx'> 				DID_PASSTHROUGH : DID_ABORT);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_ABORT_FAILED:</div><div class='hunk'>@@ -3204,7 +3211,7 @@ static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,</div><div class='ctx'> 		       "abort failed\n", cmd);</div><div class='ctx'> 		rq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='ctx'> 			cmd-&gt;err_info-&gt;CommandStatus, DRIVER_OK,</div><div class='del'>-			(cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) ?</div><div class='add'>+			blk_rq_is_passthrough(cmd-&gt;rq) ?</div><div class='ctx'> 				DID_PASSTHROUGH : DID_ERROR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_UNSOLICITED_ABORT:</div><div class='hunk'>@@ -3219,21 +3226,21 @@ static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,</div><div class='ctx'> 				"%p retried too many times\n", cmd);</div><div class='ctx'> 		rq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='ctx'> 			cmd-&gt;err_info-&gt;CommandStatus, DRIVER_OK,</div><div class='del'>-			(cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) ?</div><div class='add'>+			blk_rq_is_passthrough(cmd-&gt;rq) ?</div><div class='ctx'> 				DID_PASSTHROUGH : DID_ABORT);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_TIMEOUT:</div><div class='ctx'> 		dev_warn(&amp;h-&gt;pdev-&gt;dev, "cmd %p timedout\n", cmd);</div><div class='ctx'> 		rq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='ctx'> 			cmd-&gt;err_info-&gt;CommandStatus, DRIVER_OK,</div><div class='del'>-			(cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) ?</div><div class='add'>+			blk_rq_is_passthrough(cmd-&gt;rq) ?</div><div class='ctx'> 				DID_PASSTHROUGH : DID_ERROR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_UNABORTABLE:</div><div class='ctx'> 		dev_warn(&amp;h-&gt;pdev-&gt;dev, "cmd %p unabortable\n", cmd);</div><div class='ctx'> 		rq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='ctx'> 			cmd-&gt;err_info-&gt;CommandStatus, DRIVER_OK,</div><div class='del'>-			cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC ?</div><div class='add'>+			blk_rq_is_passthrough(cmd-&gt;rq) ?</div><div class='ctx'> 				DID_PASSTHROUGH : DID_ERROR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -3242,7 +3249,7 @@ static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,</div><div class='ctx'> 		       cmd-&gt;err_info-&gt;CommandStatus);</div><div class='ctx'> 		rq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='ctx'> 			cmd-&gt;err_info-&gt;CommandStatus, DRIVER_OK,</div><div class='del'>-			(cmd-&gt;rq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) ?</div><div class='add'>+			blk_rq_is_passthrough(cmd-&gt;rq) ?</div><div class='ctx'> 				DID_PASSTHROUGH : DID_ERROR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3370,15 +3377,31 @@ static void do_cciss_request(struct request_queue *q)</div><div class='ctx'> 		temp64.val = (__u64) pci_map_page(h-&gt;pdev, sg_page(&amp;tmp_sg[i]),</div><div class='ctx'> 						tmp_sg[i].offset,</div><div class='ctx'> 						tmp_sg[i].length, dir);</div><div class='add'>+		if (dma_mapping_error(&amp;h-&gt;pdev-&gt;dev, temp64.val)) {</div><div class='add'>+			dev_warn(&amp;h-&gt;pdev-&gt;dev,</div><div class='add'>+				"%s: error mapping page for DMA\n", __func__);</div><div class='add'>+			creq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='add'>+							0, DRIVER_OK,</div><div class='add'>+							DID_SOFT_ERROR);</div><div class='add'>+			cmd_free(h, c);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		curr_sg[sg_index].Addr.lower = temp64.val32.lower;</div><div class='ctx'> 		curr_sg[sg_index].Addr.upper = temp64.val32.upper;</div><div class='ctx'> 		curr_sg[sg_index].Ext = 0;  /* we are not chaining */</div><div class='ctx'> 		++sg_index;</div><div class='ctx'> 	}</div><div class='del'>-	if (chained)</div><div class='del'>-		cciss_map_sg_chain_block(h, c, h-&gt;cmd_sg_list[c-&gt;cmdindex],</div><div class='add'>+	if (chained) {</div><div class='add'>+		if (cciss_map_sg_chain_block(h, c, h-&gt;cmd_sg_list[c-&gt;cmdindex],</div><div class='ctx'> 			(seg - (h-&gt;max_cmd_sgentries - 1)) *</div><div class='del'>-				sizeof(SGDescriptor_struct));</div><div class='add'>+				sizeof(SGDescriptor_struct))) {</div><div class='add'>+			creq-&gt;errors = make_status_bytes(SAM_STAT_GOOD,</div><div class='add'>+							0, DRIVER_OK,</div><div class='add'>+							DID_SOFT_ERROR);</div><div class='add'>+			cmd_free(h, c);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* track how many SG entries we are using */</div><div class='ctx'> 	if (seg &gt; h-&gt;maxSG)</div><div class='hunk'>@@ -3395,7 +3418,9 @@ static void do_cciss_request(struct request_queue *q)</div><div class='ctx'> 		c-&gt;Header.SGList = h-&gt;max_cmd_sgentries;</div><div class='ctx'> 	set_performant_mode(h, c);</div><div class='ctx'> </div><div class='del'>-	if (likely(creq-&gt;cmd_type == REQ_TYPE_FS)) {</div><div class='add'>+	switch (req_op(creq)) {</div><div class='add'>+	case REQ_OP_READ:</div><div class='add'>+	case REQ_OP_WRITE:</div><div class='ctx'> 		if(h-&gt;cciss_read == CCISS_READ_10) {</div><div class='ctx'> 			c-&gt;Request.CDB[1] = 0;</div><div class='ctx'> 			c-&gt;Request.CDB[2] = (start_blk &gt;&gt; 24) &amp; 0xff; /* MSB */</div><div class='hunk'>@@ -3425,12 +3450,16 @@ static void do_cciss_request(struct request_queue *q)</div><div class='ctx'> 			c-&gt;Request.CDB[13]= blk_rq_sectors(creq) &amp; 0xff;</div><div class='ctx'> 			c-&gt;Request.CDB[14] = c-&gt;Request.CDB[15] = 0;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (creq-&gt;cmd_type == REQ_TYPE_BLOCK_PC) {</div><div class='del'>-		c-&gt;Request.CDBLen = creq-&gt;cmd_len;</div><div class='del'>-		memcpy(c-&gt;Request.CDB, creq-&gt;cmd, BLK_MAX_CDB);</div><div class='del'>-	} else {</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_SCSI_IN:</div><div class='add'>+	case REQ_OP_SCSI_OUT:</div><div class='add'>+		c-&gt;Request.CDBLen = scsi_req(creq)-&gt;cmd_len;</div><div class='add'>+		memcpy(c-&gt;Request.CDB, scsi_req(creq)-&gt;cmd, BLK_MAX_CDB);</div><div class='add'>+		scsi_req(creq)-&gt;sense = c-&gt;err_info-&gt;SenseInfo;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		dev_warn(&amp;h-&gt;pdev-&gt;dev, "bad request type %d\n",</div><div class='del'>-			creq-&gt;cmd_type);</div><div class='add'>+			creq-&gt;cmd_flags);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4074,41 +4103,27 @@ clean_up:</div><div class='ctx'> </div><div class='ctx'> static void cciss_interrupt_mode(ctlr_info_t *h)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PCI_MSI</div><div class='del'>-	int err;</div><div class='del'>-	struct msix_entry cciss_msix_entries[4] = { {0, 0}, {0, 1},</div><div class='del'>-	{0, 2}, {0, 3}</div><div class='del'>-	};</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Some boards advertise MSI but don't really support it */</div><div class='ctx'> 	if ((h-&gt;board_id == 0x40700E11) || (h-&gt;board_id == 0x40800E11) ||</div><div class='ctx'> 	    (h-&gt;board_id == 0x40820E11) || (h-&gt;board_id == 0x40830E11))</div><div class='ctx'> 		goto default_int_mode;</div><div class='ctx'> </div><div class='del'>-	if (pci_find_capability(h-&gt;pdev, PCI_CAP_ID_MSIX)) {</div><div class='del'>-		err = pci_enable_msix_exact(h-&gt;pdev, cciss_msix_entries, 4);</div><div class='del'>-		if (!err) {</div><div class='del'>-			h-&gt;intr[0] = cciss_msix_entries[0].vector;</div><div class='del'>-			h-&gt;intr[1] = cciss_msix_entries[1].vector;</div><div class='del'>-			h-&gt;intr[2] = cciss_msix_entries[2].vector;</div><div class='del'>-			h-&gt;intr[3] = cciss_msix_entries[3].vector;</div><div class='del'>-			h-&gt;msix_vector = 1;</div><div class='del'>-			return;</div><div class='del'>-		} else {</div><div class='del'>-			dev_warn(&amp;h-&gt;pdev-&gt;dev,</div><div class='del'>-				"MSI-X init failed %d\n", err);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (pci_find_capability(h-&gt;pdev, PCI_CAP_ID_MSI)) {</div><div class='del'>-		if (!pci_enable_msi(h-&gt;pdev))</div><div class='del'>-			h-&gt;msi_vector = 1;</div><div class='del'>-		else</div><div class='del'>-			dev_warn(&amp;h-&gt;pdev-&gt;dev, "MSI init failed\n");</div><div class='add'>+	ret = pci_alloc_irq_vectors(h-&gt;pdev, 4, 4, PCI_IRQ_MSIX);</div><div class='add'>+	if (ret &gt;= 0)   {</div><div class='add'>+		h-&gt;intr[0] = pci_irq_vector(h-&gt;pdev, 0);</div><div class='add'>+		h-&gt;intr[1] = pci_irq_vector(h-&gt;pdev, 1);</div><div class='add'>+		h-&gt;intr[2] = pci_irq_vector(h-&gt;pdev, 2);</div><div class='add'>+		h-&gt;intr[3] = pci_irq_vector(h-&gt;pdev, 3);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ret = pci_alloc_irq_vectors(h-&gt;pdev, 1, 1, PCI_IRQ_MSI);</div><div class='add'>+</div><div class='ctx'> default_int_mode:</div><div class='del'>-#endif				/* CONFIG_PCI_MSI */</div><div class='ctx'> 	/* if we get here we're going to use the default interrupt mode */</div><div class='del'>-	h-&gt;intr[h-&gt;intr_mode] = h-&gt;pdev-&gt;irq;</div><div class='add'>+	h-&gt;intr[h-&gt;intr_mode] = pci_irq_vector(h-&gt;pdev, 0);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4888,7 +4903,7 @@ static int cciss_request_irq(ctlr_info_t *h,</div><div class='ctx'> 	irqreturn_t (*msixhandler)(int, void *),</div><div class='ctx'> 	irqreturn_t (*intxhandler)(int, void *))</div><div class='ctx'> {</div><div class='del'>-	if (h-&gt;msix_vector || h-&gt;msi_vector) {</div><div class='add'>+	if (h-&gt;pdev-&gt;msi_enabled || h-&gt;pdev-&gt;msix_enabled) {</div><div class='ctx'> 		if (!request_irq(h-&gt;intr[h-&gt;intr_mode], msixhandler,</div><div class='ctx'> 				0, h-&gt;devname, h))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -4934,12 +4949,7 @@ static void cciss_undo_allocations_after_kdump_soft_reset(ctlr_info_t *h)</div><div class='ctx'> 	int ctlr = h-&gt;ctlr;</div><div class='ctx'> </div><div class='ctx'> 	free_irq(h-&gt;intr[h-&gt;intr_mode], h);</div><div class='del'>-#ifdef CONFIG_PCI_MSI</div><div class='del'>-	if (h-&gt;msix_vector)</div><div class='del'>-		pci_disable_msix(h-&gt;pdev);</div><div class='del'>-	else if (h-&gt;msi_vector)</div><div class='del'>-		pci_disable_msi(h-&gt;pdev);</div><div class='del'>-#endif /* CONFIG_PCI_MSI */</div><div class='add'>+	pci_free_irq_vectors(h-&gt;pdev);</div><div class='ctx'> 	cciss_free_sg_chain_blocks(h-&gt;cmd_sg_list, h-&gt;nr_cmds);</div><div class='ctx'> 	cciss_free_scatterlists(h);</div><div class='ctx'> 	cciss_free_cmd_pool(h);</div><div class='hunk'>@@ -5295,12 +5305,7 @@ static void cciss_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	cciss_shutdown(pdev);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI_MSI</div><div class='del'>-	if (h-&gt;msix_vector)</div><div class='del'>-		pci_disable_msix(h-&gt;pdev);</div><div class='del'>-	else if (h-&gt;msi_vector)</div><div class='del'>-		pci_disable_msi(h-&gt;pdev);</div><div class='del'>-#endif				/* CONFIG_PCI_MSI */</div><div class='add'>+	pci_free_irq_vectors(h-&gt;pdev);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(h-&gt;transtable);</div><div class='ctx'> 	iounmap(h-&gt;cfgtable);</div><div class='head'>diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h<br/>index 7fda30e4a241..24b5fd75501a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/cciss.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/cciss.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/cciss.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/cciss.h</a></div><div class='hunk'>@@ -90,8 +90,6 @@ struct ctlr_info</div><div class='ctx'> #	define SIMPLE_MODE_INT	2</div><div class='ctx'> #	define MEMQ_MODE_INT	3</div><div class='ctx'> 	unsigned int intr[4];</div><div class='del'>-	unsigned int msix_vector;</div><div class='del'>-	unsigned int msi_vector;</div><div class='ctx'> 	int	intr_mode;</div><div class='ctx'> 	int 	cciss_max_sectors;</div><div class='ctx'> 	BYTE	cciss_read;</div><div class='hunk'>@@ -333,7 +331,7 @@ static unsigned long SA5_performant_completed(ctlr_info_t *h)</div><div class='ctx'> 	 */</div><div class='ctx'> 	register_value = readl(h-&gt;vaddr + SA5_OUTDB_STATUS);</div><div class='ctx'> 	/* msi auto clears the interrupt pending bit. */</div><div class='del'>-	if (!(h-&gt;msi_vector || h-&gt;msix_vector)) {</div><div class='add'>+	if (!(h-&gt;pdev-&gt;msi_enabled || h-&gt;pdev-&gt;msix_enabled)) {</div><div class='ctx'> 		writel(SA5_OUTDB_CLEAR_PERF_BIT, h-&gt;vaddr + SA5_OUTDB_CLEAR);</div><div class='ctx'> 		/* Do a read in order to flush the write to the controller</div><div class='ctx'> 		 * (as per spec.)</div><div class='hunk'>@@ -393,7 +391,7 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)</div><div class='ctx'> 	if (!register_value)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (h-&gt;msi_vector || h-&gt;msix_vector)</div><div class='add'>+	if (h-&gt;pdev-&gt;msi_enabled || h-&gt;pdev-&gt;msix_enabled)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* Read outbound doorbell to flush */</div><div class='hunk'>@@ -402,27 +400,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct access_method SA5_access = {</div><div class='del'>-	SA5_submit_command,</div><div class='del'>-	SA5_intr_mask,</div><div class='del'>-	SA5_fifo_full,</div><div class='del'>-	SA5_intr_pending,</div><div class='del'>-	SA5_completed,</div><div class='add'>+	.submit_command = SA5_submit_command,</div><div class='add'>+	.set_intr_mask = SA5_intr_mask,</div><div class='add'>+	.fifo_full = SA5_fifo_full,</div><div class='add'>+	.intr_pending = SA5_intr_pending,</div><div class='add'>+	.command_completed = SA5_completed,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct access_method SA5B_access = {</div><div class='del'>-        SA5_submit_command,</div><div class='del'>-        SA5B_intr_mask,</div><div class='del'>-        SA5_fifo_full,</div><div class='del'>-        SA5B_intr_pending,</div><div class='del'>-        SA5_completed,</div><div class='add'>+	.submit_command = SA5_submit_command,</div><div class='add'>+	.set_intr_mask = SA5B_intr_mask,</div><div class='add'>+	.fifo_full = SA5_fifo_full,</div><div class='add'>+	.intr_pending = SA5B_intr_pending,</div><div class='add'>+	.command_completed = SA5_completed,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct access_method SA5_performant_access = {</div><div class='del'>-	SA5_submit_command,</div><div class='del'>-	SA5_performant_intr_mask,</div><div class='del'>-	SA5_fifo_full,</div><div class='del'>-	SA5_performant_intr_pending,</div><div class='del'>-	SA5_performant_completed,</div><div class='add'>+	.submit_command = SA5_submit_command,</div><div class='add'>+	.set_intr_mask = SA5_performant_intr_mask,</div><div class='add'>+	.fifo_full = SA5_fifo_full,</div><div class='add'>+	.intr_pending = SA5_performant_intr_pending,</div><div class='add'>+	.command_completed = SA5_performant_completed,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct board_type {</div><div class='head'>diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c<br/>index 1537302e56e3..01a1f7e24978 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/cciss_scsi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/cciss_scsi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/cciss_scsi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/cciss_scsi.c</a></div><div class='hunk'>@@ -17,15 +17,15 @@</div><div class='ctx'>  *    02111-1307, USA.</div><div class='ctx'>  *</div><div class='ctx'>  *    Questions/Comments/Bugfixes to iss_storagedev@hp.com</div><div class='del'>- *    </div><div class='add'>+ *</div><div class='ctx'>  *    Author: Stephen M. Cameron</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='ctx'> </div><div class='del'>-/* Here we have code to present the driver as a scsi driver </div><div class='del'>-   as it is simultaneously presented as a block driver.  The </div><div class='add'>+/* Here we have code to present the driver as a scsi driver</div><div class='add'>+   as it is simultaneously presented as a block driver.  The</div><div class='ctx'>    reason for doing this is to allow access to SCSI tape drives</div><div class='del'>-   through the array controller.  Note in particular, neither </div><div class='add'>+   through the array controller.  Note in particular, neither</div><div class='ctx'>    physical nor logical disks are presented through the scsi layer. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_host.h&gt; </div><div class='add'>+#include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cciss_scsi.h"</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +120,7 @@ struct cciss_scsi_adapter_data_t {</div><div class='ctx'> 	struct cciss_scsi_cmd_stack_t cmd_stack;</div><div class='ctx'> 	SGDescriptor_struct **cmd_sg_list;</div><div class='ctx'> 	int registered;</div><div class='del'>-	spinlock_t lock; // to protect ccissscsi[ctlr]; </div><div class='add'>+	spinlock_t lock; // to protect ccissscsi[ctlr];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define CPQ_TAPE_LOCK(h, flags) spin_lock_irqsave( \</div><div class='hunk'>@@ -143,36 +143,36 @@ scsi_cmd_alloc(ctlr_info_t *h)</div><div class='ctx'> 	u64bit temp64;</div><div class='ctx'> </div><div class='ctx'> 	sa = h-&gt;scsi_ctlr;</div><div class='del'>-	stk = &amp;sa-&gt;cmd_stack; </div><div class='add'>+	stk = &amp;sa-&gt;cmd_stack;</div><div class='ctx'> </div><div class='del'>-	if (stk-&gt;top &lt; 0) </div><div class='add'>+	if (stk-&gt;top &lt; 0)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	c = stk-&gt;elem[stk-&gt;top]; 	</div><div class='add'>+	c = stk-&gt;elem[stk-&gt;top];</div><div class='ctx'> 	/* memset(c, 0, sizeof(*c)); */</div><div class='ctx'> 	memset(&amp;c-&gt;cmd, 0, sizeof(c-&gt;cmd));</div><div class='ctx'> 	memset(&amp;c-&gt;Err, 0, sizeof(c-&gt;Err));</div><div class='ctx'> 	/* set physical addr of cmd and addr of scsi parameters */</div><div class='del'>-	c-&gt;cmd.busaddr = c-&gt;busaddr; </div><div class='add'>+	c-&gt;cmd.busaddr = c-&gt;busaddr;</div><div class='ctx'> 	c-&gt;cmd.cmdindex = c-&gt;cmdindex;</div><div class='del'>-	/* (__u32) (stk-&gt;cmd_pool_handle + </div><div class='add'>+	/* (__u32) (stk-&gt;cmd_pool_handle +</div><div class='ctx'> 		(sizeof(struct cciss_scsi_cmd_stack_elem_t)*stk-&gt;top)); */</div><div class='ctx'> </div><div class='ctx'> 	temp64.val = (__u64) (c-&gt;busaddr + sizeof(CommandList_struct));</div><div class='del'>-	/* (__u64) (stk-&gt;cmd_pool_handle + </div><div class='add'>+	/* (__u64) (stk-&gt;cmd_pool_handle +</div><div class='ctx'> 		(sizeof(struct cciss_scsi_cmd_stack_elem_t)*stk-&gt;top) +</div><div class='ctx'> 		 sizeof(CommandList_struct)); */</div><div class='ctx'> 	stk-&gt;top--;</div><div class='ctx'> 	c-&gt;cmd.ErrDesc.Addr.lower = temp64.val32.lower;</div><div class='ctx'> 	c-&gt;cmd.ErrDesc.Addr.upper = temp64.val32.upper;</div><div class='ctx'> 	c-&gt;cmd.ErrDesc.Len = sizeof(ErrorInfo_struct);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	c-&gt;cmd.ctlr = h-&gt;ctlr;</div><div class='ctx'> 	c-&gt;cmd.err_info = &amp;c-&gt;Err;</div><div class='ctx'> </div><div class='ctx'> 	return (CommandList_struct *) c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void </div><div class='add'>+static void</div><div class='ctx'> scsi_cmd_free(ctlr_info_t *h, CommandList_struct *c)</div><div class='ctx'> {</div><div class='ctx'> 	/* assume only one process in here at a time, locking done by caller. */</div><div class='hunk'>@@ -183,7 +183,7 @@ scsi_cmd_free(ctlr_info_t *h, CommandList_struct *c)</div><div class='ctx'> 	struct cciss_scsi_cmd_stack_t *stk;</div><div class='ctx'> </div><div class='ctx'> 	sa = h-&gt;scsi_ctlr;</div><div class='del'>-	stk = &amp;sa-&gt;cmd_stack; </div><div class='add'>+	stk = &amp;sa-&gt;cmd_stack;</div><div class='ctx'> 	stk-&gt;top++;</div><div class='ctx'> 	if (stk-&gt;top &gt;= stk-&gt;nelems) {</div><div class='ctx'> 		dev_err(&amp;h-&gt;pdev-&gt;dev,</div><div class='hunk'>@@ -228,7 +228,7 @@ scsi_cmd_stack_setup(ctlr_info_t *h, struct cciss_scsi_adapter_data_t *sa)</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; stk-&gt;nelems; i++) {</div><div class='ctx'> 		stk-&gt;elem[i] = &amp;stk-&gt;pool[i];</div><div class='del'>-		stk-&gt;elem[i]-&gt;busaddr = (__u32) (stk-&gt;cmd_pool_handle + </div><div class='add'>+		stk-&gt;elem[i]-&gt;busaddr = (__u32) (stk-&gt;cmd_pool_handle +</div><div class='ctx'> 			(sizeof(struct cciss_scsi_cmd_stack_elem_t) * i));</div><div class='ctx'> 		stk-&gt;elem[i]-&gt;cmdindex = i;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -244,7 +244,7 @@ scsi_cmd_stack_free(ctlr_info_t *h)</div><div class='ctx'> 	size_t size;</div><div class='ctx'> </div><div class='ctx'> 	sa = h-&gt;scsi_ctlr;</div><div class='del'>-	stk = &amp;sa-&gt;cmd_stack; </div><div class='add'>+	stk = &amp;sa-&gt;cmd_stack;</div><div class='ctx'> 	if (stk-&gt;top != stk-&gt;nelems-1) {</div><div class='ctx'> 		dev_warn(&amp;h-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"bug: %d scsi commands are still outstanding.\n",</div><div class='hunk'>@@ -260,77 +260,23 @@ scsi_cmd_stack_free(ctlr_info_t *h)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-static int xmargin=8;</div><div class='del'>-static int amargin=60;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_bytes (unsigned char *c, int len, int hex, int ascii)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	int i;</div><div class='del'>-	unsigned char *x;</div><div class='del'>-</div><div class='del'>-	if (hex)</div><div class='del'>-	{</div><div class='del'>-		x = c;</div><div class='del'>-		for (i=0;i&lt;len;i++)</div><div class='del'>-		{</div><div class='del'>-			if ((i % xmargin) == 0 &amp;&amp; i&gt;0) printk("\n");</div><div class='del'>-			if ((i % xmargin) == 0) printk("0x%04x:", i);</div><div class='del'>-			printk(" %02x", *x);</div><div class='del'>-			x++;</div><div class='del'>-		}</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='del'>-	if (ascii)</div><div class='del'>-	{</div><div class='del'>-		x = c;</div><div class='del'>-		for (i=0;i&lt;len;i++)</div><div class='del'>-		{</div><div class='del'>-			if ((i % amargin) == 0 &amp;&amp; i&gt;0) printk("\n");</div><div class='del'>-			if ((i % amargin) == 0) printk("0x%04x:", i);</div><div class='del'>-			if (*x &gt; 26 &amp;&amp; *x &lt; 128) printk("%c", *x);</div><div class='del'>-			else printk(".");</div><div class='del'>-			x++;</div><div class='del'>-		}</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> print_cmd(CommandList_struct *cp)</div><div class='ctx'> {</div><div class='ctx'> 	printk("queue:%d\n", cp-&gt;Header.ReplyQueue);</div><div class='ctx'> 	printk("sglist:%d\n", cp-&gt;Header.SGList);</div><div class='ctx'> 	printk("sgtot:%d\n", cp-&gt;Header.SGTotal);</div><div class='del'>-	printk("Tag:0x%08x/0x%08x\n", cp-&gt;Header.Tag.upper, </div><div class='add'>+	printk("Tag:0x%08x/0x%08x\n", cp-&gt;Header.Tag.upper,</div><div class='ctx'> 			cp-&gt;Header.Tag.lower);</div><div class='del'>-	printk("LUN:0x%02x%02x%02x%02x%02x%02x%02x%02x\n",</div><div class='del'>-		cp-&gt;Header.LUN.LunAddrBytes[0],</div><div class='del'>-		cp-&gt;Header.LUN.LunAddrBytes[1],</div><div class='del'>-		cp-&gt;Header.LUN.LunAddrBytes[2],</div><div class='del'>-		cp-&gt;Header.LUN.LunAddrBytes[3],</div><div class='del'>-		cp-&gt;Header.LUN.LunAddrBytes[4],</div><div class='del'>-		cp-&gt;Header.LUN.LunAddrBytes[5],</div><div class='del'>-		cp-&gt;Header.LUN.LunAddrBytes[6],</div><div class='del'>-		cp-&gt;Header.LUN.LunAddrBytes[7]);</div><div class='add'>+	printk("LUN:0x%8phN\n", cp-&gt;Header.LUN.LunAddrBytes);</div><div class='ctx'> 	printk("CDBLen:%d\n", cp-&gt;Request.CDBLen);</div><div class='ctx'> 	printk("Type:%d\n",cp-&gt;Request.Type.Type);</div><div class='ctx'> 	printk("Attr:%d\n",cp-&gt;Request.Type.Attribute);</div><div class='ctx'> 	printk(" Dir:%d\n",cp-&gt;Request.Type.Direction);</div><div class='ctx'> 	printk("Timeout:%d\n",cp-&gt;Request.Timeout);</div><div class='del'>-	printk( "CDB: %02x %02x %02x %02x %02x %02x %02x %02x"</div><div class='del'>-		" %02x %02x %02x %02x %02x %02x %02x %02x\n",</div><div class='del'>-		cp-&gt;Request.CDB[0], cp-&gt;Request.CDB[1],</div><div class='del'>-		cp-&gt;Request.CDB[2], cp-&gt;Request.CDB[3],</div><div class='del'>-		cp-&gt;Request.CDB[4], cp-&gt;Request.CDB[5],</div><div class='del'>-		cp-&gt;Request.CDB[6], cp-&gt;Request.CDB[7],</div><div class='del'>-		cp-&gt;Request.CDB[8], cp-&gt;Request.CDB[9],</div><div class='del'>-		cp-&gt;Request.CDB[10], cp-&gt;Request.CDB[11],</div><div class='del'>-		cp-&gt;Request.CDB[12], cp-&gt;Request.CDB[13],</div><div class='del'>-		cp-&gt;Request.CDB[14], cp-&gt;Request.CDB[15]),</div><div class='del'>-	printk("edesc.Addr: 0x%08x/0%08x, Len  = %d\n", </div><div class='del'>-		cp-&gt;ErrDesc.Addr.upper, cp-&gt;ErrDesc.Addr.lower, </div><div class='add'>+	printk("CDB: %16ph\n", cp-&gt;Request.CDB);</div><div class='add'>+	printk("edesc.Addr: 0x%08x/0%08x, Len  = %d\n",</div><div class='add'>+		cp-&gt;ErrDesc.Addr.upper, cp-&gt;ErrDesc.Addr.lower,</div><div class='ctx'> 			cp-&gt;ErrDesc.Len);</div><div class='ctx'> 	printk("sgs..........Errorinfo:\n");</div><div class='ctx'> 	printk("scsistatus:%d\n", cp-&gt;err_info-&gt;ScsiStatus);</div><div class='hunk'>@@ -340,12 +286,10 @@ print_cmd(CommandList_struct *cp)</div><div class='ctx'> 	printk("offense size:%d\n", cp-&gt;err_info-&gt;MoreErrInfo.Invalid_Cmd.offense_size);</div><div class='ctx'> 	printk("offense byte:%d\n", cp-&gt;err_info-&gt;MoreErrInfo.Invalid_Cmd.offense_num);</div><div class='ctx'> 	printk("offense value:%d\n", cp-&gt;err_info-&gt;MoreErrInfo.Invalid_Cmd.offense_value);</div><div class='del'>-			</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> find_bus_target_lun(ctlr_info_t *h, int *bus, int *target, int *lun)</div><div class='ctx'> {</div><div class='ctx'> 	/* finds an unused bus, target, lun for a new device */</div><div class='hunk'>@@ -355,24 +299,24 @@ find_bus_target_lun(ctlr_info_t *h, int *bus, int *target, int *lun)</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;target_taken[0], 0, CCISS_MAX_SCSI_DEVS_PER_HBA);</div><div class='ctx'> </div><div class='del'>-	target_taken[SELF_SCSI_ID] = 1;	</div><div class='add'>+	target_taken[SELF_SCSI_ID] = 1;</div><div class='ctx'> 	for (i = 0; i &lt; ccissscsi[h-&gt;ctlr].ndevices; i++)</div><div class='ctx'> 		target_taken[ccissscsi[h-&gt;ctlr].dev[i].target] = 1;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; CCISS_MAX_SCSI_DEVS_PER_HBA; i++) {</div><div class='ctx'> 		if (!target_taken[i]) {</div><div class='ctx'> 			*bus = 0; *target=i; *lun = 0; found=1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return (!found);	</div><div class='add'>+	return (!found);</div><div class='ctx'> }</div><div class='ctx'> struct scsi2map {</div><div class='ctx'> 	char scsi3addr[8];</div><div class='ctx'> 	int bus, target, lun;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> cciss_scsi_add_entry(ctlr_info_t *h, int hostno,</div><div class='ctx'> 		struct cciss_scsi_dev_t *device,</div><div class='ctx'> 		struct scsi2map *added, int *nadded)</div><div class='hunk'>@@ -437,8 +381,8 @@ cciss_scsi_add_entry(ctlr_info_t *h, int hostno,</div><div class='ctx'> </div><div class='ctx'> 	ccissscsi[h-&gt;ctlr].ndevices++;</div><div class='ctx'> </div><div class='del'>-	/* initially, (before registering with scsi layer) we don't </div><div class='del'>-	   know our hostno and we don't want to print anything first </div><div class='add'>+	/* initially, (before registering with scsi layer) we don't</div><div class='add'>+	   know our hostno and we don't want to print anything first</div><div class='ctx'> 	   time anyway (the scsi layer's inquiries will show that info) */</div><div class='ctx'> 	if (hostno != -1)</div><div class='ctx'> 		dev_info(&amp;h-&gt;pdev-&gt;dev, "%s device c%db%dt%dl%d added.\n",</div><div class='hunk'>@@ -523,7 +467,7 @@ adjust_cciss_scsi_table(ctlr_info_t *h, int hostno,</div><div class='ctx'> 	/* sd contains scsi3 addresses and devtypes, but</div><div class='ctx'> 	   bus target and lun are not filled in.  This funciton</div><div class='ctx'> 	   takes what's in sd to be the current and adjusts</div><div class='del'>-	   ccissscsi[] to be in line with what's in sd. */ </div><div class='add'>+	   ccissscsi[] to be in line with what's in sd. */</div><div class='ctx'> </div><div class='ctx'> 	int i,j, found, changes=0;</div><div class='ctx'> 	struct cciss_scsi_dev_t *csd;</div><div class='hunk'>@@ -548,7 +492,7 @@ adjust_cciss_scsi_table(ctlr_info_t *h, int hostno,</div><div class='ctx'> 	if (hostno != -1)  /* if it's not the first time... */</div><div class='ctx'> 		sh = h-&gt;scsi_ctlr-&gt;scsi_host;</div><div class='ctx'> </div><div class='del'>-	/* find any devices in ccissscsi[] that are not in </div><div class='add'>+	/* find any devices in ccissscsi[] that are not in</div><div class='ctx'> 	   sd[] and remove them from ccissscsi[] */</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='hunk'>@@ -568,7 +512,7 @@ adjust_cciss_scsi_table(ctlr_info_t *h, int hostno,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (found == 0) { /* device no longer present. */ </div><div class='add'>+		if (found == 0) { /* device no longer present. */</div><div class='ctx'> 			changes++;</div><div class='ctx'> 			cciss_scsi_remove_entry(h, hostno, i,</div><div class='ctx'> 				removed, &amp;nremoved);</div><div class='hunk'>@@ -697,14 +641,13 @@ lookup_scsi3addr(ctlr_info_t *h, int bus, int target, int lun, char *scsi3addr)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void </div><div class='add'>+static void</div><div class='ctx'> cciss_scsi_setup(ctlr_info_t *h)</div><div class='ctx'> {</div><div class='ctx'> 	struct cciss_scsi_adapter_data_t * shba;</div><div class='ctx'> </div><div class='ctx'> 	ccissscsi[h-&gt;ctlr].ndevices = 0;</div><div class='del'>-	shba = (struct cciss_scsi_adapter_data_t *)</div><div class='del'>-		kmalloc(sizeof(*shba), GFP_KERNEL);	</div><div class='add'>+	shba = kmalloc(sizeof(*shba), GFP_KERNEL);</div><div class='ctx'> 	if (shba == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	shba-&gt;scsi_host = NULL;</div><div class='hunk'>@@ -749,20 +692,18 @@ static void complete_scsi_command(CommandList_struct *c, int timeout,</div><div class='ctx'> </div><div class='ctx'> 	/* copy the sense data whether we need to or not. */</div><div class='ctx'> </div><div class='del'>-	memcpy(cmd-&gt;sense_buffer, ei-&gt;SenseInfo, </div><div class='add'>+	memcpy(cmd-&gt;sense_buffer, ei-&gt;SenseInfo,</div><div class='ctx'> 		ei-&gt;SenseLen &gt; SCSI_SENSE_BUFFERSIZE ?</div><div class='del'>-			SCSI_SENSE_BUFFERSIZE : </div><div class='add'>+			SCSI_SENSE_BUFFERSIZE :</div><div class='ctx'> 			ei-&gt;SenseLen);</div><div class='ctx'> 	scsi_set_resid(cmd, ei-&gt;ResidualCnt);</div><div class='ctx'> </div><div class='del'>-	if(ei-&gt;CommandStatus != 0) </div><div class='del'>-	{ /* an error has occurred */ </div><div class='del'>-		switch(ei-&gt;CommandStatus)</div><div class='del'>-		{</div><div class='add'>+	if (ei-&gt;CommandStatus != 0) { /* an error has occurred */</div><div class='add'>+		switch (ei-&gt;CommandStatus) {</div><div class='ctx'> 			case CMD_TARGET_STATUS:</div><div class='ctx'> 				/* Pass it up to the upper layers... */</div><div class='ctx'> 				if (!ei-&gt;ScsiStatus) {</div><div class='del'>-					</div><div class='add'>+</div><div class='ctx'> 	/* Ordinarily, this case should never happen, but there is a bug</div><div class='ctx'> 	   in some released firmware revisions that allows it to happen</div><div class='ctx'> 	   if, for example, a 4100 backplane loses power and the tape</div><div class='hunk'>@@ -782,10 +723,12 @@ static void complete_scsi_command(CommandList_struct *c, int timeout,</div><div class='ctx'> 					"reported\n", c);</div><div class='ctx'> 			break;</div><div class='ctx'> 			case CMD_INVALID: {</div><div class='del'>-				/* print_bytes(c, sizeof(*c), 1, 0);</div><div class='del'>-				print_cmd(c); */</div><div class='add'>+				/*</div><div class='add'>+				print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, c, sizeof(*c), false);</div><div class='add'>+				print_cmd(c);</div><div class='add'>+				 */</div><div class='ctx'>      /* We get CMD_INVALID if you address a non-existent tape drive instead</div><div class='del'>-	of a selection timeout (no response).  You will see this if you yank </div><div class='add'>+	of a selection timeout (no response).  You will see this if you yank</div><div class='ctx'> 	out a tape drive, then try to access it. This is kind of a shame</div><div class='ctx'> 	because it means that any other CMD_INVALID (e.g. driver bug) will</div><div class='ctx'> 	get interpreted as a missing target. */</div><div class='hunk'>@@ -834,7 +777,7 @@ static void complete_scsi_command(CommandList_struct *c, int timeout,</div><div class='ctx'> 				cmd-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='ctx'> 				dev_warn(&amp;h-&gt;pdev-&gt;dev,</div><div class='ctx'> 					"%p returned unknown status %x\n", c,</div><div class='del'>-						ei-&gt;CommandStatus); </div><div class='add'>+						ei-&gt;CommandStatus);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	cmd-&gt;scsi_done(cmd);</div><div class='hunk'>@@ -850,15 +793,15 @@ cciss_scsi_detect(ctlr_info_t *h)</div><div class='ctx'> 	sh = scsi_host_alloc(&amp;cciss_driver_template, sizeof(struct ctlr_info *));</div><div class='ctx'> 	if (sh == NULL)</div><div class='ctx'> 		goto fail;</div><div class='del'>-	sh-&gt;io_port = 0;	// good enough?  FIXME, </div><div class='add'>+	sh-&gt;io_port = 0;	// good enough?  FIXME,</div><div class='ctx'> 	sh-&gt;n_io_port = 0;	// I don't think we use these two...</div><div class='del'>-	sh-&gt;this_id = SELF_SCSI_ID;  </div><div class='add'>+	sh-&gt;this_id = SELF_SCSI_ID;</div><div class='ctx'> 	sh-&gt;can_queue = cciss_tape_cmds;</div><div class='ctx'> 	sh-&gt;sg_tablesize = h-&gt;maxsgentries;</div><div class='ctx'> 	sh-&gt;max_cmd_len = MAX_COMMAND_SIZE;</div><div class='ctx'> 	sh-&gt;max_sectors = h-&gt;cciss_max_sectors;</div><div class='ctx'> </div><div class='del'>-	((struct cciss_scsi_adapter_data_t *) </div><div class='add'>+	((struct cciss_scsi_adapter_data_t *)</div><div class='ctx'> 		h-&gt;scsi_ctlr)-&gt;scsi_host = sh;</div><div class='ctx'> 	sh-&gt;hostdata[0] = (unsigned long) h;</div><div class='ctx'> 	sh-&gt;irq = h-&gt;intr[SIMPLE_MODE_INT];</div><div class='hunk'>@@ -910,7 +853,7 @@ cciss_map_one(struct pci_dev *pdev,</div><div class='ctx'> static int</div><div class='ctx'> cciss_scsi_do_simple_cmd(ctlr_info_t *h,</div><div class='ctx'> 			CommandList_struct *c,</div><div class='del'>-			unsigned char *scsi3addr, </div><div class='add'>+			unsigned char *scsi3addr,</div><div class='ctx'> 			unsigned char *cdb,</div><div class='ctx'> 			unsigned char cdblen,</div><div class='ctx'> 			unsigned char *buf, int bufsize,</div><div class='hunk'>@@ -925,7 +868,7 @@ cciss_scsi_do_simple_cmd(ctlr_info_t *h,</div><div class='ctx'> 	c-&gt;Header.Tag.lower = c-&gt;busaddr;  /* Use k. address of cmd as tag */</div><div class='ctx'> 	// Fill in the request block...</div><div class='ctx'> </div><div class='del'>-	/* printk("Using scsi3addr 0x%02x%0x2%0x2%0x2%0x2%0x2%0x2%0x2\n", </div><div class='add'>+	/* printk("Using scsi3addr 0x%02x%0x2%0x2%0x2%0x2%0x2%0x2%0x2\n",</div><div class='ctx'> 		scsi3addr[0], scsi3addr[1], scsi3addr[2], scsi3addr[3],</div><div class='ctx'> 		scsi3addr[4], scsi3addr[5], scsi3addr[6], scsi3addr[7]); */</div><div class='ctx'> </div><div class='hunk'>@@ -939,7 +882,7 @@ cciss_scsi_do_simple_cmd(ctlr_info_t *h,</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the SG list and do dma mapping */</div><div class='ctx'> 	cciss_map_one(h-&gt;pdev, c, (unsigned char *) buf,</div><div class='del'>-			bufsize, DMA_FROM_DEVICE); </div><div class='add'>+			bufsize, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;waiting = &amp;wait;</div><div class='ctx'> 	enqueue_cmd_and_start_io(h, c);</div><div class='hunk'>@@ -950,14 +893,13 @@ cciss_scsi_do_simple_cmd(ctlr_info_t *h,</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void </div><div class='add'>+static void</div><div class='ctx'> cciss_scsi_interpret_error(ctlr_info_t *h, CommandList_struct *c)</div><div class='ctx'> {</div><div class='ctx'> 	ErrorInfo_struct *ei;</div><div class='ctx'> </div><div class='ctx'> 	ei = c-&gt;err_info;</div><div class='del'>-	switch(ei-&gt;CommandStatus)</div><div class='del'>-	{</div><div class='add'>+	switch (ei-&gt;CommandStatus) {</div><div class='ctx'> 		case CMD_TARGET_STATUS:</div><div class='ctx'> 			dev_warn(&amp;h-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"cmd %p has completed with errors\n", c);</div><div class='hunk'>@@ -985,8 +927,10 @@ cciss_scsi_interpret_error(ctlr_info_t *h, CommandList_struct *c)</div><div class='ctx'> 			dev_warn(&amp;h-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"%p is reported invalid (probably means "</div><div class='ctx'> 				"target device no longer present)\n", c);</div><div class='del'>-			/* print_bytes((unsigned char *) c, sizeof(*c), 1, 0);</div><div class='del'>-			print_cmd(c);  */</div><div class='add'>+			/*</div><div class='add'>+			print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, c, sizeof(*c), false);</div><div class='add'>+			print_cmd(c);</div><div class='add'>+			 */</div><div class='ctx'> 			}</div><div class='ctx'> 		break;</div><div class='ctx'> 		case CMD_PROTOCOL_ERR:</div><div class='hunk'>@@ -1057,7 +1001,7 @@ cciss_scsi_do_inquiry(ctlr_info_t *h, unsigned char *scsi3addr,</div><div class='ctx'> </div><div class='ctx'> 	if (rc != 0) return rc; /* something went wrong */</div><div class='ctx'> </div><div class='del'>-	if (ei-&gt;CommandStatus != 0 &amp;&amp; </div><div class='add'>+	if (ei-&gt;CommandStatus != 0 &amp;&amp;</div><div class='ctx'> 	    ei-&gt;CommandStatus != CMD_DATA_UNDERRUN) {</div><div class='ctx'> 		cciss_scsi_interpret_error(h, c);</div><div class='ctx'> 		rc = -1;</div><div class='hunk'>@@ -1065,7 +1009,7 @@ cciss_scsi_do_inquiry(ctlr_info_t *h, unsigned char *scsi3addr,</div><div class='ctx'> 	spin_lock_irqsave(&amp;h-&gt;lock, flags);</div><div class='ctx'> 	scsi_cmd_free(h, c);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;h-&gt;lock, flags);</div><div class='del'>-	return rc;	</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Get the device id from inquiry page 0x83 */</div><div class='hunk'>@@ -1094,7 +1038,7 @@ cciss_scsi_do_report_phys_luns(ctlr_info_t *h,</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	CommandList_struct *c;</div><div class='ctx'> 	unsigned char cdb[12];</div><div class='del'>-	unsigned char scsi3addr[8]; </div><div class='add'>+	unsigned char scsi3addr[8];</div><div class='ctx'> 	ErrorInfo_struct *ei;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -1121,14 +1065,14 @@ cciss_scsi_do_report_phys_luns(ctlr_info_t *h,</div><div class='ctx'> 	cdb[11] = 0;</div><div class='ctx'> </div><div class='ctx'> 	rc = cciss_scsi_do_simple_cmd(h, c, scsi3addr,</div><div class='del'>-				cdb, 12, </div><div class='del'>-				(unsigned char *) buf, </div><div class='add'>+				cdb, 12,</div><div class='add'>+				(unsigned char *) buf,</div><div class='ctx'> 				bufsize, XFER_READ);</div><div class='ctx'> </div><div class='ctx'> 	if (rc != 0) return rc; /* something went wrong */</div><div class='ctx'> </div><div class='ctx'> 	ei = c-&gt;err_info;</div><div class='del'>-	if (ei-&gt;CommandStatus != 0 &amp;&amp; </div><div class='add'>+	if (ei-&gt;CommandStatus != 0 &amp;&amp;</div><div class='ctx'> 	    ei-&gt;CommandStatus != CMD_DATA_UNDERRUN) {</div><div class='ctx'> 		cciss_scsi_interpret_error(h, c);</div><div class='ctx'> 		rc = -1;</div><div class='hunk'>@@ -1136,36 +1080,36 @@ cciss_scsi_do_report_phys_luns(ctlr_info_t *h,</div><div class='ctx'> 	spin_lock_irqsave(&amp;h-&gt;lock, flags);</div><div class='ctx'> 	scsi_cmd_free(h, c);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;h-&gt;lock, flags);</div><div class='del'>-	return rc;	</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> cciss_update_non_disk_devices(ctlr_info_t *h, int hostno)</div><div class='ctx'> {</div><div class='ctx'> 	/* the idea here is we could get notified from /proc</div><div class='del'>-	   that some devices have changed, so we do a report </div><div class='del'>-	   physical luns cmd, and adjust our list of devices </div><div class='add'>+	   that some devices have changed, so we do a report</div><div class='add'>+	   physical luns cmd, and adjust our list of devices</div><div class='ctx'> 	   accordingly.  (We can't rely on the scsi-mid layer just</div><div class='del'>-	   doing inquiries, because the "busses" that the scsi </div><div class='add'>+	   doing inquiries, because the "busses" that the scsi</div><div class='ctx'> 	   mid-layer probes are totally fabricated by this driver,</div><div class='ctx'> 	   so new devices wouldn't show up.</div><div class='ctx'> </div><div class='del'>-	   the scsi3addr's of devices won't change so long as the </div><div class='del'>-	   adapter is not reset.  That means we can rescan and </div><div class='del'>-	   tell which devices we already know about, vs. new </div><div class='add'>+	   the scsi3addr's of devices won't change so long as the</div><div class='add'>+	   adapter is not reset.  That means we can rescan and</div><div class='add'>+	   tell which devices we already know about, vs. new</div><div class='ctx'> 	   devices, vs.  disappearing devices.</div><div class='ctx'> </div><div class='ctx'> 	   Also, if you yank out a tape drive, then put in a disk</div><div class='del'>-	   in it's place, (say, a configured volume from another </div><div class='del'>-	   array controller for instance)  _don't_ poke this driver </div><div class='del'>-           (so it thinks it's still a tape, but _do_ poke the scsi </div><div class='del'>-           mid layer, so it does an inquiry... the scsi mid layer </div><div class='add'>+	   in it's place, (say, a configured volume from another</div><div class='add'>+	   array controller for instance)  _don't_ poke this driver</div><div class='add'>+           (so it thinks it's still a tape, but _do_ poke the scsi</div><div class='add'>+           mid layer, so it does an inquiry... the scsi mid layer</div><div class='ctx'>            will see the physical disk.  This would be bad.  Need to</div><div class='del'>-	   think about how to prevent that.  One idea would be to </div><div class='add'>+	   think about how to prevent that.  One idea would be to</div><div class='ctx'> 	   snoop all scsi responses and if an inquiry repsonse comes</div><div class='ctx'> 	   back that reports a disk, chuck it an return selection</div><div class='ctx'> 	   timeout instead and adjust our table...  Not sure i like</div><div class='del'>-	   that though.  </div><div class='add'>+	   that though.</div><div class='ctx'> </div><div class='ctx'> 	 */</div><div class='ctx'> #define OBDR_TAPE_INQ_SIZE 49</div><div class='hunk'>@@ -1193,9 +1137,9 @@ cciss_update_non_disk_devices(ctlr_info_t *h, int hostno)</div><div class='ctx'> 		ch = &amp;ld_buff-&gt;LUNListLength[0];</div><div class='ctx'> 		num_luns = ((ch[0]&lt;&lt;24) | (ch[1]&lt;&lt;16) | (ch[2]&lt;&lt;8) | ch[3]) / 8;</div><div class='ctx'> 		if (num_luns &gt; CISS_MAX_PHYS_LUN) {</div><div class='del'>-			printk(KERN_WARNING </div><div class='add'>+			printk(KERN_WARNING</div><div class='ctx'> 				"cciss: Maximum physical LUNs (%d) exceeded.  "</div><div class='del'>-				"%d LUNs ignored.\n", CISS_MAX_PHYS_LUN, </div><div class='add'>+				"%d LUNs ignored.\n", CISS_MAX_PHYS_LUN,</div><div class='ctx'> 				num_luns - CISS_MAX_PHYS_LUN);</div><div class='ctx'> 			num_luns = CISS_MAX_PHYS_LUN;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1206,7 +1150,7 @@ cciss_update_non_disk_devices(ctlr_info_t *h, int hostno)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	/* adjust our table of devices */	</div><div class='add'>+	/* adjust our table of devices */</div><div class='ctx'> 	for (i = 0; i &lt; num_luns; i++) {</div><div class='ctx'> 		/* for each physical lun, do an inquiry */</div><div class='ctx'> 		if (ld_buff-&gt;LUN[i][3] &amp; 0xC0) continue;</div><div class='hunk'>@@ -1234,8 +1178,7 @@ cciss_update_non_disk_devices(ctlr_info_t *h, int hostno)</div><div class='ctx'> 		cciss_scsi_get_device_id(h, scsi3addr,</div><div class='ctx'> 			this_device-&gt;device_id, sizeof(this_device-&gt;device_id));</div><div class='ctx'> </div><div class='del'>-		switch (this_device-&gt;devtype)</div><div class='del'>-		{</div><div class='add'>+		switch (this_device-&gt;devtype) {</div><div class='ctx'> 		  case 0x05: /* CD-ROM */ {</div><div class='ctx'> </div><div class='ctx'> 			/* We don't *really* support actual CD-ROM devices,</div><div class='hunk'>@@ -1265,7 +1208,7 @@ cciss_update_non_disk_devices(ctlr_info_t *h, int hostno)</div><div class='ctx'> 			currentsd[ncurrent] = *this_device;</div><div class='ctx'> 			ncurrent++;</div><div class='ctx'> 			break;</div><div class='del'>-		  default: </div><div class='add'>+		  default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1310,8 +1253,8 @@ cciss_scsi_write_info(struct Scsi_Host *sh,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return cciss_scsi_user_command(h, sh-&gt;host_no,</div><div class='del'>-			buffer, length);	</div><div class='del'>-} </div><div class='add'>+			buffer, length);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> cciss_scsi_show_info(struct seq_file *m, struct Scsi_Host *sh)</div><div class='hunk'>@@ -1349,8 +1292,8 @@ cciss_scsi_show_info(struct seq_file *m, struct Scsi_Host *sh)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* cciss_scatter_gather takes a struct scsi_cmnd, (cmd), and does the pci </div><div class='del'>-   dma mapping  and fills in the scatter gather entries of the </div><div class='add'>+/* cciss_scatter_gather takes a struct scsi_cmnd, (cmd), and does the pci</div><div class='add'>+   dma mapping  and fills in the scatter gather entries of the</div><div class='ctx'>    cciss command, c. */</div><div class='ctx'> </div><div class='ctx'> static void cciss_scatter_gather(ctlr_info_t *h, CommandList_struct *c,</div><div class='hunk'>@@ -1446,7 +1389,7 @@ cciss_scsi_queue_command_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn</div><div class='ctx'> </div><div class='ctx'> 	// Fill in the command list header</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;scsi_done = done;    // save this for use by completion code </div><div class='add'>+	cmd-&gt;scsi_done = done;    // save this for use by completion code</div><div class='ctx'> </div><div class='ctx'> 	/* save c in case we have to abort it */</div><div class='ctx'> 	cmd-&gt;host_scribble = (unsigned char *) c;</div><div class='hunk'>@@ -1456,7 +1399,7 @@ cciss_scsi_queue_command_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn</div><div class='ctx'> 	c-&gt;Header.ReplyQueue = 0;  /* unused in simple mode */</div><div class='ctx'> 	memcpy(&amp;c-&gt;Header.LUN.LunAddrBytes[0], &amp;scsi3addr[0], 8);</div><div class='ctx'> 	c-&gt;Header.Tag.lower = c-&gt;busaddr;  /* Use k. address of cmd as tag */</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	// Fill in the request block...</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;Request.Timeout = 0;</div><div class='hunk'>@@ -1466,8 +1409,7 @@ cciss_scsi_queue_command_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn</div><div class='ctx'> 	memcpy(c-&gt;Request.CDB, cmd-&gt;cmnd, cmd-&gt;cmd_len);</div><div class='ctx'> 	c-&gt;Request.Type.Type = TYPE_CMD;</div><div class='ctx'> 	c-&gt;Request.Type.Attribute = ATTR_SIMPLE;</div><div class='del'>-	switch(cmd-&gt;sc_data_direction)</div><div class='del'>-	{</div><div class='add'>+	switch (cmd-&gt;sc_data_direction) {</div><div class='ctx'> 	  case DMA_TO_DEVICE:</div><div class='ctx'> 		c-&gt;Request.Type.Direction = XFER_WRITE;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1484,15 +1426,15 @@ cciss_scsi_queue_command_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn</div><div class='ctx'> </div><div class='ctx'> 		c-&gt;Request.Type.Direction = XFER_RSVD;</div><div class='ctx'> 		// This is technically wrong, and cciss controllers should</div><div class='del'>-		// reject it with CMD_INVALID, which is the most correct </div><div class='del'>-		// response, but non-fibre backends appear to let it </div><div class='add'>+		// reject it with CMD_INVALID, which is the most correct</div><div class='add'>+		// response, but non-fibre backends appear to let it</div><div class='ctx'> 		// slide by, and give the same results as if this field</div><div class='ctx'> 		// were set correctly.  Either way is acceptable for</div><div class='ctx'> 		// our purposes here.</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	  default: </div><div class='add'>+	  default:</div><div class='ctx'> 		dev_warn(&amp;h-&gt;pdev-&gt;dev, "unknown data direction: %d\n",</div><div class='ctx'> 			cmd-&gt;sc_data_direction);</div><div class='ctx'> 		BUG();</div><div class='hunk'>@@ -1516,9 +1458,9 @@ static void cciss_unregister_scsi(ctlr_info_t *h)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;h-&gt;lock, flags);</div><div class='ctx'> 	sa = h-&gt;scsi_ctlr;</div><div class='del'>-	stk = &amp;sa-&gt;cmd_stack; </div><div class='add'>+	stk = &amp;sa-&gt;cmd_stack;</div><div class='ctx'> </div><div class='del'>-	/* if we weren't ever actually registered, don't unregister */ </div><div class='add'>+	/* if we weren't ever actually registered, don't unregister */</div><div class='ctx'> 	if (sa-&gt;registered) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;h-&gt;lock, flags);</div><div class='ctx'> 		scsi_remove_host(sa-&gt;scsi_host);</div><div class='hunk'>@@ -1526,7 +1468,7 @@ static void cciss_unregister_scsi(ctlr_info_t *h)</div><div class='ctx'> 		spin_lock_irqsave(&amp;h-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set scsi_host to NULL so our detect routine will </div><div class='add'>+	/* set scsi_host to NULL so our detect routine will</div><div class='ctx'> 	   find us on register */</div><div class='ctx'> 	sa-&gt;scsi_host = NULL;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;h-&gt;lock, flags);</div><div class='hunk'>@@ -1542,7 +1484,7 @@ static int cciss_engage_scsi(ctlr_info_t *h)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;h-&gt;lock, flags);</div><div class='ctx'> 	sa = h-&gt;scsi_ctlr;</div><div class='del'>-	stk = &amp;sa-&gt;cmd_stack; </div><div class='add'>+	stk = &amp;sa-&gt;cmd_stack;</div><div class='ctx'> </div><div class='ctx'> 	if (sa-&gt;registered) {</div><div class='ctx'> 		dev_info(&amp;h-&gt;pdev-&gt;dev, "SCSI subsystem already engaged.\n");</div><div class='hunk'>@@ -1638,13 +1580,13 @@ retry_tur:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Need at least one of these error handlers to keep ../scsi/hosts.c from </div><div class='del'>- * complaining.  Doing a host- or bus-reset can't do anything good here. </div><div class='add'>+/* Need at least one of these error handlers to keep ../scsi/hosts.c from</div><div class='add'>+ * complaining.  Doing a host- or bus-reset can't do anything good here.</div><div class='ctx'>  * Despite what it might say in scsi_error.c, there may well be commands</div><div class='ctx'>  * on the controller, as the cciss driver registers twice, once as a block</div><div class='ctx'>  * device for the logical drives, and once as a scsi device, for any tape</div><div class='ctx'>  * drives.  So we know there are no commands out on the tape drives, but we</div><div class='del'>- * don't know there are no commands on the controller, and it is likely </div><div class='add'>+ * don't know there are no commands on the controller, and it is likely</div><div class='ctx'>  * that there probably are, as the cciss block device is most commonly used</div><div class='ctx'>  * as a boot device (embedded controller on HP/Compaq systems.)</div><div class='ctx'> */</div><div class='head'>diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c<br/>index 3d31761c0ed0..74e03aa537ad 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/cryptoloop.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/cryptoloop.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/cryptoloop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/cryptoloop.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include "loop.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c<br/>index 2d3d50ab74bf..8d7bcfa49c12 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/drbd/drbd_actlog.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/drbd/drbd_actlog.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/drbd/drbd_actlog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_actlog.c</a></div><div class='hunk'>@@ -148,7 +148,7 @@ static int _drbd_md_sync_page_io(struct drbd_device *device,</div><div class='ctx'> </div><div class='ctx'> 	if ((op == REQ_OP_WRITE) &amp;&amp; !test_bit(MD_NO_FUA, &amp;device-&gt;flags))</div><div class='ctx'> 		op_flags |= REQ_FUA | REQ_PREFLUSH;</div><div class='del'>-	op_flags |= REQ_SYNC | REQ_NOIDLE;</div><div class='add'>+	op_flags |= REQ_SYNC;</div><div class='ctx'> </div><div class='ctx'> 	bio = bio_alloc_drbd(GFP_NOIO);</div><div class='ctx'> 	bio-&gt;bi_bdev = bdev-&gt;md_bdev;</div><div class='head'>diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c<br/>index ab62b81c2ca7..dece26f119d4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/drbd/drbd_bitmap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/drbd/drbd_bitmap.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/drbd/drbd_bitmap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_bitmap.c</a></div><div class='hunk'>@@ -1070,7 +1070,7 @@ static int bm_rw(struct drbd_device *device, const unsigned int flags, unsigned</div><div class='ctx'> 		.done = 0,</div><div class='ctx'> 		.flags = flags,</div><div class='ctx'> 		.error = 0,</div><div class='del'>-		.kref = { ATOMIC_INIT(2) },</div><div class='add'>+		.kref = KREF_INIT(2),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (!get_ldev_if_state(device, D_ATTACHING)) {  /* put is in drbd_bm_aio_ctx_destroy() */</div><div class='head'>diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h<br/>index 4cb8f21ff4ef..724d1c50fc52 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/drbd/drbd_int.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/drbd/drbd_int.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/drbd/drbd_int.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_int.h</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='head'>diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c<br/>index 83482721bc01..92c60cbd04ee 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/drbd/drbd_main.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/drbd/drbd_main.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/drbd/drbd_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_main.c</a></div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> #define __KERNEL_SYSCALLS__</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/drbd_limits.h&gt;</div><div class='ctx'> #include "drbd_int.h"</div><div class='hunk'>@@ -1846,7 +1847,7 @@ int drbd_send_out_of_sync(struct drbd_peer_device *peer_device, struct drbd_requ</div><div class='ctx'> int drbd_send(struct drbd_connection *connection, struct socket *sock,</div><div class='ctx'> 	      void *buf, size_t size, unsigned msg_flags)</div><div class='ctx'> {</div><div class='del'>-	struct kvec iov;</div><div class='add'>+	struct kvec iov = {.iov_base = buf, .iov_len = size};</div><div class='ctx'> 	struct msghdr msg;</div><div class='ctx'> 	int rv, sent = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1855,15 +1856,14 @@ int drbd_send(struct drbd_connection *connection, struct socket *sock,</div><div class='ctx'> </div><div class='ctx'> 	/* THINK  if (signal_pending) return ... ? */</div><div class='ctx'> </div><div class='del'>-	iov.iov_base = buf;</div><div class='del'>-	iov.iov_len  = size;</div><div class='del'>-</div><div class='ctx'> 	msg.msg_name       = NULL;</div><div class='ctx'> 	msg.msg_namelen    = 0;</div><div class='ctx'> 	msg.msg_control    = NULL;</div><div class='ctx'> 	msg.msg_controllen = 0;</div><div class='ctx'> 	msg.msg_flags      = msg_flags | MSG_NOSIGNAL;</div><div class='ctx'> </div><div class='add'>+	iov_iter_kvec(&amp;msg.msg_iter, WRITE | ITER_KVEC, &amp;iov, 1, size);</div><div class='add'>+</div><div class='ctx'> 	if (sock == connection-&gt;data.socket) {</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		connection-&gt;ko_count = rcu_dereference(connection-&gt;net_conf)-&gt;ko_count;</div><div class='hunk'>@@ -1871,7 +1871,7 @@ int drbd_send(struct drbd_connection *connection, struct socket *sock,</div><div class='ctx'> 		drbd_update_congested(connection);</div><div class='ctx'> 	}</div><div class='ctx'> 	do {</div><div class='del'>-		rv = kernel_sendmsg(sock, &amp;msg, &amp;iov, 1, iov.iov_len);</div><div class='add'>+		rv = sock_sendmsg(sock, &amp;msg);</div><div class='ctx'> 		if (rv == -EAGAIN) {</div><div class='ctx'> 			if (we_should_drop_the_connection(connection, sock))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1885,8 +1885,6 @@ int drbd_send(struct drbd_connection *connection, struct socket *sock,</div><div class='ctx'> 		if (rv &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		sent += rv;</div><div class='del'>-		iov.iov_base += rv;</div><div class='del'>-		iov.iov_len  -= rv;</div><div class='ctx'> 	} while (sent &lt; size);</div><div class='ctx'> </div><div class='ctx'> 	if (sock == connection-&gt;data.socket)</div><div class='hunk'>@@ -2462,7 +2460,7 @@ static int drbd_congested(void *congested_data, int bdi_bits)</div><div class='ctx'> </div><div class='ctx'> 	if (get_ldev(device)) {</div><div class='ctx'> 		q = bdev_get_queue(device-&gt;ldev-&gt;backing_bdev);</div><div class='del'>-		r = bdi_congested(&amp;q-&gt;backing_dev_info, bdi_bits);</div><div class='add'>+		r = bdi_congested(q-&gt;backing_dev_info, bdi_bits);</div><div class='ctx'> 		put_ldev(device);</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			reason = 'b';</div><div class='hunk'>@@ -2834,8 +2832,8 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig</div><div class='ctx'> 	/* we have no partitions. we contain only ourselves. */</div><div class='ctx'> 	device-&gt;this_bdev-&gt;bd_contains = device-&gt;this_bdev;</div><div class='ctx'> </div><div class='del'>-	q-&gt;backing_dev_info.congested_fn = drbd_congested;</div><div class='del'>-	q-&gt;backing_dev_info.congested_data = device;</div><div class='add'>+	q-&gt;backing_dev_info-&gt;congested_fn = drbd_congested;</div><div class='add'>+	q-&gt;backing_dev_info-&gt;congested_data = device;</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_make_request(q, drbd_make_request);</div><div class='ctx'> 	blk_queue_write_cache(q, true, true);</div><div class='hunk'>@@ -2915,11 +2913,9 @@ out_idr_remove_vol:</div><div class='ctx'> 	idr_remove(&amp;connection-&gt;peer_devices, vnr);</div><div class='ctx'> out_idr_remove_from_resource:</div><div class='ctx'> 	for_each_connection(connection, resource) {</div><div class='del'>-		peer_device = idr_find(&amp;connection-&gt;peer_devices, vnr);</div><div class='del'>-		if (peer_device) {</div><div class='del'>-			idr_remove(&amp;connection-&gt;peer_devices, vnr);</div><div class='add'>+		peer_device = idr_remove(&amp;connection-&gt;peer_devices, vnr);</div><div class='add'>+		if (peer_device)</div><div class='ctx'> 			kref_put(&amp;connection-&gt;kref, drbd_destroy_connection);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	for_each_peer_device_safe(peer_device, tmp_peer_device, device) {</div><div class='ctx'> 		list_del(&amp;peer_device-&gt;peer_devices);</div><div class='hunk'>@@ -2948,7 +2944,6 @@ void drbd_delete_device(struct drbd_device *device)</div><div class='ctx'> 	struct drbd_resource *resource = device-&gt;resource;</div><div class='ctx'> 	struct drbd_connection *connection;</div><div class='ctx'> 	struct drbd_peer_device *peer_device;</div><div class='del'>-	int refs = 3;</div><div class='ctx'> </div><div class='ctx'> 	/* move to free_peer_device() */</div><div class='ctx'> 	for_each_peer_device(peer_device, device)</div><div class='hunk'>@@ -2956,13 +2951,15 @@ void drbd_delete_device(struct drbd_device *device)</div><div class='ctx'> 	drbd_debugfs_device_cleanup(device);</div><div class='ctx'> 	for_each_connection(connection, resource) {</div><div class='ctx'> 		idr_remove(&amp;connection-&gt;peer_devices, device-&gt;vnr);</div><div class='del'>-		refs++;</div><div class='add'>+		kref_put(&amp;device-&gt;kref, drbd_destroy_device);</div><div class='ctx'> 	}</div><div class='ctx'> 	idr_remove(&amp;resource-&gt;devices, device-&gt;vnr);</div><div class='add'>+	kref_put(&amp;device-&gt;kref, drbd_destroy_device);</div><div class='ctx'> 	idr_remove(&amp;drbd_devices, device_to_minor(device));</div><div class='add'>+	kref_put(&amp;device-&gt;kref, drbd_destroy_device);</div><div class='ctx'> 	del_gendisk(device-&gt;vdisk);</div><div class='ctx'> 	synchronize_rcu();</div><div class='del'>-	kref_sub(&amp;device-&gt;kref, refs, drbd_destroy_device);</div><div class='add'>+	kref_put(&amp;device-&gt;kref, drbd_destroy_device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init drbd_init(void)</div><div class='head'>diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c<br/>index f35db29cac76..908c704e20aa 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/drbd/drbd_nl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/drbd/drbd_nl.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/drbd/drbd_nl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_nl.c</a></div><div class='hunk'>@@ -1328,11 +1328,13 @@ static void drbd_setup_queue_param(struct drbd_device *device, struct drbd_backi</div><div class='ctx'> 	if (b) {</div><div class='ctx'> 		blk_queue_stack_limits(q, b);</div><div class='ctx'> </div><div class='del'>-		if (q-&gt;backing_dev_info.ra_pages != b-&gt;backing_dev_info.ra_pages) {</div><div class='add'>+		if (q-&gt;backing_dev_info-&gt;ra_pages !=</div><div class='add'>+		    b-&gt;backing_dev_info-&gt;ra_pages) {</div><div class='ctx'> 			drbd_info(device, "Adjusting my ra_pages to backing device's (%lu -&gt; %lu)\n",</div><div class='del'>-				 q-&gt;backing_dev_info.ra_pages,</div><div class='del'>-				 b-&gt;backing_dev_info.ra_pages);</div><div class='del'>-			q-&gt;backing_dev_info.ra_pages = b-&gt;backing_dev_info.ra_pages;</div><div class='add'>+				 q-&gt;backing_dev_info-&gt;ra_pages,</div><div class='add'>+				 b-&gt;backing_dev_info-&gt;ra_pages);</div><div class='add'>+			q-&gt;backing_dev_info-&gt;ra_pages =</div><div class='add'>+						b-&gt;backing_dev_info-&gt;ra_pages;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	fixup_discard_if_not_supported(q);</div><div class='hunk'>@@ -3345,7 +3347,7 @@ static void device_to_statistics(struct device_statistics *s,</div><div class='ctx'> 		s-&gt;dev_disk_flags = md-&gt;flags;</div><div class='ctx'> 		q = bdev_get_queue(device-&gt;ldev-&gt;backing_bdev);</div><div class='ctx'> 		s-&gt;dev_lower_blocked =</div><div class='del'>-			bdi_congested(&amp;q-&gt;backing_dev_info,</div><div class='add'>+			bdi_congested(q-&gt;backing_dev_info,</div><div class='ctx'> 				      (1 &lt;&lt; WB_async_congested) |</div><div class='ctx'> 				      (1 &lt;&lt; WB_sync_congested));</div><div class='ctx'> 		put_ldev(device);</div><div class='head'>diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c<br/>index be2b93fd2c11..8378142f7a55 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/drbd/drbd_proc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/drbd/drbd_proc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/drbd/drbd_proc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_proc.c</a></div><div class='hunk'>@@ -288,7 +288,7 @@ static int drbd_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			seq_printf(seq, "%2d: cs:Unconfigured\n", i);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* reset device-&gt;congestion_reason */</div><div class='del'>-			bdi_rw_congested(&amp;device-&gt;rq_queue-&gt;backing_dev_info);</div><div class='add'>+			bdi_rw_congested(device-&gt;rq_queue-&gt;backing_dev_info);</div><div class='ctx'> </div><div class='ctx'> 			nc = rcu_dereference(first_peer_device(device)-&gt;connection-&gt;net_conf);</div><div class='ctx'> 			wp = nc ? nc-&gt;wire_protocol - DRBD_PROT_A + 'A' : ' ';</div><div class='head'>diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c<br/>index 942384f34e22..aa6bf9692eff 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/drbd/drbd_receiver.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/drbd/drbd_receiver.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/drbd/drbd_receiver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_receiver.c</a></div><div class='hunk'>@@ -36,6 +36,8 @@</div><div class='ctx'> #include &lt;linux/memcontrol.h&gt;</div><div class='ctx'> #include &lt;linux/mm_inline.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;uapi/linux/sched/types.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/pkt_sched.h&gt;</div><div class='ctx'> #define __KERNEL_SYSCALLS__</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='hunk'>@@ -1266,7 +1268,7 @@ static void submit_one_flush(struct drbd_device *device, struct issue_flush_cont</div><div class='ctx'> 	bio-&gt;bi_bdev = device-&gt;ldev-&gt;backing_bdev;</div><div class='ctx'> 	bio-&gt;bi_private = octx;</div><div class='ctx'> 	bio-&gt;bi_end_io = one_flush_endio;</div><div class='del'>-	bio_set_op_attrs(bio, REQ_OP_FLUSH, WRITE_FLUSH);</div><div class='add'>+	bio-&gt;bi_opf = REQ_OP_FLUSH | REQ_PREFLUSH;</div><div class='ctx'> </div><div class='ctx'> 	device-&gt;flush_jif = jiffies;</div><div class='ctx'> 	set_bit(FLUSH_PENDING, &amp;device-&gt;flags);</div><div class='hunk'>@@ -1648,20 +1650,8 @@ next_bio:</div><div class='ctx'> </div><div class='ctx'> 	page_chain_for_each(page) {</div><div class='ctx'> 		unsigned len = min_t(unsigned, data_size, PAGE_SIZE);</div><div class='del'>-		if (!bio_add_page(bio, page, len, 0)) {</div><div class='del'>-			/* A single page must always be possible!</div><div class='del'>-			 * But in case it fails anyways,</div><div class='del'>-			 * we deal with it, and complain (below). */</div><div class='del'>-			if (bio-&gt;bi_vcnt == 0) {</div><div class='del'>-				drbd_err(device,</div><div class='del'>-					"bio_add_page failed for len=%u, "</div><div class='del'>-					"bi_vcnt=0 (bi_sector=%llu)\n",</div><div class='del'>-					len, (uint64_t)bio-&gt;bi_iter.bi_sector);</div><div class='del'>-				err = -ENOSPC;</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='add'>+		if (!bio_add_page(bio, page, len, 0))</div><div class='ctx'> 			goto next_bio;</div><div class='del'>-		}</div><div class='ctx'> 		data_size -= len;</div><div class='ctx'> 		sector += len &gt;&gt; 9;</div><div class='ctx'> 		--nr_pages;</div><div class='head'>diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c<br/>index de279fe4e4fd..652114ae1a8a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/drbd/drbd_req.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/drbd/drbd_req.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/drbd/drbd_req.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_req.c</a></div><div class='hunk'>@@ -421,7 +421,6 @@ static void mod_rq_state(struct drbd_request *req, struct bio_and_error *m,</div><div class='ctx'> 	struct drbd_peer_device *peer_device = first_peer_device(device);</div><div class='ctx'> 	unsigned s = req-&gt;rq_state;</div><div class='ctx'> 	int c_put = 0;</div><div class='del'>-	int k_put = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (drbd_suspended(device) &amp;&amp; !((s | clear) &amp; RQ_COMPLETION_SUSP))</div><div class='ctx'> 		set |= RQ_COMPLETION_SUSP;</div><div class='hunk'>@@ -437,6 +436,8 @@ static void mod_rq_state(struct drbd_request *req, struct bio_and_error *m,</div><div class='ctx'> </div><div class='ctx'> 	/* intent: get references */</div><div class='ctx'> </div><div class='add'>+	kref_get(&amp;req-&gt;kref);</div><div class='add'>+</div><div class='ctx'> 	if (!(s &amp; RQ_LOCAL_PENDING) &amp;&amp; (set &amp; RQ_LOCAL_PENDING))</div><div class='ctx'> 		atomic_inc(&amp;req-&gt;completion_ref);</div><div class='ctx'> </div><div class='hunk'>@@ -473,15 +474,12 @@ static void mod_rq_state(struct drbd_request *req, struct bio_and_error *m,</div><div class='ctx'> </div><div class='ctx'> 	if (!(s &amp; RQ_LOCAL_ABORTED) &amp;&amp; (set &amp; RQ_LOCAL_ABORTED)) {</div><div class='ctx'> 		D_ASSERT(device, req-&gt;rq_state &amp; RQ_LOCAL_PENDING);</div><div class='del'>-		/* local completion may still come in later,</div><div class='del'>-		 * we need to keep the req object around. */</div><div class='del'>-		kref_get(&amp;req-&gt;kref);</div><div class='ctx'> 		++c_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((s &amp; RQ_LOCAL_PENDING) &amp;&amp; (clear &amp; RQ_LOCAL_PENDING)) {</div><div class='ctx'> 		if (req-&gt;rq_state &amp; RQ_LOCAL_ABORTED)</div><div class='del'>-			++k_put;</div><div class='add'>+			kref_put(&amp;req-&gt;kref, drbd_req_destroy);</div><div class='ctx'> 		else</div><div class='ctx'> 			++c_put;</div><div class='ctx'> 		list_del_init(&amp;req-&gt;req_pending_local);</div><div class='hunk'>@@ -503,7 +501,7 @@ static void mod_rq_state(struct drbd_request *req, struct bio_and_error *m,</div><div class='ctx'> 		if (s &amp; RQ_NET_SENT)</div><div class='ctx'> 			atomic_sub(req-&gt;i.size &gt;&gt; 9, &amp;device-&gt;ap_in_flight);</div><div class='ctx'> 		if (s &amp; RQ_EXP_BARR_ACK)</div><div class='del'>-			++k_put;</div><div class='add'>+			kref_put(&amp;req-&gt;kref, drbd_req_destroy);</div><div class='ctx'> 		req-&gt;net_done_jif = jiffies;</div><div class='ctx'> </div><div class='ctx'> 		/* in ahead/behind mode, or just in case,</div><div class='hunk'>@@ -516,25 +514,16 @@ static void mod_rq_state(struct drbd_request *req, struct bio_and_error *m,</div><div class='ctx'> </div><div class='ctx'> 	/* potentially complete and destroy */</div><div class='ctx'> </div><div class='del'>-	if (k_put || c_put) {</div><div class='del'>-		/* Completion does it's own kref_put.  If we are going to</div><div class='del'>-		 * kref_sub below, we need req to be still around then. */</div><div class='del'>-		int at_least = k_put + !!c_put;</div><div class='del'>-		int refcount = atomic_read(&amp;req-&gt;kref.refcount);</div><div class='del'>-		if (refcount &lt; at_least)</div><div class='del'>-			drbd_err(device,</div><div class='del'>-				"mod_rq_state: Logic BUG: %x -&gt; %x: refcount = %d, should be &gt;= %d\n",</div><div class='del'>-				s, req-&gt;rq_state, refcount, at_least);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* If we made progress, retry conflicting peer requests, if any. */</div><div class='ctx'> 	if (req-&gt;i.waiting)</div><div class='ctx'> 		wake_up(&amp;device-&gt;misc_wait);</div><div class='ctx'> </div><div class='del'>-	if (c_put)</div><div class='del'>-		k_put += drbd_req_put_completion_ref(req, m, c_put);</div><div class='del'>-	if (k_put)</div><div class='del'>-		kref_sub(&amp;req-&gt;kref, k_put, drbd_req_destroy);</div><div class='add'>+	if (c_put) {</div><div class='add'>+		if (drbd_req_put_completion_ref(req, m, c_put))</div><div class='add'>+			kref_put(&amp;req-&gt;kref, drbd_req_destroy);</div><div class='add'>+	} else {</div><div class='add'>+		kref_put(&amp;req-&gt;kref, drbd_req_destroy);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void drbd_report_io_error(struct drbd_device *device, struct drbd_request *req)</div><div class='hunk'>@@ -938,7 +927,7 @@ static bool remote_due_to_read_balancing(struct drbd_device *device, sector_t se</div><div class='ctx'> </div><div class='ctx'> 	switch (rbm) {</div><div class='ctx'> 	case RB_CONGESTED_REMOTE:</div><div class='del'>-		bdi = &amp;device-&gt;ldev-&gt;backing_bdev-&gt;bd_disk-&gt;queue-&gt;backing_dev_info;</div><div class='add'>+		bdi = device-&gt;ldev-&gt;backing_bdev-&gt;bd_disk-&gt;queue-&gt;backing_dev_info;</div><div class='ctx'> 		return bdi_read_congested(bdi);</div><div class='ctx'> 	case RB_LEAST_PENDING:</div><div class='ctx'> 		return atomic_read(&amp;device-&gt;local_cnt) &gt;</div><div class='head'>diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c<br/>index c6755c9a0aea..3bff33f21435 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/drbd/drbd_worker.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/drbd/drbd_worker.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/drbd/drbd_worker.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/drbd/drbd_worker.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/drbd.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/memcontrol.h&gt;</div><div class='head'>diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c<br/>index e3d8e4ced4a2..45b4384f650c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/floppy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/floppy.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/floppy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/floppy.c</a></div><div class='hunk'>@@ -2900,8 +2900,8 @@ static void do_fd_request(struct request_queue *q)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN(atomic_read(&amp;usage_count) == 0,</div><div class='del'>-		 "warning: usage count=0, current_req=%p sect=%ld type=%x flags=%llx\n",</div><div class='del'>-		 current_req, (long)blk_rq_pos(current_req), current_req-&gt;cmd_type,</div><div class='add'>+		 "warning: usage count=0, current_req=%p sect=%ld flags=%llx\n",</div><div class='add'>+		 current_req, (long)blk_rq_pos(current_req),</div><div class='ctx'> 		 (unsigned long long) current_req-&gt;cmd_flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -3119,7 +3119,7 @@ static int raw_cmd_copyin(int cmd, void __user *param,</div><div class='ctx'> 	*rcmd = NULL;</div><div class='ctx'> </div><div class='ctx'> loop:</div><div class='del'>-	ptr = kmalloc(sizeof(struct floppy_raw_cmd), GFP_USER);</div><div class='add'>+	ptr = kmalloc(sizeof(struct floppy_raw_cmd), GFP_KERNEL);</div><div class='ctx'> 	if (!ptr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	*rcmd = ptr;</div><div class='hunk'>@@ -3806,14 +3806,10 @@ static int __floppy_read_block_0(struct block_device *bdev, int drive)</div><div class='ctx'> </div><div class='ctx'> 	cbdata.drive = drive;</div><div class='ctx'> </div><div class='del'>-	bio_init(&amp;bio);</div><div class='del'>-	bio.bi_io_vec = &amp;bio_vec;</div><div class='del'>-	bio_vec.bv_page = page;</div><div class='del'>-	bio_vec.bv_len = size;</div><div class='del'>-	bio_vec.bv_offset = 0;</div><div class='del'>-	bio.bi_vcnt = 1;</div><div class='del'>-	bio.bi_iter.bi_size = size;</div><div class='add'>+	bio_init(&amp;bio, &amp;bio_vec, 1);</div><div class='ctx'> 	bio.bi_bdev = bdev;</div><div class='add'>+	bio_add_page(&amp;bio, page, size, 0);</div><div class='add'>+</div><div class='ctx'> 	bio.bi_iter.bi_sector = 0;</div><div class='ctx'> 	bio.bi_flags |= (1 &lt;&lt; BIO_QUIET);</div><div class='ctx'> 	bio.bi_private = &amp;cbdata;</div><div class='head'>diff --git a/drivers/block/hd.c b/drivers/block/hd.c<br/>index 3abb121825bc..6043648da1e8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/hd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/hd.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/hd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/hd.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> </div><div class='ctx'> #define REALLY_SLOW_IO</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef __arm__</div><div class='ctx'> #undef  HD_IRQ</div><div class='hunk'>@@ -626,30 +626,29 @@ repeat:</div><div class='ctx'> 		req_data_dir(req) == READ ? "read" : "writ",</div><div class='ctx'> 		cyl, head, sec, nsect, bio_data(req-&gt;bio));</div><div class='ctx'> #endif</div><div class='del'>-	if (req-&gt;cmd_type == REQ_TYPE_FS) {</div><div class='del'>-		switch (rq_data_dir(req)) {</div><div class='del'>-		case READ:</div><div class='del'>-			hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_READ,</div><div class='del'>-				&amp;read_intr);</div><div class='del'>-			if (reset)</div><div class='del'>-				goto repeat;</div><div class='del'>-			break;</div><div class='del'>-		case WRITE:</div><div class='del'>-			hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_WRITE,</div><div class='del'>-				&amp;write_intr);</div><div class='del'>-			if (reset)</div><div class='del'>-				goto repeat;</div><div class='del'>-			if (wait_DRQ()) {</div><div class='del'>-				bad_rw_intr();</div><div class='del'>-				goto repeat;</div><div class='del'>-			}</div><div class='del'>-			outsw(HD_DATA, bio_data(req-&gt;bio), 256);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk("unknown hd-command\n");</div><div class='del'>-			hd_end_request_cur(-EIO);</div><div class='del'>-			break;</div><div class='add'>+</div><div class='add'>+	switch (req_op(req)) {</div><div class='add'>+	case REQ_OP_READ:</div><div class='add'>+		hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_READ,</div><div class='add'>+			&amp;read_intr);</div><div class='add'>+		if (reset)</div><div class='add'>+			goto repeat;</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_WRITE:</div><div class='add'>+		hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_WRITE,</div><div class='add'>+			&amp;write_intr);</div><div class='add'>+		if (reset)</div><div class='add'>+			goto repeat;</div><div class='add'>+		if (wait_DRQ()) {</div><div class='add'>+			bad_rw_intr();</div><div class='add'>+			goto repeat;</div><div class='ctx'> 		}</div><div class='add'>+		outsw(HD_DATA, bio_data(req-&gt;bio), 256);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk("unknown hd-command\n");</div><div class='add'>+		hd_end_request_cur(-EIO);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/loop.c b/drivers/block/loop.c<br/>index fa1b7a90ba11..0ecb6461ed81 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/loop.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/loop.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/loop.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/loop.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include "loop.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_IDR(loop_index_idr);</div><div class='ctx'> static DEFINE_MUTEX(loop_index_mutex);</div><div class='hunk'>@@ -186,7 +186,7 @@ static void __loop_update_dio(struct loop_device *lo, bool dio)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * TODO: the above condition may be loosed in the future, and</div><div class='ctx'> 	 * direct I/O may be switched runtime at that time because most</div><div class='del'>-	 * of requests in sane appplications should be PAGE_SIZE algined</div><div class='add'>+	 * of requests in sane applications should be PAGE_SIZE aligned</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (dio) {</div><div class='ctx'> 		if (queue_logical_block_size(lo-&gt;lo_queue) &gt;= sb_bsize &amp;&amp;</div><div class='hunk'>@@ -501,9 +501,9 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,</div><div class='ctx'> 	cmd-&gt;iocb.ki_flags = IOCB_DIRECT;</div><div class='ctx'> </div><div class='ctx'> 	if (rw == WRITE)</div><div class='del'>-		ret = file-&gt;f_op-&gt;write_iter(&amp;cmd-&gt;iocb, &amp;iter);</div><div class='add'>+		ret = call_write_iter(file, &amp;cmd-&gt;iocb, &amp;iter);</div><div class='ctx'> 	else</div><div class='del'>-		ret = file-&gt;f_op-&gt;read_iter(&amp;cmd-&gt;iocb, &amp;iter);</div><div class='add'>+		ret = call_read_iter(file, &amp;cmd-&gt;iocb, &amp;iter);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != -EIOCBQUEUED)</div><div class='ctx'> 		cmd-&gt;iocb.ki_complete(&amp;cmd-&gt;iocb, ret, 0);</div><div class='hunk'>@@ -1097,9 +1097,12 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)</div><div class='ctx'> 	if ((unsigned int) info-&gt;lo_encrypt_key_size &gt; LO_KEY_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* I/O need to be drained during transfer transition */</div><div class='add'>+	blk_mq_freeze_queue(lo-&gt;lo_queue);</div><div class='add'>+</div><div class='ctx'> 	err = loop_release_xfer(lo);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;lo_encrypt_type) {</div><div class='ctx'> 		unsigned int type = info-&gt;lo_encrypt_type;</div><div class='hunk'>@@ -1114,12 +1117,14 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)</div><div class='ctx'> </div><div class='ctx'> 	err = loop_init_xfer(lo, xfer, info);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	if (lo-&gt;lo_offset != info-&gt;lo_offset ||</div><div class='ctx'> 	    lo-&gt;lo_sizelimit != info-&gt;lo_sizelimit)</div><div class='del'>-		if (figure_loop_size(lo, info-&gt;lo_offset, info-&gt;lo_sizelimit))</div><div class='del'>-			return -EFBIG;</div><div class='add'>+		if (figure_loop_size(lo, info-&gt;lo_offset, info-&gt;lo_sizelimit)) {</div><div class='add'>+			err = -EFBIG;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	loop_config_discard(lo);</div><div class='ctx'> </div><div class='hunk'>@@ -1137,13 +1142,6 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)</div><div class='ctx'> 	     (info-&gt;lo_flags &amp; LO_FLAGS_AUTOCLEAR))</div><div class='ctx'> 		lo-&gt;lo_flags ^= LO_FLAGS_AUTOCLEAR;</div><div class='ctx'> </div><div class='del'>-	if ((info-&gt;lo_flags &amp; LO_FLAGS_PARTSCAN) &amp;&amp;</div><div class='del'>-	     !(lo-&gt;lo_flags &amp; LO_FLAGS_PARTSCAN)) {</div><div class='del'>-		lo-&gt;lo_flags |= LO_FLAGS_PARTSCAN;</div><div class='del'>-		lo-&gt;lo_disk-&gt;flags &amp;= ~GENHD_FL_NO_PART_SCAN;</div><div class='del'>-		loop_reread_partitions(lo, lo-&gt;lo_device);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	lo-&gt;lo_encrypt_key_size = info-&gt;lo_encrypt_key_size;</div><div class='ctx'> 	lo-&gt;lo_init[0] = info-&gt;lo_init[0];</div><div class='ctx'> 	lo-&gt;lo_init[1] = info-&gt;lo_init[1];</div><div class='hunk'>@@ -1156,7 +1154,17 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)</div><div class='ctx'> 	/* update dio if lo_offset or transfer is changed */</div><div class='ctx'> 	__loop_update_dio(lo, lo-&gt;use_dio);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+ exit:</div><div class='add'>+	blk_mq_unfreeze_queue(lo-&gt;lo_queue);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; (info-&gt;lo_flags &amp; LO_FLAGS_PARTSCAN) &amp;&amp;</div><div class='add'>+	     !(lo-&gt;lo_flags &amp; LO_FLAGS_PARTSCAN)) {</div><div class='add'>+		lo-&gt;lo_flags |= LO_FLAGS_PARTSCAN;</div><div class='add'>+		lo-&gt;lo_disk-&gt;flags &amp;= ~GENHD_FL_NO_PART_SCAN;</div><div class='add'>+		loop_reread_partitions(lo, lo-&gt;lo_device);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1168,7 +1176,8 @@ loop_get_status(struct loop_device *lo, struct loop_info64 *info)</div><div class='ctx'> </div><div class='ctx'> 	if (lo-&gt;lo_state != Lo_bound)</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	error = vfs_getattr(&amp;file-&gt;f_path, &amp;stat);</div><div class='add'>+	error = vfs_getattr(&amp;file-&gt;f_path, &amp;stat,</div><div class='add'>+			    STATX_INO, AT_STATX_SYNC_AS_STAT);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	memset(info, 0, sizeof(*info));</div><div class='hunk'>@@ -1646,7 +1655,7 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	blk_mq_start_request(bd-&gt;rq);</div><div class='ctx'> </div><div class='ctx'> 	if (lo-&gt;lo_state != Lo_bound)</div><div class='del'>-		return -EIO;</div><div class='add'>+		return BLK_MQ_RQ_QUEUE_ERROR;</div><div class='ctx'> </div><div class='ctx'> 	switch (req_op(cmd-&gt;rq)) {</div><div class='ctx'> 	case REQ_OP_FLUSH:</div><div class='head'>diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c<br/>index e937fcf71769..286f276f586e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/mg_disk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/mg_disk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/mg_disk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/mg_disk.c</a></div><div class='hunk'>@@ -670,15 +670,17 @@ static void mg_request_poll(struct request_queue *q)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (unlikely(host-&gt;req-&gt;cmd_type != REQ_TYPE_FS)) {</div><div class='del'>-			mg_end_request_cur(host, -EIO);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rq_data_dir(host-&gt;req) == READ)</div><div class='add'>+		switch (req_op(host-&gt;req)) {</div><div class='add'>+		case REQ_OP_READ:</div><div class='ctx'> 			mg_read(host-&gt;req);</div><div class='del'>-		else</div><div class='add'>+			break;</div><div class='add'>+		case REQ_OP_WRITE:</div><div class='ctx'> 			mg_write(host-&gt;req);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			mg_end_request_cur(host, -EIO);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -687,13 +689,15 @@ static unsigned int mg_issue_req(struct request *req,</div><div class='ctx'> 		unsigned int sect_num,</div><div class='ctx'> 		unsigned int sect_cnt)</div><div class='ctx'> {</div><div class='del'>-	if (rq_data_dir(req) == READ) {</div><div class='add'>+	switch (req_op(host-&gt;req)) {</div><div class='add'>+	case REQ_OP_READ:</div><div class='ctx'> 		if (mg_out(host, sect_num, sect_cnt, MG_CMD_RD, &amp;mg_read_intr)</div><div class='ctx'> 				!= MG_ERR_NONE) {</div><div class='ctx'> 			mg_bad_rw_intr(host);</div><div class='ctx'> 			return host-&gt;error;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_WRITE:</div><div class='ctx'> 		/* TODO : handler */</div><div class='ctx'> 		outb(ATA_NIEN, (unsigned long)host-&gt;dev_base + MG_REG_DRV_CTRL);</div><div class='ctx'> 		if (mg_out(host, sect_num, sect_cnt, MG_CMD_WR, &amp;mg_write_intr)</div><div class='hunk'>@@ -712,6 +716,10 @@ static unsigned int mg_issue_req(struct request *req,</div><div class='ctx'> 		mod_timer(&amp;host-&gt;timer, jiffies + 3 * HZ);</div><div class='ctx'> 		outb(MG_CMD_WR_CONF, (unsigned long)host-&gt;dev_base +</div><div class='ctx'> 				MG_REG_COMMAND);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		mg_end_request_cur(host, -EIO);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return MG_ERR_NONE;</div><div class='ctx'> }</div><div class='hunk'>@@ -753,11 +761,6 @@ static void mg_request(struct request_queue *q)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (unlikely(req-&gt;cmd_type != REQ_TYPE_FS)) {</div><div class='del'>-			mg_end_request_cur(host, -EIO);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (!mg_issue_req(req, host, sect_num, sect_cnt))</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c<br/>index 3cfd879267b2..f96ab717534c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/mtip32xx/mtip32xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/mtip32xx/mtip32xx.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/mtip32xx/mtip32xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/mtip32xx/mtip32xx.c</a></div><div class='hunk'>@@ -2035,18 +2035,14 @@ static int exec_drive_taskfile(struct driver_data *dd,</div><div class='ctx'> 	taskout = req_task-&gt;out_size;</div><div class='ctx'> 	taskin = req_task-&gt;in_size;</div><div class='ctx'> 	/* 130560 = 512 * 0xFF*/</div><div class='del'>-	if (taskin &gt; 130560 || taskout &gt; 130560) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto abort;</div><div class='del'>-	}</div><div class='add'>+	if (taskin &gt; 130560 || taskout &gt; 130560)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (taskout) {</div><div class='ctx'> 		outbuf = memdup_user(buf + outtotal, taskout);</div><div class='del'>-		if (IS_ERR(outbuf)) {</div><div class='del'>-			err = PTR_ERR(outbuf);</div><div class='del'>-			outbuf = NULL;</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='add'>+		if (IS_ERR(outbuf))</div><div class='add'>+			return PTR_ERR(outbuf);</div><div class='add'>+</div><div class='ctx'> 		outbuf_dma = pci_map_single(dd-&gt;pdev,</div><div class='ctx'> 					 outbuf,</div><div class='ctx'> 					 taskout,</div><div class='hunk'>@@ -3937,8 +3933,10 @@ static int mtip_block_initialize(struct driver_data *dd)</div><div class='ctx'> </div><div class='ctx'> 	/* Generate the disk name, implemented same as in sd.c */</div><div class='ctx'> 	do {</div><div class='del'>-		if (!ida_pre_get(&amp;rssd_index_ida, GFP_KERNEL))</div><div class='add'>+		if (!ida_pre_get(&amp;rssd_index_ida, GFP_KERNEL)) {</div><div class='add'>+			rv = -ENOMEM;</div><div class='ctx'> 			goto ida_get_error;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;rssd_index_lock);</div><div class='ctx'> 		rv = ida_get_new(&amp;rssd_index_ida, &amp;index);</div><div class='head'>diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c<br/>index 7a1048755914..7e4287bc19e5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/nbd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/nbd.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/nbd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/nbd.c</a></div><div class='hunk'>@@ -36,31 +36,42 @@</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/blk-mq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/nbd.h&gt;</div><div class='ctx'> </div><div class='add'>+static DEFINE_IDR(nbd_index_idr);</div><div class='add'>+static DEFINE_MUTEX(nbd_index_mutex);</div><div class='add'>+</div><div class='add'>+struct nbd_sock {</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct mutex tx_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define NBD_TIMEDOUT			0</div><div class='ctx'> #define NBD_DISCONNECT_REQUESTED	1</div><div class='add'>+#define NBD_DISCONNECTED		2</div><div class='add'>+#define NBD_RUNNING			3</div><div class='ctx'> </div><div class='ctx'> struct nbd_device {</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	unsigned long runtime_flags;</div><div class='del'>-	struct socket * sock;	/* If == NULL, device is not ready, yet	*/</div><div class='add'>+	struct nbd_sock **socks;</div><div class='ctx'> 	int magic;</div><div class='ctx'> </div><div class='ctx'> 	struct blk_mq_tag_set tag_set;</div><div class='ctx'> </div><div class='del'>-	struct mutex tx_lock;</div><div class='add'>+	struct mutex config_lock;</div><div class='ctx'> 	struct gendisk *disk;</div><div class='del'>-	int blksize;</div><div class='add'>+	int num_connections;</div><div class='add'>+	atomic_t recv_threads;</div><div class='add'>+	wait_queue_head_t recv_wq;</div><div class='add'>+	loff_t blksize;</div><div class='ctx'> 	loff_t bytesize;</div><div class='ctx'> </div><div class='del'>-	/* protects initialization and shutdown of the socket */</div><div class='del'>-	spinlock_t sock_lock;</div><div class='ctx'> 	struct task_struct *task_recv;</div><div class='del'>-	struct task_struct *task_send;</div><div class='add'>+	struct task_struct *task_setup;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_DEBUG_FS)</div><div class='ctx'> 	struct dentry *dbg_dir;</div><div class='hunk'>@@ -69,7 +80,7 @@ struct nbd_device {</div><div class='ctx'> </div><div class='ctx'> struct nbd_cmd {</div><div class='ctx'> 	struct nbd_device *nbd;</div><div class='del'>-	struct list_head list;</div><div class='add'>+	struct completion send_complete;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_DEBUG_FS)</div><div class='hunk'>@@ -81,8 +92,13 @@ static struct dentry *nbd_dbg_dir;</div><div class='ctx'> #define NBD_MAGIC 0x68797548</div><div class='ctx'> </div><div class='ctx'> static unsigned int nbds_max = 16;</div><div class='del'>-static struct nbd_device *nbd_dev;</div><div class='ctx'> static int max_part;</div><div class='add'>+static struct workqueue_struct *recv_workqueue;</div><div class='add'>+static int part_shift;</div><div class='add'>+</div><div class='add'>+static int nbd_dev_dbg_init(struct nbd_device *nbd);</div><div class='add'>+static void nbd_dev_dbg_close(struct nbd_device *nbd);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static inline struct device *nbd_to_dev(struct nbd_device *nbd)</div><div class='ctx'> {</div><div class='hunk'>@@ -108,7 +124,7 @@ static const char *nbdcmd_to_ascii(int cmd)</div><div class='ctx'> </div><div class='ctx'> static int nbd_size_clear(struct nbd_device *nbd, struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	bdev-&gt;bd_inode-&gt;i_size = 0;</div><div class='add'>+	bd_set_size(bdev, 0);</div><div class='ctx'> 	set_capacity(nbd-&gt;disk, 0);</div><div class='ctx'> 	kobject_uevent(&amp;nbd_to_dev(nbd)-&gt;kobj, KOBJ_CHANGE);</div><div class='ctx'> </div><div class='hunk'>@@ -117,29 +133,20 @@ static int nbd_size_clear(struct nbd_device *nbd, struct block_device *bdev)</div><div class='ctx'> </div><div class='ctx'> static void nbd_size_update(struct nbd_device *nbd, struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	if (!nbd_is_connected(nbd))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bdev-&gt;bd_inode-&gt;i_size = nbd-&gt;bytesize;</div><div class='add'>+	blk_queue_logical_block_size(nbd-&gt;disk-&gt;queue, nbd-&gt;blksize);</div><div class='add'>+	blk_queue_physical_block_size(nbd-&gt;disk-&gt;queue, nbd-&gt;blksize);</div><div class='add'>+	bd_set_size(bdev, nbd-&gt;bytesize);</div><div class='ctx'> 	set_capacity(nbd-&gt;disk, nbd-&gt;bytesize &gt;&gt; 9);</div><div class='ctx'> 	kobject_uevent(&amp;nbd_to_dev(nbd)-&gt;kobj, KOBJ_CHANGE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nbd_size_set(struct nbd_device *nbd, struct block_device *bdev,</div><div class='del'>-			int blocksize, int nr_blocks)</div><div class='add'>+static void nbd_size_set(struct nbd_device *nbd, struct block_device *bdev,</div><div class='add'>+			loff_t blocksize, loff_t nr_blocks)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = set_blocksize(bdev, blocksize);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	nbd-&gt;blksize = blocksize;</div><div class='del'>-	nbd-&gt;bytesize = (loff_t)blocksize * (loff_t)nr_blocks;</div><div class='del'>-</div><div class='del'>-	nbd_size_update(nbd, bdev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	nbd-&gt;bytesize = blocksize * nr_blocks;</div><div class='add'>+	if (nbd_is_connected(nbd))</div><div class='add'>+		nbd_size_update(nbd, bdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nbd_end_request(struct nbd_cmd *cmd)</div><div class='hunk'>@@ -159,22 +166,20 @@ static void nbd_end_request(struct nbd_cmd *cmd)</div><div class='ctx'>  */</div><div class='ctx'> static void sock_shutdown(struct nbd_device *nbd)</div><div class='ctx'> {</div><div class='del'>-	struct socket *sock;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;nbd-&gt;sock_lock);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (!nbd-&gt;sock) {</div><div class='del'>-		spin_unlock(&amp;nbd-&gt;sock_lock);</div><div class='add'>+	if (nbd-&gt;num_connections == 0)</div><div class='add'>+		return;</div><div class='add'>+	if (test_and_set_bit(NBD_DISCONNECTED, &amp;nbd-&gt;runtime_flags))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sock = nbd-&gt;sock;</div><div class='del'>-	dev_warn(disk_to_dev(nbd-&gt;disk), "shutting down socket\n");</div><div class='del'>-	nbd-&gt;sock = NULL;</div><div class='del'>-	spin_unlock(&amp;nbd-&gt;sock_lock);</div><div class='ctx'> </div><div class='del'>-	kernel_sock_shutdown(sock, SHUT_RDWR);</div><div class='del'>-	sockfd_put(sock);</div><div class='add'>+	for (i = 0; i &lt; nbd-&gt;num_connections; i++) {</div><div class='add'>+		struct nbd_sock *nsock = nbd-&gt;socks[i];</div><div class='add'>+		mutex_lock(&amp;nsock-&gt;tx_lock);</div><div class='add'>+		kernel_sock_shutdown(nsock-&gt;sock, SHUT_RDWR);</div><div class='add'>+		mutex_unlock(&amp;nsock-&gt;tx_lock);</div><div class='add'>+	}</div><div class='add'>+	dev_warn(disk_to_dev(nbd-&gt;disk), "shutting down sockets\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,</div><div class='hunk'>@@ -182,52 +187,40 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,</div><div class='ctx'> {</div><div class='ctx'> 	struct nbd_cmd *cmd = blk_mq_rq_to_pdu(req);</div><div class='ctx'> 	struct nbd_device *nbd = cmd-&gt;nbd;</div><div class='del'>-	struct socket *sock = NULL;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;nbd-&gt;sock_lock);</div><div class='ctx'> </div><div class='add'>+	dev_err(nbd_to_dev(nbd), "Connection timed out, shutting down connection\n");</div><div class='ctx'> 	set_bit(NBD_TIMEDOUT, &amp;nbd-&gt;runtime_flags);</div><div class='del'>-</div><div class='del'>-	if (nbd-&gt;sock) {</div><div class='del'>-		sock = nbd-&gt;sock;</div><div class='del'>-		get_file(sock-&gt;file);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;nbd-&gt;sock_lock);</div><div class='del'>-	if (sock) {</div><div class='del'>-		kernel_sock_shutdown(sock, SHUT_RDWR);</div><div class='del'>-		sockfd_put(sock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	req-&gt;errors++;</div><div class='del'>-	dev_err(nbd_to_dev(nbd), "Connection timed out, shutting down connection\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nbd-&gt;config_lock);</div><div class='add'>+	sock_shutdown(nbd);</div><div class='add'>+	mutex_unlock(&amp;nbd-&gt;config_lock);</div><div class='ctx'> 	return BLK_EH_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Send or receive packet.</div><div class='ctx'>  */</div><div class='del'>-static int sock_xmit(struct nbd_device *nbd, int send, void *buf, int size,</div><div class='del'>-		int msg_flags)</div><div class='add'>+static int sock_xmit(struct nbd_device *nbd, int index, int send,</div><div class='add'>+		     struct iov_iter *iter, int msg_flags)</div><div class='ctx'> {</div><div class='del'>-	struct socket *sock = nbd-&gt;sock;</div><div class='add'>+	struct socket *sock = nbd-&gt;socks[index]-&gt;sock;</div><div class='ctx'> 	int result;</div><div class='ctx'> 	struct msghdr msg;</div><div class='del'>-	struct kvec iov;</div><div class='ctx'> 	unsigned long pflags = current-&gt;flags;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!sock)) {</div><div class='del'>-		dev_err(disk_to_dev(nbd-&gt;disk),</div><div class='add'>+		dev_err_ratelimited(disk_to_dev(nbd-&gt;disk),</div><div class='ctx'> 			"Attempted %s on closed socket in sock_xmit\n",</div><div class='ctx'> 			(send ? "send" : "recv"));</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	msg.msg_iter = *iter;</div><div class='add'>+</div><div class='ctx'> 	current-&gt;flags |= PF_MEMALLOC;</div><div class='ctx'> 	do {</div><div class='ctx'> 		sock-&gt;sk-&gt;sk_allocation = GFP_NOIO | __GFP_MEMALLOC;</div><div class='del'>-		iov.iov_base = buf;</div><div class='del'>-		iov.iov_len = size;</div><div class='ctx'> 		msg.msg_name = NULL;</div><div class='ctx'> 		msg.msg_namelen = 0;</div><div class='ctx'> 		msg.msg_control = NULL;</div><div class='hunk'>@@ -235,126 +228,137 @@ static int sock_xmit(struct nbd_device *nbd, int send, void *buf, int size,</div><div class='ctx'> 		msg.msg_flags = msg_flags | MSG_NOSIGNAL;</div><div class='ctx'> </div><div class='ctx'> 		if (send)</div><div class='del'>-			result = kernel_sendmsg(sock, &amp;msg, &amp;iov, 1, size);</div><div class='add'>+			result = sock_sendmsg(sock, &amp;msg);</div><div class='ctx'> 		else</div><div class='del'>-			result = kernel_recvmsg(sock, &amp;msg, &amp;iov, 1, size,</div><div class='del'>-						msg.msg_flags);</div><div class='add'>+			result = sock_recvmsg(sock, &amp;msg, msg.msg_flags);</div><div class='ctx'> </div><div class='ctx'> 		if (result &lt;= 0) {</div><div class='ctx'> 			if (result == 0)</div><div class='ctx'> 				result = -EPIPE; /* short read */</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		size -= result;</div><div class='del'>-		buf += result;</div><div class='del'>-	} while (size &gt; 0);</div><div class='add'>+	} while (msg_data_left(&amp;msg));</div><div class='ctx'> </div><div class='ctx'> 	tsk_restore_flags(current, pflags, PF_MEMALLOC);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int sock_send_bvec(struct nbd_device *nbd, struct bio_vec *bvec,</div><div class='del'>-		int flags)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	void *kaddr = kmap(bvec-&gt;bv_page);</div><div class='del'>-	result = sock_xmit(nbd, 1, kaddr + bvec-&gt;bv_offset,</div><div class='del'>-			   bvec-&gt;bv_len, flags);</div><div class='del'>-	kunmap(bvec-&gt;bv_page);</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* always call with the tx_lock held */</div><div class='del'>-static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd)</div><div class='add'>+static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *req = blk_mq_rq_from_pdu(cmd);</div><div class='del'>-	int result, flags;</div><div class='del'>-	struct nbd_request request;</div><div class='add'>+	int result;</div><div class='add'>+	struct nbd_request request = {.magic = htonl(NBD_REQUEST_MAGIC)};</div><div class='add'>+	struct kvec iov = {.iov_base = &amp;request, .iov_len = sizeof(request)};</div><div class='add'>+	struct iov_iter from;</div><div class='ctx'> 	unsigned long size = blk_rq_bytes(req);</div><div class='add'>+	struct bio *bio;</div><div class='ctx'> 	u32 type;</div><div class='add'>+	u32 tag = blk_mq_unique_tag(req);</div><div class='add'>+</div><div class='add'>+	iov_iter_kvec(&amp;from, WRITE | ITER_KVEC, &amp;iov, 1, sizeof(request));</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;cmd_type == REQ_TYPE_DRV_PRIV)</div><div class='del'>-		type = NBD_CMD_DISC;</div><div class='del'>-	else if (req_op(req) == REQ_OP_DISCARD)</div><div class='add'>+	switch (req_op(req)) {</div><div class='add'>+	case REQ_OP_DISCARD:</div><div class='ctx'> 		type = NBD_CMD_TRIM;</div><div class='del'>-	else if (req_op(req) == REQ_OP_FLUSH)</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_FLUSH:</div><div class='ctx'> 		type = NBD_CMD_FLUSH;</div><div class='del'>-	else if (rq_data_dir(req) == WRITE)</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_WRITE:</div><div class='ctx'> 		type = NBD_CMD_WRITE;</div><div class='del'>-	else</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_READ:</div><div class='ctx'> 		type = NBD_CMD_READ;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rq_data_dir(req) == WRITE &amp;&amp;</div><div class='add'>+	    (nbd-&gt;flags &amp; NBD_FLAG_READ_ONLY)) {</div><div class='add'>+		dev_err_ratelimited(disk_to_dev(nbd-&gt;disk),</div><div class='add'>+				    "Write on read-only\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	memset(&amp;request, 0, sizeof(request));</div><div class='del'>-	request.magic = htonl(NBD_REQUEST_MAGIC);</div><div class='ctx'> 	request.type = htonl(type);</div><div class='del'>-	if (type != NBD_CMD_FLUSH &amp;&amp; type != NBD_CMD_DISC) {</div><div class='add'>+	if (type != NBD_CMD_FLUSH) {</div><div class='ctx'> 		request.from = cpu_to_be64((u64)blk_rq_pos(req) &lt;&lt; 9);</div><div class='ctx'> 		request.len = htonl(size);</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(request.handle, &amp;req-&gt;tag, sizeof(req-&gt;tag));</div><div class='add'>+	memcpy(request.handle, &amp;tag, sizeof(tag));</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(nbd_to_dev(nbd), "request %p: sending control (%s@%llu,%uB)\n",</div><div class='ctx'> 		cmd, nbdcmd_to_ascii(type),</div><div class='ctx'> 		(unsigned long long)blk_rq_pos(req) &lt;&lt; 9, blk_rq_bytes(req));</div><div class='del'>-	result = sock_xmit(nbd, 1, &amp;request, sizeof(request),</div><div class='add'>+	result = sock_xmit(nbd, index, 1, &amp;from,</div><div class='ctx'> 			(type == NBD_CMD_WRITE) ? MSG_MORE : 0);</div><div class='ctx'> 	if (result &lt;= 0) {</div><div class='del'>-		dev_err(disk_to_dev(nbd-&gt;disk),</div><div class='add'>+		dev_err_ratelimited(disk_to_dev(nbd-&gt;disk),</div><div class='ctx'> 			"Send control failed (result %d)\n", result);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (type == NBD_CMD_WRITE) {</div><div class='del'>-		struct req_iterator iter;</div><div class='add'>+	if (type != NBD_CMD_WRITE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bio = req-&gt;bio;</div><div class='add'>+	while (bio) {</div><div class='add'>+		struct bio *next = bio-&gt;bi_next;</div><div class='add'>+		struct bvec_iter iter;</div><div class='ctx'> 		struct bio_vec bvec;</div><div class='del'>-		/*</div><div class='del'>-		 * we are really probing at internals to determine</div><div class='del'>-		 * whether to set MSG_MORE or not...</div><div class='del'>-		 */</div><div class='del'>-		rq_for_each_segment(bvec, req, iter) {</div><div class='del'>-			flags = 0;</div><div class='del'>-			if (!rq_iter_last(bvec, iter))</div><div class='del'>-				flags = MSG_MORE;</div><div class='add'>+</div><div class='add'>+		bio_for_each_segment(bvec, bio, iter) {</div><div class='add'>+			bool is_last = !next &amp;&amp; bio_iter_last(bvec, iter);</div><div class='add'>+			int flags = is_last ? 0 : MSG_MORE;</div><div class='add'>+</div><div class='ctx'> 			dev_dbg(nbd_to_dev(nbd), "request %p: sending %d bytes data\n",</div><div class='ctx'> 				cmd, bvec.bv_len);</div><div class='del'>-			result = sock_send_bvec(nbd, &amp;bvec, flags);</div><div class='add'>+			iov_iter_bvec(&amp;from, ITER_BVEC | WRITE,</div><div class='add'>+				      &amp;bvec, 1, bvec.bv_len);</div><div class='add'>+			result = sock_xmit(nbd, index, 1, &amp;from, flags);</div><div class='ctx'> 			if (result &lt;= 0) {</div><div class='ctx'> 				dev_err(disk_to_dev(nbd-&gt;disk),</div><div class='ctx'> 					"Send data failed (result %d)\n",</div><div class='ctx'> 					result);</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='add'>+			/*</div><div class='add'>+			 * The completion might already have come in,</div><div class='add'>+			 * so break for the last one instead of letting</div><div class='add'>+			 * the iterator do it. This prevents use-after-free</div><div class='add'>+			 * of the bio.</div><div class='add'>+			 */</div><div class='add'>+			if (is_last)</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='add'>+		bio = next;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int sock_recv_bvec(struct nbd_device *nbd, struct bio_vec *bvec)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	void *kaddr = kmap(bvec-&gt;bv_page);</div><div class='del'>-	result = sock_xmit(nbd, 0, kaddr + bvec-&gt;bv_offset, bvec-&gt;bv_len,</div><div class='del'>-			MSG_WAITALL);</div><div class='del'>-	kunmap(bvec-&gt;bv_page);</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* NULL returned = something went wrong, inform userspace */</div><div class='del'>-static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd)</div><div class='add'>+static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> 	struct nbd_reply reply;</div><div class='ctx'> 	struct nbd_cmd *cmd;</div><div class='ctx'> 	struct request *req = NULL;</div><div class='ctx'> 	u16 hwq;</div><div class='del'>-	int tag;</div><div class='add'>+	u32 tag;</div><div class='add'>+	struct kvec iov = {.iov_base = &amp;reply, .iov_len = sizeof(reply)};</div><div class='add'>+	struct iov_iter to;</div><div class='ctx'> </div><div class='ctx'> 	reply.magic = 0;</div><div class='del'>-	result = sock_xmit(nbd, 0, &amp;reply, sizeof(reply), MSG_WAITALL);</div><div class='add'>+	iov_iter_kvec(&amp;to, READ | ITER_KVEC, &amp;iov, 1, sizeof(reply));</div><div class='add'>+	result = sock_xmit(nbd, index, 0, &amp;to, MSG_WAITALL);</div><div class='ctx'> 	if (result &lt;= 0) {</div><div class='del'>-		dev_err(disk_to_dev(nbd-&gt;disk),</div><div class='del'>-			"Receive control failed (result %d)\n", result);</div><div class='add'>+		if (!test_bit(NBD_DISCONNECTED, &amp;nbd-&gt;runtime_flags) &amp;&amp;</div><div class='add'>+		    !test_bit(NBD_DISCONNECT_REQUESTED, &amp;nbd-&gt;runtime_flags))</div><div class='add'>+			dev_err(disk_to_dev(nbd-&gt;disk),</div><div class='add'>+				"Receive control failed (result %d)\n", result);</div><div class='ctx'> 		return ERR_PTR(result);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -364,7 +368,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd)</div><div class='ctx'> 		return ERR_PTR(-EPROTO);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;tag, reply.handle, sizeof(int));</div><div class='add'>+	memcpy(&amp;tag, reply.handle, sizeof(u32));</div><div class='ctx'> </div><div class='ctx'> 	hwq = blk_mq_unique_tag_to_hwq(tag);</div><div class='ctx'> 	if (hwq &lt; nbd-&gt;tag_set.nr_hw_queues)</div><div class='hunk'>@@ -376,7 +380,6 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd)</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> 	}</div><div class='ctx'> 	cmd = blk_mq_rq_to_pdu(req);</div><div class='del'>-</div><div class='ctx'> 	if (ntohl(reply.error)) {</div><div class='ctx'> 		dev_err(disk_to_dev(nbd-&gt;disk), "Other side returned error (%d)\n",</div><div class='ctx'> 			ntohl(reply.error));</div><div class='hunk'>@@ -390,7 +393,9 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd)</div><div class='ctx'> 		struct bio_vec bvec;</div><div class='ctx'> </div><div class='ctx'> 		rq_for_each_segment(bvec, req, iter) {</div><div class='del'>-			result = sock_recv_bvec(nbd, &amp;bvec);</div><div class='add'>+			iov_iter_bvec(&amp;to, ITER_BVEC | READ,</div><div class='add'>+				      &amp;bvec, 1, bvec.bv_len);</div><div class='add'>+			result = sock_xmit(nbd, index, 0, &amp;to, MSG_WAITALL);</div><div class='ctx'> 			if (result &lt;= 0) {</div><div class='ctx'> 				dev_err(disk_to_dev(nbd-&gt;disk), "Receive data failed (result %d)\n",</div><div class='ctx'> 					result);</div><div class='hunk'>@@ -400,6 +405,9 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd)</div><div class='ctx'> 			dev_dbg(nbd_to_dev(nbd), "request %p: got %d bytes data\n",</div><div class='ctx'> 				cmd, bvec.bv_len);</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		/* See the comment in nbd_queue_rq. */</div><div class='add'>+		wait_for_completion(&amp;cmd-&gt;send_complete);</div><div class='ctx'> 	}</div><div class='ctx'> 	return cmd;</div><div class='ctx'> }</div><div class='hunk'>@@ -418,25 +426,24 @@ static struct device_attribute pid_attr = {</div><div class='ctx'> 	.show = pid_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int nbd_thread_recv(struct nbd_device *nbd, struct block_device *bdev)</div><div class='add'>+struct recv_thread_args {</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct nbd_device *nbd;</div><div class='add'>+	int index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void recv_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	struct recv_thread_args *args = container_of(work,</div><div class='add'>+						     struct recv_thread_args,</div><div class='add'>+						     work);</div><div class='add'>+	struct nbd_device *nbd = args-&gt;nbd;</div><div class='ctx'> 	struct nbd_cmd *cmd;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(nbd-&gt;magic != NBD_MAGIC);</div><div class='del'>-</div><div class='del'>-	sk_set_memalloc(nbd-&gt;sock-&gt;sk);</div><div class='del'>-</div><div class='del'>-	ret = device_create_file(disk_to_dev(nbd-&gt;disk), &amp;pid_attr);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(disk_to_dev(nbd-&gt;disk), "device_create_file failed!\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nbd_size_update(nbd, bdev);</div><div class='del'>-</div><div class='ctx'> 	while (1) {</div><div class='del'>-		cmd = nbd_read_stat(nbd);</div><div class='add'>+		cmd = nbd_read_stat(nbd, args-&gt;index);</div><div class='ctx'> 		if (IS_ERR(cmd)) {</div><div class='ctx'> 			ret = PTR_ERR(cmd);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -445,10 +452,14 @@ static int nbd_thread_recv(struct nbd_device *nbd, struct block_device *bdev)</div><div class='ctx'> 		nbd_end_request(cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nbd_size_clear(nbd, bdev);</div><div class='del'>-</div><div class='del'>-	device_remove_file(disk_to_dev(nbd-&gt;disk), &amp;pid_attr);</div><div class='del'>-	return ret;</div><div class='add'>+	/*</div><div class='add'>+	 * We got an error, shut everybody down if this wasn't the result of a</div><div class='add'>+	 * disconnect request.</div><div class='add'>+	 */</div><div class='add'>+	if (ret &amp;&amp; !test_bit(NBD_DISCONNECT_REQUESTED, &amp;nbd-&gt;runtime_flags))</div><div class='add'>+		sock_shutdown(nbd);</div><div class='add'>+	atomic_dec(&amp;nbd-&gt;recv_threads);</div><div class='add'>+	wake_up(&amp;nbd-&gt;recv_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nbd_clear_req(struct request *req, void *data, bool reserved)</div><div class='hunk'>@@ -466,51 +477,48 @@ static void nbd_clear_que(struct nbd_device *nbd)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(nbd-&gt;magic != NBD_MAGIC);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Because we have set nbd-&gt;sock to NULL under the tx_lock, all</div><div class='del'>-	 * modifications to the list must have completed by now.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(nbd-&gt;sock);</div><div class='del'>-</div><div class='ctx'> 	blk_mq_tagset_busy_iter(&amp;nbd-&gt;tag_set, nbd_clear_req, NULL);</div><div class='ctx'> 	dev_dbg(disk_to_dev(nbd-&gt;disk), "queue cleared\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void nbd_handle_cmd(struct nbd_cmd *cmd)</div><div class='add'>+static void nbd_handle_cmd(struct nbd_cmd *cmd, int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *req = blk_mq_rq_from_pdu(cmd);</div><div class='ctx'> 	struct nbd_device *nbd = cmd-&gt;nbd;</div><div class='add'>+	struct nbd_sock *nsock;</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;cmd_type != REQ_TYPE_FS)</div><div class='add'>+	if (index &gt;= nbd-&gt;num_connections) {</div><div class='add'>+		dev_err_ratelimited(disk_to_dev(nbd-&gt;disk),</div><div class='add'>+				    "Attempted send on invalid socket\n");</div><div class='ctx'> 		goto error_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (rq_data_dir(req) == WRITE &amp;&amp;</div><div class='del'>-	    (nbd-&gt;flags &amp; NBD_FLAG_READ_ONLY)) {</div><div class='del'>-		dev_err(disk_to_dev(nbd-&gt;disk),</div><div class='del'>-			"Write on read-only\n");</div><div class='add'>+	if (test_bit(NBD_DISCONNECTED, &amp;nbd-&gt;runtime_flags)) {</div><div class='add'>+		dev_err_ratelimited(disk_to_dev(nbd-&gt;disk),</div><div class='add'>+				    "Attempted send on closed socket\n");</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;errors = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;nbd-&gt;tx_lock);</div><div class='del'>-	nbd-&gt;task_send = current;</div><div class='del'>-	if (unlikely(!nbd-&gt;sock)) {</div><div class='del'>-		mutex_unlock(&amp;nbd-&gt;tx_lock);</div><div class='del'>-		dev_err(disk_to_dev(nbd-&gt;disk),</div><div class='del'>-			"Attempted send on closed socket\n");</div><div class='add'>+	nsock = nbd-&gt;socks[index];</div><div class='add'>+	mutex_lock(&amp;nsock-&gt;tx_lock);</div><div class='add'>+	if (unlikely(!nsock-&gt;sock)) {</div><div class='add'>+		mutex_unlock(&amp;nsock-&gt;tx_lock);</div><div class='add'>+		dev_err_ratelimited(disk_to_dev(nbd-&gt;disk),</div><div class='add'>+				    "Attempted send on closed socket\n");</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nbd_send_cmd(nbd, cmd) != 0) {</div><div class='del'>-		dev_err(disk_to_dev(nbd-&gt;disk), "Request send failed\n");</div><div class='add'>+	if (nbd_send_cmd(nbd, cmd, index) != 0) {</div><div class='add'>+		dev_err_ratelimited(disk_to_dev(nbd-&gt;disk),</div><div class='add'>+				    "Request send failed\n");</div><div class='ctx'> 		req-&gt;errors++;</div><div class='ctx'> 		nbd_end_request(cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nbd-&gt;task_send = NULL;</div><div class='del'>-	mutex_unlock(&amp;nbd-&gt;tx_lock);</div><div class='add'>+	mutex_unlock(&amp;nsock-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='hunk'>@@ -524,28 +532,60 @@ static int nbd_queue_rq(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> {</div><div class='ctx'> 	struct nbd_cmd *cmd = blk_mq_rq_to_pdu(bd-&gt;rq);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Since we look at the bio's to send the request over the network we</div><div class='add'>+	 * need to make sure the completion work doesn't mark this request done</div><div class='add'>+	 * before we are done doing our send.  This keeps us from dereferencing</div><div class='add'>+	 * freed data if we have particularly fast completions (ie we get the</div><div class='add'>+	 * completion before we exit sock_xmit on the last bvec) or in the case</div><div class='add'>+	 * that the server is misbehaving (or there was an error) before we're</div><div class='add'>+	 * done sending everything over the wire.</div><div class='add'>+	 */</div><div class='add'>+	init_completion(&amp;cmd-&gt;send_complete);</div><div class='ctx'> 	blk_mq_start_request(bd-&gt;rq);</div><div class='del'>-	nbd_handle_cmd(cmd);</div><div class='add'>+	nbd_handle_cmd(cmd, hctx-&gt;queue_num);</div><div class='add'>+	complete(&amp;cmd-&gt;send_complete);</div><div class='add'>+</div><div class='ctx'> 	return BLK_MQ_RQ_QUEUE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nbd_set_socket(struct nbd_device *nbd, struct socket *sock)</div><div class='add'>+static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev,</div><div class='add'>+			  unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct nbd_sock **socks;</div><div class='add'>+	struct nbd_sock *nsock;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;nbd-&gt;sock_lock);</div><div class='add'>+	sock = sockfd_lookup(arg, &amp;err);</div><div class='add'>+	if (!sock)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (nbd-&gt;sock) {</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto out;</div><div class='add'>+	if (!nbd-&gt;task_setup)</div><div class='add'>+		nbd-&gt;task_setup = current;</div><div class='add'>+	if (nbd-&gt;task_setup != current) {</div><div class='add'>+		dev_err(disk_to_dev(nbd-&gt;disk),</div><div class='add'>+			"Device being setup by another task");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nbd-&gt;sock = sock;</div><div class='add'>+	socks = krealloc(nbd-&gt;socks, (nbd-&gt;num_connections + 1) *</div><div class='add'>+			 sizeof(struct nbd_sock *), GFP_KERNEL);</div><div class='add'>+	if (!socks)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	nsock = kzalloc(sizeof(struct nbd_sock), GFP_KERNEL);</div><div class='add'>+	if (!nsock)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	spin_unlock_irq(&amp;nbd-&gt;sock_lock);</div><div class='add'>+	nbd-&gt;socks = socks;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;nsock-&gt;tx_lock);</div><div class='add'>+	nsock-&gt;sock = sock;</div><div class='add'>+	socks[nbd-&gt;num_connections++] = nsock;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	if (max_part)</div><div class='add'>+		bdev-&gt;bd_invalidated = 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Reset all properties of an NBD device */</div><div class='hunk'>@@ -582,77 +622,164 @@ static void nbd_parse_flags(struct nbd_device *nbd, struct block_device *bdev)</div><div class='ctx'> 		blk_queue_write_cache(nbd-&gt;disk-&gt;queue, false, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nbd_dev_dbg_init(struct nbd_device *nbd);</div><div class='del'>-static void nbd_dev_dbg_close(struct nbd_device *nbd);</div><div class='add'>+static void send_disconnects(struct nbd_device *nbd)</div><div class='add'>+{</div><div class='add'>+	struct nbd_request request = {</div><div class='add'>+		.magic = htonl(NBD_REQUEST_MAGIC),</div><div class='add'>+		.type = htonl(NBD_CMD_DISC),</div><div class='add'>+	};</div><div class='add'>+	struct kvec iov = {.iov_base = &amp;request, .iov_len = sizeof(request)};</div><div class='add'>+	struct iov_iter from;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nbd-&gt;num_connections; i++) {</div><div class='add'>+		iov_iter_kvec(&amp;from, WRITE | ITER_KVEC, &amp;iov, 1, sizeof(request));</div><div class='add'>+		ret = sock_xmit(nbd, i, 1, &amp;from, 0);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			dev_err(disk_to_dev(nbd-&gt;disk),</div><div class='add'>+				"Send disconnect failed %d\n", ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-/* Must be called with tx_lock held */</div><div class='add'>+static int nbd_disconnect(struct nbd_device *nbd, struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	dev_info(disk_to_dev(nbd-&gt;disk), "NBD_DISCONNECT\n");</div><div class='add'>+	if (!nbd-&gt;socks)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,</div><div class='del'>-		       unsigned int cmd, unsigned long arg)</div><div class='add'>+	mutex_unlock(&amp;nbd-&gt;config_lock);</div><div class='add'>+	fsync_bdev(bdev);</div><div class='add'>+	mutex_lock(&amp;nbd-&gt;config_lock);</div><div class='add'>+</div><div class='add'>+	/* Check again after getting mutex back.  */</div><div class='add'>+	if (!nbd-&gt;socks)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!test_and_set_bit(NBD_DISCONNECT_REQUESTED,</div><div class='add'>+			      &amp;nbd-&gt;runtime_flags))</div><div class='add'>+		send_disconnects(nbd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nbd_clear_sock(struct nbd_device *nbd, struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case NBD_DISCONNECT: {</div><div class='del'>-		struct request *sreq;</div><div class='del'>-</div><div class='del'>-		dev_info(disk_to_dev(nbd-&gt;disk), "NBD_DISCONNECT\n");</div><div class='del'>-		if (!nbd-&gt;sock)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		sreq = blk_mq_alloc_request(bdev_get_queue(bdev), WRITE, 0);</div><div class='del'>-		if (IS_ERR(sreq))</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		mutex_unlock(&amp;nbd-&gt;tx_lock);</div><div class='del'>-		fsync_bdev(bdev);</div><div class='del'>-		mutex_lock(&amp;nbd-&gt;tx_lock);</div><div class='del'>-		sreq-&gt;cmd_type = REQ_TYPE_DRV_PRIV;</div><div class='del'>-</div><div class='del'>-		/* Check again after getting mutex back.  */</div><div class='del'>-		if (!nbd-&gt;sock) {</div><div class='del'>-			blk_mq_free_request(sreq);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	sock_shutdown(nbd);</div><div class='add'>+	nbd_clear_que(nbd);</div><div class='add'>+	kill_bdev(bdev);</div><div class='add'>+	nbd_bdev_reset(bdev);</div><div class='add'>+	/*</div><div class='add'>+	 * We want to give the run thread a chance to wait for everybody</div><div class='add'>+	 * to clean up and then do it's own cleanup.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(NBD_RUNNING, &amp;nbd-&gt;runtime_flags) &amp;&amp;</div><div class='add'>+	    nbd-&gt;num_connections) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; nbd-&gt;num_connections; i++) {</div><div class='add'>+			sockfd_put(nbd-&gt;socks[i]-&gt;sock);</div><div class='add'>+			kfree(nbd-&gt;socks[i]);</div><div class='ctx'> 		}</div><div class='add'>+		kfree(nbd-&gt;socks);</div><div class='add'>+		nbd-&gt;socks = NULL;</div><div class='add'>+		nbd-&gt;num_connections = 0;</div><div class='add'>+	}</div><div class='add'>+	nbd-&gt;task_setup = NULL;</div><div class='ctx'> </div><div class='del'>-		set_bit(NBD_DISCONNECT_REQUESTED, &amp;nbd-&gt;runtime_flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		nbd_send_cmd(nbd, blk_mq_rq_to_pdu(sreq));</div><div class='del'>-		blk_mq_free_request(sreq);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>- </div><div class='del'>-	case NBD_CLEAR_SOCK:</div><div class='del'>-		sock_shutdown(nbd);</div><div class='del'>-		nbd_clear_que(nbd);</div><div class='del'>-		kill_bdev(bdev);</div><div class='del'>-		return 0;</div><div class='add'>+static int nbd_start_device(struct nbd_device *nbd, struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	struct recv_thread_args *args;</div><div class='add'>+	int num_connections = nbd-&gt;num_connections;</div><div class='add'>+	int error = 0, i;</div><div class='ctx'> </div><div class='del'>-	case NBD_SET_SOCK: {</div><div class='del'>-		int err;</div><div class='del'>-		struct socket *sock = sockfd_lookup(arg, &amp;err);</div><div class='add'>+	if (nbd-&gt;task_recv)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (!nbd-&gt;socks)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (num_connections &gt; 1 &amp;&amp;</div><div class='add'>+	    !(nbd-&gt;flags &amp; NBD_FLAG_CAN_MULTI_CONN)) {</div><div class='add'>+		dev_err(disk_to_dev(nbd-&gt;disk), "server does not support multiple connections per device.\n");</div><div class='add'>+		error = -EINVAL;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (!sock)</div><div class='del'>-			return err;</div><div class='add'>+	set_bit(NBD_RUNNING, &amp;nbd-&gt;runtime_flags);</div><div class='add'>+	blk_mq_update_nr_hw_queues(&amp;nbd-&gt;tag_set, nbd-&gt;num_connections);</div><div class='add'>+	args = kcalloc(num_connections, sizeof(*args), GFP_KERNEL);</div><div class='add'>+	if (!args) {</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+	nbd-&gt;task_recv = current;</div><div class='add'>+	mutex_unlock(&amp;nbd-&gt;config_lock);</div><div class='ctx'> </div><div class='del'>-		err = nbd_set_socket(nbd, sock);</div><div class='del'>-		if (!err &amp;&amp; max_part)</div><div class='del'>-			bdev-&gt;bd_invalidated = 1;</div><div class='add'>+	nbd_parse_flags(nbd, bdev);</div><div class='ctx'> </div><div class='del'>-		return err;</div><div class='add'>+	error = device_create_file(disk_to_dev(nbd-&gt;disk), &amp;pid_attr);</div><div class='add'>+	if (error) {</div><div class='add'>+		dev_err(disk_to_dev(nbd-&gt;disk), "device_create_file failed!\n");</div><div class='add'>+		goto out_recv;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	case NBD_SET_BLKSIZE: {</div><div class='del'>-		loff_t bsize = div_s64(nbd-&gt;bytesize, arg);</div><div class='add'>+	nbd_size_update(nbd, bdev);</div><div class='ctx'> </div><div class='del'>-		return nbd_size_set(nbd, bdev, arg, bsize);</div><div class='add'>+	nbd_dev_dbg_init(nbd);</div><div class='add'>+	for (i = 0; i &lt; num_connections; i++) {</div><div class='add'>+		sk_set_memalloc(nbd-&gt;socks[i]-&gt;sock-&gt;sk);</div><div class='add'>+		atomic_inc(&amp;nbd-&gt;recv_threads);</div><div class='add'>+		INIT_WORK(&amp;args[i].work, recv_work);</div><div class='add'>+		args[i].nbd = nbd;</div><div class='add'>+		args[i].index = i;</div><div class='add'>+		queue_work(recv_workqueue, &amp;args[i].work);</div><div class='ctx'> 	}</div><div class='add'>+	wait_event_interruptible(nbd-&gt;recv_wq,</div><div class='add'>+				 atomic_read(&amp;nbd-&gt;recv_threads) == 0);</div><div class='add'>+	for (i = 0; i &lt; num_connections; i++)</div><div class='add'>+		flush_work(&amp;args[i].work);</div><div class='add'>+	nbd_dev_dbg_close(nbd);</div><div class='add'>+	nbd_size_clear(nbd, bdev);</div><div class='add'>+	device_remove_file(disk_to_dev(nbd-&gt;disk), &amp;pid_attr);</div><div class='add'>+out_recv:</div><div class='add'>+	mutex_lock(&amp;nbd-&gt;config_lock);</div><div class='add'>+	nbd-&gt;task_recv = NULL;</div><div class='add'>+out_err:</div><div class='add'>+	clear_bit(NBD_RUNNING, &amp;nbd-&gt;runtime_flags);</div><div class='add'>+	nbd_clear_sock(nbd, bdev);</div><div class='add'>+</div><div class='add'>+	/* user requested, ignore socket errors */</div><div class='add'>+	if (test_bit(NBD_DISCONNECT_REQUESTED, &amp;nbd-&gt;runtime_flags))</div><div class='add'>+		error = 0;</div><div class='add'>+	if (test_bit(NBD_TIMEDOUT, &amp;nbd-&gt;runtime_flags))</div><div class='add'>+		error = -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	nbd_reset(nbd);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+/* Must be called with config_lock held */</div><div class='add'>+static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,</div><div class='add'>+		       unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case NBD_DISCONNECT:</div><div class='add'>+		return nbd_disconnect(nbd, bdev);</div><div class='add'>+	case NBD_CLEAR_SOCK:</div><div class='add'>+		return nbd_clear_sock(nbd, bdev);</div><div class='add'>+	case NBD_SET_SOCK:</div><div class='add'>+		return nbd_add_socket(nbd, bdev, arg);</div><div class='add'>+	case NBD_SET_BLKSIZE:</div><div class='add'>+		nbd_size_set(nbd, bdev, arg,</div><div class='add'>+			     div_s64(nbd-&gt;bytesize, arg));</div><div class='add'>+		return 0;</div><div class='ctx'> 	case NBD_SET_SIZE:</div><div class='del'>-		return nbd_size_set(nbd, bdev, nbd-&gt;blksize,</div><div class='del'>-				    arg / nbd-&gt;blksize);</div><div class='del'>-</div><div class='add'>+		nbd_size_set(nbd, bdev, nbd-&gt;blksize,</div><div class='add'>+			     div_s64(arg, nbd-&gt;blksize));</div><div class='add'>+		return 0;</div><div class='ctx'> 	case NBD_SET_SIZE_BLOCKS:</div><div class='del'>-		return nbd_size_set(nbd, bdev, nbd-&gt;blksize, arg);</div><div class='del'>-</div><div class='add'>+		nbd_size_set(nbd, bdev, nbd-&gt;blksize, arg);</div><div class='add'>+		return 0;</div><div class='ctx'> 	case NBD_SET_TIMEOUT:</div><div class='ctx'> 		nbd-&gt;tag_set.timeout = arg * HZ;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -660,51 +787,14 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,</div><div class='ctx'> 	case NBD_SET_FLAGS:</div><div class='ctx'> 		nbd-&gt;flags = arg;</div><div class='ctx'> 		return 0;</div><div class='del'>-</div><div class='del'>-	case NBD_DO_IT: {</div><div class='del'>-		int error;</div><div class='del'>-</div><div class='del'>-		if (nbd-&gt;task_recv)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		if (!nbd-&gt;sock)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		/* We have to claim the device under the lock */</div><div class='del'>-		nbd-&gt;task_recv = current;</div><div class='del'>-		mutex_unlock(&amp;nbd-&gt;tx_lock);</div><div class='del'>-</div><div class='del'>-		nbd_parse_flags(nbd, bdev);</div><div class='del'>-</div><div class='del'>-		nbd_dev_dbg_init(nbd);</div><div class='del'>-		error = nbd_thread_recv(nbd, bdev);</div><div class='del'>-		nbd_dev_dbg_close(nbd);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;nbd-&gt;tx_lock);</div><div class='del'>-		nbd-&gt;task_recv = NULL;</div><div class='del'>-</div><div class='del'>-		sock_shutdown(nbd);</div><div class='del'>-		nbd_clear_que(nbd);</div><div class='del'>-		kill_bdev(bdev);</div><div class='del'>-		nbd_bdev_reset(bdev);</div><div class='del'>-</div><div class='del'>-		/* user requested, ignore socket errors */</div><div class='del'>-		if (test_bit(NBD_DISCONNECT_REQUESTED, &amp;nbd-&gt;runtime_flags))</div><div class='del'>-			error = 0;</div><div class='del'>-		if (test_bit(NBD_TIMEDOUT, &amp;nbd-&gt;runtime_flags))</div><div class='del'>-			error = -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-		nbd_reset(nbd);</div><div class='del'>-</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	case NBD_DO_IT:</div><div class='add'>+		return nbd_start_device(nbd, bdev);</div><div class='ctx'> 	case NBD_CLEAR_QUE:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This is for compatibility only.  The queue is always cleared</div><div class='ctx'> 		 * by NBD_DO_IT or NBD_CLEAR_SOCK.</div><div class='ctx'> 		 */</div><div class='ctx'> 		return 0;</div><div class='del'>-</div><div class='ctx'> 	case NBD_PRINT_DEBUG:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For compatibility only, we no longer keep a list of</div><div class='hunk'>@@ -726,9 +816,9 @@ static int nbd_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(nbd-&gt;magic != NBD_MAGIC);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;nbd-&gt;tx_lock);</div><div class='add'>+	mutex_lock(&amp;nbd-&gt;config_lock);</div><div class='ctx'> 	error = __nbd_ioctl(bdev, nbd, cmd, arg);</div><div class='del'>-	mutex_unlock(&amp;nbd-&gt;tx_lock);</div><div class='add'>+	mutex_unlock(&amp;nbd-&gt;config_lock);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -748,8 +838,6 @@ static int nbd_dbg_tasks_show(struct seq_file *s, void *unused)</div><div class='ctx'> </div><div class='ctx'> 	if (nbd-&gt;task_recv)</div><div class='ctx'> 		seq_printf(s, "recv: %d\n", task_pid_nr(nbd-&gt;task_recv));</div><div class='del'>-	if (nbd-&gt;task_send)</div><div class='del'>-		seq_printf(s, "send: %d\n", task_pid_nr(nbd-&gt;task_send));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -817,7 +905,7 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd)</div><div class='ctx'> 	debugfs_create_file("tasks", 0444, dir, nbd, &amp;nbd_dbg_tasks_ops);</div><div class='ctx'> 	debugfs_create_u64("size_bytes", 0444, dir, &amp;nbd-&gt;bytesize);</div><div class='ctx'> 	debugfs_create_u32("timeout", 0444, dir, &amp;nbd-&gt;tag_set.timeout);</div><div class='del'>-	debugfs_create_u32("blocksize", 0444, dir, &amp;nbd-&gt;blksize);</div><div class='add'>+	debugfs_create_u64("blocksize", 0444, dir, &amp;nbd-&gt;blksize);</div><div class='ctx'> 	debugfs_create_file("flags", 0444, dir, nbd, &amp;nbd_dbg_flags_ops);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -873,9 +961,7 @@ static int nbd_init_request(void *data, struct request *rq,</div><div class='ctx'> 			    unsigned int numa_node)</div><div class='ctx'> {</div><div class='ctx'> 	struct nbd_cmd *cmd = blk_mq_rq_to_pdu(rq);</div><div class='del'>-</div><div class='ctx'> 	cmd-&gt;nbd = data;</div><div class='del'>-	INIT_LIST_HEAD(&amp;cmd-&gt;list);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -885,6 +971,103 @@ static struct blk_mq_ops nbd_mq_ops = {</div><div class='ctx'> 	.timeout	= nbd_xmit_timeout,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void nbd_dev_remove(struct nbd_device *nbd)</div><div class='add'>+{</div><div class='add'>+	struct gendisk *disk = nbd-&gt;disk;</div><div class='add'>+	nbd-&gt;magic = 0;</div><div class='add'>+	if (disk) {</div><div class='add'>+		del_gendisk(disk);</div><div class='add'>+		blk_cleanup_queue(disk-&gt;queue);</div><div class='add'>+		blk_mq_free_tag_set(&amp;nbd-&gt;tag_set);</div><div class='add'>+		put_disk(disk);</div><div class='add'>+	}</div><div class='add'>+	kfree(nbd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nbd_dev_add(int index)</div><div class='add'>+{</div><div class='add'>+	struct nbd_device *nbd;</div><div class='add'>+	struct gendisk *disk;</div><div class='add'>+	struct request_queue *q;</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	nbd = kzalloc(sizeof(struct nbd_device), GFP_KERNEL);</div><div class='add'>+	if (!nbd)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	disk = alloc_disk(1 &lt;&lt; part_shift);</div><div class='add'>+	if (!disk)</div><div class='add'>+		goto out_free_nbd;</div><div class='add'>+</div><div class='add'>+	if (index &gt;= 0) {</div><div class='add'>+		err = idr_alloc(&amp;nbd_index_idr, nbd, index, index + 1,</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+		if (err == -ENOSPC)</div><div class='add'>+			err = -EEXIST;</div><div class='add'>+	} else {</div><div class='add'>+		err = idr_alloc(&amp;nbd_index_idr, nbd, 0, 0, GFP_KERNEL);</div><div class='add'>+		if (err &gt;= 0)</div><div class='add'>+			index = err;</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free_disk;</div><div class='add'>+</div><div class='add'>+	nbd-&gt;disk = disk;</div><div class='add'>+	nbd-&gt;tag_set.ops = &amp;nbd_mq_ops;</div><div class='add'>+	nbd-&gt;tag_set.nr_hw_queues = 1;</div><div class='add'>+	nbd-&gt;tag_set.queue_depth = 128;</div><div class='add'>+	nbd-&gt;tag_set.numa_node = NUMA_NO_NODE;</div><div class='add'>+	nbd-&gt;tag_set.cmd_size = sizeof(struct nbd_cmd);</div><div class='add'>+	nbd-&gt;tag_set.flags = BLK_MQ_F_SHOULD_MERGE |</div><div class='add'>+		BLK_MQ_F_SG_MERGE | BLK_MQ_F_BLOCKING;</div><div class='add'>+	nbd-&gt;tag_set.driver_data = nbd;</div><div class='add'>+</div><div class='add'>+	err = blk_mq_alloc_tag_set(&amp;nbd-&gt;tag_set);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_idr;</div><div class='add'>+</div><div class='add'>+	q = blk_mq_init_queue(&amp;nbd-&gt;tag_set);</div><div class='add'>+	if (IS_ERR(q)) {</div><div class='add'>+		err = PTR_ERR(q);</div><div class='add'>+		goto out_free_tags;</div><div class='add'>+	}</div><div class='add'>+	disk-&gt;queue = q;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Tell the block layer that we are not a rotational device</div><div class='add'>+	 */</div><div class='add'>+	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, disk-&gt;queue);</div><div class='add'>+	queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, disk-&gt;queue);</div><div class='add'>+	disk-&gt;queue-&gt;limits.discard_granularity = 512;</div><div class='add'>+	blk_queue_max_discard_sectors(disk-&gt;queue, UINT_MAX);</div><div class='add'>+	disk-&gt;queue-&gt;limits.discard_zeroes_data = 0;</div><div class='add'>+	blk_queue_max_hw_sectors(disk-&gt;queue, 65536);</div><div class='add'>+	disk-&gt;queue-&gt;limits.max_sectors = 256;</div><div class='add'>+</div><div class='add'>+	nbd-&gt;magic = NBD_MAGIC;</div><div class='add'>+	mutex_init(&amp;nbd-&gt;config_lock);</div><div class='add'>+	disk-&gt;major = NBD_MAJOR;</div><div class='add'>+	disk-&gt;first_minor = index &lt;&lt; part_shift;</div><div class='add'>+	disk-&gt;fops = &amp;nbd_fops;</div><div class='add'>+	disk-&gt;private_data = nbd;</div><div class='add'>+	sprintf(disk-&gt;disk_name, "nbd%d", index);</div><div class='add'>+	init_waitqueue_head(&amp;nbd-&gt;recv_wq);</div><div class='add'>+	nbd_reset(nbd);</div><div class='add'>+	add_disk(disk);</div><div class='add'>+	return index;</div><div class='add'>+</div><div class='add'>+out_free_tags:</div><div class='add'>+	blk_mq_free_tag_set(&amp;nbd-&gt;tag_set);</div><div class='add'>+out_free_idr:</div><div class='add'>+	idr_remove(&amp;nbd_index_idr, index);</div><div class='add'>+out_free_disk:</div><div class='add'>+	put_disk(disk);</div><div class='add'>+out_free_nbd:</div><div class='add'>+	kfree(nbd);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * And here should be modules and kernel interface </div><div class='ctx'>  *  (Just smiley confuses emacs :-)</div><div class='hunk'>@@ -892,9 +1075,7 @@ static struct blk_mq_ops nbd_mq_ops = {</div><div class='ctx'> </div><div class='ctx'> static int __init nbd_init(void)</div><div class='ctx'> {</div><div class='del'>-	int err = -ENOMEM;</div><div class='ctx'> 	int i;</div><div class='del'>-	int part_shift;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct nbd_request) != 28);</div><div class='ctx'> </div><div class='hunk'>@@ -923,109 +1104,40 @@ static int __init nbd_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (nbds_max &gt; 1UL &lt;&lt; (MINORBITS - part_shift))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);</div><div class='del'>-	if (!nbd_dev)</div><div class='add'>+	recv_workqueue = alloc_workqueue("knbd-recv",</div><div class='add'>+					 WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);</div><div class='add'>+	if (!recv_workqueue)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nbds_max; i++) {</div><div class='del'>-		struct gendisk *disk = alloc_disk(1 &lt;&lt; part_shift);</div><div class='del'>-		if (!disk)</div><div class='del'>-			goto out;</div><div class='del'>-		nbd_dev[i].disk = disk;</div><div class='del'>-</div><div class='del'>-		nbd_dev[i].tag_set.ops = &amp;nbd_mq_ops;</div><div class='del'>-		nbd_dev[i].tag_set.nr_hw_queues = 1;</div><div class='del'>-		nbd_dev[i].tag_set.queue_depth = 128;</div><div class='del'>-		nbd_dev[i].tag_set.numa_node = NUMA_NO_NODE;</div><div class='del'>-		nbd_dev[i].tag_set.cmd_size = sizeof(struct nbd_cmd);</div><div class='del'>-		nbd_dev[i].tag_set.flags = BLK_MQ_F_SHOULD_MERGE |</div><div class='del'>-			BLK_MQ_F_SG_MERGE | BLK_MQ_F_BLOCKING;</div><div class='del'>-		nbd_dev[i].tag_set.driver_data = &amp;nbd_dev[i];</div><div class='del'>-</div><div class='del'>-		err = blk_mq_alloc_tag_set(&amp;nbd_dev[i].tag_set);</div><div class='del'>-		if (err) {</div><div class='del'>-			put_disk(disk);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * The new linux 2.5 block layer implementation requires</div><div class='del'>-		 * every gendisk to have its very own request_queue struct.</div><div class='del'>-		 * These structs are big so we dynamically allocate them.</div><div class='del'>-		 */</div><div class='del'>-		disk-&gt;queue = blk_mq_init_queue(&amp;nbd_dev[i].tag_set);</div><div class='del'>-		if (!disk-&gt;queue) {</div><div class='del'>-			blk_mq_free_tag_set(&amp;nbd_dev[i].tag_set);</div><div class='del'>-			put_disk(disk);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Tell the block layer that we are not a rotational device</div><div class='del'>-		 */</div><div class='del'>-		queue_flag_set_unlocked(QUEUE_FLAG_NONROT, disk-&gt;queue);</div><div class='del'>-		queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, disk-&gt;queue);</div><div class='del'>-		disk-&gt;queue-&gt;limits.discard_granularity = 512;</div><div class='del'>-		blk_queue_max_discard_sectors(disk-&gt;queue, UINT_MAX);</div><div class='del'>-		disk-&gt;queue-&gt;limits.discard_zeroes_data = 0;</div><div class='del'>-		blk_queue_max_hw_sectors(disk-&gt;queue, 65536);</div><div class='del'>-		disk-&gt;queue-&gt;limits.max_sectors = 256;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (register_blkdev(NBD_MAJOR, "nbd")) {</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+		destroy_workqueue(recv_workqueue);</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "nbd: registered device at major %d\n", NBD_MAJOR);</div><div class='del'>-</div><div class='ctx'> 	nbd_dbg_init();</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nbds_max; i++) {</div><div class='del'>-		struct gendisk *disk = nbd_dev[i].disk;</div><div class='del'>-		nbd_dev[i].magic = NBD_MAGIC;</div><div class='del'>-		spin_lock_init(&amp;nbd_dev[i].sock_lock);</div><div class='del'>-		mutex_init(&amp;nbd_dev[i].tx_lock);</div><div class='del'>-		disk-&gt;major = NBD_MAJOR;</div><div class='del'>-		disk-&gt;first_minor = i &lt;&lt; part_shift;</div><div class='del'>-		disk-&gt;fops = &amp;nbd_fops;</div><div class='del'>-		disk-&gt;private_data = &amp;nbd_dev[i];</div><div class='del'>-		sprintf(disk-&gt;disk_name, "nbd%d", i);</div><div class='del'>-		nbd_reset(&amp;nbd_dev[i]);</div><div class='del'>-		add_disk(disk);</div><div class='del'>-	}</div><div class='add'>+	mutex_lock(&amp;nbd_index_mutex);</div><div class='add'>+	for (i = 0; i &lt; nbds_max; i++)</div><div class='add'>+		nbd_dev_add(i);</div><div class='add'>+	mutex_unlock(&amp;nbd_index_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int nbd_exit_cb(int id, void *ptr, void *data)</div><div class='add'>+{</div><div class='add'>+	struct nbd_device *nbd = ptr;</div><div class='add'>+	nbd_dev_remove(nbd);</div><div class='ctx'> 	return 0;</div><div class='del'>-out:</div><div class='del'>-	while (i--) {</div><div class='del'>-		blk_mq_free_tag_set(&amp;nbd_dev[i].tag_set);</div><div class='del'>-		blk_cleanup_queue(nbd_dev[i].disk-&gt;queue);</div><div class='del'>-		put_disk(nbd_dev[i].disk);</div><div class='del'>-	}</div><div class='del'>-	kfree(nbd_dev);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit nbd_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	nbd_dbg_close();</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nbds_max; i++) {</div><div class='del'>-		struct gendisk *disk = nbd_dev[i].disk;</div><div class='del'>-		nbd_dev[i].magic = 0;</div><div class='del'>-		if (disk) {</div><div class='del'>-			del_gendisk(disk);</div><div class='del'>-			blk_cleanup_queue(disk-&gt;queue);</div><div class='del'>-			blk_mq_free_tag_set(&amp;nbd_dev[i].tag_set);</div><div class='del'>-			put_disk(disk);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	idr_for_each(&amp;nbd_index_idr, &amp;nbd_exit_cb, NULL);</div><div class='add'>+	idr_destroy(&amp;nbd_index_idr);</div><div class='add'>+	destroy_workqueue(recv_workqueue);</div><div class='ctx'> 	unregister_blkdev(NBD_MAJOR, "nbd");</div><div class='del'>-	kfree(nbd_dev);</div><div class='del'>-	printk(KERN_INFO "nbd: unregistered device at major %d\n", NBD_MAJOR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(nbd_init);</div><div class='head'>diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c<br/>index ba6f4a2e73db..6f2e565bccc5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/null_blk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/null_blk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/null_blk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/null_blk.c</a></div><div class='hunk'>@@ -257,7 +257,7 @@ static enum hrtimer_restart null_cmd_timer_expired(struct hrtimer *timer)</div><div class='ctx'> </div><div class='ctx'> static void null_cmd_end_timer(struct nullb_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	ktime_t kt = ktime_set(0, completion_nsec);</div><div class='add'>+	ktime_t kt = completion_nsec;</div><div class='ctx'> </div><div class='ctx'> 	hrtimer_start(&amp;cmd-&gt;timer, kt, HRTIMER_MODE_REL);</div><div class='ctx'> }</div><div class='hunk'>@@ -420,7 +420,8 @@ static void null_lnvm_end_io(struct request *rq, int error)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvm_rq *rqd = rq-&gt;end_io_data;</div><div class='ctx'> </div><div class='del'>-	nvm_end_io(rqd, error);</div><div class='add'>+	rqd-&gt;error = error;</div><div class='add'>+	nvm_end_io(rqd);</div><div class='ctx'> </div><div class='ctx'> 	blk_put_request(rq);</div><div class='ctx'> }</div><div class='hunk'>@@ -431,11 +432,11 @@ static int null_lnvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> 	struct bio *bio = rqd-&gt;bio;</div><div class='ctx'> </div><div class='del'>-	rq = blk_mq_alloc_request(q, bio_data_dir(bio), 0);</div><div class='add'>+	rq = blk_mq_alloc_request(q,</div><div class='add'>+		op_is_write(bio_op(bio)) ? REQ_OP_DRV_OUT : REQ_OP_DRV_IN, 0);</div><div class='ctx'> 	if (IS_ERR(rq))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	rq-&gt;cmd_type = REQ_TYPE_DRV_PRIV;</div><div class='ctx'> 	rq-&gt;__sector = bio-&gt;bi_iter.bi_sector;</div><div class='ctx'> 	rq-&gt;ioprio = bio_prio(bio);</div><div class='ctx'> </div><div class='hunk'>@@ -460,7 +461,6 @@ static int null_lnvm_id(struct nvm_dev *dev, struct nvm_id *id)</div><div class='ctx'> </div><div class='ctx'> 	id-&gt;ver_id = 0x1;</div><div class='ctx'> 	id-&gt;vmnt = 0;</div><div class='del'>-	id-&gt;cgrps = 1;</div><div class='ctx'> 	id-&gt;cap = 0x2;</div><div class='ctx'> 	id-&gt;dom = 0x1;</div><div class='ctx'> </div><div class='hunk'>@@ -479,7 +479,7 @@ static int null_lnvm_id(struct nvm_dev *dev, struct nvm_id *id)</div><div class='ctx'> </div><div class='ctx'> 	sector_div(size, bs); /* convert size to pages */</div><div class='ctx'> 	size &gt;&gt;= 8; /* concert size to pgs pr blk */</div><div class='del'>-	grp = &amp;id-&gt;groups[0];</div><div class='add'>+	grp = &amp;id-&gt;grp;</div><div class='ctx'> 	grp-&gt;mtype = 0;</div><div class='ctx'> 	grp-&gt;fmtype = 0;</div><div class='ctx'> 	grp-&gt;num_ch = 1;</div><div class='hunk'>@@ -577,6 +577,7 @@ static void null_nvm_unregister(struct nullb *nullb)</div><div class='ctx'> #else</div><div class='ctx'> static int null_nvm_register(struct nullb *nullb)</div><div class='ctx'> {</div><div class='add'>+	pr_err("null_blk: CONFIG_NVM needs to be enabled for LightNVM\n");</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> static void null_nvm_unregister(struct nullb *nullb) {}</div><div class='head'>diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c<br/>index 92900f5f0b47..8127b8201a01 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/osdblk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/osdblk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/osdblk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/osdblk.c</a></div><div class='hunk'>@@ -308,12 +308,6 @@ static void osdblk_rq_fn(struct request_queue *q)</div><div class='ctx'> 		if (!rq)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/* filter out block requests we don't understand */</div><div class='del'>-		if (rq-&gt;cmd_type != REQ_TYPE_FS) {</div><div class='del'>-			blk_end_request_all(rq, 0);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* deduce our operation (read, write, flush) */</div><div class='ctx'> 		/* I wish the block layer simplified cmd_type/cmd_flags/cmd[]</div><div class='ctx'> 		 * into a clearly defined set of RPC commands:</div><div class='head'>diff --git a/drivers/block/paride/Kconfig b/drivers/block/paride/Kconfig<br/>index efefb5ac3004..3a15247942e4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/paride/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/paride/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/paride/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/Kconfig</a></div><div class='hunk'>@@ -25,6 +25,7 @@ config PARIDE_PD</div><div class='ctx'> config PARIDE_PCD</div><div class='ctx'> 	tristate "Parallel port ATAPI CD-ROMs"</div><div class='ctx'> 	depends on PARIDE</div><div class='add'>+	select BLK_SCSI_REQUEST # only for the generic cdrom code</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This option enables the high-level driver for ATAPI CD-ROM devices</div><div class='ctx'> 	  connected through a parallel port. If you chose to build PARIDE</div><div class='head'>diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c<br/>index 93362362aa55..10aed84244f5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/paride/pcd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/paride/pcd.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/paride/pcd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/pcd.c</a></div><div class='hunk'>@@ -139,7 +139,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(pcd_mutex);</div><div class='ctx'> static DEFINE_SPINLOCK(pcd_lock);</div><div class='hunk'>@@ -273,7 +273,7 @@ static const struct block_device_operations pcd_bdops = {</div><div class='ctx'> 	.check_events	= pcd_block_check_events,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct cdrom_device_ops pcd_dops = {</div><div class='add'>+static const struct cdrom_device_ops pcd_dops = {</div><div class='ctx'> 	.open		= pcd_open,</div><div class='ctx'> 	.release	= pcd_release,</div><div class='ctx'> 	.drive_status	= pcd_drive_status,</div><div class='head'>diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c<br/>index 78a39f736c64..644ba0888bd4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/paride/pd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/paride/pd.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/paride/pd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/pd.c</a></div><div class='hunk'>@@ -155,7 +155,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV};</div><div class='ctx'> #include &lt;linux/blkpg.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(pd_mutex);</div><div class='hunk'>@@ -439,18 +439,16 @@ static int pd_retries = 0;	/* i/o error retry count */</div><div class='ctx'> static int pd_block;		/* address of next requested block */</div><div class='ctx'> static int pd_count;		/* number of blocks still to do */</div><div class='ctx'> static int pd_run;		/* sectors in current cluster */</div><div class='del'>-static int pd_cmd;		/* current command READ/WRITE */</div><div class='ctx'> static char *pd_buf;		/* buffer for request in progress */</div><div class='ctx'> </div><div class='ctx'> static enum action do_pd_io_start(void)</div><div class='ctx'> {</div><div class='del'>-	if (pd_req-&gt;cmd_type == REQ_TYPE_DRV_PRIV) {</div><div class='add'>+	switch (req_op(pd_req)) {</div><div class='add'>+	case REQ_OP_DRV_IN:</div><div class='ctx'> 		phase = pd_special;</div><div class='ctx'> 		return pd_special();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pd_cmd = rq_data_dir(pd_req);</div><div class='del'>-	if (pd_cmd == READ || pd_cmd == WRITE) {</div><div class='add'>+	case REQ_OP_READ:</div><div class='add'>+	case REQ_OP_WRITE:</div><div class='ctx'> 		pd_block = blk_rq_pos(pd_req);</div><div class='ctx'> 		pd_count = blk_rq_cur_sectors(pd_req);</div><div class='ctx'> 		if (pd_block + pd_count &gt; get_capacity(pd_req-&gt;rq_disk))</div><div class='hunk'>@@ -458,7 +456,7 @@ static enum action do_pd_io_start(void)</div><div class='ctx'> 		pd_run = blk_rq_sectors(pd_req);</div><div class='ctx'> 		pd_buf = bio_data(pd_req-&gt;bio);</div><div class='ctx'> 		pd_retries = 0;</div><div class='del'>-		if (pd_cmd == READ)</div><div class='add'>+		if (req_op(pd_req) == REQ_OP_READ)</div><div class='ctx'> 			return do_pd_read_start();</div><div class='ctx'> 		else</div><div class='ctx'> 			return do_pd_write_start();</div><div class='hunk'>@@ -723,11 +721,10 @@ static int pd_special_command(struct pd_unit *disk,</div><div class='ctx'> 	struct request *rq;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	rq = blk_get_request(disk-&gt;gd-&gt;queue, READ, __GFP_RECLAIM);</div><div class='add'>+	rq = blk_get_request(disk-&gt;gd-&gt;queue, REQ_OP_DRV_IN, __GFP_RECLAIM);</div><div class='ctx'> 	if (IS_ERR(rq))</div><div class='ctx'> 		return PTR_ERR(rq);</div><div class='ctx'> </div><div class='del'>-	rq-&gt;cmd_type = REQ_TYPE_DRV_PRIV;</div><div class='ctx'> 	rq-&gt;special = func;</div><div class='ctx'> </div><div class='ctx'> 	err = blk_execute_rq(disk-&gt;gd-&gt;queue, disk-&gt;gd, rq, 0);</div><div class='head'>diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c<br/>index 7a7d977a76c5..ed93e8badf56 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/paride/pf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/paride/pf.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/paride/pf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/pf.c</a></div><div class='hunk'>@@ -155,7 +155,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_LUN, D_DLY};</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/blkpg.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(pf_mutex);</div><div class='ctx'> static DEFINE_SPINLOCK(pf_spin_lock);</div><div class='head'>diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c<br/>index bfbd4c852dd9..5db955fe3a94 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/paride/pg.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/paride/pg.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/paride/pg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/pg.c</a></div><div class='hunk'>@@ -166,7 +166,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> module_param(verbose, int, 0644);</div><div class='ctx'> module_param(major, int, 0);</div><div class='head'>diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c<br/>index 216a94fed5b4..61fc6824299a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/paride/pt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/paride/pt.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/paride/pt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/paride/pt.c</a></div><div class='hunk'>@@ -150,7 +150,7 @@ static int (*drives[4])[6] = {&amp;drive0, &amp;drive1, &amp;drive2, &amp;drive3};</div><div class='ctx'> #include &lt;linux/sched.h&gt;	/* current, TASK_*, schedule_timeout() */</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> module_param(verbose, int, 0);</div><div class='ctx'> module_param(major, int, 0);</div><div class='head'>diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c<br/>index 90fa4ac149db..66d846ba85a9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/pktcdvd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/pktcdvd.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/pktcdvd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/pktcdvd.c</a></div><div class='hunk'>@@ -68,7 +68,7 @@</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME	"pktcdvd"</div><div class='ctx'> </div><div class='hunk'>@@ -704,10 +704,10 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	rq = blk_get_request(q, (cgc-&gt;data_direction == CGC_DATA_WRITE) ?</div><div class='del'>-			     WRITE : READ, __GFP_RECLAIM);</div><div class='add'>+			     REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, __GFP_RECLAIM);</div><div class='ctx'> 	if (IS_ERR(rq))</div><div class='ctx'> 		return PTR_ERR(rq);</div><div class='del'>-	blk_rq_set_block_pc(rq);</div><div class='add'>+	scsi_req_init(rq);</div><div class='ctx'> </div><div class='ctx'> 	if (cgc-&gt;buflen) {</div><div class='ctx'> 		ret = blk_rq_map_kern(q, rq, cgc-&gt;buffer, cgc-&gt;buflen,</div><div class='hunk'>@@ -716,12 +716,12 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rq-&gt;cmd_len = COMMAND_SIZE(cgc-&gt;cmd[0]);</div><div class='del'>-	memcpy(rq-&gt;cmd, cgc-&gt;cmd, CDROM_PACKET_SIZE);</div><div class='add'>+	scsi_req(rq)-&gt;cmd_len = COMMAND_SIZE(cgc-&gt;cmd[0]);</div><div class='add'>+	memcpy(scsi_req(rq)-&gt;cmd, cgc-&gt;cmd, CDROM_PACKET_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;timeout = 60*HZ;</div><div class='ctx'> 	if (cgc-&gt;quiet)</div><div class='del'>-		rq-&gt;cmd_flags |= REQ_QUIET;</div><div class='add'>+		rq-&gt;rq_flags |= RQF_QUIET;</div><div class='ctx'> </div><div class='ctx'> 	blk_execute_rq(rq-&gt;q, pd-&gt;bdev-&gt;bd_disk, rq, 0);</div><div class='ctx'> 	if (rq-&gt;errors)</div><div class='hunk'>@@ -944,39 +944,6 @@ static int pkt_set_segment_merging(struct pktcdvd_device *pd, struct request_que</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Copy all data for this packet to pkt-&gt;pages[], so that</div><div class='del'>- * a) The number of required segments for the write bio is minimized, which</div><div class='del'>- *    is necessary for some scsi controllers.</div><div class='del'>- * b) The data can be used as cache to avoid read requests if we receive a</div><div class='del'>- *    new write request for the same zone.</div><div class='del'>- */</div><div class='del'>-static void pkt_make_local_copy(struct packet_data *pkt, struct bio_vec *bvec)</div><div class='del'>-{</div><div class='del'>-	int f, p, offs;</div><div class='del'>-</div><div class='del'>-	/* Copy all data to pkt-&gt;pages[] */</div><div class='del'>-	p = 0;</div><div class='del'>-	offs = 0;</div><div class='del'>-	for (f = 0; f &lt; pkt-&gt;frames; f++) {</div><div class='del'>-		if (bvec[f].bv_page != pkt-&gt;pages[p]) {</div><div class='del'>-			void *vfrom = kmap_atomic(bvec[f].bv_page) + bvec[f].bv_offset;</div><div class='del'>-			void *vto = page_address(pkt-&gt;pages[p]) + offs;</div><div class='del'>-			memcpy(vto, vfrom, CD_FRAMESIZE);</div><div class='del'>-			kunmap_atomic(vfrom);</div><div class='del'>-			bvec[f].bv_page = pkt-&gt;pages[p];</div><div class='del'>-			bvec[f].bv_offset = offs;</div><div class='del'>-		} else {</div><div class='del'>-			BUG_ON(bvec[f].bv_offset != offs);</div><div class='del'>-		}</div><div class='del'>-		offs += CD_FRAMESIZE;</div><div class='del'>-		if (offs &gt;= PAGE_SIZE) {</div><div class='del'>-			offs = 0;</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void pkt_end_io_read(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct packet_data *pkt = bio-&gt;bi_private;</div><div class='hunk'>@@ -1276,7 +1243,7 @@ try_next_bio:</div><div class='ctx'> 	 		&amp;&amp; pd-&gt;bio_queue_size &lt;= pd-&gt;write_congestion_off);</div><div class='ctx'> 	spin_unlock(&amp;pd-&gt;lock);</div><div class='ctx'> 	if (wakeup) {</div><div class='del'>-		clear_bdi_congested(&amp;pd-&gt;disk-&gt;queue-&gt;backing_dev_info,</div><div class='add'>+		clear_bdi_congested(pd-&gt;disk-&gt;queue-&gt;backing_dev_info,</div><div class='ctx'> 					BLK_RW_ASYNC);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1298,7 +1265,6 @@ try_next_bio:</div><div class='ctx'> static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	int f;</div><div class='del'>-	struct bio_vec *bvec = pkt-&gt;w_bio-&gt;bi_io_vec;</div><div class='ctx'> </div><div class='ctx'> 	bio_reset(pkt-&gt;w_bio);</div><div class='ctx'> 	pkt-&gt;w_bio-&gt;bi_iter.bi_sector = pkt-&gt;sector;</div><div class='hunk'>@@ -1308,9 +1274,10 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt)</div><div class='ctx'> </div><div class='ctx'> 	/* XXX: locking? */</div><div class='ctx'> 	for (f = 0; f &lt; pkt-&gt;frames; f++) {</div><div class='del'>-		bvec[f].bv_page = pkt-&gt;pages[(f * CD_FRAMESIZE) / PAGE_SIZE];</div><div class='del'>-		bvec[f].bv_offset = (f * CD_FRAMESIZE) % PAGE_SIZE;</div><div class='del'>-		if (!bio_add_page(pkt-&gt;w_bio, bvec[f].bv_page, CD_FRAMESIZE, bvec[f].bv_offset))</div><div class='add'>+		struct page *page = pkt-&gt;pages[(f * CD_FRAMESIZE) / PAGE_SIZE];</div><div class='add'>+		unsigned offset = (f * CD_FRAMESIZE) % PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+		if (!bio_add_page(pkt-&gt;w_bio, page, CD_FRAMESIZE, offset))</div><div class='ctx'> 			BUG();</div><div class='ctx'> 	}</div><div class='ctx'> 	pkt_dbg(2, pd, "vcnt=%d\n", pkt-&gt;w_bio-&gt;bi_vcnt);</div><div class='hunk'>@@ -1327,12 +1294,10 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt)</div><div class='ctx'> 	pkt_dbg(2, pd, "Writing %d frames for zone %llx\n",</div><div class='ctx'> 		pkt-&gt;write_size, (unsigned long long)pkt-&gt;sector);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(PACKET_MERGE_SEGS, &amp;pd-&gt;flags) || (pkt-&gt;write_size &lt; pkt-&gt;frames)) {</div><div class='del'>-		pkt_make_local_copy(pkt, bvec);</div><div class='add'>+	if (test_bit(PACKET_MERGE_SEGS, &amp;pd-&gt;flags) || (pkt-&gt;write_size &lt; pkt-&gt;frames))</div><div class='ctx'> 		pkt-&gt;cache_valid = 1;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		pkt-&gt;cache_valid = 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Start the write request */</div><div class='ctx'> 	atomic_set(&amp;pkt-&gt;io_wait, 1);</div><div class='hunk'>@@ -2405,7 +2370,7 @@ static void pkt_make_request_write(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	spin_lock(&amp;pd-&gt;lock);</div><div class='ctx'> 	if (pd-&gt;write_congestion_on &gt; 0</div><div class='ctx'> 	    &amp;&amp; pd-&gt;bio_queue_size &gt;= pd-&gt;write_congestion_on) {</div><div class='del'>-		set_bdi_congested(&amp;q-&gt;backing_dev_info, BLK_RW_ASYNC);</div><div class='add'>+		set_bdi_congested(q-&gt;backing_dev_info, BLK_RW_ASYNC);</div><div class='ctx'> 		do {</div><div class='ctx'> 			spin_unlock(&amp;pd-&gt;lock);</div><div class='ctx'> 			congestion_wait(BLK_RW_ASYNC, HZ);</div><div class='head'>diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c<br/>index 76f33c84ce3d..a809e3e9feb8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/ps3disk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/ps3disk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/ps3disk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/ps3disk.c</a></div><div class='hunk'>@@ -196,16 +196,19 @@ static void ps3disk_do_request(struct ps3_storage_device *dev,</div><div class='ctx'> 	dev_dbg(&amp;dev-&gt;sbd.core, "%s:%u\n", __func__, __LINE__);</div><div class='ctx'> </div><div class='ctx'> 	while ((req = blk_fetch_request(q))) {</div><div class='del'>-		if (req_op(req) == REQ_OP_FLUSH) {</div><div class='add'>+		switch (req_op(req)) {</div><div class='add'>+		case REQ_OP_FLUSH:</div><div class='ctx'> 			if (ps3disk_submit_flush_request(dev, req))</div><div class='del'>-				break;</div><div class='del'>-		} else if (req-&gt;cmd_type == REQ_TYPE_FS) {</div><div class='add'>+				return;</div><div class='add'>+			break;</div><div class='add'>+		case REQ_OP_READ:</div><div class='add'>+		case REQ_OP_WRITE:</div><div class='ctx'> 			if (ps3disk_submit_request_sg(dev, req))</div><div class='del'>-				break;</div><div class='del'>-		} else {</div><div class='add'>+				return;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='ctx'> 			blk_dump_rq_flags(req, DEVICE_NAME " bad request");</div><div class='ctx'> 			__blk_end_request_all(req, -EIO);</div><div class='del'>-			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c<br/>index 7b274ff4632c..4d6807723798 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/rbd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/rbd.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/rbd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/rbd.c</a></div><div class='hunk'>@@ -123,9 +123,11 @@ static int atomic_dec_return_safe(atomic_t *v)</div><div class='ctx'> #define RBD_FEATURE_LAYERING	(1&lt;&lt;0)</div><div class='ctx'> #define RBD_FEATURE_STRIPINGV2	(1&lt;&lt;1)</div><div class='ctx'> #define RBD_FEATURE_EXCLUSIVE_LOCK (1&lt;&lt;2)</div><div class='add'>+#define RBD_FEATURE_DATA_POOL (1&lt;&lt;7)</div><div class='ctx'> #define RBD_FEATURES_ALL	(RBD_FEATURE_LAYERING |		\</div><div class='ctx'> 				 RBD_FEATURE_STRIPINGV2 |	\</div><div class='del'>-				 RBD_FEATURE_EXCLUSIVE_LOCK)</div><div class='add'>+				 RBD_FEATURE_EXCLUSIVE_LOCK |	\</div><div class='add'>+				 RBD_FEATURE_DATA_POOL)</div><div class='ctx'> </div><div class='ctx'> /* Features supported by this (client software) implementation. */</div><div class='ctx'> </div><div class='hunk'>@@ -144,10 +146,9 @@ struct rbd_image_header {</div><div class='ctx'> 	/* These six fields never change for a given rbd image */</div><div class='ctx'> 	char *object_prefix;</div><div class='ctx'> 	__u8 obj_order;</div><div class='del'>-	__u8 crypt_type;</div><div class='del'>-	__u8 comp_type;</div><div class='ctx'> 	u64 stripe_unit;</div><div class='ctx'> 	u64 stripe_count;</div><div class='add'>+	s64 data_pool_id;</div><div class='ctx'> 	u64 features;		/* Might be changeable someday? */</div><div class='ctx'> </div><div class='ctx'> 	/* The remaining fields need to be updated occasionally */</div><div class='hunk'>@@ -230,7 +231,7 @@ enum obj_req_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct rbd_obj_request {</div><div class='del'>-	const char		*object_name;</div><div class='add'>+	u64			object_no;</div><div class='ctx'> 	u64			offset;		/* object start byte */</div><div class='ctx'> 	u64			length;		/* bytes from offset */</div><div class='ctx'> 	unsigned long		flags;</div><div class='hunk'>@@ -438,7 +439,6 @@ static DEFINE_SPINLOCK(rbd_client_list_lock);</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache	*rbd_img_request_cache;</div><div class='ctx'> static struct kmem_cache	*rbd_obj_request_cache;</div><div class='del'>-static struct kmem_cache	*rbd_segment_name_cache;</div><div class='ctx'> </div><div class='ctx'> static int rbd_major;</div><div class='ctx'> static DEFINE_IDA(rbd_dev_id_ida);</div><div class='hunk'>@@ -973,6 +973,30 @@ static bool rbd_dev_ondisk_valid(struct rbd_image_header_ondisk *ondisk)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * returns the size of an object in the image</div><div class='add'>+ */</div><div class='add'>+static u32 rbd_obj_bytes(struct rbd_image_header *header)</div><div class='add'>+{</div><div class='add'>+	return 1U &lt;&lt; header-&gt;obj_order;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rbd_init_layout(struct rbd_device *rbd_dev)</div><div class='add'>+{</div><div class='add'>+	if (rbd_dev-&gt;header.stripe_unit == 0 ||</div><div class='add'>+	    rbd_dev-&gt;header.stripe_count == 0) {</div><div class='add'>+		rbd_dev-&gt;header.stripe_unit = rbd_obj_bytes(&amp;rbd_dev-&gt;header);</div><div class='add'>+		rbd_dev-&gt;header.stripe_count = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rbd_dev-&gt;layout.stripe_unit = rbd_dev-&gt;header.stripe_unit;</div><div class='add'>+	rbd_dev-&gt;layout.stripe_count = rbd_dev-&gt;header.stripe_count;</div><div class='add'>+	rbd_dev-&gt;layout.object_size = rbd_obj_bytes(&amp;rbd_dev-&gt;header);</div><div class='add'>+	rbd_dev-&gt;layout.pool_id = rbd_dev-&gt;header.data_pool_id == CEPH_NOPOOL ?</div><div class='add'>+			  rbd_dev-&gt;spec-&gt;pool_id : rbd_dev-&gt;header.data_pool_id;</div><div class='add'>+	RCU_INIT_POINTER(rbd_dev-&gt;layout.pool_ns, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Fill an rbd image header with information from the given format 1</div><div class='ctx'>  * on-disk header.</div><div class='ctx'>  */</div><div class='hunk'>@@ -992,15 +1016,11 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev,</div><div class='ctx'> 	/* Allocate this now to avoid having to handle failure below */</div><div class='ctx'> </div><div class='ctx'> 	if (first_time) {</div><div class='del'>-		size_t len;</div><div class='del'>-</div><div class='del'>-		len = strnlen(ondisk-&gt;object_prefix,</div><div class='del'>-				sizeof (ondisk-&gt;object_prefix));</div><div class='del'>-		object_prefix = kmalloc(len + 1, GFP_KERNEL);</div><div class='add'>+		object_prefix = kstrndup(ondisk-&gt;object_prefix,</div><div class='add'>+					 sizeof(ondisk-&gt;object_prefix),</div><div class='add'>+					 GFP_KERNEL);</div><div class='ctx'> 		if (!object_prefix)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		memcpy(object_prefix, ondisk-&gt;object_prefix, len);</div><div class='del'>-		object_prefix[len] = '\0';</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate the snapshot context and fill it in */</div><div class='hunk'>@@ -1051,12 +1071,7 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev,</div><div class='ctx'> 	if (first_time) {</div><div class='ctx'> 		header-&gt;object_prefix = object_prefix;</div><div class='ctx'> 		header-&gt;obj_order = ondisk-&gt;options.order;</div><div class='del'>-		header-&gt;crypt_type = ondisk-&gt;options.crypt_type;</div><div class='del'>-		header-&gt;comp_type = ondisk-&gt;options.comp_type;</div><div class='del'>-		/* The rest aren't used for format 1 images */</div><div class='del'>-		header-&gt;stripe_unit = 0;</div><div class='del'>-		header-&gt;stripe_count = 0;</div><div class='del'>-		header-&gt;features = 0;</div><div class='add'>+		rbd_init_layout(rbd_dev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ceph_put_snap_context(header-&gt;snapc);</div><div class='ctx'> 		kfree(header-&gt;snap_names);</div><div class='hunk'>@@ -1232,42 +1247,9 @@ static void rbd_dev_mapping_clear(struct rbd_device *rbd_dev)</div><div class='ctx'> 	rbd_dev-&gt;mapping.features = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rbd_segment_name_free(const char *name)</div><div class='del'>-{</div><div class='del'>-	/* The explicit cast here is needed to drop the const qualifier */</div><div class='del'>-</div><div class='del'>-	kmem_cache_free(rbd_segment_name_cache, (void *)name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	u64 segment;</div><div class='del'>-	int ret;</div><div class='del'>-	char *name_format;</div><div class='del'>-</div><div class='del'>-	name = kmem_cache_alloc(rbd_segment_name_cache, GFP_NOIO);</div><div class='del'>-	if (!name)</div><div class='del'>-		return NULL;</div><div class='del'>-	segment = offset &gt;&gt; rbd_dev-&gt;header.obj_order;</div><div class='del'>-	name_format = "%s.%012llx";</div><div class='del'>-	if (rbd_dev-&gt;image_format == 2)</div><div class='del'>-		name_format = "%s.%016llx";</div><div class='del'>-	ret = snprintf(name, CEPH_MAX_OID_NAME_LEN + 1, name_format,</div><div class='del'>-			rbd_dev-&gt;header.object_prefix, segment);</div><div class='del'>-	if (ret &lt; 0 || ret &gt; CEPH_MAX_OID_NAME_LEN) {</div><div class='del'>-		pr_err("error formatting segment name for #%llu (%d)\n",</div><div class='del'>-			segment, ret);</div><div class='del'>-		rbd_segment_name_free(name);</div><div class='del'>-		name = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return name;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u64 rbd_segment_offset(struct rbd_device *rbd_dev, u64 offset)</div><div class='ctx'> {</div><div class='del'>-	u64 segment_size = (u64) 1 &lt;&lt; rbd_dev-&gt;header.obj_order;</div><div class='add'>+	u64 segment_size = rbd_obj_bytes(&amp;rbd_dev-&gt;header);</div><div class='ctx'> </div><div class='ctx'> 	return offset &amp; (segment_size - 1);</div><div class='ctx'> }</div><div class='hunk'>@@ -1275,7 +1257,7 @@ static u64 rbd_segment_offset(struct rbd_device *rbd_dev, u64 offset)</div><div class='ctx'> static u64 rbd_segment_length(struct rbd_device *rbd_dev,</div><div class='ctx'> 				u64 offset, u64 length)</div><div class='ctx'> {</div><div class='del'>-	u64 segment_size = (u64) 1 &lt;&lt; rbd_dev-&gt;header.obj_order;</div><div class='add'>+	u64 segment_size = rbd_obj_bytes(&amp;rbd_dev-&gt;header);</div><div class='ctx'> </div><div class='ctx'> 	offset &amp;= segment_size - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1287,14 +1269,6 @@ static u64 rbd_segment_length(struct rbd_device *rbd_dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * returns the size of an object in the image</div><div class='del'>- */</div><div class='del'>-static u64 rbd_obj_bytes(struct rbd_image_header *header)</div><div class='del'>-{</div><div class='del'>-	return 1 &lt;&lt; header-&gt;obj_order;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * bio helpers</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -1535,7 +1509,7 @@ static bool obj_request_overlaps_parent(struct rbd_obj_request *obj_request)</div><div class='ctx'> static void rbd_obj_request_get(struct rbd_obj_request *obj_request)</div><div class='ctx'> {</div><div class='ctx'> 	dout("%s: obj %p (was %d)\n", __func__, obj_request,</div><div class='del'>-		atomic_read(&amp;obj_request-&gt;kref.refcount));</div><div class='add'>+		kref_read(&amp;obj_request-&gt;kref));</div><div class='ctx'> 	kref_get(&amp;obj_request-&gt;kref);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1544,14 +1518,14 @@ static void rbd_obj_request_put(struct rbd_obj_request *obj_request)</div><div class='ctx'> {</div><div class='ctx'> 	rbd_assert(obj_request != NULL);</div><div class='ctx'> 	dout("%s: obj %p (was %d)\n", __func__, obj_request,</div><div class='del'>-		atomic_read(&amp;obj_request-&gt;kref.refcount));</div><div class='add'>+		kref_read(&amp;obj_request-&gt;kref));</div><div class='ctx'> 	kref_put(&amp;obj_request-&gt;kref, rbd_obj_request_destroy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rbd_img_request_get(struct rbd_img_request *img_request)</div><div class='ctx'> {</div><div class='ctx'> 	dout("%s: img %p (was %d)\n", __func__, img_request,</div><div class='del'>-	     atomic_read(&amp;img_request-&gt;kref.refcount));</div><div class='add'>+	     kref_read(&amp;img_request-&gt;kref));</div><div class='ctx'> 	kref_get(&amp;img_request-&gt;kref);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1562,7 +1536,7 @@ static void rbd_img_request_put(struct rbd_img_request *img_request)</div><div class='ctx'> {</div><div class='ctx'> 	rbd_assert(img_request != NULL);</div><div class='ctx'> 	dout("%s: img %p (was %d)\n", __func__, img_request,</div><div class='del'>-		atomic_read(&amp;img_request-&gt;kref.refcount));</div><div class='add'>+		kref_read(&amp;img_request-&gt;kref));</div><div class='ctx'> 	if (img_request_child_test(img_request))</div><div class='ctx'> 		kref_put(&amp;img_request-&gt;kref, rbd_parent_request_destroy);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1623,7 +1597,9 @@ static void rbd_obj_request_submit(struct rbd_obj_request *obj_request)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_osd_request *osd_req = obj_request-&gt;osd_req;</div><div class='ctx'> </div><div class='del'>-	dout("%s %p osd_req %p\n", __func__, obj_request, osd_req);</div><div class='add'>+	dout("%s %p object_no %016llx %llu~%llu osd_req %p\n", __func__,</div><div class='add'>+	     obj_request, obj_request-&gt;object_no, obj_request-&gt;offset,</div><div class='add'>+	     obj_request-&gt;length, osd_req);</div><div class='ctx'> 	if (obj_request_img_data_test(obj_request)) {</div><div class='ctx'> 		WARN_ON(obj_request-&gt;callback != rbd_img_obj_callback);</div><div class='ctx'> 		rbd_img_request_get(obj_request-&gt;img_request);</div><div class='hunk'>@@ -1631,44 +1607,6 @@ static void rbd_obj_request_submit(struct rbd_obj_request *obj_request)</div><div class='ctx'> 	ceph_osdc_start_request(osd_req-&gt;r_osdc, osd_req, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rbd_obj_request_end(struct rbd_obj_request *obj_request)</div><div class='del'>-{</div><div class='del'>-	dout("%s %p\n", __func__, obj_request);</div><div class='del'>-	ceph_osdc_cancel_request(obj_request-&gt;osd_req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wait for an object request to complete.  If interrupted, cancel the</div><div class='del'>- * underlying osd request.</div><div class='del'>- *</div><div class='del'>- * @timeout: in jiffies, 0 means "wait forever"</div><div class='del'>- */</div><div class='del'>-static int __rbd_obj_request_wait(struct rbd_obj_request *obj_request,</div><div class='del'>-				  unsigned long timeout)</div><div class='del'>-{</div><div class='del'>-	long ret;</div><div class='del'>-</div><div class='del'>-	dout("%s %p\n", __func__, obj_request);</div><div class='del'>-	ret = wait_for_completion_interruptible_timeout(</div><div class='del'>-					&amp;obj_request-&gt;completion,</div><div class='del'>-					ceph_timeout_jiffies(timeout));</div><div class='del'>-	if (ret &lt;= 0) {</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			ret = -ETIMEDOUT;</div><div class='del'>-		rbd_obj_request_end(obj_request);</div><div class='del'>-	} else {</div><div class='del'>-		ret = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dout("%s %p ret %d\n", __func__, obj_request, (int)ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rbd_obj_request_wait(struct rbd_obj_request *obj_request)</div><div class='del'>-{</div><div class='del'>-	return __rbd_obj_request_wait(obj_request, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void rbd_img_request_complete(struct rbd_img_request *img_request)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -1955,8 +1893,8 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req)</div><div class='ctx'> 		rbd_osd_call_callback(obj_request);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		rbd_warn(NULL, "%s: unsupported op %hu",</div><div class='del'>-			obj_request-&gt;object_name, (unsigned short) opcode);</div><div class='add'>+		rbd_warn(NULL, "unexpected OSD op: object_no %016llx opcode %d",</div><div class='add'>+			 obj_request-&gt;object_no, opcode);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1980,6 +1918,40 @@ static void rbd_osd_req_format_write(struct rbd_obj_request *obj_request)</div><div class='ctx'> 	osd_req-&gt;r_data_offset = obj_request-&gt;offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct ceph_osd_request *</div><div class='add'>+__rbd_osd_req_create(struct rbd_device *rbd_dev,</div><div class='add'>+		     struct ceph_snap_context *snapc,</div><div class='add'>+		     int num_ops, unsigned int flags,</div><div class='add'>+		     struct rbd_obj_request *obj_request)</div><div class='add'>+{</div><div class='add'>+	struct ceph_osd_client *osdc = &amp;rbd_dev-&gt;rbd_client-&gt;client-&gt;osdc;</div><div class='add'>+	struct ceph_osd_request *req;</div><div class='add'>+	const char *name_format = rbd_dev-&gt;image_format == 1 ?</div><div class='add'>+				      RBD_V1_DATA_FORMAT : RBD_V2_DATA_FORMAT;</div><div class='add'>+</div><div class='add'>+	req = ceph_osdc_alloc_request(osdc, snapc, num_ops, false, GFP_NOIO);</div><div class='add'>+	if (!req)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	req-&gt;r_flags = flags;</div><div class='add'>+	req-&gt;r_callback = rbd_osd_req_callback;</div><div class='add'>+	req-&gt;r_priv = obj_request;</div><div class='add'>+</div><div class='add'>+	req-&gt;r_base_oloc.pool = rbd_dev-&gt;layout.pool_id;</div><div class='add'>+	if (ceph_oid_aprintf(&amp;req-&gt;r_base_oid, GFP_NOIO, name_format,</div><div class='add'>+			rbd_dev-&gt;header.object_prefix, obj_request-&gt;object_no))</div><div class='add'>+		goto err_req;</div><div class='add'>+</div><div class='add'>+	if (ceph_osdc_alloc_messages(req, GFP_NOIO))</div><div class='add'>+		goto err_req;</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+</div><div class='add'>+err_req:</div><div class='add'>+	ceph_osdc_put_request(req);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Create an osd request.  A read request has one osd op (read).</div><div class='ctx'>  * A write request has either one (watch) or two (hint+write) osd ops.</div><div class='hunk'>@@ -1993,8 +1965,6 @@ static struct ceph_osd_request *rbd_osd_req_create(</div><div class='ctx'> 					struct rbd_obj_request *obj_request)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_snap_context *snapc = NULL;</div><div class='del'>-	struct ceph_osd_client *osdc;</div><div class='del'>-	struct ceph_osd_request *osd_req;</div><div class='ctx'> </div><div class='ctx'> 	if (obj_request_img_data_test(obj_request) &amp;&amp;</div><div class='ctx'> 		(op_type == OBJ_OP_DISCARD || op_type == OBJ_OP_WRITE)) {</div><div class='hunk'>@@ -2009,35 +1979,9 @@ static struct ceph_osd_request *rbd_osd_req_create(</div><div class='ctx'> </div><div class='ctx'> 	rbd_assert(num_ops == 1 || ((op_type == OBJ_OP_WRITE) &amp;&amp; num_ops == 2));</div><div class='ctx'> </div><div class='del'>-	/* Allocate and initialize the request, for the num_ops ops */</div><div class='del'>-</div><div class='del'>-	osdc = &amp;rbd_dev-&gt;rbd_client-&gt;client-&gt;osdc;</div><div class='del'>-	osd_req = ceph_osdc_alloc_request(osdc, snapc, num_ops, false,</div><div class='del'>-					  GFP_NOIO);</div><div class='del'>-	if (!osd_req)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (op_type == OBJ_OP_WRITE || op_type == OBJ_OP_DISCARD)</div><div class='del'>-		osd_req-&gt;r_flags = CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK;</div><div class='del'>-	else</div><div class='del'>-		osd_req-&gt;r_flags = CEPH_OSD_FLAG_READ;</div><div class='del'>-</div><div class='del'>-	osd_req-&gt;r_callback = rbd_osd_req_callback;</div><div class='del'>-	osd_req-&gt;r_priv = obj_request;</div><div class='del'>-</div><div class='del'>-	osd_req-&gt;r_base_oloc.pool = rbd_dev-&gt;layout.pool_id;</div><div class='del'>-	if (ceph_oid_aprintf(&amp;osd_req-&gt;r_base_oid, GFP_NOIO, "%s",</div><div class='del'>-			     obj_request-&gt;object_name))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (ceph_osdc_alloc_messages(osd_req, GFP_NOIO))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	return osd_req;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	ceph_osdc_put_request(osd_req);</div><div class='del'>-	return NULL;</div><div class='add'>+	return __rbd_osd_req_create(rbd_dev, snapc, num_ops,</div><div class='add'>+	    (op_type == OBJ_OP_WRITE || op_type == OBJ_OP_DISCARD) ?</div><div class='add'>+	    CEPH_OSD_FLAG_WRITE : CEPH_OSD_FLAG_READ, obj_request);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2050,10 +1994,6 @@ static struct ceph_osd_request *</div><div class='ctx'> rbd_osd_req_create_copyup(struct rbd_obj_request *obj_request)</div><div class='ctx'> {</div><div class='ctx'> 	struct rbd_img_request *img_request;</div><div class='del'>-	struct ceph_snap_context *snapc;</div><div class='del'>-	struct rbd_device *rbd_dev;</div><div class='del'>-	struct ceph_osd_client *osdc;</div><div class='del'>-	struct ceph_osd_request *osd_req;</div><div class='ctx'> 	int num_osd_ops = 3;</div><div class='ctx'> </div><div class='ctx'> 	rbd_assert(obj_request_img_data_test(obj_request));</div><div class='hunk'>@@ -2065,77 +2005,34 @@ rbd_osd_req_create_copyup(struct rbd_obj_request *obj_request)</div><div class='ctx'> 	if (img_request_discard_test(img_request))</div><div class='ctx'> 		num_osd_ops = 2;</div><div class='ctx'> </div><div class='del'>-	/* Allocate and initialize the request, for all the ops */</div><div class='del'>-</div><div class='del'>-	snapc = img_request-&gt;snapc;</div><div class='del'>-	rbd_dev = img_request-&gt;rbd_dev;</div><div class='del'>-	osdc = &amp;rbd_dev-&gt;rbd_client-&gt;client-&gt;osdc;</div><div class='del'>-	osd_req = ceph_osdc_alloc_request(osdc, snapc, num_osd_ops,</div><div class='del'>-						false, GFP_NOIO);</div><div class='del'>-	if (!osd_req)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	osd_req-&gt;r_flags = CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK;</div><div class='del'>-	osd_req-&gt;r_callback = rbd_osd_req_callback;</div><div class='del'>-	osd_req-&gt;r_priv = obj_request;</div><div class='del'>-</div><div class='del'>-	osd_req-&gt;r_base_oloc.pool = rbd_dev-&gt;layout.pool_id;</div><div class='del'>-	if (ceph_oid_aprintf(&amp;osd_req-&gt;r_base_oid, GFP_NOIO, "%s",</div><div class='del'>-			     obj_request-&gt;object_name))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (ceph_osdc_alloc_messages(osd_req, GFP_NOIO))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	return osd_req;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	ceph_osdc_put_request(osd_req);</div><div class='del'>-	return NULL;</div><div class='add'>+	return __rbd_osd_req_create(img_request-&gt;rbd_dev,</div><div class='add'>+				    img_request-&gt;snapc, num_osd_ops,</div><div class='add'>+				    CEPH_OSD_FLAG_WRITE, obj_request);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void rbd_osd_req_destroy(struct ceph_osd_request *osd_req)</div><div class='ctx'> {</div><div class='ctx'> 	ceph_osdc_put_request(osd_req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* object_name is assumed to be a non-null pointer and NUL-terminated */</div><div class='del'>-</div><div class='del'>-static struct rbd_obj_request *rbd_obj_request_create(const char *object_name,</div><div class='del'>-						u64 offset, u64 length,</div><div class='del'>-						enum obj_request_type type)</div><div class='add'>+static struct rbd_obj_request *</div><div class='add'>+rbd_obj_request_create(enum obj_request_type type)</div><div class='ctx'> {</div><div class='ctx'> 	struct rbd_obj_request *obj_request;</div><div class='del'>-	size_t size;</div><div class='del'>-	char *name;</div><div class='ctx'> </div><div class='ctx'> 	rbd_assert(obj_request_type_valid(type));</div><div class='ctx'> </div><div class='del'>-	size = strlen(object_name) + 1;</div><div class='del'>-	name = kmalloc(size, GFP_NOIO);</div><div class='del'>-	if (!name)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='ctx'> 	obj_request = kmem_cache_zalloc(rbd_obj_request_cache, GFP_NOIO);</div><div class='del'>-	if (!obj_request) {</div><div class='del'>-		kfree(name);</div><div class='add'>+	if (!obj_request)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	obj_request-&gt;object_name = memcpy(name, object_name, size);</div><div class='del'>-	obj_request-&gt;offset = offset;</div><div class='del'>-	obj_request-&gt;length = length;</div><div class='del'>-	obj_request-&gt;flags = 0;</div><div class='ctx'> 	obj_request-&gt;which = BAD_WHICH;</div><div class='ctx'> 	obj_request-&gt;type = type;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;obj_request-&gt;links);</div><div class='ctx'> 	init_completion(&amp;obj_request-&gt;completion);</div><div class='ctx'> 	kref_init(&amp;obj_request-&gt;kref);</div><div class='ctx'> </div><div class='del'>-	dout("%s: \"%s\" %llu/%llu %d -&gt; obj %p\n", __func__, object_name,</div><div class='del'>-		offset, length, (int)type, obj_request);</div><div class='del'>-</div><div class='add'>+	dout("%s %p\n", __func__, obj_request);</div><div class='ctx'> 	return obj_request;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2170,8 +2067,6 @@ static void rbd_obj_request_destroy(struct kref *kref)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(obj_request-&gt;object_name);</div><div class='del'>-	obj_request-&gt;object_name = NULL;</div><div class='ctx'> 	kmem_cache_free(rbd_obj_request_cache, obj_request);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2546,22 +2441,18 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request,</div><div class='ctx'> </div><div class='ctx'> 	while (resid) {</div><div class='ctx'> 		struct ceph_osd_request *osd_req;</div><div class='del'>-		const char *object_name;</div><div class='del'>-		u64 offset;</div><div class='del'>-		u64 length;</div><div class='add'>+		u64 object_no = img_offset &gt;&gt; rbd_dev-&gt;header.obj_order;</div><div class='add'>+		u64 offset = rbd_segment_offset(rbd_dev, img_offset);</div><div class='add'>+		u64 length = rbd_segment_length(rbd_dev, img_offset, resid);</div><div class='ctx'> </div><div class='del'>-		object_name = rbd_segment_name(rbd_dev, img_offset);</div><div class='del'>-		if (!object_name)</div><div class='del'>-			goto out_unwind;</div><div class='del'>-		offset = rbd_segment_offset(rbd_dev, img_offset);</div><div class='del'>-		length = rbd_segment_length(rbd_dev, img_offset, resid);</div><div class='del'>-		obj_request = rbd_obj_request_create(object_name,</div><div class='del'>-						offset, length, type);</div><div class='del'>-		/* object request has its own copy of the object name */</div><div class='del'>-		rbd_segment_name_free(object_name);</div><div class='add'>+		obj_request = rbd_obj_request_create(type);</div><div class='ctx'> 		if (!obj_request)</div><div class='ctx'> 			goto out_unwind;</div><div class='ctx'> </div><div class='add'>+		obj_request-&gt;object_no = object_no;</div><div class='add'>+		obj_request-&gt;offset = offset;</div><div class='add'>+		obj_request-&gt;length = length;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * set obj_request-&gt;img_request before creating the</div><div class='ctx'> 		 * osd_request so that it gets the right snapc</div><div class='hunk'>@@ -2771,7 +2662,7 @@ static int rbd_img_obj_parent_read_full(struct rbd_obj_request *obj_request)</div><div class='ctx'> 	 * child image to which the original request was to be sent.</div><div class='ctx'> 	 */</div><div class='ctx'> 	img_offset = obj_request-&gt;img_offset - obj_request-&gt;offset;</div><div class='del'>-	length = (u64)1 &lt;&lt; rbd_dev-&gt;header.obj_order;</div><div class='add'>+	length = rbd_obj_bytes(&amp;rbd_dev-&gt;header);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * There is no defined parent data beyond the parent</div><div class='hunk'>@@ -2900,11 +2791,12 @@ static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request)</div><div class='ctx'> 	size_t size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	stat_request = rbd_obj_request_create(obj_request-&gt;object_name, 0, 0,</div><div class='del'>-					      OBJ_REQUEST_PAGES);</div><div class='add'>+	stat_request = rbd_obj_request_create(OBJ_REQUEST_PAGES);</div><div class='ctx'> 	if (!stat_request)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	stat_request-&gt;object_no = obj_request-&gt;object_no;</div><div class='add'>+</div><div class='ctx'> 	stat_request-&gt;osd_req = rbd_osd_req_create(rbd_dev, OBJ_OP_READ, 1,</div><div class='ctx'> 						   stat_request);</div><div class='ctx'> 	if (!stat_request-&gt;osd_req) {</div><div class='hunk'>@@ -3756,7 +3648,7 @@ static void rbd_watch_cb(void *arg, u64 notify_id, u64 cookie,</div><div class='ctx'> 	struct rbd_device *rbd_dev = arg;</div><div class='ctx'> 	void *p = data;</div><div class='ctx'> 	void *const end = p + data_len;</div><div class='del'>-	u8 struct_v;</div><div class='add'>+	u8 struct_v = 0;</div><div class='ctx'> 	u32 len;</div><div class='ctx'> 	u32 notify_op;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -3983,17 +3875,17 @@ out:</div><div class='ctx'>  * returned in the outbound buffer, or a negative error code.</div><div class='ctx'>  */</div><div class='ctx'> static int rbd_obj_method_sync(struct rbd_device *rbd_dev,</div><div class='del'>-			     const char *object_name,</div><div class='del'>-			     const char *class_name,</div><div class='add'>+			     struct ceph_object_id *oid,</div><div class='add'>+			     struct ceph_object_locator *oloc,</div><div class='ctx'> 			     const char *method_name,</div><div class='ctx'> 			     const void *outbound,</div><div class='ctx'> 			     size_t outbound_size,</div><div class='ctx'> 			     void *inbound,</div><div class='ctx'> 			     size_t inbound_size)</div><div class='ctx'> {</div><div class='del'>-	struct rbd_obj_request *obj_request;</div><div class='del'>-	struct page **pages;</div><div class='del'>-	u32 page_count;</div><div class='add'>+	struct ceph_osd_client *osdc = &amp;rbd_dev-&gt;rbd_client-&gt;client-&gt;osdc;</div><div class='add'>+	struct page *req_page = NULL;</div><div class='add'>+	struct page *reply_page;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4003,61 +3895,35 @@ static int rbd_obj_method_sync(struct rbd_device *rbd_dev,</div><div class='ctx'> 	 * method.  Currently if this is present it will be a</div><div class='ctx'> 	 * snapshot id.</div><div class='ctx'> 	 */</div><div class='del'>-	page_count = (u32)calc_pages_for(0, inbound_size);</div><div class='del'>-	pages = ceph_alloc_page_vector(page_count, GFP_KERNEL);</div><div class='del'>-	if (IS_ERR(pages))</div><div class='del'>-		return PTR_ERR(pages);</div><div class='del'>-</div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-	obj_request = rbd_obj_request_create(object_name, 0, inbound_size,</div><div class='del'>-							OBJ_REQUEST_PAGES);</div><div class='del'>-	if (!obj_request)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	obj_request-&gt;pages = pages;</div><div class='del'>-	obj_request-&gt;page_count = page_count;</div><div class='add'>+	if (outbound) {</div><div class='add'>+		if (outbound_size &gt; PAGE_SIZE)</div><div class='add'>+			return -E2BIG;</div><div class='ctx'> </div><div class='del'>-	obj_request-&gt;osd_req = rbd_osd_req_create(rbd_dev, OBJ_OP_READ, 1,</div><div class='del'>-						  obj_request);</div><div class='del'>-	if (!obj_request-&gt;osd_req)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	osd_req_op_cls_init(obj_request-&gt;osd_req, 0, CEPH_OSD_OP_CALL,</div><div class='del'>-					class_name, method_name);</div><div class='del'>-	if (outbound_size) {</div><div class='del'>-		struct ceph_pagelist *pagelist;</div><div class='del'>-</div><div class='del'>-		pagelist = kmalloc(sizeof (*pagelist), GFP_NOFS);</div><div class='del'>-		if (!pagelist)</div><div class='del'>-			goto out;</div><div class='add'>+		req_page = alloc_page(GFP_KERNEL);</div><div class='add'>+		if (!req_page)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		ceph_pagelist_init(pagelist);</div><div class='del'>-		ceph_pagelist_append(pagelist, outbound, outbound_size);</div><div class='del'>-		osd_req_op_cls_request_data_pagelist(obj_request-&gt;osd_req, 0,</div><div class='del'>-						pagelist);</div><div class='add'>+		memcpy(page_address(req_page), outbound, outbound_size);</div><div class='ctx'> 	}</div><div class='del'>-	osd_req_op_cls_response_data_pages(obj_request-&gt;osd_req, 0,</div><div class='del'>-					obj_request-&gt;pages, inbound_size,</div><div class='del'>-					0, false, false);</div><div class='del'>-</div><div class='del'>-	rbd_obj_request_submit(obj_request);</div><div class='del'>-	ret = rbd_obj_request_wait(obj_request);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = obj_request-&gt;result;</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+	reply_page = alloc_page(GFP_KERNEL);</div><div class='add'>+	if (!reply_page) {</div><div class='add'>+		if (req_page)</div><div class='add'>+			__free_page(req_page);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rbd_assert(obj_request-&gt;xferred &lt; (u64)INT_MAX);</div><div class='del'>-	ret = (int)obj_request-&gt;xferred;</div><div class='del'>-	ceph_copy_from_page_vector(pages, inbound, 0, obj_request-&gt;xferred);</div><div class='del'>-out:</div><div class='del'>-	if (obj_request)</div><div class='del'>-		rbd_obj_request_put(obj_request);</div><div class='del'>-	else</div><div class='del'>-		ceph_release_page_vector(pages, page_count);</div><div class='add'>+	ret = ceph_osdc_call(osdc, oid, oloc, RBD_DRV_NAME, method_name,</div><div class='add'>+			     CEPH_OSD_FLAG_READ, req_page, outbound_size,</div><div class='add'>+			     reply_page, &amp;inbound_size);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		memcpy(inbound, page_address(reply_page), inbound_size);</div><div class='add'>+		ret = inbound_size;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (req_page)</div><div class='add'>+		__free_page(req_page);</div><div class='add'>+	__free_page(reply_page);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4099,19 +3965,21 @@ static void rbd_queue_workfn(struct work_struct *work)</div><div class='ctx'> 	bool must_be_locked;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	if (rq-&gt;cmd_type != REQ_TYPE_FS) {</div><div class='del'>-		dout("%s: non-fs request type %d\n", __func__,</div><div class='del'>-			(int) rq-&gt;cmd_type);</div><div class='del'>-		result = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (req_op(rq) == REQ_OP_DISCARD)</div><div class='add'>+	switch (req_op(rq)) {</div><div class='add'>+	case REQ_OP_DISCARD:</div><div class='ctx'> 		op_type = OBJ_OP_DISCARD;</div><div class='del'>-	else if (req_op(rq) == REQ_OP_WRITE)</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_WRITE:</div><div class='ctx'> 		op_type = OBJ_OP_WRITE;</div><div class='del'>-	else</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_READ:</div><div class='ctx'> 		op_type = OBJ_OP_READ;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dout("%s: non-fs request type %d\n", __func__, req_op(rq));</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Ignore/skip any zero-length requests */</div><div class='ctx'> </div><div class='hunk'>@@ -4254,63 +4122,46 @@ static void rbd_free_disk(struct rbd_device *rbd_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rbd_obj_read_sync(struct rbd_device *rbd_dev,</div><div class='del'>-				const char *object_name,</div><div class='del'>-				u64 offset, u64 length, void *buf)</div><div class='add'>+			     struct ceph_object_id *oid,</div><div class='add'>+			     struct ceph_object_locator *oloc,</div><div class='add'>+			     void *buf, int buf_len)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	struct rbd_obj_request *obj_request;</div><div class='del'>-	struct page **pages = NULL;</div><div class='del'>-	u32 page_count;</div><div class='del'>-	size_t size;</div><div class='add'>+	struct ceph_osd_client *osdc = &amp;rbd_dev-&gt;rbd_client-&gt;client-&gt;osdc;</div><div class='add'>+	struct ceph_osd_request *req;</div><div class='add'>+	struct page **pages;</div><div class='add'>+	int num_pages = calc_pages_for(0, buf_len);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	page_count = (u32) calc_pages_for(offset, length);</div><div class='del'>-	pages = ceph_alloc_page_vector(page_count, GFP_KERNEL);</div><div class='del'>-	if (IS_ERR(pages))</div><div class='del'>-		return PTR_ERR(pages);</div><div class='del'>-</div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-	obj_request = rbd_obj_request_create(object_name, offset, length,</div><div class='del'>-							OBJ_REQUEST_PAGES);</div><div class='del'>-	if (!obj_request)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	obj_request-&gt;pages = pages;</div><div class='del'>-	obj_request-&gt;page_count = page_count;</div><div class='del'>-</div><div class='del'>-	obj_request-&gt;osd_req = rbd_osd_req_create(rbd_dev, OBJ_OP_READ, 1,</div><div class='del'>-						  obj_request);</div><div class='del'>-	if (!obj_request-&gt;osd_req)</div><div class='del'>-		goto out;</div><div class='add'>+	req = ceph_osdc_alloc_request(osdc, NULL, 1, false, GFP_KERNEL);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	osd_req_op_extent_init(obj_request-&gt;osd_req, 0, CEPH_OSD_OP_READ,</div><div class='del'>-					offset, length, 0, 0);</div><div class='del'>-	osd_req_op_extent_osd_data_pages(obj_request-&gt;osd_req, 0,</div><div class='del'>-					obj_request-&gt;pages,</div><div class='del'>-					obj_request-&gt;length,</div><div class='del'>-					obj_request-&gt;offset &amp; ~PAGE_MASK,</div><div class='del'>-					false, false);</div><div class='add'>+	ceph_oid_copy(&amp;req-&gt;r_base_oid, oid);</div><div class='add'>+	ceph_oloc_copy(&amp;req-&gt;r_base_oloc, oloc);</div><div class='add'>+	req-&gt;r_flags = CEPH_OSD_FLAG_READ;</div><div class='ctx'> </div><div class='del'>-	rbd_obj_request_submit(obj_request);</div><div class='del'>-	ret = rbd_obj_request_wait(obj_request);</div><div class='add'>+	ret = ceph_osdc_alloc_messages(req, GFP_KERNEL);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_req;</div><div class='ctx'> </div><div class='del'>-	ret = obj_request-&gt;result;</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+	pages = ceph_alloc_page_vector(num_pages, GFP_KERNEL);</div><div class='add'>+	if (IS_ERR(pages)) {</div><div class='add'>+		ret = PTR_ERR(pages);</div><div class='add'>+		goto out_req;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rbd_assert(obj_request-&gt;xferred &lt;= (u64) SIZE_MAX);</div><div class='del'>-	size = (size_t) obj_request-&gt;xferred;</div><div class='del'>-	ceph_copy_from_page_vector(pages, buf, 0, size);</div><div class='del'>-	rbd_assert(size &lt;= (size_t)INT_MAX);</div><div class='del'>-	ret = (int)size;</div><div class='del'>-out:</div><div class='del'>-	if (obj_request)</div><div class='del'>-		rbd_obj_request_put(obj_request);</div><div class='del'>-	else</div><div class='del'>-		ceph_release_page_vector(pages, page_count);</div><div class='add'>+	osd_req_op_extent_init(req, 0, CEPH_OSD_OP_READ, 0, buf_len, 0, 0);</div><div class='add'>+	osd_req_op_extent_osd_data_pages(req, 0, pages, buf_len, 0, false,</div><div class='add'>+					 true);</div><div class='add'>+</div><div class='add'>+	ceph_osdc_start_request(osdc, req, false);</div><div class='add'>+	ret = ceph_osdc_wait_request(osdc, req);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		ceph_copy_from_page_vector(pages, buf, 0, ret);</div><div class='ctx'> </div><div class='add'>+out_req:</div><div class='add'>+	ceph_osdc_put_request(req);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4346,8 +4197,8 @@ static int rbd_dev_v1_header_info(struct rbd_device *rbd_dev)</div><div class='ctx'> 		if (!ondisk)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		ret = rbd_obj_read_sync(rbd_dev, rbd_dev-&gt;header_oid.name,</div><div class='del'>-				       0, size, ondisk);</div><div class='add'>+		ret = rbd_obj_read_sync(rbd_dev, &amp;rbd_dev-&gt;header_oid,</div><div class='add'>+					&amp;rbd_dev-&gt;header_oloc, ondisk, size);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		if ((size_t)ret &lt; size) {</div><div class='hunk'>@@ -4524,7 +4375,7 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)</div><div class='ctx'> 	q-&gt;limits.discard_zeroes_data = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (!ceph_test_opt(rbd_dev-&gt;rbd_client-&gt;client, NOCRC))</div><div class='del'>-		q-&gt;backing_dev_info.capabilities |= BDI_CAP_STABLE_WRITES;</div><div class='add'>+		q-&gt;backing_dev_info-&gt;capabilities |= BDI_CAP_STABLE_WRITES;</div><div class='ctx'> </div><div class='ctx'> 	disk-&gt;queue = q;</div><div class='ctx'> </div><div class='hunk'>@@ -4779,7 +4630,7 @@ static const struct attribute_group *rbd_attr_groups[] = {</div><div class='ctx'> </div><div class='ctx'> static void rbd_dev_release(struct device *dev);</div><div class='ctx'> </div><div class='del'>-static struct device_type rbd_device_type = {</div><div class='add'>+static const struct device_type rbd_device_type = {</div><div class='ctx'> 	.name		= "rbd",</div><div class='ctx'> 	.groups		= rbd_attr_groups,</div><div class='ctx'> 	.release	= rbd_dev_release,</div><div class='hunk'>@@ -4874,8 +4725,9 @@ static struct rbd_device *__rbd_dev_create(struct rbd_client *rbdc,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rbd_dev-&gt;node);</div><div class='ctx'> 	init_rwsem(&amp;rbd_dev-&gt;header_rwsem);</div><div class='ctx'> </div><div class='add'>+	rbd_dev-&gt;header.data_pool_id = CEPH_NOPOOL;</div><div class='ctx'> 	ceph_oid_init(&amp;rbd_dev-&gt;header_oid);</div><div class='del'>-	ceph_oloc_init(&amp;rbd_dev-&gt;header_oloc);</div><div class='add'>+	rbd_dev-&gt;header_oloc.pool = spec-&gt;pool_id;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;rbd_dev-&gt;watch_mutex);</div><div class='ctx'> 	rbd_dev-&gt;watch_state = RBD_WATCH_STATE_UNREGISTERED;</div><div class='hunk'>@@ -4897,12 +4749,6 @@ static struct rbd_device *__rbd_dev_create(struct rbd_client *rbdc,</div><div class='ctx'> 	rbd_dev-&gt;rbd_client = rbdc;</div><div class='ctx'> 	rbd_dev-&gt;spec = spec;</div><div class='ctx'> </div><div class='del'>-	rbd_dev-&gt;layout.stripe_unit = 1 &lt;&lt; RBD_MAX_OBJ_ORDER;</div><div class='del'>-	rbd_dev-&gt;layout.stripe_count = 1;</div><div class='del'>-	rbd_dev-&gt;layout.object_size = 1 &lt;&lt; RBD_MAX_OBJ_ORDER;</div><div class='del'>-	rbd_dev-&gt;layout.pool_id = spec-&gt;pool_id;</div><div class='del'>-	RCU_INIT_POINTER(rbd_dev-&gt;layout.pool_ns, NULL);</div><div class='del'>-</div><div class='ctx'> 	return rbd_dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4968,10 +4814,10 @@ static int _rbd_dev_v2_snap_size(struct rbd_device *rbd_dev, u64 snap_id,</div><div class='ctx'> 		__le64 size;</div><div class='ctx'> 	} __attribute__ ((packed)) size_buf = { 0 };</div><div class='ctx'> </div><div class='del'>-	ret = rbd_obj_method_sync(rbd_dev, rbd_dev-&gt;header_oid.name,</div><div class='del'>-				"rbd", "get_size",</div><div class='del'>-				&amp;snapid, sizeof (snapid),</div><div class='del'>-				&amp;size_buf, sizeof (size_buf));</div><div class='add'>+	ret = rbd_obj_method_sync(rbd_dev, &amp;rbd_dev-&gt;header_oid,</div><div class='add'>+				  &amp;rbd_dev-&gt;header_oloc, "get_size",</div><div class='add'>+				  &amp;snapid, sizeof(snapid),</div><div class='add'>+				  &amp;size_buf, sizeof(size_buf));</div><div class='ctx'> 	dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -5008,9 +4854,9 @@ static int rbd_dev_v2_object_prefix(struct rbd_device *rbd_dev)</div><div class='ctx'> 	if (!reply_buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = rbd_obj_method_sync(rbd_dev, rbd_dev-&gt;header_oid.name,</div><div class='del'>-				"rbd", "get_object_prefix", NULL, 0,</div><div class='del'>-				reply_buf, RBD_OBJ_PREFIX_LEN_MAX);</div><div class='add'>+	ret = rbd_obj_method_sync(rbd_dev, &amp;rbd_dev-&gt;header_oid,</div><div class='add'>+				  &amp;rbd_dev-&gt;header_oloc, "get_object_prefix",</div><div class='add'>+				  NULL, 0, reply_buf, RBD_OBJ_PREFIX_LEN_MAX);</div><div class='ctx'> 	dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -5043,10 +4889,10 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,</div><div class='ctx'> 	u64 unsup;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = rbd_obj_method_sync(rbd_dev, rbd_dev-&gt;header_oid.name,</div><div class='del'>-				"rbd", "get_features",</div><div class='del'>-				&amp;snapid, sizeof (snapid),</div><div class='del'>-				&amp;features_buf, sizeof (features_buf));</div><div class='add'>+	ret = rbd_obj_method_sync(rbd_dev, &amp;rbd_dev-&gt;header_oid,</div><div class='add'>+				  &amp;rbd_dev-&gt;header_oloc, "get_features",</div><div class='add'>+				  &amp;snapid, sizeof(snapid),</div><div class='add'>+				  &amp;features_buf, sizeof(features_buf));</div><div class='ctx'> 	dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -5105,10 +4951,9 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snapid = cpu_to_le64(rbd_dev-&gt;spec-&gt;snap_id);</div><div class='del'>-	ret = rbd_obj_method_sync(rbd_dev, rbd_dev-&gt;header_oid.name,</div><div class='del'>-				"rbd", "get_parent",</div><div class='del'>-				&amp;snapid, sizeof (snapid),</div><div class='del'>-				reply_buf, size);</div><div class='add'>+	ret = rbd_obj_method_sync(rbd_dev, &amp;rbd_dev-&gt;header_oid,</div><div class='add'>+				  &amp;rbd_dev-&gt;header_oloc, "get_parent",</div><div class='add'>+				  &amp;snapid, sizeof(snapid), reply_buf, size);</div><div class='ctx'> 	dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_err;</div><div class='hunk'>@@ -5208,9 +5053,9 @@ static int rbd_dev_v2_striping_info(struct rbd_device *rbd_dev)</div><div class='ctx'> 	u64 stripe_count;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = rbd_obj_method_sync(rbd_dev, rbd_dev-&gt;header_oid.name,</div><div class='del'>-				"rbd", "get_stripe_unit_count", NULL, 0,</div><div class='del'>-				(char *)&amp;striping_info_buf, size);</div><div class='add'>+	ret = rbd_obj_method_sync(rbd_dev, &amp;rbd_dev-&gt;header_oid,</div><div class='add'>+				&amp;rbd_dev-&gt;header_oloc, "get_stripe_unit_count",</div><div class='add'>+				NULL, 0, &amp;striping_info_buf, size);</div><div class='ctx'> 	dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -5224,7 +5069,7 @@ static int rbd_dev_v2_striping_info(struct rbd_device *rbd_dev)</div><div class='ctx'> 	 * out, and only fail if the image has non-default values.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = -EINVAL;</div><div class='del'>-	obj_size = (u64)1 &lt;&lt; rbd_dev-&gt;header.obj_order;</div><div class='add'>+	obj_size = rbd_obj_bytes(&amp;rbd_dev-&gt;header);</div><div class='ctx'> 	p = &amp;striping_info_buf;</div><div class='ctx'> 	stripe_unit = ceph_decode_64(&amp;p);</div><div class='ctx'> 	if (stripe_unit != obj_size) {</div><div class='hunk'>@@ -5245,8 +5090,27 @@ static int rbd_dev_v2_striping_info(struct rbd_device *rbd_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rbd_dev_v2_data_pool(struct rbd_device *rbd_dev)</div><div class='add'>+{</div><div class='add'>+	__le64 data_pool_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rbd_obj_method_sync(rbd_dev, &amp;rbd_dev-&gt;header_oid,</div><div class='add'>+				  &amp;rbd_dev-&gt;header_oloc, "get_data_pool",</div><div class='add'>+				  NULL, 0, &amp;data_pool_id, sizeof(data_pool_id));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret &lt; sizeof(data_pool_id))</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+</div><div class='add'>+	rbd_dev-&gt;header.data_pool_id = le64_to_cpu(data_pool_id);</div><div class='add'>+	WARN_ON(rbd_dev-&gt;header.data_pool_id == CEPH_NOPOOL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static char *rbd_dev_image_name(struct rbd_device *rbd_dev)</div><div class='ctx'> {</div><div class='add'>+	CEPH_DEFINE_OID_ONSTACK(oid);</div><div class='ctx'> 	size_t image_id_size;</div><div class='ctx'> 	char *image_id;</div><div class='ctx'> 	void *p;</div><div class='hunk'>@@ -5274,10 +5138,10 @@ static char *rbd_dev_image_name(struct rbd_device *rbd_dev)</div><div class='ctx'> 	if (!reply_buf)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = rbd_obj_method_sync(rbd_dev, RBD_DIRECTORY,</div><div class='del'>-				"rbd", "dir_get_name",</div><div class='del'>-				image_id, image_id_size,</div><div class='del'>-				reply_buf, size);</div><div class='add'>+	ceph_oid_printf(&amp;oid, "%s", RBD_DIRECTORY);</div><div class='add'>+	ret = rbd_obj_method_sync(rbd_dev, &amp;oid, &amp;rbd_dev-&gt;header_oloc,</div><div class='add'>+				  "dir_get_name", image_id, image_id_size,</div><div class='add'>+				  reply_buf, size);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	p = reply_buf;</div><div class='hunk'>@@ -5456,9 +5320,9 @@ static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev)</div><div class='ctx'> 	if (!reply_buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = rbd_obj_method_sync(rbd_dev, rbd_dev-&gt;header_oid.name,</div><div class='del'>-				"rbd", "get_snapcontext", NULL, 0,</div><div class='del'>-				reply_buf, size);</div><div class='add'>+	ret = rbd_obj_method_sync(rbd_dev, &amp;rbd_dev-&gt;header_oid,</div><div class='add'>+				  &amp;rbd_dev-&gt;header_oloc, "get_snapcontext",</div><div class='add'>+				  NULL, 0, reply_buf, size);</div><div class='ctx'> 	dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -5521,10 +5385,9 @@ static const char *rbd_dev_v2_snap_name(struct rbd_device *rbd_dev,</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	snapid = cpu_to_le64(snap_id);</div><div class='del'>-	ret = rbd_obj_method_sync(rbd_dev, rbd_dev-&gt;header_oid.name,</div><div class='del'>-				"rbd", "get_snapshot_name",</div><div class='del'>-				&amp;snapid, sizeof (snapid),</div><div class='del'>-				reply_buf, size);</div><div class='add'>+	ret = rbd_obj_method_sync(rbd_dev, &amp;rbd_dev-&gt;header_oid,</div><div class='add'>+				  &amp;rbd_dev-&gt;header_oloc, "get_snapshot_name",</div><div class='add'>+				  &amp;snapid, sizeof(snapid), reply_buf, size);</div><div class='ctx'> 	dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		snap_name = ERR_PTR(ret);</div><div class='hunk'>@@ -5831,7 +5694,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	size_t size;</div><div class='del'>-	char *object_name;</div><div class='add'>+	CEPH_DEFINE_OID_ONSTACK(oid);</div><div class='ctx'> 	void *response;</div><div class='ctx'> 	char *image_id;</div><div class='ctx'> </div><div class='hunk'>@@ -5851,12 +5714,12 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)</div><div class='ctx'> 	 * First, see if the format 2 image id file exists, and if</div><div class='ctx'> 	 * so, get the image's persistent id from it.</div><div class='ctx'> 	 */</div><div class='del'>-	size = sizeof (RBD_ID_PREFIX) + strlen(rbd_dev-&gt;spec-&gt;image_name);</div><div class='del'>-	object_name = kmalloc(size, GFP_NOIO);</div><div class='del'>-	if (!object_name)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	sprintf(object_name, "%s%s", RBD_ID_PREFIX, rbd_dev-&gt;spec-&gt;image_name);</div><div class='del'>-	dout("rbd id object name is %s\n", object_name);</div><div class='add'>+	ret = ceph_oid_aprintf(&amp;oid, GFP_KERNEL, "%s%s", RBD_ID_PREFIX,</div><div class='add'>+			       rbd_dev-&gt;spec-&gt;image_name);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dout("rbd id object name is %s\n", oid.name);</div><div class='ctx'> </div><div class='ctx'> 	/* Response will be an encoded string, which includes a length */</div><div class='ctx'> </div><div class='hunk'>@@ -5869,9 +5732,9 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)</div><div class='ctx'> </div><div class='ctx'> 	/* If it doesn't exist we'll assume it's a format 1 image */</div><div class='ctx'> </div><div class='del'>-	ret = rbd_obj_method_sync(rbd_dev, object_name,</div><div class='del'>-				"rbd", "get_id", NULL, 0,</div><div class='del'>-				response, RBD_IMAGE_ID_LEN_MAX);</div><div class='add'>+	ret = rbd_obj_method_sync(rbd_dev, &amp;oid, &amp;rbd_dev-&gt;header_oloc,</div><div class='add'>+				  "get_id", NULL, 0,</div><div class='add'>+				  response, RBD_IMAGE_ID_LEN_MAX);</div><div class='ctx'> 	dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);</div><div class='ctx'> 	if (ret == -ENOENT) {</div><div class='ctx'> 		image_id = kstrdup("", GFP_KERNEL);</div><div class='hunk'>@@ -5894,8 +5757,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(response);</div><div class='del'>-	kfree(object_name);</div><div class='del'>-</div><div class='add'>+	ceph_oid_destroy(&amp;oid);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5942,14 +5804,20 @@ static int rbd_dev_v2_header_onetime(struct rbd_device *rbd_dev)</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 	}</div><div class='del'>-	/* No support for crypto and compression type format 2 images */</div><div class='ctx'> </div><div class='add'>+	if (rbd_dev-&gt;header.features &amp; RBD_FEATURE_DATA_POOL) {</div><div class='add'>+		ret = rbd_dev_v2_data_pool(rbd_dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rbd_init_layout(rbd_dev);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='ctx'> out_err:</div><div class='ctx'> 	rbd_dev-&gt;header.features = 0;</div><div class='ctx'> 	kfree(rbd_dev-&gt;header.object_prefix);</div><div class='ctx'> 	rbd_dev-&gt;header.object_prefix = NULL;</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6075,8 +5943,6 @@ static int rbd_dev_header_name(struct rbd_device *rbd_dev)</div><div class='ctx'> 	/* Record the header object name for this rbd image. */</div><div class='ctx'> </div><div class='ctx'> 	rbd_assert(rbd_image_format_valid(rbd_dev-&gt;image_format));</div><div class='del'>-</div><div class='del'>-	rbd_dev-&gt;header_oloc.pool = rbd_dev-&gt;layout.pool_id;</div><div class='ctx'> 	if (rbd_dev-&gt;image_format == 1)</div><div class='ctx'> 		ret = ceph_oid_aprintf(&amp;rbd_dev-&gt;header_oid, GFP_KERNEL, "%s%s",</div><div class='ctx'> 				       spec-&gt;image_name, RBD_SUFFIX);</div><div class='hunk'>@@ -6469,27 +6335,16 @@ static int rbd_slab_init(void)</div><div class='ctx'> 	if (!rbd_obj_request_cache)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='del'>-	rbd_assert(!rbd_segment_name_cache);</div><div class='del'>-	rbd_segment_name_cache = kmem_cache_create("rbd_segment_name",</div><div class='del'>-					CEPH_MAX_OID_NAME_LEN + 1, 1, 0, NULL);</div><div class='del'>-	if (rbd_segment_name_cache)</div><div class='del'>-		return 0;</div><div class='del'>-out_err:</div><div class='del'>-	kmem_cache_destroy(rbd_obj_request_cache);</div><div class='del'>-	rbd_obj_request_cache = NULL;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+out_err:</div><div class='ctx'> 	kmem_cache_destroy(rbd_img_request_cache);</div><div class='ctx'> 	rbd_img_request_cache = NULL;</div><div class='del'>-</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rbd_slab_exit(void)</div><div class='ctx'> {</div><div class='del'>-	rbd_assert(rbd_segment_name_cache);</div><div class='del'>-	kmem_cache_destroy(rbd_segment_name_cache);</div><div class='del'>-	rbd_segment_name_cache = NULL;</div><div class='del'>-</div><div class='ctx'> 	rbd_assert(rbd_obj_request_cache);</div><div class='ctx'> 	kmem_cache_destroy(rbd_obj_request_cache);</div><div class='ctx'> 	rbd_obj_request_cache = NULL;</div><div class='head'>diff --git a/drivers/block/rbd_types.h b/drivers/block/rbd_types.h<br/>index 94f367db27b0..62ff50d3e7a6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/rbd_types.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/rbd_types.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/rbd_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/rbd_types.h</a></div><div class='hunk'>@@ -25,8 +25,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define RBD_HEADER_PREFIX      "rbd_header."</div><div class='del'>-#define RBD_DATA_PREFIX        "rbd_data."</div><div class='ctx'> #define RBD_ID_PREFIX          "rbd_id."</div><div class='add'>+#define RBD_V2_DATA_FORMAT     "%s.%016llx"</div><div class='ctx'> </div><div class='ctx'> #define RBD_LOCK_NAME          "rbd_lock"</div><div class='ctx'> #define RBD_LOCK_TAG           "internal"</div><div class='hunk'>@@ -42,13 +42,14 @@ enum rbd_notify_op {</div><div class='ctx'> /*</div><div class='ctx'>  * For format version 1, rbd image 'foo' consists of objects</div><div class='ctx'>  *   foo.rbd		- image metadata</div><div class='del'>- *   rb.&lt;idhi&gt;.&lt;idlo&gt;.00000000</div><div class='del'>- *   rb.&lt;idhi&gt;.&lt;idlo&gt;.00000001</div><div class='add'>+ *   rb.&lt;idhi&gt;.&lt;idlo&gt;.&lt;extra&gt;.000000000000</div><div class='add'>+ *   rb.&lt;idhi&gt;.&lt;idlo&gt;.&lt;extra&gt;.000000000001</div><div class='ctx'>  *   ...		- data</div><div class='ctx'>  * There is no notion of a persistent image id in rbd format 1.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define RBD_SUFFIX		".rbd"</div><div class='add'>+#define RBD_V1_DATA_FORMAT	"%s.%012llx"</div><div class='ctx'> </div><div class='ctx'> #define RBD_DIRECTORY           "rbd_directory"</div><div class='ctx'> #define RBD_INFO                "rbd_info"</div><div class='hunk'>@@ -57,9 +58,6 @@ enum rbd_notify_op {</div><div class='ctx'> #define RBD_MIN_OBJ_ORDER       16</div><div class='ctx'> #define RBD_MAX_OBJ_ORDER       30</div><div class='ctx'> </div><div class='del'>-#define RBD_COMP_NONE		0</div><div class='del'>-#define RBD_CRYPT_NONE		0</div><div class='del'>-</div><div class='ctx'> #define RBD_HEADER_TEXT		"&lt;&lt;&lt; Rados Block Device Image &gt;&gt;&gt;\n"</div><div class='ctx'> #define RBD_HEADER_SIGNATURE	"RBD"</div><div class='ctx'> #define RBD_HEADER_VERSION	"001.005"</div><div class='head'>diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c<br/>index 3822eae102db..27833e4dae2a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/skd_main.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/skd_main.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/skd_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/skd_main.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/aer.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='hunk'>@@ -270,8 +269,6 @@ struct skd_device {</div><div class='ctx'> 	resource_size_t mem_phys[SKD_MAX_BARS];</div><div class='ctx'> 	u32 mem_size[SKD_MAX_BARS];</div><div class='ctx'> </div><div class='del'>-	skd_irq_type_t irq_type;</div><div class='del'>-	u32 msix_count;</div><div class='ctx'> 	struct skd_msix_entry *msix_entries;</div><div class='ctx'> </div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='hunk'>@@ -1207,10 +1204,11 @@ static void skd_complete_special(struct skd_device *skdev,</div><div class='ctx'> static int skd_bdev_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> 			  uint cmd_in, ulong arg)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='add'>+	static const int sg_version_num = 30527;</div><div class='add'>+	int rc = 0, timeout;</div><div class='ctx'> 	struct gendisk *disk = bdev-&gt;bd_disk;</div><div class='ctx'> 	struct skd_device *skdev = disk-&gt;private_data;</div><div class='del'>-	void __user *p = (void *)arg;</div><div class='add'>+	int __user *p = (int __user *)arg;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s:%s:%d %s: CMD[%s] ioctl  mode 0x%x, cmd 0x%x arg %0lx\n",</div><div class='ctx'> 		 skdev-&gt;name, __func__, __LINE__,</div><div class='hunk'>@@ -1221,12 +1219,18 @@ static int skd_bdev_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd_in) {</div><div class='ctx'> 	case SG_SET_TIMEOUT:</div><div class='add'>+		rc = get_user(timeout, p);</div><div class='add'>+		if (!rc)</div><div class='add'>+			disk-&gt;queue-&gt;sg_timeout = clock_t_to_jiffies(timeout);</div><div class='add'>+		break;</div><div class='ctx'> 	case SG_GET_TIMEOUT:</div><div class='add'>+		rc = jiffies_to_clock_t(disk-&gt;queue-&gt;sg_timeout);</div><div class='add'>+		break;</div><div class='ctx'> 	case SG_GET_VERSION_NUM:</div><div class='del'>-		rc = scsi_cmd_ioctl(disk-&gt;queue, disk, mode, cmd_in, p);</div><div class='add'>+		rc = put_user(sg_version_num, p);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SG_IO:</div><div class='del'>-		rc = skd_ioctl_sg_io(skdev, mode, p);</div><div class='add'>+		rc = skd_ioctl_sg_io(skdev, mode, (void __user *)arg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -2138,12 +2142,8 @@ static void skd_send_fitmsg(struct skd_device *skdev,</div><div class='ctx'> 		u8 *bp = (u8 *)skmsg-&gt;msg_buf;</div><div class='ctx'> 		int i;</div><div class='ctx'> 		for (i = 0; i &lt; skmsg-&gt;length; i += 8) {</div><div class='del'>-			pr_debug("%s:%s:%d msg[%2d] %02x %02x %02x %02x "</div><div class='del'>-				 "%02x %02x %02x %02x\n",</div><div class='del'>-				 skdev-&gt;name, __func__, __LINE__,</div><div class='del'>-				 i, bp[i + 0], bp[i + 1], bp[i + 2],</div><div class='del'>-				 bp[i + 3], bp[i + 4], bp[i + 5],</div><div class='del'>-				 bp[i + 6], bp[i + 7]);</div><div class='add'>+			pr_debug("%s:%s:%d msg[%2d] %8ph\n",</div><div class='add'>+				 skdev-&gt;name, __func__, __LINE__, i, &amp;bp[i]);</div><div class='ctx'> 			if (i == 0)</div><div class='ctx'> 				i = 64 - 8;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2164,7 +2164,6 @@ static void skd_send_fitmsg(struct skd_device *skdev,</div><div class='ctx'> 		qcmd |= FIT_QCMD_MSGSIZE_64;</div><div class='ctx'> </div><div class='ctx'> 	SKD_WRITEQ(skdev, qcmd, FIT_Q_COMMAND);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void skd_send_special_fitmsg(struct skd_device *skdev,</div><div class='hunk'>@@ -2177,11 +2176,8 @@ static void skd_send_special_fitmsg(struct skd_device *skdev,</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; SKD_N_SPECIAL_FITMSG_BYTES; i += 8) {</div><div class='del'>-			pr_debug("%s:%s:%d  spcl[%2d] %02x %02x %02x %02x  "</div><div class='del'>-				 "%02x %02x %02x %02x\n",</div><div class='del'>-				 skdev-&gt;name, __func__, __LINE__, i,</div><div class='del'>-				 bp[i + 0], bp[i + 1], bp[i + 2], bp[i + 3],</div><div class='del'>-				 bp[i + 4], bp[i + 5], bp[i + 6], bp[i + 7]);</div><div class='add'>+			pr_debug("%s:%s:%d  spcl[%2d] %8ph\n",</div><div class='add'>+				 skdev-&gt;name, __func__, __LINE__, i, &amp;bp[i]);</div><div class='ctx'> 			if (i == 0)</div><div class='ctx'> 				i = 64 - 8;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2955,8 +2951,8 @@ static void skd_completion_worker(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static void skd_isr_msg_from_dev(struct skd_device *skdev);</div><div class='ctx'> </div><div class='del'>-irqreturn_t</div><div class='del'>-static skd_isr(int irq, void *ptr)</div><div class='add'>+static irqreturn_t</div><div class='add'>+skd_isr(int irq, void *ptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct skd_device *skdev;</div><div class='ctx'> 	u32 intstat;</div><div class='hunk'>@@ -3821,10 +3817,6 @@ static irqreturn_t skd_qfull_isr(int irq, void *skd_host_data)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct skd_msix_entry {</div><div class='del'>-	int have_irq;</div><div class='del'>-	u32 vector;</div><div class='del'>-	u32 entry;</div><div class='del'>-	struct skd_device *rsp;</div><div class='ctx'> 	char isr_name[30];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3853,193 +3845,121 @@ static struct skd_init_msix_entry msix_entries[SKD_MAX_MSIX_COUNT] = {</div><div class='ctx'> 	{ "(Queue Full 3)", skd_qfull_isr    },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void skd_release_msix(struct skd_device *skdev)</div><div class='del'>-{</div><div class='del'>-	struct skd_msix_entry *qentry;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (skdev-&gt;msix_entries) {</div><div class='del'>-		for (i = 0; i &lt; skdev-&gt;msix_count; i++) {</div><div class='del'>-			qentry = &amp;skdev-&gt;msix_entries[i];</div><div class='del'>-			skdev = qentry-&gt;rsp;</div><div class='del'>-</div><div class='del'>-			if (qentry-&gt;have_irq)</div><div class='del'>-				devm_free_irq(&amp;skdev-&gt;pdev-&gt;dev,</div><div class='del'>-					      qentry-&gt;vector, qentry-&gt;rsp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		kfree(skdev-&gt;msix_entries);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (skdev-&gt;msix_count)</div><div class='del'>-		pci_disable_msix(skdev-&gt;pdev);</div><div class='del'>-</div><div class='del'>-	skdev-&gt;msix_count = 0;</div><div class='del'>-	skdev-&gt;msix_entries = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int skd_acquire_msix(struct skd_device *skdev)</div><div class='ctx'> {</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> 	struct pci_dev *pdev = skdev-&gt;pdev;</div><div class='del'>-	struct msix_entry *entries;</div><div class='del'>-	struct skd_msix_entry *qentry;</div><div class='del'>-</div><div class='del'>-	entries = kzalloc(sizeof(struct msix_entry) * SKD_MAX_MSIX_COUNT,</div><div class='del'>-			  GFP_KERNEL);</div><div class='del'>-	if (!entries)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SKD_MAX_MSIX_COUNT; i++)</div><div class='del'>-		entries[i].entry = i;</div><div class='del'>-</div><div class='del'>-	rc = pci_enable_msix_exact(pdev, entries, SKD_MAX_MSIX_COUNT);</div><div class='del'>-	if (rc) {</div><div class='add'>+	rc = pci_alloc_irq_vectors(pdev, SKD_MAX_MSIX_COUNT, SKD_MAX_MSIX_COUNT,</div><div class='add'>+			PCI_IRQ_MSIX);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='ctx'> 		pr_err("(%s): failed to enable MSI-X %d\n",</div><div class='ctx'> 		       skd_name(skdev), rc);</div><div class='del'>-		goto msix_out;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skdev-&gt;msix_count = SKD_MAX_MSIX_COUNT;</div><div class='del'>-	skdev-&gt;msix_entries = kzalloc(sizeof(struct skd_msix_entry) *</div><div class='del'>-				      skdev-&gt;msix_count, GFP_KERNEL);</div><div class='add'>+	skdev-&gt;msix_entries = kcalloc(SKD_MAX_MSIX_COUNT,</div><div class='add'>+			sizeof(struct skd_msix_entry), GFP_KERNEL);</div><div class='ctx'> 	if (!skdev-&gt;msix_entries) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		pr_err("(%s): msix table allocation error\n",</div><div class='ctx'> 		       skd_name(skdev));</div><div class='del'>-		goto msix_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; skdev-&gt;msix_count; i++) {</div><div class='del'>-		qentry = &amp;skdev-&gt;msix_entries[i];</div><div class='del'>-		qentry-&gt;vector = entries[i].vector;</div><div class='del'>-		qentry-&gt;entry = entries[i].entry;</div><div class='del'>-		qentry-&gt;rsp = NULL;</div><div class='del'>-		qentry-&gt;have_irq = 0;</div><div class='del'>-		pr_debug("%s:%s:%d %s: &lt;%s&gt; msix (%d) vec %d, entry %x\n",</div><div class='del'>-			 skdev-&gt;name, __func__, __LINE__,</div><div class='del'>-			 pci_name(pdev), skdev-&gt;name,</div><div class='del'>-			 i, qentry-&gt;vector, qentry-&gt;entry);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable MSI-X vectors for the base queue */</div><div class='del'>-	for (i = 0; i &lt; skdev-&gt;msix_count; i++) {</div><div class='del'>-		qentry = &amp;skdev-&gt;msix_entries[i];</div><div class='add'>+	for (i = 0; i &lt; SKD_MAX_MSIX_COUNT; i++) {</div><div class='add'>+		struct skd_msix_entry *qentry = &amp;skdev-&gt;msix_entries[i];</div><div class='add'>+</div><div class='ctx'> 		snprintf(qentry-&gt;isr_name, sizeof(qentry-&gt;isr_name),</div><div class='ctx'> 			 "%s%d-msix %s", DRV_NAME, skdev-&gt;devno,</div><div class='ctx'> 			 msix_entries[i].name);</div><div class='del'>-		rc = devm_request_irq(&amp;skdev-&gt;pdev-&gt;dev, qentry-&gt;vector,</div><div class='del'>-				      msix_entries[i].handler, 0,</div><div class='del'>-				      qentry-&gt;isr_name, skdev);</div><div class='add'>+</div><div class='add'>+		rc = devm_request_irq(&amp;skdev-&gt;pdev-&gt;dev,</div><div class='add'>+				pci_irq_vector(skdev-&gt;pdev, i),</div><div class='add'>+				msix_entries[i].handler, 0,</div><div class='add'>+				qentry-&gt;isr_name, skdev);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			pr_err("(%s): Unable to register(%d) MSI-X "</div><div class='ctx'> 			       "handler %d: %s\n",</div><div class='ctx'> 			       skd_name(skdev), rc, i, qentry-&gt;isr_name);</div><div class='ctx'> 			goto msix_out;</div><div class='del'>-		} else {</div><div class='del'>-			qentry-&gt;have_irq = 1;</div><div class='del'>-			qentry-&gt;rsp = skdev;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	pr_debug("%s:%s:%d %s: &lt;%s&gt; msix %d irq(s) enabled\n",</div><div class='ctx'> 		 skdev-&gt;name, __func__, __LINE__,</div><div class='del'>-		 pci_name(pdev), skdev-&gt;name, skdev-&gt;msix_count);</div><div class='add'>+		 pci_name(pdev), skdev-&gt;name, SKD_MAX_MSIX_COUNT);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> msix_out:</div><div class='del'>-	if (entries)</div><div class='del'>-		kfree(entries);</div><div class='del'>-	skd_release_msix(skdev);</div><div class='add'>+	while (--i &gt;= 0)</div><div class='add'>+		devm_free_irq(&amp;pdev-&gt;dev, pci_irq_vector(pdev, i), skdev);</div><div class='add'>+out:</div><div class='add'>+	kfree(skdev-&gt;msix_entries);</div><div class='add'>+	skdev-&gt;msix_entries = NULL;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int skd_acquire_irq(struct skd_device *skdev)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = skdev-&gt;pdev;</div><div class='add'>+	unsigned int irq_flag = PCI_IRQ_LEGACY;</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct pci_dev *pdev;</div><div class='del'>-</div><div class='del'>-	pdev = skdev-&gt;pdev;</div><div class='del'>-	skdev-&gt;msix_count = 0;</div><div class='ctx'> </div><div class='del'>-RETRY_IRQ_TYPE:</div><div class='del'>-	switch (skdev-&gt;irq_type) {</div><div class='del'>-	case SKD_IRQ_MSIX:</div><div class='add'>+	if (skd_isr_type == SKD_IRQ_MSIX) {</div><div class='ctx'> 		rc = skd_acquire_msix(skdev);</div><div class='ctx'> 		if (!rc)</div><div class='del'>-			pr_info("(%s): MSI-X %d irqs enabled\n",</div><div class='del'>-			       skd_name(skdev), skdev-&gt;msix_count);</div><div class='del'>-		else {</div><div class='del'>-			pr_err(</div><div class='del'>-			       "(%s): failed to enable MSI-X, re-trying with MSI %d\n",</div><div class='del'>-			       skd_name(skdev), rc);</div><div class='del'>-			skdev-&gt;irq_type = SKD_IRQ_MSI;</div><div class='del'>-			goto RETRY_IRQ_TYPE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case SKD_IRQ_MSI:</div><div class='del'>-		snprintf(skdev-&gt;isr_name, sizeof(skdev-&gt;isr_name), "%s%d-msi",</div><div class='del'>-			 DRV_NAME, skdev-&gt;devno);</div><div class='del'>-		rc = pci_enable_msi_range(pdev, 1, 1);</div><div class='del'>-		if (rc &gt; 0) {</div><div class='del'>-			rc = devm_request_irq(&amp;pdev-&gt;dev, pdev-&gt;irq, skd_isr, 0,</div><div class='del'>-					      skdev-&gt;isr_name, skdev);</div><div class='del'>-			if (rc) {</div><div class='del'>-				pci_disable_msi(pdev);</div><div class='del'>-				pr_err(</div><div class='del'>-				       "(%s): failed to allocate the MSI interrupt %d\n",</div><div class='del'>-				       skd_name(skdev), rc);</div><div class='del'>-				goto RETRY_IRQ_LEGACY;</div><div class='del'>-			}</div><div class='del'>-			pr_info("(%s): MSI irq %d enabled\n",</div><div class='del'>-			       skd_name(skdev), pdev-&gt;irq);</div><div class='del'>-		} else {</div><div class='del'>-RETRY_IRQ_LEGACY:</div><div class='del'>-			pr_err(</div><div class='del'>-			       "(%s): failed to enable MSI, re-trying with LEGACY %d\n",</div><div class='del'>-			       skd_name(skdev), rc);</div><div class='del'>-			skdev-&gt;irq_type = SKD_IRQ_LEGACY;</div><div class='del'>-			goto RETRY_IRQ_TYPE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case SKD_IRQ_LEGACY:</div><div class='del'>-		snprintf(skdev-&gt;isr_name, sizeof(skdev-&gt;isr_name),</div><div class='del'>-			 "%s%d-legacy", DRV_NAME, skdev-&gt;devno);</div><div class='del'>-		rc = devm_request_irq(&amp;pdev-&gt;dev, pdev-&gt;irq, skd_isr,</div><div class='del'>-				      IRQF_SHARED, skdev-&gt;isr_name, skdev);</div><div class='del'>-		if (!rc)</div><div class='del'>-			pr_info("(%s): LEGACY irq %d enabled\n",</div><div class='del'>-			       skd_name(skdev), pdev-&gt;irq);</div><div class='del'>-		else</div><div class='del'>-			pr_err("(%s): request LEGACY irq error %d\n",</div><div class='del'>-			       skd_name(skdev), rc);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_info("(%s): irq_type %d invalid, re-set to %d\n",</div><div class='del'>-		       skd_name(skdev), skdev-&gt;irq_type, SKD_IRQ_DEFAULT);</div><div class='del'>-		skdev-&gt;irq_type = SKD_IRQ_LEGACY;</div><div class='del'>-		goto RETRY_IRQ_TYPE;</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		pr_err("(%s): failed to enable MSI-X, re-trying with MSI %d\n",</div><div class='add'>+		       skd_name(skdev), rc);</div><div class='ctx'> 	}</div><div class='del'>-	return rc;</div><div class='add'>+</div><div class='add'>+	snprintf(skdev-&gt;isr_name, sizeof(skdev-&gt;isr_name), "%s%d", DRV_NAME,</div><div class='add'>+			skdev-&gt;devno);</div><div class='add'>+</div><div class='add'>+	if (skd_isr_type != SKD_IRQ_LEGACY)</div><div class='add'>+		irq_flag |= PCI_IRQ_MSI;</div><div class='add'>+	rc = pci_alloc_irq_vectors(pdev, 1, 1, irq_flag);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		pr_err("(%s): failed to allocate the MSI interrupt %d\n",</div><div class='add'>+			skd_name(skdev), rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = devm_request_irq(&amp;pdev-&gt;dev, pdev-&gt;irq, skd_isr,</div><div class='add'>+			pdev-&gt;msi_enabled ? 0 : IRQF_SHARED,</div><div class='add'>+			skdev-&gt;isr_name, skdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		pci_free_irq_vectors(pdev);</div><div class='add'>+		pr_err("(%s): failed to allocate interrupt %d\n",</div><div class='add'>+			skd_name(skdev), rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void skd_release_irq(struct skd_device *skdev)</div><div class='ctx'> {</div><div class='del'>-	switch (skdev-&gt;irq_type) {</div><div class='del'>-	case SKD_IRQ_MSIX:</div><div class='del'>-		skd_release_msix(skdev);</div><div class='del'>-		break;</div><div class='del'>-	case SKD_IRQ_MSI:</div><div class='del'>-		devm_free_irq(&amp;skdev-&gt;pdev-&gt;dev, skdev-&gt;pdev-&gt;irq, skdev);</div><div class='del'>-		pci_disable_msi(skdev-&gt;pdev);</div><div class='del'>-		break;</div><div class='del'>-	case SKD_IRQ_LEGACY:</div><div class='del'>-		devm_free_irq(&amp;skdev-&gt;pdev-&gt;dev, skdev-&gt;pdev-&gt;irq, skdev);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("(%s): wrong irq type %d!",</div><div class='del'>-		       skd_name(skdev), skdev-&gt;irq_type);</div><div class='del'>-		break;</div><div class='add'>+	struct pci_dev *pdev = skdev-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	if (skdev-&gt;msix_entries) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; SKD_MAX_MSIX_COUNT; i++) {</div><div class='add'>+			devm_free_irq(&amp;pdev-&gt;dev, pci_irq_vector(pdev, i),</div><div class='add'>+					skdev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(skdev-&gt;msix_entries);</div><div class='add'>+		skdev-&gt;msix_entries = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		devm_free_irq(&amp;pdev-&gt;dev, pdev-&gt;irq, skdev);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	pci_free_irq_vectors(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4402,7 +4322,6 @@ static struct skd_device *skd_construct(struct pci_dev *pdev)</div><div class='ctx'> 	skdev-&gt;pdev = pdev;</div><div class='ctx'> 	skdev-&gt;devno = skd_next_devno++;</div><div class='ctx'> 	skdev-&gt;major = blk_major;</div><div class='del'>-	skdev-&gt;irq_type = skd_isr_type;</div><div class='ctx'> 	sprintf(skdev-&gt;name, DRV_NAME "%d", skdev-&gt;devno);</div><div class='ctx'> 	skdev-&gt;dev_max_queue_depth = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c<br/>index cab157331c4e..3f3a3ab3d50a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/sunvdc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/sunvdc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/sunvdc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/sunvdc.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_MODULE_VERSION);</div><div class='ctx'> </div><div class='ctx'> #define VDC_TX_RING_SIZE	512</div><div class='add'>+#define VDC_DEFAULT_BLK_SIZE	512</div><div class='ctx'> </div><div class='ctx'> #define WAITING_FOR_LINK_UP	0x01</div><div class='ctx'> #define WAITING_FOR_TX_SPACE	0x02</div><div class='hunk'>@@ -73,6 +74,7 @@ struct vdc_port {</div><div class='ctx'> 	u32			vdisk_size;</div><div class='ctx'> 	u8			vdisk_type;</div><div class='ctx'> 	u8			vdisk_mtype;</div><div class='add'>+	u32			vdisk_phys_blksz;</div><div class='ctx'> </div><div class='ctx'> 	char			disk_name[32];</div><div class='ctx'> };</div><div class='hunk'>@@ -88,6 +90,7 @@ static inline struct vdc_port *to_vdc_port(struct vio_driver_state *vio)</div><div class='ctx'> </div><div class='ctx'> /* Ordered from largest major to lowest */</div><div class='ctx'> static struct vio_version vdc_versions[] = {</div><div class='add'>+	{ .major = 1, .minor = 2 },</div><div class='ctx'> 	{ .major = 1, .minor = 1 },</div><div class='ctx'> 	{ .major = 1, .minor = 0 },</div><div class='ctx'> };</div><div class='hunk'>@@ -271,6 +274,11 @@ static int vdc_handle_attr(struct vio_driver_state *vio, void *arg)</div><div class='ctx'> 		if (pkt-&gt;max_xfer_size &lt; port-&gt;max_xfer_size)</div><div class='ctx'> 			port-&gt;max_xfer_size = pkt-&gt;max_xfer_size;</div><div class='ctx'> 		port-&gt;vdisk_block_size = pkt-&gt;vdisk_block_size;</div><div class='add'>+</div><div class='add'>+		port-&gt;vdisk_phys_blksz = VDC_DEFAULT_BLK_SIZE;</div><div class='add'>+		if (vdc_version_supported(port, 1, 2))</div><div class='add'>+			port-&gt;vdisk_phys_blksz = pkt-&gt;phys_block_size;</div><div class='add'>+</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(KERN_ERR PFX "%s: Attribute NACK\n", vio-&gt;name);</div><div class='hunk'>@@ -754,6 +762,12 @@ static int probe_disk(struct vdc_port *port)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	/* Using version 1.2 means vdisk_phys_blksz should be set unless the</div><div class='add'>+	 * disk is reserved by another system.</div><div class='add'>+	 */</div><div class='add'>+	if (vdc_version_supported(port, 1, 2) &amp;&amp; !port-&gt;vdisk_phys_blksz)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	if (vdc_version_supported(port, 1, 1)) {</div><div class='ctx'> 		/* vdisk_size should be set during the handshake, if it wasn't</div><div class='ctx'> 		 * then the underlying disk is reserved by another system</div><div class='hunk'>@@ -829,6 +843,8 @@ static int probe_disk(struct vdc_port *port)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	blk_queue_physical_block_size(q, port-&gt;vdisk_phys_blksz);</div><div class='add'>+</div><div class='ctx'> 	pr_info(PFX "%s: %u sectors (%u MB) protocol %d.%d\n",</div><div class='ctx'> 	       g-&gt;disk_name,</div><div class='ctx'> 	       port-&gt;vdisk_size, (port-&gt;vdisk_size &gt;&gt; (20 - 9)),</div><div class='hunk'>@@ -910,7 +926,7 @@ static int vdc_port_probe(struct vio_dev *vdev, const struct vio_device_id *id)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out_free_port;</div><div class='ctx'> </div><div class='del'>-	port-&gt;vdisk_block_size = 512;</div><div class='add'>+	port-&gt;vdisk_block_size = VDC_DEFAULT_BLK_SIZE;</div><div class='ctx'> 	port-&gt;max_xfer_size = ((128 * 1024) / port-&gt;vdisk_block_size);</div><div class='ctx'> 	port-&gt;ring_cookies = ((port-&gt;max_xfer_size *</div><div class='ctx'> 			       port-&gt;vdisk_block_size) / PAGE_SIZE) + 2;</div><div class='head'>diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c<br/>index c264f2d284a7..61b3ffa4f458 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/swim3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/swim3.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/swim3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/swim3.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fd.h&gt;</div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dbdma.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mediabay.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/pmac_feature.h&gt;</div><div class='head'>diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c<br/>index ba4bfe933276..c8e072caf56f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/sx8.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/sx8.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/sx8.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/sx8.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> #define CARM_DEBUG</div><div class='hunk'>@@ -567,7 +567,7 @@ static struct carm_request *carm_get_special(struct carm_host *host)</div><div class='ctx'> 	if (!crq)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	rq = blk_get_request(host-&gt;oob_q, WRITE /* bogus */, GFP_KERNEL);</div><div class='add'>+	rq = blk_get_request(host-&gt;oob_q, REQ_OP_DRV_OUT, GFP_KERNEL);</div><div class='ctx'> 	if (IS_ERR(rq)) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;host-&gt;lock, flags);</div><div class='ctx'> 		carm_put_request(host, crq);</div><div class='hunk'>@@ -620,7 +620,6 @@ static int carm_array_info (struct carm_host *host, unsigned int array_idx)</div><div class='ctx'> 	spin_unlock_irq(&amp;host-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("blk_execute_rq_nowait, tag == %u\n", idx);</div><div class='del'>-	crq-&gt;rq-&gt;cmd_type = REQ_TYPE_DRV_PRIV;</div><div class='ctx'> 	crq-&gt;rq-&gt;special = crq;</div><div class='ctx'> 	blk_execute_rq_nowait(host-&gt;oob_q, NULL, crq-&gt;rq, true, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -661,7 +660,6 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func)</div><div class='ctx'> 	crq-&gt;msg_bucket = (u32) rc;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("blk_execute_rq_nowait, tag == %u\n", idx);</div><div class='del'>-	crq-&gt;rq-&gt;cmd_type = REQ_TYPE_DRV_PRIV;</div><div class='ctx'> 	crq-&gt;rq-&gt;special = crq;</div><div class='ctx'> 	blk_execute_rq_nowait(host-&gt;oob_q, NULL, crq-&gt;rq, true, NULL);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/umem.c b/drivers/block/umem.c<br/>index be90e15854ed..c141cc3be22b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/umem.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/umem.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/umem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/umem.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "umem.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MM_MAXCARDS 4</div><div class='hunk'>@@ -535,7 +535,7 @@ static blk_qc_t mm_make_request(struct request_queue *q, struct bio *bio)</div><div class='ctx'> 	*card-&gt;biotail = bio;</div><div class='ctx'> 	bio-&gt;bi_next = NULL;</div><div class='ctx'> 	card-&gt;biotail = &amp;bio-&gt;bi_next;</div><div class='del'>-	if (bio-&gt;bi_opf &amp; REQ_SYNC || !mm_check_plugged(card))</div><div class='add'>+	if (op_is_sync(bio-&gt;bi_opf) || !mm_check_plugged(card))</div><div class='ctx'> 		activate(card);</div><div class='ctx'> 	spin_unlock_irq(&amp;card-&gt;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c<br/>index 5545a679abd8..1d4c9f8bc1e1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/virtio_blk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/virtio_blk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/virtio_blk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/virtio_blk.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/virtio.h&gt;</div><div class='ctx'> #include &lt;linux/virtio_blk.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='hunk'>@@ -12,6 +13,7 @@</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/blk-mq.h&gt;</div><div class='add'>+#include &lt;linux/blk-mq-virtio.h&gt;</div><div class='ctx'> #include &lt;linux/numa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PART_BITS 4</div><div class='hunk'>@@ -52,9 +54,12 @@ struct virtio_blk {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct virtblk_req {</div><div class='del'>-	struct request *req;</div><div class='del'>-	struct virtio_blk_outhdr out_hdr;</div><div class='add'>+#ifdef CONFIG_VIRTIO_BLK_SCSI</div><div class='add'>+	struct scsi_request sreq;	/* for SCSI passthrough, must be first */</div><div class='add'>+	u8 sense[SCSI_SENSE_BUFFERSIZE];</div><div class='ctx'> 	struct virtio_scsi_inhdr in_hdr;</div><div class='add'>+#endif</div><div class='add'>+	struct virtio_blk_outhdr out_hdr;</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	struct scatterlist sg[];</div><div class='ctx'> };</div><div class='hunk'>@@ -71,28 +76,88 @@ static inline int virtblk_result(struct virtblk_req *vbr)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __virtblk_add_req(struct virtqueue *vq,</div><div class='del'>-			     struct virtblk_req *vbr,</div><div class='del'>-			     struct scatterlist *data_sg,</div><div class='del'>-			     bool have_data)</div><div class='add'>+/*</div><div class='add'>+ * If this is a packet command we need a couple of additional headers.  Behind</div><div class='add'>+ * the normal outhdr we put a segment with the scsi command block, and before</div><div class='add'>+ * the normal inhdr we put the sense data and the inhdr with additional status</div><div class='add'>+ * information.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_VIRTIO_BLK_SCSI</div><div class='add'>+static int virtblk_add_req_scsi(struct virtqueue *vq, struct virtblk_req *vbr,</div><div class='add'>+		struct scatterlist *data_sg, bool have_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct scatterlist hdr, status, cmd, sense, inhdr, *sgs[6];</div><div class='ctx'> 	unsigned int num_out = 0, num_in = 0;</div><div class='del'>-	__virtio32 type = vbr-&gt;out_hdr.type &amp; ~cpu_to_virtio32(vq-&gt;vdev, VIRTIO_BLK_T_OUT);</div><div class='ctx'> </div><div class='ctx'> 	sg_init_one(&amp;hdr, &amp;vbr-&gt;out_hdr, sizeof(vbr-&gt;out_hdr));</div><div class='ctx'> 	sgs[num_out++] = &amp;hdr;</div><div class='add'>+	sg_init_one(&amp;cmd, vbr-&gt;sreq.cmd, vbr-&gt;sreq.cmd_len);</div><div class='add'>+	sgs[num_out++] = &amp;cmd;</div><div class='add'>+</div><div class='add'>+	if (have_data) {</div><div class='add'>+		if (vbr-&gt;out_hdr.type &amp; cpu_to_virtio32(vq-&gt;vdev, VIRTIO_BLK_T_OUT))</div><div class='add'>+			sgs[num_out++] = data_sg;</div><div class='add'>+		else</div><div class='add'>+			sgs[num_out + num_in++] = data_sg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;sense, vbr-&gt;sense, SCSI_SENSE_BUFFERSIZE);</div><div class='add'>+	sgs[num_out + num_in++] = &amp;sense;</div><div class='add'>+	sg_init_one(&amp;inhdr, &amp;vbr-&gt;in_hdr, sizeof(vbr-&gt;in_hdr));</div><div class='add'>+	sgs[num_out + num_in++] = &amp;inhdr;</div><div class='add'>+	sg_init_one(&amp;status, &amp;vbr-&gt;status, sizeof(vbr-&gt;status));</div><div class='add'>+	sgs[num_out + num_in++] = &amp;status;</div><div class='add'>+</div><div class='add'>+	return virtqueue_add_sgs(vq, sgs, num_out, num_in, vbr, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void virtblk_scsi_reques_done(struct request *req)</div><div class='add'>+{</div><div class='add'>+	struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);</div><div class='add'>+	struct virtio_blk *vblk = req-&gt;q-&gt;queuedata;</div><div class='add'>+	struct scsi_request *sreq = &amp;vbr-&gt;sreq;</div><div class='add'>+</div><div class='add'>+	sreq-&gt;resid_len = virtio32_to_cpu(vblk-&gt;vdev, vbr-&gt;in_hdr.residual);</div><div class='add'>+	sreq-&gt;sense_len = virtio32_to_cpu(vblk-&gt;vdev, vbr-&gt;in_hdr.sense_len);</div><div class='add'>+	req-&gt;errors = virtio32_to_cpu(vblk-&gt;vdev, vbr-&gt;in_hdr.errors);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='add'>+			     unsigned int cmd, unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct gendisk *disk = bdev-&gt;bd_disk;</div><div class='add'>+	struct virtio_blk *vblk = disk-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If this is a packet command we need a couple of additional headers.</div><div class='del'>-	 * Behind the normal outhdr we put a segment with the scsi command</div><div class='del'>-	 * block, and before the normal inhdr we put the sense data and the</div><div class='del'>-	 * inhdr with additional status information.</div><div class='add'>+	 * Only allow the generic SCSI ioctls if the host can support it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (type == cpu_to_virtio32(vq-&gt;vdev, VIRTIO_BLK_T_SCSI_CMD)) {</div><div class='del'>-		sg_init_one(&amp;cmd, vbr-&gt;req-&gt;cmd, vbr-&gt;req-&gt;cmd_len);</div><div class='del'>-		sgs[num_out++] = &amp;cmd;</div><div class='del'>-	}</div><div class='add'>+	if (!virtio_has_feature(vblk-&gt;vdev, VIRTIO_BLK_F_SCSI))</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+</div><div class='add'>+	return scsi_cmd_blk_ioctl(bdev, mode, cmd,</div><div class='add'>+				  (void __user *)data);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int virtblk_add_req_scsi(struct virtqueue *vq,</div><div class='add'>+		struct virtblk_req *vbr, struct scatterlist *data_sg,</div><div class='add'>+		bool have_data)</div><div class='add'>+{</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+static inline void virtblk_scsi_reques_done(struct request *req)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#define virtblk_ioctl	NULL</div><div class='add'>+#endif /* CONFIG_VIRTIO_BLK_SCSI */</div><div class='add'>+</div><div class='add'>+static int virtblk_add_req(struct virtqueue *vq, struct virtblk_req *vbr,</div><div class='add'>+		struct scatterlist *data_sg, bool have_data)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist hdr, status, *sgs[3];</div><div class='add'>+	unsigned int num_out = 0, num_in = 0;</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;hdr, &amp;vbr-&gt;out_hdr, sizeof(vbr-&gt;out_hdr));</div><div class='add'>+	sgs[num_out++] = &amp;hdr;</div><div class='ctx'> </div><div class='ctx'> 	if (have_data) {</div><div class='ctx'> 		if (vbr-&gt;out_hdr.type &amp; cpu_to_virtio32(vq-&gt;vdev, VIRTIO_BLK_T_OUT))</div><div class='hunk'>@@ -101,13 +166,6 @@ static int __virtblk_add_req(struct virtqueue *vq,</div><div class='ctx'> 			sgs[num_out + num_in++] = data_sg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (type == cpu_to_virtio32(vq-&gt;vdev, VIRTIO_BLK_T_SCSI_CMD)) {</div><div class='del'>-		sg_init_one(&amp;sense, vbr-&gt;req-&gt;sense, SCSI_SENSE_BUFFERSIZE);</div><div class='del'>-		sgs[num_out + num_in++] = &amp;sense;</div><div class='del'>-		sg_init_one(&amp;inhdr, &amp;vbr-&gt;in_hdr, sizeof(vbr-&gt;in_hdr));</div><div class='del'>-		sgs[num_out + num_in++] = &amp;inhdr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	sg_init_one(&amp;status, &amp;vbr-&gt;status, sizeof(vbr-&gt;status));</div><div class='ctx'> 	sgs[num_out + num_in++] = &amp;status;</div><div class='ctx'> </div><div class='hunk'>@@ -117,15 +175,16 @@ static int __virtblk_add_req(struct virtqueue *vq,</div><div class='ctx'> static inline void virtblk_request_done(struct request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);</div><div class='del'>-	struct virtio_blk *vblk = req-&gt;q-&gt;queuedata;</div><div class='ctx'> 	int error = virtblk_result(vbr);</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;cmd_type == REQ_TYPE_BLOCK_PC) {</div><div class='del'>-		req-&gt;resid_len = virtio32_to_cpu(vblk-&gt;vdev, vbr-&gt;in_hdr.residual);</div><div class='del'>-		req-&gt;sense_len = virtio32_to_cpu(vblk-&gt;vdev, vbr-&gt;in_hdr.sense_len);</div><div class='del'>-		req-&gt;errors = virtio32_to_cpu(vblk-&gt;vdev, vbr-&gt;in_hdr.errors);</div><div class='del'>-	} else if (req-&gt;cmd_type == REQ_TYPE_DRV_PRIV) {</div><div class='add'>+	switch (req_op(req)) {</div><div class='add'>+	case REQ_OP_SCSI_IN:</div><div class='add'>+	case REQ_OP_SCSI_OUT:</div><div class='add'>+		virtblk_scsi_reques_done(req);</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_DRV_IN:</div><div class='ctx'> 		req-&gt;errors = (error != 0);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	blk_mq_end_request(req, error);</div><div class='hunk'>@@ -144,7 +203,9 @@ static void virtblk_done(struct virtqueue *vq)</div><div class='ctx'> 	do {</div><div class='ctx'> 		virtqueue_disable_cb(vq);</div><div class='ctx'> 		while ((vbr = virtqueue_get_buf(vblk-&gt;vqs[qid].vq, &amp;len)) != NULL) {</div><div class='del'>-			blk_mq_complete_request(vbr-&gt;req, vbr-&gt;req-&gt;errors);</div><div class='add'>+			struct request *req = blk_mq_rq_from_pdu(vbr);</div><div class='add'>+</div><div class='add'>+			blk_mq_complete_request(req, req-&gt;errors);</div><div class='ctx'> 			req_done = true;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (unlikely(virtqueue_is_broken(vq)))</div><div class='hunk'>@@ -168,49 +229,50 @@ static int virtio_queue_rq(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 	int qid = hctx-&gt;queue_num;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool notify = false;</div><div class='add'>+	u32 type;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(req-&gt;nr_phys_segments + 2 &gt; vblk-&gt;sg_elems);</div><div class='ctx'> </div><div class='del'>-	vbr-&gt;req = req;</div><div class='del'>-	if (req_op(req) == REQ_OP_FLUSH) {</div><div class='del'>-		vbr-&gt;out_hdr.type = cpu_to_virtio32(vblk-&gt;vdev, VIRTIO_BLK_T_FLUSH);</div><div class='del'>-		vbr-&gt;out_hdr.sector = 0;</div><div class='del'>-		vbr-&gt;out_hdr.ioprio = cpu_to_virtio32(vblk-&gt;vdev, req_get_ioprio(vbr-&gt;req));</div><div class='del'>-	} else {</div><div class='del'>-		switch (req-&gt;cmd_type) {</div><div class='del'>-		case REQ_TYPE_FS:</div><div class='del'>-			vbr-&gt;out_hdr.type = 0;</div><div class='del'>-			vbr-&gt;out_hdr.sector = cpu_to_virtio64(vblk-&gt;vdev, blk_rq_pos(vbr-&gt;req));</div><div class='del'>-			vbr-&gt;out_hdr.ioprio = cpu_to_virtio32(vblk-&gt;vdev, req_get_ioprio(vbr-&gt;req));</div><div class='del'>-			break;</div><div class='del'>-		case REQ_TYPE_BLOCK_PC:</div><div class='del'>-			vbr-&gt;out_hdr.type = cpu_to_virtio32(vblk-&gt;vdev, VIRTIO_BLK_T_SCSI_CMD);</div><div class='del'>-			vbr-&gt;out_hdr.sector = 0;</div><div class='del'>-			vbr-&gt;out_hdr.ioprio = cpu_to_virtio32(vblk-&gt;vdev, req_get_ioprio(vbr-&gt;req));</div><div class='del'>-			break;</div><div class='del'>-		case REQ_TYPE_DRV_PRIV:</div><div class='del'>-			vbr-&gt;out_hdr.type = cpu_to_virtio32(vblk-&gt;vdev, VIRTIO_BLK_T_GET_ID);</div><div class='del'>-			vbr-&gt;out_hdr.sector = 0;</div><div class='del'>-			vbr-&gt;out_hdr.ioprio = cpu_to_virtio32(vblk-&gt;vdev, req_get_ioprio(vbr-&gt;req));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			/* We don't put anything else in the queue. */</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='add'>+	switch (req_op(req)) {</div><div class='add'>+	case REQ_OP_READ:</div><div class='add'>+	case REQ_OP_WRITE:</div><div class='add'>+		type = 0;</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_FLUSH:</div><div class='add'>+		type = VIRTIO_BLK_T_FLUSH;</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_SCSI_IN:</div><div class='add'>+	case REQ_OP_SCSI_OUT:</div><div class='add'>+		type = VIRTIO_BLK_T_SCSI_CMD;</div><div class='add'>+		break;</div><div class='add'>+	case REQ_OP_DRV_IN:</div><div class='add'>+		type = VIRTIO_BLK_T_GET_ID;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return BLK_MQ_RQ_QUEUE_ERROR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	vbr-&gt;out_hdr.type = cpu_to_virtio32(vblk-&gt;vdev, type);</div><div class='add'>+	vbr-&gt;out_hdr.sector = type ?</div><div class='add'>+		0 : cpu_to_virtio64(vblk-&gt;vdev, blk_rq_pos(req));</div><div class='add'>+	vbr-&gt;out_hdr.ioprio = cpu_to_virtio32(vblk-&gt;vdev, req_get_ioprio(req));</div><div class='add'>+</div><div class='ctx'> 	blk_mq_start_request(req);</div><div class='ctx'> </div><div class='del'>-	num = blk_rq_map_sg(hctx-&gt;queue, vbr-&gt;req, vbr-&gt;sg);</div><div class='add'>+	num = blk_rq_map_sg(hctx-&gt;queue, req, vbr-&gt;sg);</div><div class='ctx'> 	if (num) {</div><div class='del'>-		if (rq_data_dir(vbr-&gt;req) == WRITE)</div><div class='add'>+		if (rq_data_dir(req) == WRITE)</div><div class='ctx'> 			vbr-&gt;out_hdr.type |= cpu_to_virtio32(vblk-&gt;vdev, VIRTIO_BLK_T_OUT);</div><div class='ctx'> 		else</div><div class='ctx'> 			vbr-&gt;out_hdr.type |= cpu_to_virtio32(vblk-&gt;vdev, VIRTIO_BLK_T_IN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;vblk-&gt;vqs[qid].lock, flags);</div><div class='del'>-	err = __virtblk_add_req(vblk-&gt;vqs[qid].vq, vbr, vbr-&gt;sg, num);</div><div class='add'>+	if (req_op(req) == REQ_OP_SCSI_IN || req_op(req) == REQ_OP_SCSI_OUT)</div><div class='add'>+		err = virtblk_add_req_scsi(vblk-&gt;vqs[qid].vq, vbr, vbr-&gt;sg, num);</div><div class='add'>+	else</div><div class='add'>+		err = virtblk_add_req(vblk-&gt;vqs[qid].vq, vbr, vbr-&gt;sg, num);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		virtqueue_kick(vblk-&gt;vqs[qid].vq);</div><div class='ctx'> 		blk_mq_stop_hw_queue(hctx);</div><div class='hunk'>@@ -240,10 +302,9 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str)</div><div class='ctx'> 	struct request *req;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	req = blk_get_request(q, READ, GFP_KERNEL);</div><div class='add'>+	req = blk_get_request(q, REQ_OP_DRV_IN, GFP_KERNEL);</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='del'>-	req-&gt;cmd_type = REQ_TYPE_DRV_PRIV;</div><div class='ctx'> </div><div class='ctx'> 	err = blk_rq_map_kern(q, req, id_str, VIRTIO_BLK_ID_BYTES, GFP_KERNEL);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -255,22 +316,6 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='del'>-			     unsigned int cmd, unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct gendisk *disk = bdev-&gt;bd_disk;</div><div class='del'>-	struct virtio_blk *vblk = disk-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Only allow the generic SCSI ioctls if the host can support it.</div><div class='del'>-	 */</div><div class='del'>-	if (!virtio_has_feature(vblk-&gt;vdev, VIRTIO_BLK_F_SCSI))</div><div class='del'>-		return -ENOTTY;</div><div class='del'>-</div><div class='del'>-	return scsi_cmd_blk_ioctl(bdev, mode, cmd,</div><div class='del'>-				  (void __user *)data);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* We provide getgeo only to please some old bootloader/partitioning tools */</div><div class='ctx'> static int virtblk_getgeo(struct block_device *bd, struct hd_geometry *geo)</div><div class='ctx'> {</div><div class='hunk'>@@ -383,6 +428,7 @@ static int init_vq(struct virtio_blk *vblk)</div><div class='ctx'> 	struct virtqueue **vqs;</div><div class='ctx'> 	unsigned short num_vqs;</div><div class='ctx'> 	struct virtio_device *vdev = vblk-&gt;vdev;</div><div class='add'>+	struct irq_affinity desc = { 0, };</div><div class='ctx'> </div><div class='ctx'> 	err = virtio_cread_feature(vdev, VIRTIO_BLK_F_MQ,</div><div class='ctx'> 				   struct virtio_blk_config, num_queues,</div><div class='hunk'>@@ -409,7 +455,8 @@ static int init_vq(struct virtio_blk *vblk)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Discover virtqueues and write information to configuration.  */</div><div class='del'>-	err = vdev-&gt;config-&gt;find_vqs(vdev, num_vqs, vqs, callbacks, names);</div><div class='add'>+	err = vdev-&gt;config-&gt;find_vqs(vdev, num_vqs, vqs, callbacks, names,</div><div class='add'>+			&amp;desc);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -536,14 +583,25 @@ static int virtblk_init_request(void *data, struct request *rq,</div><div class='ctx'> 	struct virtio_blk *vblk = data;</div><div class='ctx'> 	struct virtblk_req *vbr = blk_mq_rq_to_pdu(rq);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_VIRTIO_BLK_SCSI</div><div class='add'>+	vbr-&gt;sreq.sense = vbr-&gt;sense;</div><div class='add'>+#endif</div><div class='ctx'> 	sg_init_table(vbr-&gt;sg, vblk-&gt;sg_elems);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int virtblk_map_queues(struct blk_mq_tag_set *set)</div><div class='add'>+{</div><div class='add'>+	struct virtio_blk *vblk = set-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	return blk_mq_virtio_map_queues(set, vblk-&gt;vdev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct blk_mq_ops virtio_mq_ops = {</div><div class='ctx'> 	.queue_rq	= virtio_queue_rq,</div><div class='ctx'> 	.complete	= virtblk_request_done,</div><div class='ctx'> 	.init_request	= virtblk_init_request,</div><div class='add'>+	.map_queues	= virtblk_map_queues,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static unsigned int virtblk_queue_depth;</div><div class='hunk'>@@ -628,11 +686,12 @@ static int virtblk_probe(struct virtio_device *vdev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_put_disk;</div><div class='ctx'> </div><div class='del'>-	q = vblk-&gt;disk-&gt;queue = blk_mq_init_queue(&amp;vblk-&gt;tag_set);</div><div class='add'>+	q = blk_mq_init_queue(&amp;vblk-&gt;tag_set);</div><div class='ctx'> 	if (IS_ERR(q)) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out_free_tags;</div><div class='ctx'> 	}</div><div class='add'>+	vblk-&gt;disk-&gt;queue = q;</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;queuedata = vblk;</div><div class='ctx'> </div><div class='hunk'>@@ -767,7 +826,7 @@ static void virtblk_remove(struct virtio_device *vdev)</div><div class='ctx'> 	/* Stop all the virtqueues. */</div><div class='ctx'> 	vdev-&gt;config-&gt;reset(vdev);</div><div class='ctx'> </div><div class='del'>-	refc = atomic_read(&amp;disk_to_dev(vblk-&gt;disk)-&gt;kobj.kref.refcount);</div><div class='add'>+	refc = kref_read(&amp;disk_to_dev(vblk-&gt;disk)-&gt;kobj.kref);</div><div class='ctx'> 	put_disk(vblk-&gt;disk);</div><div class='ctx'> 	vdev-&gt;config-&gt;del_vqs(vdev);</div><div class='ctx'> 	kfree(vblk-&gt;vqs);</div><div class='hunk'>@@ -818,7 +877,10 @@ static const struct virtio_device_id id_table[] = {</div><div class='ctx'> </div><div class='ctx'> static unsigned int features_legacy[] = {</div><div class='ctx'> 	VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX, VIRTIO_BLK_F_GEOMETRY,</div><div class='del'>-	VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE, VIRTIO_BLK_F_SCSI,</div><div class='add'>+	VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE,</div><div class='add'>+#ifdef CONFIG_VIRTIO_BLK_SCSI</div><div class='add'>+	VIRTIO_BLK_F_SCSI,</div><div class='add'>+#endif</div><div class='ctx'> 	VIRTIO_BLK_F_FLUSH, VIRTIO_BLK_F_TOPOLOGY, VIRTIO_BLK_F_CONFIG_WCE,</div><div class='ctx'> 	VIRTIO_BLK_F_MQ,</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c<br/>index 4a80ee752597..726c32e35db9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/xen-blkback/blkback.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/xen-blkback/blkback.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/xen-blkback/blkback.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/xen-blkback/blkback.c</a></div><div class='hunk'>@@ -1253,14 +1253,14 @@ static int dispatch_rw_block_io(struct xen_blkif_ring *ring,</div><div class='ctx'> 	case BLKIF_OP_WRITE:</div><div class='ctx'> 		ring-&gt;st_wr_req++;</div><div class='ctx'> 		operation = REQ_OP_WRITE;</div><div class='del'>-		operation_flags = WRITE_ODIRECT;</div><div class='add'>+		operation_flags = REQ_SYNC | REQ_IDLE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BLKIF_OP_WRITE_BARRIER:</div><div class='ctx'> 		drain = true;</div><div class='ctx'> 	case BLKIF_OP_FLUSH_DISKCACHE:</div><div class='ctx'> 		ring-&gt;st_f_req++;</div><div class='ctx'> 		operation = REQ_OP_WRITE;</div><div class='del'>-		operation_flags = WRITE_FLUSH;</div><div class='add'>+		operation_flags = REQ_PREFLUSH;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		operation = 0; /* make gcc happy */</div><div class='hunk'>@@ -1272,7 +1272,7 @@ static int dispatch_rw_block_io(struct xen_blkif_ring *ring,</div><div class='ctx'> 	nseg = req-&gt;operation == BLKIF_OP_INDIRECT ?</div><div class='ctx'> 	       req-&gt;u.indirect.nr_segments : req-&gt;u.rw.nr_segments;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(nseg == 0 &amp;&amp; operation_flags != WRITE_FLUSH) ||</div><div class='add'>+	if (unlikely(nseg == 0 &amp;&amp; operation_flags != REQ_PREFLUSH) ||</div><div class='ctx'> 	    unlikely((req-&gt;operation != BLKIF_OP_INDIRECT) &amp;&amp;</div><div class='ctx'> 		     (nseg &gt; BLKIF_MAX_SEGMENTS_PER_REQUEST)) ||</div><div class='ctx'> 	    unlikely((req-&gt;operation == BLKIF_OP_INDIRECT) &amp;&amp;</div><div class='hunk'>@@ -1334,7 +1334,7 @@ static int dispatch_rw_block_io(struct xen_blkif_ring *ring,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Wait on all outstanding I/O's and once that has been completed</div><div class='del'>-	 * issue the WRITE_FLUSH.</div><div class='add'>+	 * issue the flush.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (drain)</div><div class='ctx'> 		xen_blk_drain_io(pending_req-&gt;ring);</div><div class='hunk'>@@ -1380,7 +1380,7 @@ static int dispatch_rw_block_io(struct xen_blkif_ring *ring,</div><div class='ctx'> </div><div class='ctx'> 	/* This will be hit if the operation was a flush or discard. */</div><div class='ctx'> 	if (!bio) {</div><div class='del'>-		BUG_ON(operation_flags != WRITE_FLUSH);</div><div class='add'>+		BUG_ON(operation_flags != REQ_PREFLUSH);</div><div class='ctx'> </div><div class='ctx'> 		bio = bio_alloc(GFP_KERNEL, 0);</div><div class='ctx'> 		if (unlikely(bio == NULL))</div><div class='head'>diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c<br/>index 3cc6d1d86f1e..8fe61b5dc5a6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/xen-blkback/xenbus.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/xen-blkback/xenbus.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/xen-blkback/xenbus.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/xen-blkback/xenbus.c</a></div><div class='hunk'>@@ -38,8 +38,8 @@ struct backend_info {</div><div class='ctx'> static struct kmem_cache *xen_blkif_cachep;</div><div class='ctx'> static void connect(struct backend_info *);</div><div class='ctx'> static int connect_ring(struct backend_info *);</div><div class='del'>-static void backend_changed(struct xenbus_watch *, const char **,</div><div class='del'>-			    unsigned int);</div><div class='add'>+static void backend_changed(struct xenbus_watch *, const char *,</div><div class='add'>+			    const char *);</div><div class='ctx'> static void xen_blkif_free(struct xen_blkif *blkif);</div><div class='ctx'> static void xen_vbd_free(struct xen_vbd *vbd);</div><div class='ctx'> </div><div class='hunk'>@@ -533,13 +533,11 @@ static void xen_blkbk_discard(struct xenbus_transaction xbt, struct backend_info</div><div class='ctx'> 	struct xenbus_device *dev = be-&gt;dev;</div><div class='ctx'> 	struct xen_blkif *blkif = be-&gt;blkif;</div><div class='ctx'> 	int err;</div><div class='del'>-	int state = 0, discard_enable;</div><div class='add'>+	int state = 0;</div><div class='ctx'> 	struct block_device *bdev = be-&gt;blkif-&gt;vbd.bdev;</div><div class='ctx'> 	struct request_queue *q = bdev_get_queue(bdev);</div><div class='ctx'> </div><div class='del'>-	err = xenbus_scanf(XBT_NIL, dev-&gt;nodename, "discard-enable", "%d",</div><div class='del'>-			   &amp;discard_enable);</div><div class='del'>-	if (err == 1 &amp;&amp; !discard_enable)</div><div class='add'>+	if (!xenbus_read_unsigned(dev-&gt;nodename, "discard-enable", 1))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (blk_queue_discard(q)) {</div><div class='hunk'>@@ -663,7 +661,7 @@ fail:</div><div class='ctx'>  * ready, connect.</div><div class='ctx'>  */</div><div class='ctx'> static void backend_changed(struct xenbus_watch *watch,</div><div class='del'>-			    const char **vec, unsigned int len)</div><div class='add'>+			    const char *path, const char *token)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned major;</div><div class='hunk'>@@ -1039,30 +1037,24 @@ static int connect_ring(struct backend_info *be)</div><div class='ctx'> 		xenbus_dev_fatal(dev, err, "unknown fe protocol %s", protocol);</div><div class='ctx'> 		return -ENOSYS;</div><div class='ctx'> 	}</div><div class='del'>-	err = xenbus_scanf(XBT_NIL, dev-&gt;otherend,</div><div class='del'>-			   "feature-persistent", "%u", &amp;pers_grants);</div><div class='del'>-	if (err &lt;= 0)</div><div class='del'>-		pers_grants = 0;</div><div class='del'>-</div><div class='add'>+	pers_grants = xenbus_read_unsigned(dev-&gt;otherend, "feature-persistent",</div><div class='add'>+					   0);</div><div class='ctx'> 	be-&gt;blkif-&gt;vbd.feature_gnt_persistent = pers_grants;</div><div class='ctx'> 	be-&gt;blkif-&gt;vbd.overflow_max_grants = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Read the number of hardware queues from frontend.</div><div class='ctx'> 	 */</div><div class='del'>-	err = xenbus_scanf(XBT_NIL, dev-&gt;otherend, "multi-queue-num-queues",</div><div class='del'>-			   "%u", &amp;requested_num_queues);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		requested_num_queues = 1;</div><div class='del'>-	} else {</div><div class='del'>-		if (requested_num_queues &gt; xenblk_max_queues</div><div class='del'>-		    || requested_num_queues == 0) {</div><div class='del'>-			/* Buggy or malicious guest. */</div><div class='del'>-			xenbus_dev_fatal(dev, err,</div><div class='del'>-					"guest requested %u queues, exceeding the maximum of %u.",</div><div class='del'>-					requested_num_queues, xenblk_max_queues);</div><div class='del'>-			return -ENOSYS;</div><div class='del'>-		}</div><div class='add'>+	requested_num_queues = xenbus_read_unsigned(dev-&gt;otherend,</div><div class='add'>+						    "multi-queue-num-queues",</div><div class='add'>+						    1);</div><div class='add'>+	if (requested_num_queues &gt; xenblk_max_queues</div><div class='add'>+	    || requested_num_queues == 0) {</div><div class='add'>+		/* Buggy or malicious guest. */</div><div class='add'>+		xenbus_dev_fatal(dev, err,</div><div class='add'>+				"guest requested %u queues, exceeding the maximum of %u.",</div><div class='add'>+				requested_num_queues, xenblk_max_queues);</div><div class='add'>+		return -ENOSYS;</div><div class='ctx'> 	}</div><div class='ctx'> 	be-&gt;blkif-&gt;nr_rings = requested_num_queues;</div><div class='ctx'> 	if (xen_blkif_alloc_rings(be-&gt;blkif))</div><div class='head'>diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c<br/>index 9908597c5209..5067a0a952cb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/xen-blkfront.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/xen-blkfront.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/xen-blkfront.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/xen-blkfront.c</a></div><div class='hunk'>@@ -197,13 +197,13 @@ struct blkfront_info</div><div class='ctx'> 	/* Number of pages per ring buffer. */</div><div class='ctx'> 	unsigned int nr_ring_pages;</div><div class='ctx'> 	struct request_queue *rq;</div><div class='del'>-	unsigned int feature_flush;</div><div class='del'>-	unsigned int feature_fua;</div><div class='add'>+	unsigned int feature_flush:1;</div><div class='add'>+	unsigned int feature_fua:1;</div><div class='ctx'> 	unsigned int feature_discard:1;</div><div class='ctx'> 	unsigned int feature_secdiscard:1;</div><div class='add'>+	unsigned int feature_persistent:1;</div><div class='ctx'> 	unsigned int discard_granularity;</div><div class='ctx'> 	unsigned int discard_alignment;</div><div class='del'>-	unsigned int feature_persistent:1;</div><div class='ctx'> 	/* Number of 4KB segments handled */</div><div class='ctx'> 	unsigned int max_indirect_segments;</div><div class='ctx'> 	int is_ready;</div><div class='hunk'>@@ -865,7 +865,7 @@ static inline void flush_requests(struct blkfront_ring_info *rinfo)</div><div class='ctx'> static inline bool blkif_request_flush_invalid(struct request *req,</div><div class='ctx'> 					       struct blkfront_info *info)</div><div class='ctx'> {</div><div class='del'>-	return ((req-&gt;cmd_type != REQ_TYPE_FS) ||</div><div class='add'>+	return (blk_rq_is_passthrough(req) ||</div><div class='ctx'> 		((req_op(req) == REQ_OP_FLUSH) &amp;&amp;</div><div class='ctx'> 		 !info-&gt;feature_flush) ||</div><div class='ctx'> 		((req-&gt;cmd_flags &amp; REQ_FUA) &amp;&amp;</div><div class='hunk'>@@ -1758,17 +1758,13 @@ static int talk_to_blkback(struct xenbus_device *dev,</div><div class='ctx'> 	const char *message = NULL;</div><div class='ctx'> 	struct xenbus_transaction xbt;</div><div class='ctx'> 	int err;</div><div class='del'>-	unsigned int i, max_page_order = 0;</div><div class='del'>-	unsigned int ring_page_order = 0;</div><div class='add'>+	unsigned int i, max_page_order;</div><div class='add'>+	unsigned int ring_page_order;</div><div class='ctx'> </div><div class='del'>-	err = xenbus_scanf(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='del'>-			   "max-ring-page-order", "%u", &amp;max_page_order);</div><div class='del'>-	if (err != 1)</div><div class='del'>-		info-&gt;nr_ring_pages = 1;</div><div class='del'>-	else {</div><div class='del'>-		ring_page_order = min(xen_blkif_max_ring_order, max_page_order);</div><div class='del'>-		info-&gt;nr_ring_pages = 1 &lt;&lt; ring_page_order;</div><div class='del'>-	}</div><div class='add'>+	max_page_order = xenbus_read_unsigned(info-&gt;xbdev-&gt;otherend,</div><div class='add'>+					      "max-ring-page-order", 0);</div><div class='add'>+	ring_page_order = min(xen_blkif_max_ring_order, max_page_order);</div><div class='add'>+	info-&gt;nr_ring_pages = 1 &lt;&lt; ring_page_order;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; info-&gt;nr_rings; i++) {</div><div class='ctx'> 		struct blkfront_ring_info *rinfo = &amp;info-&gt;rinfo[i];</div><div class='hunk'>@@ -1877,18 +1873,14 @@ again:</div><div class='ctx'> </div><div class='ctx'> static int negotiate_mq(struct blkfront_info *info)</div><div class='ctx'> {</div><div class='del'>-	unsigned int backend_max_queues = 0;</div><div class='del'>-	int err;</div><div class='add'>+	unsigned int backend_max_queues;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(info-&gt;nr_rings);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if backend supports multiple queues. */</div><div class='del'>-	err = xenbus_scanf(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='del'>-			   "multi-queue-max-queues", "%u", &amp;backend_max_queues);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		backend_max_queues = 1;</div><div class='del'>-</div><div class='add'>+	backend_max_queues = xenbus_read_unsigned(info-&gt;xbdev-&gt;otherend,</div><div class='add'>+						  "multi-queue-max-queues", 1);</div><div class='ctx'> 	info-&gt;nr_rings = min(backend_max_queues, xen_blkif_max_queues);</div><div class='ctx'> 	/* We need at least one ring. */</div><div class='ctx'> 	if (!info-&gt;nr_rings)</div><div class='hunk'>@@ -2043,8 +2035,9 @@ static int blkif_recover(struct blkfront_info *info)</div><div class='ctx'> 		/* Requeue pending requests (flush or discard) */</div><div class='ctx'> 		list_del_init(&amp;req-&gt;queuelist);</div><div class='ctx'> 		BUG_ON(req-&gt;nr_phys_segments &gt; segs);</div><div class='del'>-		blk_mq_requeue_request(req);</div><div class='add'>+		blk_mq_requeue_request(req, false);</div><div class='ctx'> 	}</div><div class='add'>+	blk_mq_start_stopped_hw_queues(info-&gt;rq, true);</div><div class='ctx'> 	blk_mq_kick_requeue_list(info-&gt;rq);</div><div class='ctx'> </div><div class='ctx'> 	while ((bio = bio_list_pop(&amp;info-&gt;bio_list)) != NULL) {</div><div class='hunk'>@@ -2195,7 +2188,6 @@ static void blkfront_setup_discard(struct blkfront_info *info)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int discard_granularity;</div><div class='ctx'> 	unsigned int discard_alignment;</div><div class='del'>-	unsigned int discard_secure;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;feature_discard = 1;</div><div class='ctx'> 	err = xenbus_gather(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='hunk'>@@ -2206,10 +2198,9 @@ static void blkfront_setup_discard(struct blkfront_info *info)</div><div class='ctx'> 		info-&gt;discard_granularity = discard_granularity;</div><div class='ctx'> 		info-&gt;discard_alignment = discard_alignment;</div><div class='ctx'> 	}</div><div class='del'>-	err = xenbus_scanf(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='del'>-			   "discard-secure", "%u", &amp;discard_secure);</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		info-&gt;feature_secdiscard = !!discard_secure;</div><div class='add'>+	info-&gt;feature_secdiscard =</div><div class='add'>+		!!xenbus_read_unsigned(info-&gt;xbdev-&gt;otherend, "discard-secure",</div><div class='add'>+				       0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)</div><div class='hunk'>@@ -2232,7 +2223,7 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='ctx'> 		grants = info-&gt;max_indirect_segments;</div><div class='del'>-	psegs = grants / GRANTS_PER_PSEG;</div><div class='add'>+	psegs = DIV_ROUND_UP(grants, GRANTS_PER_PSEG);</div><div class='ctx'> </div><div class='ctx'> 	err = fill_grant_buffer(rinfo,</div><div class='ctx'> 				(grants + INDIRECT_GREFS(grants)) * BLK_RING_SIZE(info));</div><div class='hunk'>@@ -2301,16 +2292,11 @@ out_of_memory:</div><div class='ctx'>  */</div><div class='ctx'> static void blkfront_gather_backend_features(struct blkfront_info *info)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	int barrier, flush, discard, persistent;</div><div class='ctx'> 	unsigned int indirect_segments;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;feature_flush = 0;</div><div class='ctx'> 	info-&gt;feature_fua = 0;</div><div class='ctx'> </div><div class='del'>-	err = xenbus_scanf(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='del'>-			   "feature-barrier", "%d", &amp;barrier);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If there's no "feature-barrier" defined, then it means</div><div class='ctx'> 	 * we're dealing with a very old backend which writes</div><div class='hunk'>@@ -2318,7 +2304,7 @@ static void blkfront_gather_backend_features(struct blkfront_info *info)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * If there are barriers, then we use flush.</div><div class='ctx'> 	 */</div><div class='del'>-	if (err &gt; 0 &amp;&amp; barrier) {</div><div class='add'>+	if (xenbus_read_unsigned(info-&gt;xbdev-&gt;otherend, "feature-barrier", 0)) {</div><div class='ctx'> 		info-&gt;feature_flush = 1;</div><div class='ctx'> 		info-&gt;feature_fua = 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2327,35 +2313,26 @@ static void blkfront_gather_backend_features(struct blkfront_info *info)</div><div class='ctx'> 	 * And if there is "feature-flush-cache" use that above</div><div class='ctx'> 	 * barriers.</div><div class='ctx'> 	 */</div><div class='del'>-	err = xenbus_scanf(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='del'>-			   "feature-flush-cache", "%d", &amp;flush);</div><div class='del'>-</div><div class='del'>-	if (err &gt; 0 &amp;&amp; flush) {</div><div class='add'>+	if (xenbus_read_unsigned(info-&gt;xbdev-&gt;otherend, "feature-flush-cache",</div><div class='add'>+				 0)) {</div><div class='ctx'> 		info-&gt;feature_flush = 1;</div><div class='ctx'> 		info-&gt;feature_fua = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = xenbus_scanf(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='del'>-			   "feature-discard", "%d", &amp;discard);</div><div class='del'>-</div><div class='del'>-	if (err &gt; 0 &amp;&amp; discard)</div><div class='add'>+	if (xenbus_read_unsigned(info-&gt;xbdev-&gt;otherend, "feature-discard", 0))</div><div class='ctx'> 		blkfront_setup_discard(info);</div><div class='ctx'> </div><div class='del'>-	err = xenbus_scanf(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='del'>-			   "feature-persistent", "%d", &amp;persistent);</div><div class='del'>-	if (err &lt;= 0)</div><div class='del'>-		info-&gt;feature_persistent = 0;</div><div class='del'>-	else</div><div class='del'>-		info-&gt;feature_persistent = persistent;</div><div class='del'>-</div><div class='del'>-	err = xenbus_scanf(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='del'>-			   "feature-max-indirect-segments", "%u",</div><div class='del'>-			   &amp;indirect_segments);</div><div class='del'>-	if (err &lt;= 0)</div><div class='del'>-		info-&gt;max_indirect_segments = 0;</div><div class='del'>-	else</div><div class='del'>-		info-&gt;max_indirect_segments = min(indirect_segments,</div><div class='del'>-						  xen_blkif_max_segments);</div><div class='add'>+	info-&gt;feature_persistent =</div><div class='add'>+		!!xenbus_read_unsigned(info-&gt;xbdev-&gt;otherend,</div><div class='add'>+				       "feature-persistent", 0);</div><div class='add'>+</div><div class='add'>+	indirect_segments = xenbus_read_unsigned(info-&gt;xbdev-&gt;otherend,</div><div class='add'>+					"feature-max-indirect-segments", 0);</div><div class='add'>+	if (indirect_segments &gt; xen_blkif_max_segments)</div><div class='add'>+		indirect_segments = xen_blkif_max_segments;</div><div class='add'>+	if (indirect_segments &lt;= BLKIF_MAX_SEGMENTS_PER_REQUEST)</div><div class='add'>+		indirect_segments = 0;</div><div class='add'>+	info-&gt;max_indirect_segments = indirect_segments;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2420,11 +2397,9 @@ static void blkfront_connect(struct blkfront_info *info)</div><div class='ctx'> 	 * provide this. Assume physical sector size to be the same as</div><div class='ctx'> 	 * sector_size in that case.</div><div class='ctx'> 	 */</div><div class='del'>-	err = xenbus_scanf(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='del'>-			   "physical-sector-size", "%u", &amp;physical_sector_size);</div><div class='del'>-	if (err != 1)</div><div class='del'>-		physical_sector_size = sector_size;</div><div class='del'>-</div><div class='add'>+	physical_sector_size = xenbus_read_unsigned(info-&gt;xbdev-&gt;otherend,</div><div class='add'>+						    "physical-sector-size",</div><div class='add'>+						    sector_size);</div><div class='ctx'> 	blkfront_gather_backend_features(info);</div><div class='ctx'> 	for (i = 0; i &lt; info-&gt;nr_rings; i++) {</div><div class='ctx'> 		err = blkfront_setup_indirect(&amp;info-&gt;rinfo[i]);</div><div class='hunk'>@@ -2680,6 +2655,9 @@ static int __init xlblk_init(void)</div><div class='ctx'> 	if (!xen_domain())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	if (xen_blkif_max_segments &lt; BLKIF_MAX_SEGMENTS_PER_REQUEST)</div><div class='add'>+		xen_blkif_max_segments = BLKIF_MAX_SEGMENTS_PER_REQUEST;</div><div class='add'>+</div><div class='ctx'> 	if (xen_blkif_max_ring_order &gt; XENBUS_MAX_RING_GRANT_ORDER) {</div><div class='ctx'> 		pr_info("Invalid max_ring_order (%d), will use default max: %d.\n",</div><div class='ctx'> 			xen_blkif_max_ring_order, XENBUS_MAX_RING_GRANT_ORDER);</div><div class='head'>diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c<br/>index c4328d9d9981..757dce2147e0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/xsysace.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/xsysace.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/xsysace.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/xsysace.c</a></div><div class='hunk'>@@ -468,7 +468,7 @@ static struct request *ace_get_next_request(struct request_queue *q)</div><div class='ctx'> 	struct request *req;</div><div class='ctx'> </div><div class='ctx'> 	while ((req = blk_peek_request(q)) != NULL) {</div><div class='del'>-		if (req-&gt;cmd_type == REQ_TYPE_FS)</div><div class='add'>+		if (!blk_rq_is_passthrough(req))</div><div class='ctx'> 			break;</div><div class='ctx'> 		blk_start_request(req);</div><div class='ctx'> 		__blk_end_request_all(req, -EIO);</div><div class='head'>diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c<br/>index 4b5cd3a7b2b6..12046f4f00e4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/zram/zcomp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/zram/zcomp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/zram/zcomp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/zram/zcomp.c</a></div><div class='hunk'>@@ -160,82 +160,56 @@ int zcomp_decompress(struct zcomp_strm *zstrm,</div><div class='ctx'> 			dst, &amp;dst_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __zcomp_cpu_notifier(struct zcomp *comp,</div><div class='del'>-		unsigned long action, unsigned long cpu)</div><div class='add'>+int zcomp_cpu_up_prepare(unsigned int cpu, struct hlist_node *node)</div><div class='ctx'> {</div><div class='add'>+	struct zcomp *comp = hlist_entry(node, struct zcomp, node);</div><div class='ctx'> 	struct zcomp_strm *zstrm;</div><div class='ctx'> </div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_UP_PREPARE:</div><div class='del'>-		if (WARN_ON(*per_cpu_ptr(comp-&gt;stream, cpu)))</div><div class='del'>-			break;</div><div class='del'>-		zstrm = zcomp_strm_alloc(comp);</div><div class='del'>-		if (IS_ERR_OR_NULL(zstrm)) {</div><div class='del'>-			pr_err("Can't allocate a compression stream\n");</div><div class='del'>-			return NOTIFY_BAD;</div><div class='del'>-		}</div><div class='del'>-		*per_cpu_ptr(comp-&gt;stream, cpu) = zstrm;</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DEAD:</div><div class='del'>-	case CPU_UP_CANCELED:</div><div class='del'>-		zstrm = *per_cpu_ptr(comp-&gt;stream, cpu);</div><div class='del'>-		if (!IS_ERR_OR_NULL(zstrm))</div><div class='del'>-			zcomp_strm_free(zstrm);</div><div class='del'>-		*per_cpu_ptr(comp-&gt;stream, cpu) = NULL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+	if (WARN_ON(*per_cpu_ptr(comp-&gt;stream, cpu)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	zstrm = zcomp_strm_alloc(comp);</div><div class='add'>+	if (IS_ERR_OR_NULL(zstrm)) {</div><div class='add'>+		pr_err("Can't allocate a compression stream\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	return NOTIFY_OK;</div><div class='add'>+	*per_cpu_ptr(comp-&gt;stream, cpu) = zstrm;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int zcomp_cpu_notifier(struct notifier_block *nb,</div><div class='del'>-		unsigned long action, void *pcpu)</div><div class='add'>+int zcomp_cpu_dead(unsigned int cpu, struct hlist_node *node)</div><div class='ctx'> {</div><div class='del'>-	unsigned long cpu = (unsigned long)pcpu;</div><div class='del'>-	struct zcomp *comp = container_of(nb, typeof(*comp), notifier);</div><div class='add'>+	struct zcomp *comp = hlist_entry(node, struct zcomp, node);</div><div class='add'>+	struct zcomp_strm *zstrm;</div><div class='ctx'> </div><div class='del'>-	return __zcomp_cpu_notifier(comp, action, cpu);</div><div class='add'>+	zstrm = *per_cpu_ptr(comp-&gt;stream, cpu);</div><div class='add'>+	if (!IS_ERR_OR_NULL(zstrm))</div><div class='add'>+		zcomp_strm_free(zstrm);</div><div class='add'>+	*per_cpu_ptr(comp-&gt;stream, cpu) = NULL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int zcomp_init(struct zcomp *comp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long cpu;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	comp-&gt;notifier.notifier_call = zcomp_cpu_notifier;</div><div class='del'>-</div><div class='ctx'> 	comp-&gt;stream = alloc_percpu(struct zcomp_strm *);</div><div class='ctx'> 	if (!comp-&gt;stream)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-	for_each_online_cpu(cpu) {</div><div class='del'>-		ret = __zcomp_cpu_notifier(comp, CPU_UP_PREPARE, cpu);</div><div class='del'>-		if (ret == NOTIFY_BAD)</div><div class='del'>-			goto cleanup;</div><div class='del'>-	}</div><div class='del'>-	__register_cpu_notifier(&amp;comp-&gt;notifier);</div><div class='del'>-	cpu_notifier_register_done();</div><div class='add'>+	ret = cpuhp_state_add_instance(CPUHP_ZCOMP_PREPARE, &amp;comp-&gt;node);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto cleanup;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='del'>-	for_each_online_cpu(cpu)</div><div class='del'>-		__zcomp_cpu_notifier(comp, CPU_UP_CANCELED, cpu);</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-	return -ENOMEM;</div><div class='add'>+	free_percpu(comp-&gt;stream);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void zcomp_destroy(struct zcomp *comp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long cpu;</div><div class='del'>-</div><div class='del'>-	cpu_notifier_register_begin();</div><div class='del'>-	for_each_online_cpu(cpu)</div><div class='del'>-		__zcomp_cpu_notifier(comp, CPU_UP_CANCELED, cpu);</div><div class='del'>-	__unregister_cpu_notifier(&amp;comp-&gt;notifier);</div><div class='del'>-	cpu_notifier_register_done();</div><div class='del'>-</div><div class='add'>+	cpuhp_state_remove_instance(CPUHP_ZCOMP_PREPARE, &amp;comp-&gt;node);</div><div class='ctx'> 	free_percpu(comp-&gt;stream);</div><div class='ctx'> 	kfree(comp);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h<br/>index 478cac2ed465..41c1002a7d7d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/zram/zcomp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/zram/zcomp.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/zram/zcomp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/zram/zcomp.h</a></div><div class='hunk'>@@ -19,11 +19,12 @@ struct zcomp_strm {</div><div class='ctx'> /* dynamic per-device compression frontend */</div><div class='ctx'> struct zcomp {</div><div class='ctx'> 	struct zcomp_strm * __percpu *stream;</div><div class='del'>-	struct notifier_block notifier;</div><div class='del'>-</div><div class='ctx'> 	const char *name;</div><div class='add'>+	struct hlist_node node;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+int zcomp_cpu_up_prepare(unsigned int cpu, struct hlist_node *node);</div><div class='add'>+int zcomp_cpu_dead(unsigned int cpu, struct hlist_node *node);</div><div class='ctx'> ssize_t zcomp_available_show(const char *comp, char *buf);</div><div class='ctx'> bool zcomp_available_algorithm(const char *comp);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c<br/>index 5497f7fc44d0..e27d89a36c34 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/zram/zram_drv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/zram/zram_drv.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/zram/zram_drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/zram/zram_drv.c</a></div><div class='hunk'>@@ -25,11 +25,13 @@</div><div class='ctx'> #include &lt;linux/genhd.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/backing-dev.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/cpuhotplug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "zram_drv.h"</div><div class='ctx'> </div><div class='hunk'>@@ -43,27 +45,6 @@ static const char *default_compressor = "lzo";</div><div class='ctx'> /* Module params (documentation at end) */</div><div class='ctx'> static unsigned int num_devices = 1;</div><div class='ctx'> </div><div class='del'>-static inline void deprecated_attr_warn(const char *name)</div><div class='del'>-{</div><div class='del'>-	pr_warn_once("%d (%s) Attribute %s (and others) will be removed. %s\n",</div><div class='del'>-			task_pid_nr(current),</div><div class='del'>-			current-&gt;comm,</div><div class='del'>-			name,</div><div class='del'>-			"See zram documentation.");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ZRAM_ATTR_RO(name)						\</div><div class='del'>-static ssize_t name##_show(struct device *d,				\</div><div class='del'>-				struct device_attribute *attr, char *b)	\</div><div class='del'>-{									\</div><div class='del'>-	struct zram *zram = dev_to_zram(d);				\</div><div class='del'>-									\</div><div class='del'>-	deprecated_attr_warn(__stringify(name));			\</div><div class='del'>-	return scnprintf(b, PAGE_SIZE, "%llu\n",			\</div><div class='del'>-		(u64)atomic64_read(&amp;zram-&gt;stats.name));			\</div><div class='del'>-}									\</div><div class='del'>-static DEVICE_ATTR_RO(name);</div><div class='del'>-</div><div class='ctx'> static inline bool init_done(struct zram *zram)</div><div class='ctx'> {</div><div class='ctx'> 	return zram-&gt;disksize;</div><div class='hunk'>@@ -93,6 +74,17 @@ static void zram_clear_flag(struct zram_meta *meta, u32 index,</div><div class='ctx'> 	meta-&gt;table[index].value &amp;= ~BIT(flag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void zram_set_element(struct zram_meta *meta, u32 index,</div><div class='add'>+			unsigned long element)</div><div class='add'>+{</div><div class='add'>+	meta-&gt;table[index].element = element;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void zram_clear_element(struct zram_meta *meta, u32 index)</div><div class='add'>+{</div><div class='add'>+	meta-&gt;table[index].element = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static size_t zram_get_obj_size(struct zram_meta *meta, u32 index)</div><div class='ctx'> {</div><div class='ctx'> 	return meta-&gt;table[index].value &amp; (BIT(ZRAM_FLAG_SHIFT) - 1);</div><div class='hunk'>@@ -111,6 +103,14 @@ static inline bool is_partial_io(struct bio_vec *bvec)</div><div class='ctx'> 	return bvec-&gt;bv_len != PAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void zram_revalidate_disk(struct zram *zram)</div><div class='add'>+{</div><div class='add'>+	revalidate_disk(zram-&gt;disk);</div><div class='add'>+	/* revalidate_disk reset the BDI_CAP_STABLE_WRITES so set again */</div><div class='add'>+	zram-&gt;disk-&gt;queue-&gt;backing_dev_info-&gt;capabilities |=</div><div class='add'>+		BDI_CAP_STABLE_WRITES;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Check if request is within bounds and aligned on zram logical blocks.</div><div class='ctx'>  */</div><div class='hunk'>@@ -157,31 +157,46 @@ static inline void update_used_max(struct zram *zram,</div><div class='ctx'> 	} while (old_max != cur_max);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool page_zero_filled(void *ptr)</div><div class='add'>+static inline void zram_fill_page(char *ptr, unsigned long len,</div><div class='add'>+					unsigned long value)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long *page = (unsigned long *)ptr;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!IS_ALIGNED(len, sizeof(unsigned long)));</div><div class='add'>+</div><div class='add'>+	if (likely(value == 0)) {</div><div class='add'>+		memset(ptr, 0, len);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; len / sizeof(*page); i++)</div><div class='add'>+			page[i] = value;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool page_same_filled(void *ptr, unsigned long *element)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int pos;</div><div class='ctx'> 	unsigned long *page;</div><div class='ctx'> </div><div class='ctx'> 	page = (unsigned long *)ptr;</div><div class='ctx'> </div><div class='del'>-	for (pos = 0; pos != PAGE_SIZE / sizeof(*page); pos++) {</div><div class='del'>-		if (page[pos])</div><div class='add'>+	for (pos = 0; pos &lt; PAGE_SIZE / sizeof(*page) - 1; pos++) {</div><div class='add'>+		if (page[pos] != page[pos + 1])</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	*element = page[pos];</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void handle_zero_page(struct bio_vec *bvec)</div><div class='add'>+static void handle_same_page(struct bio_vec *bvec, unsigned long element)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page = bvec-&gt;bv_page;</div><div class='ctx'> 	void *user_mem;</div><div class='ctx'> </div><div class='ctx'> 	user_mem = kmap_atomic(page);</div><div class='del'>-	if (is_partial_io(bvec))</div><div class='del'>-		memset(user_mem + bvec-&gt;bv_offset, 0, bvec-&gt;bv_len);</div><div class='del'>-	else</div><div class='del'>-		clear_page(user_mem);</div><div class='add'>+	zram_fill_page(user_mem + bvec-&gt;bv_offset, bvec-&gt;bv_len, element);</div><div class='ctx'> 	kunmap_atomic(user_mem);</div><div class='ctx'> </div><div class='ctx'> 	flush_dcache_page(page);</div><div class='hunk'>@@ -208,47 +223,6 @@ static ssize_t disksize_show(struct device *dev,</div><div class='ctx'> 	return scnprintf(buf, PAGE_SIZE, "%llu\n", zram-&gt;disksize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t orig_data_size_show(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct zram *zram = dev_to_zram(dev);</div><div class='del'>-</div><div class='del'>-	deprecated_attr_warn("orig_data_size");</div><div class='del'>-	return scnprintf(buf, PAGE_SIZE, "%llu\n",</div><div class='del'>-		(u64)(atomic64_read(&amp;zram-&gt;stats.pages_stored)) &lt;&lt; PAGE_SHIFT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t mem_used_total_show(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	u64 val = 0;</div><div class='del'>-	struct zram *zram = dev_to_zram(dev);</div><div class='del'>-</div><div class='del'>-	deprecated_attr_warn("mem_used_total");</div><div class='del'>-	down_read(&amp;zram-&gt;init_lock);</div><div class='del'>-	if (init_done(zram)) {</div><div class='del'>-		struct zram_meta *meta = zram-&gt;meta;</div><div class='del'>-		val = zs_get_total_pages(meta-&gt;mem_pool);</div><div class='del'>-	}</div><div class='del'>-	up_read(&amp;zram-&gt;init_lock);</div><div class='del'>-</div><div class='del'>-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val &lt;&lt; PAGE_SHIFT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t mem_limit_show(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	u64 val;</div><div class='del'>-	struct zram *zram = dev_to_zram(dev);</div><div class='del'>-</div><div class='del'>-	deprecated_attr_warn("mem_limit");</div><div class='del'>-	down_read(&amp;zram-&gt;init_lock);</div><div class='del'>-	val = zram-&gt;limit_pages;</div><div class='del'>-	up_read(&amp;zram-&gt;init_lock);</div><div class='del'>-</div><div class='del'>-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val &lt;&lt; PAGE_SHIFT);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t mem_limit_store(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, const char *buf, size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -267,21 +241,6 @@ static ssize_t mem_limit_store(struct device *dev,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t mem_used_max_show(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	u64 val = 0;</div><div class='del'>-	struct zram *zram = dev_to_zram(dev);</div><div class='del'>-</div><div class='del'>-	deprecated_attr_warn("mem_used_max");</div><div class='del'>-	down_read(&amp;zram-&gt;init_lock);</div><div class='del'>-	if (init_done(zram))</div><div class='del'>-		val = atomic_long_read(&amp;zram-&gt;stats.max_used_pages);</div><div class='del'>-	up_read(&amp;zram-&gt;init_lock);</div><div class='del'>-</div><div class='del'>-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val &lt;&lt; PAGE_SHIFT);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t mem_used_max_store(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, const char *buf, size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -430,7 +389,7 @@ static ssize_t mm_stat_show(struct device *dev,</div><div class='ctx'> 			mem_used &lt;&lt; PAGE_SHIFT,</div><div class='ctx'> 			zram-&gt;limit_pages &lt;&lt; PAGE_SHIFT,</div><div class='ctx'> 			max_used &lt;&lt; PAGE_SHIFT,</div><div class='del'>-			(u64)atomic64_read(&amp;zram-&gt;stats.zero_pages),</div><div class='add'>+			(u64)atomic64_read(&amp;zram-&gt;stats.same_pages),</div><div class='ctx'> 			pool_stats.pages_compacted);</div><div class='ctx'> 	up_read(&amp;zram-&gt;init_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -457,26 +416,6 @@ static ssize_t debug_stat_show(struct device *dev,</div><div class='ctx'> static DEVICE_ATTR_RO(io_stat);</div><div class='ctx'> static DEVICE_ATTR_RO(mm_stat);</div><div class='ctx'> static DEVICE_ATTR_RO(debug_stat);</div><div class='del'>-ZRAM_ATTR_RO(num_reads);</div><div class='del'>-ZRAM_ATTR_RO(num_writes);</div><div class='del'>-ZRAM_ATTR_RO(failed_reads);</div><div class='del'>-ZRAM_ATTR_RO(failed_writes);</div><div class='del'>-ZRAM_ATTR_RO(invalid_io);</div><div class='del'>-ZRAM_ATTR_RO(notify_free);</div><div class='del'>-ZRAM_ATTR_RO(zero_pages);</div><div class='del'>-ZRAM_ATTR_RO(compr_data_size);</div><div class='del'>-</div><div class='del'>-static inline bool zram_meta_get(struct zram *zram)</div><div class='del'>-{</div><div class='del'>-	if (atomic_inc_not_zero(&amp;zram-&gt;refcount))</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void zram_meta_put(struct zram *zram)</div><div class='del'>-{</div><div class='del'>-	atomic_dec(&amp;zram-&gt;refcount);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static void zram_meta_free(struct zram_meta *meta, u64 disksize)</div><div class='ctx'> {</div><div class='hunk'>@@ -486,8 +425,11 @@ static void zram_meta_free(struct zram_meta *meta, u64 disksize)</div><div class='ctx'> 	/* Free all pages that are still in this zram device */</div><div class='ctx'> 	for (index = 0; index &lt; num_pages; index++) {</div><div class='ctx'> 		unsigned long handle = meta-&gt;table[index].handle;</div><div class='del'>-</div><div class='del'>-		if (!handle)</div><div class='add'>+		/*</div><div class='add'>+		 * No memory is allocated for same element filled pages.</div><div class='add'>+		 * Simply clear same page flag.</div><div class='add'>+		 */</div><div class='add'>+		if (!handle || zram_test_flag(meta, index, ZRAM_SAME))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		zs_free(meta-&gt;mem_pool, handle);</div><div class='hunk'>@@ -537,18 +479,20 @@ static void zram_free_page(struct zram *zram, size_t index)</div><div class='ctx'> 	struct zram_meta *meta = zram-&gt;meta;</div><div class='ctx'> 	unsigned long handle = meta-&gt;table[index].handle;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!handle)) {</div><div class='del'>-		/*</div><div class='del'>-		 * No memory is allocated for zero filled pages.</div><div class='del'>-		 * Simply clear zero page flag.</div><div class='del'>-		 */</div><div class='del'>-		if (zram_test_flag(meta, index, ZRAM_ZERO)) {</div><div class='del'>-			zram_clear_flag(meta, index, ZRAM_ZERO);</div><div class='del'>-			atomic64_dec(&amp;zram-&gt;stats.zero_pages);</div><div class='del'>-		}</div><div class='add'>+	/*</div><div class='add'>+	 * No memory is allocated for same element filled pages.</div><div class='add'>+	 * Simply clear same page flag.</div><div class='add'>+	 */</div><div class='add'>+	if (zram_test_flag(meta, index, ZRAM_SAME)) {</div><div class='add'>+		zram_clear_flag(meta, index, ZRAM_SAME);</div><div class='add'>+		zram_clear_element(meta, index);</div><div class='add'>+		atomic64_dec(&amp;zram-&gt;stats.same_pages);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!handle)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	zs_free(meta-&gt;mem_pool, handle);</div><div class='ctx'> </div><div class='ctx'> 	atomic64_sub(zram_get_obj_size(meta, index),</div><div class='hunk'>@@ -571,9 +515,9 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index)</div><div class='ctx'> 	handle = meta-&gt;table[index].handle;</div><div class='ctx'> 	size = zram_get_obj_size(meta, index);</div><div class='ctx'> </div><div class='del'>-	if (!handle || zram_test_flag(meta, index, ZRAM_ZERO)) {</div><div class='add'>+	if (!handle || zram_test_flag(meta, index, ZRAM_SAME)) {</div><div class='ctx'> 		bit_spin_unlock(ZRAM_ACCESS, &amp;meta-&gt;table[index].value);</div><div class='del'>-		clear_page(mem);</div><div class='add'>+		zram_fill_page(mem, PAGE_SIZE, meta-&gt;table[index].element);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -609,9 +553,9 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,</div><div class='ctx'> </div><div class='ctx'> 	bit_spin_lock(ZRAM_ACCESS, &amp;meta-&gt;table[index].value);</div><div class='ctx'> 	if (unlikely(!meta-&gt;table[index].handle) ||</div><div class='del'>-			zram_test_flag(meta, index, ZRAM_ZERO)) {</div><div class='add'>+			zram_test_flag(meta, index, ZRAM_SAME)) {</div><div class='ctx'> 		bit_spin_unlock(ZRAM_ACCESS, &amp;meta-&gt;table[index].value);</div><div class='del'>-		handle_zero_page(bvec);</div><div class='add'>+		handle_same_page(bvec, meta-&gt;table[index].element);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	bit_spin_unlock(ZRAM_ACCESS, &amp;meta-&gt;table[index].value);</div><div class='hunk'>@@ -659,6 +603,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,</div><div class='ctx'> 	struct zram_meta *meta = zram-&gt;meta;</div><div class='ctx'> 	struct zcomp_strm *zstrm = NULL;</div><div class='ctx'> 	unsigned long alloced_pages;</div><div class='add'>+	unsigned long element;</div><div class='ctx'> </div><div class='ctx'> 	page = bvec-&gt;bv_page;</div><div class='ctx'> 	if (is_partial_io(bvec)) {</div><div class='hunk'>@@ -687,16 +632,17 @@ compress_again:</div><div class='ctx'> 		uncmem = user_mem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (page_zero_filled(uncmem)) {</div><div class='add'>+	if (page_same_filled(uncmem, &amp;element)) {</div><div class='ctx'> 		if (user_mem)</div><div class='ctx'> 			kunmap_atomic(user_mem);</div><div class='ctx'> 		/* Free memory associated with this sector now. */</div><div class='ctx'> 		bit_spin_lock(ZRAM_ACCESS, &amp;meta-&gt;table[index].value);</div><div class='ctx'> 		zram_free_page(zram, index);</div><div class='del'>-		zram_set_flag(meta, index, ZRAM_ZERO);</div><div class='add'>+		zram_set_flag(meta, index, ZRAM_SAME);</div><div class='add'>+		zram_set_element(meta, index, element);</div><div class='ctx'> 		bit_spin_unlock(ZRAM_ACCESS, &amp;meta-&gt;table[index].value);</div><div class='ctx'> </div><div class='del'>-		atomic64_inc(&amp;zram-&gt;stats.zero_pages);</div><div class='add'>+		atomic64_inc(&amp;zram-&gt;stats.same_pages);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -934,22 +880,17 @@ static blk_qc_t zram_make_request(struct request_queue *queue, struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct zram *zram = queue-&gt;queuedata;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!zram_meta_get(zram)))</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='ctx'> 	blk_queue_split(queue, &amp;bio, queue-&gt;bio_split);</div><div class='ctx'> </div><div class='ctx'> 	if (!valid_io_request(zram, bio-&gt;bi_iter.bi_sector,</div><div class='ctx'> 					bio-&gt;bi_iter.bi_size)) {</div><div class='ctx'> 		atomic64_inc(&amp;zram-&gt;stats.invalid_io);</div><div class='del'>-		goto put_zram;</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	__zram_make_request(zram, bio);</div><div class='del'>-	zram_meta_put(zram);</div><div class='ctx'> 	return BLK_QC_T_NONE;</div><div class='del'>-put_zram:</div><div class='del'>-	zram_meta_put(zram);</div><div class='add'>+</div><div class='ctx'> error:</div><div class='ctx'> 	bio_io_error(bio);</div><div class='ctx'> 	return BLK_QC_T_NONE;</div><div class='hunk'>@@ -979,13 +920,11 @@ static int zram_rw_page(struct block_device *bdev, sector_t sector,</div><div class='ctx'> 	struct bio_vec bv;</div><div class='ctx'> </div><div class='ctx'> 	zram = bdev-&gt;bd_disk-&gt;private_data;</div><div class='del'>-	if (unlikely(!zram_meta_get(zram)))</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (!valid_io_request(zram, sector, PAGE_SIZE)) {</div><div class='ctx'> 		atomic64_inc(&amp;zram-&gt;stats.invalid_io);</div><div class='ctx'> 		err = -EINVAL;</div><div class='del'>-		goto put_zram;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	index = sector &gt;&gt; SECTORS_PER_PAGE_SHIFT;</div><div class='hunk'>@@ -996,8 +935,6 @@ static int zram_rw_page(struct block_device *bdev, sector_t sector,</div><div class='ctx'> 	bv.bv_offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	err = zram_bvec_rw(zram, &amp;bv, index, offset, is_write);</div><div class='del'>-put_zram:</div><div class='del'>-	zram_meta_put(zram);</div><div class='ctx'> out:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If I/O fails, just return error(ie, non-zero) without</div><div class='hunk'>@@ -1030,17 +967,6 @@ static void zram_reset_device(struct zram *zram)</div><div class='ctx'> 	meta = zram-&gt;meta;</div><div class='ctx'> 	comp = zram-&gt;comp;</div><div class='ctx'> 	disksize = zram-&gt;disksize;</div><div class='del'>-	/*</div><div class='del'>-	 * Refcount will go down to 0 eventually and r/w handler</div><div class='del'>-	 * cannot handle further I/O so it will bail out by</div><div class='del'>-	 * check zram_meta_get.</div><div class='del'>-	 */</div><div class='del'>-	zram_meta_put(zram);</div><div class='del'>-	/*</div><div class='del'>-	 * We want to free zram_meta in process context to avoid</div><div class='del'>-	 * deadlock between reclaim path and any other locks.</div><div class='del'>-	 */</div><div class='del'>-	wait_event(zram-&gt;io_done, atomic_read(&amp;zram-&gt;refcount) == 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset stats */</div><div class='ctx'> 	memset(&amp;zram-&gt;stats, 0, sizeof(zram-&gt;stats));</div><div class='hunk'>@@ -1088,21 +1014,13 @@ static ssize_t disksize_store(struct device *dev,</div><div class='ctx'> 		goto out_destroy_comp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	init_waitqueue_head(&amp;zram-&gt;io_done);</div><div class='del'>-	atomic_set(&amp;zram-&gt;refcount, 1);</div><div class='ctx'> 	zram-&gt;meta = meta;</div><div class='ctx'> 	zram-&gt;comp = comp;</div><div class='ctx'> 	zram-&gt;disksize = disksize;</div><div class='ctx'> 	set_capacity(zram-&gt;disk, zram-&gt;disksize &gt;&gt; SECTOR_SHIFT);</div><div class='add'>+	zram_revalidate_disk(zram);</div><div class='ctx'> 	up_write(&amp;zram-&gt;init_lock);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Revalidate disk out of the init_lock to avoid lockdep splat.</div><div class='del'>-	 * It's okay because disk's capacity is protected by init_lock</div><div class='del'>-	 * so that revalidate_disk always sees up-to-date capacity.</div><div class='del'>-	 */</div><div class='del'>-	revalidate_disk(zram-&gt;disk);</div><div class='del'>-</div><div class='ctx'> 	return len;</div><div class='ctx'> </div><div class='ctx'> out_destroy_comp:</div><div class='hunk'>@@ -1148,7 +1066,7 @@ static ssize_t reset_store(struct device *dev,</div><div class='ctx'> 	/* Make sure all the pending I/O are finished */</div><div class='ctx'> 	fsync_bdev(bdev);</div><div class='ctx'> 	zram_reset_device(zram);</div><div class='del'>-	revalidate_disk(zram-&gt;disk);</div><div class='add'>+	zram_revalidate_disk(zram);</div><div class='ctx'> 	bdput(bdev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;bdev-&gt;bd_mutex);</div><div class='hunk'>@@ -1184,10 +1102,8 @@ static DEVICE_ATTR_WO(compact);</div><div class='ctx'> static DEVICE_ATTR_RW(disksize);</div><div class='ctx'> static DEVICE_ATTR_RO(initstate);</div><div class='ctx'> static DEVICE_ATTR_WO(reset);</div><div class='del'>-static DEVICE_ATTR_RO(orig_data_size);</div><div class='del'>-static DEVICE_ATTR_RO(mem_used_total);</div><div class='del'>-static DEVICE_ATTR_RW(mem_limit);</div><div class='del'>-static DEVICE_ATTR_RW(mem_used_max);</div><div class='add'>+static DEVICE_ATTR_WO(mem_limit);</div><div class='add'>+static DEVICE_ATTR_WO(mem_used_max);</div><div class='ctx'> static DEVICE_ATTR_RW(max_comp_streams);</div><div class='ctx'> static DEVICE_ATTR_RW(comp_algorithm);</div><div class='ctx'> </div><div class='hunk'>@@ -1195,17 +1111,7 @@ static struct attribute *zram_disk_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_disksize.attr,</div><div class='ctx'> 	&amp;dev_attr_initstate.attr,</div><div class='ctx'> 	&amp;dev_attr_reset.attr,</div><div class='del'>-	&amp;dev_attr_num_reads.attr,</div><div class='del'>-	&amp;dev_attr_num_writes.attr,</div><div class='del'>-	&amp;dev_attr_failed_reads.attr,</div><div class='del'>-	&amp;dev_attr_failed_writes.attr,</div><div class='ctx'> 	&amp;dev_attr_compact.attr,</div><div class='del'>-	&amp;dev_attr_invalid_io.attr,</div><div class='del'>-	&amp;dev_attr_notify_free.attr,</div><div class='del'>-	&amp;dev_attr_zero_pages.attr,</div><div class='del'>-	&amp;dev_attr_orig_data_size.attr,</div><div class='del'>-	&amp;dev_attr_compr_data_size.attr,</div><div class='del'>-	&amp;dev_attr_mem_used_total.attr,</div><div class='ctx'> 	&amp;dev_attr_mem_limit.attr,</div><div class='ctx'> 	&amp;dev_attr_mem_used_max.attr,</div><div class='ctx'> 	&amp;dev_attr_max_comp_streams.attr,</div><div class='hunk'>@@ -1443,15 +1349,22 @@ static void destroy_devices(void)</div><div class='ctx'> 	idr_for_each(&amp;zram_index_idr, &amp;zram_remove_cb, NULL);</div><div class='ctx'> 	idr_destroy(&amp;zram_index_idr);</div><div class='ctx'> 	unregister_blkdev(zram_major, "zram");</div><div class='add'>+	cpuhp_remove_multi_state(CPUHP_ZCOMP_PREPARE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init zram_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = cpuhp_setup_state_multi(CPUHP_ZCOMP_PREPARE, "block/zram:prepare",</div><div class='add'>+				      zcomp_cpu_up_prepare, zcomp_cpu_dead);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ret = class_register(&amp;zram_control_class);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("Unable to register zram-control class\n");</div><div class='add'>+		cpuhp_remove_multi_state(CPUHP_ZCOMP_PREPARE);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1459,6 +1372,7 @@ static int __init zram_init(void)</div><div class='ctx'> 	if (zram_major &lt;= 0) {</div><div class='ctx'> 		pr_err("Unable to get major number\n");</div><div class='ctx'> 		class_unregister(&amp;zram_control_class);</div><div class='add'>+		cpuhp_remove_multi_state(CPUHP_ZCOMP_PREPARE);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h<br/>index 74fcf10da374..caeff51f1571 100644<br/>--- a/<a href='/drm-misc/tree/drivers/block/zram/zram_drv.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/block/zram/zram_drv.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/block/zram/zram_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/block/zram/zram_drv.h</a></div><div class='hunk'>@@ -61,7 +61,7 @@ static const size_t max_zpage_size = PAGE_SIZE / 4 * 3;</div><div class='ctx'> /* Flags for zram pages (table[page_no].value) */</div><div class='ctx'> enum zram_pageflags {</div><div class='ctx'> 	/* Page consists entirely of zeros */</div><div class='del'>-	ZRAM_ZERO = ZRAM_FLAG_SHIFT,</div><div class='add'>+	ZRAM_SAME = ZRAM_FLAG_SHIFT,</div><div class='ctx'> 	ZRAM_ACCESS,	/* page is now accessed */</div><div class='ctx'> </div><div class='ctx'> 	__NR_ZRAM_PAGEFLAGS,</div><div class='hunk'>@@ -71,7 +71,10 @@ enum zram_pageflags {</div><div class='ctx'> </div><div class='ctx'> /* Allocated for each disk page */</div><div class='ctx'> struct zram_table_entry {</div><div class='del'>-	unsigned long handle;</div><div class='add'>+	union {</div><div class='add'>+		unsigned long handle;</div><div class='add'>+		unsigned long element;</div><div class='add'>+	};</div><div class='ctx'> 	unsigned long value;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -83,7 +86,7 @@ struct zram_stats {</div><div class='ctx'> 	atomic64_t failed_writes;	/* can happen when memory is too low */</div><div class='ctx'> 	atomic64_t invalid_io;	/* non-page-aligned I/O requests */</div><div class='ctx'> 	atomic64_t notify_free;	/* no. of swap slot free notifications */</div><div class='del'>-	atomic64_t zero_pages;		/* no. of zero filled pages */</div><div class='add'>+	atomic64_t same_pages;		/* no. of same element filled pages */</div><div class='ctx'> 	atomic64_t pages_stored;	/* no. of pages currently stored */</div><div class='ctx'> 	atomic_long_t max_used_pages;	/* no. of maximum pages stored */</div><div class='ctx'> 	atomic64_t writestall;		/* no. of write slow paths */</div><div class='hunk'>@@ -106,9 +109,6 @@ struct zram {</div><div class='ctx'> 	unsigned long limit_pages;</div><div class='ctx'> </div><div class='ctx'> 	struct zram_stats stats;</div><div class='del'>-	atomic_t refcount; /* refcount for zram_meta */</div><div class='del'>-	/* wait all IO under all of cpu are done */</div><div class='del'>-	wait_queue_head_t io_done;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is the limit on amount of *uncompressed* worth of data</div><div class='ctx'> 	 * we can store in a disk.</div><div class='head'>diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig<br/>index 3cc9bff9d99d..c2c14a12713b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/Kconfig</a></div><div class='hunk'>@@ -344,7 +344,7 @@ config BT_WILINK</div><div class='ctx'> </div><div class='ctx'> config BT_QCOMSMD</div><div class='ctx'> 	tristate "Qualcomm SMD based HCI support"</div><div class='del'>-	depends on QCOM_SMD &amp;&amp; QCOM_WCNSS_CTRL</div><div class='add'>+	depends on (QCOM_SMD &amp;&amp; QCOM_WCNSS_CTRL) || COMPILE_TEST</div><div class='ctx'> 	select BT_QCA</div><div class='ctx'> 	help</div><div class='ctx'> 	  Qualcomm SMD based HCI driver.</div><div class='head'>diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile<br/>index b1fc29a697b7..80627187c8b6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/Makefile</a></div><div class='hunk'>@@ -40,5 +40,3 @@ hci_uart-$(CONFIG_BT_HCIUART_QCA)	+= hci_qca.o</div><div class='ctx'> hci_uart-$(CONFIG_BT_HCIUART_AG6XX)	+= hci_ag6xx.o</div><div class='ctx'> hci_uart-$(CONFIG_BT_HCIUART_MRVL)	+= hci_mrvl.o</div><div class='ctx'> hci_uart-objs				:= $(hci_uart-y)</div><div class='del'>-</div><div class='del'>-ccflags-y += -D__CHECK_ENDIAN__</div><div class='head'>diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c<br/>index fadba88745dc..b793853ff05f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/ath3k.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/ath3k.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/ath3k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/ath3k.c</a></div><div class='hunk'>@@ -94,6 +94,7 @@ static const struct usb_device_id ath3k_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x04CA, 0x300f) },</div><div class='ctx'> 	{ USB_DEVICE(0x04CA, 0x3010) },</div><div class='ctx'> 	{ USB_DEVICE(0x04CA, 0x3014) },</div><div class='add'>+	{ USB_DEVICE(0x04CA, 0x3018) },</div><div class='ctx'> 	{ USB_DEVICE(0x0930, 0x0219) },</div><div class='ctx'> 	{ USB_DEVICE(0x0930, 0x021c) },</div><div class='ctx'> 	{ USB_DEVICE(0x0930, 0x0220) },</div><div class='hunk'>@@ -162,6 +163,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x04ca, 0x300f), .driver_info = BTUSB_ATH3012 },</div><div class='ctx'> 	{ USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 },</div><div class='ctx'> 	{ USB_DEVICE(0x04ca, 0x3014), .driver_info = BTUSB_ATH3012 },</div><div class='add'>+	{ USB_DEVICE(0x04ca, 0x3018), .driver_info = BTUSB_ATH3012 },</div><div class='ctx'> 	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },</div><div class='ctx'> 	{ USB_DEVICE(0x0930, 0x021c), .driver_info = BTUSB_ATH3012 },</div><div class='ctx'> 	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },</div><div class='head'>diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c<br/>index fdb44829ab6f..ba3dd2eafc09 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/btbcm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/btbcm.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/btbcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btbcm.c</a></div><div class='hunk'>@@ -178,6 +178,9 @@ static int btbcm_reset(struct hci_dev *hdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> </div><div class='add'>+	/* 100 msec delay for module to complete reset process */</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h<br/>index f742384b53f7..fc3caf4541ba 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/btmrvl_drv.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/btmrvl_drv.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/btmrvl_drv.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btmrvl_drv.h</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define BTM_HEADER_LEN			4</div><div class='head'>diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c<br/>index e6a85f0e6309..c38cb5b91291 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/btmrvl_main.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/btmrvl_main.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/btmrvl_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btmrvl_main.c</a></div><div class='hunk'>@@ -502,7 +502,7 @@ static int btmrvl_download_cal_data(struct btmrvl_private *priv,</div><div class='ctx'> 	ret = btmrvl_send_sync_cmd(priv, BT_CMD_LOAD_CONFIG_DATA, data,</div><div class='ctx'> 				   BT_CAL_HDR_LEN + len);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		BT_ERR("Failed to download caibration data");</div><div class='add'>+		BT_ERR("Failed to download calibration data");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c<br/>index d02f2c14df32..08e01f002bad 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/btmrvl_sdio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/btmrvl_sdio.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/btmrvl_sdio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btmrvl_sdio.c</a></div><div class='hunk'>@@ -97,11 +97,11 @@ static int btmrvl_sdio_probe_of(struct device *dev,</div><div class='ctx'> 		cfg-&gt;irq_bt = irq_of_parse_and_map(card-&gt;plt_of_node, 0);</div><div class='ctx'> 		if (!cfg-&gt;irq_bt) {</div><div class='ctx'> 			dev_err(dev, "fail to parse irq_bt from device tree");</div><div class='add'>+			cfg-&gt;irq_bt = -1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ret = devm_request_irq(dev, cfg-&gt;irq_bt,</div><div class='ctx'> 					       btmrvl_wake_irq_bt,</div><div class='del'>-					       IRQF_TRIGGER_LOW,</div><div class='del'>-					       "bt_wake", cfg);</div><div class='add'>+					       0, "bt_wake", cfg);</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				dev_err(dev,</div><div class='ctx'> 					"Failed to request irq_bt %d (%d)\n",</div><div class='hunk'>@@ -1624,7 +1624,7 @@ static int btmrvl_sdio_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;adapter-&gt;hs_state != HS_ACTIVATED) {</div><div class='ctx'> 		if (btmrvl_enable_hs(priv)) {</div><div class='del'>-			BT_ERR("HS not actived, suspend failed!");</div><div class='add'>+			BT_ERR("HS not activated, suspend failed!");</div><div class='ctx'> 			priv-&gt;adapter-&gt;is_suspending = false;</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1682,8 +1682,12 @@ static int btmrvl_sdio_resume(struct device *dev)</div><div class='ctx'> 	/* Disable platform specific wakeup interrupt */</div><div class='ctx'> 	if (card-&gt;plt_wake_cfg &amp;&amp; card-&gt;plt_wake_cfg-&gt;irq_bt &gt;= 0) {</div><div class='ctx'> 		disable_irq_wake(card-&gt;plt_wake_cfg-&gt;irq_bt);</div><div class='del'>-		if (!card-&gt;plt_wake_cfg-&gt;wake_by_bt)</div><div class='del'>-			disable_irq(card-&gt;plt_wake_cfg-&gt;irq_bt);</div><div class='add'>+		disable_irq(card-&gt;plt_wake_cfg-&gt;irq_bt);</div><div class='add'>+		if (card-&gt;plt_wake_cfg-&gt;wake_by_bt)</div><div class='add'>+			/* Undo our disable, since interrupt handler already</div><div class='add'>+			 * did this.</div><div class='add'>+			 */</div><div class='add'>+			enable_irq(card-&gt;plt_wake_cfg-&gt;irq_bt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c<br/>index 08c2c93887c1..8d4868af9bbd 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/btqcomsmd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/btqcomsmd.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/btqcomsmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btqcomsmd.c</a></div><div class='hunk'>@@ -165,6 +165,7 @@ static const struct of_device_id btqcomsmd_of_match[] = {</div><div class='ctx'> 	{ .compatible = "qcom,wcnss-bt", },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='add'>+MODULE_DEVICE_TABLE(of, btqcomsmd_of_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver btqcomsmd_driver = {</div><div class='ctx'> 	.probe = btqcomsmd_probe,</div><div class='head'>diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c<br/>index 2f633df9f4e6..1c8094ef3f22 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/btusb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/btusb.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/btusb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/btusb.c</a></div><div class='hunk'>@@ -24,6 +24,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='hunk'>@@ -130,6 +132,10 @@ static const struct usb_device_id btusb_table[] = {</div><div class='ctx'> 	/* Broadcom BCM43142A0 (Foxconn/Lenovo) */</div><div class='ctx'> 	{ USB_DEVICE(0x105b, 0xe065), .driver_info = BTUSB_BCM_PATCHRAM },</div><div class='ctx'> </div><div class='add'>+	/* Broadcom BCM920703 (HTC Vive) */</div><div class='add'>+	{ USB_VENDOR_AND_INTERFACE_INFO(0x0bb4, 0xff, 0x01, 0x01),</div><div class='add'>+	  .driver_info = BTUSB_BCM_PATCHRAM },</div><div class='add'>+</div><div class='ctx'> 	/* Foxconn - Hon Hai */</div><div class='ctx'> 	{ USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01),</div><div class='ctx'> 	  .driver_info = BTUSB_BCM_PATCHRAM },</div><div class='hunk'>@@ -154,6 +160,10 @@ static const struct usb_device_id btusb_table[] = {</div><div class='ctx'> 	{ USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01),</div><div class='ctx'> 	  .driver_info = BTUSB_BCM_PATCHRAM },</div><div class='ctx'> </div><div class='add'>+	/* Dell Computer - Broadcom based  */</div><div class='add'>+	{ USB_VENDOR_AND_INTERFACE_INFO(0x413c, 0xff, 0x01, 0x01),</div><div class='add'>+	  .driver_info = BTUSB_BCM_PATCHRAM },</div><div class='add'>+</div><div class='ctx'> 	/* Toshiba Corp - Broadcom based */</div><div class='ctx'> 	{ USB_VENDOR_AND_INTERFACE_INFO(0x0930, 0xff, 0x01, 0x01),</div><div class='ctx'> 	  .driver_info = BTUSB_BCM_PATCHRAM },</div><div class='hunk'>@@ -209,6 +219,7 @@ static const struct usb_device_id blacklist_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x04ca, 0x300f), .driver_info = BTUSB_ATH3012 },</div><div class='ctx'> 	{ USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 },</div><div class='ctx'> 	{ USB_DEVICE(0x04ca, 0x3014), .driver_info = BTUSB_ATH3012 },</div><div class='add'>+	{ USB_DEVICE(0x04ca, 0x3018), .driver_info = BTUSB_ATH3012 },</div><div class='ctx'> 	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },</div><div class='ctx'> 	{ USB_DEVICE(0x0930, 0x021c), .driver_info = BTUSB_ATH3012 },</div><div class='ctx'> 	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },</div><div class='hunk'>@@ -369,6 +380,7 @@ static const struct usb_device_id blacklist_table[] = {</div><div class='ctx'> #define BTUSB_BOOTING		9</div><div class='ctx'> #define BTUSB_RESET_RESUME	10</div><div class='ctx'> #define BTUSB_DIAG_RUNNING	11</div><div class='add'>+#define BTUSB_OOB_WAKE_ENABLED	12</div><div class='ctx'> </div><div class='ctx'> struct btusb_data {</div><div class='ctx'> 	struct hci_dev       *hdev;</div><div class='hunk'>@@ -416,6 +428,8 @@ struct btusb_data {</div><div class='ctx'> 	int (*recv_bulk)(struct btusb_data *data, void *buffer, int count);</div><div class='ctx'> </div><div class='ctx'> 	int (*setup_on_usb)(struct hci_dev *hdev);</div><div class='add'>+</div><div class='add'>+	int oob_wake_irq;   /* irq for out-of-band wake-on-bt */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void btusb_free_frags(struct btusb_data *data)</div><div class='hunk'>@@ -2338,6 +2352,50 @@ static int btusb_shutdown_intel(struct hci_dev *hdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+/* Configure an out-of-band gpio as wake-up pin, if specified in device tree */</div><div class='add'>+static int marvell_config_oob_wake(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct btusb_data *data = hci_get_drvdata(hdev);</div><div class='add'>+	struct device *dev = &amp;data-&gt;udev-&gt;dev;</div><div class='add'>+	u16 pin, gap, opcode;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 cmd[5];</div><div class='add'>+</div><div class='add'>+	/* Move on if no wakeup pin specified */</div><div class='add'>+	if (of_property_read_u16(dev-&gt;of_node, "marvell,wakeup-pin", &amp;pin) ||</div><div class='add'>+	    of_property_read_u16(dev-&gt;of_node, "marvell,wakeup-gap-ms", &amp;gap))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Vendor specific command to configure a GPIO as wake-up pin */</div><div class='add'>+	opcode = hci_opcode_pack(0x3F, 0x59);</div><div class='add'>+	cmd[0] = opcode &amp; 0xFF;</div><div class='add'>+	cmd[1] = opcode &gt;&gt; 8;</div><div class='add'>+	cmd[2] = 2; /* length of parameters that follow */</div><div class='add'>+	cmd[3] = pin;</div><div class='add'>+	cmd[4] = gap; /* time in ms, for which wakeup pin should be asserted */</div><div class='add'>+</div><div class='add'>+	skb = bt_skb_alloc(sizeof(cmd), GFP_KERNEL);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		bt_dev_err(hdev, "%s: No memory\n", __func__);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(skb_put(skb, sizeof(cmd)), cmd, sizeof(cmd));</div><div class='add'>+	hci_skb_pkt_type(skb) = HCI_COMMAND_PKT;</div><div class='add'>+</div><div class='add'>+	ret = btusb_send_frame(hdev, skb);</div><div class='add'>+	if (ret) {</div><div class='add'>+		bt_dev_err(hdev, "%s: configuration failed\n", __func__);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int btusb_set_bdaddr_marvell(struct hci_dev *hdev,</div><div class='ctx'> 				    const bdaddr_t *bdaddr)</div><div class='ctx'> {</div><div class='hunk'>@@ -2728,6 +2786,66 @@ static int btusb_bcm_set_diag(struct hci_dev *hdev, bool enable)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static irqreturn_t btusb_oob_wake_handler(int irq, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct btusb_data *data = priv;</div><div class='add'>+</div><div class='add'>+	pm_wakeup_event(&amp;data-&gt;udev-&gt;dev, 0);</div><div class='add'>+</div><div class='add'>+	/* Disable only if not already disabled (keep it balanced) */</div><div class='add'>+	if (test_and_clear_bit(BTUSB_OOB_WAKE_ENABLED, &amp;data-&gt;flags)) {</div><div class='add'>+		disable_irq_nosync(irq);</div><div class='add'>+		disable_irq_wake(irq);</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id btusb_match_table[] = {</div><div class='add'>+	{ .compatible = "usb1286,204e" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, btusb_match_table);</div><div class='add'>+</div><div class='add'>+/* Use an oob wakeup pin? */</div><div class='add'>+static int btusb_config_oob_wake(struct hci_dev *hdev)</div><div class='add'>+{</div><div class='add'>+	struct btusb_data *data = hci_get_drvdata(hdev);</div><div class='add'>+	struct device *dev = &amp;data-&gt;udev-&gt;dev;</div><div class='add'>+	int irq, ret;</div><div class='add'>+</div><div class='add'>+	clear_bit(BTUSB_OOB_WAKE_ENABLED, &amp;data-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (!of_match_device(btusb_match_table, dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Move on if no IRQ specified */</div><div class='add'>+	irq = of_irq_get_byname(dev-&gt;of_node, "wakeup");</div><div class='add'>+	if (irq &lt;= 0) {</div><div class='add'>+		bt_dev_dbg(hdev, "%s: no OOB Wakeup IRQ in DT", __func__);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = devm_request_irq(&amp;hdev-&gt;dev, irq, btusb_oob_wake_handler,</div><div class='add'>+			       0, "OOB Wake-on-BT", data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		bt_dev_err(hdev, "%s: IRQ request failed", __func__);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = device_init_wakeup(dev, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		bt_dev_err(hdev, "%s: failed to init_wakeup", __func__);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;oob_wake_irq = irq;</div><div class='add'>+	disable_irq(irq);</div><div class='add'>+	bt_dev_info(hdev, "OOB Wake-on-BT configured at IRQ %u", irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int btusb_probe(struct usb_interface *intf,</div><div class='ctx'> 		       const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -2849,6 +2967,18 @@ static int btusb_probe(struct usb_interface *intf,</div><div class='ctx'> 	hdev-&gt;send   = btusb_send_frame;</div><div class='ctx'> 	hdev-&gt;notify = btusb_notify;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	err = btusb_config_oob_wake(hdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_dev;</div><div class='add'>+</div><div class='add'>+	/* Marvell devices may need a specific chip configuration */</div><div class='add'>+	if (id-&gt;driver_info &amp; BTUSB_MARVELL &amp;&amp; data-&gt;oob_wake_irq) {</div><div class='add'>+		err = marvell_config_oob_wake(hdev);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_free_dev;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	if (id-&gt;driver_info &amp; BTUSB_CW6622)</div><div class='ctx'> 		set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY, &amp;hdev-&gt;quirks);</div><div class='ctx'> </div><div class='hunk'>@@ -2991,18 +3121,15 @@ static int btusb_probe(struct usb_interface *intf,</div><div class='ctx'> 		err = usb_set_interface(data-&gt;udev, 0, 0);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			BT_ERR("failed to set interface 0, alt 0 %d", err);</div><div class='del'>-			hci_free_dev(hdev);</div><div class='del'>-			return err;</div><div class='add'>+			goto out_free_dev;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;isoc) {</div><div class='ctx'> 		err = usb_driver_claim_interface(&amp;btusb_driver,</div><div class='ctx'> 						 data-&gt;isoc, data);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			hci_free_dev(hdev);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out_free_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BT_HCIBTUSB_BCM</div><div class='hunk'>@@ -3016,14 +3143,16 @@ static int btusb_probe(struct usb_interface *intf,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	err = hci_register_dev(hdev);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		hci_free_dev(hdev);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free_dev;</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_free_dev:</div><div class='add'>+	hci_free_dev(hdev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void btusb_disconnect(struct usb_interface *intf)</div><div class='hunk'>@@ -3062,6 +3191,9 @@ static void btusb_disconnect(struct usb_interface *intf)</div><div class='ctx'> 			usb_driver_release_interface(&amp;btusb_driver, data-&gt;isoc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (data-&gt;oob_wake_irq)</div><div class='add'>+		device_init_wakeup(&amp;data-&gt;udev-&gt;dev, false);</div><div class='add'>+</div><div class='ctx'> 	hci_free_dev(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3090,6 +3222,12 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)</div><div class='ctx'> 	btusb_stop_traffic(data);</div><div class='ctx'> 	usb_kill_anchored_urbs(&amp;data-&gt;tx_anchor);</div><div class='ctx'> </div><div class='add'>+	if (data-&gt;oob_wake_irq &amp;&amp; device_may_wakeup(&amp;data-&gt;udev-&gt;dev)) {</div><div class='add'>+		set_bit(BTUSB_OOB_WAKE_ENABLED, &amp;data-&gt;flags);</div><div class='add'>+		enable_irq_wake(data-&gt;oob_wake_irq);</div><div class='add'>+		enable_irq(data-&gt;oob_wake_irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Optionally request a device reset on resume, but only when</div><div class='ctx'> 	 * wakeups are disabled. If wakeups are enabled we assume the</div><div class='ctx'> 	 * device will stay powered up throughout suspend.</div><div class='hunk'>@@ -3127,6 +3265,12 @@ static int btusb_resume(struct usb_interface *intf)</div><div class='ctx'> 	if (--data-&gt;suspend_count)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* Disable only if not already disabled (keep it balanced) */</div><div class='add'>+	if (test_and_clear_bit(BTUSB_OOB_WAKE_ENABLED, &amp;data-&gt;flags)) {</div><div class='add'>+		disable_irq(data-&gt;oob_wake_irq);</div><div class='add'>+		disable_irq_wake(data-&gt;oob_wake_irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!test_bit(HCI_RUNNING, &amp;hdev-&gt;flags))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c<br/>index 8f6c23c20c52..5262a2077d7a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/hci_bcm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/hci_bcm.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/hci_bcm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/hci_bcm.c</a></div><div class='hunk'>@@ -618,14 +618,25 @@ unlock:</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static const struct acpi_gpio_params device_wakeup_gpios = { 0, 0, false };</div><div class='del'>-static const struct acpi_gpio_params shutdown_gpios = { 1, 0, false };</div><div class='del'>-static const struct acpi_gpio_params host_wakeup_gpios = { 2, 0, false };</div><div class='del'>-</div><div class='del'>-static const struct acpi_gpio_mapping acpi_bcm_default_gpios[] = {</div><div class='del'>-	{ "device-wakeup-gpios", &amp;device_wakeup_gpios, 1 },</div><div class='del'>-	{ "shutdown-gpios", &amp;shutdown_gpios, 1 },</div><div class='del'>-	{ "host-wakeup-gpios", &amp;host_wakeup_gpios, 1 },</div><div class='add'>+static const struct acpi_gpio_params int_last_device_wakeup_gpios = { 0, 0, false };</div><div class='add'>+static const struct acpi_gpio_params int_last_shutdown_gpios = { 1, 0, false };</div><div class='add'>+static const struct acpi_gpio_params int_last_host_wakeup_gpios = { 2, 0, false };</div><div class='add'>+</div><div class='add'>+static const struct acpi_gpio_mapping acpi_bcm_int_last_gpios[] = {</div><div class='add'>+	{ "device-wakeup-gpios", &amp;int_last_device_wakeup_gpios, 1 },</div><div class='add'>+	{ "shutdown-gpios", &amp;int_last_shutdown_gpios, 1 },</div><div class='add'>+	{ "host-wakeup-gpios", &amp;int_last_host_wakeup_gpios, 1 },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct acpi_gpio_params int_first_host_wakeup_gpios = { 0, 0, false };</div><div class='add'>+static const struct acpi_gpio_params int_first_device_wakeup_gpios = { 1, 0, false };</div><div class='add'>+static const struct acpi_gpio_params int_first_shutdown_gpios = { 2, 0, false };</div><div class='add'>+</div><div class='add'>+static const struct acpi_gpio_mapping acpi_bcm_int_first_gpios[] = {</div><div class='add'>+	{ "device-wakeup-gpios", &amp;int_first_device_wakeup_gpios, 1 },</div><div class='add'>+	{ "shutdown-gpios", &amp;int_first_shutdown_gpios, 1 },</div><div class='add'>+	{ "host-wakeup-gpios", &amp;int_first_host_wakeup_gpios, 1 },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -692,12 +703,19 @@ static int bcm_acpi_probe(struct bcm_device *dev)</div><div class='ctx'> 	struct platform_device *pdev = dev-&gt;pdev;</div><div class='ctx'> 	LIST_HEAD(resources);</div><div class='ctx'> 	const struct dmi_system_id *dmi_id;</div><div class='add'>+	const struct acpi_gpio_mapping *gpio_mapping = acpi_bcm_int_last_gpios;</div><div class='add'>+	const struct acpi_device_id *id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Retrieve GPIO data */</div><div class='ctx'> 	dev-&gt;name = dev_name(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* Retrieve GPIO data */</div><div class='add'>+	id = acpi_match_device(pdev-&gt;dev.driver-&gt;acpi_match_table, &amp;pdev-&gt;dev);</div><div class='add'>+	if (id)</div><div class='add'>+		gpio_mapping = (const struct acpi_gpio_mapping *) id-&gt;driver_data;</div><div class='add'>+</div><div class='ctx'> 	ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(&amp;pdev-&gt;dev),</div><div class='del'>-					acpi_bcm_default_gpios);</div><div class='add'>+					gpio_mapping);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -822,20 +840,22 @@ static const struct hci_uart_proto bcm_proto = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> static const struct acpi_device_id bcm_acpi_match[] = {</div><div class='del'>-	{ "BCM2E1A", 0 },</div><div class='del'>-	{ "BCM2E39", 0 },</div><div class='del'>-	{ "BCM2E3A", 0 },</div><div class='del'>-	{ "BCM2E3D", 0 },</div><div class='del'>-	{ "BCM2E3F", 0 },</div><div class='del'>-	{ "BCM2E40", 0 },</div><div class='del'>-	{ "BCM2E54", 0 },</div><div class='del'>-	{ "BCM2E55", 0 },</div><div class='del'>-	{ "BCM2E64", 0 },</div><div class='del'>-	{ "BCM2E65", 0 },</div><div class='del'>-	{ "BCM2E67", 0 },</div><div class='del'>-	{ "BCM2E71", 0 },</div><div class='del'>-	{ "BCM2E7B", 0 },</div><div class='del'>-	{ "BCM2E7C", 0 },</div><div class='add'>+	{ "BCM2E1A", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E39", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E3A", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E3D", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E3F", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E40", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E54", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E55", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E64", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E65", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E67", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E71", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E7B", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E7C", (kernel_ulong_t)&amp;acpi_bcm_int_last_gpios },</div><div class='add'>+	{ "BCM2E95", (kernel_ulong_t)&amp;acpi_bcm_int_first_gpios },</div><div class='add'>+	{ "BCM2E96", (kernel_ulong_t)&amp;acpi_bcm_int_first_gpios },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(acpi, bcm_acpi_match);</div><div class='head'>diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c<br/>index a2c921faaa12..910ec968f022 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/hci_bcsp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/hci_bcsp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/hci_bcsp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/hci_bcsp.c</a></div><div class='hunk'>@@ -733,9 +733,7 @@ static int bcsp_open(struct hci_uart *hu)</div><div class='ctx'> 	skb_queue_head_init(&amp;bcsp-&gt;rel);</div><div class='ctx'> 	skb_queue_head_init(&amp;bcsp-&gt;unrel);</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;bcsp-&gt;tbcsp);</div><div class='del'>-	bcsp-&gt;tbcsp.function = bcsp_timed_event;</div><div class='del'>-	bcsp-&gt;tbcsp.data     = (u_long)hu;</div><div class='add'>+	setup_timer(&amp;bcsp-&gt;tbcsp, bcsp_timed_event, (u_long)hu);</div><div class='ctx'> </div><div class='ctx'> 	bcsp-&gt;rx_state = BCSP_W4_PKT_DELIMITER;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c<br/>index 0879d64b1caf..90d0456b6744 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/hci_h5.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/hci_h5.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/hci_h5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/hci_h5.c</a></div><div class='hunk'>@@ -204,9 +204,7 @@ static int h5_open(struct hci_uart *hu)</div><div class='ctx'> </div><div class='ctx'> 	h5_reset_rx(h5);</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;h5-&gt;timer);</div><div class='del'>-	h5-&gt;timer.function = h5_timed_event;</div><div class='del'>-	h5-&gt;timer.data = (unsigned long)hu;</div><div class='add'>+	setup_timer(&amp;h5-&gt;timer, h5_timed_event, (unsigned long)hu);</div><div class='ctx'> </div><div class='ctx'> 	h5-&gt;tx_win = H5_TX_WIN_MAX;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c<br/>index 6c867fbc56a7..f242dfd0c2e2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/hci_qca.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/hci_qca.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/hci_qca.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/hci_qca.c</a></div><div class='hunk'>@@ -335,7 +335,7 @@ static void hci_ibs_tx_idle_timeout(unsigned long arg)</div><div class='ctx'> 		/* Fall through */</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		BT_ERR("Spurrious timeout tx state %d", qca-&gt;tx_ibs_state);</div><div class='add'>+		BT_ERR("Spurious timeout tx state %d", qca-&gt;tx_ibs_state);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -373,7 +373,7 @@ static void hci_ibs_wake_retrans_timeout(unsigned long arg)</div><div class='ctx'> 		/* Fall through */</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		BT_ERR("Spurrious timeout tx state %d", qca-&gt;tx_ibs_state);</div><div class='add'>+		BT_ERR("Spurious timeout tx state %d", qca-&gt;tx_ibs_state);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -438,14 +438,11 @@ static int qca_open(struct hci_uart *hu)</div><div class='ctx'> </div><div class='ctx'> 	hu-&gt;priv = qca;</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;qca-&gt;wake_retrans_timer);</div><div class='del'>-	qca-&gt;wake_retrans_timer.function = hci_ibs_wake_retrans_timeout;</div><div class='del'>-	qca-&gt;wake_retrans_timer.data = (u_long)hu;</div><div class='add'>+	setup_timer(&amp;qca-&gt;wake_retrans_timer, hci_ibs_wake_retrans_timeout,</div><div class='add'>+		    (u_long)hu);</div><div class='ctx'> 	qca-&gt;wake_retrans = IBS_WAKE_RETRANS_TIMEOUT_MS;</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;qca-&gt;tx_idle_timer);</div><div class='del'>-	qca-&gt;tx_idle_timer.function = hci_ibs_tx_idle_timeout;</div><div class='del'>-	qca-&gt;tx_idle_timer.data = (u_long)hu;</div><div class='add'>+	setup_timer(&amp;qca-&gt;tx_idle_timer, hci_ibs_tx_idle_timeout, (u_long)hu);</div><div class='ctx'> 	qca-&gt;tx_idle_delay = IBS_TX_IDLE_TIMEOUT_MS;</div><div class='ctx'> </div><div class='ctx'> 	BT_DBG("HCI_UART_QCA open, tx_idle_delay=%u, wake_retrans=%u",</div><div class='head'>diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c<br/>index c4a75a18dcae..233e850fdac7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bluetooth/hci_vhci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bluetooth/hci_vhci.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bluetooth/hci_vhci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bluetooth/hci_vhci.c</a></div><div class='hunk'>@@ -181,7 +181,7 @@ static inline ssize_t vhci_get_user(struct vhci_data *data,</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_iter(skb_put(skb, len), len, from) != len) {</div><div class='add'>+	if (!copy_from_iter_full(skb_put(skb, len), len, from)) {</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig<br/>index 78751057164a..0a52da439abf 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bus/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bus/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bus/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/Kconfig</a></div><div class='hunk'>@@ -112,6 +112,7 @@ config QCOM_EBI2</div><div class='ctx'> 	bool "Qualcomm External Bus Interface 2 (EBI2)"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	depends on ARCH_QCOM || COMPILE_TEST</div><div class='add'>+	default ARCH_QCOM</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say y here to enable support for the Qualcomm External Bus</div><div class='ctx'> 	  Interface 2, which can be used to connect things like NAND Flash,</div><div class='hunk'>@@ -150,6 +151,13 @@ config TEGRA_ACONNECT</div><div class='ctx'> 	  Driver for the Tegra ACONNECT bus which is used to interface with</div><div class='ctx'> 	  the devices inside the Audio Processing Engine (APE) for Tegra210.</div><div class='ctx'> </div><div class='add'>+config TEGRA_GMI</div><div class='add'>+	tristate "Tegra Generic Memory Interface bus driver"</div><div class='add'>+	depends on ARCH_TEGRA</div><div class='add'>+	help</div><div class='add'>+	  Driver for the Tegra Generic Memory Interface bus which can be used</div><div class='add'>+	  to attach devices such as NOR, UART, FPGA and more.</div><div class='add'>+</div><div class='ctx'> config UNIPHIER_SYSTEM_BUS</div><div class='ctx'> 	tristate "UniPhier System Bus driver"</div><div class='ctx'> 	depends on ARCH_UNIPHIER &amp;&amp; OF</div><div class='hunk'>@@ -167,4 +175,13 @@ config VEXPRESS_CONFIG</div><div class='ctx'> 	help</div><div class='ctx'> 	  Platform configuration infrastructure for the ARM Ltd.</div><div class='ctx'> 	  Versatile Express.</div><div class='add'>+</div><div class='add'>+config DA8XX_MSTPRI</div><div class='add'>+	bool "TI da8xx master peripheral priority driver"</div><div class='add'>+	depends on ARCH_DAVINCI_DA8XX</div><div class='add'>+	help</div><div class='add'>+	  Driver for Texas Instruments da8xx master peripheral priority</div><div class='add'>+	  configuration. Allows to adjust the priorities of all master</div><div class='add'>+	  peripherals.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile<br/>index c6cfa6b2606e..cc6364bec054 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bus/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bus/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bus/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/Makefile</a></div><div class='hunk'>@@ -19,5 +19,8 @@ obj-$(CONFIG_QCOM_EBI2)		+= qcom-ebi2.o</div><div class='ctx'> obj-$(CONFIG_SUNXI_RSB)		+= sunxi-rsb.o</div><div class='ctx'> obj-$(CONFIG_SIMPLE_PM_BUS)	+= simple-pm-bus.o</div><div class='ctx'> obj-$(CONFIG_TEGRA_ACONNECT)	+= tegra-aconnect.o</div><div class='add'>+obj-$(CONFIG_TEGRA_GMI)		+= tegra-gmi.o</div><div class='ctx'> obj-$(CONFIG_UNIPHIER_SYSTEM_BUS)	+= uniphier-system-bus.o</div><div class='ctx'> obj-$(CONFIG_VEXPRESS_CONFIG)	+= vexpress-config.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_DA8XX_MSTPRI)	+= da8xx-mstpri.o</div><div class='head'>diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c<br/>index 890082315054..c49da15d9790 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bus/arm-cci.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bus/arm-cci.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bus/arm-cci.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/arm-cci.c</a></div><div class='hunk'>@@ -1796,7 +1796,7 @@ static int __init cci_platform_init(void)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = cpuhp_setup_state_multi(CPUHP_AP_PERF_ARM_CCI_ONLINE,</div><div class='del'>-				      "AP_PERF_ARM_CCI_ONLINE", NULL,</div><div class='add'>+				      "perf/arm/cci:online", NULL,</div><div class='ctx'> 				      cci_pmu_offline_cpu);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2190,6 +2190,9 @@ static int cci_probe_ports(struct device_node *np)</div><div class='ctx'> 		if (!of_match_node(arm_cci_ctrl_if_matches, cp))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		if (!of_device_is_available(cp))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		i = nb_ace + nb_ace_lite;</div><div class='ctx'> </div><div class='ctx'> 		if (i &gt;= nb_cci_ports)</div><div class='hunk'>@@ -2232,6 +2235,13 @@ static int cci_probe_ports(struct device_node *np)</div><div class='ctx'> 		ports[i].dn = cp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If there is no CCI port that is under kernel control</div><div class='add'>+	 * return early and report probe status.</div><div class='add'>+	 */</div><div class='add'>+	if (!nb_ace &amp;&amp; !nb_ace_lite)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	 /* initialize a stashed array of ACE ports to speed-up look-up */</div><div class='ctx'> 	cci_ace_init_ports();</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c<br/>index d1074d9b38ba..4d6a2b7e4d3f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bus/arm-ccn.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bus/arm-ccn.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bus/arm-ccn.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/arm-ccn.c</a></div><div class='hunk'>@@ -1562,7 +1562,7 @@ static int __init arm_ccn_init(void)</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = cpuhp_setup_state_multi(CPUHP_AP_PERF_ARM_CCN_ONLINE,</div><div class='del'>-				      "AP_PERF_ARM_CCN_ONLINE", NULL,</div><div class='add'>+				      "perf/arm/ccn:online", NULL,</div><div class='ctx'> 				      arm_ccn_pmu_offline_cpu);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1570,7 +1570,10 @@ static int __init arm_ccn_init(void)</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(arm_ccn_pmu_events); i++)</div><div class='ctx'> 		arm_ccn_pmu_events_attrs[i] = &amp;arm_ccn_pmu_events[i].attr.attr;</div><div class='ctx'> </div><div class='del'>-	return platform_driver_register(&amp;arm_ccn_driver);</div><div class='add'>+	ret = platform_driver_register(&amp;arm_ccn_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		cpuhp_remove_multi_state(CPUHP_AP_PERF_ARM_CCN_ONLINE);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit arm_ccn_exit(void)</div><div class='head'>diff --git a/drivers/bus/da8xx-mstpri.c b/drivers/bus/da8xx-mstpri.c<br/>new file mode 100644<br/>index 000000000000..9af9bcc68059<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/bus/da8xx-mstpri.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/da8xx-mstpri.c</a></div><div class='hunk'>@@ -0,0 +1,267 @@</div><div class='add'>+/*</div><div class='add'>+ * TI da8xx master peripheral priority driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 BayLibre SAS</div><div class='add'>+ *</div><div class='add'>+ * Author:</div><div class='add'>+ *   Bartosz Golaszewski &lt;bgolaszewski@baylibre.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * REVISIT: Linux doesn't have a good framework for the kind of performance</div><div class='add'>+ * knobs this driver controls. We can't use device tree properties as it deals</div><div class='add'>+ * with hardware configuration rather than description. We also don't want to</div><div class='add'>+ * commit to maintaining some random sysfs attributes.</div><div class='add'>+ *</div><div class='add'>+ * For now we just hardcode the register values for the boards that need</div><div class='add'>+ * some changes (as is the case for the LCD controller on da850-lcdk - the</div><div class='add'>+ * first board we support here). When linux gets an appropriate framework,</div><div class='add'>+ * we'll easily convert the driver to it.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define DA8XX_MSTPRI0_OFFSET		0</div><div class='add'>+#define DA8XX_MSTPRI1_OFFSET		4</div><div class='add'>+#define DA8XX_MSTPRI2_OFFSET		8</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	DA8XX_MSTPRI_ARM_I = 0,</div><div class='add'>+	DA8XX_MSTPRI_ARM_D,</div><div class='add'>+	DA8XX_MSTPRI_UPP,</div><div class='add'>+	DA8XX_MSTPRI_SATA,</div><div class='add'>+	DA8XX_MSTPRI_PRU0,</div><div class='add'>+	DA8XX_MSTPRI_PRU1,</div><div class='add'>+	DA8XX_MSTPRI_EDMA30TC0,</div><div class='add'>+	DA8XX_MSTPRI_EDMA30TC1,</div><div class='add'>+	DA8XX_MSTPRI_EDMA31TC0,</div><div class='add'>+	DA8XX_MSTPRI_VPIF_DMA_0,</div><div class='add'>+	DA8XX_MSTPRI_VPIF_DMA_1,</div><div class='add'>+	DA8XX_MSTPRI_EMAC,</div><div class='add'>+	DA8XX_MSTPRI_USB0CFG,</div><div class='add'>+	DA8XX_MSTPRI_USB0CDMA,</div><div class='add'>+	DA8XX_MSTPRI_UHPI,</div><div class='add'>+	DA8XX_MSTPRI_USB1,</div><div class='add'>+	DA8XX_MSTPRI_LCDC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct da8xx_mstpri_descr {</div><div class='add'>+	int reg;</div><div class='add'>+	int shift;</div><div class='add'>+	int mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct da8xx_mstpri_descr da8xx_mstpri_priority_list[] = {</div><div class='add'>+	[DA8XX_MSTPRI_ARM_I] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI0_OFFSET,</div><div class='add'>+		.shift = 0,</div><div class='add'>+		.mask = 0x0000000f,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_ARM_D] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI0_OFFSET,</div><div class='add'>+		.shift = 4,</div><div class='add'>+		.mask = 0x000000f0,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_UPP] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI0_OFFSET,</div><div class='add'>+		.shift = 16,</div><div class='add'>+		.mask = 0x000f0000,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_SATA] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI0_OFFSET,</div><div class='add'>+		.shift = 20,</div><div class='add'>+		.mask = 0x00f00000,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_PRU0] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI1_OFFSET,</div><div class='add'>+		.shift = 0,</div><div class='add'>+		.mask = 0x0000000f,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_PRU1] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI1_OFFSET,</div><div class='add'>+		.shift = 4,</div><div class='add'>+		.mask = 0x000000f0,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_EDMA30TC0] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI1_OFFSET,</div><div class='add'>+		.shift = 8,</div><div class='add'>+		.mask = 0x00000f00,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_EDMA30TC1] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI1_OFFSET,</div><div class='add'>+		.shift = 12,</div><div class='add'>+		.mask = 0x0000f000,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_EDMA31TC0] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI1_OFFSET,</div><div class='add'>+		.shift = 16,</div><div class='add'>+		.mask = 0x000f0000,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_VPIF_DMA_0] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI1_OFFSET,</div><div class='add'>+		.shift = 24,</div><div class='add'>+		.mask = 0x0f000000,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_VPIF_DMA_1] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI1_OFFSET,</div><div class='add'>+		.shift = 28,</div><div class='add'>+		.mask = 0xf0000000,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_EMAC] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI2_OFFSET,</div><div class='add'>+		.shift = 0,</div><div class='add'>+		.mask = 0x0000000f,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_USB0CFG] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI2_OFFSET,</div><div class='add'>+		.shift = 8,</div><div class='add'>+		.mask = 0x00000f00,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_USB0CDMA] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI2_OFFSET,</div><div class='add'>+		.shift = 12,</div><div class='add'>+		.mask = 0x0000f000,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_UHPI] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI2_OFFSET,</div><div class='add'>+		.shift = 20,</div><div class='add'>+		.mask = 0x00f00000,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_USB1] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI2_OFFSET,</div><div class='add'>+		.shift = 24,</div><div class='add'>+		.mask = 0x0f000000,</div><div class='add'>+	},</div><div class='add'>+	[DA8XX_MSTPRI_LCDC] = {</div><div class='add'>+		.reg = DA8XX_MSTPRI2_OFFSET,</div><div class='add'>+		.shift = 28,</div><div class='add'>+		.mask = 0xf0000000,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct da8xx_mstpri_priority {</div><div class='add'>+	int which;</div><div class='add'>+	u32 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct da8xx_mstpri_board_priorities {</div><div class='add'>+	const char *board;</div><div class='add'>+	const struct da8xx_mstpri_priority *priorities;</div><div class='add'>+	size_t numprio;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default memory settings of da850 do not meet the throughput/latency</div><div class='add'>+ * requirements of tilcdc. This results in the image displayed being</div><div class='add'>+ * incorrect and the following warning being displayed by the LCDC</div><div class='add'>+ * drm driver:</div><div class='add'>+ *</div><div class='add'>+ *   tilcdc da8xx_lcdc.0: tilcdc_crtc_irq(0x00000020): FIFO underfow</div><div class='add'>+ */</div><div class='add'>+static const struct da8xx_mstpri_priority da850_lcdk_priorities[] = {</div><div class='add'>+	{</div><div class='add'>+		.which = DA8XX_MSTPRI_LCDC,</div><div class='add'>+		.val = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.which = DA8XX_MSTPRI_EDMA30TC1,</div><div class='add'>+		.val = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.which = DA8XX_MSTPRI_EDMA30TC0,</div><div class='add'>+		.val = 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct da8xx_mstpri_board_priorities da8xx_mstpri_board_confs[] = {</div><div class='add'>+	{</div><div class='add'>+		.board = "ti,da850-lcdk",</div><div class='add'>+		.priorities = da850_lcdk_priorities,</div><div class='add'>+		.numprio = ARRAY_SIZE(da850_lcdk_priorities),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct da8xx_mstpri_board_priorities *</div><div class='add'>+da8xx_mstpri_get_board_prio(void)</div><div class='add'>+{</div><div class='add'>+	const struct da8xx_mstpri_board_priorities *board_prio;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(da8xx_mstpri_board_confs); i++) {</div><div class='add'>+		board_prio = &amp;da8xx_mstpri_board_confs[i];</div><div class='add'>+</div><div class='add'>+		if (of_machine_is_compatible(board_prio-&gt;board))</div><div class='add'>+			return board_prio;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da8xx_mstpri_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	const struct da8xx_mstpri_board_priorities *prio_list;</div><div class='add'>+	const struct da8xx_mstpri_descr *prio_descr;</div><div class='add'>+	const struct da8xx_mstpri_priority *prio;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	void __iomem *mstpri;</div><div class='add'>+	u32 reg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	mstpri = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(mstpri)) {</div><div class='add'>+		dev_err(dev, "unable to map MSTPRI registers\n");</div><div class='add'>+		return PTR_ERR(mstpri);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prio_list = da8xx_mstpri_get_board_prio();</div><div class='add'>+	if (!prio_list) {</div><div class='add'>+		dev_err(dev, "no master priorities defined for this board\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; prio_list-&gt;numprio; i++) {</div><div class='add'>+		prio = &amp;prio_list-&gt;priorities[i];</div><div class='add'>+		prio_descr = &amp;da8xx_mstpri_priority_list[prio-&gt;which];</div><div class='add'>+</div><div class='add'>+		if (prio_descr-&gt;reg + sizeof(u32) &gt; resource_size(res)) {</div><div class='add'>+			dev_warn(dev, "register offset out of range\n");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		reg = readl(mstpri + prio_descr-&gt;reg);</div><div class='add'>+		reg &amp;= ~prio_descr-&gt;mask;</div><div class='add'>+		reg |= prio-&gt;val &lt;&lt; prio_descr-&gt;shift;</div><div class='add'>+</div><div class='add'>+		writel(reg, mstpri + prio_descr-&gt;reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id da8xx_mstpri_of_match[] = {</div><div class='add'>+	{ .compatible = "ti,da850-mstpri", },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver da8xx_mstpri_driver = {</div><div class='add'>+	.probe = da8xx_mstpri_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "da8xx-mstpri",</div><div class='add'>+		.of_match_table = da8xx_mstpri_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(da8xx_mstpri_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Bartosz Golaszewski &lt;bgolaszewski@baylibre.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("TI da8xx master peripheral priority driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/bus/tegra-gmi.c b/drivers/bus/tegra-gmi.c<br/>new file mode 100644<br/>index 000000000000..a6570789f7af<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/bus/tegra-gmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/tegra-gmi.c</a></div><div class='hunk'>@@ -0,0 +1,284 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for NVIDIA Generic Memory Interface</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Host Mobility AB. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2. This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+</div><div class='add'>+#define TEGRA_GMI_CONFIG		0x00</div><div class='add'>+#define TEGRA_GMI_CONFIG_GO		BIT(31)</div><div class='add'>+#define TEGRA_GMI_BUS_WIDTH_32BIT	BIT(30)</div><div class='add'>+#define TEGRA_GMI_MUX_MODE		BIT(28)</div><div class='add'>+#define TEGRA_GMI_RDY_BEFORE_DATA	BIT(24)</div><div class='add'>+#define TEGRA_GMI_RDY_ACTIVE_HIGH	BIT(23)</div><div class='add'>+#define TEGRA_GMI_ADV_ACTIVE_HIGH	BIT(22)</div><div class='add'>+#define TEGRA_GMI_OE_ACTIVE_HIGH	BIT(21)</div><div class='add'>+#define TEGRA_GMI_CS_ACTIVE_HIGH	BIT(20)</div><div class='add'>+#define TEGRA_GMI_CS_SELECT(x)		((x &amp; 0x7) &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+#define TEGRA_GMI_TIMING0		0x10</div><div class='add'>+#define TEGRA_GMI_MUXED_WIDTH(x)	((x &amp; 0xf) &lt;&lt; 12)</div><div class='add'>+#define TEGRA_GMI_HOLD_WIDTH(x)		((x &amp; 0xf) &lt;&lt; 8)</div><div class='add'>+#define TEGRA_GMI_ADV_WIDTH(x)		((x &amp; 0xf) &lt;&lt; 4)</div><div class='add'>+#define TEGRA_GMI_CE_WIDTH(x)		(x &amp; 0xf)</div><div class='add'>+</div><div class='add'>+#define TEGRA_GMI_TIMING1		0x14</div><div class='add'>+#define TEGRA_GMI_WE_WIDTH(x)		((x &amp; 0xff) &lt;&lt; 16)</div><div class='add'>+#define TEGRA_GMI_OE_WIDTH(x)		((x &amp; 0xff) &lt;&lt; 8)</div><div class='add'>+#define TEGRA_GMI_WAIT_WIDTH(x)		(x &amp; 0xff)</div><div class='add'>+</div><div class='add'>+#define TEGRA_GMI_MAX_CHIP_SELECT	8</div><div class='add'>+</div><div class='add'>+struct tegra_gmi {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	struct reset_control *rst;</div><div class='add'>+</div><div class='add'>+	u32 snor_config;</div><div class='add'>+	u32 snor_timing0;</div><div class='add'>+	u32 snor_timing1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tegra_gmi_enable(struct tegra_gmi *gmi)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = clk_prepare_enable(gmi-&gt;clk);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(gmi-&gt;dev, "failed to enable clock: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reset_control_assert(gmi-&gt;rst);</div><div class='add'>+	usleep_range(2000, 4000);</div><div class='add'>+	reset_control_deassert(gmi-&gt;rst);</div><div class='add'>+</div><div class='add'>+	writel(gmi-&gt;snor_timing0, gmi-&gt;base + TEGRA_GMI_TIMING0);</div><div class='add'>+	writel(gmi-&gt;snor_timing1, gmi-&gt;base + TEGRA_GMI_TIMING1);</div><div class='add'>+</div><div class='add'>+	gmi-&gt;snor_config |= TEGRA_GMI_CONFIG_GO;</div><div class='add'>+	writel(gmi-&gt;snor_config, gmi-&gt;base + TEGRA_GMI_CONFIG);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra_gmi_disable(struct tegra_gmi *gmi)</div><div class='add'>+{</div><div class='add'>+	u32 config;</div><div class='add'>+</div><div class='add'>+	/* stop GMI operation */</div><div class='add'>+	config = readl(gmi-&gt;base + TEGRA_GMI_CONFIG);</div><div class='add'>+	config &amp;= ~TEGRA_GMI_CONFIG_GO;</div><div class='add'>+	writel(config, gmi-&gt;base + TEGRA_GMI_CONFIG);</div><div class='add'>+</div><div class='add'>+	reset_control_assert(gmi-&gt;rst);</div><div class='add'>+	clk_disable_unprepare(gmi-&gt;clk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_gmi_parse_dt(struct tegra_gmi *gmi)</div><div class='add'>+{</div><div class='add'>+	struct device_node *child;</div><div class='add'>+	u32 property, ranges[4];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	child = of_get_next_available_child(gmi-&gt;dev-&gt;of_node, NULL);</div><div class='add'>+	if (!child) {</div><div class='add'>+		dev_err(gmi-&gt;dev, "no child nodes found\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We currently only support one child device due to lack of</div><div class='add'>+	 * chip-select address decoding. Which means that we only have one</div><div class='add'>+	 * chip-select line from the GMI controller.</div><div class='add'>+	 */</div><div class='add'>+	if (of_get_child_count(gmi-&gt;dev-&gt;of_node) &gt; 1)</div><div class='add'>+		dev_warn(gmi-&gt;dev, "only one child device is supported.");</div><div class='add'>+</div><div class='add'>+	if (of_property_read_bool(child, "nvidia,snor-data-width-32bit"))</div><div class='add'>+		gmi-&gt;snor_config |= TEGRA_GMI_BUS_WIDTH_32BIT;</div><div class='add'>+</div><div class='add'>+	if (of_property_read_bool(child, "nvidia,snor-mux-mode"))</div><div class='add'>+		gmi-&gt;snor_config |= TEGRA_GMI_MUX_MODE;</div><div class='add'>+</div><div class='add'>+	if (of_property_read_bool(child, "nvidia,snor-rdy-active-before-data"))</div><div class='add'>+		gmi-&gt;snor_config |= TEGRA_GMI_RDY_BEFORE_DATA;</div><div class='add'>+</div><div class='add'>+	if (of_property_read_bool(child, "nvidia,snor-rdy-active-high"))</div><div class='add'>+		gmi-&gt;snor_config |= TEGRA_GMI_RDY_ACTIVE_HIGH;</div><div class='add'>+</div><div class='add'>+	if (of_property_read_bool(child, "nvidia,snor-adv-active-high"))</div><div class='add'>+		gmi-&gt;snor_config |= TEGRA_GMI_ADV_ACTIVE_HIGH;</div><div class='add'>+</div><div class='add'>+	if (of_property_read_bool(child, "nvidia,snor-oe-active-high"))</div><div class='add'>+		gmi-&gt;snor_config |= TEGRA_GMI_OE_ACTIVE_HIGH;</div><div class='add'>+</div><div class='add'>+	if (of_property_read_bool(child, "nvidia,snor-cs-active-high"))</div><div class='add'>+		gmi-&gt;snor_config |= TEGRA_GMI_CS_ACTIVE_HIGH;</div><div class='add'>+</div><div class='add'>+	/* Decode the CS# */</div><div class='add'>+	err = of_property_read_u32_array(child, "ranges", ranges, 4);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		/* Invalid binding */</div><div class='add'>+		if (err == -EOVERFLOW) {</div><div class='add'>+			dev_err(gmi-&gt;dev,</div><div class='add'>+				"failed to decode CS: invalid ranges length\n");</div><div class='add'>+			goto error_cs;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If we reach here it means that the child node has an empty</div><div class='add'>+		 * ranges or it does not exist at all. Attempt to decode the</div><div class='add'>+		 * CS# from the reg property instead.</div><div class='add'>+		 */</div><div class='add'>+		err = of_property_read_u32(child, "reg", &amp;property);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(gmi-&gt;dev,</div><div class='add'>+				"failed to decode CS: no reg property found\n");</div><div class='add'>+			goto error_cs;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		property = ranges[1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Valid chip selects are CS0-CS7 */</div><div class='add'>+	if (property &gt;= TEGRA_GMI_MAX_CHIP_SELECT) {</div><div class='add'>+		dev_err(gmi-&gt;dev, "invalid chip select: %d", property);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto error_cs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gmi-&gt;snor_config |= TEGRA_GMI_CS_SELECT(property);</div><div class='add'>+</div><div class='add'>+	/* The default values that are provided below are reset values */</div><div class='add'>+	if (!of_property_read_u32(child, "nvidia,snor-muxed-width", &amp;property))</div><div class='add'>+		gmi-&gt;snor_timing0 |= TEGRA_GMI_MUXED_WIDTH(property);</div><div class='add'>+	else</div><div class='add'>+		gmi-&gt;snor_timing0 |= TEGRA_GMI_MUXED_WIDTH(1);</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(child, "nvidia,snor-hold-width", &amp;property))</div><div class='add'>+		gmi-&gt;snor_timing0 |= TEGRA_GMI_HOLD_WIDTH(property);</div><div class='add'>+	else</div><div class='add'>+		gmi-&gt;snor_timing0 |= TEGRA_GMI_HOLD_WIDTH(1);</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(child, "nvidia,snor-adv-width", &amp;property))</div><div class='add'>+		gmi-&gt;snor_timing0 |= TEGRA_GMI_ADV_WIDTH(property);</div><div class='add'>+	else</div><div class='add'>+		gmi-&gt;snor_timing0 |= TEGRA_GMI_ADV_WIDTH(1);</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(child, "nvidia,snor-ce-width", &amp;property))</div><div class='add'>+		gmi-&gt;snor_timing0 |= TEGRA_GMI_CE_WIDTH(property);</div><div class='add'>+	else</div><div class='add'>+		gmi-&gt;snor_timing0 |= TEGRA_GMI_CE_WIDTH(4);</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(child, "nvidia,snor-we-width", &amp;property))</div><div class='add'>+		gmi-&gt;snor_timing1 |= TEGRA_GMI_WE_WIDTH(property);</div><div class='add'>+	else</div><div class='add'>+		gmi-&gt;snor_timing1 |= TEGRA_GMI_WE_WIDTH(1);</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(child, "nvidia,snor-oe-width", &amp;property))</div><div class='add'>+		gmi-&gt;snor_timing1 |= TEGRA_GMI_OE_WIDTH(property);</div><div class='add'>+	else</div><div class='add'>+		gmi-&gt;snor_timing1 |= TEGRA_GMI_OE_WIDTH(1);</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(child, "nvidia,snor-wait-width", &amp;property))</div><div class='add'>+		gmi-&gt;snor_timing1 |= TEGRA_GMI_WAIT_WIDTH(property);</div><div class='add'>+	else</div><div class='add'>+		gmi-&gt;snor_timing1 |= TEGRA_GMI_WAIT_WIDTH(3);</div><div class='add'>+</div><div class='add'>+error_cs:</div><div class='add'>+	of_node_put(child);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_gmi_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct tegra_gmi *gmi;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	gmi = devm_kzalloc(dev, sizeof(*gmi), GFP_KERNEL);</div><div class='add'>+	if (!gmi)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	gmi-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	gmi-&gt;base = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(gmi-&gt;base))</div><div class='add'>+		return PTR_ERR(gmi-&gt;base);</div><div class='add'>+</div><div class='add'>+	gmi-&gt;clk = devm_clk_get(dev, "gmi");</div><div class='add'>+	if (IS_ERR(gmi-&gt;clk)) {</div><div class='add'>+		dev_err(dev, "can not get clock\n");</div><div class='add'>+		return PTR_ERR(gmi-&gt;clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gmi-&gt;rst = devm_reset_control_get(dev, "gmi");</div><div class='add'>+	if (IS_ERR(gmi-&gt;rst)) {</div><div class='add'>+		dev_err(dev, "can not get reset\n");</div><div class='add'>+		return PTR_ERR(gmi-&gt;rst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = tegra_gmi_parse_dt(gmi);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = tegra_gmi_enable(gmi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = of_platform_default_populate(dev-&gt;of_node, NULL, dev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev, "fail to create devices.\n");</div><div class='add'>+		tegra_gmi_disable(gmi);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, gmi);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_gmi_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct tegra_gmi *gmi = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	of_platform_depopulate(gmi-&gt;dev);</div><div class='add'>+	tegra_gmi_disable(gmi);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id tegra_gmi_id_table[] = {</div><div class='add'>+	{ .compatible = "nvidia,tegra20-gmi", },</div><div class='add'>+	{ .compatible = "nvidia,tegra30-gmi", },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, tegra_gmi_id_table);</div><div class='add'>+</div><div class='add'>+static struct platform_driver tegra_gmi_driver = {</div><div class='add'>+	.probe = tegra_gmi_probe,</div><div class='add'>+	.remove = tegra_gmi_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		= "tegra-gmi",</div><div class='add'>+		.of_match_table	= tegra_gmi_id_table,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(tegra_gmi_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Mirza Krak &lt;mirza.krak@gmail.com");</div><div class='add'>+MODULE_DESCRIPTION("NVIDIA Tegra GMI Bus Driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/bus/vexpress-config.c b/drivers/bus/vexpress-config.c<br/>index 9efdf1de4035..493e7b9fc813 100644<br/>--- a/<a href='/drm-misc/tree/drivers/bus/vexpress-config.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/bus/vexpress-config.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/bus/vexpress-config.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/bus/vexpress-config.c</a></div><div class='hunk'>@@ -171,6 +171,7 @@ static int vexpress_config_populate(struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *bridge;</div><div class='ctx'> 	struct device *parent;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	bridge = of_parse_phandle(node, "arm,vexpress,config-bridge", 0);</div><div class='ctx'> 	if (!bridge)</div><div class='hunk'>@@ -182,7 +183,11 @@ static int vexpress_config_populate(struct device_node *node)</div><div class='ctx'> 	if (WARN_ON(!parent))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return of_platform_populate(node, NULL, NULL, parent);</div><div class='add'>+	ret = of_platform_populate(node, NULL, NULL, parent);</div><div class='add'>+</div><div class='add'>+	put_device(parent);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init vexpress_config_init(void)</div><div class='head'>diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c<br/>index 5d475b3a0b2e..87739649eac2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cdrom/cdrom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cdrom/cdrom.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cdrom/cdrom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cdrom/cdrom.c</a></div><div class='hunk'>@@ -281,8 +281,8 @@</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/times.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* used to tell the module to turn on full debugging messages */</div><div class='ctx'> static bool debug;</div><div class='hunk'>@@ -342,8 +342,8 @@ static void cdrom_sysctl_register(void);</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(cdrom_list);</div><div class='ctx'> </div><div class='del'>-static int cdrom_dummy_generic_packet(struct cdrom_device_info *cdi,</div><div class='del'>-				      struct packet_command *cgc)</div><div class='add'>+int cdrom_dummy_generic_packet(struct cdrom_device_info *cdi,</div><div class='add'>+			       struct packet_command *cgc)</div><div class='ctx'> {</div><div class='ctx'> 	if (cgc-&gt;sense) {</div><div class='ctx'> 		cgc-&gt;sense-&gt;sense_key = 0x05;</div><div class='hunk'>@@ -354,6 +354,7 @@ static int cdrom_dummy_generic_packet(struct cdrom_device_info *cdi,</div><div class='ctx'> 	cgc-&gt;stat = -EIO;</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(cdrom_dummy_generic_packet);</div><div class='ctx'> </div><div class='ctx'> static int cdrom_flush_cache(struct cdrom_device_info *cdi)</div><div class='ctx'> {</div><div class='hunk'>@@ -371,7 +372,7 @@ static int cdrom_flush_cache(struct cdrom_device_info *cdi)</div><div class='ctx'> static int cdrom_get_disc_info(struct cdrom_device_info *cdi,</div><div class='ctx'> 			       disc_information *di)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	struct packet_command cgc;</div><div class='ctx'> 	int ret, buflen;</div><div class='ctx'> </div><div class='hunk'>@@ -586,7 +587,7 @@ static int cdrom_mrw_set_lba_space(struct cdrom_device_info *cdi, int space)</div><div class='ctx'> int register_cdrom(struct cdrom_device_info *cdi)</div><div class='ctx'> {</div><div class='ctx'> 	static char banner_printed;</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	int *change_capability = (int *)&amp;cdo-&gt;capability; /* hack */</div><div class='ctx'> </div><div class='ctx'> 	cd_dbg(CD_OPEN, "entering register_cdrom\n");</div><div class='hunk'>@@ -610,7 +611,6 @@ int register_cdrom(struct cdrom_device_info *cdi)</div><div class='ctx'> 	ENSURE(reset, CDC_RESET);</div><div class='ctx'> 	ENSURE(generic_packet, CDC_GENERIC_PACKET);</div><div class='ctx'> 	cdi-&gt;mc_flags = 0;</div><div class='del'>-	cdo-&gt;n_minors = 0;</div><div class='ctx'> 	cdi-&gt;options = CDO_USE_FFLAGS;</div><div class='ctx'> </div><div class='ctx'> 	if (autoclose == 1 &amp;&amp; CDROM_CAN(CDC_CLOSE_TRAY))</div><div class='hunk'>@@ -630,8 +630,7 @@ int register_cdrom(struct cdrom_device_info *cdi)</div><div class='ctx'> 	else</div><div class='ctx'> 		cdi-&gt;cdda_method = CDDA_OLD;</div><div class='ctx'> </div><div class='del'>-	if (!cdo-&gt;generic_packet)</div><div class='del'>-		cdo-&gt;generic_packet = cdrom_dummy_generic_packet;</div><div class='add'>+	WARN_ON(!cdo-&gt;generic_packet);</div><div class='ctx'> </div><div class='ctx'> 	cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi-&gt;name);</div><div class='ctx'> 	mutex_lock(&amp;cdrom_mutex);</div><div class='hunk'>@@ -652,7 +651,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)</div><div class='ctx'> 	if (cdi-&gt;exit)</div><div class='ctx'> 		cdi-&gt;exit(cdi);</div><div class='ctx'> </div><div class='del'>-	cdi-&gt;ops-&gt;n_minors--;</div><div class='ctx'> 	cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1036,7 +1034,7 @@ static</div><div class='ctx'> int open_for_data(struct cdrom_device_info *cdi)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	tracktype tracks;</div><div class='ctx'> 	cd_dbg(CD_OPEN, "entering open_for_data\n");</div><div class='ctx'> 	/* Check if the driver can report drive status.  If it can, we</div><div class='hunk'>@@ -1198,8 +1196,8 @@ err:</div><div class='ctx'> /* This code is similar to that in open_for_data. The routine is called</div><div class='ctx'>    whenever an audio play operation is requested.</div><div class='ctx'> */</div><div class='del'>-static int check_for_audio_disc(struct cdrom_device_info * cdi,</div><div class='del'>-				struct cdrom_device_ops * cdo)</div><div class='add'>+static int check_for_audio_disc(struct cdrom_device_info *cdi,</div><div class='add'>+				const struct cdrom_device_ops *cdo)</div><div class='ctx'> {</div><div class='ctx'>         int ret;</div><div class='ctx'> 	tracktype tracks;</div><div class='hunk'>@@ -1254,7 +1252,7 @@ static int check_for_audio_disc(struct cdrom_device_info * cdi,</div><div class='ctx'> </div><div class='ctx'> void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	int opened_for_data;</div><div class='ctx'> </div><div class='ctx'> 	cd_dbg(CD_CLOSE, "entering cdrom_release\n");</div><div class='hunk'>@@ -1294,7 +1292,7 @@ static int cdrom_read_mech_status(struct cdrom_device_info *cdi,</div><div class='ctx'> 				  struct cdrom_changer_info *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct packet_command cgc;</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	int length;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1643,7 +1641,7 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u_char buf[20];</div><div class='ctx'> 	struct packet_command cgc;</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	rpc_state_t rpc_state;</div><div class='ctx'> </div><div class='ctx'> 	memset(buf, 0, sizeof(buf));</div><div class='hunk'>@@ -1791,7 +1789,7 @@ static int dvd_read_physical(struct cdrom_device_info *cdi, dvd_struct *s,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf[21], *base;</div><div class='ctx'> 	struct dvd_layer *layer;</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	int ret, layer_num = s-&gt;physical.layer_num;</div><div class='ctx'> </div><div class='ctx'> 	if (layer_num &gt;= DVD_LAYERS)</div><div class='hunk'>@@ -1842,7 +1840,7 @@ static int dvd_read_copyright(struct cdrom_device_info *cdi, dvd_struct *s,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u_char buf[8];</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	init_cdrom_command(cgc, buf, sizeof(buf), CGC_DATA_READ);</div><div class='ctx'> 	cgc-&gt;cmd[0] = GPCMD_READ_DVD_STRUCTURE;</div><div class='hunk'>@@ -1866,7 +1864,7 @@ static int dvd_read_disckey(struct cdrom_device_info *cdi, dvd_struct *s,</div><div class='ctx'> {</div><div class='ctx'> 	int ret, size;</div><div class='ctx'> 	u_char *buf;</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(s-&gt;disckey.value) + 4;</div><div class='ctx'> </div><div class='hunk'>@@ -1894,7 +1892,7 @@ static int dvd_read_bca(struct cdrom_device_info *cdi, dvd_struct *s,</div><div class='ctx'> {</div><div class='ctx'> 	int ret, size = 4 + 188;</div><div class='ctx'> 	u_char *buf;</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	buf = kmalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (!buf)</div><div class='hunk'>@@ -1928,7 +1926,7 @@ static int dvd_read_manufact(struct cdrom_device_info *cdi, dvd_struct *s,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0, size;</div><div class='ctx'> 	u_char *buf;</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(s-&gt;manufact.value) + 4;</div><div class='ctx'> </div><div class='hunk'>@@ -1995,7 +1993,7 @@ int cdrom_mode_sense(struct cdrom_device_info *cdi,</div><div class='ctx'> 		     struct packet_command *cgc,</div><div class='ctx'> 		     int page_code, int page_control)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	memset(cgc-&gt;cmd, 0, sizeof(cgc-&gt;cmd));</div><div class='ctx'> </div><div class='hunk'>@@ -2010,7 +2008,7 @@ int cdrom_mode_sense(struct cdrom_device_info *cdi,</div><div class='ctx'> int cdrom_mode_select(struct cdrom_device_info *cdi,</div><div class='ctx'> 		      struct packet_command *cgc)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	memset(cgc-&gt;cmd, 0, sizeof(cgc-&gt;cmd));</div><div class='ctx'> 	memset(cgc-&gt;buffer, 0, 2);</div><div class='hunk'>@@ -2025,7 +2023,7 @@ int cdrom_mode_select(struct cdrom_device_info *cdi,</div><div class='ctx'> static int cdrom_read_subchannel(struct cdrom_device_info *cdi,</div><div class='ctx'> 				 struct cdrom_subchnl *subchnl, int mcn)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	struct packet_command cgc;</div><div class='ctx'> 	char buffer[32];</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2073,7 +2071,7 @@ static int cdrom_read_cd(struct cdrom_device_info *cdi,</div><div class='ctx'> 			 struct packet_command *cgc, int lba,</div><div class='ctx'> 			 int blocksize, int nblocks)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cgc-&gt;cmd, 0, sizeof(cgc-&gt;cmd));</div><div class='ctx'> 	cgc-&gt;cmd[0] = GPCMD_READ_10;</div><div class='hunk'>@@ -2093,7 +2091,7 @@ static int cdrom_read_block(struct cdrom_device_info *cdi,</div><div class='ctx'> 			    struct packet_command *cgc,</div><div class='ctx'> 			    int lba, int nblocks, int format, int blksize)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cgc-&gt;cmd, 0, sizeof(cgc-&gt;cmd));</div><div class='ctx'> 	cgc-&gt;cmd[0] = GPCMD_READ_CD;</div><div class='hunk'>@@ -2172,6 +2170,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = cdi-&gt;disk-&gt;queue;</div><div class='ctx'> 	struct request *rq;</div><div class='add'>+	struct scsi_request *req;</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> 	int nr, ret = 0;</div><div class='hunk'>@@ -2190,12 +2189,13 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,</div><div class='ctx'> </div><div class='ctx'> 		len = nr * CD_FRAMESIZE_RAW;</div><div class='ctx'> </div><div class='del'>-		rq = blk_get_request(q, READ, GFP_KERNEL);</div><div class='add'>+		rq = blk_get_request(q, REQ_OP_SCSI_IN, GFP_KERNEL);</div><div class='ctx'> 		if (IS_ERR(rq)) {</div><div class='ctx'> 			ret = PTR_ERR(rq);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		blk_rq_set_block_pc(rq);</div><div class='add'>+		req = scsi_req(rq);</div><div class='add'>+		scsi_req_init(rq);</div><div class='ctx'> </div><div class='ctx'> 		ret = blk_rq_map_user(q, rq, NULL, ubuf, len, GFP_KERNEL);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -2203,23 +2203,23 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rq-&gt;cmd[0] = GPCMD_READ_CD;</div><div class='del'>-		rq-&gt;cmd[1] = 1 &lt;&lt; 2;</div><div class='del'>-		rq-&gt;cmd[2] = (lba &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-		rq-&gt;cmd[3] = (lba &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-		rq-&gt;cmd[4] = (lba &gt;&gt;  8) &amp; 0xff;</div><div class='del'>-		rq-&gt;cmd[5] = lba &amp; 0xff;</div><div class='del'>-		rq-&gt;cmd[6] = (nr &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-		rq-&gt;cmd[7] = (nr &gt;&gt;  8) &amp; 0xff;</div><div class='del'>-		rq-&gt;cmd[8] = nr &amp; 0xff;</div><div class='del'>-		rq-&gt;cmd[9] = 0xf8;</div><div class='del'>-</div><div class='del'>-		rq-&gt;cmd_len = 12;</div><div class='add'>+		req-&gt;cmd[0] = GPCMD_READ_CD;</div><div class='add'>+		req-&gt;cmd[1] = 1 &lt;&lt; 2;</div><div class='add'>+		req-&gt;cmd[2] = (lba &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+		req-&gt;cmd[3] = (lba &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		req-&gt;cmd[4] = (lba &gt;&gt;  8) &amp; 0xff;</div><div class='add'>+		req-&gt;cmd[5] = lba &amp; 0xff;</div><div class='add'>+		req-&gt;cmd[6] = (nr &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		req-&gt;cmd[7] = (nr &gt;&gt;  8) &amp; 0xff;</div><div class='add'>+		req-&gt;cmd[8] = nr &amp; 0xff;</div><div class='add'>+		req-&gt;cmd[9] = 0xf8;</div><div class='add'>+</div><div class='add'>+		req-&gt;cmd_len = 12;</div><div class='ctx'> 		rq-&gt;timeout = 60 * HZ;</div><div class='ctx'> 		bio = rq-&gt;bio;</div><div class='ctx'> </div><div class='ctx'> 		if (blk_execute_rq(q, cdi-&gt;disk, rq, 0)) {</div><div class='del'>-			struct request_sense *s = rq-&gt;sense;</div><div class='add'>+			struct request_sense *s = req-&gt;sense;</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			cdi-&gt;last_sense = s-&gt;sense_key;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2764,7 +2764,7 @@ static int cdrom_ioctl_audioctl(struct cdrom_device_info *cdi,</div><div class='ctx'>  */</div><div class='ctx'> static int cdrom_switch_blocksize(struct cdrom_device_info *cdi, int size)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	struct packet_command cgc;</div><div class='ctx'> 	struct modesel_head mh;</div><div class='ctx'> </div><div class='hunk'>@@ -2790,7 +2790,7 @@ static int cdrom_switch_blocksize(struct cdrom_device_info *cdi, int size)</div><div class='ctx'> static int cdrom_get_track_info(struct cdrom_device_info *cdi,</div><div class='ctx'> 				__u16 track, __u8 type, track_information *ti)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	struct packet_command cgc;</div><div class='ctx'> 	int ret, buflen;</div><div class='ctx'> </div><div class='hunk'>@@ -3049,7 +3049,7 @@ static noinline int mmc_ioctl_cdrom_play_msf(struct cdrom_device_info *cdi,</div><div class='ctx'> 					     void __user *arg,</div><div class='ctx'> 					     struct packet_command *cgc)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	struct cdrom_msf msf;</div><div class='ctx'> 	cd_dbg(CD_DO_IOCTL, "entering CDROMPLAYMSF\n");</div><div class='ctx'> 	if (copy_from_user(&amp;msf, (struct cdrom_msf __user *)arg, sizeof(msf)))</div><div class='hunk'>@@ -3069,7 +3069,7 @@ static noinline int mmc_ioctl_cdrom_play_blk(struct cdrom_device_info *cdi,</div><div class='ctx'> 					     void __user *arg,</div><div class='ctx'> 					     struct packet_command *cgc)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	struct cdrom_blk blk;</div><div class='ctx'> 	cd_dbg(CD_DO_IOCTL, "entering CDROMPLAYBLK\n");</div><div class='ctx'> 	if (copy_from_user(&amp;blk, (struct cdrom_blk __user *)arg, sizeof(blk)))</div><div class='hunk'>@@ -3164,7 +3164,7 @@ static noinline int mmc_ioctl_cdrom_start_stop(struct cdrom_device_info *cdi,</div><div class='ctx'> 					       struct packet_command *cgc,</div><div class='ctx'> 					       int cmd)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	cd_dbg(CD_DO_IOCTL, "entering CDROMSTART/CDROMSTOP\n");</div><div class='ctx'> 	cgc-&gt;cmd[0] = GPCMD_START_STOP_UNIT;</div><div class='ctx'> 	cgc-&gt;cmd[1] = 1;</div><div class='hunk'>@@ -3177,7 +3177,7 @@ static noinline int mmc_ioctl_cdrom_pause_resume(struct cdrom_device_info *cdi,</div><div class='ctx'> 						 struct packet_command *cgc,</div><div class='ctx'> 						 int cmd)</div><div class='ctx'> {</div><div class='del'>-	struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='add'>+	const struct cdrom_device_ops *cdo = cdi-&gt;ops;</div><div class='ctx'> 	cd_dbg(CD_DO_IOCTL, "entering CDROMPAUSE/CDROMRESUME\n");</div><div class='ctx'> 	cgc-&gt;cmd[0] = GPCMD_PAUSE_RESUME;</div><div class='ctx'> 	cgc-&gt;cmd[8] = (cmd == CDROMRESUME) ? 1 : 0;</div><div class='head'>diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c<br/>index 584bc3126403..1372763a948f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cdrom/gdrom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cdrom/gdrom.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cdrom/gdrom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cdrom/gdrom.c</a></div><div class='hunk'>@@ -481,7 +481,7 @@ static int gdrom_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct cdrom_device_ops gdrom_ops = {</div><div class='add'>+static const struct cdrom_device_ops gdrom_ops = {</div><div class='ctx'> 	.open			= gdrom_open,</div><div class='ctx'> 	.release		= gdrom_release,</div><div class='ctx'> 	.drive_status		= gdrom_drivestatus,</div><div class='hunk'>@@ -489,9 +489,9 @@ static struct cdrom_device_ops gdrom_ops = {</div><div class='ctx'> 	.get_last_session	= gdrom_get_last_session,</div><div class='ctx'> 	.reset			= gdrom_hardreset,</div><div class='ctx'> 	.audio_ioctl		= gdrom_audio_ioctl,</div><div class='add'>+	.generic_packet		= cdrom_dummy_generic_packet,</div><div class='ctx'> 	.capability		= CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |</div><div class='ctx'> 				  CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,</div><div class='del'>-	.n_minors		= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)</div><div class='hunk'>@@ -659,23 +659,24 @@ static void gdrom_request(struct request_queue *rq)</div><div class='ctx'> 	struct request *req;</div><div class='ctx'> </div><div class='ctx'> 	while ((req = blk_fetch_request(rq)) != NULL) {</div><div class='del'>-		if (req-&gt;cmd_type != REQ_TYPE_FS) {</div><div class='del'>-			printk(KERN_DEBUG "gdrom: Non-fs request ignored\n");</div><div class='del'>-			__blk_end_request_all(req, -EIO);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (rq_data_dir(req) != READ) {</div><div class='add'>+		switch (req_op(req)) {</div><div class='add'>+		case REQ_OP_READ:</div><div class='add'>+			/*</div><div class='add'>+			 * Add to list of deferred work and then schedule</div><div class='add'>+			 * workqueue.</div><div class='add'>+			 */</div><div class='add'>+			list_add_tail(&amp;req-&gt;queuelist, &amp;gdrom_deferred);</div><div class='add'>+			schedule_work(&amp;work);</div><div class='add'>+			break;</div><div class='add'>+		case REQ_OP_WRITE:</div><div class='ctx'> 			pr_notice("Read only device - write request ignored\n");</div><div class='ctx'> 			__blk_end_request_all(req, -EIO);</div><div class='del'>-			continue;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_DEBUG "gdrom: Non-fs request ignored\n");</div><div class='add'>+			__blk_end_request_all(req, -EIO);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Add to list of deferred work and then schedule</div><div class='del'>-		 * workqueue.</div><div class='del'>-		 */</div><div class='del'>-		list_add_tail(&amp;req-&gt;queuelist, &amp;gdrom_deferred);</div><div class='del'>-		schedule_work(&amp;work);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -807,16 +808,20 @@ static int probe_gdrom(struct platform_device *devptr)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto probe_fail_cmdirq_register;</div><div class='ctx'> 	gd.gdrom_rq = blk_init_queue(gdrom_request, &amp;gdrom_lock);</div><div class='del'>-	if (!gd.gdrom_rq)</div><div class='add'>+	if (!gd.gdrom_rq) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto probe_fail_requestq;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = probe_gdrom_setupqueue();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto probe_fail_toc;</div><div class='ctx'> </div><div class='ctx'> 	gd.toc = kzalloc(sizeof(struct gdromtoc), GFP_KERNEL);</div><div class='del'>-	if (!gd.toc)</div><div class='add'>+	if (!gd.toc) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto probe_fail_toc;</div><div class='add'>+	}</div><div class='ctx'> 	add_disk(gd.disk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig<br/>index dcc09739a54e..31adbebf812e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/Kconfig</a></div><div class='hunk'>@@ -17,7 +17,6 @@ config DEVMEM</div><div class='ctx'> </div><div class='ctx'> config DEVKMEM</div><div class='ctx'> 	bool "/dev/kmem virtual device support"</div><div class='del'>-	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you want to support the /dev/kmem device. The</div><div class='ctx'> 	  /dev/kmem device is rarely used, but can be used for certain</div><div class='hunk'>@@ -47,6 +46,7 @@ config SGI_MBCS</div><div class='ctx'>          say Y or M here, otherwise say N.</div><div class='ctx'> </div><div class='ctx'> source "drivers/tty/serial/Kconfig"</div><div class='add'>+source "drivers/tty/serdev/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config TTY_PRINTK</div><div class='ctx'> 	tristate "TTY driver to output user messages via printk"</div><div class='hunk'>@@ -542,6 +542,7 @@ config HANGCHECK_TIMER</div><div class='ctx'> config MMTIMER</div><div class='ctx'> 	tristate "MMTIMER Memory mapped RTC for SGI Altix"</div><div class='ctx'> 	depends on IA64_GENERIC || IA64_SGI_SN2</div><div class='add'>+	depends on POSIX_TIMERS</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  The mmtimer device allows direct userspace access to the</div><div class='hunk'>@@ -571,14 +572,17 @@ config TELCLOCK</div><div class='ctx'> 	  controlling the behavior of this hardware.</div><div class='ctx'> </div><div class='ctx'> config DEVPORT</div><div class='del'>-	bool</div><div class='add'>+	bool "/dev/port character device"</div><div class='ctx'> 	depends on ISA || PCI</div><div class='ctx'> 	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to support the /dev/port device. The /dev/port</div><div class='add'>+	  device is similar to /dev/mem, but for I/O ports.</div><div class='ctx'> </div><div class='ctx'> source "drivers/s390/char/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config TILE_SROM</div><div class='del'>-	bool "Character-device access via hypervisor to the Tilera SPI ROM"</div><div class='add'>+	tristate "Character-device access via hypervisor to the Tilera SPI ROM"</div><div class='ctx'> 	depends on TILE</div><div class='ctx'> 	default y</div><div class='ctx'> 	---help---</div><div class='head'>diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c<br/>index 199b8e99f7d7..53fe633df1e8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/agp/alpha-agp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/agp/alpha-agp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/agp/alpha-agp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/agp/alpha-agp.c</a></div><div class='hunk'>@@ -11,16 +11,14 @@</div><div class='ctx'> </div><div class='ctx'> #include "agp.h"</div><div class='ctx'> </div><div class='del'>-static int alpha_core_agp_vm_fault(struct vm_area_struct *vma,</div><div class='del'>-					struct vm_fault *vmf)</div><div class='add'>+static int alpha_core_agp_vm_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='ctx'> 	alpha_agp_info *agp = agp_bridge-&gt;dev_private_data;</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> 	unsigned long pa;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='del'>-	dma_addr = (unsigned long)vmf-&gt;virtual_address - vma-&gt;vm_start</div><div class='del'>-						+ agp-&gt;aperture.bus_base;</div><div class='add'>+	dma_addr = vmf-&gt;address - vmf-&gt;vma-&gt;vm_start + agp-&gt;aperture.bus_base;</div><div class='ctx'> 	pa = agp-&gt;ops-&gt;translate(agp, dma_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (pa == (unsigned long)-EINVAL)</div><div class='head'>diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c<br/>index a48e05b31593..2053f70ef66b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/agp/compat_ioctl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/agp/compat_ioctl.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/agp/compat_ioctl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/agp/compat_ioctl.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/agpgart.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include "agp.h"</div><div class='ctx'> #include "compat_ioctl.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c<br/>index 0f64d149c98d..f6955888e676 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/agp/frontend.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/agp/frontend.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/agp/frontend.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/agp/frontend.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include "agp.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c<br/>index 0f7d28a98b9a..9702c78f458d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/agp/intel-gtt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/agp/intel-gtt.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/agp/intel-gtt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/agp/intel-gtt.c</a></div><div class='hunk'>@@ -1420,8 +1420,10 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(intel_gmch_probe);</div><div class='ctx'> </div><div class='del'>-void intel_gtt_get(u64 *gtt_total, size_t *stolen_size,</div><div class='del'>-		   phys_addr_t *mappable_base, u64 *mappable_end)</div><div class='add'>+void intel_gtt_get(u64 *gtt_total,</div><div class='add'>+		   u32 *stolen_size,</div><div class='add'>+		   phys_addr_t *mappable_base,</div><div class='add'>+		   u64 *mappable_end)</div><div class='ctx'> {</div><div class='ctx'> 	*gtt_total = intel_private.gtt_total_entries &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	*stolen_size = intel_private.stolen_size;</div><div class='head'>diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c<br/>index dd9dfa15e9d1..1dfb9f8de171 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/apm-emulation.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/apm-emulation.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/apm-emulation.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/apm-emulation.c</a></div><div class='hunk'>@@ -31,13 +31,6 @@</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The apm_bios device is one of the misc char devices.</div><div class='del'>- * This is its minor number.</div><div class='del'>- */</div><div class='del'>-#define APM_MINOR_DEV	134</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * One option can be changed at boot time as follows:</div><div class='ctx'>  *	apm=on/off			enable/disable APM</div><div class='head'>diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c<br/>index 14790304b84b..e770ad977472 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/applicom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/applicom.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/applicom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/applicom.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "applicom.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/bfin-otp.c b/drivers/char/bfin-otp.c<br/>index 35d46da754d7..0584025bb0c2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/bfin-otp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/bfin-otp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/bfin-otp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/bfin-otp.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/blackfin.h&gt;</div><div class='ctx'> #include &lt;asm/bfrom.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args)</div><div class='ctx'> #define stampit() stamp("here i am")</div><div class='head'>diff --git a/drivers/char/ds1302.c b/drivers/char/ds1302.c<br/>index 7d34b203718a..c614a56e68cc 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/ds1302.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/ds1302.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/ds1302.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ds1302.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='head'>diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c<br/>index 0fae5296e311..eb53cbadb68f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/ds1620.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/ds1620.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/ds1620.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ds1620.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/therm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='head'>diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c<br/>index 65a8d96c0e93..58471394beb9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/dtlk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/dtlk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/dtlk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/dtlk.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* for inb_p, outb_p, inb, outb, etc. */</div><div class='del'>-#include &lt;asm/uaccess.h&gt;	/* for get_user, etc. */</div><div class='add'>+#include &lt;linux/uaccess.h&gt;	/* for get_user, etc. */</div><div class='ctx'> #include &lt;linux/wait.h&gt;		/* for wait_queue */</div><div class='ctx'> #include &lt;linux/init.h&gt;		/* for __init, module_{init,exit} */</div><div class='ctx'> #include &lt;linux/poll.h&gt;		/* for POLLIN, etc. */</div><div class='head'>diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c<br/>index 073db9558379..14e728fbb8a0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/generic_nvram.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/generic_nvram.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/generic_nvram.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/generic_nvram.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/nvram.h&gt;</div><div class='ctx'> #ifdef CONFIG_PPC_PMAC</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='head'>diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c<br/>index a7c5c59675f0..4f337375252e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hangcheck-timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hangcheck-timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hangcheck-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hangcheck-timer.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/sysrq.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='head'>diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c<br/>index be54e5331a45..8bdc38d81adf 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hpet.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hpet.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hpet.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hpet.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -69,9 +70,9 @@ static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ;</div><div class='ctx'> #ifdef CONFIG_IA64</div><div class='ctx'> static void __iomem *hpet_mctr;</div><div class='ctx'> </div><div class='del'>-static cycle_t read_hpet(struct clocksource *cs)</div><div class='add'>+static u64 read_hpet(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)read_counter((void __iomem *)hpet_mctr);</div><div class='add'>+	return (u64)read_counter((void __iomem *)hpet_mctr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource clocksource_hpet = {</div><div class='head'>diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig<br/>index 200dab5136a7..0cafe08919c9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/Kconfig</a></div><div class='hunk'>@@ -168,12 +168,12 @@ config HW_RANDOM_IXP4XX</div><div class='ctx'> </div><div class='ctx'> config HW_RANDOM_OMAP</div><div class='ctx'> 	tristate "OMAP Random Number Generator support"</div><div class='del'>-	depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS</div><div class='add'>+	depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS || ARCH_MVEBU</div><div class='ctx'> 	default HW_RANDOM</div><div class='ctx'>  	---help---</div><div class='ctx'>  	  This driver provides kernel-side support for the Random Number</div><div class='del'>-	  Generator hardware found on OMAP16xx, OMAP2/3/4/5 and AM33xx/AM43xx</div><div class='del'>-	  multimedia processors.</div><div class='add'>+	  Generator hardware found on OMAP16xx, OMAP2/3/4/5, AM33xx/AM43xx</div><div class='add'>+	  multimedia processors, and Marvell Armada 7k/8k SoCs.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called omap-rng.</div><div class='head'>diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c<br/>index 0fcc9e69a346..661c82cde0f2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/atmel-rng.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/atmel-rng.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/atmel-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/atmel-rng.c</a></div><div class='hunk'>@@ -48,6 +48,16 @@ static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max,</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void atmel_trng_enable(struct atmel_trng *trng)</div><div class='add'>+{</div><div class='add'>+	writel(TRNG_KEY | 1, trng-&gt;base + TRNG_CR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atmel_trng_disable(struct atmel_trng *trng)</div><div class='add'>+{</div><div class='add'>+	writel(TRNG_KEY, trng-&gt;base + TRNG_CR);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int atmel_trng_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_trng *trng;</div><div class='hunk'>@@ -71,7 +81,7 @@ static int atmel_trng_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	writel(TRNG_KEY | 1, trng-&gt;base + TRNG_CR);</div><div class='add'>+	atmel_trng_enable(trng);</div><div class='ctx'> 	trng-&gt;rng.name = pdev-&gt;name;</div><div class='ctx'> 	trng-&gt;rng.read = atmel_trng_read;</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +94,7 @@ static int atmel_trng_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_register:</div><div class='del'>-	clk_disable(trng-&gt;clk);</div><div class='add'>+	clk_disable_unprepare(trng-&gt;clk);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -94,7 +104,7 @@ static int atmel_trng_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	hwrng_unregister(&amp;trng-&gt;rng);</div><div class='ctx'> </div><div class='del'>-	writel(TRNG_KEY, trng-&gt;base + TRNG_CR);</div><div class='add'>+	atmel_trng_disable(trng);</div><div class='ctx'> 	clk_disable_unprepare(trng-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -105,6 +115,7 @@ static int atmel_trng_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_trng *trng = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='add'>+	atmel_trng_disable(trng);</div><div class='ctx'> 	clk_disable_unprepare(trng-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -113,8 +124,15 @@ static int atmel_trng_suspend(struct device *dev)</div><div class='ctx'> static int atmel_trng_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_trng *trng = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return clk_prepare_enable(trng-&gt;clk);</div><div class='add'>+	ret = clk_prepare_enable(trng-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	atmel_trng_enable(trng);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct dev_pm_ops atmel_trng_pm_ops = {</div><div class='head'>diff --git a/drivers/char/hw_random/cavium-rng-vf.c b/drivers/char/hw_random/cavium-rng-vf.c<br/>index 066ae0e78d63..dd1007aecb10 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/cavium-rng-vf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/cavium-rng-vf.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/cavium-rng-vf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/cavium-rng-vf.c</a></div><div class='hunk'>@@ -57,7 +57,11 @@ static int cavium_rng_probe_vf(struct	pci_dev		*pdev,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rng-&gt;ops.name    = "cavium rng";</div><div class='add'>+	rng-&gt;ops.name = devm_kasprintf(&amp;pdev-&gt;dev, GFP_KERNEL,</div><div class='add'>+				       "cavium-rng-%s", dev_name(&amp;pdev-&gt;dev));</div><div class='add'>+	if (!rng-&gt;ops.name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	rng-&gt;ops.read    = cavium_rng_read;</div><div class='ctx'> 	rng-&gt;ops.quality = 1000;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c<br/>index d2d2c89de5b4..503a41dfa193 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/core.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/core.c</a></div><div class='hunk'>@@ -1,55 +1,31 @@</div><div class='ctx'> /*</div><div class='del'>-        Added support for the AMD Geode LX RNG</div><div class='del'>-	(c) Copyright 2004-2005 Advanced Micro Devices, Inc.</div><div class='del'>-</div><div class='del'>-	derived from</div><div class='del'>-</div><div class='del'>- 	Hardware driver for the Intel/AMD/VIA Random Number Generators (RNG)</div><div class='del'>-	(c) Copyright 2003 Red Hat Inc &lt;jgarzik@redhat.com&gt;</div><div class='del'>-</div><div class='del'>- 	derived from</div><div class='del'>-</div><div class='del'>-        Hardware driver for the AMD 768 Random Number Generator (RNG)</div><div class='del'>-        (c) Copyright 2001 Red Hat Inc &lt;alan@redhat.com&gt;</div><div class='del'>-</div><div class='del'>- 	derived from</div><div class='del'>-</div><div class='del'>-	Hardware driver for Intel i810 Random Number Generator (RNG)</div><div class='del'>-	Copyright 2000,2001 Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='del'>-	Copyright 2000,2001 Philipp Rumpf &lt;prumpf@mandrakesoft.com&gt;</div><div class='del'>-</div><div class='del'>-	Added generic RNG API</div><div class='del'>-	Copyright 2006 Michael Buesch &lt;m@bues.ch&gt;</div><div class='del'>-	Copyright 2005 (c) MontaVista Software, Inc.</div><div class='del'>-</div><div class='del'>-	Please read Documentation/hw_random.txt for details on use.</div><div class='del'>-</div><div class='del'>-	----------------------------------------------------------</div><div class='del'>-	This software may be used and distributed according to the terms</div><div class='del'>-        of the GNU General Public License, incorporated herein by reference.</div><div class='del'>-</div><div class='add'>+ * hw_random/core.c: HWRNG core API</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2006 Michael Buesch &lt;m@bues.ch&gt;</div><div class='add'>+ * Copyright 2005 (c) MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Please read Documentation/hw_random.txt for details on use.</div><div class='add'>+ *</div><div class='add'>+ * This software may be used and distributed according to the terms</div><div class='add'>+ * of the GNU General Public License, incorporated herein by reference.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/hw_random.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define RNG_MODULE_NAME		"hw_random"</div><div class='del'>-#define PFX			RNG_MODULE_NAME ": "</div><div class='del'>-#define RNG_MISCDEV_MINOR	183 /* official */</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> static struct hwrng *current_rng;</div><div class='ctx'> static struct task_struct *hwrng_fill;</div><div class='hunk'>@@ -296,7 +272,6 @@ out_put:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static const struct file_operations rng_chrdev_ops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.open		= rng_dev_open,</div><div class='hunk'>@@ -307,14 +282,13 @@ static const struct file_operations rng_chrdev_ops = {</div><div class='ctx'> static const struct attribute_group *rng_dev_groups[];</div><div class='ctx'> </div><div class='ctx'> static struct miscdevice rng_miscdev = {</div><div class='del'>-	.minor		= RNG_MISCDEV_MINOR,</div><div class='add'>+	.minor		= HWRNG_MINOR,</div><div class='ctx'> 	.name		= RNG_MODULE_NAME,</div><div class='ctx'> 	.nodename	= "hwrng",</div><div class='ctx'> 	.fops		= &amp;rng_chrdev_ops,</div><div class='ctx'> 	.groups		= rng_dev_groups,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static ssize_t hwrng_attr_current_store(struct device *dev,</div><div class='ctx'> 					struct device_attribute *attr,</div><div class='ctx'> 					const char *buf, size_t len)</div><div class='hunk'>@@ -444,8 +418,7 @@ int hwrng_register(struct hwrng *rng)</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> 	struct hwrng *old_rng, *tmp;</div><div class='ctx'> </div><div class='del'>-	if (rng-&gt;name == NULL ||</div><div class='del'>-	    (rng-&gt;data_read == NULL &amp;&amp; rng-&gt;read == NULL))</div><div class='add'>+	if (!rng-&gt;name || (!rng-&gt;data_read &amp;&amp; !rng-&gt;read))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;rng_mutex);</div><div class='head'>diff --git a/drivers/char/hw_random/meson-rng.c b/drivers/char/hw_random/meson-rng.c<br/>index 58bef39f7286..119d698439ae 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/meson-rng.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/meson-rng.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/meson-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/meson-rng.c</a></div><div class='hunk'>@@ -110,6 +110,7 @@ static const struct of_device_id meson_rng_of_match[] = {</div><div class='ctx'> 	{ .compatible = "amlogic,meson-rng", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='add'>+MODULE_DEVICE_TABLE(of, meson_rng_of_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver meson_rng_driver = {</div><div class='ctx'> 	.probe	= meson_rng_probe,</div><div class='hunk'>@@ -121,7 +122,6 @@ static struct platform_driver meson_rng_driver = {</div><div class='ctx'> </div><div class='ctx'> module_platform_driver(meson_rng_driver);</div><div class='ctx'> </div><div class='del'>-MODULE_ALIAS("platform:meson-rng");</div><div class='ctx'> MODULE_DESCRIPTION("Meson H/W Random Number Generator driver");</div><div class='ctx'> MODULE_AUTHOR("Lawrence Mok &lt;lawrence.mok@amlogic.com&gt;");</div><div class='ctx'> MODULE_AUTHOR("Neil Armstrong &lt;narmstrong@baylibre.com&gt;");</div><div class='head'>diff --git a/drivers/char/hw_random/msm-rng.c b/drivers/char/hw_random/msm-rng.c<br/>index 96fb986402eb..841fee845ec9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/msm-rng.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/msm-rng.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/msm-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/msm-rng.c</a></div><div class='hunk'>@@ -90,10 +90,6 @@ static int msm_rng_read(struct hwrng *hwrng, void *data, size_t max, bool wait)</div><div class='ctx'> 	/* calculate max size bytes to transfer back to caller */</div><div class='ctx'> 	maxsize = min_t(size_t, MAX_HW_FIFO_SIZE, max);</div><div class='ctx'> </div><div class='del'>-	/* no room for word data */</div><div class='del'>-	if (maxsize &lt; WORD_SZ)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	ret = clk_prepare_enable(rng-&gt;clk);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='head'>diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c<br/>index 3b06c1d6cfb2..31cbdbbaebfc 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/n2-drv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/n2-drv.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/n2-drv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/n2-drv.c</a></div><div class='hunk'>@@ -21,11 +21,11 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"n2rng"</div><div class='ctx'> #define PFX DRV_MODULE_NAME	": "</div><div class='del'>-#define DRV_MODULE_VERSION	"0.2"</div><div class='del'>-#define DRV_MODULE_RELDATE	"July 27, 2011"</div><div class='add'>+#define DRV_MODULE_VERSION	"0.3"</div><div class='add'>+#define DRV_MODULE_RELDATE	"Jan 7, 2017"</div><div class='ctx'> </div><div class='ctx'> static char version[] =</div><div class='del'>-	DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";</div><div class='add'>+	DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");</div><div class='ctx'> MODULE_DESCRIPTION("Niagara2 RNG driver");</div><div class='hunk'>@@ -302,26 +302,57 @@ static int n2rng_try_read_ctl(struct n2rng *np)</div><div class='ctx'> 	return n2rng_hv_err_trans(hv_err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define CONTROL_DEFAULT_BASE		\</div><div class='del'>-	((2 &lt;&lt; RNG_CTL_ASEL_SHIFT) |	\</div><div class='del'>-	 (N2RNG_ACCUM_CYCLES_DEFAULT &lt;&lt; RNG_CTL_WAIT_SHIFT) |	\</div><div class='del'>-	 RNG_CTL_LFSR)</div><div class='del'>-</div><div class='del'>-#define CONTROL_DEFAULT_0		\</div><div class='del'>-	(CONTROL_DEFAULT_BASE |		\</div><div class='del'>-	 (1 &lt;&lt; RNG_CTL_VCO_SHIFT) |	\</div><div class='del'>-	 RNG_CTL_ES1)</div><div class='del'>-#define CONTROL_DEFAULT_1		\</div><div class='del'>-	(CONTROL_DEFAULT_BASE |		\</div><div class='del'>-	 (2 &lt;&lt; RNG_CTL_VCO_SHIFT) |	\</div><div class='del'>-	 RNG_CTL_ES2)</div><div class='del'>-#define CONTROL_DEFAULT_2		\</div><div class='del'>-	(CONTROL_DEFAULT_BASE |		\</div><div class='del'>-	 (3 &lt;&lt; RNG_CTL_VCO_SHIFT) |	\</div><div class='del'>-	 RNG_CTL_ES3)</div><div class='del'>-#define CONTROL_DEFAULT_3		\</div><div class='del'>-	(CONTROL_DEFAULT_BASE |		\</div><div class='del'>-	 RNG_CTL_ES1 | RNG_CTL_ES2 | RNG_CTL_ES3)</div><div class='add'>+static u64 n2rng_control_default(struct n2rng *np, int ctl)</div><div class='add'>+{</div><div class='add'>+	u64 val = 0;</div><div class='add'>+</div><div class='add'>+	if (np-&gt;data-&gt;chip_version == 1) {</div><div class='add'>+		val = ((2 &lt;&lt; RNG_v1_CTL_ASEL_SHIFT) |</div><div class='add'>+			(N2RNG_ACCUM_CYCLES_DEFAULT &lt;&lt; RNG_v1_CTL_WAIT_SHIFT) |</div><div class='add'>+			 RNG_CTL_LFSR);</div><div class='add'>+</div><div class='add'>+		switch (ctl) {</div><div class='add'>+		case 0:</div><div class='add'>+			val |= (1 &lt;&lt; RNG_v1_CTL_VCO_SHIFT) | RNG_CTL_ES1;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			val |= (2 &lt;&lt; RNG_v1_CTL_VCO_SHIFT) | RNG_CTL_ES2;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			val |= (3 &lt;&lt; RNG_v1_CTL_VCO_SHIFT) | RNG_CTL_ES3;</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			val |= RNG_CTL_ES1 | RNG_CTL_ES2 | RNG_CTL_ES3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		val = ((2 &lt;&lt; RNG_v2_CTL_ASEL_SHIFT) |</div><div class='add'>+			(N2RNG_ACCUM_CYCLES_DEFAULT &lt;&lt; RNG_v2_CTL_WAIT_SHIFT) |</div><div class='add'>+			 RNG_CTL_LFSR);</div><div class='add'>+</div><div class='add'>+		switch (ctl) {</div><div class='add'>+		case 0:</div><div class='add'>+			val |= (1 &lt;&lt; RNG_v2_CTL_VCO_SHIFT) | RNG_CTL_ES1;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			val |= (2 &lt;&lt; RNG_v2_CTL_VCO_SHIFT) | RNG_CTL_ES2;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			val |= (3 &lt;&lt; RNG_v2_CTL_VCO_SHIFT) | RNG_CTL_ES3;</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			val |= RNG_CTL_ES1 | RNG_CTL_ES2 | RNG_CTL_ES3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void n2rng_control_swstate_init(struct n2rng *np)</div><div class='ctx'> {</div><div class='hunk'>@@ -336,10 +367,10 @@ static void n2rng_control_swstate_init(struct n2rng *np)</div><div class='ctx'> 	for (i = 0; i &lt; np-&gt;num_units; i++) {</div><div class='ctx'> 		struct n2rng_unit *up = &amp;np-&gt;units[i];</div><div class='ctx'> </div><div class='del'>-		up-&gt;control[0] = CONTROL_DEFAULT_0;</div><div class='del'>-		up-&gt;control[1] = CONTROL_DEFAULT_1;</div><div class='del'>-		up-&gt;control[2] = CONTROL_DEFAULT_2;</div><div class='del'>-		up-&gt;control[3] = CONTROL_DEFAULT_3;</div><div class='add'>+		up-&gt;control[0] = n2rng_control_default(np, 0);</div><div class='add'>+		up-&gt;control[1] = n2rng_control_default(np, 1);</div><div class='add'>+		up-&gt;control[2] = n2rng_control_default(np, 2);</div><div class='add'>+		up-&gt;control[3] = n2rng_control_default(np, 3);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	np-&gt;hv_state = HV_RNG_STATE_UNCONFIGURED;</div><div class='hunk'>@@ -399,6 +430,7 @@ static int n2rng_data_read(struct hwrng *rng, u32 *data)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int err = n2rng_generic_read_data(ra);</div><div class='ctx'> 		if (!err) {</div><div class='add'>+			np-&gt;flags |= N2RNG_FLAG_BUFFER_VALID;</div><div class='ctx'> 			np-&gt;buffer = np-&gt;test_data &gt;&gt; 32;</div><div class='ctx'> 			*data = np-&gt;test_data &amp; 0xffffffff;</div><div class='ctx'> 			len = 4;</div><div class='hunk'>@@ -487,9 +519,21 @@ static void n2rng_dump_test_buffer(struct n2rng *np)</div><div class='ctx'> </div><div class='ctx'> static int n2rng_check_selftest_buffer(struct n2rng *np, unsigned long unit)</div><div class='ctx'> {</div><div class='del'>-	u64 val = SELFTEST_VAL;</div><div class='add'>+	u64 val;</div><div class='ctx'> 	int err, matches, limit;</div><div class='ctx'> </div><div class='add'>+	switch (np-&gt;data-&gt;id) {</div><div class='add'>+	case N2_n2_rng:</div><div class='add'>+	case N2_vf_rng:</div><div class='add'>+	case N2_kt_rng:</div><div class='add'>+	case N2_m4_rng:  /* yes, m4 uses the old value */</div><div class='add'>+		val = RNG_v1_SELFTEST_VAL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		val = RNG_v2_SELFTEST_VAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	matches = 0;</div><div class='ctx'> 	for (limit = 0; limit &lt; SELFTEST_LOOPS_MAX; limit++) {</div><div class='ctx'> 		matches += n2rng_test_buffer_find(np, val);</div><div class='hunk'>@@ -512,14 +556,32 @@ static int n2rng_check_selftest_buffer(struct n2rng *np, unsigned long unit)</div><div class='ctx'> static int n2rng_control_selftest(struct n2rng *np, unsigned long unit)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='add'>+	u64 base, base3;</div><div class='add'>+</div><div class='add'>+	switch (np-&gt;data-&gt;id) {</div><div class='add'>+	case N2_n2_rng:</div><div class='add'>+	case N2_vf_rng:</div><div class='add'>+	case N2_kt_rng:</div><div class='add'>+		base = RNG_v1_CTL_ASEL_NOOUT &lt;&lt; RNG_v1_CTL_ASEL_SHIFT;</div><div class='add'>+		base3 = base | RNG_CTL_LFSR |</div><div class='add'>+			((RNG_v1_SELFTEST_TICKS - 2) &lt;&lt; RNG_v1_CTL_WAIT_SHIFT);</div><div class='add'>+		break;</div><div class='add'>+	case N2_m4_rng:</div><div class='add'>+		base = RNG_v2_CTL_ASEL_NOOUT &lt;&lt; RNG_v2_CTL_ASEL_SHIFT;</div><div class='add'>+		base3 = base | RNG_CTL_LFSR |</div><div class='add'>+			((RNG_v1_SELFTEST_TICKS - 2) &lt;&lt; RNG_v2_CTL_WAIT_SHIFT);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		base = RNG_v2_CTL_ASEL_NOOUT &lt;&lt; RNG_v2_CTL_ASEL_SHIFT;</div><div class='add'>+		base3 = base | RNG_CTL_LFSR |</div><div class='add'>+			(RNG_v2_SELFTEST_TICKS &lt;&lt; RNG_v2_CTL_WAIT_SHIFT);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	np-&gt;test_control[0] = (0x2 &lt;&lt; RNG_CTL_ASEL_SHIFT);</div><div class='del'>-	np-&gt;test_control[1] = (0x2 &lt;&lt; RNG_CTL_ASEL_SHIFT);</div><div class='del'>-	np-&gt;test_control[2] = (0x2 &lt;&lt; RNG_CTL_ASEL_SHIFT);</div><div class='del'>-	np-&gt;test_control[3] = ((0x2 &lt;&lt; RNG_CTL_ASEL_SHIFT) |</div><div class='del'>-			       RNG_CTL_LFSR |</div><div class='del'>-			       ((SELFTEST_TICKS - 2) &lt;&lt; RNG_CTL_WAIT_SHIFT));</div><div class='del'>-</div><div class='add'>+	np-&gt;test_control[0] = base;</div><div class='add'>+	np-&gt;test_control[1] = base;</div><div class='add'>+	np-&gt;test_control[2] = base;</div><div class='add'>+	np-&gt;test_control[3] = base3;</div><div class='ctx'> </div><div class='ctx'> 	err = n2rng_entropy_diag_read(np, unit, np-&gt;test_control,</div><div class='ctx'> 				      HV_RNG_STATE_HEALTHCHECK,</div><div class='hunk'>@@ -557,11 +619,19 @@ static int n2rng_control_configure_units(struct n2rng *np)</div><div class='ctx'> 		struct n2rng_unit *up = &amp;np-&gt;units[unit];</div><div class='ctx'> 		unsigned long ctl_ra = __pa(&amp;up-&gt;control[0]);</div><div class='ctx'> 		int esrc;</div><div class='del'>-		u64 base;</div><div class='add'>+		u64 base, shift;</div><div class='ctx'> </div><div class='del'>-		base = ((np-&gt;accum_cycles &lt;&lt; RNG_CTL_WAIT_SHIFT) |</div><div class='del'>-			(2 &lt;&lt; RNG_CTL_ASEL_SHIFT) |</div><div class='del'>-			RNG_CTL_LFSR);</div><div class='add'>+		if (np-&gt;data-&gt;chip_version == 1) {</div><div class='add'>+			base = ((np-&gt;accum_cycles &lt;&lt; RNG_v1_CTL_WAIT_SHIFT) |</div><div class='add'>+			      (RNG_v1_CTL_ASEL_NOOUT &lt;&lt; RNG_v1_CTL_ASEL_SHIFT) |</div><div class='add'>+			      RNG_CTL_LFSR);</div><div class='add'>+			shift = RNG_v1_CTL_VCO_SHIFT;</div><div class='add'>+		} else {</div><div class='add'>+			base = ((np-&gt;accum_cycles &lt;&lt; RNG_v2_CTL_WAIT_SHIFT) |</div><div class='add'>+			      (RNG_v2_CTL_ASEL_NOOUT &lt;&lt; RNG_v2_CTL_ASEL_SHIFT) |</div><div class='add'>+			      RNG_CTL_LFSR);</div><div class='add'>+			shift = RNG_v2_CTL_VCO_SHIFT;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* XXX This isn't the best.  We should fetch a bunch</div><div class='ctx'> 		 * XXX of words using each entropy source combined XXX</div><div class='hunk'>@@ -570,7 +640,7 @@ static int n2rng_control_configure_units(struct n2rng *np)</div><div class='ctx'> 		 */</div><div class='ctx'> 		for (esrc = 0; esrc &lt; 3; esrc++)</div><div class='ctx'> 			up-&gt;control[esrc] = base |</div><div class='del'>-				(esrc &lt;&lt; RNG_CTL_VCO_SHIFT) |</div><div class='add'>+				(esrc &lt;&lt; shift) |</div><div class='ctx'> 				(RNG_CTL_ES1 &lt;&lt; esrc);</div><div class='ctx'> </div><div class='ctx'> 		up-&gt;control[3] = base |</div><div class='hunk'>@@ -589,6 +659,7 @@ static void n2rng_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct n2rng *np = container_of(work, struct n2rng, work.work);</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	static int retries = 4;</div><div class='ctx'> </div><div class='ctx'> 	if (!(np-&gt;flags &amp; N2RNG_FLAG_CONTROL)) {</div><div class='ctx'> 		err = n2rng_guest_check(np);</div><div class='hunk'>@@ -606,7 +677,9 @@ static void n2rng_work(struct work_struct *work)</div><div class='ctx'> 		dev_info(&amp;np-&gt;op-&gt;dev, "RNG ready\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (err &amp;&amp; !(np-&gt;flags &amp; N2RNG_FLAG_SHUTDOWN))</div><div class='add'>+	if (--retries == 0)</div><div class='add'>+		dev_err(&amp;np-&gt;op-&gt;dev, "Self-test retries failed, RNG not ready\n");</div><div class='add'>+	else if (err &amp;&amp; !(np-&gt;flags &amp; N2RNG_FLAG_SHUTDOWN))</div><div class='ctx'> 		schedule_delayed_work(&amp;np-&gt;work, HZ * 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -622,24 +695,23 @@ static const struct of_device_id n2rng_match[];</div><div class='ctx'> static int n2rng_probe(struct platform_device *op)</div><div class='ctx'> {</div><div class='ctx'> 	const struct of_device_id *match;</div><div class='del'>-	int multi_capable;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> 	struct n2rng *np;</div><div class='ctx'> </div><div class='ctx'> 	match = of_match_device(n2rng_match, &amp;op-&gt;dev);</div><div class='ctx'> 	if (!match)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	multi_capable = (match-&gt;data != NULL);</div><div class='ctx'> </div><div class='ctx'> 	n2rng_driver_version();</div><div class='ctx'> 	np = devm_kzalloc(&amp;op-&gt;dev, sizeof(*np), GFP_KERNEL);</div><div class='ctx'> 	if (!np)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	np-&gt;op = op;</div><div class='add'>+	np-&gt;data = (struct n2rng_template *)match-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;np-&gt;work, n2rng_work);</div><div class='ctx'> </div><div class='del'>-	if (multi_capable)</div><div class='add'>+	if (np-&gt;data-&gt;multi_capable)</div><div class='ctx'> 		np-&gt;flags |= N2RNG_FLAG_MULTI;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENODEV;</div><div class='hunk'>@@ -670,8 +742,9 @@ static int n2rng_probe(struct platform_device *op)</div><div class='ctx'> 			dev_err(&amp;op-&gt;dev, "VF RNG lacks rng-#units property\n");</div><div class='ctx'> 			goto out_hvapi_unregister;</div><div class='ctx'> 		}</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		np-&gt;num_units = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;op-&gt;dev, "Registered RNG HVAPI major %lu minor %lu\n",</div><div class='ctx'> 		 np-&gt;hvapi_major, np-&gt;hvapi_minor);</div><div class='hunk'>@@ -692,7 +765,7 @@ static int n2rng_probe(struct platform_device *op)</div><div class='ctx'> 		  "multi-unit-capable" : "single-unit"),</div><div class='ctx'> 		 np-&gt;num_units);</div><div class='ctx'> </div><div class='del'>-	np-&gt;hwrng.name = "n2rng";</div><div class='add'>+	np-&gt;hwrng.name = DRV_MODULE_NAME;</div><div class='ctx'> 	np-&gt;hwrng.data_read = n2rng_data_read;</div><div class='ctx'> 	np-&gt;hwrng.priv = (unsigned long) np;</div><div class='ctx'> </div><div class='hunk'>@@ -728,30 +801,61 @@ static int n2rng_remove(struct platform_device *op)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct n2rng_template n2_template = {</div><div class='add'>+	.id = N2_n2_rng,</div><div class='add'>+	.multi_capable = 0,</div><div class='add'>+	.chip_version = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct n2rng_template vf_template = {</div><div class='add'>+	.id = N2_vf_rng,</div><div class='add'>+	.multi_capable = 1,</div><div class='add'>+	.chip_version = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct n2rng_template kt_template = {</div><div class='add'>+	.id = N2_kt_rng,</div><div class='add'>+	.multi_capable = 1,</div><div class='add'>+	.chip_version = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct n2rng_template m4_template = {</div><div class='add'>+	.id = N2_m4_rng,</div><div class='add'>+	.multi_capable = 1,</div><div class='add'>+	.chip_version = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct n2rng_template m7_template = {</div><div class='add'>+	.id = N2_m7_rng,</div><div class='add'>+	.multi_capable = 1,</div><div class='add'>+	.chip_version = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id n2rng_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "random-number-generator",</div><div class='ctx'> 		.compatible	= "SUNW,n2-rng",</div><div class='add'>+		.data		= &amp;n2_template,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "random-number-generator",</div><div class='ctx'> 		.compatible	= "SUNW,vf-rng",</div><div class='del'>-		.data		= (void *) 1,</div><div class='add'>+		.data		= &amp;vf_template,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "random-number-generator",</div><div class='ctx'> 		.compatible	= "SUNW,kt-rng",</div><div class='del'>-		.data		= (void *) 1,</div><div class='add'>+		.data		= &amp;kt_template,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "random-number-generator",</div><div class='ctx'> 		.compatible	= "ORCL,m4-rng",</div><div class='del'>-		.data		= (void *) 1,</div><div class='add'>+		.data		= &amp;m4_template,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "random-number-generator",</div><div class='ctx'> 		.compatible	= "ORCL,m7-rng",</div><div class='del'>-		.data		= (void *) 1,</div><div class='add'>+		.data		= &amp;m7_template,</div><div class='ctx'> 	},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/char/hw_random/n2rng.h b/drivers/char/hw_random/n2rng.h<br/>index f244ac89087f..6bad6cc634e8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/n2rng.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/n2rng.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/n2rng.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/n2rng.h</a></div><div class='hunk'>@@ -6,18 +6,34 @@</div><div class='ctx'> #ifndef _N2RNG_H</div><div class='ctx'> #define _N2RNG_H</div><div class='ctx'> </div><div class='del'>-#define RNG_CTL_WAIT       0x0000000001fffe00ULL /* Minimum wait time       */</div><div class='del'>-#define RNG_CTL_WAIT_SHIFT 9</div><div class='del'>-#define RNG_CTL_BYPASS     0x0000000000000100ULL /* VCO voltage source      */</div><div class='del'>-#define RNG_CTL_VCO        0x00000000000000c0ULL /* VCO rate control        */</div><div class='del'>-#define RNG_CTL_VCO_SHIFT  6</div><div class='del'>-#define RNG_CTL_ASEL       0x0000000000000030ULL /* Analog MUX select       */</div><div class='del'>-#define RNG_CTL_ASEL_SHIFT 4</div><div class='add'>+/* ver1 devices - n2-rng, vf-rng, kt-rng */</div><div class='add'>+#define RNG_v1_CTL_WAIT       0x0000000001fffe00ULL /* Minimum wait time    */</div><div class='add'>+#define RNG_v1_CTL_WAIT_SHIFT 9</div><div class='add'>+#define RNG_v1_CTL_BYPASS     0x0000000000000100ULL /* VCO voltage source   */</div><div class='add'>+#define RNG_v1_CTL_VCO        0x00000000000000c0ULL /* VCO rate control     */</div><div class='add'>+#define RNG_v1_CTL_VCO_SHIFT  6</div><div class='add'>+#define RNG_v1_CTL_ASEL       0x0000000000000030ULL /* Analog MUX select    */</div><div class='add'>+#define RNG_v1_CTL_ASEL_SHIFT 4</div><div class='add'>+#define RNG_v1_CTL_ASEL_NOOUT 2</div><div class='add'>+</div><div class='add'>+/* these are the same in v2 as in v1 */</div><div class='ctx'> #define RNG_CTL_LFSR       0x0000000000000008ULL /* Use LFSR or plain shift */</div><div class='ctx'> #define RNG_CTL_ES3        0x0000000000000004ULL /* Enable entropy source 3 */</div><div class='ctx'> #define RNG_CTL_ES2        0x0000000000000002ULL /* Enable entropy source 2 */</div><div class='ctx'> #define RNG_CTL_ES1        0x0000000000000001ULL /* Enable entropy source 1 */</div><div class='ctx'> </div><div class='add'>+/* ver2 devices - m4-rng, m7-rng */</div><div class='add'>+#define RNG_v2_CTL_WAIT       0x0000000007fff800ULL /* Minimum wait time    */</div><div class='add'>+#define RNG_v2_CTL_WAIT_SHIFT 12</div><div class='add'>+#define RNG_v2_CTL_BYPASS     0x0000000000000400ULL /* VCO voltage source   */</div><div class='add'>+#define RNG_v2_CTL_VCO        0x0000000000000300ULL /* VCO rate control     */</div><div class='add'>+#define RNG_v2_CTL_VCO_SHIFT  9</div><div class='add'>+#define RNG_v2_CTL_PERF       0x0000000000000180ULL /* Perf */</div><div class='add'>+#define RNG_v2_CTL_ASEL       0x0000000000000070ULL /* Analog MUX select    */</div><div class='add'>+#define RNG_v2_CTL_ASEL_SHIFT 4</div><div class='add'>+#define RNG_v2_CTL_ASEL_NOOUT 7</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define HV_FAST_RNG_GET_DIAG_CTL	0x130</div><div class='ctx'> #define HV_FAST_RNG_CTL_READ		0x131</div><div class='ctx'> #define HV_FAST_RNG_CTL_WRITE		0x132</div><div class='hunk'>@@ -60,6 +76,20 @@ extern unsigned long sun4v_rng_data_read_diag_v2(unsigned long data_ra,</div><div class='ctx'> extern unsigned long sun4v_rng_data_read(unsigned long data_ra,</div><div class='ctx'> 					 unsigned long *tick_delta);</div><div class='ctx'> </div><div class='add'>+enum n2rng_compat_id {</div><div class='add'>+	N2_n2_rng,</div><div class='add'>+	N2_vf_rng,</div><div class='add'>+	N2_kt_rng,</div><div class='add'>+	N2_m4_rng,</div><div class='add'>+	N2_m7_rng,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct n2rng_template {</div><div class='add'>+	enum n2rng_compat_id id;</div><div class='add'>+	int multi_capable;</div><div class='add'>+	int chip_version;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct n2rng_unit {</div><div class='ctx'> 	u64			control[HV_RNG_NUM_CONTROL];</div><div class='ctx'> };</div><div class='hunk'>@@ -74,6 +104,7 @@ struct n2rng {</div><div class='ctx'> #define N2RNG_FLAG_SHUTDOWN	0x00000010 /* Driver unregistering        */</div><div class='ctx'> #define N2RNG_FLAG_BUFFER_VALID	0x00000020 /* u32 buffer holds valid data */</div><div class='ctx'> </div><div class='add'>+	struct n2rng_template	*data;</div><div class='ctx'> 	int			num_units;</div><div class='ctx'> 	struct n2rng_unit	*units;</div><div class='ctx'> </div><div class='hunk'>@@ -97,8 +128,10 @@ struct n2rng {</div><div class='ctx'> </div><div class='ctx'> 	u64			scratch_control[HV_RNG_NUM_CONTROL];</div><div class='ctx'> </div><div class='del'>-#define SELFTEST_TICKS		38859</div><div class='del'>-#define SELFTEST_VAL		((u64)0xB8820C7BD387E32C)</div><div class='add'>+#define RNG_v1_SELFTEST_TICKS	38859</div><div class='add'>+#define RNG_v1_SELFTEST_VAL	((u64)0xB8820C7BD387E32C)</div><div class='add'>+#define RNG_v2_SELFTEST_TICKS	64</div><div class='add'>+#define RNG_v2_SELFTEST_VAL	((u64)0xffffffffffffffff)</div><div class='ctx'> #define SELFTEST_POLY		((u64)0x231DCEE91262B8A3)</div><div class='ctx'> #define SELFTEST_MATCH_GOAL	6</div><div class='ctx'> #define SELFTEST_LOOPS_MAX	40000</div><div class='head'>diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c<br/>index f5c26a5f6875..3ad86fdf954e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/omap-rng.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/omap-rng.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/omap-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/omap-rng.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -63,10 +64,13 @@</div><div class='ctx'> </div><div class='ctx'> #define OMAP2_RNG_OUTPUT_SIZE			0x4</div><div class='ctx'> #define OMAP4_RNG_OUTPUT_SIZE			0x8</div><div class='add'>+#define EIP76_RNG_OUTPUT_SIZE			0x10</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	RNG_OUTPUT_L_REG = 0,</div><div class='del'>-	RNG_OUTPUT_H_REG,</div><div class='add'>+	RNG_OUTPUT_0_REG = 0,</div><div class='add'>+	RNG_OUTPUT_1_REG,</div><div class='add'>+	RNG_OUTPUT_2_REG,</div><div class='add'>+	RNG_OUTPUT_3_REG,</div><div class='ctx'> 	RNG_STATUS_REG,</div><div class='ctx'> 	RNG_INTMASK_REG,</div><div class='ctx'> 	RNG_INTACK_REG,</div><div class='hunk'>@@ -82,7 +86,7 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u16 reg_map_omap2[] = {</div><div class='del'>-	[RNG_OUTPUT_L_REG]	= 0x0,</div><div class='add'>+	[RNG_OUTPUT_0_REG]	= 0x0,</div><div class='ctx'> 	[RNG_STATUS_REG]	= 0x4,</div><div class='ctx'> 	[RNG_CONFIG_REG]	= 0x28,</div><div class='ctx'> 	[RNG_REV_REG]		= 0x3c,</div><div class='hunk'>@@ -90,8 +94,8 @@ static const u16 reg_map_omap2[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u16 reg_map_omap4[] = {</div><div class='del'>-	[RNG_OUTPUT_L_REG]	= 0x0,</div><div class='del'>-	[RNG_OUTPUT_H_REG]	= 0x4,</div><div class='add'>+	[RNG_OUTPUT_0_REG]	= 0x0,</div><div class='add'>+	[RNG_OUTPUT_1_REG]	= 0x4,</div><div class='ctx'> 	[RNG_STATUS_REG]	= 0x8,</div><div class='ctx'> 	[RNG_INTMASK_REG]	= 0xc,</div><div class='ctx'> 	[RNG_INTACK_REG]	= 0x10,</div><div class='hunk'>@@ -106,6 +110,23 @@ static const u16 reg_map_omap4[] = {</div><div class='ctx'> 	[RNG_SYSCONFIG_REG]	= 0x1FE4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const u16 reg_map_eip76[] = {</div><div class='add'>+	[RNG_OUTPUT_0_REG]	= 0x0,</div><div class='add'>+	[RNG_OUTPUT_1_REG]	= 0x4,</div><div class='add'>+	[RNG_OUTPUT_2_REG]	= 0x8,</div><div class='add'>+	[RNG_OUTPUT_3_REG]	= 0xc,</div><div class='add'>+	[RNG_STATUS_REG]	= 0x10,</div><div class='add'>+	[RNG_INTACK_REG]	= 0x10,</div><div class='add'>+	[RNG_CONTROL_REG]	= 0x14,</div><div class='add'>+	[RNG_CONFIG_REG]	= 0x18,</div><div class='add'>+	[RNG_ALARMCNT_REG]	= 0x1c,</div><div class='add'>+	[RNG_FROENABLE_REG]	= 0x20,</div><div class='add'>+	[RNG_FRODETUNE_REG]	= 0x24,</div><div class='add'>+	[RNG_ALARMMASK_REG]	= 0x28,</div><div class='add'>+	[RNG_ALARMSTOP_REG]	= 0x2c,</div><div class='add'>+	[RNG_REV_REG]		= 0x7c,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct omap_rng_dev;</div><div class='ctx'> /**</div><div class='ctx'>  * struct omap_rng_pdata - RNG IP block-specific data</div><div class='hunk'>@@ -127,6 +148,8 @@ struct omap_rng_dev {</div><div class='ctx'> 	void __iomem			*base;</div><div class='ctx'> 	struct device			*dev;</div><div class='ctx'> 	const struct omap_rng_pdata	*pdata;</div><div class='add'>+	struct hwrng rng;</div><div class='add'>+	struct clk 			*clk;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline u32 omap_rng_read(struct omap_rng_dev *priv, u16 reg)</div><div class='hunk'>@@ -140,41 +163,35 @@ static inline void omap_rng_write(struct omap_rng_dev *priv, u16 reg,</div><div class='ctx'> 	__raw_writel(val, priv-&gt;base + priv-&gt;pdata-&gt;regs[reg]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int omap_rng_data_present(struct hwrng *rng, int wait)</div><div class='add'>+</div><div class='add'>+static int omap_rng_do_read(struct hwrng *rng, void *data, size_t max,</div><div class='add'>+			    bool wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_rng_dev *priv;</div><div class='del'>-	int data, i;</div><div class='add'>+	int i, present;</div><div class='ctx'> </div><div class='ctx'> 	priv = (struct omap_rng_dev *)rng-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	if (max &lt; priv-&gt;pdata-&gt;data_size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 20; i++) {</div><div class='del'>-		data = priv-&gt;pdata-&gt;data_present(priv);</div><div class='del'>-		if (data || !wait)</div><div class='add'>+		present = priv-&gt;pdata-&gt;data_present(priv);</div><div class='add'>+		if (present || !wait)</div><div class='ctx'> 			break;</div><div class='del'>-		/* RNG produces data fast enough (2+ MBit/sec, even</div><div class='del'>-		 * during "rngtest" loads, that these delays don't</div><div class='del'>-		 * seem to trigger.  We *could* use the RNG IRQ, but</div><div class='del'>-		 * that'd be higher overhead ... so why bother?</div><div class='del'>-		 */</div><div class='add'>+</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='del'>-	return data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int omap_rng_data_read(struct hwrng *rng, u32 *data)</div><div class='del'>-{</div><div class='del'>-	struct omap_rng_dev *priv;</div><div class='del'>-	u32 data_size, i;</div><div class='del'>-</div><div class='del'>-	priv = (struct omap_rng_dev *)rng-&gt;priv;</div><div class='del'>-	data_size = priv-&gt;pdata-&gt;data_size;</div><div class='add'>+	if (!present)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; data_size / sizeof(u32); i++)</div><div class='del'>-		data[i] = omap_rng_read(priv, RNG_OUTPUT_L_REG + i);</div><div class='add'>+	memcpy_fromio(data, priv-&gt;base + priv-&gt;pdata-&gt;regs[RNG_OUTPUT_0_REG],</div><div class='add'>+		      priv-&gt;pdata-&gt;data_size);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;pdata-&gt;regs[RNG_INTACK_REG])</div><div class='ctx'> 		omap_rng_write(priv, RNG_INTACK_REG, RNG_REG_INTACK_RDY_MASK);</div><div class='del'>-	return data_size;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;pdata-&gt;data_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int omap_rng_init(struct hwrng *rng)</div><div class='hunk'>@@ -193,13 +210,6 @@ static void omap_rng_cleanup(struct hwrng *rng)</div><div class='ctx'> 	priv-&gt;pdata-&gt;cleanup(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hwrng omap_rng_ops = {</div><div class='del'>-	.name		= "omap",</div><div class='del'>-	.data_present	= omap_rng_data_present,</div><div class='del'>-	.data_read	= omap_rng_data_read,</div><div class='del'>-	.init		= omap_rng_init,</div><div class='del'>-	.cleanup	= omap_rng_cleanup,</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static inline u32 omap2_rng_data_present(struct omap_rng_dev *priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -231,6 +241,38 @@ static inline u32 omap4_rng_data_present(struct omap_rng_dev *priv)</div><div class='ctx'> 	return omap_rng_read(priv, RNG_STATUS_REG) &amp; RNG_REG_STATUS_RDY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int eip76_rng_init(struct omap_rng_dev *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Return if RNG is already running. */</div><div class='add'>+	if (omap_rng_read(priv, RNG_CONTROL_REG) &amp; RNG_CONTROL_ENABLE_TRNG_MASK)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*  Number of 512 bit blocks of raw Noise Source output data that must</div><div class='add'>+	 *  be processed by either the Conditioning Function or the</div><div class='add'>+	 *  SP 800-90 DRBG ‘BC_DF’ functionality to yield a ‘full entropy’</div><div class='add'>+	 *  output value.</div><div class='add'>+	 */</div><div class='add'>+	val = 0x5 &lt;&lt; RNG_CONFIG_MIN_REFIL_CYCLES_SHIFT;</div><div class='add'>+</div><div class='add'>+	/* Number of FRO samples that are XOR-ed together into one bit to be</div><div class='add'>+	 * shifted into the main shift register</div><div class='add'>+	 */</div><div class='add'>+	val |= RNG_CONFIG_MAX_REFIL_CYCLES &lt;&lt; RNG_CONFIG_MAX_REFIL_CYCLES_SHIFT;</div><div class='add'>+	omap_rng_write(priv, RNG_CONFIG_REG, val);</div><div class='add'>+</div><div class='add'>+	/* Enable all available FROs */</div><div class='add'>+	omap_rng_write(priv, RNG_FRODETUNE_REG, 0x0);</div><div class='add'>+	omap_rng_write(priv, RNG_FROENABLE_REG, RNG_REG_FROENABLE_MASK);</div><div class='add'>+</div><div class='add'>+	/* Enable TRNG */</div><div class='add'>+	val = RNG_CONTROL_ENABLE_TRNG_MASK;</div><div class='add'>+	omap_rng_write(priv, RNG_CONTROL_REG, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int omap4_rng_init(struct omap_rng_dev *priv)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -300,6 +342,14 @@ static struct omap_rng_pdata omap4_rng_pdata = {</div><div class='ctx'> 	.cleanup	= omap4_rng_cleanup,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct omap_rng_pdata eip76_rng_pdata = {</div><div class='add'>+	.regs		= (u16 *)reg_map_eip76,</div><div class='add'>+	.data_size	= EIP76_RNG_OUTPUT_SIZE,</div><div class='add'>+	.data_present	= omap4_rng_data_present,</div><div class='add'>+	.init		= eip76_rng_init,</div><div class='add'>+	.cleanup	= omap4_rng_cleanup,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id omap_rng_of_match[] = {</div><div class='ctx'> 		{</div><div class='ctx'> 			.compatible	= "ti,omap2-rng",</div><div class='hunk'>@@ -309,6 +359,10 @@ static const struct of_device_id omap_rng_of_match[] = {</div><div class='ctx'> 			.compatible	= "ti,omap4-rng",</div><div class='ctx'> 			.data		= &amp;omap4_rng_pdata,</div><div class='ctx'> 		},</div><div class='add'>+		{</div><div class='add'>+			.compatible	= "inside-secure,safexcel-eip76",</div><div class='add'>+			.data		= &amp;eip76_rng_pdata,</div><div class='add'>+		},</div><div class='ctx'> 		{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, omap_rng_of_match);</div><div class='hunk'>@@ -327,7 +381,8 @@ static int of_get_omap_rng_device_details(struct omap_rng_dev *priv,</div><div class='ctx'> 	}</div><div class='ctx'> 	priv-&gt;pdata = match-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (of_device_is_compatible(dev-&gt;of_node, "ti,omap4-rng")) {</div><div class='add'>+	if (of_device_is_compatible(dev-&gt;of_node, "ti,omap4-rng") ||</div><div class='add'>+	    of_device_is_compatible(dev-&gt;of_node, "inside-secure,safexcel-eip76")) {</div><div class='ctx'> 		irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 		if (irq &lt; 0) {</div><div class='ctx'> 			dev_err(dev, "%s: error getting IRQ resource - %d\n",</div><div class='hunk'>@@ -343,6 +398,16 @@ static int of_get_omap_rng_device_details(struct omap_rng_dev *priv,</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		omap_rng_write(priv, RNG_INTMASK_REG, RNG_SHUTDOWN_OFLO_MASK);</div><div class='add'>+</div><div class='add'>+		priv-&gt;clk = of_clk_get(pdev-&gt;dev.of_node, 0);</div><div class='add'>+		if (IS_ERR(priv-&gt;clk) &amp;&amp; PTR_ERR(priv-&gt;clk) == -EPROBE_DEFER)</div><div class='add'>+			return -EPROBE_DEFER;</div><div class='add'>+		if (!IS_ERR(priv-&gt;clk)) {</div><div class='add'>+			err = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+			if (err)</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "unable to enable the clk, "</div><div class='add'>+						    "err = %d\n", err);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -372,7 +437,11 @@ static int omap_rng_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	omap_rng_ops.priv = (unsigned long)priv;</div><div class='add'>+	priv-&gt;rng.read = omap_rng_do_read;</div><div class='add'>+	priv-&gt;rng.init = omap_rng_init;</div><div class='add'>+	priv-&gt;rng.cleanup = omap_rng_cleanup;</div><div class='add'>+</div><div class='add'>+	priv-&gt;rng.priv = (unsigned long)priv;</div><div class='ctx'> 	platform_set_drvdata(pdev, priv);</div><div class='ctx'> 	priv-&gt;dev = dev;</div><div class='ctx'> </div><div class='hunk'>@@ -383,6 +452,12 @@ static int omap_rng_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_ioremap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	priv-&gt;rng.name = devm_kstrdup(dev, dev_name(dev), GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;rng.name) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_ioremap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pm_runtime_enable(&amp;pdev-&gt;dev);</div><div class='ctx'> 	ret = pm_runtime_get_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -394,20 +469,24 @@ static int omap_rng_probe(struct platform_device *pdev)</div><div class='ctx'> 	ret = (dev-&gt;of_node) ? of_get_omap_rng_device_details(priv, pdev) :</div><div class='ctx'> 				get_omap_rng_device_details(priv);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_ioremap;</div><div class='add'>+		goto err_register;</div><div class='ctx'> </div><div class='del'>-	ret = hwrng_register(&amp;omap_rng_ops);</div><div class='add'>+	ret = hwrng_register(&amp;priv-&gt;rng);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_register;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "OMAP Random Number Generator ver. %02x\n",</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "Random Number Generator ver. %02x\n",</div><div class='ctx'> 		 omap_rng_read(priv, RNG_REV_REG));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_register:</div><div class='ctx'> 	priv-&gt;base = NULL;</div><div class='add'>+	pm_runtime_put_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> 	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(priv-&gt;clk))</div><div class='add'>+		clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> err_ioremap:</div><div class='ctx'> 	dev_err(dev, "initialization failed.\n");</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -417,13 +496,16 @@ static int omap_rng_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_rng_dev *priv = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='del'>-	hwrng_unregister(&amp;omap_rng_ops);</div><div class='add'>+	hwrng_unregister(&amp;priv-&gt;rng);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;pdata-&gt;cleanup(priv);</div><div class='ctx'> </div><div class='ctx'> 	pm_runtime_put_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> 	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	if (!IS_ERR(priv-&gt;clk))</div><div class='add'>+		clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/hw_random/pic32-rng.c b/drivers/char/hw_random/pic32-rng.c<br/>index 11dc9b7c09ce..9b5e68a71d01 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/pic32-rng.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/pic32-rng.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/pic32-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/pic32-rng.c</a></div><div class='hunk'>@@ -62,9 +62,6 @@ static int pic32_rng_read(struct hwrng *rng, void *buf, size_t max,</div><div class='ctx'> 	u32 t;</div><div class='ctx'> 	unsigned int timeout = RNG_TIMEOUT;</div><div class='ctx'> </div><div class='del'>-	if (max &lt; 8)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	do {</div><div class='ctx'> 		t = readl(priv-&gt;base + RNGRCNT) &amp; RCNT_MASK;</div><div class='ctx'> 		if (t == 64) {</div><div class='head'>diff --git a/drivers/char/hw_random/pseries-rng.c b/drivers/char/hw_random/pseries-rng.c<br/>index 63ce51d09af1..d9f46b437cc2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/pseries-rng.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/pseries-rng.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/pseries-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/pseries-rng.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> static int pseries_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)</div><div class='ctx'> {</div><div class='ctx'> 	u64 buffer[PLPAR_HCALL_BUFSIZE];</div><div class='del'>-	size_t size = max &lt; 8 ? max : 8;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = plpar_hcall(H_RANDOM, (unsigned long *)buffer);</div><div class='hunk'>@@ -36,10 +35,10 @@ static int pseries_rng_read(struct hwrng *rng, void *data, size_t max, bool wait</div><div class='ctx'> 		pr_err_ratelimited("H_RANDOM call failed %d\n", rc);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(data, buffer, size);</div><div class='add'>+	memcpy(data, buffer, 8);</div><div class='ctx'> </div><div class='ctx'> 	/* The hypervisor interface returns 64 bits */</div><div class='del'>-	return size;</div><div class='add'>+	return 8;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/char/hw_random/via-rng.c b/drivers/char/hw_random/via-rng.c<br/>index 44ce80606944..d1f5bb534e0e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/hw_random/via-rng.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/hw_random/via-rng.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/hw_random/via-rng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/hw_random/via-rng.c</a></div><div class='hunk'>@@ -70,21 +70,17 @@ enum {</div><div class='ctx'>  * until we have 4 bytes, thus returning a u32 at a time,</div><div class='ctx'>  * instead of the current u8-at-a-time.</div><div class='ctx'>  *</div><div class='del'>- * Padlock instructions can generate a spurious DNA fault, so</div><div class='del'>- * we have to call them in the context of irq_ts_save/restore()</div><div class='add'>+ * Padlock instructions can generate a spurious DNA fault, but the</div><div class='add'>+ * kernel doesn't use CR0.TS, so this doesn't matter.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static inline u32 xstore(u32 *addr, u32 edx_in)</div><div class='ctx'> {</div><div class='ctx'> 	u32 eax_out;</div><div class='del'>-	int ts_state;</div><div class='del'>-</div><div class='del'>-	ts_state = irq_ts_save();</div><div class='ctx'> </div><div class='ctx'> 	asm(".byte 0x0F,0xA7,0xC0 /* xstore %%edi (addr=%0) */"</div><div class='ctx'> 		: "=m" (*addr), "=a" (eax_out), "+d" (edx_in), "+D" (addr));</div><div class='ctx'> </div><div class='del'>-	irq_ts_restore(ts_state);</div><div class='ctx'> 	return eax_out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/ipmi/Kconfig b/drivers/char/ipmi/Kconfig<br/>index 7f816655cbbf..90f3edffb067 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/ipmi/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/ipmi/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/ipmi/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/Kconfig</a></div><div class='hunk'>@@ -78,7 +78,8 @@ config IPMI_POWEROFF</div><div class='ctx'> endif # IPMI_HANDLER</div><div class='ctx'> </div><div class='ctx'> config ASPEED_BT_IPMI_BMC</div><div class='del'>-	depends on ARCH_ASPEED</div><div class='add'>+	depends on ARCH_ASPEED || COMPILE_TEST</div><div class='add'>+       depends on REGMAP &amp;&amp; REGMAP_MMIO &amp;&amp; MFD_SYSCON</div><div class='ctx'> 	tristate "BT IPMI bmc driver"</div><div class='ctx'> 	help</div><div class='ctx'> 	  Provides a driver for the BT (Block Transfer) IPMI interface</div><div class='head'>diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c<br/>index fc9e8891eae3..d6f5d9eb102d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/ipmi/bt-bmc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/ipmi/bt-bmc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/ipmi/bt-bmc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/bt-bmc.c</a></div><div class='hunk'>@@ -12,10 +12,13 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mfd/syscon.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -60,7 +63,8 @@</div><div class='ctx'> struct bt_bmc {</div><div class='ctx'> 	struct device		dev;</div><div class='ctx'> 	struct miscdevice	miscdev;</div><div class='del'>-	void __iomem		*base;</div><div class='add'>+	struct regmap		*map;</div><div class='add'>+	int			offset;</div><div class='ctx'> 	int			irq;</div><div class='ctx'> 	wait_queue_head_t	queue;</div><div class='ctx'> 	struct timer_list	poll_timer;</div><div class='hunk'>@@ -69,14 +73,29 @@ struct bt_bmc {</div><div class='ctx'> </div><div class='ctx'> static atomic_t open_count = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='add'>+static const struct regmap_config bt_regmap_cfg = {</div><div class='add'>+	.reg_bits = 32,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.reg_stride = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static u8 bt_inb(struct bt_bmc *bt_bmc, int reg)</div><div class='ctx'> {</div><div class='del'>-	return ioread8(bt_bmc-&gt;base + reg);</div><div class='add'>+	uint32_t val = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = regmap_read(bt_bmc-&gt;map, bt_bmc-&gt;offset + reg, &amp;val);</div><div class='add'>+	WARN(rc != 0, "regmap_read() failed: %d\n", rc);</div><div class='add'>+</div><div class='add'>+	return rc == 0 ? (u8) val : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bt_outb(struct bt_bmc *bt_bmc, u8 data, int reg)</div><div class='ctx'> {</div><div class='del'>-	iowrite8(data, bt_bmc-&gt;base + reg);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = regmap_write(bt_bmc-&gt;map, bt_bmc-&gt;offset + reg, data);</div><div class='add'>+	WARN(rc != 0, "regmap_write() failed: %d\n", rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void clr_rd_ptr(struct bt_bmc *bt_bmc)</div><div class='hunk'>@@ -367,14 +386,18 @@ static irqreturn_t bt_bmc_irq(int irq, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct bt_bmc *bt_bmc = arg;</div><div class='ctx'> 	u32 reg;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = regmap_read(bt_bmc-&gt;map, bt_bmc-&gt;offset + BT_CR2, &amp;reg);</div><div class='add'>+	if (rc)</div><div class='add'>+		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	reg = ioread32(bt_bmc-&gt;base + BT_CR2);</div><div class='ctx'> 	reg &amp;= BT_CR2_IRQ_H2B | BT_CR2_IRQ_HBUSY;</div><div class='ctx'> 	if (!reg)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	/* ack pending IRQs */</div><div class='del'>-	iowrite32(reg, bt_bmc-&gt;base + BT_CR2);</div><div class='add'>+	regmap_write(bt_bmc-&gt;map, bt_bmc-&gt;offset + BT_CR2, reg);</div><div class='ctx'> </div><div class='ctx'> 	wake_up(&amp;bt_bmc-&gt;queue);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -384,7 +407,6 @@ static int bt_bmc_config_irq(struct bt_bmc *bt_bmc,</div><div class='ctx'> 			     struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	u32 reg;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	bt_bmc-&gt;irq = platform_get_irq(pdev, 0);</div><div class='hunk'>@@ -405,18 +427,17 @@ static int bt_bmc_config_irq(struct bt_bmc *bt_bmc,</div><div class='ctx'> 	 * will be cleared (along with B2H) when we can write the next</div><div class='ctx'> 	 * message to the BT buffer</div><div class='ctx'> 	 */</div><div class='del'>-	reg = ioread32(bt_bmc-&gt;base + BT_CR1);</div><div class='del'>-	reg |= BT_CR1_IRQ_H2B | BT_CR1_IRQ_HBUSY;</div><div class='del'>-	iowrite32(reg, bt_bmc-&gt;base + BT_CR1);</div><div class='add'>+	rc = regmap_update_bits(bt_bmc-&gt;map, bt_bmc-&gt;offset + BT_CR1,</div><div class='add'>+				(BT_CR1_IRQ_H2B | BT_CR1_IRQ_HBUSY),</div><div class='add'>+				(BT_CR1_IRQ_H2B | BT_CR1_IRQ_HBUSY));</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bt_bmc_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bt_bmc *bt_bmc;</div><div class='ctx'> 	struct device *dev;</div><div class='del'>-	struct resource *res;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!pdev || !pdev-&gt;dev.of_node)</div><div class='hunk'>@@ -431,10 +452,27 @@ static int bt_bmc_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(&amp;pdev-&gt;dev, bt_bmc);</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	bt_bmc-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='del'>-	if (IS_ERR(bt_bmc-&gt;base))</div><div class='del'>-		return PTR_ERR(bt_bmc-&gt;base);</div><div class='add'>+	bt_bmc-&gt;map = syscon_node_to_regmap(pdev-&gt;dev.parent-&gt;of_node);</div><div class='add'>+	if (IS_ERR(bt_bmc-&gt;map)) {</div><div class='add'>+		struct resource *res;</div><div class='add'>+		void __iomem *base;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Assume it's not the MFD-based devicetree description, in</div><div class='add'>+		 * which case generate a regmap ourselves</div><div class='add'>+		 */</div><div class='add'>+		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+		base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+		if (IS_ERR(base))</div><div class='add'>+			return PTR_ERR(base);</div><div class='add'>+</div><div class='add'>+		bt_bmc-&gt;map = devm_regmap_init_mmio(dev, base, &amp;bt_regmap_cfg);</div><div class='add'>+		bt_bmc-&gt;offset = 0;</div><div class='add'>+	} else {</div><div class='add'>+		rc = of_property_read_u32(dev-&gt;of_node, "reg", &amp;bt_bmc-&gt;offset);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;bt_bmc-&gt;mutex);</div><div class='ctx'> 	init_waitqueue_head(&amp;bt_bmc-&gt;queue);</div><div class='hunk'>@@ -461,12 +499,12 @@ static int bt_bmc_probe(struct platform_device *pdev)</div><div class='ctx'> 		add_timer(&amp;bt_bmc-&gt;poll_timer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iowrite32((BT_IO_BASE &lt;&lt; BT_CR0_IO_BASE) |</div><div class='del'>-		  (BT_IRQ &lt;&lt; BT_CR0_IRQ) |</div><div class='del'>-		  BT_CR0_EN_CLR_SLV_RDP |</div><div class='del'>-		  BT_CR0_EN_CLR_SLV_WRP |</div><div class='del'>-		  BT_CR0_ENABLE_IBT,</div><div class='del'>-		  bt_bmc-&gt;base + BT_CR0);</div><div class='add'>+	regmap_write(bt_bmc-&gt;map, bt_bmc-&gt;offset + BT_CR0,</div><div class='add'>+		     (BT_IO_BASE &lt;&lt; BT_CR0_IO_BASE) |</div><div class='add'>+		     (BT_IRQ &lt;&lt; BT_CR0_IRQ) |</div><div class='add'>+		     BT_CR0_EN_CLR_SLV_RDP |</div><div class='add'>+		     BT_CR0_EN_CLR_SLV_WRP |</div><div class='add'>+		     BT_CR0_ENABLE_IBT);</div><div class='ctx'> </div><div class='ctx'> 	clr_b_busy(bt_bmc);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c<br/>index 1786574536b2..f45119c5337d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_devintf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/ipmi/ipmi_devintf.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_devintf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_devintf.c</a></div><div class='hunk'>@@ -108,7 +108,7 @@ static int ipmi_fasync(int fd, struct file *file, int on)</div><div class='ctx'> 	return (result);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ipmi_user_hndl ipmi_hndlrs =</div><div class='add'>+static const struct ipmi_user_hndl ipmi_hndlrs =</div><div class='ctx'> {</div><div class='ctx'> 	.ipmi_recv_hndl	= file_receive_handler,</div><div class='ctx'> };</div><div class='hunk'>@@ -989,4 +989,3 @@ module_exit(cleanup_ipmi);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Corey Minyard &lt;minyard@mvista.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Linux device interface for the IPMI message handler.");</div><div class='del'>-MODULE_ALIAS("platform:ipmi_si");</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c<br/>index fcdd886819f5..9f699951b75a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_msghandler.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/ipmi/ipmi_msghandler.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_msghandler.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_msghandler.c</a></div><div class='hunk'>@@ -102,7 +102,7 @@ struct ipmi_user {</div><div class='ctx'> 	struct kref refcount;</div><div class='ctx'> </div><div class='ctx'> 	/* The upper layer that handles receive messages. */</div><div class='del'>-	struct ipmi_user_hndl *handler;</div><div class='add'>+	const struct ipmi_user_hndl *handler;</div><div class='ctx'> 	void             *handler_data;</div><div class='ctx'> </div><div class='ctx'> 	/* The interface this user is bound to. */</div><div class='hunk'>@@ -158,15 +158,16 @@ struct seq_table {</div><div class='ctx'>  * Store the information in a msgid (long) to allow us to find a</div><div class='ctx'>  * sequence table entry from the msgid.</div><div class='ctx'>  */</div><div class='del'>-#define STORE_SEQ_IN_MSGID(seq, seqid) (((seq&amp;0xff)&lt;&lt;26) | (seqid&amp;0x3ffffff))</div><div class='add'>+#define STORE_SEQ_IN_MSGID(seq, seqid) \</div><div class='add'>+	((((seq) &amp; 0x3f) &lt;&lt; 26) | ((seqid) &amp; 0x3ffffff))</div><div class='ctx'> </div><div class='ctx'> #define GET_SEQ_FROM_MSGID(msgid, seq, seqid) \</div><div class='ctx'> 	do {								\</div><div class='del'>-		seq = ((msgid &gt;&gt; 26) &amp; 0x3f);				\</div><div class='del'>-		seqid = (msgid &amp; 0x3fffff);				\</div><div class='add'>+		seq = (((msgid) &gt;&gt; 26) &amp; 0x3f);				\</div><div class='add'>+		seqid = ((msgid) &amp; 0x3ffffff);				\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define NEXT_SEQID(seqid) (((seqid) + 1) &amp; 0x3fffff)</div><div class='add'>+#define NEXT_SEQID(seqid) (((seqid) + 1) &amp; 0x3ffffff)</div><div class='ctx'> </div><div class='ctx'> struct ipmi_channel {</div><div class='ctx'> 	unsigned char medium;</div><div class='hunk'>@@ -918,7 +919,7 @@ static int intf_err_seq(ipmi_smi_t   intf,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> int ipmi_create_user(unsigned int          if_num,</div><div class='del'>-		     struct ipmi_user_hndl *handler,</div><div class='add'>+		     const struct ipmi_user_hndl *handler,</div><div class='ctx'> 		     void                  *handler_data,</div><div class='ctx'> 		     ipmi_user_t           *user)</div><div class='ctx'> {</div><div class='hunk'>@@ -4645,3 +4646,4 @@ MODULE_AUTHOR("Corey Minyard &lt;minyard@mvista.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Incoming and outgoing message routing for an IPMI"</div><div class='ctx'> 		   " interface.");</div><div class='ctx'> MODULE_VERSION(IPMI_DRIVER_VERSION);</div><div class='add'>+MODULE_SOFTDEP("post: ipmi_devintf");</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_powernv.c b/drivers/char/ipmi/ipmi_powernv.c<br/>index 6e658aa114f1..b338a4becbf8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_powernv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/ipmi/ipmi_powernv.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_powernv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_powernv.c</a></div><div class='hunk'>@@ -196,7 +196,7 @@ static void ipmi_powernv_poll(void *send_info)</div><div class='ctx'> 	ipmi_powernv_recv(smi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ipmi_smi_handlers ipmi_powernv_smi_handlers = {</div><div class='add'>+static const struct ipmi_smi_handlers ipmi_powernv_smi_handlers = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.start_processing	= ipmi_powernv_start_processing,</div><div class='ctx'> 	.sender			= ipmi_powernv_send,</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c<br/>index a112c0146012..2a7c425ddfa7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_si_intf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/ipmi/ipmi_si_intf.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_si_intf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_si_intf.c</a></div><div class='hunk'>@@ -789,7 +789,7 @@ static void handle_transaction_done(struct smi_info *smi_info)</div><div class='ctx'> 				smi_info-&gt;si_state = SI_NORMAL;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			start_getting_msg_queue(smi_info);</div><div class='add'>+			start_getting_events(smi_info);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			smi_info-&gt;si_state = SI_NORMAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -812,7 +812,7 @@ static void handle_transaction_done(struct smi_info *smi_info)</div><div class='ctx'> 				smi_info-&gt;si_state = SI_NORMAL;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			start_getting_msg_queue(smi_info);</div><div class='add'>+			start_getting_events(smi_info);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			smi_info-&gt;si_state = SI_NORMAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1764,7 +1764,7 @@ static int parse_str(const struct hotmod_vals *v, int *val, char *name,</div><div class='ctx'> </div><div class='ctx'> 	s = strchr(*curr, ',');</div><div class='ctx'> 	if (!s) {</div><div class='del'>-		printk(KERN_WARNING PFX "No hotmod %s given.\n", name);</div><div class='add'>+		pr_warn(PFX "No hotmod %s given.\n", name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	*s = '\0';</div><div class='hunk'>@@ -1777,7 +1777,7 @@ static int parse_str(const struct hotmod_vals *v, int *val, char *name,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_WARNING PFX "Invalid hotmod %s '%s'\n", name, *curr);</div><div class='add'>+	pr_warn(PFX "Invalid hotmod %s '%s'\n", name, *curr);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1788,16 +1788,12 @@ static int check_hotmod_int_op(const char *curr, const char *option,</div><div class='ctx'> </div><div class='ctx'> 	if (strcmp(curr, name) == 0) {</div><div class='ctx'> 		if (!option) {</div><div class='del'>-			printk(KERN_WARNING PFX</div><div class='del'>-			       "No option given for '%s'\n",</div><div class='del'>-			       curr);</div><div class='add'>+			pr_warn(PFX "No option given for '%s'\n", curr);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		*val = simple_strtoul(option, &amp;n, 0);</div><div class='ctx'> 		if ((*n != '\0') || (*option == '\0')) {</div><div class='del'>-			printk(KERN_WARNING PFX</div><div class='del'>-			       "Bad option given for '%s'\n",</div><div class='del'>-			       curr);</div><div class='add'>+			pr_warn(PFX "Bad option given for '%s'\n", curr);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -1877,8 +1873,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)</div><div class='ctx'> 		}</div><div class='ctx'> 		addr = simple_strtoul(curr, &amp;n, 0);</div><div class='ctx'> 		if ((*n != '\0') || (*curr == '\0')) {</div><div class='del'>-			printk(KERN_WARNING PFX "Invalid hotmod address"</div><div class='del'>-			       " '%s'\n", curr);</div><div class='add'>+			pr_warn(PFX "Invalid hotmod address '%s'\n", curr);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1921,9 +1916,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			rv = -EINVAL;</div><div class='del'>-			printk(KERN_WARNING PFX</div><div class='del'>-			       "Invalid hotmod option '%s'\n",</div><div class='del'>-			       curr);</div><div class='add'>+			pr_warn(PFX "Invalid hotmod option '%s'\n", curr);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2003,7 +1996,7 @@ static int hardcode_find_bmc(void)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		info-&gt;addr_source = SI_HARDCODED;</div><div class='del'>-		printk(KERN_INFO PFX "probing via hardcoded address\n");</div><div class='add'>+		pr_info(PFX "probing via hardcoded address\n");</div><div class='ctx'> </div><div class='ctx'> 		if (!si_type[i] || strcmp(si_type[i], "kcs") == 0) {</div><div class='ctx'> 			info-&gt;si_type = SI_KCS;</div><div class='hunk'>@@ -2012,9 +2005,8 @@ static int hardcode_find_bmc(void)</div><div class='ctx'> 		} else if (strcmp(si_type[i], "bt") == 0) {</div><div class='ctx'> 			info-&gt;si_type = SI_BT;</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(KERN_WARNING PFX "Interface type specified "</div><div class='del'>-			       "for interface %d, was invalid: %s\n",</div><div class='del'>-			       i, si_type[i]);</div><div class='add'>+			pr_warn(PFX "Interface type specified for interface %d, was invalid: %s\n",</div><div class='add'>+				i, si_type[i]);</div><div class='ctx'> 			kfree(info);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2030,9 +2022,8 @@ static int hardcode_find_bmc(void)</div><div class='ctx'> 			info-&gt;io.addr_data = addrs[i];</div><div class='ctx'> 			info-&gt;io.addr_type = IPMI_MEM_ADDR_SPACE;</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(KERN_WARNING PFX "Interface type specified "</div><div class='del'>-			       "for interface %d, but port and address were "</div><div class='del'>-			       "not set or set to zero.\n", i);</div><div class='add'>+			pr_warn(PFX "Interface type specified for interface %d, but port and address were not set or set to zero.\n",</div><div class='add'>+				i);</div><div class='ctx'> 			kfree(info);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2173,18 +2164,18 @@ static int try_init_spmi(struct SPMITable *spmi)</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='ctx'> 	if (spmi-&gt;IPMIlegacy != 1) {</div><div class='del'>-		printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi-&gt;IPMIlegacy);</div><div class='add'>+		pr_info(PFX "Bad SPMI legacy %d\n", spmi-&gt;IPMIlegacy);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info = smi_info_alloc();</div><div class='ctx'> 	if (!info) {</div><div class='del'>-		printk(KERN_ERR PFX "Could not allocate SI data (3)\n");</div><div class='add'>+		pr_err(PFX "Could not allocate SI data (3)\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;addr_source = SI_SPMI;</div><div class='del'>-	printk(KERN_INFO PFX "probing via SPMI\n");</div><div class='add'>+	pr_info(PFX "probing via SPMI\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Figure out the interface type. */</div><div class='ctx'> 	switch (spmi-&gt;InterfaceType) {</div><div class='hunk'>@@ -2201,8 +2192,8 @@ static int try_init_spmi(struct SPMITable *spmi)</div><div class='ctx'> 		kfree(info);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_INFO PFX "Unknown ACPI/SPMI SI type %d\n",</div><div class='del'>-		       spmi-&gt;InterfaceType);</div><div class='add'>+		pr_info(PFX "Unknown ACPI/SPMI SI type %d\n",</div><div class='add'>+			spmi-&gt;InterfaceType);</div><div class='ctx'> 		kfree(info);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2238,15 +2229,15 @@ static int try_init_spmi(struct SPMITable *spmi)</div><div class='ctx'> 		info-&gt;io.addr_type = IPMI_IO_ADDR_SPACE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kfree(info);</div><div class='del'>-		printk(KERN_WARNING PFX "Unknown ACPI I/O Address type\n");</div><div class='add'>+		pr_warn(PFX "Unknown ACPI I/O Address type\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	info-&gt;io.addr_data = spmi-&gt;addr.address;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("ipmi_si: SPMI: %s %#lx regsize %d spacing %d irq %d\n",</div><div class='del'>-		 (info-&gt;io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem",</div><div class='del'>-		 info-&gt;io.addr_data, info-&gt;io.regsize, info-&gt;io.regspacing,</div><div class='del'>-		 info-&gt;irq);</div><div class='add'>+		(info-&gt;io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem",</div><div class='add'>+		info-&gt;io.addr_data, info-&gt;io.regsize, info-&gt;io.regspacing,</div><div class='add'>+		info-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	rv = add_smi(info);</div><div class='ctx'> 	if (rv)</div><div class='hunk'>@@ -2356,12 +2347,12 @@ static void try_init_dmi(struct dmi_ipmi_data *ipmi_data)</div><div class='ctx'> </div><div class='ctx'> 	info = smi_info_alloc();</div><div class='ctx'> 	if (!info) {</div><div class='del'>-		printk(KERN_ERR PFX "Could not allocate SI data\n");</div><div class='add'>+		pr_err(PFX "Could not allocate SI data\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;addr_source = SI_SMBIOS;</div><div class='del'>-	printk(KERN_INFO PFX "probing via SMBIOS\n");</div><div class='add'>+	pr_info(PFX "probing via SMBIOS\n");</div><div class='ctx'> </div><div class='ctx'> 	switch (ipmi_data-&gt;type) {</div><div class='ctx'> 	case 0x01: /* KCS */</div><div class='hunk'>@@ -2391,8 +2382,8 @@ static void try_init_dmi(struct dmi_ipmi_data *ipmi_data)</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		kfree(info);</div><div class='del'>-		printk(KERN_WARNING PFX "Unknown SMBIOS I/O Address type: %d\n",</div><div class='del'>-		       ipmi_data-&gt;addr_space);</div><div class='add'>+		pr_warn(PFX "Unknown SMBIOS I/O Address type: %d\n",</div><div class='add'>+			ipmi_data-&gt;addr_space);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	info-&gt;io.addr_data = ipmi_data-&gt;base_addr;</div><div class='hunk'>@@ -2410,9 +2401,9 @@ static void try_init_dmi(struct dmi_ipmi_data *ipmi_data)</div><div class='ctx'> 		info-&gt;irq_setup = std_irq_setup;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("ipmi_si: SMBIOS: %s %#lx regsize %d spacing %d irq %d\n",</div><div class='del'>-		 (info-&gt;io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem",</div><div class='del'>-		 info-&gt;io.addr_data, info-&gt;io.regsize, info-&gt;io.regspacing,</div><div class='del'>-		 info-&gt;irq);</div><div class='add'>+		(info-&gt;io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem",</div><div class='add'>+		info-&gt;io.addr_data, info-&gt;io.regsize, info-&gt;io.regspacing,</div><div class='add'>+		info-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	if (add_smi(info))</div><div class='ctx'> 		kfree(info);</div><div class='hunk'>@@ -3141,9 +3132,7 @@ static int try_enable_event_buffer(struct smi_info *smi_info)</div><div class='ctx'> </div><div class='ctx'> 	rv = wait_for_msg_done(smi_info);</div><div class='ctx'> 	if (rv) {</div><div class='del'>-		printk(KERN_WARNING PFX "Error getting response from get"</div><div class='del'>-		       " global enables command, the event buffer is not"</div><div class='del'>-		       " enabled.\n");</div><div class='add'>+		pr_warn(PFX "Error getting response from get global enables command, the event buffer is not enabled.\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3154,8 +3143,7 @@ static int try_enable_event_buffer(struct smi_info *smi_info)</div><div class='ctx'> 			resp[0] != (IPMI_NETFN_APP_REQUEST | 1) &lt;&lt; 2 ||</div><div class='ctx'> 			resp[1] != IPMI_GET_BMC_GLOBAL_ENABLES_CMD   ||</div><div class='ctx'> 			resp[2] != 0) {</div><div class='del'>-		printk(KERN_WARNING PFX "Invalid return from get global"</div><div class='del'>-		       " enables command, cannot enable the event buffer.\n");</div><div class='add'>+		pr_warn(PFX "Invalid return from get global enables command, cannot enable the event buffer.\n");</div><div class='ctx'> 		rv = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3173,9 +3161,7 @@ static int try_enable_event_buffer(struct smi_info *smi_info)</div><div class='ctx'> </div><div class='ctx'> 	rv = wait_for_msg_done(smi_info);</div><div class='ctx'> 	if (rv) {</div><div class='del'>-		printk(KERN_WARNING PFX "Error getting response from set"</div><div class='del'>-		       " global, enables command, the event buffer is not"</div><div class='del'>-		       " enabled.\n");</div><div class='add'>+		pr_warn(PFX "Error getting response from set global, enables command, the event buffer is not enabled.\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3185,8 +3171,7 @@ static int try_enable_event_buffer(struct smi_info *smi_info)</div><div class='ctx'> 	if (resp_len &lt; 3 ||</div><div class='ctx'> 			resp[0] != (IPMI_NETFN_APP_REQUEST | 1) &lt;&lt; 2 ||</div><div class='ctx'> 			resp[1] != IPMI_SET_BMC_GLOBAL_ENABLES_CMD) {</div><div class='del'>-		printk(KERN_WARNING PFX "Invalid return from get global,"</div><div class='del'>-		       "enables command, not enable the event buffer.\n");</div><div class='add'>+		pr_warn(PFX "Invalid return from get global, enables command, not enable the event buffer.\n");</div><div class='ctx'> 		rv = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3463,8 +3448,16 @@ static int is_new_interface(struct smi_info *info)</div><div class='ctx'> 	list_for_each_entry(e, &amp;smi_infos, link) {</div><div class='ctx'> 		if (e-&gt;io.addr_type != info-&gt;io.addr_type)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (e-&gt;io.addr_data == info-&gt;io.addr_data)</div><div class='add'>+		if (e-&gt;io.addr_data == info-&gt;io.addr_data) {</div><div class='add'>+			/*</div><div class='add'>+			 * This is a cheap hack, ACPI doesn't have a defined</div><div class='add'>+			 * slave address but SMBIOS does.  Pick it up from</div><div class='add'>+			 * any source that has it available.</div><div class='add'>+			 */</div><div class='add'>+			if (info-&gt;slave_addr &amp;&amp; !e-&gt;slave_addr)</div><div class='add'>+				e-&gt;slave_addr = info-&gt;slave_addr;</div><div class='ctx'> 			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -3474,17 +3467,18 @@ static int add_smi(struct smi_info *new_smi)</div><div class='ctx'> {</div><div class='ctx'> 	int rv = 0;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "Adding %s-specified %s state machine",</div><div class='del'>-	       ipmi_addr_src_to_str(new_smi-&gt;addr_source),</div><div class='del'>-	       si_to_str[new_smi-&gt;si_type]);</div><div class='ctx'> 	mutex_lock(&amp;smi_infos_lock);</div><div class='ctx'> 	if (!is_new_interface(new_smi)) {</div><div class='del'>-		printk(KERN_CONT " duplicate interface\n");</div><div class='add'>+		pr_info(PFX "%s-specified %s state machine: duplicate\n",</div><div class='add'>+			ipmi_addr_src_to_str(new_smi-&gt;addr_source),</div><div class='add'>+			si_to_str[new_smi-&gt;si_type]);</div><div class='ctx'> 		rv = -EBUSY;</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_CONT "\n");</div><div class='add'>+	pr_info(PFX "Adding %s-specified %s state machine\n",</div><div class='add'>+		ipmi_addr_src_to_str(new_smi-&gt;addr_source),</div><div class='add'>+		si_to_str[new_smi-&gt;si_type]);</div><div class='ctx'> </div><div class='ctx'> 	/* So we know not to free it unless we have allocated one. */</div><div class='ctx'> 	new_smi-&gt;intf = NULL;</div><div class='hunk'>@@ -3502,15 +3496,14 @@ static int try_smi_init(struct smi_info *new_smi)</div><div class='ctx'> {</div><div class='ctx'> 	int rv = 0;</div><div class='ctx'> 	int i;</div><div class='add'>+	char *init_name = NULL;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "Trying %s-specified %s state"</div><div class='del'>-	       " machine at %s address 0x%lx, slave address 0x%x,"</div><div class='del'>-	       " irq %d\n",</div><div class='del'>-	       ipmi_addr_src_to_str(new_smi-&gt;addr_source),</div><div class='del'>-	       si_to_str[new_smi-&gt;si_type],</div><div class='del'>-	       addr_space_to_str[new_smi-&gt;io.addr_type],</div><div class='del'>-	       new_smi-&gt;io.addr_data,</div><div class='del'>-	       new_smi-&gt;slave_addr, new_smi-&gt;irq);</div><div class='add'>+	pr_info(PFX "Trying %s-specified %s state machine at %s address 0x%lx, slave address 0x%x, irq %d\n",</div><div class='add'>+		ipmi_addr_src_to_str(new_smi-&gt;addr_source),</div><div class='add'>+		si_to_str[new_smi-&gt;si_type],</div><div class='add'>+		addr_space_to_str[new_smi-&gt;io.addr_type],</div><div class='add'>+		new_smi-&gt;io.addr_data,</div><div class='add'>+		new_smi-&gt;slave_addr, new_smi-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	switch (new_smi-&gt;si_type) {</div><div class='ctx'> 	case SI_KCS:</div><div class='hunk'>@@ -3531,11 +3524,30 @@ static int try_smi_init(struct smi_info *new_smi)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Do this early so it's available for logs. */</div><div class='add'>+	if (!new_smi-&gt;dev) {</div><div class='add'>+		init_name = kasprintf(GFP_KERNEL, "ipmi_si.%d", 0);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If we don't already have a device from something</div><div class='add'>+		 * else (like PCI), then register a new one.</div><div class='add'>+		 */</div><div class='add'>+		new_smi-&gt;pdev = platform_device_alloc("ipmi_si",</div><div class='add'>+						      new_smi-&gt;intf_num);</div><div class='add'>+		if (!new_smi-&gt;pdev) {</div><div class='add'>+			pr_err(PFX "Unable to allocate platform device\n");</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+		new_smi-&gt;dev = &amp;new_smi-&gt;pdev-&gt;dev;</div><div class='add'>+		new_smi-&gt;dev-&gt;driver = &amp;ipmi_driver.driver;</div><div class='add'>+		/* Nulled by device_add() */</div><div class='add'>+		new_smi-&gt;dev-&gt;init_name = init_name;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Allocate the state machine's data and initialize it. */</div><div class='ctx'> 	new_smi-&gt;si_sm = kmalloc(new_smi-&gt;handlers-&gt;size(), GFP_KERNEL);</div><div class='ctx'> 	if (!new_smi-&gt;si_sm) {</div><div class='del'>-		printk(KERN_ERR PFX</div><div class='del'>-		       "Could not allocate state machine memory\n");</div><div class='add'>+		pr_err(PFX "Could not allocate state machine memory\n");</div><div class='ctx'> 		rv = -ENOMEM;</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3545,14 +3557,14 @@ static int try_smi_init(struct smi_info *new_smi)</div><div class='ctx'> 	/* Now that we know the I/O size, we can set up the I/O. */</div><div class='ctx'> 	rv = new_smi-&gt;io_setup(new_smi);</div><div class='ctx'> 	if (rv) {</div><div class='del'>-		printk(KERN_ERR PFX "Could not set up I/O space\n");</div><div class='add'>+		dev_err(new_smi-&gt;dev, "Could not set up I/O space\n");</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Do low-level detection first. */</div><div class='ctx'> 	if (new_smi-&gt;handlers-&gt;detect(new_smi-&gt;si_sm)) {</div><div class='ctx'> 		if (new_smi-&gt;addr_source)</div><div class='del'>-			printk(KERN_INFO PFX "Interface detection failed\n");</div><div class='add'>+			dev_err(new_smi-&gt;dev, "Interface detection failed\n");</div><div class='ctx'> 		rv = -ENODEV;</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3564,8 +3576,7 @@ static int try_smi_init(struct smi_info *new_smi)</div><div class='ctx'> 	rv = try_get_dev_id(new_smi);</div><div class='ctx'> 	if (rv) {</div><div class='ctx'> 		if (new_smi-&gt;addr_source)</div><div class='del'>-			printk(KERN_INFO PFX "There appears to be no BMC"</div><div class='del'>-			       " at this location\n");</div><div class='add'>+			dev_err(new_smi-&gt;dev, "There appears to be no BMC at this location\n");</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3604,27 +3615,12 @@ static int try_smi_init(struct smi_info *new_smi)</div><div class='ctx'> 		atomic_set(&amp;new_smi-&gt;req_events, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!new_smi-&gt;dev) {</div><div class='del'>-		/*</div><div class='del'>-		 * If we don't already have a device from something</div><div class='del'>-		 * else (like PCI), then register a new one.</div><div class='del'>-		 */</div><div class='del'>-		new_smi-&gt;pdev = platform_device_alloc("ipmi_si",</div><div class='del'>-						      new_smi-&gt;intf_num);</div><div class='del'>-		if (!new_smi-&gt;pdev) {</div><div class='del'>-			printk(KERN_ERR PFX</div><div class='del'>-			       "Unable to allocate platform device\n");</div><div class='del'>-			goto out_err;</div><div class='del'>-		}</div><div class='del'>-		new_smi-&gt;dev = &amp;new_smi-&gt;pdev-&gt;dev;</div><div class='del'>-		new_smi-&gt;dev-&gt;driver = &amp;ipmi_driver.driver;</div><div class='del'>-</div><div class='add'>+	if (new_smi-&gt;pdev) {</div><div class='ctx'> 		rv = platform_device_add(new_smi-&gt;pdev);</div><div class='ctx'> 		if (rv) {</div><div class='del'>-			printk(KERN_ERR PFX</div><div class='del'>-			       "Unable to register system interface device:"</div><div class='del'>-			       " %d\n",</div><div class='del'>-			       rv);</div><div class='add'>+			dev_err(new_smi-&gt;dev,</div><div class='add'>+				"Unable to register system interface device: %d\n",</div><div class='add'>+				rv);</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 		}</div><div class='ctx'> 		new_smi-&gt;dev_registered = true;</div><div class='hunk'>@@ -3668,6 +3664,9 @@ static int try_smi_init(struct smi_info *new_smi)</div><div class='ctx'> 	dev_info(new_smi-&gt;dev, "IPMI %s interface initialized\n",</div><div class='ctx'> 		 si_to_str[new_smi-&gt;si_type]);</div><div class='ctx'> </div><div class='add'>+	WARN_ON(new_smi-&gt;dev-&gt;init_name != NULL);</div><div class='add'>+	kfree(init_name);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_err_stop_timer:</div><div class='hunk'>@@ -3712,8 +3711,14 @@ out_err:</div><div class='ctx'> 	if (new_smi-&gt;dev_registered) {</div><div class='ctx'> 		platform_device_unregister(new_smi-&gt;pdev);</div><div class='ctx'> 		new_smi-&gt;dev_registered = false;</div><div class='add'>+		new_smi-&gt;pdev = NULL;</div><div class='add'>+	} else if (new_smi-&gt;pdev) {</div><div class='add'>+		platform_device_put(new_smi-&gt;pdev);</div><div class='add'>+		new_smi-&gt;pdev = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	kfree(init_name);</div><div class='add'>+</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3732,8 +3737,7 @@ static int init_ipmi_si(void)</div><div class='ctx'> 	if (si_tryplatform) {</div><div class='ctx'> 		rv = platform_driver_register(&amp;ipmi_driver);</div><div class='ctx'> 		if (rv) {</div><div class='del'>-			printk(KERN_ERR PFX "Unable to register "</div><div class='del'>-			       "driver: %d\n", rv);</div><div class='add'>+			pr_err(PFX "Unable to register driver: %d\n", rv);</div><div class='ctx'> 			return rv;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3753,7 +3757,7 @@ static int init_ipmi_si(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "IPMI System Interface driver.\n");</div><div class='add'>+	pr_info("IPMI System Interface driver.\n");</div><div class='ctx'> </div><div class='ctx'> 	/* If the user gave us a device, they presumably want us to use it */</div><div class='ctx'> 	if (!hardcode_find_bmc())</div><div class='hunk'>@@ -3763,8 +3767,7 @@ static int init_ipmi_si(void)</div><div class='ctx'> 	if (si_trypci) {</div><div class='ctx'> 		rv = pci_register_driver(&amp;ipmi_pci_driver);</div><div class='ctx'> 		if (rv)</div><div class='del'>-			printk(KERN_ERR PFX "Unable to register "</div><div class='del'>-			       "PCI driver: %d\n", rv);</div><div class='add'>+			pr_err(PFX "Unable to register PCI driver: %d\n", rv);</div><div class='ctx'> 		else</div><div class='ctx'> 			pci_registered = true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3826,8 +3829,7 @@ static int init_ipmi_si(void)</div><div class='ctx'> 	if (unload_when_empty &amp;&amp; list_empty(&amp;smi_infos)) {</div><div class='ctx'> 		mutex_unlock(&amp;smi_infos_lock);</div><div class='ctx'> 		cleanup_ipmi_si();</div><div class='del'>-		printk(KERN_WARNING PFX</div><div class='del'>-		       "Unable to find any System Interface(s)\n");</div><div class='add'>+		pr_warn(PFX "Unable to find any System Interface(s)\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mutex_unlock(&amp;smi_infos_lock);</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c<br/>index 5673ffff00be..cca6e5bc1cea 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_ssif.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/ipmi/ipmi_ssif.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_ssif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_ssif.c</a></div><div class='hunk'>@@ -174,7 +174,6 @@ enum ssif_stat_indexes {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ssif_addr_info {</div><div class='del'>-	unsigned short addr;</div><div class='ctx'> 	struct i2c_board_info binfo;</div><div class='ctx'> 	char *adapter_name;</div><div class='ctx'> 	int debug;</div><div class='hunk'>@@ -1154,10 +1153,6 @@ static bool ssif_dbg_probe;</div><div class='ctx'> module_param_named(dbg_probe, ssif_dbg_probe, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(dbg_probe, "Enable debugging of probing of adapters.");</div><div class='ctx'> </div><div class='del'>-static int use_thread;</div><div class='del'>-module_param(use_thread, int, 0);</div><div class='del'>-MODULE_PARM_DESC(use_thread, "Use the thread interface.");</div><div class='del'>-</div><div class='ctx'> static bool ssif_tryacpi = true;</div><div class='ctx'> module_param_named(tryacpi, ssif_tryacpi, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(tryacpi, "Setting this to zero will disable the default scan of the interfaces identified via ACPI");</div><div class='hunk'>@@ -1405,6 +1400,34 @@ static bool check_acpi(struct ssif_info *ssif_info, struct device *dev)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int find_slave_address(struct i2c_client *client, int slave_addr)</div><div class='add'>+{</div><div class='add'>+	struct ssif_addr_info *info;</div><div class='add'>+</div><div class='add'>+	if (slave_addr)</div><div class='add'>+		return slave_addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Came in without a slave address, search around to see if</div><div class='add'>+	 * the other sources have a slave address.  This lets us pick</div><div class='add'>+	 * up an SMBIOS slave address when using ACPI.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(info, &amp;ssif_infos, link) {</div><div class='add'>+		if (info-&gt;binfo.addr != client-&gt;addr)</div><div class='add'>+			continue;</div><div class='add'>+		if (info-&gt;adapter_name &amp;&amp; client-&gt;adapter-&gt;name &amp;&amp;</div><div class='add'>+		    strcmp_nospace(info-&gt;adapter_name,</div><div class='add'>+				   client-&gt;adapter-&gt;name))</div><div class='add'>+			continue;</div><div class='add'>+		if (info-&gt;slave_addr) {</div><div class='add'>+			slave_addr = info-&gt;slave_addr;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return slave_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Global enables we care about.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1447,6 +1470,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	slave_addr = find_slave_address(client, slave_addr);</div><div class='add'>+</div><div class='ctx'> 	pr_info(PFX "Trying %s-specified SSIF interface at i2c address 0x%x, adapter %s, slave address 0x%x\n",</div><div class='ctx'> 	       ipmi_addr_src_to_str(ssif_info-&gt;addr_source),</div><div class='ctx'> 	       client-&gt;addr, client-&gt;adapter-&gt;name, slave_addr);</div><div class='hunk'>@@ -1935,7 +1960,7 @@ static int decode_dmi(const struct dmi_device *dmi_dev)</div><div class='ctx'> 		slave_addr = data[6];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return new_ssif_client(myaddr, NULL, 0, 0, SI_SMBIOS);</div><div class='add'>+	return new_ssif_client(myaddr, NULL, 0, slave_addr, SI_SMBIOS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dmi_iterator(void)</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c<br/>index 4facc7517a6a..5ca24d9b101b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_watchdog.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/ipmi/ipmi_watchdog.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/ipmi/ipmi_watchdog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ipmi/ipmi_watchdog.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='hunk'>@@ -53,6 +53,7 @@</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86</div><div class='ctx'> /*</div><div class='hunk'>@@ -985,7 +986,7 @@ static void ipmi_wdog_pretimeout_handler(void *handler_data)</div><div class='ctx'> 	pretimeout_since_last_heartbeat = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ipmi_user_hndl ipmi_hndlrs = {</div><div class='add'>+static const struct ipmi_user_hndl ipmi_hndlrs = {</div><div class='ctx'> 	.ipmi_recv_hndl           = ipmi_wdog_msg_handler,</div><div class='ctx'> 	.ipmi_watchdog_pretimeout = ipmi_wdog_pretimeout_handler</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/char/lp.c b/drivers/char/lp.c<br/>index c4094c4e22c1..565e4cf04a02 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/lp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/lp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/lp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/lp.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -134,7 +134,7 @@</div><div class='ctx'> #include &lt;linux/lp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* if you have more than 8 printers, remember to increase LP_NO */</div><div class='ctx'> #define LP_NO 8</div><div class='head'>diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c<br/>index 67d426470e53..8c9216a0f62e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/mbcs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/mbcs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/mbcs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mbcs.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/sn/addrs.h&gt;</div><div class='ctx'> #include &lt;asm/sn/intr.h&gt;</div><div class='head'>diff --git a/drivers/char/mem.c b/drivers/char/mem.c<br/>index 5bb1985ec484..6d9cc2d39d22 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/mem.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/mem.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/mem.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mem.c</a></div><div class='hunk'>@@ -381,9 +381,6 @@ static ssize_t read_kmem(struct file *file, char __user *buf,</div><div class='ctx'> 	char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!pfn_valid(PFN_DOWN(p)))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='ctx'> 	read = 0;</div><div class='ctx'> 	if (p &lt; (unsigned long) high_memory) {</div><div class='ctx'> 		low_count = count;</div><div class='hunk'>@@ -412,6 +409,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,</div><div class='ctx'> 			 * by the kernel or data corruption may occur</div><div class='ctx'> 			 */</div><div class='ctx'> 			kbuf = xlate_dev_kmem_ptr((void *)p);</div><div class='add'>+			if (!virt_addr_valid(kbuf))</div><div class='add'>+				return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 			if (copy_to_user(buf, kbuf, sz))</div><div class='ctx'> 				return -EFAULT;</div><div class='hunk'>@@ -482,6 +481,8 @@ static ssize_t do_write_kmem(unsigned long p, const char __user *buf,</div><div class='ctx'> 		 * corruption may occur.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ptr = xlate_dev_kmem_ptr((void *)p);</div><div class='add'>+		if (!virt_addr_valid(ptr))</div><div class='add'>+			return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 		copied = copy_from_user(ptr, buf, sz);</div><div class='ctx'> 		if (copied) {</div><div class='hunk'>@@ -512,9 +513,6 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,</div><div class='ctx'> 	char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!pfn_valid(PFN_DOWN(p)))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='ctx'> 	if (p &lt; (unsigned long) high_memory) {</div><div class='ctx'> 		unsigned long to_write = min_t(unsigned long, count,</div><div class='ctx'> 					       (unsigned long)high_memory - p);</div><div class='head'>diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c<br/>index 3d6c0671e996..b708c85dc9c1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/mmtimer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/mmtimer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/mmtimer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mmtimer.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/sn/addrs.h&gt;</div><div class='ctx'> #include &lt;asm/sn/intr.h&gt;</div><div class='ctx'> #include &lt;asm/sn/shub_mmr.h&gt;</div><div class='hunk'>@@ -463,9 +463,9 @@ static int mmtimer_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct miscdevice mmtimer_miscdev = {</div><div class='del'>-	SGI_MMTIMER,</div><div class='del'>-	MMTIMER_NAME,</div><div class='del'>-	&amp;mmtimer_fops</div><div class='add'>+	.minor = SGI_MMTIMER,</div><div class='add'>+	.name = MMTIMER_NAME,</div><div class='add'>+	.fops = &amp;mmtimer_fops</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct timespec sgi_clock_offset;</div><div class='head'>diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c<br/>index f3f92d5fcda0..a9c2fa3c81e5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/mspec.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/mspec.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/mspec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mspec.c</a></div><div class='hunk'>@@ -191,12 +191,12 @@ mspec_close(struct vm_area_struct *vma)</div><div class='ctx'>  * Creates a mspec page and maps it to user space.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-mspec_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+mspec_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long paddr, maddr;</div><div class='ctx'> 	unsigned long pfn;</div><div class='ctx'> 	pgoff_t index = vmf-&gt;pgoff;</div><div class='del'>-	struct vma_data *vdata = vma-&gt;vm_private_data;</div><div class='add'>+	struct vma_data *vdata = vmf-&gt;vma-&gt;vm_private_data;</div><div class='ctx'> </div><div class='ctx'> 	maddr = (volatile unsigned long) vdata-&gt;maddr[index];</div><div class='ctx'> 	if (maddr == 0) {</div><div class='hunk'>@@ -227,7 +227,7 @@ mspec_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='ctx'> 	 * be because another thread has installed the pte first, so it</div><div class='ctx'> 	 * is no problem.</div><div class='ctx'> 	 */</div><div class='del'>-	vm_insert_pfn(vma, (unsigned long)vmf-&gt;virtual_address, pfn);</div><div class='add'>+	vm_insert_pfn(vmf-&gt;vma, vmf-&gt;address, pfn);</div><div class='ctx'> </div><div class='ctx'> 	return VM_FAULT_NOPAGE;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c<br/>index 972c40a19629..4a8937f80570 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/mwave/3780i.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/mwave/3780i.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/mwave/3780i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mwave/3780i.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;	/* cond_resched() */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include "smapi.h"</div><div class='ctx'> #include "mwavedd.h"</div><div class='head'>diff --git a/drivers/char/mwave/mwavedd.h b/drivers/char/mwave/mwavedd.h<br/>index 37e0a4926080..21cb09c7bed7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/mwave/mwavedd.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/mwave/mwavedd.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/mwave/mwavedd.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/mwave/mwavedd.h</a></div><div class='hunk'>@@ -53,7 +53,7 @@</div><div class='ctx'> #include "smapi.h"</div><div class='ctx'> #include "mwavepub.h"</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int mwave_debug;</div><div class='head'>diff --git a/drivers/char/nsc_gpio.c b/drivers/char/nsc_gpio.c<br/>index b07b119ae57f..2a91bf048804 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/nsc_gpio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/nsc_gpio.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/nsc_gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/nsc_gpio.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/nsc_gpio.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define NAME "nsc_gpio"</div><div class='head'>diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c<br/>index 0e184426db98..a5b1eb276c0b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/nwbutton.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/nwbutton.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/nwbutton.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/nwbutton.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c<br/>index dbe598de9b74..a284ae25e69a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/nwflash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/nwflash.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/nwflash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/nwflash.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;asm/hardware/dec21285.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> #include &lt;asm/nwflash.h&gt;</div><div class='head'>diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c<br/>index 3f79a9fb6b1b..5f4be88c0dfc 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/pc8736x_gpio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/pc8736x_gpio.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/pc8736x_gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pc8736x_gpio.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/nsc_gpio.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEVNAME "pc8736x_gpio"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig<br/>index 8d3dfb0c8a26..1d1e7da8ad27 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/pcmcia/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/pcmcia/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/pcmcia/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/Kconfig</a></div><div class='hunk'>@@ -43,6 +43,17 @@ config CARDMAN_4040</div><div class='ctx'> 	  (http://www.omnikey.com/), or a current development version of OpenCT</div><div class='ctx'> 	  (http://www.opensc-project.org/opensc).</div><div class='ctx'> </div><div class='add'>+config SCR24X</div><div class='add'>+	tristate "SCR24x Chip Card Interface support"</div><div class='add'>+	depends on PCMCIA</div><div class='add'>+	help</div><div class='add'>+	  Enable support for the SCR24x PCMCIA Chip Card Interface.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here.</div><div class='add'>+	  The module will be called scr24x_cs..</div><div class='add'>+</div><div class='add'>+	  If unsure say N.</div><div class='add'>+</div><div class='ctx'> config IPWIRELESS</div><div class='ctx'> 	tristate "IPWireless 3G UMTS PCMCIA card support"</div><div class='ctx'> 	depends on PCMCIA &amp;&amp; NETDEVICES &amp;&amp; TTY</div><div class='head'>diff --git a/drivers/char/pcmcia/Makefile b/drivers/char/pcmcia/Makefile<br/>index 0aae20985d57..5b836bc21406 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/pcmcia/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/pcmcia/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/pcmcia/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/Makefile</a></div><div class='hunk'>@@ -7,3 +7,4 @@</div><div class='ctx'> obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o</div><div class='ctx'> obj-$(CONFIG_CARDMAN_4000) += cm4000_cs.o</div><div class='ctx'> obj-$(CONFIG_CARDMAN_4040) += cm4040_cs.o</div><div class='add'>+obj-$(CONFIG_SCR24X) += scr24x_cs.o</div><div class='head'>diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c<br/>index c115217c79ae..cd53771b9ae7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/pcmcia/cm4000_cs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/pcmcia/cm4000_cs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/pcmcia/cm4000_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/cm4000_cs.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>   * (C) 2000,2001,2002,2003,2004 Omnikey AG</div><div class='ctx'>   *</div><div class='ctx'>   * (C) 2005-2006 Harald Welte &lt;laforge@gnumonks.org&gt;</div><div class='del'>-  * 	- Adhere to Kernel CodingStyle</div><div class='add'>+  * 	- Adhere to Kernel process/coding-style.rst</div><div class='ctx'>   * 	- Port to 2.6.13 "new" style PCMCIA</div><div class='ctx'>   * 	- Check for copy_{from,to}_user return values</div><div class='ctx'>   * 	- Use nonseekable_open()</div><div class='hunk'>@@ -151,7 +151,7 @@ static struct pcmcia_device *dev_table[CM4000_MAX_DEV];</div><div class='ctx'> static struct class *cmm_class;</div><div class='ctx'> </div><div class='ctx'> /* This table doesn't use spaces after the comma between fields and thus</div><div class='del'>- * violates CodingStyle.  However, I don't really think wrapping it around will</div><div class='add'>+ * violates process/coding-style.rst.  However, I don't really think wrapping it around will</div><div class='ctx'>  * make it any clearer to read -HW */</div><div class='ctx'> static unsigned char fi_di_table[10][14] = {</div><div class='ctx'> /*FI     00   01   02   03   04   05   06   07   08   09   10   11   12   13 */</div><div class='hunk'>@@ -655,7 +655,7 @@ static void terminate_monitor(struct cm4000_dev *dev)</div><div class='ctx'>  * monitor the card every 50msec. as a side-effect, retrieve the</div><div class='ctx'>  * atr once a card is inserted. another side-effect of retrieving the</div><div class='ctx'>  * atr is that the card will be powered on, so there is no need to</div><div class='del'>- * power on the card explictely from the application: the driver</div><div class='add'>+ * power on the card explicitly from the application: the driver</div><div class='ctx'>  * is already doing that for you.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -1037,7 +1037,7 @@ release_io:</div><div class='ctx'> 	clear_bit(LOCK_IO, &amp;dev-&gt;flags);</div><div class='ctx'> 	wake_up_interruptible(&amp;dev-&gt;ioq);</div><div class='ctx'> </div><div class='del'>-	DEBUGP(2, dev, "&lt;- cmm_read returns: rc = %Zi\n",</div><div class='add'>+	DEBUGP(2, dev, "&lt;- cmm_read returns: rc = %zi\n",</div><div class='ctx'> 	       (rc &lt; 0 ? rc : count));</div><div class='ctx'> 	return rc &lt; 0 ? rc : count;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c<br/>index fc061f7c2bd1..d4dbd8d8e524 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/pcmcia/cm4040_cs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/pcmcia/cm4040_cs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/pcmcia/cm4040_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/cm4040_cs.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;pcmcia/cistpl.h&gt;</div><div class='hunk'>@@ -331,7 +331,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((count &lt; 5) || (count &gt; READ_WRITE_BUFFER_SIZE)) {</div><div class='del'>-		DEBUGP(2, dev, "&lt;- cm4040_write buffersize=%Zd &lt; 5\n", count);</div><div class='add'>+		DEBUGP(2, dev, "&lt;- cm4040_write buffersize=%zd &lt; 5\n", count);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/pcmcia/scr24x_cs.c b/drivers/char/pcmcia/scr24x_cs.c<br/>new file mode 100644<br/>index 000000000000..f6b43d9350f0<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/char/pcmcia/scr24x_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/scr24x_cs.c</a></div><div class='hunk'>@@ -0,0 +1,373 @@</div><div class='add'>+/*</div><div class='add'>+ * SCR24x PCMCIA Smart Card Reader Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005-2006 TL Sudheendran</div><div class='add'>+ * Copyright (C) 2016 Lubomir Rintel</div><div class='add'>+ *</div><div class='add'>+ * Derived from "scr24x_v4.2.6_Release.tar.gz" driver by TL Sudheendran.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; see the file COPYING.  If not, write to</div><div class='add'>+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;pcmcia/cistpl.h&gt;</div><div class='add'>+#include &lt;pcmcia/ds.h&gt;</div><div class='add'>+</div><div class='add'>+#define CCID_HEADER_SIZE	10</div><div class='add'>+#define CCID_LENGTH_OFFSET	1</div><div class='add'>+#define CCID_MAX_LEN		271</div><div class='add'>+</div><div class='add'>+#define SCR24X_DATA(n)		(1 + n)</div><div class='add'>+#define SCR24X_CMD_STATUS	7</div><div class='add'>+#define CMD_START		0x40</div><div class='add'>+#define CMD_WRITE_BYTE		0x41</div><div class='add'>+#define CMD_READ_BYTE		0x42</div><div class='add'>+#define STATUS_BUSY		0x80</div><div class='add'>+</div><div class='add'>+struct scr24x_dev {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct cdev c_dev;</div><div class='add'>+	unsigned char buf[CCID_MAX_LEN];</div><div class='add'>+	int devno;</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	struct kref refcnt;</div><div class='add'>+	u8 __iomem *regs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SCR24X_DEVS 8</div><div class='add'>+static DECLARE_BITMAP(scr24x_minors, SCR24X_DEVS);</div><div class='add'>+</div><div class='add'>+static struct class *scr24x_class;</div><div class='add'>+static dev_t scr24x_devt;</div><div class='add'>+</div><div class='add'>+static void scr24x_delete(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct scr24x_dev *dev = container_of(kref, struct scr24x_dev,</div><div class='add'>+								refcnt);</div><div class='add'>+</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int scr24x_wait_ready(struct scr24x_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u_char status;</div><div class='add'>+	int timeout = 100;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		status = ioread8(dev-&gt;regs + SCR24X_CMD_STATUS);</div><div class='add'>+		if (!(status &amp; STATUS_BUSY))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		msleep(20);</div><div class='add'>+	} while (--timeout);</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int scr24x_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct scr24x_dev *dev = container_of(inode-&gt;i_cdev,</div><div class='add'>+				struct scr24x_dev, c_dev);</div><div class='add'>+</div><div class='add'>+	kref_get(&amp;dev-&gt;refcnt);</div><div class='add'>+	filp-&gt;private_data = dev;</div><div class='add'>+</div><div class='add'>+	return nonseekable_open(inode, filp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int scr24x_release(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct scr24x_dev *dev = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* We must not take the dev-&gt;lock here as scr24x_delete()</div><div class='add'>+	 * might be called to remove the dev structure altogether.</div><div class='add'>+	 * We don't need the lock anyway, since after the reference</div><div class='add'>+	 * acquired in probe() is released in remove() the chrdev</div><div class='add'>+	 * is already unregistered and noone can possibly acquire</div><div class='add'>+	 * a reference via open() anymore. */</div><div class='add'>+	kref_put(&amp;dev-&gt;refcnt, scr24x_delete);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_chunk(struct scr24x_dev *dev, size_t offset, size_t limit)</div><div class='add'>+{</div><div class='add'>+	size_t i, y;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (i = offset; i &lt; limit; i += 5) {</div><div class='add'>+		iowrite8(CMD_READ_BYTE, dev-&gt;regs + SCR24X_CMD_STATUS);</div><div class='add'>+		ret = scr24x_wait_ready(dev);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		for (y = 0; y &lt; 5 &amp;&amp; i + y &lt; limit; y++)</div><div class='add'>+			dev-&gt;buf[i + y] = ioread8(dev-&gt;regs + SCR24X_DATA(y));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t scr24x_read(struct file *filp, char __user *buf, size_t count,</div><div class='add'>+								loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct scr24x_dev *dev = filp-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (count &lt; CCID_HEADER_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;dev-&gt;lock))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = scr24x_wait_ready(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	len = CCID_HEADER_SIZE;</div><div class='add'>+	ret = read_chunk(dev, 0, len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	len += le32_to_cpu(*(__le32 *)(&amp;dev-&gt;buf[CCID_LENGTH_OFFSET]));</div><div class='add'>+	if (len &gt; sizeof(dev-&gt;buf)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = read_chunk(dev, CCID_HEADER_SIZE, len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (len &lt; count)</div><div class='add'>+		count = len;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, dev-&gt;buf, count)) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = count;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t scr24x_write(struct file *filp, const char __user *buf,</div><div class='add'>+					size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct scr24x_dev *dev = filp-&gt;private_data;</div><div class='add'>+	size_t i, y;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;dev-&gt;lock))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (count &gt; sizeof(dev-&gt;buf)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(dev-&gt;buf, buf, count)) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = scr24x_wait_ready(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	iowrite8(CMD_START, dev-&gt;regs + SCR24X_CMD_STATUS);</div><div class='add'>+	ret = scr24x_wait_ready(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i += 5) {</div><div class='add'>+		for (y = 0; y &lt; 5 &amp;&amp; i + y &lt; count; y++)</div><div class='add'>+			iowrite8(dev-&gt;buf[i + y], dev-&gt;regs + SCR24X_DATA(y));</div><div class='add'>+</div><div class='add'>+		iowrite8(CMD_WRITE_BYTE, dev-&gt;regs + SCR24X_CMD_STATUS);</div><div class='add'>+		ret = scr24x_wait_ready(dev);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = count;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations scr24x_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.read		= scr24x_read,</div><div class='add'>+	.write		= scr24x_write,</div><div class='add'>+	.open		= scr24x_open,</div><div class='add'>+	.release	= scr24x_release,</div><div class='add'>+	.llseek		= no_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int scr24x_config_check(struct pcmcia_device *link, void *priv_data)</div><div class='add'>+{</div><div class='add'>+	if (resource_size(link-&gt;resource[PCMCIA_IOPORT_0]) != 0x11)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	return pcmcia_request_io(link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int scr24x_probe(struct pcmcia_device *link)</div><div class='add'>+{</div><div class='add'>+	struct scr24x_dev *dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;devno = find_first_zero_bit(scr24x_minors, SCR24X_DEVS);</div><div class='add'>+	if (dev-&gt;devno &gt;= SCR24X_DEVS) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;dev-&gt;lock);</div><div class='add'>+	kref_init(&amp;dev-&gt;refcnt);</div><div class='add'>+</div><div class='add'>+	link-&gt;priv = dev;</div><div class='add'>+	link-&gt;config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;</div><div class='add'>+</div><div class='add'>+	ret = pcmcia_loop_config(link, scr24x_config_check, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	dev-&gt;dev = &amp;link-&gt;dev;</div><div class='add'>+	dev-&gt;regs = devm_ioport_map(&amp;link-&gt;dev,</div><div class='add'>+				link-&gt;resource[PCMCIA_IOPORT_0]-&gt;start,</div><div class='add'>+				resource_size(link-&gt;resource[PCMCIA_IOPORT_0]));</div><div class='add'>+	if (!dev-&gt;regs) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cdev_init(&amp;dev-&gt;c_dev, &amp;scr24x_fops);</div><div class='add'>+	dev-&gt;c_dev.owner = THIS_MODULE;</div><div class='add'>+	dev-&gt;c_dev.ops = &amp;scr24x_fops;</div><div class='add'>+	ret = cdev_add(&amp;dev-&gt;c_dev, MKDEV(MAJOR(scr24x_devt), dev-&gt;devno), 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = pcmcia_enable_device(link);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pcmcia_disable_device(link);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_create(scr24x_class, NULL, MKDEV(MAJOR(scr24x_devt), dev-&gt;devno),</div><div class='add'>+		      NULL, "scr24x%d", dev-&gt;devno);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;link-&gt;dev, "SCR24x Chip Card Interface\n");</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (dev-&gt;devno &lt; SCR24X_DEVS)</div><div class='add'>+		clear_bit(dev-&gt;devno, scr24x_minors);</div><div class='add'>+	kfree (dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void scr24x_remove(struct pcmcia_device *link)</div><div class='add'>+{</div><div class='add'>+	struct scr24x_dev *dev = (struct scr24x_dev *)link-&gt;priv;</div><div class='add'>+</div><div class='add'>+	device_destroy(scr24x_class, MKDEV(MAJOR(scr24x_devt), dev-&gt;devno));</div><div class='add'>+	mutex_lock(&amp;dev-&gt;lock);</div><div class='add'>+	pcmcia_disable_device(link);</div><div class='add'>+	cdev_del(&amp;dev-&gt;c_dev);</div><div class='add'>+	clear_bit(dev-&gt;devno, scr24x_minors);</div><div class='add'>+	dev-&gt;dev = NULL;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;dev-&gt;refcnt, scr24x_delete);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct pcmcia_device_id scr24x_ids[] = {</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("HP", "PC Card Smart Card Reader",</div><div class='add'>+					0x53cb94f9, 0xbfdf89a5),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1("SCR241 PCMCIA", 0x6271efa3),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1("SCR243 PCMCIA", 0x2054e8de),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID1("SCR24x PCMCIA", 0x54a33665),</div><div class='add'>+	PCMCIA_DEVICE_NULL</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pcmcia, scr24x_ids);</div><div class='add'>+</div><div class='add'>+static struct pcmcia_driver scr24x_driver = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "scr24x_cs",</div><div class='add'>+	.probe		= scr24x_probe,</div><div class='add'>+	.remove		= scr24x_remove,</div><div class='add'>+	.id_table	= scr24x_ids,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init scr24x_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	scr24x_class = class_create(THIS_MODULE, "scr24x");</div><div class='add'>+	if (IS_ERR(scr24x_class))</div><div class='add'>+		return PTR_ERR(scr24x_class);</div><div class='add'>+</div><div class='add'>+	ret = alloc_chrdev_region(&amp;scr24x_devt, 0, SCR24X_DEVS, "scr24x");</div><div class='add'>+	if (ret &lt; 0)  {</div><div class='add'>+		class_destroy(scr24x_class);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pcmcia_register_driver(&amp;scr24x_driver);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		unregister_chrdev_region(scr24x_devt, SCR24X_DEVS);</div><div class='add'>+		class_destroy(scr24x_class);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit scr24x_exit(void)</div><div class='add'>+{</div><div class='add'>+	pcmcia_unregister_driver(&amp;scr24x_driver);</div><div class='add'>+	unregister_chrdev_region(scr24x_devt, SCR24X_DEVS);</div><div class='add'>+	class_destroy(scr24x_class);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(scr24x_init);</div><div class='add'>+module_exit(scr24x_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Lubomir Rintel");</div><div class='add'>+MODULE_DESCRIPTION("SCR24x PCMCIA Smart Card Reader Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c<br/>index d28922df01d7..d136db1a10f0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/pcmcia/synclink_cs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/pcmcia/synclink_cs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/pcmcia/synclink_cs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/pcmcia/synclink_cs.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@</div><div class='ctx'> #define PUT_USER(error,value,addr) error = put_user(value,addr)</div><div class='ctx'> #define COPY_TO_USER(error,dest,src,size) error = copy_to_user(dest,src,size) ? -EFAULT : 0</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> static MGSL_PARAMS default_params = {</div><div class='ctx'> 	MGSL_MODE_HDLC,			/* unsigned long mode */</div><div class='hunk'>@@ -4248,7 +4248,6 @@ static void hdlcdev_rx(MGSLPC_INFO *info, char *buf, int size)</div><div class='ctx'> static const struct net_device_ops hdlcdev_ops = {</div><div class='ctx'> 	.ndo_open       = hdlcdev_open,</div><div class='ctx'> 	.ndo_stop       = hdlcdev_close,</div><div class='del'>-	.ndo_change_mtu = hdlc_change_mtu,</div><div class='ctx'> 	.ndo_start_xmit = hdlc_start_xmit,</div><div class='ctx'> 	.ndo_do_ioctl   = hdlcdev_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout = hdlcdev_tx_timeout,</div><div class='head'>diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c<br/>index 6af1ce04b3da..2a558c706581 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/ppdev.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/ppdev.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/ppdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/ppdev.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/parport.h&gt;</div><div class='hunk'>@@ -86,6 +86,9 @@ struct pp_struct {</div><div class='ctx'> 	long default_inactivity;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* should we use PARDEVICE_MAX here? */</div><div class='add'>+static struct device *devices[PARPORT_MAX];</div><div class='add'>+</div><div class='ctx'> /* pp_struct.flags bitfields */</div><div class='ctx'> #define PP_CLAIMED    (1&lt;&lt;0)</div><div class='ctx'> #define PP_EXCL       (1&lt;&lt;1)</div><div class='hunk'>@@ -287,6 +290,7 @@ static int register_device(int minor, struct pp_struct *pp)</div><div class='ctx'> 	struct pardevice *pdev = NULL;</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	struct pardev_cb ppdev_cb;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	name = kasprintf(GFP_KERNEL, CHRDEV "%x", minor);</div><div class='ctx'> 	if (name == NULL)</div><div class='hunk'>@@ -294,9 +298,9 @@ static int register_device(int minor, struct pp_struct *pp)</div><div class='ctx'> </div><div class='ctx'> 	port = parport_find_number(minor);</div><div class='ctx'> 	if (!port) {</div><div class='del'>-		printk(KERN_WARNING "%s: no associated port!\n", name);</div><div class='del'>-		kfree(name);</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		pr_warn("%s: no associated port!\n", name);</div><div class='add'>+		rc = -ENXIO;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ppdev_cb, 0, sizeof(ppdev_cb));</div><div class='hunk'>@@ -307,14 +311,16 @@ static int register_device(int minor, struct pp_struct *pp)</div><div class='ctx'> 	parport_put_port(port);</div><div class='ctx'> </div><div class='ctx'> 	if (!pdev) {</div><div class='del'>-		printk(KERN_WARNING "%s: failed to register device!\n", name);</div><div class='del'>-		kfree(name);</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		pr_warn("%s: failed to register device!\n", name);</div><div class='add'>+		rc = -ENXIO;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pp-&gt;pdev = pdev;</div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev, "registered pardevice\n");</div><div class='del'>-	return 0;</div><div class='add'>+err:</div><div class='add'>+	kfree(name);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum ieee1284_phase init_phase(int mode)</div><div class='hunk'>@@ -789,13 +795,29 @@ static const struct file_operations pp_fops = {</div><div class='ctx'> </div><div class='ctx'> static void pp_attach(struct parport *port)</div><div class='ctx'> {</div><div class='del'>-	device_create(ppdev_class, port-&gt;dev, MKDEV(PP_MAJOR, port-&gt;number),</div><div class='del'>-		      NULL, "parport%d", port-&gt;number);</div><div class='add'>+	struct device *ret;</div><div class='add'>+</div><div class='add'>+	if (devices[port-&gt;number])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = device_create(ppdev_class, port-&gt;dev,</div><div class='add'>+			    MKDEV(PP_MAJOR, port-&gt;number), NULL,</div><div class='add'>+			    "parport%d", port-&gt;number);</div><div class='add'>+	if (IS_ERR(ret)) {</div><div class='add'>+		pr_err("Failed to create device parport%d\n",</div><div class='add'>+		       port-&gt;number);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	devices[port-&gt;number] = ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pp_detach(struct parport *port)</div><div class='ctx'> {</div><div class='add'>+	if (!devices[port-&gt;number])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	device_destroy(ppdev_class, MKDEV(PP_MAJOR, port-&gt;number));</div><div class='add'>+	devices[port-&gt;number] = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pp_probe(struct pardevice *par_dev)</div><div class='hunk'>@@ -822,8 +844,7 @@ static int __init ppdev_init(void)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (register_chrdev(PP_MAJOR, CHRDEV, &amp;pp_fops)) {</div><div class='del'>-		printk(KERN_WARNING CHRDEV ": unable to get major %d\n",</div><div class='del'>-		       PP_MAJOR);</div><div class='add'>+		pr_warn(CHRDEV ": unable to get major %d\n", PP_MAJOR);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	ppdev_class = class_create(THIS_MODULE, CHRDEV);</div><div class='hunk'>@@ -833,11 +854,11 @@ static int __init ppdev_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	err = parport_register_driver(&amp;pp_driver);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING CHRDEV ": unable to register with parport\n");</div><div class='add'>+		pr_warn(CHRDEV ": unable to register with parport\n");</div><div class='ctx'> 		goto out_class;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PP_VERSION "\n");</div><div class='add'>+	pr_info(PP_VERSION "\n");</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> out_class:</div><div class='head'>diff --git a/drivers/char/random.c b/drivers/char/random.c<br/>index d6876d506220..1ef26403bcc8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/random.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/random.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/random.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/random.c</a></div><div class='hunk'>@@ -265,7 +265,7 @@</div><div class='ctx'> #include &lt;crypto/chacha20.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/char/raw.c b/drivers/char/raw.c<br/>index e83b2adc014a..293167c6e254 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/raw.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/raw.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/raw.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/raw.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct raw_device_data {</div><div class='ctx'> 	struct block_device *binding;</div><div class='head'>diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c<br/>index 35259961cc38..974d48927b07 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/rtc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/rtc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/rtc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/rtc.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='head'>diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c<br/>index 0bc135b9b16f..903761bc41c9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/scx200_gpio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/scx200_gpio.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/scx200_gpio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/scx200_gpio.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c<br/>index 10e56323f390..6aa32679fd58 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/snsc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/snsc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/snsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/snsc.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -285,7 +285,7 @@ scdrv_write(struct file *file, const char __user *buf,</div><div class='ctx'> 		DECLARE_WAITQUEUE(wait, current);</div><div class='ctx'> </div><div class='ctx'> 		if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-			spin_unlock(&amp;sd-&gt;sd_wlock);</div><div class='add'>+			spin_unlock_irqrestore(&amp;sd-&gt;sd_wlock, flags);</div><div class='ctx'> 			up(&amp;sd-&gt;sd_wbs);</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c<br/>index 59bcefd6ec7c..e452673dff66 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/snsc_event.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/snsc_event.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/snsc_event.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/snsc_event.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/sn/sn_sal.h&gt;</div><div class='head'>diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c<br/>index 719c5b4eed39..f4f866ee54bc 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/sonypi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/sonypi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/sonypi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/sonypi.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sonypi.h&gt;</div><div class='hunk'>@@ -603,7 +603,7 @@ static void sonypi_type3_srs(void)</div><div class='ctx'> 	u16 v16;</div><div class='ctx'> 	u8  v8;</div><div class='ctx'> </div><div class='del'>-	/* This model type uses the same initialiazation of</div><div class='add'>+	/* This model type uses the same initialization of</div><div class='ctx'> 	 * the embedded controller as the type2 models. */</div><div class='ctx'> 	sonypi_type2_srs();</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/tile-srom.c b/drivers/char/tile-srom.c<br/>index 398800edb2cc..3d4cca64b2d4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tile-srom.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tile-srom.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tile-srom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tile-srom.c</a></div><div class='hunk'>@@ -312,7 +312,8 @@ ATTRIBUTE_GROUPS(srom_dev);</div><div class='ctx'> </div><div class='ctx'> static char *srom_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='del'>-	*mode = S_IRUGO | S_IWUSR;</div><div class='add'>+	if (mode)</div><div class='add'>+		*mode = 0644;</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "srom/%s", dev_name(dev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c<br/>index 100cd1de9939..572a51704e67 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tlclk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tlclk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tlclk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tlclk.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* inb/outb */</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Sebastien Bouchard &lt;sebastien.bouchard@ca.kontron.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c<br/>index f5a45d887a37..5488516da8ea 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/toshiba.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/toshiba.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/toshiba.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/toshiba.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='head'>diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig<br/>index 9faa0b1e7766..af985cca413c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/Kconfig</a></div><div class='hunk'>@@ -6,6 +6,7 @@ menuconfig TCG_TPM</div><div class='ctx'> 	tristate "TPM Hardware Support"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	select SECURITYFS</div><div class='add'>+	select CRYPTO_HASH_INFO</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  If you have a TPM security chip in your system, which</div><div class='ctx'> 	  implements the Trusted Computing Group's specification,</div><div class='hunk'>@@ -32,7 +33,7 @@ config TCG_TIS_CORE</div><div class='ctx'> </div><div class='ctx'> config TCG_TIS</div><div class='ctx'> 	tristate "TPM Interface Specification 1.2 Interface / TPM 2.0 FIFO Interface"</div><div class='del'>-	depends on X86</div><div class='add'>+	depends on X86 || OF</div><div class='ctx'> 	select TCG_TIS_CORE</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  If you have a TPM security chip that is compliant with the</div><div class='head'>diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile<br/>index a385fb8c17de..3d386a8c579f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/Makefile</a></div><div class='hunk'>@@ -2,16 +2,10 @@</div><div class='ctx'> # Makefile for the kernel tpm device drivers.</div><div class='ctx'> #</div><div class='ctx'> obj-$(CONFIG_TCG_TPM) += tpm.o</div><div class='del'>-tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o</div><div class='del'>-tpm-$(CONFIG_ACPI) += tpm_ppi.o</div><div class='del'>-</div><div class='del'>-ifdef CONFIG_ACPI</div><div class='del'>-	tpm-y += tpm_eventlog.o tpm_acpi.o</div><div class='del'>-else</div><div class='del'>-ifdef CONFIG_TCG_IBMVTPM</div><div class='del'>-	tpm-y += tpm_eventlog.o tpm_of.o</div><div class='del'>-endif</div><div class='del'>-endif</div><div class='add'>+tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o \</div><div class='add'>+		tpm1_eventlog.o tpm2_eventlog.o</div><div class='add'>+tpm-$(CONFIG_ACPI) += tpm_ppi.o tpm_acpi.o</div><div class='add'>+tpm-$(CONFIG_OF) += tpm_of.o</div><div class='ctx'> obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o</div><div class='ctx'> obj-$(CONFIG_TCG_TIS) += tpm_tis.o</div><div class='ctx'> obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o</div><div class='head'>diff --git a/drivers/char/tpm/st33zp24/st33zp24.c b/drivers/char/tpm/st33zp24/st33zp24.c<br/>index 6f060c76217b..e8e0f7c02686 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/st33zp24/st33zp24.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/st33zp24/st33zp24.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/st33zp24/st33zp24.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/st33zp24/st33zp24.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='head'>diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c<br/>index e5950131bd90..c406343848da 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm-chip.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm-chip.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm-chip.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm-chip.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ EXPORT_SYMBOL_GPL(tpm_put_ops);</div><div class='ctx'>  *</div><div class='ctx'>  * The return'd chip has been tpm_try_get_ops'd and must be released via</div><div class='ctx'>  * tpm_put_ops</div><div class='del'>-  */</div><div class='add'>+ */</div><div class='ctx'> struct tpm_chip *tpm_chip_find_get(int chip_num)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm_chip *chip, *res = NULL;</div><div class='hunk'>@@ -103,7 +103,7 @@ struct tpm_chip *tpm_chip_find_get(int chip_num)</div><div class='ctx'> 			}</div><div class='ctx'> 		} while (chip_prev != chip_num);</div><div class='ctx'> 	} else {</div><div class='del'>-		chip = idr_find_slowpath(&amp;dev_nums_idr, chip_num);</div><div class='add'>+		chip = idr_find(&amp;dev_nums_idr, chip_num);</div><div class='ctx'> 		if (chip &amp;&amp; !tpm_try_get_ops(chip))</div><div class='ctx'> 			res = chip;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -127,6 +127,7 @@ static void tpm_dev_release(struct device *dev)</div><div class='ctx'> 	idr_remove(&amp;dev_nums_idr, chip-&gt;dev_num);</div><div class='ctx'> 	mutex_unlock(&amp;idr_lock);</div><div class='ctx'> </div><div class='add'>+	kfree(chip-&gt;log.bios_event_log);</div><div class='ctx'> 	kfree(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -140,7 +141,7 @@ static void tpm_dev_release(struct device *dev)</div><div class='ctx'>  * Allocates a new struct tpm_chip instance and assigns a free</div><div class='ctx'>  * device number for it. Must be paired with put_device(&amp;chip-&gt;dev).</div><div class='ctx'>  */</div><div class='del'>-struct tpm_chip *tpm_chip_alloc(struct device *dev,</div><div class='add'>+struct tpm_chip *tpm_chip_alloc(struct device *pdev,</div><div class='ctx'> 				const struct tpm_class_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm_chip *chip;</div><div class='hunk'>@@ -159,7 +160,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev,</div><div class='ctx'> 	rc = idr_alloc(&amp;dev_nums_idr, NULL, 0, TPM_NUM_DEVICES, GFP_KERNEL);</div><div class='ctx'> 	mutex_unlock(&amp;idr_lock);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='del'>-		dev_err(dev, "No available tpm device numbers\n");</div><div class='add'>+		dev_err(pdev, "No available tpm device numbers\n");</div><div class='ctx'> 		kfree(chip);</div><div class='ctx'> 		return ERR_PTR(rc);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -169,7 +170,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;dev.class = tpm_class;</div><div class='ctx'> 	chip-&gt;dev.release = tpm_dev_release;</div><div class='del'>-	chip-&gt;dev.parent = dev;</div><div class='add'>+	chip-&gt;dev.parent = pdev;</div><div class='ctx'> 	chip-&gt;dev.groups = chip-&gt;groups;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;dev_num == 0)</div><div class='hunk'>@@ -181,7 +182,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev,</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!dev)</div><div class='add'>+	if (!pdev)</div><div class='ctx'> 		chip-&gt;flags |= TPM_CHIP_FLAG_VIRTUAL;</div><div class='ctx'> </div><div class='ctx'> 	cdev_init(&amp;chip-&gt;cdev, &amp;tpm_fops);</div><div class='hunk'>@@ -276,27 +277,6 @@ static void tpm_del_char_device(struct tpm_chip *chip)</div><div class='ctx'> 	up_write(&amp;chip-&gt;ops_sem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tpm1_chip_register(struct tpm_chip *chip)</div><div class='del'>-{</div><div class='del'>-	if (chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	tpm_sysfs_add_device(chip);</div><div class='del'>-</div><div class='del'>-	chip-&gt;bios_dir = tpm_bios_log_setup(dev_name(&amp;chip-&gt;dev));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tpm1_chip_unregister(struct tpm_chip *chip)</div><div class='del'>-{</div><div class='del'>-	if (chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;bios_dir)</div><div class='del'>-		tpm_bios_log_teardown(chip-&gt;bios_dir);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void tpm_del_legacy_sysfs(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct attribute **i;</div><div class='hunk'>@@ -363,20 +343,20 @@ int tpm_chip_register(struct tpm_chip *chip)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = tpm1_chip_register(chip);</div><div class='del'>-	if (rc)</div><div class='add'>+	tpm_sysfs_add_device(chip);</div><div class='add'>+</div><div class='add'>+	rc = tpm_bios_log_setup(chip);</div><div class='add'>+	if (rc != 0 &amp;&amp; rc != -ENODEV)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	tpm_add_ppi(chip);</div><div class='ctx'> </div><div class='ctx'> 	rc = tpm_add_char_device(chip);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		tpm1_chip_unregister(chip);</div><div class='add'>+		tpm_bios_log_teardown(chip);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chip-&gt;flags |= TPM_CHIP_FLAG_REGISTERED;</div><div class='del'>-</div><div class='ctx'> 	rc = tpm_add_legacy_sysfs(chip);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		tpm_chip_unregister(chip);</div><div class='hunk'>@@ -402,12 +382,8 @@ EXPORT_SYMBOL_GPL(tpm_chip_register);</div><div class='ctx'>  */</div><div class='ctx'> void tpm_chip_unregister(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	if (!(chip-&gt;flags &amp; TPM_CHIP_FLAG_REGISTERED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	tpm_del_legacy_sysfs(chip);</div><div class='del'>-</div><div class='del'>-	tpm1_chip_unregister(chip);</div><div class='add'>+	tpm_bios_log_teardown(chip);</div><div class='ctx'> 	tpm_del_char_device(chip);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_chip_unregister);</div><div class='head'>diff --git a/drivers/char/tpm/tpm-dev.c b/drivers/char/tpm/tpm-dev.c<br/>index 912ad30be585..02a8850d3a69 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm-dev.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm-dev.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm-dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm-dev.c</a></div><div class='hunk'>@@ -38,6 +38,9 @@ static void user_reader_timeout(unsigned long ptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_priv *priv = (struct file_priv *)ptr;</div><div class='ctx'> </div><div class='add'>+	pr_warn("TPM user space timeout is deprecated (pid=%d)\n",</div><div class='add'>+		task_tgid_nr(current));</div><div class='add'>+</div><div class='ctx'> 	schedule_work(&amp;priv-&gt;work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +160,7 @@ static ssize_t tpm_write(struct file *file, const char __user *buf,</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;buffer_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Set a timeout by which the reader must come claim the result */</div><div class='del'>-	mod_timer(&amp;priv-&gt;user_read_timer, jiffies + (60 * HZ));</div><div class='add'>+	mod_timer(&amp;priv-&gt;user_read_timer, jiffies + (120 * HZ));</div><div class='ctx'> </div><div class='ctx'> 	return in_size;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c<br/>index 3a9149cf0110..bd2128e0b56c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm-interface.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm-interface.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm-interface.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm-interface.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "tpm.h"</div><div class='ctx'> #include "tpm_eventlog.h"</div><div class='hunk'>@@ -46,7 +47,7 @@</div><div class='ctx'> static int tpm_suspend_pcr;</div><div class='ctx'> module_param_named(suspend_pcr, tpm_suspend_pcr, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(suspend_pcr,</div><div class='del'>-		 "PCR to use for dummy writes to faciltate flush on suspend.");</div><div class='add'>+		 "PCR to use for dummy writes to facilitate flush on suspend.");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Array with one entry per ordinal defining the maximum amount</div><div class='hunk'>@@ -327,8 +328,17 @@ unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Internal kernel interface to transmit TPM commands</div><div class='add'>+/**</div><div class='add'>+ * tmp_transmit - Internal kernel interface to transmit TPM commands.</div><div class='add'>+ *</div><div class='add'>+ * @chip: TPM chip to use</div><div class='add'>+ * @buf: TPM command buffer</div><div class='add'>+ * @bufsiz: length of the TPM command buffer</div><div class='add'>+ * @flags: tpm transmit flags - bitmap</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *     0 when the operation is successful.</div><div class='add'>+ *     A negative number for system errors (errno).</div><div class='ctx'>  */</div><div class='ctx'> ssize_t tpm_transmit(struct tpm_chip *chip, const u8 *buf, size_t bufsiz,</div><div class='ctx'> 		     unsigned int flags)</div><div class='hunk'>@@ -356,6 +366,9 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const u8 *buf, size_t bufsiz,</div><div class='ctx'> 	if (!(flags &amp; TPM_TRANSMIT_UNLOCKED))</div><div class='ctx'> 		mutex_lock(&amp;chip-&gt;tpm_mutex);</div><div class='ctx'> </div><div class='add'>+	if (chip-&gt;dev.parent)</div><div class='add'>+		pm_runtime_get_sync(chip-&gt;dev.parent);</div><div class='add'>+</div><div class='ctx'> 	rc = chip-&gt;ops-&gt;send(chip, (u8 *) buf, count);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;chip-&gt;dev,</div><div class='hunk'>@@ -397,36 +410,63 @@ out_recv:</div><div class='ctx'> 		dev_err(&amp;chip-&gt;dev,</div><div class='ctx'> 			"tpm_transmit: tpm_recv: error %zd\n", rc);</div><div class='ctx'> out:</div><div class='add'>+	if (chip-&gt;dev.parent)</div><div class='add'>+		pm_runtime_put_sync(chip-&gt;dev.parent);</div><div class='add'>+</div><div class='ctx'> 	if (!(flags &amp; TPM_TRANSMIT_UNLOCKED))</div><div class='ctx'> 		mutex_unlock(&amp;chip-&gt;tpm_mutex);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define TPM_DIGEST_SIZE 20</div><div class='del'>-#define TPM_RET_CODE_IDX 6</div><div class='del'>-</div><div class='del'>-ssize_t tpm_transmit_cmd(struct tpm_chip *chip, const void *cmd,</div><div class='del'>-			 int len, unsigned int flags, const char *desc)</div><div class='add'>+/**</div><div class='add'>+ * tmp_transmit_cmd - send a tpm command to the device</div><div class='add'>+ *    The function extracts tpm out header return code</div><div class='add'>+ *</div><div class='add'>+ * @chip: TPM chip to use</div><div class='add'>+ * @buf: TPM command buffer</div><div class='add'>+ * @bufsiz: length of the buffer</div><div class='add'>+ * @min_rsp_body_length: minimum expected length of response body</div><div class='add'>+ * @flags: tpm transmit flags - bitmap</div><div class='add'>+ * @desc: command description used in the error message</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *     0 when the operation is successful.</div><div class='add'>+ *     A negative number for system errors (errno).</div><div class='add'>+ *     A positive number for a TPM error.</div><div class='add'>+ */</div><div class='add'>+ssize_t tpm_transmit_cmd(struct tpm_chip *chip, const void *buf,</div><div class='add'>+			 size_t bufsiz, size_t min_rsp_body_length,</div><div class='add'>+			 unsigned int flags, const char *desc)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tpm_output_header *header;</div><div class='ctx'> 	int err;</div><div class='add'>+	ssize_t len;</div><div class='ctx'> </div><div class='del'>-	len = tpm_transmit(chip, (const u8 *)cmd, len, flags);</div><div class='add'>+	len = tpm_transmit(chip, (const u8 *)buf, bufsiz, flags);</div><div class='ctx'> 	if (len &lt;  0)</div><div class='ctx'> 		return len;</div><div class='ctx'> 	else if (len &lt; TPM_HEADER_SIZE)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	header = cmd;</div><div class='add'>+	header = buf;</div><div class='add'>+	if (len != be32_to_cpu(header-&gt;length))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	err = be32_to_cpu(header-&gt;return_code);</div><div class='ctx'> 	if (err != 0 &amp;&amp; desc)</div><div class='ctx'> 		dev_err(&amp;chip-&gt;dev, "A TPM error (%d) occurred %s\n", err,</div><div class='ctx'> 			desc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	if (len &lt; min_rsp_body_length + TPM_HEADER_SIZE)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define TPM_DIGEST_SIZE 20</div><div class='add'>+#define TPM_RET_CODE_IDX 6</div><div class='ctx'> #define TPM_INTERNAL_RESULT_SIZE 200</div><div class='ctx'> #define TPM_ORD_GET_CAP cpu_to_be32(101)</div><div class='ctx'> #define TPM_ORD_GET_RANDOM cpu_to_be32(70)</div><div class='hunk'>@@ -437,29 +477,32 @@ static const struct tpm_input_header tpm_getcap_header = {</div><div class='ctx'> 	.ordinal = TPM_ORD_GET_CAP</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-ssize_t tpm_getcap(struct tpm_chip *chip, __be32 subcap_id, cap_t *cap,</div><div class='del'>-		   const char *desc)</div><div class='add'>+ssize_t tpm_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,</div><div class='add'>+		   const char *desc, size_t min_cap_length)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm_cmd_t tpm_cmd;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	tpm_cmd.header.in = tpm_getcap_header;</div><div class='del'>-	if (subcap_id == CAP_VERSION_1_1 || subcap_id == CAP_VERSION_1_2) {</div><div class='del'>-		tpm_cmd.params.getcap_in.cap = subcap_id;</div><div class='add'>+	if (subcap_id == TPM_CAP_VERSION_1_1 ||</div><div class='add'>+	    subcap_id == TPM_CAP_VERSION_1_2) {</div><div class='add'>+		tpm_cmd.params.getcap_in.cap = cpu_to_be32(subcap_id);</div><div class='ctx'> 		/*subcap field not necessary */</div><div class='ctx'> 		tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(0);</div><div class='ctx'> 		tpm_cmd.header.in.length -= cpu_to_be32(sizeof(__be32));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (subcap_id == TPM_CAP_FLAG_PERM ||</div><div class='ctx'> 		    subcap_id == TPM_CAP_FLAG_VOL)</div><div class='del'>-			tpm_cmd.params.getcap_in.cap = TPM_CAP_FLAG;</div><div class='add'>+			tpm_cmd.params.getcap_in.cap =</div><div class='add'>+				cpu_to_be32(TPM_CAP_FLAG);</div><div class='ctx'> 		else</div><div class='del'>-			tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP;</div><div class='add'>+			tpm_cmd.params.getcap_in.cap =</div><div class='add'>+				cpu_to_be32(TPM_CAP_PROP);</div><div class='ctx'> 		tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4);</div><div class='del'>-		tpm_cmd.params.getcap_in.subcap = subcap_id;</div><div class='add'>+		tpm_cmd.params.getcap_in.subcap = cpu_to_be32(subcap_id);</div><div class='ctx'> 	}</div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;tpm_cmd, TPM_INTERNAL_RESULT_SIZE, 0,</div><div class='del'>-			      desc);</div><div class='add'>+	rc = tpm_transmit_cmd(chip, &amp;tpm_cmd, TPM_INTERNAL_RESULT_SIZE,</div><div class='add'>+			      min_cap_length, 0, desc);</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		*cap = tpm_cmd.params.getcap_out.cap;</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -483,17 +526,18 @@ static int tpm_startup(struct tpm_chip *chip, __be16 startup_type)</div><div class='ctx'> </div><div class='ctx'> 	start_cmd.params.startup_in.startup_type = startup_type;</div><div class='ctx'> 	return tpm_transmit_cmd(chip, &amp;start_cmd, TPM_INTERNAL_RESULT_SIZE, 0,</div><div class='del'>-				"attempting to start the TPM");</div><div class='add'>+				0, "attempting to start the TPM");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int tpm_get_timeouts(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	struct tpm_cmd_t tpm_cmd;</div><div class='del'>-	unsigned long new_timeout[4];</div><div class='del'>-	unsigned long old_timeout[4];</div><div class='del'>-	struct duration_t *duration_cap;</div><div class='add'>+	cap_t cap;</div><div class='add'>+	unsigned long timeout_old[4], timeout_chip[4], timeout_eff[4];</div><div class='ctx'> 	ssize_t rc;</div><div class='ctx'> </div><div class='add'>+	if (chip-&gt;flags &amp; TPM_CHIP_FLAG_HAVE_TIMEOUTS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2) {</div><div class='ctx'> 		/* Fixed timeouts for TPM2 */</div><div class='ctx'> 		chip-&gt;timeout_a = msecs_to_jiffies(TPM2_TIMEOUT_A);</div><div class='hunk'>@@ -506,47 +550,41 @@ int tpm_get_timeouts(struct tpm_chip *chip)</div><div class='ctx'> 		    msecs_to_jiffies(TPM2_DURATION_MEDIUM);</div><div class='ctx'> 		chip-&gt;duration[TPM_LONG] =</div><div class='ctx'> 		    msecs_to_jiffies(TPM2_DURATION_LONG);</div><div class='add'>+</div><div class='add'>+		chip-&gt;flags |= TPM_CHIP_FLAG_HAVE_TIMEOUTS;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tpm_cmd.header.in = tpm_getcap_header;</div><div class='del'>-	tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP;</div><div class='del'>-	tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4);</div><div class='del'>-	tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_TIMEOUT;</div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;tpm_cmd, TPM_INTERNAL_RESULT_SIZE, 0,</div><div class='del'>-			      NULL);</div><div class='del'>-</div><div class='add'>+	rc = tpm_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &amp;cap, NULL,</div><div class='add'>+			sizeof(cap.timeout));</div><div class='ctx'> 	if (rc == TPM_ERR_INVALID_POSTINIT) {</div><div class='ctx'> 		/* The TPM is not started, we are the first to talk to it.</div><div class='ctx'> 		   Execute a startup command. */</div><div class='del'>-		dev_info(&amp;chip-&gt;dev, "Issuing TPM_STARTUP");</div><div class='add'>+		dev_info(&amp;chip-&gt;dev, "Issuing TPM_STARTUP\n");</div><div class='ctx'> 		if (tpm_startup(chip, TPM_ST_CLEAR))</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='del'>-		tpm_cmd.header.in = tpm_getcap_header;</div><div class='del'>-		tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP;</div><div class='del'>-		tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4);</div><div class='del'>-		tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_TIMEOUT;</div><div class='del'>-		rc = tpm_transmit_cmd(chip, &amp;tpm_cmd, TPM_INTERNAL_RESULT_SIZE,</div><div class='del'>-				      0, NULL);</div><div class='add'>+		rc = tpm_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &amp;cap,</div><div class='add'>+				"attempting to determine the timeouts",</div><div class='add'>+				sizeof(cap.timeout));</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;chip-&gt;dev,</div><div class='ctx'> 			"A TPM error (%zd) occurred attempting to determine the timeouts\n",</div><div class='ctx'> 			rc);</div><div class='del'>-		goto duration;</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (be32_to_cpu(tpm_cmd.header.out.return_code) != 0 ||</div><div class='del'>-	    be32_to_cpu(tpm_cmd.header.out.length)</div><div class='del'>-	    != sizeof(tpm_cmd.header.out) + sizeof(u32) + 4 * sizeof(u32))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	old_timeout[0] = be32_to_cpu(tpm_cmd.params.getcap_out.cap.timeout.a);</div><div class='del'>-	old_timeout[1] = be32_to_cpu(tpm_cmd.params.getcap_out.cap.timeout.b);</div><div class='del'>-	old_timeout[2] = be32_to_cpu(tpm_cmd.params.getcap_out.cap.timeout.c);</div><div class='del'>-	old_timeout[3] = be32_to_cpu(tpm_cmd.params.getcap_out.cap.timeout.d);</div><div class='del'>-	memcpy(new_timeout, old_timeout, sizeof(new_timeout));</div><div class='add'>+	timeout_old[0] = jiffies_to_usecs(chip-&gt;timeout_a);</div><div class='add'>+	timeout_old[1] = jiffies_to_usecs(chip-&gt;timeout_b);</div><div class='add'>+	timeout_old[2] = jiffies_to_usecs(chip-&gt;timeout_c);</div><div class='add'>+	timeout_old[3] = jiffies_to_usecs(chip-&gt;timeout_d);</div><div class='add'>+	timeout_chip[0] = be32_to_cpu(cap.timeout.a);</div><div class='add'>+	timeout_chip[1] = be32_to_cpu(cap.timeout.b);</div><div class='add'>+	timeout_chip[2] = be32_to_cpu(cap.timeout.c);</div><div class='add'>+	timeout_chip[3] = be32_to_cpu(cap.timeout.d);</div><div class='add'>+	memcpy(timeout_eff, timeout_chip, sizeof(timeout_eff));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Provide ability for vendor overrides of timeout values in case</div><div class='hunk'>@@ -554,16 +592,24 @@ int tpm_get_timeouts(struct tpm_chip *chip)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (chip-&gt;ops-&gt;update_timeouts != NULL)</div><div class='ctx'> 		chip-&gt;timeout_adjusted =</div><div class='del'>-			chip-&gt;ops-&gt;update_timeouts(chip, new_timeout);</div><div class='add'>+			chip-&gt;ops-&gt;update_timeouts(chip, timeout_eff);</div><div class='ctx'> </div><div class='ctx'> 	if (!chip-&gt;timeout_adjusted) {</div><div class='del'>-		/* Don't overwrite default if value is 0 */</div><div class='del'>-		if (new_timeout[0] != 0 &amp;&amp; new_timeout[0] &lt; 1000) {</div><div class='del'>-			int i;</div><div class='add'>+		/* Restore default if chip reported 0 */</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(timeout_eff); i++) {</div><div class='add'>+			if (timeout_eff[i])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			timeout_eff[i] = timeout_old[i];</div><div class='add'>+			chip-&gt;timeout_adjusted = true;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		if (timeout_eff[0] != 0 &amp;&amp; timeout_eff[0] &lt; 1000) {</div><div class='ctx'> 			/* timeouts in msec rather usec */</div><div class='del'>-			for (i = 0; i != ARRAY_SIZE(new_timeout); i++)</div><div class='del'>-				new_timeout[i] *= 1000;</div><div class='add'>+			for (i = 0; i != ARRAY_SIZE(timeout_eff); i++)</div><div class='add'>+				timeout_eff[i] *= 1000;</div><div class='ctx'> 			chip-&gt;timeout_adjusted = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -572,40 +618,29 @@ int tpm_get_timeouts(struct tpm_chip *chip)</div><div class='ctx'> 	if (chip-&gt;timeout_adjusted) {</div><div class='ctx'> 		dev_info(&amp;chip-&gt;dev,</div><div class='ctx'> 			 HW_ERR "Adjusting reported timeouts: A %lu-&gt;%luus B %lu-&gt;%luus C %lu-&gt;%luus D %lu-&gt;%luus\n",</div><div class='del'>-			 old_timeout[0], new_timeout[0],</div><div class='del'>-			 old_timeout[1], new_timeout[1],</div><div class='del'>-			 old_timeout[2], new_timeout[2],</div><div class='del'>-			 old_timeout[3], new_timeout[3]);</div><div class='add'>+			 timeout_chip[0], timeout_eff[0],</div><div class='add'>+			 timeout_chip[1], timeout_eff[1],</div><div class='add'>+			 timeout_chip[2], timeout_eff[2],</div><div class='add'>+			 timeout_chip[3], timeout_eff[3]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chip-&gt;timeout_a = usecs_to_jiffies(new_timeout[0]);</div><div class='del'>-	chip-&gt;timeout_b = usecs_to_jiffies(new_timeout[1]);</div><div class='del'>-	chip-&gt;timeout_c = usecs_to_jiffies(new_timeout[2]);</div><div class='del'>-	chip-&gt;timeout_d = usecs_to_jiffies(new_timeout[3]);</div><div class='add'>+	chip-&gt;timeout_a = usecs_to_jiffies(timeout_eff[0]);</div><div class='add'>+	chip-&gt;timeout_b = usecs_to_jiffies(timeout_eff[1]);</div><div class='add'>+	chip-&gt;timeout_c = usecs_to_jiffies(timeout_eff[2]);</div><div class='add'>+	chip-&gt;timeout_d = usecs_to_jiffies(timeout_eff[3]);</div><div class='ctx'> </div><div class='del'>-duration:</div><div class='del'>-	tpm_cmd.header.in = tpm_getcap_header;</div><div class='del'>-	tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP;</div><div class='del'>-	tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4);</div><div class='del'>-	tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_DURATION;</div><div class='del'>-</div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;tpm_cmd, TPM_INTERNAL_RESULT_SIZE, 0,</div><div class='del'>-			      "attempting to determine the durations");</div><div class='add'>+	rc = tpm_getcap(chip, TPM_CAP_PROP_TIS_DURATION, &amp;cap,</div><div class='add'>+			"attempting to determine the durations",</div><div class='add'>+			sizeof(cap.duration));</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	if (be32_to_cpu(tpm_cmd.header.out.return_code) != 0 ||</div><div class='del'>-	    be32_to_cpu(tpm_cmd.header.out.length)</div><div class='del'>-	    != sizeof(tpm_cmd.header.out) + sizeof(u32) + 3 * sizeof(u32))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	duration_cap = &amp;tpm_cmd.params.getcap_out.cap.duration;</div><div class='ctx'> 	chip-&gt;duration[TPM_SHORT] =</div><div class='del'>-	    usecs_to_jiffies(be32_to_cpu(duration_cap-&gt;tpm_short));</div><div class='add'>+		usecs_to_jiffies(be32_to_cpu(cap.duration.tpm_short));</div><div class='ctx'> 	chip-&gt;duration[TPM_MEDIUM] =</div><div class='del'>-	    usecs_to_jiffies(be32_to_cpu(duration_cap-&gt;tpm_medium));</div><div class='add'>+		usecs_to_jiffies(be32_to_cpu(cap.duration.tpm_medium));</div><div class='ctx'> 	chip-&gt;duration[TPM_LONG] =</div><div class='del'>-	    usecs_to_jiffies(be32_to_cpu(duration_cap-&gt;tpm_long));</div><div class='add'>+		usecs_to_jiffies(be32_to_cpu(cap.duration.tpm_long));</div><div class='ctx'> </div><div class='ctx'> 	/* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above</div><div class='ctx'> 	 * value wrong and apparently reports msecs rather than usecs. So we</div><div class='hunk'>@@ -619,6 +654,8 @@ duration:</div><div class='ctx'> 		chip-&gt;duration_adjusted = true;</div><div class='ctx'> 		dev_info(&amp;chip-&gt;dev, "Adjusting TPM timeout parameters.");</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;flags |= TPM_CHIP_FLAG_HAVE_TIMEOUTS;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_get_timeouts);</div><div class='hunk'>@@ -645,13 +682,14 @@ static int tpm_continue_selftest(struct tpm_chip *chip)</div><div class='ctx'> 	struct tpm_cmd_t cmd;</div><div class='ctx'> </div><div class='ctx'> 	cmd.header.in = continue_selftest_header;</div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;cmd, CONTINUE_SELFTEST_RESULT_SIZE, 0,</div><div class='add'>+	rc = tpm_transmit_cmd(chip, &amp;cmd, CONTINUE_SELFTEST_RESULT_SIZE, 0, 0,</div><div class='ctx'> 			      "continue selftest");</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define TPM_ORDINAL_PCRREAD cpu_to_be32(21)</div><div class='ctx'> #define READ_PCR_RESULT_SIZE 30</div><div class='add'>+#define READ_PCR_RESULT_BODY_SIZE 20</div><div class='ctx'> static const struct tpm_input_header pcrread_header = {</div><div class='ctx'> 	.tag = TPM_TAG_RQU_COMMAND,</div><div class='ctx'> 	.length = cpu_to_be32(14),</div><div class='hunk'>@@ -665,7 +703,8 @@ int tpm_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)</div><div class='ctx'> </div><div class='ctx'> 	cmd.header.in = pcrread_header;</div><div class='ctx'> 	cmd.params.pcrread_in.pcr_idx = cpu_to_be32(pcr_idx);</div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;cmd, READ_PCR_RESULT_SIZE, 0,</div><div class='add'>+	rc = tpm_transmit_cmd(chip, &amp;cmd, READ_PCR_RESULT_SIZE,</div><div class='add'>+			      READ_PCR_RESULT_BODY_SIZE, 0,</div><div class='ctx'> 			      "attempting to read a pcr value");</div><div class='ctx'> </div><div class='ctx'> 	if (rc == 0)</div><div class='hunk'>@@ -726,6 +765,15 @@ int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_pcr_read);</div><div class='ctx'> </div><div class='add'>+#define TPM_ORD_PCR_EXTEND cpu_to_be32(20)</div><div class='add'>+#define EXTEND_PCR_RESULT_SIZE 34</div><div class='add'>+#define EXTEND_PCR_RESULT_BODY_SIZE 20</div><div class='add'>+static const struct tpm_input_header pcrextend_header = {</div><div class='add'>+	.tag = TPM_TAG_RQU_COMMAND,</div><div class='add'>+	.length = cpu_to_be32(34),</div><div class='add'>+	.ordinal = TPM_ORD_PCR_EXTEND</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * tpm_pcr_extend - extend pcr value with hash</div><div class='ctx'>  * @chip_num:	tpm idx # or AN&amp;</div><div class='hunk'>@@ -736,26 +784,30 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read);</div><div class='ctx'>  * isn't, protect against the chip disappearing, by incrementing</div><div class='ctx'>  * the module usage count.</div><div class='ctx'>  */</div><div class='del'>-#define TPM_ORD_PCR_EXTEND cpu_to_be32(20)</div><div class='del'>-#define EXTEND_PCR_RESULT_SIZE 34</div><div class='del'>-static const struct tpm_input_header pcrextend_header = {</div><div class='del'>-	.tag = TPM_TAG_RQU_COMMAND,</div><div class='del'>-	.length = cpu_to_be32(34),</div><div class='del'>-	.ordinal = TPM_ORD_PCR_EXTEND</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm_cmd_t cmd;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct tpm_chip *chip;</div><div class='add'>+	struct tpm2_digest digest_list[ARRAY_SIZE(chip-&gt;active_banks)];</div><div class='add'>+	u32 count = 0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	chip = tpm_chip_find_get(chip_num);</div><div class='ctx'> 	if (chip == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2) {</div><div class='del'>-		rc = tpm2_pcr_extend(chip, pcr_idx, hash);</div><div class='add'>+		memset(digest_list, 0, sizeof(digest_list));</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(chip-&gt;active_banks) &amp;&amp;</div><div class='add'>+			    chip-&gt;active_banks[i] != TPM2_ALG_ERROR; i++) {</div><div class='add'>+			digest_list[i].alg_id = chip-&gt;active_banks[i];</div><div class='add'>+			memcpy(digest_list[i].digest, hash, TPM_DIGEST_SIZE);</div><div class='add'>+			count++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rc = tpm2_pcr_extend(chip, pcr_idx, count, digest_list);</div><div class='ctx'> 		tpm_put_ops(chip);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -763,7 +815,8 @@ int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)</div><div class='ctx'> 	cmd.header.in = pcrextend_header;</div><div class='ctx'> 	cmd.params.pcrextend_in.pcr_idx = cpu_to_be32(pcr_idx);</div><div class='ctx'> 	memcpy(cmd.params.pcrextend_in.hash, hash, TPM_DIGEST_SIZE);</div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;cmd, EXTEND_PCR_RESULT_SIZE, 0,</div><div class='add'>+	rc = tpm_transmit_cmd(chip, &amp;cmd, EXTEND_PCR_RESULT_SIZE,</div><div class='add'>+			      EXTEND_PCR_RESULT_BODY_SIZE, 0,</div><div class='ctx'> 			      "attempting extend a PCR value");</div><div class='ctx'> </div><div class='ctx'> 	tpm_put_ops(chip);</div><div class='hunk'>@@ -867,7 +920,7 @@ int tpm_send(u32 chip_num, void *cmd, size_t buflen)</div><div class='ctx'> 	if (chip == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	rc = tpm_transmit_cmd(chip, cmd, buflen, 0, "attempting tpm_cmd");</div><div class='add'>+	rc = tpm_transmit_cmd(chip, cmd, buflen, 0, 0, "attempting tpm_cmd");</div><div class='ctx'> </div><div class='ctx'> 	tpm_put_ops(chip);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -969,7 +1022,8 @@ int tpm_pm_suspend(struct device *dev)</div><div class='ctx'> 		cmd.params.pcrextend_in.pcr_idx = cpu_to_be32(tpm_suspend_pcr);</div><div class='ctx'> 		memcpy(cmd.params.pcrextend_in.hash, dummy_hash,</div><div class='ctx'> 		       TPM_DIGEST_SIZE);</div><div class='del'>-		rc = tpm_transmit_cmd(chip, &amp;cmd, EXTEND_PCR_RESULT_SIZE, 0,</div><div class='add'>+		rc = tpm_transmit_cmd(chip, &amp;cmd, EXTEND_PCR_RESULT_SIZE,</div><div class='add'>+				     EXTEND_PCR_RESULT_BODY_SIZE, 0,</div><div class='ctx'> 				      "extending dummy pcr before suspend");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -977,7 +1031,7 @@ int tpm_pm_suspend(struct device *dev)</div><div class='ctx'> 	for (try = 0; try &lt; TPM_RETRY; try++) {</div><div class='ctx'> 		cmd.header.in = savestate_header;</div><div class='ctx'> 		rc = tpm_transmit_cmd(chip, &amp;cmd, SAVESTATE_RESULT_SIZE, 0,</div><div class='del'>-				      NULL);</div><div class='add'>+				      0, NULL);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the TPM indicates that it is too busy to respond to</div><div class='hunk'>@@ -1039,7 +1093,7 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm_chip *chip;</div><div class='ctx'> 	struct tpm_cmd_t tpm_cmd;</div><div class='del'>-	u32 recd, num_bytes = min_t(u32, max, TPM_MAX_RNG_DATA);</div><div class='add'>+	u32 recd, num_bytes = min_t(u32, max, TPM_MAX_RNG_DATA), rlength;</div><div class='ctx'> 	int err, total = 0, retries = 5;</div><div class='ctx'> 	u8 *dest = out;</div><div class='ctx'> </div><div class='hunk'>@@ -1062,11 +1116,20 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max)</div><div class='ctx'> </div><div class='ctx'> 		err = tpm_transmit_cmd(chip, &amp;tpm_cmd,</div><div class='ctx'> 				       TPM_GETRANDOM_RESULT_SIZE + num_bytes,</div><div class='add'>+				       offsetof(struct tpm_getrandom_out,</div><div class='add'>+						rng_data),</div><div class='ctx'> 				       0, "attempting get random");</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		recd = be32_to_cpu(tpm_cmd.params.getrandom_out.rng_data_len);</div><div class='add'>+</div><div class='add'>+		rlength = be32_to_cpu(tpm_cmd.header.out.length);</div><div class='add'>+		if (rlength &lt; offsetof(struct tpm_getrandom_out, rng_data) +</div><div class='add'>+			      recd) {</div><div class='add'>+			total = -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		memcpy(dest, tpm_cmd.params.getrandom_out.rng_data, recd);</div><div class='ctx'> </div><div class='ctx'> 		dest += recd;</div><div class='head'>diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c<br/>index a76ab4af9fb2..2f596d74f80c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm-sysfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm-sysfs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm-sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm-sysfs.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include "tpm.h"</div><div class='ctx'> </div><div class='ctx'> #define READ_PUBEK_RESULT_SIZE 314</div><div class='add'>+#define READ_PUBEK_RESULT_MIN_BODY_SIZE (28 + 256)</div><div class='ctx'> #define TPM_ORD_READPUBEK cpu_to_be32(124)</div><div class='ctx'> static const struct tpm_input_header tpm_readpubek_header = {</div><div class='ctx'> 	.tag = TPM_TAG_RQU_COMMAND,</div><div class='hunk'>@@ -39,7 +40,8 @@ static ssize_t pubek_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct tpm_chip *chip = to_tpm_chip(dev);</div><div class='ctx'> </div><div class='ctx'> 	tpm_cmd.header.in = tpm_readpubek_header;</div><div class='del'>-	err = tpm_transmit_cmd(chip, &amp;tpm_cmd, READ_PUBEK_RESULT_SIZE, 0,</div><div class='add'>+	err = tpm_transmit_cmd(chip, &amp;tpm_cmd, READ_PUBEK_RESULT_SIZE,</div><div class='add'>+			       READ_PUBEK_RESULT_MIN_BODY_SIZE, 0,</div><div class='ctx'> 			       "attempting to read the PUBEK");</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -95,7 +97,8 @@ static ssize_t pcrs_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct tpm_chip *chip = to_tpm_chip(dev);</div><div class='ctx'> </div><div class='ctx'> 	rc = tpm_getcap(chip, TPM_CAP_PROP_PCR, &amp;cap,</div><div class='del'>-			"attempting to determine the number of PCRS");</div><div class='add'>+			"attempting to determine the number of PCRS",</div><div class='add'>+			sizeof(cap.num_pcrs));</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +123,8 @@ static ssize_t enabled_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	ssize_t rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_PERM, &amp;cap,</div><div class='del'>-			"attempting to determine the permanent enabled state");</div><div class='add'>+			"attempting to determine the permanent enabled state",</div><div class='add'>+			sizeof(cap.perm_flags));</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -136,7 +140,8 @@ static ssize_t active_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	ssize_t rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_PERM, &amp;cap,</div><div class='del'>-			"attempting to determine the permanent active state");</div><div class='add'>+			"attempting to determine the permanent active state",</div><div class='add'>+			sizeof(cap.perm_flags));</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -152,7 +157,8 @@ static ssize_t owned_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	ssize_t rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_PROP_OWNER, &amp;cap,</div><div class='del'>-			"attempting to determine the owner state");</div><div class='add'>+			"attempting to determine the owner state",</div><div class='add'>+			sizeof(cap.owned));</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -168,7 +174,8 @@ static ssize_t temp_deactivated_show(struct device *dev,</div><div class='ctx'> 	ssize_t rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_VOL, &amp;cap,</div><div class='del'>-			"attempting to determine the temporary state");</div><div class='add'>+			"attempting to determine the temporary state",</div><div class='add'>+			sizeof(cap.stclear_flags));</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -186,15 +193,17 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	char *str = buf;</div><div class='ctx'> </div><div class='ctx'> 	rc = tpm_getcap(chip, TPM_CAP_PROP_MANUFACTURER, &amp;cap,</div><div class='del'>-			"attempting to determine the manufacturer");</div><div class='add'>+			"attempting to determine the manufacturer",</div><div class='add'>+			sizeof(cap.manufacturer_id));</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	str += sprintf(str, "Manufacturer: 0x%x\n",</div><div class='ctx'> 		       be32_to_cpu(cap.manufacturer_id));</div><div class='ctx'> </div><div class='ctx'> 	/* Try to get a TPM version 1.2 TPM_CAP_VERSION_INFO */</div><div class='del'>-	rc = tpm_getcap(chip, CAP_VERSION_1_2, &amp;cap,</div><div class='del'>-			"attempting to determine the 1.2 version");</div><div class='add'>+	rc = tpm_getcap(chip, TPM_CAP_VERSION_1_2, &amp;cap,</div><div class='add'>+			"attempting to determine the 1.2 version",</div><div class='add'>+			sizeof(cap.tpm_version_1_2));</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		str += sprintf(str,</div><div class='ctx'> 			       "TCG version: %d.%d\nFirmware version: %d.%d\n",</div><div class='hunk'>@@ -204,8 +213,9 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			       cap.tpm_version_1_2.revMinor);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Otherwise just use TPM_STRUCT_VER */</div><div class='del'>-		rc = tpm_getcap(chip, CAP_VERSION_1_1, &amp;cap,</div><div class='del'>-				"attempting to determine the 1.1 version");</div><div class='add'>+		rc = tpm_getcap(chip, TPM_CAP_VERSION_1_1, &amp;cap,</div><div class='add'>+				"attempting to determine the 1.1 version",</div><div class='add'>+				sizeof(cap.tpm_version));</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		str += sprintf(str,</div><div class='hunk'>@@ -284,6 +294,9 @@ static const struct attribute_group tpm_dev_group = {</div><div class='ctx'> </div><div class='ctx'> void tpm_sysfs_add_device(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='add'>+	if (chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* The sysfs routines rely on an implicit tpm_try_get_ops, device_del</div><div class='ctx'> 	 * is called before ops is null'd and the sysfs core synchronizes this</div><div class='ctx'> 	 * removal so that no callbacks are running or can run again</div><div class='head'>diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h<br/>index 4d183c97f6a6..4937b56a275c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm.h</a></div><div class='hunk'>@@ -34,12 +34,14 @@</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;crypto/hash_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum tpm_const {</div><div class='ctx'> 	TPM_MINOR = 224,	/* officially assigned */</div><div class='ctx'> 	TPM_BUFSIZE = 4096,</div><div class='ctx'> 	TPM_NUM_DEVICES = 65536,</div><div class='ctx'> 	TPM_RETRY = 50,		/* 5 seconds */</div><div class='add'>+	TPM_NUM_EVENT_LOG_FILES = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum tpm_timeout {</div><div class='hunk'>@@ -94,6 +96,7 @@ enum tpm2_return_codes {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum tpm2_algorithms {</div><div class='add'>+	TPM2_ALG_ERROR		= 0x0000,</div><div class='ctx'> 	TPM2_ALG_SHA1		= 0x0004,</div><div class='ctx'> 	TPM2_ALG_KEYEDHASH	= 0x0008,</div><div class='ctx'> 	TPM2_ALG_SHA256		= 0x000B,</div><div class='hunk'>@@ -124,6 +127,7 @@ enum tpm2_permanent_handles {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum tpm2_capabilities {</div><div class='add'>+	TPM2_CAP_PCRS		= 5,</div><div class='ctx'> 	TPM2_CAP_TPM_PROPERTIES = 6,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -139,10 +143,20 @@ enum tpm2_startup_types {</div><div class='ctx'> #define TPM_PPI_VERSION_LEN		3</div><div class='ctx'> </div><div class='ctx'> enum tpm_chip_flags {</div><div class='del'>-	TPM_CHIP_FLAG_REGISTERED	= BIT(0),</div><div class='ctx'> 	TPM_CHIP_FLAG_TPM2		= BIT(1),</div><div class='ctx'> 	TPM_CHIP_FLAG_IRQ		= BIT(2),</div><div class='ctx'> 	TPM_CHIP_FLAG_VIRTUAL		= BIT(3),</div><div class='add'>+	TPM_CHIP_FLAG_HAVE_TIMEOUTS	= BIT(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tpm_bios_log {</div><div class='add'>+	void *bios_event_log;</div><div class='add'>+	void *bios_event_log_end;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tpm_chip_seqops {</div><div class='add'>+	struct tpm_chip *chip;</div><div class='add'>+	const struct seq_operations *seqops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tpm_chip {</div><div class='hunk'>@@ -156,6 +170,10 @@ struct tpm_chip {</div><div class='ctx'> 	struct rw_semaphore ops_sem;</div><div class='ctx'> 	const struct tpm_class_ops *ops;</div><div class='ctx'> </div><div class='add'>+	struct tpm_bios_log log;</div><div class='add'>+	struct tpm_chip_seqops bin_log_seqops;</div><div class='add'>+	struct tpm_chip_seqops ascii_log_seqops;</div><div class='add'>+</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> </div><div class='ctx'> 	int dev_num;		/* /dev/tpm# */</div><div class='hunk'>@@ -171,10 +189,12 @@ struct tpm_chip {</div><div class='ctx'> 	unsigned long duration[3]; /* jiffies */</div><div class='ctx'> 	bool duration_adjusted;</div><div class='ctx'> </div><div class='del'>-	struct dentry **bios_dir;</div><div class='add'>+	struct dentry *bios_dir[TPM_NUM_EVENT_LOG_FILES];</div><div class='ctx'> </div><div class='ctx'> 	const struct attribute_group *groups[3];</div><div class='ctx'> 	unsigned int groups_cnt;</div><div class='add'>+</div><div class='add'>+	u16 active_banks[7];</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> 	acpi_handle acpi_dev_handle;</div><div class='ctx'> 	char ppi_version[TPM_PPI_VERSION_LEN + 1];</div><div class='hunk'>@@ -183,17 +203,6 @@ struct tpm_chip {</div><div class='ctx'> </div><div class='ctx'> #define to_tpm_chip(d) container_of(d, struct tpm_chip, dev)</div><div class='ctx'> </div><div class='del'>-static inline int tpm_read_index(int base, int index)</div><div class='del'>-{</div><div class='del'>-	outb(index, base);</div><div class='del'>-	return inb(base+1) &amp; 0xFF;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tpm_write_index(int base, int index, int value)</div><div class='del'>-{</div><div class='del'>-	outb(index, base);</div><div class='del'>-	outb(value &amp; 0xFF, base+1);</div><div class='del'>-}</div><div class='ctx'> struct tpm_input_header {</div><div class='ctx'> 	__be16	tag;</div><div class='ctx'> 	__be32	length;</div><div class='hunk'>@@ -272,7 +281,7 @@ struct permanent_flags_t {</div><div class='ctx'> typedef union {</div><div class='ctx'> 	struct	permanent_flags_t perm_flags;</div><div class='ctx'> 	struct	stclear_flags_t	stclear_flags;</div><div class='del'>-	bool	owned;</div><div class='add'>+	__u8	owned;</div><div class='ctx'> 	__be32	num_pcrs;</div><div class='ctx'> 	struct	tpm_version_t	tpm_version;</div><div class='ctx'> 	struct	tpm_version_1_2_t tpm_version_1_2;</div><div class='hunk'>@@ -282,21 +291,20 @@ typedef union {</div><div class='ctx'> } cap_t;</div><div class='ctx'> </div><div class='ctx'> enum tpm_capabilities {</div><div class='del'>-	TPM_CAP_FLAG = cpu_to_be32(4),</div><div class='del'>-	TPM_CAP_PROP = cpu_to_be32(5),</div><div class='del'>-	CAP_VERSION_1_1 = cpu_to_be32(0x06),</div><div class='del'>-	CAP_VERSION_1_2 = cpu_to_be32(0x1A)</div><div class='add'>+	TPM_CAP_FLAG = 4,</div><div class='add'>+	TPM_CAP_PROP = 5,</div><div class='add'>+	TPM_CAP_VERSION_1_1 = 0x06,</div><div class='add'>+	TPM_CAP_VERSION_1_2 = 0x1A,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum tpm_sub_capabilities {</div><div class='del'>-	TPM_CAP_PROP_PCR = cpu_to_be32(0x101),</div><div class='del'>-	TPM_CAP_PROP_MANUFACTURER = cpu_to_be32(0x103),</div><div class='del'>-	TPM_CAP_FLAG_PERM = cpu_to_be32(0x108),</div><div class='del'>-	TPM_CAP_FLAG_VOL = cpu_to_be32(0x109),</div><div class='del'>-	TPM_CAP_PROP_OWNER = cpu_to_be32(0x111),</div><div class='del'>-	TPM_CAP_PROP_TIS_TIMEOUT = cpu_to_be32(0x115),</div><div class='del'>-	TPM_CAP_PROP_TIS_DURATION = cpu_to_be32(0x120),</div><div class='del'>-</div><div class='add'>+	TPM_CAP_PROP_PCR = 0x101,</div><div class='add'>+	TPM_CAP_PROP_MANUFACTURER = 0x103,</div><div class='add'>+	TPM_CAP_FLAG_PERM = 0x108,</div><div class='add'>+	TPM_CAP_FLAG_VOL = 0x109,</div><div class='add'>+	TPM_CAP_PROP_OWNER = 0x111,</div><div class='add'>+	TPM_CAP_PROP_TIS_TIMEOUT = 0x115,</div><div class='add'>+	TPM_CAP_PROP_TIS_DURATION = 0x120,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct	tpm_getcap_params_in {</div><div class='hunk'>@@ -376,6 +384,11 @@ struct tpm_cmd_t {</div><div class='ctx'> 	tpm_cmd_params	params;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct tpm2_digest {</div><div class='add'>+	u16 alg_id;</div><div class='add'>+	u8 digest[SHA512_DIGEST_SIZE];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /* A string buffer type for constructing TPM commands. This is based on the</div><div class='ctx'>  * ideas of string buffer code in security/keys/trusted.h but is heap based</div><div class='ctx'>  * in order to keep the stack usage minimal.</div><div class='hunk'>@@ -482,10 +495,11 @@ enum tpm_transmit_flags {</div><div class='ctx'> </div><div class='ctx'> ssize_t tpm_transmit(struct tpm_chip *chip, const u8 *buf, size_t bufsiz,</div><div class='ctx'> 		     unsigned int flags);</div><div class='del'>-ssize_t tpm_transmit_cmd(struct tpm_chip *chip, const void *cmd, int len,</div><div class='del'>-			 unsigned int flags, const char *desc);</div><div class='del'>-ssize_t tpm_getcap(struct tpm_chip *chip, __be32 subcap_id, cap_t *cap,</div><div class='del'>-		   const char *desc);</div><div class='add'>+ssize_t tpm_transmit_cmd(struct tpm_chip *chip, const void *buf, size_t bufsiz,</div><div class='add'>+			 size_t min_rsp_body_len, unsigned int flags,</div><div class='add'>+			 const char *desc);</div><div class='add'>+ssize_t tpm_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,</div><div class='add'>+		   const char *desc, size_t min_cap_length);</div><div class='ctx'> int tpm_get_timeouts(struct tpm_chip *);</div><div class='ctx'> int tpm1_auto_startup(struct tpm_chip *chip);</div><div class='ctx'> int tpm_do_selftest(struct tpm_chip *chip);</div><div class='hunk'>@@ -518,8 +532,14 @@ static inline void tpm_add_ppi(struct tpm_chip *chip)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline inline u32 tpm2_rc_value(u32 rc)</div><div class='add'>+{</div><div class='add'>+	return (rc &amp; BIT(7)) ? rc &amp; 0xff : rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int tpm2_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf);</div><div class='del'>-int tpm2_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash);</div><div class='add'>+int tpm2_pcr_extend(struct tpm_chip *chip, int pcr_idx, u32 count,</div><div class='add'>+		    struct tpm2_digest *digests);</div><div class='ctx'> int tpm2_get_random(struct tpm_chip *chip, u8 *out, size_t max);</div><div class='ctx'> int tpm2_seal_trusted(struct tpm_chip *chip,</div><div class='ctx'> 		      struct trusted_key_payload *payload,</div><div class='head'>diff --git a/drivers/char/tpm/tpm1_eventlog.c b/drivers/char/tpm/tpm1_eventlog.c<br/>new file mode 100644<br/>index 000000000000..9a8605e500b5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm1_eventlog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm1_eventlog.c</a></div><div class='hunk'>@@ -0,0 +1,469 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005, 2012 IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Kent Yoder &lt;key@linux.vnet.ibm.com&gt;</div><div class='add'>+ *	Seiji Munetoh &lt;munetoh@jp.ibm.com&gt;</div><div class='add'>+ *	Stefan Berger &lt;stefanb@us.ibm.com&gt;</div><div class='add'>+ *	Reiner Sailer &lt;sailer@watson.ibm.com&gt;</div><div class='add'>+ *	Kylene Hall &lt;kjhall@us.ibm.com&gt;</div><div class='add'>+ *	Nayna Jain &lt;nayna@linux.vnet.ibm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Maintained by: &lt;tpmdd-devel@lists.sourceforge.net&gt;</div><div class='add'>+ *</div><div class='add'>+ * Access to the event log created by a system's firmware / BIOS</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/security.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tpm.h"</div><div class='add'>+#include "tpm_eventlog.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const char* tcpa_event_type_strings[] = {</div><div class='add'>+	"PREBOOT",</div><div class='add'>+	"POST CODE",</div><div class='add'>+	"",</div><div class='add'>+	"NO ACTION",</div><div class='add'>+	"SEPARATOR",</div><div class='add'>+	"ACTION",</div><div class='add'>+	"EVENT TAG",</div><div class='add'>+	"S-CRTM Contents",</div><div class='add'>+	"S-CRTM Version",</div><div class='add'>+	"CPU Microcode",</div><div class='add'>+	"Platform Config Flags",</div><div class='add'>+	"Table of Devices",</div><div class='add'>+	"Compact Hash",</div><div class='add'>+	"IPL",</div><div class='add'>+	"IPL Partition Data",</div><div class='add'>+	"Non-Host Code",</div><div class='add'>+	"Non-Host Config",</div><div class='add'>+	"Non-Host Info"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char* tcpa_pc_event_id_strings[] = {</div><div class='add'>+	"",</div><div class='add'>+	"SMBIOS",</div><div class='add'>+	"BIS Certificate",</div><div class='add'>+	"POST BIOS ",</div><div class='add'>+	"ESCD ",</div><div class='add'>+	"CMOS",</div><div class='add'>+	"NVRAM",</div><div class='add'>+	"Option ROM",</div><div class='add'>+	"Option ROM config",</div><div class='add'>+	"",</div><div class='add'>+	"Option ROM microcode ",</div><div class='add'>+	"S-CRTM Version",</div><div class='add'>+	"S-CRTM Contents ",</div><div class='add'>+	"POST Contents ",</div><div class='add'>+	"Table of Devices",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* returns pointer to start of pos. entry of tcg log */</div><div class='add'>+static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	loff_t i;</div><div class='add'>+	struct tpm_chip *chip = m-&gt;private;</div><div class='add'>+	struct tpm_bios_log *log = &amp;chip-&gt;log;</div><div class='add'>+	void *addr = log-&gt;bios_event_log;</div><div class='add'>+	void *limit = log-&gt;bios_event_log_end;</div><div class='add'>+	struct tcpa_event *event;</div><div class='add'>+	u32 converted_event_size;</div><div class='add'>+	u32 converted_event_type;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* read over *pos measurements */</div><div class='add'>+	for (i = 0; i &lt; *pos; i++) {</div><div class='add'>+		event = addr;</div><div class='add'>+</div><div class='add'>+		converted_event_size =</div><div class='add'>+		    do_endian_conversion(event-&gt;event_size);</div><div class='add'>+		converted_event_type =</div><div class='add'>+		    do_endian_conversion(event-&gt;event_type);</div><div class='add'>+</div><div class='add'>+		if ((addr + sizeof(struct tcpa_event)) &lt; limit) {</div><div class='add'>+			if ((converted_event_type == 0) &amp;&amp;</div><div class='add'>+			    (converted_event_size == 0))</div><div class='add'>+				return NULL;</div><div class='add'>+			addr += (sizeof(struct tcpa_event) +</div><div class='add'>+				 converted_event_size);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* now check if current entry is valid */</div><div class='add'>+	if ((addr + sizeof(struct tcpa_event)) &gt;= limit)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	event = addr;</div><div class='add'>+</div><div class='add'>+	converted_event_size = do_endian_conversion(event-&gt;event_size);</div><div class='add'>+	converted_event_type = do_endian_conversion(event-&gt;event_type);</div><div class='add'>+</div><div class='add'>+	if (((converted_event_type == 0) &amp;&amp; (converted_event_size == 0))</div><div class='add'>+	    || ((addr + sizeof(struct tcpa_event) + converted_event_size)</div><div class='add'>+		&gt;= limit))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *tpm_bios_measurements_next(struct seq_file *m, void *v,</div><div class='add'>+					loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct tcpa_event *event = v;</div><div class='add'>+	struct tpm_chip *chip = m-&gt;private;</div><div class='add'>+	struct tpm_bios_log *log = &amp;chip-&gt;log;</div><div class='add'>+	void *limit = log-&gt;bios_event_log_end;</div><div class='add'>+	u32 converted_event_size;</div><div class='add'>+	u32 converted_event_type;</div><div class='add'>+</div><div class='add'>+	converted_event_size = do_endian_conversion(event-&gt;event_size);</div><div class='add'>+</div><div class='add'>+	v += sizeof(struct tcpa_event) + converted_event_size;</div><div class='add'>+</div><div class='add'>+	/* now check if current entry is valid */</div><div class='add'>+	if ((v + sizeof(struct tcpa_event)) &gt;= limit)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	event = v;</div><div class='add'>+</div><div class='add'>+	converted_event_size = do_endian_conversion(event-&gt;event_size);</div><div class='add'>+	converted_event_type = do_endian_conversion(event-&gt;event_type);</div><div class='add'>+</div><div class='add'>+	if (((converted_event_type == 0) &amp;&amp; (converted_event_size == 0)) ||</div><div class='add'>+	    ((v + sizeof(struct tcpa_event) + converted_event_size) &gt;= limit))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	(*pos)++;</div><div class='add'>+	return v;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tpm_bios_measurements_stop(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_event_name(char *dest, struct tcpa_event *event,</div><div class='add'>+			unsigned char * event_entry)</div><div class='add'>+{</div><div class='add'>+	const char *name = "";</div><div class='add'>+	/* 41 so there is room for 40 data and 1 nul */</div><div class='add'>+	char data[41] = "";</div><div class='add'>+	int i, n_len = 0, d_len = 0;</div><div class='add'>+	struct tcpa_pc_event *pc_event;</div><div class='add'>+</div><div class='add'>+	switch (do_endian_conversion(event-&gt;event_type)) {</div><div class='add'>+	case PREBOOT:</div><div class='add'>+	case POST_CODE:</div><div class='add'>+	case UNUSED:</div><div class='add'>+	case NO_ACTION:</div><div class='add'>+	case SCRTM_CONTENTS:</div><div class='add'>+	case SCRTM_VERSION:</div><div class='add'>+	case CPU_MICROCODE:</div><div class='add'>+	case PLATFORM_CONFIG_FLAGS:</div><div class='add'>+	case TABLE_OF_DEVICES:</div><div class='add'>+	case COMPACT_HASH:</div><div class='add'>+	case IPL:</div><div class='add'>+	case IPL_PARTITION_DATA:</div><div class='add'>+	case NONHOST_CODE:</div><div class='add'>+	case NONHOST_CONFIG:</div><div class='add'>+	case NONHOST_INFO:</div><div class='add'>+		name = tcpa_event_type_strings[do_endian_conversion</div><div class='add'>+						(event-&gt;event_type)];</div><div class='add'>+		n_len = strlen(name);</div><div class='add'>+		break;</div><div class='add'>+	case SEPARATOR:</div><div class='add'>+	case ACTION:</div><div class='add'>+		if (MAX_TEXT_EVENT &gt;</div><div class='add'>+		    do_endian_conversion(event-&gt;event_size)) {</div><div class='add'>+			name = event_entry;</div><div class='add'>+			n_len = do_endian_conversion(event-&gt;event_size);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case EVENT_TAG:</div><div class='add'>+		pc_event = (struct tcpa_pc_event *)event_entry;</div><div class='add'>+</div><div class='add'>+		/* ToDo Row data -&gt; Base64 */</div><div class='add'>+</div><div class='add'>+		switch (do_endian_conversion(pc_event-&gt;event_id)) {</div><div class='add'>+		case SMBIOS:</div><div class='add'>+		case BIS_CERT:</div><div class='add'>+		case CMOS:</div><div class='add'>+		case NVRAM:</div><div class='add'>+		case OPTION_ROM_EXEC:</div><div class='add'>+		case OPTION_ROM_CONFIG:</div><div class='add'>+		case S_CRTM_VERSION:</div><div class='add'>+			name = tcpa_pc_event_id_strings[do_endian_conversion</div><div class='add'>+							(pc_event-&gt;event_id)];</div><div class='add'>+			n_len = strlen(name);</div><div class='add'>+			break;</div><div class='add'>+		/* hash data */</div><div class='add'>+		case POST_BIOS_ROM:</div><div class='add'>+		case ESCD:</div><div class='add'>+		case OPTION_ROM_MICROCODE:</div><div class='add'>+		case S_CRTM_CONTENTS:</div><div class='add'>+		case POST_CONTENTS:</div><div class='add'>+			name = tcpa_pc_event_id_strings[do_endian_conversion</div><div class='add'>+							(pc_event-&gt;event_id)];</div><div class='add'>+			n_len = strlen(name);</div><div class='add'>+			for (i = 0; i &lt; 20; i++)</div><div class='add'>+				d_len += sprintf(&amp;data[2*i], "%02x",</div><div class='add'>+						pc_event-&gt;event_data[i]);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snprintf(dest, MAX_TEXT_EVENT, "[%.*s%.*s]",</div><div class='add'>+			n_len, name, d_len, data);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct tcpa_event *event = v;</div><div class='add'>+	struct tcpa_event temp_event;</div><div class='add'>+	char *temp_ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;temp_event, event, sizeof(struct tcpa_event));</div><div class='add'>+</div><div class='add'>+	/* convert raw integers for endianness */</div><div class='add'>+	temp_event.pcr_index = do_endian_conversion(event-&gt;pcr_index);</div><div class='add'>+	temp_event.event_type = do_endian_conversion(event-&gt;event_type);</div><div class='add'>+	temp_event.event_size = do_endian_conversion(event-&gt;event_size);</div><div class='add'>+</div><div class='add'>+	temp_ptr = (char *) &amp;temp_event;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; (sizeof(struct tcpa_event) - 1) ; i++)</div><div class='add'>+		seq_putc(m, temp_ptr[i]);</div><div class='add'>+</div><div class='add'>+	temp_ptr = (char *) v;</div><div class='add'>+</div><div class='add'>+	for (i = (sizeof(struct tcpa_event) - 1);</div><div class='add'>+	     i &lt; (sizeof(struct tcpa_event) + temp_event.event_size); i++)</div><div class='add'>+		seq_putc(m, temp_ptr[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tpm_bios_measurements_release(struct inode *inode,</div><div class='add'>+					 struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *seq = (struct seq_file *)file-&gt;private_data;</div><div class='add'>+	struct tpm_chip *chip = (struct tpm_chip *)seq-&gt;private;</div><div class='add'>+</div><div class='add'>+	put_device(&amp;chip-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return seq_release(inode, file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tpm_ascii_bios_measurements_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	int len = 0;</div><div class='add'>+	char *eventname;</div><div class='add'>+	struct tcpa_event *event = v;</div><div class='add'>+	unsigned char *event_entry =</div><div class='add'>+	    (unsigned char *)(v + sizeof(struct tcpa_event));</div><div class='add'>+</div><div class='add'>+	eventname = kmalloc(MAX_TEXT_EVENT, GFP_KERNEL);</div><div class='add'>+	if (!eventname) {</div><div class='add'>+		printk(KERN_ERR "%s: ERROR - No Memory for event name\n ",</div><div class='add'>+		       __func__);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 1st: PCR */</div><div class='add'>+	seq_printf(m, "%2d ", do_endian_conversion(event-&gt;pcr_index));</div><div class='add'>+</div><div class='add'>+	/* 2nd: SHA1 */</div><div class='add'>+	seq_printf(m, "%20phN", event-&gt;pcr_value);</div><div class='add'>+</div><div class='add'>+	/* 3rd: event type identifier */</div><div class='add'>+	seq_printf(m, " %02x", do_endian_conversion(event-&gt;event_type));</div><div class='add'>+</div><div class='add'>+	len += get_event_name(eventname, event, event_entry);</div><div class='add'>+</div><div class='add'>+	/* 4th: eventname &lt;= max + \'0' delimiter */</div><div class='add'>+	seq_printf(m, " %s\n", eventname);</div><div class='add'>+</div><div class='add'>+	kfree(eventname);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct seq_operations tpm_ascii_b_measurements_seqops = {</div><div class='add'>+	.start = tpm_bios_measurements_start,</div><div class='add'>+	.next = tpm_bios_measurements_next,</div><div class='add'>+	.stop = tpm_bios_measurements_stop,</div><div class='add'>+	.show = tpm_ascii_bios_measurements_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct seq_operations tpm_binary_b_measurements_seqops = {</div><div class='add'>+	.start = tpm_bios_measurements_start,</div><div class='add'>+	.next = tpm_bios_measurements_next,</div><div class='add'>+	.stop = tpm_bios_measurements_stop,</div><div class='add'>+	.show = tpm_binary_bios_measurements_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tpm_bios_measurements_open(struct inode *inode,</div><div class='add'>+					    struct file *file)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct seq_file *seq;</div><div class='add'>+	struct tpm_chip_seqops *chip_seqops;</div><div class='add'>+	const struct seq_operations *seqops;</div><div class='add'>+	struct tpm_chip *chip;</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	if (!inode-&gt;i_private) {</div><div class='add'>+		inode_unlock(inode);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	chip_seqops = (struct tpm_chip_seqops *)inode-&gt;i_private;</div><div class='add'>+	seqops = chip_seqops-&gt;seqops;</div><div class='add'>+	chip = chip_seqops-&gt;chip;</div><div class='add'>+	get_device(&amp;chip-&gt;dev);</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+</div><div class='add'>+	/* now register seq file */</div><div class='add'>+	err = seq_open(file, seqops);</div><div class='add'>+	if (!err) {</div><div class='add'>+		seq = file-&gt;private_data;</div><div class='add'>+		seq-&gt;private = chip;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations tpm_bios_measurements_ops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = tpm_bios_measurements_open,</div><div class='add'>+	.read = seq_read,</div><div class='add'>+	.llseek = seq_lseek,</div><div class='add'>+	.release = tpm_bios_measurements_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tpm_read_log(struct tpm_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;log.bios_event_log != NULL) {</div><div class='add'>+		dev_dbg(&amp;chip-&gt;dev,</div><div class='add'>+			"%s: ERROR - event log already initialized\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = tpm_read_log_acpi(chip);</div><div class='add'>+	if (rc != -ENODEV)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return tpm_read_log_of(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * tpm_bios_log_setup() - Read the event log from the firmware</div><div class='add'>+ * @chip: TPM chip to use.</div><div class='add'>+ *</div><div class='add'>+ * If an event log is found then the securityfs files are setup to</div><div class='add'>+ * export it to userspace, otherwise nothing is done.</div><div class='add'>+ *</div><div class='add'>+ * Returns -ENODEV if the firmware has no event log or securityfs is not</div><div class='add'>+ * supported.</div><div class='add'>+ */</div><div class='add'>+int tpm_bios_log_setup(struct tpm_chip *chip)</div><div class='add'>+{</div><div class='add'>+	const char *name = dev_name(&amp;chip-&gt;dev);</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	rc = tpm_read_log(chip);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	cnt = 0;</div><div class='add'>+	chip-&gt;bios_dir[cnt] = securityfs_create_dir(name, NULL);</div><div class='add'>+	/* NOTE: securityfs_create_dir can return ENODEV if securityfs is</div><div class='add'>+	 * compiled out. The caller should ignore the ENODEV return code.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_ERR(chip-&gt;bios_dir[cnt]))</div><div class='add'>+		goto err;</div><div class='add'>+	cnt++;</div><div class='add'>+</div><div class='add'>+	chip-&gt;bin_log_seqops.chip = chip;</div><div class='add'>+	if (chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2)</div><div class='add'>+		chip-&gt;bin_log_seqops.seqops =</div><div class='add'>+			&amp;tpm2_binary_b_measurements_seqops;</div><div class='add'>+	else</div><div class='add'>+		chip-&gt;bin_log_seqops.seqops =</div><div class='add'>+			&amp;tpm_binary_b_measurements_seqops;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	chip-&gt;bios_dir[cnt] =</div><div class='add'>+	    securityfs_create_file("binary_bios_measurements",</div><div class='add'>+				   0440, chip-&gt;bios_dir[0],</div><div class='add'>+				   (void *)&amp;chip-&gt;bin_log_seqops,</div><div class='add'>+				   &amp;tpm_bios_measurements_ops);</div><div class='add'>+	if (IS_ERR(chip-&gt;bios_dir[cnt]))</div><div class='add'>+		goto err;</div><div class='add'>+	cnt++;</div><div class='add'>+</div><div class='add'>+	if (!(chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2)) {</div><div class='add'>+</div><div class='add'>+		chip-&gt;ascii_log_seqops.chip = chip;</div><div class='add'>+		chip-&gt;ascii_log_seqops.seqops =</div><div class='add'>+			&amp;tpm_ascii_b_measurements_seqops;</div><div class='add'>+</div><div class='add'>+		chip-&gt;bios_dir[cnt] =</div><div class='add'>+			securityfs_create_file("ascii_bios_measurements",</div><div class='add'>+					       0440, chip-&gt;bios_dir[0],</div><div class='add'>+					       (void *)&amp;chip-&gt;ascii_log_seqops,</div><div class='add'>+					       &amp;tpm_bios_measurements_ops);</div><div class='add'>+		if (IS_ERR(chip-&gt;bios_dir[cnt]))</div><div class='add'>+			goto err;</div><div class='add'>+		cnt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	rc = PTR_ERR(chip-&gt;bios_dir[cnt]);</div><div class='add'>+	chip-&gt;bios_dir[cnt] = NULL;</div><div class='add'>+	tpm_bios_log_teardown(chip);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tpm_bios_log_teardown(struct tpm_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+</div><div class='add'>+	/* securityfs_remove currently doesn't take care of handling sync</div><div class='add'>+	 * between removal and opening of pseudo files. To handle this, a</div><div class='add'>+	 * workaround is added by making i_private = NULL here during removal</div><div class='add'>+	 * and to check it during open(), both within inode_lock()/unlock().</div><div class='add'>+	 * This design ensures that open() either safely gets kref or fails.</div><div class='add'>+	 */</div><div class='add'>+	for (i = (TPM_NUM_EVENT_LOG_FILES - 1); i &gt;= 0; i--) {</div><div class='add'>+		if (chip-&gt;bios_dir[i]) {</div><div class='add'>+			inode = d_inode(chip-&gt;bios_dir[i]);</div><div class='add'>+			inode_lock(inode);</div><div class='add'>+			inode-&gt;i_private = NULL;</div><div class='add'>+			inode_unlock(inode);</div><div class='add'>+			securityfs_remove(chip-&gt;bios_dir[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c<br/>index 7df55d58c939..881aea9732bf 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm2-cmd.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm2-cmd.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm2-cmd.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm2-cmd.c</a></div><div class='hunk'>@@ -53,22 +53,6 @@ struct tpm2_pcr_read_out {</div><div class='ctx'> 	u8	digest[TPM_DIGEST_SIZE];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct tpm2_null_auth_area {</div><div class='del'>-	__be32			handle;</div><div class='del'>-	__be16			nonce_size;</div><div class='del'>-	u8			attributes;</div><div class='del'>-	__be16			auth_size;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct tpm2_pcr_extend_in {</div><div class='del'>-	__be32				pcr_idx;</div><div class='del'>-	__be32				auth_area_size;</div><div class='del'>-	struct tpm2_null_auth_area	auth_area;</div><div class='del'>-	__be32				digest_cnt;</div><div class='del'>-	__be16				hash_alg;</div><div class='del'>-	u8				digest[TPM_DIGEST_SIZE];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> struct tpm2_get_tpm_pt_in {</div><div class='ctx'> 	__be32	cap_id;</div><div class='ctx'> 	__be32	property_id;</div><div class='hunk'>@@ -97,7 +81,6 @@ union tpm2_cmd_params {</div><div class='ctx'> 	struct	tpm2_self_test_in	selftest_in;</div><div class='ctx'> 	struct	tpm2_pcr_read_in	pcrread_in;</div><div class='ctx'> 	struct	tpm2_pcr_read_out	pcrread_out;</div><div class='del'>-	struct	tpm2_pcr_extend_in	pcrextend_in;</div><div class='ctx'> 	struct	tpm2_get_tpm_pt_in	get_tpm_pt_in;</div><div class='ctx'> 	struct	tpm2_get_tpm_pt_out	get_tpm_pt_out;</div><div class='ctx'> 	struct	tpm2_get_random_in	getrandom_in;</div><div class='hunk'>@@ -248,6 +231,9 @@ static const u8 tpm2_ordinal_duration[TPM2_CC_LAST - TPM2_CC_FIRST + 1] = {</div><div class='ctx'> 	(sizeof(struct tpm_input_header) + \</div><div class='ctx'> 	 sizeof(struct tpm2_pcr_read_in))</div><div class='ctx'> </div><div class='add'>+#define TPM2_PCR_READ_RESP_BODY_SIZE \</div><div class='add'>+	 sizeof(struct tpm2_pcr_read_out)</div><div class='add'>+</div><div class='ctx'> static const struct tpm_input_header tpm2_pcrread_header = {</div><div class='ctx'> 	.tag = cpu_to_be16(TPM2_ST_NO_SESSIONS),</div><div class='ctx'> 	.length = cpu_to_be32(TPM2_PCR_READ_IN_SIZE),</div><div class='hunk'>@@ -258,11 +244,9 @@ static const struct tpm_input_header tpm2_pcrread_header = {</div><div class='ctx'>  * tpm2_pcr_read() - read a PCR value</div><div class='ctx'>  * @chip:	TPM chip to use.</div><div class='ctx'>  * @pcr_idx:	index of the PCR to read.</div><div class='del'>- * @ref_buf:	buffer to store the resulting hash,</div><div class='add'>+ * @res_buf:	buffer to store the resulting hash.</div><div class='ctx'>  *</div><div class='del'>- * 0 is returned when the operation is successful. If a negative number is</div><div class='del'>- * returned it remarks a POSIX error code. If a positive number is returned</div><div class='del'>- * it remarks a TPM error.</div><div class='add'>+ * Return: Same as with tpm_transmit_cmd.</div><div class='ctx'>  */</div><div class='ctx'> int tpm2_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -282,8 +266,9 @@ int tpm2_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)</div><div class='ctx'> 	       sizeof(cmd.params.pcrread_in.pcr_select));</div><div class='ctx'> 	cmd.params.pcrread_in.pcr_select[pcr_idx &gt;&gt; 3] = 1 &lt;&lt; (pcr_idx &amp; 0x7);</div><div class='ctx'> </div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd), 0,</div><div class='del'>-			      "attempting to read a pcr value");</div><div class='add'>+	rc = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd),</div><div class='add'>+			      TPM2_PCR_READ_RESP_BODY_SIZE,</div><div class='add'>+			      0, "attempting to read a pcr value");</div><div class='ctx'> 	if (rc == 0) {</div><div class='ctx'> 		buf = cmd.params.pcrread_out.digest;</div><div class='ctx'> 		memcpy(res_buf, buf, TPM_DIGEST_SIZE);</div><div class='hunk'>@@ -292,50 +277,71 @@ int tpm2_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define TPM2_GET_PCREXTEND_IN_SIZE \</div><div class='del'>-	(sizeof(struct tpm_input_header) + \</div><div class='del'>-	 sizeof(struct tpm2_pcr_extend_in))</div><div class='del'>-</div><div class='del'>-static const struct tpm_input_header tpm2_pcrextend_header = {</div><div class='del'>-	.tag = cpu_to_be16(TPM2_ST_SESSIONS),</div><div class='del'>-	.length = cpu_to_be32(TPM2_GET_PCREXTEND_IN_SIZE),</div><div class='del'>-	.ordinal = cpu_to_be32(TPM2_CC_PCR_EXTEND)</div><div class='del'>-};</div><div class='add'>+struct tpm2_null_auth_area {</div><div class='add'>+	__be32  handle;</div><div class='add'>+	__be16  nonce_size;</div><div class='add'>+	u8  attributes;</div><div class='add'>+	__be16  auth_size;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm2_pcr_extend() - extend a PCR value</div><div class='add'>+ *</div><div class='ctx'>  * @chip:	TPM chip to use.</div><div class='ctx'>  * @pcr_idx:	index of the PCR.</div><div class='del'>- * @hash:	hash value to use for the extend operation.</div><div class='add'>+ * @count:	number of digests passed.</div><div class='add'>+ * @digests:	list of pcr banks and corresponding digest values to extend.</div><div class='ctx'>  *</div><div class='del'>- * 0 is returned when the operation is successful. If a negative number is</div><div class='del'>- * returned it remarks a POSIX error code. If a positive number is returned</div><div class='del'>- * it remarks a TPM error.</div><div class='add'>+ * Return: Same as with tpm_transmit_cmd.</div><div class='ctx'>  */</div><div class='del'>-int tpm2_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash)</div><div class='add'>+int tpm2_pcr_extend(struct tpm_chip *chip, int pcr_idx, u32 count,</div><div class='add'>+		    struct tpm2_digest *digests)</div><div class='ctx'> {</div><div class='del'>-	struct tpm2_cmd cmd;</div><div class='add'>+	struct tpm_buf buf;</div><div class='add'>+	struct tpm2_null_auth_area auth_area;</div><div class='ctx'> 	int rc;</div><div class='add'>+	int i;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	if (count &gt; ARRAY_SIZE(chip-&gt;active_banks))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rc = tpm_buf_init(&amp;buf, TPM2_ST_SESSIONS, TPM2_CC_PCR_EXTEND);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	tpm_buf_append_u32(&amp;buf, pcr_idx);</div><div class='add'>+</div><div class='add'>+	auth_area.handle = cpu_to_be32(TPM2_RS_PW);</div><div class='add'>+	auth_area.nonce_size = 0;</div><div class='add'>+	auth_area.attributes = 0;</div><div class='add'>+	auth_area.auth_size = 0;</div><div class='add'>+</div><div class='add'>+	tpm_buf_append_u32(&amp;buf, sizeof(struct tpm2_null_auth_area));</div><div class='add'>+	tpm_buf_append(&amp;buf, (const unsigned char *)&amp;auth_area,</div><div class='add'>+		       sizeof(auth_area));</div><div class='add'>+	tpm_buf_append_u32(&amp;buf, count);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(tpm2_hash_map); j++) {</div><div class='add'>+			if (digests[i].alg_id != tpm2_hash_map[j].tpm_id)</div><div class='add'>+				continue;</div><div class='add'>+			tpm_buf_append_u16(&amp;buf, digests[i].alg_id);</div><div class='add'>+			tpm_buf_append(&amp;buf, (const unsigned char</div><div class='add'>+					      *)&amp;digests[i].digest,</div><div class='add'>+			       hash_digest_size[tpm2_hash_map[j].crypto_id]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	cmd.header.in = tpm2_pcrextend_header;</div><div class='del'>-	cmd.params.pcrextend_in.pcr_idx = cpu_to_be32(pcr_idx);</div><div class='del'>-	cmd.params.pcrextend_in.auth_area_size =</div><div class='del'>-		cpu_to_be32(sizeof(struct tpm2_null_auth_area));</div><div class='del'>-	cmd.params.pcrextend_in.auth_area.handle =</div><div class='del'>-		cpu_to_be32(TPM2_RS_PW);</div><div class='del'>-	cmd.params.pcrextend_in.auth_area.nonce_size = 0;</div><div class='del'>-	cmd.params.pcrextend_in.auth_area.attributes = 0;</div><div class='del'>-	cmd.params.pcrextend_in.auth_area.auth_size = 0;</div><div class='del'>-	cmd.params.pcrextend_in.digest_cnt = cpu_to_be32(1);</div><div class='del'>-	cmd.params.pcrextend_in.hash_alg = cpu_to_be16(TPM2_ALG_SHA1);</div><div class='del'>-	memcpy(cmd.params.pcrextend_in.digest, hash, TPM_DIGEST_SIZE);</div><div class='del'>-</div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd), 0,</div><div class='add'>+	rc = tpm_transmit_cmd(chip, buf.data, PAGE_SIZE, 0, 0,</div><div class='ctx'> 			      "attempting extend a PCR value");</div><div class='ctx'> </div><div class='add'>+	tpm_buf_destroy(&amp;buf);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> #define TPM2_GETRANDOM_IN_SIZE \</div><div class='ctx'> 	(sizeof(struct tpm_input_header) + \</div><div class='ctx'> 	 sizeof(struct tpm2_get_random_in))</div><div class='hunk'>@@ -348,18 +354,18 @@ static const struct tpm_input_header tpm2_getrandom_header = {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm2_get_random() - get random bytes from the TPM RNG</div><div class='add'>+ *</div><div class='ctx'>  * @chip: TPM chip to use</div><div class='ctx'>  * @out: destination buffer for the random bytes</div><div class='ctx'>  * @max: the max number of bytes to write to @out</div><div class='ctx'>  *</div><div class='del'>- * 0 is returned when the operation is successful. If a negative number is</div><div class='del'>- * returned it remarks a POSIX error code. If a positive number is returned</div><div class='del'>- * it remarks a TPM error.</div><div class='add'>+ * Return:</div><div class='add'>+ *    Size of the output buffer, or -EIO on error.</div><div class='ctx'>  */</div><div class='ctx'> int tpm2_get_random(struct tpm_chip *chip, u8 *out, size_t max)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm2_cmd cmd;</div><div class='del'>-	u32 recd;</div><div class='add'>+	u32 recd, rlength;</div><div class='ctx'> 	u32 num_bytes;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int total = 0;</div><div class='hunk'>@@ -376,13 +382,19 @@ int tpm2_get_random(struct tpm_chip *chip, u8 *out, size_t max)</div><div class='ctx'> 		cmd.header.in = tpm2_getrandom_header;</div><div class='ctx'> 		cmd.params.getrandom_in.size = cpu_to_be16(num_bytes);</div><div class='ctx'> </div><div class='del'>-		err = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd), 0,</div><div class='del'>-				       "attempting get random");</div><div class='add'>+		err = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd),</div><div class='add'>+				       offsetof(struct tpm2_get_random_out,</div><div class='add'>+						buffer),</div><div class='add'>+				       0, "attempting get random");</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		recd = min_t(u32, be16_to_cpu(cmd.params.getrandom_out.size),</div><div class='ctx'> 			     num_bytes);</div><div class='add'>+		rlength = be32_to_cpu(cmd.header.out.length);</div><div class='add'>+		if (rlength &lt; offsetof(struct tpm2_get_random_out, buffer) +</div><div class='add'>+			      recd)</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		memcpy(dest, cmd.params.getrandom_out.buffer, recd);</div><div class='ctx'> </div><div class='ctx'> 		dest += recd;</div><div class='hunk'>@@ -397,6 +409,9 @@ int tpm2_get_random(struct tpm_chip *chip, u8 *out, size_t max)</div><div class='ctx'> 	(sizeof(struct tpm_input_header) + \</div><div class='ctx'> 	 sizeof(struct tpm2_get_tpm_pt_in))</div><div class='ctx'> </div><div class='add'>+#define TPM2_GET_TPM_PT_OUT_BODY_SIZE \</div><div class='add'>+	 sizeof(struct tpm2_get_tpm_pt_out)</div><div class='add'>+</div><div class='ctx'> static const struct tpm_input_header tpm2_get_tpm_pt_header = {</div><div class='ctx'> 	.tag = cpu_to_be16(TPM2_ST_NO_SESSIONS),</div><div class='ctx'> 	.length = cpu_to_be32(TPM2_GET_TPM_PT_IN_SIZE),</div><div class='hunk'>@@ -404,15 +419,15 @@ static const struct tpm_input_header tpm2_get_tpm_pt_header = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Append TPMS_AUTH_COMMAND to the buffer. The buffer must be allocated with</div><div class='del'>- * tpm_buf_alloc().</div><div class='del'>- *</div><div class='del'>- * @param buf: an allocated tpm_buf instance</div><div class='del'>- * @param nonce: the session nonce, may be NULL if not used</div><div class='del'>- * @param nonce_len: the session nonce length, may be 0 if not used</div><div class='del'>- * @param attributes: the session attributes</div><div class='del'>- * @param hmac: the session HMAC or password, may be NULL if not used</div><div class='del'>- * @param hmac_len: the session HMAC or password length, maybe 0 if not used</div><div class='add'>+ * tpm_buf_append_auth() - append TPMS_AUTH_COMMAND to the buffer.</div><div class='add'>+ *</div><div class='add'>+ * @buf: an allocated tpm_buf instance</div><div class='add'>+ * @session_handle: session handle</div><div class='add'>+ * @nonce: the session nonce, may be NULL if not used</div><div class='add'>+ * @nonce_len: the session nonce length, may be 0 if not used</div><div class='add'>+ * @attributes: the session attributes</div><div class='add'>+ * @hmac: the session HMAC or password, may be NULL if not used</div><div class='add'>+ * @hmac_len: the session HMAC or password length, maybe 0 if not used</div><div class='ctx'>  */</div><div class='ctx'> static void tpm2_buf_append_auth(struct tpm_buf *buf, u32 session_handle,</div><div class='ctx'> 				 const u8 *nonce, u16 nonce_len,</div><div class='hunk'>@@ -435,7 +450,8 @@ static void tpm2_buf_append_auth(struct tpm_buf *buf, u32 session_handle,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm2_seal_trusted() - seal the payload of a trusted key</div><div class='del'>- * @chip_num: TPM chip to use</div><div class='add'>+ *</div><div class='add'>+ * @chip: TPM chip to use</div><div class='ctx'>  * @payload: the key data in clear and encrypted form</div><div class='ctx'>  * @options: authentication values and other options</div><div class='ctx'>  *</div><div class='hunk'>@@ -447,7 +463,7 @@ int tpm2_seal_trusted(struct tpm_chip *chip,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int blob_len;</div><div class='ctx'> 	struct tpm_buf buf;</div><div class='del'>-	u32 hash;</div><div class='add'>+	u32 hash, rlength;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -512,7 +528,8 @@ int tpm2_seal_trusted(struct tpm_chip *chip,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = tpm_transmit_cmd(chip, buf.data, PAGE_SIZE, 0, "sealing data");</div><div class='add'>+	rc = tpm_transmit_cmd(chip, buf.data, PAGE_SIZE, 4, 0,</div><div class='add'>+			      "sealing data");</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -521,6 +538,11 @@ int tpm2_seal_trusted(struct tpm_chip *chip,</div><div class='ctx'> 		rc = -E2BIG;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	rlength = be32_to_cpu(((struct tpm2_cmd *)&amp;buf)-&gt;header.out.length);</div><div class='add'>+	if (rlength &lt; TPM_HEADER_SIZE + 4 + blob_len) {</div><div class='add'>+		rc = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(payload-&gt;blob, &amp;buf.data[TPM_HEADER_SIZE + 4], blob_len);</div><div class='ctx'> 	payload-&gt;blob_len = blob_len;</div><div class='hunk'>@@ -529,7 +551,7 @@ out:</div><div class='ctx'> 	tpm_buf_destroy(&amp;buf);</div><div class='ctx'> </div><div class='ctx'> 	if (rc &gt; 0) {</div><div class='del'>-		if ((rc &amp; TPM2_RC_HASH) == TPM2_RC_HASH)</div><div class='add'>+		if (tpm2_rc_value(rc) == TPM2_RC_HASH)</div><div class='ctx'> 			rc = -EINVAL;</div><div class='ctx'> 		else</div><div class='ctx'> 			rc = -EPERM;</div><div class='hunk'>@@ -540,11 +562,17 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm2_load_cmd() - execute a TPM2_Load command</div><div class='del'>- * @chip_num: TPM chip to use</div><div class='add'>+ *</div><div class='add'>+ * @chip: TPM chip to use</div><div class='ctx'>  * @payload: the key data in clear and encrypted form</div><div class='ctx'>  * @options: authentication values and other options</div><div class='add'>+ * @blob_handle: returned blob handle</div><div class='add'>+ * @flags: tpm transmit flags</div><div class='ctx'>  *</div><div class='del'>- * Return: same as with tpm_transmit_cmd</div><div class='add'>+ * Return: 0 on success.</div><div class='add'>+ *        -E2BIG on wrong payload size.</div><div class='add'>+ *        -EPERM on tpm error status.</div><div class='add'>+ *        &lt; 0 error from tpm_transmit_cmd.</div><div class='ctx'>  */</div><div class='ctx'> static int tpm2_load_cmd(struct tpm_chip *chip,</div><div class='ctx'> 			 struct trusted_key_payload *payload,</div><div class='hunk'>@@ -584,7 +612,8 @@ static int tpm2_load_cmd(struct tpm_chip *chip,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = tpm_transmit_cmd(chip, buf.data, PAGE_SIZE, flags, "loading blob");</div><div class='add'>+	rc = tpm_transmit_cmd(chip, buf.data, PAGE_SIZE, 4, flags,</div><div class='add'>+			      "loading blob");</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		*blob_handle = be32_to_cpup(</div><div class='ctx'> 			(__be32 *) &amp;buf.data[TPM_HEADER_SIZE]);</div><div class='hunk'>@@ -600,11 +629,12 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm2_flush_context_cmd() - execute a TPM2_FlushContext command</div><div class='del'>- * @chip_num: TPM chip to use</div><div class='del'>- * @payload: the key data in clear and encrypted form</div><div class='del'>- * @options: authentication values and other options</div><div class='ctx'>  *</div><div class='del'>- * Return: same as with tpm_transmit_cmd</div><div class='add'>+ * @chip: TPM chip to use</div><div class='add'>+ * @handle: the key data in clear and encrypted form</div><div class='add'>+ * @flags: tpm transmit flags</div><div class='add'>+ *</div><div class='add'>+ * Return: Same as with tpm_transmit_cmd.</div><div class='ctx'>  */</div><div class='ctx'> static void tpm2_flush_context_cmd(struct tpm_chip *chip, u32 handle,</div><div class='ctx'> 				   unsigned int flags)</div><div class='hunk'>@@ -621,7 +651,7 @@ static void tpm2_flush_context_cmd(struct tpm_chip *chip, u32 handle,</div><div class='ctx'> </div><div class='ctx'> 	tpm_buf_append_u32(&amp;buf, handle);</div><div class='ctx'> </div><div class='del'>-	rc = tpm_transmit_cmd(chip, buf.data, PAGE_SIZE, flags,</div><div class='add'>+	rc = tpm_transmit_cmd(chip, buf.data, PAGE_SIZE, 0, flags,</div><div class='ctx'> 			      "flushing context");</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		dev_warn(&amp;chip-&gt;dev, "0x%08x was not flushed, rc=%d\n", handle,</div><div class='hunk'>@@ -632,11 +662,16 @@ static void tpm2_flush_context_cmd(struct tpm_chip *chip, u32 handle,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm2_unseal_cmd() - execute a TPM2_Unload command</div><div class='del'>- * @chip_num: TPM chip to use</div><div class='add'>+ *</div><div class='add'>+ * @chip: TPM chip to use</div><div class='ctx'>  * @payload: the key data in clear and encrypted form</div><div class='ctx'>  * @options: authentication values and other options</div><div class='add'>+ * @blob_handle: blob handle</div><div class='add'>+ * @flags: tpm_transmit_cmd flags</div><div class='ctx'>  *</div><div class='del'>- * Return: same as with tpm_transmit_cmd</div><div class='add'>+ * Return: 0 on success</div><div class='add'>+ *         -EPERM on tpm error status</div><div class='add'>+ *         &lt; 0 error from tpm_transmit_cmd</div><div class='ctx'>  */</div><div class='ctx'> static int tpm2_unseal_cmd(struct tpm_chip *chip,</div><div class='ctx'> 			   struct trusted_key_payload *payload,</div><div class='hunk'>@@ -647,6 +682,7 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip,</div><div class='ctx'> 	u16 data_len;</div><div class='ctx'> 	u8 *data;</div><div class='ctx'> 	int rc;</div><div class='add'>+	u32 rlength;</div><div class='ctx'> </div><div class='ctx'> 	rc = tpm_buf_init(&amp;buf, TPM2_ST_SESSIONS, TPM2_CC_UNSEAL);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -661,13 +697,21 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip,</div><div class='ctx'> 			     options-&gt;blobauth /* hmac */,</div><div class='ctx'> 			     TPM_DIGEST_SIZE);</div><div class='ctx'> </div><div class='del'>-	rc = tpm_transmit_cmd(chip, buf.data, PAGE_SIZE, flags, "unsealing");</div><div class='add'>+	rc = tpm_transmit_cmd(chip, buf.data, PAGE_SIZE, 6, flags,</div><div class='add'>+			      "unsealing");</div><div class='ctx'> 	if (rc &gt; 0)</div><div class='ctx'> 		rc = -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		data_len = be16_to_cpup(</div><div class='ctx'> 			(__be16 *) &amp;buf.data[TPM_HEADER_SIZE + 4]);</div><div class='add'>+</div><div class='add'>+		rlength = be32_to_cpu(((struct tpm2_cmd *)&amp;buf)</div><div class='add'>+					-&gt;header.out.length);</div><div class='add'>+		if (rlength &lt; TPM_HEADER_SIZE + 6 + data_len) {</div><div class='add'>+			rc = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		data = &amp;buf.data[TPM_HEADER_SIZE + 6];</div><div class='ctx'> </div><div class='ctx'> 		memcpy(payload-&gt;key, data, data_len - 1);</div><div class='hunk'>@@ -675,17 +719,19 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip,</div><div class='ctx'> 		payload-&gt;migratable = data[data_len - 1];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	tpm_buf_destroy(&amp;buf);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * tpm_unseal_trusted() - unseal the payload of a trusted key</div><div class='del'>- * @chip_num: TPM chip to use</div><div class='add'>+ * tpm2_unseal_trusted() - unseal the payload of a trusted key</div><div class='add'>+ *</div><div class='add'>+ * @chip: TPM chip to use</div><div class='ctx'>  * @payload: the key data in clear and encrypted form</div><div class='ctx'>  * @options: authentication values and other options</div><div class='ctx'>  *</div><div class='del'>- * Return: &lt; 0 on error and 0 on success.</div><div class='add'>+ * Return: Same as with tpm_transmit_cmd.</div><div class='ctx'>  */</div><div class='ctx'> int tpm2_unseal_trusted(struct tpm_chip *chip,</div><div class='ctx'> 			struct trusted_key_payload *payload,</div><div class='hunk'>@@ -715,9 +761,7 @@ out:</div><div class='ctx'>  * @value:		output variable.</div><div class='ctx'>  * @desc:		passed to tpm_transmit_cmd()</div><div class='ctx'>  *</div><div class='del'>- * 0 is returned when the operation is successful. If a negative number is</div><div class='del'>- * returned it remarks a POSIX error code. If a positive number is returned</div><div class='del'>- * it remarks a TPM error.</div><div class='add'>+ * Return: Same as with tpm_transmit_cmd.</div><div class='ctx'>  */</div><div class='ctx'> ssize_t tpm2_get_tpm_pt(struct tpm_chip *chip, u32 property_id,  u32 *value,</div><div class='ctx'> 			const char *desc)</div><div class='hunk'>@@ -730,7 +774,8 @@ ssize_t tpm2_get_tpm_pt(struct tpm_chip *chip, u32 property_id,  u32 *value,</div><div class='ctx'> 	cmd.params.get_tpm_pt_in.property_id = cpu_to_be32(property_id);</div><div class='ctx'> 	cmd.params.get_tpm_pt_in.property_cnt = cpu_to_be32(1);</div><div class='ctx'> </div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd), 0, desc);</div><div class='add'>+	rc = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd),</div><div class='add'>+			      TPM2_GET_TPM_PT_OUT_BODY_SIZE, 0, desc);</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		*value = be32_to_cpu(cmd.params.get_tpm_pt_out.value);</div><div class='ctx'> </div><div class='hunk'>@@ -750,13 +795,12 @@ static const struct tpm_input_header tpm2_startup_header = {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm2_startup() - send startup command to the TPM chip</div><div class='add'>+ *</div><div class='ctx'>  * @chip:		TPM chip to use.</div><div class='del'>- * @startup_type	startup type. The value is either</div><div class='add'>+ * @startup_type:	startup type. The value is either</div><div class='ctx'>  *			TPM_SU_CLEAR or TPM_SU_STATE.</div><div class='ctx'>  *</div><div class='del'>- * 0 is returned when the operation is successful. If a negative number is</div><div class='del'>- * returned it remarks a POSIX error code. If a positive number is returned</div><div class='del'>- * it remarks a TPM error.</div><div class='add'>+ * Return: Same as with tpm_transmit_cmd.</div><div class='ctx'>  */</div><div class='ctx'> static int tpm2_startup(struct tpm_chip *chip, u16 startup_type)</div><div class='ctx'> {</div><div class='hunk'>@@ -765,7 +809,7 @@ static int tpm2_startup(struct tpm_chip *chip, u16 startup_type)</div><div class='ctx'> 	cmd.header.in = tpm2_startup_header;</div><div class='ctx'> </div><div class='ctx'> 	cmd.params.startup_in.startup_type = cpu_to_be16(startup_type);</div><div class='del'>-	return tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd), 0,</div><div class='add'>+	return tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd), 0, 0,</div><div class='ctx'> 				"attempting to start the TPM");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -781,8 +825,9 @@ static const struct tpm_input_header tpm2_shutdown_header = {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm2_shutdown() - send shutdown command to the TPM chip</div><div class='add'>+ *</div><div class='ctx'>  * @chip:		TPM chip to use.</div><div class='del'>- * @shutdown_type	shutdown type. The value is either</div><div class='add'>+ * @shutdown_type:	shutdown type. The value is either</div><div class='ctx'>  *			TPM_SU_CLEAR or TPM_SU_STATE.</div><div class='ctx'>  */</div><div class='ctx'> void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type)</div><div class='hunk'>@@ -793,7 +838,8 @@ void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type)</div><div class='ctx'> 	cmd.header.in = tpm2_shutdown_header;</div><div class='ctx'> 	cmd.params.startup_in.startup_type = cpu_to_be16(shutdown_type);</div><div class='ctx'> </div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd), 0, "stopping the TPM");</div><div class='add'>+	rc = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd), 0, 0,</div><div class='add'>+			      "stopping the TPM");</div><div class='ctx'> </div><div class='ctx'> 	/* In places where shutdown command is sent there's no much we can do</div><div class='ctx'> 	 * except print the error code on a system failure.</div><div class='hunk'>@@ -805,12 +851,11 @@ void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * tpm2_calc_ordinal_duration() - maximum duration for a command</div><div class='add'>+ *</div><div class='ctx'>  * @chip:	TPM chip to use.</div><div class='ctx'>  * @ordinal:	command code number.</div><div class='ctx'>  *</div><div class='del'>- * 0 is returned when the operation is successful. If a negative number is</div><div class='del'>- * returned it remarks a POSIX error code. If a positive number is returned</div><div class='del'>- * it remarks a TPM error.</div><div class='add'>+ * Return: maximum duration for a command</div><div class='ctx'>  */</div><div class='ctx'> unsigned long tpm2_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal)</div><div class='ctx'> {</div><div class='hunk'>@@ -842,13 +887,12 @@ static const struct tpm_input_header tpm2_selftest_header = {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm2_continue_selftest() - start a self test</div><div class='add'>+ *</div><div class='ctx'>  * @chip: TPM chip to use</div><div class='ctx'>  * @full: test all commands instead of testing only those that were not</div><div class='ctx'>  *        previously tested.</div><div class='ctx'>  *</div><div class='del'>- * 0 is returned when the operation is successful. If a negative number is</div><div class='del'>- * returned it remarks a POSIX error code. If a positive number is returned</div><div class='del'>- * it remarks a TPM error.</div><div class='add'>+ * Return: Same as with tpm_transmit_cmd with exception of RC_TESTING.</div><div class='ctx'>  */</div><div class='ctx'> static int tpm2_start_selftest(struct tpm_chip *chip, bool full)</div><div class='ctx'> {</div><div class='hunk'>@@ -858,7 +902,7 @@ static int tpm2_start_selftest(struct tpm_chip *chip, bool full)</div><div class='ctx'> 	cmd.header.in = tpm2_selftest_header;</div><div class='ctx'> 	cmd.params.selftest_in.full_test = full;</div><div class='ctx'> </div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;cmd, TPM2_SELF_TEST_IN_SIZE, 0,</div><div class='add'>+	rc = tpm_transmit_cmd(chip, &amp;cmd, TPM2_SELF_TEST_IN_SIZE, 0, 0,</div><div class='ctx'> 			      "continue selftest");</div><div class='ctx'> </div><div class='ctx'> 	/* At least some prototype chips seem to give RC_TESTING error</div><div class='hunk'>@@ -874,14 +918,13 @@ static int tpm2_start_selftest(struct tpm_chip *chip, bool full)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm2_do_selftest() - run a full self test</div><div class='add'>+ *</div><div class='ctx'>  * @chip: TPM chip to use</div><div class='ctx'>  *</div><div class='add'>+ * Return: Same as with tpm_transmit_cmd.</div><div class='add'>+ *</div><div class='ctx'>  * During the self test TPM2 commands return with the error code RC_TESTING.</div><div class='ctx'>  * Waiting is done by issuing PCR read until it executes successfully.</div><div class='del'>- *</div><div class='del'>- * 0 is returned when the operation is successful. If a negative number is</div><div class='del'>- * returned it remarks a POSIX error code. If a positive number is returned</div><div class='del'>- * it remarks a TPM error.</div><div class='ctx'>  */</div><div class='ctx'> static int tpm2_do_selftest(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='hunk'>@@ -910,7 +953,7 @@ static int tpm2_do_selftest(struct tpm_chip *chip)</div><div class='ctx'> 		cmd.params.pcrread_in.pcr_select[1] = 0x00;</div><div class='ctx'> 		cmd.params.pcrread_in.pcr_select[2] = 0x00;</div><div class='ctx'> </div><div class='del'>-		rc = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd), 0, NULL);</div><div class='add'>+		rc = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd), 0, 0, NULL);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -928,6 +971,8 @@ static int tpm2_do_selftest(struct tpm_chip *chip)</div><div class='ctx'>  * tpm2_probe() - probe TPM 2.0</div><div class='ctx'>  * @chip: TPM chip to use</div><div class='ctx'>  *</div><div class='add'>+ * Return: &lt; 0 error and 0 on success.</div><div class='add'>+ *</div><div class='ctx'>  * Send idempotent TPM 2.0 command and see whether TPM 2.0 chip replied based on</div><div class='ctx'>  * the reply tag.</div><div class='ctx'>  */</div><div class='hunk'>@@ -941,7 +986,7 @@ int tpm2_probe(struct tpm_chip *chip)</div><div class='ctx'> 	cmd.params.get_tpm_pt_in.property_id = cpu_to_be32(0x100);</div><div class='ctx'> 	cmd.params.get_tpm_pt_in.property_cnt = cpu_to_be32(1);</div><div class='ctx'> </div><div class='del'>-	rc = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd),  0, NULL);</div><div class='add'>+	rc = tpm_transmit_cmd(chip, &amp;cmd, sizeof(cmd), 0, 0, NULL);</div><div class='ctx'> 	if (rc &lt;  0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -952,12 +997,85 @@ int tpm2_probe(struct tpm_chip *chip)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm2_probe);</div><div class='ctx'> </div><div class='add'>+struct tpm2_pcr_selection {</div><div class='add'>+	__be16  hash_alg;</div><div class='add'>+	u8  size_of_select;</div><div class='add'>+	u8  pcr_select[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static ssize_t tpm2_get_pcr_allocation(struct tpm_chip *chip)</div><div class='add'>+{</div><div class='add'>+	struct tpm2_pcr_selection pcr_selection;</div><div class='add'>+	struct tpm_buf buf;</div><div class='add'>+	void *marker;</div><div class='add'>+	void *end;</div><div class='add'>+	void *pcr_select_offset;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	u32 sizeof_pcr_selection;</div><div class='add'>+	u32 rsp_len;</div><div class='add'>+	int rc;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	rc = tpm_buf_init(&amp;buf, TPM2_ST_NO_SESSIONS, TPM2_CC_GET_CAPABILITY);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	tpm_buf_append_u32(&amp;buf, TPM2_CAP_PCRS);</div><div class='add'>+	tpm_buf_append_u32(&amp;buf, 0);</div><div class='add'>+	tpm_buf_append_u32(&amp;buf, 1);</div><div class='add'>+</div><div class='add'>+	rc = tpm_transmit_cmd(chip, buf.data, PAGE_SIZE, 9, 0,</div><div class='add'>+			      "get tpm pcr allocation");</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	count = be32_to_cpup(</div><div class='add'>+		(__be32 *)&amp;buf.data[TPM_HEADER_SIZE + 5]);</div><div class='add'>+</div><div class='add'>+	if (count &gt; ARRAY_SIZE(chip-&gt;active_banks)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	marker = &amp;buf.data[TPM_HEADER_SIZE + 9];</div><div class='add'>+</div><div class='add'>+	rsp_len = be32_to_cpup((__be32 *)&amp;buf.data[2]);</div><div class='add'>+	end = &amp;buf.data[rsp_len];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		pcr_select_offset = marker +</div><div class='add'>+			offsetof(struct tpm2_pcr_selection, size_of_select);</div><div class='add'>+		if (pcr_select_offset &gt;= end) {</div><div class='add'>+			rc = -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;pcr_selection, marker, sizeof(pcr_selection));</div><div class='add'>+		chip-&gt;active_banks[i] = be16_to_cpu(pcr_selection.hash_alg);</div><div class='add'>+		sizeof_pcr_selection = sizeof(pcr_selection.hash_alg) +</div><div class='add'>+			sizeof(pcr_selection.size_of_select) +</div><div class='add'>+			pcr_selection.size_of_select;</div><div class='add'>+		marker = marker + sizeof_pcr_selection;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (i &lt; ARRAY_SIZE(chip-&gt;active_banks))</div><div class='add'>+		chip-&gt;active_banks[i] = TPM2_ALG_ERROR;</div><div class='add'>+</div><div class='add'>+	tpm_buf_destroy(&amp;buf);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * tpm2_auto_startup - Perform the standard automatic TPM initialization</div><div class='ctx'>  *                     sequence</div><div class='ctx'>  * @chip: TPM chip to use</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success, &lt; 0 in case of fatal error.</div><div class='add'>+ * Initializes timeout values for operation and command durations, conducts</div><div class='add'>+ * a self-test and reads the list of active PCR banks.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success. Otherwise, a system error code is returned.</div><div class='ctx'>  */</div><div class='ctx'> int tpm2_auto_startup(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='hunk'>@@ -985,6 +1103,8 @@ int tpm2_auto_startup(struct tpm_chip *chip)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rc = tpm2_get_pcr_allocation(chip);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	if (rc &gt; 0)</div><div class='ctx'> 		rc = -ENODEV;</div><div class='head'>diff --git a/drivers/char/tpm/tpm2_eventlog.c b/drivers/char/tpm/tpm2_eventlog.c<br/>new file mode 100644<br/>index 000000000000..513897cf9c4b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm2_eventlog.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm2_eventlog.c</a></div><div class='hunk'>@@ -0,0 +1,203 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *      Nayna Jain &lt;nayna@linux.vnet.ibm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Access to TPM 2.0 event log as written by Firmware.</div><div class='add'>+ * It assumes that writer of event log has followed TCG Specification</div><div class='add'>+ * for Family "2.0" and written the event data in little endian.</div><div class='add'>+ * With that, it doesn't need any endian conversion for structure</div><div class='add'>+ * content.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/security.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tpm.h"</div><div class='add'>+#include "tpm_eventlog.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * calc_tpm2_event_size() - calculate the event size, where event</div><div class='add'>+ * is an entry in the TPM 2.0 event log. The event is of type Crypto</div><div class='add'>+ * Agile Log Entry Format as defined in TCG EFI Protocol Specification</div><div class='add'>+ * Family "2.0".</div><div class='add'>+</div><div class='add'>+ * @event: event whose size is to be calculated.</div><div class='add'>+ * @event_header: the first event in the event log.</div><div class='add'>+ *</div><div class='add'>+ * Returns size of the event. If it is an invalid event, returns 0.</div><div class='add'>+ */</div><div class='add'>+static int calc_tpm2_event_size(struct tcg_pcr_event2 *event,</div><div class='add'>+				struct tcg_pcr_event *event_header)</div><div class='add'>+{</div><div class='add'>+	struct tcg_efi_specid_event *efispecid;</div><div class='add'>+	struct tcg_event_field *event_field;</div><div class='add'>+	void *marker;</div><div class='add'>+	void *marker_start;</div><div class='add'>+	u32 halg_size;</div><div class='add'>+	size_t size;</div><div class='add'>+	u16 halg;</div><div class='add'>+	int i;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	marker = event;</div><div class='add'>+	marker_start = marker;</div><div class='add'>+	marker = marker + sizeof(event-&gt;pcr_idx) + sizeof(event-&gt;event_type)</div><div class='add'>+		+ sizeof(event-&gt;count);</div><div class='add'>+</div><div class='add'>+	efispecid = (struct tcg_efi_specid_event *)event_header-&gt;event;</div><div class='add'>+</div><div class='add'>+	for (i = 0; (i &lt; event-&gt;count) &amp;&amp; (i &lt; TPM2_ACTIVE_PCR_BANKS);</div><div class='add'>+	     i++) {</div><div class='add'>+		halg_size = sizeof(event-&gt;digests[i].alg_id);</div><div class='add'>+		memcpy(&amp;halg, marker, halg_size);</div><div class='add'>+		marker = marker + halg_size;</div><div class='add'>+		for (j = 0; (j &lt; efispecid-&gt;num_algs); j++) {</div><div class='add'>+			if (halg == efispecid-&gt;digest_sizes[j].alg_id) {</div><div class='add'>+				marker = marker +</div><div class='add'>+					efispecid-&gt;digest_sizes[j].digest_size;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	event_field = (struct tcg_event_field *)marker;</div><div class='add'>+	marker = marker + sizeof(event_field-&gt;event_size)</div><div class='add'>+		+ event_field-&gt;event_size;</div><div class='add'>+	size = marker - marker_start;</div><div class='add'>+</div><div class='add'>+	if ((event-&gt;event_type == 0) &amp;&amp; (event_field-&gt;event_size == 0))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *tpm2_bios_measurements_start(struct seq_file *m, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct tpm_chip *chip = m-&gt;private;</div><div class='add'>+	struct tpm_bios_log *log = &amp;chip-&gt;log;</div><div class='add'>+	void *addr = log-&gt;bios_event_log;</div><div class='add'>+	void *limit = log-&gt;bios_event_log_end;</div><div class='add'>+	struct tcg_pcr_event *event_header;</div><div class='add'>+	struct tcg_pcr_event2 *event;</div><div class='add'>+	size_t size;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	event_header = addr;</div><div class='add'>+	size = sizeof(struct tcg_pcr_event) - sizeof(event_header-&gt;event)</div><div class='add'>+		+ event_header-&gt;event_size;</div><div class='add'>+</div><div class='add'>+	if (*pos == 0) {</div><div class='add'>+		if (addr + size &lt; limit) {</div><div class='add'>+			if ((event_header-&gt;event_type == 0) &amp;&amp;</div><div class='add'>+			    (event_header-&gt;event_size == 0))</div><div class='add'>+				return NULL;</div><div class='add'>+			return SEQ_START_TOKEN;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*pos &gt; 0) {</div><div class='add'>+		addr += size;</div><div class='add'>+		event = addr;</div><div class='add'>+		size = calc_tpm2_event_size(event, event_header);</div><div class='add'>+		if ((addr + size &gt;=  limit) || (size == 0))</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; (*pos - 1); i++) {</div><div class='add'>+		event = addr;</div><div class='add'>+		size = calc_tpm2_event_size(event, event_header);</div><div class='add'>+</div><div class='add'>+		if ((addr + size &gt;= limit) || (size == 0))</div><div class='add'>+			return NULL;</div><div class='add'>+		addr += size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *tpm2_bios_measurements_next(struct seq_file *m, void *v,</div><div class='add'>+					 loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct tcg_pcr_event *event_header;</div><div class='add'>+	struct tcg_pcr_event2 *event;</div><div class='add'>+	struct tpm_chip *chip = m-&gt;private;</div><div class='add'>+	struct tpm_bios_log *log = &amp;chip-&gt;log;</div><div class='add'>+	void *limit = log-&gt;bios_event_log_end;</div><div class='add'>+	size_t event_size;</div><div class='add'>+	void *marker;</div><div class='add'>+</div><div class='add'>+	event_header = log-&gt;bios_event_log;</div><div class='add'>+</div><div class='add'>+	if (v == SEQ_START_TOKEN) {</div><div class='add'>+		event_size = sizeof(struct tcg_pcr_event) -</div><div class='add'>+			sizeof(event_header-&gt;event) + event_header-&gt;event_size;</div><div class='add'>+		marker = event_header;</div><div class='add'>+	} else {</div><div class='add'>+		event = v;</div><div class='add'>+		event_size = calc_tpm2_event_size(event, event_header);</div><div class='add'>+		if (event_size == 0)</div><div class='add'>+			return NULL;</div><div class='add'>+		marker = event;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	marker = marker + event_size;</div><div class='add'>+	if (marker &gt;= limit)</div><div class='add'>+		return NULL;</div><div class='add'>+	v = marker;</div><div class='add'>+	event = v;</div><div class='add'>+</div><div class='add'>+	event_size = calc_tpm2_event_size(event, event_header);</div><div class='add'>+	if (((v + event_size) &gt;= limit) || (event_size == 0))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	(*pos)++;</div><div class='add'>+	return v;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tpm2_bios_measurements_stop(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tpm2_binary_bios_measurements_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct tpm_chip *chip = m-&gt;private;</div><div class='add'>+	struct tpm_bios_log *log = &amp;chip-&gt;log;</div><div class='add'>+	struct tcg_pcr_event *event_header = log-&gt;bios_event_log;</div><div class='add'>+	struct tcg_pcr_event2 *event = v;</div><div class='add'>+	void *temp_ptr;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	if (v == SEQ_START_TOKEN) {</div><div class='add'>+		size = sizeof(struct tcg_pcr_event) -</div><div class='add'>+			sizeof(event_header-&gt;event) + event_header-&gt;event_size;</div><div class='add'>+</div><div class='add'>+		temp_ptr = event_header;</div><div class='add'>+</div><div class='add'>+		if (size &gt; 0)</div><div class='add'>+			seq_write(m, temp_ptr, size);</div><div class='add'>+	} else {</div><div class='add'>+		size = calc_tpm2_event_size(event, event_header);</div><div class='add'>+		temp_ptr = event;</div><div class='add'>+		if (size &gt; 0)</div><div class='add'>+			seq_write(m, temp_ptr, size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct seq_operations tpm2_binary_b_measurements_seqops = {</div><div class='add'>+	.start = tpm2_bios_measurements_start,</div><div class='add'>+	.next = tpm2_bios_measurements_next,</div><div class='add'>+	.stop = tpm2_bios_measurements_stop,</div><div class='add'>+	.show = tpm2_binary_bios_measurements_show,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c<br/>index 565a9478cb94..169edf3ce86d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_acpi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_acpi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_acpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_acpi.c</a></div><div class='hunk'>@@ -6,10 +6,11 @@</div><div class='ctx'>  *	Stefan Berger &lt;stefanb@us.ibm.com&gt;</div><div class='ctx'>  *	Reiner Sailer &lt;sailer@watson.ibm.com&gt;</div><div class='ctx'>  *	Kylene Hall &lt;kjhall@us.ibm.com&gt;</div><div class='add'>+ *	Nayna Jain &lt;nayna@linux.vnet.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Maintained by: &lt;tpmdd-devel@lists.sourceforge.net&gt;</div><div class='ctx'>  *</div><div class='del'>- * Access to the eventlog extended by the TCG BIOS of PC platform</div><div class='add'>+ * Access to the event log extended by the TCG BIOS of PC platform</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='ctx'>  * modify it under the terms of the GNU General Public License</div><div class='hunk'>@@ -45,29 +46,31 @@ struct acpi_tcpa {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* read binary bios log */</div><div class='del'>-int read_log(struct tpm_bios_log *log)</div><div class='add'>+int tpm_read_log_acpi(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_tcpa *buff;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	void __iomem *virt;</div><div class='ctx'> 	u64 len, start;</div><div class='add'>+	struct tpm_bios_log *log;</div><div class='ctx'> </div><div class='del'>-	if (log-&gt;bios_event_log != NULL) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "%s: ERROR - Eventlog already initialized\n",</div><div class='del'>-		       __func__);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	if (chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	log = &amp;chip-&gt;log;</div><div class='add'>+</div><div class='add'>+	/* Unfortuntely ACPI does not associate the event log with a specific</div><div class='add'>+	 * TPM, like PPI. Thus all ACPI TPMs will read the same log.</div><div class='add'>+	 */</div><div class='add'>+	if (!chip-&gt;acpi_dev_handle)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Find TCPA entry in RSDT (ACPI_LOGICAL_ADDRESSING) */</div><div class='ctx'> 	status = acpi_get_table(ACPI_SIG_TCPA, 1,</div><div class='ctx'> 				(struct acpi_table_header **)&amp;buff);</div><div class='ctx'> </div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		printk(KERN_ERR "%s: ERROR - Could not get TCPA table\n",</div><div class='del'>-		       __func__);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	switch(buff-&gt;platform_class) {</div><div class='ctx'> 	case BIOS_SERVER:</div><div class='hunk'>@@ -81,29 +84,29 @@ int read_log(struct tpm_bios_log *log)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!len) {</div><div class='del'>-		printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", __func__);</div><div class='add'>+		dev_warn(&amp;chip-&gt;dev, "%s: TCPA log area empty\n", __func__);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* malloc EventLog space */</div><div class='ctx'> 	log-&gt;bios_event_log = kmalloc(len, GFP_KERNEL);</div><div class='del'>-	if (!log-&gt;bios_event_log) {</div><div class='del'>-		printk("%s: ERROR - Not enough  Memory for BIOS measurements\n",</div><div class='del'>-			__func__);</div><div class='add'>+	if (!log-&gt;bios_event_log)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	log-&gt;bios_event_log_end = log-&gt;bios_event_log + len;</div><div class='ctx'> </div><div class='ctx'> 	virt = acpi_os_map_iomem(start, len);</div><div class='del'>-	if (!virt) {</div><div class='del'>-		kfree(log-&gt;bios_event_log);</div><div class='del'>-		printk("%s: ERROR - Unable to map memory\n", __func__);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+	if (!virt)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	memcpy_fromio(log-&gt;bios_event_log, virt, len);</div><div class='ctx'> </div><div class='ctx'> 	acpi_os_unmap_iomem(virt, len);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	kfree(log-&gt;bios_event_log);</div><div class='add'>+	log-&gt;bios_event_log = NULL;</div><div class='add'>+	return -EIO;</div><div class='add'>+</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h<br/>index 4f96d80cdce9..5c82eb47665e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_atmel.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_atmel.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_atmel.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_atmel.h</a></div><div class='hunk'>@@ -96,6 +96,12 @@ enum tpm_atmel_addr {</div><div class='ctx'> 	TPM_ATMEL_BASE_ADDR_HI = 0x09</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline int tpm_read_index(int base, int index)</div><div class='add'>+{</div><div class='add'>+	outb(index, base);</div><div class='add'>+	return inb(base+1) &amp; 0xFF;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Verify this is a 1.1 Atmel TPM */</div><div class='ctx'> static int atmel_verify_tpm11(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c<br/>index a7c870af916c..86f355b6df1d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_crb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_crb.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_crb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_crb.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include "tpm.h"</div><div class='ctx'> </div><div class='ctx'> #define ACPI_SIG_TPM2 "TPM2"</div><div class='hunk'>@@ -83,7 +84,71 @@ struct crb_priv {</div><div class='ctx'> 	u32 cmd_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static SIMPLE_DEV_PM_OPS(crb_pm, tpm_pm_suspend, tpm_pm_resume);</div><div class='add'>+/**</div><div class='add'>+ * crb_go_idle - request tpm crb device to go the idle state</div><div class='add'>+ *</div><div class='add'>+ * @dev:  crb device</div><div class='add'>+ * @priv: crb private data</div><div class='add'>+ *</div><div class='add'>+ * Write CRB_CTRL_REQ_GO_IDLE to TPM_CRB_CTRL_REQ</div><div class='add'>+ * The device should respond within TIMEOUT_C by clearing the bit.</div><div class='add'>+ * Anyhow, we do not wait here as a consequent CMD_READY request</div><div class='add'>+ * will be handled correctly even if idle was not completed.</div><div class='add'>+ *</div><div class='add'>+ * The function does nothing for devices with ACPI-start method.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 always</div><div class='add'>+ */</div><div class='add'>+static int __maybe_unused crb_go_idle(struct device *dev, struct crb_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (priv-&gt;flags &amp; CRB_FL_ACPI_START)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	iowrite32(CRB_CTRL_REQ_GO_IDLE, &amp;priv-&gt;cca-&gt;req);</div><div class='add'>+	/* we don't really care when this settles */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * crb_cmd_ready - request tpm crb device to enter ready state</div><div class='add'>+ *</div><div class='add'>+ * @dev:  crb device</div><div class='add'>+ * @priv: crb private data</div><div class='add'>+ *</div><div class='add'>+ * Write CRB_CTRL_REQ_CMD_READY to TPM_CRB_CTRL_REQ</div><div class='add'>+ * and poll till the device acknowledge it by clearing the bit.</div><div class='add'>+ * The device should respond within TIMEOUT_C.</div><div class='add'>+ *</div><div class='add'>+ * The function does nothing for devices with ACPI-start method</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success -ETIME on timeout;</div><div class='add'>+ */</div><div class='add'>+static int __maybe_unused crb_cmd_ready(struct device *dev,</div><div class='add'>+					struct crb_priv *priv)</div><div class='add'>+{</div><div class='add'>+	ktime_t stop, start;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;flags &amp; CRB_FL_ACPI_START)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	iowrite32(CRB_CTRL_REQ_CMD_READY, &amp;priv-&gt;cca-&gt;req);</div><div class='add'>+</div><div class='add'>+	start = ktime_get();</div><div class='add'>+	stop = ktime_add(start, ms_to_ktime(TPM2_TIMEOUT_C));</div><div class='add'>+	do {</div><div class='add'>+		if (!(ioread32(&amp;priv-&gt;cca-&gt;req) &amp; CRB_CTRL_REQ_CMD_READY))</div><div class='add'>+			return 0;</div><div class='add'>+		usleep_range(50, 100);</div><div class='add'>+	} while (ktime_before(ktime_get(), stop));</div><div class='add'>+</div><div class='add'>+	if (ioread32(&amp;priv-&gt;cca-&gt;req) &amp; CRB_CTRL_REQ_CMD_READY) {</div><div class='add'>+		dev_warn(dev, "cmdReady timed out\n");</div><div class='add'>+		return -ETIME;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static u8 crb_status(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='hunk'>@@ -196,28 +261,15 @@ static const struct tpm_class_ops tpm_crb = {</div><div class='ctx'> 	.req_complete_val = CRB_DRV_STS_COMPLETE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int crb_init(struct acpi_device *device, struct crb_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct tpm_chip *chip;</div><div class='del'>-</div><div class='del'>-	chip = tpmm_chip_alloc(&amp;device-&gt;dev, &amp;tpm_crb);</div><div class='del'>-	if (IS_ERR(chip))</div><div class='del'>-		return PTR_ERR(chip);</div><div class='del'>-</div><div class='del'>-	dev_set_drvdata(&amp;chip-&gt;dev, priv);</div><div class='del'>-	chip-&gt;acpi_dev_handle = device-&gt;handle;</div><div class='del'>-	chip-&gt;flags = TPM_CHIP_FLAG_TPM2;</div><div class='del'>-</div><div class='del'>-	return tpm_chip_register(chip);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int crb_check_resource(struct acpi_resource *ares, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *io_res = data;</div><div class='del'>-	struct resource res;</div><div class='add'>+	struct resource_win win;</div><div class='add'>+	struct resource *res = &amp;(win.res);</div><div class='ctx'> </div><div class='del'>-	if (acpi_dev_resource_memory(ares, &amp;res)) {</div><div class='del'>-		*io_res = res;</div><div class='add'>+	if (acpi_dev_resource_memory(ares, res) ||</div><div class='add'>+	    acpi_dev_resource_address_space(ares, &amp;win)) {</div><div class='add'>+		*io_res = *res;</div><div class='ctx'> 		io_res-&gt;name = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -249,6 +301,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,</div><div class='ctx'> 	struct list_head resources;</div><div class='ctx'> 	struct resource io_res;</div><div class='ctx'> 	struct device *dev = &amp;device-&gt;dev;</div><div class='add'>+	u32 pa_high, pa_low;</div><div class='ctx'> 	u64 cmd_pa;</div><div class='ctx'> 	u32 cmd_size;</div><div class='ctx'> 	u64 rsp_pa;</div><div class='hunk'>@@ -276,12 +329,27 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,</div><div class='ctx'> 	if (IS_ERR(priv-&gt;cca))</div><div class='ctx'> 		return PTR_ERR(priv-&gt;cca);</div><div class='ctx'> </div><div class='del'>-	cmd_pa = ((u64) ioread32(&amp;priv-&gt;cca-&gt;cmd_pa_high) &lt;&lt; 32) |</div><div class='del'>-		  (u64) ioread32(&amp;priv-&gt;cca-&gt;cmd_pa_low);</div><div class='add'>+	/*</div><div class='add'>+	 * PTT HW bug w/a: wake up the device to access</div><div class='add'>+	 * possibly not retained registers.</div><div class='add'>+	 */</div><div class='add'>+	ret = crb_cmd_ready(dev, priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pa_high = ioread32(&amp;priv-&gt;cca-&gt;cmd_pa_high);</div><div class='add'>+	pa_low  = ioread32(&amp;priv-&gt;cca-&gt;cmd_pa_low);</div><div class='add'>+	cmd_pa = ((u64)pa_high &lt;&lt; 32) | pa_low;</div><div class='ctx'> 	cmd_size = ioread32(&amp;priv-&gt;cca-&gt;cmd_size);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "cmd_hi = %X cmd_low = %X cmd_size %X\n",</div><div class='add'>+		pa_high, pa_low, cmd_size);</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;cmd = crb_map_res(dev, priv, &amp;io_res, cmd_pa, cmd_size);</div><div class='del'>-	if (IS_ERR(priv-&gt;cmd))</div><div class='del'>-		return PTR_ERR(priv-&gt;cmd);</div><div class='add'>+	if (IS_ERR(priv-&gt;cmd)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;cmd);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy_fromio(&amp;rsp_pa, &amp;priv-&gt;cca-&gt;rsp_pa, 8);</div><div class='ctx'> 	rsp_pa = le64_to_cpu(rsp_pa);</div><div class='hunk'>@@ -289,7 +357,8 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (cmd_pa != rsp_pa) {</div><div class='ctx'> 		priv-&gt;rsp = crb_map_res(dev, priv, &amp;io_res, rsp_pa, rsp_size);</div><div class='del'>-		return PTR_ERR_OR_ZERO(priv-&gt;rsp);</div><div class='add'>+		ret = PTR_ERR_OR_ZERO(priv-&gt;rsp);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* According to the PTP specification, overlapping command and response</div><div class='hunk'>@@ -297,18 +366,25 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cmd_size != rsp_size) {</div><div class='ctx'> 		dev_err(dev, FW_BUG "overlapping command and response buffer sizes are not identical");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;cmd_size = cmd_size;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;rsp = priv-&gt;cmd;</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	crb_go_idle(dev, priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crb_acpi_add(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_tpm2 *buf;</div><div class='ctx'> 	struct crb_priv *priv;</div><div class='add'>+	struct tpm_chip *chip;</div><div class='ctx'> 	struct device *dev = &amp;device-&gt;dev;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u32 sm;</div><div class='hunk'>@@ -346,7 +422,33 @@ static int crb_acpi_add(struct acpi_device *device)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	return crb_init(device, priv);</div><div class='add'>+	chip = tpmm_chip_alloc(dev, &amp;tpm_crb);</div><div class='add'>+	if (IS_ERR(chip))</div><div class='add'>+		return PTR_ERR(chip);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;chip-&gt;dev, priv);</div><div class='add'>+	chip-&gt;acpi_dev_handle = device-&gt;handle;</div><div class='add'>+	chip-&gt;flags = TPM_CHIP_FLAG_TPM2;</div><div class='add'>+</div><div class='add'>+	rc  = crb_cmd_ready(dev, priv);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_noresume(dev);</div><div class='add'>+	pm_runtime_set_active(dev);</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='add'>+</div><div class='add'>+	rc = tpm_chip_register(chip);</div><div class='add'>+	if (rc) {</div><div class='add'>+		crb_go_idle(dev, priv);</div><div class='add'>+		pm_runtime_put_noidle(dev);</div><div class='add'>+		pm_runtime_disable(dev);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crb_acpi_remove(struct acpi_device *device)</div><div class='hunk'>@@ -356,9 +458,34 @@ static int crb_acpi_remove(struct acpi_device *device)</div><div class='ctx'> </div><div class='ctx'> 	tpm_chip_unregister(chip);</div><div class='ctx'> </div><div class='add'>+	pm_runtime_disable(dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int crb_pm_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tpm_chip *chip = dev_get_drvdata(dev);</div><div class='add'>+	struct crb_priv *priv = dev_get_drvdata(&amp;chip-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return crb_go_idle(dev, priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crb_pm_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tpm_chip *chip = dev_get_drvdata(dev);</div><div class='add'>+	struct crb_priv *priv = dev_get_drvdata(&amp;chip-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return crb_cmd_ready(dev, priv);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops crb_pm = {</div><div class='add'>+	SET_SYSTEM_SLEEP_PM_OPS(tpm_pm_suspend, tpm_pm_resume)</div><div class='add'>+	SET_RUNTIME_PM_OPS(crb_pm_runtime_suspend, crb_pm_runtime_resume, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct acpi_device_id crb_device_ids[] = {</div><div class='ctx'> 	{"MSFT0101", 0},</div><div class='ctx'> 	{"", 0},</div><div class='head'>diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c<br/>deleted file mode 100644<br/>index e7228863290e..000000000000<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_eventlog.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_eventlog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,454 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2005, 2012 IBM Corporation</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *	Kent Yoder &lt;key@linux.vnet.ibm.com&gt;</div><div class='del'>- *	Seiji Munetoh &lt;munetoh@jp.ibm.com&gt;</div><div class='del'>- *	Stefan Berger &lt;stefanb@us.ibm.com&gt;</div><div class='del'>- *	Reiner Sailer &lt;sailer@watson.ibm.com&gt;</div><div class='del'>- *	Kylene Hall &lt;kjhall@us.ibm.com&gt;</div><div class='del'>- *</div><div class='del'>- * Maintained by: &lt;tpmdd-devel@lists.sourceforge.net&gt;</div><div class='del'>- *</div><div class='del'>- * Access to the eventlog created by a system's firmware / BIOS</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/security.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "tpm.h"</div><div class='del'>-#include "tpm_eventlog.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const char* tcpa_event_type_strings[] = {</div><div class='del'>-	"PREBOOT",</div><div class='del'>-	"POST CODE",</div><div class='del'>-	"",</div><div class='del'>-	"NO ACTION",</div><div class='del'>-	"SEPARATOR",</div><div class='del'>-	"ACTION",</div><div class='del'>-	"EVENT TAG",</div><div class='del'>-	"S-CRTM Contents",</div><div class='del'>-	"S-CRTM Version",</div><div class='del'>-	"CPU Microcode",</div><div class='del'>-	"Platform Config Flags",</div><div class='del'>-	"Table of Devices",</div><div class='del'>-	"Compact Hash",</div><div class='del'>-	"IPL",</div><div class='del'>-	"IPL Partition Data",</div><div class='del'>-	"Non-Host Code",</div><div class='del'>-	"Non-Host Config",</div><div class='del'>-	"Non-Host Info"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char* tcpa_pc_event_id_strings[] = {</div><div class='del'>-	"",</div><div class='del'>-	"SMBIOS",</div><div class='del'>-	"BIS Certificate",</div><div class='del'>-	"POST BIOS ",</div><div class='del'>-	"ESCD ",</div><div class='del'>-	"CMOS",</div><div class='del'>-	"NVRAM",</div><div class='del'>-	"Option ROM",</div><div class='del'>-	"Option ROM config",</div><div class='del'>-	"",</div><div class='del'>-	"Option ROM microcode ",</div><div class='del'>-	"S-CRTM Version",</div><div class='del'>-	"S-CRTM Contents ",</div><div class='del'>-	"POST Contents ",</div><div class='del'>-	"Table of Devices",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* returns pointer to start of pos. entry of tcg log */</div><div class='del'>-static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	loff_t i;</div><div class='del'>-	struct tpm_bios_log *log = m-&gt;private;</div><div class='del'>-	void *addr = log-&gt;bios_event_log;</div><div class='del'>-	void *limit = log-&gt;bios_event_log_end;</div><div class='del'>-	struct tcpa_event *event;</div><div class='del'>-	u32 converted_event_size;</div><div class='del'>-	u32 converted_event_type;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* read over *pos measurements */</div><div class='del'>-	for (i = 0; i &lt; *pos; i++) {</div><div class='del'>-		event = addr;</div><div class='del'>-</div><div class='del'>-		converted_event_size =</div><div class='del'>-		    do_endian_conversion(event-&gt;event_size);</div><div class='del'>-		converted_event_type =</div><div class='del'>-		    do_endian_conversion(event-&gt;event_type);</div><div class='del'>-</div><div class='del'>-		if ((addr + sizeof(struct tcpa_event)) &lt; limit) {</div><div class='del'>-			if ((converted_event_type == 0) &amp;&amp;</div><div class='del'>-			    (converted_event_size == 0))</div><div class='del'>-				return NULL;</div><div class='del'>-			addr += (sizeof(struct tcpa_event) +</div><div class='del'>-				 converted_event_size);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now check if current entry is valid */</div><div class='del'>-	if ((addr + sizeof(struct tcpa_event)) &gt;= limit)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	event = addr;</div><div class='del'>-</div><div class='del'>-	converted_event_size = do_endian_conversion(event-&gt;event_size);</div><div class='del'>-	converted_event_type = do_endian_conversion(event-&gt;event_type);</div><div class='del'>-</div><div class='del'>-	if (((converted_event_type == 0) &amp;&amp; (converted_event_size == 0))</div><div class='del'>-	    || ((addr + sizeof(struct tcpa_event) + converted_event_size)</div><div class='del'>-		&gt;= limit))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *tpm_bios_measurements_next(struct seq_file *m, void *v,</div><div class='del'>-					loff_t *pos)</div><div class='del'>-{</div><div class='del'>-	struct tcpa_event *event = v;</div><div class='del'>-	struct tpm_bios_log *log = m-&gt;private;</div><div class='del'>-	void *limit = log-&gt;bios_event_log_end;</div><div class='del'>-	u32 converted_event_size;</div><div class='del'>-	u32 converted_event_type;</div><div class='del'>-</div><div class='del'>-	converted_event_size = do_endian_conversion(event-&gt;event_size);</div><div class='del'>-</div><div class='del'>-	v += sizeof(struct tcpa_event) + converted_event_size;</div><div class='del'>-</div><div class='del'>-	/* now check if current entry is valid */</div><div class='del'>-	if ((v + sizeof(struct tcpa_event)) &gt;= limit)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	event = v;</div><div class='del'>-</div><div class='del'>-	converted_event_size = do_endian_conversion(event-&gt;event_size);</div><div class='del'>-	converted_event_type = do_endian_conversion(event-&gt;event_type);</div><div class='del'>-</div><div class='del'>-	if (((converted_event_type == 0) &amp;&amp; (converted_event_size == 0)) ||</div><div class='del'>-	    ((v + sizeof(struct tcpa_event) + converted_event_size) &gt;= limit))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	(*pos)++;</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tpm_bios_measurements_stop(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_event_name(char *dest, struct tcpa_event *event,</div><div class='del'>-			unsigned char * event_entry)</div><div class='del'>-{</div><div class='del'>-	const char *name = "";</div><div class='del'>-	/* 41 so there is room for 40 data and 1 nul */</div><div class='del'>-	char data[41] = "";</div><div class='del'>-	int i, n_len = 0, d_len = 0;</div><div class='del'>-	struct tcpa_pc_event *pc_event;</div><div class='del'>-</div><div class='del'>-	switch (do_endian_conversion(event-&gt;event_type)) {</div><div class='del'>-	case PREBOOT:</div><div class='del'>-	case POST_CODE:</div><div class='del'>-	case UNUSED:</div><div class='del'>-	case NO_ACTION:</div><div class='del'>-	case SCRTM_CONTENTS:</div><div class='del'>-	case SCRTM_VERSION:</div><div class='del'>-	case CPU_MICROCODE:</div><div class='del'>-	case PLATFORM_CONFIG_FLAGS:</div><div class='del'>-	case TABLE_OF_DEVICES:</div><div class='del'>-	case COMPACT_HASH:</div><div class='del'>-	case IPL:</div><div class='del'>-	case IPL_PARTITION_DATA:</div><div class='del'>-	case NONHOST_CODE:</div><div class='del'>-	case NONHOST_CONFIG:</div><div class='del'>-	case NONHOST_INFO:</div><div class='del'>-		name = tcpa_event_type_strings[do_endian_conversion</div><div class='del'>-						(event-&gt;event_type)];</div><div class='del'>-		n_len = strlen(name);</div><div class='del'>-		break;</div><div class='del'>-	case SEPARATOR:</div><div class='del'>-	case ACTION:</div><div class='del'>-		if (MAX_TEXT_EVENT &gt;</div><div class='del'>-		    do_endian_conversion(event-&gt;event_size)) {</div><div class='del'>-			name = event_entry;</div><div class='del'>-			n_len = do_endian_conversion(event-&gt;event_size);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case EVENT_TAG:</div><div class='del'>-		pc_event = (struct tcpa_pc_event *)event_entry;</div><div class='del'>-</div><div class='del'>-		/* ToDo Row data -&gt; Base64 */</div><div class='del'>-</div><div class='del'>-		switch (do_endian_conversion(pc_event-&gt;event_id)) {</div><div class='del'>-		case SMBIOS:</div><div class='del'>-		case BIS_CERT:</div><div class='del'>-		case CMOS:</div><div class='del'>-		case NVRAM:</div><div class='del'>-		case OPTION_ROM_EXEC:</div><div class='del'>-		case OPTION_ROM_CONFIG:</div><div class='del'>-		case S_CRTM_VERSION:</div><div class='del'>-			name = tcpa_pc_event_id_strings[do_endian_conversion</div><div class='del'>-							(pc_event-&gt;event_id)];</div><div class='del'>-			n_len = strlen(name);</div><div class='del'>-			break;</div><div class='del'>-		/* hash data */</div><div class='del'>-		case POST_BIOS_ROM:</div><div class='del'>-		case ESCD:</div><div class='del'>-		case OPTION_ROM_MICROCODE:</div><div class='del'>-		case S_CRTM_CONTENTS:</div><div class='del'>-		case POST_CONTENTS:</div><div class='del'>-			name = tcpa_pc_event_id_strings[do_endian_conversion</div><div class='del'>-							(pc_event-&gt;event_id)];</div><div class='del'>-			n_len = strlen(name);</div><div class='del'>-			for (i = 0; i &lt; 20; i++)</div><div class='del'>-				d_len += sprintf(&amp;data[2*i], "%02x",</div><div class='del'>-						pc_event-&gt;event_data[i]);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return snprintf(dest, MAX_TEXT_EVENT, "[%.*s%.*s]",</div><div class='del'>-			n_len, name, d_len, data);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	struct tcpa_event *event = v;</div><div class='del'>-	struct tcpa_event temp_event;</div><div class='del'>-	char *temp_ptr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;temp_event, event, sizeof(struct tcpa_event));</div><div class='del'>-</div><div class='del'>-	/* convert raw integers for endianness */</div><div class='del'>-	temp_event.pcr_index = do_endian_conversion(event-&gt;pcr_index);</div><div class='del'>-	temp_event.event_type = do_endian_conversion(event-&gt;event_type);</div><div class='del'>-	temp_event.event_size = do_endian_conversion(event-&gt;event_size);</div><div class='del'>-</div><div class='del'>-	temp_ptr = (char *) &amp;temp_event;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; (sizeof(struct tcpa_event) - 1) ; i++)</div><div class='del'>-		seq_putc(m, temp_ptr[i]);</div><div class='del'>-</div><div class='del'>-	temp_ptr = (char *) v;</div><div class='del'>-</div><div class='del'>-	for (i = (sizeof(struct tcpa_event) - 1);</div><div class='del'>-	     i &lt; (sizeof(struct tcpa_event) + temp_event.event_size); i++)</div><div class='del'>-		seq_putc(m, temp_ptr[i]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tpm_bios_measurements_release(struct inode *inode,</div><div class='del'>-					 struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct seq_file *seq = file-&gt;private_data;</div><div class='del'>-	struct tpm_bios_log *log = seq-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (log) {</div><div class='del'>-		kfree(log-&gt;bios_event_log);</div><div class='del'>-		kfree(log);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return seq_release(inode, file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tpm_ascii_bios_measurements_show(struct seq_file *m, void *v)</div><div class='del'>-{</div><div class='del'>-	int len = 0;</div><div class='del'>-	char *eventname;</div><div class='del'>-	struct tcpa_event *event = v;</div><div class='del'>-	unsigned char *event_entry =</div><div class='del'>-	    (unsigned char *)(v + sizeof(struct tcpa_event));</div><div class='del'>-</div><div class='del'>-	eventname = kmalloc(MAX_TEXT_EVENT, GFP_KERNEL);</div><div class='del'>-	if (!eventname) {</div><div class='del'>-		printk(KERN_ERR "%s: ERROR - No Memory for event name\n ",</div><div class='del'>-		       __func__);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 1st: PCR */</div><div class='del'>-	seq_printf(m, "%2d ", do_endian_conversion(event-&gt;pcr_index));</div><div class='del'>-</div><div class='del'>-	/* 2nd: SHA1 */</div><div class='del'>-	seq_printf(m, "%20phN", event-&gt;pcr_value);</div><div class='del'>-</div><div class='del'>-	/* 3rd: event type identifier */</div><div class='del'>-	seq_printf(m, " %02x", do_endian_conversion(event-&gt;event_type));</div><div class='del'>-</div><div class='del'>-	len += get_event_name(eventname, event, event_entry);</div><div class='del'>-</div><div class='del'>-	/* 4th: eventname &lt;= max + \'0' delimiter */</div><div class='del'>-	seq_printf(m, " %s\n", eventname);</div><div class='del'>-</div><div class='del'>-	kfree(eventname);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct seq_operations tpm_ascii_b_measurments_seqops = {</div><div class='del'>-	.start = tpm_bios_measurements_start,</div><div class='del'>-	.next = tpm_bios_measurements_next,</div><div class='del'>-	.stop = tpm_bios_measurements_stop,</div><div class='del'>-	.show = tpm_ascii_bios_measurements_show,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct seq_operations tpm_binary_b_measurments_seqops = {</div><div class='del'>-	.start = tpm_bios_measurements_start,</div><div class='del'>-	.next = tpm_bios_measurements_next,</div><div class='del'>-	.stop = tpm_bios_measurements_stop,</div><div class='del'>-	.show = tpm_binary_bios_measurements_show,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int tpm_ascii_bios_measurements_open(struct inode *inode,</div><div class='del'>-					    struct file *file)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct tpm_bios_log *log;</div><div class='del'>-	struct seq_file *seq;</div><div class='del'>-</div><div class='del'>-	log = kzalloc(sizeof(struct tpm_bios_log), GFP_KERNEL);</div><div class='del'>-	if (!log)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if ((err = read_log(log)))</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	/* now register seq file */</div><div class='del'>-	err = seq_open(file, &amp;tpm_ascii_b_measurments_seqops);</div><div class='del'>-	if (!err) {</div><div class='del'>-		seq = file-&gt;private_data;</div><div class='del'>-		seq-&gt;private = log;</div><div class='del'>-	} else {</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-out_free:</div><div class='del'>-	kfree(log-&gt;bios_event_log);</div><div class='del'>-	kfree(log);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations tpm_ascii_bios_measurements_ops = {</div><div class='del'>-	.open = tpm_ascii_bios_measurements_open,</div><div class='del'>-	.read = seq_read,</div><div class='del'>-	.llseek = seq_lseek,</div><div class='del'>-	.release = tpm_bios_measurements_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int tpm_binary_bios_measurements_open(struct inode *inode,</div><div class='del'>-					     struct file *file)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct tpm_bios_log *log;</div><div class='del'>-	struct seq_file *seq;</div><div class='del'>-</div><div class='del'>-	log = kzalloc(sizeof(struct tpm_bios_log), GFP_KERNEL);</div><div class='del'>-	if (!log)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if ((err = read_log(log)))</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	/* now register seq file */</div><div class='del'>-	err = seq_open(file, &amp;tpm_binary_b_measurments_seqops);</div><div class='del'>-	if (!err) {</div><div class='del'>-		seq = file-&gt;private_data;</div><div class='del'>-		seq-&gt;private = log;</div><div class='del'>-	} else {</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-out_free:</div><div class='del'>-	kfree(log-&gt;bios_event_log);</div><div class='del'>-	kfree(log);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations tpm_binary_bios_measurements_ops = {</div><div class='del'>-	.open = tpm_binary_bios_measurements_open,</div><div class='del'>-	.read = seq_read,</div><div class='del'>-	.llseek = seq_lseek,</div><div class='del'>-	.release = tpm_bios_measurements_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int is_bad(void *p)</div><div class='del'>-{</div><div class='del'>-	if (!p)</div><div class='del'>-		return 1;</div><div class='del'>-	if (IS_ERR(p) &amp;&amp; (PTR_ERR(p) != -ENODEV))</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dentry **tpm_bios_log_setup(const char *name)</div><div class='del'>-{</div><div class='del'>-	struct dentry **ret = NULL, *tpm_dir, *bin_file, *ascii_file;</div><div class='del'>-</div><div class='del'>-	tpm_dir = securityfs_create_dir(name, NULL);</div><div class='del'>-	if (is_bad(tpm_dir))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	bin_file =</div><div class='del'>-	    securityfs_create_file("binary_bios_measurements",</div><div class='del'>-				   S_IRUSR | S_IRGRP, tpm_dir, NULL,</div><div class='del'>-				   &amp;tpm_binary_bios_measurements_ops);</div><div class='del'>-	if (is_bad(bin_file))</div><div class='del'>-		goto out_tpm;</div><div class='del'>-</div><div class='del'>-	ascii_file =</div><div class='del'>-	    securityfs_create_file("ascii_bios_measurements",</div><div class='del'>-				   S_IRUSR | S_IRGRP, tpm_dir, NULL,</div><div class='del'>-				   &amp;tpm_ascii_bios_measurements_ops);</div><div class='del'>-	if (is_bad(ascii_file))</div><div class='del'>-		goto out_bin;</div><div class='del'>-</div><div class='del'>-	ret = kmalloc(3 * sizeof(struct dentry *), GFP_KERNEL);</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto out_ascii;</div><div class='del'>-</div><div class='del'>-	ret[0] = ascii_file;</div><div class='del'>-	ret[1] = bin_file;</div><div class='del'>-	ret[2] = tpm_dir;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-out_ascii:</div><div class='del'>-	securityfs_remove(ascii_file);</div><div class='del'>-out_bin:</div><div class='del'>-	securityfs_remove(bin_file);</div><div class='del'>-out_tpm:</div><div class='del'>-	securityfs_remove(tpm_dir);</div><div class='del'>-out:</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tpm_bios_log_teardown(struct dentry **lst)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		securityfs_remove(lst[i]);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/char/tpm/tpm_eventlog.h b/drivers/char/tpm/tpm_eventlog.h<br/>index 8de62b09be51..b4b549559203 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_eventlog.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_eventlog.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_eventlog.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_eventlog.h</a></div><div class='hunk'>@@ -2,9 +2,12 @@</div><div class='ctx'> #ifndef __TPM_EVENTLOG_H__</div><div class='ctx'> #define __TPM_EVENTLOG_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;crypto/hash_info.h&gt;</div><div class='add'>+</div><div class='ctx'> #define TCG_EVENT_NAME_LEN_MAX	255</div><div class='ctx'> #define MAX_TEXT_EVENT		1000	/* Max event string length */</div><div class='ctx'> #define ACPI_TCPA_SIG		"TCPA"	/* 0x41504354 /'TCPA' */</div><div class='add'>+#define TPM2_ACTIVE_PCR_BANKS	3</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> #define do_endian_conversion(x) be32_to_cpu(x)</div><div class='hunk'>@@ -17,11 +20,6 @@ enum bios_platform_class {</div><div class='ctx'> 	BIOS_SERVER = 0x01,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct tpm_bios_log {</div><div class='del'>-	void *bios_event_log;</div><div class='del'>-	void *bios_event_log_end;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct tcpa_event {</div><div class='ctx'> 	u32 pcr_index;</div><div class='ctx'> 	u32 event_type;</div><div class='hunk'>@@ -73,20 +71,67 @@ enum tcpa_pc_event_ids {</div><div class='ctx'> 	HOST_TABLE_OF_DEVICES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int read_log(struct tpm_bios_log *log);</div><div class='add'>+/* http://www.trustedcomputinggroup.org/tcg-efi-protocol-specification/ */</div><div class='add'>+</div><div class='add'>+struct tcg_efi_specid_event_algs {</div><div class='add'>+	u16 alg_id;</div><div class='add'>+	u16 digest_size;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct tcg_efi_specid_event {</div><div class='add'>+	u8 signature[16];</div><div class='add'>+	u32 platform_class;</div><div class='add'>+	u8 spec_version_minor;</div><div class='add'>+	u8 spec_version_major;</div><div class='add'>+	u8 spec_errata;</div><div class='add'>+	u8 uintnsize;</div><div class='add'>+	u32 num_algs;</div><div class='add'>+	struct tcg_efi_specid_event_algs digest_sizes[TPM2_ACTIVE_PCR_BANKS];</div><div class='add'>+	u8 vendor_info_size;</div><div class='add'>+	u8 vendor_info[0];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct tcg_pcr_event {</div><div class='add'>+	u32 pcr_idx;</div><div class='add'>+	u32 event_type;</div><div class='add'>+	u8 digest[20];</div><div class='add'>+	u32 event_size;</div><div class='add'>+	u8 event[0];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct tcg_event_field {</div><div class='add'>+	u32 event_size;</div><div class='add'>+	u8 event[0];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct tcg_pcr_event2 {</div><div class='add'>+	u32 pcr_idx;</div><div class='add'>+	u32 event_type;</div><div class='add'>+	u32 count;</div><div class='add'>+	struct tpm2_digest digests[TPM2_ACTIVE_PCR_BANKS];</div><div class='add'>+	struct tcg_event_field event;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+extern const struct seq_operations tpm2_binary_b_measurements_seqops;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_TCG_IBMVTPM) || defined(CONFIG_TCG_IBMVTPM_MODULE) || \</div><div class='del'>-	defined(CONFIG_ACPI)</div><div class='del'>-extern struct dentry **tpm_bios_log_setup(const char *);</div><div class='del'>-extern void tpm_bios_log_teardown(struct dentry **);</div><div class='add'>+#if defined(CONFIG_ACPI)</div><div class='add'>+int tpm_read_log_acpi(struct tpm_chip *chip);</div><div class='ctx'> #else</div><div class='del'>-static inline struct dentry **tpm_bios_log_setup(const char *name)</div><div class='add'>+static inline int tpm_read_log_acpi(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='del'>-static inline void tpm_bios_log_teardown(struct dentry **dir)</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_OF)</div><div class='add'>+int tpm_read_log_of(struct tpm_chip *chip);</div><div class='add'>+#else</div><div class='add'>+static inline int tpm_read_log_of(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+int tpm_bios_log_setup(struct tpm_chip *chip);</div><div class='add'>+void tpm_bios_log_teardown(struct tpm_chip *chip);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c<br/>index 946025a7413b..1b9d61ffe991 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_ibmvtpm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_ibmvtpm.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_ibmvtpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_ibmvtpm.c</a></div><div class='hunk'>@@ -40,11 +40,12 @@ MODULE_DEVICE_TABLE(vio, tpm_ibmvtpm_device_table);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ibmvtpm_send_crq - Send a CRQ request</div><div class='add'>+ *</div><div class='ctx'>  * @vdev:	vio device struct</div><div class='ctx'>  * @w1:		first word</div><div class='ctx'>  * @w2:		second word</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='add'>+ * Return:</div><div class='ctx'>  *	0 -Sucess</div><div class='ctx'>  *	Non-zero - Failure</div><div class='ctx'>  */</div><div class='hunk'>@@ -55,11 +56,12 @@ static int ibmvtpm_send_crq(struct vio_dev *vdev, u64 w1, u64 w2)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm_ibmvtpm_recv - Receive data after send</div><div class='add'>+ *</div><div class='ctx'>  * @chip:	tpm chip struct</div><div class='ctx'>  * @buf:	buffer to read</div><div class='del'>- * count:	size of buffer</div><div class='add'>+ * @count:	size of buffer</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='add'>+ * Return:</div><div class='ctx'>  *	Number of bytes read</div><div class='ctx'>  */</div><div class='ctx'> static int tpm_ibmvtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count)</div><div class='hunk'>@@ -96,12 +98,13 @@ static int tpm_ibmvtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm_ibmvtpm_send - Send tpm request</div><div class='add'>+ *</div><div class='ctx'>  * @chip:	tpm chip struct</div><div class='ctx'>  * @buf:	buffer contains data to send</div><div class='del'>- * count:	size of buffer</div><div class='add'>+ * @count:	size of buffer</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	Number of bytes sent</div><div class='add'>+ * Return:</div><div class='add'>+ *	Number of bytes sent or &lt; 0 on error.</div><div class='ctx'>  */</div><div class='ctx'> static int tpm_ibmvtpm_send(struct tpm_chip *chip, u8 *buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -170,11 +173,12 @@ static u8 tpm_ibmvtpm_status(struct tpm_chip *chip)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ibmvtpm_crq_get_rtce_size - Send a CRQ request to get rtce size</div><div class='add'>+ *</div><div class='ctx'>  * @ibmvtpm:	vtpm device struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	0 - Success</div><div class='del'>- *	Non-zero - Failure</div><div class='add'>+ * Return:</div><div class='add'>+ *	0 on success.</div><div class='add'>+ *	Non-zero on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int ibmvtpm_crq_get_rtce_size(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'> {</div><div class='hunk'>@@ -197,11 +201,12 @@ static int ibmvtpm_crq_get_rtce_size(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'> /**</div><div class='ctx'>  * ibmvtpm_crq_get_version - Send a CRQ request to get vtpm version</div><div class='ctx'>  *			   - Note that this is vtpm version and not tpm version</div><div class='add'>+ *</div><div class='ctx'>  * @ibmvtpm:	vtpm device struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	0 - Success</div><div class='del'>- *	Non-zero - Failure</div><div class='add'>+ * Return:</div><div class='add'>+ *	0 on success.</div><div class='add'>+ *	Non-zero on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int ibmvtpm_crq_get_version(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'> {</div><div class='hunk'>@@ -225,9 +230,9 @@ static int ibmvtpm_crq_get_version(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'>  * ibmvtpm_crq_send_init_complete - Send a CRQ initialize complete message</div><div class='ctx'>  * @ibmvtpm:	vtpm device struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	0 - Success</div><div class='del'>- *	Non-zero - Failure</div><div class='add'>+ * Return:</div><div class='add'>+ *	0 on success.</div><div class='add'>+ *	Non-zero on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int ibmvtpm_crq_send_init_complete(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'> {</div><div class='hunk'>@@ -245,9 +250,9 @@ static int ibmvtpm_crq_send_init_complete(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'>  * ibmvtpm_crq_send_init - Send a CRQ initialize message</div><div class='ctx'>  * @ibmvtpm:	vtpm device struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	0 - Success</div><div class='del'>- *	Non-zero - Failure</div><div class='add'>+ * Return:</div><div class='add'>+ *	0 on success.</div><div class='add'>+ *	Non-zero on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int ibmvtpm_crq_send_init(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'> {</div><div class='hunk'>@@ -265,8 +270,7 @@ static int ibmvtpm_crq_send_init(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'>  * tpm_ibmvtpm_remove - ibm vtpm remove entry point</div><div class='ctx'>  * @vdev:	vio device struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	0</div><div class='add'>+ * Return: Always 0.</div><div class='ctx'>  */</div><div class='ctx'> static int tpm_ibmvtpm_remove(struct vio_dev *vdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -303,18 +307,19 @@ static int tpm_ibmvtpm_remove(struct vio_dev *vdev)</div><div class='ctx'>  * tpm_ibmvtpm_get_desired_dma - Get DMA size needed by this driver</div><div class='ctx'>  * @vdev:	vio device struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	Number of bytes the driver needs to DMA map</div><div class='add'>+ * Return:</div><div class='add'>+ *	Number of bytes the driver needs to DMA map.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long tpm_ibmvtpm_get_desired_dma(struct vio_dev *vdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm_chip *chip = dev_get_drvdata(&amp;vdev-&gt;dev);</div><div class='ctx'> 	struct ibmvtpm_dev *ibmvtpm = dev_get_drvdata(&amp;chip-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	/* ibmvtpm initializes at probe time, so the data we are</div><div class='del'>-	* asking for may not be set yet. Estimate that 4K required</div><div class='del'>-	* for TCE-mapped buffer in addition to CRQ.</div><div class='del'>-	*/</div><div class='add'>+	/*</div><div class='add'>+	 * ibmvtpm initializes at probe time, so the data we are</div><div class='add'>+	 * asking for may not be set yet. Estimate that 4K required</div><div class='add'>+	 * for TCE-mapped buffer in addition to CRQ.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!ibmvtpm)</div><div class='ctx'> 		return CRQ_RES_BUF_SIZE + PAGE_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -325,8 +330,7 @@ static unsigned long tpm_ibmvtpm_get_desired_dma(struct vio_dev *vdev)</div><div class='ctx'>  * tpm_ibmvtpm_suspend - Suspend</div><div class='ctx'>  * @dev:	device struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	0</div><div class='add'>+ * Return: Always 0.</div><div class='ctx'>  */</div><div class='ctx'> static int tpm_ibmvtpm_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -350,11 +354,12 @@ static int tpm_ibmvtpm_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ibmvtpm_reset_crq - Reset CRQ</div><div class='add'>+ *</div><div class='ctx'>  * @ibmvtpm:	ibm vtpm struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	0 - Success</div><div class='del'>- *	Non-zero - Failure</div><div class='add'>+ * Return:</div><div class='add'>+ *	0 on success.</div><div class='add'>+ *	Non-zero on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int ibmvtpm_reset_crq(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'> {</div><div class='hunk'>@@ -376,10 +381,10 @@ static int ibmvtpm_reset_crq(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm_ibmvtpm_resume - Resume from suspend</div><div class='add'>+ *</div><div class='ctx'>  * @dev:	device struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	0</div><div class='add'>+ * Return: Always 0.</div><div class='ctx'>  */</div><div class='ctx'> static int tpm_ibmvtpm_resume(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -434,10 +439,10 @@ static const struct dev_pm_ops tpm_ibmvtpm_pm_ops = {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ibmvtpm_crq_get_next - Get next responded crq</div><div class='del'>- * @ibmvtpm	vtpm device struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	vtpm crq pointer</div><div class='add'>+ * @ibmvtpm:	vtpm device struct</div><div class='add'>+ *</div><div class='add'>+ * Return: vtpm crq pointer or NULL.</div><div class='ctx'>  */</div><div class='ctx'> static struct ibmvtpm_crq *ibmvtpm_crq_get_next(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'> {</div><div class='hunk'>@@ -455,11 +460,10 @@ static struct ibmvtpm_crq *ibmvtpm_crq_get_next(struct ibmvtpm_dev *ibmvtpm)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ibmvtpm_crq_process - Process responded crq</div><div class='del'>- * @crq		crq to be processed</div><div class='del'>- * @ibmvtpm	vtpm device struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	Nothing</div><div class='add'>+ * @crq:	crq to be processed</div><div class='add'>+ * @ibmvtpm:	vtpm device struct</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> static void ibmvtpm_crq_process(struct ibmvtpm_crq *crq,</div><div class='ctx'> 				struct ibmvtpm_dev *ibmvtpm)</div><div class='hunk'>@@ -528,6 +532,7 @@ static void ibmvtpm_crq_process(struct ibmvtpm_crq *crq,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ibmvtpm_interrupt -	Interrupt handler</div><div class='add'>+ *</div><div class='ctx'>  * @irq:		irq number to handle</div><div class='ctx'>  * @vtpm_instance:	vtpm that received interrupt</div><div class='ctx'>  *</div><div class='hunk'>@@ -554,12 +559,13 @@ static irqreturn_t ibmvtpm_interrupt(int irq, void *vtpm_instance)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tpm_ibmvtpm_probe - ibm vtpm initialize entry point</div><div class='add'>+ *</div><div class='ctx'>  * @vio_dev:	vio device struct</div><div class='ctx'>  * @id:		vio device id struct</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	0 - Success</div><div class='del'>- *	Non-zero - Failure</div><div class='add'>+ * Return:</div><div class='add'>+ *	0 on success.</div><div class='add'>+ *	Non-zero on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,</div><div class='ctx'> 				   const struct vio_device_id *id)</div><div class='hunk'>@@ -671,11 +677,12 @@ static struct vio_driver ibmvtpm_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ibmvtpm_module_init - Initialize ibm vtpm module</div><div class='add'>+ * ibmvtpm_module_init - Initialize ibm vtpm module.</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *	0 -Success</div><div class='del'>- *	Non-zero - Failure</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *	0 on success.</div><div class='add'>+ *	Non-zero on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int __init ibmvtpm_module_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -683,10 +690,7 @@ static int __init ibmvtpm_module_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ibmvtpm_module_exit - Teardown ibm vtpm module</div><div class='del'>- *</div><div class='del'>- * Return value:</div><div class='del'>- *	Nothing</div><div class='add'>+ * ibmvtpm_module_exit - Tear down ibm vtpm module.</div><div class='ctx'>  */</div><div class='ctx'> static void __exit ibmvtpm_module_exit(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c<br/>index 9ff0e072c476..5d6cce74cd3f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_nsc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_nsc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_nsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_nsc.c</a></div><div class='hunk'>@@ -278,6 +278,18 @@ static struct platform_driver nsc_drv = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline int tpm_read_index(int base, int index)</div><div class='add'>+{</div><div class='add'>+	outb(index, base);</div><div class='add'>+	return inb(base+1) &amp; 0xFF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tpm_write_index(int base, int index, int value)</div><div class='add'>+{</div><div class='add'>+	outb(index, base);</div><div class='add'>+	outb(value &amp; 0xFF, base+1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init init_nsc(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='head'>diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c<br/>index 570f30c5c5f4..de57d4ac8901 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_of.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_of.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_of.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_of.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * Copyright 2012 IBM Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Ashley Lai &lt;ashleydlai@gmail.com&gt;</div><div class='add'>+ *         Nayna Jain &lt;nayna@linux.vnet.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Maintained by: &lt;tpmdd-devel@lists.sourceforge.net&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,55 +21,57 @@</div><div class='ctx'> #include "tpm.h"</div><div class='ctx'> #include "tpm_eventlog.h"</div><div class='ctx'> </div><div class='del'>-int read_log(struct tpm_bios_log *log)</div><div class='add'>+int tpm_read_log_of(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> 	const u32 *sizep;</div><div class='ctx'> 	const u64 *basep;</div><div class='add'>+	struct tpm_bios_log *log;</div><div class='add'>+	u32 size;</div><div class='add'>+	u64 base;</div><div class='ctx'> </div><div class='del'>-	if (log-&gt;bios_event_log != NULL) {</div><div class='del'>-		pr_err("%s: ERROR - Eventlog already initialized\n", __func__);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_name(NULL, "vtpm");</div><div class='del'>-	if (!np) {</div><div class='del'>-		pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);</div><div class='add'>+	log = &amp;chip-&gt;log;</div><div class='add'>+	if (chip-&gt;dev.parent &amp;&amp; chip-&gt;dev.parent-&gt;of_node)</div><div class='add'>+		np = chip-&gt;dev.parent-&gt;of_node;</div><div class='add'>+	else</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	sizep = of_get_property(np, "linux,sml-size", NULL);</div><div class='del'>-	if (sizep == NULL) {</div><div class='del'>-		pr_err("%s: ERROR - SML size not found\n", __func__);</div><div class='del'>-		goto cleanup_eio;</div><div class='del'>-	}</div><div class='del'>-	if (*sizep == 0) {</div><div class='del'>-		pr_err("%s: ERROR - event log area empty\n", __func__);</div><div class='del'>-		goto cleanup_eio;</div><div class='add'>+	basep = of_get_property(np, "linux,sml-base", NULL);</div><div class='add'>+	if (sizep == NULL &amp;&amp; basep == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (sizep == NULL || basep == NULL)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For both vtpm/tpm, firmware has log addr and log size in big</div><div class='add'>+	 * endian format. But in case of vtpm, there is a method called</div><div class='add'>+	 * sml-handover which is run during kernel init even before</div><div class='add'>+	 * device tree is setup. This sml-handover function takes care</div><div class='add'>+	 * of endianness and writes to sml-base and sml-size in little</div><div class='add'>+	 * endian format. For this reason, vtpm doesn't need conversion</div><div class='add'>+	 * but physical tpm needs the conversion.</div><div class='add'>+	 */</div><div class='add'>+	if (of_property_match_string(np, "compatible", "IBM,vtpm") &lt; 0) {</div><div class='add'>+		size = be32_to_cpup(sizep);</div><div class='add'>+		base = be64_to_cpup(basep);</div><div class='add'>+	} else {</div><div class='add'>+		size = *sizep;</div><div class='add'>+		base = *basep;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	basep = of_get_property(np, "linux,sml-base", NULL);</div><div class='del'>-	if (basep == NULL) {</div><div class='del'>-		pr_err("%s: ERROR - SML not found\n", __func__);</div><div class='del'>-		goto cleanup_eio;</div><div class='add'>+	if (size == 0) {</div><div class='add'>+		dev_warn(&amp;chip-&gt;dev, "%s: Event log area empty\n", __func__);</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	log-&gt;bios_event_log = kmalloc(*sizep, GFP_KERNEL);</div><div class='del'>-	if (!log-&gt;bios_event_log) {</div><div class='del'>-		pr_err("%s: ERROR - Not enough memory for BIOS measurements\n",</div><div class='del'>-		       __func__);</div><div class='del'>-		of_node_put(np);</div><div class='add'>+	log-&gt;bios_event_log = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!log-&gt;bios_event_log)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	log-&gt;bios_event_log_end = log-&gt;bios_event_log + *sizep;</div><div class='add'>+	log-&gt;bios_event_log_end = log-&gt;bios_event_log + size;</div><div class='ctx'> </div><div class='del'>-	memcpy(log-&gt;bios_event_log, __va(*basep), *sizep);</div><div class='del'>-	of_node_put(np);</div><div class='add'>+	memcpy(log-&gt;bios_event_log, __va(base), size);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-cleanup_eio:</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	return -EIO;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c<br/>index eaf5730d79eb..c7e1384f1b08 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_tis.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_tis.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_tis.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_tis.c</a></div><div class='hunk'>@@ -28,6 +28,8 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include "tpm.h"</div><div class='ctx'> #include "tpm_tis_core.h"</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +159,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info,</div><div class='ctx'> 		irq = tpm_info-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	if (itpm)</div><div class='del'>-		phy-&gt;priv.flags |= TPM_TIS_ITPM_POSSIBLE;</div><div class='add'>+		phy-&gt;priv.flags |= TPM_TIS_ITPM_WORKAROUND;</div><div class='ctx'> </div><div class='ctx'> 	return tpm_tis_core_init(dev, &amp;phy-&gt;priv, irq, &amp;tpm_tcg,</div><div class='ctx'> 				 acpi_dev_handle);</div><div class='hunk'>@@ -354,12 +356,21 @@ static int tpm_tis_plat_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+static const struct of_device_id tis_of_platform_match[] = {</div><div class='add'>+	{.compatible = "tcg,tpm-tis-mmio"},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, tis_of_platform_match);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct platform_driver tis_drv = {</div><div class='ctx'> 	.probe = tpm_tis_plat_probe,</div><div class='ctx'> 	.remove = tpm_tis_plat_remove,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name		= "tpm_tis",</div><div class='ctx'> 		.pm		= &amp;tpm_tis_pm,</div><div class='add'>+		.of_match_table = of_match_ptr(tis_of_platform_match),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -421,7 +432,7 @@ err_pnp:</div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;tis_acpi_driver);</div><div class='ctx'> err_acpi:</div><div class='ctx'> #endif</div><div class='del'>-	platform_device_unregister(force_pdev);</div><div class='add'>+	platform_driver_unregister(&amp;tis_drv);</div><div class='ctx'> err_platform:</div><div class='ctx'> 	if (force_pdev)</div><div class='ctx'> 		platform_device_unregister(force_pdev);</div><div class='head'>diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c<br/>index e3bf31b37138..c0f296b5d413 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_tis_core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_tis_core.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_tis_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_tis_core.c</a></div><div class='hunk'>@@ -180,12 +180,19 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)</div><div class='ctx'> 	struct tpm_tis_data *priv = dev_get_drvdata(&amp;chip-&gt;dev);</div><div class='ctx'> 	int size = 0, burstcnt, rc;</div><div class='ctx'> </div><div class='del'>-	while (size &lt; count &amp;&amp;</div><div class='del'>-	       wait_for_tpm_stat(chip,</div><div class='add'>+	while (size &lt; count) {</div><div class='add'>+		rc = wait_for_tpm_stat(chip,</div><div class='ctx'> 				 TPM_STS_DATA_AVAIL | TPM_STS_VALID,</div><div class='ctx'> 				 chip-&gt;timeout_c,</div><div class='del'>-				 &amp;priv-&gt;read_queue, true) == 0) {</div><div class='del'>-		burstcnt = min_t(int, get_burstcount(chip), count - size);</div><div class='add'>+				 &amp;priv-&gt;read_queue, true);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+		burstcnt = get_burstcount(chip);</div><div class='add'>+		if (burstcnt &lt; 0) {</div><div class='add'>+			dev_err(&amp;chip-&gt;dev, "Unable to read burstcount\n");</div><div class='add'>+			return burstcnt;</div><div class='add'>+		}</div><div class='add'>+		burstcnt = min_t(int, burstcnt, count - size);</div><div class='ctx'> </div><div class='ctx'> 		rc = tpm_tis_read_bytes(priv, TPM_DATA_FIFO(priv-&gt;locality),</div><div class='ctx'> 					burstcnt, buf + size);</div><div class='hunk'>@@ -229,8 +236,11 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wait_for_tpm_stat(chip, TPM_STS_VALID, chip-&gt;timeout_c,</div><div class='del'>-			  &amp;priv-&gt;int_queue, false);</div><div class='add'>+	if (wait_for_tpm_stat(chip, TPM_STS_VALID, chip-&gt;timeout_c,</div><div class='add'>+				&amp;priv-&gt;int_queue, false) &lt; 0) {</div><div class='add'>+		size = -ETIME;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	status = tpm_tis_status(chip);</div><div class='ctx'> 	if (status &amp; TPM_STS_DATA_AVAIL) {	/* retry? */</div><div class='ctx'> 		dev_err(&amp;chip-&gt;dev, "Error left over data\n");</div><div class='hunk'>@@ -254,7 +264,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)</div><div class='ctx'> 	struct tpm_tis_data *priv = dev_get_drvdata(&amp;chip-&gt;dev);</div><div class='ctx'> 	int rc, status, burstcnt;</div><div class='ctx'> 	size_t count = 0;</div><div class='del'>-	bool itpm = priv-&gt;flags &amp; TPM_TIS_ITPM_POSSIBLE;</div><div class='add'>+	bool itpm = priv-&gt;flags &amp; TPM_TIS_ITPM_WORKAROUND;</div><div class='ctx'> </div><div class='ctx'> 	if (request_locality(chip, 0) &lt; 0)</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -271,7 +281,13 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (count &lt; len - 1) {</div><div class='del'>-		burstcnt = min_t(int, get_burstcount(chip), len - count - 1);</div><div class='add'>+		burstcnt = get_burstcount(chip);</div><div class='add'>+		if (burstcnt &lt; 0) {</div><div class='add'>+			dev_err(&amp;chip-&gt;dev, "Unable to read burstcount\n");</div><div class='add'>+			rc = burstcnt;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+		burstcnt = min_t(int, burstcnt, len - count - 1);</div><div class='ctx'> 		rc = tpm_tis_write_bytes(priv, TPM_DATA_FIFO(priv-&gt;locality),</div><div class='ctx'> 					 burstcnt, buf + count);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='hunk'>@@ -279,8 +295,11 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)</div><div class='ctx'> </div><div class='ctx'> 		count += burstcnt;</div><div class='ctx'> </div><div class='del'>-		wait_for_tpm_stat(chip, TPM_STS_VALID, chip-&gt;timeout_c,</div><div class='del'>-				  &amp;priv-&gt;int_queue, false);</div><div class='add'>+		if (wait_for_tpm_stat(chip, TPM_STS_VALID, chip-&gt;timeout_c,</div><div class='add'>+					&amp;priv-&gt;int_queue, false) &lt; 0) {</div><div class='add'>+			rc = -ETIME;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='ctx'> 		status = tpm_tis_status(chip);</div><div class='ctx'> 		if (!itpm &amp;&amp; (status &amp; TPM_STS_DATA_EXPECT) == 0) {</div><div class='ctx'> 			rc = -EIO;</div><div class='hunk'>@@ -293,8 +312,11 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='del'>-	wait_for_tpm_stat(chip, TPM_STS_VALID, chip-&gt;timeout_c,</div><div class='del'>-			  &amp;priv-&gt;int_queue, false);</div><div class='add'>+	if (wait_for_tpm_stat(chip, TPM_STS_VALID, chip-&gt;timeout_c,</div><div class='add'>+				&amp;priv-&gt;int_queue, false) &lt; 0) {</div><div class='add'>+		rc = -ETIME;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='ctx'> 	status = tpm_tis_status(chip);</div><div class='ctx'> 	if (!itpm &amp;&amp; (status &amp; TPM_STS_DATA_EXPECT) != 0) {</div><div class='ctx'> 		rc = -EIO;</div><div class='hunk'>@@ -442,6 +464,9 @@ static int probe_itpm(struct tpm_chip *chip)</div><div class='ctx'> 	size_t len = sizeof(cmd_getticks);</div><div class='ctx'> 	u16 vendor;</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;flags &amp; TPM_TIS_ITPM_WORKAROUND)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	rc = tpm_tis_read16(priv, TPM_DID_VID(0), &amp;vendor);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -457,12 +482,15 @@ static int probe_itpm(struct tpm_chip *chip)</div><div class='ctx'> 	tpm_tis_ready(chip);</div><div class='ctx'> 	release_locality(chip, priv-&gt;locality, 0);</div><div class='ctx'> </div><div class='add'>+	priv-&gt;flags |= TPM_TIS_ITPM_WORKAROUND;</div><div class='add'>+</div><div class='ctx'> 	rc = tpm_tis_send_data(chip, cmd_getticks, len);</div><div class='del'>-	if (rc == 0) {</div><div class='add'>+	if (rc == 0)</div><div class='ctx'> 		dev_info(&amp;chip-&gt;dev, "Detected an iTPM.\n");</div><div class='del'>-		rc = 1;</div><div class='del'>-	} else</div><div class='add'>+	else {</div><div class='add'>+		priv-&gt;flags &amp;= ~TPM_TIS_ITPM_WORKAROUND;</div><div class='ctx'> 		rc = -EFAULT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	tpm_tis_ready(chip);</div><div class='hunk'>@@ -530,7 +558,8 @@ static int tpm_tis_gen_interrupt(struct tpm_chip *chip)</div><div class='ctx'> 	if (chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2)</div><div class='ctx'> 		return tpm2_get_tpm_pt(chip, 0x100, &amp;cap2, desc);</div><div class='ctx'> 	else</div><div class='del'>-		return tpm_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &amp;cap, desc);</div><div class='add'>+		return tpm_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &amp;cap, desc,</div><div class='add'>+				  0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Register the IRQ and issue a command that will cause an interrupt. If an</div><div class='hunk'>@@ -718,15 +747,10 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,</div><div class='ctx'> 		 (chip-&gt;flags &amp; TPM_CHIP_FLAG_TPM2) ? "2.0" : "1.2",</div><div class='ctx'> 		 vendor &gt;&gt; 16, rid);</div><div class='ctx'> </div><div class='del'>-	if (!(priv-&gt;flags &amp; TPM_TIS_ITPM_POSSIBLE)) {</div><div class='del'>-		probe = probe_itpm(chip);</div><div class='del'>-		if (probe &lt; 0) {</div><div class='del'>-			rc = -ENODEV;</div><div class='del'>-			goto out_err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!!probe)</div><div class='del'>-			priv-&gt;flags |= TPM_TIS_ITPM_POSSIBLE;</div><div class='add'>+	probe = probe_itpm(chip);</div><div class='add'>+	if (probe &lt; 0) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Figure out the capabilities */</div><div class='hunk'>@@ -755,20 +779,20 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,</div><div class='ctx'> 	if (intfcaps &amp; TPM_INTF_DATA_AVAIL_INT)</div><div class='ctx'> 		dev_dbg(dev, "\tData Avail Int Support\n");</div><div class='ctx'> </div><div class='del'>-	/* Very early on issue a command to the TPM in polling mode to make</div><div class='del'>-	 * sure it works. May as well use that command to set the proper</div><div class='del'>-	 *  timeouts for the driver.</div><div class='del'>-	 */</div><div class='del'>-	if (tpm_get_timeouts(chip)) {</div><div class='del'>-		dev_err(dev, "Could not get TPM timeouts and durations\n");</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* INTERRUPT Setup */</div><div class='ctx'> 	init_waitqueue_head(&amp;priv-&gt;read_queue);</div><div class='ctx'> 	init_waitqueue_head(&amp;priv-&gt;int_queue);</div><div class='ctx'> 	if (irq != -1) {</div><div class='add'>+		/* Before doing irq testing issue a command to the TPM in polling mode</div><div class='add'>+		 * to make sure it works. May as well use that command to set the</div><div class='add'>+		 * proper timeouts for the driver.</div><div class='add'>+		 */</div><div class='add'>+		if (tpm_get_timeouts(chip)) {</div><div class='add'>+			dev_err(dev, "Could not get TPM timeouts and durations\n");</div><div class='add'>+			rc = -ENODEV;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (irq) {</div><div class='ctx'> 			tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,</div><div class='ctx'> 						 irq);</div><div class='head'>diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h<br/>index 9191aabbf9c2..e2212f021a02 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_tis_core.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_tis_core.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_tis_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_tis_core.h</a></div><div class='hunk'>@@ -80,7 +80,7 @@ enum tis_defaults {</div><div class='ctx'> #define	TPM_RID(l)			(0x0F04 | ((l) &lt;&lt; 12))</div><div class='ctx'> </div><div class='ctx'> enum tpm_tis_flags {</div><div class='del'>-	TPM_TIS_ITPM_POSSIBLE		= BIT(0),</div><div class='add'>+	TPM_TIS_ITPM_WORKAROUND		= BIT(0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tpm_tis_data {</div><div class='head'>diff --git a/drivers/char/tpm/tpm_tis_spi.c b/drivers/char/tpm/tpm_tis_spi.c<br/>index dbaad9c681e3..5292e5768a7e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_tis_spi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_tis_spi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_tis_spi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_tis_spi.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='head'>diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c<br/>index 9a940332c157..751059d2140a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/tpm_vtpm_proxy.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/tpm_vtpm_proxy.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/tpm_vtpm_proxy.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/tpm_vtpm_proxy.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2015, 2016 IBM Corporation</div><div class='add'>+ * Copyright (C) 2016 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Stefan Berger &lt;stefanb@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -41,6 +42,7 @@ struct proxy_dev {</div><div class='ctx'> 	long state;                  /* internal state */</div><div class='ctx'> #define STATE_OPENED_FLAG        BIT(0)</div><div class='ctx'> #define STATE_WAIT_RESPONSE_FLAG BIT(1)  /* waiting for emulator response */</div><div class='add'>+#define STATE_REGISTERED_FLAG	 BIT(2)</div><div class='ctx'> </div><div class='ctx'> 	size_t req_len;              /* length of queued TPM request */</div><div class='ctx'> 	size_t resp_len;             /* length of queued TPM response */</div><div class='hunk'>@@ -63,7 +65,12 @@ static void vtpm_proxy_delete_device(struct proxy_dev *proxy_dev);</div><div class='ctx'> /**</div><div class='ctx'>  * vtpm_proxy_fops_read - Read TPM commands on 'server side'</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='add'>+ * @filp: file pointer</div><div class='add'>+ * @buf: read buffer</div><div class='add'>+ * @count: number of bytes to read</div><div class='add'>+ * @off: offset</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='ctx'>  *	Number of bytes read or negative error code</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t vtpm_proxy_fops_read(struct file *filp, char __user *buf,</div><div class='hunk'>@@ -113,7 +120,12 @@ static ssize_t vtpm_proxy_fops_read(struct file *filp, char __user *buf,</div><div class='ctx'> /**</div><div class='ctx'>  * vtpm_proxy_fops_write - Write TPM responses on 'server side'</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='add'>+ * @filp: file pointer</div><div class='add'>+ * @buf: write buffer</div><div class='add'>+ * @count: number of bytes to write</div><div class='add'>+ * @off: offset</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='ctx'>  *	Number of bytes read or negative error value</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t vtpm_proxy_fops_write(struct file *filp, const char __user *buf,</div><div class='hunk'>@@ -153,10 +165,12 @@ static ssize_t vtpm_proxy_fops_write(struct file *filp, const char __user *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * vtpm_proxy_fops_poll: Poll status on 'server side'</div><div class='add'>+ * vtpm_proxy_fops_poll - Poll status on 'server side'</div><div class='add'>+ *</div><div class='add'>+ * @filp: file pointer</div><div class='add'>+ * @wait: poll table</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *      Poll flags</div><div class='add'>+ * Return: Poll flags</div><div class='ctx'>  */</div><div class='ctx'> static unsigned int vtpm_proxy_fops_poll(struct file *filp, poll_table *wait)</div><div class='ctx'> {</div><div class='hunk'>@@ -183,6 +197,8 @@ static unsigned int vtpm_proxy_fops_poll(struct file *filp, poll_table *wait)</div><div class='ctx'> /*</div><div class='ctx'>  * vtpm_proxy_fops_open - Open vTPM device on 'server side'</div><div class='ctx'>  *</div><div class='add'>+ * @filp: file pointer</div><div class='add'>+ *</div><div class='ctx'>  * Called when setting up the anonymous file descriptor</div><div class='ctx'>  */</div><div class='ctx'> static void vtpm_proxy_fops_open(struct file *filp)</div><div class='hunk'>@@ -194,8 +210,9 @@ static void vtpm_proxy_fops_open(struct file *filp)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * vtpm_proxy_fops_undo_open - counter-part to vtpm_fops_open</div><div class='add'>+ *       Call to undo vtpm_proxy_fops_open</div><div class='ctx'>  *</div><div class='del'>- * Call to undo vtpm_proxy_fops_open</div><div class='add'>+ *@proxy_dev: tpm proxy device</div><div class='ctx'>  */</div><div class='ctx'> static void vtpm_proxy_fops_undo_open(struct proxy_dev *proxy_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -210,9 +227,11 @@ static void vtpm_proxy_fops_undo_open(struct proxy_dev *proxy_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * vtpm_proxy_fops_release: Close 'server side'</div><div class='add'>+ * vtpm_proxy_fops_release - Close 'server side'</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='add'>+ * @inode: inode</div><div class='add'>+ * @filp: file pointer</div><div class='add'>+ * Return:</div><div class='ctx'>  *      Always returns 0.</div><div class='ctx'>  */</div><div class='ctx'> static int vtpm_proxy_fops_release(struct inode *inode, struct file *filp)</div><div class='hunk'>@@ -243,7 +262,10 @@ static const struct file_operations vtpm_proxy_fops = {</div><div class='ctx'> /*</div><div class='ctx'>  * Called when core TPM driver reads TPM responses from 'server side'</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='add'>+ * @chip: tpm chip to use</div><div class='add'>+ * @buf: receive buffer</div><div class='add'>+ * @count: bytes to read</div><div class='add'>+ * Return:</div><div class='ctx'>  *      Number of TPM response bytes read, negative error value otherwise</div><div class='ctx'>  */</div><div class='ctx'> static int vtpm_proxy_tpm_op_recv(struct tpm_chip *chip, u8 *buf, size_t count)</div><div class='hunk'>@@ -280,7 +302,11 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * Called when core TPM driver forwards TPM requests to 'server side'.</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='add'>+ * @chip: tpm chip to use</div><div class='add'>+ * @buf: send buffer</div><div class='add'>+ * @count: bytes to send</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='ctx'>  *      0 in case of success, negative error value otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static int vtpm_proxy_tpm_op_send(struct tpm_chip *chip, u8 *buf, size_t count)</div><div class='hunk'>@@ -369,12 +395,9 @@ static void vtpm_proxy_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	rc = tpm_chip_register(proxy_dev-&gt;chip);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	vtpm_proxy_fops_undo_open(proxy_dev);</div><div class='add'>+		vtpm_proxy_fops_undo_open(proxy_dev);</div><div class='add'>+	else</div><div class='add'>+		proxy_dev-&gt;state |= STATE_REGISTERED_FLAG;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -443,7 +466,7 @@ static inline void vtpm_proxy_delete_proxy_dev(struct proxy_dev *proxy_dev)</div><div class='ctx'> /*</div><div class='ctx'>  * Create a /dev/tpm%d and 'server side' file descriptor pair</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='add'>+ * Return:</div><div class='ctx'>  *      Returns file pointer on success, an error value otherwise</div><div class='ctx'>  */</div><div class='ctx'> static struct file *vtpm_proxy_create_device(</div><div class='hunk'>@@ -515,7 +538,8 @@ static void vtpm_proxy_delete_device(struct proxy_dev *proxy_dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	vtpm_proxy_fops_undo_open(proxy_dev);</div><div class='ctx'> </div><div class='del'>-	tpm_chip_unregister(proxy_dev-&gt;chip);</div><div class='add'>+	if (proxy_dev-&gt;state &amp; STATE_REGISTERED_FLAG)</div><div class='add'>+		tpm_chip_unregister(proxy_dev-&gt;chip);</div><div class='ctx'> </div><div class='ctx'> 	vtpm_proxy_delete_proxy_dev(proxy_dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -524,41 +548,62 @@ static void vtpm_proxy_delete_device(struct proxy_dev *proxy_dev)</div><div class='ctx'>  * Code related to the control device /dev/vtpmx</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * vtpmx_fops_ioctl: ioctl on /dev/vtpmx</div><div class='add'>+/**</div><div class='add'>+ * vtpmx_ioc_new_dev - handler for the %VTPM_PROXY_IOC_NEW_DEV ioctl</div><div class='add'>+ * @file:	/dev/vtpmx</div><div class='add'>+ * @ioctl:	the ioctl number</div><div class='add'>+ * @arg:	pointer to the struct vtpmx_proxy_new_dev</div><div class='ctx'>  *</div><div class='del'>- * Return value:</div><div class='del'>- *      Returns 0 on success, a negative error code otherwise.</div><div class='add'>+ * Creates an anonymous file that is used by the process acting as a TPM to</div><div class='add'>+ * communicate with the client processes. The function will also add a new TPM</div><div class='add'>+ * device through which data is proxied to this TPM acting process. The caller</div><div class='add'>+ * will be provided with a file descriptor to communicate with the clients and</div><div class='add'>+ * major and minor numbers for the TPM device.</div><div class='ctx'>  */</div><div class='del'>-static long vtpmx_fops_ioctl(struct file *f, unsigned int ioctl,</div><div class='del'>-				   unsigned long arg)</div><div class='add'>+static long vtpmx_ioc_new_dev(struct file *file, unsigned int ioctl,</div><div class='add'>+			      unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	struct vtpm_proxy_new_dev __user *vtpm_new_dev_p;</div><div class='ctx'> 	struct vtpm_proxy_new_dev vtpm_new_dev;</div><div class='del'>-	struct file *file;</div><div class='add'>+	struct file *vtpm_file;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='ctx'> </div><div class='add'>+	vtpm_new_dev_p = argp;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;vtpm_new_dev, vtpm_new_dev_p,</div><div class='add'>+			   sizeof(vtpm_new_dev)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	vtpm_file = vtpm_proxy_create_device(&amp;vtpm_new_dev);</div><div class='add'>+	if (IS_ERR(vtpm_file))</div><div class='add'>+		return PTR_ERR(vtpm_file);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(vtpm_new_dev_p, &amp;vtpm_new_dev,</div><div class='add'>+			 sizeof(vtpm_new_dev))) {</div><div class='add'>+		put_unused_fd(vtpm_new_dev.fd);</div><div class='add'>+		fput(vtpm_file);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fd_install(vtpm_new_dev.fd, vtpm_file);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * vtpmx_fops_ioctl: ioctl on /dev/vtpmx</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *      Returns 0 on success, a negative error code otherwise.</div><div class='add'>+ */</div><div class='add'>+static long vtpmx_fops_ioctl(struct file *f, unsigned int ioctl,</div><div class='add'>+			     unsigned long arg)</div><div class='add'>+{</div><div class='ctx'> 	switch (ioctl) {</div><div class='ctx'> 	case VTPM_PROXY_IOC_NEW_DEV:</div><div class='del'>-		if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-			return -EPERM;</div><div class='del'>-		vtpm_new_dev_p = argp;</div><div class='del'>-		if (copy_from_user(&amp;vtpm_new_dev, vtpm_new_dev_p,</div><div class='del'>-				   sizeof(vtpm_new_dev)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		file = vtpm_proxy_create_device(&amp;vtpm_new_dev);</div><div class='del'>-		if (IS_ERR(file))</div><div class='del'>-			return PTR_ERR(file);</div><div class='del'>-		if (copy_to_user(vtpm_new_dev_p, &amp;vtpm_new_dev,</div><div class='del'>-				 sizeof(vtpm_new_dev))) {</div><div class='del'>-			put_unused_fd(vtpm_new_dev.fd);</div><div class='del'>-			fput(file);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fd_install(vtpm_new_dev.fd, file);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='add'>+		return vtpmx_ioc_new_dev(f, ioctl, arg);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c<br/>index 62028f483bba..656e8af95d52 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/tpm/xen-tpmfront.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/tpm/xen-tpmfront.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/tpm/xen-tpmfront.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/tpm/xen-tpmfront.c</a></div><div class='hunk'>@@ -289,7 +289,6 @@ static int tpmfront_probe(struct xenbus_device *dev,</div><div class='ctx'> 		const struct xenbus_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm_private *priv;</div><div class='del'>-	struct tpm_chip *chip;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='ctx'> 	priv = kzalloc(sizeof(*priv), GFP_KERNEL);</div><div class='hunk'>@@ -306,8 +305,6 @@ static int tpmfront_probe(struct xenbus_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	rv = setup_ring(dev, priv);</div><div class='ctx'> 	if (rv) {</div><div class='del'>-		chip = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='del'>-		tpm_chip_unregister(chip);</div><div class='ctx'> 		ring_free(priv);</div><div class='ctx'> 		return rv;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -337,18 +334,14 @@ static int tpmfront_resume(struct xenbus_device *dev)</div><div class='ctx'> static void backend_changed(struct xenbus_device *dev,</div><div class='ctx'> 		enum xenbus_state backend_state)</div><div class='ctx'> {</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='ctx'> 	switch (backend_state) {</div><div class='ctx'> 	case XenbusStateInitialised:</div><div class='ctx'> 	case XenbusStateConnected:</div><div class='ctx'> 		if (dev-&gt;state == XenbusStateConnected)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (xenbus_scanf(XBT_NIL, dev-&gt;otherend,</div><div class='del'>-				"feature-protocol-v2", "%d", &amp;val) &lt; 0)</div><div class='del'>-			val = 0;</div><div class='del'>-		if (!val) {</div><div class='add'>+		if (!xenbus_read_unsigned(dev-&gt;otherend, "feature-protocol-v2",</div><div class='add'>+					  0)) {</div><div class='ctx'> 			xenbus_dev_fatal(dev, -EINVAL,</div><div class='ctx'> 					"vTPM protocol 2 required");</div><div class='ctx'> 			return;</div><div class='head'>diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c<br/>index 5649234b7316..e9b7e0b3cabe 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/virtio_console.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/virtio_console.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/virtio_console.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/virtio_console.c</a></div><div class='hunk'>@@ -152,8 +152,8 @@ struct ports_device {</div><div class='ctx'> 	spinlock_t c_ivq_lock;</div><div class='ctx'> 	spinlock_t c_ovq_lock;</div><div class='ctx'> </div><div class='del'>-	/* The current config space is stored here */</div><div class='del'>-	struct virtio_console_config config;</div><div class='add'>+	/* max. number of ports this device can hold */</div><div class='add'>+	u32 max_nr_ports;</div><div class='ctx'> </div><div class='ctx'> 	/* The virtio device we're associated with */</div><div class='ctx'> 	struct virtio_device *vdev;</div><div class='hunk'>@@ -1136,6 +1136,8 @@ static int put_chars(u32 vtermno, const char *buf, int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct port *port;</div><div class='ctx'> 	struct scatterlist sg[1];</div><div class='add'>+	void *data;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(early_put_chars))</div><div class='ctx'> 		return early_put_chars(vtermno, buf, count);</div><div class='hunk'>@@ -1144,8 +1146,14 @@ static int put_chars(u32 vtermno, const char *buf, int count)</div><div class='ctx'> 	if (!port)</div><div class='ctx'> 		return -EPIPE;</div><div class='ctx'> </div><div class='del'>-	sg_init_one(sg, buf, count);</div><div class='del'>-	return __send_to_port(port, sg, 1, count, (void *)buf, false);</div><div class='add'>+	data = kmemdup(buf, count, GFP_ATOMIC);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sg_init_one(sg, data, count);</div><div class='add'>+	ret = __send_to_port(port, sg, 1, count, data, false);</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1649,11 +1657,11 @@ static void handle_control_message(struct virtio_device *vdev,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (virtio32_to_cpu(vdev, cpkt-&gt;id) &gt;=</div><div class='del'>-		    portdev-&gt;config.max_nr_ports) {</div><div class='add'>+		    portdev-&gt;max_nr_ports) {</div><div class='ctx'> 			dev_warn(&amp;portdev-&gt;vdev-&gt;dev,</div><div class='ctx'> 				"Request for adding port with "</div><div class='ctx'> 				"out-of-bound id %u, max. supported id: %u\n",</div><div class='del'>-				cpkt-&gt;id, portdev-&gt;config.max_nr_ports - 1);</div><div class='add'>+				cpkt-&gt;id, portdev-&gt;max_nr_ports - 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		add_port(portdev, virtio32_to_cpu(vdev, cpkt-&gt;id));</div><div class='hunk'>@@ -1862,7 +1870,7 @@ static void config_work_handler(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct ports_device *portdev;</div><div class='ctx'> </div><div class='del'>-	portdev = container_of(work, struct ports_device, control_work);</div><div class='add'>+	portdev = container_of(work, struct ports_device, config_work);</div><div class='ctx'> 	if (!use_multiport(portdev)) {</div><div class='ctx'> 		struct virtio_device *vdev;</div><div class='ctx'> 		struct port *port;</div><div class='hunk'>@@ -1894,7 +1902,7 @@ static int init_vqs(struct ports_device *portdev)</div><div class='ctx'> 	u32 i, j, nr_ports, nr_queues;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	nr_ports = portdev-&gt;config.max_nr_ports;</div><div class='add'>+	nr_ports = portdev-&gt;max_nr_ports;</div><div class='ctx'> 	nr_queues = use_multiport(portdev) ? (nr_ports + 1) * 2 : 2;</div><div class='ctx'> </div><div class='ctx'> 	vqs = kmalloc(nr_queues * sizeof(struct virtqueue *), GFP_KERNEL);</div><div class='hunk'>@@ -1939,7 +1947,7 @@ static int init_vqs(struct ports_device *portdev)</div><div class='ctx'> 	/* Find the queues. */</div><div class='ctx'> 	err = portdev-&gt;vdev-&gt;config-&gt;find_vqs(portdev-&gt;vdev, nr_queues, vqs,</div><div class='ctx'> 					      io_callbacks,</div><div class='del'>-					      (const char **)io_names);</div><div class='add'>+					      (const char **)io_names, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='hunk'>@@ -2047,13 +2055,13 @@ static int virtcons_probe(struct virtio_device *vdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	multiport = false;</div><div class='del'>-	portdev-&gt;config.max_nr_ports = 1;</div><div class='add'>+	portdev-&gt;max_nr_ports = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't test MULTIPORT at all if we're rproc: not a valid feature! */</div><div class='ctx'> 	if (!is_rproc_serial(vdev) &amp;&amp;</div><div class='ctx'> 	    virtio_cread_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT,</div><div class='ctx'> 				 struct virtio_console_config, max_nr_ports,</div><div class='del'>-				 &amp;portdev-&gt;config.max_nr_ports) == 0) {</div><div class='add'>+				 &amp;portdev-&gt;max_nr_ports) == 0) {</div><div class='ctx'> 		multiport = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/xilinx_hwicap/buffer_icap.c b/drivers/char/xilinx_hwicap/buffer_icap.c<br/>index 53c3882e4981..35981cae1afa 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/xilinx_hwicap/buffer_icap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/xilinx_hwicap/buffer_icap.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/xilinx_hwicap/buffer_icap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/xilinx_hwicap/buffer_icap.c</a></div><div class='hunk'>@@ -269,7 +269,6 @@ int buffer_icap_set_configuration(struct hwicap_drvdata *drvdata, u32 *data,</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> 	s32 buffer_count = 0;</div><div class='del'>-	s32 num_writes = 0;</div><div class='ctx'> 	bool dirty = false;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	void __iomem *base_address = drvdata-&gt;base_address;</div><div class='hunk'>@@ -298,7 +297,6 @@ int buffer_icap_set_configuration(struct hwicap_drvdata *drvdata, u32 *data,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		buffer_count = 0;</div><div class='del'>-		num_writes++;</div><div class='ctx'> 		dirty = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -328,7 +326,6 @@ int buffer_icap_get_configuration(struct hwicap_drvdata *drvdata, u32 *data,</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> 	s32 buffer_count = 0;</div><div class='del'>-	s32 read_count = 0;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	void __iomem *base_address = drvdata-&gt;base_address;</div><div class='ctx'> </div><div class='hunk'>@@ -353,7 +350,6 @@ int buffer_icap_get_configuration(struct hwicap_drvdata *drvdata, u32 *data,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			buffer_count = 0;</div><div class='del'>-			read_count++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Copy data from bram */</div><div class='head'>diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c<br/>index c07dfe5c4da3..3e6b23c3453c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/char/xilinx_hwicap/xilinx_hwicap.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/char/xilinx_hwicap/xilinx_hwicap.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/char/xilinx_hwicap/xilinx_hwicap.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/char/xilinx_hwicap/xilinx_hwicap.c</a></div><div class='hunk'>@@ -88,7 +88,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OF</div><div class='ctx'> /* For open firmware. */</div><div class='head'>diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig<br/>index 6a8ac04bedeb..9356ab4b7d76 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/Kconfig</a></div><div class='hunk'>@@ -33,7 +33,7 @@ source "drivers/clk/versatile/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config COMMON_CLK_MAX77686</div><div class='ctx'> 	tristate "Clock driver for Maxim 77620/77686/77802 MFD"</div><div class='del'>-	depends on MFD_MAX77686 || MFD_MAX77620</div><div class='add'>+	depends on MFD_MAX77686 || MFD_MAX77620 || COMPILE_TEST</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver supports Maxim 77620/77686/77802 crystal oscillator</div><div class='ctx'> 	  clock.</div><div class='hunk'>@@ -95,16 +95,17 @@ config COMMON_CLK_CDCE706</div><div class='ctx'> 	  This driver supports TI CDCE706 programmable 3-PLL clock synthesizer.</div><div class='ctx'> </div><div class='ctx'> config COMMON_CLK_CDCE925</div><div class='del'>-	tristate "Clock driver for TI CDCE925 devices"</div><div class='add'>+	tristate "Clock driver for TI CDCE913/925/937/949 devices"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	depends on OF</div><div class='ctx'> 	select REGMAP_I2C</div><div class='ctx'> 	help</div><div class='ctx'> 	---help---</div><div class='del'>-	  This driver supports the TI CDCE925 programmable clock synthesizer.</div><div class='del'>-	  The chip contains two PLLs with spread-spectrum clocking support and</div><div class='del'>-	  five output dividers. The driver only supports the following setup,</div><div class='del'>-	  and uses a fixed setting for the output muxes.</div><div class='add'>+	  This driver supports the TI CDCE913/925/937/949 programmable clock</div><div class='add'>+	  synthesizer. Each chip has different number of PLLs and outputs.</div><div class='add'>+	  For example, the CDCE925 contains two PLLs with spread-spectrum</div><div class='add'>+	  clocking support and five output dividers. The driver only supports</div><div class='add'>+	  the following setup, and uses a fixed setting for the output muxes.</div><div class='ctx'> 	  Y1 is derived from the input clock</div><div class='ctx'> 	  Y2 and Y3 derive from PLL1</div><div class='ctx'> 	  Y4 and Y5 derive from PLL2</div><div class='hunk'>@@ -119,7 +120,7 @@ config COMMON_CLK_CS2000_CP</div><div class='ctx'> </div><div class='ctx'> config COMMON_CLK_S2MPS11</div><div class='ctx'> 	tristate "Clock driver for S2MPS1X/S5M8767 MFD"</div><div class='del'>-	depends on MFD_SEC_CORE</div><div class='add'>+	depends on MFD_SEC_CORE || COMPILE_TEST</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator</div><div class='ctx'> 	  clock. These multi-function devices have two (S2MPS14) or three</div><div class='hunk'>@@ -198,6 +199,16 @@ config COMMON_CLK_OXNAS</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Support for the OXNAS SoC Family clocks.</div><div class='ctx'> </div><div class='add'>+config COMMON_CLK_VC5</div><div class='add'>+	tristate "Clock driver for IDT VersaClock5 devices"</div><div class='add'>+	depends on I2C</div><div class='add'>+	depends on OF</div><div class='add'>+	select REGMAP_I2C</div><div class='add'>+	help</div><div class='add'>+	---help---</div><div class='add'>+	  This driver supports the IDT VersaClock5 programmable clock</div><div class='add'>+	  generator.</div><div class='add'>+</div><div class='ctx'> source "drivers/clk/bcm/Kconfig"</div><div class='ctx'> source "drivers/clk/hisilicon/Kconfig"</div><div class='ctx'> source "drivers/clk/mediatek/Kconfig"</div><div class='head'>diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile<br/>index 925081ec14c0..92c12b86c2e8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/Makefile</a></div><div class='hunk'>@@ -46,6 +46,7 @@ obj-$(CONFIG_ARCH_TANGO)		+= clk-tango4.o</div><div class='ctx'> obj-$(CONFIG_CLK_TWL6040)		+= clk-twl6040.o</div><div class='ctx'> obj-$(CONFIG_ARCH_U300)			+= clk-u300.o</div><div class='ctx'> obj-$(CONFIG_ARCH_VT8500)		+= clk-vt8500.o</div><div class='add'>+obj-$(CONFIG_COMMON_CLK_VC5)		+= clk-versaclock5.o</div><div class='ctx'> obj-$(CONFIG_COMMON_CLK_WM831X)		+= clk-wm831x.o</div><div class='ctx'> obj-$(CONFIG_COMMON_CLK_XGENE)		+= clk-xgene.o</div><div class='ctx'> </div><div class='hunk'>@@ -87,6 +88,8 @@ obj-y					+= ti/</div><div class='ctx'> obj-$(CONFIG_CLK_UNIPHIER)		+= uniphier/</div><div class='ctx'> obj-$(CONFIG_ARCH_U8500)		+= ux500/</div><div class='ctx'> obj-$(CONFIG_COMMON_CLK_VERSATILE)	+= versatile/</div><div class='add'>+ifeq ($(CONFIG_COMMON_CLK), y)</div><div class='ctx'> obj-$(CONFIG_X86)			+= x86/</div><div class='add'>+endif</div><div class='ctx'> obj-$(CONFIG_ARCH_ZX)			+= zte/</div><div class='ctx'> obj-$(CONFIG_ARCH_ZYNQ)			+= zynq/</div><div class='head'>diff --git a/drivers/clk/axs10x/i2s_pll_clock.c b/drivers/clk/axs10x/i2s_pll_clock.c<br/>index 411310d29581..02d3bcd6216c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/axs10x/i2s_pll_clock.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/axs10x/i2s_pll_clock.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/axs10x/i2s_pll_clock.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/axs10x/i2s_pll_clock.c</a></div><div class='hunk'>@@ -182,6 +182,7 @@ static int i2s_pll_clk_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (IS_ERR(pll_clk-&gt;base))</div><div class='ctx'> 		return PTR_ERR(pll_clk-&gt;base);</div><div class='ctx'> </div><div class='add'>+	memset(&amp;init, 0, sizeof(init));</div><div class='ctx'> 	clk_name = node-&gt;name;</div><div class='ctx'> 	init.name = clk_name;</div><div class='ctx'> 	init.ops = &amp;i2s_pll_ops;</div><div class='head'>diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig<br/>index e3eed5a78404..b5ae5311b0a2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/bcm/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/bcm/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/bcm/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/bcm/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> config CLK_BCM_63XX</div><div class='ctx'> 	bool "Broadcom BCM63xx clock support"</div><div class='ctx'> 	depends on ARCH_BCM_63XX || COMPILE_TEST</div><div class='del'>-	depends on COMMON_CLK</div><div class='ctx'> 	select COMMON_CLK_IPROC</div><div class='ctx'> 	default ARCH_BCM_63XX</div><div class='ctx'> 	help</div><div class='hunk'>@@ -11,27 +10,22 @@ config CLK_BCM_63XX</div><div class='ctx'> config CLK_BCM_KONA</div><div class='ctx'> 	bool "Broadcom Kona CCU clock support"</div><div class='ctx'> 	depends on ARCH_BCM_MOBILE || COMPILE_TEST</div><div class='del'>-	depends on COMMON_CLK</div><div class='del'>-	default y</div><div class='add'>+	default ARCH_BCM_MOBILE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable common clock framework support for Broadcom SoCs</div><div class='ctx'> 	  using "Kona" style clock control units, including those</div><div class='ctx'> 	  in the BCM281xx and BCM21664 families.</div><div class='ctx'> </div><div class='ctx'> config COMMON_CLK_IPROC</div><div class='del'>-	bool "Broadcom iProc clock support"</div><div class='del'>-	depends on ARCH_BCM_IPROC || ARCH_BCM_63XX || COMPILE_TEST</div><div class='del'>-	depends on COMMON_CLK</div><div class='del'>-	default ARCH_BCM_IPROC</div><div class='add'>+	bool</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable common clock framework support for Broadcom SoCs</div><div class='ctx'> 	  based on the iProc architecture</div><div class='ctx'> </div><div class='del'>-if COMMON_CLK_IPROC</div><div class='del'>-</div><div class='ctx'> config CLK_BCM_CYGNUS</div><div class='ctx'> 	bool "Broadcom Cygnus clock support"</div><div class='ctx'> 	depends on ARCH_BCM_CYGNUS || COMPILE_TEST</div><div class='add'>+	select COMMON_CLK_IPROC</div><div class='ctx'> 	default ARCH_BCM_CYGNUS</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable common clock framework support for the Broadcom Cygnus SoC</div><div class='hunk'>@@ -39,6 +33,7 @@ config CLK_BCM_CYGNUS</div><div class='ctx'> config CLK_BCM_NSP</div><div class='ctx'> 	bool "Broadcom Northstar/Northstar Plus clock support"</div><div class='ctx'> 	depends on ARCH_BCM_5301X || ARCH_BCM_NSP || COMPILE_TEST</div><div class='add'>+	select COMMON_CLK_IPROC</div><div class='ctx'> 	default ARCH_BCM_5301X || ARCH_BCM_NSP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable common clock framework support for the Broadcom Northstar and</div><div class='hunk'>@@ -47,8 +42,7 @@ config CLK_BCM_NSP</div><div class='ctx'> config CLK_BCM_NS2</div><div class='ctx'> 	bool "Broadcom Northstar 2 clock support"</div><div class='ctx'> 	depends on ARCH_BCM_IPROC || COMPILE_TEST</div><div class='add'>+	select COMMON_CLK_IPROC</div><div class='ctx'> 	default ARCH_BCM_IPROC</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable common clock framework support for the Broadcom Northstar 2 SoC</div><div class='del'>-</div><div class='del'>-endif</div><div class='head'>diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c<br/>index 8c7763fd9efc..025853870619 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/bcm/clk-bcm2835.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/bcm/clk-bcm2835.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/bcm/clk-bcm2835.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/bcm/clk-bcm2835.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/clk/bcm2835.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='hunk'>@@ -98,7 +99,8 @@</div><div class='ctx'> #define CM_SMIDIV		0x0b4</div><div class='ctx'> /* no definition for 0x0b8  and 0x0bc */</div><div class='ctx'> #define CM_TCNTCTL		0x0c0</div><div class='del'>-#define CM_TCNTDIV		0x0c4</div><div class='add'>+# define CM_TCNT_SRC1_SHIFT		12</div><div class='add'>+#define CM_TCNTCNT		0x0c4</div><div class='ctx'> #define CM_TECCTL		0x0c8</div><div class='ctx'> #define CM_TECDIV		0x0cc</div><div class='ctx'> #define CM_TD0CTL		0x0d0</div><div class='hunk'>@@ -297,11 +299,32 @@</div><div class='ctx'> #define LOCK_TIMEOUT_NS		100000000</div><div class='ctx'> #define BCM2835_MAX_FB_RATE	1750000000u</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Names of clocks used within the driver that need to be replaced</div><div class='add'>+ * with an external parent's name.  This array is in the order that</div><div class='add'>+ * the clocks node in the DT references external clocks.</div><div class='add'>+ */</div><div class='add'>+static const char *const cprman_parent_names[] = {</div><div class='add'>+	"xosc",</div><div class='add'>+	"dsi0_byte",</div><div class='add'>+	"dsi0_ddr2",</div><div class='add'>+	"dsi0_ddr",</div><div class='add'>+	"dsi1_byte",</div><div class='add'>+	"dsi1_ddr2",</div><div class='add'>+	"dsi1_ddr",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct bcm2835_cprman {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	void __iomem *regs;</div><div class='ctx'> 	spinlock_t regs_lock; /* spinlock for all clocks */</div><div class='del'>-	const char *osc_name;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Real names of cprman clock parents looked up through</div><div class='add'>+	 * of_clk_get_parent_name(), which will be used in the</div><div class='add'>+	 * parent_names[] arrays for clock registration.</div><div class='add'>+	 */</div><div class='add'>+	const char *real_parent_names[ARRAY_SIZE(cprman_parent_names)];</div><div class='ctx'> </div><div class='ctx'> 	/* Must be last */</div><div class='ctx'> 	struct clk_hw_onecell_data onecell;</div><div class='hunk'>@@ -317,6 +340,61 @@ static inline u32 cprman_read(struct bcm2835_cprman *cprman, u32 reg)</div><div class='ctx'> 	return readl(cprman-&gt;regs + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Does a cycle of measuring a clock through the TCNT clock, which may</div><div class='add'>+ * source from many other clocks in the system.</div><div class='add'>+ */</div><div class='add'>+static unsigned long bcm2835_measure_tcnt_mux(struct bcm2835_cprman *cprman,</div><div class='add'>+					      u32 tcnt_mux)</div><div class='add'>+{</div><div class='add'>+	u32 osccount = 19200; /* 1ms */</div><div class='add'>+	u32 count;</div><div class='add'>+	ktime_t timeout;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;cprman-&gt;regs_lock);</div><div class='add'>+</div><div class='add'>+	cprman_write(cprman, CM_TCNTCTL, CM_KILL);</div><div class='add'>+</div><div class='add'>+	cprman_write(cprman, CM_TCNTCTL,</div><div class='add'>+		     (tcnt_mux &amp; CM_SRC_MASK) |</div><div class='add'>+		     (tcnt_mux &gt;&gt; CM_SRC_BITS) &lt;&lt; CM_TCNT_SRC1_SHIFT);</div><div class='add'>+</div><div class='add'>+	cprman_write(cprman, CM_OSCCOUNT, osccount);</div><div class='add'>+</div><div class='add'>+	/* do a kind delay at the start */</div><div class='add'>+	mdelay(1);</div><div class='add'>+</div><div class='add'>+	/* Finish off whatever is left of OSCCOUNT */</div><div class='add'>+	timeout = ktime_add_ns(ktime_get(), LOCK_TIMEOUT_NS);</div><div class='add'>+	while (cprman_read(cprman, CM_OSCCOUNT)) {</div><div class='add'>+		if (ktime_after(ktime_get(), timeout)) {</div><div class='add'>+			dev_err(cprman-&gt;dev, "timeout waiting for OSCCOUNT\n");</div><div class='add'>+			count = 0;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for BUSY to clear. */</div><div class='add'>+	timeout = ktime_add_ns(ktime_get(), LOCK_TIMEOUT_NS);</div><div class='add'>+	while (cprman_read(cprman, CM_TCNTCTL) &amp; CM_BUSY) {</div><div class='add'>+		if (ktime_after(ktime_get(), timeout)) {</div><div class='add'>+			dev_err(cprman-&gt;dev, "timeout waiting for !BUSY\n");</div><div class='add'>+			count = 0;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = cprman_read(cprman, CM_TCNTCNT);</div><div class='add'>+</div><div class='add'>+	cprman_write(cprman, CM_TCNTCTL, 0);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;cprman-&gt;regs_lock);</div><div class='add'>+</div><div class='add'>+	return count * 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bcm2835_debugfs_regset(struct bcm2835_cprman *cprman, u32 base,</div><div class='ctx'> 				  struct debugfs_reg32 *regs, size_t nregs,</div><div class='ctx'> 				  struct dentry *dentry)</div><div class='hunk'>@@ -428,6 +506,7 @@ struct bcm2835_pll_divider_data {</div><div class='ctx'> 	u32 load_mask;</div><div class='ctx'> 	u32 hold_mask;</div><div class='ctx'> 	u32 fixed_divider;</div><div class='add'>+	u32 flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bcm2835_clock_data {</div><div class='hunk'>@@ -436,6 +515,9 @@ struct bcm2835_clock_data {</div><div class='ctx'> 	const char *const *parents;</div><div class='ctx'> 	int num_mux_parents;</div><div class='ctx'> </div><div class='add'>+	/* Bitmap encoding which parents accept rate change propagation. */</div><div class='add'>+	unsigned int set_rate_parent;</div><div class='add'>+</div><div class='ctx'> 	u32 ctl_reg;</div><div class='ctx'> 	u32 div_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -448,6 +530,8 @@ struct bcm2835_clock_data {</div><div class='ctx'> </div><div class='ctx'> 	bool is_vpu_clock;</div><div class='ctx'> 	bool is_mash_clock;</div><div class='add'>+</div><div class='add'>+	u32 tcnt_mux;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bcm2835_gate_data {</div><div class='hunk'>@@ -751,7 +835,9 @@ static void bcm2835_pll_divider_off(struct clk_hw *hw)</div><div class='ctx'> 	cprman_write(cprman, data-&gt;cm_reg,</div><div class='ctx'> 		     (cprman_read(cprman, data-&gt;cm_reg) &amp;</div><div class='ctx'> 		      ~data-&gt;load_mask) | data-&gt;hold_mask);</div><div class='del'>-	cprman_write(cprman, data-&gt;a2w_reg, A2W_PLL_CHANNEL_DISABLE);</div><div class='add'>+	cprman_write(cprman, data-&gt;a2w_reg,</div><div class='add'>+		     cprman_read(cprman, data-&gt;a2w_reg) |</div><div class='add'>+		     A2W_PLL_CHANNEL_DISABLE);</div><div class='ctx'> 	spin_unlock(&amp;cprman-&gt;regs_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -901,6 +987,9 @@ static long bcm2835_clock_rate_from_divisor(struct bcm2835_clock *clock,</div><div class='ctx'> 	const struct bcm2835_clock_data *data = clock-&gt;data;</div><div class='ctx'> 	u64 temp;</div><div class='ctx'> </div><div class='add'>+	if (data-&gt;int_bits == 0 &amp;&amp; data-&gt;frac_bits == 0)</div><div class='add'>+		return parent_rate;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The divisor is a 12.12 fixed point field, but only some of</div><div class='ctx'> 	 * the bits are populated in any given clock.</div><div class='hunk'>@@ -924,7 +1013,12 @@ static unsigned long bcm2835_clock_get_rate(struct clk_hw *hw,</div><div class='ctx'> 	struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);</div><div class='ctx'> 	struct bcm2835_cprman *cprman = clock-&gt;cprman;</div><div class='ctx'> 	const struct bcm2835_clock_data *data = clock-&gt;data;</div><div class='del'>-	u32 div = cprman_read(cprman, data-&gt;div_reg);</div><div class='add'>+	u32 div;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;int_bits == 0 &amp;&amp; data-&gt;frac_bits == 0)</div><div class='add'>+		return parent_rate;</div><div class='add'>+</div><div class='add'>+	div = cprman_read(cprman, data-&gt;div_reg);</div><div class='ctx'> </div><div class='ctx'> 	return bcm2835_clock_rate_from_divisor(clock, parent_rate, div);</div><div class='ctx'> }</div><div class='hunk'>@@ -973,6 +1067,17 @@ static int bcm2835_clock_on(struct clk_hw *hw)</div><div class='ctx'> 		     CM_GATE);</div><div class='ctx'> 	spin_unlock(&amp;cprman-&gt;regs_lock);</div><div class='ctx'> </div><div class='add'>+	/* Debug code to measure the clock once it's turned on to see</div><div class='add'>+	 * if it's ticking at the rate we expect.</div><div class='add'>+	 */</div><div class='add'>+	if (data-&gt;tcnt_mux &amp;&amp; false) {</div><div class='add'>+		dev_info(cprman-&gt;dev,</div><div class='add'>+			 "clk %s: rate %ld, measure %ld\n",</div><div class='add'>+			 data-&gt;name,</div><div class='add'>+			 clk_hw_get_rate(hw),</div><div class='add'>+			 bcm2835_measure_tcnt_mux(cprman, data-&gt;tcnt_mux));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1015,10 +1120,60 @@ bcm2835_clk_is_pllc(struct clk_hw *hw)</div><div class='ctx'> 	return strncmp(clk_hw_get_name(hw), "pllc", 4) == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long bcm2835_clock_choose_div_and_prate(struct clk_hw *hw,</div><div class='add'>+							int parent_idx,</div><div class='add'>+							unsigned long rate,</div><div class='add'>+							u32 *div,</div><div class='add'>+							unsigned long *prate)</div><div class='add'>+{</div><div class='add'>+	struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);</div><div class='add'>+	struct bcm2835_cprman *cprman = clock-&gt;cprman;</div><div class='add'>+	const struct bcm2835_clock_data *data = clock-&gt;data;</div><div class='add'>+	unsigned long best_rate = 0;</div><div class='add'>+	u32 curdiv, mindiv, maxdiv;</div><div class='add'>+	struct clk_hw *parent;</div><div class='add'>+</div><div class='add'>+	parent = clk_hw_get_parent_by_index(hw, parent_idx);</div><div class='add'>+</div><div class='add'>+	if (!(BIT(parent_idx) &amp; data-&gt;set_rate_parent)) {</div><div class='add'>+		*prate = clk_hw_get_rate(parent);</div><div class='add'>+		*div = bcm2835_clock_choose_div(hw, rate, *prate, true);</div><div class='add'>+</div><div class='add'>+		return bcm2835_clock_rate_from_divisor(clock, *prate,</div><div class='add'>+						       *div);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;frac_bits)</div><div class='add'>+		dev_warn(cprman-&gt;dev,</div><div class='add'>+			"frac bits are not used when propagating rate change");</div><div class='add'>+</div><div class='add'>+	/* clamp to min divider of 2 if we're dealing with a mash clock */</div><div class='add'>+	mindiv = data-&gt;is_mash_clock ? 2 : 1;</div><div class='add'>+	maxdiv = BIT(data-&gt;int_bits) - 1;</div><div class='add'>+</div><div class='add'>+	/* TODO: Be smart, and only test a subset of the available divisors. */</div><div class='add'>+	for (curdiv = mindiv; curdiv &lt;= maxdiv; curdiv++) {</div><div class='add'>+		unsigned long tmp_rate;</div><div class='add'>+</div><div class='add'>+		tmp_rate = clk_hw_round_rate(parent, rate * curdiv);</div><div class='add'>+		tmp_rate /= curdiv;</div><div class='add'>+		if (curdiv == mindiv ||</div><div class='add'>+		    (tmp_rate &gt; best_rate &amp;&amp; tmp_rate &lt;= rate))</div><div class='add'>+			best_rate = tmp_rate;</div><div class='add'>+</div><div class='add'>+		if (best_rate == rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*div = curdiv &lt;&lt; CM_DIV_FRAC_BITS;</div><div class='add'>+	*prate = curdiv * best_rate;</div><div class='add'>+</div><div class='add'>+	return best_rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bcm2835_clock_determine_rate(struct clk_hw *hw,</div><div class='ctx'> 					struct clk_rate_request *req)</div><div class='ctx'> {</div><div class='del'>-	struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);</div><div class='ctx'> 	struct clk_hw *parent, *best_parent = NULL;</div><div class='ctx'> 	bool current_parent_is_pllc;</div><div class='ctx'> 	unsigned long rate, best_rate = 0;</div><div class='hunk'>@@ -1046,9 +1201,8 @@ static int bcm2835_clock_determine_rate(struct clk_hw *hw,</div><div class='ctx'> 		if (bcm2835_clk_is_pllc(parent) &amp;&amp; !current_parent_is_pllc)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		prate = clk_hw_get_rate(parent);</div><div class='del'>-		div = bcm2835_clock_choose_div(hw, req-&gt;rate, prate, true);</div><div class='del'>-		rate = bcm2835_clock_rate_from_divisor(clock, prate, div);</div><div class='add'>+		rate = bcm2835_clock_choose_div_and_prate(hw, i, req-&gt;rate,</div><div class='add'>+							  &amp;div, &amp;prate);</div><div class='ctx'> 		if (rate &gt; best_rate &amp;&amp; rate &lt;= req-&gt;rate) {</div><div class='ctx'> 			best_parent = parent;</div><div class='ctx'> 			best_prate = prate;</div><div class='hunk'>@@ -1154,7 +1308,7 @@ static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,</div><div class='ctx'> 	memset(&amp;init, 0, sizeof(init));</div><div class='ctx'> </div><div class='ctx'> 	/* All of the PLLs derive from the external oscillator. */</div><div class='del'>-	init.parent_names = &amp;cprman-&gt;osc_name;</div><div class='add'>+	init.parent_names = &amp;cprman-&gt;real_parent_names[0];</div><div class='ctx'> 	init.num_parents = 1;</div><div class='ctx'> 	init.name = data-&gt;name;</div><div class='ctx'> 	init.ops = &amp;bcm2835_pll_clk_ops;</div><div class='hunk'>@@ -1198,7 +1352,7 @@ bcm2835_register_pll_divider(struct bcm2835_cprman *cprman,</div><div class='ctx'> 	init.num_parents = 1;</div><div class='ctx'> 	init.name = divider_name;</div><div class='ctx'> 	init.ops = &amp;bcm2835_pll_divider_clk_ops;</div><div class='del'>-	init.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED;</div><div class='add'>+	init.flags = data-&gt;flags | CLK_IGNORE_UNUSED;</div><div class='ctx'> </div><div class='ctx'> 	divider = devm_kzalloc(cprman-&gt;dev, sizeof(*divider), GFP_KERNEL);</div><div class='ctx'> 	if (!divider)</div><div class='hunk'>@@ -1240,18 +1394,22 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman,</div><div class='ctx'> 	struct bcm2835_clock *clock;</div><div class='ctx'> 	struct clk_init_data init;</div><div class='ctx'> 	const char *parents[1 &lt;&lt; CM_SRC_BITS];</div><div class='del'>-	size_t i;</div><div class='add'>+	size_t i, j;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Replace our "xosc" references with the oscillator's</div><div class='del'>-	 * actual name.</div><div class='add'>+	 * Replace our strings referencing parent clocks with the</div><div class='add'>+	 * actual clock-output-name of the parent.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; data-&gt;num_mux_parents; i++) {</div><div class='del'>-		if (strcmp(data-&gt;parents[i], "xosc") == 0)</div><div class='del'>-			parents[i] = cprman-&gt;osc_name;</div><div class='del'>-		else</div><div class='del'>-			parents[i] = data-&gt;parents[i];</div><div class='add'>+		parents[i] = data-&gt;parents[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(cprman_parent_names); j++) {</div><div class='add'>+			if (strcmp(parents[i], cprman_parent_names[j]) == 0) {</div><div class='add'>+				parents[i] = cprman-&gt;real_parent_names[j];</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;init, 0, sizeof(init));</div><div class='hunk'>@@ -1260,6 +1418,13 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman,</div><div class='ctx'> 	init.name = data-&gt;name;</div><div class='ctx'> 	init.flags = data-&gt;flags | CLK_IGNORE_UNUSED;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Pass the CLK_SET_RATE_PARENT flag if we are allowed to propagate</div><div class='add'>+	 * rate changes on at least of the parents.</div><div class='add'>+	 */</div><div class='add'>+	if (data-&gt;set_rate_parent)</div><div class='add'>+		init.flags |= CLK_SET_RATE_PARENT;</div><div class='add'>+</div><div class='ctx'> 	if (data-&gt;is_vpu_clock) {</div><div class='ctx'> 		init.ops = &amp;bcm2835_vpu_clock_clk_ops;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1371,6 +1536,47 @@ static const char *const bcm2835_clock_vpu_parents[] = {</div><div class='ctx'> 	__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * DSI parent clocks.  The DSI byte/DDR/DDR2 clocks come from the DSI</div><div class='add'>+ * analog PHY.  The _inv variants are generated internally to cprman,</div><div class='add'>+ * but we don't use them so they aren't hooked up.</div><div class='add'>+ */</div><div class='add'>+static const char *const bcm2835_clock_dsi0_parents[] = {</div><div class='add'>+	"gnd",</div><div class='add'>+	"xosc",</div><div class='add'>+	"testdebug0",</div><div class='add'>+	"testdebug1",</div><div class='add'>+	"dsi0_ddr",</div><div class='add'>+	"dsi0_ddr_inv",</div><div class='add'>+	"dsi0_ddr2",</div><div class='add'>+	"dsi0_ddr2_inv",</div><div class='add'>+	"dsi0_byte",</div><div class='add'>+	"dsi0_byte_inv",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const bcm2835_clock_dsi1_parents[] = {</div><div class='add'>+	"gnd",</div><div class='add'>+	"xosc",</div><div class='add'>+	"testdebug0",</div><div class='add'>+	"testdebug1",</div><div class='add'>+	"dsi1_ddr",</div><div class='add'>+	"dsi1_ddr_inv",</div><div class='add'>+	"dsi1_ddr2",</div><div class='add'>+	"dsi1_ddr2_inv",</div><div class='add'>+	"dsi1_byte",</div><div class='add'>+	"dsi1_byte_inv",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define REGISTER_DSI0_CLK(...)	REGISTER_CLK(				\</div><div class='add'>+	.num_mux_parents = ARRAY_SIZE(bcm2835_clock_dsi0_parents),	\</div><div class='add'>+	.parents = bcm2835_clock_dsi0_parents,				\</div><div class='add'>+	__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define REGISTER_DSI1_CLK(...)	REGISTER_CLK(				\</div><div class='add'>+	.num_mux_parents = ARRAY_SIZE(bcm2835_clock_dsi1_parents),	\</div><div class='add'>+	.parents = bcm2835_clock_dsi1_parents,				\</div><div class='add'>+	__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * the real definition of all the pll, pll_dividers and clocks</div><div class='ctx'>  * these make use of the above REGISTER_* macros</div><div class='ctx'>  */</div><div class='hunk'>@@ -1405,7 +1611,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLA_CORE,</div><div class='ctx'> 		.load_mask = CM_PLLA_LOADCORE,</div><div class='ctx'> 		.hold_mask = CM_PLLA_HOLDCORE,</div><div class='del'>-		.fixed_divider = 1),</div><div class='add'>+		.fixed_divider = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> 	[BCM2835_PLLA_PER]	= REGISTER_PLL_DIV(</div><div class='ctx'> 		.name = "plla_per",</div><div class='ctx'> 		.source_pll = "plla",</div><div class='hunk'>@@ -1413,7 +1620,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLA_PER,</div><div class='ctx'> 		.load_mask = CM_PLLA_LOADPER,</div><div class='ctx'> 		.hold_mask = CM_PLLA_HOLDPER,</div><div class='del'>-		.fixed_divider = 1),</div><div class='add'>+		.fixed_divider = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> 	[BCM2835_PLLA_DSI0]	= REGISTER_PLL_DIV(</div><div class='ctx'> 		.name = "plla_dsi0",</div><div class='ctx'> 		.source_pll = "plla",</div><div class='hunk'>@@ -1429,7 +1637,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLA_CCP2,</div><div class='ctx'> 		.load_mask = CM_PLLA_LOADCCP2,</div><div class='ctx'> 		.hold_mask = CM_PLLA_HOLDCCP2,</div><div class='del'>-		.fixed_divider = 1),</div><div class='add'>+		.fixed_divider = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> </div><div class='ctx'> 	/* PLLB is used for the ARM's clock. */</div><div class='ctx'> 	[BCM2835_PLLB]		= REGISTER_PLL(</div><div class='hunk'>@@ -1453,7 +1662,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLB_ARM,</div><div class='ctx'> 		.load_mask = CM_PLLB_LOADARM,</div><div class='ctx'> 		.hold_mask = CM_PLLB_HOLDARM,</div><div class='del'>-		.fixed_divider = 1),</div><div class='add'>+		.fixed_divider = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * PLLC is the core PLL, used to drive the core VPU clock.</div><div class='hunk'>@@ -1482,7 +1692,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLC_CORE0,</div><div class='ctx'> 		.load_mask = CM_PLLC_LOADCORE0,</div><div class='ctx'> 		.hold_mask = CM_PLLC_HOLDCORE0,</div><div class='del'>-		.fixed_divider = 1),</div><div class='add'>+		.fixed_divider = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> 	[BCM2835_PLLC_CORE1]	= REGISTER_PLL_DIV(</div><div class='ctx'> 		.name = "pllc_core1",</div><div class='ctx'> 		.source_pll = "pllc",</div><div class='hunk'>@@ -1490,7 +1701,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLC_CORE1,</div><div class='ctx'> 		.load_mask = CM_PLLC_LOADCORE1,</div><div class='ctx'> 		.hold_mask = CM_PLLC_HOLDCORE1,</div><div class='del'>-		.fixed_divider = 1),</div><div class='add'>+		.fixed_divider = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> 	[BCM2835_PLLC_CORE2]	= REGISTER_PLL_DIV(</div><div class='ctx'> 		.name = "pllc_core2",</div><div class='ctx'> 		.source_pll = "pllc",</div><div class='hunk'>@@ -1498,7 +1710,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLC_CORE2,</div><div class='ctx'> 		.load_mask = CM_PLLC_LOADCORE2,</div><div class='ctx'> 		.hold_mask = CM_PLLC_HOLDCORE2,</div><div class='del'>-		.fixed_divider = 1),</div><div class='add'>+		.fixed_divider = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> 	[BCM2835_PLLC_PER]	= REGISTER_PLL_DIV(</div><div class='ctx'> 		.name = "pllc_per",</div><div class='ctx'> 		.source_pll = "pllc",</div><div class='hunk'>@@ -1506,7 +1719,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLC_PER,</div><div class='ctx'> 		.load_mask = CM_PLLC_LOADPER,</div><div class='ctx'> 		.hold_mask = CM_PLLC_HOLDPER,</div><div class='del'>-		.fixed_divider = 1),</div><div class='add'>+		.fixed_divider = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * PLLD is the display PLL, used to drive DSI display panels.</div><div class='hunk'>@@ -1535,7 +1749,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLD_CORE,</div><div class='ctx'> 		.load_mask = CM_PLLD_LOADCORE,</div><div class='ctx'> 		.hold_mask = CM_PLLD_HOLDCORE,</div><div class='del'>-		.fixed_divider = 1),</div><div class='add'>+		.fixed_divider = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> 	[BCM2835_PLLD_PER]	= REGISTER_PLL_DIV(</div><div class='ctx'> 		.name = "plld_per",</div><div class='ctx'> 		.source_pll = "plld",</div><div class='hunk'>@@ -1543,7 +1758,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLD_PER,</div><div class='ctx'> 		.load_mask = CM_PLLD_LOADPER,</div><div class='ctx'> 		.hold_mask = CM_PLLD_HOLDPER,</div><div class='del'>-		.fixed_divider = 1),</div><div class='add'>+		.fixed_divider = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> 	[BCM2835_PLLD_DSI0]	= REGISTER_PLL_DIV(</div><div class='ctx'> 		.name = "plld_dsi0",</div><div class='ctx'> 		.source_pll = "plld",</div><div class='hunk'>@@ -1588,7 +1804,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLH_RCAL,</div><div class='ctx'> 		.load_mask = CM_PLLH_LOADRCAL,</div><div class='ctx'> 		.hold_mask = 0,</div><div class='del'>-		.fixed_divider = 10),</div><div class='add'>+		.fixed_divider = 10,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> 	[BCM2835_PLLH_AUX]	= REGISTER_PLL_DIV(</div><div class='ctx'> 		.name = "pllh_aux",</div><div class='ctx'> 		.source_pll = "pllh",</div><div class='hunk'>@@ -1596,7 +1813,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLH_AUX,</div><div class='ctx'> 		.load_mask = CM_PLLH_LOADAUX,</div><div class='ctx'> 		.hold_mask = 0,</div><div class='del'>-		.fixed_divider = 10),</div><div class='add'>+		.fixed_divider = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> 	[BCM2835_PLLH_PIX]	= REGISTER_PLL_DIV(</div><div class='ctx'> 		.name = "pllh_pix",</div><div class='ctx'> 		.source_pll = "pllh",</div><div class='hunk'>@@ -1604,7 +1822,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.a2w_reg = A2W_PLLH_PIX,</div><div class='ctx'> 		.load_mask = CM_PLLH_LOADPIX,</div><div class='ctx'> 		.hold_mask = 0,</div><div class='del'>-		.fixed_divider = 10),</div><div class='add'>+		.fixed_divider = 10,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT),</div><div class='ctx'> </div><div class='ctx'> 	/* the clocks */</div><div class='ctx'> </div><div class='hunk'>@@ -1616,7 +1835,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.ctl_reg = CM_OTPCTL,</div><div class='ctx'> 		.div_reg = CM_OTPDIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 0),</div><div class='add'>+		.frac_bits = 0,</div><div class='add'>+		.tcnt_mux = 6),</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Used for a 1Mhz clock for the system clocksource, and also used</div><div class='ctx'> 	 * bythe watchdog timer and the camera pulse generator.</div><div class='hunk'>@@ -1650,13 +1870,15 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.ctl_reg = CM_H264CTL,</div><div class='ctx'> 		.div_reg = CM_H264DIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 8),</div><div class='add'>+		.frac_bits = 8,</div><div class='add'>+		.tcnt_mux = 1),</div><div class='ctx'> 	[BCM2835_CLOCK_ISP]	= REGISTER_VPU_CLK(</div><div class='ctx'> 		.name = "isp",</div><div class='ctx'> 		.ctl_reg = CM_ISPCTL,</div><div class='ctx'> 		.div_reg = CM_ISPDIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 8),</div><div class='add'>+		.frac_bits = 8,</div><div class='add'>+		.tcnt_mux = 2),</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Secondary SDRAM clock.  Used for low-voltage modes when the PLL</div><div class='hunk'>@@ -1667,13 +1889,15 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.ctl_reg = CM_SDCCTL,</div><div class='ctx'> 		.div_reg = CM_SDCDIV,</div><div class='ctx'> 		.int_bits = 6,</div><div class='del'>-		.frac_bits = 0),</div><div class='add'>+		.frac_bits = 0,</div><div class='add'>+		.tcnt_mux = 3),</div><div class='ctx'> 	[BCM2835_CLOCK_V3D]	= REGISTER_VPU_CLK(</div><div class='ctx'> 		.name = "v3d",</div><div class='ctx'> 		.ctl_reg = CM_V3DCTL,</div><div class='ctx'> 		.div_reg = CM_V3DDIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 8),</div><div class='add'>+		.frac_bits = 8,</div><div class='add'>+		.tcnt_mux = 4),</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * VPU clock.  This doesn't have an enable bit, since it drives</div><div class='ctx'> 	 * the bus for everything else, and is special so it doesn't need</div><div class='hunk'>@@ -1687,7 +1911,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.int_bits = 12,</div><div class='ctx'> 		.frac_bits = 8,</div><div class='ctx'> 		.flags = CLK_IS_CRITICAL,</div><div class='del'>-		.is_vpu_clock = true),</div><div class='add'>+		.is_vpu_clock = true,</div><div class='add'>+		.tcnt_mux = 5),</div><div class='ctx'> </div><div class='ctx'> 	/* clocks with per parent mux */</div><div class='ctx'> 	[BCM2835_CLOCK_AVEO]	= REGISTER_PER_CLK(</div><div class='hunk'>@@ -1695,19 +1920,22 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.ctl_reg = CM_AVEOCTL,</div><div class='ctx'> 		.div_reg = CM_AVEODIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 0),</div><div class='add'>+		.frac_bits = 0,</div><div class='add'>+		.tcnt_mux = 38),</div><div class='ctx'> 	[BCM2835_CLOCK_CAM0]	= REGISTER_PER_CLK(</div><div class='ctx'> 		.name = "cam0",</div><div class='ctx'> 		.ctl_reg = CM_CAM0CTL,</div><div class='ctx'> 		.div_reg = CM_CAM0DIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 8),</div><div class='add'>+		.frac_bits = 8,</div><div class='add'>+		.tcnt_mux = 14),</div><div class='ctx'> 	[BCM2835_CLOCK_CAM1]	= REGISTER_PER_CLK(</div><div class='ctx'> 		.name = "cam1",</div><div class='ctx'> 		.ctl_reg = CM_CAM1CTL,</div><div class='ctx'> 		.div_reg = CM_CAM1DIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 8),</div><div class='add'>+		.frac_bits = 8,</div><div class='add'>+		.tcnt_mux = 15),</div><div class='ctx'> 	[BCM2835_CLOCK_DFT]	= REGISTER_PER_CLK(</div><div class='ctx'> 		.name = "dft",</div><div class='ctx'> 		.ctl_reg = CM_DFTCTL,</div><div class='hunk'>@@ -1719,7 +1947,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.ctl_reg = CM_DPICTL,</div><div class='ctx'> 		.div_reg = CM_DPIDIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 8),</div><div class='add'>+		.frac_bits = 8,</div><div class='add'>+		.tcnt_mux = 17),</div><div class='ctx'> </div><div class='ctx'> 	/* Arasan EMMC clock */</div><div class='ctx'> 	[BCM2835_CLOCK_EMMC]	= REGISTER_PER_CLK(</div><div class='hunk'>@@ -1727,7 +1956,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.ctl_reg = CM_EMMCCTL,</div><div class='ctx'> 		.div_reg = CM_EMMCDIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 8),</div><div class='add'>+		.frac_bits = 8,</div><div class='add'>+		.tcnt_mux = 39),</div><div class='ctx'> </div><div class='ctx'> 	/* General purpose (GPIO) clocks */</div><div class='ctx'> 	[BCM2835_CLOCK_GP0]	= REGISTER_PER_CLK(</div><div class='hunk'>@@ -1736,7 +1966,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.div_reg = CM_GP0DIV,</div><div class='ctx'> 		.int_bits = 12,</div><div class='ctx'> 		.frac_bits = 12,</div><div class='del'>-		.is_mash_clock = true),</div><div class='add'>+		.is_mash_clock = true,</div><div class='add'>+		.tcnt_mux = 20),</div><div class='ctx'> 	[BCM2835_CLOCK_GP1]	= REGISTER_PER_CLK(</div><div class='ctx'> 		.name = "gp1",</div><div class='ctx'> 		.ctl_reg = CM_GP1CTL,</div><div class='hunk'>@@ -1744,7 +1975,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.int_bits = 12,</div><div class='ctx'> 		.frac_bits = 12,</div><div class='ctx'> 		.flags = CLK_IS_CRITICAL,</div><div class='del'>-		.is_mash_clock = true),</div><div class='add'>+		.is_mash_clock = true,</div><div class='add'>+		.tcnt_mux = 21),</div><div class='ctx'> 	[BCM2835_CLOCK_GP2]	= REGISTER_PER_CLK(</div><div class='ctx'> 		.name = "gp2",</div><div class='ctx'> 		.ctl_reg = CM_GP2CTL,</div><div class='hunk'>@@ -1759,40 +1991,46 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.ctl_reg = CM_HSMCTL,</div><div class='ctx'> 		.div_reg = CM_HSMDIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 8),</div><div class='add'>+		.frac_bits = 8,</div><div class='add'>+		.tcnt_mux = 22),</div><div class='ctx'> 	[BCM2835_CLOCK_PCM]	= REGISTER_PER_CLK(</div><div class='ctx'> 		.name = "pcm",</div><div class='ctx'> 		.ctl_reg = CM_PCMCTL,</div><div class='ctx'> 		.div_reg = CM_PCMDIV,</div><div class='ctx'> 		.int_bits = 12,</div><div class='ctx'> 		.frac_bits = 12,</div><div class='del'>-		.is_mash_clock = true),</div><div class='add'>+		.is_mash_clock = true,</div><div class='add'>+		.tcnt_mux = 23),</div><div class='ctx'> 	[BCM2835_CLOCK_PWM]	= REGISTER_PER_CLK(</div><div class='ctx'> 		.name = "pwm",</div><div class='ctx'> 		.ctl_reg = CM_PWMCTL,</div><div class='ctx'> 		.div_reg = CM_PWMDIV,</div><div class='ctx'> 		.int_bits = 12,</div><div class='ctx'> 		.frac_bits = 12,</div><div class='del'>-		.is_mash_clock = true),</div><div class='add'>+		.is_mash_clock = true,</div><div class='add'>+		.tcnt_mux = 24),</div><div class='ctx'> 	[BCM2835_CLOCK_SLIM]	= REGISTER_PER_CLK(</div><div class='ctx'> 		.name = "slim",</div><div class='ctx'> 		.ctl_reg = CM_SLIMCTL,</div><div class='ctx'> 		.div_reg = CM_SLIMDIV,</div><div class='ctx'> 		.int_bits = 12,</div><div class='ctx'> 		.frac_bits = 12,</div><div class='del'>-		.is_mash_clock = true),</div><div class='add'>+		.is_mash_clock = true,</div><div class='add'>+		.tcnt_mux = 25),</div><div class='ctx'> 	[BCM2835_CLOCK_SMI]	= REGISTER_PER_CLK(</div><div class='ctx'> 		.name = "smi",</div><div class='ctx'> 		.ctl_reg = CM_SMICTL,</div><div class='ctx'> 		.div_reg = CM_SMIDIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 8),</div><div class='add'>+		.frac_bits = 8,</div><div class='add'>+		.tcnt_mux = 27),</div><div class='ctx'> 	[BCM2835_CLOCK_UART]	= REGISTER_PER_CLK(</div><div class='ctx'> 		.name = "uart",</div><div class='ctx'> 		.ctl_reg = CM_UARTCTL,</div><div class='ctx'> 		.div_reg = CM_UARTDIV,</div><div class='ctx'> 		.int_bits = 10,</div><div class='del'>-		.frac_bits = 12),</div><div class='add'>+		.frac_bits = 12,</div><div class='add'>+		.tcnt_mux = 28),</div><div class='ctx'> </div><div class='ctx'> 	/* TV encoder clock.  Only operating frequency is 108Mhz.  */</div><div class='ctx'> 	[BCM2835_CLOCK_VEC]	= REGISTER_PER_CLK(</div><div class='hunk'>@@ -1800,7 +2038,13 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.ctl_reg = CM_VECCTL,</div><div class='ctx'> 		.div_reg = CM_VECDIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 0),</div><div class='add'>+		.frac_bits = 0,</div><div class='add'>+		/*</div><div class='add'>+		 * Allow rate change propagation only on PLLH_AUX which is</div><div class='add'>+		 * assigned index 7 in the parent array.</div><div class='add'>+		 */</div><div class='add'>+		.set_rate_parent = BIT(7),</div><div class='add'>+		.tcnt_mux = 29),</div><div class='ctx'> </div><div class='ctx'> 	/* dsi clocks */</div><div class='ctx'> 	[BCM2835_CLOCK_DSI0E]	= REGISTER_PER_CLK(</div><div class='hunk'>@@ -1808,13 +2052,29 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {</div><div class='ctx'> 		.ctl_reg = CM_DSI0ECTL,</div><div class='ctx'> 		.div_reg = CM_DSI0EDIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 8),</div><div class='add'>+		.frac_bits = 8,</div><div class='add'>+		.tcnt_mux = 18),</div><div class='ctx'> 	[BCM2835_CLOCK_DSI1E]	= REGISTER_PER_CLK(</div><div class='ctx'> 		.name = "dsi1e",</div><div class='ctx'> 		.ctl_reg = CM_DSI1ECTL,</div><div class='ctx'> 		.div_reg = CM_DSI1EDIV,</div><div class='ctx'> 		.int_bits = 4,</div><div class='del'>-		.frac_bits = 8),</div><div class='add'>+		.frac_bits = 8,</div><div class='add'>+		.tcnt_mux = 19),</div><div class='add'>+	[BCM2835_CLOCK_DSI0P]	= REGISTER_DSI0_CLK(</div><div class='add'>+		.name = "dsi0p",</div><div class='add'>+		.ctl_reg = CM_DSI0PCTL,</div><div class='add'>+		.div_reg = CM_DSI0PDIV,</div><div class='add'>+		.int_bits = 0,</div><div class='add'>+		.frac_bits = 0,</div><div class='add'>+		.tcnt_mux = 12),</div><div class='add'>+	[BCM2835_CLOCK_DSI1P]	= REGISTER_DSI1_CLK(</div><div class='add'>+		.name = "dsi1p",</div><div class='add'>+		.ctl_reg = CM_DSI1PCTL,</div><div class='add'>+		.div_reg = CM_DSI1PDIV,</div><div class='add'>+		.int_bits = 0,</div><div class='add'>+		.frac_bits = 0,</div><div class='add'>+		.tcnt_mux = 13),</div><div class='ctx'> </div><div class='ctx'> 	/* the gates */</div><div class='ctx'> </div><div class='hunk'>@@ -1873,8 +2133,19 @@ static int bcm2835_clk_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (IS_ERR(cprman-&gt;regs))</div><div class='ctx'> 		return PTR_ERR(cprman-&gt;regs);</div><div class='ctx'> </div><div class='del'>-	cprman-&gt;osc_name = of_clk_get_parent_name(dev-&gt;of_node, 0);</div><div class='del'>-	if (!cprman-&gt;osc_name)</div><div class='add'>+	memcpy(cprman-&gt;real_parent_names, cprman_parent_names,</div><div class='add'>+	       sizeof(cprman_parent_names));</div><div class='add'>+	of_clk_parent_fill(dev-&gt;of_node, cprman-&gt;real_parent_names,</div><div class='add'>+			   ARRAY_SIZE(cprman_parent_names));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the external oscillator has been registered.</div><div class='add'>+	 *</div><div class='add'>+	 * The other (DSI) clocks are not present on older device</div><div class='add'>+	 * trees, which we still need to support for backwards</div><div class='add'>+	 * compatibility.</div><div class='add'>+	 */</div><div class='add'>+	if (!cprman-&gt;real_parent_names[0])</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, cprman);</div><div class='head'>diff --git a/drivers/clk/clk-cdce925.c b/drivers/clk/clk-cdce925.c<br/>index b8459c14a1b7..c933be01c7db 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/clk-cdce925.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/clk-cdce925.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clk-cdce925.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-cdce925.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- * Driver for TI Dual PLL CDCE925 clock synthesizer</div><div class='add'>+ * Driver for TI Multi PLL CDCE913/925/937/949 clock synthesizer</div><div class='ctx'>  *</div><div class='del'>- * This driver always connects the Y1 to the input clock, Y2/Y3 to PLL1</div><div class='del'>- * and Y4/Y5 to PLL2. PLL frequency is set on a first-come-first-serve</div><div class='add'>+ * This driver always connects the Y1 to the input clock, Y2/Y3 to PLL1,</div><div class='add'>+ * Y4/Y5 to PLL2, and so on. PLL frequency is set on a first-come-first-serve</div><div class='ctx'>  * basis. Clients can directly request any frequency that the chip can</div><div class='ctx'>  * deliver using the standard clk framework. In addition, the device can</div><div class='ctx'>  * be configured and activated via the devicetree.</div><div class='hunk'>@@ -19,11 +19,32 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/gcd.h&gt;</div><div class='ctx'> </div><div class='del'>-/* The chip has 2 PLLs which can be routed through dividers to 5 outputs.</div><div class='add'>+/* Each chip has different number of PLLs and outputs, for example:</div><div class='add'>+ * The CECE925 has 2 PLLs which can be routed through dividers to 5 outputs.</div><div class='ctx'>  * Model this as 2 PLL clocks which are parents to the outputs.</div><div class='ctx'>  */</div><div class='del'>-#define NUMBER_OF_PLLS	2</div><div class='del'>-#define NUMBER_OF_OUTPUTS	5</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CDCE913,</div><div class='add'>+	CDCE925,</div><div class='add'>+	CDCE937,</div><div class='add'>+	CDCE949,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk_cdce925_chip_info {</div><div class='add'>+	int num_plls;</div><div class='add'>+	int num_outputs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_cdce925_chip_info clk_cdce925_chip_info_tbl[] = {</div><div class='add'>+	[CDCE913] = { .num_plls = 1, .num_outputs = 3 },</div><div class='add'>+	[CDCE925] = { .num_plls = 2, .num_outputs = 5 },</div><div class='add'>+	[CDCE937] = { .num_plls = 3, .num_outputs = 7 },</div><div class='add'>+	[CDCE949] = { .num_plls = 4, .num_outputs = 9 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MAX_NUMBER_OF_PLLS	4</div><div class='add'>+#define MAX_NUMBER_OF_OUTPUTS	9</div><div class='ctx'> </div><div class='ctx'> #define CDCE925_REG_GLOBAL1	0x01</div><div class='ctx'> #define CDCE925_REG_Y1SPIPDIVH	0x02</div><div class='hunk'>@@ -43,7 +64,7 @@ struct clk_cdce925_output {</div><div class='ctx'> 	struct clk_hw hw;</div><div class='ctx'> 	struct clk_cdce925_chip *chip;</div><div class='ctx'> 	u8 index;</div><div class='del'>-	u16 pdiv; /* 1..127 for Y2-Y5; 1..1023 for Y1 */</div><div class='add'>+	u16 pdiv; /* 1..127 for Y2-Y9; 1..1023 for Y1 */</div><div class='ctx'> };</div><div class='ctx'> #define to_clk_cdce925_output(_hw) \</div><div class='ctx'> 	container_of(_hw, struct clk_cdce925_output, hw)</div><div class='hunk'>@@ -60,8 +81,9 @@ struct clk_cdce925_pll {</div><div class='ctx'> struct clk_cdce925_chip {</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> 	struct i2c_client *i2c_client;</div><div class='del'>-	struct clk_cdce925_pll pll[NUMBER_OF_PLLS];</div><div class='del'>-	struct clk_cdce925_output clk[NUMBER_OF_OUTPUTS];</div><div class='add'>+	const struct clk_cdce925_chip_info *chip_info;</div><div class='add'>+	struct clk_cdce925_pll pll[MAX_NUMBER_OF_PLLS];</div><div class='add'>+	struct clk_cdce925_output clk[MAX_NUMBER_OF_OUTPUTS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */</div><div class='hunk'>@@ -216,7 +238,7 @@ static int cdce925_pll_prepare(struct clk_hw *hw)</div><div class='ctx'> 		nn = n * BIT(p);</div><div class='ctx'> 		/* q = int(nn/m) */</div><div class='ctx'> 		q = nn / m;</div><div class='del'>-		if ((q &lt; 16) || (1 &gt; 64)) {</div><div class='add'>+		if ((q &lt; 16) || (q &gt; 63)) {</div><div class='ctx'> 			pr_debug("%s invalid q=%d\n", __func__, q);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -284,6 +306,18 @@ static void cdce925_clk_set_pdiv(struct clk_cdce925_output *data, u16 pdiv)</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		regmap_update_bits(data-&gt;chip-&gt;regmap, 0x27, 0x7F, pdiv);</div><div class='ctx'> 		break;</div><div class='add'>+	case 5:</div><div class='add'>+		regmap_update_bits(data-&gt;chip-&gt;regmap, 0x36, 0x7F, pdiv);</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		regmap_update_bits(data-&gt;chip-&gt;regmap, 0x37, 0x7F, pdiv);</div><div class='add'>+		break;</div><div class='add'>+	case 7:</div><div class='add'>+		regmap_update_bits(data-&gt;chip-&gt;regmap, 0x46, 0x7F, pdiv);</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		regmap_update_bits(data-&gt;chip-&gt;regmap, 0x47, 0x7F, pdiv);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -302,6 +336,14 @@ static void cdce925_clk_activate(struct clk_cdce925_output *data)</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		regmap_update_bits(data-&gt;chip-&gt;regmap, 0x24, 0x03, 0x03);</div><div class='ctx'> 		break;</div><div class='add'>+	case 5:</div><div class='add'>+	case 6:</div><div class='add'>+		regmap_update_bits(data-&gt;chip-&gt;regmap, 0x34, 0x03, 0x03);</div><div class='add'>+		break;</div><div class='add'>+	case 7:</div><div class='add'>+	case 8:</div><div class='add'>+		regmap_update_bits(data-&gt;chip-&gt;regmap, 0x44, 0x03, 0x03);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -474,15 +516,6 @@ static const struct clk_ops cdce925_clk_y1_ops = {</div><div class='ctx'> 	.set_rate = cdce925_clk_y1_set_rate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct regmap_config cdce925_regmap_config = {</div><div class='del'>-	.name = "configuration0",</div><div class='del'>-	.reg_bits = 8,</div><div class='del'>-	.val_bits = 8,</div><div class='del'>-	.cache_type = REGCACHE_RBTREE,</div><div class='del'>-	.max_register = 0x2F,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define CDCE925_I2C_COMMAND_BLOCK_TRANSFER	0x00</div><div class='ctx'> #define CDCE925_I2C_COMMAND_BYTE_TRANSFER	0x80</div><div class='ctx'> </div><div class='hunk'>@@ -582,13 +615,19 @@ static int cdce925_probe(struct i2c_client *client,</div><div class='ctx'> 	struct clk_cdce925_chip *data;</div><div class='ctx'> 	struct device_node *node = client-&gt;dev.of_node;</div><div class='ctx'> 	const char *parent_name;</div><div class='del'>-	const char *pll_clk_name[NUMBER_OF_PLLS] = {NULL,};</div><div class='add'>+	const char *pll_clk_name[MAX_NUMBER_OF_PLLS] = {NULL,};</div><div class='ctx'> 	struct clk_init_data init;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct device_node *np_output;</div><div class='ctx'> 	char child_name[6];</div><div class='add'>+	struct regmap_config config = {</div><div class='add'>+		.name = "configuration0",</div><div class='add'>+		.reg_bits = 8,</div><div class='add'>+		.val_bits = 8,</div><div class='add'>+		.cache_type = REGCACHE_RBTREE,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev, "%s\n", __func__);</div><div class='ctx'> 	data = devm_kzalloc(&amp;client-&gt;dev, sizeof(*data), GFP_KERNEL);</div><div class='hunk'>@@ -596,8 +635,11 @@ static int cdce925_probe(struct i2c_client *client,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;i2c_client = client;</div><div class='add'>+	data-&gt;chip_info = &amp;clk_cdce925_chip_info_tbl[id-&gt;driver_data];</div><div class='add'>+	config.max_register = CDCE925_OFFSET_PLL +</div><div class='add'>+		data-&gt;chip_info-&gt;num_plls * 0x10 - 1;</div><div class='ctx'> 	data-&gt;regmap = devm_regmap_init(&amp;client-&gt;dev, &amp;regmap_cdce925_bus,</div><div class='del'>-			&amp;client-&gt;dev, &amp;cdce925_regmap_config);</div><div class='add'>+			&amp;client-&gt;dev, &amp;config);</div><div class='ctx'> 	if (IS_ERR(data-&gt;regmap)) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "failed to allocate register map\n");</div><div class='ctx'> 		return PTR_ERR(data-&gt;regmap);</div><div class='hunk'>@@ -626,7 +668,7 @@ static int cdce925_probe(struct i2c_client *client,</div><div class='ctx'> 	init.num_parents = parent_name ? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Register PLL clocks */</div><div class='del'>-	for (i = 0; i &lt; NUMBER_OF_PLLS; ++i) {</div><div class='add'>+	for (i = 0; i &lt; data-&gt;chip_info-&gt;num_plls; ++i) {</div><div class='ctx'> 		pll_clk_name[i] = kasprintf(GFP_KERNEL, "%s.pll%d",</div><div class='ctx'> 			client-&gt;dev.of_node-&gt;name, i);</div><div class='ctx'> 		init.name = pll_clk_name[i];</div><div class='hunk'>@@ -684,7 +726,7 @@ static int cdce925_probe(struct i2c_client *client,</div><div class='ctx'> 	init.ops = &amp;cdce925_clk_ops;</div><div class='ctx'> 	init.flags = CLK_SET_RATE_PARENT;</div><div class='ctx'> 	init.num_parents = 1;</div><div class='del'>-	for (i = 1; i &lt; NUMBER_OF_OUTPUTS; ++i) {</div><div class='add'>+	for (i = 1; i &lt; data-&gt;chip_info-&gt;num_outputs; ++i) {</div><div class='ctx'> 		init.name = kasprintf(GFP_KERNEL, "%s.Y%d",</div><div class='ctx'> 			client-&gt;dev.of_node-&gt;name, i+1);</div><div class='ctx'> 		data-&gt;clk[i].chip = data;</div><div class='hunk'>@@ -702,6 +744,16 @@ static int cdce925_probe(struct i2c_client *client,</div><div class='ctx'> 			/* Mux Y4/5 to PLL2 */</div><div class='ctx'> 			init.parent_names = &amp;pll_clk_name[1];</div><div class='ctx'> 			break;</div><div class='add'>+		case 5:</div><div class='add'>+		case 6:</div><div class='add'>+			/* Mux Y6/7 to PLL3 */</div><div class='add'>+			init.parent_names = &amp;pll_clk_name[2];</div><div class='add'>+			break;</div><div class='add'>+		case 7:</div><div class='add'>+		case 8:</div><div class='add'>+			/* Mux Y8/9 to PLL4 */</div><div class='add'>+			init.parent_names = &amp;pll_clk_name[3];</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		err = devm_clk_hw_register(&amp;client-&gt;dev, &amp;data-&gt;clk[i].hw);</div><div class='ctx'> 		kfree(init.name); /* clock framework made a copy of the name */</div><div class='hunk'>@@ -720,7 +772,7 @@ static int cdce925_probe(struct i2c_client *client,</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	for (i = 0; i &lt; NUMBER_OF_PLLS; ++i)</div><div class='add'>+	for (i = 0; i &lt; data-&gt;chip_info-&gt;num_plls; ++i)</div><div class='ctx'> 		/* clock framework made a copy of the name */</div><div class='ctx'> 		kfree(pll_clk_name[i]);</div><div class='ctx'> </div><div class='hunk'>@@ -728,13 +780,19 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct i2c_device_id cdce925_id[] = {</div><div class='del'>-	{ "cdce925", 0 },</div><div class='add'>+	{ "cdce913", CDCE913 },</div><div class='add'>+	{ "cdce925", CDCE925 },</div><div class='add'>+	{ "cdce937", CDCE937 },</div><div class='add'>+	{ "cdce949", CDCE949 },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, cdce925_id);</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id clk_cdce925_of_match[] = {</div><div class='add'>+	{ .compatible = "ti,cdce913" },</div><div class='ctx'> 	{ .compatible = "ti,cdce925" },</div><div class='add'>+	{ .compatible = "ti,cdce937" },</div><div class='add'>+	{ .compatible = "ti,cdce949" },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, clk_cdce925_of_match);</div><div class='hunk'>@@ -750,5 +808,5 @@ static struct i2c_driver cdce925_driver = {</div><div class='ctx'> module_i2c_driver(cdce925_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mike Looijmans &lt;mike.looijmans@topic.nl&gt;");</div><div class='del'>-MODULE_DESCRIPTION("cdce925 driver");</div><div class='add'>+MODULE_DESCRIPTION("TI CDCE913/925/937/949 driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c<br/>index 674785d968a3..e0e02a6e5900 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/clk-conf.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/clk-conf.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clk-conf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-conf.c</a></div><div class='hunk'>@@ -40,8 +40,9 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		pclk = of_clk_get_from_provider(&amp;clkspec);</div><div class='ctx'> 		if (IS_ERR(pclk)) {</div><div class='del'>-			pr_warn("clk: couldn't get parent clock %d for %s\n",</div><div class='del'>-				index, node-&gt;full_name);</div><div class='add'>+			if (PTR_ERR(pclk) != -EPROBE_DEFER)</div><div class='add'>+				pr_warn("clk: couldn't get parent clock %d for %s\n",</div><div class='add'>+					index, node-&gt;full_name);</div><div class='ctx'> 			return PTR_ERR(pclk);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -55,8 +56,9 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)</div><div class='ctx'> 		}</div><div class='ctx'> 		clk = of_clk_get_from_provider(&amp;clkspec);</div><div class='ctx'> 		if (IS_ERR(clk)) {</div><div class='del'>-			pr_warn("clk: couldn't get assigned clock %d for %s\n",</div><div class='del'>-				index, node-&gt;full_name);</div><div class='add'>+			if (PTR_ERR(clk) != -EPROBE_DEFER)</div><div class='add'>+				pr_warn("clk: couldn't get assigned clock %d for %s\n",</div><div class='add'>+					index, node-&gt;full_name);</div><div class='ctx'> 			rc = PTR_ERR(clk);</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -99,8 +101,9 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier)</div><div class='ctx'> </div><div class='ctx'> 			clk = of_clk_get_from_provider(&amp;clkspec);</div><div class='ctx'> 			if (IS_ERR(clk)) {</div><div class='del'>-				pr_warn("clk: couldn't get clock %d for %s\n",</div><div class='del'>-					index, node-&gt;full_name);</div><div class='add'>+				if (PTR_ERR(clk) != -EPROBE_DEFER)</div><div class='add'>+					pr_warn("clk: couldn't get clock %d for %s\n",</div><div class='add'>+						index, node-&gt;full_name);</div><div class='ctx'> 				return PTR_ERR(clk);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/clk-cs2000-cp.c b/drivers/clk/clk-cs2000-cp.c<br/>index 021f3daf34e1..3fca0526d940 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/clk-cs2000-cp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/clk-cs2000-cp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clk-cs2000-cp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-cs2000-cp.c</a></div><div class='hunk'>@@ -59,6 +59,10 @@ struct cs2000_priv {</div><div class='ctx'> 	struct i2c_client *client;</div><div class='ctx'> 	struct clk *clk_in;</div><div class='ctx'> 	struct clk *ref_clk;</div><div class='add'>+</div><div class='add'>+	/* suspend/resume */</div><div class='add'>+	unsigned long saved_rate;</div><div class='add'>+	unsigned long saved_parent_rate;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id cs2000_of_match[] = {</div><div class='hunk'>@@ -286,6 +290,9 @@ static int __cs2000_set_rate(struct cs2000_priv *priv, int ch,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;saved_rate	= rate;</div><div class='add'>+	priv-&gt;saved_parent_rate	= parent_rate;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -489,9 +496,24 @@ probe_err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cs2000_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs2000_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	int ch = 0; /* it uses ch0 only at this point */</div><div class='add'>+</div><div class='add'>+	return __cs2000_set_rate(priv, ch,</div><div class='add'>+				 priv-&gt;saved_rate,</div><div class='add'>+				 priv-&gt;saved_parent_rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops cs2000_pm_ops = {</div><div class='add'>+	.resume_early	= cs2000_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver cs2000_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "cs2000-cp",</div><div class='add'>+		.pm	= &amp;cs2000_pm_ops,</div><div class='ctx'> 		.of_match_table = cs2000_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= cs2000_probe,</div><div class='head'>diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c<br/>index 8f571548870f..3a218c3a06ae 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/clk-devres.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/clk-devres.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clk-devres.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-devres.c</a></div><div class='hunk'>@@ -53,3 +53,24 @@ void devm_clk_put(struct device *dev, struct clk *clk)</div><div class='ctx'> 	WARN_ON(ret);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(devm_clk_put);</div><div class='add'>+</div><div class='add'>+struct clk *devm_get_clk_from_child(struct device *dev,</div><div class='add'>+				    struct device_node *np, const char *con_id)</div><div class='add'>+{</div><div class='add'>+	struct clk **ptr, *clk;</div><div class='add'>+</div><div class='add'>+	ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL);</div><div class='add'>+	if (!ptr)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	clk = of_clk_get_by_name(np, con_id);</div><div class='add'>+	if (!IS_ERR(clk)) {</div><div class='add'>+		*ptr = clk;</div><div class='add'>+		devres_add(dev, ptr);</div><div class='add'>+	} else {</div><div class='add'>+		devres_free(ptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return clk;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(devm_get_clk_from_child);</div><div class='head'>diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c<br/>index 4e691e35483a..4e0c054a787c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/clk-gate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/clk-gate.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clk-gate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-gate.c</a></div><div class='hunk'>@@ -145,8 +145,8 @@ struct clk_hw *clk_hw_register_gate(struct device *dev, const char *name,</div><div class='ctx'> 	init.name = name;</div><div class='ctx'> 	init.ops = &amp;clk_gate_ops;</div><div class='ctx'> 	init.flags = flags | CLK_IS_BASIC;</div><div class='del'>-	init.parent_names = (parent_name ? &amp;parent_name: NULL);</div><div class='del'>-	init.num_parents = (parent_name ? 1 : 0);</div><div class='add'>+	init.parent_names = parent_name ? &amp;parent_name : NULL;</div><div class='add'>+	init.num_parents = parent_name ? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 	/* struct clk_gate assignments */</div><div class='ctx'> 	gate-&gt;reg = reg;</div><div class='head'>diff --git a/drivers/clk/clk-oxnas.c b/drivers/clk/clk-oxnas.c<br/>index 47649ac5d399..e51e0023fc6e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/clk-oxnas.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/clk-oxnas.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clk-oxnas.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-oxnas.c</a></div><div class='hunk'>@@ -20,31 +20,43 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/syscon.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;dt-bindings/clock/oxsemi,ox810se.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/oxsemi,ox820.h&gt;</div><div class='add'>+</div><div class='ctx'> /* Standard regmap gate clocks */</div><div class='del'>-struct clk_oxnas {</div><div class='add'>+struct clk_oxnas_gate {</div><div class='ctx'> 	struct clk_hw hw;</div><div class='del'>-	signed char bit;</div><div class='add'>+	unsigned int bit;</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct oxnas_stdclk_data {</div><div class='add'>+	struct clk_hw_onecell_data *onecell_data;</div><div class='add'>+	struct clk_oxnas_gate **gates;</div><div class='add'>+	unsigned int ngates;</div><div class='add'>+	struct clk_oxnas_pll **plls;</div><div class='add'>+	unsigned int nplls;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Regmap offsets */</div><div class='ctx'> #define CLK_STAT_REGOFFSET	0x24</div><div class='ctx'> #define CLK_SET_REGOFFSET	0x2c</div><div class='ctx'> #define CLK_CLR_REGOFFSET	0x30</div><div class='ctx'> </div><div class='del'>-static inline struct clk_oxnas *to_clk_oxnas(struct clk_hw *hw)</div><div class='add'>+static inline struct clk_oxnas_gate *to_clk_oxnas_gate(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	return container_of(hw, struct clk_oxnas, hw);</div><div class='add'>+	return container_of(hw, struct clk_oxnas_gate, hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int oxnas_clk_is_enabled(struct clk_hw *hw)</div><div class='add'>+static int oxnas_clk_gate_is_enabled(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	struct clk_oxnas *std = to_clk_oxnas(hw);</div><div class='add'>+	struct clk_oxnas_gate *std = to_clk_oxnas_gate(hw);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='hunk'>@@ -55,29 +67,29 @@ static int oxnas_clk_is_enabled(struct clk_hw *hw)</div><div class='ctx'> 	return val &amp; BIT(std-&gt;bit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int oxnas_clk_enable(struct clk_hw *hw)</div><div class='add'>+static int oxnas_clk_gate_enable(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	struct clk_oxnas *std = to_clk_oxnas(hw);</div><div class='add'>+	struct clk_oxnas_gate *std = to_clk_oxnas_gate(hw);</div><div class='ctx'> </div><div class='ctx'> 	regmap_write(std-&gt;regmap, CLK_SET_REGOFFSET, BIT(std-&gt;bit));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void oxnas_clk_disable(struct clk_hw *hw)</div><div class='add'>+static void oxnas_clk_gate_disable(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	struct clk_oxnas *std = to_clk_oxnas(hw);</div><div class='add'>+	struct clk_oxnas_gate *std = to_clk_oxnas_gate(hw);</div><div class='ctx'> </div><div class='ctx'> 	regmap_write(std-&gt;regmap, CLK_CLR_REGOFFSET, BIT(std-&gt;bit));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct clk_ops oxnas_clk_ops = {</div><div class='del'>-	.enable = oxnas_clk_enable,</div><div class='del'>-	.disable = oxnas_clk_disable,</div><div class='del'>-	.is_enabled = oxnas_clk_is_enabled,</div><div class='add'>+static const struct clk_ops oxnas_clk_gate_ops = {</div><div class='add'>+	.enable = oxnas_clk_gate_enable,</div><div class='add'>+	.disable = oxnas_clk_gate_disable,</div><div class='add'>+	.is_enabled = oxnas_clk_gate_is_enabled,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const char *const oxnas_clk_parents[] = {</div><div class='add'>+static const char *const osc_parents[] = {</div><div class='ctx'> 	"oscillator",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -85,63 +97,138 @@ static const char *const eth_parents[] = {</div><div class='ctx'> 	"gmacclk",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define DECLARE_STD_CLKP(__clk, __parent)			\</div><div class='del'>-static const struct clk_init_data clk_##__clk##_init = {	\</div><div class='del'>-	.name = __stringify(__clk),				\</div><div class='del'>-	.ops = &amp;oxnas_clk_ops,					\</div><div class='del'>-	.parent_names = __parent,				\</div><div class='del'>-	.num_parents = ARRAY_SIZE(__parent),			\</div><div class='add'>+#define OXNAS_GATE(_name, _bit, _parents)				\</div><div class='add'>+struct clk_oxnas_gate _name = {						\</div><div class='add'>+	.bit = (_bit),							\</div><div class='add'>+	.hw.init = &amp;(struct clk_init_data) {				\</div><div class='add'>+		.name = #_name,						\</div><div class='add'>+		.ops = &amp;oxnas_clk_gate_ops,				\</div><div class='add'>+		.parent_names = _parents,				\</div><div class='add'>+		.num_parents = ARRAY_SIZE(_parents),			\</div><div class='add'>+		.flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),	\</div><div class='add'>+	},								\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define DECLARE_STD_CLK(__clk) DECLARE_STD_CLKP(__clk, oxnas_clk_parents)</div><div class='add'>+static OXNAS_GATE(ox810se_leon, 0, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox810se_dma_sgdma, 1, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox810se_cipher, 2, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox810se_sata, 4, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox810se_audio, 5, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox810se_usbmph, 6, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox810se_etha, 7, eth_parents);</div><div class='add'>+static OXNAS_GATE(ox810se_pciea, 8, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox810se_nand, 9, osc_parents);</div><div class='add'>+</div><div class='add'>+static struct clk_oxnas_gate *ox810se_gates[] = {</div><div class='add'>+	&amp;ox810se_leon,</div><div class='add'>+	&amp;ox810se_dma_sgdma,</div><div class='add'>+	&amp;ox810se_cipher,</div><div class='add'>+	&amp;ox810se_sata,</div><div class='add'>+	&amp;ox810se_audio,</div><div class='add'>+	&amp;ox810se_usbmph,</div><div class='add'>+	&amp;ox810se_etha,</div><div class='add'>+	&amp;ox810se_pciea,</div><div class='add'>+	&amp;ox810se_nand,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static OXNAS_GATE(ox820_leon, 0, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox820_dma_sgdma, 1, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox820_cipher, 2, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox820_sd, 3, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox820_sata, 4, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox820_audio, 5, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox820_usbmph, 6, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox820_etha, 7, eth_parents);</div><div class='add'>+static OXNAS_GATE(ox820_pciea, 8, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox820_nand, 9, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox820_ethb, 10, eth_parents);</div><div class='add'>+static OXNAS_GATE(ox820_pcieb, 11, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox820_ref600, 12, osc_parents);</div><div class='add'>+static OXNAS_GATE(ox820_usbdev, 13, osc_parents);</div><div class='add'>+</div><div class='add'>+static struct clk_oxnas_gate *ox820_gates[] = {</div><div class='add'>+	&amp;ox820_leon,</div><div class='add'>+	&amp;ox820_dma_sgdma,</div><div class='add'>+	&amp;ox820_cipher,</div><div class='add'>+	&amp;ox820_sd,</div><div class='add'>+	&amp;ox820_sata,</div><div class='add'>+	&amp;ox820_audio,</div><div class='add'>+	&amp;ox820_usbmph,</div><div class='add'>+	&amp;ox820_etha,</div><div class='add'>+	&amp;ox820_pciea,</div><div class='add'>+	&amp;ox820_nand,</div><div class='add'>+	&amp;ox820_etha,</div><div class='add'>+	&amp;ox820_pciea,</div><div class='add'>+	&amp;ox820_ref600,</div><div class='add'>+	&amp;ox820_usbdev,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw_onecell_data ox810se_hw_onecell_data = {</div><div class='add'>+	.hws = {</div><div class='add'>+		[CLK_810_LEON]	= &amp;ox810se_leon.hw,</div><div class='add'>+		[CLK_810_DMA_SGDMA]	= &amp;ox810se_dma_sgdma.hw,</div><div class='add'>+		[CLK_810_CIPHER]	= &amp;ox810se_cipher.hw,</div><div class='add'>+		[CLK_810_SATA]	= &amp;ox810se_sata.hw,</div><div class='add'>+		[CLK_810_AUDIO]	= &amp;ox810se_audio.hw,</div><div class='add'>+		[CLK_810_USBMPH]	= &amp;ox810se_usbmph.hw,</div><div class='add'>+		[CLK_810_ETHA]	= &amp;ox810se_etha.hw,</div><div class='add'>+		[CLK_810_PCIEA]	= &amp;ox810se_pciea.hw,</div><div class='add'>+		[CLK_810_NAND]	= &amp;ox810se_nand.hw,</div><div class='add'>+	},</div><div class='add'>+	.num = ARRAY_SIZE(ox810se_gates),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw_onecell_data ox820_hw_onecell_data = {</div><div class='add'>+	.hws = {</div><div class='add'>+		[CLK_820_LEON]	= &amp;ox820_leon.hw,</div><div class='add'>+		[CLK_820_DMA_SGDMA]	= &amp;ox820_dma_sgdma.hw,</div><div class='add'>+		[CLK_820_CIPHER]	= &amp;ox820_cipher.hw,</div><div class='add'>+		[CLK_820_SD]	= &amp;ox820_sd.hw,</div><div class='add'>+		[CLK_820_SATA]	= &amp;ox820_sata.hw,</div><div class='add'>+		[CLK_820_AUDIO]	= &amp;ox820_audio.hw,</div><div class='add'>+		[CLK_820_USBMPH]	= &amp;ox820_usbmph.hw,</div><div class='add'>+		[CLK_820_ETHA]	= &amp;ox820_etha.hw,</div><div class='add'>+		[CLK_820_PCIEA]	= &amp;ox820_pciea.hw,</div><div class='add'>+		[CLK_820_NAND]	= &amp;ox820_nand.hw,</div><div class='add'>+		[CLK_820_ETHB]	= &amp;ox820_ethb.hw,</div><div class='add'>+		[CLK_820_PCIEB]	= &amp;ox820_pcieb.hw,</div><div class='add'>+		[CLK_820_REF600]	= &amp;ox820_ref600.hw,</div><div class='add'>+		[CLK_820_USBDEV]	= &amp;ox820_usbdev.hw,</div><div class='add'>+	},</div><div class='add'>+	.num = ARRAY_SIZE(ox820_gates),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/* Hardware Bit - Clock association */</div><div class='del'>-struct clk_oxnas_init_data {</div><div class='del'>-	unsigned long bit;</div><div class='del'>-	const struct clk_init_data *clk_init;</div><div class='add'>+static struct oxnas_stdclk_data ox810se_stdclk_data = {</div><div class='add'>+	.onecell_data = &amp;ox810se_hw_onecell_data,</div><div class='add'>+	.gates = ox810se_gates,</div><div class='add'>+	.ngates = ARRAY_SIZE(ox810se_gates),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Clk init data declaration */</div><div class='del'>-DECLARE_STD_CLK(leon);</div><div class='del'>-DECLARE_STD_CLK(dma_sgdma);</div><div class='del'>-DECLARE_STD_CLK(cipher);</div><div class='del'>-DECLARE_STD_CLK(sata);</div><div class='del'>-DECLARE_STD_CLK(audio);</div><div class='del'>-DECLARE_STD_CLK(usbmph);</div><div class='del'>-DECLARE_STD_CLKP(etha, eth_parents);</div><div class='del'>-DECLARE_STD_CLK(pciea);</div><div class='del'>-DECLARE_STD_CLK(nand);</div><div class='del'>-</div><div class='del'>-/* Table index is clock indice */</div><div class='del'>-static const struct clk_oxnas_init_data clk_oxnas_init[] = {</div><div class='del'>-	[0] = {0, &amp;clk_leon_init},</div><div class='del'>-	[1] = {1, &amp;clk_dma_sgdma_init},</div><div class='del'>-	[2] = {2, &amp;clk_cipher_init},</div><div class='del'>-	/* Skip &amp; Do not touch to DDR clock */</div><div class='del'>-	[3] = {4, &amp;clk_sata_init},</div><div class='del'>-	[4] = {5, &amp;clk_audio_init},</div><div class='del'>-	[5] = {6, &amp;clk_usbmph_init},</div><div class='del'>-	[6] = {7, &amp;clk_etha_init},</div><div class='del'>-	[7] = {8, &amp;clk_pciea_init},</div><div class='del'>-	[8] = {9, &amp;clk_nand_init},</div><div class='add'>+static struct oxnas_stdclk_data ox820_stdclk_data = {</div><div class='add'>+	.onecell_data = &amp;ox820_hw_onecell_data,</div><div class='add'>+	.gates = ox820_gates,</div><div class='add'>+	.ngates = ARRAY_SIZE(ox820_gates),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct clk_oxnas_data {</div><div class='del'>-	struct clk_oxnas clk_oxnas[ARRAY_SIZE(clk_oxnas_init)];</div><div class='del'>-	struct clk_onecell_data onecell_data[ARRAY_SIZE(clk_oxnas_init)];</div><div class='del'>-	struct clk *clks[ARRAY_SIZE(clk_oxnas_init)];</div><div class='add'>+static const struct of_device_id oxnas_stdclk_dt_ids[] = {</div><div class='add'>+	{ .compatible = "oxsemi,ox810se-stdclk", &amp;ox810se_stdclk_data },</div><div class='add'>+	{ .compatible = "oxsemi,ox820-stdclk", &amp;ox820_stdclk_data },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int oxnas_stdclk_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='del'>-	struct clk_oxnas_data *clk_oxnas;</div><div class='add'>+	const struct oxnas_stdclk_data *data;</div><div class='add'>+	const struct of_device_id *id;</div><div class='ctx'> 	struct regmap *regmap;</div><div class='add'>+	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	clk_oxnas = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*clk_oxnas), GFP_KERNEL);</div><div class='del'>-	if (!clk_oxnas)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	id = of_match_device(oxnas_stdclk_dt_ids, &amp;pdev-&gt;dev);</div><div class='add'>+	if (!id)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	data = id-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	regmap = syscon_node_to_regmap(of_get_parent(np));</div><div class='ctx'> 	if (IS_ERR(regmap)) {</div><div class='hunk'>@@ -149,32 +236,23 @@ static int oxnas_stdclk_probe(struct platform_device *pdev)</div><div class='ctx'> 		return PTR_ERR(regmap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(clk_oxnas_init); i++) {</div><div class='del'>-		struct clk_oxnas *_clk;</div><div class='add'>+	for (i = 0 ; i &lt; data-&gt;ngates ; ++i)</div><div class='add'>+		data-&gt;gates[i]-&gt;regmap = regmap;</div><div class='ctx'> </div><div class='del'>-		_clk = &amp;clk_oxnas-&gt;clk_oxnas[i];</div><div class='del'>-		_clk-&gt;bit = clk_oxnas_init[i].bit;</div><div class='del'>-		_clk-&gt;hw.init = clk_oxnas_init[i].clk_init;</div><div class='del'>-		_clk-&gt;regmap = regmap;</div><div class='add'>+	for (i = 0; i &lt; data-&gt;onecell_data-&gt;num; i++) {</div><div class='add'>+		if (!data-&gt;onecell_data-&gt;hws[i])</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-		clk_oxnas-&gt;clks[i] =</div><div class='del'>-			devm_clk_register(&amp;pdev-&gt;dev, &amp;_clk-&gt;hw);</div><div class='del'>-		if (WARN_ON(IS_ERR(clk_oxnas-&gt;clks[i])))</div><div class='del'>-			return PTR_ERR(clk_oxnas-&gt;clks[i]);</div><div class='add'>+		ret = devm_clk_hw_register(&amp;pdev-&gt;dev,</div><div class='add'>+					   data-&gt;onecell_data-&gt;hws[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	clk_oxnas-&gt;onecell_data-&gt;clks = clk_oxnas-&gt;clks;</div><div class='del'>-	clk_oxnas-&gt;onecell_data-&gt;clk_num = ARRAY_SIZE(clk_oxnas_init);</div><div class='del'>-</div><div class='del'>-	return of_clk_add_provider(np, of_clk_src_onecell_get,</div><div class='del'>-				   clk_oxnas-&gt;onecell_data);</div><div class='add'>+	return of_clk_add_hw_provider(np, of_clk_hw_onecell_get,</div><div class='add'>+				      data-&gt;onecell_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id oxnas_stdclk_dt_ids[] = {</div><div class='del'>-	{ .compatible = "oxsemi,ox810se-stdclk" },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct platform_driver oxnas_stdclk_driver = {</div><div class='ctx'> 	.probe = oxnas_stdclk_probe,</div><div class='ctx'> 	.driver	= {</div><div class='head'>diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c<br/>index 80ae2a51452d..d0bf8b1c67de 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/clk-qoriq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/clk-qoriq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clk-qoriq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-qoriq.c</a></div><div class='hunk'>@@ -266,6 +266,39 @@ static const struct clockgen_muxinfo ls1043a_hwa2 = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct clockgen_muxinfo ls1046a_hwa1 = {</div><div class='add'>+	{</div><div class='add'>+		{},</div><div class='add'>+		{},</div><div class='add'>+		{ CLKSEL_VALID, CGA_PLL1, PLL_DIV2 },</div><div class='add'>+		{ CLKSEL_VALID, CGA_PLL1, PLL_DIV3 },</div><div class='add'>+		{ CLKSEL_VALID, CGA_PLL1, PLL_DIV4 },</div><div class='add'>+		{ CLKSEL_VALID, PLATFORM_PLL, PLL_DIV1 },</div><div class='add'>+		{ CLKSEL_VALID, CGA_PLL2, PLL_DIV2 },</div><div class='add'>+		{ CLKSEL_VALID, CGA_PLL2, PLL_DIV3 },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clockgen_muxinfo ls1046a_hwa2 = {</div><div class='add'>+	{</div><div class='add'>+		{},</div><div class='add'>+		{ CLKSEL_VALID, CGA_PLL2, PLL_DIV1 },</div><div class='add'>+		{ CLKSEL_VALID, CGA_PLL2, PLL_DIV2 },</div><div class='add'>+		{ CLKSEL_VALID, CGA_PLL2, PLL_DIV3 },</div><div class='add'>+		{},</div><div class='add'>+		{},</div><div class='add'>+		{ CLKSEL_VALID, CGA_PLL1, PLL_DIV2 },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clockgen_muxinfo ls1012a_cmux = {</div><div class='add'>+	{</div><div class='add'>+		[0] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV1 },</div><div class='add'>+		{},</div><div class='add'>+		[2] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV2 },</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct clockgen_muxinfo t1023_hwa1 = {</div><div class='ctx'> 	{</div><div class='ctx'> 		{},</div><div class='hunk'>@@ -489,6 +522,31 @@ static const struct clockgen_chipinfo chipinfo[] = {</div><div class='ctx'> 		.flags = CG_PLL_8BIT,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.compat = "fsl,ls1046a-clockgen",</div><div class='add'>+		.init_periph = t2080_init_periph,</div><div class='add'>+		.cmux_groups = {</div><div class='add'>+			&amp;t1040_cmux</div><div class='add'>+		},</div><div class='add'>+		.hwaccel = {</div><div class='add'>+			&amp;ls1046a_hwa1, &amp;ls1046a_hwa2</div><div class='add'>+		},</div><div class='add'>+		.cmux_to_group = {</div><div class='add'>+			0, -1</div><div class='add'>+		},</div><div class='add'>+		.pll_mask = 0x07,</div><div class='add'>+		.flags = CG_PLL_8BIT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compat = "fsl,ls1012a-clockgen",</div><div class='add'>+		.cmux_groups = {</div><div class='add'>+			&amp;ls1012a_cmux</div><div class='add'>+		},</div><div class='add'>+		.cmux_to_group = {</div><div class='add'>+			0, -1</div><div class='add'>+		},</div><div class='add'>+		.pll_mask = 0x03,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.compat = "fsl,ls2080a-clockgen",</div><div class='ctx'> 		.cmux_groups = {</div><div class='ctx'> 			&amp;clockgen2_cmux_cga12, &amp;clockgen2_cmux_cgb</div><div class='hunk'>@@ -1273,8 +1331,10 @@ err:</div><div class='ctx'> </div><div class='ctx'> CLK_OF_DECLARE(qoriq_clockgen_1, "fsl,qoriq-clockgen-1.0", clockgen_init);</div><div class='ctx'> CLK_OF_DECLARE(qoriq_clockgen_2, "fsl,qoriq-clockgen-2.0", clockgen_init);</div><div class='add'>+CLK_OF_DECLARE(qoriq_clockgen_ls1012a, "fsl,ls1012a-clockgen", clockgen_init);</div><div class='ctx'> CLK_OF_DECLARE(qoriq_clockgen_ls1021a, "fsl,ls1021a-clockgen", clockgen_init);</div><div class='ctx'> CLK_OF_DECLARE(qoriq_clockgen_ls1043a, "fsl,ls1043a-clockgen", clockgen_init);</div><div class='add'>+CLK_OF_DECLARE(qoriq_clockgen_ls1046a, "fsl,ls1046a-clockgen", clockgen_init);</div><div class='ctx'> CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen", clockgen_init);</div><div class='ctx'> </div><div class='ctx'> /* Legacy nodes */</div><div class='head'>diff --git a/drivers/clk/clk-scpi.c b/drivers/clk/clk-scpi.c<br/>index 2a3e9d8e88b0..96d37175d0ad 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/clk-scpi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/clk-scpi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clk-scpi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-scpi.c</a></div><div class='hunk'>@@ -290,13 +290,15 @@ static int scpi_clocks_probe(struct platform_device *pdev)</div><div class='ctx'> 			of_node_put(child);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	/* Add the virtual cpufreq device */</div><div class='del'>-	cpufreq_dev = platform_device_register_simple("scpi-cpufreq",</div><div class='del'>-						      -1, NULL, 0);</div><div class='del'>-	if (IS_ERR(cpufreq_dev))</div><div class='del'>-		pr_warn("unable to register cpufreq device");</div><div class='ctx'> </div><div class='add'>+		if (match-&gt;data != &amp;scpi_dvfs_ops)</div><div class='add'>+			continue;</div><div class='add'>+		/* Add the virtual cpufreq device if it's DVFS clock provider */</div><div class='add'>+		cpufreq_dev = platform_device_register_simple("scpi-cpufreq",</div><div class='add'>+							      -1, NULL, 0);</div><div class='add'>+		if (IS_ERR(cpufreq_dev))</div><div class='add'>+			pr_warn("unable to register cpufreq device");</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c<br/>index 02d681008401..ab609a76706f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/clk-stm32f4.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/clk-stm32f4.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clk-stm32f4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-stm32f4.c</a></div><div class='hunk'>@@ -19,11 +19,23 @@</div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/mfd/syscon.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Include list of clocks wich are not derived from system clock (SYSCLOCK)</div><div class='add'>+ * The index of these clocks is the secondary index of DT bindings</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;dt-bindings/clock/stm32fx-clock.h&gt;</div><div class='add'>+</div><div class='add'>+#define STM32F4_RCC_CR			0x00</div><div class='ctx'> #define STM32F4_RCC_PLLCFGR		0x04</div><div class='ctx'> #define STM32F4_RCC_CFGR		0x08</div><div class='ctx'> #define STM32F4_RCC_AHB1ENR		0x30</div><div class='hunk'>@@ -31,6 +43,17 @@</div><div class='ctx'> #define STM32F4_RCC_AHB3ENR		0x38</div><div class='ctx'> #define STM32F4_RCC_APB1ENR		0x40</div><div class='ctx'> #define STM32F4_RCC_APB2ENR		0x44</div><div class='add'>+#define STM32F4_RCC_BDCR		0x70</div><div class='add'>+#define STM32F4_RCC_CSR			0x74</div><div class='add'>+#define STM32F4_RCC_PLLI2SCFGR		0x84</div><div class='add'>+#define STM32F4_RCC_PLLSAICFGR		0x88</div><div class='add'>+#define STM32F4_RCC_DCKCFGR		0x8c</div><div class='add'>+#define STM32F7_RCC_DCKCFGR2		0x90</div><div class='add'>+</div><div class='add'>+#define NONE -1</div><div class='add'>+#define NO_IDX  NONE</div><div class='add'>+#define NO_MUX  NONE</div><div class='add'>+#define NO_GATE NONE</div><div class='ctx'> </div><div class='ctx'> struct stm32f4_gate_data {</div><div class='ctx'> 	u8	offset;</div><div class='hunk'>@@ -40,7 +63,7 @@ struct stm32f4_gate_data {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct stm32f4_gate_data stm32f4_gates[] __initconst = {</div><div class='add'>+static const struct stm32f4_gate_data stm32f429_gates[] __initconst = {</div><div class='ctx'> 	{ STM32F4_RCC_AHB1ENR,  0,	"gpioa",	"ahb_div" },</div><div class='ctx'> 	{ STM32F4_RCC_AHB1ENR,  1,	"gpiob",	"ahb_div" },</div><div class='ctx'> 	{ STM32F4_RCC_AHB1ENR,  2,	"gpioc",	"ahb_div" },</div><div class='hunk'>@@ -120,26 +143,191 @@ static const struct stm32f4_gate_data stm32f4_gates[] __initconst = {</div><div class='ctx'> 	{ STM32F4_RCC_APB2ENR, 26,	"ltdc",		"apb2_div" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * MAX_CLKS is the maximum value in the enumeration below plus the combined</div><div class='del'>- * hweight of stm32f42xx_gate_map (plus one).</div><div class='del'>- */</div><div class='del'>-#define MAX_CLKS 74</div><div class='add'>+static const struct stm32f4_gate_data stm32f469_gates[] __initconst = {</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  0,	"gpioa",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  1,	"gpiob",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  2,	"gpioc",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  3,	"gpiod",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  4,	"gpioe",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  5,	"gpiof",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  6,	"gpiog",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  7,	"gpioh",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  8,	"gpioi",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  9,	"gpioj",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 10,	"gpiok",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 12,	"crc",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 18,	"bkpsra",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 20,	"ccmdatam",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 21,	"dma1",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 22,	"dma2",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 23,	"dma2d",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 25,	"ethmac",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 26,	"ethmactx",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 27,	"ethmacrx",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 28,	"ethmacptp",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 29,	"otghs",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 30,	"otghsulpi",	"ahb_div" },</div><div class='add'>+</div><div class='add'>+	{ STM32F4_RCC_AHB2ENR,  0,	"dcmi",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB2ENR,  4,	"cryp",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB2ENR,  5,	"hash",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB2ENR,  6,	"rng",		"pll48" },</div><div class='add'>+	{ STM32F4_RCC_AHB2ENR,  7,	"otgfs",	"pll48" },</div><div class='add'>+</div><div class='add'>+	{ STM32F4_RCC_AHB3ENR,  0,	"fmc",		"ahb_div",</div><div class='add'>+		CLK_IGNORE_UNUSED },</div><div class='add'>+	{ STM32F4_RCC_AHB3ENR,  1,	"qspi",		"ahb_div",</div><div class='add'>+		CLK_IGNORE_UNUSED },</div><div class='add'>+</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  0,	"tim2",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  1,	"tim3",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  2,	"tim4",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  3,	"tim5",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  4,	"tim6",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  5,	"tim7",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  6,	"tim12",	"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  7,	"tim13",	"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  8,	"tim14",	"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 11,	"wwdg",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 14,	"spi2",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 15,	"spi3",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 17,	"uart2",	"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 18,	"uart3",	"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 19,	"uart4",	"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 20,	"uart5",	"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 21,	"i2c1",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 22,	"i2c2",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 23,	"i2c3",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 25,	"can1",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 26,	"can2",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 28,	"pwr",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 29,	"dac",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 30,	"uart7",	"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 31,	"uart8",	"apb1_div" },</div><div class='add'>+</div><div class='add'>+	{ STM32F4_RCC_APB2ENR,  0,	"tim1",		"apb2_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR,  1,	"tim8",		"apb2_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR,  4,	"usart1",	"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR,  5,	"usart6",	"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR,  8,	"adc1",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR,  9,	"adc2",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 10,	"adc3",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 11,	"sdio",		"sdmux" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 12,	"spi1",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 13,	"spi4",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 14,	"syscfg",	"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 16,	"tim9",		"apb2_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 17,	"tim10",	"apb2_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 18,	"tim11",	"apb2_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 20,	"spi5",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 21,	"spi6",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 22,	"sai1",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 26,	"ltdc",		"apb2_div" },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct stm32f4_gate_data stm32f746_gates[] __initconst = {</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  0,	"gpioa",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  1,	"gpiob",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  2,	"gpioc",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  3,	"gpiod",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  4,	"gpioe",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  5,	"gpiof",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  6,	"gpiog",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  7,	"gpioh",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  8,	"gpioi",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR,  9,	"gpioj",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 10,	"gpiok",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 12,	"crc",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 18,	"bkpsra",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 20,	"dtcmram",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 21,	"dma1",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 22,	"dma2",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 23,	"dma2d",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 25,	"ethmac",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 26,	"ethmactx",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 27,	"ethmacrx",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 28,	"ethmacptp",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 29,	"otghs",	"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB1ENR, 30,	"otghsulpi",	"ahb_div" },</div><div class='add'>+</div><div class='add'>+	{ STM32F4_RCC_AHB2ENR,  0,	"dcmi",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB2ENR,  4,	"cryp",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB2ENR,  5,	"hash",		"ahb_div" },</div><div class='add'>+	{ STM32F4_RCC_AHB2ENR,  6,	"rng",		"pll48"   },</div><div class='add'>+	{ STM32F4_RCC_AHB2ENR,  7,	"otgfs",	"pll48"   },</div><div class='ctx'> </div><div class='del'>-enum { SYSTICK, FCLK };</div><div class='add'>+	{ STM32F4_RCC_AHB3ENR,  0,	"fmc",		"ahb_div",</div><div class='add'>+		CLK_IGNORE_UNUSED },</div><div class='add'>+	{ STM32F4_RCC_AHB3ENR,  1,	"qspi",		"ahb_div",</div><div class='add'>+		CLK_IGNORE_UNUSED },</div><div class='add'>+</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  0,	"tim2",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  1,	"tim3",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  2,	"tim4",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  3,	"tim5",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  4,	"tim6",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  5,	"tim7",		"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  6,	"tim12",	"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  7,	"tim13",	"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR,  8,	"tim14",	"apb1_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 11,	"wwdg",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 14,	"spi2",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 15,	"spi3",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 16,	"spdifrx",	"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 25,	"can1",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 26,	"can2",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 27,	"cec",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 28,	"pwr",		"apb1_div" },</div><div class='add'>+	{ STM32F4_RCC_APB1ENR, 29,	"dac",		"apb1_div" },</div><div class='add'>+</div><div class='add'>+	{ STM32F4_RCC_APB2ENR,  0,	"tim1",		"apb2_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR,  1,	"tim8",		"apb2_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR,  8,	"adc1",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR,  9,	"adc2",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 10,	"adc3",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 11,	"sdmmc",	"sdmux"    },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 12,	"spi1",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 13,	"spi4",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 14,	"syscfg",	"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 16,	"tim9",		"apb2_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 17,	"tim10",	"apb2_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 18,	"tim11",	"apb2_mul" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 20,	"spi5",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 21,	"spi6",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 22,	"sai1",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 23,	"sai2",		"apb2_div" },</div><div class='add'>+	{ STM32F4_RCC_APB2ENR, 26,	"ltdc",		"apb2_div" },</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This bitmask tells us which bit offsets (0..192) on STM32F4[23]xxx</div><div class='ctx'>  * have gate bits associated with them. Its combined hweight is 71.</div><div class='ctx'>  */</div><div class='del'>-static const u64 stm32f42xx_gate_map[] = { 0x000000f17ef417ffull,</div><div class='del'>-					   0x0000000000000001ull,</div><div class='del'>-					   0x04777f33f6fec9ffull };</div><div class='add'>+#define MAX_GATE_MAP 3</div><div class='add'>+</div><div class='add'>+static const u64 stm32f42xx_gate_map[MAX_GATE_MAP] = { 0x000000f17ef417ffull,</div><div class='add'>+						       0x0000000000000001ull,</div><div class='add'>+						       0x04777f33f6fec9ffull };</div><div class='add'>+</div><div class='add'>+static const u64 stm32f46xx_gate_map[MAX_GATE_MAP] = { 0x000000f17ef417ffull,</div><div class='add'>+						       0x0000000000000003ull,</div><div class='add'>+						       0x0c777f33f6fec9ffull };</div><div class='add'>+</div><div class='add'>+static const u64 stm32f746_gate_map[MAX_GATE_MAP] = { 0x000000f17ef417ffull,</div><div class='add'>+						      0x0000000000000003ull,</div><div class='add'>+						      0x04f77f033e01c9ffull };</div><div class='add'>+</div><div class='add'>+static const u64 *stm32f4_gate_map;</div><div class='add'>+</div><div class='add'>+static struct clk_hw **clks;</div><div class='ctx'> </div><div class='del'>-static struct clk_hw *clks[MAX_CLKS];</div><div class='ctx'> static DEFINE_SPINLOCK(stm32f4_clk_lock);</div><div class='ctx'> static void __iomem *base;</div><div class='ctx'> </div><div class='add'>+static struct regmap *pdrm;</div><div class='add'>+</div><div class='add'>+static int stm32fx_end_primary_clk;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * "Multiplier" device for APBx clocks.</div><div class='ctx'>  *</div><div class='hunk'>@@ -231,23 +419,342 @@ static struct clk *clk_register_apb_mul(struct device *dev, const char *name,</div><div class='ctx'> 	return clk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Decode current PLL state and (statically) model the state we inherit from</div><div class='del'>- * the bootloader.</div><div class='del'>- */</div><div class='del'>-static void stm32f4_rcc_register_pll(const char *hse_clk, const char *hsi_clk)</div><div class='add'>+enum {</div><div class='add'>+	PLL,</div><div class='add'>+	PLL_I2S,</div><div class='add'>+	PLL_SAI,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_div_table pll_divp_table[] = {</div><div class='add'>+	{ 0, 2 }, { 1, 4 }, { 2, 6 }, { 3, 8 }, { 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_div_table pll_divr_table[] = {</div><div class='add'>+	{ 2, 2 }, { 3, 3 }, { 4, 4 }, { 5, 5 }, { 6, 6 }, { 7, 7 }, { 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct stm32f4_pll {</div><div class='add'>+	spinlock_t *lock;</div><div class='add'>+	struct	clk_gate gate;</div><div class='add'>+	u8 offset;</div><div class='add'>+	u8 bit_rdy_idx;</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 n_start;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_stm32f4_pll(_gate) container_of(_gate, struct stm32f4_pll, gate)</div><div class='add'>+</div><div class='add'>+struct stm32f4_pll_post_div_data {</div><div class='add'>+	int idx;</div><div class='add'>+	u8 pll_num;</div><div class='add'>+	const char *name;</div><div class='add'>+	const char *parent;</div><div class='add'>+	u8 flag;</div><div class='add'>+	u8 offset;</div><div class='add'>+	u8 shift;</div><div class='add'>+	u8 width;</div><div class='add'>+	u8 flag_div;</div><div class='add'>+	const struct clk_div_table *div_table;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct stm32f4_vco_data {</div><div class='add'>+	const char *vco_name;</div><div class='add'>+	u8 offset;</div><div class='add'>+	u8 bit_idx;</div><div class='add'>+	u8 bit_rdy_idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct stm32f4_vco_data  vco_data[] = {</div><div class='add'>+	{ "vco",     STM32F4_RCC_PLLCFGR,    24, 25 },</div><div class='add'>+	{ "vco-i2s", STM32F4_RCC_PLLI2SCFGR, 26, 27 },</div><div class='add'>+	{ "vco-sai", STM32F4_RCC_PLLSAICFGR, 28, 29 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct clk_div_table post_divr_table[] = {</div><div class='add'>+	{ 0, 2 }, { 1, 4 }, { 2, 8 }, { 3, 16 }, { 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MAX_POST_DIV 3</div><div class='add'>+static const struct stm32f4_pll_post_div_data  post_div_data[MAX_POST_DIV] = {</div><div class='add'>+	{ CLK_I2SQ_PDIV, PLL_I2S, "plli2s-q-div", "plli2s-q",</div><div class='add'>+		CLK_SET_RATE_PARENT, STM32F4_RCC_DCKCFGR, 0, 5, 0, NULL},</div><div class='add'>+</div><div class='add'>+	{ CLK_SAIQ_PDIV, PLL_SAI, "pllsai-q-div", "pllsai-q",</div><div class='add'>+		CLK_SET_RATE_PARENT, STM32F4_RCC_DCKCFGR, 8, 5, 0, NULL },</div><div class='add'>+</div><div class='add'>+	{ NO_IDX, PLL_SAI, "pllsai-r-div", "pllsai-r", CLK_SET_RATE_PARENT,</div><div class='add'>+		STM32F4_RCC_DCKCFGR, 16, 2, 0, post_divr_table },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct stm32f4_div_data {</div><div class='add'>+	u8 shift;</div><div class='add'>+	u8 width;</div><div class='add'>+	u8 flag_div;</div><div class='add'>+	const struct clk_div_table *div_table;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MAX_PLL_DIV 3</div><div class='add'>+static const struct stm32f4_div_data  div_data[MAX_PLL_DIV] = {</div><div class='add'>+	{ 16, 2, 0,			pll_divp_table	},</div><div class='add'>+	{ 24, 4, CLK_DIVIDER_ONE_BASED, NULL		},</div><div class='add'>+	{ 28, 3, 0,			pll_divr_table	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct stm32f4_pll_data {</div><div class='add'>+	u8 pll_num;</div><div class='add'>+	u8 n_start;</div><div class='add'>+	const char *div_name[MAX_PLL_DIV];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct stm32f4_pll_data stm32f429_pll[MAX_PLL_DIV] = {</div><div class='add'>+	{ PLL,	   192, { "pll", "pll48",    NULL	} },</div><div class='add'>+	{ PLL_I2S, 192, { NULL,  "plli2s-q", "plli2s-r" } },</div><div class='add'>+	{ PLL_SAI,  49, { NULL,  "pllsai-q", "pllsai-r" } },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct stm32f4_pll_data stm32f469_pll[MAX_PLL_DIV] = {</div><div class='add'>+	{ PLL,	   50, { "pll",	     "pll-q",    NULL	    } },</div><div class='add'>+	{ PLL_I2S, 50, { "plli2s-p", "plli2s-q", "plli2s-r" } },</div><div class='add'>+	{ PLL_SAI, 50, { "pllsai-p", "pllsai-q", "pllsai-r" } },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stm32f4_pll_is_enabled(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	return clk_gate_ops.is_enabled(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32f4_pll_enable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct clk_gate *gate = to_clk_gate(hw);</div><div class='add'>+	struct stm32f4_pll *pll = to_stm32f4_pll(gate);</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	ret = clk_gate_ops.enable(hw);</div><div class='add'>+</div><div class='add'>+	ret = readl_relaxed_poll_timeout_atomic(base + STM32F4_RCC_CR, reg,</div><div class='add'>+			reg &amp; (1 &lt;&lt; pll-&gt;bit_rdy_idx), 0, 10000);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stm32f4_pll_disable(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	unsigned long pllcfgr = readl(base + STM32F4_RCC_PLLCFGR);</div><div class='add'>+	clk_gate_ops.disable(hw);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	unsigned long pllm   = pllcfgr &amp; 0x3f;</div><div class='del'>-	unsigned long plln   = (pllcfgr &gt;&gt; 6) &amp; 0x1ff;</div><div class='del'>-	unsigned long pllp   = BIT(((pllcfgr &gt;&gt; 16) &amp; 3) + 1);</div><div class='del'>-	const char   *pllsrc = pllcfgr &amp; BIT(22) ? hse_clk : hsi_clk;</div><div class='del'>-	unsigned long pllq   = (pllcfgr &gt;&gt; 24) &amp; 0xf;</div><div class='add'>+static unsigned long stm32f4_pll_recalc(struct clk_hw *hw,</div><div class='add'>+		unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_gate *gate = to_clk_gate(hw);</div><div class='add'>+	struct stm32f4_pll *pll = to_stm32f4_pll(gate);</div><div class='add'>+	unsigned long n;</div><div class='ctx'> </div><div class='del'>-	clk_register_fixed_factor(NULL, "vco", pllsrc, 0, plln, pllm);</div><div class='del'>-	clk_register_fixed_factor(NULL, "pll", "vco", 0, 1, pllp);</div><div class='del'>-	clk_register_fixed_factor(NULL, "pll48", "vco", 0, 1, pllq);</div><div class='add'>+	n = (readl(base + pll-&gt;offset) &gt;&gt; 6) &amp; 0x1ff;</div><div class='add'>+</div><div class='add'>+	return parent_rate * n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long stm32f4_pll_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+		unsigned long *prate)</div><div class='add'>+{</div><div class='add'>+	struct clk_gate *gate = to_clk_gate(hw);</div><div class='add'>+	struct stm32f4_pll *pll = to_stm32f4_pll(gate);</div><div class='add'>+	unsigned long n;</div><div class='add'>+</div><div class='add'>+	n = rate / *prate;</div><div class='add'>+</div><div class='add'>+	if (n &lt; pll-&gt;n_start)</div><div class='add'>+		n = pll-&gt;n_start;</div><div class='add'>+	else if (n &gt; 432)</div><div class='add'>+		n = 432;</div><div class='add'>+</div><div class='add'>+	return *prate * n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32f4_pll_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_gate *gate = to_clk_gate(hw);</div><div class='add'>+	struct stm32f4_pll *pll = to_stm32f4_pll(gate);</div><div class='add'>+</div><div class='add'>+	unsigned long n;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int pll_state;</div><div class='add'>+</div><div class='add'>+	pll_state = stm32f4_pll_is_enabled(hw);</div><div class='add'>+</div><div class='add'>+	if (pll_state)</div><div class='add'>+		stm32f4_pll_disable(hw);</div><div class='add'>+</div><div class='add'>+	n = rate  / parent_rate;</div><div class='add'>+</div><div class='add'>+	val = readl(base + pll-&gt;offset) &amp; ~(0x1ff &lt;&lt; 6);</div><div class='add'>+</div><div class='add'>+	writel(val | ((n &amp; 0x1ff) &lt;&lt;  6), base + pll-&gt;offset);</div><div class='add'>+</div><div class='add'>+	if (pll_state)</div><div class='add'>+		stm32f4_pll_enable(hw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops stm32f4_pll_gate_ops = {</div><div class='add'>+	.enable		= stm32f4_pll_enable,</div><div class='add'>+	.disable	= stm32f4_pll_disable,</div><div class='add'>+	.is_enabled	= stm32f4_pll_is_enabled,</div><div class='add'>+	.recalc_rate	= stm32f4_pll_recalc,</div><div class='add'>+	.round_rate	= stm32f4_pll_round_rate,</div><div class='add'>+	.set_rate	= stm32f4_pll_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct stm32f4_pll_div {</div><div class='add'>+	struct clk_divider div;</div><div class='add'>+	struct clk_hw *hw_pll;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_pll_div_clk(_div) container_of(_div, struct stm32f4_pll_div, div)</div><div class='add'>+</div><div class='add'>+static unsigned long stm32f4_pll_div_recalc_rate(struct clk_hw *hw,</div><div class='add'>+		unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	return clk_divider_ops.recalc_rate(hw, parent_rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long stm32f4_pll_div_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				unsigned long *prate)</div><div class='add'>+{</div><div class='add'>+	return clk_divider_ops.round_rate(hw, rate, prate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stm32f4_pll_div_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	int pll_state, ret;</div><div class='add'>+</div><div class='add'>+	struct clk_divider *div = to_clk_divider(hw);</div><div class='add'>+	struct stm32f4_pll_div *pll_div = to_pll_div_clk(div);</div><div class='add'>+</div><div class='add'>+	pll_state = stm32f4_pll_is_enabled(pll_div-&gt;hw_pll);</div><div class='add'>+</div><div class='add'>+	if (pll_state)</div><div class='add'>+		stm32f4_pll_disable(pll_div-&gt;hw_pll);</div><div class='add'>+</div><div class='add'>+	ret = clk_divider_ops.set_rate(hw, rate, parent_rate);</div><div class='add'>+</div><div class='add'>+	if (pll_state)</div><div class='add'>+		stm32f4_pll_enable(pll_div-&gt;hw_pll);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops stm32f4_pll_div_ops = {</div><div class='add'>+	.recalc_rate = stm32f4_pll_div_recalc_rate,</div><div class='add'>+	.round_rate = stm32f4_pll_div_round_rate,</div><div class='add'>+	.set_rate = stm32f4_pll_div_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw *clk_register_pll_div(const char *name,</div><div class='add'>+		const char *parent_name, unsigned long flags,</div><div class='add'>+		void __iomem *reg, u8 shift, u8 width,</div><div class='add'>+		u8 clk_divider_flags, const struct clk_div_table *table,</div><div class='add'>+		struct clk_hw *pll_hw, spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	struct stm32f4_pll_div *pll_div;</div><div class='add'>+	struct clk_hw *hw;</div><div class='add'>+	struct clk_init_data init;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* allocate the divider */</div><div class='add'>+	pll_div = kzalloc(sizeof(*pll_div), GFP_KERNEL);</div><div class='add'>+	if (!pll_div)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	init.name = name;</div><div class='add'>+	init.ops = &amp;stm32f4_pll_div_ops;</div><div class='add'>+	init.flags = flags;</div><div class='add'>+	init.parent_names = (parent_name ? &amp;parent_name : NULL);</div><div class='add'>+	init.num_parents = (parent_name ? 1 : 0);</div><div class='add'>+</div><div class='add'>+	/* struct clk_divider assignments */</div><div class='add'>+	pll_div-&gt;div.reg = reg;</div><div class='add'>+	pll_div-&gt;div.shift = shift;</div><div class='add'>+	pll_div-&gt;div.width = width;</div><div class='add'>+	pll_div-&gt;div.flags = clk_divider_flags;</div><div class='add'>+	pll_div-&gt;div.lock = lock;</div><div class='add'>+	pll_div-&gt;div.table = table;</div><div class='add'>+	pll_div-&gt;div.hw.init = &amp;init;</div><div class='add'>+</div><div class='add'>+	pll_div-&gt;hw_pll = pll_hw;</div><div class='add'>+</div><div class='add'>+	/* register the clock */</div><div class='add'>+	hw = &amp;pll_div-&gt;div.hw;</div><div class='add'>+	ret = clk_hw_register(NULL, hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(pll_div);</div><div class='add'>+		hw = ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk_hw *stm32f4_rcc_register_pll(const char *pllsrc,</div><div class='add'>+		const struct stm32f4_pll_data *data,  spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	struct stm32f4_pll *pll;</div><div class='add'>+	struct clk_init_data init = { NULL };</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+	struct clk_hw *pll_hw;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+	const struct stm32f4_vco_data *vco;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	pll = kzalloc(sizeof(*pll), GFP_KERNEL);</div><div class='add'>+	if (!pll)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	vco = &amp;vco_data[data-&gt;pll_num];</div><div class='add'>+</div><div class='add'>+	init.name = vco-&gt;vco_name;</div><div class='add'>+	init.ops = &amp;stm32f4_pll_gate_ops;</div><div class='add'>+	init.flags = CLK_SET_RATE_GATE;</div><div class='add'>+	init.parent_names = &amp;pllsrc;</div><div class='add'>+	init.num_parents = 1;</div><div class='add'>+</div><div class='add'>+	pll-&gt;gate.lock = lock;</div><div class='add'>+	pll-&gt;gate.reg = base + STM32F4_RCC_CR;</div><div class='add'>+	pll-&gt;gate.bit_idx = vco-&gt;bit_idx;</div><div class='add'>+	pll-&gt;gate.hw.init = &amp;init;</div><div class='add'>+</div><div class='add'>+	pll-&gt;offset = vco-&gt;offset;</div><div class='add'>+	pll-&gt;n_start = data-&gt;n_start;</div><div class='add'>+	pll-&gt;bit_rdy_idx = vco-&gt;bit_rdy_idx;</div><div class='add'>+	pll-&gt;status = (readl(base + STM32F4_RCC_CR) &gt;&gt; vco-&gt;bit_idx) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	reg = base + pll-&gt;offset;</div><div class='add'>+</div><div class='add'>+	pll_hw = &amp;pll-&gt;gate.hw;</div><div class='add'>+	ret = clk_hw_register(NULL, pll_hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(pll);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_PLL_DIV; i++)</div><div class='add'>+		if (data-&gt;div_name[i])</div><div class='add'>+			clk_register_pll_div(data-&gt;div_name[i],</div><div class='add'>+					vco-&gt;vco_name,</div><div class='add'>+					0,</div><div class='add'>+					reg,</div><div class='add'>+					div_data[i].shift,</div><div class='add'>+					div_data[i].width,</div><div class='add'>+					div_data[i].flag_div,</div><div class='add'>+					div_data[i].div_table,</div><div class='add'>+					pll_hw,</div><div class='add'>+					lock);</div><div class='add'>+	return pll_hw;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -256,15 +763,15 @@ static void stm32f4_rcc_register_pll(const char *hse_clk, const char *hsi_clk)</div><div class='ctx'>  */</div><div class='ctx'> static int stm32f4_rcc_lookup_clk_idx(u8 primary, u8 secondary)</div><div class='ctx'> {</div><div class='del'>-	u64 table[ARRAY_SIZE(stm32f42xx_gate_map)];</div><div class='add'>+	u64 table[MAX_GATE_MAP];</div><div class='ctx'> </div><div class='ctx'> 	if (primary == 1) {</div><div class='del'>-		if (WARN_ON(secondary &gt; FCLK))</div><div class='add'>+		if (WARN_ON(secondary &gt;= stm32fx_end_primary_clk))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		return secondary;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(table, stm32f42xx_gate_map, sizeof(table));</div><div class='add'>+	memcpy(table, stm32f4_gate_map, sizeof(table));</div><div class='ctx'> </div><div class='ctx'> 	/* only bits set in table can be used as indices */</div><div class='ctx'> 	if (WARN_ON(secondary &gt;= BITS_PER_BYTE * sizeof(table) ||</div><div class='hunk'>@@ -276,7 +783,7 @@ static int stm32f4_rcc_lookup_clk_idx(u8 primary, u8 secondary)</div><div class='ctx'> 	table[BIT_ULL_WORD(secondary)] &amp;=</div><div class='ctx'> 	    GENMASK_ULL(secondary % BITS_PER_LONG_LONG, 0);</div><div class='ctx'> </div><div class='del'>-	return FCLK + hweight64(table[0]) +</div><div class='add'>+	return stm32fx_end_primary_clk - 1 + hweight64(table[0]) +</div><div class='ctx'> 	       (BIT_ULL_WORD(secondary) &gt;= 1 ? hweight64(table[1]) : 0) +</div><div class='ctx'> 	       (BIT_ULL_WORD(secondary) &gt;= 2 ? hweight64(table[2]) : 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -292,6 +799,212 @@ stm32f4_rcc_lookup_clk(struct of_phandle_args *clkspec, void *data)</div><div class='ctx'> 	return clks[i];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define to_rgclk(_rgate) container_of(_rgate, struct stm32_rgate, gate)</div><div class='add'>+</div><div class='add'>+static inline void disable_power_domain_write_protection(void)</div><div class='add'>+{</div><div class='add'>+	if (pdrm)</div><div class='add'>+		regmap_update_bits(pdrm, 0x00, (1 &lt;&lt; 8), (1 &lt;&lt; 8));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enable_power_domain_write_protection(void)</div><div class='add'>+{</div><div class='add'>+	if (pdrm)</div><div class='add'>+		regmap_update_bits(pdrm, 0x00, (1 &lt;&lt; 8), (0 &lt;&lt; 8));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void sofware_reset_backup_domain(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	val = readl(base + STM32F4_RCC_BDCR);</div><div class='add'>+	writel(val | BIT(16), base + STM32F4_RCC_BDCR);</div><div class='add'>+	writel(val &amp; ~BIT(16), base + STM32F4_RCC_BDCR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct stm32_rgate {</div><div class='add'>+	struct	clk_gate gate;</div><div class='add'>+	u8	bit_rdy_idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RTC_TIMEOUT 1000000</div><div class='add'>+</div><div class='add'>+static int rgclk_enable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct clk_gate *gate = to_clk_gate(hw);</div><div class='add'>+	struct stm32_rgate *rgate = to_rgclk(gate);</div><div class='add'>+	u32 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	disable_power_domain_write_protection();</div><div class='add'>+</div><div class='add'>+	clk_gate_ops.enable(hw);</div><div class='add'>+</div><div class='add'>+	ret = readl_relaxed_poll_timeout_atomic(gate-&gt;reg, reg,</div><div class='add'>+			reg &amp; rgate-&gt;bit_rdy_idx, 1000, RTC_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	enable_power_domain_write_protection();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rgclk_disable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	clk_gate_ops.disable(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rgclk_is_enabled(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	return clk_gate_ops.is_enabled(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops rgclk_ops = {</div><div class='add'>+	.enable = rgclk_enable,</div><div class='add'>+	.disable = rgclk_disable,</div><div class='add'>+	.is_enabled = rgclk_is_enabled,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw *clk_register_rgate(struct device *dev, const char *name,</div><div class='add'>+		const char *parent_name, unsigned long flags,</div><div class='add'>+		void __iomem *reg, u8 bit_idx, u8 bit_rdy_idx,</div><div class='add'>+		u8 clk_gate_flags, spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	struct stm32_rgate *rgate;</div><div class='add'>+	struct clk_init_data init = { NULL };</div><div class='add'>+	struct clk_hw *hw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rgate = kzalloc(sizeof(*rgate), GFP_KERNEL);</div><div class='add'>+	if (!rgate)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	init.name = name;</div><div class='add'>+	init.ops = &amp;rgclk_ops;</div><div class='add'>+	init.flags = flags;</div><div class='add'>+	init.parent_names = &amp;parent_name;</div><div class='add'>+	init.num_parents = 1;</div><div class='add'>+</div><div class='add'>+	rgate-&gt;bit_rdy_idx = bit_rdy_idx;</div><div class='add'>+</div><div class='add'>+	rgate-&gt;gate.lock = lock;</div><div class='add'>+	rgate-&gt;gate.reg = reg;</div><div class='add'>+	rgate-&gt;gate.bit_idx = bit_idx;</div><div class='add'>+	rgate-&gt;gate.hw.init = &amp;init;</div><div class='add'>+</div><div class='add'>+	hw = &amp;rgate-&gt;gate.hw;</div><div class='add'>+	ret = clk_hw_register(dev, hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(rgate);</div><div class='add'>+		hw = ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cclk_gate_enable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	disable_power_domain_write_protection();</div><div class='add'>+</div><div class='add'>+	ret = clk_gate_ops.enable(hw);</div><div class='add'>+</div><div class='add'>+	enable_power_domain_write_protection();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cclk_gate_disable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	disable_power_domain_write_protection();</div><div class='add'>+</div><div class='add'>+	clk_gate_ops.disable(hw);</div><div class='add'>+</div><div class='add'>+	enable_power_domain_write_protection();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cclk_gate_is_enabled(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	return clk_gate_ops.is_enabled(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops cclk_gate_ops = {</div><div class='add'>+	.enable		= cclk_gate_enable,</div><div class='add'>+	.disable	= cclk_gate_disable,</div><div class='add'>+	.is_enabled	= cclk_gate_is_enabled,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 cclk_mux_get_parent(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	return clk_mux_ops.get_parent(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cclk_mux_set_parent(struct clk_hw *hw, u8 index)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	disable_power_domain_write_protection();</div><div class='add'>+</div><div class='add'>+	sofware_reset_backup_domain();</div><div class='add'>+</div><div class='add'>+	ret = clk_mux_ops.set_parent(hw, index);</div><div class='add'>+</div><div class='add'>+	enable_power_domain_write_protection();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops cclk_mux_ops = {</div><div class='add'>+	.get_parent = cclk_mux_get_parent,</div><div class='add'>+	.set_parent = cclk_mux_set_parent,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw *stm32_register_cclk(struct device *dev, const char *name,</div><div class='add'>+		const char * const *parent_names, int num_parents,</div><div class='add'>+		void __iomem *reg, u8 bit_idx, u8 shift, unsigned long flags,</div><div class='add'>+		spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	struct clk_hw *hw;</div><div class='add'>+	struct clk_gate *gate;</div><div class='add'>+	struct clk_mux *mux;</div><div class='add'>+</div><div class='add'>+	gate = kzalloc(sizeof(*gate), GFP_KERNEL);</div><div class='add'>+	if (!gate) {</div><div class='add'>+		hw = ERR_PTR(-EINVAL);</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mux = kzalloc(sizeof(*mux), GFP_KERNEL);</div><div class='add'>+	if (!mux) {</div><div class='add'>+		kfree(gate);</div><div class='add'>+		hw = ERR_PTR(-EINVAL);</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gate-&gt;reg = reg;</div><div class='add'>+	gate-&gt;bit_idx = bit_idx;</div><div class='add'>+	gate-&gt;flags = 0;</div><div class='add'>+	gate-&gt;lock = lock;</div><div class='add'>+</div><div class='add'>+	mux-&gt;reg = reg;</div><div class='add'>+	mux-&gt;shift = shift;</div><div class='add'>+	mux-&gt;mask = 3;</div><div class='add'>+	mux-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+	hw = clk_hw_register_composite(dev, name, parent_names, num_parents,</div><div class='add'>+			&amp;mux-&gt;hw, &amp;cclk_mux_ops,</div><div class='add'>+			NULL, NULL,</div><div class='add'>+			&amp;gate-&gt;hw, &amp;cclk_gate_ops,</div><div class='add'>+			flags);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(hw)) {</div><div class='add'>+		kfree(gate);</div><div class='add'>+		kfree(mux);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	return hw;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const char *sys_parents[] __initdata =   { "hsi", NULL, "pll" };</div><div class='ctx'> </div><div class='ctx'> static const struct clk_div_table ahb_div_table[] = {</div><div class='hunk'>@@ -308,10 +1021,384 @@ static const struct clk_div_table apb_div_table[] = {</div><div class='ctx'> 	{ 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const char *rtc_parents[4] = {</div><div class='add'>+	"no-clock", "lse", "lsi", "hse-rtc"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *lcd_parent[1] = { "pllsai-r-div" };</div><div class='add'>+</div><div class='add'>+static const char *i2s_parents[2] = { "plli2s-r", NULL };</div><div class='add'>+</div><div class='add'>+static const char *sai_parents[4] = { "pllsai-q-div", "plli2s-q-div", NULL,</div><div class='add'>+	"no-clock" };</div><div class='add'>+</div><div class='add'>+static const char *pll48_parents[2] = { "pll-q", "pllsai-p" };</div><div class='add'>+</div><div class='add'>+static const char *sdmux_parents[2] = { "pll48", "sys" };</div><div class='add'>+</div><div class='add'>+static const char *hdmi_parents[2] = { "lse", "hsi_div488" };</div><div class='add'>+</div><div class='add'>+static const char *spdif_parent[1] = { "plli2s-p" };</div><div class='add'>+</div><div class='add'>+static const char *lptim_parent[4] = { "apb1_mul", "lsi", "hsi", "lse" };</div><div class='add'>+</div><div class='add'>+static const char *uart_parents1[4] = { "apb2_div", "sys", "hsi", "lse" };</div><div class='add'>+static const char *uart_parents2[4] = { "apb1_div", "sys", "hsi", "lse" };</div><div class='add'>+</div><div class='add'>+static const char *i2c_parents[4] = { "apb1_div", "sys", "hsi", "no-clock" };</div><div class='add'>+</div><div class='add'>+struct stm32_aux_clk {</div><div class='add'>+	int idx;</div><div class='add'>+	const char *name;</div><div class='add'>+	const char * const *parent_names;</div><div class='add'>+	int num_parents;</div><div class='add'>+	int offset_mux;</div><div class='add'>+	u8 shift;</div><div class='add'>+	u8 mask;</div><div class='add'>+	int offset_gate;</div><div class='add'>+	u8 bit_idx;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct stm32f4_clk_data {</div><div class='add'>+	const struct stm32f4_gate_data *gates_data;</div><div class='add'>+	const u64 *gates_map;</div><div class='add'>+	int gates_num;</div><div class='add'>+	const struct stm32f4_pll_data *pll_data;</div><div class='add'>+	const struct stm32_aux_clk *aux_clk;</div><div class='add'>+	int aux_clk_num;</div><div class='add'>+	int end_primary;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct stm32_aux_clk stm32f429_aux_clk[] = {</div><div class='add'>+	{</div><div class='add'>+		CLK_LCD, "lcd-tft", lcd_parent, ARRAY_SIZE(lcd_parent),</div><div class='add'>+		NO_MUX, 0, 0,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 26,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_I2S, "i2s", i2s_parents, ARRAY_SIZE(i2s_parents),</div><div class='add'>+		STM32F4_RCC_CFGR, 23, 1,</div><div class='add'>+		NO_GATE, 0,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_SAI1, "sai1-a", sai_parents, ARRAY_SIZE(sai_parents),</div><div class='add'>+		STM32F4_RCC_DCKCFGR, 20, 3,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 22,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_SAI2, "sai1-b", sai_parents, ARRAY_SIZE(sai_parents),</div><div class='add'>+		STM32F4_RCC_DCKCFGR, 22, 3,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 22,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct stm32_aux_clk stm32f469_aux_clk[] = {</div><div class='add'>+	{</div><div class='add'>+		CLK_LCD, "lcd-tft", lcd_parent, ARRAY_SIZE(lcd_parent),</div><div class='add'>+		NO_MUX, 0, 0,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 26,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_I2S, "i2s", i2s_parents, ARRAY_SIZE(i2s_parents),</div><div class='add'>+		STM32F4_RCC_CFGR, 23, 1,</div><div class='add'>+		NO_GATE, 0,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_SAI1, "sai1-a", sai_parents, ARRAY_SIZE(sai_parents),</div><div class='add'>+		STM32F4_RCC_DCKCFGR, 20, 3,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 22,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_SAI2, "sai1-b", sai_parents, ARRAY_SIZE(sai_parents),</div><div class='add'>+		STM32F4_RCC_DCKCFGR, 22, 3,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 22,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		NO_IDX, "pll48", pll48_parents, ARRAY_SIZE(pll48_parents),</div><div class='add'>+		STM32F4_RCC_DCKCFGR, 27, 1,</div><div class='add'>+		NO_GATE, 0,</div><div class='add'>+		0</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		NO_IDX, "sdmux", sdmux_parents, ARRAY_SIZE(sdmux_parents),</div><div class='add'>+		STM32F4_RCC_DCKCFGR, 28, 1,</div><div class='add'>+		NO_GATE, 0,</div><div class='add'>+		0</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct stm32_aux_clk stm32f746_aux_clk[] = {</div><div class='add'>+	{</div><div class='add'>+		CLK_LCD, "lcd-tft", lcd_parent, ARRAY_SIZE(lcd_parent),</div><div class='add'>+		NO_MUX, 0, 0,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 26,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_I2S, "i2s", i2s_parents, ARRAY_SIZE(i2s_parents),</div><div class='add'>+		STM32F4_RCC_CFGR, 23, 1,</div><div class='add'>+		NO_GATE, 0,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_SAI1, "sai1_clk", sai_parents, ARRAY_SIZE(sai_parents),</div><div class='add'>+		STM32F4_RCC_DCKCFGR, 20, 3,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 22,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_SAI2, "sai2_clk", sai_parents, ARRAY_SIZE(sai_parents),</div><div class='add'>+		STM32F4_RCC_DCKCFGR, 22, 3,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 23,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		NO_IDX, "pll48", pll48_parents, ARRAY_SIZE(pll48_parents),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 27, 1,</div><div class='add'>+		NO_GATE, 0,</div><div class='add'>+		0</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		NO_IDX, "sdmux", sdmux_parents, ARRAY_SIZE(sdmux_parents),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 28, 1,</div><div class='add'>+		NO_GATE, 0,</div><div class='add'>+		0</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_HDMI_CEC, "hdmi-cec",</div><div class='add'>+		hdmi_parents, ARRAY_SIZE(hdmi_parents),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 26, 1,</div><div class='add'>+		NO_GATE, 0,</div><div class='add'>+		0</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_SPDIF, "spdif-rx",</div><div class='add'>+		spdif_parent, ARRAY_SIZE(spdif_parent),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 22, 3,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 23,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_USART1, "usart1",</div><div class='add'>+		uart_parents1, ARRAY_SIZE(uart_parents1),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 0, 3,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 4,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_USART2, "usart2",</div><div class='add'>+		uart_parents2, ARRAY_SIZE(uart_parents1),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 2, 3,</div><div class='add'>+		STM32F4_RCC_APB1ENR, 17,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_USART3, "usart3",</div><div class='add'>+		uart_parents2, ARRAY_SIZE(uart_parents1),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 4, 3,</div><div class='add'>+		STM32F4_RCC_APB1ENR, 18,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_UART4, "uart4",</div><div class='add'>+		uart_parents2, ARRAY_SIZE(uart_parents1),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 6, 3,</div><div class='add'>+		STM32F4_RCC_APB1ENR, 19,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_UART5, "uart5",</div><div class='add'>+		uart_parents2, ARRAY_SIZE(uart_parents1),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 8, 3,</div><div class='add'>+		STM32F4_RCC_APB1ENR, 20,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_USART6, "usart6",</div><div class='add'>+		uart_parents1, ARRAY_SIZE(uart_parents1),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 10, 3,</div><div class='add'>+		STM32F4_RCC_APB2ENR, 5,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		CLK_UART7, "uart7",</div><div class='add'>+		uart_parents2, ARRAY_SIZE(uart_parents1),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 12, 3,</div><div class='add'>+		STM32F4_RCC_APB1ENR, 30,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_UART8, "uart8",</div><div class='add'>+		uart_parents2, ARRAY_SIZE(uart_parents1),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 14, 3,</div><div class='add'>+		STM32F4_RCC_APB1ENR, 31,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_I2C1, "i2c1",</div><div class='add'>+		i2c_parents, ARRAY_SIZE(i2c_parents),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 16, 3,</div><div class='add'>+		STM32F4_RCC_APB1ENR, 21,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_I2C2, "i2c2",</div><div class='add'>+		i2c_parents, ARRAY_SIZE(i2c_parents),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 18, 3,</div><div class='add'>+		STM32F4_RCC_APB1ENR, 22,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_I2C3, "i2c3",</div><div class='add'>+		i2c_parents, ARRAY_SIZE(i2c_parents),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 20, 3,</div><div class='add'>+		STM32F4_RCC_APB1ENR, 23,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		CLK_I2C4, "i2c4",</div><div class='add'>+		i2c_parents, ARRAY_SIZE(i2c_parents),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 22, 3,</div><div class='add'>+		STM32F4_RCC_APB1ENR, 24,</div><div class='add'>+		CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		CLK_LPTIMER, "lptim1",</div><div class='add'>+		lptim_parent, ARRAY_SIZE(lptim_parent),</div><div class='add'>+		STM32F7_RCC_DCKCFGR2, 24, 3,</div><div class='add'>+		STM32F4_RCC_APB1ENR, 9,</div><div class='add'>+		CLK_SET_RATE_PARENT</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct stm32f4_clk_data stm32f429_clk_data = {</div><div class='add'>+	.end_primary	= END_PRIMARY_CLK,</div><div class='add'>+	.gates_data	= stm32f429_gates,</div><div class='add'>+	.gates_map	= stm32f42xx_gate_map,</div><div class='add'>+	.gates_num	= ARRAY_SIZE(stm32f429_gates),</div><div class='add'>+	.pll_data	= stm32f429_pll,</div><div class='add'>+	.aux_clk	= stm32f429_aux_clk,</div><div class='add'>+	.aux_clk_num	= ARRAY_SIZE(stm32f429_aux_clk),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct stm32f4_clk_data stm32f469_clk_data = {</div><div class='add'>+	.end_primary	= END_PRIMARY_CLK,</div><div class='add'>+	.gates_data	= stm32f469_gates,</div><div class='add'>+	.gates_map	= stm32f46xx_gate_map,</div><div class='add'>+	.gates_num	= ARRAY_SIZE(stm32f469_gates),</div><div class='add'>+	.pll_data	= stm32f469_pll,</div><div class='add'>+	.aux_clk	= stm32f469_aux_clk,</div><div class='add'>+	.aux_clk_num	= ARRAY_SIZE(stm32f469_aux_clk),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct stm32f4_clk_data stm32f746_clk_data = {</div><div class='add'>+	.end_primary	= END_PRIMARY_CLK_F7,</div><div class='add'>+	.gates_data	= stm32f746_gates,</div><div class='add'>+	.gates_map	= stm32f746_gate_map,</div><div class='add'>+	.gates_num	= ARRAY_SIZE(stm32f746_gates),</div><div class='add'>+	.pll_data	= stm32f469_pll,</div><div class='add'>+	.aux_clk	= stm32f746_aux_clk,</div><div class='add'>+	.aux_clk_num	= ARRAY_SIZE(stm32f746_aux_clk),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id stm32f4_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "st,stm32f42xx-rcc",</div><div class='add'>+		.data = &amp;stm32f429_clk_data</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "st,stm32f469-rcc",</div><div class='add'>+		.data = &amp;stm32f469_clk_data</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "st,stm32f746-rcc",</div><div class='add'>+		.data = &amp;stm32f746_clk_data</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw *stm32_register_aux_clk(const char *name,</div><div class='add'>+		const char * const *parent_names, int num_parents,</div><div class='add'>+		int offset_mux, u8 shift, u8 mask,</div><div class='add'>+		int offset_gate, u8 bit_idx,</div><div class='add'>+		unsigned long flags, spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	struct clk_hw *hw;</div><div class='add'>+	struct clk_gate *gate = NULL;</div><div class='add'>+	struct clk_mux *mux = NULL;</div><div class='add'>+	struct clk_hw *mux_hw = NULL, *gate_hw = NULL;</div><div class='add'>+	const struct clk_ops *mux_ops = NULL, *gate_ops = NULL;</div><div class='add'>+</div><div class='add'>+	if (offset_gate != NO_GATE) {</div><div class='add'>+		gate = kzalloc(sizeof(*gate), GFP_KERNEL);</div><div class='add'>+		if (!gate) {</div><div class='add'>+			hw = ERR_PTR(-EINVAL);</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		gate-&gt;reg = base + offset_gate;</div><div class='add'>+		gate-&gt;bit_idx = bit_idx;</div><div class='add'>+		gate-&gt;flags = 0;</div><div class='add'>+		gate-&gt;lock = lock;</div><div class='add'>+		gate_hw = &amp;gate-&gt;hw;</div><div class='add'>+		gate_ops = &amp;clk_gate_ops;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (offset_mux != NO_MUX) {</div><div class='add'>+		mux = kzalloc(sizeof(*mux), GFP_KERNEL);</div><div class='add'>+		if (!mux) {</div><div class='add'>+			hw = ERR_PTR(-EINVAL);</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mux-&gt;reg = base + offset_mux;</div><div class='add'>+		mux-&gt;shift = shift;</div><div class='add'>+		mux-&gt;mask = mask;</div><div class='add'>+		mux-&gt;flags = 0;</div><div class='add'>+		mux_hw = &amp;mux-&gt;hw;</div><div class='add'>+		mux_ops = &amp;clk_mux_ops;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mux_hw == NULL &amp;&amp; gate_hw == NULL) {</div><div class='add'>+		hw = ERR_PTR(-EINVAL);</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw = clk_hw_register_composite(NULL, name, parent_names, num_parents,</div><div class='add'>+			mux_hw, mux_ops,</div><div class='add'>+			NULL, NULL,</div><div class='add'>+			gate_hw, gate_ops,</div><div class='add'>+			flags);</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	if (IS_ERR(hw)) {</div><div class='add'>+		kfree(gate);</div><div class='add'>+		kfree(mux);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hw;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init stm32f4_rcc_init(struct device_node *np)</div><div class='ctx'> {</div><div class='del'>-	const char *hse_clk;</div><div class='add'>+	const char *hse_clk, *i2s_in_clk;</div><div class='ctx'> 	int n;</div><div class='add'>+	const struct of_device_id *match;</div><div class='add'>+	const struct stm32f4_clk_data *data;</div><div class='add'>+	unsigned long pllcfgr;</div><div class='add'>+	const char *pllsrc;</div><div class='add'>+	unsigned long pllm;</div><div class='ctx'> </div><div class='ctx'> 	base = of_iomap(np, 0);</div><div class='ctx'> 	if (!base) {</div><div class='hunk'>@@ -319,14 +1406,77 @@ static void __init stm32f4_rcc_init(struct device_node *np)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pdrm = syscon_regmap_lookup_by_phandle(np, "st,syscfg");</div><div class='add'>+	if (IS_ERR(pdrm)) {</div><div class='add'>+		pdrm = NULL;</div><div class='add'>+		pr_warn("%s: Unable to get syscfg\n", __func__);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	match = of_match_node(stm32f4_of_match, np);</div><div class='add'>+	if (WARN_ON(!match))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	data = match-&gt;data;</div><div class='add'>+</div><div class='add'>+	stm32fx_end_primary_clk = data-&gt;end_primary;</div><div class='add'>+</div><div class='add'>+	clks = kmalloc_array(data-&gt;gates_num + stm32fx_end_primary_clk,</div><div class='add'>+			sizeof(*clks), GFP_KERNEL);</div><div class='add'>+	if (!clks)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	stm32f4_gate_map = data-&gt;gates_map;</div><div class='add'>+</div><div class='ctx'> 	hse_clk = of_clk_get_parent_name(np, 0);</div><div class='ctx'> </div><div class='del'>-	clk_register_fixed_rate_with_accuracy(NULL, "hsi", NULL, 0,</div><div class='del'>-			16000000, 160000);</div><div class='del'>-	stm32f4_rcc_register_pll(hse_clk, "hsi");</div><div class='add'>+	i2s_in_clk = of_clk_get_parent_name(np, 1);</div><div class='add'>+</div><div class='add'>+	i2s_parents[1] = i2s_in_clk;</div><div class='add'>+	sai_parents[2] = i2s_in_clk;</div><div class='add'>+</div><div class='add'>+	clks[CLK_HSI] = clk_hw_register_fixed_rate_with_accuracy(NULL, "hsi",</div><div class='add'>+			NULL, 0, 16000000, 160000);</div><div class='add'>+</div><div class='add'>+	pllcfgr = readl(base + STM32F4_RCC_PLLCFGR);</div><div class='add'>+	pllsrc = pllcfgr &amp; BIT(22) ? hse_clk : "hsi";</div><div class='add'>+	pllm = pllcfgr &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+	clk_hw_register_fixed_factor(NULL, "vco_in", pllsrc,</div><div class='add'>+					       0, 1, pllm);</div><div class='add'>+</div><div class='add'>+	stm32f4_rcc_register_pll("vco_in", &amp;data-&gt;pll_data[0],</div><div class='add'>+			&amp;stm32f4_clk_lock);</div><div class='add'>+</div><div class='add'>+	clks[PLL_VCO_I2S] = stm32f4_rcc_register_pll("vco_in",</div><div class='add'>+			&amp;data-&gt;pll_data[1], &amp;stm32f4_clk_lock);</div><div class='add'>+</div><div class='add'>+	clks[PLL_VCO_SAI] = stm32f4_rcc_register_pll("vco_in",</div><div class='add'>+			&amp;data-&gt;pll_data[2], &amp;stm32f4_clk_lock);</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; MAX_POST_DIV; n++) {</div><div class='add'>+		const struct stm32f4_pll_post_div_data *post_div;</div><div class='add'>+		struct clk_hw *hw;</div><div class='add'>+</div><div class='add'>+		post_div = &amp;post_div_data[n];</div><div class='add'>+</div><div class='add'>+		hw = clk_register_pll_div(post_div-&gt;name,</div><div class='add'>+				post_div-&gt;parent,</div><div class='add'>+				post_div-&gt;flag,</div><div class='add'>+				base + post_div-&gt;offset,</div><div class='add'>+				post_div-&gt;shift,</div><div class='add'>+				post_div-&gt;width,</div><div class='add'>+				post_div-&gt;flag_div,</div><div class='add'>+				post_div-&gt;div_table,</div><div class='add'>+				clks[post_div-&gt;pll_num],</div><div class='add'>+				&amp;stm32f4_clk_lock);</div><div class='add'>+</div><div class='add'>+		if (post_div-&gt;idx != NO_IDX)</div><div class='add'>+			clks[post_div-&gt;idx] = hw;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sys_parents[1] = hse_clk;</div><div class='del'>-	clk_register_mux_table(</div><div class='add'>+</div><div class='add'>+	clks[CLK_SYSCLK] = clk_hw_register_mux_table(</div><div class='ctx'> 	    NULL, "sys", sys_parents, ARRAY_SIZE(sys_parents), 0,</div><div class='ctx'> 	    base + STM32F4_RCC_CFGR, 0, 3, 0, NULL, &amp;stm32f4_clk_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -351,11 +1501,15 @@ static void __init stm32f4_rcc_init(struct device_node *np)</div><div class='ctx'> 	clks[FCLK] = clk_hw_register_fixed_factor(NULL, "fclk", "ahb_div",</div><div class='ctx'> 					       0, 1, 1);</div><div class='ctx'> </div><div class='del'>-	for (n = 0; n &lt; ARRAY_SIZE(stm32f4_gates); n++) {</div><div class='del'>-		const struct stm32f4_gate_data *gd = &amp;stm32f4_gates[n];</div><div class='del'>-		unsigned int secondary =</div><div class='del'>-		    8 * (gd-&gt;offset - STM32F4_RCC_AHB1ENR) + gd-&gt;bit_idx;</div><div class='del'>-		int idx = stm32f4_rcc_lookup_clk_idx(0, secondary);</div><div class='add'>+	for (n = 0; n &lt; data-&gt;gates_num; n++) {</div><div class='add'>+		const struct stm32f4_gate_data *gd;</div><div class='add'>+		unsigned int secondary;</div><div class='add'>+		int idx;</div><div class='add'>+</div><div class='add'>+		gd = &amp;data-&gt;gates_data[n];</div><div class='add'>+		secondary = 8 * (gd-&gt;offset - STM32F4_RCC_AHB1ENR) +</div><div class='add'>+			gd-&gt;bit_idx;</div><div class='add'>+		idx = stm32f4_rcc_lookup_clk_idx(0, secondary);</div><div class='ctx'> </div><div class='ctx'> 		if (idx &lt; 0)</div><div class='ctx'> 			goto fail;</div><div class='hunk'>@@ -371,9 +1525,72 @@ static void __init stm32f4_rcc_init(struct device_node *np)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	clks[CLK_LSI] = clk_register_rgate(NULL, "lsi", "clk-lsi", 0,</div><div class='add'>+			base + STM32F4_RCC_CSR, 0, 2, 0, &amp;stm32f4_clk_lock);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(clks[CLK_LSI])) {</div><div class='add'>+		pr_err("Unable to register lsi clock\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clks[CLK_LSE] = clk_register_rgate(NULL, "lse", "clk-lse", 0,</div><div class='add'>+			base + STM32F4_RCC_BDCR, 0, 2, 0, &amp;stm32f4_clk_lock);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(clks[CLK_LSE])) {</div><div class='add'>+		pr_err("Unable to register lse clock\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clks[CLK_HSE_RTC] = clk_hw_register_divider(NULL, "hse-rtc", "clk-hse",</div><div class='add'>+			0, base + STM32F4_RCC_CFGR, 16, 5, 0,</div><div class='add'>+			&amp;stm32f4_clk_lock);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(clks[CLK_HSE_RTC])) {</div><div class='add'>+		pr_err("Unable to register hse-rtc clock\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clks[CLK_RTC] = stm32_register_cclk(NULL, "rtc", rtc_parents, 4,</div><div class='add'>+			base + STM32F4_RCC_BDCR, 15, 8, 0, &amp;stm32f4_clk_lock);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(clks[CLK_RTC])) {</div><div class='add'>+		pr_err("Unable to register rtc clock\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; data-&gt;aux_clk_num; n++) {</div><div class='add'>+		const struct stm32_aux_clk *aux_clk;</div><div class='add'>+		struct clk_hw *hw;</div><div class='add'>+</div><div class='add'>+		aux_clk = &amp;data-&gt;aux_clk[n];</div><div class='add'>+</div><div class='add'>+		hw = stm32_register_aux_clk(aux_clk-&gt;name,</div><div class='add'>+				aux_clk-&gt;parent_names, aux_clk-&gt;num_parents,</div><div class='add'>+				aux_clk-&gt;offset_mux, aux_clk-&gt;shift,</div><div class='add'>+				aux_clk-&gt;mask, aux_clk-&gt;offset_gate,</div><div class='add'>+				aux_clk-&gt;bit_idx, aux_clk-&gt;flags,</div><div class='add'>+				&amp;stm32f4_clk_lock);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(hw)) {</div><div class='add'>+			pr_warn("Unable to register %s clk\n", aux_clk-&gt;name);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (aux_clk-&gt;idx != NO_IDX)</div><div class='add'>+			clks[aux_clk-&gt;idx] = hw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_device_is_compatible(np, "st,stm32f746-rcc"))</div><div class='add'>+</div><div class='add'>+		clk_hw_register_fixed_factor(NULL, "hsi_div488", "hsi", 0,</div><div class='add'>+				1, 488);</div><div class='add'>+</div><div class='ctx'> 	of_clk_add_hw_provider(np, stm32f4_rcc_lookup_clk, NULL);</div><div class='ctx'> 	return;</div><div class='ctx'> fail:</div><div class='add'>+	kfree(clks);</div><div class='ctx'> 	iounmap(base);</div><div class='ctx'> }</div><div class='del'>-CLK_OF_DECLARE(stm32f4_rcc, "st,stm32f42xx-rcc", stm32f4_rcc_init);</div><div class='add'>+CLK_OF_DECLARE_DRIVER(stm32f42xx_rcc, "st,stm32f42xx-rcc", stm32f4_rcc_init);</div><div class='add'>+CLK_OF_DECLARE_DRIVER(stm32f46xx_rcc, "st,stm32f469-rcc", stm32f4_rcc_init);</div><div class='add'>+CLK_OF_DECLARE_DRIVER(stm32f746_rcc, "st,stm32f746-rcc", stm32f4_rcc_init);</div><div class='head'>diff --git a/drivers/clk/clk-versaclock5.c b/drivers/clk/clk-versaclock5.c<br/>new file mode 100644<br/>index 000000000000..56741f3cf0a3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clk-versaclock5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-versaclock5.c</a></div><div class='hunk'>@@ -0,0 +1,791 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for IDT Versaclock 5</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Marek Vasut &lt;marek.vasut@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Possible optimizations:</div><div class='add'>+ * - Use spread spectrum</div><div class='add'>+ * - Use integer divider in FOD if applicable</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/rational.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+/* VersaClock5 registers */</div><div class='add'>+#define VC5_OTP_CONTROL				0x00</div><div class='add'>+</div><div class='add'>+/* Factory-reserved register block */</div><div class='add'>+#define VC5_RSVD_DEVICE_ID			0x01</div><div class='add'>+#define VC5_RSVD_ADC_GAIN_7_0			0x02</div><div class='add'>+#define VC5_RSVD_ADC_GAIN_15_8			0x03</div><div class='add'>+#define VC5_RSVD_ADC_OFFSET_7_0			0x04</div><div class='add'>+#define VC5_RSVD_ADC_OFFSET_15_8		0x05</div><div class='add'>+#define VC5_RSVD_TEMPY				0x06</div><div class='add'>+#define VC5_RSVD_OFFSET_TBIN			0x07</div><div class='add'>+#define VC5_RSVD_GAIN				0x08</div><div class='add'>+#define VC5_RSVD_TEST_NP			0x09</div><div class='add'>+#define VC5_RSVD_UNUSED				0x0a</div><div class='add'>+#define VC5_RSVD_BANDGAP_TRIM_UP		0x0b</div><div class='add'>+#define VC5_RSVD_BANDGAP_TRIM_DN		0x0c</div><div class='add'>+#define VC5_RSVD_CLK_R_12_CLK_AMP_4		0x0d</div><div class='add'>+#define VC5_RSVD_CLK_R_34_CLK_AMP_4		0x0e</div><div class='add'>+#define VC5_RSVD_CLK_AMP_123			0x0f</div><div class='add'>+</div><div class='add'>+/* Configuration register block */</div><div class='add'>+#define VC5_PRIM_SRC_SHDN			0x10</div><div class='add'>+#define VC5_PRIM_SRC_SHDN_EN_XTAL		BIT(7)</div><div class='add'>+#define VC5_PRIM_SRC_SHDN_EN_CLKIN		BIT(6)</div><div class='add'>+#define VC5_PRIM_SRC_SHDN_SP			BIT(1)</div><div class='add'>+#define VC5_PRIM_SRC_SHDN_EN_GBL_SHDN		BIT(0)</div><div class='add'>+</div><div class='add'>+#define VC5_VCO_BAND				0x11</div><div class='add'>+#define VC5_XTAL_X1_LOAD_CAP			0x12</div><div class='add'>+#define VC5_XTAL_X2_LOAD_CAP			0x13</div><div class='add'>+#define VC5_REF_DIVIDER				0x15</div><div class='add'>+#define VC5_REF_DIVIDER_SEL_PREDIV2		BIT(7)</div><div class='add'>+#define VC5_REF_DIVIDER_REF_DIV(n)		((n) &amp; 0x3f)</div><div class='add'>+</div><div class='add'>+#define VC5_VCO_CTRL_AND_PREDIV			0x16</div><div class='add'>+#define VC5_VCO_CTRL_AND_PREDIV_BYPASS_PREDIV	BIT(7)</div><div class='add'>+</div><div class='add'>+#define VC5_FEEDBACK_INT_DIV			0x17</div><div class='add'>+#define VC5_FEEDBACK_INT_DIV_BITS		0x18</div><div class='add'>+#define VC5_FEEDBACK_FRAC_DIV(n)		(0x19 + (n))</div><div class='add'>+#define VC5_RC_CONTROL0				0x1e</div><div class='add'>+#define VC5_RC_CONTROL1				0x1f</div><div class='add'>+/* Register 0x20 is factory reserved */</div><div class='add'>+</div><div class='add'>+/* Output divider control for divider 1,2,3,4 */</div><div class='add'>+#define VC5_OUT_DIV_CONTROL(idx)	(0x21 + ((idx) * 0x10))</div><div class='add'>+#define VC5_OUT_DIV_CONTROL_RESET	BIT(7)</div><div class='add'>+#define VC5_OUT_DIV_CONTROL_SELB_NORM	BIT(3)</div><div class='add'>+#define VC5_OUT_DIV_CONTROL_SEL_EXT	BIT(2)</div><div class='add'>+#define VC5_OUT_DIV_CONTROL_INT_MODE	BIT(1)</div><div class='add'>+#define VC5_OUT_DIV_CONTROL_EN_FOD	BIT(0)</div><div class='add'>+</div><div class='add'>+#define VC5_OUT_DIV_FRAC(idx, n)	(0x22 + ((idx) * 0x10) + (n))</div><div class='add'>+#define VC5_OUT_DIV_FRAC4_OD_SCEE	BIT(1)</div><div class='add'>+</div><div class='add'>+#define VC5_OUT_DIV_STEP_SPREAD(idx, n)	(0x26 + ((idx) * 0x10) + (n))</div><div class='add'>+#define VC5_OUT_DIV_SPREAD_MOD(idx, n)	(0x29 + ((idx) * 0x10) + (n))</div><div class='add'>+#define VC5_OUT_DIV_SKEW_INT(idx, n)	(0x2b + ((idx) * 0x10) + (n))</div><div class='add'>+#define VC5_OUT_DIV_INT(idx, n)		(0x2d + ((idx) * 0x10) + (n))</div><div class='add'>+#define VC5_OUT_DIV_SKEW_FRAC(idx)	(0x2f + ((idx) * 0x10))</div><div class='add'>+/* Registers 0x30, 0x40, 0x50 are factory reserved */</div><div class='add'>+</div><div class='add'>+/* Clock control register for clock 1,2 */</div><div class='add'>+#define VC5_CLK_OUTPUT_CFG(idx, n)	(0x60 + ((idx) * 0x2) + (n))</div><div class='add'>+#define VC5_CLK_OUTPUT_CFG1_EN_CLKBUF	BIT(0)</div><div class='add'>+</div><div class='add'>+#define VC5_CLK_OE_SHDN				0x68</div><div class='add'>+#define VC5_CLK_OS_SHDN				0x69</div><div class='add'>+</div><div class='add'>+#define VC5_GLOBAL_REGISTER			0x76</div><div class='add'>+#define VC5_GLOBAL_REGISTER_GLOBAL_RESET	BIT(5)</div><div class='add'>+</div><div class='add'>+/* PLL/VCO runs between 2.5 GHz and 3.0 GHz */</div><div class='add'>+#define VC5_PLL_VCO_MIN				2500000000UL</div><div class='add'>+#define VC5_PLL_VCO_MAX				3000000000UL</div><div class='add'>+</div><div class='add'>+/* VC5 Input mux settings */</div><div class='add'>+#define VC5_MUX_IN_XIN		BIT(0)</div><div class='add'>+#define VC5_MUX_IN_CLKIN	BIT(1)</div><div class='add'>+</div><div class='add'>+/* Supported IDT VC5 models. */</div><div class='add'>+enum vc5_model {</div><div class='add'>+	IDT_VC5_5P49V5923,</div><div class='add'>+	IDT_VC5_5P49V5933,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vc5_driver_data;</div><div class='add'>+</div><div class='add'>+struct vc5_hw_data {</div><div class='add'>+	struct clk_hw		hw;</div><div class='add'>+	struct vc5_driver_data	*vc5;</div><div class='add'>+	u32			div_int;</div><div class='add'>+	u32			div_frc;</div><div class='add'>+	unsigned int		num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vc5_driver_data {</div><div class='add'>+	struct i2c_client	*client;</div><div class='add'>+	struct regmap		*regmap;</div><div class='add'>+	enum vc5_model		model;</div><div class='add'>+</div><div class='add'>+	struct clk		*pin_xin;</div><div class='add'>+	struct clk		*pin_clkin;</div><div class='add'>+	unsigned char		clk_mux_ins;</div><div class='add'>+	struct clk_hw		clk_mux;</div><div class='add'>+	struct vc5_hw_data	clk_pll;</div><div class='add'>+	struct vc5_hw_data	clk_fod[2];</div><div class='add'>+	struct vc5_hw_data	clk_out[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const vc5_mux_names[] = {</div><div class='add'>+	"mux"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const vc5_pll_names[] = {</div><div class='add'>+	"pll"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const vc5_fod_names[] = {</div><div class='add'>+	"fod0", "fod1", "fod2", "fod3",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const vc5_clk_out_names[] = {</div><div class='add'>+	"out0_sel_i2cb", "out1", "out2", "out3", "out4",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VersaClock5 i2c regmap</div><div class='add'>+ */</div><div class='add'>+static bool vc5_regmap_is_writeable(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	/* Factory reserved regs, make them read-only */</div><div class='add'>+	if (reg &lt;= 0xf)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Factory reserved regs, make them read-only */</div><div class='add'>+	if (reg == 0x14 || reg == 0x1c || reg == 0x1d)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_config vc5_regmap_config = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+	.cache_type = REGCACHE_RBTREE,</div><div class='add'>+	.max_register = 0x76,</div><div class='add'>+	.writeable_reg = vc5_regmap_is_writeable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VersaClock5 input multiplexer between XTAL and CLKIN divider</div><div class='add'>+ */</div><div class='add'>+static unsigned char vc5_mux_get_parent(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct vc5_driver_data *vc5 =</div><div class='add'>+		container_of(hw, struct vc5_driver_data, clk_mux);</div><div class='add'>+	const u8 mask = VC5_PRIM_SRC_SHDN_EN_XTAL | VC5_PRIM_SRC_SHDN_EN_CLKIN;</div><div class='add'>+	unsigned int src;</div><div class='add'>+</div><div class='add'>+	regmap_read(vc5-&gt;regmap, VC5_PRIM_SRC_SHDN, &amp;src);</div><div class='add'>+	src &amp;= mask;</div><div class='add'>+</div><div class='add'>+	if (src == VC5_PRIM_SRC_SHDN_EN_XTAL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (src == VC5_PRIM_SRC_SHDN_EN_CLKIN)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	dev_warn(&amp;vc5-&gt;client-&gt;dev,</div><div class='add'>+		 "Invalid clock input configuration (%02x)\n", src);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vc5_mux_set_parent(struct clk_hw *hw, u8 index)</div><div class='add'>+{</div><div class='add'>+	struct vc5_driver_data *vc5 =</div><div class='add'>+		container_of(hw, struct vc5_driver_data, clk_mux);</div><div class='add'>+	const u8 mask = VC5_PRIM_SRC_SHDN_EN_XTAL | VC5_PRIM_SRC_SHDN_EN_CLKIN;</div><div class='add'>+	u8 src;</div><div class='add'>+</div><div class='add'>+	if ((index &gt; 1) || !vc5-&gt;clk_mux_ins)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (vc5-&gt;clk_mux_ins == (VC5_MUX_IN_CLKIN | VC5_MUX_IN_XIN)) {</div><div class='add'>+		if (index == 0)</div><div class='add'>+			src = VC5_PRIM_SRC_SHDN_EN_XTAL;</div><div class='add'>+		if (index == 1)</div><div class='add'>+			src = VC5_PRIM_SRC_SHDN_EN_CLKIN;</div><div class='add'>+	} else {</div><div class='add'>+		if (index != 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (vc5-&gt;clk_mux_ins == VC5_MUX_IN_XIN)</div><div class='add'>+			src = VC5_PRIM_SRC_SHDN_EN_XTAL;</div><div class='add'>+		if (vc5-&gt;clk_mux_ins == VC5_MUX_IN_CLKIN)</div><div class='add'>+			src = VC5_PRIM_SRC_SHDN_EN_CLKIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(vc5-&gt;regmap, VC5_PRIM_SRC_SHDN, mask, src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long vc5_mux_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					 unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct vc5_driver_data *vc5 =</div><div class='add'>+		container_of(hw, struct vc5_driver_data, clk_mux);</div><div class='add'>+	unsigned int prediv, div;</div><div class='add'>+</div><div class='add'>+	regmap_read(vc5-&gt;regmap, VC5_VCO_CTRL_AND_PREDIV, &amp;prediv);</div><div class='add'>+</div><div class='add'>+	/* The bypass_prediv is set, PLL fed from Ref_in directly. */</div><div class='add'>+	if (prediv &amp; VC5_VCO_CTRL_AND_PREDIV_BYPASS_PREDIV)</div><div class='add'>+		return parent_rate;</div><div class='add'>+</div><div class='add'>+	regmap_read(vc5-&gt;regmap, VC5_REF_DIVIDER, &amp;div);</div><div class='add'>+</div><div class='add'>+	/* The Sel_prediv2 is set, PLL fed from prediv2 (Ref_in / 2) */</div><div class='add'>+	if (div &amp; VC5_REF_DIVIDER_SEL_PREDIV2)</div><div class='add'>+		return parent_rate / 2;</div><div class='add'>+	else</div><div class='add'>+		return parent_rate / VC5_REF_DIVIDER_REF_DIV(div);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long vc5_mux_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+			       unsigned long *parent_rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long idiv;</div><div class='add'>+</div><div class='add'>+	/* PLL cannot operate with input clock above 50 MHz. */</div><div class='add'>+	if (rate &gt; 50000000)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* CLKIN within range of PLL input, feed directly to PLL. */</div><div class='add'>+	if (*parent_rate &lt;= 50000000)</div><div class='add'>+		return *parent_rate;</div><div class='add'>+</div><div class='add'>+	idiv = DIV_ROUND_UP(*parent_rate, rate);</div><div class='add'>+	if (idiv &gt; 127)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return *parent_rate / idiv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vc5_mux_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+			    unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct vc5_driver_data *vc5 =</div><div class='add'>+		container_of(hw, struct vc5_driver_data, clk_mux);</div><div class='add'>+	unsigned long idiv;</div><div class='add'>+	u8 div;</div><div class='add'>+</div><div class='add'>+	/* CLKIN within range of PLL input, feed directly to PLL. */</div><div class='add'>+	if (parent_rate &lt;= 50000000) {</div><div class='add'>+		regmap_update_bits(vc5-&gt;regmap, VC5_VCO_CTRL_AND_PREDIV,</div><div class='add'>+				   VC5_VCO_CTRL_AND_PREDIV_BYPASS_PREDIV,</div><div class='add'>+				   VC5_VCO_CTRL_AND_PREDIV_BYPASS_PREDIV);</div><div class='add'>+		regmap_update_bits(vc5-&gt;regmap, VC5_REF_DIVIDER, 0xff, 0x00);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idiv = DIV_ROUND_UP(parent_rate, rate);</div><div class='add'>+</div><div class='add'>+	/* We have dedicated div-2 predivider. */</div><div class='add'>+	if (idiv == 2)</div><div class='add'>+		div = VC5_REF_DIVIDER_SEL_PREDIV2;</div><div class='add'>+	else</div><div class='add'>+		div = VC5_REF_DIVIDER_REF_DIV(idiv);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(vc5-&gt;regmap, VC5_REF_DIVIDER, 0xff, div);</div><div class='add'>+	regmap_update_bits(vc5-&gt;regmap, VC5_VCO_CTRL_AND_PREDIV,</div><div class='add'>+			   VC5_VCO_CTRL_AND_PREDIV_BYPASS_PREDIV, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops vc5_mux_ops = {</div><div class='add'>+	.set_parent	= vc5_mux_set_parent,</div><div class='add'>+	.get_parent	= vc5_mux_get_parent,</div><div class='add'>+	.recalc_rate	= vc5_mux_recalc_rate,</div><div class='add'>+	.round_rate	= vc5_mux_round_rate,</div><div class='add'>+	.set_rate	= vc5_mux_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VersaClock5 PLL/VCO</div><div class='add'>+ */</div><div class='add'>+static unsigned long vc5_pll_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					 unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct vc5_hw_data *hwdata = container_of(hw, struct vc5_hw_data, hw);</div><div class='add'>+	struct vc5_driver_data *vc5 = hwdata-&gt;vc5;</div><div class='add'>+	u32 div_int, div_frc;</div><div class='add'>+	u8 fb[5];</div><div class='add'>+</div><div class='add'>+	regmap_bulk_read(vc5-&gt;regmap, VC5_FEEDBACK_INT_DIV, fb, 5);</div><div class='add'>+</div><div class='add'>+	div_int = (fb[0] &lt;&lt; 4) | (fb[1] &gt;&gt; 4);</div><div class='add'>+	div_frc = (fb[2] &lt;&lt; 16) | (fb[3] &lt;&lt; 8) | fb[4];</div><div class='add'>+</div><div class='add'>+	/* The PLL divider has 12 integer bits and 24 fractional bits */</div><div class='add'>+	return (parent_rate * div_int) + ((parent_rate * div_frc) &gt;&gt; 24);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long vc5_pll_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+			       unsigned long *parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct vc5_hw_data *hwdata = container_of(hw, struct vc5_hw_data, hw);</div><div class='add'>+	u32 div_int;</div><div class='add'>+	u64 div_frc;</div><div class='add'>+</div><div class='add'>+	if (rate &lt; VC5_PLL_VCO_MIN)</div><div class='add'>+		rate = VC5_PLL_VCO_MIN;</div><div class='add'>+	if (rate &gt; VC5_PLL_VCO_MAX)</div><div class='add'>+		rate = VC5_PLL_VCO_MAX;</div><div class='add'>+</div><div class='add'>+	/* Determine integer part, which is 12 bit wide */</div><div class='add'>+	div_int = rate / *parent_rate;</div><div class='add'>+	if (div_int &gt; 0xfff)</div><div class='add'>+		rate = *parent_rate * 0xfff;</div><div class='add'>+</div><div class='add'>+	/* Determine best fractional part, which is 24 bit wide */</div><div class='add'>+	div_frc = rate % *parent_rate;</div><div class='add'>+	div_frc *= BIT(24) - 1;</div><div class='add'>+	do_div(div_frc, *parent_rate);</div><div class='add'>+</div><div class='add'>+	hwdata-&gt;div_int = div_int;</div><div class='add'>+	hwdata-&gt;div_frc = (u32)div_frc;</div><div class='add'>+</div><div class='add'>+	return (*parent_rate * div_int) + ((*parent_rate * div_frc) &gt;&gt; 24);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vc5_pll_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+			    unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct vc5_hw_data *hwdata = container_of(hw, struct vc5_hw_data, hw);</div><div class='add'>+	struct vc5_driver_data *vc5 = hwdata-&gt;vc5;</div><div class='add'>+	u8 fb[5];</div><div class='add'>+</div><div class='add'>+	fb[0] = hwdata-&gt;div_int &gt;&gt; 4;</div><div class='add'>+	fb[1] = hwdata-&gt;div_int &lt;&lt; 4;</div><div class='add'>+	fb[2] = hwdata-&gt;div_frc &gt;&gt; 16;</div><div class='add'>+	fb[3] = hwdata-&gt;div_frc &gt;&gt; 8;</div><div class='add'>+	fb[4] = hwdata-&gt;div_frc;</div><div class='add'>+</div><div class='add'>+	return regmap_bulk_write(vc5-&gt;regmap, VC5_FEEDBACK_INT_DIV, fb, 5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops vc5_pll_ops = {</div><div class='add'>+	.recalc_rate	= vc5_pll_recalc_rate,</div><div class='add'>+	.round_rate	= vc5_pll_round_rate,</div><div class='add'>+	.set_rate	= vc5_pll_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long vc5_fod_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					 unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct vc5_hw_data *hwdata = container_of(hw, struct vc5_hw_data, hw);</div><div class='add'>+	struct vc5_driver_data *vc5 = hwdata-&gt;vc5;</div><div class='add'>+	/* VCO frequency is divided by two before entering FOD */</div><div class='add'>+	u32 f_in = parent_rate / 2;</div><div class='add'>+	u32 div_int, div_frc;</div><div class='add'>+	u8 od_int[2];</div><div class='add'>+	u8 od_frc[4];</div><div class='add'>+</div><div class='add'>+	regmap_bulk_read(vc5-&gt;regmap, VC5_OUT_DIV_INT(hwdata-&gt;num, 0),</div><div class='add'>+			 od_int, 2);</div><div class='add'>+	regmap_bulk_read(vc5-&gt;regmap, VC5_OUT_DIV_FRAC(hwdata-&gt;num, 0),</div><div class='add'>+			 od_frc, 4);</div><div class='add'>+</div><div class='add'>+	div_int = (od_int[0] &lt;&lt; 4) | (od_int[1] &gt;&gt; 4);</div><div class='add'>+	div_frc = (od_frc[0] &lt;&lt; 22) | (od_frc[1] &lt;&lt; 14) |</div><div class='add'>+		  (od_frc[2] &lt;&lt; 6) | (od_frc[3] &gt;&gt; 2);</div><div class='add'>+</div><div class='add'>+	/* The PLL divider has 12 integer bits and 30 fractional bits */</div><div class='add'>+	return div64_u64((u64)f_in &lt;&lt; 24ULL, ((u64)div_int &lt;&lt; 24ULL) + div_frc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long vc5_fod_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+			       unsigned long *parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct vc5_hw_data *hwdata = container_of(hw, struct vc5_hw_data, hw);</div><div class='add'>+	/* VCO frequency is divided by two before entering FOD */</div><div class='add'>+	u32 f_in = *parent_rate / 2;</div><div class='add'>+	u32 div_int;</div><div class='add'>+	u64 div_frc;</div><div class='add'>+</div><div class='add'>+	/* Determine integer part, which is 12 bit wide */</div><div class='add'>+	div_int = f_in / rate;</div><div class='add'>+	/*</div><div class='add'>+	 * WARNING: The clock chip does not output signal if the integer part</div><div class='add'>+	 *          of the divider is 0xfff and fractional part is non-zero.</div><div class='add'>+	 *          Clamp the divider at 0xffe to keep the code simple.</div><div class='add'>+	 */</div><div class='add'>+	if (div_int &gt; 0xffe) {</div><div class='add'>+		div_int = 0xffe;</div><div class='add'>+		rate = f_in / div_int;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Determine best fractional part, which is 30 bit wide */</div><div class='add'>+	div_frc = f_in % rate;</div><div class='add'>+	div_frc &lt;&lt;= 24;</div><div class='add'>+	do_div(div_frc, rate);</div><div class='add'>+</div><div class='add'>+	hwdata-&gt;div_int = div_int;</div><div class='add'>+	hwdata-&gt;div_frc = (u32)div_frc;</div><div class='add'>+</div><div class='add'>+	return div64_u64((u64)f_in &lt;&lt; 24ULL, ((u64)div_int &lt;&lt; 24ULL) + div_frc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vc5_fod_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+			    unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct vc5_hw_data *hwdata = container_of(hw, struct vc5_hw_data, hw);</div><div class='add'>+	struct vc5_driver_data *vc5 = hwdata-&gt;vc5;</div><div class='add'>+	u8 data[14] = {</div><div class='add'>+		hwdata-&gt;div_frc &gt;&gt; 22, hwdata-&gt;div_frc &gt;&gt; 14,</div><div class='add'>+		hwdata-&gt;div_frc &gt;&gt; 6, hwdata-&gt;div_frc &lt;&lt; 2,</div><div class='add'>+		0, 0, 0, 0, 0,</div><div class='add'>+		0, 0,</div><div class='add'>+		hwdata-&gt;div_int &gt;&gt; 4, hwdata-&gt;div_int &lt;&lt; 4,</div><div class='add'>+		0</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	regmap_bulk_write(vc5-&gt;regmap, VC5_OUT_DIV_FRAC(hwdata-&gt;num, 0),</div><div class='add'>+			  data, 14);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Toggle magic bit in undocumented register for unknown reason.</div><div class='add'>+	 * This is what the IDT timing commander tool does and the chip</div><div class='add'>+	 * datasheet somewhat implies this is needed, but the register</div><div class='add'>+	 * and the bit is not documented.</div><div class='add'>+	 */</div><div class='add'>+	regmap_update_bits(vc5-&gt;regmap, VC5_GLOBAL_REGISTER,</div><div class='add'>+			   VC5_GLOBAL_REGISTER_GLOBAL_RESET, 0);</div><div class='add'>+	regmap_update_bits(vc5-&gt;regmap, VC5_GLOBAL_REGISTER,</div><div class='add'>+			   VC5_GLOBAL_REGISTER_GLOBAL_RESET,</div><div class='add'>+			   VC5_GLOBAL_REGISTER_GLOBAL_RESET);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops vc5_fod_ops = {</div><div class='add'>+	.recalc_rate	= vc5_fod_recalc_rate,</div><div class='add'>+	.round_rate	= vc5_fod_round_rate,</div><div class='add'>+	.set_rate	= vc5_fod_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int vc5_clk_out_prepare(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct vc5_hw_data *hwdata = container_of(hw, struct vc5_hw_data, hw);</div><div class='add'>+	struct vc5_driver_data *vc5 = hwdata-&gt;vc5;</div><div class='add'>+</div><div class='add'>+	/* Enable the clock buffer */</div><div class='add'>+	regmap_update_bits(vc5-&gt;regmap, VC5_CLK_OUTPUT_CFG(hwdata-&gt;num, 1),</div><div class='add'>+			   VC5_CLK_OUTPUT_CFG1_EN_CLKBUF,</div><div class='add'>+			   VC5_CLK_OUTPUT_CFG1_EN_CLKBUF);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vc5_clk_out_unprepare(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct vc5_hw_data *hwdata = container_of(hw, struct vc5_hw_data, hw);</div><div class='add'>+	struct vc5_driver_data *vc5 = hwdata-&gt;vc5;</div><div class='add'>+</div><div class='add'>+	/* Enable the clock buffer */</div><div class='add'>+	regmap_update_bits(vc5-&gt;regmap, VC5_CLK_OUTPUT_CFG(hwdata-&gt;num, 1),</div><div class='add'>+			   VC5_CLK_OUTPUT_CFG1_EN_CLKBUF, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char vc5_clk_out_get_parent(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct vc5_hw_data *hwdata = container_of(hw, struct vc5_hw_data, hw);</div><div class='add'>+	struct vc5_driver_data *vc5 = hwdata-&gt;vc5;</div><div class='add'>+	const u8 mask = VC5_OUT_DIV_CONTROL_SELB_NORM |</div><div class='add'>+			VC5_OUT_DIV_CONTROL_SEL_EXT |</div><div class='add'>+			VC5_OUT_DIV_CONTROL_EN_FOD;</div><div class='add'>+	const u8 fodclkmask = VC5_OUT_DIV_CONTROL_SELB_NORM |</div><div class='add'>+			      VC5_OUT_DIV_CONTROL_EN_FOD;</div><div class='add'>+	const u8 extclk = VC5_OUT_DIV_CONTROL_SELB_NORM |</div><div class='add'>+			  VC5_OUT_DIV_CONTROL_SEL_EXT;</div><div class='add'>+	unsigned int src;</div><div class='add'>+</div><div class='add'>+	regmap_read(vc5-&gt;regmap, VC5_OUT_DIV_CONTROL(hwdata-&gt;num), &amp;src);</div><div class='add'>+	src &amp;= mask;</div><div class='add'>+</div><div class='add'>+	if ((src &amp; fodclkmask) == VC5_OUT_DIV_CONTROL_EN_FOD)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (src == extclk)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	dev_warn(&amp;vc5-&gt;client-&gt;dev,</div><div class='add'>+		 "Invalid clock output configuration (%02x)\n", src);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vc5_clk_out_set_parent(struct clk_hw *hw, u8 index)</div><div class='add'>+{</div><div class='add'>+	struct vc5_hw_data *hwdata = container_of(hw, struct vc5_hw_data, hw);</div><div class='add'>+	struct vc5_driver_data *vc5 = hwdata-&gt;vc5;</div><div class='add'>+	const u8 mask = VC5_OUT_DIV_CONTROL_RESET |</div><div class='add'>+			VC5_OUT_DIV_CONTROL_SELB_NORM |</div><div class='add'>+			VC5_OUT_DIV_CONTROL_SEL_EXT |</div><div class='add'>+			VC5_OUT_DIV_CONTROL_EN_FOD;</div><div class='add'>+	const u8 extclk = VC5_OUT_DIV_CONTROL_SELB_NORM |</div><div class='add'>+			  VC5_OUT_DIV_CONTROL_SEL_EXT;</div><div class='add'>+	u8 src = VC5_OUT_DIV_CONTROL_RESET;</div><div class='add'>+</div><div class='add'>+	if (index == 0)</div><div class='add'>+		src |= VC5_OUT_DIV_CONTROL_EN_FOD;</div><div class='add'>+	else</div><div class='add'>+		src |= extclk;</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(vc5-&gt;regmap, VC5_OUT_DIV_CONTROL(hwdata-&gt;num),</div><div class='add'>+				  mask, src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops vc5_clk_out_ops = {</div><div class='add'>+	.prepare	= vc5_clk_out_prepare,</div><div class='add'>+	.unprepare	= vc5_clk_out_unprepare,</div><div class='add'>+	.set_parent	= vc5_clk_out_set_parent,</div><div class='add'>+	.get_parent	= vc5_clk_out_get_parent,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw *vc5_of_clk_get(struct of_phandle_args *clkspec,</div><div class='add'>+				     void *data)</div><div class='add'>+{</div><div class='add'>+	struct vc5_driver_data *vc5 = data;</div><div class='add'>+	unsigned int idx = clkspec-&gt;args[0];</div><div class='add'>+</div><div class='add'>+	if (idx &gt; 2)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return &amp;vc5-&gt;clk_out[idx].hw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vc5_map_index_to_output(const enum vc5_model model,</div><div class='add'>+				   const unsigned int n)</div><div class='add'>+{</div><div class='add'>+	switch (model) {</div><div class='add'>+	case IDT_VC5_5P49V5933:</div><div class='add'>+		return (n == 0) ? 0 : 3;</div><div class='add'>+	case IDT_VC5_5P49V5923:</div><div class='add'>+	default:</div><div class='add'>+		return n;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id clk_vc5_of_match[];</div><div class='add'>+</div><div class='add'>+static int vc5_probe(struct i2c_client *client,</div><div class='add'>+		     const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	const struct of_device_id *of_id =</div><div class='add'>+		of_match_device(clk_vc5_of_match, &amp;client-&gt;dev);</div><div class='add'>+	struct vc5_driver_data *vc5;</div><div class='add'>+	struct clk_init_data init;</div><div class='add'>+	const char *parent_names[2];</div><div class='add'>+	unsigned int n, idx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	vc5 = devm_kzalloc(&amp;client-&gt;dev, sizeof(*vc5), GFP_KERNEL);</div><div class='add'>+	if (vc5 == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, vc5);</div><div class='add'>+	vc5-&gt;client = client;</div><div class='add'>+	vc5-&gt;model = (enum vc5_model)of_id-&gt;data;</div><div class='add'>+</div><div class='add'>+	vc5-&gt;pin_xin = devm_clk_get(&amp;client-&gt;dev, "xin");</div><div class='add'>+	if (PTR_ERR(vc5-&gt;pin_xin) == -EPROBE_DEFER)</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='add'>+</div><div class='add'>+	vc5-&gt;pin_clkin = devm_clk_get(&amp;client-&gt;dev, "clkin");</div><div class='add'>+	if (PTR_ERR(vc5-&gt;pin_clkin) == -EPROBE_DEFER)</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='add'>+</div><div class='add'>+	vc5-&gt;regmap = devm_regmap_init_i2c(client, &amp;vc5_regmap_config);</div><div class='add'>+	if (IS_ERR(vc5-&gt;regmap)) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "failed to allocate register map\n");</div><div class='add'>+		return PTR_ERR(vc5-&gt;regmap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register clock input mux */</div><div class='add'>+	memset(&amp;init, 0, sizeof(init));</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(vc5-&gt;pin_xin)) {</div><div class='add'>+		vc5-&gt;clk_mux_ins |= VC5_MUX_IN_XIN;</div><div class='add'>+		parent_names[init.num_parents++] = __clk_get_name(vc5-&gt;pin_xin);</div><div class='add'>+	} else if (vc5-&gt;model == IDT_VC5_5P49V5933) {</div><div class='add'>+		/* IDT VC5 5P49V5933 has built-in oscilator. */</div><div class='add'>+		vc5-&gt;pin_xin = clk_register_fixed_rate(&amp;client-&gt;dev,</div><div class='add'>+						       "internal-xtal", NULL,</div><div class='add'>+						       0, 25000000);</div><div class='add'>+		if (IS_ERR(vc5-&gt;pin_xin))</div><div class='add'>+			return PTR_ERR(vc5-&gt;pin_xin);</div><div class='add'>+		vc5-&gt;clk_mux_ins |= VC5_MUX_IN_XIN;</div><div class='add'>+		parent_names[init.num_parents++] = __clk_get_name(vc5-&gt;pin_xin);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(vc5-&gt;pin_clkin)) {</div><div class='add'>+		vc5-&gt;clk_mux_ins |= VC5_MUX_IN_CLKIN;</div><div class='add'>+		parent_names[init.num_parents++] =</div><div class='add'>+			__clk_get_name(vc5-&gt;pin_clkin);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!init.num_parents) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "no input clock specified!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init.name = vc5_mux_names[0];</div><div class='add'>+	init.ops = &amp;vc5_mux_ops;</div><div class='add'>+	init.flags = 0;</div><div class='add'>+	init.parent_names = parent_names;</div><div class='add'>+	vc5-&gt;clk_mux.init = &amp;init;</div><div class='add'>+	ret = devm_clk_hw_register(&amp;client-&gt;dev, &amp;vc5-&gt;clk_mux);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to register %s\n", init.name);</div><div class='add'>+		goto err_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register PLL */</div><div class='add'>+	memset(&amp;init, 0, sizeof(init));</div><div class='add'>+	init.name = vc5_pll_names[0];</div><div class='add'>+	init.ops = &amp;vc5_pll_ops;</div><div class='add'>+	init.flags = CLK_SET_RATE_PARENT;</div><div class='add'>+	init.parent_names = vc5_mux_names;</div><div class='add'>+	init.num_parents = 1;</div><div class='add'>+	vc5-&gt;clk_pll.num = 0;</div><div class='add'>+	vc5-&gt;clk_pll.vc5 = vc5;</div><div class='add'>+	vc5-&gt;clk_pll.hw.init = &amp;init;</div><div class='add'>+	ret = devm_clk_hw_register(&amp;client-&gt;dev, &amp;vc5-&gt;clk_pll.hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to register %s\n", init.name);</div><div class='add'>+		goto err_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register FODs */</div><div class='add'>+	for (n = 0; n &lt; 2; n++) {</div><div class='add'>+		idx = vc5_map_index_to_output(vc5-&gt;model, n);</div><div class='add'>+		memset(&amp;init, 0, sizeof(init));</div><div class='add'>+		init.name = vc5_fod_names[idx];</div><div class='add'>+		init.ops = &amp;vc5_fod_ops;</div><div class='add'>+		init.flags = CLK_SET_RATE_PARENT;</div><div class='add'>+		init.parent_names = vc5_pll_names;</div><div class='add'>+		init.num_parents = 1;</div><div class='add'>+		vc5-&gt;clk_fod[n].num = idx;</div><div class='add'>+		vc5-&gt;clk_fod[n].vc5 = vc5;</div><div class='add'>+		vc5-&gt;clk_fod[n].hw.init = &amp;init;</div><div class='add'>+		ret = devm_clk_hw_register(&amp;client-&gt;dev, &amp;vc5-&gt;clk_fod[n].hw);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;client-&gt;dev, "unable to register %s\n",</div><div class='add'>+				init.name);</div><div class='add'>+			goto err_clk;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register MUX-connected OUT0_I2C_SELB output */</div><div class='add'>+	memset(&amp;init, 0, sizeof(init));</div><div class='add'>+	init.name = vc5_clk_out_names[0];</div><div class='add'>+	init.ops = &amp;vc5_clk_out_ops;</div><div class='add'>+	init.flags = CLK_SET_RATE_PARENT;</div><div class='add'>+	init.parent_names = vc5_mux_names;</div><div class='add'>+	init.num_parents = 1;</div><div class='add'>+	vc5-&gt;clk_out[0].num = idx;</div><div class='add'>+	vc5-&gt;clk_out[0].vc5 = vc5;</div><div class='add'>+	vc5-&gt;clk_out[0].hw.init = &amp;init;</div><div class='add'>+	ret = devm_clk_hw_register(&amp;client-&gt;dev, &amp;vc5-&gt;clk_out[0].hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to register %s\n",</div><div class='add'>+			init.name);</div><div class='add'>+		goto err_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register FOD-connected OUTx outputs */</div><div class='add'>+	for (n = 1; n &lt; 3; n++) {</div><div class='add'>+		idx = vc5_map_index_to_output(vc5-&gt;model, n - 1);</div><div class='add'>+		parent_names[0] = vc5_fod_names[idx];</div><div class='add'>+		if (n == 1)</div><div class='add'>+			parent_names[1] = vc5_mux_names[0];</div><div class='add'>+		else</div><div class='add'>+			parent_names[1] = vc5_clk_out_names[n - 1];</div><div class='add'>+</div><div class='add'>+		memset(&amp;init, 0, sizeof(init));</div><div class='add'>+		init.name = vc5_clk_out_names[idx + 1];</div><div class='add'>+		init.ops = &amp;vc5_clk_out_ops;</div><div class='add'>+		init.flags = CLK_SET_RATE_PARENT;</div><div class='add'>+		init.parent_names = parent_names;</div><div class='add'>+		init.num_parents = 2;</div><div class='add'>+		vc5-&gt;clk_out[n].num = idx;</div><div class='add'>+		vc5-&gt;clk_out[n].vc5 = vc5;</div><div class='add'>+		vc5-&gt;clk_out[n].hw.init = &amp;init;</div><div class='add'>+		ret = devm_clk_hw_register(&amp;client-&gt;dev,</div><div class='add'>+					   &amp;vc5-&gt;clk_out[n].hw);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;client-&gt;dev, "unable to register %s\n",</div><div class='add'>+				init.name);</div><div class='add'>+			goto err_clk;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_clk_add_hw_provider(client-&gt;dev.of_node, vc5_of_clk_get, vc5);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to add clk provider\n");</div><div class='add'>+		goto err_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_clk:</div><div class='add'>+	if (vc5-&gt;model == IDT_VC5_5P49V5933)</div><div class='add'>+		clk_unregister_fixed_rate(vc5-&gt;pin_xin);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vc5_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct vc5_driver_data *vc5 = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	of_clk_del_provider(client-&gt;dev.of_node);</div><div class='add'>+</div><div class='add'>+	if (vc5-&gt;model == IDT_VC5_5P49V5933)</div><div class='add'>+		clk_unregister_fixed_rate(vc5-&gt;pin_xin);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id vc5_id[] = {</div><div class='add'>+	{ "5p49v5923", .driver_data = IDT_VC5_5P49V5923 },</div><div class='add'>+	{ "5p49v5933", .driver_data = IDT_VC5_5P49V5933 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, vc5_id);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id clk_vc5_of_match[] = {</div><div class='add'>+	{ .compatible = "idt,5p49v5923", .data = (void *)IDT_VC5_5P49V5923 },</div><div class='add'>+	{ .compatible = "idt,5p49v5933", .data = (void *)IDT_VC5_5P49V5933 },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, clk_vc5_of_match);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver vc5_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "vc5",</div><div class='add'>+		.of_match_table = clk_vc5_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe		= vc5_probe,</div><div class='add'>+	.remove		= vc5_remove,</div><div class='add'>+	.id_table	= vc5_id,</div><div class='add'>+};</div><div class='add'>+module_i2c_driver(vc5_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Marek Vasut &lt;marek.vasut@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("IDT VersaClock 5 driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/clk/clk-wm831x.c b/drivers/clk/clk-wm831x.c<br/>index f4fdac55727c..a47960aacfa5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/clk-wm831x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/clk-wm831x.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clk-wm831x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clk-wm831x.c</a></div><div class='hunk'>@@ -97,7 +97,8 @@ static int wm831x_fll_prepare(struct clk_hw *hw)</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		dev_crit(wm831x-&gt;dev, "Failed to enable FLL: %d\n", ret);</div><div class='ctx'> </div><div class='del'>-	usleep_range(2000, 2000);</div><div class='add'>+	/* wait 2-3 ms for new frequency taking effect */</div><div class='add'>+	usleep_range(2000, 3000);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -243,7 +244,7 @@ static int wm831x_clkout_is_prepared(struct clk_hw *hw)</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(wm831x-&gt;dev, "Unable to read CLOCK_CONTROL_1: %d\n",</div><div class='ctx'> 			ret);</div><div class='del'>-		return true;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (ret &amp; WM831X_CLKOUT_ENA) != 0;</div><div class='head'>diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c<br/>index 97ae60fa1584..bb8a77a5985f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/clkdev.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/clkdev.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/clkdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/clkdev.c</a></div><div class='hunk'>@@ -448,12 +448,20 @@ EXPORT_SYMBOL(clk_register_clkdev);</div><div class='ctx'>  *</div><div class='ctx'>  * con_id or dev_id may be NULL as a wildcard, just as in the rest of</div><div class='ctx'>  * clkdev.</div><div class='add'>+ *</div><div class='add'>+ * To make things easier for mass registration, we detect error clk_hws</div><div class='add'>+ * from a previous clk_hw_register_*() call, and return the error code for</div><div class='add'>+ * those.  This is to permit this function to be called immediately</div><div class='add'>+ * after clk_hw_register_*().</div><div class='ctx'>  */</div><div class='ctx'> int clk_hw_register_clkdev(struct clk_hw *hw, const char *con_id,</div><div class='ctx'> 	const char *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk_lookup *cl;</div><div class='ctx'> </div><div class='add'>+	if (IS_ERR(hw))</div><div class='add'>+		return PTR_ERR(hw);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since dev_id can be NULL, and NULL is handled specially, we must</div><div class='ctx'> 	 * pass it as either a NULL format string, or with "%s".</div><div class='head'>diff --git a/drivers/clk/hisilicon/Kconfig b/drivers/clk/hisilicon/Kconfig<br/>index 3f537a04c6a6..7098bfd32b1b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/hisilicon/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/hisilicon/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/hisilicon/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,11 @@</div><div class='add'>+config COMMON_CLK_HI3516CV300</div><div class='add'>+	tristate "HI3516CV300 Clock Driver"</div><div class='add'>+	depends on ARCH_HISI || COMPILE_TEST</div><div class='add'>+	select RESET_HISI</div><div class='add'>+	default ARCH_HISI</div><div class='add'>+	help</div><div class='add'>+	  Build the clock driver for hi3516cv300.</div><div class='add'>+</div><div class='ctx'> config COMMON_CLK_HI3519</div><div class='ctx'> 	tristate "Hi3519 Clock Driver"</div><div class='ctx'> 	depends on ARCH_HISI || COMPILE_TEST</div><div class='hunk'>@@ -6,6 +14,21 @@ config COMMON_CLK_HI3519</div><div class='ctx'> 	help</div><div class='ctx'> 	  Build the clock driver for hi3519.</div><div class='ctx'> </div><div class='add'>+config COMMON_CLK_HI3660</div><div class='add'>+	bool "Hi3660 Clock Driver"</div><div class='add'>+	depends on ARCH_HISI || COMPILE_TEST</div><div class='add'>+	default ARCH_HISI</div><div class='add'>+	help</div><div class='add'>+	  Build the clock driver for hi3660.</div><div class='add'>+</div><div class='add'>+config COMMON_CLK_HI3798CV200</div><div class='add'>+	tristate "Hi3798CV200 Clock Driver"</div><div class='add'>+	depends on ARCH_HISI || COMPILE_TEST</div><div class='add'>+	select RESET_HISI</div><div class='add'>+	default ARCH_HISI</div><div class='add'>+	help</div><div class='add'>+	  Build the clock driver for hi3798cv200.</div><div class='add'>+</div><div class='ctx'> config COMMON_CLK_HI6220</div><div class='ctx'> 	bool "Hi6220 Clock Driver"</div><div class='ctx'> 	depends on ARCH_HISI || COMPILE_TEST</div><div class='hunk'>@@ -23,5 +46,6 @@ config RESET_HISI</div><div class='ctx'> config STUB_CLK_HI6220</div><div class='ctx'> 	bool "Hi6220 Stub Clock Driver"</div><div class='ctx'> 	depends on COMMON_CLK_HI6220 &amp;&amp; MAILBOX</div><div class='add'>+	default ARCH_HISI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Build the Hisilicon Hi6220 stub clock driver.</div><div class='head'>diff --git a/drivers/clk/hisilicon/Makefile b/drivers/clk/hisilicon/Makefile<br/>index e169ec7da023..1e4c3ddbad84 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/hisilicon/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/hisilicon/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/hisilicon/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/Makefile</a></div><div class='hunk'>@@ -7,7 +7,10 @@ obj-y	+= clk.o clkgate-separated.o clkdivider-hi6220.o</div><div class='ctx'> obj-$(CONFIG_ARCH_HI3xxx)	+= clk-hi3620.o</div><div class='ctx'> obj-$(CONFIG_ARCH_HIP04)	+= clk-hip04.o</div><div class='ctx'> obj-$(CONFIG_ARCH_HIX5HD2)	+= clk-hix5hd2.o</div><div class='add'>+obj-$(CONFIG_COMMON_CLK_HI3516CV300)	+= crg-hi3516cv300.o</div><div class='ctx'> obj-$(CONFIG_COMMON_CLK_HI3519)	+= clk-hi3519.o</div><div class='add'>+obj-$(CONFIG_COMMON_CLK_HI3660) += clk-hi3660.o</div><div class='add'>+obj-$(CONFIG_COMMON_CLK_HI3798CV200)	+= crg-hi3798cv200.o</div><div class='ctx'> obj-$(CONFIG_COMMON_CLK_HI6220)	+= clk-hi6220.o</div><div class='ctx'> obj-$(CONFIG_RESET_HISI)	+= reset.o</div><div class='ctx'> obj-$(CONFIG_STUB_CLK_HI6220)	+= clk-hi6220-stub.o</div><div class='head'>diff --git a/drivers/clk/hisilicon/clk-hi3660.c b/drivers/clk/hisilicon/clk-hi3660.c<br/>new file mode 100644<br/>index 000000000000..96a9697b06cf<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/hisilicon/clk-hi3660.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/clk-hi3660.c</a></div><div class='hunk'>@@ -0,0 +1,567 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016-2017 Linaro Ltd.</div><div class='add'>+ * Copyright (c) 2016-2017 HiSilicon Technologies Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/hi3660-clock.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include "clk.h"</div><div class='add'>+</div><div class='add'>+static const struct hisi_fixed_rate_clock hi3660_fixed_rate_clks[] = {</div><div class='add'>+	{ HI3660_CLKIN_SYS, "clkin_sys", NULL, 0, 19200000, },</div><div class='add'>+	{ HI3660_CLKIN_REF, "clkin_ref", NULL, 0, 32764, },</div><div class='add'>+	{ HI3660_CLK_FLL_SRC, "clk_fll_src", NULL, 0, 128000000, },</div><div class='add'>+	{ HI3660_CLK_PPLL0, "clk_ppll0", NULL, 0, 1600000000, },</div><div class='add'>+	{ HI3660_CLK_PPLL1, "clk_ppll1", NULL, 0, 1866000000, },</div><div class='add'>+	{ HI3660_CLK_PPLL2, "clk_ppll2", NULL, 0, 960000000, },</div><div class='add'>+	{ HI3660_CLK_PPLL3, "clk_ppll3", NULL, 0, 1290000000, },</div><div class='add'>+	{ HI3660_CLK_SCPLL, "clk_scpll", NULL, 0, 245760000, },</div><div class='add'>+	{ HI3660_PCLK, "pclk", NULL, 0, 20000000, },</div><div class='add'>+	{ HI3660_CLK_UART0_DBG, "clk_uart0_dbg", NULL, 0, 19200000, },</div><div class='add'>+	{ HI3660_CLK_UART6, "clk_uart6", NULL, 0, 19200000, },</div><div class='add'>+	{ HI3660_OSC32K, "osc32k", NULL, 0, 32764, },</div><div class='add'>+	{ HI3660_OSC19M, "osc19m", NULL, 0, 19200000, },</div><div class='add'>+	{ HI3660_CLK_480M, "clk_480m", NULL, 0, 480000000, },</div><div class='add'>+	{ HI3660_CLK_INV, "clk_inv", NULL, 0, 10000000, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* crgctrl */</div><div class='add'>+static const struct hisi_fixed_factor_clock hi3660_crg_fixed_factor_clks[] = {</div><div class='add'>+	{ HI3660_FACTOR_UART3, "clk_factor_uart3", "iomcu_peri0", 1, 8, 0, },</div><div class='add'>+	{ HI3660_CLK_FACTOR_MMC, "clk_factor_mmc", "clkin_sys", 1, 6, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_I2C0, "clk_gate_i2c0", "clk_i2c0_iomcu", 1, 4, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_I2C1, "clk_gate_i2c1", "clk_i2c1_iomcu", 1, 4, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_I2C2, "clk_gate_i2c2", "clk_i2c2_iomcu", 1, 4, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_I2C6, "clk_gate_i2c6", "clk_i2c6_iomcu", 1, 4, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_SYSBUS, "clk_div_sysbus", "clk_mux_sysbus", 1, 7, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_320M, "clk_div_320m", "clk_320m_pll_gt", 1, 5, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_A53, "clk_div_a53hpm", "clk_a53hpm_andgt", 1, 2, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_SPI0, "clk_gate_spi0", "clk_ppll0", 1, 8, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_SPI2, "clk_gate_spi2", "clk_ppll0", 1, 8, 0, },</div><div class='add'>+	{ HI3660_PCIEPHY_REF, "clk_pciephy_ref", "clk_div_pciephy", 1, 1, 0, },</div><div class='add'>+	{ HI3660_CLK_ABB_USB, "clk_abb_usb", "clk_gate_usb_tcxo_en", 1, 1, 0 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hisi_gate_clock hi3660_crgctrl_gate_sep_clks[] = {</div><div class='add'>+	{ HI3660_HCLK_GATE_SDIO0, "hclk_gate_sdio0", "clk_div_sysbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x0, 21, 0, },</div><div class='add'>+	{ HI3660_HCLK_GATE_SD, "hclk_gate_sd", "clk_div_sysbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x0, 30, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_AOMM, "clk_gate_aomm", "clk_div_aomm",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x0, 31, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO0, "pclk_gpio0", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 0, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO1, "pclk_gpio1", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 1, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO2, "pclk_gpio2", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 2, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO3, "pclk_gpio3", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 3, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO4, "pclk_gpio4", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 4, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO5, "pclk_gpio5", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 5, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO6, "pclk_gpio6", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 6, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO7, "pclk_gpio7", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 7, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO8, "pclk_gpio8", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 8, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO9, "pclk_gpio9", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 9, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO10, "pclk_gpio10", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 10, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO11, "pclk_gpio11", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 11, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO12, "pclk_gpio12", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 12, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO13, "pclk_gpio13", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 13, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO14, "pclk_gpio14", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 14, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO15, "pclk_gpio15", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 15, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO16, "pclk_gpio16", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 16, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO17, "pclk_gpio17", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 17, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO18, "pclk_gpio18", "clk_div_ioperi",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 18, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO19, "pclk_gpio19", "clk_div_ioperi",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 19, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO20, "pclk_gpio20", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 20, 0, },</div><div class='add'>+	{ HI3660_PCLK_GPIO21, "pclk_gpio21", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 21, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_SPI3, "clk_gate_spi3", "clk_div_ioperi",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 30, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_I2C7, "clk_gate_i2c7", "clk_mux_i2c",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 31, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_I2C3, "clk_gate_i2c3", "clk_mux_i2c",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x20, 7, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_SPI1, "clk_gate_spi1", "clk_mux_spi",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x20, 9, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_UART1, "clk_gate_uart1", "clk_mux_uarth",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x20, 11, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_UART2, "clk_gate_uart2", "clk_mux_uart1",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x20, 12, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_UART4, "clk_gate_uart4", "clk_mux_uarth",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x20, 14, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_UART5, "clk_gate_uart5", "clk_mux_uart1",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x20, 15, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_I2C4, "clk_gate_i2c4", "clk_mux_i2c",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x20, 27, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_DMAC, "clk_gate_dmac", "clk_div_sysbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x30, 1, 0, },</div><div class='add'>+	{ HI3660_PCLK_GATE_DSS, "pclk_gate_dss", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x30, 12, 0, },</div><div class='add'>+	{ HI3660_ACLK_GATE_DSS, "aclk_gate_dss", "clk_gate_vivobus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x30, 13, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_LDI1, "clk_gate_ldi1", "clk_div_ldi1",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x30, 14, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_LDI0, "clk_gate_ldi0", "clk_div_ldi0",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x30, 15, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_VIVOBUS, "clk_gate_vivobus", "clk_div_vivobus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x30, 16, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_EDC0, "clk_gate_edc0", "clk_div_edc0",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x30, 17, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_TXDPHY0_CFG, "clk_gate_txdphy0_cfg", "clkin_sys",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x30, 28, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_TXDPHY0_REF, "clk_gate_txdphy0_ref", "clkin_sys",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x30, 29, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_TXDPHY1_CFG, "clk_gate_txdphy1_cfg", "clkin_sys",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x30, 30, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_TXDPHY1_REF, "clk_gate_txdphy1_ref", "clkin_sys",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x30, 31, 0, },</div><div class='add'>+	{ HI3660_ACLK_GATE_USB3OTG, "aclk_gate_usb3otg", "clk_div_mmc0bus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x40, 1, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_SPI4, "clk_gate_spi4", "clk_mux_spi",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x40, 4, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_SD, "clk_gate_sd", "clk_mux_sd_sys",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x40, 17, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_SDIO0, "clk_gate_sdio0", "clk_mux_sdio_sys",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x40, 19, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_UFS_SUBSYS, "clk_gate_ufs_subsys", "clk_div_sysbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x50, 21, 0, },</div><div class='add'>+	{ HI3660_PCLK_GATE_DSI0, "pclk_gate_dsi0", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x50, 28, 0, },</div><div class='add'>+	{ HI3660_PCLK_GATE_DSI1, "pclk_gate_dsi1", "clk_div_cfgbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x50, 29, 0, },</div><div class='add'>+	{ HI3660_ACLK_GATE_PCIE, "aclk_gate_pcie", "clk_div_mmc1bus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x420, 5, 0, },</div><div class='add'>+	{ HI3660_PCLK_GATE_PCIE_SYS, "pclk_gate_pcie_sys", "clk_div_mmc1bus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x420, 7, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_PCIEAUX, "clk_gate_pcieaux", "clkin_sys",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x420, 8, 0, },</div><div class='add'>+	{ HI3660_PCLK_GATE_PCIE_PHY, "pclk_gate_pcie_phy", "clk_div_mmc1bus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x420, 9, 0, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hisi_gate_clock hi3660_crgctrl_gate_clks[] = {</div><div class='add'>+	{ HI3660_CLK_ANDGT_LDI0, "clk_andgt_ldi0", "clk_mux_ldi0",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf0, 6, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_ANDGT_LDI1, "clk_andgt_ldi1", "clk_mux_ldi1",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf0, 7, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_ANDGT_EDC0, "clk_andgt_edc0", "clk_mux_edc0",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf0, 8, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_GATE_UFSPHY_GT, "clk_gate_ufsphy_gt", "clk_div_ufsperi",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf4, 1, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_ANDGT_MMC, "clk_andgt_mmc", "clk_mux_mmc_pll",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf4, 2, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_ANDGT_SD, "clk_andgt_sd", "clk_mux_sd_pll",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf4, 3, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_A53HPM_ANDGT, "clk_a53hpm_andgt", "clk_mux_a53hpm",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf4, 7, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_ANDGT_SDIO, "clk_andgt_sdio", "clk_mux_sdio_pll",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf4, 8, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_ANDGT_UART0, "clk_andgt_uart0", "clk_div_320m",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf4, 9, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_ANDGT_UART1, "clk_andgt_uart1", "clk_div_320m",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf4, 10, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_ANDGT_UARTH, "clk_andgt_uarth", "clk_div_320m",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf4, 11, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_ANDGT_SPI, "clk_andgt_spi", "clk_div_320m",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf4, 13, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_VIVOBUS_ANDGT, "clk_vivobus_andgt", "clk_mux_vivobus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf8, 1, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_AOMM_ANDGT, "clk_aomm_andgt", "clk_ppll2",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf8, 3, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_320M_PLL_GT, "clk_320m_pll_gt", "clk_mux_320m",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xf8, 10, 0, },</div><div class='add'>+	{ HI3660_AUTODIV_EMMC0BUS, "autodiv_emmc0bus", "autodiv_sysbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x404, 1, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_AUTODIV_SYSBUS, "autodiv_sysbus", "clk_div_sysbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x404, 5, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_GATE_UFSPHY_CFG, "clk_gate_ufsphy_cfg",</div><div class='add'>+	  "clk_div_ufsphy_cfg", CLK_SET_RATE_PARENT, 0x420, 12, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_UFSIO_REF, "clk_gate_ufsio_ref",</div><div class='add'>+	  "clk_gate_ufs_tcxo_en", CLK_SET_RATE_PARENT, 0x420, 14, 0, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_sdio_sys_p[] = {"clk_factor_mmc", "clk_div_sdio",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_sd_sys_p[] = {"clk_factor_mmc", "clk_div_sd",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_pll_p[] = {"clk_ppll0", "clk_ppll1", "clk_ppll2", "clk_ppll2",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_pll0123_p[] = {"clk_ppll0", "clk_ppll1", "clk_ppll2", "clk_ppll3",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_edc0_p[] = {"clk_inv", "clk_ppll0", "clk_ppll1", "clk_inv",</div><div class='add'>+		    "clk_ppll2", "clk_inv", "clk_inv", "clk_inv",</div><div class='add'>+		    "clk_ppll3", "clk_inv", "clk_inv", "clk_inv",</div><div class='add'>+		    "clk_inv", "clk_inv", "clk_inv", "clk_inv",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_ldi0_p[] = {"clk_inv", "clk_ppll0", "clk_ppll2", "clk_inv",</div><div class='add'>+		    "clk_ppll1", "clk_inv", "clk_inv", "clk_inv",</div><div class='add'>+		    "clk_ppll3", "clk_inv", "clk_inv", "clk_inv",</div><div class='add'>+		    "clk_inv", "clk_inv", "clk_inv", "clk_inv",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_uart0_p[] = {"clkin_sys", "clk_div_uart0",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_uart1_p[] = {"clkin_sys", "clk_div_uart1",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_uarth_p[] = {"clkin_sys", "clk_div_uarth",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_pll02p[] = {"clk_ppll0", "clk_ppll2",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_ioperi_p[] = {"clk_div_320m", "clk_div_a53hpm",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_spi_p[] = {"clkin_sys", "clk_div_spi",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_mux_i2c_p[] = {"clkin_sys", "clk_div_i2c",};</div><div class='add'>+</div><div class='add'>+static const struct hisi_mux_clock hi3660_crgctrl_mux_clks[] = {</div><div class='add'>+	{ HI3660_CLK_MUX_SYSBUS, "clk_mux_sysbus", clk_mux_sdio_sys_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_sdio_sys_p), CLK_SET_RATE_PARENT, 0xac, 0, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_UART0, "clk_mux_uart0", clk_mux_uart0_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_uart0_p), CLK_SET_RATE_PARENT, 0xac, 2, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_UART1, "clk_mux_uart1", clk_mux_uart1_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_uart1_p), CLK_SET_RATE_PARENT, 0xac, 3, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_UARTH, "clk_mux_uarth", clk_mux_uarth_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_uarth_p), CLK_SET_RATE_PARENT, 0xac, 4, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_SPI, "clk_mux_spi", clk_mux_spi_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_spi_p), CLK_SET_RATE_PARENT, 0xac, 8, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_I2C, "clk_mux_i2c", clk_mux_i2c_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_i2c_p), CLK_SET_RATE_PARENT, 0xac, 13, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_MMC_PLL, "clk_mux_mmc_pll", clk_mux_pll02p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_pll02p), CLK_SET_RATE_PARENT, 0xb4, 0, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_LDI1, "clk_mux_ldi1", clk_mux_ldi0_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_ldi0_p), CLK_SET_RATE_PARENT, 0xb4, 8, 4,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_LDI0, "clk_mux_ldi0", clk_mux_ldi0_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_ldi0_p), CLK_SET_RATE_PARENT, 0xb4, 12, 4,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_SD_PLL, "clk_mux_sd_pll", clk_mux_pll_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_pll_p), CLK_SET_RATE_PARENT, 0xb8, 4, 2,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_SD_SYS, "clk_mux_sd_sys", clk_mux_sd_sys_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_sd_sys_p), CLK_SET_RATE_PARENT, 0xb8, 6, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_EDC0, "clk_mux_edc0", clk_mux_edc0_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_edc0_p), CLK_SET_RATE_PARENT, 0xbc, 6, 4,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_SDIO_SYS, "clk_mux_sdio_sys", clk_mux_sdio_sys_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_sdio_sys_p), CLK_SET_RATE_PARENT, 0xc0, 6, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_SDIO_PLL, "clk_mux_sdio_pll", clk_mux_pll_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_pll_p), CLK_SET_RATE_PARENT, 0xc0, 4, 2,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_VIVOBUS, "clk_mux_vivobus", clk_mux_pll0123_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_pll0123_p), CLK_SET_RATE_PARENT, 0xd0, 12, 2,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_A53HPM, "clk_mux_a53hpm", clk_mux_pll02p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_pll02p), CLK_SET_RATE_PARENT, 0xd4, 9, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_320M, "clk_mux_320m", clk_mux_pll02p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_pll02p), CLK_SET_RATE_PARENT, 0x100, 0, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MUX_IOPERI, "clk_mux_ioperi", clk_mux_ioperi_p,</div><div class='add'>+	  ARRAY_SIZE(clk_mux_ioperi_p), CLK_SET_RATE_PARENT, 0x108, 10, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hisi_divider_clock hi3660_crgctrl_divider_clks[] = {</div><div class='add'>+	{ HI3660_CLK_DIV_UART0, "clk_div_uart0", "clk_andgt_uart0",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xb0, 4, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_UART1, "clk_div_uart1", "clk_andgt_uart1",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xb0, 8, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_UARTH, "clk_div_uarth", "clk_andgt_uarth",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xb0, 12, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_MMC, "clk_div_mmc", "clk_andgt_mmc",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xb4, 3, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_SD, "clk_div_sd", "clk_andgt_sd",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xb8, 0, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_EDC0, "clk_div_edc0", "clk_andgt_edc0",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xbc, 0, 6, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_LDI0, "clk_div_ldi0", "clk_andgt_ldi0",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xbc, 10, 6, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_SDIO, "clk_div_sdio", "clk_andgt_sdio",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xc0, 0, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_LDI1, "clk_div_ldi1", "clk_andgt_ldi1",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xc0, 8, 6, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_SPI, "clk_div_spi", "clk_andgt_spi",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xc4, 12, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_VIVOBUS, "clk_div_vivobus", "clk_vivobus_andgt",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xd0, 7, 5, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_I2C, "clk_div_i2c", "clk_div_320m",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xe8, 4, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_UFSPHY, "clk_div_ufsphy_cfg", "clk_gate_ufsphy_gt",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xe8, 9, 2, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_CFGBUS, "clk_div_cfgbus", "clk_div_sysbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xec, 0, 2, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_MMC0BUS, "clk_div_mmc0bus", "autodiv_emmc0bus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xec, 2, 1, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_MMC1BUS, "clk_div_mmc1bus", "clk_div_sysbus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xec, 3, 1, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_UFSPERI, "clk_div_ufsperi", "clk_gate_ufs_subsys",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0xec, 14, 1, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_AOMM, "clk_div_aomm", "clk_aomm_andgt",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x100, 7, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_IOPERI, "clk_div_ioperi", "clk_mux_ioperi",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x108, 11, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clk_pmuctrl */</div><div class='add'>+/* pmu register need shift 2 bits */</div><div class='add'>+static const struct hisi_gate_clock hi3660_pmu_gate_clks[] = {</div><div class='add'>+	{ HI3660_GATE_ABB_192, "clk_gate_abb_192", "clkin_sys",</div><div class='add'>+	  CLK_SET_RATE_PARENT, (0x10a &lt;&lt; 2), 3, 0, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clk_pctrl */</div><div class='add'>+static const struct hisi_gate_clock hi3660_pctrl_gate_clks[] = {</div><div class='add'>+	{ HI3660_GATE_UFS_TCXO_EN, "clk_gate_ufs_tcxo_en",</div><div class='add'>+	  "clk_gate_abb_192", CLK_SET_RATE_PARENT, 0x10, 0,</div><div class='add'>+	  CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_GATE_USB_TCXO_EN, "clk_gate_usb_tcxo_en", "clk_gate_abb_192",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 1, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clk_sctrl */</div><div class='add'>+static const struct hisi_gate_clock hi3660_sctrl_gate_sep_clks[] = {</div><div class='add'>+	{ HI3660_PCLK_AO_GPIO0, "pclk_ao_gpio0", "clk_div_aobus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x160, 11, 0, },</div><div class='add'>+	{ HI3660_PCLK_AO_GPIO1, "pclk_ao_gpio1", "clk_div_aobus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x160, 12, 0, },</div><div class='add'>+	{ HI3660_PCLK_AO_GPIO2, "pclk_ao_gpio2", "clk_div_aobus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x160, 13, 0, },</div><div class='add'>+	{ HI3660_PCLK_AO_GPIO3, "pclk_ao_gpio3", "clk_div_aobus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x160, 14, 0, },</div><div class='add'>+	{ HI3660_PCLK_AO_GPIO4, "pclk_ao_gpio4", "clk_div_aobus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x160, 21, 0, },</div><div class='add'>+	{ HI3660_PCLK_AO_GPIO5, "pclk_ao_gpio5", "clk_div_aobus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x160, 22, 0, },</div><div class='add'>+	{ HI3660_PCLK_AO_GPIO6, "pclk_ao_gpio6", "clk_div_aobus",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x160, 25, 0, },</div><div class='add'>+	{ HI3660_PCLK_GATE_MMBUF, "pclk_gate_mmbuf", "pclk_div_mmbuf",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x170, 23, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_DSS_AXI_MM, "clk_gate_dss_axi_mm", "aclk_mux_mmbuf",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x170, 24, 0, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hisi_gate_clock hi3660_sctrl_gate_clks[] = {</div><div class='add'>+	{ HI3660_PCLK_MMBUF_ANDGT, "pclk_mmbuf_andgt", "clk_sw_mmbuf",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x258, 7, CLK_GATE_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_MMBUF_PLL_ANDGT, "clk_mmbuf_pll_andgt", "clk_ppll0",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x260, 11, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_FLL_MMBUF_ANDGT, "clk_fll_mmbuf_andgt", "clk_fll_src",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x260, 12, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_SYS_MMBUF_ANDGT, "clk_sys_mmbuf_andgt", "clkin_sys",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x260, 13, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_GATE_PCIEPHY_GT, "clk_gate_pciephy_gt", "clk_ppll0",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x268, 11, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const</div><div class='add'>+aclk_mux_mmbuf_p[] = {"aclk_div_mmbuf", "clk_gate_aomm",};</div><div class='add'>+static const char *const</div><div class='add'>+clk_sw_mmbuf_p[] = {"clk_sys_mmbuf_andgt", "clk_fll_mmbuf_andgt",</div><div class='add'>+		    "aclk_mux_mmbuf", "aclk_mux_mmbuf"};</div><div class='add'>+</div><div class='add'>+static const struct hisi_mux_clock hi3660_sctrl_mux_clks[] = {</div><div class='add'>+	{ HI3660_ACLK_MUX_MMBUF, "aclk_mux_mmbuf", aclk_mux_mmbuf_p,</div><div class='add'>+	  ARRAY_SIZE(aclk_mux_mmbuf_p), CLK_SET_RATE_PARENT, 0x250, 12, 1,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+	{ HI3660_CLK_SW_MMBUF, "clk_sw_mmbuf", clk_sw_mmbuf_p,</div><div class='add'>+	  ARRAY_SIZE(clk_sw_mmbuf_p), CLK_SET_RATE_PARENT, 0x258, 8, 2,</div><div class='add'>+	  CLK_MUX_HIWORD_MASK, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hisi_divider_clock hi3660_sctrl_divider_clks[] = {</div><div class='add'>+	{ HI3660_CLK_DIV_AOBUS, "clk_div_aobus", "clk_ppll0",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x254, 0, 6, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_PCLK_DIV_MMBUF, "pclk_div_mmbuf", "pclk_mmbuf_andgt",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x258, 10, 2, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_ACLK_DIV_MMBUF, "aclk_div_mmbuf", "clk_mmbuf_pll_andgt",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x258, 12, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+	{ HI3660_CLK_DIV_PCIEPHY, "clk_div_pciephy", "clk_gate_pciephy_gt",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x268, 12, 4, CLK_DIVIDER_HIWORD_MASK, 0, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clk_iomcu */</div><div class='add'>+static const struct hisi_gate_clock hi3660_iomcu_gate_sep_clks[] = {</div><div class='add'>+	{ HI3660_CLK_I2C0_IOMCU, "clk_i2c0_iomcu", "clk_fll_src",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 3, 0, },</div><div class='add'>+	{ HI3660_CLK_I2C1_IOMCU, "clk_i2c1_iomcu", "clk_fll_src",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 4, 0, },</div><div class='add'>+	{ HI3660_CLK_I2C2_IOMCU, "clk_i2c2_iomcu", "clk_fll_src",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 5, 0, },</div><div class='add'>+	{ HI3660_CLK_I2C6_IOMCU, "clk_i2c6_iomcu", "clk_fll_src",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x10, 27, 0, },</div><div class='add'>+	{ HI3660_CLK_IOMCU_PERI0, "iomcu_peri0", "clk_ppll0",</div><div class='add'>+	  CLK_SET_RATE_PARENT, 0x90, 0, 0, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void hi3660_clk_iomcu_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct hisi_clock_data *clk_data;</div><div class='add'>+	int nr = ARRAY_SIZE(hi3660_iomcu_gate_sep_clks);</div><div class='add'>+</div><div class='add'>+	clk_data = hisi_clk_init(np, nr);</div><div class='add'>+	if (!clk_data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hisi_clk_register_gate_sep(hi3660_iomcu_gate_sep_clks,</div><div class='add'>+				   ARRAY_SIZE(hi3660_iomcu_gate_sep_clks),</div><div class='add'>+				   clk_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hi3660_clk_pmuctrl_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct hisi_clock_data *clk_data;</div><div class='add'>+	int nr = ARRAY_SIZE(hi3660_pmu_gate_clks);</div><div class='add'>+</div><div class='add'>+	clk_data = hisi_clk_init(np, nr);</div><div class='add'>+	if (!clk_data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hisi_clk_register_gate(hi3660_pmu_gate_clks,</div><div class='add'>+			       ARRAY_SIZE(hi3660_pmu_gate_clks), clk_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hi3660_clk_pctrl_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct hisi_clock_data *clk_data;</div><div class='add'>+	int nr = ARRAY_SIZE(hi3660_pctrl_gate_clks);</div><div class='add'>+</div><div class='add'>+	clk_data = hisi_clk_init(np, nr);</div><div class='add'>+	if (!clk_data)</div><div class='add'>+		return;</div><div class='add'>+	hisi_clk_register_gate(hi3660_pctrl_gate_clks,</div><div class='add'>+			       ARRAY_SIZE(hi3660_pctrl_gate_clks), clk_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hi3660_clk_sctrl_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct hisi_clock_data *clk_data;</div><div class='add'>+	int nr = ARRAY_SIZE(hi3660_sctrl_gate_clks) +</div><div class='add'>+		 ARRAY_SIZE(hi3660_sctrl_gate_sep_clks) +</div><div class='add'>+		 ARRAY_SIZE(hi3660_sctrl_mux_clks) +</div><div class='add'>+		 ARRAY_SIZE(hi3660_sctrl_divider_clks);</div><div class='add'>+</div><div class='add'>+	clk_data = hisi_clk_init(np, nr);</div><div class='add'>+	if (!clk_data)</div><div class='add'>+		return;</div><div class='add'>+	hisi_clk_register_gate(hi3660_sctrl_gate_clks,</div><div class='add'>+			       ARRAY_SIZE(hi3660_sctrl_gate_clks), clk_data);</div><div class='add'>+	hisi_clk_register_gate_sep(hi3660_sctrl_gate_sep_clks,</div><div class='add'>+				   ARRAY_SIZE(hi3660_sctrl_gate_sep_clks),</div><div class='add'>+				   clk_data);</div><div class='add'>+	hisi_clk_register_mux(hi3660_sctrl_mux_clks,</div><div class='add'>+			      ARRAY_SIZE(hi3660_sctrl_mux_clks), clk_data);</div><div class='add'>+	hisi_clk_register_divider(hi3660_sctrl_divider_clks,</div><div class='add'>+				  ARRAY_SIZE(hi3660_sctrl_divider_clks),</div><div class='add'>+				  clk_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hi3660_clk_crgctrl_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct hisi_clock_data *clk_data;</div><div class='add'>+	int nr = ARRAY_SIZE(hi3660_fixed_rate_clks) +</div><div class='add'>+		 ARRAY_SIZE(hi3660_crgctrl_gate_sep_clks) +</div><div class='add'>+		 ARRAY_SIZE(hi3660_crgctrl_gate_clks) +</div><div class='add'>+		 ARRAY_SIZE(hi3660_crgctrl_mux_clks) +</div><div class='add'>+		 ARRAY_SIZE(hi3660_crg_fixed_factor_clks) +</div><div class='add'>+		 ARRAY_SIZE(hi3660_crgctrl_divider_clks);</div><div class='add'>+</div><div class='add'>+	clk_data = hisi_clk_init(np, nr);</div><div class='add'>+	if (!clk_data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hisi_clk_register_fixed_rate(hi3660_fixed_rate_clks,</div><div class='add'>+				     ARRAY_SIZE(hi3660_fixed_rate_clks),</div><div class='add'>+				     clk_data);</div><div class='add'>+	hisi_clk_register_gate_sep(hi3660_crgctrl_gate_sep_clks,</div><div class='add'>+				   ARRAY_SIZE(hi3660_crgctrl_gate_sep_clks),</div><div class='add'>+				   clk_data);</div><div class='add'>+	hisi_clk_register_gate(hi3660_crgctrl_gate_clks,</div><div class='add'>+			       ARRAY_SIZE(hi3660_crgctrl_gate_clks),</div><div class='add'>+			       clk_data);</div><div class='add'>+	hisi_clk_register_mux(hi3660_crgctrl_mux_clks,</div><div class='add'>+			      ARRAY_SIZE(hi3660_crgctrl_mux_clks),</div><div class='add'>+			      clk_data);</div><div class='add'>+	hisi_clk_register_fixed_factor(hi3660_crg_fixed_factor_clks,</div><div class='add'>+				       ARRAY_SIZE(hi3660_crg_fixed_factor_clks),</div><div class='add'>+				       clk_data);</div><div class='add'>+	hisi_clk_register_divider(hi3660_crgctrl_divider_clks,</div><div class='add'>+				  ARRAY_SIZE(hi3660_crgctrl_divider_clks),</div><div class='add'>+				  clk_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id hi3660_clk_match_table[] = {</div><div class='add'>+	{ .compatible = "hisilicon,hi3660-crgctrl",</div><div class='add'>+	  .data = hi3660_clk_crgctrl_init },</div><div class='add'>+	{ .compatible = "hisilicon,hi3660-pctrl",</div><div class='add'>+	  .data = hi3660_clk_pctrl_init },</div><div class='add'>+	{ .compatible = "hisilicon,hi3660-pmuctrl",</div><div class='add'>+	  .data = hi3660_clk_pmuctrl_init },</div><div class='add'>+	{ .compatible = "hisilicon,hi3660-sctrl",</div><div class='add'>+	  .data = hi3660_clk_sctrl_init },</div><div class='add'>+	{ .compatible = "hisilicon,hi3660-iomcu",</div><div class='add'>+	  .data = hi3660_clk_iomcu_init },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hi3660_clk_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+	void (*init_func)(struct device_node *np);</div><div class='add'>+</div><div class='add'>+	init_func = of_device_get_match_data(dev);</div><div class='add'>+	if (!init_func)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	init_func(np);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver hi3660_clk_driver = {</div><div class='add'>+	.probe          = hi3660_clk_probe,</div><div class='add'>+	.driver         = {</div><div class='add'>+		.name   = "hi3660-clk",</div><div class='add'>+		.of_match_table = hi3660_clk_match_table,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init hi3660_clk_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;hi3660_clk_driver);</div><div class='add'>+}</div><div class='add'>+core_initcall(hi3660_clk_init);</div><div class='head'>diff --git a/drivers/clk/hisilicon/clkgate-separated.c b/drivers/clk/hisilicon/clkgate-separated.c<br/>index a47812f56a17..7908bc3c9ec7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/hisilicon/clkgate-separated.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/hisilicon/clkgate-separated.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/hisilicon/clkgate-separated.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/clkgate-separated.c</a></div><div class='hunk'>@@ -120,6 +120,7 @@ struct clk *hisi_register_clkgate_sep(struct device *dev, const char *name,</div><div class='ctx'> 	sclk-&gt;bit_idx = bit_idx;</div><div class='ctx'> 	sclk-&gt;flags = clk_gate_flags;</div><div class='ctx'> 	sclk-&gt;hw.init = &amp;init;</div><div class='add'>+	sclk-&gt;lock = lock;</div><div class='ctx'> </div><div class='ctx'> 	clk = clk_register(dev, &amp;sclk-&gt;hw);</div><div class='ctx'> 	if (IS_ERR(clk))</div><div class='head'>diff --git a/drivers/clk/hisilicon/crg-hi3516cv300.c b/drivers/clk/hisilicon/crg-hi3516cv300.c<br/>new file mode 100644<br/>index 000000000000..2007123832bb<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/hisilicon/crg-hi3516cv300.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/crg-hi3516cv300.c</a></div><div class='hunk'>@@ -0,0 +1,330 @@</div><div class='add'>+/*</div><div class='add'>+ * Hi3516CV300 Clock and Reset Generator Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 HiSilicon Technologies Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/hi3516cv300-clock.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include "clk.h"</div><div class='add'>+#include "crg.h"</div><div class='add'>+#include "reset.h"</div><div class='add'>+</div><div class='add'>+/* hi3516CV300 core CRG */</div><div class='add'>+#define HI3516CV300_INNER_CLK_OFFSET	64</div><div class='add'>+#define HI3516CV300_FIXED_3M		65</div><div class='add'>+#define HI3516CV300_FIXED_6M		66</div><div class='add'>+#define HI3516CV300_FIXED_24M		67</div><div class='add'>+#define HI3516CV300_FIXED_49P5		68</div><div class='add'>+#define HI3516CV300_FIXED_50M		69</div><div class='add'>+#define HI3516CV300_FIXED_83P3M		70</div><div class='add'>+#define HI3516CV300_FIXED_99M		71</div><div class='add'>+#define HI3516CV300_FIXED_100M		72</div><div class='add'>+#define HI3516CV300_FIXED_148P5M	73</div><div class='add'>+#define HI3516CV300_FIXED_198M		74</div><div class='add'>+#define HI3516CV300_FIXED_297M		75</div><div class='add'>+#define HI3516CV300_UART_MUX		76</div><div class='add'>+#define HI3516CV300_FMC_MUX		77</div><div class='add'>+#define HI3516CV300_MMC0_MUX		78</div><div class='add'>+#define HI3516CV300_MMC1_MUX		79</div><div class='add'>+#define HI3516CV300_MMC2_MUX		80</div><div class='add'>+#define HI3516CV300_MMC3_MUX		81</div><div class='add'>+#define HI3516CV300_PWM_MUX		82</div><div class='add'>+#define HI3516CV300_CRG_NR_CLKS		128</div><div class='add'>+</div><div class='add'>+static const struct hisi_fixed_rate_clock hi3516cv300_fixed_rate_clks[] = {</div><div class='add'>+	{ HI3516CV300_FIXED_3M, "3m", NULL, 0, 3000000, },</div><div class='add'>+	{ HI3516CV300_FIXED_6M, "6m", NULL, 0, 6000000, },</div><div class='add'>+	{ HI3516CV300_FIXED_24M, "24m", NULL, 0, 24000000, },</div><div class='add'>+	{ HI3516CV300_FIXED_49P5, "49.5m", NULL, 0, 49500000, },</div><div class='add'>+	{ HI3516CV300_FIXED_50M, "50m", NULL, 0, 50000000, },</div><div class='add'>+	{ HI3516CV300_FIXED_83P3M, "83.3m", NULL, 0, 83300000, },</div><div class='add'>+	{ HI3516CV300_FIXED_99M, "99m", NULL, 0, 99000000, },</div><div class='add'>+	{ HI3516CV300_FIXED_100M, "100m", NULL, 0, 100000000, },</div><div class='add'>+	{ HI3516CV300_FIXED_148P5M, "148.5m", NULL, 0, 148500000, },</div><div class='add'>+	{ HI3516CV300_FIXED_198M, "198m", NULL, 0, 198000000, },</div><div class='add'>+	{ HI3516CV300_FIXED_297M, "297m", NULL, 0, 297000000, },</div><div class='add'>+	{ HI3516CV300_APB_CLK, "apb", NULL, 0, 50000000, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const uart_mux_p[] = {"24m", "6m"};</div><div class='add'>+static const char *const fmc_mux_p[] = {</div><div class='add'>+	"24m", "83.3m", "148.5m", "198m", "297m"</div><div class='add'>+};</div><div class='add'>+static const char *const mmc_mux_p[] = {"49.5m"};</div><div class='add'>+static const char *const mmc2_mux_p[] = {"99m", "49.5m"};</div><div class='add'>+static const char *const pwm_mux_p[] = {"3m", "50m", "24m", "24m"};</div><div class='add'>+</div><div class='add'>+static u32 uart_mux_table[] = {0, 1};</div><div class='add'>+static u32 fmc_mux_table[] = {0, 1, 2, 3, 4};</div><div class='add'>+static u32 mmc_mux_table[] = {0};</div><div class='add'>+static u32 mmc2_mux_table[] = {0, 2};</div><div class='add'>+static u32 pwm_mux_table[] = {0, 1, 2, 3};</div><div class='add'>+</div><div class='add'>+static const struct hisi_mux_clock hi3516cv300_mux_clks[] = {</div><div class='add'>+	{ HI3516CV300_UART_MUX, "uart_mux", uart_mux_p, ARRAY_SIZE(uart_mux_p),</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xe4, 19, 1, 0, uart_mux_table, },</div><div class='add'>+	{ HI3516CV300_FMC_MUX, "fmc_mux", fmc_mux_p, ARRAY_SIZE(fmc_mux_p),</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xc0, 2, 3, 0, fmc_mux_table, },</div><div class='add'>+	{ HI3516CV300_MMC0_MUX, "mmc0_mux", mmc_mux_p, ARRAY_SIZE(mmc_mux_p),</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xc4, 4, 2, 0, mmc_mux_table, },</div><div class='add'>+	{ HI3516CV300_MMC1_MUX, "mmc1_mux", mmc_mux_p, ARRAY_SIZE(mmc_mux_p),</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xc4, 12, 2, 0, mmc_mux_table, },</div><div class='add'>+	{ HI3516CV300_MMC2_MUX, "mmc2_mux", mmc2_mux_p, ARRAY_SIZE(mmc2_mux_p),</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xc4, 20, 2, 0, mmc2_mux_table, },</div><div class='add'>+	{ HI3516CV300_MMC3_MUX, "mmc3_mux", mmc_mux_p, ARRAY_SIZE(mmc_mux_p),</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xc8, 4, 2, 0, mmc_mux_table, },</div><div class='add'>+	{ HI3516CV300_PWM_MUX, "pwm_mux", pwm_mux_p, ARRAY_SIZE(pwm_mux_p),</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x38, 2, 2, 0, pwm_mux_table, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hisi_gate_clock hi3516cv300_gate_clks[] = {</div><div class='add'>+</div><div class='add'>+	{ HI3516CV300_UART0_CLK, "clk_uart0", "uart_mux", CLK_SET_RATE_PARENT,</div><div class='add'>+		0xe4, 15, 0, },</div><div class='add'>+	{ HI3516CV300_UART1_CLK, "clk_uart1", "uart_mux", CLK_SET_RATE_PARENT,</div><div class='add'>+		0xe4, 16, 0, },</div><div class='add'>+	{ HI3516CV300_UART2_CLK, "clk_uart2", "uart_mux", CLK_SET_RATE_PARENT,</div><div class='add'>+		0xe4, 17, 0, },</div><div class='add'>+</div><div class='add'>+	{ HI3516CV300_SPI0_CLK, "clk_spi0", "100m", CLK_SET_RATE_PARENT,</div><div class='add'>+		0xe4, 13, 0, },</div><div class='add'>+	{ HI3516CV300_SPI1_CLK, "clk_spi1", "100m", CLK_SET_RATE_PARENT,</div><div class='add'>+		0xe4, 14, 0, },</div><div class='add'>+</div><div class='add'>+	{ HI3516CV300_FMC_CLK, "clk_fmc", "fmc_mux", CLK_SET_RATE_PARENT,</div><div class='add'>+		0xc0, 1, 0, },</div><div class='add'>+	{ HI3516CV300_MMC0_CLK, "clk_mmc0", "mmc0_mux", CLK_SET_RATE_PARENT,</div><div class='add'>+		0xc4, 1, 0, },</div><div class='add'>+	{ HI3516CV300_MMC1_CLK, "clk_mmc1", "mmc1_mux", CLK_SET_RATE_PARENT,</div><div class='add'>+		0xc4, 9, 0, },</div><div class='add'>+	{ HI3516CV300_MMC2_CLK, "clk_mmc2", "mmc2_mux", CLK_SET_RATE_PARENT,</div><div class='add'>+		0xc4, 17, 0, },</div><div class='add'>+	{ HI3516CV300_MMC3_CLK, "clk_mmc3", "mmc3_mux", CLK_SET_RATE_PARENT,</div><div class='add'>+		0xc8, 1, 0, },</div><div class='add'>+</div><div class='add'>+	{ HI3516CV300_ETH_CLK, "clk_eth", NULL, 0, 0xec, 1, 0, },</div><div class='add'>+</div><div class='add'>+	{ HI3516CV300_DMAC_CLK, "clk_dmac", NULL, 0, 0xd8, 5, 0, },</div><div class='add'>+	{ HI3516CV300_PWM_CLK, "clk_pwm", "pwm_mux", CLK_SET_RATE_PARENT,</div><div class='add'>+		0x38, 1, 0, },</div><div class='add'>+</div><div class='add'>+	{ HI3516CV300_USB2_BUS_CLK, "clk_usb2_bus", NULL, 0, 0xb8, 0, 0, },</div><div class='add'>+	{ HI3516CV300_USB2_OHCI48M_CLK, "clk_usb2_ohci48m", NULL, 0,</div><div class='add'>+		0xb8, 1, 0, },</div><div class='add'>+	{ HI3516CV300_USB2_OHCI12M_CLK, "clk_usb2_ohci12m", NULL, 0,</div><div class='add'>+		0xb8, 2, 0, },</div><div class='add'>+	{ HI3516CV300_USB2_OTG_UTMI_CLK, "clk_usb2_otg_utmi", NULL, 0,</div><div class='add'>+		0xb8, 3, 0, },</div><div class='add'>+	{ HI3516CV300_USB2_HST_PHY_CLK, "clk_usb2_hst_phy", NULL, 0,</div><div class='add'>+		0xb8, 4, 0, },</div><div class='add'>+	{ HI3516CV300_USB2_UTMI0_CLK, "clk_usb2_utmi0", NULL, 0, 0xb8, 5, 0, },</div><div class='add'>+	{ HI3516CV300_USB2_PHY_CLK, "clk_usb2_phy", NULL, 0, 0xb8, 7, 0, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct hisi_clock_data *hi3516cv300_clk_register(</div><div class='add'>+		struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_clock_data *clk_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	clk_data = hisi_clk_alloc(pdev, HI3516CV300_CRG_NR_CLKS);</div><div class='add'>+	if (!clk_data)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ret = hisi_clk_register_fixed_rate(hi3516cv300_fixed_rate_clks,</div><div class='add'>+			ARRAY_SIZE(hi3516cv300_fixed_rate_clks), clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	ret = hisi_clk_register_mux(hi3516cv300_mux_clks,</div><div class='add'>+			ARRAY_SIZE(hi3516cv300_mux_clks), clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unregister_fixed_rate;</div><div class='add'>+</div><div class='add'>+	ret = hisi_clk_register_gate(hi3516cv300_gate_clks,</div><div class='add'>+			ARRAY_SIZE(hi3516cv300_gate_clks), clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unregister_mux;</div><div class='add'>+</div><div class='add'>+	ret = of_clk_add_provider(pdev-&gt;dev.of_node,</div><div class='add'>+			of_clk_src_onecell_get, &amp;clk_data-&gt;clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unregister_gate;</div><div class='add'>+</div><div class='add'>+	return clk_data;</div><div class='add'>+</div><div class='add'>+unregister_gate:</div><div class='add'>+	hisi_clk_unregister_gate(hi3516cv300_gate_clks,</div><div class='add'>+				ARRAY_SIZE(hi3516cv300_gate_clks), clk_data);</div><div class='add'>+unregister_mux:</div><div class='add'>+	hisi_clk_unregister_mux(hi3516cv300_mux_clks,</div><div class='add'>+			ARRAY_SIZE(hi3516cv300_mux_clks), clk_data);</div><div class='add'>+unregister_fixed_rate:</div><div class='add'>+	hisi_clk_unregister_fixed_rate(hi3516cv300_fixed_rate_clks,</div><div class='add'>+			ARRAY_SIZE(hi3516cv300_fixed_rate_clks), clk_data);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hi3516cv300_clk_unregister(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_crg_dev *crg = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	of_clk_del_provider(pdev-&gt;dev.of_node);</div><div class='add'>+</div><div class='add'>+	hisi_clk_unregister_gate(hi3516cv300_gate_clks,</div><div class='add'>+			ARRAY_SIZE(hi3516cv300_gate_clks), crg-&gt;clk_data);</div><div class='add'>+	hisi_clk_unregister_mux(hi3516cv300_mux_clks,</div><div class='add'>+			ARRAY_SIZE(hi3516cv300_mux_clks), crg-&gt;clk_data);</div><div class='add'>+	hisi_clk_unregister_fixed_rate(hi3516cv300_fixed_rate_clks,</div><div class='add'>+			ARRAY_SIZE(hi3516cv300_fixed_rate_clks), crg-&gt;clk_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hisi_crg_funcs hi3516cv300_crg_funcs = {</div><div class='add'>+	.register_clks = hi3516cv300_clk_register,</div><div class='add'>+	.unregister_clks = hi3516cv300_clk_unregister,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hi3516CV300 sysctrl CRG */</div><div class='add'>+#define HI3516CV300_SYSCTRL_NR_CLKS 16</div><div class='add'>+</div><div class='add'>+static const char *wdt_mux_p[] __initconst = { "3m", "apb" };</div><div class='add'>+static u32 wdt_mux_table[] = {0, 1};</div><div class='add'>+</div><div class='add'>+static const struct hisi_mux_clock hi3516cv300_sysctrl_mux_clks[] = {</div><div class='add'>+	{ HI3516CV300_WDT_CLK, "wdt", wdt_mux_p, ARRAY_SIZE(wdt_mux_p),</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x0, 23, 1, 0, wdt_mux_table, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct hisi_clock_data *hi3516cv300_sysctrl_clk_register(</div><div class='add'>+		struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_clock_data *clk_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	clk_data = hisi_clk_alloc(pdev, HI3516CV300_SYSCTRL_NR_CLKS);</div><div class='add'>+	if (!clk_data)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ret = hisi_clk_register_mux(hi3516cv300_sysctrl_mux_clks,</div><div class='add'>+			ARRAY_SIZE(hi3516cv300_sysctrl_mux_clks), clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	ret = of_clk_add_provider(pdev-&gt;dev.of_node,</div><div class='add'>+			of_clk_src_onecell_get, &amp;clk_data-&gt;clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unregister_mux;</div><div class='add'>+</div><div class='add'>+	return clk_data;</div><div class='add'>+</div><div class='add'>+unregister_mux:</div><div class='add'>+	hisi_clk_unregister_mux(hi3516cv300_sysctrl_mux_clks,</div><div class='add'>+			ARRAY_SIZE(hi3516cv300_sysctrl_mux_clks), clk_data);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hi3516cv300_sysctrl_clk_unregister(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_crg_dev *crg = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	of_clk_del_provider(pdev-&gt;dev.of_node);</div><div class='add'>+</div><div class='add'>+	hisi_clk_unregister_mux(hi3516cv300_sysctrl_mux_clks,</div><div class='add'>+			ARRAY_SIZE(hi3516cv300_sysctrl_mux_clks),</div><div class='add'>+			crg-&gt;clk_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hisi_crg_funcs hi3516cv300_sysctrl_funcs = {</div><div class='add'>+	.register_clks = hi3516cv300_sysctrl_clk_register,</div><div class='add'>+	.unregister_clks = hi3516cv300_sysctrl_clk_unregister,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id hi3516cv300_crg_match_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "hisilicon,hi3516cv300-crg",</div><div class='add'>+		.data = &amp;hi3516cv300_crg_funcs</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "hisilicon,hi3516cv300-sysctrl",</div><div class='add'>+		.data = &amp;hi3516cv300_sysctrl_funcs</div><div class='add'>+	},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, hi3516cv300_crg_match_table);</div><div class='add'>+</div><div class='add'>+static int hi3516cv300_crg_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_crg_dev *crg;</div><div class='add'>+</div><div class='add'>+	crg = devm_kmalloc(&amp;pdev-&gt;dev, sizeof(*crg), GFP_KERNEL);</div><div class='add'>+	if (!crg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	crg-&gt;funcs = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!crg-&gt;funcs)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	crg-&gt;rstc = hisi_reset_init(pdev);</div><div class='add'>+	if (!crg-&gt;rstc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	crg-&gt;clk_data = crg-&gt;funcs-&gt;register_clks(pdev);</div><div class='add'>+	if (IS_ERR(crg-&gt;clk_data)) {</div><div class='add'>+		hisi_reset_exit(crg-&gt;rstc);</div><div class='add'>+		return PTR_ERR(crg-&gt;clk_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, crg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hi3516cv300_crg_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_crg_dev *crg = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	hisi_reset_exit(crg-&gt;rstc);</div><div class='add'>+	crg-&gt;funcs-&gt;unregister_clks(pdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver hi3516cv300_crg_driver = {</div><div class='add'>+	.probe          = hi3516cv300_crg_probe,</div><div class='add'>+	.remove		= hi3516cv300_crg_remove,</div><div class='add'>+	.driver         = {</div><div class='add'>+		.name   = "hi3516cv300-crg",</div><div class='add'>+		.of_match_table = hi3516cv300_crg_match_table,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init hi3516cv300_crg_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;hi3516cv300_crg_driver);</div><div class='add'>+}</div><div class='add'>+core_initcall(hi3516cv300_crg_init);</div><div class='add'>+</div><div class='add'>+static void __exit hi3516cv300_crg_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;hi3516cv300_crg_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(hi3516cv300_crg_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("HiSilicon Hi3516CV300 CRG Driver");</div><div class='head'>diff --git a/drivers/clk/hisilicon/crg-hi3798cv200.c b/drivers/clk/hisilicon/crg-hi3798cv200.c<br/>new file mode 100644<br/>index 000000000000..fc8b5bc2d50d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/hisilicon/crg-hi3798cv200.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/crg-hi3798cv200.c</a></div><div class='hunk'>@@ -0,0 +1,337 @@</div><div class='add'>+/*</div><div class='add'>+ * Hi3798CV200 Clock and Reset Generator Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 HiSilicon Technologies Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/histb-clock.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include "clk.h"</div><div class='add'>+#include "crg.h"</div><div class='add'>+#include "reset.h"</div><div class='add'>+</div><div class='add'>+/* hi3798CV200 core CRG */</div><div class='add'>+#define HI3798CV200_INNER_CLK_OFFSET	64</div><div class='add'>+#define HI3798CV200_FIXED_24M	65</div><div class='add'>+#define HI3798CV200_FIXED_25M	66</div><div class='add'>+#define HI3798CV200_FIXED_50M	67</div><div class='add'>+#define HI3798CV200_FIXED_75M	68</div><div class='add'>+#define HI3798CV200_FIXED_100M	69</div><div class='add'>+#define HI3798CV200_FIXED_150M	70</div><div class='add'>+#define HI3798CV200_FIXED_200M	71</div><div class='add'>+#define HI3798CV200_FIXED_250M	72</div><div class='add'>+#define HI3798CV200_FIXED_300M	73</div><div class='add'>+#define HI3798CV200_FIXED_400M	74</div><div class='add'>+#define HI3798CV200_MMC_MUX	75</div><div class='add'>+#define HI3798CV200_ETH_PUB_CLK	76</div><div class='add'>+#define HI3798CV200_ETH_BUS_CLK	77</div><div class='add'>+#define HI3798CV200_ETH_BUS0_CLK	78</div><div class='add'>+#define HI3798CV200_ETH_BUS1_CLK	79</div><div class='add'>+#define HI3798CV200_COMBPHY1_MUX	80</div><div class='add'>+</div><div class='add'>+#define HI3798CV200_CRG_NR_CLKS		128</div><div class='add'>+</div><div class='add'>+static const struct hisi_fixed_rate_clock hi3798cv200_fixed_rate_clks[] = {</div><div class='add'>+	{ HISTB_OSC_CLK, "clk_osc", NULL, 0, 24000000, },</div><div class='add'>+	{ HISTB_APB_CLK, "clk_apb", NULL, 0, 100000000, },</div><div class='add'>+	{ HISTB_AHB_CLK, "clk_ahb", NULL, 0, 200000000, },</div><div class='add'>+	{ HI3798CV200_FIXED_24M, "24m", NULL, 0, 24000000, },</div><div class='add'>+	{ HI3798CV200_FIXED_25M, "25m", NULL, 0, 25000000, },</div><div class='add'>+	{ HI3798CV200_FIXED_50M, "50m", NULL, 0, 50000000, },</div><div class='add'>+	{ HI3798CV200_FIXED_75M, "75m", NULL, 0, 75000000, },</div><div class='add'>+	{ HI3798CV200_FIXED_100M, "100m", NULL, 0, 100000000, },</div><div class='add'>+	{ HI3798CV200_FIXED_150M, "150m", NULL, 0, 150000000, },</div><div class='add'>+	{ HI3798CV200_FIXED_200M, "200m", NULL, 0, 200000000, },</div><div class='add'>+	{ HI3798CV200_FIXED_250M, "250m", NULL, 0, 250000000, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const mmc_mux_p[] = {</div><div class='add'>+		"100m", "50m", "25m", "200m", "150m" };</div><div class='add'>+static u32 mmc_mux_table[] = {0, 1, 2, 3, 6};</div><div class='add'>+</div><div class='add'>+static const char *const comphy1_mux_p[] = {</div><div class='add'>+		"100m", "25m"};</div><div class='add'>+static u32 comphy1_mux_table[] = {2, 3};</div><div class='add'>+</div><div class='add'>+static struct hisi_mux_clock hi3798cv200_mux_clks[] = {</div><div class='add'>+	{ HI3798CV200_MMC_MUX, "mmc_mux", mmc_mux_p, ARRAY_SIZE(mmc_mux_p),</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xa0, 8, 3, 0, mmc_mux_table, },</div><div class='add'>+	{ HI3798CV200_COMBPHY1_MUX, "combphy1_mux",</div><div class='add'>+		comphy1_mux_p, ARRAY_SIZE(comphy1_mux_p),</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x188, 10, 2, 0, comphy1_mux_table, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hisi_gate_clock hi3798cv200_gate_clks[] = {</div><div class='add'>+	/* UART */</div><div class='add'>+	{ HISTB_UART2_CLK, "clk_uart2", "75m",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x68, 4, 0, },</div><div class='add'>+	/* I2C */</div><div class='add'>+	{ HISTB_I2C0_CLK, "clk_i2c0", "clk_apb",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x6C, 4, 0, },</div><div class='add'>+	{ HISTB_I2C1_CLK, "clk_i2c1", "clk_apb",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x6C, 8, 0, },</div><div class='add'>+	{ HISTB_I2C2_CLK, "clk_i2c2", "clk_apb",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x6C, 12, 0, },</div><div class='add'>+	{ HISTB_I2C3_CLK, "clk_i2c3", "clk_apb",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x6C, 16, 0, },</div><div class='add'>+	{ HISTB_I2C4_CLK, "clk_i2c4", "clk_apb",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x6C, 20, 0, },</div><div class='add'>+	/* SPI */</div><div class='add'>+	{ HISTB_SPI0_CLK, "clk_spi0", "clk_apb",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x70, 0, 0, },</div><div class='add'>+	/* SDIO */</div><div class='add'>+	{ HISTB_SDIO0_BIU_CLK, "clk_sdio0_biu", "200m",</div><div class='add'>+			CLK_SET_RATE_PARENT, 0x9c, 0, 0, },</div><div class='add'>+	{ HISTB_SDIO0_CIU_CLK, "clk_sdio0_ciu", "mmc_mux",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x9c, 1, 0, },</div><div class='add'>+	/* EMMC */</div><div class='add'>+	{ HISTB_MMC_BIU_CLK, "clk_mmc_biu", "200m",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xa0, 0, 0, },</div><div class='add'>+	{ HISTB_MMC_CIU_CLK, "clk_mmc_ciu", "mmc_mux",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xa0, 1, 0, },</div><div class='add'>+	/* PCIE*/</div><div class='add'>+	{ HISTB_PCIE_BUS_CLK, "clk_pcie_bus", "200m",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x18c, 0, 0, },</div><div class='add'>+	{ HISTB_PCIE_SYS_CLK, "clk_pcie_sys", "100m",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x18c, 1, 0, },</div><div class='add'>+	{ HISTB_PCIE_PIPE_CLK, "clk_pcie_pipe", "250m",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x18c, 2, 0, },</div><div class='add'>+	{ HISTB_PCIE_AUX_CLK, "clk_pcie_aux", "24m",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x18c, 3, 0, },</div><div class='add'>+	/* Ethernet */</div><div class='add'>+	{ HI3798CV200_ETH_PUB_CLK, "clk_pub", NULL,</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xcc, 5, 0, },</div><div class='add'>+	{ HI3798CV200_ETH_BUS_CLK, "clk_bus", "clk_pub",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xcc, 0, 0, },</div><div class='add'>+	{ HI3798CV200_ETH_BUS0_CLK, "clk_bus_m0", "clk_bus",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xcc, 1, 0, },</div><div class='add'>+	{ HI3798CV200_ETH_BUS1_CLK, "clk_bus_m1", "clk_bus",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xcc, 2, 0, },</div><div class='add'>+	{ HISTB_ETH0_MAC_CLK, "clk_mac0", "clk_bus_m0",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xcc, 3, 0, },</div><div class='add'>+	{ HISTB_ETH0_MACIF_CLK, "clk_macif0", "clk_bus_m0",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xcc, 24, 0, },</div><div class='add'>+	{ HISTB_ETH1_MAC_CLK, "clk_mac1", "clk_bus_m1",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xcc, 4, 0, },</div><div class='add'>+	{ HISTB_ETH1_MACIF_CLK, "clk_macif1", "clk_bus_m1",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0xcc, 25, 0, },</div><div class='add'>+	/* COMBPHY1 */</div><div class='add'>+	{ HISTB_COMBPHY1_CLK, "clk_combphy1", "combphy1_mux",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x188, 8, 0, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct hisi_clock_data *hi3798cv200_clk_register(</div><div class='add'>+				struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_clock_data *clk_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	clk_data = hisi_clk_alloc(pdev, HI3798CV200_CRG_NR_CLKS);</div><div class='add'>+	if (!clk_data)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ret = hisi_clk_register_fixed_rate(hi3798cv200_fixed_rate_clks,</div><div class='add'>+				     ARRAY_SIZE(hi3798cv200_fixed_rate_clks),</div><div class='add'>+				     clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	ret = hisi_clk_register_mux(hi3798cv200_mux_clks,</div><div class='add'>+				ARRAY_SIZE(hi3798cv200_mux_clks),</div><div class='add'>+				clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unregister_fixed_rate;</div><div class='add'>+</div><div class='add'>+	ret = hisi_clk_register_gate(hi3798cv200_gate_clks,</div><div class='add'>+				ARRAY_SIZE(hi3798cv200_gate_clks),</div><div class='add'>+				clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unregister_mux;</div><div class='add'>+</div><div class='add'>+	ret = of_clk_add_provider(pdev-&gt;dev.of_node,</div><div class='add'>+			of_clk_src_onecell_get, &amp;clk_data-&gt;clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unregister_gate;</div><div class='add'>+</div><div class='add'>+	return clk_data;</div><div class='add'>+</div><div class='add'>+unregister_fixed_rate:</div><div class='add'>+	hisi_clk_unregister_fixed_rate(hi3798cv200_fixed_rate_clks,</div><div class='add'>+				ARRAY_SIZE(hi3798cv200_fixed_rate_clks),</div><div class='add'>+				clk_data);</div><div class='add'>+</div><div class='add'>+unregister_mux:</div><div class='add'>+	hisi_clk_unregister_mux(hi3798cv200_mux_clks,</div><div class='add'>+				ARRAY_SIZE(hi3798cv200_mux_clks),</div><div class='add'>+				clk_data);</div><div class='add'>+unregister_gate:</div><div class='add'>+	hisi_clk_unregister_gate(hi3798cv200_gate_clks,</div><div class='add'>+				ARRAY_SIZE(hi3798cv200_gate_clks),</div><div class='add'>+				clk_data);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hi3798cv200_clk_unregister(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_crg_dev *crg = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	of_clk_del_provider(pdev-&gt;dev.of_node);</div><div class='add'>+</div><div class='add'>+	hisi_clk_unregister_gate(hi3798cv200_gate_clks,</div><div class='add'>+				ARRAY_SIZE(hi3798cv200_gate_clks),</div><div class='add'>+				crg-&gt;clk_data);</div><div class='add'>+	hisi_clk_unregister_mux(hi3798cv200_mux_clks,</div><div class='add'>+				ARRAY_SIZE(hi3798cv200_mux_clks),</div><div class='add'>+				crg-&gt;clk_data);</div><div class='add'>+	hisi_clk_unregister_fixed_rate(hi3798cv200_fixed_rate_clks,</div><div class='add'>+				ARRAY_SIZE(hi3798cv200_fixed_rate_clks),</div><div class='add'>+				crg-&gt;clk_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hisi_crg_funcs hi3798cv200_crg_funcs = {</div><div class='add'>+	.register_clks = hi3798cv200_clk_register,</div><div class='add'>+	.unregister_clks = hi3798cv200_clk_unregister,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hi3798CV200 sysctrl CRG */</div><div class='add'>+</div><div class='add'>+#define HI3798CV200_SYSCTRL_NR_CLKS 16</div><div class='add'>+</div><div class='add'>+static const struct hisi_gate_clock hi3798cv200_sysctrl_gate_clks[] = {</div><div class='add'>+	{ HISTB_IR_CLK, "clk_ir", "100m",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x48, 4, 0, },</div><div class='add'>+	{ HISTB_TIMER01_CLK, "clk_timer01", "24m",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x48, 6, 0, },</div><div class='add'>+	{ HISTB_UART0_CLK, "clk_uart0", "75m",</div><div class='add'>+		CLK_SET_RATE_PARENT, 0x48, 10, 0, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct hisi_clock_data *hi3798cv200_sysctrl_clk_register(</div><div class='add'>+					struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_clock_data *clk_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	clk_data = hisi_clk_alloc(pdev, HI3798CV200_SYSCTRL_NR_CLKS);</div><div class='add'>+	if (!clk_data)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ret = hisi_clk_register_gate(hi3798cv200_sysctrl_gate_clks,</div><div class='add'>+				ARRAY_SIZE(hi3798cv200_sysctrl_gate_clks),</div><div class='add'>+				clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	ret = of_clk_add_provider(pdev-&gt;dev.of_node,</div><div class='add'>+			of_clk_src_onecell_get, &amp;clk_data-&gt;clk_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unregister_gate;</div><div class='add'>+</div><div class='add'>+	return clk_data;</div><div class='add'>+</div><div class='add'>+unregister_gate:</div><div class='add'>+	hisi_clk_unregister_gate(hi3798cv200_sysctrl_gate_clks,</div><div class='add'>+				ARRAY_SIZE(hi3798cv200_sysctrl_gate_clks),</div><div class='add'>+				clk_data);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hi3798cv200_sysctrl_clk_unregister(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_crg_dev *crg = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	of_clk_del_provider(pdev-&gt;dev.of_node);</div><div class='add'>+</div><div class='add'>+	hisi_clk_unregister_gate(hi3798cv200_sysctrl_gate_clks,</div><div class='add'>+				ARRAY_SIZE(hi3798cv200_sysctrl_gate_clks),</div><div class='add'>+				crg-&gt;clk_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hisi_crg_funcs hi3798cv200_sysctrl_funcs = {</div><div class='add'>+	.register_clks = hi3798cv200_sysctrl_clk_register,</div><div class='add'>+	.unregister_clks = hi3798cv200_sysctrl_clk_unregister,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id hi3798cv200_crg_match_table[] = {</div><div class='add'>+	{ .compatible = "hisilicon,hi3798cv200-crg",</div><div class='add'>+		.data = &amp;hi3798cv200_crg_funcs },</div><div class='add'>+	{ .compatible = "hisilicon,hi3798cv200-sysctrl",</div><div class='add'>+		.data = &amp;hi3798cv200_sysctrl_funcs },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, hi3798cv200_crg_match_table);</div><div class='add'>+</div><div class='add'>+static int hi3798cv200_crg_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_crg_dev *crg;</div><div class='add'>+</div><div class='add'>+	crg = devm_kmalloc(&amp;pdev-&gt;dev, sizeof(*crg), GFP_KERNEL);</div><div class='add'>+	if (!crg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	crg-&gt;funcs = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!crg-&gt;funcs)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	crg-&gt;rstc = hisi_reset_init(pdev);</div><div class='add'>+	if (!crg-&gt;rstc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	crg-&gt;clk_data = crg-&gt;funcs-&gt;register_clks(pdev);</div><div class='add'>+	if (IS_ERR(crg-&gt;clk_data)) {</div><div class='add'>+		hisi_reset_exit(crg-&gt;rstc);</div><div class='add'>+		return PTR_ERR(crg-&gt;clk_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, crg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hi3798cv200_crg_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hisi_crg_dev *crg = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	hisi_reset_exit(crg-&gt;rstc);</div><div class='add'>+	crg-&gt;funcs-&gt;unregister_clks(pdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver hi3798cv200_crg_driver = {</div><div class='add'>+	.probe          = hi3798cv200_crg_probe,</div><div class='add'>+	.remove		= hi3798cv200_crg_remove,</div><div class='add'>+	.driver         = {</div><div class='add'>+		.name   = "hi3798cv200-crg",</div><div class='add'>+		.of_match_table = hi3798cv200_crg_match_table,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init hi3798cv200_crg_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;hi3798cv200_crg_driver);</div><div class='add'>+}</div><div class='add'>+core_initcall(hi3798cv200_crg_init);</div><div class='add'>+</div><div class='add'>+static void __exit hi3798cv200_crg_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;hi3798cv200_crg_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(hi3798cv200_crg_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("HiSilicon Hi3798CV200 CRG Driver");</div><div class='head'>diff --git a/drivers/clk/hisilicon/crg.h b/drivers/clk/hisilicon/crg.h<br/>new file mode 100644<br/>index 000000000000..e0739717de9a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/hisilicon/crg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/hisilicon/crg.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+/*</div><div class='add'>+ * HiSilicon Clock and Reset Driver Header</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 HiSilicon Limited.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __HISI_CRG_H</div><div class='add'>+#define __HISI_CRG_H</div><div class='add'>+</div><div class='add'>+struct hisi_clock_data;</div><div class='add'>+struct hisi_reset_controller;</div><div class='add'>+</div><div class='add'>+struct hisi_crg_funcs {</div><div class='add'>+	struct hisi_clock_data*	(*register_clks)(struct platform_device *pdev);</div><div class='add'>+	void (*unregister_clks)(struct platform_device *pdev);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hisi_crg_dev {</div><div class='add'>+	struct hisi_clock_data *clk_data;</div><div class='add'>+	struct hisi_reset_controller *rstc;</div><div class='add'>+	const struct hisi_crg_funcs *funcs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif	/* __HISI_CRG_H */</div><div class='head'>diff --git a/drivers/clk/imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c<br/>index 6a964144a5b5..cbce308aad04 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/imx/clk-imx31.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/imx/clk-imx31.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/imx/clk-imx31.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-imx31.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;soc/imx/revision.h&gt;</div><div class='ctx'> #include &lt;soc/imx/timer.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -72,14 +73,8 @@ static struct clk ** const uart_clks[] __initconst = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __init _mx31_clocks_init(unsigned long fref)</div><div class='add'>+static void __init _mx31_clocks_init(void __iomem *base, unsigned long fref)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *base;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	base = ioremap(MX31_CCM_BASE_ADDR, SZ_4K);</div><div class='del'>-	BUG_ON(!base);</div><div class='del'>-</div><div class='ctx'> 	clk[dummy] = imx_clk_fixed("dummy", 0);</div><div class='ctx'> 	clk[ckih] = imx_clk_fixed("ckih", fref);</div><div class='ctx'> 	clk[ckil] = imx_clk_fixed("ckil", 32768);</div><div class='hunk'>@@ -147,21 +142,17 @@ static void __init _mx31_clocks_init(unsigned long fref)</div><div class='ctx'> 	clk_prepare_enable(clk[iim_gate]);</div><div class='ctx'> 	mx31_revision();</div><div class='ctx'> 	clk_disable_unprepare(clk[iim_gate]);</div><div class='del'>-</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,imx31-ccm");</div><div class='del'>-</div><div class='del'>-	if (np) {</div><div class='del'>-		clk_data.clks = clk;</div><div class='del'>-		clk_data.clk_num = ARRAY_SIZE(clk);</div><div class='del'>-		of_clk_add_provider(np, of_clk_src_onecell_get, &amp;clk_data);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init mx31_clocks_init(void)</div><div class='add'>+int __init mx31_clocks_init(unsigned long fref)</div><div class='ctx'> {</div><div class='del'>-	u32 fref = 26000000; /* default */</div><div class='add'>+	void __iomem *base;</div><div class='add'>+</div><div class='add'>+	base = ioremap(MX31_CCM_BASE_ADDR, SZ_4K);</div><div class='add'>+	if (!base)</div><div class='add'>+		panic("%s: failed to map registers\n", __func__);</div><div class='ctx'> </div><div class='del'>-	_mx31_clocks_init(fref);</div><div class='add'>+	_mx31_clocks_init(base, fref);</div><div class='ctx'> </div><div class='ctx'> 	clk_register_clkdev(clk[gpt_gate], "per", "imx-gpt.0");</div><div class='ctx'> 	clk_register_clkdev(clk[ipg], "ipg", "imx-gpt.0");</div><div class='hunk'>@@ -224,22 +215,31 @@ int __init mx31_clocks_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init mx31_clocks_init_dt(void)</div><div class='add'>+static void __init mx31_clocks_init_dt(struct device_node *np)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np;</div><div class='add'>+	struct device_node *osc_np;</div><div class='ctx'> 	u32 fref = 26000000; /* default */</div><div class='add'>+	void __iomem *ccm;</div><div class='ctx'> </div><div class='del'>-	for_each_compatible_node(np, NULL, "fixed-clock") {</div><div class='del'>-		if (!of_device_is_compatible(np, "fsl,imx-osc26m"))</div><div class='add'>+	for_each_compatible_node(osc_np, NULL, "fixed-clock") {</div><div class='add'>+		if (!of_device_is_compatible(osc_np, "fsl,imx-osc26m"))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!of_property_read_u32(np, "clock-frequency", &amp;fref)) {</div><div class='del'>-			of_node_put(np);</div><div class='add'>+		if (!of_property_read_u32(osc_np, "clock-frequency", &amp;fref)) {</div><div class='add'>+			of_node_put(osc_np);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_mx31_clocks_init(fref);</div><div class='add'>+	ccm = of_iomap(np, 0);</div><div class='add'>+	if (!ccm)</div><div class='add'>+		panic("%s: failed to map registers\n", __func__);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	_mx31_clocks_init(ccm, fref);</div><div class='add'>+</div><div class='add'>+	clk_data.clks = clk;</div><div class='add'>+	clk_data.clk_num = ARRAY_SIZE(clk);</div><div class='add'>+	of_clk_add_provider(np, of_clk_src_onecell_get, &amp;clk_data);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+CLK_OF_DECLARE(imx31_ccm, "fsl,imx31-ccm", mx31_clocks_init_dt);</div><div class='head'>diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c<br/>index ce8ea10407e4..c07df719b8a3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/imx/clk-imx6q.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/imx/clk-imx6q.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/imx/clk-imx6q.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-imx6q.c</a></div><div class='hunk'>@@ -156,10 +156,267 @@ static struct clk ** const uart_clks[] __initconst = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int ldb_di_sel_by_clock_id(int clock_id)</div><div class='add'>+{</div><div class='add'>+	switch (clock_id) {</div><div class='add'>+	case IMX6QDL_CLK_PLL5_VIDEO_DIV:</div><div class='add'>+		if (clk_on_imx6q() &amp;&amp;</div><div class='add'>+		    imx_get_soc_revision() == IMX_CHIP_REVISION_1_0)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		return 0;</div><div class='add'>+	case IMX6QDL_CLK_PLL2_PFD0_352M:</div><div class='add'>+		return 1;</div><div class='add'>+	case IMX6QDL_CLK_PLL2_PFD2_396M:</div><div class='add'>+		return 2;</div><div class='add'>+	case IMX6QDL_CLK_MMDC_CH1_AXI:</div><div class='add'>+		return 3;</div><div class='add'>+	case IMX6QDL_CLK_PLL3_USB_OTG:</div><div class='add'>+		return 4;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void of_assigned_ldb_sels(struct device_node *node,</div><div class='add'>+				 unsigned int *ldb_di0_sel,</div><div class='add'>+				 unsigned int *ldb_di1_sel)</div><div class='add'>+{</div><div class='add'>+	struct of_phandle_args clkspec;</div><div class='add'>+	int index, rc, num_parents;</div><div class='add'>+	int parent, child, sel;</div><div class='add'>+</div><div class='add'>+	num_parents = of_count_phandle_with_args(node, "assigned-clock-parents",</div><div class='add'>+						 "#clock-cells");</div><div class='add'>+	for (index = 0; index &lt; num_parents; index++) {</div><div class='add'>+		rc = of_parse_phandle_with_args(node, "assigned-clock-parents",</div><div class='add'>+					"#clock-cells", index, &amp;clkspec);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			/* skip empty (null) phandles */</div><div class='add'>+			if (rc == -ENOENT)</div><div class='add'>+				continue;</div><div class='add'>+			else</div><div class='add'>+				return;</div><div class='add'>+		}</div><div class='add'>+		if (clkspec.np != node || clkspec.args[0] &gt;= IMX6QDL_CLK_END) {</div><div class='add'>+			pr_err("ccm: parent clock %d not in ccm\n", index);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		parent = clkspec.args[0];</div><div class='add'>+</div><div class='add'>+		rc = of_parse_phandle_with_args(node, "assigned-clocks",</div><div class='add'>+				"#clock-cells", index, &amp;clkspec);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+		if (clkspec.np != node || clkspec.args[0] &gt;= IMX6QDL_CLK_END) {</div><div class='add'>+			pr_err("ccm: child clock %d not in ccm\n", index);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		child = clkspec.args[0];</div><div class='add'>+</div><div class='add'>+		if (child != IMX6QDL_CLK_LDB_DI0_SEL &amp;&amp;</div><div class='add'>+		    child != IMX6QDL_CLK_LDB_DI1_SEL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sel = ldb_di_sel_by_clock_id(parent);</div><div class='add'>+		if (sel &lt; 0) {</div><div class='add'>+			pr_err("ccm: invalid ldb_di%d parent clock: %d\n",</div><div class='add'>+			       child == IMX6QDL_CLK_LDB_DI1_SEL, parent);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (child == IMX6QDL_CLK_LDB_DI0_SEL)</div><div class='add'>+			*ldb_di0_sel = sel;</div><div class='add'>+		if (child == IMX6QDL_CLK_LDB_DI1_SEL)</div><div class='add'>+			*ldb_di1_sel = sel;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CCM_CCDR		0x04</div><div class='add'>+#define CCM_CCSR		0x0c</div><div class='add'>+#define CCM_CS2CDR		0x2c</div><div class='add'>+</div><div class='add'>+#define CCDR_MMDC_CH1_MASK		BIT(16)</div><div class='add'>+#define CCSR_PLL3_SW_CLK_SEL		BIT(0)</div><div class='add'>+</div><div class='add'>+#define CS2CDR_LDB_DI0_CLK_SEL_SHIFT	9</div><div class='add'>+#define CS2CDR_LDB_DI1_CLK_SEL_SHIFT	12</div><div class='add'>+</div><div class='add'>+static void __init imx6q_mmdc_ch1_mask_handshake(void __iomem *ccm_base)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+</div><div class='add'>+	reg = readl_relaxed(ccm_base + CCM_CCDR);</div><div class='add'>+	reg |= CCDR_MMDC_CH1_MASK;</div><div class='add'>+	writel_relaxed(reg, ccm_base + CCM_CCDR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The only way to disable the MMDC_CH1 clock is to move it to pll3_sw_clk</div><div class='add'>+ * via periph2_clk2_sel and then to disable pll3_sw_clk by selecting the</div><div class='add'>+ * bypass clock source, since there is no CG bit for mmdc_ch1.</div><div class='add'>+ */</div><div class='add'>+static void mmdc_ch1_disable(void __iomem *ccm_base)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+</div><div class='add'>+	clk_set_parent(clk[IMX6QDL_CLK_PERIPH2_CLK2_SEL],</div><div class='add'>+		       clk[IMX6QDL_CLK_PLL3_USB_OTG]);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Handshake with mmdc_ch1 module must be masked when changing</div><div class='add'>+	 * periph2_clk_sel.</div><div class='add'>+	 */</div><div class='add'>+	clk_set_parent(clk[IMX6QDL_CLK_PERIPH2], clk[IMX6QDL_CLK_PERIPH2_CLK2]);</div><div class='add'>+</div><div class='add'>+	/* Disable pll3_sw_clk by selecting the bypass clock source */</div><div class='add'>+	reg = readl_relaxed(ccm_base + CCM_CCSR);</div><div class='add'>+	reg |= CCSR_PLL3_SW_CLK_SEL;</div><div class='add'>+	writel_relaxed(reg, ccm_base + CCM_CCSR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mmdc_ch1_reenable(void __iomem *ccm_base)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+</div><div class='add'>+	/* Enable pll3_sw_clk by disabling the bypass */</div><div class='add'>+	reg = readl_relaxed(ccm_base + CCM_CCSR);</div><div class='add'>+	reg &amp;= ~CCSR_PLL3_SW_CLK_SEL;</div><div class='add'>+	writel_relaxed(reg, ccm_base + CCM_CCSR);</div><div class='add'>+</div><div class='add'>+	clk_set_parent(clk[IMX6QDL_CLK_PERIPH2], clk[IMX6QDL_CLK_PERIPH2_PRE]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We have to follow a strict procedure when changing the LDB clock source,</div><div class='add'>+ * otherwise we risk introducing a glitch that can lock up the LDB divider.</div><div class='add'>+ * Things to keep in mind:</div><div class='add'>+ *</div><div class='add'>+ * 1. The current and new parent clock inputs to the mux must be disabled.</div><div class='add'>+ * 2. The default clock input for ldb_di0/1_clk_sel is mmdc_ch1_axi, which</div><div class='add'>+ *    has no CG bit.</div><div class='add'>+ * 3. pll2_pfd2_396m can not be gated if it is used as memory clock.</div><div class='add'>+ * 4. In the RTL implementation of the LDB_DI_CLK_SEL muxes the top four</div><div class='add'>+ *    options are in one mux and the PLL3 option along with three unused</div><div class='add'>+ *    inputs is in a second mux. There is a third mux with two inputs used</div><div class='add'>+ *    to decide between the first and second 4-port mux:</div><div class='add'>+ *</div><div class='add'>+ *    pll5_video_div 0 --|\</div><div class='add'>+ *    pll2_pfd0_352m 1 --| |_</div><div class='add'>+ *    pll2_pfd2_396m 2 --| | `-|\</div><div class='add'>+ *    mmdc_ch1_axi   3 --|/    | |</div><div class='add'>+ *                             | |--</div><div class='add'>+ *    pll3_usb_otg   4 --|\    | |</div><div class='add'>+ *                   5 --| |_,-|/</div><div class='add'>+ *                   6 --| |</div><div class='add'>+ *                   7 --|/</div><div class='add'>+ *</div><div class='add'>+ * The ldb_di0/1_clk_sel[1:0] bits control both 4-port muxes at the same time.</div><div class='add'>+ * The ldb_di0/1_clk_sel[2] bit controls the 2-port mux. The code below</div><div class='add'>+ * switches the parent to the bottom mux first and then manipulates the top</div><div class='add'>+ * mux to ensure that no glitch will enter the divider.</div><div class='add'>+ */</div><div class='add'>+static void init_ldb_clks(struct device_node *np, void __iomem *ccm_base)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+	unsigned int sel[2][4];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	reg = readl_relaxed(ccm_base + CCM_CS2CDR);</div><div class='add'>+	sel[0][0] = (reg &gt;&gt; CS2CDR_LDB_DI0_CLK_SEL_SHIFT) &amp; 7;</div><div class='add'>+	sel[1][0] = (reg &gt;&gt; CS2CDR_LDB_DI1_CLK_SEL_SHIFT) &amp; 7;</div><div class='add'>+</div><div class='add'>+	sel[0][3] = sel[0][2] = sel[0][1] = sel[0][0];</div><div class='add'>+	sel[1][3] = sel[1][2] = sel[1][1] = sel[1][0];</div><div class='add'>+</div><div class='add'>+	of_assigned_ldb_sels(np, &amp;sel[0][3], &amp;sel[1][3]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		/* Warn if a glitch might have been introduced already */</div><div class='add'>+		if (sel[i][0] != 3) {</div><div class='add'>+			pr_warn("ccm: ldb_di%d_sel already changed from reset value: %d\n",</div><div class='add'>+				i, sel[i][0]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (sel[i][0] == sel[i][3])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Only switch to or from pll2_pfd2_396m if it is disabled */</div><div class='add'>+		if ((sel[i][0] == 2 || sel[i][3] == 2) &amp;&amp;</div><div class='add'>+		    (clk_get_parent(clk[IMX6QDL_CLK_PERIPH_PRE]) ==</div><div class='add'>+		     clk[IMX6QDL_CLK_PLL2_PFD2_396M])) {</div><div class='add'>+			pr_err("ccm: ldb_di%d_sel: couldn't disable pll2_pfd2_396m\n",</div><div class='add'>+			       i);</div><div class='add'>+			sel[i][3] = sel[i][2] = sel[i][1] = sel[i][0];</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* First switch to the bottom mux */</div><div class='add'>+		sel[i][1] = sel[i][0] | 4;</div><div class='add'>+</div><div class='add'>+		/* Then configure the top mux before switching back to it */</div><div class='add'>+		sel[i][2] = sel[i][3] | 4;</div><div class='add'>+</div><div class='add'>+		pr_debug("ccm: switching ldb_di%d_sel: %d-&gt;%d-&gt;%d-&gt;%d\n", i,</div><div class='add'>+			 sel[i][0], sel[i][1], sel[i][2], sel[i][3]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sel[0][0] == sel[0][3] &amp;&amp; sel[1][0] == sel[1][3])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mmdc_ch1_disable(ccm_base);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; 4; i++) {</div><div class='add'>+		reg = readl_relaxed(ccm_base + CCM_CS2CDR);</div><div class='add'>+		reg &amp;= ~((7 &lt;&lt; CS2CDR_LDB_DI0_CLK_SEL_SHIFT) |</div><div class='add'>+			 (7 &lt;&lt; CS2CDR_LDB_DI1_CLK_SEL_SHIFT));</div><div class='add'>+		reg |= ((sel[0][i] &lt;&lt; CS2CDR_LDB_DI0_CLK_SEL_SHIFT) |</div><div class='add'>+			(sel[1][i] &lt;&lt; CS2CDR_LDB_DI1_CLK_SEL_SHIFT));</div><div class='add'>+		writel_relaxed(reg, ccm_base + CCM_CS2CDR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mmdc_ch1_reenable(ccm_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CCM_ANALOG_PLL_VIDEO	0xa0</div><div class='add'>+#define CCM_ANALOG_PFD_480	0xf0</div><div class='add'>+#define CCM_ANALOG_PFD_528	0x100</div><div class='add'>+</div><div class='add'>+#define PLL_ENABLE		BIT(13)</div><div class='add'>+</div><div class='add'>+#define PFD0_CLKGATE		BIT(7)</div><div class='add'>+#define PFD1_CLKGATE		BIT(15)</div><div class='add'>+#define PFD2_CLKGATE		BIT(23)</div><div class='add'>+#define PFD3_CLKGATE		BIT(31)</div><div class='add'>+</div><div class='add'>+static void disable_anatop_clocks(void __iomem *anatop_base)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+</div><div class='add'>+	/* Make sure PLL2 PFDs 0-2 are gated */</div><div class='add'>+	reg = readl_relaxed(anatop_base + CCM_ANALOG_PFD_528);</div><div class='add'>+	/* Cannot gate PFD2 if pll2_pfd2_396m is the parent of MMDC clock */</div><div class='add'>+	if (clk_get_parent(clk[IMX6QDL_CLK_PERIPH_PRE]) ==</div><div class='add'>+	    clk[IMX6QDL_CLK_PLL2_PFD2_396M])</div><div class='add'>+		reg |= PFD0_CLKGATE | PFD1_CLKGATE;</div><div class='add'>+	else</div><div class='add'>+		reg |= PFD0_CLKGATE | PFD1_CLKGATE | PFD2_CLKGATE;</div><div class='add'>+	writel_relaxed(reg, anatop_base + CCM_ANALOG_PFD_528);</div><div class='add'>+</div><div class='add'>+	/* Make sure PLL3 PFDs 0-3 are gated */</div><div class='add'>+	reg = readl_relaxed(anatop_base + CCM_ANALOG_PFD_480);</div><div class='add'>+	reg |= PFD0_CLKGATE | PFD1_CLKGATE | PFD2_CLKGATE | PFD3_CLKGATE;</div><div class='add'>+	writel_relaxed(reg, anatop_base + CCM_ANALOG_PFD_480);</div><div class='add'>+</div><div class='add'>+	/* Make sure PLL5 is disabled */</div><div class='add'>+	reg = readl_relaxed(anatop_base + CCM_ANALOG_PLL_VIDEO);</div><div class='add'>+	reg &amp;= ~PLL_ENABLE;</div><div class='add'>+	writel_relaxed(reg, anatop_base + CCM_ANALOG_PLL_VIDEO);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init imx6q_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np;</div><div class='del'>-	void __iomem *base;</div><div class='add'>+	void __iomem *anatop_base, *base;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -172,7 +429,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 	clk[IMX6QDL_CLK_ANACLK2] = imx_obtain_fixed_clock("anaclk2", 0);</div><div class='ctx'> </div><div class='ctx'> 	np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop");</div><div class='del'>-	base = of_iomap(np, 0);</div><div class='add'>+	anatop_base = base = of_iomap(np, 0);</div><div class='ctx'> 	WARN_ON(!base);</div><div class='ctx'> </div><div class='ctx'> 	/* Audio/video PLL post dividers do not work on i.MX6q revision 1.0 */</div><div class='hunk'>@@ -330,8 +587,25 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 		clk[IMX6QDL_CLK_GPU3D_SHADER_SEL] = imx_clk_mux("gpu3d_shader_sel", base + 0x18, 8,  2, gpu3d_shader_sels, ARRAY_SIZE(gpu3d_shader_sels));</div><div class='ctx'> 	clk[IMX6QDL_CLK_IPU1_SEL]         = imx_clk_mux("ipu1_sel",         base + 0x3c, 9,  2, ipu_sels,          ARRAY_SIZE(ipu_sels));</div><div class='ctx'> 	clk[IMX6QDL_CLK_IPU2_SEL]         = imx_clk_mux("ipu2_sel",         base + 0x3c, 14, 2, ipu_sels,          ARRAY_SIZE(ipu_sels));</div><div class='del'>-	clk[IMX6QDL_CLK_LDB_DI0_SEL]      = imx_clk_mux_flags("ldb_di0_sel", base + 0x2c, 9,  3, ldb_di_sels,      ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT);</div><div class='del'>-	clk[IMX6QDL_CLK_LDB_DI1_SEL]      = imx_clk_mux_flags("ldb_di1_sel", base + 0x2c, 12, 3, ldb_di_sels,      ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+	disable_anatop_clocks(anatop_base);</div><div class='add'>+</div><div class='add'>+	imx6q_mmdc_ch1_mask_handshake(base);</div><div class='add'>+</div><div class='add'>+	if (clk_on_imx6qp()) {</div><div class='add'>+		clk[IMX6QDL_CLK_LDB_DI0_SEL]      = imx_clk_mux_flags("ldb_di0_sel", base + 0x2c, 9,  3, ldb_di_sels,      ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT);</div><div class='add'>+		clk[IMX6QDL_CLK_LDB_DI1_SEL]      = imx_clk_mux_flags("ldb_di1_sel", base + 0x2c, 12, 3, ldb_di_sels,      ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * The LDB_DI0/1_SEL muxes are registered read-only due to a hardware</div><div class='add'>+		 * bug. Set the muxes to the requested values before registering the</div><div class='add'>+		 * ldb_di_sel clocks.</div><div class='add'>+		 */</div><div class='add'>+		init_ldb_clks(np, base);</div><div class='add'>+</div><div class='add'>+		clk[IMX6QDL_CLK_LDB_DI0_SEL]      = imx_clk_mux_ldb("ldb_di0_sel", base + 0x2c, 9,  3, ldb_di_sels,      ARRAY_SIZE(ldb_di_sels));</div><div class='add'>+		clk[IMX6QDL_CLK_LDB_DI1_SEL]      = imx_clk_mux_ldb("ldb_di1_sel", base + 0x2c, 12, 3, ldb_di_sels,      ARRAY_SIZE(ldb_di_sels));</div><div class='add'>+	}</div><div class='ctx'> 	clk[IMX6QDL_CLK_IPU1_DI0_PRE_SEL] = imx_clk_mux_flags("ipu1_di0_pre_sel", base + 0x34, 6,  3, ipu_di_pre_sels,   ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT);</div><div class='ctx'> 	clk[IMX6QDL_CLK_IPU1_DI1_PRE_SEL] = imx_clk_mux_flags("ipu1_di1_pre_sel", base + 0x34, 15, 3, ipu_di_pre_sels,   ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT);</div><div class='ctx'> 	clk[IMX6QDL_CLK_IPU2_DI0_PRE_SEL] = imx_clk_mux_flags("ipu2_di0_pre_sel", base + 0x38, 6,  3, ipu_di_pre_sels,   ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT);</div><div class='hunk'>@@ -582,12 +856,6 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> </div><div class='ctx'> 	clk_register_clkdev(clk[IMX6QDL_CLK_ENET_REF], "enet_ref", NULL);</div><div class='ctx'> </div><div class='del'>-	if ((imx_get_soc_revision() != IMX_CHIP_REVISION_1_0) ||</div><div class='del'>-	    clk_on_imx6dl()) {</div><div class='del'>-		clk_set_parent(clk[IMX6QDL_CLK_LDB_DI0_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);</div><div class='del'>-		clk_set_parent(clk[IMX6QDL_CLK_LDB_DI1_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	clk_set_rate(clk[IMX6QDL_CLK_PLL3_PFD1_540M], 540000000);</div><div class='ctx'> 	if (clk_on_imx6dl())</div><div class='ctx'> 		clk_set_parent(clk[IMX6QDL_CLK_IPU1_SEL], clk[IMX6QDL_CLK_PLL3_PFD1_540M]);</div><div class='head'>diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c<br/>index d1d7787ce211..75c35fb12b60 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/imx/clk-imx6ul.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/imx/clk-imx6ul.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/imx/clk-imx6ul.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-imx6ul.c</a></div><div class='hunk'>@@ -64,6 +64,10 @@ static const char *perclk_sels[] = { "ipg", "osc", };</div><div class='ctx'> static const char *lcdif_sels[] = { "lcdif_podf", "ipp_di0", "ipp_di1", "ldb_di0", "ldb_di1", };</div><div class='ctx'> static const char *csi_sels[] = { "osc", "pll2_pfd2_396m", "pll3_120m", "pll3_pfd1_540m", };</div><div class='ctx'> static const char *sim_sels[] = { "sim_podf", "ipp_di0", "ipp_di1", "ldb_di0", "ldb_di1", };</div><div class='add'>+/* epdc_pre_sels, epdc_sels, esai_sels only exists on i.MX6ULL */</div><div class='add'>+static const char *epdc_pre_sels[] = { "pll2_bus", "pll3_usb_otg", "pll5_video_div", "pll2_pfd0_352m", "pll2_pfd2_396m", "pll3_pfd2_508m", };</div><div class='add'>+static const char *esai_sels[] = { "pll4_audio_div", "pll3_pfd2_508m", "pll5_video_div", "pll3_usb_otg", };</div><div class='add'>+static const char *epdc_sels[] = { "epdc_podf", "ipp_di0", "ipp_di1", "ldb_di0", "ldb_di1", };</div><div class='ctx'> </div><div class='ctx'> static struct clk *clks[IMX6UL_CLK_END];</div><div class='ctx'> static struct clk_onecell_data clk_data;</div><div class='hunk'>@@ -102,6 +106,17 @@ static u32 share_count_audio;</div><div class='ctx'> static u32 share_count_sai1;</div><div class='ctx'> static u32 share_count_sai2;</div><div class='ctx'> static u32 share_count_sai3;</div><div class='add'>+static u32 share_count_esai;</div><div class='add'>+</div><div class='add'>+static inline int clk_on_imx6ul(void)</div><div class='add'>+{</div><div class='add'>+	return of_machine_is_compatible("fsl,imx6ul");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int clk_on_imx6ull(void)</div><div class='add'>+{</div><div class='add'>+	return of_machine_is_compatible("fsl,imx6ull");</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void __init imx6ul_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> {</div><div class='hunk'>@@ -238,12 +253,19 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 	clks[IMX6UL_CLK_QSPI1_SEL]	  = imx_clk_mux("qspi1_sel",    base + 0x1c, 7,  3, qspi1_sels, ARRAY_SIZE(qspi1_sels));</div><div class='ctx'> 	clks[IMX6UL_CLK_PERCLK_SEL]	  = imx_clk_mux("perclk_sel",	base + 0x1c, 6,  1, perclk_sels, ARRAY_SIZE(perclk_sels));</div><div class='ctx'> 	clks[IMX6UL_CLK_CAN_SEL]	  = imx_clk_mux("can_sel",	base + 0x20, 8,  2, can_sels, ARRAY_SIZE(can_sels));</div><div class='add'>+	if (clk_on_imx6ull())</div><div class='add'>+		clks[IMX6ULL_CLK_ESAI_SEL]	  = imx_clk_mux("esai_sel",	base + 0x20, 19, 2, esai_sels, ARRAY_SIZE(esai_sels));</div><div class='ctx'> 	clks[IMX6UL_CLK_UART_SEL]	  = imx_clk_mux("uart_sel",	base + 0x24, 6,  1, uart_sels, ARRAY_SIZE(uart_sels));</div><div class='ctx'> 	clks[IMX6UL_CLK_ENFC_SEL]	  = imx_clk_mux("enfc_sel",	base + 0x2c, 15, 3, enfc_sels, ARRAY_SIZE(enfc_sels));</div><div class='ctx'> 	clks[IMX6UL_CLK_LDB_DI0_SEL]	  = imx_clk_mux("ldb_di0_sel",	base + 0x2c, 9,  3, ldb_di0_sels, ARRAY_SIZE(ldb_di0_sels));</div><div class='ctx'> 	clks[IMX6UL_CLK_SPDIF_SEL]	  = imx_clk_mux("spdif_sel",	base + 0x30, 20, 2, spdif_sels, ARRAY_SIZE(spdif_sels));</div><div class='del'>-	clks[IMX6UL_CLK_SIM_PRE_SEL]	  = imx_clk_mux("sim_pre_sel",	base + 0x34, 15, 3, sim_pre_sels, ARRAY_SIZE(sim_pre_sels));</div><div class='del'>-	clks[IMX6UL_CLK_SIM_SEL]	  = imx_clk_mux("sim_sel",	base + 0x34, 9, 3, sim_sels, ARRAY_SIZE(sim_sels));</div><div class='add'>+	if (clk_on_imx6ul()) {</div><div class='add'>+		clks[IMX6UL_CLK_SIM_PRE_SEL] 	  = imx_clk_mux("sim_pre_sel",	base + 0x34, 15, 3, sim_pre_sels, ARRAY_SIZE(sim_pre_sels));</div><div class='add'>+		clks[IMX6UL_CLK_SIM_SEL]	  = imx_clk_mux("sim_sel", 	base + 0x34, 9, 3, sim_sels, ARRAY_SIZE(sim_sels));</div><div class='add'>+	} else if (clk_on_imx6ull()) {</div><div class='add'>+		clks[IMX6ULL_CLK_EPDC_PRE_SEL]	  = imx_clk_mux("epdc_pre_sel",	base + 0x34, 15, 3, epdc_pre_sels, ARRAY_SIZE(epdc_pre_sels));</div><div class='add'>+		clks[IMX6ULL_CLK_EPDC_SEL]	  = imx_clk_mux("epdc_sel",	base + 0x34, 9, 3, epdc_sels, ARRAY_SIZE(epdc_sels));</div><div class='add'>+	}</div><div class='ctx'> 	clks[IMX6UL_CLK_ECSPI_SEL]	  = imx_clk_mux("ecspi_sel",	base + 0x38, 18, 1, ecspi_sels, ARRAY_SIZE(ecspi_sels));</div><div class='ctx'> 	clks[IMX6UL_CLK_LCDIF_PRE_SEL]	  = imx_clk_mux("lcdif_pre_sel", base + 0x38, 15, 3, lcdif_pre_sels, ARRAY_SIZE(lcdif_pre_sels));</div><div class='ctx'> 	clks[IMX6UL_CLK_LCDIF_SEL]	  = imx_clk_mux("lcdif_sel",	base + 0x38, 9, 3, lcdif_sels, ARRAY_SIZE(lcdif_sels));</div><div class='hunk'>@@ -276,6 +298,10 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 	clks[IMX6UL_CLK_SAI3_PODF]	= imx_clk_divider("sai3_podf",	   "sai3_pred",		base + 0x28, 16, 6);</div><div class='ctx'> 	clks[IMX6UL_CLK_SAI1_PRED]	= imx_clk_divider("sai1_pred",	   "sai1_sel",		base + 0x28, 6,	 3);</div><div class='ctx'> 	clks[IMX6UL_CLK_SAI1_PODF]	= imx_clk_divider("sai1_podf",	   "sai1_pred",		base + 0x28, 0,	 6);</div><div class='add'>+	if (clk_on_imx6ull()) {</div><div class='add'>+		clks[IMX6ULL_CLK_ESAI_PRED]	= imx_clk_divider("esai_pred",     "esai_sel",		base + 0x28, 9,  3);</div><div class='add'>+		clks[IMX6ULL_CLK_ESAI_PODF]	= imx_clk_divider("esai_podf",     "esai_pred",		base + 0x28, 25, 3);</div><div class='add'>+	}</div><div class='ctx'> 	clks[IMX6UL_CLK_ENFC_PRED]	= imx_clk_divider("enfc_pred",	   "enfc_sel",		base + 0x2c, 18, 3);</div><div class='ctx'> 	clks[IMX6UL_CLK_ENFC_PODF]	= imx_clk_divider("enfc_podf",	   "enfc_pred",		base + 0x2c, 21, 6);</div><div class='ctx'> 	clks[IMX6UL_CLK_SAI2_PRED]	= imx_clk_divider("sai2_pred",	   "sai2_sel",		base + 0x2c, 6,	 3);</div><div class='hunk'>@@ -298,9 +324,15 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 	clks[IMX6UL_CLK_APBHDMA]	= imx_clk_gate2("apbh_dma",	"bch_podf",	base + 0x68,	4);</div><div class='ctx'> 	clks[IMX6UL_CLK_ASRC_IPG]	= imx_clk_gate2_shared("asrc_ipg",	"ahb",	base + 0x68,	6, &amp;share_count_asrc);</div><div class='ctx'> 	clks[IMX6UL_CLK_ASRC_MEM]	= imx_clk_gate2_shared("asrc_mem",	"ahb",	base + 0x68,	6, &amp;share_count_asrc);</div><div class='del'>-	clks[IMX6UL_CLK_CAAM_MEM]	= imx_clk_gate2("caam_mem",	"ahb",		base + 0x68,	8);</div><div class='del'>-	clks[IMX6UL_CLK_CAAM_ACLK]	= imx_clk_gate2("caam_aclk",	"ahb",		base + 0x68,	10);</div><div class='del'>-	clks[IMX6UL_CLK_CAAM_IPG]	= imx_clk_gate2("caam_ipg",	"ipg",		base + 0x68,	12);</div><div class='add'>+	if (clk_on_imx6ul()) {</div><div class='add'>+		clks[IMX6UL_CLK_CAAM_MEM]	= imx_clk_gate2("caam_mem",	"ahb",		base + 0x68,	8);</div><div class='add'>+		clks[IMX6UL_CLK_CAAM_ACLK]	= imx_clk_gate2("caam_aclk",	"ahb",		base + 0x68,	10);</div><div class='add'>+		clks[IMX6UL_CLK_CAAM_IPG]	= imx_clk_gate2("caam_ipg",	"ipg",		base + 0x68,	12);</div><div class='add'>+	} else if (clk_on_imx6ull()) {</div><div class='add'>+		clks[IMX6ULL_CLK_DCP_CLK]	= imx_clk_gate2("dcp",		"ahb",		base + 0x68,	10);</div><div class='add'>+		clks[IMX6UL_CLK_ENET]		= imx_clk_gate2("enet",		"ipg",		base + 0x68,	12);</div><div class='add'>+		clks[IMX6UL_CLK_ENET_AHB]	= imx_clk_gate2("enet_ahb",	"ahb",		base + 0x68,	12);</div><div class='add'>+	}</div><div class='ctx'> 	clks[IMX6UL_CLK_CAN1_IPG]	= imx_clk_gate2("can1_ipg",	"ipg",		base + 0x68,	14);</div><div class='ctx'> 	clks[IMX6UL_CLK_CAN1_SERIAL]	= imx_clk_gate2("can1_serial",	"can_podf",	base + 0x68,	16);</div><div class='ctx'> 	clks[IMX6UL_CLK_CAN2_IPG]	= imx_clk_gate2("can2_ipg",	"ipg",		base + 0x68,	18);</div><div class='hunk'>@@ -309,7 +341,10 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 	clks[IMX6UL_CLK_GPT2_SERIAL]	= imx_clk_gate2("gpt2_serial",	"perclk",	base + 0x68,	26);</div><div class='ctx'> 	clks[IMX6UL_CLK_UART2_IPG]	= imx_clk_gate2("uart2_ipg",	"ipg",		base + 0x68,	28);</div><div class='ctx'> 	clks[IMX6UL_CLK_UART2_SERIAL]	= imx_clk_gate2("uart2_serial",	"uart_podf",	base + 0x68,	28);</div><div class='del'>-	clks[IMX6UL_CLK_AIPSTZ3]	= imx_clk_gate2("aips_tz3",	"ahb",		base + 0x68,	30);</div><div class='add'>+	if (clk_on_imx6ul())</div><div class='add'>+		clks[IMX6UL_CLK_AIPSTZ3]	= imx_clk_gate2("aips_tz3",	"ahb",		base + 0x68,	30);</div><div class='add'>+	else if (clk_on_imx6ull())</div><div class='add'>+		clks[IMX6UL_CLK_AIPSTZ3]	= imx_clk_gate2("aips_tz3",	"ahb",		 base + 0x80,	18);</div><div class='ctx'> </div><div class='ctx'> 	/* CCGR1 */</div><div class='ctx'> 	clks[IMX6UL_CLK_ECSPI1]		= imx_clk_gate2("ecspi1",	"ecspi_podf",	base + 0x6c,	0);</div><div class='hunk'>@@ -328,6 +363,11 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 	clks[IMX6UL_CLK_UART4_SERIAL]	= imx_clk_gate2("uart4_serail",	"uart_podf",	base + 0x6c,	24);</div><div class='ctx'> </div><div class='ctx'> 	/* CCGR2 */</div><div class='add'>+	if (clk_on_imx6ull()) {</div><div class='add'>+		clks[IMX6ULL_CLK_ESAI_EXTAL]	= imx_clk_gate2_shared("esai_extal",	"esai_podf",	base + 0x70,	0, &amp;share_count_esai);</div><div class='add'>+		clks[IMX6ULL_CLK_ESAI_IPG]	= imx_clk_gate2_shared("esai_ipg",	"ahb",		base + 0x70,	0, &amp;share_count_esai);</div><div class='add'>+		clks[IMX6ULL_CLK_ESAI_MEM]	= imx_clk_gate2_shared("esai_mem",	"ahb",		base + 0x70,	0, &amp;share_count_esai);</div><div class='add'>+	}</div><div class='ctx'> 	clks[IMX6UL_CLK_CSI]		= imx_clk_gate2("csi",		"csi_podf",		base + 0x70,	2);</div><div class='ctx'> 	clks[IMX6UL_CLK_I2C1]		= imx_clk_gate2("i2c1",		"perclk",	base + 0x70,	6);</div><div class='ctx'> 	clks[IMX6UL_CLK_I2C2]		= imx_clk_gate2("i2c2",		"perclk",	base + 0x70,	8);</div><div class='hunk'>@@ -340,8 +380,13 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 	/* CCGR3 */</div><div class='ctx'> 	clks[IMX6UL_CLK_UART5_IPG]	= imx_clk_gate2("uart5_ipg",	"ipg",		base + 0x74,	2);</div><div class='ctx'> 	clks[IMX6UL_CLK_UART5_SERIAL]	= imx_clk_gate2("uart5_serial",	"uart_podf",	base + 0x74,	2);</div><div class='del'>-	clks[IMX6UL_CLK_ENET]		= imx_clk_gate2("enet",		"ipg",		base + 0x74,	4);</div><div class='del'>-	clks[IMX6UL_CLK_ENET_AHB]	= imx_clk_gate2("enet_ahb",	"ahb",		base + 0x74,	4);</div><div class='add'>+	if (clk_on_imx6ul()) {</div><div class='add'>+		clks[IMX6UL_CLK_ENET]		= imx_clk_gate2("enet",		"ipg",		base + 0x74,	4);</div><div class='add'>+		clks[IMX6UL_CLK_ENET_AHB]	= imx_clk_gate2("enet_ahb",	"ahb",		base + 0x74,	4);</div><div class='add'>+	} else if (clk_on_imx6ull()) {</div><div class='add'>+		clks[IMX6ULL_CLK_EPDC_ACLK]	= imx_clk_gate2("epdc_aclk",	"axi",		base + 0x74,	4);</div><div class='add'>+		clks[IMX6ULL_CLK_EPDC_PIX]	= imx_clk_gate2("epdc_pix",	"epdc_podf",	base + 0x74,	4);</div><div class='add'>+	}</div><div class='ctx'> 	clks[IMX6UL_CLK_UART6_IPG]	= imx_clk_gate2("uart6_ipg",	"ipg",		base + 0x74,	6);</div><div class='ctx'> 	clks[IMX6UL_CLK_UART6_SERIAL]	= imx_clk_gate2("uart6_serial",	"uart_podf",	base + 0x74,	6);</div><div class='ctx'> 	clks[IMX6UL_CLK_LCDIF_PIX]	= imx_clk_gate2("lcdif_pix",	"lcdif_podf",	base + 0x74,	10);</div><div class='hunk'>@@ -385,8 +430,10 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 	clks[IMX6UL_CLK_USBOH3]		= imx_clk_gate2("usboh3",	"ipg",		 base + 0x80,	0);</div><div class='ctx'> 	clks[IMX6UL_CLK_USDHC1]		= imx_clk_gate2("usdhc1",	"usdhc1_podf",	 base + 0x80,	2);</div><div class='ctx'> 	clks[IMX6UL_CLK_USDHC2]		= imx_clk_gate2("usdhc2",	"usdhc2_podf",	 base + 0x80,	4);</div><div class='del'>-	clks[IMX6UL_CLK_SIM1]		= imx_clk_gate2("sim1",		"sim_sel",	 base + 0x80,	6);</div><div class='del'>-	clks[IMX6UL_CLK_SIM2]		= imx_clk_gate2("sim2",		"sim_sel",	 base + 0x80,	8);</div><div class='add'>+	if (clk_on_imx6ul()) {</div><div class='add'>+		clks[IMX6UL_CLK_SIM1]		= imx_clk_gate2("sim1",		"sim_sel",	 base + 0x80,	6);</div><div class='add'>+		clks[IMX6UL_CLK_SIM2]		= imx_clk_gate2("sim2",		"sim_sel",	 base + 0x80,	8);</div><div class='add'>+	}</div><div class='ctx'> 	clks[IMX6UL_CLK_EIM]		= imx_clk_gate2("eim",		"eim_slow_podf", base + 0x80,	10);</div><div class='ctx'> 	clks[IMX6UL_CLK_PWM8]		= imx_clk_gate2("pwm8",		"perclk",	 base + 0x80,	16);</div><div class='ctx'> 	clks[IMX6UL_CLK_UART8_IPG]	= imx_clk_gate2("uart8_ipg",	"ipg",		 base + 0x80,	14);</div><div class='hunk'>@@ -441,7 +488,10 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clk_set_parent(clks[IMX6UL_CLK_CAN_SEL], clks[IMX6UL_CLK_PLL3_60M]);</div><div class='del'>-	clk_set_parent(clks[IMX6UL_CLK_SIM_PRE_SEL], clks[IMX6UL_CLK_PLL3_USB_OTG]);</div><div class='add'>+	if (clk_on_imx6ul())</div><div class='add'>+		clk_set_parent(clks[IMX6UL_CLK_SIM_PRE_SEL], clks[IMX6UL_CLK_PLL3_USB_OTG]);</div><div class='add'>+	else if (clk_on_imx6ull())</div><div class='add'>+		clk_set_parent(clks[IMX6ULL_CLK_EPDC_PRE_SEL], clks[IMX6UL_CLK_PLL3_PFD2]);</div><div class='ctx'> </div><div class='ctx'> 	clk_set_parent(clks[IMX6UL_CLK_ENFC_SEL], clks[IMX6UL_CLK_PLL2_PFD2]);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c<br/>index e7c7353a86fc..ae1d31be906e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/imx/clk-imx7d.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/imx/clk-imx7d.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/imx/clk-imx7d.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-imx7d.c</a></div><div class='hunk'>@@ -803,6 +803,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 	clks[IMX7D_DRAM_PHYM_ROOT_CLK] = imx_clk_gate4("dram_phym_root_clk", "dram_phym_cg", base + 0x4130, 0);</div><div class='ctx'> 	clks[IMX7D_DRAM_PHYM_ALT_ROOT_CLK] = imx_clk_gate4("dram_phym_alt_root_clk", "dram_phym_alt_post_div", base + 0x4130, 0);</div><div class='ctx'> 	clks[IMX7D_DRAM_ALT_ROOT_CLK] = imx_clk_gate4("dram_alt_root_clk", "dram_alt_post_div", base + 0x4130, 0);</div><div class='add'>+	clks[IMX7D_OCOTP_CLK] = imx_clk_gate4("ocotp_clk", "ipg_root_clk", base + 0x4230, 0);</div><div class='ctx'> 	clks[IMX7D_USB_HSIC_ROOT_CLK] = imx_clk_gate4("usb_hsic_root_clk", "usb_hsic_post_div", base + 0x4420, 0);</div><div class='ctx'> 	clks[IMX7D_SDMA_CORE_CLK] = imx_clk_gate4("sdma_root_clk", "ahb_root_clk", base + 0x4480, 0);</div><div class='ctx'> 	clks[IMX7D_PCIE_CTRL_ROOT_CLK] = imx_clk_gate4("pcie_ctrl_root_clk", "pcie_ctrl_post_div", base + 0x4600, 0);</div><div class='head'>diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c<br/>index 7a6acc3e4a92..f1099167ba31 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/imx/clk-pllv3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/imx/clk-pllv3.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/imx/clk-pllv3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-pllv3.c</a></div><div class='hunk'>@@ -21,6 +21,9 @@</div><div class='ctx'> #define PLL_NUM_OFFSET		0x10</div><div class='ctx'> #define PLL_DENOM_OFFSET	0x20</div><div class='ctx'> </div><div class='add'>+#define PLL_VF610_NUM_OFFSET	0x20</div><div class='add'>+#define PLL_VF610_DENOM_OFFSET	0x30</div><div class='add'>+</div><div class='ctx'> #define BM_PLL_POWER		(0x1 &lt;&lt; 12)</div><div class='ctx'> #define BM_PLL_LOCK		(0x1 &lt;&lt; 31)</div><div class='ctx'> #define IMX7_ENET_PLL_POWER	(0x1 &lt;&lt; 5)</div><div class='hunk'>@@ -234,6 +237,7 @@ static long clk_pllv3_av_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	unsigned long max_rate = parent_rate * 54;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u32 mfn, mfd = 1000000;</div><div class='add'>+	u32 max_mfd = 0x3FFFFFFF;</div><div class='ctx'> 	u64 temp64;</div><div class='ctx'> </div><div class='ctx'> 	if (rate &gt; max_rate)</div><div class='hunk'>@@ -241,6 +245,9 @@ static long clk_pllv3_av_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	else if (rate &lt; min_rate)</div><div class='ctx'> 		rate = min_rate;</div><div class='ctx'> </div><div class='add'>+	if (parent_rate &lt;= max_mfd)</div><div class='add'>+		mfd = parent_rate;</div><div class='add'>+</div><div class='ctx'> 	div = rate / parent_rate;</div><div class='ctx'> 	temp64 = (u64) (rate - div * parent_rate);</div><div class='ctx'> 	temp64 *= mfd;</div><div class='hunk'>@@ -262,11 +269,15 @@ static int clk_pllv3_av_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	unsigned long max_rate = parent_rate * 54;</div><div class='ctx'> 	u32 val, div;</div><div class='ctx'> 	u32 mfn, mfd = 1000000;</div><div class='add'>+	u32 max_mfd = 0x3FFFFFFF;</div><div class='ctx'> 	u64 temp64;</div><div class='ctx'> </div><div class='ctx'> 	if (rate &lt; min_rate || rate &gt; max_rate)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (parent_rate &lt;= max_mfd)</div><div class='add'>+		mfd = parent_rate;</div><div class='add'>+</div><div class='ctx'> 	div = rate / parent_rate;</div><div class='ctx'> 	temp64 = (u64) (rate - div * parent_rate);</div><div class='ctx'> 	temp64 *= mfd;</div><div class='hunk'>@@ -292,6 +303,99 @@ static const struct clk_ops clk_pllv3_av_ops = {</div><div class='ctx'> 	.set_rate	= clk_pllv3_av_set_rate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct clk_pllv3_vf610_mf {</div><div class='add'>+	u32 mfi;	/* integer part, can be 20 or 22 */</div><div class='add'>+	u32 mfn;	/* numerator, 30-bit value */</div><div class='add'>+	u32 mfd;	/* denominator, 30-bit value, must be less than mfn */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long clk_pllv3_vf610_mf_to_rate(unsigned long parent_rate,</div><div class='add'>+		struct clk_pllv3_vf610_mf mf)</div><div class='add'>+{</div><div class='add'>+	u64 temp64;</div><div class='add'>+</div><div class='add'>+	temp64 = parent_rate;</div><div class='add'>+	temp64 *= mf.mfn;</div><div class='add'>+	do_div(temp64, mf.mfd);</div><div class='add'>+</div><div class='add'>+	return (parent_rate * mf.mfi) + temp64;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk_pllv3_vf610_mf clk_pllv3_vf610_rate_to_mf(</div><div class='add'>+		unsigned long parent_rate, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_pllv3_vf610_mf mf;</div><div class='add'>+	u64 temp64;</div><div class='add'>+</div><div class='add'>+	mf.mfi = (rate &gt;= 22 * parent_rate) ? 22 : 20;</div><div class='add'>+	mf.mfd = 0x3fffffff;	/* use max supported value for best accuracy */</div><div class='add'>+</div><div class='add'>+	if (rate &lt;= parent_rate * mf.mfi)</div><div class='add'>+		mf.mfn = 0;</div><div class='add'>+	else if (rate &gt;= parent_rate * (mf.mfi + 1))</div><div class='add'>+		mf.mfn = mf.mfd - 1;</div><div class='add'>+	else {</div><div class='add'>+		/* rate = parent_rate * (mfi + mfn/mfd) */</div><div class='add'>+		temp64 = rate - parent_rate * mf.mfi;</div><div class='add'>+		temp64 *= mf.mfd;</div><div class='add'>+		do_div(temp64, parent_rate);</div><div class='add'>+		mf.mfn = temp64;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long clk_pllv3_vf610_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					      unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_pllv3 *pll = to_clk_pllv3(hw);</div><div class='add'>+	struct clk_pllv3_vf610_mf mf;</div><div class='add'>+</div><div class='add'>+	mf.mfn = readl_relaxed(pll-&gt;base + PLL_VF610_NUM_OFFSET);</div><div class='add'>+	mf.mfd = readl_relaxed(pll-&gt;base + PLL_VF610_DENOM_OFFSET);</div><div class='add'>+	mf.mfi = (readl_relaxed(pll-&gt;base) &amp; pll-&gt;div_mask) ? 22 : 20;</div><div class='add'>+</div><div class='add'>+	return clk_pllv3_vf610_mf_to_rate(parent_rate, mf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long clk_pllv3_vf610_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				    unsigned long *prate)</div><div class='add'>+{</div><div class='add'>+	struct clk_pllv3_vf610_mf mf = clk_pllv3_vf610_rate_to_mf(*prate, rate);</div><div class='add'>+</div><div class='add'>+	return clk_pllv3_vf610_mf_to_rate(*prate, mf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_pllv3_vf610_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+		unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_pllv3 *pll = to_clk_pllv3(hw);</div><div class='add'>+	struct clk_pllv3_vf610_mf mf =</div><div class='add'>+			clk_pllv3_vf610_rate_to_mf(parent_rate, rate);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = readl_relaxed(pll-&gt;base);</div><div class='add'>+	if (mf.mfi == 20)</div><div class='add'>+		val &amp;= ~pll-&gt;div_mask;	/* clear bit for mfi=20 */</div><div class='add'>+	else</div><div class='add'>+		val |= pll-&gt;div_mask;	/* set bit for mfi=22 */</div><div class='add'>+	writel_relaxed(val, pll-&gt;base);</div><div class='add'>+</div><div class='add'>+	writel_relaxed(mf.mfn, pll-&gt;base + PLL_VF610_NUM_OFFSET);</div><div class='add'>+	writel_relaxed(mf.mfd, pll-&gt;base + PLL_VF610_DENOM_OFFSET);</div><div class='add'>+</div><div class='add'>+	return clk_pllv3_wait_lock(pll);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops clk_pllv3_vf610_ops = {</div><div class='add'>+	.prepare	= clk_pllv3_prepare,</div><div class='add'>+	.unprepare	= clk_pllv3_unprepare,</div><div class='add'>+	.is_prepared	= clk_pllv3_is_prepared,</div><div class='add'>+	.recalc_rate	= clk_pllv3_vf610_recalc_rate,</div><div class='add'>+	.round_rate	= clk_pllv3_vf610_round_rate,</div><div class='add'>+	.set_rate	= clk_pllv3_vf610_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static unsigned long clk_pllv3_enet_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> 						unsigned long parent_rate)</div><div class='ctx'> {</div><div class='hunk'>@@ -326,6 +430,9 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,</div><div class='ctx'> 	case IMX_PLLV3_SYS:</div><div class='ctx'> 		ops = &amp;clk_pllv3_sys_ops;</div><div class='ctx'> 		break;</div><div class='add'>+	case IMX_PLLV3_SYS_VF610:</div><div class='add'>+		ops = &amp;clk_pllv3_vf610_ops;</div><div class='add'>+		break;</div><div class='ctx'> 	case IMX_PLLV3_USB_VF610:</div><div class='ctx'> 		pll-&gt;div_shift = 1;</div><div class='ctx'> 	case IMX_PLLV3_USB:</div><div class='head'>diff --git a/drivers/clk/imx/clk-vf610.c b/drivers/clk/imx/clk-vf610.c<br/>index 0476353ab423..59b1863deb88 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/imx/clk-vf610.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/imx/clk-vf610.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/imx/clk-vf610.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk-vf610.c</a></div><div class='hunk'>@@ -219,8 +219,8 @@ static void __init vf610_clocks_init(struct device_node *ccm_node)</div><div class='ctx'> 	clk[VF610_CLK_PLL6_BYPASS_SRC] = imx_clk_mux("pll6_bypass_src", PLL6_CTRL, 14, 1, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));</div><div class='ctx'> 	clk[VF610_CLK_PLL7_BYPASS_SRC] = imx_clk_mux("pll7_bypass_src", PLL7_CTRL, 14, 1, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));</div><div class='ctx'> </div><div class='del'>-	clk[VF610_CLK_PLL1] = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll1", "pll1_bypass_src", PLL1_CTRL, 0x1);</div><div class='del'>-	clk[VF610_CLK_PLL2] = imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll2", "pll2_bypass_src", PLL2_CTRL, 0x1);</div><div class='add'>+	clk[VF610_CLK_PLL1] = imx_clk_pllv3(IMX_PLLV3_SYS_VF610, "pll1", "pll1_bypass_src", PLL1_CTRL, 0x1);</div><div class='add'>+	clk[VF610_CLK_PLL2] = imx_clk_pllv3(IMX_PLLV3_SYS_VF610, "pll2", "pll2_bypass_src", PLL2_CTRL, 0x1);</div><div class='ctx'> 	clk[VF610_CLK_PLL3] = imx_clk_pllv3(IMX_PLLV3_USB_VF610,     "pll3", "pll3_bypass_src", PLL3_CTRL, 0x2);</div><div class='ctx'> 	clk[VF610_CLK_PLL4] = imx_clk_pllv3(IMX_PLLV3_AV,      "pll4", "pll4_bypass_src", PLL4_CTRL, 0x7f);</div><div class='ctx'> 	clk[VF610_CLK_PLL5] = imx_clk_pllv3(IMX_PLLV3_ENET,    "pll5", "pll5_bypass_src", PLL5_CTRL, 0x3);</div><div class='head'>diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h<br/>index 3799ff82a9b4..e1f5e425db73 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/imx/clk.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/imx/clk.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/imx/clk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/imx/clk.h</a></div><div class='hunk'>@@ -34,6 +34,7 @@ enum imx_pllv3_type {</div><div class='ctx'> 	IMX_PLLV3_AV,</div><div class='ctx'> 	IMX_PLLV3_ENET,</div><div class='ctx'> 	IMX_PLLV3_ENET_IMX7,</div><div class='add'>+	IMX_PLLV3_SYS_VF610,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,</div><div class='hunk'>@@ -75,6 +76,14 @@ static inline struct clk *imx_clk_fixed(const char *name, int rate)</div><div class='ctx'> 	return clk_register_fixed_rate(NULL, name, NULL, 0, rate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct clk *imx_clk_mux_ldb(const char *name, void __iomem *reg,</div><div class='add'>+		u8 shift, u8 width, const char **parents, int num_parents)</div><div class='add'>+{</div><div class='add'>+	return clk_register_mux(NULL, name, parents, num_parents,</div><div class='add'>+			CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT, reg,</div><div class='add'>+			shift, width, CLK_MUX_READ_ONLY, &amp;imx_ccm_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct clk *imx_clk_fixed_factor(const char *name,</div><div class='ctx'> 		const char *parent, unsigned int mult, unsigned int div)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/clk/keystone/pll.c b/drivers/clk/keystone/pll.c<br/>index a26ba2184454..e7e840fb74ea 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/keystone/pll.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/keystone/pll.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/keystone/pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/keystone/pll.c</a></div><div class='hunk'>@@ -154,7 +154,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * _of_clk_init - PLL initialisation via DT</div><div class='add'>+ * _of_pll_clk_init - PLL initialisation via DT</div><div class='ctx'>  * @node: device tree node for this clock</div><div class='ctx'>  * @pllctrl: If true, lower 6 bits of multiplier is in pllm register of</div><div class='ctx'>  *		pll controller, else it is in the control register0(bit 11-6)</div><div class='hunk'>@@ -235,7 +235,7 @@ CLK_OF_DECLARE(keystone_pll_clock, "ti,keystone,pll-clock",</div><div class='ctx'> 					of_keystone_pll_clk_init);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * of_keystone_pll_main_clk_init - Main PLL initialisation DT wrapper</div><div class='add'>+ * of_keystone_main_pll_clk_init - Main PLL initialisation DT wrapper</div><div class='ctx'>  * @node: device tree node for this clock</div><div class='ctx'>  */</div><div class='ctx'> static void __init of_keystone_main_pll_clk_init(struct device_node *node)</div><div class='hunk'>@@ -267,25 +267,30 @@ static void __init of_pll_div_clk_init(struct device_node *node)</div><div class='ctx'> 	parent_name = of_clk_get_parent_name(node, 0);</div><div class='ctx'> 	if (!parent_name) {</div><div class='ctx'> 		pr_err("%s: missing parent clock\n", __func__);</div><div class='add'>+		iounmap(reg);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (of_property_read_u32(node, "bit-shift", &amp;shift)) {</div><div class='ctx'> 		pr_err("%s: missing 'shift' property\n", __func__);</div><div class='add'>+		iounmap(reg);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (of_property_read_u32(node, "bit-mask", &amp;mask)) {</div><div class='ctx'> 		pr_err("%s: missing 'bit-mask' property\n", __func__);</div><div class='add'>+		iounmap(reg);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clk = clk_register_divider(NULL, clk_name, parent_name, 0, reg, shift,</div><div class='ctx'> 				 mask, 0, NULL);</div><div class='del'>-	if (clk)</div><div class='add'>+	if (clk) {</div><div class='ctx'> 		of_clk_add_provider(node, of_clk_src_simple_get, clk);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		pr_err("%s: error registering divider %s\n", __func__, clk_name);</div><div class='add'>+		iounmap(reg);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> CLK_OF_DECLARE(pll_divider_clock, "ti,keystone,pll-divider-clock", of_pll_div_clk_init);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/mediatek/Kconfig b/drivers/clk/mediatek/Kconfig<br/>index f042bd2a6a99..a01ef7806aed 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mediatek/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mediatek/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/Kconfig</a></div><div class='hunk'>@@ -6,11 +6,55 @@ config COMMON_CLK_MEDIATEK</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Mediatek SoCs' clock support.</div><div class='ctx'> </div><div class='add'>+config COMMON_CLK_MT2701</div><div class='add'>+	bool "Clock driver for Mediatek MT2701"</div><div class='add'>+	depends on (ARCH_MEDIATEK &amp;&amp; ARM) || COMPILE_TEST</div><div class='add'>+	select COMMON_CLK_MEDIATEK</div><div class='add'>+	default ARCH_MEDIATEK &amp;&amp; ARM</div><div class='add'>+	---help---</div><div class='add'>+	  This driver supports Mediatek MT2701 basic clocks.</div><div class='add'>+</div><div class='add'>+config COMMON_CLK_MT2701_MMSYS</div><div class='add'>+	bool "Clock driver for Mediatek MT2701 mmsys"</div><div class='add'>+	depends on COMMON_CLK_MT2701</div><div class='add'>+	---help---</div><div class='add'>+	  This driver supports Mediatek MT2701 mmsys clocks.</div><div class='add'>+</div><div class='add'>+config COMMON_CLK_MT2701_IMGSYS</div><div class='add'>+	bool "Clock driver for Mediatek MT2701 imgsys"</div><div class='add'>+	depends on COMMON_CLK_MT2701</div><div class='add'>+	---help---</div><div class='add'>+	  This driver supports Mediatek MT2701 imgsys clocks.</div><div class='add'>+</div><div class='add'>+config COMMON_CLK_MT2701_VDECSYS</div><div class='add'>+	bool "Clock driver for Mediatek MT2701 vdecsys"</div><div class='add'>+	depends on COMMON_CLK_MT2701</div><div class='add'>+	---help---</div><div class='add'>+	  This driver supports Mediatek MT2701 vdecsys clocks.</div><div class='add'>+</div><div class='add'>+config COMMON_CLK_MT2701_HIFSYS</div><div class='add'>+	bool "Clock driver for Mediatek MT2701 hifsys"</div><div class='add'>+	depends on COMMON_CLK_MT2701</div><div class='add'>+	---help---</div><div class='add'>+	  This driver supports Mediatek MT2701 hifsys clocks.</div><div class='add'>+</div><div class='add'>+config COMMON_CLK_MT2701_ETHSYS</div><div class='add'>+	bool "Clock driver for Mediatek MT2701 ethsys"</div><div class='add'>+	depends on COMMON_CLK_MT2701</div><div class='add'>+	---help---</div><div class='add'>+	  This driver supports Mediatek MT2701 ethsys clocks.</div><div class='add'>+</div><div class='add'>+config COMMON_CLK_MT2701_BDPSYS</div><div class='add'>+	bool "Clock driver for Mediatek MT2701 bdpsys"</div><div class='add'>+	depends on COMMON_CLK_MT2701</div><div class='add'>+	---help---</div><div class='add'>+	  This driver supports Mediatek MT2701 bdpsys clocks.</div><div class='add'>+</div><div class='ctx'> config COMMON_CLK_MT8135</div><div class='ctx'> 	bool "Clock driver for Mediatek MT8135"</div><div class='del'>-	depends on ARCH_MEDIATEK || COMPILE_TEST</div><div class='add'>+	depends on (ARCH_MEDIATEK &amp;&amp; ARM) || COMPILE_TEST</div><div class='ctx'> 	select COMMON_CLK_MEDIATEK</div><div class='del'>-	default ARCH_MEDIATEK</div><div class='add'>+	default ARCH_MEDIATEK &amp;&amp; ARM</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver supports Mediatek MT8135 clocks.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/mediatek/Makefile b/drivers/clk/mediatek/Makefile<br/>index 32e7222e7305..19ae7ef79b57 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mediatek/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mediatek/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/Makefile</a></div><div class='hunk'>@@ -1,4 +1,11 @@</div><div class='ctx'> obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o</div><div class='ctx'> obj-$(CONFIG_RESET_CONTROLLER) += reset.o</div><div class='add'>+obj-$(CONFIG_COMMON_CLK_MT2701) += clk-mt2701.o</div><div class='add'>+obj-$(CONFIG_COMMON_CLK_MT2701_BDPSYS) += clk-mt2701-bdp.o</div><div class='add'>+obj-$(CONFIG_COMMON_CLK_MT2701_ETHSYS) += clk-mt2701-eth.o</div><div class='add'>+obj-$(CONFIG_COMMON_CLK_MT2701_HIFSYS) += clk-mt2701-hif.o</div><div class='add'>+obj-$(CONFIG_COMMON_CLK_MT2701_IMGSYS) += clk-mt2701-img.o</div><div class='add'>+obj-$(CONFIG_COMMON_CLK_MT2701_MMSYS) += clk-mt2701-mm.o</div><div class='add'>+obj-$(CONFIG_COMMON_CLK_MT2701_VDECSYS) += clk-mt2701-vdec.o</div><div class='ctx'> obj-$(CONFIG_COMMON_CLK_MT8135) += clk-mt8135.o</div><div class='ctx'> obj-$(CONFIG_COMMON_CLK_MT8173) += clk-mt8173.o</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-gate.c b/drivers/clk/mediatek/clk-gate.c<br/>index d8787bf444eb..934bf0e45e26 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-gate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mediatek/clk-gate.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-gate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-gate.c</a></div><div class='hunk'>@@ -61,6 +61,22 @@ static void mtk_cg_clr_bit(struct clk_hw *hw)</div><div class='ctx'> 	regmap_write(cg-&gt;regmap, cg-&gt;clr_ofs, BIT(cg-&gt;bit));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mtk_cg_set_bit_no_setclr(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct mtk_clk_gate *cg = to_mtk_clk_gate(hw);</div><div class='add'>+	u32 cgbit = BIT(cg-&gt;bit);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(cg-&gt;regmap, cg-&gt;sta_ofs, cgbit, cgbit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_cg_clr_bit_no_setclr(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct mtk_clk_gate *cg = to_mtk_clk_gate(hw);</div><div class='add'>+	u32 cgbit = BIT(cg-&gt;bit);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(cg-&gt;regmap, cg-&gt;sta_ofs, cgbit, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mtk_cg_enable(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	mtk_cg_clr_bit(hw);</div><div class='hunk'>@@ -85,6 +101,30 @@ static void mtk_cg_disable_inv(struct clk_hw *hw)</div><div class='ctx'> 	mtk_cg_clr_bit(hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mtk_cg_enable_no_setclr(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	mtk_cg_clr_bit_no_setclr(hw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_cg_disable_no_setclr(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	mtk_cg_set_bit_no_setclr(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_cg_enable_inv_no_setclr(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	mtk_cg_set_bit_no_setclr(hw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_cg_disable_inv_no_setclr(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	mtk_cg_clr_bit_no_setclr(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct clk_ops mtk_clk_gate_ops_setclr = {</div><div class='ctx'> 	.is_enabled	= mtk_cg_bit_is_cleared,</div><div class='ctx'> 	.enable		= mtk_cg_enable,</div><div class='hunk'>@@ -97,6 +137,18 @@ const struct clk_ops mtk_clk_gate_ops_setclr_inv = {</div><div class='ctx'> 	.disable	= mtk_cg_disable_inv,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const struct clk_ops mtk_clk_gate_ops_no_setclr = {</div><div class='add'>+	.is_enabled	= mtk_cg_bit_is_cleared,</div><div class='add'>+	.enable		= mtk_cg_enable_no_setclr,</div><div class='add'>+	.disable	= mtk_cg_disable_no_setclr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct clk_ops mtk_clk_gate_ops_no_setclr_inv = {</div><div class='add'>+	.is_enabled	= mtk_cg_bit_is_set,</div><div class='add'>+	.enable		= mtk_cg_enable_inv_no_setclr,</div><div class='add'>+	.disable	= mtk_cg_disable_inv_no_setclr,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct clk *mtk_clk_register_gate(</div><div class='ctx'> 		const char *name,</div><div class='ctx'> 		const char *parent_name,</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-gate.h b/drivers/clk/mediatek/clk-gate.h<br/>index b1821603b887..72ef89b3ad7b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-gate.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mediatek/clk-gate.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-gate.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-gate.h</a></div><div class='hunk'>@@ -36,6 +36,8 @@ static inline struct mtk_clk_gate *to_mtk_clk_gate(struct clk_hw *hw)</div><div class='ctx'> </div><div class='ctx'> extern const struct clk_ops mtk_clk_gate_ops_setclr;</div><div class='ctx'> extern const struct clk_ops mtk_clk_gate_ops_setclr_inv;</div><div class='add'>+extern const struct clk_ops mtk_clk_gate_ops_no_setclr;</div><div class='add'>+extern const struct clk_ops mtk_clk_gate_ops_no_setclr_inv;</div><div class='ctx'> </div><div class='ctx'> struct clk *mtk_clk_register_gate(</div><div class='ctx'> 		const char *name,</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-mt2701-bdp.c b/drivers/clk/mediatek/clk-mt2701-bdp.c<br/>new file mode 100644<br/>index 000000000000..fe4964d05b5f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-mt2701-bdp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-bdp.c</a></div><div class='hunk'>@@ -0,0 +1,138 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014 MediaTek Inc.</div><div class='add'>+ * Author: Shunli Wang &lt;shunli.wang@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "clk-mtk.h"</div><div class='add'>+#include "clk-gate.h"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/mt2701-clk.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs bdp0_cg_regs = {</div><div class='add'>+	.set_ofs = 0x0104,</div><div class='add'>+	.clr_ofs = 0x0108,</div><div class='add'>+	.sta_ofs = 0x0100,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs bdp1_cg_regs = {</div><div class='add'>+	.set_ofs = 0x0114,</div><div class='add'>+	.clr_ofs = 0x0118,</div><div class='add'>+	.sta_ofs = 0x0110,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GATE_BDP0(_id, _name, _parent, _shift) {	\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;bdp0_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_setclr_inv,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define GATE_BDP1(_id, _name, _parent, _shift) {	\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;bdp1_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_setclr_inv,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate bdp_clks[] = {</div><div class='add'>+	GATE_BDP0(CLK_BDP_BRG_BA, "brg_baclk", "mm_sel", 0),</div><div class='add'>+	GATE_BDP0(CLK_BDP_BRG_DRAM, "brg_dram", "mm_sel", 1),</div><div class='add'>+	GATE_BDP0(CLK_BDP_LARB_DRAM, "larb_dram", "mm_sel", 2),</div><div class='add'>+	GATE_BDP0(CLK_BDP_WR_VDI_PXL, "wr_vdi_pxl", "hdmi_0_deep340m", 3),</div><div class='add'>+	GATE_BDP0(CLK_BDP_WR_VDI_DRAM, "wr_vdi_dram", "mm_sel", 4),</div><div class='add'>+	GATE_BDP0(CLK_BDP_WR_B, "wr_bclk", "mm_sel", 5),</div><div class='add'>+	GATE_BDP0(CLK_BDP_DGI_IN, "dgi_in", "dpi1_sel", 6),</div><div class='add'>+	GATE_BDP0(CLK_BDP_DGI_OUT, "dgi_out", "dpi1_sel", 7),</div><div class='add'>+	GATE_BDP0(CLK_BDP_FMT_MAST_27, "fmt_mast_27", "dpi1_sel", 8),</div><div class='add'>+	GATE_BDP0(CLK_BDP_FMT_B, "fmt_bclk", "mm_sel", 9),</div><div class='add'>+	GATE_BDP0(CLK_BDP_OSD_B, "osd_bclk", "mm_sel", 10),</div><div class='add'>+	GATE_BDP0(CLK_BDP_OSD_DRAM, "osd_dram", "mm_sel", 11),</div><div class='add'>+	GATE_BDP0(CLK_BDP_OSD_AGENT, "osd_agent", "osd_sel", 12),</div><div class='add'>+	GATE_BDP0(CLK_BDP_OSD_PXL, "osd_pxl", "dpi1_sel", 13),</div><div class='add'>+	GATE_BDP0(CLK_BDP_RLE_B, "rle_bclk", "mm_sel", 14),</div><div class='add'>+	GATE_BDP0(CLK_BDP_RLE_AGENT, "rle_agent", "mm_sel", 15),</div><div class='add'>+	GATE_BDP0(CLK_BDP_RLE_DRAM, "rle_dram", "mm_sel", 16),</div><div class='add'>+	GATE_BDP0(CLK_BDP_F27M, "f27m", "di_sel", 17),</div><div class='add'>+	GATE_BDP0(CLK_BDP_F27M_VDOUT, "f27m_vdout", "di_sel", 18),</div><div class='add'>+	GATE_BDP0(CLK_BDP_F27_74_74, "f27_74_74", "di_sel", 19),</div><div class='add'>+	GATE_BDP0(CLK_BDP_F2FS, "f2fs", "di_sel", 20),</div><div class='add'>+	GATE_BDP0(CLK_BDP_F2FS74_148, "f2fs74_148", "di_sel", 21),</div><div class='add'>+	GATE_BDP0(CLK_BDP_FB, "fbclk", "mm_sel", 22),</div><div class='add'>+	GATE_BDP0(CLK_BDP_VDO_DRAM, "vdo_dram", "mm_sel", 23),</div><div class='add'>+	GATE_BDP0(CLK_BDP_VDO_2FS, "vdo_2fs", "di_sel", 24),</div><div class='add'>+	GATE_BDP0(CLK_BDP_VDO_B, "vdo_bclk", "mm_sel", 25),</div><div class='add'>+	GATE_BDP0(CLK_BDP_WR_DI_PXL, "wr_di_pxl", "di_sel", 26),</div><div class='add'>+	GATE_BDP0(CLK_BDP_WR_DI_DRAM, "wr_di_dram", "mm_sel", 27),</div><div class='add'>+	GATE_BDP0(CLK_BDP_WR_DI_B, "wr_di_bclk", "mm_sel", 28),</div><div class='add'>+	GATE_BDP0(CLK_BDP_NR_PXL, "nr_pxl", "nr_sel", 29),</div><div class='add'>+	GATE_BDP0(CLK_BDP_NR_DRAM, "nr_dram", "mm_sel", 30),</div><div class='add'>+	GATE_BDP0(CLK_BDP_NR_B, "nr_bclk", "mm_sel", 31),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RX_F, "rx_fclk", "hadds2_fbclk", 0),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RX_X, "rx_xclk", "clk26m", 1),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RXPDT, "rxpdtclk", "hdmi_0_pix340m", 2),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RX_CSCL_N, "rx_cscl_n", "clk26m", 3),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RX_CSCL, "rx_cscl", "clk26m", 4),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RX_DDCSCL_N, "rx_ddcscl_n", "hdmi_scl_rx", 5),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RX_DDCSCL, "rx_ddcscl", "hdmi_scl_rx", 6),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RX_VCO, "rx_vcoclk", "hadds2pll_294m", 7),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RX_DP, "rx_dpclk", "hdmi_0_pll340m", 8),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RX_P, "rx_pclk", "hdmi_0_pll340m", 9),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RX_M, "rx_mclk", "hadds2pll_294m", 10),</div><div class='add'>+	GATE_BDP1(CLK_BDP_RX_PLL, "rx_pllclk", "hdmi_0_pix340m", 11),</div><div class='add'>+	GATE_BDP1(CLK_BDP_BRG_RT_B, "brg_rt_bclk", "mm_sel", 12),</div><div class='add'>+	GATE_BDP1(CLK_BDP_BRG_RT_DRAM, "brg_rt_dram", "mm_sel", 13),</div><div class='add'>+	GATE_BDP1(CLK_BDP_LARBRT_DRAM, "larbrt_dram", "mm_sel", 14),</div><div class='add'>+	GATE_BDP1(CLK_BDP_TMDS_SYN, "tmds_syn", "hdmi_0_pll340m", 15),</div><div class='add'>+	GATE_BDP1(CLK_BDP_HDMI_MON, "hdmi_mon", "hdmi_0_pll340m", 16),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_match_clk_mt2701_bdp[] = {</div><div class='add'>+	{ .compatible = "mediatek,mt2701-bdpsys", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int clk_mt2701_bdp_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk_onecell_data *clk_data;</div><div class='add'>+	int r;</div><div class='add'>+	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	clk_data = mtk_alloc_clk_data(CLK_BDP_NR);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_gates(node, bdp_clks, ARRAY_SIZE(bdp_clks),</div><div class='add'>+						clk_data);</div><div class='add'>+</div><div class='add'>+	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);</div><div class='add'>+	if (r)</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"could not register clock provider: %s: %d\n",</div><div class='add'>+			pdev-&gt;name, r);</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver clk_mt2701_bdp_drv = {</div><div class='add'>+	.probe = clk_mt2701_bdp_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "clk-mt2701-bdp",</div><div class='add'>+		.of_match_table = of_match_clk_mt2701_bdp,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+builtin_platform_driver(clk_mt2701_bdp_drv);</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-mt2701-eth.c b/drivers/clk/mediatek/clk-mt2701-eth.c<br/>new file mode 100644<br/>index 000000000000..877be8715afa<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-mt2701-eth.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-eth.c</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014 MediaTek Inc.</div><div class='add'>+ * Author: Shunli Wang &lt;shunli.wang@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "clk-mtk.h"</div><div class='add'>+#include "clk-gate.h"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/mt2701-clk.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs eth_cg_regs = {</div><div class='add'>+	.sta_ofs = 0x0030,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GATE_ETH(_id, _name, _parent, _shift) {		\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;eth_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_no_setclr_inv,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate eth_clks[] = {</div><div class='add'>+	GATE_ETH(CLK_ETHSYS_HSDMA, "hsdma_clk", "ethif_sel", 5),</div><div class='add'>+	GATE_ETH(CLK_ETHSYS_ESW, "esw_clk", "ethpll_500m_ck", 6),</div><div class='add'>+	GATE_ETH(CLK_ETHSYS_GP2, "gp2_clk", "trgpll", 7),</div><div class='add'>+	GATE_ETH(CLK_ETHSYS_GP1, "gp1_clk", "ethpll_500m_ck", 8),</div><div class='add'>+	GATE_ETH(CLK_ETHSYS_PCM, "pcm_clk", "ethif_sel", 11),</div><div class='add'>+	GATE_ETH(CLK_ETHSYS_GDMA, "gdma_clk", "ethif_sel", 14),</div><div class='add'>+	GATE_ETH(CLK_ETHSYS_I2S, "i2s_clk", "ethif_sel", 17),</div><div class='add'>+	GATE_ETH(CLK_ETHSYS_CRYPTO, "crypto_clk", "ethif_sel", 29),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_match_clk_mt2701_eth[] = {</div><div class='add'>+	{ .compatible = "mediatek,mt2701-ethsys", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int clk_mt2701_eth_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk_onecell_data *clk_data;</div><div class='add'>+	int r;</div><div class='add'>+	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	clk_data = mtk_alloc_clk_data(CLK_ETHSYS_NR);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_gates(node, eth_clks, ARRAY_SIZE(eth_clks),</div><div class='add'>+						clk_data);</div><div class='add'>+</div><div class='add'>+	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);</div><div class='add'>+	if (r)</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"could not register clock provider: %s: %d\n",</div><div class='add'>+			pdev-&gt;name, r);</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver clk_mt2701_eth_drv = {</div><div class='add'>+	.probe = clk_mt2701_eth_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "clk-mt2701-eth",</div><div class='add'>+		.of_match_table = of_match_clk_mt2701_eth,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+builtin_platform_driver(clk_mt2701_eth_drv);</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-mt2701-hif.c b/drivers/clk/mediatek/clk-mt2701-hif.c<br/>new file mode 100644<br/>index 000000000000..18f3723be3e8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-mt2701-hif.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-hif.c</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014 MediaTek Inc.</div><div class='add'>+ * Author: Shunli Wang &lt;shunli.wang@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "clk-mtk.h"</div><div class='add'>+#include "clk-gate.h"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/mt2701-clk.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs hif_cg_regs = {</div><div class='add'>+	.sta_ofs = 0x0030,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GATE_HIF(_id, _name, _parent, _shift) {		\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;hif_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_no_setclr_inv,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate hif_clks[] = {</div><div class='add'>+	GATE_HIF(CLK_HIFSYS_USB0PHY, "usb0_phy_clk", "ethpll_500m_ck", 21),</div><div class='add'>+	GATE_HIF(CLK_HIFSYS_USB1PHY, "usb1_phy_clk", "ethpll_500m_ck", 22),</div><div class='add'>+	GATE_HIF(CLK_HIFSYS_PCIE0, "pcie0_clk", "ethpll_500m_ck", 24),</div><div class='add'>+	GATE_HIF(CLK_HIFSYS_PCIE1, "pcie1_clk", "ethpll_500m_ck", 25),</div><div class='add'>+	GATE_HIF(CLK_HIFSYS_PCIE2, "pcie2_clk", "ethpll_500m_ck", 26),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_match_clk_mt2701_hif[] = {</div><div class='add'>+	{ .compatible = "mediatek,mt2701-hifsys", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int clk_mt2701_hif_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk_onecell_data *clk_data;</div><div class='add'>+	int r;</div><div class='add'>+	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	clk_data = mtk_alloc_clk_data(CLK_HIFSYS_NR);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_gates(node, hif_clks, ARRAY_SIZE(hif_clks),</div><div class='add'>+						clk_data);</div><div class='add'>+</div><div class='add'>+	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"could not register clock provider: %s: %d\n",</div><div class='add'>+			pdev-&gt;name, r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtk_register_reset_controller(node, 1, 0x34);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver clk_mt2701_hif_drv = {</div><div class='add'>+	.probe = clk_mt2701_hif_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "clk-mt2701-hif",</div><div class='add'>+		.of_match_table = of_match_clk_mt2701_hif,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+builtin_platform_driver(clk_mt2701_hif_drv);</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-mt2701-img.c b/drivers/clk/mediatek/clk-mt2701-img.c<br/>new file mode 100644<br/>index 000000000000..b7441c98bda8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-mt2701-img.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-img.c</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014 MediaTek Inc.</div><div class='add'>+ * Author: Shunli Wang &lt;shunli.wang@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "clk-mtk.h"</div><div class='add'>+#include "clk-gate.h"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/mt2701-clk.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs img_cg_regs = {</div><div class='add'>+	.set_ofs = 0x0004,</div><div class='add'>+	.clr_ofs = 0x0008,</div><div class='add'>+	.sta_ofs = 0x0000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GATE_IMG(_id, _name, _parent, _shift) {		\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;img_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_setclr,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate img_clks[] = {</div><div class='add'>+	GATE_IMG(CLK_IMG_SMI_COMM, "img_smi_comm", "mm_sel", 0),</div><div class='add'>+	GATE_IMG(CLK_IMG_RESZ, "img_resz", "mm_sel", 1),</div><div class='add'>+	GATE_IMG(CLK_IMG_JPGDEC_SMI, "img_jpgdec_smi", "mm_sel", 5),</div><div class='add'>+	GATE_IMG(CLK_IMG_JPGDEC, "img_jpgdec", "mm_sel", 6),</div><div class='add'>+	GATE_IMG(CLK_IMG_VENC_LT, "img_venc_lt", "mm_sel", 8),</div><div class='add'>+	GATE_IMG(CLK_IMG_VENC, "img_venc", "mm_sel", 9),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_match_clk_mt2701_img[] = {</div><div class='add'>+	{ .compatible = "mediatek,mt2701-imgsys", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int clk_mt2701_img_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk_onecell_data *clk_data;</div><div class='add'>+	int r;</div><div class='add'>+	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	clk_data = mtk_alloc_clk_data(CLK_IMG_NR);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_gates(node, img_clks, ARRAY_SIZE(img_clks),</div><div class='add'>+						clk_data);</div><div class='add'>+</div><div class='add'>+	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);</div><div class='add'>+	if (r)</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"could not register clock provider: %s: %d\n",</div><div class='add'>+			pdev-&gt;name, r);</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver clk_mt2701_img_drv = {</div><div class='add'>+	.probe = clk_mt2701_img_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "clk-mt2701-img",</div><div class='add'>+		.of_match_table = of_match_clk_mt2701_img,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+builtin_platform_driver(clk_mt2701_img_drv);</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-mt2701-mm.c b/drivers/clk/mediatek/clk-mt2701-mm.c<br/>new file mode 100644<br/>index 000000000000..fe1f85072fc5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-mt2701-mm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-mm.c</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014 MediaTek Inc.</div><div class='add'>+ * Author: Shunli Wang &lt;shunli.wang@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "clk-mtk.h"</div><div class='add'>+#include "clk-gate.h"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/mt2701-clk.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs disp0_cg_regs = {</div><div class='add'>+	.set_ofs = 0x0104,</div><div class='add'>+	.clr_ofs = 0x0108,</div><div class='add'>+	.sta_ofs = 0x0100,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs disp1_cg_regs = {</div><div class='add'>+	.set_ofs = 0x0114,</div><div class='add'>+	.clr_ofs = 0x0118,</div><div class='add'>+	.sta_ofs = 0x0110,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GATE_DISP0(_id, _name, _parent, _shift) {	\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;disp0_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_setclr,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define GATE_DISP1(_id, _name, _parent, _shift) {	\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;disp1_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_setclr,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate mm_clks[] = {</div><div class='add'>+	GATE_DISP0(CLK_MM_SMI_COMMON, "mm_smi_comm", "mm_sel", 0),</div><div class='add'>+	GATE_DISP0(CLK_MM_SMI_LARB0, "mm_smi_larb0", "mm_sel", 1),</div><div class='add'>+	GATE_DISP0(CLK_MM_CMDQ, "mm_cmdq", "mm_sel", 2),</div><div class='add'>+	GATE_DISP0(CLK_MM_MUTEX, "mm_mutex", "mm_sel", 3),</div><div class='add'>+	GATE_DISP0(CLK_MM_DISP_COLOR, "mm_disp_color", "mm_sel", 4),</div><div class='add'>+	GATE_DISP0(CLK_MM_DISP_BLS, "mm_disp_bls", "mm_sel", 5),</div><div class='add'>+	GATE_DISP0(CLK_MM_DISP_WDMA, "mm_disp_wdma", "mm_sel", 6),</div><div class='add'>+	GATE_DISP0(CLK_MM_DISP_RDMA, "mm_disp_rdma", "mm_sel", 7),</div><div class='add'>+	GATE_DISP0(CLK_MM_DISP_OVL, "mm_disp_ovl", "mm_sel", 8),</div><div class='add'>+	GATE_DISP0(CLK_MM_MDP_TDSHP, "mm_mdp_tdshp", "mm_sel", 9),</div><div class='add'>+	GATE_DISP0(CLK_MM_MDP_WROT, "mm_mdp_wrot", "mm_sel", 10),</div><div class='add'>+	GATE_DISP0(CLK_MM_MDP_WDMA, "mm_mdp_wdma", "mm_sel", 11),</div><div class='add'>+	GATE_DISP0(CLK_MM_MDP_RSZ1, "mm_mdp_rsz1", "mm_sel", 12),</div><div class='add'>+	GATE_DISP0(CLK_MM_MDP_RSZ0, "mm_mdp_rsz0", "mm_sel", 13),</div><div class='add'>+	GATE_DISP0(CLK_MM_MDP_RDMA, "mm_mdp_rdma", "mm_sel", 14),</div><div class='add'>+	GATE_DISP0(CLK_MM_MDP_BLS_26M, "mm_mdp_bls_26m", "pwm_sel", 15),</div><div class='add'>+	GATE_DISP0(CLK_MM_CAM_MDP, "mm_cam_mdp", "mm_sel", 16),</div><div class='add'>+	GATE_DISP0(CLK_MM_FAKE_ENG, "mm_fake_eng", "mm_sel", 17),</div><div class='add'>+	GATE_DISP0(CLK_MM_MUTEX_32K, "mm_mutex_32k", "rtc_sel", 18),</div><div class='add'>+	GATE_DISP0(CLK_MM_DISP_RDMA1, "mm_disp_rdma1", "mm_sel", 19),</div><div class='add'>+	GATE_DISP0(CLK_MM_DISP_UFOE, "mm_disp_ufoe", "mm_sel", 20),</div><div class='add'>+	GATE_DISP1(CLK_MM_DSI_ENGINE, "mm_dsi_eng", "mm_sel", 0),</div><div class='add'>+	GATE_DISP1(CLK_MM_DSI_DIG, "mm_dsi_dig", "dsi0_lntc_dsi", 1),</div><div class='add'>+	GATE_DISP1(CLK_MM_DPI_DIGL, "mm_dpi_digl", "dpi0_sel", 2),</div><div class='add'>+	GATE_DISP1(CLK_MM_DPI_ENGINE, "mm_dpi_eng", "mm_sel", 3),</div><div class='add'>+	GATE_DISP1(CLK_MM_DPI1_DIGL, "mm_dpi1_digl", "dpi1_sel", 4),</div><div class='add'>+	GATE_DISP1(CLK_MM_DPI1_ENGINE, "mm_dpi1_eng", "mm_sel", 5),</div><div class='add'>+	GATE_DISP1(CLK_MM_TVE_OUTPUT, "mm_tve_output", "tve_sel", 6),</div><div class='add'>+	GATE_DISP1(CLK_MM_TVE_INPUT, "mm_tve_input", "dpi0_sel", 7),</div><div class='add'>+	GATE_DISP1(CLK_MM_HDMI_PIXEL, "mm_hdmi_pixel", "dpi1_sel", 8),</div><div class='add'>+	GATE_DISP1(CLK_MM_HDMI_PLL, "mm_hdmi_pll", "hdmi_sel", 9),</div><div class='add'>+	GATE_DISP1(CLK_MM_HDMI_AUDIO, "mm_hdmi_audio", "apll_sel", 10),</div><div class='add'>+	GATE_DISP1(CLK_MM_HDMI_SPDIF, "mm_hdmi_spdif", "apll_sel", 11),</div><div class='add'>+	GATE_DISP1(CLK_MM_TVE_FMM, "mm_tve_fmm", "mm_sel", 14),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_match_clk_mt2701_mm[] = {</div><div class='add'>+	{ .compatible = "mediatek,mt2701-mmsys", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int clk_mt2701_mm_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk_onecell_data *clk_data;</div><div class='add'>+	int r;</div><div class='add'>+	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	clk_data = mtk_alloc_clk_data(CLK_MM_NR);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_gates(node, mm_clks, ARRAY_SIZE(mm_clks),</div><div class='add'>+						clk_data);</div><div class='add'>+</div><div class='add'>+	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);</div><div class='add'>+	if (r)</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"could not register clock provider: %s: %d\n",</div><div class='add'>+			pdev-&gt;name, r);</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver clk_mt2701_mm_drv = {</div><div class='add'>+	.probe = clk_mt2701_mm_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "clk-mt2701-mm",</div><div class='add'>+		.of_match_table = of_match_clk_mt2701_mm,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+builtin_platform_driver(clk_mt2701_mm_drv);</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-mt2701-vdec.c b/drivers/clk/mediatek/clk-mt2701-vdec.c<br/>new file mode 100644<br/>index 000000000000..d3c0fc9d6f02<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-mt2701-vdec.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701-vdec.c</a></div><div class='hunk'>@@ -0,0 +1,91 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014 MediaTek Inc.</div><div class='add'>+ * Author: Shunli Wang &lt;shunli.wang@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "clk-mtk.h"</div><div class='add'>+#include "clk-gate.h"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/mt2701-clk.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs vdec0_cg_regs = {</div><div class='add'>+	.set_ofs = 0x0000,</div><div class='add'>+	.clr_ofs = 0x0004,</div><div class='add'>+	.sta_ofs = 0x0000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs vdec1_cg_regs = {</div><div class='add'>+	.set_ofs = 0x0008,</div><div class='add'>+	.clr_ofs = 0x000c,</div><div class='add'>+	.sta_ofs = 0x0008,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GATE_VDEC0(_id, _name, _parent, _shift) {	\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;vdec0_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_setclr_inv,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define GATE_VDEC1(_id, _name, _parent, _shift) {	\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;vdec1_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_setclr_inv,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate vdec_clks[] = {</div><div class='add'>+	GATE_VDEC0(CLK_VDEC_CKGEN, "vdec_cken", "vdec_sel", 0),</div><div class='add'>+	GATE_VDEC1(CLK_VDEC_LARB, "vdec_larb_cken", "mm_sel", 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_match_clk_mt2701_vdec[] = {</div><div class='add'>+	{ .compatible = "mediatek,mt2701-vdecsys", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int clk_mt2701_vdec_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk_onecell_data *clk_data;</div><div class='add'>+	int r;</div><div class='add'>+	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	clk_data = mtk_alloc_clk_data(CLK_VDEC_NR);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_gates(node, vdec_clks, ARRAY_SIZE(vdec_clks),</div><div class='add'>+						clk_data);</div><div class='add'>+</div><div class='add'>+	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);</div><div class='add'>+	if (r)</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"could not register clock provider: %s: %d\n",</div><div class='add'>+			pdev-&gt;name, r);</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver clk_mt2701_vdec_drv = {</div><div class='add'>+	.probe = clk_mt2701_vdec_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "clk-mt2701-vdec",</div><div class='add'>+		.of_match_table = of_match_clk_mt2701_vdec,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+builtin_platform_driver(clk_mt2701_vdec_drv);</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-mt2701.c b/drivers/clk/mediatek/clk-mt2701.c<br/>new file mode 100644<br/>index 000000000000..6f26e6a37a6b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-mt2701.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mt2701.c</a></div><div class='hunk'>@@ -0,0 +1,1035 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014 MediaTek Inc.</div><div class='add'>+ * Author: Shunli Wang &lt;shunli.wang@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "clk-mtk.h"</div><div class='add'>+#include "clk-gate.h"</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/mt2701-clk.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For some clocks, we don't care what their actual rates are. And these</div><div class='add'>+ * clocks may change their rate on different products or different scenarios.</div><div class='add'>+ * So we model these clocks' rate as 0, to denote it's not an actual rate.</div><div class='add'>+ */</div><div class='add'>+#define DUMMY_RATE		0</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(mt2701_clk_lock);</div><div class='add'>+</div><div class='add'>+static const struct mtk_fixed_clk top_fixed_clks[] = {</div><div class='add'>+	FIXED_CLK(CLK_TOP_DPI, "dpi_ck", "clk26m",</div><div class='add'>+		108 * MHZ),</div><div class='add'>+	FIXED_CLK(CLK_TOP_DMPLL, "dmpll_ck", "clk26m",</div><div class='add'>+		400 * MHZ),</div><div class='add'>+	FIXED_CLK(CLK_TOP_VENCPLL, "vencpll_ck", "clk26m",</div><div class='add'>+		295750000),</div><div class='add'>+	FIXED_CLK(CLK_TOP_HDMI_0_PIX340M, "hdmi_0_pix340m", "clk26m",</div><div class='add'>+		340 * MHZ),</div><div class='add'>+	FIXED_CLK(CLK_TOP_HDMI_0_DEEP340M, "hdmi_0_deep340m", "clk26m",</div><div class='add'>+		340 * MHZ),</div><div class='add'>+	FIXED_CLK(CLK_TOP_HDMI_0_PLL340M, "hdmi_0_pll340m", "clk26m",</div><div class='add'>+		340 * MHZ),</div><div class='add'>+	FIXED_CLK(CLK_TOP_HDMITX_CLKDIG_CTS, "hdmitx_dig_cts", "clk26m",</div><div class='add'>+		300 * MHZ),</div><div class='add'>+	FIXED_CLK(CLK_TOP_HADDS2_FB, "hadds2_fbclk", "clk26m",</div><div class='add'>+		27 * MHZ),</div><div class='add'>+	FIXED_CLK(CLK_TOP_WBG_DIG_416M, "wbg_dig_ck_416m", "clk26m",</div><div class='add'>+		416 * MHZ),</div><div class='add'>+	FIXED_CLK(CLK_TOP_DSI0_LNTC_DSI, "dsi0_lntc_dsi", "clk26m",</div><div class='add'>+		143 * MHZ),</div><div class='add'>+	FIXED_CLK(CLK_TOP_HDMI_SCL_RX, "hdmi_scl_rx", "clk26m",</div><div class='add'>+		27 * MHZ),</div><div class='add'>+	FIXED_CLK(CLK_TOP_AUD_EXT1, "aud_ext1", "clk26m",</div><div class='add'>+		DUMMY_RATE),</div><div class='add'>+	FIXED_CLK(CLK_TOP_AUD_EXT2, "aud_ext2", "clk26m",</div><div class='add'>+		DUMMY_RATE),</div><div class='add'>+	FIXED_CLK(CLK_TOP_NFI1X_PAD, "nfi1x_pad", "clk26m",</div><div class='add'>+		DUMMY_RATE),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_fixed_factor top_fixed_divs[] = {</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL, "syspll_ck", "mainpll", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL_D2, "syspll_d2", "mainpll", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL_D3, "syspll_d3", "mainpll", 1, 3),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL_D5, "syspll_d5", "mainpll", 1, 5),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL_D7, "syspll_d7", "mainpll", 1, 7),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL1_D2, "syspll1_d2", "syspll_d2", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL1_D4, "syspll1_d4", "syspll_d2", 1, 4),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL1_D8, "syspll1_d8", "syspll_d2", 1, 8),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL1_D16, "syspll1_d16", "syspll_d2", 1, 16),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL2_D2, "syspll2_d2", "syspll_d3", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL2_D4, "syspll2_d4", "syspll_d3", 1, 4),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL2_D8, "syspll2_d8", "syspll_d3", 1, 8),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL3_D2, "syspll3_d2", "syspll_d5", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL3_D4, "syspll3_d4", "syspll_d5", 1, 4),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL4_D2, "syspll4_d2", "syspll_d7", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_SYSPLL4_D4, "syspll4_d4", "syspll_d7", 1, 4),</div><div class='add'>+</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL, "univpll_ck", "univpll", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL_D2, "univpll_d2", "univpll", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL_D3, "univpll_d3", "univpll", 1, 3),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL_D5, "univpll_d5", "univpll", 1, 5),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL_D7, "univpll_d7", "univpll", 1, 7),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL_D26, "univpll_d26", "univpll", 1, 26),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL_D52, "univpll_d52", "univpll", 1, 52),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL_D108, "univpll_d108", "univpll", 1, 108),</div><div class='add'>+	FACTOR(CLK_TOP_USB_PHY48M, "usb_phy48m_ck", "univpll", 1, 26),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL1_D2, "univpll1_d2", "univpll_d2", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL1_D4, "univpll1_d4", "univpll_d2", 1, 4),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL1_D8, "univpll1_d8", "univpll_d2", 1, 8),</div><div class='add'>+	FACTOR(CLK_TOP_8BDAC, "8bdac_ck", "univpll_d2", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL2_D2, "univpll2_d2", "univpll_d3", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL2_D4, "univpll2_d4", "univpll_d3", 1, 4),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL2_D8, "univpll2_d8", "univpll_d3", 1, 8),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL2_D16, "univpll2_d16", "univpll_d3", 1, 16),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL2_D32, "univpll2_d32", "univpll_d3", 1, 32),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL3_D2, "univpll3_d2", "univpll_d5", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL3_D4, "univpll3_d4", "univpll_d5", 1, 4),</div><div class='add'>+	FACTOR(CLK_TOP_UNIVPLL3_D8, "univpll3_d8", "univpll_d5", 1, 8),</div><div class='add'>+</div><div class='add'>+	FACTOR(CLK_TOP_MSDCPLL, "msdcpll_ck", "msdcpll", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_MSDCPLL_D2, "msdcpll_d2", "msdcpll", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_MSDCPLL_D4, "msdcpll_d4", "msdcpll", 1, 4),</div><div class='add'>+	FACTOR(CLK_TOP_MSDCPLL_D8, "msdcpll_d8", "msdcpll", 1, 8),</div><div class='add'>+</div><div class='add'>+	FACTOR(CLK_TOP_MMPLL, "mmpll_ck", "mmpll", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_MMPLL_D2, "mmpll_d2", "mmpll", 1, 2),</div><div class='add'>+</div><div class='add'>+	FACTOR(CLK_TOP_DMPLL_D2, "dmpll_d2", "dmpll_ck", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_DMPLL_D4, "dmpll_d4", "dmpll_ck", 1, 4),</div><div class='add'>+	FACTOR(CLK_TOP_DMPLL_X2, "dmpll_x2", "dmpll_ck", 1, 1),</div><div class='add'>+</div><div class='add'>+	FACTOR(CLK_TOP_TVDPLL, "tvdpll_ck", "tvdpll", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_TVDPLL_D2, "tvdpll_d2", "tvdpll", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_TVDPLL_D4, "tvdpll_d4", "tvdpll", 1, 4),</div><div class='add'>+</div><div class='add'>+	FACTOR(CLK_TOP_VDECPLL, "vdecpll_ck", "vdecpll", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_TVD2PLL, "tvd2pll_ck", "tvd2pll", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_TVD2PLL_D2, "tvd2pll_d2", "tvd2pll", 1, 2),</div><div class='add'>+</div><div class='add'>+	FACTOR(CLK_TOP_MIPIPLL, "mipipll", "dpi_ck", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_MIPIPLL_D2, "mipipll_d2", "dpi_ck", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_MIPIPLL_D4, "mipipll_d4", "dpi_ck", 1, 4),</div><div class='add'>+</div><div class='add'>+	FACTOR(CLK_TOP_HDMIPLL, "hdmipll_ck", "hdmitx_dig_cts", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_HDMIPLL_D2, "hdmipll_d2", "hdmitx_dig_cts", 1, 2),</div><div class='add'>+	FACTOR(CLK_TOP_HDMIPLL_D3, "hdmipll_d3", "hdmitx_dig_cts", 1, 3),</div><div class='add'>+</div><div class='add'>+	FACTOR(CLK_TOP_ARMPLL_1P3G, "armpll_1p3g_ck", "armpll", 1, 1),</div><div class='add'>+</div><div class='add'>+	FACTOR(CLK_TOP_AUDPLL, "audpll", "audpll_sel", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_AUDPLL_D4, "audpll_d4", "audpll_sel", 1, 4),</div><div class='add'>+	FACTOR(CLK_TOP_AUDPLL_D8, "audpll_d8", "audpll_sel", 1, 8),</div><div class='add'>+	FACTOR(CLK_TOP_AUDPLL_D16, "audpll_d16", "audpll_sel", 1, 16),</div><div class='add'>+	FACTOR(CLK_TOP_AUDPLL_D24, "audpll_d24", "audpll_sel", 1, 24),</div><div class='add'>+</div><div class='add'>+	FACTOR(CLK_TOP_AUD1PLL_98M, "aud1pll_98m_ck", "aud1pll", 1, 3),</div><div class='add'>+	FACTOR(CLK_TOP_AUD2PLL_90M, "aud2pll_90m_ck", "aud2pll", 1, 3),</div><div class='add'>+	FACTOR(CLK_TOP_HADDS2PLL_98M, "hadds2pll_98m", "hadds2pll", 1, 3),</div><div class='add'>+	FACTOR(CLK_TOP_HADDS2PLL_294M, "hadds2pll_294m", "hadds2pll", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_ETHPLL_500M, "ethpll_500m_ck", "ethpll", 1, 1),</div><div class='add'>+	FACTOR(CLK_TOP_CLK26M_D8, "clk26m_d8", "clk26m", 1, 8),</div><div class='add'>+	FACTOR(CLK_TOP_32K_INTERNAL, "32k_internal", "clk26m", 1, 793),</div><div class='add'>+	FACTOR(CLK_TOP_32K_EXTERNAL, "32k_external", "rtc32k", 1, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const axi_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll1_d2",</div><div class='add'>+	"syspll_d5",</div><div class='add'>+	"syspll1_d4",</div><div class='add'>+	"univpll_d5",</div><div class='add'>+	"univpll2_d2",</div><div class='add'>+	"mmpll_d2",</div><div class='add'>+	"dmpll_d2"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const mem_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"dmpll_ck"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const ddrphycfg_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll1_d8"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const mm_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"vencpll_ck",</div><div class='add'>+	"syspll1_d2",</div><div class='add'>+	"syspll1_d4",</div><div class='add'>+	"univpll_d5",</div><div class='add'>+	"univpll1_d2",</div><div class='add'>+	"univpll2_d2",</div><div class='add'>+	"dmpll_ck"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const pwm_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"univpll2_d4",</div><div class='add'>+	"univpll3_d2",</div><div class='add'>+	"univpll1_d4",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const vdec_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"vdecpll_ck",</div><div class='add'>+	"syspll_d5",</div><div class='add'>+	"syspll1_d4",</div><div class='add'>+	"univpll_d5",</div><div class='add'>+	"univpll2_d2",</div><div class='add'>+	"vencpll_ck",</div><div class='add'>+	"msdcpll_d2",</div><div class='add'>+	"mmpll_d2"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const mfg_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"mmpll_ck",</div><div class='add'>+	"dmpll_x2_ck",</div><div class='add'>+	"msdcpll_ck",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll_d3",</div><div class='add'>+	"univpll_d3",</div><div class='add'>+	"univpll1_d2"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const camtg_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"univpll_d26",</div><div class='add'>+	"univpll2_d2",</div><div class='add'>+	"syspll3_d2",</div><div class='add'>+	"syspll3_d4",</div><div class='add'>+	"msdcpll_d2",</div><div class='add'>+	"mmpll_d2"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const uart_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"univpll2_d8"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const spi_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll3_d2",</div><div class='add'>+	"syspll4_d2",</div><div class='add'>+	"univpll2_d4",</div><div class='add'>+	"univpll1_d8"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const usb20_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"univpll1_d8",</div><div class='add'>+	"univpll3_d4"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const msdc30_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"msdcpll_d2",</div><div class='add'>+	"syspll2_d2",</div><div class='add'>+	"syspll1_d4",</div><div class='add'>+	"univpll1_d4",</div><div class='add'>+	"univpll2_d4"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const audio_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll1_d16"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const aud_intbus_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll1_d4",</div><div class='add'>+	"syspll3_d2",</div><div class='add'>+	"syspll4_d2",</div><div class='add'>+	"univpll3_d2",</div><div class='add'>+	"univpll2_d4"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const pmicspi_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll1_d8",</div><div class='add'>+	"syspll2_d4",</div><div class='add'>+	"syspll4_d2",</div><div class='add'>+	"syspll3_d4",</div><div class='add'>+	"syspll2_d8",</div><div class='add'>+	"syspll1_d16",</div><div class='add'>+	"univpll3_d4",</div><div class='add'>+	"univpll_d26",</div><div class='add'>+	"dmpll_d2",</div><div class='add'>+	"dmpll_d4"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const scp_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll1_d8",</div><div class='add'>+	"dmpll_d2",</div><div class='add'>+	"dmpll_d4"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const dpi0_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"mipipll",</div><div class='add'>+	"mipipll_d2",</div><div class='add'>+	"mipipll_d4",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"tvdpll_ck",</div><div class='add'>+	"tvdpll_d2",</div><div class='add'>+	"tvdpll_d4"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const dpi1_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"tvdpll_ck",</div><div class='add'>+	"tvdpll_d2",</div><div class='add'>+	"tvdpll_d4"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const tve_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"mipipll",</div><div class='add'>+	"mipipll_d2",</div><div class='add'>+	"mipipll_d4",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"tvdpll_ck",</div><div class='add'>+	"tvdpll_d2",</div><div class='add'>+	"tvdpll_d4"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const hdmi_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"hdmipll_ck",</div><div class='add'>+	"hdmipll_d2",</div><div class='add'>+	"hdmipll_d3"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const apll_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"audpll",</div><div class='add'>+	"audpll_d4",</div><div class='add'>+	"audpll_d8",</div><div class='add'>+	"audpll_d16",</div><div class='add'>+	"audpll_d24",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"clk26m"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const rtc_parents[] = {</div><div class='add'>+	"32k_internal",</div><div class='add'>+	"32k_external",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"univpll3_d8"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const nfi2x_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll2_d2",</div><div class='add'>+	"syspll_d7",</div><div class='add'>+	"univpll3_d2",</div><div class='add'>+	"syspll2_d4",</div><div class='add'>+	"univpll3_d4",</div><div class='add'>+	"syspll4_d4",</div><div class='add'>+	"clk26m"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const emmc_hclk_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll1_d2",</div><div class='add'>+	"syspll1_d4",</div><div class='add'>+	"syspll2_d2"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const flash_parents[] = {</div><div class='add'>+	"clk26m_d8",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll2_d8",</div><div class='add'>+	"syspll3_d4",</div><div class='add'>+	"univpll3_d4",</div><div class='add'>+	"syspll4_d2",</div><div class='add'>+	"syspll2_d4",</div><div class='add'>+	"univpll2_d4"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const di_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"tvd2pll_ck",</div><div class='add'>+	"tvd2pll_d2",</div><div class='add'>+	"clk26m"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const nr_osd_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"vencpll_ck",</div><div class='add'>+	"syspll1_d2",</div><div class='add'>+	"syspll1_d4",</div><div class='add'>+	"univpll_d5",</div><div class='add'>+	"univpll1_d2",</div><div class='add'>+	"univpll2_d2",</div><div class='add'>+	"dmpll_ck"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const hdmirx_bist_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll_d3",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll1_d16",</div><div class='add'>+	"syspll4_d2",</div><div class='add'>+	"syspll1_d4",</div><div class='add'>+	"vencpll_ck",</div><div class='add'>+	"clk26m"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const intdir_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"mmpll_ck",</div><div class='add'>+	"syspll_d2",</div><div class='add'>+	"univpll_d2"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const asm_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"univpll2_d4",</div><div class='add'>+	"univpll2_d2",</div><div class='add'>+	"syspll_d5"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const ms_card_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"univpll3_d8",</div><div class='add'>+	"syspll4_d4"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const ethif_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll1_d2",</div><div class='add'>+	"syspll_d5",</div><div class='add'>+	"syspll1_d4",</div><div class='add'>+	"univpll_d5",</div><div class='add'>+	"univpll1_d2",</div><div class='add'>+	"dmpll_ck",</div><div class='add'>+	"dmpll_d2"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const hdmirx_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"univpll_d52"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const cmsys_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"syspll1_d2",</div><div class='add'>+	"univpll1_d2",</div><div class='add'>+	"univpll_d5",</div><div class='add'>+	"syspll_d5",</div><div class='add'>+	"syspll2_d2",</div><div class='add'>+	"syspll1_d4",</div><div class='add'>+	"syspll3_d2",</div><div class='add'>+	"syspll2_d4",</div><div class='add'>+	"syspll1_d8",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"clk26m"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const clk_8bdac_parents[] = {</div><div class='add'>+	"32k_internal",</div><div class='add'>+	"8bdac_ck",</div><div class='add'>+	"clk26m",</div><div class='add'>+	"clk26m"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const aud2dvd_parents[] = {</div><div class='add'>+	"a1sys_hp_ck",</div><div class='add'>+	"a2sys_hp_ck"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const padmclk_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"univpll_d26",</div><div class='add'>+	"univpll_d52",</div><div class='add'>+	"univpll_d108",</div><div class='add'>+	"univpll2_d8",</div><div class='add'>+	"univpll2_d16",</div><div class='add'>+	"univpll2_d32"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const aud_mux_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"aud1pll_98m_ck",</div><div class='add'>+	"aud2pll_90m_ck",</div><div class='add'>+	"hadds2pll_98m",</div><div class='add'>+	"audio_ext1_ck",</div><div class='add'>+	"audio_ext2_ck"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const aud_src_parents[] = {</div><div class='add'>+	"aud_mux1_sel",</div><div class='add'>+	"aud_mux2_sel"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const cpu_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"armpll",</div><div class='add'>+	"mainpll",</div><div class='add'>+	"mmpll"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_composite top_muxes[] = {</div><div class='add'>+	MUX_GATE_FLAGS(CLK_TOP_AXI_SEL, "axi_sel", axi_parents,</div><div class='add'>+		0x0040, 0, 3, 7, CLK_IS_CRITICAL),</div><div class='add'>+	MUX_GATE_FLAGS(CLK_TOP_MEM_SEL, "mem_sel", mem_parents,</div><div class='add'>+		0x0040, 8, 1, 15, CLK_IS_CRITICAL),</div><div class='add'>+	MUX_GATE_FLAGS(CLK_TOP_DDRPHYCFG_SEL, "ddrphycfg_sel",</div><div class='add'>+		ddrphycfg_parents, 0x0040, 16, 1, 23, CLK_IS_CRITICAL),</div><div class='add'>+	MUX_GATE(CLK_TOP_MM_SEL, "mm_sel", mm_parents,</div><div class='add'>+		0x0040, 24, 3, 31),</div><div class='add'>+</div><div class='add'>+	MUX_GATE(CLK_TOP_PWM_SEL, "pwm_sel", pwm_parents,</div><div class='add'>+		0x0050, 0, 2, 7),</div><div class='add'>+	MUX_GATE(CLK_TOP_VDEC_SEL, "vdec_sel", vdec_parents,</div><div class='add'>+		0x0050, 8, 4, 15),</div><div class='add'>+	MUX_GATE(CLK_TOP_MFG_SEL, "mfg_sel", mfg_parents,</div><div class='add'>+		0x0050, 16, 3, 23),</div><div class='add'>+	MUX_GATE(CLK_TOP_CAMTG_SEL, "camtg_sel", camtg_parents,</div><div class='add'>+		0x0050, 24, 3, 31),</div><div class='add'>+	MUX_GATE(CLK_TOP_UART_SEL, "uart_sel", uart_parents,</div><div class='add'>+		0x0060, 0, 1, 7),</div><div class='add'>+</div><div class='add'>+	MUX_GATE(CLK_TOP_SPI0_SEL, "spi0_sel", spi_parents,</div><div class='add'>+		0x0060, 8, 3, 15),</div><div class='add'>+	MUX_GATE(CLK_TOP_USB20_SEL, "usb20_sel", usb20_parents,</div><div class='add'>+		0x0060, 16, 2, 23),</div><div class='add'>+	MUX_GATE(CLK_TOP_MSDC30_0_SEL, "msdc30_0_sel", msdc30_parents,</div><div class='add'>+		0x0060, 24, 3, 31),</div><div class='add'>+</div><div class='add'>+	MUX_GATE(CLK_TOP_MSDC30_1_SEL, "msdc30_1_sel", msdc30_parents,</div><div class='add'>+		0x0070, 0, 3, 7),</div><div class='add'>+	MUX_GATE(CLK_TOP_MSDC30_2_SEL, "msdc30_2_sel", msdc30_parents,</div><div class='add'>+		0x0070, 8, 3, 15),</div><div class='add'>+	MUX_GATE(CLK_TOP_AUDIO_SEL, "audio_sel", msdc30_parents,</div><div class='add'>+		0x0070, 16, 1, 23),</div><div class='add'>+	MUX_GATE(CLK_TOP_AUDINTBUS_SEL, "aud_intbus_sel", aud_intbus_parents,</div><div class='add'>+		0x0070, 24, 3, 31),</div><div class='add'>+</div><div class='add'>+	MUX_GATE(CLK_TOP_PMICSPI_SEL, "pmicspi_sel", pmicspi_parents,</div><div class='add'>+		0x0080, 0, 4, 7),</div><div class='add'>+	MUX_GATE(CLK_TOP_SCP_SEL, "scp_sel", scp_parents,</div><div class='add'>+		0x0080, 8, 2, 15),</div><div class='add'>+	MUX_GATE(CLK_TOP_DPI0_SEL, "dpi0_sel", dpi0_parents,</div><div class='add'>+		0x0080, 16, 3, 23),</div><div class='add'>+	MUX_GATE(CLK_TOP_DPI1_SEL, "dpi1_sel", dpi1_parents,</div><div class='add'>+		0x0080, 24, 2, 31),</div><div class='add'>+</div><div class='add'>+	MUX_GATE(CLK_TOP_TVE_SEL, "tve_sel", tve_parents,</div><div class='add'>+		0x0090, 0, 3, 7),</div><div class='add'>+	MUX_GATE(CLK_TOP_HDMI_SEL, "hdmi_sel", hdmi_parents,</div><div class='add'>+		0x0090, 8, 2, 15),</div><div class='add'>+	MUX_GATE(CLK_TOP_APLL_SEL, "apll_sel", apll_parents,</div><div class='add'>+		0x0090, 16, 3, 23),</div><div class='add'>+</div><div class='add'>+	MUX_GATE_FLAGS(CLK_TOP_RTC_SEL, "rtc_sel", rtc_parents,</div><div class='add'>+		0x00A0, 0, 2, 7, CLK_IS_CRITICAL),</div><div class='add'>+	MUX_GATE(CLK_TOP_NFI2X_SEL, "nfi2x_sel", nfi2x_parents,</div><div class='add'>+		0x00A0, 8, 3, 15),</div><div class='add'>+	MUX_GATE(CLK_TOP_EMMC_HCLK_SEL, "emmc_hclk_sel", emmc_hclk_parents,</div><div class='add'>+		0x00A0, 24, 2, 31),</div><div class='add'>+</div><div class='add'>+	MUX_GATE(CLK_TOP_FLASH_SEL, "flash_sel", flash_parents,</div><div class='add'>+		0x00B0, 0, 3, 7),</div><div class='add'>+	MUX_GATE(CLK_TOP_DI_SEL, "di_sel", di_parents,</div><div class='add'>+		0x00B0, 8, 2, 15),</div><div class='add'>+	MUX_GATE(CLK_TOP_NR_SEL, "nr_sel", nr_osd_parents,</div><div class='add'>+		0x00B0, 16, 3, 23),</div><div class='add'>+	MUX_GATE(CLK_TOP_OSD_SEL, "osd_sel", nr_osd_parents,</div><div class='add'>+		0x00B0, 24, 3, 31),</div><div class='add'>+</div><div class='add'>+	MUX_GATE(CLK_TOP_HDMIRX_BIST_SEL, "hdmirx_bist_sel",</div><div class='add'>+		hdmirx_bist_parents, 0x00C0, 0, 3, 7),</div><div class='add'>+	MUX_GATE(CLK_TOP_INTDIR_SEL, "intdir_sel", intdir_parents,</div><div class='add'>+		0x00C0, 8, 2, 15),</div><div class='add'>+	MUX_GATE(CLK_TOP_ASM_I_SEL, "asm_i_sel", asm_parents,</div><div class='add'>+		0x00C0, 16, 2, 23),</div><div class='add'>+	MUX_GATE(CLK_TOP_ASM_M_SEL, "asm_m_sel", asm_parents,</div><div class='add'>+		0x00C0, 24, 3, 31),</div><div class='add'>+</div><div class='add'>+	MUX_GATE(CLK_TOP_ASM_H_SEL, "asm_h_sel", asm_parents,</div><div class='add'>+		0x00D0, 0, 2, 7),</div><div class='add'>+	MUX_GATE(CLK_TOP_MS_CARD_SEL, "ms_card_sel", ms_card_parents,</div><div class='add'>+		0x00D0, 16, 2, 23),</div><div class='add'>+	MUX_GATE(CLK_TOP_ETHIF_SEL, "ethif_sel", ethif_parents,</div><div class='add'>+		0x00D0, 24, 3, 31),</div><div class='add'>+</div><div class='add'>+	MUX_GATE(CLK_TOP_HDMIRX26_24_SEL, "hdmirx26_24_sel", hdmirx_parents,</div><div class='add'>+		0x00E0, 0, 1, 7),</div><div class='add'>+	MUX_GATE(CLK_TOP_MSDC30_3_SEL, "msdc30_3_sel", msdc30_parents,</div><div class='add'>+		0x00E0, 8, 3, 15),</div><div class='add'>+	MUX_GATE(CLK_TOP_CMSYS_SEL, "cmsys_sel", cmsys_parents,</div><div class='add'>+		0x00E0, 16, 4, 23),</div><div class='add'>+</div><div class='add'>+	MUX_GATE(CLK_TOP_SPI1_SEL, "spi2_sel", spi_parents,</div><div class='add'>+		0x00E0, 24, 3, 31),</div><div class='add'>+	MUX_GATE(CLK_TOP_SPI2_SEL, "spi1_sel", spi_parents,</div><div class='add'>+		0x00F0, 0, 3, 7),</div><div class='add'>+	MUX_GATE(CLK_TOP_8BDAC_SEL, "8bdac_sel", clk_8bdac_parents,</div><div class='add'>+		0x00F0, 8, 2, 15),</div><div class='add'>+	MUX_GATE(CLK_TOP_AUD2DVD_SEL, "aud2dvd_sel", aud2dvd_parents,</div><div class='add'>+		0x00F0, 16, 1, 23),</div><div class='add'>+</div><div class='add'>+	MUX(CLK_TOP_PADMCLK_SEL, "padmclk_sel", padmclk_parents,</div><div class='add'>+		0x0100, 0, 3),</div><div class='add'>+</div><div class='add'>+	MUX(CLK_TOP_AUD_MUX1_SEL, "aud_mux1_sel", aud_mux_parents,</div><div class='add'>+		0x012c, 0, 3),</div><div class='add'>+	MUX(CLK_TOP_AUD_MUX2_SEL, "aud_mux2_sel", aud_mux_parents,</div><div class='add'>+		0x012c, 3, 3),</div><div class='add'>+	MUX(CLK_TOP_AUDPLL_MUX_SEL, "audpll_sel", aud_mux_parents,</div><div class='add'>+		0x012c, 6, 3),</div><div class='add'>+	MUX_GATE(CLK_TOP_AUD_K1_SRC_SEL, "aud_k1_src_sel", aud_src_parents,</div><div class='add'>+		0x012c, 15, 1, 23),</div><div class='add'>+	MUX_GATE(CLK_TOP_AUD_K2_SRC_SEL, "aud_k2_src_sel", aud_src_parents,</div><div class='add'>+		0x012c, 16, 1, 24),</div><div class='add'>+	MUX_GATE(CLK_TOP_AUD_K3_SRC_SEL, "aud_k3_src_sel", aud_src_parents,</div><div class='add'>+		0x012c, 17, 1, 25),</div><div class='add'>+	MUX_GATE(CLK_TOP_AUD_K4_SRC_SEL, "aud_k4_src_sel", aud_src_parents,</div><div class='add'>+		0x012c, 18, 1, 26),</div><div class='add'>+	MUX_GATE(CLK_TOP_AUD_K5_SRC_SEL, "aud_k5_src_sel", aud_src_parents,</div><div class='add'>+		0x012c, 19, 1, 27),</div><div class='add'>+	MUX_GATE(CLK_TOP_AUD_K6_SRC_SEL, "aud_k6_src_sel", aud_src_parents,</div><div class='add'>+		0x012c, 20, 1, 28),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_clk_divider top_adj_divs[] = {</div><div class='add'>+	DIV_ADJ(CLK_TOP_AUD_EXTCK1_DIV, "audio_ext1_ck", "aud_ext1",</div><div class='add'>+		0x0120, 0, 8),</div><div class='add'>+	DIV_ADJ(CLK_TOP_AUD_EXTCK2_DIV, "audio_ext2_ck", "aud_ext2",</div><div class='add'>+		0x0120, 8, 8),</div><div class='add'>+	DIV_ADJ(CLK_TOP_AUD_MUX1_DIV, "aud_mux1_div", "aud_mux1_sel",</div><div class='add'>+		0x0120, 16, 8),</div><div class='add'>+	DIV_ADJ(CLK_TOP_AUD_MUX2_DIV, "aud_mux2_div", "aud_mux2_sel",</div><div class='add'>+		0x0120, 24, 8),</div><div class='add'>+	DIV_ADJ(CLK_TOP_AUD_K1_SRC_DIV, "aud_k1_src_div", "aud_k1_src_sel",</div><div class='add'>+		0x0124, 0, 8),</div><div class='add'>+	DIV_ADJ(CLK_TOP_AUD_K2_SRC_DIV, "aud_k2_src_div", "aud_k2_src_sel",</div><div class='add'>+		0x0124, 8, 8),</div><div class='add'>+	DIV_ADJ(CLK_TOP_AUD_K3_SRC_DIV, "aud_k3_src_div", "aud_k3_src_sel",</div><div class='add'>+		0x0124, 16, 8),</div><div class='add'>+	DIV_ADJ(CLK_TOP_AUD_K4_SRC_DIV, "aud_k4_src_div", "aud_k4_src_sel",</div><div class='add'>+		0x0124, 24, 8),</div><div class='add'>+	DIV_ADJ(CLK_TOP_AUD_K5_SRC_DIV, "aud_k5_src_div", "aud_k5_src_sel",</div><div class='add'>+		0x0128, 0, 8),</div><div class='add'>+	DIV_ADJ(CLK_TOP_AUD_K6_SRC_DIV, "aud_k6_src_div", "aud_k6_src_sel",</div><div class='add'>+		0x0128, 8, 8),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs top_aud_cg_regs = {</div><div class='add'>+	.sta_ofs = 0x012C,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GATE_TOP_AUD(_id, _name, _parent, _shift) {	\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;top_aud_cg_regs,		\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_no_setclr,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate top_clks[] = {</div><div class='add'>+	GATE_TOP_AUD(CLK_TOP_AUD_48K_TIMING, "a1sys_hp_ck", "aud_mux1_div",</div><div class='add'>+		21),</div><div class='add'>+	GATE_TOP_AUD(CLK_TOP_AUD_44K_TIMING, "a2sys_hp_ck", "aud_mux2_div",</div><div class='add'>+		22),</div><div class='add'>+	GATE_TOP_AUD(CLK_TOP_AUD_I2S1_MCLK, "aud_i2s1_mclk", "aud_k1_src_div",</div><div class='add'>+		23),</div><div class='add'>+	GATE_TOP_AUD(CLK_TOP_AUD_I2S2_MCLK, "aud_i2s2_mclk", "aud_k2_src_div",</div><div class='add'>+		24),</div><div class='add'>+	GATE_TOP_AUD(CLK_TOP_AUD_I2S3_MCLK, "aud_i2s3_mclk", "aud_k3_src_div",</div><div class='add'>+		25),</div><div class='add'>+	GATE_TOP_AUD(CLK_TOP_AUD_I2S4_MCLK, "aud_i2s4_mclk", "aud_k4_src_div",</div><div class='add'>+		26),</div><div class='add'>+	GATE_TOP_AUD(CLK_TOP_AUD_I2S5_MCLK, "aud_i2s5_mclk", "aud_k5_src_div",</div><div class='add'>+		27),</div><div class='add'>+	GATE_TOP_AUD(CLK_TOP_AUD_I2S6_MCLK, "aud_i2s6_mclk", "aud_k6_src_div",</div><div class='add'>+		28),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mtk_topckgen_init(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk_onecell_data *clk_data;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='add'>+	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+</div><div class='add'>+	base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(base))</div><div class='add'>+		return PTR_ERR(base);</div><div class='add'>+</div><div class='add'>+	clk_data = mtk_alloc_clk_data(CLK_TOP_NR);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks),</div><div class='add'>+								clk_data);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_factors(top_fixed_divs, ARRAY_SIZE(top_fixed_divs),</div><div class='add'>+								clk_data);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_composites(top_muxes, ARRAY_SIZE(top_muxes),</div><div class='add'>+				base, &amp;mt2701_clk_lock, clk_data);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_dividers(top_adj_divs, ARRAY_SIZE(top_adj_divs),</div><div class='add'>+				base, &amp;mt2701_clk_lock, clk_data);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_gates(node, top_clks, ARRAY_SIZE(top_clks),</div><div class='add'>+						clk_data);</div><div class='add'>+</div><div class='add'>+	return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs infra_cg_regs = {</div><div class='add'>+	.set_ofs = 0x0040,</div><div class='add'>+	.clr_ofs = 0x0044,</div><div class='add'>+	.sta_ofs = 0x0048,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GATE_ICG(_id, _name, _parent, _shift) {		\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;infra_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_setclr,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate infra_clks[] = {</div><div class='add'>+	GATE_ICG(CLK_INFRA_DBG, "dbgclk", "axi_sel", 0),</div><div class='add'>+	GATE_ICG(CLK_INFRA_SMI, "smi_ck", "mm_sel", 1),</div><div class='add'>+	GATE_ICG(CLK_INFRA_QAXI_CM4, "cm4_ck", "axi_sel", 2),</div><div class='add'>+	GATE_ICG(CLK_INFRA_AUD_SPLIN_B, "audio_splin_bck", "hadds2pll_294m", 4),</div><div class='add'>+	GATE_ICG(CLK_INFRA_AUDIO, "audio_ck", "clk26m", 5),</div><div class='add'>+	GATE_ICG(CLK_INFRA_EFUSE, "efuse_ck", "clk26m", 6),</div><div class='add'>+	GATE_ICG(CLK_INFRA_L2C_SRAM, "l2c_sram_ck", "mm_sel", 7),</div><div class='add'>+	GATE_ICG(CLK_INFRA_M4U, "m4u_ck", "mem_sel", 8),</div><div class='add'>+	GATE_ICG(CLK_INFRA_CONNMCU, "connsys_bus", "wbg_dig_ck_416m", 12),</div><div class='add'>+	GATE_ICG(CLK_INFRA_TRNG, "trng_ck", "axi_sel", 13),</div><div class='add'>+	GATE_ICG(CLK_INFRA_RAMBUFIF, "rambufif_ck", "mem_sel", 14),</div><div class='add'>+	GATE_ICG(CLK_INFRA_CPUM, "cpum_ck", "mem_sel", 15),</div><div class='add'>+	GATE_ICG(CLK_INFRA_KP, "kp_ck", "axi_sel", 16),</div><div class='add'>+	GATE_ICG(CLK_INFRA_CEC, "cec_ck", "rtc_sel", 18),</div><div class='add'>+	GATE_ICG(CLK_INFRA_IRRX, "irrx_ck", "axi_sel", 19),</div><div class='add'>+	GATE_ICG(CLK_INFRA_PMICSPI, "pmicspi_ck", "pmicspi_sel", 22),</div><div class='add'>+	GATE_ICG(CLK_INFRA_PMICWRAP, "pmicwrap_ck", "axi_sel", 23),</div><div class='add'>+	GATE_ICG(CLK_INFRA_DDCCI, "ddcci_ck", "axi_sel", 24),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_fixed_factor infra_fixed_divs[] = {</div><div class='add'>+	FACTOR(CLK_INFRA_CLK_13M, "clk13m", "clk26m", 1, 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_onecell_data *infra_clk_data;</div><div class='add'>+</div><div class='add'>+static void mtk_infrasys_init_early(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	int r, i;</div><div class='add'>+</div><div class='add'>+	if (!infra_clk_data) {</div><div class='add'>+		infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; CLK_INFRA_NR; i++)</div><div class='add'>+			infra_clk_data-&gt;clks[i] = ERR_PTR(-EPROBE_DEFER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_factors(infra_fixed_divs, ARRAY_SIZE(infra_fixed_divs),</div><div class='add'>+						infra_clk_data);</div><div class='add'>+</div><div class='add'>+	r = of_clk_add_provider(node, of_clk_src_onecell_get, infra_clk_data);</div><div class='add'>+	if (r)</div><div class='add'>+		pr_err("%s(): could not register clock provider: %d\n",</div><div class='add'>+			__func__, r);</div><div class='add'>+}</div><div class='add'>+CLK_OF_DECLARE_DRIVER(mtk_infra, "mediatek,mt2701-infracfg",</div><div class='add'>+			mtk_infrasys_init_early);</div><div class='add'>+</div><div class='add'>+static int mtk_infrasys_init(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int r, i;</div><div class='add'>+	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	if (!infra_clk_data) {</div><div class='add'>+		infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; CLK_INFRA_NR; i++) {</div><div class='add'>+			if (infra_clk_data-&gt;clks[i] == ERR_PTR(-EPROBE_DEFER))</div><div class='add'>+				infra_clk_data-&gt;clks[i] = ERR_PTR(-ENOENT);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_gates(node, infra_clks, ARRAY_SIZE(infra_clks),</div><div class='add'>+						infra_clk_data);</div><div class='add'>+	mtk_clk_register_factors(infra_fixed_divs, ARRAY_SIZE(infra_fixed_divs),</div><div class='add'>+						infra_clk_data);</div><div class='add'>+</div><div class='add'>+	r = of_clk_add_provider(node, of_clk_src_onecell_get, infra_clk_data);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	mtk_register_reset_controller(node, 2, 0x30);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs peri0_cg_regs = {</div><div class='add'>+	.set_ofs = 0x0008,</div><div class='add'>+	.clr_ofs = 0x0010,</div><div class='add'>+	.sta_ofs = 0x0018,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate_regs peri1_cg_regs = {</div><div class='add'>+	.set_ofs = 0x000c,</div><div class='add'>+	.clr_ofs = 0x0014,</div><div class='add'>+	.sta_ofs = 0x001c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GATE_PERI0(_id, _name, _parent, _shift) {	\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;peri0_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_setclr,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define GATE_PERI1(_id, _name, _parent, _shift) {	\</div><div class='add'>+		.id = _id,				\</div><div class='add'>+		.name = _name,				\</div><div class='add'>+		.parent_name = _parent,			\</div><div class='add'>+		.regs = &amp;peri1_cg_regs,			\</div><div class='add'>+		.shift = _shift,			\</div><div class='add'>+		.ops = &amp;mtk_clk_gate_ops_setclr,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct mtk_gate peri_clks[] = {</div><div class='add'>+	GATE_PERI0(CLK_PERI_USB0_MCU, "usb0_mcu_ck", "axi_sel", 31),</div><div class='add'>+	GATE_PERI0(CLK_PERI_ETH, "eth_ck", "clk26m", 30),</div><div class='add'>+	GATE_PERI0(CLK_PERI_SPI0, "spi0_ck", "spi0_sel", 29),</div><div class='add'>+	GATE_PERI0(CLK_PERI_AUXADC, "auxadc_ck", "clk26m", 28),</div><div class='add'>+	GATE_PERI0(CLK_PERI_I2C3, "i2c3_ck", "clk26m", 27),</div><div class='add'>+	GATE_PERI0(CLK_PERI_I2C2, "i2c2_ck", "axi_sel", 26),</div><div class='add'>+	GATE_PERI0(CLK_PERI_I2C1, "i2c1_ck", "axi_sel", 25),</div><div class='add'>+	GATE_PERI0(CLK_PERI_I2C0, "i2c0_ck", "axi_sel", 24),</div><div class='add'>+	GATE_PERI0(CLK_PERI_BTIF, "bitif_ck", "axi_sel", 23),</div><div class='add'>+	GATE_PERI0(CLK_PERI_UART3, "uart3_ck", "axi_sel", 22),</div><div class='add'>+	GATE_PERI0(CLK_PERI_UART2, "uart2_ck", "axi_sel", 21),</div><div class='add'>+	GATE_PERI0(CLK_PERI_UART1, "uart1_ck", "axi_sel", 20),</div><div class='add'>+	GATE_PERI0(CLK_PERI_UART0, "uart0_ck", "axi_sel", 19),</div><div class='add'>+	GATE_PERI0(CLK_PERI_NLI, "nli_ck", "axi_sel", 18),</div><div class='add'>+	GATE_PERI0(CLK_PERI_MSDC50_3, "msdc50_3_ck", "emmc_hclk_sel", 17),</div><div class='add'>+	GATE_PERI0(CLK_PERI_MSDC30_3, "msdc30_3_ck", "msdc30_3_sel", 16),</div><div class='add'>+	GATE_PERI0(CLK_PERI_MSDC30_2, "msdc30_2_ck", "msdc30_2_sel", 15),</div><div class='add'>+	GATE_PERI0(CLK_PERI_MSDC30_1, "msdc30_1_ck", "msdc30_1_sel", 14),</div><div class='add'>+	GATE_PERI0(CLK_PERI_MSDC30_0, "msdc30_0_ck", "msdc30_0_sel", 13),</div><div class='add'>+	GATE_PERI0(CLK_PERI_AP_DMA, "ap_dma_ck", "axi_sel", 12),</div><div class='add'>+	GATE_PERI0(CLK_PERI_USB1, "usb1_ck", "usb20_sel", 11),</div><div class='add'>+	GATE_PERI0(CLK_PERI_USB0, "usb0_ck", "usb20_sel", 10),</div><div class='add'>+	GATE_PERI0(CLK_PERI_PWM, "pwm_ck", "axi_sel", 9),</div><div class='add'>+	GATE_PERI0(CLK_PERI_PWM7, "pwm7_ck", "axi_sel", 8),</div><div class='add'>+	GATE_PERI0(CLK_PERI_PWM6, "pwm6_ck", "axi_sel", 7),</div><div class='add'>+	GATE_PERI0(CLK_PERI_PWM5, "pwm5_ck", "axi_sel", 6),</div><div class='add'>+	GATE_PERI0(CLK_PERI_PWM4, "pwm4_ck", "axi_sel", 5),</div><div class='add'>+	GATE_PERI0(CLK_PERI_PWM3, "pwm3_ck", "axi_sel", 4),</div><div class='add'>+	GATE_PERI0(CLK_PERI_PWM2, "pwm2_ck", "axi_sel", 3),</div><div class='add'>+	GATE_PERI0(CLK_PERI_PWM1, "pwm1_ck", "axi_sel", 2),</div><div class='add'>+	GATE_PERI0(CLK_PERI_THERM, "therm_ck", "axi_sel", 1),</div><div class='add'>+	GATE_PERI0(CLK_PERI_NFI, "nfi_ck", "nfi2x_sel", 0),</div><div class='add'>+</div><div class='add'>+	GATE_PERI1(CLK_PERI_FCI, "fci_ck", "ms_card_sel", 11),</div><div class='add'>+	GATE_PERI1(CLK_PERI_SPI2, "spi2_ck", "spi2_sel", 10),</div><div class='add'>+	GATE_PERI1(CLK_PERI_SPI1, "spi1_ck", "spi1_sel", 9),</div><div class='add'>+	GATE_PERI1(CLK_PERI_HOST89_DVD, "host89_dvd_ck", "aud2dvd_sel", 8),</div><div class='add'>+	GATE_PERI1(CLK_PERI_HOST89_SPI, "host89_spi_ck", "spi0_sel", 7),</div><div class='add'>+	GATE_PERI1(CLK_PERI_HOST89_INT, "host89_int_ck", "axi_sel", 6),</div><div class='add'>+	GATE_PERI1(CLK_PERI_FLASH, "flash_ck", "nfi2x_sel", 5),</div><div class='add'>+	GATE_PERI1(CLK_PERI_NFI_PAD, "nfi_pad_ck", "nfi1x_pad", 4),</div><div class='add'>+	GATE_PERI1(CLK_PERI_NFI_ECC, "nfi_ecc_ck", "nfi1x_pad", 3),</div><div class='add'>+	GATE_PERI1(CLK_PERI_GCPU, "gcpu_ck", "axi_sel", 2),</div><div class='add'>+	GATE_PERI1(CLK_PERI_USB_SLV, "usbslv_ck", "axi_sel", 1),</div><div class='add'>+	GATE_PERI1(CLK_PERI_USB1_MCU, "usb1_mcu_ck", "axi_sel", 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const uart_ck_sel_parents[] = {</div><div class='add'>+	"clk26m",</div><div class='add'>+	"uart_sel",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mtk_composite peri_muxs[] = {</div><div class='add'>+	MUX(CLK_PERI_UART0_SEL, "uart0_ck_sel", uart_ck_sel_parents,</div><div class='add'>+		0x40c, 0, 1),</div><div class='add'>+	MUX(CLK_PERI_UART1_SEL, "uart1_ck_sel", uart_ck_sel_parents,</div><div class='add'>+		0x40c, 1, 1),</div><div class='add'>+	MUX(CLK_PERI_UART2_SEL, "uart2_ck_sel", uart_ck_sel_parents,</div><div class='add'>+		0x40c, 2, 1),</div><div class='add'>+	MUX(CLK_PERI_UART3_SEL, "uart3_ck_sel", uart_ck_sel_parents,</div><div class='add'>+		0x40c, 3, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mtk_pericfg_init(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk_onecell_data *clk_data;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	int r;</div><div class='add'>+	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='add'>+	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+</div><div class='add'>+	base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(base))</div><div class='add'>+		return PTR_ERR(base);</div><div class='add'>+</div><div class='add'>+	clk_data = mtk_alloc_clk_data(CLK_PERI_NR);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_gates(node, peri_clks, ARRAY_SIZE(peri_clks),</div><div class='add'>+						clk_data);</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_composites(peri_muxs, ARRAY_SIZE(peri_muxs), base,</div><div class='add'>+			&amp;mt2701_clk_lock, clk_data);</div><div class='add'>+</div><div class='add'>+	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	mtk_register_reset_controller(node, 2, 0x0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MT8590_PLL_FMAX		(2000 * MHZ)</div><div class='add'>+#define CON0_MT8590_RST_BAR	BIT(27)</div><div class='add'>+</div><div class='add'>+#define PLL(_id, _name, _reg, _pwr_reg, _en_mask, _flags, _pcwbits, _pd_reg, \</div><div class='add'>+			_pd_shift, _tuner_reg, _pcw_reg, _pcw_shift) {	\</div><div class='add'>+		.id = _id,						\</div><div class='add'>+		.name = _name,						\</div><div class='add'>+		.reg = _reg,						\</div><div class='add'>+		.pwr_reg = _pwr_reg,					\</div><div class='add'>+		.en_mask = _en_mask,					\</div><div class='add'>+		.flags = _flags,					\</div><div class='add'>+		.rst_bar_mask = CON0_MT8590_RST_BAR,			\</div><div class='add'>+		.fmax = MT8590_PLL_FMAX,				\</div><div class='add'>+		.pcwbits = _pcwbits,					\</div><div class='add'>+		.pd_reg = _pd_reg,					\</div><div class='add'>+		.pd_shift = _pd_shift,					\</div><div class='add'>+		.tuner_reg = _tuner_reg,				\</div><div class='add'>+		.pcw_reg = _pcw_reg,					\</div><div class='add'>+		.pcw_shift = _pcw_shift,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct mtk_pll_data apmixed_plls[] = {</div><div class='add'>+	PLL(CLK_APMIXED_ARMPLL, "armpll", 0x200, 0x20c, 0x80000001,</div><div class='add'>+			PLL_AO, 21, 0x204, 24, 0x0, 0x204, 0),</div><div class='add'>+	PLL(CLK_APMIXED_MAINPLL, "mainpll", 0x210, 0x21c, 0xf0000001,</div><div class='add'>+		  HAVE_RST_BAR, 21, 0x210, 4, 0x0, 0x214, 0),</div><div class='add'>+	PLL(CLK_APMIXED_UNIVPLL, "univpll", 0x220, 0x22c, 0xf3000001,</div><div class='add'>+		  HAVE_RST_BAR, 7, 0x220, 4, 0x0, 0x224, 14),</div><div class='add'>+	PLL(CLK_APMIXED_MMPLL, "mmpll", 0x230, 0x23c, 0x00000001, 0,</div><div class='add'>+				21, 0x230, 4, 0x0, 0x234, 0),</div><div class='add'>+	PLL(CLK_APMIXED_MSDCPLL, "msdcpll", 0x240, 0x24c, 0x00000001, 0,</div><div class='add'>+				21, 0x240, 4, 0x0, 0x244, 0),</div><div class='add'>+	PLL(CLK_APMIXED_TVDPLL, "tvdpll", 0x250, 0x25c, 0x00000001, 0,</div><div class='add'>+				21, 0x250, 4, 0x0, 0x254, 0),</div><div class='add'>+	PLL(CLK_APMIXED_AUD1PLL, "aud1pll", 0x270, 0x27c, 0x00000001, 0,</div><div class='add'>+				31, 0x270, 4, 0x0, 0x274, 0),</div><div class='add'>+	PLL(CLK_APMIXED_TRGPLL, "trgpll", 0x280, 0x28c, 0x00000001, 0,</div><div class='add'>+				31, 0x280, 4, 0x0, 0x284, 0),</div><div class='add'>+	PLL(CLK_APMIXED_ETHPLL, "ethpll", 0x290, 0x29c, 0x00000001, 0,</div><div class='add'>+				31, 0x290, 4, 0x0, 0x294, 0),</div><div class='add'>+	PLL(CLK_APMIXED_VDECPLL, "vdecpll", 0x2a0, 0x2ac, 0x00000001, 0,</div><div class='add'>+				31, 0x2a0, 4, 0x0, 0x2a4, 0),</div><div class='add'>+	PLL(CLK_APMIXED_HADDS2PLL, "hadds2pll", 0x2b0, 0x2bc, 0x00000001, 0,</div><div class='add'>+				31, 0x2b0, 4, 0x0, 0x2b4, 0),</div><div class='add'>+	PLL(CLK_APMIXED_AUD2PLL, "aud2pll", 0x2c0, 0x2cc, 0x00000001, 0,</div><div class='add'>+				31, 0x2c0, 4, 0x0, 0x2c4, 0),</div><div class='add'>+	PLL(CLK_APMIXED_TVD2PLL, "tvd2pll", 0x2d0, 0x2dc, 0x00000001, 0,</div><div class='add'>+				21, 0x2d0, 4, 0x0, 0x2d4, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mtk_apmixedsys_init(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk_onecell_data *clk_data;</div><div class='add'>+	struct device_node *node = pdev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	clk_data = mtk_alloc_clk_data(CLK_APMIXED_NR);</div><div class='add'>+	if (!clk_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mtk_clk_register_plls(node, apmixed_plls, ARRAY_SIZE(apmixed_plls),</div><div class='add'>+								clk_data);</div><div class='add'>+</div><div class='add'>+	return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_match_clk_mt2701[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "mediatek,mt2701-topckgen",</div><div class='add'>+		.data = mtk_topckgen_init,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "mediatek,mt2701-infracfg",</div><div class='add'>+		.data = mtk_infrasys_init,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "mediatek,mt2701-pericfg",</div><div class='add'>+		.data = mtk_pericfg_init,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "mediatek,mt2701-apmixedsys",</div><div class='add'>+		.data = mtk_apmixedsys_init,</div><div class='add'>+	}, {</div><div class='add'>+		/* sentinel */</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int clk_mt2701_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int (*clk_init)(struct platform_device *);</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	clk_init = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!clk_init)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	r = clk_init(pdev);</div><div class='add'>+	if (r)</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"could not register clock provider: %s: %d\n",</div><div class='add'>+			pdev-&gt;name, r);</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver clk_mt2701_drv = {</div><div class='add'>+	.probe = clk_mt2701_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "clk-mt2701",</div><div class='add'>+		.of_match_table = of_match_clk_mt2701,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init clk_mt2701_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;clk_mt2701_drv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(clk_mt2701_init);</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c<br/>index bb30f7063569..0541df78141c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-mtk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mediatek/clk-mtk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-mtk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mtk.c</a></div><div class='hunk'>@@ -58,6 +58,9 @@ void mtk_clk_register_fixed_clks(const struct mtk_fixed_clk *clks,</div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='ctx'> 		const struct mtk_fixed_clk *rc = &amp;clks[i];</div><div class='ctx'> </div><div class='add'>+		if (clk_data &amp;&amp; !IS_ERR_OR_NULL(clk_data-&gt;clks[rc-&gt;id]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		clk = clk_register_fixed_rate(NULL, rc-&gt;name, rc-&gt;parent, 0,</div><div class='ctx'> 					      rc-&gt;rate);</div><div class='ctx'> </div><div class='hunk'>@@ -81,6 +84,9 @@ void mtk_clk_register_factors(const struct mtk_fixed_factor *clks,</div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='ctx'> 		const struct mtk_fixed_factor *ff = &amp;clks[i];</div><div class='ctx'> </div><div class='add'>+		if (clk_data &amp;&amp; !IS_ERR_OR_NULL(clk_data-&gt;clks[ff-&gt;id]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		clk = clk_register_fixed_factor(NULL, ff-&gt;name, ff-&gt;parent_name,</div><div class='ctx'> 				CLK_SET_RATE_PARENT, ff-&gt;mult, ff-&gt;div);</div><div class='ctx'> </div><div class='hunk'>@@ -116,6 +122,9 @@ int mtk_clk_register_gates(struct device_node *node,</div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='ctx'> 		const struct mtk_gate *gate = &amp;clks[i];</div><div class='ctx'> </div><div class='add'>+		if (!IS_ERR_OR_NULL(clk_data-&gt;clks[gate-&gt;id]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		clk = mtk_clk_register_gate(gate-&gt;name, gate-&gt;parent_name,</div><div class='ctx'> 				regmap,</div><div class='ctx'> 				gate-&gt;regs-&gt;set_ofs,</div><div class='hunk'>@@ -232,6 +241,9 @@ void mtk_clk_register_composites(const struct mtk_composite *mcs,</div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='ctx'> 		const struct mtk_composite *mc = &amp;mcs[i];</div><div class='ctx'> </div><div class='add'>+		if (clk_data &amp;&amp; !IS_ERR_OR_NULL(clk_data-&gt;clks[mc-&gt;id]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		clk = mtk_clk_register_composite(mc, base, lock);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(clk)) {</div><div class='hunk'>@@ -244,3 +256,31 @@ void mtk_clk_register_composites(const struct mtk_composite *mcs,</div><div class='ctx'> 			clk_data-&gt;clks[mc-&gt;id] = clk;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void mtk_clk_register_dividers(const struct mtk_clk_divider *mcds,</div><div class='add'>+			int num, void __iomem *base, spinlock_t *lock,</div><div class='add'>+				struct clk_onecell_data *clk_data)</div><div class='add'>+{</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;  num; i++) {</div><div class='add'>+		const struct mtk_clk_divider *mcd = &amp;mcds[i];</div><div class='add'>+</div><div class='add'>+		if (clk_data &amp;&amp; !IS_ERR_OR_NULL(clk_data-&gt;clks[mcd-&gt;id]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		clk = clk_register_divider(NULL, mcd-&gt;name, mcd-&gt;parent_name,</div><div class='add'>+			mcd-&gt;flags, base +  mcd-&gt;div_reg, mcd-&gt;div_shift,</div><div class='add'>+			mcd-&gt;div_width, mcd-&gt;clk_divider_flags, lock);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(clk)) {</div><div class='add'>+			pr_err("Failed to register clk %s: %ld\n",</div><div class='add'>+				mcd-&gt;name, PTR_ERR(clk));</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (clk_data)</div><div class='add'>+			clk_data-&gt;clks[mcd-&gt;id] = clk;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h<br/>index 9f24fcfa304f..f5d6b70ce189 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-mtk.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mediatek/clk-mtk.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-mtk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-mtk.h</a></div><div class='hunk'>@@ -87,7 +87,8 @@ struct mtk_composite {</div><div class='ctx'>  * In case the rate change propagation to parent clocks is undesirable,</div><div class='ctx'>  * this macro allows to specify the clock flags manually.</div><div class='ctx'>  */</div><div class='del'>-#define MUX_GATE_FLAGS(_id, _name, _parents, _reg, _shift, _width, _gate, _flags) {	\</div><div class='add'>+#define MUX_GATE_FLAGS(_id, _name, _parents, _reg, _shift, _width,	\</div><div class='add'>+			_gate, _flags) {				\</div><div class='ctx'> 		.id = _id,						\</div><div class='ctx'> 		.name = _name,						\</div><div class='ctx'> 		.mux_reg = _reg,					\</div><div class='hunk'>@@ -106,7 +107,8 @@ struct mtk_composite {</div><div class='ctx'>  * parent clock by default.</div><div class='ctx'>  */</div><div class='ctx'> #define MUX_GATE(_id, _name, _parents, _reg, _shift, _width, _gate)	\</div><div class='del'>-	MUX_GATE_FLAGS(_id, _name, _parents, _reg, _shift, _width, _gate, CLK_SET_RATE_PARENT)</div><div class='add'>+	MUX_GATE_FLAGS(_id, _name, _parents, _reg, _shift, _width,	\</div><div class='add'>+		_gate, CLK_SET_RATE_PARENT)</div><div class='ctx'> </div><div class='ctx'> #define MUX(_id, _name, _parents, _reg, _shift, _width) {		\</div><div class='ctx'> 		.id = _id,						\</div><div class='hunk'>@@ -121,7 +123,8 @@ struct mtk_composite {</div><div class='ctx'> 		.flags = CLK_SET_RATE_PARENT,				\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#define DIV_GATE(_id, _name, _parent, _gate_reg, _gate_shift, _div_reg, _div_width, _div_shift) {	\</div><div class='add'>+#define DIV_GATE(_id, _name, _parent, _gate_reg, _gate_shift, _div_reg,	\</div><div class='add'>+					_div_width, _div_shift) {	\</div><div class='ctx'> 		.id = _id,						\</div><div class='ctx'> 		.parent = _parent,					\</div><div class='ctx'> 		.name = _name,						\</div><div class='hunk'>@@ -156,12 +159,40 @@ struct mtk_gate {</div><div class='ctx'> 	const struct clk_ops *ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int mtk_clk_register_gates(struct device_node *node, const struct mtk_gate *clks,</div><div class='del'>-		int num, struct clk_onecell_data *clk_data);</div><div class='add'>+int mtk_clk_register_gates(struct device_node *node,</div><div class='add'>+			const struct mtk_gate *clks, int num,</div><div class='add'>+			struct clk_onecell_data *clk_data);</div><div class='add'>+</div><div class='add'>+struct mtk_clk_divider {</div><div class='add'>+	int id;</div><div class='add'>+	const char *name;</div><div class='add'>+	const char *parent_name;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	u32 div_reg;</div><div class='add'>+	unsigned char div_shift;</div><div class='add'>+	unsigned char div_width;</div><div class='add'>+	unsigned char clk_divider_flags;</div><div class='add'>+	const struct clk_div_table *clk_div_table;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DIV_ADJ(_id, _name, _parent, _reg, _shift, _width) {	\</div><div class='add'>+		.id = _id,					\</div><div class='add'>+		.name = _name,					\</div><div class='add'>+		.parent_name = _parent,				\</div><div class='add'>+		.div_reg = _reg,				\</div><div class='add'>+		.div_shift = _shift,				\</div><div class='add'>+		.div_width = _width,				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mtk_clk_register_dividers(const struct mtk_clk_divider *mcds,</div><div class='add'>+			int num, void __iomem *base, spinlock_t *lock,</div><div class='add'>+				struct clk_onecell_data *clk_data);</div><div class='ctx'> </div><div class='ctx'> struct clk_onecell_data *mtk_alloc_clk_data(unsigned int clk_num);</div><div class='ctx'> </div><div class='ctx'> #define HAVE_RST_BAR	BIT(0)</div><div class='add'>+#define PLL_AO		BIT(1)</div><div class='ctx'> </div><div class='ctx'> struct mtk_pll_div_table {</div><div class='ctx'> 	u32 div;</div><div class='head'>diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c<br/>index 0c2deac17ce9..a409142e9346 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-pll.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mediatek/clk-pll.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mediatek/clk-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mediatek/clk-pll.c</a></div><div class='hunk'>@@ -301,6 +301,7 @@ static struct clk *mtk_clk_register_pll(const struct mtk_pll_data *data,</div><div class='ctx'> 	pll-&gt;data = data;</div><div class='ctx'> </div><div class='ctx'> 	init.name = data-&gt;name;</div><div class='add'>+	init.flags = (data-&gt;flags &amp; PLL_AO) ? CLK_IS_CRITICAL : 0;</div><div class='ctx'> 	init.ops = &amp;mtk_pll_ops;</div><div class='ctx'> 	init.parent_names = &amp;parent_name;</div><div class='ctx'> 	init.num_parents = 1;</div><div class='head'>diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c<br/>index 9d9af446bafc..1c1ec137a3cc 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/meson/gxbb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/meson/gxbb.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/meson/gxbb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/meson/gxbb.c</a></div><div class='hunk'>@@ -564,6 +564,46 @@ static struct clk_gate gxbb_clk81 = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk_mux gxbb_sar_adc_clk_sel = {</div><div class='add'>+	.reg = (void *)HHI_SAR_CLK_CNTL,</div><div class='add'>+	.mask = 0x3,</div><div class='add'>+	.shift = 9,</div><div class='add'>+	.lock = &amp;clk_lock,</div><div class='add'>+	.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+		.name = "sar_adc_clk_sel",</div><div class='add'>+		.ops = &amp;clk_mux_ops,</div><div class='add'>+		/* NOTE: The datasheet doesn't list the parents for bit 10 */</div><div class='add'>+		.parent_names = (const char *[]){ "xtal", "clk81", },</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_divider gxbb_sar_adc_clk_div = {</div><div class='add'>+	.reg = (void *)HHI_SAR_CLK_CNTL,</div><div class='add'>+	.shift = 0,</div><div class='add'>+	.width = 8,</div><div class='add'>+	.lock = &amp;clk_lock,</div><div class='add'>+	.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+		.name = "sar_adc_clk_div",</div><div class='add'>+		.ops = &amp;clk_divider_ops,</div><div class='add'>+		.parent_names = (const char *[]){ "sar_adc_clk_sel" },</div><div class='add'>+		.num_parents = 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_gate gxbb_sar_adc_clk = {</div><div class='add'>+	.reg = (void *)HHI_SAR_CLK_CNTL,</div><div class='add'>+	.bit_idx = 8,</div><div class='add'>+	.lock = &amp;clk_lock,</div><div class='add'>+	.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+		.name = "sar_adc_clk",</div><div class='add'>+		.ops = &amp;clk_gate_ops,</div><div class='add'>+		.parent_names = (const char *[]){ "sar_adc_clk_div" },</div><div class='add'>+		.num_parents = 1,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Everything Else (EE) domain gates */</div><div class='ctx'> static MESON_GATE(gxbb_ddr, HHI_GCLK_MPEG0, 0);</div><div class='ctx'> static MESON_GATE(gxbb_dos, HHI_GCLK_MPEG0, 1);</div><div class='hunk'>@@ -754,6 +794,9 @@ static struct clk_hw_onecell_data gxbb_hw_onecell_data = {</div><div class='ctx'> 		[CLKID_SD_EMMC_A]	    = &amp;gxbb_emmc_a.hw,</div><div class='ctx'> 		[CLKID_SD_EMMC_B]	    = &amp;gxbb_emmc_b.hw,</div><div class='ctx'> 		[CLKID_SD_EMMC_C]	    = &amp;gxbb_emmc_c.hw,</div><div class='add'>+		[CLKID_SAR_ADC_CLK]	    = &amp;gxbb_sar_adc_clk.hw,</div><div class='add'>+		[CLKID_SAR_ADC_SEL]	    = &amp;gxbb_sar_adc_clk_sel.hw,</div><div class='add'>+		[CLKID_SAR_ADC_DIV]	    = &amp;gxbb_sar_adc_clk_div.hw,</div><div class='ctx'> 	},</div><div class='ctx'> 	.num = NR_CLKS,</div><div class='ctx'> };</div><div class='hunk'>@@ -856,6 +899,7 @@ static struct clk_gate *gxbb_clk_gates[] = {</div><div class='ctx'> 	&amp;gxbb_emmc_a,</div><div class='ctx'> 	&amp;gxbb_emmc_b,</div><div class='ctx'> 	&amp;gxbb_emmc_c,</div><div class='add'>+	&amp;gxbb_sar_adc_clk,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int gxbb_clkc_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -888,6 +932,10 @@ static int gxbb_clkc_probe(struct platform_device *pdev)</div><div class='ctx'> 	gxbb_mpeg_clk_sel.reg = clk_base + (u64)gxbb_mpeg_clk_sel.reg;</div><div class='ctx'> 	gxbb_mpeg_clk_div.reg = clk_base + (u64)gxbb_mpeg_clk_div.reg;</div><div class='ctx'> </div><div class='add'>+	/* Populate the base address for the SAR ADC clks */</div><div class='add'>+	gxbb_sar_adc_clk_sel.reg = clk_base + (u64)gxbb_sar_adc_clk_sel.reg;</div><div class='add'>+	gxbb_sar_adc_clk_div.reg = clk_base + (u64)gxbb_sar_adc_clk_div.reg;</div><div class='add'>+</div><div class='ctx'> 	/* Populate base address for gates */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(gxbb_clk_gates); i++)</div><div class='ctx'> 		gxbb_clk_gates[i]-&gt;reg = clk_base +</div><div class='head'>diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h<br/>index 0252939ba58f..8ee2022ce5d5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/meson/gxbb.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/meson/gxbb.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/meson/gxbb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/meson/gxbb.h</a></div><div class='hunk'>@@ -191,7 +191,7 @@</div><div class='ctx'> #define CLKID_PERIPHS		  20</div><div class='ctx'> #define CLKID_SPICC		  21</div><div class='ctx'> /* CLKID_I2C */</div><div class='del'>-#define CLKID_SAR_ADC		  23</div><div class='add'>+/* #define CLKID_SAR_ADC */</div><div class='ctx'> #define CLKID_SMART_CARD	  24</div><div class='ctx'> #define CLKID_RNG0		  25</div><div class='ctx'> #define CLKID_UART0		  26</div><div class='hunk'>@@ -204,7 +204,7 @@</div><div class='ctx'> #define CLKID_ASSIST_MISC	  33</div><div class='ctx'> /* CLKID_SPI */</div><div class='ctx'> #define CLKID_I2S_SPDIF		  35</div><div class='del'>-#define CLKID_ETH		  36</div><div class='add'>+/* CLKID_ETH */</div><div class='ctx'> #define CLKID_DEMUX		  37</div><div class='ctx'> #define CLKID_AIU_GLUE		  38</div><div class='ctx'> #define CLKID_IEC958		  39</div><div class='hunk'>@@ -231,13 +231,13 @@</div><div class='ctx'> #define CLKID_AHB_DATA_BUS	  60</div><div class='ctx'> #define CLKID_AHB_CTRL_BUS	  61</div><div class='ctx'> #define CLKID_HDMI_INTR_SYNC	  62</div><div class='del'>-#define CLKID_HDMI_PCLK		  63</div><div class='add'>+/* CLKID_HDMI_PCLK */</div><div class='ctx'> /* CLKID_USB1_DDR_BRIDGE */</div><div class='ctx'> /* CLKID_USB0_DDR_BRIDGE */</div><div class='ctx'> #define CLKID_MMC_PCLK		  66</div><div class='ctx'> #define CLKID_DVIN		  67</div><div class='ctx'> #define CLKID_UART2		  68</div><div class='del'>-#define CLKID_SANA		  69</div><div class='add'>+/* #define CLKID_SANA */</div><div class='ctx'> #define CLKID_VPU_INTR		  70</div><div class='ctx'> #define CLKID_SEC_AHB_AHB3_BRIDGE 71</div><div class='ctx'> #define CLKID_CLK81_A53		  72</div><div class='hunk'>@@ -245,7 +245,7 @@</div><div class='ctx'> #define CLKID_VCLK2_VENCI1	  74</div><div class='ctx'> #define CLKID_VCLK2_VENCP0	  75</div><div class='ctx'> #define CLKID_VCLK2_VENCP1	  76</div><div class='del'>-#define CLKID_GCLK_VENCI_INT0	  77</div><div class='add'>+/* CLKID_GCLK_VENCI_INT0 */</div><div class='ctx'> #define CLKID_GCLK_VENCI_INT	  78</div><div class='ctx'> #define CLKID_DAC_CLK		  79</div><div class='ctx'> #define CLKID_AOCLK_GATE	  80</div><div class='hunk'>@@ -265,8 +265,11 @@</div><div class='ctx'> /* CLKID_SD_EMMC_A */</div><div class='ctx'> /* CLKID_SD_EMMC_B */</div><div class='ctx'> /* CLKID_SD_EMMC_C */</div><div class='add'>+/* CLKID_SAR_ADC_CLK */</div><div class='add'>+/* CLKID_SAR_ADC_SEL */</div><div class='add'>+#define CLKID_SAR_ADC_DIV	  99</div><div class='ctx'> </div><div class='del'>-#define NR_CLKS			  97</div><div class='add'>+#define NR_CLKS			  100</div><div class='ctx'> </div><div class='ctx'> /* include the CLKIDs that have been made part of the stable DT binding */</div><div class='ctx'> #include &lt;dt-bindings/clock/gxbb-clkc.h&gt;</div><div class='head'>diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c<br/>index 3f1be46cbb33..888494d4fb8a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/meson/meson8b.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/meson/meson8b.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/meson/meson8b.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/meson/meson8b.c</a></div><div class='hunk'>@@ -607,7 +607,6 @@ static int meson8b_clkc_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* Populate the base address for the MPEG clks */</div><div class='ctx'> 	meson8b_mpeg_clk_sel.reg = clk_base + (u32)meson8b_mpeg_clk_sel.reg;</div><div class='ctx'> 	meson8b_mpeg_clk_div.reg = clk_base + (u32)meson8b_mpeg_clk_div.reg;</div><div class='del'>-	meson8b_clk81.reg = clk_base + (u32)meson8b_clk81.reg;</div><div class='ctx'> </div><div class='ctx'> 	/* Populate base address for gates */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(meson8b_clk_gates); i++)</div><div class='head'>diff --git a/drivers/clk/mmp/clk-of-mmp2.c b/drivers/clk/mmp/clk-of-mmp2.c<br/>index 9adaf48aea23..0fc75c395957 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mmp/clk-of-mmp2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mmp/clk-of-mmp2.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mmp/clk-of-mmp2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mmp/clk-of-mmp2.c</a></div><div class='hunk'>@@ -309,19 +309,19 @@ static void __init mmp2_clk_init(struct device_node *np)</div><div class='ctx'> 	pxa_unit-&gt;mpmu_base = of_iomap(np, 0);</div><div class='ctx'> 	if (!pxa_unit-&gt;mpmu_base) {</div><div class='ctx'> 		pr_err("failed to map mpmu registers\n");</div><div class='del'>-		return;</div><div class='add'>+		goto free_memory;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pxa_unit-&gt;apmu_base = of_iomap(np, 1);</div><div class='ctx'> 	if (!pxa_unit-&gt;apmu_base) {</div><div class='ctx'> 		pr_err("failed to map apmu registers\n");</div><div class='del'>-		return;</div><div class='add'>+		goto unmap_mpmu_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pxa_unit-&gt;apbc_base = of_iomap(np, 2);</div><div class='ctx'> 	if (!pxa_unit-&gt;apbc_base) {</div><div class='ctx'> 		pr_err("failed to map apbc registers\n");</div><div class='del'>-		return;</div><div class='add'>+		goto unmap_apmu_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mmp_clk_init(np, &amp;pxa_unit-&gt;unit, MMP2_NR_CLKS);</div><div class='hunk'>@@ -333,6 +333,15 @@ static void __init mmp2_clk_init(struct device_node *np)</div><div class='ctx'> 	mmp2_axi_periph_clk_init(pxa_unit);</div><div class='ctx'> </div><div class='ctx'> 	mmp2_clk_reset_init(np, pxa_unit);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+unmap_apmu_region:</div><div class='add'>+	iounmap(pxa_unit-&gt;apmu_base);</div><div class='add'>+unmap_mpmu_region:</div><div class='add'>+	iounmap(pxa_unit-&gt;mpmu_base);</div><div class='add'>+free_memory:</div><div class='add'>+	kfree(pxa_unit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> CLK_OF_DECLARE(mmp2_clk, "marvell,mmp2-clock", mmp2_clk_init);</div><div class='head'>diff --git a/drivers/clk/mmp/clk-of-pxa1928.c b/drivers/clk/mmp/clk-of-pxa1928.c<br/>index e478ff44e170..cede7b4ca3b9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mmp/clk-of-pxa1928.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mmp/clk-of-pxa1928.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mmp/clk-of-pxa1928.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mmp/clk-of-pxa1928.c</a></div><div class='hunk'>@@ -216,6 +216,7 @@ static void __init pxa1928_mpmu_clk_init(struct device_node *np)</div><div class='ctx'> 	pxa_unit-&gt;mpmu_base = of_iomap(np, 0);</div><div class='ctx'> 	if (!pxa_unit-&gt;mpmu_base) {</div><div class='ctx'> 		pr_err("failed to map mpmu registers\n");</div><div class='add'>+		kfree(pxa_unit);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -234,6 +235,7 @@ static void __init pxa1928_apmu_clk_init(struct device_node *np)</div><div class='ctx'> 	pxa_unit-&gt;apmu_base = of_iomap(np, 0);</div><div class='ctx'> 	if (!pxa_unit-&gt;apmu_base) {</div><div class='ctx'> 		pr_err("failed to map apmu registers\n");</div><div class='add'>+		kfree(pxa_unit);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -254,6 +256,7 @@ static void __init pxa1928_apbc_clk_init(struct device_node *np)</div><div class='ctx'> 	pxa_unit-&gt;apbc_base = of_iomap(np, 0);</div><div class='ctx'> 	if (!pxa_unit-&gt;apbc_base) {</div><div class='ctx'> 		pr_err("failed to map apbc registers\n");</div><div class='add'>+		kfree(pxa_unit);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/mmp/clk-of-pxa910.c b/drivers/clk/mmp/clk-of-pxa910.c<br/>index 64d1ef49caeb..1dcabe95cb67 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mmp/clk-of-pxa910.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mmp/clk-of-pxa910.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mmp/clk-of-pxa910.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mmp/clk-of-pxa910.c</a></div><div class='hunk'>@@ -278,25 +278,25 @@ static void __init pxa910_clk_init(struct device_node *np)</div><div class='ctx'> 	pxa_unit-&gt;mpmu_base = of_iomap(np, 0);</div><div class='ctx'> 	if (!pxa_unit-&gt;mpmu_base) {</div><div class='ctx'> 		pr_err("failed to map mpmu registers\n");</div><div class='del'>-		return;</div><div class='add'>+		goto free_memory;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pxa_unit-&gt;apmu_base = of_iomap(np, 1);</div><div class='ctx'> 	if (!pxa_unit-&gt;apmu_base) {</div><div class='ctx'> 		pr_err("failed to map apmu registers\n");</div><div class='del'>-		return;</div><div class='add'>+		goto unmap_mpmu_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pxa_unit-&gt;apbc_base = of_iomap(np, 2);</div><div class='ctx'> 	if (!pxa_unit-&gt;apbc_base) {</div><div class='ctx'> 		pr_err("failed to map apbc registers\n");</div><div class='del'>-		return;</div><div class='add'>+		goto unmap_apmu_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pxa_unit-&gt;apbcp_base = of_iomap(np, 3);</div><div class='ctx'> 	if (!pxa_unit-&gt;apbcp_base) {</div><div class='ctx'> 		pr_err("failed to map apbcp registers\n");</div><div class='del'>-		return;</div><div class='add'>+		goto unmap_apbc_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mmp_clk_init(np, &amp;pxa_unit-&gt;unit, PXA910_NR_CLKS);</div><div class='hunk'>@@ -308,6 +308,17 @@ static void __init pxa910_clk_init(struct device_node *np)</div><div class='ctx'> 	pxa910_axi_periph_clk_init(pxa_unit);</div><div class='ctx'> </div><div class='ctx'> 	pxa910_clk_reset_init(np, pxa_unit);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+unmap_apbc_region:</div><div class='add'>+	iounmap(pxa_unit-&gt;apbc_base);</div><div class='add'>+unmap_apmu_region:</div><div class='add'>+	iounmap(pxa_unit-&gt;apmu_base);</div><div class='add'>+unmap_mpmu_region:</div><div class='add'>+	iounmap(pxa_unit-&gt;mpmu_base);</div><div class='add'>+free_memory:</div><div class='add'>+	kfree(pxa_unit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> CLK_OF_DECLARE(pxa910_clk, "marvell,pxa910-clock", pxa910_clk_init);</div><div class='head'>diff --git a/drivers/clk/mvebu/Makefile b/drivers/clk/mvebu/Makefile<br/>index d9ae97fb43c4..d71c7fd5da16 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mvebu/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mvebu/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mvebu/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/Makefile</a></div><div class='hunk'>@@ -9,7 +9,7 @@ obj-$(CONFIG_ARMADA_39X_CLK)	+= armada-39x.o</div><div class='ctx'> obj-$(CONFIG_ARMADA_37XX_CLK)	+= armada-37xx-xtal.o</div><div class='ctx'> obj-$(CONFIG_ARMADA_37XX_CLK)	+= armada-37xx-tbg.o</div><div class='ctx'> obj-$(CONFIG_ARMADA_37XX_CLK)	+= armada-37xx-periph.o</div><div class='del'>-obj-$(CONFIG_ARMADA_XP_CLK)	+= armada-xp.o</div><div class='add'>+obj-$(CONFIG_ARMADA_XP_CLK)	+= armada-xp.o mv98dx3236.o</div><div class='ctx'> obj-$(CONFIG_ARMADA_AP806_SYSCON) += ap806-system-controller.o</div><div class='ctx'> obj-$(CONFIG_ARMADA_CP110_SYSCON) += cp110-system-controller.o</div><div class='ctx'> obj-$(CONFIG_DOVE_CLK)		+= dove.o dove-divider.o</div><div class='head'>diff --git a/drivers/clk/mvebu/ap806-system-controller.c b/drivers/clk/mvebu/ap806-system-controller.c<br/>index 02023baf86c9..f17702107ac5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mvebu/ap806-system-controller.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mvebu/ap806-system-controller.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mvebu/ap806-system-controller.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/ap806-system-controller.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/syscon.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='hunk'>@@ -55,21 +55,39 @@ static int ap806_syscon_clk_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	freq_mode = reg &amp; AP806_SAR_CLKFREQ_MODE_MASK;</div><div class='ctx'> 	switch (freq_mode) {</div><div class='del'>-	case 0x0 ... 0x5:</div><div class='add'>+	case 0x0:</div><div class='add'>+	case 0x1:</div><div class='ctx'> 		cpuclk_freq = 2000;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x6 ... 0xB:</div><div class='add'>+	case 0x6:</div><div class='add'>+	case 0x7:</div><div class='ctx'> 		cpuclk_freq = 1800;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0xC ... 0x11:</div><div class='add'>+	case 0x4:</div><div class='add'>+	case 0xB:</div><div class='add'>+	case 0xD:</div><div class='ctx'> 		cpuclk_freq = 1600;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x12 ... 0x16:</div><div class='add'>+	case 0x1a:</div><div class='ctx'> 		cpuclk_freq = 1400;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x17 ... 0x19:</div><div class='add'>+	case 0x14:</div><div class='add'>+	case 0x17:</div><div class='ctx'> 		cpuclk_freq = 1300;</div><div class='ctx'> 		break;</div><div class='add'>+	case 0x19:</div><div class='add'>+		cpuclk_freq = 1200;</div><div class='add'>+		break;</div><div class='add'>+	case 0x13:</div><div class='add'>+	case 0x1d:</div><div class='add'>+		cpuclk_freq = 1000;</div><div class='add'>+		break;</div><div class='add'>+	case 0x1c:</div><div class='add'>+		cpuclk_freq = 800;</div><div class='add'>+		break;</div><div class='add'>+	case 0x1b:</div><div class='add'>+		cpuclk_freq = 600;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "invalid SAR value\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -135,34 +153,17 @@ fail0:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ap806_syscon_clk_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	of_clk_del_provider(pdev-&gt;dev.of_node);</div><div class='del'>-	clk_unregister_fixed_factor(ap806_clks[3]);</div><div class='del'>-	clk_unregister_fixed_rate(ap806_clks[2]);</div><div class='del'>-	clk_unregister_fixed_rate(ap806_clks[1]);</div><div class='del'>-	clk_unregister_fixed_rate(ap806_clks[0]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct of_device_id ap806_syscon_of_match[] = {</div><div class='ctx'> 	{ .compatible = "marvell,ap806-system-controller", },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='del'>-MODULE_DEVICE_TABLE(of, armada8k_pcie_of_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ap806_syscon_driver = {</div><div class='ctx'> 	.probe = ap806_syscon_clk_probe,</div><div class='del'>-	.remove = ap806_syscon_clk_remove,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "marvell-ap806-system-controller",</div><div class='ctx'> 		.of_match_table = ap806_syscon_of_match,</div><div class='add'>+		.suppress_bind_attrs = true,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-module_platform_driver(ap806_syscon_driver);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Marvell AP806 System Controller driver");</div><div class='del'>-MODULE_AUTHOR("Thomas Petazzoni &lt;thomas.petazzoni@free-electrons.com&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='add'>+builtin_platform_driver(ap806_syscon_driver);</div><div class='head'>diff --git a/drivers/clk/mvebu/armada-xp.c b/drivers/clk/mvebu/armada-xp.c<br/>index b3094315a3c0..0ec44ae9a2a2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mvebu/armada-xp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mvebu/armada-xp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mvebu/armada-xp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/armada-xp.c</a></div><div class='hunk'>@@ -52,6 +52,12 @@ static u32 __init axp_get_tclk_freq(void __iomem *sar)</div><div class='ctx'> 	return 250000000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* MV98DX3236 TCLK frequency is fixed to 200MHz */</div><div class='add'>+static u32 __init mv98dx3236_get_tclk_freq(void __iomem *sar)</div><div class='add'>+{</div><div class='add'>+	return 200000000;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const u32 axp_cpu_freqs[] __initconst = {</div><div class='ctx'> 	1000000000,</div><div class='ctx'> 	1066000000,</div><div class='hunk'>@@ -89,6 +95,12 @@ static u32 __init axp_get_cpu_freq(void __iomem *sar)</div><div class='ctx'> 	return cpu_freq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* MV98DX3236 CLK frequency is fixed to 800MHz */</div><div class='add'>+static u32 __init mv98dx3236_get_cpu_freq(void __iomem *sar)</div><div class='add'>+{</div><div class='add'>+	return 800000000;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const int axp_nbclk_ratios[32][2] __initconst = {</div><div class='ctx'> 	{0, 1}, {1, 2}, {2, 2}, {2, 2},</div><div class='ctx'> 	{1, 2}, {1, 2}, {1, 1}, {2, 3},</div><div class='hunk'>@@ -158,6 +170,11 @@ static const struct coreclk_soc_desc axp_coreclks = {</div><div class='ctx'> 	.num_ratios = ARRAY_SIZE(axp_coreclk_ratios),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct coreclk_soc_desc mv98dx3236_coreclks = {</div><div class='add'>+	.get_tclk_freq = mv98dx3236_get_tclk_freq,</div><div class='add'>+	.get_cpu_freq = mv98dx3236_get_cpu_freq,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Clock Gating Control</div><div class='ctx'>  */</div><div class='hunk'>@@ -195,6 +212,15 @@ static const struct clk_gating_soc_desc axp_gating_desc[] __initconst = {</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct clk_gating_soc_desc mv98dx3236_gating_desc[] __initconst = {</div><div class='add'>+	{ "ge1", NULL, 3, 0 },</div><div class='add'>+	{ "ge0", NULL, 4, 0 },</div><div class='add'>+	{ "pex00", NULL, 5, 0 },</div><div class='add'>+	{ "sdio", NULL, 17, 0 },</div><div class='add'>+	{ "xor0", NULL, 22, 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init axp_clk_init(struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *cgnp =</div><div class='head'>diff --git a/drivers/clk/mvebu/clk-corediv.c b/drivers/clk/mvebu/clk-corediv.c<br/>index d1e5863d3375..8491979f4096 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mvebu/clk-corediv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mvebu/clk-corediv.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mvebu/clk-corediv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/clk-corediv.c</a></div><div class='hunk'>@@ -71,6 +71,10 @@ static const struct clk_corediv_desc mvebu_corediv_desc[] = {</div><div class='ctx'> 	{ .mask = 0x3f, .offset = 8, .fieldbit = 1 }, /* NAND clock */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct clk_corediv_desc mv98dx3236_corediv_desc[] = {</div><div class='add'>+	{ .mask = 0x0f, .offset = 6, .fieldbit = 26 }, /* NAND clock */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define to_corediv_clk(p) container_of(p, struct clk_corediv, hw)</div><div class='ctx'> </div><div class='ctx'> static int clk_corediv_is_enabled(struct clk_hw *hwclk)</div><div class='hunk'>@@ -232,6 +236,18 @@ static const struct clk_corediv_soc_desc armada375_corediv_soc = {</div><div class='ctx'> 	.ratio_offset = 0x4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct clk_corediv_soc_desc mv98dx3236_corediv_soc = {</div><div class='add'>+	.descs = mv98dx3236_corediv_desc,</div><div class='add'>+	.ndescs = ARRAY_SIZE(mv98dx3236_corediv_desc),</div><div class='add'>+	.ops = {</div><div class='add'>+		.recalc_rate = clk_corediv_recalc_rate,</div><div class='add'>+		.round_rate = clk_corediv_round_rate,</div><div class='add'>+		.set_rate = clk_corediv_set_rate,</div><div class='add'>+	},</div><div class='add'>+	.ratio_reload = BIT(10),</div><div class='add'>+	.ratio_offset = 0x8,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init</div><div class='ctx'> mvebu_corediv_clk_init(struct device_node *node,</div><div class='ctx'> 		       const struct clk_corediv_soc_desc *soc_desc)</div><div class='hunk'>@@ -313,3 +329,10 @@ static void __init armada380_corediv_clk_init(struct device_node *node)</div><div class='ctx'> }</div><div class='ctx'> CLK_OF_DECLARE(armada380_corediv_clk, "marvell,armada-380-corediv-clock",</div><div class='ctx'> 	       armada380_corediv_clk_init);</div><div class='add'>+</div><div class='add'>+static void __init mv98dx3236_corediv_clk_init(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	return mvebu_corediv_clk_init(node, &amp;mv98dx3236_corediv_soc);</div><div class='add'>+}</div><div class='add'>+CLK_OF_DECLARE(mv98dx3236_corediv_clk, "marvell,mv98dx3236-corediv-clock",</div><div class='add'>+	       mv98dx3236_corediv_clk_init);</div><div class='head'>diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c<br/>index 5837eb8a212f..044892b6534d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mvebu/clk-cpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mvebu/clk-cpu.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mvebu/clk-cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/clk-cpu.c</a></div><div class='hunk'>@@ -245,3 +245,11 @@ cpuclk_out:</div><div class='ctx'> </div><div class='ctx'> CLK_OF_DECLARE(armada_xp_cpu_clock, "marvell,armada-xp-cpu-clock",</div><div class='ctx'> 					 of_cpu_clk_setup);</div><div class='add'>+</div><div class='add'>+static void __init of_mv98dx3236_cpu_clk_setup(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	of_clk_add_provider(node, of_clk_src_simple_get, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CLK_OF_DECLARE(mv98dx3236_cpu_clock, "marvell,mv98dx3236-cpu-clock",</div><div class='add'>+					 of_mv98dx3236_cpu_clk_setup);</div><div class='head'>diff --git a/drivers/clk/mvebu/cp110-system-controller.c b/drivers/clk/mvebu/cp110-system-controller.c<br/>index f2303da7fda7..6b11d7b3e0e0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/mvebu/cp110-system-controller.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/mvebu/cp110-system-controller.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mvebu/cp110-system-controller.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/cp110-system-controller.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/syscon.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='hunk'>@@ -64,8 +64,11 @@ enum {</div><div class='ctx'> #define CP110_GATE_NAND			2</div><div class='ctx'> #define CP110_GATE_PPV2			3</div><div class='ctx'> #define CP110_GATE_SDIO			4</div><div class='add'>+#define CP110_GATE_MG			5</div><div class='add'>+#define CP110_GATE_MG_CORE		6</div><div class='ctx'> #define CP110_GATE_XOR1			7</div><div class='ctx'> #define CP110_GATE_XOR0			8</div><div class='add'>+#define CP110_GATE_GOP_DP		9</div><div class='ctx'> #define CP110_GATE_PCIE_X1_0		11</div><div class='ctx'> #define CP110_GATE_PCIE_X1_1		12</div><div class='ctx'> #define CP110_GATE_PCIE_X4		13</div><div class='hunk'>@@ -73,7 +76,7 @@ enum {</div><div class='ctx'> #define CP110_GATE_SATA			15</div><div class='ctx'> #define CP110_GATE_SATA_USB		16</div><div class='ctx'> #define CP110_GATE_MAIN			17</div><div class='del'>-#define CP110_GATE_SDMMC		18</div><div class='add'>+#define CP110_GATE_SDMMC_GOP		18</div><div class='ctx'> #define CP110_GATE_SLOW_IO		21</div><div class='ctx'> #define CP110_GATE_USB3H0		22</div><div class='ctx'> #define CP110_GATE_USB3H1		23</div><div class='hunk'>@@ -87,7 +90,7 @@ struct cp110_gate_clk {</div><div class='ctx'> 	u8 bit_idx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_cp110_gate_clk(clk) container_of(clk, struct cp110_gate_clk, hw)</div><div class='add'>+#define to_cp110_gate_clk(hw) container_of(hw, struct cp110_gate_clk, hw)</div><div class='ctx'> </div><div class='ctx'> static int cp110_gate_enable(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='hunk'>@@ -123,13 +126,14 @@ static const struct clk_ops cp110_gate_ops = {</div><div class='ctx'> 	.is_enabled = cp110_gate_is_enabled,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk *cp110_register_gate(const char *name,</div><div class='del'>-				       const char *parent_name,</div><div class='del'>-				       struct regmap *regmap, u8 bit_idx)</div><div class='add'>+static struct clk_hw *cp110_register_gate(const char *name,</div><div class='add'>+					  const char *parent_name,</div><div class='add'>+					  struct regmap *regmap, u8 bit_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct cp110_gate_clk *gate;</div><div class='del'>-	struct clk *clk;</div><div class='add'>+	struct clk_hw *hw;</div><div class='ctx'> 	struct clk_init_data init;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	gate = kzalloc(sizeof(*gate), GFP_KERNEL);</div><div class='ctx'> 	if (!gate)</div><div class='hunk'>@@ -146,39 +150,37 @@ static struct clk *cp110_register_gate(const char *name,</div><div class='ctx'> 	gate-&gt;bit_idx = bit_idx;</div><div class='ctx'> 	gate-&gt;hw.init = &amp;init;</div><div class='ctx'> </div><div class='del'>-	clk = clk_register(NULL, &amp;gate-&gt;hw);</div><div class='del'>-	if (IS_ERR(clk))</div><div class='add'>+	hw = &amp;gate-&gt;hw;</div><div class='add'>+	ret = clk_hw_register(NULL, hw);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		kfree(gate);</div><div class='add'>+		hw = ERR_PTR(ret);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return clk;</div><div class='add'>+	return hw;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cp110_unregister_gate(struct clk *clk)</div><div class='add'>+static void cp110_unregister_gate(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	struct clk_hw *hw;</div><div class='del'>-</div><div class='del'>-	hw = __clk_get_hw(clk);</div><div class='del'>-	if (!hw)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	clk_unregister(clk);</div><div class='add'>+	clk_hw_unregister(hw);</div><div class='ctx'> 	kfree(to_cp110_gate_clk(hw));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct clk *cp110_of_clk_get(struct of_phandle_args *clkspec, void *data)</div><div class='add'>+static struct clk_hw *cp110_of_clk_get(struct of_phandle_args *clkspec,</div><div class='add'>+				       void *data)</div><div class='ctx'> {</div><div class='del'>-	struct clk_onecell_data *clk_data = data;</div><div class='add'>+	struct clk_hw_onecell_data *clk_data = data;</div><div class='ctx'> 	unsigned int type = clkspec-&gt;args[0];</div><div class='ctx'> 	unsigned int idx = clkspec-&gt;args[1];</div><div class='ctx'> </div><div class='ctx'> 	if (type == CP110_CLK_TYPE_CORE) {</div><div class='ctx'> 		if (idx &gt; CP110_MAX_CORE_CLOCKS)</div><div class='ctx'> 			return ERR_PTR(-EINVAL);</div><div class='del'>-		return clk_data-&gt;clks[idx];</div><div class='add'>+		return clk_data-&gt;hws[idx];</div><div class='ctx'> 	} else if (type == CP110_CLK_TYPE_GATABLE) {</div><div class='ctx'> 		if (idx &gt; CP110_MAX_GATABLE_CLOCKS)</div><div class='ctx'> 			return ERR_PTR(-EINVAL);</div><div class='del'>-		return clk_data-&gt;clks[CP110_MAX_CORE_CLOCKS + idx];</div><div class='add'>+		return clk_data-&gt;hws[CP110_MAX_CORE_CLOCKS + idx];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -189,8 +191,8 @@ static int cp110_syscon_clk_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> 	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='ctx'> 	const char *ppv2_name, *apll_name, *core_name, *eip_name, *nand_name;</div><div class='del'>-	struct clk_onecell_data *cp110_clk_data;</div><div class='del'>-	struct clk *clk, **cp110_clks;</div><div class='add'>+	struct clk_hw_onecell_data *cp110_clk_data;</div><div class='add'>+	struct clk_hw *hw, **cp110_clks;</div><div class='ctx'> 	u32 nand_clk_ctrl;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='hunk'>@@ -203,80 +205,75 @@ static int cp110_syscon_clk_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	cp110_clks = devm_kcalloc(&amp;pdev-&gt;dev, sizeof(struct clk *),</div><div class='del'>-				  CP110_CLK_NUM, GFP_KERNEL);</div><div class='del'>-	if (!cp110_clks)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	cp110_clk_data = devm_kzalloc(&amp;pdev-&gt;dev,</div><div class='del'>-				      sizeof(*cp110_clk_data),</div><div class='add'>+	cp110_clk_data = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*cp110_clk_data) +</div><div class='add'>+				      sizeof(struct clk_hw *) * CP110_CLK_NUM,</div><div class='ctx'> 				      GFP_KERNEL);</div><div class='ctx'> 	if (!cp110_clk_data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	cp110_clk_data-&gt;clks = cp110_clks;</div><div class='del'>-	cp110_clk_data-&gt;clk_num = CP110_CLK_NUM;</div><div class='add'>+	cp110_clks = cp110_clk_data-&gt;hws;</div><div class='add'>+	cp110_clk_data-&gt;num = CP110_CLK_NUM;</div><div class='ctx'> </div><div class='del'>-	/* Register the APLL which is the root of the clk tree */</div><div class='add'>+	/* Register the APLL which is the root of the hw tree */</div><div class='ctx'> 	of_property_read_string_index(np, "core-clock-output-names",</div><div class='ctx'> 				      CP110_CORE_APLL, &amp;apll_name);</div><div class='del'>-	clk = clk_register_fixed_rate(NULL, apll_name, NULL, 0,</div><div class='del'>-				      1000 * 1000 * 1000);</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		ret = PTR_ERR(clk);</div><div class='add'>+	hw = clk_hw_register_fixed_rate(NULL, apll_name, NULL, 0,</div><div class='add'>+					1000 * 1000 * 1000);</div><div class='add'>+	if (IS_ERR(hw)) {</div><div class='add'>+		ret = PTR_ERR(hw);</div><div class='ctx'> 		goto fail0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cp110_clks[CP110_CORE_APLL] = clk;</div><div class='add'>+	cp110_clks[CP110_CORE_APLL] = hw;</div><div class='ctx'> </div><div class='ctx'> 	/* PPv2 is APLL/3 */</div><div class='ctx'> 	of_property_read_string_index(np, "core-clock-output-names",</div><div class='ctx'> 				      CP110_CORE_PPV2, &amp;ppv2_name);</div><div class='del'>-	clk = clk_register_fixed_factor(NULL, ppv2_name, apll_name, 0, 1, 3);</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		ret = PTR_ERR(clk);</div><div class='add'>+	hw = clk_hw_register_fixed_factor(NULL, ppv2_name, apll_name, 0, 1, 3);</div><div class='add'>+	if (IS_ERR(hw)) {</div><div class='add'>+		ret = PTR_ERR(hw);</div><div class='ctx'> 		goto fail1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cp110_clks[CP110_CORE_PPV2] = clk;</div><div class='add'>+	cp110_clks[CP110_CORE_PPV2] = hw;</div><div class='ctx'> </div><div class='ctx'> 	/* EIP clock is APLL/2 */</div><div class='ctx'> 	of_property_read_string_index(np, "core-clock-output-names",</div><div class='ctx'> 				      CP110_CORE_EIP, &amp;eip_name);</div><div class='del'>-	clk = clk_register_fixed_factor(NULL, eip_name, apll_name, 0, 1, 2);</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		ret = PTR_ERR(clk);</div><div class='add'>+	hw = clk_hw_register_fixed_factor(NULL, eip_name, apll_name, 0, 1, 2);</div><div class='add'>+	if (IS_ERR(hw)) {</div><div class='add'>+		ret = PTR_ERR(hw);</div><div class='ctx'> 		goto fail2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cp110_clks[CP110_CORE_EIP] = clk;</div><div class='add'>+	cp110_clks[CP110_CORE_EIP] = hw;</div><div class='ctx'> </div><div class='ctx'> 	/* Core clock is EIP/2 */</div><div class='ctx'> 	of_property_read_string_index(np, "core-clock-output-names",</div><div class='ctx'> 				      CP110_CORE_CORE, &amp;core_name);</div><div class='del'>-	clk = clk_register_fixed_factor(NULL, core_name, eip_name, 0, 1, 2);</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		ret = PTR_ERR(clk);</div><div class='add'>+	hw = clk_hw_register_fixed_factor(NULL, core_name, eip_name, 0, 1, 2);</div><div class='add'>+	if (IS_ERR(hw)) {</div><div class='add'>+		ret = PTR_ERR(hw);</div><div class='ctx'> 		goto fail3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cp110_clks[CP110_CORE_CORE] = clk;</div><div class='add'>+	cp110_clks[CP110_CORE_CORE] = hw;</div><div class='ctx'> </div><div class='ctx'> 	/* NAND can be either APLL/2.5 or core clock */</div><div class='ctx'> 	of_property_read_string_index(np, "core-clock-output-names",</div><div class='ctx'> 				      CP110_CORE_NAND, &amp;nand_name);</div><div class='ctx'> 	if (nand_clk_ctrl &amp; NF_CLOCK_SEL_400_MASK)</div><div class='del'>-		clk = clk_register_fixed_factor(NULL, nand_name,</div><div class='del'>-						apll_name, 0, 2, 5);</div><div class='add'>+		hw = clk_hw_register_fixed_factor(NULL, nand_name,</div><div class='add'>+						   apll_name, 0, 2, 5);</div><div class='ctx'> 	else</div><div class='del'>-		clk = clk_register_fixed_factor(NULL, nand_name,</div><div class='del'>-						core_name, 0, 1, 1);</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		ret = PTR_ERR(clk);</div><div class='add'>+		hw = clk_hw_register_fixed_factor(NULL, nand_name,</div><div class='add'>+						   core_name, 0, 1, 1);</div><div class='add'>+	if (IS_ERR(hw)) {</div><div class='add'>+		ret = PTR_ERR(hw);</div><div class='ctx'> 		goto fail4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cp110_clks[CP110_CORE_NAND] = clk;</div><div class='add'>+	cp110_clks[CP110_CORE_NAND] = hw;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; CP110_MAX_GATABLE_CLOCKS; i++) {</div><div class='ctx'> 		const char *parent, *name;</div><div class='hunk'>@@ -302,6 +299,11 @@ static int cp110_syscon_clk_probe(struct platform_device *pdev)</div><div class='ctx'> 						      "gate-clock-output-names",</div><div class='ctx'> 						      CP110_GATE_MAIN, &amp;parent);</div><div class='ctx'> 			break;</div><div class='add'>+		case CP110_GATE_MG:</div><div class='add'>+			of_property_read_string_index(np,</div><div class='add'>+						      "gate-clock-output-names",</div><div class='add'>+						      CP110_GATE_MG_CORE, &amp;parent);</div><div class='add'>+			break;</div><div class='ctx'> 		case CP110_GATE_NAND:</div><div class='ctx'> 			parent = nand_name;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -309,9 +311,10 @@ static int cp110_syscon_clk_probe(struct platform_device *pdev)</div><div class='ctx'> 			parent = ppv2_name;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CP110_GATE_SDIO:</div><div class='add'>+		case CP110_GATE_GOP_DP:</div><div class='ctx'> 			of_property_read_string_index(np,</div><div class='ctx'> 						      "gate-clock-output-names",</div><div class='del'>-						      CP110_GATE_SDMMC, &amp;parent);</div><div class='add'>+						      CP110_GATE_SDMMC_GOP, &amp;parent);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CP110_GATE_XOR1:</div><div class='ctx'> 		case CP110_GATE_XOR0:</div><div class='hunk'>@@ -335,16 +338,16 @@ static int cp110_syscon_clk_probe(struct platform_device *pdev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		clk = cp110_register_gate(name, parent, regmap, i);</div><div class='del'>-		if (IS_ERR(clk)) {</div><div class='del'>-			ret = PTR_ERR(clk);</div><div class='add'>+		hw = cp110_register_gate(name, parent, regmap, i);</div><div class='add'>+		if (IS_ERR(hw)) {</div><div class='add'>+			ret = PTR_ERR(hw);</div><div class='ctx'> 			goto fail_gate;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		cp110_clks[CP110_MAX_CORE_CLOCKS + i] = clk;</div><div class='add'>+		cp110_clks[CP110_MAX_CORE_CLOCKS + i] = hw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = of_clk_add_provider(np, cp110_of_clk_get, cp110_clk_data);</div><div class='add'>+	ret = of_clk_add_hw_provider(np, cp110_of_clk_get, cp110_clk_data);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fail_clk_add;</div><div class='ctx'> </div><div class='hunk'>@@ -355,65 +358,36 @@ static int cp110_syscon_clk_probe(struct platform_device *pdev)</div><div class='ctx'> fail_clk_add:</div><div class='ctx'> fail_gate:</div><div class='ctx'> 	for (i = 0; i &lt; CP110_MAX_GATABLE_CLOCKS; i++) {</div><div class='del'>-		clk = cp110_clks[CP110_MAX_CORE_CLOCKS + i];</div><div class='add'>+		hw = cp110_clks[CP110_MAX_CORE_CLOCKS + i];</div><div class='ctx'> </div><div class='del'>-		if (clk)</div><div class='del'>-			cp110_unregister_gate(clk);</div><div class='add'>+		if (hw)</div><div class='add'>+			cp110_unregister_gate(hw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	clk_unregister_fixed_factor(cp110_clks[CP110_CORE_NAND]);</div><div class='add'>+	clk_hw_unregister_fixed_factor(cp110_clks[CP110_CORE_NAND]);</div><div class='ctx'> fail4:</div><div class='del'>-	clk_unregister_fixed_factor(cp110_clks[CP110_CORE_CORE]);</div><div class='add'>+	clk_hw_unregister_fixed_factor(cp110_clks[CP110_CORE_CORE]);</div><div class='ctx'> fail3:</div><div class='del'>-	clk_unregister_fixed_factor(cp110_clks[CP110_CORE_EIP]);</div><div class='add'>+	clk_hw_unregister_fixed_factor(cp110_clks[CP110_CORE_EIP]);</div><div class='ctx'> fail2:</div><div class='del'>-	clk_unregister_fixed_factor(cp110_clks[CP110_CORE_PPV2]);</div><div class='add'>+	clk_hw_unregister_fixed_factor(cp110_clks[CP110_CORE_PPV2]);</div><div class='ctx'> fail1:</div><div class='del'>-	clk_unregister_fixed_rate(cp110_clks[CP110_CORE_APLL]);</div><div class='add'>+	clk_hw_unregister_fixed_rate(cp110_clks[CP110_CORE_APLL]);</div><div class='ctx'> fail0:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cp110_syscon_clk_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct clk **cp110_clks = platform_get_drvdata(pdev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	of_clk_del_provider(pdev-&gt;dev.of_node);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; CP110_MAX_GATABLE_CLOCKS; i++) {</div><div class='del'>-		struct clk *clk = cp110_clks[CP110_MAX_CORE_CLOCKS + i];</div><div class='del'>-</div><div class='del'>-		if (clk)</div><div class='del'>-			cp110_unregister_gate(clk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clk_unregister_fixed_factor(cp110_clks[CP110_CORE_NAND]);</div><div class='del'>-	clk_unregister_fixed_factor(cp110_clks[CP110_CORE_CORE]);</div><div class='del'>-	clk_unregister_fixed_factor(cp110_clks[CP110_CORE_EIP]);</div><div class='del'>-	clk_unregister_fixed_factor(cp110_clks[CP110_CORE_PPV2]);</div><div class='del'>-	clk_unregister_fixed_rate(cp110_clks[CP110_CORE_APLL]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct of_device_id cp110_syscon_of_match[] = {</div><div class='ctx'> 	{ .compatible = "marvell,cp110-system-controller0", },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='del'>-MODULE_DEVICE_TABLE(of, armada8k_pcie_of_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver cp110_syscon_driver = {</div><div class='ctx'> 	.probe = cp110_syscon_clk_probe,</div><div class='del'>-	.remove = cp110_syscon_clk_remove,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "marvell-cp110-system-controller0",</div><div class='ctx'> 		.of_match_table = cp110_syscon_of_match,</div><div class='add'>+		.suppress_bind_attrs = true,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-module_platform_driver(cp110_syscon_driver);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Marvell CP110 System Controller 0 driver");</div><div class='del'>-MODULE_AUTHOR("Thomas Petazzoni &lt;thomas.petazzoni@free-electrons.com&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='add'>+builtin_platform_driver(cp110_syscon_driver);</div><div class='head'>diff --git a/drivers/clk/mvebu/mv98dx3236.c b/drivers/clk/mvebu/mv98dx3236.c<br/>new file mode 100644<br/>index 000000000000..6e203af73cac<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/mvebu/mv98dx3236.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/mvebu/mv98dx3236.c</a></div><div class='hunk'>@@ -0,0 +1,180 @@</div><div class='add'>+/*</div><div class='add'>+ * Marvell MV98DX3236 SoC clocks</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2012 Marvell</div><div class='add'>+ *</div><div class='add'>+ * Gregory CLEMENT &lt;gregory.clement@free-electrons.com&gt;</div><div class='add'>+ * Sebastian Hesselbarth &lt;sebastian.hesselbarth@gmail.com&gt;</div><div class='add'>+ * Andrew Lunn &lt;andrew@lunn.ch&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2.  This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For 98DX4251 Sample At Reset the CPU, DDR and Main PLL clocks are all</div><div class='add'>+ * defined at the same time</div><div class='add'>+ *</div><div class='add'>+ * SAR1[20:18]   : CPU frequency    DDR frequency   MPLL frequency</div><div class='add'>+ *		 0  =  400 MHz	    400 MHz	    800 MHz</div><div class='add'>+ *		 2  =  667 MHz	    667 MHz	    2000 MHz</div><div class='add'>+ *		 3  =  800 MHz	    800 MHz	    1600 MHz</div><div class='add'>+ *		 others reserved.</div><div class='add'>+ *</div><div class='add'>+ * For 98DX3236 Sample At Reset the CPU, DDR and Main PLL clocks are all</div><div class='add'>+ * defined at the same time</div><div class='add'>+ *</div><div class='add'>+ * SAR1[20:18]   : CPU frequency    DDR frequency   MPLL frequency</div><div class='add'>+ *		 1  =  667 MHz	    667 MHz	    2000 MHz</div><div class='add'>+ *		 2  =  400 MHz	    400 MHz	    400 MHz</div><div class='add'>+ *		 3  =  800 MHz	    800 MHz	    800 MHz</div><div class='add'>+ *		 5  =  800 MHz	    400 MHz	    800 MHz</div><div class='add'>+ *		 others reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define SAR1_MV98DX3236_CPU_DDR_MPLL_FREQ_OPT		18</div><div class='add'>+#define SAR1_MV98DX3236_CPU_DDR_MPLL_FREQ_OPT_MASK	0x7</div><div class='add'>+</div><div class='add'>+static u32 __init mv98dx3236_get_tclk_freq(void __iomem *sar)</div><div class='add'>+{</div><div class='add'>+	/* Tclk = 200MHz, no SaR dependency */</div><div class='add'>+	return 200000000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u32 mv98dx3236_cpu_frequencies[] __initconst = {</div><div class='add'>+	0,</div><div class='add'>+	667000000,</div><div class='add'>+	400000000,</div><div class='add'>+	800000000,</div><div class='add'>+	0,</div><div class='add'>+	800000000,</div><div class='add'>+	0, 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 mv98dx4251_cpu_frequencies[] __initconst = {</div><div class='add'>+	400000000,</div><div class='add'>+	0,</div><div class='add'>+	667000000,</div><div class='add'>+	800000000,</div><div class='add'>+	0, 0, 0, 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 __init mv98dx3236_get_cpu_freq(void __iomem *sar)</div><div class='add'>+{</div><div class='add'>+	u32 cpu_freq = 0;</div><div class='add'>+	u8 cpu_freq_select = 0;</div><div class='add'>+</div><div class='add'>+	cpu_freq_select = ((readl(sar) &gt;&gt; SAR1_MV98DX3236_CPU_DDR_MPLL_FREQ_OPT) &amp;</div><div class='add'>+			   SAR1_MV98DX3236_CPU_DDR_MPLL_FREQ_OPT_MASK);</div><div class='add'>+</div><div class='add'>+	if (of_machine_is_compatible("marvell,armadaxp-98dx4251"))</div><div class='add'>+		cpu_freq = mv98dx4251_cpu_frequencies[cpu_freq_select];</div><div class='add'>+	else if (of_machine_is_compatible("marvell,armadaxp-98dx3236"))</div><div class='add'>+		cpu_freq = mv98dx3236_cpu_frequencies[cpu_freq_select];</div><div class='add'>+</div><div class='add'>+	if (!cpu_freq)</div><div class='add'>+		pr_err("CPU freq select unsupported %d\n", cpu_freq_select);</div><div class='add'>+</div><div class='add'>+	return cpu_freq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MV98DX3236_CPU_TO_DDR,</div><div class='add'>+	MV98DX3236_CPU_TO_MPLL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct coreclk_ratio mv98dx3236_core_ratios[] __initconst = {</div><div class='add'>+	{ .id = MV98DX3236_CPU_TO_DDR, .name = "ddrclk" },</div><div class='add'>+	{ .id = MV98DX3236_CPU_TO_MPLL, .name = "mpll" },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int __initconst mv98dx3236_cpu_mpll_ratios[8][2] = {</div><div class='add'>+	{0, 1}, {3, 1}, {1, 1}, {1, 1},</div><div class='add'>+	{0, 1}, {1, 1}, {0, 1}, {0, 1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int __initconst mv98dx3236_cpu_ddr_ratios[8][2] = {</div><div class='add'>+	{0, 1}, {1, 1}, {1, 1}, {1, 1},</div><div class='add'>+	{0, 1}, {1, 2}, {0, 1}, {0, 1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int __initconst mv98dx4251_cpu_mpll_ratios[8][2] = {</div><div class='add'>+	{2, 1}, {0, 1}, {3, 1}, {2, 1},</div><div class='add'>+	{0, 1}, {0, 1}, {0, 1}, {0, 1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int __initconst mv98dx4251_cpu_ddr_ratios[8][2] = {</div><div class='add'>+	{1, 1}, {0, 1}, {1, 1}, {1, 1},</div><div class='add'>+	{0, 1}, {0, 1}, {0, 1}, {0, 1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init mv98dx3236_get_clk_ratio(</div><div class='add'>+	void __iomem *sar, int id, int *mult, int *div)</div><div class='add'>+{</div><div class='add'>+	u32 opt = ((readl(sar) &gt;&gt; SAR1_MV98DX3236_CPU_DDR_MPLL_FREQ_OPT) &amp;</div><div class='add'>+		SAR1_MV98DX3236_CPU_DDR_MPLL_FREQ_OPT_MASK);</div><div class='add'>+</div><div class='add'>+	switch (id) {</div><div class='add'>+	case MV98DX3236_CPU_TO_DDR:</div><div class='add'>+		if (of_machine_is_compatible("marvell,armadaxp-98dx4251")) {</div><div class='add'>+			*mult = mv98dx4251_cpu_ddr_ratios[opt][0];</div><div class='add'>+			*div = mv98dx4251_cpu_ddr_ratios[opt][1];</div><div class='add'>+		} else if (of_machine_is_compatible("marvell,armadaxp-98dx3236")) {</div><div class='add'>+			*mult = mv98dx3236_cpu_ddr_ratios[opt][0];</div><div class='add'>+			*div = mv98dx3236_cpu_ddr_ratios[opt][1];</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case MV98DX3236_CPU_TO_MPLL:</div><div class='add'>+		if (of_machine_is_compatible("marvell,armadaxp-98dx4251")) {</div><div class='add'>+			*mult = mv98dx4251_cpu_mpll_ratios[opt][0];</div><div class='add'>+			*div = mv98dx4251_cpu_mpll_ratios[opt][1];</div><div class='add'>+		} else if (of_machine_is_compatible("marvell,armadaxp-98dx3236")) {</div><div class='add'>+			*mult = mv98dx3236_cpu_mpll_ratios[opt][0];</div><div class='add'>+			*div = mv98dx3236_cpu_mpll_ratios[opt][1];</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct coreclk_soc_desc mv98dx3236_core_clocks = {</div><div class='add'>+	.get_tclk_freq = mv98dx3236_get_tclk_freq,</div><div class='add'>+	.get_cpu_freq = mv98dx3236_get_cpu_freq,</div><div class='add'>+	.get_clk_ratio = mv98dx3236_get_clk_ratio,</div><div class='add'>+	.ratios = mv98dx3236_core_ratios,</div><div class='add'>+	.num_ratios = ARRAY_SIZE(mv98dx3236_core_ratios),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clock Gating Control</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const struct clk_gating_soc_desc mv98dx3236_gating_desc[] __initconst = {</div><div class='add'>+	{ "ge1", NULL, 3, 0 },</div><div class='add'>+	{ "ge0", NULL, 4, 0 },</div><div class='add'>+	{ "pex00", NULL, 5, 0 },</div><div class='add'>+	{ "sdio", NULL, 17, 0 },</div><div class='add'>+	{ "usb0", NULL, 18, 0 },</div><div class='add'>+	{ "xor0", NULL, 22, 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init mv98dx3236_clk_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct device_node *cgnp =</div><div class='add'>+		of_find_compatible_node(NULL, NULL, "marvell,mv98dx3236-gating-clock");</div><div class='add'>+</div><div class='add'>+	mvebu_coreclk_setup(np, &amp;mv98dx3236_core_clocks);</div><div class='add'>+</div><div class='add'>+	if (cgnp)</div><div class='add'>+		mvebu_clk_gating_setup(cgnp, mv98dx3236_gating_desc);</div><div class='add'>+}</div><div class='add'>+CLK_OF_DECLARE(mv98dx3236_clk, "marvell,mv98dx3236-core-clock", mv98dx3236_clk_init);</div><div class='head'>diff --git a/drivers/clk/nxp/clk-lpc18xx-ccu.c b/drivers/clk/nxp/clk-lpc18xx-ccu.c<br/>index f7136b94fd0e..27781b49eb82 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/nxp/clk-lpc18xx-ccu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/nxp/clk-lpc18xx-ccu.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/nxp/clk-lpc18xx-ccu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/nxp/clk-lpc18xx-ccu.c</a></div><div class='hunk'>@@ -277,12 +277,15 @@ static void __init lpc18xx_ccu_init(struct device_node *np)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);</div><div class='del'>-	if (!clk_data)</div><div class='add'>+	if (!clk_data) {</div><div class='add'>+		iounmap(reg_base);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	clk_data-&gt;num = of_property_count_strings(np, "clock-names");</div><div class='ctx'> 	clk_data-&gt;name = kcalloc(clk_data-&gt;num, sizeof(char *), GFP_KERNEL);</div><div class='ctx'> 	if (!clk_data-&gt;name) {</div><div class='add'>+		iounmap(reg_base);</div><div class='ctx'> 		kfree(clk_data);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/clk/nxp/clk-lpc32xx.c b/drivers/clk/nxp/clk-lpc32xx.c<br/>index 34c97353cdeb..5b98ff9076f3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/nxp/clk-lpc32xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/nxp/clk-lpc32xx.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/nxp/clk-lpc32xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/nxp/clk-lpc32xx.c</a></div><div class='hunk'>@@ -1282,13 +1282,13 @@ static struct clk_hw_proto clk_hw_proto[LPC32XX_CLK_HW_MAX] = {</div><div class='ctx'> </div><div class='ctx'> 	LPC32XX_DEFINE_MUX(PWM1_MUX, PWMCLK_CTRL, 1, 0x1, NULL, 0),</div><div class='ctx'> 	LPC32XX_DEFINE_DIV(PWM1_DIV, PWMCLK_CTRL, 4, 4, NULL,</div><div class='del'>-			   CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO),</div><div class='add'>+			   CLK_DIVIDER_ONE_BASED),</div><div class='ctx'> 	LPC32XX_DEFINE_GATE(PWM1_GATE, PWMCLK_CTRL, 0, 0),</div><div class='ctx'> 	LPC32XX_DEFINE_COMPOSITE(PWM1, PWM1_MUX, PWM1_DIV, PWM1_GATE),</div><div class='ctx'> </div><div class='ctx'> 	LPC32XX_DEFINE_MUX(PWM2_MUX, PWMCLK_CTRL, 3, 0x1, NULL, 0),</div><div class='ctx'> 	LPC32XX_DEFINE_DIV(PWM2_DIV, PWMCLK_CTRL, 8, 4, NULL,</div><div class='del'>-			   CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO),</div><div class='add'>+			   CLK_DIVIDER_ONE_BASED),</div><div class='ctx'> 	LPC32XX_DEFINE_GATE(PWM2_GATE, PWMCLK_CTRL, 2, 0),</div><div class='ctx'> 	LPC32XX_DEFINE_COMPOSITE(PWM2, PWM2_MUX, PWM2_DIV, PWM2_GATE),</div><div class='ctx'> </div><div class='hunk'>@@ -1335,8 +1335,7 @@ static struct clk_hw_proto clk_hw_proto[LPC32XX_CLK_HW_MAX] = {</div><div class='ctx'> 	LPC32XX_DEFINE_GATE(USB_DIV_GATE, USB_CTRL, 17, 0),</div><div class='ctx'> 	LPC32XX_DEFINE_COMPOSITE(USB_DIV, _NULL, USB_DIV_DIV, USB_DIV_GATE),</div><div class='ctx'> </div><div class='del'>-	LPC32XX_DEFINE_DIV(SD_DIV, MS_CTRL, 0, 4, NULL,</div><div class='del'>-			   CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO),</div><div class='add'>+	LPC32XX_DEFINE_DIV(SD_DIV, MS_CTRL, 0, 4, NULL, CLK_DIVIDER_ONE_BASED),</div><div class='ctx'> 	LPC32XX_DEFINE_CLK(SD_GATE, MS_CTRL, BIT(5) | BIT(9), BIT(5) | BIT(9),</div><div class='ctx'> 			   0x0, BIT(5) | BIT(9), 0x0, 0x0, clk_mask_ops),</div><div class='ctx'> 	LPC32XX_DEFINE_COMPOSITE(SD, _NULL, SD_DIV, SD_GATE),</div><div class='hunk'>@@ -1478,6 +1477,20 @@ static struct clk * __init lpc32xx_clk_register(u32 id)</div><div class='ctx'> 	return clk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init lpc32xx_clk_div_quirk(u32 reg, u32 div_mask, u32 gate)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	regmap_read(clk_regmap, reg, &amp;val);</div><div class='add'>+</div><div class='add'>+	if (!(val &amp; div_mask)) {</div><div class='add'>+		val &amp;= ~gate;</div><div class='add'>+		val |= BIT(__ffs(div_mask));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(clk_regmap, reg, gate | div_mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init lpc32xx_clk_init(struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -1517,6 +1530,17 @@ static void __init lpc32xx_clk_init(struct device_node *np)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Divider part of PWM and MS clocks requires a quirk to avoid</div><div class='add'>+	 * a misinterpretation of formally valid zero value in register</div><div class='add'>+	 * bitfield, which indicates another clock gate. Instead of</div><div class='add'>+	 * adding complexity to a gate clock ensure that zero value in</div><div class='add'>+	 * divider clock is never met in runtime.</div><div class='add'>+	 */</div><div class='add'>+	lpc32xx_clk_div_quirk(LPC32XX_CLKPWR_PWMCLK_CTRL, 0xf0, BIT(0));</div><div class='add'>+	lpc32xx_clk_div_quirk(LPC32XX_CLKPWR_PWMCLK_CTRL, 0xf00, BIT(2));</div><div class='add'>+	lpc32xx_clk_div_quirk(LPC32XX_CLKPWR_MS_CTRL, 0xf, BIT(5) | BIT(9));</div><div class='add'>+</div><div class='ctx'> 	for (i = 1; i &lt; LPC32XX_CLK_MAX; i++) {</div><div class='ctx'> 		clk[i] = lpc32xx_clk_register(i);</div><div class='ctx'> 		if (IS_ERR(clk[i])) {</div><div class='head'>diff --git a/drivers/clk/pxa/clk-pxa.c b/drivers/clk/pxa/clk-pxa.c<br/>index 29cee9e8d4d9..74f64c3c4290 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/pxa/clk-pxa.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/pxa/clk-pxa.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/pxa/clk-pxa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/pxa/clk-pxa.c</a></div><div class='hunk'>@@ -18,7 +18,27 @@</div><div class='ctx'> #include &lt;dt-bindings/clock/pxa-clock.h&gt;</div><div class='ctx'> #include "clk-pxa.h"</div><div class='ctx'> </div><div class='del'>-DEFINE_SPINLOCK(lock);</div><div class='add'>+#define KHz 1000</div><div class='add'>+#define MHz (1000 * 1000)</div><div class='add'>+</div><div class='add'>+#define MDREFR_K0DB4	(1 &lt;&lt; 29)	/* SDCLK0 Divide by 4 Control/Status */</div><div class='add'>+#define MDREFR_K2FREE	(1 &lt;&lt; 25)	/* SDRAM Free-Running Control */</div><div class='add'>+#define MDREFR_K1FREE	(1 &lt;&lt; 24)	/* SDRAM Free-Running Control */</div><div class='add'>+#define MDREFR_K0FREE	(1 &lt;&lt; 23)	/* SDRAM Free-Running Control */</div><div class='add'>+#define MDREFR_SLFRSH	(1 &lt;&lt; 22)	/* SDRAM Self-Refresh Control/Status */</div><div class='add'>+#define MDREFR_APD	(1 &lt;&lt; 20)	/* SDRAM/SSRAM Auto-Power-Down Enable */</div><div class='add'>+#define MDREFR_K2DB2	(1 &lt;&lt; 19)	/* SDCLK2 Divide by 2 Control/Status */</div><div class='add'>+#define MDREFR_K2RUN	(1 &lt;&lt; 18)	/* SDCLK2 Run Control/Status */</div><div class='add'>+#define MDREFR_K1DB2	(1 &lt;&lt; 17)	/* SDCLK1 Divide by 2 Control/Status */</div><div class='add'>+#define MDREFR_K1RUN	(1 &lt;&lt; 16)	/* SDCLK1 Run Control/Status */</div><div class='add'>+#define MDREFR_E1PIN	(1 &lt;&lt; 15)	/* SDCKE1 Level Control/Status */</div><div class='add'>+#define MDREFR_K0DB2	(1 &lt;&lt; 14)	/* SDCLK0 Divide by 2 Control/Status */</div><div class='add'>+#define MDREFR_K0RUN	(1 &lt;&lt; 13)	/* SDCLK0 Run Control/Status */</div><div class='add'>+#define MDREFR_E0PIN	(1 &lt;&lt; 12)	/* SDCKE0 Level Control/Status */</div><div class='add'>+#define MDREFR_DB2_MASK	(MDREFR_K2DB2 | MDREFR_K1DB2)</div><div class='add'>+#define MDREFR_DRI_MASK	0xFFF</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(pxa_clk_lock);</div><div class='ctx'> </div><div class='ctx'> static struct clk *pxa_clocks[CLK_MAX];</div><div class='ctx'> static struct clk_onecell_data onecell_data = {</div><div class='hunk'>@@ -89,7 +109,7 @@ int __init clk_pxa_cken_init(const struct desc_clk_cken *clks, int nb_clks)</div><div class='ctx'> 		pxa_clk-&gt;lp = clks[i].lp;</div><div class='ctx'> 		pxa_clk-&gt;hp = clks[i].hp;</div><div class='ctx'> 		pxa_clk-&gt;gate = clks[i].gate;</div><div class='del'>-		pxa_clk-&gt;gate.lock = &amp;lock;</div><div class='add'>+		pxa_clk-&gt;gate.lock = &amp;pxa_clk_lock;</div><div class='ctx'> 		clk = clk_register_composite(NULL, clks[i].name,</div><div class='ctx'> 					     clks[i].parent_names, 2,</div><div class='ctx'> 					     &amp;pxa_clk-&gt;hw, &amp;cken_mux_ops,</div><div class='hunk'>@@ -106,3 +126,124 @@ void __init clk_pxa_dt_common_init(struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	of_clk_add_provider(np, of_clk_src_onecell_get, &amp;onecell_data);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void pxa2xx_core_turbo_switch(bool on)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int unused, clkcfg;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	asm("mrc p14, 0, %0, c6, c0, 0" : "=r" (clkcfg));</div><div class='add'>+	clkcfg &amp;= ~CLKCFG_TURBO &amp; ~CLKCFG_HALFTURBO;</div><div class='add'>+	if (on)</div><div class='add'>+		clkcfg |= CLKCFG_TURBO;</div><div class='add'>+	clkcfg |= CLKCFG_FCS;</div><div class='add'>+</div><div class='add'>+	asm volatile(</div><div class='add'>+	"	b	2f\n"</div><div class='add'>+	"	.align	5\n"</div><div class='add'>+	"1:	mcr	p14, 0, %1, c6, c0, 0\n"</div><div class='add'>+	"	b	3f\n"</div><div class='add'>+	"2:	b	1b\n"</div><div class='add'>+	"3:	nop\n"</div><div class='add'>+		: "=&amp;r" (unused)</div><div class='add'>+		: "r" (clkcfg)</div><div class='add'>+		: );</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pxa2xx_cpll_change(struct pxa2xx_freq *freq,</div><div class='add'>+			u32 (*mdrefr_dri)(unsigned int), void __iomem *mdrefr,</div><div class='add'>+			void __iomem *cccr)</div><div class='add'>+{</div><div class='add'>+	unsigned int clkcfg = freq-&gt;clkcfg;</div><div class='add'>+	unsigned int unused, preset_mdrefr, postset_mdrefr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	/* Calculate the next MDREFR.  If we're slowing down the SDRAM clock</div><div class='add'>+	 * we need to preset the smaller DRI before the change.	 If we're</div><div class='add'>+	 * speeding up we need to set the larger DRI value after the change.</div><div class='add'>+	 */</div><div class='add'>+	preset_mdrefr = postset_mdrefr = readl(mdrefr);</div><div class='add'>+	if ((preset_mdrefr &amp; MDREFR_DRI_MASK) &gt; mdrefr_dri(freq-&gt;membus_khz)) {</div><div class='add'>+		preset_mdrefr = (preset_mdrefr &amp; ~MDREFR_DRI_MASK);</div><div class='add'>+		preset_mdrefr |= mdrefr_dri(freq-&gt;membus_khz);</div><div class='add'>+	}</div><div class='add'>+	postset_mdrefr =</div><div class='add'>+		(postset_mdrefr &amp; ~MDREFR_DRI_MASK) |</div><div class='add'>+		mdrefr_dri(freq-&gt;membus_khz);</div><div class='add'>+</div><div class='add'>+	/* If we're dividing the memory clock by two for the SDRAM clock, this</div><div class='add'>+	 * must be set prior to the change.  Clearing the divide must be done</div><div class='add'>+	 * after the change.</div><div class='add'>+	 */</div><div class='add'>+	if (freq-&gt;div2) {</div><div class='add'>+		preset_mdrefr  |= MDREFR_DB2_MASK;</div><div class='add'>+		postset_mdrefr |= MDREFR_DB2_MASK;</div><div class='add'>+	} else {</div><div class='add'>+		postset_mdrefr &amp;= ~MDREFR_DB2_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set new the CCCR and prepare CLKCFG */</div><div class='add'>+	writel(freq-&gt;cccr, cccr);</div><div class='add'>+</div><div class='add'>+	asm volatile(</div><div class='add'>+	"	ldr	r4, [%1]\n"</div><div class='add'>+	"	b	2f\n"</div><div class='add'>+	"	.align	5\n"</div><div class='add'>+	"1:	str	%3, [%1]		/* preset the MDREFR */\n"</div><div class='add'>+	"	mcr	p14, 0, %2, c6, c0, 0	/* set CLKCFG[FCS] */\n"</div><div class='add'>+	"	str	%4, [%1]		/* postset the MDREFR */\n"</div><div class='add'>+	"	b	3f\n"</div><div class='add'>+	"2:	b	1b\n"</div><div class='add'>+	"3:	nop\n"</div><div class='add'>+	     : "=&amp;r" (unused)</div><div class='add'>+	     : "r" (mdrefr), "r" (clkcfg), "r" (preset_mdrefr),</div><div class='add'>+	       "r" (postset_mdrefr)</div><div class='add'>+	     : "r4", "r5");</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pxa2xx_determine_rate(struct clk_rate_request *req,</div><div class='add'>+			  struct pxa2xx_freq *freqs, int nb_freqs)</div><div class='add'>+{</div><div class='add'>+	int i, closest_below = -1, closest_above = -1;</div><div class='add'>+	unsigned long rate;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nb_freqs; i++) {</div><div class='add'>+		rate = freqs[i].cpll;</div><div class='add'>+		if (rate == req-&gt;rate)</div><div class='add'>+			break;</div><div class='add'>+		if (rate &lt; req-&gt;min_rate)</div><div class='add'>+			continue;</div><div class='add'>+		if (rate &gt; req-&gt;max_rate)</div><div class='add'>+			continue;</div><div class='add'>+		if (rate &lt;= req-&gt;rate)</div><div class='add'>+			closest_below = i;</div><div class='add'>+		if ((rate &gt;= req-&gt;rate) &amp;&amp; (closest_above == -1))</div><div class='add'>+			closest_above = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;best_parent_hw = NULL;</div><div class='add'>+</div><div class='add'>+	if (i &lt; nb_freqs) {</div><div class='add'>+		rate = req-&gt;rate;</div><div class='add'>+	} else if (closest_below &gt;= 0) {</div><div class='add'>+		rate = freqs[closest_below].cpll;</div><div class='add'>+	} else if (closest_above &gt;= 0) {</div><div class='add'>+		rate = freqs[closest_above].cpll;</div><div class='add'>+	} else {</div><div class='add'>+		pr_debug("%s(rate=%lu) no match\n", __func__, req-&gt;rate);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("%s(rate=%lu) rate=%lu\n", __func__, req-&gt;rate, rate);</div><div class='add'>+	req-&gt;rate = rate;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/clk/pxa/clk-pxa.h b/drivers/clk/pxa/clk-pxa.h<br/>index d1de805df867..2b90c5917b32 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/pxa/clk-pxa.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/pxa/clk-pxa.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/pxa/clk-pxa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/pxa/clk-pxa.h</a></div><div class='hunk'>@@ -13,6 +13,11 @@</div><div class='ctx'> #ifndef _CLK_PXA_</div><div class='ctx'> #define _CLK_PXA_</div><div class='ctx'> </div><div class='add'>+#define CLKCFG_TURBO		0x1</div><div class='add'>+#define CLKCFG_FCS		0x2</div><div class='add'>+#define CLKCFG_HALFTURBO	0x4</div><div class='add'>+#define CLKCFG_FASTBUS		0x8</div><div class='add'>+</div><div class='ctx'> #define PARENTS(name) \</div><div class='ctx'> 	static const char *const name ## _parents[] __initconst</div><div class='ctx'> #define MUX_RO_RATE_RO_OPS(name, clk_name)			\</div><div class='hunk'>@@ -35,10 +40,27 @@</div><div class='ctx'> 			NULL, NULL, CLK_GET_RATE_NOCACHE);	\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#define RATE_RO_OPS(name, clk_name)			\</div><div class='add'>+#define RATE_RO_OPS(name, clk_name)				\</div><div class='add'>+	static struct clk_hw name ## _rate_hw;			\</div><div class='add'>+	static const struct clk_ops name ## _rate_ops = {		\</div><div class='add'>+		.recalc_rate = name ## _get_rate,		\</div><div class='add'>+	};							\</div><div class='add'>+	static struct clk * __init clk_register_ ## name(void)	\</div><div class='add'>+	{							\</div><div class='add'>+		return clk_register_composite(NULL, clk_name,	\</div><div class='add'>+			name ## _parents,			\</div><div class='add'>+			ARRAY_SIZE(name ## _parents),		\</div><div class='add'>+			NULL, NULL,				\</div><div class='add'>+			&amp;name ## _rate_hw, &amp;name ## _rate_ops,	\</div><div class='add'>+			NULL, NULL, CLK_GET_RATE_NOCACHE);	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define RATE_OPS(name, clk_name)				\</div><div class='ctx'> 	static struct clk_hw name ## _rate_hw;			\</div><div class='ctx'> 	static struct clk_ops name ## _rate_ops = {		\</div><div class='ctx'> 		.recalc_rate = name ## _get_rate,		\</div><div class='add'>+		.set_rate = name ## _set_rate,			\</div><div class='add'>+		.determine_rate = name ## _determine_rate,	\</div><div class='ctx'> 	};							\</div><div class='ctx'> 	static struct clk * __init clk_register_ ## name(void)	\</div><div class='ctx'> 	{							\</div><div class='hunk'>@@ -50,6 +72,24 @@</div><div class='ctx'> 			NULL, NULL, CLK_GET_RATE_NOCACHE);	\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define MUX_OPS(name, clk_name, flags)				\</div><div class='add'>+	static struct clk_hw name ## _mux_hw;			\</div><div class='add'>+	static const struct clk_ops name ## _mux_ops = {	\</div><div class='add'>+		.get_parent = name ## _get_parent,		\</div><div class='add'>+		.set_parent = name ## _set_parent,		\</div><div class='add'>+		.determine_rate = name ## _determine_rate,	\</div><div class='add'>+	};							\</div><div class='add'>+	static struct clk * __init clk_register_ ## name(void)	\</div><div class='add'>+	{							\</div><div class='add'>+		return clk_register_composite(NULL, clk_name,	\</div><div class='add'>+			name ## _parents,			\</div><div class='add'>+			ARRAY_SIZE(name ## _parents),		\</div><div class='add'>+			&amp;name ## _mux_hw, &amp;name ## _mux_ops,	\</div><div class='add'>+			NULL, NULL,				\</div><div class='add'>+			NULL, NULL,				\</div><div class='add'>+			CLK_GET_RATE_NOCACHE | flags); \</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * CKEN clock type</div><div class='ctx'>  * This clock takes it source from 2 possible parents :</div><div class='hunk'>@@ -95,7 +135,15 @@ struct desc_clk_cken {</div><div class='ctx'> 	PXA_CKEN(dev_id, con_id, name, parents, 1, 1, 1, 1,		\</div><div class='ctx'> 		 NULL, cken_reg, cken_bit, flag)</div><div class='ctx'> </div><div class='del'>-static int dummy_clk_set_parent(struct clk_hw *hw, u8 index)</div><div class='add'>+struct pxa2xx_freq {</div><div class='add'>+	unsigned long cpll;</div><div class='add'>+	unsigned int membus_khz;</div><div class='add'>+	unsigned int cccr;</div><div class='add'>+	unsigned int div2;</div><div class='add'>+	unsigned int clkcfg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int dummy_clk_set_parent(struct clk_hw *hw, u8 index)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -105,4 +153,11 @@ extern void clkdev_pxa_register(int ckid, const char *con_id,</div><div class='ctx'> extern int clk_pxa_cken_init(const struct desc_clk_cken *clks, int nb_clks);</div><div class='ctx'> void clk_pxa_dt_common_init(struct device_node *np);</div><div class='ctx'> </div><div class='add'>+void pxa2xx_core_turbo_switch(bool on);</div><div class='add'>+void pxa2xx_cpll_change(struct pxa2xx_freq *freq,</div><div class='add'>+			u32 (*mdrefr_dri)(unsigned int), void __iomem *mdrefr,</div><div class='add'>+			void __iomem *cccr);</div><div class='add'>+int pxa2xx_determine_rate(struct clk_rate_request *req,</div><div class='add'>+			  struct pxa2xx_freq *freqs,  int nb_freqs);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/clk/pxa/clk-pxa25x.c b/drivers/clk/pxa/clk-pxa25x.c<br/>index a98b98e2a9e4..6416c1f8e632 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/pxa/clk-pxa25x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/pxa/clk-pxa25x.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/pxa/clk-pxa25x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/pxa/clk-pxa25x.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;mach/pxa2xx-regs.h&gt;</div><div class='add'>+#include &lt;mach/smemc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/pxa-clock.h&gt;</div><div class='ctx'> #include "clk-pxa.h"</div><div class='hunk'>@@ -30,6 +31,17 @@ enum {</div><div class='ctx'> 	PXA_CORE_TURBO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define PXA25x_CLKCFG(T)			\</div><div class='add'>+	(CLKCFG_FCS |				\</div><div class='add'>+	 ((T) ? CLKCFG_TURBO : 0))</div><div class='add'>+#define PXA25x_CCCR(N2, M, L) (N2 &lt;&lt; 7 | M &lt;&lt; 5 | L)</div><div class='add'>+</div><div class='add'>+#define MDCNFG_DRAC2(mdcnfg)	(((mdcnfg) &gt;&gt; 21) &amp; 0x3)</div><div class='add'>+#define MDCNFG_DRAC0(mdcnfg)	(((mdcnfg) &gt;&gt; 5) &amp; 0x3)</div><div class='add'>+</div><div class='add'>+/* Define the refresh period in mSec for the SDRAM and the number of rows */</div><div class='add'>+#define SDRAM_TREF	64	/* standard 64ms SDRAM */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Various clock factors driven by the CCCR register.</div><div class='ctx'>  */</div><div class='hunk'>@@ -48,6 +60,34 @@ static const char * const get_freq_khz[] = {</div><div class='ctx'> 	"core", "run", "cpll", "memory"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int get_sdram_rows(void)</div><div class='add'>+{</div><div class='add'>+	static int sdram_rows;</div><div class='add'>+	unsigned int drac2 = 0, drac0 = 0;</div><div class='add'>+	u32 mdcnfg;</div><div class='add'>+</div><div class='add'>+	if (sdram_rows)</div><div class='add'>+		return sdram_rows;</div><div class='add'>+</div><div class='add'>+	mdcnfg = readl_relaxed(MDCNFG);</div><div class='add'>+</div><div class='add'>+	if (mdcnfg &amp; (MDCNFG_DE2 | MDCNFG_DE3))</div><div class='add'>+		drac2 = MDCNFG_DRAC2(mdcnfg);</div><div class='add'>+</div><div class='add'>+	if (mdcnfg &amp; (MDCNFG_DE0 | MDCNFG_DE1))</div><div class='add'>+		drac0 = MDCNFG_DRAC0(mdcnfg);</div><div class='add'>+</div><div class='add'>+	sdram_rows = 1 &lt;&lt; (11 + max(drac0, drac2));</div><div class='add'>+	return sdram_rows;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mdrefr_dri(unsigned int freq_khz)</div><div class='add'>+{</div><div class='add'>+	u32 interval = freq_khz * SDRAM_TREF / get_sdram_rows();</div><div class='add'>+</div><div class='add'>+	return interval / 32;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Get the clock frequency as reflected by CCCR and the turbo flag.</div><div class='ctx'>  * We assume these values have been applied via a fcs.</div><div class='hunk'>@@ -139,6 +179,21 @@ static struct desc_clk_cken pxa25x_clocks[] __initdata = {</div><div class='ctx'> 			     clk_pxa25x_memory_parents, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * In this table, PXA25x_CCCR(N2, M, L) has the following meaning, where :</div><div class='add'>+ *   - freq_cpll = n * m * L * 3.6864 MHz</div><div class='add'>+ *   - n = N2 / 2</div><div class='add'>+ *   - m = 2^(M - 1), where 1 &lt;= M &lt;= 3</div><div class='add'>+ *   - l = L_clk_mult[L], ie. { 0, 27, 32, 36, 40, 45, 0, }[L]</div><div class='add'>+ */</div><div class='add'>+static struct pxa2xx_freq pxa25x_freqs[] = {</div><div class='add'>+	/* CPU  MEMBUS  CCCR                  DIV2 CCLKCFG      */</div><div class='add'>+	{ 99532800, 99500, PXA25x_CCCR(2,  1, 1),  1, PXA25x_CLKCFG(1)},</div><div class='add'>+	{199065600, 99500, PXA25x_CCCR(4,  1, 1),  0, PXA25x_CLKCFG(1)},</div><div class='add'>+	{298598400, 99500, PXA25x_CCCR(3,  2, 1),  0, PXA25x_CLKCFG(1)},</div><div class='add'>+	{398131200, 99500, PXA25x_CCCR(4,  2, 1),  0, PXA25x_CLKCFG(1)},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static u8 clk_pxa25x_core_get_parent(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long clkcfg;</div><div class='hunk'>@@ -151,13 +206,24 @@ static u8 clk_pxa25x_core_get_parent(struct clk_hw *hw)</div><div class='ctx'> 	return PXA_CORE_RUN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long clk_pxa25x_core_get_rate(struct clk_hw *hw,</div><div class='del'>-					      unsigned long parent_rate)</div><div class='add'>+static int clk_pxa25x_core_set_parent(struct clk_hw *hw, u8 index)</div><div class='ctx'> {</div><div class='del'>-	return parent_rate;</div><div class='add'>+	if (index &gt; PXA_CORE_TURBO)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pxa2xx_core_turbo_switch(index == PXA_CORE_TURBO);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_pxa25x_core_determine_rate(struct clk_hw *hw,</div><div class='add'>+					  struct clk_rate_request *req)</div><div class='add'>+{</div><div class='add'>+	return __clk_mux_determine_rate(hw, req);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> PARENTS(clk_pxa25x_core) = { "run", "cpll" };</div><div class='del'>-MUX_RO_RATE_RO_OPS(clk_pxa25x_core, "core");</div><div class='add'>+MUX_OPS(clk_pxa25x_core, "core", CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static unsigned long clk_pxa25x_run_get_rate(struct clk_hw *hw,</div><div class='ctx'> 					     unsigned long parent_rate)</div><div class='hunk'>@@ -182,17 +248,42 @@ static unsigned long clk_pxa25x_cpll_get_rate(struct clk_hw *hw,</div><div class='ctx'> 	m = M_clk_mult[(cccr &gt;&gt; 5) &amp; 0x03];</div><div class='ctx'> 	n2 = N2_clk_mult[(cccr &gt;&gt; 7) &amp; 0x07];</div><div class='ctx'> </div><div class='del'>-	if (t)</div><div class='del'>-		return m * l * n2 * parent_rate / 2;</div><div class='del'>-	return m * l * parent_rate;</div><div class='add'>+	return m * l * n2 * parent_rate / 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_pxa25x_cpll_determine_rate(struct clk_hw *hw,</div><div class='add'>+					  struct clk_rate_request *req)</div><div class='add'>+{</div><div class='add'>+	return pxa2xx_determine_rate(req, pxa25x_freqs,</div><div class='add'>+				     ARRAY_SIZE(pxa25x_freqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_pxa25x_cpll_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				    unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s(rate=%lu parent_rate=%lu)\n", __func__, rate, parent_rate);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pxa25x_freqs); i++)</div><div class='add'>+		if (pxa25x_freqs[i].cpll == rate)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (i &gt;= ARRAY_SIZE(pxa25x_freqs))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pxa2xx_cpll_change(&amp;pxa25x_freqs[i], mdrefr_dri, MDREFR, CCCR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> PARENTS(clk_pxa25x_cpll) = { "osc_3_6864mhz" };</div><div class='del'>-RATE_RO_OPS(clk_pxa25x_cpll, "cpll");</div><div class='add'>+RATE_OPS(clk_pxa25x_cpll, "cpll");</div><div class='ctx'> </div><div class='ctx'> static void __init pxa25x_register_core(void)</div><div class='ctx'> {</div><div class='del'>-	clk_register_clk_pxa25x_cpll();</div><div class='del'>-	clk_register_clk_pxa25x_run();</div><div class='add'>+	clkdev_pxa_register(CLK_NONE, "cpll", NULL,</div><div class='add'>+			    clk_register_clk_pxa25x_cpll());</div><div class='add'>+	clkdev_pxa_register(CLK_NONE, "run", NULL,</div><div class='add'>+			    clk_register_clk_pxa25x_run());</div><div class='ctx'> 	clkdev_pxa_register(CLK_CORE, "core", NULL,</div><div class='ctx'> 			    clk_register_clk_pxa25x_core());</div><div class='ctx'> }</div><div class='hunk'>@@ -214,7 +305,8 @@ static void __init pxa25x_base_clocks_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	pxa25x_register_plls();</div><div class='ctx'> 	pxa25x_register_core();</div><div class='del'>-	clk_register_clk_pxa25x_memory();</div><div class='add'>+	clkdev_pxa_register(CLK_NONE, "system_bus", NULL,</div><div class='add'>+			    clk_register_clk_pxa25x_memory());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DUMMY_CLK(_con_id, _dev_id, _parent) \</div><div class='hunk'>@@ -230,7 +322,7 @@ static struct dummy_clk dummy_clks[] __initdata = {</div><div class='ctx'> 	DUMMY_CLK("GPIO11_CLK", NULL, "osc_3_6864mhz"),</div><div class='ctx'> 	DUMMY_CLK("GPIO12_CLK", NULL, "osc_32_768khz"),</div><div class='ctx'> 	DUMMY_CLK(NULL, "sa1100-rtc", "osc_32_768khz"),</div><div class='del'>-	DUMMY_CLK("OSTIMER0", NULL, "osc_32_768khz"),</div><div class='add'>+	DUMMY_CLK("OSTIMER0", NULL, "osc_3_6864mhz"),</div><div class='ctx'> 	DUMMY_CLK("UARTCLK", "pxa2xx-ir", "STUART"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/pxa/clk-pxa27x.c b/drivers/clk/pxa/clk-pxa27x.c<br/>index c40b1804f58c..25a30194d27a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/pxa/clk-pxa27x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/pxa/clk-pxa27x.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/pxa/clk-pxa27x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/pxa/clk-pxa27x.c</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> #include &lt;linux/clkdev.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/smemc.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;dt-bindings/clock/pxa-clock.h&gt;</div><div class='ctx'> #include "clk-pxa.h"</div><div class='ctx'> </div><div class='hunk'>@@ -45,11 +47,52 @@ enum {</div><div class='ctx'> 	PXA_MEM_RUN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define PXA27x_CLKCFG(B, HT, T)			\</div><div class='add'>+	(CLKCFG_FCS |				\</div><div class='add'>+	 ((B)  ? CLKCFG_FASTBUS : 0) |		\</div><div class='add'>+	 ((HT) ? CLKCFG_HALFTURBO : 0) |	\</div><div class='add'>+	 ((T)  ? CLKCFG_TURBO : 0))</div><div class='add'>+#define PXA27x_CCCR(A, L, N2) (A &lt;&lt; 25 | N2 &lt;&lt; 7 | L)</div><div class='add'>+</div><div class='add'>+#define MDCNFG_DRAC2(mdcnfg)	(((mdcnfg) &gt;&gt; 21) &amp; 0x3)</div><div class='add'>+#define MDCNFG_DRAC0(mdcnfg)	(((mdcnfg) &gt;&gt; 5) &amp; 0x3)</div><div class='add'>+</div><div class='add'>+/* Define the refresh period in mSec for the SDRAM and the number of rows */</div><div class='add'>+#define SDRAM_TREF	64	/* standard 64ms SDRAM */</div><div class='add'>+</div><div class='ctx'> static const char * const get_freq_khz[] = {</div><div class='ctx'> 	"core", "run", "cpll", "memory",</div><div class='ctx'> 	"system_bus"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int get_sdram_rows(void)</div><div class='add'>+{</div><div class='add'>+	static int sdram_rows;</div><div class='add'>+	unsigned int drac2 = 0, drac0 = 0;</div><div class='add'>+	u32 mdcnfg;</div><div class='add'>+</div><div class='add'>+	if (sdram_rows)</div><div class='add'>+		return sdram_rows;</div><div class='add'>+</div><div class='add'>+	mdcnfg = readl_relaxed(MDCNFG);</div><div class='add'>+</div><div class='add'>+	if (mdcnfg &amp; (MDCNFG_DE2 | MDCNFG_DE3))</div><div class='add'>+		drac2 = MDCNFG_DRAC2(mdcnfg);</div><div class='add'>+</div><div class='add'>+	if (mdcnfg &amp; (MDCNFG_DE0 | MDCNFG_DE1))</div><div class='add'>+		drac0 = MDCNFG_DRAC0(mdcnfg);</div><div class='add'>+</div><div class='add'>+	sdram_rows = 1 &lt;&lt; (11 + max(drac0, drac2));</div><div class='add'>+	return sdram_rows;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mdrefr_dri(unsigned int freq_khz)</div><div class='add'>+{</div><div class='add'>+	u32 interval = freq_khz * SDRAM_TREF / get_sdram_rows();</div><div class='add'>+</div><div class='add'>+	return (interval - 31) / 32;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Get the clock frequency as reflected by CCSR and the turbo flag.</div><div class='ctx'>  * We assume these values have been applied via a fcs.</div><div class='hunk'>@@ -145,6 +188,42 @@ static struct desc_clk_cken pxa27x_clocks[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * PXA270 definitions</div><div class='add'>+ *</div><div class='add'>+ * For the PXA27x:</div><div class='add'>+ * Control variables are A, L, 2N for CCCR; B, HT, T for CLKCFG.</div><div class='add'>+ *</div><div class='add'>+ * A = 0 =&gt; memory controller clock from table 3-7,</div><div class='add'>+ * A = 1 =&gt; memory controller clock = system bus clock</div><div class='add'>+ * Run mode frequency	= 13 MHz * L</div><div class='add'>+ * Turbo mode frequency = 13 MHz * L * N</div><div class='add'>+ * System bus frequency = 13 MHz * L / (B + 1)</div><div class='add'>+ *</div><div class='add'>+ * In CCCR:</div><div class='add'>+ * A = 1</div><div class='add'>+ * L = 16	  oscillator to run mode ratio</div><div class='add'>+ * 2N = 6	  2 * (turbo mode to run mode ratio)</div><div class='add'>+ *</div><div class='add'>+ * In CCLKCFG:</div><div class='add'>+ * B = 1	  Fast bus mode</div><div class='add'>+ * HT = 0	  Half-Turbo mode</div><div class='add'>+ * T = 1	  Turbo mode</div><div class='add'>+ *</div><div class='add'>+ * For now, just support some of the combinations in table 3-7 of</div><div class='add'>+ * PXA27x Processor Family Developer's Manual to simplify frequency</div><div class='add'>+ * change sequences.</div><div class='add'>+ */</div><div class='add'>+static struct pxa2xx_freq pxa27x_freqs[] = {</div><div class='add'>+	{104000000, 104000, PXA27x_CCCR(1,  8, 2), 0, PXA27x_CLKCFG(1, 0, 1) },</div><div class='add'>+	{156000000, 104000, PXA27x_CCCR(1,  8, 3), 0, PXA27x_CLKCFG(1, 0, 1) },</div><div class='add'>+	{208000000, 208000, PXA27x_CCCR(0, 16, 2), 1, PXA27x_CLKCFG(0, 0, 1) },</div><div class='add'>+	{312000000, 208000, PXA27x_CCCR(1, 16, 3), 1, PXA27x_CLKCFG(1, 0, 1) },</div><div class='add'>+	{416000000, 208000, PXA27x_CCCR(1, 16, 4), 1, PXA27x_CLKCFG(1, 0, 1) },</div><div class='add'>+	{520000000, 208000, PXA27x_CCCR(1, 16, 5), 1, PXA27x_CLKCFG(1, 0, 1) },</div><div class='add'>+	{624000000, 208000, PXA27x_CCCR(1, 16, 6), 1, PXA27x_CLKCFG(1, 0, 1) },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static unsigned long clk_pxa27x_cpll_get_rate(struct clk_hw *hw,</div><div class='ctx'> 	unsigned long parent_rate)</div><div class='ctx'> {</div><div class='hunk'>@@ -162,10 +241,35 @@ static unsigned long clk_pxa27x_cpll_get_rate(struct clk_hw *hw,</div><div class='ctx'> 	L  = l * parent_rate;</div><div class='ctx'> 	N  = (L * n2) / 2;</div><div class='ctx'> </div><div class='del'>-	return t ? N : L;</div><div class='add'>+	return N;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_pxa27x_cpll_determine_rate(struct clk_hw *hw,</div><div class='add'>+					  struct clk_rate_request *req)</div><div class='add'>+{</div><div class='add'>+	return pxa2xx_determine_rate(req, pxa27x_freqs,</div><div class='add'>+				     ARRAY_SIZE(pxa27x_freqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_pxa27x_cpll_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				    unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s(rate=%lu parent_rate=%lu)\n", __func__, rate, parent_rate);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pxa27x_freqs); i++)</div><div class='add'>+		if (pxa27x_freqs[i].cpll == rate)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (i &gt;= ARRAY_SIZE(pxa27x_freqs))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pxa2xx_cpll_change(&amp;pxa27x_freqs[i], mdrefr_dri, MDREFR, CCCR);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> PARENTS(clk_pxa27x_cpll) = { "osc_13mhz" };</div><div class='del'>-RATE_RO_OPS(clk_pxa27x_cpll, "cpll");</div><div class='add'>+RATE_OPS(clk_pxa27x_cpll, "cpll");</div><div class='ctx'> </div><div class='ctx'> static unsigned long clk_pxa27x_lcd_base_get_rate(struct clk_hw *hw,</div><div class='ctx'> 						  unsigned long parent_rate)</div><div class='hunk'>@@ -217,31 +321,10 @@ static void __init pxa27x_register_plls(void)</div><div class='ctx'> 	clk_register_fixed_factor(NULL, "ppll_312mhz", "osc_13mhz", 0, 24, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long clk_pxa27x_core_get_rate(struct clk_hw *hw,</div><div class='del'>-					      unsigned long parent_rate)</div><div class='del'>-{</div><div class='del'>-	unsigned long clkcfg;</div><div class='del'>-	unsigned int t, ht, b, osc_forced;</div><div class='del'>-	unsigned long ccsr = readl(CCSR);</div><div class='del'>-</div><div class='del'>-	osc_forced = ccsr &amp; (1 &lt;&lt; CCCR_CPDIS_BIT);</div><div class='del'>-	asm("mrc\tp14, 0, %0, c6, c0, 0" : "=r" (clkcfg));</div><div class='del'>-	t  = clkcfg &amp; (1 &lt;&lt; 0);</div><div class='del'>-	ht = clkcfg &amp; (1 &lt;&lt; 2);</div><div class='del'>-	b  = clkcfg &amp; (1 &lt;&lt; 3);</div><div class='del'>-</div><div class='del'>-	if (osc_forced)</div><div class='del'>-		return parent_rate;</div><div class='del'>-	if (ht)</div><div class='del'>-		return parent_rate / 2;</div><div class='del'>-	else</div><div class='del'>-		return parent_rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u8 clk_pxa27x_core_get_parent(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long clkcfg;</div><div class='del'>-	unsigned int t, ht, b, osc_forced;</div><div class='add'>+	unsigned int t, ht, osc_forced;</div><div class='ctx'> 	unsigned long ccsr = readl(CCSR);</div><div class='ctx'> </div><div class='ctx'> 	osc_forced = ccsr &amp; (1 &lt;&lt; CCCR_CPDIS_BIT);</div><div class='hunk'>@@ -251,14 +334,30 @@ static u8 clk_pxa27x_core_get_parent(struct clk_hw *hw)</div><div class='ctx'> 	asm("mrc\tp14, 0, %0, c6, c0, 0" : "=r" (clkcfg));</div><div class='ctx'> 	t  = clkcfg &amp; (1 &lt;&lt; 0);</div><div class='ctx'> 	ht = clkcfg &amp; (1 &lt;&lt; 2);</div><div class='del'>-	b  = clkcfg &amp; (1 &lt;&lt; 3);</div><div class='ctx'> </div><div class='ctx'> 	if (ht || t)</div><div class='ctx'> 		return PXA_CORE_TURBO;</div><div class='ctx'> 	return PXA_CORE_RUN;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int clk_pxa27x_core_set_parent(struct clk_hw *hw, u8 index)</div><div class='add'>+{</div><div class='add'>+	if (index &gt; PXA_CORE_TURBO)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pxa2xx_core_turbo_switch(index == PXA_CORE_TURBO);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_pxa27x_core_determine_rate(struct clk_hw *hw,</div><div class='add'>+					  struct clk_rate_request *req)</div><div class='add'>+{</div><div class='add'>+	return __clk_mux_determine_rate(hw, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> PARENTS(clk_pxa27x_core) = { "osc_13mhz", "run", "cpll" };</div><div class='del'>-MUX_RO_RATE_RO_OPS(clk_pxa27x_core, "core");</div><div class='add'>+MUX_OPS(clk_pxa27x_core, "core", CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static unsigned long clk_pxa27x_run_get_rate(struct clk_hw *hw,</div><div class='ctx'> 					     unsigned long parent_rate)</div><div class='hunk'>@@ -273,9 +372,10 @@ RATE_RO_OPS(clk_pxa27x_run, "run");</div><div class='ctx'> </div><div class='ctx'> static void __init pxa27x_register_core(void)</div><div class='ctx'> {</div><div class='del'>-	clk_register_clk_pxa27x_cpll();</div><div class='del'>-	clk_register_clk_pxa27x_run();</div><div class='del'>-</div><div class='add'>+	clkdev_pxa_register(CLK_NONE, "cpll", NULL,</div><div class='add'>+			    clk_register_clk_pxa27x_cpll());</div><div class='add'>+	clkdev_pxa_register(CLK_NONE, "run", NULL,</div><div class='add'>+			    clk_register_clk_pxa27x_run());</div><div class='ctx'> 	clkdev_pxa_register(CLK_CORE, "core", NULL,</div><div class='ctx'> 			    clk_register_clk_pxa27x_core());</div><div class='ctx'> }</div><div class='hunk'>@@ -294,9 +394,9 @@ static unsigned long clk_pxa27x_system_bus_get_rate(struct clk_hw *hw,</div><div class='ctx'> 	if (osc_forced)</div><div class='ctx'> 		return parent_rate;</div><div class='ctx'> 	if (b)</div><div class='del'>-		return parent_rate / 2;</div><div class='del'>-	else</div><div class='ctx'> 		return parent_rate;</div><div class='add'>+	else</div><div class='add'>+		return parent_rate / 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 clk_pxa27x_system_bus_get_parent(struct clk_hw *hw)</div><div class='hunk'>@@ -385,8 +485,10 @@ static void __init pxa27x_base_clocks_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	pxa27x_register_plls();</div><div class='ctx'> 	pxa27x_register_core();</div><div class='del'>-	clk_register_clk_pxa27x_system_bus();</div><div class='del'>-	clk_register_clk_pxa27x_memory();</div><div class='add'>+	clkdev_pxa_register(CLK_NONE, "system_bus", NULL,</div><div class='add'>+			    clk_register_clk_pxa27x_system_bus());</div><div class='add'>+	clkdev_pxa_register(CLK_NONE, "memory", NULL,</div><div class='add'>+			    clk_register_clk_pxa27x_memory());</div><div class='ctx'> 	clk_register_clk_pxa27x_lcd_base();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig<br/>index 0146d3c2547f..5fb8d7430908 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/Kconfig</a></div><div class='hunk'>@@ -2,6 +2,9 @@ config QCOM_GDSC</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PM_GENERIC_DOMAINS if PM</div><div class='ctx'> </div><div class='add'>+config QCOM_RPMCC</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config COMMON_CLK_QCOM</div><div class='ctx'> 	tristate "Support for Qualcomm's clock controllers"</div><div class='ctx'> 	depends on OF</div><div class='hunk'>@@ -9,6 +12,32 @@ config COMMON_CLK_QCOM</div><div class='ctx'> 	select REGMAP_MMIO</div><div class='ctx'> 	select RESET_CONTROLLER</div><div class='ctx'> </div><div class='add'>+config QCOM_CLK_RPM</div><div class='add'>+	tristate "RPM based Clock Controller"</div><div class='add'>+	depends on COMMON_CLK_QCOM &amp;&amp; MFD_QCOM_RPM</div><div class='add'>+	select QCOM_RPMCC</div><div class='add'>+	help</div><div class='add'>+	  The RPM (Resource Power Manager) is a dedicated hardware engine for</div><div class='add'>+	  managing the shared SoC resources in order to keep the lowest power</div><div class='add'>+	  profile. It communicates with other hardware subsystems via shared</div><div class='add'>+	  memory and accepts clock requests, aggregates the requests and turns</div><div class='add'>+	  the clocks on/off or scales them on demand.</div><div class='add'>+	  Say Y if you want to support the clocks exposed by the RPM on</div><div class='add'>+	  platforms such as apq8064, msm8660, msm8960 etc.</div><div class='add'>+</div><div class='add'>+config QCOM_CLK_SMD_RPM</div><div class='add'>+	tristate "RPM over SMD based Clock Controller"</div><div class='add'>+	depends on COMMON_CLK_QCOM &amp;&amp; QCOM_SMD_RPM</div><div class='add'>+	select QCOM_RPMCC</div><div class='add'>+	help</div><div class='add'>+	  The RPM (Resource Power Manager) is a dedicated hardware engine for</div><div class='add'>+	  managing the shared SoC resources in order to keep the lowest power</div><div class='add'>+	  profile. It communicates with other hardware subsystems via shared</div><div class='add'>+	  memory and accepts clock requests, aggregates the requests and turns</div><div class='add'>+	  the clocks on/off or scales them on demand.</div><div class='add'>+	  Say Y if you want to support the clocks exposed by the RPM on</div><div class='add'>+	  platforms such as apq8016, apq8084, msm8974 etc.</div><div class='add'>+</div><div class='ctx'> config APQ_GCC_8084</div><div class='ctx'> 	tristate "APQ8084 Global Clock Controller"</div><div class='ctx'> 	select QCOM_GDSC</div><div class='hunk'>@@ -132,6 +161,14 @@ config MSM_MMCC_8974</div><div class='ctx'> 	  Say Y if you want to support multimedia devices such as display,</div><div class='ctx'> 	  graphics, video encode/decode, camera, etc.</div><div class='ctx'> </div><div class='add'>+config MSM_GCC_8994</div><div class='add'>+	tristate "MSM8994 Global Clock Controller"</div><div class='add'>+	depends on COMMON_CLK_QCOM</div><div class='add'>+	help</div><div class='add'>+	  Support for the global clock controller on msm8994 devices.</div><div class='add'>+	  Say Y if you want to use peripheral devices such as UART, SPI,</div><div class='add'>+	  i2c, USB, UFS, SD/eMMC, PCIe, etc.</div><div class='add'>+</div><div class='ctx'> config MSM_GCC_8996</div><div class='ctx'> 	tristate "MSM8996 Global Clock Controller"</div><div class='ctx'> 	select QCOM_GDSC</div><div class='head'>diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile<br/>index 1fb1f5476cb0..1c3e222b917b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/Makefile</a></div><div class='hunk'>@@ -24,8 +24,11 @@ obj-$(CONFIG_MSM_GCC_8660) += gcc-msm8660.o</div><div class='ctx'> obj-$(CONFIG_MSM_GCC_8916) += gcc-msm8916.o</div><div class='ctx'> obj-$(CONFIG_MSM_GCC_8960) += gcc-msm8960.o</div><div class='ctx'> obj-$(CONFIG_MSM_GCC_8974) += gcc-msm8974.o</div><div class='add'>+obj-$(CONFIG_MSM_GCC_8994) += gcc-msm8994.o</div><div class='ctx'> obj-$(CONFIG_MSM_GCC_8996) += gcc-msm8996.o</div><div class='ctx'> obj-$(CONFIG_MSM_LCC_8960) += lcc-msm8960.o</div><div class='ctx'> obj-$(CONFIG_MSM_MMCC_8960) += mmcc-msm8960.o</div><div class='ctx'> obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8974.o</div><div class='ctx'> obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm8996.o</div><div class='add'>+obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o</div><div class='add'>+obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o</div><div class='head'>diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c<br/>index e6a03eaf7a93..47a1da3739ce 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/clk-alpha-pll.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/clk-alpha-pll.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/clk-alpha-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-alpha-pll.c</a></div><div class='hunk'>@@ -18,17 +18,21 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "clk-alpha-pll.h"</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #define PLL_MODE		0x00</div><div class='ctx'> # define PLL_OUTCTRL		BIT(0)</div><div class='ctx'> # define PLL_BYPASSNL		BIT(1)</div><div class='ctx'> # define PLL_RESET_N		BIT(2)</div><div class='add'>+# define PLL_OFFLINE_REQ	BIT(7)</div><div class='ctx'> # define PLL_LOCK_COUNT_SHIFT	8</div><div class='ctx'> # define PLL_LOCK_COUNT_MASK	0x3f</div><div class='ctx'> # define PLL_BIAS_COUNT_SHIFT	14</div><div class='ctx'> # define PLL_BIAS_COUNT_MASK	0x3f</div><div class='ctx'> # define PLL_VOTE_FSM_ENA	BIT(20)</div><div class='add'>+# define PLL_FSM_ENA		BIT(20)</div><div class='ctx'> # define PLL_VOTE_FSM_RESET	BIT(21)</div><div class='add'>+# define PLL_OFFLINE_ACK	BIT(28)</div><div class='ctx'> # define PLL_ACTIVE_FLAG	BIT(30)</div><div class='ctx'> # define PLL_LOCK_DET		BIT(31)</div><div class='ctx'> </div><div class='hunk'>@@ -46,6 +50,7 @@</div><div class='ctx'> #define PLL_USER_CTL_U		0x14</div><div class='ctx'> </div><div class='ctx'> #define PLL_CONFIG_CTL		0x18</div><div class='add'>+#define PLL_CONFIG_CTL_U	0x20</div><div class='ctx'> #define PLL_TEST_CTL		0x1c</div><div class='ctx'> #define PLL_TEST_CTL_U		0x20</div><div class='ctx'> #define PLL_STATUS		0x24</div><div class='hunk'>@@ -55,6 +60,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define ALPHA_REG_BITWIDTH	40</div><div class='ctx'> #define ALPHA_BITWIDTH		32</div><div class='add'>+#define ALPHA_16BIT_MASK	0xffff</div><div class='ctx'> </div><div class='ctx'> #define to_clk_alpha_pll(_hw) container_of(to_clk_regmap(_hw), \</div><div class='ctx'> 					   struct clk_alpha_pll, clkr)</div><div class='hunk'>@@ -62,9 +68,10 @@</div><div class='ctx'> #define to_clk_alpha_pll_postdiv(_hw) container_of(to_clk_regmap(_hw), \</div><div class='ctx'> 					   struct clk_alpha_pll_postdiv, clkr)</div><div class='ctx'> </div><div class='del'>-static int wait_for_pll(struct clk_alpha_pll *pll)</div><div class='add'>+static int wait_for_pll(struct clk_alpha_pll *pll, u32 mask, bool inverse,</div><div class='add'>+			const char *action)</div><div class='ctx'> {</div><div class='del'>-	u32 val, mask, off;</div><div class='add'>+	u32 val, off;</div><div class='ctx'> 	int count;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	const char *name = clk_hw_get_name(&amp;pll-&gt;clkr.hw);</div><div class='hunk'>@@ -74,26 +81,148 @@ static int wait_for_pll(struct clk_alpha_pll *pll)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (val &amp; PLL_VOTE_FSM_ENA)</div><div class='del'>-		mask = PLL_ACTIVE_FLAG;</div><div class='del'>-	else</div><div class='del'>-		mask = PLL_LOCK_DET;</div><div class='del'>-</div><div class='del'>-	/* Wait for pll to enable. */</div><div class='ctx'> 	for (count = 100; count &gt; 0; count--) {</div><div class='ctx'> 		ret = regmap_read(pll-&gt;clkr.regmap, off + PLL_MODE, &amp;val);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		if ((val &amp; mask) == mask)</div><div class='add'>+		if (inverse &amp;&amp; !(val &amp; mask))</div><div class='add'>+			return 0;</div><div class='add'>+		else if ((val &amp; mask) == mask)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	WARN(1, "%s didn't enable after voting for it!\n", name);</div><div class='add'>+	WARN(1, "%s failed to %s!\n", name, action);</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define wait_for_pll_enable_active(pll) \</div><div class='add'>+	wait_for_pll(pll, PLL_ACTIVE_FLAG, 0, "enable")</div><div class='add'>+</div><div class='add'>+#define wait_for_pll_enable_lock(pll) \</div><div class='add'>+	wait_for_pll(pll, PLL_LOCK_DET, 0, "enable")</div><div class='add'>+</div><div class='add'>+#define wait_for_pll_disable(pll) \</div><div class='add'>+	wait_for_pll(pll, PLL_ACTIVE_FLAG, 1, "disable")</div><div class='add'>+</div><div class='add'>+#define wait_for_pll_offline(pll) \</div><div class='add'>+	wait_for_pll(pll, PLL_OFFLINE_ACK, 0, "offline")</div><div class='add'>+</div><div class='add'>+void clk_alpha_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,</div><div class='add'>+			     const struct alpha_pll_config *config)</div><div class='add'>+{</div><div class='add'>+	u32 val, mask;</div><div class='add'>+	u32 off = pll-&gt;offset;</div><div class='add'>+</div><div class='add'>+	regmap_write(regmap, off + PLL_L_VAL, config-&gt;l);</div><div class='add'>+	regmap_write(regmap, off + PLL_ALPHA_VAL, config-&gt;alpha);</div><div class='add'>+	regmap_write(regmap, off + PLL_CONFIG_CTL, config-&gt;config_ctl_val);</div><div class='add'>+	regmap_write(regmap, off + PLL_CONFIG_CTL_U, config-&gt;config_ctl_hi_val);</div><div class='add'>+</div><div class='add'>+	val = config-&gt;main_output_mask;</div><div class='add'>+	val |= config-&gt;aux_output_mask;</div><div class='add'>+	val |= config-&gt;aux2_output_mask;</div><div class='add'>+	val |= config-&gt;early_output_mask;</div><div class='add'>+	val |= config-&gt;pre_div_val;</div><div class='add'>+	val |= config-&gt;post_div_val;</div><div class='add'>+	val |= config-&gt;vco_val;</div><div class='add'>+</div><div class='add'>+	mask = config-&gt;main_output_mask;</div><div class='add'>+	mask |= config-&gt;aux_output_mask;</div><div class='add'>+	mask |= config-&gt;aux2_output_mask;</div><div class='add'>+	mask |= config-&gt;early_output_mask;</div><div class='add'>+	mask |= config-&gt;pre_div_mask;</div><div class='add'>+	mask |= config-&gt;post_div_mask;</div><div class='add'>+	mask |= config-&gt;vco_mask;</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(regmap, off + PLL_USER_CTL, mask, val);</div><div class='add'>+</div><div class='add'>+	if (pll-&gt;flags &amp; SUPPORTS_FSM_MODE)</div><div class='add'>+		qcom_pll_set_fsm_mode(regmap, off + PLL_MODE, 6, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_alpha_pll_hwfsm_enable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val, off;</div><div class='add'>+	struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);</div><div class='add'>+</div><div class='add'>+	off = pll-&gt;offset;</div><div class='add'>+	ret = regmap_read(pll-&gt;clkr.regmap, off + PLL_MODE, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val |= PLL_FSM_ENA;</div><div class='add'>+</div><div class='add'>+	if (pll-&gt;flags &amp; SUPPORTS_OFFLINE_REQ)</div><div class='add'>+		val &amp;= ~PLL_OFFLINE_REQ;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(pll-&gt;clkr.regmap, off + PLL_MODE, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Make sure enable request goes through before waiting for update */</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	return wait_for_pll_enable_active(pll);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clk_alpha_pll_hwfsm_disable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val, off;</div><div class='add'>+	struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);</div><div class='add'>+</div><div class='add'>+	off = pll-&gt;offset;</div><div class='add'>+	ret = regmap_read(pll-&gt;clkr.regmap, off + PLL_MODE, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pll-&gt;flags &amp; SUPPORTS_OFFLINE_REQ) {</div><div class='add'>+		ret = regmap_update_bits(pll-&gt;clkr.regmap, off + PLL_MODE,</div><div class='add'>+					 PLL_OFFLINE_REQ, PLL_OFFLINE_REQ);</div><div class='add'>+		if (ret)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		ret = wait_for_pll_offline(pll);</div><div class='add'>+		if (ret)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable hwfsm */</div><div class='add'>+	ret = regmap_update_bits(pll-&gt;clkr.regmap, off + PLL_MODE,</div><div class='add'>+				 PLL_FSM_ENA, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wait_for_pll_disable(pll);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pll_is_enabled(struct clk_hw *hw, u32 mask)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val, off;</div><div class='add'>+	struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);</div><div class='add'>+</div><div class='add'>+	off = pll-&gt;offset;</div><div class='add'>+	ret = regmap_read(pll-&gt;clkr.regmap, off + PLL_MODE, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return !!(val &amp; mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_alpha_pll_hwfsm_is_enabled(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	return pll_is_enabled(hw, PLL_ACTIVE_FLAG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_alpha_pll_is_enabled(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	return pll_is_enabled(hw, PLL_LOCK_DET);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int clk_alpha_pll_enable(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -112,7 +241,7 @@ static int clk_alpha_pll_enable(struct clk_hw *hw)</div><div class='ctx'> 		ret = clk_enable_regmap(hw);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		return wait_for_pll(pll);</div><div class='add'>+		return wait_for_pll_enable_active(pll);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Skip if already enabled */</div><div class='hunk'>@@ -136,7 +265,7 @@ static int clk_alpha_pll_enable(struct clk_hw *hw)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = wait_for_pll(pll);</div><div class='add'>+	ret = wait_for_pll_enable_lock(pll);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -234,9 +363,14 @@ clk_alpha_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)</div><div class='ctx'> 	regmap_read(pll-&gt;clkr.regmap, off + PLL_USER_CTL, &amp;ctl);</div><div class='ctx'> 	if (ctl &amp; PLL_ALPHA_EN) {</div><div class='ctx'> 		regmap_read(pll-&gt;clkr.regmap, off + PLL_ALPHA_VAL, &amp;low);</div><div class='del'>-		regmap_read(pll-&gt;clkr.regmap, off + PLL_ALPHA_VAL_U, &amp;high);</div><div class='del'>-		a = (u64)high &lt;&lt; 32 | low;</div><div class='del'>-		a &gt;&gt;= ALPHA_REG_BITWIDTH - ALPHA_BITWIDTH;</div><div class='add'>+		if (pll-&gt;flags &amp; SUPPORTS_16BIT_ALPHA) {</div><div class='add'>+			a = low &amp; ALPHA_16BIT_MASK;</div><div class='add'>+		} else {</div><div class='add'>+			regmap_read(pll-&gt;clkr.regmap, off + PLL_ALPHA_VAL_U,</div><div class='add'>+				    &amp;high);</div><div class='add'>+			a = (u64)high &lt;&lt; 32 | low;</div><div class='add'>+			a &gt;&gt;= ALPHA_REG_BITWIDTH - ALPHA_BITWIDTH;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return alpha_pll_calc_rate(prate, l, a);</div><div class='hunk'>@@ -257,11 +391,15 @@ static int clk_alpha_pll_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	a &lt;&lt;= (ALPHA_REG_BITWIDTH - ALPHA_BITWIDTH);</div><div class='del'>-</div><div class='ctx'> 	regmap_write(pll-&gt;clkr.regmap, off + PLL_L_VAL, l);</div><div class='del'>-	regmap_write(pll-&gt;clkr.regmap, off + PLL_ALPHA_VAL, a);</div><div class='del'>-	regmap_write(pll-&gt;clkr.regmap, off + PLL_ALPHA_VAL_U, a &gt;&gt; 32);</div><div class='add'>+</div><div class='add'>+	if (pll-&gt;flags &amp; SUPPORTS_16BIT_ALPHA) {</div><div class='add'>+		regmap_write(pll-&gt;clkr.regmap, off + PLL_ALPHA_VAL,</div><div class='add'>+			     a &amp; ALPHA_16BIT_MASK);</div><div class='add'>+	} else {</div><div class='add'>+		a &lt;&lt;= (ALPHA_REG_BITWIDTH - ALPHA_BITWIDTH);</div><div class='add'>+		regmap_write(pll-&gt;clkr.regmap, off + PLL_ALPHA_VAL_U, a &gt;&gt; 32);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	regmap_update_bits(pll-&gt;clkr.regmap, off + PLL_USER_CTL,</div><div class='ctx'> 			   PLL_VCO_MASK &lt;&lt; PLL_VCO_SHIFT,</div><div class='hunk'>@@ -294,12 +432,23 @@ static long clk_alpha_pll_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> const struct clk_ops clk_alpha_pll_ops = {</div><div class='ctx'> 	.enable = clk_alpha_pll_enable,</div><div class='ctx'> 	.disable = clk_alpha_pll_disable,</div><div class='add'>+	.is_enabled = clk_alpha_pll_is_enabled,</div><div class='ctx'> 	.recalc_rate = clk_alpha_pll_recalc_rate,</div><div class='ctx'> 	.round_rate = clk_alpha_pll_round_rate,</div><div class='ctx'> 	.set_rate = clk_alpha_pll_set_rate,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(clk_alpha_pll_ops);</div><div class='ctx'> </div><div class='add'>+const struct clk_ops clk_alpha_pll_hwfsm_ops = {</div><div class='add'>+	.enable = clk_alpha_pll_hwfsm_enable,</div><div class='add'>+	.disable = clk_alpha_pll_hwfsm_disable,</div><div class='add'>+	.is_enabled = clk_alpha_pll_hwfsm_is_enabled,</div><div class='add'>+	.recalc_rate = clk_alpha_pll_recalc_rate,</div><div class='add'>+	.round_rate = clk_alpha_pll_round_rate,</div><div class='add'>+	.set_rate = clk_alpha_pll_set_rate,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(clk_alpha_pll_hwfsm_ops);</div><div class='add'>+</div><div class='ctx'> static unsigned long</div><div class='ctx'> clk_alpha_pll_postdiv_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/clk/qcom/clk-alpha-pll.h b/drivers/clk/qcom/clk-alpha-pll.h<br/>index 90ce2016e1a0..d6e1ee2c7348 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/clk-alpha-pll.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/clk-alpha-pll.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/clk-alpha-pll.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-alpha-pll.h</a></div><div class='hunk'>@@ -34,6 +34,10 @@ struct clk_alpha_pll {</div><div class='ctx'> </div><div class='ctx'> 	const struct pll_vco *vco_table;</div><div class='ctx'> 	size_t num_vco;</div><div class='add'>+#define SUPPORTS_OFFLINE_REQ	BIT(0)</div><div class='add'>+#define SUPPORTS_16BIT_ALPHA	BIT(1)</div><div class='add'>+#define SUPPORTS_FSM_MODE	BIT(2)</div><div class='add'>+	u8 flags;</div><div class='ctx'> </div><div class='ctx'> 	struct clk_regmap clkr;</div><div class='ctx'> };</div><div class='hunk'>@@ -51,7 +55,28 @@ struct clk_alpha_pll_postdiv {</div><div class='ctx'> 	struct clk_regmap clkr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct alpha_pll_config {</div><div class='add'>+	u32 l;</div><div class='add'>+	u32 alpha;</div><div class='add'>+	u32 config_ctl_val;</div><div class='add'>+	u32 config_ctl_hi_val;</div><div class='add'>+	u32 main_output_mask;</div><div class='add'>+	u32 aux_output_mask;</div><div class='add'>+	u32 aux2_output_mask;</div><div class='add'>+	u32 early_output_mask;</div><div class='add'>+	u32 pre_div_val;</div><div class='add'>+	u32 pre_div_mask;</div><div class='add'>+	u32 post_div_val;</div><div class='add'>+	u32 post_div_mask;</div><div class='add'>+	u32 vco_val;</div><div class='add'>+	u32 vco_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> extern const struct clk_ops clk_alpha_pll_ops;</div><div class='add'>+extern const struct clk_ops clk_alpha_pll_hwfsm_ops;</div><div class='ctx'> extern const struct clk_ops clk_alpha_pll_postdiv_ops;</div><div class='ctx'> </div><div class='add'>+void clk_alpha_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,</div><div class='add'>+			     const struct alpha_pll_config *config);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/clk/qcom/clk-pll.c b/drivers/clk/qcom/clk-pll.c<br/>index 5b940d629045..cb6cb8710daf 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/clk-pll.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/clk-pll.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/clk-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-pll.c</a></div><div class='hunk'>@@ -23,16 +23,11 @@</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "clk-pll.h"</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #define PLL_OUTCTRL		BIT(0)</div><div class='ctx'> #define PLL_BYPASSNL		BIT(1)</div><div class='ctx'> #define PLL_RESET_N		BIT(2)</div><div class='del'>-#define PLL_LOCK_COUNT_SHIFT	8</div><div class='del'>-#define PLL_LOCK_COUNT_MASK	0x3f</div><div class='del'>-#define PLL_BIAS_COUNT_SHIFT	14</div><div class='del'>-#define PLL_BIAS_COUNT_MASK	0x3f</div><div class='del'>-#define PLL_VOTE_FSM_ENA	BIT(20)</div><div class='del'>-#define PLL_VOTE_FSM_RESET	BIT(21)</div><div class='ctx'> </div><div class='ctx'> static int clk_pll_enable(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='hunk'>@@ -228,26 +223,6 @@ const struct clk_ops clk_pll_vote_ops = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(clk_pll_vote_ops);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-clk_pll_set_fsm_mode(struct clk_pll *pll, struct regmap *regmap, u8 lock_count)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-	u32 mask;</div><div class='del'>-</div><div class='del'>-	/* De-assert reset to FSM */</div><div class='del'>-	regmap_update_bits(regmap, pll-&gt;mode_reg, PLL_VOTE_FSM_RESET, 0);</div><div class='del'>-</div><div class='del'>-	/* Program bias count and lock count */</div><div class='del'>-	val = 1 &lt;&lt; PLL_BIAS_COUNT_SHIFT | lock_count &lt;&lt; PLL_LOCK_COUNT_SHIFT;</div><div class='del'>-	mask = PLL_BIAS_COUNT_MASK &lt;&lt; PLL_BIAS_COUNT_SHIFT;</div><div class='del'>-	mask |= PLL_LOCK_COUNT_MASK &lt;&lt; PLL_LOCK_COUNT_SHIFT;</div><div class='del'>-	regmap_update_bits(regmap, pll-&gt;mode_reg, mask, val);</div><div class='del'>-</div><div class='del'>-	/* Enable PLL FSM voting */</div><div class='del'>-	regmap_update_bits(regmap, pll-&gt;mode_reg, PLL_VOTE_FSM_ENA,</div><div class='del'>-		PLL_VOTE_FSM_ENA);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void clk_pll_configure(struct clk_pll *pll, struct regmap *regmap,</div><div class='ctx'> 	const struct pll_config *config)</div><div class='ctx'> {</div><div class='hunk'>@@ -280,7 +255,7 @@ void clk_pll_configure_sr(struct clk_pll *pll, struct regmap *regmap,</div><div class='ctx'> {</div><div class='ctx'> 	clk_pll_configure(pll, regmap, config);</div><div class='ctx'> 	if (fsm_mode)</div><div class='del'>-		clk_pll_set_fsm_mode(pll, regmap, 8);</div><div class='add'>+		qcom_pll_set_fsm_mode(regmap, pll-&gt;mode_reg, 1, 8);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(clk_pll_configure_sr);</div><div class='ctx'> </div><div class='hunk'>@@ -289,7 +264,7 @@ void clk_pll_configure_sr_hpm_lp(struct clk_pll *pll, struct regmap *regmap,</div><div class='ctx'> {</div><div class='ctx'> 	clk_pll_configure(pll, regmap, config);</div><div class='ctx'> 	if (fsm_mode)</div><div class='del'>-		clk_pll_set_fsm_mode(pll, regmap, 0);</div><div class='add'>+		qcom_pll_set_fsm_mode(regmap, pll-&gt;mode_reg, 1, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(clk_pll_configure_sr_hpm_lp);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h<br/>index b904c335cda4..1b3e8d265bdb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/clk-rcg.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/clk-rcg.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/clk-rcg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-rcg.h</a></div><div class='hunk'>@@ -173,6 +173,7 @@ struct clk_rcg2 {</div><div class='ctx'> #define to_clk_rcg2(_hw) container_of(to_clk_regmap(_hw), struct clk_rcg2, clkr)</div><div class='ctx'> </div><div class='ctx'> extern const struct clk_ops clk_rcg2_ops;</div><div class='add'>+extern const struct clk_ops clk_rcg2_floor_ops;</div><div class='ctx'> extern const struct clk_ops clk_rcg2_shared_ops;</div><div class='ctx'> extern const struct clk_ops clk_edp_pixel_ops;</div><div class='ctx'> extern const struct clk_ops clk_byte_ops;</div><div class='head'>diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c<br/>index a071bba8018c..1a0985ae20d2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/clk-rcg2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/clk-rcg2.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/clk-rcg2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-rcg2.c</a></div><div class='hunk'>@@ -47,6 +47,11 @@</div><div class='ctx'> #define N_REG			0xc</div><div class='ctx'> #define D_REG			0x10</div><div class='ctx'> </div><div class='add'>+enum freq_policy {</div><div class='add'>+	FLOOR,</div><div class='add'>+	CEIL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int clk_rcg2_is_enabled(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk_rcg2 *rcg = to_clk_rcg2(hw);</div><div class='hunk'>@@ -176,15 +181,26 @@ clk_rcg2_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)</div><div class='ctx'> 	return calc_rate(parent_rate, m, n, mode, hid_div);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _freq_tbl_determine_rate(struct clk_hw *hw,</div><div class='del'>-		const struct freq_tbl *f, struct clk_rate_request *req)</div><div class='add'>+static int _freq_tbl_determine_rate(struct clk_hw *hw, const struct freq_tbl *f,</div><div class='add'>+				    struct clk_rate_request *req,</div><div class='add'>+				    enum freq_policy policy)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long clk_flags, rate = req-&gt;rate;</div><div class='ctx'> 	struct clk_hw *p;</div><div class='ctx'> 	struct clk_rcg2 *rcg = to_clk_rcg2(hw);</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='del'>-	f = qcom_find_freq(f, rate);</div><div class='add'>+	switch (policy) {</div><div class='add'>+	case FLOOR:</div><div class='add'>+		f = qcom_find_freq_floor(f, rate);</div><div class='add'>+		break;</div><div class='add'>+	case CEIL:</div><div class='add'>+		f = qcom_find_freq(f, rate);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	if (!f)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +237,15 @@ static int clk_rcg2_determine_rate(struct clk_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct clk_rcg2 *rcg = to_clk_rcg2(hw);</div><div class='ctx'> </div><div class='del'>-	return _freq_tbl_determine_rate(hw, rcg-&gt;freq_tbl, req);</div><div class='add'>+	return _freq_tbl_determine_rate(hw, rcg-&gt;freq_tbl, req, CEIL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_rcg2_determine_floor_rate(struct clk_hw *hw,</div><div class='add'>+					 struct clk_rate_request *req)</div><div class='add'>+{</div><div class='add'>+	struct clk_rcg2 *rcg = to_clk_rcg2(hw);</div><div class='add'>+</div><div class='add'>+	return _freq_tbl_determine_rate(hw, rcg-&gt;freq_tbl, req, FLOOR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)</div><div class='hunk'>@@ -265,12 +289,23 @@ static int clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)</div><div class='ctx'> 	return update_config(rcg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate)</div><div class='add'>+static int __clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+			       enum freq_policy policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk_rcg2 *rcg = to_clk_rcg2(hw);</div><div class='ctx'> 	const struct freq_tbl *f;</div><div class='ctx'> </div><div class='del'>-	f = qcom_find_freq(rcg-&gt;freq_tbl, rate);</div><div class='add'>+	switch (policy) {</div><div class='add'>+	case FLOOR:</div><div class='add'>+		f = qcom_find_freq_floor(rcg-&gt;freq_tbl, rate);</div><div class='add'>+		break;</div><div class='add'>+	case CEIL:</div><div class='add'>+		f = qcom_find_freq(rcg-&gt;freq_tbl, rate);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	if (!f)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -280,13 +315,25 @@ static int __clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate)</div><div class='ctx'> static int clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 			    unsigned long parent_rate)</div><div class='ctx'> {</div><div class='del'>-	return __clk_rcg2_set_rate(hw, rate);</div><div class='add'>+	return __clk_rcg2_set_rate(hw, rate, CEIL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_rcg2_set_floor_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				   unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	return __clk_rcg2_set_rate(hw, rate, FLOOR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int clk_rcg2_set_rate_and_parent(struct clk_hw *hw,</div><div class='ctx'> 		unsigned long rate, unsigned long parent_rate, u8 index)</div><div class='ctx'> {</div><div class='del'>-	return __clk_rcg2_set_rate(hw, rate);</div><div class='add'>+	return __clk_rcg2_set_rate(hw, rate, CEIL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_rcg2_set_floor_rate_and_parent(struct clk_hw *hw,</div><div class='add'>+		unsigned long rate, unsigned long parent_rate, u8 index)</div><div class='add'>+{</div><div class='add'>+	return __clk_rcg2_set_rate(hw, rate, FLOOR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct clk_ops clk_rcg2_ops = {</div><div class='hunk'>@@ -300,6 +347,17 @@ const struct clk_ops clk_rcg2_ops = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(clk_rcg2_ops);</div><div class='ctx'> </div><div class='add'>+const struct clk_ops clk_rcg2_floor_ops = {</div><div class='add'>+	.is_enabled = clk_rcg2_is_enabled,</div><div class='add'>+	.get_parent = clk_rcg2_get_parent,</div><div class='add'>+	.set_parent = clk_rcg2_set_parent,</div><div class='add'>+	.recalc_rate = clk_rcg2_recalc_rate,</div><div class='add'>+	.determine_rate = clk_rcg2_determine_floor_rate,</div><div class='add'>+	.set_rate = clk_rcg2_set_floor_rate,</div><div class='add'>+	.set_rate_and_parent = clk_rcg2_set_floor_rate_and_parent,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(clk_rcg2_floor_ops);</div><div class='add'>+</div><div class='ctx'> static int clk_rcg2_shared_force_enable(struct clk_hw *hw, unsigned long rate)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk_rcg2 *rcg = to_clk_rcg2(hw);</div><div class='hunk'>@@ -323,7 +381,7 @@ static int clk_rcg2_shared_force_enable(struct clk_hw *hw, unsigned long rate)</div><div class='ctx'> 		pr_err("%s: RCG did not turn on\n", name);</div><div class='ctx'> </div><div class='ctx'> 	/* set clock rate */</div><div class='del'>-	ret = __clk_rcg2_set_rate(hw, rate);</div><div class='add'>+	ret = __clk_rcg2_set_rate(hw, rate, CEIL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/qcom/clk-rpm.c b/drivers/clk/qcom/clk-rpm.c<br/>new file mode 100644<br/>index 000000000000..df3e5fe8442a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/clk-rpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-rpm.c</a></div><div class='hunk'>@@ -0,0 +1,497 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016, Linaro Limited</div><div class='add'>+ * Copyright (c) 2014, The Linux Foundation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/mfd/qcom_rpm.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/mfd/qcom-rpm.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/qcom,rpmcc.h&gt;</div><div class='add'>+</div><div class='add'>+#define QCOM_RPM_MISC_CLK_TYPE				0x306b6c63</div><div class='add'>+#define QCOM_RPM_SCALING_ENABLE_ID			0x2</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLK_RPM(_platform, _name, _active, r_id)			      \</div><div class='add'>+	static struct clk_rpm _platform##_##_active;			      \</div><div class='add'>+	static struct clk_rpm _platform##_##_name = {			      \</div><div class='add'>+		.rpm_clk_id = (r_id),					      \</div><div class='add'>+		.peer = &amp;_platform##_##_active,				      \</div><div class='add'>+		.rate = INT_MAX,					      \</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){			      \</div><div class='add'>+			.ops = &amp;clk_rpm_ops,				      \</div><div class='add'>+			.name = #_name,					      \</div><div class='add'>+			.parent_names = (const char *[]){ "pxo_board" },      \</div><div class='add'>+			.num_parents = 1,				      \</div><div class='add'>+		},							      \</div><div class='add'>+	};								      \</div><div class='add'>+	static struct clk_rpm _platform##_##_active = {			      \</div><div class='add'>+		.rpm_clk_id = (r_id),					      \</div><div class='add'>+		.peer = &amp;_platform##_##_name,				      \</div><div class='add'>+		.active_only = true,					      \</div><div class='add'>+		.rate = INT_MAX,					      \</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){			      \</div><div class='add'>+			.ops = &amp;clk_rpm_ops,				      \</div><div class='add'>+			.name = #_active,				      \</div><div class='add'>+			.parent_names = (const char *[]){ "pxo_board" },      \</div><div class='add'>+			.num_parents = 1,				      \</div><div class='add'>+		},							      \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLK_RPM_PXO_BRANCH(_platform, _name, _active, r_id, r)	      \</div><div class='add'>+	static struct clk_rpm _platform##_##_active;			      \</div><div class='add'>+	static struct clk_rpm _platform##_##_name = {			      \</div><div class='add'>+		.rpm_clk_id = (r_id),					      \</div><div class='add'>+		.active_only = true,					      \</div><div class='add'>+		.peer = &amp;_platform##_##_active,				      \</div><div class='add'>+		.rate = (r),						      \</div><div class='add'>+		.branch = true,						      \</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){			      \</div><div class='add'>+			.ops = &amp;clk_rpm_branch_ops,			      \</div><div class='add'>+			.name = #_name,					      \</div><div class='add'>+			.parent_names = (const char *[]){ "pxo_board" },      \</div><div class='add'>+			.num_parents = 1,				      \</div><div class='add'>+		},							      \</div><div class='add'>+	};								      \</div><div class='add'>+	static struct clk_rpm _platform##_##_active = {			      \</div><div class='add'>+		.rpm_clk_id = (r_id),					      \</div><div class='add'>+		.peer = &amp;_platform##_##_name,				      \</div><div class='add'>+		.rate = (r),						      \</div><div class='add'>+		.branch = true,						      \</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){			      \</div><div class='add'>+			.ops = &amp;clk_rpm_branch_ops,			      \</div><div class='add'>+			.name = #_active,				      \</div><div class='add'>+			.parent_names = (const char *[]){ "pxo_board" },      \</div><div class='add'>+			.num_parents = 1,				      \</div><div class='add'>+		},							      \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLK_RPM_CXO_BRANCH(_platform, _name, _active, r_id, r)	      \</div><div class='add'>+	static struct clk_rpm _platform##_##_active;			      \</div><div class='add'>+	static struct clk_rpm _platform##_##_name = {			      \</div><div class='add'>+		.rpm_clk_id = (r_id),					      \</div><div class='add'>+		.peer = &amp;_platform##_##_active,				      \</div><div class='add'>+		.rate = (r),						      \</div><div class='add'>+		.branch = true,						      \</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){			      \</div><div class='add'>+			.ops = &amp;clk_rpm_branch_ops,			      \</div><div class='add'>+			.name = #_name,					      \</div><div class='add'>+			.parent_names = (const char *[]){ "cxo_board" },      \</div><div class='add'>+			.num_parents = 1,				      \</div><div class='add'>+		},							      \</div><div class='add'>+	};								      \</div><div class='add'>+	static struct clk_rpm _platform##_##_active = {			      \</div><div class='add'>+		.rpm_clk_id = (r_id),					      \</div><div class='add'>+		.active_only = true,					      \</div><div class='add'>+		.peer = &amp;_platform##_##_name,				      \</div><div class='add'>+		.rate = (r),						      \</div><div class='add'>+		.branch = true,						      \</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){			      \</div><div class='add'>+			.ops = &amp;clk_rpm_branch_ops,			      \</div><div class='add'>+			.name = #_active,				      \</div><div class='add'>+			.parent_names = (const char *[]){ "cxo_board" },      \</div><div class='add'>+			.num_parents = 1,				      \</div><div class='add'>+		},							      \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define to_clk_rpm(_hw) container_of(_hw, struct clk_rpm, hw)</div><div class='add'>+</div><div class='add'>+struct clk_rpm {</div><div class='add'>+	const int rpm_clk_id;</div><div class='add'>+	const bool active_only;</div><div class='add'>+	unsigned long rate;</div><div class='add'>+	bool enabled;</div><div class='add'>+	bool branch;</div><div class='add'>+	struct clk_rpm *peer;</div><div class='add'>+	struct clk_hw hw;</div><div class='add'>+	struct qcom_rpm *rpm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rpm_cc {</div><div class='add'>+	struct qcom_rpm *rpm;</div><div class='add'>+	struct clk_rpm **clks;</div><div class='add'>+	size_t num_clks;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rpm_clk_desc {</div><div class='add'>+	struct clk_rpm **clks;</div><div class='add'>+	size_t num_clks;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(rpm_clk_lock);</div><div class='add'>+</div><div class='add'>+static int clk_rpm_handoff(struct clk_rpm *r)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 value = INT_MAX;</div><div class='add'>+</div><div class='add'>+	ret = qcom_rpm_write(r-&gt;rpm, QCOM_RPM_ACTIVE_STATE,</div><div class='add'>+			     r-&gt;rpm_clk_id, &amp;value, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = qcom_rpm_write(r-&gt;rpm, QCOM_RPM_SLEEP_STATE,</div><div class='add'>+			     r-&gt;rpm_clk_id, &amp;value, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_rpm_set_rate_active(struct clk_rpm *r, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	u32 value = DIV_ROUND_UP(rate, 1000); /* to kHz */</div><div class='add'>+</div><div class='add'>+	return qcom_rpm_write(r-&gt;rpm, QCOM_RPM_ACTIVE_STATE,</div><div class='add'>+			      r-&gt;rpm_clk_id, &amp;value, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_rpm_set_rate_sleep(struct clk_rpm *r, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	u32 value = DIV_ROUND_UP(rate, 1000); /* to kHz */</div><div class='add'>+</div><div class='add'>+	return qcom_rpm_write(r-&gt;rpm, QCOM_RPM_SLEEP_STATE,</div><div class='add'>+			      r-&gt;rpm_clk_id, &amp;value, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void to_active_sleep(struct clk_rpm *r, unsigned long rate,</div><div class='add'>+			    unsigned long *active, unsigned long *sleep)</div><div class='add'>+{</div><div class='add'>+	*active = rate;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Active-only clocks don't care what the rate is during sleep. So,</div><div class='add'>+	 * they vote for zero.</div><div class='add'>+	 */</div><div class='add'>+	if (r-&gt;active_only)</div><div class='add'>+		*sleep = 0;</div><div class='add'>+	else</div><div class='add'>+		*sleep = *active;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_rpm_prepare(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct clk_rpm *r = to_clk_rpm(hw);</div><div class='add'>+	struct clk_rpm *peer = r-&gt;peer;</div><div class='add'>+	unsigned long this_rate = 0, this_sleep_rate = 0;</div><div class='add'>+	unsigned long peer_rate = 0, peer_sleep_rate = 0;</div><div class='add'>+	unsigned long active_rate, sleep_rate;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rpm_clk_lock);</div><div class='add'>+</div><div class='add'>+	/* Don't send requests to the RPM if the rate has not been set. */</div><div class='add'>+	if (!r-&gt;rate)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	to_active_sleep(r, r-&gt;rate, &amp;this_rate, &amp;this_sleep_rate);</div><div class='add'>+</div><div class='add'>+	/* Take peer clock's rate into account only if it's enabled. */</div><div class='add'>+	if (peer-&gt;enabled)</div><div class='add'>+		to_active_sleep(peer, peer-&gt;rate,</div><div class='add'>+				&amp;peer_rate, &amp;peer_sleep_rate);</div><div class='add'>+</div><div class='add'>+	active_rate = max(this_rate, peer_rate);</div><div class='add'>+</div><div class='add'>+	if (r-&gt;branch)</div><div class='add'>+		active_rate = !!active_rate;</div><div class='add'>+</div><div class='add'>+	ret = clk_rpm_set_rate_active(r, active_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sleep_rate = max(this_sleep_rate, peer_sleep_rate);</div><div class='add'>+	if (r-&gt;branch)</div><div class='add'>+		sleep_rate = !!sleep_rate;</div><div class='add'>+</div><div class='add'>+	ret = clk_rpm_set_rate_sleep(r, sleep_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		/* Undo the active set vote and restore it */</div><div class='add'>+		ret = clk_rpm_set_rate_active(r, peer_rate);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (!ret)</div><div class='add'>+		r-&gt;enabled = true;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rpm_clk_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clk_rpm_unprepare(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct clk_rpm *r = to_clk_rpm(hw);</div><div class='add'>+	struct clk_rpm *peer = r-&gt;peer;</div><div class='add'>+	unsigned long peer_rate = 0, peer_sleep_rate = 0;</div><div class='add'>+	unsigned long active_rate, sleep_rate;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rpm_clk_lock);</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;rate)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Take peer clock's rate into account only if it's enabled. */</div><div class='add'>+	if (peer-&gt;enabled)</div><div class='add'>+		to_active_sleep(peer, peer-&gt;rate, &amp;peer_rate,</div><div class='add'>+				&amp;peer_sleep_rate);</div><div class='add'>+</div><div class='add'>+	active_rate = r-&gt;branch ? !!peer_rate : peer_rate;</div><div class='add'>+	ret = clk_rpm_set_rate_active(r, active_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sleep_rate = r-&gt;branch ? !!peer_sleep_rate : peer_sleep_rate;</div><div class='add'>+	ret = clk_rpm_set_rate_sleep(r, sleep_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r-&gt;enabled = false;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;rpm_clk_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_rpm_set_rate(struct clk_hw *hw,</div><div class='add'>+			    unsigned long rate, unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_rpm *r = to_clk_rpm(hw);</div><div class='add'>+	struct clk_rpm *peer = r-&gt;peer;</div><div class='add'>+	unsigned long active_rate, sleep_rate;</div><div class='add'>+	unsigned long this_rate = 0, this_sleep_rate = 0;</div><div class='add'>+	unsigned long peer_rate = 0, peer_sleep_rate = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rpm_clk_lock);</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;enabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	to_active_sleep(r, rate, &amp;this_rate, &amp;this_sleep_rate);</div><div class='add'>+</div><div class='add'>+	/* Take peer clock's rate into account only if it's enabled. */</div><div class='add'>+	if (peer-&gt;enabled)</div><div class='add'>+		to_active_sleep(peer, peer-&gt;rate,</div><div class='add'>+				&amp;peer_rate, &amp;peer_sleep_rate);</div><div class='add'>+</div><div class='add'>+	active_rate = max(this_rate, peer_rate);</div><div class='add'>+	ret = clk_rpm_set_rate_active(r, active_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sleep_rate = max(this_sleep_rate, peer_sleep_rate);</div><div class='add'>+	ret = clk_rpm_set_rate_sleep(r, sleep_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r-&gt;rate = rate;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;rpm_clk_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long clk_rpm_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+			       unsigned long *parent_rate)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * RPM handles rate rounding and we don't have a way to</div><div class='add'>+	 * know what the rate will be, so just return whatever</div><div class='add'>+	 * rate is requested.</div><div class='add'>+	 */</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long clk_rpm_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					 unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_rpm *r = to_clk_rpm(hw);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RPM handles rate rounding and we don't have a way to</div><div class='add'>+	 * know what the rate will be, so just return whatever</div><div class='add'>+	 * rate was set.</div><div class='add'>+	 */</div><div class='add'>+	return r-&gt;rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops clk_rpm_ops = {</div><div class='add'>+	.prepare	= clk_rpm_prepare,</div><div class='add'>+	.unprepare	= clk_rpm_unprepare,</div><div class='add'>+	.set_rate	= clk_rpm_set_rate,</div><div class='add'>+	.round_rate	= clk_rpm_round_rate,</div><div class='add'>+	.recalc_rate	= clk_rpm_recalc_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_ops clk_rpm_branch_ops = {</div><div class='add'>+	.prepare	= clk_rpm_prepare,</div><div class='add'>+	.unprepare	= clk_rpm_unprepare,</div><div class='add'>+	.round_rate	= clk_rpm_round_rate,</div><div class='add'>+	.recalc_rate	= clk_rpm_recalc_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* apq8064 */</div><div class='add'>+DEFINE_CLK_RPM(apq8064, afab_clk, afab_a_clk, QCOM_RPM_APPS_FABRIC_CLK);</div><div class='add'>+DEFINE_CLK_RPM(apq8064, cfpb_clk, cfpb_a_clk, QCOM_RPM_CFPB_CLK);</div><div class='add'>+DEFINE_CLK_RPM(apq8064, daytona_clk, daytona_a_clk, QCOM_RPM_DAYTONA_FABRIC_CLK);</div><div class='add'>+DEFINE_CLK_RPM(apq8064, ebi1_clk, ebi1_a_clk, QCOM_RPM_EBI1_CLK);</div><div class='add'>+DEFINE_CLK_RPM(apq8064, mmfab_clk, mmfab_a_clk, QCOM_RPM_MM_FABRIC_CLK);</div><div class='add'>+DEFINE_CLK_RPM(apq8064, mmfpb_clk, mmfpb_a_clk, QCOM_RPM_MMFPB_CLK);</div><div class='add'>+DEFINE_CLK_RPM(apq8064, sfab_clk, sfab_a_clk, QCOM_RPM_SYS_FABRIC_CLK);</div><div class='add'>+DEFINE_CLK_RPM(apq8064, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK);</div><div class='add'>+DEFINE_CLK_RPM(apq8064, qdss_clk, qdss_a_clk, QCOM_RPM_QDSS_CLK);</div><div class='add'>+</div><div class='add'>+static struct clk_rpm *apq8064_clks[] = {</div><div class='add'>+	[RPM_APPS_FABRIC_CLK] = &amp;apq8064_afab_clk,</div><div class='add'>+	[RPM_APPS_FABRIC_A_CLK] = &amp;apq8064_afab_a_clk,</div><div class='add'>+	[RPM_CFPB_CLK] = &amp;apq8064_cfpb_clk,</div><div class='add'>+	[RPM_CFPB_A_CLK] = &amp;apq8064_cfpb_a_clk,</div><div class='add'>+	[RPM_DAYTONA_FABRIC_CLK] = &amp;apq8064_daytona_clk,</div><div class='add'>+	[RPM_DAYTONA_FABRIC_A_CLK] = &amp;apq8064_daytona_a_clk,</div><div class='add'>+	[RPM_EBI1_CLK] = &amp;apq8064_ebi1_clk,</div><div class='add'>+	[RPM_EBI1_A_CLK] = &amp;apq8064_ebi1_a_clk,</div><div class='add'>+	[RPM_MM_FABRIC_CLK] = &amp;apq8064_mmfab_clk,</div><div class='add'>+	[RPM_MM_FABRIC_A_CLK] = &amp;apq8064_mmfab_a_clk,</div><div class='add'>+	[RPM_MMFPB_CLK] = &amp;apq8064_mmfpb_clk,</div><div class='add'>+	[RPM_MMFPB_A_CLK] = &amp;apq8064_mmfpb_a_clk,</div><div class='add'>+	[RPM_SYS_FABRIC_CLK] = &amp;apq8064_sfab_clk,</div><div class='add'>+	[RPM_SYS_FABRIC_A_CLK] = &amp;apq8064_sfab_a_clk,</div><div class='add'>+	[RPM_SFPB_CLK] = &amp;apq8064_sfpb_clk,</div><div class='add'>+	[RPM_SFPB_A_CLK] = &amp;apq8064_sfpb_a_clk,</div><div class='add'>+	[RPM_QDSS_CLK] = &amp;apq8064_qdss_clk,</div><div class='add'>+	[RPM_QDSS_A_CLK] = &amp;apq8064_qdss_a_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rpm_clk_desc rpm_clk_apq8064 = {</div><div class='add'>+	.clks = apq8064_clks,</div><div class='add'>+	.num_clks = ARRAY_SIZE(apq8064_clks),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id rpm_clk_match_table[] = {</div><div class='add'>+	{ .compatible = "qcom,rpmcc-apq8064", .data = &amp;rpm_clk_apq8064 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, rpm_clk_match_table);</div><div class='add'>+</div><div class='add'>+static struct clk_hw *qcom_rpm_clk_hw_get(struct of_phandle_args *clkspec,</div><div class='add'>+					  void *data)</div><div class='add'>+{</div><div class='add'>+	struct rpm_cc *rcc = data;</div><div class='add'>+	unsigned int idx = clkspec-&gt;args[0];</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= rcc-&gt;num_clks) {</div><div class='add'>+		pr_err("%s: invalid index %u\n", __func__, idx);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rcc-&gt;clks[idx] ? &amp;rcc-&gt;clks[idx]-&gt;hw : ERR_PTR(-ENOENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpm_clk_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rpm_cc *rcc;</div><div class='add'>+	int ret;</div><div class='add'>+	size_t num_clks, i;</div><div class='add'>+	struct qcom_rpm *rpm;</div><div class='add'>+	struct clk_rpm **rpm_clks;</div><div class='add'>+	const struct rpm_clk_desc *desc;</div><div class='add'>+</div><div class='add'>+	rpm = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+	if (!rpm) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to retrieve handle to RPM\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!desc)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rpm_clks = desc-&gt;clks;</div><div class='add'>+	num_clks = desc-&gt;num_clks;</div><div class='add'>+</div><div class='add'>+	rcc = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*rcc), GFP_KERNEL);</div><div class='add'>+	if (!rcc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rcc-&gt;clks = rpm_clks;</div><div class='add'>+	rcc-&gt;num_clks = num_clks;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_clks; i++) {</div><div class='add'>+		if (!rpm_clks[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rpm_clks[i]-&gt;rpm = rpm;</div><div class='add'>+</div><div class='add'>+		ret = clk_rpm_handoff(rpm_clks[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_clks; i++) {</div><div class='add'>+		if (!rpm_clks[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = devm_clk_hw_register(&amp;pdev-&gt;dev, &amp;rpm_clks[i]-&gt;hw);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_clk_add_hw_provider(pdev-&gt;dev.of_node, qcom_rpm_clk_hw_get,</div><div class='add'>+				     rcc);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dev_err(&amp;pdev-&gt;dev, "Error registering RPM Clock driver (%d)\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpm_clk_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	of_clk_del_provider(pdev-&gt;dev.of_node);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver rpm_clk_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "qcom-clk-rpm",</div><div class='add'>+		.of_match_table = rpm_clk_match_table,</div><div class='add'>+	},</div><div class='add'>+	.probe = rpm_clk_probe,</div><div class='add'>+	.remove = rpm_clk_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init rpm_clk_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;rpm_clk_driver);</div><div class='add'>+}</div><div class='add'>+core_initcall(rpm_clk_init);</div><div class='add'>+</div><div class='add'>+static void __exit rpm_clk_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;rpm_clk_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(rpm_clk_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Qualcomm RPM Clock Controller Driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS("platform:qcom-clk-rpm");</div><div class='head'>diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c<br/>new file mode 100644<br/>index 000000000000..3487c267833e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/clk-smd-rpm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/clk-smd-rpm.c</a></div><div class='hunk'>@@ -0,0 +1,649 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016, Linaro Limited</div><div class='add'>+ * Copyright (c) 2014, The Linux Foundation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/soc/qcom/smd-rpm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/qcom,rpmcc.h&gt;</div><div class='add'>+#include &lt;dt-bindings/mfd/qcom-rpm.h&gt;</div><div class='add'>+</div><div class='add'>+#define QCOM_RPM_KEY_SOFTWARE_ENABLE			0x6e657773</div><div class='add'>+#define QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY	0x62636370</div><div class='add'>+#define QCOM_RPM_SMD_KEY_RATE				0x007a484b</div><div class='add'>+#define QCOM_RPM_SMD_KEY_ENABLE				0x62616e45</div><div class='add'>+#define QCOM_RPM_SMD_KEY_STATE				0x54415453</div><div class='add'>+#define QCOM_RPM_SCALING_ENABLE_ID			0x2</div><div class='add'>+</div><div class='add'>+#define __DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id, stat_id,  \</div><div class='add'>+			     key)					      \</div><div class='add'>+	static struct clk_smd_rpm _platform##_##_active;		      \</div><div class='add'>+	static struct clk_smd_rpm _platform##_##_name = {		      \</div><div class='add'>+		.rpm_res_type = (type),					      \</div><div class='add'>+		.rpm_clk_id = (r_id),					      \</div><div class='add'>+		.rpm_status_id = (stat_id),				      \</div><div class='add'>+		.rpm_key = (key),					      \</div><div class='add'>+		.peer = &amp;_platform##_##_active,				      \</div><div class='add'>+		.rate = INT_MAX,					      \</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){			      \</div><div class='add'>+			.ops = &amp;clk_smd_rpm_ops,			      \</div><div class='add'>+			.name = #_name,					      \</div><div class='add'>+			.parent_names = (const char *[]){ "xo_board" },       \</div><div class='add'>+			.num_parents = 1,				      \</div><div class='add'>+		},							      \</div><div class='add'>+	};								      \</div><div class='add'>+	static struct clk_smd_rpm _platform##_##_active = {		      \</div><div class='add'>+		.rpm_res_type = (type),					      \</div><div class='add'>+		.rpm_clk_id = (r_id),					      \</div><div class='add'>+		.rpm_status_id = (stat_id),				      \</div><div class='add'>+		.active_only = true,					      \</div><div class='add'>+		.rpm_key = (key),					      \</div><div class='add'>+		.peer = &amp;_platform##_##_name,				      \</div><div class='add'>+		.rate = INT_MAX,					      \</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){			      \</div><div class='add'>+			.ops = &amp;clk_smd_rpm_ops,			      \</div><div class='add'>+			.name = #_active,				      \</div><div class='add'>+			.parent_names = (const char *[]){ "xo_board" },	      \</div><div class='add'>+			.num_parents = 1,				      \</div><div class='add'>+		},							      \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, r_id,    \</div><div class='add'>+				    stat_id, r, key)			      \</div><div class='add'>+	static struct clk_smd_rpm _platform##_##_active;		      \</div><div class='add'>+	static struct clk_smd_rpm _platform##_##_name = {		      \</div><div class='add'>+		.rpm_res_type = (type),					      \</div><div class='add'>+		.rpm_clk_id = (r_id),					      \</div><div class='add'>+		.rpm_status_id = (stat_id),				      \</div><div class='add'>+		.rpm_key = (key),					      \</div><div class='add'>+		.branch = true,						      \</div><div class='add'>+		.peer = &amp;_platform##_##_active,				      \</div><div class='add'>+		.rate = (r),						      \</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){			      \</div><div class='add'>+			.ops = &amp;clk_smd_rpm_branch_ops,			      \</div><div class='add'>+			.name = #_name,					      \</div><div class='add'>+			.parent_names = (const char *[]){ "xo_board" },	      \</div><div class='add'>+			.num_parents = 1,				      \</div><div class='add'>+		},							      \</div><div class='add'>+	};								      \</div><div class='add'>+	static struct clk_smd_rpm _platform##_##_active = {		      \</div><div class='add'>+		.rpm_res_type = (type),					      \</div><div class='add'>+		.rpm_clk_id = (r_id),					      \</div><div class='add'>+		.rpm_status_id = (stat_id),				      \</div><div class='add'>+		.active_only = true,					      \</div><div class='add'>+		.rpm_key = (key),					      \</div><div class='add'>+		.branch = true,						      \</div><div class='add'>+		.peer = &amp;_platform##_##_name,				      \</div><div class='add'>+		.rate = (r),						      \</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){			      \</div><div class='add'>+			.ops = &amp;clk_smd_rpm_branch_ops,			      \</div><div class='add'>+			.name = #_active,				      \</div><div class='add'>+			.parent_names = (const char *[]){ "xo_board" },	      \</div><div class='add'>+			.num_parents = 1,				      \</div><div class='add'>+		},							      \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id)	      \</div><div class='add'>+		__DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id,   \</div><div class='add'>+		0, QCOM_RPM_SMD_KEY_RATE)</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, r_id, r)   \</div><div class='add'>+		__DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type,  \</div><div class='add'>+		r_id, 0, r, QCOM_RPM_SMD_KEY_ENABLE)</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLK_SMD_RPM_QDSS(_platform, _name, _active, type, r_id)	      \</div><div class='add'>+		__DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id,   \</div><div class='add'>+		0, QCOM_RPM_SMD_KEY_STATE)</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLK_SMD_RPM_XO_BUFFER(_platform, _name, _active, r_id)	      \</div><div class='add'>+		__DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active,	      \</div><div class='add'>+		QCOM_SMD_RPM_CLK_BUF_A, r_id, 0, 1000,			      \</div><div class='add'>+		QCOM_RPM_KEY_SOFTWARE_ENABLE)</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(_platform, _name, _active, r_id) \</div><div class='add'>+		__DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active,	      \</div><div class='add'>+		QCOM_SMD_RPM_CLK_BUF_A, r_id, 0, 1000,			      \</div><div class='add'>+		QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY)</div><div class='add'>+</div><div class='add'>+#define to_clk_smd_rpm(_hw) container_of(_hw, struct clk_smd_rpm, hw)</div><div class='add'>+</div><div class='add'>+struct clk_smd_rpm {</div><div class='add'>+	const int rpm_res_type;</div><div class='add'>+	const int rpm_key;</div><div class='add'>+	const int rpm_clk_id;</div><div class='add'>+	const int rpm_status_id;</div><div class='add'>+	const bool active_only;</div><div class='add'>+	bool enabled;</div><div class='add'>+	bool branch;</div><div class='add'>+	struct clk_smd_rpm *peer;</div><div class='add'>+	struct clk_hw hw;</div><div class='add'>+	unsigned long rate;</div><div class='add'>+	struct qcom_smd_rpm *rpm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk_smd_rpm_req {</div><div class='add'>+	__le32 key;</div><div class='add'>+	__le32 nbytes;</div><div class='add'>+	__le32 value;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rpm_cc {</div><div class='add'>+	struct qcom_rpm *rpm;</div><div class='add'>+	struct clk_smd_rpm **clks;</div><div class='add'>+	size_t num_clks;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rpm_smd_clk_desc {</div><div class='add'>+	struct clk_smd_rpm **clks;</div><div class='add'>+	size_t num_clks;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(rpm_smd_clk_lock);</div><div class='add'>+</div><div class='add'>+static int clk_smd_rpm_handoff(struct clk_smd_rpm *r)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct clk_smd_rpm_req req = {</div><div class='add'>+		.key = cpu_to_le32(r-&gt;rpm_key),</div><div class='add'>+		.nbytes = cpu_to_le32(sizeof(u32)),</div><div class='add'>+		.value = cpu_to_le32(INT_MAX),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = qcom_rpm_smd_write(r-&gt;rpm, QCOM_SMD_RPM_ACTIVE_STATE,</div><div class='add'>+				 r-&gt;rpm_res_type, r-&gt;rpm_clk_id, &amp;req,</div><div class='add'>+				 sizeof(req));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = qcom_rpm_smd_write(r-&gt;rpm, QCOM_SMD_RPM_SLEEP_STATE,</div><div class='add'>+				 r-&gt;rpm_res_type, r-&gt;rpm_clk_id, &amp;req,</div><div class='add'>+				 sizeof(req));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_smd_rpm_set_rate_active(struct clk_smd_rpm *r,</div><div class='add'>+				       unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_smd_rpm_req req = {</div><div class='add'>+		.key = cpu_to_le32(r-&gt;rpm_key),</div><div class='add'>+		.nbytes = cpu_to_le32(sizeof(u32)),</div><div class='add'>+		.value = cpu_to_le32(DIV_ROUND_UP(rate, 1000)), /* to kHz */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return qcom_rpm_smd_write(r-&gt;rpm, QCOM_SMD_RPM_ACTIVE_STATE,</div><div class='add'>+				  r-&gt;rpm_res_type, r-&gt;rpm_clk_id, &amp;req,</div><div class='add'>+				  sizeof(req));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_smd_rpm_set_rate_sleep(struct clk_smd_rpm *r,</div><div class='add'>+				      unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_smd_rpm_req req = {</div><div class='add'>+		.key = cpu_to_le32(r-&gt;rpm_key),</div><div class='add'>+		.nbytes = cpu_to_le32(sizeof(u32)),</div><div class='add'>+		.value = cpu_to_le32(DIV_ROUND_UP(rate, 1000)), /* to kHz */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return qcom_rpm_smd_write(r-&gt;rpm, QCOM_SMD_RPM_SLEEP_STATE,</div><div class='add'>+				  r-&gt;rpm_res_type, r-&gt;rpm_clk_id, &amp;req,</div><div class='add'>+				  sizeof(req));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void to_active_sleep(struct clk_smd_rpm *r, unsigned long rate,</div><div class='add'>+			    unsigned long *active, unsigned long *sleep)</div><div class='add'>+{</div><div class='add'>+	*active = rate;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Active-only clocks don't care what the rate is during sleep. So,</div><div class='add'>+	 * they vote for zero.</div><div class='add'>+	 */</div><div class='add'>+	if (r-&gt;active_only)</div><div class='add'>+		*sleep = 0;</div><div class='add'>+	else</div><div class='add'>+		*sleep = *active;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_smd_rpm_prepare(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct clk_smd_rpm *r = to_clk_smd_rpm(hw);</div><div class='add'>+	struct clk_smd_rpm *peer = r-&gt;peer;</div><div class='add'>+	unsigned long this_rate = 0, this_sleep_rate = 0;</div><div class='add'>+	unsigned long peer_rate = 0, peer_sleep_rate = 0;</div><div class='add'>+	unsigned long active_rate, sleep_rate;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rpm_smd_clk_lock);</div><div class='add'>+</div><div class='add'>+	/* Don't send requests to the RPM if the rate has not been set. */</div><div class='add'>+	if (!r-&gt;rate)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	to_active_sleep(r, r-&gt;rate, &amp;this_rate, &amp;this_sleep_rate);</div><div class='add'>+</div><div class='add'>+	/* Take peer clock's rate into account only if it's enabled. */</div><div class='add'>+	if (peer-&gt;enabled)</div><div class='add'>+		to_active_sleep(peer, peer-&gt;rate,</div><div class='add'>+				&amp;peer_rate, &amp;peer_sleep_rate);</div><div class='add'>+</div><div class='add'>+	active_rate = max(this_rate, peer_rate);</div><div class='add'>+</div><div class='add'>+	if (r-&gt;branch)</div><div class='add'>+		active_rate = !!active_rate;</div><div class='add'>+</div><div class='add'>+	ret = clk_smd_rpm_set_rate_active(r, active_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sleep_rate = max(this_sleep_rate, peer_sleep_rate);</div><div class='add'>+	if (r-&gt;branch)</div><div class='add'>+		sleep_rate = !!sleep_rate;</div><div class='add'>+</div><div class='add'>+	ret = clk_smd_rpm_set_rate_sleep(r, sleep_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		/* Undo the active set vote and restore it */</div><div class='add'>+		ret = clk_smd_rpm_set_rate_active(r, peer_rate);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (!ret)</div><div class='add'>+		r-&gt;enabled = true;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rpm_smd_clk_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clk_smd_rpm_unprepare(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct clk_smd_rpm *r = to_clk_smd_rpm(hw);</div><div class='add'>+	struct clk_smd_rpm *peer = r-&gt;peer;</div><div class='add'>+	unsigned long peer_rate = 0, peer_sleep_rate = 0;</div><div class='add'>+	unsigned long active_rate, sleep_rate;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rpm_smd_clk_lock);</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;rate)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Take peer clock's rate into account only if it's enabled. */</div><div class='add'>+	if (peer-&gt;enabled)</div><div class='add'>+		to_active_sleep(peer, peer-&gt;rate, &amp;peer_rate,</div><div class='add'>+				&amp;peer_sleep_rate);</div><div class='add'>+</div><div class='add'>+	active_rate = r-&gt;branch ? !!peer_rate : peer_rate;</div><div class='add'>+	ret = clk_smd_rpm_set_rate_active(r, active_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sleep_rate = r-&gt;branch ? !!peer_sleep_rate : peer_sleep_rate;</div><div class='add'>+	ret = clk_smd_rpm_set_rate_sleep(r, sleep_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r-&gt;enabled = false;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;rpm_smd_clk_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_smd_rpm_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_smd_rpm *r = to_clk_smd_rpm(hw);</div><div class='add'>+	struct clk_smd_rpm *peer = r-&gt;peer;</div><div class='add'>+	unsigned long active_rate, sleep_rate;</div><div class='add'>+	unsigned long this_rate = 0, this_sleep_rate = 0;</div><div class='add'>+	unsigned long peer_rate = 0, peer_sleep_rate = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rpm_smd_clk_lock);</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;enabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	to_active_sleep(r, rate, &amp;this_rate, &amp;this_sleep_rate);</div><div class='add'>+</div><div class='add'>+	/* Take peer clock's rate into account only if it's enabled. */</div><div class='add'>+	if (peer-&gt;enabled)</div><div class='add'>+		to_active_sleep(peer, peer-&gt;rate,</div><div class='add'>+				&amp;peer_rate, &amp;peer_sleep_rate);</div><div class='add'>+</div><div class='add'>+	active_rate = max(this_rate, peer_rate);</div><div class='add'>+	ret = clk_smd_rpm_set_rate_active(r, active_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sleep_rate = max(this_sleep_rate, peer_sleep_rate);</div><div class='add'>+	ret = clk_smd_rpm_set_rate_sleep(r, sleep_rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r-&gt;rate = rate;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;rpm_smd_clk_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long clk_smd_rpm_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				   unsigned long *parent_rate)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * RPM handles rate rounding and we don't have a way to</div><div class='add'>+	 * know what the rate will be, so just return whatever</div><div class='add'>+	 * rate is requested.</div><div class='add'>+	 */</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long clk_smd_rpm_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					     unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_smd_rpm *r = to_clk_smd_rpm(hw);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RPM handles rate rounding and we don't have a way to</div><div class='add'>+	 * know what the rate will be, so just return whatever</div><div class='add'>+	 * rate was set.</div><div class='add'>+	 */</div><div class='add'>+	return r-&gt;rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_smd_rpm_enable_scaling(struct qcom_smd_rpm *rpm)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct clk_smd_rpm_req req = {</div><div class='add'>+		.key = cpu_to_le32(QCOM_RPM_SMD_KEY_ENABLE),</div><div class='add'>+		.nbytes = cpu_to_le32(sizeof(u32)),</div><div class='add'>+		.value = cpu_to_le32(1),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = qcom_rpm_smd_write(rpm, QCOM_SMD_RPM_SLEEP_STATE,</div><div class='add'>+				 QCOM_SMD_RPM_MISC_CLK,</div><div class='add'>+				 QCOM_RPM_SCALING_ENABLE_ID, &amp;req, sizeof(req));</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("RPM clock scaling (sleep set) not enabled!\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qcom_rpm_smd_write(rpm, QCOM_SMD_RPM_ACTIVE_STATE,</div><div class='add'>+				 QCOM_SMD_RPM_MISC_CLK,</div><div class='add'>+				 QCOM_RPM_SCALING_ENABLE_ID, &amp;req, sizeof(req));</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("RPM clock scaling (active set) not enabled!\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: RPM clock scaling is enabled\n", __func__);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops clk_smd_rpm_ops = {</div><div class='add'>+	.prepare	= clk_smd_rpm_prepare,</div><div class='add'>+	.unprepare	= clk_smd_rpm_unprepare,</div><div class='add'>+	.set_rate	= clk_smd_rpm_set_rate,</div><div class='add'>+	.round_rate	= clk_smd_rpm_round_rate,</div><div class='add'>+	.recalc_rate	= clk_smd_rpm_recalc_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_ops clk_smd_rpm_branch_ops = {</div><div class='add'>+	.prepare	= clk_smd_rpm_prepare,</div><div class='add'>+	.unprepare	= clk_smd_rpm_unprepare,</div><div class='add'>+	.round_rate	= clk_smd_rpm_round_rate,</div><div class='add'>+	.recalc_rate	= clk_smd_rpm_recalc_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* msm8916 */</div><div class='add'>+DEFINE_CLK_SMD_RPM(msm8916, pcnoc_clk, pcnoc_a_clk, QCOM_SMD_RPM_BUS_CLK, 0);</div><div class='add'>+DEFINE_CLK_SMD_RPM(msm8916, snoc_clk, snoc_a_clk, QCOM_SMD_RPM_BUS_CLK, 1);</div><div class='add'>+DEFINE_CLK_SMD_RPM(msm8916, bimc_clk, bimc_a_clk, QCOM_SMD_RPM_MEM_CLK, 0);</div><div class='add'>+DEFINE_CLK_SMD_RPM_QDSS(msm8916, qdss_clk, qdss_a_clk, QCOM_SMD_RPM_MISC_CLK, 1);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8916, bb_clk1, bb_clk1_a, 1);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8916, bb_clk2, bb_clk2_a, 2);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8916, rf_clk1, rf_clk1_a, 4);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8916, rf_clk2, rf_clk2_a, 5);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8916, bb_clk1_pin, bb_clk1_a_pin, 1);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8916, bb_clk2_pin, bb_clk2_a_pin, 2);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8916, rf_clk1_pin, rf_clk1_a_pin, 4);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8916, rf_clk2_pin, rf_clk2_a_pin, 5);</div><div class='add'>+</div><div class='add'>+static struct clk_smd_rpm *msm8916_clks[] = {</div><div class='add'>+	[RPM_SMD_PCNOC_CLK]		= &amp;msm8916_pcnoc_clk,</div><div class='add'>+	[RPM_SMD_PCNOC_A_CLK]		= &amp;msm8916_pcnoc_a_clk,</div><div class='add'>+	[RPM_SMD_SNOC_CLK]		= &amp;msm8916_snoc_clk,</div><div class='add'>+	[RPM_SMD_SNOC_A_CLK]		= &amp;msm8916_snoc_a_clk,</div><div class='add'>+	[RPM_SMD_BIMC_CLK]		= &amp;msm8916_bimc_clk,</div><div class='add'>+	[RPM_SMD_BIMC_A_CLK]		= &amp;msm8916_bimc_a_clk,</div><div class='add'>+	[RPM_SMD_QDSS_CLK]		= &amp;msm8916_qdss_clk,</div><div class='add'>+	[RPM_SMD_QDSS_A_CLK]		= &amp;msm8916_qdss_a_clk,</div><div class='add'>+	[RPM_SMD_BB_CLK1]		= &amp;msm8916_bb_clk1,</div><div class='add'>+	[RPM_SMD_BB_CLK1_A]		= &amp;msm8916_bb_clk1_a,</div><div class='add'>+	[RPM_SMD_BB_CLK2]		= &amp;msm8916_bb_clk2,</div><div class='add'>+	[RPM_SMD_BB_CLK2_A]		= &amp;msm8916_bb_clk2_a,</div><div class='add'>+	[RPM_SMD_RF_CLK1]		= &amp;msm8916_rf_clk1,</div><div class='add'>+	[RPM_SMD_RF_CLK1_A]		= &amp;msm8916_rf_clk1_a,</div><div class='add'>+	[RPM_SMD_RF_CLK2]		= &amp;msm8916_rf_clk2,</div><div class='add'>+	[RPM_SMD_RF_CLK2_A]		= &amp;msm8916_rf_clk2_a,</div><div class='add'>+	[RPM_SMD_BB_CLK1_PIN]		= &amp;msm8916_bb_clk1_pin,</div><div class='add'>+	[RPM_SMD_BB_CLK1_A_PIN]		= &amp;msm8916_bb_clk1_a_pin,</div><div class='add'>+	[RPM_SMD_BB_CLK2_PIN]		= &amp;msm8916_bb_clk2_pin,</div><div class='add'>+	[RPM_SMD_BB_CLK2_A_PIN]		= &amp;msm8916_bb_clk2_a_pin,</div><div class='add'>+	[RPM_SMD_RF_CLK1_PIN]		= &amp;msm8916_rf_clk1_pin,</div><div class='add'>+	[RPM_SMD_RF_CLK1_A_PIN]		= &amp;msm8916_rf_clk1_a_pin,</div><div class='add'>+	[RPM_SMD_RF_CLK2_PIN]		= &amp;msm8916_rf_clk2_pin,</div><div class='add'>+	[RPM_SMD_RF_CLK2_A_PIN]		= &amp;msm8916_rf_clk2_a_pin,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rpm_smd_clk_desc rpm_clk_msm8916 = {</div><div class='add'>+	.clks = msm8916_clks,</div><div class='add'>+	.num_clks = ARRAY_SIZE(msm8916_clks),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* msm8974 */</div><div class='add'>+DEFINE_CLK_SMD_RPM(msm8974, pnoc_clk, pnoc_a_clk, QCOM_SMD_RPM_BUS_CLK, 0);</div><div class='add'>+DEFINE_CLK_SMD_RPM(msm8974, snoc_clk, snoc_a_clk, QCOM_SMD_RPM_BUS_CLK, 1);</div><div class='add'>+DEFINE_CLK_SMD_RPM(msm8974, cnoc_clk, cnoc_a_clk, QCOM_SMD_RPM_BUS_CLK, 2);</div><div class='add'>+DEFINE_CLK_SMD_RPM(msm8974, mmssnoc_ahb_clk, mmssnoc_ahb_a_clk, QCOM_SMD_RPM_BUS_CLK, 3);</div><div class='add'>+DEFINE_CLK_SMD_RPM(msm8974, bimc_clk, bimc_a_clk, QCOM_SMD_RPM_MEM_CLK, 0);</div><div class='add'>+DEFINE_CLK_SMD_RPM(msm8974, gfx3d_clk_src, gfx3d_a_clk_src, QCOM_SMD_RPM_MEM_CLK, 1);</div><div class='add'>+DEFINE_CLK_SMD_RPM(msm8974, ocmemgx_clk, ocmemgx_a_clk, QCOM_SMD_RPM_MEM_CLK, 2);</div><div class='add'>+DEFINE_CLK_SMD_RPM_QDSS(msm8974, qdss_clk, qdss_a_clk, QCOM_SMD_RPM_MISC_CLK, 1);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8974, cxo_d0, cxo_d0_a, 1);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8974, cxo_d1, cxo_d1_a, 2);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8974, cxo_a0, cxo_a0_a, 4);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8974, cxo_a1, cxo_a1_a, 5);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8974, cxo_a2, cxo_a2_a, 6);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8974, diff_clk, diff_a_clk, 7);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8974, div_clk1, div_a_clk1, 11);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8974, div_clk2, div_a_clk2, 12);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8974, cxo_d0_pin, cxo_d0_a_pin, 1);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8974, cxo_d1_pin, cxo_d1_a_pin, 2);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8974, cxo_a0_pin, cxo_a0_a_pin, 4);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8974, cxo_a1_pin, cxo_a1_a_pin, 5);</div><div class='add'>+DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8974, cxo_a2_pin, cxo_a2_a_pin, 6);</div><div class='add'>+</div><div class='add'>+static struct clk_smd_rpm *msm8974_clks[] = {</div><div class='add'>+	[RPM_SMD_PNOC_CLK]		= &amp;msm8974_pnoc_clk,</div><div class='add'>+	[RPM_SMD_PNOC_A_CLK]		= &amp;msm8974_pnoc_a_clk,</div><div class='add'>+	[RPM_SMD_SNOC_CLK]		= &amp;msm8974_snoc_clk,</div><div class='add'>+	[RPM_SMD_SNOC_A_CLK]		= &amp;msm8974_snoc_a_clk,</div><div class='add'>+	[RPM_SMD_CNOC_CLK]		= &amp;msm8974_cnoc_clk,</div><div class='add'>+	[RPM_SMD_CNOC_A_CLK]		= &amp;msm8974_cnoc_a_clk,</div><div class='add'>+	[RPM_SMD_MMSSNOC_AHB_CLK]	= &amp;msm8974_mmssnoc_ahb_clk,</div><div class='add'>+	[RPM_SMD_MMSSNOC_AHB_A_CLK]	= &amp;msm8974_mmssnoc_ahb_a_clk,</div><div class='add'>+	[RPM_SMD_BIMC_CLK]		= &amp;msm8974_bimc_clk,</div><div class='add'>+	[RPM_SMD_BIMC_A_CLK]		= &amp;msm8974_bimc_a_clk,</div><div class='add'>+	[RPM_SMD_OCMEMGX_CLK]		= &amp;msm8974_ocmemgx_clk,</div><div class='add'>+	[RPM_SMD_OCMEMGX_A_CLK]		= &amp;msm8974_ocmemgx_a_clk,</div><div class='add'>+	[RPM_SMD_QDSS_CLK]		= &amp;msm8974_qdss_clk,</div><div class='add'>+	[RPM_SMD_QDSS_A_CLK]		= &amp;msm8974_qdss_a_clk,</div><div class='add'>+	[RPM_SMD_CXO_D0]		= &amp;msm8974_cxo_d0,</div><div class='add'>+	[RPM_SMD_CXO_D0_A]		= &amp;msm8974_cxo_d0_a,</div><div class='add'>+	[RPM_SMD_CXO_D1]		= &amp;msm8974_cxo_d1,</div><div class='add'>+	[RPM_SMD_CXO_D1_A]		= &amp;msm8974_cxo_d1_a,</div><div class='add'>+	[RPM_SMD_CXO_A0]		= &amp;msm8974_cxo_a0,</div><div class='add'>+	[RPM_SMD_CXO_A0_A]		= &amp;msm8974_cxo_a0_a,</div><div class='add'>+	[RPM_SMD_CXO_A1]		= &amp;msm8974_cxo_a1,</div><div class='add'>+	[RPM_SMD_CXO_A1_A]		= &amp;msm8974_cxo_a1_a,</div><div class='add'>+	[RPM_SMD_CXO_A2]		= &amp;msm8974_cxo_a2,</div><div class='add'>+	[RPM_SMD_CXO_A2_A]		= &amp;msm8974_cxo_a2_a,</div><div class='add'>+	[RPM_SMD_DIFF_CLK]		= &amp;msm8974_diff_clk,</div><div class='add'>+	[RPM_SMD_DIFF_A_CLK]		= &amp;msm8974_diff_a_clk,</div><div class='add'>+	[RPM_SMD_DIV_CLK1]		= &amp;msm8974_div_clk1,</div><div class='add'>+	[RPM_SMD_DIV_A_CLK1]		= &amp;msm8974_div_a_clk1,</div><div class='add'>+	[RPM_SMD_DIV_CLK2]		= &amp;msm8974_div_clk2,</div><div class='add'>+	[RPM_SMD_DIV_A_CLK2]		= &amp;msm8974_div_a_clk2,</div><div class='add'>+	[RPM_SMD_CXO_D0_PIN]		= &amp;msm8974_cxo_d0_pin,</div><div class='add'>+	[RPM_SMD_CXO_D0_A_PIN]		= &amp;msm8974_cxo_d0_a_pin,</div><div class='add'>+	[RPM_SMD_CXO_D1_PIN]		= &amp;msm8974_cxo_d1_pin,</div><div class='add'>+	[RPM_SMD_CXO_D1_A_PIN]		= &amp;msm8974_cxo_d1_a_pin,</div><div class='add'>+	[RPM_SMD_CXO_A0_PIN]		= &amp;msm8974_cxo_a0_pin,</div><div class='add'>+	[RPM_SMD_CXO_A0_A_PIN]		= &amp;msm8974_cxo_a0_a_pin,</div><div class='add'>+	[RPM_SMD_CXO_A1_PIN]		= &amp;msm8974_cxo_a1_pin,</div><div class='add'>+	[RPM_SMD_CXO_A1_A_PIN]		= &amp;msm8974_cxo_a1_a_pin,</div><div class='add'>+	[RPM_SMD_CXO_A2_PIN]		= &amp;msm8974_cxo_a2_pin,</div><div class='add'>+	[RPM_SMD_CXO_A2_A_PIN]		= &amp;msm8974_cxo_a2_a_pin,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rpm_smd_clk_desc rpm_clk_msm8974 = {</div><div class='add'>+	.clks = msm8974_clks,</div><div class='add'>+	.num_clks = ARRAY_SIZE(msm8974_clks),</div><div class='add'>+};</div><div class='add'>+static const struct of_device_id rpm_smd_clk_match_table[] = {</div><div class='add'>+	{ .compatible = "qcom,rpmcc-msm8916", .data = &amp;rpm_clk_msm8916 },</div><div class='add'>+	{ .compatible = "qcom,rpmcc-msm8974", .data = &amp;rpm_clk_msm8974 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, rpm_smd_clk_match_table);</div><div class='add'>+</div><div class='add'>+static struct clk_hw *qcom_smdrpm_clk_hw_get(struct of_phandle_args *clkspec,</div><div class='add'>+					     void *data)</div><div class='add'>+{</div><div class='add'>+	struct rpm_cc *rcc = data;</div><div class='add'>+	unsigned int idx = clkspec-&gt;args[0];</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= rcc-&gt;num_clks) {</div><div class='add'>+		pr_err("%s: invalid index %u\n", __func__, idx);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rcc-&gt;clks[idx] ? &amp;rcc-&gt;clks[idx]-&gt;hw : ERR_PTR(-ENOENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpm_smd_clk_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rpm_cc *rcc;</div><div class='add'>+	int ret;</div><div class='add'>+	size_t num_clks, i;</div><div class='add'>+	struct qcom_smd_rpm *rpm;</div><div class='add'>+	struct clk_smd_rpm **rpm_smd_clks;</div><div class='add'>+	const struct rpm_smd_clk_desc *desc;</div><div class='add'>+</div><div class='add'>+	rpm = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+	if (!rpm) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to retrieve handle to RPM\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!desc)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rpm_smd_clks = desc-&gt;clks;</div><div class='add'>+	num_clks = desc-&gt;num_clks;</div><div class='add'>+</div><div class='add'>+	rcc = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*rcc), GFP_KERNEL);</div><div class='add'>+	if (!rcc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rcc-&gt;clks = rpm_smd_clks;</div><div class='add'>+	rcc-&gt;num_clks = num_clks;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_clks; i++) {</div><div class='add'>+		if (!rpm_smd_clks[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rpm_smd_clks[i]-&gt;rpm = rpm;</div><div class='add'>+</div><div class='add'>+		ret = clk_smd_rpm_handoff(rpm_smd_clks[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_smd_rpm_enable_scaling(rpm);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_clks; i++) {</div><div class='add'>+		if (!rpm_smd_clks[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = devm_clk_hw_register(&amp;pdev-&gt;dev, &amp;rpm_smd_clks[i]-&gt;hw);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_clk_add_hw_provider(pdev-&gt;dev.of_node, qcom_smdrpm_clk_hw_get,</div><div class='add'>+				     rcc);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dev_err(&amp;pdev-&gt;dev, "Error registering SMD clock driver (%d)\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rpm_smd_clk_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	of_clk_del_provider(pdev-&gt;dev.of_node);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver rpm_smd_clk_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "qcom-clk-smd-rpm",</div><div class='add'>+		.of_match_table = rpm_smd_clk_match_table,</div><div class='add'>+	},</div><div class='add'>+	.probe = rpm_smd_clk_probe,</div><div class='add'>+	.remove = rpm_smd_clk_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init rpm_smd_clk_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;rpm_smd_clk_driver);</div><div class='add'>+}</div><div class='add'>+core_initcall(rpm_smd_clk_init);</div><div class='add'>+</div><div class='add'>+static void __exit rpm_smd_clk_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;rpm_smd_clk_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(rpm_smd_clk_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Qualcomm RPM over SMD Clock Controller Driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS("platform:qcom-clk-smd-rpm");</div><div class='head'>diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c<br/>index fffcbaf0fba7..03f9d316f969 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/common.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/common.c</a></div><div class='hunk'>@@ -46,6 +46,22 @@ struct freq_tbl *qcom_find_freq(const struct freq_tbl *f, unsigned long rate)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qcom_find_freq);</div><div class='ctx'> </div><div class='add'>+const struct freq_tbl *qcom_find_freq_floor(const struct freq_tbl *f,</div><div class='add'>+					    unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	const struct freq_tbl *best = NULL;</div><div class='add'>+</div><div class='add'>+	for ( ; f-&gt;freq; f++) {</div><div class='add'>+		if (rate &gt;= f-&gt;freq)</div><div class='add'>+			best = f;</div><div class='add'>+		else</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return best;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(qcom_find_freq_floor);</div><div class='add'>+</div><div class='ctx'> int qcom_find_src_index(struct clk_hw *hw, const struct parent_map *map, u8 src)</div><div class='ctx'> {</div><div class='ctx'> 	int i, num_parents = clk_hw_get_num_parents(hw);</div><div class='hunk'>@@ -74,6 +90,27 @@ qcom_cc_map(struct platform_device *pdev, const struct qcom_cc_desc *desc)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qcom_cc_map);</div><div class='ctx'> </div><div class='add'>+void</div><div class='add'>+qcom_pll_set_fsm_mode(struct regmap *map, u32 reg, u8 bias_count, u8 lock_count)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	/* De-assert reset to FSM */</div><div class='add'>+	regmap_update_bits(map, reg, PLL_VOTE_FSM_RESET, 0);</div><div class='add'>+</div><div class='add'>+	/* Program bias count and lock count */</div><div class='add'>+	val = bias_count &lt;&lt; PLL_BIAS_COUNT_SHIFT |</div><div class='add'>+		lock_count &lt;&lt; PLL_LOCK_COUNT_SHIFT;</div><div class='add'>+	mask = PLL_BIAS_COUNT_MASK &lt;&lt; PLL_BIAS_COUNT_SHIFT;</div><div class='add'>+	mask |= PLL_LOCK_COUNT_MASK &lt;&lt; PLL_LOCK_COUNT_SHIFT;</div><div class='add'>+	regmap_update_bits(map, reg, mask, val);</div><div class='add'>+</div><div class='add'>+	/* Enable PLL FSM voting */</div><div class='add'>+	regmap_update_bits(map, reg, PLL_VOTE_FSM_ENA, PLL_VOTE_FSM_ENA);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(qcom_pll_set_fsm_mode);</div><div class='add'>+</div><div class='ctx'> static void qcom_cc_del_clk_provider(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	of_clk_del_provider(data);</div><div class='hunk'>@@ -108,7 +145,6 @@ static int _qcom_cc_register_board_clk(struct device *dev, const char *path,</div><div class='ctx'> 	clocks_node = of_find_node_by_path("/clocks");</div><div class='ctx'> 	if (clocks_node)</div><div class='ctx'> 		node = of_find_node_by_name(clocks_node, path);</div><div class='del'>-	of_node_put(clocks_node);</div><div class='ctx'> </div><div class='ctx'> 	if (!node) {</div><div class='ctx'> 		fixed = devm_kzalloc(dev, sizeof(*fixed), GFP_KERNEL);</div><div class='hunk'>@@ -153,15 +189,12 @@ int qcom_cc_register_board_clk(struct device *dev, const char *path,</div><div class='ctx'> 			       const char *name, unsigned long rate)</div><div class='ctx'> {</div><div class='ctx'> 	bool add_factor = true;</div><div class='del'>-	struct device_node *node;</div><div class='del'>-</div><div class='del'>-	/* The RPM clock driver will add the factor clock if present */</div><div class='del'>-	if (IS_ENABLED(CONFIG_QCOM_RPMCC)) {</div><div class='del'>-		node = of_find_compatible_node(NULL, NULL, "qcom,rpmcc");</div><div class='del'>-		if (of_device_is_available(node))</div><div class='del'>-			add_factor = false;</div><div class='del'>-		of_node_put(node);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: The RPM clock driver currently does not support the xo clock.</div><div class='add'>+	 * When xo is added to the RPM clock driver, we should change this</div><div class='add'>+	 * function to skip registration of xo factor clocks.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	return _qcom_cc_register_board_clk(dev, path, name, rate, add_factor);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/clk/qcom/common.h b/drivers/clk/qcom/common.h<br/>index ae9bdeb21f29..23c1927669ba 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/common.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/common.h</a></div><div class='hunk'>@@ -22,6 +22,13 @@ struct freq_tbl;</div><div class='ctx'> struct clk_hw;</div><div class='ctx'> struct parent_map;</div><div class='ctx'> </div><div class='add'>+#define PLL_LOCK_COUNT_SHIFT	8</div><div class='add'>+#define PLL_LOCK_COUNT_MASK	0x3f</div><div class='add'>+#define PLL_BIAS_COUNT_SHIFT	14</div><div class='add'>+#define PLL_BIAS_COUNT_MASK	0x3f</div><div class='add'>+#define PLL_VOTE_FSM_ENA	BIT(20)</div><div class='add'>+#define PLL_VOTE_FSM_RESET	BIT(21)</div><div class='add'>+</div><div class='ctx'> struct qcom_cc_desc {</div><div class='ctx'> 	const struct regmap_config *config;</div><div class='ctx'> 	struct clk_regmap **clks;</div><div class='hunk'>@@ -34,6 +41,10 @@ struct qcom_cc_desc {</div><div class='ctx'> </div><div class='ctx'> extern const struct freq_tbl *qcom_find_freq(const struct freq_tbl *f,</div><div class='ctx'> 					     unsigned long rate);</div><div class='add'>+extern const struct freq_tbl *qcom_find_freq_floor(const struct freq_tbl *f,</div><div class='add'>+						   unsigned long rate);</div><div class='add'>+extern void</div><div class='add'>+qcom_pll_set_fsm_mode(struct regmap *m, u32 reg, u8 bias_count, u8 lock_count);</div><div class='ctx'> extern int qcom_find_src_index(struct clk_hw *hw, const struct parent_map *map,</div><div class='ctx'> 			       u8 src);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/qcom/gcc-apq8084.c b/drivers/clk/qcom/gcc-apq8084.c<br/>index 070037a29ea5..486d9610355c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-apq8084.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/gcc-apq8084.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-apq8084.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-apq8084.c</a></div><div class='hunk'>@@ -1142,7 +1142,7 @@ static struct clk_rcg2 sdcc1_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc1_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0_gpll4,</div><div class='ctx'> 		.num_parents = 3,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1156,7 +1156,7 @@ static struct clk_rcg2 sdcc2_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc2_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0,</div><div class='ctx'> 		.num_parents = 2,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1170,7 +1170,7 @@ static struct clk_rcg2 sdcc3_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc3_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0,</div><div class='ctx'> 		.num_parents = 2,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1184,7 +1184,7 @@ static struct clk_rcg2 sdcc4_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc4_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0,</div><div class='ctx'> 		.num_parents = 2,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/qcom/gcc-ipq4019.c b/drivers/clk/qcom/gcc-ipq4019.c<br/>index b593065de8db..46cb256b4aa2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-ipq4019.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/gcc-ipq4019.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-ipq4019.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-ipq4019.c</a></div><div class='hunk'>@@ -20,6 +20,9 @@</div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/reset-controller.h&gt;</div><div class='add'>+#include &lt;linux/math64.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/qcom,gcc-ipq4019.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -28,6 +31,13 @@</div><div class='ctx'> #include "clk-rcg.h"</div><div class='ctx'> #include "clk-branch.h"</div><div class='ctx'> #include "reset.h"</div><div class='add'>+#include "clk-regmap-divider.h"</div><div class='add'>+</div><div class='add'>+#define to_clk_regmap_div(_hw) container_of(to_clk_regmap(_hw),\</div><div class='add'>+					struct clk_regmap_div, clkr)</div><div class='add'>+</div><div class='add'>+#define to_clk_fepll(_hw) container_of(to_clk_regmap_div(_hw),\</div><div class='add'>+						struct clk_fepll, cdiv)</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	P_XO,</div><div class='hunk'>@@ -40,6 +50,41 @@ enum {</div><div class='ctx'> 	P_DDRPLLAPSS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * struct clk_fepll_vco - vco feedback divider corresponds for FEPLL clocks</div><div class='add'>+ * @fdbkdiv_shift: lowest bit for FDBKDIV</div><div class='add'>+ * @fdbkdiv_width: number of bits in FDBKDIV</div><div class='add'>+ * @refclkdiv_shift: lowest bit for REFCLKDIV</div><div class='add'>+ * @refclkdiv_width: number of bits in REFCLKDIV</div><div class='add'>+ * @reg: PLL_DIV register address</div><div class='add'>+ */</div><div class='add'>+struct clk_fepll_vco {</div><div class='add'>+	u32 fdbkdiv_shift;</div><div class='add'>+	u32 fdbkdiv_width;</div><div class='add'>+	u32 refclkdiv_shift;</div><div class='add'>+	u32 refclkdiv_width;</div><div class='add'>+	u32 reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct clk_fepll - clk divider corresponds to FEPLL clocks</div><div class='add'>+ * @fixed_div: fixed divider value if divider is fixed</div><div class='add'>+ * @parent_map: map from software's parent index to hardware's src_sel field</div><div class='add'>+ * @cdiv: divider values for PLL_DIV</div><div class='add'>+ * @pll_vco: vco feedback divider</div><div class='add'>+ * @div_table: mapping for actual divider value to register divider value</div><div class='add'>+ *             in case of non fixed divider</div><div class='add'>+ * @freq_tbl: frequency table</div><div class='add'>+ */</div><div class='add'>+struct clk_fepll {</div><div class='add'>+	u32 fixed_div;</div><div class='add'>+	const u8 *parent_map;</div><div class='add'>+	struct clk_regmap_div cdiv;</div><div class='add'>+	const struct clk_fepll_vco *pll_vco;</div><div class='add'>+	const struct clk_div_table *div_table;</div><div class='add'>+	const struct freq_tbl *freq_tbl;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct parent_map gcc_xo_200_500_map[] = {</div><div class='ctx'> 	{ P_XO, 0 },</div><div class='ctx'> 	{ P_FEPLL200, 1 },</div><div class='hunk'>@@ -80,7 +125,7 @@ static struct parent_map gcc_xo_sdcc1_500_map[] = {</div><div class='ctx'> </div><div class='ctx'> static const char * const gcc_xo_sdcc1_500[] = {</div><div class='ctx'> 	"xo",</div><div class='del'>-	"ddrpll",</div><div class='add'>+	"ddrpllsdcc",</div><div class='ctx'> 	"fepll500",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -121,6 +166,12 @@ static struct parent_map gcc_xo_ddr_500_200_map[] = {</div><div class='ctx'> 	{  P_DDRPLLAPSS, 1 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Contains index for safe clock during APSS freq change.</div><div class='add'>+ * fepll500 is being used as safe clock so initialize it</div><div class='add'>+ * with its index in parents list gcc_xo_ddr_500_200.</div><div class='add'>+ */</div><div class='add'>+static const int gcc_ipq4019_cpu_safe_parent = 2;</div><div class='ctx'> static const char * const gcc_xo_ddr_500_200[] = {</div><div class='ctx'> 	"xo",</div><div class='ctx'> 	"fepll200",</div><div class='hunk'>@@ -185,8 +236,7 @@ static struct clk_branch gcc_audio_pwm_clk = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct freq_tbl ftbl_gcc_blsp1_qup1_2_i2c_apps_clk[] = {</div><div class='del'>-	F(19200000, P_XO, 1, 2, 5),</div><div class='del'>-	F(24000000, P_XO, 1, 1, 2),</div><div class='add'>+	F(19050000, P_FEPLL200, 10.5, 1, 1),</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -506,7 +556,7 @@ static const struct freq_tbl ftbl_gcc_sdcc1_apps_clk[] = {</div><div class='ctx'> 	F(25000000,  P_FEPLL500,		1,  1, 20),</div><div class='ctx'> 	F(50000000,  P_FEPLL500,		1,  1, 10),</div><div class='ctx'> 	F(100000000, P_FEPLL500,		1,  1, 5),</div><div class='del'>-	F(193000000, P_DDRPLL,		1,  0, 0),</div><div class='add'>+	F(192000000, P_DDRPLL,			1,  0, 0),</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -525,10 +575,20 @@ static struct clk_rcg2  sdcc1_apps_clk_src = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct freq_tbl ftbl_gcc_apps_clk[] = {</div><div class='del'>-	F(48000000, P_XO,	   1, 0, 0),</div><div class='add'>+	F(48000000,  P_XO,         1, 0, 0),</div><div class='ctx'> 	F(200000000, P_FEPLL200,   1, 0, 0),</div><div class='add'>+	F(384000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='add'>+	F(413000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='add'>+	F(448000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='add'>+	F(488000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='ctx'> 	F(500000000, P_FEPLL500,   1, 0, 0),</div><div class='del'>-	F(626000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='add'>+	F(512000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='add'>+	F(537000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='add'>+	F(565000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='add'>+	F(597000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='add'>+	F(632000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='add'>+	F(672000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='add'>+	F(716000000, P_DDRPLLAPSS, 1, 0, 0),</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -542,6 +602,7 @@ static struct clk_rcg2 apps_clk_src = {</div><div class='ctx'> 		.parent_names = gcc_xo_ddr_500_200,</div><div class='ctx'> 		.num_parents = 4,</div><div class='ctx'> 		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.flags = CLK_SET_RATE_PARENT,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1155,6 +1216,364 @@ static struct clk_branch gcc_wcss5g_rtc_clk = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Calculates the VCO rate for FEPLL. */</div><div class='add'>+static u64 clk_fepll_vco_calc_rate(struct clk_fepll *pll_div,</div><div class='add'>+				   unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	const struct clk_fepll_vco *pll_vco = pll_div-&gt;pll_vco;</div><div class='add'>+	u32 fdbkdiv, refclkdiv, cdiv;</div><div class='add'>+	u64 vco;</div><div class='add'>+</div><div class='add'>+	regmap_read(pll_div-&gt;cdiv.clkr.regmap, pll_vco-&gt;reg, &amp;cdiv);</div><div class='add'>+	refclkdiv = (cdiv &gt;&gt; pll_vco-&gt;refclkdiv_shift) &amp;</div><div class='add'>+		    (BIT(pll_vco-&gt;refclkdiv_width) - 1);</div><div class='add'>+	fdbkdiv = (cdiv &gt;&gt; pll_vco-&gt;fdbkdiv_shift) &amp;</div><div class='add'>+		  (BIT(pll_vco-&gt;fdbkdiv_width) - 1);</div><div class='add'>+</div><div class='add'>+	vco = parent_rate / refclkdiv;</div><div class='add'>+	vco *= 2;</div><div class='add'>+	vco *= fdbkdiv;</div><div class='add'>+</div><div class='add'>+	return vco;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_fepll_vco gcc_apss_ddrpll_vco = {</div><div class='add'>+	.fdbkdiv_shift = 16,</div><div class='add'>+	.fdbkdiv_width = 8,</div><div class='add'>+	.refclkdiv_shift = 24,</div><div class='add'>+	.refclkdiv_width = 5,</div><div class='add'>+	.reg = 0x2e020,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_fepll_vco gcc_fepll_vco = {</div><div class='add'>+	.fdbkdiv_shift = 16,</div><div class='add'>+	.fdbkdiv_width = 8,</div><div class='add'>+	.refclkdiv_shift = 24,</div><div class='add'>+	.refclkdiv_width = 5,</div><div class='add'>+	.reg = 0x2f020,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Round rate function for APSS CPU PLL Clock divider.</div><div class='add'>+ * It looks up the frequency table and returns the next higher frequency</div><div class='add'>+ * supported in hardware.</div><div class='add'>+ */</div><div class='add'>+static long clk_cpu_div_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				   unsigned long *p_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_fepll *pll = to_clk_fepll(hw);</div><div class='add'>+	struct clk_hw *p_hw;</div><div class='add'>+	const struct freq_tbl *f;</div><div class='add'>+</div><div class='add'>+	f = qcom_find_freq(pll-&gt;freq_tbl, rate);</div><div class='add'>+	if (!f)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	p_hw = clk_hw_get_parent_by_index(hw, f-&gt;src);</div><div class='add'>+	*p_rate = clk_hw_get_rate(p_hw);</div><div class='add'>+</div><div class='add'>+	return f-&gt;freq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clock set rate function for APSS CPU PLL Clock divider.</div><div class='add'>+ * It looks up the frequency table and updates the PLL divider to corresponding</div><div class='add'>+ * divider value.</div><div class='add'>+ */</div><div class='add'>+static int clk_cpu_div_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_fepll *pll = to_clk_fepll(hw);</div><div class='add'>+	const struct freq_tbl *f;</div><div class='add'>+	u32 mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	f = qcom_find_freq(pll-&gt;freq_tbl, rate);</div><div class='add'>+	if (!f)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mask = (BIT(pll-&gt;cdiv.width) - 1) &lt;&lt; pll-&gt;cdiv.shift;</div><div class='add'>+	ret = regmap_update_bits(pll-&gt;cdiv.clkr.regmap,</div><div class='add'>+				 pll-&gt;cdiv.reg, mask,</div><div class='add'>+				 f-&gt;pre_div &lt;&lt; pll-&gt;cdiv.shift);</div><div class='add'>+	/*</div><div class='add'>+	 * There is no status bit which can be checked for successful CPU</div><div class='add'>+	 * divider update operation so using delay for the same.</div><div class='add'>+	 */</div><div class='add'>+	udelay(1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clock frequency calculation function for APSS CPU PLL Clock divider.</div><div class='add'>+ * This clock divider is nonlinear so this function calculates the actual</div><div class='add'>+ * divider and returns the output frequency by dividing VCO Frequency</div><div class='add'>+ * with this actual divider value.</div><div class='add'>+ */</div><div class='add'>+static unsigned long</div><div class='add'>+clk_cpu_div_recalc_rate(struct clk_hw *hw,</div><div class='add'>+			unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_fepll *pll = to_clk_fepll(hw);</div><div class='add'>+	u32 cdiv, pre_div;</div><div class='add'>+	u64 rate;</div><div class='add'>+</div><div class='add'>+	regmap_read(pll-&gt;cdiv.clkr.regmap, pll-&gt;cdiv.reg, &amp;cdiv);</div><div class='add'>+	cdiv = (cdiv &gt;&gt; pll-&gt;cdiv.shift) &amp; (BIT(pll-&gt;cdiv.width) - 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some dividers have value in 0.5 fraction so multiply both VCO</div><div class='add'>+	 * frequency(parent_rate) and pre_div with 2 to make integer</div><div class='add'>+	 * calculation.</div><div class='add'>+	 */</div><div class='add'>+	if (cdiv &gt; 10)</div><div class='add'>+		pre_div = (cdiv + 1) * 2;</div><div class='add'>+	else</div><div class='add'>+		pre_div = cdiv + 12;</div><div class='add'>+</div><div class='add'>+	rate = clk_fepll_vco_calc_rate(pll, parent_rate) * 2;</div><div class='add'>+	do_div(rate, pre_div);</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_ops clk_regmap_cpu_div_ops = {</div><div class='add'>+	.round_rate = clk_cpu_div_round_rate,</div><div class='add'>+	.set_rate = clk_cpu_div_set_rate,</div><div class='add'>+	.recalc_rate = clk_cpu_div_recalc_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct freq_tbl ftbl_apss_ddr_pll[] = {</div><div class='add'>+	{ 384000000, P_XO, 0xd, 0, 0 },</div><div class='add'>+	{ 413000000, P_XO, 0xc, 0, 0 },</div><div class='add'>+	{ 448000000, P_XO, 0xb, 0, 0 },</div><div class='add'>+	{ 488000000, P_XO, 0xa, 0, 0 },</div><div class='add'>+	{ 512000000, P_XO, 0x9, 0, 0 },</div><div class='add'>+	{ 537000000, P_XO, 0x8, 0, 0 },</div><div class='add'>+	{ 565000000, P_XO, 0x7, 0, 0 },</div><div class='add'>+	{ 597000000, P_XO, 0x6, 0, 0 },</div><div class='add'>+	{ 632000000, P_XO, 0x5, 0, 0 },</div><div class='add'>+	{ 672000000, P_XO, 0x4, 0, 0 },</div><div class='add'>+	{ 716000000, P_XO, 0x3, 0, 0 },</div><div class='add'>+	{ 768000000, P_XO, 0x2, 0, 0 },</div><div class='add'>+	{ 823000000, P_XO, 0x1, 0, 0 },</div><div class='add'>+	{ 896000000, P_XO, 0x0, 0, 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_fepll gcc_apss_cpu_plldiv_clk = {</div><div class='add'>+	.cdiv.reg = 0x2e020,</div><div class='add'>+	.cdiv.shift = 4,</div><div class='add'>+	.cdiv.width = 4,</div><div class='add'>+	.cdiv.clkr = {</div><div class='add'>+		.enable_reg = 0x2e000,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+			.name = "ddrpllapss",</div><div class='add'>+			.parent_names = (const char *[]){</div><div class='add'>+				"xo",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_regmap_cpu_div_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.freq_tbl = ftbl_apss_ddr_pll,</div><div class='add'>+	.pll_vco = &amp;gcc_apss_ddrpll_vco,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Calculates the rate for PLL divider.</div><div class='add'>+ * If the divider value is not fixed then it gets the actual divider value</div><div class='add'>+ * from divider table. Then, it calculate the clock rate by dividing the</div><div class='add'>+ * parent rate with actual divider value.</div><div class='add'>+ */</div><div class='add'>+static unsigned long</div><div class='add'>+clk_regmap_clk_div_recalc_rate(struct clk_hw *hw,</div><div class='add'>+			       unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_fepll *pll = to_clk_fepll(hw);</div><div class='add'>+	u32 cdiv, pre_div = 1;</div><div class='add'>+	u64 rate;</div><div class='add'>+	const struct clk_div_table *clkt;</div><div class='add'>+</div><div class='add'>+	if (pll-&gt;fixed_div) {</div><div class='add'>+		pre_div = pll-&gt;fixed_div;</div><div class='add'>+	} else {</div><div class='add'>+		regmap_read(pll-&gt;cdiv.clkr.regmap, pll-&gt;cdiv.reg, &amp;cdiv);</div><div class='add'>+		cdiv = (cdiv &gt;&gt; pll-&gt;cdiv.shift) &amp; (BIT(pll-&gt;cdiv.width) - 1);</div><div class='add'>+</div><div class='add'>+		for (clkt = pll-&gt;div_table; clkt-&gt;div; clkt++) {</div><div class='add'>+			if (clkt-&gt;val == cdiv)</div><div class='add'>+				pre_div = clkt-&gt;div;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rate = clk_fepll_vco_calc_rate(pll, parent_rate);</div><div class='add'>+	do_div(rate, pre_div);</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_ops clk_fepll_div_ops = {</div><div class='add'>+	.recalc_rate = clk_regmap_clk_div_recalc_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_fepll gcc_apss_sdcc_clk = {</div><div class='add'>+	.fixed_div = 28,</div><div class='add'>+	.cdiv.clkr = {</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+			.name = "ddrpllsdcc",</div><div class='add'>+			.parent_names = (const char *[]){</div><div class='add'>+				"xo",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_fepll_div_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.pll_vco = &amp;gcc_apss_ddrpll_vco,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_fepll gcc_fepll125_clk = {</div><div class='add'>+	.fixed_div = 32,</div><div class='add'>+	.cdiv.clkr = {</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+			.name = "fepll125",</div><div class='add'>+			.parent_names = (const char *[]){</div><div class='add'>+				"xo",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_fepll_div_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.pll_vco = &amp;gcc_fepll_vco,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_fepll gcc_fepll125dly_clk = {</div><div class='add'>+	.fixed_div = 32,</div><div class='add'>+	.cdiv.clkr = {</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+			.name = "fepll125dly",</div><div class='add'>+			.parent_names = (const char *[]){</div><div class='add'>+				"xo",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_fepll_div_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.pll_vco = &amp;gcc_fepll_vco,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_fepll gcc_fepll200_clk = {</div><div class='add'>+	.fixed_div = 20,</div><div class='add'>+	.cdiv.clkr = {</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+			.name = "fepll200",</div><div class='add'>+			.parent_names = (const char *[]){</div><div class='add'>+				"xo",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_fepll_div_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.pll_vco = &amp;gcc_fepll_vco,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_fepll gcc_fepll500_clk = {</div><div class='add'>+	.fixed_div = 8,</div><div class='add'>+	.cdiv.clkr = {</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+			.name = "fepll500",</div><div class='add'>+			.parent_names = (const char *[]){</div><div class='add'>+				"xo",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_fepll_div_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.pll_vco = &amp;gcc_fepll_vco,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_div_table fepllwcss_clk_div_table[] = {</div><div class='add'>+	{ 0, 15 },</div><div class='add'>+	{ 1, 16 },</div><div class='add'>+	{ 2, 18 },</div><div class='add'>+	{ 3, 20 },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_fepll gcc_fepllwcss2g_clk = {</div><div class='add'>+	.cdiv.reg = 0x2f020,</div><div class='add'>+	.cdiv.shift = 8,</div><div class='add'>+	.cdiv.width = 2,</div><div class='add'>+	.cdiv.clkr = {</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+			.name = "fepllwcss2g",</div><div class='add'>+			.parent_names = (const char *[]){</div><div class='add'>+				"xo",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_fepll_div_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.div_table = fepllwcss_clk_div_table,</div><div class='add'>+	.pll_vco = &amp;gcc_fepll_vco,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_fepll gcc_fepllwcss5g_clk = {</div><div class='add'>+	.cdiv.reg = 0x2f020,</div><div class='add'>+	.cdiv.shift = 12,</div><div class='add'>+	.cdiv.width = 2,</div><div class='add'>+	.cdiv.clkr = {</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+			.name = "fepllwcss5g",</div><div class='add'>+			.parent_names = (const char *[]){</div><div class='add'>+				"xo",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_fepll_div_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.div_table = fepllwcss_clk_div_table,</div><div class='add'>+	.pll_vco = &amp;gcc_fepll_vco,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct freq_tbl ftbl_gcc_pcnoc_ahb_clk[] = {</div><div class='add'>+	F(48000000,  P_XO,	 1, 0, 0),</div><div class='add'>+	F(100000000, P_FEPLL200, 2, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 gcc_pcnoc_ahb_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x21024,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_200_500_map,</div><div class='add'>+	.freq_tbl = ftbl_gcc_pcnoc_ahb_clk,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+		.name = "gcc_pcnoc_ahb_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_200_500,</div><div class='add'>+		.num_parents = 3,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch pcnoc_clk_src = {</div><div class='add'>+	.halt_reg = 0x21030,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x21030,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+			.name = "pcnoc_clk_src",</div><div class='add'>+			.parent_names = (const char *[]){</div><div class='add'>+				"gcc_pcnoc_ahb_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT |</div><div class='add'>+				CLK_IS_CRITICAL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk_regmap *gcc_ipq4019_clocks[] = {</div><div class='ctx'> 	[AUDIO_CLK_SRC] = &amp;audio_clk_src.clkr,</div><div class='ctx'> 	[BLSP1_QUP1_I2C_APPS_CLK_SRC] = &amp;blsp1_qup1_i2c_apps_clk_src.clkr,</div><div class='hunk'>@@ -1215,6 +1634,16 @@ static struct clk_regmap *gcc_ipq4019_clocks[] = {</div><div class='ctx'> 	[GCC_WCSS5G_CLK] = &amp;gcc_wcss5g_clk.clkr,</div><div class='ctx'> 	[GCC_WCSS5G_REF_CLK] = &amp;gcc_wcss5g_ref_clk.clkr,</div><div class='ctx'> 	[GCC_WCSS5G_RTC_CLK] = &amp;gcc_wcss5g_rtc_clk.clkr,</div><div class='add'>+	[GCC_SDCC_PLLDIV_CLK] = &amp;gcc_apss_sdcc_clk.cdiv.clkr,</div><div class='add'>+	[GCC_FEPLL125_CLK] = &amp;gcc_fepll125_clk.cdiv.clkr,</div><div class='add'>+	[GCC_FEPLL125DLY_CLK] = &amp;gcc_fepll125dly_clk.cdiv.clkr,</div><div class='add'>+	[GCC_FEPLL200_CLK] = &amp;gcc_fepll200_clk.cdiv.clkr,</div><div class='add'>+	[GCC_FEPLL500_CLK] = &amp;gcc_fepll500_clk.cdiv.clkr,</div><div class='add'>+	[GCC_FEPLL_WCSS2G_CLK] = &amp;gcc_fepllwcss2g_clk.cdiv.clkr,</div><div class='add'>+	[GCC_FEPLL_WCSS5G_CLK] = &amp;gcc_fepllwcss5g_clk.cdiv.clkr,</div><div class='add'>+	[GCC_APSS_CPU_PLLDIV_CLK] = &amp;gcc_apss_cpu_plldiv_clk.cdiv.clkr,</div><div class='add'>+	[GCC_PCNOC_AHB_CLK_SRC] = &amp;gcc_pcnoc_ahb_clk_src.clkr,</div><div class='add'>+	[GCC_PCNOC_AHB_CLK] = &amp;pcnoc_clk_src.clkr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct qcom_reset_map gcc_ipq4019_resets[] = {</div><div class='hunk'>@@ -1295,7 +1724,7 @@ static const struct regmap_config gcc_ipq4019_regmap_config = {</div><div class='ctx'> 	.reg_bits	= 32,</div><div class='ctx'> 	.reg_stride	= 4,</div><div class='ctx'> 	.val_bits	= 32,</div><div class='del'>-	.max_register	= 0x2dfff,</div><div class='add'>+	.max_register	= 0x2ffff,</div><div class='ctx'> 	.fast_io	= true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1313,23 +1742,44 @@ static const struct of_device_id gcc_ipq4019_match_table[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, gcc_ipq4019_match_table);</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+gcc_ipq4019_cpu_clk_notifier_fn(struct notifier_block *nb,</div><div class='add'>+				unsigned long action, void *data)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (action == PRE_RATE_CHANGE)</div><div class='add'>+		err = clk_rcg2_ops.set_parent(&amp;apps_clk_src.clkr.hw,</div><div class='add'>+					      gcc_ipq4019_cpu_safe_parent);</div><div class='add'>+</div><div class='add'>+	return notifier_from_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block gcc_ipq4019_cpu_clk_notifier = {</div><div class='add'>+	.notifier_call = gcc_ipq4019_cpu_clk_notifier_fn,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int gcc_ipq4019_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	clk_register_fixed_rate(dev, "fepll125", "xo", 0, 200000000);</div><div class='del'>-	clk_register_fixed_rate(dev, "fepll125dly", "xo", 0, 200000000);</div><div class='del'>-	clk_register_fixed_rate(dev, "fepllwcss2g", "xo", 0, 200000000);</div><div class='del'>-	clk_register_fixed_rate(dev, "fepllwcss5g", "xo", 0, 200000000);</div><div class='del'>-	clk_register_fixed_rate(dev, "fepll200", "xo", 0, 200000000);</div><div class='del'>-	clk_register_fixed_rate(dev, "fepll500", "xo", 0, 200000000);</div><div class='del'>-	clk_register_fixed_rate(dev, "ddrpllapss", "xo", 0, 666000000);</div><div class='add'>+	err = qcom_cc_probe(pdev, &amp;gcc_ipq4019_desc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	return qcom_cc_probe(pdev, &amp;gcc_ipq4019_desc);</div><div class='add'>+	return clk_notifier_register(apps_clk_src.clkr.hw.clk,</div><div class='add'>+				     &amp;gcc_ipq4019_cpu_clk_notifier);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gcc_ipq4019_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return clk_notifier_unregister(apps_clk_src.clkr.hw.clk,</div><div class='add'>+				       &amp;gcc_ipq4019_cpu_clk_notifier);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver gcc_ipq4019_driver = {</div><div class='ctx'> 	.probe		= gcc_ipq4019_probe,</div><div class='add'>+	.remove		= gcc_ipq4019_remove,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "qcom,gcc-ipq4019",</div><div class='ctx'> 		.of_match_table = gcc_ipq4019_match_table,</div><div class='head'>diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c<br/>index 52a7d3959875..28eb200d0f1e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-ipq806x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/gcc-ipq806x.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-ipq806x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-ipq806x.c</a></div><div class='hunk'>@@ -2990,11 +2990,11 @@ static int gcc_ipq806x_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = qcom_cc_register_board_clk(dev, "cxo_board", "cxo", 19200000);</div><div class='add'>+	ret = qcom_cc_register_board_clk(dev, "cxo_board", "cxo", 25000000);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = qcom_cc_register_board_clk(dev, "pxo_board", "pxo", 27000000);</div><div class='add'>+	ret = qcom_cc_register_board_clk(dev, "pxo_board", "pxo", 25000000);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/qcom/gcc-mdm9615.c b/drivers/clk/qcom/gcc-mdm9615.c<br/>index 581a17f67379..b99dd406e907 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-mdm9615.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/gcc-mdm9615.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-mdm9615.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-mdm9615.c</a></div><div class='hunk'>@@ -1563,6 +1563,34 @@ static struct clk_branch rpm_msg_ram_h_clk = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk_branch ebi2_clk = {</div><div class='add'>+	.hwcg_reg = 0x2664,</div><div class='add'>+	.hwcg_bit = 6,</div><div class='add'>+	.halt_reg = 0x2fcc,</div><div class='add'>+	.halt_bit = 24,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x2664,</div><div class='add'>+		.enable_mask = BIT(6) | BIT(4),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+			.name = "ebi2_clk",</div><div class='add'>+			.ops = &amp;clk_branch_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch ebi2_aon_clk = {</div><div class='add'>+	.halt_reg = 0x2fcc,</div><div class='add'>+	.halt_bit = 23,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x2664,</div><div class='add'>+		.enable_mask = BIT(8),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data){</div><div class='add'>+			.name = "ebi2_aon_clk",</div><div class='add'>+			.ops = &amp;clk_branch_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk_hw *gcc_mdm9615_hws[] = {</div><div class='ctx'> 	&amp;cxo.hw,</div><div class='ctx'> };</div><div class='hunk'>@@ -1637,6 +1665,8 @@ static struct clk_regmap *gcc_mdm9615_clks[] = {</div><div class='ctx'> 	[PMIC_ARB1_H_CLK] = &amp;pmic_arb1_h_clk.clkr,</div><div class='ctx'> 	[PMIC_SSBI2_CLK] = &amp;pmic_ssbi2_clk.clkr,</div><div class='ctx'> 	[RPM_MSG_RAM_H_CLK] = &amp;rpm_msg_ram_h_clk.clkr,</div><div class='add'>+	[EBI2_CLK] = &amp;ebi2_clk.clkr,</div><div class='add'>+	[EBI2_AON_CLK] = &amp;ebi2_aon_clk.clkr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct qcom_reset_map gcc_mdm9615_resets[] = {</div><div class='head'>diff --git a/drivers/clk/qcom/gcc-msm8916.c b/drivers/clk/qcom/gcc-msm8916.c<br/>index 5c4e193164d4..628e6ca276ec 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-msm8916.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/gcc-msm8916.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-msm8916.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-msm8916.c</a></div><div class='hunk'>@@ -1107,7 +1107,7 @@ static struct clk_rcg2 sdcc1_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc1_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0,</div><div class='ctx'> 		.num_parents = 2,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1132,7 +1132,7 @@ static struct clk_rcg2 sdcc2_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc2_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0,</div><div class='ctx'> 		.num_parents = 2,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/qcom/gcc-msm8974.c b/drivers/clk/qcom/gcc-msm8974.c<br/>index 00915209e7c5..348e30da4f18 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-msm8974.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/gcc-msm8974.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-msm8974.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-msm8974.c</a></div><div class='hunk'>@@ -872,7 +872,7 @@ static struct clk_init_data sdcc1_apps_clk_src_init = {</div><div class='ctx'> 	.name = "sdcc1_apps_clk_src",</div><div class='ctx'> 	.parent_names = gcc_xo_gpll0,</div><div class='ctx'> 	.num_parents = 2,</div><div class='del'>-	.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_rcg2 sdcc1_apps_clk_src = {</div><div class='hunk'>@@ -894,7 +894,7 @@ static struct clk_rcg2 sdcc2_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc2_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0,</div><div class='ctx'> 		.num_parents = 2,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -908,7 +908,7 @@ static struct clk_rcg2 sdcc3_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc3_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0,</div><div class='ctx'> 		.num_parents = 2,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -922,7 +922,7 @@ static struct clk_rcg2 sdcc4_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc4_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0,</div><div class='ctx'> 		.num_parents = 2,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/qcom/gcc-msm8994.c b/drivers/clk/qcom/gcc-msm8994.c<br/>new file mode 100644<br/>index 000000000000..7983288d9141<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-msm8994.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-msm8994.c</a></div><div class='hunk'>@@ -0,0 +1,2318 @@</div><div class='add'>+/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 and</div><div class='add'>+ * only version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/qcom,gcc-msm8994.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "clk-regmap.h"</div><div class='add'>+#include "clk-alpha-pll.h"</div><div class='add'>+#include "clk-rcg.h"</div><div class='add'>+#include "clk-branch.h"</div><div class='add'>+#include "reset.h"</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	P_XO,</div><div class='add'>+	P_GPLL0,</div><div class='add'>+	P_GPLL4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct parent_map gcc_xo_gpll0_map[] = {</div><div class='add'>+	{ P_XO, 0 },</div><div class='add'>+	{ P_GPLL0, 1 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const gcc_xo_gpll0[] = {</div><div class='add'>+	"xo",</div><div class='add'>+	"gpll0",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct parent_map gcc_xo_gpll0_gpll4_map[] = {</div><div class='add'>+	{ P_XO, 0 },</div><div class='add'>+	{ P_GPLL0, 1 },</div><div class='add'>+	{ P_GPLL4, 5 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const gcc_xo_gpll0_gpll4[] = {</div><div class='add'>+	"xo",</div><div class='add'>+	"gpll0",</div><div class='add'>+	"gpll4",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define F(f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n) }</div><div class='add'>+</div><div class='add'>+static struct clk_fixed_factor xo = {</div><div class='add'>+	.mult = 1,</div><div class='add'>+	.div = 1,</div><div class='add'>+	.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "xo",</div><div class='add'>+		.parent_names = (const char *[]) { "xo_board" },</div><div class='add'>+		.num_parents = 1,</div><div class='add'>+		.ops = &amp;clk_fixed_factor_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_alpha_pll gpll0_early = {</div><div class='add'>+	.offset = 0x00000,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1480,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gpll0_early",</div><div class='add'>+			.parent_names = (const char *[]) { "xo" },</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_alpha_pll_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_alpha_pll_postdiv gpll0 = {</div><div class='add'>+	.offset = 0x00000,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "gpll0",</div><div class='add'>+		.parent_names = (const char *[]) { "gpll0_early" },</div><div class='add'>+		.num_parents = 1,</div><div class='add'>+		.ops = &amp;clk_alpha_pll_postdiv_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_alpha_pll gpll4_early = {</div><div class='add'>+	.offset = 0x1dc0,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1480,</div><div class='add'>+		.enable_mask = BIT(4),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gpll4_early",</div><div class='add'>+			.parent_names = (const char *[]) { "xo" },</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_alpha_pll_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_alpha_pll_postdiv gpll4 = {</div><div class='add'>+	.offset = 0x1dc0,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "gpll4",</div><div class='add'>+		.parent_names = (const char *[]) { "gpll4_early" },</div><div class='add'>+		.num_parents = 1,</div><div class='add'>+		.ops = &amp;clk_alpha_pll_postdiv_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_ufs_axi_clk_src[] = {</div><div class='add'>+	F(50000000, P_GPLL0, 12, 0, 0),</div><div class='add'>+	F(100000000, P_GPLL0, 6, 0, 0),</div><div class='add'>+	F(150000000, P_GPLL0, 4, 0, 0),</div><div class='add'>+	F(171430000, P_GPLL0, 3.5, 0, 0),</div><div class='add'>+	F(200000000, P_GPLL0, 3, 0, 0),</div><div class='add'>+	F(240000000, P_GPLL0, 2.5, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 ufs_axi_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x1d68,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_ufs_axi_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "ufs_axi_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_usb30_master_clk_src[] = {</div><div class='add'>+	F(19200000, P_XO, 1, 0, 0),</div><div class='add'>+	F(125000000, P_GPLL0, 1, 5, 24),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 usb30_master_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x03d4,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_usb30_master_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "usb30_master_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_blsp_i2c_apps_clk_src[] = {</div><div class='add'>+	F(19200000, P_XO, 1, 0, 0),</div><div class='add'>+	F(50000000, P_GPLL0, 12, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup1_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0660,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup1_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_blspqup_spi_apps_clk_src[] = {</div><div class='add'>+	F(960000, P_XO, 10, 1, 2),</div><div class='add'>+	F(4800000, P_XO, 4, 0, 0),</div><div class='add'>+	F(9600000, P_XO, 2, 0, 0),</div><div class='add'>+	F(15000000, P_GPLL0, 10, 1, 4),</div><div class='add'>+	F(19200000, P_XO, 1, 0, 0),</div><div class='add'>+	F(24000000, P_GPLL0, 12.5, 1, 2),</div><div class='add'>+	F(25000000, P_GPLL0, 12, 1, 2),</div><div class='add'>+	F(48000000, P_GPLL0, 12.5, 0, 0),</div><div class='add'>+	F(50000000, P_GPLL0, 12, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup1_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x064c,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup1_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup2_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x06e0,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup2_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup2_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x06cc,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup2_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup3_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0760,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup3_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup3_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x074c,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup3_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup4_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x07e0,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup4_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup4_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x07cc,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup4_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup5_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0860,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup5_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup5_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x084c,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup5_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup6_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x08e0,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup6_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_qup6_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x08cc,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_qup6_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_blsp_uart_apps_clk_src[] = {</div><div class='add'>+	F(3686400, P_GPLL0, 1, 96, 15625),</div><div class='add'>+	F(7372800, P_GPLL0, 1, 192, 15625),</div><div class='add'>+	F(14745600, P_GPLL0, 1, 384, 15625),</div><div class='add'>+	F(16000000, P_GPLL0, 5, 2, 15),</div><div class='add'>+	F(19200000, P_XO, 1, 0, 0),</div><div class='add'>+	F(24000000, P_GPLL0, 5, 1, 5),</div><div class='add'>+	F(32000000, P_GPLL0, 1, 4, 75),</div><div class='add'>+	F(40000000, P_GPLL0, 15, 0, 0),</div><div class='add'>+	F(46400000, P_GPLL0, 1, 29, 375),</div><div class='add'>+	F(48000000, P_GPLL0, 12.5, 0, 0),</div><div class='add'>+	F(51200000, P_GPLL0, 1, 32, 375),</div><div class='add'>+	F(56000000, P_GPLL0, 1, 7, 75),</div><div class='add'>+	F(58982400, P_GPLL0, 1, 1536, 15625),</div><div class='add'>+	F(60000000, P_GPLL0, 10, 0, 0),</div><div class='add'>+	F(63160000, P_GPLL0, 9.5, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_uart1_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x068c,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_uart1_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_uart2_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x070c,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_uart2_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_uart3_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x078c,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_uart3_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_uart4_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x080c,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_uart4_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_uart5_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x088c,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_uart5_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp1_uart6_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x090c,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp1_uart6_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup1_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x09a0,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup1_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup1_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x098c,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup1_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup2_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0a20,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup2_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup2_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0a0c,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup2_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup3_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0aa0,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup3_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup3_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0a8c,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup3_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup4_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0b20,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup4_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup4_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0b0c,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup4_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup5_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0ba0,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup5_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup5_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0b8c,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup5_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup6_i2c_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0c20,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_i2c_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup6_i2c_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_qup6_spi_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0c0c,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blspqup_spi_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_qup6_spi_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_uart1_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x09cc,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_uart1_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_uart2_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0a4c,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_uart2_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_uart3_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0acc,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_uart3_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_uart4_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0b4c,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_uart4_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_uart5_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0bcc,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_uart5_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 blsp2_uart6_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0c4c,</div><div class='add'>+	.mnd_width = 16,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_blsp_uart_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "blsp2_uart6_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_gp1_clk_src[] = {</div><div class='add'>+	F(19200000, P_XO, 1, 0, 0),</div><div class='add'>+	F(100000000, P_GPLL0, 6, 0, 0),</div><div class='add'>+	F(200000000, P_GPLL0, 3, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 gp1_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x1904,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_gp1_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "gp1_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_gp2_clk_src[] = {</div><div class='add'>+	F(19200000, P_XO, 1, 0, 0),</div><div class='add'>+	F(100000000, P_GPLL0, 6, 0, 0),</div><div class='add'>+	F(200000000, P_GPLL0, 3, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 gp2_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x1944,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_gp2_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "gp2_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_gp3_clk_src[] = {</div><div class='add'>+	F(19200000, P_XO, 1, 0, 0),</div><div class='add'>+	F(100000000, P_GPLL0, 6, 0, 0),</div><div class='add'>+	F(200000000, P_GPLL0, 3, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 gp3_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x1984,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_gp3_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "gp3_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_pcie_0_aux_clk_src[] = {</div><div class='add'>+	F(1011000, P_XO, 1, 1, 19),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 pcie_0_aux_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x1b00,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.freq_tbl = ftbl_pcie_0_aux_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "pcie_0_aux_clk_src",</div><div class='add'>+		.parent_names = (const char *[]) { "xo" },</div><div class='add'>+		.num_parents = 1,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_pcie_pipe_clk_src[] = {</div><div class='add'>+	F(125000000, P_XO, 1, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 pcie_0_pipe_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x1adc,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.freq_tbl = ftbl_pcie_pipe_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "pcie_0_pipe_clk_src",</div><div class='add'>+		.parent_names = (const char *[]) { "xo" },</div><div class='add'>+		.num_parents = 1,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_pcie_1_aux_clk_src[] = {</div><div class='add'>+	F(1011000, P_XO, 1, 1, 19),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 pcie_1_aux_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x1b80,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.freq_tbl = ftbl_pcie_1_aux_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "pcie_1_aux_clk_src",</div><div class='add'>+		.parent_names = (const char *[]) { "xo" },</div><div class='add'>+		.num_parents = 1,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 pcie_1_pipe_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x1b5c,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.freq_tbl = ftbl_pcie_pipe_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "pcie_1_pipe_clk_src",</div><div class='add'>+		.parent_names = (const char *[]) { "xo" },</div><div class='add'>+		.num_parents = 1,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_pdm2_clk_src[] = {</div><div class='add'>+	F(60000000, P_GPLL0, 10, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 pdm2_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0cd0,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_pdm2_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "pdm2_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_sdcc1_apps_clk_src[] = {</div><div class='add'>+	F(144000, P_XO, 16, 3, 25),</div><div class='add'>+	F(400000, P_XO, 12, 1, 4),</div><div class='add'>+	F(20000000, P_GPLL0, 15, 1, 2),</div><div class='add'>+	F(25000000, P_GPLL0, 12, 1, 2),</div><div class='add'>+	F(50000000, P_GPLL0, 12, 0, 0),</div><div class='add'>+	F(100000000, P_GPLL0, 6, 0, 0),</div><div class='add'>+	F(192000000, P_GPLL4, 2, 0, 0),</div><div class='add'>+	F(384000000, P_GPLL4, 1, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 sdcc1_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x04d0,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_gpll4_map,</div><div class='add'>+	.freq_tbl = ftbl_sdcc1_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "sdcc1_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0_gpll4,</div><div class='add'>+		.num_parents = 3,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_sdcc2_4_apps_clk_src[] = {</div><div class='add'>+	F(144000, P_XO, 16, 3, 25),</div><div class='add'>+	F(400000, P_XO, 12, 1, 4),</div><div class='add'>+	F(20000000, P_GPLL0, 15, 1, 2),</div><div class='add'>+	F(25000000, P_GPLL0, 12, 1, 2),</div><div class='add'>+	F(50000000, P_GPLL0, 12, 0, 0),</div><div class='add'>+	F(100000000, P_GPLL0, 6, 0, 0),</div><div class='add'>+	F(200000000, P_GPLL0, 3, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 sdcc2_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0510,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_sdcc2_4_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "sdcc2_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 sdcc3_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0550,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_sdcc2_4_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "sdcc3_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 sdcc4_apps_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0590,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_sdcc2_4_apps_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "sdcc4_apps_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_tsif_ref_clk_src[] = {</div><div class='add'>+	F(105500, P_XO, 1, 1, 182),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 tsif_ref_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0d90,</div><div class='add'>+	.mnd_width = 8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.freq_tbl = ftbl_tsif_ref_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "tsif_ref_clk_src",</div><div class='add'>+		.parent_names = (const char *[]) { "xo" },</div><div class='add'>+		.num_parents = 1,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_usb30_mock_utmi_clk_src[] = {</div><div class='add'>+	F(19200000, P_XO, 1, 0, 0),</div><div class='add'>+	F(60000000, P_GPLL0, 10, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 usb30_mock_utmi_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x03e8,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_usb30_mock_utmi_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "usb30_mock_utmi_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_usb3_phy_aux_clk_src[] = {</div><div class='add'>+	F(1200000, P_XO, 16, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 usb3_phy_aux_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x1414,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.freq_tbl = ftbl_usb3_phy_aux_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "usb3_phy_aux_clk_src",</div><div class='add'>+		.parent_names = (const char *[]) { "xo" },</div><div class='add'>+		.num_parents = 1,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct freq_tbl ftbl_usb_hs_system_clk_src[] = {</div><div class='add'>+	F(75000000, P_GPLL0, 8, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_rcg2 usb_hs_system_clk_src = {</div><div class='add'>+	.cmd_rcgr = 0x0490,</div><div class='add'>+	.hid_width = 5,</div><div class='add'>+	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_usb_hs_system_clk_src,</div><div class='add'>+	.clkr.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+	{</div><div class='add'>+		.name = "usb_hs_system_clk_src",</div><div class='add'>+		.parent_names = gcc_xo_gpll0,</div><div class='add'>+		.num_parents = 2,</div><div class='add'>+		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_ahb_clk = {</div><div class='add'>+	.halt_reg = 0x05c4,</div><div class='add'>+	.halt_check = BRANCH_HALT_VOTED,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1484,</div><div class='add'>+		.enable_mask = BIT(17),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_ahb_clk",</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup1_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0648,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0648,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup1_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup1_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup1_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0644,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0644,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup1_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup1_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup2_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x06c8,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x06c8,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup2_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup2_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup2_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x06c4,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x06c4,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup2_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup2_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup3_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0748,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0748,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup3_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup3_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup3_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0744,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0744,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup3_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup3_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup4_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x07c8,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x07c8,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup4_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup4_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup4_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x07c4,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x07c4,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup4_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup4_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup5_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0848,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0848,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup5_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup5_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup5_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0844,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0844,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup5_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup5_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup6_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x08c8,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x08c8,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup6_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup6_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_qup6_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x08c4,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x08c4,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_qup6_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_qup6_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_uart1_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0684,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0684,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_uart1_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_uart1_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_uart2_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0704,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0704,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_uart2_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_uart2_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_uart3_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0784,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0784,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_uart3_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_uart3_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_uart4_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0804,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0804,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_uart4_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_uart4_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_uart5_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0884,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0884,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_uart5_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_uart5_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp1_uart6_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0904,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0904,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp1_uart6_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp1_uart6_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_ahb_clk = {</div><div class='add'>+	.halt_reg = 0x0944,</div><div class='add'>+	.halt_check = BRANCH_HALT_VOTED,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1484,</div><div class='add'>+		.enable_mask = BIT(15),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_ahb_clk",</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup1_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0988,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0988,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup1_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup1_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup1_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0984,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0984,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup1_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup1_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup2_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0a08,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0a08,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup2_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup2_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup2_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0a04,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0a04,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup2_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup2_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup3_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0a88,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0a88,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup3_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup3_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup3_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0a84,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0a84,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup3_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup3_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup4_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0b08,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0b08,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup4_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup4_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup4_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0b04,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0b04,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup4_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup4_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup5_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0b88,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0b88,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup5_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup5_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup5_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0b84,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0b84,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup5_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup5_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup6_i2c_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0c08,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0c08,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup6_i2c_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup6_i2c_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_qup6_spi_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0c04,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0c04,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_qup6_spi_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_qup6_spi_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_uart1_apps_clk = {</div><div class='add'>+	.halt_reg = 0x09c4,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x09c4,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_uart1_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_uart1_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_uart2_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0a44,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0a44,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_uart2_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_uart2_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_uart3_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0ac4,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0ac4,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_uart3_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_uart3_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_uart4_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0b44,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0b44,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_uart4_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_uart4_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_uart5_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0bc4,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0bc4,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_uart5_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_uart5_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_blsp2_uart6_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0c44,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0c44,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_blsp2_uart6_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"blsp2_uart6_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_gp1_clk = {</div><div class='add'>+	.halt_reg = 0x1900,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1900,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_gp1_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"gp1_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_gp2_clk = {</div><div class='add'>+	.halt_reg = 0x1940,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1940,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_gp2_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"gp2_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_gp3_clk = {</div><div class='add'>+	.halt_reg = 0x1980,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1980,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_gp3_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"gp3_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_pcie_0_aux_clk = {</div><div class='add'>+	.halt_reg = 0x1ad4,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1ad4,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_pcie_0_aux_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"pcie_0_aux_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_pcie_0_pipe_clk = {</div><div class='add'>+	.halt_reg = 0x1ad8,</div><div class='add'>+	.halt_check = BRANCH_HALT_DELAY,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1ad8,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_pcie_0_pipe_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"pcie_0_pipe_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_pcie_1_aux_clk = {</div><div class='add'>+	.halt_reg = 0x1b54,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1b54,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_pcie_1_aux_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"pcie_1_aux_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_pcie_1_pipe_clk = {</div><div class='add'>+	.halt_reg = 0x1b58,</div><div class='add'>+	.halt_check = BRANCH_HALT_DELAY,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1b58,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_pcie_1_pipe_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"pcie_1_pipe_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_pdm2_clk = {</div><div class='add'>+	.halt_reg = 0x0ccc,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0ccc,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_pdm2_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"pdm2_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_sdcc1_apps_clk = {</div><div class='add'>+	.halt_reg = 0x04c4,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x04c4,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_sdcc1_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"sdcc1_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_sdcc1_ahb_clk = {</div><div class='add'>+	.halt_reg = 0x04c8,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x04c8,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_sdcc1_ahb_clk",</div><div class='add'>+			.parent_names = (const char *[]){</div><div class='add'>+				"periph_noc_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_sdcc2_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0504,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0504,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_sdcc2_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"sdcc2_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_sdcc3_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0544,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0544,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_sdcc3_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"sdcc3_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_sdcc4_apps_clk = {</div><div class='add'>+	.halt_reg = 0x0584,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0584,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_sdcc4_apps_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"sdcc4_apps_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_sys_noc_ufs_axi_clk = {</div><div class='add'>+	.halt_reg = 0x1d7c,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1d7c,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_sys_noc_ufs_axi_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"ufs_axi_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_sys_noc_usb3_axi_clk = {</div><div class='add'>+	.halt_reg = 0x03fc,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x03fc,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_sys_noc_usb3_axi_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"usb30_master_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_tsif_ref_clk = {</div><div class='add'>+	.halt_reg = 0x0d88,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0d88,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_tsif_ref_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"tsif_ref_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_ufs_axi_clk = {</div><div class='add'>+	.halt_reg = 0x1d48,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1d48,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_ufs_axi_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"ufs_axi_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_ufs_rx_cfg_clk = {</div><div class='add'>+	.halt_reg = 0x1d54,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1d54,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_ufs_rx_cfg_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"ufs_axi_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_ufs_tx_cfg_clk = {</div><div class='add'>+	.halt_reg = 0x1d50,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1d50,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_ufs_tx_cfg_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"ufs_axi_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_usb30_master_clk = {</div><div class='add'>+	.halt_reg = 0x03c8,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x03c8,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_usb30_master_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"usb30_master_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_usb30_mock_utmi_clk = {</div><div class='add'>+	.halt_reg = 0x03d0,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x03d0,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_usb30_mock_utmi_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"usb30_mock_utmi_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_usb3_phy_aux_clk = {</div><div class='add'>+	.halt_reg = 0x1408,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x1408,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_usb3_phy_aux_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"usb3_phy_aux_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_branch gcc_usb_hs_system_clk = {</div><div class='add'>+	.halt_reg = 0x0484,</div><div class='add'>+	.clkr = {</div><div class='add'>+		.enable_reg = 0x0484,</div><div class='add'>+		.enable_mask = BIT(0),</div><div class='add'>+		.hw.init = &amp;(struct clk_init_data)</div><div class='add'>+		{</div><div class='add'>+			.name = "gcc_usb_hs_system_clk",</div><div class='add'>+			.parent_names = (const char *[]) {</div><div class='add'>+				"usb_hs_system_clk_src",</div><div class='add'>+			},</div><div class='add'>+			.num_parents = 1,</div><div class='add'>+			.flags = CLK_SET_RATE_PARENT,</div><div class='add'>+			.ops = &amp;clk_branch2_ops,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_regmap *gcc_msm8994_clocks[] = {</div><div class='add'>+	[GPLL0_EARLY] = &amp;gpll0_early.clkr,</div><div class='add'>+	[GPLL0] = &amp;gpll0.clkr,</div><div class='add'>+	[GPLL4_EARLY] = &amp;gpll4_early.clkr,</div><div class='add'>+	[GPLL4] = &amp;gpll4.clkr,</div><div class='add'>+	[UFS_AXI_CLK_SRC] = &amp;ufs_axi_clk_src.clkr,</div><div class='add'>+	[USB30_MASTER_CLK_SRC] = &amp;usb30_master_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP1_I2C_APPS_CLK_SRC] = &amp;blsp1_qup1_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP1_SPI_APPS_CLK_SRC] = &amp;blsp1_qup1_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP2_I2C_APPS_CLK_SRC] = &amp;blsp1_qup2_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP2_SPI_APPS_CLK_SRC] = &amp;blsp1_qup2_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP3_I2C_APPS_CLK_SRC] = &amp;blsp1_qup3_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP3_SPI_APPS_CLK_SRC] = &amp;blsp1_qup3_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP4_I2C_APPS_CLK_SRC] = &amp;blsp1_qup4_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP4_SPI_APPS_CLK_SRC] = &amp;blsp1_qup4_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP5_I2C_APPS_CLK_SRC] = &amp;blsp1_qup5_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP5_SPI_APPS_CLK_SRC] = &amp;blsp1_qup5_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP6_I2C_APPS_CLK_SRC] = &amp;blsp1_qup6_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_QUP6_SPI_APPS_CLK_SRC] = &amp;blsp1_qup6_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_UART1_APPS_CLK_SRC] = &amp;blsp1_uart1_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_UART2_APPS_CLK_SRC] = &amp;blsp1_uart2_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_UART3_APPS_CLK_SRC] = &amp;blsp1_uart3_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_UART4_APPS_CLK_SRC] = &amp;blsp1_uart4_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_UART5_APPS_CLK_SRC] = &amp;blsp1_uart5_apps_clk_src.clkr,</div><div class='add'>+	[BLSP1_UART6_APPS_CLK_SRC] = &amp;blsp1_uart6_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP1_I2C_APPS_CLK_SRC] = &amp;blsp2_qup1_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP1_SPI_APPS_CLK_SRC] = &amp;blsp2_qup1_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP2_I2C_APPS_CLK_SRC] = &amp;blsp2_qup2_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP2_SPI_APPS_CLK_SRC] = &amp;blsp2_qup2_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP3_I2C_APPS_CLK_SRC] = &amp;blsp2_qup3_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP3_SPI_APPS_CLK_SRC] = &amp;blsp2_qup3_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP4_I2C_APPS_CLK_SRC] = &amp;blsp2_qup4_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP4_SPI_APPS_CLK_SRC] = &amp;blsp2_qup4_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP5_I2C_APPS_CLK_SRC] = &amp;blsp2_qup5_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP5_SPI_APPS_CLK_SRC] = &amp;blsp2_qup5_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP6_I2C_APPS_CLK_SRC] = &amp;blsp2_qup6_i2c_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_QUP6_SPI_APPS_CLK_SRC] = &amp;blsp2_qup6_spi_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_UART1_APPS_CLK_SRC] = &amp;blsp2_uart1_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_UART2_APPS_CLK_SRC] = &amp;blsp2_uart2_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_UART3_APPS_CLK_SRC] = &amp;blsp2_uart3_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_UART4_APPS_CLK_SRC] = &amp;blsp2_uart4_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_UART5_APPS_CLK_SRC] = &amp;blsp2_uart5_apps_clk_src.clkr,</div><div class='add'>+	[BLSP2_UART6_APPS_CLK_SRC] = &amp;blsp2_uart6_apps_clk_src.clkr,</div><div class='add'>+	[GP1_CLK_SRC] = &amp;gp1_clk_src.clkr,</div><div class='add'>+	[GP2_CLK_SRC] = &amp;gp2_clk_src.clkr,</div><div class='add'>+	[GP3_CLK_SRC] = &amp;gp3_clk_src.clkr,</div><div class='add'>+	[PCIE_0_AUX_CLK_SRC] = &amp;pcie_0_aux_clk_src.clkr,</div><div class='add'>+	[PCIE_0_PIPE_CLK_SRC] = &amp;pcie_0_pipe_clk_src.clkr,</div><div class='add'>+	[PCIE_1_AUX_CLK_SRC] = &amp;pcie_1_aux_clk_src.clkr,</div><div class='add'>+	[PCIE_1_PIPE_CLK_SRC] = &amp;pcie_1_pipe_clk_src.clkr,</div><div class='add'>+	[PDM2_CLK_SRC] = &amp;pdm2_clk_src.clkr,</div><div class='add'>+	[SDCC1_APPS_CLK_SRC] = &amp;sdcc1_apps_clk_src.clkr,</div><div class='add'>+	[SDCC2_APPS_CLK_SRC] = &amp;sdcc2_apps_clk_src.clkr,</div><div class='add'>+	[SDCC3_APPS_CLK_SRC] = &amp;sdcc3_apps_clk_src.clkr,</div><div class='add'>+	[SDCC4_APPS_CLK_SRC] = &amp;sdcc4_apps_clk_src.clkr,</div><div class='add'>+	[TSIF_REF_CLK_SRC] = &amp;tsif_ref_clk_src.clkr,</div><div class='add'>+	[USB30_MOCK_UTMI_CLK_SRC] = &amp;usb30_mock_utmi_clk_src.clkr,</div><div class='add'>+	[USB3_PHY_AUX_CLK_SRC] = &amp;usb3_phy_aux_clk_src.clkr,</div><div class='add'>+	[USB_HS_SYSTEM_CLK_SRC] = &amp;usb_hs_system_clk_src.clkr,</div><div class='add'>+	[GCC_BLSP1_AHB_CLK] = &amp;gcc_blsp1_ahb_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP1_I2C_APPS_CLK] = &amp;gcc_blsp1_qup1_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP1_SPI_APPS_CLK] = &amp;gcc_blsp1_qup1_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP2_I2C_APPS_CLK] = &amp;gcc_blsp1_qup2_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP2_SPI_APPS_CLK] = &amp;gcc_blsp1_qup2_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP3_I2C_APPS_CLK] = &amp;gcc_blsp1_qup3_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP3_SPI_APPS_CLK] = &amp;gcc_blsp1_qup3_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP4_I2C_APPS_CLK] = &amp;gcc_blsp1_qup4_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP4_SPI_APPS_CLK] = &amp;gcc_blsp1_qup4_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP5_I2C_APPS_CLK] = &amp;gcc_blsp1_qup5_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP5_SPI_APPS_CLK] = &amp;gcc_blsp1_qup5_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP6_I2C_APPS_CLK] = &amp;gcc_blsp1_qup6_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_QUP6_SPI_APPS_CLK] = &amp;gcc_blsp1_qup6_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_UART1_APPS_CLK] = &amp;gcc_blsp1_uart1_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_UART2_APPS_CLK] = &amp;gcc_blsp1_uart2_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_UART3_APPS_CLK] = &amp;gcc_blsp1_uart3_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_UART4_APPS_CLK] = &amp;gcc_blsp1_uart4_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_UART5_APPS_CLK] = &amp;gcc_blsp1_uart5_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP1_UART6_APPS_CLK] = &amp;gcc_blsp1_uart6_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_AHB_CLK] = &amp;gcc_blsp2_ahb_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP1_I2C_APPS_CLK] = &amp;gcc_blsp2_qup1_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP1_SPI_APPS_CLK] = &amp;gcc_blsp2_qup1_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP2_I2C_APPS_CLK] = &amp;gcc_blsp2_qup2_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP2_SPI_APPS_CLK] = &amp;gcc_blsp2_qup2_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP3_I2C_APPS_CLK] = &amp;gcc_blsp2_qup3_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP3_SPI_APPS_CLK] = &amp;gcc_blsp2_qup3_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP4_I2C_APPS_CLK] = &amp;gcc_blsp2_qup4_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP4_SPI_APPS_CLK] = &amp;gcc_blsp2_qup4_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP5_I2C_APPS_CLK] = &amp;gcc_blsp2_qup5_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP5_SPI_APPS_CLK] = &amp;gcc_blsp2_qup5_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP6_I2C_APPS_CLK] = &amp;gcc_blsp2_qup6_i2c_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_QUP6_SPI_APPS_CLK] = &amp;gcc_blsp2_qup6_spi_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_UART1_APPS_CLK] = &amp;gcc_blsp2_uart1_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_UART2_APPS_CLK] = &amp;gcc_blsp2_uart2_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_UART3_APPS_CLK] = &amp;gcc_blsp2_uart3_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_UART4_APPS_CLK] = &amp;gcc_blsp2_uart4_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_UART5_APPS_CLK] = &amp;gcc_blsp2_uart5_apps_clk.clkr,</div><div class='add'>+	[GCC_BLSP2_UART6_APPS_CLK] = &amp;gcc_blsp2_uart6_apps_clk.clkr,</div><div class='add'>+	[GCC_GP1_CLK] = &amp;gcc_gp1_clk.clkr,</div><div class='add'>+	[GCC_GP2_CLK] = &amp;gcc_gp2_clk.clkr,</div><div class='add'>+	[GCC_GP3_CLK] = &amp;gcc_gp3_clk.clkr,</div><div class='add'>+	[GCC_PCIE_0_AUX_CLK] = &amp;gcc_pcie_0_aux_clk.clkr,</div><div class='add'>+	[GCC_PCIE_0_PIPE_CLK] = &amp;gcc_pcie_0_pipe_clk.clkr,</div><div class='add'>+	[GCC_PCIE_1_AUX_CLK] = &amp;gcc_pcie_1_aux_clk.clkr,</div><div class='add'>+	[GCC_PCIE_1_PIPE_CLK] = &amp;gcc_pcie_1_pipe_clk.clkr,</div><div class='add'>+	[GCC_PDM2_CLK] = &amp;gcc_pdm2_clk.clkr,</div><div class='add'>+	[GCC_SDCC1_APPS_CLK] = &amp;gcc_sdcc1_apps_clk.clkr,</div><div class='add'>+	[GCC_SDCC2_APPS_CLK] = &amp;gcc_sdcc2_apps_clk.clkr,</div><div class='add'>+	[GCC_SDCC3_APPS_CLK] = &amp;gcc_sdcc3_apps_clk.clkr,</div><div class='add'>+	[GCC_SDCC4_APPS_CLK] = &amp;gcc_sdcc4_apps_clk.clkr,</div><div class='add'>+	[GCC_SDCC1_AHB_CLK] = &amp;gcc_sdcc1_ahb_clk.clkr,</div><div class='add'>+	[GCC_SYS_NOC_UFS_AXI_CLK] = &amp;gcc_sys_noc_ufs_axi_clk.clkr,</div><div class='add'>+	[GCC_SYS_NOC_USB3_AXI_CLK] = &amp;gcc_sys_noc_usb3_axi_clk.clkr,</div><div class='add'>+	[GCC_TSIF_REF_CLK] = &amp;gcc_tsif_ref_clk.clkr,</div><div class='add'>+	[GCC_UFS_AXI_CLK] = &amp;gcc_ufs_axi_clk.clkr,</div><div class='add'>+	[GCC_UFS_RX_CFG_CLK] = &amp;gcc_ufs_rx_cfg_clk.clkr,</div><div class='add'>+	[GCC_UFS_TX_CFG_CLK] = &amp;gcc_ufs_tx_cfg_clk.clkr,</div><div class='add'>+	[GCC_USB30_MASTER_CLK] = &amp;gcc_usb30_master_clk.clkr,</div><div class='add'>+	[GCC_USB30_MOCK_UTMI_CLK] = &amp;gcc_usb30_mock_utmi_clk.clkr,</div><div class='add'>+	[GCC_USB3_PHY_AUX_CLK] = &amp;gcc_usb3_phy_aux_clk.clkr,</div><div class='add'>+	[GCC_USB_HS_SYSTEM_CLK] = &amp;gcc_usb_hs_system_clk.clkr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config gcc_msm8994_regmap_config = {</div><div class='add'>+	.reg_bits	= 32,</div><div class='add'>+	.reg_stride	= 4,</div><div class='add'>+	.val_bits	= 32,</div><div class='add'>+	.max_register	= 0x2000,</div><div class='add'>+	.fast_io	= true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qcom_cc_desc gcc_msm8994_desc = {</div><div class='add'>+	.config = &amp;gcc_msm8994_regmap_config,</div><div class='add'>+	.clks = gcc_msm8994_clocks,</div><div class='add'>+	.num_clks = ARRAY_SIZE(gcc_msm8994_clocks),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id gcc_msm8994_match_table[] = {</div><div class='add'>+	{ .compatible = "qcom,gcc-msm8994" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, gcc_msm8994_match_table);</div><div class='add'>+</div><div class='add'>+static int gcc_msm8994_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	clk = devm_clk_register(dev, &amp;xo.hw);</div><div class='add'>+	if (IS_ERR(clk))</div><div class='add'>+		return PTR_ERR(clk);</div><div class='add'>+</div><div class='add'>+	return qcom_cc_probe(pdev, &amp;gcc_msm8994_desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver gcc_msm8994_driver = {</div><div class='add'>+	.probe		= gcc_msm8994_probe,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "gcc-msm8994",</div><div class='add'>+		.of_match_table = gcc_msm8994_match_table,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init gcc_msm8994_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;gcc_msm8994_driver);</div><div class='add'>+}</div><div class='add'>+core_initcall(gcc_msm8994_init);</div><div class='add'>+</div><div class='add'>+static void __exit gcc_msm8994_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;gcc_msm8994_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(gcc_msm8994_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Qualcomm GCC MSM8994 Driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS("platform:gcc-msm8994");</div><div class='head'>diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c<br/>index fe03e6fbc7df..8abc200d4fd3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-msm8996.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/gcc-msm8996.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/gcc-msm8996.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gcc-msm8996.c</a></div><div class='hunk'>@@ -460,14 +460,22 @@ static struct clk_rcg2 sdcc1_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc1_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0_gpll4_gpll0_early_div,</div><div class='ctx'> 		.num_parents = 4,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct freq_tbl ftbl_sdcc1_ice_core_clk_src[] = {</div><div class='add'>+	F(19200000, P_XO, 1, 0, 0),</div><div class='add'>+	F(150000000, P_GPLL0, 4, 0, 0),</div><div class='add'>+	F(300000000, P_GPLL0, 2, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk_rcg2 sdcc1_ice_core_clk_src = {</div><div class='ctx'> 	.cmd_rcgr = 0x13024,</div><div class='ctx'> 	.hid_width = 5,</div><div class='ctx'> 	.parent_map = gcc_xo_gpll0_gpll4_gpll0_early_div_map,</div><div class='add'>+	.freq_tbl = ftbl_sdcc1_ice_core_clk_src,</div><div class='ctx'> 	.clkr.hw.init = &amp;(struct clk_init_data){</div><div class='ctx'> 		.name = "sdcc1_ice_core_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0_gpll4_gpll0_early_div,</div><div class='hunk'>@@ -497,7 +505,7 @@ static struct clk_rcg2 sdcc2_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc2_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0_gpll4,</div><div class='ctx'> 		.num_parents = 3,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -511,7 +519,7 @@ static struct clk_rcg2 sdcc3_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc3_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0_gpll4,</div><div class='ctx'> 		.num_parents = 3,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -535,7 +543,7 @@ static struct clk_rcg2 sdcc4_apps_clk_src = {</div><div class='ctx'> 		.name = "sdcc4_apps_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0,</div><div class='ctx'> 		.num_parents = 2,</div><div class='del'>-		.ops = &amp;clk_rcg2_ops,</div><div class='add'>+		.ops = &amp;clk_rcg2_floor_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1230,10 +1238,18 @@ static struct clk_rcg2 ufs_axi_clk_src = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct freq_tbl ftbl_ufs_ice_core_clk_src[] = {</div><div class='add'>+	F(19200000, P_XO, 1, 0, 0),</div><div class='add'>+	F(150000000, P_GPLL0, 4, 0, 0),</div><div class='add'>+	F(300000000, P_GPLL0, 2, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk_rcg2 ufs_ice_core_clk_src = {</div><div class='ctx'> 	.cmd_rcgr = 0x76014,</div><div class='ctx'> 	.hid_width = 5,</div><div class='ctx'> 	.parent_map = gcc_xo_gpll0_map,</div><div class='add'>+	.freq_tbl = ftbl_ufs_ice_core_clk_src,</div><div class='ctx'> 	.clkr.hw.init = &amp;(struct clk_init_data){</div><div class='ctx'> 		.name = "ufs_ice_core_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0,</div><div class='hunk'>@@ -1242,10 +1258,19 @@ static struct clk_rcg2 ufs_ice_core_clk_src = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct freq_tbl ftbl_qspi_ser_clk_src[] = {</div><div class='add'>+	F(75000000, P_GPLL0, 8, 0, 0),</div><div class='add'>+	F(150000000, P_GPLL0, 4, 0, 0),</div><div class='add'>+	F(256000000, P_GPLL4, 1.5, 0, 0),</div><div class='add'>+	F(300000000, P_GPLL0, 2, 0, 0),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk_rcg2 qspi_ser_clk_src = {</div><div class='ctx'> 	.cmd_rcgr = 0x8b00c,</div><div class='ctx'> 	.hid_width = 5,</div><div class='ctx'> 	.parent_map = gcc_xo_gpll0_gpll1_early_div_gpll1_gpll4_gpll0_early_div_map,</div><div class='add'>+	.freq_tbl = ftbl_qspi_ser_clk_src,</div><div class='ctx'> 	.clkr.hw.init = &amp;(struct clk_init_data){</div><div class='ctx'> 		.name = "qspi_ser_clk_src",</div><div class='ctx'> 		.parent_names = gcc_xo_gpll0_gpll1_early_div_gpll1_gpll4_gpll0_early_div,</div><div class='hunk'>@@ -3423,6 +3448,7 @@ static const struct qcom_reset_map gcc_msm8996_resets[] = {</div><div class='ctx'> 	[GCC_MSMPU_BCR] = { 0x8d000 },</div><div class='ctx'> 	[GCC_MSS_Q6_BCR] = { 0x8e000 },</div><div class='ctx'> 	[GCC_QREFS_VBG_CAL_BCR] = { 0x88020 },</div><div class='add'>+	[GCC_MSS_RESTART] = { 0x8f008 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct regmap_config gcc_msm8996_regmap_config = {</div><div class='head'>diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c<br/>index f12d7b2bddd7..a4f3580587b7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/gdsc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/gdsc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/gdsc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gdsc.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #define SW_OVERRIDE_MASK	BIT(2)</div><div class='ctx'> #define HW_CONTROL_MASK		BIT(1)</div><div class='ctx'> #define SW_COLLAPSE_MASK	BIT(0)</div><div class='add'>+#define GMEM_CLAMP_IO_MASK	BIT(0)</div><div class='ctx'> </div><div class='ctx'> /* Wait 2^n CXO cycles between all states. Here, n=2 (4 cycles). */</div><div class='ctx'> #define EN_REST_WAIT_VAL	(0x2 &lt;&lt; 20)</div><div class='hunk'>@@ -55,11 +56,33 @@ static int gdsc_is_enabled(struct gdsc *sc, unsigned int reg)</div><div class='ctx'> 	return !!(val &amp; PWR_ON_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int gdsc_hwctrl(struct gdsc *sc, bool en)</div><div class='add'>+{</div><div class='add'>+	u32 val = en ? HW_CONTROL_MASK : 0;</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(sc-&gt;regmap, sc-&gt;gdscr, HW_CONTROL_MASK, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gdsc_poll_status(struct gdsc *sc, unsigned int reg, bool en)</div><div class='add'>+{</div><div class='add'>+	ktime_t start;</div><div class='add'>+</div><div class='add'>+	start = ktime_get();</div><div class='add'>+	do {</div><div class='add'>+		if (gdsc_is_enabled(sc, reg) == en)</div><div class='add'>+			return 0;</div><div class='add'>+	} while (ktime_us_delta(ktime_get(), start) &lt; TIMEOUT_US);</div><div class='add'>+</div><div class='add'>+	if (gdsc_is_enabled(sc, reg) == en)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int gdsc_toggle_logic(struct gdsc *sc, bool en)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 val = en ? 0 : SW_COLLAPSE_MASK;</div><div class='del'>-	ktime_t start;</div><div class='ctx'> 	unsigned int status_reg = sc-&gt;gdscr;</div><div class='ctx'> </div><div class='ctx'> 	ret = regmap_update_bits(sc-&gt;regmap, sc-&gt;gdscr, SW_COLLAPSE_MASK, val);</div><div class='hunk'>@@ -92,16 +115,7 @@ static int gdsc_toggle_logic(struct gdsc *sc, bool en)</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	start = ktime_get();</div><div class='del'>-	do {</div><div class='del'>-		if (gdsc_is_enabled(sc, status_reg) == en)</div><div class='del'>-			return 0;</div><div class='del'>-	} while (ktime_us_delta(ktime_get(), start) &lt; TIMEOUT_US);</div><div class='del'>-</div><div class='del'>-	if (gdsc_is_enabled(sc, status_reg) == en)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return -ETIMEDOUT;</div><div class='add'>+	return gdsc_poll_status(sc, status_reg, en);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int gdsc_deassert_reset(struct gdsc *sc)</div><div class='hunk'>@@ -140,6 +154,18 @@ static inline void gdsc_clear_mem_on(struct gdsc *sc)</div><div class='ctx'> 		regmap_update_bits(sc-&gt;regmap, sc-&gt;cxcs[i], mask, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void gdsc_deassert_clamp_io(struct gdsc *sc)</div><div class='add'>+{</div><div class='add'>+	regmap_update_bits(sc-&gt;regmap, sc-&gt;clamp_io_ctrl,</div><div class='add'>+			   GMEM_CLAMP_IO_MASK, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gdsc_assert_clamp_io(struct gdsc *sc)</div><div class='add'>+{</div><div class='add'>+	regmap_update_bits(sc-&gt;regmap, sc-&gt;clamp_io_ctrl,</div><div class='add'>+			   GMEM_CLAMP_IO_MASK, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int gdsc_enable(struct generic_pm_domain *domain)</div><div class='ctx'> {</div><div class='ctx'> 	struct gdsc *sc = domain_to_gdsc(domain);</div><div class='hunk'>@@ -148,6 +174,9 @@ static int gdsc_enable(struct generic_pm_domain *domain)</div><div class='ctx'> 	if (sc-&gt;pwrsts == PWRSTS_ON)</div><div class='ctx'> 		return gdsc_deassert_reset(sc);</div><div class='ctx'> </div><div class='add'>+	if (sc-&gt;flags &amp; CLAMP_IO)</div><div class='add'>+		gdsc_deassert_clamp_io(sc);</div><div class='add'>+</div><div class='ctx'> 	ret = gdsc_toggle_logic(sc, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -164,20 +193,65 @@ static int gdsc_enable(struct generic_pm_domain *domain)</div><div class='ctx'> 	 */</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> </div><div class='add'>+	/* Turn on HW trigger mode if supported */</div><div class='add'>+	if (sc-&gt;flags &amp; HW_CTRL) {</div><div class='add'>+		ret = gdsc_hwctrl(sc, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		/*</div><div class='add'>+		 * Wait for the GDSC to go through a power down and</div><div class='add'>+		 * up cycle.  In case a firmware ends up polling status</div><div class='add'>+		 * bits for the gdsc, it might read an 'on' status before</div><div class='add'>+		 * the GDSC can finish the power cycle.</div><div class='add'>+		 * We wait 1us before returning to ensure the firmware</div><div class='add'>+		 * can't immediately poll the status bits.</div><div class='add'>+		 */</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gdsc_disable(struct generic_pm_domain *domain)</div><div class='ctx'> {</div><div class='ctx'> 	struct gdsc *sc = domain_to_gdsc(domain);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (sc-&gt;pwrsts == PWRSTS_ON)</div><div class='ctx'> 		return gdsc_assert_reset(sc);</div><div class='ctx'> </div><div class='add'>+	/* Turn off HW trigger mode if supported */</div><div class='add'>+	if (sc-&gt;flags &amp; HW_CTRL) {</div><div class='add'>+		unsigned int reg;</div><div class='add'>+</div><div class='add'>+		ret = gdsc_hwctrl(sc, false);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		/*</div><div class='add'>+		 * Wait for the GDSC to go through a power down and</div><div class='add'>+		 * up cycle.  In case we end up polling status</div><div class='add'>+		 * bits for the gdsc before the power cycle is completed</div><div class='add'>+		 * it might read an 'on' status wrongly.</div><div class='add'>+		 */</div><div class='add'>+		udelay(1);</div><div class='add'>+</div><div class='add'>+		reg = sc-&gt;gds_hw_ctrl ? sc-&gt;gds_hw_ctrl : sc-&gt;gdscr;</div><div class='add'>+		ret = gdsc_poll_status(sc, reg, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (sc-&gt;pwrsts &amp; PWRSTS_OFF)</div><div class='ctx'> 		gdsc_clear_mem_on(sc);</div><div class='ctx'> </div><div class='del'>-	return gdsc_toggle_logic(sc, false);</div><div class='add'>+	ret = gdsc_toggle_logic(sc, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;flags &amp; CLAMP_IO)</div><div class='add'>+		gdsc_assert_clamp_io(sc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gdsc_init(struct gdsc *sc)</div><div class='head'>diff --git a/drivers/clk/qcom/gdsc.h b/drivers/clk/qcom/gdsc.h<br/>index 3bf497c36bdf..39648348e5ec 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/gdsc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/gdsc.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/gdsc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/gdsc.h</a></div><div class='hunk'>@@ -39,6 +39,7 @@ struct gdsc {</div><div class='ctx'> 	struct regmap			*regmap;</div><div class='ctx'> 	unsigned int			gdscr;</div><div class='ctx'> 	unsigned int			gds_hw_ctrl;</div><div class='add'>+	unsigned int			clamp_io_ctrl;</div><div class='ctx'> 	unsigned int			*cxcs;</div><div class='ctx'> 	unsigned int			cxc_count;</div><div class='ctx'> 	const u8			pwrsts;</div><div class='hunk'>@@ -50,6 +51,8 @@ struct gdsc {</div><div class='ctx'> #define PWRSTS_RET_ON		(PWRSTS_RET | PWRSTS_ON)</div><div class='ctx'> 	const u8			flags;</div><div class='ctx'> #define VOTABLE		BIT(0)</div><div class='add'>+#define CLAMP_IO	BIT(1)</div><div class='add'>+#define HW_CTRL		BIT(2)</div><div class='ctx'> 	struct reset_controller_dev	*rcdev;</div><div class='ctx'> 	unsigned int			*resets;</div><div class='ctx'> 	unsigned int			reset_count;</div><div class='head'>diff --git a/drivers/clk/qcom/lcc-ipq806x.c b/drivers/clk/qcom/lcc-ipq806x.c<br/>index db3998e5e2d8..977e98eadbeb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/lcc-ipq806x.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/lcc-ipq806x.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/lcc-ipq806x.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/lcc-ipq806x.c</a></div><div class='hunk'>@@ -443,7 +443,7 @@ static int lcc_ipq806x_probe(struct platform_device *pdev)</div><div class='ctx'> 		return PTR_ERR(regmap);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure the rate of PLL4 if the bootloader hasn't already */</div><div class='del'>-	val = regmap_read(regmap, 0x0, &amp;val);</div><div class='add'>+	regmap_read(regmap, 0x0, &amp;val);</div><div class='ctx'> 	if (!val)</div><div class='ctx'> 		clk_pll_configure_sr(&amp;pll4, regmap, &amp;pll4_config, true);</div><div class='ctx'> 	/* Enable PLL4 source on the LPASS Primary PLL Mux */</div><div class='head'>diff --git a/drivers/clk/qcom/mmcc-msm8996.c b/drivers/clk/qcom/mmcc-msm8996.c<br/>index ca97e1151797..9b97246287a7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/qcom/mmcc-msm8996.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/qcom/mmcc-msm8996.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/qcom/mmcc-msm8996.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/qcom/mmcc-msm8996.c</a></div><div class='hunk'>@@ -2945,6 +2945,7 @@ static struct gdsc venus_core0_gdsc = {</div><div class='ctx'> 		.name = "venus_core0",</div><div class='ctx'> 	},</div><div class='ctx'> 	.pwrsts = PWRSTS_OFF_ON,</div><div class='add'>+	.flags = HW_CTRL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct gdsc venus_core1_gdsc = {</div><div class='hunk'>@@ -2955,6 +2956,7 @@ static struct gdsc venus_core1_gdsc = {</div><div class='ctx'> 		.name = "venus_core1",</div><div class='ctx'> 	},</div><div class='ctx'> 	.pwrsts = PWRSTS_OFF_ON,</div><div class='add'>+	.flags = HW_CTRL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct gdsc camss_gdsc = {</div><div class='hunk'>@@ -3034,6 +3036,28 @@ static struct gdsc mdss_gdsc = {</div><div class='ctx'> 	.pwrsts = PWRSTS_OFF_ON,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct gdsc gpu_gdsc = {</div><div class='add'>+	.gdscr = 0x4034,</div><div class='add'>+	.gds_hw_ctrl = 0x4038,</div><div class='add'>+	.pd = {</div><div class='add'>+		.name = "gpu",</div><div class='add'>+	},</div><div class='add'>+	.pwrsts = PWRSTS_OFF_ON,</div><div class='add'>+	.flags = VOTABLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gdsc gpu_gx_gdsc = {</div><div class='add'>+	.gdscr = 0x4024,</div><div class='add'>+	.clamp_io_ctrl = 0x4300,</div><div class='add'>+	.cxcs = (unsigned int []){ 0x4028 },</div><div class='add'>+	.cxc_count = 1,</div><div class='add'>+	.pd = {</div><div class='add'>+		.name = "gpu_gx",</div><div class='add'>+	},</div><div class='add'>+	.pwrsts = PWRSTS_OFF_ON,</div><div class='add'>+	.flags = CLAMP_IO,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk_regmap *mmcc_msm8996_clocks[] = {</div><div class='ctx'> 	[MMPLL0_EARLY] = &amp;mmpll0_early.clkr,</div><div class='ctx'> 	[MMPLL0_PLL] = &amp;mmpll0.clkr,</div><div class='hunk'>@@ -3223,6 +3247,8 @@ static struct gdsc *mmcc_msm8996_gdscs[] = {</div><div class='ctx'> 	[CPP_GDSC] = &amp;cpp_gdsc,</div><div class='ctx'> 	[FD_GDSC] = &amp;fd_gdsc,</div><div class='ctx'> 	[MDSS_GDSC] = &amp;mdss_gdsc,</div><div class='add'>+	[GPU_GDSC] = &amp;gpu_gdsc,</div><div class='add'>+	[GPU_GX_GDSC] = &amp;gpu_gx_gdsc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct qcom_reset_map mmcc_msm8996_resets[] = {</div><div class='head'>diff --git a/drivers/clk/renesas/Kconfig b/drivers/clk/renesas/Kconfig<br/>index 41a12d376799..2586dfa0026b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/Kconfig</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> config CLK_RENESAS_CPG_MSSR</div><div class='ctx'> 	bool</div><div class='add'>+	default y if ARCH_R8A7743</div><div class='add'>+	default y if ARCH_R8A7745</div><div class='ctx'> 	default y if ARCH_R8A7795</div><div class='ctx'> 	default y if ARCH_R8A7796</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/renesas/Makefile b/drivers/clk/renesas/Makefile<br/>index 90dd0db7d9c6..1072f7653c0c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/Makefile</a></div><div class='hunk'>@@ -2,6 +2,8 @@ obj-$(CONFIG_ARCH_EMEV2)		+= clk-emev2.o</div><div class='ctx'> obj-$(CONFIG_ARCH_R7S72100)		+= clk-rz.o</div><div class='ctx'> obj-$(CONFIG_ARCH_R8A73A4)		+= clk-r8a73a4.o clk-div6.o</div><div class='ctx'> obj-$(CONFIG_ARCH_R8A7740)		+= clk-r8a7740.o clk-div6.o</div><div class='add'>+obj-$(CONFIG_ARCH_R8A7743)		+= r8a7743-cpg-mssr.o rcar-gen2-cpg.o</div><div class='add'>+obj-$(CONFIG_ARCH_R8A7745)		+= r8a7745-cpg-mssr.o rcar-gen2-cpg.o</div><div class='ctx'> obj-$(CONFIG_ARCH_R8A7778)		+= clk-r8a7778.o</div><div class='ctx'> obj-$(CONFIG_ARCH_R8A7779)		+= clk-r8a7779.o</div><div class='ctx'> obj-$(CONFIG_ARCH_R8A7790)		+= clk-rcar-gen2.o clk-div6.o</div><div class='head'>diff --git a/drivers/clk/renesas/clk-mstp.c b/drivers/clk/renesas/clk-mstp.c<br/>index 9375777776d9..4067216bf31f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/clk-mstp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/clk-mstp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/clk-mstp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/clk-mstp.c</a></div><div class='hunk'>@@ -37,12 +37,14 @@</div><div class='ctx'>  * @smstpcr: module stop control register</div><div class='ctx'>  * @mstpsr: module stop status register (optional)</div><div class='ctx'>  * @lock: protects writes to SMSTPCR</div><div class='add'>+ * @width_8bit: registers are 8-bit, not 32-bit</div><div class='ctx'>  */</div><div class='ctx'> struct mstp_clock_group {</div><div class='ctx'> 	struct clk_onecell_data data;</div><div class='ctx'> 	void __iomem *smstpcr;</div><div class='ctx'> 	void __iomem *mstpsr;</div><div class='ctx'> 	spinlock_t lock;</div><div class='add'>+	bool width_8bit;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -59,6 +61,18 @@ struct mstp_clock {</div><div class='ctx'> </div><div class='ctx'> #define to_mstp_clock(_hw) container_of(_hw, struct mstp_clock, hw)</div><div class='ctx'> </div><div class='add'>+static inline u32 cpg_mstp_read(struct mstp_clock_group *group,</div><div class='add'>+				u32 __iomem *reg)</div><div class='add'>+{</div><div class='add'>+	return group-&gt;width_8bit ? readb(reg) : clk_readl(reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cpg_mstp_write(struct mstp_clock_group *group, u32 val,</div><div class='add'>+				  u32 __iomem *reg)</div><div class='add'>+{</div><div class='add'>+	group-&gt;width_8bit ? writeb(val, reg) : clk_writel(val, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct mstp_clock *clock = to_mstp_clock(hw);</div><div class='hunk'>@@ -70,12 +84,18 @@ static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;group-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	value = clk_readl(group-&gt;smstpcr);</div><div class='add'>+	value = cpg_mstp_read(group, group-&gt;smstpcr);</div><div class='ctx'> 	if (enable)</div><div class='ctx'> 		value &amp;= ~bitmask;</div><div class='ctx'> 	else</div><div class='ctx'> 		value |= bitmask;</div><div class='del'>-	clk_writel(value, group-&gt;smstpcr);</div><div class='add'>+	cpg_mstp_write(group, value, group-&gt;smstpcr);</div><div class='add'>+</div><div class='add'>+	if (!group-&gt;mstpsr) {</div><div class='add'>+		/* dummy read to ensure write has completed */</div><div class='add'>+		cpg_mstp_read(group, group-&gt;smstpcr);</div><div class='add'>+		barrier_data(group-&gt;smstpcr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;group-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -83,7 +103,7 @@ static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1000; i &gt; 0; --i) {</div><div class='del'>-		if (!(clk_readl(group-&gt;mstpsr) &amp; bitmask))</div><div class='add'>+		if (!(cpg_mstp_read(group, group-&gt;mstpsr) &amp; bitmask))</div><div class='ctx'> 			break;</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -114,9 +134,9 @@ static int cpg_mstp_clock_is_enabled(struct clk_hw *hw)</div><div class='ctx'> 	u32 value;</div><div class='ctx'> </div><div class='ctx'> 	if (group-&gt;mstpsr)</div><div class='del'>-		value = clk_readl(group-&gt;mstpsr);</div><div class='add'>+		value = cpg_mstp_read(group, group-&gt;mstpsr);</div><div class='ctx'> 	else</div><div class='del'>-		value = clk_readl(group-&gt;smstpcr);</div><div class='add'>+		value = cpg_mstp_read(group, group-&gt;smstpcr);</div><div class='ctx'> </div><div class='ctx'> 	return !(value &amp; BIT(clock-&gt;bit_index));</div><div class='ctx'> }</div><div class='hunk'>@@ -127,9 +147,9 @@ static const struct clk_ops cpg_mstp_clock_ops = {</div><div class='ctx'> 	.is_enabled = cpg_mstp_clock_is_enabled,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk * __init</div><div class='del'>-cpg_mstp_clock_register(const char *name, const char *parent_name,</div><div class='del'>-			unsigned int index, struct mstp_clock_group *group)</div><div class='add'>+static struct clk * __init cpg_mstp_clock_register(const char *name,</div><div class='add'>+	const char *parent_name, unsigned int index,</div><div class='add'>+	struct mstp_clock_group *group)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk_init_data init;</div><div class='ctx'> 	struct mstp_clock *clock;</div><div class='hunk'>@@ -144,6 +164,11 @@ cpg_mstp_clock_register(const char *name, const char *parent_name,</div><div class='ctx'> 	init.name = name;</div><div class='ctx'> 	init.ops = &amp;cpg_mstp_clock_ops;</div><div class='ctx'> 	init.flags = CLK_IS_BASIC | CLK_SET_RATE_PARENT;</div><div class='add'>+	/* INTC-SYS is the module clock of the GIC, and must not be disabled */</div><div class='add'>+	if (!strcmp(name, "intc-sys")) {</div><div class='add'>+		pr_debug("MSTP %s setting CLK_IS_CRITICAL\n", name);</div><div class='add'>+		init.flags |= CLK_IS_CRITICAL;</div><div class='add'>+	}</div><div class='ctx'> 	init.parent_names = &amp;parent_name;</div><div class='ctx'> 	init.num_parents = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -188,6 +213,9 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (of_device_is_compatible(np, "renesas,r7s72100-mstp-clocks"))</div><div class='add'>+		group-&gt;width_8bit = true;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; MSTP_MAX_CLOCKS; ++i)</div><div class='ctx'> 		clks[i] = ERR_PTR(-ENOENT);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/renesas/clk-r8a7778.c b/drivers/clk/renesas/clk-r8a7778.c<br/>index 40e3a501a50e..886a8380e912 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/clk-r8a7778.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/clk-r8a7778.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/clk-r8a7778.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/clk-r8a7778.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/clk/renesas.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/soc/renesas/rcar-rst.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct r8a7778_cpg {</div><div class='ctx'> 	struct clk_onecell_data data;</div><div class='hunk'>@@ -83,6 +84,18 @@ static void __init r8a7778_cpg_clocks_init(struct device_node *np)</div><div class='ctx'> 	struct clk **clks;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int num_clks;</div><div class='add'>+	u32 mode;</div><div class='add'>+</div><div class='add'>+	if (rcar_rst_read_mode_pins(&amp;mode))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!(mode &amp; BIT(19)));</div><div class='add'>+</div><div class='add'>+	cpg_mode_rates = (!!(mode &amp; BIT(18)) &lt;&lt; 2) |</div><div class='add'>+			 (!!(mode &amp; BIT(12)) &lt;&lt; 1) |</div><div class='add'>+			 (!!(mode &amp; BIT(11)));</div><div class='add'>+	cpg_mode_divs = (!!(mode &amp; BIT(2)) &lt;&lt; 1) |</div><div class='add'>+			(!!(mode &amp; BIT(1)));</div><div class='ctx'> </div><div class='ctx'> 	num_clks = of_property_count_strings(np, "clock-output-names");</div><div class='ctx'> 	if (num_clks &lt; 0) {</div><div class='hunk'>@@ -130,16 +143,3 @@ static void __init r8a7778_cpg_clocks_init(struct device_node *np)</div><div class='ctx'> </div><div class='ctx'> CLK_OF_DECLARE(r8a7778_cpg_clks, "renesas,r8a7778-cpg-clocks",</div><div class='ctx'> 	       r8a7778_cpg_clocks_init);</div><div class='del'>-</div><div class='del'>-void __init r8a7778_clocks_init(u32 mode)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!(mode &amp; BIT(19)));</div><div class='del'>-</div><div class='del'>-	cpg_mode_rates = (!!(mode &amp; BIT(18)) &lt;&lt; 2) |</div><div class='del'>-			 (!!(mode &amp; BIT(12)) &lt;&lt; 1) |</div><div class='del'>-			 (!!(mode &amp; BIT(11)));</div><div class='del'>-	cpg_mode_divs = (!!(mode &amp; BIT(2)) &lt;&lt; 1) |</div><div class='del'>-			(!!(mode &amp; BIT(1)));</div><div class='del'>-</div><div class='del'>-	of_clk_init(NULL);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/clk/renesas/clk-r8a7779.c b/drivers/clk/renesas/clk-r8a7779.c<br/>index cf2a37df03b1..27fbfafaf2cd 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/clk-r8a7779.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/clk-r8a7779.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/clk-r8a7779.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/clk-r8a7779.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/soc/renesas/rcar-rst.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/r8a7779-clock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -88,8 +89,6 @@ static const unsigned int cpg_plla_mult[4] __initconst = { 42, 48, 56, 64 };</div><div class='ctx'>  * Initialization</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static u32 cpg_mode __initdata;</div><div class='del'>-</div><div class='ctx'> static struct clk * __init</div><div class='ctx'> r8a7779_cpg_register_clock(struct device_node *np, struct r8a7779_cpg *cpg,</div><div class='ctx'> 			   const struct cpg_clk_config *config,</div><div class='hunk'>@@ -127,6 +126,10 @@ static void __init r8a7779_cpg_clocks_init(struct device_node *np)</div><div class='ctx'> 	struct clk **clks;</div><div class='ctx'> 	unsigned int i, plla_mult;</div><div class='ctx'> 	int num_clks;</div><div class='add'>+	u32 mode;</div><div class='add'>+</div><div class='add'>+	if (rcar_rst_read_mode_pins(&amp;mode))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	num_clks = of_property_count_strings(np, "clock-output-names");</div><div class='ctx'> 	if (num_clks &lt; 0) {</div><div class='hunk'>@@ -148,8 +151,8 @@ static void __init r8a7779_cpg_clocks_init(struct device_node *np)</div><div class='ctx'> 	cpg-&gt;data.clks = clks;</div><div class='ctx'> 	cpg-&gt;data.clk_num = num_clks;</div><div class='ctx'> </div><div class='del'>-	config = &amp;cpg_clk_configs[CPG_CLK_CONFIG_INDEX(cpg_mode)];</div><div class='del'>-	plla_mult = cpg_plla_mult[CPG_PLLA_MULT_INDEX(cpg_mode)];</div><div class='add'>+	config = &amp;cpg_clk_configs[CPG_CLK_CONFIG_INDEX(mode)];</div><div class='add'>+	plla_mult = cpg_plla_mult[CPG_PLLA_MULT_INDEX(mode)];</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_clks; ++i) {</div><div class='ctx'> 		const char *name;</div><div class='hunk'>@@ -173,10 +176,3 @@ static void __init r8a7779_cpg_clocks_init(struct device_node *np)</div><div class='ctx'> }</div><div class='ctx'> CLK_OF_DECLARE(r8a7779_cpg_clks, "renesas,r8a7779-cpg-clocks",</div><div class='ctx'> 	       r8a7779_cpg_clocks_init);</div><div class='del'>-</div><div class='del'>-void __init r8a7779_clocks_init(u32 mode)</div><div class='del'>-{</div><div class='del'>-	cpg_mode = mode;</div><div class='del'>-</div><div class='del'>-	of_clk_init(NULL);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c<br/>index 00e6aba4b9c0..f39519edc645 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/clk-rcar-gen2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/clk-rcar-gen2.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/clk-rcar-gen2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/clk-rcar-gen2.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/soc/renesas/rcar-rst.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct rcar_gen2_cpg {</div><div class='ctx'> 	struct clk_onecell_data data;</div><div class='hunk'>@@ -364,6 +365,23 @@ rcar_gen2_cpg_register_clock(struct device_node *np, struct rcar_gen2_cpg *cpg,</div><div class='ctx'> 						 4, 0, table, &amp;cpg-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Reset register definitions.</div><div class='add'>+ */</div><div class='add'>+#define MODEMR	0xe6160060</div><div class='add'>+</div><div class='add'>+static u32 __init rcar_gen2_read_mode_pins(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *modemr = ioremap_nocache(MODEMR, 4);</div><div class='add'>+	u32 mode;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!modemr);</div><div class='add'>+	mode = ioread32(modemr);</div><div class='add'>+	iounmap(modemr);</div><div class='add'>+</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init rcar_gen2_cpg_clocks_init(struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	const struct cpg_pll_config *config;</div><div class='hunk'>@@ -372,6 +390,13 @@ static void __init rcar_gen2_cpg_clocks_init(struct device_node *np)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int num_clks;</div><div class='ctx'> </div><div class='add'>+	if (rcar_rst_read_mode_pins(&amp;cpg_mode)) {</div><div class='add'>+		/* Backward-compatibility with old DT */</div><div class='add'>+		pr_warn("%s: failed to obtain mode pins from RST\n",</div><div class='add'>+			np-&gt;full_name);</div><div class='add'>+		cpg_mode = rcar_gen2_read_mode_pins();</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	num_clks = of_property_count_strings(np, "clock-output-names");</div><div class='ctx'> 	if (num_clks &lt; 0) {</div><div class='ctx'> 		pr_err("%s: failed to count clocks\n", __func__);</div><div class='hunk'>@@ -420,10 +445,3 @@ static void __init rcar_gen2_cpg_clocks_init(struct device_node *np)</div><div class='ctx'> }</div><div class='ctx'> CLK_OF_DECLARE(rcar_gen2_cpg_clks, "renesas,rcar-gen2-cpg-clocks",</div><div class='ctx'> 	       rcar_gen2_cpg_clocks_init);</div><div class='del'>-</div><div class='del'>-void __init rcar_gen2_clocks_init(u32 mode)</div><div class='del'>-{</div><div class='del'>-	cpg_mode = mode;</div><div class='del'>-</div><div class='del'>-	of_clk_init(NULL);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/clk/renesas/r8a7743-cpg-mssr.c b/drivers/clk/renesas/r8a7743-cpg-mssr.c<br/>new file mode 100644<br/>index 000000000000..6dc0b3082aa6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/r8a7743-cpg-mssr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/r8a7743-cpg-mssr.c</a></div><div class='hunk'>@@ -0,0 +1,270 @@</div><div class='add'>+/*</div><div class='add'>+ * r8a7743 Clock Pulse Generator / Module Standby and Software Reset</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Cogent Embedded Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License version 2 as published</div><div class='add'>+ * by the Free Software Foundation; of the License.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/soc/renesas/rcar-rst.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/r8a7743-cpg-mssr.h&gt;</div><div class='add'>+</div><div class='add'>+#include "renesas-cpg-mssr.h"</div><div class='add'>+#include "rcar-gen2-cpg.h"</div><div class='add'>+</div><div class='add'>+enum clk_ids {</div><div class='add'>+	/* Core Clock Outputs exported to DT */</div><div class='add'>+	LAST_DT_CORE_CLK = R8A7743_CLK_OSC,</div><div class='add'>+</div><div class='add'>+	/* External Input Clocks */</div><div class='add'>+	CLK_EXTAL,</div><div class='add'>+	CLK_USB_EXTAL,</div><div class='add'>+</div><div class='add'>+	/* Internal Core Clocks */</div><div class='add'>+	CLK_MAIN,</div><div class='add'>+	CLK_PLL0,</div><div class='add'>+	CLK_PLL1,</div><div class='add'>+	CLK_PLL3,</div><div class='add'>+	CLK_PLL1_DIV2,</div><div class='add'>+</div><div class='add'>+	/* Module Clocks */</div><div class='add'>+	MOD_CLK_BASE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cpg_core_clk r8a7743_core_clks[] __initconst = {</div><div class='add'>+	/* External Clock Inputs */</div><div class='add'>+	DEF_INPUT("extal",	CLK_EXTAL),</div><div class='add'>+	DEF_INPUT("usb_extal",	CLK_USB_EXTAL),</div><div class='add'>+</div><div class='add'>+	/* Internal Core Clocks */</div><div class='add'>+	DEF_BASE(".main",	CLK_MAIN, CLK_TYPE_GEN2_MAIN, CLK_EXTAL),</div><div class='add'>+	DEF_BASE(".pll0",	CLK_PLL0, CLK_TYPE_GEN2_PLL0, CLK_MAIN),</div><div class='add'>+	DEF_BASE(".pll1",	CLK_PLL1, CLK_TYPE_GEN2_PLL1, CLK_MAIN),</div><div class='add'>+	DEF_BASE(".pll3",	CLK_PLL3, CLK_TYPE_GEN2_PLL3, CLK_MAIN),</div><div class='add'>+</div><div class='add'>+	DEF_FIXED(".pll1_div2",	CLK_PLL1_DIV2, CLK_PLL1, 2, 1),</div><div class='add'>+</div><div class='add'>+	/* Core Clock Outputs */</div><div class='add'>+	DEF_BASE("z",    R8A7743_CLK_Z,    CLK_TYPE_GEN2_Z,	CLK_PLL0),</div><div class='add'>+	DEF_BASE("lb",   R8A7743_CLK_LB,   CLK_TYPE_GEN2_LB,	CLK_PLL1),</div><div class='add'>+	DEF_BASE("sdh",  R8A7743_CLK_SDH,  CLK_TYPE_GEN2_SDH,	CLK_PLL1),</div><div class='add'>+	DEF_BASE("sd0",  R8A7743_CLK_SD0,  CLK_TYPE_GEN2_SD0,	CLK_PLL1),</div><div class='add'>+	DEF_BASE("qspi", R8A7743_CLK_QSPI, CLK_TYPE_GEN2_QSPI,	CLK_PLL1_DIV2),</div><div class='add'>+	DEF_BASE("rcan", R8A7743_CLK_RCAN, CLK_TYPE_GEN2_RCAN,	CLK_USB_EXTAL),</div><div class='add'>+</div><div class='add'>+	DEF_FIXED("zg",    R8A7743_CLK_ZG,	CLK_PLL1,	    3, 1),</div><div class='add'>+	DEF_FIXED("zx",    R8A7743_CLK_ZX,	CLK_PLL1,	    3, 1),</div><div class='add'>+	DEF_FIXED("zs",    R8A7743_CLK_ZS,	CLK_PLL1,	    6, 1),</div><div class='add'>+	DEF_FIXED("hp",    R8A7743_CLK_HP,	CLK_PLL1,	   12, 1),</div><div class='add'>+	DEF_FIXED("b",     R8A7743_CLK_B,	CLK_PLL1,	   12, 1),</div><div class='add'>+	DEF_FIXED("p",     R8A7743_CLK_P,	CLK_PLL1,	   24, 1),</div><div class='add'>+	DEF_FIXED("cl",    R8A7743_CLK_CL,	CLK_PLL1,	   48, 1),</div><div class='add'>+	DEF_FIXED("m2",    R8A7743_CLK_M2,	CLK_PLL1,	    8, 1),</div><div class='add'>+	DEF_FIXED("zb3",   R8A7743_CLK_ZB3,	CLK_PLL3,	    4, 1),</div><div class='add'>+	DEF_FIXED("zb3d2", R8A7743_CLK_ZB3D2,	CLK_PLL3,	    8, 1),</div><div class='add'>+	DEF_FIXED("ddr",   R8A7743_CLK_DDR,	CLK_PLL3,	    8, 1),</div><div class='add'>+	DEF_FIXED("mp",    R8A7743_CLK_MP,	CLK_PLL1_DIV2,	   15, 1),</div><div class='add'>+	DEF_FIXED("cp",    R8A7743_CLK_CP,	CLK_EXTAL,	    2, 1),</div><div class='add'>+	DEF_FIXED("r",     R8A7743_CLK_R,	CLK_PLL1,	49152, 1),</div><div class='add'>+	DEF_FIXED("osc",   R8A7743_CLK_OSC,	CLK_PLL1,	12288, 1),</div><div class='add'>+</div><div class='add'>+	DEF_DIV6P1("sd2",  R8A7743_CLK_SD2,	CLK_PLL1_DIV2,	0x078),</div><div class='add'>+	DEF_DIV6P1("sd3",  R8A7743_CLK_SD3,	CLK_PLL1_DIV2,	0x26c),</div><div class='add'>+	DEF_DIV6P1("mmc0", R8A7743_CLK_MMC0,	CLK_PLL1_DIV2,	0x240),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mssr_mod_clk r8a7743_mod_clks[] __initconst = {</div><div class='add'>+	DEF_MOD("msiof0",		   0,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("vcp0",			 101,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("vpc0",			 103,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("tmu1",			 111,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("3dg",			 112,	R8A7743_CLK_ZG),</div><div class='add'>+	DEF_MOD("2d-dmac",		 115,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("fdp1-1",		 118,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("fdp1-0",		 119,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("tmu3",			 121,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("tmu2",			 122,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("cmt0",			 124,	R8A7743_CLK_R),</div><div class='add'>+	DEF_MOD("tmu0",			 125,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("vsp1du1",		 127,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("vsp1du0",		 128,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("vsp1-sy",		 131,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("scifa2",		 202,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("scifa1",		 203,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("scifa0",		 204,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("msiof2",		 205,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("scifb0",		 206,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("scifb1",		 207,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("msiof1",		 208,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("scifb2",		 216,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("sys-dmac1",		 218,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("sys-dmac0",		 219,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("tpu0",			 304,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("sdhi3",		 311,	R8A7743_CLK_SD3),</div><div class='add'>+	DEF_MOD("sdhi2",		 312,	R8A7743_CLK_SD2),</div><div class='add'>+	DEF_MOD("sdhi0",		 314,	R8A7743_CLK_SD0),</div><div class='add'>+	DEF_MOD("mmcif0",		 315,	R8A7743_CLK_MMC0),</div><div class='add'>+	DEF_MOD("iic0",			 318,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("pciec",		 319,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("iic1",			 323,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("usb3.0",		 328,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("cmt1",			 329,	R8A7743_CLK_R),</div><div class='add'>+	DEF_MOD("usbhs-dmac0",		 330,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("usbhs-dmac1",		 331,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("irqc",			 407,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("intc-sys",		 408,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("audio-dmac1",		 501,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("audio-dmac0",		 502,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("thermal",		 522,	CLK_EXTAL),</div><div class='add'>+	DEF_MOD("pwm",			 523,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("usb-ehci",		 703,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("usbhs",		 704,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("hscif2",		 713,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("scif5",		 714,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("scif4",		 715,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("hscif1",		 716,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("hscif0",		 717,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("scif3",		 718,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("scif2",		 719,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("scif1",		 720,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("scif0",		 721,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("du1",			 723,	R8A7743_CLK_ZX),</div><div class='add'>+	DEF_MOD("du0",			 724,	R8A7743_CLK_ZX),</div><div class='add'>+	DEF_MOD("lvds0",		 726,	R8A7743_CLK_ZX),</div><div class='add'>+	DEF_MOD("ipmmu-sgx",		 800,	R8A7743_CLK_ZX),</div><div class='add'>+	DEF_MOD("vin2",			 809,	R8A7743_CLK_ZG),</div><div class='add'>+	DEF_MOD("vin1",			 810,	R8A7743_CLK_ZG),</div><div class='add'>+	DEF_MOD("vin0",			 811,	R8A7743_CLK_ZG),</div><div class='add'>+	DEF_MOD("etheravb",		 812,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("ether",		 813,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("sata1",		 814,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("sata0",		 815,	R8A7743_CLK_ZS),</div><div class='add'>+	DEF_MOD("gpio7",		 904,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio6",		 905,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio5",		 907,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio4",		 908,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio3",		 909,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio2",		 910,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio1",		 911,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio0",		 912,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("can1",			 915,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("can0",			 916,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("qspi_mod",		 917,	R8A7743_CLK_QSPI),</div><div class='add'>+	DEF_MOD("i2c5",			 925,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("iicdvfs",		 926,	R8A7743_CLK_CP),</div><div class='add'>+	DEF_MOD("i2c4",			 927,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("i2c3",			 928,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("i2c2",			 929,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("i2c1",			 930,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("i2c0",			 931,	R8A7743_CLK_HP),</div><div class='add'>+	DEF_MOD("ssi-all",		1005,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("ssi9",			1006,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi8",			1007,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi7",			1008,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi6",			1009,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi5",			1010,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi4",			1011,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi3",			1012,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi2",			1013,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi1",			1014,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi0",			1015,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("scu-all",		1017,	R8A7743_CLK_P),</div><div class='add'>+	DEF_MOD("scu-dvc1",		1018,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-dvc0",		1019,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-ctu1-mix1",	1020,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-ctu0-mix0",	1021,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src9",		1022,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src8",		1023,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src7",		1024,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src6",		1025,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src5",		1026,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src4",		1027,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src3",		1028,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src2",		1029,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src1",		1030,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src0",		1031,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scifa3",		1106,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("scifa4",		1107,	R8A7743_CLK_MP),</div><div class='add'>+	DEF_MOD("scifa5",		1108,	R8A7743_CLK_MP),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int r8a7743_crit_mod_clks[] __initconst = {</div><div class='add'>+	MOD_CLK_ID(408),	/* INTC-SYS (GIC) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CPG Clock Data</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *    MD	EXTAL		PLL0	PLL1	PLL3</div><div class='add'>+ * 14 13 19	(MHz)		*1	*1</div><div class='add'>+ *---------------------------------------------------</div><div class='add'>+ * 0  0  0	15		x172/2	x208/2	x106</div><div class='add'>+ * 0  0  1	15		x172/2	x208/2	x88</div><div class='add'>+ * 0  1  0	20		x130/2	x156/2	x80</div><div class='add'>+ * 0  1  1	20		x130/2	x156/2	x66</div><div class='add'>+ * 1  0  0	26 / 2		x200/2	x240/2	x122</div><div class='add'>+ * 1  0  1	26 / 2		x200/2	x240/2	x102</div><div class='add'>+ * 1  1  0	30 / 2		x172/2	x208/2	x106</div><div class='add'>+ * 1  1  1	30 / 2		x172/2	x208/2	x88</div><div class='add'>+ *</div><div class='add'>+ * *1 :	Table 7.5a indicates VCO output (PLLx = VCO/2)</div><div class='add'>+ */</div><div class='add'>+#define CPG_PLL_CONFIG_INDEX(md)	((((md) &amp; BIT(14)) &gt;&gt; 12) | \</div><div class='add'>+					 (((md) &amp; BIT(13)) &gt;&gt; 12) | \</div><div class='add'>+					 (((md) &amp; BIT(19)) &gt;&gt; 19))</div><div class='add'>+</div><div class='add'>+static const struct rcar_gen2_cpg_pll_config cpg_pll_configs[8] __initconst = {</div><div class='add'>+	/* EXTAL div	PLL1 mult	PLL3 mult */</div><div class='add'>+	{ 1,		208,		106,	},</div><div class='add'>+	{ 1,		208,		88,	},</div><div class='add'>+	{ 1,		156,		80,	},</div><div class='add'>+	{ 1,		156,		66,	},</div><div class='add'>+	{ 2,		240,		122,	},</div><div class='add'>+	{ 2,		240,		102,	},</div><div class='add'>+	{ 2,		208,		106,	},</div><div class='add'>+	{ 2,		208,		88,	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init r8a7743_cpg_mssr_init(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct rcar_gen2_cpg_pll_config *cpg_pll_config;</div><div class='add'>+	u32 cpg_mode;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = rcar_rst_read_mode_pins(&amp;cpg_mode);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	cpg_pll_config = &amp;cpg_pll_configs[CPG_PLL_CONFIG_INDEX(cpg_mode)];</div><div class='add'>+</div><div class='add'>+	return rcar_gen2_cpg_init(cpg_pll_config, 2, cpg_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct cpg_mssr_info r8a7743_cpg_mssr_info __initconst = {</div><div class='add'>+	/* Core Clocks */</div><div class='add'>+	.core_clks = r8a7743_core_clks,</div><div class='add'>+	.num_core_clks = ARRAY_SIZE(r8a7743_core_clks),</div><div class='add'>+	.last_dt_core_clk = LAST_DT_CORE_CLK,</div><div class='add'>+	.num_total_core_clks = MOD_CLK_BASE,</div><div class='add'>+</div><div class='add'>+	/* Module Clocks */</div><div class='add'>+	.mod_clks = r8a7743_mod_clks,</div><div class='add'>+	.num_mod_clks = ARRAY_SIZE(r8a7743_mod_clks),</div><div class='add'>+	.num_hw_mod_clks = 12 * 32,</div><div class='add'>+</div><div class='add'>+	/* Critical Module Clocks */</div><div class='add'>+	.crit_mod_clks = r8a7743_crit_mod_clks,</div><div class='add'>+	.num_crit_mod_clks = ARRAY_SIZE(r8a7743_crit_mod_clks),</div><div class='add'>+</div><div class='add'>+	/* Callbacks */</div><div class='add'>+	.init = r8a7743_cpg_mssr_init,</div><div class='add'>+	.cpg_clk_register = rcar_gen2_cpg_clk_register,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/clk/renesas/r8a7745-cpg-mssr.c b/drivers/clk/renesas/r8a7745-cpg-mssr.c<br/>new file mode 100644<br/>index 000000000000..2f15ba786c3b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/r8a7745-cpg-mssr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/r8a7745-cpg-mssr.c</a></div><div class='hunk'>@@ -0,0 +1,259 @@</div><div class='add'>+/*</div><div class='add'>+ * r8a7745 Clock Pulse Generator / Module Standby and Software Reset</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Cogent Embedded Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License version 2 as published</div><div class='add'>+ * by the Free Software Foundation; of the License.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/soc/renesas/rcar-rst.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/r8a7745-cpg-mssr.h&gt;</div><div class='add'>+</div><div class='add'>+#include "renesas-cpg-mssr.h"</div><div class='add'>+#include "rcar-gen2-cpg.h"</div><div class='add'>+</div><div class='add'>+enum clk_ids {</div><div class='add'>+	/* Core Clock Outputs exported to DT */</div><div class='add'>+	LAST_DT_CORE_CLK = R8A7745_CLK_OSC,</div><div class='add'>+</div><div class='add'>+	/* External Input Clocks */</div><div class='add'>+	CLK_EXTAL,</div><div class='add'>+	CLK_USB_EXTAL,</div><div class='add'>+</div><div class='add'>+	/* Internal Core Clocks */</div><div class='add'>+	CLK_MAIN,</div><div class='add'>+	CLK_PLL0,</div><div class='add'>+	CLK_PLL1,</div><div class='add'>+	CLK_PLL3,</div><div class='add'>+	CLK_PLL1_DIV2,</div><div class='add'>+</div><div class='add'>+	/* Module Clocks */</div><div class='add'>+	MOD_CLK_BASE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cpg_core_clk r8a7745_core_clks[] __initconst = {</div><div class='add'>+	/* External Clock Inputs */</div><div class='add'>+	DEF_INPUT("extal",	CLK_EXTAL),</div><div class='add'>+	DEF_INPUT("usb_extal",	CLK_USB_EXTAL),</div><div class='add'>+</div><div class='add'>+	/* Internal Core Clocks */</div><div class='add'>+	DEF_BASE(".main",	CLK_MAIN, CLK_TYPE_GEN2_MAIN, CLK_EXTAL),</div><div class='add'>+	DEF_BASE(".pll0",	CLK_PLL0, CLK_TYPE_GEN2_PLL0, CLK_MAIN),</div><div class='add'>+	DEF_BASE(".pll1",	CLK_PLL1, CLK_TYPE_GEN2_PLL1, CLK_MAIN),</div><div class='add'>+	DEF_BASE(".pll3",	CLK_PLL3, CLK_TYPE_GEN2_PLL3, CLK_MAIN),</div><div class='add'>+</div><div class='add'>+	DEF_FIXED(".pll1_div2",	CLK_PLL1_DIV2, CLK_PLL1, 2, 1),</div><div class='add'>+</div><div class='add'>+	/* Core Clock Outputs */</div><div class='add'>+	DEF_BASE("lb",   R8A7745_CLK_LB,   CLK_TYPE_GEN2_LB,	CLK_PLL1),</div><div class='add'>+	DEF_BASE("sdh",  R8A7745_CLK_SDH,  CLK_TYPE_GEN2_SDH,	CLK_PLL1),</div><div class='add'>+	DEF_BASE("sd0",  R8A7745_CLK_SD0,  CLK_TYPE_GEN2_SD0,	CLK_PLL1),</div><div class='add'>+	DEF_BASE("qspi", R8A7745_CLK_QSPI, CLK_TYPE_GEN2_QSPI,	CLK_PLL1_DIV2),</div><div class='add'>+	DEF_BASE("rcan", R8A7745_CLK_RCAN, CLK_TYPE_GEN2_RCAN,	CLK_USB_EXTAL),</div><div class='add'>+</div><div class='add'>+	DEF_FIXED("z2",    R8A7745_CLK_Z2,	CLK_PLL0,	    1, 1),</div><div class='add'>+	DEF_FIXED("zg",    R8A7745_CLK_ZG,	CLK_PLL1,	    6, 1),</div><div class='add'>+	DEF_FIXED("zx",    R8A7745_CLK_ZX,	CLK_PLL1,	    3, 1),</div><div class='add'>+	DEF_FIXED("zs",    R8A7745_CLK_ZS,	CLK_PLL1,	    6, 1),</div><div class='add'>+	DEF_FIXED("hp",    R8A7745_CLK_HP,	CLK_PLL1,	   12, 1),</div><div class='add'>+	DEF_FIXED("b",     R8A7745_CLK_B,	CLK_PLL1,	   12, 1),</div><div class='add'>+	DEF_FIXED("p",     R8A7745_CLK_P,	CLK_PLL1,	   24, 1),</div><div class='add'>+	DEF_FIXED("cl",    R8A7745_CLK_CL,	CLK_PLL1,	   48, 1),</div><div class='add'>+	DEF_FIXED("cp",    R8A7745_CLK_CP,	CLK_PLL1,	   48, 1),</div><div class='add'>+	DEF_FIXED("m2",    R8A7745_CLK_M2,	CLK_PLL1,	    8, 1),</div><div class='add'>+	DEF_FIXED("zb3",   R8A7745_CLK_ZB3,	CLK_PLL3,	    4, 1),</div><div class='add'>+	DEF_FIXED("zb3d2", R8A7745_CLK_ZB3D2,	CLK_PLL3,	    8, 1),</div><div class='add'>+	DEF_FIXED("ddr",   R8A7745_CLK_DDR,	CLK_PLL3,	    8, 1),</div><div class='add'>+	DEF_FIXED("mp",    R8A7745_CLK_MP,	CLK_PLL1_DIV2,	   15, 1),</div><div class='add'>+	DEF_FIXED("cpex",  R8A7745_CLK_CPEX,	CLK_EXTAL,	    2, 1),</div><div class='add'>+	DEF_FIXED("r",     R8A7745_CLK_R,	CLK_PLL1,	49152, 1),</div><div class='add'>+	DEF_FIXED("osc",   R8A7745_CLK_OSC,	CLK_PLL1,	12288, 1),</div><div class='add'>+</div><div class='add'>+	DEF_DIV6P1("sd2",  R8A7745_CLK_SD2,	CLK_PLL1_DIV2,	0x078),</div><div class='add'>+	DEF_DIV6P1("sd3",  R8A7745_CLK_SD3,	CLK_PLL1_DIV2,	0x26c),</div><div class='add'>+	DEF_DIV6P1("mmc0", R8A7745_CLK_MMC0,	CLK_PLL1_DIV2,	0x240),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mssr_mod_clk r8a7745_mod_clks[] __initconst = {</div><div class='add'>+	DEF_MOD("msiof0",		   0,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("vcp0",			 101,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("vpc0",			 103,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("tmu1",			 111,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("3dg",			 112,	R8A7745_CLK_ZG),</div><div class='add'>+	DEF_MOD("2d-dmac",		 115,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("fdp1-0",		 119,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("tmu3",			 121,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("tmu2",			 122,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("cmt0",			 124,	R8A7745_CLK_R),</div><div class='add'>+	DEF_MOD("tmu0",			 125,	R8A7745_CLK_CP),</div><div class='add'>+	DEF_MOD("vsp1du0",		 128,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("vsp1-sy",		 131,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("scifa2",		 202,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("scifa1",		 203,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("scifa0",		 204,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("msiof2",		 205,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("scifb0",		 206,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("scifb1",		 207,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("msiof1",		 208,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("scifb2",		 216,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("sys-dmac1",		 218,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("sys-dmac0",		 219,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("tpu0",			 304,	R8A7745_CLK_CP),</div><div class='add'>+	DEF_MOD("sdhi3",		 311,	R8A7745_CLK_SD3),</div><div class='add'>+	DEF_MOD("sdhi2",		 312,	R8A7745_CLK_SD2),</div><div class='add'>+	DEF_MOD("sdhi0",		 314,	R8A7745_CLK_SD0),</div><div class='add'>+	DEF_MOD("mmcif0",		 315,	R8A7745_CLK_MMC0),</div><div class='add'>+	DEF_MOD("iic0",			 318,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("iic1",			 323,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("cmt1",			 329,	R8A7745_CLK_R),</div><div class='add'>+	DEF_MOD("usbhs-dmac0",		 330,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("usbhs-dmac1",		 331,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("irqc",			 407,	R8A7745_CLK_CP),</div><div class='add'>+	DEF_MOD("intc-sys",		 408,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("audio-dmac0",		 502,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("pwm",			 523,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("usb-ehci",		 703,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("usbhs",		 704,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("hscif2",		 713,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("scif5",		 714,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("scif4",		 715,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("hscif1",		 716,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("hscif0",		 717,	R8A7745_CLK_ZS),</div><div class='add'>+	DEF_MOD("scif3",		 718,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("scif2",		 719,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("scif1",		 720,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("scif0",		 721,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("du0",			 724,	R8A7745_CLK_ZX),</div><div class='add'>+	DEF_MOD("ipmmu-sgx",		 800,	R8A7745_CLK_ZX),</div><div class='add'>+	DEF_MOD("vin1",			 810,	R8A7745_CLK_ZG),</div><div class='add'>+	DEF_MOD("vin0",			 811,	R8A7745_CLK_ZG),</div><div class='add'>+	DEF_MOD("etheravb",		 812,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("ether",		 813,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("gpio6",		 905,	R8A7745_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio5",		 907,	R8A7745_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio4",		 908,	R8A7745_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio3",		 909,	R8A7745_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio2",		 910,	R8A7745_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio1",		 911,	R8A7745_CLK_CP),</div><div class='add'>+	DEF_MOD("gpio0",		 912,	R8A7745_CLK_CP),</div><div class='add'>+	DEF_MOD("can1",			 915,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("can0",			 916,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("qspi_mod",		 917,	R8A7745_CLK_QSPI),</div><div class='add'>+	DEF_MOD("i2c5",			 925,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("i2c4",			 927,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("i2c3",			 928,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("i2c2",			 929,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("i2c1",			 930,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("i2c0",			 931,	R8A7745_CLK_HP),</div><div class='add'>+	DEF_MOD("ssi-all",		1005,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("ssi9",			1006,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi8",			1007,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi7",			1008,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi6",			1009,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi5",			1010,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi4",			1011,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi3",			1012,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi2",			1013,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi1",			1014,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("ssi0",			1015,	MOD_CLK_ID(1005)),</div><div class='add'>+	DEF_MOD("scu-all",		1017,	R8A7745_CLK_P),</div><div class='add'>+	DEF_MOD("scu-dvc1",		1018,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-dvc0",		1019,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-ctu1-mix1",	1020,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-ctu0-mix0",	1021,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src9",		1022,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src8",		1023,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src7",		1024,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src6",		1025,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src5",		1026,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src4",		1027,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src3",		1028,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src2",		1029,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src1",		1030,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scu-src0",		1031,	MOD_CLK_ID(1017)),</div><div class='add'>+	DEF_MOD("scifa3",		1106,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("scifa4",		1107,	R8A7745_CLK_MP),</div><div class='add'>+	DEF_MOD("scifa5",		1108,	R8A7745_CLK_MP),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int r8a7745_crit_mod_clks[] __initconst = {</div><div class='add'>+	MOD_CLK_ID(408),	/* INTC-SYS (GIC) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CPG Clock Data</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *    MD	EXTAL		PLL0	PLL1	PLL3</div><div class='add'>+ * 14 13 19	(MHz)		*1	*2</div><div class='add'>+ *---------------------------------------------------</div><div class='add'>+ * 0  0  0	15		x200/3	x208/2	x106</div><div class='add'>+ * 0  0  1	15		x200/3	x208/2	x88</div><div class='add'>+ * 0  1  0	20		x150/3	x156/2	x80</div><div class='add'>+ * 0  1  1	20		x150/3	x156/2	x66</div><div class='add'>+ * 1  0  0	26 / 2		x230/3	x240/2	x122</div><div class='add'>+ * 1  0  1	26 / 2		x230/3	x240/2	x102</div><div class='add'>+ * 1  1  0	30 / 2		x200/3	x208/2	x106</div><div class='add'>+ * 1  1  1	30 / 2		x200/3	x208/2	x88</div><div class='add'>+ *</div><div class='add'>+ * *1 :	Table 7.5b indicates VCO output (PLL0 = VCO/3)</div><div class='add'>+ * *2 :	Table 7.5b indicates VCO output (PLL1 = VCO/2)</div><div class='add'>+ */</div><div class='add'>+#define CPG_PLL_CONFIG_INDEX(md)	((((md) &amp; BIT(14)) &gt;&gt; 12) | \</div><div class='add'>+					 (((md) &amp; BIT(13)) &gt;&gt; 12) | \</div><div class='add'>+					 (((md) &amp; BIT(19)) &gt;&gt; 19))</div><div class='add'>+</div><div class='add'>+static const struct rcar_gen2_cpg_pll_config cpg_pll_configs[8] __initconst = {</div><div class='add'>+	/* EXTAL div	PLL1 mult	PLL3 mult	PLL0 mult */</div><div class='add'>+	{ 1,		208,		106,		200	},</div><div class='add'>+	{ 1,		208,		88,		200	},</div><div class='add'>+	{ 1,		156,		80,		150	},</div><div class='add'>+	{ 1,		156,		66,		150	},</div><div class='add'>+	{ 2,		240,		122,		230	},</div><div class='add'>+	{ 2,		240,		102,		230	},</div><div class='add'>+	{ 2,		208,		106,		200	},</div><div class='add'>+	{ 2,		208,		88,		200	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init r8a7745_cpg_mssr_init(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct rcar_gen2_cpg_pll_config *cpg_pll_config;</div><div class='add'>+	u32 cpg_mode;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = rcar_rst_read_mode_pins(&amp;cpg_mode);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	cpg_pll_config = &amp;cpg_pll_configs[CPG_PLL_CONFIG_INDEX(cpg_mode)];</div><div class='add'>+</div><div class='add'>+	return rcar_gen2_cpg_init(cpg_pll_config, 3, cpg_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct cpg_mssr_info r8a7745_cpg_mssr_info __initconst = {</div><div class='add'>+	/* Core Clocks */</div><div class='add'>+	.core_clks = r8a7745_core_clks,</div><div class='add'>+	.num_core_clks = ARRAY_SIZE(r8a7745_core_clks),</div><div class='add'>+	.last_dt_core_clk = LAST_DT_CORE_CLK,</div><div class='add'>+	.num_total_core_clks = MOD_CLK_BASE,</div><div class='add'>+</div><div class='add'>+	/* Module Clocks */</div><div class='add'>+	.mod_clks = r8a7745_mod_clks,</div><div class='add'>+	.num_mod_clks = ARRAY_SIZE(r8a7745_mod_clks),</div><div class='add'>+	.num_hw_mod_clks = 12 * 32,</div><div class='add'>+</div><div class='add'>+	/* Critical Module Clocks */</div><div class='add'>+	.crit_mod_clks = r8a7745_crit_mod_clks,</div><div class='add'>+	.num_crit_mod_clks = ARRAY_SIZE(r8a7745_crit_mod_clks),</div><div class='add'>+</div><div class='add'>+	/* Callbacks */</div><div class='add'>+	.init = r8a7745_cpg_mssr_init,</div><div class='add'>+	.cpg_clk_register = rcar_gen2_cpg_clk_register,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c<br/>index f255e451e8ca..bfffdb00df97 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/r8a7795-cpg-mssr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/r8a7795-cpg-mssr.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/r8a7795-cpg-mssr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/r8a7795-cpg-mssr.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/soc/renesas/rcar-rst.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/r8a7795-cpg-mssr.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -97,7 +98,7 @@ static const struct cpg_core_clk r8a7795_core_clks[] __initconst = {</div><div class='ctx'> 	DEF_FIXED("cp",         R8A7795_CLK_CP,    CLK_EXTAL,      2, 1),</div><div class='ctx'> </div><div class='ctx'> 	DEF_DIV6P1("mso",       R8A7795_CLK_MSO,   CLK_PLL1_DIV4, 0x014),</div><div class='del'>-	DEF_DIV6P1("hdmi",      R8A7795_CLK_HDMI,  CLK_PLL1_DIV2, 0x250),</div><div class='add'>+	DEF_DIV6P1("hdmi",      R8A7795_CLK_HDMI,  CLK_PLL1_DIV4, 0x250),</div><div class='ctx'> 	DEF_DIV6P1("canfd",     R8A7795_CLK_CANFD, CLK_PLL1_DIV4, 0x244),</div><div class='ctx'> 	DEF_DIV6P1("csi0",      R8A7795_CLK_CSI0,  CLK_PLL1_DIV4, 0x00c),</div><div class='ctx'> </div><div class='hunk'>@@ -220,6 +221,7 @@ static const struct mssr_mod_clk r8a7795_mod_clks[] __initconst = {</div><div class='ctx'> 	DEF_MOD("can-if0",		 916,	R8A7795_CLK_S3D4),</div><div class='ctx'> 	DEF_MOD("i2c6",			 918,	R8A7795_CLK_S3D2),</div><div class='ctx'> 	DEF_MOD("i2c5",			 919,	R8A7795_CLK_S3D2),</div><div class='add'>+	DEF_MOD("i2c-dvfs",		 926,	R8A7795_CLK_CP),</div><div class='ctx'> 	DEF_MOD("i2c4",			 927,	R8A7795_CLK_S3D2),</div><div class='ctx'> 	DEF_MOD("i2c3",			 928,	R8A7795_CLK_S3D2),</div><div class='ctx'> 	DEF_MOD("i2c2",			 929,	R8A7795_CLK_S3D2),</div><div class='hunk'>@@ -311,7 +313,12 @@ static const struct rcar_gen3_cpg_pll_config cpg_pll_configs[16] __initconst = {</div><div class='ctx'> static int __init r8a7795_cpg_mssr_init(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct rcar_gen3_cpg_pll_config *cpg_pll_config;</div><div class='del'>-	u32 cpg_mode = rcar_gen3_read_mode_pins();</div><div class='add'>+	u32 cpg_mode;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = rcar_rst_read_mode_pins(&amp;cpg_mode);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	cpg_pll_config = &amp;cpg_pll_configs[CPG_PLL_CONFIG_INDEX(cpg_mode)];</div><div class='ctx'> 	if (!cpg_pll_config-&gt;extal_div) {</div><div class='head'>diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c<br/>index eb347ed265f2..11e084a56b0d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/r8a7796-cpg-mssr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/r8a7796-cpg-mssr.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/r8a7796-cpg-mssr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/r8a7796-cpg-mssr.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/soc/renesas/rcar-rst.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/r8a7796-cpg-mssr.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -102,6 +103,10 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = {</div><div class='ctx'> 	DEF_FIXED("cl",         R8A7796_CLK_CL,    CLK_PLL1_DIV2, 48, 1),</div><div class='ctx'> 	DEF_FIXED("cp",         R8A7796_CLK_CP,    CLK_EXTAL,      2, 1),</div><div class='ctx'> </div><div class='add'>+	DEF_DIV6P1("canfd",     R8A7796_CLK_CANFD, CLK_PLL1_DIV4, 0x244),</div><div class='add'>+	DEF_DIV6P1("csi0",      R8A7796_CLK_CSI0,  CLK_PLL1_DIV4, 0x00c),</div><div class='add'>+	DEF_DIV6P1("mso",       R8A7796_CLK_MSO,   CLK_PLL1_DIV4, 0x014),</div><div class='add'>+</div><div class='ctx'> 	DEF_DIV6_RO("osc",      R8A7796_CLK_OSC,   CLK_EXTAL, CPG_RCKCR,  8),</div><div class='ctx'> 	DEF_DIV6_RO("r_int",    CLK_RINT,          CLK_EXTAL, CPG_RCKCR, 32),</div><div class='ctx'> </div><div class='hunk'>@@ -109,6 +114,18 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {</div><div class='add'>+	DEF_MOD("scif5",		 202,	R8A7796_CLK_S3D4),</div><div class='add'>+	DEF_MOD("scif4",		 203,	R8A7796_CLK_S3D4),</div><div class='add'>+	DEF_MOD("scif3",		 204,	R8A7796_CLK_S3D4),</div><div class='add'>+	DEF_MOD("scif1",		 206,	R8A7796_CLK_S3D4),</div><div class='add'>+	DEF_MOD("scif0",		 207,	R8A7796_CLK_S3D4),</div><div class='add'>+	DEF_MOD("msiof3",		 208,	R8A7796_CLK_MSO),</div><div class='add'>+	DEF_MOD("msiof2",		 209,	R8A7796_CLK_MSO),</div><div class='add'>+	DEF_MOD("msiof1",		 210,	R8A7796_CLK_MSO),</div><div class='add'>+	DEF_MOD("msiof0",		 211,	R8A7796_CLK_MSO),</div><div class='add'>+	DEF_MOD("sys-dmac2",		 217,	R8A7796_CLK_S0D3),</div><div class='add'>+	DEF_MOD("sys-dmac1",		 218,	R8A7796_CLK_S0D3),</div><div class='add'>+	DEF_MOD("sys-dmac0",		 219,	R8A7796_CLK_S0D3),</div><div class='ctx'> 	DEF_MOD("cmt3",			 300,	R8A7796_CLK_R),</div><div class='ctx'> 	DEF_MOD("cmt2",			 301,	R8A7796_CLK_R),</div><div class='ctx'> 	DEF_MOD("cmt1",			 302,	R8A7796_CLK_R),</div><div class='hunk'>@@ -120,7 +137,47 @@ static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {</div><div class='ctx'> 	DEF_MOD("sdif0",		 314,	R8A7796_CLK_SD0),</div><div class='ctx'> 	DEF_MOD("rwdt0",		 402,	R8A7796_CLK_R),</div><div class='ctx'> 	DEF_MOD("intc-ap",		 408,	R8A7796_CLK_S3D1),</div><div class='add'>+	DEF_MOD("drif7",		 508,	R8A7796_CLK_S3D2),</div><div class='add'>+	DEF_MOD("drif6",		 509,	R8A7796_CLK_S3D2),</div><div class='add'>+	DEF_MOD("drif5",		 510,	R8A7796_CLK_S3D2),</div><div class='add'>+	DEF_MOD("drif4",		 511,	R8A7796_CLK_S3D2),</div><div class='add'>+	DEF_MOD("drif3",		 512,	R8A7796_CLK_S3D2),</div><div class='add'>+	DEF_MOD("drif2",		 513,	R8A7796_CLK_S3D2),</div><div class='add'>+	DEF_MOD("drif1",		 514,	R8A7796_CLK_S3D2),</div><div class='add'>+	DEF_MOD("drif0",		 515,	R8A7796_CLK_S3D2),</div><div class='add'>+	DEF_MOD("hscif4",		 516,	R8A7796_CLK_S3D1),</div><div class='add'>+	DEF_MOD("hscif3",		 517,	R8A7796_CLK_S3D1),</div><div class='add'>+	DEF_MOD("hscif2",		 518,	R8A7796_CLK_S3D1),</div><div class='add'>+	DEF_MOD("hscif1",		 519,	R8A7796_CLK_S3D1),</div><div class='add'>+	DEF_MOD("hscif0",		 520,	R8A7796_CLK_S3D1),</div><div class='ctx'> 	DEF_MOD("thermal",		 522,	R8A7796_CLK_CP),</div><div class='add'>+	DEF_MOD("fcpvd2",		 601,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("fcpvd1",		 602,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("fcpvd0",		 603,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("fcpvb0",		 607,	R8A7796_CLK_S0D1),</div><div class='add'>+	DEF_MOD("fcpvi0",		 611,	R8A7796_CLK_S0D1),</div><div class='add'>+	DEF_MOD("fcpf0",		 615,	R8A7796_CLK_S0D1),</div><div class='add'>+	DEF_MOD("fcpci0",		 617,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("fcpcs",		 619,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("vspd2",		 621,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("vspd1",		 622,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("vspd0",		 623,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("vspb",			 626,	R8A7796_CLK_S0D1),</div><div class='add'>+	DEF_MOD("vspi0",		 631,	R8A7796_CLK_S0D1),</div><div class='add'>+	DEF_MOD("csi20",		 714,	R8A7796_CLK_CSI0),</div><div class='add'>+	DEF_MOD("csi40",		 716,	R8A7796_CLK_CSI0),</div><div class='add'>+	DEF_MOD("du2",			 722,	R8A7796_CLK_S2D1),</div><div class='add'>+	DEF_MOD("du1",			 723,	R8A7796_CLK_S2D1),</div><div class='add'>+	DEF_MOD("du0",			 724,	R8A7796_CLK_S2D1),</div><div class='add'>+	DEF_MOD("lvds",			 727,	R8A7796_CLK_S2D1),</div><div class='add'>+	DEF_MOD("vin7",			 804,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("vin6",			 805,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("vin5",			 806,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("vin4",			 807,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("vin3",			 808,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("vin2",			 809,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("vin1",			 810,	R8A7796_CLK_S0D2),</div><div class='add'>+	DEF_MOD("vin0",			 811,	R8A7796_CLK_S0D2),</div><div class='ctx'> 	DEF_MOD("etheravb",		 812,	R8A7796_CLK_S0D6),</div><div class='ctx'> 	DEF_MOD("gpio7",		 905,	R8A7796_CLK_S3D4),</div><div class='ctx'> 	DEF_MOD("gpio6",		 906,	R8A7796_CLK_S3D4),</div><div class='hunk'>@@ -130,6 +187,17 @@ static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {</div><div class='ctx'> 	DEF_MOD("gpio2",		 910,	R8A7796_CLK_S3D4),</div><div class='ctx'> 	DEF_MOD("gpio1",		 911,	R8A7796_CLK_S3D4),</div><div class='ctx'> 	DEF_MOD("gpio0",		 912,	R8A7796_CLK_S3D4),</div><div class='add'>+	DEF_MOD("can-fd",		 914,	R8A7796_CLK_S3D2),</div><div class='add'>+	DEF_MOD("can-if1",		 915,	R8A7796_CLK_S3D4),</div><div class='add'>+	DEF_MOD("can-if0",		 916,	R8A7796_CLK_S3D4),</div><div class='add'>+	DEF_MOD("i2c6",			 918,	R8A7796_CLK_S0D6),</div><div class='add'>+	DEF_MOD("i2c5",			 919,	R8A7796_CLK_S0D6),</div><div class='add'>+	DEF_MOD("i2c-dvfs",		 926,	R8A7796_CLK_CP),</div><div class='add'>+	DEF_MOD("i2c4",			 927,	R8A7796_CLK_S0D6),</div><div class='add'>+	DEF_MOD("i2c3",			 928,	R8A7796_CLK_S0D6),</div><div class='add'>+	DEF_MOD("i2c2",			 929,	R8A7796_CLK_S3D2),</div><div class='add'>+	DEF_MOD("i2c1",			 930,	R8A7796_CLK_S3D2),</div><div class='add'>+	DEF_MOD("i2c0",			 931,	R8A7796_CLK_S3D2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int r8a7796_crit_mod_clks[] __initconst = {</div><div class='hunk'>@@ -190,7 +258,12 @@ static const struct rcar_gen3_cpg_pll_config cpg_pll_configs[16] __initconst = {</div><div class='ctx'> static int __init r8a7796_cpg_mssr_init(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct rcar_gen3_cpg_pll_config *cpg_pll_config;</div><div class='del'>-	u32 cpg_mode = rcar_gen3_read_mode_pins();</div><div class='add'>+	u32 cpg_mode;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = rcar_rst_read_mode_pins(&amp;cpg_mode);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	cpg_pll_config = &amp;cpg_pll_configs[CPG_PLL_CONFIG_INDEX(cpg_mode)];</div><div class='ctx'> 	if (!cpg_pll_config-&gt;extal_div) {</div><div class='head'>diff --git a/drivers/clk/renesas/rcar-gen2-cpg.c b/drivers/clk/renesas/rcar-gen2-cpg.c<br/>new file mode 100644<br/>index 000000000000..123b1e622179<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/rcar-gen2-cpg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/rcar-gen2-cpg.c</a></div><div class='hunk'>@@ -0,0 +1,371 @@</div><div class='add'>+/*</div><div class='add'>+ * R-Car Gen2 Clock Pulse Generator</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Cogent Embedded Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License version 2 as published</div><div class='add'>+ * by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "renesas-cpg-mssr.h"</div><div class='add'>+#include "rcar-gen2-cpg.h"</div><div class='add'>+</div><div class='add'>+#define CPG_FRQCRB		0x0004</div><div class='add'>+#define CPG_FRQCRB_KICK		BIT(31)</div><div class='add'>+#define CPG_SDCKCR		0x0074</div><div class='add'>+#define CPG_PLL0CR		0x00d8</div><div class='add'>+#define CPG_PLL0CR_STC_SHIFT	24</div><div class='add'>+#define CPG_PLL0CR_STC_MASK	(0x7f &lt;&lt; CPG_PLL0CR_STC_SHIFT)</div><div class='add'>+#define CPG_FRQCRC		0x00e0</div><div class='add'>+#define CPG_FRQCRC_ZFC_SHIFT	8</div><div class='add'>+#define CPG_FRQCRC_ZFC_MASK	(0x1f &lt;&lt; CPG_FRQCRC_ZFC_SHIFT)</div><div class='add'>+#define CPG_ADSPCKCR		0x025c</div><div class='add'>+#define CPG_RCANCKCR		0x0270</div><div class='add'>+</div><div class='add'>+static spinlock_t cpg_lock;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Z Clock</div><div class='add'>+ *</div><div class='add'>+ * Traits of this clock:</div><div class='add'>+ * prepare - clk_prepare only ensures that parents are prepared</div><div class='add'>+ * enable - clk_enable only ensures that parents are enabled</div><div class='add'>+ * rate - rate is adjustable.  clk-&gt;rate = parent-&gt;rate * mult / 32</div><div class='add'>+ * parent - fixed parent.  No clk_set_parent support</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct cpg_z_clk {</div><div class='add'>+	struct clk_hw hw;</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+	void __iomem *kick_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_z_clk(_hw)	container_of(_hw, struct cpg_z_clk, hw)</div><div class='add'>+</div><div class='add'>+static unsigned long cpg_z_clk_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					   unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct cpg_z_clk *zclk = to_z_clk(hw);</div><div class='add'>+	unsigned int mult;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	val = (readl(zclk-&gt;reg) &amp; CPG_FRQCRC_ZFC_MASK) &gt;&gt; CPG_FRQCRC_ZFC_SHIFT;</div><div class='add'>+	mult = 32 - val;</div><div class='add'>+</div><div class='add'>+	return div_u64((u64)parent_rate * mult, 32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long cpg_z_clk_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				 unsigned long *parent_rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long prate  = *parent_rate;</div><div class='add'>+	unsigned int mult;</div><div class='add'>+</div><div class='add'>+	if (!prate)</div><div class='add'>+		prate = 1;</div><div class='add'>+</div><div class='add'>+	mult = div_u64((u64)rate * 32, prate);</div><div class='add'>+	mult = clamp(mult, 1U, 32U);</div><div class='add'>+</div><div class='add'>+	return *parent_rate / 32 * mult;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpg_z_clk_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+			      unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct cpg_z_clk *zclk = to_z_clk(hw);</div><div class='add'>+	unsigned int mult;</div><div class='add'>+	u32 val, kick;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	mult = div_u64((u64)rate * 32, parent_rate);</div><div class='add'>+	mult = clamp(mult, 1U, 32U);</div><div class='add'>+</div><div class='add'>+	if (readl(zclk-&gt;kick_reg) &amp; CPG_FRQCRB_KICK)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	val = readl(zclk-&gt;reg);</div><div class='add'>+	val &amp;= ~CPG_FRQCRC_ZFC_MASK;</div><div class='add'>+	val |= (32 - mult) &lt;&lt; CPG_FRQCRC_ZFC_SHIFT;</div><div class='add'>+	writel(val, zclk-&gt;reg);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set KICK bit in FRQCRB to update hardware setting and wait for</div><div class='add'>+	 * clock change completion.</div><div class='add'>+	 */</div><div class='add'>+	kick = readl(zclk-&gt;kick_reg);</div><div class='add'>+	kick |= CPG_FRQCRB_KICK;</div><div class='add'>+	writel(kick, zclk-&gt;kick_reg);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Note: There is no HW information about the worst case latency.</div><div class='add'>+	 *</div><div class='add'>+	 * Using experimental measurements, it seems that no more than</div><div class='add'>+	 * ~10 iterations are needed, independently of the CPU rate.</div><div class='add'>+	 * Since this value might be dependent on external xtal rate, pll1</div><div class='add'>+	 * rate or even the other emulation clocks rate, use 1000 as a</div><div class='add'>+	 * "super" safe value.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 1000; i; i--) {</div><div class='add'>+		if (!(readl(zclk-&gt;kick_reg) &amp; CPG_FRQCRB_KICK))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops cpg_z_clk_ops = {</div><div class='add'>+	.recalc_rate = cpg_z_clk_recalc_rate,</div><div class='add'>+	.round_rate = cpg_z_clk_round_rate,</div><div class='add'>+	.set_rate = cpg_z_clk_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk * __init cpg_z_clk_register(const char *name,</div><div class='add'>+					      const char *parent_name,</div><div class='add'>+					      void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	struct clk_init_data init;</div><div class='add'>+	struct cpg_z_clk *zclk;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	zclk = kzalloc(sizeof(*zclk), GFP_KERNEL);</div><div class='add'>+	if (!zclk)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	init.name = name;</div><div class='add'>+	init.ops = &amp;cpg_z_clk_ops;</div><div class='add'>+	init.flags = 0;</div><div class='add'>+	init.parent_names = &amp;parent_name;</div><div class='add'>+	init.num_parents = 1;</div><div class='add'>+</div><div class='add'>+	zclk-&gt;reg = base + CPG_FRQCRC;</div><div class='add'>+	zclk-&gt;kick_reg = base + CPG_FRQCRB;</div><div class='add'>+	zclk-&gt;hw.init = &amp;init;</div><div class='add'>+</div><div class='add'>+	clk = clk_register(NULL, &amp;zclk-&gt;hw);</div><div class='add'>+	if (IS_ERR(clk))</div><div class='add'>+		kfree(zclk);</div><div class='add'>+</div><div class='add'>+	return clk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk * __init cpg_rcan_clk_register(const char *name,</div><div class='add'>+						 const char *parent_name,</div><div class='add'>+						 void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	struct clk_fixed_factor *fixed;</div><div class='add'>+	struct clk_gate *gate;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	fixed = kzalloc(sizeof(*fixed), GFP_KERNEL);</div><div class='add'>+	if (!fixed)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	fixed-&gt;mult = 1;</div><div class='add'>+	fixed-&gt;div = 6;</div><div class='add'>+</div><div class='add'>+	gate = kzalloc(sizeof(*gate), GFP_KERNEL);</div><div class='add'>+	if (!gate) {</div><div class='add'>+		kfree(fixed);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gate-&gt;reg = base + CPG_RCANCKCR;</div><div class='add'>+	gate-&gt;bit_idx = 8;</div><div class='add'>+	gate-&gt;flags = CLK_GATE_SET_TO_DISABLE;</div><div class='add'>+	gate-&gt;lock = &amp;cpg_lock;</div><div class='add'>+</div><div class='add'>+	clk = clk_register_composite(NULL, name, &amp;parent_name, 1, NULL, NULL,</div><div class='add'>+				     &amp;fixed-&gt;hw, &amp;clk_fixed_factor_ops,</div><div class='add'>+				     &amp;gate-&gt;hw, &amp;clk_gate_ops, 0);</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		kfree(gate);</div><div class='add'>+		kfree(fixed);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return clk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ADSP divisors */</div><div class='add'>+static const struct clk_div_table cpg_adsp_div_table[] = {</div><div class='add'>+	{  1,  3 }, {  2,  4 }, {  3,  6 }, {  4,  8 },</div><div class='add'>+	{  5, 12 }, {  6, 16 }, {  7, 18 }, {  8, 24 },</div><div class='add'>+	{ 10, 36 }, { 11, 48 }, {  0,  0 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk * __init cpg_adsp_clk_register(const char *name,</div><div class='add'>+						 const char *parent_name,</div><div class='add'>+						 void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	struct clk_divider *div;</div><div class='add'>+	struct clk_gate *gate;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	div = kzalloc(sizeof(*div), GFP_KERNEL);</div><div class='add'>+	if (!div)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	div-&gt;reg = base + CPG_ADSPCKCR;</div><div class='add'>+	div-&gt;width = 4;</div><div class='add'>+	div-&gt;table = cpg_adsp_div_table;</div><div class='add'>+	div-&gt;lock = &amp;cpg_lock;</div><div class='add'>+</div><div class='add'>+	gate = kzalloc(sizeof(*gate), GFP_KERNEL);</div><div class='add'>+	if (!gate) {</div><div class='add'>+		kfree(div);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gate-&gt;reg = base + CPG_ADSPCKCR;</div><div class='add'>+	gate-&gt;bit_idx = 8;</div><div class='add'>+	gate-&gt;flags = CLK_GATE_SET_TO_DISABLE;</div><div class='add'>+	gate-&gt;lock = &amp;cpg_lock;</div><div class='add'>+</div><div class='add'>+	clk = clk_register_composite(NULL, name, &amp;parent_name, 1, NULL, NULL,</div><div class='add'>+				     &amp;div-&gt;hw, &amp;clk_divider_ops,</div><div class='add'>+				     &amp;gate-&gt;hw, &amp;clk_gate_ops, 0);</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		kfree(gate);</div><div class='add'>+		kfree(div);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return clk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* SDHI divisors */</div><div class='add'>+static const struct clk_div_table cpg_sdh_div_table[] = {</div><div class='add'>+	{  0,  2 }, {  1,  3 }, {  2,  4 }, {  3,  6 },</div><div class='add'>+	{  4,  8 }, {  5, 12 }, {  6, 16 }, {  7, 18 },</div><div class='add'>+	{  8, 24 }, { 10, 36 }, { 11, 48 }, {  0,  0 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_div_table cpg_sd01_div_table[] = {</div><div class='add'>+	{  4,  8 }, {  5, 12 }, {  6, 16 }, {  7, 18 },</div><div class='add'>+	{  8, 24 }, { 10, 36 }, { 11, 48 }, { 12, 10 },</div><div class='add'>+	{  0,  0 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rcar_gen2_cpg_pll_config *cpg_pll_config __initdata;</div><div class='add'>+static unsigned int cpg_pll0_div __initdata;</div><div class='add'>+static u32 cpg_mode __initdata;</div><div class='add'>+</div><div class='add'>+struct clk * __init rcar_gen2_cpg_clk_register(struct device *dev,</div><div class='add'>+					       const struct cpg_core_clk *core,</div><div class='add'>+					       const struct cpg_mssr_info *info,</div><div class='add'>+					       struct clk **clks,</div><div class='add'>+					       void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	const struct clk_div_table *table = NULL;</div><div class='add'>+	const struct clk *parent;</div><div class='add'>+	const char *parent_name;</div><div class='add'>+	unsigned int mult = 1;</div><div class='add'>+	unsigned int div = 1;</div><div class='add'>+	unsigned int shift;</div><div class='add'>+</div><div class='add'>+	parent = clks[core-&gt;parent];</div><div class='add'>+	if (IS_ERR(parent))</div><div class='add'>+		return ERR_CAST(parent);</div><div class='add'>+</div><div class='add'>+	parent_name = __clk_get_name(parent);</div><div class='add'>+</div><div class='add'>+	switch (core-&gt;type) {</div><div class='add'>+	/* R-Car Gen2 */</div><div class='add'>+	case CLK_TYPE_GEN2_MAIN:</div><div class='add'>+		div = cpg_pll_config-&gt;extal_div;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CLK_TYPE_GEN2_PLL0:</div><div class='add'>+		/*</div><div class='add'>+		 * PLL0 is a  configurable multiplier clock except on R-Car</div><div class='add'>+		 * V2H/E2. Register the PLL0 clock as a fixed factor clock for</div><div class='add'>+		 * now as there's no generic multiplier clock implementation and</div><div class='add'>+		 * we  currently  have no need to change  the multiplier value.</div><div class='add'>+		 */</div><div class='add'>+		mult = cpg_pll_config-&gt;pll0_mult;</div><div class='add'>+		div  = cpg_pll0_div;</div><div class='add'>+		if (!mult) {</div><div class='add'>+			u32 pll0cr = readl(base + CPG_PLL0CR);</div><div class='add'>+</div><div class='add'>+			mult = (((pll0cr &amp; CPG_PLL0CR_STC_MASK) &gt;&gt;</div><div class='add'>+				 CPG_PLL0CR_STC_SHIFT) + 1) * 2;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CLK_TYPE_GEN2_PLL1:</div><div class='add'>+		mult = cpg_pll_config-&gt;pll1_mult / 2;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CLK_TYPE_GEN2_PLL3:</div><div class='add'>+		mult = cpg_pll_config-&gt;pll3_mult;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CLK_TYPE_GEN2_Z:</div><div class='add'>+		return cpg_z_clk_register(core-&gt;name, parent_name, base);</div><div class='add'>+</div><div class='add'>+	case CLK_TYPE_GEN2_LB:</div><div class='add'>+		div = cpg_mode &amp; BIT(18) ? 36 : 24;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CLK_TYPE_GEN2_ADSP:</div><div class='add'>+		return cpg_adsp_clk_register(core-&gt;name, parent_name, base);</div><div class='add'>+</div><div class='add'>+	case CLK_TYPE_GEN2_SDH:</div><div class='add'>+		table = cpg_sdh_div_table;</div><div class='add'>+		shift = 8;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CLK_TYPE_GEN2_SD0:</div><div class='add'>+		table = cpg_sd01_div_table;</div><div class='add'>+		shift = 4;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CLK_TYPE_GEN2_SD1:</div><div class='add'>+		table = cpg_sd01_div_table;</div><div class='add'>+		shift = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CLK_TYPE_GEN2_QSPI:</div><div class='add'>+		div = (cpg_mode &amp; (BIT(3) | BIT(2) | BIT(1))) == BIT(2) ?</div><div class='add'>+		      8 : 10;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CLK_TYPE_GEN2_RCAN:</div><div class='add'>+		return cpg_rcan_clk_register(core-&gt;name, parent_name, base);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!table)</div><div class='add'>+		return clk_register_fixed_factor(NULL, core-&gt;name, parent_name,</div><div class='add'>+						 0, mult, div);</div><div class='add'>+	else</div><div class='add'>+		return clk_register_divider_table(NULL, core-&gt;name,</div><div class='add'>+						  parent_name, 0,</div><div class='add'>+						  base + CPG_SDCKCR, shift, 4,</div><div class='add'>+						  0, table, &amp;cpg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init rcar_gen2_cpg_init(const struct rcar_gen2_cpg_pll_config *config,</div><div class='add'>+			      unsigned int pll0_div, u32 mode)</div><div class='add'>+{</div><div class='add'>+	cpg_pll_config = config;</div><div class='add'>+	cpg_pll0_div = pll0_div;</div><div class='add'>+	cpg_mode = mode;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;cpg_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/clk/renesas/rcar-gen2-cpg.h b/drivers/clk/renesas/rcar-gen2-cpg.h<br/>new file mode 100644<br/>index 000000000000..9eba07ff8b11<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/rcar-gen2-cpg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/rcar-gen2-cpg.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ * R-Car Gen2 Clock Pulse Generator</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Cogent Embedded Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License version 2 as published</div><div class='add'>+ * by the Free Software Foundation; version 2 of the License.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CLK_RENESAS_RCAR_GEN2_CPG_H__</div><div class='add'>+#define __CLK_RENESAS_RCAR_GEN2_CPG_H__</div><div class='add'>+</div><div class='add'>+enum rcar_gen2_clk_types {</div><div class='add'>+	CLK_TYPE_GEN2_MAIN = CLK_TYPE_CUSTOM,</div><div class='add'>+	CLK_TYPE_GEN2_PLL0,</div><div class='add'>+	CLK_TYPE_GEN2_PLL1,</div><div class='add'>+	CLK_TYPE_GEN2_PLL3,</div><div class='add'>+	CLK_TYPE_GEN2_Z,</div><div class='add'>+	CLK_TYPE_GEN2_LB,</div><div class='add'>+	CLK_TYPE_GEN2_ADSP,</div><div class='add'>+	CLK_TYPE_GEN2_SDH,</div><div class='add'>+	CLK_TYPE_GEN2_SD0,</div><div class='add'>+	CLK_TYPE_GEN2_SD1,</div><div class='add'>+	CLK_TYPE_GEN2_QSPI,</div><div class='add'>+	CLK_TYPE_GEN2_RCAN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rcar_gen2_cpg_pll_config {</div><div class='add'>+	unsigned int extal_div;</div><div class='add'>+	unsigned int pll1_mult;</div><div class='add'>+	unsigned int pll3_mult;</div><div class='add'>+	unsigned int pll0_mult;		/* leave as zero if PLL0CR exists */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk *rcar_gen2_cpg_clk_register(struct device *dev,</div><div class='add'>+				       const struct cpg_core_clk *core,</div><div class='add'>+				       const struct cpg_mssr_info *info,</div><div class='add'>+				       struct clk **clks, void __iomem *base);</div><div class='add'>+int rcar_gen2_cpg_init(const struct rcar_gen2_cpg_pll_config *config,</div><div class='add'>+		       unsigned int pll0_div, u32 mode);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/clk/renesas/rcar-gen3-cpg.c b/drivers/clk/renesas/rcar-gen3-cpg.c<br/>index bb4f2f9a8c2f..742f6dc7c156 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/rcar-gen3-cpg.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/rcar-gen3-cpg.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/rcar-gen3-cpg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/rcar-gen3-cpg.c</a></div><div class='hunk'>@@ -98,7 +98,7 @@ static int cpg_sd_clock_enable(struct clk_hw *hw)</div><div class='ctx'> 	u32 val, sd_fc;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	val = clk_readl(clock-&gt;reg);</div><div class='add'>+	val = readl(clock-&gt;reg);</div><div class='ctx'> </div><div class='ctx'> 	sd_fc = val &amp; CPG_SD_FC_MASK;</div><div class='ctx'> 	for (i = 0; i &lt; clock-&gt;div_num; i++)</div><div class='hunk'>@@ -111,7 +111,7 @@ static int cpg_sd_clock_enable(struct clk_hw *hw)</div><div class='ctx'> 	val &amp;= ~(CPG_SD_STP_MASK);</div><div class='ctx'> 	val |= clock-&gt;div_table[i].val &amp; CPG_SD_STP_MASK;</div><div class='ctx'> </div><div class='del'>-	clk_writel(val, clock-&gt;reg);</div><div class='add'>+	writel(val, clock-&gt;reg);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -120,14 +120,14 @@ static void cpg_sd_clock_disable(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd_clock *clock = to_sd_clock(hw);</div><div class='ctx'> </div><div class='del'>-	clk_writel(clk_readl(clock-&gt;reg) | CPG_SD_STP_MASK, clock-&gt;reg);</div><div class='add'>+	writel(readl(clock-&gt;reg) | CPG_SD_STP_MASK, clock-&gt;reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cpg_sd_clock_is_enabled(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd_clock *clock = to_sd_clock(hw);</div><div class='ctx'> </div><div class='del'>-	return !(clk_readl(clock-&gt;reg) &amp; CPG_SD_STP_MASK);</div><div class='add'>+	return !(readl(clock-&gt;reg) &amp; CPG_SD_STP_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long cpg_sd_clock_recalc_rate(struct clk_hw *hw,</div><div class='hunk'>@@ -138,7 +138,7 @@ static unsigned long cpg_sd_clock_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> 	u32 val, sd_fc;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	val = clk_readl(clock-&gt;reg);</div><div class='add'>+	val = readl(clock-&gt;reg);</div><div class='ctx'> </div><div class='ctx'> 	sd_fc = val &amp; CPG_SD_FC_MASK;</div><div class='ctx'> 	for (i = 0; i &lt; clock-&gt;div_num; i++)</div><div class='hunk'>@@ -189,10 +189,10 @@ static int cpg_sd_clock_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	if (i &gt;= clock-&gt;div_num)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	val = clk_readl(clock-&gt;reg);</div><div class='add'>+	val = readl(clock-&gt;reg);</div><div class='ctx'> 	val &amp;= ~(CPG_SD_STP_MASK | CPG_SD_FC_MASK);</div><div class='ctx'> 	val |= clock-&gt;div_table[i].val &amp; (CPG_SD_STP_MASK | CPG_SD_FC_MASK);</div><div class='del'>-	clk_writel(val, clock-&gt;reg);</div><div class='add'>+	writel(val, clock-&gt;reg);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -333,23 +333,6 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,</div><div class='ctx'> 					 __clk_get_name(parent), 0, mult, div);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Reset register definitions.</div><div class='del'>- */</div><div class='del'>-#define MODEMR	0xe6160060</div><div class='del'>-</div><div class='del'>-u32 __init rcar_gen3_read_mode_pins(void)</div><div class='del'>-{</div><div class='del'>-	void __iomem *modemr = ioremap_nocache(MODEMR, 4);</div><div class='del'>-	u32 mode;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!modemr);</div><div class='del'>-	mode = ioread32(modemr);</div><div class='del'>-	iounmap(modemr);</div><div class='del'>-</div><div class='del'>-	return mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int __init rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config,</div><div class='ctx'> 			      unsigned int clk_extalr)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/clk/renesas/rcar-gen3-cpg.h b/drivers/clk/renesas/rcar-gen3-cpg.h<br/>index f699085147d1..f788f481dd42 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/rcar-gen3-cpg.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/rcar-gen3-cpg.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/rcar-gen3-cpg.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/rcar-gen3-cpg.h</a></div><div class='hunk'>@@ -33,7 +33,6 @@ struct rcar_gen3_cpg_pll_config {</div><div class='ctx'> </div><div class='ctx'> #define CPG_RCKCR	0x240</div><div class='ctx'> </div><div class='del'>-u32 rcar_gen3_read_mode_pins(void);</div><div class='ctx'> struct clk *rcar_gen3_cpg_clk_register(struct device *dev,</div><div class='ctx'> 	const struct cpg_core_clk *core, const struct cpg_mssr_info *info,</div><div class='ctx'> 	struct clk **clks, void __iomem *base);</div><div class='head'>diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c<br/>index e1365e7491ae..eadcbd43ff88 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/renesas-cpg-mssr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/renesas-cpg-mssr.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/renesas-cpg-mssr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/renesas-cpg-mssr.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/clk/renesas.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='hunk'>@@ -25,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/pm_clock.h&gt;</div><div class='ctx'> #include &lt;linux/pm_domain.h&gt;</div><div class='add'>+#include &lt;linux/reset-controller.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;dt-bindings/clock/renesas-cpg-mssr.h&gt;</div><div class='hunk'>@@ -33,9 +35,9 @@</div><div class='ctx'> #include "clk-div6.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-#define WARN_DEBUG(x)	do { } while (0)</div><div class='del'>-#else</div><div class='ctx'> #define WARN_DEBUG(x)	WARN_ON(x)</div><div class='add'>+#else</div><div class='add'>+#define WARN_DEBUG(x)	do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -43,7 +45,7 @@</div><div class='ctx'>  * Module Standby and Software Reset register offets.</div><div class='ctx'>  *</div><div class='ctx'>  * If the registers exist, these are valid for SH-Mobile, R-Mobile,</div><div class='del'>- * R-Car Gen 2, and R-Car Gen 3.</div><div class='add'>+ * R-Car Gen2, R-Car Gen3, and RZ/G1.</div><div class='ctx'>  * These are NOT valid for R-Car Gen1 and RZ/A1!</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -96,18 +98,22 @@ static const u16 srcr[] = {</div><div class='ctx'> /**</div><div class='ctx'>  * Clock Pulse Generator / Module Standby and Software Reset Private Data</div><div class='ctx'>  *</div><div class='add'>+ * @rcdev: Optional reset controller entity</div><div class='ctx'>  * @dev: CPG/MSSR device</div><div class='ctx'>  * @base: CPG/MSSR register block base address</div><div class='del'>- * @mstp_lock: protects writes to SMSTPCR</div><div class='add'>+ * @rmw_lock: protects RMW register accesses</div><div class='ctx'>  * @clks: Array containing all Core and Module Clocks</div><div class='ctx'>  * @num_core_clks: Number of Core Clocks in clks[]</div><div class='ctx'>  * @num_mod_clks: Number of Module Clocks in clks[]</div><div class='ctx'>  * @last_dt_core_clk: ID of the last Core Clock exported to DT</div><div class='ctx'>  */</div><div class='ctx'> struct cpg_mssr_priv {</div><div class='add'>+#ifdef CONFIG_RESET_CONTROLLER</div><div class='add'>+	struct reset_controller_dev rcdev;</div><div class='add'>+#endif</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	void __iomem *base;</div><div class='del'>-	spinlock_t mstp_lock;</div><div class='add'>+	spinlock_t rmw_lock;</div><div class='ctx'> </div><div class='ctx'> 	struct clk **clks;</div><div class='ctx'> 	unsigned int num_core_clks;</div><div class='hunk'>@@ -144,23 +150,22 @@ static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "MSTP %u%02u/%pC %s\n", reg, bit, hw-&gt;clk,</div><div class='ctx'> 		enable ? "ON" : "OFF");</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;mstp_lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;rmw_lock, flags);</div><div class='ctx'> </div><div class='del'>-	value = clk_readl(priv-&gt;base + SMSTPCR(reg));</div><div class='add'>+	value = readl(priv-&gt;base + SMSTPCR(reg));</div><div class='ctx'> 	if (enable)</div><div class='ctx'> 		value &amp;= ~bitmask;</div><div class='ctx'> 	else</div><div class='ctx'> 		value |= bitmask;</div><div class='del'>-	clk_writel(value, priv-&gt;base + SMSTPCR(reg));</div><div class='add'>+	writel(value, priv-&gt;base + SMSTPCR(reg));</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;mstp_lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;rmw_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!enable)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1000; i &gt; 0; --i) {</div><div class='del'>-		if (!(clk_readl(priv-&gt;base + MSTPSR(reg)) &amp;</div><div class='del'>-		      bitmask))</div><div class='add'>+		if (!(readl(priv-&gt;base + MSTPSR(reg)) &amp; bitmask))</div><div class='ctx'> 			break;</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -190,7 +195,7 @@ static int cpg_mstp_clock_is_enabled(struct clk_hw *hw)</div><div class='ctx'> 	struct cpg_mssr_priv *priv = clock-&gt;priv;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> </div><div class='del'>-	value = clk_readl(priv-&gt;base + MSTPSR(clock-&gt;index / 32));</div><div class='add'>+	value = readl(priv-&gt;base + MSTPSR(clock-&gt;index / 32));</div><div class='ctx'> </div><div class='ctx'> 	return !(value &amp; BIT(clock-&gt;index % 32));</div><div class='ctx'> }</div><div class='hunk'>@@ -309,7 +314,7 @@ static void __init cpg_mssr_register_core_clk(const struct cpg_core_clk *core,</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	dev_err(dev, "Failed to register %s clock %s: %ld\n", "core,",</div><div class='add'>+	dev_err(dev, "Failed to register %s clock %s: %ld\n", "core",</div><div class='ctx'> 		core-&gt;name, PTR_ERR(clk));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -347,17 +352,10 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,</div><div class='ctx'> 	init.flags = CLK_IS_BASIC | CLK_SET_RATE_PARENT;</div><div class='ctx'> 	for (i = 0; i &lt; info-&gt;num_crit_mod_clks; i++)</div><div class='ctx'> 		if (id == info-&gt;crit_mod_clks[i]) {</div><div class='del'>-#ifdef CLK_ENABLE_HAND_OFF</div><div class='del'>-			dev_dbg(dev, "MSTP %s setting CLK_ENABLE_HAND_OFF\n",</div><div class='add'>+			dev_dbg(dev, "MSTP %s setting CLK_IS_CRITICAL\n",</div><div class='ctx'> 				mod-&gt;name);</div><div class='del'>-			init.flags |= CLK_ENABLE_HAND_OFF;</div><div class='add'>+			init.flags |= CLK_IS_CRITICAL;</div><div class='ctx'> 			break;</div><div class='del'>-#else</div><div class='del'>-			dev_dbg(dev, "Ignoring MSTP %s to prevent disabling\n",</div><div class='del'>-				mod-&gt;name);</div><div class='del'>-			kfree(clock);</div><div class='del'>-			return;</div><div class='del'>-#endif</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	parent_name = __clk_get_name(parent);</div><div class='hunk'>@@ -377,7 +375,7 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	dev_err(dev, "Failed to register %s clock %s: %ld\n", "module,",</div><div class='add'>+	dev_err(dev, "Failed to register %s clock %s: %ld\n", "module",</div><div class='ctx'> 		mod-&gt;name, PTR_ERR(clk));</div><div class='ctx'> 	kfree(clock);</div><div class='ctx'> }</div><div class='hunk'>@@ -502,7 +500,135 @@ static int __init cpg_mssr_add_clk_domain(struct device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RESET_CONTROLLER</div><div class='add'>+</div><div class='add'>+#define rcdev_to_priv(x)	container_of(x, struct cpg_mssr_priv, rcdev)</div><div class='add'>+</div><div class='add'>+static int cpg_mssr_reset(struct reset_controller_dev *rcdev,</div><div class='add'>+			  unsigned long id)</div><div class='add'>+{</div><div class='add'>+	struct cpg_mssr_priv *priv = rcdev_to_priv(rcdev);</div><div class='add'>+	unsigned int reg = id / 32;</div><div class='add'>+	unsigned int bit = id % 32;</div><div class='add'>+	u32 bitmask = BIT(bit);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "reset %u%02u\n", reg, bit);</div><div class='add'>+</div><div class='add'>+	/* Reset module */</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;rmw_lock, flags);</div><div class='add'>+	value = readl(priv-&gt;base + SRCR(reg));</div><div class='add'>+	value |= bitmask;</div><div class='add'>+	writel(value, priv-&gt;base + SRCR(reg));</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;rmw_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */</div><div class='add'>+	udelay(35);</div><div class='add'>+</div><div class='add'>+	/* Release module from reset state */</div><div class='add'>+	writel(bitmask, priv-&gt;base + SRSTCLR(reg));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpg_mssr_assert(struct reset_controller_dev *rcdev, unsigned long id)</div><div class='add'>+{</div><div class='add'>+	struct cpg_mssr_priv *priv = rcdev_to_priv(rcdev);</div><div class='add'>+	unsigned int reg = id / 32;</div><div class='add'>+	unsigned int bit = id % 32;</div><div class='add'>+	u32 bitmask = BIT(bit);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "assert %u%02u\n", reg, bit);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;rmw_lock, flags);</div><div class='add'>+	value = readl(priv-&gt;base + SRCR(reg));</div><div class='add'>+	value |= bitmask;</div><div class='add'>+	writel(value, priv-&gt;base + SRCR(reg));</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;rmw_lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpg_mssr_deassert(struct reset_controller_dev *rcdev,</div><div class='add'>+			     unsigned long id)</div><div class='add'>+{</div><div class='add'>+	struct cpg_mssr_priv *priv = rcdev_to_priv(rcdev);</div><div class='add'>+	unsigned int reg = id / 32;</div><div class='add'>+	unsigned int bit = id % 32;</div><div class='add'>+	u32 bitmask = BIT(bit);</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "deassert %u%02u\n", reg, bit);</div><div class='add'>+</div><div class='add'>+	writel(bitmask, priv-&gt;base + SRSTCLR(reg));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpg_mssr_status(struct reset_controller_dev *rcdev,</div><div class='add'>+			   unsigned long id)</div><div class='add'>+{</div><div class='add'>+	struct cpg_mssr_priv *priv = rcdev_to_priv(rcdev);</div><div class='add'>+	unsigned int reg = id / 32;</div><div class='add'>+	unsigned int bit = id % 32;</div><div class='add'>+	u32 bitmask = BIT(bit);</div><div class='add'>+</div><div class='add'>+	return !!(readl(priv-&gt;base + SRCR(reg)) &amp; bitmask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct reset_control_ops cpg_mssr_reset_ops = {</div><div class='add'>+	.reset = cpg_mssr_reset,</div><div class='add'>+	.assert = cpg_mssr_assert,</div><div class='add'>+	.deassert = cpg_mssr_deassert,</div><div class='add'>+	.status = cpg_mssr_status,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cpg_mssr_reset_xlate(struct reset_controller_dev *rcdev,</div><div class='add'>+				const struct of_phandle_args *reset_spec)</div><div class='add'>+{</div><div class='add'>+	struct cpg_mssr_priv *priv = rcdev_to_priv(rcdev);</div><div class='add'>+	unsigned int unpacked = reset_spec-&gt;args[0];</div><div class='add'>+	unsigned int idx = MOD_CLK_PACK(unpacked);</div><div class='add'>+</div><div class='add'>+	if (unpacked % 100 &gt; 31 || idx &gt;= rcdev-&gt;nr_resets) {</div><div class='add'>+		dev_err(priv-&gt;dev, "Invalid reset index %u\n", unpacked);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpg_mssr_reset_controller_register(struct cpg_mssr_priv *priv)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;rcdev.ops = &amp;cpg_mssr_reset_ops;</div><div class='add'>+	priv-&gt;rcdev.of_node = priv-&gt;dev-&gt;of_node;</div><div class='add'>+	priv-&gt;rcdev.of_reset_n_cells = 1;</div><div class='add'>+	priv-&gt;rcdev.of_xlate = cpg_mssr_reset_xlate;</div><div class='add'>+	priv-&gt;rcdev.nr_resets = priv-&gt;num_mod_clks;</div><div class='add'>+	return devm_reset_controller_register(priv-&gt;dev, &amp;priv-&gt;rcdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_RESET_CONTROLLER */</div><div class='add'>+static inline int cpg_mssr_reset_controller_register(struct cpg_mssr_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_RESET_CONTROLLER */</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id cpg_mssr_match[] = {</div><div class='add'>+#ifdef CONFIG_ARCH_R8A7743</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,r8a7743-cpg-mssr",</div><div class='add'>+		.data = &amp;r8a7743_cpg_mssr_info,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ARCH_R8A7745</div><div class='add'>+	{</div><div class='add'>+		.compatible = "renesas,r8a7745-cpg-mssr",</div><div class='add'>+		.data = &amp;r8a7745_cpg_mssr_info,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_ARCH_R8A7795</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "renesas,r8a7795-cpg-mssr",</div><div class='hunk'>@@ -546,7 +672,7 @@ static int __init cpg_mssr_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;dev = dev;</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;mstp_lock);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;rmw_lock);</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	priv-&gt;base = devm_ioremap_resource(dev, res);</div><div class='hunk'>@@ -587,6 +713,10 @@ static int __init cpg_mssr_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='add'>+	error = cpg_mssr_reset_controller_register(priv);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h<br/>index ee7edfaf1408..4bb7a80c6469 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/renesas/renesas-cpg-mssr.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/renesas/renesas-cpg-mssr.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/renesas/renesas-cpg-mssr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/renesas/renesas-cpg-mssr.h</a></div><div class='hunk'>@@ -130,6 +130,8 @@ struct cpg_mssr_info {</div><div class='ctx'> 					struct clk **clks, void __iomem *base);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+extern const struct cpg_mssr_info r8a7743_cpg_mssr_info;</div><div class='add'>+extern const struct cpg_mssr_info r8a7745_cpg_mssr_info;</div><div class='ctx'> extern const struct cpg_mssr_info r8a7795_cpg_mssr_info;</div><div class='ctx'> extern const struct cpg_mssr_info r8a7796_cpg_mssr_info;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile<br/>index b5f2c8ed12e1..141971488f40 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/rockchip/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/rockchip/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/rockchip/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/Makefile</a></div><div class='hunk'>@@ -8,12 +8,15 @@ obj-y	+= clk-pll.o</div><div class='ctx'> obj-y	+= clk-cpu.o</div><div class='ctx'> obj-y	+= clk-inverter.o</div><div class='ctx'> obj-y	+= clk-mmc-phase.o</div><div class='add'>+obj-y	+= clk-muxgrf.o</div><div class='ctx'> obj-y	+= clk-ddr.o</div><div class='ctx'> obj-$(CONFIG_RESET_CONTROLLER)	+= softrst.o</div><div class='ctx'> </div><div class='add'>+obj-y	+= clk-rk1108.o</div><div class='ctx'> obj-y	+= clk-rk3036.o</div><div class='ctx'> obj-y	+= clk-rk3188.o</div><div class='ctx'> obj-y	+= clk-rk3228.o</div><div class='ctx'> obj-y	+= clk-rk3288.o</div><div class='add'>+obj-y	+= clk-rk3328.o</div><div class='ctx'> obj-y	+= clk-rk3368.o</div><div class='ctx'> obj-y	+= clk-rk3399.o</div><div class='head'>diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c<br/>index 05b3d73bfefa..0e09684d43a5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-cpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/rockchip/clk-cpu.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-cpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-cpu.c</a></div><div class='hunk'>@@ -124,9 +124,18 @@ static int rockchip_cpuclk_pre_rate_change(struct rockchip_cpuclk *cpuclk,</div><div class='ctx'> 					   struct clk_notifier_data *ndata)</div><div class='ctx'> {</div><div class='ctx'> 	const struct rockchip_cpuclk_reg_data *reg_data = cpuclk-&gt;reg_data;</div><div class='add'>+	const struct rockchip_cpuclk_rate_table *rate;</div><div class='ctx'> 	unsigned long alt_prate, alt_div;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	/* check validity of the new rate */</div><div class='add'>+	rate = rockchip_get_cpuclk_settings(cpuclk, ndata-&gt;new_rate);</div><div class='add'>+	if (!rate) {</div><div class='add'>+		pr_err("%s: Invalid rate : %lu for cpuclk\n",</div><div class='add'>+		       __func__, ndata-&gt;new_rate);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	alt_prate = clk_get_rate(cpuclk-&gt;alt_parent);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(cpuclk-&gt;lock, flags);</div><div class='head'>diff --git a/drivers/clk/rockchip/clk-muxgrf.c b/drivers/clk/rockchip/clk-muxgrf.c<br/>new file mode 100644<br/>index 000000000000..4f291180a26b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-muxgrf.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-muxgrf.c</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include "clk.h"</div><div class='add'>+</div><div class='add'>+struct rockchip_muxgrf_clock {</div><div class='add'>+	struct clk_hw		hw;</div><div class='add'>+	struct regmap		*regmap;</div><div class='add'>+	u32			reg;</div><div class='add'>+	u32			shift;</div><div class='add'>+	u32			width;</div><div class='add'>+	int			flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_muxgrf_clock(_hw) container_of(_hw, struct rockchip_muxgrf_clock, hw)</div><div class='add'>+</div><div class='add'>+static u8 rockchip_muxgrf_get_parent(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct rockchip_muxgrf_clock *mux = to_muxgrf_clock(hw);</div><div class='add'>+	unsigned int mask = GENMASK(mux-&gt;width - 1, 0);</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	regmap_read(mux-&gt;regmap, mux-&gt;reg, &amp;val);</div><div class='add'>+</div><div class='add'>+	val &gt;&gt;= mux-&gt;shift;</div><div class='add'>+	val &amp;= mask;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rockchip_muxgrf_set_parent(struct clk_hw *hw, u8 index)</div><div class='add'>+{</div><div class='add'>+	struct rockchip_muxgrf_clock *mux = to_muxgrf_clock(hw);</div><div class='add'>+	unsigned int mask = GENMASK(mux-&gt;width + mux-&gt;shift - 1, mux-&gt;shift);</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	val = index;</div><div class='add'>+	val &lt;&lt;= mux-&gt;shift;</div><div class='add'>+</div><div class='add'>+	if (mux-&gt;flags &amp; CLK_MUX_HIWORD_MASK)</div><div class='add'>+		return regmap_write(mux-&gt;regmap, mux-&gt;reg, val | (mask &lt;&lt; 16));</div><div class='add'>+	else</div><div class='add'>+		return regmap_update_bits(mux-&gt;regmap, mux-&gt;reg, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops rockchip_muxgrf_clk_ops = {</div><div class='add'>+	.get_parent = rockchip_muxgrf_get_parent,</div><div class='add'>+	.set_parent = rockchip_muxgrf_set_parent,</div><div class='add'>+	.determine_rate = __clk_mux_determine_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk *rockchip_clk_register_muxgrf(const char *name,</div><div class='add'>+				const char *const *parent_names, u8 num_parents,</div><div class='add'>+				int flags, struct regmap *regmap, int reg,</div><div class='add'>+				int shift, int width, int mux_flags)</div><div class='add'>+{</div><div class='add'>+	struct rockchip_muxgrf_clock *muxgrf_clock;</div><div class='add'>+	struct clk_init_data init;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(regmap)) {</div><div class='add'>+		pr_err("%s: regmap not available\n", __func__);</div><div class='add'>+		return ERR_PTR(-ENOTSUPP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	muxgrf_clock = kmalloc(sizeof(*muxgrf_clock), GFP_KERNEL);</div><div class='add'>+	if (!muxgrf_clock)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	init.name = name;</div><div class='add'>+	init.flags = flags;</div><div class='add'>+	init.num_parents = num_parents;</div><div class='add'>+	init.parent_names = parent_names;</div><div class='add'>+	init.ops = &amp;rockchip_muxgrf_clk_ops;</div><div class='add'>+</div><div class='add'>+	muxgrf_clock-&gt;hw.init = &amp;init;</div><div class='add'>+	muxgrf_clock-&gt;regmap = regmap;</div><div class='add'>+	muxgrf_clock-&gt;reg = reg;</div><div class='add'>+	muxgrf_clock-&gt;shift = shift;</div><div class='add'>+	muxgrf_clock-&gt;width = width;</div><div class='add'>+	muxgrf_clock-&gt;flags = mux_flags;</div><div class='add'>+</div><div class='add'>+	clk = clk_register(NULL, &amp;muxgrf_clock-&gt;hw);</div><div class='add'>+	if (IS_ERR(clk))</div><div class='add'>+		kfree(muxgrf_clock);</div><div class='add'>+</div><div class='add'>+	return clk;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c<br/>index 9c1373e81683..eec51893a7e6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-pll.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/rockchip/clk-pll.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-pll.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #define PLL_MODE_SLOW		0x0</div><div class='ctx'> #define PLL_MODE_NORM		0x1</div><div class='ctx'> #define PLL_MODE_DEEP		0x2</div><div class='add'>+#define PLL_RK3328_MODE_MASK	0x1</div><div class='ctx'> </div><div class='ctx'> struct rockchip_clk_pll {</div><div class='ctx'> 	struct clk_hw		hw;</div><div class='hunk'>@@ -319,7 +320,8 @@ static void rockchip_rk3036_pll_init(struct clk_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	if (rate-&gt;fbdiv != cur.fbdiv || rate-&gt;postdiv1 != cur.postdiv1 ||</div><div class='ctx'> 		rate-&gt;refdiv != cur.refdiv || rate-&gt;postdiv2 != cur.postdiv2 ||</div><div class='del'>-		rate-&gt;dsmpd != cur.dsmpd || rate-&gt;frac != cur.frac) {</div><div class='add'>+		rate-&gt;dsmpd != cur.dsmpd ||</div><div class='add'>+		(!cur.dsmpd &amp;&amp; (rate-&gt;frac != cur.frac))) {</div><div class='ctx'> 		struct clk *parent = clk_get_parent(hw-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 		if (!parent) {</div><div class='hunk'>@@ -795,7 +797,8 @@ static void rockchip_rk3399_pll_init(struct clk_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	if (rate-&gt;fbdiv != cur.fbdiv || rate-&gt;postdiv1 != cur.postdiv1 ||</div><div class='ctx'> 		rate-&gt;refdiv != cur.refdiv || rate-&gt;postdiv2 != cur.postdiv2 ||</div><div class='del'>-		rate-&gt;dsmpd != cur.dsmpd || rate-&gt;frac != cur.frac) {</div><div class='add'>+		rate-&gt;dsmpd != cur.dsmpd ||</div><div class='add'>+		(!cur.dsmpd &amp;&amp; (rate-&gt;frac != cur.frac))) {</div><div class='ctx'> 		struct clk *parent = clk_get_parent(hw-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 		if (!parent) {</div><div class='hunk'>@@ -846,7 +849,8 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,</div><div class='ctx'> 	struct clk *pll_clk, *mux_clk;</div><div class='ctx'> 	char pll_name[20];</div><div class='ctx'> </div><div class='del'>-	if (num_parents != 2) {</div><div class='add'>+	if ((pll_type != pll_rk3328 &amp;&amp; num_parents != 2) ||</div><div class='add'>+	    (pll_type == pll_rk3328 &amp;&amp; num_parents != 1)) {</div><div class='ctx'> 		pr_err("%s: needs two parent clocks\n", __func__);</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -863,13 +867,17 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,</div><div class='ctx'> 	pll_mux = &amp;pll-&gt;pll_mux;</div><div class='ctx'> 	pll_mux-&gt;reg = ctx-&gt;reg_base + mode_offset;</div><div class='ctx'> 	pll_mux-&gt;shift = mode_shift;</div><div class='del'>-	pll_mux-&gt;mask = PLL_MODE_MASK;</div><div class='add'>+	if (pll_type == pll_rk3328)</div><div class='add'>+		pll_mux-&gt;mask = PLL_RK3328_MODE_MASK;</div><div class='add'>+	else</div><div class='add'>+		pll_mux-&gt;mask = PLL_MODE_MASK;</div><div class='ctx'> 	pll_mux-&gt;flags = 0;</div><div class='ctx'> 	pll_mux-&gt;lock = &amp;ctx-&gt;lock;</div><div class='ctx'> 	pll_mux-&gt;hw.init = &amp;init;</div><div class='ctx'> </div><div class='ctx'> 	if (pll_type == pll_rk3036 ||</div><div class='ctx'> 	    pll_type == pll_rk3066 ||</div><div class='add'>+	    pll_type == pll_rk3328 ||</div><div class='ctx'> 	    pll_type == pll_rk3399)</div><div class='ctx'> 		pll_mux-&gt;flags |= CLK_MUX_HIWORD_MASK;</div><div class='ctx'> </div><div class='hunk'>@@ -882,7 +890,10 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,</div><div class='ctx'> 	init.flags = CLK_SET_RATE_PARENT;</div><div class='ctx'> 	init.ops = pll-&gt;pll_mux_ops;</div><div class='ctx'> 	init.parent_names = pll_parents;</div><div class='del'>-	init.num_parents = ARRAY_SIZE(pll_parents);</div><div class='add'>+	if (pll_type == pll_rk3328)</div><div class='add'>+		init.num_parents = 2;</div><div class='add'>+	else</div><div class='add'>+		init.num_parents = ARRAY_SIZE(pll_parents);</div><div class='ctx'> </div><div class='ctx'> 	mux_clk = clk_register(NULL, &amp;pll_mux-&gt;hw);</div><div class='ctx'> 	if (IS_ERR(mux_clk))</div><div class='hunk'>@@ -916,6 +927,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,</div><div class='ctx'> </div><div class='ctx'> 	switch (pll_type) {</div><div class='ctx'> 	case pll_rk3036:</div><div class='add'>+	case pll_rk3328:</div><div class='ctx'> 		if (!pll-&gt;rate_table || IS_ERR(ctx-&gt;grf))</div><div class='ctx'> 			init.ops = &amp;rockchip_rk3036_pll_clk_norate_ops;</div><div class='ctx'> 		else</div><div class='head'>diff --git a/drivers/clk/rockchip/clk-rk1108.c b/drivers/clk/rockchip/clk-rk1108.c<br/>new file mode 100644<br/>index 000000000000..92750d798e5d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-rk1108.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-rk1108.c</a></div><div class='hunk'>@@ -0,0 +1,531 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Rockchip Electronics Co. Ltd.</div><div class='add'>+ * Author: Shawn Lin &lt;shawn.lin@rock-chips.com&gt;</div><div class='add'>+ *         Andy Yan &lt;andy.yan@rock-chips.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/syscore_ops.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/rk1108-cru.h&gt;</div><div class='add'>+#include "clk.h"</div><div class='add'>+</div><div class='add'>+#define RK1108_GRF_SOC_STATUS0	0x480</div><div class='add'>+</div><div class='add'>+enum rk1108_plls {</div><div class='add'>+	apll, dpll, gpll,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rockchip_pll_rate_table rk1108_pll_rates[] = {</div><div class='add'>+	/* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd, _frac */</div><div class='add'>+	RK3036_PLL_RATE(1608000000, 1, 67, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1584000000, 1, 66, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1560000000, 1, 65, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1536000000, 1, 64, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1512000000, 1, 63, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1488000000, 1, 62, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1464000000, 1, 61, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1440000000, 1, 60, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1416000000, 1, 59, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1392000000, 1, 58, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1368000000, 1, 57, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1344000000, 1, 56, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1320000000, 1, 55, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1296000000, 1, 54, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1272000000, 1, 53, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1248000000, 1, 52, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1200000000, 1, 50, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1188000000, 2, 99, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1104000000, 1, 46, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1100000000, 12, 550, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1008000000, 1, 84, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1000000000, 6, 500, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 984000000, 1, 82, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 960000000, 1, 80, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 936000000, 1, 78, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 912000000, 1, 76, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 900000000, 4, 300, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 888000000, 1, 74, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 864000000, 1, 72, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 840000000, 1, 70, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 816000000, 1, 68, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 800000000, 6, 400, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 700000000, 6, 350, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 696000000, 1, 58, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 600000000, 1, 75, 3, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 594000000, 2, 99, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 504000000, 1, 63, 3, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 500000000, 6, 250, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 408000000, 1, 68, 2, 2, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 312000000, 1, 52, 2, 2, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 216000000, 1, 72, 4, 2, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(  96000000, 1, 64, 4, 4, 1, 0),</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RK1108_DIV_CORE_MASK		0xf</div><div class='add'>+#define RK1108_DIV_CORE_SHIFT		4</div><div class='add'>+</div><div class='add'>+#define RK1108_CLKSEL0(_core_peri_div)	\</div><div class='add'>+	{				\</div><div class='add'>+		.reg = RK1108_CLKSEL_CON(1),	\</div><div class='add'>+		.val = HIWORD_UPDATE(_core_peri_div, RK1108_DIV_CORE_MASK,\</div><div class='add'>+				RK1108_DIV_CORE_SHIFT)	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define RK1108_CPUCLK_RATE(_prate, _core_peri_div)			\</div><div class='add'>+	{								\</div><div class='add'>+		.prate = _prate,					\</div><div class='add'>+		.divs = {						\</div><div class='add'>+			RK1108_CLKSEL0(_core_peri_div),		\</div><div class='add'>+		},							\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static struct rockchip_cpuclk_rate_table rk1108_cpuclk_rates[] __initdata = {</div><div class='add'>+	RK1108_CPUCLK_RATE(816000000, 4),</div><div class='add'>+	RK1108_CPUCLK_RATE(600000000, 4),</div><div class='add'>+	RK1108_CPUCLK_RATE(312000000, 4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rockchip_cpuclk_reg_data rk1108_cpuclk_data = {</div><div class='add'>+	.core_reg = RK1108_CLKSEL_CON(0),</div><div class='add'>+	.div_core_shift = 0,</div><div class='add'>+	.div_core_mask = 0x1f,</div><div class='add'>+	.mux_core_alt = 1,</div><div class='add'>+	.mux_core_main = 0,</div><div class='add'>+	.mux_core_shift = 8,</div><div class='add'>+	.mux_core_mask = 0x1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+PNAME(mux_pll_p)		= { "xin24m", "xin24m"};</div><div class='add'>+PNAME(mux_ddrphy_p)		= { "dpll_ddr", "gpll_ddr", "apll_ddr" };</div><div class='add'>+PNAME(mux_armclk_p)		= { "apll_core", "gpll_core", "dpll_core" };</div><div class='add'>+PNAME(mux_usb480m_pre_p)	= { "usbphy", "xin24m" };</div><div class='add'>+PNAME(mux_hdmiphy_phy_p)	= { "hdmiphy", "xin24m" };</div><div class='add'>+PNAME(mux_dclk_hdmiphy_pre_p)	= { "dclk_hdmiphy_src_gpll", "dclk_hdmiphy_src_dpll" };</div><div class='add'>+PNAME(mux_pll_src_4plls_p)	= { "dpll", "hdmiphy", "gpll", "usb480m" };</div><div class='add'>+PNAME(mux_pll_src_3plls_p)	= { "apll", "gpll", "dpll" };</div><div class='add'>+PNAME(mux_pll_src_2plls_p)	= { "dpll", "gpll" };</div><div class='add'>+PNAME(mux_pll_src_apll_gpll_p)	= { "apll", "gpll" };</div><div class='add'>+PNAME(mux_aclk_peri_src_p)	= { "aclk_peri_src_dpll", "aclk_peri_src_gpll" };</div><div class='add'>+PNAME(mux_aclk_bus_src_p)	= { "aclk_bus_src_gpll", "aclk_bus_src_apll", "aclk_bus_src_dpll" };</div><div class='add'>+PNAME(mux_mmc_src_p)		= { "dpll", "gpll", "xin24m", "usb480m" };</div><div class='add'>+PNAME(mux_pll_src_dpll_gpll_usb480m_p)	= { "dpll", "gpll", "usb480m" };</div><div class='add'>+PNAME(mux_uart0_p)		= { "uart0_src", "uart0_frac", "xin24m" };</div><div class='add'>+PNAME(mux_uart1_p)		= { "uart1_src", "uart1_frac", "xin24m" };</div><div class='add'>+PNAME(mux_uart2_p)		= { "uart2_src", "uart2_frac", "xin24m" };</div><div class='add'>+PNAME(mux_sclk_macphy_p)	= { "sclk_macphy_pre", "ext_gmac" };</div><div class='add'>+PNAME(mux_i2s0_pre_p)		= { "i2s0_src", "i2s0_frac", "ext_i2s", "xin12m" };</div><div class='add'>+PNAME(mux_i2s_out_p)		= { "i2s0_pre", "xin12m" };</div><div class='add'>+PNAME(mux_i2s1_p)		= { "i2s1_src", "i2s1_frac", "xin12m" };</div><div class='add'>+PNAME(mux_i2s2_p)		= { "i2s2_src", "i2s2_frac", "xin12m" };</div><div class='add'>+</div><div class='add'>+static struct rockchip_pll_clock rk1108_pll_clks[] __initdata = {</div><div class='add'>+	[apll] = PLL(pll_rk3399, PLL_APLL, "apll", mux_pll_p, 0, RK1108_PLL_CON(0),</div><div class='add'>+		     RK1108_PLL_CON(3), 8, 31, 0, rk1108_pll_rates),</div><div class='add'>+	[dpll] = PLL(pll_rk3399, PLL_DPLL, "dpll", mux_pll_p, 0, RK1108_PLL_CON(8),</div><div class='add'>+		     RK1108_PLL_CON(11), 8, 31, 0, NULL),</div><div class='add'>+	[gpll] = PLL(pll_rk3399, PLL_GPLL, "gpll", mux_pll_p, 0, RK1108_PLL_CON(16),</div><div class='add'>+		     RK1108_PLL_CON(19), 8, 31, ROCKCHIP_PLL_SYNC_RATE, rk1108_pll_rates),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MFLAGS CLK_MUX_HIWORD_MASK</div><div class='add'>+#define DFLAGS CLK_DIVIDER_HIWORD_MASK</div><div class='add'>+#define GFLAGS (CLK_GATE_HIWORD_MASK | CLK_GATE_SET_TO_DISABLE)</div><div class='add'>+#define IFLAGS ROCKCHIP_INVERTER_HIWORD_MASK</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk1108_uart0_fracmux __initdata =</div><div class='add'>+	MUX(SCLK_UART0, "sclk_uart0", mux_uart0_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(13), 8, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk1108_uart1_fracmux __initdata =</div><div class='add'>+	MUX(SCLK_UART1, "sclk_uart1", mux_uart1_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(14), 8, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk1108_uart2_fracmux __initdata =</div><div class='add'>+	MUX(SCLK_UART2, "sclk_uart2", mux_uart2_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(15), 8, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk1108_i2s0_fracmux __initdata =</div><div class='add'>+	MUX(0, "i2s0_pre", mux_i2s0_pre_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(5), 12, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk1108_i2s1_fracmux __initdata =</div><div class='add'>+	MUX(0, "i2s1_pre", mux_i2s1_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(6), 12, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk1108_i2s2_fracmux __initdata =</div><div class='add'>+	MUX(0, "i2s2_pre", mux_i2s2_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(7), 12, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk1108_clk_branches[] __initdata = {</div><div class='add'>+	MUX(0, "hdmi_phy", mux_hdmiphy_phy_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_MISC_CON, 13, 2, MFLAGS),</div><div class='add'>+	MUX(0, "usb480m", mux_usb480m_pre_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_MISC_CON, 15, 2, MFLAGS),</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 2</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* PD_CORE */</div><div class='add'>+	GATE(0, "dpll_core", "dpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(0), 1, GFLAGS),</div><div class='add'>+	GATE(0, "apll_core", "apll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(0), 0, GFLAGS),</div><div class='add'>+	GATE(0, "gpll_core", "gpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(0), 2, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(0, "pclken_dbg", "armclk", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(1), 4, 4, DFLAGS | CLK_DIVIDER_READ_ONLY,</div><div class='add'>+			RK1108_CLKGATE_CON(0), 5, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(ACLK_ENMCORE, "aclkenm_core", "armclk", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(1), 0, 3, DFLAGS | CLK_DIVIDER_READ_ONLY,</div><div class='add'>+			RK1108_CLKGATE_CON(0), 4, GFLAGS),</div><div class='add'>+	GATE(ACLK_CORE, "aclk_core", "aclkenm_core", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(11), 0, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_dbg", "pclken_dbg", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(11), 1, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/* PD_RKVENC */</div><div class='add'>+</div><div class='add'>+	/* PD_RKVDEC */</div><div class='add'>+</div><div class='add'>+	/* PD_PMU_wrapper */</div><div class='add'>+	COMPOSITE_NOMUX(0, "pmu_24m_ena", "gpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(38), 0, 5, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(8), 12, GFLAGS),</div><div class='add'>+	GATE(0, "pmu", "pmu_24m_ena", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(10), 0, GFLAGS),</div><div class='add'>+	GATE(0, "intmem1", "pmu_24m_ena", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(10), 1, GFLAGS),</div><div class='add'>+	GATE(0, "gpio0_pmu", "pmu_24m_ena", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(10), 2, GFLAGS),</div><div class='add'>+	GATE(0, "pmugrf", "pmu_24m_ena", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(10), 3, GFLAGS),</div><div class='add'>+	GATE(0, "pmu_noc", "pmu_24m_ena", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(10), 4, GFLAGS),</div><div class='add'>+	GATE(0, "i2c0_pmu_pclk", "pmu_24m_ena", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(10), 5, GFLAGS),</div><div class='add'>+	GATE(0, "pwm0_pmu_pclk", "pmu_24m_ena", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(10), 6, GFLAGS),</div><div class='add'>+	COMPOSITE(0, "pwm0_pmu_clk", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(12), 7, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(8), 15, GFLAGS),</div><div class='add'>+	COMPOSITE(0, "i2c0_pmu_clk", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(19), 7, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(8), 14, GFLAGS),</div><div class='add'>+	GATE(0, "pvtm_pmu", "xin24m", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(8), 13, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 4</div><div class='add'>+	 */</div><div class='add'>+	COMPOSITE(0, "aclk_vio0_2wrap_occ", mux_pll_src_4plls_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(28), 6, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(6), 0, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_vio0_pre", "aclk_vio0_2wrap_occ", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(17), 0, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(0, "hclk_vio_pre", "aclk_vio0_pre", 0,</div><div class='add'>+			RK1108_CLKSEL_CON(29), 0, 5, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(7), 2, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(0, "pclk_vio_pre", "aclk_vio0_pre", 0,</div><div class='add'>+			RK1108_CLKSEL_CON(29), 8, 5, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(7), 3, GFLAGS),</div><div class='add'>+</div><div class='add'>+	INVERTER(0, "pclk_vip", "ext_vip",</div><div class='add'>+			RK1108_CLKSEL_CON(31), 8, IFLAGS),</div><div class='add'>+	GATE(0, "pclk_isp_pre", "pclk_vip", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(7), 6, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_isp", "pclk_isp_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(18), 10, GFLAGS),</div><div class='add'>+	GATE(0, "dclk_hdmiphy_src_gpll", "gpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(6), 5, GFLAGS),</div><div class='add'>+	GATE(0, "dclk_hdmiphy_src_dpll", "dpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(6), 4, GFLAGS),</div><div class='add'>+	COMPOSITE_NOGATE(0, "dclk_hdmiphy", mux_dclk_hdmiphy_pre_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(32), 6, 2, MFLAGS, 8, 6, DFLAGS),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 5</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	FACTOR(0, "xin12m", "xin24m", 0, 1, 2),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(0, "i2s0_src", mux_pll_src_2plls_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(5), 8, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(2), 0, GFLAGS),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_src", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(8), 0,</div><div class='add'>+			RK1108_CLKGATE_CON(2), 1, GFLAGS,</div><div class='add'>+			&amp;rk1108_i2s0_fracmux),</div><div class='add'>+	GATE(SCLK_I2S0, "sclk_i2s0", "i2s0_pre", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKGATE_CON(2), 2, GFLAGS),</div><div class='add'>+	COMPOSITE_NODIV(0, "i2s_out", mux_i2s_out_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(5), 15, 1, MFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(2), 3, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(0, "i2s1_src", mux_pll_src_2plls_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(6), 8, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(2), 4, GFLAGS),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_src", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK2928_CLKSEL_CON(9), 0,</div><div class='add'>+			RK2928_CLKGATE_CON(2), 5, GFLAGS,</div><div class='add'>+			&amp;rk1108_i2s1_fracmux),</div><div class='add'>+	GATE(SCLK_I2S1, "sclk_i2s1", "i2s1_pre", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKGATE_CON(2), 6, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(0, "i2s2_src", mux_pll_src_2plls_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(7), 8, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(3), 8, GFLAGS),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "i2s2_frac", "i2s2_src", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(10), 0,</div><div class='add'>+			RK1108_CLKGATE_CON(2), 9, GFLAGS,</div><div class='add'>+			&amp;rk1108_i2s2_fracmux),</div><div class='add'>+	GATE(SCLK_I2S2, "sclk_i2s2", "i2s2_pre", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKGATE_CON(2), 10, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/* PD_BUS */</div><div class='add'>+	GATE(0, "aclk_bus_src_gpll", "gpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(1), 0, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_bus_src_apll", "apll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(1), 1, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_bus_src_dpll", "dpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(1), 2, GFLAGS),</div><div class='add'>+	COMPOSITE_NOGATE(ACLK_PRE, "aclk_bus_pre", mux_aclk_bus_src_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(2), 8, 2, MFLAGS, 0, 5, DFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(0, "hclk_bus_pre", "aclk_bus_2wrap_occ", 0,</div><div class='add'>+			RK1108_CLKSEL_CON(3), 0, 5, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(1), 4, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(0, "pclken_bus", "aclk_bus_2wrap_occ", 0,</div><div class='add'>+			RK1108_CLKSEL_CON(3), 8, 5, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(1), 5, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_bus_pre", "pclken_bus", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(1), 6, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_top_pre", "pclken_bus", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(1), 7, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_ddr_pre", "pclken_bus", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(1), 8, GFLAGS),</div><div class='add'>+	GATE(0, "clk_timer0", "mux_pll_p", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(1), 9, GFLAGS),</div><div class='add'>+	GATE(0, "clk_timer1", "mux_pll_p", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(1), 10, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_timer", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 4, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(0, "uart0_src", mux_pll_src_dpll_gpll_usb480m_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(13), 12, 2, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(3), 1, GFLAGS),</div><div class='add'>+	COMPOSITE(0, "uart1_src", mux_pll_src_dpll_gpll_usb480m_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(14), 12, 2, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(3), 3, GFLAGS),</div><div class='add'>+	COMPOSITE(0, "uart21_src", mux_pll_src_dpll_gpll_usb480m_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(15), 12, 2, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(3), 5, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(16), 0,</div><div class='add'>+			RK1108_CLKGATE_CON(3), 2, GFLAGS,</div><div class='add'>+			&amp;rk1108_uart0_fracmux),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(17), 0,</div><div class='add'>+			RK1108_CLKGATE_CON(3), 4, GFLAGS,</div><div class='add'>+			&amp;rk1108_uart1_fracmux),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_src", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(18), 0,</div><div class='add'>+			RK1108_CLKGATE_CON(3), 6, GFLAGS,</div><div class='add'>+			&amp;rk1108_uart2_fracmux),</div><div class='add'>+	GATE(PCLK_UART0, "pclk_uart0", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 10, GFLAGS),</div><div class='add'>+	GATE(PCLK_UART1, "pclk_uart1", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 11, GFLAGS),</div><div class='add'>+	GATE(PCLK_UART2, "pclk_uart2", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 12, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(0, "clk_i2c1", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(19), 15, 2, MFLAGS, 8, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(3), 7, GFLAGS),</div><div class='add'>+	COMPOSITE(0, "clk_i2c2", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(20), 7, 2, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(3), 8, GFLAGS),</div><div class='add'>+	COMPOSITE(0, "clk_i2c3", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(20), 15, 2, MFLAGS, 8, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(3), 9, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_i2c1", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 0, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_i2c2", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 1, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_i2c3", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 2, GFLAGS),</div><div class='add'>+	COMPOSITE(0, "clk_pwm1", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(12), 15, 2, MFLAGS, 8, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(3), 10, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_pwm1", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 6, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_wdt", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 3, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_gpio1", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 7, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_gpio2", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 8, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_gpio3", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(13), 9, GFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(0, "pclk_grf", "pclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(14), 0, GFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(ACLK_DMAC, "aclk_dmac", "aclk_bus_pre", 0,</div><div class='add'>+	     RK1108_CLKGATE_CON(12), 2, GFLAGS),</div><div class='add'>+	GATE(0, "hclk_rom", "hclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(12), 3, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_intmem", "aclk_bus_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(12), 1, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/* PD_DDR */</div><div class='add'>+	GATE(0, "apll_ddr", "apll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(0), 8, GFLAGS),</div><div class='add'>+	GATE(0, "dpll_ddr", "dpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(0), 9, GFLAGS),</div><div class='add'>+	GATE(0, "gpll_ddr", "gpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(0), 10, GFLAGS),</div><div class='add'>+	COMPOSITE(0, "ddrphy4x", mux_ddrphy_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(4), 8, 2, MFLAGS, 0, 3,</div><div class='add'>+			DFLAGS | CLK_DIVIDER_POWER_OF_TWO,</div><div class='add'>+			RK1108_CLKGATE_CON(10), 9, GFLAGS),</div><div class='add'>+	GATE(0, "ddrupctl", "ddrphy_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(12), 4, GFLAGS),</div><div class='add'>+	GATE(0, "ddrc", "ddrphy", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(12), 5, GFLAGS),</div><div class='add'>+	GATE(0, "ddrmon", "ddrphy_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(12), 6, GFLAGS),</div><div class='add'>+	GATE(0, "timer_clk", "xin24m", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(0), 11, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 6</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* PD_PERI */</div><div class='add'>+	COMPOSITE_NOMUX(0, "pclk_periph_pre", "gpll", 0,</div><div class='add'>+			RK1108_CLKSEL_CON(23), 10, 5, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(4), 5, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_periph", "pclk_periph_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(15), 13, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(0, "hclk_periph_pre", "gpll", 0,</div><div class='add'>+			RK1108_CLKSEL_CON(23), 5, 5, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(4), 4, GFLAGS),</div><div class='add'>+	GATE(0, "hclk_periph", "hclk_periph_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(15), 12, GFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(0, "aclk_peri_src_dpll", "dpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(4), 1, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_peri_src_gpll", "gpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKGATE_CON(4), 2, GFLAGS),</div><div class='add'>+	COMPOSITE(0, "aclk_periph", mux_aclk_peri_src_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK1108_CLKSEL_CON(23), 15, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(15), 11, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_SDMMC, "sclk_sdmmc0", mux_mmc_src_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(25), 8, 2, MFLAGS, 0, 8, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(5), 0, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE_NODIV(0, "sclk_sdio_src", mux_mmc_src_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(25), 10, 2, MFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(5), 2, GFLAGS),</div><div class='add'>+	DIV(SCLK_SDIO, "sclk_sdio", "sclk_sdio_src", 0,</div><div class='add'>+			RK1108_CLKSEL_CON(26), 0, 8, DFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE_NODIV(0, "sclk_emmc_src", mux_mmc_src_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(25), 12, 2, MFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(5), 1, GFLAGS),</div><div class='add'>+	DIV(SCLK_EMMC, "sclk_emmc", "sclk_emmc_src", 0,</div><div class='add'>+			RK2928_CLKSEL_CON(26), 8, 8, DFLAGS),</div><div class='add'>+	GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_periph", 0, RK1108_CLKGATE_CON(15), 0, GFLAGS),</div><div class='add'>+	GATE(HCLK_SDIO, "hclk_sdio", "hclk_periph", 0, RK1108_CLKGATE_CON(15), 1, GFLAGS),</div><div class='add'>+	GATE(HCLK_EMMC, "hclk_emmc", "hclk_periph", 0, RK1108_CLKGATE_CON(15), 2, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_NANDC, "sclk_nandc", mux_pll_src_2plls_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(27), 14, 2, MFLAGS, 8, 5, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(5), 3, GFLAGS),</div><div class='add'>+	GATE(HCLK_NANDC, "hclk_nandc", "hclk_periph", 0, RK1108_CLKGATE_CON(15), 3, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_SFC, "sclk_sfc", mux_pll_src_2plls_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(27), 7, 2, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(5), 4, GFLAGS),</div><div class='add'>+	GATE(HCLK_SFC, "hclk_sfc", "hclk_periph", 0, RK1108_CLKGATE_CON(15), 10, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(0, "sclk_macphy_pre", mux_pll_src_apll_gpll_p, 0,</div><div class='add'>+			RK1108_CLKSEL_CON(24), 12, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK1108_CLKGATE_CON(4), 10, GFLAGS),</div><div class='add'>+	MUX(0, "sclk_macphy", mux_sclk_macphy_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK1108_CLKSEL_CON(24), 8, 2, MFLAGS),</div><div class='add'>+	GATE(0, "sclk_macphy_rx", "sclk_macphy", 0, RK1108_CLKGATE_CON(4), 8, GFLAGS),</div><div class='add'>+	GATE(0, "sclk_mac_ref", "sclk_macphy", 0, RK1108_CLKGATE_CON(4), 6, GFLAGS),</div><div class='add'>+	GATE(0, "sclk_mac_refout", "sclk_macphy", 0, RK1108_CLKGATE_CON(4), 7, GFLAGS),</div><div class='add'>+</div><div class='add'>+	MMC(SCLK_SDMMC_DRV,    "sdmmc_drv",    "sclk_sdmmc", RK1108_SDMMC_CON0, 1),</div><div class='add'>+	MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "sclk_sdmmc", RK1108_SDMMC_CON1, 1),</div><div class='add'>+</div><div class='add'>+	MMC(SCLK_SDIO_DRV,     "sdio_drv",     "sclk_sdio",  RK1108_SDIO_CON0,  1),</div><div class='add'>+	MMC(SCLK_SDIO_SAMPLE,  "sdio_sample",  "sclk_sdio",  RK1108_SDIO_CON1,  1),</div><div class='add'>+</div><div class='add'>+	MMC(SCLK_EMMC_DRV,     "emmc_drv",     "sclk_emmc",  RK1108_EMMC_CON0,  1),</div><div class='add'>+	MMC(SCLK_EMMC_SAMPLE,  "emmc_sample",  "sclk_emmc",  RK1108_EMMC_CON1,  1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const rk1108_critical_clocks[] __initconst = {</div><div class='add'>+	"aclk_core",</div><div class='add'>+	"aclk_bus_src_gpll",</div><div class='add'>+	"aclk_periph",</div><div class='add'>+	"hclk_periph",</div><div class='add'>+	"pclk_periph",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init rk1108_clk_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct rockchip_clk_provider *ctx;</div><div class='add'>+	void __iomem *reg_base;</div><div class='add'>+</div><div class='add'>+	reg_base = of_iomap(np, 0);</div><div class='add'>+	if (!reg_base) {</div><div class='add'>+		pr_err("%s: could not map cru region\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS);</div><div class='add'>+	if (IS_ERR(ctx)) {</div><div class='add'>+		pr_err("%s: rockchip clk init failed\n", __func__);</div><div class='add'>+		iounmap(reg_base);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rockchip_clk_register_plls(ctx, rk1108_pll_clks,</div><div class='add'>+				   ARRAY_SIZE(rk1108_pll_clks),</div><div class='add'>+				   RK1108_GRF_SOC_STATUS0);</div><div class='add'>+	rockchip_clk_register_branches(ctx, rk1108_clk_branches,</div><div class='add'>+				  ARRAY_SIZE(rk1108_clk_branches));</div><div class='add'>+	rockchip_clk_protect_critical(rk1108_critical_clocks,</div><div class='add'>+				      ARRAY_SIZE(rk1108_critical_clocks));</div><div class='add'>+</div><div class='add'>+	rockchip_clk_register_armclk(ctx, ARMCLK, "armclk",</div><div class='add'>+			mux_armclk_p, ARRAY_SIZE(mux_armclk_p),</div><div class='add'>+			&amp;rk1108_cpuclk_data, rk1108_cpuclk_rates,</div><div class='add'>+			ARRAY_SIZE(rk1108_cpuclk_rates));</div><div class='add'>+</div><div class='add'>+	rockchip_register_softrst(np, 13, reg_base + RK1108_SOFTRST_CON(0),</div><div class='add'>+				  ROCKCHIP_SOFTRST_HIWORD_MASK);</div><div class='add'>+</div><div class='add'>+	rockchip_register_restart_notifier(ctx, RK1108_GLB_SRST_FST, NULL);</div><div class='add'>+</div><div class='add'>+	rockchip_clk_of_add_provider(np, ctx);</div><div class='add'>+}</div><div class='add'>+CLK_OF_DECLARE(rk1108_cru, "rockchip,rk1108-cru", rk1108_clk_init);</div><div class='head'>diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c<br/>index d0e722a0e8cf..00ad0e5f8d66 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-rk3188.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/rockchip/clk-rk3188.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-rk3188.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-rk3188.c</a></div><div class='hunk'>@@ -89,6 +89,7 @@ static struct rockchip_pll_rate_table rk3188_pll_rates[] = {</div><div class='ctx'> 	RK3066_PLL_RATE( 504000000, 1, 84, 4),</div><div class='ctx'> 	RK3066_PLL_RATE( 456000000, 1, 76, 4),</div><div class='ctx'> 	RK3066_PLL_RATE( 408000000, 1, 68, 4),</div><div class='add'>+	RK3066_PLL_RATE( 400000000, 3, 100, 2),</div><div class='ctx'> 	RK3066_PLL_RATE( 384000000, 2, 128, 4),</div><div class='ctx'> 	RK3066_PLL_RATE( 360000000, 1, 60, 4),</div><div class='ctx'> 	RK3066_PLL_RATE( 312000000, 1, 52, 4),</div><div class='hunk'>@@ -306,14 +307,14 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = {</div><div class='ctx'> 			RK2928_CLKSEL_CON(26), 8, 1, MFLAGS, 0, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO,</div><div class='ctx'> 			RK2928_CLKGATE_CON(0), 2, GFLAGS),</div><div class='ctx'> </div><div class='del'>-	GATE(0, "aclk_cpu", "aclk_cpu_pre", 0,</div><div class='add'>+	GATE(ACLK_CPU, "aclk_cpu", "aclk_cpu_pre", 0,</div><div class='ctx'> 			RK2928_CLKGATE_CON(0), 3, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	GATE(0, "atclk_cpu", "pclk_cpu_pre", 0,</div><div class='ctx'> 			RK2928_CLKGATE_CON(0), 6, GFLAGS),</div><div class='del'>-	GATE(0, "pclk_cpu", "pclk_cpu_pre", 0,</div><div class='add'>+	GATE(PCLK_CPU, "pclk_cpu", "pclk_cpu_pre", 0,</div><div class='ctx'> 			RK2928_CLKGATE_CON(0), 5, GFLAGS),</div><div class='del'>-	GATE(0, "hclk_cpu", "hclk_cpu_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+	GATE(HCLK_CPU, "hclk_cpu", "hclk_cpu_pre", CLK_IGNORE_UNUSED,</div><div class='ctx'> 			RK2928_CLKGATE_CON(0), 4, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	COMPOSITE(0, "aclk_lcdc0_pre", mux_pll_src_cpll_gpll_p, CLK_IGNORE_UNUSED,</div><div class='hunk'>@@ -323,12 +324,12 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = {</div><div class='ctx'> 			RK2928_CLKSEL_CON(31), 15, 1, MFLAGS, 8, 5, DFLAGS,</div><div class='ctx'> 			RK2928_CLKGATE_CON(1), 4, GFLAGS),</div><div class='ctx'> </div><div class='del'>-	GATE(0, "aclk_peri", "aclk_peri_pre", 0,</div><div class='add'>+	GATE(ACLK_PERI, "aclk_peri", "aclk_peri_pre", 0,</div><div class='ctx'> 			RK2928_CLKGATE_CON(2), 1, GFLAGS),</div><div class='del'>-	COMPOSITE_NOMUX(0, "hclk_peri", "aclk_peri_pre", 0,</div><div class='add'>+	COMPOSITE_NOMUX(HCLK_PERI, "hclk_peri", "aclk_peri_pre", 0,</div><div class='ctx'> 			RK2928_CLKSEL_CON(10), 8, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO,</div><div class='ctx'> 			RK2928_CLKGATE_CON(2), 2, GFLAGS),</div><div class='del'>-	COMPOSITE_NOMUX(0, "pclk_peri", "aclk_peri_pre", 0,</div><div class='add'>+	COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "aclk_peri_pre", 0,</div><div class='ctx'> 			RK2928_CLKSEL_CON(10), 12, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO,</div><div class='ctx'> 			RK2928_CLKGATE_CON(2), 3, GFLAGS),</div><div class='ctx'> </div><div class='hunk'>@@ -506,8 +507,8 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = {</div><div class='ctx'> 	GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_cpu", 0, RK2928_CLKGATE_CON(8), 11, GFLAGS),</div><div class='ctx'> 	GATE(PCLK_EFUSE, "pclk_efuse", "pclk_cpu", 0, RK2928_CLKGATE_CON(5), 2, GFLAGS),</div><div class='ctx'> 	GATE(PCLK_TZPC, "pclk_tzpc", "pclk_cpu", 0, RK2928_CLKGATE_CON(5), 3, GFLAGS),</div><div class='del'>-	GATE(0, "pclk_ddrupctl", "pclk_cpu", 0, RK2928_CLKGATE_CON(5), 7, GFLAGS),</div><div class='del'>-	GATE(0, "pclk_ddrpubl", "pclk_cpu", 0, RK2928_CLKGATE_CON(9), 6, GFLAGS),</div><div class='add'>+	GATE(PCLK_DDRUPCTL, "pclk_ddrupctl", "pclk_cpu", 0, RK2928_CLKGATE_CON(5), 7, GFLAGS),</div><div class='add'>+	GATE(PCLK_PUBL, "pclk_ddrpubl", "pclk_cpu", 0, RK2928_CLKGATE_CON(9), 6, GFLAGS),</div><div class='ctx'> 	GATE(0, "pclk_dbg", "pclk_cpu", 0, RK2928_CLKGATE_CON(9), 1, GFLAGS),</div><div class='ctx'> 	GATE(PCLK_GRF, "pclk_grf", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(5), 4, GFLAGS),</div><div class='ctx'> 	GATE(PCLK_PMU, "pclk_pmu", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(5), 5, GFLAGS),</div><div class='head'>diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c<br/>index 39af05a589b3..68ba7d4105e7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-rk3288.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/rockchip/clk-rk3288.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-rk3288.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-rk3288.c</a></div><div class='hunk'>@@ -198,6 +198,7 @@ PNAME(mux_hsadcout_p)	= { "hsadc_src", "ext_hsadc" };</div><div class='ctx'> PNAME(mux_edp_24m_p)	= { "ext_edp_24m", "xin24m" };</div><div class='ctx'> PNAME(mux_tspout_p)	= { "cpll", "gpll", "npll", "xin27m" };</div><div class='ctx'> </div><div class='add'>+PNAME(mux_aclk_vcodec_pre_p)	= { "aclk_vepu", "aclk_vdpu" };</div><div class='ctx'> PNAME(mux_usbphy480m_p)		= { "sclk_otgphy1_480m", "sclk_otgphy2_480m",</div><div class='ctx'> 				    "sclk_otgphy0_480m" };</div><div class='ctx'> PNAME(mux_hsicphy480m_p)	= { "cpll", "gpll", "usbphy480m_src" };</div><div class='hunk'>@@ -398,14 +399,12 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {</div><div class='ctx'> 	COMPOSITE(0, "aclk_vdpu", mux_pll_src_cpll_gpll_usb480m_p, 0,</div><div class='ctx'> 			RK3288_CLKSEL_CON(32), 14, 2, MFLAGS, 8, 5, DFLAGS,</div><div class='ctx'> 			RK3288_CLKGATE_CON(3), 11, GFLAGS),</div><div class='del'>-	/*</div><div class='del'>-	 * We use aclk_vdpu by default GRF_SOC_CON0[7] setting in system,</div><div class='del'>-	 * so we ignore the mux and make clocks nodes as following,</div><div class='del'>-	 */</div><div class='del'>-	GATE(ACLK_VCODEC, "aclk_vcodec", "aclk_vdpu", 0,</div><div class='add'>+	MUXGRF(0, "aclk_vcodec_pre", mux_aclk_vcodec_pre_p, 0,</div><div class='add'>+			RK3288_GRF_SOC_CON(0), 7, 1, MFLAGS),</div><div class='add'>+	GATE(ACLK_VCODEC, "aclk_vcodec", "aclk_vcodec_pre", 0,</div><div class='ctx'> 		RK3288_CLKGATE_CON(9), 0, GFLAGS),</div><div class='ctx'> </div><div class='del'>-	FACTOR_GATE(0, "hclk_vcodec_pre", "aclk_vdpu", 0, 1, 4,</div><div class='add'>+	FACTOR_GATE(0, "hclk_vcodec_pre", "aclk_vcodec_pre", 0, 1, 4,</div><div class='ctx'> 		RK3288_CLKGATE_CON(3), 10, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_vcodec_pre", 0,</div><div class='hunk'>@@ -469,7 +468,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {</div><div class='ctx'> 	COMPOSITE_NODIV(0, "vip_src", mux_pll_src_cpll_gpll_p, 0,</div><div class='ctx'> 			RK3288_CLKSEL_CON(26), 8, 1, MFLAGS,</div><div class='ctx'> 			RK3288_CLKGATE_CON(3), 7, GFLAGS),</div><div class='del'>-	COMPOSITE_NOGATE(0, "sclk_vip_out", mux_vip_out_p, 0,</div><div class='add'>+	COMPOSITE_NOGATE(SCLK_VIP_OUT, "sclk_vip_out", mux_vip_out_p, 0,</div><div class='ctx'> 			RK3288_CLKSEL_CON(26), 15, 1, MFLAGS, 9, 5, DFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	DIV(0, "pclk_pd_alive", "gpll", 0,</div><div class='hunk'>@@ -690,7 +689,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {</div><div class='ctx'> 	/* aclk_peri gates */</div><div class='ctx'> 	GATE(0, "aclk_peri_axi_matrix", "aclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(6), 2, GFLAGS),</div><div class='ctx'> 	GATE(ACLK_DMAC2, "aclk_dmac2", "aclk_peri", 0, RK3288_CLKGATE_CON(6), 3, GFLAGS),</div><div class='del'>-	GATE(0, "aclk_peri_niu", "aclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(7), 11, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_peri_niu", "aclk_peri", 0, RK3288_CLKGATE_CON(7), 11, GFLAGS),</div><div class='ctx'> 	GATE(ACLK_MMU, "aclk_mmu", "aclk_peri", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(8), 12, GFLAGS),</div><div class='ctx'> 	GATE(ACLK_GMAC, "aclk_gmac", "aclk_peri", 0, RK3288_CLKGATE_CON(8), 0, GFLAGS),</div><div class='ctx'> 	GATE(HCLK_GPS, "hclk_gps", "aclk_peri", 0, RK3288_CLKGATE_CON(8), 2, GFLAGS),</div><div class='hunk'>@@ -753,12 +752,12 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {</div><div class='ctx'> 	GATE(PCLK_GPIO5, "pclk_gpio5", "pclk_pd_alive", 0, RK3288_CLKGATE_CON(14), 5, GFLAGS),</div><div class='ctx'> 	GATE(PCLK_GPIO6, "pclk_gpio6", "pclk_pd_alive", 0, RK3288_CLKGATE_CON(14), 6, GFLAGS),</div><div class='ctx'> 	GATE(PCLK_GRF, "pclk_grf", "pclk_pd_alive", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(14), 11, GFLAGS),</div><div class='del'>-	GATE(0, "pclk_alive_niu", "pclk_pd_alive", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(14), 12, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_alive_niu", "pclk_pd_alive", 0, RK3288_CLKGATE_CON(14), 12, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	/* pclk_pd_pmu gates */</div><div class='ctx'> 	GATE(PCLK_PMU, "pclk_pmu", "pclk_pd_pmu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(17), 0, GFLAGS),</div><div class='ctx'> 	GATE(0, "pclk_intmem1", "pclk_pd_pmu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(17), 1, GFLAGS),</div><div class='del'>-	GATE(0, "pclk_pmu_niu", "pclk_pd_pmu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(17), 2, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_pmu_niu", "pclk_pd_pmu", 0, RK3288_CLKGATE_CON(17), 2, GFLAGS),</div><div class='ctx'> 	GATE(PCLK_SGRF, "pclk_sgrf", "pclk_pd_pmu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(17), 3, GFLAGS),</div><div class='ctx'> 	GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_pd_pmu", 0, RK3288_CLKGATE_CON(17), 4, GFLAGS),</div><div class='ctx'> </div><div class='hunk'>@@ -767,7 +766,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {</div><div class='ctx'> 	GATE(HCLK_VOP0, "hclk_vop0", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 6, GFLAGS),</div><div class='ctx'> 	GATE(HCLK_VOP1, "hclk_vop1", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 8, GFLAGS),</div><div class='ctx'> 	GATE(HCLK_VIO_AHB_ARBI, "hclk_vio_ahb_arbi", "hclk_vio", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(15), 9, GFLAGS),</div><div class='del'>-	GATE(HCLK_VIO_NIU, "hclk_vio_niu", "hclk_vio", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(15), 10, GFLAGS),</div><div class='add'>+	GATE(HCLK_VIO_NIU, "hclk_vio_niu", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 10, GFLAGS),</div><div class='ctx'> 	GATE(HCLK_VIP, "hclk_vip", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 15, GFLAGS),</div><div class='ctx'> 	GATE(HCLK_IEP, "hclk_iep", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 3, GFLAGS),</div><div class='ctx'> 	GATE(HCLK_ISP, "hclk_isp", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 1, GFLAGS),</div><div class='hunk'>@@ -783,17 +782,17 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {</div><div class='ctx'> 	/* aclk_vio0 gates */</div><div class='ctx'> 	GATE(ACLK_VOP0, "aclk_vop0", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 5, GFLAGS),</div><div class='ctx'> 	GATE(ACLK_IEP, "aclk_iep", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 2, GFLAGS),</div><div class='del'>-	GATE(ACLK_VIO0_NIU, "aclk_vio0_niu", "aclk_vio0", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(15), 11, GFLAGS),</div><div class='add'>+	GATE(ACLK_VIO0_NIU, "aclk_vio0_niu", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 11, GFLAGS),</div><div class='ctx'> 	GATE(ACLK_VIP, "aclk_vip", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 14, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	/* aclk_vio1 gates */</div><div class='ctx'> 	GATE(ACLK_VOP1, "aclk_vop1", "aclk_vio1", 0, RK3288_CLKGATE_CON(15), 7, GFLAGS),</div><div class='ctx'> 	GATE(ACLK_ISP, "aclk_isp", "aclk_vio1", 0, RK3288_CLKGATE_CON(16), 2, GFLAGS),</div><div class='del'>-	GATE(ACLK_VIO1_NIU, "aclk_vio1_niu", "aclk_vio1", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(15), 12, GFLAGS),</div><div class='add'>+	GATE(ACLK_VIO1_NIU, "aclk_vio1_niu", "aclk_vio1", 0, RK3288_CLKGATE_CON(15), 12, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	/* aclk_rga_pre gates */</div><div class='ctx'> 	GATE(ACLK_RGA, "aclk_rga", "aclk_rga_pre", 0, RK3288_CLKGATE_CON(15), 0, GFLAGS),</div><div class='del'>-	GATE(ACLK_RGA_NIU, "aclk_rga_niu", "aclk_rga_pre", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(15), 13, GFLAGS),</div><div class='add'>+	GATE(ACLK_RGA_NIU, "aclk_rga_niu", "aclk_rga_pre", 0, RK3288_CLKGATE_CON(15), 13, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Other ungrouped clocks.</div><div class='hunk'>@@ -801,15 +800,22 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> 	GATE(0, "pclk_vip_in", "ext_vip", 0, RK3288_CLKGATE_CON(16), 0, GFLAGS),</div><div class='ctx'> 	INVERTER(0, "pclk_vip", "pclk_vip_in", RK3288_CLKSEL_CON(29), 4, IFLAGS),</div><div class='del'>-	GATE(0, "pclk_isp_in", "ext_isp", 0, RK3288_CLKGATE_CON(16), 3, GFLAGS),</div><div class='add'>+	GATE(PCLK_ISP_IN, "pclk_isp_in", "ext_isp", 0, RK3288_CLKGATE_CON(16), 3, GFLAGS),</div><div class='ctx'> 	INVERTER(0, "pclk_isp", "pclk_isp_in", RK3288_CLKSEL_CON(29), 3, IFLAGS),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char *const rk3288_critical_clocks[] __initconst = {</div><div class='ctx'> 	"aclk_cpu",</div><div class='ctx'> 	"aclk_peri",</div><div class='add'>+	"aclk_peri_niu",</div><div class='add'>+	"aclk_vio0_niu",</div><div class='add'>+	"aclk_vio1_niu",</div><div class='add'>+	"aclk_rga_niu",</div><div class='ctx'> 	"hclk_peri",</div><div class='add'>+	"hclk_vio_niu",</div><div class='add'>+	"pclk_alive_niu",</div><div class='ctx'> 	"pclk_pd_pmu",</div><div class='add'>+	"pclk_pmu_niu",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __iomem *rk3288_cru_base;</div><div class='head'>diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c<br/>new file mode 100644<br/>index 000000000000..1e384e143504<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-rk3328.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-rk3328.c</a></div><div class='hunk'>@@ -0,0 +1,895 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Rockchip Electronics Co. Ltd.</div><div class='add'>+ * Author: Elaine &lt;zhangqing@rock-chips.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/syscore_ops.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/rk3328-cru.h&gt;</div><div class='add'>+#include "clk.h"</div><div class='add'>+</div><div class='add'>+#define RK3328_GRF_SOC_STATUS0		0x480</div><div class='add'>+#define RK3328_GRF_MAC_CON1		0x904</div><div class='add'>+#define RK3328_GRF_MAC_CON2		0x908</div><div class='add'>+</div><div class='add'>+enum rk3328_plls {</div><div class='add'>+	apll, dpll, cpll, gpll, npll,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rockchip_pll_rate_table rk3328_pll_rates[] = {</div><div class='add'>+	/* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd, _frac */</div><div class='add'>+	RK3036_PLL_RATE(1608000000, 1, 67, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1584000000, 1, 66, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1560000000, 1, 65, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1536000000, 1, 64, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1512000000, 1, 63, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1488000000, 1, 62, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1464000000, 1, 61, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1440000000, 1, 60, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1416000000, 1, 59, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1392000000, 1, 58, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1368000000, 1, 57, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1344000000, 1, 56, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1320000000, 1, 55, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1296000000, 1, 54, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1272000000, 1, 53, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1248000000, 1, 52, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1200000000, 1, 50, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1188000000, 2, 99, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1104000000, 1, 46, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1100000000, 12, 550, 1, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1008000000, 1, 84, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1000000000, 6, 500, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(984000000, 1, 82, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(960000000, 1, 80, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(936000000, 1, 78, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(912000000, 1, 76, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(900000000, 4, 300, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(888000000, 1, 74, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(864000000, 1, 72, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(840000000, 1, 70, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(816000000, 1, 68, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(800000000, 6, 400, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(700000000, 6, 350, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(696000000, 1, 58, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(600000000, 1, 75, 3, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(594000000, 2, 99, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(504000000, 1, 63, 3, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(500000000, 6, 250, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(408000000, 1, 68, 2, 2, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(312000000, 1, 52, 2, 2, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(216000000, 1, 72, 4, 2, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(96000000, 1, 64, 4, 4, 1, 0),</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rockchip_pll_rate_table rk3328_pll_frac_rates[] = {</div><div class='add'>+	/* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd, _frac */</div><div class='add'>+	RK3036_PLL_RATE(1016064000, 3, 127, 1, 1, 0, 134217),</div><div class='add'>+	/* vco = 1016064000 */</div><div class='add'>+	RK3036_PLL_RATE(983040000, 24, 983, 1, 1, 0, 671088),</div><div class='add'>+	/* vco = 983040000 */</div><div class='add'>+	RK3036_PLL_RATE(491520000, 24, 983, 2, 1, 0, 671088),</div><div class='add'>+	/* vco = 983040000 */</div><div class='add'>+	RK3036_PLL_RATE(61440000, 6, 215, 7, 2, 0, 671088),</div><div class='add'>+	/* vco = 860156000 */</div><div class='add'>+	RK3036_PLL_RATE(56448000, 12, 451, 4, 4, 0, 9797894),</div><div class='add'>+	/* vco = 903168000 */</div><div class='add'>+	RK3036_PLL_RATE(40960000, 12, 409, 4, 5, 0, 10066329),</div><div class='add'>+	/* vco = 819200000 */</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RK3328_DIV_ACLKM_MASK		0x7</div><div class='add'>+#define RK3328_DIV_ACLKM_SHIFT		4</div><div class='add'>+#define RK3328_DIV_PCLK_DBG_MASK	0xf</div><div class='add'>+#define RK3328_DIV_PCLK_DBG_SHIFT	0</div><div class='add'>+</div><div class='add'>+#define RK3328_CLKSEL1(_aclk_core, _pclk_dbg)				\</div><div class='add'>+{									\</div><div class='add'>+	.reg = RK3328_CLKSEL_CON(1),					\</div><div class='add'>+	.val = HIWORD_UPDATE(_aclk_core, RK3328_DIV_ACLKM_MASK,		\</div><div class='add'>+			     RK3328_DIV_ACLKM_SHIFT) |			\</div><div class='add'>+	       HIWORD_UPDATE(_pclk_dbg, RK3328_DIV_PCLK_DBG_MASK,	\</div><div class='add'>+			     RK3328_DIV_PCLK_DBG_SHIFT),		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RK3328_CPUCLK_RATE(_prate, _aclk_core, _pclk_dbg)		\</div><div class='add'>+{									\</div><div class='add'>+	.prate = _prate,						\</div><div class='add'>+	.divs = {							\</div><div class='add'>+		RK3328_CLKSEL1(_aclk_core, _pclk_dbg),			\</div><div class='add'>+	},								\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rockchip_cpuclk_rate_table rk3328_cpuclk_rates[] __initdata = {</div><div class='add'>+	RK3328_CPUCLK_RATE(1800000000, 1, 7),</div><div class='add'>+	RK3328_CPUCLK_RATE(1704000000, 1, 7),</div><div class='add'>+	RK3328_CPUCLK_RATE(1608000000, 1, 7),</div><div class='add'>+	RK3328_CPUCLK_RATE(1512000000, 1, 7),</div><div class='add'>+	RK3328_CPUCLK_RATE(1488000000, 1, 5),</div><div class='add'>+	RK3328_CPUCLK_RATE(1416000000, 1, 5),</div><div class='add'>+	RK3328_CPUCLK_RATE(1392000000, 1, 5),</div><div class='add'>+	RK3328_CPUCLK_RATE(1296000000, 1, 5),</div><div class='add'>+	RK3328_CPUCLK_RATE(1200000000, 1, 5),</div><div class='add'>+	RK3328_CPUCLK_RATE(1104000000, 1, 5),</div><div class='add'>+	RK3328_CPUCLK_RATE(1008000000, 1, 5),</div><div class='add'>+	RK3328_CPUCLK_RATE(912000000, 1, 5),</div><div class='add'>+	RK3328_CPUCLK_RATE(816000000, 1, 3),</div><div class='add'>+	RK3328_CPUCLK_RATE(696000000, 1, 3),</div><div class='add'>+	RK3328_CPUCLK_RATE(600000000, 1, 3),</div><div class='add'>+	RK3328_CPUCLK_RATE(408000000, 1, 1),</div><div class='add'>+	RK3328_CPUCLK_RATE(312000000, 1, 1),</div><div class='add'>+	RK3328_CPUCLK_RATE(216000000,  1, 1),</div><div class='add'>+	RK3328_CPUCLK_RATE(96000000, 1, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rockchip_cpuclk_reg_data rk3328_cpuclk_data = {</div><div class='add'>+	.core_reg = RK3328_CLKSEL_CON(0),</div><div class='add'>+	.div_core_shift = 0,</div><div class='add'>+	.div_core_mask = 0x1f,</div><div class='add'>+	.mux_core_alt = 1,</div><div class='add'>+	.mux_core_main = 3,</div><div class='add'>+	.mux_core_shift = 6,</div><div class='add'>+	.mux_core_mask = 0x3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+PNAME(mux_pll_p)		= { "xin24m" };</div><div class='add'>+</div><div class='add'>+PNAME(mux_2plls_p)		= { "cpll", "gpll" };</div><div class='add'>+PNAME(mux_gpll_cpll_p)		= { "gpll", "cpll" };</div><div class='add'>+PNAME(mux_cpll_gpll_apll_p)	= { "cpll", "gpll", "apll" };</div><div class='add'>+PNAME(mux_2plls_xin24m_p)	= { "cpll", "gpll", "xin24m" };</div><div class='add'>+PNAME(mux_2plls_hdmiphy_p)	= { "cpll", "gpll",</div><div class='add'>+				    "dummy_hdmiphy" };</div><div class='add'>+PNAME(mux_4plls_p)		= { "cpll", "gpll",</div><div class='add'>+				    "dummy_hdmiphy",</div><div class='add'>+				    "usb480m" };</div><div class='add'>+PNAME(mux_2plls_u480m_p)	= { "cpll", "gpll",</div><div class='add'>+				    "usb480m" };</div><div class='add'>+PNAME(mux_2plls_24m_u480m_p)	= { "cpll", "gpll",</div><div class='add'>+				     "xin24m", "usb480m" };</div><div class='add'>+</div><div class='add'>+PNAME(mux_ddrphy_p)		= { "dpll", "apll", "cpll" };</div><div class='add'>+PNAME(mux_armclk_p)		= { "apll_core",</div><div class='add'>+				    "gpll_core",</div><div class='add'>+				    "dpll_core",</div><div class='add'>+				    "npll_core"};</div><div class='add'>+PNAME(mux_hdmiphy_p)		= { "hdmi_phy", "xin24m" };</div><div class='add'>+PNAME(mux_usb480m_p)		= { "usb480m_phy",</div><div class='add'>+				    "xin24m" };</div><div class='add'>+</div><div class='add'>+PNAME(mux_i2s0_p)		= { "clk_i2s0_div",</div><div class='add'>+				    "clk_i2s0_frac",</div><div class='add'>+				    "xin12m",</div><div class='add'>+				    "xin12m" };</div><div class='add'>+PNAME(mux_i2s1_p)		= { "clk_i2s1_div",</div><div class='add'>+				    "clk_i2s1_frac",</div><div class='add'>+				    "clkin_i2s1",</div><div class='add'>+				    "xin12m" };</div><div class='add'>+PNAME(mux_i2s2_p)		= { "clk_i2s2_div",</div><div class='add'>+				    "clk_i2s2_frac",</div><div class='add'>+				    "clkin_i2s2",</div><div class='add'>+				    "xin12m" };</div><div class='add'>+PNAME(mux_i2s1out_p)		= { "clk_i2s1", "xin12m"};</div><div class='add'>+PNAME(mux_i2s2out_p)		= { "clk_i2s2", "xin12m" };</div><div class='add'>+PNAME(mux_spdif_p)		= { "clk_spdif_div",</div><div class='add'>+				    "clk_spdif_frac",</div><div class='add'>+				    "xin12m",</div><div class='add'>+				    "xin12m" };</div><div class='add'>+PNAME(mux_uart0_p)		= { "clk_uart0_div",</div><div class='add'>+				    "clk_uart0_frac",</div><div class='add'>+				    "xin24m" };</div><div class='add'>+PNAME(mux_uart1_p)		= { "clk_uart1_div",</div><div class='add'>+				    "clk_uart1_frac",</div><div class='add'>+				    "xin24m" };</div><div class='add'>+PNAME(mux_uart2_p)		= { "clk_uart2_div",</div><div class='add'>+				    "clk_uart2_frac",</div><div class='add'>+				    "xin24m" };</div><div class='add'>+</div><div class='add'>+PNAME(mux_sclk_cif_p)		= { "clk_cif_src",</div><div class='add'>+				    "xin24m" };</div><div class='add'>+PNAME(mux_dclk_lcdc_p)		= { "hdmiphy",</div><div class='add'>+				    "dclk_lcdc_src" };</div><div class='add'>+PNAME(mux_aclk_peri_pre_p)	= { "cpll_peri",</div><div class='add'>+				    "gpll_peri",</div><div class='add'>+				    "hdmiphy_peri" };</div><div class='add'>+PNAME(mux_ref_usb3otg_src_p)	= { "xin24m",</div><div class='add'>+				    "clk_usb3otg_ref" };</div><div class='add'>+PNAME(mux_xin24m_32k_p)		= { "xin24m",</div><div class='add'>+				    "clk_rtc32k" };</div><div class='add'>+PNAME(mux_mac2io_src_p)		= { "clk_mac2io_src",</div><div class='add'>+				    "gmac_clkin" };</div><div class='add'>+PNAME(mux_mac2phy_src_p)	= { "clk_mac2phy_src",</div><div class='add'>+				    "phy_50m_out" };</div><div class='add'>+</div><div class='add'>+static struct rockchip_pll_clock rk3328_pll_clks[] __initdata = {</div><div class='add'>+	[apll] = PLL(pll_rk3328, PLL_APLL, "apll", mux_pll_p,</div><div class='add'>+		     0, RK3328_PLL_CON(0),</div><div class='add'>+		     RK3328_MODE_CON, 0, 4, 0, rk3328_pll_frac_rates),</div><div class='add'>+	[dpll] = PLL(pll_rk3328, PLL_DPLL, "dpll", mux_pll_p,</div><div class='add'>+		     0, RK3328_PLL_CON(8),</div><div class='add'>+		     RK3328_MODE_CON, 4, 3, 0, NULL),</div><div class='add'>+	[cpll] = PLL(pll_rk3328, PLL_CPLL, "cpll", mux_pll_p,</div><div class='add'>+		     0, RK3328_PLL_CON(16),</div><div class='add'>+		     RK3328_MODE_CON, 8, 2, 0, rk3328_pll_rates),</div><div class='add'>+	[gpll] = PLL(pll_rk3328, PLL_GPLL, "gpll", mux_pll_p,</div><div class='add'>+		     0, RK3328_PLL_CON(24),</div><div class='add'>+		     RK3328_MODE_CON, 12, 1, 0, rk3328_pll_frac_rates),</div><div class='add'>+	[npll] = PLL(pll_rk3328, PLL_NPLL, "npll", mux_pll_p,</div><div class='add'>+		     0, RK3328_PLL_CON(40),</div><div class='add'>+		     RK3328_MODE_CON, 1, 0, 0, rk3328_pll_rates),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MFLAGS CLK_MUX_HIWORD_MASK</div><div class='add'>+#define DFLAGS CLK_DIVIDER_HIWORD_MASK</div><div class='add'>+#define GFLAGS (CLK_GATE_HIWORD_MASK | CLK_GATE_SET_TO_DISABLE)</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk3328_i2s0_fracmux __initdata =</div><div class='add'>+	MUX(0, "i2s0_pre", mux_i2s0_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(6), 8, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk3328_i2s1_fracmux __initdata =</div><div class='add'>+	MUX(0, "i2s1_pre", mux_i2s1_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(8), 8, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk3328_i2s2_fracmux __initdata =</div><div class='add'>+	MUX(0, "i2s2_pre", mux_i2s2_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(10), 8, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk3328_spdif_fracmux __initdata =</div><div class='add'>+	MUX(SCLK_SPDIF, "sclk_spdif", mux_spdif_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(12), 8, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk3328_uart0_fracmux __initdata =</div><div class='add'>+	MUX(SCLK_UART0, "sclk_uart0", mux_uart0_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(14), 8, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk3328_uart1_fracmux __initdata =</div><div class='add'>+	MUX(SCLK_UART1, "sclk_uart1", mux_uart1_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(16), 8, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk3328_uart2_fracmux __initdata =</div><div class='add'>+	MUX(SCLK_UART2, "sclk_uart2", mux_uart2_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(18), 8, 2, MFLAGS);</div><div class='add'>+</div><div class='add'>+static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = {</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 1</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	DIV(0, "clk_24m", "xin24m", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKSEL_CON(2), 8, 5, DFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_RTC32K, "clk_rtc32k", mux_2plls_xin24m_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(38), 14, 2, MFLAGS, 0, 14, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(0), 11, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/* PD_MISC */</div><div class='add'>+	MUX(HDMIPHY, "hdmiphy", mux_hdmiphy_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_MISC_CON, 13, 1, MFLAGS),</div><div class='add'>+	MUX(USB480M, "usb480m", mux_usb480m_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_MISC_CON, 15, 1, MFLAGS),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 2</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* PD_CORE */</div><div class='add'>+	GATE(0, "apll_core", "apll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(0), 0, GFLAGS),</div><div class='add'>+	GATE(0, "gpll_core", "gpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(0), 2, GFLAGS),</div><div class='add'>+	GATE(0, "dpll_core", "dpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(0), 1, GFLAGS),</div><div class='add'>+	GATE(0, "npll_core", "npll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(0), 12, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(0, "pclk_dbg", "armclk", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKSEL_CON(1), 0, 4, DFLAGS | CLK_DIVIDER_READ_ONLY,</div><div class='add'>+			RK3328_CLKGATE_CON(7), 0, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(0, "aclk_core", "armclk", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKSEL_CON(1), 4, 3, DFLAGS | CLK_DIVIDER_READ_ONLY,</div><div class='add'>+			RK3328_CLKGATE_CON(7), 1, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_core_niu", "aclk_core", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(13), 0, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_gic400", "aclk_core", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(13), 1, GFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(0, "clk_jtag", "jtag_clkin", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(7), 2, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/* PD_GPU */</div><div class='add'>+	COMPOSITE(0, "aclk_gpu_pre", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(44), 6, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(6), 6, GFLAGS),</div><div class='add'>+	GATE(ACLK_GPU, "aclk_gpu", "aclk_gpu_pre", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKGATE_CON(14), 0, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_gpu_niu", "aclk_gpu_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(14), 1, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/* PD_DDR */</div><div class='add'>+	COMPOSITE(0, "clk_ddr", mux_ddrphy_p, CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKSEL_CON(3), 8, 2, MFLAGS, 0, 3, DFLAGS | CLK_DIVIDER_POWER_OF_TWO,</div><div class='add'>+			RK3328_CLKGATE_CON(0), 4, GFLAGS),</div><div class='add'>+	GATE(0, "clk_ddrmsch", "clk_ddr", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(18), 6, GFLAGS),</div><div class='add'>+	GATE(0, "clk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(18), 5, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(18), 4, GFLAGS),</div><div class='add'>+	GATE(0, "clk_ddrmon", "xin24m", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(0), 6, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(PCLK_DDR, "pclk_ddr", mux_2plls_hdmiphy_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(4), 13, 2, MFLAGS, 8, 3, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(7), 4, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_ddrupctl", "pclk_ddr", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(18), 1, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_ddr_msch", "pclk_ddr", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(18), 2, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_ddr_mon", "pclk_ddr", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(18), 3, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_ddrstdby", "pclk_ddr", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(18), 7, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_ddr_grf", "pclk_ddr", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(18), 9, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 3</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* PD_BUS */</div><div class='add'>+	COMPOSITE(ACLK_BUS_PRE, "aclk_bus_pre", mux_2plls_hdmiphy_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(0), 13, 2, MFLAGS, 8, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(8), 0, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(HCLK_BUS_PRE, "hclk_bus_pre", "aclk_bus_pre", 0,</div><div class='add'>+			RK3328_CLKSEL_CON(1), 8, 2, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(8), 1, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(PCLK_BUS_PRE, "pclk_bus_pre", "aclk_bus_pre", 0,</div><div class='add'>+			RK3328_CLKSEL_CON(1), 12, 3, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(8), 2, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_bus", "pclk_bus_pre", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(8), 3, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_phy_pre", "pclk_bus_pre", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(8), 4, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_TSP, "clk_tsp", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(21), 15, 1, MFLAGS, 8, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 5, GFLAGS),</div><div class='add'>+	GATE(0, "clk_hsadc_tsp", "ext_gpio3a2", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(17), 13, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/* PD_I2S */</div><div class='add'>+	COMPOSITE(0, "clk_i2s0_div", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(6), 15, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 1, GFLAGS),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "clk_i2s0_frac", "clk_i2s0_div", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(7), 0,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 2, GFLAGS,</div><div class='add'>+			&amp;rk3328_i2s0_fracmux),</div><div class='add'>+	GATE(SCLK_I2S0, "clk_i2s0", "i2s0_pre", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 3, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(0, "clk_i2s1_div", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(8), 15, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 4, GFLAGS),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "clk_i2s1_frac", "clk_i2s1_div", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(9), 0,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 5, GFLAGS,</div><div class='add'>+			&amp;rk3328_i2s1_fracmux),</div><div class='add'>+	GATE(SCLK_I2S1, "clk_i2s1", "i2s1_pre", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKGATE_CON(0), 6, GFLAGS),</div><div class='add'>+	COMPOSITE_NODIV(SCLK_I2S1_OUT, "i2s1_out", mux_i2s1out_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(8), 12, 1, MFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 7, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(0, "clk_i2s2_div", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(10), 15, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 8, GFLAGS),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "clk_i2s2_frac", "clk_i2s2_div", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(11), 0,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 9, GFLAGS,</div><div class='add'>+			&amp;rk3328_i2s2_fracmux),</div><div class='add'>+	GATE(SCLK_I2S2, "clk_i2s2", "i2s2_pre", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 10, GFLAGS),</div><div class='add'>+	COMPOSITE_NODIV(SCLK_I2S2_OUT, "i2s2_out", mux_i2s2out_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(10), 12, 1, MFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 11, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(0, "clk_spdif_div", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(12), 15, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 12, GFLAGS),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "clk_spdif_frac", "clk_spdif_div", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(13), 0,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 13, GFLAGS,</div><div class='add'>+			&amp;rk3328_spdif_fracmux),</div><div class='add'>+</div><div class='add'>+	/* PD_UART */</div><div class='add'>+	COMPOSITE(0, "clk_uart0_div", mux_2plls_u480m_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(14), 12, 2, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 14, GFLAGS),</div><div class='add'>+	COMPOSITE(0, "clk_uart1_div", mux_2plls_u480m_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(16), 12, 2, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 0, GFLAGS),</div><div class='add'>+	COMPOSITE(0, "clk_uart2_div", mux_2plls_u480m_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(18), 12, 2, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 2, GFLAGS),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "clk_uart0_frac", "clk_uart0_div", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(15), 0,</div><div class='add'>+			RK3328_CLKGATE_CON(1), 15, GFLAGS,</div><div class='add'>+			&amp;rk3328_uart0_fracmux),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "clk_uart1_frac", "clk_uart1_div", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(17), 0,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 1, GFLAGS,</div><div class='add'>+			&amp;rk3328_uart1_fracmux),</div><div class='add'>+	COMPOSITE_FRACMUX(0, "clk_uart2_frac", "clk_uart2_div", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(19), 0,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 3, GFLAGS,</div><div class='add'>+			&amp;rk3328_uart2_fracmux),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 4</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_I2C0, "clk_i2c0", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(34), 7, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 9, GFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_I2C1, "clk_i2c1", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(34), 15, 1, MFLAGS, 8, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 10, GFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_I2C2, "clk_i2c2", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(35), 7, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 11, GFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_I2C3, "clk_i2c3", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(35), 15, 1, MFLAGS, 8, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 12, GFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_CRYPTO, "clk_crypto", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(20), 7, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 4, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(SCLK_TSADC, "clk_tsadc", "clk_24m", 0,</div><div class='add'>+			RK3328_CLKSEL_CON(22), 0, 10, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 6, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(SCLK_SARADC, "clk_saradc", "clk_24m", 0,</div><div class='add'>+			RK3328_CLKSEL_CON(23), 0, 10, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 14, GFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_SPI, "clk_spi", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(24), 7, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 7, GFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_PWM, "clk_pwm", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(24), 15, 1, MFLAGS, 8, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 8, GFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_OTP, "clk_otp", mux_2plls_xin24m_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(4), 6, 2, MFLAGS, 0, 6, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(3), 8, GFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_EFUSE, "clk_efuse", mux_2plls_xin24m_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(5), 14, 2, MFLAGS, 8, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 13, GFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_PDM, "clk_pdm", mux_cpll_gpll_apll_p, CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(20), 14, 2, MFLAGS, 8, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(2), 15, GFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(SCLK_TIMER0, "sclk_timer0", "xin24m", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(8), 5, GFLAGS),</div><div class='add'>+	GATE(SCLK_TIMER1, "sclk_timer1", "xin24m", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(8), 6, GFLAGS),</div><div class='add'>+	GATE(SCLK_TIMER2, "sclk_timer2", "xin24m", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(8), 7, GFLAGS),</div><div class='add'>+	GATE(SCLK_TIMER3, "sclk_timer3", "xin24m", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(8), 8, GFLAGS),</div><div class='add'>+	GATE(SCLK_TIMER4, "sclk_timer4", "xin24m", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(8), 9, GFLAGS),</div><div class='add'>+	GATE(SCLK_TIMER5, "sclk_timer5", "xin24m", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(8), 10, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_WIFI, "clk_wifi", mux_2plls_u480m_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(52), 6, 2, MFLAGS, 0, 6, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(0), 10, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 5</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* PD_VIDEO */</div><div class='add'>+	COMPOSITE(ACLK_RKVDEC_PRE, "aclk_rkvdec_pre", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(48), 6, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(6), 0, GFLAGS),</div><div class='add'>+	FACTOR_GATE(HCLK_RKVDEC_PRE, "hclk_rkvdec_pre", "aclk_rkvdec_pre", 0, 1, 4,</div><div class='add'>+			RK3328_CLKGATE_CON(11), 0, GFLAGS),</div><div class='add'>+	GATE(ACLK_RKVDEC, "aclk_rkvdec", "aclk_rkvdec_pre", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKGATE_CON(24), 0, GFLAGS),</div><div class='add'>+	GATE(HCLK_RKVDEC, "hclk_rkvdec", "hclk_rkvdec_pre", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKGATE_CON(24), 1, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_rkvdec_niu", "aclk_rkvdec_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(24), 2, GFLAGS),</div><div class='add'>+	GATE(0, "hclk_rkvdec_niu", "hclk_rkvdec_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(24), 3, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_VDEC_CABAC, "sclk_vdec_cabac", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(48), 14, 2, MFLAGS, 8, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(6), 1, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_VDEC_CORE, "sclk_vdec_core", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(49), 6, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(6), 2, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(ACLK_VPU_PRE, "aclk_vpu_pre", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(50), 6, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(6), 5, GFLAGS),</div><div class='add'>+	FACTOR_GATE(HCLK_VPU_PRE, "hclk_vpu_pre", "aclk_vpu_pre", 0, 1, 4,</div><div class='add'>+			RK3328_CLKGATE_CON(11), 8, GFLAGS),</div><div class='add'>+	GATE(ACLK_VPU, "aclk_vpu", "aclk_vpu_pre", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKGATE_CON(23), 0, GFLAGS),</div><div class='add'>+	GATE(HCLK_VPU, "hclk_vpu", "hclk_vpu_pre", CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKGATE_CON(23), 1, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_vpu_niu", "aclk_vpu_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(23), 2, GFLAGS),</div><div class='add'>+	GATE(0, "hclk_vpu_niu", "hclk_vpu_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(23), 3, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(ACLK_RKVENC, "aclk_rkvenc", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(51), 6, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(6), 3, GFLAGS),</div><div class='add'>+	FACTOR_GATE(HCLK_RKVENC, "hclk_rkvenc", "aclk_rkvenc", 0, 1, 4,</div><div class='add'>+			RK3328_CLKGATE_CON(11), 4, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_rkvenc_niu", "aclk_rkvenc", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(25), 0, GFLAGS),</div><div class='add'>+	GATE(0, "hclk_rkvenc_niu", "hclk_rkvenc", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(25), 1, GFLAGS),</div><div class='add'>+	GATE(ACLK_H265, "aclk_h265", "aclk_rkvenc", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(25), 0, GFLAGS),</div><div class='add'>+	GATE(PCLK_H265, "pclk_h265", "hclk_rkvenc", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(25), 1, GFLAGS),</div><div class='add'>+	GATE(ACLK_H264, "aclk_h264", "aclk_rkvenc", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(25), 0, GFLAGS),</div><div class='add'>+	GATE(HCLK_H264, "hclk_h264", "hclk_rkvenc", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(25), 1, GFLAGS),</div><div class='add'>+	GATE(ACLK_AXISRAM, "aclk_axisram", "aclk_rkvenc", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(25), 0, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_VENC_CORE, "sclk_venc_core", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(51), 14, 2, MFLAGS, 8, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(6), 4, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_VENC_DSP, "sclk_venc_dsp", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(52), 14, 2, MFLAGS, 8, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(6), 7, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 6</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* PD_VIO */</div><div class='add'>+	COMPOSITE(ACLK_VIO_PRE, "aclk_vio_pre", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(37), 6, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(5), 2, GFLAGS),</div><div class='add'>+	DIV(HCLK_VIO_PRE, "hclk_vio_pre", "aclk_vio_pre", 0,</div><div class='add'>+			RK3328_CLKSEL_CON(37), 8, 5, DFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(ACLK_RGA_PRE, "aclk_rga_pre", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(36), 14, 2, MFLAGS, 8, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(5), 0, GFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_RGA, "clk_rga", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(36), 6, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(5), 1, GFLAGS),</div><div class='add'>+	COMPOSITE(ACLK_VOP_PRE, "aclk_vop_pre", mux_4plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(39), 6, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(5), 5, GFLAGS),</div><div class='add'>+	GATE(0, "clk_hdmi_sfc", "xin24m", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(5), 4, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE_NODIV(0, "clk_cif_src", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(42), 7, 1, MFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(5), 3, GFLAGS),</div><div class='add'>+	COMPOSITE_NOGATE(SCLK_CIF_OUT, "clk_cif_out", mux_sclk_cif_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(42), 5, 1, MFLAGS, 0, 5, DFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(DCLK_LCDC_SRC, "dclk_lcdc_src", mux_gpll_cpll_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(40), 0, 1, MFLAGS, 8, 8, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(5), 6, GFLAGS),</div><div class='add'>+	DIV(DCLK_HDMIPHY, "dclk_hdmiphy", "dclk_lcdc_src", 0,</div><div class='add'>+			RK3328_CLKSEL_CON(40), 3, 3, DFLAGS),</div><div class='add'>+	MUX(DCLK_LCDC, "dclk_lcdc", mux_dclk_lcdc_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(40), 1, 1, MFLAGS),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 7</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* PD_PERI */</div><div class='add'>+	GATE(0, "gpll_peri", "gpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(4), 0, GFLAGS),</div><div class='add'>+	GATE(0, "cpll_peri", "cpll", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(4), 1, GFLAGS),</div><div class='add'>+	GATE(0, "hdmiphy_peri", "hdmiphy", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKGATE_CON(4), 2, GFLAGS),</div><div class='add'>+	COMPOSITE_NOGATE(ACLK_PERI_PRE, "aclk_peri_pre", mux_aclk_peri_pre_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(28), 6, 2, MFLAGS, 0, 5, DFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "aclk_peri_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKSEL_CON(29), 0, 2, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(10), 2, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(HCLK_PERI, "hclk_peri", "aclk_peri_pre", CLK_IGNORE_UNUSED,</div><div class='add'>+			RK3328_CLKSEL_CON(29), 4, 3, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(10), 1, GFLAGS),</div><div class='add'>+	GATE(ACLK_PERI, "aclk_peri", "aclk_peri_pre", CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKGATE_CON(10), 0, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_SDMMC, "clk_sdmmc", mux_2plls_24m_u480m_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(30), 8, 2, MFLAGS, 0, 8, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(4), 3, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_SDIO, "clk_sdio", mux_2plls_24m_u480m_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(31), 8, 2, MFLAGS, 0, 8, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(4), 4, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_EMMC, "clk_emmc", mux_2plls_24m_u480m_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(32), 8, 2, MFLAGS, 0, 8, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(4), 5, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_SDMMC_EXT, "clk_sdmmc_ext", mux_2plls_24m_u480m_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(43), 8, 2, MFLAGS, 0, 8, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(4), 10, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_REF_USB3OTG_SRC, "clk_ref_usb3otg_src", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(45), 7, 1, MFLAGS, 0, 7, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(4), 9, GFLAGS),</div><div class='add'>+</div><div class='add'>+	MUX(SCLK_REF_USB3OTG, "clk_ref_usb3otg", mux_ref_usb3otg_src_p, CLK_SET_RATE_PARENT,</div><div class='add'>+			RK3328_CLKSEL_CON(45), 8, 1, MFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(SCLK_USB3OTG_REF, "clk_usb3otg_ref", "xin24m", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(4), 7, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_USB3OTG_SUSPEND, "clk_usb3otg_suspend", mux_xin24m_32k_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(33), 15, 1, MFLAGS, 0, 10, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(4), 8, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 8</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* PD_GMAC */</div><div class='add'>+	COMPOSITE(ACLK_GMAC, "aclk_gmac", mux_2plls_hdmiphy_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(35), 6, 2, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(3), 2, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(PCLK_GMAC, "pclk_gmac", "aclk_gmac", 0,</div><div class='add'>+			RK3328_CLKSEL_CON(25), 8, 3, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(9), 0, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_MAC2IO_SRC, "clk_mac2io_src", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(27), 7, 1, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(3), 1, GFLAGS),</div><div class='add'>+	GATE(SCLK_MAC2IO_REF, "clk_mac2io_ref", "clk_mac2io", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(9), 7, GFLAGS),</div><div class='add'>+	GATE(SCLK_MAC2IO_RX, "clk_mac2io_rx", "clk_mac2io", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(9), 4, GFLAGS),</div><div class='add'>+	GATE(SCLK_MAC2IO_TX, "clk_mac2io_tx", "clk_mac2io", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(9), 5, GFLAGS),</div><div class='add'>+	GATE(SCLK_MAC2IO_REFOUT, "clk_mac2io_refout", "clk_mac2io", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(9), 6, GFLAGS),</div><div class='add'>+	COMPOSITE(SCLK_MAC2IO_OUT, "clk_mac2io_out", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(27), 15, 1, MFLAGS, 8, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(3), 5, GFLAGS),</div><div class='add'>+</div><div class='add'>+	COMPOSITE(SCLK_MAC2PHY_SRC, "clk_mac2phy_src", mux_2plls_p, 0,</div><div class='add'>+			RK3328_CLKSEL_CON(26), 7, 1, MFLAGS, 0, 5, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(3), 0, GFLAGS),</div><div class='add'>+	GATE(SCLK_MAC2PHY_REF, "clk_mac2phy_ref", "clk_mac2phy", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(9), 3, GFLAGS),</div><div class='add'>+	GATE(SCLK_MAC2PHY_RXTX, "clk_mac2phy_rxtx", "clk_mac2phy", 0,</div><div class='add'>+			RK3328_CLKGATE_CON(9), 1, GFLAGS),</div><div class='add'>+	COMPOSITE_NOMUX(SCLK_MAC2PHY_OUT, "clk_mac2phy_out", "clk_mac2phy", 0,</div><div class='add'>+			RK3328_CLKSEL_CON(26), 8, 2, DFLAGS,</div><div class='add'>+			RK3328_CLKGATE_CON(9), 2, GFLAGS),</div><div class='add'>+</div><div class='add'>+	FACTOR(0, "xin12m", "xin24m", 0, 1, 2),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clock-Architecture Diagram 9</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* PD_VOP */</div><div class='add'>+	GATE(ACLK_RGA, "aclk_rga", "aclk_rga_pre", 0, RK3328_CLKGATE_CON(21), 10, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_rga_niu", "aclk_rga_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(22), 3, GFLAGS),</div><div class='add'>+	GATE(ACLK_VOP, "aclk_vop", "aclk_vop_pre", 0, RK3328_CLKGATE_CON(21), 2, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_vop_niu", "aclk_vop_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(21), 4, GFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(ACLK_IEP, "aclk_iep", "aclk_vio_pre", 0, RK3328_CLKGATE_CON(21), 6, GFLAGS),</div><div class='add'>+	GATE(ACLK_CIF, "aclk_cif", "aclk_vio_pre", 0, RK3328_CLKGATE_CON(21), 8, GFLAGS),</div><div class='add'>+	GATE(ACLK_HDCP, "aclk_hdcp", "aclk_vio_pre", 0, RK3328_CLKGATE_CON(21), 15, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_vio_niu", "aclk_vio_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(22), 2, GFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(HCLK_VOP, "hclk_vop", "hclk_vio_pre", 0, RK3328_CLKGATE_CON(21), 3, GFLAGS),</div><div class='add'>+	GATE(0, "hclk_vop_niu", "hclk_vio_pre", 0, RK3328_CLKGATE_CON(21), 5, GFLAGS),</div><div class='add'>+	GATE(HCLK_IEP, "hclk_iep", "hclk_vio_pre", 0, RK3328_CLKGATE_CON(21), 7, GFLAGS),</div><div class='add'>+	GATE(HCLK_CIF, "hclk_cif", "hclk_vio_pre", 0, RK3328_CLKGATE_CON(21), 9, GFLAGS),</div><div class='add'>+	GATE(HCLK_RGA, "hclk_rga", "hclk_vio_pre", 0, RK3328_CLKGATE_CON(21), 11, GFLAGS),</div><div class='add'>+	GATE(0, "hclk_ahb1tom", "hclk_vio_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(21), 12, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_vio_h2p", "hclk_vio_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(21), 13, GFLAGS),</div><div class='add'>+	GATE(0, "hclk_vio_h2p", "hclk_vio_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(21), 14, GFLAGS),</div><div class='add'>+	GATE(HCLK_HDCP, "hclk_hdcp", "hclk_vio_pre", 0, RK3328_CLKGATE_CON(22), 0, GFLAGS),</div><div class='add'>+	GATE(HCLK_VIO, "hclk_vio", "hclk_vio_pre", 0, RK3328_CLKGATE_CON(22), 1, GFLAGS),</div><div class='add'>+	GATE(PCLK_HDMI, "pclk_hdmi", "hclk_vio_pre", 0, RK3328_CLKGATE_CON(22), 4, GFLAGS),</div><div class='add'>+	GATE(PCLK_HDCP, "pclk_hdcp", "hclk_vio_pre", 0, RK3328_CLKGATE_CON(22), 5, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/* PD_PERI */</div><div class='add'>+	GATE(0, "aclk_peri_noc", "aclk_peri", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(19), 11, GFLAGS),</div><div class='add'>+	GATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_peri", 0, RK3328_CLKGATE_CON(19), 4, GFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 0, GFLAGS),</div><div class='add'>+	GATE(HCLK_SDIO, "hclk_sdio", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 1, GFLAGS),</div><div class='add'>+	GATE(HCLK_EMMC, "hclk_emmc", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 2, GFLAGS),</div><div class='add'>+	GATE(HCLK_SDMMC_EXT, "hclk_sdmmc_ext", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 15, GFLAGS),</div><div class='add'>+	GATE(HCLK_HOST0, "hclk_host0", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 6, GFLAGS),</div><div class='add'>+	GATE(HCLK_HOST0_ARB, "hclk_host0_arb", "hclk_peri", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(19), 7, GFLAGS),</div><div class='add'>+	GATE(HCLK_OTG, "hclk_otg", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 8, GFLAGS),</div><div class='add'>+	GATE(HCLK_OTG_PMU, "hclk_otg_pmu", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 9, GFLAGS),</div><div class='add'>+	GATE(0, "hclk_peri_niu", "hclk_peri", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(19), 12, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_peri_niu", "hclk_peri", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(19), 13, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/* PD_GMAC */</div><div class='add'>+	GATE(ACLK_MAC2PHY, "aclk_mac2phy", "aclk_gmac", 0, RK3328_CLKGATE_CON(26), 0, GFLAGS),</div><div class='add'>+	GATE(ACLK_MAC2IO, "aclk_mac2io", "aclk_gmac", 0, RK3328_CLKGATE_CON(26), 2, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_gmac_niu", "aclk_gmac", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(26), 4, GFLAGS),</div><div class='add'>+	GATE(PCLK_MAC2PHY, "pclk_mac2phy", "pclk_gmac", 0, RK3328_CLKGATE_CON(26), 1, GFLAGS),</div><div class='add'>+	GATE(PCLK_MAC2IO, "pclk_mac2io", "pclk_gmac", 0, RK3328_CLKGATE_CON(26), 3, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_gmac_niu", "pclk_gmac", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(26), 5, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/* PD_BUS */</div><div class='add'>+	GATE(0, "aclk_bus_niu", "aclk_bus_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(15), 12, GFLAGS),</div><div class='add'>+	GATE(ACLK_DCF, "aclk_dcf", "aclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 11, GFLAGS),</div><div class='add'>+	GATE(ACLK_TSP, "aclk_tsp", "aclk_bus_pre", 0, RK3328_CLKGATE_CON(17), 12, GFLAGS),</div><div class='add'>+	GATE(0, "aclk_intmem", "aclk_bus_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(15), 0, GFLAGS),</div><div class='add'>+	GATE(ACLK_DMAC, "aclk_dmac_bus", "aclk_bus_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(15), 1, GFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(0, "hclk_rom", "hclk_bus_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(15), 2, GFLAGS),</div><div class='add'>+	GATE(HCLK_I2S0_8CH, "hclk_i2s0_8ch", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 3, GFLAGS),</div><div class='add'>+	GATE(HCLK_I2S1_8CH, "hclk_i2s1_8ch", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 4, GFLAGS),</div><div class='add'>+	GATE(HCLK_I2S2_2CH, "hclk_i2s2_2ch", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 5, GFLAGS),</div><div class='add'>+	GATE(HCLK_SPDIF_8CH, "hclk_spdif_8ch", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 6, GFLAGS),</div><div class='add'>+	GATE(HCLK_TSP, "hclk_tsp", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(17), 11, GFLAGS),</div><div class='add'>+	GATE(HCLK_CRYPTO_MST, "hclk_crypto_mst", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 7, GFLAGS),</div><div class='add'>+	GATE(HCLK_CRYPTO_SLV, "hclk_crypto_slv", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(15), 8, GFLAGS),</div><div class='add'>+	GATE(0, "hclk_bus_niu", "hclk_bus_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(15), 13, GFLAGS),</div><div class='add'>+	GATE(HCLK_PDM, "hclk_pdm", "hclk_bus_pre", 0, RK3328_CLKGATE_CON(28), 0, GFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(0, "pclk_bus_niu", "pclk_bus", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(15), 14, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_efuse", "pclk_bus", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(15), 9, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_otp", "pclk_bus", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(28), 4, GFLAGS),</div><div class='add'>+	GATE(PCLK_I2C0, "pclk_i2c0", "pclk_bus", 0, RK3328_CLKGATE_CON(15), 10, GFLAGS),</div><div class='add'>+	GATE(PCLK_I2C1, "pclk_i2c1", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 0, GFLAGS),</div><div class='add'>+	GATE(PCLK_I2C2, "pclk_i2c2", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 1, GFLAGS),</div><div class='add'>+	GATE(PCLK_I2C3, "pclk_i2c3", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 2, GFLAGS),</div><div class='add'>+	GATE(PCLK_TIMER, "pclk_timer0", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 3, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_stimer", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 4, GFLAGS),</div><div class='add'>+	GATE(PCLK_SPI, "pclk_spi", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 5, GFLAGS),</div><div class='add'>+	GATE(PCLK_PWM, "pclk_rk_pwm", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 6, GFLAGS),</div><div class='add'>+	GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 7, GFLAGS),</div><div class='add'>+	GATE(PCLK_GPIO1, "pclk_gpio1", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 8, GFLAGS),</div><div class='add'>+	GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 9, GFLAGS),</div><div class='add'>+	GATE(PCLK_GPIO3, "pclk_gpio3", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 10, GFLAGS),</div><div class='add'>+	GATE(PCLK_UART0, "pclk_uart0", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 11, GFLAGS),</div><div class='add'>+	GATE(PCLK_UART1, "pclk_uart1", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 12, GFLAGS),</div><div class='add'>+	GATE(PCLK_UART2, "pclk_uart2", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 13, GFLAGS),</div><div class='add'>+	GATE(PCLK_TSADC, "pclk_tsadc", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 14, GFLAGS),</div><div class='add'>+	GATE(PCLK_DCF, "pclk_dcf", "pclk_bus", 0, RK3328_CLKGATE_CON(16), 15, GFLAGS),</div><div class='add'>+	GATE(PCLK_GRF, "pclk_grf", "pclk_bus", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 0, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_cru", "pclk_bus", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 4, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_sgrf", "pclk_bus", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 6, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_sim", "pclk_bus", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 10, GFLAGS),</div><div class='add'>+	GATE(PCLK_SARADC, "pclk_saradc", "pclk_bus", 0, RK3328_CLKGATE_CON(17), 15, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_pmu", "pclk_bus", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(28), 3, GFLAGS),</div><div class='add'>+</div><div class='add'>+	GATE(PCLK_USB3PHY_OTG, "pclk_usb3phy_otg", "pclk_phy_pre", 0, RK3328_CLKGATE_CON(28), 1, GFLAGS),</div><div class='add'>+	GATE(PCLK_USB3PHY_PIPE, "pclk_usb3phy_pipe", "pclk_phy_pre", 0, RK3328_CLKGATE_CON(28), 2, GFLAGS),</div><div class='add'>+	GATE(PCLK_USB3_GRF, "pclk_usb3_grf", "pclk_phy_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 2, GFLAGS),</div><div class='add'>+	GATE(PCLK_USB2_GRF, "pclk_usb2_grf", "pclk_phy_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 14, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_ddrphy", "pclk_phy_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 13, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_acodecphy", "pclk_phy_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 5, GFLAGS),</div><div class='add'>+	GATE(PCLK_HDMIPHY, "pclk_hdmiphy", "pclk_phy_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 7, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_vdacphy", "pclk_phy_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(17), 8, GFLAGS),</div><div class='add'>+	GATE(0, "pclk_phy_niu", "pclk_phy_pre", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(15), 15, GFLAGS),</div><div class='add'>+</div><div class='add'>+	/* PD_MMC */</div><div class='add'>+	MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "sclk_sdmmc",</div><div class='add'>+	    RK3328_SDMMC_CON0, 1),</div><div class='add'>+	MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "sclk_sdmmc",</div><div class='add'>+	    RK3328_SDMMC_CON1, 1),</div><div class='add'>+</div><div class='add'>+	MMC(SCLK_SDIO_DRV, "sdio_drv", "sclk_sdio",</div><div class='add'>+	    RK3328_SDIO_CON0, 1),</div><div class='add'>+	MMC(SCLK_SDIO_SAMPLE, "sdio_sample", "sclk_sdio",</div><div class='add'>+	    RK3328_SDIO_CON1, 1),</div><div class='add'>+</div><div class='add'>+	MMC(SCLK_EMMC_DRV, "emmc_drv", "sclk_emmc",</div><div class='add'>+	    RK3328_EMMC_CON0, 1),</div><div class='add'>+	MMC(SCLK_EMMC_SAMPLE, "emmc_sample", "sclk_emmc",</div><div class='add'>+	    RK3328_EMMC_CON1, 1),</div><div class='add'>+</div><div class='add'>+	MMC(SCLK_SDMMC_EXT_DRV, "sdmmc_ext_drv", "sclk_sdmmc_ext",</div><div class='add'>+	    RK3328_SDMMC_EXT_CON0, 1),</div><div class='add'>+	MMC(SCLK_SDMMC_EXT_SAMPLE, "sdmmc_ext_sample", "sclk_sdmmc_ext",</div><div class='add'>+	    RK3328_SDMMC_EXT_CON1, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const rk3328_critical_clocks[] __initconst = {</div><div class='add'>+	"aclk_bus",</div><div class='add'>+	"pclk_bus",</div><div class='add'>+	"hclk_bus",</div><div class='add'>+	"aclk_peri",</div><div class='add'>+	"hclk_peri",</div><div class='add'>+	"pclk_peri",</div><div class='add'>+	"pclk_dbg",</div><div class='add'>+	"aclk_core_niu",</div><div class='add'>+	"aclk_gic400",</div><div class='add'>+	"aclk_intmem",</div><div class='add'>+	"hclk_rom",</div><div class='add'>+	"pclk_grf",</div><div class='add'>+	"pclk_cru",</div><div class='add'>+	"pclk_sgrf",</div><div class='add'>+	"pclk_timer0",</div><div class='add'>+	"clk_timer0",</div><div class='add'>+	"pclk_ddr_msch",</div><div class='add'>+	"pclk_ddr_mon",</div><div class='add'>+	"pclk_ddr_grf",</div><div class='add'>+	"clk_ddrupctl",</div><div class='add'>+	"clk_ddrmsch",</div><div class='add'>+	"hclk_ahb1tom",</div><div class='add'>+	"clk_jtag",</div><div class='add'>+	"pclk_ddrphy",</div><div class='add'>+	"pclk_pmu",</div><div class='add'>+	"hclk_otg_pmu",</div><div class='add'>+	"aclk_rga_niu",</div><div class='add'>+	"pclk_vio_h2p",</div><div class='add'>+	"hclk_vio_h2p",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init rk3328_clk_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct rockchip_clk_provider *ctx;</div><div class='add'>+	void __iomem *reg_base;</div><div class='add'>+</div><div class='add'>+	reg_base = of_iomap(np, 0);</div><div class='add'>+	if (!reg_base) {</div><div class='add'>+		pr_err("%s: could not map cru region\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS);</div><div class='add'>+	if (IS_ERR(ctx)) {</div><div class='add'>+		pr_err("%s: rockchip clk init failed\n", __func__);</div><div class='add'>+		iounmap(reg_base);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rockchip_clk_register_plls(ctx, rk3328_pll_clks,</div><div class='add'>+				   ARRAY_SIZE(rk3328_pll_clks),</div><div class='add'>+				   RK3328_GRF_SOC_STATUS0);</div><div class='add'>+	rockchip_clk_register_branches(ctx, rk3328_clk_branches,</div><div class='add'>+				       ARRAY_SIZE(rk3328_clk_branches));</div><div class='add'>+	rockchip_clk_protect_critical(rk3328_critical_clocks,</div><div class='add'>+				      ARRAY_SIZE(rk3328_critical_clocks));</div><div class='add'>+</div><div class='add'>+	rockchip_clk_register_armclk(ctx, ARMCLK, "armclk",</div><div class='add'>+				     mux_armclk_p, ARRAY_SIZE(mux_armclk_p),</div><div class='add'>+				     &amp;rk3328_cpuclk_data, rk3328_cpuclk_rates,</div><div class='add'>+				     ARRAY_SIZE(rk3328_cpuclk_rates));</div><div class='add'>+</div><div class='add'>+	rockchip_register_softrst(np, 11, reg_base + RK3328_SOFTRST_CON(0),</div><div class='add'>+				  ROCKCHIP_SOFTRST_HIWORD_MASK);</div><div class='add'>+</div><div class='add'>+	rockchip_register_restart_notifier(ctx, RK3328_GLB_SRST_FST, NULL);</div><div class='add'>+</div><div class='add'>+	rockchip_clk_of_add_provider(np, ctx);</div><div class='add'>+}</div><div class='add'>+CLK_OF_DECLARE(rk3328_cru, "rockchip,rk3328-cru", rk3328_clk_init);</div><div class='head'>diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c<br/>index 8387c7a40bda..73121b144634 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-rk3399.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/rockchip/clk-rk3399.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/rockchip/clk-rk3399.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk-rk3399.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ static struct rockchip_pll_rate_table rk3399_pll_rates[] = {</div><div class='ctx'> 	RK3036_PLL_RATE(1104000000, 1, 46, 1, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE(1100000000, 12, 550, 1, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE(1008000000, 1, 84, 2, 1, 1, 0),</div><div class='del'>-	RK3036_PLL_RATE(1000000000, 6, 500, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE(1000000000, 1, 125, 3, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 984000000, 1, 82, 2, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 960000000, 1, 80, 2, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 936000000, 1, 78, 2, 1, 1, 0),</div><div class='hunk'>@@ -87,12 +87,13 @@ static struct rockchip_pll_rate_table rk3399_pll_rates[] = {</div><div class='ctx'> 	RK3036_PLL_RATE( 864000000, 1, 72, 2, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 840000000, 1, 70, 2, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 816000000, 1, 68, 2, 1, 1, 0),</div><div class='del'>-	RK3036_PLL_RATE( 800000000, 6, 400, 2, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 800000000, 1, 100, 3, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 700000000, 6, 350, 2, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 696000000, 1, 58, 2, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 676000000, 3, 169, 2, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 600000000, 1, 75, 3, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 594000000, 1, 99, 4, 1, 1, 0),</div><div class='add'>+	RK3036_PLL_RATE( 533250000, 8, 711, 4, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 504000000, 1, 63, 3, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 500000000, 6, 250, 2, 1, 1, 0),</div><div class='ctx'> 	RK3036_PLL_RATE( 408000000, 1, 68, 2, 2, 1, 0),</div><div class='hunk'>@@ -410,11 +411,11 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {</div><div class='ctx'> 	GATE(SCLK_USB2PHY1_REF, "clk_usb2phy1_ref", "xin24m", CLK_IGNORE_UNUSED,</div><div class='ctx'> 			RK3399_CLKGATE_CON(6), 6, GFLAGS),</div><div class='ctx'> </div><div class='del'>-	GATE(0, "clk_usbphy0_480m_src", "clk_usbphy0_480m", CLK_IGNORE_UNUSED,</div><div class='add'>+	GATE(0, "clk_usbphy0_480m_src", "clk_usbphy0_480m", 0,</div><div class='ctx'> 			RK3399_CLKGATE_CON(13), 12, GFLAGS),</div><div class='del'>-	GATE(0, "clk_usbphy1_480m_src", "clk_usbphy1_480m", CLK_IGNORE_UNUSED,</div><div class='add'>+	GATE(0, "clk_usbphy1_480m_src", "clk_usbphy1_480m", 0,</div><div class='ctx'> 			RK3399_CLKGATE_CON(13), 12, GFLAGS),</div><div class='del'>-	MUX(0, "clk_usbphy_480m", mux_usbphy_480m_p, CLK_IGNORE_UNUSED,</div><div class='add'>+	MUX(0, "clk_usbphy_480m", mux_usbphy_480m_p, 0,</div><div class='ctx'> 			RK3399_CLKSEL_CON(14), 6, 1, MFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	MUX(0, "upll", mux_pll_src_24m_usbphy480m_p, 0,</div><div class='hunk'>@@ -498,7 +499,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {</div><div class='ctx'> 			RK3399_CLKGATE_CON(14), 10, GFLAGS),</div><div class='ctx'> 	GATE(ACLK_GIC_ADB400_CORE_L_2_GIC, "aclk_core_adb400_core_l_2_gic", "armclkl", CLK_IGNORE_UNUSED,</div><div class='ctx'> 			RK3399_CLKGATE_CON(14), 11, GFLAGS),</div><div class='del'>-	GATE(SCLK_PVTM_CORE_L, "clk_pvtm_core_l", "xin24m", CLK_IGNORE_UNUSED,</div><div class='add'>+	GATE(SCLK_PVTM_CORE_L, "clk_pvtm_core_l", "xin24m", 0,</div><div class='ctx'> 			RK3399_CLKGATE_CON(0), 7, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	/* big core */</div><div class='hunk'>@@ -539,7 +540,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {</div><div class='ctx'> 	GATE(0, "pclk_dbg_cxcs_pd_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,</div><div class='ctx'> 			RK3399_CLKGATE_CON(14), 2, GFLAGS),</div><div class='ctx'> </div><div class='del'>-	GATE(SCLK_PVTM_CORE_B, "clk_pvtm_core_b", "xin24m", CLK_IGNORE_UNUSED,</div><div class='add'>+	GATE(SCLK_PVTM_CORE_B, "clk_pvtm_core_b", "xin24m", 0,</div><div class='ctx'> 			RK3399_CLKGATE_CON(1), 7, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	/* gmac */</div><div class='hunk'>@@ -675,18 +676,18 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> 	GATE(PCLK_CENTER_MAIN_NOC, "pclk_center_main_noc", "pclk_ddr", CLK_IGNORE_UNUSED,</div><div class='ctx'> 			RK3399_CLKGATE_CON(18), 10, GFLAGS),</div><div class='del'>-	GATE(PCLK_DDR_MON, "pclk_ddr_mon", "pclk_ddr", CLK_IGNORE_UNUSED,</div><div class='add'>+	GATE(PCLK_DDR_MON, "pclk_ddr_mon", "pclk_ddr", 0,</div><div class='ctx'> 			RK3399_CLKGATE_CON(18), 12, GFLAGS),</div><div class='ctx'> 	GATE(PCLK_CIC, "pclk_cic", "pclk_ddr", CLK_IGNORE_UNUSED,</div><div class='ctx'> 			RK3399_CLKGATE_CON(18), 15, GFLAGS),</div><div class='ctx'> 	GATE(PCLK_DDR_SGRF, "pclk_ddr_sgrf", "pclk_ddr", CLK_IGNORE_UNUSED,</div><div class='ctx'> 			RK3399_CLKGATE_CON(19), 2, GFLAGS),</div><div class='ctx'> </div><div class='del'>-	GATE(SCLK_PVTM_DDR, "clk_pvtm_ddr", "xin24m", CLK_IGNORE_UNUSED,</div><div class='add'>+	GATE(SCLK_PVTM_DDR, "clk_pvtm_ddr", "xin24m", 0,</div><div class='ctx'> 			RK3399_CLKGATE_CON(4), 11, GFLAGS),</div><div class='del'>-	GATE(SCLK_DFIMON0_TIMER, "clk_dfimon0_timer", "xin24m", CLK_IGNORE_UNUSED,</div><div class='add'>+	GATE(SCLK_DFIMON0_TIMER, "clk_dfimon0_timer", "xin24m", 0,</div><div class='ctx'> 			RK3399_CLKGATE_CON(3), 5, GFLAGS),</div><div class='del'>-	GATE(SCLK_DFIMON1_TIMER, "clk_dfimon1_timer", "xin24m", CLK_IGNORE_UNUSED,</div><div class='add'>+	GATE(SCLK_DFIMON1_TIMER, "clk_dfimon1_timer", "xin24m", 0,</div><div class='ctx'> 			RK3399_CLKGATE_CON(3), 6, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	/* cci */</div><div class='hunk'>@@ -966,7 +967,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {</div><div class='ctx'> 	GATE(SCLK_INTMEM3, "clk_intmem3", "aclk_perilp0", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(23), 5, GFLAGS),</div><div class='ctx'> 	GATE(SCLK_INTMEM4, "clk_intmem4", "aclk_perilp0", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(23), 6, GFLAGS),</div><div class='ctx'> 	GATE(SCLK_INTMEM5, "clk_intmem5", "aclk_perilp0", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(23), 7, GFLAGS),</div><div class='del'>-	GATE(ACLK_DCF, "aclk_dcf", "aclk_perilp0", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(23), 8, GFLAGS),</div><div class='add'>+	GATE(ACLK_DCF, "aclk_dcf", "aclk_perilp0", 0, RK3399_CLKGATE_CON(23), 8, GFLAGS),</div><div class='ctx'> 	GATE(ACLK_DMAC0_PERILP, "aclk_dmac0_perilp", "aclk_perilp0", 0, RK3399_CLKGATE_CON(25), 5, GFLAGS),</div><div class='ctx'> 	GATE(ACLK_DMAC1_PERILP, "aclk_dmac1_perilp", "aclk_perilp0", 0, RK3399_CLKGATE_CON(25), 6, GFLAGS),</div><div class='ctx'> 	GATE(ACLK_PERILP0_NOC, "aclk_perilp0_noc", "aclk_perilp0", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(25), 7, GFLAGS),</div><div class='hunk'>@@ -980,7 +981,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {</div><div class='ctx'> 	GATE(HCLK_PERILP0_NOC, "hclk_perilp0_noc", "hclk_perilp0", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(25), 8, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	/* pclk_perilp0 gates */</div><div class='del'>-	GATE(PCLK_DCF, "pclk_dcf", "pclk_perilp0", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(23), 9, GFLAGS),</div><div class='add'>+	GATE(PCLK_DCF, "pclk_dcf", "pclk_perilp0", 0, RK3399_CLKGATE_CON(23), 9, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	/* crypto */</div><div class='ctx'> 	COMPOSITE(SCLK_CRYPTO0, "clk_crypto0", mux_pll_src_cpll_gpll_ppll_p, 0,</div><div class='hunk'>@@ -1131,7 +1132,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {</div><div class='ctx'> 			RK3399_CLKGATE_CON(11), 8, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	COMPOSITE(PCLK_EDP, "pclk_edp", mux_pll_src_cpll_gpll_p, 0,</div><div class='del'>-			RK3399_CLKSEL_CON(44), 15, 1, MFLAGS, 8, 5, DFLAGS,</div><div class='add'>+			RK3399_CLKSEL_CON(44), 15, 1, MFLAGS, 8, 6, DFLAGS,</div><div class='ctx'> 			RK3399_CLKGATE_CON(11), 11, GFLAGS),</div><div class='ctx'> 	GATE(PCLK_EDP_NOC, "pclk_edp_noc", "pclk_edp", CLK_IGNORE_UNUSED,</div><div class='ctx'> 			RK3399_CLKGATE_CON(32), 12, GFLAGS),</div><div class='hunk'>@@ -1382,8 +1383,8 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {</div><div class='ctx'> 	/* clk_test */</div><div class='ctx'> 	/* clk_test_pre is controlled by CRU_MISC_CON[3] */</div><div class='ctx'> 	COMPOSITE_NOMUX(0, "clk_test", "clk_test_pre", CLK_IGNORE_UNUSED,</div><div class='del'>-			RK3368_CLKSEL_CON(58), 0, 5, DFLAGS,</div><div class='del'>-			RK3368_CLKGATE_CON(13), 11, GFLAGS),</div><div class='add'>+			RK3399_CLKSEL_CON(58), 0, 5, DFLAGS,</div><div class='add'>+			RK3399_CLKGATE_CON(13), 11, GFLAGS),</div><div class='ctx'> </div><div class='ctx'> 	/* ddrc */</div><div class='ctx'> 	GATE(0, "clk_ddrc_lpll_src", "lpll", 0, RK3399_CLKGATE_CON(3),</div><div class='head'>diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c<br/>index b886be30f34f..fe1d393cf678 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/rockchip/clk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/rockchip/clk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/rockchip/clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk.c</a></div><div class='hunk'>@@ -344,7 +344,6 @@ struct rockchip_clk_provider * __init rockchip_clk_init(struct device_node *np,</div><div class='ctx'> 	ctx-&gt;clk_data.clks = clk_table;</div><div class='ctx'> 	ctx-&gt;clk_data.clk_num = nr_clks;</div><div class='ctx'> 	ctx-&gt;cru_node = np;</div><div class='del'>-	ctx-&gt;grf = ERR_PTR(-EPROBE_DEFER);</div><div class='ctx'> 	spin_lock_init(&amp;ctx-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;grf = syscon_regmap_lookup_by_phandle(ctx-&gt;cru_node,</div><div class='hunk'>@@ -417,6 +416,13 @@ void __init rockchip_clk_register_branches(</div><div class='ctx'> 				list-&gt;mux_shift, list-&gt;mux_width,</div><div class='ctx'> 				list-&gt;mux_flags, &amp;ctx-&gt;lock);</div><div class='ctx'> 			break;</div><div class='add'>+		case branch_muxgrf:</div><div class='add'>+			clk = rockchip_clk_register_muxgrf(list-&gt;name,</div><div class='add'>+				list-&gt;parent_names, list-&gt;num_parents,</div><div class='add'>+				flags, ctx-&gt;grf, list-&gt;muxdiv_offset,</div><div class='add'>+				list-&gt;mux_shift, list-&gt;mux_width,</div><div class='add'>+				list-&gt;mux_flags);</div><div class='add'>+			break;</div><div class='ctx'> 		case branch_divider:</div><div class='ctx'> 			if (list-&gt;div_table)</div><div class='ctx'> 				clk = clk_register_divider_table(NULL,</div><div class='head'>diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h<br/>index 1653edd792a5..7c15473ea72b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/rockchip/clk.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/rockchip/clk.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/rockchip/clk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/rockchip/clk.h</a></div><div class='hunk'>@@ -34,6 +34,21 @@ struct clk;</div><div class='ctx'> #define HIWORD_UPDATE(val, mask, shift) \</div><div class='ctx'> 		((val) &lt;&lt; (shift) | (mask) &lt;&lt; ((shift) + 16))</div><div class='ctx'> </div><div class='add'>+/* register positions shared by RK1108, RK2928, RK3036, RK3066, RK3188 and RK3228 */</div><div class='add'>+#define RK1108_PLL_CON(x)		((x) * 0x4)</div><div class='add'>+#define RK1108_CLKSEL_CON(x)		((x) * 0x4 + 0x60)</div><div class='add'>+#define RK1108_CLKGATE_CON(x)		((x) * 0x4 + 0x120)</div><div class='add'>+#define RK1108_SOFTRST_CON(x)		((x) * 0x4 + 0x180)</div><div class='add'>+#define RK1108_GLB_SRST_FST		0x1c0</div><div class='add'>+#define RK1108_GLB_SRST_SND		0x1c4</div><div class='add'>+#define RK1108_MISC_CON			0x1cc</div><div class='add'>+#define RK1108_SDMMC_CON0		0x1d8</div><div class='add'>+#define RK1108_SDMMC_CON1		0x1dc</div><div class='add'>+#define RK1108_SDIO_CON0		0x1e0</div><div class='add'>+#define RK1108_SDIO_CON1		0x1e4</div><div class='add'>+#define RK1108_EMMC_CON0		0x1e8</div><div class='add'>+#define RK1108_EMMC_CON1		0x1ec</div><div class='add'>+</div><div class='ctx'> #define RK2928_PLL_CON(x)		((x) * 0x4)</div><div class='ctx'> #define RK2928_MODE_CON		0x40</div><div class='ctx'> #define RK2928_CLKSEL_CON(x)	((x) * 0x4 + 0x44)</div><div class='hunk'>@@ -76,6 +91,24 @@ struct clk;</div><div class='ctx'> #define RK3288_EMMC_CON0		0x218</div><div class='ctx'> #define RK3288_EMMC_CON1		0x21c</div><div class='ctx'> </div><div class='add'>+#define RK3328_PLL_CON(x)		RK2928_PLL_CON(x)</div><div class='add'>+#define RK3328_CLKSEL_CON(x)		((x) * 0x4 + 0x100)</div><div class='add'>+#define RK3328_CLKGATE_CON(x)		((x) * 0x4 + 0x200)</div><div class='add'>+#define RK3328_GRFCLKSEL_CON(x)		((x) * 0x4 + 0x100)</div><div class='add'>+#define RK3328_GLB_SRST_FST		0x9c</div><div class='add'>+#define RK3328_GLB_SRST_SND		0x98</div><div class='add'>+#define RK3328_SOFTRST_CON(x)		((x) * 0x4 + 0x300)</div><div class='add'>+#define RK3328_MODE_CON			0x80</div><div class='add'>+#define RK3328_MISC_CON			0x84</div><div class='add'>+#define RK3328_SDMMC_CON0		0x380</div><div class='add'>+#define RK3328_SDMMC_CON1		0x384</div><div class='add'>+#define RK3328_SDIO_CON0		0x388</div><div class='add'>+#define RK3328_SDIO_CON1		0x38c</div><div class='add'>+#define RK3328_EMMC_CON0		0x390</div><div class='add'>+#define RK3328_EMMC_CON1		0x394</div><div class='add'>+#define RK3328_SDMMC_EXT_CON0		0x398</div><div class='add'>+#define RK3328_SDMMC_EXT_CON1		0x39C</div><div class='add'>+</div><div class='ctx'> #define RK3368_PLL_CON(x)		RK2928_PLL_CON(x)</div><div class='ctx'> #define RK3368_CLKSEL_CON(x)		((x) * 0x4 + 0x100)</div><div class='ctx'> #define RK3368_CLKGATE_CON(x)		((x) * 0x4 + 0x200)</div><div class='hunk'>@@ -115,6 +148,7 @@ struct clk;</div><div class='ctx'> enum rockchip_pll_type {</div><div class='ctx'> 	pll_rk3036,</div><div class='ctx'> 	pll_rk3066,</div><div class='add'>+	pll_rk3328,</div><div class='ctx'> 	pll_rk3399,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -302,11 +336,17 @@ struct clk *rockchip_clk_register_inverter(const char *name,</div><div class='ctx'> 				void __iomem *reg, int shift, int flags,</div><div class='ctx'> 				spinlock_t *lock);</div><div class='ctx'> </div><div class='add'>+struct clk *rockchip_clk_register_muxgrf(const char *name,</div><div class='add'>+				const char *const *parent_names, u8 num_parents,</div><div class='add'>+				int flags, struct regmap *grf, int reg,</div><div class='add'>+				int shift, int width, int mux_flags);</div><div class='add'>+</div><div class='ctx'> #define PNAME(x) static const char *const x[] __initconst</div><div class='ctx'> </div><div class='ctx'> enum rockchip_clk_branch_type {</div><div class='ctx'> 	branch_composite,</div><div class='ctx'> 	branch_mux,</div><div class='add'>+	branch_muxgrf,</div><div class='ctx'> 	branch_divider,</div><div class='ctx'> 	branch_fraction_divider,</div><div class='ctx'> 	branch_gate,</div><div class='hunk'>@@ -536,6 +576,21 @@ struct rockchip_clk_branch {</div><div class='ctx'> 		.gate_offset	= -1,				\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define MUXGRF(_id, cname, pnames, f, o, s, w, mf)		\</div><div class='add'>+	{							\</div><div class='add'>+		.id		= _id,				\</div><div class='add'>+		.branch_type	= branch_muxgrf,		\</div><div class='add'>+		.name		= cname,			\</div><div class='add'>+		.parent_names	= pnames,			\</div><div class='add'>+		.num_parents	= ARRAY_SIZE(pnames),		\</div><div class='add'>+		.flags		= f,				\</div><div class='add'>+		.muxdiv_offset	= o,				\</div><div class='add'>+		.mux_shift	= s,				\</div><div class='add'>+		.mux_width	= w,				\</div><div class='add'>+		.mux_flags	= mf,				\</div><div class='add'>+		.gate_offset	= -1,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #define DIV(_id, cname, pname, f, o, s, w, df)			\</div><div class='ctx'> 	{							\</div><div class='ctx'> 		.id		= _id,				\</div><div class='head'>diff --git a/drivers/clk/samsung/Makefile b/drivers/clk/samsung/Makefile<br/>index 57f4dc6dc447..7afc21dc374e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/samsung/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/samsung/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/samsung/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/Makefile</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> obj-$(CONFIG_COMMON_CLK)	+= clk.o clk-pll.o clk-cpu.o</div><div class='ctx'> obj-$(CONFIG_SOC_EXYNOS3250)	+= clk-exynos3250.o</div><div class='ctx'> obj-$(CONFIG_ARCH_EXYNOS4)	+= clk-exynos4.o</div><div class='del'>-obj-$(CONFIG_SOC_EXYNOS4415)	+= clk-exynos4415.o</div><div class='ctx'> obj-$(CONFIG_SOC_EXYNOS5250)	+= clk-exynos5250.o</div><div class='ctx'> obj-$(CONFIG_SOC_EXYNOS5260)	+= clk-exynos5260.o</div><div class='ctx'> obj-$(CONFIG_SOC_EXYNOS5410)	+= clk-exynos5410.o</div><div class='head'>diff --git a/drivers/clk/samsung/clk-exynos-audss.c b/drivers/clk/samsung/clk-exynos-audss.c<br/>index 17e68a724945..cb7df358a27d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/samsung/clk-exynos-audss.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/samsung/clk-exynos-audss.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/samsung/clk-exynos-audss.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-exynos-audss.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ static unsigned long reg_save[][2] = {</div><div class='ctx'> 	{ ASS_CLK_GATE, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int exynos_audss_clk_suspend(void)</div><div class='add'>+static int exynos_audss_clk_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -54,18 +54,15 @@ static int exynos_audss_clk_suspend(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void exynos_audss_clk_resume(void)</div><div class='add'>+static int exynos_audss_clk_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(reg_save); i++)</div><div class='ctx'> 		writel(reg_save[i][1], reg_base + reg_save[i][0]);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static struct syscore_ops exynos_audss_clk_syscore_ops = {</div><div class='del'>-	.suspend	= exynos_audss_clk_suspend,</div><div class='del'>-	.resume		= exynos_audss_clk_resume,</div><div class='del'>-};</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> struct exynos_audss_clk_drvdata {</div><div class='hunk'>@@ -251,9 +248,6 @@ static int exynos_audss_clk_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto unregister;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-	register_syscore_ops(&amp;exynos_audss_clk_syscore_ops);</div><div class='del'>-#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> unregister:</div><div class='hunk'>@@ -267,10 +261,6 @@ unregister:</div><div class='ctx'> </div><div class='ctx'> static int exynos_audss_clk_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-	unregister_syscore_ops(&amp;exynos_audss_clk_syscore_ops);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	of_clk_del_provider(pdev-&gt;dev.of_node);</div><div class='ctx'> </div><div class='ctx'> 	exynos_audss_clk_teardown();</div><div class='hunk'>@@ -281,10 +271,16 @@ static int exynos_audss_clk_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct dev_pm_ops exynos_audss_clk_pm_ops = {</div><div class='add'>+	SET_LATE_SYSTEM_SLEEP_PM_OPS(exynos_audss_clk_suspend,</div><div class='add'>+				     exynos_audss_clk_resume)</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_driver exynos_audss_clk_driver = {</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name = "exynos-audss-clk",</div><div class='ctx'> 		.of_match_table = exynos_audss_clk_of_match,</div><div class='add'>+		.pm = &amp;exynos_audss_clk_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = exynos_audss_clk_probe,</div><div class='ctx'> 	.remove = exynos_audss_clk_remove,</div><div class='head'>diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c<br/>index faab9b31baf5..e40b77583c47 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/samsung/clk-exynos4.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/samsung/clk-exynos4.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/samsung/clk-exynos4.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-exynos4.c</a></div><div class='hunk'>@@ -1298,6 +1298,8 @@ static const struct samsung_pll_rate_table exynos4210_vpll_rates[] __initconst =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_pll_rate_table exynos4x12_apll_rates[] __initconst = {</div><div class='add'>+	PLL_35XX_RATE(1704000000, 213, 3, 0),</div><div class='add'>+	PLL_35XX_RATE(1600000000, 200, 3, 0),</div><div class='ctx'> 	PLL_35XX_RATE(1500000000, 250, 4, 0),</div><div class='ctx'> 	PLL_35XX_RATE(1400000000, 175, 3, 0),</div><div class='ctx'> 	PLL_35XX_RATE(1300000000, 325, 6, 0),</div><div class='hunk'>@@ -1421,6 +1423,8 @@ static const struct exynos_cpuclk_cfg_data e4212_armclk_d[] __initconst = {</div><div class='ctx'> 		(((cores) &lt;&lt; 8) | ((hpm) &lt;&lt; 4) | ((copy) &lt;&lt; 0))</div><div class='ctx'> </div><div class='ctx'> static const struct exynos_cpuclk_cfg_data e4412_armclk_d[] __initconst = {</div><div class='add'>+	{ 1704000, E4210_CPU_DIV0(2, 1, 6, 0, 7, 3), E4412_CPU_DIV1(7, 0, 7), },</div><div class='add'>+	{ 1600000, E4210_CPU_DIV0(2, 1, 6, 0, 7, 3), E4412_CPU_DIV1(7, 0, 6), },</div><div class='ctx'> 	{ 1500000, E4210_CPU_DIV0(2, 1, 6, 0, 7, 3), E4412_CPU_DIV1(7, 0, 6), },</div><div class='ctx'> 	{ 1400000, E4210_CPU_DIV0(2, 1, 6, 0, 7, 3), E4412_CPU_DIV1(6, 0, 6), },</div><div class='ctx'> 	{ 1300000, E4210_CPU_DIV0(2, 1, 5, 0, 7, 3), E4412_CPU_DIV1(6, 0, 5), },</div><div class='head'>diff --git a/drivers/clk/samsung/clk-exynos4415.c b/drivers/clk/samsung/clk-exynos4415.c<br/>deleted file mode 100644<br/>index 6c9063159717..000000000000<br/>--- a/<a href='/drm-misc/tree/drivers/clk/samsung/clk-exynos4415.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/samsung/clk-exynos4415.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1022 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2014 Samsung Electronics Co., Ltd.</div><div class='del'>- * Author: Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * Common Clock Framework support for Exynos4415 SoC.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/clk-provider.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_address.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/syscore_ops.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;dt-bindings/clock/exynos4415.h&gt;</div><div class='del'>-</div><div class='del'>-#include "clk.h"</div><div class='del'>-#include "clk-pll.h"</div><div class='del'>-</div><div class='del'>-#define SRC_LEFTBUS		0x4200</div><div class='del'>-#define DIV_LEFTBUS		0x4500</div><div class='del'>-#define GATE_IP_LEFTBUS		0x4800</div><div class='del'>-#define GATE_IP_IMAGE		0x4930</div><div class='del'>-#define SRC_RIGHTBUS		0x8200</div><div class='del'>-#define DIV_RIGHTBUS		0x8500</div><div class='del'>-#define GATE_IP_RIGHTBUS	0x8800</div><div class='del'>-#define GATE_IP_PERIR		0x8960</div><div class='del'>-#define EPLL_LOCK		0xc010</div><div class='del'>-#define G3D_PLL_LOCK		0xc020</div><div class='del'>-#define DISP_PLL_LOCK		0xc030</div><div class='del'>-#define ISP_PLL_LOCK		0xc040</div><div class='del'>-#define EPLL_CON0		0xc110</div><div class='del'>-#define EPLL_CON1		0xc114</div><div class='del'>-#define EPLL_CON2		0xc118</div><div class='del'>-#define G3D_PLL_CON0		0xc120</div><div class='del'>-#define G3D_PLL_CON1		0xc124</div><div class='del'>-#define G3D_PLL_CON2		0xc128</div><div class='del'>-#define ISP_PLL_CON0		0xc130</div><div class='del'>-#define ISP_PLL_CON1		0xc134</div><div class='del'>-#define ISP_PLL_CON2		0xc138</div><div class='del'>-#define DISP_PLL_CON0		0xc140</div><div class='del'>-#define DISP_PLL_CON1		0xc144</div><div class='del'>-#define DISP_PLL_CON2		0xc148</div><div class='del'>-#define SRC_TOP0		0xc210</div><div class='del'>-#define SRC_TOP1		0xc214</div><div class='del'>-#define SRC_CAM			0xc220</div><div class='del'>-#define SRC_TV			0xc224</div><div class='del'>-#define SRC_MFC			0xc228</div><div class='del'>-#define SRC_G3D			0xc22c</div><div class='del'>-#define SRC_LCD			0xc234</div><div class='del'>-#define SRC_ISP			0xc238</div><div class='del'>-#define SRC_MAUDIO		0xc23c</div><div class='del'>-#define SRC_FSYS		0xc240</div><div class='del'>-#define SRC_PERIL0		0xc250</div><div class='del'>-#define SRC_PERIL1		0xc254</div><div class='del'>-#define SRC_CAM1		0xc258</div><div class='del'>-#define SRC_TOP_ISP0		0xc25c</div><div class='del'>-#define SRC_TOP_ISP1		0xc260</div><div class='del'>-#define SRC_MASK_TOP		0xc310</div><div class='del'>-#define SRC_MASK_CAM		0xc320</div><div class='del'>-#define SRC_MASK_TV		0xc324</div><div class='del'>-#define SRC_MASK_LCD		0xc334</div><div class='del'>-#define SRC_MASK_ISP		0xc338</div><div class='del'>-#define SRC_MASK_MAUDIO		0xc33c</div><div class='del'>-#define SRC_MASK_FSYS		0xc340</div><div class='del'>-#define SRC_MASK_PERIL0		0xc350</div><div class='del'>-#define SRC_MASK_PERIL1		0xc354</div><div class='del'>-#define DIV_TOP			0xc510</div><div class='del'>-#define DIV_CAM			0xc520</div><div class='del'>-#define DIV_TV			0xc524</div><div class='del'>-#define DIV_MFC			0xc528</div><div class='del'>-#define DIV_G3D			0xc52c</div><div class='del'>-#define DIV_LCD			0xc534</div><div class='del'>-#define DIV_ISP			0xc538</div><div class='del'>-#define DIV_MAUDIO		0xc53c</div><div class='del'>-#define DIV_FSYS0		0xc540</div><div class='del'>-#define DIV_FSYS1		0xc544</div><div class='del'>-#define DIV_FSYS2		0xc548</div><div class='del'>-#define DIV_PERIL0		0xc550</div><div class='del'>-#define DIV_PERIL1		0xc554</div><div class='del'>-#define DIV_PERIL2		0xc558</div><div class='del'>-#define DIV_PERIL3		0xc55c</div><div class='del'>-#define DIV_PERIL4		0xc560</div><div class='del'>-#define DIV_PERIL5		0xc564</div><div class='del'>-#define DIV_CAM1		0xc568</div><div class='del'>-#define DIV_TOP_ISP1		0xc56c</div><div class='del'>-#define DIV_TOP_ISP0		0xc570</div><div class='del'>-#define CLKDIV2_RATIO		0xc580</div><div class='del'>-#define GATE_SCLK_CAM		0xc820</div><div class='del'>-#define GATE_SCLK_TV		0xc824</div><div class='del'>-#define GATE_SCLK_MFC		0xc828</div><div class='del'>-#define GATE_SCLK_G3D		0xc82c</div><div class='del'>-#define GATE_SCLK_LCD		0xc834</div><div class='del'>-#define GATE_SCLK_MAUDIO	0xc83c</div><div class='del'>-#define GATE_SCLK_FSYS		0xc840</div><div class='del'>-#define GATE_SCLK_PERIL		0xc850</div><div class='del'>-#define GATE_IP_CAM		0xc920</div><div class='del'>-#define GATE_IP_TV		0xc924</div><div class='del'>-#define GATE_IP_MFC		0xc928</div><div class='del'>-#define GATE_IP_G3D		0xc92c</div><div class='del'>-#define GATE_IP_LCD		0xc934</div><div class='del'>-#define GATE_IP_FSYS		0xc940</div><div class='del'>-#define GATE_IP_PERIL		0xc950</div><div class='del'>-#define GATE_BLOCK		0xc970</div><div class='del'>-#define APLL_LOCK		0x14000</div><div class='del'>-#define APLL_CON0		0x14100</div><div class='del'>-#define SRC_CPU			0x14200</div><div class='del'>-#define DIV_CPU0		0x14500</div><div class='del'>-#define DIV_CPU1		0x14504</div><div class='del'>-</div><div class='del'>-static const unsigned long exynos4415_cmu_clk_regs[] __initconst = {</div><div class='del'>-	SRC_LEFTBUS,</div><div class='del'>-	DIV_LEFTBUS,</div><div class='del'>-	GATE_IP_LEFTBUS,</div><div class='del'>-	GATE_IP_IMAGE,</div><div class='del'>-	SRC_RIGHTBUS,</div><div class='del'>-	DIV_RIGHTBUS,</div><div class='del'>-	GATE_IP_RIGHTBUS,</div><div class='del'>-	GATE_IP_PERIR,</div><div class='del'>-	EPLL_LOCK,</div><div class='del'>-	G3D_PLL_LOCK,</div><div class='del'>-	DISP_PLL_LOCK,</div><div class='del'>-	ISP_PLL_LOCK,</div><div class='del'>-	EPLL_CON0,</div><div class='del'>-	EPLL_CON1,</div><div class='del'>-	EPLL_CON2,</div><div class='del'>-	G3D_PLL_CON0,</div><div class='del'>-	G3D_PLL_CON1,</div><div class='del'>-	G3D_PLL_CON2,</div><div class='del'>-	ISP_PLL_CON0,</div><div class='del'>-	ISP_PLL_CON1,</div><div class='del'>-	ISP_PLL_CON2,</div><div class='del'>-	DISP_PLL_CON0,</div><div class='del'>-	DISP_PLL_CON1,</div><div class='del'>-	DISP_PLL_CON2,</div><div class='del'>-	SRC_TOP0,</div><div class='del'>-	SRC_TOP1,</div><div class='del'>-	SRC_CAM,</div><div class='del'>-	SRC_TV,</div><div class='del'>-	SRC_MFC,</div><div class='del'>-	SRC_G3D,</div><div class='del'>-	SRC_LCD,</div><div class='del'>-	SRC_ISP,</div><div class='del'>-	SRC_MAUDIO,</div><div class='del'>-	SRC_FSYS,</div><div class='del'>-	SRC_PERIL0,</div><div class='del'>-	SRC_PERIL1,</div><div class='del'>-	SRC_CAM1,</div><div class='del'>-	SRC_TOP_ISP0,</div><div class='del'>-	SRC_TOP_ISP1,</div><div class='del'>-	SRC_MASK_TOP,</div><div class='del'>-	SRC_MASK_CAM,</div><div class='del'>-	SRC_MASK_TV,</div><div class='del'>-	SRC_MASK_LCD,</div><div class='del'>-	SRC_MASK_ISP,</div><div class='del'>-	SRC_MASK_MAUDIO,</div><div class='del'>-	SRC_MASK_FSYS,</div><div class='del'>-	SRC_MASK_PERIL0,</div><div class='del'>-	SRC_MASK_PERIL1,</div><div class='del'>-	DIV_TOP,</div><div class='del'>-	DIV_CAM,</div><div class='del'>-	DIV_TV,</div><div class='del'>-	DIV_MFC,</div><div class='del'>-	DIV_G3D,</div><div class='del'>-	DIV_LCD,</div><div class='del'>-	DIV_ISP,</div><div class='del'>-	DIV_MAUDIO,</div><div class='del'>-	DIV_FSYS0,</div><div class='del'>-	DIV_FSYS1,</div><div class='del'>-	DIV_FSYS2,</div><div class='del'>-	DIV_PERIL0,</div><div class='del'>-	DIV_PERIL1,</div><div class='del'>-	DIV_PERIL2,</div><div class='del'>-	DIV_PERIL3,</div><div class='del'>-	DIV_PERIL4,</div><div class='del'>-	DIV_PERIL5,</div><div class='del'>-	DIV_CAM1,</div><div class='del'>-	DIV_TOP_ISP1,</div><div class='del'>-	DIV_TOP_ISP0,</div><div class='del'>-	CLKDIV2_RATIO,</div><div class='del'>-	GATE_SCLK_CAM,</div><div class='del'>-	GATE_SCLK_TV,</div><div class='del'>-	GATE_SCLK_MFC,</div><div class='del'>-	GATE_SCLK_G3D,</div><div class='del'>-	GATE_SCLK_LCD,</div><div class='del'>-	GATE_SCLK_MAUDIO,</div><div class='del'>-	GATE_SCLK_FSYS,</div><div class='del'>-	GATE_SCLK_PERIL,</div><div class='del'>-	GATE_IP_CAM,</div><div class='del'>-	GATE_IP_TV,</div><div class='del'>-	GATE_IP_MFC,</div><div class='del'>-	GATE_IP_G3D,</div><div class='del'>-	GATE_IP_LCD,</div><div class='del'>-	GATE_IP_FSYS,</div><div class='del'>-	GATE_IP_PERIL,</div><div class='del'>-	GATE_BLOCK,</div><div class='del'>-	APLL_LOCK,</div><div class='del'>-	APLL_CON0,</div><div class='del'>-	SRC_CPU,</div><div class='del'>-	DIV_CPU0,</div><div class='del'>-	DIV_CPU1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* list of all parent clock list */</div><div class='del'>-PNAME(mout_g3d_pllsrc_p)	= { "fin_pll", };</div><div class='del'>-</div><div class='del'>-PNAME(mout_apll_p)		= { "fin_pll", "fout_apll", };</div><div class='del'>-PNAME(mout_g3d_pll_p)		= { "fin_pll", "fout_g3d_pll", };</div><div class='del'>-PNAME(mout_isp_pll_p)		= { "fin_pll", "fout_isp_pll", };</div><div class='del'>-PNAME(mout_disp_pll_p)		= { "fin_pll", "fout_disp_pll", };</div><div class='del'>-</div><div class='del'>-PNAME(mout_mpll_user_p)		= { "fin_pll", "div_mpll_pre", };</div><div class='del'>-PNAME(mout_epll_p)		= { "fin_pll", "fout_epll", };</div><div class='del'>-PNAME(mout_core_p)		= { "mout_apll", "mout_mpll_user_c", };</div><div class='del'>-PNAME(mout_hpm_p)		= { "mout_apll", "mout_mpll_user_c", };</div><div class='del'>-</div><div class='del'>-PNAME(mout_ebi_p)		= { "div_aclk_200", "div_aclk_160", };</div><div class='del'>-PNAME(mout_ebi_1_p)		= { "mout_ebi", "mout_g3d_pll", };</div><div class='del'>-</div><div class='del'>-PNAME(mout_gdl_p)		= { "mout_mpll_user_l", };</div><div class='del'>-PNAME(mout_gdr_p)		= { "mout_mpll_user_r", };</div><div class='del'>-</div><div class='del'>-PNAME(mout_aclk_266_p)		= { "mout_mpll_user_t", "mout_g3d_pll", };</div><div class='del'>-</div><div class='del'>-PNAME(group_epll_g3dpll_p)	= { "mout_epll", "mout_g3d_pll" };</div><div class='del'>-PNAME(group_sclk_p)		= { "xxti", "xusbxti",</div><div class='del'>-				    "none", "mout_isp_pll",</div><div class='del'>-				    "none", "none", "div_mpll_pre",</div><div class='del'>-				    "mout_epll", "mout_g3d_pll", };</div><div class='del'>-PNAME(group_spdif_p)		= { "mout_audio0", "mout_audio1",</div><div class='del'>-				    "mout_audio2", "spdif_extclk", };</div><div class='del'>-PNAME(group_sclk_audio2_p)	= { "audiocdclk2", "none",</div><div class='del'>-				    "none", "mout_isp_pll",</div><div class='del'>-				    "mout_disp_pll", "xusbxti",</div><div class='del'>-				    "div_mpll_pre", "mout_epll",</div><div class='del'>-				    "mout_g3d_pll", };</div><div class='del'>-PNAME(group_sclk_audio1_p)	= { "audiocdclk1", "none",</div><div class='del'>-				    "none", "mout_isp_pll",</div><div class='del'>-				    "mout_disp_pll", "xusbxti",</div><div class='del'>-				    "div_mpll_pre", "mout_epll",</div><div class='del'>-				    "mout_g3d_pll", };</div><div class='del'>-PNAME(group_sclk_audio0_p)	= { "audiocdclk0", "none",</div><div class='del'>-				    "none", "mout_isp_pll",</div><div class='del'>-				    "mout_disp_pll", "xusbxti",</div><div class='del'>-				    "div_mpll_pre", "mout_epll",</div><div class='del'>-				    "mout_g3d_pll", };</div><div class='del'>-PNAME(group_fimc_lclk_p)	= { "xxti", "xusbxti",</div><div class='del'>-				    "none", "mout_isp_pll",</div><div class='del'>-				    "none", "mout_disp_pll",</div><div class='del'>-				    "mout_mpll_user_t", "mout_epll",</div><div class='del'>-				    "mout_g3d_pll", };</div><div class='del'>-PNAME(group_sclk_fimd0_p)	= { "xxti", "xusbxti",</div><div class='del'>-				    "m_bitclkhsdiv4_4l", "mout_isp_pll",</div><div class='del'>-				    "mout_disp_pll", "sclk_hdmiphy",</div><div class='del'>-				    "div_mpll_pre", "mout_epll",</div><div class='del'>-				    "mout_g3d_pll", };</div><div class='del'>-PNAME(mout_hdmi_p)		= { "sclk_pixel", "sclk_hdmiphy" };</div><div class='del'>-PNAME(mout_mfc_p)		= { "mout_mfc_0", "mout_mfc_1" };</div><div class='del'>-PNAME(mout_g3d_p)		= { "mout_g3d_0", "mout_g3d_1" };</div><div class='del'>-PNAME(mout_jpeg_p)		= { "mout_jpeg_0", "mout_jpeg_1" };</div><div class='del'>-PNAME(mout_jpeg1_p)		= { "mout_epll", "mout_g3d_pll" };</div><div class='del'>-PNAME(group_aclk_isp0_300_p)	= { "mout_isp_pll", "div_mpll_pre" };</div><div class='del'>-PNAME(group_aclk_isp0_400_user_p) = { "fin_pll", "div_aclk_400_mcuisp" };</div><div class='del'>-PNAME(group_aclk_isp0_300_user_p) = { "fin_pll", "mout_aclk_isp0_300" };</div><div class='del'>-PNAME(group_aclk_isp1_300_user_p) = { "fin_pll", "mout_aclk_isp1_300" };</div><div class='del'>-PNAME(group_mout_mpll_user_t_p)	= { "mout_mpll_user_t" };</div><div class='del'>-</div><div class='del'>-static const struct samsung_fixed_factor_clock exynos4415_fixed_factor_clks[] __initconst = {</div><div class='del'>-	/* HACK: fin_pll hardcoded to xusbxti until detection is implemented. */</div><div class='del'>-	FFACTOR(CLK_FIN_PLL, "fin_pll", "xusbxti", 1, 1, 0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct samsung_fixed_rate_clock exynos4415_fixed_rate_clks[] __initconst = {</div><div class='del'>-	FRATE(CLK_SCLK_HDMIPHY, "sclk_hdmiphy", NULL, 0, 27000000),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct samsung_mux_clock exynos4415_mux_clks[] __initconst = {</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE: Following table is sorted by register address in ascending</div><div class='del'>-	 * order and then bitfield shift in descending order, as it is done</div><div class='del'>-	 * in the User's Manual. When adding new entries, please make sure</div><div class='del'>-	 * that the order is preserved, to avoid merge conflicts and make</div><div class='del'>-	 * further work with defined data easier.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* SRC_LEFTBUS */</div><div class='del'>-	MUX(CLK_MOUT_MPLL_USER_L, "mout_mpll_user_l", mout_mpll_user_p,</div><div class='del'>-		SRC_LEFTBUS, 4, 1),</div><div class='del'>-	MUX(CLK_MOUT_GDL, "mout_gdl", mout_gdl_p, SRC_LEFTBUS, 0, 1),</div><div class='del'>-</div><div class='del'>-	/* SRC_RIGHTBUS */</div><div class='del'>-	MUX(CLK_MOUT_MPLL_USER_R, "mout_mpll_user_r", mout_mpll_user_p,</div><div class='del'>-		SRC_RIGHTBUS, 4, 1),</div><div class='del'>-	MUX(CLK_MOUT_GDR, "mout_gdr", mout_gdr_p, SRC_RIGHTBUS, 0, 1),</div><div class='del'>-</div><div class='del'>-	/* SRC_TOP0 */</div><div class='del'>-	MUX(CLK_MOUT_EBI, "mout_ebi", mout_ebi_p, SRC_TOP0, 28, 1),</div><div class='del'>-	MUX(CLK_MOUT_ACLK_200, "mout_aclk_200", group_mout_mpll_user_t_p,</div><div class='del'>-		SRC_TOP0, 24, 1),</div><div class='del'>-	MUX(CLK_MOUT_ACLK_160, "mout_aclk_160", group_mout_mpll_user_t_p,</div><div class='del'>-		SRC_TOP0, 20, 1),</div><div class='del'>-	MUX(CLK_MOUT_ACLK_100, "mout_aclk_100", group_mout_mpll_user_t_p,</div><div class='del'>-		SRC_TOP0, 16, 1),</div><div class='del'>-	MUX(CLK_MOUT_ACLK_266, "mout_aclk_266", mout_aclk_266_p,</div><div class='del'>-		SRC_TOP0, 12, 1),</div><div class='del'>-	MUX(CLK_MOUT_G3D_PLL, "mout_g3d_pll", mout_g3d_pll_p,</div><div class='del'>-		SRC_TOP0, 8, 1),</div><div class='del'>-	MUX(CLK_MOUT_EPLL, "mout_epll", mout_epll_p, SRC_TOP0, 4, 1),</div><div class='del'>-	MUX(CLK_MOUT_EBI_1, "mout_ebi_1", mout_ebi_1_p, SRC_TOP0, 0, 1),</div><div class='del'>-</div><div class='del'>-	/* SRC_TOP1 */</div><div class='del'>-	MUX(CLK_MOUT_ISP_PLL, "mout_isp_pll", mout_isp_pll_p,</div><div class='del'>-		SRC_TOP1, 28, 1),</div><div class='del'>-	MUX(CLK_MOUT_DISP_PLL, "mout_disp_pll", mout_disp_pll_p,</div><div class='del'>-		SRC_TOP1, 16, 1),</div><div class='del'>-	MUX(CLK_MOUT_MPLL_USER_T, "mout_mpll_user_t", mout_mpll_user_p,</div><div class='del'>-		SRC_TOP1, 12, 1),</div><div class='del'>-	MUX(CLK_MOUT_ACLK_400_MCUISP, "mout_aclk_400_mcuisp",</div><div class='del'>-		group_mout_mpll_user_t_p, SRC_TOP1, 8, 1),</div><div class='del'>-	MUX(CLK_MOUT_G3D_PLLSRC, "mout_g3d_pllsrc", mout_g3d_pllsrc_p,</div><div class='del'>-		SRC_TOP1, 0, 1),</div><div class='del'>-</div><div class='del'>-	/* SRC_CAM */</div><div class='del'>-	MUX(CLK_MOUT_CSIS1, "mout_csis1", group_fimc_lclk_p, SRC_CAM, 28, 4),</div><div class='del'>-	MUX(CLK_MOUT_CSIS0, "mout_csis0", group_fimc_lclk_p, SRC_CAM, 24, 4),</div><div class='del'>-	MUX(CLK_MOUT_CAM1, "mout_cam1", group_fimc_lclk_p, SRC_CAM, 20, 4),</div><div class='del'>-	MUX(CLK_MOUT_FIMC3_LCLK, "mout_fimc3_lclk", group_fimc_lclk_p, SRC_CAM,</div><div class='del'>-		12, 4),</div><div class='del'>-	MUX(CLK_MOUT_FIMC2_LCLK, "mout_fimc2_lclk", group_fimc_lclk_p, SRC_CAM,</div><div class='del'>-		8, 4),</div><div class='del'>-	MUX(CLK_MOUT_FIMC1_LCLK, "mout_fimc1_lclk", group_fimc_lclk_p, SRC_CAM,</div><div class='del'>-		4, 4),</div><div class='del'>-	MUX(CLK_MOUT_FIMC0_LCLK, "mout_fimc0_lclk", group_fimc_lclk_p, SRC_CAM,</div><div class='del'>-		0, 4),</div><div class='del'>-</div><div class='del'>-	/* SRC_TV */</div><div class='del'>-	MUX(CLK_MOUT_HDMI, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1),</div><div class='del'>-</div><div class='del'>-	/* SRC_MFC */</div><div class='del'>-	MUX(CLK_MOUT_MFC, "mout_mfc", mout_mfc_p, SRC_MFC, 8, 1),</div><div class='del'>-	MUX(CLK_MOUT_MFC_1, "mout_mfc_1", group_epll_g3dpll_p, SRC_MFC, 4, 1),</div><div class='del'>-	MUX(CLK_MOUT_MFC_0, "mout_mfc_0", group_mout_mpll_user_t_p, SRC_MFC, 0,</div><div class='del'>-		1),</div><div class='del'>-</div><div class='del'>-	/* SRC_G3D */</div><div class='del'>-	MUX(CLK_MOUT_G3D, "mout_g3d", mout_g3d_p, SRC_G3D, 8, 1),</div><div class='del'>-	MUX(CLK_MOUT_G3D_1, "mout_g3d_1", group_epll_g3dpll_p, SRC_G3D, 4, 1),</div><div class='del'>-	MUX(CLK_MOUT_G3D_0, "mout_g3d_0", group_mout_mpll_user_t_p, SRC_G3D, 0,</div><div class='del'>-		1),</div><div class='del'>-</div><div class='del'>-	/* SRC_LCD */</div><div class='del'>-	MUX(CLK_MOUT_MIPI0, "mout_mipi0", group_fimc_lclk_p, SRC_LCD, 12, 4),</div><div class='del'>-	MUX(CLK_MOUT_FIMD0, "mout_fimd0", group_sclk_fimd0_p, SRC_LCD, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* SRC_ISP */</div><div class='del'>-	MUX(CLK_MOUT_TSADC_ISP, "mout_tsadc_isp", group_fimc_lclk_p, SRC_ISP,</div><div class='del'>-		16, 4),</div><div class='del'>-	MUX(CLK_MOUT_UART_ISP, "mout_uart_isp", group_fimc_lclk_p, SRC_ISP,</div><div class='del'>-		12, 4),</div><div class='del'>-	MUX(CLK_MOUT_SPI1_ISP, "mout_spi1_isp", group_fimc_lclk_p, SRC_ISP,</div><div class='del'>-		8, 4),</div><div class='del'>-	MUX(CLK_MOUT_SPI0_ISP, "mout_spi0_isp", group_fimc_lclk_p, SRC_ISP,</div><div class='del'>-		4, 4),</div><div class='del'>-	MUX(CLK_MOUT_PWM_ISP, "mout_pwm_isp", group_fimc_lclk_p, SRC_ISP,</div><div class='del'>-		0, 4),</div><div class='del'>-</div><div class='del'>-	/* SRC_MAUDIO */</div><div class='del'>-	MUX(CLK_MOUT_AUDIO0, "mout_audio0", group_sclk_audio0_p, SRC_MAUDIO,</div><div class='del'>-		0, 4),</div><div class='del'>-</div><div class='del'>-	/* SRC_FSYS */</div><div class='del'>-	MUX(CLK_MOUT_TSADC, "mout_tsadc", group_sclk_p, SRC_FSYS, 28, 4),</div><div class='del'>-	MUX(CLK_MOUT_MMC2, "mout_mmc2", group_sclk_p, SRC_FSYS, 8, 4),</div><div class='del'>-	MUX(CLK_MOUT_MMC1, "mout_mmc1", group_sclk_p, SRC_FSYS, 4, 4),</div><div class='del'>-	MUX(CLK_MOUT_MMC0, "mout_mmc0", group_sclk_p, SRC_FSYS, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* SRC_PERIL0 */</div><div class='del'>-	MUX(CLK_MOUT_UART3, "mout_uart3", group_sclk_p, SRC_PERIL0, 12, 4),</div><div class='del'>-	MUX(CLK_MOUT_UART2, "mout_uart2", group_sclk_p, SRC_PERIL0, 8, 4),</div><div class='del'>-	MUX(CLK_MOUT_UART1, "mout_uart1", group_sclk_p, SRC_PERIL0, 4, 4),</div><div class='del'>-	MUX(CLK_MOUT_UART0, "mout_uart0", group_sclk_p, SRC_PERIL0, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* SRC_PERIL1 */</div><div class='del'>-	MUX(CLK_MOUT_SPI2, "mout_spi2", group_sclk_p, SRC_PERIL1, 24, 4),</div><div class='del'>-	MUX(CLK_MOUT_SPI1, "mout_spi1", group_sclk_p, SRC_PERIL1, 20, 4),</div><div class='del'>-	MUX(CLK_MOUT_SPI0, "mout_spi0", group_sclk_p, SRC_PERIL1, 16, 4),</div><div class='del'>-	MUX(CLK_MOUT_SPDIF, "mout_spdif", group_spdif_p, SRC_PERIL1, 8, 4),</div><div class='del'>-	MUX(CLK_MOUT_AUDIO2, "mout_audio2", group_sclk_audio2_p, SRC_PERIL1,</div><div class='del'>-		4, 4),</div><div class='del'>-	MUX(CLK_MOUT_AUDIO1, "mout_audio1", group_sclk_audio1_p, SRC_PERIL1,</div><div class='del'>-		0, 4),</div><div class='del'>-</div><div class='del'>-	/* SRC_CPU */</div><div class='del'>-	MUX(CLK_MOUT_MPLL_USER_C, "mout_mpll_user_c", mout_mpll_user_p,</div><div class='del'>-		SRC_CPU, 24, 1),</div><div class='del'>-	MUX(CLK_MOUT_HPM, "mout_hpm", mout_hpm_p, SRC_CPU, 20, 1),</div><div class='del'>-	MUX_F(CLK_MOUT_CORE, "mout_core", mout_core_p, SRC_CPU, 16, 1, 0,</div><div class='del'>-		CLK_MUX_READ_ONLY),</div><div class='del'>-	MUX_F(CLK_MOUT_APLL, "mout_apll", mout_apll_p, SRC_CPU, 0, 1,</div><div class='del'>-		CLK_SET_RATE_PARENT, 0),</div><div class='del'>-</div><div class='del'>-	/* SRC_CAM1 */</div><div class='del'>-	MUX(CLK_MOUT_PXLASYNC_CSIS1_FIMC, "mout_pxlasync_csis1",</div><div class='del'>-		group_fimc_lclk_p, SRC_CAM1, 20, 1),</div><div class='del'>-	MUX(CLK_MOUT_PXLASYNC_CSIS0_FIMC, "mout_pxlasync_csis0",</div><div class='del'>-		group_fimc_lclk_p, SRC_CAM1, 16, 1),</div><div class='del'>-	MUX(CLK_MOUT_JPEG, "mout_jpeg", mout_jpeg_p, SRC_CAM1, 8, 1),</div><div class='del'>-	MUX(CLK_MOUT_JPEG1, "mout_jpeg_1", mout_jpeg1_p, SRC_CAM1, 4, 1),</div><div class='del'>-	MUX(CLK_MOUT_JPEG0, "mout_jpeg_0", group_mout_mpll_user_t_p, SRC_CAM1,</div><div class='del'>-		0, 1),</div><div class='del'>-</div><div class='del'>-	/* SRC_TOP_ISP0 */</div><div class='del'>-	MUX(CLK_MOUT_ACLK_ISP0_300, "mout_aclk_isp0_300",</div><div class='del'>-		group_aclk_isp0_300_p, SRC_TOP_ISP0, 8, 1),</div><div class='del'>-	MUX(CLK_MOUT_ACLK_ISP0_400, "mout_aclk_isp0_400_user",</div><div class='del'>-		group_aclk_isp0_400_user_p, SRC_TOP_ISP0, 4, 1),</div><div class='del'>-	MUX(CLK_MOUT_ACLK_ISP0_300_USER, "mout_aclk_isp0_300_user",</div><div class='del'>-		group_aclk_isp0_300_user_p, SRC_TOP_ISP0, 0, 1),</div><div class='del'>-</div><div class='del'>-	/* SRC_TOP_ISP1 */</div><div class='del'>-	MUX(CLK_MOUT_ACLK_ISP1_300, "mout_aclk_isp1_300",</div><div class='del'>-		group_aclk_isp0_300_p, SRC_TOP_ISP1, 4, 1),</div><div class='del'>-	MUX(CLK_MOUT_ACLK_ISP1_300_USER, "mout_aclk_isp1_300_user",</div><div class='del'>-		group_aclk_isp1_300_user_p, SRC_TOP_ISP1, 0, 1),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct samsung_div_clock exynos4415_div_clks[] __initconst = {</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE: Following table is sorted by register address in ascending</div><div class='del'>-	 * order and then bitfield shift in descending order, as it is done</div><div class='del'>-	 * in the User's Manual. When adding new entries, please make sure</div><div class='del'>-	 * that the order is preserved, to avoid merge conflicts and make</div><div class='del'>-	 * further work with defined data easier.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* DIV_LEFTBUS */</div><div class='del'>-	DIV(CLK_DIV_GPL, "div_gpl", "div_gdl", DIV_LEFTBUS, 4, 3),</div><div class='del'>-	DIV(CLK_DIV_GDL, "div_gdl", "mout_gdl", DIV_LEFTBUS, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_RIGHTBUS */</div><div class='del'>-	DIV(CLK_DIV_GPR, "div_gpr", "div_gdr", DIV_RIGHTBUS, 4, 3),</div><div class='del'>-	DIV(CLK_DIV_GDR, "div_gdr", "mout_gdr", DIV_RIGHTBUS, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_TOP */</div><div class='del'>-	DIV(CLK_DIV_ACLK_400_MCUISP, "div_aclk_400_mcuisp",</div><div class='del'>-		"mout_aclk_400_mcuisp", DIV_TOP, 24, 3),</div><div class='del'>-	DIV(CLK_DIV_EBI, "div_ebi", "mout_ebi_1", DIV_TOP, 16, 3),</div><div class='del'>-	DIV(CLK_DIV_ACLK_200, "div_aclk_200", "mout_aclk_200", DIV_TOP, 12, 3),</div><div class='del'>-	DIV(CLK_DIV_ACLK_160, "div_aclk_160", "mout_aclk_160", DIV_TOP, 8, 3),</div><div class='del'>-	DIV(CLK_DIV_ACLK_100, "div_aclk_100", "mout_aclk_100", DIV_TOP, 4, 4),</div><div class='del'>-	DIV(CLK_DIV_ACLK_266, "div_aclk_266", "mout_aclk_266", DIV_TOP, 0, 3),</div><div class='del'>-</div><div class='del'>-	/* DIV_CAM */</div><div class='del'>-	DIV(CLK_DIV_CSIS1, "div_csis1", "mout_csis1", DIV_CAM, 28, 4),</div><div class='del'>-	DIV(CLK_DIV_CSIS0, "div_csis0", "mout_csis0", DIV_CAM, 24, 4),</div><div class='del'>-	DIV(CLK_DIV_CAM1, "div_cam1", "mout_cam1", DIV_CAM, 20, 4),</div><div class='del'>-	DIV(CLK_DIV_FIMC3_LCLK, "div_fimc3_lclk", "mout_fimc3_lclk", DIV_CAM,</div><div class='del'>-		12, 4),</div><div class='del'>-	DIV(CLK_DIV_FIMC2_LCLK, "div_fimc2_lclk", "mout_fimc2_lclk", DIV_CAM,</div><div class='del'>-		8, 4),</div><div class='del'>-	DIV(CLK_DIV_FIMC1_LCLK, "div_fimc1_lclk", "mout_fimc1_lclk", DIV_CAM,</div><div class='del'>-		4, 4),</div><div class='del'>-	DIV(CLK_DIV_FIMC0_LCLK, "div_fimc0_lclk", "mout_fimc0_lclk", DIV_CAM,</div><div class='del'>-		0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_TV */</div><div class='del'>-	DIV(CLK_DIV_TV_BLK, "div_tv_blk", "mout_g3d_pll", DIV_TV, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_MFC */</div><div class='del'>-	DIV(CLK_DIV_MFC, "div_mfc", "mout_mfc", DIV_MFC, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_G3D */</div><div class='del'>-	DIV(CLK_DIV_G3D, "div_g3d", "mout_g3d", DIV_G3D, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_LCD */</div><div class='del'>-	DIV_F(CLK_DIV_MIPI0_PRE, "div_mipi0_pre", "div_mipi0", DIV_LCD, 20, 4,</div><div class='del'>-		CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	DIV(CLK_DIV_MIPI0, "div_mipi0", "mout_mipi0", DIV_LCD, 16, 4),</div><div class='del'>-	DIV(CLK_DIV_FIMD0, "div_fimd0", "mout_fimd0", DIV_LCD, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_ISP */</div><div class='del'>-	DIV(CLK_DIV_UART_ISP, "div_uart_isp", "mout_uart_isp", DIV_ISP, 28, 4),</div><div class='del'>-	DIV_F(CLK_DIV_SPI1_ISP_PRE, "div_spi1_isp_pre", "div_spi1_isp",</div><div class='del'>-		DIV_ISP, 20, 8, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	DIV(CLK_DIV_SPI1_ISP, "div_spi1_isp", "mout_spi1_isp", DIV_ISP, 16, 4),</div><div class='del'>-	DIV_F(CLK_DIV_SPI0_ISP_PRE, "div_spi0_isp_pre", "div_spi0_isp",</div><div class='del'>-		DIV_ISP, 8, 8, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	DIV(CLK_DIV_SPI0_ISP, "div_spi0_isp", "mout_spi0_isp", DIV_ISP, 4, 4),</div><div class='del'>-	DIV(CLK_DIV_PWM_ISP, "div_pwm_isp", "mout_pwm_isp", DIV_ISP, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_MAUDIO */</div><div class='del'>-	DIV(CLK_DIV_PCM0, "div_pcm0", "div_audio0", DIV_MAUDIO, 4, 8),</div><div class='del'>-	DIV(CLK_DIV_AUDIO0, "div_audio0", "mout_audio0", DIV_MAUDIO, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_FSYS0 */</div><div class='del'>-	DIV_F(CLK_DIV_TSADC_PRE, "div_tsadc_pre", "div_tsadc", DIV_FSYS0, 8, 8,</div><div class='del'>-		CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	DIV(CLK_DIV_TSADC, "div_tsadc", "mout_tsadc", DIV_FSYS0, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_FSYS1 */</div><div class='del'>-	DIV_F(CLK_DIV_MMC1_PRE, "div_mmc1_pre", "div_mmc1", DIV_FSYS1, 24, 8,</div><div class='del'>-		CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	DIV(CLK_DIV_MMC1, "div_mmc1", "mout_mmc1", DIV_FSYS1, 16, 4),</div><div class='del'>-	DIV_F(CLK_DIV_MMC0_PRE, "div_mmc0_pre", "div_mmc0", DIV_FSYS1, 8, 8,</div><div class='del'>-		CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	DIV(CLK_DIV_MMC0, "div_mmc0", "mout_mmc0", DIV_FSYS1, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_FSYS2 */</div><div class='del'>-	DIV_F(CLK_DIV_MMC2_PRE, "div_mmc2_pre", "div_mmc2", DIV_FSYS2, 8, 8,</div><div class='del'>-		CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	DIV_F(CLK_DIV_MMC2_PRE, "div_mmc2", "mout_mmc2", DIV_FSYS2, 0, 4,</div><div class='del'>-		CLK_SET_RATE_PARENT, 0),</div><div class='del'>-</div><div class='del'>-	/* DIV_PERIL0 */</div><div class='del'>-	DIV(CLK_DIV_UART3, "div_uart3", "mout_uart3", DIV_PERIL0, 12, 4),</div><div class='del'>-	DIV(CLK_DIV_UART2, "div_uart2", "mout_uart2", DIV_PERIL0, 8, 4),</div><div class='del'>-	DIV(CLK_DIV_UART1, "div_uart1", "mout_uart1", DIV_PERIL0, 4, 4),</div><div class='del'>-	DIV(CLK_DIV_UART0, "div_uart0", "mout_uart0", DIV_PERIL0, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_PERIL1 */</div><div class='del'>-	DIV_F(CLK_DIV_SPI1_PRE, "div_spi1_pre", "div_spi1", DIV_PERIL1, 24, 8,</div><div class='del'>-		CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	DIV(CLK_DIV_SPI1, "div_spi1", "mout_spi1", DIV_PERIL1, 16, 4),</div><div class='del'>-	DIV_F(CLK_DIV_SPI0_PRE, "div_spi0_pre", "div_spi0", DIV_PERIL1, 8, 8,</div><div class='del'>-		CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	DIV(CLK_DIV_SPI0, "div_spi0", "mout_spi0", DIV_PERIL1, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_PERIL2 */</div><div class='del'>-	DIV_F(CLK_DIV_SPI2_PRE, "div_spi2_pre", "div_spi2", DIV_PERIL2, 8, 8,</div><div class='del'>-		CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	DIV(CLK_DIV_SPI2, "div_spi2", "mout_spi2", DIV_PERIL2, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_PERIL4 */</div><div class='del'>-	DIV(CLK_DIV_PCM2, "div_pcm2", "div_audio2", DIV_PERIL4, 20, 8),</div><div class='del'>-	DIV(CLK_DIV_AUDIO2, "div_audio2", "mout_audio2", DIV_PERIL4, 16, 4),</div><div class='del'>-	DIV(CLK_DIV_PCM1, "div_pcm1", "div_audio1", DIV_PERIL4, 20, 8),</div><div class='del'>-	DIV(CLK_DIV_AUDIO1, "div_audio1", "mout_audio1", DIV_PERIL4, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_PERIL5 */</div><div class='del'>-	DIV(CLK_DIV_I2S1, "div_i2s1", "div_audio1", DIV_PERIL5, 0, 6),</div><div class='del'>-</div><div class='del'>-	/* DIV_CAM1 */</div><div class='del'>-	DIV(CLK_DIV_PXLASYNC_CSIS1_FIMC, "div_pxlasync_csis1_fimc",</div><div class='del'>-		"mout_pxlasync_csis1", DIV_CAM1, 24, 4),</div><div class='del'>-	DIV(CLK_DIV_PXLASYNC_CSIS0_FIMC, "div_pxlasync_csis0_fimc",</div><div class='del'>-		"mout_pxlasync_csis0", DIV_CAM1, 20, 4),</div><div class='del'>-	DIV(CLK_DIV_JPEG, "div_jpeg", "mout_jpeg", DIV_CAM1, 0, 4),</div><div class='del'>-</div><div class='del'>-	/* DIV_CPU0 */</div><div class='del'>-	DIV(CLK_DIV_CORE2, "div_core2", "div_core", DIV_CPU0, 28, 3),</div><div class='del'>-	DIV_F(CLK_DIV_APLL, "div_apll", "mout_apll", DIV_CPU0, 24, 3,</div><div class='del'>-			CLK_GET_RATE_NOCACHE, CLK_DIVIDER_READ_ONLY),</div><div class='del'>-	DIV(CLK_DIV_PCLK_DBG, "div_pclk_dbg", "div_core2", DIV_CPU0, 20, 3),</div><div class='del'>-	DIV(CLK_DIV_ATB, "div_atb", "div_core2", DIV_CPU0, 16, 3),</div><div class='del'>-	DIV(CLK_DIV_PERIPH, "div_periph", "div_core2", DIV_CPU0, 12, 3),</div><div class='del'>-	DIV(CLK_DIV_COREM1, "div_corem1", "div_core2", DIV_CPU0, 8, 3),</div><div class='del'>-	DIV(CLK_DIV_COREM0, "div_corem0", "div_core2", DIV_CPU0, 4, 3),</div><div class='del'>-	DIV_F(CLK_DIV_CORE, "div_core", "mout_core", DIV_CPU0, 0, 3,</div><div class='del'>-		CLK_GET_RATE_NOCACHE, CLK_DIVIDER_READ_ONLY),</div><div class='del'>-</div><div class='del'>-	/* DIV_CPU1 */</div><div class='del'>-	DIV(CLK_DIV_HPM, "div_hpm", "div_copy", DIV_CPU1, 4, 3),</div><div class='del'>-	DIV(CLK_DIV_COPY, "div_copy", "mout_hpm", DIV_CPU1, 0, 3),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct samsung_gate_clock exynos4415_gate_clks[] __initconst = {</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE: Following table is sorted by register address in ascending</div><div class='del'>-	 * order and then bitfield shift in descending order, as it is done</div><div class='del'>-	 * in the User's Manual. When adding new entries, please make sure</div><div class='del'>-	 * that the order is preserved, to avoid merge conflicts and make</div><div class='del'>-	 * further work with defined data easier.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* GATE_IP_LEFTBUS */</div><div class='del'>-	GATE(CLK_ASYNC_G3D, "async_g3d", "div_aclk_100", GATE_IP_LEFTBUS, 6,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_ASYNC_MFCL, "async_mfcl", "div_aclk_100", GATE_IP_LEFTBUS, 4,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_ASYNC_TVX, "async_tvx", "div_aclk_100", GATE_IP_LEFTBUS, 3,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_PPMULEFT, "ppmuleft", "div_aclk_100", GATE_IP_LEFTBUS, 1,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_GPIO_LEFT, "gpio_left", "div_aclk_100", GATE_IP_LEFTBUS, 0,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_IP_IMAGE */</div><div class='del'>-	GATE(CLK_PPMUIMAGE, "ppmuimage", "div_aclk_100", GATE_IP_IMAGE,</div><div class='del'>-		9, 0, 0),</div><div class='del'>-	GATE(CLK_QEMDMA2, "qe_mdma2", "div_aclk_100", GATE_IP_IMAGE,</div><div class='del'>-		8, 0, 0),</div><div class='del'>-	GATE(CLK_QEROTATOR, "qe_rotator", "div_aclk_100", GATE_IP_IMAGE,</div><div class='del'>-		7, 0, 0),</div><div class='del'>-	GATE(CLK_SMMUMDMA2, "smmu_mdam2", "div_aclk_100", GATE_IP_IMAGE,</div><div class='del'>-		5, 0, 0),</div><div class='del'>-	GATE(CLK_SMMUROTATOR, "smmu_rotator", "div_aclk_100", GATE_IP_IMAGE,</div><div class='del'>-		4, 0, 0),</div><div class='del'>-	GATE(CLK_MDMA2, "mdma2", "div_aclk_100", GATE_IP_IMAGE, 2, 0, 0),</div><div class='del'>-	GATE(CLK_ROTATOR, "rotator", "div_aclk_100", GATE_IP_IMAGE, 1, 0, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_IP_RIGHTBUS */</div><div class='del'>-	GATE(CLK_ASYNC_ISPMX, "async_ispmx", "div_aclk_100",</div><div class='del'>-		GATE_IP_RIGHTBUS, 9, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_ASYNC_MAUDIOX, "async_maudiox", "div_aclk_100",</div><div class='del'>-		GATE_IP_RIGHTBUS, 7, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_ASYNC_MFCR, "async_mfcr", "div_aclk_100",</div><div class='del'>-		GATE_IP_RIGHTBUS, 6, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_ASYNC_FSYSD, "async_fsysd", "div_aclk_100",</div><div class='del'>-		GATE_IP_RIGHTBUS, 5, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_ASYNC_LCD0X, "async_lcd0x", "div_aclk_100",</div><div class='del'>-		GATE_IP_RIGHTBUS, 3, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_ASYNC_CAMX, "async_camx", "div_aclk_100",</div><div class='del'>-		GATE_IP_RIGHTBUS, 2, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_PPMURIGHT, "ppmuright", "div_aclk_100",</div><div class='del'>-		GATE_IP_RIGHTBUS, 1, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_GPIO_RIGHT, "gpio_right", "div_aclk_100",</div><div class='del'>-		GATE_IP_RIGHTBUS, 0, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_IP_PERIR */</div><div class='del'>-	GATE(CLK_ANTIRBK_APBIF, "antirbk_apbif", "div_aclk_100",</div><div class='del'>-		GATE_IP_PERIR, 24, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_EFUSE_WRITER_APBIF, "efuse_writer_apbif", "div_aclk_100",</div><div class='del'>-		GATE_IP_PERIR, 23, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_MONOCNT, "monocnt", "div_aclk_100", GATE_IP_PERIR, 22,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_TZPC6, "tzpc6", "div_aclk_100", GATE_IP_PERIR, 21,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_PROVISIONKEY1, "provisionkey1", "div_aclk_100",</div><div class='del'>-		GATE_IP_PERIR, 20, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_PROVISIONKEY0, "provisionkey0", "div_aclk_100",</div><div class='del'>-		GATE_IP_PERIR, 19, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_CMU_ISPPART, "cmu_isppart", "div_aclk_100", GATE_IP_PERIR, 18,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_TMU_APBIF, "tmu_apbif", "div_aclk_100",</div><div class='del'>-		GATE_IP_PERIR, 17, 0, 0),</div><div class='del'>-	GATE(CLK_KEYIF, "keyif", "div_aclk_100", GATE_IP_PERIR, 16, 0, 0),</div><div class='del'>-	GATE(CLK_RTC, "rtc", "div_aclk_100", GATE_IP_PERIR, 15, 0, 0),</div><div class='del'>-	GATE(CLK_WDT, "wdt", "div_aclk_100", GATE_IP_PERIR, 14, 0, 0),</div><div class='del'>-	GATE(CLK_MCT, "mct", "div_aclk_100", GATE_IP_PERIR, 13, 0, 0),</div><div class='del'>-	GATE(CLK_SECKEY, "seckey", "div_aclk_100", GATE_IP_PERIR, 12,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_HDMI_CEC, "hdmi_cec", "div_aclk_100", GATE_IP_PERIR, 11,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_TZPC5, "tzpc5", "div_aclk_100", GATE_IP_PERIR, 10,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_TZPC4, "tzpc4", "div_aclk_100", GATE_IP_PERIR, 9,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_TZPC3, "tzpc3", "div_aclk_100", GATE_IP_PERIR, 8,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_TZPC2, "tzpc2", "div_aclk_100", GATE_IP_PERIR, 7,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_TZPC1, "tzpc1", "div_aclk_100", GATE_IP_PERIR, 6,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_TZPC0, "tzpc0", "div_aclk_100", GATE_IP_PERIR, 5,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_CMU_COREPART, "cmu_corepart", "div_aclk_100", GATE_IP_PERIR, 4,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_CMU_TOPPART, "cmu_toppart", "div_aclk_100", GATE_IP_PERIR, 3,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_PMU_APBIF, "pmu_apbif", "div_aclk_100", GATE_IP_PERIR, 2,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_SYSREG, "sysreg", "div_aclk_100", GATE_IP_PERIR, 1,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_CHIP_ID, "chip_id", "div_aclk_100", GATE_IP_PERIR, 0,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_SCLK_CAM - non-completed */</div><div class='del'>-	GATE(CLK_SCLK_PXLAYSNC_CSIS1_FIMC, "sclk_pxlasync_csis1_fimc",</div><div class='del'>-		"div_pxlasync_csis1_fimc", GATE_SCLK_CAM, 11,</div><div class='del'>-		CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_PXLAYSNC_CSIS0_FIMC, "sclk_pxlasync_csis0_fimc",</div><div class='del'>-		"div_pxlasync_csis0_fimc", GATE_SCLK_CAM,</div><div class='del'>-		10, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_JPEG, "sclk_jpeg", "div_jpeg",</div><div class='del'>-		GATE_SCLK_CAM, 8, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_CSIS1, "sclk_csis1", "div_csis1",</div><div class='del'>-		GATE_SCLK_CAM, 7, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_CSIS0, "sclk_csis0", "div_csis0",</div><div class='del'>-		GATE_SCLK_CAM, 6, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_CAM1, "sclk_cam1", "div_cam1",</div><div class='del'>-		GATE_SCLK_CAM, 5, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_FIMC3_LCLK, "sclk_fimc3_lclk", "div_fimc3_lclk",</div><div class='del'>-		GATE_SCLK_CAM, 3, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_FIMC2_LCLK, "sclk_fimc2_lclk", "div_fimc2_lclk",</div><div class='del'>-		GATE_SCLK_CAM, 2, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_FIMC1_LCLK, "sclk_fimc1_lclk", "div_fimc1_lclk",</div><div class='del'>-		GATE_SCLK_CAM, 1, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_FIMC0_LCLK, "sclk_fimc0_lclk", "div_fimc0_lclk",</div><div class='del'>-		GATE_SCLK_CAM, 0, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_SCLK_TV */</div><div class='del'>-	GATE(CLK_SCLK_PIXEL, "sclk_pixel", "div_tv_blk",</div><div class='del'>-		GATE_SCLK_TV, 3, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_HDMI, "sclk_hdmi", "mout_hdmi",</div><div class='del'>-		GATE_SCLK_TV, 2, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_MIXER, "sclk_mixer", "div_tv_blk",</div><div class='del'>-		GATE_SCLK_TV, 0, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_SCLK_MFC */</div><div class='del'>-	GATE(CLK_SCLK_MFC, "sclk_mfc", "div_mfc",</div><div class='del'>-		GATE_SCLK_MFC, 0, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_SCLK_G3D */</div><div class='del'>-	GATE(CLK_SCLK_G3D, "sclk_g3d", "div_g3d",</div><div class='del'>-		GATE_SCLK_G3D, 0, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_SCLK_LCD */</div><div class='del'>-	GATE(CLK_SCLK_MIPIDPHY4L, "sclk_mipidphy4l", "div_mipi0",</div><div class='del'>-		GATE_SCLK_LCD, 4, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_MIPI0, "sclk_mipi0", "div_mipi0_pre",</div><div class='del'>-		GATE_SCLK_LCD, 3, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_MDNIE0, "sclk_mdnie0", "div_fimd0",</div><div class='del'>-		GATE_SCLK_LCD, 1, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_FIMD0, "sclk_fimd0", "div_fimd0",</div><div class='del'>-		GATE_SCLK_LCD, 0, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_SCLK_MAUDIO */</div><div class='del'>-	GATE(CLK_SCLK_PCM0, "sclk_pcm0", "div_pcm0",</div><div class='del'>-		GATE_SCLK_MAUDIO, 1, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_AUDIO0, "sclk_audio0", "div_audio0",</div><div class='del'>-		GATE_SCLK_MAUDIO, 0, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_SCLK_FSYS */</div><div class='del'>-	GATE(CLK_SCLK_TSADC, "sclk_tsadc", "div_tsadc_pre",</div><div class='del'>-		GATE_SCLK_FSYS, 9, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_EBI, "sclk_ebi", "div_ebi",</div><div class='del'>-		GATE_SCLK_FSYS, 6, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_MMC2, "sclk_mmc2", "div_mmc2_pre",</div><div class='del'>-		GATE_SCLK_FSYS, 2, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_MMC1, "sclk_mmc1", "div_mmc1_pre",</div><div class='del'>-		GATE_SCLK_FSYS, 1, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_MMC0, "sclk_mmc0", "div_mmc0_pre",</div><div class='del'>-		GATE_SCLK_FSYS, 0, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_SCLK_PERIL */</div><div class='del'>-	GATE(CLK_SCLK_I2S, "sclk_i2s1", "div_i2s1",</div><div class='del'>-		GATE_SCLK_PERIL, 18, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_PCM2, "sclk_pcm2", "div_pcm2",</div><div class='del'>-		GATE_SCLK_PERIL, 16, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_PCM1, "sclk_pcm1", "div_pcm1",</div><div class='del'>-		GATE_SCLK_PERIL, 15, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_AUDIO2, "sclk_audio2", "div_audio2",</div><div class='del'>-		GATE_SCLK_PERIL, 14, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_AUDIO1, "sclk_audio1", "div_audio1",</div><div class='del'>-		GATE_SCLK_PERIL, 13, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_SPDIF, "sclk_spdif", "mout_spdif",</div><div class='del'>-		GATE_SCLK_PERIL, 10, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_SPI2, "sclk_spi2", "div_spi2_pre",</div><div class='del'>-		GATE_SCLK_PERIL, 8, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_SPI1, "sclk_spi1", "div_spi1_pre",</div><div class='del'>-		GATE_SCLK_PERIL, 7, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_SPI0, "sclk_spi0", "div_spi0_pre",</div><div class='del'>-		GATE_SCLK_PERIL, 6, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_UART3, "sclk_uart3", "div_uart3",</div><div class='del'>-		GATE_SCLK_PERIL, 3, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_UART2, "sclk_uart2", "div_uart2",</div><div class='del'>-		GATE_SCLK_PERIL, 2, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_UART1, "sclk_uart1", "div_uart1",</div><div class='del'>-		GATE_SCLK_PERIL, 1, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-	GATE(CLK_SCLK_UART0, "sclk_uart0", "div_uart0",</div><div class='del'>-		GATE_SCLK_PERIL, 0, CLK_SET_RATE_PARENT, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_IP_CAM */</div><div class='del'>-	GATE(CLK_SMMUFIMC_LITE2, "smmufimc_lite2", "div_aclk_160", GATE_IP_CAM,</div><div class='del'>-		22, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_FIMC_LITE2, "fimc_lite2", "div_aclk_160", GATE_IP_CAM,</div><div class='del'>-		20, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_PIXELASYNCM1, "pixelasyncm1", "div_aclk_160", GATE_IP_CAM,</div><div class='del'>-		18, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_PIXELASYNCM0, "pixelasyncm0", "div_aclk_160", GATE_IP_CAM,</div><div class='del'>-		17, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_PPMUCAMIF, "ppmucamif", "div_aclk_160", GATE_IP_CAM,</div><div class='del'>-		16, CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_SMMUJPEG, "smmujpeg", "div_aclk_160", GATE_IP_CAM, 11, 0, 0),</div><div class='del'>-	GATE(CLK_SMMUFIMC3, "smmufimc3", "div_aclk_160", GATE_IP_CAM, 10, 0, 0),</div><div class='del'>-	GATE(CLK_SMMUFIMC2, "smmufimc2", "div_aclk_160", GATE_IP_CAM, 9, 0, 0),</div><div class='del'>-	GATE(CLK_SMMUFIMC1, "smmufimc1", "div_aclk_160", GATE_IP_CAM, 8, 0, 0),</div><div class='del'>-	GATE(CLK_SMMUFIMC0, "smmufimc0", "div_aclk_160", GATE_IP_CAM, 7, 0, 0),</div><div class='del'>-	GATE(CLK_JPEG, "jpeg", "div_aclk_160", GATE_IP_CAM, 6, 0, 0),</div><div class='del'>-	GATE(CLK_CSIS1, "csis1", "div_aclk_160", GATE_IP_CAM, 5, 0, 0),</div><div class='del'>-	GATE(CLK_CSIS0, "csis0", "div_aclk_160", GATE_IP_CAM, 4, 0, 0),</div><div class='del'>-	GATE(CLK_FIMC3, "fimc3", "div_aclk_160", GATE_IP_CAM, 3, 0, 0),</div><div class='del'>-	GATE(CLK_FIMC2, "fimc2", "div_aclk_160", GATE_IP_CAM, 2, 0, 0),</div><div class='del'>-	GATE(CLK_FIMC1, "fimc1", "div_aclk_160", GATE_IP_CAM, 1, 0, 0),</div><div class='del'>-	GATE(CLK_FIMC0, "fimc0", "div_aclk_160", GATE_IP_CAM, 0, 0, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_IP_TV */</div><div class='del'>-	GATE(CLK_PPMUTV, "ppmutv", "div_aclk_100", GATE_IP_TV, 5, 0, 0),</div><div class='del'>-	GATE(CLK_SMMUTV, "smmutv", "div_aclk_100", GATE_IP_TV, 4, 0, 0),</div><div class='del'>-	GATE(CLK_HDMI, "hdmi", "div_aclk_100", GATE_IP_TV, 3, 0, 0),</div><div class='del'>-	GATE(CLK_MIXER, "mixer", "div_aclk_100", GATE_IP_TV, 1, 0, 0),</div><div class='del'>-	GATE(CLK_VP, "vp", "div_aclk_100", GATE_IP_TV, 0, 0, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_IP_MFC */</div><div class='del'>-	GATE(CLK_PPMUMFC_R, "ppmumfc_r", "div_aclk_200", GATE_IP_MFC, 4,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_PPMUMFC_L, "ppmumfc_l", "div_aclk_200", GATE_IP_MFC, 3,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_SMMUMFC_R, "smmumfc_r", "div_aclk_200", GATE_IP_MFC, 2, 0, 0),</div><div class='del'>-	GATE(CLK_SMMUMFC_L, "smmumfc_l", "div_aclk_200", GATE_IP_MFC, 1, 0, 0),</div><div class='del'>-	GATE(CLK_MFC, "mfc", "div_aclk_200", GATE_IP_MFC, 0, 0, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_IP_G3D */</div><div class='del'>-	GATE(CLK_PPMUG3D, "ppmug3d", "div_aclk_200", GATE_IP_G3D, 1,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_G3D, "g3d", "div_aclk_200", GATE_IP_G3D, 0, 0, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_IP_LCD */</div><div class='del'>-	GATE(CLK_PPMULCD0, "ppmulcd0", "div_aclk_160", GATE_IP_LCD, 5,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_SMMUFIMD0, "smmufimd0", "div_aclk_160", GATE_IP_LCD, 4, 0, 0),</div><div class='del'>-	GATE(CLK_DSIM0, "dsim0", "div_aclk_160", GATE_IP_LCD, 3, 0, 0),</div><div class='del'>-	GATE(CLK_SMIES, "smies", "div_aclk_160", GATE_IP_LCD, 2, 0, 0),</div><div class='del'>-	GATE(CLK_MIE0, "mie0", "div_aclk_160", GATE_IP_LCD, 1, 0, 0),</div><div class='del'>-	GATE(CLK_FIMD0, "fimd0", "div_aclk_160", GATE_IP_LCD, 0, 0, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_IP_FSYS */</div><div class='del'>-	GATE(CLK_TSADC, "tsadc", "div_aclk_200", GATE_IP_FSYS, 20, 0, 0),</div><div class='del'>-	GATE(CLK_PPMUFILE, "ppmufile", "div_aclk_200", GATE_IP_FSYS, 17,</div><div class='del'>-		CLK_IGNORE_UNUSED, 0),</div><div class='del'>-	GATE(CLK_NFCON, "nfcon", "div_aclk_200", GATE_IP_FSYS, 16, 0, 0),</div><div class='del'>-	GATE(CLK_USBDEVICE, "usbdevice", "div_aclk_200", GATE_IP_FSYS, 13,</div><div class='del'>-		0, 0),</div><div class='del'>-	GATE(CLK_USBHOST, "usbhost", "div_aclk_200", GATE_IP_FSYS, 12, 0, 0),</div><div class='del'>-	GATE(CLK_SROMC, "sromc", "div_aclk_200", GATE_IP_FSYS, 11, 0, 0),</div><div class='del'>-	GATE(CLK_SDMMC2, "sdmmc2", "div_aclk_200", GATE_IP_FSYS, 7, 0, 0),</div><div class='del'>-	GATE(CLK_SDMMC1, "sdmmc1", "div_aclk_200", GATE_IP_FSYS, 6, 0, 0),</div><div class='del'>-	GATE(CLK_SDMMC0, "sdmmc0", "div_aclk_200", GATE_IP_FSYS, 5, 0, 0),</div><div class='del'>-	GATE(CLK_PDMA1, "pdma1", "div_aclk_200", GATE_IP_FSYS, 1, 0, 0),</div><div class='del'>-	GATE(CLK_PDMA0, "pdma0", "div_aclk_200", GATE_IP_FSYS, 0, 0, 0),</div><div class='del'>-</div><div class='del'>-	/* GATE_IP_PERIL */</div><div class='del'>-	GATE(CLK_SPDIF, "spdif", "div_aclk_100", GATE_IP_PERIL, 26, 0, 0),</div><div class='del'>-	GATE(CLK_PWM, "pwm", "div_aclk_100", GATE_IP_PERIL, 24, 0, 0),</div><div class='del'>-	GATE(CLK_PCM2, "pcm2", "div_aclk_100", GATE_IP_PERIL, 23, 0, 0),</div><div class='del'>-	GATE(CLK_PCM1, "pcm1", "div_aclk_100", GATE_IP_PERIL, 22, 0, 0),</div><div class='del'>-	GATE(CLK_I2S1, "i2s1", "div_aclk_100", GATE_IP_PERIL, 20, 0, 0),</div><div class='del'>-	GATE(CLK_SPI2, "spi2", "div_aclk_100", GATE_IP_PERIL, 18, 0, 0),</div><div class='del'>-	GATE(CLK_SPI1, "spi1", "div_aclk_100", GATE_IP_PERIL, 17, 0, 0),</div><div class='del'>-	GATE(CLK_SPI0, "spi0", "div_aclk_100", GATE_IP_PERIL, 16, 0, 0),</div><div class='del'>-	GATE(CLK_I2CHDMI, "i2chdmi", "div_aclk_100", GATE_IP_PERIL, 14, 0, 0),</div><div class='del'>-	GATE(CLK_I2C7, "i2c7", "div_aclk_100", GATE_IP_PERIL, 13, 0, 0),</div><div class='del'>-	GATE(CLK_I2C6, "i2c6", "div_aclk_100", GATE_IP_PERIL, 12, 0, 0),</div><div class='del'>-	GATE(CLK_I2C5, "i2c5", "div_aclk_100", GATE_IP_PERIL, 11, 0, 0),</div><div class='del'>-	GATE(CLK_I2C4, "i2c4", "div_aclk_100", GATE_IP_PERIL, 10, 0, 0),</div><div class='del'>-	GATE(CLK_I2C3, "i2c3", "div_aclk_100", GATE_IP_PERIL, 9, 0, 0),</div><div class='del'>-	GATE(CLK_I2C2, "i2c2", "div_aclk_100", GATE_IP_PERIL, 8, 0, 0),</div><div class='del'>-	GATE(CLK_I2C1, "i2c1", "div_aclk_100", GATE_IP_PERIL, 7, 0, 0),</div><div class='del'>-	GATE(CLK_I2C0, "i2c0", "div_aclk_100", GATE_IP_PERIL, 6, 0, 0),</div><div class='del'>-	GATE(CLK_UART3, "uart3", "div_aclk_100", GATE_IP_PERIL, 3, 0, 0),</div><div class='del'>-	GATE(CLK_UART2, "uart2", "div_aclk_100", GATE_IP_PERIL, 2, 0, 0),</div><div class='del'>-	GATE(CLK_UART1, "uart1", "div_aclk_100", GATE_IP_PERIL, 1, 0, 0),</div><div class='del'>-	GATE(CLK_UART0, "uart0", "div_aclk_100", GATE_IP_PERIL, 0, 0, 0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * APLL &amp; MPLL &amp; BPLL &amp; ISP_PLL &amp; DISP_PLL &amp; G3D_PLL</div><div class='del'>- */</div><div class='del'>-static const struct samsung_pll_rate_table exynos4415_pll_rates[] __initconst = {</div><div class='del'>-	PLL_35XX_RATE(1600000000, 400, 3,  1),</div><div class='del'>-	PLL_35XX_RATE(1500000000, 250, 2,  1),</div><div class='del'>-	PLL_35XX_RATE(1400000000, 175, 3,  0),</div><div class='del'>-	PLL_35XX_RATE(1300000000, 325, 3,  1),</div><div class='del'>-	PLL_35XX_RATE(1200000000, 400, 4,  1),</div><div class='del'>-	PLL_35XX_RATE(1100000000, 275, 3,  1),</div><div class='del'>-	PLL_35XX_RATE(1066000000, 533, 6,  1),</div><div class='del'>-	PLL_35XX_RATE(1000000000, 250, 3,  1),</div><div class='del'>-	PLL_35XX_RATE(960000000,  320, 4,  1),</div><div class='del'>-	PLL_35XX_RATE(900000000,  300, 4,  1),</div><div class='del'>-	PLL_35XX_RATE(850000000,  425, 6,  1),</div><div class='del'>-	PLL_35XX_RATE(800000000,  200, 3,  1),</div><div class='del'>-	PLL_35XX_RATE(700000000,  175, 3,  1),</div><div class='del'>-	PLL_35XX_RATE(667000000,  667, 12, 1),</div><div class='del'>-	PLL_35XX_RATE(600000000,  400, 4,  2),</div><div class='del'>-	PLL_35XX_RATE(550000000,  275, 3,  2),</div><div class='del'>-	PLL_35XX_RATE(533000000,  533, 6,  2),</div><div class='del'>-	PLL_35XX_RATE(520000000,  260, 3,  2),</div><div class='del'>-	PLL_35XX_RATE(500000000,  250, 3,  2),</div><div class='del'>-	PLL_35XX_RATE(440000000,  220, 3,  2),</div><div class='del'>-	PLL_35XX_RATE(400000000,  200, 3,  2),</div><div class='del'>-	PLL_35XX_RATE(350000000,  175, 3,  2),</div><div class='del'>-	PLL_35XX_RATE(300000000,  300, 3,  3),</div><div class='del'>-	PLL_35XX_RATE(266000000,  266, 3,  3),</div><div class='del'>-	PLL_35XX_RATE(200000000,  200, 3,  3),</div><div class='del'>-	PLL_35XX_RATE(160000000,  160, 3,  3),</div><div class='del'>-	PLL_35XX_RATE(100000000,  200, 3,  4),</div><div class='del'>-	{ /* sentinel */ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* EPLL */</div><div class='del'>-static const struct samsung_pll_rate_table exynos4415_epll_rates[] __initconst = {</div><div class='del'>-	PLL_36XX_RATE(800000000, 200, 3, 1,     0),</div><div class='del'>-	PLL_36XX_RATE(288000000,  96, 2, 2,     0),</div><div class='del'>-	PLL_36XX_RATE(192000000, 128, 2, 3,     0),</div><div class='del'>-	PLL_36XX_RATE(144000000,  96, 2, 3,     0),</div><div class='del'>-	PLL_36XX_RATE(96000000,  128, 2, 4,     0),</div><div class='del'>-	PLL_36XX_RATE(84000000,  112, 2, 4,     0),</div><div class='del'>-	PLL_36XX_RATE(80750011,  107, 2, 4, 43691),</div><div class='del'>-	PLL_36XX_RATE(73728004,   98, 2, 4, 19923),</div><div class='del'>-	PLL_36XX_RATE(67987602,  271, 3, 5, 62285),</div><div class='del'>-	PLL_36XX_RATE(65911004,  175, 2, 5, 49982),</div><div class='del'>-	PLL_36XX_RATE(50000000,  200, 3, 5,     0),</div><div class='del'>-	PLL_36XX_RATE(49152003,  131, 2, 5,  4719),</div><div class='del'>-	PLL_36XX_RATE(48000000,  128, 2, 5,     0),</div><div class='del'>-	PLL_36XX_RATE(45250000,  181, 3, 5,     0),</div><div class='del'>-	{ /* sentinel */ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct samsung_pll_clock exynos4415_plls[] __initconst = {</div><div class='del'>-	PLL(pll_35xx, CLK_FOUT_APLL, "fout_apll", "fin_pll",</div><div class='del'>-		APLL_LOCK, APLL_CON0, exynos4415_pll_rates),</div><div class='del'>-	PLL(pll_36xx, CLK_FOUT_EPLL, "fout_epll", "fin_pll",</div><div class='del'>-		EPLL_LOCK, EPLL_CON0, exynos4415_epll_rates),</div><div class='del'>-	PLL(pll_35xx, CLK_FOUT_G3D_PLL, "fout_g3d_pll", "mout_g3d_pllsrc",</div><div class='del'>-		G3D_PLL_LOCK, G3D_PLL_CON0, exynos4415_pll_rates),</div><div class='del'>-	PLL(pll_35xx, CLK_FOUT_ISP_PLL, "fout_isp_pll", "fin_pll",</div><div class='del'>-		ISP_PLL_LOCK, ISP_PLL_CON0, exynos4415_pll_rates),</div><div class='del'>-	PLL(pll_35xx, CLK_FOUT_DISP_PLL, "fout_disp_pll",</div><div class='del'>-		"fin_pll", DISP_PLL_LOCK, DISP_PLL_CON0, exynos4415_pll_rates),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct samsung_cmu_info cmu_info __initconst = {</div><div class='del'>-	.pll_clks		= exynos4415_plls,</div><div class='del'>-	.nr_pll_clks		= ARRAY_SIZE(exynos4415_plls),</div><div class='del'>-	.mux_clks		= exynos4415_mux_clks,</div><div class='del'>-	.nr_mux_clks		= ARRAY_SIZE(exynos4415_mux_clks),</div><div class='del'>-	.div_clks		= exynos4415_div_clks,</div><div class='del'>-	.nr_div_clks		= ARRAY_SIZE(exynos4415_div_clks),</div><div class='del'>-	.gate_clks		= exynos4415_gate_clks,</div><div class='del'>-	.nr_gate_clks		= ARRAY_SIZE(exynos4415_gate_clks),</div><div class='del'>-	.fixed_clks		= exynos4415_fixed_rate_clks,</div><div class='del'>-	.nr_fixed_clks		= ARRAY_SIZE(exynos4415_fixed_rate_clks),</div><div class='del'>-	.fixed_factor_clks	= exynos4415_fixed_factor_clks,</div><div class='del'>-	.nr_fixed_factor_clks	= ARRAY_SIZE(exynos4415_fixed_factor_clks),</div><div class='del'>-	.nr_clk_ids		= CLK_NR_CLKS,</div><div class='del'>-	.clk_regs		= exynos4415_cmu_clk_regs,</div><div class='del'>-	.nr_clk_regs		= ARRAY_SIZE(exynos4415_cmu_clk_regs),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init exynos4415_cmu_init(struct device_node *np)</div><div class='del'>-{</div><div class='del'>-	samsung_cmu_register_one(np, &amp;cmu_info);</div><div class='del'>-}</div><div class='del'>-CLK_OF_DECLARE(exynos4415_cmu, "samsung,exynos4415-cmu", exynos4415_cmu_init);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CMU DMC</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define MPLL_LOCK		0x008</div><div class='del'>-#define MPLL_CON0		0x108</div><div class='del'>-#define MPLL_CON1		0x10c</div><div class='del'>-#define MPLL_CON2		0x110</div><div class='del'>-#define BPLL_LOCK		0x118</div><div class='del'>-#define BPLL_CON0		0x218</div><div class='del'>-#define BPLL_CON1		0x21c</div><div class='del'>-#define BPLL_CON2		0x220</div><div class='del'>-#define SRC_DMC			0x300</div><div class='del'>-#define DIV_DMC1		0x504</div><div class='del'>-</div><div class='del'>-static const unsigned long exynos4415_cmu_dmc_clk_regs[] __initconst = {</div><div class='del'>-	MPLL_LOCK,</div><div class='del'>-	MPLL_CON0,</div><div class='del'>-	MPLL_CON1,</div><div class='del'>-	MPLL_CON2,</div><div class='del'>-	BPLL_LOCK,</div><div class='del'>-	BPLL_CON0,</div><div class='del'>-	BPLL_CON1,</div><div class='del'>-	BPLL_CON2,</div><div class='del'>-	SRC_DMC,</div><div class='del'>-	DIV_DMC1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-PNAME(mout_mpll_p)		= { "fin_pll", "fout_mpll", };</div><div class='del'>-PNAME(mout_bpll_p)		= { "fin_pll", "fout_bpll", };</div><div class='del'>-PNAME(mbpll_p)			= { "mout_mpll", "mout_bpll", };</div><div class='del'>-</div><div class='del'>-static const struct samsung_mux_clock exynos4415_dmc_mux_clks[] __initconst = {</div><div class='del'>-	MUX(CLK_DMC_MOUT_MPLL, "mout_mpll", mout_mpll_p, SRC_DMC, 12, 1),</div><div class='del'>-	MUX(CLK_DMC_MOUT_BPLL, "mout_bpll", mout_bpll_p, SRC_DMC, 10, 1),</div><div class='del'>-	MUX(CLK_DMC_MOUT_DPHY, "mout_dphy", mbpll_p, SRC_DMC, 8, 1),</div><div class='del'>-	MUX(CLK_DMC_MOUT_DMC_BUS, "mout_dmc_bus", mbpll_p, SRC_DMC, 4, 1),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct samsung_div_clock exynos4415_dmc_div_clks[] __initconst = {</div><div class='del'>-	DIV(CLK_DMC_DIV_DMC, "div_dmc", "div_dmc_pre", DIV_DMC1, 27, 3),</div><div class='del'>-	DIV(CLK_DMC_DIV_DPHY, "div_dphy", "mout_dphy", DIV_DMC1, 23, 3),</div><div class='del'>-	DIV(CLK_DMC_DIV_DMC_PRE, "div_dmc_pre", "mout_dmc_bus",</div><div class='del'>-		DIV_DMC1, 19, 2),</div><div class='del'>-	DIV(CLK_DMC_DIV_DMCP, "div_dmcp", "div_dmcd", DIV_DMC1, 15, 3),</div><div class='del'>-	DIV(CLK_DMC_DIV_DMCD, "div_dmcd", "div_dmc", DIV_DMC1, 11, 3),</div><div class='del'>-	DIV(CLK_DMC_DIV_MPLL_PRE, "div_mpll_pre", "mout_mpll", DIV_DMC1, 8, 2),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct samsung_pll_clock exynos4415_dmc_plls[] __initconst = {</div><div class='del'>-	PLL(pll_35xx, CLK_DMC_FOUT_MPLL, "fout_mpll", "fin_pll",</div><div class='del'>-		MPLL_LOCK, MPLL_CON0, exynos4415_pll_rates),</div><div class='del'>-	PLL(pll_35xx, CLK_DMC_FOUT_BPLL, "fout_bpll", "fin_pll",</div><div class='del'>-		BPLL_LOCK, BPLL_CON0, exynos4415_pll_rates),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct samsung_cmu_info cmu_dmc_info __initconst = {</div><div class='del'>-	.pll_clks		= exynos4415_dmc_plls,</div><div class='del'>-	.nr_pll_clks		= ARRAY_SIZE(exynos4415_dmc_plls),</div><div class='del'>-	.mux_clks		= exynos4415_dmc_mux_clks,</div><div class='del'>-	.nr_mux_clks		= ARRAY_SIZE(exynos4415_dmc_mux_clks),</div><div class='del'>-	.div_clks		= exynos4415_dmc_div_clks,</div><div class='del'>-	.nr_div_clks		= ARRAY_SIZE(exynos4415_dmc_div_clks),</div><div class='del'>-	.nr_clk_ids		= NR_CLKS_DMC,</div><div class='del'>-	.clk_regs		= exynos4415_cmu_dmc_clk_regs,</div><div class='del'>-	.nr_clk_regs		= ARRAY_SIZE(exynos4415_cmu_dmc_clk_regs),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init exynos4415_cmu_dmc_init(struct device_node *np)</div><div class='del'>-{</div><div class='del'>-	samsung_cmu_register_one(np, &amp;cmu_dmc_info);</div><div class='del'>-}</div><div class='del'>-CLK_OF_DECLARE(exynos4415_cmu_dmc, "samsung,exynos4415-cmu-dmc",</div><div class='del'>-		exynos4415_cmu_dmc_init);</div><div class='head'>diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c<br/>index 8c8b495cbf0d..cdc092a1d9ef 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/samsung/clk-exynos5420.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/samsung/clk-exynos5420.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/samsung/clk-exynos5420.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-exynos5420.c</a></div><div class='hunk'>@@ -586,7 +586,7 @@ static const struct samsung_gate_clock exynos5800_gate_clks[] __initconst = {</div><div class='ctx'> 	GATE(CLK_ACLK550_CAM, "aclk550_cam", "mout_user_aclk550_cam",</div><div class='ctx'> 				GATE_BUS_TOP, 24, 0, 0),</div><div class='ctx'> 	GATE(CLK_ACLK432_SCALER, "aclk432_scaler", "mout_user_aclk432_scaler",</div><div class='del'>-				GATE_BUS_TOP, 27, 0, 0),</div><div class='add'>+				GATE_BUS_TOP, 27, CLK_IS_CRITICAL, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_mux_clock exynos5420_mux_clks[] __initconst = {</div><div class='hunk'>@@ -956,20 +956,20 @@ static const struct samsung_gate_clock exynos5x_gate_clks[] __initconst = {</div><div class='ctx'> 	GATE(CLK_SMMU_G2D, "smmu_g2d", "aclk333_g2d", GATE_IP_G2D, 7, 0, 0),</div><div class='ctx'> </div><div class='ctx'> 	GATE(0, "aclk200_fsys", "mout_user_aclk200_fsys",</div><div class='del'>-			GATE_BUS_FSYS0, 9, CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			GATE_BUS_FSYS0, 9, CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(0, "aclk200_fsys2", "mout_user_aclk200_fsys2",</div><div class='ctx'> 			GATE_BUS_FSYS0, 10, CLK_IGNORE_UNUSED, 0),</div><div class='ctx'> </div><div class='ctx'> 	GATE(0, "aclk333_g2d", "mout_user_aclk333_g2d",</div><div class='ctx'> 			GATE_BUS_TOP, 0, CLK_IGNORE_UNUSED, 0),</div><div class='ctx'> 	GATE(0, "aclk266_g2d", "mout_user_aclk266_g2d",</div><div class='del'>-			GATE_BUS_TOP, 1, CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			GATE_BUS_TOP, 1, CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(0, "aclk300_jpeg", "mout_user_aclk300_jpeg",</div><div class='ctx'> 			GATE_BUS_TOP, 4, CLK_IGNORE_UNUSED, 0),</div><div class='ctx'> 	GATE(0, "aclk333_432_isp0", "mout_user_aclk333_432_isp0",</div><div class='ctx'> 			GATE_BUS_TOP, 5, 0, 0),</div><div class='ctx'> 	GATE(0, "aclk300_gscl", "mout_user_aclk300_gscl",</div><div class='del'>-			GATE_BUS_TOP, 6, CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			GATE_BUS_TOP, 6, CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(0, "aclk333_432_gscl", "mout_user_aclk333_432_gscl",</div><div class='ctx'> 			GATE_BUS_TOP, 7, CLK_IGNORE_UNUSED, 0),</div><div class='ctx'> 	GATE(0, "aclk333_432_isp", "mout_user_aclk333_432_isp",</div><div class='hunk'>@@ -983,20 +983,20 @@ static const struct samsung_gate_clock exynos5x_gate_clks[] __initconst = {</div><div class='ctx'> 	GATE(0, "aclk166", "mout_user_aclk166",</div><div class='ctx'> 			GATE_BUS_TOP, 14, CLK_IGNORE_UNUSED, 0),</div><div class='ctx'> 	GATE(CLK_ACLK333, "aclk333", "mout_user_aclk333",</div><div class='del'>-			GATE_BUS_TOP, 15, CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			GATE_BUS_TOP, 15, CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(0, "aclk400_isp", "mout_user_aclk400_isp",</div><div class='ctx'> 			GATE_BUS_TOP, 16, 0, 0),</div><div class='ctx'> 	GATE(0, "aclk400_mscl", "mout_user_aclk400_mscl",</div><div class='ctx'> 			GATE_BUS_TOP, 17, 0, 0),</div><div class='ctx'> 	GATE(0, "aclk200_disp1", "mout_user_aclk200_disp1",</div><div class='del'>-			GATE_BUS_TOP, 18, 0, 0),</div><div class='add'>+			GATE_BUS_TOP, 18, CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_SCLK_MPHY_IXTAL24, "sclk_mphy_ixtal24", "mphy_refclk_ixtal24",</div><div class='ctx'> 			GATE_BUS_TOP, 28, 0, 0),</div><div class='ctx'> 	GATE(CLK_SCLK_HSIC_12M, "sclk_hsic_12m", "ff_hsic_12m",</div><div class='ctx'> 			GATE_BUS_TOP, 29, 0, 0),</div><div class='ctx'> </div><div class='ctx'> 	GATE(0, "aclk300_disp1", "mout_user_aclk300_disp1",</div><div class='del'>-			SRC_MASK_TOP2, 24, 0, 0),</div><div class='add'>+			SRC_MASK_TOP2, 24, CLK_IS_CRITICAL, 0),</div><div class='ctx'> </div><div class='ctx'> 	GATE(CLK_MAU_EPLL, "mau_epll", "mout_mau_epll_clk",</div><div class='ctx'> 			SRC_MASK_TOP7, 20, 0, 0),</div><div class='head'>diff --git a/drivers/clk/samsung/clk-exynos5433.c b/drivers/clk/samsung/clk-exynos5433.c<br/>index ea1608682d7f..11343a597093 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/samsung/clk-exynos5433.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/samsung/clk-exynos5433.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/samsung/clk-exynos5433.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-exynos5433.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- * Common Clock Framework support for Exynos5443 SoC.</div><div class='add'>+ * Common Clock Framework support for Exynos5433 SoC.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='hunk'>@@ -543,37 +543,37 @@ static const struct samsung_div_clock top_div_clks[] __initconst = {</div><div class='ctx'> static const struct samsung_gate_clock top_gate_clks[] __initconst = {</div><div class='ctx'> 	/* ENABLE_ACLK_TOP */</div><div class='ctx'> 	GATE(CLK_ACLK_G3D_400, "aclk_g3d_400", "div_aclk_g3d_400",</div><div class='del'>-			ENABLE_ACLK_TOP, 30, 0, 0),</div><div class='add'>+			ENABLE_ACLK_TOP, 30, CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_IMEM_SSX_266, "aclk_imem_ssx_266",</div><div class='ctx'> 			"div_aclk_imem_sssx_266", ENABLE_ACLK_TOP,</div><div class='ctx'> 			29, CLK_IGNORE_UNUSED, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_BUS0_400, "aclk_bus0_400", "div_aclk_bus0_400",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 26,</div><div class='del'>-			CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT, 0),</div><div class='add'>+			CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_BUS1_400, "aclk_bus1_400", "div_aclk_bus1_400",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 25,</div><div class='del'>-			CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT, 0),</div><div class='add'>+			CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_IMEM_200, "aclk_imem_200", "div_aclk_imem_266",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 24,</div><div class='del'>-			CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT, 0),</div><div class='add'>+			CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_IMEM_266, "aclk_imem_266", "div_aclk_imem_200",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 23,</div><div class='ctx'> 			CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_PERIC_66, "aclk_peric_66", "div_aclk_peric_66_b",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 22,</div><div class='del'>-			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_PERIS_66, "aclk_peris_66", "div_aclk_peris_66_b",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 21,</div><div class='del'>-			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_MSCL_400, "aclk_mscl_400", "div_aclk_mscl_400",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 19,</div><div class='del'>-			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_FSYS_200, "aclk_fsys_200", "div_aclk_fsys_200",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 18,</div><div class='del'>-			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_GSCL_111, "aclk_gscl_111", "div_aclk_gscl_111",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 15,</div><div class='del'>-			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_GSCL_333, "aclk_gscl_333", "div_aclk_gscl_333",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 14,</div><div class='ctx'> 			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='hunk'>@@ -582,7 +582,7 @@ static const struct samsung_gate_clock top_gate_clks[] __initconst = {</div><div class='ctx'> 			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_CAM1_400, "aclk_cam1_400", "div_aclk_cam1_400",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 12,</div><div class='del'>-			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_CAM1_552, "aclk_cam1_552", "div_aclk_cam1_552",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 11,</div><div class='ctx'> 			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='hunk'>@@ -591,7 +591,7 @@ static const struct samsung_gate_clock top_gate_clks[] __initconst = {</div><div class='ctx'> 			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_CAM0_400, "aclk_cam0_400", "div_aclk_cam0_400",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 9,</div><div class='del'>-			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_CAM0_552, "aclk_cam0_552", "div_aclk_cam0_552",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 8,</div><div class='ctx'> 			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='hunk'>@@ -600,23 +600,23 @@ static const struct samsung_gate_clock top_gate_clks[] __initconst = {</div><div class='ctx'> 			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_ISP_400, "aclk_isp_400", "div_aclk_isp_400",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 6,</div><div class='del'>-			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_HEVC_400, "aclk_hevc_400", "div_aclk_hevc_400",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 5,</div><div class='del'>-			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_MFC_400, "aclk_mfc_400", "div_aclk_mfc_400",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 3,</div><div class='del'>-			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_G2D_266, "aclk_g2d_266", "div_aclk_g2d_266",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 2,</div><div class='ctx'> 			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_G2D_400, "aclk_g2d_400", "div_aclk_g2d_400",</div><div class='ctx'> 			ENABLE_ACLK_TOP, 0,</div><div class='del'>-			CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 0),</div><div class='add'>+			CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0),</div><div class='ctx'> </div><div class='ctx'> 	/* ENABLE_SCLK_TOP_MSCL */</div><div class='ctx'> 	GATE(CLK_SCLK_JPEG_MSCL, "sclk_jpeg_mscl", "div_sclk_jpeg",</div><div class='del'>-			ENABLE_SCLK_TOP_MSCL, 0, 0, 0),</div><div class='add'>+			ENABLE_SCLK_TOP_MSCL, 0, CLK_SET_RATE_PARENT, 0),</div><div class='ctx'> </div><div class='ctx'> 	/* ENABLE_SCLK_TOP_CAM1 */</div><div class='ctx'> 	GATE(CLK_SCLK_ISP_SENSOR2, "sclk_isp_sensor2", "div_sclk_isp_sensor2_b",</div><div class='hunk'>@@ -698,7 +698,7 @@ static const struct samsung_gate_clock top_gate_clks[] __initconst = {</div><div class='ctx'>  * ATLAS_PLL &amp; APOLLO_PLL &amp; MEM0_PLL &amp; MEM1_PLL &amp; BUS_PLL &amp; MFC_PLL</div><div class='ctx'>  * &amp; MPHY_PLL &amp; G3D_PLL &amp; DISP_PLL &amp; ISP_PLL</div><div class='ctx'>  */</div><div class='del'>-static const struct samsung_pll_rate_table exynos5443_pll_rates[] __initconst = {</div><div class='add'>+static const struct samsung_pll_rate_table exynos5433_pll_rates[] __initconst = {</div><div class='ctx'> 	PLL_35XX_RATE(2500000000U, 625, 6,  0),</div><div class='ctx'> 	PLL_35XX_RATE(2400000000U, 500, 5,  0),</div><div class='ctx'> 	PLL_35XX_RATE(2300000000U, 575, 6,  0),</div><div class='hunk'>@@ -739,7 +739,9 @@ static const struct samsung_pll_rate_table exynos5443_pll_rates[] __initconst =</div><div class='ctx'> 	PLL_35XX_RATE(350000000U,  350, 6,  2),</div><div class='ctx'> 	PLL_35XX_RATE(333000000U,  222, 4,  2),</div><div class='ctx'> 	PLL_35XX_RATE(300000000U,  500, 5,  3),</div><div class='add'>+	PLL_35XX_RATE(278000000U,  556, 6,  3),</div><div class='ctx'> 	PLL_35XX_RATE(266000000U,  532, 6,  3),</div><div class='add'>+	PLL_35XX_RATE(250000000U,  500, 6,  3),</div><div class='ctx'> 	PLL_35XX_RATE(200000000U,  400, 6,  3),</div><div class='ctx'> 	PLL_35XX_RATE(166000000U,  332, 6,  3),</div><div class='ctx'> 	PLL_35XX_RATE(160000000U,  320, 6,  3),</div><div class='hunk'>@@ -749,7 +751,7 @@ static const struct samsung_pll_rate_table exynos5443_pll_rates[] __initconst =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* AUD_PLL */</div><div class='del'>-static const struct samsung_pll_rate_table exynos5443_aud_pll_rates[] __initconst = {</div><div class='add'>+static const struct samsung_pll_rate_table exynos5433_aud_pll_rates[] __initconst = {</div><div class='ctx'> 	PLL_36XX_RATE(400000000U, 200, 3, 2,      0),</div><div class='ctx'> 	PLL_36XX_RATE(393216000U, 197, 3, 2, -25690),</div><div class='ctx'> 	PLL_36XX_RATE(384000000U, 128, 2, 2,      0),</div><div class='hunk'>@@ -764,9 +766,9 @@ static const struct samsung_pll_rate_table exynos5443_aud_pll_rates[] __initcons</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_pll_clock top_pll_clks[] __initconst = {</div><div class='ctx'> 	PLL(pll_35xx, CLK_FOUT_ISP_PLL, "fout_isp_pll", "oscclk",</div><div class='del'>-		ISP_PLL_LOCK, ISP_PLL_CON0, exynos5443_pll_rates),</div><div class='add'>+		ISP_PLL_LOCK, ISP_PLL_CON0, exynos5433_pll_rates),</div><div class='ctx'> 	PLL(pll_36xx, CLK_FOUT_AUD_PLL, "fout_aud_pll", "oscclk",</div><div class='del'>-		AUD_PLL_LOCK, AUD_PLL_CON0, exynos5443_aud_pll_rates),</div><div class='add'>+		AUD_PLL_LOCK, AUD_PLL_CON0, exynos5433_aud_pll_rates),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_cmu_info top_cmu_info __initconst = {</div><div class='hunk'>@@ -820,7 +822,7 @@ PNAME(mout_mphy_pll_p)		= { "oscclk", "fout_mphy_pll", };</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_pll_clock cpif_pll_clks[] __initconst = {</div><div class='ctx'> 	PLL(pll_35xx, CLK_FOUT_MPHY_PLL, "fout_mphy_pll", "oscclk",</div><div class='del'>-		MPHY_PLL_LOCK, MPHY_PLL_CON0, exynos5443_pll_rates),</div><div class='add'>+		MPHY_PLL_LOCK, MPHY_PLL_CON0, exynos5433_pll_rates),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_mux_clock cpif_mux_clks[] __initconst = {</div><div class='hunk'>@@ -1011,13 +1013,13 @@ static const unsigned long mif_clk_regs[] __initconst = {</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_pll_clock mif_pll_clks[] __initconst = {</div><div class='ctx'> 	PLL(pll_35xx, CLK_FOUT_MEM0_PLL, "fout_mem0_pll", "oscclk",</div><div class='del'>-		MEM0_PLL_LOCK, MEM0_PLL_CON0, exynos5443_pll_rates),</div><div class='add'>+		MEM0_PLL_LOCK, MEM0_PLL_CON0, exynos5433_pll_rates),</div><div class='ctx'> 	PLL(pll_35xx, CLK_FOUT_MEM1_PLL, "fout_mem1_pll", "oscclk",</div><div class='del'>-		MEM1_PLL_LOCK, MEM1_PLL_CON0, exynos5443_pll_rates),</div><div class='add'>+		MEM1_PLL_LOCK, MEM1_PLL_CON0, exynos5433_pll_rates),</div><div class='ctx'> 	PLL(pll_35xx, CLK_FOUT_BUS_PLL, "fout_bus_pll", "oscclk",</div><div class='del'>-		BUS_PLL_LOCK, BUS_PLL_CON0, exynos5443_pll_rates),</div><div class='add'>+		BUS_PLL_LOCK, BUS_PLL_CON0, exynos5433_pll_rates),</div><div class='ctx'> 	PLL(pll_35xx, CLK_FOUT_MFC_PLL, "fout_mfc_pll", "oscclk",</div><div class='del'>-		MFC_PLL_LOCK, MFC_PLL_CON0, exynos5443_pll_rates),</div><div class='add'>+		MFC_PLL_LOCK, MFC_PLL_CON0, exynos5433_pll_rates),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* list of all parent clock list */</div><div class='hunk'>@@ -1382,10 +1384,10 @@ static const struct samsung_gate_clock mif_gate_clks[] __initconst = {</div><div class='ctx'> 	/* ENABLE_ACLK_MIF3 */</div><div class='ctx'> 	GATE(CLK_ACLK_BUS2_400, "aclk_bus2_400", "div_aclk_bus2_400",</div><div class='ctx'> 			ENABLE_ACLK_MIF3, 4,</div><div class='del'>-			CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT, 0),</div><div class='add'>+			CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_DISP_333, "aclk_disp_333", "div_aclk_disp_333",</div><div class='ctx'> 			ENABLE_ACLK_MIF3, 1,</div><div class='del'>-			CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT, 0),</div><div class='add'>+			CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, 0),</div><div class='ctx'> 	GATE(CLK_ACLK_CPIF_200, "aclk_cpif_200", "div_aclk_cpif_200",</div><div class='ctx'> 			ENABLE_ACLK_MIF3, 0,</div><div class='ctx'> 			CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT, 0),</div><div class='hunk'>@@ -1929,7 +1931,7 @@ CLK_OF_DECLARE(exynos5433_cmu_peris, "samsung,exynos5433-cmu-peris",</div><div class='ctx'> </div><div class='ctx'> /* list of all parent clock list */</div><div class='ctx'> PNAME(mout_sclk_ufs_mphy_user_p)	= { "oscclk", "sclk_ufs_mphy", };</div><div class='del'>-PNAME(mout_aclk_fsys_200_user_p)	= { "oscclk", "div_aclk_fsys_200", };</div><div class='add'>+PNAME(mout_aclk_fsys_200_user_p)	= { "oscclk", "aclk_fsys_200", };</div><div class='ctx'> PNAME(mout_sclk_pcie_100_user_p)	= { "oscclk", "sclk_pcie_100_fsys",};</div><div class='ctx'> PNAME(mout_sclk_ufsunipro_user_p)	= { "oscclk", "sclk_ufsunipro_fsys",};</div><div class='ctx'> PNAME(mout_sclk_mmc2_user_p)		= { "oscclk", "sclk_mmc2_fsys", };</div><div class='hunk'>@@ -2539,7 +2541,7 @@ PNAME(mout_sclk_decon_tv_vclk_b_disp_p)	= { "mout_sclk_decon_tv_vclk_a_disp",</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_pll_clock disp_pll_clks[] __initconst = {</div><div class='ctx'> 	PLL(pll_35xx, CLK_FOUT_DISP_PLL, "fout_disp_pll", "oscclk",</div><div class='del'>-		DISP_PLL_LOCK, DISP_PLL_CON0, exynos5443_pll_rates),</div><div class='add'>+		DISP_PLL_LOCK, DISP_PLL_CON0, exynos5433_pll_rates),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_fixed_factor_clock disp_fixed_factor_clks[] __initconst = {</div><div class='hunk'>@@ -2559,8 +2561,10 @@ static const struct samsung_fixed_rate_clock disp_fixed_clks[] __initconst = {</div><div class='ctx'> 	FRATE(0, "phyclk_mipidphy1_bitclkdiv8_phy", NULL, 0, 188000000),</div><div class='ctx'> 	FRATE(0, "phyclk_mipidphy1_rxclkesc0_phy", NULL, 0, 100000000),</div><div class='ctx'> 	/* PHY clocks from MIPI_DPHY0 */</div><div class='del'>-	FRATE(0, "phyclk_mipidphy0_bitclkdiv8_phy", NULL, 0, 188000000),</div><div class='del'>-	FRATE(0, "phyclk_mipidphy0_rxclkesc0_phy", NULL, 0, 100000000),</div><div class='add'>+	FRATE(CLK_PHYCLK_MIPIDPHY0_BITCLKDIV8_PHY, "phyclk_mipidphy0_bitclkdiv8_phy",</div><div class='add'>+			NULL, 0, 188000000),</div><div class='add'>+	FRATE(CLK_PHYCLK_MIPIDPHY0_RXCLKESC0_PHY, "phyclk_mipidphy0_rxclkesc0_phy",</div><div class='add'>+			NULL, 0, 100000000),</div><div class='ctx'> 	/* PHY clocks from HDMI_PHY */</div><div class='ctx'> 	FRATE(CLK_PHYCLK_HDMIPHY_TMDS_CLKO_PHY, "phyclk_hdmiphy_tmds_clko_phy",</div><div class='ctx'> 			NULL, 0, 300000000),</div><div class='hunk'>@@ -3224,7 +3228,7 @@ PNAME(mout_g3d_pll_p)		= { "oscclk", "fout_g3d_pll", };</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_pll_clock g3d_pll_clks[] __initconst = {</div><div class='ctx'> 	PLL(pll_35xx, CLK_FOUT_G3D_PLL, "fout_g3d_pll", "oscclk",</div><div class='del'>-		G3D_PLL_LOCK, G3D_PLL_CON0, exynos5443_pll_rates),</div><div class='add'>+		G3D_PLL_LOCK, G3D_PLL_CON0, exynos5433_pll_rates),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_mux_clock g3d_mux_clks[] __initconst = {</div><div class='hunk'>@@ -3514,7 +3518,7 @@ PNAME(mout_apollo_p)			= { "mout_apollo_pll",</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_pll_clock apollo_pll_clks[] __initconst = {</div><div class='ctx'> 	PLL(pll_35xx, CLK_FOUT_APOLLO_PLL, "fout_apollo_pll", "oscclk",</div><div class='del'>-		APOLLO_PLL_LOCK, APOLLO_PLL_CON0, exynos5443_pll_rates),</div><div class='add'>+		APOLLO_PLL_LOCK, APOLLO_PLL_CON0, exynos5433_pll_rates),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_mux_clock apollo_mux_clks[] __initconst = {</div><div class='hunk'>@@ -3737,7 +3741,7 @@ PNAME(mout_atlas_p)			= { "mout_atlas_pll",</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_pll_clock atlas_pll_clks[] __initconst = {</div><div class='ctx'> 	PLL(pll_35xx, CLK_FOUT_ATLAS_PLL, "fout_atlas_pll", "oscclk",</div><div class='del'>-		ATLAS_PLL_LOCK, ATLAS_PLL_CON0, exynos5443_pll_rates),</div><div class='add'>+		ATLAS_PLL_LOCK, ATLAS_PLL_CON0, exynos5433_pll_rates),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct samsung_mux_clock atlas_mux_clks[] __initconst = {</div><div class='head'>diff --git a/drivers/clk/samsung/clk-pll.c b/drivers/clk/samsung/clk-pll.c<br/>index 9617825daabb..52290894857a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/samsung/clk-pll.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/samsung/clk-pll.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/samsung/clk-pll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-pll.c</a></div><div class='hunk'>@@ -136,11 +136,39 @@ static const struct clk_ops samsung_pll3000_clk_ops = {</div><div class='ctx'> #define PLL35XX_MDIV_MASK       (0x3FF)</div><div class='ctx'> #define PLL35XX_PDIV_MASK       (0x3F)</div><div class='ctx'> #define PLL35XX_SDIV_MASK       (0x7)</div><div class='del'>-#define PLL35XX_LOCK_STAT_MASK	(0x1)</div><div class='ctx'> #define PLL35XX_MDIV_SHIFT      (16)</div><div class='ctx'> #define PLL35XX_PDIV_SHIFT      (8)</div><div class='ctx'> #define PLL35XX_SDIV_SHIFT      (0)</div><div class='ctx'> #define PLL35XX_LOCK_STAT_SHIFT	(29)</div><div class='add'>+#define PLL35XX_ENABLE_SHIFT	(31)</div><div class='add'>+</div><div class='add'>+static int samsung_pll35xx_enable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct samsung_clk_pll *pll = to_clk_pll(hw);</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	tmp = readl_relaxed(pll-&gt;con_reg);</div><div class='add'>+	tmp |= BIT(PLL35XX_ENABLE_SHIFT);</div><div class='add'>+	writel_relaxed(tmp, pll-&gt;con_reg);</div><div class='add'>+</div><div class='add'>+	/* wait_lock_time */</div><div class='add'>+	do {</div><div class='add'>+		cpu_relax();</div><div class='add'>+		tmp = readl_relaxed(pll-&gt;con_reg);</div><div class='add'>+	} while (!(tmp &amp; BIT(PLL35XX_LOCK_STAT_SHIFT)));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void samsung_pll35xx_disable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct samsung_clk_pll *pll = to_clk_pll(hw);</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	tmp = readl_relaxed(pll-&gt;con_reg);</div><div class='add'>+	tmp &amp;= ~BIT(PLL35XX_ENABLE_SHIFT);</div><div class='add'>+	writel_relaxed(tmp, pll-&gt;con_reg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static unsigned long samsung_pll35xx_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> 				unsigned long parent_rate)</div><div class='hunk'>@@ -210,12 +238,13 @@ static int samsung_pll35xx_set_rate(struct clk_hw *hw, unsigned long drate,</div><div class='ctx'> 			(rate-&gt;sdiv &lt;&lt; PLL35XX_SDIV_SHIFT);</div><div class='ctx'> 	writel_relaxed(tmp, pll-&gt;con_reg);</div><div class='ctx'> </div><div class='del'>-	/* wait_lock_time */</div><div class='del'>-	do {</div><div class='del'>-		cpu_relax();</div><div class='del'>-		tmp = readl_relaxed(pll-&gt;con_reg);</div><div class='del'>-	} while (!(tmp &amp; (PLL35XX_LOCK_STAT_MASK</div><div class='del'>-				&lt;&lt; PLL35XX_LOCK_STAT_SHIFT)));</div><div class='add'>+	/* wait_lock_time if enabled */</div><div class='add'>+	if (tmp &amp; BIT(PLL35XX_ENABLE_SHIFT)) {</div><div class='add'>+		do {</div><div class='add'>+			cpu_relax();</div><div class='add'>+			tmp = readl_relaxed(pll-&gt;con_reg);</div><div class='add'>+		} while (!(tmp &amp; BIT(PLL35XX_LOCK_STAT_SHIFT)));</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -223,6 +252,8 @@ static const struct clk_ops samsung_pll35xx_clk_ops = {</div><div class='ctx'> 	.recalc_rate = samsung_pll35xx_recalc_rate,</div><div class='ctx'> 	.round_rate = samsung_pll_round_rate,</div><div class='ctx'> 	.set_rate = samsung_pll35xx_set_rate,</div><div class='add'>+	.enable = samsung_pll35xx_enable,</div><div class='add'>+	.disable = samsung_pll35xx_disable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct clk_ops samsung_pll35xx_clk_min_ops = {</div><div class='head'>diff --git a/drivers/clk/samsung/clk-s3c2410.c b/drivers/clk/samsung/clk-s3c2410.c<br/>index d7a1e772d95a..e0650c33863b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/samsung/clk-s3c2410.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/samsung/clk-s3c2410.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/samsung/clk-s3c2410.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-s3c2410.c</a></div><div class='hunk'>@@ -76,7 +76,7 @@ static struct syscore_ops s3c2410_clk_syscore_ops = {</div><div class='ctx'> 	.resume = s3c2410_clk_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void s3c2410_clk_sleep_init(void)</div><div class='add'>+static void __init s3c2410_clk_sleep_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	s3c2410_save = samsung_clk_alloc_reg_dump(s3c2410_clk_regs,</div><div class='ctx'> 						ARRAY_SIZE(s3c2410_clk_regs));</div><div class='hunk'>@@ -90,7 +90,7 @@ static void s3c2410_clk_sleep_init(void)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static void s3c2410_clk_sleep_init(void) {}</div><div class='add'>+static void __init s3c2410_clk_sleep_init(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> PNAME(fclk_p) = { "mpll", "div_slow" };</div><div class='head'>diff --git a/drivers/clk/samsung/clk-s3c2412.c b/drivers/clk/samsung/clk-s3c2412.c<br/>index ec873ee15d37..b8340a49921b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/samsung/clk-s3c2412.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/samsung/clk-s3c2412.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/samsung/clk-s3c2412.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-s3c2412.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ static struct syscore_ops s3c2412_clk_syscore_ops = {</div><div class='ctx'> 	.resume = s3c2412_clk_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void s3c2412_clk_sleep_init(void)</div><div class='add'>+static void __init s3c2412_clk_sleep_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	s3c2412_save = samsung_clk_alloc_reg_dump(s3c2412_clk_regs,</div><div class='ctx'> 						ARRAY_SIZE(s3c2412_clk_regs));</div><div class='hunk'>@@ -83,7 +83,7 @@ static void s3c2412_clk_sleep_init(void)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static void s3c2412_clk_sleep_init(void) {}</div><div class='add'>+static void __init s3c2412_clk_sleep_init(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct clk_div_table divxti_d[] = {</div><div class='head'>diff --git a/drivers/clk/samsung/clk-s3c2443.c b/drivers/clk/samsung/clk-s3c2443.c<br/>index 5e24a17e10e6..abb935c42916 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/samsung/clk-s3c2443.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/samsung/clk-s3c2443.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/samsung/clk-s3c2443.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-s3c2443.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ static struct syscore_ops s3c2443_clk_syscore_ops = {</div><div class='ctx'> 	.resume = s3c2443_clk_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void s3c2443_clk_sleep_init(void)</div><div class='add'>+static void __init s3c2443_clk_sleep_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	s3c2443_save = samsung_clk_alloc_reg_dump(s3c2443_clk_regs,</div><div class='ctx'> 						ARRAY_SIZE(s3c2443_clk_regs));</div><div class='hunk'>@@ -103,7 +103,7 @@ static void s3c2443_clk_sleep_init(void)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static void s3c2443_clk_sleep_init(void) {}</div><div class='add'>+static void __init s3c2443_clk_sleep_init(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> PNAME(epllref_p) = { "mpllref", "mpllref", "xti", "ext" };</div><div class='head'>diff --git a/drivers/clk/samsung/clk-s3c64xx.c b/drivers/clk/samsung/clk-s3c64xx.c<br/>index a48bd5f17330..7306867a0ab8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/samsung/clk-s3c64xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/samsung/clk-s3c64xx.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/samsung/clk-s3c64xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/samsung/clk-s3c64xx.c</a></div><div class='hunk'>@@ -121,7 +121,7 @@ static struct syscore_ops s3c64xx_clk_syscore_ops = {</div><div class='ctx'> 	.resume = s3c64xx_clk_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void s3c64xx_clk_sleep_init(void)</div><div class='add'>+static void __init s3c64xx_clk_sleep_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	s3c64xx_save_common = samsung_clk_alloc_reg_dump(s3c64xx_clk_regs,</div><div class='ctx'> 						ARRAY_SIZE(s3c64xx_clk_regs));</div><div class='hunk'>@@ -145,7 +145,7 @@ err_warn:</div><div class='ctx'> 		__func__);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static void s3c64xx_clk_sleep_init(void) {}</div><div class='add'>+static void __init s3c64xx_clk_sleep_init(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* List of parent clocks common for all S3C64xx SoCs. */</div><div class='head'>diff --git a/drivers/clk/st/clk-flexgen.c b/drivers/clk/st/clk-flexgen.c<br/>index a485f3b284b9..918ba3164da9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/st/clk-flexgen.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/st/clk-flexgen.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/st/clk-flexgen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/st/clk-flexgen.c</a></div><div class='hunk'>@@ -329,8 +329,10 @@ static void __init st_of_flexgen_setup(struct device_node *np)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	parents = flexgen_get_parents(np, &amp;num_parents);</div><div class='del'>-	if (!parents)</div><div class='add'>+	if (!parents) {</div><div class='add'>+		iounmap(reg);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	match = of_match_node(flexgen_of_match, np);</div><div class='ctx'> 	if (match) {</div><div class='hunk'>@@ -394,6 +396,7 @@ static void __init st_of_flexgen_setup(struct device_node *np)</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='add'>+	iounmap(reg);</div><div class='ctx'> 	if (clk_data)</div><div class='ctx'> 		kfree(clk_data-&gt;clks);</div><div class='ctx'> 	kfree(clk_data);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig<br/>index 254d9526c018..695bbf9ef428 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/Kconfig</a></div><div class='hunk'>@@ -35,17 +35,14 @@ config SUNXI_CCU_NK</div><div class='ctx'> </div><div class='ctx'> config SUNXI_CCU_NKM</div><div class='ctx'> 	bool</div><div class='del'>-	select RATIONAL</div><div class='ctx'> 	select SUNXI_CCU_GATE</div><div class='ctx'> </div><div class='ctx'> config SUNXI_CCU_NKMP</div><div class='ctx'> 	bool</div><div class='del'>-	select RATIONAL</div><div class='ctx'> 	select SUNXI_CCU_GATE</div><div class='ctx'> </div><div class='ctx'> config SUNXI_CCU_NM</div><div class='ctx'> 	bool</div><div class='del'>-	select RATIONAL</div><div class='ctx'> 	select SUNXI_CCU_FRAC</div><div class='ctx'> 	select SUNXI_CCU_GATE</div><div class='ctx'> </div><div class='hunk'>@@ -56,6 +53,28 @@ config SUNXI_CCU_MP</div><div class='ctx'> </div><div class='ctx'> # SoC Drivers</div><div class='ctx'> </div><div class='add'>+config SUN50I_A64_CCU</div><div class='add'>+	bool "Support for the Allwinner A64 CCU"</div><div class='add'>+	select SUNXI_CCU_DIV</div><div class='add'>+	select SUNXI_CCU_NK</div><div class='add'>+	select SUNXI_CCU_NKM</div><div class='add'>+	select SUNXI_CCU_NKMP</div><div class='add'>+	select SUNXI_CCU_NM</div><div class='add'>+	select SUNXI_CCU_MP</div><div class='add'>+	select SUNXI_CCU_PHASE</div><div class='add'>+	default ARM64 &amp;&amp; ARCH_SUNXI</div><div class='add'>+</div><div class='add'>+config SUN5I_CCU</div><div class='add'>+	bool "Support for the Allwinner sun5i family CCM"</div><div class='add'>+	select SUNXI_CCU_DIV</div><div class='add'>+	select SUNXI_CCU_MULT</div><div class='add'>+	select SUNXI_CCU_NK</div><div class='add'>+	select SUNXI_CCU_NKM</div><div class='add'>+	select SUNXI_CCU_NM</div><div class='add'>+	select SUNXI_CCU_MP</div><div class='add'>+	select SUNXI_CCU_PHASE</div><div class='add'>+	default MACH_SUN5I</div><div class='add'>+</div><div class='ctx'> config SUN6I_A31_CCU</div><div class='ctx'> 	bool "Support for the Allwinner A31/A31s CCU"</div><div class='ctx'> 	select SUNXI_CCU_DIV</div><div class='hunk'>@@ -101,4 +120,25 @@ config SUN8I_H3_CCU</div><div class='ctx'> 	select SUNXI_CCU_PHASE</div><div class='ctx'> 	default MACH_SUN8I</div><div class='ctx'> </div><div class='add'>+config SUN8I_V3S_CCU</div><div class='add'>+	bool "Support for the Allwinner V3s CCU"</div><div class='add'>+	select SUNXI_CCU_DIV</div><div class='add'>+	select SUNXI_CCU_NK</div><div class='add'>+	select SUNXI_CCU_NKM</div><div class='add'>+	select SUNXI_CCU_NKMP</div><div class='add'>+	select SUNXI_CCU_NM</div><div class='add'>+	select SUNXI_CCU_MP</div><div class='add'>+	select SUNXI_CCU_PHASE</div><div class='add'>+	default MACH_SUN8I</div><div class='add'>+</div><div class='add'>+config SUN9I_A80_CCU</div><div class='add'>+	bool "Support for the Allwinner A80 CCU"</div><div class='add'>+	select SUNXI_CCU_DIV</div><div class='add'>+	select SUNXI_CCU_GATE</div><div class='add'>+	select SUNXI_CCU_NKMP</div><div class='add'>+	select SUNXI_CCU_NM</div><div class='add'>+	select SUNXI_CCU_MP</div><div class='add'>+	select SUNXI_CCU_PHASE</div><div class='add'>+	default MACH_SUN9I</div><div class='add'>+</div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile<br/>index 106cba27c331..6feaac0c5600 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/Makefile</a></div><div class='hunk'>@@ -18,7 +18,13 @@ obj-$(CONFIG_SUNXI_CCU_NM)	+= ccu_nm.o</div><div class='ctx'> obj-$(CONFIG_SUNXI_CCU_MP)	+= ccu_mp.o</div><div class='ctx'> </div><div class='ctx'> # SoC support</div><div class='add'>+obj-$(CONFIG_SUN50I_A64_CCU)	+= ccu-sun50i-a64.o</div><div class='add'>+obj-$(CONFIG_SUN5I_CCU)		+= ccu-sun5i.o</div><div class='ctx'> obj-$(CONFIG_SUN6I_A31_CCU)	+= ccu-sun6i-a31.o</div><div class='ctx'> obj-$(CONFIG_SUN8I_A23_CCU)	+= ccu-sun8i-a23.o</div><div class='ctx'> obj-$(CONFIG_SUN8I_A33_CCU)	+= ccu-sun8i-a33.o</div><div class='ctx'> obj-$(CONFIG_SUN8I_H3_CCU)	+= ccu-sun8i-h3.o</div><div class='add'>+obj-$(CONFIG_SUN8I_V3S_CCU)	+= ccu-sun8i-v3s.o</div><div class='add'>+obj-$(CONFIG_SUN9I_A80_CCU)	+= ccu-sun9i-a80.o</div><div class='add'>+obj-$(CONFIG_SUN9I_A80_CCU)	+= ccu-sun9i-a80-de.o</div><div class='add'>+obj-$(CONFIG_SUN9I_A80_CCU)	+= ccu-sun9i-a80-usb.o</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c<br/>new file mode 100644<br/>index 000000000000..e3c084cc6da5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun50i-a64.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun50i-a64.c</a></div><div class='hunk'>@@ -0,0 +1,915 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Maxime Ripard. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ccu_common.h"</div><div class='add'>+#include "ccu_reset.h"</div><div class='add'>+</div><div class='add'>+#include "ccu_div.h"</div><div class='add'>+#include "ccu_gate.h"</div><div class='add'>+#include "ccu_mp.h"</div><div class='add'>+#include "ccu_mult.h"</div><div class='add'>+#include "ccu_nk.h"</div><div class='add'>+#include "ccu_nkm.h"</div><div class='add'>+#include "ccu_nkmp.h"</div><div class='add'>+#include "ccu_nm.h"</div><div class='add'>+#include "ccu_phase.h"</div><div class='add'>+</div><div class='add'>+#include "ccu-sun50i-a64.h"</div><div class='add'>+</div><div class='add'>+static struct ccu_nkmp pll_cpux_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(28),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT(8, 5),</div><div class='add'>+	.k		= _SUNXI_CCU_MULT(4, 2),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(0, 2),</div><div class='add'>+	.p		= _SUNXI_CCU_DIV_MAX(16, 2, 4),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x000,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-cpux",</div><div class='add'>+					      "osc24M",</div><div class='add'>+					      &amp;ccu_nkmp_ops,</div><div class='add'>+					      CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Audio PLL is supposed to have 4 outputs: 3 fixed factors from</div><div class='add'>+ * the base (2x, 4x and 8x), and one variable divider (the one true</div><div class='add'>+ * pll audio).</div><div class='add'>+ *</div><div class='add'>+ * We don't have any need for the variable divider for now, so we just</div><div class='add'>+ * hardcode it to match with the clock names</div><div class='add'>+ */</div><div class='add'>+#define SUN50I_A64_PLL_AUDIO_REG	0x008</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_audio_base_clk, "pll-audio-base",</div><div class='add'>+				   "osc24M", 0x008,</div><div class='add'>+				   8, 7,	/* N */</div><div class='add'>+				   0, 5,	/* M */</div><div class='add'>+				   BIT(31),	/* gate */</div><div class='add'>+				   BIT(28),	/* lock */</div><div class='add'>+				   CLK_SET_RATE_UNGATE);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_video0_clk, "pll-video0",</div><div class='add'>+					"osc24M", 0x010,</div><div class='add'>+					8, 7,		/* N */</div><div class='add'>+					0, 4,		/* M */</div><div class='add'>+					BIT(24),	/* frac enable */</div><div class='add'>+					BIT(25),	/* frac select */</div><div class='add'>+					270000000,	/* frac rate 0 */</div><div class='add'>+					297000000,	/* frac rate 1 */</div><div class='add'>+					BIT(31),	/* gate */</div><div class='add'>+					BIT(28),	/* lock */</div><div class='add'>+					CLK_SET_RATE_UNGATE);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_ve_clk, "pll-ve",</div><div class='add'>+					"osc24M", 0x018,</div><div class='add'>+					8, 7,		/* N */</div><div class='add'>+					0, 4,		/* M */</div><div class='add'>+					BIT(24),	/* frac enable */</div><div class='add'>+					BIT(25),	/* frac select */</div><div class='add'>+					270000000,	/* frac rate 0 */</div><div class='add'>+					297000000,	/* frac rate 1 */</div><div class='add'>+					BIT(31),	/* gate */</div><div class='add'>+					BIT(28),	/* lock */</div><div class='add'>+					CLK_SET_RATE_UNGATE);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_ddr0_clk, "pll-ddr0",</div><div class='add'>+				    "osc24M", 0x020,</div><div class='add'>+				    8, 5,	/* N */</div><div class='add'>+				    4, 2,	/* K */</div><div class='add'>+				    0, 2,	/* M */</div><div class='add'>+				    BIT(31),	/* gate */</div><div class='add'>+				    BIT(28),	/* lock */</div><div class='add'>+				    CLK_SET_RATE_UNGATE);</div><div class='add'>+</div><div class='add'>+static struct ccu_nk pll_periph0_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(28),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT(8, 5),</div><div class='add'>+	.k		= _SUNXI_CCU_MULT_MIN(4, 2, 2),</div><div class='add'>+	.fixed_post_div	= 2,</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x028,</div><div class='add'>+		.features	= CCU_FEATURE_FIXED_POSTDIV,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-periph0", "osc24M",</div><div class='add'>+					      &amp;ccu_nk_ops, CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nk pll_periph1_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(28),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT(8, 5),</div><div class='add'>+	.k		= _SUNXI_CCU_MULT_MIN(4, 2, 2),</div><div class='add'>+	.fixed_post_div	= 2,</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x02c,</div><div class='add'>+		.features	= CCU_FEATURE_FIXED_POSTDIV,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-periph1", "osc24M",</div><div class='add'>+					      &amp;ccu_nk_ops, CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_video1_clk, "pll-video1",</div><div class='add'>+					"osc24M", 0x030,</div><div class='add'>+					8, 7,		/* N */</div><div class='add'>+					0, 4,		/* M */</div><div class='add'>+					BIT(24),	/* frac enable */</div><div class='add'>+					BIT(25),	/* frac select */</div><div class='add'>+					270000000,	/* frac rate 0 */</div><div class='add'>+					297000000,	/* frac rate 1 */</div><div class='add'>+					BIT(31),	/* gate */</div><div class='add'>+					BIT(28),	/* lock */</div><div class='add'>+					CLK_SET_RATE_UNGATE);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_gpu_clk, "pll-gpu",</div><div class='add'>+					"osc24M", 0x038,</div><div class='add'>+					8, 7,		/* N */</div><div class='add'>+					0, 4,		/* M */</div><div class='add'>+					BIT(24),	/* frac enable */</div><div class='add'>+					BIT(25),	/* frac select */</div><div class='add'>+					270000000,	/* frac rate 0 */</div><div class='add'>+					297000000,	/* frac rate 1 */</div><div class='add'>+					BIT(31),	/* gate */</div><div class='add'>+					BIT(28),	/* lock */</div><div class='add'>+					CLK_SET_RATE_UNGATE);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The output function can be changed to something more complex that</div><div class='add'>+ * we do not handle yet.</div><div class='add'>+ *</div><div class='add'>+ * Hardcode the mode so that we don't fall in that case.</div><div class='add'>+ */</div><div class='add'>+#define SUN50I_A64_PLL_MIPI_REG		0x040</div><div class='add'>+</div><div class='add'>+static struct ccu_nkm pll_mipi_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(28),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT(8, 4),</div><div class='add'>+	.k		= _SUNXI_CCU_MULT_MIN(4, 2, 2),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(0, 4),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x040,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-mipi", "pll-video0",</div><div class='add'>+					      &amp;ccu_nkm_ops, CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_hsic_clk, "pll-hsic",</div><div class='add'>+					"osc24M", 0x044,</div><div class='add'>+					8, 7,		/* N */</div><div class='add'>+					0, 4,		/* M */</div><div class='add'>+					BIT(24),	/* frac enable */</div><div class='add'>+					BIT(25),	/* frac select */</div><div class='add'>+					270000000,	/* frac rate 0 */</div><div class='add'>+					297000000,	/* frac rate 1 */</div><div class='add'>+					BIT(31),	/* gate */</div><div class='add'>+					BIT(28),	/* lock */</div><div class='add'>+					CLK_SET_RATE_UNGATE);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_de_clk, "pll-de",</div><div class='add'>+					"osc24M", 0x048,</div><div class='add'>+					8, 7,		/* N */</div><div class='add'>+					0, 4,		/* M */</div><div class='add'>+					BIT(24),	/* frac enable */</div><div class='add'>+					BIT(25),	/* frac select */</div><div class='add'>+					270000000,	/* frac rate 0 */</div><div class='add'>+					297000000,	/* frac rate 1 */</div><div class='add'>+					BIT(31),	/* gate */</div><div class='add'>+					BIT(28),	/* lock */</div><div class='add'>+					CLK_SET_RATE_UNGATE);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_ddr1_clk, "pll-ddr1",</div><div class='add'>+				   "osc24M", 0x04c,</div><div class='add'>+				   8, 7,	/* N */</div><div class='add'>+				   0, 2,	/* M */</div><div class='add'>+				   BIT(31),	/* gate */</div><div class='add'>+				   BIT(28),	/* lock */</div><div class='add'>+				   CLK_SET_RATE_UNGATE);</div><div class='add'>+</div><div class='add'>+static const char * const cpux_parents[] = { "osc32k", "osc24M",</div><div class='add'>+					     "pll-cpux", "pll-cpux" };</div><div class='add'>+static SUNXI_CCU_MUX(cpux_clk, "cpux", cpux_parents,</div><div class='add'>+		     0x050, 16, 2, CLK_SET_RATE_PARENT | CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M(axi_clk, "axi", "cpux", 0x050, 0, 2, 0);</div><div class='add'>+</div><div class='add'>+static const char * const ahb1_parents[] = { "osc32k", "osc24M",</div><div class='add'>+					     "axi", "pll-periph0" };</div><div class='add'>+static struct ccu_div ahb1_clk = {</div><div class='add'>+	.div		= _SUNXI_CCU_DIV_FLAGS(4, 2, CLK_DIVIDER_POWER_OF_TWO),</div><div class='add'>+</div><div class='add'>+	.mux		= {</div><div class='add'>+		.shift	= 12,</div><div class='add'>+		.width	= 2,</div><div class='add'>+</div><div class='add'>+		.variable_prediv	= {</div><div class='add'>+			.index	= 3,</div><div class='add'>+			.shift	= 6,</div><div class='add'>+			.width	= 2,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x054,</div><div class='add'>+		.features	= CCU_FEATURE_VARIABLE_PREDIV,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("ahb1",</div><div class='add'>+						      ahb1_parents,</div><div class='add'>+						      &amp;ccu_div_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_div_table apb1_div_table[] = {</div><div class='add'>+	{ .val = 0, .div = 2 },</div><div class='add'>+	{ .val = 1, .div = 2 },</div><div class='add'>+	{ .val = 2, .div = 4 },</div><div class='add'>+	{ .val = 3, .div = 8 },</div><div class='add'>+	{ /* Sentinel */ },</div><div class='add'>+};</div><div class='add'>+static SUNXI_CCU_DIV_TABLE(apb1_clk, "apb1", "ahb1",</div><div class='add'>+			   0x054, 8, 2, apb1_div_table, 0);</div><div class='add'>+</div><div class='add'>+static const char * const apb2_parents[] = { "osc32k", "osc24M",</div><div class='add'>+					     "pll-periph0-2x",</div><div class='add'>+					     "pll-periph0-2x" };</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX(apb2_clk, "apb2", apb2_parents, 0x058,</div><div class='add'>+			     0, 5,	/* M */</div><div class='add'>+			     16, 2,	/* P */</div><div class='add'>+			     24, 2,	/* mux */</div><div class='add'>+			     0);</div><div class='add'>+</div><div class='add'>+static const char * const ahb2_parents[] = { "ahb1", "pll-periph0" };</div><div class='add'>+static const struct ccu_mux_fixed_prediv ahb2_fixed_predivs[] = {</div><div class='add'>+	{ .index = 1, .div = 2 },</div><div class='add'>+};</div><div class='add'>+static struct ccu_mux ahb2_clk = {</div><div class='add'>+	.mux		= {</div><div class='add'>+		.shift	= 0,</div><div class='add'>+		.width	= 1,</div><div class='add'>+		.fixed_predivs	= ahb2_fixed_predivs,</div><div class='add'>+		.n_predivs	= ARRAY_SIZE(ahb2_fixed_predivs),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x05c,</div><div class='add'>+		.features	= CCU_FEATURE_FIXED_PREDIV,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("ahb2",</div><div class='add'>+						      ahb2_parents,</div><div class='add'>+						      &amp;ccu_mux_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_mipi_dsi_clk,	"bus-mipi-dsi",	"ahb1",</div><div class='add'>+		      0x060, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ce_clk,	"bus-ce",	"ahb1",</div><div class='add'>+		      0x060, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_dma_clk,	"bus-dma",	"ahb1",</div><div class='add'>+		      0x060, BIT(6), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_mmc0_clk,	"bus-mmc0",	"ahb1",</div><div class='add'>+		      0x060, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_mmc1_clk,	"bus-mmc1",	"ahb1",</div><div class='add'>+		      0x060, BIT(9), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_mmc2_clk,	"bus-mmc2",	"ahb1",</div><div class='add'>+		      0x060, BIT(10), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_nand_clk,	"bus-nand",	"ahb1",</div><div class='add'>+		      0x060, BIT(13), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_dram_clk,	"bus-dram",	"ahb1",</div><div class='add'>+		      0x060, BIT(14), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_emac_clk,	"bus-emac",	"ahb2",</div><div class='add'>+		      0x060, BIT(17), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ts_clk,	"bus-ts",	"ahb1",</div><div class='add'>+		      0x060, BIT(18), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_hstimer_clk,	"bus-hstimer",	"ahb1",</div><div class='add'>+		      0x060, BIT(19), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_spi0_clk,	"bus-spi0",	"ahb1",</div><div class='add'>+		      0x060, BIT(20), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_spi1_clk,	"bus-spi1",	"ahb1",</div><div class='add'>+		      0x060, BIT(21), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_otg_clk,	"bus-otg",	"ahb1",</div><div class='add'>+		      0x060, BIT(23), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ehci0_clk,	"bus-ehci0",	"ahb1",</div><div class='add'>+		      0x060, BIT(24), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ehci1_clk,	"bus-ehci1",	"ahb2",</div><div class='add'>+		      0x060, BIT(25), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ohci0_clk,	"bus-ohci0",	"ahb1",</div><div class='add'>+		      0x060, BIT(28), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ohci1_clk,	"bus-ohci1",	"ahb2",</div><div class='add'>+		      0x060, BIT(29), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_ve_clk,	"bus-ve",	"ahb1",</div><div class='add'>+		      0x064, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_tcon0_clk,	"bus-tcon0",	"ahb1",</div><div class='add'>+		      0x064, BIT(3), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_tcon1_clk,	"bus-tcon1",	"ahb1",</div><div class='add'>+		      0x064, BIT(4), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_deinterlace_clk,	"bus-deinterlace",	"ahb1",</div><div class='add'>+		      0x064, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_csi_clk,	"bus-csi",	"ahb1",</div><div class='add'>+		      0x064, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_hdmi_clk,	"bus-hdmi",	"ahb1",</div><div class='add'>+		      0x064, BIT(11), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_de_clk,	"bus-de",	"ahb1",</div><div class='add'>+		      0x064, BIT(12), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_gpu_clk,	"bus-gpu",	"ahb1",</div><div class='add'>+		      0x064, BIT(20), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_msgbox_clk,	"bus-msgbox",	"ahb1",</div><div class='add'>+		      0x064, BIT(21), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_spinlock_clk,	"bus-spinlock",	"ahb1",</div><div class='add'>+		      0x064, BIT(22), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_codec_clk,	"bus-codec",	"apb1",</div><div class='add'>+		      0x068, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_spdif_clk,	"bus-spdif",	"apb1",</div><div class='add'>+		      0x068, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_pio_clk,	"bus-pio",	"apb1",</div><div class='add'>+		      0x068, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ths_clk,	"bus-ths",	"apb1",</div><div class='add'>+		      0x068, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2s0_clk,	"bus-i2s0",	"apb1",</div><div class='add'>+		      0x068, BIT(12), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2s1_clk,	"bus-i2s1",	"apb1",</div><div class='add'>+		      0x068, BIT(13), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2s2_clk,	"bus-i2s2",	"apb1",</div><div class='add'>+		      0x068, BIT(14), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2c0_clk,	"bus-i2c0",	"apb2",</div><div class='add'>+		      0x06c, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2c1_clk,	"bus-i2c1",	"apb2",</div><div class='add'>+		      0x06c, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2c2_clk,	"bus-i2c2",	"apb2",</div><div class='add'>+		      0x06c, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_scr_clk,	"bus-scr",	"apb2",</div><div class='add'>+		      0x06c, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart0_clk,	"bus-uart0",	"apb2",</div><div class='add'>+		      0x06c, BIT(16), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart1_clk,	"bus-uart1",	"apb2",</div><div class='add'>+		      0x06c, BIT(17), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart2_clk,	"bus-uart2",	"apb2",</div><div class='add'>+		      0x06c, BIT(18), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart3_clk,	"bus-uart3",	"apb2",</div><div class='add'>+		      0x06c, BIT(19), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart4_clk,	"bus-uart4",	"apb2",</div><div class='add'>+		      0x06c, BIT(20), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_dbg_clk,	"bus-dbg",	"ahb1",</div><div class='add'>+		      0x070, BIT(7), 0);</div><div class='add'>+</div><div class='add'>+static struct clk_div_table ths_div_table[] = {</div><div class='add'>+	{ .val = 0, .div = 1 },</div><div class='add'>+	{ .val = 1, .div = 2 },</div><div class='add'>+	{ .val = 2, .div = 4 },</div><div class='add'>+	{ .val = 3, .div = 6 },</div><div class='add'>+};</div><div class='add'>+static const char * const ths_parents[] = { "osc24M" };</div><div class='add'>+static struct ccu_div ths_clk = {</div><div class='add'>+	.enable	= BIT(31),</div><div class='add'>+	.div	= _SUNXI_CCU_DIV_TABLE(0, 2, ths_div_table),</div><div class='add'>+	.mux	= _SUNXI_CCU_MUX(24, 2),</div><div class='add'>+	.common	= {</div><div class='add'>+		.reg		= 0x074,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("ths",</div><div class='add'>+						      ths_parents,</div><div class='add'>+						      &amp;ccu_div_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const mod0_default_parents[] = { "osc24M", "pll-periph0",</div><div class='add'>+						     "pll-periph1" };</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(nand_clk, "nand", mod0_default_parents, 0x080,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static const char * const mmc_default_parents[] = { "osc24M", "pll-periph0-2x",</div><div class='add'>+						    "pll-periph1-2x" };</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc0_clk, "mmc0", mmc_default_parents, 0x088,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc1_clk, "mmc1", mmc_default_parents, 0x08c,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc2_clk, "mmc2", mmc_default_parents, 0x090,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static const char * const ts_parents[] = { "osc24M", "pll-periph0", };</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(ts_clk, "ts", ts_parents, 0x098,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(ce_clk, "ce", mmc_default_parents, 0x09c,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(spi0_clk, "spi0", mod0_default_parents, 0x0a0,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(spi1_clk, "spi1", mod0_default_parents, 0x0a4,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static const char * const i2s_parents[] = { "pll-audio-8x", "pll-audio-4x",</div><div class='add'>+					    "pll-audio-2x", "pll-audio" };</div><div class='add'>+static SUNXI_CCU_MUX_WITH_GATE(i2s0_clk, "i2s0", i2s_parents,</div><div class='add'>+			       0x0b0, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MUX_WITH_GATE(i2s1_clk, "i2s1", i2s_parents,</div><div class='add'>+			       0x0b4, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MUX_WITH_GATE(i2s2_clk, "i2s2", i2s_parents,</div><div class='add'>+			       0x0b8, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(spdif_clk, "spdif", "pll-audio",</div><div class='add'>+			     0x0c0, 0, 4, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(usb_phy0_clk,	"usb-phy0",	"osc24M",</div><div class='add'>+		      0x0cc, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb_phy1_clk,	"usb-phy1",	"osc24M",</div><div class='add'>+		      0x0cc, BIT(9), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb_hsic_clk,	"usb-hsic",	"pll-hsic",</div><div class='add'>+		      0x0cc, BIT(10), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb_hsic_12m_clk,	"usb-hsic-12M",	"osc12M",</div><div class='add'>+		      0x0cc, BIT(11), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb_ohci0_clk,	"usb-ohci0",	"osc12M",</div><div class='add'>+		      0x0cc, BIT(16), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb_ohci1_clk,	"usb-ohci1",	"usb-ohci0",</div><div class='add'>+		      0x0cc, BIT(17), 0);</div><div class='add'>+</div><div class='add'>+static const char * const dram_parents[] = { "pll-ddr0", "pll-ddr1" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX(dram_clk, "dram", dram_parents,</div><div class='add'>+			    0x0f4, 0, 4, 20, 2, CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(dram_ve_clk,	"dram-ve",	"dram",</div><div class='add'>+		      0x100, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_csi_clk,	"dram-csi",	"dram",</div><div class='add'>+		      0x100, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_deinterlace_clk,	"dram-deinterlace",	"dram",</div><div class='add'>+		      0x100, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_ts_clk,	"dram-ts",	"dram",</div><div class='add'>+		      0x100, BIT(3), 0);</div><div class='add'>+</div><div class='add'>+static const char * const de_parents[] = { "pll-periph0-2x", "pll-de" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(de_clk, "de", de_parents,</div><div class='add'>+				 0x104, 0, 4, 24, 3, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const tcon0_parents[] = { "pll-mipi", "pll-video0-2x" };</div><div class='add'>+static const u8 tcon0_table[] = { 0, 2, };</div><div class='add'>+static SUNXI_CCU_MUX_TABLE_WITH_GATE(tcon0_clk, "tcon0", tcon0_parents,</div><div class='add'>+				     tcon0_table, 0x118, 24, 3, BIT(31),</div><div class='add'>+				     CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static const char * const tcon1_parents[] = { "pll-video0", "pll-video1" };</div><div class='add'>+static const u8 tcon1_table[] = { 0, 2, };</div><div class='add'>+static struct ccu_div tcon1_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.div		= _SUNXI_CCU_DIV(0, 4),</div><div class='add'>+	.mux		= _SUNXI_CCU_MUX_TABLE(24, 2, tcon1_table),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x11c,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("tcon1",</div><div class='add'>+						      tcon1_parents,</div><div class='add'>+						      &amp;ccu_div_ops,</div><div class='add'>+						      CLK_SET_RATE_PARENT),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const deinterlace_parents[] = { "pll-periph0", "pll-periph1" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(deinterlace_clk, "deinterlace", deinterlace_parents,</div><div class='add'>+				 0x124, 0, 4, 24, 3, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(csi_misc_clk,	"csi-misc",	"osc24M",</div><div class='add'>+		      0x130, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const csi_sclk_parents[] = { "pll-periph0", "pll-periph1" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(csi_sclk_clk, "csi-sclk", csi_sclk_parents,</div><div class='add'>+				 0x134, 16, 4, 24, 3, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const csi_mclk_parents[] = { "osc24M", "pll-video1", "pll-periph1" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(csi_mclk_clk, "csi-mclk", csi_mclk_parents,</div><div class='add'>+				 0x134, 0, 5, 8, 3, BIT(15), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve",</div><div class='add'>+			     0x13c, 16, 3, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(ac_dig_clk,	"ac-dig",	"pll-audio",</div><div class='add'>+		      0x140, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(ac_dig_4x_clk,	"ac-dig-4x",	"pll-audio-4x",</div><div class='add'>+		      0x140, BIT(30), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(avs_clk,		"avs",		"osc24M",</div><div class='add'>+		      0x144, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const hdmi_parents[] = { "pll-video0", "pll-video1" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(hdmi_clk, "hdmi", hdmi_parents,</div><div class='add'>+				 0x150, 0, 4, 24, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(hdmi_ddc_clk,	"hdmi-ddc",	"osc24M",</div><div class='add'>+		      0x154, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const mbus_parents[] = { "osc24M", "pll-periph0-2x",</div><div class='add'>+						 "pll-ddr0", "pll-ddr1" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(mbus_clk, "mbus", mbus_parents,</div><div class='add'>+				 0x15c, 0, 3, 24, 2, BIT(31), CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static const char * const dsi_dphy_parents[] = { "pll-video0", "pll-periph0" };</div><div class='add'>+static const u8 dsi_dphy_table[] = { 0, 2, };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(dsi_dphy_clk, "dsi-dphy",</div><div class='add'>+				       dsi_dphy_parents, dsi_dphy_table,</div><div class='add'>+				       0x168, 0, 4, 8, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(gpu_clk, "gpu", "pll-gpu",</div><div class='add'>+			     0x1a0, 0, 3, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+/* Fixed Factor clocks */</div><div class='add'>+static CLK_FIXED_FACTOR(osc12M_clk, "osc12M", "osc24M", 1, 2, 0);</div><div class='add'>+</div><div class='add'>+/* We hardcode the divider to 4 for now */</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_clk, "pll-audio",</div><div class='add'>+			"pll-audio-base", 4, 1, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_2x_clk, "pll-audio-2x",</div><div class='add'>+			"pll-audio-base", 2, 1, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_4x_clk, "pll-audio-4x",</div><div class='add'>+			"pll-audio-base", 1, 1, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_8x_clk, "pll-audio-8x",</div><div class='add'>+			"pll-audio-base", 1, 2, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_periph0_2x_clk, "pll-periph0-2x",</div><div class='add'>+			"pll-periph0", 1, 2, 0);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_periph1_2x_clk, "pll-periph1-2x",</div><div class='add'>+			"pll-periph1", 1, 2, 0);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_video0_2x_clk, "pll-video0-2x",</div><div class='add'>+			"pll-video0", 1, 2, CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static struct ccu_common *sun50i_a64_ccu_clks[] = {</div><div class='add'>+	&amp;pll_cpux_clk.common,</div><div class='add'>+	&amp;pll_audio_base_clk.common,</div><div class='add'>+	&amp;pll_video0_clk.common,</div><div class='add'>+	&amp;pll_ve_clk.common,</div><div class='add'>+	&amp;pll_ddr0_clk.common,</div><div class='add'>+	&amp;pll_periph0_clk.common,</div><div class='add'>+	&amp;pll_periph1_clk.common,</div><div class='add'>+	&amp;pll_video1_clk.common,</div><div class='add'>+	&amp;pll_gpu_clk.common,</div><div class='add'>+	&amp;pll_mipi_clk.common,</div><div class='add'>+	&amp;pll_hsic_clk.common,</div><div class='add'>+	&amp;pll_de_clk.common,</div><div class='add'>+	&amp;pll_ddr1_clk.common,</div><div class='add'>+	&amp;cpux_clk.common,</div><div class='add'>+	&amp;axi_clk.common,</div><div class='add'>+	&amp;ahb1_clk.common,</div><div class='add'>+	&amp;apb1_clk.common,</div><div class='add'>+	&amp;apb2_clk.common,</div><div class='add'>+	&amp;ahb2_clk.common,</div><div class='add'>+	&amp;bus_mipi_dsi_clk.common,</div><div class='add'>+	&amp;bus_ce_clk.common,</div><div class='add'>+	&amp;bus_dma_clk.common,</div><div class='add'>+	&amp;bus_mmc0_clk.common,</div><div class='add'>+	&amp;bus_mmc1_clk.common,</div><div class='add'>+	&amp;bus_mmc2_clk.common,</div><div class='add'>+	&amp;bus_nand_clk.common,</div><div class='add'>+	&amp;bus_dram_clk.common,</div><div class='add'>+	&amp;bus_emac_clk.common,</div><div class='add'>+	&amp;bus_ts_clk.common,</div><div class='add'>+	&amp;bus_hstimer_clk.common,</div><div class='add'>+	&amp;bus_spi0_clk.common,</div><div class='add'>+	&amp;bus_spi1_clk.common,</div><div class='add'>+	&amp;bus_otg_clk.common,</div><div class='add'>+	&amp;bus_ehci0_clk.common,</div><div class='add'>+	&amp;bus_ehci1_clk.common,</div><div class='add'>+	&amp;bus_ohci0_clk.common,</div><div class='add'>+	&amp;bus_ohci1_clk.common,</div><div class='add'>+	&amp;bus_ve_clk.common,</div><div class='add'>+	&amp;bus_tcon0_clk.common,</div><div class='add'>+	&amp;bus_tcon1_clk.common,</div><div class='add'>+	&amp;bus_deinterlace_clk.common,</div><div class='add'>+	&amp;bus_csi_clk.common,</div><div class='add'>+	&amp;bus_hdmi_clk.common,</div><div class='add'>+	&amp;bus_de_clk.common,</div><div class='add'>+	&amp;bus_gpu_clk.common,</div><div class='add'>+	&amp;bus_msgbox_clk.common,</div><div class='add'>+	&amp;bus_spinlock_clk.common,</div><div class='add'>+	&amp;bus_codec_clk.common,</div><div class='add'>+	&amp;bus_spdif_clk.common,</div><div class='add'>+	&amp;bus_pio_clk.common,</div><div class='add'>+	&amp;bus_ths_clk.common,</div><div class='add'>+	&amp;bus_i2s0_clk.common,</div><div class='add'>+	&amp;bus_i2s1_clk.common,</div><div class='add'>+	&amp;bus_i2s2_clk.common,</div><div class='add'>+	&amp;bus_i2c0_clk.common,</div><div class='add'>+	&amp;bus_i2c1_clk.common,</div><div class='add'>+	&amp;bus_i2c2_clk.common,</div><div class='add'>+	&amp;bus_scr_clk.common,</div><div class='add'>+	&amp;bus_uart0_clk.common,</div><div class='add'>+	&amp;bus_uart1_clk.common,</div><div class='add'>+	&amp;bus_uart2_clk.common,</div><div class='add'>+	&amp;bus_uart3_clk.common,</div><div class='add'>+	&amp;bus_uart4_clk.common,</div><div class='add'>+	&amp;bus_dbg_clk.common,</div><div class='add'>+	&amp;ths_clk.common,</div><div class='add'>+	&amp;nand_clk.common,</div><div class='add'>+	&amp;mmc0_clk.common,</div><div class='add'>+	&amp;mmc1_clk.common,</div><div class='add'>+	&amp;mmc2_clk.common,</div><div class='add'>+	&amp;ts_clk.common,</div><div class='add'>+	&amp;ce_clk.common,</div><div class='add'>+	&amp;spi0_clk.common,</div><div class='add'>+	&amp;spi1_clk.common,</div><div class='add'>+	&amp;i2s0_clk.common,</div><div class='add'>+	&amp;i2s1_clk.common,</div><div class='add'>+	&amp;i2s2_clk.common,</div><div class='add'>+	&amp;spdif_clk.common,</div><div class='add'>+	&amp;usb_phy0_clk.common,</div><div class='add'>+	&amp;usb_phy1_clk.common,</div><div class='add'>+	&amp;usb_hsic_clk.common,</div><div class='add'>+	&amp;usb_hsic_12m_clk.common,</div><div class='add'>+	&amp;usb_ohci0_clk.common,</div><div class='add'>+	&amp;usb_ohci1_clk.common,</div><div class='add'>+	&amp;dram_clk.common,</div><div class='add'>+	&amp;dram_ve_clk.common,</div><div class='add'>+	&amp;dram_csi_clk.common,</div><div class='add'>+	&amp;dram_deinterlace_clk.common,</div><div class='add'>+	&amp;dram_ts_clk.common,</div><div class='add'>+	&amp;de_clk.common,</div><div class='add'>+	&amp;tcon0_clk.common,</div><div class='add'>+	&amp;tcon1_clk.common,</div><div class='add'>+	&amp;deinterlace_clk.common,</div><div class='add'>+	&amp;csi_misc_clk.common,</div><div class='add'>+	&amp;csi_sclk_clk.common,</div><div class='add'>+	&amp;csi_mclk_clk.common,</div><div class='add'>+	&amp;ve_clk.common,</div><div class='add'>+	&amp;ac_dig_clk.common,</div><div class='add'>+	&amp;ac_dig_4x_clk.common,</div><div class='add'>+	&amp;avs_clk.common,</div><div class='add'>+	&amp;hdmi_clk.common,</div><div class='add'>+	&amp;hdmi_ddc_clk.common,</div><div class='add'>+	&amp;mbus_clk.common,</div><div class='add'>+	&amp;dsi_dphy_clk.common,</div><div class='add'>+	&amp;gpu_clk.common,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw_onecell_data sun50i_a64_hw_clks = {</div><div class='add'>+	.hws	= {</div><div class='add'>+		[CLK_OSC_12M]		= &amp;osc12M_clk.hw,</div><div class='add'>+		[CLK_PLL_CPUX]		= &amp;pll_cpux_clk.common.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_BASE]	= &amp;pll_audio_base_clk.common.hw,</div><div class='add'>+		[CLK_PLL_AUDIO]		= &amp;pll_audio_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_2X]	= &amp;pll_audio_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_4X]	= &amp;pll_audio_4x_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_8X]	= &amp;pll_audio_8x_clk.hw,</div><div class='add'>+		[CLK_PLL_VIDEO0]	= &amp;pll_video0_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO0_2X]	= &amp;pll_video0_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_VE]		= &amp;pll_ve_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR0]		= &amp;pll_ddr0_clk.common.hw,</div><div class='add'>+		[CLK_PLL_PERIPH0]	= &amp;pll_periph0_clk.common.hw,</div><div class='add'>+		[CLK_PLL_PERIPH0_2X]	= &amp;pll_periph0_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_PERIPH1]	= &amp;pll_periph1_clk.common.hw,</div><div class='add'>+		[CLK_PLL_PERIPH1_2X]	= &amp;pll_periph1_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_VIDEO1]	= &amp;pll_video1_clk.common.hw,</div><div class='add'>+		[CLK_PLL_GPU]		= &amp;pll_gpu_clk.common.hw,</div><div class='add'>+		[CLK_PLL_MIPI]  	= &amp;pll_mipi_clk.common.hw,</div><div class='add'>+		[CLK_PLL_HSIC]		= &amp;pll_hsic_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DE]		= &amp;pll_de_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR1]		= &amp;pll_ddr1_clk.common.hw,</div><div class='add'>+		[CLK_CPUX]		= &amp;cpux_clk.common.hw,</div><div class='add'>+		[CLK_AXI]		= &amp;axi_clk.common.hw,</div><div class='add'>+		[CLK_AHB1]		= &amp;ahb1_clk.common.hw,</div><div class='add'>+		[CLK_APB1]		= &amp;apb1_clk.common.hw,</div><div class='add'>+		[CLK_APB2]		= &amp;apb2_clk.common.hw,</div><div class='add'>+		[CLK_AHB2]		= &amp;ahb2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MIPI_DSI]	= &amp;bus_mipi_dsi_clk.common.hw,</div><div class='add'>+		[CLK_BUS_CE]		= &amp;bus_ce_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DMA]		= &amp;bus_dma_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MMC0]		= &amp;bus_mmc0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MMC1]		= &amp;bus_mmc1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MMC2]		= &amp;bus_mmc2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_NAND]		= &amp;bus_nand_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DRAM]		= &amp;bus_dram_clk.common.hw,</div><div class='add'>+		[CLK_BUS_EMAC]		= &amp;bus_emac_clk.common.hw,</div><div class='add'>+		[CLK_BUS_TS]		= &amp;bus_ts_clk.common.hw,</div><div class='add'>+		[CLK_BUS_HSTIMER]	= &amp;bus_hstimer_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SPI0]		= &amp;bus_spi0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SPI1]		= &amp;bus_spi1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_OTG]		= &amp;bus_otg_clk.common.hw,</div><div class='add'>+		[CLK_BUS_EHCI0]		= &amp;bus_ehci0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_EHCI1]		= &amp;bus_ehci1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_OHCI0]		= &amp;bus_ohci0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_OHCI1]		= &amp;bus_ohci1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_VE]		= &amp;bus_ve_clk.common.hw,</div><div class='add'>+		[CLK_BUS_TCON0]		= &amp;bus_tcon0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_TCON1]		= &amp;bus_tcon1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DEINTERLACE]	= &amp;bus_deinterlace_clk.common.hw,</div><div class='add'>+		[CLK_BUS_CSI]		= &amp;bus_csi_clk.common.hw,</div><div class='add'>+		[CLK_BUS_HDMI]		= &amp;bus_hdmi_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DE]		= &amp;bus_de_clk.common.hw,</div><div class='add'>+		[CLK_BUS_GPU]		= &amp;bus_gpu_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MSGBOX]	= &amp;bus_msgbox_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SPINLOCK]	= &amp;bus_spinlock_clk.common.hw,</div><div class='add'>+		[CLK_BUS_CODEC]		= &amp;bus_codec_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SPDIF]		= &amp;bus_spdif_clk.common.hw,</div><div class='add'>+		[CLK_BUS_PIO]		= &amp;bus_pio_clk.common.hw,</div><div class='add'>+		[CLK_BUS_THS]		= &amp;bus_ths_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2S0]		= &amp;bus_i2s0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2S1]		= &amp;bus_i2s1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2S2]		= &amp;bus_i2s2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2C0]		= &amp;bus_i2c0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2C1]		= &amp;bus_i2c1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2C2]		= &amp;bus_i2c2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART0]		= &amp;bus_uart0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART1]		= &amp;bus_uart1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART2]		= &amp;bus_uart2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART3]		= &amp;bus_uart3_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART4]		= &amp;bus_uart4_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SCR]		= &amp;bus_scr_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DBG]		= &amp;bus_dbg_clk.common.hw,</div><div class='add'>+		[CLK_THS]		= &amp;ths_clk.common.hw,</div><div class='add'>+		[CLK_NAND]		= &amp;nand_clk.common.hw,</div><div class='add'>+		[CLK_MMC0]		= &amp;mmc0_clk.common.hw,</div><div class='add'>+		[CLK_MMC1]		= &amp;mmc1_clk.common.hw,</div><div class='add'>+		[CLK_MMC2]		= &amp;mmc2_clk.common.hw,</div><div class='add'>+		[CLK_TS]		= &amp;ts_clk.common.hw,</div><div class='add'>+		[CLK_CE]		= &amp;ce_clk.common.hw,</div><div class='add'>+		[CLK_SPI0]		= &amp;spi0_clk.common.hw,</div><div class='add'>+		[CLK_SPI1]		= &amp;spi1_clk.common.hw,</div><div class='add'>+		[CLK_I2S0]		= &amp;i2s0_clk.common.hw,</div><div class='add'>+		[CLK_I2S1]		= &amp;i2s1_clk.common.hw,</div><div class='add'>+		[CLK_I2S2]		= &amp;i2s2_clk.common.hw,</div><div class='add'>+		[CLK_SPDIF]		= &amp;spdif_clk.common.hw,</div><div class='add'>+		[CLK_USB_PHY0]		= &amp;usb_phy0_clk.common.hw,</div><div class='add'>+		[CLK_USB_PHY1]		= &amp;usb_phy1_clk.common.hw,</div><div class='add'>+		[CLK_USB_HSIC]		= &amp;usb_hsic_clk.common.hw,</div><div class='add'>+		[CLK_USB_HSIC_12M]	= &amp;usb_hsic_12m_clk.common.hw,</div><div class='add'>+		[CLK_USB_OHCI0]		= &amp;usb_ohci0_clk.common.hw,</div><div class='add'>+		[CLK_USB_OHCI1]		= &amp;usb_ohci1_clk.common.hw,</div><div class='add'>+		[CLK_DRAM]		= &amp;dram_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_VE]		= &amp;dram_ve_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_CSI]		= &amp;dram_csi_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_DEINTERLACE]	= &amp;dram_deinterlace_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_TS]		= &amp;dram_ts_clk.common.hw,</div><div class='add'>+		[CLK_DE]		= &amp;de_clk.common.hw,</div><div class='add'>+		[CLK_TCON0]		= &amp;tcon0_clk.common.hw,</div><div class='add'>+		[CLK_TCON1]		= &amp;tcon1_clk.common.hw,</div><div class='add'>+		[CLK_DEINTERLACE]	= &amp;deinterlace_clk.common.hw,</div><div class='add'>+		[CLK_CSI_MISC]		= &amp;csi_misc_clk.common.hw,</div><div class='add'>+		[CLK_CSI_SCLK]		= &amp;csi_sclk_clk.common.hw,</div><div class='add'>+		[CLK_CSI_MCLK]		= &amp;csi_mclk_clk.common.hw,</div><div class='add'>+		[CLK_VE]		= &amp;ve_clk.common.hw,</div><div class='add'>+		[CLK_AC_DIG]		= &amp;ac_dig_clk.common.hw,</div><div class='add'>+		[CLK_AC_DIG_4X]		= &amp;ac_dig_4x_clk.common.hw,</div><div class='add'>+		[CLK_AVS]		= &amp;avs_clk.common.hw,</div><div class='add'>+		[CLK_HDMI]		= &amp;hdmi_clk.common.hw,</div><div class='add'>+		[CLK_HDMI_DDC]		= &amp;hdmi_ddc_clk.common.hw,</div><div class='add'>+		[CLK_MBUS]		= &amp;mbus_clk.common.hw,</div><div class='add'>+		[CLK_DSI_DPHY]		= &amp;dsi_dphy_clk.common.hw,</div><div class='add'>+		[CLK_GPU]		= &amp;gpu_clk.common.hw,</div><div class='add'>+	},</div><div class='add'>+	.num	= CLK_NUMBER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_reset_map sun50i_a64_ccu_resets[] = {</div><div class='add'>+	[RST_USB_PHY0]		=  { 0x0cc, BIT(0) },</div><div class='add'>+	[RST_USB_PHY1]		=  { 0x0cc, BIT(1) },</div><div class='add'>+	[RST_USB_HSIC]		=  { 0x0cc, BIT(2) },</div><div class='add'>+</div><div class='add'>+	[RST_DRAM]		=  { 0x0f4, BIT(31) },</div><div class='add'>+	[RST_MBUS]		=  { 0x0fc, BIT(31) },</div><div class='add'>+</div><div class='add'>+	[RST_BUS_MIPI_DSI]	=  { 0x2c0, BIT(1) },</div><div class='add'>+	[RST_BUS_CE]		=  { 0x2c0, BIT(5) },</div><div class='add'>+	[RST_BUS_DMA]		=  { 0x2c0, BIT(6) },</div><div class='add'>+	[RST_BUS_MMC0]		=  { 0x2c0, BIT(8) },</div><div class='add'>+	[RST_BUS_MMC1]		=  { 0x2c0, BIT(9) },</div><div class='add'>+	[RST_BUS_MMC2]		=  { 0x2c0, BIT(10) },</div><div class='add'>+	[RST_BUS_NAND]		=  { 0x2c0, BIT(13) },</div><div class='add'>+	[RST_BUS_DRAM]		=  { 0x2c0, BIT(14) },</div><div class='add'>+	[RST_BUS_EMAC]		=  { 0x2c0, BIT(17) },</div><div class='add'>+	[RST_BUS_TS]		=  { 0x2c0, BIT(18) },</div><div class='add'>+	[RST_BUS_HSTIMER]	=  { 0x2c0, BIT(19) },</div><div class='add'>+	[RST_BUS_SPI0]		=  { 0x2c0, BIT(20) },</div><div class='add'>+	[RST_BUS_SPI1]		=  { 0x2c0, BIT(21) },</div><div class='add'>+	[RST_BUS_OTG]		=  { 0x2c0, BIT(23) },</div><div class='add'>+	[RST_BUS_EHCI0]		=  { 0x2c0, BIT(24) },</div><div class='add'>+	[RST_BUS_EHCI1]		=  { 0x2c0, BIT(25) },</div><div class='add'>+	[RST_BUS_OHCI0]		=  { 0x2c0, BIT(28) },</div><div class='add'>+	[RST_BUS_OHCI1]		=  { 0x2c0, BIT(29) },</div><div class='add'>+</div><div class='add'>+	[RST_BUS_VE]		=  { 0x2c4, BIT(0) },</div><div class='add'>+	[RST_BUS_TCON0]		=  { 0x2c4, BIT(3) },</div><div class='add'>+	[RST_BUS_TCON1]		=  { 0x2c4, BIT(4) },</div><div class='add'>+	[RST_BUS_DEINTERLACE]	=  { 0x2c4, BIT(5) },</div><div class='add'>+	[RST_BUS_CSI]		=  { 0x2c4, BIT(8) },</div><div class='add'>+	[RST_BUS_HDMI0]		=  { 0x2c4, BIT(10) },</div><div class='add'>+	[RST_BUS_HDMI1]		=  { 0x2c4, BIT(11) },</div><div class='add'>+	[RST_BUS_DE]		=  { 0x2c4, BIT(12) },</div><div class='add'>+	[RST_BUS_GPU]		=  { 0x2c4, BIT(20) },</div><div class='add'>+	[RST_BUS_MSGBOX]	=  { 0x2c4, BIT(21) },</div><div class='add'>+	[RST_BUS_SPINLOCK]	=  { 0x2c4, BIT(22) },</div><div class='add'>+	[RST_BUS_DBG]		=  { 0x2c4, BIT(31) },</div><div class='add'>+</div><div class='add'>+	[RST_BUS_LVDS]		=  { 0x2c8, BIT(0) },</div><div class='add'>+</div><div class='add'>+	[RST_BUS_CODEC]		=  { 0x2d0, BIT(0) },</div><div class='add'>+	[RST_BUS_SPDIF]		=  { 0x2d0, BIT(1) },</div><div class='add'>+	[RST_BUS_THS]		=  { 0x2d0, BIT(8) },</div><div class='add'>+	[RST_BUS_I2S0]		=  { 0x2d0, BIT(12) },</div><div class='add'>+	[RST_BUS_I2S1]		=  { 0x2d0, BIT(13) },</div><div class='add'>+	[RST_BUS_I2S2]		=  { 0x2d0, BIT(14) },</div><div class='add'>+</div><div class='add'>+	[RST_BUS_I2C0]		=  { 0x2d8, BIT(0) },</div><div class='add'>+	[RST_BUS_I2C1]		=  { 0x2d8, BIT(1) },</div><div class='add'>+	[RST_BUS_I2C2]		=  { 0x2d8, BIT(2) },</div><div class='add'>+	[RST_BUS_SCR]		=  { 0x2d8, BIT(5) },</div><div class='add'>+	[RST_BUS_UART0]		=  { 0x2d8, BIT(16) },</div><div class='add'>+	[RST_BUS_UART1]		=  { 0x2d8, BIT(17) },</div><div class='add'>+	[RST_BUS_UART2]		=  { 0x2d8, BIT(18) },</div><div class='add'>+	[RST_BUS_UART3]		=  { 0x2d8, BIT(19) },</div><div class='add'>+	[RST_BUS_UART4]		=  { 0x2d8, BIT(20) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sunxi_ccu_desc sun50i_a64_ccu_desc = {</div><div class='add'>+	.ccu_clks	= sun50i_a64_ccu_clks,</div><div class='add'>+	.num_ccu_clks	= ARRAY_SIZE(sun50i_a64_ccu_clks),</div><div class='add'>+</div><div class='add'>+	.hw_clks	= &amp;sun50i_a64_hw_clks,</div><div class='add'>+</div><div class='add'>+	.resets		= sun50i_a64_ccu_resets,</div><div class='add'>+	.num_resets	= ARRAY_SIZE(sun50i_a64_ccu_resets),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sun50i_a64_ccu_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct resource *res;</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	reg = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(reg))</div><div class='add'>+		return PTR_ERR(reg);</div><div class='add'>+</div><div class='add'>+	/* Force the PLL-Audio-1x divider to 4 */</div><div class='add'>+	val = readl(reg + SUN50I_A64_PLL_AUDIO_REG);</div><div class='add'>+	val &amp;= ~GENMASK(19, 16);</div><div class='add'>+	writel(val | (3 &lt;&lt; 16), reg + SUN50I_A64_PLL_AUDIO_REG);</div><div class='add'>+</div><div class='add'>+	writel(0x515, reg + SUN50I_A64_PLL_MIPI_REG);</div><div class='add'>+</div><div class='add'>+	return sunxi_ccu_probe(pdev-&gt;dev.of_node, reg, &amp;sun50i_a64_ccu_desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id sun50i_a64_ccu_ids[] = {</div><div class='add'>+	{ .compatible = "allwinner,sun50i-a64-ccu" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver sun50i_a64_ccu_driver = {</div><div class='add'>+	.probe	= sun50i_a64_ccu_probe,</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name	= "sun50i-a64-ccu",</div><div class='add'>+		.of_match_table	= sun50i_a64_ccu_ids,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+builtin_platform_driver(sun50i_a64_ccu_driver);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.h b/drivers/clk/sunxi-ng/ccu-sun50i-a64.h<br/>new file mode 100644<br/>index 000000000000..9b3cd24b78d2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun50i-a64.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun50i-a64.h</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Maxime Ripard</div><div class='add'>+ *</div><div class='add'>+ * Maxime Ripard &lt;maxime.ripard@free-electrons.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CCU_SUN50I_A64_H_</div><div class='add'>+#define _CCU_SUN50I_A64_H_</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/sun50i-a64-ccu.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun50i-a64-ccu.h&gt;</div><div class='add'>+</div><div class='add'>+#define CLK_OSC_12M			0</div><div class='add'>+#define CLK_PLL_CPUX			1</div><div class='add'>+#define CLK_PLL_AUDIO_BASE		2</div><div class='add'>+#define CLK_PLL_AUDIO			3</div><div class='add'>+#define CLK_PLL_AUDIO_2X		4</div><div class='add'>+#define CLK_PLL_AUDIO_4X		5</div><div class='add'>+#define CLK_PLL_AUDIO_8X		6</div><div class='add'>+#define CLK_PLL_VIDEO0			7</div><div class='add'>+#define CLK_PLL_VIDEO0_2X		8</div><div class='add'>+#define CLK_PLL_VE			9</div><div class='add'>+#define CLK_PLL_DDR0			10</div><div class='add'>+#define CLK_PLL_PERIPH0			11</div><div class='add'>+#define CLK_PLL_PERIPH0_2X		12</div><div class='add'>+#define CLK_PLL_PERIPH1			13</div><div class='add'>+#define CLK_PLL_PERIPH1_2X		14</div><div class='add'>+#define CLK_PLL_VIDEO1			15</div><div class='add'>+#define CLK_PLL_GPU			16</div><div class='add'>+#define CLK_PLL_MIPI			17</div><div class='add'>+#define CLK_PLL_HSIC			18</div><div class='add'>+#define CLK_PLL_DE			19</div><div class='add'>+#define CLK_PLL_DDR1			20</div><div class='add'>+#define CLK_CPUX			21</div><div class='add'>+#define CLK_AXI				22</div><div class='add'>+#define CLK_APB				23</div><div class='add'>+#define CLK_AHB1			24</div><div class='add'>+#define CLK_APB1			25</div><div class='add'>+#define CLK_APB2			26</div><div class='add'>+#define CLK_AHB2			27</div><div class='add'>+</div><div class='add'>+/* All the bus gates are exported */</div><div class='add'>+</div><div class='add'>+/* The first bunch of module clocks are exported */</div><div class='add'>+</div><div class='add'>+#define CLK_USB_OHCI0_12M		90</div><div class='add'>+</div><div class='add'>+#define CLK_USB_OHCI1_12M		92</div><div class='add'>+</div><div class='add'>+#define CLK_DRAM			94</div><div class='add'>+</div><div class='add'>+/* All the DRAM gates are exported */</div><div class='add'>+</div><div class='add'>+/* Some more module clocks are exported */</div><div class='add'>+</div><div class='add'>+#define CLK_MBUS			112</div><div class='add'>+</div><div class='add'>+/* And the DSI and GPU module clock is exported */</div><div class='add'>+</div><div class='add'>+#define CLK_NUMBER			(CLK_GPU + 1)</div><div class='add'>+</div><div class='add'>+#endif /* _CCU_SUN50I_A64_H_ */</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun5i.c b/drivers/clk/sunxi-ng/ccu-sun5i.c<br/>new file mode 100644<br/>index 000000000000..06edaa523479<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun5i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun5i.c</a></div><div class='hunk'>@@ -0,0 +1,1022 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Maxime Ripard. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ccu_common.h"</div><div class='add'>+#include "ccu_reset.h"</div><div class='add'>+</div><div class='add'>+#include "ccu_div.h"</div><div class='add'>+#include "ccu_gate.h"</div><div class='add'>+#include "ccu_mp.h"</div><div class='add'>+#include "ccu_mult.h"</div><div class='add'>+#include "ccu_nk.h"</div><div class='add'>+#include "ccu_nkm.h"</div><div class='add'>+#include "ccu_nkmp.h"</div><div class='add'>+#include "ccu_nm.h"</div><div class='add'>+#include "ccu_phase.h"</div><div class='add'>+</div><div class='add'>+#include "ccu-sun5i.h"</div><div class='add'>+</div><div class='add'>+static struct ccu_nkmp pll_core_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET(8, 5, 0),</div><div class='add'>+	.k		= _SUNXI_CCU_MULT(4, 2),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(0, 2),</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(16, 2),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x000,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-core",</div><div class='add'>+					      "hosc",</div><div class='add'>+					      &amp;ccu_nkmp_ops,</div><div class='add'>+					      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Audio PLL is supposed to have 4 outputs: 3 fixed factors from</div><div class='add'>+ * the base (2x, 4x and 8x), and one variable divider (the one true</div><div class='add'>+ * pll audio).</div><div class='add'>+ *</div><div class='add'>+ * We don't have any need for the variable divider for now, so we just</div><div class='add'>+ * hardcode it to match with the clock names</div><div class='add'>+ */</div><div class='add'>+#define SUN5I_PLL_AUDIO_REG	0x008</div><div class='add'>+</div><div class='add'>+static struct ccu_nm pll_audio_base_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET(8, 7, 0),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The datasheet is wrong here, this doesn't have any</div><div class='add'>+	 * offset</div><div class='add'>+	 */</div><div class='add'>+	.m		= _SUNXI_CCU_DIV_OFFSET(0, 5, 0),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x008,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-audio-base",</div><div class='add'>+					      "hosc",</div><div class='add'>+					      &amp;ccu_nm_ops,</div><div class='add'>+					      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_mult pll_video0_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.mult		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(0, 7, 0, 9, 127),</div><div class='add'>+	.frac		= _SUNXI_CCU_FRAC(BIT(15), BIT(14),</div><div class='add'>+					  270000000, 297000000),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x010,</div><div class='add'>+		.features	= (CCU_FEATURE_FRACTIONAL |</div><div class='add'>+				   CCU_FEATURE_ALL_PREDIV),</div><div class='add'>+		.prediv		= 8,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-video0",</div><div class='add'>+					      "hosc",</div><div class='add'>+					      &amp;ccu_mult_ops,</div><div class='add'>+					      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nkmp pll_ve_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET(8, 5, 0),</div><div class='add'>+	.k		= _SUNXI_CCU_MULT(4, 2),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(0, 2),</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(16, 2),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x018,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-ve",</div><div class='add'>+					      "hosc",</div><div class='add'>+					      &amp;ccu_nkmp_ops,</div><div class='add'>+					      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nk pll_ddr_base_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET(8, 5, 0),</div><div class='add'>+	.k		= _SUNXI_CCU_MULT(4, 2),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x020,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-ddr-base",</div><div class='add'>+					      "hosc",</div><div class='add'>+					      &amp;ccu_nk_ops,</div><div class='add'>+					      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M(pll_ddr_clk, "pll-ddr", "pll-ddr-base", 0x020, 0, 2,</div><div class='add'>+		   CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static struct ccu_div pll_ddr_other_clk = {</div><div class='add'>+	.div		= _SUNXI_CCU_DIV_FLAGS(16, 2, CLK_DIVIDER_POWER_OF_TWO),</div><div class='add'>+</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x020,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-ddr-other", "pll-ddr-base",</div><div class='add'>+					      &amp;ccu_div_ops,</div><div class='add'>+					      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nk pll_periph_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET(8, 5, 0),</div><div class='add'>+	.k		= _SUNXI_CCU_MULT(4, 2),</div><div class='add'>+	.fixed_post_div	= 2,</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x028,</div><div class='add'>+		.features	= CCU_FEATURE_FIXED_POSTDIV,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-periph",</div><div class='add'>+					      "hosc",</div><div class='add'>+					      &amp;ccu_nk_ops,</div><div class='add'>+					      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_mult pll_video1_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.mult		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(0, 7, 0, 9, 127),</div><div class='add'>+	.frac		= _SUNXI_CCU_FRAC(BIT(15), BIT(14),</div><div class='add'>+				  270000000, 297000000),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x030,</div><div class='add'>+		.features	= (CCU_FEATURE_FRACTIONAL |</div><div class='add'>+				   CCU_FEATURE_ALL_PREDIV),</div><div class='add'>+		.prediv		= 8,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-video1",</div><div class='add'>+					      "hosc",</div><div class='add'>+					      &amp;ccu_mult_ops,</div><div class='add'>+					      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(hosc_clk,	"hosc",	"osc24M", 0x050, BIT(0), 0);</div><div class='add'>+</div><div class='add'>+#define SUN5I_AHB_REG	0x054</div><div class='add'>+static const char * const cpu_parents[] = { "osc32k", "hosc",</div><div class='add'>+					    "pll-core" , "pll-periph" };</div><div class='add'>+static const struct ccu_mux_fixed_prediv cpu_predivs[] = {</div><div class='add'>+	{ .index = 3, .div = 3, },</div><div class='add'>+};</div><div class='add'>+static struct ccu_mux cpu_clk = {</div><div class='add'>+	.mux		= {</div><div class='add'>+		.shift		= 16,</div><div class='add'>+		.width		= 2,</div><div class='add'>+		.fixed_predivs	= cpu_predivs,</div><div class='add'>+		.n_predivs	= ARRAY_SIZE(cpu_predivs),</div><div class='add'>+	},</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x054,</div><div class='add'>+		.features	= CCU_FEATURE_FIXED_PREDIV,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("cpu",</div><div class='add'>+						      cpu_parents,</div><div class='add'>+						      &amp;ccu_mux_ops,</div><div class='add'>+						      CLK_IS_CRITICAL),</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M(axi_clk, "axi", "cpu", 0x054, 0, 2, 0);</div><div class='add'>+</div><div class='add'>+static const char * const ahb_parents[] = { "axi" , "cpu", "pll-periph" };</div><div class='add'>+static const struct ccu_mux_fixed_prediv ahb_predivs[] = {</div><div class='add'>+	{ .index = 2, .div = 2, },</div><div class='add'>+};</div><div class='add'>+static struct ccu_div ahb_clk = {</div><div class='add'>+	.div		= _SUNXI_CCU_DIV_FLAGS(4, 2, CLK_DIVIDER_POWER_OF_TWO),</div><div class='add'>+	.mux		= {</div><div class='add'>+		.shift		= 6,</div><div class='add'>+		.width		= 2,</div><div class='add'>+		.fixed_predivs	= ahb_predivs,</div><div class='add'>+		.n_predivs	= ARRAY_SIZE(ahb_predivs),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x054,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("ahb",</div><div class='add'>+						      ahb_parents,</div><div class='add'>+						      &amp;ccu_div_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_div_table apb0_div_table[] = {</div><div class='add'>+	{ .val = 0, .div = 2 },</div><div class='add'>+	{ .val = 1, .div = 2 },</div><div class='add'>+	{ .val = 2, .div = 4 },</div><div class='add'>+	{ .val = 3, .div = 8 },</div><div class='add'>+	{ /* Sentinel */ },</div><div class='add'>+};</div><div class='add'>+static SUNXI_CCU_DIV_TABLE(apb0_clk, "apb0", "ahb",</div><div class='add'>+			   0x054, 8, 2, apb0_div_table, 0);</div><div class='add'>+</div><div class='add'>+static const char * const apb1_parents[] = { "hosc", "pll-periph", "osc32k" };</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX(apb1_clk, "apb1", apb1_parents, 0x058,</div><div class='add'>+			     0, 5,	/* M */</div><div class='add'>+			     16, 2,	/* P */</div><div class='add'>+			     24, 2,	/* mux */</div><div class='add'>+			     0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(axi_dram_clk,	"axi-dram",	"axi",</div><div class='add'>+		      0x05c, BIT(0), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(ahb_otg_clk,	"ahb-otg",	"ahb",</div><div class='add'>+		      0x060, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_ehci_clk,	"ahb-ehci",	"ahb",</div><div class='add'>+		      0x060, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_ohci_clk,	"ahb-ohci",	"ahb",</div><div class='add'>+		      0x060, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_ss_clk,	"ahb-ss",	"ahb",</div><div class='add'>+		      0x060, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_dma_clk,	"ahb-dma",	"ahb",</div><div class='add'>+		      0x060, BIT(6), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_bist_clk,	"ahb-bist",	"ahb",</div><div class='add'>+		      0x060, BIT(6), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_mmc0_clk,	"ahb-mmc0",	"ahb",</div><div class='add'>+		      0x060, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_mmc1_clk,	"ahb-mmc1",	"ahb",</div><div class='add'>+		      0x060, BIT(9), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_mmc2_clk,	"ahb-mmc2",	"ahb",</div><div class='add'>+		      0x060, BIT(10), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_nand_clk,	"ahb-nand",	"ahb",</div><div class='add'>+		      0x060, BIT(13), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_sdram_clk,	"ahb-sdram",	"ahb",</div><div class='add'>+		      0x060, BIT(14), CLK_IS_CRITICAL);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_emac_clk,	"ahb-emac",	"ahb",</div><div class='add'>+		      0x060, BIT(17), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_ts_clk,	"ahb-ts",	"ahb",</div><div class='add'>+		      0x060, BIT(18), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_spi0_clk,	"ahb-spi0",	"ahb",</div><div class='add'>+		      0x060, BIT(20), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_spi1_clk,	"ahb-spi1",	"ahb",</div><div class='add'>+		      0x060, BIT(21), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_spi2_clk,	"ahb-spi2",	"ahb",</div><div class='add'>+		      0x060, BIT(22), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_gps_clk,	"ahb-gps",	"ahb",</div><div class='add'>+		      0x060, BIT(26), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_hstimer_clk,	"ahb-hstimer",	"ahb",</div><div class='add'>+		      0x060, BIT(28), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(ahb_ve_clk,	"ahb-ve",	"ahb",</div><div class='add'>+		      0x064, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_tve_clk,	"ahb-tve",	"ahb",</div><div class='add'>+		      0x064, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_lcd_clk,	"ahb-lcd",	"ahb",</div><div class='add'>+		      0x064, BIT(4), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_csi_clk,	"ahb-csi",	"ahb",</div><div class='add'>+		      0x064, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_hdmi_clk,	"ahb-hdmi",	"ahb",</div><div class='add'>+		      0x064, BIT(11), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_de_be_clk,	"ahb-de-be",	"ahb",</div><div class='add'>+		      0x064, BIT(12), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_de_fe_clk,	"ahb-de-fe",	"ahb",</div><div class='add'>+		      0x064, BIT(14), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_iep_clk,	"ahb-iep",	"ahb",</div><div class='add'>+		      0x064, BIT(19), 0);</div><div class='add'>+static SUNXI_CCU_GATE(ahb_gpu_clk,	"ahb-gpu",	"ahb",</div><div class='add'>+		      0x064, BIT(20), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(apb0_codec_clk,	"apb0-codec",	"apb0",</div><div class='add'>+		      0x068, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(apb0_spdif_clk,	"apb0-spdif",	"apb0",</div><div class='add'>+		      0x068, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(apb0_i2s_clk,	"apb0-i2s",	"apb0",</div><div class='add'>+		      0x068, BIT(3), 0);</div><div class='add'>+static SUNXI_CCU_GATE(apb0_pio_clk,	"apb0-pio",	"apb0",</div><div class='add'>+		      0x068, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(apb0_ir_clk,	"apb0-ir",	"apb0",</div><div class='add'>+		      0x068, BIT(6), 0);</div><div class='add'>+static SUNXI_CCU_GATE(apb0_keypad_clk,	"apb0-keypad",	"apb0",</div><div class='add'>+		      0x068, BIT(10), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(apb1_i2c0_clk,	"apb1-i2c0",	"apb1",</div><div class='add'>+		      0x06c, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(apb1_i2c1_clk,	"apb1-i2c1",	"apb1",</div><div class='add'>+		      0x06c, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(apb1_i2c2_clk,	"apb1-i2c2",	"apb1",</div><div class='add'>+		      0x06c, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(apb1_uart0_clk,	"apb1-uart0",	"apb1",</div><div class='add'>+		      0x06c, BIT(16), 0);</div><div class='add'>+static SUNXI_CCU_GATE(apb1_uart1_clk,	"apb1-uart1",	"apb1",</div><div class='add'>+		      0x06c, BIT(17), 0);</div><div class='add'>+static SUNXI_CCU_GATE(apb1_uart2_clk,	"apb1-uart2",	"apb1",</div><div class='add'>+		      0x06c, BIT(18), 0);</div><div class='add'>+static SUNXI_CCU_GATE(apb1_uart3_clk,	"apb1-uart3",	"apb1",</div><div class='add'>+		      0x06c, BIT(19), 0);</div><div class='add'>+</div><div class='add'>+static const char * const mod0_default_parents[] = { "hosc", "pll-periph",</div><div class='add'>+						     "pll-ddr-other" };</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(nand_clk, "nand", mod0_default_parents, 0x080,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc0_clk, "mmc0", mod0_default_parents, 0x088,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc1_clk, "mmc1", mod0_default_parents, 0x08c,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc2_clk, "mmc2", mod0_default_parents, 0x090,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(ts_clk, "ts", mod0_default_parents, 0x098,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(ss_clk, "ss", mod0_default_parents, 0x09c,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(spi0_clk, "spi0", mod0_default_parents, 0x0a0,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(spi1_clk, "spi1", mod0_default_parents, 0x0a4,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(spi2_clk, "spi2", mod0_default_parents, 0x0a8,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(ir_clk, "ir", mod0_default_parents, 0x0b0,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static const char * const i2s_parents[] = { "pll-audio-8x", "pll-audio-4x",</div><div class='add'>+					    "pll-audio-2x", "pll-audio" };</div><div class='add'>+static SUNXI_CCU_MUX_WITH_GATE(i2s_clk, "i2s", i2s_parents,</div><div class='add'>+			       0x0b8, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static const char * const spdif_parents[] = { "pll-audio-8x", "pll-audio-4x",</div><div class='add'>+					    "pll-audio-2x", "pll-audio" };</div><div class='add'>+static SUNXI_CCU_MUX_WITH_GATE(spdif_clk, "spdif", spdif_parents,</div><div class='add'>+			       0x0c0, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static const char * const keypad_parents[] = { "hosc", "losc"};</div><div class='add'>+static const u8 keypad_table[] = { 0, 2 };</div><div class='add'>+static struct ccu_mp keypad_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(8, 5),</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(20, 2),</div><div class='add'>+	.mux		= _SUNXI_CCU_MUX_TABLE(24, 2, keypad_table),</div><div class='add'>+</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x0c4,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("keypad",</div><div class='add'>+						      keypad_parents,</div><div class='add'>+						      &amp;ccu_mp_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(usb_ohci_clk,	"usb-ohci",	"pll-periph",</div><div class='add'>+		      0x0cc, BIT(6), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb_phy0_clk,	"usb-phy0",	"pll-periph",</div><div class='add'>+		      0x0cc, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb_phy1_clk,	"usb-phy1",	"pll-periph",</div><div class='add'>+		      0x0cc, BIT(9), 0);</div><div class='add'>+</div><div class='add'>+static const char * const gps_parents[] = { "hosc", "pll-periph",</div><div class='add'>+					    "pll-video1", "pll-ve" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(gps_clk, "gps", gps_parents,</div><div class='add'>+				 0x0d0, 0, 3, 24, 2, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(dram_ve_clk,	"dram-ve",	"pll-ddr",</div><div class='add'>+		      0x100, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_csi_clk,	"dram-csi",	"pll-ddr",</div><div class='add'>+		      0x100, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_ts_clk,	"dram-ts",	"pll-ddr",</div><div class='add'>+		      0x100, BIT(3), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_tve_clk,	"dram-tve",	"pll-ddr",</div><div class='add'>+		      0x100, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_de_fe_clk,	"dram-de-fe",	"pll-ddr",</div><div class='add'>+		      0x100, BIT(25), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_de_be_clk,	"dram-de-be",	"pll-ddr",</div><div class='add'>+		      0x100, BIT(26), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_ace_clk,	"dram-ace",	"pll-ddr",</div><div class='add'>+		      0x100, BIT(29), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_iep_clk,	"dram-iep",	"pll-ddr",</div><div class='add'>+		      0x100, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const de_parents[] = { "pll-video0", "pll-video1",</div><div class='add'>+					   "pll-ddr-other" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(de_be_clk, "de-be", de_parents,</div><div class='add'>+				 0x104, 0, 4, 24, 2, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(de_fe_clk, "de-fe", de_parents,</div><div class='add'>+				 0x10c, 0, 4, 24, 2, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const tcon_parents[] = { "pll-video0", "pll-video1",</div><div class='add'>+					     "pll-video0-2x", "pll-video1-2x" };</div><div class='add'>+static SUNXI_CCU_MUX_WITH_GATE(tcon_ch0_clk, "tcon-ch0-sclk", tcon_parents,</div><div class='add'>+			       0x118, 24, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(tcon_ch1_sclk2_clk, "tcon-ch1-sclk2",</div><div class='add'>+				 tcon_parents,</div><div class='add'>+				 0x12c, 0, 4, 24, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(tcon_ch1_sclk1_clk, "tcon-ch1-sclk1", "tcon-ch1-sclk2",</div><div class='add'>+			     0x12c, 11, 1, BIT(15), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static const char * const csi_parents[] = { "hosc", "pll-video0", "pll-video1",</div><div class='add'>+					    "pll-video0-2x", "pll-video1-2x" };</div><div class='add'>+static const u8 csi_table[] = { 0, 1, 2, 5, 6 };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(csi_clk, "csi",</div><div class='add'>+				       csi_parents, csi_table,</div><div class='add'>+				       0x134, 0, 5, 24, 2, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(ve_clk,		"ve",		"pll-ve",</div><div class='add'>+		      0x13c, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(codec_clk,	"codec",	"pll-audio",</div><div class='add'>+		      0x140, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(avs_clk,		"avs",		"hosc",</div><div class='add'>+		      0x144, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const hdmi_parents[] = { "pll-video0", "pll-video0-2x" };</div><div class='add'>+static const u8 hdmi_table[] = { 0, 2 };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(hdmi_clk, "hdmi",</div><div class='add'>+				       hdmi_parents, hdmi_table,</div><div class='add'>+				       0x150, 0, 4, 24, 2, BIT(31),</div><div class='add'>+				       CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static const char * const gpu_parents[] = { "pll-video0", "pll-ve",</div><div class='add'>+					    "pll-ddr-other", "pll-video1",</div><div class='add'>+					    "pll-video1-2x" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(gpu_clk, "gpu", gpu_parents,</div><div class='add'>+				 0x154, 0, 4, 24, 3, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const mbus_parents[] = { "hosc", "pll-periph", "pll-ddr" };</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mbus_clk, "mbus", mbus_parents,</div><div class='add'>+				  0x15c, 0, 4, 16, 2, 24, 2, BIT(31), CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(iep_clk,		"iep",		"de-be",</div><div class='add'>+		      0x160, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static struct ccu_common *sun5i_a10s_ccu_clks[] = {</div><div class='add'>+	&amp;hosc_clk.common,</div><div class='add'>+	&amp;pll_core_clk.common,</div><div class='add'>+	&amp;pll_audio_base_clk.common,</div><div class='add'>+	&amp;pll_video0_clk.common,</div><div class='add'>+	&amp;pll_ve_clk.common,</div><div class='add'>+	&amp;pll_ddr_base_clk.common,</div><div class='add'>+	&amp;pll_ddr_clk.common,</div><div class='add'>+	&amp;pll_ddr_other_clk.common,</div><div class='add'>+	&amp;pll_periph_clk.common,</div><div class='add'>+	&amp;pll_video1_clk.common,</div><div class='add'>+	&amp;cpu_clk.common,</div><div class='add'>+	&amp;axi_clk.common,</div><div class='add'>+	&amp;ahb_clk.common,</div><div class='add'>+	&amp;apb0_clk.common,</div><div class='add'>+	&amp;apb1_clk.common,</div><div class='add'>+	&amp;axi_dram_clk.common,</div><div class='add'>+	&amp;ahb_otg_clk.common,</div><div class='add'>+	&amp;ahb_ehci_clk.common,</div><div class='add'>+	&amp;ahb_ohci_clk.common,</div><div class='add'>+	&amp;ahb_ss_clk.common,</div><div class='add'>+	&amp;ahb_dma_clk.common,</div><div class='add'>+	&amp;ahb_bist_clk.common,</div><div class='add'>+	&amp;ahb_mmc0_clk.common,</div><div class='add'>+	&amp;ahb_mmc1_clk.common,</div><div class='add'>+	&amp;ahb_mmc2_clk.common,</div><div class='add'>+	&amp;ahb_nand_clk.common,</div><div class='add'>+	&amp;ahb_sdram_clk.common,</div><div class='add'>+	&amp;ahb_emac_clk.common,</div><div class='add'>+	&amp;ahb_ts_clk.common,</div><div class='add'>+	&amp;ahb_spi0_clk.common,</div><div class='add'>+	&amp;ahb_spi1_clk.common,</div><div class='add'>+	&amp;ahb_spi2_clk.common,</div><div class='add'>+	&amp;ahb_gps_clk.common,</div><div class='add'>+	&amp;ahb_hstimer_clk.common,</div><div class='add'>+	&amp;ahb_ve_clk.common,</div><div class='add'>+	&amp;ahb_tve_clk.common,</div><div class='add'>+	&amp;ahb_lcd_clk.common,</div><div class='add'>+	&amp;ahb_csi_clk.common,</div><div class='add'>+	&amp;ahb_hdmi_clk.common,</div><div class='add'>+	&amp;ahb_de_be_clk.common,</div><div class='add'>+	&amp;ahb_de_fe_clk.common,</div><div class='add'>+	&amp;ahb_iep_clk.common,</div><div class='add'>+	&amp;ahb_gpu_clk.common,</div><div class='add'>+	&amp;apb0_codec_clk.common,</div><div class='add'>+	&amp;apb0_spdif_clk.common,</div><div class='add'>+	&amp;apb0_i2s_clk.common,</div><div class='add'>+	&amp;apb0_pio_clk.common,</div><div class='add'>+	&amp;apb0_ir_clk.common,</div><div class='add'>+	&amp;apb0_keypad_clk.common,</div><div class='add'>+	&amp;apb1_i2c0_clk.common,</div><div class='add'>+	&amp;apb1_i2c1_clk.common,</div><div class='add'>+	&amp;apb1_i2c2_clk.common,</div><div class='add'>+	&amp;apb1_uart0_clk.common,</div><div class='add'>+	&amp;apb1_uart1_clk.common,</div><div class='add'>+	&amp;apb1_uart2_clk.common,</div><div class='add'>+	&amp;apb1_uart3_clk.common,</div><div class='add'>+	&amp;nand_clk.common,</div><div class='add'>+	&amp;mmc0_clk.common,</div><div class='add'>+	&amp;mmc1_clk.common,</div><div class='add'>+	&amp;mmc2_clk.common,</div><div class='add'>+	&amp;ts_clk.common,</div><div class='add'>+	&amp;ss_clk.common,</div><div class='add'>+	&amp;spi0_clk.common,</div><div class='add'>+	&amp;spi1_clk.common,</div><div class='add'>+	&amp;spi2_clk.common,</div><div class='add'>+	&amp;ir_clk.common,</div><div class='add'>+	&amp;i2s_clk.common,</div><div class='add'>+	&amp;spdif_clk.common,</div><div class='add'>+	&amp;keypad_clk.common,</div><div class='add'>+	&amp;usb_ohci_clk.common,</div><div class='add'>+	&amp;usb_phy0_clk.common,</div><div class='add'>+	&amp;usb_phy1_clk.common,</div><div class='add'>+	&amp;gps_clk.common,</div><div class='add'>+	&amp;dram_ve_clk.common,</div><div class='add'>+	&amp;dram_csi_clk.common,</div><div class='add'>+	&amp;dram_ts_clk.common,</div><div class='add'>+	&amp;dram_tve_clk.common,</div><div class='add'>+	&amp;dram_de_fe_clk.common,</div><div class='add'>+	&amp;dram_de_be_clk.common,</div><div class='add'>+	&amp;dram_ace_clk.common,</div><div class='add'>+	&amp;dram_iep_clk.common,</div><div class='add'>+	&amp;de_be_clk.common,</div><div class='add'>+	&amp;de_fe_clk.common,</div><div class='add'>+	&amp;tcon_ch0_clk.common,</div><div class='add'>+	&amp;tcon_ch1_sclk2_clk.common,</div><div class='add'>+	&amp;tcon_ch1_sclk1_clk.common,</div><div class='add'>+	&amp;csi_clk.common,</div><div class='add'>+	&amp;ve_clk.common,</div><div class='add'>+	&amp;codec_clk.common,</div><div class='add'>+	&amp;avs_clk.common,</div><div class='add'>+	&amp;hdmi_clk.common,</div><div class='add'>+	&amp;gpu_clk.common,</div><div class='add'>+	&amp;mbus_clk.common,</div><div class='add'>+	&amp;iep_clk.common,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* We hardcode the divider to 4 for now */</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_clk, "pll-audio",</div><div class='add'>+			"pll-audio-base", 4, 1, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_2x_clk, "pll-audio-2x",</div><div class='add'>+			"pll-audio-base", 2, 1, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_4x_clk, "pll-audio-4x",</div><div class='add'>+			"pll-audio-base", 1, 1, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_8x_clk, "pll-audio-8x",</div><div class='add'>+			"pll-audio-base", 1, 2, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_video0_2x_clk, "pll-video0-2x",</div><div class='add'>+			"pll-video0", 1, 2, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_video1_2x_clk, "pll-video1-2x",</div><div class='add'>+			"pll-video1", 1, 2, CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static struct clk_hw_onecell_data sun5i_a10s_hw_clks = {</div><div class='add'>+	.hws	= {</div><div class='add'>+		[CLK_HOSC]		= &amp;hosc_clk.common.hw,</div><div class='add'>+		[CLK_PLL_CORE]		= &amp;pll_core_clk.common.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_BASE]	= &amp;pll_audio_base_clk.common.hw,</div><div class='add'>+		[CLK_PLL_AUDIO]		= &amp;pll_audio_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_2X]	= &amp;pll_audio_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_4X]	= &amp;pll_audio_4x_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_8X]	= &amp;pll_audio_8x_clk.hw,</div><div class='add'>+		[CLK_PLL_VIDEO0]	= &amp;pll_video0_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO0_2X]	= &amp;pll_video0_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_VE]		= &amp;pll_ve_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR_BASE]	= &amp;pll_ddr_base_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR]		= &amp;pll_ddr_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR_OTHER]	= &amp;pll_ddr_other_clk.common.hw,</div><div class='add'>+		[CLK_PLL_PERIPH]	= &amp;pll_periph_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO1]	= &amp;pll_video1_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO1_2X]	= &amp;pll_video1_2x_clk.hw,</div><div class='add'>+		[CLK_CPU]		= &amp;cpu_clk.common.hw,</div><div class='add'>+		[CLK_AXI]		= &amp;axi_clk.common.hw,</div><div class='add'>+		[CLK_AHB]		= &amp;ahb_clk.common.hw,</div><div class='add'>+		[CLK_APB0]		= &amp;apb0_clk.common.hw,</div><div class='add'>+		[CLK_APB1]		= &amp;apb1_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_AXI]		= &amp;axi_dram_clk.common.hw,</div><div class='add'>+		[CLK_AHB_OTG]		= &amp;ahb_otg_clk.common.hw,</div><div class='add'>+		[CLK_AHB_EHCI]		= &amp;ahb_ehci_clk.common.hw,</div><div class='add'>+		[CLK_AHB_OHCI]		= &amp;ahb_ohci_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SS]		= &amp;ahb_ss_clk.common.hw,</div><div class='add'>+		[CLK_AHB_DMA]		= &amp;ahb_dma_clk.common.hw,</div><div class='add'>+		[CLK_AHB_BIST]		= &amp;ahb_bist_clk.common.hw,</div><div class='add'>+		[CLK_AHB_MMC0]		= &amp;ahb_mmc0_clk.common.hw,</div><div class='add'>+		[CLK_AHB_MMC1]		= &amp;ahb_mmc1_clk.common.hw,</div><div class='add'>+		[CLK_AHB_MMC2]		= &amp;ahb_mmc2_clk.common.hw,</div><div class='add'>+		[CLK_AHB_NAND]		= &amp;ahb_nand_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SDRAM]		= &amp;ahb_sdram_clk.common.hw,</div><div class='add'>+		[CLK_AHB_EMAC]		= &amp;ahb_emac_clk.common.hw,</div><div class='add'>+		[CLK_AHB_TS]		= &amp;ahb_ts_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SPI0]		= &amp;ahb_spi0_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SPI1]		= &amp;ahb_spi1_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SPI2]		= &amp;ahb_spi2_clk.common.hw,</div><div class='add'>+		[CLK_AHB_GPS]		= &amp;ahb_gps_clk.common.hw,</div><div class='add'>+		[CLK_AHB_HSTIMER]	= &amp;ahb_hstimer_clk.common.hw,</div><div class='add'>+		[CLK_AHB_VE]		= &amp;ahb_ve_clk.common.hw,</div><div class='add'>+		[CLK_AHB_TVE]		= &amp;ahb_tve_clk.common.hw,</div><div class='add'>+		[CLK_AHB_LCD]		= &amp;ahb_lcd_clk.common.hw,</div><div class='add'>+		[CLK_AHB_CSI]		= &amp;ahb_csi_clk.common.hw,</div><div class='add'>+		[CLK_AHB_HDMI]		= &amp;ahb_hdmi_clk.common.hw,</div><div class='add'>+		[CLK_AHB_DE_BE]		= &amp;ahb_de_be_clk.common.hw,</div><div class='add'>+		[CLK_AHB_DE_FE]		= &amp;ahb_de_fe_clk.common.hw,</div><div class='add'>+		[CLK_AHB_IEP]		= &amp;ahb_iep_clk.common.hw,</div><div class='add'>+		[CLK_AHB_GPU]		= &amp;ahb_gpu_clk.common.hw,</div><div class='add'>+		[CLK_APB0_CODEC]	= &amp;apb0_codec_clk.common.hw,</div><div class='add'>+		[CLK_APB0_I2S]		= &amp;apb0_i2s_clk.common.hw,</div><div class='add'>+		[CLK_APB0_PIO]		= &amp;apb0_pio_clk.common.hw,</div><div class='add'>+		[CLK_APB0_IR]		= &amp;apb0_ir_clk.common.hw,</div><div class='add'>+		[CLK_APB0_KEYPAD]	= &amp;apb0_keypad_clk.common.hw,</div><div class='add'>+		[CLK_APB1_I2C0]		= &amp;apb1_i2c0_clk.common.hw,</div><div class='add'>+		[CLK_APB1_I2C1]		= &amp;apb1_i2c1_clk.common.hw,</div><div class='add'>+		[CLK_APB1_I2C2]		= &amp;apb1_i2c2_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART0]	= &amp;apb1_uart0_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART1]	= &amp;apb1_uart1_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART2]	= &amp;apb1_uart2_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART3]	= &amp;apb1_uart3_clk.common.hw,</div><div class='add'>+		[CLK_NAND]		= &amp;nand_clk.common.hw,</div><div class='add'>+		[CLK_MMC0]		= &amp;mmc0_clk.common.hw,</div><div class='add'>+		[CLK_MMC1]		= &amp;mmc1_clk.common.hw,</div><div class='add'>+		[CLK_MMC2]		= &amp;mmc2_clk.common.hw,</div><div class='add'>+		[CLK_TS]		= &amp;ts_clk.common.hw,</div><div class='add'>+		[CLK_SS]		= &amp;ss_clk.common.hw,</div><div class='add'>+		[CLK_SPI0]		= &amp;spi0_clk.common.hw,</div><div class='add'>+		[CLK_SPI1]		= &amp;spi1_clk.common.hw,</div><div class='add'>+		[CLK_SPI2]		= &amp;spi2_clk.common.hw,</div><div class='add'>+		[CLK_IR]		= &amp;ir_clk.common.hw,</div><div class='add'>+		[CLK_I2S]		= &amp;i2s_clk.common.hw,</div><div class='add'>+		[CLK_KEYPAD]		= &amp;keypad_clk.common.hw,</div><div class='add'>+		[CLK_USB_OHCI]		= &amp;usb_ohci_clk.common.hw,</div><div class='add'>+		[CLK_USB_PHY0]		= &amp;usb_phy0_clk.common.hw,</div><div class='add'>+		[CLK_USB_PHY1]		= &amp;usb_phy1_clk.common.hw,</div><div class='add'>+		[CLK_GPS]		= &amp;gps_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_VE]		= &amp;dram_ve_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_CSI]		= &amp;dram_csi_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_TS]		= &amp;dram_ts_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_TVE]		= &amp;dram_tve_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_DE_FE]	= &amp;dram_de_fe_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_DE_BE]	= &amp;dram_de_be_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_ACE]		= &amp;dram_ace_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_IEP]		= &amp;dram_iep_clk.common.hw,</div><div class='add'>+		[CLK_DE_BE]		= &amp;de_be_clk.common.hw,</div><div class='add'>+		[CLK_DE_FE]		= &amp;de_fe_clk.common.hw,</div><div class='add'>+		[CLK_TCON_CH0]		= &amp;tcon_ch0_clk.common.hw,</div><div class='add'>+		[CLK_TCON_CH1_SCLK]	= &amp;tcon_ch1_sclk2_clk.common.hw,</div><div class='add'>+		[CLK_TCON_CH1]		= &amp;tcon_ch1_sclk1_clk.common.hw,</div><div class='add'>+		[CLK_CSI]		= &amp;csi_clk.common.hw,</div><div class='add'>+		[CLK_VE]		= &amp;ve_clk.common.hw,</div><div class='add'>+		[CLK_CODEC]		= &amp;codec_clk.common.hw,</div><div class='add'>+		[CLK_AVS]		= &amp;avs_clk.common.hw,</div><div class='add'>+		[CLK_HDMI]		= &amp;hdmi_clk.common.hw,</div><div class='add'>+		[CLK_GPU]		= &amp;gpu_clk.common.hw,</div><div class='add'>+		[CLK_MBUS]		= &amp;mbus_clk.common.hw,</div><div class='add'>+		[CLK_IEP]		= &amp;iep_clk.common.hw,</div><div class='add'>+	},</div><div class='add'>+	.num	= CLK_NUMBER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_reset_map sun5i_a10s_ccu_resets[] = {</div><div class='add'>+	[RST_USB_PHY0]		=  { 0x0cc, BIT(0) },</div><div class='add'>+	[RST_USB_PHY1]		=  { 0x0cc, BIT(1) },</div><div class='add'>+</div><div class='add'>+	[RST_GPS]		=  { 0x0d0, BIT(30) },</div><div class='add'>+</div><div class='add'>+	[RST_DE_BE]		=  { 0x104, BIT(30) },</div><div class='add'>+</div><div class='add'>+	[RST_DE_FE]		=  { 0x10c, BIT(30) },</div><div class='add'>+</div><div class='add'>+	[RST_TVE]		=  { 0x118, BIT(29) },</div><div class='add'>+	[RST_LCD]		=  { 0x118, BIT(30) },</div><div class='add'>+</div><div class='add'>+	[RST_CSI]		=  { 0x134, BIT(30) },</div><div class='add'>+</div><div class='add'>+	[RST_VE]		=  { 0x13c, BIT(0) },</div><div class='add'>+</div><div class='add'>+	[RST_GPU]		=  { 0x154, BIT(30) },</div><div class='add'>+</div><div class='add'>+	[RST_IEP]		=  { 0x160, BIT(30) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sunxi_ccu_desc sun5i_a10s_ccu_desc = {</div><div class='add'>+	.ccu_clks	= sun5i_a10s_ccu_clks,</div><div class='add'>+	.num_ccu_clks	= ARRAY_SIZE(sun5i_a10s_ccu_clks),</div><div class='add'>+</div><div class='add'>+	.hw_clks	= &amp;sun5i_a10s_hw_clks,</div><div class='add'>+</div><div class='add'>+	.resets		= sun5i_a10s_ccu_resets,</div><div class='add'>+	.num_resets	= ARRAY_SIZE(sun5i_a10s_ccu_resets),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The A13 is the A10s minus the TS, GPS, HDMI, I2S and the keypad</div><div class='add'>+ */</div><div class='add'>+static struct clk_hw_onecell_data sun5i_a13_hw_clks = {</div><div class='add'>+	.hws	= {</div><div class='add'>+		[CLK_HOSC]		= &amp;hosc_clk.common.hw,</div><div class='add'>+		[CLK_PLL_CORE]		= &amp;pll_core_clk.common.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_BASE]	= &amp;pll_audio_base_clk.common.hw,</div><div class='add'>+		[CLK_PLL_AUDIO]		= &amp;pll_audio_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_2X]	= &amp;pll_audio_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_4X]	= &amp;pll_audio_4x_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_8X]	= &amp;pll_audio_8x_clk.hw,</div><div class='add'>+		[CLK_PLL_VIDEO0]	= &amp;pll_video0_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO0_2X]	= &amp;pll_video0_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_VE]		= &amp;pll_ve_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR_BASE]	= &amp;pll_ddr_base_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR]		= &amp;pll_ddr_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR_OTHER]	= &amp;pll_ddr_other_clk.common.hw,</div><div class='add'>+		[CLK_PLL_PERIPH]	= &amp;pll_periph_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO1]	= &amp;pll_video1_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO1_2X]	= &amp;pll_video1_2x_clk.hw,</div><div class='add'>+		[CLK_CPU]		= &amp;cpu_clk.common.hw,</div><div class='add'>+		[CLK_AXI]		= &amp;axi_clk.common.hw,</div><div class='add'>+		[CLK_AHB]		= &amp;ahb_clk.common.hw,</div><div class='add'>+		[CLK_APB0]		= &amp;apb0_clk.common.hw,</div><div class='add'>+		[CLK_APB1]		= &amp;apb1_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_AXI]		= &amp;axi_dram_clk.common.hw,</div><div class='add'>+		[CLK_AHB_OTG]		= &amp;ahb_otg_clk.common.hw,</div><div class='add'>+		[CLK_AHB_EHCI]		= &amp;ahb_ehci_clk.common.hw,</div><div class='add'>+		[CLK_AHB_OHCI]		= &amp;ahb_ohci_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SS]		= &amp;ahb_ss_clk.common.hw,</div><div class='add'>+		[CLK_AHB_DMA]		= &amp;ahb_dma_clk.common.hw,</div><div class='add'>+		[CLK_AHB_BIST]		= &amp;ahb_bist_clk.common.hw,</div><div class='add'>+		[CLK_AHB_MMC0]		= &amp;ahb_mmc0_clk.common.hw,</div><div class='add'>+		[CLK_AHB_MMC1]		= &amp;ahb_mmc1_clk.common.hw,</div><div class='add'>+		[CLK_AHB_MMC2]		= &amp;ahb_mmc2_clk.common.hw,</div><div class='add'>+		[CLK_AHB_NAND]		= &amp;ahb_nand_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SDRAM]		= &amp;ahb_sdram_clk.common.hw,</div><div class='add'>+		[CLK_AHB_EMAC]		= &amp;ahb_emac_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SPI0]		= &amp;ahb_spi0_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SPI1]		= &amp;ahb_spi1_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SPI2]		= &amp;ahb_spi2_clk.common.hw,</div><div class='add'>+		[CLK_AHB_HSTIMER]	= &amp;ahb_hstimer_clk.common.hw,</div><div class='add'>+		[CLK_AHB_VE]		= &amp;ahb_ve_clk.common.hw,</div><div class='add'>+		[CLK_AHB_TVE]		= &amp;ahb_tve_clk.common.hw,</div><div class='add'>+		[CLK_AHB_LCD]		= &amp;ahb_lcd_clk.common.hw,</div><div class='add'>+		[CLK_AHB_CSI]		= &amp;ahb_csi_clk.common.hw,</div><div class='add'>+		[CLK_AHB_DE_BE]		= &amp;ahb_de_be_clk.common.hw,</div><div class='add'>+		[CLK_AHB_DE_FE]		= &amp;ahb_de_fe_clk.common.hw,</div><div class='add'>+		[CLK_AHB_IEP]		= &amp;ahb_iep_clk.common.hw,</div><div class='add'>+		[CLK_AHB_GPU]		= &amp;ahb_gpu_clk.common.hw,</div><div class='add'>+		[CLK_APB0_CODEC]	= &amp;apb0_codec_clk.common.hw,</div><div class='add'>+		[CLK_APB0_PIO]		= &amp;apb0_pio_clk.common.hw,</div><div class='add'>+		[CLK_APB0_IR]		= &amp;apb0_ir_clk.common.hw,</div><div class='add'>+		[CLK_APB1_I2C0]		= &amp;apb1_i2c0_clk.common.hw,</div><div class='add'>+		[CLK_APB1_I2C1]		= &amp;apb1_i2c1_clk.common.hw,</div><div class='add'>+		[CLK_APB1_I2C2]		= &amp;apb1_i2c2_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART0]	= &amp;apb1_uart0_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART1]	= &amp;apb1_uart1_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART2]	= &amp;apb1_uart2_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART3]	= &amp;apb1_uart3_clk.common.hw,</div><div class='add'>+		[CLK_NAND]		= &amp;nand_clk.common.hw,</div><div class='add'>+		[CLK_MMC0]		= &amp;mmc0_clk.common.hw,</div><div class='add'>+		[CLK_MMC1]		= &amp;mmc1_clk.common.hw,</div><div class='add'>+		[CLK_MMC2]		= &amp;mmc2_clk.common.hw,</div><div class='add'>+		[CLK_SS]		= &amp;ss_clk.common.hw,</div><div class='add'>+		[CLK_SPI0]		= &amp;spi0_clk.common.hw,</div><div class='add'>+		[CLK_SPI1]		= &amp;spi1_clk.common.hw,</div><div class='add'>+		[CLK_SPI2]		= &amp;spi2_clk.common.hw,</div><div class='add'>+		[CLK_IR]		= &amp;ir_clk.common.hw,</div><div class='add'>+		[CLK_USB_OHCI]		= &amp;usb_ohci_clk.common.hw,</div><div class='add'>+		[CLK_USB_PHY0]		= &amp;usb_phy0_clk.common.hw,</div><div class='add'>+		[CLK_USB_PHY1]		= &amp;usb_phy1_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_VE]		= &amp;dram_ve_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_CSI]		= &amp;dram_csi_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_TVE]		= &amp;dram_tve_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_DE_FE]	= &amp;dram_de_fe_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_DE_BE]	= &amp;dram_de_be_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_ACE]		= &amp;dram_ace_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_IEP]		= &amp;dram_iep_clk.common.hw,</div><div class='add'>+		[CLK_DE_BE]		= &amp;de_be_clk.common.hw,</div><div class='add'>+		[CLK_DE_FE]		= &amp;de_fe_clk.common.hw,</div><div class='add'>+		[CLK_TCON_CH0]		= &amp;tcon_ch0_clk.common.hw,</div><div class='add'>+		[CLK_TCON_CH1_SCLK]	= &amp;tcon_ch1_sclk2_clk.common.hw,</div><div class='add'>+		[CLK_TCON_CH1]		= &amp;tcon_ch1_sclk1_clk.common.hw,</div><div class='add'>+		[CLK_CSI]		= &amp;csi_clk.common.hw,</div><div class='add'>+		[CLK_VE]		= &amp;ve_clk.common.hw,</div><div class='add'>+		[CLK_CODEC]		= &amp;codec_clk.common.hw,</div><div class='add'>+		[CLK_AVS]		= &amp;avs_clk.common.hw,</div><div class='add'>+		[CLK_GPU]		= &amp;gpu_clk.common.hw,</div><div class='add'>+		[CLK_MBUS]		= &amp;mbus_clk.common.hw,</div><div class='add'>+		[CLK_IEP]		= &amp;iep_clk.common.hw,</div><div class='add'>+	},</div><div class='add'>+	.num	= CLK_NUMBER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sunxi_ccu_desc sun5i_a13_ccu_desc = {</div><div class='add'>+	.ccu_clks	= sun5i_a10s_ccu_clks,</div><div class='add'>+	.num_ccu_clks	= ARRAY_SIZE(sun5i_a10s_ccu_clks),</div><div class='add'>+</div><div class='add'>+	.hw_clks	= &amp;sun5i_a13_hw_clks,</div><div class='add'>+</div><div class='add'>+	.resets		= sun5i_a10s_ccu_resets,</div><div class='add'>+	.num_resets	= ARRAY_SIZE(sun5i_a10s_ccu_resets),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The GR8 is the A10s CCU minus the HDMI and keypad, plus SPDIF</div><div class='add'>+ */</div><div class='add'>+static struct clk_hw_onecell_data sun5i_gr8_hw_clks = {</div><div class='add'>+	.hws	= {</div><div class='add'>+		[CLK_HOSC]		= &amp;hosc_clk.common.hw,</div><div class='add'>+		[CLK_PLL_CORE]		= &amp;pll_core_clk.common.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_BASE]	= &amp;pll_audio_base_clk.common.hw,</div><div class='add'>+		[CLK_PLL_AUDIO]		= &amp;pll_audio_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_2X]	= &amp;pll_audio_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_4X]	= &amp;pll_audio_4x_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_8X]	= &amp;pll_audio_8x_clk.hw,</div><div class='add'>+		[CLK_PLL_VIDEO0]	= &amp;pll_video0_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO0_2X]	= &amp;pll_video0_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_VE]		= &amp;pll_ve_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR_BASE]	= &amp;pll_ddr_base_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR]		= &amp;pll_ddr_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR_OTHER]	= &amp;pll_ddr_other_clk.common.hw,</div><div class='add'>+		[CLK_PLL_PERIPH]	= &amp;pll_periph_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO1]	= &amp;pll_video1_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO1_2X]	= &amp;pll_video1_2x_clk.hw,</div><div class='add'>+		[CLK_CPU]		= &amp;cpu_clk.common.hw,</div><div class='add'>+		[CLK_AXI]		= &amp;axi_clk.common.hw,</div><div class='add'>+		[CLK_AHB]		= &amp;ahb_clk.common.hw,</div><div class='add'>+		[CLK_APB0]		= &amp;apb0_clk.common.hw,</div><div class='add'>+		[CLK_APB1]		= &amp;apb1_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_AXI]		= &amp;axi_dram_clk.common.hw,</div><div class='add'>+		[CLK_AHB_OTG]		= &amp;ahb_otg_clk.common.hw,</div><div class='add'>+		[CLK_AHB_EHCI]		= &amp;ahb_ehci_clk.common.hw,</div><div class='add'>+		[CLK_AHB_OHCI]		= &amp;ahb_ohci_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SS]		= &amp;ahb_ss_clk.common.hw,</div><div class='add'>+		[CLK_AHB_DMA]		= &amp;ahb_dma_clk.common.hw,</div><div class='add'>+		[CLK_AHB_BIST]		= &amp;ahb_bist_clk.common.hw,</div><div class='add'>+		[CLK_AHB_MMC0]		= &amp;ahb_mmc0_clk.common.hw,</div><div class='add'>+		[CLK_AHB_MMC1]		= &amp;ahb_mmc1_clk.common.hw,</div><div class='add'>+		[CLK_AHB_MMC2]		= &amp;ahb_mmc2_clk.common.hw,</div><div class='add'>+		[CLK_AHB_NAND]		= &amp;ahb_nand_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SDRAM]		= &amp;ahb_sdram_clk.common.hw,</div><div class='add'>+		[CLK_AHB_EMAC]		= &amp;ahb_emac_clk.common.hw,</div><div class='add'>+		[CLK_AHB_TS]		= &amp;ahb_ts_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SPI0]		= &amp;ahb_spi0_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SPI1]		= &amp;ahb_spi1_clk.common.hw,</div><div class='add'>+		[CLK_AHB_SPI2]		= &amp;ahb_spi2_clk.common.hw,</div><div class='add'>+		[CLK_AHB_GPS]		= &amp;ahb_gps_clk.common.hw,</div><div class='add'>+		[CLK_AHB_HSTIMER]	= &amp;ahb_hstimer_clk.common.hw,</div><div class='add'>+		[CLK_AHB_VE]		= &amp;ahb_ve_clk.common.hw,</div><div class='add'>+		[CLK_AHB_TVE]		= &amp;ahb_tve_clk.common.hw,</div><div class='add'>+		[CLK_AHB_LCD]		= &amp;ahb_lcd_clk.common.hw,</div><div class='add'>+		[CLK_AHB_CSI]		= &amp;ahb_csi_clk.common.hw,</div><div class='add'>+		[CLK_AHB_DE_BE]		= &amp;ahb_de_be_clk.common.hw,</div><div class='add'>+		[CLK_AHB_DE_FE]		= &amp;ahb_de_fe_clk.common.hw,</div><div class='add'>+		[CLK_AHB_IEP]		= &amp;ahb_iep_clk.common.hw,</div><div class='add'>+		[CLK_AHB_GPU]		= &amp;ahb_gpu_clk.common.hw,</div><div class='add'>+		[CLK_APB0_CODEC]	= &amp;apb0_codec_clk.common.hw,</div><div class='add'>+		[CLK_APB0_SPDIF]	= &amp;apb0_spdif_clk.common.hw,</div><div class='add'>+		[CLK_APB0_I2S]		= &amp;apb0_i2s_clk.common.hw,</div><div class='add'>+		[CLK_APB0_PIO]		= &amp;apb0_pio_clk.common.hw,</div><div class='add'>+		[CLK_APB0_IR]		= &amp;apb0_ir_clk.common.hw,</div><div class='add'>+		[CLK_APB1_I2C0]		= &amp;apb1_i2c0_clk.common.hw,</div><div class='add'>+		[CLK_APB1_I2C1]		= &amp;apb1_i2c1_clk.common.hw,</div><div class='add'>+		[CLK_APB1_I2C2]		= &amp;apb1_i2c2_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART0]	= &amp;apb1_uart0_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART1]	= &amp;apb1_uart1_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART2]	= &amp;apb1_uart2_clk.common.hw,</div><div class='add'>+		[CLK_APB1_UART3]	= &amp;apb1_uart3_clk.common.hw,</div><div class='add'>+		[CLK_NAND]		= &amp;nand_clk.common.hw,</div><div class='add'>+		[CLK_MMC0]		= &amp;mmc0_clk.common.hw,</div><div class='add'>+		[CLK_MMC1]		= &amp;mmc1_clk.common.hw,</div><div class='add'>+		[CLK_MMC2]		= &amp;mmc2_clk.common.hw,</div><div class='add'>+		[CLK_TS]		= &amp;ts_clk.common.hw,</div><div class='add'>+		[CLK_SS]		= &amp;ss_clk.common.hw,</div><div class='add'>+		[CLK_SPI0]		= &amp;spi0_clk.common.hw,</div><div class='add'>+		[CLK_SPI1]		= &amp;spi1_clk.common.hw,</div><div class='add'>+		[CLK_SPI2]		= &amp;spi2_clk.common.hw,</div><div class='add'>+		[CLK_IR]		= &amp;ir_clk.common.hw,</div><div class='add'>+		[CLK_I2S]		= &amp;i2s_clk.common.hw,</div><div class='add'>+		[CLK_SPDIF]		= &amp;spdif_clk.common.hw,</div><div class='add'>+		[CLK_USB_OHCI]		= &amp;usb_ohci_clk.common.hw,</div><div class='add'>+		[CLK_USB_PHY0]		= &amp;usb_phy0_clk.common.hw,</div><div class='add'>+		[CLK_USB_PHY1]		= &amp;usb_phy1_clk.common.hw,</div><div class='add'>+		[CLK_GPS]		= &amp;gps_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_VE]		= &amp;dram_ve_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_CSI]		= &amp;dram_csi_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_TS]		= &amp;dram_ts_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_TVE]		= &amp;dram_tve_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_DE_FE]	= &amp;dram_de_fe_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_DE_BE]	= &amp;dram_de_be_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_ACE]		= &amp;dram_ace_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_IEP]		= &amp;dram_iep_clk.common.hw,</div><div class='add'>+		[CLK_DE_BE]		= &amp;de_be_clk.common.hw,</div><div class='add'>+		[CLK_DE_FE]		= &amp;de_fe_clk.common.hw,</div><div class='add'>+		[CLK_TCON_CH0]		= &amp;tcon_ch0_clk.common.hw,</div><div class='add'>+		[CLK_TCON_CH1_SCLK]	= &amp;tcon_ch1_sclk2_clk.common.hw,</div><div class='add'>+		[CLK_TCON_CH1]		= &amp;tcon_ch1_sclk1_clk.common.hw,</div><div class='add'>+		[CLK_CSI]		= &amp;csi_clk.common.hw,</div><div class='add'>+		[CLK_VE]		= &amp;ve_clk.common.hw,</div><div class='add'>+		[CLK_CODEC]		= &amp;codec_clk.common.hw,</div><div class='add'>+		[CLK_AVS]		= &amp;avs_clk.common.hw,</div><div class='add'>+		[CLK_GPU]		= &amp;gpu_clk.common.hw,</div><div class='add'>+		[CLK_MBUS]		= &amp;mbus_clk.common.hw,</div><div class='add'>+		[CLK_IEP]		= &amp;iep_clk.common.hw,</div><div class='add'>+	},</div><div class='add'>+	.num	= CLK_NUMBER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sunxi_ccu_desc sun5i_gr8_ccu_desc = {</div><div class='add'>+	.ccu_clks	= sun5i_a10s_ccu_clks,</div><div class='add'>+	.num_ccu_clks	= ARRAY_SIZE(sun5i_a10s_ccu_clks),</div><div class='add'>+</div><div class='add'>+	.hw_clks	= &amp;sun5i_gr8_hw_clks,</div><div class='add'>+</div><div class='add'>+	.resets		= sun5i_a10s_ccu_resets,</div><div class='add'>+	.num_resets	= ARRAY_SIZE(sun5i_a10s_ccu_resets),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init sun5i_ccu_init(struct device_node *node,</div><div class='add'>+				  const struct sunxi_ccu_desc *desc)</div><div class='add'>+{</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	reg = of_io_request_and_map(node, 0, of_node_full_name(node));</div><div class='add'>+	if (IS_ERR(reg)) {</div><div class='add'>+		pr_err("%s: Could not map the clock registers\n",</div><div class='add'>+		       of_node_full_name(node));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Force the PLL-Audio-1x divider to 4 */</div><div class='add'>+	val = readl(reg + SUN5I_PLL_AUDIO_REG);</div><div class='add'>+	val &amp;= ~GENMASK(19, 16);</div><div class='add'>+	writel(val | (3 &lt;&lt; 16), reg + SUN5I_PLL_AUDIO_REG);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Use the peripheral PLL as the AHB parent, instead of CPU /</div><div class='add'>+	 * AXI which have rate changes due to cpufreq.</div><div class='add'>+	 *</div><div class='add'>+	 * This is especially a big deal for the HS timer whose parent</div><div class='add'>+	 * clock is AHB.</div><div class='add'>+	 */</div><div class='add'>+	val = readl(reg + SUN5I_AHB_REG);</div><div class='add'>+	val &amp;= ~GENMASK(7, 6);</div><div class='add'>+	writel(val | (2 &lt;&lt; 6), reg + SUN5I_AHB_REG);</div><div class='add'>+</div><div class='add'>+	sunxi_ccu_probe(node, reg, desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init sun5i_a10s_ccu_setup(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	sun5i_ccu_init(node, &amp;sun5i_a10s_ccu_desc);</div><div class='add'>+}</div><div class='add'>+CLK_OF_DECLARE(sun5i_a10s_ccu, "allwinner,sun5i-a10s-ccu",</div><div class='add'>+	       sun5i_a10s_ccu_setup);</div><div class='add'>+</div><div class='add'>+static void __init sun5i_a13_ccu_setup(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	sun5i_ccu_init(node, &amp;sun5i_a13_ccu_desc);</div><div class='add'>+}</div><div class='add'>+CLK_OF_DECLARE(sun5i_a13_ccu, "allwinner,sun5i-a13-ccu",</div><div class='add'>+	       sun5i_a13_ccu_setup);</div><div class='add'>+</div><div class='add'>+static void __init sun5i_gr8_ccu_setup(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	sun5i_ccu_init(node, &amp;sun5i_gr8_ccu_desc);</div><div class='add'>+}</div><div class='add'>+CLK_OF_DECLARE(sun5i_gr8_ccu, "nextthing,gr8-ccu",</div><div class='add'>+	       sun5i_gr8_ccu_setup);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun5i.h b/drivers/clk/sunxi-ng/ccu-sun5i.h<br/>new file mode 100644<br/>index 000000000000..8144487eb7ca<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun5i.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun5i.h</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Maxime Ripard</div><div class='add'>+ *</div><div class='add'>+ * Maxime Ripard &lt;maxime.ripard@free-electrons.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CCU_SUN5I_H_</div><div class='add'>+#define _CCU_SUN5I_H_</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/sun5i-ccu.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun5i-ccu.h&gt;</div><div class='add'>+</div><div class='add'>+/* The HOSC is exported */</div><div class='add'>+#define CLK_PLL_CORE		2</div><div class='add'>+#define CLK_PLL_AUDIO_BASE	3</div><div class='add'>+#define CLK_PLL_AUDIO		4</div><div class='add'>+#define CLK_PLL_AUDIO_2X	5</div><div class='add'>+#define CLK_PLL_AUDIO_4X	6</div><div class='add'>+#define CLK_PLL_AUDIO_8X	7</div><div class='add'>+#define CLK_PLL_VIDEO0		8</div><div class='add'>+#define CLK_PLL_VIDEO0_2X	9</div><div class='add'>+#define CLK_PLL_VE		10</div><div class='add'>+#define CLK_PLL_DDR_BASE	11</div><div class='add'>+#define CLK_PLL_DDR		12</div><div class='add'>+#define CLK_PLL_DDR_OTHER	13</div><div class='add'>+#define CLK_PLL_PERIPH		14</div><div class='add'>+#define CLK_PLL_VIDEO1		15</div><div class='add'>+#define CLK_PLL_VIDEO1_2X	16</div><div class='add'>+</div><div class='add'>+/* The CPU clock is exported */</div><div class='add'>+</div><div class='add'>+#define CLK_AXI			18</div><div class='add'>+#define CLK_AHB			19</div><div class='add'>+#define CLK_APB0		20</div><div class='add'>+#define CLK_APB1		21</div><div class='add'>+#define CLK_DRAM_AXI		22</div><div class='add'>+</div><div class='add'>+/* AHB gates are exported */</div><div class='add'>+/* APB0 gates are exported */</div><div class='add'>+/* APB1 gates are exported */</div><div class='add'>+/* Modules clocks are exported */</div><div class='add'>+/* USB clocks are exported */</div><div class='add'>+/* GPS clock is exported */</div><div class='add'>+/* DRAM gates are exported */</div><div class='add'>+/* More display modules clocks are exported */</div><div class='add'>+</div><div class='add'>+#define CLK_TCON_CH1_SCLK	91</div><div class='add'>+</div><div class='add'>+/* The rest of the module clocks are exported */</div><div class='add'>+</div><div class='add'>+#define CLK_MBUS		99</div><div class='add'>+</div><div class='add'>+/* And finally the IEP clock */</div><div class='add'>+</div><div class='add'>+#define CLK_NUMBER		(CLK_IEP + 1)</div><div class='add'>+</div><div class='add'>+#endif /* _CCU_SUN5I_H_ */</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c<br/>index fc75a335a7ce..4c9a920ff4ab 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun6i-a31.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu-sun6i-a31.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun6i-a31.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun6i-a31.c</a></div><div class='hunk'>@@ -468,8 +468,8 @@ static SUNXI_CCU_MUX_WITH_GATE(daudio0_clk, "daudio0", daudio_parents,</div><div class='ctx'> static SUNXI_CCU_MUX_WITH_GATE(daudio1_clk, "daudio1", daudio_parents,</div><div class='ctx'> 			       0x0b4, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='del'>-static SUNXI_CCU_M_WITH_GATE(spdif_clk, "spdif", "pll-audio",</div><div class='del'>-			     0x0c0, 0, 4, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+static SUNXI_CCU_MUX_WITH_GATE(spdif_clk, "spdif", daudio_parents,</div><div class='add'>+			       0x0c0, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static SUNXI_CCU_GATE(usb_phy0_clk,	"usb-phy0",	"osc24M",</div><div class='ctx'> 		      0x0cc, BIT(8), 0);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-a23.c b/drivers/clk/sunxi-ng/ccu-sun8i-a23.c<br/>index 2646d980087b..5c6d37bdf247 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun8i-a23.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu-sun8i-a23.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun8i-a23.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun8i-a23.c</a></div><div class='hunk'>@@ -344,10 +344,10 @@ static SUNXI_CCU_MP_WITH_MUX_GATE(spi1_clk, "spi1", mod0_default_parents, 0x0a4,</div><div class='ctx'> static const char * const i2s_parents[] = { "pll-audio-8x", "pll-audio-4x",</div><div class='ctx'> 					    "pll-audio-2x", "pll-audio" };</div><div class='ctx'> static SUNXI_CCU_MUX_WITH_GATE(i2s0_clk, "i2s0", i2s_parents,</div><div class='del'>-			       0x0b0, 16, 2, BIT(31), 0);</div><div class='add'>+			       0x0b0, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static SUNXI_CCU_MUX_WITH_GATE(i2s1_clk, "i2s1", i2s_parents,</div><div class='del'>-			       0x0b4, 16, 2, BIT(31), 0);</div><div class='add'>+			       0x0b4, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> /* TODO: the parent for most of the USB clocks is not known */</div><div class='ctx'> static SUNXI_CCU_GATE(usb_phy0_clk,	"usb-phy0",	"osc24M",</div><div class='hunk'>@@ -415,7 +415,7 @@ static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve",</div><div class='ctx'> 			     0x13c, 16, 3, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static SUNXI_CCU_GATE(ac_dig_clk,	"ac-dig",	"pll-audio",</div><div class='del'>-		      0x140, BIT(31), 0);</div><div class='add'>+		      0x140, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> static SUNXI_CCU_GATE(avs_clk,		"avs",		"osc24M",</div><div class='ctx'> 		      0x144, BIT(31), 0);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-a33.c b/drivers/clk/sunxi-ng/ccu-sun8i-a33.c<br/>index 9bd1f78a0547..a7b3c08ed0e2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun8i-a33.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu-sun8i-a33.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun8i-a33.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun8i-a33.c</a></div><div class='hunk'>@@ -170,7 +170,7 @@ static SUNXI_CCU_N_WITH_GATE_LOCK(pll_ddr1_clk, "pll-ddr1",</div><div class='ctx'> static const char * const cpux_parents[] = { "osc32k", "osc24M",</div><div class='ctx'> 					     "pll-cpux" , "pll-cpux" };</div><div class='ctx'> static SUNXI_CCU_MUX(cpux_clk, "cpux", cpux_parents,</div><div class='del'>-		     0x050, 16, 2, CLK_IS_CRITICAL);</div><div class='add'>+		     0x050, 16, 2, CLK_IS_CRITICAL | CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static SUNXI_CCU_M(axi_clk, "axi", "cpux", 0x050, 0, 2, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -440,7 +440,7 @@ static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve",</div><div class='ctx'> 			     0x13c, 16, 3, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static SUNXI_CCU_GATE(ac_dig_clk,	"ac-dig",	"pll-audio",</div><div class='del'>-		      0x140, BIT(31), 0);</div><div class='add'>+		      0x140, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> static SUNXI_CCU_GATE(ac_dig_4x_clk,	"ac-dig-4x",	"pll-audio-4x",</div><div class='ctx'> 		      0x140, BIT(30), 0);</div><div class='ctx'> static SUNXI_CCU_GATE(avs_clk,		"avs",		"osc24M",</div><div class='hunk'>@@ -468,7 +468,7 @@ static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(drc_clk, "drc",</div><div class='ctx'> 				       0x180, 0, 4, 24, 3, BIT(31), 0);</div><div class='ctx'> </div><div class='ctx'> static SUNXI_CCU_M_WITH_GATE(gpu_clk, "gpu", "pll-gpu",</div><div class='del'>-			     0x1a0, 0, 3, BIT(31), 0);</div><div class='add'>+			     0x1a0, 0, 3, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static const char * const ats_parents[] = { "osc24M", "pll-periph" };</div><div class='ctx'> static SUNXI_CCU_M_WITH_MUX_GATE(ats_clk, "ats", ats_parents,</div><div class='hunk'>@@ -752,6 +752,13 @@ static const struct sunxi_ccu_desc sun8i_a33_ccu_desc = {</div><div class='ctx'> 	.num_resets	= ARRAY_SIZE(sun8i_a33_ccu_resets),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ccu_mux_nb sun8i_a33_cpu_nb = {</div><div class='add'>+	.common		= &amp;cpux_clk.common,</div><div class='add'>+	.cm		= &amp;cpux_clk.mux,</div><div class='add'>+	.delay_us	= 1, /* &gt; 8 clock cycles at 24 MHz */</div><div class='add'>+	.bypass_index	= 1, /* index of 24 MHz oscillator */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init sun8i_a33_ccu_setup(struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *reg;</div><div class='hunk'>@@ -775,6 +782,9 @@ static void __init sun8i_a33_ccu_setup(struct device_node *node)</div><div class='ctx'> 	writel(val, reg + SUN8I_A33_PLL_MIPI_REG);</div><div class='ctx'> </div><div class='ctx'> 	sunxi_ccu_probe(node, reg, &amp;sun8i_a33_ccu_desc);</div><div class='add'>+</div><div class='add'>+	ccu_mux_notifier_register(pll_cpux_clk.common.hw.clk,</div><div class='add'>+				  &amp;sun8i_a33_cpu_nb);</div><div class='ctx'> }</div><div class='ctx'> CLK_OF_DECLARE(sun8i_a33_ccu, "allwinner,sun8i-a33-ccu",</div><div class='ctx'> 	       sun8i_a33_ccu_setup);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c<br/>index 4d70590f05e3..a26c8a19fe93 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun8i-h3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu-sun8i-h3.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun8i-h3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun8i-h3.c</a></div><div class='hunk'>@@ -394,16 +394,16 @@ static SUNXI_CCU_MP_WITH_MUX_GATE(spi1_clk, "spi1", mod0_default_parents, 0x0a4,</div><div class='ctx'> static const char * const i2s_parents[] = { "pll-audio-8x", "pll-audio-4x",</div><div class='ctx'> 					    "pll-audio-2x", "pll-audio" };</div><div class='ctx'> static SUNXI_CCU_MUX_WITH_GATE(i2s0_clk, "i2s0", i2s_parents,</div><div class='del'>-			       0x0b0, 16, 2, BIT(31), 0);</div><div class='add'>+			       0x0b0, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static SUNXI_CCU_MUX_WITH_GATE(i2s1_clk, "i2s1", i2s_parents,</div><div class='del'>-			       0x0b4, 16, 2, BIT(31), 0);</div><div class='add'>+			       0x0b4, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static SUNXI_CCU_MUX_WITH_GATE(i2s2_clk, "i2s2", i2s_parents,</div><div class='del'>-			       0x0b8, 16, 2, BIT(31), 0);</div><div class='add'>+			       0x0b8, 16, 2, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static SUNXI_CCU_M_WITH_GATE(spdif_clk, "spdif", "pll-audio",</div><div class='del'>-			     0x0c0, 0, 4, BIT(31), 0);</div><div class='add'>+			     0x0c0, 0, 4, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> </div><div class='ctx'> static SUNXI_CCU_GATE(usb_phy0_clk,	"usb-phy0",	"osc24M",</div><div class='ctx'> 		      0x0cc, BIT(8), 0);</div><div class='hunk'>@@ -466,7 +466,7 @@ static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve",</div><div class='ctx'> 			     0x13c, 16, 3, BIT(31), 0);</div><div class='ctx'> </div><div class='ctx'> static SUNXI_CCU_GATE(ac_dig_clk,	"ac-dig",	"pll-audio",</div><div class='del'>-		      0x140, BIT(31), 0);</div><div class='add'>+		      0x140, BIT(31), CLK_SET_RATE_PARENT);</div><div class='ctx'> static SUNXI_CCU_GATE(avs_clk,		"avs",		"osc24M",</div><div class='ctx'> 		      0x144, BIT(31), 0);</div><div class='ctx'> </div><div class='hunk'>@@ -803,6 +803,13 @@ static const struct sunxi_ccu_desc sun8i_h3_ccu_desc = {</div><div class='ctx'> 	.num_resets	= ARRAY_SIZE(sun8i_h3_ccu_resets),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ccu_mux_nb sun8i_h3_cpu_nb = {</div><div class='add'>+	.common		= &amp;cpux_clk.common,</div><div class='add'>+	.cm		= &amp;cpux_clk.mux,</div><div class='add'>+	.delay_us	= 1, /* &gt; 8 clock cycles at 24 MHz */</div><div class='add'>+	.bypass_index	= 1, /* index of 24 MHz oscillator */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init sun8i_h3_ccu_setup(struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *reg;</div><div class='hunk'>@@ -821,6 +828,9 @@ static void __init sun8i_h3_ccu_setup(struct device_node *node)</div><div class='ctx'> 	writel(val | (3 &lt;&lt; 16), reg + SUN8I_H3_PLL_AUDIO_REG);</div><div class='ctx'> </div><div class='ctx'> 	sunxi_ccu_probe(node, reg, &amp;sun8i_h3_ccu_desc);</div><div class='add'>+</div><div class='add'>+	ccu_mux_notifier_register(pll_cpux_clk.common.hw.clk,</div><div class='add'>+				  &amp;sun8i_h3_cpu_nb);</div><div class='ctx'> }</div><div class='ctx'> CLK_OF_DECLARE(sun8i_h3_ccu, "allwinner,sun8i-h3-ccu",</div><div class='ctx'> 	       sun8i_h3_ccu_setup);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c b/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c<br/>new file mode 100644<br/>index 000000000000..e58706b40ae9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun8i-v3s.c</a></div><div class='hunk'>@@ -0,0 +1,591 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Icenowy Zheng &lt;icenowy@aosc.xyz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on ccu-sun8i-h3.c, which is:</div><div class='add'>+ * Copyright (c) 2016 Maxime Ripard. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ccu_common.h"</div><div class='add'>+#include "ccu_reset.h"</div><div class='add'>+</div><div class='add'>+#include "ccu_div.h"</div><div class='add'>+#include "ccu_gate.h"</div><div class='add'>+#include "ccu_mp.h"</div><div class='add'>+#include "ccu_mult.h"</div><div class='add'>+#include "ccu_nk.h"</div><div class='add'>+#include "ccu_nkm.h"</div><div class='add'>+#include "ccu_nkmp.h"</div><div class='add'>+#include "ccu_nm.h"</div><div class='add'>+#include "ccu_phase.h"</div><div class='add'>+</div><div class='add'>+#include "ccu-sun8i-v3s.h"</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NKMP_WITH_GATE_LOCK(pll_cpu_clk, "pll-cpu",</div><div class='add'>+				     "osc24M", 0x000,</div><div class='add'>+				     8, 5,	/* N */</div><div class='add'>+				     4, 2,	/* K */</div><div class='add'>+				     0, 2,	/* M */</div><div class='add'>+				     16, 2,	/* P */</div><div class='add'>+				     BIT(31),	/* gate */</div><div class='add'>+				     BIT(28),	/* lock */</div><div class='add'>+				     0);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Audio PLL is supposed to have 4 outputs: 3 fixed factors from</div><div class='add'>+ * the base (2x, 4x and 8x), and one variable divider (the one true</div><div class='add'>+ * pll audio).</div><div class='add'>+ *</div><div class='add'>+ * We don't have any need for the variable divider for now, so we just</div><div class='add'>+ * hardcode it to match with the clock names</div><div class='add'>+ */</div><div class='add'>+#define SUN8I_V3S_PLL_AUDIO_REG	0x008</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_audio_base_clk, "pll-audio-base",</div><div class='add'>+				   "osc24M", 0x008,</div><div class='add'>+				   8, 7,	/* N */</div><div class='add'>+				   0, 5,	/* M */</div><div class='add'>+				   BIT(31),	/* gate */</div><div class='add'>+				   BIT(28),	/* lock */</div><div class='add'>+				   0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_video_clk, "pll-video",</div><div class='add'>+					"osc24M", 0x0010,</div><div class='add'>+					8, 7,		/* N */</div><div class='add'>+					0, 4,		/* M */</div><div class='add'>+					BIT(24),	/* frac enable */</div><div class='add'>+					BIT(25),	/* frac select */</div><div class='add'>+					270000000,	/* frac rate 0 */</div><div class='add'>+					297000000,	/* frac rate 1 */</div><div class='add'>+					BIT(31),	/* gate */</div><div class='add'>+					BIT(28),	/* lock */</div><div class='add'>+					0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_ve_clk, "pll-ve",</div><div class='add'>+					"osc24M", 0x0018,</div><div class='add'>+					8, 7,		/* N */</div><div class='add'>+					0, 4,		/* M */</div><div class='add'>+					BIT(24),	/* frac enable */</div><div class='add'>+					BIT(25),	/* frac select */</div><div class='add'>+					270000000,	/* frac rate 0 */</div><div class='add'>+					297000000,	/* frac rate 1 */</div><div class='add'>+					BIT(31),	/* gate */</div><div class='add'>+					BIT(28),	/* lock */</div><div class='add'>+					0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_ddr_clk, "pll-ddr",</div><div class='add'>+				    "osc24M", 0x020,</div><div class='add'>+				    8, 5,	/* N */</div><div class='add'>+				    4, 2,	/* K */</div><div class='add'>+				    0, 2,	/* M */</div><div class='add'>+				    BIT(31),	/* gate */</div><div class='add'>+				    BIT(28),	/* lock */</div><div class='add'>+				    0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NK_WITH_GATE_LOCK_POSTDIV(pll_periph0_clk, "pll-periph0",</div><div class='add'>+					   "osc24M", 0x028,</div><div class='add'>+					   8, 5,	/* N */</div><div class='add'>+					   4, 2,	/* K */</div><div class='add'>+					   BIT(31),	/* gate */</div><div class='add'>+					   BIT(28),	/* lock */</div><div class='add'>+					   2,		/* post-div */</div><div class='add'>+					   0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_isp_clk, "pll-isp",</div><div class='add'>+					"osc24M", 0x002c,</div><div class='add'>+					8, 7,		/* N */</div><div class='add'>+					0, 4,		/* M */</div><div class='add'>+					BIT(24),	/* frac enable */</div><div class='add'>+					BIT(25),	/* frac select */</div><div class='add'>+					270000000,	/* frac rate 0 */</div><div class='add'>+					297000000,	/* frac rate 1 */</div><div class='add'>+					BIT(31),	/* gate */</div><div class='add'>+					BIT(28),	/* lock */</div><div class='add'>+					0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_NK_WITH_GATE_LOCK_POSTDIV(pll_periph1_clk, "pll-periph1",</div><div class='add'>+					   "osc24M", 0x044,</div><div class='add'>+					   8, 5,	/* N */</div><div class='add'>+					   4, 2,	/* K */</div><div class='add'>+					   BIT(31),	/* gate */</div><div class='add'>+					   BIT(28),	/* lock */</div><div class='add'>+					   2,		/* post-div */</div><div class='add'>+					   0);</div><div class='add'>+</div><div class='add'>+static const char * const cpu_parents[] = { "osc32k", "osc24M",</div><div class='add'>+					     "pll-cpu", "pll-cpu" };</div><div class='add'>+static SUNXI_CCU_MUX(cpu_clk, "cpu", cpu_parents,</div><div class='add'>+		     0x050, 16, 2, CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M(axi_clk, "axi", "cpu", 0x050, 0, 2, 0);</div><div class='add'>+</div><div class='add'>+static const char * const ahb1_parents[] = { "osc32k", "osc24M",</div><div class='add'>+					     "axi", "pll-periph0" };</div><div class='add'>+static struct ccu_div ahb1_clk = {</div><div class='add'>+	.div		= _SUNXI_CCU_DIV_FLAGS(4, 2, CLK_DIVIDER_POWER_OF_TWO),</div><div class='add'>+</div><div class='add'>+	.mux		= {</div><div class='add'>+		.shift	= 12,</div><div class='add'>+		.width	= 2,</div><div class='add'>+</div><div class='add'>+		.variable_prediv	= {</div><div class='add'>+			.index	= 3,</div><div class='add'>+			.shift	= 6,</div><div class='add'>+			.width	= 2,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x054,</div><div class='add'>+		.features	= CCU_FEATURE_VARIABLE_PREDIV,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("ahb1",</div><div class='add'>+						      ahb1_parents,</div><div class='add'>+						      &amp;ccu_div_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_div_table apb1_div_table[] = {</div><div class='add'>+	{ .val = 0, .div = 2 },</div><div class='add'>+	{ .val = 1, .div = 2 },</div><div class='add'>+	{ .val = 2, .div = 4 },</div><div class='add'>+	{ .val = 3, .div = 8 },</div><div class='add'>+	{ /* Sentinel */ },</div><div class='add'>+};</div><div class='add'>+static SUNXI_CCU_DIV_TABLE(apb1_clk, "apb1", "ahb1",</div><div class='add'>+			   0x054, 8, 2, apb1_div_table, 0);</div><div class='add'>+</div><div class='add'>+static const char * const apb2_parents[] = { "osc32k", "osc24M",</div><div class='add'>+					     "pll-periph0", "pll-periph0" };</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX(apb2_clk, "apb2", apb2_parents, 0x058,</div><div class='add'>+			     0, 5,	/* M */</div><div class='add'>+			     16, 2,	/* P */</div><div class='add'>+			     24, 2,	/* mux */</div><div class='add'>+			     0);</div><div class='add'>+</div><div class='add'>+static const char * const ahb2_parents[] = { "ahb1", "pll-periph0" };</div><div class='add'>+static const struct ccu_mux_fixed_prediv ahb2_fixed_predivs[] = {</div><div class='add'>+	{ .index = 1, .div = 2 },</div><div class='add'>+};</div><div class='add'>+static struct ccu_mux ahb2_clk = {</div><div class='add'>+	.mux		= {</div><div class='add'>+		.shift	= 0,</div><div class='add'>+		.width	= 1,</div><div class='add'>+		.fixed_predivs	= ahb2_fixed_predivs,</div><div class='add'>+		.n_predivs	= ARRAY_SIZE(ahb2_fixed_predivs),</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x05c,</div><div class='add'>+		.features	= CCU_FEATURE_FIXED_PREDIV,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("ahb2",</div><div class='add'>+						      ahb2_parents,</div><div class='add'>+						      &amp;ccu_mux_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_ce_clk,	"bus-ce",	"ahb1",</div><div class='add'>+		      0x060, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_dma_clk,	"bus-dma",	"ahb1",</div><div class='add'>+		      0x060, BIT(6), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_mmc0_clk,	"bus-mmc0",	"ahb1",</div><div class='add'>+		      0x060, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_mmc1_clk,	"bus-mmc1",	"ahb1",</div><div class='add'>+		      0x060, BIT(9), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_mmc2_clk,	"bus-mmc2",	"ahb1",</div><div class='add'>+		      0x060, BIT(10), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_dram_clk,	"bus-dram",	"ahb1",</div><div class='add'>+		      0x060, BIT(14), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_emac_clk,	"bus-emac",	"ahb2",</div><div class='add'>+		      0x060, BIT(17), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_hstimer_clk,	"bus-hstimer",	"ahb1",</div><div class='add'>+		      0x060, BIT(19), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_spi0_clk,	"bus-spi0",	"ahb1",</div><div class='add'>+		      0x060, BIT(20), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_otg_clk,	"bus-otg",	"ahb1",</div><div class='add'>+		      0x060, BIT(24), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ehci0_clk,	"bus-ehci0",	"ahb1",</div><div class='add'>+		      0x060, BIT(26), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ohci0_clk,	"bus-ohci0",	"ahb1",</div><div class='add'>+		      0x060, BIT(29), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_ve_clk,	"bus-ve",	"ahb1",</div><div class='add'>+		      0x064, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_tcon0_clk,	"bus-tcon0",	"ahb1",</div><div class='add'>+		      0x064, BIT(4), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_csi_clk,	"bus-csi",	"ahb1",</div><div class='add'>+		      0x064, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_de_clk,	"bus-de",	"ahb1",</div><div class='add'>+		      0x064, BIT(12), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_codec_clk,	"bus-codec",	"apb1",</div><div class='add'>+		      0x068, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_pio_clk,	"bus-pio",	"apb1",</div><div class='add'>+		      0x068, BIT(5), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2c0_clk,	"bus-i2c0",	"apb2",</div><div class='add'>+		      0x06c, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2c1_clk,	"bus-i2c1",	"apb2",</div><div class='add'>+		      0x06c, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart0_clk,	"bus-uart0",	"apb2",</div><div class='add'>+		      0x06c, BIT(16), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart1_clk,	"bus-uart1",	"apb2",</div><div class='add'>+		      0x06c, BIT(17), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart2_clk,	"bus-uart2",	"apb2",</div><div class='add'>+		      0x06c, BIT(18), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_ephy_clk,	"bus-ephy",	"ahb1",</div><div class='add'>+		      0x070, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_dbg_clk,	"bus-dbg",	"ahb1",</div><div class='add'>+		      0x070, BIT(7), 0);</div><div class='add'>+</div><div class='add'>+static const char * const mod0_default_parents[] = { "osc24M", "pll-periph0",</div><div class='add'>+						     "pll-periph1" };</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc0_clk, "mmc0", mod0_default_parents, 0x088,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_PHASE(mmc0_sample_clk, "mmc0_sample", "mmc0",</div><div class='add'>+		       0x088, 20, 3, 0);</div><div class='add'>+static SUNXI_CCU_PHASE(mmc0_output_clk, "mmc0_output", "mmc0",</div><div class='add'>+		       0x088, 8, 3, 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc1_clk, "mmc1", mod0_default_parents, 0x08c,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_PHASE(mmc1_sample_clk, "mmc1_sample", "mmc1",</div><div class='add'>+		       0x08c, 20, 3, 0);</div><div class='add'>+static SUNXI_CCU_PHASE(mmc1_output_clk, "mmc1_output", "mmc1",</div><div class='add'>+		       0x08c, 8, 3, 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc2_clk, "mmc2", mod0_default_parents, 0x090,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_PHASE(mmc2_sample_clk, "mmc2_sample", "mmc2",</div><div class='add'>+		       0x090, 20, 3, 0);</div><div class='add'>+static SUNXI_CCU_PHASE(mmc2_output_clk, "mmc2_output", "mmc2",</div><div class='add'>+		       0x090, 8, 3, 0);</div><div class='add'>+</div><div class='add'>+static const char * const ce_parents[] = { "osc24M", "pll-periph0", };</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(ce_clk, "ce", ce_parents, 0x09c,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(spi0_clk, "spi0", mod0_default_parents, 0x0a0,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 2,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(usb_phy0_clk,	"usb-phy0",	"osc24M",</div><div class='add'>+		      0x0cc, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb_ohci0_clk,	"usb-ohci0",	"osc24M",</div><div class='add'>+		      0x0cc, BIT(16), 0);</div><div class='add'>+</div><div class='add'>+static const char * const dram_parents[] = { "pll-ddr", "pll-periph0-2x" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX(dram_clk, "dram", dram_parents,</div><div class='add'>+			    0x0f4, 0, 4, 20, 2, CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(dram_ve_clk,	"dram-ve",	"dram",</div><div class='add'>+		      0x100, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_csi_clk,	"dram-csi",	"dram",</div><div class='add'>+		      0x100, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_ehci_clk,	"dram-ehci",	"dram",</div><div class='add'>+		      0x100, BIT(17), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_ohci_clk,	"dram-ohci",	"dram",</div><div class='add'>+		      0x100, BIT(18), 0);</div><div class='add'>+</div><div class='add'>+static const char * const de_parents[] = { "pll-video", "pll-periph0" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(de_clk, "de", de_parents,</div><div class='add'>+				 0x104, 0, 4, 24, 2, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const tcon_parents[] = { "pll-video" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(tcon_clk, "tcon", tcon_parents,</div><div class='add'>+				 0x118, 0, 4, 24, 3, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(csi_misc_clk,	"csi-misc",	"osc24M",</div><div class='add'>+		      0x130, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const csi_mclk_parents[] = { "osc24M", "pll-video",</div><div class='add'>+						 "pll-periph0", "pll-periph1" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(csi0_mclk_clk, "csi0-mclk", csi_mclk_parents,</div><div class='add'>+				 0x130, 0, 5, 8, 3, BIT(15), 0);</div><div class='add'>+</div><div class='add'>+static const char * const csi1_sclk_parents[] = { "pll-video", "pll-isp" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(csi1_sclk_clk, "csi-sclk", csi1_sclk_parents,</div><div class='add'>+				 0x134, 16, 4, 24, 3, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(csi1_mclk_clk, "csi-mclk", csi_mclk_parents,</div><div class='add'>+				 0x134, 0, 5, 8, 3, BIT(15), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve",</div><div class='add'>+			     0x13c, 16, 3, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(ac_dig_clk,	"ac-dig",	"pll-audio",</div><div class='add'>+		      0x140, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+static SUNXI_CCU_GATE(avs_clk,		"avs",		"osc24M",</div><div class='add'>+		      0x144, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const mbus_parents[] = { "osc24M", "pll-periph0-2x",</div><div class='add'>+					     "pll-ddr" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(mbus_clk, "mbus", mbus_parents,</div><div class='add'>+				 0x15c, 0, 3, 24, 2, BIT(31), CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static const char * const mipi_csi_parents[] = { "pll-video", "pll-periph0",</div><div class='add'>+						 "pll-isp" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(mipi_csi_clk, "mipi-csi", mipi_csi_parents,</div><div class='add'>+			     0x16c, 0, 3, 24, 2, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static struct ccu_common *sun8i_v3s_ccu_clks[] = {</div><div class='add'>+	&amp;pll_cpu_clk.common,</div><div class='add'>+	&amp;pll_audio_base_clk.common,</div><div class='add'>+	&amp;pll_video_clk.common,</div><div class='add'>+	&amp;pll_ve_clk.common,</div><div class='add'>+	&amp;pll_ddr_clk.common,</div><div class='add'>+	&amp;pll_periph0_clk.common,</div><div class='add'>+	&amp;pll_isp_clk.common,</div><div class='add'>+	&amp;pll_periph1_clk.common,</div><div class='add'>+	&amp;cpu_clk.common,</div><div class='add'>+	&amp;axi_clk.common,</div><div class='add'>+	&amp;ahb1_clk.common,</div><div class='add'>+	&amp;apb1_clk.common,</div><div class='add'>+	&amp;apb2_clk.common,</div><div class='add'>+	&amp;ahb2_clk.common,</div><div class='add'>+	&amp;bus_ce_clk.common,</div><div class='add'>+	&amp;bus_dma_clk.common,</div><div class='add'>+	&amp;bus_mmc0_clk.common,</div><div class='add'>+	&amp;bus_mmc1_clk.common,</div><div class='add'>+	&amp;bus_mmc2_clk.common,</div><div class='add'>+	&amp;bus_dram_clk.common,</div><div class='add'>+	&amp;bus_emac_clk.common,</div><div class='add'>+	&amp;bus_hstimer_clk.common,</div><div class='add'>+	&amp;bus_spi0_clk.common,</div><div class='add'>+	&amp;bus_otg_clk.common,</div><div class='add'>+	&amp;bus_ehci0_clk.common,</div><div class='add'>+	&amp;bus_ohci0_clk.common,</div><div class='add'>+	&amp;bus_ve_clk.common,</div><div class='add'>+	&amp;bus_tcon0_clk.common,</div><div class='add'>+	&amp;bus_csi_clk.common,</div><div class='add'>+	&amp;bus_de_clk.common,</div><div class='add'>+	&amp;bus_codec_clk.common,</div><div class='add'>+	&amp;bus_pio_clk.common,</div><div class='add'>+	&amp;bus_i2c0_clk.common,</div><div class='add'>+	&amp;bus_i2c1_clk.common,</div><div class='add'>+	&amp;bus_uart0_clk.common,</div><div class='add'>+	&amp;bus_uart1_clk.common,</div><div class='add'>+	&amp;bus_uart2_clk.common,</div><div class='add'>+	&amp;bus_ephy_clk.common,</div><div class='add'>+	&amp;bus_dbg_clk.common,</div><div class='add'>+	&amp;mmc0_clk.common,</div><div class='add'>+	&amp;mmc0_sample_clk.common,</div><div class='add'>+	&amp;mmc0_output_clk.common,</div><div class='add'>+	&amp;mmc1_clk.common,</div><div class='add'>+	&amp;mmc1_sample_clk.common,</div><div class='add'>+	&amp;mmc1_output_clk.common,</div><div class='add'>+	&amp;mmc2_clk.common,</div><div class='add'>+	&amp;mmc2_sample_clk.common,</div><div class='add'>+	&amp;mmc2_output_clk.common,</div><div class='add'>+	&amp;ce_clk.common,</div><div class='add'>+	&amp;spi0_clk.common,</div><div class='add'>+	&amp;usb_phy0_clk.common,</div><div class='add'>+	&amp;usb_ohci0_clk.common,</div><div class='add'>+	&amp;dram_clk.common,</div><div class='add'>+	&amp;dram_ve_clk.common,</div><div class='add'>+	&amp;dram_csi_clk.common,</div><div class='add'>+	&amp;dram_ohci_clk.common,</div><div class='add'>+	&amp;dram_ehci_clk.common,</div><div class='add'>+	&amp;de_clk.common,</div><div class='add'>+	&amp;tcon_clk.common,</div><div class='add'>+	&amp;csi_misc_clk.common,</div><div class='add'>+	&amp;csi0_mclk_clk.common,</div><div class='add'>+	&amp;csi1_sclk_clk.common,</div><div class='add'>+	&amp;csi1_mclk_clk.common,</div><div class='add'>+	&amp;ve_clk.common,</div><div class='add'>+	&amp;ac_dig_clk.common,</div><div class='add'>+	&amp;avs_clk.common,</div><div class='add'>+	&amp;mbus_clk.common,</div><div class='add'>+	&amp;mipi_csi_clk.common,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* We hardcode the divider to 4 for now */</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_clk, "pll-audio",</div><div class='add'>+			"pll-audio-base", 4, 1, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_2x_clk, "pll-audio-2x",</div><div class='add'>+			"pll-audio-base", 2, 1, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_4x_clk, "pll-audio-4x",</div><div class='add'>+			"pll-audio-base", 1, 1, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_audio_8x_clk, "pll-audio-8x",</div><div class='add'>+			"pll-audio-base", 1, 2, CLK_SET_RATE_PARENT);</div><div class='add'>+static CLK_FIXED_FACTOR(pll_periph0_2x_clk, "pll-periph0-2x",</div><div class='add'>+			"pll-periph0", 1, 2, 0);</div><div class='add'>+</div><div class='add'>+static struct clk_hw_onecell_data sun8i_v3s_hw_clks = {</div><div class='add'>+	.hws	= {</div><div class='add'>+		[CLK_PLL_CPU]		= &amp;pll_cpu_clk.common.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_BASE]	= &amp;pll_audio_base_clk.common.hw,</div><div class='add'>+		[CLK_PLL_AUDIO]		= &amp;pll_audio_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_2X]	= &amp;pll_audio_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_4X]	= &amp;pll_audio_4x_clk.hw,</div><div class='add'>+		[CLK_PLL_AUDIO_8X]	= &amp;pll_audio_8x_clk.hw,</div><div class='add'>+		[CLK_PLL_VIDEO]		= &amp;pll_video_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VE]		= &amp;pll_ve_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR]		= &amp;pll_ddr_clk.common.hw,</div><div class='add'>+		[CLK_PLL_PERIPH0]	= &amp;pll_periph0_clk.common.hw,</div><div class='add'>+		[CLK_PLL_PERIPH0_2X]	= &amp;pll_periph0_2x_clk.hw,</div><div class='add'>+		[CLK_PLL_ISP]		= &amp;pll_isp_clk.common.hw,</div><div class='add'>+		[CLK_PLL_PERIPH1]	= &amp;pll_periph1_clk.common.hw,</div><div class='add'>+		[CLK_CPU]		= &amp;cpu_clk.common.hw,</div><div class='add'>+		[CLK_AXI]		= &amp;axi_clk.common.hw,</div><div class='add'>+		[CLK_AHB1]		= &amp;ahb1_clk.common.hw,</div><div class='add'>+		[CLK_APB1]		= &amp;apb1_clk.common.hw,</div><div class='add'>+		[CLK_APB2]		= &amp;apb2_clk.common.hw,</div><div class='add'>+		[CLK_AHB2]		= &amp;ahb2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_CE]		= &amp;bus_ce_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DMA]		= &amp;bus_dma_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MMC0]		= &amp;bus_mmc0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MMC1]		= &amp;bus_mmc1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MMC2]		= &amp;bus_mmc2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DRAM]		= &amp;bus_dram_clk.common.hw,</div><div class='add'>+		[CLK_BUS_EMAC]		= &amp;bus_emac_clk.common.hw,</div><div class='add'>+		[CLK_BUS_HSTIMER]	= &amp;bus_hstimer_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SPI0]		= &amp;bus_spi0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_OTG]		= &amp;bus_otg_clk.common.hw,</div><div class='add'>+		[CLK_BUS_EHCI0]		= &amp;bus_ehci0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_OHCI0]		= &amp;bus_ohci0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_VE]		= &amp;bus_ve_clk.common.hw,</div><div class='add'>+		[CLK_BUS_TCON0]		= &amp;bus_tcon0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_CSI]		= &amp;bus_csi_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DE]		= &amp;bus_de_clk.common.hw,</div><div class='add'>+		[CLK_BUS_CODEC]		= &amp;bus_codec_clk.common.hw,</div><div class='add'>+		[CLK_BUS_PIO]		= &amp;bus_pio_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2C0]		= &amp;bus_i2c0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2C1]		= &amp;bus_i2c1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART0]		= &amp;bus_uart0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART1]		= &amp;bus_uart1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART2]		= &amp;bus_uart2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_EPHY]		= &amp;bus_ephy_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DBG]		= &amp;bus_dbg_clk.common.hw,</div><div class='add'>+		[CLK_MMC0]		= &amp;mmc0_clk.common.hw,</div><div class='add'>+		[CLK_MMC0_SAMPLE]	= &amp;mmc0_sample_clk.common.hw,</div><div class='add'>+		[CLK_MMC0_OUTPUT]	= &amp;mmc0_output_clk.common.hw,</div><div class='add'>+		[CLK_MMC1]		= &amp;mmc1_clk.common.hw,</div><div class='add'>+		[CLK_MMC1_SAMPLE]	= &amp;mmc1_sample_clk.common.hw,</div><div class='add'>+		[CLK_MMC1_OUTPUT]	= &amp;mmc1_output_clk.common.hw,</div><div class='add'>+		[CLK_CE]		= &amp;ce_clk.common.hw,</div><div class='add'>+		[CLK_SPI0]		= &amp;spi0_clk.common.hw,</div><div class='add'>+		[CLK_USB_PHY0]		= &amp;usb_phy0_clk.common.hw,</div><div class='add'>+		[CLK_USB_OHCI0]		= &amp;usb_ohci0_clk.common.hw,</div><div class='add'>+		[CLK_DRAM]		= &amp;dram_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_VE]		= &amp;dram_ve_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_CSI]		= &amp;dram_csi_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_EHCI]		= &amp;dram_ehci_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_OHCI]		= &amp;dram_ohci_clk.common.hw,</div><div class='add'>+		[CLK_DE]		= &amp;de_clk.common.hw,</div><div class='add'>+		[CLK_TCON0]		= &amp;tcon_clk.common.hw,</div><div class='add'>+		[CLK_CSI_MISC]		= &amp;csi_misc_clk.common.hw,</div><div class='add'>+		[CLK_CSI0_MCLK]		= &amp;csi0_mclk_clk.common.hw,</div><div class='add'>+		[CLK_CSI1_SCLK]		= &amp;csi1_sclk_clk.common.hw,</div><div class='add'>+		[CLK_CSI1_MCLK]		= &amp;csi1_mclk_clk.common.hw,</div><div class='add'>+		[CLK_VE]		= &amp;ve_clk.common.hw,</div><div class='add'>+		[CLK_AC_DIG]		= &amp;ac_dig_clk.common.hw,</div><div class='add'>+		[CLK_AVS]		= &amp;avs_clk.common.hw,</div><div class='add'>+		[CLK_MBUS]		= &amp;mbus_clk.common.hw,</div><div class='add'>+		[CLK_MIPI_CSI]		= &amp;mipi_csi_clk.common.hw,</div><div class='add'>+	},</div><div class='add'>+	.num	= CLK_NUMBER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_reset_map sun8i_v3s_ccu_resets[] = {</div><div class='add'>+	[RST_USB_PHY0]		=  { 0x0cc, BIT(0) },</div><div class='add'>+</div><div class='add'>+	[RST_MBUS]		=  { 0x0fc, BIT(31) },</div><div class='add'>+</div><div class='add'>+	[RST_BUS_CE]		=  { 0x2c0, BIT(5) },</div><div class='add'>+	[RST_BUS_DMA]		=  { 0x2c0, BIT(6) },</div><div class='add'>+	[RST_BUS_MMC0]		=  { 0x2c0, BIT(8) },</div><div class='add'>+	[RST_BUS_MMC1]		=  { 0x2c0, BIT(9) },</div><div class='add'>+	[RST_BUS_MMC2]		=  { 0x2c0, BIT(10) },</div><div class='add'>+	[RST_BUS_DRAM]		=  { 0x2c0, BIT(14) },</div><div class='add'>+	[RST_BUS_EMAC]		=  { 0x2c0, BIT(17) },</div><div class='add'>+	[RST_BUS_HSTIMER]	=  { 0x2c0, BIT(19) },</div><div class='add'>+	[RST_BUS_SPI0]		=  { 0x2c0, BIT(20) },</div><div class='add'>+	[RST_BUS_OTG]		=  { 0x2c0, BIT(23) },</div><div class='add'>+	[RST_BUS_EHCI0]		=  { 0x2c0, BIT(26) },</div><div class='add'>+	[RST_BUS_OHCI0]		=  { 0x2c0, BIT(29) },</div><div class='add'>+</div><div class='add'>+	[RST_BUS_VE]		=  { 0x2c4, BIT(0) },</div><div class='add'>+	[RST_BUS_TCON0]		=  { 0x2c4, BIT(3) },</div><div class='add'>+	[RST_BUS_CSI]		=  { 0x2c4, BIT(8) },</div><div class='add'>+	[RST_BUS_DE]		=  { 0x2c4, BIT(12) },</div><div class='add'>+	[RST_BUS_DBG]		=  { 0x2c4, BIT(31) },</div><div class='add'>+</div><div class='add'>+	[RST_BUS_EPHY]		=  { 0x2c8, BIT(2) },</div><div class='add'>+</div><div class='add'>+	[RST_BUS_CODEC]		=  { 0x2d0, BIT(0) },</div><div class='add'>+</div><div class='add'>+	[RST_BUS_I2C0]		=  { 0x2d8, BIT(0) },</div><div class='add'>+	[RST_BUS_I2C1]		=  { 0x2d8, BIT(1) },</div><div class='add'>+	[RST_BUS_UART0]		=  { 0x2d8, BIT(16) },</div><div class='add'>+	[RST_BUS_UART1]		=  { 0x2d8, BIT(17) },</div><div class='add'>+	[RST_BUS_UART2]		=  { 0x2d8, BIT(18) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sunxi_ccu_desc sun8i_v3s_ccu_desc = {</div><div class='add'>+	.ccu_clks	= sun8i_v3s_ccu_clks,</div><div class='add'>+	.num_ccu_clks	= ARRAY_SIZE(sun8i_v3s_ccu_clks),</div><div class='add'>+</div><div class='add'>+	.hw_clks	= &amp;sun8i_v3s_hw_clks,</div><div class='add'>+</div><div class='add'>+	.resets		= sun8i_v3s_ccu_resets,</div><div class='add'>+	.num_resets	= ARRAY_SIZE(sun8i_v3s_ccu_resets),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init sun8i_v3s_ccu_setup(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	reg = of_io_request_and_map(node, 0, of_node_full_name(node));</div><div class='add'>+	if (IS_ERR(reg)) {</div><div class='add'>+		pr_err("%s: Could not map the clock registers\n",</div><div class='add'>+		       of_node_full_name(node));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Force the PLL-Audio-1x divider to 4 */</div><div class='add'>+	val = readl(reg + SUN8I_V3S_PLL_AUDIO_REG);</div><div class='add'>+	val &amp;= ~GENMASK(19, 16);</div><div class='add'>+	writel(val | (3 &lt;&lt; 16), reg + SUN8I_V3S_PLL_AUDIO_REG);</div><div class='add'>+</div><div class='add'>+	sunxi_ccu_probe(node, reg, &amp;sun8i_v3s_ccu_desc);</div><div class='add'>+}</div><div class='add'>+CLK_OF_DECLARE(sun8i_v3s_ccu, "allwinner,sun8i-v3s-ccu",</div><div class='add'>+	       sun8i_v3s_ccu_setup);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-v3s.h b/drivers/clk/sunxi-ng/ccu-sun8i-v3s.h<br/>new file mode 100644<br/>index 000000000000..4a4d36fdad96<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun8i-v3s.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun8i-v3s.h</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Icenowy Zheng &lt;icenowy@aosc.xyz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on ccu-sun8i-h3.h, which is:</div><div class='add'>+ * Copyright (c) 2016 Maxime Ripard &lt;maxime.ripard@free-electrons.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CCU_SUN8I_H3_H_</div><div class='add'>+#define _CCU_SUN8I_H3_H_</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/sun8i-v3s-ccu.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun8i-v3s-ccu.h&gt;</div><div class='add'>+</div><div class='add'>+#define CLK_PLL_CPU		0</div><div class='add'>+#define CLK_PLL_AUDIO_BASE	1</div><div class='add'>+#define CLK_PLL_AUDIO		2</div><div class='add'>+#define CLK_PLL_AUDIO_2X	3</div><div class='add'>+#define CLK_PLL_AUDIO_4X	4</div><div class='add'>+#define CLK_PLL_AUDIO_8X	5</div><div class='add'>+#define CLK_PLL_VIDEO		6</div><div class='add'>+#define CLK_PLL_VE		7</div><div class='add'>+#define CLK_PLL_DDR		8</div><div class='add'>+#define CLK_PLL_PERIPH0		9</div><div class='add'>+#define CLK_PLL_PERIPH0_2X	10</div><div class='add'>+#define CLK_PLL_ISP		11</div><div class='add'>+#define CLK_PLL_PERIPH1		12</div><div class='add'>+/* Reserve one number for not implemented and not used PLL_DDR1 */</div><div class='add'>+</div><div class='add'>+/* The CPU clock is exported */</div><div class='add'>+</div><div class='add'>+#define CLK_AXI			15</div><div class='add'>+#define CLK_AHB1		16</div><div class='add'>+#define CLK_APB1		17</div><div class='add'>+#define CLK_APB2		18</div><div class='add'>+#define CLK_AHB2		19</div><div class='add'>+</div><div class='add'>+/* All the bus gates are exported */</div><div class='add'>+</div><div class='add'>+/* The first bunch of module clocks are exported */</div><div class='add'>+</div><div class='add'>+#define CLK_DRAM		58</div><div class='add'>+</div><div class='add'>+/* All the DRAM gates are exported */</div><div class='add'>+</div><div class='add'>+/* Some more module clocks are exported */</div><div class='add'>+</div><div class='add'>+#define CLK_MBUS		72</div><div class='add'>+</div><div class='add'>+/* And the GPU module clock is exported */</div><div class='add'>+</div><div class='add'>+#define CLK_NUMBER		(CLK_MIPI_CSI + 1)</div><div class='add'>+</div><div class='add'>+#endif /* _CCU_SUN8I_H3_H_ */</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c b/drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c<br/>new file mode 100644<br/>index 000000000000..6d116581c86d<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c</a></div><div class='hunk'>@@ -0,0 +1,283 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Chen-Yu Tsai. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ccu_common.h"</div><div class='add'>+#include "ccu_div.h"</div><div class='add'>+#include "ccu_gate.h"</div><div class='add'>+#include "ccu_reset.h"</div><div class='add'>+</div><div class='add'>+#include "ccu-sun9i-a80-de.h"</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(fe0_clk,		"fe0",		"fe0-div",</div><div class='add'>+		      0x00, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(fe1_clk,		"fe1",		"fe1-div",</div><div class='add'>+		      0x00, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(fe2_clk,		"fe2",		"fe2-div",</div><div class='add'>+		      0x00, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(iep_deu0_clk,	"iep-deu0",	"de",</div><div class='add'>+		      0x00, BIT(4), 0);</div><div class='add'>+static SUNXI_CCU_GATE(iep_deu1_clk,	"iep-deu1",	"de",</div><div class='add'>+		      0x00, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(be0_clk,		"be0",		"be0-div",</div><div class='add'>+		      0x00, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(be1_clk,		"be1",		"be1-div",</div><div class='add'>+		      0x00, BIT(9), 0);</div><div class='add'>+static SUNXI_CCU_GATE(be2_clk,		"be2",		"be2-div",</div><div class='add'>+		      0x00, BIT(10), 0);</div><div class='add'>+static SUNXI_CCU_GATE(iep_drc0_clk,	"iep-drc0",	"de",</div><div class='add'>+		      0x00, BIT(12), 0);</div><div class='add'>+static SUNXI_CCU_GATE(iep_drc1_clk,	"iep-drc1",	"de",</div><div class='add'>+		      0x00, BIT(13), 0);</div><div class='add'>+static SUNXI_CCU_GATE(merge_clk,	"merge",	"de",</div><div class='add'>+		      0x00, BIT(20), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(dram_fe0_clk,	"dram-fe0",	"sdram",</div><div class='add'>+		      0x04, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_fe1_clk,	"dram-fe1",	"sdram",</div><div class='add'>+		      0x04, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_fe2_clk,	"dram-fe2",	"sdram",</div><div class='add'>+		      0x04, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_deu0_clk,	"dram-deu0",	"sdram",</div><div class='add'>+		      0x04, BIT(4), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_deu1_clk,	"dram-deu1",	"sdram",</div><div class='add'>+		      0x04, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_be0_clk,	"dram-be0",	"sdram",</div><div class='add'>+		      0x04, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_be1_clk,	"dram-be1",	"sdram",</div><div class='add'>+		      0x04, BIT(9), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_be2_clk,	"dram-be2",	"sdram",</div><div class='add'>+		      0x04, BIT(10), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_drc0_clk,	"dram-drc0",	"sdram",</div><div class='add'>+		      0x04, BIT(12), 0);</div><div class='add'>+static SUNXI_CCU_GATE(dram_drc1_clk,	"dram-drc1",	"sdram",</div><div class='add'>+		      0x04, BIT(13), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_fe0_clk,	"bus-fe0",	"bus-de",</div><div class='add'>+		      0x08, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_fe1_clk,	"bus-fe1",	"bus-de",</div><div class='add'>+		      0x08, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_fe2_clk,	"bus-fe2",	"bus-de",</div><div class='add'>+		      0x08, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_deu0_clk,	"bus-deu0",	"bus-de",</div><div class='add'>+		      0x08, BIT(4), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_deu1_clk,	"bus-deu1",	"bus-de",</div><div class='add'>+		      0x08, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_be0_clk,	"bus-be0",	"bus-de",</div><div class='add'>+		      0x08, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_be1_clk,	"bus-be1",	"bus-de",</div><div class='add'>+		      0x08, BIT(9), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_be2_clk,	"bus-be2",	"bus-de",</div><div class='add'>+		      0x08, BIT(10), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_drc0_clk,	"bus-drc0",	"bus-de",</div><div class='add'>+		      0x08, BIT(12), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_drc1_clk,	"bus-drc1",	"bus-de",</div><div class='add'>+		      0x08, BIT(13), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M(fe0_div_clk, "fe0-div", "de", 0x20, 0, 4, 0);</div><div class='add'>+static SUNXI_CCU_M(fe1_div_clk, "fe1-div", "de", 0x20, 4, 4, 0);</div><div class='add'>+static SUNXI_CCU_M(fe2_div_clk, "fe2-div", "de", 0x20, 8, 4, 0);</div><div class='add'>+static SUNXI_CCU_M(be0_div_clk, "be0-div", "de", 0x20, 16, 4, 0);</div><div class='add'>+static SUNXI_CCU_M(be1_div_clk, "be1-div", "de", 0x20, 20, 4, 0);</div><div class='add'>+static SUNXI_CCU_M(be2_div_clk, "be2-div", "de", 0x20, 24, 4, 0);</div><div class='add'>+</div><div class='add'>+static struct ccu_common *sun9i_a80_de_clks[] = {</div><div class='add'>+	&amp;fe0_clk.common,</div><div class='add'>+	&amp;fe1_clk.common,</div><div class='add'>+	&amp;fe2_clk.common,</div><div class='add'>+	&amp;iep_deu0_clk.common,</div><div class='add'>+	&amp;iep_deu1_clk.common,</div><div class='add'>+	&amp;be0_clk.common,</div><div class='add'>+	&amp;be1_clk.common,</div><div class='add'>+	&amp;be2_clk.common,</div><div class='add'>+	&amp;iep_drc0_clk.common,</div><div class='add'>+	&amp;iep_drc1_clk.common,</div><div class='add'>+	&amp;merge_clk.common,</div><div class='add'>+</div><div class='add'>+	&amp;dram_fe0_clk.common,</div><div class='add'>+	&amp;dram_fe1_clk.common,</div><div class='add'>+	&amp;dram_fe2_clk.common,</div><div class='add'>+	&amp;dram_deu0_clk.common,</div><div class='add'>+	&amp;dram_deu1_clk.common,</div><div class='add'>+	&amp;dram_be0_clk.common,</div><div class='add'>+	&amp;dram_be1_clk.common,</div><div class='add'>+	&amp;dram_be2_clk.common,</div><div class='add'>+	&amp;dram_drc0_clk.common,</div><div class='add'>+	&amp;dram_drc1_clk.common,</div><div class='add'>+</div><div class='add'>+	&amp;bus_fe0_clk.common,</div><div class='add'>+	&amp;bus_fe1_clk.common,</div><div class='add'>+	&amp;bus_fe2_clk.common,</div><div class='add'>+	&amp;bus_deu0_clk.common,</div><div class='add'>+	&amp;bus_deu1_clk.common,</div><div class='add'>+	&amp;bus_be0_clk.common,</div><div class='add'>+	&amp;bus_be1_clk.common,</div><div class='add'>+	&amp;bus_be2_clk.common,</div><div class='add'>+	&amp;bus_drc0_clk.common,</div><div class='add'>+	&amp;bus_drc1_clk.common,</div><div class='add'>+</div><div class='add'>+	&amp;fe0_div_clk.common,</div><div class='add'>+	&amp;fe1_div_clk.common,</div><div class='add'>+	&amp;fe2_div_clk.common,</div><div class='add'>+	&amp;be0_div_clk.common,</div><div class='add'>+	&amp;be1_div_clk.common,</div><div class='add'>+	&amp;be2_div_clk.common,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw_onecell_data sun9i_a80_de_hw_clks = {</div><div class='add'>+	.hws	= {</div><div class='add'>+		[CLK_FE0]	= &amp;fe0_clk.common.hw,</div><div class='add'>+		[CLK_FE1]	= &amp;fe1_clk.common.hw,</div><div class='add'>+		[CLK_FE2]	= &amp;fe2_clk.common.hw,</div><div class='add'>+		[CLK_IEP_DEU0]	= &amp;iep_deu0_clk.common.hw,</div><div class='add'>+		[CLK_IEP_DEU1]	= &amp;iep_deu1_clk.common.hw,</div><div class='add'>+		[CLK_BE0]	= &amp;be0_clk.common.hw,</div><div class='add'>+		[CLK_BE1]	= &amp;be1_clk.common.hw,</div><div class='add'>+		[CLK_BE2]	= &amp;be2_clk.common.hw,</div><div class='add'>+		[CLK_IEP_DRC0]	= &amp;iep_drc0_clk.common.hw,</div><div class='add'>+		[CLK_IEP_DRC1]	= &amp;iep_drc1_clk.common.hw,</div><div class='add'>+		[CLK_MERGE]	= &amp;merge_clk.common.hw,</div><div class='add'>+</div><div class='add'>+		[CLK_DRAM_FE0]	= &amp;dram_fe0_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_FE1]	= &amp;dram_fe1_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_FE2]	= &amp;dram_fe2_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_DEU0]	= &amp;dram_deu0_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_DEU1]	= &amp;dram_deu1_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_BE0]	= &amp;dram_be0_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_BE1]	= &amp;dram_be1_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_BE2]	= &amp;dram_be2_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_DRC0]	= &amp;dram_drc0_clk.common.hw,</div><div class='add'>+		[CLK_DRAM_DRC1]	= &amp;dram_drc1_clk.common.hw,</div><div class='add'>+</div><div class='add'>+		[CLK_BUS_FE0]	= &amp;bus_fe0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_FE1]	= &amp;bus_fe1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_FE2]	= &amp;bus_fe2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DEU0]	= &amp;bus_deu0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DEU1]	= &amp;bus_deu1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_BE0]	= &amp;bus_be0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_BE1]	= &amp;bus_be1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_BE2]	= &amp;bus_be2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DRC0]	= &amp;bus_drc0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DRC1]	= &amp;bus_drc1_clk.common.hw,</div><div class='add'>+</div><div class='add'>+		[CLK_FE0_DIV]	= &amp;fe0_div_clk.common.hw,</div><div class='add'>+		[CLK_FE1_DIV]	= &amp;fe1_div_clk.common.hw,</div><div class='add'>+		[CLK_FE2_DIV]	= &amp;fe2_div_clk.common.hw,</div><div class='add'>+		[CLK_BE0_DIV]	= &amp;be0_div_clk.common.hw,</div><div class='add'>+		[CLK_BE1_DIV]	= &amp;be1_div_clk.common.hw,</div><div class='add'>+		[CLK_BE2_DIV]	= &amp;be2_div_clk.common.hw,</div><div class='add'>+	},</div><div class='add'>+	.num	= CLK_NUMBER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_reset_map sun9i_a80_de_resets[] = {</div><div class='add'>+	[RST_FE0]	= { 0x0c, BIT(0) },</div><div class='add'>+	[RST_FE1]	= { 0x0c, BIT(1) },</div><div class='add'>+	[RST_FE2]	= { 0x0c, BIT(2) },</div><div class='add'>+	[RST_DEU0]	= { 0x0c, BIT(4) },</div><div class='add'>+	[RST_DEU1]	= { 0x0c, BIT(5) },</div><div class='add'>+	[RST_BE0]	= { 0x0c, BIT(8) },</div><div class='add'>+	[RST_BE1]	= { 0x0c, BIT(9) },</div><div class='add'>+	[RST_BE2]	= { 0x0c, BIT(10) },</div><div class='add'>+	[RST_DRC0]	= { 0x0c, BIT(12) },</div><div class='add'>+	[RST_DRC1]	= { 0x0c, BIT(13) },</div><div class='add'>+	[RST_MERGE]	= { 0x0c, BIT(20) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sunxi_ccu_desc sun9i_a80_de_clk_desc = {</div><div class='add'>+	.ccu_clks	= sun9i_a80_de_clks,</div><div class='add'>+	.num_ccu_clks	= ARRAY_SIZE(sun9i_a80_de_clks),</div><div class='add'>+</div><div class='add'>+	.hw_clks	= &amp;sun9i_a80_de_hw_clks,</div><div class='add'>+</div><div class='add'>+	.resets		= sun9i_a80_de_resets,</div><div class='add'>+	.num_resets	= ARRAY_SIZE(sun9i_a80_de_resets),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sun9i_a80_de_clk_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct clk *bus_clk;</div><div class='add'>+	struct reset_control *rstc;</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	reg = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(reg))</div><div class='add'>+		return PTR_ERR(reg);</div><div class='add'>+</div><div class='add'>+	bus_clk = devm_clk_get(&amp;pdev-&gt;dev, "bus");</div><div class='add'>+	if (IS_ERR(bus_clk)) {</div><div class='add'>+		ret = PTR_ERR(bus_clk);</div><div class='add'>+		if (ret != -EPROBE_DEFER)</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Couldn't get bus clk: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rstc = devm_reset_control_get_exclusive(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(rstc)) {</div><div class='add'>+		ret = PTR_ERR(rstc);</div><div class='add'>+		if (ret != -EPROBE_DEFER)</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"Couldn't get reset control: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The bus clock needs to be enabled for us to access the registers */</div><div class='add'>+	ret = clk_prepare_enable(bus_clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Couldn't enable bus clk: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The reset control needs to be asserted for the controls to work */</div><div class='add'>+	ret = reset_control_deassert(rstc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Couldn't deassert reset control: %d\n", ret);</div><div class='add'>+		goto err_disable_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = sunxi_ccu_probe(pdev-&gt;dev.of_node, reg,</div><div class='add'>+			      &amp;sun9i_a80_de_clk_desc);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_assert_reset;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_assert_reset:</div><div class='add'>+	reset_control_assert(rstc);</div><div class='add'>+err_disable_clk:</div><div class='add'>+	clk_disable_unprepare(bus_clk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id sun9i_a80_de_clk_ids[] = {</div><div class='add'>+	{ .compatible = "allwinner,sun9i-a80-de-clks" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver sun9i_a80_de_clk_driver = {</div><div class='add'>+	.probe	= sun9i_a80_de_clk_probe,</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name	= "sun9i-a80-de-clks",</div><div class='add'>+		.of_match_table	= sun9i_a80_de_clk_ids,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+builtin_platform_driver(sun9i_a80_de_clk_driver);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun9i-a80-de.h b/drivers/clk/sunxi-ng/ccu-sun9i-a80-de.h<br/>new file mode 100644<br/>index 000000000000..a4769041e40f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun9i-a80-de.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80-de.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Chen-Yu Tsai</div><div class='add'>+ *</div><div class='add'>+ * Chen-Yu Tsai &lt;wens@csie.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CCU_SUN9I_A80_DE_H_</div><div class='add'>+#define _CCU_SUN9I_A80_DE_H_</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/sun9i-a80-de.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun9i-a80-de.h&gt;</div><div class='add'>+</div><div class='add'>+/* Intermediary clock dividers are not exported */</div><div class='add'>+#define CLK_FE0_DIV	31</div><div class='add'>+#define CLK_FE1_DIV	32</div><div class='add'>+#define CLK_FE2_DIV	33</div><div class='add'>+#define CLK_BE0_DIV	34</div><div class='add'>+#define CLK_BE1_DIV	35</div><div class='add'>+#define CLK_BE2_DIV	36</div><div class='add'>+</div><div class='add'>+#define CLK_NUMBER	(CLK_BE2_DIV + 1)</div><div class='add'>+</div><div class='add'>+#endif /* _CCU_SUN9I_A80_DE_H_ */</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c b/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c<br/>new file mode 100644<br/>index 000000000000..1d76f24f7df3<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c</a></div><div class='hunk'>@@ -0,0 +1,144 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Chen-Yu Tsai. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ccu_common.h"</div><div class='add'>+#include "ccu_gate.h"</div><div class='add'>+#include "ccu_reset.h"</div><div class='add'>+</div><div class='add'>+#include "ccu-sun9i-a80-usb.h"</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(bus_hci0_clk, "bus-hci0", "bus-usb", 0x0, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb_ohci0_clk, "usb-ohci0", "osc24M", 0x0, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_hci1_clk, "bus-hci1", "bus-usb", 0x0, BIT(3), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_hci2_clk, "bus-hci2", "bus-usb", 0x0, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb_ohci2_clk, "usb-ohci2", "osc24M", 0x0, BIT(6), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(usb0_phy_clk, "usb0-phy", "osc24M", 0x4, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb1_hsic_clk, "usb1-hsic", "osc24M", 0x4, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb1_phy_clk, "usb1-phy", "osc24M", 0x4, BIT(3), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb2_hsic_clk, "usb2-hsic", "osc24M", 0x4, BIT(4), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb2_phy_clk, "usb2-phy", "osc24M", 0x4, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(usb_hsic_clk, "usb-hsic", "osc24M", 0x4, BIT(10), 0);</div><div class='add'>+</div><div class='add'>+static struct ccu_common *sun9i_a80_usb_clks[] = {</div><div class='add'>+	&amp;bus_hci0_clk.common,</div><div class='add'>+	&amp;usb_ohci0_clk.common,</div><div class='add'>+	&amp;bus_hci1_clk.common,</div><div class='add'>+	&amp;bus_hci2_clk.common,</div><div class='add'>+	&amp;usb_ohci2_clk.common,</div><div class='add'>+</div><div class='add'>+	&amp;usb0_phy_clk.common,</div><div class='add'>+	&amp;usb1_hsic_clk.common,</div><div class='add'>+	&amp;usb1_phy_clk.common,</div><div class='add'>+	&amp;usb2_hsic_clk.common,</div><div class='add'>+	&amp;usb2_phy_clk.common,</div><div class='add'>+	&amp;usb_hsic_clk.common,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw_onecell_data sun9i_a80_usb_hw_clks = {</div><div class='add'>+	.hws	= {</div><div class='add'>+		[CLK_BUS_HCI0]	= &amp;bus_hci0_clk.common.hw,</div><div class='add'>+		[CLK_USB_OHCI0]	= &amp;usb_ohci0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_HCI1]	= &amp;bus_hci1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_HCI2]	= &amp;bus_hci2_clk.common.hw,</div><div class='add'>+		[CLK_USB_OHCI2]	= &amp;usb_ohci2_clk.common.hw,</div><div class='add'>+</div><div class='add'>+		[CLK_USB0_PHY]	= &amp;usb0_phy_clk.common.hw,</div><div class='add'>+		[CLK_USB1_HSIC]	= &amp;usb1_hsic_clk.common.hw,</div><div class='add'>+		[CLK_USB1_PHY]	= &amp;usb1_phy_clk.common.hw,</div><div class='add'>+		[CLK_USB2_HSIC]	= &amp;usb2_hsic_clk.common.hw,</div><div class='add'>+		[CLK_USB2_PHY]	= &amp;usb2_phy_clk.common.hw,</div><div class='add'>+		[CLK_USB_HSIC]	= &amp;usb_hsic_clk.common.hw,</div><div class='add'>+	},</div><div class='add'>+	.num	= CLK_NUMBER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_reset_map sun9i_a80_usb_resets[] = {</div><div class='add'>+	[RST_USB0_HCI]		= { 0x0, BIT(17) },</div><div class='add'>+	[RST_USB1_HCI]		= { 0x0, BIT(18) },</div><div class='add'>+	[RST_USB2_HCI]		= { 0x0, BIT(19) },</div><div class='add'>+</div><div class='add'>+	[RST_USB0_PHY]		= { 0x4, BIT(17) },</div><div class='add'>+	[RST_USB1_HSIC]		= { 0x4, BIT(18) },</div><div class='add'>+	[RST_USB1_PHY]		= { 0x4, BIT(19) },</div><div class='add'>+	[RST_USB2_HSIC]		= { 0x4, BIT(20) },</div><div class='add'>+	[RST_USB2_PHY]		= { 0x4, BIT(21) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sunxi_ccu_desc sun9i_a80_usb_clk_desc = {</div><div class='add'>+	.ccu_clks	= sun9i_a80_usb_clks,</div><div class='add'>+	.num_ccu_clks	= ARRAY_SIZE(sun9i_a80_usb_clks),</div><div class='add'>+</div><div class='add'>+	.hw_clks	= &amp;sun9i_a80_usb_hw_clks,</div><div class='add'>+</div><div class='add'>+	.resets		= sun9i_a80_usb_resets,</div><div class='add'>+	.num_resets	= ARRAY_SIZE(sun9i_a80_usb_resets),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sun9i_a80_usb_clk_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct clk *bus_clk;</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	reg = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(reg))</div><div class='add'>+		return PTR_ERR(reg);</div><div class='add'>+</div><div class='add'>+	bus_clk = devm_clk_get(&amp;pdev-&gt;dev, "bus");</div><div class='add'>+	if (IS_ERR(bus_clk)) {</div><div class='add'>+		ret = PTR_ERR(bus_clk);</div><div class='add'>+		if (ret != -EPROBE_DEFER)</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Couldn't get bus clk: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The bus clock needs to be enabled for us to access the registers */</div><div class='add'>+	ret = clk_prepare_enable(bus_clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Couldn't enable bus clk: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = sunxi_ccu_probe(pdev-&gt;dev.of_node, reg,</div><div class='add'>+			      &amp;sun9i_a80_usb_clk_desc);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_disable_clk;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_disable_clk:</div><div class='add'>+	clk_disable_unprepare(bus_clk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id sun9i_a80_usb_clk_ids[] = {</div><div class='add'>+	{ .compatible = "allwinner,sun9i-a80-usb-clks" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver sun9i_a80_usb_clk_driver = {</div><div class='add'>+	.probe	= sun9i_a80_usb_clk_probe,</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name	= "sun9i-a80-usb-clks",</div><div class='add'>+		.of_match_table	= sun9i_a80_usb_clk_ids,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+builtin_platform_driver(sun9i_a80_usb_clk_driver);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.h b/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.h<br/>new file mode 100644<br/>index 000000000000..a184280ba854<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.h</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Chen-Yu Tsai</div><div class='add'>+ *</div><div class='add'>+ * Chen-Yu Tsai &lt;wens@csie.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CCU_SUN9I_A80_USB_H_</div><div class='add'>+#define _CCU_SUN9I_A80_USB_H_</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/sun9i-a80-usb.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun9i-a80-usb.h&gt;</div><div class='add'>+</div><div class='add'>+#define CLK_NUMBER	(CLK_USB_HSIC + 1)</div><div class='add'>+</div><div class='add'>+#endif /* _CCU_SUN9I_A80_USB_H_ */</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun9i-a80.c b/drivers/clk/sunxi-ng/ccu-sun9i-a80.c<br/>new file mode 100644<br/>index 000000000000..e13e313ce4f5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun9i-a80.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80.c</a></div><div class='hunk'>@@ -0,0 +1,1223 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016 Chen-Yu Tsai. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ccu_common.h"</div><div class='add'>+#include "ccu_reset.h"</div><div class='add'>+</div><div class='add'>+#include "ccu_div.h"</div><div class='add'>+#include "ccu_gate.h"</div><div class='add'>+#include "ccu_mp.h"</div><div class='add'>+#include "ccu_nkmp.h"</div><div class='add'>+#include "ccu_nm.h"</div><div class='add'>+#include "ccu_phase.h"</div><div class='add'>+</div><div class='add'>+#include "ccu-sun9i-a80.h"</div><div class='add'>+</div><div class='add'>+#define CCU_SUN9I_LOCK_REG	0x09c</div><div class='add'>+</div><div class='add'>+static struct clk_div_table pll_cpux_p_div_table[] = {</div><div class='add'>+	{ .val = 0, .div = 1 },</div><div class='add'>+	{ .val = 1, .div = 4 },</div><div class='add'>+	{ /* Sentinel */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The CPU PLLs are actually NP clocks, but P is /1 or /4, so here we</div><div class='add'>+ * use the NM clocks with a divider table for M.</div><div class='add'>+ */</div><div class='add'>+static struct ccu_nm pll_c0cpux_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(0),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV_TABLE(16, 1, pll_cpux_p_div_table),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x000,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-c0cpux", "osc24M",</div><div class='add'>+					      &amp;ccu_nm_ops, CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nm pll_c1cpux_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(1),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV_TABLE(16, 1, pll_cpux_p_div_table),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x004,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-c1cpux", "osc24M",</div><div class='add'>+					      &amp;ccu_nm_ops, CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Audio PLL has d1, d2 dividers in addition to the usual N, M</div><div class='add'>+ * factors. Since we only need 2 frequencies from this PLL: 22.5792 MHz</div><div class='add'>+ * and 24.576 MHz, ignore them for now. Enforce the default for them,</div><div class='add'>+ * which is d1 = 0, d2 = 1.</div><div class='add'>+ */</div><div class='add'>+#define SUN9I_A80_PLL_AUDIO_REG	0x008</div><div class='add'>+</div><div class='add'>+static struct ccu_nm pll_audio_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(2),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV_OFFSET(0, 6, 0),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x008,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-audio", "osc24M",</div><div class='add'>+					      &amp;ccu_nm_ops, CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Some PLLs are input * N / div1 / div2. Model them as NKMP with no K */</div><div class='add'>+static struct ccu_nkmp pll_periph0_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(3),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(16, 1), /* input divider */</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(18, 1), /* output divider */</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x00c,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-periph0", "osc24M",</div><div class='add'>+					      &amp;ccu_nkmp_ops,</div><div class='add'>+					      CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nkmp pll_ve_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(4),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(16, 1), /* input divider */</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(18, 1), /* output divider */</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x010,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-ve", "osc24M",</div><div class='add'>+					      &amp;ccu_nkmp_ops,</div><div class='add'>+					      CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nkmp pll_ddr_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(5),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(16, 1), /* input divider */</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(18, 1), /* output divider */</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x014,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-ddr", "osc24M",</div><div class='add'>+					      &amp;ccu_nkmp_ops,</div><div class='add'>+					      CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nm pll_video0_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(6),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(16, 1), /* input divider */</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x018,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-video0", "osc24M",</div><div class='add'>+					      &amp;ccu_nm_ops,</div><div class='add'>+					      CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nkmp pll_video1_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(7),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(16, 1), /* input divider */</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(0, 2), /* external divider p */</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x01c,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-video1", "osc24M",</div><div class='add'>+					      &amp;ccu_nkmp_ops,</div><div class='add'>+					      CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nkmp pll_gpu_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(8),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(16, 1), /* input divider */</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(18, 1), /* output divider */</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x020,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-gpu", "osc24M",</div><div class='add'>+					      &amp;ccu_nkmp_ops,</div><div class='add'>+					      CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nkmp pll_de_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(9),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(16, 1), /* input divider */</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(18, 1), /* output divider */</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x024,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-de", "osc24M",</div><div class='add'>+					      &amp;ccu_nkmp_ops,</div><div class='add'>+					      CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nkmp pll_isp_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(10),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(16, 1), /* input divider */</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(18, 1), /* output divider */</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x028,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-isp", "osc24M",</div><div class='add'>+					      &amp;ccu_nkmp_ops,</div><div class='add'>+					      CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_nkmp pll_periph1_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.lock		= BIT(11),</div><div class='add'>+	.n		= _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(16, 1), /* input divider */</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(18, 1), /* output divider */</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x028,</div><div class='add'>+		.lock_reg	= CCU_SUN9I_LOCK_REG,</div><div class='add'>+		.features	= CCU_FEATURE_LOCK_REG,</div><div class='add'>+		.hw.init	= CLK_HW_INIT("pll-periph1", "osc24M",</div><div class='add'>+					      &amp;ccu_nkmp_ops,</div><div class='add'>+					      CLK_SET_RATE_UNGATE),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const c0cpux_parents[] = { "osc24M", "pll-c0cpux" };</div><div class='add'>+static SUNXI_CCU_MUX(c0cpux_clk, "c0cpux", c0cpux_parents,</div><div class='add'>+		     0x50, 0, 1, CLK_SET_RATE_PARENT | CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static const char * const c1cpux_parents[] = { "osc24M", "pll-c1cpux" };</div><div class='add'>+static SUNXI_CCU_MUX(c1cpux_clk, "c1cpux", c1cpux_parents,</div><div class='add'>+		     0x50, 8, 1, CLK_SET_RATE_PARENT | CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static struct clk_div_table axi_div_table[] = {</div><div class='add'>+	{ .val = 0, .div = 1 },</div><div class='add'>+	{ .val = 1, .div = 2 },</div><div class='add'>+	{ .val = 2, .div = 3 },</div><div class='add'>+	{ .val = 3, .div = 4 },</div><div class='add'>+	{ .val = 4, .div = 4 },</div><div class='add'>+	{ .val = 5, .div = 4 },</div><div class='add'>+	{ .val = 6, .div = 4 },</div><div class='add'>+	{ .val = 7, .div = 4 },</div><div class='add'>+	{ /* Sentinel */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M(atb0_clk, "atb0", "c0cpux", 0x054, 8, 2, 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_DIV_TABLE(axi0_clk, "axi0", "c0cpux",</div><div class='add'>+			   0x054, 0, 3, axi_div_table, 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M(atb1_clk, "atb1", "c1cpux", 0x058, 8, 2, 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_DIV_TABLE(axi1_clk, "axi1", "c1cpux",</div><div class='add'>+			   0x058, 0, 3, axi_div_table, 0);</div><div class='add'>+</div><div class='add'>+static const char * const gtbus_parents[] = { "osc24M", "pll-periph0",</div><div class='add'>+					      "pll-periph1", "pll-periph1" };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX(gtbus_clk, "gtbus", gtbus_parents,</div><div class='add'>+			    0x05c, 0, 2, 24, 2, CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static const char * const ahb_parents[] = { "gtbus", "pll-periph0",</div><div class='add'>+					    "pll-periph1", "pll-periph1" };</div><div class='add'>+static struct ccu_div ahb0_clk = {</div><div class='add'>+	.div		= _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO),</div><div class='add'>+	.mux		= _SUNXI_CCU_MUX(24, 2),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x060,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("ahb0",</div><div class='add'>+						      ahb_parents,</div><div class='add'>+						      &amp;ccu_div_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_div ahb1_clk = {</div><div class='add'>+	.div		= _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO),</div><div class='add'>+	.mux		= _SUNXI_CCU_MUX(24, 2),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x064,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("ahb1",</div><div class='add'>+						      ahb_parents,</div><div class='add'>+						      &amp;ccu_div_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_div ahb2_clk = {</div><div class='add'>+	.div		= _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO),</div><div class='add'>+	.mux		= _SUNXI_CCU_MUX(24, 2),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x068,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("ahb2",</div><div class='add'>+						      ahb_parents,</div><div class='add'>+						      &amp;ccu_div_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const apb_parents[] = { "osc24M", "pll-periph0" };</div><div class='add'>+</div><div class='add'>+static struct ccu_div apb0_clk = {</div><div class='add'>+	.div		= _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO),</div><div class='add'>+	.mux		= _SUNXI_CCU_MUX(24, 1),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x070,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("apb0",</div><div class='add'>+						      apb_parents,</div><div class='add'>+						      &amp;ccu_div_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_div apb1_clk = {</div><div class='add'>+	.div		= _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO),</div><div class='add'>+	.mux		= _SUNXI_CCU_MUX(24, 1),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x074,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("apb1",</div><div class='add'>+						      apb_parents,</div><div class='add'>+						      &amp;ccu_div_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_div cci400_clk = {</div><div class='add'>+	.div		= _SUNXI_CCU_DIV_FLAGS(0, 2, CLK_DIVIDER_POWER_OF_TWO),</div><div class='add'>+	.mux		= _SUNXI_CCU_MUX(24, 2),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x078,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("cci400",</div><div class='add'>+						      ahb_parents,</div><div class='add'>+						      &amp;ccu_div_ops,</div><div class='add'>+						      CLK_IS_CRITICAL),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(ats_clk, "ats", apb_parents,</div><div class='add'>+				 0x080, 0, 3, 24, 2, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(trace_clk, "trace", apb_parents,</div><div class='add'>+				 0x084, 0, 3, 24, 2, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const out_parents[] = { "osc24M", "osc32k", "osc24M" };</div><div class='add'>+static const struct ccu_mux_fixed_prediv out_prediv = {</div><div class='add'>+	.index = 0, .div = 750</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_mp out_a_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(8, 5),</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(20, 2),</div><div class='add'>+	.mux		= {</div><div class='add'>+		.shift		= 24,</div><div class='add'>+		.width		= 4,</div><div class='add'>+		.fixed_predivs	= &amp;out_prediv,</div><div class='add'>+		.n_predivs	= 1,</div><div class='add'>+	},</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x180,</div><div class='add'>+		.features	= CCU_FEATURE_FIXED_PREDIV,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("out-a",</div><div class='add'>+						      out_parents,</div><div class='add'>+						      &amp;ccu_mp_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_mp out_b_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(8, 5),</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(20, 2),</div><div class='add'>+	.mux		= {</div><div class='add'>+		.shift		= 24,</div><div class='add'>+		.width		= 4,</div><div class='add'>+		.fixed_predivs	= &amp;out_prediv,</div><div class='add'>+		.n_predivs	= 1,</div><div class='add'>+	},</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x184,</div><div class='add'>+		.features	= CCU_FEATURE_FIXED_PREDIV,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("out-b",</div><div class='add'>+						      out_parents,</div><div class='add'>+						      &amp;ccu_mp_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const mod0_default_parents[] = { "osc24M", "pll-periph0" };</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(nand0_0_clk, "nand0-0", mod0_default_parents,</div><div class='add'>+				  0x400,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(nand0_1_clk, "nand0-1", mod0_default_parents,</div><div class='add'>+				  0x404,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(nand1_0_clk, "nand1-0", mod0_default_parents,</div><div class='add'>+				  0x408,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(nand1_1_clk, "nand1-1", mod0_default_parents,</div><div class='add'>+				  0x40c,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc0_clk, "mmc0", mod0_default_parents,</div><div class='add'>+				  0x410,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_PHASE(mmc0_sample_clk, "mmc0-sample", "mmc0",</div><div class='add'>+		       0x410, 20, 3, 0);</div><div class='add'>+static SUNXI_CCU_PHASE(mmc0_output_clk, "mmc0-output", "mmc0",</div><div class='add'>+		       0x410, 8, 3, 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc1_clk, "mmc1", mod0_default_parents,</div><div class='add'>+				  0x414,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_PHASE(mmc1_sample_clk, "mmc1-sample", "mmc1",</div><div class='add'>+		       0x414, 20, 3, 0);</div><div class='add'>+static SUNXI_CCU_PHASE(mmc1_output_clk, "mmc1-output", "mmc1",</div><div class='add'>+		       0x414, 8, 3, 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc2_clk, "mmc2", mod0_default_parents,</div><div class='add'>+				  0x418,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_PHASE(mmc2_sample_clk, "mmc2-sample", "mmc2",</div><div class='add'>+		       0x418, 20, 3, 0);</div><div class='add'>+static SUNXI_CCU_PHASE(mmc2_output_clk, "mmc2-output", "mmc2",</div><div class='add'>+		       0x418, 8, 3, 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(mmc3_clk, "mmc3", mod0_default_parents,</div><div class='add'>+				  0x41c,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_PHASE(mmc3_sample_clk, "mmc3-sample", "mmc3",</div><div class='add'>+		       0x41c, 20, 3, 0);</div><div class='add'>+static SUNXI_CCU_PHASE(mmc3_output_clk, "mmc3-output", "mmc3",</div><div class='add'>+		       0x41c, 8, 3, 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(ts_clk, "ts", mod0_default_parents,</div><div class='add'>+				  0x428,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static const char * const ss_parents[] = { "osc24M", "pll-periph",</div><div class='add'>+					   "pll-periph1" };</div><div class='add'>+static const u8 ss_table[] = { 0, 1, 13 };</div><div class='add'>+static struct ccu_mp ss_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(0, 4),</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(16, 2),</div><div class='add'>+	.mux		= _SUNXI_CCU_MUX_TABLE(24, 4, ss_table),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x42c,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("ss",</div><div class='add'>+						      ss_parents,</div><div class='add'>+						      &amp;ccu_mp_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(spi0_clk, "spi0", mod0_default_parents,</div><div class='add'>+				  0x430,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(spi1_clk, "spi1", mod0_default_parents,</div><div class='add'>+				  0x434,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(spi2_clk, "spi2", mod0_default_parents,</div><div class='add'>+				  0x438,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_MP_WITH_MUX_GATE(spi3_clk, "spi3", mod0_default_parents,</div><div class='add'>+				  0x43c,</div><div class='add'>+				  0, 4,		/* M */</div><div class='add'>+				  16, 2,	/* P */</div><div class='add'>+				  24, 4,	/* mux */</div><div class='add'>+				  BIT(31),	/* gate */</div><div class='add'>+				  0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(i2s0_clk, "i2s0", "pll-audio",</div><div class='add'>+			     0x440, 0, 4, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(i2s1_clk, "i2s1", "pll-audio",</div><div class='add'>+			     0x444, 0, 4, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(spdif_clk, "spdif", "pll-audio",</div><div class='add'>+			     0x44c, 0, 4, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static const char * const sdram_parents[] = { "pll-periph0", "pll-ddr" };</div><div class='add'>+static const u8 sdram_table[] = { 0, 3 };</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(sdram_clk, "sdram",</div><div class='add'>+				       sdram_parents, sdram_table,</div><div class='add'>+				       0x484,</div><div class='add'>+				       8, 4,	/* M */</div><div class='add'>+				       12, 4,	/* mux */</div><div class='add'>+				       0,	/* no gate */</div><div class='add'>+				       CLK_IS_CRITICAL);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(de_clk, "de", "pll-de", 0x490,</div><div class='add'>+			     0, 4, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(edp_clk, "edp", "osc24M", 0x494, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static const char * const mp_parents[] = { "pll-video1", "pll-gpu", "pll-de" };</div><div class='add'>+static const u8 mp_table[] = { 9, 10, 11 };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(mp_clk, "mp", mp_parents, mp_table,</div><div class='add'>+				       0x498,</div><div class='add'>+				       0, 4,	/* M */</div><div class='add'>+				       24, 4,	/* mux */</div><div class='add'>+				       BIT(31),	/* gate */</div><div class='add'>+				       0);</div><div class='add'>+</div><div class='add'>+static const char * const display_parents[] = { "pll-video0", "pll-video1" };</div><div class='add'>+static const u8 display_table[] = { 8, 9 };</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(lcd0_clk, "lcd0",</div><div class='add'>+				       display_parents, display_table,</div><div class='add'>+				       0x49c,</div><div class='add'>+				       0, 4,	/* M */</div><div class='add'>+				       24, 4,	/* mux */</div><div class='add'>+				       BIT(31),	/* gate */</div><div class='add'>+				       CLK_SET_RATE_NO_REPARENT |</div><div class='add'>+				       CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(lcd1_clk, "lcd1",</div><div class='add'>+				       display_parents, display_table,</div><div class='add'>+				       0x4a0,</div><div class='add'>+				       0, 4,	/* M */</div><div class='add'>+				       24, 4,	/* mux */</div><div class='add'>+				       BIT(31),	/* gate */</div><div class='add'>+				       CLK_SET_RATE_NO_REPARENT |</div><div class='add'>+				       CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(mipi_dsi0_clk, "mipi-dsi0",</div><div class='add'>+				       display_parents, display_table,</div><div class='add'>+				       0x4a8,</div><div class='add'>+				       0, 4,	/* M */</div><div class='add'>+				       24, 4,	/* mux */</div><div class='add'>+				       BIT(31),	/* gate */</div><div class='add'>+				       CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static const char * const mipi_dsi1_parents[] = { "osc24M", "pll-video1" };</div><div class='add'>+static const u8 mipi_dsi1_table[] = { 0, 9 };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(mipi_dsi1_clk, "mipi-dsi1",</div><div class='add'>+				       mipi_dsi1_parents, mipi_dsi1_table,</div><div class='add'>+				       0x4ac,</div><div class='add'>+				       0, 4,	/* M */</div><div class='add'>+				       24, 4,	/* mux */</div><div class='add'>+				       BIT(31),	/* gate */</div><div class='add'>+				       CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(hdmi_clk, "hdmi",</div><div class='add'>+				       display_parents, display_table,</div><div class='add'>+				       0x4b0,</div><div class='add'>+				       0, 4,	/* M */</div><div class='add'>+				       24, 4,	/* mux */</div><div class='add'>+				       BIT(31),	/* gate */</div><div class='add'>+				       CLK_SET_RATE_NO_REPARENT |</div><div class='add'>+				       CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(hdmi_slow_clk, "hdmi-slow", "osc24M", 0x4b4, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(mipi_csi_clk, "mipi-csi", "osc24M", 0x4bc,</div><div class='add'>+			     0, 4, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(csi_isp_clk, "csi-isp", "pll-isp", 0x4c0,</div><div class='add'>+			     0, 4, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(csi_misc_clk, "csi-misc", "osc24M", 0x4c0, BIT(16), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(csi0_mclk_clk, "csi0-mclk",</div><div class='add'>+				       mipi_dsi1_parents, mipi_dsi1_table,</div><div class='add'>+				       0x4c4,</div><div class='add'>+				       0, 4,	/* M */</div><div class='add'>+				       24, 4,	/* mux */</div><div class='add'>+				       BIT(31),	/* gate */</div><div class='add'>+				       CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(csi1_mclk_clk, "csi1-mclk",</div><div class='add'>+				       mipi_dsi1_parents, mipi_dsi1_table,</div><div class='add'>+				       0x4c8,</div><div class='add'>+				       0, 4,	/* M */</div><div class='add'>+				       24, 4,	/* mux */</div><div class='add'>+				       BIT(31),	/* gate */</div><div class='add'>+				       CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static const char * const fd_parents[] = { "pll-periph0", "pll-isp" };</div><div class='add'>+static const u8 fd_table[] = { 1, 12 };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(fd_clk, "fd", fd_parents, fd_table,</div><div class='add'>+				       0x4cc,</div><div class='add'>+				       0, 4,	/* M */</div><div class='add'>+				       24, 4,	/* mux */</div><div class='add'>+				       BIT(31),	/* gate */</div><div class='add'>+				       0);</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve", 0x4d0,</div><div class='add'>+			     16, 3, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_GATE(avs_clk, "avs", "osc24M", 0x4d4, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(gpu_core_clk, "gpu-core", "pll-gpu", 0x4f0,</div><div class='add'>+			     0, 3, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(gpu_memory_clk, "gpu-memory", "pll-gpu", 0x4f4,</div><div class='add'>+			     0, 3, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static const char * const gpu_axi_parents[] = { "pll-periph0", "pll-gpu" };</div><div class='add'>+static const u8 gpu_axi_table[] = { 1, 10 };</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_TABLE_GATE(gpu_axi_clk, "gpu-axi",</div><div class='add'>+				       gpu_axi_parents, gpu_axi_table,</div><div class='add'>+				       0x4f8,</div><div class='add'>+				       0, 4,	/* M */</div><div class='add'>+				       24, 4,	/* mux */</div><div class='add'>+				       BIT(31),	/* gate */</div><div class='add'>+				       CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(sata_clk, "sata", "pll-periph0", 0x500,</div><div class='add'>+			     0, 4, BIT(31), 0);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_GATE(ac97_clk, "ac97", "pll-audio",</div><div class='add'>+			     0x504, 0, 4, BIT(31), CLK_SET_RATE_PARENT);</div><div class='add'>+</div><div class='add'>+static SUNXI_CCU_M_WITH_MUX_GATE(mipi_hsi_clk, "mipi-hsi",</div><div class='add'>+				 mod0_default_parents, 0x508,</div><div class='add'>+				 0, 4,		/* M */</div><div class='add'>+				 24, 4,		/* mux */</div><div class='add'>+				 BIT(31),	/* gate */</div><div class='add'>+				 0);</div><div class='add'>+</div><div class='add'>+static const char * const gpadc_parents[] = { "osc24M", "pll-audio", "osc32k" };</div><div class='add'>+static const u8 gpadc_table[] = { 0, 4, 7 };</div><div class='add'>+static struct ccu_mp gpadc_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(0, 4),</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(16, 2),</div><div class='add'>+	.mux		= _SUNXI_CCU_MUX_TABLE(24, 4, gpadc_table),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x50c,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("gpadc",</div><div class='add'>+						      gpadc_parents,</div><div class='add'>+						      &amp;ccu_mp_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const cir_tx_parents[] = { "osc24M", "osc32k" };</div><div class='add'>+static const u8 cir_tx_table[] = { 0, 7 };</div><div class='add'>+static struct ccu_mp cir_tx_clk = {</div><div class='add'>+	.enable		= BIT(31),</div><div class='add'>+	.m		= _SUNXI_CCU_DIV(0, 4),</div><div class='add'>+	.p		= _SUNXI_CCU_DIV(16, 2),</div><div class='add'>+	.mux		= _SUNXI_CCU_MUX_TABLE(24, 4, cir_tx_table),</div><div class='add'>+	.common		= {</div><div class='add'>+		.reg		= 0x510,</div><div class='add'>+		.hw.init	= CLK_HW_INIT_PARENTS("cir-tx",</div><div class='add'>+						      cir_tx_parents,</div><div class='add'>+						      &amp;ccu_mp_ops,</div><div class='add'>+						      0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* AHB0 bus gates */</div><div class='add'>+static SUNXI_CCU_GATE(bus_fd_clk,	"bus-fd",	"ahb0",</div><div class='add'>+		      0x580, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ve_clk,	"bus-ve",	"ahb0",</div><div class='add'>+		      0x580, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_gpu_ctrl_clk,	"bus-gpu-ctrl",	"ahb0",</div><div class='add'>+		      0x580, BIT(3), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ss_clk,	"bus-ss",	"ahb0",</div><div class='add'>+		      0x580, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_mmc_clk,	"bus-mmc",	"ahb0",</div><div class='add'>+		      0x580, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_nand0_clk,	"bus-nand0",	"ahb0",</div><div class='add'>+		      0x580, BIT(12), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_nand1_clk,	"bus-nand1",	"ahb0",</div><div class='add'>+		      0x580, BIT(13), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_sdram_clk,	"bus-sdram",	"ahb0",</div><div class='add'>+		      0x580, BIT(14), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_mipi_hsi_clk,	"bus-mipi-hsi",	"ahb0",</div><div class='add'>+		      0x580, BIT(15), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_sata_clk,	"bus-sata",	"ahb0",</div><div class='add'>+		      0x580, BIT(16), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ts_clk,	"bus-ts",	"ahb0",</div><div class='add'>+		      0x580, BIT(18), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_spi0_clk,	"bus-spi0",	"ahb0",</div><div class='add'>+		      0x580, BIT(20), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_spi1_clk,	"bus-spi1",	"ahb0",</div><div class='add'>+		      0x580, BIT(21), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_spi2_clk,	"bus-spi2",	"ahb0",</div><div class='add'>+		      0x580, BIT(22), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_spi3_clk,	"bus-spi3",	"ahb0",</div><div class='add'>+		      0x580, BIT(23), 0);</div><div class='add'>+</div><div class='add'>+/* AHB1 bus gates */</div><div class='add'>+static SUNXI_CCU_GATE(bus_otg_clk,	"bus-otg",	"ahb1",</div><div class='add'>+		      0x584, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_usb_clk,	"bus-usb",	"ahb1",</div><div class='add'>+		      0x584, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_gmac_clk,	"bus-gmac",	"ahb1",</div><div class='add'>+		      0x584, BIT(17), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_msgbox_clk,	"bus-msgbox",	"ahb1",</div><div class='add'>+		      0x584, BIT(21), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_spinlock_clk,	"bus-spinlock",	"ahb1",</div><div class='add'>+		      0x584, BIT(22), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_hstimer_clk,	"bus-hstimer",	"ahb1",</div><div class='add'>+		      0x584, BIT(23), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_dma_clk,	"bus-dma",	"ahb1",</div><div class='add'>+		      0x584, BIT(24), 0);</div><div class='add'>+</div><div class='add'>+/* AHB2 bus gates */</div><div class='add'>+static SUNXI_CCU_GATE(bus_lcd0_clk,	"bus-lcd0",	"ahb2",</div><div class='add'>+		      0x588, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_lcd1_clk,	"bus-lcd1",	"ahb2",</div><div class='add'>+		      0x588, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_edp_clk,	"bus-edp",	"ahb2",</div><div class='add'>+		      0x588, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_csi_clk,	"bus-csi",	"ahb2",</div><div class='add'>+		      0x588, BIT(4), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_hdmi_clk,	"bus-hdmi",	"ahb2",</div><div class='add'>+		      0x588, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_de_clk,	"bus-de",	"ahb2",</div><div class='add'>+		      0x588, BIT(7), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_mp_clk,	"bus-mp",	"ahb2",</div><div class='add'>+		      0x588, BIT(8), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_mipi_dsi_clk,	"bus-mipi-dsi",	"ahb2",</div><div class='add'>+		      0x588, BIT(11), 0);</div><div class='add'>+</div><div class='add'>+/* APB0 bus gates */</div><div class='add'>+static SUNXI_CCU_GATE(bus_spdif_clk,	"bus-spdif",	"apb0",</div><div class='add'>+		      0x590, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_pio_clk,	"bus-pio",	"apb0",</div><div class='add'>+		      0x590, BIT(5), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_ac97_clk,	"bus-ac97",	"apb0",</div><div class='add'>+		      0x590, BIT(11), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2s0_clk,	"bus-i2s0",	"apb0",</div><div class='add'>+		      0x590, BIT(12), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2s1_clk,	"bus-i2s1",	"apb0",</div><div class='add'>+		      0x590, BIT(13), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_lradc_clk,	"bus-lradc",	"apb0",</div><div class='add'>+		      0x590, BIT(15), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_gpadc_clk,	"bus-gpadc",	"apb0",</div><div class='add'>+		      0x590, BIT(17), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_twd_clk,	"bus-twd",	"apb0",</div><div class='add'>+		      0x590, BIT(18), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_cir_tx_clk,	"bus-cir-tx",	"apb0",</div><div class='add'>+		      0x590, BIT(19), 0);</div><div class='add'>+</div><div class='add'>+/* APB1 bus gates */</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2c0_clk,	"bus-i2c0",	"apb1",</div><div class='add'>+		      0x594, BIT(0), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2c1_clk,	"bus-i2c1",	"apb1",</div><div class='add'>+		      0x594, BIT(1), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2c2_clk,	"bus-i2c2",	"apb1",</div><div class='add'>+		      0x594, BIT(2), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2c3_clk,	"bus-i2c3",	"apb1",</div><div class='add'>+		      0x594, BIT(3), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_i2c4_clk,	"bus-i2c4",	"apb1",</div><div class='add'>+		      0x594, BIT(4), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart0_clk,	"bus-uart0",	"apb1",</div><div class='add'>+		      0x594, BIT(16), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart1_clk,	"bus-uart1",	"apb1",</div><div class='add'>+		      0x594, BIT(17), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart2_clk,	"bus-uart2",	"apb1",</div><div class='add'>+		      0x594, BIT(18), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart3_clk,	"bus-uart3",	"apb1",</div><div class='add'>+		      0x594, BIT(19), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart4_clk,	"bus-uart4",	"apb1",</div><div class='add'>+		      0x594, BIT(20), 0);</div><div class='add'>+static SUNXI_CCU_GATE(bus_uart5_clk,	"bus-uart5",	"apb1",</div><div class='add'>+		      0x594, BIT(21), 0);</div><div class='add'>+</div><div class='add'>+static struct ccu_common *sun9i_a80_ccu_clks[] = {</div><div class='add'>+	&amp;pll_c0cpux_clk.common,</div><div class='add'>+	&amp;pll_c1cpux_clk.common,</div><div class='add'>+	&amp;pll_audio_clk.common,</div><div class='add'>+	&amp;pll_periph0_clk.common,</div><div class='add'>+	&amp;pll_ve_clk.common,</div><div class='add'>+	&amp;pll_ddr_clk.common,</div><div class='add'>+	&amp;pll_video0_clk.common,</div><div class='add'>+	&amp;pll_video1_clk.common,</div><div class='add'>+	&amp;pll_gpu_clk.common,</div><div class='add'>+	&amp;pll_de_clk.common,</div><div class='add'>+	&amp;pll_isp_clk.common,</div><div class='add'>+	&amp;pll_periph1_clk.common,</div><div class='add'>+	&amp;c0cpux_clk.common,</div><div class='add'>+	&amp;c1cpux_clk.common,</div><div class='add'>+	&amp;atb0_clk.common,</div><div class='add'>+	&amp;axi0_clk.common,</div><div class='add'>+	&amp;atb1_clk.common,</div><div class='add'>+	&amp;axi1_clk.common,</div><div class='add'>+	&amp;gtbus_clk.common,</div><div class='add'>+	&amp;ahb0_clk.common,</div><div class='add'>+	&amp;ahb1_clk.common,</div><div class='add'>+	&amp;ahb2_clk.common,</div><div class='add'>+	&amp;apb0_clk.common,</div><div class='add'>+	&amp;apb1_clk.common,</div><div class='add'>+	&amp;cci400_clk.common,</div><div class='add'>+	&amp;ats_clk.common,</div><div class='add'>+	&amp;trace_clk.common,</div><div class='add'>+</div><div class='add'>+	&amp;out_a_clk.common,</div><div class='add'>+	&amp;out_b_clk.common,</div><div class='add'>+</div><div class='add'>+	/* module clocks */</div><div class='add'>+	&amp;nand0_0_clk.common,</div><div class='add'>+	&amp;nand0_1_clk.common,</div><div class='add'>+	&amp;nand1_0_clk.common,</div><div class='add'>+	&amp;nand1_1_clk.common,</div><div class='add'>+	&amp;mmc0_clk.common,</div><div class='add'>+	&amp;mmc0_sample_clk.common,</div><div class='add'>+	&amp;mmc0_output_clk.common,</div><div class='add'>+	&amp;mmc1_clk.common,</div><div class='add'>+	&amp;mmc1_sample_clk.common,</div><div class='add'>+	&amp;mmc1_output_clk.common,</div><div class='add'>+	&amp;mmc2_clk.common,</div><div class='add'>+	&amp;mmc2_sample_clk.common,</div><div class='add'>+	&amp;mmc2_output_clk.common,</div><div class='add'>+	&amp;mmc3_clk.common,</div><div class='add'>+	&amp;mmc3_sample_clk.common,</div><div class='add'>+	&amp;mmc3_output_clk.common,</div><div class='add'>+	&amp;ts_clk.common,</div><div class='add'>+	&amp;ss_clk.common,</div><div class='add'>+	&amp;spi0_clk.common,</div><div class='add'>+	&amp;spi1_clk.common,</div><div class='add'>+	&amp;spi2_clk.common,</div><div class='add'>+	&amp;spi3_clk.common,</div><div class='add'>+	&amp;i2s0_clk.common,</div><div class='add'>+	&amp;i2s1_clk.common,</div><div class='add'>+	&amp;spdif_clk.common,</div><div class='add'>+	&amp;sdram_clk.common,</div><div class='add'>+	&amp;de_clk.common,</div><div class='add'>+	&amp;edp_clk.common,</div><div class='add'>+	&amp;mp_clk.common,</div><div class='add'>+	&amp;lcd0_clk.common,</div><div class='add'>+	&amp;lcd1_clk.common,</div><div class='add'>+	&amp;mipi_dsi0_clk.common,</div><div class='add'>+	&amp;mipi_dsi1_clk.common,</div><div class='add'>+	&amp;hdmi_clk.common,</div><div class='add'>+	&amp;hdmi_slow_clk.common,</div><div class='add'>+	&amp;mipi_csi_clk.common,</div><div class='add'>+	&amp;csi_isp_clk.common,</div><div class='add'>+	&amp;csi_misc_clk.common,</div><div class='add'>+	&amp;csi0_mclk_clk.common,</div><div class='add'>+	&amp;csi1_mclk_clk.common,</div><div class='add'>+	&amp;fd_clk.common,</div><div class='add'>+	&amp;ve_clk.common,</div><div class='add'>+	&amp;avs_clk.common,</div><div class='add'>+	&amp;gpu_core_clk.common,</div><div class='add'>+	&amp;gpu_memory_clk.common,</div><div class='add'>+	&amp;gpu_axi_clk.common,</div><div class='add'>+	&amp;sata_clk.common,</div><div class='add'>+	&amp;ac97_clk.common,</div><div class='add'>+	&amp;mipi_hsi_clk.common,</div><div class='add'>+	&amp;gpadc_clk.common,</div><div class='add'>+	&amp;cir_tx_clk.common,</div><div class='add'>+</div><div class='add'>+	/* AHB0 bus gates */</div><div class='add'>+	&amp;bus_fd_clk.common,</div><div class='add'>+	&amp;bus_ve_clk.common,</div><div class='add'>+	&amp;bus_gpu_ctrl_clk.common,</div><div class='add'>+	&amp;bus_ss_clk.common,</div><div class='add'>+	&amp;bus_mmc_clk.common,</div><div class='add'>+	&amp;bus_nand0_clk.common,</div><div class='add'>+	&amp;bus_nand1_clk.common,</div><div class='add'>+	&amp;bus_sdram_clk.common,</div><div class='add'>+	&amp;bus_mipi_hsi_clk.common,</div><div class='add'>+	&amp;bus_sata_clk.common,</div><div class='add'>+	&amp;bus_ts_clk.common,</div><div class='add'>+	&amp;bus_spi0_clk.common,</div><div class='add'>+	&amp;bus_spi1_clk.common,</div><div class='add'>+	&amp;bus_spi2_clk.common,</div><div class='add'>+	&amp;bus_spi3_clk.common,</div><div class='add'>+</div><div class='add'>+	/* AHB1 bus gates */</div><div class='add'>+	&amp;bus_otg_clk.common,</div><div class='add'>+	&amp;bus_usb_clk.common,</div><div class='add'>+	&amp;bus_gmac_clk.common,</div><div class='add'>+	&amp;bus_msgbox_clk.common,</div><div class='add'>+	&amp;bus_spinlock_clk.common,</div><div class='add'>+	&amp;bus_hstimer_clk.common,</div><div class='add'>+	&amp;bus_dma_clk.common,</div><div class='add'>+</div><div class='add'>+	/* AHB2 bus gates */</div><div class='add'>+	&amp;bus_lcd0_clk.common,</div><div class='add'>+	&amp;bus_lcd1_clk.common,</div><div class='add'>+	&amp;bus_edp_clk.common,</div><div class='add'>+	&amp;bus_csi_clk.common,</div><div class='add'>+	&amp;bus_hdmi_clk.common,</div><div class='add'>+	&amp;bus_de_clk.common,</div><div class='add'>+	&amp;bus_mp_clk.common,</div><div class='add'>+	&amp;bus_mipi_dsi_clk.common,</div><div class='add'>+</div><div class='add'>+	/* APB0 bus gates */</div><div class='add'>+	&amp;bus_spdif_clk.common,</div><div class='add'>+	&amp;bus_pio_clk.common,</div><div class='add'>+	&amp;bus_ac97_clk.common,</div><div class='add'>+	&amp;bus_i2s0_clk.common,</div><div class='add'>+	&amp;bus_i2s1_clk.common,</div><div class='add'>+	&amp;bus_lradc_clk.common,</div><div class='add'>+	&amp;bus_gpadc_clk.common,</div><div class='add'>+	&amp;bus_twd_clk.common,</div><div class='add'>+	&amp;bus_cir_tx_clk.common,</div><div class='add'>+</div><div class='add'>+	/* APB1 bus gates */</div><div class='add'>+	&amp;bus_i2c0_clk.common,</div><div class='add'>+	&amp;bus_i2c1_clk.common,</div><div class='add'>+	&amp;bus_i2c2_clk.common,</div><div class='add'>+	&amp;bus_i2c3_clk.common,</div><div class='add'>+	&amp;bus_i2c4_clk.common,</div><div class='add'>+	&amp;bus_uart0_clk.common,</div><div class='add'>+	&amp;bus_uart1_clk.common,</div><div class='add'>+	&amp;bus_uart2_clk.common,</div><div class='add'>+	&amp;bus_uart3_clk.common,</div><div class='add'>+	&amp;bus_uart4_clk.common,</div><div class='add'>+	&amp;bus_uart5_clk.common,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw_onecell_data sun9i_a80_hw_clks = {</div><div class='add'>+	.hws	= {</div><div class='add'>+		[CLK_PLL_C0CPUX]	= &amp;pll_c0cpux_clk.common.hw,</div><div class='add'>+		[CLK_PLL_C1CPUX]	= &amp;pll_c1cpux_clk.common.hw,</div><div class='add'>+		[CLK_PLL_AUDIO]		= &amp;pll_audio_clk.common.hw,</div><div class='add'>+		[CLK_PLL_PERIPH0]	= &amp;pll_periph0_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VE]		= &amp;pll_ve_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DDR]		= &amp;pll_ddr_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO0]	= &amp;pll_video0_clk.common.hw,</div><div class='add'>+		[CLK_PLL_VIDEO1]	= &amp;pll_video1_clk.common.hw,</div><div class='add'>+		[CLK_PLL_GPU]		= &amp;pll_gpu_clk.common.hw,</div><div class='add'>+		[CLK_PLL_DE]		= &amp;pll_de_clk.common.hw,</div><div class='add'>+		[CLK_PLL_ISP]		= &amp;pll_isp_clk.common.hw,</div><div class='add'>+		[CLK_PLL_PERIPH1]	= &amp;pll_periph1_clk.common.hw,</div><div class='add'>+		[CLK_C0CPUX]		= &amp;c0cpux_clk.common.hw,</div><div class='add'>+		[CLK_C1CPUX]		= &amp;c1cpux_clk.common.hw,</div><div class='add'>+		[CLK_ATB0]		= &amp;atb0_clk.common.hw,</div><div class='add'>+		[CLK_AXI0]		= &amp;axi0_clk.common.hw,</div><div class='add'>+		[CLK_ATB1]		= &amp;atb1_clk.common.hw,</div><div class='add'>+		[CLK_AXI1]		= &amp;axi1_clk.common.hw,</div><div class='add'>+		[CLK_GTBUS]		= &amp;gtbus_clk.common.hw,</div><div class='add'>+		[CLK_AHB0]		= &amp;ahb0_clk.common.hw,</div><div class='add'>+		[CLK_AHB1]		= &amp;ahb1_clk.common.hw,</div><div class='add'>+		[CLK_AHB2]		= &amp;ahb2_clk.common.hw,</div><div class='add'>+		[CLK_APB0]		= &amp;apb0_clk.common.hw,</div><div class='add'>+		[CLK_APB1]		= &amp;apb1_clk.common.hw,</div><div class='add'>+		[CLK_CCI400]		= &amp;cci400_clk.common.hw,</div><div class='add'>+		[CLK_ATS]		= &amp;ats_clk.common.hw,</div><div class='add'>+		[CLK_TRACE]		= &amp;trace_clk.common.hw,</div><div class='add'>+</div><div class='add'>+		[CLK_OUT_A]		= &amp;out_a_clk.common.hw,</div><div class='add'>+		[CLK_OUT_B]		= &amp;out_b_clk.common.hw,</div><div class='add'>+</div><div class='add'>+		[CLK_NAND0_0]		= &amp;nand0_0_clk.common.hw,</div><div class='add'>+		[CLK_NAND0_1]		= &amp;nand0_1_clk.common.hw,</div><div class='add'>+		[CLK_NAND1_0]		= &amp;nand1_0_clk.common.hw,</div><div class='add'>+		[CLK_NAND1_1]		= &amp;nand1_1_clk.common.hw,</div><div class='add'>+		[CLK_MMC0]		= &amp;mmc0_clk.common.hw,</div><div class='add'>+		[CLK_MMC0_SAMPLE]	= &amp;mmc0_sample_clk.common.hw,</div><div class='add'>+		[CLK_MMC0_OUTPUT]	= &amp;mmc0_output_clk.common.hw,</div><div class='add'>+		[CLK_MMC1]		= &amp;mmc1_clk.common.hw,</div><div class='add'>+		[CLK_MMC1_SAMPLE]	= &amp;mmc1_sample_clk.common.hw,</div><div class='add'>+		[CLK_MMC1_OUTPUT]	= &amp;mmc1_output_clk.common.hw,</div><div class='add'>+		[CLK_MMC2]		= &amp;mmc2_clk.common.hw,</div><div class='add'>+		[CLK_MMC2_SAMPLE]	= &amp;mmc2_sample_clk.common.hw,</div><div class='add'>+		[CLK_MMC2_OUTPUT]	= &amp;mmc2_output_clk.common.hw,</div><div class='add'>+		[CLK_MMC3]		= &amp;mmc3_clk.common.hw,</div><div class='add'>+		[CLK_MMC3_SAMPLE]	= &amp;mmc3_sample_clk.common.hw,</div><div class='add'>+		[CLK_MMC3_OUTPUT]	= &amp;mmc3_output_clk.common.hw,</div><div class='add'>+		[CLK_TS]		= &amp;ts_clk.common.hw,</div><div class='add'>+		[CLK_SS]		= &amp;ss_clk.common.hw,</div><div class='add'>+		[CLK_SPI0]		= &amp;spi0_clk.common.hw,</div><div class='add'>+		[CLK_SPI1]		= &amp;spi1_clk.common.hw,</div><div class='add'>+		[CLK_SPI2]		= &amp;spi2_clk.common.hw,</div><div class='add'>+		[CLK_SPI3]		= &amp;spi3_clk.common.hw,</div><div class='add'>+		[CLK_I2S0]		= &amp;i2s0_clk.common.hw,</div><div class='add'>+		[CLK_I2S1]		= &amp;i2s1_clk.common.hw,</div><div class='add'>+		[CLK_SPDIF]		= &amp;spdif_clk.common.hw,</div><div class='add'>+		[CLK_SDRAM]		= &amp;sdram_clk.common.hw,</div><div class='add'>+		[CLK_DE]		= &amp;de_clk.common.hw,</div><div class='add'>+		[CLK_EDP]		= &amp;edp_clk.common.hw,</div><div class='add'>+		[CLK_MP]		= &amp;mp_clk.common.hw,</div><div class='add'>+		[CLK_LCD0]		= &amp;lcd0_clk.common.hw,</div><div class='add'>+		[CLK_LCD1]		= &amp;lcd1_clk.common.hw,</div><div class='add'>+		[CLK_MIPI_DSI0]		= &amp;mipi_dsi0_clk.common.hw,</div><div class='add'>+		[CLK_MIPI_DSI1]		= &amp;mipi_dsi1_clk.common.hw,</div><div class='add'>+		[CLK_HDMI]		= &amp;hdmi_clk.common.hw,</div><div class='add'>+		[CLK_HDMI_SLOW]		= &amp;hdmi_slow_clk.common.hw,</div><div class='add'>+		[CLK_MIPI_CSI]		= &amp;mipi_csi_clk.common.hw,</div><div class='add'>+		[CLK_CSI_ISP]		= &amp;csi_isp_clk.common.hw,</div><div class='add'>+		[CLK_CSI_MISC]		= &amp;csi_misc_clk.common.hw,</div><div class='add'>+		[CLK_CSI0_MCLK]		= &amp;csi0_mclk_clk.common.hw,</div><div class='add'>+		[CLK_CSI1_MCLK]		= &amp;csi1_mclk_clk.common.hw,</div><div class='add'>+		[CLK_FD]		= &amp;fd_clk.common.hw,</div><div class='add'>+		[CLK_VE]		= &amp;ve_clk.common.hw,</div><div class='add'>+		[CLK_AVS]		= &amp;avs_clk.common.hw,</div><div class='add'>+		[CLK_GPU_CORE]		= &amp;gpu_core_clk.common.hw,</div><div class='add'>+		[CLK_GPU_MEMORY]	= &amp;gpu_memory_clk.common.hw,</div><div class='add'>+		[CLK_GPU_AXI]		= &amp;gpu_axi_clk.common.hw,</div><div class='add'>+		[CLK_SATA]		= &amp;sata_clk.common.hw,</div><div class='add'>+		[CLK_AC97]		= &amp;ac97_clk.common.hw,</div><div class='add'>+		[CLK_MIPI_HSI]		= &amp;mipi_hsi_clk.common.hw,</div><div class='add'>+		[CLK_GPADC]		= &amp;gpadc_clk.common.hw,</div><div class='add'>+		[CLK_CIR_TX]		= &amp;cir_tx_clk.common.hw,</div><div class='add'>+</div><div class='add'>+		[CLK_BUS_FD]		= &amp;bus_fd_clk.common.hw,</div><div class='add'>+		[CLK_BUS_VE]		= &amp;bus_ve_clk.common.hw,</div><div class='add'>+		[CLK_BUS_GPU_CTRL]	= &amp;bus_gpu_ctrl_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SS]		= &amp;bus_ss_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MMC]		= &amp;bus_mmc_clk.common.hw,</div><div class='add'>+		[CLK_BUS_NAND0]		= &amp;bus_nand0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_NAND1]		= &amp;bus_nand1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SDRAM]		= &amp;bus_sdram_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MIPI_HSI]	= &amp;bus_mipi_hsi_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SATA]		= &amp;bus_sata_clk.common.hw,</div><div class='add'>+		[CLK_BUS_TS]		= &amp;bus_ts_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SPI0]		= &amp;bus_spi0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SPI1]		= &amp;bus_spi1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SPI2]		= &amp;bus_spi2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SPI3]		= &amp;bus_spi3_clk.common.hw,</div><div class='add'>+</div><div class='add'>+		[CLK_BUS_OTG]		= &amp;bus_otg_clk.common.hw,</div><div class='add'>+		[CLK_BUS_USB]		= &amp;bus_usb_clk.common.hw,</div><div class='add'>+		[CLK_BUS_GMAC]		= &amp;bus_gmac_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MSGBOX]	= &amp;bus_msgbox_clk.common.hw,</div><div class='add'>+		[CLK_BUS_SPINLOCK]	= &amp;bus_spinlock_clk.common.hw,</div><div class='add'>+		[CLK_BUS_HSTIMER]	= &amp;bus_hstimer_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DMA]		= &amp;bus_dma_clk.common.hw,</div><div class='add'>+</div><div class='add'>+		[CLK_BUS_LCD0]		= &amp;bus_lcd0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_LCD1]		= &amp;bus_lcd1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_EDP]		= &amp;bus_edp_clk.common.hw,</div><div class='add'>+		[CLK_BUS_CSI]		= &amp;bus_csi_clk.common.hw,</div><div class='add'>+		[CLK_BUS_HDMI]		= &amp;bus_hdmi_clk.common.hw,</div><div class='add'>+		[CLK_BUS_DE]		= &amp;bus_de_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MP]		= &amp;bus_mp_clk.common.hw,</div><div class='add'>+		[CLK_BUS_MIPI_DSI]	= &amp;bus_mipi_dsi_clk.common.hw,</div><div class='add'>+</div><div class='add'>+		[CLK_BUS_SPDIF]		= &amp;bus_spdif_clk.common.hw,</div><div class='add'>+		[CLK_BUS_PIO]		= &amp;bus_pio_clk.common.hw,</div><div class='add'>+		[CLK_BUS_AC97]		= &amp;bus_ac97_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2S0]		= &amp;bus_i2s0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2S1]		= &amp;bus_i2s1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_LRADC]		= &amp;bus_lradc_clk.common.hw,</div><div class='add'>+		[CLK_BUS_GPADC]		= &amp;bus_gpadc_clk.common.hw,</div><div class='add'>+		[CLK_BUS_TWD]		= &amp;bus_twd_clk.common.hw,</div><div class='add'>+		[CLK_BUS_CIR_TX]	= &amp;bus_cir_tx_clk.common.hw,</div><div class='add'>+</div><div class='add'>+		[CLK_BUS_I2C0]		= &amp;bus_i2c0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2C1]		= &amp;bus_i2c1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2C2]		= &amp;bus_i2c2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2C3]		= &amp;bus_i2c3_clk.common.hw,</div><div class='add'>+		[CLK_BUS_I2C4]		= &amp;bus_i2c4_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART0]		= &amp;bus_uart0_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART1]		= &amp;bus_uart1_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART2]		= &amp;bus_uart2_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART3]		= &amp;bus_uart3_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART4]		= &amp;bus_uart4_clk.common.hw,</div><div class='add'>+		[CLK_BUS_UART5]		= &amp;bus_uart5_clk.common.hw,</div><div class='add'>+	},</div><div class='add'>+	.num	= CLK_NUMBER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ccu_reset_map sun9i_a80_ccu_resets[] = {</div><div class='add'>+	/* AHB0 reset controls */</div><div class='add'>+	[RST_BUS_FD]		= { 0x5a0, BIT(0) },</div><div class='add'>+	[RST_BUS_VE]		= { 0x5a0, BIT(1) },</div><div class='add'>+	[RST_BUS_GPU_CTRL]	= { 0x5a0, BIT(3) },</div><div class='add'>+	[RST_BUS_SS]		= { 0x5a0, BIT(5) },</div><div class='add'>+	[RST_BUS_MMC]		= { 0x5a0, BIT(8) },</div><div class='add'>+	[RST_BUS_NAND0]		= { 0x5a0, BIT(12) },</div><div class='add'>+	[RST_BUS_NAND1]		= { 0x5a0, BIT(13) },</div><div class='add'>+	[RST_BUS_SDRAM]		= { 0x5a0, BIT(14) },</div><div class='add'>+	[RST_BUS_SATA]		= { 0x5a0, BIT(16) },</div><div class='add'>+	[RST_BUS_TS]		= { 0x5a0, BIT(18) },</div><div class='add'>+	[RST_BUS_SPI0]		= { 0x5a0, BIT(20) },</div><div class='add'>+	[RST_BUS_SPI1]		= { 0x5a0, BIT(21) },</div><div class='add'>+	[RST_BUS_SPI2]		= { 0x5a0, BIT(22) },</div><div class='add'>+	[RST_BUS_SPI3]		= { 0x5a0, BIT(23) },</div><div class='add'>+</div><div class='add'>+	/* AHB1 reset controls */</div><div class='add'>+	[RST_BUS_OTG]		= { 0x5a4, BIT(0) },</div><div class='add'>+	[RST_BUS_OTG_PHY]	= { 0x5a4, BIT(1) },</div><div class='add'>+	[RST_BUS_MIPI_HSI]	= { 0x5a4, BIT(9) },</div><div class='add'>+	[RST_BUS_GMAC]		= { 0x5a4, BIT(17) },</div><div class='add'>+	[RST_BUS_MSGBOX]	= { 0x5a4, BIT(21) },</div><div class='add'>+	[RST_BUS_SPINLOCK]	= { 0x5a4, BIT(22) },</div><div class='add'>+	[RST_BUS_HSTIMER]	= { 0x5a4, BIT(23) },</div><div class='add'>+	[RST_BUS_DMA]		= { 0x5a4, BIT(24) },</div><div class='add'>+</div><div class='add'>+	/* AHB2 reset controls */</div><div class='add'>+	[RST_BUS_LCD0]		= { 0x5a8, BIT(0) },</div><div class='add'>+	[RST_BUS_LCD1]		= { 0x5a8, BIT(1) },</div><div class='add'>+	[RST_BUS_EDP]		= { 0x5a8, BIT(2) },</div><div class='add'>+	[RST_BUS_LVDS]		= { 0x5a8, BIT(3) },</div><div class='add'>+	[RST_BUS_CSI]		= { 0x5a8, BIT(4) },</div><div class='add'>+	[RST_BUS_HDMI0]		= { 0x5a8, BIT(5) },</div><div class='add'>+	[RST_BUS_HDMI1]		= { 0x5a8, BIT(6) },</div><div class='add'>+	[RST_BUS_DE]		= { 0x5a8, BIT(7) },</div><div class='add'>+	[RST_BUS_MP]		= { 0x5a8, BIT(8) },</div><div class='add'>+	[RST_BUS_GPU]		= { 0x5a8, BIT(9) },</div><div class='add'>+	[RST_BUS_MIPI_DSI]	= { 0x5a8, BIT(11) },</div><div class='add'>+</div><div class='add'>+	/* APB0 reset controls */</div><div class='add'>+	[RST_BUS_SPDIF]		= { 0x5b0, BIT(1) },</div><div class='add'>+	[RST_BUS_AC97]		= { 0x5b0, BIT(11) },</div><div class='add'>+	[RST_BUS_I2S0]		= { 0x5b0, BIT(12) },</div><div class='add'>+	[RST_BUS_I2S1]		= { 0x5b0, BIT(13) },</div><div class='add'>+	[RST_BUS_LRADC]		= { 0x5b0, BIT(15) },</div><div class='add'>+	[RST_BUS_GPADC]		= { 0x5b0, BIT(17) },</div><div class='add'>+	[RST_BUS_CIR_TX]	= { 0x5b0, BIT(19) },</div><div class='add'>+</div><div class='add'>+	/* APB1 reset controls */</div><div class='add'>+	[RST_BUS_I2C0]		= { 0x5b4, BIT(0) },</div><div class='add'>+	[RST_BUS_I2C1]		= { 0x5b4, BIT(1) },</div><div class='add'>+	[RST_BUS_I2C2]		= { 0x5b4, BIT(2) },</div><div class='add'>+	[RST_BUS_I2C3]		= { 0x5b4, BIT(3) },</div><div class='add'>+	[RST_BUS_I2C4]		= { 0x5b4, BIT(4) },</div><div class='add'>+	[RST_BUS_UART0]		= { 0x5b4, BIT(16) },</div><div class='add'>+	[RST_BUS_UART1]		= { 0x5b4, BIT(17) },</div><div class='add'>+	[RST_BUS_UART2]		= { 0x5b4, BIT(18) },</div><div class='add'>+	[RST_BUS_UART3]		= { 0x5b4, BIT(19) },</div><div class='add'>+	[RST_BUS_UART4]		= { 0x5b4, BIT(20) },</div><div class='add'>+	[RST_BUS_UART5]		= { 0x5b4, BIT(21) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sunxi_ccu_desc sun9i_a80_ccu_desc = {</div><div class='add'>+	.ccu_clks	= sun9i_a80_ccu_clks,</div><div class='add'>+	.num_ccu_clks	= ARRAY_SIZE(sun9i_a80_ccu_clks),</div><div class='add'>+</div><div class='add'>+	.hw_clks	= &amp;sun9i_a80_hw_clks,</div><div class='add'>+</div><div class='add'>+	.resets		= sun9i_a80_ccu_resets,</div><div class='add'>+	.num_resets	= ARRAY_SIZE(sun9i_a80_ccu_resets),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sun9i_a80_ccu_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct resource *res;</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	reg = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(reg))</div><div class='add'>+		return PTR_ERR(reg);</div><div class='add'>+</div><div class='add'>+	/* Enforce d1 = 0, d2 = 0 for Audio PLL */</div><div class='add'>+	val = readl(reg + SUN9I_A80_PLL_AUDIO_REG);</div><div class='add'>+	val &amp;= (BIT(16) &amp; BIT(18));</div><div class='add'>+	writel(val, reg + SUN9I_A80_PLL_AUDIO_REG);</div><div class='add'>+</div><div class='add'>+	return sunxi_ccu_probe(pdev-&gt;dev.of_node, reg, &amp;sun9i_a80_ccu_desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id sun9i_a80_ccu_ids[] = {</div><div class='add'>+	{ .compatible = "allwinner,sun9i-a80-ccu" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver sun9i_a80_ccu_driver = {</div><div class='add'>+	.probe	= sun9i_a80_ccu_probe,</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name	= "sun9i-a80-ccu",</div><div class='add'>+		.of_match_table	= sun9i_a80_ccu_ids,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+builtin_platform_driver(sun9i_a80_ccu_driver);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu-sun9i-a80.h b/drivers/clk/sunxi-ng/ccu-sun9i-a80.h<br/>new file mode 100644<br/>index 000000000000..315662341c70<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu-sun9i-a80.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu-sun9i-a80.h</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Chen-Yu Tsai</div><div class='add'>+ *</div><div class='add'>+ * Chen-Yu Tsai &lt;wens@csie.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CCU_SUN9I_A80_H_</div><div class='add'>+#define _CCU_SUN9I_A80_H_</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/sun9i-a80-ccu.h&gt;</div><div class='add'>+#include &lt;dt-bindings/reset/sun9i-a80-ccu.h&gt;</div><div class='add'>+</div><div class='add'>+#define CLK_PLL_C0CPUX		0</div><div class='add'>+#define CLK_PLL_C1CPUX		1</div><div class='add'>+</div><div class='add'>+/* pll-audio and pll-periph0 are exported to the PRCM block */</div><div class='add'>+</div><div class='add'>+#define CLK_PLL_VE		4</div><div class='add'>+#define CLK_PLL_DDR		5</div><div class='add'>+#define CLK_PLL_VIDEO0		6</div><div class='add'>+#define CLK_PLL_VIDEO1		7</div><div class='add'>+#define CLK_PLL_GPU		8</div><div class='add'>+#define CLK_PLL_DE		9</div><div class='add'>+#define CLK_PLL_ISP		10</div><div class='add'>+#define CLK_PLL_PERIPH1		11</div><div class='add'>+</div><div class='add'>+/* The CPUX clocks are exported */</div><div class='add'>+</div><div class='add'>+#define CLK_ATB0		14</div><div class='add'>+#define CLK_AXI0		15</div><div class='add'>+#define CLK_ATB1		16</div><div class='add'>+#define CLK_AXI1		17</div><div class='add'>+#define CLK_GTBUS		18</div><div class='add'>+#define CLK_AHB0		19</div><div class='add'>+#define CLK_AHB1		20</div><div class='add'>+#define CLK_AHB2		21</div><div class='add'>+#define CLK_APB0		22</div><div class='add'>+#define CLK_APB1		23</div><div class='add'>+#define CLK_CCI400		24</div><div class='add'>+#define CLK_ATS			25</div><div class='add'>+#define CLK_TRACE		26</div><div class='add'>+</div><div class='add'>+/* module clocks and bus gates exported */</div><div class='add'>+</div><div class='add'>+#define CLK_NUMBER		(CLK_BUS_UART5 + 1)</div><div class='add'>+</div><div class='add'>+#endif /* _CCU_SUN9I_A80_H_ */</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_common.c b/drivers/clk/sunxi-ng/ccu_common.c<br/>index 51d4bac97ab3..8a47bafd7890 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_common.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_common.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_common.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_common.c</a></div><div class='hunk'>@@ -25,13 +25,18 @@ static DEFINE_SPINLOCK(ccu_lock);</div><div class='ctx'> </div><div class='ctx'> void ccu_helper_wait_for_lock(struct ccu_common *common, u32 lock)</div><div class='ctx'> {</div><div class='add'>+	void __iomem *addr;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	if (!lock)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(readl_relaxed_poll_timeout(common-&gt;base + common-&gt;reg, reg,</div><div class='del'>-					   reg &amp; lock, 100, 70000));</div><div class='add'>+	if (common-&gt;features &amp; CCU_FEATURE_LOCK_REG)</div><div class='add'>+		addr = common-&gt;base + common-&gt;lock_reg;</div><div class='add'>+	else</div><div class='add'>+		addr = common-&gt;base + common-&gt;reg;</div><div class='add'>+</div><div class='add'>+	WARN_ON(readl_relaxed_poll_timeout(addr, reg, reg &amp; lock, 100, 70000));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int sunxi_ccu_probe(struct device_node *node, void __iomem *reg,</div><div class='hunk'>@@ -70,6 +75,11 @@ int sunxi_ccu_probe(struct device_node *node, void __iomem *reg,</div><div class='ctx'> 		goto err_clk_unreg;</div><div class='ctx'> </div><div class='ctx'> 	reset = kzalloc(sizeof(*reset), GFP_KERNEL);</div><div class='add'>+	if (!reset) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_alloc_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	reset-&gt;rcdev.of_node = node;</div><div class='ctx'> 	reset-&gt;rcdev.ops = &amp;ccu_reset_ops;</div><div class='ctx'> 	reset-&gt;rcdev.owner = THIS_MODULE;</div><div class='hunk'>@@ -85,6 +95,16 @@ int sunxi_ccu_probe(struct device_node *node, void __iomem *reg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_of_clk_unreg:</div><div class='add'>+	kfree(reset);</div><div class='add'>+err_alloc_reset:</div><div class='add'>+	of_clk_del_provider(node);</div><div class='ctx'> err_clk_unreg:</div><div class='add'>+	while (--i &gt;= 0) {</div><div class='add'>+		struct clk_hw *hw = desc-&gt;hw_clks-&gt;hws[i];</div><div class='add'>+</div><div class='add'>+		if (!hw)</div><div class='add'>+			continue;</div><div class='add'>+		clk_hw_unregister(hw);</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_common.h b/drivers/clk/sunxi-ng/ccu_common.h<br/>index b3d9abfbd721..73d81dc58fc5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_common.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_common.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_common.h</a></div><div class='hunk'>@@ -21,6 +21,8 @@</div><div class='ctx'> #define CCU_FEATURE_VARIABLE_PREDIV	BIT(1)</div><div class='ctx'> #define CCU_FEATURE_FIXED_PREDIV	BIT(2)</div><div class='ctx'> #define CCU_FEATURE_FIXED_POSTDIV	BIT(3)</div><div class='add'>+#define CCU_FEATURE_ALL_PREDIV		BIT(4)</div><div class='add'>+#define CCU_FEATURE_LOCK_REG		BIT(5)</div><div class='ctx'> </div><div class='ctx'> struct device_node;</div><div class='ctx'> </div><div class='hunk'>@@ -56,6 +58,8 @@ struct device_node;</div><div class='ctx'> struct ccu_common {</div><div class='ctx'> 	void __iomem	*base;</div><div class='ctx'> 	u16		reg;</div><div class='add'>+	u16		lock_reg;</div><div class='add'>+	u32		prediv;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long	features;</div><div class='ctx'> 	spinlock_t	*lock;</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_div.c b/drivers/clk/sunxi-ng/ccu_div.c<br/>index 8659b4cb6c20..4057e6021aa9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_div.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_div.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_div.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_div.c</a></div><div class='hunk'>@@ -77,6 +77,18 @@ static int ccu_div_determine_rate(struct clk_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct ccu_div *cd = hw_to_ccu_div(hw);</div><div class='ctx'> </div><div class='add'>+	if (clk_hw_get_num_parents(hw) == 1) {</div><div class='add'>+		req-&gt;rate = divider_round_rate(hw, req-&gt;rate,</div><div class='add'>+					       &amp;req-&gt;best_parent_rate,</div><div class='add'>+					       cd-&gt;div.table,</div><div class='add'>+					       cd-&gt;div.width,</div><div class='add'>+					       cd-&gt;div.flags);</div><div class='add'>+</div><div class='add'>+		req-&gt;best_parent_hw = clk_hw_get_parent(hw);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return ccu_mux_helper_determine_rate(&amp;cd-&gt;common, &amp;cd-&gt;mux,</div><div class='ctx'> 					     req, ccu_div_round_rate, cd);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_div.h b/drivers/clk/sunxi-ng/ccu_div.h<br/>index 34c338832c0d..08d074451204 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_div.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_div.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_div.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_div.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include "ccu_mux.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct _ccu_div - Internal divider description</div><div class='add'>+ * struct ccu_div_internal - Internal divider description</div><div class='ctx'>  * @shift: Bit offset of the divider in its register</div><div class='ctx'>  * @width: Width of the divider field in its register</div><div class='ctx'>  * @max: Maximum value allowed for that divider. This is the</div><div class='hunk'>@@ -36,11 +36,12 @@</div><div class='ctx'>  * It is basically a wrapper around the clk_divider functions</div><div class='ctx'>  * arguments.</div><div class='ctx'>  */</div><div class='del'>-struct _ccu_div {</div><div class='add'>+struct ccu_div_internal {</div><div class='ctx'> 	u8			shift;</div><div class='ctx'> 	u8			width;</div><div class='ctx'> </div><div class='ctx'> 	u32			max;</div><div class='add'>+	u32			offset;</div><div class='ctx'> </div><div class='ctx'> 	u32			flags;</div><div class='ctx'> </div><div class='hunk'>@@ -58,27 +59,34 @@ struct _ccu_div {</div><div class='ctx'> #define _SUNXI_CCU_DIV_TABLE(_shift, _width, _table)			\</div><div class='ctx'> 	_SUNXI_CCU_DIV_TABLE_FLAGS(_shift, _width, _table, 0)</div><div class='ctx'> </div><div class='del'>-#define _SUNXI_CCU_DIV_MAX_FLAGS(_shift, _width, _max, _flags) \</div><div class='add'>+#define _SUNXI_CCU_DIV_OFFSET_MAX_FLAGS(_shift, _width, _off, _max, _flags) \</div><div class='ctx'> 	{								\</div><div class='ctx'> 		.shift	= _shift,					\</div><div class='ctx'> 		.width	= _width,					\</div><div class='ctx'> 		.flags	= _flags,					\</div><div class='ctx'> 		.max	= _max,						\</div><div class='add'>+		.offset	= _off,						\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define _SUNXI_CCU_DIV_MAX_FLAGS(_shift, _width, _max, _flags)		\</div><div class='add'>+	_SUNXI_CCU_DIV_OFFSET_MAX_FLAGS(_shift, _width, 1, _max, _flags)</div><div class='add'>+</div><div class='ctx'> #define _SUNXI_CCU_DIV_FLAGS(_shift, _width, _flags)			\</div><div class='ctx'> 	_SUNXI_CCU_DIV_MAX_FLAGS(_shift, _width, 0, _flags)</div><div class='ctx'> </div><div class='ctx'> #define _SUNXI_CCU_DIV_MAX(_shift, _width, _max)			\</div><div class='ctx'> 	_SUNXI_CCU_DIV_MAX_FLAGS(_shift, _width, _max, 0)</div><div class='ctx'> </div><div class='add'>+#define _SUNXI_CCU_DIV_OFFSET(_shift, _width, _offset)			\</div><div class='add'>+	_SUNXI_CCU_DIV_OFFSET_MAX_FLAGS(_shift, _width, _offset, 0, 0)</div><div class='add'>+</div><div class='ctx'> #define _SUNXI_CCU_DIV(_shift, _width)					\</div><div class='ctx'> 	_SUNXI_CCU_DIV_FLAGS(_shift, _width, 0)</div><div class='ctx'> </div><div class='ctx'> struct ccu_div {</div><div class='ctx'> 	u32			enable;</div><div class='ctx'> </div><div class='del'>-	struct _ccu_div		div;</div><div class='add'>+	struct ccu_div_internal		div;</div><div class='ctx'> 	struct ccu_mux_internal	mux;</div><div class='ctx'> 	struct ccu_common	common;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_frac.c b/drivers/clk/sunxi-ng/ccu_frac.c<br/>index 5c4b10cd15b5..8b5eb7756bf7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_frac.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_frac.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_frac.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_frac.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include "ccu_frac.h"</div><div class='ctx'> </div><div class='ctx'> bool ccu_frac_helper_is_enabled(struct ccu_common *common,</div><div class='del'>-				struct _ccu_frac *cf)</div><div class='add'>+				struct ccu_frac_internal *cf)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(common-&gt;features &amp; CCU_FEATURE_FRACTIONAL))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -23,7 +23,7 @@ bool ccu_frac_helper_is_enabled(struct ccu_common *common,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ccu_frac_helper_enable(struct ccu_common *common,</div><div class='del'>-			    struct _ccu_frac *cf)</div><div class='add'>+			    struct ccu_frac_internal *cf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='hunk'>@@ -38,7 +38,7 @@ void ccu_frac_helper_enable(struct ccu_common *common,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ccu_frac_helper_disable(struct ccu_common *common,</div><div class='del'>-			     struct _ccu_frac *cf)</div><div class='add'>+			     struct ccu_frac_internal *cf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='hunk'>@@ -53,7 +53,7 @@ void ccu_frac_helper_disable(struct ccu_common *common,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool ccu_frac_helper_has_rate(struct ccu_common *common,</div><div class='del'>-			      struct _ccu_frac *cf,</div><div class='add'>+			      struct ccu_frac_internal *cf,</div><div class='ctx'> 			      unsigned long rate)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(common-&gt;features &amp; CCU_FEATURE_FRACTIONAL))</div><div class='hunk'>@@ -63,7 +63,7 @@ bool ccu_frac_helper_has_rate(struct ccu_common *common,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,</div><div class='del'>-					struct _ccu_frac *cf)</div><div class='add'>+					struct ccu_frac_internal *cf)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +84,7 @@ unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ccu_frac_helper_set_rate(struct ccu_common *common,</div><div class='del'>-			     struct _ccu_frac *cf,</div><div class='add'>+			     struct ccu_frac_internal *cf,</div><div class='ctx'> 			     unsigned long rate)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_frac.h b/drivers/clk/sunxi-ng/ccu_frac.h<br/>index e4c670b1cdfe..7b1ee380156f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_frac.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_frac.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_frac.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_frac.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "ccu_common.h"</div><div class='ctx'> </div><div class='del'>-struct _ccu_frac {</div><div class='add'>+struct ccu_frac_internal {</div><div class='ctx'> 	u32		enable;</div><div class='ctx'> 	u32		select;</div><div class='ctx'> </div><div class='hunk'>@@ -33,21 +33,21 @@ struct _ccu_frac {</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> bool ccu_frac_helper_is_enabled(struct ccu_common *common,</div><div class='del'>-				struct _ccu_frac *cf);</div><div class='add'>+				struct ccu_frac_internal *cf);</div><div class='ctx'> void ccu_frac_helper_enable(struct ccu_common *common,</div><div class='del'>-			    struct _ccu_frac *cf);</div><div class='add'>+			    struct ccu_frac_internal *cf);</div><div class='ctx'> void ccu_frac_helper_disable(struct ccu_common *common,</div><div class='del'>-			     struct _ccu_frac *cf);</div><div class='add'>+			     struct ccu_frac_internal *cf);</div><div class='ctx'> </div><div class='ctx'> bool ccu_frac_helper_has_rate(struct ccu_common *common,</div><div class='del'>-			      struct _ccu_frac *cf,</div><div class='add'>+			      struct ccu_frac_internal *cf,</div><div class='ctx'> 			      unsigned long rate);</div><div class='ctx'> </div><div class='ctx'> unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,</div><div class='del'>-					struct _ccu_frac *cf);</div><div class='add'>+					struct ccu_frac_internal *cf);</div><div class='ctx'> </div><div class='ctx'> int ccu_frac_helper_set_rate(struct ccu_common *common,</div><div class='del'>-			     struct _ccu_frac *cf,</div><div class='add'>+			     struct ccu_frac_internal *cf,</div><div class='ctx'> 			     unsigned long rate);</div><div class='ctx'> </div><div class='ctx'> #endif /* _CCU_FRAC_H_ */</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_mp.c b/drivers/clk/sunxi-ng/ccu_mp.c<br/>index ebb1b31568a5..22c2ca7a2a22 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_mp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_mp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_mp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_mp.c</a></div><div class='hunk'>@@ -89,11 +89,14 @@ static unsigned long ccu_mp_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	m = reg &gt;&gt; cmp-&gt;m.shift;</div><div class='ctx'> 	m &amp;= (1 &lt;&lt; cmp-&gt;m.width) - 1;</div><div class='add'>+	m += cmp-&gt;m.offset;</div><div class='add'>+	if (!m)</div><div class='add'>+		m++;</div><div class='ctx'> </div><div class='ctx'> 	p = reg &gt;&gt; cmp-&gt;p.shift;</div><div class='ctx'> 	p &amp;= (1 &lt;&lt; cmp-&gt;p.width) - 1;</div><div class='ctx'> </div><div class='del'>-	return (parent_rate &gt;&gt; p) / (m + 1);</div><div class='add'>+	return (parent_rate &gt;&gt; p) / m;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ccu_mp_determine_rate(struct clk_hw *hw,</div><div class='hunk'>@@ -124,9 +127,10 @@ static int ccu_mp_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	reg = readl(cmp-&gt;common.base + cmp-&gt;common.reg);</div><div class='ctx'> 	reg &amp;= ~GENMASK(cmp-&gt;m.width + cmp-&gt;m.shift - 1, cmp-&gt;m.shift);</div><div class='ctx'> 	reg &amp;= ~GENMASK(cmp-&gt;p.width + cmp-&gt;p.shift - 1, cmp-&gt;p.shift);</div><div class='add'>+	reg |= (m - cmp-&gt;m.offset) &lt;&lt; cmp-&gt;m.shift;</div><div class='add'>+	reg |= ilog2(p) &lt;&lt; cmp-&gt;p.shift;</div><div class='ctx'> </div><div class='del'>-	writel(reg | (ilog2(p) &lt;&lt; cmp-&gt;p.shift) | ((m - 1) &lt;&lt; cmp-&gt;m.shift),</div><div class='del'>-	       cmp-&gt;common.base + cmp-&gt;common.reg);</div><div class='add'>+	writel(reg, cmp-&gt;common.base + cmp-&gt;common.reg);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(cmp-&gt;common.lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_mp.h b/drivers/clk/sunxi-ng/ccu_mp.h<br/>index edf9215ea8cc..915625e97d98 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_mp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_mp.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_mp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_mp.h</a></div><div class='hunk'>@@ -29,8 +29,8 @@</div><div class='ctx'> struct ccu_mp {</div><div class='ctx'> 	u32			enable;</div><div class='ctx'> </div><div class='del'>-	struct _ccu_div		m;</div><div class='del'>-	struct _ccu_div		p;</div><div class='add'>+	struct ccu_div_internal		m;</div><div class='add'>+	struct ccu_div_internal		p;</div><div class='ctx'> 	struct ccu_mux_internal	mux;</div><div class='ctx'> 	struct ccu_common	common;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_mult.c b/drivers/clk/sunxi-ng/ccu_mult.c<br/>index 010e9424691d..8724c01171b1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_mult.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_mult.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_mult.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_mult.c</a></div><div class='hunk'>@@ -13,10 +13,23 @@</div><div class='ctx'> #include "ccu_gate.h"</div><div class='ctx'> #include "ccu_mult.h"</div><div class='ctx'> </div><div class='add'>+struct _ccu_mult {</div><div class='add'>+	unsigned long	mult, min, max;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void ccu_mult_find_best(unsigned long parent, unsigned long rate,</div><div class='del'>-			       unsigned int max_n, unsigned int *n)</div><div class='add'>+			       struct _ccu_mult *mult)</div><div class='ctx'> {</div><div class='del'>-	*n = rate / parent;</div><div class='add'>+	int _mult;</div><div class='add'>+</div><div class='add'>+	_mult = rate / parent;</div><div class='add'>+	if (_mult &lt; mult-&gt;min)</div><div class='add'>+		_mult = mult-&gt;min;</div><div class='add'>+</div><div class='add'>+	if (_mult &gt; mult-&gt;max)</div><div class='add'>+		_mult = mult-&gt;max;</div><div class='add'>+</div><div class='add'>+	mult-&gt;mult = _mult;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long ccu_mult_round_rate(struct ccu_mux_internal *mux,</div><div class='hunk'>@@ -25,11 +38,18 @@ static unsigned long ccu_mult_round_rate(struct ccu_mux_internal *mux,</div><div class='ctx'> 					void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccu_mult *cm = data;</div><div class='del'>-	unsigned int n;</div><div class='add'>+	struct _ccu_mult _cm;</div><div class='add'>+</div><div class='add'>+	_cm.min = cm-&gt;mult.min;</div><div class='ctx'> </div><div class='del'>-	ccu_mult_find_best(parent_rate, rate, 1 &lt;&lt; cm-&gt;mult.width, &amp;n);</div><div class='add'>+	if (cm-&gt;mult.max)</div><div class='add'>+		_cm.max = cm-&gt;mult.max;</div><div class='add'>+	else</div><div class='add'>+		_cm.max = (1 &lt;&lt; cm-&gt;mult.width) + cm-&gt;mult.offset - 1;</div><div class='ctx'> </div><div class='del'>-	return parent_rate * n;</div><div class='add'>+	ccu_mult_find_best(parent_rate, rate, &amp;_cm);</div><div class='add'>+</div><div class='add'>+	return parent_rate * _cm.mult;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ccu_mult_disable(struct clk_hw *hw)</div><div class='hunk'>@@ -60,6 +80,9 @@ static unsigned long ccu_mult_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='add'>+	if (ccu_frac_helper_is_enabled(&amp;cm-&gt;common, &amp;cm-&gt;frac))</div><div class='add'>+		return ccu_frac_helper_read_rate(&amp;cm-&gt;common, &amp;cm-&gt;frac);</div><div class='add'>+</div><div class='ctx'> 	reg = readl(cm-&gt;common.base + cm-&gt;common.reg);</div><div class='ctx'> 	val = reg &gt;&gt; cm-&gt;mult.shift;</div><div class='ctx'> 	val &amp;= (1 &lt;&lt; cm-&gt;mult.width) - 1;</div><div class='hunk'>@@ -67,7 +90,7 @@ static unsigned long ccu_mult_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> 	ccu_mux_helper_adjust_parent_for_prediv(&amp;cm-&gt;common, &amp;cm-&gt;mux, -1,</div><div class='ctx'> 						&amp;parent_rate);</div><div class='ctx'> </div><div class='del'>-	return parent_rate * (val + 1);</div><div class='add'>+	return parent_rate * (val + cm-&gt;mult.offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ccu_mult_determine_rate(struct clk_hw *hw,</div><div class='hunk'>@@ -83,22 +106,34 @@ static int ccu_mult_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 			   unsigned long parent_rate)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccu_mult *cm = hw_to_ccu_mult(hw);</div><div class='add'>+	struct _ccu_mult _cm;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned int n;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='add'>+	if (ccu_frac_helper_has_rate(&amp;cm-&gt;common, &amp;cm-&gt;frac, rate))</div><div class='add'>+		return ccu_frac_helper_set_rate(&amp;cm-&gt;common, &amp;cm-&gt;frac, rate);</div><div class='add'>+	else</div><div class='add'>+		ccu_frac_helper_disable(&amp;cm-&gt;common, &amp;cm-&gt;frac);</div><div class='add'>+</div><div class='ctx'> 	ccu_mux_helper_adjust_parent_for_prediv(&amp;cm-&gt;common, &amp;cm-&gt;mux, -1,</div><div class='ctx'> 						&amp;parent_rate);</div><div class='ctx'> </div><div class='del'>-	ccu_mult_find_best(parent_rate, rate, 1 &lt;&lt; cm-&gt;mult.width, &amp;n);</div><div class='add'>+	_cm.min = cm-&gt;mult.min;</div><div class='add'>+</div><div class='add'>+	if (cm-&gt;mult.max)</div><div class='add'>+		_cm.max = cm-&gt;mult.max;</div><div class='add'>+	else</div><div class='add'>+		_cm.max = (1 &lt;&lt; cm-&gt;mult.width) + cm-&gt;mult.offset - 1;</div><div class='add'>+</div><div class='add'>+	ccu_mult_find_best(parent_rate, rate, &amp;_cm);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(cm-&gt;common.lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	reg = readl(cm-&gt;common.base + cm-&gt;common.reg);</div><div class='ctx'> 	reg &amp;= ~GENMASK(cm-&gt;mult.width + cm-&gt;mult.shift - 1, cm-&gt;mult.shift);</div><div class='add'>+	reg |= ((_cm.mult - cm-&gt;mult.offset) &lt;&lt; cm-&gt;mult.shift);</div><div class='ctx'> </div><div class='del'>-	writel(reg | ((n - 1) &lt;&lt; cm-&gt;mult.shift),</div><div class='del'>-	       cm-&gt;common.base + cm-&gt;common.reg);</div><div class='add'>+	writel(reg, cm-&gt;common.base + cm-&gt;common.reg);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(cm-&gt;common.lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_mult.h b/drivers/clk/sunxi-ng/ccu_mult.h<br/>index 5d2c8dc14073..524acddfcb2e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_mult.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_mult.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_mult.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_mult.h</a></div><div class='hunk'>@@ -2,23 +2,40 @@</div><div class='ctx'> #define _CCU_MULT_H_</div><div class='ctx'> </div><div class='ctx'> #include "ccu_common.h"</div><div class='add'>+#include "ccu_frac.h"</div><div class='ctx'> #include "ccu_mux.h"</div><div class='ctx'> </div><div class='del'>-struct _ccu_mult {</div><div class='add'>+struct ccu_mult_internal {</div><div class='add'>+	u8	offset;</div><div class='ctx'> 	u8	shift;</div><div class='ctx'> 	u8	width;</div><div class='add'>+	u8	min;</div><div class='add'>+	u8	max;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define _SUNXI_CCU_MULT(_shift, _width)		\</div><div class='del'>-	{					\</div><div class='del'>-		.shift	= _shift,		\</div><div class='del'>-		.width	= _width,		\</div><div class='add'>+#define _SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, _offset, _min, _max) \</div><div class='add'>+	{								\</div><div class='add'>+		.min	= _min,						\</div><div class='add'>+		.max	= _max,						\</div><div class='add'>+		.offset	= _offset,					\</div><div class='add'>+		.shift	= _shift,					\</div><div class='add'>+		.width	= _width,					\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define _SUNXI_CCU_MULT_MIN(_shift, _width, _min)	\</div><div class='add'>+	_SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, 1, _min, 0)</div><div class='add'>+</div><div class='add'>+#define _SUNXI_CCU_MULT_OFFSET(_shift, _width, _offset)	\</div><div class='add'>+	_SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, _offset, 1, 0)</div><div class='add'>+</div><div class='add'>+#define _SUNXI_CCU_MULT(_shift, _width)		\</div><div class='add'>+	_SUNXI_CCU_MULT_OFFSET_MIN_MAX(_shift, _width, 1, 1, 0)</div><div class='add'>+</div><div class='ctx'> struct ccu_mult {</div><div class='ctx'> 	u32			enable;</div><div class='ctx'> </div><div class='del'>-	struct _ccu_mult	mult;</div><div class='add'>+	struct ccu_frac_internal	frac;</div><div class='add'>+	struct ccu_mult_internal	mult;</div><div class='ctx'> 	struct ccu_mux_internal	mux;</div><div class='ctx'> 	struct ccu_common	common;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_mux.c b/drivers/clk/sunxi-ng/ccu_mux.c<br/>index a43ad52a957d..c6bb1f523232 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_mux.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_mux.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_mux.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_mux.c</a></div><div class='hunk'>@@ -25,9 +25,15 @@ void ccu_mux_helper_adjust_parent_for_prediv(struct ccu_common *common,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!((common-&gt;features &amp; CCU_FEATURE_FIXED_PREDIV) ||</div><div class='del'>-	      (common-&gt;features &amp; CCU_FEATURE_VARIABLE_PREDIV)))</div><div class='add'>+	      (common-&gt;features &amp; CCU_FEATURE_VARIABLE_PREDIV) ||</div><div class='add'>+	      (common-&gt;features &amp; CCU_FEATURE_ALL_PREDIV)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (common-&gt;features &amp; CCU_FEATURE_ALL_PREDIV) {</div><div class='add'>+		*parent_rate = *parent_rate / common-&gt;prediv;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	reg = readl(common-&gt;base + common-&gt;reg);</div><div class='ctx'> 	if (parent_index &lt; 0) {</div><div class='ctx'> 		parent_index = reg &gt;&gt; cm-&gt;shift;</div><div class='hunk'>@@ -64,19 +70,46 @@ int ccu_mux_helper_determine_rate(struct ccu_common *common,</div><div class='ctx'> 	struct clk_hw *best_parent, *hw = &amp;common-&gt;hw;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	if (clk_hw_get_flags(hw) &amp; CLK_SET_RATE_NO_REPARENT) {</div><div class='add'>+		unsigned long adj_parent_rate;</div><div class='add'>+</div><div class='add'>+		best_parent = clk_hw_get_parent(hw);</div><div class='add'>+		best_parent_rate = clk_hw_get_rate(best_parent);</div><div class='add'>+</div><div class='add'>+		adj_parent_rate = best_parent_rate;</div><div class='add'>+		ccu_mux_helper_adjust_parent_for_prediv(common, cm, -1,</div><div class='add'>+							&amp;adj_parent_rate);</div><div class='add'>+</div><div class='add'>+		best_rate = round(cm, adj_parent_rate, req-&gt;rate, data);</div><div class='add'>+</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; clk_hw_get_num_parents(hw); i++) {</div><div class='del'>-		unsigned long tmp_rate, parent_rate;</div><div class='add'>+		unsigned long tmp_rate, parent_rate, adj_parent_rate;</div><div class='ctx'> 		struct clk_hw *parent;</div><div class='ctx'> </div><div class='ctx'> 		parent = clk_hw_get_parent_by_index(hw, i);</div><div class='ctx'> 		if (!parent)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		parent_rate = clk_hw_get_rate(parent);</div><div class='add'>+		if (clk_hw_get_flags(hw) &amp; CLK_SET_RATE_PARENT) {</div><div class='add'>+			struct clk_rate_request parent_req = *req;</div><div class='add'>+			int ret = __clk_determine_rate(parent, &amp;parent_req);</div><div class='add'>+</div><div class='add'>+			if (ret)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			parent_rate = parent_req.rate;</div><div class='add'>+		} else {</div><div class='add'>+			parent_rate = clk_hw_get_rate(parent);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		adj_parent_rate = parent_rate;</div><div class='ctx'> 		ccu_mux_helper_adjust_parent_for_prediv(common, cm, i,</div><div class='del'>-							&amp;parent_rate);</div><div class='add'>+							&amp;adj_parent_rate);</div><div class='ctx'> </div><div class='del'>-		tmp_rate = round(cm, clk_hw_get_rate(parent), req-&gt;rate, data);</div><div class='add'>+		tmp_rate = round(cm, adj_parent_rate, req-&gt;rate, data);</div><div class='ctx'> 		if (tmp_rate == req-&gt;rate) {</div><div class='ctx'> 			best_parent = parent;</div><div class='ctx'> 			best_parent_rate = parent_rate;</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_nk.c b/drivers/clk/sunxi-ng/ccu_nk.c<br/>index d6fafb397489..b9e9b8a9d1b4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_nk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nk.c</a></div><div class='hunk'>@@ -9,21 +9,24 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='del'>-#include &lt;linux/rational.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ccu_gate.h"</div><div class='ctx'> #include "ccu_nk.h"</div><div class='ctx'> </div><div class='add'>+struct _ccu_nk {</div><div class='add'>+	unsigned long	n, min_n, max_n;</div><div class='add'>+	unsigned long	k, min_k, max_k;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void ccu_nk_find_best(unsigned long parent, unsigned long rate,</div><div class='del'>-			     unsigned int max_n, unsigned int max_k,</div><div class='del'>-			     unsigned int *n, unsigned int *k)</div><div class='add'>+			     struct _ccu_nk *nk)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long best_rate = 0;</div><div class='ctx'> 	unsigned int best_k = 0, best_n = 0;</div><div class='ctx'> 	unsigned int _k, _n;</div><div class='ctx'> </div><div class='del'>-	for (_k = 1; _k &lt;= max_k; _k++) {</div><div class='del'>-		for (_n = 1; _n &lt;= max_n; _n++) {</div><div class='add'>+	for (_k = nk-&gt;min_k; _k &lt;= nk-&gt;max_k; _k++) {</div><div class='add'>+		for (_n = nk-&gt;min_n; _n &lt;= nk-&gt;max_n; _n++) {</div><div class='ctx'> 			unsigned long tmp_rate = parent * _n * _k;</div><div class='ctx'> </div><div class='ctx'> 			if (tmp_rate &gt; rate)</div><div class='hunk'>@@ -37,8 +40,8 @@ static void ccu_nk_find_best(unsigned long parent, unsigned long rate,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*k = best_k;</div><div class='del'>-	*n = best_n;</div><div class='add'>+	nk-&gt;k = best_k;</div><div class='add'>+	nk-&gt;n = best_n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ccu_nk_disable(struct clk_hw *hw)</div><div class='hunk'>@@ -73,12 +76,17 @@ static unsigned long ccu_nk_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	n = reg &gt;&gt; nk-&gt;n.shift;</div><div class='ctx'> 	n &amp;= (1 &lt;&lt; nk-&gt;n.width) - 1;</div><div class='add'>+	n += nk-&gt;n.offset;</div><div class='add'>+	if (!n)</div><div class='add'>+		n++;</div><div class='ctx'> </div><div class='ctx'> 	k = reg &gt;&gt; nk-&gt;k.shift;</div><div class='ctx'> 	k &amp;= (1 &lt;&lt; nk-&gt;k.width) - 1;</div><div class='add'>+	k += nk-&gt;k.offset;</div><div class='add'>+	if (!k)</div><div class='add'>+		k++;</div><div class='ctx'> </div><div class='del'>-	rate = parent_rate * (n + 1) * (k + 1);</div><div class='del'>-</div><div class='add'>+	rate = parent_rate * n * k;</div><div class='ctx'> 	if (nk-&gt;common.features &amp; CCU_FEATURE_FIXED_POSTDIV)</div><div class='ctx'> 		rate /= nk-&gt;fixed_post_div;</div><div class='ctx'> </div><div class='hunk'>@@ -89,16 +97,19 @@ static long ccu_nk_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 			      unsigned long *parent_rate)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccu_nk *nk = hw_to_ccu_nk(hw);</div><div class='del'>-	unsigned int n, k;</div><div class='add'>+	struct _ccu_nk _nk;</div><div class='ctx'> </div><div class='ctx'> 	if (nk-&gt;common.features &amp; CCU_FEATURE_FIXED_POSTDIV)</div><div class='ctx'> 		rate *= nk-&gt;fixed_post_div;</div><div class='ctx'> </div><div class='del'>-	ccu_nk_find_best(*parent_rate, rate,</div><div class='del'>-			 1 &lt;&lt; nk-&gt;n.width, 1 &lt;&lt; nk-&gt;k.width,</div><div class='del'>-			 &amp;n, &amp;k);</div><div class='add'>+	_nk.min_n = nk-&gt;n.min;</div><div class='add'>+	_nk.max_n = nk-&gt;n.max ?: 1 &lt;&lt; nk-&gt;n.width;</div><div class='add'>+	_nk.min_k = nk-&gt;k.min;</div><div class='add'>+	_nk.max_k = nk-&gt;k.max ?: 1 &lt;&lt; nk-&gt;k.width;</div><div class='add'>+</div><div class='add'>+	ccu_nk_find_best(*parent_rate, rate, &amp;_nk);</div><div class='add'>+	rate = *parent_rate * _nk.n * _nk.k;</div><div class='ctx'> </div><div class='del'>-	rate = *parent_rate * n * k;</div><div class='ctx'> 	if (nk-&gt;common.features &amp; CCU_FEATURE_FIXED_POSTDIV)</div><div class='ctx'> 		rate = rate / nk-&gt;fixed_post_div;</div><div class='ctx'> </div><div class='hunk'>@@ -110,15 +121,18 @@ static int ccu_nk_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> {</div><div class='ctx'> 	struct ccu_nk *nk = hw_to_ccu_nk(hw);</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned int n, k;</div><div class='add'>+	struct _ccu_nk _nk;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	if (nk-&gt;common.features &amp; CCU_FEATURE_FIXED_POSTDIV)</div><div class='ctx'> 		rate = rate * nk-&gt;fixed_post_div;</div><div class='ctx'> </div><div class='del'>-	ccu_nk_find_best(parent_rate, rate,</div><div class='del'>-			 1 &lt;&lt; nk-&gt;n.width, 1 &lt;&lt; nk-&gt;k.width,</div><div class='del'>-			 &amp;n, &amp;k);</div><div class='add'>+	_nk.min_n = nk-&gt;n.min;</div><div class='add'>+	_nk.max_n = nk-&gt;n.max ?: 1 &lt;&lt; nk-&gt;n.width;</div><div class='add'>+	_nk.min_k = nk-&gt;k.min;</div><div class='add'>+	_nk.max_k = nk-&gt;k.max ?: 1 &lt;&lt; nk-&gt;k.width;</div><div class='add'>+</div><div class='add'>+	ccu_nk_find_best(parent_rate, rate, &amp;_nk);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(nk-&gt;common.lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -126,8 +140,9 @@ static int ccu_nk_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	reg &amp;= ~GENMASK(nk-&gt;n.width + nk-&gt;n.shift - 1, nk-&gt;n.shift);</div><div class='ctx'> 	reg &amp;= ~GENMASK(nk-&gt;k.width + nk-&gt;k.shift - 1, nk-&gt;k.shift);</div><div class='ctx'> </div><div class='del'>-	writel(reg | ((k - 1) &lt;&lt; nk-&gt;k.shift) | ((n - 1) &lt;&lt; nk-&gt;n.shift),</div><div class='del'>-	       nk-&gt;common.base + nk-&gt;common.reg);</div><div class='add'>+	reg |= (_nk.k - nk-&gt;k.offset) &lt;&lt; nk-&gt;k.shift;</div><div class='add'>+	reg |= (_nk.n - nk-&gt;n.offset) &lt;&lt; nk-&gt;n.shift;</div><div class='add'>+	writel(reg, nk-&gt;common.base + nk-&gt;common.reg);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(nk-&gt;common.lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_nk.h b/drivers/clk/sunxi-ng/ccu_nk.h<br/>index 4b52da0c29fe..437836b80696 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nk.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_nk.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nk.h</a></div><div class='hunk'>@@ -30,8 +30,8 @@ struct ccu_nk {</div><div class='ctx'> 	u32			enable;</div><div class='ctx'> 	u32			lock;</div><div class='ctx'> </div><div class='del'>-	struct _ccu_mult	n;</div><div class='del'>-	struct _ccu_mult	k;</div><div class='add'>+	struct ccu_mult_internal	n;</div><div class='add'>+	struct ccu_mult_internal	k;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		fixed_post_div;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_nkm.c b/drivers/clk/sunxi-ng/ccu_nkm.c<br/>index 059fdc3b4f96..71f81e95a061 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nkm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_nkm.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nkm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nkm.c</a></div><div class='hunk'>@@ -9,15 +9,14 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='del'>-#include &lt;linux/rational.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ccu_gate.h"</div><div class='ctx'> #include "ccu_nkm.h"</div><div class='ctx'> </div><div class='ctx'> struct _ccu_nkm {</div><div class='del'>-	unsigned long	n, max_n;</div><div class='del'>-	unsigned long	k, max_k;</div><div class='del'>-	unsigned long	m, max_m;</div><div class='add'>+	unsigned long	n, min_n, max_n;</div><div class='add'>+	unsigned long	k, min_k, max_k;</div><div class='add'>+	unsigned long	m, min_m, max_m;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void ccu_nkm_find_best(unsigned long parent, unsigned long rate,</div><div class='hunk'>@@ -27,22 +26,22 @@ static void ccu_nkm_find_best(unsigned long parent, unsigned long rate,</div><div class='ctx'> 	unsigned long best_n = 0, best_k = 0, best_m = 0;</div><div class='ctx'> 	unsigned long _n, _k, _m;</div><div class='ctx'> </div><div class='del'>-	for (_k = 1; _k &lt;= nkm-&gt;max_k; _k++) {</div><div class='del'>-		unsigned long tmp_rate;</div><div class='del'>-</div><div class='del'>-		rational_best_approximation(rate / _k, parent,</div><div class='del'>-					    nkm-&gt;max_n, nkm-&gt;max_m, &amp;_n, &amp;_m);</div><div class='del'>-</div><div class='del'>-		tmp_rate = parent * _n * _k / _m;</div><div class='del'>-</div><div class='del'>-		if (tmp_rate &gt; rate)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if ((rate - tmp_rate) &lt; (rate - best_rate)) {</div><div class='del'>-			best_rate = tmp_rate;</div><div class='del'>-			best_n = _n;</div><div class='del'>-			best_k = _k;</div><div class='del'>-			best_m = _m;</div><div class='add'>+	for (_k = nkm-&gt;min_k; _k &lt;= nkm-&gt;max_k; _k++) {</div><div class='add'>+		for (_n = nkm-&gt;min_n; _n &lt;= nkm-&gt;max_n; _n++) {</div><div class='add'>+			for (_m = nkm-&gt;min_m; _m &lt;= nkm-&gt;max_m; _m++) {</div><div class='add'>+				unsigned long tmp_rate;</div><div class='add'>+</div><div class='add'>+				tmp_rate = parent * _n * _k / _m;</div><div class='add'>+</div><div class='add'>+				if (tmp_rate &gt; rate)</div><div class='add'>+					continue;</div><div class='add'>+				if ((rate - tmp_rate) &lt; (rate - best_rate)) {</div><div class='add'>+					best_rate = tmp_rate;</div><div class='add'>+					best_n = _n;</div><div class='add'>+					best_k = _k;</div><div class='add'>+					best_m = _m;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -83,14 +82,23 @@ static unsigned long ccu_nkm_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	n = reg &gt;&gt; nkm-&gt;n.shift;</div><div class='ctx'> 	n &amp;= (1 &lt;&lt; nkm-&gt;n.width) - 1;</div><div class='add'>+	n += nkm-&gt;n.offset;</div><div class='add'>+	if (!n)</div><div class='add'>+		n++;</div><div class='ctx'> </div><div class='ctx'> 	k = reg &gt;&gt; nkm-&gt;k.shift;</div><div class='ctx'> 	k &amp;= (1 &lt;&lt; nkm-&gt;k.width) - 1;</div><div class='add'>+	k += nkm-&gt;k.offset;</div><div class='add'>+	if (!k)</div><div class='add'>+		k++;</div><div class='ctx'> </div><div class='ctx'> 	m = reg &gt;&gt; nkm-&gt;m.shift;</div><div class='ctx'> 	m &amp;= (1 &lt;&lt; nkm-&gt;m.width) - 1;</div><div class='add'>+	m += nkm-&gt;m.offset;</div><div class='add'>+	if (!m)</div><div class='add'>+		m++;</div><div class='ctx'> </div><div class='del'>-	return parent_rate * (n + 1) * (k + 1) / (m + 1);</div><div class='add'>+	return parent_rate * n  * k / m;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long ccu_nkm_round_rate(struct ccu_mux_internal *mux,</div><div class='hunk'>@@ -101,8 +109,11 @@ static unsigned long ccu_nkm_round_rate(struct ccu_mux_internal *mux,</div><div class='ctx'> 	struct ccu_nkm *nkm = data;</div><div class='ctx'> 	struct _ccu_nkm _nkm;</div><div class='ctx'> </div><div class='del'>-	_nkm.max_n = 1 &lt;&lt; nkm-&gt;n.width;</div><div class='del'>-	_nkm.max_k = 1 &lt;&lt; nkm-&gt;k.width;</div><div class='add'>+	_nkm.min_n = nkm-&gt;n.min;</div><div class='add'>+	_nkm.max_n = nkm-&gt;n.max ?: 1 &lt;&lt; nkm-&gt;n.width;</div><div class='add'>+	_nkm.min_k = nkm-&gt;k.min;</div><div class='add'>+	_nkm.max_k = nkm-&gt;k.max ?: 1 &lt;&lt; nkm-&gt;k.width;</div><div class='add'>+	_nkm.min_m = 1;</div><div class='ctx'> 	_nkm.max_m = nkm-&gt;m.max ?: 1 &lt;&lt; nkm-&gt;m.width;</div><div class='ctx'> </div><div class='ctx'> 	ccu_nkm_find_best(parent_rate, rate, &amp;_nkm);</div><div class='hunk'>@@ -127,8 +138,11 @@ static int ccu_nkm_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='del'>-	_nkm.max_n = 1 &lt;&lt; nkm-&gt;n.width;</div><div class='del'>-	_nkm.max_k = 1 &lt;&lt; nkm-&gt;k.width;</div><div class='add'>+	_nkm.min_n = nkm-&gt;n.min;</div><div class='add'>+	_nkm.max_n = nkm-&gt;n.max ?: 1 &lt;&lt; nkm-&gt;n.width;</div><div class='add'>+	_nkm.min_k = nkm-&gt;k.min;</div><div class='add'>+	_nkm.max_k = nkm-&gt;k.max ?: 1 &lt;&lt; nkm-&gt;k.width;</div><div class='add'>+	_nkm.min_m = 1;</div><div class='ctx'> 	_nkm.max_m = nkm-&gt;m.max ?: 1 &lt;&lt; nkm-&gt;m.width;</div><div class='ctx'> </div><div class='ctx'> 	ccu_nkm_find_best(parent_rate, rate, &amp;_nkm);</div><div class='hunk'>@@ -140,10 +154,9 @@ static int ccu_nkm_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	reg &amp;= ~GENMASK(nkm-&gt;k.width + nkm-&gt;k.shift - 1, nkm-&gt;k.shift);</div><div class='ctx'> 	reg &amp;= ~GENMASK(nkm-&gt;m.width + nkm-&gt;m.shift - 1, nkm-&gt;m.shift);</div><div class='ctx'> </div><div class='del'>-	reg |= (_nkm.n - 1) &lt;&lt; nkm-&gt;n.shift;</div><div class='del'>-	reg |= (_nkm.k - 1) &lt;&lt; nkm-&gt;k.shift;</div><div class='del'>-	reg |= (_nkm.m - 1) &lt;&lt; nkm-&gt;m.shift;</div><div class='del'>-</div><div class='add'>+	reg |= (_nkm.n - nkm-&gt;n.offset) &lt;&lt; nkm-&gt;n.shift;</div><div class='add'>+	reg |= (_nkm.k - nkm-&gt;k.offset) &lt;&lt; nkm-&gt;k.shift;</div><div class='add'>+	reg |= (_nkm.m - nkm-&gt;m.offset) &lt;&lt; nkm-&gt;m.shift;</div><div class='ctx'> 	writel(reg, nkm-&gt;common.base + nkm-&gt;common.reg);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(nkm-&gt;common.lock, flags);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_nkm.h b/drivers/clk/sunxi-ng/ccu_nkm.h<br/>index 35493fddd8ab..34580894f4d1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nkm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_nkm.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nkm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nkm.h</a></div><div class='hunk'>@@ -29,9 +29,9 @@ struct ccu_nkm {</div><div class='ctx'> 	u32			enable;</div><div class='ctx'> 	u32			lock;</div><div class='ctx'> </div><div class='del'>-	struct _ccu_mult	n;</div><div class='del'>-	struct _ccu_mult	k;</div><div class='del'>-	struct _ccu_div		m;</div><div class='add'>+	struct ccu_mult_internal	n;</div><div class='add'>+	struct ccu_mult_internal	k;</div><div class='add'>+	struct ccu_div_internal		m;</div><div class='ctx'> 	struct ccu_mux_internal	mux;</div><div class='ctx'> </div><div class='ctx'> 	struct ccu_common	common;</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_nkmp.c b/drivers/clk/sunxi-ng/ccu_nkmp.c<br/>index 9769dee99511..a2b40a000157 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nkmp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_nkmp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nkmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nkmp.c</a></div><div class='hunk'>@@ -9,16 +9,15 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='del'>-#include &lt;linux/rational.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ccu_gate.h"</div><div class='ctx'> #include "ccu_nkmp.h"</div><div class='ctx'> </div><div class='ctx'> struct _ccu_nkmp {</div><div class='del'>-	unsigned long	n, max_n;</div><div class='del'>-	unsigned long	k, max_k;</div><div class='del'>-	unsigned long	m, max_m;</div><div class='del'>-	unsigned long	p, max_p;</div><div class='add'>+	unsigned long	n, min_n, max_n;</div><div class='add'>+	unsigned long	k, min_k, max_k;</div><div class='add'>+	unsigned long	m, min_m, max_m;</div><div class='add'>+	unsigned long	p, min_p, max_p;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void ccu_nkmp_find_best(unsigned long parent, unsigned long rate,</div><div class='hunk'>@@ -28,25 +27,25 @@ static void ccu_nkmp_find_best(unsigned long parent, unsigned long rate,</div><div class='ctx'> 	unsigned long best_n = 0, best_k = 0, best_m = 0, best_p = 0;</div><div class='ctx'> 	unsigned long _n, _k, _m, _p;</div><div class='ctx'> </div><div class='del'>-	for (_k = 1; _k &lt;= nkmp-&gt;max_k; _k++) {</div><div class='del'>-		for (_p = 1; _p &lt;= nkmp-&gt;max_p; _p &lt;&lt;= 1) {</div><div class='del'>-			unsigned long tmp_rate;</div><div class='del'>-</div><div class='del'>-			rational_best_approximation(rate / _k, parent / _p,</div><div class='del'>-						    nkmp-&gt;max_n, nkmp-&gt;max_m,</div><div class='del'>-						    &amp;_n, &amp;_m);</div><div class='del'>-</div><div class='del'>-			tmp_rate = parent * _n * _k / (_m * _p);</div><div class='del'>-</div><div class='del'>-			if (tmp_rate &gt; rate)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if ((rate - tmp_rate) &lt; (rate - best_rate)) {</div><div class='del'>-				best_rate = tmp_rate;</div><div class='del'>-				best_n = _n;</div><div class='del'>-				best_k = _k;</div><div class='del'>-				best_m = _m;</div><div class='del'>-				best_p = _p;</div><div class='add'>+	for (_k = nkmp-&gt;min_k; _k &lt;= nkmp-&gt;max_k; _k++) {</div><div class='add'>+		for (_n = nkmp-&gt;min_n; _n &lt;= nkmp-&gt;max_n; _n++) {</div><div class='add'>+			for (_m = nkmp-&gt;min_m; _m &lt;= nkmp-&gt;max_m; _m++) {</div><div class='add'>+				for (_p = nkmp-&gt;min_p; _p &lt;= nkmp-&gt;max_p; _p &lt;&lt;= 1) {</div><div class='add'>+					unsigned long tmp_rate;</div><div class='add'>+</div><div class='add'>+					tmp_rate = parent * _n * _k / (_m * _p);</div><div class='add'>+</div><div class='add'>+					if (tmp_rate &gt; rate)</div><div class='add'>+						continue;</div><div class='add'>+</div><div class='add'>+					if ((rate - tmp_rate) &lt; (rate - best_rate)) {</div><div class='add'>+						best_rate = tmp_rate;</div><div class='add'>+						best_n = _n;</div><div class='add'>+						best_k = _k;</div><div class='add'>+						best_m = _m;</div><div class='add'>+						best_p = _p;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -89,17 +88,26 @@ static unsigned long ccu_nkmp_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	n = reg &gt;&gt; nkmp-&gt;n.shift;</div><div class='ctx'> 	n &amp;= (1 &lt;&lt; nkmp-&gt;n.width) - 1;</div><div class='add'>+	n += nkmp-&gt;n.offset;</div><div class='add'>+	if (!n)</div><div class='add'>+		n++;</div><div class='ctx'> </div><div class='ctx'> 	k = reg &gt;&gt; nkmp-&gt;k.shift;</div><div class='ctx'> 	k &amp;= (1 &lt;&lt; nkmp-&gt;k.width) - 1;</div><div class='add'>+	k += nkmp-&gt;k.offset;</div><div class='add'>+	if (!k)</div><div class='add'>+		k++;</div><div class='ctx'> </div><div class='ctx'> 	m = reg &gt;&gt; nkmp-&gt;m.shift;</div><div class='ctx'> 	m &amp;= (1 &lt;&lt; nkmp-&gt;m.width) - 1;</div><div class='add'>+	m += nkmp-&gt;m.offset;</div><div class='add'>+	if (!m)</div><div class='add'>+		m++;</div><div class='ctx'> </div><div class='ctx'> 	p = reg &gt;&gt; nkmp-&gt;p.shift;</div><div class='ctx'> 	p &amp;= (1 &lt;&lt; nkmp-&gt;p.width) - 1;</div><div class='ctx'> </div><div class='del'>-	return (parent_rate * (n + 1) * (k + 1) &gt;&gt; p) / (m + 1);</div><div class='add'>+	return parent_rate * n * k &gt;&gt; p / m;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='hunk'>@@ -108,9 +116,13 @@ static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw);</div><div class='ctx'> 	struct _ccu_nkmp _nkmp;</div><div class='ctx'> </div><div class='del'>-	_nkmp.max_n = 1 &lt;&lt; nkmp-&gt;n.width;</div><div class='del'>-	_nkmp.max_k = 1 &lt;&lt; nkmp-&gt;k.width;</div><div class='add'>+	_nkmp.min_n = nkmp-&gt;n.min;</div><div class='add'>+	_nkmp.max_n = nkmp-&gt;n.max ?: 1 &lt;&lt; nkmp-&gt;n.width;</div><div class='add'>+	_nkmp.min_k = nkmp-&gt;k.min;</div><div class='add'>+	_nkmp.max_k = nkmp-&gt;k.max ?: 1 &lt;&lt; nkmp-&gt;k.width;</div><div class='add'>+	_nkmp.min_m = 1;</div><div class='ctx'> 	_nkmp.max_m = nkmp-&gt;m.max ?: 1 &lt;&lt; nkmp-&gt;m.width;</div><div class='add'>+	_nkmp.min_p = 1;</div><div class='ctx'> 	_nkmp.max_p = nkmp-&gt;p.max ?: 1 &lt;&lt; ((1 &lt;&lt; nkmp-&gt;p.width) - 1);</div><div class='ctx'> </div><div class='ctx'> 	ccu_nkmp_find_best(*parent_rate, rate, &amp;_nkmp);</div><div class='hunk'>@@ -126,9 +138,13 @@ static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='del'>-	_nkmp.max_n = 1 &lt;&lt; nkmp-&gt;n.width;</div><div class='del'>-	_nkmp.max_k = 1 &lt;&lt; nkmp-&gt;k.width;</div><div class='add'>+	_nkmp.min_n = 1;</div><div class='add'>+	_nkmp.max_n = nkmp-&gt;n.max ?: 1 &lt;&lt; nkmp-&gt;n.width;</div><div class='add'>+	_nkmp.min_k = 1;</div><div class='add'>+	_nkmp.max_k = nkmp-&gt;k.max ?: 1 &lt;&lt; nkmp-&gt;k.width;</div><div class='add'>+	_nkmp.min_m = 1;</div><div class='ctx'> 	_nkmp.max_m = nkmp-&gt;m.max ?: 1 &lt;&lt; nkmp-&gt;m.width;</div><div class='add'>+	_nkmp.min_p = 1;</div><div class='ctx'> 	_nkmp.max_p = nkmp-&gt;p.max ?: 1 &lt;&lt; ((1 &lt;&lt; nkmp-&gt;p.width) - 1);</div><div class='ctx'> </div><div class='ctx'> 	ccu_nkmp_find_best(parent_rate, rate, &amp;_nkmp);</div><div class='hunk'>@@ -141,9 +157,9 @@ static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	reg &amp;= ~GENMASK(nkmp-&gt;m.width + nkmp-&gt;m.shift - 1, nkmp-&gt;m.shift);</div><div class='ctx'> 	reg &amp;= ~GENMASK(nkmp-&gt;p.width + nkmp-&gt;p.shift - 1, nkmp-&gt;p.shift);</div><div class='ctx'> </div><div class='del'>-	reg |= (_nkmp.n - 1) &lt;&lt; nkmp-&gt;n.shift;</div><div class='del'>-	reg |= (_nkmp.k - 1) &lt;&lt; nkmp-&gt;k.shift;</div><div class='del'>-	reg |= (_nkmp.m - 1) &lt;&lt; nkmp-&gt;m.shift;</div><div class='add'>+	reg |= (_nkmp.n - nkmp-&gt;n.offset) &lt;&lt; nkmp-&gt;n.shift;</div><div class='add'>+	reg |= (_nkmp.k - nkmp-&gt;k.offset) &lt;&lt; nkmp-&gt;k.shift;</div><div class='add'>+	reg |= (_nkmp.m - nkmp-&gt;m.offset) &lt;&lt; nkmp-&gt;m.shift;</div><div class='ctx'> 	reg |= ilog2(_nkmp.p) &lt;&lt; nkmp-&gt;p.shift;</div><div class='ctx'> </div><div class='ctx'> 	writel(reg, nkmp-&gt;common.base + nkmp-&gt;common.reg);</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_nkmp.h b/drivers/clk/sunxi-ng/ccu_nkmp.h<br/>index 5adb0c92a614..a82facbc6144 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nkmp.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_nkmp.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nkmp.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nkmp.h</a></div><div class='hunk'>@@ -29,10 +29,10 @@ struct ccu_nkmp {</div><div class='ctx'> 	u32			enable;</div><div class='ctx'> 	u32			lock;</div><div class='ctx'> </div><div class='del'>-	struct _ccu_mult	n;</div><div class='del'>-	struct _ccu_mult	k;</div><div class='del'>-	struct _ccu_div		m;</div><div class='del'>-	struct _ccu_div		p;</div><div class='add'>+	struct ccu_mult_internal	n;</div><div class='add'>+	struct ccu_mult_internal	k;</div><div class='add'>+	struct ccu_div_internal		m;</div><div class='add'>+	struct ccu_div_internal		p;</div><div class='ctx'> </div><div class='ctx'> 	struct ccu_common	common;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_nm.c b/drivers/clk/sunxi-ng/ccu_nm.c<br/>index b61bdd8c7a7f..af71b1909cd9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_nm.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nm.c</a></div><div class='hunk'>@@ -9,12 +9,42 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='del'>-#include &lt;linux/rational.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ccu_frac.h"</div><div class='ctx'> #include "ccu_gate.h"</div><div class='ctx'> #include "ccu_nm.h"</div><div class='ctx'> </div><div class='add'>+struct _ccu_nm {</div><div class='add'>+	unsigned long	n, min_n, max_n;</div><div class='add'>+	unsigned long	m, min_m, max_m;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ccu_nm_find_best(unsigned long parent, unsigned long rate,</div><div class='add'>+			     struct _ccu_nm *nm)</div><div class='add'>+{</div><div class='add'>+	unsigned long best_rate = 0;</div><div class='add'>+	unsigned long best_n = 0, best_m = 0;</div><div class='add'>+	unsigned long _n, _m;</div><div class='add'>+</div><div class='add'>+	for (_n = nm-&gt;min_n; _n &lt;= nm-&gt;max_n; _n++) {</div><div class='add'>+		for (_m = nm-&gt;min_m; _m &lt;= nm-&gt;max_m; _m++) {</div><div class='add'>+			unsigned long tmp_rate = parent * _n  / _m;</div><div class='add'>+</div><div class='add'>+			if (tmp_rate &gt; rate)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if ((rate - tmp_rate) &lt; (rate - best_rate)) {</div><div class='add'>+				best_rate = tmp_rate;</div><div class='add'>+				best_n = _n;</div><div class='add'>+				best_m = _m;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nm-&gt;n = best_n;</div><div class='add'>+	nm-&gt;m = best_m;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ccu_nm_disable(struct clk_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccu_nm *nm = hw_to_ccu_nm(hw);</div><div class='hunk'>@@ -50,35 +80,41 @@ static unsigned long ccu_nm_recalc_rate(struct clk_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	n = reg &gt;&gt; nm-&gt;n.shift;</div><div class='ctx'> 	n &amp;= (1 &lt;&lt; nm-&gt;n.width) - 1;</div><div class='add'>+	n += nm-&gt;n.offset;</div><div class='add'>+	if (!n)</div><div class='add'>+		n++;</div><div class='ctx'> </div><div class='ctx'> 	m = reg &gt;&gt; nm-&gt;m.shift;</div><div class='ctx'> 	m &amp;= (1 &lt;&lt; nm-&gt;m.width) - 1;</div><div class='add'>+	m += nm-&gt;m.offset;</div><div class='add'>+	if (!m)</div><div class='add'>+		m++;</div><div class='ctx'> </div><div class='del'>-	return parent_rate * (n + 1) / (m + 1);</div><div class='add'>+	return parent_rate * n / m;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long ccu_nm_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 			      unsigned long *parent_rate)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccu_nm *nm = hw_to_ccu_nm(hw);</div><div class='del'>-	unsigned long max_n, max_m;</div><div class='del'>-	unsigned long n, m;</div><div class='add'>+	struct _ccu_nm _nm;</div><div class='ctx'> </div><div class='del'>-	max_n = 1 &lt;&lt; nm-&gt;n.width;</div><div class='del'>-	max_m = nm-&gt;m.max ?: 1 &lt;&lt; nm-&gt;m.width;</div><div class='add'>+	_nm.min_n = nm-&gt;n.min;</div><div class='add'>+	_nm.max_n = nm-&gt;n.max ?: 1 &lt;&lt; nm-&gt;n.width;</div><div class='add'>+	_nm.min_m = 1;</div><div class='add'>+	_nm.max_m = nm-&gt;m.max ?: 1 &lt;&lt; nm-&gt;m.width;</div><div class='ctx'> </div><div class='del'>-	rational_best_approximation(rate, *parent_rate, max_n, max_m, &amp;n, &amp;m);</div><div class='add'>+	ccu_nm_find_best(*parent_rate, rate, &amp;_nm);</div><div class='ctx'> </div><div class='del'>-	return *parent_rate * n / m;</div><div class='add'>+	return *parent_rate * _nm.n / _nm.m;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ccu_nm_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 			   unsigned long parent_rate)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccu_nm *nm = hw_to_ccu_nm(hw);</div><div class='add'>+	struct _ccu_nm _nm;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned long max_n, max_m;</div><div class='del'>-	unsigned long n, m;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	if (ccu_frac_helper_has_rate(&amp;nm-&gt;common, &amp;nm-&gt;frac, rate))</div><div class='hunk'>@@ -86,10 +122,12 @@ static int ccu_nm_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	else</div><div class='ctx'> 		ccu_frac_helper_disable(&amp;nm-&gt;common, &amp;nm-&gt;frac);</div><div class='ctx'> </div><div class='del'>-	max_n = 1 &lt;&lt; nm-&gt;n.width;</div><div class='del'>-	max_m = nm-&gt;m.max ?: 1 &lt;&lt; nm-&gt;m.width;</div><div class='add'>+	_nm.min_n = 1;</div><div class='add'>+	_nm.max_n = nm-&gt;n.max ?: 1 &lt;&lt; nm-&gt;n.width;</div><div class='add'>+	_nm.min_m = 1;</div><div class='add'>+	_nm.max_m = nm-&gt;m.max ?: 1 &lt;&lt; nm-&gt;m.width;</div><div class='ctx'> </div><div class='del'>-	rational_best_approximation(rate, parent_rate, max_n, max_m, &amp;n, &amp;m);</div><div class='add'>+	ccu_nm_find_best(parent_rate, rate, &amp;_nm);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(nm-&gt;common.lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -97,8 +135,9 @@ static int ccu_nm_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	reg &amp;= ~GENMASK(nm-&gt;n.width + nm-&gt;n.shift - 1, nm-&gt;n.shift);</div><div class='ctx'> 	reg &amp;= ~GENMASK(nm-&gt;m.width + nm-&gt;m.shift - 1, nm-&gt;m.shift);</div><div class='ctx'> </div><div class='del'>-	writel(reg | ((m - 1) &lt;&lt; nm-&gt;m.shift) | ((n - 1) &lt;&lt; nm-&gt;n.shift),</div><div class='del'>-	       nm-&gt;common.base + nm-&gt;common.reg);</div><div class='add'>+	reg |= (_nm.n - nm-&gt;n.offset) &lt;&lt; nm-&gt;n.shift;</div><div class='add'>+	reg |= (_nm.m - nm-&gt;m.offset) &lt;&lt; nm-&gt;m.shift;</div><div class='add'>+	writel(reg, nm-&gt;common.base + nm-&gt;common.reg);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(nm-&gt;common.lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/sunxi-ng/ccu_nm.h b/drivers/clk/sunxi-ng/ccu_nm.h<br/>index 0b7bcd33a2df..e87fd186da78 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nm.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi-ng/ccu_nm.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi-ng/ccu_nm.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi-ng/ccu_nm.h</a></div><div class='hunk'>@@ -30,9 +30,9 @@ struct ccu_nm {</div><div class='ctx'> 	u32			enable;</div><div class='ctx'> 	u32			lock;</div><div class='ctx'> </div><div class='del'>-	struct _ccu_mult	n;</div><div class='del'>-	struct _ccu_div		m;</div><div class='del'>-	struct _ccu_frac	frac;</div><div class='add'>+	struct ccu_mult_internal	n;</div><div class='add'>+	struct ccu_div_internal		m;</div><div class='add'>+	struct ccu_frac_internal	frac;</div><div class='ctx'> </div><div class='ctx'> 	struct ccu_common	common;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/clk/sunxi/clk-mod0.c b/drivers/clk/sunxi/clk-mod0.c<br/>index e54266cc1c51..4417ae129ac7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/sunxi/clk-mod0.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/sunxi/clk-mod0.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/sunxi/clk-mod0.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/sunxi/clk-mod0.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include "clk-factors.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * sun4i_get_mod0_factors() - calculates m, n factors for MOD0-style clocks</div><div class='add'>+ * sun4i_a10_get_mod0_factors() - calculates m, n factors for MOD0-style clocks</div><div class='ctx'>  * MOD0 rate is calculated as follows</div><div class='ctx'>  * rate = (parent_rate &gt;&gt; p) / (m + 1);</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/clk/tegra/Kconfig b/drivers/clk/tegra/Kconfig<br/>index 1ba30d1e14f2..7ddacae5d0b1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/tegra/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/tegra/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/tegra/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,7 @@</div><div class='ctx'> config TEGRA_CLK_EMC</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on TEGRA124_EMC</div><div class='add'>+</div><div class='add'>+config CLK_TEGRA_BPMP</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on TEGRA_BPMP</div><div class='head'>diff --git a/drivers/clk/tegra/Makefile b/drivers/clk/tegra/Makefile<br/>index 33fd0938d79e..4be8af28ee61 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/tegra/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/tegra/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/tegra/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/Makefile</a></div><div class='hunk'>@@ -22,3 +22,4 @@ obj-$(CONFIG_ARCH_TEGRA_124_SOC)	+= clk-tegra124-dfll-fcpu.o</div><div class='ctx'> obj-$(CONFIG_ARCH_TEGRA_132_SOC)	+= clk-tegra124.o</div><div class='ctx'> obj-y					+= cvb.o</div><div class='ctx'> obj-$(CONFIG_ARCH_TEGRA_210_SOC)	+= clk-tegra210.o</div><div class='add'>+obj-$(CONFIG_CLK_TEGRA_BPMP)		+= clk-bpmp.o</div><div class='head'>diff --git a/drivers/clk/tegra/clk-bpmp.c b/drivers/clk/tegra/clk-bpmp.c<br/>new file mode 100644<br/>index 000000000000..638ace64033b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/tegra/clk-bpmp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/clk-bpmp.c</a></div><div class='hunk'>@@ -0,0 +1,620 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 NVIDIA Corporation</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/seq_buf.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;soc/tegra/bpmp.h&gt;</div><div class='add'>+#include &lt;soc/tegra/bpmp-abi.h&gt;</div><div class='add'>+</div><div class='add'>+#define TEGRA_BPMP_DUMP_CLOCK_INFO	0</div><div class='add'>+</div><div class='add'>+#define TEGRA_BPMP_CLK_HAS_MUX		BIT(0)</div><div class='add'>+#define TEGRA_BPMP_CLK_HAS_SET_RATE	BIT(1)</div><div class='add'>+#define TEGRA_BPMP_CLK_IS_ROOT		BIT(2)</div><div class='add'>+</div><div class='add'>+struct tegra_bpmp_clk_info {</div><div class='add'>+	unsigned int id;</div><div class='add'>+	char name[MRQ_CLK_NAME_MAXLEN];</div><div class='add'>+	unsigned int parents[MRQ_CLK_MAX_PARENTS];</div><div class='add'>+	unsigned int num_parents;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tegra_bpmp_clk {</div><div class='add'>+	struct clk_hw hw;</div><div class='add'>+</div><div class='add'>+	struct tegra_bpmp *bpmp;</div><div class='add'>+	unsigned int id;</div><div class='add'>+</div><div class='add'>+	unsigned int num_parents;</div><div class='add'>+	unsigned int *parents;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct tegra_bpmp_clk *to_tegra_bpmp_clk(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	return container_of(hw, struct tegra_bpmp_clk, hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct tegra_bpmp_clk_message {</div><div class='add'>+	unsigned int cmd;</div><div class='add'>+	unsigned int id;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		const void *data;</div><div class='add'>+		size_t size;</div><div class='add'>+	} tx;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		void *data;</div><div class='add'>+		size_t size;</div><div class='add'>+	} rx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tegra_bpmp_clk_transfer(struct tegra_bpmp *bpmp,</div><div class='add'>+				   const struct tegra_bpmp_clk_message *clk)</div><div class='add'>+{</div><div class='add'>+	struct mrq_clk_request request;</div><div class='add'>+	struct tegra_bpmp_message msg;</div><div class='add'>+	void *req = &amp;request;</div><div class='add'>+</div><div class='add'>+	memset(&amp;request, 0, sizeof(request));</div><div class='add'>+	request.cmd_and_id = (clk-&gt;cmd &lt;&lt; 24) | clk-&gt;id;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The mrq_clk_request structure has an anonymous union at offset 4</div><div class='add'>+	 * that contains all possible sub-command structures. Copy the data</div><div class='add'>+	 * to that union. Ideally we'd be able to refer to it by name, but</div><div class='add'>+	 * doing so would require changing the ABI header and increase the</div><div class='add'>+	 * maintenance burden.</div><div class='add'>+	 */</div><div class='add'>+	memcpy(req + 4, clk-&gt;tx.data, clk-&gt;tx.size);</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	msg.mrq = MRQ_CLK;</div><div class='add'>+	msg.tx.data = &amp;request;</div><div class='add'>+	msg.tx.size = sizeof(request);</div><div class='add'>+	msg.rx.data = clk-&gt;rx.data;</div><div class='add'>+	msg.rx.size = clk-&gt;rx.size;</div><div class='add'>+</div><div class='add'>+	return tegra_bpmp_transfer(bpmp, &amp;msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_bpmp_clk_prepare(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk *clk = to_tegra_bpmp_clk(hw);</div><div class='add'>+	struct tegra_bpmp_clk_message msg;</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	msg.cmd = CMD_CLK_ENABLE;</div><div class='add'>+	msg.id = clk-&gt;id;</div><div class='add'>+</div><div class='add'>+	return tegra_bpmp_clk_transfer(clk-&gt;bpmp, &amp;msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra_bpmp_clk_unprepare(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk *clk = to_tegra_bpmp_clk(hw);</div><div class='add'>+	struct tegra_bpmp_clk_message msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	msg.cmd = CMD_CLK_DISABLE;</div><div class='add'>+	msg.id = clk-&gt;id;</div><div class='add'>+</div><div class='add'>+	err = tegra_bpmp_clk_transfer(clk-&gt;bpmp, &amp;msg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		dev_err(clk-&gt;bpmp-&gt;dev, "failed to disable clock %s: %d\n",</div><div class='add'>+			clk_hw_get_name(hw), err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_bpmp_clk_is_prepared(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk *clk = to_tegra_bpmp_clk(hw);</div><div class='add'>+	struct cmd_clk_is_enabled_response response;</div><div class='add'>+	struct tegra_bpmp_clk_message msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	msg.cmd = CMD_CLK_IS_ENABLED;</div><div class='add'>+	msg.id = clk-&gt;id;</div><div class='add'>+	msg.rx.data = &amp;response;</div><div class='add'>+	msg.rx.size = sizeof(response);</div><div class='add'>+</div><div class='add'>+	err = tegra_bpmp_clk_transfer(clk-&gt;bpmp, &amp;msg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return response.state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long tegra_bpmp_clk_recalc_rate(struct clk_hw *hw,</div><div class='add'>+						unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk *clk = to_tegra_bpmp_clk(hw);</div><div class='add'>+	struct cmd_clk_get_rate_response response;</div><div class='add'>+	struct cmd_clk_get_rate_request request;</div><div class='add'>+	struct tegra_bpmp_clk_message msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	msg.cmd = CMD_CLK_GET_RATE;</div><div class='add'>+	msg.id = clk-&gt;id;</div><div class='add'>+	msg.tx.data = &amp;request;</div><div class='add'>+	msg.tx.size = sizeof(request);</div><div class='add'>+	msg.rx.data = &amp;response;</div><div class='add'>+	msg.rx.size = sizeof(response);</div><div class='add'>+</div><div class='add'>+	err = tegra_bpmp_clk_transfer(clk-&gt;bpmp, &amp;msg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return response.rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long tegra_bpmp_clk_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				      unsigned long *parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk *clk = to_tegra_bpmp_clk(hw);</div><div class='add'>+	struct cmd_clk_round_rate_response response;</div><div class='add'>+	struct cmd_clk_round_rate_request request;</div><div class='add'>+	struct tegra_bpmp_clk_message msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;request, 0, sizeof(request));</div><div class='add'>+	request.rate = rate;</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	msg.cmd = CMD_CLK_ROUND_RATE;</div><div class='add'>+	msg.id = clk-&gt;id;</div><div class='add'>+	msg.tx.data = &amp;request;</div><div class='add'>+	msg.tx.size = sizeof(request);</div><div class='add'>+	msg.rx.data = &amp;response;</div><div class='add'>+	msg.rx.size = sizeof(response);</div><div class='add'>+</div><div class='add'>+	err = tegra_bpmp_clk_transfer(clk-&gt;bpmp, &amp;msg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return response.rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_bpmp_clk_set_parent(struct clk_hw *hw, u8 index)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk *clk = to_tegra_bpmp_clk(hw);</div><div class='add'>+	struct cmd_clk_set_parent_response response;</div><div class='add'>+	struct cmd_clk_set_parent_request request;</div><div class='add'>+	struct tegra_bpmp_clk_message msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;request, 0, sizeof(request));</div><div class='add'>+	request.parent_id = clk-&gt;parents[index];</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	msg.cmd = CMD_CLK_SET_PARENT;</div><div class='add'>+	msg.id = clk-&gt;id;</div><div class='add'>+	msg.tx.data = &amp;request;</div><div class='add'>+	msg.tx.size = sizeof(request);</div><div class='add'>+	msg.rx.data = &amp;response;</div><div class='add'>+	msg.rx.size = sizeof(response);</div><div class='add'>+</div><div class='add'>+	err = tegra_bpmp_clk_transfer(clk-&gt;bpmp, &amp;msg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* XXX check parent ID in response */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 tegra_bpmp_clk_get_parent(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk *clk = to_tegra_bpmp_clk(hw);</div><div class='add'>+	struct cmd_clk_get_parent_response response;</div><div class='add'>+	struct tegra_bpmp_clk_message msg;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	msg.cmd = CMD_CLK_GET_PARENT;</div><div class='add'>+	msg.id = clk-&gt;id;</div><div class='add'>+	msg.rx.data = &amp;response;</div><div class='add'>+	msg.rx.size = sizeof(response);</div><div class='add'>+</div><div class='add'>+	err = tegra_bpmp_clk_transfer(clk-&gt;bpmp, &amp;msg);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(clk-&gt;bpmp-&gt;dev, "failed to get parent for %s: %d\n",</div><div class='add'>+			clk_hw_get_name(hw), err);</div><div class='add'>+		return U8_MAX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; clk-&gt;num_parents; i++)</div><div class='add'>+		if (clk-&gt;parents[i] == response.parent_id)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return U8_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_bpmp_clk_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				   unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk *clk = to_tegra_bpmp_clk(hw);</div><div class='add'>+	struct cmd_clk_set_rate_response response;</div><div class='add'>+	struct cmd_clk_set_rate_request request;</div><div class='add'>+	struct tegra_bpmp_clk_message msg;</div><div class='add'>+</div><div class='add'>+	memset(&amp;request, 0, sizeof(request));</div><div class='add'>+	request.rate = rate;</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	msg.cmd = CMD_CLK_SET_RATE;</div><div class='add'>+	msg.id = clk-&gt;id;</div><div class='add'>+	msg.tx.data = &amp;request;</div><div class='add'>+	msg.tx.size = sizeof(request);</div><div class='add'>+	msg.rx.data = &amp;response;</div><div class='add'>+	msg.rx.size = sizeof(response);</div><div class='add'>+</div><div class='add'>+	return tegra_bpmp_clk_transfer(clk-&gt;bpmp, &amp;msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops tegra_bpmp_clk_gate_ops = {</div><div class='add'>+	.prepare = tegra_bpmp_clk_prepare,</div><div class='add'>+	.unprepare = tegra_bpmp_clk_unprepare,</div><div class='add'>+	.is_prepared = tegra_bpmp_clk_is_prepared,</div><div class='add'>+	.recalc_rate = tegra_bpmp_clk_recalc_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_ops tegra_bpmp_clk_mux_ops = {</div><div class='add'>+	.prepare = tegra_bpmp_clk_prepare,</div><div class='add'>+	.unprepare = tegra_bpmp_clk_unprepare,</div><div class='add'>+	.is_prepared = tegra_bpmp_clk_is_prepared,</div><div class='add'>+	.recalc_rate = tegra_bpmp_clk_recalc_rate,</div><div class='add'>+	.set_parent = tegra_bpmp_clk_set_parent,</div><div class='add'>+	.get_parent = tegra_bpmp_clk_get_parent,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_ops tegra_bpmp_clk_rate_ops = {</div><div class='add'>+	.prepare = tegra_bpmp_clk_prepare,</div><div class='add'>+	.unprepare = tegra_bpmp_clk_unprepare,</div><div class='add'>+	.is_prepared = tegra_bpmp_clk_is_prepared,</div><div class='add'>+	.recalc_rate = tegra_bpmp_clk_recalc_rate,</div><div class='add'>+	.round_rate = tegra_bpmp_clk_round_rate,</div><div class='add'>+	.set_rate = tegra_bpmp_clk_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct clk_ops tegra_bpmp_clk_mux_rate_ops = {</div><div class='add'>+	.prepare = tegra_bpmp_clk_prepare,</div><div class='add'>+	.unprepare = tegra_bpmp_clk_unprepare,</div><div class='add'>+	.is_prepared = tegra_bpmp_clk_is_prepared,</div><div class='add'>+	.recalc_rate = tegra_bpmp_clk_recalc_rate,</div><div class='add'>+	.round_rate = tegra_bpmp_clk_round_rate,</div><div class='add'>+	.set_parent = tegra_bpmp_clk_set_parent,</div><div class='add'>+	.get_parent = tegra_bpmp_clk_get_parent,</div><div class='add'>+	.set_rate = tegra_bpmp_clk_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tegra_bpmp_clk_get_max_id(struct tegra_bpmp *bpmp)</div><div class='add'>+{</div><div class='add'>+	struct cmd_clk_get_max_clk_id_response response;</div><div class='add'>+	struct tegra_bpmp_clk_message msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	msg.cmd = CMD_CLK_GET_MAX_CLK_ID;</div><div class='add'>+	msg.rx.data = &amp;response;</div><div class='add'>+	msg.rx.size = sizeof(response);</div><div class='add'>+</div><div class='add'>+	err = tegra_bpmp_clk_transfer(bpmp, &amp;msg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (response.max_id &gt; INT_MAX)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	return response.max_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_bpmp_clk_get_info(struct tegra_bpmp *bpmp, unsigned int id,</div><div class='add'>+				   struct tegra_bpmp_clk_info *info)</div><div class='add'>+{</div><div class='add'>+	struct cmd_clk_get_all_info_response response;</div><div class='add'>+	struct tegra_bpmp_clk_message msg;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	msg.cmd = CMD_CLK_GET_ALL_INFO;</div><div class='add'>+	msg.id = id;</div><div class='add'>+	msg.rx.data = &amp;response;</div><div class='add'>+	msg.rx.size = sizeof(response);</div><div class='add'>+</div><div class='add'>+	err = tegra_bpmp_clk_transfer(bpmp, &amp;msg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	strlcpy(info-&gt;name, response.name, MRQ_CLK_NAME_MAXLEN);</div><div class='add'>+	info-&gt;num_parents = response.num_parents;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; info-&gt;num_parents; i++)</div><div class='add'>+		info-&gt;parents[i] = response.parents[i];</div><div class='add'>+</div><div class='add'>+	info-&gt;flags = response.flags;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra_bpmp_clk_info_dump(struct tegra_bpmp *bpmp,</div><div class='add'>+				     const char *level,</div><div class='add'>+				     const struct tegra_bpmp_clk_info *info)</div><div class='add'>+{</div><div class='add'>+	const char *prefix = "";</div><div class='add'>+	struct seq_buf buf;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	char flags[64];</div><div class='add'>+</div><div class='add'>+	seq_buf_init(&amp;buf, flags, sizeof(flags));</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags)</div><div class='add'>+		seq_buf_printf(&amp;buf, "(");</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; TEGRA_BPMP_CLK_HAS_MUX) {</div><div class='add'>+		seq_buf_printf(&amp;buf, "%smux", prefix);</div><div class='add'>+		prefix = ", ";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((info-&gt;flags &amp; TEGRA_BPMP_CLK_HAS_SET_RATE) == 0) {</div><div class='add'>+		seq_buf_printf(&amp;buf, "%sfixed", prefix);</div><div class='add'>+		prefix = ", ";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; TEGRA_BPMP_CLK_IS_ROOT) {</div><div class='add'>+		seq_buf_printf(&amp;buf, "%sroot", prefix);</div><div class='add'>+		prefix = ", ";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags)</div><div class='add'>+		seq_buf_printf(&amp;buf, ")");</div><div class='add'>+</div><div class='add'>+	dev_printk(level, bpmp-&gt;dev, "%03u: %s\n", info-&gt;id, info-&gt;name);</div><div class='add'>+	dev_printk(level, bpmp-&gt;dev, "  flags: %lx %s\n", info-&gt;flags, flags);</div><div class='add'>+	dev_printk(level, bpmp-&gt;dev, "  parents: %u\n", info-&gt;num_parents);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; info-&gt;num_parents; i++)</div><div class='add'>+		dev_printk(level, bpmp-&gt;dev, "    %03u\n", info-&gt;parents[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_bpmp_probe_clocks(struct tegra_bpmp *bpmp,</div><div class='add'>+				   struct tegra_bpmp_clk_info **clocksp)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk_info *clocks;</div><div class='add'>+	unsigned int max_id, id, count = 0;</div><div class='add'>+	unsigned int holes = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = tegra_bpmp_clk_get_max_id(bpmp);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	max_id = err;</div><div class='add'>+</div><div class='add'>+	dev_dbg(bpmp-&gt;dev, "maximum clock ID: %u\n", max_id);</div><div class='add'>+</div><div class='add'>+	clocks = kcalloc(max_id + 1, sizeof(*clocks), GFP_KERNEL);</div><div class='add'>+	if (!clocks)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (id = 0; id &lt;= max_id; id++) {</div><div class='add'>+		struct tegra_bpmp_clk_info *info = &amp;clocks[count];</div><div class='add'>+</div><div class='add'>+		err = tegra_bpmp_clk_get_info(bpmp, id, info);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(bpmp-&gt;dev, "failed to query clock %u: %d\n",</div><div class='add'>+				id, err);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (info-&gt;num_parents &gt;= U8_MAX) {</div><div class='add'>+			dev_err(bpmp-&gt;dev,</div><div class='add'>+				"clock %u has too many parents (%u, max: %u)\n",</div><div class='add'>+				id, info-&gt;num_parents, U8_MAX);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* clock not exposed by BPMP */</div><div class='add'>+		if (info-&gt;name[0] == '\0') {</div><div class='add'>+			holes++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info-&gt;id = id;</div><div class='add'>+		count++;</div><div class='add'>+</div><div class='add'>+		if (TEGRA_BPMP_DUMP_CLOCK_INFO)</div><div class='add'>+			tegra_bpmp_clk_info_dump(bpmp, KERN_DEBUG, info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(bpmp-&gt;dev, "holes: %u\n", holes);</div><div class='add'>+	*clocksp = clocks;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tegra_bpmp_clk_info *</div><div class='add'>+tegra_bpmp_clk_find(const struct tegra_bpmp_clk_info *clocks,</div><div class='add'>+		    unsigned int num_clocks, unsigned int id)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_clocks; i++)</div><div class='add'>+		if (clocks[i].id == id)</div><div class='add'>+			return &amp;clocks[i];</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tegra_bpmp_clk *</div><div class='add'>+tegra_bpmp_clk_register(struct tegra_bpmp *bpmp,</div><div class='add'>+			const struct tegra_bpmp_clk_info *info,</div><div class='add'>+			const struct tegra_bpmp_clk_info *clocks,</div><div class='add'>+			unsigned int num_clocks)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk *clk;</div><div class='add'>+	struct clk_init_data init;</div><div class='add'>+	const char **parents;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	clk = devm_kzalloc(bpmp-&gt;dev, sizeof(*clk), GFP_KERNEL);</div><div class='add'>+	if (!clk)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	clk-&gt;id = info-&gt;id;</div><div class='add'>+	clk-&gt;bpmp = bpmp;</div><div class='add'>+</div><div class='add'>+	clk-&gt;parents = devm_kcalloc(bpmp-&gt;dev, info-&gt;num_parents,</div><div class='add'>+				    sizeof(*clk-&gt;parents), GFP_KERNEL);</div><div class='add'>+	if (!clk-&gt;parents)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	clk-&gt;num_parents = info-&gt;num_parents;</div><div class='add'>+</div><div class='add'>+	/* hardware clock initialization */</div><div class='add'>+	memset(&amp;init, 0, sizeof(init));</div><div class='add'>+	init.name = info-&gt;name;</div><div class='add'>+	clk-&gt;hw.init = &amp;init;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;flags &amp; TEGRA_BPMP_CLK_HAS_MUX) {</div><div class='add'>+		if (info-&gt;flags &amp; TEGRA_BPMP_CLK_HAS_SET_RATE)</div><div class='add'>+			init.ops = &amp;tegra_bpmp_clk_mux_rate_ops;</div><div class='add'>+		else</div><div class='add'>+			init.ops = &amp;tegra_bpmp_clk_mux_ops;</div><div class='add'>+	} else {</div><div class='add'>+		if (info-&gt;flags &amp; TEGRA_BPMP_CLK_HAS_SET_RATE)</div><div class='add'>+			init.ops = &amp;tegra_bpmp_clk_rate_ops;</div><div class='add'>+		else</div><div class='add'>+			init.ops = &amp;tegra_bpmp_clk_gate_ops;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init.num_parents = info-&gt;num_parents;</div><div class='add'>+</div><div class='add'>+	parents = kcalloc(info-&gt;num_parents, sizeof(*parents), GFP_KERNEL);</div><div class='add'>+	if (!parents)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; info-&gt;num_parents; i++) {</div><div class='add'>+		const struct tegra_bpmp_clk_info *parent;</div><div class='add'>+</div><div class='add'>+		/* keep a private copy of the ID to parent index map */</div><div class='add'>+		clk-&gt;parents[i] = info-&gt;parents[i];</div><div class='add'>+</div><div class='add'>+		parent = tegra_bpmp_clk_find(clocks, num_clocks,</div><div class='add'>+					     info-&gt;parents[i]);</div><div class='add'>+		if (!parent) {</div><div class='add'>+			dev_err(bpmp-&gt;dev, "no parent %u found for %u\n",</div><div class='add'>+				info-&gt;parents[i], info-&gt;id);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		parents[i] = parent-&gt;name;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init.parent_names = parents;</div><div class='add'>+</div><div class='add'>+	err = devm_clk_hw_register(bpmp-&gt;dev, &amp;clk-&gt;hw);</div><div class='add'>+</div><div class='add'>+	kfree(parents);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	return clk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_bpmp_register_clocks(struct tegra_bpmp *bpmp,</div><div class='add'>+				      struct tegra_bpmp_clk_info *infos,</div><div class='add'>+				      unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk *clk;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	bpmp-&gt;num_clocks = count;</div><div class='add'>+</div><div class='add'>+	bpmp-&gt;clocks = devm_kcalloc(bpmp-&gt;dev, count, sizeof(clk), GFP_KERNEL);</div><div class='add'>+	if (!bpmp-&gt;clocks)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		struct tegra_bpmp_clk_info *info = &amp;infos[i];</div><div class='add'>+</div><div class='add'>+		clk = tegra_bpmp_clk_register(bpmp, info, infos, count);</div><div class='add'>+		if (IS_ERR(clk)) {</div><div class='add'>+			dev_err(bpmp-&gt;dev,</div><div class='add'>+				"failed to register clock %u (%s): %ld\n",</div><div class='add'>+				info-&gt;id, info-&gt;name, PTR_ERR(clk));</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bpmp-&gt;clocks[i] = clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra_bpmp_unregister_clocks(struct tegra_bpmp *bpmp)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bpmp-&gt;num_clocks; i++)</div><div class='add'>+		clk_hw_unregister(&amp;bpmp-&gt;clocks[i]-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk_hw *tegra_bpmp_clk_of_xlate(struct of_phandle_args *clkspec,</div><div class='add'>+					      void *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int id = clkspec-&gt;args[0], i;</div><div class='add'>+	struct tegra_bpmp *bpmp = data;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bpmp-&gt;num_clocks; i++)</div><div class='add'>+		if (bpmp-&gt;clocks[i]-&gt;id == id)</div><div class='add'>+			return &amp;bpmp-&gt;clocks[i]-&gt;hw;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tegra_bpmp_init_clocks(struct tegra_bpmp *bpmp)</div><div class='add'>+{</div><div class='add'>+	struct tegra_bpmp_clk_info *clocks;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = tegra_bpmp_probe_clocks(bpmp, &amp;clocks);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	count = err;</div><div class='add'>+</div><div class='add'>+	dev_dbg(bpmp-&gt;dev, "%u clocks probed\n", count);</div><div class='add'>+</div><div class='add'>+	err = tegra_bpmp_register_clocks(bpmp, clocks, count);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	err = of_clk_add_hw_provider(bpmp-&gt;dev-&gt;of_node,</div><div class='add'>+				     tegra_bpmp_clk_of_xlate,</div><div class='add'>+				     bpmp);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		tegra_bpmp_unregister_clocks(bpmp);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	kfree(clocks);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/clk/tegra/clk-dfll.c b/drivers/clk/tegra/clk-dfll.c<br/>index f010562534eb..2c44aeb0b97c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/tegra/clk-dfll.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/tegra/clk-dfll.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/tegra/clk-dfll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/clk-dfll.c</a></div><div class='hunk'>@@ -633,16 +633,12 @@ static int find_lut_index_for_rate(struct tegra_dfll *td, unsigned long rate)</div><div class='ctx'> 	struct dev_pm_opp *opp;</div><div class='ctx'> 	int i, uv;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='ctx'> 	opp = dev_pm_opp_find_freq_ceil(td-&gt;soc-&gt;dev, &amp;rate);</div><div class='del'>-	if (IS_ERR(opp)) {</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+	if (IS_ERR(opp))</div><div class='ctx'> 		return PTR_ERR(opp);</div><div class='del'>-	}</div><div class='del'>-	uv = dev_pm_opp_get_voltage(opp);</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	uv = dev_pm_opp_get_voltage(opp);</div><div class='add'>+	dev_pm_opp_put(opp);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; td-&gt;i2c_lut_size; i++) {</div><div class='ctx'> 		if (regulator_list_voltage(td-&gt;vdd_reg, td-&gt;i2c_lut[i]) == uv)</div><div class='hunk'>@@ -1440,8 +1436,6 @@ static int dfll_build_i2c_lut(struct tegra_dfll *td)</div><div class='ctx'> 	struct dev_pm_opp *opp;</div><div class='ctx'> 	int lut;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='ctx'> 	rate = ULONG_MAX;</div><div class='ctx'> 	opp = dev_pm_opp_find_freq_floor(td-&gt;soc-&gt;dev, &amp;rate);</div><div class='ctx'> 	if (IS_ERR(opp)) {</div><div class='hunk'>@@ -1449,6 +1443,7 @@ static int dfll_build_i2c_lut(struct tegra_dfll *td)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	v_max = dev_pm_opp_get_voltage(opp);</div><div class='add'>+	dev_pm_opp_put(opp);</div><div class='ctx'> </div><div class='ctx'> 	v = td-&gt;soc-&gt;cvb-&gt;min_millivolts * 1000;</div><div class='ctx'> 	lut = find_vdd_map_entry_exact(td, v);</div><div class='hunk'>@@ -1465,6 +1460,8 @@ static int dfll_build_i2c_lut(struct tegra_dfll *td)</div><div class='ctx'> 		if (v_opp &lt;= td-&gt;soc-&gt;cvb-&gt;min_millivolts * 1000)</div><div class='ctx'> 			td-&gt;dvco_rate_min = dev_pm_opp_get_freq(opp);</div><div class='ctx'> </div><div class='add'>+		dev_pm_opp_put(opp);</div><div class='add'>+</div><div class='ctx'> 		for (;;) {</div><div class='ctx'> 			v += max(1, (v_max - v) / (MAX_DFLL_VOLTAGES - j));</div><div class='ctx'> 			if (v &gt;= v_opp)</div><div class='hunk'>@@ -1496,8 +1493,6 @@ static int dfll_build_i2c_lut(struct tegra_dfll *td)</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c b/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c<br/>index c205809ba580..ad1c1cc829cb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/tegra/clk-tegra124-dfll-fcpu.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/clk-tegra124-dfll-fcpu.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;soc/tegra/fuse.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -148,7 +148,6 @@ static const struct of_device_id tegra124_dfll_fcpu_of_match[] = {</div><div class='ctx'> 	{ .compatible = "nvidia,tegra124-dfll", },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='del'>-MODULE_DEVICE_TABLE(of, tegra124_dfll_fcpu_of_match);</div><div class='ctx'> </div><div class='ctx'> static const struct dev_pm_ops tegra124_dfll_pm_ops = {</div><div class='ctx'> 	SET_RUNTIME_PM_OPS(tegra_dfll_runtime_suspend,</div><div class='hunk'>@@ -164,20 +163,4 @@ static struct platform_driver tegra124_dfll_fcpu_driver = {</div><div class='ctx'> 		.pm = &amp;tegra124_dfll_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init tegra124_dfll_fcpu_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;tegra124_dfll_fcpu_driver);</div><div class='del'>-}</div><div class='del'>-module_init(tegra124_dfll_fcpu_init);</div><div class='del'>-</div><div class='del'>-static void __exit tegra124_dfll_fcpu_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;tegra124_dfll_fcpu_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(tegra124_dfll_fcpu_exit);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Tegra124 DFLL clock source driver");</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='del'>-MODULE_AUTHOR("Aleksandr Frid &lt;afrid@nvidia.com&gt;");</div><div class='del'>-MODULE_AUTHOR("Paul Walmsley &lt;pwalmsley@nvidia.com&gt;");</div><div class='add'>+builtin_platform_driver(tegra124_dfll_fcpu_driver);</div><div class='head'>diff --git a/drivers/clk/tegra/cvb.c b/drivers/clk/tegra/cvb.c<br/>index 624115e82ff9..da9e8e7b5ce5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/tegra/cvb.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/tegra/cvb.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/tegra/cvb.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/tegra/cvb.c</a></div><div class='hunk'>@@ -92,19 +92,19 @@ static int build_opp_table(struct device *dev, const struct cvb_table *table,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tegra_cvb_add_opp_table - build OPP table from Tegra CVB tables</div><div class='del'>- * @cvb_tables: array of CVB tables</div><div class='del'>- * @sz: size of the previously mentioned array</div><div class='add'>+ * @dev: the struct device * for which the OPP table is built</div><div class='add'>+ * @tables: array of CVB tables</div><div class='add'>+ * @count: size of the previously mentioned array</div><div class='ctx'>  * @process_id: process id of the HW module</div><div class='ctx'>  * @speedo_id: speedo id of the HW module</div><div class='ctx'>  * @speedo_value: speedo value of the HW module</div><div class='del'>- * @max_rate: highest safe clock rate</div><div class='del'>- * @opp_dev: the struct device * for which the OPP table is built</div><div class='add'>+ * @max_freq: highest safe clock rate</div><div class='ctx'>  *</div><div class='ctx'>  * On Tegra, a CVB table encodes the relationship between operating voltage</div><div class='ctx'>  * and safe maximal frequency for a given module (e.g. GPU or CPU). This</div><div class='ctx'>  * function calculates the optimal voltage-frequency operating points</div><div class='ctx'>  * for the given arguments and exports them via the OPP library for the</div><div class='del'>- * given @opp_dev. Returns a pointer to the struct cvb_table that matched</div><div class='add'>+ * given @dev. Returns a pointer to the struct cvb_table that matched</div><div class='ctx'>  * or an ERR_PTR on failure.</div><div class='ctx'>  */</div><div class='ctx'> const struct cvb_table *</div><div class='head'>diff --git a/drivers/clk/ti/clk-3xxx.c b/drivers/clk/ti/clk-3xxx.c<br/>index 8831e1a05367..11d8aa3ec186 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/ti/clk-3xxx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/ti/clk-3xxx.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/ti/clk-3xxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/clk-3xxx.c</a></div><div class='hunk'>@@ -22,13 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "clock.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * DPLL5_FREQ_FOR_USBHOST: USBHOST and USBTLL are the only clocks</div><div class='del'>- * that are sourced by DPLL5, and both of these require this clock</div><div class='del'>- * to be at 120 MHz for proper operation.</div><div class='del'>- */</div><div class='del'>-#define DPLL5_FREQ_FOR_USBHOST		120000000</div><div class='del'>-</div><div class='ctx'> #define OMAP3430ES2_ST_DSS_IDLE_SHIFT			1</div><div class='ctx'> #define OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT		5</div><div class='ctx'> #define OMAP3430ES2_ST_SSI_IDLE_SHIFT			8</div><div class='hunk'>@@ -546,14 +539,21 @@ void __init omap3_clk_lock_dpll5(void)</div><div class='ctx'> 	struct clk *dpll5_clk;</div><div class='ctx'> 	struct clk *dpll5_m2_clk;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Errata sprz319f advisory 2.1 documents a USB host clock drift issue</div><div class='add'>+	 * that can be worked around using specially crafted dpll5 settings</div><div class='add'>+	 * with a dpll5_m2 divider set to 8. Set the dpll5 rate to 8x the USB</div><div class='add'>+	 * host clock rate, its .set_rate handler() will detect that frequency</div><div class='add'>+	 * and use the errata settings.</div><div class='add'>+	 */</div><div class='ctx'> 	dpll5_clk = clk_get(NULL, "dpll5_ck");</div><div class='del'>-	clk_set_rate(dpll5_clk, DPLL5_FREQ_FOR_USBHOST);</div><div class='add'>+	clk_set_rate(dpll5_clk, OMAP3_DPLL5_FREQ_FOR_USBHOST * 8);</div><div class='ctx'> 	clk_prepare_enable(dpll5_clk);</div><div class='ctx'> </div><div class='del'>-	/* Program dpll5_m2_clk divider for no division */</div><div class='add'>+	/* Program dpll5_m2_clk divider */</div><div class='ctx'> 	dpll5_m2_clk = clk_get(NULL, "dpll5_m2_ck");</div><div class='ctx'> 	clk_prepare_enable(dpll5_m2_clk);</div><div class='del'>-	clk_set_rate(dpll5_m2_clk, DPLL5_FREQ_FOR_USBHOST);</div><div class='add'>+	clk_set_rate(dpll5_m2_clk, OMAP3_DPLL5_FREQ_FOR_USBHOST);</div><div class='ctx'> </div><div class='ctx'> 	clk_disable_unprepare(dpll5_m2_clk);</div><div class='ctx'> 	clk_disable_unprepare(dpll5_clk);</div><div class='head'>diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c<br/>index bfa17d33ef3b..9fd6043314eb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/ti/clk-7xx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/ti/clk-7xx.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/ti/clk-7xx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/clk-7xx.c</a></div><div class='hunk'>@@ -201,7 +201,6 @@ static struct ti_dt_clk dra7xx_clks[] = {</div><div class='ctx'> 	DT_CLK(NULL, "atl_dpll_clk_mux", "atl_dpll_clk_mux"),</div><div class='ctx'> 	DT_CLK(NULL, "atl_gfclk_mux", "atl_gfclk_mux"),</div><div class='ctx'> 	DT_CLK(NULL, "dcan1_sys_clk_mux", "dcan1_sys_clk_mux"),</div><div class='del'>-	DT_CLK(NULL, "gmac_gmii_ref_clk_div", "gmac_gmii_ref_clk_div"),</div><div class='ctx'> 	DT_CLK(NULL, "gmac_rft_clk_mux", "gmac_rft_clk_mux"),</div><div class='ctx'> 	DT_CLK(NULL, "gpu_core_gclk_mux", "gpu_core_gclk_mux"),</div><div class='ctx'> 	DT_CLK(NULL, "gpu_hyd_gclk_mux", "gpu_hyd_gclk_mux"),</div><div class='head'>diff --git a/drivers/clk/ti/clk-dra7-atl.c b/drivers/clk/ti/clk-dra7-atl.c<br/>index c77333230bdf..45d05339d583 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/ti/clk-dra7-atl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/ti/clk-dra7-atl.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/ti/clk-dra7-atl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/clk-dra7-atl.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -295,31 +295,17 @@ static int of_dra7_atl_clk_probe(struct platform_device *pdev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int of_dra7_atl_clk_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct of_device_id of_dra7_atl_clk_match_tbl[] = {</div><div class='ctx'> 	{ .compatible = "ti,dra7-atl", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='del'>-MODULE_DEVICE_TABLE(of, of_dra7_atl_clk_match_tbl);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver dra7_atl_clk_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "dra7-atl",</div><div class='add'>+		.suppress_bind_attrs = true,</div><div class='ctx'> 		.of_match_table = of_dra7_atl_clk_match_tbl,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = of_dra7_atl_clk_probe,</div><div class='del'>-	.remove = of_dra7_atl_clk_remove,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-module_platform_driver(dra7_atl_clk_driver);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Clock driver for DRA7 Audio Tracking Logic");</div><div class='del'>-MODULE_ALIAS("platform:dra7-atl-clock");</div><div class='del'>-MODULE_AUTHOR("Peter Ujfalusi &lt;peter.ujfalusi@ti.com&gt;");</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='add'>+builtin_platform_driver(dra7_atl_clk_driver);</div><div class='head'>diff --git a/drivers/clk/ti/clock.h b/drivers/clk/ti/clock.h<br/>index 90f3f472ae1c..13c37f48d9d6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/ti/clock.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/ti/clock.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/ti/clock.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/clock.h</a></div><div class='hunk'>@@ -257,11 +257,20 @@ long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate,</div><div class='ctx'> unsigned long omap3_clkoutx2_recalc(struct clk_hw *hw,</div><div class='ctx'> 				    unsigned long parent_rate);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * OMAP3_DPLL5_FREQ_FOR_USBHOST: USBHOST and USBTLL are the only clocks</div><div class='add'>+ * that are sourced by DPLL5, and both of these require this clock</div><div class='add'>+ * to be at 120 MHz for proper operation.</div><div class='add'>+ */</div><div class='add'>+#define OMAP3_DPLL5_FREQ_FOR_USBHOST	120000000</div><div class='add'>+</div><div class='ctx'> unsigned long omap3_dpll_recalc(struct clk_hw *hw, unsigned long parent_rate);</div><div class='ctx'> int omap3_dpll4_set_rate(struct clk_hw *clk, unsigned long rate,</div><div class='ctx'> 			 unsigned long parent_rate);</div><div class='ctx'> int omap3_dpll4_set_rate_and_parent(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 				    unsigned long parent_rate, u8 index);</div><div class='add'>+int omap3_dpll5_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+			 unsigned long parent_rate);</div><div class='ctx'> void omap3_clk_lock_dpll5(void);</div><div class='ctx'> </div><div class='ctx'> unsigned long omap4_dpll_regm4xen_recalc(struct clk_hw *hw,</div><div class='head'>diff --git a/drivers/clk/ti/divider.c b/drivers/clk/ti/divider.c<br/>index b4e5de16e561..6bb87784a0d6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/ti/divider.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/ti/divider.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/ti/divider.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/divider.c</a></div><div class='hunk'>@@ -140,6 +140,35 @@ static bool _is_valid_div(struct clk_divider *divider, unsigned int div)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int _div_round_up(const struct clk_div_table *table,</div><div class='add'>+			 unsigned long parent_rate, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	const struct clk_div_table *clkt;</div><div class='add'>+	int up = INT_MAX;</div><div class='add'>+	int div = DIV_ROUND_UP_ULL((u64)parent_rate, rate);</div><div class='add'>+</div><div class='add'>+	for (clkt = table; clkt-&gt;div; clkt++) {</div><div class='add'>+		if (clkt-&gt;div == div)</div><div class='add'>+			return clkt-&gt;div;</div><div class='add'>+		else if (clkt-&gt;div &lt; div)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if ((clkt-&gt;div - div) &lt; (up - div))</div><div class='add'>+			up = clkt-&gt;div;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return up;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _div_round(const struct clk_div_table *table,</div><div class='add'>+		      unsigned long parent_rate, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	if (!table)</div><div class='add'>+		return DIV_ROUND_UP(parent_rate, rate);</div><div class='add'>+</div><div class='add'>+	return _div_round_up(table, parent_rate, rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ti_clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 				  unsigned long *best_parent_rate)</div><div class='ctx'> {</div><div class='hunk'>@@ -155,7 +184,7 @@ static int ti_clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> </div><div class='ctx'> 	if (!(clk_hw_get_flags(hw) &amp; CLK_SET_RATE_PARENT)) {</div><div class='ctx'> 		parent_rate = *best_parent_rate;</div><div class='del'>-		bestdiv = DIV_ROUND_UP(parent_rate, rate);</div><div class='add'>+		bestdiv = _div_round(divider-&gt;table, parent_rate, rate);</div><div class='ctx'> 		bestdiv = bestdiv == 0 ? 1 : bestdiv;</div><div class='ctx'> 		bestdiv = bestdiv &gt; maxdiv ? maxdiv : bestdiv;</div><div class='ctx'> 		return bestdiv;</div><div class='head'>diff --git a/drivers/clk/ti/dpll.c b/drivers/clk/ti/dpll.c<br/>index 9fc8754a6e61..4b9a419d8e14 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/ti/dpll.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/ti/dpll.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/ti/dpll.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/dpll.c</a></div><div class='hunk'>@@ -114,6 +114,18 @@ static const struct clk_ops omap3_dpll_ck_ops = {</div><div class='ctx'> 	.round_rate	= &amp;omap2_dpll_round_rate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct clk_ops omap3_dpll5_ck_ops = {</div><div class='add'>+	.enable		= &amp;omap3_noncore_dpll_enable,</div><div class='add'>+	.disable	= &amp;omap3_noncore_dpll_disable,</div><div class='add'>+	.get_parent	= &amp;omap2_init_dpll_parent,</div><div class='add'>+	.recalc_rate	= &amp;omap3_dpll_recalc,</div><div class='add'>+	.set_rate	= &amp;omap3_dpll5_set_rate,</div><div class='add'>+	.set_parent	= &amp;omap3_noncore_dpll_set_parent,</div><div class='add'>+	.set_rate_and_parent	= &amp;omap3_noncore_dpll_set_rate_and_parent,</div><div class='add'>+	.determine_rate	= &amp;omap3_noncore_dpll_determine_rate,</div><div class='add'>+	.round_rate	= &amp;omap2_dpll_round_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct clk_ops omap3_dpll_per_ck_ops = {</div><div class='ctx'> 	.enable		= &amp;omap3_noncore_dpll_enable,</div><div class='ctx'> 	.disable	= &amp;omap3_noncore_dpll_disable,</div><div class='hunk'>@@ -474,7 +486,12 @@ static void __init of_ti_omap3_dpll_setup(struct device_node *node)</div><div class='ctx'> 		.modes = (1 &lt;&lt; DPLL_LOW_POWER_BYPASS) | (1 &lt;&lt; DPLL_LOCKED),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	of_ti_dpll_setup(node, &amp;omap3_dpll_ck_ops, &amp;dd);</div><div class='add'>+	if ((of_machine_is_compatible("ti,omap3630") ||</div><div class='add'>+	     of_machine_is_compatible("ti,omap36xx")) &amp;&amp;</div><div class='add'>+	    !strcmp(node-&gt;name, "dpll5_ck"))</div><div class='add'>+		of_ti_dpll_setup(node, &amp;omap3_dpll5_ck_ops, &amp;dd);</div><div class='add'>+	else</div><div class='add'>+		of_ti_dpll_setup(node, &amp;omap3_dpll_ck_ops, &amp;dd);</div><div class='ctx'> }</div><div class='ctx'> CLK_OF_DECLARE(ti_omap3_dpll_clock, "ti,omap3-dpll-clock",</div><div class='ctx'> 	       of_ti_omap3_dpll_setup);</div><div class='head'>diff --git a/drivers/clk/ti/dpll3xxx.c b/drivers/clk/ti/dpll3xxx.c<br/>index 88f2ce81ba55..4cdd28a25584 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/ti/dpll3xxx.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/ti/dpll3xxx.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/ti/dpll3xxx.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ti/dpll3xxx.c</a></div><div class='hunk'>@@ -838,3 +838,70 @@ int omap3_dpll4_set_rate_and_parent(struct clk_hw *hw, unsigned long rate,</div><div class='ctx'> 	return omap3_noncore_dpll_set_rate_and_parent(hw, rate, parent_rate,</div><div class='ctx'> 						      index);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* Apply DM3730 errata sprz319 advisory 2.1. */</div><div class='add'>+static bool omap3_dpll5_apply_errata(struct clk_hw *hw,</div><div class='add'>+				     unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct omap3_dpll5_settings {</div><div class='add'>+		unsigned int rate, m, n;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const struct omap3_dpll5_settings precomputed[] = {</div><div class='add'>+		/*</div><div class='add'>+		 * From DM3730 errata advisory 2.1, table 35 and 36.</div><div class='add'>+		 * The N value is increased by 1 compared to the tables as the</div><div class='add'>+		 * errata lists register values while last_rounded_field is the</div><div class='add'>+		 * real divider value.</div><div class='add'>+		 */</div><div class='add'>+		{ 12000000,  80,  0 + 1 },</div><div class='add'>+		{ 13000000, 443,  5 + 1 },</div><div class='add'>+		{ 19200000,  50,  0 + 1 },</div><div class='add'>+		{ 26000000, 443, 11 + 1 },</div><div class='add'>+		{ 38400000,  25,  0 + 1 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	const struct omap3_dpll5_settings *d;</div><div class='add'>+	struct clk_hw_omap *clk = to_clk_hw_omap(hw);</div><div class='add'>+	struct dpll_data *dd;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(precomputed); ++i) {</div><div class='add'>+		if (parent_rate == precomputed[i].rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == ARRAY_SIZE(precomputed))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	d = &amp;precomputed[i];</div><div class='add'>+</div><div class='add'>+	/* Update the M, N and rounded rate values and program the DPLL. */</div><div class='add'>+	dd = clk-&gt;dpll_data;</div><div class='add'>+	dd-&gt;last_rounded_m = d-&gt;m;</div><div class='add'>+	dd-&gt;last_rounded_n = d-&gt;n;</div><div class='add'>+	dd-&gt;last_rounded_rate = div_u64((u64)parent_rate * d-&gt;m, d-&gt;n);</div><div class='add'>+	omap3_noncore_dpll_program(clk, 0);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap3_dpll5_set_rate - set rate for omap3 dpll5</div><div class='add'>+ * @hw: clock to change</div><div class='add'>+ * @rate: target rate for clock</div><div class='add'>+ * @parent_rate: rate of the parent clock</div><div class='add'>+ *</div><div class='add'>+ * Set rate for the DPLL5 clock. Apply the sprz319 advisory 2.1 on OMAP36xx if</div><div class='add'>+ * the DPLL is used for USB host (detected through the requested rate).</div><div class='add'>+ */</div><div class='add'>+int omap3_dpll5_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+			 unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	if (rate == OMAP3_DPLL5_FREQ_FOR_USBHOST * 8) {</div><div class='add'>+		if (omap3_dpll5_apply_errata(hw, parent_rate))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return omap3_noncore_dpll_set_rate(hw, rate, parent_rate);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/clk/uniphier/Makefile b/drivers/clk/uniphier/Makefile<br/>index f27b360329ca..665d1d65a90e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/uniphier/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/uniphier/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/uniphier/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/uniphier/Makefile</a></div><div class='hunk'>@@ -1,8 +1,11 @@</div><div class='ctx'> obj-y	+= clk-uniphier-core.o</div><div class='add'>+</div><div class='add'>+obj-y	+= clk-uniphier-cpugear.o</div><div class='ctx'> obj-y	+= clk-uniphier-fixed-factor.o</div><div class='ctx'> obj-y	+= clk-uniphier-fixed-rate.o</div><div class='ctx'> obj-y	+= clk-uniphier-gate.o</div><div class='ctx'> obj-y	+= clk-uniphier-mux.o</div><div class='add'>+</div><div class='ctx'> obj-y	+= clk-uniphier-sys.o</div><div class='ctx'> obj-y	+= clk-uniphier-mio.o</div><div class='ctx'> obj-y	+= clk-uniphier-peri.o</div><div class='head'>diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c<br/>index 26c53f7963a4..2cf386347f0c 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/uniphier/clk-uniphier-core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/uniphier/clk-uniphier-core.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/uniphier/clk-uniphier-core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/uniphier/clk-uniphier-core.c</a></div><div class='hunk'>@@ -27,6 +27,9 @@ static struct clk_hw *uniphier_clk_register(struct device *dev,</div><div class='ctx'> 					const struct uniphier_clk_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	switch (data-&gt;type) {</div><div class='add'>+	case UNIPHIER_CLK_TYPE_CPUGEAR:</div><div class='add'>+		return uniphier_clk_register_cpugear(dev, regmap, data-&gt;name,</div><div class='add'>+						     &amp;data-&gt;data.cpugear);</div><div class='ctx'> 	case UNIPHIER_CLK_TYPE_FIXED_FACTOR:</div><div class='ctx'> 		return uniphier_clk_register_fixed_factor(dev, data-&gt;name,</div><div class='ctx'> 							  &amp;data-&gt;data.factor);</div><div class='hunk'>@@ -87,11 +90,8 @@ static int uniphier_clk_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(dev, "register %s (index=%d)\n", p-&gt;name, p-&gt;idx);</div><div class='ctx'> 		hw = uniphier_clk_register(dev, regmap, p);</div><div class='del'>-		if (IS_ERR(hw)) {</div><div class='del'>-			dev_err(dev, "failed to register %s (error %ld)\n",</div><div class='del'>-				p-&gt;name, PTR_ERR(hw));</div><div class='del'>-			return PTR_ERR(hw);</div><div class='del'>-		}</div><div class='add'>+		if (WARN(IS_ERR(hw), "failed to register %s", p-&gt;name))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (p-&gt;idx &gt;= 0)</div><div class='ctx'> 			hw_data-&gt;hws[p-&gt;idx] = hw;</div><div class='head'>diff --git a/drivers/clk/uniphier/clk-uniphier-cpugear.c b/drivers/clk/uniphier/clk-uniphier-cpugear.c<br/>new file mode 100644<br/>index 000000000000..ec11f55594ad<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/uniphier/clk-uniphier-cpugear.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/uniphier/clk-uniphier-cpugear.c</a></div><div class='hunk'>@@ -0,0 +1,114 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Socionext Inc.</div><div class='add'>+ *   Author: Masahiro Yamada &lt;yamada.masahiro@socionext.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "clk-uniphier.h"</div><div class='add'>+</div><div class='add'>+#define UNIPHIER_CLK_CPUGEAR_STAT	0	/* status */</div><div class='add'>+#define UNIPHIER_CLK_CPUGEAR_SET	4	/* set */</div><div class='add'>+#define UNIPHIER_CLK_CPUGEAR_UPD	8	/* update */</div><div class='add'>+#define   UNIPHIER_CLK_CPUGEAR_UPD_BIT	BIT(0)</div><div class='add'>+</div><div class='add'>+struct uniphier_clk_cpugear {</div><div class='add'>+	struct clk_hw hw;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	unsigned int regbase;</div><div class='add'>+	unsigned int mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_uniphier_clk_cpugear(_hw) \</div><div class='add'>+			container_of(_hw, struct uniphier_clk_cpugear, hw)</div><div class='add'>+</div><div class='add'>+static int uniphier_clk_cpugear_set_parent(struct clk_hw *hw, u8 index)</div><div class='add'>+{</div><div class='add'>+	struct uniphier_clk_cpugear *gear = to_uniphier_clk_cpugear(hw);</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write_bits(gear-&gt;regmap,</div><div class='add'>+				gear-&gt;regbase + UNIPHIER_CLK_CPUGEAR_SET,</div><div class='add'>+				gear-&gt;mask, index);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write_bits(gear-&gt;regmap,</div><div class='add'>+				gear-&gt;regbase + UNIPHIER_CLK_CPUGEAR_SET,</div><div class='add'>+				UNIPHIER_CLK_CPUGEAR_UPD_BIT,</div><div class='add'>+				UNIPHIER_CLK_CPUGEAR_UPD_BIT);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return regmap_read_poll_timeout(gear-&gt;regmap,</div><div class='add'>+				gear-&gt;regbase + UNIPHIER_CLK_CPUGEAR_UPD,</div><div class='add'>+				val, !(val &amp; UNIPHIER_CLK_CPUGEAR_UPD_BIT),</div><div class='add'>+				0, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 uniphier_clk_cpugear_get_parent(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct uniphier_clk_cpugear *gear = to_uniphier_clk_cpugear(hw);</div><div class='add'>+	int num_parents = clk_hw_get_num_parents(hw);</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(gear-&gt;regmap,</div><div class='add'>+			  gear-&gt;regbase + UNIPHIER_CLK_CPUGEAR_STAT, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val &amp;= gear-&gt;mask;</div><div class='add'>+</div><div class='add'>+	return val &lt; num_parents ? val : -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops uniphier_clk_cpugear_ops = {</div><div class='add'>+	.determine_rate = __clk_mux_determine_rate,</div><div class='add'>+	.set_parent = uniphier_clk_cpugear_set_parent,</div><div class='add'>+	.get_parent = uniphier_clk_cpugear_get_parent,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk_hw *uniphier_clk_register_cpugear(struct device *dev,</div><div class='add'>+					 struct regmap *regmap,</div><div class='add'>+					 const char *name,</div><div class='add'>+				const struct uniphier_clk_cpugear_data *data)</div><div class='add'>+{</div><div class='add'>+	struct uniphier_clk_cpugear *gear;</div><div class='add'>+	struct clk_init_data init;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	gear = devm_kzalloc(dev, sizeof(*gear), GFP_KERNEL);</div><div class='add'>+	if (!gear)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	init.name = name;</div><div class='add'>+	init.ops = &amp;uniphier_clk_cpugear_ops;</div><div class='add'>+	init.flags = CLK_SET_RATE_PARENT;</div><div class='add'>+	init.parent_names = data-&gt;parent_names;</div><div class='add'>+	init.num_parents = data-&gt;num_parents,</div><div class='add'>+</div><div class='add'>+	gear-&gt;regmap = regmap;</div><div class='add'>+	gear-&gt;regbase = data-&gt;regbase;</div><div class='add'>+	gear-&gt;mask = data-&gt;mask;</div><div class='add'>+	gear-&gt;hw.init = &amp;init;</div><div class='add'>+</div><div class='add'>+	ret = devm_clk_hw_register(dev, &amp;gear-&gt;hw);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	return &amp;gear-&gt;hw;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/clk/uniphier/clk-uniphier-sys.c b/drivers/clk/uniphier/clk-uniphier-sys.c<br/>index 5d029991047d..c8027d909429 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/uniphier/clk-uniphier-sys.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/uniphier/clk-uniphier-sys.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/uniphier/clk-uniphier-sys.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/uniphier/clk-uniphier-sys.c</a></div><div class='hunk'>@@ -29,6 +29,15 @@</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("sd-200m", -1, "spll", 1, 10),		\</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("sd-133m", -1, "spll", 1, 15)</div><div class='ctx'> </div><div class='add'>+#define UNIPHIER_SLD3_SYS_CLK_NAND(idx)					\</div><div class='add'>+	UNIPHIER_CLK_GATE("nand", (idx), NULL, 0x2104, 2)</div><div class='add'>+</div><div class='add'>+#define UNIPHIER_LD11_SYS_CLK_NAND(idx)					\</div><div class='add'>+	UNIPHIER_CLK_GATE("nand", (idx), NULL, 0x210c, 0)</div><div class='add'>+</div><div class='add'>+#define UNIPHIER_LD11_SYS_CLK_EMMC(idx)					\</div><div class='add'>+	UNIPHIER_CLK_GATE("emmc", (idx), NULL, 0x210c, 2)</div><div class='add'>+</div><div class='ctx'> #define UNIPHIER_SLD3_SYS_CLK_STDMAC(idx)				\</div><div class='ctx'> 	UNIPHIER_CLK_GATE("stdmac", (idx), NULL, 0x2104, 10)</div><div class='ctx'> </div><div class='hunk'>@@ -48,6 +57,7 @@ const struct uniphier_clk_data uniphier_sld3_sys_clk_data[] = {</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("vpll27a", -1, "ref", 5625, 512),	/* 270 MHz */</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("uart", 0, "a2pll", 1, 16),</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("i2c", 1, "spll", 1, 16),</div><div class='add'>+	UNIPHIER_SLD3_SYS_CLK_NAND(2),</div><div class='ctx'> 	UNIPHIER_SLD3_SYS_CLK_SD,</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("usb2", -1, "upll", 1, 12),</div><div class='ctx'> 	UNIPHIER_SLD3_SYS_CLK_STDMAC(8),</div><div class='hunk'>@@ -61,6 +71,7 @@ const struct uniphier_clk_data uniphier_ld4_sys_clk_data[] = {</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("vpll27a", -1, "ref", 5625, 512),	/* 270 MHz */</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("uart", 0, "a2pll", 1, 16),</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("i2c", 1, "spll", 1, 16),</div><div class='add'>+	UNIPHIER_SLD3_SYS_CLK_NAND(2),</div><div class='ctx'> 	UNIPHIER_SLD3_SYS_CLK_SD,</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("usb2", -1, "upll", 1, 12),</div><div class='ctx'> 	UNIPHIER_SLD3_SYS_CLK_STDMAC(8),		/* Ether, HSC, MIO */</div><div class='hunk'>@@ -74,6 +85,7 @@ const struct uniphier_clk_data uniphier_pro4_sys_clk_data[] = {</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("vpll27a", -1, "ref", 270, 25),	/* 270 MHz */</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("uart", 0, "a2pll", 1, 8),</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("i2c", 1, "spll", 1, 32),</div><div class='add'>+	UNIPHIER_SLD3_SYS_CLK_NAND(2),</div><div class='ctx'> 	UNIPHIER_SLD3_SYS_CLK_SD,</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("usb2", -1, "upll", 1, 12),</div><div class='ctx'> 	UNIPHIER_SLD3_SYS_CLK_STDMAC(8),		/* HSC, MIO, RLE */</div><div class='hunk'>@@ -89,6 +101,7 @@ const struct uniphier_clk_data uniphier_sld8_sys_clk_data[] = {</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("vpll27a", -1, "ref", 270, 25),	/* 270 MHz */</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("uart", 0, "spll", 1, 20),</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("i2c", 1, "spll", 1, 16),</div><div class='add'>+	UNIPHIER_SLD3_SYS_CLK_NAND(2),</div><div class='ctx'> 	UNIPHIER_SLD3_SYS_CLK_SD,</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("usb2", -1, "upll", 1, 12),</div><div class='ctx'> 	UNIPHIER_SLD3_SYS_CLK_STDMAC(8),		/* Ether, HSC, MIO */</div><div class='hunk'>@@ -101,6 +114,7 @@ const struct uniphier_clk_data uniphier_pro5_sys_clk_data[] = {</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("dapll2", -1, "ref", 144, 125),	/* 2949.12 MHz */</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("uart", 0, "dapll2", 1, 40),</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("i2c", 1, "spll", 1, 48),</div><div class='add'>+	UNIPHIER_SLD3_SYS_CLK_NAND(2),</div><div class='ctx'> 	UNIPHIER_PRO5_SYS_CLK_SD,</div><div class='ctx'> 	UNIPHIER_SLD3_SYS_CLK_STDMAC(8),			/* HSC */</div><div class='ctx'> 	UNIPHIER_PRO4_SYS_CLK_GIO(12),				/* PCIe, USB3 */</div><div class='hunk'>@@ -113,6 +127,7 @@ const struct uniphier_clk_data uniphier_pxs2_sys_clk_data[] = {</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("spll", -1, "ref", 96, 1),		/* 2400 MHz */</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("uart", 0, "spll", 1, 27),</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("i2c", 1, "spll", 1, 48),</div><div class='add'>+	UNIPHIER_SLD3_SYS_CLK_NAND(2),</div><div class='ctx'> 	UNIPHIER_PRO5_SYS_CLK_SD,</div><div class='ctx'> 	UNIPHIER_SLD3_SYS_CLK_STDMAC(8),			/* HSC, RLE */</div><div class='ctx'> 	/* GIO is always clock-enabled: no function for 0x2104 bit6 */</div><div class='hunk'>@@ -125,18 +140,43 @@ const struct uniphier_clk_data uniphier_pxs2_sys_clk_data[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct uniphier_clk_data uniphier_ld11_sys_clk_data[] = {</div><div class='add'>+	UNIPHIER_CLK_FACTOR("cpll", -1, "ref", 392, 5),		/* 1960 MHz */</div><div class='add'>+	UNIPHIER_CLK_FACTOR("mpll", -1, "ref", 64, 1),		/* 1600 MHz */</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("spll", -1, "ref", 80, 1),		/* 2000 MHz */</div><div class='add'>+	UNIPHIER_CLK_FACTOR("vspll", -1, "ref", 80, 1),		/* 2000 MHz */</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("uart", 0, "spll", 1, 34),</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("i2c", 1, "spll", 1, 40),</div><div class='add'>+	UNIPHIER_LD11_SYS_CLK_NAND(2),</div><div class='add'>+	UNIPHIER_LD11_SYS_CLK_EMMC(4),</div><div class='add'>+	/* Index 5 reserved for eMMC PHY */</div><div class='ctx'> 	UNIPHIER_LD11_SYS_CLK_STDMAC(8),			/* HSC, MIO */</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("usb2", -1, "ref", 24, 25),</div><div class='add'>+	/* CPU gears */</div><div class='add'>+	UNIPHIER_CLK_DIV4("cpll", 2, 3, 4, 8),</div><div class='add'>+	UNIPHIER_CLK_DIV4("mpll", 2, 3, 4, 8),</div><div class='add'>+	UNIPHIER_CLK_DIV3("spll", 3, 4, 8),</div><div class='add'>+	/* Note: both gear1 and gear4 are spll/4.  This is not a bug. */</div><div class='add'>+	UNIPHIER_CLK_CPUGEAR("cpu-ca53", 33, 0x8080, 0xf, 8,</div><div class='add'>+			     "cpll/2", "spll/4", "cpll/3", "spll/3",</div><div class='add'>+			     "spll/4", "spll/8", "cpll/4", "cpll/8"),</div><div class='add'>+	UNIPHIER_CLK_CPUGEAR("cpu-ipp", 34, 0x8100, 0xf, 8,</div><div class='add'>+			     "mpll/2", "spll/4", "mpll/3", "spll/3",</div><div class='add'>+			     "spll/4", "spll/8", "mpll/4", "mpll/8"),</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct uniphier_clk_data uniphier_ld20_sys_clk_data[] = {</div><div class='add'>+	UNIPHIER_CLK_FACTOR("cpll", -1, "ref", 88, 1),		/* ARM: 2200 MHz */</div><div class='add'>+	UNIPHIER_CLK_FACTOR("gppll", -1, "ref", 52, 1),		/* Mali: 1300 MHz */</div><div class='add'>+	UNIPHIER_CLK_FACTOR("mpll", -1, "ref", 64, 1),		/* Codec: 1600 MHz */</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("spll", -1, "ref", 80, 1),		/* 2000 MHz */</div><div class='add'>+	UNIPHIER_CLK_FACTOR("s2pll", -1, "ref", 88, 1),		/* IPP: 2200 MHz */</div><div class='add'>+	UNIPHIER_CLK_FACTOR("vppll", -1, "ref", 504, 5),	/* 2520 MHz */</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("uart", 0, "spll", 1, 34),</div><div class='ctx'> 	UNIPHIER_CLK_FACTOR("i2c", 1, "spll", 1, 40),</div><div class='add'>+	UNIPHIER_LD11_SYS_CLK_NAND(2),</div><div class='add'>+	UNIPHIER_LD11_SYS_CLK_EMMC(4),</div><div class='add'>+	/* Index 5 reserved for eMMC PHY */</div><div class='ctx'> 	UNIPHIER_LD20_SYS_CLK_SD,</div><div class='ctx'> 	UNIPHIER_LD11_SYS_CLK_STDMAC(8),			/* HSC */</div><div class='ctx'> 	/* GIO is always clock-enabled: no function for 0x210c bit5 */</div><div class='hunk'>@@ -147,5 +187,18 @@ const struct uniphier_clk_data uniphier_ld20_sys_clk_data[] = {</div><div class='ctx'> 	UNIPHIER_CLK_GATE("usb30", 14, NULL, 0x210c, 14),</div><div class='ctx'> 	UNIPHIER_CLK_GATE("usb30-phy0", 16, NULL, 0x210c, 12),</div><div class='ctx'> 	UNIPHIER_CLK_GATE("usb30-phy1", 17, NULL, 0x210c, 13),</div><div class='add'>+	/* CPU gears */</div><div class='add'>+	UNIPHIER_CLK_DIV4("cpll", 2, 3, 4, 8),</div><div class='add'>+	UNIPHIER_CLK_DIV4("spll", 2, 3, 4, 8),</div><div class='add'>+	UNIPHIER_CLK_DIV4("s2pll", 2, 3, 4, 8),</div><div class='add'>+	UNIPHIER_CLK_CPUGEAR("cpu-ca72", 32, 0x8000, 0xf, 8,</div><div class='add'>+			     "cpll/2", "spll/2", "cpll/3", "spll/3",</div><div class='add'>+			     "spll/4", "spll/8", "cpll/4", "cpll/8"),</div><div class='add'>+	UNIPHIER_CLK_CPUGEAR("cpu-ca53", 33, 0x8080, 0xf, 8,</div><div class='add'>+			     "cpll/2", "spll/2", "cpll/3", "spll/3",</div><div class='add'>+			     "spll/4", "spll/8", "cpll/4", "cpll/8"),</div><div class='add'>+	UNIPHIER_CLK_CPUGEAR("cpu-ipp", 34, 0x8100, 0xf, 8,</div><div class='add'>+			     "s2pll/2", "spll/2", "s2pll/3", "spll/3",</div><div class='add'>+			     "spll/4", "spll/8", "s2pll/4", "s2pll/8"),</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/clk/uniphier/clk-uniphier.h b/drivers/clk/uniphier/clk-uniphier.h<br/>index 0244dba1f4cf..01c16ecec48f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/uniphier/clk-uniphier.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/uniphier/clk-uniphier.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/uniphier/clk-uniphier.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/uniphier/clk-uniphier.h</a></div><div class='hunk'>@@ -20,15 +20,24 @@ struct clk_hw;</div><div class='ctx'> struct device;</div><div class='ctx'> struct regmap;</div><div class='ctx'> </div><div class='del'>-#define UNIPHIER_CLK_MUX_MAX_PARENTS	8</div><div class='add'>+#define UNIPHIER_CLK_CPUGEAR_MAX_PARENTS	16</div><div class='add'>+#define UNIPHIER_CLK_MUX_MAX_PARENTS		8</div><div class='ctx'> </div><div class='ctx'> enum uniphier_clk_type {</div><div class='add'>+	UNIPHIER_CLK_TYPE_CPUGEAR,</div><div class='ctx'> 	UNIPHIER_CLK_TYPE_FIXED_FACTOR,</div><div class='ctx'> 	UNIPHIER_CLK_TYPE_FIXED_RATE,</div><div class='ctx'> 	UNIPHIER_CLK_TYPE_GATE,</div><div class='ctx'> 	UNIPHIER_CLK_TYPE_MUX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct uniphier_clk_cpugear_data {</div><div class='add'>+	const char *parent_names[UNIPHIER_CLK_CPUGEAR_MAX_PARENTS];</div><div class='add'>+	unsigned int num_parents;</div><div class='add'>+	unsigned int regbase;</div><div class='add'>+	unsigned int mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct uniphier_clk_fixed_factor_data {</div><div class='ctx'> 	const char *parent_name;</div><div class='ctx'> 	unsigned int mult;</div><div class='hunk'>@@ -58,6 +67,7 @@ struct uniphier_clk_data {</div><div class='ctx'> 	enum uniphier_clk_type type;</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	union {</div><div class='add'>+		struct uniphier_clk_cpugear_data cpugear;</div><div class='ctx'> 		struct uniphier_clk_fixed_factor_data factor;</div><div class='ctx'> 		struct uniphier_clk_fixed_rate_data rate;</div><div class='ctx'> 		struct uniphier_clk_gate_data gate;</div><div class='hunk'>@@ -65,6 +75,20 @@ struct uniphier_clk_data {</div><div class='ctx'> 	} data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define UNIPHIER_CLK_CPUGEAR(_name, _idx, _regbase, _mask,	\</div><div class='add'>+			     _num_parents, ...)			\</div><div class='add'>+	{							\</div><div class='add'>+		.name = (_name),				\</div><div class='add'>+		.type = UNIPHIER_CLK_TYPE_CPUGEAR,		\</div><div class='add'>+		.idx = (_idx),					\</div><div class='add'>+		.data.cpugear = {				\</div><div class='add'>+			.parent_names = { __VA_ARGS__ },	\</div><div class='add'>+			.num_parents = (_num_parents),		\</div><div class='add'>+			.regbase = (_regbase),			\</div><div class='add'>+			.mask = (_mask)				\</div><div class='add'>+		 },						\</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #define UNIPHIER_CLK_FACTOR(_name, _idx, _parent, _mult, _div)	\</div><div class='ctx'> 	{							\</div><div class='ctx'> 		.name = (_name),				\</div><div class='hunk'>@@ -77,7 +101,6 @@ struct uniphier_clk_data {</div><div class='ctx'> 		},						\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #define UNIPHIER_CLK_GATE(_name, _idx, _parent, _reg, _bit)	\</div><div class='ctx'> 	{							\</div><div class='ctx'> 		.name = (_name),				\</div><div class='hunk'>@@ -90,7 +113,25 @@ struct uniphier_clk_data {</div><div class='ctx'> 		},						\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define UNIPHIER_CLK_DIV(parent, div)				\</div><div class='add'>+	UNIPHIER_CLK_FACTOR(parent "/" #div, -1, parent, 1, div)</div><div class='add'>+</div><div class='add'>+#define UNIPHIER_CLK_DIV2(parent, div0, div1)			\</div><div class='add'>+	UNIPHIER_CLK_DIV(parent, div0),				\</div><div class='add'>+	UNIPHIER_CLK_DIV(parent, div1)</div><div class='add'>+</div><div class='add'>+#define UNIPHIER_CLK_DIV3(parent, div0, div1, div2)		\</div><div class='add'>+	UNIPHIER_CLK_DIV2(parent, div0, div1),			\</div><div class='add'>+	UNIPHIER_CLK_DIV(parent, div2)</div><div class='add'>+</div><div class='add'>+#define UNIPHIER_CLK_DIV4(parent, div0, div1, div2, div3)	\</div><div class='add'>+	UNIPHIER_CLK_DIV2(parent, div0, div1),			\</div><div class='add'>+	UNIPHIER_CLK_DIV2(parent, div2, div3)</div><div class='ctx'> </div><div class='add'>+struct clk_hw *uniphier_clk_register_cpugear(struct device *dev,</div><div class='add'>+					     struct regmap *regmap,</div><div class='add'>+					     const char *name,</div><div class='add'>+				const struct uniphier_clk_cpugear_data *data);</div><div class='ctx'> struct clk_hw *uniphier_clk_register_fixed_factor(struct device *dev,</div><div class='ctx'> 						  const char *name,</div><div class='ctx'> 			const struct uniphier_clk_fixed_factor_data *data);</div><div class='head'>diff --git a/drivers/clk/ux500/abx500-clk.c b/drivers/clk/ux500/abx500-clk.c<br/>index a07c31e6f26d..2257d12ba988 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/ux500/abx500-clk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/ux500/abx500-clk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/ux500/abx500-clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ux500/abx500-clk.c</a></div><div class='hunk'>@@ -10,20 +10,26 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/abx500/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/abx500/ab8500-sysctrl.h&gt;</div><div class='ctx'> #include &lt;linux/clkdev.h&gt;</div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='del'>-#include &lt;linux/mfd/dbx500-prcmu.h&gt;</div><div class='add'>+#include &lt;dt-bindings/clock/ste-ab8500.h&gt;</div><div class='ctx'> #include "clk.h"</div><div class='ctx'> </div><div class='add'>+#define AB8500_NUM_CLKS 6</div><div class='add'>+</div><div class='add'>+static struct clk *ab8500_clks[AB8500_NUM_CLKS];</div><div class='add'>+static struct clk_onecell_data ab8500_clk_data;</div><div class='add'>+</div><div class='ctx'> /* Clock definitions for ab8500 */</div><div class='ctx'> static int ab8500_reg_clks(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct clk *clk;</div><div class='del'>-</div><div class='add'>+	struct device_node *np = dev-&gt;of_node;</div><div class='ctx'> 	const char *intclk_parents[] = {"ab8500_sysclk", "ulpclk"};</div><div class='ctx'> 	u16 intclk_reg_sel[] = {0 , AB8500_SYSULPCLKCTRL1};</div><div class='ctx'> 	u8 intclk_reg_mask[] = {0 , AB8500_SYSULPCLKCTRL1_SYSULPCLKINTSEL_MASK};</div><div class='hunk'>@@ -32,55 +38,52 @@ static int ab8500_reg_clks(struct device *dev)</div><div class='ctx'> 		(1 &lt;&lt; AB8500_SYSULPCLKCTRL1_SYSULPCLKINTSEL_SHIFT)</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	dev_info(dev, "register clocks for ab850x\n");</div><div class='del'>-</div><div class='ctx'> 	/* Enable SWAT */</div><div class='ctx'> 	ret = ab8500_sysctrl_set(AB8500_SWATCTRL, AB8500_SWATCTRL_SWATENABLE);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* ab8500_sysclk */</div><div class='del'>-	clk = clk_reg_prcmu_gate("ab8500_sysclk", NULL, PRCMU_SYSCLK, 0);</div><div class='del'>-	clk_register_clkdev(clk, "sysclk", "ab8500-usb.0");</div><div class='del'>-	clk_register_clkdev(clk, "sysclk", "ab-iddet.0");</div><div class='del'>-	clk_register_clkdev(clk, "sysclk", "snd-soc-mop500.0");</div><div class='del'>-	clk_register_clkdev(clk, "sysclk", "shrm_bus");</div><div class='del'>-</div><div class='ctx'> 	/* ab8500_sysclk2 */</div><div class='ctx'> 	clk = clk_reg_sysctrl_gate(dev , "ab8500_sysclk2", "ab8500_sysclk",</div><div class='ctx'> 		AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_SYSCLKBUF2REQ,</div><div class='ctx'> 		AB8500_SYSULPCLKCTRL1_SYSCLKBUF2REQ, 0, 0);</div><div class='del'>-	clk_register_clkdev(clk, "sysclk", "0-0070");</div><div class='add'>+	ab8500_clks[AB8500_SYSCLK_BUF2] = clk;</div><div class='ctx'> </div><div class='ctx'> 	/* ab8500_sysclk3 */</div><div class='ctx'> 	clk = clk_reg_sysctrl_gate(dev , "ab8500_sysclk3", "ab8500_sysclk",</div><div class='ctx'> 		AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_SYSCLKBUF3REQ,</div><div class='ctx'> 		AB8500_SYSULPCLKCTRL1_SYSCLKBUF3REQ, 0, 0);</div><div class='del'>-	clk_register_clkdev(clk, "sysclk", "cg1960_core.0");</div><div class='add'>+	ab8500_clks[AB8500_SYSCLK_BUF3] = clk;</div><div class='ctx'> </div><div class='ctx'> 	/* ab8500_sysclk4 */</div><div class='ctx'> 	clk = clk_reg_sysctrl_gate(dev , "ab8500_sysclk4", "ab8500_sysclk",</div><div class='ctx'> 		AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_SYSCLKBUF4REQ,</div><div class='ctx'> 		AB8500_SYSULPCLKCTRL1_SYSCLKBUF4REQ, 0, 0);</div><div class='add'>+	ab8500_clks[AB8500_SYSCLK_BUF4] = clk;</div><div class='ctx'> </div><div class='ctx'> 	/* ab_ulpclk */</div><div class='ctx'> 	clk = clk_reg_sysctrl_gate_fixed_rate(dev, "ulpclk", NULL,</div><div class='ctx'> 		AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_ULPCLKREQ,</div><div class='ctx'> 		AB8500_SYSULPCLKCTRL1_ULPCLKREQ,</div><div class='ctx'> 		38400000, 9000, 0);</div><div class='del'>-	clk_register_clkdev(clk, "ulpclk", "snd-soc-mop500.0");</div><div class='add'>+	ab8500_clks[AB8500_SYSCLK_ULP] = clk;</div><div class='ctx'> </div><div class='ctx'> 	/* ab8500_intclk */</div><div class='ctx'> 	clk = clk_reg_sysctrl_set_parent(dev , "intclk", intclk_parents, 2,</div><div class='ctx'> 		intclk_reg_sel, intclk_reg_mask, intclk_reg_bits, 0);</div><div class='del'>-	clk_register_clkdev(clk, "intclk", "snd-soc-mop500.0");</div><div class='del'>-	clk_register_clkdev(clk, NULL, "ab8500-pwm.1");</div><div class='add'>+	ab8500_clks[AB8500_SYSCLK_INT] = clk;</div><div class='ctx'> </div><div class='ctx'> 	/* ab8500_audioclk */</div><div class='ctx'> 	clk = clk_reg_sysctrl_gate(dev , "audioclk", "intclk",</div><div class='ctx'> 		AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_AUDIOCLKENA,</div><div class='ctx'> 		AB8500_SYSULPCLKCTRL1_AUDIOCLKENA, 0, 0);</div><div class='del'>-	clk_register_clkdev(clk, "audioclk", "ab8500-codec.0");</div><div class='add'>+	ab8500_clks[AB8500_SYSCLK_AUDIO] = clk;</div><div class='add'>+</div><div class='add'>+	ab8500_clk_data.clks = ab8500_clks;</div><div class='add'>+	ab8500_clk_data.clk_num = ARRAY_SIZE(ab8500_clks);</div><div class='add'>+	of_clk_add_provider(np, of_clk_src_onecell_get, &amp;ab8500_clk_data);</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "registered clocks for ab850x\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -116,9 +119,15 @@ static int abx500_clk_probe(struct platform_device *pdev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id abx500_clk_match[] = {</div><div class='add'>+	{ .compatible = "stericsson,ab8500-clk", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_driver abx500_clk_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "abx500-clk",</div><div class='add'>+		.of_match_table = abx500_clk_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= abx500_clk_probe,</div><div class='ctx'> };</div><div class='hunk'>@@ -127,7 +136,6 @@ static int __init abx500_clk_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return platform_driver_register(&amp;abx500_clk_driver);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> arch_initcall(abx500_clk_init);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Ulf Hansson &lt;ulf.hansson@linaro.org");</div><div class='head'>diff --git a/drivers/clk/ux500/u8500_of_clk.c b/drivers/clk/ux500/u8500_of_clk.c<br/>index e960d686d9db..d5888591e1a9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/ux500/u8500_of_clk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/ux500/u8500_of_clk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/ux500/u8500_of_clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/ux500/u8500_of_clk.c</a></div><div class='hunk'>@@ -206,6 +206,9 @@ static void u8500_clk_init(struct device_node *np)</div><div class='ctx'> 	clk = clk_reg_prcmu_gate("timclk", NULL, PRCMU_TIMCLK, 0);</div><div class='ctx'> 	prcmu_clk[PRCMU_TIMCLK] = clk;</div><div class='ctx'> </div><div class='add'>+	clk = clk_reg_prcmu_gate("ab8500_sysclk", NULL, PRCMU_SYSCLK, 0);</div><div class='add'>+	prcmu_clk[PRCMU_SYSCLK] = clk;</div><div class='add'>+</div><div class='ctx'> 	clk = clk_reg_prcmu_opp_volt_scalable("sdmmcclk", NULL, PRCMU_SDMMCCLK,</div><div class='ctx'> 					100000000, CLK_SET_RATE_GATE);</div><div class='ctx'> 	prcmu_clk[PRCMU_SDMMCCLK] = clk;</div><div class='head'>diff --git a/drivers/clk/x86/Makefile b/drivers/clk/x86/Makefile<br/>index 04781389d0fb..1367afb03858 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/x86/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/x86/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/x86/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/x86/Makefile</a></div><div class='hunk'>@@ -1,2 +1,3 @@</div><div class='ctx'> clk-x86-lpss-objs		:= clk-lpt.o</div><div class='ctx'> obj-$(CONFIG_X86_INTEL_LPSS)	+= clk-x86-lpss.o</div><div class='add'>+obj-$(CONFIG_PMC_ATOM)		+= clk-pmc-atom.o</div><div class='head'>diff --git a/drivers/clk/x86/clk-pmc-atom.c b/drivers/clk/x86/clk-pmc-atom.c<br/>new file mode 100644<br/>index 000000000000..2b60577703ef<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clk/x86/clk-pmc-atom.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/x86/clk-pmc-atom.c</a></div><div class='hunk'>@@ -0,0 +1,371 @@</div><div class='add'>+/*</div><div class='add'>+ * Intel Atom platform clocks driver for BayTrail and CherryTrail SoCs</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016, Intel Corporation</div><div class='add'>+ * Author: Irina Tirdea &lt;irina.tirdea@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/clkdev.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/x86/clk-pmc-atom.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#define PLT_CLK_NAME_BASE	"pmc_plt_clk"</div><div class='add'>+</div><div class='add'>+#define PMC_CLK_CTL_OFFSET		0x60</div><div class='add'>+#define PMC_CLK_CTL_SIZE		4</div><div class='add'>+#define PMC_CLK_NUM			6</div><div class='add'>+#define PMC_CLK_CTL_GATED_ON_D3		0x0</div><div class='add'>+#define PMC_CLK_CTL_FORCE_ON		0x1</div><div class='add'>+#define PMC_CLK_CTL_FORCE_OFF		0x2</div><div class='add'>+#define PMC_CLK_CTL_RESERVED		0x3</div><div class='add'>+#define PMC_MASK_CLK_CTL		GENMASK(1, 0)</div><div class='add'>+#define PMC_MASK_CLK_FREQ		BIT(2)</div><div class='add'>+#define PMC_CLK_FREQ_XTAL		(0 &lt;&lt; 2)	/* 25 MHz */</div><div class='add'>+#define PMC_CLK_FREQ_PLL		(1 &lt;&lt; 2)	/* 19.2 MHz */</div><div class='add'>+</div><div class='add'>+struct clk_plt_fixed {</div><div class='add'>+	struct clk_hw *clk;</div><div class='add'>+	struct clk_lookup *lookup;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk_plt {</div><div class='add'>+	struct clk_hw hw;</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+	struct clk_lookup *lookup;</div><div class='add'>+	/* protect access to PMC registers */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_clk_plt(_hw) container_of(_hw, struct clk_plt, hw)</div><div class='add'>+</div><div class='add'>+struct clk_plt_data {</div><div class='add'>+	struct clk_plt_fixed **parents;</div><div class='add'>+	u8 nparents;</div><div class='add'>+	struct clk_plt *clks[PMC_CLK_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Return an index in parent table */</div><div class='add'>+static inline int plt_reg_to_parent(int reg)</div><div class='add'>+{</div><div class='add'>+	switch (reg &amp; PMC_MASK_CLK_FREQ) {</div><div class='add'>+	default:</div><div class='add'>+	case PMC_CLK_FREQ_XTAL:</div><div class='add'>+		return 0;</div><div class='add'>+	case PMC_CLK_FREQ_PLL:</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return clk index of parent */</div><div class='add'>+static inline int plt_parent_to_reg(int index)</div><div class='add'>+{</div><div class='add'>+	switch (index) {</div><div class='add'>+	default:</div><div class='add'>+	case 0:</div><div class='add'>+		return PMC_CLK_FREQ_XTAL;</div><div class='add'>+	case 1:</div><div class='add'>+		return PMC_CLK_FREQ_PLL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Abstract status in simpler enabled/disabled value */</div><div class='add'>+static inline int plt_reg_to_enabled(int reg)</div><div class='add'>+{</div><div class='add'>+	switch (reg &amp; PMC_MASK_CLK_CTL) {</div><div class='add'>+	case PMC_CLK_CTL_GATED_ON_D3:</div><div class='add'>+	case PMC_CLK_CTL_FORCE_ON:</div><div class='add'>+		return 1;	/* enabled */</div><div class='add'>+	case PMC_CLK_CTL_FORCE_OFF:</div><div class='add'>+	case PMC_CLK_CTL_RESERVED:</div><div class='add'>+	default:</div><div class='add'>+		return 0;	/* disabled */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void plt_clk_reg_update(struct clk_plt *clk, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;clk-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	tmp = readl(clk-&gt;reg);</div><div class='add'>+	tmp = (tmp &amp; ~mask) | (val &amp; mask);</div><div class='add'>+	writel(tmp, clk-&gt;reg);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;clk-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int plt_clk_set_parent(struct clk_hw *hw, u8 index)</div><div class='add'>+{</div><div class='add'>+	struct clk_plt *clk = to_clk_plt(hw);</div><div class='add'>+</div><div class='add'>+	plt_clk_reg_update(clk, PMC_MASK_CLK_FREQ, plt_parent_to_reg(index));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 plt_clk_get_parent(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct clk_plt *clk = to_clk_plt(hw);</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	value = readl(clk-&gt;reg);</div><div class='add'>+</div><div class='add'>+	return plt_reg_to_parent(value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int plt_clk_enable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct clk_plt *clk = to_clk_plt(hw);</div><div class='add'>+</div><div class='add'>+	plt_clk_reg_update(clk, PMC_MASK_CLK_CTL, PMC_CLK_CTL_FORCE_ON);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void plt_clk_disable(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct clk_plt *clk = to_clk_plt(hw);</div><div class='add'>+</div><div class='add'>+	plt_clk_reg_update(clk, PMC_MASK_CLK_CTL, PMC_CLK_CTL_FORCE_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int plt_clk_is_enabled(struct clk_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct clk_plt *clk = to_clk_plt(hw);</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	value = readl(clk-&gt;reg);</div><div class='add'>+</div><div class='add'>+	return plt_reg_to_enabled(value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops plt_clk_ops = {</div><div class='add'>+	.enable = plt_clk_enable,</div><div class='add'>+	.disable = plt_clk_disable,</div><div class='add'>+	.is_enabled = plt_clk_is_enabled,</div><div class='add'>+	.get_parent = plt_clk_get_parent,</div><div class='add'>+	.set_parent = plt_clk_set_parent,</div><div class='add'>+	.determine_rate = __clk_mux_determine_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id,</div><div class='add'>+					void __iomem *base,</div><div class='add'>+					const char **parent_names,</div><div class='add'>+					int num_parents)</div><div class='add'>+{</div><div class='add'>+	struct clk_plt *pclk;</div><div class='add'>+	struct clk_init_data init;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pclk = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*pclk), GFP_KERNEL);</div><div class='add'>+	if (!pclk)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	init.name =  kasprintf(GFP_KERNEL, "%s_%d", PLT_CLK_NAME_BASE, id);</div><div class='add'>+	init.ops = &amp;plt_clk_ops;</div><div class='add'>+	init.flags = 0;</div><div class='add'>+	init.parent_names = parent_names;</div><div class='add'>+	init.num_parents = num_parents;</div><div class='add'>+</div><div class='add'>+	pclk-&gt;hw.init = &amp;init;</div><div class='add'>+	pclk-&gt;reg = base + PMC_CLK_CTL_OFFSET + id * PMC_CLK_CTL_SIZE;</div><div class='add'>+	spin_lock_init(&amp;pclk-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ret = devm_clk_hw_register(&amp;pdev-&gt;dev, &amp;pclk-&gt;hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pclk = ERR_PTR(ret);</div><div class='add'>+		goto err_free_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pclk-&gt;lookup = clkdev_hw_create(&amp;pclk-&gt;hw, init.name, NULL);</div><div class='add'>+	if (!pclk-&gt;lookup) {</div><div class='add'>+		pclk = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto err_free_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_free_init:</div><div class='add'>+	kfree(init.name);</div><div class='add'>+	return pclk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void plt_clk_unregister(struct clk_plt *pclk)</div><div class='add'>+{</div><div class='add'>+	clkdev_drop(pclk-&gt;lookup);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk_plt_fixed *plt_clk_register_fixed_rate(struct platform_device *pdev,</div><div class='add'>+						 const char *name,</div><div class='add'>+						 const char *parent_name,</div><div class='add'>+						 unsigned long fixed_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_plt_fixed *pclk;</div><div class='add'>+</div><div class='add'>+	pclk = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*pclk), GFP_KERNEL);</div><div class='add'>+	if (!pclk)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	pclk-&gt;clk = clk_hw_register_fixed_rate(&amp;pdev-&gt;dev, name, parent_name,</div><div class='add'>+					       0, fixed_rate);</div><div class='add'>+	if (IS_ERR(pclk-&gt;clk))</div><div class='add'>+		return ERR_CAST(pclk-&gt;clk);</div><div class='add'>+</div><div class='add'>+	pclk-&gt;lookup = clkdev_hw_create(pclk-&gt;clk, name, NULL);</div><div class='add'>+	if (!pclk-&gt;lookup) {</div><div class='add'>+		clk_hw_unregister_fixed_rate(pclk-&gt;clk);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pclk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void plt_clk_unregister_fixed_rate(struct clk_plt_fixed *pclk)</div><div class='add'>+{</div><div class='add'>+	clkdev_drop(pclk-&gt;lookup);</div><div class='add'>+	clk_hw_unregister_fixed_rate(pclk-&gt;clk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void plt_clk_unregister_fixed_rate_loop(struct clk_plt_data *data,</div><div class='add'>+					       unsigned int i)</div><div class='add'>+{</div><div class='add'>+	while (i--)</div><div class='add'>+		plt_clk_unregister_fixed_rate(data-&gt;parents[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void plt_clk_free_parent_names_loop(const char **parent_names,</div><div class='add'>+					   unsigned int i)</div><div class='add'>+{</div><div class='add'>+	while (i--)</div><div class='add'>+		kfree_const(parent_names[i]);</div><div class='add'>+	kfree(parent_names);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void plt_clk_unregister_loop(struct clk_plt_data *data,</div><div class='add'>+				    unsigned int i)</div><div class='add'>+{</div><div class='add'>+	while (i--)</div><div class='add'>+		plt_clk_unregister(data-&gt;clks[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char **plt_clk_register_parents(struct platform_device *pdev,</div><div class='add'>+					     struct clk_plt_data *data,</div><div class='add'>+					     const struct pmc_clk *clks)</div><div class='add'>+{</div><div class='add'>+	const char **parent_names;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+	int nparents = 0;</div><div class='add'>+</div><div class='add'>+	data-&gt;nparents = 0;</div><div class='add'>+	while (clks[nparents].name)</div><div class='add'>+		nparents++;</div><div class='add'>+</div><div class='add'>+	data-&gt;parents = devm_kcalloc(&amp;pdev-&gt;dev, nparents,</div><div class='add'>+				     sizeof(*data-&gt;parents), GFP_KERNEL);</div><div class='add'>+	if (!data-&gt;parents)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	parent_names = kcalloc(nparents, sizeof(*parent_names),</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+	if (!parent_names)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nparents; i++) {</div><div class='add'>+		data-&gt;parents[i] =</div><div class='add'>+			plt_clk_register_fixed_rate(pdev, clks[i].name,</div><div class='add'>+						    clks[i].parent_name,</div><div class='add'>+						    clks[i].freq);</div><div class='add'>+		if (IS_ERR(data-&gt;parents[i])) {</div><div class='add'>+			err = PTR_ERR(data-&gt;parents[i]);</div><div class='add'>+			goto err_unreg;</div><div class='add'>+		}</div><div class='add'>+		parent_names[i] = kstrdup_const(clks[i].name, GFP_KERNEL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;nparents = nparents;</div><div class='add'>+	return parent_names;</div><div class='add'>+</div><div class='add'>+err_unreg:</div><div class='add'>+	plt_clk_unregister_fixed_rate_loop(data, i);</div><div class='add'>+	plt_clk_free_parent_names_loop(parent_names, i);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void plt_clk_unregister_parents(struct clk_plt_data *data)</div><div class='add'>+{</div><div class='add'>+	plt_clk_unregister_fixed_rate_loop(data, data-&gt;nparents);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int plt_clk_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	const struct pmc_clk_data *pmc_data;</div><div class='add'>+	const char **parent_names;</div><div class='add'>+	struct clk_plt_data *data;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pmc_data = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!pmc_data || !pmc_data-&gt;clks)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	data = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	parent_names = plt_clk_register_parents(pdev, data, pmc_data-&gt;clks);</div><div class='add'>+	if (IS_ERR(parent_names))</div><div class='add'>+		return PTR_ERR(parent_names);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PMC_CLK_NUM; i++) {</div><div class='add'>+		data-&gt;clks[i] = plt_clk_register(pdev, i, pmc_data-&gt;base,</div><div class='add'>+						 parent_names, data-&gt;nparents);</div><div class='add'>+		if (IS_ERR(data-&gt;clks[i])) {</div><div class='add'>+			err = PTR_ERR(data-&gt;clks[i]);</div><div class='add'>+			goto err_unreg_clk_plt;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plt_clk_free_parent_names_loop(parent_names, data-&gt;nparents);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, data);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unreg_clk_plt:</div><div class='add'>+	plt_clk_unregister_loop(data, i);</div><div class='add'>+	plt_clk_unregister_parents(data);</div><div class='add'>+	plt_clk_free_parent_names_loop(parent_names, data-&gt;nparents);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int plt_clk_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk_plt_data *data;</div><div class='add'>+</div><div class='add'>+	data = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	plt_clk_unregister_loop(data, PMC_CLK_NUM);</div><div class='add'>+	plt_clk_unregister_parents(data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver plt_clk_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "clk-pmc-atom",</div><div class='add'>+	},</div><div class='add'>+	.probe = plt_clk_probe,</div><div class='add'>+	.remove = plt_clk_remove,</div><div class='add'>+};</div><div class='add'>+builtin_platform_driver(plt_clk_driver);</div><div class='head'>diff --git a/drivers/clk/zte/clk-zx296718.c b/drivers/clk/zte/clk-zx296718.c<br/>index 707d62956e9b..2f7c668643fe 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/zte/clk-zx296718.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/zte/clk-zx296718.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/zte/clk-zx296718.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/zte/clk-zx296718.c</a></div><div class='hunk'>@@ -610,9 +610,12 @@ static int __init top_clocks_init(struct device_node *np)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (of_clk_add_hw_provider(np, of_clk_hw_onecell_get, &amp;top_hw_onecell_data))</div><div class='del'>-		panic("could not register clk provider\n");</div><div class='del'>-	pr_info("top clk init over, nr:%d\n", TOP_NR_CLKS);</div><div class='add'>+	ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,</div><div class='add'>+				     &amp;top_hw_onecell_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("failed to register top clk provider: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -776,9 +779,12 @@ static int __init lsp0_clocks_init(struct device_node *np)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (of_clk_add_hw_provider(np, of_clk_hw_onecell_get, &amp;lsp0_hw_onecell_data))</div><div class='del'>-		panic("could not register clk provider\n");</div><div class='del'>-	pr_info("lsp0-clk init over:%d\n", LSP0_NR_CLKS);</div><div class='add'>+	ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,</div><div class='add'>+				     &amp;lsp0_hw_onecell_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("failed to register lsp0 clk provider: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -881,9 +887,142 @@ static int __init lsp1_clocks_init(struct device_node *np)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (of_clk_add_hw_provider(np, of_clk_hw_onecell_get, &amp;lsp1_hw_onecell_data))</div><div class='del'>-		panic("could not register clk provider\n");</div><div class='del'>-	pr_info("lsp1-clk init over, nr:%d\n", LSP1_NR_CLKS);</div><div class='add'>+	ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,</div><div class='add'>+				     &amp;lsp1_hw_onecell_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("failed to register lsp1 clk provider: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+PNAME(audio_wclk_common_p) = {</div><div class='add'>+	"audio_99m",</div><div class='add'>+	"audio_24m",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+PNAME(audio_timer_p) = {</div><div class='add'>+	"audio_24m",</div><div class='add'>+	"audio_32k",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct zx_clk_mux audio_mux_clk[] = {</div><div class='add'>+	MUX(0, "i2s0_wclk_mux", audio_wclk_common_p, AUDIO_I2S0_CLK, 0, 1),</div><div class='add'>+	MUX(0, "i2s1_wclk_mux", audio_wclk_common_p, AUDIO_I2S1_CLK, 0, 1),</div><div class='add'>+	MUX(0, "i2s2_wclk_mux", audio_wclk_common_p, AUDIO_I2S2_CLK, 0, 1),</div><div class='add'>+	MUX(0, "i2s3_wclk_mux", audio_wclk_common_p, AUDIO_I2S3_CLK, 0, 1),</div><div class='add'>+	MUX(0, "i2c0_wclk_mux", audio_wclk_common_p, AUDIO_I2C0_CLK, 0, 1),</div><div class='add'>+	MUX(0, "spdif0_wclk_mux", audio_wclk_common_p, AUDIO_SPDIF0_CLK, 0, 1),</div><div class='add'>+	MUX(0, "spdif1_wclk_mux", audio_wclk_common_p, AUDIO_SPDIF1_CLK, 0, 1),</div><div class='add'>+	MUX(0, "timer_wclk_mux", audio_timer_p, AUDIO_TIMER_CLK, 0, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_zx_audio_divider audio_adiv_clk[] = {</div><div class='add'>+	AUDIO_DIV(0, "i2s0_wclk_div", "i2s0_wclk_mux", AUDIO_I2S0_DIV_CFG1),</div><div class='add'>+	AUDIO_DIV(0, "i2s1_wclk_div", "i2s1_wclk_mux", AUDIO_I2S1_DIV_CFG1),</div><div class='add'>+	AUDIO_DIV(0, "i2s2_wclk_div", "i2s2_wclk_mux", AUDIO_I2S2_DIV_CFG1),</div><div class='add'>+	AUDIO_DIV(0, "i2s3_wclk_div", "i2s3_wclk_mux", AUDIO_I2S3_DIV_CFG1),</div><div class='add'>+	AUDIO_DIV(0, "spdif0_wclk_div", "spdif0_wclk_mux", AUDIO_SPDIF0_DIV_CFG1),</div><div class='add'>+	AUDIO_DIV(0, "spdif1_wclk_div", "spdif1_wclk_mux", AUDIO_SPDIF1_DIV_CFG1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct zx_clk_div audio_div_clk[] = {</div><div class='add'>+	DIV_T(0, "tdm_wclk_div", "audio_16m384", AUDIO_TDM_CLK, 8, 4, 0, common_div_table),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct zx_clk_gate audio_gate_clk[] = {</div><div class='add'>+	GATE(AUDIO_I2S0_WCLK, "i2s0_wclk", "i2s0_wclk_div", AUDIO_I2S0_CLK, 9, CLK_SET_RATE_PARENT, 0),</div><div class='add'>+	GATE(AUDIO_I2S1_WCLK, "i2s1_wclk", "i2s1_wclk_div", AUDIO_I2S1_CLK, 9, CLK_SET_RATE_PARENT, 0),</div><div class='add'>+	GATE(AUDIO_I2S2_WCLK, "i2s2_wclk", "i2s2_wclk_div", AUDIO_I2S2_CLK, 9, CLK_SET_RATE_PARENT, 0),</div><div class='add'>+	GATE(AUDIO_I2S3_WCLK, "i2s3_wclk", "i2s3_wclk_div", AUDIO_I2S3_CLK, 9, CLK_SET_RATE_PARENT, 0),</div><div class='add'>+	GATE(AUDIO_I2S0_PCLK, "i2s0_pclk", "clk49m5", AUDIO_I2S0_CLK, 8, 0, 0),</div><div class='add'>+	GATE(AUDIO_I2S1_PCLK, "i2s1_pclk", "clk49m5", AUDIO_I2S1_CLK, 8, 0, 0),</div><div class='add'>+	GATE(AUDIO_I2S2_PCLK, "i2s2_pclk", "clk49m5", AUDIO_I2S2_CLK, 8, 0, 0),</div><div class='add'>+	GATE(AUDIO_I2S3_PCLK, "i2s3_pclk", "clk49m5", AUDIO_I2S3_CLK, 8, 0, 0),</div><div class='add'>+	GATE(AUDIO_I2C0_WCLK, "i2c0_wclk", "i2c0_wclk_mux", AUDIO_I2C0_CLK, 9, CLK_SET_RATE_PARENT, 0),</div><div class='add'>+	GATE(AUDIO_SPDIF0_WCLK, "spdif0_wclk", "spdif0_wclk_div", AUDIO_SPDIF0_CLK, 9, CLK_SET_RATE_PARENT, 0),</div><div class='add'>+	GATE(AUDIO_SPDIF1_WCLK, "spdif1_wclk", "spdif1_wclk_div", AUDIO_SPDIF1_CLK, 9, CLK_SET_RATE_PARENT, 0),</div><div class='add'>+	GATE(AUDIO_TDM_WCLK, "tdm_wclk", "tdm_wclk_div", AUDIO_TDM_CLK, 17, CLK_SET_RATE_PARENT, 0),</div><div class='add'>+	GATE(AUDIO_TS_PCLK, "tempsensor_pclk", "clk49m5", AUDIO_TS_CLK, 1, 0, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_hw_onecell_data audio_hw_onecell_data = {</div><div class='add'>+	.num = AUDIO_NR_CLKS,</div><div class='add'>+	.hws = {</div><div class='add'>+		[AUDIO_NR_CLKS - 1] = NULL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init audio_clocks_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	void __iomem *reg_base;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	reg_base = of_iomap(np, 0);</div><div class='add'>+	if (!reg_base) {</div><div class='add'>+		pr_err("%s: Unable to map audio clk base\n", __func__);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(audio_mux_clk); i++) {</div><div class='add'>+		if (audio_mux_clk[i].id)</div><div class='add'>+			audio_hw_onecell_data.hws[audio_mux_clk[i].id] =</div><div class='add'>+					&amp;audio_mux_clk[i].mux.hw;</div><div class='add'>+</div><div class='add'>+		audio_mux_clk[i].mux.reg += (uintptr_t)reg_base;</div><div class='add'>+		ret = clk_hw_register(NULL, &amp;audio_mux_clk[i].mux.hw);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_warn("audio clk %s init error!\n",</div><div class='add'>+				audio_mux_clk[i].mux.hw.init-&gt;name);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(audio_adiv_clk); i++) {</div><div class='add'>+		if (audio_adiv_clk[i].id)</div><div class='add'>+			audio_hw_onecell_data.hws[audio_adiv_clk[i].id] =</div><div class='add'>+					&amp;audio_adiv_clk[i].hw;</div><div class='add'>+</div><div class='add'>+		audio_adiv_clk[i].reg_base += (uintptr_t)reg_base;</div><div class='add'>+		ret = clk_hw_register(NULL, &amp;audio_adiv_clk[i].hw);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_warn("audio clk %s init error!\n",</div><div class='add'>+				audio_adiv_clk[i].hw.init-&gt;name);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(audio_div_clk); i++) {</div><div class='add'>+		if (audio_div_clk[i].id)</div><div class='add'>+			audio_hw_onecell_data.hws[audio_div_clk[i].id] =</div><div class='add'>+					&amp;audio_div_clk[i].div.hw;</div><div class='add'>+</div><div class='add'>+		audio_div_clk[i].div.reg += (uintptr_t)reg_base;</div><div class='add'>+		ret = clk_hw_register(NULL, &amp;audio_div_clk[i].div.hw);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_warn("audio clk %s init error!\n",</div><div class='add'>+				audio_div_clk[i].div.hw.init-&gt;name);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(audio_gate_clk); i++) {</div><div class='add'>+		if (audio_gate_clk[i].id)</div><div class='add'>+			audio_hw_onecell_data.hws[audio_gate_clk[i].id] =</div><div class='add'>+					&amp;audio_gate_clk[i].gate.hw;</div><div class='add'>+</div><div class='add'>+		audio_gate_clk[i].gate.reg += (uintptr_t)reg_base;</div><div class='add'>+		ret = clk_hw_register(NULL, &amp;audio_gate_clk[i].gate.hw);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_warn("audio clk %s init error!\n",</div><div class='add'>+				audio_gate_clk[i].gate.hw.init-&gt;name);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,</div><div class='add'>+				     &amp;audio_hw_onecell_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("failed to register audio clk provider: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -892,6 +1031,7 @@ static const struct of_device_id zx_clkc_match_table[] = {</div><div class='ctx'> 	{ .compatible = "zte,zx296718-topcrm", .data = &amp;top_clocks_init },</div><div class='ctx'> 	{ .compatible = "zte,zx296718-lsp0crm", .data = &amp;lsp0_clocks_init },</div><div class='ctx'> 	{ .compatible = "zte,zx296718-lsp1crm", .data = &amp;lsp1_clocks_init },</div><div class='add'>+	{ .compatible = "zte,zx296718-audiocrm", .data = &amp;audio_clocks_init },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clk/zte/clk.c b/drivers/clk/zte/clk.c<br/>index c4c1251bc1e7..878d879b23ff 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/zte/clk.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/zte/clk.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/zte/clk.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/zte/clk.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/gcd.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/iopoll.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -310,3 +311,129 @@ struct clk *clk_register_zx_audio(const char *name,</div><div class='ctx'> </div><div class='ctx'> 	return clk;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#define CLK_AUDIO_DIV_FRAC	BIT(0)</div><div class='add'>+#define CLK_AUDIO_DIV_INT	BIT(1)</div><div class='add'>+#define CLK_AUDIO_DIV_UNCOMMON	BIT(1)</div><div class='add'>+</div><div class='add'>+#define CLK_AUDIO_DIV_FRAC_NSHIFT	16</div><div class='add'>+#define CLK_AUDIO_DIV_INT_FRAC_RE	BIT(16)</div><div class='add'>+#define CLK_AUDIO_DIV_INT_FRAC_MAX	(0xffff)</div><div class='add'>+#define CLK_AUDIO_DIV_INT_FRAC_MIN	(0x2)</div><div class='add'>+#define CLK_AUDIO_DIV_INT_INT_SHIFT	24</div><div class='add'>+#define CLK_AUDIO_DIV_INT_INT_WIDTH	4</div><div class='add'>+</div><div class='add'>+struct zx_clk_audio_div_table {</div><div class='add'>+	unsigned long rate;</div><div class='add'>+	unsigned int int_reg;</div><div class='add'>+	unsigned int frac_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_clk_zx_audio_div(_hw) container_of(_hw, struct clk_zx_audio_divider, hw)</div><div class='add'>+</div><div class='add'>+static unsigned long audio_calc_rate(struct clk_zx_audio_divider *audio_div,</div><div class='add'>+				     u32 reg_frac, u32 reg_int,</div><div class='add'>+				     unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long rate, m, n;</div><div class='add'>+</div><div class='add'>+	m = reg_frac &amp; 0xffff;</div><div class='add'>+	n = (reg_frac &gt;&gt; 16) &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+	m = (reg_int &amp; 0xffff) * n + m;</div><div class='add'>+	rate = (parent_rate * n) / m;</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void audio_calc_reg(struct clk_zx_audio_divider *audio_div,</div><div class='add'>+			   struct zx_clk_audio_div_table *div_table,</div><div class='add'>+			   unsigned long rate, unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg_int, reg_frac;</div><div class='add'>+	unsigned long m, n, div;</div><div class='add'>+</div><div class='add'>+	reg_int = parent_rate / rate;</div><div class='add'>+</div><div class='add'>+	if (reg_int &gt; CLK_AUDIO_DIV_INT_FRAC_MAX)</div><div class='add'>+		reg_int = CLK_AUDIO_DIV_INT_FRAC_MAX;</div><div class='add'>+	else if (reg_int &lt; CLK_AUDIO_DIV_INT_FRAC_MIN)</div><div class='add'>+		reg_int = 0;</div><div class='add'>+	m = parent_rate - rate * reg_int;</div><div class='add'>+	n = rate;</div><div class='add'>+</div><div class='add'>+	div = gcd(m, n);</div><div class='add'>+	m = m / div;</div><div class='add'>+	n = n / div;</div><div class='add'>+</div><div class='add'>+	if ((m &gt;&gt; 16) || (n &gt;&gt; 16)) {</div><div class='add'>+		if (m &gt; n) {</div><div class='add'>+			n = n * 0xffff / m;</div><div class='add'>+			m = 0xffff;</div><div class='add'>+		} else {</div><div class='add'>+			m = m * 0xffff / n;</div><div class='add'>+			n = 0xffff;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	reg_frac = m | (n &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	div_table-&gt;rate = parent_rate * n / (reg_int * n + m);</div><div class='add'>+	div_table-&gt;int_reg = reg_int;</div><div class='add'>+	div_table-&gt;frac_reg = reg_frac;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long zx_audio_div_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					  unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_zx_audio_divider *zx_audio_div = to_clk_zx_audio_div(hw);</div><div class='add'>+	u32 reg_frac, reg_int;</div><div class='add'>+</div><div class='add'>+	reg_frac = readl_relaxed(zx_audio_div-&gt;reg_base);</div><div class='add'>+	reg_int = readl_relaxed(zx_audio_div-&gt;reg_base + 0x4);</div><div class='add'>+</div><div class='add'>+	return audio_calc_rate(zx_audio_div, reg_frac, reg_int, parent_rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long zx_audio_div_round_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				unsigned long *prate)</div><div class='add'>+{</div><div class='add'>+	struct clk_zx_audio_divider *zx_audio_div = to_clk_zx_audio_div(hw);</div><div class='add'>+	struct zx_clk_audio_div_table divt;</div><div class='add'>+</div><div class='add'>+	audio_calc_reg(zx_audio_div, &amp;divt, rate, *prate);</div><div class='add'>+</div><div class='add'>+	return audio_calc_rate(zx_audio_div, divt.frac_reg, divt.int_reg, *prate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zx_audio_div_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				    unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_zx_audio_divider *zx_audio_div = to_clk_zx_audio_div(hw);</div><div class='add'>+	struct zx_clk_audio_div_table divt;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	audio_calc_reg(zx_audio_div, &amp;divt, rate, parent_rate);</div><div class='add'>+	if (divt.rate != rate)</div><div class='add'>+		pr_debug("the real rate is:%ld", divt.rate);</div><div class='add'>+</div><div class='add'>+	writel_relaxed(divt.frac_reg, zx_audio_div-&gt;reg_base);</div><div class='add'>+</div><div class='add'>+	val = readl_relaxed(zx_audio_div-&gt;reg_base + 0x4);</div><div class='add'>+	val &amp;= ~0xffff;</div><div class='add'>+	val |= divt.int_reg | CLK_AUDIO_DIV_INT_FRAC_RE;</div><div class='add'>+	writel_relaxed(val, zx_audio_div-&gt;reg_base + 0x4);</div><div class='add'>+</div><div class='add'>+	mdelay(1);</div><div class='add'>+</div><div class='add'>+	val = readl_relaxed(zx_audio_div-&gt;reg_base + 0x4);</div><div class='add'>+	val &amp;= ~CLK_AUDIO_DIV_INT_FRAC_RE;</div><div class='add'>+	writel_relaxed(val, zx_audio_div-&gt;reg_base + 0x4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct clk_ops zx_audio_div_ops = {</div><div class='add'>+	.recalc_rate = zx_audio_div_recalc_rate,</div><div class='add'>+	.round_rate = zx_audio_div_round_rate,</div><div class='add'>+	.set_rate = zx_audio_div_set_rate,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/clk/zte/clk.h b/drivers/clk/zte/clk.h<br/>index 0df3474b2cf3..84a55a3e2bd4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clk/zte/clk.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clk/zte/clk.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clk/zte/clk.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clk/zte/clk.h</a></div><div class='hunk'>@@ -153,6 +153,25 @@ struct zx_clk_div {</div><div class='ctx'> 	.id = _id,							\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct clk_zx_audio_divider {</div><div class='add'>+	struct clk_hw				hw;</div><div class='add'>+	void __iomem				*reg_base;</div><div class='add'>+	unsigned int				rate_count;</div><div class='add'>+	spinlock_t				*lock;</div><div class='add'>+	u16					id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AUDIO_DIV(_id, _name, _parent, _reg)				\</div><div class='add'>+{									\</div><div class='add'>+	.reg_base	= (void __iomem *) _reg,			\</div><div class='add'>+	.lock		= &amp;clk_lock,					\</div><div class='add'>+	.hw.init	= CLK_HW_INIT(_name,				\</div><div class='add'>+				      _parent,				\</div><div class='add'>+				      &amp;zx_audio_div_ops,		\</div><div class='add'>+				      0),				\</div><div class='add'>+	.id = _id,							\</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct clk *clk_register_zx_pll(const char *name, const char *parent_name,</div><div class='ctx'> 	unsigned long flags, void __iomem *reg_base,</div><div class='ctx'> 	const struct zx_pll_config *lookup_table, int count, spinlock_t *lock);</div><div class='hunk'>@@ -167,4 +186,6 @@ struct clk *clk_register_zx_audio(const char *name,</div><div class='ctx'> 				  unsigned long flags, void __iomem *reg_base);</div><div class='ctx'> </div><div class='ctx'> extern const struct clk_ops zx_pll_ops;</div><div class='add'>+extern const struct clk_ops zx_audio_div_ops;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig<br/>index e2c6e43cf8ca..3356ab821624 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/Kconfig</a></div><div class='hunk'>@@ -5,6 +5,10 @@ config CLKSRC_OF</div><div class='ctx'> 	bool</div><div class='ctx'> 	select CLKSRC_PROBE</div><div class='ctx'> </div><div class='add'>+config CLKEVT_OF</div><div class='add'>+	bool</div><div class='add'>+	select CLKEVT_PROBE</div><div class='add'>+</div><div class='ctx'> config CLKSRC_ACPI</div><div class='ctx'> 	bool</div><div class='ctx'> 	select CLKSRC_PROBE</div><div class='hunk'>@@ -12,6 +16,9 @@ config CLKSRC_ACPI</div><div class='ctx'> config CLKSRC_PROBE</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config CLKEVT_PROBE</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config CLKSRC_I8253</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -60,6 +67,16 @@ config DW_APB_TIMER_OF</div><div class='ctx'> 	select DW_APB_TIMER</div><div class='ctx'> 	select CLKSRC_OF</div><div class='ctx'> </div><div class='add'>+config GEMINI_TIMER</div><div class='add'>+	bool "Cortina Gemini timer driver" if COMPILE_TEST</div><div class='add'>+	depends on GENERIC_CLOCKEVENTS</div><div class='add'>+	depends on HAS_IOMEM</div><div class='add'>+	select CLKSRC_MMIO</div><div class='add'>+	select CLKSRC_OF</div><div class='add'>+	select MFD_SYSCON</div><div class='add'>+	help</div><div class='add'>+	  Enables support for the Gemini timer</div><div class='add'>+</div><div class='ctx'> config ROCKCHIP_TIMER</div><div class='ctx'> 	bool "Rockchip timer driver" if COMPILE_TEST</div><div class='ctx'> 	depends on ARM || ARM64</div><div class='hunk'>@@ -282,6 +299,26 @@ config CLKSRC_MPS2</div><div class='ctx'> 	select CLKSRC_MMIO</div><div class='ctx'> 	select CLKSRC_OF</div><div class='ctx'> </div><div class='add'>+config ARC_TIMERS</div><div class='add'>+	bool "Support for 32-bit TIMERn counters in ARC Cores" if COMPILE_TEST</div><div class='add'>+	depends on GENERIC_CLOCKEVENTS</div><div class='add'>+	select CLKSRC_OF</div><div class='add'>+	help</div><div class='add'>+	  These are legacy 32-bit TIMER0 and TIMER1 counters found on all ARC cores</div><div class='add'>+	  (ARC700 as well as ARC HS38).</div><div class='add'>+	  TIMER0 serves as clockevent while TIMER1 provides clocksource</div><div class='add'>+</div><div class='add'>+config ARC_TIMERS_64BIT</div><div class='add'>+	bool "Support for 64-bit counters in ARC HS38 cores" if COMPILE_TEST</div><div class='add'>+	depends on GENERIC_CLOCKEVENTS</div><div class='add'>+	depends on ARC_TIMERS</div><div class='add'>+	select CLKSRC_OF</div><div class='add'>+	help</div><div class='add'>+	  This enables 2 different 64-bit timers: RTC (for UP) and GFRC (for SMP)</div><div class='add'>+	  RTC is implemented inside the core, while GFRC sits outside the core in</div><div class='add'>+	  ARConnect IP block. Driver automatically picks one of them for clocksource</div><div class='add'>+	  as appropriate.</div><div class='add'>+</div><div class='ctx'> config ARM_ARCH_TIMER</div><div class='ctx'> 	bool</div><div class='ctx'> 	select CLKSRC_OF if OF</div><div class='hunk'>@@ -305,16 +342,30 @@ config ARM_ARCH_TIMER_EVTSTREAM</div><div class='ctx'> 	  This must be disabled for hardware validation purposes to detect any</div><div class='ctx'> 	  hardware anomalies of missing events.</div><div class='ctx'> </div><div class='add'>+config ARM_ARCH_TIMER_OOL_WORKAROUND</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config FSL_ERRATUM_A008585</div><div class='ctx'> 	bool "Workaround for Freescale/NXP Erratum A-008585"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on ARM_ARCH_TIMER &amp;&amp; ARM64</div><div class='add'>+	select ARM_ARCH_TIMER_OOL_WORKAROUND</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables a workaround for Freescale/NXP Erratum</div><div class='ctx'> 	  A-008585 ("ARM generic timer may contain an erroneous</div><div class='ctx'> 	  value").  The workaround will only be active if the</div><div class='ctx'> 	  fsl,erratum-a008585 property is found in the timer node.</div><div class='ctx'> </div><div class='add'>+config HISILICON_ERRATUM_161010101</div><div class='add'>+	bool "Workaround for Hisilicon Erratum 161010101"</div><div class='add'>+	default y</div><div class='add'>+	select ARM_ARCH_TIMER_OOL_WORKAROUND</div><div class='add'>+	depends on ARM_ARCH_TIMER &amp;&amp; ARM64</div><div class='add'>+	help</div><div class='add'>+	  This option enables a workaround for Hisilicon Erratum</div><div class='add'>+	  161010101. The workaround will be active if the hisilicon,erratum-161010101</div><div class='add'>+	  property is found in the timer node.</div><div class='add'>+</div><div class='ctx'> config ARM_GLOBAL_TIMER</div><div class='ctx'> 	bool "Support for the ARM global timer" if COMPILE_TEST</div><div class='ctx'> 	select CLKSRC_OF if OF</div><div class='hunk'>@@ -447,6 +498,13 @@ config SH_TIMER_MTU2</div><div class='ctx'> 	  Timer Pulse Unit 2 (MTU2) hardware available on SoCs from Renesas.</div><div class='ctx'> 	  This hardware comes with 16 bit-timer registers.</div><div class='ctx'> </div><div class='add'>+config RENESAS_OSTM</div><div class='add'>+	bool "Renesas OSTM timer driver" if COMPILE_TEST</div><div class='add'>+	depends on GENERIC_CLOCKEVENTS</div><div class='add'>+	select CLKSRC_MMIO</div><div class='add'>+	help</div><div class='add'>+	  Enables the support for the Renesas OSTM.</div><div class='add'>+</div><div class='ctx'> config SH_TIMER_TMU</div><div class='ctx'> 	bool "Renesas TMU timer driver" if COMPILE_TEST</div><div class='ctx'> 	depends on GENERIC_CLOCKEVENTS</div><div class='head'>diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile<br/>index cf87f407f1ad..d227d1314f14 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/Makefile</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> obj-$(CONFIG_CLKSRC_PROBE)	+= clksrc-probe.o</div><div class='add'>+obj-$(CONFIG_CLKEVT_PROBE)	+= clkevt-probe.o</div><div class='ctx'> obj-$(CONFIG_ATMEL_PIT)		+= timer-atmel-pit.o</div><div class='ctx'> obj-$(CONFIG_ATMEL_ST)		+= timer-atmel-st.o</div><div class='ctx'> obj-$(CONFIG_ATMEL_TCB_CLKSRC)	+= tcb_clksrc.o</div><div class='hunk'>@@ -8,6 +9,7 @@ obj-$(CONFIG_CS5535_CLOCK_EVENT_SRC)	+= cs5535-clockevt.o</div><div class='ctx'> obj-$(CONFIG_CLKSRC_JCORE_PIT)		+= jcore-pit.o</div><div class='ctx'> obj-$(CONFIG_SH_TIMER_CMT)	+= sh_cmt.o</div><div class='ctx'> obj-$(CONFIG_SH_TIMER_MTU2)	+= sh_mtu2.o</div><div class='add'>+obj-$(CONFIG_RENESAS_OSTM)	+= renesas-ostm.o</div><div class='ctx'> obj-$(CONFIG_SH_TIMER_TMU)	+= sh_tmu.o</div><div class='ctx'> obj-$(CONFIG_EM_TIMER_STI)	+= em_sti.o</div><div class='ctx'> obj-$(CONFIG_CLKBLD_I8253)	+= i8253.o</div><div class='hunk'>@@ -15,6 +17,7 @@ obj-$(CONFIG_CLKSRC_MMIO)	+= mmio.o</div><div class='ctx'> obj-$(CONFIG_DIGICOLOR_TIMER)	+= timer-digicolor.o</div><div class='ctx'> obj-$(CONFIG_DW_APB_TIMER)	+= dw_apb_timer.o</div><div class='ctx'> obj-$(CONFIG_DW_APB_TIMER_OF)	+= dw_apb_timer_of.o</div><div class='add'>+obj-$(CONFIG_GEMINI_TIMER)	+= timer-gemini.o</div><div class='ctx'> obj-$(CONFIG_ROCKCHIP_TIMER)      += rockchip_timer.o</div><div class='ctx'> obj-$(CONFIG_CLKSRC_NOMADIK_MTU)	+= nomadik-mtu.o</div><div class='ctx'> obj-$(CONFIG_CLKSRC_DBX500_PRCMU)	+= clksrc-dbx500-prcmu.o</div><div class='hunk'>@@ -51,6 +54,7 @@ obj-$(CONFIG_CLKSRC_TI_32K)	+= timer-ti-32k.o</div><div class='ctx'> obj-$(CONFIG_CLKSRC_NPS)	+= timer-nps.o</div><div class='ctx'> obj-$(CONFIG_OXNAS_RPS_TIMER)	+= timer-oxnas-rps.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_ARC_TIMERS)		+= arc_timer.o</div><div class='ctx'> obj-$(CONFIG_ARM_ARCH_TIMER)		+= arm_arch_timer.o</div><div class='ctx'> obj-$(CONFIG_ARM_GLOBAL_TIMER)		+= arm_global_timer.o</div><div class='ctx'> obj-$(CONFIG_ARMV7M_SYSTICK)		+= armv7m_systick.o</div><div class='head'>diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c<br/>index 28037d0b8dcd..1961e3539b57 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/acpi_pm.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/acpi_pm.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/acpi_pm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/acpi_pm.c</a></div><div class='hunk'>@@ -58,16 +58,16 @@ u32 acpi_pm_read_verified(void)</div><div class='ctx'> 	return v2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t acpi_pm_read(struct clocksource *cs)</div><div class='add'>+static u64 acpi_pm_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)read_pmtmr();</div><div class='add'>+	return (u64)read_pmtmr();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource clocksource_acpi_pm = {</div><div class='ctx'> 	.name		= "acpi_pm",</div><div class='ctx'> 	.rating		= 200,</div><div class='ctx'> 	.read		= acpi_pm_read,</div><div class='del'>-	.mask		= (cycle_t)ACPI_PM_MASK,</div><div class='add'>+	.mask		= (u64)ACPI_PM_MASK,</div><div class='ctx'> 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -81,9 +81,9 @@ static int __init acpi_pm_good_setup(char *__str)</div><div class='ctx'> }</div><div class='ctx'> __setup("acpi_pm_good", acpi_pm_good_setup);</div><div class='ctx'> </div><div class='del'>-static cycle_t acpi_pm_read_slow(struct clocksource *cs)</div><div class='add'>+static u64 acpi_pm_read_slow(struct clocksource *cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)acpi_pm_read_verified();</div><div class='add'>+	return (u64)acpi_pm_read_verified();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void acpi_pm_need_workaround(void)</div><div class='hunk'>@@ -145,7 +145,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,</div><div class='ctx'>  */</div><div class='ctx'> static int verify_pmtmr_rate(void)</div><div class='ctx'> {</div><div class='del'>-	cycle_t value1, value2;</div><div class='add'>+	u64 value1, value2;</div><div class='ctx'> 	unsigned long count, delta;</div><div class='ctx'> </div><div class='ctx'> 	mach_prepare_counter();</div><div class='hunk'>@@ -175,7 +175,7 @@ static int verify_pmtmr_rate(void)</div><div class='ctx'> </div><div class='ctx'> static int __init init_acpi_pm_clocksource(void)</div><div class='ctx'> {</div><div class='del'>-	cycle_t value1, value2;</div><div class='add'>+	u64 value1, value2;</div><div class='ctx'> 	unsigned int i, j = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!pmtmr_ioport)</div><div class='head'>diff --git a/drivers/clocksource/arc_timer.c b/drivers/clocksource/arc_timer.c<br/>new file mode 100644<br/>index 000000000000..7517f959cba7<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/arc_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/arc_timer.c</a></div><div class='hunk'>@@ -0,0 +1,336 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016-17 Synopsys, Inc. (www.synopsys.com)</div><div class='add'>+ * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* ARC700 has two 32bit independent prog Timers: TIMER0 and TIMER1, Each can be</div><div class='add'>+ * programmed to go from @count to @limit and optionally interrupt.</div><div class='add'>+ * We've designated TIMER0 for clockevents and TIMER1 for clocksource</div><div class='add'>+ *</div><div class='add'>+ * ARCv2 based HS38 cores have RTC (in-core) and GFRC (inside ARConnect/MCIP)</div><div class='add'>+ * which are suitable for UP and SMP based clocksources respectively</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/clockchips.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;soc/arc/timers.h&gt;</div><div class='add'>+#include &lt;soc/arc/mcip.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned long arc_timer_freq;</div><div class='add'>+</div><div class='add'>+static int noinline arc_get_timer_clk(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	clk = of_clk_get(node, 0);</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		pr_err("timer missing clk");</div><div class='add'>+		return PTR_ERR(clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Couldn't enable parent clk\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arc_timer_freq = clk_get_rate(clk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/********** Clock Source Device *********/</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARC_TIMERS_64BIT</div><div class='add'>+</div><div class='add'>+static u64 arc_read_gfrc(struct clocksource *cs)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 l, h;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	__mcip_cmd(CMD_GFRC_READ_LO, 0);</div><div class='add'>+	l = read_aux_reg(ARC_REG_MCIP_READBACK);</div><div class='add'>+</div><div class='add'>+	__mcip_cmd(CMD_GFRC_READ_HI, 0);</div><div class='add'>+	h = read_aux_reg(ARC_REG_MCIP_READBACK);</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return (((u64)h) &lt;&lt; 32) | l;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource arc_counter_gfrc = {</div><div class='add'>+	.name   = "ARConnect GFRC",</div><div class='add'>+	.rating = 400,</div><div class='add'>+	.read   = arc_read_gfrc,</div><div class='add'>+	.mask   = CLOCKSOURCE_MASK(64),</div><div class='add'>+	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init arc_cs_setup_gfrc(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct mcip_bcr mp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	READ_BCR(ARC_REG_MCIP_BCR, mp);</div><div class='add'>+	if (!mp.gfrc) {</div><div class='add'>+		pr_warn("Global-64-bit-Ctr clocksource not detected");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = arc_get_timer_clk(node);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return clocksource_register_hz(&amp;arc_counter_gfrc, arc_timer_freq);</div><div class='add'>+}</div><div class='add'>+CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc);</div><div class='add'>+</div><div class='add'>+#define AUX_RTC_CTRL	0x103</div><div class='add'>+#define AUX_RTC_LOW	0x104</div><div class='add'>+#define AUX_RTC_HIGH	0x105</div><div class='add'>+</div><div class='add'>+static u64 arc_read_rtc(struct clocksource *cs)</div><div class='add'>+{</div><div class='add'>+	unsigned long status;</div><div class='add'>+	u32 l, h;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * hardware has an internal state machine which tracks readout of</div><div class='add'>+	 * low/high and updates the CTRL.status if</div><div class='add'>+	 *  - interrupt/exception taken between the two reads</div><div class='add'>+	 *  - high increments after low has been read</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		l = read_aux_reg(AUX_RTC_LOW);</div><div class='add'>+		h = read_aux_reg(AUX_RTC_HIGH);</div><div class='add'>+		status = read_aux_reg(AUX_RTC_CTRL);</div><div class='add'>+	} while (!(status &amp; _BITUL(31)));</div><div class='add'>+</div><div class='add'>+	return (((u64)h) &lt;&lt; 32) | l;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource arc_counter_rtc = {</div><div class='add'>+	.name   = "ARCv2 RTC",</div><div class='add'>+	.rating = 350,</div><div class='add'>+	.read   = arc_read_rtc,</div><div class='add'>+	.mask   = CLOCKSOURCE_MASK(64),</div><div class='add'>+	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init arc_cs_setup_rtc(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct bcr_timer timer;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	READ_BCR(ARC_REG_TIMERS_BCR, timer);</div><div class='add'>+	if (!timer.rtc) {</div><div class='add'>+		pr_warn("Local-64-bit-Ctr clocksource not detected");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Local to CPU hence not usable in SMP */</div><div class='add'>+	if (IS_ENABLED(CONFIG_SMP)) {</div><div class='add'>+		pr_warn("Local-64-bit-Ctr not usable in SMP");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = arc_get_timer_clk(node);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	write_aux_reg(AUX_RTC_CTRL, 1);</div><div class='add'>+</div><div class='add'>+	return clocksource_register_hz(&amp;arc_counter_rtc, arc_timer_freq);</div><div class='add'>+}</div><div class='add'>+CLOCKSOURCE_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 32bit TIMER1 to keep counting monotonically and wraparound</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static u64 arc_read_timer1(struct clocksource *cs)</div><div class='add'>+{</div><div class='add'>+	return (u64) read_aux_reg(ARC_REG_TIMER1_CNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource arc_counter_timer1 = {</div><div class='add'>+	.name   = "ARC Timer1",</div><div class='add'>+	.rating = 300,</div><div class='add'>+	.read   = arc_read_timer1,</div><div class='add'>+	.mask   = CLOCKSOURCE_MASK(32),</div><div class='add'>+	.flags  = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init arc_cs_setup_timer1(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Local to CPU hence not usable in SMP */</div><div class='add'>+	if (IS_ENABLED(CONFIG_SMP))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = arc_get_timer_clk(node);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	write_aux_reg(ARC_REG_TIMER1_LIMIT, ARC_TIMERN_MAX);</div><div class='add'>+	write_aux_reg(ARC_REG_TIMER1_CNT, 0);</div><div class='add'>+	write_aux_reg(ARC_REG_TIMER1_CTRL, TIMER_CTRL_NH);</div><div class='add'>+</div><div class='add'>+	return clocksource_register_hz(&amp;arc_counter_timer1, arc_timer_freq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/********** Clock Event Device *********/</div><div class='add'>+</div><div class='add'>+static int arc_timer_irq;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Arm the timer to interrupt after @cycles</div><div class='add'>+ * The distinction for oneshot/periodic is done in arc_event_timer_ack() below</div><div class='add'>+ */</div><div class='add'>+static void arc_timer_event_setup(unsigned int cycles)</div><div class='add'>+{</div><div class='add'>+	write_aux_reg(ARC_REG_TIMER0_LIMIT, cycles);</div><div class='add'>+	write_aux_reg(ARC_REG_TIMER0_CNT, 0);	/* start from 0 */</div><div class='add'>+</div><div class='add'>+	write_aux_reg(ARC_REG_TIMER0_CTRL, TIMER_CTRL_IE | TIMER_CTRL_NH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int arc_clkevent_set_next_event(unsigned long delta,</div><div class='add'>+				       struct clock_event_device *dev)</div><div class='add'>+{</div><div class='add'>+	arc_timer_event_setup(delta);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int arc_clkevent_set_periodic(struct clock_event_device *dev)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * At X Hz, 1 sec = 1000ms -&gt; X cycles;</div><div class='add'>+	 *		      10ms -&gt; X / 100 cycles</div><div class='add'>+	 */</div><div class='add'>+	arc_timer_event_setup(arc_timer_freq / HZ);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct clock_event_device, arc_clockevent_device) = {</div><div class='add'>+	.name			= "ARC Timer0",</div><div class='add'>+	.features		= CLOCK_EVT_FEAT_ONESHOT |</div><div class='add'>+				  CLOCK_EVT_FEAT_PERIODIC,</div><div class='add'>+	.rating			= 300,</div><div class='add'>+	.set_next_event		= arc_clkevent_set_next_event,</div><div class='add'>+	.set_state_periodic	= arc_clkevent_set_periodic,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t timer_irq_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Note that generic IRQ core could have passed @evt for @dev_id if</div><div class='add'>+	 * irq_set_chip_and_handler() asked for handle_percpu_devid_irq()</div><div class='add'>+	 */</div><div class='add'>+	struct clock_event_device *evt = this_cpu_ptr(&amp;arc_clockevent_device);</div><div class='add'>+	int irq_reenable = clockevent_state_periodic(evt);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Any write to CTRL reg ACks the interrupt, we rewrite the</div><div class='add'>+	 * Count when [N]ot [H]alted bit.</div><div class='add'>+	 * And re-arm it if perioid by [I]nterrupt [E]nable bit</div><div class='add'>+	 */</div><div class='add'>+	write_aux_reg(ARC_REG_TIMER0_CTRL, irq_reenable | TIMER_CTRL_NH);</div><div class='add'>+</div><div class='add'>+	evt-&gt;event_handler(evt);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int arc_timer_starting_cpu(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct clock_event_device *evt = this_cpu_ptr(&amp;arc_clockevent_device);</div><div class='add'>+</div><div class='add'>+	evt-&gt;cpumask = cpumask_of(smp_processor_id());</div><div class='add'>+</div><div class='add'>+	clockevents_config_and_register(evt, arc_timer_freq, 0, ARC_TIMERN_MAX);</div><div class='add'>+	enable_percpu_irq(arc_timer_irq, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int arc_timer_dying_cpu(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	disable_percpu_irq(arc_timer_irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * clockevent setup for boot CPU</div><div class='add'>+ */</div><div class='add'>+static int __init arc_clockevent_setup(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct clock_event_device *evt = this_cpu_ptr(&amp;arc_clockevent_device);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	arc_timer_irq = irq_of_parse_and_map(node, 0);</div><div class='add'>+	if (arc_timer_irq &lt;= 0) {</div><div class='add'>+		pr_err("clockevent: missing irq");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = arc_get_timer_clk(node);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("clockevent: missing clk");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Needs apriori irq_set_percpu_devid() done in intc map function */</div><div class='add'>+	ret = request_percpu_irq(arc_timer_irq, timer_irq_handler,</div><div class='add'>+				 "Timer0 (per-cpu-tick)", evt);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("clockevent: unable to request irq\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_ARC_TIMER_STARTING,</div><div class='add'>+				"clockevents/arc/timer:starting",</div><div class='add'>+				arc_timer_starting_cpu,</div><div class='add'>+				arc_timer_dying_cpu);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Failed to setup hotplug state");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init arc_of_timer_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	static int init_count = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!init_count) {</div><div class='add'>+		init_count = 1;</div><div class='add'>+		ret = arc_clockevent_setup(np);</div><div class='add'>+	} else {</div><div class='add'>+		ret = arc_cs_setup_timer1(np);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+CLOCKSOURCE_OF_DECLARE(arc_clkevt, "snps,arc-timer", arc_of_timer_init);</div><div class='head'>diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c<br/>index 73c487da6d2a..7a8a4117f123 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/arm_arch_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/arm_arch_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/arm_arch_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/arm_arch_timer.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/sched_clock.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -81,6 +82,7 @@ static struct clock_event_device __percpu *arch_timer_evt;</div><div class='ctx'> static enum ppi_nr arch_timer_uses_ppi = VIRT_PPI;</div><div class='ctx'> static bool arch_timer_c3stop;</div><div class='ctx'> static bool arch_timer_mem_use_virtual;</div><div class='add'>+static bool arch_counter_suspend_stop;</div><div class='ctx'> </div><div class='ctx'> static bool evtstrm_enable = IS_ENABLED(CONFIG_ARM_ARCH_TIMER_EVTSTREAM);</div><div class='ctx'> </div><div class='hunk'>@@ -95,41 +97,107 @@ early_param("clocksource.arm_arch_timer.evtstrm", early_evtstrm_cfg);</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FSL_ERRATUM_A008585</div><div class='del'>-DEFINE_STATIC_KEY_FALSE(arch_timer_read_ool_enabled);</div><div class='del'>-EXPORT_SYMBOL_GPL(arch_timer_read_ool_enabled);</div><div class='del'>-</div><div class='del'>-static int fsl_a008585_enable = -1;</div><div class='del'>-</div><div class='del'>-static int __init early_fsl_a008585_cfg(char *buf)</div><div class='add'>+/*</div><div class='add'>+ * The number of retries is an arbitrary value well beyond the highest number</div><div class='add'>+ * of iterations the loop has been observed to take.</div><div class='add'>+ */</div><div class='add'>+#define __fsl_a008585_read_reg(reg) ({			\</div><div class='add'>+	u64 _old, _new;					\</div><div class='add'>+	int _retries = 200;				\</div><div class='add'>+							\</div><div class='add'>+	do {						\</div><div class='add'>+		_old = read_sysreg(reg);		\</div><div class='add'>+		_new = read_sysreg(reg);		\</div><div class='add'>+		_retries--;				\</div><div class='add'>+	} while (unlikely(_old != _new) &amp;&amp; _retries);	\</div><div class='add'>+							\</div><div class='add'>+	WARN_ON_ONCE(!_retries);			\</div><div class='add'>+	_new;						\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static u32 notrace fsl_a008585_read_cntp_tval_el0(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	bool val;</div><div class='add'>+	return __fsl_a008585_read_reg(cntp_tval_el0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ret = strtobool(buf, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+static u32 notrace fsl_a008585_read_cntv_tval_el0(void)</div><div class='add'>+{</div><div class='add'>+	return __fsl_a008585_read_reg(cntv_tval_el0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	fsl_a008585_enable = val;</div><div class='del'>-	return 0;</div><div class='add'>+static u64 notrace fsl_a008585_read_cntvct_el0(void)</div><div class='add'>+{</div><div class='add'>+	return __fsl_a008585_read_reg(cntvct_el0);</div><div class='ctx'> }</div><div class='del'>-early_param("clocksource.arm_arch_timer.fsl-a008585", early_fsl_a008585_cfg);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-u32 __fsl_a008585_read_cntp_tval_el0(void)</div><div class='add'>+#ifdef CONFIG_HISILICON_ERRATUM_161010101</div><div class='add'>+/*</div><div class='add'>+ * Verify whether the value of the second read is larger than the first by</div><div class='add'>+ * less than 32 is the only way to confirm the value is correct, so clear the</div><div class='add'>+ * lower 5 bits to check whether the difference is greater than 32 or not.</div><div class='add'>+ * Theoretically the erratum should not occur more than twice in succession</div><div class='add'>+ * when reading the system counter, but it is possible that some interrupts</div><div class='add'>+ * may lead to more than twice read errors, triggering the warning, so setting</div><div class='add'>+ * the number of retries far beyond the number of iterations the loop has been</div><div class='add'>+ * observed to take.</div><div class='add'>+ */</div><div class='add'>+#define __hisi_161010101_read_reg(reg) ({				\</div><div class='add'>+	u64 _old, _new;						\</div><div class='add'>+	int _retries = 50;					\</div><div class='add'>+								\</div><div class='add'>+	do {							\</div><div class='add'>+		_old = read_sysreg(reg);			\</div><div class='add'>+		_new = read_sysreg(reg);			\</div><div class='add'>+		_retries--;					\</div><div class='add'>+	} while (unlikely((_new - _old) &gt;&gt; 5) &amp;&amp; _retries);	\</div><div class='add'>+								\</div><div class='add'>+	WARN_ON_ONCE(!_retries);				\</div><div class='add'>+	_new;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static u32 notrace hisi_161010101_read_cntp_tval_el0(void)</div><div class='ctx'> {</div><div class='del'>-	return __fsl_a008585_read_reg(cntp_tval_el0);</div><div class='add'>+	return __hisi_161010101_read_reg(cntp_tval_el0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 __fsl_a008585_read_cntv_tval_el0(void)</div><div class='add'>+static u32 notrace hisi_161010101_read_cntv_tval_el0(void)</div><div class='ctx'> {</div><div class='del'>-	return __fsl_a008585_read_reg(cntv_tval_el0);</div><div class='add'>+	return __hisi_161010101_read_reg(cntv_tval_el0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u64 __fsl_a008585_read_cntvct_el0(void)</div><div class='add'>+static u64 notrace hisi_161010101_read_cntvct_el0(void)</div><div class='ctx'> {</div><div class='del'>-	return __fsl_a008585_read_reg(cntvct_el0);</div><div class='add'>+	return __hisi_161010101_read_reg(cntvct_el0);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__fsl_a008585_read_cntvct_el0);</div><div class='del'>-#endif /* CONFIG_FSL_ERRATUM_A008585 */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND</div><div class='add'>+const struct arch_timer_erratum_workaround *timer_unstable_counter_workaround = NULL;</div><div class='add'>+EXPORT_SYMBOL_GPL(timer_unstable_counter_workaround);</div><div class='add'>+</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(arch_timer_read_ool_enabled);</div><div class='add'>+EXPORT_SYMBOL_GPL(arch_timer_read_ool_enabled);</div><div class='add'>+</div><div class='add'>+static const struct arch_timer_erratum_workaround ool_workarounds[] = {</div><div class='add'>+#ifdef CONFIG_FSL_ERRATUM_A008585</div><div class='add'>+	{</div><div class='add'>+		.id = "fsl,erratum-a008585",</div><div class='add'>+		.read_cntp_tval_el0 = fsl_a008585_read_cntp_tval_el0,</div><div class='add'>+		.read_cntv_tval_el0 = fsl_a008585_read_cntv_tval_el0,</div><div class='add'>+		.read_cntvct_el0 = fsl_a008585_read_cntvct_el0,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_HISILICON_ERRATUM_161010101</div><div class='add'>+	{</div><div class='add'>+		.id = "hisilicon,erratum-161010101",</div><div class='add'>+		.read_cntp_tval_el0 = hisi_161010101_read_cntp_tval_el0,</div><div class='add'>+		.read_cntv_tval_el0 = hisi_161010101_read_cntv_tval_el0,</div><div class='add'>+		.read_cntvct_el0 = hisi_161010101_read_cntvct_el0,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND */</div><div class='ctx'> </div><div class='ctx'> static __always_inline</div><div class='ctx'> void arch_timer_reg_write(int access, enum arch_timer_reg reg, u32 val,</div><div class='hunk'>@@ -280,8 +348,8 @@ static __always_inline void set_next_event(const int access, unsigned long evt,</div><div class='ctx'> 	arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, clk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_FSL_ERRATUM_A008585</div><div class='del'>-static __always_inline void fsl_a008585_set_next_event(const int access,</div><div class='add'>+#ifdef CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND</div><div class='add'>+static __always_inline void erratum_set_next_event_generic(const int access,</div><div class='ctx'> 		unsigned long evt, struct clock_event_device *clk)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ctrl;</div><div class='hunk'>@@ -299,20 +367,20 @@ static __always_inline void fsl_a008585_set_next_event(const int access,</div><div class='ctx'> 	arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, clk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fsl_a008585_set_next_event_virt(unsigned long evt,</div><div class='add'>+static int erratum_set_next_event_virt(unsigned long evt,</div><div class='ctx'> 					   struct clock_event_device *clk)</div><div class='ctx'> {</div><div class='del'>-	fsl_a008585_set_next_event(ARCH_TIMER_VIRT_ACCESS, evt, clk);</div><div class='add'>+	erratum_set_next_event_generic(ARCH_TIMER_VIRT_ACCESS, evt, clk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fsl_a008585_set_next_event_phys(unsigned long evt,</div><div class='add'>+static int erratum_set_next_event_phys(unsigned long evt,</div><div class='ctx'> 					   struct clock_event_device *clk)</div><div class='ctx'> {</div><div class='del'>-	fsl_a008585_set_next_event(ARCH_TIMER_PHYS_ACCESS, evt, clk);</div><div class='add'>+	erratum_set_next_event_generic(ARCH_TIMER_PHYS_ACCESS, evt, clk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_FSL_ERRATUM_A008585 */</div><div class='add'>+#endif /* CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND */</div><div class='ctx'> </div><div class='ctx'> static int arch_timer_set_next_event_virt(unsigned long evt,</div><div class='ctx'> 					  struct clock_event_device *clk)</div><div class='hunk'>@@ -342,16 +410,16 @@ static int arch_timer_set_next_event_phys_mem(unsigned long evt,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fsl_a008585_set_sne(struct clock_event_device *clk)</div><div class='add'>+static void erratum_workaround_set_sne(struct clock_event_device *clk)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_FSL_ERRATUM_A008585</div><div class='add'>+#ifdef CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND</div><div class='ctx'> 	if (!static_branch_unlikely(&amp;arch_timer_read_ool_enabled))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (arch_timer_uses_ppi == VIRT_PPI)</div><div class='del'>-		clk-&gt;set_next_event = fsl_a008585_set_next_event_virt;</div><div class='add'>+		clk-&gt;set_next_event = erratum_set_next_event_virt;</div><div class='ctx'> 	else</div><div class='del'>-		clk-&gt;set_next_event = fsl_a008585_set_next_event_phys;</div><div class='add'>+		clk-&gt;set_next_event = erratum_set_next_event_phys;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -384,7 +452,7 @@ static void __arch_timer_setup(unsigned type,</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		fsl_a008585_set_sne(clk);</div><div class='add'>+		erratum_workaround_set_sne(clk);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		clk-&gt;features |= CLOCK_EVT_FEAT_DYNIRQ;</div><div class='ctx'> 		clk-&gt;name = "arch_mem_timer";</div><div class='hunk'>@@ -561,12 +629,12 @@ static u64 arch_counter_get_cntvct_mem(void)</div><div class='ctx'>  */</div><div class='ctx'> u64 (*arch_timer_read_counter)(void) = arch_counter_get_cntvct;</div><div class='ctx'> </div><div class='del'>-static cycle_t arch_counter_read(struct clocksource *cs)</div><div class='add'>+static u64 arch_counter_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return arch_timer_read_counter();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t arch_counter_read_cc(const struct cyclecounter *cc)</div><div class='add'>+static u64 arch_counter_read_cc(const struct cyclecounter *cc)</div><div class='ctx'> {</div><div class='ctx'> 	return arch_timer_read_counter();</div><div class='ctx'> }</div><div class='hunk'>@@ -576,10 +644,10 @@ static struct clocksource clocksource_counter = {</div><div class='ctx'> 	.rating	= 400,</div><div class='ctx'> 	.read	= arch_counter_read,</div><div class='ctx'> 	.mask	= CLOCKSOURCE_MASK(56),</div><div class='del'>-	.flags	= CLOCK_SOURCE_IS_CONTINUOUS | CLOCK_SOURCE_SUSPEND_NONSTOP,</div><div class='add'>+	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct cyclecounter cyclecounter = {</div><div class='add'>+static struct cyclecounter cyclecounter __ro_after_init = {</div><div class='ctx'> 	.read	= arch_counter_read_cc,</div><div class='ctx'> 	.mask	= CLOCKSOURCE_MASK(56),</div><div class='ctx'> };</div><div class='hunk'>@@ -604,7 +672,7 @@ static void __init arch_counter_register(unsigned type)</div><div class='ctx'> </div><div class='ctx'> 		clocksource_counter.archdata.vdso_direct = true;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_FSL_ERRATUM_A008585</div><div class='add'>+#ifdef CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Don't use the vdso fastpath if errata require using</div><div class='ctx'> 		 * the out-of-line counter accessor.</div><div class='hunk'>@@ -616,6 +684,8 @@ static void __init arch_counter_register(unsigned type)</div><div class='ctx'> 		arch_timer_read_counter = arch_counter_get_cntvct_mem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!arch_counter_suspend_stop)</div><div class='add'>+		clocksource_counter.flags |= CLOCK_SOURCE_SUSPEND_NONSTOP;</div><div class='ctx'> 	start_count = arch_timer_read_counter();</div><div class='ctx'> 	clocksource_register_hz(&amp;clocksource_counter, arch_timer_rate);</div><div class='ctx'> 	cyclecounter.mult = clocksource_counter.mult;</div><div class='hunk'>@@ -735,7 +805,7 @@ static int __init arch_timer_register(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Register and immediately configure the timer on the boot CPU */</div><div class='ctx'> 	err = cpuhp_setup_state(CPUHP_AP_ARM_ARCH_TIMER_STARTING,</div><div class='del'>-				"AP_ARM_ARCH_TIMER_STARTING",</div><div class='add'>+				"clockevents/arm/arch_timer:starting",</div><div class='ctx'> 				arch_timer_starting_cpu, arch_timer_dying_cpu);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_unreg_cpupm;</div><div class='hunk'>@@ -890,12 +960,15 @@ static int __init arch_timer_of_init(struct device_node *np)</div><div class='ctx'> </div><div class='ctx'> 	arch_timer_c3stop = !of_property_read_bool(np, "always-on");</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_FSL_ERRATUM_A008585</div><div class='del'>-	if (fsl_a008585_enable &lt; 0)</div><div class='del'>-		fsl_a008585_enable = of_property_read_bool(np, "fsl,erratum-a008585");</div><div class='del'>-	if (fsl_a008585_enable) {</div><div class='del'>-		static_branch_enable(&amp;arch_timer_read_ool_enabled);</div><div class='del'>-		pr_info("Enabling workaround for FSL erratum A-008585\n");</div><div class='add'>+#ifdef CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ool_workarounds); i++) {</div><div class='add'>+		if (of_property_read_bool(np, ool_workarounds[i].id)) {</div><div class='add'>+			timer_unstable_counter_workaround = &amp;ool_workarounds[i];</div><div class='add'>+			static_branch_enable(&amp;arch_timer_read_ool_enabled);</div><div class='add'>+			pr_info("arch_timer: Enabling workaround for %s\n",</div><div class='add'>+				timer_unstable_counter_workaround-&gt;id);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -907,6 +980,10 @@ static int __init arch_timer_of_init(struct device_node *np)</div><div class='ctx'> 	    of_property_read_bool(np, "arm,cpu-registers-not-fw-configured"))</div><div class='ctx'> 		arch_timer_uses_ppi = PHYS_SECURE_PPI;</div><div class='ctx'> </div><div class='add'>+	/* On some systems, the counter stops ticking when in suspend. */</div><div class='add'>+	arch_counter_suspend_stop = of_property_read_bool(np,</div><div class='add'>+							 "arm,no-tick-in-suspend");</div><div class='add'>+</div><div class='ctx'> 	return arch_timer_init();</div><div class='ctx'> }</div><div class='ctx'> CLOCKSOURCE_OF_DECLARE(armv7_arch_timer, "arm,armv7-timer", arch_timer_of_init);</div><div class='hunk'>@@ -964,8 +1041,9 @@ static int __init arch_timer_mem_init(struct device_node *np)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret= -ENXIO;</div><div class='del'>-	base = arch_counter_base = of_iomap(best_frame, 0);</div><div class='del'>-	if (!base) {</div><div class='add'>+	base = arch_counter_base = of_io_request_and_map(best_frame, 0,</div><div class='add'>+							 "arch_mem_timer");</div><div class='add'>+	if (IS_ERR(base)) {</div><div class='ctx'> 		pr_err("arch_timer: Can't map frame's registers\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c<br/>index 8da03298f844..123ed20ac2ff 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/arm_global_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/arm_global_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/arm_global_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/arm_global_timer.c</a></div><div class='hunk'>@@ -195,7 +195,7 @@ static int gt_dying_cpu(unsigned int cpu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t gt_clocksource_read(struct clocksource *cs)</div><div class='add'>+static u64 gt_clocksource_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return gt_counter_read();</div><div class='ctx'> }</div><div class='hunk'>@@ -316,7 +316,7 @@ static int __init global_timer_of_register(struct device_node *np)</div><div class='ctx'> 		goto out_irq;</div><div class='ctx'> 	</div><div class='ctx'> 	err = cpuhp_setup_state(CPUHP_AP_ARM_GLOBAL_TIMER_STARTING,</div><div class='del'>-				"AP_ARM_GLOBAL_TIMER_STARTING",</div><div class='add'>+				"clockevents/arm/global_timer:starting",</div><div class='ctx'> 				gt_starting_cpu, gt_dying_cpu);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_irq;</div><div class='head'>diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c<br/>index e71acf231c89..f2f29d2be1cf 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/bcm2835_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/bcm2835_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/bcm2835_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/bcm2835_timer.c</a></div><div class='hunk'>@@ -96,7 +96,7 @@ static int __init bcm2835_timer_init(struct device_node *node)</div><div class='ctx'> 	ret = of_property_read_u32(node, "clock-frequency", &amp;freq);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("Can't read clock-frequency");</div><div class='del'>-		return ret;</div><div class='add'>+		goto err_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	system_clock = base + REG_COUNTER_LO;</div><div class='hunk'>@@ -108,13 +108,15 @@ static int __init bcm2835_timer_init(struct device_node *node)</div><div class='ctx'> 	irq = irq_of_parse_and_map(node, DEFAULT_TIMER);</div><div class='ctx'> 	if (irq &lt;= 0) {</div><div class='ctx'> 		pr_err("Can't parse IRQ");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	timer = kzalloc(sizeof(*timer), GFP_KERNEL);</div><div class='ctx'> 	if (!timer) {</div><div class='ctx'> 		pr_err("Can't allocate timer struct\n");</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	timer-&gt;control = base + REG_CONTROL;</div><div class='hunk'>@@ -133,7 +135,7 @@ static int __init bcm2835_timer_init(struct device_node *node)</div><div class='ctx'> 	ret = setup_irq(irq, &amp;timer-&gt;act);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("Can't set up timer IRQ\n");</div><div class='del'>-		return ret;</div><div class='add'>+		goto err_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clockevents_config_and_register(&amp;timer-&gt;evt, freq, 0xf, 0xffffffff);</div><div class='hunk'>@@ -141,6 +143,10 @@ static int __init bcm2835_timer_init(struct device_node *node)</div><div class='ctx'> 	pr_info("bcm2835: system timer (irq = %d)\n", irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_iounmap:</div><div class='add'>+	iounmap(base);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> CLOCKSOURCE_OF_DECLARE(bcm2835, "brcm,bcm2835-system-timer",</div><div class='ctx'> 			bcm2835_timer_init);</div><div class='head'>diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c<br/>index fbfbdec13b08..44e5e951583b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/cadence_ttc_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/cadence_ttc_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/cadence_ttc_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/cadence_ttc_timer.c</a></div><div class='hunk'>@@ -158,11 +158,11 @@ static irqreturn_t ttc_clock_event_interrupt(int irq, void *dev_id)</div><div class='ctx'>  *</div><div class='ctx'>  * returns: Current timer counter register value</div><div class='ctx'>  **/</div><div class='del'>-static cycle_t __ttc_clocksource_read(struct clocksource *cs)</div><div class='add'>+static u64 __ttc_clocksource_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttc_timer *timer = &amp;to_ttc_timer_clksrc(cs)-&gt;ttc;</div><div class='ctx'> </div><div class='del'>-	return (cycle_t)readl_relaxed(timer-&gt;base_addr +</div><div class='add'>+	return (u64)readl_relaxed(timer-&gt;base_addr +</div><div class='ctx'> 				TTC_COUNT_VAL_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clocksource/clkevt-probe.c b/drivers/clocksource/clkevt-probe.c<br/>new file mode 100644<br/>index 000000000000..8c30fec86094<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/clkevt-probe.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/clkevt-probe.c</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016, Linaro Ltd.  All rights reserved.</div><div class='add'>+ * Daniel Lezcano &lt;daniel.lezcano@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/clockchip.h&gt;</div><div class='add'>+</div><div class='add'>+extern struct of_device_id __clkevt_of_table[];</div><div class='add'>+</div><div class='add'>+static const struct of_device_id __clkevt_of_table_sentinel</div><div class='add'>+	__used __section(__clkevt_of_table_end);</div><div class='add'>+</div><div class='add'>+int __init clockevent_probe(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	const struct of_device_id *match;</div><div class='add'>+	of_init_fn_1_ret init_func;</div><div class='add'>+	int ret, clockevents = 0;</div><div class='add'>+</div><div class='add'>+	for_each_matching_node_and_match(np, __clkevt_of_table, &amp;match) {</div><div class='add'>+		if (!of_device_is_available(np))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		init_func = match-&gt;data;</div><div class='add'>+</div><div class='add'>+		ret = init_func(np);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_warn("Failed to initialize '%s' (%d)\n",</div><div class='add'>+				np-&gt;name, ret);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		clockevents++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!clockevents) {</div><div class='add'>+		pr_crit("%s: no matching clockevent found\n", __func__);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c<br/>index 77a365f573d7..c69e2772658d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/clksrc-dbx500-prcmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/clksrc-dbx500-prcmu.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/clksrc-dbx500-prcmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/clksrc-dbx500-prcmu.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> static void __iomem *clksrc_dbx500_timer_base;</div><div class='ctx'> </div><div class='del'>-static cycle_t notrace clksrc_dbx500_prcmu_read(struct clocksource *cs)</div><div class='add'>+static u64 notrace clksrc_dbx500_prcmu_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *base = clksrc_dbx500_timer_base;</div><div class='ctx'> 	u32 count, count2;</div><div class='head'>diff --git a/drivers/clocksource/dummy_timer.c b/drivers/clocksource/dummy_timer.c<br/>index 89f1c2edbe02..01f3f5a59bc6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/dummy_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/dummy_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/dummy_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/dummy_timer.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@ static int dummy_timer_starting_cpu(unsigned int cpu)</div><div class='ctx'> static int __init dummy_timer_register(void)</div><div class='ctx'> {</div><div class='ctx'> 	return cpuhp_setup_state(CPUHP_AP_DUMMY_TIMER_STARTING,</div><div class='del'>-				 "AP_DUMMY_TIMER_STARTING",</div><div class='add'>+				 "clockevents/dummy_timer:starting",</div><div class='ctx'> 				 dummy_timer_starting_cpu, NULL);</div><div class='ctx'> }</div><div class='ctx'> early_initcall(dummy_timer_register);</div><div class='head'>diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c<br/>index 797505aa2ba4..63e4f5519577 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/dw_apb_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/dw_apb_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/dw_apb_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/dw_apb_timer.c</a></div><div class='hunk'>@@ -348,7 +348,7 @@ void dw_apb_clocksource_start(struct dw_apb_clocksource *dw_cs)</div><div class='ctx'> 	dw_apb_clocksource_read(dw_cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t __apbt_read_clocksource(struct clocksource *cs)</div><div class='add'>+static u64 __apbt_read_clocksource(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	u32 current_count;</div><div class='ctx'> 	struct dw_apb_clocksource *dw_cs =</div><div class='hunk'>@@ -357,7 +357,7 @@ static cycle_t __apbt_read_clocksource(struct clocksource *cs)</div><div class='ctx'> 	current_count = apbt_readl_relaxed(&amp;dw_cs-&gt;timer,</div><div class='ctx'> 					APBTMR_N_CURRENT_VALUE);</div><div class='ctx'> </div><div class='del'>-	return (cycle_t)~current_count;</div><div class='add'>+	return (u64)~current_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void apbt_restart_clocksource(struct clocksource *cs)</div><div class='hunk'>@@ -416,7 +416,7 @@ void dw_apb_clocksource_register(struct dw_apb_clocksource *dw_cs)</div><div class='ctx'>  *</div><div class='ctx'>  * @dw_cs:	The clocksource to read.</div><div class='ctx'>  */</div><div class='del'>-cycle_t dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs)</div><div class='add'>+u64 dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)~apbt_readl(&amp;dw_cs-&gt;timer, APBTMR_N_CURRENT_VALUE);</div><div class='add'>+	return (u64)~apbt_readl(&amp;dw_cs-&gt;timer, APBTMR_N_CURRENT_VALUE);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c<br/>index 19bb1792d647..aff87df07449 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/em_sti.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/em_sti.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/em_sti.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/em_sti.c</a></div><div class='hunk'>@@ -110,9 +110,9 @@ static void em_sti_disable(struct em_sti_priv *p)</div><div class='ctx'> 	clk_disable_unprepare(p-&gt;clk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t em_sti_count(struct em_sti_priv *p)</div><div class='add'>+static u64 em_sti_count(struct em_sti_priv *p)</div><div class='ctx'> {</div><div class='del'>-	cycle_t ticks;</div><div class='add'>+	u64 ticks;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* the STI hardware buffers the 48-bit count, but to</div><div class='hunk'>@@ -121,14 +121,14 @@ static cycle_t em_sti_count(struct em_sti_priv *p)</div><div class='ctx'> 	 * Always read STI_COUNT_H before STI_COUNT_L.</div><div class='ctx'> 	 */</div><div class='ctx'> 	raw_spin_lock_irqsave(&amp;p-&gt;lock, flags);</div><div class='del'>-	ticks = (cycle_t)(em_sti_read(p, STI_COUNT_H) &amp; 0xffff) &lt;&lt; 32;</div><div class='add'>+	ticks = (u64)(em_sti_read(p, STI_COUNT_H) &amp; 0xffff) &lt;&lt; 32;</div><div class='ctx'> 	ticks |= em_sti_read(p, STI_COUNT_L);</div><div class='ctx'> 	raw_spin_unlock_irqrestore(&amp;p-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return ticks;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t em_sti_set_next(struct em_sti_priv *p, cycle_t next)</div><div class='add'>+static u64 em_sti_set_next(struct em_sti_priv *p, u64 next)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -198,7 +198,7 @@ static struct em_sti_priv *cs_to_em_sti(struct clocksource *cs)</div><div class='ctx'> 	return container_of(cs, struct em_sti_priv, cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t em_sti_clocksource_read(struct clocksource *cs)</div><div class='add'>+static u64 em_sti_clocksource_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return em_sti_count(cs_to_em_sti(cs));</div><div class='ctx'> }</div><div class='hunk'>@@ -271,7 +271,7 @@ static int em_sti_clock_event_next(unsigned long delta,</div><div class='ctx'> 				   struct clock_event_device *ced)</div><div class='ctx'> {</div><div class='ctx'> 	struct em_sti_priv *p = ced_to_em_sti(ced);</div><div class='del'>-	cycle_t next;</div><div class='add'>+	u64 next;</div><div class='ctx'> 	int safe;</div><div class='ctx'> </div><div class='ctx'> 	next = em_sti_set_next(p, em_sti_count(p) + delta);</div><div class='head'>diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c<br/>index 8f3488b80896..670ff0f25b67 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/exynos_mct.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/exynos_mct.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/exynos_mct.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/exynos_mct.c</a></div><div class='hunk'>@@ -183,7 +183,7 @@ static u64 exynos4_read_count_64(void)</div><div class='ctx'> 		hi2 = readl_relaxed(reg_base + EXYNOS4_MCT_G_CNT_U);</div><div class='ctx'> 	} while (hi != hi2);</div><div class='ctx'> </div><div class='del'>-	return ((cycle_t)hi &lt;&lt; 32) | lo;</div><div class='add'>+	return ((u64)hi &lt;&lt; 32) | lo;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -199,7 +199,7 @@ static u32 notrace exynos4_read_count_32(void)</div><div class='ctx'> 	return readl_relaxed(reg_base + EXYNOS4_MCT_G_CNT_L);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t exynos4_frc_read(struct clocksource *cs)</div><div class='add'>+static u64 exynos4_frc_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return exynos4_read_count_32();</div><div class='ctx'> }</div><div class='hunk'>@@ -266,7 +266,7 @@ static void exynos4_mct_comp0_stop(void)</div><div class='ctx'> static void exynos4_mct_comp0_start(bool periodic, unsigned long cycles)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tcon;</div><div class='del'>-	cycle_t comp_cycle;</div><div class='add'>+	u64 comp_cycle;</div><div class='ctx'> </div><div class='ctx'> 	tcon = readl_relaxed(reg_base + EXYNOS4_MCT_G_TCON);</div><div class='ctx'> </div><div class='hunk'>@@ -495,6 +495,7 @@ static int exynos4_mct_dying_cpu(unsigned int cpu)</div><div class='ctx'> 	if (mct_int_type == MCT_INT_SPI) {</div><div class='ctx'> 		if (evt-&gt;irq != -1)</div><div class='ctx'> 			disable_irq_nosync(evt-&gt;irq);</div><div class='add'>+		exynos4_mct_write(0x1, mevt-&gt;base + MCT_L_INT_CSTAT_OFFSET);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		disable_percpu_irq(mct_irqs[MCT_L0_IRQ]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -552,7 +553,7 @@ static int __init exynos4_timer_resources(struct device_node *np, void __iomem *</div><div class='ctx'> </div><div class='ctx'> 	/* Install hotplug callbacks which configure the timer on this CPU */</div><div class='ctx'> 	err = cpuhp_setup_state(CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,</div><div class='del'>-				"AP_EXYNOS4_MCT_TIMER_STARTING",</div><div class='add'>+				"clockevents/exynos4/mct_timer:starting",</div><div class='ctx'> 				exynos4_mct_starting_cpu,</div><div class='ctx'> 				exynos4_mct_dying_cpu);</div><div class='ctx'> 	if (err)</div><div class='head'>diff --git a/drivers/clocksource/h8300_timer16.c b/drivers/clocksource/h8300_timer16.c<br/>index 07d9d5be9054..5b27fb9997c2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/h8300_timer16.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/h8300_timer16.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/h8300_timer16.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/h8300_timer16.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ static inline struct timer16_priv *cs_to_priv(struct clocksource *cs)</div><div class='ctx'> 	return container_of(cs, struct timer16_priv, cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t timer16_clocksource_read(struct clocksource *cs)</div><div class='add'>+static u64 timer16_clocksource_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct timer16_priv *p = cs_to_priv(cs);</div><div class='ctx'> 	unsigned long raw, value;</div><div class='head'>diff --git a/drivers/clocksource/h8300_tpu.c b/drivers/clocksource/h8300_tpu.c<br/>index 7bdf1991c847..72e1cf2b3096 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/h8300_tpu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/h8300_tpu.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/h8300_tpu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/h8300_tpu.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ static inline struct tpu_priv *cs_to_priv(struct clocksource *cs)</div><div class='ctx'> 	return container_of(cs, struct tpu_priv, cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t tpu_clocksource_read(struct clocksource *cs)</div><div class='add'>+static u64 tpu_clocksource_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpu_priv *p = cs_to_priv(cs);</div><div class='ctx'> 	unsigned long flags;</div><div class='head'>diff --git a/drivers/clocksource/i8253.c b/drivers/clocksource/i8253.c<br/>index 0efd36e483ab..64f6490740d7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/i8253.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/i8253.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/i8253.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/i8253.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@ EXPORT_SYMBOL(i8253_lock);</div><div class='ctx'>  * to just read by itself. So use jiffies to emulate a free</div><div class='ctx'>  * running counter:</div><div class='ctx'>  */</div><div class='del'>-static cycle_t i8253_read(struct clocksource *cs)</div><div class='add'>+static u64 i8253_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	static int old_count;</div><div class='ctx'> 	static u32 old_jifs;</div><div class='hunk'>@@ -83,7 +83,7 @@ static cycle_t i8253_read(struct clocksource *cs)</div><div class='ctx'> </div><div class='ctx'> 	count = (PIT_LATCH - 1) - count;</div><div class='ctx'> </div><div class='del'>-	return (cycle_t)(jifs * PIT_LATCH) + count;</div><div class='add'>+	return (u64)(jifs * PIT_LATCH) + count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource i8253_cs = {</div><div class='head'>diff --git a/drivers/clocksource/jcore-pit.c b/drivers/clocksource/jcore-pit.c<br/>index 54e1665aa03c..7c61226f4359 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/jcore-pit.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/jcore-pit.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/jcore-pit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/jcore-pit.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ static notrace u64 jcore_sched_clock_read(void)</div><div class='ctx'> 	return seclo * NSEC_PER_SEC + nsec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t jcore_clocksource_read(struct clocksource *cs)</div><div class='add'>+static u64 jcore_clocksource_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return jcore_sched_clock_read();</div><div class='ctx'> }</div><div class='hunk'>@@ -240,7 +240,7 @@ static int __init jcore_pit_init(struct device_node *node)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpuhp_setup_state(CPUHP_AP_JCORE_TIMER_STARTING,</div><div class='del'>-			  "AP_JCORE_TIMER_STARTING",</div><div class='add'>+			  "clockevents/jcore:starting",</div><div class='ctx'> 			  jcore_pit_local_init, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/clocksource/metag_generic.c b/drivers/clocksource/metag_generic.c<br/>index a80ab3e446b7..6fcf96540631 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/metag_generic.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/metag_generic.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/metag_generic.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/metag_generic.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ static int metag_timer_set_next_event(unsigned long delta,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t metag_clocksource_read(struct clocksource *cs)</div><div class='add'>+static u64 metag_clocksource_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return __core_reg_get(TXTIMER);</div><div class='ctx'> }</div><div class='hunk'>@@ -154,6 +154,6 @@ int __init metag_generic_timer_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Hook cpu boot to configure the CPU's timers */</div><div class='ctx'> 	return cpuhp_setup_state(CPUHP_AP_METAG_TIMER_STARTING,</div><div class='del'>-				 "AP_METAG_TIMER_STARTING",</div><div class='add'>+				 "clockevents/metag:starting",</div><div class='ctx'> 				 arch_timer_starting_cpu, NULL);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c<br/>index 7a960cd01104..d9ef7a61e093 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/mips-gic-timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/mips-gic-timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/mips-gic-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/mips-gic-timer.c</a></div><div class='hunk'>@@ -120,12 +120,12 @@ static int gic_clockevent_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpuhp_setup_state(CPUHP_AP_MIPS_GIC_TIMER_STARTING,</div><div class='del'>-			  "AP_MIPS_GIC_TIMER_STARTING", gic_starting_cpu,</div><div class='del'>-			  gic_dying_cpu);</div><div class='add'>+			  "clockevents/mips/gic/timer:starting",</div><div class='add'>+			  gic_starting_cpu, gic_dying_cpu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t gic_hpt_read(struct clocksource *cs)</div><div class='add'>+static u64 gic_hpt_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return gic_read_count();</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/clocksource/mmio.c b/drivers/clocksource/mmio.c<br/>index c4f7d7a9b689..4c4df981d8cc 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/mmio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/mmio.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/mmio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/mmio.c</a></div><div class='hunk'>@@ -20,24 +20,24 @@ static inline struct clocksource_mmio *to_mmio_clksrc(struct clocksource *c)</div><div class='ctx'> 	return container_of(c, struct clocksource_mmio, clksrc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-cycle_t clocksource_mmio_readl_up(struct clocksource *c)</div><div class='add'>+u64 clocksource_mmio_readl_up(struct clocksource *c)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)readl_relaxed(to_mmio_clksrc(c)-&gt;reg);</div><div class='add'>+	return (u64)readl_relaxed(to_mmio_clksrc(c)-&gt;reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-cycle_t clocksource_mmio_readl_down(struct clocksource *c)</div><div class='add'>+u64 clocksource_mmio_readl_down(struct clocksource *c)</div><div class='ctx'> {</div><div class='del'>-	return ~(cycle_t)readl_relaxed(to_mmio_clksrc(c)-&gt;reg) &amp; c-&gt;mask;</div><div class='add'>+	return ~(u64)readl_relaxed(to_mmio_clksrc(c)-&gt;reg) &amp; c-&gt;mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-cycle_t clocksource_mmio_readw_up(struct clocksource *c)</div><div class='add'>+u64 clocksource_mmio_readw_up(struct clocksource *c)</div><div class='ctx'> {</div><div class='del'>-	return (cycle_t)readw_relaxed(to_mmio_clksrc(c)-&gt;reg);</div><div class='add'>+	return (u64)readw_relaxed(to_mmio_clksrc(c)-&gt;reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-cycle_t clocksource_mmio_readw_down(struct clocksource *c)</div><div class='add'>+u64 clocksource_mmio_readw_down(struct clocksource *c)</div><div class='ctx'> {</div><div class='del'>-	return ~(cycle_t)readw_relaxed(to_mmio_clksrc(c)-&gt;reg) &amp; c-&gt;mask;</div><div class='add'>+	return ~(u64)readw_relaxed(to_mmio_clksrc(c)-&gt;reg) &amp; c-&gt;mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -51,7 +51,7 @@ cycle_t clocksource_mmio_readw_down(struct clocksource *c)</div><div class='ctx'>  */</div><div class='ctx'> int __init clocksource_mmio_init(void __iomem *base, const char *name,</div><div class='ctx'> 	unsigned long hz, int rating, unsigned bits,</div><div class='del'>-	cycle_t (*read)(struct clocksource *))</div><div class='add'>+	u64 (*read)(struct clocksource *))</div><div class='ctx'> {</div><div class='ctx'> 	struct clocksource_mmio *cs;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c<br/>index 2a8f4705c734..7f3430654fbd 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/moxart_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/moxart_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/moxart_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/moxart_timer.c</a></div><div class='hunk'>@@ -161,19 +161,22 @@ static int __init moxart_timer_init(struct device_node *node)</div><div class='ctx'> 	timer-&gt;base = of_iomap(node, 0);</div><div class='ctx'> 	if (!timer-&gt;base) {</div><div class='ctx'> 		pr_err("%s: of_iomap failed\n", node-&gt;full_name);</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	irq = irq_of_parse_and_map(node, 0);</div><div class='ctx'> 	if (irq &lt;= 0) {</div><div class='ctx'> 		pr_err("%s: irq_of_parse_and_map failed\n", node-&gt;full_name);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clk = of_clk_get(node, 0);</div><div class='ctx'> 	if (IS_ERR(clk))  {</div><div class='ctx'> 		pr_err("%s: of_clk_get failed\n", node-&gt;full_name);</div><div class='del'>-		return PTR_ERR(clk);</div><div class='add'>+		ret = PTR_ERR(clk);</div><div class='add'>+		goto out_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pclk = clk_get_rate(clk);</div><div class='hunk'>@@ -186,7 +189,8 @@ static int __init moxart_timer_init(struct device_node *node)</div><div class='ctx'> 		timer-&gt;t1_disable_val = ASPEED_TIMER1_DISABLE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_err("%s: unknown platform\n", node-&gt;full_name);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	timer-&gt;count_per_tick = DIV_ROUND_CLOSEST(pclk, HZ);</div><div class='hunk'>@@ -208,14 +212,14 @@ static int __init moxart_timer_init(struct device_node *node)</div><div class='ctx'> 				    clocksource_mmio_readl_down);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("%s: clocksource_mmio_init failed\n", node-&gt;full_name);</div><div class='del'>-		return ret;</div><div class='add'>+		goto out_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(irq, moxart_timer_interrupt, IRQF_TIMER,</div><div class='ctx'> 			  node-&gt;name, &amp;timer-&gt;clkevt);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("%s: setup_irq failed\n", node-&gt;full_name);</div><div class='del'>-		return ret;</div><div class='add'>+		goto out_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clear match registers */</div><div class='hunk'>@@ -241,6 +245,12 @@ static int __init moxart_timer_init(struct device_node *node)</div><div class='ctx'> 	clockevents_config_and_register(&amp;timer-&gt;clkevt, pclk, 0x4, 0xfffffffe);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_unmap:</div><div class='add'>+	iounmap(timer-&gt;base);</div><div class='add'>+out_free:</div><div class='add'>+	kfree(timer);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> CLOCKSOURCE_OF_DECLARE(moxart, "moxa,moxart-timer", moxart_timer_init);</div><div class='ctx'> CLOCKSOURCE_OF_DECLARE(aspeed, "aspeed,ast2400-timer", moxart_timer_init);</div><div class='head'>diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c<br/>index 0ba0a913b41d..99b77aff0839 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/mxs_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/mxs_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/mxs_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/mxs_timer.c</a></div><div class='hunk'>@@ -97,7 +97,7 @@ static void timrot_irq_acknowledge(void)</div><div class='ctx'> 		     HW_TIMROT_TIMCTRLn(0) + STMP_OFFSET_REG_CLR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t timrotv1_get_cycles(struct clocksource *cs)</div><div class='add'>+static u64 timrotv1_get_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return ~((__raw_readl(mxs_timrot_base + HW_TIMROT_TIMCOUNTn(1))</div><div class='ctx'> 			&amp; 0xffff0000) &gt;&gt; 16);</div><div class='head'>diff --git a/drivers/clocksource/pxa_timer.c b/drivers/clocksource/pxa_timer.c<br/>index 3e1cb512f3ce..1c24de215c14 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/pxa_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/pxa_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/pxa_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/pxa_timer.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/sched_clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;clocksource/pxa.h&gt;</div><div class='hunk'>@@ -220,17 +221,16 @@ CLOCKSOURCE_OF_DECLARE(pxa_timer, "marvell,pxa-timer", pxa_timer_dt_init);</div><div class='ctx'> /*</div><div class='ctx'>  * Legacy timer init for non device-tree boards.</div><div class='ctx'>  */</div><div class='del'>-void __init pxa_timer_nodt_init(int irq, void __iomem *base,</div><div class='del'>-	unsigned long clock_tick_rate)</div><div class='add'>+void __init pxa_timer_nodt_init(int irq, void __iomem *base)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> </div><div class='ctx'> 	timer_base = base;</div><div class='ctx'> 	clk = clk_get(NULL, "OSTIMER0");</div><div class='del'>-	if (clk &amp;&amp; !IS_ERR(clk))</div><div class='add'>+	if (clk &amp;&amp; !IS_ERR(clk)) {</div><div class='ctx'> 		clk_prepare_enable(clk);</div><div class='del'>-	else</div><div class='add'>+		pxa_timer_common_init(irq, clk_get_rate(clk));</div><div class='add'>+	} else {</div><div class='ctx'> 		pr_crit("%s: unable to get clk\n", __func__);</div><div class='del'>-</div><div class='del'>-	pxa_timer_common_init(irq, clock_tick_rate);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c<br/>index 3283cfa2aa52..ee358cdf4a07 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/qcom-timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/qcom-timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/qcom-timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/qcom-timer.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ static struct clock_event_device __percpu *msm_evt;</div><div class='ctx'> </div><div class='ctx'> static void __iomem *source_base;</div><div class='ctx'> </div><div class='del'>-static notrace cycle_t msm_read_timer_count(struct clocksource *cs)</div><div class='add'>+static notrace u64 msm_read_timer_count(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return readl_relaxed(source_base + TIMER_COUNT_VAL);</div><div class='ctx'> }</div><div class='hunk'>@@ -182,7 +182,7 @@ static int __init msm_timer_init(u32 dgt_hz, int sched_bits, int irq,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Install and invoke hotplug callbacks */</div><div class='ctx'> 		res = cpuhp_setup_state(CPUHP_AP_QCOM_TIMER_STARTING,</div><div class='del'>-					"AP_QCOM_TIMER_STARTING",</div><div class='add'>+					"clockevents/qcom/timer:starting",</div><div class='ctx'> 					msm_local_timer_starting_cpu,</div><div class='ctx'> 					msm_local_timer_dying_cpu);</div><div class='ctx'> 		if (res) {</div><div class='head'>diff --git a/drivers/clocksource/renesas-ostm.c b/drivers/clocksource/renesas-ostm.c<br/>new file mode 100644<br/>index 000000000000..c76f57668fb2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/renesas-ostm.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/renesas-ostm.c</a></div><div class='hunk'>@@ -0,0 +1,265 @@</div><div class='add'>+/*</div><div class='add'>+ * Renesas Timer Support - OSTM</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Renesas Electronics America, Inc.</div><div class='add'>+ * Copyright (C) 2017 Chris Brandt</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/clockchips.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/sched_clock.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The OSTM contains independent channels.</div><div class='add'>+ * The first OSTM channel probed will be set up as a free running</div><div class='add'>+ * clocksource. Additionally we will use this clocksource for the system</div><div class='add'>+ * schedule timer sched_clock().</div><div class='add'>+ *</div><div class='add'>+ * The second (or more) channel probed will be set up as an interrupt</div><div class='add'>+ * driven clock event.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct ostm_device {</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	unsigned long ticks_per_jiffy;</div><div class='add'>+	struct clock_event_device ced;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __iomem *system_clock;	/* For sched_clock() */</div><div class='add'>+</div><div class='add'>+/* OSTM REGISTERS */</div><div class='add'>+#define	OSTM_CMP		0x000	/* RW,32 */</div><div class='add'>+#define	OSTM_CNT		0x004	/* R,32 */</div><div class='add'>+#define	OSTM_TE			0x010	/* R,8 */</div><div class='add'>+#define	OSTM_TS			0x014	/* W,8 */</div><div class='add'>+#define	OSTM_TT			0x018	/* W,8 */</div><div class='add'>+#define	OSTM_CTL		0x020	/* RW,8 */</div><div class='add'>+</div><div class='add'>+#define	TE			0x01</div><div class='add'>+#define	TS			0x01</div><div class='add'>+#define	TT			0x01</div><div class='add'>+#define	CTL_PERIODIC		0x00</div><div class='add'>+#define	CTL_ONESHOT		0x02</div><div class='add'>+#define	CTL_FREERUN		0x02</div><div class='add'>+</div><div class='add'>+static struct ostm_device *ced_to_ostm(struct clock_event_device *ced)</div><div class='add'>+{</div><div class='add'>+	return container_of(ced, struct ostm_device, ced);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ostm_timer_stop(struct ostm_device *ostm)</div><div class='add'>+{</div><div class='add'>+	if (readb(ostm-&gt;base + OSTM_TE) &amp; TE) {</div><div class='add'>+		writeb(TT, ostm-&gt;base + OSTM_TT);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Read back the register simply to confirm the write operation</div><div class='add'>+		 * has completed since I/O writes can sometimes get queued by</div><div class='add'>+		 * the bus architecture.</div><div class='add'>+		 */</div><div class='add'>+		while (readb(ostm-&gt;base + OSTM_TE) &amp; TE)</div><div class='add'>+			;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init ostm_init_clksrc(struct ostm_device *ostm, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * irq not used (clock sources don't use interrupts)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ostm_timer_stop(ostm);</div><div class='add'>+</div><div class='add'>+	writel(0, ostm-&gt;base + OSTM_CMP);</div><div class='add'>+	writeb(CTL_FREERUN, ostm-&gt;base + OSTM_CTL);</div><div class='add'>+	writeb(TS, ostm-&gt;base + OSTM_TS);</div><div class='add'>+</div><div class='add'>+	return clocksource_mmio_init(ostm-&gt;base + OSTM_CNT,</div><div class='add'>+			"ostm", rate,</div><div class='add'>+			300, 32, clocksource_mmio_readl_up);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 notrace ostm_read_sched_clock(void)</div><div class='add'>+{</div><div class='add'>+	return readl(system_clock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init ostm_init_sched_clock(struct ostm_device *ostm,</div><div class='add'>+			unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	system_clock = ostm-&gt;base + OSTM_CNT;</div><div class='add'>+	sched_clock_register(ostm_read_sched_clock, 32, rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ostm_clock_event_next(unsigned long delta,</div><div class='add'>+				     struct clock_event_device *ced)</div><div class='add'>+{</div><div class='add'>+	struct ostm_device *ostm = ced_to_ostm(ced);</div><div class='add'>+</div><div class='add'>+	ostm_timer_stop(ostm);</div><div class='add'>+</div><div class='add'>+	writel(delta, ostm-&gt;base + OSTM_CMP);</div><div class='add'>+	writeb(CTL_ONESHOT, ostm-&gt;base + OSTM_CTL);</div><div class='add'>+	writeb(TS, ostm-&gt;base + OSTM_TS);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ostm_shutdown(struct clock_event_device *ced)</div><div class='add'>+{</div><div class='add'>+	struct ostm_device *ostm = ced_to_ostm(ced);</div><div class='add'>+</div><div class='add'>+	ostm_timer_stop(ostm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int ostm_set_periodic(struct clock_event_device *ced)</div><div class='add'>+{</div><div class='add'>+	struct ostm_device *ostm = ced_to_ostm(ced);</div><div class='add'>+</div><div class='add'>+	if (clockevent_state_oneshot(ced) || clockevent_state_periodic(ced))</div><div class='add'>+		ostm_timer_stop(ostm);</div><div class='add'>+</div><div class='add'>+	writel(ostm-&gt;ticks_per_jiffy - 1, ostm-&gt;base + OSTM_CMP);</div><div class='add'>+	writeb(CTL_PERIODIC, ostm-&gt;base + OSTM_CTL);</div><div class='add'>+	writeb(TS, ostm-&gt;base + OSTM_TS);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ostm_set_oneshot(struct clock_event_device *ced)</div><div class='add'>+{</div><div class='add'>+	struct ostm_device *ostm = ced_to_ostm(ced);</div><div class='add'>+</div><div class='add'>+	ostm_timer_stop(ostm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ostm_timer_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct ostm_device *ostm = dev_id;</div><div class='add'>+</div><div class='add'>+	if (clockevent_state_oneshot(&amp;ostm-&gt;ced))</div><div class='add'>+		ostm_timer_stop(ostm);</div><div class='add'>+</div><div class='add'>+	/* notify clockevent layer */</div><div class='add'>+	if (ostm-&gt;ced.event_handler)</div><div class='add'>+		ostm-&gt;ced.event_handler(&amp;ostm-&gt;ced);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init ostm_init_clkevt(struct ostm_device *ostm, int irq,</div><div class='add'>+			unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	struct clock_event_device *ced = &amp;ostm-&gt;ced;</div><div class='add'>+	int ret = -ENXIO;</div><div class='add'>+</div><div class='add'>+	ret = request_irq(irq, ostm_timer_interrupt,</div><div class='add'>+			  IRQF_TIMER | IRQF_IRQPOLL,</div><div class='add'>+			  "ostm", ostm);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("ostm: failed to request irq\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ced-&gt;name = "ostm";</div><div class='add'>+	ced-&gt;features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC;</div><div class='add'>+	ced-&gt;set_state_shutdown = ostm_shutdown;</div><div class='add'>+	ced-&gt;set_state_periodic = ostm_set_periodic;</div><div class='add'>+	ced-&gt;set_state_oneshot = ostm_set_oneshot;</div><div class='add'>+	ced-&gt;set_next_event = ostm_clock_event_next;</div><div class='add'>+	ced-&gt;shift = 32;</div><div class='add'>+	ced-&gt;rating = 300;</div><div class='add'>+	ced-&gt;cpumask = cpumask_of(0);</div><div class='add'>+	clockevents_config_and_register(ced, rate, 0xf, 0xffffffff);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init ostm_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct ostm_device *ostm;</div><div class='add'>+	int ret = -EFAULT;</div><div class='add'>+	struct clk *ostm_clk = NULL;</div><div class='add'>+	int irq;</div><div class='add'>+	unsigned long rate;</div><div class='add'>+</div><div class='add'>+	ostm = kzalloc(sizeof(*ostm), GFP_KERNEL);</div><div class='add'>+	if (!ostm)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ostm-&gt;base = of_iomap(np, 0);</div><div class='add'>+	if (!ostm-&gt;base) {</div><div class='add'>+		pr_err("ostm: failed to remap I/O memory\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq = irq_of_parse_and_map(np, 0);</div><div class='add'>+	if (irq &lt; 0) {</div><div class='add'>+		pr_err("ostm: Failed to get irq\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ostm_clk = of_clk_get(np, 0);</div><div class='add'>+	if (IS_ERR(ostm_clk)) {</div><div class='add'>+		pr_err("ostm: Failed to get clock\n");</div><div class='add'>+		ostm_clk = NULL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(ostm_clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("ostm: Failed to enable clock\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rate = clk_get_rate(ostm_clk);</div><div class='add'>+	ostm-&gt;ticks_per_jiffy = (rate + HZ / 2) / HZ;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First probed device will be used as system clocksource. Any</div><div class='add'>+	 * additional devices will be used as clock events.</div><div class='add'>+	 */</div><div class='add'>+	if (!system_clock) {</div><div class='add'>+		ret = ostm_init_clksrc(ostm, rate);</div><div class='add'>+</div><div class='add'>+		if (!ret) {</div><div class='add'>+			ostm_init_sched_clock(ostm, rate);</div><div class='add'>+			pr_info("ostm: used for clocksource\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		ret = ostm_init_clkevt(ostm, irq, rate);</div><div class='add'>+</div><div class='add'>+		if (!ret)</div><div class='add'>+			pr_info("ostm: used for clock events\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (ret) {</div><div class='add'>+		clk_disable_unprepare(ostm_clk);</div><div class='add'>+		iounmap(ostm-&gt;base);</div><div class='add'>+		kfree(ostm);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CLOCKSOURCE_OF_DECLARE(ostm, "renesas,ostm", ostm_init);</div><div class='head'>diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c<br/>index 54565bd0093b..0093ece661fe 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/samsung_pwm_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/samsung_pwm_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/samsung_pwm_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/samsung_pwm_timer.c</a></div><div class='hunk'>@@ -307,7 +307,7 @@ static void samsung_clocksource_resume(struct clocksource *cs)</div><div class='ctx'> 	samsung_time_start(pwm.source_id, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t notrace samsung_clocksource_read(struct clocksource *c)</div><div class='add'>+static u64 notrace samsung_clocksource_read(struct clocksource *c)</div><div class='ctx'> {</div><div class='ctx'> 	return ~readl_relaxed(pwm.source_reg);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/clocksource/scx200_hrt.c b/drivers/clocksource/scx200_hrt.c<br/>index 64f9e8294434..a46660bf6588 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/scx200_hrt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/scx200_hrt.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/scx200_hrt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/scx200_hrt.c</a></div><div class='hunk'>@@ -43,10 +43,10 @@ MODULE_PARM_DESC(ppm, "+-adjust to actual XO freq (ppm)");</div><div class='ctx'> /* The base timer frequency, * 27 if selected */</div><div class='ctx'> #define HRT_FREQ   1000000</div><div class='ctx'> </div><div class='del'>-static cycle_t read_hrt(struct clocksource *cs)</div><div class='add'>+static u64 read_hrt(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	/* Read the timer value */</div><div class='del'>-	return (cycle_t) inl(scx200_cb_base + SCx200_TIMER_OFFSET);</div><div class='add'>+	return (u64) inl(scx200_cb_base + SCx200_TIMER_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource cs_hrt = {</div><div class='head'>diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c<br/>index 103c49362c68..28757edf6aca 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/sh_cmt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/sh_cmt.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/sh_cmt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/sh_cmt.c</a></div><div class='hunk'>@@ -612,7 +612,7 @@ static struct sh_cmt_channel *cs_to_sh_cmt(struct clocksource *cs)</div><div class='ctx'> 	return container_of(cs, struct sh_cmt_channel, cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t sh_cmt_clocksource_read(struct clocksource *cs)</div><div class='add'>+static u64 sh_cmt_clocksource_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct sh_cmt_channel *ch = cs_to_sh_cmt(cs);</div><div class='ctx'> 	unsigned long flags, raw;</div><div class='head'>diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c<br/>index 469e776ec17a..1fbf2aadcfd4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/sh_tmu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/sh_tmu.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/sh_tmu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/sh_tmu.c</a></div><div class='hunk'>@@ -255,7 +255,7 @@ static struct sh_tmu_channel *cs_to_sh_tmu(struct clocksource *cs)</div><div class='ctx'> 	return container_of(cs, struct sh_tmu_channel, cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t sh_tmu_clocksource_read(struct clocksource *cs)</div><div class='add'>+static u64 sh_tmu_clocksource_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct sh_tmu_channel *ch = cs_to_sh_tmu(cs);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c<br/>index 4da2af9694a2..745844ee973e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/tcb_clksrc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/tcb_clksrc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/tcb_clksrc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/tcb_clksrc.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/atmel_tc.h&gt;</div><div class='add'>+#include &lt;linux/sched_clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -41,7 +42,7 @@</div><div class='ctx'> </div><div class='ctx'> static void __iomem *tcaddr;</div><div class='ctx'> </div><div class='del'>-static cycle_t tc_get_cycles(struct clocksource *cs)</div><div class='add'>+static u64 tc_get_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> 	u32		lower, upper;</div><div class='hunk'>@@ -56,11 +57,16 @@ static cycle_t tc_get_cycles(struct clocksource *cs)</div><div class='ctx'> 	return (upper &lt;&lt; 16) | lower;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t tc_get_cycles32(struct clocksource *cs)</div><div class='add'>+static u32 tc_get_cv32(void)</div><div class='ctx'> {</div><div class='ctx'> 	return __raw_readl(tcaddr + ATMEL_TC_REG(0, CV));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u64 tc_get_cycles32(struct clocksource *cs)</div><div class='add'>+{</div><div class='add'>+	return tc_get_cv32();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct clocksource clksrc = {</div><div class='ctx'> 	.name           = "tcb_clksrc",</div><div class='ctx'> 	.rating         = 200,</div><div class='hunk'>@@ -69,6 +75,11 @@ static struct clocksource clksrc = {</div><div class='ctx'> 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static u64 notrace tc_read_sched_clock(void)</div><div class='add'>+{</div><div class='add'>+	return tc_get_cv32();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_GENERIC_CLOCKEVENTS</div><div class='ctx'> </div><div class='ctx'> struct tc_clkevt_device {</div><div class='hunk'>@@ -339,6 +350,9 @@ static int __init tcb_clksrc_init(void)</div><div class='ctx'> 		clksrc.read = tc_get_cycles32;</div><div class='ctx'> 		/* setup ony channel 0 */</div><div class='ctx'> 		tcb_setup_single_chan(tc, best_divisor_idx);</div><div class='add'>+</div><div class='add'>+		/* register sched_clock on chips with single 32 bit counter */</div><div class='add'>+		sched_clock_register(tc_read_sched_clock, 32, divided_rate);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* tclib will give us three clocks no matter what the</div><div class='ctx'> 		 * underlying platform supports.</div><div class='head'>diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c<br/>index 3c39e6f45971..4440aefc59cd 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/time-armada-370-xp.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/time-armada-370-xp.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/time-armada-370-xp.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/time-armada-370-xp.c</a></div><div class='hunk'>@@ -320,7 +320,7 @@ static int __init armada_370_xp_timer_common_init(struct device_node *np)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	res = cpuhp_setup_state(CPUHP_AP_ARMADA_TIMER_STARTING,</div><div class='del'>-				"AP_ARMADA_TIMER_STARTING",</div><div class='add'>+				"clockevents/armada:starting",</div><div class='ctx'> 				armada_370_xp_timer_starting_cpu,</div><div class='ctx'> 				armada_370_xp_timer_dying_cpu);</div><div class='ctx'> 	if (res) {</div><div class='head'>diff --git a/drivers/clocksource/time-pistachio.c b/drivers/clocksource/time-pistachio.c<br/>index a8e6c7df853d..3710e4d9dcba 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/time-pistachio.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/time-pistachio.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/time-pistachio.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/time-pistachio.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ static inline void gpt_writel(void __iomem *base, u32 value, u32 offset,</div><div class='ctx'> 	writel(value, base + 0x20 * gpt_id + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t notrace</div><div class='add'>+static u64 notrace</div><div class='ctx'> pistachio_clocksource_read_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct pistachio_clocksource *pcs = to_pistachio_clocksource(cs);</div><div class='hunk'>@@ -84,7 +84,7 @@ pistachio_clocksource_read_cycles(struct clocksource *cs)</div><div class='ctx'> 	counter = gpt_readl(pcs-&gt;base, TIMER_CURRENT_VALUE, 0);</div><div class='ctx'> 	raw_spin_unlock_irqrestore(&amp;pcs-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	return (cycle_t)~counter;</div><div class='add'>+	return (u64)~counter;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u64 notrace pistachio_read_sched_clock(void)</div><div class='head'>diff --git a/drivers/clocksource/timer-atlas7.c b/drivers/clocksource/timer-atlas7.c<br/>index 4334e0330ada..3d8a181f0252 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/timer-atlas7.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/timer-atlas7.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/timer-atlas7.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-atlas7.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* read 64-bit timer counter */</div><div class='del'>-static cycle_t sirfsoc_timer_read(struct clocksource *cs)</div><div class='add'>+static u64 sirfsoc_timer_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	u64 cycles;</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +221,7 @@ static int __init sirfsoc_clockevent_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Install and invoke hotplug callbacks */</div><div class='ctx'> 	return cpuhp_setup_state(CPUHP_AP_MARCO_TIMER_STARTING,</div><div class='del'>-				 "AP_MARCO_TIMER_STARTING",</div><div class='add'>+				 "clockevents/marco:starting",</div><div class='ctx'> 				 sirfsoc_local_timer_starting_cpu,</div><div class='ctx'> 				 sirfsoc_local_timer_dying_cpu);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c<br/>index 6555821bbdae..c0b5df3167a0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/timer-atmel-pit.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/timer-atmel-pit.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/timer-atmel-pit.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-atmel-pit.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ static inline void pit_write(void __iomem *base, unsigned int reg_offset, unsign</div><div class='ctx'>  * Clocksource:  just a monotonic counter of MCK/16 cycles.</div><div class='ctx'>  * We don't care whether or not PIT irqs are enabled.</div><div class='ctx'>  */</div><div class='del'>-static cycle_t read_pit_clk(struct clocksource *cs)</div><div class='add'>+static u64 read_pit_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct pit_data *data = clksrc_to_pit_data(cs);</div><div class='ctx'> 	unsigned long flags;</div><div class='head'>diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c<br/>index e90ab5b63a90..be4ac7604136 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/timer-atmel-st.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/timer-atmel-st.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/timer-atmel-st.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-atmel-st.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t read_clk32k(struct clocksource *cs)</div><div class='add'>+static u64 read_clk32k(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return read_CRTR();</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/clocksource/timer-digicolor.c b/drivers/clocksource/timer-digicolor.c<br/>index 10318cc99c0e..e9f50d289362 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/timer-digicolor.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/timer-digicolor.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/timer-digicolor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-digicolor.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/irqreturn.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/sched_clock.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='head'>diff --git a/drivers/clocksource/timer-gemini.c b/drivers/clocksource/timer-gemini.c<br/>new file mode 100644<br/>index 000000000000..dda27b7bf1a1<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/timer-gemini.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-gemini.c</a></div><div class='hunk'>@@ -0,0 +1,277 @@</div><div class='add'>+/*</div><div class='add'>+ * Gemini timer driver</div><div class='add'>+ * Copyright (C) 2017 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on a rewrite of arch/arm/mach-gemini/timer.c:</div><div class='add'>+ * Copyright (C) 2001-2006 Storlink, Corp.</div><div class='add'>+ * Copyright (C) 2008-2009 Paulius Zaleckas &lt;paulius.zaleckas@teltonika.lt&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/mfd/syscon.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/clockchips.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/sched_clock.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Relevant registers in the global syscon</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_STATUS		0x04</div><div class='add'>+#define CPU_AHB_RATIO_MASK	(0x3 &lt;&lt; 18)</div><div class='add'>+#define CPU_AHB_1_1		(0x0 &lt;&lt; 18)</div><div class='add'>+#define CPU_AHB_3_2		(0x1 &lt;&lt; 18)</div><div class='add'>+#define CPU_AHB_24_13		(0x2 &lt;&lt; 18)</div><div class='add'>+#define CPU_AHB_2_1		(0x3 &lt;&lt; 18)</div><div class='add'>+#define REG_TO_AHB_SPEED(reg)	((((reg) &gt;&gt; 15) &amp; 0x7) * 10 + 130)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register definitions for the timers</div><div class='add'>+ */</div><div class='add'>+#define TIMER1_COUNT		(0x00)</div><div class='add'>+#define TIMER1_LOAD		(0x04)</div><div class='add'>+#define TIMER1_MATCH1		(0x08)</div><div class='add'>+#define TIMER1_MATCH2		(0x0c)</div><div class='add'>+#define TIMER2_COUNT		(0x10)</div><div class='add'>+#define TIMER2_LOAD		(0x14)</div><div class='add'>+#define TIMER2_MATCH1		(0x18)</div><div class='add'>+#define TIMER2_MATCH2		(0x1c)</div><div class='add'>+#define TIMER3_COUNT		(0x20)</div><div class='add'>+#define TIMER3_LOAD		(0x24)</div><div class='add'>+#define TIMER3_MATCH1		(0x28)</div><div class='add'>+#define TIMER3_MATCH2		(0x2c)</div><div class='add'>+#define TIMER_CR		(0x30)</div><div class='add'>+#define TIMER_INTR_STATE	(0x34)</div><div class='add'>+#define TIMER_INTR_MASK		(0x38)</div><div class='add'>+</div><div class='add'>+#define TIMER_1_CR_ENABLE	(1 &lt;&lt; 0)</div><div class='add'>+#define TIMER_1_CR_CLOCK	(1 &lt;&lt; 1)</div><div class='add'>+#define TIMER_1_CR_INT		(1 &lt;&lt; 2)</div><div class='add'>+#define TIMER_2_CR_ENABLE	(1 &lt;&lt; 3)</div><div class='add'>+#define TIMER_2_CR_CLOCK	(1 &lt;&lt; 4)</div><div class='add'>+#define TIMER_2_CR_INT		(1 &lt;&lt; 5)</div><div class='add'>+#define TIMER_3_CR_ENABLE	(1 &lt;&lt; 6)</div><div class='add'>+#define TIMER_3_CR_CLOCK	(1 &lt;&lt; 7)</div><div class='add'>+#define TIMER_3_CR_INT		(1 &lt;&lt; 8)</div><div class='add'>+#define TIMER_1_CR_UPDOWN	(1 &lt;&lt; 9)</div><div class='add'>+#define TIMER_2_CR_UPDOWN	(1 &lt;&lt; 10)</div><div class='add'>+#define TIMER_3_CR_UPDOWN	(1 &lt;&lt; 11)</div><div class='add'>+#define TIMER_DEFAULT_FLAGS	(TIMER_1_CR_UPDOWN | \</div><div class='add'>+				 TIMER_3_CR_ENABLE | \</div><div class='add'>+				 TIMER_3_CR_UPDOWN)</div><div class='add'>+</div><div class='add'>+#define TIMER_1_INT_MATCH1	(1 &lt;&lt; 0)</div><div class='add'>+#define TIMER_1_INT_MATCH2	(1 &lt;&lt; 1)</div><div class='add'>+#define TIMER_1_INT_OVERFLOW	(1 &lt;&lt; 2)</div><div class='add'>+#define TIMER_2_INT_MATCH1	(1 &lt;&lt; 3)</div><div class='add'>+#define TIMER_2_INT_MATCH2	(1 &lt;&lt; 4)</div><div class='add'>+#define TIMER_2_INT_OVERFLOW	(1 &lt;&lt; 5)</div><div class='add'>+#define TIMER_3_INT_MATCH1	(1 &lt;&lt; 6)</div><div class='add'>+#define TIMER_3_INT_MATCH2	(1 &lt;&lt; 7)</div><div class='add'>+#define TIMER_3_INT_OVERFLOW	(1 &lt;&lt; 8)</div><div class='add'>+#define TIMER_INT_ALL_MASK	0x1ff</div><div class='add'>+</div><div class='add'>+static unsigned int tick_rate;</div><div class='add'>+static void __iomem *base;</div><div class='add'>+</div><div class='add'>+static u64 notrace gemini_read_sched_clock(void)</div><div class='add'>+{</div><div class='add'>+	return readl(base + TIMER3_COUNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gemini_timer_set_next_event(unsigned long cycles,</div><div class='add'>+				       struct clock_event_device *evt)</div><div class='add'>+{</div><div class='add'>+	u32 cr;</div><div class='add'>+</div><div class='add'>+	/* Setup the match register */</div><div class='add'>+	cr = readl(base + TIMER1_COUNT);</div><div class='add'>+	writel(cr + cycles, base + TIMER1_MATCH1);</div><div class='add'>+	if (readl(base + TIMER1_COUNT) - cr &gt; cycles)</div><div class='add'>+		return -ETIME;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gemini_timer_shutdown(struct clock_event_device *evt)</div><div class='add'>+{</div><div class='add'>+	u32 cr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable also for oneshot: the set_next() call will arm the timer</div><div class='add'>+	 * instead.</div><div class='add'>+	 */</div><div class='add'>+	/* Stop timer and interrupt. */</div><div class='add'>+	cr = readl(base + TIMER_CR);</div><div class='add'>+	cr &amp;= ~(TIMER_1_CR_ENABLE | TIMER_1_CR_INT);</div><div class='add'>+	writel(cr, base + TIMER_CR);</div><div class='add'>+</div><div class='add'>+	/* Setup counter start from 0 */</div><div class='add'>+	writel(0, base + TIMER1_COUNT);</div><div class='add'>+	writel(0, base + TIMER1_LOAD);</div><div class='add'>+</div><div class='add'>+	/* enable interrupt */</div><div class='add'>+	cr = readl(base + TIMER_INTR_MASK);</div><div class='add'>+	cr &amp;= ~(TIMER_1_INT_OVERFLOW | TIMER_1_INT_MATCH2);</div><div class='add'>+	cr |= TIMER_1_INT_MATCH1;</div><div class='add'>+	writel(cr, base + TIMER_INTR_MASK);</div><div class='add'>+</div><div class='add'>+	/* start the timer */</div><div class='add'>+	cr = readl(base + TIMER_CR);</div><div class='add'>+	cr |= TIMER_1_CR_ENABLE;</div><div class='add'>+	writel(cr, base + TIMER_CR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gemini_timer_set_periodic(struct clock_event_device *evt)</div><div class='add'>+{</div><div class='add'>+	u32 period = DIV_ROUND_CLOSEST(tick_rate, HZ);</div><div class='add'>+	u32 cr;</div><div class='add'>+</div><div class='add'>+	/* Stop timer and interrupt */</div><div class='add'>+	cr = readl(base + TIMER_CR);</div><div class='add'>+	cr &amp;= ~(TIMER_1_CR_ENABLE | TIMER_1_CR_INT);</div><div class='add'>+	writel(cr, base + TIMER_CR);</div><div class='add'>+</div><div class='add'>+	/* Setup timer to fire at 1/HT intervals. */</div><div class='add'>+	cr = 0xffffffff - (period - 1);</div><div class='add'>+	writel(cr, base + TIMER1_COUNT);</div><div class='add'>+	writel(cr, base + TIMER1_LOAD);</div><div class='add'>+</div><div class='add'>+	/* enable interrupt on overflow */</div><div class='add'>+	cr = readl(base + TIMER_INTR_MASK);</div><div class='add'>+	cr &amp;= ~(TIMER_1_INT_MATCH1 | TIMER_1_INT_MATCH2);</div><div class='add'>+	cr |= TIMER_1_INT_OVERFLOW;</div><div class='add'>+	writel(cr, base + TIMER_INTR_MASK);</div><div class='add'>+</div><div class='add'>+	/* Start the timer */</div><div class='add'>+	cr = readl(base + TIMER_CR);</div><div class='add'>+	cr |= TIMER_1_CR_ENABLE;</div><div class='add'>+	cr |= TIMER_1_CR_INT;</div><div class='add'>+	writel(cr, base + TIMER_CR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Use TIMER1 as clock event */</div><div class='add'>+static struct clock_event_device gemini_clockevent = {</div><div class='add'>+	.name			= "TIMER1",</div><div class='add'>+	/* Reasonably fast and accurate clock event */</div><div class='add'>+	.rating			= 300,</div><div class='add'>+	.shift                  = 32,</div><div class='add'>+	.features		= CLOCK_EVT_FEAT_PERIODIC |</div><div class='add'>+				  CLOCK_EVT_FEAT_ONESHOT,</div><div class='add'>+	.set_next_event		= gemini_timer_set_next_event,</div><div class='add'>+	.set_state_shutdown	= gemini_timer_shutdown,</div><div class='add'>+	.set_state_periodic	= gemini_timer_set_periodic,</div><div class='add'>+	.set_state_oneshot	= gemini_timer_shutdown,</div><div class='add'>+	.tick_resume		= gemini_timer_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IRQ handler for the timer</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t gemini_timer_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct clock_event_device *evt = &amp;gemini_clockevent;</div><div class='add'>+</div><div class='add'>+	evt-&gt;event_handler(evt);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irqaction gemini_timer_irq = {</div><div class='add'>+	.name		= "Gemini Timer Tick",</div><div class='add'>+	.flags		= IRQF_TIMER,</div><div class='add'>+	.handler	= gemini_timer_interrupt,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init gemini_timer_of_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	static struct regmap *map;</div><div class='add'>+	int irq;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	map = syscon_regmap_lookup_by_phandle(np, "syscon");</div><div class='add'>+	if (IS_ERR(map)) {</div><div class='add'>+		pr_err("Can't get regmap for syscon handle");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	ret = regmap_read(map, GLOBAL_STATUS, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Can't read syscon status register");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	base = of_iomap(np, 0);</div><div class='add'>+	if (!base) {</div><div class='add'>+		pr_err("Can't remap registers");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+	/* IRQ for timer 1 */</div><div class='add'>+	irq = irq_of_parse_and_map(np, 0);</div><div class='add'>+	if (irq &lt;= 0) {</div><div class='add'>+		pr_err("Can't parse IRQ");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tick_rate = REG_TO_AHB_SPEED(val) * 1000000;</div><div class='add'>+	printk(KERN_INFO "Bus: %dMHz", tick_rate / 1000000);</div><div class='add'>+</div><div class='add'>+	tick_rate /= 6;		/* APB bus run AHB*(1/6) */</div><div class='add'>+</div><div class='add'>+	switch (val &amp; CPU_AHB_RATIO_MASK) {</div><div class='add'>+	case CPU_AHB_1_1:</div><div class='add'>+		printk(KERN_CONT "(1/1)\n");</div><div class='add'>+		break;</div><div class='add'>+	case CPU_AHB_3_2:</div><div class='add'>+		printk(KERN_CONT "(3/2)\n");</div><div class='add'>+		break;</div><div class='add'>+	case CPU_AHB_24_13:</div><div class='add'>+		printk(KERN_CONT "(24/13)\n");</div><div class='add'>+		break;</div><div class='add'>+	case CPU_AHB_2_1:</div><div class='add'>+		printk(KERN_CONT "(2/1)\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset the interrupt mask and status</div><div class='add'>+	 */</div><div class='add'>+	writel(TIMER_INT_ALL_MASK, base + TIMER_INTR_MASK);</div><div class='add'>+	writel(0, base + TIMER_INTR_STATE);</div><div class='add'>+	writel(TIMER_DEFAULT_FLAGS, base + TIMER_CR);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup free-running clocksource timer (interrupts</div><div class='add'>+	 * disabled.)</div><div class='add'>+	 */</div><div class='add'>+	writel(0, base + TIMER3_COUNT);</div><div class='add'>+	writel(0, base + TIMER3_LOAD);</div><div class='add'>+	writel(0, base + TIMER3_MATCH1);</div><div class='add'>+	writel(0, base + TIMER3_MATCH2);</div><div class='add'>+	clocksource_mmio_init(base + TIMER3_COUNT,</div><div class='add'>+			      "gemini_clocksource", tick_rate,</div><div class='add'>+			      300, 32, clocksource_mmio_readl_up);</div><div class='add'>+	sched_clock_register(gemini_read_sched_clock, 32, tick_rate);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup clockevent timer (interrupt-driven.)</div><div class='add'>+	 */</div><div class='add'>+	writel(0, base + TIMER1_COUNT);</div><div class='add'>+	writel(0, base + TIMER1_LOAD);</div><div class='add'>+	writel(0, base + TIMER1_MATCH1);</div><div class='add'>+	writel(0, base + TIMER1_MATCH2);</div><div class='add'>+	setup_irq(irq, &amp;gemini_timer_irq);</div><div class='add'>+	gemini_clockevent.cpumask = cpumask_of(0);</div><div class='add'>+	clockevents_config_and_register(&amp;gemini_clockevent, tick_rate,</div><div class='add'>+					1, 0xffffffff);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+CLOCKSOURCE_OF_DECLARE(nomadik_mtu, "cortina,gemini-timer",</div><div class='add'>+		       gemini_timer_of_init);</div><div class='head'>diff --git a/drivers/clocksource/timer-nps.c b/drivers/clocksource/timer-nps.c<br/>index 70c149af8ee0..da1f7986e477 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/timer-nps.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/timer-nps.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/timer-nps.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-nps.c</a></div><div class='hunk'>@@ -46,35 +46,62 @@</div><div class='ctx'> /* This array is per cluster of CPUs (Each NPS400 cluster got 256 CPUs) */</div><div class='ctx'> static void *nps_msu_reg_low_addr[NPS_CLUSTER_NUM] __read_mostly;</div><div class='ctx'> </div><div class='del'>-static unsigned long nps_timer_rate;</div><div class='add'>+static int __init nps_get_timer_clk(struct device_node *node,</div><div class='add'>+			     unsigned long *timer_freq,</div><div class='add'>+			     struct clk **clk)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	*clk = of_clk_get(node, 0);</div><div class='add'>+	ret = PTR_ERR_OR_ZERO(*clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("timer missing clk");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(*clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Couldn't enable parent clk\n");</div><div class='add'>+		clk_put(*clk);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*timer_freq = clk_get_rate(*clk);</div><div class='add'>+	if (!(*timer_freq)) {</div><div class='add'>+		pr_err("Couldn't get clk rate\n");</div><div class='add'>+		clk_disable_unprepare(*clk);</div><div class='add'>+		clk_put(*clk);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static cycle_t nps_clksrc_read(struct clocksource *clksrc)</div><div class='add'>+static u64 nps_clksrc_read(struct clocksource *clksrc)</div><div class='ctx'> {</div><div class='ctx'> 	int cluster = raw_smp_processor_id() &gt;&gt; NPS_CLUSTER_OFFSET;</div><div class='ctx'> </div><div class='del'>-	return (cycle_t)ioread32be(nps_msu_reg_low_addr[cluster]);</div><div class='add'>+	return (u64)ioread32be(nps_msu_reg_low_addr[cluster]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init nps_setup_clocksource(struct device_node *node,</div><div class='del'>-					struct clk *clk)</div><div class='add'>+static int __init nps_setup_clocksource(struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, cluster;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	unsigned long nps_timer1_freq;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	for (cluster = 0; cluster &lt; NPS_CLUSTER_NUM; cluster++)</div><div class='ctx'> 		nps_msu_reg_low_addr[cluster] =</div><div class='ctx'> 			nps_host_reg((cluster &lt;&lt; NPS_CLUSTER_OFFSET),</div><div class='del'>-				 NPS_MSU_BLKID, NPS_MSU_TICK_LOW);</div><div class='add'>+				     NPS_MSU_BLKID, NPS_MSU_TICK_LOW);</div><div class='ctx'> </div><div class='del'>-	ret = clk_prepare_enable(clk);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("Couldn't enable parent clock\n");</div><div class='add'>+	ret = nps_get_timer_clk(node, &amp;nps_timer1_freq, &amp;clk);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nps_timer_rate = clk_get_rate(clk);</div><div class='ctx'> </div><div class='del'>-	ret = clocksource_mmio_init(nps_msu_reg_low_addr, "EZnps-tick",</div><div class='del'>-				    nps_timer_rate, 301, 32, nps_clksrc_read);</div><div class='add'>+	ret = clocksource_mmio_init(nps_msu_reg_low_addr, "nps-tick",</div><div class='add'>+				    nps_timer1_freq, 300, 32, nps_clksrc_read);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("Couldn't register clock source.\n");</div><div class='ctx'> 		clk_disable_unprepare(clk);</div><div class='hunk'>@@ -83,18 +110,175 @@ static int __init nps_setup_clocksource(struct device_node *node,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init nps_timer_init(struct device_node *node)</div><div class='add'>+CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clksrc, "ezchip,nps400-timer",</div><div class='add'>+		       nps_setup_clocksource);</div><div class='add'>+CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clk_src, "ezchip,nps400-timer1",</div><div class='add'>+		       nps_setup_clocksource);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_EZNPS_MTM_EXT</div><div class='add'>+#include &lt;soc/nps/mtm.h&gt;</div><div class='add'>+</div><div class='add'>+/* Timer related Aux registers */</div><div class='add'>+#define NPS_REG_TIMER0_TSI	0xFFFFF850</div><div class='add'>+#define NPS_REG_TIMER0_LIMIT	0x23</div><div class='add'>+#define NPS_REG_TIMER0_CTRL	0x22</div><div class='add'>+#define NPS_REG_TIMER0_CNT	0x21</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interrupt Enabled (IE) - re-arm the timer</div><div class='add'>+ * Not Halted (NH) - is cleared when working with JTAG (for debug)</div><div class='add'>+ */</div><div class='add'>+#define TIMER0_CTRL_IE		BIT(0)</div><div class='add'>+#define TIMER0_CTRL_NH		BIT(1)</div><div class='add'>+</div><div class='add'>+static unsigned long nps_timer0_freq;</div><div class='add'>+static unsigned long nps_timer0_irq;</div><div class='add'>+</div><div class='add'>+static void nps_clkevent_rm_thread(void)</div><div class='add'>+{</div><div class='add'>+	int thread;</div><div class='add'>+	unsigned int cflags, enabled_threads;</div><div class='add'>+</div><div class='add'>+	hw_schd_save(&amp;cflags);</div><div class='add'>+</div><div class='add'>+	enabled_threads = read_aux_reg(NPS_REG_TIMER0_TSI);</div><div class='add'>+</div><div class='add'>+	/* remove thread from TSI1 */</div><div class='add'>+	thread = read_aux_reg(CTOP_AUX_THREAD_ID);</div><div class='add'>+	enabled_threads &amp;= ~(1 &lt;&lt; thread);</div><div class='add'>+	write_aux_reg(NPS_REG_TIMER0_TSI, enabled_threads);</div><div class='add'>+</div><div class='add'>+	/* Acknowledge and if needed re-arm the timer */</div><div class='add'>+	if (!enabled_threads)</div><div class='add'>+		write_aux_reg(NPS_REG_TIMER0_CTRL, TIMER0_CTRL_NH);</div><div class='add'>+	else</div><div class='add'>+		write_aux_reg(NPS_REG_TIMER0_CTRL,</div><div class='add'>+			      TIMER0_CTRL_IE | TIMER0_CTRL_NH);</div><div class='add'>+</div><div class='add'>+	hw_schd_restore(cflags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nps_clkevent_add_thread(unsigned long delta)</div><div class='add'>+{</div><div class='add'>+	int thread;</div><div class='add'>+	unsigned int cflags, enabled_threads;</div><div class='add'>+</div><div class='add'>+	hw_schd_save(&amp;cflags);</div><div class='add'>+</div><div class='add'>+	/* add thread to TSI1 */</div><div class='add'>+	thread = read_aux_reg(CTOP_AUX_THREAD_ID);</div><div class='add'>+	enabled_threads = read_aux_reg(NPS_REG_TIMER0_TSI);</div><div class='add'>+	enabled_threads |= (1 &lt;&lt; thread);</div><div class='add'>+	write_aux_reg(NPS_REG_TIMER0_TSI, enabled_threads);</div><div class='add'>+</div><div class='add'>+	/* set next timer event */</div><div class='add'>+	write_aux_reg(NPS_REG_TIMER0_LIMIT, delta);</div><div class='add'>+	write_aux_reg(NPS_REG_TIMER0_CNT, 0);</div><div class='add'>+	write_aux_reg(NPS_REG_TIMER0_CTRL,</div><div class='add'>+		      TIMER0_CTRL_IE | TIMER0_CTRL_NH);</div><div class='add'>+</div><div class='add'>+	hw_schd_restore(cflags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Whenever anyone tries to change modes, we just mask interrupts</div><div class='add'>+ * and wait for the next event to get set.</div><div class='add'>+ */</div><div class='add'>+static int nps_clkevent_set_state(struct clock_event_device *dev)</div><div class='add'>+{</div><div class='add'>+	nps_clkevent_rm_thread();</div><div class='add'>+	disable_percpu_irq(nps_timer0_irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nps_clkevent_set_next_event(unsigned long delta,</div><div class='add'>+				       struct clock_event_device *dev)</div><div class='add'>+{</div><div class='add'>+	nps_clkevent_add_thread(delta);</div><div class='add'>+	enable_percpu_irq(nps_timer0_irq, IRQ_TYPE_NONE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct clock_event_device, nps_clockevent_device) = {</div><div class='add'>+	.name				=	"NPS Timer0",</div><div class='add'>+	.features			=	CLOCK_EVT_FEAT_ONESHOT,</div><div class='add'>+	.rating				=	300,</div><div class='add'>+	.set_next_event			=	nps_clkevent_set_next_event,</div><div class='add'>+	.set_state_oneshot		=	nps_clkevent_set_state,</div><div class='add'>+	.set_state_oneshot_stopped	=	nps_clkevent_set_state,</div><div class='add'>+	.set_state_shutdown		=	nps_clkevent_set_state,</div><div class='add'>+	.tick_resume			=	nps_clkevent_set_state,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t timer_irq_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct clock_event_device *evt = dev_id;</div><div class='add'>+</div><div class='add'>+	nps_clkevent_rm_thread();</div><div class='add'>+	evt-&gt;event_handler(evt);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nps_timer_starting_cpu(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct clock_event_device *evt = this_cpu_ptr(&amp;nps_clockevent_device);</div><div class='add'>+</div><div class='add'>+	evt-&gt;cpumask = cpumask_of(smp_processor_id());</div><div class='add'>+</div><div class='add'>+	clockevents_config_and_register(evt, nps_timer0_freq, 0, ULONG_MAX);</div><div class='add'>+	enable_percpu_irq(nps_timer0_irq, IRQ_TYPE_NONE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nps_timer_dying_cpu(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	disable_percpu_irq(nps_timer0_irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init nps_setup_clockevent(struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *clk;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	clk = of_clk_get(node, 0);</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		pr_err("Can't get timer clock.\n");</div><div class='del'>-		return PTR_ERR(clk);</div><div class='add'>+	nps_timer0_irq = irq_of_parse_and_map(node, 0);</div><div class='add'>+	if (nps_timer0_irq &lt;= 0) {</div><div class='add'>+		pr_err("clockevent: missing irq");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return nps_setup_clocksource(node, clk);</div><div class='add'>+	ret = nps_get_timer_clk(node, &amp;nps_timer0_freq, &amp;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Needs apriori irq_set_percpu_devid() done in intc map function */</div><div class='add'>+	ret = request_percpu_irq(nps_timer0_irq, timer_irq_handler,</div><div class='add'>+				 "Timer0 (per-cpu-tick)",</div><div class='add'>+				 &amp;nps_clockevent_device);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Couldn't request irq\n");</div><div class='add'>+		clk_disable_unprepare(clk);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_ARC_TIMER_STARTING,</div><div class='add'>+				"clockevents/nps:starting",</div><div class='add'>+				nps_timer_starting_cpu,</div><div class='add'>+				nps_timer_dying_cpu);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Failed to setup hotplug state");</div><div class='add'>+		clk_disable_unprepare(clk);</div><div class='add'>+		free_percpu_irq(nps_timer0_irq, &amp;nps_clockevent_device);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clksrc, "ezchip,nps400-timer",</div><div class='del'>-		       nps_timer_init);</div><div class='add'>+CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clk_evt, "ezchip,nps400-timer0",</div><div class='add'>+		       nps_setup_clockevent);</div><div class='add'>+#endif /* CONFIG_EZNPS_MTM_EXT */</div><div class='head'>diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c<br/>index c32148ec7a38..bfa981ac1eaf 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/timer-prima2.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/timer-prima2.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/timer-prima2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-prima2.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* read 64-bit timer counter */</div><div class='del'>-static cycle_t notrace sirfsoc_timer_read(struct clocksource *cs)</div><div class='add'>+static u64 notrace sirfsoc_timer_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	u64 cycles;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c<br/>index 4f87f3e76d83..a3e662b15964 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/timer-sun5i.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/timer-sun5i.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/timer-sun5i.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-sun5i.c</a></div><div class='hunk'>@@ -152,7 +152,7 @@ static irqreturn_t sun5i_timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t sun5i_clksrc_read(struct clocksource *clksrc)</div><div class='add'>+static u64 sun5i_clksrc_read(struct clocksource *clksrc)</div><div class='ctx'> {</div><div class='ctx'> 	struct sun5i_timer_clksrc *cs = to_sun5i_timer_clksrc(clksrc);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/clocksource/timer-ti-32k.c b/drivers/clocksource/timer-ti-32k.c<br/>index cf5b14e442e4..624067712ef0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/timer-ti-32k.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/timer-ti-32k.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/timer-ti-32k.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/timer-ti-32k.c</a></div><div class='hunk'>@@ -65,11 +65,11 @@ static inline struct ti_32k *to_ti_32k(struct clocksource *cs)</div><div class='ctx'> 	return container_of(cs, struct ti_32k, cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t notrace ti_32k_read_cycles(struct clocksource *cs)</div><div class='add'>+static u64 notrace ti_32k_read_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ti_32k *ti = to_ti_32k(cs);</div><div class='ctx'> </div><div class='del'>-	return (cycle_t)readl_relaxed(ti-&gt;counter);</div><div class='add'>+	return (u64)readl_relaxed(ti-&gt;counter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ti_32k ti_32k_timer = {</div><div class='head'>diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c<br/>index b15069483fbd..d02b51075ad1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/clocksource/vt8500_timer.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/clocksource/vt8500_timer.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/clocksource/vt8500_timer.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/clocksource/vt8500_timer.c</a></div><div class='hunk'>@@ -53,7 +53,7 @@</div><div class='ctx'> </div><div class='ctx'> static void __iomem *regbase;</div><div class='ctx'> </div><div class='del'>-static cycle_t vt8500_timer_read(struct clocksource *cs)</div><div class='add'>+static u64 vt8500_timer_read(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	int loops = msecs_to_loops(10);</div><div class='ctx'> 	writel(3, regbase + TIMER_CTRL_VAL);</div><div class='hunk'>@@ -75,7 +75,7 @@ static int vt8500_timer_set_next_event(unsigned long cycles,</div><div class='ctx'> 				    struct clock_event_device *evt)</div><div class='ctx'> {</div><div class='ctx'> 	int loops = msecs_to_loops(10);</div><div class='del'>-	cycle_t alarm = clocksource.read(&amp;clocksource) + cycles;</div><div class='add'>+	u64 alarm = clocksource.read(&amp;clocksource) + cycles;</div><div class='ctx'> 	while ((readl(regbase + TIMER_AS_VAL) &amp; TIMER_MATCH_W_ACTIVE)</div><div class='ctx'> 						&amp;&amp; --loops)</div><div class='ctx'> 		cpu_relax();</div><div class='head'>diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig<br/>index d8b164a7c4e5..4ebae43118ef 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/Kconfig</a></div><div class='hunk'>@@ -37,14 +37,6 @@ config CPU_FREQ_STAT</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say N.</div><div class='ctx'> </div><div class='del'>-config CPU_FREQ_STAT_DETAILS</div><div class='del'>-	bool "CPU frequency transition statistics details"</div><div class='del'>-	depends on CPU_FREQ_STAT</div><div class='del'>-	help</div><div class='del'>-	  Show detailed CPU frequency transition table in sysfs.</div><div class='del'>-</div><div class='del'>-	  If in doubt, say N.</div><div class='del'>-</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "Default CPUFreq governor"</div><div class='ctx'> 	default CPU_FREQ_DEFAULT_GOV_USERSPACE if ARM_SA1100_CPUFREQ || ARM_SA1110_CPUFREQ</div><div class='hunk'>@@ -271,6 +263,16 @@ config IA64_ACPI_CPUFREQ</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> if MIPS</div><div class='add'>+config BMIPS_CPUFREQ</div><div class='add'>+	tristate "BMIPS CPUfreq Driver"</div><div class='add'>+	help</div><div class='add'>+	  This option adds a CPUfreq driver for BMIPS processors with</div><div class='add'>+	  support for configurable CPU frequency.</div><div class='add'>+</div><div class='add'>+	  For now, BMIPS5 chips are supported (such as the Broadcom 7425).</div><div class='add'>+</div><div class='add'>+	  If in doubt, say N.</div><div class='add'>+</div><div class='ctx'> config LOONGSON2_CPUFREQ</div><div class='ctx'> 	tristate "Loongson2 CPUFreq Driver"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -332,7 +334,7 @@ endif</div><div class='ctx'> </div><div class='ctx'> config QORIQ_CPUFREQ</div><div class='ctx'> 	tristate "CPU frequency scaling driver for Freescale QorIQ SoCs"</div><div class='del'>-	depends on OF &amp;&amp; COMMON_CLK &amp;&amp; (PPC_E500MC || ARM)</div><div class='add'>+	depends on OF &amp;&amp; COMMON_CLK &amp;&amp; (PPC_E500MC || ARM || ARM64)</div><div class='ctx'> 	depends on !CPU_THERMAL || THERMAL</div><div class='ctx'> 	select CLK_QORIQ</div><div class='ctx'> 	help</div><div class='head'>diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm<br/>index d89b8afe23b6..74fa5c5904d3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/Kconfig.arm?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/Kconfig.arm</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/Kconfig.arm?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/Kconfig.arm</a></div><div class='hunk'>@@ -12,6 +12,27 @@ config ARM_BIG_LITTLE_CPUFREQ</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables the Generic CPUfreq driver for ARM big.LITTLE platforms.</div><div class='ctx'> </div><div class='add'>+config ARM_BRCMSTB_AVS_CPUFREQ</div><div class='add'>+	tristate "Broadcom STB AVS CPUfreq driver"</div><div class='add'>+	depends on ARCH_BRCMSTB || COMPILE_TEST</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Some Broadcom STB SoCs use a co-processor running proprietary firmware</div><div class='add'>+	  ("AVS") to handle voltage and frequency scaling. This driver provides</div><div class='add'>+	  a standard CPUfreq interface to to the firmware.</div><div class='add'>+</div><div class='add'>+	  Say Y, if you have a Broadcom SoC with AVS support for DFS or DVFS.</div><div class='add'>+</div><div class='add'>+config ARM_BRCMSTB_AVS_CPUFREQ_DEBUG</div><div class='add'>+	bool "Broadcom STB AVS CPUfreq driver sysfs debug capability"</div><div class='add'>+	depends on ARM_BRCMSTB_AVS_CPUFREQ</div><div class='add'>+	help</div><div class='add'>+	  Enabling this option turns on debug support via sysfs under</div><div class='add'>+	  /sys/kernel/debug/brcmstb-avs-cpufreq. It is possible to read all and</div><div class='add'>+	  write some AVS mailbox registers through sysfs entries.</div><div class='add'>+</div><div class='add'>+	  If in doubt, say N.</div><div class='add'>+</div><div class='ctx'> config ARM_DT_BL_CPUFREQ</div><div class='ctx'> 	tristate "Generic probing via DT for ARM big LITTLE CPUfreq driver"</div><div class='ctx'> 	depends on ARM_BIG_LITTLE_CPUFREQ &amp;&amp; OF</div><div class='hunk'>@@ -60,14 +81,6 @@ config ARM_IMX6Q_CPUFREQ</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say N.</div><div class='ctx'> </div><div class='del'>-config ARM_INTEGRATOR</div><div class='del'>-	tristate "CPUfreq driver for ARM Integrator CPUs"</div><div class='del'>-	depends on ARCH_INTEGRATOR</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  This enables the CPUfreq driver for ARM Integrator CPUs.</div><div class='del'>-	  If in doubt, say Y.</div><div class='del'>-</div><div class='ctx'> config ARM_KIRKWOOD_CPUFREQ</div><div class='ctx'> 	def_bool MACH_KIRKWOOD</div><div class='ctx'> 	help</div><div class='hunk'>@@ -234,6 +247,17 @@ config ARM_TEGRA124_CPUFREQ</div><div class='ctx'> 	help</div><div class='ctx'> 	  This adds the CPUFreq driver support for Tegra124 SOCs.</div><div class='ctx'> </div><div class='add'>+config ARM_TI_CPUFREQ</div><div class='add'>+	bool "Texas Instruments CPUFreq support"</div><div class='add'>+	depends on ARCH_OMAP2PLUS</div><div class='add'>+	help</div><div class='add'>+	  This driver enables valid OPPs on the running platform based on</div><div class='add'>+	  values contained within the SoC in use. Enable this in order to</div><div class='add'>+	  use the cpufreq-dt driver on all Texas Instruments platforms that</div><div class='add'>+	  provide dt based operating-points-v2 tables with opp-supported-hw</div><div class='add'>+	  data provided. Required for cpufreq support on AM335x, AM437x,</div><div class='add'>+	  DRA7x, and AM57x platforms.</div><div class='add'>+</div><div class='ctx'> config ARM_PXA2xx_CPUFREQ</div><div class='ctx'> 	tristate "Intel PXA2xx CPUfreq driver"</div><div class='ctx'> 	depends on PXA27x || PXA25x</div><div class='hunk'>@@ -244,7 +268,7 @@ config ARM_PXA2xx_CPUFREQ</div><div class='ctx'> </div><div class='ctx'> config ACPI_CPPC_CPUFREQ</div><div class='ctx'> 	tristate "CPUFreq driver based on the ACPI CPPC spec"</div><div class='del'>-	depends on ACPI</div><div class='add'>+	depends on ACPI_PROCESSOR</div><div class='ctx'> 	select ACPI_CPPC_LIB</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='head'>diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86<br/>index adbd1de1cea5..35f71825b7f3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/Kconfig.x86?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/Kconfig.x86</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/Kconfig.x86?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/Kconfig.x86</a></div><div class='hunk'>@@ -6,6 +6,7 @@ config X86_INTEL_PSTATE</div><div class='ctx'>        bool "Intel P state control"</div><div class='ctx'>        depends on X86</div><div class='ctx'>        select ACPI_PROCESSOR if ACPI</div><div class='add'>+       select ACPI_CPPC_LIB if X86_64 &amp;&amp; ACPI &amp;&amp; SCHED_MC_PRIO</div><div class='ctx'>        help</div><div class='ctx'>           This driver provides a P state for Intel core processors.</div><div class='ctx'> 	  The driver implements an internal governor and will become</div><div class='head'>diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile<br/>index 0a9b6a093646..9f5a8045f36d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/Makefile</a></div><div class='hunk'>@@ -51,12 +51,12 @@ obj-$(CONFIG_ARM_BIG_LITTLE_CPUFREQ)	+= arm_big_little.o</div><div class='ctx'> # LITTLE drivers, so that it is probed last.</div><div class='ctx'> obj-$(CONFIG_ARM_DT_BL_CPUFREQ)		+= arm_big_little_dt.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_ARM_BRCMSTB_AVS_CPUFREQ)	+= brcmstb-avs-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARCH_DAVINCI)		+= davinci-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_UX500_SOC_DB8500)		+= dbx500-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_EXYNOS5440_CPUFREQ)	+= exynos5440-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ)	+= highbank-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_IMX6Q_CPUFREQ)		+= imx6q-cpufreq.o</div><div class='del'>-obj-$(CONFIG_ARM_INTEGRATOR)		+= integrator-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ)	+= kirkwood-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_MT8173_CPUFREQ)	+= mt8173-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ)	+= omap-cpufreq.o</div><div class='hunk'>@@ -77,6 +77,7 @@ obj-$(CONFIG_ARM_SPEAR_CPUFREQ)		+= spear-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_STI_CPUFREQ)		+= sti-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_TEGRA20_CPUFREQ)	+= tegra20-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_TEGRA124_CPUFREQ)	+= tegra124-cpufreq.o</div><div class='add'>+obj-$(CONFIG_ARM_TI_CPUFREQ)		+= ti-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ)	+= vexpress-spc-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ACPI_CPPC_CPUFREQ) += cppc_cpufreq.o</div><div class='ctx'> obj-$(CONFIG_MACH_MVEBU_V7)		+= mvebu-cpufreq.o</div><div class='hunk'>@@ -98,6 +99,7 @@ obj-$(CONFIG_POWERNV_CPUFREQ)		+= powernv-cpufreq.o</div><div class='ctx'> # Other platform drivers</div><div class='ctx'> obj-$(CONFIG_AVR32_AT32AP_CPUFREQ)	+= at32ap-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_BFIN_CPU_FREQ)		+= blackfin-cpufreq.o</div><div class='add'>+obj-$(CONFIG_BMIPS_CPUFREQ)		+= bmips-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_CRIS_MACH_ARTPEC3)		+= cris-artpec3-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ETRAXFS)			+= cris-etraxfs-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_IA64_ACPI_CPUFREQ)		+= ia64-acpi-cpufreq.o</div><div class='head'>diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c<br/>index 297e9128fe9f..3a2ca0f79daf 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/acpi-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/acpi-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/acpi-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/acpi-cpufreq.c</a></div><div class='hunk'>@@ -84,7 +84,6 @@ static inline struct acpi_processor_performance *to_perf_data(struct acpi_cpufre</div><div class='ctx'> static struct cpufreq_driver acpi_cpufreq_driver;</div><div class='ctx'> </div><div class='ctx'> static unsigned int acpi_pstate_strict;</div><div class='del'>-static struct msr __percpu *msrs;</div><div class='ctx'> </div><div class='ctx'> static bool boost_state(unsigned int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -104,11 +103,10 @@ static bool boost_state(unsigned int cpu)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void boost_set_msrs(bool enable, const struct cpumask *cpumask)</div><div class='add'>+static int boost_set_msr(bool enable)</div><div class='ctx'> {</div><div class='del'>-	u32 cpu;</div><div class='ctx'> 	u32 msr_addr;</div><div class='del'>-	u64 msr_mask;</div><div class='add'>+	u64 msr_mask, val;</div><div class='ctx'> </div><div class='ctx'> 	switch (boot_cpu_data.x86_vendor) {</div><div class='ctx'> 	case X86_VENDOR_INTEL:</div><div class='hunk'>@@ -120,26 +118,31 @@ static void boost_set_msrs(bool enable, const struct cpumask *cpumask)</div><div class='ctx'> 		msr_mask = MSR_K7_HWCR_CPB_DIS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rdmsr_on_cpus(cpumask, msr_addr, msrs);</div><div class='add'>+	rdmsrl(msr_addr, val);</div><div class='ctx'> </div><div class='del'>-	for_each_cpu(cpu, cpumask) {</div><div class='del'>-		struct msr *reg = per_cpu_ptr(msrs, cpu);</div><div class='del'>-		if (enable)</div><div class='del'>-			reg-&gt;q &amp;= ~msr_mask;</div><div class='del'>-		else</div><div class='del'>-			reg-&gt;q |= msr_mask;</div><div class='del'>-	}</div><div class='add'>+	if (enable)</div><div class='add'>+		val &amp;= ~msr_mask;</div><div class='add'>+	else</div><div class='add'>+		val |= msr_mask;</div><div class='add'>+</div><div class='add'>+	wrmsrl(msr_addr, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void boost_set_msr_each(void *p_en)</div><div class='add'>+{</div><div class='add'>+	bool enable = (bool) p_en;</div><div class='ctx'> </div><div class='del'>-	wrmsr_on_cpus(cpumask, msr_addr, msrs);</div><div class='add'>+	boost_set_msr(enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_boost(int val)</div><div class='ctx'> {</div><div class='ctx'> 	get_online_cpus();</div><div class='del'>-	boost_set_msrs(val, cpu_online_mask);</div><div class='add'>+	on_each_cpu(boost_set_msr_each, (void *)(long)val, 1);</div><div class='ctx'> 	put_online_cpus();</div><div class='ctx'> 	pr_debug("Core Boosting %sabled.\n", val ? "en" : "dis");</div><div class='ctx'> </div><div class='hunk'>@@ -536,46 +539,24 @@ static void free_acpi_perf_data(void)</div><div class='ctx'> 	free_percpu(acpi_perf_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int boost_notify(struct notifier_block *nb, unsigned long action,</div><div class='del'>-		      void *hcpu)</div><div class='add'>+static int cpufreq_boost_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned cpu = (long)hcpu;</div><div class='del'>-	const struct cpumask *cpumask;</div><div class='del'>-</div><div class='del'>-	cpumask = get_cpu_mask(cpu);</div><div class='add'>+	/*</div><div class='add'>+	 * On the CPU_UP path we simply keep the boost-disable flag</div><div class='add'>+	 * in sync with the current global state.</div><div class='add'>+	 */</div><div class='add'>+	return boost_set_msr(acpi_cpufreq_driver.boost_enabled);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int cpufreq_boost_down_prep(unsigned int cpu)</div><div class='add'>+{</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear the boost-disable bit on the CPU_DOWN path so that</div><div class='del'>-	 * this cpu cannot block the remaining ones from boosting. On</div><div class='del'>-	 * the CPU_UP path we simply keep the boost-disable flag in</div><div class='del'>-	 * sync with the current global state.</div><div class='add'>+	 * this cpu cannot block the remaining ones from boosting.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CPU_DOWN_FAILED:</div><div class='del'>-	case CPU_DOWN_FAILED_FROZEN:</div><div class='del'>-	case CPU_ONLINE:</div><div class='del'>-	case CPU_ONLINE_FROZEN:</div><div class='del'>-		boost_set_msrs(acpi_cpufreq_driver.boost_enabled, cpumask);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CPU_DOWN_PREPARE:</div><div class='del'>-	case CPU_DOWN_PREPARE_FROZEN:</div><div class='del'>-		boost_set_msrs(1, cpumask);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NOTIFY_OK;</div><div class='add'>+	return boost_set_msr(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct notifier_block boost_nb = {</div><div class='del'>-	.notifier_call          = boost_notify,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * acpi_cpufreq_early_init - initialize ACPI P-States library</div><div class='ctx'>  *</div><div class='hunk'>@@ -922,37 +903,35 @@ static struct cpufreq_driver acpi_cpufreq_driver = {</div><div class='ctx'> 	.attr		= acpi_cpufreq_attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static enum cpuhp_state acpi_cpufreq_online;</div><div class='add'>+</div><div class='ctx'> static void __init acpi_cpufreq_boost_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {</div><div class='del'>-		msrs = msrs_alloc();</div><div class='del'>-</div><div class='del'>-		if (!msrs)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		acpi_cpufreq_driver.set_boost = set_boost;</div><div class='del'>-		acpi_cpufreq_driver.boost_enabled = boost_state(0);</div><div class='del'>-</div><div class='del'>-		cpu_notifier_register_begin();</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-		/* Force all MSRs to the same value */</div><div class='del'>-		boost_set_msrs(acpi_cpufreq_driver.boost_enabled,</div><div class='del'>-			       cpu_online_mask);</div><div class='add'>+	if (!(boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		__register_cpu_notifier(&amp;boost_nb);</div><div class='add'>+	acpi_cpufreq_driver.set_boost = set_boost;</div><div class='add'>+	acpi_cpufreq_driver.boost_enabled = boost_state(0);</div><div class='ctx'> </div><div class='del'>-		cpu_notifier_register_done();</div><div class='add'>+	/*</div><div class='add'>+	 * This calls the online callback on all online cpu and forces all</div><div class='add'>+	 * MSRs to the same value.</div><div class='add'>+	 */</div><div class='add'>+	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "cpufreq/acpi:online",</div><div class='add'>+				cpufreq_boost_online, cpufreq_boost_down_prep);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("acpi_cpufreq: failed to register hotplug callbacks\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+	acpi_cpufreq_online = ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void acpi_cpufreq_boost_exit(void)</div><div class='ctx'> {</div><div class='del'>-	if (msrs) {</div><div class='del'>-		unregister_cpu_notifier(&amp;boost_nb);</div><div class='del'>-</div><div class='del'>-		msrs_free(msrs);</div><div class='del'>-		msrs = NULL;</div><div class='del'>-	}</div><div class='add'>+	if (acpi_cpufreq_online &gt; 0)</div><div class='add'>+		cpuhp_remove_state_nocalls(acpi_cpufreq_online);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_cpufreq_init(void)</div><div class='head'>diff --git a/drivers/cpufreq/bmips-cpufreq.c b/drivers/cpufreq/bmips-cpufreq.c<br/>new file mode 100644<br/>index 000000000000..1653151b77df<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/bmips-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/bmips-cpufreq.c</a></div><div class='hunk'>@@ -0,0 +1,188 @@</div><div class='add'>+/*</div><div class='add'>+ * CPU frequency scaling for Broadcom BMIPS SoCs</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2017 Broadcom</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation version 2.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any</div><div class='add'>+ * kind, whether express or implied; without even the implied warranty</div><div class='add'>+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cpufreq.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+/* for mips_hpt_frequency */</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+</div><div class='add'>+#define BMIPS_CPUFREQ_PREFIX	"bmips"</div><div class='add'>+#define BMIPS_CPUFREQ_NAME	BMIPS_CPUFREQ_PREFIX "-cpufreq"</div><div class='add'>+</div><div class='add'>+#define TRANSITION_LATENCY	(25 * 1000)	/* 25 us */</div><div class='add'>+</div><div class='add'>+#define BMIPS5_CLK_DIV_SET_SHIFT	0x7</div><div class='add'>+#define BMIPS5_CLK_DIV_SHIFT		0x4</div><div class='add'>+#define BMIPS5_CLK_DIV_MASK		0xf</div><div class='add'>+</div><div class='add'>+enum bmips_type {</div><div class='add'>+	BMIPS5000,</div><div class='add'>+	BMIPS5200,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpufreq_compat {</div><div class='add'>+	const char *compatible;</div><div class='add'>+	unsigned int bmips_type;</div><div class='add'>+	unsigned int clk_mult;</div><div class='add'>+	unsigned int max_freqs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BMIPS(c, t, m, f) { \</div><div class='add'>+	.compatible = c, \</div><div class='add'>+	.bmips_type = (t), \</div><div class='add'>+	.clk_mult = (m), \</div><div class='add'>+	.max_freqs = (f), \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cpufreq_compat bmips_cpufreq_compat[] = {</div><div class='add'>+	BMIPS("brcm,bmips5000", BMIPS5000, 8, 4),</div><div class='add'>+	BMIPS("brcm,bmips5200", BMIPS5200, 8, 4),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cpufreq_compat *priv;</div><div class='add'>+</div><div class='add'>+static int htp_freq_to_cpu_freq(unsigned int clk_mult)</div><div class='add'>+{</div><div class='add'>+	return mips_hpt_frequency * clk_mult / 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cpufreq_frequency_table *</div><div class='add'>+bmips_cpufreq_get_freq_table(const struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_frequency_table *table;</div><div class='add'>+	unsigned long cpu_freq;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cpu_freq = htp_freq_to_cpu_freq(priv-&gt;clk_mult);</div><div class='add'>+</div><div class='add'>+	table = kmalloc((priv-&gt;max_freqs + 1) * sizeof(*table), GFP_KERNEL);</div><div class='add'>+	if (!table)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;max_freqs; i++) {</div><div class='add'>+		table[i].frequency = cpu_freq / (1 &lt;&lt; i);</div><div class='add'>+		table[i].driver_data = i;</div><div class='add'>+	}</div><div class='add'>+	table[i].frequency = CPUFREQ_TABLE_END;</div><div class='add'>+</div><div class='add'>+	return table;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int bmips_cpufreq_get(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	unsigned int div;</div><div class='add'>+	uint32_t mode;</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;bmips_type) {</div><div class='add'>+	case BMIPS5200:</div><div class='add'>+	case BMIPS5000:</div><div class='add'>+		mode = read_c0_brcm_mode();</div><div class='add'>+		div = ((mode &gt;&gt; BMIPS5_CLK_DIV_SHIFT) &amp; BMIPS5_CLK_DIV_MASK);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		div = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return htp_freq_to_cpu_freq(priv-&gt;clk_mult) / (1 &lt;&lt; div);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bmips_cpufreq_target_index(struct cpufreq_policy *policy,</div><div class='add'>+				      unsigned int index)</div><div class='add'>+{</div><div class='add'>+	unsigned int div = policy-&gt;freq_table[index].driver_data;</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;bmips_type) {</div><div class='add'>+	case BMIPS5200:</div><div class='add'>+	case BMIPS5000:</div><div class='add'>+		change_c0_brcm_mode(BMIPS5_CLK_DIV_MASK &lt;&lt; BMIPS5_CLK_DIV_SHIFT,</div><div class='add'>+				    (1 &lt;&lt; BMIPS5_CLK_DIV_SET_SHIFT) |</div><div class='add'>+				    (div &lt;&lt; BMIPS5_CLK_DIV_SHIFT));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bmips_cpufreq_exit(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	kfree(policy-&gt;freq_table);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bmips_cpufreq_init(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_frequency_table *freq_table;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	freq_table = bmips_cpufreq_get_freq_table(policy);</div><div class='add'>+	if (IS_ERR(freq_table)) {</div><div class='add'>+		ret = PTR_ERR(freq_table);</div><div class='add'>+		pr_err("%s: couldn't determine frequency table (%d).\n",</div><div class='add'>+			BMIPS_CPUFREQ_NAME, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cpufreq_generic_init(policy, freq_table, TRANSITION_LATENCY);</div><div class='add'>+	if (ret)</div><div class='add'>+		bmips_cpufreq_exit(policy);</div><div class='add'>+	else</div><div class='add'>+		pr_info("%s: registered\n", BMIPS_CPUFREQ_NAME);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cpufreq_driver bmips_cpufreq_driver = {</div><div class='add'>+	.flags		= CPUFREQ_NEED_INITIAL_FREQ_CHECK,</div><div class='add'>+	.verify		= cpufreq_generic_frequency_table_verify,</div><div class='add'>+	.target_index	= bmips_cpufreq_target_index,</div><div class='add'>+	.get		= bmips_cpufreq_get,</div><div class='add'>+	.init		= bmips_cpufreq_init,</div><div class='add'>+	.exit		= bmips_cpufreq_exit,</div><div class='add'>+	.attr		= cpufreq_generic_attr,</div><div class='add'>+	.name		= BMIPS_CPUFREQ_PREFIX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bmips_cpufreq_probe(void)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_compat *cc;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	for (cc = bmips_cpufreq_compat; cc-&gt;compatible; cc++) {</div><div class='add'>+		np = of_find_compatible_node(NULL, "cpu", cc-&gt;compatible);</div><div class='add'>+		if (np) {</div><div class='add'>+			of_node_put(np);</div><div class='add'>+			priv = cc;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We hit the guard element of the array. No compatible CPU found. */</div><div class='add'>+	if (!cc-&gt;compatible)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return cpufreq_register_driver(&amp;bmips_cpufreq_driver);</div><div class='add'>+}</div><div class='add'>+device_initcall(bmips_cpufreq_probe);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Markus Mayer &lt;mmayer@broadcom.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("CPUfreq driver for Broadcom BMIPS SoCs");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c<br/>new file mode 100644<br/>index 000000000000..7281a2c19c36<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/brcmstb-avs-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/brcmstb-avs-cpufreq.c</a></div><div class='hunk'>@@ -0,0 +1,1066 @@</div><div class='add'>+/*</div><div class='add'>+ * CPU frequency scaling for Broadcom SoCs with AVS firmware that</div><div class='add'>+ * supports DVS or DVFS</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Broadcom</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation version 2.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any</div><div class='add'>+ * kind, whether express or implied; without even the implied warranty</div><div class='add'>+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * "AVS" is the name of a firmware developed at Broadcom. It derives</div><div class='add'>+ * its name from the technique called "Adaptive Voltage Scaling".</div><div class='add'>+ * Adaptive voltage scaling was the original purpose of this firmware.</div><div class='add'>+ * The AVS firmware still supports "AVS mode", where all it does is</div><div class='add'>+ * adaptive voltage scaling. However, on some newer Broadcom SoCs, the</div><div class='add'>+ * AVS Firmware, despite its unchanged name, also supports DFS mode and</div><div class='add'>+ * DVFS mode.</div><div class='add'>+ *</div><div class='add'>+ * In the context of this document and the related driver, "AVS" by</div><div class='add'>+ * itself always means the Broadcom firmware and never refers to the</div><div class='add'>+ * technique called "Adaptive Voltage Scaling".</div><div class='add'>+ *</div><div class='add'>+ * The Broadcom STB AVS CPUfreq driver provides voltage and frequency</div><div class='add'>+ * scaling on Broadcom SoCs using AVS firmware with support for DFS and</div><div class='add'>+ * DVFS. The AVS firmware is running on its own co-processor. The</div><div class='add'>+ * driver supports both uniprocessor (UP) and symmetric multiprocessor</div><div class='add'>+ * (SMP) systems which share clock and voltage across all CPUs.</div><div class='add'>+ *</div><div class='add'>+ * Actual voltage and frequency scaling is done solely by the AVS</div><div class='add'>+ * firmware. This driver does not change frequency or voltage itself.</div><div class='add'>+ * It provides a standard CPUfreq interface to the rest of the kernel</div><div class='add'>+ * and to userland. It interfaces with the AVS firmware to effect the</div><div class='add'>+ * requested changes and to report back the current system status in a</div><div class='add'>+ * way that is expected by existing tools.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cpufreq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/semaphore.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARM_BRCMSTB_AVS_CPUFREQ_DEBUG</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Max number of arguments AVS calls take */</div><div class='add'>+#define AVS_MAX_CMD_ARGS	4</div><div class='add'>+/*</div><div class='add'>+ * This macro is used to generate AVS parameter register offsets. For</div><div class='add'>+ * x &gt;= AVS_MAX_CMD_ARGS, it returns 0 to protect against accidental memory</div><div class='add'>+ * access outside of the parameter range. (Offset 0 is the first parameter.)</div><div class='add'>+ */</div><div class='add'>+#define AVS_PARAM_MULT(x)	((x) &lt; AVS_MAX_CMD_ARGS ? (x) : 0)</div><div class='add'>+</div><div class='add'>+/* AVS Mailbox Register offsets */</div><div class='add'>+#define AVS_MBOX_COMMAND	0x00</div><div class='add'>+#define AVS_MBOX_STATUS		0x04</div><div class='add'>+#define AVS_MBOX_VOLTAGE0	0x08</div><div class='add'>+#define AVS_MBOX_TEMP0		0x0c</div><div class='add'>+#define AVS_MBOX_PV0		0x10</div><div class='add'>+#define AVS_MBOX_MV0		0x14</div><div class='add'>+#define AVS_MBOX_PARAM(x)	(0x18 + AVS_PARAM_MULT(x) * sizeof(u32))</div><div class='add'>+#define AVS_MBOX_REVISION	0x28</div><div class='add'>+#define AVS_MBOX_PSTATE		0x2c</div><div class='add'>+#define AVS_MBOX_HEARTBEAT	0x30</div><div class='add'>+#define AVS_MBOX_MAGIC		0x34</div><div class='add'>+#define AVS_MBOX_SIGMA_HVT	0x38</div><div class='add'>+#define AVS_MBOX_SIGMA_SVT	0x3c</div><div class='add'>+#define AVS_MBOX_VOLTAGE1	0x40</div><div class='add'>+#define AVS_MBOX_TEMP1		0x44</div><div class='add'>+#define AVS_MBOX_PV1		0x48</div><div class='add'>+#define AVS_MBOX_MV1		0x4c</div><div class='add'>+#define AVS_MBOX_FREQUENCY	0x50</div><div class='add'>+</div><div class='add'>+/* AVS Commands */</div><div class='add'>+#define AVS_CMD_AVAILABLE	0x00</div><div class='add'>+#define AVS_CMD_DISABLE		0x10</div><div class='add'>+#define AVS_CMD_ENABLE		0x11</div><div class='add'>+#define AVS_CMD_S2_ENTER	0x12</div><div class='add'>+#define AVS_CMD_S2_EXIT		0x13</div><div class='add'>+#define AVS_CMD_BBM_ENTER	0x14</div><div class='add'>+#define AVS_CMD_BBM_EXIT	0x15</div><div class='add'>+#define AVS_CMD_S3_ENTER	0x16</div><div class='add'>+#define AVS_CMD_S3_EXIT		0x17</div><div class='add'>+#define AVS_CMD_BALANCE		0x18</div><div class='add'>+/* PMAP and P-STATE commands */</div><div class='add'>+#define AVS_CMD_GET_PMAP	0x30</div><div class='add'>+#define AVS_CMD_SET_PMAP	0x31</div><div class='add'>+#define AVS_CMD_GET_PSTATE	0x40</div><div class='add'>+#define AVS_CMD_SET_PSTATE	0x41</div><div class='add'>+</div><div class='add'>+/* Different modes AVS supports (for GET_PMAP/SET_PMAP) */</div><div class='add'>+#define AVS_MODE_AVS		0x0</div><div class='add'>+#define AVS_MODE_DFS		0x1</div><div class='add'>+#define AVS_MODE_DVS		0x2</div><div class='add'>+#define AVS_MODE_DVFS		0x3</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PMAP parameter p1</div><div class='add'>+ * unused:31-24, mdiv_p0:23-16, unused:15-14, pdiv:13-10 , ndiv_int:9-0</div><div class='add'>+ */</div><div class='add'>+#define NDIV_INT_SHIFT		0</div><div class='add'>+#define NDIV_INT_MASK		0x3ff</div><div class='add'>+#define PDIV_SHIFT		10</div><div class='add'>+#define PDIV_MASK		0xf</div><div class='add'>+#define MDIV_P0_SHIFT		16</div><div class='add'>+#define MDIV_P0_MASK		0xff</div><div class='add'>+/*</div><div class='add'>+ * PMAP parameter p2</div><div class='add'>+ * mdiv_p4:31-24, mdiv_p3:23-16, mdiv_p2:15:8, mdiv_p1:7:0</div><div class='add'>+ */</div><div class='add'>+#define MDIV_P1_SHIFT		0</div><div class='add'>+#define MDIV_P1_MASK		0xff</div><div class='add'>+#define MDIV_P2_SHIFT		8</div><div class='add'>+#define MDIV_P2_MASK		0xff</div><div class='add'>+#define MDIV_P3_SHIFT		16</div><div class='add'>+#define MDIV_P3_MASK		0xff</div><div class='add'>+#define MDIV_P4_SHIFT		24</div><div class='add'>+#define MDIV_P4_MASK		0xff</div><div class='add'>+</div><div class='add'>+/* Different P-STATES AVS supports (for GET_PSTATE/SET_PSTATE) */</div><div class='add'>+#define AVS_PSTATE_P0		0x0</div><div class='add'>+#define AVS_PSTATE_P1		0x1</div><div class='add'>+#define AVS_PSTATE_P2		0x2</div><div class='add'>+#define AVS_PSTATE_P3		0x3</div><div class='add'>+#define AVS_PSTATE_P4		0x4</div><div class='add'>+#define AVS_PSTATE_MAX		AVS_PSTATE_P4</div><div class='add'>+</div><div class='add'>+/* CPU L2 Interrupt Controller Registers */</div><div class='add'>+#define AVS_CPU_L2_SET0		0x04</div><div class='add'>+#define AVS_CPU_L2_INT_MASK	BIT(31)</div><div class='add'>+</div><div class='add'>+/* AVS Command Status Values */</div><div class='add'>+#define AVS_STATUS_CLEAR	0x00</div><div class='add'>+/* Command/notification accepted */</div><div class='add'>+#define AVS_STATUS_SUCCESS	0xf0</div><div class='add'>+/* Command/notification rejected */</div><div class='add'>+#define AVS_STATUS_FAILURE	0xff</div><div class='add'>+/* Invalid command/notification (unknown) */</div><div class='add'>+#define AVS_STATUS_INVALID	0xf1</div><div class='add'>+/* Non-AVS modes are not supported */</div><div class='add'>+#define AVS_STATUS_NO_SUPP	0xf2</div><div class='add'>+/* Cannot set P-State until P-Map supplied */</div><div class='add'>+#define AVS_STATUS_NO_MAP	0xf3</div><div class='add'>+/* Cannot change P-Map after initial P-Map set */</div><div class='add'>+#define AVS_STATUS_MAP_SET	0xf4</div><div class='add'>+/* Max AVS status; higher numbers are used for debugging */</div><div class='add'>+#define AVS_STATUS_MAX		0xff</div><div class='add'>+</div><div class='add'>+/* Other AVS related constants */</div><div class='add'>+#define AVS_LOOP_LIMIT		10000</div><div class='add'>+#define AVS_TIMEOUT		300 /* in ms; expected completion is &lt; 10ms */</div><div class='add'>+#define AVS_FIRMWARE_MAGIC	0xa11600d1</div><div class='add'>+</div><div class='add'>+#define BRCM_AVS_CPUFREQ_PREFIX	"brcmstb-avs"</div><div class='add'>+#define BRCM_AVS_CPUFREQ_NAME	BRCM_AVS_CPUFREQ_PREFIX "-cpufreq"</div><div class='add'>+#define BRCM_AVS_CPU_DATA	"brcm,avs-cpu-data-mem"</div><div class='add'>+#define BRCM_AVS_CPU_INTR	"brcm,avs-cpu-l2-intr"</div><div class='add'>+#define BRCM_AVS_HOST_INTR	"sw_intr"</div><div class='add'>+</div><div class='add'>+struct pmap {</div><div class='add'>+	unsigned int mode;</div><div class='add'>+	unsigned int p1;</div><div class='add'>+	unsigned int p2;</div><div class='add'>+	unsigned int state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct private_data {</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	void __iomem *avs_intr_base;</div><div class='add'>+	struct device *dev;</div><div class='add'>+#ifdef CONFIG_ARM_BRCMSTB_AVS_CPUFREQ_DEBUG</div><div class='add'>+	struct dentry *debugfs;</div><div class='add'>+#endif</div><div class='add'>+	struct completion done;</div><div class='add'>+	struct semaphore sem;</div><div class='add'>+	struct pmap pmap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARM_BRCMSTB_AVS_CPUFREQ_DEBUG</div><div class='add'>+</div><div class='add'>+enum debugfs_format {</div><div class='add'>+	DEBUGFS_NORMAL,</div><div class='add'>+	DEBUGFS_FLOAT,</div><div class='add'>+	DEBUGFS_REV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct debugfs_data {</div><div class='add'>+	struct debugfs_entry *entry;</div><div class='add'>+	struct private_data *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct debugfs_entry {</div><div class='add'>+	char *name;</div><div class='add'>+	u32 offset;</div><div class='add'>+	fmode_t mode;</div><div class='add'>+	enum debugfs_format format;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_ENTRY(name, mode, format)	{ \</div><div class='add'>+	#name, AVS_MBOX_##name, mode, format \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are used for debugfs only. Otherwise we use AVS_MBOX_PARAM() directly.</div><div class='add'>+ */</div><div class='add'>+#define AVS_MBOX_PARAM1		AVS_MBOX_PARAM(0)</div><div class='add'>+#define AVS_MBOX_PARAM2		AVS_MBOX_PARAM(1)</div><div class='add'>+#define AVS_MBOX_PARAM3		AVS_MBOX_PARAM(2)</div><div class='add'>+#define AVS_MBOX_PARAM4		AVS_MBOX_PARAM(3)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This table stores the name, access permissions and offset for each hardware</div><div class='add'>+ * register and is used to generate debugfs entries.</div><div class='add'>+ */</div><div class='add'>+static struct debugfs_entry debugfs_entries[] = {</div><div class='add'>+	DEBUGFS_ENTRY(COMMAND, S_IWUSR, DEBUGFS_NORMAL),</div><div class='add'>+	DEBUGFS_ENTRY(STATUS, S_IWUSR, DEBUGFS_NORMAL),</div><div class='add'>+	DEBUGFS_ENTRY(VOLTAGE0, 0, DEBUGFS_FLOAT),</div><div class='add'>+	DEBUGFS_ENTRY(TEMP0, 0, DEBUGFS_FLOAT),</div><div class='add'>+	DEBUGFS_ENTRY(PV0, 0, DEBUGFS_FLOAT),</div><div class='add'>+	DEBUGFS_ENTRY(MV0, 0, DEBUGFS_FLOAT),</div><div class='add'>+	DEBUGFS_ENTRY(PARAM1, S_IWUSR, DEBUGFS_NORMAL),</div><div class='add'>+	DEBUGFS_ENTRY(PARAM2, S_IWUSR, DEBUGFS_NORMAL),</div><div class='add'>+	DEBUGFS_ENTRY(PARAM3, S_IWUSR, DEBUGFS_NORMAL),</div><div class='add'>+	DEBUGFS_ENTRY(PARAM4, S_IWUSR, DEBUGFS_NORMAL),</div><div class='add'>+	DEBUGFS_ENTRY(REVISION, 0, DEBUGFS_REV),</div><div class='add'>+	DEBUGFS_ENTRY(PSTATE, 0, DEBUGFS_NORMAL),</div><div class='add'>+	DEBUGFS_ENTRY(HEARTBEAT, 0, DEBUGFS_NORMAL),</div><div class='add'>+	DEBUGFS_ENTRY(MAGIC, S_IWUSR, DEBUGFS_NORMAL),</div><div class='add'>+	DEBUGFS_ENTRY(SIGMA_HVT, 0, DEBUGFS_NORMAL),</div><div class='add'>+	DEBUGFS_ENTRY(SIGMA_SVT, 0, DEBUGFS_NORMAL),</div><div class='add'>+	DEBUGFS_ENTRY(VOLTAGE1, 0, DEBUGFS_FLOAT),</div><div class='add'>+	DEBUGFS_ENTRY(TEMP1, 0, DEBUGFS_FLOAT),</div><div class='add'>+	DEBUGFS_ENTRY(PV1, 0, DEBUGFS_FLOAT),</div><div class='add'>+	DEBUGFS_ENTRY(MV1, 0, DEBUGFS_FLOAT),</div><div class='add'>+	DEBUGFS_ENTRY(FREQUENCY, 0, DEBUGFS_NORMAL),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int brcm_avs_target_index(struct cpufreq_policy *, unsigned int);</div><div class='add'>+</div><div class='add'>+static char *__strtolower(char *s)</div><div class='add'>+{</div><div class='add'>+	char *p;</div><div class='add'>+</div><div class='add'>+	for (p = s; *p; p++)</div><div class='add'>+		*p = tolower(*p);</div><div class='add'>+</div><div class='add'>+	return s;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ARM_BRCMSTB_AVS_CPUFREQ_DEBUG */</div><div class='add'>+</div><div class='add'>+static void __iomem *__map_region(const char *name)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	void __iomem *ptr;</div><div class='add'>+</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, name);</div><div class='add'>+	if (!np)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ptr = of_iomap(np, 0);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __issue_avs_command(struct private_data *priv, int cmd, bool is_send,</div><div class='add'>+			       u32 args[])</div><div class='add'>+{</div><div class='add'>+	unsigned long time_left = msecs_to_jiffies(AVS_TIMEOUT);</div><div class='add'>+	void __iomem *base = priv-&gt;base;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ret = down_interruptible(&amp;priv-&gt;sem);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure no other command is currently running: cmd is 0 if AVS</div><div class='add'>+	 * co-processor is idle. Due to the guard above, we should almost never</div><div class='add'>+	 * have to wait here.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, val = 1; val != 0 &amp;&amp; i &lt; AVS_LOOP_LIMIT; i++)</div><div class='add'>+		val = readl(base + AVS_MBOX_COMMAND);</div><div class='add'>+</div><div class='add'>+	/* Give the caller a chance to retry if AVS is busy. */</div><div class='add'>+	if (i == AVS_LOOP_LIMIT) {</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear status before we begin. */</div><div class='add'>+	writel(AVS_STATUS_CLEAR, base + AVS_MBOX_STATUS);</div><div class='add'>+</div><div class='add'>+	/* We need to send arguments for this command. */</div><div class='add'>+	if (args &amp;&amp; is_send) {</div><div class='add'>+		for (i = 0; i &lt; AVS_MAX_CMD_ARGS; i++)</div><div class='add'>+			writel(args[i], base + AVS_MBOX_PARAM(i));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Protect from spurious interrupts. */</div><div class='add'>+	reinit_completion(&amp;priv-&gt;done);</div><div class='add'>+</div><div class='add'>+	/* Now issue the command &amp; tell firmware to wake up to process it. */</div><div class='add'>+	writel(cmd, base + AVS_MBOX_COMMAND);</div><div class='add'>+	writel(AVS_CPU_L2_INT_MASK, priv-&gt;avs_intr_base + AVS_CPU_L2_SET0);</div><div class='add'>+</div><div class='add'>+	/* Wait for AVS co-processor to finish processing the command. */</div><div class='add'>+	time_left = wait_for_completion_timeout(&amp;priv-&gt;done, time_left);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the AVS status is not in the expected range, it means AVS didn't</div><div class='add'>+	 * complete our command in time, and we return an error. Also, if there</div><div class='add'>+	 * is no "time left", we timed out waiting for the interrupt.</div><div class='add'>+	 */</div><div class='add'>+	val = readl(base + AVS_MBOX_STATUS);</div><div class='add'>+	if (time_left == 0 || val == 0 || val &gt; AVS_STATUS_MAX) {</div><div class='add'>+		dev_err(priv-&gt;dev, "AVS command %#x didn't complete in time\n",</div><div class='add'>+			cmd);</div><div class='add'>+		dev_err(priv-&gt;dev, "    Time left: %u ms, AVS status: %#x\n",</div><div class='add'>+			jiffies_to_msecs(time_left), val);</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This command returned arguments, so we read them back. */</div><div class='add'>+	if (args &amp;&amp; !is_send) {</div><div class='add'>+		for (i = 0; i &lt; AVS_MAX_CMD_ARGS; i++)</div><div class='add'>+			args[i] = readl(base + AVS_MBOX_PARAM(i));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear status to tell AVS co-processor we are done. */</div><div class='add'>+	writel(AVS_STATUS_CLEAR, base + AVS_MBOX_STATUS);</div><div class='add'>+</div><div class='add'>+	/* Convert firmware errors to errno's as much as possible. */</div><div class='add'>+	switch (val) {</div><div class='add'>+	case AVS_STATUS_INVALID:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case AVS_STATUS_NO_SUPP:</div><div class='add'>+		ret = -ENOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	case AVS_STATUS_NO_MAP:</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		break;</div><div class='add'>+	case AVS_STATUS_MAP_SET:</div><div class='add'>+		ret = -EEXIST;</div><div class='add'>+		break;</div><div class='add'>+	case AVS_STATUS_FAILURE:</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	up(&amp;priv-&gt;sem);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t irq_handler(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct private_data *priv = data;</div><div class='add'>+</div><div class='add'>+	/* AVS command completed execution. Wake up __issue_avs_command(). */</div><div class='add'>+	complete(&amp;priv-&gt;done);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *brcm_avs_mode_to_string(unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case AVS_MODE_AVS:</div><div class='add'>+		return "AVS";</div><div class='add'>+	case AVS_MODE_DFS:</div><div class='add'>+		return "DFS";</div><div class='add'>+	case AVS_MODE_DVS:</div><div class='add'>+		return "DVS";</div><div class='add'>+	case AVS_MODE_DVFS:</div><div class='add'>+		return "DVFS";</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void brcm_avs_parse_p1(u32 p1, unsigned int *mdiv_p0, unsigned int *pdiv,</div><div class='add'>+			      unsigned int *ndiv)</div><div class='add'>+{</div><div class='add'>+	*mdiv_p0 = (p1 &gt;&gt; MDIV_P0_SHIFT) &amp; MDIV_P0_MASK;</div><div class='add'>+	*pdiv = (p1 &gt;&gt; PDIV_SHIFT) &amp; PDIV_MASK;</div><div class='add'>+	*ndiv = (p1 &gt;&gt; NDIV_INT_SHIFT) &amp; NDIV_INT_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void brcm_avs_parse_p2(u32 p2, unsigned int *mdiv_p1,</div><div class='add'>+			      unsigned int *mdiv_p2, unsigned int *mdiv_p3,</div><div class='add'>+			      unsigned int *mdiv_p4)</div><div class='add'>+{</div><div class='add'>+	*mdiv_p4 = (p2 &gt;&gt; MDIV_P4_SHIFT) &amp; MDIV_P4_MASK;</div><div class='add'>+	*mdiv_p3 = (p2 &gt;&gt; MDIV_P3_SHIFT) &amp; MDIV_P3_MASK;</div><div class='add'>+	*mdiv_p2 = (p2 &gt;&gt; MDIV_P2_SHIFT) &amp; MDIV_P2_MASK;</div><div class='add'>+	*mdiv_p1 = (p2 &gt;&gt; MDIV_P1_SHIFT) &amp; MDIV_P1_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcm_avs_get_pmap(struct private_data *priv, struct pmap *pmap)</div><div class='add'>+{</div><div class='add'>+	u32 args[AVS_MAX_CMD_ARGS];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __issue_avs_command(priv, AVS_CMD_GET_PMAP, false, args);</div><div class='add'>+	if (ret || !pmap)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pmap-&gt;mode = args[0];</div><div class='add'>+	pmap-&gt;p1 = args[1];</div><div class='add'>+	pmap-&gt;p2 = args[2];</div><div class='add'>+	pmap-&gt;state = args[3];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcm_avs_set_pmap(struct private_data *priv, struct pmap *pmap)</div><div class='add'>+{</div><div class='add'>+	u32 args[AVS_MAX_CMD_ARGS];</div><div class='add'>+</div><div class='add'>+	args[0] = pmap-&gt;mode;</div><div class='add'>+	args[1] = pmap-&gt;p1;</div><div class='add'>+	args[2] = pmap-&gt;p2;</div><div class='add'>+	args[3] = pmap-&gt;state;</div><div class='add'>+</div><div class='add'>+	return __issue_avs_command(priv, AVS_CMD_SET_PMAP, true, args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcm_avs_get_pstate(struct private_data *priv, unsigned int *pstate)</div><div class='add'>+{</div><div class='add'>+	u32 args[AVS_MAX_CMD_ARGS];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __issue_avs_command(priv, AVS_CMD_GET_PSTATE, false, args);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	*pstate = args[0];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcm_avs_set_pstate(struct private_data *priv, unsigned int pstate)</div><div class='add'>+{</div><div class='add'>+	u32 args[AVS_MAX_CMD_ARGS];</div><div class='add'>+</div><div class='add'>+	args[0] = pstate;</div><div class='add'>+</div><div class='add'>+	return __issue_avs_command(priv, AVS_CMD_SET_PSTATE, true, args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long brcm_avs_get_voltage(void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	return readl(base + AVS_MBOX_VOLTAGE1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long brcm_avs_get_frequency(void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	return readl(base + AVS_MBOX_FREQUENCY) * 1000;	/* in kHz */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We determine which frequencies are supported by cycling through all P-states</div><div class='add'>+ * and reading back what frequency we are running at for each P-state.</div><div class='add'>+ */</div><div class='add'>+static struct cpufreq_frequency_table *</div><div class='add'>+brcm_avs_get_freq_table(struct device *dev, struct private_data *priv)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_frequency_table *table;</div><div class='add'>+	unsigned int pstate;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* Remember P-state for later */</div><div class='add'>+	ret = brcm_avs_get_pstate(priv, &amp;pstate);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	table = devm_kzalloc(dev, (AVS_PSTATE_MAX + 1) * sizeof(*table),</div><div class='add'>+			     GFP_KERNEL);</div><div class='add'>+	if (!table)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	for (i = AVS_PSTATE_P0; i &lt;= AVS_PSTATE_MAX; i++) {</div><div class='add'>+		ret = brcm_avs_set_pstate(priv, i);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ERR_PTR(ret);</div><div class='add'>+		table[i].frequency = brcm_avs_get_frequency(priv-&gt;base);</div><div class='add'>+		table[i].driver_data = i;</div><div class='add'>+	}</div><div class='add'>+	table[i].frequency = CPUFREQ_TABLE_END;</div><div class='add'>+</div><div class='add'>+	/* Restore P-state */</div><div class='add'>+	ret = brcm_avs_set_pstate(priv, pstate);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	return table;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARM_BRCMSTB_AVS_CPUFREQ_DEBUG</div><div class='add'>+</div><div class='add'>+#define MANT(x)	(unsigned int)(abs((x)) / 1000)</div><div class='add'>+#define FRAC(x)	(unsigned int)(abs((x)) - abs((x)) / 1000 * 1000)</div><div class='add'>+</div><div class='add'>+static int brcm_avs_debug_show(struct seq_file *s, void *data)</div><div class='add'>+{</div><div class='add'>+	struct debugfs_data *dbgfs = s-&gt;private;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	u32 val, offset;</div><div class='add'>+</div><div class='add'>+	if (!dbgfs) {</div><div class='add'>+		seq_puts(s, "No device pointer\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	base = dbgfs-&gt;priv-&gt;base;</div><div class='add'>+	offset = dbgfs-&gt;entry-&gt;offset;</div><div class='add'>+	val = readl(base + offset);</div><div class='add'>+	switch (dbgfs-&gt;entry-&gt;format) {</div><div class='add'>+	case DEBUGFS_NORMAL:</div><div class='add'>+		seq_printf(s, "%u\n", val);</div><div class='add'>+		break;</div><div class='add'>+	case DEBUGFS_FLOAT:</div><div class='add'>+		seq_printf(s, "%d.%03d\n", MANT(val), FRAC(val));</div><div class='add'>+		break;</div><div class='add'>+	case DEBUGFS_REV:</div><div class='add'>+		seq_printf(s, "%c.%c.%c.%c\n", (val &gt;&gt; 24 &amp; 0xff),</div><div class='add'>+			   (val &gt;&gt; 16 &amp; 0xff), (val &gt;&gt; 8 &amp; 0xff),</div><div class='add'>+			   val &amp; 0xff);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	seq_printf(s, "0x%08x\n", val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef MANT</div><div class='add'>+#undef FRAC</div><div class='add'>+</div><div class='add'>+static ssize_t brcm_avs_seq_write(struct file *file, const char __user *buf,</div><div class='add'>+				  size_t size, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *s = file-&gt;private_data;</div><div class='add'>+	struct debugfs_data *dbgfs = s-&gt;private;</div><div class='add'>+	struct private_data *priv = dbgfs-&gt;priv;</div><div class='add'>+	void __iomem *base, *avs_intr_base;</div><div class='add'>+	bool use_issue_command = false;</div><div class='add'>+	unsigned long val, offset;</div><div class='add'>+	char str[128];</div><div class='add'>+	int ret;</div><div class='add'>+	char *str_ptr = str;</div><div class='add'>+</div><div class='add'>+	if (size &gt;= sizeof(str))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	memset(str, 0, sizeof(str));</div><div class='add'>+	ret = copy_from_user(str, buf, size);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	base = priv-&gt;base;</div><div class='add'>+	avs_intr_base = priv-&gt;avs_intr_base;</div><div class='add'>+	offset = dbgfs-&gt;entry-&gt;offset;</div><div class='add'>+	/*</div><div class='add'>+	 * Special case writing to "command" entry only: if the string starts</div><div class='add'>+	 * with a 'c', we use the driver's __issue_avs_command() function.</div><div class='add'>+	 * Otherwise, we perform a raw write. This should allow testing of raw</div><div class='add'>+	 * access as well as using the higher level function. (Raw access</div><div class='add'>+	 * doesn't clear the firmware return status after issuing the command.)</div><div class='add'>+	 */</div><div class='add'>+	if (str_ptr[0] == 'c' &amp;&amp; offset == AVS_MBOX_COMMAND) {</div><div class='add'>+		use_issue_command = true;</div><div class='add'>+		str_ptr++;</div><div class='add'>+	}</div><div class='add'>+	if (kstrtoul(str_ptr, 0, &amp;val) != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setting the P-state is a special case. We need to update the CPU</div><div class='add'>+	 * frequency we report.</div><div class='add'>+	 */</div><div class='add'>+	if (val == AVS_CMD_SET_PSTATE) {</div><div class='add'>+		struct cpufreq_policy *policy;</div><div class='add'>+		unsigned int pstate;</div><div class='add'>+</div><div class='add'>+		policy = cpufreq_cpu_get(smp_processor_id());</div><div class='add'>+		/* Read back the P-state we are about to set */</div><div class='add'>+		pstate = readl(base + AVS_MBOX_PARAM(0));</div><div class='add'>+		if (use_issue_command) {</div><div class='add'>+			ret = brcm_avs_target_index(policy, pstate);</div><div class='add'>+			return ret ? ret : size;</div><div class='add'>+		}</div><div class='add'>+		policy-&gt;cur = policy-&gt;freq_table[pstate].frequency;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (use_issue_command) {</div><div class='add'>+		ret = __issue_avs_command(priv, val, false, NULL);</div><div class='add'>+	} else {</div><div class='add'>+		/* Locking here is not perfect, but is only for debug. */</div><div class='add'>+		ret = down_interruptible(&amp;priv-&gt;sem);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		writel(val, base + offset);</div><div class='add'>+		/* We have to wake up the firmware to process a command. */</div><div class='add'>+		if (offset == AVS_MBOX_COMMAND)</div><div class='add'>+			writel(AVS_CPU_L2_INT_MASK,</div><div class='add'>+			       avs_intr_base + AVS_CPU_L2_SET0);</div><div class='add'>+		up(&amp;priv-&gt;sem);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret ? ret : size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct debugfs_entry *__find_debugfs_entry(const char *name)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(debugfs_entries); i++)</div><div class='add'>+		if (strcasecmp(debugfs_entries[i].name, name) == 0)</div><div class='add'>+			return &amp;debugfs_entries[i];</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcm_avs_debug_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct debugfs_data *data;</div><div class='add'>+	fmode_t fmode;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * seq_open(), which is called by single_open(), clears "write" access.</div><div class='add'>+	 * We need write access to some files, so we preserve our access mode</div><div class='add'>+	 * and restore it.</div><div class='add'>+	 */</div><div class='add'>+	fmode = file-&gt;f_mode;</div><div class='add'>+	/*</div><div class='add'>+	 * Check access permissions even for root. We don't want to be writing</div><div class='add'>+	 * to read-only registers. Access for regular users has already been</div><div class='add'>+	 * checked by the VFS layer.</div><div class='add'>+	 */</div><div class='add'>+	if ((fmode &amp; FMODE_WRITER) &amp;&amp; !(inode-&gt;i_mode &amp; S_IWUSR))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	data = kmalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	/*</div><div class='add'>+	 * We use the same file system operations for all our debug files. To</div><div class='add'>+	 * produce specific output, we look up the file name upon opening a</div><div class='add'>+	 * debugfs entry and map it to a memory offset. This offset is then used</div><div class='add'>+	 * in the generic "show" function to read a specific register.</div><div class='add'>+	 */</div><div class='add'>+	data-&gt;entry = __find_debugfs_entry(file-&gt;f_path.dentry-&gt;d_iname);</div><div class='add'>+	data-&gt;priv = inode-&gt;i_private;</div><div class='add'>+</div><div class='add'>+	ret = single_open(file, brcm_avs_debug_show, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		kfree(data);</div><div class='add'>+	file-&gt;f_mode = fmode;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcm_avs_debug_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *seq_priv = file-&gt;private_data;</div><div class='add'>+	struct debugfs_data *data = seq_priv-&gt;private;</div><div class='add'>+</div><div class='add'>+	kfree(data);</div><div class='add'>+	return single_release(inode, file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations brcm_avs_debug_ops = {</div><div class='add'>+	.open		= brcm_avs_debug_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.write		= brcm_avs_seq_write,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= brcm_avs_debug_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void brcm_avs_cpufreq_debug_init(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct private_data *priv = platform_get_drvdata(pdev);</div><div class='add'>+	struct dentry *dir;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dir = debugfs_create_dir(BRCM_AVS_CPUFREQ_NAME, NULL);</div><div class='add'>+	if (IS_ERR_OR_NULL(dir))</div><div class='add'>+		return;</div><div class='add'>+	priv-&gt;debugfs = dir;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(debugfs_entries); i++) {</div><div class='add'>+		/*</div><div class='add'>+		 * The DEBUGFS_ENTRY macro generates uppercase strings. We</div><div class='add'>+		 * convert them to lowercase before creating the debugfs</div><div class='add'>+		 * entries.</div><div class='add'>+		 */</div><div class='add'>+		char *entry = __strtolower(debugfs_entries[i].name);</div><div class='add'>+		fmode_t mode = debugfs_entries[i].mode;</div><div class='add'>+</div><div class='add'>+		if (!debugfs_create_file(entry, S_IFREG | S_IRUGO | mode,</div><div class='add'>+					 dir, priv, &amp;brcm_avs_debug_ops)) {</div><div class='add'>+			priv-&gt;debugfs = NULL;</div><div class='add'>+			debugfs_remove_recursive(dir);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void brcm_avs_cpufreq_debug_exit(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct private_data *priv = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (priv &amp;&amp; priv-&gt;debugfs) {</div><div class='add'>+		debugfs_remove_recursive(priv-&gt;debugfs);</div><div class='add'>+		priv-&gt;debugfs = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static void brcm_avs_cpufreq_debug_init(struct platform_device *pdev) {}</div><div class='add'>+static void brcm_avs_cpufreq_debug_exit(struct platform_device *pdev) {}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ARM_BRCMSTB_AVS_CPUFREQ_DEBUG */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To ensure the right firmware is running we need to</div><div class='add'>+ *    - check the MAGIC matches what we expect</div><div class='add'>+ *    - brcm_avs_get_pmap() doesn't return -ENOTSUPP or -EINVAL</div><div class='add'>+ * We need to set up our interrupt handling before calling brcm_avs_get_pmap()!</div><div class='add'>+ */</div><div class='add'>+static bool brcm_avs_is_firmware_loaded(struct private_data *priv)</div><div class='add'>+{</div><div class='add'>+	u32 magic;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = brcm_avs_get_pmap(priv, NULL);</div><div class='add'>+	magic = readl(priv-&gt;base + AVS_MBOX_MAGIC);</div><div class='add'>+</div><div class='add'>+	return (magic == AVS_FIRMWARE_MAGIC) &amp;&amp; (rc != -ENOTSUPP) &amp;&amp;</div><div class='add'>+		(rc != -EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int brcm_avs_cpufreq_get(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);</div><div class='add'>+	struct private_data *priv = policy-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	return brcm_avs_get_frequency(priv-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcm_avs_target_index(struct cpufreq_policy *policy,</div><div class='add'>+				 unsigned int index)</div><div class='add'>+{</div><div class='add'>+	return brcm_avs_set_pstate(policy-&gt;driver_data,</div><div class='add'>+				  policy-&gt;freq_table[index].driver_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcm_avs_suspend(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	struct private_data *priv = policy-&gt;driver_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = brcm_avs_get_pmap(priv, &amp;priv-&gt;pmap);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We can't use the P-state returned by brcm_avs_get_pmap(), since</div><div class='add'>+	 * that's the initial P-state from when the P-map was downloaded to the</div><div class='add'>+	 * AVS co-processor, not necessarily the P-state we are running at now.</div><div class='add'>+	 * So, we get the current P-state explicitly.</div><div class='add'>+	 */</div><div class='add'>+	return brcm_avs_get_pstate(priv, &amp;priv-&gt;pmap.state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcm_avs_resume(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	struct private_data *priv = policy-&gt;driver_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = brcm_avs_set_pmap(priv, &amp;priv-&gt;pmap);</div><div class='add'>+	if (ret == -EEXIST) {</div><div class='add'>+		struct platform_device *pdev  = cpufreq_get_driver_data();</div><div class='add'>+		struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+		dev_warn(dev, "PMAP was already set\n");</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * All initialization code that we only want to execute once goes here. Setup</div><div class='add'>+ * code that can be re-tried on every core (if it failed before) can go into</div><div class='add'>+ * brcm_avs_cpufreq_init().</div><div class='add'>+ */</div><div class='add'>+static int brcm_avs_prepare_init(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct private_data *priv;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int host_irq, ret;</div><div class='add'>+</div><div class='add'>+	dev = &amp;pdev-&gt;dev;</div><div class='add'>+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;dev = dev;</div><div class='add'>+	sema_init(&amp;priv-&gt;sem, 1);</div><div class='add'>+	init_completion(&amp;priv-&gt;done);</div><div class='add'>+	platform_set_drvdata(pdev, priv);</div><div class='add'>+</div><div class='add'>+	priv-&gt;base = __map_region(BRCM_AVS_CPU_DATA);</div><div class='add'>+	if (!priv-&gt;base) {</div><div class='add'>+		dev_err(dev, "Couldn't find property %s in device tree.\n",</div><div class='add'>+			BRCM_AVS_CPU_DATA);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;avs_intr_base = __map_region(BRCM_AVS_CPU_INTR);</div><div class='add'>+	if (!priv-&gt;avs_intr_base) {</div><div class='add'>+		dev_err(dev, "Couldn't find property %s in device tree.\n",</div><div class='add'>+			BRCM_AVS_CPU_INTR);</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto unmap_base;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	host_irq = platform_get_irq_byname(pdev, BRCM_AVS_HOST_INTR);</div><div class='add'>+	if (host_irq &lt; 0) {</div><div class='add'>+		dev_err(dev, "Couldn't find interrupt %s -- %d\n",</div><div class='add'>+			BRCM_AVS_HOST_INTR, host_irq);</div><div class='add'>+		ret = host_irq;</div><div class='add'>+		goto unmap_intr_base;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = devm_request_irq(dev, host_irq, irq_handler, IRQF_TRIGGER_RISING,</div><div class='add'>+			       BRCM_AVS_HOST_INTR, priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "IRQ request failed: %s (%d) -- %d\n",</div><div class='add'>+			BRCM_AVS_HOST_INTR, host_irq, ret);</div><div class='add'>+		goto unmap_intr_base;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (brcm_avs_is_firmware_loaded(priv))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_err(dev, "AVS firmware is not loaded or doesn't support DVFS\n");</div><div class='add'>+	ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+unmap_intr_base:</div><div class='add'>+	iounmap(priv-&gt;avs_intr_base);</div><div class='add'>+unmap_base:</div><div class='add'>+	iounmap(priv-&gt;base);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcm_avs_cpufreq_init(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_frequency_table *freq_table;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	struct private_data *priv;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pdev = cpufreq_get_driver_data();</div><div class='add'>+	priv = platform_get_drvdata(pdev);</div><div class='add'>+	policy-&gt;driver_data = priv;</div><div class='add'>+	dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	freq_table = brcm_avs_get_freq_table(dev, priv);</div><div class='add'>+	if (IS_ERR(freq_table)) {</div><div class='add'>+		ret = PTR_ERR(freq_table);</div><div class='add'>+		dev_err(dev, "Couldn't determine frequency table (%d).\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cpufreq_table_validate_and_show(policy, freq_table);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "invalid frequency table: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* All cores share the same clock and thus the same policy. */</div><div class='add'>+	cpumask_setall(policy-&gt;cpus);</div><div class='add'>+</div><div class='add'>+	ret = __issue_avs_command(priv, AVS_CMD_ENABLE, false, NULL);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		unsigned int pstate;</div><div class='add'>+</div><div class='add'>+		ret = brcm_avs_get_pstate(priv, &amp;pstate);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			policy-&gt;cur = freq_table[pstate].frequency;</div><div class='add'>+			dev_info(dev, "registered\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(dev, "couldn't initialize driver (%d)\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_brcm_avs_pstate(struct cpufreq_policy *policy, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct private_data *priv = policy-&gt;driver_data;</div><div class='add'>+	unsigned int pstate;</div><div class='add'>+</div><div class='add'>+	if (brcm_avs_get_pstate(priv, &amp;pstate))</div><div class='add'>+		return sprintf(buf, "&lt;unknown&gt;\n");</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", pstate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_brcm_avs_mode(struct cpufreq_policy *policy, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct private_data *priv = policy-&gt;driver_data;</div><div class='add'>+	struct pmap pmap;</div><div class='add'>+</div><div class='add'>+	if (brcm_avs_get_pmap(priv, &amp;pmap))</div><div class='add'>+		return sprintf(buf, "&lt;unknown&gt;\n");</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s %u\n", brcm_avs_mode_to_string(pmap.mode),</div><div class='add'>+		pmap.mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_brcm_avs_pmap(struct cpufreq_policy *policy, char *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned int mdiv_p0, mdiv_p1, mdiv_p2, mdiv_p3, mdiv_p4;</div><div class='add'>+	struct private_data *priv = policy-&gt;driver_data;</div><div class='add'>+	unsigned int ndiv, pdiv;</div><div class='add'>+	struct pmap pmap;</div><div class='add'>+</div><div class='add'>+	if (brcm_avs_get_pmap(priv, &amp;pmap))</div><div class='add'>+		return sprintf(buf, "&lt;unknown&gt;\n");</div><div class='add'>+</div><div class='add'>+	brcm_avs_parse_p1(pmap.p1, &amp;mdiv_p0, &amp;pdiv, &amp;ndiv);</div><div class='add'>+	brcm_avs_parse_p2(pmap.p2, &amp;mdiv_p1, &amp;mdiv_p2, &amp;mdiv_p3, &amp;mdiv_p4);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "0x%08x 0x%08x %u %u %u %u %u %u %u %u %u\n",</div><div class='add'>+		pmap.p1, pmap.p2, ndiv, pdiv, mdiv_p0, mdiv_p1, mdiv_p2,</div><div class='add'>+		mdiv_p3, mdiv_p4, pmap.mode, pmap.state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_brcm_avs_voltage(struct cpufreq_policy *policy, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct private_data *priv = policy-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "0x%08lx\n", brcm_avs_get_voltage(priv-&gt;base));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_brcm_avs_frequency(struct cpufreq_policy *policy, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct private_data *priv = policy-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "0x%08lx\n", brcm_avs_get_frequency(priv-&gt;base));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+cpufreq_freq_attr_ro(brcm_avs_pstate);</div><div class='add'>+cpufreq_freq_attr_ro(brcm_avs_mode);</div><div class='add'>+cpufreq_freq_attr_ro(brcm_avs_pmap);</div><div class='add'>+cpufreq_freq_attr_ro(brcm_avs_voltage);</div><div class='add'>+cpufreq_freq_attr_ro(brcm_avs_frequency);</div><div class='add'>+</div><div class='add'>+static struct freq_attr *brcm_avs_cpufreq_attr[] = {</div><div class='add'>+	&amp;cpufreq_freq_attr_scaling_available_freqs,</div><div class='add'>+	&amp;brcm_avs_pstate,</div><div class='add'>+	&amp;brcm_avs_mode,</div><div class='add'>+	&amp;brcm_avs_pmap,</div><div class='add'>+	&amp;brcm_avs_voltage,</div><div class='add'>+	&amp;brcm_avs_frequency,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cpufreq_driver brcm_avs_driver = {</div><div class='add'>+	.flags		= CPUFREQ_NEED_INITIAL_FREQ_CHECK,</div><div class='add'>+	.verify		= cpufreq_generic_frequency_table_verify,</div><div class='add'>+	.target_index	= brcm_avs_target_index,</div><div class='add'>+	.get		= brcm_avs_cpufreq_get,</div><div class='add'>+	.suspend	= brcm_avs_suspend,</div><div class='add'>+	.resume		= brcm_avs_resume,</div><div class='add'>+	.init		= brcm_avs_cpufreq_init,</div><div class='add'>+	.attr		= brcm_avs_cpufreq_attr,</div><div class='add'>+	.name		= BRCM_AVS_CPUFREQ_PREFIX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int brcm_avs_cpufreq_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = brcm_avs_prepare_init(pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	brcm_avs_driver.driver_data = pdev;</div><div class='add'>+	ret = cpufreq_register_driver(&amp;brcm_avs_driver);</div><div class='add'>+	if (!ret)</div><div class='add'>+		brcm_avs_cpufreq_debug_init(pdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcm_avs_cpufreq_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct private_data *priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cpufreq_unregister_driver(&amp;brcm_avs_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	brcm_avs_cpufreq_debug_exit(pdev);</div><div class='add'>+</div><div class='add'>+	priv = platform_get_drvdata(pdev);</div><div class='add'>+	iounmap(priv-&gt;base);</div><div class='add'>+	iounmap(priv-&gt;avs_intr_base);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id brcm_avs_cpufreq_match[] = {</div><div class='add'>+	{ .compatible = BRCM_AVS_CPU_DATA },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, brcm_avs_cpufreq_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver brcm_avs_cpufreq_platdrv = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= BRCM_AVS_CPUFREQ_NAME,</div><div class='add'>+		.of_match_table = brcm_avs_cpufreq_match,</div><div class='add'>+	},</div><div class='add'>+	.probe		= brcm_avs_cpufreq_probe,</div><div class='add'>+	.remove		= brcm_avs_cpufreq_remove,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(brcm_avs_cpufreq_platdrv);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Markus Mayer &lt;mmayer@broadcom.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("CPUfreq driver for Broadcom STB AVS");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c<br/>index 4852d9efe74e..e82bb3c30b92 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/cppc_cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/cppc_cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/cppc_cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cppc_cpufreq.c</a></div><div class='hunk'>@@ -247,3 +247,10 @@ MODULE_DESCRIPTION("CPUFreq driver based on the ACPI CPPC v5.0+ spec");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> late_initcall(cppc_cpufreq_init);</div><div class='add'>+</div><div class='add'>+static const struct acpi_device_id cppc_acpi_ids[] = {</div><div class='add'>+	{ACPI_PROCESSOR_DEVICE_HID, },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(acpi, cppc_acpi_ids);</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c<br/>index 71267626456b..921b4a6c3d16 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq-dt-platdev.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/cpufreq-dt-platdev.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq-dt-platdev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq-dt-platdev.c</a></div><div class='hunk'>@@ -26,6 +26,11 @@ static const struct of_device_id machines[] __initconst = {</div><div class='ctx'> 	{ .compatible = "allwinner,sun8i-a83t", },</div><div class='ctx'> 	{ .compatible = "allwinner,sun8i-h3", },</div><div class='ctx'> </div><div class='add'>+	{ .compatible = "apm,xgene-shadowcat", },</div><div class='add'>+</div><div class='add'>+	{ .compatible = "arm,integrator-ap", },</div><div class='add'>+	{ .compatible = "arm,integrator-cp", },</div><div class='add'>+</div><div class='ctx'> 	{ .compatible = "hisilicon,hi6220", },</div><div class='ctx'> </div><div class='ctx'> 	{ .compatible = "fsl,imx27", },</div><div class='hunk'>@@ -34,6 +39,8 @@ static const struct of_device_id machines[] __initconst = {</div><div class='ctx'> 	{ .compatible = "fsl,imx7d", },</div><div class='ctx'> </div><div class='ctx'> 	{ .compatible = "marvell,berlin", },</div><div class='add'>+	{ .compatible = "marvell,pxa250", },</div><div class='add'>+	{ .compatible = "marvell,pxa270", },</div><div class='ctx'> </div><div class='ctx'> 	{ .compatible = "samsung,exynos3250", },</div><div class='ctx'> 	{ .compatible = "samsung,exynos4210", },</div><div class='hunk'>@@ -50,6 +57,8 @@ static const struct of_device_id machines[] __initconst = {</div><div class='ctx'> 	{ .compatible = "renesas,r7s72100", },</div><div class='ctx'> 	{ .compatible = "renesas,r8a73a4", },</div><div class='ctx'> 	{ .compatible = "renesas,r8a7740", },</div><div class='add'>+	{ .compatible = "renesas,r8a7743", },</div><div class='add'>+	{ .compatible = "renesas,r8a7745", },</div><div class='ctx'> 	{ .compatible = "renesas,r8a7778", },</div><div class='ctx'> 	{ .compatible = "renesas,r8a7779", },</div><div class='ctx'> 	{ .compatible = "renesas,r8a7790", },</div><div class='hunk'>@@ -72,8 +81,12 @@ static const struct of_device_id machines[] __initconst = {</div><div class='ctx'> </div><div class='ctx'> 	{ .compatible = "sigma,tango4" },</div><div class='ctx'> </div><div class='del'>-	{ .compatible = "ti,am33xx", },</div><div class='del'>-	{ .compatible = "ti,dra7", },</div><div class='add'>+	{ .compatible = "socionext,uniphier-pro5", },</div><div class='add'>+	{ .compatible = "socionext,uniphier-pxs2", },</div><div class='add'>+	{ .compatible = "socionext,uniphier-ld6b", },</div><div class='add'>+	{ .compatible = "socionext,uniphier-ld11", },</div><div class='add'>+	{ .compatible = "socionext,uniphier-ld20", },</div><div class='add'>+</div><div class='ctx'> 	{ .compatible = "ti,omap2", },</div><div class='ctx'> 	{ .compatible = "ti,omap3", },</div><div class='ctx'> 	{ .compatible = "ti,omap4", },</div><div class='hunk'>@@ -81,6 +94,8 @@ static const struct of_device_id machines[] __initconst = {</div><div class='ctx'> </div><div class='ctx'> 	{ .compatible = "xlnx,zynq-7000", },</div><div class='ctx'> </div><div class='add'>+	{ .compatible = "zte,zx296718", },</div><div class='add'>+</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c<br/>index 5c07ae05d69a..c943787d761e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq-dt.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/cpufreq-dt.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq-dt.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq-dt.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include "cpufreq-dt.h"</div><div class='ctx'> </div><div class='ctx'> struct private_data {</div><div class='add'>+	struct opp_table *opp_table;</div><div class='ctx'> 	struct device *cpu_dev;</div><div class='ctx'> 	struct thermal_cooling_device *cdev;</div><div class='ctx'> 	const char *reg_name;</div><div class='hunk'>@@ -143,10 +144,10 @@ static int resources_available(void)</div><div class='ctx'> static int cpufreq_init(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_frequency_table *freq_table;</div><div class='add'>+	struct opp_table *opp_table = NULL;</div><div class='ctx'> 	struct private_data *priv;</div><div class='ctx'> 	struct device *cpu_dev;</div><div class='ctx'> 	struct clk *cpu_clk;</div><div class='del'>-	struct dev_pm_opp *suspend_opp;</div><div class='ctx'> 	unsigned int transition_latency;</div><div class='ctx'> 	bool fallback = false;</div><div class='ctx'> 	const char *name;</div><div class='hunk'>@@ -186,8 +187,9 @@ static int cpufreq_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	 */</div><div class='ctx'> 	name = find_supply_name(cpu_dev);</div><div class='ctx'> 	if (name) {</div><div class='del'>-		ret = dev_pm_opp_set_regulator(cpu_dev, name);</div><div class='del'>-		if (ret) {</div><div class='add'>+		opp_table = dev_pm_opp_set_regulators(cpu_dev, &amp;name, 1);</div><div class='add'>+		if (IS_ERR(opp_table)) {</div><div class='add'>+			ret = PTR_ERR(opp_table);</div><div class='ctx'> 			dev_err(cpu_dev, "Failed to set regulator for cpu%d: %d\n",</div><div class='ctx'> 				policy-&gt;cpu, ret);</div><div class='ctx'> 			goto out_put_clk;</div><div class='hunk'>@@ -237,6 +239,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;reg_name = name;</div><div class='add'>+	priv-&gt;opp_table = opp_table;</div><div class='ctx'> </div><div class='ctx'> 	ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &amp;freq_table);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -248,11 +251,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	policy-&gt;driver_data = priv;</div><div class='ctx'> 	policy-&gt;clk = cpu_clk;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	suspend_opp = dev_pm_opp_get_suspend_opp(cpu_dev);</div><div class='del'>-	if (suspend_opp)</div><div class='del'>-		policy-&gt;suspend_freq = dev_pm_opp_get_freq(suspend_opp) / 1000;</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	policy-&gt;suspend_freq = dev_pm_opp_get_suspend_opp_freq(cpu_dev) / 1000;</div><div class='ctx'> </div><div class='ctx'> 	ret = cpufreq_table_validate_and_show(policy, freq_table);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -285,7 +284,7 @@ out_free_priv:</div><div class='ctx'> out_free_opp:</div><div class='ctx'> 	dev_pm_opp_of_cpumask_remove_table(policy-&gt;cpus);</div><div class='ctx'> 	if (name)</div><div class='del'>-		dev_pm_opp_put_regulator(cpu_dev);</div><div class='add'>+		dev_pm_opp_put_regulators(opp_table);</div><div class='ctx'> out_put_clk:</div><div class='ctx'> 	clk_put(cpu_clk);</div><div class='ctx'> </div><div class='hunk'>@@ -300,7 +299,7 @@ static int cpufreq_exit(struct cpufreq_policy *policy)</div><div class='ctx'> 	dev_pm_opp_free_cpufreq_table(priv-&gt;cpu_dev, &amp;policy-&gt;freq_table);</div><div class='ctx'> 	dev_pm_opp_of_cpumask_remove_table(policy-&gt;related_cpus);</div><div class='ctx'> 	if (priv-&gt;reg_name)</div><div class='del'>-		dev_pm_opp_put_regulator(priv-&gt;cpu_dev);</div><div class='add'>+		dev_pm_opp_put_regulators(priv-&gt;opp_table);</div><div class='ctx'> </div><div class='ctx'> 	clk_put(policy-&gt;clk);</div><div class='ctx'> 	kfree(priv);</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c<br/>index 6e6c1fb60fbc..a47543281864 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq.c</a></div><div class='hunk'>@@ -132,7 +132,7 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)</div><div class='ctx'> 	u64 cur_wall_time;</div><div class='ctx'> 	u64 busy_time;</div><div class='ctx'> </div><div class='del'>-	cur_wall_time = jiffies64_to_cputime64(get_jiffies_64());</div><div class='add'>+	cur_wall_time = jiffies64_to_nsecs(get_jiffies_64());</div><div class='ctx'> </div><div class='ctx'> 	busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER];</div><div class='ctx'> 	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM];</div><div class='hunk'>@@ -143,9 +143,9 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)</div><div class='ctx'> </div><div class='ctx'> 	idle_time = cur_wall_time - busy_time;</div><div class='ctx'> 	if (wall)</div><div class='del'>-		*wall = cputime_to_usecs(cur_wall_time);</div><div class='add'>+		*wall = div_u64(cur_wall_time, NSEC_PER_USEC);</div><div class='ctx'> </div><div class='del'>-	return cputime_to_usecs(idle_time);</div><div class='add'>+	return div_u64(idle_time, NSEC_PER_USEC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy)</div><div class='hunk'>@@ -1078,15 +1078,11 @@ err_free_policy:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cpufreq_policy_put_kobj(struct cpufreq_policy *policy, bool notify)</div><div class='add'>+static void cpufreq_policy_put_kobj(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct kobject *kobj;</div><div class='ctx'> 	struct completion *cmp;</div><div class='ctx'> </div><div class='del'>-	if (notify)</div><div class='del'>-		blocking_notifier_call_chain(&amp;cpufreq_policy_notifier_list,</div><div class='del'>-					     CPUFREQ_REMOVE_POLICY, policy);</div><div class='del'>-</div><div class='ctx'> 	down_write(&amp;policy-&gt;rwsem);</div><div class='ctx'> 	cpufreq_stats_free_table(policy);</div><div class='ctx'> 	kobj = &amp;policy-&gt;kobj;</div><div class='hunk'>@@ -1104,7 +1100,7 @@ static void cpufreq_policy_put_kobj(struct cpufreq_policy *policy, bool notify)</div><div class='ctx'> 	pr_debug("wait complete\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cpufreq_policy_free(struct cpufreq_policy *policy, bool notify)</div><div class='add'>+static void cpufreq_policy_free(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int cpu;</div><div class='hunk'>@@ -1117,7 +1113,7 @@ static void cpufreq_policy_free(struct cpufreq_policy *policy, bool notify)</div><div class='ctx'> 		per_cpu(cpufreq_cpu_data, cpu) = NULL;</div><div class='ctx'> 	write_unlock_irqrestore(&amp;cpufreq_driver_lock, flags);</div><div class='ctx'> </div><div class='del'>-	cpufreq_policy_put_kobj(policy, notify);</div><div class='add'>+	cpufreq_policy_put_kobj(policy);</div><div class='ctx'> 	free_cpumask_var(policy-&gt;real_cpus);</div><div class='ctx'> 	free_cpumask_var(policy-&gt;related_cpus);</div><div class='ctx'> 	free_cpumask_var(policy-&gt;cpus);</div><div class='hunk'>@@ -1170,8 +1166,6 @@ static int cpufreq_online(unsigned int cpu)</div><div class='ctx'> 	if (new_policy) {</div><div class='ctx'> 		/* related_cpus should at least include policy-&gt;cpus. */</div><div class='ctx'> 		cpumask_copy(policy-&gt;related_cpus, policy-&gt;cpus);</div><div class='del'>-		/* Clear mask of registered CPUs */</div><div class='del'>-		cpumask_clear(policy-&gt;real_cpus);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1244,17 +1238,12 @@ static int cpufreq_online(unsigned int cpu)</div><div class='ctx'> 			goto out_exit_policy;</div><div class='ctx'> </div><div class='ctx'> 		cpufreq_stats_create_table(policy);</div><div class='del'>-		blocking_notifier_call_chain(&amp;cpufreq_policy_notifier_list,</div><div class='del'>-				CPUFREQ_CREATE_POLICY, policy);</div><div class='ctx'> </div><div class='ctx'> 		write_lock_irqsave(&amp;cpufreq_driver_lock, flags);</div><div class='ctx'> 		list_add(&amp;policy-&gt;policy_list, &amp;cpufreq_policy_list);</div><div class='ctx'> 		write_unlock_irqrestore(&amp;cpufreq_driver_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	blocking_notifier_call_chain(&amp;cpufreq_policy_notifier_list,</div><div class='del'>-				     CPUFREQ_START, policy);</div><div class='del'>-</div><div class='ctx'> 	ret = cpufreq_init_policy(policy);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("%s: Failed to initialize policy for cpu: %d (%d)\n",</div><div class='hunk'>@@ -1282,7 +1271,7 @@ out_exit_policy:</div><div class='ctx'> 	if (cpufreq_driver-&gt;exit)</div><div class='ctx'> 		cpufreq_driver-&gt;exit(policy);</div><div class='ctx'> out_free_policy:</div><div class='del'>-	cpufreq_policy_free(policy, !new_policy);</div><div class='add'>+	cpufreq_policy_free(policy);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1403,7 +1392,7 @@ static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)</div><div class='ctx'> 	remove_cpu_dev_symlink(policy, dev);</div><div class='ctx'> </div><div class='ctx'> 	if (cpumask_empty(policy-&gt;real_cpus))</div><div class='del'>-		cpufreq_policy_free(policy, true);</div><div class='add'>+		cpufreq_policy_free(policy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1526,7 +1515,10 @@ unsigned int cpufreq_get(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> 	if (policy) {</div><div class='ctx'> 		down_read(&amp;policy-&gt;rwsem);</div><div class='del'>-		ret_freq = __cpufreq_get(policy);</div><div class='add'>+</div><div class='add'>+		if (!policy_is_inactive(policy))</div><div class='add'>+			ret_freq = __cpufreq_get(policy);</div><div class='add'>+</div><div class='ctx'> 		up_read(&amp;policy-&gt;rwsem);</div><div class='ctx'> </div><div class='ctx'> 		cpufreq_cpu_put(policy);</div><div class='hunk'>@@ -2254,17 +2246,19 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy,</div><div class='ctx'>  *	Useful for policy notifiers which have different necessities</div><div class='ctx'>  *	at different times.</div><div class='ctx'>  */</div><div class='del'>-int cpufreq_update_policy(unsigned int cpu)</div><div class='add'>+void cpufreq_update_policy(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);</div><div class='ctx'> 	struct cpufreq_policy new_policy;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!policy)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;policy-&gt;rwsem);</div><div class='ctx'> </div><div class='add'>+	if (policy_is_inactive(policy))</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='ctx'> 	pr_debug("updating policy for CPU %u\n", cpu);</div><div class='ctx'> 	memcpy(&amp;new_policy, policy, sizeof(*policy));</div><div class='ctx'> 	new_policy.min = policy-&gt;user_policy.min;</div><div class='hunk'>@@ -2275,24 +2269,20 @@ int cpufreq_update_policy(unsigned int cpu)</div><div class='ctx'> 	 * -&gt; ask driver for current freq and notify governors about a change</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cpufreq_driver-&gt;get &amp;&amp; !cpufreq_driver-&gt;setpolicy) {</div><div class='del'>-		if (cpufreq_suspended) {</div><div class='del'>-			ret = -EAGAIN;</div><div class='add'>+		if (cpufreq_suspended)</div><div class='ctx'> 			goto unlock;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		new_policy.cur = cpufreq_update_current_freq(policy);</div><div class='del'>-		if (WARN_ON(!new_policy.cur)) {</div><div class='del'>-			ret = -EIO;</div><div class='add'>+		if (WARN_ON(!new_policy.cur))</div><div class='ctx'> 			goto unlock;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = cpufreq_set_policy(policy, &amp;new_policy);</div><div class='add'>+	cpufreq_set_policy(policy, &amp;new_policy);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	up_write(&amp;policy-&gt;rwsem);</div><div class='ctx'> </div><div class='ctx'> 	cpufreq_cpu_put(policy);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cpufreq_update_policy);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c<br/>index 13475890d792..992f7c20760f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq_conservative.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/cpufreq_conservative.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq_conservative.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq_conservative.c</a></div><div class='hunk'>@@ -37,16 +37,16 @@ struct cs_dbs_tuners {</div><div class='ctx'> #define DEF_SAMPLING_DOWN_FACTOR		(1)</div><div class='ctx'> #define MAX_SAMPLING_DOWN_FACTOR		(10)</div><div class='ctx'> </div><div class='del'>-static inline unsigned int get_freq_target(struct cs_dbs_tuners *cs_tuners,</div><div class='del'>-					   struct cpufreq_policy *policy)</div><div class='add'>+static inline unsigned int get_freq_step(struct cs_dbs_tuners *cs_tuners,</div><div class='add'>+					 struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='del'>-	unsigned int freq_target = (cs_tuners-&gt;freq_step * policy-&gt;max) / 100;</div><div class='add'>+	unsigned int freq_step = (cs_tuners-&gt;freq_step * policy-&gt;max) / 100;</div><div class='ctx'> </div><div class='ctx'> 	/* max freq cannot be less than 100. But who knows... */</div><div class='del'>-	if (unlikely(freq_target == 0))</div><div class='del'>-		freq_target = DEF_FREQUENCY_STEP;</div><div class='add'>+	if (unlikely(freq_step == 0))</div><div class='add'>+		freq_step = DEF_FREQUENCY_STEP;</div><div class='ctx'> </div><div class='del'>-	return freq_target;</div><div class='add'>+	return freq_step;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -55,10 +55,10 @@ static inline unsigned int get_freq_target(struct cs_dbs_tuners *cs_tuners,</div><div class='ctx'>  * sampling_down_factor, we check, if current idle time is more than 80%</div><div class='ctx'>  * (default), then we try to decrease frequency</div><div class='ctx'>  *</div><div class='del'>- * Any frequency increase takes it to the maximum frequency. Frequency reduction</div><div class='del'>- * happens at minimum steps of 5% (default) of maximum frequency</div><div class='add'>+ * Frequency updates happen at minimum steps of 5% (default) of maximum</div><div class='add'>+ * frequency</div><div class='ctx'>  */</div><div class='del'>-static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)</div><div class='add'>+static unsigned int cs_dbs_update(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct policy_dbs_info *policy_dbs = policy-&gt;governor_data;</div><div class='ctx'> 	struct cs_policy_dbs_info *dbs_info = to_dbs_info(policy_dbs);</div><div class='hunk'>@@ -66,6 +66,7 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)</div><div class='ctx'> 	struct dbs_data *dbs_data = policy_dbs-&gt;dbs_data;</div><div class='ctx'> 	struct cs_dbs_tuners *cs_tuners = dbs_data-&gt;tuners;</div><div class='ctx'> 	unsigned int load = dbs_update(policy);</div><div class='add'>+	unsigned int freq_step;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * break out if we 'cannot' reduce the speed as the user might</div><div class='hunk'>@@ -82,6 +83,23 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)</div><div class='ctx'> 	if (requested_freq &gt; policy-&gt;max || requested_freq &lt; policy-&gt;min)</div><div class='ctx'> 		requested_freq = policy-&gt;cur;</div><div class='ctx'> </div><div class='add'>+	freq_step = get_freq_step(cs_tuners, policy);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Decrease requested_freq one freq_step for each idle period that</div><div class='add'>+	 * we didn't update the frequency.</div><div class='add'>+	 */</div><div class='add'>+	if (policy_dbs-&gt;idle_periods &lt; UINT_MAX) {</div><div class='add'>+		unsigned int freq_steps = policy_dbs-&gt;idle_periods * freq_step;</div><div class='add'>+</div><div class='add'>+		if (requested_freq &gt; freq_steps)</div><div class='add'>+			requested_freq -= freq_steps;</div><div class='add'>+		else</div><div class='add'>+			requested_freq = policy-&gt;min;</div><div class='add'>+</div><div class='add'>+		policy_dbs-&gt;idle_periods = UINT_MAX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Check for frequency increase */</div><div class='ctx'> 	if (load &gt; dbs_data-&gt;up_threshold) {</div><div class='ctx'> 		dbs_info-&gt;down_skip = 0;</div><div class='hunk'>@@ -90,7 +108,7 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)</div><div class='ctx'> 		if (requested_freq == policy-&gt;max)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		requested_freq += get_freq_target(cs_tuners, policy);</div><div class='add'>+		requested_freq += freq_step;</div><div class='ctx'> 		if (requested_freq &gt; policy-&gt;max)</div><div class='ctx'> 			requested_freq = policy-&gt;max;</div><div class='ctx'> </div><div class='hunk'>@@ -106,16 +124,14 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	/* Check for frequency decrease */</div><div class='ctx'> 	if (load &lt; cs_tuners-&gt;down_threshold) {</div><div class='del'>-		unsigned int freq_target;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * if we cannot reduce the frequency anymore, break out early</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (requested_freq == policy-&gt;min)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		freq_target = get_freq_target(cs_tuners, policy);</div><div class='del'>-		if (requested_freq &gt; freq_target)</div><div class='del'>-			requested_freq -= freq_target;</div><div class='add'>+		if (requested_freq &gt; freq_step)</div><div class='add'>+			requested_freq -= freq_step;</div><div class='ctx'> 		else</div><div class='ctx'> 			requested_freq = policy-&gt;min;</div><div class='ctx'> </div><div class='hunk'>@@ -305,7 +321,7 @@ static void cs_start(struct cpufreq_policy *policy)</div><div class='ctx'> static struct dbs_governor cs_governor = {</div><div class='ctx'> 	.gov = CPUFREQ_DBS_GOVERNOR_INITIALIZER("conservative"),</div><div class='ctx'> 	.kobj_type = { .default_attrs = cs_attributes },</div><div class='del'>-	.gov_dbs_timer = cs_dbs_timer,</div><div class='add'>+	.gov_dbs_update = cs_dbs_update,</div><div class='ctx'> 	.alloc = cs_alloc,</div><div class='ctx'> 	.free = cs_free,</div><div class='ctx'> 	.init = cs_init,</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c<br/>index 642dd0f183a8..47e24b5384b3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq_governor.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/cpufreq_governor.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq_governor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq_governor.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cpufreq_governor.h"</div><div class='hunk'>@@ -61,7 +60,7 @@ ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf,</div><div class='ctx'> 	 * entries can't be freed concurrently.</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry(policy_dbs, &amp;attr_set-&gt;policy_list, list) {</div><div class='del'>-		mutex_lock(&amp;policy_dbs-&gt;timer_mutex);</div><div class='add'>+		mutex_lock(&amp;policy_dbs-&gt;update_mutex);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * On 32-bit architectures this may race with the</div><div class='ctx'> 		 * sample_delay_ns read in dbs_update_util_handler(), but that</div><div class='hunk'>@@ -76,7 +75,7 @@ ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf,</div><div class='ctx'> 		 * taken, so it shouldn't be significant.</div><div class='ctx'> 		 */</div><div class='ctx'> 		gov_update_sample_delay(policy_dbs, 0);</div><div class='del'>-		mutex_unlock(&amp;policy_dbs-&gt;timer_mutex);</div><div class='add'>+		mutex_unlock(&amp;policy_dbs-&gt;update_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -117,7 +116,7 @@ unsigned int dbs_update(struct cpufreq_policy *policy)</div><div class='ctx'> 	struct policy_dbs_info *policy_dbs = policy-&gt;governor_data;</div><div class='ctx'> 	struct dbs_data *dbs_data = policy_dbs-&gt;dbs_data;</div><div class='ctx'> 	unsigned int ignore_nice = dbs_data-&gt;ignore_nice_load;</div><div class='del'>-	unsigned int max_load = 0;</div><div class='add'>+	unsigned int max_load = 0, idle_periods = UINT_MAX;</div><div class='ctx'> 	unsigned int sampling_rate, io_busy, j;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -152,7 +151,7 @@ unsigned int dbs_update(struct cpufreq_policy *policy)</div><div class='ctx'> 		if (ignore_nice) {</div><div class='ctx'> 			u64 cur_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];</div><div class='ctx'> </div><div class='del'>-			idle_time += cputime_to_usecs(cur_nice - j_cdbs-&gt;prev_cpu_nice);</div><div class='add'>+			idle_time += div_u64(cur_nice - j_cdbs-&gt;prev_cpu_nice, NSEC_PER_USEC);</div><div class='ctx'> 			j_cdbs-&gt;prev_cpu_nice = cur_nice;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -215,9 +214,19 @@ unsigned int dbs_update(struct cpufreq_policy *policy)</div><div class='ctx'> 			j_cdbs-&gt;prev_load = load;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (time_elapsed &gt; 2 * sampling_rate) {</div><div class='add'>+			unsigned int periods = time_elapsed / sampling_rate;</div><div class='add'>+</div><div class='add'>+			if (periods &lt; idle_periods)</div><div class='add'>+				idle_periods = periods;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (load &gt; max_load)</div><div class='ctx'> 			max_load = load;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	policy_dbs-&gt;idle_periods = idle_periods;</div><div class='add'>+</div><div class='ctx'> 	return max_load;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dbs_update);</div><div class='hunk'>@@ -236,9 +245,9 @@ static void dbs_work_handler(struct work_struct *work)</div><div class='ctx'> 	 * Make sure cpufreq_governor_limits() isn't evaluating load or the</div><div class='ctx'> 	 * ondemand governor isn't updating the sampling rate in parallel.</div><div class='ctx'> 	 */</div><div class='del'>-	mutex_lock(&amp;policy_dbs-&gt;timer_mutex);</div><div class='del'>-	gov_update_sample_delay(policy_dbs, gov-&gt;gov_dbs_timer(policy));</div><div class='del'>-	mutex_unlock(&amp;policy_dbs-&gt;timer_mutex);</div><div class='add'>+	mutex_lock(&amp;policy_dbs-&gt;update_mutex);</div><div class='add'>+	gov_update_sample_delay(policy_dbs, gov-&gt;gov_dbs_update(policy));</div><div class='add'>+	mutex_unlock(&amp;policy_dbs-&gt;update_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Allow the utilization update handler to queue up more work. */</div><div class='ctx'> 	atomic_set(&amp;policy_dbs-&gt;work_count, 0);</div><div class='hunk'>@@ -348,7 +357,7 @@ static struct policy_dbs_info *alloc_policy_dbs_info(struct cpufreq_policy *poli</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	policy_dbs-&gt;policy = policy;</div><div class='del'>-	mutex_init(&amp;policy_dbs-&gt;timer_mutex);</div><div class='add'>+	mutex_init(&amp;policy_dbs-&gt;update_mutex);</div><div class='ctx'> 	atomic_set(&amp;policy_dbs-&gt;work_count, 0);</div><div class='ctx'> 	init_irq_work(&amp;policy_dbs-&gt;irq_work, dbs_irq_work);</div><div class='ctx'> 	INIT_WORK(&amp;policy_dbs-&gt;work, dbs_work_handler);</div><div class='hunk'>@@ -367,7 +376,7 @@ static void free_policy_dbs_info(struct policy_dbs_info *policy_dbs,</div><div class='ctx'> {</div><div class='ctx'> 	int j;</div><div class='ctx'> </div><div class='del'>-	mutex_destroy(&amp;policy_dbs-&gt;timer_mutex);</div><div class='add'>+	mutex_destroy(&amp;policy_dbs-&gt;update_mutex);</div><div class='ctx'> </div><div class='ctx'> 	for_each_cpu(j, policy_dbs-&gt;policy-&gt;related_cpus) {</div><div class='ctx'> 		struct cpu_dbs_info *j_cdbs = &amp;per_cpu(cpu_dbs, j);</div><div class='hunk'>@@ -547,10 +556,10 @@ void cpufreq_dbs_governor_limits(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct policy_dbs_info *policy_dbs = policy-&gt;governor_data;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;policy_dbs-&gt;timer_mutex);</div><div class='add'>+	mutex_lock(&amp;policy_dbs-&gt;update_mutex);</div><div class='ctx'> 	cpufreq_policy_apply_limits(policy);</div><div class='ctx'> 	gov_update_sample_delay(policy_dbs, 0);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;policy_dbs-&gt;timer_mutex);</div><div class='add'>+	mutex_unlock(&amp;policy_dbs-&gt;update_mutex);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(cpufreq_dbs_governor_limits);</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h<br/>index ef1037e9c92b..0236ec2cd654 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq_governor.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/cpufreq_governor.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq_governor.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq_governor.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/irq_work.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='add'>+#include &lt;linux/sched/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -85,7 +86,7 @@ struct policy_dbs_info {</div><div class='ctx'> 	 * Per policy mutex that serializes load evaluation from limit-change</div><div class='ctx'> 	 * and work-handler.</div><div class='ctx'> 	 */</div><div class='del'>-	struct mutex timer_mutex;</div><div class='add'>+	struct mutex update_mutex;</div><div class='ctx'> </div><div class='ctx'> 	u64 last_sample_time;</div><div class='ctx'> 	s64 sample_delay_ns;</div><div class='hunk'>@@ -97,6 +98,7 @@ struct policy_dbs_info {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	/* Multiplier for increasing sample delay temporarily. */</div><div class='ctx'> 	unsigned int rate_mult;</div><div class='add'>+	unsigned int idle_periods;	/* For conservative */</div><div class='ctx'> 	/* Status indicators */</div><div class='ctx'> 	bool is_shared;		/* This object is used by multiple CPUs */</div><div class='ctx'> 	bool work_in_progress;	/* Work is being queued up or in progress */</div><div class='hunk'>@@ -135,7 +137,7 @@ struct dbs_governor {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct dbs_data *gdbs_data;</div><div class='ctx'> </div><div class='del'>-	unsigned int (*gov_dbs_timer)(struct cpufreq_policy *policy);</div><div class='add'>+	unsigned int (*gov_dbs_update)(struct cpufreq_policy *policy);</div><div class='ctx'> 	struct policy_dbs_info *(*alloc)(void);</div><div class='ctx'> 	void (*free)(struct policy_dbs_info *policy_dbs);</div><div class='ctx'> 	int (*init)(struct dbs_data *dbs_data);</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c<br/>index 3a1f49f5f4c6..3937acf7e026 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq_ondemand.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/cpufreq_ondemand.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq_ondemand.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq_ondemand.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/percpu-defs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='add'>+#include &lt;linux/sched/cpufreq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cpufreq_ondemand.h"</div><div class='ctx'> </div><div class='hunk'>@@ -25,7 +26,7 @@</div><div class='ctx'> #define MAX_SAMPLING_DOWN_FACTOR		(100000)</div><div class='ctx'> #define MICRO_FREQUENCY_UP_THRESHOLD		(95)</div><div class='ctx'> #define MICRO_FREQUENCY_MIN_SAMPLE_RATE		(10000)</div><div class='del'>-#define MIN_FREQUENCY_UP_THRESHOLD		(11)</div><div class='add'>+#define MIN_FREQUENCY_UP_THRESHOLD		(1)</div><div class='ctx'> #define MAX_FREQUENCY_UP_THRESHOLD		(100)</div><div class='ctx'> </div><div class='ctx'> static struct od_ops od_ops;</div><div class='hunk'>@@ -169,7 +170,7 @@ static void od_update(struct cpufreq_policy *policy)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int od_dbs_timer(struct cpufreq_policy *policy)</div><div class='add'>+static unsigned int od_dbs_update(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct policy_dbs_info *policy_dbs = policy-&gt;governor_data;</div><div class='ctx'> 	struct dbs_data *dbs_data = policy_dbs-&gt;dbs_data;</div><div class='hunk'>@@ -191,7 +192,7 @@ static unsigned int od_dbs_timer(struct cpufreq_policy *policy)</div><div class='ctx'> 	od_update(policy);</div><div class='ctx'> </div><div class='ctx'> 	if (dbs_info-&gt;freq_lo) {</div><div class='del'>-		/* Setup timer for SUB_SAMPLE */</div><div class='add'>+		/* Setup SUB_SAMPLE */</div><div class='ctx'> 		dbs_info-&gt;sample_type = OD_SUB_SAMPLE;</div><div class='ctx'> 		return dbs_info-&gt;freq_hi_delay_us;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -255,11 +256,11 @@ static ssize_t store_sampling_down_factor(struct gov_attr_set *attr_set,</div><div class='ctx'> 	list_for_each_entry(policy_dbs, &amp;attr_set-&gt;policy_list, list) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Doing this without locking might lead to using different</div><div class='del'>-		 * rate_mult values in od_update() and od_dbs_timer().</div><div class='add'>+		 * rate_mult values in od_update() and od_dbs_update().</div><div class='ctx'> 		 */</div><div class='del'>-		mutex_lock(&amp;policy_dbs-&gt;timer_mutex);</div><div class='add'>+		mutex_lock(&amp;policy_dbs-&gt;update_mutex);</div><div class='ctx'> 		policy_dbs-&gt;rate_mult = 1;</div><div class='del'>-		mutex_unlock(&amp;policy_dbs-&gt;timer_mutex);</div><div class='add'>+		mutex_unlock(&amp;policy_dbs-&gt;update_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -374,8 +375,7 @@ static int od_init(struct dbs_data *dbs_data)</div><div class='ctx'> 		dbs_data-&gt;up_threshold = MICRO_FREQUENCY_UP_THRESHOLD;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * In nohz/micro accounting case we set the minimum frequency</div><div class='del'>-		 * not depending on HZ, but fixed (very low). The deferred</div><div class='del'>-		 * timer might skip some samples if idle/sleeping as needed.</div><div class='add'>+		 * not depending on HZ, but fixed (very low).</div><div class='ctx'> 		*/</div><div class='ctx'> 		dbs_data-&gt;min_sampling_rate = MICRO_FREQUENCY_MIN_SAMPLE_RATE;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -415,7 +415,7 @@ static struct od_ops od_ops = {</div><div class='ctx'> static struct dbs_governor od_dbs_gov = {</div><div class='ctx'> 	.gov = CPUFREQ_DBS_GOVERNOR_INITIALIZER("ondemand"),</div><div class='ctx'> 	.kobj_type = { .default_attrs = od_attributes },</div><div class='del'>-	.gov_dbs_timer = od_dbs_timer,</div><div class='add'>+	.gov_dbs_update = od_dbs_update,</div><div class='ctx'> 	.alloc = od_alloc,</div><div class='ctx'> 	.free = od_free,</div><div class='ctx'> 	.init = od_init,</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c<br/>index 06d3abdffd3a..f570ead62454 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq_stats.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/cpufreq_stats.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/cpufreq_stats.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/cpufreq_stats.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/cputime.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(cpufreq_stats_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -25,9 +24,7 @@ struct cpufreq_stats {</div><div class='ctx'> 	unsigned int last_index;</div><div class='ctx'> 	u64 *time_in_state;</div><div class='ctx'> 	unsigned int *freq_table;</div><div class='del'>-#ifdef CONFIG_CPU_FREQ_STAT_DETAILS</div><div class='ctx'> 	unsigned int *trans_table;</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int cpufreq_stats_update(struct cpufreq_stats *stats)</div><div class='hunk'>@@ -41,6 +38,16 @@ static int cpufreq_stats_update(struct cpufreq_stats *stats)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cpufreq_stats_clear_table(struct cpufreq_stats *stats)</div><div class='add'>+{</div><div class='add'>+	unsigned int count = stats-&gt;max_state;</div><div class='add'>+</div><div class='add'>+	memset(stats-&gt;time_in_state, 0, count * sizeof(u64));</div><div class='add'>+	memset(stats-&gt;trans_table, 0, count * count * sizeof(int));</div><div class='add'>+	stats-&gt;last_time = get_jiffies_64();</div><div class='add'>+	stats-&gt;total_trans = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t show_total_trans(struct cpufreq_policy *policy, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%d\n", policy-&gt;stats-&gt;total_trans);</div><div class='hunk'>@@ -64,7 +71,14 @@ static ssize_t show_time_in_state(struct cpufreq_policy *policy, char *buf)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPU_FREQ_STAT_DETAILS</div><div class='add'>+static ssize_t store_reset(struct cpufreq_policy *policy, const char *buf,</div><div class='add'>+			   size_t count)</div><div class='add'>+{</div><div class='add'>+	/* We don't care what is written to the attribute. */</div><div class='add'>+	cpufreq_stats_clear_table(policy-&gt;stats);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_stats *stats = policy-&gt;stats;</div><div class='hunk'>@@ -109,17 +123,16 @@ static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> cpufreq_freq_attr_ro(trans_table);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> cpufreq_freq_attr_ro(total_trans);</div><div class='ctx'> cpufreq_freq_attr_ro(time_in_state);</div><div class='add'>+cpufreq_freq_attr_wo(reset);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *default_attrs[] = {</div><div class='ctx'> 	&amp;total_trans.attr,</div><div class='ctx'> 	&amp;time_in_state.attr,</div><div class='del'>-#ifdef CONFIG_CPU_FREQ_STAT_DETAILS</div><div class='add'>+	&amp;reset.attr,</div><div class='ctx'> 	&amp;trans_table.attr,</div><div class='del'>-#endif</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> static struct attribute_group stats_attr_group = {</div><div class='hunk'>@@ -178,9 +191,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	alloc_size = count * sizeof(int) + count * sizeof(u64);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPU_FREQ_STAT_DETAILS</div><div class='ctx'> 	alloc_size += count * count * sizeof(int);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for time_in_state/freq_table/trans_table in one go */</div><div class='ctx'> 	stats-&gt;time_in_state = kzalloc(alloc_size, GFP_KERNEL);</div><div class='hunk'>@@ -189,9 +200,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;freq_table = (unsigned int *)(stats-&gt;time_in_state + count);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPU_FREQ_STAT_DETAILS</div><div class='ctx'> 	stats-&gt;trans_table = stats-&gt;freq_table + count;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;max_state = count;</div><div class='ctx'> </div><div class='hunk'>@@ -237,8 +246,6 @@ void cpufreq_stats_record_transition(struct cpufreq_policy *policy,</div><div class='ctx'> 	cpufreq_stats_update(stats);</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;last_index = new_index;</div><div class='del'>-#ifdef CONFIG_CPU_FREQ_STAT_DETAILS</div><div class='ctx'> 	stats-&gt;trans_table[old_index * stats-&gt;max_state + new_index]++;</div><div class='del'>-#endif</div><div class='ctx'> 	stats-&gt;total_trans++;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c<br/>index b95a872800ec..d54a27c99121 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/davinci-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/davinci-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/davinci-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/davinci-cpufreq.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ static int davinci_target(struct cpufreq_policy *policy, unsigned int idx)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = clk_set_rate(armclk, idx);</div><div class='add'>+	ret = clk_set_rate(armclk, new_freq * 1000);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/exynos5440-cpufreq.c b/drivers/cpufreq/exynos5440-cpufreq.c<br/>index c0f3373706f4..9180d34cc9fc 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/exynos5440-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/exynos5440-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/exynos5440-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/exynos5440-cpufreq.c</a></div><div class='hunk'>@@ -118,12 +118,10 @@ static int init_div_table(void)</div><div class='ctx'> 	unsigned int tmp, clk_div, ema_div, freq, volt_id;</div><div class='ctx'> 	struct dev_pm_opp *opp;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	cpufreq_for_each_entry(pos, freq_tbl) {</div><div class='ctx'> 		opp = dev_pm_opp_find_freq_exact(dvfs_info-&gt;dev,</div><div class='ctx'> 					pos-&gt;frequency * 1000, true);</div><div class='ctx'> 		if (IS_ERR(opp)) {</div><div class='del'>-			rcu_read_unlock();</div><div class='ctx'> 			dev_err(dvfs_info-&gt;dev,</div><div class='ctx'> 				"failed to find valid OPP for %u KHZ\n",</div><div class='ctx'> 				pos-&gt;frequency);</div><div class='hunk'>@@ -140,6 +138,7 @@ static int init_div_table(void)</div><div class='ctx'> </div><div class='ctx'> 		/* Calculate EMA */</div><div class='ctx'> 		volt_id = dev_pm_opp_get_voltage(opp);</div><div class='add'>+</div><div class='ctx'> 		volt_id = (MAX_VOLTAGE - volt_id) / VOLTAGE_STEP;</div><div class='ctx'> 		if (volt_id &lt; PMIC_HIGH_VOLT) {</div><div class='ctx'> 			ema_div = (CPUEMA_HIGH &lt;&lt; P0_7_CPUEMA_SHIFT) |</div><div class='hunk'>@@ -157,9 +156,9 @@ static int init_div_table(void)</div><div class='ctx'> </div><div class='ctx'> 		__raw_writel(tmp, dvfs_info-&gt;base + XMU_PMU_P0_7 + 4 *</div><div class='ctx'> 						(pos - freq_tbl));</div><div class='add'>+		dev_pm_opp_put(opp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/ia64-acpi-cpufreq.c b/drivers/cpufreq/ia64-acpi-cpufreq.c<br/>index 759612da4fdc..e28a31a40829 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/ia64-acpi-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/ia64-acpi-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/ia64-acpi-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/ia64-acpi-cpufreq.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='head'>diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c<br/>index ef1fa8145419..7719b02e04f5 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/imx6q-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/imx6q-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/imx6q-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/imx6q-cpufreq.c</a></div><div class='hunk'>@@ -53,16 +53,15 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)</div><div class='ctx'> 	freq_hz = new_freq * 1000;</div><div class='ctx'> 	old_freq = clk_get_rate(arm_clk) / 1000;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	opp = dev_pm_opp_find_freq_ceil(cpu_dev, &amp;freq_hz);</div><div class='ctx'> 	if (IS_ERR(opp)) {</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 		dev_err(cpu_dev, "failed to find OPP for %ld\n", freq_hz);</div><div class='ctx'> 		return PTR_ERR(opp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	volt = dev_pm_opp_get_voltage(opp);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	dev_pm_opp_put(opp);</div><div class='add'>+</div><div class='ctx'> 	volt_old = regulator_get_voltage(arm_reg);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(cpu_dev, "%u MHz, %ld mV --&gt; %u MHz, %ld mV\n",</div><div class='hunk'>@@ -321,14 +320,15 @@ soc_opp_out:</div><div class='ctx'> 	 * freq_table initialised from OPP is therefore sorted in the</div><div class='ctx'> 	 * same order.</div><div class='ctx'> 	 */</div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	opp = dev_pm_opp_find_freq_exact(cpu_dev,</div><div class='ctx'> 				  freq_table[0].frequency * 1000, true);</div><div class='ctx'> 	min_volt = dev_pm_opp_get_voltage(opp);</div><div class='add'>+	dev_pm_opp_put(opp);</div><div class='ctx'> 	opp = dev_pm_opp_find_freq_exact(cpu_dev,</div><div class='ctx'> 				  freq_table[--num].frequency * 1000, true);</div><div class='ctx'> 	max_volt = dev_pm_opp_get_voltage(opp);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	dev_pm_opp_put(opp);</div><div class='add'>+</div><div class='ctx'> 	ret = regulator_set_voltage_time(arm_reg, min_volt, max_volt);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		transition_latency += ret * 1000;</div><div class='head'>diff --git a/drivers/cpufreq/integrator-cpufreq.c b/drivers/cpufreq/integrator-cpufreq.c<br/>deleted file mode 100644<br/>index 79e3ff2771a6..000000000000<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/integrator-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/integrator-cpufreq.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,239 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001-2002 Deep Blue Solutions Ltd.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * CPU support functions</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/cpufreq.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_address.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware/icst.h&gt;</div><div class='del'>-</div><div class='del'>-static void __iomem *cm_base;</div><div class='del'>-/* The cpufreq driver only use the OSC register */</div><div class='del'>-#define INTEGRATOR_HDR_OSC_OFFSET       0x08</div><div class='del'>-#define INTEGRATOR_HDR_LOCK_OFFSET      0x14</div><div class='del'>-</div><div class='del'>-static struct cpufreq_driver integrator_driver;</div><div class='del'>-</div><div class='del'>-static const struct icst_params lclk_params = {</div><div class='del'>-	.ref		= 24000000,</div><div class='del'>-	.vco_max	= ICST525_VCO_MAX_5V,</div><div class='del'>-	.vco_min	= ICST525_VCO_MIN,</div><div class='del'>-	.vd_min		= 8,</div><div class='del'>-	.vd_max		= 132,</div><div class='del'>-	.rd_min		= 24,</div><div class='del'>-	.rd_max		= 24,</div><div class='del'>-	.s2div		= icst525_s2div,</div><div class='del'>-	.idx2s		= icst525_idx2s,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct icst_params cclk_params = {</div><div class='del'>-	.ref		= 24000000,</div><div class='del'>-	.vco_max	= ICST525_VCO_MAX_5V,</div><div class='del'>-	.vco_min	= ICST525_VCO_MIN,</div><div class='del'>-	.vd_min		= 12,</div><div class='del'>-	.vd_max		= 160,</div><div class='del'>-	.rd_min		= 24,</div><div class='del'>-	.rd_max		= 24,</div><div class='del'>-	.s2div		= icst525_s2div,</div><div class='del'>-	.idx2s		= icst525_idx2s,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Validate the speed policy.</div><div class='del'>- */</div><div class='del'>-static int integrator_verify_policy(struct cpufreq_policy *policy)</div><div class='del'>-{</div><div class='del'>-	struct icst_vco vco;</div><div class='del'>-</div><div class='del'>-	cpufreq_verify_within_cpu_limits(policy);</div><div class='del'>-</div><div class='del'>-	vco = icst_hz_to_vco(&amp;cclk_params, policy-&gt;max * 1000);</div><div class='del'>-	policy-&gt;max = icst_hz(&amp;cclk_params, vco) / 1000;</div><div class='del'>-</div><div class='del'>-	vco = icst_hz_to_vco(&amp;cclk_params, policy-&gt;min * 1000);</div><div class='del'>-	policy-&gt;min = icst_hz(&amp;cclk_params, vco) / 1000;</div><div class='del'>-</div><div class='del'>-	cpufreq_verify_within_cpu_limits(policy);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int integrator_set_target(struct cpufreq_policy *policy,</div><div class='del'>-				 unsigned int target_freq,</div><div class='del'>-				 unsigned int relation)</div><div class='del'>-{</div><div class='del'>-	cpumask_t cpus_allowed;</div><div class='del'>-	int cpu = policy-&gt;cpu;</div><div class='del'>-	struct icst_vco vco;</div><div class='del'>-	struct cpufreq_freqs freqs;</div><div class='del'>-	u_int cm_osc;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Save this threads cpus_allowed mask.</div><div class='del'>-	 */</div><div class='del'>-	cpus_allowed = current-&gt;cpus_allowed;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Bind to the specified CPU.  When this call returns,</div><div class='del'>-	 * we should be running on the right CPU.</div><div class='del'>-	 */</div><div class='del'>-	set_cpus_allowed_ptr(current, cpumask_of(cpu));</div><div class='del'>-	BUG_ON(cpu != smp_processor_id());</div><div class='del'>-</div><div class='del'>-	/* get current setting */</div><div class='del'>-	cm_osc = __raw_readl(cm_base + INTEGRATOR_HDR_OSC_OFFSET);</div><div class='del'>-</div><div class='del'>-	if (machine_is_integrator())</div><div class='del'>-		vco.s = (cm_osc &gt;&gt; 8) &amp; 7;</div><div class='del'>-	else if (machine_is_cintegrator())</div><div class='del'>-		vco.s = 1;</div><div class='del'>-	vco.v = cm_osc &amp; 255;</div><div class='del'>-	vco.r = 22;</div><div class='del'>-	freqs.old = icst_hz(&amp;cclk_params, vco) / 1000;</div><div class='del'>-</div><div class='del'>-	/* icst_hz_to_vco rounds down -- so we need the next</div><div class='del'>-	 * larger freq in case of CPUFREQ_RELATION_L.</div><div class='del'>-	 */</div><div class='del'>-	if (relation == CPUFREQ_RELATION_L)</div><div class='del'>-		target_freq += 999;</div><div class='del'>-	if (target_freq &gt; policy-&gt;max)</div><div class='del'>-		target_freq = policy-&gt;max;</div><div class='del'>-	vco = icst_hz_to_vco(&amp;cclk_params, target_freq * 1000);</div><div class='del'>-	freqs.new = icst_hz(&amp;cclk_params, vco) / 1000;</div><div class='del'>-</div><div class='del'>-	if (freqs.old == freqs.new) {</div><div class='del'>-		set_cpus_allowed_ptr(current, &amp;cpus_allowed);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cpufreq_freq_transition_begin(policy, &amp;freqs);</div><div class='del'>-</div><div class='del'>-	cm_osc = __raw_readl(cm_base + INTEGRATOR_HDR_OSC_OFFSET);</div><div class='del'>-</div><div class='del'>-	if (machine_is_integrator()) {</div><div class='del'>-		cm_osc &amp;= 0xfffff800;</div><div class='del'>-		cm_osc |= vco.s &lt;&lt; 8;</div><div class='del'>-	} else if (machine_is_cintegrator()) {</div><div class='del'>-		cm_osc &amp;= 0xffffff00;</div><div class='del'>-	}</div><div class='del'>-	cm_osc |= vco.v;</div><div class='del'>-</div><div class='del'>-	__raw_writel(0xa05f, cm_base + INTEGRATOR_HDR_LOCK_OFFSET);</div><div class='del'>-	__raw_writel(cm_osc, cm_base + INTEGRATOR_HDR_OSC_OFFSET);</div><div class='del'>-	__raw_writel(0, cm_base + INTEGRATOR_HDR_LOCK_OFFSET);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Restore the CPUs allowed mask.</div><div class='del'>-	 */</div><div class='del'>-	set_cpus_allowed_ptr(current, &amp;cpus_allowed);</div><div class='del'>-</div><div class='del'>-	cpufreq_freq_transition_end(policy, &amp;freqs, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int integrator_get(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	cpumask_t cpus_allowed;</div><div class='del'>-	unsigned int current_freq;</div><div class='del'>-	u_int cm_osc;</div><div class='del'>-	struct icst_vco vco;</div><div class='del'>-</div><div class='del'>-	cpus_allowed = current-&gt;cpus_allowed;</div><div class='del'>-</div><div class='del'>-	set_cpus_allowed_ptr(current, cpumask_of(cpu));</div><div class='del'>-	BUG_ON(cpu != smp_processor_id());</div><div class='del'>-</div><div class='del'>-	/* detect memory etc. */</div><div class='del'>-	cm_osc = __raw_readl(cm_base + INTEGRATOR_HDR_OSC_OFFSET);</div><div class='del'>-</div><div class='del'>-	if (machine_is_integrator())</div><div class='del'>-		vco.s = (cm_osc &gt;&gt; 8) &amp; 7;</div><div class='del'>-	else</div><div class='del'>-		vco.s = 1;</div><div class='del'>-	vco.v = cm_osc &amp; 255;</div><div class='del'>-	vco.r = 22;</div><div class='del'>-</div><div class='del'>-	current_freq = icst_hz(&amp;cclk_params, vco) / 1000; /* current freq */</div><div class='del'>-</div><div class='del'>-	set_cpus_allowed_ptr(current, &amp;cpus_allowed);</div><div class='del'>-</div><div class='del'>-	return current_freq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int integrator_cpufreq_init(struct cpufreq_policy *policy)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/* set default policy and cpuinfo */</div><div class='del'>-	policy-&gt;max = policy-&gt;cpuinfo.max_freq = 160000;</div><div class='del'>-	policy-&gt;min = policy-&gt;cpuinfo.min_freq = 12000;</div><div class='del'>-	policy-&gt;cpuinfo.transition_latency = 1000000; /* 1 ms, assumed */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct cpufreq_driver integrator_driver = {</div><div class='del'>-	.flags		= CPUFREQ_NEED_INITIAL_FREQ_CHECK,</div><div class='del'>-	.verify		= integrator_verify_policy,</div><div class='del'>-	.target		= integrator_set_target,</div><div class='del'>-	.get		= integrator_get,</div><div class='del'>-	.init		= integrator_cpufreq_init,</div><div class='del'>-	.name		= "integrator",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init integrator_cpufreq_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct resource *res;</div><div class='del'>-</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (!res)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	cm_base = devm_ioremap(&amp;pdev-&gt;dev, res-&gt;start, resource_size(res));</div><div class='del'>-	if (!cm_base)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	return cpufreq_register_driver(&amp;integrator_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __exit integrator_cpufreq_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	return cpufreq_unregister_driver(&amp;integrator_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct of_device_id integrator_cpufreq_match[] = {</div><div class='del'>-	{ .compatible = "arm,core-module-integrator"},</div><div class='del'>-	{ },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(of, integrator_cpufreq_match);</div><div class='del'>-</div><div class='del'>-static struct platform_driver integrator_cpufreq_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "integrator-cpufreq",</div><div class='del'>-		.of_match_table = integrator_cpufreq_match,</div><div class='del'>-	},</div><div class='del'>-	.remove = __exit_p(integrator_cpufreq_remove),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_platform_driver_probe(integrator_cpufreq_driver,</div><div class='del'>-			     integrator_cpufreq_probe);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Russell M. King");</div><div class='del'>-MODULE_DESCRIPTION("cpufreq driver for ARM Integrator CPUs");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c<br/>index 4737520ec823..b1fbaa30ae04 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/intel_pstate.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/intel_pstate.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/intel_pstate.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/intel_pstate.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='hunk'>@@ -37,13 +37,11 @@</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/intel-family.h&gt;</div><div class='ctx'> </div><div class='del'>-#define ATOM_RATIOS		0x66a</div><div class='del'>-#define ATOM_VIDS		0x66b</div><div class='del'>-#define ATOM_TURBO_RATIOS	0x66c</div><div class='del'>-#define ATOM_TURBO_VIDS		0x66d</div><div class='add'>+#define INTEL_CPUFREQ_TRANSITION_LATENCY	20000</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> #include &lt;acpi/processor.h&gt;</div><div class='add'>+#include &lt;acpi/cppc_acpi.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define FRAC_BITS 8</div><div class='hunk'>@@ -52,6 +50,8 @@</div><div class='ctx'> </div><div class='ctx'> #define EXT_BITS 6</div><div class='ctx'> #define EXT_FRAC_BITS (EXT_BITS + FRAC_BITS)</div><div class='add'>+#define fp_ext_toint(X) ((X) &gt;&gt; EXT_FRAC_BITS)</div><div class='add'>+#define int_ext_tofp(X) ((int64_t)(X) &lt;&lt; EXT_FRAC_BITS)</div><div class='ctx'> </div><div class='ctx'> static inline int32_t mul_fp(int32_t x, int32_t y)</div><div class='ctx'> {</div><div class='hunk'>@@ -122,6 +122,8 @@ struct sample {</div><div class='ctx'>  * @scaling:		Scaling factor to  convert frequency to cpufreq</div><div class='ctx'>  *			frequency units</div><div class='ctx'>  * @turbo_pstate:	Max Turbo P state possible for this platform</div><div class='add'>+ * @max_freq:		@max_pstate frequency in cpufreq units</div><div class='add'>+ * @turbo_freq:		@turbo_pstate frequency in cpufreq units</div><div class='ctx'>  *</div><div class='ctx'>  * Stores the per cpu model P state limits and current P state.</div><div class='ctx'>  */</div><div class='hunk'>@@ -132,6 +134,8 @@ struct pstate_data {</div><div class='ctx'> 	int	max_pstate_physical;</div><div class='ctx'> 	int	scaling;</div><div class='ctx'> 	int	turbo_pstate;</div><div class='add'>+	unsigned int max_freq;</div><div class='add'>+	unsigned int turbo_freq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -177,6 +181,48 @@ struct _pid {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct perf_limits - Store user and policy limits</div><div class='add'>+ * @no_turbo:		User requested turbo state from intel_pstate sysfs</div><div class='add'>+ * @turbo_disabled:	Platform turbo status either from msr</div><div class='add'>+ *			MSR_IA32_MISC_ENABLE or when maximum available pstate</div><div class='add'>+ *			matches the maximum turbo pstate</div><div class='add'>+ * @max_perf_pct:	Effective maximum performance limit in percentage, this</div><div class='add'>+ *			is minimum of either limits enforced by cpufreq policy</div><div class='add'>+ *			or limits from user set limits via intel_pstate sysfs</div><div class='add'>+ * @min_perf_pct:	Effective minimum performance limit in percentage, this</div><div class='add'>+ *			is maximum of either limits enforced by cpufreq policy</div><div class='add'>+ *			or limits from user set limits via intel_pstate sysfs</div><div class='add'>+ * @max_perf:		This is a scaled value between 0 to 255 for max_perf_pct</div><div class='add'>+ *			This value is used to limit max pstate</div><div class='add'>+ * @min_perf:		This is a scaled value between 0 to 255 for min_perf_pct</div><div class='add'>+ *			This value is used to limit min pstate</div><div class='add'>+ * @max_policy_pct:	The maximum performance in percentage enforced by</div><div class='add'>+ *			cpufreq setpolicy interface</div><div class='add'>+ * @max_sysfs_pct:	The maximum performance in percentage enforced by</div><div class='add'>+ *			intel pstate sysfs interface, unused when per cpu</div><div class='add'>+ *			controls are enforced</div><div class='add'>+ * @min_policy_pct:	The minimum performance in percentage enforced by</div><div class='add'>+ *			cpufreq setpolicy interface</div><div class='add'>+ * @min_sysfs_pct:	The minimum performance in percentage enforced by</div><div class='add'>+ *			intel pstate sysfs interface, unused when per cpu</div><div class='add'>+ *			controls are enforced</div><div class='add'>+ *</div><div class='add'>+ * Storage for user and policy defined limits.</div><div class='add'>+ */</div><div class='add'>+struct perf_limits {</div><div class='add'>+	int no_turbo;</div><div class='add'>+	int turbo_disabled;</div><div class='add'>+	int max_perf_pct;</div><div class='add'>+	int min_perf_pct;</div><div class='add'>+	int32_t max_perf;</div><div class='add'>+	int32_t min_perf;</div><div class='add'>+	int max_policy_pct;</div><div class='add'>+	int max_sysfs_pct;</div><div class='add'>+	int min_policy_pct;</div><div class='add'>+	int min_sysfs_pct;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct cpudata -	Per CPU instance data storage</div><div class='ctx'>  * @cpu:		CPU number for this instance data</div><div class='ctx'>  * @policy:		CPUFreq policy value</div><div class='hunk'>@@ -194,8 +240,19 @@ struct _pid {</div><div class='ctx'>  * @prev_cummulative_iowait: IO Wait time difference from last and</div><div class='ctx'>  *			current sample</div><div class='ctx'>  * @sample:		Storage for storing last Sample data</div><div class='add'>+ * @perf_limits:	Pointer to perf_limit unique to this CPU</div><div class='add'>+ *			Not all field in the structure are applicable</div><div class='add'>+ *			when per cpu controls are enforced</div><div class='ctx'>  * @acpi_perf_data:	Stores ACPI perf information read from _PSS</div><div class='ctx'>  * @valid_pss_table:	Set to true for valid ACPI _PSS entries found</div><div class='add'>+ * @epp_powersave:	Last saved HWP energy performance preference</div><div class='add'>+ *			(EPP) or energy performance bias (EPB),</div><div class='add'>+ *			when policy switched to performance</div><div class='add'>+ * @epp_policy:		Last saved policy used to set EPP/EPB</div><div class='add'>+ * @epp_default:	Power on default HWP energy performance</div><div class='add'>+ *			preference/bias</div><div class='add'>+ * @epp_saved:		Saved EPP/EPB during system suspend or CPU offline</div><div class='add'>+ *			operation</div><div class='ctx'>  *</div><div class='ctx'>  * This structure stores per CPU instance data for all CPUs.</div><div class='ctx'>  */</div><div class='hunk'>@@ -217,11 +274,16 @@ struct cpudata {</div><div class='ctx'> 	u64	prev_tsc;</div><div class='ctx'> 	u64	prev_cummulative_iowait;</div><div class='ctx'> 	struct sample sample;</div><div class='add'>+	struct perf_limits *perf_limits;</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> 	struct acpi_processor_performance acpi_perf_data;</div><div class='ctx'> 	bool valid_pss_table;</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned int iowait_boost;</div><div class='add'>+	s16 epp_powersave;</div><div class='add'>+	s16 epp_policy;</div><div class='add'>+	s16 epp_default;</div><div class='add'>+	s16 epp_saved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct cpudata **all_cpu_data;</div><div class='hunk'>@@ -235,7 +297,6 @@ static struct cpudata **all_cpu_data;</div><div class='ctx'>  * @p_gain_pct:		PID proportional gain</div><div class='ctx'>  * @i_gain_pct:		PID integral gain</div><div class='ctx'>  * @d_gain_pct:		PID derivative gain</div><div class='del'>- * @boost_iowait:	Whether or not to use iowait boosting.</div><div class='ctx'>  *</div><div class='ctx'>  * Stores per CPU model static PID configuration data.</div><div class='ctx'>  */</div><div class='hunk'>@@ -247,7 +308,6 @@ struct pstate_adjust_policy {</div><div class='ctx'> 	int p_gain_pct;</div><div class='ctx'> 	int d_gain_pct;</div><div class='ctx'> 	int i_gain_pct;</div><div class='del'>-	bool boost_iowait;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -291,82 +351,36 @@ static inline int32_t get_target_pstate_use_cpu_load(struct cpudata *cpu);</div><div class='ctx'> static struct pstate_adjust_policy pid_params __read_mostly;</div><div class='ctx'> static struct pstate_funcs pstate_funcs __read_mostly;</div><div class='ctx'> static int hwp_active __read_mostly;</div><div class='add'>+static bool per_cpu_limits __read_mostly;</div><div class='add'>+</div><div class='add'>+static bool driver_registered __read_mostly;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> static bool acpi_ppc;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct perf_limits - Store user and policy limits</div><div class='del'>- * @no_turbo:		User requested turbo state from intel_pstate sysfs</div><div class='del'>- * @turbo_disabled:	Platform turbo status either from msr</div><div class='del'>- *			MSR_IA32_MISC_ENABLE or when maximum available pstate</div><div class='del'>- *			matches the maximum turbo pstate</div><div class='del'>- * @max_perf_pct:	Effective maximum performance limit in percentage, this</div><div class='del'>- *			is minimum of either limits enforced by cpufreq policy</div><div class='del'>- *			or limits from user set limits via intel_pstate sysfs</div><div class='del'>- * @min_perf_pct:	Effective minimum performance limit in percentage, this</div><div class='del'>- *			is maximum of either limits enforced by cpufreq policy</div><div class='del'>- *			or limits from user set limits via intel_pstate sysfs</div><div class='del'>- * @max_perf:		This is a scaled value between 0 to 255 for max_perf_pct</div><div class='del'>- *			This value is used to limit max pstate</div><div class='del'>- * @min_perf:		This is a scaled value between 0 to 255 for min_perf_pct</div><div class='del'>- *			This value is used to limit min pstate</div><div class='del'>- * @max_policy_pct:	The maximum performance in percentage enforced by</div><div class='del'>- *			cpufreq setpolicy interface</div><div class='del'>- * @max_sysfs_pct:	The maximum performance in percentage enforced by</div><div class='del'>- *			intel pstate sysfs interface</div><div class='del'>- * @min_policy_pct:	The minimum performance in percentage enforced by</div><div class='del'>- *			cpufreq setpolicy interface</div><div class='del'>- * @min_sysfs_pct:	The minimum performance in percentage enforced by</div><div class='del'>- *			intel pstate sysfs interface</div><div class='del'>- *</div><div class='del'>- * Storage for user and policy defined limits.</div><div class='del'>- */</div><div class='del'>-struct perf_limits {</div><div class='del'>-	int no_turbo;</div><div class='del'>-	int turbo_disabled;</div><div class='del'>-	int max_perf_pct;</div><div class='del'>-	int min_perf_pct;</div><div class='del'>-	int32_t max_perf;</div><div class='del'>-	int32_t min_perf;</div><div class='del'>-	int max_policy_pct;</div><div class='del'>-	int max_sysfs_pct;</div><div class='del'>-	int min_policy_pct;</div><div class='del'>-	int min_sysfs_pct;</div><div class='del'>-};</div><div class='add'>+static struct perf_limits performance_limits;</div><div class='add'>+static struct perf_limits powersave_limits;</div><div class='add'>+static struct perf_limits *limits;</div><div class='ctx'> </div><div class='del'>-static struct perf_limits performance_limits = {</div><div class='del'>-	.no_turbo = 0,</div><div class='del'>-	.turbo_disabled = 0,</div><div class='del'>-	.max_perf_pct = 100,</div><div class='del'>-	.max_perf = int_tofp(1),</div><div class='del'>-	.min_perf_pct = 100,</div><div class='del'>-	.min_perf = int_tofp(1),</div><div class='del'>-	.max_policy_pct = 100,</div><div class='del'>-	.max_sysfs_pct = 100,</div><div class='del'>-	.min_policy_pct = 0,</div><div class='del'>-	.min_sysfs_pct = 0,</div><div class='del'>-};</div><div class='add'>+static void intel_pstate_init_limits(struct perf_limits *limits)</div><div class='add'>+{</div><div class='add'>+	memset(limits, 0, sizeof(*limits));</div><div class='add'>+	limits-&gt;max_perf_pct = 100;</div><div class='add'>+	limits-&gt;max_perf = int_ext_tofp(1);</div><div class='add'>+	limits-&gt;max_policy_pct = 100;</div><div class='add'>+	limits-&gt;max_sysfs_pct = 100;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static struct perf_limits powersave_limits = {</div><div class='del'>-	.no_turbo = 0,</div><div class='del'>-	.turbo_disabled = 0,</div><div class='del'>-	.max_perf_pct = 100,</div><div class='del'>-	.max_perf = int_tofp(1),</div><div class='del'>-	.min_perf_pct = 0,</div><div class='del'>-	.min_perf = 0,</div><div class='del'>-	.max_policy_pct = 100,</div><div class='del'>-	.max_sysfs_pct = 100,</div><div class='del'>-	.min_policy_pct = 0,</div><div class='del'>-	.min_sysfs_pct = 0,</div><div class='del'>-};</div><div class='add'>+static void intel_pstate_set_performance_limits(struct perf_limits *limits)</div><div class='add'>+{</div><div class='add'>+	intel_pstate_init_limits(limits);</div><div class='add'>+	limits-&gt;min_perf_pct = 100;</div><div class='add'>+	limits-&gt;min_perf = int_ext_tofp(1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE</div><div class='del'>-static struct perf_limits *limits = &amp;performance_limits;</div><div class='del'>-#else</div><div class='del'>-static struct perf_limits *limits = &amp;powersave_limits;</div><div class='del'>-#endif</div><div class='add'>+static DEFINE_MUTEX(intel_pstate_driver_lock);</div><div class='add'>+static DEFINE_MUTEX(intel_pstate_limits_lock);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> </div><div class='hunk'>@@ -379,14 +393,67 @@ static bool intel_pstate_get_ppc_enable_status(void)</div><div class='ctx'> 	return acpi_ppc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ACPI_CPPC_LIB</div><div class='add'>+</div><div class='add'>+/* The work item is needed to avoid CPU hotplug locking issues */</div><div class='add'>+static void intel_pstste_sched_itmt_work_fn(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	sched_set_itmt_support();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DECLARE_WORK(sched_itmt_work, intel_pstste_sched_itmt_work_fn);</div><div class='add'>+</div><div class='add'>+static void intel_pstate_set_itmt_prio(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct cppc_perf_caps cppc_perf;</div><div class='add'>+	static u32 max_highest_perf = 0, min_highest_perf = U32_MAX;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cppc_get_perf_caps(cpu, &amp;cppc_perf);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The priorities can be set regardless of whether or not</div><div class='add'>+	 * sched_set_itmt_support(true) has been called and it is valid to</div><div class='add'>+	 * update them at any time after it has been called.</div><div class='add'>+	 */</div><div class='add'>+	sched_set_itmt_core_prio(cppc_perf.highest_perf, cpu);</div><div class='add'>+</div><div class='add'>+	if (max_highest_perf &lt;= min_highest_perf) {</div><div class='add'>+		if (cppc_perf.highest_perf &gt; max_highest_perf)</div><div class='add'>+			max_highest_perf = cppc_perf.highest_perf;</div><div class='add'>+</div><div class='add'>+		if (cppc_perf.highest_perf &lt; min_highest_perf)</div><div class='add'>+			min_highest_perf = cppc_perf.highest_perf;</div><div class='add'>+</div><div class='add'>+		if (max_highest_perf &gt; min_highest_perf) {</div><div class='add'>+			/*</div><div class='add'>+			 * This code can be run during CPU online under the</div><div class='add'>+			 * CPU hotplug locks, so sched_set_itmt_support()</div><div class='add'>+			 * cannot be called from here.  Queue up a work item</div><div class='add'>+			 * to invoke it.</div><div class='add'>+			 */</div><div class='add'>+			schedule_work(&amp;sched_itmt_work);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void intel_pstate_set_itmt_prio(int cpu)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpudata *cpu;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (hwp_active)</div><div class='add'>+	if (hwp_active) {</div><div class='add'>+		intel_pstate_set_itmt_prio(policy-&gt;cpu);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!intel_pstate_get_ppc_enable_status())</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -457,13 +524,12 @@ static void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	acpi_processor_unregister_performance(policy-&gt;cpu);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> #else</div><div class='del'>-static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)</div><div class='add'>+static inline void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy)</div><div class='add'>+static inline void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -559,33 +625,306 @@ static inline void update_turbo_state(void)</div><div class='ctx'> 		 cpu-&gt;pstate.max_pstate == cpu-&gt;pstate.turbo_pstate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void intel_pstate_hwp_set(const struct cpumask *cpumask)</div><div class='add'>+static s16 intel_pstate_get_epb(struct cpudata *cpu_data)</div><div class='add'>+{</div><div class='add'>+	u64 epb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!static_cpu_has(X86_FEATURE_EPB))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	ret = rdmsrl_on_cpu(cpu_data-&gt;cpu, MSR_IA32_ENERGY_PERF_BIAS, &amp;epb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return (s16)ret;</div><div class='add'>+</div><div class='add'>+	return (s16)(epb &amp; 0x0f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s16 intel_pstate_get_epp(struct cpudata *cpu_data, u64 hwp_req_data)</div><div class='add'>+{</div><div class='add'>+	s16 epp;</div><div class='add'>+</div><div class='add'>+	if (static_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='add'>+		/*</div><div class='add'>+		 * When hwp_req_data is 0, means that caller didn't read</div><div class='add'>+		 * MSR_HWP_REQUEST, so need to read and get EPP.</div><div class='add'>+		 */</div><div class='add'>+		if (!hwp_req_data) {</div><div class='add'>+			epp = rdmsrl_on_cpu(cpu_data-&gt;cpu, MSR_HWP_REQUEST,</div><div class='add'>+					    &amp;hwp_req_data);</div><div class='add'>+			if (epp)</div><div class='add'>+				return epp;</div><div class='add'>+		}</div><div class='add'>+		epp = (hwp_req_data &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	} else {</div><div class='add'>+		/* When there is no EPP present, HWP uses EPB settings */</div><div class='add'>+		epp = intel_pstate_get_epb(cpu_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return epp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_pstate_set_epb(int cpu, s16 pref)</div><div class='add'>+{</div><div class='add'>+	u64 epb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!static_cpu_has(X86_FEATURE_EPB))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	ret = rdmsrl_on_cpu(cpu, MSR_IA32_ENERGY_PERF_BIAS, &amp;epb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	epb = (epb &amp; ~0x0f) | pref;</div><div class='add'>+	wrmsrl_on_cpu(cpu, MSR_IA32_ENERGY_PERF_BIAS, epb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * EPP/EPB display strings corresponding to EPP index in the</div><div class='add'>+ * energy_perf_strings[]</div><div class='add'>+ *	index		String</div><div class='add'>+ *-------------------------------------</div><div class='add'>+ *	0		default</div><div class='add'>+ *	1		performance</div><div class='add'>+ *	2		balance_performance</div><div class='add'>+ *	3		balance_power</div><div class='add'>+ *	4		power</div><div class='add'>+ */</div><div class='add'>+static const char * const energy_perf_strings[] = {</div><div class='add'>+	"default",</div><div class='add'>+	"performance",</div><div class='add'>+	"balance_performance",</div><div class='add'>+	"balance_power",</div><div class='add'>+	"power",</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int intel_pstate_get_energy_pref_index(struct cpudata *cpu_data)</div><div class='add'>+{</div><div class='add'>+	s16 epp;</div><div class='add'>+	int index = -EINVAL;</div><div class='add'>+</div><div class='add'>+	epp = intel_pstate_get_epp(cpu_data, 0);</div><div class='add'>+	if (epp &lt; 0)</div><div class='add'>+		return epp;</div><div class='add'>+</div><div class='add'>+	if (static_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Range:</div><div class='add'>+		 *	0x00-0x3F	:	Performance</div><div class='add'>+		 *	0x40-0x7F	:	Balance performance</div><div class='add'>+		 *	0x80-0xBF	:	Balance power</div><div class='add'>+		 *	0xC0-0xFF	:	Power</div><div class='add'>+		 * The EPP is a 8 bit value, but our ranges restrict the</div><div class='add'>+		 * value which can be set. Here only using top two bits</div><div class='add'>+		 * effectively.</div><div class='add'>+		 */</div><div class='add'>+		index = (epp &gt;&gt; 6) + 1;</div><div class='add'>+	} else if (static_cpu_has(X86_FEATURE_EPB)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Range:</div><div class='add'>+		 *	0x00-0x03	:	Performance</div><div class='add'>+		 *	0x04-0x07	:	Balance performance</div><div class='add'>+		 *	0x08-0x0B	:	Balance power</div><div class='add'>+		 *	0x0C-0x0F	:	Power</div><div class='add'>+		 * The EPB is a 4 bit value, but our ranges restrict the</div><div class='add'>+		 * value which can be set. Here only using top two bits</div><div class='add'>+		 * effectively.</div><div class='add'>+		 */</div><div class='add'>+		index = (epp &gt;&gt; 2) + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data,</div><div class='add'>+					      int pref_index)</div><div class='add'>+{</div><div class='add'>+	int epp = -EINVAL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!pref_index)</div><div class='add'>+		epp = cpu_data-&gt;epp_default;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	if (static_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='add'>+		u64 value;</div><div class='add'>+</div><div class='add'>+		ret = rdmsrl_on_cpu(cpu_data-&gt;cpu, MSR_HWP_REQUEST, &amp;value);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto return_pref;</div><div class='add'>+</div><div class='add'>+		value &amp;= ~GENMASK_ULL(31, 24);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If epp is not default, convert from index into</div><div class='add'>+		 * energy_perf_strings to epp value, by shifting 6</div><div class='add'>+		 * bits left to use only top two bits in epp.</div><div class='add'>+		 * The resultant epp need to shifted by 24 bits to</div><div class='add'>+		 * epp position in MSR_HWP_REQUEST.</div><div class='add'>+		 */</div><div class='add'>+		if (epp == -EINVAL)</div><div class='add'>+			epp = (pref_index - 1) &lt;&lt; 6;</div><div class='add'>+</div><div class='add'>+		value |= (u64)epp &lt;&lt; 24;</div><div class='add'>+		ret = wrmsrl_on_cpu(cpu_data-&gt;cpu, MSR_HWP_REQUEST, value);</div><div class='add'>+	} else {</div><div class='add'>+		if (epp == -EINVAL)</div><div class='add'>+			epp = (pref_index - 1) &lt;&lt; 2;</div><div class='add'>+		ret = intel_pstate_set_epb(cpu_data-&gt;cpu, epp);</div><div class='add'>+	}</div><div class='add'>+return_pref:</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_energy_performance_available_preferences(</div><div class='add'>+				struct cpufreq_policy *policy, char *buf)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	while (energy_perf_strings[i] != NULL)</div><div class='add'>+		ret += sprintf(&amp;buf[ret], "%s ", energy_perf_strings[i++]);</div><div class='add'>+</div><div class='add'>+	ret += sprintf(&amp;buf[ret], "\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+cpufreq_freq_attr_ro(energy_performance_available_preferences);</div><div class='add'>+</div><div class='add'>+static ssize_t store_energy_performance_preference(</div><div class='add'>+		struct cpufreq_policy *policy, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct cpudata *cpu_data = all_cpu_data[policy-&gt;cpu];</div><div class='add'>+	char str_preference[21];</div><div class='add'>+	int ret, i = 0;</div><div class='add'>+</div><div class='add'>+	ret = sscanf(buf, "%20s", str_preference);</div><div class='add'>+	if (ret != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	while (energy_perf_strings[i] != NULL) {</div><div class='add'>+		if (!strcmp(str_preference, energy_perf_strings[i])) {</div><div class='add'>+			intel_pstate_set_energy_pref_index(cpu_data, i);</div><div class='add'>+			return count;</div><div class='add'>+		}</div><div class='add'>+		++i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_energy_performance_preference(</div><div class='add'>+				struct cpufreq_policy *policy, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct cpudata *cpu_data = all_cpu_data[policy-&gt;cpu];</div><div class='add'>+	int preference;</div><div class='add'>+</div><div class='add'>+	preference = intel_pstate_get_energy_pref_index(cpu_data);</div><div class='add'>+	if (preference &lt; 0)</div><div class='add'>+		return preference;</div><div class='add'>+</div><div class='add'>+	return  sprintf(buf, "%s\n", energy_perf_strings[preference]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+cpufreq_freq_attr_rw(energy_performance_preference);</div><div class='add'>+</div><div class='add'>+static struct freq_attr *hwp_cpufreq_attrs[] = {</div><div class='add'>+	&amp;energy_performance_preference,</div><div class='add'>+	&amp;energy_performance_available_preferences,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void intel_pstate_hwp_set(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	int min, hw_min, max, hw_max, cpu, range, adj_range;</div><div class='add'>+	struct perf_limits *perf_limits = limits;</div><div class='ctx'> 	u64 value, cap;</div><div class='ctx'> </div><div class='del'>-	for_each_cpu(cpu, cpumask) {</div><div class='add'>+	for_each_cpu(cpu, policy-&gt;cpus) {</div><div class='add'>+		int max_perf_pct, min_perf_pct;</div><div class='add'>+		struct cpudata *cpu_data = all_cpu_data[cpu];</div><div class='add'>+		s16 epp;</div><div class='add'>+</div><div class='add'>+		if (per_cpu_limits)</div><div class='add'>+			perf_limits = all_cpu_data[cpu]-&gt;perf_limits;</div><div class='add'>+</div><div class='ctx'> 		rdmsrl_on_cpu(cpu, MSR_HWP_CAPABILITIES, &amp;cap);</div><div class='ctx'> 		hw_min = HWP_LOWEST_PERF(cap);</div><div class='del'>-		hw_max = HWP_HIGHEST_PERF(cap);</div><div class='add'>+		if (limits-&gt;no_turbo)</div><div class='add'>+			hw_max = HWP_GUARANTEED_PERF(cap);</div><div class='add'>+		else</div><div class='add'>+			hw_max = HWP_HIGHEST_PERF(cap);</div><div class='ctx'> 		range = hw_max - hw_min;</div><div class='ctx'> </div><div class='add'>+		max_perf_pct = perf_limits-&gt;max_perf_pct;</div><div class='add'>+		min_perf_pct = perf_limits-&gt;min_perf_pct;</div><div class='add'>+</div><div class='ctx'> 		rdmsrl_on_cpu(cpu, MSR_HWP_REQUEST, &amp;value);</div><div class='del'>-		adj_range = limits-&gt;min_perf_pct * range / 100;</div><div class='add'>+		adj_range = min_perf_pct * range / 100;</div><div class='ctx'> 		min = hw_min + adj_range;</div><div class='ctx'> 		value &amp;= ~HWP_MIN_PERF(~0L);</div><div class='ctx'> 		value |= HWP_MIN_PERF(min);</div><div class='ctx'> </div><div class='del'>-		adj_range = limits-&gt;max_perf_pct * range / 100;</div><div class='add'>+		adj_range = max_perf_pct * range / 100;</div><div class='ctx'> 		max = hw_min + adj_range;</div><div class='del'>-		if (limits-&gt;no_turbo) {</div><div class='del'>-			hw_max = HWP_GUARANTEED_PERF(cap);</div><div class='del'>-			if (hw_max &lt; max)</div><div class='del'>-				max = hw_max;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		value &amp;= ~HWP_MAX_PERF(~0L);</div><div class='ctx'> 		value |= HWP_MAX_PERF(max);</div><div class='add'>+</div><div class='add'>+		if (cpu_data-&gt;epp_policy == cpu_data-&gt;policy)</div><div class='add'>+			goto skip_epp;</div><div class='add'>+</div><div class='add'>+		cpu_data-&gt;epp_policy = cpu_data-&gt;policy;</div><div class='add'>+</div><div class='add'>+		if (cpu_data-&gt;epp_saved &gt;= 0) {</div><div class='add'>+			epp = cpu_data-&gt;epp_saved;</div><div class='add'>+			cpu_data-&gt;epp_saved = -EINVAL;</div><div class='add'>+			goto update_epp;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cpu_data-&gt;policy == CPUFREQ_POLICY_PERFORMANCE) {</div><div class='add'>+			epp = intel_pstate_get_epp(cpu_data, value);</div><div class='add'>+			cpu_data-&gt;epp_powersave = epp;</div><div class='add'>+			/* If EPP read was failed, then don't try to write */</div><div class='add'>+			if (epp &lt; 0)</div><div class='add'>+				goto skip_epp;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+			epp = 0;</div><div class='add'>+		} else {</div><div class='add'>+			/* skip setting EPP, when saved value is invalid */</div><div class='add'>+			if (cpu_data-&gt;epp_powersave &lt; 0)</div><div class='add'>+				goto skip_epp;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * No need to restore EPP when it is not zero. This</div><div class='add'>+			 * means:</div><div class='add'>+			 *  - Policy is not changed</div><div class='add'>+			 *  - user has manually changed</div><div class='add'>+			 *  - Error reading EPB</div><div class='add'>+			 */</div><div class='add'>+			epp = intel_pstate_get_epp(cpu_data, value);</div><div class='add'>+			if (epp)</div><div class='add'>+				goto skip_epp;</div><div class='add'>+</div><div class='add'>+			epp = cpu_data-&gt;epp_powersave;</div><div class='add'>+		}</div><div class='add'>+update_epp:</div><div class='add'>+		if (static_cpu_has(X86_FEATURE_HWP_EPP)) {</div><div class='add'>+			value &amp;= ~GENMASK_ULL(31, 24);</div><div class='add'>+			value |= (u64)epp &lt;&lt; 24;</div><div class='add'>+		} else {</div><div class='add'>+			intel_pstate_set_epb(cpu, epp);</div><div class='add'>+		}</div><div class='add'>+skip_epp:</div><div class='ctx'> 		wrmsrl_on_cpu(cpu, MSR_HWP_REQUEST, value);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -593,16 +932,47 @@ static void intel_pstate_hwp_set(const struct cpumask *cpumask)</div><div class='ctx'> static int intel_pstate_hwp_set_policy(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	if (hwp_active)</div><div class='del'>-		intel_pstate_hwp_set(policy-&gt;cpus);</div><div class='add'>+		intel_pstate_hwp_set(policy);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void intel_pstate_hwp_set_online_cpus(void)</div><div class='add'>+static int intel_pstate_hwp_save_state(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='del'>-	get_online_cpus();</div><div class='del'>-	intel_pstate_hwp_set(cpu_online_mask);</div><div class='del'>-	put_online_cpus();</div><div class='add'>+	struct cpudata *cpu_data = all_cpu_data[policy-&gt;cpu];</div><div class='add'>+</div><div class='add'>+	if (!hwp_active)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cpu_data-&gt;epp_saved = intel_pstate_get_epp(cpu_data, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_pstate_resume(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!hwp_active)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	all_cpu_data[policy-&gt;cpu]-&gt;epp_policy = 0;</div><div class='add'>+</div><div class='add'>+	ret = intel_pstate_hwp_set_policy(policy);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_pstate_update_policies(void)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu)</div><div class='add'>+		cpufreq_update_policy(cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /************************** debugfs begin ************************/</div><div class='hunk'>@@ -620,37 +990,57 @@ static int pid_param_get(void *data, u64 *val)</div><div class='ctx'> }</div><div class='ctx'> DEFINE_SIMPLE_ATTRIBUTE(fops_pid_param, pid_param_get, pid_param_set, "%llu\n");</div><div class='ctx'> </div><div class='add'>+static struct dentry *debugfs_parent;</div><div class='add'>+</div><div class='ctx'> struct pid_param {</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	void *value;</div><div class='add'>+	struct dentry *dentry;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pid_param pid_files[] = {</div><div class='del'>-	{"sample_rate_ms", &amp;pid_params.sample_rate_ms},</div><div class='del'>-	{"d_gain_pct", &amp;pid_params.d_gain_pct},</div><div class='del'>-	{"i_gain_pct", &amp;pid_params.i_gain_pct},</div><div class='del'>-	{"deadband", &amp;pid_params.deadband},</div><div class='del'>-	{"setpoint", &amp;pid_params.setpoint},</div><div class='del'>-	{"p_gain_pct", &amp;pid_params.p_gain_pct},</div><div class='del'>-	{NULL, NULL}</div><div class='add'>+	{"sample_rate_ms", &amp;pid_params.sample_rate_ms, },</div><div class='add'>+	{"d_gain_pct", &amp;pid_params.d_gain_pct, },</div><div class='add'>+	{"i_gain_pct", &amp;pid_params.i_gain_pct, },</div><div class='add'>+	{"deadband", &amp;pid_params.deadband, },</div><div class='add'>+	{"setpoint", &amp;pid_params.setpoint, },</div><div class='add'>+	{"p_gain_pct", &amp;pid_params.p_gain_pct, },</div><div class='add'>+	{NULL, NULL, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __init intel_pstate_debug_expose_params(void)</div><div class='add'>+static void intel_pstate_debug_expose_params(void)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *debugfs_parent;</div><div class='del'>-	int i = 0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (hwp_active)</div><div class='del'>-		return;</div><div class='ctx'> 	debugfs_parent = debugfs_create_dir("pstate_snb", NULL);</div><div class='ctx'> 	if (IS_ERR_OR_NULL(debugfs_parent))</div><div class='ctx'> 		return;</div><div class='del'>-	while (pid_files[i].name) {</div><div class='del'>-		debugfs_create_file(pid_files[i].name, 0660,</div><div class='del'>-				    debugfs_parent, pid_files[i].value,</div><div class='del'>-				    &amp;fops_pid_param);</div><div class='del'>-		i++;</div><div class='add'>+</div><div class='add'>+	for (i = 0; pid_files[i].name; i++) {</div><div class='add'>+		struct dentry *dentry;</div><div class='add'>+</div><div class='add'>+		dentry = debugfs_create_file(pid_files[i].name, 0660,</div><div class='add'>+					     debugfs_parent, pid_files[i].value,</div><div class='add'>+					     &amp;fops_pid_param);</div><div class='add'>+		if (!IS_ERR(dentry))</div><div class='add'>+			pid_files[i].dentry = dentry;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_pstate_debug_hide_params(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(debugfs_parent))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; pid_files[i].name; i++) {</div><div class='add'>+		debugfs_remove(pid_files[i].dentry);</div><div class='add'>+		pid_files[i].dentry = NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	debugfs_remove(debugfs_parent);</div><div class='add'>+	debugfs_parent = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /************************** debugfs end ************************/</div><div class='hunk'>@@ -663,6 +1053,34 @@ static void __init intel_pstate_debug_expose_params(void)</div><div class='ctx'> 		return sprintf(buf, "%u\n", limits-&gt;object);		\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+static ssize_t intel_pstate_show_status(char *buf);</div><div class='add'>+static int intel_pstate_update_status(const char *buf, size_t size);</div><div class='add'>+</div><div class='add'>+static ssize_t show_status(struct kobject *kobj,</div><div class='add'>+			   struct attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intel_pstate_driver_lock);</div><div class='add'>+	ret = intel_pstate_show_status(buf);</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_status(struct kobject *a, struct attribute *b,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	char *p = memchr(buf, '\n', count);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intel_pstate_driver_lock);</div><div class='add'>+	ret = intel_pstate_update_status(buf, p ? p - buf : count);</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='add'>+	return ret &lt; 0 ? ret : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t show_turbo_pct(struct kobject *kobj,</div><div class='ctx'> 				struct attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -670,12 +1088,22 @@ static ssize_t show_turbo_pct(struct kobject *kobj,</div><div class='ctx'> 	int total, no_turbo, turbo_pct;</div><div class='ctx'> 	uint32_t turbo_fp;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='add'>+	if (!driver_registered) {</div><div class='add'>+		mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	cpu = all_cpu_data[0];</div><div class='ctx'> </div><div class='ctx'> 	total = cpu-&gt;pstate.turbo_pstate - cpu-&gt;pstate.min_pstate + 1;</div><div class='ctx'> 	no_turbo = cpu-&gt;pstate.max_pstate - cpu-&gt;pstate.min_pstate + 1;</div><div class='ctx'> 	turbo_fp = div_fp(no_turbo, total);</div><div class='ctx'> 	turbo_pct = 100 - fp_toint(mul_fp(turbo_fp, int_tofp(100)));</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='ctx'> 	return sprintf(buf, "%u\n", turbo_pct);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -685,8 +1113,18 @@ static ssize_t show_num_pstates(struct kobject *kobj,</div><div class='ctx'> 	struct cpudata *cpu;</div><div class='ctx'> 	int total;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='add'>+	if (!driver_registered) {</div><div class='add'>+		mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	cpu = all_cpu_data[0];</div><div class='ctx'> 	total = cpu-&gt;pstate.turbo_pstate - cpu-&gt;pstate.min_pstate + 1;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='ctx'> 	return sprintf(buf, "%u\n", total);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -695,12 +1133,21 @@ static ssize_t show_no_turbo(struct kobject *kobj,</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='add'>+	if (!driver_registered) {</div><div class='add'>+		mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	update_turbo_state();</div><div class='ctx'> 	if (limits-&gt;turbo_disabled)</div><div class='ctx'> 		ret = sprintf(buf, "%u\n", limits-&gt;turbo_disabled);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = sprintf(buf, "%u\n", limits-&gt;no_turbo);</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -714,16 +1161,30 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b,</div><div class='ctx'> 	if (ret != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='add'>+	if (!driver_registered) {</div><div class='add'>+		mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='ctx'> 	update_turbo_state();</div><div class='ctx'> 	if (limits-&gt;turbo_disabled) {</div><div class='ctx'> 		pr_warn("Turbo disabled by BIOS or unavailable on processor\n");</div><div class='add'>+		mutex_unlock(&amp;intel_pstate_limits_lock);</div><div class='add'>+		mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	limits-&gt;no_turbo = clamp_t(int, input, 0, 1);</div><div class='ctx'> </div><div class='del'>-	if (hwp_active)</div><div class='del'>-		intel_pstate_hwp_set_online_cpus();</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	intel_pstate_update_policies();</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -738,6 +1199,15 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b,</div><div class='ctx'> 	if (ret != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='add'>+	if (!driver_registered) {</div><div class='add'>+		mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='ctx'> 	limits-&gt;max_sysfs_pct = clamp_t(int, input, 0 , 100);</div><div class='ctx'> 	limits-&gt;max_perf_pct = min(limits-&gt;max_policy_pct,</div><div class='ctx'> 				   limits-&gt;max_sysfs_pct);</div><div class='hunk'>@@ -745,10 +1215,14 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b,</div><div class='ctx'> 				   limits-&gt;max_perf_pct);</div><div class='ctx'> 	limits-&gt;max_perf_pct = max(limits-&gt;min_perf_pct,</div><div class='ctx'> 				   limits-&gt;max_perf_pct);</div><div class='del'>-	limits-&gt;max_perf = div_fp(limits-&gt;max_perf_pct, 100);</div><div class='add'>+	limits-&gt;max_perf = div_ext_fp(limits-&gt;max_perf_pct, 100);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	intel_pstate_update_policies();</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='ctx'> </div><div class='del'>-	if (hwp_active)</div><div class='del'>-		intel_pstate_hwp_set_online_cpus();</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -762,6 +1236,15 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b,</div><div class='ctx'> 	if (ret != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;intel_pstate_driver_lock);</div><div class='add'>+</div><div class='add'>+	if (!driver_registered) {</div><div class='add'>+		mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='ctx'> 	limits-&gt;min_sysfs_pct = clamp_t(int, input, 0 , 100);</div><div class='ctx'> 	limits-&gt;min_perf_pct = max(limits-&gt;min_policy_pct,</div><div class='ctx'> 				   limits-&gt;min_sysfs_pct);</div><div class='hunk'>@@ -769,16 +1252,21 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b,</div><div class='ctx'> 				   limits-&gt;min_perf_pct);</div><div class='ctx'> 	limits-&gt;min_perf_pct = min(limits-&gt;max_perf_pct,</div><div class='ctx'> 				   limits-&gt;min_perf_pct);</div><div class='del'>-	limits-&gt;min_perf = div_fp(limits-&gt;min_perf_pct, 100);</div><div class='add'>+	limits-&gt;min_perf = div_ext_fp(limits-&gt;min_perf_pct, 100);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	intel_pstate_update_policies();</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='ctx'> </div><div class='del'>-	if (hwp_active)</div><div class='del'>-		intel_pstate_hwp_set_online_cpus();</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> show_one(max_perf_pct, max_perf_pct);</div><div class='ctx'> show_one(min_perf_pct, min_perf_pct);</div><div class='ctx'> </div><div class='add'>+define_one_global_rw(status);</div><div class='ctx'> define_one_global_rw(no_turbo);</div><div class='ctx'> define_one_global_rw(max_perf_pct);</div><div class='ctx'> define_one_global_rw(min_perf_pct);</div><div class='hunk'>@@ -786,9 +1274,8 @@ define_one_global_ro(turbo_pct);</div><div class='ctx'> define_one_global_ro(num_pstates);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *intel_pstate_attributes[] = {</div><div class='add'>+	&amp;status.attr,</div><div class='ctx'> 	&amp;no_turbo.attr,</div><div class='del'>-	&amp;max_perf_pct.attr,</div><div class='del'>-	&amp;min_perf_pct.attr,</div><div class='ctx'> 	&amp;turbo_pct.attr,</div><div class='ctx'> 	&amp;num_pstates.attr,</div><div class='ctx'> 	NULL</div><div class='hunk'>@@ -805,9 +1292,26 @@ static void __init intel_pstate_sysfs_expose_params(void)</div><div class='ctx'> </div><div class='ctx'> 	intel_pstate_kobject = kobject_create_and_add("intel_pstate",</div><div class='ctx'> 						&amp;cpu_subsys.dev_root-&gt;kobj);</div><div class='del'>-	BUG_ON(!intel_pstate_kobject);</div><div class='add'>+	if (WARN_ON(!intel_pstate_kobject))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	rc = sysfs_create_group(intel_pstate_kobject, &amp;intel_pstate_attr_group);</div><div class='del'>-	BUG_ON(rc);</div><div class='add'>+	if (WARN_ON(rc))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If per cpu limits are enforced there are no global limits, so</div><div class='add'>+	 * return without creating max/min_perf_pct attributes</div><div class='add'>+	 */</div><div class='add'>+	if (per_cpu_limits)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rc = sysfs_create_file(intel_pstate_kobject, &amp;max_perf_pct.attr);</div><div class='add'>+	WARN_ON(rc);</div><div class='add'>+</div><div class='add'>+	rc = sysfs_create_file(intel_pstate_kobject, &amp;min_perf_pct.attr);</div><div class='add'>+	WARN_ON(rc);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> /************************** sysfs end ************************/</div><div class='ctx'> </div><div class='hunk'>@@ -818,13 +1322,35 @@ static void intel_pstate_hwp_enable(struct cpudata *cpudata)</div><div class='ctx'> 		wrmsrl_on_cpu(cpudata-&gt;cpu, MSR_HWP_INTERRUPT, 0x00);</div><div class='ctx'> </div><div class='ctx'> 	wrmsrl_on_cpu(cpudata-&gt;cpu, MSR_PM_ENABLE, 0x1);</div><div class='add'>+	cpudata-&gt;epp_policy = 0;</div><div class='add'>+	if (cpudata-&gt;epp_default == -EINVAL)</div><div class='add'>+		cpudata-&gt;epp_default = intel_pstate_get_epp(cpudata, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MSR_IA32_POWER_CTL_BIT_EE	19</div><div class='add'>+</div><div class='add'>+/* Disable energy efficiency optimization */</div><div class='add'>+static void intel_pstate_disable_ee(int cpu)</div><div class='add'>+{</div><div class='add'>+	u64 power_ctl;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rdmsrl_on_cpu(cpu, MSR_IA32_POWER_CTL, &amp;power_ctl);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!(power_ctl &amp; BIT(MSR_IA32_POWER_CTL_BIT_EE))) {</div><div class='add'>+		pr_info("Disabling energy efficiency optimization\n");</div><div class='add'>+		power_ctl |= BIT(MSR_IA32_POWER_CTL_BIT_EE);</div><div class='add'>+		wrmsrl_on_cpu(cpu, MSR_IA32_POWER_CTL, power_ctl);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atom_get_min_pstate(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 value;</div><div class='ctx'> </div><div class='del'>-	rdmsrl(ATOM_RATIOS, value);</div><div class='add'>+	rdmsrl(MSR_ATOM_CORE_RATIOS, value);</div><div class='ctx'> 	return (value &gt;&gt; 8) &amp; 0x7F;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -832,7 +1358,7 @@ static int atom_get_max_pstate(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 value;</div><div class='ctx'> </div><div class='del'>-	rdmsrl(ATOM_RATIOS, value);</div><div class='add'>+	rdmsrl(MSR_ATOM_CORE_RATIOS, value);</div><div class='ctx'> 	return (value &gt;&gt; 16) &amp; 0x7F;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -840,7 +1366,7 @@ static int atom_get_turbo_pstate(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 value;</div><div class='ctx'> </div><div class='del'>-	rdmsrl(ATOM_TURBO_RATIOS, value);</div><div class='add'>+	rdmsrl(MSR_ATOM_CORE_TURBO_RATIOS, value);</div><div class='ctx'> 	return value &amp; 0x7F;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -902,7 +1428,7 @@ static void atom_get_vid(struct cpudata *cpudata)</div><div class='ctx'> {</div><div class='ctx'> 	u64 value;</div><div class='ctx'> </div><div class='del'>-	rdmsrl(ATOM_VIDS, value);</div><div class='add'>+	rdmsrl(MSR_ATOM_CORE_VIDS, value);</div><div class='ctx'> 	cpudata-&gt;vid.min = int_tofp((value &gt;&gt; 8) &amp; 0x7f);</div><div class='ctx'> 	cpudata-&gt;vid.max = int_tofp((value &gt;&gt; 16) &amp; 0x7f);</div><div class='ctx'> 	cpudata-&gt;vid.ratio = div_fp(</div><div class='hunk'>@@ -910,7 +1436,7 @@ static void atom_get_vid(struct cpudata *cpudata)</div><div class='ctx'> 		int_tofp(cpudata-&gt;pstate.max_pstate -</div><div class='ctx'> 			cpudata-&gt;pstate.min_pstate));</div><div class='ctx'> </div><div class='del'>-	rdmsrl(ATOM_TURBO_VIDS, value);</div><div class='add'>+	rdmsrl(MSR_ATOM_CORE_TURBO_VIDS, value);</div><div class='ctx'> 	cpudata-&gt;vid.turbo = value &amp; 0x7f;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -930,48 +1456,71 @@ static int core_get_max_pstate_physical(void)</div><div class='ctx'> 	return (value &gt;&gt; 8) &amp; 0xFF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int core_get_tdp_ratio(u64 plat_info)</div><div class='add'>+{</div><div class='add'>+	/* Check how many TDP levels present */</div><div class='add'>+	if (plat_info &amp; 0x600000000) {</div><div class='add'>+		u64 tdp_ctrl;</div><div class='add'>+		u64 tdp_ratio;</div><div class='add'>+		int tdp_msr;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		/* Get the TDP level (0, 1, 2) to get ratios */</div><div class='add'>+		err = rdmsrl_safe(MSR_CONFIG_TDP_CONTROL, &amp;tdp_ctrl);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* TDP MSR are continuous starting at 0x648 */</div><div class='add'>+		tdp_msr = MSR_CONFIG_TDP_NOMINAL + (tdp_ctrl &amp; 0x03);</div><div class='add'>+		err = rdmsrl_safe(tdp_msr, &amp;tdp_ratio);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* For level 1 and 2, bits[23:16] contain the ratio */</div><div class='add'>+		if (tdp_ctrl &amp; 0x03)</div><div class='add'>+			tdp_ratio &gt;&gt;= 16;</div><div class='add'>+</div><div class='add'>+		tdp_ratio &amp;= 0xff; /* ratios are only 8 bits long */</div><div class='add'>+		pr_debug("tdp_ratio %x\n", (int)tdp_ratio);</div><div class='add'>+</div><div class='add'>+		return (int)tdp_ratio;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int core_get_max_pstate(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 tar;</div><div class='ctx'> 	u64 plat_info;</div><div class='ctx'> 	int max_pstate;</div><div class='add'>+	int tdp_ratio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	rdmsrl(MSR_PLATFORM_INFO, plat_info);</div><div class='ctx'> 	max_pstate = (plat_info &gt;&gt; 8) &amp; 0xFF;</div><div class='ctx'> </div><div class='add'>+	tdp_ratio = core_get_tdp_ratio(plat_info);</div><div class='add'>+	if (tdp_ratio &lt;= 0)</div><div class='add'>+		return max_pstate;</div><div class='add'>+</div><div class='add'>+	if (hwp_active) {</div><div class='add'>+		/* Turbo activation ratio is not used on HWP platforms */</div><div class='add'>+		return tdp_ratio;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = rdmsrl_safe(MSR_TURBO_ACTIVATION_RATIO, &amp;tar);</div><div class='ctx'> 	if (!err) {</div><div class='add'>+		int tar_levels;</div><div class='add'>+</div><div class='ctx'> 		/* Do some sanity checking for safety */</div><div class='del'>-		if (plat_info &amp; 0x600000000) {</div><div class='del'>-			u64 tdp_ctrl;</div><div class='del'>-			u64 tdp_ratio;</div><div class='del'>-			int tdp_msr;</div><div class='del'>-</div><div class='del'>-			err = rdmsrl_safe(MSR_CONFIG_TDP_CONTROL, &amp;tdp_ctrl);</div><div class='del'>-			if (err)</div><div class='del'>-				goto skip_tar;</div><div class='del'>-</div><div class='del'>-			tdp_msr = MSR_CONFIG_TDP_NOMINAL + (tdp_ctrl &amp; 0x3);</div><div class='del'>-			err = rdmsrl_safe(tdp_msr, &amp;tdp_ratio);</div><div class='del'>-			if (err)</div><div class='del'>-				goto skip_tar;</div><div class='del'>-</div><div class='del'>-			/* For level 1 and 2, bits[23:16] contain the ratio */</div><div class='del'>-			if (tdp_ctrl)</div><div class='del'>-				tdp_ratio &gt;&gt;= 16;</div><div class='del'>-</div><div class='del'>-			tdp_ratio &amp;= 0xff; /* ratios are only 8 bits long */</div><div class='del'>-			if (tdp_ratio - 1 == tar) {</div><div class='del'>-				max_pstate = tar;</div><div class='del'>-				pr_debug("max_pstate=TAC %x\n", max_pstate);</div><div class='del'>-			} else {</div><div class='del'>-				goto skip_tar;</div><div class='del'>-			}</div><div class='add'>+		tar_levels = tar &amp; 0xff;</div><div class='add'>+		if (tdp_ratio - 1 == tar_levels) {</div><div class='add'>+			max_pstate = tar_levels;</div><div class='add'>+			pr_debug("max_pstate=TAC %x\n", max_pstate);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-skip_tar:</div><div class='ctx'> 	return max_pstate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1045,7 +1594,6 @@ static const struct cpu_defaults silvermont_params = {</div><div class='ctx'> 		.p_gain_pct = 14,</div><div class='ctx'> 		.d_gain_pct = 0,</div><div class='ctx'> 		.i_gain_pct = 4,</div><div class='del'>-		.boost_iowait = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	.funcs = {</div><div class='ctx'> 		.get_max = atom_get_max_pstate,</div><div class='hunk'>@@ -1067,7 +1615,6 @@ static const struct cpu_defaults airmont_params = {</div><div class='ctx'> 		.p_gain_pct = 14,</div><div class='ctx'> 		.d_gain_pct = 0,</div><div class='ctx'> 		.i_gain_pct = 4,</div><div class='del'>-		.boost_iowait = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	.funcs = {</div><div class='ctx'> 		.get_max = atom_get_max_pstate,</div><div class='hunk'>@@ -1109,7 +1656,6 @@ static const struct cpu_defaults bxt_params = {</div><div class='ctx'> 		.p_gain_pct = 14,</div><div class='ctx'> 		.d_gain_pct = 0,</div><div class='ctx'> 		.i_gain_pct = 4,</div><div class='del'>-		.boost_iowait = true,</div><div class='ctx'> 	},</div><div class='ctx'> 	.funcs = {</div><div class='ctx'> 		.get_max = core_get_max_pstate,</div><div class='hunk'>@@ -1127,20 +1673,24 @@ static void intel_pstate_get_min_max(struct cpudata *cpu, int *min, int *max)</div><div class='ctx'> 	int max_perf = cpu-&gt;pstate.turbo_pstate;</div><div class='ctx'> 	int max_perf_adj;</div><div class='ctx'> 	int min_perf;</div><div class='add'>+	struct perf_limits *perf_limits = limits;</div><div class='ctx'> </div><div class='ctx'> 	if (limits-&gt;no_turbo || limits-&gt;turbo_disabled)</div><div class='ctx'> 		max_perf = cpu-&gt;pstate.max_pstate;</div><div class='ctx'> </div><div class='add'>+	if (per_cpu_limits)</div><div class='add'>+		perf_limits = cpu-&gt;perf_limits;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * performance can be limited by user through sysfs, by cpufreq</div><div class='ctx'> 	 * policy, or by cpu specific default values determined through</div><div class='ctx'> 	 * experimentation.</div><div class='ctx'> 	 */</div><div class='del'>-	max_perf_adj = fp_toint(max_perf * limits-&gt;max_perf);</div><div class='add'>+	max_perf_adj = fp_ext_toint(max_perf * perf_limits-&gt;max_perf);</div><div class='ctx'> 	*max = clamp_t(int, max_perf_adj,</div><div class='ctx'> 			cpu-&gt;pstate.min_pstate, cpu-&gt;pstate.turbo_pstate);</div><div class='ctx'> </div><div class='del'>-	min_perf = fp_toint(max_perf * limits-&gt;min_perf);</div><div class='add'>+	min_perf = fp_ext_toint(max_perf * perf_limits-&gt;min_perf);</div><div class='ctx'> 	*min = clamp_t(int, min_perf, cpu-&gt;pstate.min_pstate, max_perf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1178,6 +1728,8 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)</div><div class='ctx'> 	cpu-&gt;pstate.max_pstate_physical = pstate_funcs.get_max_physical();</div><div class='ctx'> 	cpu-&gt;pstate.turbo_pstate = pstate_funcs.get_turbo();</div><div class='ctx'> 	cpu-&gt;pstate.scaling = pstate_funcs.get_scaling();</div><div class='add'>+	cpu-&gt;pstate.max_freq = cpu-&gt;pstate.max_pstate * cpu-&gt;pstate.scaling;</div><div class='add'>+	cpu-&gt;pstate.turbo_freq = cpu-&gt;pstate.turbo_pstate * cpu-&gt;pstate.scaling;</div><div class='ctx'> </div><div class='ctx'> 	if (pstate_funcs.get_vid)</div><div class='ctx'> 		pstate_funcs.get_vid(cpu);</div><div class='hunk'>@@ -1316,15 +1868,19 @@ static inline int32_t get_target_pstate_use_performance(struct cpudata *cpu)</div><div class='ctx'> 	return cpu-&gt;pstate.current_pstate - pid_calc(&amp;cpu-&gt;pid, perf_scaled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void intel_pstate_update_pstate(struct cpudata *cpu, int pstate)</div><div class='add'>+static int intel_pstate_prepare_request(struct cpudata *cpu, int pstate)</div><div class='ctx'> {</div><div class='ctx'> 	int max_perf, min_perf;</div><div class='ctx'> </div><div class='del'>-	update_turbo_state();</div><div class='del'>-</div><div class='ctx'> 	intel_pstate_get_min_max(cpu, &amp;min_perf, &amp;max_perf);</div><div class='ctx'> 	pstate = clamp_t(int, pstate, min_perf, max_perf);</div><div class='ctx'> 	trace_cpu_frequency(pstate * cpu-&gt;pstate.scaling, cpu-&gt;cpu);</div><div class='add'>+	return pstate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_pstate_update_pstate(struct cpudata *cpu, int pstate)</div><div class='add'>+{</div><div class='add'>+	pstate = intel_pstate_prepare_request(cpu, pstate);</div><div class='ctx'> 	if (pstate == cpu-&gt;pstate.current_pstate)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -1342,6 +1898,8 @@ static inline void intel_pstate_adjust_busy_pstate(struct cpudata *cpu)</div><div class='ctx'> 	target_pstate = cpu-&gt;policy == CPUFREQ_POLICY_PERFORMANCE ?</div><div class='ctx'> 		cpu-&gt;pstate.turbo_pstate : pstate_funcs.get_target_pstate(cpu);</div><div class='ctx'> </div><div class='add'>+	update_turbo_state();</div><div class='add'>+</div><div class='ctx'> 	intel_pstate_update_pstate(cpu, target_pstate);</div><div class='ctx'> </div><div class='ctx'> 	sample = &amp;cpu-&gt;sample;</div><div class='hunk'>@@ -1362,7 +1920,7 @@ static void intel_pstate_update_util(struct update_util_data *data, u64 time,</div><div class='ctx'> 	struct cpudata *cpu = container_of(data, struct cpudata, update_util);</div><div class='ctx'> 	u64 delta_ns;</div><div class='ctx'> </div><div class='del'>-	if (pid_params.boost_iowait) {</div><div class='add'>+	if (pstate_funcs.get_target_pstate == get_target_pstate_use_cpu_load) {</div><div class='ctx'> 		if (flags &amp; SCHED_CPUFREQ_IOWAIT) {</div><div class='ctx'> 			cpu-&gt;iowait_boost = int_tofp(1);</div><div class='ctx'> 		} else if (cpu-&gt;iowait_boost) {</div><div class='hunk'>@@ -1408,6 +1966,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {</div><div class='ctx'> 	ICPU(INTEL_FAM6_SKYLAKE_DESKTOP,	core_params),</div><div class='ctx'> 	ICPU(INTEL_FAM6_BROADWELL_XEON_D,	core_params),</div><div class='ctx'> 	ICPU(INTEL_FAM6_XEON_PHI_KNL,		knl_params),</div><div class='add'>+	ICPU(INTEL_FAM6_XEON_PHI_KNM,		knl_params),</div><div class='ctx'> 	ICPU(INTEL_FAM6_ATOM_GOLDMONT,		bxt_params),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='hunk'>@@ -1420,21 +1979,47 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = {</div><div class='add'>+	ICPU(INTEL_FAM6_KABYLAKE_DESKTOP, core_params),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int intel_pstate_init_cpu(unsigned int cpunum)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpudata *cpu;</div><div class='ctx'> </div><div class='del'>-	if (!all_cpu_data[cpunum])</div><div class='del'>-		all_cpu_data[cpunum] = kzalloc(sizeof(struct cpudata),</div><div class='del'>-					       GFP_KERNEL);</div><div class='del'>-	if (!all_cpu_data[cpunum])</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	cpu = all_cpu_data[cpunum];</div><div class='add'>+</div><div class='add'>+	if (!cpu) {</div><div class='add'>+		unsigned int size = sizeof(struct cpudata);</div><div class='add'>+</div><div class='add'>+		if (per_cpu_limits)</div><div class='add'>+			size += sizeof(struct perf_limits);</div><div class='add'>+</div><div class='add'>+		cpu = kzalloc(size, GFP_KERNEL);</div><div class='add'>+		if (!cpu)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		all_cpu_data[cpunum] = cpu;</div><div class='add'>+		if (per_cpu_limits)</div><div class='add'>+			cpu-&gt;perf_limits = (struct perf_limits *)(cpu + 1);</div><div class='add'>+</div><div class='add'>+		cpu-&gt;epp_default = -EINVAL;</div><div class='add'>+		cpu-&gt;epp_powersave = -EINVAL;</div><div class='add'>+		cpu-&gt;epp_saved = -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cpu = all_cpu_data[cpunum];</div><div class='ctx'> </div><div class='ctx'> 	cpu-&gt;cpu = cpunum;</div><div class='ctx'> </div><div class='ctx'> 	if (hwp_active) {</div><div class='add'>+		const struct x86_cpu_id *id;</div><div class='add'>+</div><div class='add'>+		id = x86_match_cpu(intel_pstate_cpu_ee_disable_ids);</div><div class='add'>+		if (id)</div><div class='add'>+			intel_pstate_disable_ee(cpunum);</div><div class='add'>+</div><div class='ctx'> 		intel_pstate_hwp_enable(cpu);</div><div class='ctx'> 		pid_params.sample_rate_ms = 50;</div><div class='ctx'> 		pid_params.sample_rate_ns = 50 * NSEC_PER_MSEC;</div><div class='hunk'>@@ -1482,23 +2067,48 @@ static void intel_pstate_clear_update_util_hook(unsigned int cpu)</div><div class='ctx'> 	synchronize_sched();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void intel_pstate_set_performance_limits(struct perf_limits *limits)</div><div class='add'>+static void intel_pstate_update_perf_limits(struct cpufreq_policy *policy,</div><div class='add'>+					    struct perf_limits *limits)</div><div class='ctx'> {</div><div class='del'>-	limits-&gt;no_turbo = 0;</div><div class='del'>-	limits-&gt;turbo_disabled = 0;</div><div class='del'>-	limits-&gt;max_perf_pct = 100;</div><div class='del'>-	limits-&gt;max_perf = int_tofp(1);</div><div class='del'>-	limits-&gt;min_perf_pct = 100;</div><div class='del'>-	limits-&gt;min_perf = int_tofp(1);</div><div class='del'>-	limits-&gt;max_policy_pct = 100;</div><div class='del'>-	limits-&gt;max_sysfs_pct = 100;</div><div class='del'>-	limits-&gt;min_policy_pct = 0;</div><div class='del'>-	limits-&gt;min_sysfs_pct = 0;</div><div class='add'>+</div><div class='add'>+	limits-&gt;max_policy_pct = DIV_ROUND_UP(policy-&gt;max * 100,</div><div class='add'>+					      policy-&gt;cpuinfo.max_freq);</div><div class='add'>+	limits-&gt;max_policy_pct = clamp_t(int, limits-&gt;max_policy_pct, 0, 100);</div><div class='add'>+	if (policy-&gt;max == policy-&gt;min) {</div><div class='add'>+		limits-&gt;min_policy_pct = limits-&gt;max_policy_pct;</div><div class='add'>+	} else {</div><div class='add'>+		limits-&gt;min_policy_pct = DIV_ROUND_UP(policy-&gt;min * 100,</div><div class='add'>+						      policy-&gt;cpuinfo.max_freq);</div><div class='add'>+		limits-&gt;min_policy_pct = clamp_t(int, limits-&gt;min_policy_pct,</div><div class='add'>+						 0, 100);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Normalize user input to [min_policy_pct, max_policy_pct] */</div><div class='add'>+	limits-&gt;min_perf_pct = max(limits-&gt;min_policy_pct,</div><div class='add'>+				   limits-&gt;min_sysfs_pct);</div><div class='add'>+	limits-&gt;min_perf_pct = min(limits-&gt;max_policy_pct,</div><div class='add'>+				   limits-&gt;min_perf_pct);</div><div class='add'>+	limits-&gt;max_perf_pct = min(limits-&gt;max_policy_pct,</div><div class='add'>+				   limits-&gt;max_sysfs_pct);</div><div class='add'>+	limits-&gt;max_perf_pct = max(limits-&gt;min_policy_pct,</div><div class='add'>+				   limits-&gt;max_perf_pct);</div><div class='add'>+</div><div class='add'>+	/* Make sure min_perf_pct &lt;= max_perf_pct */</div><div class='add'>+	limits-&gt;min_perf_pct = min(limits-&gt;max_perf_pct, limits-&gt;min_perf_pct);</div><div class='add'>+</div><div class='add'>+	limits-&gt;min_perf = div_ext_fp(limits-&gt;min_perf_pct, 100);</div><div class='add'>+	limits-&gt;max_perf = div_ext_fp(limits-&gt;max_perf_pct, 100);</div><div class='add'>+	limits-&gt;max_perf = round_up(limits-&gt;max_perf, EXT_FRAC_BITS);</div><div class='add'>+	limits-&gt;min_perf = round_up(limits-&gt;min_perf, EXT_FRAC_BITS);</div><div class='add'>+</div><div class='add'>+	pr_debug("cpu:%d max_perf_pct:%d min_perf_pct:%d\n", policy-&gt;cpu,</div><div class='add'>+		 limits-&gt;max_perf_pct, limits-&gt;min_perf_pct);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int intel_pstate_set_policy(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpudata *cpu;</div><div class='add'>+	struct perf_limits *perf_limits = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!policy-&gt;cpuinfo.max_freq)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1516,41 +2126,32 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)</div><div class='ctx'> 		policy-&gt;max = policy-&gt;cpuinfo.max_freq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cpu-&gt;policy == CPUFREQ_POLICY_PERFORMANCE) {</div><div class='del'>-		limits = &amp;performance_limits;</div><div class='del'>-		if (policy-&gt;max &gt;= policy-&gt;cpuinfo.max_freq) {</div><div class='add'>+	if (per_cpu_limits)</div><div class='add'>+		perf_limits = cpu-&gt;perf_limits;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	if (policy-&gt;policy == CPUFREQ_POLICY_PERFORMANCE) {</div><div class='add'>+		if (!perf_limits) {</div><div class='add'>+			limits = &amp;performance_limits;</div><div class='add'>+			perf_limits = limits;</div><div class='add'>+		}</div><div class='add'>+		if (policy-&gt;max &gt;= policy-&gt;cpuinfo.max_freq &amp;&amp;</div><div class='add'>+		    !limits-&gt;no_turbo) {</div><div class='ctx'> 			pr_debug("set performance\n");</div><div class='del'>-			intel_pstate_set_performance_limits(limits);</div><div class='add'>+			intel_pstate_set_performance_limits(perf_limits);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_debug("set powersave\n");</div><div class='del'>-		limits = &amp;powersave_limits;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	limits-&gt;min_policy_pct = (policy-&gt;min * 100) / policy-&gt;cpuinfo.max_freq;</div><div class='del'>-	limits-&gt;min_policy_pct = clamp_t(int, limits-&gt;min_policy_pct, 0 , 100);</div><div class='del'>-	limits-&gt;max_policy_pct = DIV_ROUND_UP(policy-&gt;max * 100,</div><div class='del'>-					      policy-&gt;cpuinfo.max_freq);</div><div class='del'>-	limits-&gt;max_policy_pct = clamp_t(int, limits-&gt;max_policy_pct, 0 , 100);</div><div class='del'>-</div><div class='del'>-	/* Normalize user input to [min_policy_pct, max_policy_pct] */</div><div class='del'>-	limits-&gt;min_perf_pct = max(limits-&gt;min_policy_pct,</div><div class='del'>-				   limits-&gt;min_sysfs_pct);</div><div class='del'>-	limits-&gt;min_perf_pct = min(limits-&gt;max_policy_pct,</div><div class='del'>-				   limits-&gt;min_perf_pct);</div><div class='del'>-	limits-&gt;max_perf_pct = min(limits-&gt;max_policy_pct,</div><div class='del'>-				   limits-&gt;max_sysfs_pct);</div><div class='del'>-	limits-&gt;max_perf_pct = max(limits-&gt;min_policy_pct,</div><div class='del'>-				   limits-&gt;max_perf_pct);</div><div class='del'>-</div><div class='del'>-	/* Make sure min_perf_pct &lt;= max_perf_pct */</div><div class='del'>-	limits-&gt;min_perf_pct = min(limits-&gt;max_perf_pct, limits-&gt;min_perf_pct);</div><div class='add'>+		if (!perf_limits) {</div><div class='add'>+			limits = &amp;powersave_limits;</div><div class='add'>+			perf_limits = limits;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	limits-&gt;min_perf = div_fp(limits-&gt;min_perf_pct, 100);</div><div class='del'>-	limits-&gt;max_perf = div_fp(limits-&gt;max_perf_pct, 100);</div><div class='del'>-	limits-&gt;max_perf = round_up(limits-&gt;max_perf, FRAC_BITS);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	intel_pstate_update_perf_limits(policy, perf_limits);</div><div class='ctx'>  out:</div><div class='ctx'> 	if (cpu-&gt;policy == CPUFREQ_POLICY_PERFORMANCE) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1565,36 +2166,73 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	intel_pstate_hwp_set_policy(policy);</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int intel_pstate_verify_policy(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='add'>+	struct cpudata *cpu = all_cpu_data[policy-&gt;cpu];</div><div class='add'>+	struct perf_limits *perf_limits;</div><div class='add'>+</div><div class='add'>+	if (policy-&gt;policy == CPUFREQ_POLICY_PERFORMANCE)</div><div class='add'>+		perf_limits = &amp;performance_limits;</div><div class='add'>+	else</div><div class='add'>+		perf_limits = &amp;powersave_limits;</div><div class='add'>+</div><div class='add'>+	update_turbo_state();</div><div class='add'>+	policy-&gt;cpuinfo.max_freq = perf_limits-&gt;turbo_disabled ||</div><div class='add'>+					perf_limits-&gt;no_turbo ?</div><div class='add'>+					cpu-&gt;pstate.max_freq :</div><div class='add'>+					cpu-&gt;pstate.turbo_freq;</div><div class='add'>+</div><div class='ctx'> 	cpufreq_verify_within_cpu_limits(policy);</div><div class='ctx'> </div><div class='ctx'> 	if (policy-&gt;policy != CPUFREQ_POLICY_POWERSAVE &amp;&amp;</div><div class='ctx'> 	    policy-&gt;policy != CPUFREQ_POLICY_PERFORMANCE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* When per-CPU limits are used, sysfs limits are not used */</div><div class='add'>+	if (!per_cpu_limits) {</div><div class='add'>+		unsigned int max_freq, min_freq;</div><div class='add'>+</div><div class='add'>+		max_freq = policy-&gt;cpuinfo.max_freq *</div><div class='add'>+						limits-&gt;max_sysfs_pct / 100;</div><div class='add'>+		min_freq = policy-&gt;cpuinfo.max_freq *</div><div class='add'>+						limits-&gt;min_sysfs_pct / 100;</div><div class='add'>+		cpufreq_verify_within_limits(policy, min_freq, max_freq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void intel_cpufreq_stop_cpu(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	intel_pstate_set_min_pstate(all_cpu_data[policy-&gt;cpu]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void intel_pstate_stop_cpu(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='del'>-	int cpu_num = policy-&gt;cpu;</div><div class='del'>-	struct cpudata *cpu = all_cpu_data[cpu_num];</div><div class='add'>+	pr_debug("CPU %d exiting\n", policy-&gt;cpu);</div><div class='ctx'> </div><div class='del'>-	pr_debug("CPU %d exiting\n", cpu_num);</div><div class='add'>+	intel_pstate_clear_update_util_hook(policy-&gt;cpu);</div><div class='add'>+	if (hwp_active)</div><div class='add'>+		intel_pstate_hwp_save_state(policy);</div><div class='add'>+	else</div><div class='add'>+		intel_cpufreq_stop_cpu(policy);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	intel_pstate_clear_update_util_hook(cpu_num);</div><div class='add'>+static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	intel_pstate_exit_perf_limits(policy);</div><div class='ctx'> </div><div class='del'>-	if (hwp_active)</div><div class='del'>-		return;</div><div class='add'>+	policy-&gt;fast_switch_possible = false;</div><div class='ctx'> </div><div class='del'>-	intel_pstate_set_min_pstate(cpu);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int intel_pstate_cpu_init(struct cpufreq_policy *policy)</div><div class='add'>+static int __intel_pstate_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpudata *cpu;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -1605,10 +2243,13 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	cpu = all_cpu_data[policy-&gt;cpu];</div><div class='ctx'> </div><div class='del'>-	if (limits-&gt;min_perf_pct == 100 &amp;&amp; limits-&gt;max_perf_pct == 100)</div><div class='del'>-		policy-&gt;policy = CPUFREQ_POLICY_PERFORMANCE;</div><div class='del'>-	else</div><div class='del'>-		policy-&gt;policy = CPUFREQ_POLICY_POWERSAVE;</div><div class='add'>+	/*</div><div class='add'>+	 * We need sane value in the cpu-&gt;perf_limits, so inherit from global</div><div class='add'>+	 * perf_limits limits, which are seeded with values based on the</div><div class='add'>+	 * CONFIG_CPU_FREQ_DEFAULT_GOV_*, during boot up.</div><div class='add'>+	 */</div><div class='add'>+	if (per_cpu_limits)</div><div class='add'>+		memcpy(cpu-&gt;perf_limits, limits, sizeof(struct perf_limits));</div><div class='ctx'> </div><div class='ctx'> 	policy-&gt;min = cpu-&gt;pstate.min_pstate * cpu-&gt;pstate.scaling;</div><div class='ctx'> 	policy-&gt;max = cpu-&gt;pstate.turbo_pstate * cpu-&gt;pstate.scaling;</div><div class='hunk'>@@ -1621,24 +2262,35 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	policy-&gt;cpuinfo.max_freq *= cpu-&gt;pstate.scaling;</div><div class='ctx'> </div><div class='ctx'> 	intel_pstate_init_acpi_perf_limits(policy);</div><div class='del'>-	policy-&gt;cpuinfo.transition_latency = CPUFREQ_ETERNAL;</div><div class='ctx'> 	cpumask_set_cpu(policy-&gt;cpu, policy-&gt;cpus);</div><div class='ctx'> </div><div class='add'>+	policy-&gt;fast_switch_possible = true;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)</div><div class='add'>+static int intel_pstate_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='del'>-	intel_pstate_exit_perf_limits(policy);</div><div class='add'>+	int ret = __intel_pstate_cpu_init(policy);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	policy-&gt;cpuinfo.transition_latency = CPUFREQ_ETERNAL;</div><div class='add'>+	if (limits-&gt;min_perf_pct == 100 &amp;&amp; limits-&gt;max_perf_pct == 100)</div><div class='add'>+		policy-&gt;policy = CPUFREQ_POLICY_PERFORMANCE;</div><div class='add'>+	else</div><div class='add'>+		policy-&gt;policy = CPUFREQ_POLICY_POWERSAVE;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct cpufreq_driver intel_pstate_driver = {</div><div class='add'>+static struct cpufreq_driver intel_pstate = {</div><div class='ctx'> 	.flags		= CPUFREQ_CONST_LOOPS,</div><div class='ctx'> 	.verify		= intel_pstate_verify_policy,</div><div class='ctx'> 	.setpolicy	= intel_pstate_set_policy,</div><div class='del'>-	.resume		= intel_pstate_hwp_set_policy,</div><div class='add'>+	.suspend	= intel_pstate_hwp_save_state,</div><div class='add'>+	.resume		= intel_pstate_resume,</div><div class='ctx'> 	.get		= intel_pstate_get,</div><div class='ctx'> 	.init		= intel_pstate_cpu_init,</div><div class='ctx'> 	.exit		= intel_pstate_cpu_exit,</div><div class='hunk'>@@ -1646,6 +2298,232 @@ static struct cpufreq_driver intel_pstate_driver = {</div><div class='ctx'> 	.name		= "intel_pstate",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int intel_cpufreq_verify_policy(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	struct cpudata *cpu = all_cpu_data[policy-&gt;cpu];</div><div class='add'>+	struct perf_limits *perf_limits = limits;</div><div class='add'>+</div><div class='add'>+	update_turbo_state();</div><div class='add'>+	policy-&gt;cpuinfo.max_freq = limits-&gt;turbo_disabled ?</div><div class='add'>+			cpu-&gt;pstate.max_freq : cpu-&gt;pstate.turbo_freq;</div><div class='add'>+</div><div class='add'>+	cpufreq_verify_within_cpu_limits(policy);</div><div class='add'>+</div><div class='add'>+	if (per_cpu_limits)</div><div class='add'>+		perf_limits = cpu-&gt;perf_limits;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	intel_pstate_update_perf_limits(policy, perf_limits);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int intel_cpufreq_turbo_update(struct cpudata *cpu,</div><div class='add'>+					       struct cpufreq_policy *policy,</div><div class='add'>+					       unsigned int target_freq)</div><div class='add'>+{</div><div class='add'>+	unsigned int max_freq;</div><div class='add'>+</div><div class='add'>+	update_turbo_state();</div><div class='add'>+</div><div class='add'>+	max_freq = limits-&gt;no_turbo || limits-&gt;turbo_disabled ?</div><div class='add'>+			cpu-&gt;pstate.max_freq : cpu-&gt;pstate.turbo_freq;</div><div class='add'>+	policy-&gt;cpuinfo.max_freq = max_freq;</div><div class='add'>+	if (policy-&gt;max &gt; max_freq)</div><div class='add'>+		policy-&gt;max = max_freq;</div><div class='add'>+</div><div class='add'>+	if (target_freq &gt; max_freq)</div><div class='add'>+		target_freq = max_freq;</div><div class='add'>+</div><div class='add'>+	return target_freq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_cpufreq_target(struct cpufreq_policy *policy,</div><div class='add'>+				unsigned int target_freq,</div><div class='add'>+				unsigned int relation)</div><div class='add'>+{</div><div class='add'>+	struct cpudata *cpu = all_cpu_data[policy-&gt;cpu];</div><div class='add'>+	struct cpufreq_freqs freqs;</div><div class='add'>+	int target_pstate;</div><div class='add'>+</div><div class='add'>+	freqs.old = policy-&gt;cur;</div><div class='add'>+	freqs.new = intel_cpufreq_turbo_update(cpu, policy, target_freq);</div><div class='add'>+</div><div class='add'>+	cpufreq_freq_transition_begin(policy, &amp;freqs);</div><div class='add'>+	switch (relation) {</div><div class='add'>+	case CPUFREQ_RELATION_L:</div><div class='add'>+		target_pstate = DIV_ROUND_UP(freqs.new, cpu-&gt;pstate.scaling);</div><div class='add'>+		break;</div><div class='add'>+	case CPUFREQ_RELATION_H:</div><div class='add'>+		target_pstate = freqs.new / cpu-&gt;pstate.scaling;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		target_pstate = DIV_ROUND_CLOSEST(freqs.new, cpu-&gt;pstate.scaling);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	target_pstate = intel_pstate_prepare_request(cpu, target_pstate);</div><div class='add'>+	if (target_pstate != cpu-&gt;pstate.current_pstate) {</div><div class='add'>+		cpu-&gt;pstate.current_pstate = target_pstate;</div><div class='add'>+		wrmsrl_on_cpu(policy-&gt;cpu, MSR_IA32_PERF_CTL,</div><div class='add'>+			      pstate_funcs.get_val(cpu, target_pstate));</div><div class='add'>+	}</div><div class='add'>+	cpufreq_freq_transition_end(policy, &amp;freqs, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int intel_cpufreq_fast_switch(struct cpufreq_policy *policy,</div><div class='add'>+					      unsigned int target_freq)</div><div class='add'>+{</div><div class='add'>+	struct cpudata *cpu = all_cpu_data[policy-&gt;cpu];</div><div class='add'>+	int target_pstate;</div><div class='add'>+</div><div class='add'>+	target_freq = intel_cpufreq_turbo_update(cpu, policy, target_freq);</div><div class='add'>+	target_pstate = DIV_ROUND_UP(target_freq, cpu-&gt;pstate.scaling);</div><div class='add'>+	intel_pstate_update_pstate(cpu, target_pstate);</div><div class='add'>+	return target_freq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_cpufreq_cpu_init(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	int ret = __intel_pstate_cpu_init(policy);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	policy-&gt;cpuinfo.transition_latency = INTEL_CPUFREQ_TRANSITION_LATENCY;</div><div class='add'>+	/* This reflects the intel_pstate_get_cpu_pstates() setting. */</div><div class='add'>+	policy-&gt;cur = policy-&gt;cpuinfo.min_freq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cpufreq_driver intel_cpufreq = {</div><div class='add'>+	.flags		= CPUFREQ_CONST_LOOPS,</div><div class='add'>+	.verify		= intel_cpufreq_verify_policy,</div><div class='add'>+	.target		= intel_cpufreq_target,</div><div class='add'>+	.fast_switch	= intel_cpufreq_fast_switch,</div><div class='add'>+	.init		= intel_cpufreq_cpu_init,</div><div class='add'>+	.exit		= intel_pstate_cpu_exit,</div><div class='add'>+	.stop_cpu	= intel_cpufreq_stop_cpu,</div><div class='add'>+	.name		= "intel_cpufreq",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cpufreq_driver *intel_pstate_driver = &amp;intel_pstate;</div><div class='add'>+</div><div class='add'>+static void intel_pstate_driver_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu;</div><div class='add'>+</div><div class='add'>+	get_online_cpus();</div><div class='add'>+	for_each_online_cpu(cpu) {</div><div class='add'>+		if (all_cpu_data[cpu]) {</div><div class='add'>+			if (intel_pstate_driver == &amp;intel_pstate)</div><div class='add'>+				intel_pstate_clear_update_util_hook(cpu);</div><div class='add'>+</div><div class='add'>+			kfree(all_cpu_data[cpu]);</div><div class='add'>+			all_cpu_data[cpu] = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	put_online_cpus();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_pstate_register_driver(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	intel_pstate_init_limits(&amp;powersave_limits);</div><div class='add'>+	intel_pstate_set_performance_limits(&amp;performance_limits);</div><div class='add'>+	limits = IS_ENABLED(CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE) ?</div><div class='add'>+			&amp;performance_limits : &amp;powersave_limits;</div><div class='add'>+</div><div class='add'>+	ret = cpufreq_register_driver(intel_pstate_driver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		intel_pstate_driver_cleanup();</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intel_pstate_limits_lock);</div><div class='add'>+	driver_registered = true;</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	if (intel_pstate_driver == &amp;intel_pstate &amp;&amp; !hwp_active &amp;&amp;</div><div class='add'>+	    pstate_funcs.get_target_pstate != get_target_pstate_use_cpu_load)</div><div class='add'>+		intel_pstate_debug_expose_params();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_pstate_unregister_driver(void)</div><div class='add'>+{</div><div class='add'>+	if (hwp_active)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (intel_pstate_driver == &amp;intel_pstate &amp;&amp; !hwp_active &amp;&amp;</div><div class='add'>+	    pstate_funcs.get_target_pstate != get_target_pstate_use_cpu_load)</div><div class='add'>+		intel_pstate_debug_hide_params();</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intel_pstate_limits_lock);</div><div class='add'>+	driver_registered = false;</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_limits_lock);</div><div class='add'>+</div><div class='add'>+	cpufreq_unregister_driver(intel_pstate_driver);</div><div class='add'>+	intel_pstate_driver_cleanup();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t intel_pstate_show_status(char *buf)</div><div class='add'>+{</div><div class='add'>+	if (!driver_registered)</div><div class='add'>+		return sprintf(buf, "off\n");</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%s\n", intel_pstate_driver == &amp;intel_pstate ?</div><div class='add'>+					"active" : "passive");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_pstate_update_status(const char *buf, size_t size)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (size == 3 &amp;&amp; !strncmp(buf, "off", size))</div><div class='add'>+		return driver_registered ?</div><div class='add'>+			intel_pstate_unregister_driver() : -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (size == 6 &amp;&amp; !strncmp(buf, "active", size)) {</div><div class='add'>+		if (driver_registered) {</div><div class='add'>+			if (intel_pstate_driver == &amp;intel_pstate)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			ret = intel_pstate_unregister_driver();</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		intel_pstate_driver = &amp;intel_pstate;</div><div class='add'>+		return intel_pstate_register_driver();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (size == 7 &amp;&amp; !strncmp(buf, "passive", size)) {</div><div class='add'>+		if (driver_registered) {</div><div class='add'>+			if (intel_pstate_driver != &amp;intel_pstate)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			ret = intel_pstate_unregister_driver();</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		intel_pstate_driver = &amp;intel_cpufreq;</div><div class='add'>+		return intel_pstate_register_driver();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int no_load __initdata;</div><div class='ctx'> static int no_hwp __initdata;</div><div class='ctx'> static int hwp_only __initdata;</div><div class='hunk'>@@ -1672,6 +2550,19 @@ static void __init copy_pid_params(struct pstate_adjust_policy *policy)</div><div class='ctx'> 	pid_params.setpoint = policy-&gt;setpoint;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+static void intel_pstate_use_acpi_profile(void)</div><div class='add'>+{</div><div class='add'>+	if (acpi_gbl_FADT.preferred_profile == PM_MOBILE)</div><div class='add'>+		pstate_funcs.get_target_pstate =</div><div class='add'>+				get_target_pstate_use_cpu_load;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void intel_pstate_use_acpi_profile(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void __init copy_cpu_funcs(struct pstate_funcs *funcs)</div><div class='ctx'> {</div><div class='ctx'> 	pstate_funcs.get_max   = funcs-&gt;get_max;</div><div class='hunk'>@@ -1683,6 +2574,7 @@ static void __init copy_cpu_funcs(struct pstate_funcs *funcs)</div><div class='ctx'> 	pstate_funcs.get_vid   = funcs-&gt;get_vid;</div><div class='ctx'> 	pstate_funcs.get_target_pstate = funcs-&gt;get_target_pstate;</div><div class='ctx'> </div><div class='add'>+	intel_pstate_use_acpi_profile();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='hunk'>@@ -1796,9 +2688,20 @@ static bool __init intel_pstate_platform_pwr_mgmt_exists(void)</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void intel_pstate_request_control_from_smm(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * It may be unsafe to request P-states control from SMM if _PPC support</div><div class='add'>+	 * has not been enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (acpi_ppc)</div><div class='add'>+		acpi_processor_pstate_control();</div><div class='add'>+}</div><div class='ctx'> #else /* CONFIG_ACPI not enabled */</div><div class='ctx'> static inline bool intel_pstate_platform_pwr_mgmt_exists(void) { return false; }</div><div class='ctx'> static inline bool intel_pstate_has_acpi_ppc(void) { return false; }</div><div class='add'>+static inline void intel_pstate_request_control_from_smm(void) {}</div><div class='ctx'> #endif /* CONFIG_ACPI */</div><div class='ctx'> </div><div class='ctx'> static const struct x86_cpu_id hwp_support_ids[] __initconst = {</div><div class='hunk'>@@ -1808,9 +2711,9 @@ static const struct x86_cpu_id hwp_support_ids[] __initconst = {</div><div class='ctx'> </div><div class='ctx'> static int __init intel_pstate_init(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu, rc = 0;</div><div class='ctx'> 	const struct x86_cpu_id *id;</div><div class='ctx'> 	struct cpu_defaults *cpu_def;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (no_load)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1818,6 +2721,7 @@ static int __init intel_pstate_init(void)</div><div class='ctx'> 	if (x86_match_cpu(hwp_support_ids) &amp;&amp; !no_hwp) {</div><div class='ctx'> 		copy_cpu_funcs(&amp;core_params.funcs);</div><div class='ctx'> 		hwp_active++;</div><div class='add'>+		intel_pstate.attr = hwp_cpufreq_attrs;</div><div class='ctx'> 		goto hwp_cpu_matched;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1841,38 +2745,29 @@ hwp_cpu_matched:</div><div class='ctx'> 	if (intel_pstate_platform_pwr_mgmt_exists())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	if (!hwp_active &amp;&amp; hwp_only)</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	pr_info("Intel P-state driver initializing\n");</div><div class='ctx'> </div><div class='ctx'> 	all_cpu_data = vzalloc(sizeof(void *) * num_possible_cpus());</div><div class='ctx'> 	if (!all_cpu_data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (!hwp_active &amp;&amp; hwp_only)</div><div class='del'>-		goto out;</div><div class='add'>+	intel_pstate_request_control_from_smm();</div><div class='ctx'> </div><div class='del'>-	rc = cpufreq_register_driver(&amp;intel_pstate_driver);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	intel_pstate_debug_expose_params();</div><div class='ctx'> 	intel_pstate_sysfs_expose_params();</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;intel_pstate_driver_lock);</div><div class='add'>+	rc = intel_pstate_register_driver();</div><div class='add'>+	mutex_unlock(&amp;intel_pstate_driver_lock);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='ctx'> 	if (hwp_active)</div><div class='ctx'> 		pr_info("HWP enabled\n");</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='del'>-out:</div><div class='del'>-	get_online_cpus();</div><div class='del'>-	for_each_online_cpu(cpu) {</div><div class='del'>-		if (all_cpu_data[cpu]) {</div><div class='del'>-			intel_pstate_clear_update_util_hook(cpu);</div><div class='del'>-			kfree(all_cpu_data[cpu]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	put_online_cpus();</div><div class='del'>-	vfree(all_cpu_data);</div><div class='del'>-	return -ENODEV;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> device_initcall(intel_pstate_init);</div><div class='ctx'> </div><div class='hunk'>@@ -1881,8 +2776,13 @@ static int __init intel_pstate_setup(char *str)</div><div class='ctx'> 	if (!str)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!strcmp(str, "disable"))</div><div class='add'>+	if (!strcmp(str, "disable")) {</div><div class='ctx'> 		no_load = 1;</div><div class='add'>+	} else if (!strcmp(str, "passive")) {</div><div class='add'>+		pr_info("Passive mode enabled\n");</div><div class='add'>+		intel_pstate_driver = &amp;intel_cpufreq;</div><div class='add'>+		no_hwp = 1;</div><div class='add'>+	}</div><div class='ctx'> 	if (!strcmp(str, "no_hwp")) {</div><div class='ctx'> 		pr_info("HWP disabled\n");</div><div class='ctx'> 		no_hwp = 1;</div><div class='hunk'>@@ -1891,6 +2791,8 @@ static int __init intel_pstate_setup(char *str)</div><div class='ctx'> 		force_load = 1;</div><div class='ctx'> 	if (!strcmp(str, "hwp_only"))</div><div class='ctx'> 		hwp_only = 1;</div><div class='add'>+	if (!strcmp(str, "per_cpu_perf_limits"))</div><div class='add'>+		per_cpu_limits = true;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> 	if (!strcmp(str, "support_acpi_ppc"))</div><div class='head'>diff --git a/drivers/cpufreq/mt8173-cpufreq.c b/drivers/cpufreq/mt8173-cpufreq.c<br/>index 643f43179df1..ab25b1235a5e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/mt8173-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/mt8173-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/mt8173-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/mt8173-cpufreq.c</a></div><div class='hunk'>@@ -232,16 +232,14 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,</div><div class='ctx'> </div><div class='ctx'> 	freq_hz = freq_table[index].frequency * 1000;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	opp = dev_pm_opp_find_freq_ceil(cpu_dev, &amp;freq_hz);</div><div class='ctx'> 	if (IS_ERR(opp)) {</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 		pr_err("cpu%d: failed to find OPP for %ld\n",</div><div class='ctx'> 		       policy-&gt;cpu, freq_hz);</div><div class='ctx'> 		return PTR_ERR(opp);</div><div class='ctx'> 	}</div><div class='ctx'> 	vproc = dev_pm_opp_get_voltage(opp);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	dev_pm_opp_put(opp);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the new voltage or the intermediate voltage is higher than the</div><div class='hunk'>@@ -411,16 +409,14 @@ static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu)</div><div class='ctx'> </div><div class='ctx'> 	/* Search a safe voltage for intermediate frequency. */</div><div class='ctx'> 	rate = clk_get_rate(inter_clk);</div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	opp = dev_pm_opp_find_freq_ceil(cpu_dev, &amp;rate);</div><div class='ctx'> 	if (IS_ERR(opp)) {</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 		pr_err("failed to get intermediate opp for cpu%d\n", cpu);</div><div class='ctx'> 		ret = PTR_ERR(opp);</div><div class='ctx'> 		goto out_free_opp_table;</div><div class='ctx'> 	}</div><div class='ctx'> 	info-&gt;intermediate_voltage = dev_pm_opp_get_voltage(opp);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	dev_pm_opp_put(opp);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;cpu_dev = cpu_dev;</div><div class='ctx'> 	info-&gt;proc_reg = proc_reg;</div><div class='head'>diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c<br/>index 376e63ca94e8..71e81bbf031b 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/omap-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/omap-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/omap-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/omap-cpufreq.c</a></div><div class='hunk'>@@ -63,16 +63,14 @@ static int omap_target(struct cpufreq_policy *policy, unsigned int index)</div><div class='ctx'> 	freq = ret;</div><div class='ctx'> </div><div class='ctx'> 	if (mpu_reg) {</div><div class='del'>-		rcu_read_lock();</div><div class='ctx'> 		opp = dev_pm_opp_find_freq_ceil(mpu_dev, &amp;freq);</div><div class='ctx'> 		if (IS_ERR(opp)) {</div><div class='del'>-			rcu_read_unlock();</div><div class='ctx'> 			dev_err(mpu_dev, "%s: unable to find MPU OPP for %d\n",</div><div class='ctx'> 				__func__, new_freq);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		volt = dev_pm_opp_get_voltage(opp);</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+		dev_pm_opp_put(opp);</div><div class='ctx'> 		tol = volt * OPP_TOLERANCE / 100;</div><div class='ctx'> 		volt_old = regulator_get_voltage(mpu_reg);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c<br/>index d3ffde806629..3ff5160451b4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/powernv-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/powernv-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/powernv-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/powernv-cpufreq.c</a></div><div class='hunk'>@@ -42,6 +42,10 @@</div><div class='ctx'> #define PMSR_PSAFE_ENABLE	(1UL &lt;&lt; 30)</div><div class='ctx'> #define PMSR_SPR_EM_DISABLE	(1UL &lt;&lt; 31)</div><div class='ctx'> #define PMSR_MAX(x)		((x &gt;&gt; 32) &amp; 0xFF)</div><div class='add'>+#define LPSTATE_SHIFT		48</div><div class='add'>+#define GPSTATE_SHIFT		56</div><div class='add'>+#define GET_LPSTATE(x)		(((x) &gt;&gt; LPSTATE_SHIFT) &amp; 0xFF)</div><div class='add'>+#define GET_GPSTATE(x)		(((x) &gt;&gt; GPSTATE_SHIFT) &amp; 0xFF)</div><div class='ctx'> </div><div class='ctx'> #define MAX_RAMP_DOWN_TIME				5120</div><div class='ctx'> /*</div><div class='hunk'>@@ -140,6 +144,7 @@ static struct powernv_pstate_info {</div><div class='ctx'> 	unsigned int max;</div><div class='ctx'> 	unsigned int nominal;</div><div class='ctx'> 	unsigned int nr_pstates;</div><div class='add'>+	bool wof_enabled;</div><div class='ctx'> } powernv_pstate_info;</div><div class='ctx'> </div><div class='ctx'> /* Use following macros for conversions between pstate_id and index */</div><div class='hunk'>@@ -199,6 +204,7 @@ static int init_powernv_pstates(void)</div><div class='ctx'> 	const __be32 *pstate_ids, *pstate_freqs;</div><div class='ctx'> 	u32 len_ids, len_freqs;</div><div class='ctx'> 	u32 pstate_min, pstate_max, pstate_nominal;</div><div class='add'>+	u32 pstate_turbo, pstate_ultra_turbo;</div><div class='ctx'> </div><div class='ctx'> 	power_mgt = of_find_node_by_path("/ibm,opal/power-mgt");</div><div class='ctx'> 	if (!power_mgt) {</div><div class='hunk'>@@ -221,8 +227,29 @@ static int init_powernv_pstates(void)</div><div class='ctx'> 		pr_warn("ibm,pstate-nominal not found\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (of_property_read_u32(power_mgt, "ibm,pstate-ultra-turbo",</div><div class='add'>+				 &amp;pstate_ultra_turbo)) {</div><div class='add'>+		powernv_pstate_info.wof_enabled = false;</div><div class='add'>+		goto next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_property_read_u32(power_mgt, "ibm,pstate-turbo",</div><div class='add'>+				 &amp;pstate_turbo)) {</div><div class='add'>+		powernv_pstate_info.wof_enabled = false;</div><div class='add'>+		goto next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pstate_turbo == pstate_ultra_turbo)</div><div class='add'>+		powernv_pstate_info.wof_enabled = false;</div><div class='add'>+	else</div><div class='add'>+		powernv_pstate_info.wof_enabled = true;</div><div class='add'>+</div><div class='add'>+next:</div><div class='ctx'> 	pr_info("cpufreq pstate min %d nominal %d max %d\n", pstate_min,</div><div class='ctx'> 		pstate_nominal, pstate_max);</div><div class='add'>+	pr_info("Workload Optimized Frequency is %s in the platform\n",</div><div class='add'>+		(powernv_pstate_info.wof_enabled) ? "enabled" : "disabled");</div><div class='ctx'> </div><div class='ctx'> 	pstate_ids = of_get_property(power_mgt, "ibm,pstate-ids", &amp;len_ids);</div><div class='ctx'> 	if (!pstate_ids) {</div><div class='hunk'>@@ -264,6 +291,13 @@ static int init_powernv_pstates(void)</div><div class='ctx'> 			powernv_pstate_info.nominal = i;</div><div class='ctx'> 		else if (id == pstate_min)</div><div class='ctx'> 			powernv_pstate_info.min = i;</div><div class='add'>+</div><div class='add'>+		if (powernv_pstate_info.wof_enabled &amp;&amp; id == pstate_turbo) {</div><div class='add'>+			int j;</div><div class='add'>+</div><div class='add'>+			for (j = i - 1; j &gt;= (int)powernv_pstate_info.max; j--)</div><div class='add'>+				powernv_freqs[j].flags = CPUFREQ_BOOST_FREQ;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* End of list marker entry */</div><div class='hunk'>@@ -301,9 +335,12 @@ static ssize_t cpuinfo_nominal_freq_show(struct cpufreq_policy *policy,</div><div class='ctx'> struct freq_attr cpufreq_freq_attr_cpuinfo_nominal_freq =</div><div class='ctx'> 	__ATTR_RO(cpuinfo_nominal_freq);</div><div class='ctx'> </div><div class='add'>+#define SCALING_BOOST_FREQS_ATTR_INDEX		2</div><div class='add'>+</div><div class='ctx'> static struct freq_attr *powernv_cpu_freq_attr[] = {</div><div class='ctx'> 	&amp;cpufreq_freq_attr_scaling_available_freqs,</div><div class='ctx'> 	&amp;cpufreq_freq_attr_cpuinfo_nominal_freq,</div><div class='add'>+	&amp;cpufreq_freq_attr_scaling_boost_freqs,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -592,7 +629,8 @@ void gpstate_timer_handler(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_policy *policy = (struct cpufreq_policy *)data;</div><div class='ctx'> 	struct global_pstate_info *gpstates = policy-&gt;driver_data;</div><div class='del'>-	int gpstate_idx;</div><div class='add'>+	int gpstate_idx, lpstate_idx;</div><div class='add'>+	unsigned long val;</div><div class='ctx'> 	unsigned int time_diff = jiffies_to_msecs(jiffies)</div><div class='ctx'> 					- gpstates-&gt;last_sampled_time;</div><div class='ctx'> 	struct powernv_smp_call_data freq_data;</div><div class='hunk'>@@ -600,21 +638,37 @@ void gpstate_timer_handler(unsigned long data)</div><div class='ctx'> 	if (!spin_trylock(&amp;gpstates-&gt;gpstate_lock))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If PMCR was last updated was using fast_swtich then</div><div class='add'>+	 * We may have wrong in gpstate-&gt;last_lpstate_idx</div><div class='add'>+	 * value. Hence, read from PMCR to get correct data.</div><div class='add'>+	 */</div><div class='add'>+	val = get_pmspr(SPRN_PMCR);</div><div class='add'>+	freq_data.gpstate_id = (s8)GET_GPSTATE(val);</div><div class='add'>+	freq_data.pstate_id = (s8)GET_LPSTATE(val);</div><div class='add'>+	if (freq_data.gpstate_id  == freq_data.pstate_id) {</div><div class='add'>+		reset_gpstates(policy);</div><div class='add'>+		spin_unlock(&amp;gpstates-&gt;gpstate_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	gpstates-&gt;last_sampled_time += time_diff;</div><div class='ctx'> 	gpstates-&gt;elapsed_time += time_diff;</div><div class='del'>-	freq_data.pstate_id = idx_to_pstate(gpstates-&gt;last_lpstate_idx);</div><div class='ctx'> </div><div class='del'>-	if ((gpstates-&gt;last_gpstate_idx == gpstates-&gt;last_lpstate_idx) ||</div><div class='del'>-	    (gpstates-&gt;elapsed_time &gt; MAX_RAMP_DOWN_TIME)) {</div><div class='add'>+	if (gpstates-&gt;elapsed_time &gt; MAX_RAMP_DOWN_TIME) {</div><div class='ctx'> 		gpstate_idx = pstate_to_idx(freq_data.pstate_id);</div><div class='add'>+		lpstate_idx = gpstate_idx;</div><div class='ctx'> 		reset_gpstates(policy);</div><div class='ctx'> 		gpstates-&gt;highest_lpstate_idx = gpstate_idx;</div><div class='ctx'> 	} else {</div><div class='add'>+		lpstate_idx = pstate_to_idx(freq_data.pstate_id);</div><div class='ctx'> 		gpstate_idx = calc_global_pstate(gpstates-&gt;elapsed_time,</div><div class='ctx'> 						 gpstates-&gt;highest_lpstate_idx,</div><div class='del'>-						 gpstates-&gt;last_lpstate_idx);</div><div class='add'>+						 lpstate_idx);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	freq_data.gpstate_id = idx_to_pstate(gpstate_idx);</div><div class='add'>+	gpstates-&gt;last_gpstate_idx = gpstate_idx;</div><div class='add'>+	gpstates-&gt;last_lpstate_idx = lpstate_idx;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If local pstate is equal to global pstate, rampdown is over</div><div class='ctx'> 	 * So timer is not required to be queued.</div><div class='hunk'>@@ -622,10 +676,6 @@ void gpstate_timer_handler(unsigned long data)</div><div class='ctx'> 	if (gpstate_idx != gpstates-&gt;last_lpstate_idx)</div><div class='ctx'> 		queue_gpstate_timer(gpstates);</div><div class='ctx'> </div><div class='del'>-	freq_data.gpstate_id = idx_to_pstate(gpstate_idx);</div><div class='del'>-	gpstates-&gt;last_gpstate_idx = pstate_to_idx(freq_data.gpstate_id);</div><div class='del'>-	gpstates-&gt;last_lpstate_idx = pstate_to_idx(freq_data.pstate_id);</div><div class='del'>-</div><div class='ctx'> 	spin_unlock(&amp;gpstates-&gt;gpstate_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Timer may get migrated to a different cpu on cpu hot unplug */</div><div class='hunk'>@@ -647,8 +697,14 @@ static int powernv_cpufreq_target_index(struct cpufreq_policy *policy,</div><div class='ctx'> 	if (unlikely(rebooting) &amp;&amp; new_index != get_nominal_index())</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!throttled)</div><div class='add'>+	if (!throttled) {</div><div class='add'>+		/* we don't want to be preempted while</div><div class='add'>+		 * checking if the CPU frequency has been throttled</div><div class='add'>+		 */</div><div class='add'>+		preempt_disable();</div><div class='ctx'> 		powernv_cpufreq_throttle_check(NULL);</div><div class='add'>+		preempt_enable();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cur_msec = jiffies_to_msecs(get_jiffies_64());</div><div class='ctx'> </div><div class='hunk'>@@ -752,9 +808,12 @@ static int powernv_cpufreq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	spin_lock_init(&amp;gpstates-&gt;gpstate_lock);</div><div class='ctx'> 	ret = cpufreq_table_validate_and_show(policy, powernv_freqs);</div><div class='ctx'> </div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt; 0) {</div><div class='ctx'> 		kfree(policy-&gt;driver_data);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	policy-&gt;fast_switch_possible = true;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -897,6 +956,20 @@ static void powernv_cpufreq_stop_cpu(struct cpufreq_policy *policy)</div><div class='ctx'> 	del_timer_sync(&amp;gpstates-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int powernv_fast_switch(struct cpufreq_policy *policy,</div><div class='add'>+					unsigned int target_freq)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+	struct powernv_smp_call_data freq_data;</div><div class='add'>+</div><div class='add'>+	index = cpufreq_table_find_index_dl(policy, target_freq);</div><div class='add'>+	freq_data.pstate_id = powernv_freqs[index].driver_data;</div><div class='add'>+	freq_data.gpstate_id = powernv_freqs[index].driver_data;</div><div class='add'>+	set_pstate(&amp;freq_data);</div><div class='add'>+</div><div class='add'>+	return powernv_freqs[index].frequency;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct cpufreq_driver powernv_cpufreq_driver = {</div><div class='ctx'> 	.name		= "powernv-cpufreq",</div><div class='ctx'> 	.flags		= CPUFREQ_CONST_LOOPS,</div><div class='hunk'>@@ -904,6 +977,7 @@ static struct cpufreq_driver powernv_cpufreq_driver = {</div><div class='ctx'> 	.exit		= powernv_cpufreq_cpu_exit,</div><div class='ctx'> 	.verify		= cpufreq_generic_frequency_table_verify,</div><div class='ctx'> 	.target_index	= powernv_cpufreq_target_index,</div><div class='add'>+	.fast_switch	= powernv_fast_switch,</div><div class='ctx'> 	.get		= powernv_cpufreq_get,</div><div class='ctx'> 	.stop_cpu	= powernv_cpufreq_stop_cpu,</div><div class='ctx'> 	.attr		= powernv_cpu_freq_attr,</div><div class='hunk'>@@ -972,11 +1046,22 @@ static int __init powernv_cpufreq_init(void)</div><div class='ctx'> 	register_reboot_notifier(&amp;powernv_cpufreq_reboot_nb);</div><div class='ctx'> 	opal_message_notifier_register(OPAL_MSG_OCC, &amp;powernv_cpufreq_opal_nb);</div><div class='ctx'> </div><div class='add'>+	if (powernv_pstate_info.wof_enabled)</div><div class='add'>+		powernv_cpufreq_driver.boost_enabled = true;</div><div class='add'>+	else</div><div class='add'>+		powernv_cpu_freq_attr[SCALING_BOOST_FREQS_ATTR_INDEX] = NULL;</div><div class='add'>+</div><div class='ctx'> 	rc = cpufreq_register_driver(&amp;powernv_cpufreq_driver);</div><div class='del'>-	if (!rc)</div><div class='del'>-		return 0;</div><div class='add'>+	if (rc) {</div><div class='add'>+		pr_info("Failed to register the cpufreq driver (%d)\n", rc);</div><div class='add'>+		goto cleanup_notifiers;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	pr_info("Failed to register the cpufreq driver (%d)\n", rc);</div><div class='add'>+	if (powernv_pstate_info.wof_enabled)</div><div class='add'>+		cpufreq_enable_boost_support();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+cleanup_notifiers:</div><div class='ctx'> 	unregister_all_notifiers();</div><div class='ctx'> 	clean_chip_info();</div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c<br/>index dc112481a408..eeaa92251512 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/ppc_cbe_cpufreq_pmi.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/ppc_cbe_cpufreq_pmi.c</a></div><div class='hunk'>@@ -100,9 +100,6 @@ static int pmi_notifier(struct notifier_block *nb,</div><div class='ctx'> 	/* Should this really be called for CPUFREQ_ADJUST and CPUFREQ_NOTIFY</div><div class='ctx'> 	 * policy events?)</div><div class='ctx'> 	 */</div><div class='del'>-	if (event == CPUFREQ_START)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	node = cbe_cpu_to_node(policy-&gt;cpu);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("got notified, event=%lu, node=%u\n", event, node);</div><div class='head'>diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c<br/>index 53d8c3fb16f6..bfec1bcd3835 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/qoriq-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/qoriq-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/qoriq-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/qoriq-cpufreq.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/cpu_cooling.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -22,10 +23,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='del'>-#if !defined(CONFIG_ARM)</div><div class='del'>-#include &lt;asm/smp.h&gt;	/* for get_hard_smp_processor_id() in UP configs */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct cpu_data</div><div class='ctx'>  * @pclk: the parent clock of cpu</div><div class='hunk'>@@ -37,53 +34,20 @@ struct cpu_data {</div><div class='ctx'> 	struct thermal_cooling_device *cdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Don't use cpufreq on this SoC -- used when the SoC would have otherwise</div><div class='add'>+ * matched a more generic compatible.</div><div class='add'>+ */</div><div class='add'>+#define SOC_BLACKLIST		1</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct soc_data - SoC specific data</div><div class='del'>- * @freq_mask: mask the disallowed frequencies</div><div class='del'>- * @flag: unique flags</div><div class='add'>+ * @flags: SOC_xxx</div><div class='ctx'>  */</div><div class='ctx'> struct soc_data {</div><div class='del'>-	u32 freq_mask[4];</div><div class='del'>-	u32 flag;</div><div class='add'>+	u32 flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define FREQ_MASK	1</div><div class='del'>-/* see hardware specification for the allowed frqeuencies */</div><div class='del'>-static const struct soc_data sdata[] = {</div><div class='del'>-	{ /* used by p2041 and p3041 */</div><div class='del'>-		.freq_mask = {0x8, 0x8, 0x2, 0x2},</div><div class='del'>-		.flag = FREQ_MASK,</div><div class='del'>-	},</div><div class='del'>-	{ /* used by p5020 */</div><div class='del'>-		.freq_mask = {0x8, 0x2},</div><div class='del'>-		.flag = FREQ_MASK,</div><div class='del'>-	},</div><div class='del'>-	{ /* used by p4080, p5040 */</div><div class='del'>-		.freq_mask = {0},</div><div class='del'>-		.flag = 0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * the minimum allowed core frequency, in Hz</div><div class='del'>- * for chassis v1.0, &gt;= platform frequency</div><div class='del'>- * for chassis v2.0, &gt;= platform frequency / 2</div><div class='del'>- */</div><div class='del'>-static u32 min_cpufreq;</div><div class='del'>-static const u32 *fmask;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_ARM)</div><div class='del'>-static int get_cpu_physical_id(int cpu)</div><div class='del'>-{</div><div class='del'>-	return topology_core_id(cpu);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static int get_cpu_physical_id(int cpu)</div><div class='del'>-{</div><div class='del'>-	return get_hard_smp_processor_id(cpu);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static u32 get_bus_freq(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *soc;</div><div class='hunk'>@@ -101,9 +65,10 @@ static u32 get_bus_freq(void)</div><div class='ctx'> 	return sysfreq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device_node *cpu_to_clk_node(int cpu)</div><div class='add'>+static struct clk *cpu_to_clk(int cpu)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np, *clk_np;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct clk *clk;</div><div class='ctx'> </div><div class='ctx'> 	if (!cpu_present(cpu))</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -112,37 +77,28 @@ static struct device_node *cpu_to_clk_node(int cpu)</div><div class='ctx'> 	if (!np)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	clk_np = of_parse_phandle(np, "clocks", 0);</div><div class='del'>-	if (!clk_np)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='add'>+	clk = of_clk_get(np, 0);</div><div class='ctx'> 	of_node_put(np);</div><div class='del'>-</div><div class='del'>-	return clk_np;</div><div class='add'>+	return clk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* traverse cpu nodes to get cpu mask of sharing clock wire */</div><div class='ctx'> static void set_affected_cpus(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np, *clk_np;</div><div class='ctx'> 	struct cpumask *dstp = policy-&gt;cpus;</div><div class='add'>+	struct clk *clk;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	np = cpu_to_clk_node(policy-&gt;cpu);</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	for_each_present_cpu(i) {</div><div class='del'>-		clk_np = cpu_to_clk_node(i);</div><div class='del'>-		if (!clk_np)</div><div class='add'>+		clk = cpu_to_clk(i);</div><div class='add'>+		if (IS_ERR(clk)) {</div><div class='add'>+			pr_err("%s: no clock for cpu %d\n", __func__, i);</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (clk_np == np)</div><div class='add'>+		if (clk_is_match(policy-&gt;clk, clk))</div><div class='ctx'> 			cpumask_set_cpu(i, dstp);</div><div class='del'>-</div><div class='del'>-		of_node_put(clk_np);</div><div class='ctx'> 	}</div><div class='del'>-	of_node_put(np);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* reduce the duplicated frequencies in frequency table */</div><div class='hunk'>@@ -198,10 +154,11 @@ static void freq_table_sort(struct cpufreq_frequency_table *freq_table,</div><div class='ctx'> </div><div class='ctx'> static int qoriq_cpufreq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np, *pnode;</div><div class='add'>+	struct device_node *np;</div><div class='ctx'> 	int i, count, ret;</div><div class='del'>-	u32 freq, mask;</div><div class='add'>+	u32 freq;</div><div class='ctx'> 	struct clk *clk;</div><div class='add'>+	const struct clk_hw *hwclk;</div><div class='ctx'> 	struct cpufreq_frequency_table *table;</div><div class='ctx'> 	struct cpu_data *data;</div><div class='ctx'> 	unsigned int cpu = policy-&gt;cpu;</div><div class='hunk'>@@ -221,17 +178,13 @@ static int qoriq_cpufreq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 		goto err_nomem2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pnode = of_parse_phandle(np, "clocks", 0);</div><div class='del'>-	if (!pnode) {</div><div class='del'>-		pr_err("%s: could not get clock information\n", __func__);</div><div class='del'>-		goto err_nomem2;</div><div class='del'>-	}</div><div class='add'>+	hwclk = __clk_get_hw(policy-&gt;clk);</div><div class='add'>+	count = clk_hw_get_num_parents(hwclk);</div><div class='ctx'> </div><div class='del'>-	count = of_property_count_strings(pnode, "clock-names");</div><div class='ctx'> 	data-&gt;pclk = kcalloc(count, sizeof(struct clk *), GFP_KERNEL);</div><div class='ctx'> 	if (!data-&gt;pclk) {</div><div class='ctx'> 		pr_err("%s: no memory\n", __func__);</div><div class='del'>-		goto err_node;</div><div class='add'>+		goto err_nomem2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	table = kcalloc(count + 1, sizeof(*table), GFP_KERNEL);</div><div class='hunk'>@@ -240,23 +193,11 @@ static int qoriq_cpufreq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 		goto err_pclk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fmask)</div><div class='del'>-		mask = fmask[get_cpu_physical_id(cpu)];</div><div class='del'>-	else</div><div class='del'>-		mask = 0x0;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		clk = of_clk_get(pnode, i);</div><div class='add'>+		clk = clk_hw_get_parent_by_index(hwclk, i)-&gt;clk;</div><div class='ctx'> 		data-&gt;pclk[i] = clk;</div><div class='ctx'> 		freq = clk_get_rate(clk);</div><div class='del'>-		/*</div><div class='del'>-		 * the clock is valid if its frequency is not masked</div><div class='del'>-		 * and large than minimum allowed frequency.</div><div class='del'>-		 */</div><div class='del'>-		if (freq &lt; min_cpufreq || (mask &amp; (1 &lt;&lt; i)))</div><div class='del'>-			table[i].frequency = CPUFREQ_ENTRY_INVALID;</div><div class='del'>-		else</div><div class='del'>-			table[i].frequency = freq / 1000;</div><div class='add'>+		table[i].frequency = freq / 1000;</div><div class='ctx'> 		table[i].driver_data = i;</div><div class='ctx'> 	}</div><div class='ctx'> 	freq_table_redup(table, count);</div><div class='hunk'>@@ -282,7 +223,6 @@ static int qoriq_cpufreq_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	policy-&gt;cpuinfo.transition_latency = u64temp + 1;</div><div class='ctx'> </div><div class='ctx'> 	of_node_put(np);</div><div class='del'>-	of_node_put(pnode);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -290,10 +230,7 @@ err_nomem1:</div><div class='ctx'> 	kfree(table);</div><div class='ctx'> err_pclk:</div><div class='ctx'> 	kfree(data-&gt;pclk);</div><div class='del'>-err_node:</div><div class='del'>-	of_node_put(pnode);</div><div class='ctx'> err_nomem2:</div><div class='del'>-	policy-&gt;driver_data = NULL;</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> err_np:</div><div class='ctx'> 	of_node_put(np);</div><div class='hunk'>@@ -357,12 +294,25 @@ static struct cpufreq_driver qoriq_cpufreq_driver = {</div><div class='ctx'> 	.attr		= cpufreq_generic_attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct soc_data blacklist = {</div><div class='add'>+	.flags = SOC_BLACKLIST,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id node_matches[] __initconst = {</div><div class='del'>-	{ .compatible = "fsl,p2041-clockgen", .data = &amp;sdata[0], },</div><div class='del'>-	{ .compatible = "fsl,p3041-clockgen", .data = &amp;sdata[0], },</div><div class='del'>-	{ .compatible = "fsl,p5020-clockgen", .data = &amp;sdata[1], },</div><div class='del'>-	{ .compatible = "fsl,p4080-clockgen", .data = &amp;sdata[2], },</div><div class='del'>-	{ .compatible = "fsl,p5040-clockgen", .data = &amp;sdata[2], },</div><div class='add'>+	/* e6500 cannot use cpufreq due to erratum A-008083 */</div><div class='add'>+	{ .compatible = "fsl,b4420-clockgen", &amp;blacklist },</div><div class='add'>+	{ .compatible = "fsl,b4860-clockgen", &amp;blacklist },</div><div class='add'>+	{ .compatible = "fsl,t2080-clockgen", &amp;blacklist },</div><div class='add'>+	{ .compatible = "fsl,t4240-clockgen", &amp;blacklist },</div><div class='add'>+</div><div class='add'>+	{ .compatible = "fsl,ls1012a-clockgen", },</div><div class='add'>+	{ .compatible = "fsl,ls1021a-clockgen", },</div><div class='add'>+	{ .compatible = "fsl,ls1043a-clockgen", },</div><div class='add'>+	{ .compatible = "fsl,ls1046a-clockgen", },</div><div class='add'>+	{ .compatible = "fsl,ls1088a-clockgen", },</div><div class='add'>+	{ .compatible = "fsl,ls2080a-clockgen", },</div><div class='add'>+	{ .compatible = "fsl,p4080-clockgen", },</div><div class='add'>+	{ .compatible = "fsl,qoriq-clockgen-1.0", },</div><div class='ctx'> 	{ .compatible = "fsl,qoriq-clockgen-2.0", },</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='hunk'>@@ -380,16 +330,12 @@ static int __init qoriq_cpufreq_init(void)</div><div class='ctx'> </div><div class='ctx'> 	match = of_match_node(node_matches, np);</div><div class='ctx'> 	data = match-&gt;data;</div><div class='del'>-	if (data) {</div><div class='del'>-		if (data-&gt;flag)</div><div class='del'>-			fmask = data-&gt;freq_mask;</div><div class='del'>-		min_cpufreq = get_bus_freq();</div><div class='del'>-	} else {</div><div class='del'>-		min_cpufreq = get_bus_freq() / 2;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	of_node_put(np);</div><div class='ctx'> </div><div class='add'>+	if (data &amp;&amp; data-&gt;flags &amp; SOC_BLACKLIST)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	ret = cpufreq_register_driver(&amp;qoriq_cpufreq_driver);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		pr_info("Freescale QorIQ CPU frequency scaling driver\n");</div><div class='head'>diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c<br/>index d6d425773fa4..5b2db3c6568f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/s3c2416-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/s3c2416-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/s3c2416-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/s3c2416-cpufreq.c</a></div><div class='hunk'>@@ -400,7 +400,6 @@ static int s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	rate = clk_get_rate(s3c_freq-&gt;hclk);</div><div class='ctx'> 	if (rate &lt; 133 * 1000 * 1000) {</div><div class='ctx'> 		pr_err("cpufreq: HCLK not at 133MHz\n");</div><div class='del'>-		clk_put(s3c_freq-&gt;hclk);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto err_armclk;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c<br/>index 176e84cc3991..0cb9040eca49 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/s3c64xx-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/s3c64xx-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/s3c64xx-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/s3c64xx-cpufreq.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_REGULATOR</div><div class='del'>-static void __init s3c64xx_cpufreq_config_regulator(void)</div><div class='add'>+static void s3c64xx_cpufreq_config_regulator(void)</div><div class='ctx'> {</div><div class='ctx'> 	int count, v, i, found;</div><div class='ctx'> 	struct cpufreq_frequency_table *freq;</div><div class='head'>diff --git a/drivers/cpufreq/sparc-us2e-cpufreq.c b/drivers/cpufreq/sparc-us2e-cpufreq.c<br/>index b73feeb666f9..35ddb6da93aa 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/sparc-us2e-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/sparc-us2e-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/sparc-us2e-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/sparc-us2e-cpufreq.c</a></div><div class='hunk'>@@ -234,7 +234,7 @@ static unsigned int us2e_freq_get(unsigned int cpu)</div><div class='ctx'> 	cpumask_t cpus_allowed;</div><div class='ctx'> 	unsigned long clock_tick, estar;</div><div class='ctx'> </div><div class='del'>-	cpumask_copy(&amp;cpus_allowed, tsk_cpus_allowed(current));</div><div class='add'>+	cpumask_copy(&amp;cpus_allowed, &amp;current-&gt;cpus_allowed);</div><div class='ctx'> 	set_cpus_allowed_ptr(current, cpumask_of(cpu));</div><div class='ctx'> </div><div class='ctx'> 	clock_tick = sparc64_get_clock_tick(cpu) / 1000;</div><div class='hunk'>@@ -252,7 +252,7 @@ static int us2e_freq_target(struct cpufreq_policy *policy, unsigned int index)</div><div class='ctx'> 	unsigned long clock_tick, divisor, old_divisor, estar;</div><div class='ctx'> 	cpumask_t cpus_allowed;</div><div class='ctx'> </div><div class='del'>-	cpumask_copy(&amp;cpus_allowed, tsk_cpus_allowed(current));</div><div class='add'>+	cpumask_copy(&amp;cpus_allowed, &amp;current-&gt;cpus_allowed);</div><div class='ctx'> 	set_cpus_allowed_ptr(current, cpumask_of(cpu));</div><div class='ctx'> </div><div class='ctx'> 	new_freq = clock_tick = sparc64_get_clock_tick(cpu) / 1000;</div><div class='head'>diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c<br/>index 9bb42ba50efa..a8d86a449ca1 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/sparc-us3-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/sparc-us3-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/sparc-us3-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/sparc-us3-cpufreq.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ static unsigned int us3_freq_get(unsigned int cpu)</div><div class='ctx'> 	unsigned long reg;</div><div class='ctx'> 	unsigned int ret;</div><div class='ctx'> </div><div class='del'>-	cpumask_copy(&amp;cpus_allowed, tsk_cpus_allowed(current));</div><div class='add'>+	cpumask_copy(&amp;cpus_allowed, &amp;current-&gt;cpus_allowed);</div><div class='ctx'> 	set_cpus_allowed_ptr(current, cpumask_of(cpu));</div><div class='ctx'> </div><div class='ctx'> 	reg = read_safari_cfg();</div><div class='hunk'>@@ -99,7 +99,7 @@ static int us3_freq_target(struct cpufreq_policy *policy, unsigned int index)</div><div class='ctx'> 	unsigned long new_bits, new_freq, reg;</div><div class='ctx'> 	cpumask_t cpus_allowed;</div><div class='ctx'> </div><div class='del'>-	cpumask_copy(&amp;cpus_allowed, tsk_cpus_allowed(current));</div><div class='add'>+	cpumask_copy(&amp;cpus_allowed, &amp;current-&gt;cpus_allowed);</div><div class='ctx'> 	set_cpus_allowed_ptr(current, cpumask_of(cpu));</div><div class='ctx'> </div><div class='ctx'> 	new_freq = sparc64_get_clock_tick(cpu) / 1000;</div><div class='head'>diff --git a/drivers/cpufreq/sti-cpufreq.c b/drivers/cpufreq/sti-cpufreq.c<br/>index b366e6d830ea..a7db9011d5fe 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpufreq/sti-cpufreq.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpufreq/sti-cpufreq.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/sti-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/sti-cpufreq.c</a></div><div class='hunk'>@@ -160,6 +160,7 @@ static int sti_cpufreq_set_opp_info(void)</div><div class='ctx'> 	int pcode, substrate, major, minor;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	char name[MAX_PCODE_NAME_LEN];</div><div class='add'>+	struct opp_table *opp_table;</div><div class='ctx'> </div><div class='ctx'> 	reg_fields = sti_cpufreq_match();</div><div class='ctx'> 	if (!reg_fields) {</div><div class='hunk'>@@ -211,20 +212,20 @@ use_defaults:</div><div class='ctx'> </div><div class='ctx'> 	snprintf(name, MAX_PCODE_NAME_LEN, "pcode%d", pcode);</div><div class='ctx'> </div><div class='del'>-	ret = dev_pm_opp_set_prop_name(dev, name);</div><div class='del'>-	if (ret) {</div><div class='add'>+	opp_table = dev_pm_opp_set_prop_name(dev, name);</div><div class='add'>+	if (IS_ERR(opp_table)) {</div><div class='ctx'> 		dev_err(dev, "Failed to set prop name\n");</div><div class='del'>-		return ret;</div><div class='add'>+		return PTR_ERR(opp_table);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	version[0] = BIT(major);</div><div class='ctx'> 	version[1] = BIT(minor);</div><div class='ctx'> 	version[2] = BIT(substrate);</div><div class='ctx'> </div><div class='del'>-	ret = dev_pm_opp_set_supported_hw(dev, version, VERSION_ELEMENTS);</div><div class='del'>-	if (ret) {</div><div class='add'>+	opp_table = dev_pm_opp_set_supported_hw(dev, version, VERSION_ELEMENTS);</div><div class='add'>+	if (IS_ERR(opp_table)) {</div><div class='ctx'> 		dev_err(dev, "Failed to set supported hardware\n");</div><div class='del'>-		return ret;</div><div class='add'>+		return PTR_ERR(opp_table);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "pcode: %d major: %d minor: %d substrate: %d\n",</div><div class='head'>diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c<br/>new file mode 100644<br/>index 000000000000..a7b5658c0460<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/cpufreq/ti-cpufreq.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpufreq/ti-cpufreq.c</a></div><div class='hunk'>@@ -0,0 +1,268 @@</div><div class='add'>+/*</div><div class='add'>+ * TI CPUFreq/OPP hw-supported driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016-2017 Texas Instruments, Inc.</div><div class='add'>+ *	 Dave Gerlach &lt;d-gerlach@ti.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mfd/syscon.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/pm_opp.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#define REVISION_MASK				0xF</div><div class='add'>+#define REVISION_SHIFT				28</div><div class='add'>+</div><div class='add'>+#define AM33XX_800M_ARM_MPU_MAX_FREQ		0x1E2F</div><div class='add'>+#define AM43XX_600M_ARM_MPU_MAX_FREQ		0xFFA</div><div class='add'>+</div><div class='add'>+#define DRA7_EFUSE_HAS_OD_MPU_OPP		11</div><div class='add'>+#define DRA7_EFUSE_HAS_HIGH_MPU_OPP		15</div><div class='add'>+#define DRA7_EFUSE_HAS_ALL_MPU_OPP		23</div><div class='add'>+</div><div class='add'>+#define DRA7_EFUSE_NOM_MPU_OPP			BIT(0)</div><div class='add'>+#define DRA7_EFUSE_OD_MPU_OPP			BIT(1)</div><div class='add'>+#define DRA7_EFUSE_HIGH_MPU_OPP			BIT(2)</div><div class='add'>+</div><div class='add'>+#define VERSION_COUNT				2</div><div class='add'>+</div><div class='add'>+struct ti_cpufreq_data;</div><div class='add'>+</div><div class='add'>+struct ti_cpufreq_soc_data {</div><div class='add'>+	unsigned long (*efuse_xlate)(struct ti_cpufreq_data *opp_data,</div><div class='add'>+				     unsigned long efuse);</div><div class='add'>+	unsigned long efuse_fallback;</div><div class='add'>+	unsigned long efuse_offset;</div><div class='add'>+	unsigned long efuse_mask;</div><div class='add'>+	unsigned long efuse_shift;</div><div class='add'>+	unsigned long rev_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ti_cpufreq_data {</div><div class='add'>+	struct device *cpu_dev;</div><div class='add'>+	struct device_node *opp_node;</div><div class='add'>+	struct regmap *syscon;</div><div class='add'>+	const struct ti_cpufreq_soc_data *soc_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long amx3_efuse_xlate(struct ti_cpufreq_data *opp_data,</div><div class='add'>+				      unsigned long efuse)</div><div class='add'>+{</div><div class='add'>+	if (!efuse)</div><div class='add'>+		efuse = opp_data-&gt;soc_data-&gt;efuse_fallback;</div><div class='add'>+	/* AM335x and AM437x use "OPP disable" bits, so invert */</div><div class='add'>+	return ~efuse;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long dra7_efuse_xlate(struct ti_cpufreq_data *opp_data,</div><div class='add'>+				      unsigned long efuse)</div><div class='add'>+{</div><div class='add'>+	unsigned long calculated_efuse = DRA7_EFUSE_NOM_MPU_OPP;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The efuse on dra7 and am57 parts contains a specific</div><div class='add'>+	 * value indicating the highest available OPP.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (efuse) {</div><div class='add'>+	case DRA7_EFUSE_HAS_ALL_MPU_OPP:</div><div class='add'>+	case DRA7_EFUSE_HAS_HIGH_MPU_OPP:</div><div class='add'>+		calculated_efuse |= DRA7_EFUSE_HIGH_MPU_OPP;</div><div class='add'>+	case DRA7_EFUSE_HAS_OD_MPU_OPP:</div><div class='add'>+		calculated_efuse |= DRA7_EFUSE_OD_MPU_OPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return calculated_efuse;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ti_cpufreq_soc_data am3x_soc_data = {</div><div class='add'>+	.efuse_xlate = amx3_efuse_xlate,</div><div class='add'>+	.efuse_fallback = AM33XX_800M_ARM_MPU_MAX_FREQ,</div><div class='add'>+	.efuse_offset = 0x07fc,</div><div class='add'>+	.efuse_mask = 0x1fff,</div><div class='add'>+	.rev_offset = 0x600,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ti_cpufreq_soc_data am4x_soc_data = {</div><div class='add'>+	.efuse_xlate = amx3_efuse_xlate,</div><div class='add'>+	.efuse_fallback = AM43XX_600M_ARM_MPU_MAX_FREQ,</div><div class='add'>+	.efuse_offset = 0x0610,</div><div class='add'>+	.efuse_mask = 0x3f,</div><div class='add'>+	.rev_offset = 0x600,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ti_cpufreq_soc_data dra7_soc_data = {</div><div class='add'>+	.efuse_xlate = dra7_efuse_xlate,</div><div class='add'>+	.efuse_offset = 0x020c,</div><div class='add'>+	.efuse_mask = 0xf80000,</div><div class='add'>+	.efuse_shift = 19,</div><div class='add'>+	.rev_offset = 0x204,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ti_cpufreq_get_efuse() - Parse and return efuse value present on SoC</div><div class='add'>+ * @opp_data: pointer to ti_cpufreq_data context</div><div class='add'>+ * @efuse_value: Set to the value parsed from efuse</div><div class='add'>+ *</div><div class='add'>+ * Returns error code if efuse not read properly.</div><div class='add'>+ */</div><div class='add'>+static int ti_cpufreq_get_efuse(struct ti_cpufreq_data *opp_data,</div><div class='add'>+				u32 *efuse_value)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = opp_data-&gt;cpu_dev;</div><div class='add'>+	u32 efuse;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(opp_data-&gt;syscon, opp_data-&gt;soc_data-&gt;efuse_offset,</div><div class='add'>+			  &amp;efuse);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"Failed to read the efuse value from syscon: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	efuse = (efuse &amp; opp_data-&gt;soc_data-&gt;efuse_mask);</div><div class='add'>+	efuse &gt;&gt;= opp_data-&gt;soc_data-&gt;efuse_shift;</div><div class='add'>+</div><div class='add'>+	*efuse_value = opp_data-&gt;soc_data-&gt;efuse_xlate(opp_data, efuse);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ti_cpufreq_get_rev() - Parse and return rev value present on SoC</div><div class='add'>+ * @opp_data: pointer to ti_cpufreq_data context</div><div class='add'>+ * @revision_value: Set to the value parsed from revision register</div><div class='add'>+ *</div><div class='add'>+ * Returns error code if revision not read properly.</div><div class='add'>+ */</div><div class='add'>+static int ti_cpufreq_get_rev(struct ti_cpufreq_data *opp_data,</div><div class='add'>+			      u32 *revision_value)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = opp_data-&gt;cpu_dev;</div><div class='add'>+	u32 revision;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(opp_data-&gt;syscon, opp_data-&gt;soc_data-&gt;rev_offset,</div><div class='add'>+			  &amp;revision);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"Failed to read the revision number from syscon: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*revision_value = BIT((revision &gt;&gt; REVISION_SHIFT) &amp; REVISION_MASK);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ti_cpufreq_setup_syscon_register(struct ti_cpufreq_data *opp_data)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = opp_data-&gt;cpu_dev;</div><div class='add'>+	struct device_node *np = opp_data-&gt;opp_node;</div><div class='add'>+</div><div class='add'>+	opp_data-&gt;syscon = syscon_regmap_lookup_by_phandle(np,</div><div class='add'>+							"syscon");</div><div class='add'>+	if (IS_ERR(opp_data-&gt;syscon)) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"\"syscon\" is missing, cannot use OPPv2 table.\n");</div><div class='add'>+		return PTR_ERR(opp_data-&gt;syscon);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ti_cpufreq_of_match[] = {</div><div class='add'>+	{ .compatible = "ti,am33xx", .data = &amp;am3x_soc_data, },</div><div class='add'>+	{ .compatible = "ti,am4372", .data = &amp;am4x_soc_data, },</div><div class='add'>+	{ .compatible = "ti,dra7", .data = &amp;dra7_soc_data },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ti_cpufreq_init(void)</div><div class='add'>+{</div><div class='add'>+	u32 version[VERSION_COUNT];</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	const struct of_device_id *match;</div><div class='add'>+	struct ti_cpufreq_data *opp_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	np = of_find_node_by_path("/");</div><div class='add'>+	match = of_match_node(ti_cpufreq_of_match, np);</div><div class='add'>+	if (!match)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	opp_data = kzalloc(sizeof(*opp_data), GFP_KERNEL);</div><div class='add'>+	if (!opp_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	opp_data-&gt;soc_data = match-&gt;data;</div><div class='add'>+</div><div class='add'>+	opp_data-&gt;cpu_dev = get_cpu_device(0);</div><div class='add'>+	if (!opp_data-&gt;cpu_dev) {</div><div class='add'>+		pr_err("%s: Failed to get device for CPU0\n", __func__);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opp_data-&gt;opp_node = dev_pm_opp_of_get_opp_desc_node(opp_data-&gt;cpu_dev);</div><div class='add'>+	if (!opp_data-&gt;opp_node) {</div><div class='add'>+		dev_info(opp_data-&gt;cpu_dev,</div><div class='add'>+			 "OPP-v2 not supported, cpufreq-dt will attempt to use legacy tables.\n");</div><div class='add'>+		goto register_cpufreq_dt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ti_cpufreq_setup_syscon_register(opp_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail_put_node;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * OPPs determine whether or not they are supported based on</div><div class='add'>+	 * two metrics:</div><div class='add'>+	 *	0 - SoC Revision</div><div class='add'>+	 *	1 - eFuse value</div><div class='add'>+	 */</div><div class='add'>+	ret = ti_cpufreq_get_rev(opp_data, &amp;version[0]);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail_put_node;</div><div class='add'>+</div><div class='add'>+	ret = ti_cpufreq_get_efuse(opp_data, &amp;version[1]);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail_put_node;</div><div class='add'>+</div><div class='add'>+	of_node_put(opp_data-&gt;opp_node);</div><div class='add'>+</div><div class='add'>+	ret = PTR_ERR_OR_ZERO(dev_pm_opp_set_supported_hw(opp_data-&gt;cpu_dev,</div><div class='add'>+							  version, VERSION_COUNT));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(opp_data-&gt;cpu_dev,</div><div class='add'>+			"Failed to set supported hardware\n");</div><div class='add'>+		goto fail_put_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+register_cpufreq_dt:</div><div class='add'>+	platform_device_register_simple("cpufreq-dt", -1, NULL, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_put_node:</div><div class='add'>+	of_node_put(opp_data-&gt;opp_node);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+device_initcall(ti_cpufreq_init);</div><div class='head'>diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c<br/>index 7fe442ca38f4..370593006f5f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpuidle/cpuidle-powernv.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpuidle/cpuidle-powernv.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpuidle/cpuidle-powernv.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/cpuidle-powernv.c</a></div><div class='hunk'>@@ -19,10 +19,15 @@</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='ctx'> #include &lt;asm/opal.h&gt;</div><div class='ctx'> #include &lt;asm/runlatch.h&gt;</div><div class='add'>+#include &lt;asm/cpuidle.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Expose only those Hardware idle states via the cpuidle framework</div><div class='add'>+ * that have latency value below POWERNV_THRESHOLD_LATENCY_NS.</div><div class='add'>+ */</div><div class='ctx'> #define POWERNV_THRESHOLD_LATENCY_NS 200000</div><div class='ctx'> </div><div class='del'>-struct cpuidle_driver powernv_idle_driver = {</div><div class='add'>+static struct cpuidle_driver powernv_idle_driver = {</div><div class='ctx'> 	.name             = "powernv_idle",</div><div class='ctx'> 	.owner            = THIS_MODULE,</div><div class='ctx'> };</div><div class='hunk'>@@ -30,7 +35,12 @@ struct cpuidle_driver powernv_idle_driver = {</div><div class='ctx'> static int max_idle_state;</div><div class='ctx'> static struct cpuidle_state *cpuidle_state_table;</div><div class='ctx'> </div><div class='del'>-static u64 stop_psscr_table[CPUIDLE_STATE_MAX];</div><div class='add'>+struct stop_psscr_table {</div><div class='add'>+	u64 val;</div><div class='add'>+	u64 mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct stop_psscr_table stop_psscr_table[CPUIDLE_STATE_MAX];</div><div class='ctx'> </div><div class='ctx'> static u64 snooze_timeout;</div><div class='ctx'> static bool snooze_timeout_en;</div><div class='hunk'>@@ -102,7 +112,8 @@ static int stop_loop(struct cpuidle_device *dev,</div><div class='ctx'> 		     int index)</div><div class='ctx'> {</div><div class='ctx'> 	ppc64_runlatch_off();</div><div class='del'>-	power9_idle_stop(stop_psscr_table[index]);</div><div class='add'>+	power9_idle_stop(stop_psscr_table[index].val,</div><div class='add'>+			 stop_psscr_table[index].mask);</div><div class='ctx'> 	ppc64_runlatch_on();</div><div class='ctx'> 	return index;</div><div class='ctx'> }</div><div class='hunk'>@@ -167,6 +178,25 @@ static int powernv_cpuidle_driver_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void add_powernv_state(int index, const char *name,</div><div class='add'>+				     unsigned int flags,</div><div class='add'>+				     int (*idle_fn)(struct cpuidle_device *,</div><div class='add'>+						    struct cpuidle_driver *,</div><div class='add'>+						    int),</div><div class='add'>+				     unsigned int target_residency,</div><div class='add'>+				     unsigned int exit_latency,</div><div class='add'>+				     u64 psscr_val, u64 psscr_mask)</div><div class='add'>+{</div><div class='add'>+	strlcpy(powernv_states[index].name, name, CPUIDLE_NAME_LEN);</div><div class='add'>+	strlcpy(powernv_states[index].desc, name, CPUIDLE_NAME_LEN);</div><div class='add'>+	powernv_states[index].flags = flags;</div><div class='add'>+	powernv_states[index].target_residency = target_residency;</div><div class='add'>+	powernv_states[index].exit_latency = exit_latency;</div><div class='add'>+	powernv_states[index].enter = idle_fn;</div><div class='add'>+	stop_psscr_table[index].val = psscr_val;</div><div class='add'>+	stop_psscr_table[index].mask = psscr_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int powernv_add_idle_states(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *power_mgt;</div><div class='hunk'>@@ -176,7 +206,9 @@ static int powernv_add_idle_states(void)</div><div class='ctx'> 	u32 residency_ns[CPUIDLE_STATE_MAX];</div><div class='ctx'> 	u32 flags[CPUIDLE_STATE_MAX];</div><div class='ctx'> 	u64 psscr_val[CPUIDLE_STATE_MAX];</div><div class='add'>+	u64 psscr_mask[CPUIDLE_STATE_MAX];</div><div class='ctx'> 	const char *names[CPUIDLE_STATE_MAX];</div><div class='add'>+	u32 has_stop_states = 0;</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Currently we have snooze statically defined */</div><div class='hunk'>@@ -223,19 +255,30 @@ static int powernv_add_idle_states(void)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the idle states use stop instruction, probe for psscr values</div><div class='del'>-	 * which are necessary to specify required stop level.</div><div class='add'>+	 * and psscr mask which are necessary to specify required stop level.</div><div class='ctx'> 	 */</div><div class='del'>-	if (flags[0] &amp; (OPAL_PM_STOP_INST_FAST | OPAL_PM_STOP_INST_DEEP))</div><div class='add'>+	has_stop_states = (flags[0] &amp;</div><div class='add'>+			   (OPAL_PM_STOP_INST_FAST | OPAL_PM_STOP_INST_DEEP));</div><div class='add'>+	if (has_stop_states) {</div><div class='ctx'> 		if (of_property_read_u64_array(power_mgt,</div><div class='ctx'> 		    "ibm,cpu-idle-state-psscr", psscr_val, dt_idle_states)) {</div><div class='del'>-			pr_warn("cpuidle-powernv: missing ibm,cpu-idle-states-psscr in DT\n");</div><div class='add'>+			pr_warn("cpuidle-powernv: missing ibm,cpu-idle-state-psscr in DT\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (of_property_read_u64_array(power_mgt,</div><div class='add'>+					       "ibm,cpu-idle-state-psscr-mask",</div><div class='add'>+						psscr_mask, dt_idle_states)) {</div><div class='add'>+			pr_warn("cpuidle-powernv:Missing ibm,cpu-idle-state-psscr-mask in DT\n");</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rc = of_property_read_u32_array(power_mgt,</div><div class='ctx'> 		"ibm,cpu-idle-state-residency-ns", residency_ns, dt_idle_states);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dt_idle_states; i++) {</div><div class='add'>+		unsigned int exit_latency, target_residency;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If an idle state has exit latency beyond</div><div class='ctx'> 		 * POWERNV_THRESHOLD_LATENCY_NS then don't use it</div><div class='hunk'>@@ -243,28 +286,43 @@ static int powernv_add_idle_states(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (latency_ns[i] &gt; POWERNV_THRESHOLD_LATENCY_NS)</div><div class='ctx'> 			continue;</div><div class='add'>+		/*</div><div class='add'>+		 * Firmware passes residency and latency values in ns.</div><div class='add'>+		 * cpuidle expects it in us.</div><div class='add'>+		 */</div><div class='add'>+		exit_latency = latency_ns[i] / 1000;</div><div class='add'>+		if (!rc)</div><div class='add'>+			target_residency = residency_ns[i] / 1000;</div><div class='add'>+		else</div><div class='add'>+			target_residency = 0;</div><div class='add'>+</div><div class='add'>+		if (has_stop_states) {</div><div class='add'>+			int err = validate_psscr_val_mask(&amp;psscr_val[i],</div><div class='add'>+							  &amp;psscr_mask[i],</div><div class='add'>+							  flags[i]);</div><div class='add'>+			if (err) {</div><div class='add'>+				report_invalid_psscr_val(psscr_val[i], err);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Cpuidle accepts exit_latency and target_residency in us.</div><div class='del'>-		 * Use default target_residency values if f/w does not expose it.</div><div class='add'>+		 * For nap and fastsleep, use default target_residency</div><div class='add'>+		 * values if f/w does not expose it.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (flags[i] &amp; OPAL_PM_NAP_ENABLED) {</div><div class='add'>+			if (!rc)</div><div class='add'>+				target_residency = 100;</div><div class='ctx'> 			/* Add NAP state */</div><div class='del'>-			strcpy(powernv_states[nr_idle_states].name, "Nap");</div><div class='del'>-			strcpy(powernv_states[nr_idle_states].desc, "Nap");</div><div class='del'>-			powernv_states[nr_idle_states].flags = 0;</div><div class='del'>-			powernv_states[nr_idle_states].target_residency = 100;</div><div class='del'>-			powernv_states[nr_idle_states].enter = nap_loop;</div><div class='add'>+			add_powernv_state(nr_idle_states, "Nap",</div><div class='add'>+					  CPUIDLE_FLAG_NONE, nap_loop,</div><div class='add'>+					  target_residency, exit_latency, 0, 0);</div><div class='ctx'> 		} else if ((flags[i] &amp; OPAL_PM_STOP_INST_FAST) &amp;&amp;</div><div class='ctx'> 				!(flags[i] &amp; OPAL_PM_TIMEBASE_STOP)) {</div><div class='del'>-			strncpy(powernv_states[nr_idle_states].name,</div><div class='del'>-				names[i], CPUIDLE_NAME_LEN);</div><div class='del'>-			strncpy(powernv_states[nr_idle_states].desc,</div><div class='del'>-				names[i], CPUIDLE_NAME_LEN);</div><div class='del'>-			powernv_states[nr_idle_states].flags = 0;</div><div class='del'>-</div><div class='del'>-			powernv_states[nr_idle_states].enter = stop_loop;</div><div class='del'>-			stop_psscr_table[nr_idle_states] = psscr_val[i];</div><div class='add'>+			add_powernv_state(nr_idle_states, names[i],</div><div class='add'>+					  CPUIDLE_FLAG_NONE, stop_loop,</div><div class='add'>+					  target_residency, exit_latency,</div><div class='add'>+					  psscr_val[i], psscr_mask[i]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -274,32 +332,21 @@ static int powernv_add_idle_states(void)</div><div class='ctx'> #ifdef CONFIG_TICK_ONESHOT</div><div class='ctx'> 		if (flags[i] &amp; OPAL_PM_SLEEP_ENABLED ||</div><div class='ctx'> 			flags[i] &amp; OPAL_PM_SLEEP_ENABLED_ER1) {</div><div class='add'>+			if (!rc)</div><div class='add'>+				target_residency = 300000;</div><div class='ctx'> 			/* Add FASTSLEEP state */</div><div class='del'>-			strcpy(powernv_states[nr_idle_states].name, "FastSleep");</div><div class='del'>-			strcpy(powernv_states[nr_idle_states].desc, "FastSleep");</div><div class='del'>-			powernv_states[nr_idle_states].flags = CPUIDLE_FLAG_TIMER_STOP;</div><div class='del'>-			powernv_states[nr_idle_states].target_residency = 300000;</div><div class='del'>-			powernv_states[nr_idle_states].enter = fastsleep_loop;</div><div class='add'>+			add_powernv_state(nr_idle_states, "FastSleep",</div><div class='add'>+					  CPUIDLE_FLAG_TIMER_STOP,</div><div class='add'>+					  fastsleep_loop,</div><div class='add'>+					  target_residency, exit_latency, 0, 0);</div><div class='ctx'> 		} else if ((flags[i] &amp; OPAL_PM_STOP_INST_DEEP) &amp;&amp;</div><div class='ctx'> 				(flags[i] &amp; OPAL_PM_TIMEBASE_STOP)) {</div><div class='del'>-			strncpy(powernv_states[nr_idle_states].name,</div><div class='del'>-				names[i], CPUIDLE_NAME_LEN);</div><div class='del'>-			strncpy(powernv_states[nr_idle_states].desc,</div><div class='del'>-				names[i], CPUIDLE_NAME_LEN);</div><div class='del'>-</div><div class='del'>-			powernv_states[nr_idle_states].flags = CPUIDLE_FLAG_TIMER_STOP;</div><div class='del'>-			powernv_states[nr_idle_states].enter = stop_loop;</div><div class='del'>-			stop_psscr_table[nr_idle_states] = psscr_val[i];</div><div class='add'>+			add_powernv_state(nr_idle_states, names[i],</div><div class='add'>+					  CPUIDLE_FLAG_TIMER_STOP, stop_loop,</div><div class='add'>+					  target_residency, exit_latency,</div><div class='add'>+					  psscr_val[i], psscr_mask[i]);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		powernv_states[nr_idle_states].exit_latency =</div><div class='del'>-				((unsigned int)latency_ns[i]) / 1000;</div><div class='del'>-</div><div class='del'>-		if (!rc) {</div><div class='del'>-			powernv_states[nr_idle_states].target_residency =</div><div class='del'>-				((unsigned int)residency_ns[i]) / 1000;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		nr_idle_states++;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c<br/>index c73207abb5a4..548b90be7685 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpuidle/cpuidle.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpuidle/cpuidle.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpuidle/cpuidle.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/cpuidle.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/clock.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/pm_qos.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='hunk'>@@ -97,7 +98,23 @@ static int find_deepest_state(struct cpuidle_driver *drv,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUSPEND</div><div class='add'>+/**</div><div class='add'>+ * cpuidle_use_deepest_state - Set/clear governor override flag.</div><div class='add'>+ * @enable: New value of the flag.</div><div class='add'>+ *</div><div class='add'>+ * Set/unset the current CPU to use the deepest idle state (override governors</div><div class='add'>+ * going forward if set).</div><div class='add'>+ */</div><div class='add'>+void cpuidle_use_deepest_state(bool enable)</div><div class='add'>+{</div><div class='add'>+	struct cpuidle_device *dev;</div><div class='add'>+</div><div class='add'>+	preempt_disable();</div><div class='add'>+	dev = cpuidle_get_device();</div><div class='add'>+	dev-&gt;use_deepest_state = enable;</div><div class='add'>+	preempt_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * cpuidle_find_deepest_state - Find the deepest available idle state.</div><div class='ctx'>  * @drv: cpuidle driver for the given CPU.</div><div class='hunk'>@@ -109,6 +126,7 @@ int cpuidle_find_deepest_state(struct cpuidle_driver *drv,</div><div class='ctx'> 	return find_deepest_state(drv, dev, UINT_MAX, 0, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SUSPEND</div><div class='ctx'> static void enter_freeze_proper(struct cpuidle_driver *drv,</div><div class='ctx'> 				struct cpuidle_device *dev, int index)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c<br/>index ab264d393233..e53fb861beb0 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpuidle/driver.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpuidle/driver.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpuidle/driver.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/driver.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/idle.h&gt;</div><div class='ctx'> #include &lt;linux/cpuidle.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='head'>diff --git a/drivers/cpuidle/dt_idle_states.c b/drivers/cpuidle/dt_idle_states.c<br/>index a5c111b67f37..ffca4fc0061d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpuidle/dt_idle_states.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpuidle/dt_idle_states.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpuidle/dt_idle_states.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/dt_idle_states.c</a></div><div class='hunk'>@@ -38,6 +38,12 @@ static int init_state_node(struct cpuidle_state *idle_state,</div><div class='ctx'> 	 * state enter function.</div><div class='ctx'> 	 */</div><div class='ctx'> 	idle_state-&gt;enter = match_id-&gt;data;</div><div class='add'>+	/*</div><div class='add'>+	 * Since this is not a "coupled" state, it's safe to assume interrupts</div><div class='add'>+	 * won't be enabled when it exits allowing the tick to be frozen</div><div class='add'>+	 * safely. So enter() can be also enter_freeze() callback.</div><div class='add'>+	 */</div><div class='add'>+	idle_state-&gt;enter_freeze = match_id-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	err = of_property_read_u32(state_node, "wakeup-latency-us",</div><div class='ctx'> 				   &amp;idle_state-&gt;exit_latency);</div><div class='head'>diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c<br/>index fb9f511cca23..4e78263e34a4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpuidle/governor.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpuidle/governor.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpuidle/governor.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/governor.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/cpuidle.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cpuidle.h"</div><div class='hunk'>@@ -53,14 +52,11 @@ int cpuidle_switch_governor(struct cpuidle_governor *gov)</div><div class='ctx'> 	if (cpuidle_curr_governor) {</div><div class='ctx'> 		list_for_each_entry(dev, &amp;cpuidle_detected_devices, device_list)</div><div class='ctx'> 			cpuidle_disable_device(dev);</div><div class='del'>-		module_put(cpuidle_curr_governor-&gt;owner);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpuidle_curr_governor = gov;</div><div class='ctx'> </div><div class='ctx'> 	if (gov) {</div><div class='del'>-		if (!try_module_get(cpuidle_curr_governor-&gt;owner))</div><div class='del'>-			return -EINVAL;</div><div class='ctx'> 		list_for_each_entry(dev, &amp;cpuidle_detected_devices, device_list)</div><div class='ctx'> 			cpuidle_enable_device(dev);</div><div class='ctx'> 		cpuidle_install_idle_handler();</div><div class='head'>diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c<br/>index 63bd5a403e22..ac321f09e717 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpuidle/governors/ladder.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpuidle/governors/ladder.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpuidle/governors/ladder.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/governors/ladder.c</a></div><div class='hunk'>@@ -15,12 +15,11 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/cpuidle.h&gt;</div><div class='ctx'> #include &lt;linux/pm_qos.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PROMOTION_COUNT 4</div><div class='ctx'> #define DEMOTION_COUNT 1</div><div class='hunk'>@@ -177,7 +176,6 @@ static struct cpuidle_governor ladder_governor = {</div><div class='ctx'> 	.enable =	ladder_enable_device,</div><div class='ctx'> 	.select =	ladder_select_state,</div><div class='ctx'> 	.reflect =	ladder_reflect,</div><div class='del'>-	.owner =	THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c<br/>index 03d38c291de6..b2330fd69e34 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpuidle/governors/menu.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpuidle/governors/menu.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpuidle/governors/menu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/governors/menu.c</a></div><div class='hunk'>@@ -18,8 +18,10 @@</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/loadavg.h&gt;</div><div class='add'>+#include &lt;linux/sched/stat.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Please note when changing the tuning values:</div><div class='hunk'>@@ -281,17 +283,23 @@ again:</div><div class='ctx'> static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct menu_device *data = this_cpu_ptr(&amp;menu_devices);</div><div class='add'>+	struct device *device = get_cpu_device(dev-&gt;cpu);</div><div class='ctx'> 	int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned int interactivity_req;</div><div class='ctx'> 	unsigned int expected_interval;</div><div class='ctx'> 	unsigned long nr_iowaiters, cpu_load;</div><div class='add'>+	int resume_latency = dev_pm_qos_raw_read_value(device);</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;needs_update) {</div><div class='ctx'> 		menu_update(drv, dev);</div><div class='ctx'> 		data-&gt;needs_update = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* resume_latency is 0 means no restriction */</div><div class='add'>+	if (resume_latency &amp;&amp; resume_latency &lt; latency_req)</div><div class='add'>+		latency_req = resume_latency;</div><div class='add'>+</div><div class='ctx'> 	/* Special case when user has set very strict latency requirement */</div><div class='ctx'> 	if (unlikely(latency_req == 0))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -358,9 +366,9 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)</div><div class='ctx'> 		if (s-&gt;disabled || su-&gt;disable)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (s-&gt;target_residency &gt; data-&gt;predicted_us)</div><div class='del'>-			continue;</div><div class='add'>+			break;</div><div class='ctx'> 		if (s-&gt;exit_latency &gt; latency_req)</div><div class='del'>-			continue;</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;last_state_idx = i;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -484,7 +492,6 @@ static struct cpuidle_governor menu_governor = {</div><div class='ctx'> 	.enable =	menu_enable_device,</div><div class='ctx'> 	.select =	menu_select,</div><div class='ctx'> 	.reflect =	menu_reflect,</div><div class='del'>-	.owner =	THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c<br/>index 832a2c3f01ff..c5adc8c9ac43 100644<br/>--- a/<a href='/drm-misc/tree/drivers/cpuidle/sysfs.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/cpuidle/sysfs.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/cpuidle/sysfs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/cpuidle/sysfs.c</a></div><div class='hunk'>@@ -403,8 +403,10 @@ static int cpuidle_add_state_sysfs(struct cpuidle_device *device)</div><div class='ctx'> 	/* state statistics */</div><div class='ctx'> 	for (i = 0; i &lt; drv-&gt;state_count; i++) {</div><div class='ctx'> 		kobj = kzalloc(sizeof(struct cpuidle_state_kobj), GFP_KERNEL);</div><div class='del'>-		if (!kobj)</div><div class='add'>+		if (!kobj) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='ctx'> 			goto error_state;</div><div class='add'>+		}</div><div class='ctx'> 		kobj-&gt;state = &amp;drv-&gt;states[i];</div><div class='ctx'> 		kobj-&gt;state_usage = &amp;device-&gt;states_usage[i];</div><div class='ctx'> 		init_completion(&amp;kobj-&gt;kobj_unregister);</div><div class='head'>diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig<br/>index 4d2b81f2b223..473d31288ad8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/Kconfig</a></div><div class='hunk'>@@ -62,19 +62,32 @@ config CRYPTO_DEV_GEODE</div><div class='ctx'> 	  will be called geode-aes.</div><div class='ctx'> </div><div class='ctx'> config ZCRYPT</div><div class='del'>-	tristate "Support for PCI-attached cryptographic adapters"</div><div class='add'>+	tristate "Support for s390 cryptographic adapters"</div><div class='ctx'> 	depends on S390</div><div class='ctx'> 	select HW_RANDOM</div><div class='ctx'> 	help</div><div class='del'>-	  Select this option if you want to use a PCI-attached cryptographic</div><div class='del'>-	  adapter like:</div><div class='del'>-	  + PCI Cryptographic Accelerator (PCICA)</div><div class='del'>-	  + PCI Cryptographic Coprocessor (PCICC)</div><div class='add'>+	  Select this option if you want to enable support for</div><div class='add'>+	  s390 cryptographic adapters like:</div><div class='ctx'> 	  + PCI-X Cryptographic Coprocessor (PCIXCC)</div><div class='del'>-	  + Crypto Express2 Coprocessor (CEX2C)</div><div class='del'>-	  + Crypto Express2 Accelerator (CEX2A)</div><div class='del'>-	  + Crypto Express3 Coprocessor (CEX3C)</div><div class='del'>-	  + Crypto Express3 Accelerator (CEX3A)</div><div class='add'>+	  + Crypto Express 2,3,4 or 5 Coprocessor (CEXxC)</div><div class='add'>+	  + Crypto Express 2,3,4 or 5 Accelerator (CEXxA)</div><div class='add'>+	  + Crypto Express 4 or 5 EP11 Coprocessor (CEXxP)</div><div class='add'>+</div><div class='add'>+config PKEY</div><div class='add'>+	tristate "Kernel API for protected key handling"</div><div class='add'>+	depends on S390</div><div class='add'>+	depends on ZCRYPT</div><div class='add'>+	help</div><div class='add'>+	  With this option enabled the pkey kernel module provides an API</div><div class='add'>+	  for creation and handling of protected keys. Other parts of the</div><div class='add'>+	  kernel or userspace applications may use these functions.</div><div class='add'>+</div><div class='add'>+	  Select this option if you want to enable the kernel and userspace</div><div class='add'>+	  API for proteced key handling.</div><div class='add'>+</div><div class='add'>+	  Please note that creation of protected keys from secure keys</div><div class='add'>+	  requires to have at least one CEX card in coprocessor mode</div><div class='add'>+	  available at runtime.</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_SHA1_S390</div><div class='ctx'> 	tristate "SHA1 digest algorithm"</div><div class='hunk'>@@ -124,6 +137,7 @@ config CRYPTO_AES_S390</div><div class='ctx'> 	depends on S390</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='ctx'> 	select CRYPTO_BLKCIPHER</div><div class='add'>+	select PKEY</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is the s390 hardware accelerated implementation of the</div><div class='ctx'> 	  AES cipher algorithms (FIPS-197).</div><div class='hunk'>@@ -339,7 +353,7 @@ config CRYPTO_DEV_OMAP_DES</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_DEV_PICOXCELL</div><div class='ctx'> 	tristate "Support for picoXcell IPSEC and Layer2 crypto engines"</div><div class='del'>-	depends on ARCH_PICOXCELL &amp;&amp; HAVE_CLK</div><div class='add'>+	depends on (ARCH_PICOXCELL || COMPILE_TEST) &amp;&amp; HAVE_CLK</div><div class='ctx'> 	select CRYPTO_AEAD</div><div class='ctx'> 	select CRYPTO_AES</div><div class='ctx'> 	select CRYPTO_AUTHENC</div><div class='hunk'>@@ -415,10 +429,23 @@ config CRYPTO_DEV_BFIN_CRC</div><div class='ctx'> 	  Newer Blackfin processors have CRC hardware. Select this if you</div><div class='ctx'> 	  want to use the Blackfin CRC module.</div><div class='ctx'> </div><div class='add'>+config CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+	tristate "Support for Atmel IPSEC/SSL hw accelerator"</div><div class='add'>+	depends on HAS_DMA</div><div class='add'>+	depends on ARCH_AT91 || COMPILE_TEST</div><div class='add'>+	select CRYPTO_AUTHENC</div><div class='add'>+	select CRYPTO_DEV_ATMEL_AES</div><div class='add'>+	select CRYPTO_DEV_ATMEL_SHA</div><div class='add'>+	help</div><div class='add'>+	  Some Atmel processors can combine the AES and SHA hw accelerators</div><div class='add'>+	  to enhance support of IPSEC/SSL.</div><div class='add'>+	  Select this if you want to use the Atmel modules for</div><div class='add'>+	  authenc(hmac(shaX),Y(cbc)) algorithms.</div><div class='add'>+</div><div class='ctx'> config CRYPTO_DEV_ATMEL_AES</div><div class='ctx'> 	tristate "Support for Atmel AES hw accelerator"</div><div class='ctx'> 	depends on HAS_DMA</div><div class='del'>-	depends on AT_XDMAC || AT_HDMAC || COMPILE_TEST</div><div class='add'>+	depends on ARCH_AT91 || COMPILE_TEST</div><div class='ctx'> 	select CRYPTO_AES</div><div class='ctx'> 	select CRYPTO_AEAD</div><div class='ctx'> 	select CRYPTO_BLKCIPHER</div><div class='hunk'>@@ -432,7 +459,8 @@ config CRYPTO_DEV_ATMEL_AES</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_DEV_ATMEL_TDES</div><div class='ctx'> 	tristate "Support for Atmel DES/TDES hw accelerator"</div><div class='del'>-	depends on ARCH_AT91</div><div class='add'>+	depends on HAS_DMA</div><div class='add'>+	depends on ARCH_AT91 || COMPILE_TEST</div><div class='ctx'> 	select CRYPTO_DES</div><div class='ctx'> 	select CRYPTO_BLKCIPHER</div><div class='ctx'> 	help</div><div class='hunk'>@@ -445,7 +473,8 @@ config CRYPTO_DEV_ATMEL_TDES</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_DEV_ATMEL_SHA</div><div class='ctx'> 	tristate "Support for Atmel SHA hw accelerator"</div><div class='del'>-	depends on ARCH_AT91</div><div class='add'>+	depends on HAS_DMA</div><div class='add'>+	depends on ARCH_AT91 || COMPILE_TEST</div><div class='ctx'> 	select CRYPTO_HASH</div><div class='ctx'> 	help</div><div class='ctx'> 	  Some Atmel processors have SHA1/SHA224/SHA256/SHA384/SHA512</div><div class='hunk'>@@ -484,6 +513,7 @@ config CRYPTO_DEV_MXS_DCP</div><div class='ctx'> 	  will be called mxs-dcp.</div><div class='ctx'> </div><div class='ctx'> source "drivers/crypto/qat/Kconfig"</div><div class='add'>+source "drivers/crypto/cavium/cpt/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_DEV_QCE</div><div class='ctx'> 	tristate "Qualcomm crypto engine accelerator"</div><div class='hunk'>@@ -553,6 +583,40 @@ config CRYPTO_DEV_ROCKCHIP</div><div class='ctx'> 	  This driver interfaces with the hardware crypto accelerator.</div><div class='ctx'> 	  Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode.</div><div class='ctx'> </div><div class='add'>+config CRYPTO_DEV_MEDIATEK</div><div class='add'>+	tristate "MediaTek's EIP97 Cryptographic Engine driver"</div><div class='add'>+	depends on HAS_DMA</div><div class='add'>+	depends on (ARM &amp;&amp; ARCH_MEDIATEK) || COMPILE_TEST</div><div class='add'>+	select CRYPTO_AES</div><div class='add'>+	select CRYPTO_AEAD</div><div class='add'>+	select CRYPTO_BLKCIPHER</div><div class='add'>+	select CRYPTO_CTR</div><div class='add'>+	select CRYPTO_SHA1</div><div class='add'>+	select CRYPTO_SHA256</div><div class='add'>+	select CRYPTO_SHA512</div><div class='add'>+	select CRYPTO_HMAC</div><div class='add'>+	help</div><div class='add'>+	  This driver allows you to utilize the hardware crypto accelerator</div><div class='add'>+	  EIP97 which can be found on the MT7623 MT2701, MT8521p, etc ....</div><div class='add'>+	  Select this if you want to use it for AES/SHA1/SHA2 algorithms.</div><div class='add'>+</div><div class='ctx'> source "drivers/crypto/chelsio/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/crypto/virtio/Kconfig"</div><div class='add'>+</div><div class='add'>+config CRYPTO_DEV_BCM_SPU</div><div class='add'>+	tristate "Broadcom symmetric crypto/hash acceleration support"</div><div class='add'>+	depends on ARCH_BCM_IPROC</div><div class='add'>+	depends on BCM_PDC_MBOX</div><div class='add'>+	default m</div><div class='add'>+	select CRYPTO_DES</div><div class='add'>+	select CRYPTO_MD5</div><div class='add'>+	select CRYPTO_SHA1</div><div class='add'>+	select CRYPTO_SHA256</div><div class='add'>+	select CRYPTO_SHA512</div><div class='add'>+	help</div><div class='add'>+	  This driver provides support for Broadcom crypto acceleration using the</div><div class='add'>+	  Secure Processing Unit (SPU). The SPU driver registers ablkcipher,</div><div class='add'>+	  ahash, and aead algorithms with the kernel cryptographic API.</div><div class='add'>+</div><div class='ctx'> endif # CRYPTO_HW</div><div class='head'>diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile<br/>index ad7250fa1348..739609471169 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/Makefile</a></div><div class='hunk'>@@ -3,6 +3,8 @@ obj-$(CONFIG_CRYPTO_DEV_ATMEL_SHA) += atmel-sha.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_ATMEL_TDES) += atmel-tdes.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_BFIN_CRC) += bfin_crc.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_CCP) += ccp/</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_CHELSIO) += chelsio/</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_CPT) += cavium/cpt/</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM) += caam/</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o</div><div class='hunk'>@@ -10,7 +12,9 @@ obj-$(CONFIG_CRYPTO_DEV_IMGTEC_HASH) += img-hash.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_MV_CESA) += mv_cesa.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_MARVELL_CESA) += marvell/</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_MEDIATEK) += mediatek/</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_MXS_DCP) += mxs-dcp.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_MXC_SCC) += mxc-scc.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_NIAGARA2) += n2_crypto.o</div><div class='ctx'> n2_crypto-y := n2_core.o n2_asm.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_NX) += nx/</div><div class='hunk'>@@ -21,14 +25,14 @@ obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_PPC4XX) += amcc/</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_QAT) += qat/</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_QCE) += qce/</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) += rockchip/</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_SAHARA) += sahara.o</div><div class='del'>-obj-$(CONFIG_CRYPTO_DEV_MXC_SCC) += mxc-scc.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_SUN4I_SS) += sunxi-ss/</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/</div><div class='del'>-obj-$(CONFIG_CRYPTO_DEV_QAT) += qat/</div><div class='del'>-obj-$(CONFIG_CRYPTO_DEV_QCE) += qce/</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_VIRTIO) += virtio/</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_VMX) += vmx/</div><div class='del'>-obj-$(CONFIG_CRYPTO_DEV_SUN4I_SS) += sunxi-ss/</div><div class='del'>-obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) += rockchip/</div><div class='del'>-obj-$(CONFIG_CRYPTO_DEV_CHELSIO) += chelsio/</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_BCM_SPU) += bcm/</div><div class='head'>diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c<br/>index dae1e39139e9..d10b4ae5e0da 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/amcc/crypto4xx_core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/amcc/crypto4xx_core.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/amcc/crypto4xx_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/amcc/crypto4xx_core.c</a></div><div class='hunk'>@@ -135,8 +135,7 @@ int crypto4xx_alloc_sa(struct crypto4xx_ctx *ctx, u32 size)</div><div class='ctx'> 	ctx-&gt;sa_out = dma_alloc_coherent(ctx-&gt;dev-&gt;core_dev-&gt;device, size * 4,</div><div class='ctx'> 					 &amp;ctx-&gt;sa_out_dma_addr, GFP_ATOMIC);</div><div class='ctx'> 	if (ctx-&gt;sa_out == NULL) {</div><div class='del'>-		dma_free_coherent(ctx-&gt;dev-&gt;core_dev-&gt;device,</div><div class='del'>-				  ctx-&gt;sa_len * 4,</div><div class='add'>+		dma_free_coherent(ctx-&gt;dev-&gt;core_dev-&gt;device, size * 4,</div><div class='ctx'> 				  ctx-&gt;sa_in, ctx-&gt;sa_in_dma_addr);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/crypto/atmel-aes-regs.h b/drivers/crypto/atmel-aes-regs.h<br/>index 6c2951bb70b1..7694679802b3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/atmel-aes-regs.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/atmel-aes-regs.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/atmel-aes-regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-aes-regs.h</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #define AES_MR_OPMOD_CFB		(0x3 &lt;&lt; 12)</div><div class='ctx'> #define AES_MR_OPMOD_CTR		(0x4 &lt;&lt; 12)</div><div class='ctx'> #define AES_MR_OPMOD_GCM		(0x5 &lt;&lt; 12)</div><div class='add'>+#define AES_MR_OPMOD_XTS		(0x6 &lt;&lt; 12)</div><div class='ctx'> #define AES_MR_LOD				(0x1 &lt;&lt; 15)</div><div class='ctx'> #define AES_MR_CFBS_MASK		(0x7 &lt;&lt; 16)</div><div class='ctx'> #define AES_MR_CFBS_128b		(0x0 &lt;&lt; 16)</div><div class='hunk'>@@ -67,6 +68,25 @@</div><div class='ctx'> #define AES_CTRR	0x98</div><div class='ctx'> #define AES_GCMHR(x)	(0x9c + ((x) * 0x04))</div><div class='ctx'> </div><div class='add'>+#define AES_EMR		0xb0</div><div class='add'>+#define AES_EMR_APEN		BIT(0)	/* Auto Padding Enable */</div><div class='add'>+#define AES_EMR_APM		BIT(1)	/* Auto Padding Mode */</div><div class='add'>+#define AES_EMR_APM_IPSEC	0x0</div><div class='add'>+#define AES_EMR_APM_SSL		BIT(1)</div><div class='add'>+#define AES_EMR_PLIPEN		BIT(4)	/* PLIP Enable */</div><div class='add'>+#define AES_EMR_PLIPD		BIT(5)	/* PLIP Decipher */</div><div class='add'>+#define AES_EMR_PADLEN_MASK	(0xFu &lt;&lt; 8)</div><div class='add'>+#define AES_EMR_PADLEN_OFFSET	8</div><div class='add'>+#define AES_EMR_PADLEN(padlen)	(((padlen) &lt;&lt; AES_EMR_PADLEN_OFFSET) &amp;\</div><div class='add'>+				 AES_EMR_PADLEN_MASK)</div><div class='add'>+#define AES_EMR_NHEAD_MASK	(0xFu &lt;&lt; 16)</div><div class='add'>+#define AES_EMR_NHEAD_OFFSET	16</div><div class='add'>+#define AES_EMR_NHEAD(nhead)	(((nhead) &lt;&lt; AES_EMR_NHEAD_OFFSET) &amp;\</div><div class='add'>+				 AES_EMR_NHEAD_MASK)</div><div class='add'>+</div><div class='add'>+#define AES_TWR(x)	(0xc0 + ((x) * 0x04))</div><div class='add'>+#define AES_ALPHAR(x)	(0xd0 + ((x) * 0x04))</div><div class='add'>+</div><div class='ctx'> #define AES_HW_VERSION	0xFC</div><div class='ctx'> </div><div class='ctx'> #endif /* __ATMEL_AES_REGS_H__ */</div><div class='head'>diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c<br/>index e3d40a8dfffb..29e20c37f3a6 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/atmel-aes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/atmel-aes.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/atmel-aes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-aes.c</a></div><div class='hunk'>@@ -36,10 +36,12 @@</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/xts.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/aead.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/crypto-atmel.h&gt;</div><div class='ctx'> #include &lt;dt-bindings/dma/at91.h&gt;</div><div class='ctx'> #include "atmel-aes-regs.h"</div><div class='add'>+#include "atmel-authenc.h"</div><div class='ctx'> </div><div class='ctx'> #define ATMEL_AES_PRIORITY	300</div><div class='ctx'> </div><div class='hunk'>@@ -68,6 +70,7 @@</div><div class='ctx'> #define AES_FLAGS_CFB8		(AES_MR_OPMOD_CFB | AES_MR_CFBS_8b)</div><div class='ctx'> #define AES_FLAGS_CTR		AES_MR_OPMOD_CTR</div><div class='ctx'> #define AES_FLAGS_GCM		AES_MR_OPMOD_GCM</div><div class='add'>+#define AES_FLAGS_XTS		AES_MR_OPMOD_XTS</div><div class='ctx'> </div><div class='ctx'> #define AES_FLAGS_MODE_MASK	(AES_FLAGS_OPMODE_MASK |	\</div><div class='ctx'> 				 AES_FLAGS_ENCRYPT |		\</div><div class='hunk'>@@ -76,6 +79,7 @@</div><div class='ctx'> #define AES_FLAGS_INIT		BIT(2)</div><div class='ctx'> #define AES_FLAGS_BUSY		BIT(3)</div><div class='ctx'> #define AES_FLAGS_DUMP_REG	BIT(4)</div><div class='add'>+#define AES_FLAGS_OWN_SHA	BIT(5)</div><div class='ctx'> </div><div class='ctx'> #define AES_FLAGS_PERSISTENT	(AES_FLAGS_INIT | AES_FLAGS_BUSY)</div><div class='ctx'> </div><div class='hunk'>@@ -89,6 +93,8 @@ struct atmel_aes_caps {</div><div class='ctx'> 	bool			has_cfb64;</div><div class='ctx'> 	bool			has_ctr32;</div><div class='ctx'> 	bool			has_gcm;</div><div class='add'>+	bool			has_xts;</div><div class='add'>+	bool			has_authenc;</div><div class='ctx'> 	u32			max_burst_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -135,10 +141,37 @@ struct atmel_aes_gcm_ctx {</div><div class='ctx'> 	atmel_aes_fn_t		ghash_resume;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct atmel_aes_xts_ctx {</div><div class='add'>+	struct atmel_aes_base_ctx	base;</div><div class='add'>+</div><div class='add'>+	u32			key2[AES_KEYSIZE_256 / sizeof(u32)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+struct atmel_aes_authenc_ctx {</div><div class='add'>+	struct atmel_aes_base_ctx	base;</div><div class='add'>+	struct atmel_sha_authenc_ctx	*auth;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct atmel_aes_reqctx {</div><div class='ctx'> 	unsigned long		mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+struct atmel_aes_authenc_reqctx {</div><div class='add'>+	struct atmel_aes_reqctx	base;</div><div class='add'>+</div><div class='add'>+	struct scatterlist	src[2];</div><div class='add'>+	struct scatterlist	dst[2];</div><div class='add'>+	size_t			textlen;</div><div class='add'>+	u32			digest[SHA512_DIGEST_SIZE / sizeof(u32)];</div><div class='add'>+</div><div class='add'>+	/* auth_req MUST be place last. */</div><div class='add'>+	struct ahash_request	auth_req;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct atmel_aes_dma {</div><div class='ctx'> 	struct dma_chan		*chan;</div><div class='ctx'> 	struct scatterlist	*sg;</div><div class='hunk'>@@ -282,6 +315,23 @@ static const char *atmel_aes_reg_name(u32 offset, char *tmp, size_t sz)</div><div class='ctx'> 		snprintf(tmp, sz, "GCMHR[%u]", (offset - AES_GCMHR(0)) &gt;&gt; 2);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case AES_EMR:</div><div class='add'>+		return "EMR";</div><div class='add'>+</div><div class='add'>+	case AES_TWR(0):</div><div class='add'>+	case AES_TWR(1):</div><div class='add'>+	case AES_TWR(2):</div><div class='add'>+	case AES_TWR(3):</div><div class='add'>+		snprintf(tmp, sz, "TWR[%u]", (offset - AES_TWR(0)) &gt;&gt; 2);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AES_ALPHAR(0):</div><div class='add'>+	case AES_ALPHAR(1):</div><div class='add'>+	case AES_ALPHAR(2):</div><div class='add'>+	case AES_ALPHAR(3):</div><div class='add'>+		snprintf(tmp, sz, "ALPHAR[%u]", (offset - AES_ALPHAR(0)) &gt;&gt; 2);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		snprintf(tmp, sz, "0x%02x", offset);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -317,7 +367,7 @@ static inline void atmel_aes_write(struct atmel_aes_dev *dd,</div><div class='ctx'> 		char tmp[16];</div><div class='ctx'> </div><div class='ctx'> 		dev_vdbg(dd-&gt;dev, "write 0x%08x into %s\n", value,</div><div class='del'>-			 atmel_aes_reg_name(offset, tmp));</div><div class='add'>+			 atmel_aes_reg_name(offset, tmp, sizeof(tmp)));</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* VERBOSE_DEBUG */</div><div class='ctx'> </div><div class='hunk'>@@ -440,8 +490,16 @@ static inline bool atmel_aes_is_encrypt(const struct atmel_aes_dev *dd)</div><div class='ctx'> 	return (dd-&gt;flags &amp; AES_FLAGS_ENCRYPT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+static void atmel_aes_authenc_complete(struct atmel_aes_dev *dd, int err);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline int atmel_aes_complete(struct atmel_aes_dev *dd, int err)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+	atmel_aes_authenc_complete(dd, err);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	clk_disable(dd-&gt;iclk);</div><div class='ctx'> 	dd-&gt;flags &amp;= ~AES_FLAGS_BUSY;</div><div class='ctx'> </div><div class='hunk'>@@ -453,15 +511,15 @@ static inline int atmel_aes_complete(struct atmel_aes_dev *dd, int err)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atmel_aes_write_ctrl(struct atmel_aes_dev *dd, bool use_dma,</div><div class='del'>-				 const u32 *iv)</div><div class='add'>+static void atmel_aes_write_ctrl_key(struct atmel_aes_dev *dd, bool use_dma,</div><div class='add'>+				     const u32 *iv, const u32 *key, int keylen)</div><div class='ctx'> {</div><div class='ctx'> 	u32 valmr = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* MR register must be set before IV registers */</div><div class='del'>-	if (dd-&gt;ctx-&gt;keylen == AES_KEYSIZE_128)</div><div class='add'>+	if (keylen == AES_KEYSIZE_128)</div><div class='ctx'> 		valmr |= AES_MR_KEYSIZE_128;</div><div class='del'>-	else if (dd-&gt;ctx-&gt;keylen == AES_KEYSIZE_192)</div><div class='add'>+	else if (keylen == AES_KEYSIZE_192)</div><div class='ctx'> 		valmr |= AES_MR_KEYSIZE_192;</div><div class='ctx'> 	else</div><div class='ctx'> 		valmr |= AES_MR_KEYSIZE_256;</div><div class='hunk'>@@ -478,13 +536,19 @@ static void atmel_aes_write_ctrl(struct atmel_aes_dev *dd, bool use_dma,</div><div class='ctx'> </div><div class='ctx'> 	atmel_aes_write(dd, AES_MR, valmr);</div><div class='ctx'> </div><div class='del'>-	atmel_aes_write_n(dd, AES_KEYWR(0), dd-&gt;ctx-&gt;key,</div><div class='del'>-			  SIZE_IN_WORDS(dd-&gt;ctx-&gt;keylen));</div><div class='add'>+	atmel_aes_write_n(dd, AES_KEYWR(0), key, SIZE_IN_WORDS(keylen));</div><div class='ctx'> </div><div class='ctx'> 	if (iv &amp;&amp; (valmr &amp; AES_MR_OPMOD_MASK) != AES_MR_OPMOD_ECB)</div><div class='ctx'> 		atmel_aes_write_block(dd, AES_IVR(0), iv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void atmel_aes_write_ctrl(struct atmel_aes_dev *dd, bool use_dma,</div><div class='add'>+					const u32 *iv)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	atmel_aes_write_ctrl_key(dd, use_dma, iv,</div><div class='add'>+				 dd-&gt;ctx-&gt;key, dd-&gt;ctx-&gt;keylen);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* CPU transfer */</div><div class='ctx'> </div><div class='hunk'>@@ -850,6 +914,7 @@ static int atmel_aes_handle_queue(struct atmel_aes_dev *dd,</div><div class='ctx'> 	struct crypto_async_request *areq, *backlog;</div><div class='ctx'> 	struct atmel_aes_base_ctx *ctx;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	bool start_async;</div><div class='ctx'> 	int err, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;dd-&gt;lock, flags);</div><div class='hunk'>@@ -875,10 +940,12 @@ static int atmel_aes_handle_queue(struct atmel_aes_dev *dd,</div><div class='ctx'> </div><div class='ctx'> 	dd-&gt;areq = areq;</div><div class='ctx'> 	dd-&gt;ctx = ctx;</div><div class='del'>-	dd-&gt;is_async = (areq != new_areq);</div><div class='add'>+	start_async = (areq != new_areq);</div><div class='add'>+	dd-&gt;is_async = start_async;</div><div class='ctx'> </div><div class='add'>+	/* WARNING: ctx-&gt;start() MAY change dd-&gt;is_async. */</div><div class='ctx'> 	err = ctx-&gt;start(dd);</div><div class='del'>-	return (dd-&gt;is_async) ? ret : err;</div><div class='add'>+	return (start_async) ? ret : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1769,6 +1836,515 @@ static struct aead_alg aes_gcm_alg = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* xts functions */</div><div class='add'>+</div><div class='add'>+static inline struct atmel_aes_xts_ctx *</div><div class='add'>+atmel_aes_xts_ctx_cast(struct atmel_aes_base_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	return container_of(ctx, struct atmel_aes_xts_ctx, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_xts_process_data(struct atmel_aes_dev *dd);</div><div class='add'>+</div><div class='add'>+static int atmel_aes_xts_start(struct atmel_aes_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct atmel_aes_xts_ctx *ctx = atmel_aes_xts_ctx_cast(dd-&gt;ctx);</div><div class='add'>+	struct ablkcipher_request *req = ablkcipher_request_cast(dd-&gt;areq);</div><div class='add'>+	struct atmel_aes_reqctx *rctx = ablkcipher_request_ctx(req);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	atmel_aes_set_mode(dd, rctx);</div><div class='add'>+</div><div class='add'>+	err = atmel_aes_hw_init(dd);</div><div class='add'>+	if (err)</div><div class='add'>+		return atmel_aes_complete(dd, err);</div><div class='add'>+</div><div class='add'>+	/* Compute the tweak value from req-&gt;info with ecb(aes). */</div><div class='add'>+	flags = dd-&gt;flags;</div><div class='add'>+	dd-&gt;flags &amp;= ~AES_FLAGS_MODE_MASK;</div><div class='add'>+	dd-&gt;flags |= (AES_FLAGS_ECB | AES_FLAGS_ENCRYPT);</div><div class='add'>+	atmel_aes_write_ctrl_key(dd, false, NULL,</div><div class='add'>+				 ctx-&gt;key2, ctx-&gt;base.keylen);</div><div class='add'>+	dd-&gt;flags = flags;</div><div class='add'>+</div><div class='add'>+	atmel_aes_write_block(dd, AES_IDATAR(0), req-&gt;info);</div><div class='add'>+	return atmel_aes_wait_for_data_ready(dd, atmel_aes_xts_process_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_xts_process_data(struct atmel_aes_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ablkcipher_request *req = ablkcipher_request_cast(dd-&gt;areq);</div><div class='add'>+	bool use_dma = (req-&gt;nbytes &gt;= ATMEL_AES_DMA_THRESHOLD);</div><div class='add'>+	u32 tweak[AES_BLOCK_SIZE / sizeof(u32)];</div><div class='add'>+	static const u32 one[AES_BLOCK_SIZE / sizeof(u32)] = {cpu_to_le32(1), };</div><div class='add'>+	u8 *tweak_bytes = (u8 *)tweak;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Read the computed ciphered tweak value. */</div><div class='add'>+	atmel_aes_read_block(dd, AES_ODATAR(0), tweak);</div><div class='add'>+	/*</div><div class='add'>+	 * Hardware quirk:</div><div class='add'>+	 * the order of the ciphered tweak bytes need to be reversed before</div><div class='add'>+	 * writing them into the ODATARx registers.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; AES_BLOCK_SIZE/2; ++i) {</div><div class='add'>+		u8 tmp = tweak_bytes[AES_BLOCK_SIZE - 1 - i];</div><div class='add'>+</div><div class='add'>+		tweak_bytes[AES_BLOCK_SIZE - 1 - i] = tweak_bytes[i];</div><div class='add'>+		tweak_bytes[i] = tmp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Process the data. */</div><div class='add'>+	atmel_aes_write_ctrl(dd, use_dma, NULL);</div><div class='add'>+	atmel_aes_write_block(dd, AES_TWR(0), tweak);</div><div class='add'>+	atmel_aes_write_block(dd, AES_ALPHAR(0), one);</div><div class='add'>+	if (use_dma)</div><div class='add'>+		return atmel_aes_dma_start(dd, req-&gt;src, req-&gt;dst, req-&gt;nbytes,</div><div class='add'>+					   atmel_aes_transfer_complete);</div><div class='add'>+</div><div class='add'>+	return atmel_aes_cpu_start(dd, req-&gt;src, req-&gt;dst, req-&gt;nbytes,</div><div class='add'>+				   atmel_aes_transfer_complete);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_xts_setkey(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='add'>+				unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct atmel_aes_xts_ctx *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = xts_check_key(crypto_ablkcipher_tfm(tfm), key, keylen);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;base.key, key, keylen/2);</div><div class='add'>+	memcpy(ctx-&gt;key2, key + keylen/2, keylen/2);</div><div class='add'>+	ctx-&gt;base.keylen = keylen/2;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_xts_encrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return atmel_aes_crypt(req, AES_FLAGS_XTS | AES_FLAGS_ENCRYPT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_xts_decrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return atmel_aes_crypt(req, AES_FLAGS_XTS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_xts_cra_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct atmel_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	tfm-&gt;crt_ablkcipher.reqsize = sizeof(struct atmel_aes_reqctx);</div><div class='add'>+	ctx-&gt;base.start = atmel_aes_xts_start;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg aes_xts_alg = {</div><div class='add'>+	.cra_name		= "xts(aes)",</div><div class='add'>+	.cra_driver_name	= "atmel-xts-aes",</div><div class='add'>+	.cra_priority		= ATMEL_AES_PRIORITY,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct atmel_aes_xts_ctx),</div><div class='add'>+	.cra_alignmask		= 0xf,</div><div class='add'>+	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_init		= atmel_aes_xts_cra_init,</div><div class='add'>+	.cra_exit		= atmel_aes_cra_exit,</div><div class='add'>+	.cra_u.ablkcipher = {</div><div class='add'>+		.min_keysize	= 2 * AES_MIN_KEY_SIZE,</div><div class='add'>+		.max_keysize	= 2 * AES_MAX_KEY_SIZE,</div><div class='add'>+		.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+		.setkey		= atmel_aes_xts_setkey,</div><div class='add'>+		.encrypt	= atmel_aes_xts_encrypt,</div><div class='add'>+		.decrypt	= atmel_aes_xts_decrypt,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+/* authenc aead functions */</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_start(struct atmel_aes_dev *dd);</div><div class='add'>+static int atmel_aes_authenc_init(struct atmel_aes_dev *dd, int err,</div><div class='add'>+				  bool is_async);</div><div class='add'>+static int atmel_aes_authenc_transfer(struct atmel_aes_dev *dd, int err,</div><div class='add'>+				      bool is_async);</div><div class='add'>+static int atmel_aes_authenc_digest(struct atmel_aes_dev *dd);</div><div class='add'>+static int atmel_aes_authenc_final(struct atmel_aes_dev *dd, int err,</div><div class='add'>+				   bool is_async);</div><div class='add'>+</div><div class='add'>+static void atmel_aes_authenc_complete(struct atmel_aes_dev *dd, int err)</div><div class='add'>+{</div><div class='add'>+	struct aead_request *req = aead_request_cast(dd-&gt;areq);</div><div class='add'>+	struct atmel_aes_authenc_reqctx *rctx = aead_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	if (err &amp;&amp; (dd-&gt;flags &amp; AES_FLAGS_OWN_SHA))</div><div class='add'>+		atmel_sha_authenc_abort(&amp;rctx-&gt;auth_req);</div><div class='add'>+	dd-&gt;flags &amp;= ~AES_FLAGS_OWN_SHA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_start(struct atmel_aes_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct aead_request *req = aead_request_cast(dd-&gt;areq);</div><div class='add'>+	struct atmel_aes_authenc_reqctx *rctx = aead_request_ctx(req);</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	struct atmel_aes_authenc_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	atmel_aes_set_mode(dd, &amp;rctx-&gt;base);</div><div class='add'>+</div><div class='add'>+	err = atmel_aes_hw_init(dd);</div><div class='add'>+	if (err)</div><div class='add'>+		return atmel_aes_complete(dd, err);</div><div class='add'>+</div><div class='add'>+	return atmel_sha_authenc_schedule(&amp;rctx-&gt;auth_req, ctx-&gt;auth,</div><div class='add'>+					  atmel_aes_authenc_init, dd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_init(struct atmel_aes_dev *dd, int err,</div><div class='add'>+				  bool is_async)</div><div class='add'>+{</div><div class='add'>+	struct aead_request *req = aead_request_cast(dd-&gt;areq);</div><div class='add'>+	struct atmel_aes_authenc_reqctx *rctx = aead_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	if (is_async)</div><div class='add'>+		dd-&gt;is_async = true;</div><div class='add'>+	if (err)</div><div class='add'>+		return atmel_aes_complete(dd, err);</div><div class='add'>+</div><div class='add'>+	/* If here, we've got the ownership of the SHA device. */</div><div class='add'>+	dd-&gt;flags |= AES_FLAGS_OWN_SHA;</div><div class='add'>+</div><div class='add'>+	/* Configure the SHA device. */</div><div class='add'>+	return atmel_sha_authenc_init(&amp;rctx-&gt;auth_req,</div><div class='add'>+				      req-&gt;src, req-&gt;assoclen,</div><div class='add'>+				      rctx-&gt;textlen,</div><div class='add'>+				      atmel_aes_authenc_transfer, dd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_transfer(struct atmel_aes_dev *dd, int err,</div><div class='add'>+				      bool is_async)</div><div class='add'>+{</div><div class='add'>+	struct aead_request *req = aead_request_cast(dd-&gt;areq);</div><div class='add'>+	struct atmel_aes_authenc_reqctx *rctx = aead_request_ctx(req);</div><div class='add'>+	bool enc = atmel_aes_is_encrypt(dd);</div><div class='add'>+	struct scatterlist *src, *dst;</div><div class='add'>+	u32 iv[AES_BLOCK_SIZE / sizeof(u32)];</div><div class='add'>+	u32 emr;</div><div class='add'>+</div><div class='add'>+	if (is_async)</div><div class='add'>+		dd-&gt;is_async = true;</div><div class='add'>+	if (err)</div><div class='add'>+		return atmel_aes_complete(dd, err);</div><div class='add'>+</div><div class='add'>+	/* Prepare src and dst scatter-lists to transfer cipher/plain texts. */</div><div class='add'>+	src = scatterwalk_ffwd(rctx-&gt;src, req-&gt;src, req-&gt;assoclen);</div><div class='add'>+	dst = src;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;src != req-&gt;dst)</div><div class='add'>+		dst = scatterwalk_ffwd(rctx-&gt;dst, req-&gt;dst, req-&gt;assoclen);</div><div class='add'>+</div><div class='add'>+	/* Configure the AES device. */</div><div class='add'>+	memcpy(iv, req-&gt;iv, sizeof(iv));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Here we always set the 2nd parameter of atmel_aes_write_ctrl() to</div><div class='add'>+	 * 'true' even if the data transfer is actually performed by the CPU (so</div><div class='add'>+	 * not by the DMA) because we must force the AES_MR_SMOD bitfield to the</div><div class='add'>+	 * value AES_MR_SMOD_IDATAR0. Indeed, both AES_MR_SMOD and SHA_MR_SMOD</div><div class='add'>+	 * must be set to *_MR_SMOD_IDATAR0.</div><div class='add'>+	 */</div><div class='add'>+	atmel_aes_write_ctrl(dd, true, iv);</div><div class='add'>+	emr = AES_EMR_PLIPEN;</div><div class='add'>+	if (!enc)</div><div class='add'>+		emr |= AES_EMR_PLIPD;</div><div class='add'>+	atmel_aes_write(dd, AES_EMR, emr);</div><div class='add'>+</div><div class='add'>+	/* Transfer data. */</div><div class='add'>+	return atmel_aes_dma_start(dd, src, dst, rctx-&gt;textlen,</div><div class='add'>+				   atmel_aes_authenc_digest);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_digest(struct atmel_aes_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct aead_request *req = aead_request_cast(dd-&gt;areq);</div><div class='add'>+	struct atmel_aes_authenc_reqctx *rctx = aead_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	/* atmel_sha_authenc_final() releases the SHA device. */</div><div class='add'>+	dd-&gt;flags &amp;= ~AES_FLAGS_OWN_SHA;</div><div class='add'>+	return atmel_sha_authenc_final(&amp;rctx-&gt;auth_req,</div><div class='add'>+				       rctx-&gt;digest, sizeof(rctx-&gt;digest),</div><div class='add'>+				       atmel_aes_authenc_final, dd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_final(struct atmel_aes_dev *dd, int err,</div><div class='add'>+				   bool is_async)</div><div class='add'>+{</div><div class='add'>+	struct aead_request *req = aead_request_cast(dd-&gt;areq);</div><div class='add'>+	struct atmel_aes_authenc_reqctx *rctx = aead_request_ctx(req);</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	bool enc = atmel_aes_is_encrypt(dd);</div><div class='add'>+	u32 idigest[SHA512_DIGEST_SIZE / sizeof(u32)], *odigest = rctx-&gt;digest;</div><div class='add'>+	u32 offs, authsize;</div><div class='add'>+</div><div class='add'>+	if (is_async)</div><div class='add'>+		dd-&gt;is_async = true;</div><div class='add'>+	if (err)</div><div class='add'>+		goto complete;</div><div class='add'>+</div><div class='add'>+	offs = req-&gt;assoclen + rctx-&gt;textlen;</div><div class='add'>+	authsize = crypto_aead_authsize(tfm);</div><div class='add'>+	if (enc) {</div><div class='add'>+		scatterwalk_map_and_copy(odigest, req-&gt;dst, offs, authsize, 1);</div><div class='add'>+	} else {</div><div class='add'>+		scatterwalk_map_and_copy(idigest, req-&gt;src, offs, authsize, 0);</div><div class='add'>+		if (crypto_memneq(idigest, odigest, authsize))</div><div class='add'>+			err = -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+complete:</div><div class='add'>+	return atmel_aes_complete(dd, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_setkey(struct crypto_aead *tfm, const u8 *key,</div><div class='add'>+				    unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct atmel_aes_authenc_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	struct crypto_authenc_keys keys;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (crypto_authenc_extractkeys(&amp;keys, key, keylen) != 0)</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	if (keys.enckeylen &gt; sizeof(ctx-&gt;base.key))</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	/* Save auth key. */</div><div class='add'>+	flags = crypto_aead_get_flags(tfm);</div><div class='add'>+	err = atmel_sha_authenc_setkey(ctx-&gt;auth,</div><div class='add'>+				       keys.authkey, keys.authkeylen,</div><div class='add'>+				       &amp;flags);</div><div class='add'>+	crypto_aead_set_flags(tfm, flags &amp; CRYPTO_TFM_RES_MASK);</div><div class='add'>+	if (err) {</div><div class='add'>+		memzero_explicit(&amp;keys, sizeof(keys));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save enc key. */</div><div class='add'>+	ctx-&gt;base.keylen = keys.enckeylen;</div><div class='add'>+	memcpy(ctx-&gt;base.key, keys.enckey, keys.enckeylen);</div><div class='add'>+</div><div class='add'>+	memzero_explicit(&amp;keys, sizeof(keys));</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+badkey:</div><div class='add'>+	crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+	memzero_explicit(&amp;key, sizeof(keys));</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_init_tfm(struct crypto_aead *tfm,</div><div class='add'>+				      unsigned long auth_mode)</div><div class='add'>+{</div><div class='add'>+	struct atmel_aes_authenc_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	unsigned int auth_reqsize = atmel_sha_authenc_get_reqsize();</div><div class='add'>+</div><div class='add'>+	ctx-&gt;auth = atmel_sha_authenc_spawn(auth_mode);</div><div class='add'>+	if (IS_ERR(ctx-&gt;auth))</div><div class='add'>+		return PTR_ERR(ctx-&gt;auth);</div><div class='add'>+</div><div class='add'>+	crypto_aead_set_reqsize(tfm, (sizeof(struct atmel_aes_authenc_reqctx) +</div><div class='add'>+				      auth_reqsize));</div><div class='add'>+	ctx-&gt;base.start = atmel_aes_authenc_start;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_hmac_sha1_init_tfm(struct crypto_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	return atmel_aes_authenc_init_tfm(tfm, SHA_FLAGS_HMAC_SHA1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_hmac_sha224_init_tfm(struct crypto_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	return atmel_aes_authenc_init_tfm(tfm, SHA_FLAGS_HMAC_SHA224);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_hmac_sha256_init_tfm(struct crypto_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	return atmel_aes_authenc_init_tfm(tfm, SHA_FLAGS_HMAC_SHA256);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_hmac_sha384_init_tfm(struct crypto_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	return atmel_aes_authenc_init_tfm(tfm, SHA_FLAGS_HMAC_SHA384);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_hmac_sha512_init_tfm(struct crypto_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	return atmel_aes_authenc_init_tfm(tfm, SHA_FLAGS_HMAC_SHA512);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atmel_aes_authenc_exit_tfm(struct crypto_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	struct atmel_aes_authenc_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	atmel_sha_authenc_free(ctx-&gt;auth);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_crypt(struct aead_request *req,</div><div class='add'>+				   unsigned long mode)</div><div class='add'>+{</div><div class='add'>+	struct atmel_aes_authenc_reqctx *rctx = aead_request_ctx(req);</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	struct atmel_aes_base_ctx *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	u32 authsize = crypto_aead_authsize(tfm);</div><div class='add'>+	bool enc = (mode &amp; AES_FLAGS_ENCRYPT);</div><div class='add'>+	struct atmel_aes_dev *dd;</div><div class='add'>+</div><div class='add'>+	/* Compute text length. */</div><div class='add'>+	if (!enc &amp;&amp; req-&gt;cryptlen &lt; authsize)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	rctx-&gt;textlen = req-&gt;cryptlen - (enc ? 0 : authsize);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Currently, empty messages are not supported yet:</div><div class='add'>+	 * the SHA auto-padding can be used only on non-empty messages.</div><div class='add'>+	 * Hence a special case needs to be implemented for empty message.</div><div class='add'>+	 */</div><div class='add'>+	if (!rctx-&gt;textlen &amp;&amp; !req-&gt;assoclen)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rctx-&gt;base.mode = mode;</div><div class='add'>+	ctx-&gt;block_size = AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+	dd = atmel_aes_find_dev(ctx);</div><div class='add'>+	if (!dd)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return atmel_aes_handle_queue(dd, &amp;req-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_cbc_aes_encrypt(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	return atmel_aes_authenc_crypt(req, AES_FLAGS_CBC | AES_FLAGS_ENCRYPT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_aes_authenc_cbc_aes_decrypt(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	return atmel_aes_authenc_crypt(req, AES_FLAGS_CBC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct aead_alg aes_authenc_algs[] = {</div><div class='add'>+{</div><div class='add'>+	.setkey		= atmel_aes_authenc_setkey,</div><div class='add'>+	.encrypt	= atmel_aes_authenc_cbc_aes_encrypt,</div><div class='add'>+	.decrypt	= atmel_aes_authenc_cbc_aes_decrypt,</div><div class='add'>+	.init		= atmel_aes_authenc_hmac_sha1_init_tfm,</div><div class='add'>+	.exit		= atmel_aes_authenc_exit_tfm,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.maxauthsize	= SHA1_DIGEST_SIZE,</div><div class='add'>+</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "authenc(hmac(sha1),cbc(aes))",</div><div class='add'>+		.cra_driver_name	= "atmel-authenc-hmac-sha1-cbc-aes",</div><div class='add'>+		.cra_priority		= ATMEL_AES_PRIORITY,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='add'>+		.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct atmel_aes_authenc_ctx),</div><div class='add'>+		.cra_alignmask		= 0xf,</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.setkey		= atmel_aes_authenc_setkey,</div><div class='add'>+	.encrypt	= atmel_aes_authenc_cbc_aes_encrypt,</div><div class='add'>+	.decrypt	= atmel_aes_authenc_cbc_aes_decrypt,</div><div class='add'>+	.init		= atmel_aes_authenc_hmac_sha224_init_tfm,</div><div class='add'>+	.exit		= atmel_aes_authenc_exit_tfm,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.maxauthsize	= SHA224_DIGEST_SIZE,</div><div class='add'>+</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "authenc(hmac(sha224),cbc(aes))",</div><div class='add'>+		.cra_driver_name	= "atmel-authenc-hmac-sha224-cbc-aes",</div><div class='add'>+		.cra_priority		= ATMEL_AES_PRIORITY,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='add'>+		.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct atmel_aes_authenc_ctx),</div><div class='add'>+		.cra_alignmask		= 0xf,</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.setkey		= atmel_aes_authenc_setkey,</div><div class='add'>+	.encrypt	= atmel_aes_authenc_cbc_aes_encrypt,</div><div class='add'>+	.decrypt	= atmel_aes_authenc_cbc_aes_decrypt,</div><div class='add'>+	.init		= atmel_aes_authenc_hmac_sha256_init_tfm,</div><div class='add'>+	.exit		= atmel_aes_authenc_exit_tfm,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.maxauthsize	= SHA256_DIGEST_SIZE,</div><div class='add'>+</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "authenc(hmac(sha256),cbc(aes))",</div><div class='add'>+		.cra_driver_name	= "atmel-authenc-hmac-sha256-cbc-aes",</div><div class='add'>+		.cra_priority		= ATMEL_AES_PRIORITY,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='add'>+		.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct atmel_aes_authenc_ctx),</div><div class='add'>+		.cra_alignmask		= 0xf,</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.setkey		= atmel_aes_authenc_setkey,</div><div class='add'>+	.encrypt	= atmel_aes_authenc_cbc_aes_encrypt,</div><div class='add'>+	.decrypt	= atmel_aes_authenc_cbc_aes_decrypt,</div><div class='add'>+	.init		= atmel_aes_authenc_hmac_sha384_init_tfm,</div><div class='add'>+	.exit		= atmel_aes_authenc_exit_tfm,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.maxauthsize	= SHA384_DIGEST_SIZE,</div><div class='add'>+</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "authenc(hmac(sha384),cbc(aes))",</div><div class='add'>+		.cra_driver_name	= "atmel-authenc-hmac-sha384-cbc-aes",</div><div class='add'>+		.cra_priority		= ATMEL_AES_PRIORITY,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='add'>+		.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct atmel_aes_authenc_ctx),</div><div class='add'>+		.cra_alignmask		= 0xf,</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.setkey		= atmel_aes_authenc_setkey,</div><div class='add'>+	.encrypt	= atmel_aes_authenc_cbc_aes_encrypt,</div><div class='add'>+	.decrypt	= atmel_aes_authenc_cbc_aes_decrypt,</div><div class='add'>+	.init		= atmel_aes_authenc_hmac_sha512_init_tfm,</div><div class='add'>+	.exit		= atmel_aes_authenc_exit_tfm,</div><div class='add'>+	.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	.maxauthsize	= SHA512_DIGEST_SIZE,</div><div class='add'>+</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "authenc(hmac(sha512),cbc(aes))",</div><div class='add'>+		.cra_driver_name	= "atmel-authenc-hmac-sha512-cbc-aes",</div><div class='add'>+		.cra_priority		= ATMEL_AES_PRIORITY,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='add'>+		.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct atmel_aes_authenc_ctx),</div><div class='add'>+		.cra_alignmask		= 0xf,</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_CRYPTO_DEV_ATMEL_AUTHENC */</div><div class='add'>+</div><div class='ctx'> /* Probe functions */</div><div class='ctx'> </div><div class='ctx'> static int atmel_aes_buff_init(struct atmel_aes_dev *dd)</div><div class='hunk'>@@ -1877,6 +2453,15 @@ static void atmel_aes_unregister_algs(struct atmel_aes_dev *dd)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+	if (dd-&gt;caps.has_authenc)</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(aes_authenc_algs); i++)</div><div class='add'>+			crypto_unregister_aead(&amp;aes_authenc_algs[i]);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (dd-&gt;caps.has_xts)</div><div class='add'>+		crypto_unregister_alg(&amp;aes_xts_alg);</div><div class='add'>+</div><div class='ctx'> 	if (dd-&gt;caps.has_gcm)</div><div class='ctx'> 		crypto_unregister_aead(&amp;aes_gcm_alg);</div><div class='ctx'> </div><div class='hunk'>@@ -1909,8 +2494,33 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd)</div><div class='ctx'> 			goto err_aes_gcm_alg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dd-&gt;caps.has_xts) {</div><div class='add'>+		err = crypto_register_alg(&amp;aes_xts_alg);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_aes_xts_alg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+	if (dd-&gt;caps.has_authenc) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(aes_authenc_algs); i++) {</div><div class='add'>+			err = crypto_register_aead(&amp;aes_authenc_algs[i]);</div><div class='add'>+			if (err)</div><div class='add'>+				goto err_aes_authenc_alg;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+	/* i = ARRAY_SIZE(aes_authenc_algs); */</div><div class='add'>+err_aes_authenc_alg:</div><div class='add'>+	for (j = 0; j &lt; i; j++)</div><div class='add'>+		crypto_unregister_aead(&amp;aes_authenc_algs[j]);</div><div class='add'>+	crypto_unregister_alg(&amp;aes_xts_alg);</div><div class='add'>+#endif</div><div class='add'>+err_aes_xts_alg:</div><div class='add'>+	crypto_unregister_aead(&amp;aes_gcm_alg);</div><div class='ctx'> err_aes_gcm_alg:</div><div class='ctx'> 	crypto_unregister_alg(&amp;aes_cfb64_alg);</div><div class='ctx'> err_aes_cfb64_alg:</div><div class='hunk'>@@ -1928,6 +2538,8 @@ static void atmel_aes_get_cap(struct atmel_aes_dev *dd)</div><div class='ctx'> 	dd-&gt;caps.has_cfb64 = 0;</div><div class='ctx'> 	dd-&gt;caps.has_ctr32 = 0;</div><div class='ctx'> 	dd-&gt;caps.has_gcm = 0;</div><div class='add'>+	dd-&gt;caps.has_xts = 0;</div><div class='add'>+	dd-&gt;caps.has_authenc = 0;</div><div class='ctx'> 	dd-&gt;caps.max_burst_size = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* keep only major version number */</div><div class='hunk'>@@ -1937,6 +2549,8 @@ static void atmel_aes_get_cap(struct atmel_aes_dev *dd)</div><div class='ctx'> 		dd-&gt;caps.has_cfb64 = 1;</div><div class='ctx'> 		dd-&gt;caps.has_ctr32 = 1;</div><div class='ctx'> 		dd-&gt;caps.has_gcm = 1;</div><div class='add'>+		dd-&gt;caps.has_xts = 1;</div><div class='add'>+		dd-&gt;caps.has_authenc = 1;</div><div class='ctx'> 		dd-&gt;caps.max_burst_size = 4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x200:</div><div class='hunk'>@@ -2095,6 +2709,13 @@ static int atmel_aes_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	atmel_aes_get_cap(aes_dd);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+	if (aes_dd-&gt;caps.has_authenc &amp;&amp; !atmel_sha_authenc_is_ready()) {</div><div class='add'>+		err = -EPROBE_DEFER;</div><div class='add'>+		goto iclk_unprepare;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	err = atmel_aes_buff_init(aes_dd);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_aes_buff;</div><div class='hunk'>@@ -2131,14 +2752,15 @@ res_err:</div><div class='ctx'> 	tasklet_kill(&amp;aes_dd-&gt;done_task);</div><div class='ctx'> 	tasklet_kill(&amp;aes_dd-&gt;queue_task);</div><div class='ctx'> aes_dd_err:</div><div class='del'>-	dev_err(dev, "initialization failed.\n");</div><div class='add'>+	if (err != -EPROBE_DEFER)</div><div class='add'>+		dev_err(dev, "initialization failed.\n");</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atmel_aes_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	static struct atmel_aes_dev *aes_dd;</div><div class='add'>+	struct atmel_aes_dev *aes_dd;</div><div class='ctx'> </div><div class='ctx'> 	aes_dd = platform_get_drvdata(pdev);</div><div class='ctx'> 	if (!aes_dd)</div><div class='head'>diff --git a/drivers/crypto/atmel-authenc.h b/drivers/crypto/atmel-authenc.h<br/>new file mode 100644<br/>index 000000000000..2a60d1224143<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/atmel-authenc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-authenc.h</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/*</div><div class='add'>+ * API for Atmel Secure Protocol Layers Improved Performances (SPLIP)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Atmel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Author: Cyrille Pitchen &lt;cyrille.pitchen@atmel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ *</div><div class='add'>+ * This driver is based on drivers/mtd/spi-nor/fsl-quadspi.c from Freescale.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ATMEL_AUTHENC_H__</div><div class='add'>+#define __ATMEL_AUTHENC_H__</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/authenc.h&gt;</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;crypto/sha.h&gt;</div><div class='add'>+#include "atmel-sha-regs.h"</div><div class='add'>+</div><div class='add'>+struct atmel_aes_dev;</div><div class='add'>+typedef int (*atmel_aes_authenc_fn_t)(struct atmel_aes_dev *, int, bool);</div><div class='add'>+</div><div class='add'>+struct atmel_sha_authenc_ctx;</div><div class='add'>+</div><div class='add'>+bool atmel_sha_authenc_is_ready(void);</div><div class='add'>+unsigned int atmel_sha_authenc_get_reqsize(void);</div><div class='add'>+</div><div class='add'>+struct atmel_sha_authenc_ctx *atmel_sha_authenc_spawn(unsigned long mode);</div><div class='add'>+void atmel_sha_authenc_free(struct atmel_sha_authenc_ctx *auth);</div><div class='add'>+int atmel_sha_authenc_setkey(struct atmel_sha_authenc_ctx *auth,</div><div class='add'>+			     const u8 *key, unsigned int keylen,</div><div class='add'>+			     u32 *flags);</div><div class='add'>+</div><div class='add'>+int atmel_sha_authenc_schedule(struct ahash_request *req,</div><div class='add'>+			       struct atmel_sha_authenc_ctx *auth,</div><div class='add'>+			       atmel_aes_authenc_fn_t cb,</div><div class='add'>+			       struct atmel_aes_dev *dd);</div><div class='add'>+int atmel_sha_authenc_init(struct ahash_request *req,</div><div class='add'>+			   struct scatterlist *assoc, unsigned int assoclen,</div><div class='add'>+			   unsigned int textlen,</div><div class='add'>+			   atmel_aes_authenc_fn_t cb,</div><div class='add'>+			   struct atmel_aes_dev *dd);</div><div class='add'>+int atmel_sha_authenc_final(struct ahash_request *req,</div><div class='add'>+			    u32 *digest, unsigned int digestlen,</div><div class='add'>+			    atmel_aes_authenc_fn_t cb,</div><div class='add'>+			    struct atmel_aes_dev *dd);</div><div class='add'>+void  atmel_sha_authenc_abort(struct ahash_request *req);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_CRYPTO_DEV_ATMEL_AUTHENC */</div><div class='add'>+</div><div class='add'>+#endif /* __ATMEL_AUTHENC_H__ */</div><div class='head'>diff --git a/drivers/crypto/atmel-sha-regs.h b/drivers/crypto/atmel-sha-regs.h<br/>index e08897109cab..1b0eba4a2706 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/atmel-sha-regs.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/atmel-sha-regs.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/atmel-sha-regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-sha-regs.h</a></div><div class='hunk'>@@ -16,16 +16,33 @@</div><div class='ctx'> #define SHA_MR_MODE_MANUAL		0x0</div><div class='ctx'> #define SHA_MR_MODE_AUTO		0x1</div><div class='ctx'> #define SHA_MR_MODE_PDC			0x2</div><div class='add'>+#define SHA_MR_MODE_IDATAR0		0x2</div><div class='ctx'> #define SHA_MR_PROCDLY			(1 &lt;&lt; 4)</div><div class='ctx'> #define SHA_MR_UIHV			(1 &lt;&lt; 5)</div><div class='ctx'> #define SHA_MR_UIEHV			(1 &lt;&lt; 6)</div><div class='add'>+#define SHA_MR_ALGO_MASK		GENMASK(10, 8)</div><div class='ctx'> #define SHA_MR_ALGO_SHA1		(0 &lt;&lt; 8)</div><div class='ctx'> #define SHA_MR_ALGO_SHA256		(1 &lt;&lt; 8)</div><div class='ctx'> #define SHA_MR_ALGO_SHA384		(2 &lt;&lt; 8)</div><div class='ctx'> #define SHA_MR_ALGO_SHA512		(3 &lt;&lt; 8)</div><div class='ctx'> #define SHA_MR_ALGO_SHA224		(4 &lt;&lt; 8)</div><div class='add'>+#define SHA_MR_HMAC			(1 &lt;&lt; 11)</div><div class='ctx'> #define	SHA_MR_DUALBUFF			(1 &lt;&lt; 16)</div><div class='ctx'> </div><div class='add'>+#define SHA_FLAGS_ALGO_MASK	SHA_MR_ALGO_MASK</div><div class='add'>+#define SHA_FLAGS_SHA1		SHA_MR_ALGO_SHA1</div><div class='add'>+#define SHA_FLAGS_SHA256	SHA_MR_ALGO_SHA256</div><div class='add'>+#define SHA_FLAGS_SHA384	SHA_MR_ALGO_SHA384</div><div class='add'>+#define SHA_FLAGS_SHA512	SHA_MR_ALGO_SHA512</div><div class='add'>+#define SHA_FLAGS_SHA224	SHA_MR_ALGO_SHA224</div><div class='add'>+#define SHA_FLAGS_HMAC		SHA_MR_HMAC</div><div class='add'>+#define SHA_FLAGS_HMAC_SHA1	(SHA_FLAGS_HMAC | SHA_FLAGS_SHA1)</div><div class='add'>+#define SHA_FLAGS_HMAC_SHA256	(SHA_FLAGS_HMAC | SHA_FLAGS_SHA256)</div><div class='add'>+#define SHA_FLAGS_HMAC_SHA384	(SHA_FLAGS_HMAC | SHA_FLAGS_SHA384)</div><div class='add'>+#define SHA_FLAGS_HMAC_SHA512	(SHA_FLAGS_HMAC | SHA_FLAGS_SHA512)</div><div class='add'>+#define SHA_FLAGS_HMAC_SHA224	(SHA_FLAGS_HMAC | SHA_FLAGS_SHA224)</div><div class='add'>+#define SHA_FLAGS_MODE_MASK	(SHA_FLAGS_HMAC | SHA_FLAGS_ALGO_MASK)</div><div class='add'>+</div><div class='ctx'> #define SHA_IER				0x10</div><div class='ctx'> #define SHA_IDR				0x14</div><div class='ctx'> #define SHA_IMR				0x18</div><div class='hunk'>@@ -40,6 +57,9 @@</div><div class='ctx'> #define SHA_ISR_URAT_MR			(0x2 &lt;&lt; 12)</div><div class='ctx'> #define SHA_ISR_URAT_WO			(0x5 &lt;&lt; 12)</div><div class='ctx'> </div><div class='add'>+#define SHA_MSR				0x20</div><div class='add'>+#define SHA_BCR				0x30</div><div class='add'>+</div><div class='ctx'> #define	SHA_HW_VERSION		0xFC</div><div class='ctx'> </div><div class='ctx'> #define SHA_TPR				0x108</div><div class='head'>diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c<br/>index 97e34799e077..a9482023d7d3 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/atmel-sha.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/atmel-sha.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/atmel-sha.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-sha.c</a></div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/crypto-atmel.h&gt;</div><div class='ctx'> #include "atmel-sha-regs.h"</div><div class='add'>+#include "atmel-authenc.h"</div><div class='ctx'> </div><div class='ctx'> /* SHA flags */</div><div class='ctx'> #define SHA_FLAGS_BUSY			BIT(0)</div><div class='hunk'>@@ -50,21 +51,22 @@</div><div class='ctx'> #define SHA_FLAGS_INIT			BIT(4)</div><div class='ctx'> #define SHA_FLAGS_CPU			BIT(5)</div><div class='ctx'> #define SHA_FLAGS_DMA_READY		BIT(6)</div><div class='add'>+#define SHA_FLAGS_DUMP_REG	BIT(7)</div><div class='add'>+</div><div class='add'>+/* bits[11:8] are reserved. */</div><div class='ctx'> </div><div class='ctx'> #define SHA_FLAGS_FINUP		BIT(16)</div><div class='ctx'> #define SHA_FLAGS_SG		BIT(17)</div><div class='del'>-#define SHA_FLAGS_ALGO_MASK	GENMASK(22, 18)</div><div class='del'>-#define SHA_FLAGS_SHA1		BIT(18)</div><div class='del'>-#define SHA_FLAGS_SHA224	BIT(19)</div><div class='del'>-#define SHA_FLAGS_SHA256	BIT(20)</div><div class='del'>-#define SHA_FLAGS_SHA384	BIT(21)</div><div class='del'>-#define SHA_FLAGS_SHA512	BIT(22)</div><div class='ctx'> #define SHA_FLAGS_ERROR		BIT(23)</div><div class='ctx'> #define SHA_FLAGS_PAD		BIT(24)</div><div class='ctx'> #define SHA_FLAGS_RESTORE	BIT(25)</div><div class='add'>+#define SHA_FLAGS_IDATAR0	BIT(26)</div><div class='add'>+#define SHA_FLAGS_WAIT_DATARDY	BIT(27)</div><div class='ctx'> </div><div class='add'>+#define SHA_OP_INIT	0</div><div class='ctx'> #define SHA_OP_UPDATE	1</div><div class='ctx'> #define SHA_OP_FINAL	2</div><div class='add'>+#define SHA_OP_DIGEST	3</div><div class='ctx'> </div><div class='ctx'> #define SHA_BUFFER_LEN		(PAGE_SIZE / 16)</div><div class='ctx'> </div><div class='hunk'>@@ -76,6 +78,7 @@ struct atmel_sha_caps {</div><div class='ctx'> 	bool	has_sha224;</div><div class='ctx'> 	bool	has_sha_384_512;</div><div class='ctx'> 	bool	has_uihv;</div><div class='add'>+	bool	has_hmac;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct atmel_sha_dev;</div><div class='hunk'>@@ -101,12 +104,16 @@ struct atmel_sha_reqctx {</div><div class='ctx'> 	unsigned int	total;	/* total request */</div><div class='ctx'> </div><div class='ctx'> 	size_t block_size;</div><div class='add'>+	size_t hash_size;</div><div class='ctx'> </div><div class='ctx'> 	u8 buffer[SHA_BUFFER_LEN + SHA512_BLOCK_SIZE] __aligned(sizeof(u32));</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+typedef int (*atmel_sha_fn_t)(struct atmel_sha_dev *);</div><div class='add'>+</div><div class='ctx'> struct atmel_sha_ctx {</div><div class='ctx'> 	struct atmel_sha_dev	*dd;</div><div class='add'>+	atmel_sha_fn_t		start;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		flags;</div><div class='ctx'> };</div><div class='hunk'>@@ -116,6 +123,9 @@ struct atmel_sha_ctx {</div><div class='ctx'> struct atmel_sha_dma {</div><div class='ctx'> 	struct dma_chan			*chan;</div><div class='ctx'> 	struct dma_slave_config dma_conf;</div><div class='add'>+	struct scatterlist	*sg;</div><div class='add'>+	int			nents;</div><div class='add'>+	unsigned int		last_sg_length;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct atmel_sha_dev {</div><div class='hunk'>@@ -134,11 +144,17 @@ struct atmel_sha_dev {</div><div class='ctx'> 	unsigned long		flags;</div><div class='ctx'> 	struct crypto_queue	queue;</div><div class='ctx'> 	struct ahash_request	*req;</div><div class='add'>+	bool			is_async;</div><div class='add'>+	bool			force_complete;</div><div class='add'>+	atmel_sha_fn_t		resume;</div><div class='add'>+	atmel_sha_fn_t		cpu_transfer_complete;</div><div class='ctx'> </div><div class='ctx'> 	struct atmel_sha_dma	dma_lch_in;</div><div class='ctx'> </div><div class='ctx'> 	struct atmel_sha_caps	caps;</div><div class='ctx'> </div><div class='add'>+	struct scatterlist	tmp;</div><div class='add'>+</div><div class='ctx'> 	u32	hw_version;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -152,17 +168,140 @@ static struct atmel_sha_drv atmel_sha = {</div><div class='ctx'> 	.lock = __SPIN_LOCK_UNLOCKED(atmel_sha.lock),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef VERBOSE_DEBUG</div><div class='add'>+static const char *atmel_sha_reg_name(u32 offset, char *tmp, size_t sz, bool wr)</div><div class='add'>+{</div><div class='add'>+	switch (offset) {</div><div class='add'>+	case SHA_CR:</div><div class='add'>+		return "CR";</div><div class='add'>+</div><div class='add'>+	case SHA_MR:</div><div class='add'>+		return "MR";</div><div class='add'>+</div><div class='add'>+	case SHA_IER:</div><div class='add'>+		return "IER";</div><div class='add'>+</div><div class='add'>+	case SHA_IDR:</div><div class='add'>+		return "IDR";</div><div class='add'>+</div><div class='add'>+	case SHA_IMR:</div><div class='add'>+		return "IMR";</div><div class='add'>+</div><div class='add'>+	case SHA_ISR:</div><div class='add'>+		return "ISR";</div><div class='add'>+</div><div class='add'>+	case SHA_MSR:</div><div class='add'>+		return "MSR";</div><div class='add'>+</div><div class='add'>+	case SHA_BCR:</div><div class='add'>+		return "BCR";</div><div class='add'>+</div><div class='add'>+	case SHA_REG_DIN(0):</div><div class='add'>+	case SHA_REG_DIN(1):</div><div class='add'>+	case SHA_REG_DIN(2):</div><div class='add'>+	case SHA_REG_DIN(3):</div><div class='add'>+	case SHA_REG_DIN(4):</div><div class='add'>+	case SHA_REG_DIN(5):</div><div class='add'>+	case SHA_REG_DIN(6):</div><div class='add'>+	case SHA_REG_DIN(7):</div><div class='add'>+	case SHA_REG_DIN(8):</div><div class='add'>+	case SHA_REG_DIN(9):</div><div class='add'>+	case SHA_REG_DIN(10):</div><div class='add'>+	case SHA_REG_DIN(11):</div><div class='add'>+	case SHA_REG_DIN(12):</div><div class='add'>+	case SHA_REG_DIN(13):</div><div class='add'>+	case SHA_REG_DIN(14):</div><div class='add'>+	case SHA_REG_DIN(15):</div><div class='add'>+		snprintf(tmp, sz, "IDATAR[%u]", (offset - SHA_REG_DIN(0)) &gt;&gt; 2);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_REG_DIGEST(0):</div><div class='add'>+	case SHA_REG_DIGEST(1):</div><div class='add'>+	case SHA_REG_DIGEST(2):</div><div class='add'>+	case SHA_REG_DIGEST(3):</div><div class='add'>+	case SHA_REG_DIGEST(4):</div><div class='add'>+	case SHA_REG_DIGEST(5):</div><div class='add'>+	case SHA_REG_DIGEST(6):</div><div class='add'>+	case SHA_REG_DIGEST(7):</div><div class='add'>+	case SHA_REG_DIGEST(8):</div><div class='add'>+	case SHA_REG_DIGEST(9):</div><div class='add'>+	case SHA_REG_DIGEST(10):</div><div class='add'>+	case SHA_REG_DIGEST(11):</div><div class='add'>+	case SHA_REG_DIGEST(12):</div><div class='add'>+	case SHA_REG_DIGEST(13):</div><div class='add'>+	case SHA_REG_DIGEST(14):</div><div class='add'>+	case SHA_REG_DIGEST(15):</div><div class='add'>+		if (wr)</div><div class='add'>+			snprintf(tmp, sz, "IDATAR[%u]",</div><div class='add'>+				 16u + ((offset - SHA_REG_DIGEST(0)) &gt;&gt; 2));</div><div class='add'>+		else</div><div class='add'>+			snprintf(tmp, sz, "ODATAR[%u]",</div><div class='add'>+				 (offset - SHA_REG_DIGEST(0)) &gt;&gt; 2);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_HW_VERSION:</div><div class='add'>+		return "HWVER";</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		snprintf(tmp, sz, "0x%02x", offset);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* VERBOSE_DEBUG */</div><div class='add'>+</div><div class='ctx'> static inline u32 atmel_sha_read(struct atmel_sha_dev *dd, u32 offset)</div><div class='ctx'> {</div><div class='del'>-	return readl_relaxed(dd-&gt;io_base + offset);</div><div class='add'>+	u32 value = readl_relaxed(dd-&gt;io_base + offset);</div><div class='add'>+</div><div class='add'>+#ifdef VERBOSE_DEBUG</div><div class='add'>+	if (dd-&gt;flags &amp; SHA_FLAGS_DUMP_REG) {</div><div class='add'>+		char tmp[16];</div><div class='add'>+</div><div class='add'>+		dev_vdbg(dd-&gt;dev, "read 0x%08x from %s\n", value,</div><div class='add'>+			 atmel_sha_reg_name(offset, tmp, sizeof(tmp), false));</div><div class='add'>+	}</div><div class='add'>+#endif /* VERBOSE_DEBUG */</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void atmel_sha_write(struct atmel_sha_dev *dd,</div><div class='ctx'> 					u32 offset, u32 value)</div><div class='ctx'> {</div><div class='add'>+#ifdef VERBOSE_DEBUG</div><div class='add'>+	if (dd-&gt;flags &amp; SHA_FLAGS_DUMP_REG) {</div><div class='add'>+		char tmp[16];</div><div class='add'>+</div><div class='add'>+		dev_vdbg(dd-&gt;dev, "write 0x%08x into %s\n", value,</div><div class='add'>+			 atmel_sha_reg_name(offset, tmp, sizeof(tmp), true));</div><div class='add'>+	}</div><div class='add'>+#endif /* VERBOSE_DEBUG */</div><div class='add'>+</div><div class='ctx'> 	writel_relaxed(value, dd-&gt;io_base + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int atmel_sha_complete(struct atmel_sha_dev *dd, int err)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+</div><div class='add'>+	dd-&gt;flags &amp;= ~(SHA_FLAGS_BUSY | SHA_FLAGS_FINAL | SHA_FLAGS_CPU |</div><div class='add'>+		       SHA_FLAGS_DMA_READY | SHA_FLAGS_OUTPUT_READY |</div><div class='add'>+		       SHA_FLAGS_DUMP_REG);</div><div class='add'>+</div><div class='add'>+	clk_disable(dd-&gt;iclk);</div><div class='add'>+</div><div class='add'>+	if ((dd-&gt;is_async || dd-&gt;force_complete) &amp;&amp; req-&gt;base.complete)</div><div class='add'>+		req-&gt;base.complete(&amp;req-&gt;base, err);</div><div class='add'>+</div><div class='add'>+	/* handle new request */</div><div class='add'>+	tasklet_schedule(&amp;dd-&gt;queue_task);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static size_t atmel_sha_append_sg(struct atmel_sha_reqctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	size_t count;</div><div class='hunk'>@@ -241,7 +380,9 @@ static void atmel_sha_fill_padding(struct atmel_sha_reqctx *ctx, int length)</div><div class='ctx'> 	bits[1] = cpu_to_be64(size[0] &lt;&lt; 3);</div><div class='ctx'> 	bits[0] = cpu_to_be64(size[1] &lt;&lt; 3 | size[0] &gt;&gt; 61);</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;flags &amp; (SHA_FLAGS_SHA384 | SHA_FLAGS_SHA512)) {</div><div class='add'>+	switch (ctx-&gt;flags &amp; SHA_FLAGS_ALGO_MASK) {</div><div class='add'>+	case SHA_FLAGS_SHA384:</div><div class='add'>+	case SHA_FLAGS_SHA512:</div><div class='ctx'> 		index = ctx-&gt;bufcnt &amp; 0x7f;</div><div class='ctx'> 		padlen = (index &lt; 112) ? (112 - index) : ((128+112) - index);</div><div class='ctx'> 		*(ctx-&gt;buffer + ctx-&gt;bufcnt) = 0x80;</div><div class='hunk'>@@ -249,7 +390,9 @@ static void atmel_sha_fill_padding(struct atmel_sha_reqctx *ctx, int length)</div><div class='ctx'> 		memcpy(ctx-&gt;buffer + ctx-&gt;bufcnt + padlen, bits, 16);</div><div class='ctx'> 		ctx-&gt;bufcnt += padlen + 16;</div><div class='ctx'> 		ctx-&gt;flags |= SHA_FLAGS_PAD;</div><div class='del'>-	} else {</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='ctx'> 		index = ctx-&gt;bufcnt &amp; 0x3f;</div><div class='ctx'> 		padlen = (index &lt; 56) ? (56 - index) : ((64+56) - index);</div><div class='ctx'> 		*(ctx-&gt;buffer + ctx-&gt;bufcnt) = 0x80;</div><div class='hunk'>@@ -257,14 +400,12 @@ static void atmel_sha_fill_padding(struct atmel_sha_reqctx *ctx, int length)</div><div class='ctx'> 		memcpy(ctx-&gt;buffer + ctx-&gt;bufcnt + padlen, &amp;bits[1], 8);</div><div class='ctx'> 		ctx-&gt;bufcnt += padlen + 8;</div><div class='ctx'> 		ctx-&gt;flags |= SHA_FLAGS_PAD;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int atmel_sha_init(struct ahash_request *req)</div><div class='add'>+static struct atmel_sha_dev *atmel_sha_find_dev(struct atmel_sha_ctx *tctx)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='del'>-	struct atmel_sha_ctx *tctx = crypto_ahash_ctx(tfm);</div><div class='del'>-	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='ctx'> 	struct atmel_sha_dev *dd = NULL;</div><div class='ctx'> 	struct atmel_sha_dev *tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -281,6 +422,16 @@ static int atmel_sha_init(struct ahash_request *req)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;atmel_sha.lock);</div><div class='ctx'> </div><div class='add'>+	return dd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_init(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct atmel_sha_ctx *tctx = crypto_ahash_ctx(tfm);</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	struct atmel_sha_dev *dd = atmel_sha_find_dev(tctx);</div><div class='add'>+</div><div class='ctx'> 	ctx-&gt;dd = dd;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;flags = 0;</div><div class='hunk'>@@ -397,6 +548,19 @@ static void atmel_sha_write_ctrl(struct atmel_sha_dev *dd, int dma)</div><div class='ctx'> 	atmel_sha_write(dd, SHA_MR, valmr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int atmel_sha_wait_for_data_ready(struct atmel_sha_dev *dd,</div><div class='add'>+						atmel_sha_fn_t resume)</div><div class='add'>+{</div><div class='add'>+	u32 isr = atmel_sha_read(dd, SHA_ISR);</div><div class='add'>+</div><div class='add'>+	if (unlikely(isr &amp; SHA_INT_DATARDY))</div><div class='add'>+		return resume(dd);</div><div class='add'>+</div><div class='add'>+	dd-&gt;resume = resume;</div><div class='add'>+	atmel_sha_write(dd, SHA_IER, SHA_INT_DATARDY);</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int atmel_sha_xmit_cpu(struct atmel_sha_dev *dd, const u8 *buf,</div><div class='ctx'> 			      size_t length, int final)</div><div class='ctx'> {</div><div class='hunk'>@@ -404,7 +568,7 @@ static int atmel_sha_xmit_cpu(struct atmel_sha_dev *dd, const u8 *buf,</div><div class='ctx'> 	int count, len32;</div><div class='ctx'> 	const u32 *buffer = (const u32 *)buf;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dd-&gt;dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",</div><div class='add'>+	dev_dbg(dd-&gt;dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %zd, final: %d\n",</div><div class='ctx'> 		ctx-&gt;digcnt[1], ctx-&gt;digcnt[0], length, final);</div><div class='ctx'> </div><div class='ctx'> 	atmel_sha_write_ctrl(dd, 0);</div><div class='hunk'>@@ -433,7 +597,7 @@ static int atmel_sha_xmit_pdc(struct atmel_sha_dev *dd, dma_addr_t dma_addr1,</div><div class='ctx'> 	struct atmel_sha_reqctx *ctx = ahash_request_ctx(dd-&gt;req);</div><div class='ctx'> 	int len32;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dd-&gt;dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",</div><div class='add'>+	dev_dbg(dd-&gt;dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %zd, final: %d\n",</div><div class='ctx'> 		ctx-&gt;digcnt[1], ctx-&gt;digcnt[0], length1, final);</div><div class='ctx'> </div><div class='ctx'> 	len32 = DIV_ROUND_UP(length1, sizeof(u32));</div><div class='hunk'>@@ -467,6 +631,8 @@ static void atmel_sha_dma_callback(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_sha_dev *dd = data;</div><div class='ctx'> </div><div class='add'>+	dd-&gt;is_async = true;</div><div class='add'>+</div><div class='ctx'> 	/* dma_lch_in - completed - wait DATRDY */</div><div class='ctx'> 	atmel_sha_write(dd, SHA_IER, SHA_INT_DATARDY);</div><div class='ctx'> }</div><div class='hunk'>@@ -478,7 +644,7 @@ static int atmel_sha_xmit_dma(struct atmel_sha_dev *dd, dma_addr_t dma_addr1,</div><div class='ctx'> 	struct dma_async_tx_descriptor	*in_desc;</div><div class='ctx'> 	struct scatterlist sg[2];</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dd-&gt;dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",</div><div class='add'>+	dev_dbg(dd-&gt;dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %zd, final: %d\n",</div><div class='ctx'> 		ctx-&gt;digcnt[1], ctx-&gt;digcnt[0], length1, final);</div><div class='ctx'> </div><div class='ctx'> 	dd-&gt;dma_lch_in.dma_conf.src_maxburst = 16;</div><div class='hunk'>@@ -502,7 +668,7 @@ static int atmel_sha_xmit_dma(struct atmel_sha_dev *dd, dma_addr_t dma_addr1,</div><div class='ctx'> 			DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!in_desc)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return atmel_sha_complete(dd, -EINVAL);</div><div class='ctx'> </div><div class='ctx'> 	in_desc-&gt;callback = atmel_sha_dma_callback;</div><div class='ctx'> 	in_desc-&gt;callback_param = dd;</div><div class='hunk'>@@ -557,9 +723,9 @@ static int atmel_sha_xmit_dma_map(struct atmel_sha_dev *dd,</div><div class='ctx'> 	ctx-&gt;dma_addr = dma_map_single(dd-&gt;dev, ctx-&gt;buffer,</div><div class='ctx'> 				ctx-&gt;buflen + ctx-&gt;block_size, DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(dd-&gt;dev, ctx-&gt;dma_addr)) {</div><div class='del'>-		dev_err(dd-&gt;dev, "dma %u bytes error\n", ctx-&gt;buflen +</div><div class='add'>+		dev_err(dd-&gt;dev, "dma %zu bytes error\n", ctx-&gt;buflen +</div><div class='ctx'> 				ctx-&gt;block_size);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return atmel_sha_complete(dd, -EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;flags &amp;= ~SHA_FLAGS_SG;</div><div class='hunk'>@@ -578,7 +744,7 @@ static int atmel_sha_update_dma_slow(struct atmel_sha_dev *dd)</div><div class='ctx'> </div><div class='ctx'> 	final = (ctx-&gt;flags &amp; SHA_FLAGS_FINUP) &amp;&amp; !ctx-&gt;total;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dd-&gt;dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n",</div><div class='add'>+	dev_dbg(dd-&gt;dev, "slow: bufcnt: %zu, digcnt: 0x%llx 0x%llx, final: %d\n",</div><div class='ctx'> 		 ctx-&gt;bufcnt, ctx-&gt;digcnt[1], ctx-&gt;digcnt[0], final);</div><div class='ctx'> </div><div class='ctx'> 	if (final)</div><div class='hunk'>@@ -606,7 +772,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd)</div><div class='ctx'> 	if (ctx-&gt;bufcnt || ctx-&gt;offset)</div><div class='ctx'> 		return atmel_sha_update_dma_slow(dd);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dd-&gt;dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n",</div><div class='add'>+	dev_dbg(dd-&gt;dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %zd, total: %u\n",</div><div class='ctx'> 		ctx-&gt;digcnt[1], ctx-&gt;digcnt[0], ctx-&gt;bufcnt, ctx-&gt;total);</div><div class='ctx'> </div><div class='ctx'> 	sg = ctx-&gt;sg;</div><div class='hunk'>@@ -648,9 +814,9 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd)</div><div class='ctx'> 		ctx-&gt;dma_addr = dma_map_single(dd-&gt;dev, ctx-&gt;buffer,</div><div class='ctx'> 			ctx-&gt;buflen + ctx-&gt;block_size, DMA_TO_DEVICE);</div><div class='ctx'> 		if (dma_mapping_error(dd-&gt;dev, ctx-&gt;dma_addr)) {</div><div class='del'>-			dev_err(dd-&gt;dev, "dma %u bytes error\n",</div><div class='add'>+			dev_err(dd-&gt;dev, "dma %zu bytes error\n",</div><div class='ctx'> 				ctx-&gt;buflen + ctx-&gt;block_size);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			return atmel_sha_complete(dd, -EINVAL);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (length == 0) {</div><div class='hunk'>@@ -664,7 +830,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd)</div><div class='ctx'> 			if (!dma_map_sg(dd-&gt;dev, ctx-&gt;sg, 1,</div><div class='ctx'> 				DMA_TO_DEVICE)) {</div><div class='ctx'> 					dev_err(dd-&gt;dev, "dma_map_sg  error\n");</div><div class='del'>-					return -EINVAL;</div><div class='add'>+					return atmel_sha_complete(dd, -EINVAL);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			ctx-&gt;flags |= SHA_FLAGS_SG;</div><div class='hunk'>@@ -678,7 +844,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd)</div><div class='ctx'> </div><div class='ctx'> 	if (!dma_map_sg(dd-&gt;dev, ctx-&gt;sg, 1, DMA_TO_DEVICE)) {</div><div class='ctx'> 		dev_err(dd-&gt;dev, "dma_map_sg  error\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return atmel_sha_complete(dd, -EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;flags |= SHA_FLAGS_SG;</div><div class='hunk'>@@ -796,16 +962,28 @@ static void atmel_sha_copy_ready_hash(struct ahash_request *req)</div><div class='ctx'> 	if (!req-&gt;result)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;flags &amp; SHA_FLAGS_SHA1)</div><div class='add'>+	switch (ctx-&gt;flags &amp; SHA_FLAGS_ALGO_MASK) {</div><div class='add'>+	default:</div><div class='add'>+	case SHA_FLAGS_SHA1:</div><div class='ctx'> 		memcpy(req-&gt;result, ctx-&gt;digest, SHA1_DIGEST_SIZE);</div><div class='del'>-	else if (ctx-&gt;flags &amp; SHA_FLAGS_SHA224)</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA224:</div><div class='ctx'> 		memcpy(req-&gt;result, ctx-&gt;digest, SHA224_DIGEST_SIZE);</div><div class='del'>-	else if (ctx-&gt;flags &amp; SHA_FLAGS_SHA256)</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA256:</div><div class='ctx'> 		memcpy(req-&gt;result, ctx-&gt;digest, SHA256_DIGEST_SIZE);</div><div class='del'>-	else if (ctx-&gt;flags &amp; SHA_FLAGS_SHA384)</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA384:</div><div class='ctx'> 		memcpy(req-&gt;result, ctx-&gt;digest, SHA384_DIGEST_SIZE);</div><div class='del'>-	else</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA512:</div><div class='ctx'> 		memcpy(req-&gt;result, ctx-&gt;digest, SHA512_DIGEST_SIZE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atmel_sha_finish(struct ahash_request *req)</div><div class='hunk'>@@ -816,7 +994,7 @@ static int atmel_sha_finish(struct ahash_request *req)</div><div class='ctx'> 	if (ctx-&gt;digcnt[0] || ctx-&gt;digcnt[1])</div><div class='ctx'> 		atmel_sha_copy_ready_hash(req);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dd-&gt;dev, "digcnt: 0x%llx 0x%llx, bufcnt: %d\n", ctx-&gt;digcnt[1],</div><div class='add'>+	dev_dbg(dd-&gt;dev, "digcnt: 0x%llx 0x%llx, bufcnt: %zd\n", ctx-&gt;digcnt[1],</div><div class='ctx'> 		ctx-&gt;digcnt[0], ctx-&gt;bufcnt);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -836,16 +1014,7 @@ static void atmel_sha_finish_req(struct ahash_request *req, int err)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* atomic operation is not needed here */</div><div class='del'>-	dd-&gt;flags &amp;= ~(SHA_FLAGS_BUSY | SHA_FLAGS_FINAL | SHA_FLAGS_CPU |</div><div class='del'>-			SHA_FLAGS_DMA_READY | SHA_FLAGS_OUTPUT_READY);</div><div class='del'>-</div><div class='del'>-	clk_disable(dd-&gt;iclk);</div><div class='del'>-</div><div class='del'>-	if (req-&gt;base.complete)</div><div class='del'>-		req-&gt;base.complete(&amp;req-&gt;base, err);</div><div class='del'>-</div><div class='del'>-	/* handle new request */</div><div class='del'>-	tasklet_schedule(&amp;dd-&gt;queue_task);</div><div class='add'>+	(void)atmel_sha_complete(dd, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atmel_sha_hw_init(struct atmel_sha_dev *dd)</div><div class='hunk'>@@ -886,8 +1055,9 @@ static int atmel_sha_handle_queue(struct atmel_sha_dev *dd,</div><div class='ctx'> 				  struct ahash_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_async_request *async_req, *backlog;</div><div class='del'>-	struct atmel_sha_reqctx *ctx;</div><div class='add'>+	struct atmel_sha_ctx *ctx;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	bool start_async;</div><div class='ctx'> 	int err = 0, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;dd-&gt;lock, flags);</div><div class='hunk'>@@ -912,35 +1082,69 @@ static int atmel_sha_handle_queue(struct atmel_sha_dev *dd,</div><div class='ctx'> 	if (backlog)</div><div class='ctx'> 		backlog-&gt;complete(backlog, -EINPROGRESS);</div><div class='ctx'> </div><div class='del'>-	req = ahash_request_cast(async_req);</div><div class='del'>-	dd-&gt;req = req;</div><div class='del'>-	ctx = ahash_request_ctx(req);</div><div class='add'>+	ctx = crypto_tfm_ctx(async_req-&gt;tfm);</div><div class='add'>+</div><div class='add'>+	dd-&gt;req = ahash_request_cast(async_req);</div><div class='add'>+	start_async = (dd-&gt;req != req);</div><div class='add'>+	dd-&gt;is_async = start_async;</div><div class='add'>+	dd-&gt;force_complete = false;</div><div class='add'>+</div><div class='add'>+	/* WARNING: ctx-&gt;start() MAY change dd-&gt;is_async. */</div><div class='add'>+	err = ctx-&gt;start(dd);</div><div class='add'>+	return (start_async) ? ret : err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_done(struct atmel_sha_dev *dd);</div><div class='add'>+</div><div class='add'>+static int atmel_sha_start(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dd-&gt;dev, "handling new req, op: %lu, nbytes: %d\n",</div><div class='ctx'> 						ctx-&gt;op, req-&gt;nbytes);</div><div class='ctx'> </div><div class='ctx'> 	err = atmel_sha_hw_init(dd);</div><div class='del'>-</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err1;</div><div class='add'>+		return atmel_sha_complete(dd, err);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * atmel_sha_update_req() and atmel_sha_final_req() can return either:</div><div class='add'>+	 *  -EINPROGRESS: the hardware is busy and the SHA driver will resume</div><div class='add'>+	 *                its job later in the done_task.</div><div class='add'>+	 *                This is the main path.</div><div class='add'>+	 *</div><div class='add'>+	 * 0: the SHA driver can continue its job then release the hardware</div><div class='add'>+	 *    later, if needed, with atmel_sha_finish_req().</div><div class='add'>+	 *    This is the alternate path.</div><div class='add'>+	 *</div><div class='add'>+	 * &lt; 0: an error has occurred so atmel_sha_complete(dd, err) has already</div><div class='add'>+	 *      been called, hence the hardware has been released.</div><div class='add'>+	 *      The SHA driver must stop its job without calling</div><div class='add'>+	 *      atmel_sha_finish_req(), otherwise atmel_sha_complete() would be</div><div class='add'>+	 *      called a second time.</div><div class='add'>+	 *</div><div class='add'>+	 * Please note that currently, atmel_sha_final_req() never returns 0.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	dd-&gt;resume = atmel_sha_done;</div><div class='ctx'> 	if (ctx-&gt;op == SHA_OP_UPDATE) {</div><div class='ctx'> 		err = atmel_sha_update_req(dd);</div><div class='del'>-		if (err != -EINPROGRESS &amp;&amp; (ctx-&gt;flags &amp; SHA_FLAGS_FINUP))</div><div class='add'>+		if (!err &amp;&amp; (ctx-&gt;flags &amp; SHA_FLAGS_FINUP))</div><div class='ctx'> 			/* no final() after finup() */</div><div class='ctx'> 			err = atmel_sha_final_req(dd);</div><div class='ctx'> 	} else if (ctx-&gt;op == SHA_OP_FINAL) {</div><div class='ctx'> 		err = atmel_sha_final_req(dd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-err1:</div><div class='del'>-	if (err != -EINPROGRESS)</div><div class='add'>+	if (!err)</div><div class='ctx'> 		/* done_task will not finish it, so do it here */</div><div class='ctx'> 		atmel_sha_finish_req(req, err);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dd-&gt;dev, "exit, err: %d\n", err);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atmel_sha_enqueue(struct ahash_request *req, unsigned int op)</div><div class='hunk'>@@ -1036,8 +1240,11 @@ static int atmel_sha_import(struct ahash_request *req, const void *in)</div><div class='ctx'> </div><div class='ctx'> static int atmel_sha_cra_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='add'>+	struct atmel_sha_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='ctx'> 	crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),</div><div class='ctx'> 				 sizeof(struct atmel_sha_reqctx));</div><div class='add'>+	ctx-&gt;start = atmel_sha_start;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1176,9 +1383,8 @@ static void atmel_sha_queue_task(unsigned long data)</div><div class='ctx'> 	atmel_sha_handle_queue(dd, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atmel_sha_done_task(unsigned long data)</div><div class='add'>+static int atmel_sha_done(struct atmel_sha_dev *dd)</div><div class='ctx'> {</div><div class='del'>-	struct atmel_sha_dev *dd = (struct atmel_sha_dev *)data;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (SHA_FLAGS_CPU &amp; dd-&gt;flags) {</div><div class='hunk'>@@ -1204,11 +1410,21 @@ static void atmel_sha_done_task(unsigned long data)</div><div class='ctx'> 				goto finish;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return;</div><div class='add'>+	return err;</div><div class='ctx'> </div><div class='ctx'> finish:</div><div class='ctx'> 	/* finish curent request */</div><div class='ctx'> 	atmel_sha_finish_req(dd-&gt;req, err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atmel_sha_done_task(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_dev *dd = (struct atmel_sha_dev *)data;</div><div class='add'>+</div><div class='add'>+	dd-&gt;is_async = true;</div><div class='add'>+	(void)dd-&gt;resume(dd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t atmel_sha_irq(int irq, void *dev_id)</div><div class='hunk'>@@ -1233,10 +1449,1104 @@ static irqreturn_t atmel_sha_irq(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* DMA transfer functions */</div><div class='add'>+</div><div class='add'>+static bool atmel_sha_dma_check_aligned(struct atmel_sha_dev *dd,</div><div class='add'>+					struct scatterlist *sg,</div><div class='add'>+					size_t len)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_dma *dma = &amp;dd-&gt;dma_lch_in;</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	size_t bs = ctx-&gt;block_size;</div><div class='add'>+	int nents;</div><div class='add'>+</div><div class='add'>+	for (nents = 0; sg; sg = sg_next(sg), ++nents) {</div><div class='add'>+		if (!IS_ALIGNED(sg-&gt;offset, sizeof(u32)))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * This is the last sg, the only one that is allowed to</div><div class='add'>+		 * have an unaligned length.</div><div class='add'>+		 */</div><div class='add'>+		if (len &lt;= sg-&gt;length) {</div><div class='add'>+			dma-&gt;nents = nents + 1;</div><div class='add'>+			dma-&gt;last_sg_length = sg-&gt;length;</div><div class='add'>+			sg-&gt;length = ALIGN(len, sizeof(u32));</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* All other sg lengths MUST be aligned to the block size. */</div><div class='add'>+		if (!IS_ALIGNED(sg-&gt;length, bs))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		len -= sg-&gt;length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atmel_sha_dma_callback2(void *data)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_dev *dd = data;</div><div class='add'>+	struct atmel_sha_dma *dma = &amp;dd-&gt;dma_lch_in;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	int nents;</div><div class='add'>+</div><div class='add'>+	dmaengine_terminate_all(dma-&gt;chan);</div><div class='add'>+	dma_unmap_sg(dd-&gt;dev, dma-&gt;sg, dma-&gt;nents, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	sg = dma-&gt;sg;</div><div class='add'>+	for (nents = 0; nents &lt; dma-&gt;nents - 1; ++nents)</div><div class='add'>+		sg = sg_next(sg);</div><div class='add'>+	sg-&gt;length = dma-&gt;last_sg_length;</div><div class='add'>+</div><div class='add'>+	dd-&gt;is_async = true;</div><div class='add'>+	(void)atmel_sha_wait_for_data_ready(dd, dd-&gt;resume);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_dma_start(struct atmel_sha_dev *dd,</div><div class='add'>+			       struct scatterlist *src,</div><div class='add'>+			       size_t len,</div><div class='add'>+			       atmel_sha_fn_t resume)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_dma *dma = &amp;dd-&gt;dma_lch_in;</div><div class='add'>+	struct dma_slave_config *config = &amp;dma-&gt;dma_conf;</div><div class='add'>+	struct dma_chan *chan = dma-&gt;chan;</div><div class='add'>+	struct dma_async_tx_descriptor *desc;</div><div class='add'>+	dma_cookie_t cookie;</div><div class='add'>+	unsigned int sg_len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dd-&gt;resume = resume;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * dma-&gt;nents has already been initialized by</div><div class='add'>+	 * atmel_sha_dma_check_aligned().</div><div class='add'>+	 */</div><div class='add'>+	dma-&gt;sg = src;</div><div class='add'>+	sg_len = dma_map_sg(dd-&gt;dev, dma-&gt;sg, dma-&gt;nents, DMA_TO_DEVICE);</div><div class='add'>+	if (!sg_len) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	config-&gt;src_maxburst = 16;</div><div class='add'>+	config-&gt;dst_maxburst = 16;</div><div class='add'>+	err = dmaengine_slave_config(chan, config);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unmap_sg;</div><div class='add'>+</div><div class='add'>+	desc = dmaengine_prep_slave_sg(chan, dma-&gt;sg, sg_len, DMA_MEM_TO_DEV,</div><div class='add'>+				       DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto unmap_sg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc-&gt;callback = atmel_sha_dma_callback2;</div><div class='add'>+	desc-&gt;callback_param = dd;</div><div class='add'>+	cookie = dmaengine_submit(desc);</div><div class='add'>+	err = dma_submit_error(cookie);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unmap_sg;</div><div class='add'>+</div><div class='add'>+	dma_async_issue_pending(chan);</div><div class='add'>+</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+</div><div class='add'>+unmap_sg:</div><div class='add'>+	dma_unmap_sg(dd-&gt;dev, dma-&gt;sg, dma-&gt;nents, DMA_TO_DEVICE);</div><div class='add'>+exit:</div><div class='add'>+	return atmel_sha_complete(dd, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* CPU transfer functions */</div><div class='add'>+</div><div class='add'>+static int atmel_sha_cpu_transfer(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	const u32 *words = (const u32 *)ctx-&gt;buffer;</div><div class='add'>+	size_t i, num_words;</div><div class='add'>+	u32 isr, din, din_inc;</div><div class='add'>+</div><div class='add'>+	din_inc = (ctx-&gt;flags &amp; SHA_FLAGS_IDATAR0) ? 0 : 1;</div><div class='add'>+	for (;;) {</div><div class='add'>+		/* Write data into the Input Data Registers. */</div><div class='add'>+		num_words = DIV_ROUND_UP(ctx-&gt;bufcnt, sizeof(u32));</div><div class='add'>+		for (i = 0, din = 0; i &lt; num_words; ++i, din += din_inc)</div><div class='add'>+			atmel_sha_write(dd, SHA_REG_DIN(din), words[i]);</div><div class='add'>+</div><div class='add'>+		ctx-&gt;offset += ctx-&gt;bufcnt;</div><div class='add'>+		ctx-&gt;total -= ctx-&gt;bufcnt;</div><div class='add'>+</div><div class='add'>+		if (!ctx-&gt;total)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Prepare next block:</div><div class='add'>+		 * Fill ctx-&gt;buffer now with the next data to be written into</div><div class='add'>+		 * IDATARx: it gives time for the SHA hardware to process</div><div class='add'>+		 * the current data so the SHA_INT_DATARDY flag might be set</div><div class='add'>+		 * in SHA_ISR when polling this register at the beginning of</div><div class='add'>+		 * the next loop.</div><div class='add'>+		 */</div><div class='add'>+		ctx-&gt;bufcnt = min_t(size_t, ctx-&gt;block_size, ctx-&gt;total);</div><div class='add'>+		scatterwalk_map_and_copy(ctx-&gt;buffer, ctx-&gt;sg,</div><div class='add'>+					 ctx-&gt;offset, ctx-&gt;bufcnt, 0);</div><div class='add'>+</div><div class='add'>+		/* Wait for hardware to be ready again. */</div><div class='add'>+		isr = atmel_sha_read(dd, SHA_ISR);</div><div class='add'>+		if (!(isr &amp; SHA_INT_DATARDY)) {</div><div class='add'>+			/* Not ready yet. */</div><div class='add'>+			dd-&gt;resume = atmel_sha_cpu_transfer;</div><div class='add'>+			atmel_sha_write(dd, SHA_IER, SHA_INT_DATARDY);</div><div class='add'>+			return -EINPROGRESS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(!(ctx-&gt;flags &amp; SHA_FLAGS_WAIT_DATARDY)))</div><div class='add'>+		return dd-&gt;cpu_transfer_complete(dd);</div><div class='add'>+</div><div class='add'>+	return atmel_sha_wait_for_data_ready(dd, dd-&gt;cpu_transfer_complete);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_cpu_start(struct atmel_sha_dev *dd,</div><div class='add'>+			       struct scatterlist *sg,</div><div class='add'>+			       unsigned int len,</div><div class='add'>+			       bool idatar0_only,</div><div class='add'>+			       bool wait_data_ready,</div><div class='add'>+			       atmel_sha_fn_t resume)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	if (!len)</div><div class='add'>+		return resume(dd);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;flags &amp;= ~(SHA_FLAGS_IDATAR0 | SHA_FLAGS_WAIT_DATARDY);</div><div class='add'>+</div><div class='add'>+	if (idatar0_only)</div><div class='add'>+		ctx-&gt;flags |= SHA_FLAGS_IDATAR0;</div><div class='add'>+</div><div class='add'>+	if (wait_data_ready)</div><div class='add'>+		ctx-&gt;flags |= SHA_FLAGS_WAIT_DATARDY;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;sg = sg;</div><div class='add'>+	ctx-&gt;total = len;</div><div class='add'>+	ctx-&gt;offset = 0;</div><div class='add'>+</div><div class='add'>+	/* Prepare the first block to be written. */</div><div class='add'>+	ctx-&gt;bufcnt = min_t(size_t, ctx-&gt;block_size, ctx-&gt;total);</div><div class='add'>+	scatterwalk_map_and_copy(ctx-&gt;buffer, ctx-&gt;sg,</div><div class='add'>+				 ctx-&gt;offset, ctx-&gt;bufcnt, 0);</div><div class='add'>+</div><div class='add'>+	dd-&gt;cpu_transfer_complete = resume;</div><div class='add'>+	return atmel_sha_cpu_transfer(dd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_cpu_hash(struct atmel_sha_dev *dd,</div><div class='add'>+			      const void *data, unsigned int datalen,</div><div class='add'>+			      bool auto_padding,</div><div class='add'>+			      atmel_sha_fn_t resume)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	u32 msglen = (auto_padding) ? datalen : 0;</div><div class='add'>+	u32 mr = SHA_MR_MODE_AUTO;</div><div class='add'>+</div><div class='add'>+	if (!(IS_ALIGNED(datalen, ctx-&gt;block_size) || auto_padding))</div><div class='add'>+		return atmel_sha_complete(dd, -EINVAL);</div><div class='add'>+</div><div class='add'>+	mr |= (ctx-&gt;flags &amp; SHA_FLAGS_ALGO_MASK);</div><div class='add'>+	atmel_sha_write(dd, SHA_MR, mr);</div><div class='add'>+	atmel_sha_write(dd, SHA_MSR, msglen);</div><div class='add'>+	atmel_sha_write(dd, SHA_BCR, msglen);</div><div class='add'>+	atmel_sha_write(dd, SHA_CR, SHA_CR_FIRST);</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;dd-&gt;tmp, data, datalen);</div><div class='add'>+	return atmel_sha_cpu_start(dd, &amp;dd-&gt;tmp, datalen, false, true, resume);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* hmac functions */</div><div class='add'>+</div><div class='add'>+struct atmel_sha_hmac_key {</div><div class='add'>+	bool			valid;</div><div class='add'>+	unsigned int		keylen;</div><div class='add'>+	u8			buffer[SHA512_BLOCK_SIZE];</div><div class='add'>+	u8			*keydup;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void atmel_sha_hmac_key_init(struct atmel_sha_hmac_key *hkey)</div><div class='add'>+{</div><div class='add'>+	memset(hkey, 0, sizeof(*hkey));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void atmel_sha_hmac_key_release(struct atmel_sha_hmac_key *hkey)</div><div class='add'>+{</div><div class='add'>+	kfree(hkey-&gt;keydup);</div><div class='add'>+	memset(hkey, 0, sizeof(*hkey));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int atmel_sha_hmac_key_set(struct atmel_sha_hmac_key *hkey,</div><div class='add'>+					 const u8 *key,</div><div class='add'>+					 unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	atmel_sha_hmac_key_release(hkey);</div><div class='add'>+</div><div class='add'>+	if (keylen &gt; sizeof(hkey-&gt;buffer)) {</div><div class='add'>+		hkey-&gt;keydup = kmemdup(key, keylen, GFP_KERNEL);</div><div class='add'>+		if (!hkey-&gt;keydup)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(hkey-&gt;buffer, key, keylen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hkey-&gt;valid = true;</div><div class='add'>+	hkey-&gt;keylen = keylen;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool atmel_sha_hmac_key_get(const struct atmel_sha_hmac_key *hkey,</div><div class='add'>+					  const u8 **key,</div><div class='add'>+					  unsigned int *keylen)</div><div class='add'>+{</div><div class='add'>+	if (!hkey-&gt;valid)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	*keylen = hkey-&gt;keylen;</div><div class='add'>+	*key = (hkey-&gt;keydup) ? hkey-&gt;keydup : hkey-&gt;buffer;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct atmel_sha_hmac_ctx {</div><div class='add'>+	struct atmel_sha_ctx	base;</div><div class='add'>+</div><div class='add'>+	struct atmel_sha_hmac_key	hkey;</div><div class='add'>+	u32			ipad[SHA512_BLOCK_SIZE / sizeof(u32)];</div><div class='add'>+	u32			opad[SHA512_BLOCK_SIZE / sizeof(u32)];</div><div class='add'>+	atmel_sha_fn_t		resume;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_setup(struct atmel_sha_dev *dd,</div><div class='add'>+				atmel_sha_fn_t resume);</div><div class='add'>+static int atmel_sha_hmac_prehash_key(struct atmel_sha_dev *dd,</div><div class='add'>+				      const u8 *key, unsigned int keylen);</div><div class='add'>+static int atmel_sha_hmac_prehash_key_done(struct atmel_sha_dev *dd);</div><div class='add'>+static int atmel_sha_hmac_compute_ipad_hash(struct atmel_sha_dev *dd);</div><div class='add'>+static int atmel_sha_hmac_compute_opad_hash(struct atmel_sha_dev *dd);</div><div class='add'>+static int atmel_sha_hmac_setup_done(struct atmel_sha_dev *dd);</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_init_done(struct atmel_sha_dev *dd);</div><div class='add'>+static int atmel_sha_hmac_final(struct atmel_sha_dev *dd);</div><div class='add'>+static int atmel_sha_hmac_final_done(struct atmel_sha_dev *dd);</div><div class='add'>+static int atmel_sha_hmac_digest2(struct atmel_sha_dev *dd);</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_setup(struct atmel_sha_dev *dd,</div><div class='add'>+				atmel_sha_fn_t resume)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);</div><div class='add'>+	unsigned int keylen;</div><div class='add'>+	const u8 *key;</div><div class='add'>+	size_t bs;</div><div class='add'>+</div><div class='add'>+	hmac-&gt;resume = resume;</div><div class='add'>+	switch (ctx-&gt;flags &amp; SHA_FLAGS_ALGO_MASK) {</div><div class='add'>+	case SHA_FLAGS_SHA1:</div><div class='add'>+		ctx-&gt;block_size = SHA1_BLOCK_SIZE;</div><div class='add'>+		ctx-&gt;hash_size = SHA1_DIGEST_SIZE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA224:</div><div class='add'>+		ctx-&gt;block_size = SHA224_BLOCK_SIZE;</div><div class='add'>+		ctx-&gt;hash_size = SHA256_DIGEST_SIZE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA256:</div><div class='add'>+		ctx-&gt;block_size = SHA256_BLOCK_SIZE;</div><div class='add'>+		ctx-&gt;hash_size = SHA256_DIGEST_SIZE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA384:</div><div class='add'>+		ctx-&gt;block_size = SHA384_BLOCK_SIZE;</div><div class='add'>+		ctx-&gt;hash_size = SHA512_DIGEST_SIZE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA512:</div><div class='add'>+		ctx-&gt;block_size = SHA512_BLOCK_SIZE;</div><div class='add'>+		ctx-&gt;hash_size = SHA512_DIGEST_SIZE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return atmel_sha_complete(dd, -EINVAL);</div><div class='add'>+	}</div><div class='add'>+	bs = ctx-&gt;block_size;</div><div class='add'>+</div><div class='add'>+	if (likely(!atmel_sha_hmac_key_get(&amp;hmac-&gt;hkey, &amp;key, &amp;keylen)))</div><div class='add'>+		return resume(dd);</div><div class='add'>+</div><div class='add'>+	/* Compute K' from K. */</div><div class='add'>+	if (unlikely(keylen &gt; bs))</div><div class='add'>+		return atmel_sha_hmac_prehash_key(dd, key, keylen);</div><div class='add'>+</div><div class='add'>+	/* Prepare ipad. */</div><div class='add'>+	memcpy((u8 *)hmac-&gt;ipad, key, keylen);</div><div class='add'>+	memset((u8 *)hmac-&gt;ipad + keylen, 0, bs - keylen);</div><div class='add'>+	return atmel_sha_hmac_compute_ipad_hash(dd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_prehash_key(struct atmel_sha_dev *dd,</div><div class='add'>+				      const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	return atmel_sha_cpu_hash(dd, key, keylen, true,</div><div class='add'>+				  atmel_sha_hmac_prehash_key_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_prehash_key_done(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	size_t ds = crypto_ahash_digestsize(tfm);</div><div class='add'>+	size_t bs = ctx-&gt;block_size;</div><div class='add'>+	size_t i, num_words = ds / sizeof(u32);</div><div class='add'>+</div><div class='add'>+	/* Prepare ipad. */</div><div class='add'>+	for (i = 0; i &lt; num_words; ++i)</div><div class='add'>+		hmac-&gt;ipad[i] = atmel_sha_read(dd, SHA_REG_DIGEST(i));</div><div class='add'>+	memset((u8 *)hmac-&gt;ipad + ds, 0, bs - ds);</div><div class='add'>+	return atmel_sha_hmac_compute_ipad_hash(dd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_compute_ipad_hash(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	size_t bs = ctx-&gt;block_size;</div><div class='add'>+	size_t i, num_words = bs / sizeof(u32);</div><div class='add'>+</div><div class='add'>+	memcpy(hmac-&gt;opad, hmac-&gt;ipad, bs);</div><div class='add'>+	for (i = 0; i &lt; num_words; ++i) {</div><div class='add'>+		hmac-&gt;ipad[i] ^= 0x36363636;</div><div class='add'>+		hmac-&gt;opad[i] ^= 0x5c5c5c5c;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return atmel_sha_cpu_hash(dd, hmac-&gt;ipad, bs, false,</div><div class='add'>+				  atmel_sha_hmac_compute_opad_hash);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_compute_opad_hash(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	size_t bs = ctx-&gt;block_size;</div><div class='add'>+	size_t hs = ctx-&gt;hash_size;</div><div class='add'>+	size_t i, num_words = hs / sizeof(u32);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_words; ++i)</div><div class='add'>+		hmac-&gt;ipad[i] = atmel_sha_read(dd, SHA_REG_DIGEST(i));</div><div class='add'>+	return atmel_sha_cpu_hash(dd, hmac-&gt;opad, bs, false,</div><div class='add'>+				  atmel_sha_hmac_setup_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_setup_done(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	size_t hs = ctx-&gt;hash_size;</div><div class='add'>+	size_t i, num_words = hs / sizeof(u32);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_words; ++i)</div><div class='add'>+		hmac-&gt;opad[i] = atmel_sha_read(dd, SHA_REG_DIGEST(i));</div><div class='add'>+	atmel_sha_hmac_key_release(&amp;hmac-&gt;hkey);</div><div class='add'>+	return hmac-&gt;resume(dd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_start(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = atmel_sha_hw_init(dd);</div><div class='add'>+	if (err)</div><div class='add'>+		return atmel_sha_complete(dd, err);</div><div class='add'>+</div><div class='add'>+	switch (ctx-&gt;op) {</div><div class='add'>+	case SHA_OP_INIT:</div><div class='add'>+		err = atmel_sha_hmac_setup(dd, atmel_sha_hmac_init_done);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_OP_UPDATE:</div><div class='add'>+		dd-&gt;resume = atmel_sha_done;</div><div class='add'>+		err = atmel_sha_update_req(dd);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_OP_FINAL:</div><div class='add'>+		dd-&gt;resume = atmel_sha_hmac_final;</div><div class='add'>+		err = atmel_sha_final_req(dd);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_OP_DIGEST:</div><div class='add'>+		err = atmel_sha_hmac_setup(dd, atmel_sha_hmac_digest2);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return atmel_sha_complete(dd, -EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_setkey(struct crypto_ahash *tfm, const u8 *key,</div><div class='add'>+				 unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	if (atmel_sha_hmac_key_set(&amp;hmac-&gt;hkey, key, keylen)) {</div><div class='add'>+		crypto_ahash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_init(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = atmel_sha_init(req);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return atmel_sha_enqueue(req, SHA_OP_INIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_init_done(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);</div><div class='add'>+	size_t bs = ctx-&gt;block_size;</div><div class='add'>+	size_t hs = ctx-&gt;hash_size;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;bufcnt = 0;</div><div class='add'>+	ctx-&gt;digcnt[0] = bs;</div><div class='add'>+	ctx-&gt;digcnt[1] = 0;</div><div class='add'>+	ctx-&gt;flags |= SHA_FLAGS_RESTORE;</div><div class='add'>+	memcpy(ctx-&gt;digest, hmac-&gt;ipad, hs);</div><div class='add'>+	return atmel_sha_complete(dd, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_final(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);</div><div class='add'>+	u32 *digest = (u32 *)ctx-&gt;digest;</div><div class='add'>+	size_t ds = crypto_ahash_digestsize(tfm);</div><div class='add'>+	size_t bs = ctx-&gt;block_size;</div><div class='add'>+	size_t hs = ctx-&gt;hash_size;</div><div class='add'>+	size_t i, num_words;</div><div class='add'>+	u32 mr;</div><div class='add'>+</div><div class='add'>+	/* Save d = SHA((K' + ipad) | msg). */</div><div class='add'>+	num_words = ds / sizeof(u32);</div><div class='add'>+	for (i = 0; i &lt; num_words; ++i)</div><div class='add'>+		digest[i] = atmel_sha_read(dd, SHA_REG_DIGEST(i));</div><div class='add'>+</div><div class='add'>+	/* Restore context to finish computing SHA((K' + opad) | d). */</div><div class='add'>+	atmel_sha_write(dd, SHA_CR, SHA_CR_WUIHV);</div><div class='add'>+	num_words = hs / sizeof(u32);</div><div class='add'>+	for (i = 0; i &lt; num_words; ++i)</div><div class='add'>+		atmel_sha_write(dd, SHA_REG_DIN(i), hmac-&gt;opad[i]);</div><div class='add'>+</div><div class='add'>+	mr = SHA_MR_MODE_AUTO | SHA_MR_UIHV;</div><div class='add'>+	mr |= (ctx-&gt;flags &amp; SHA_FLAGS_ALGO_MASK);</div><div class='add'>+	atmel_sha_write(dd, SHA_MR, mr);</div><div class='add'>+	atmel_sha_write(dd, SHA_MSR, bs + ds);</div><div class='add'>+	atmel_sha_write(dd, SHA_BCR, ds);</div><div class='add'>+	atmel_sha_write(dd, SHA_CR, SHA_CR_FIRST);</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;dd-&gt;tmp, digest, ds);</div><div class='add'>+	return atmel_sha_cpu_start(dd, &amp;dd-&gt;tmp, ds, false, true,</div><div class='add'>+				   atmel_sha_hmac_final_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_final_done(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * req-&gt;result might not be sizeof(u32) aligned, so copy the</div><div class='add'>+	 * digest into ctx-&gt;digest[] before memcpy() the data into</div><div class='add'>+	 * req-&gt;result.</div><div class='add'>+	 */</div><div class='add'>+	atmel_sha_copy_hash(dd-&gt;req);</div><div class='add'>+	atmel_sha_copy_ready_hash(dd-&gt;req);</div><div class='add'>+	return atmel_sha_complete(dd, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_digest(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = atmel_sha_init(req);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return atmel_sha_enqueue(req, SHA_OP_DIGEST);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_digest2(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);</div><div class='add'>+	size_t hs = ctx-&gt;hash_size;</div><div class='add'>+	size_t i, num_words = hs / sizeof(u32);</div><div class='add'>+	bool use_dma = false;</div><div class='add'>+	u32 mr;</div><div class='add'>+</div><div class='add'>+	/* Special case for empty message. */</div><div class='add'>+	if (!req-&gt;nbytes)</div><div class='add'>+		return atmel_sha_complete(dd, -EINVAL); // TODO:</div><div class='add'>+</div><div class='add'>+	/* Check DMA threshold and alignment. */</div><div class='add'>+	if (req-&gt;nbytes &gt; ATMEL_SHA_DMA_THRESHOLD &amp;&amp;</div><div class='add'>+	    atmel_sha_dma_check_aligned(dd, req-&gt;src, req-&gt;nbytes))</div><div class='add'>+		use_dma = true;</div><div class='add'>+</div><div class='add'>+	/* Write both initial hash values to compute a HMAC. */</div><div class='add'>+	atmel_sha_write(dd, SHA_CR, SHA_CR_WUIHV);</div><div class='add'>+	for (i = 0; i &lt; num_words; ++i)</div><div class='add'>+		atmel_sha_write(dd, SHA_REG_DIN(i), hmac-&gt;ipad[i]);</div><div class='add'>+</div><div class='add'>+	atmel_sha_write(dd, SHA_CR, SHA_CR_WUIEHV);</div><div class='add'>+	for (i = 0; i &lt; num_words; ++i)</div><div class='add'>+		atmel_sha_write(dd, SHA_REG_DIN(i), hmac-&gt;opad[i]);</div><div class='add'>+</div><div class='add'>+	/* Write the Mode, Message Size, Bytes Count then Control Registers. */</div><div class='add'>+	mr = (SHA_MR_HMAC | SHA_MR_DUALBUFF);</div><div class='add'>+	mr |= ctx-&gt;flags &amp; SHA_FLAGS_ALGO_MASK;</div><div class='add'>+	if (use_dma)</div><div class='add'>+		mr |= SHA_MR_MODE_IDATAR0;</div><div class='add'>+	else</div><div class='add'>+		mr |= SHA_MR_MODE_AUTO;</div><div class='add'>+	atmel_sha_write(dd, SHA_MR, mr);</div><div class='add'>+</div><div class='add'>+	atmel_sha_write(dd, SHA_MSR, req-&gt;nbytes);</div><div class='add'>+	atmel_sha_write(dd, SHA_BCR, req-&gt;nbytes);</div><div class='add'>+</div><div class='add'>+	atmel_sha_write(dd, SHA_CR, SHA_CR_FIRST);</div><div class='add'>+</div><div class='add'>+	/* Process data. */</div><div class='add'>+	if (use_dma)</div><div class='add'>+		return atmel_sha_dma_start(dd, req-&gt;src, req-&gt;nbytes,</div><div class='add'>+					   atmel_sha_hmac_final_done);</div><div class='add'>+</div><div class='add'>+	return atmel_sha_cpu_start(dd, req-&gt;src, req-&gt;nbytes, false, true,</div><div class='add'>+				   atmel_sha_hmac_final_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_hmac_cra_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),</div><div class='add'>+				 sizeof(struct atmel_sha_reqctx));</div><div class='add'>+	hmac-&gt;base.start = atmel_sha_hmac_start;</div><div class='add'>+	atmel_sha_hmac_key_init(&amp;hmac-&gt;hkey);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atmel_sha_hmac_cra_exit(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	atmel_sha_hmac_key_release(&amp;hmac-&gt;hkey);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ahash_alg sha_hmac_algs[] = {</div><div class='add'>+{</div><div class='add'>+	.init		= atmel_sha_hmac_init,</div><div class='add'>+	.update		= atmel_sha_update,</div><div class='add'>+	.final		= atmel_sha_final,</div><div class='add'>+	.digest		= atmel_sha_hmac_digest,</div><div class='add'>+	.setkey		= atmel_sha_hmac_setkey,</div><div class='add'>+	.export		= atmel_sha_export,</div><div class='add'>+	.import		= atmel_sha_import,</div><div class='add'>+	.halg = {</div><div class='add'>+		.digestsize	= SHA1_DIGEST_SIZE,</div><div class='add'>+		.statesize	= sizeof(struct atmel_sha_reqctx),</div><div class='add'>+		.base	= {</div><div class='add'>+			.cra_name		= "hmac(sha1)",</div><div class='add'>+			.cra_driver_name	= "atmel-hmac-sha1",</div><div class='add'>+			.cra_priority		= 100,</div><div class='add'>+			.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='add'>+			.cra_blocksize		= SHA1_BLOCK_SIZE,</div><div class='add'>+			.cra_ctxsize		= sizeof(struct atmel_sha_hmac_ctx),</div><div class='add'>+			.cra_alignmask		= 0,</div><div class='add'>+			.cra_module		= THIS_MODULE,</div><div class='add'>+			.cra_init		= atmel_sha_hmac_cra_init,</div><div class='add'>+			.cra_exit		= atmel_sha_hmac_cra_exit,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.init		= atmel_sha_hmac_init,</div><div class='add'>+	.update		= atmel_sha_update,</div><div class='add'>+	.final		= atmel_sha_final,</div><div class='add'>+	.digest		= atmel_sha_hmac_digest,</div><div class='add'>+	.setkey		= atmel_sha_hmac_setkey,</div><div class='add'>+	.export		= atmel_sha_export,</div><div class='add'>+	.import		= atmel_sha_import,</div><div class='add'>+	.halg = {</div><div class='add'>+		.digestsize	= SHA224_DIGEST_SIZE,</div><div class='add'>+		.statesize	= sizeof(struct atmel_sha_reqctx),</div><div class='add'>+		.base	= {</div><div class='add'>+			.cra_name		= "hmac(sha224)",</div><div class='add'>+			.cra_driver_name	= "atmel-hmac-sha224",</div><div class='add'>+			.cra_priority		= 100,</div><div class='add'>+			.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='add'>+			.cra_blocksize		= SHA224_BLOCK_SIZE,</div><div class='add'>+			.cra_ctxsize		= sizeof(struct atmel_sha_hmac_ctx),</div><div class='add'>+			.cra_alignmask		= 0,</div><div class='add'>+			.cra_module		= THIS_MODULE,</div><div class='add'>+			.cra_init		= atmel_sha_hmac_cra_init,</div><div class='add'>+			.cra_exit		= atmel_sha_hmac_cra_exit,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.init		= atmel_sha_hmac_init,</div><div class='add'>+	.update		= atmel_sha_update,</div><div class='add'>+	.final		= atmel_sha_final,</div><div class='add'>+	.digest		= atmel_sha_hmac_digest,</div><div class='add'>+	.setkey		= atmel_sha_hmac_setkey,</div><div class='add'>+	.export		= atmel_sha_export,</div><div class='add'>+	.import		= atmel_sha_import,</div><div class='add'>+	.halg = {</div><div class='add'>+		.digestsize	= SHA256_DIGEST_SIZE,</div><div class='add'>+		.statesize	= sizeof(struct atmel_sha_reqctx),</div><div class='add'>+		.base	= {</div><div class='add'>+			.cra_name		= "hmac(sha256)",</div><div class='add'>+			.cra_driver_name	= "atmel-hmac-sha256",</div><div class='add'>+			.cra_priority		= 100,</div><div class='add'>+			.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='add'>+			.cra_blocksize		= SHA256_BLOCK_SIZE,</div><div class='add'>+			.cra_ctxsize		= sizeof(struct atmel_sha_hmac_ctx),</div><div class='add'>+			.cra_alignmask		= 0,</div><div class='add'>+			.cra_module		= THIS_MODULE,</div><div class='add'>+			.cra_init		= atmel_sha_hmac_cra_init,</div><div class='add'>+			.cra_exit		= atmel_sha_hmac_cra_exit,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.init		= atmel_sha_hmac_init,</div><div class='add'>+	.update		= atmel_sha_update,</div><div class='add'>+	.final		= atmel_sha_final,</div><div class='add'>+	.digest		= atmel_sha_hmac_digest,</div><div class='add'>+	.setkey		= atmel_sha_hmac_setkey,</div><div class='add'>+	.export		= atmel_sha_export,</div><div class='add'>+	.import		= atmel_sha_import,</div><div class='add'>+	.halg = {</div><div class='add'>+		.digestsize	= SHA384_DIGEST_SIZE,</div><div class='add'>+		.statesize	= sizeof(struct atmel_sha_reqctx),</div><div class='add'>+		.base	= {</div><div class='add'>+			.cra_name		= "hmac(sha384)",</div><div class='add'>+			.cra_driver_name	= "atmel-hmac-sha384",</div><div class='add'>+			.cra_priority		= 100,</div><div class='add'>+			.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='add'>+			.cra_blocksize		= SHA384_BLOCK_SIZE,</div><div class='add'>+			.cra_ctxsize		= sizeof(struct atmel_sha_hmac_ctx),</div><div class='add'>+			.cra_alignmask		= 0,</div><div class='add'>+			.cra_module		= THIS_MODULE,</div><div class='add'>+			.cra_init		= atmel_sha_hmac_cra_init,</div><div class='add'>+			.cra_exit		= atmel_sha_hmac_cra_exit,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.init		= atmel_sha_hmac_init,</div><div class='add'>+	.update		= atmel_sha_update,</div><div class='add'>+	.final		= atmel_sha_final,</div><div class='add'>+	.digest		= atmel_sha_hmac_digest,</div><div class='add'>+	.setkey		= atmel_sha_hmac_setkey,</div><div class='add'>+	.export		= atmel_sha_export,</div><div class='add'>+	.import		= atmel_sha_import,</div><div class='add'>+	.halg = {</div><div class='add'>+		.digestsize	= SHA512_DIGEST_SIZE,</div><div class='add'>+		.statesize	= sizeof(struct atmel_sha_reqctx),</div><div class='add'>+		.base	= {</div><div class='add'>+			.cra_name		= "hmac(sha512)",</div><div class='add'>+			.cra_driver_name	= "atmel-hmac-sha512",</div><div class='add'>+			.cra_priority		= 100,</div><div class='add'>+			.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='add'>+			.cra_blocksize		= SHA512_BLOCK_SIZE,</div><div class='add'>+			.cra_ctxsize		= sizeof(struct atmel_sha_hmac_ctx),</div><div class='add'>+			.cra_alignmask		= 0,</div><div class='add'>+			.cra_module		= THIS_MODULE,</div><div class='add'>+			.cra_init		= atmel_sha_hmac_cra_init,</div><div class='add'>+			.cra_exit		= atmel_sha_hmac_cra_exit,</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC</div><div class='add'>+/* authenc functions */</div><div class='add'>+</div><div class='add'>+static int atmel_sha_authenc_init2(struct atmel_sha_dev *dd);</div><div class='add'>+static int atmel_sha_authenc_init_done(struct atmel_sha_dev *dd);</div><div class='add'>+static int atmel_sha_authenc_final_done(struct atmel_sha_dev *dd);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct atmel_sha_authenc_ctx {</div><div class='add'>+	struct crypto_ahash	*tfm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct atmel_sha_authenc_reqctx {</div><div class='add'>+	struct atmel_sha_reqctx	base;</div><div class='add'>+</div><div class='add'>+	atmel_aes_authenc_fn_t	cb;</div><div class='add'>+	struct atmel_aes_dev	*aes_dev;</div><div class='add'>+</div><div class='add'>+	/* _init() parameters. */</div><div class='add'>+	struct scatterlist	*assoc;</div><div class='add'>+	u32			assoclen;</div><div class='add'>+	u32			textlen;</div><div class='add'>+</div><div class='add'>+	/* _final() parameters. */</div><div class='add'>+	u32			*digest;</div><div class='add'>+	unsigned int		digestlen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void atmel_sha_authenc_complete(struct crypto_async_request *areq,</div><div class='add'>+				       int err)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = areq-&gt;data;</div><div class='add'>+	struct atmel_sha_authenc_reqctx *authctx  = ahash_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	authctx-&gt;cb(authctx-&gt;aes_dev, err, authctx-&gt;base.dd-&gt;is_async);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_authenc_start(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_authenc_reqctx *authctx = ahash_request_ctx(req);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Force atmel_sha_complete() to call req-&gt;base.complete(), ie</div><div class='add'>+	 * atmel_sha_authenc_complete(), which in turn calls authctx-&gt;cb().</div><div class='add'>+	 */</div><div class='add'>+	dd-&gt;force_complete = true;</div><div class='add'>+</div><div class='add'>+	err = atmel_sha_hw_init(dd);</div><div class='add'>+	return authctx-&gt;cb(authctx-&gt;aes_dev, err, dd-&gt;is_async);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool atmel_sha_authenc_is_ready(void)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_ctx dummy;</div><div class='add'>+</div><div class='add'>+	dummy.dd = NULL;</div><div class='add'>+	return (atmel_sha_find_dev(&amp;dummy) != NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(atmel_sha_authenc_is_ready);</div><div class='add'>+</div><div class='add'>+unsigned int atmel_sha_authenc_get_reqsize(void)</div><div class='add'>+{</div><div class='add'>+	return sizeof(struct atmel_sha_authenc_reqctx);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(atmel_sha_authenc_get_reqsize);</div><div class='add'>+</div><div class='add'>+struct atmel_sha_authenc_ctx *atmel_sha_authenc_spawn(unsigned long mode)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_authenc_ctx *auth;</div><div class='add'>+	struct crypto_ahash *tfm;</div><div class='add'>+	struct atmel_sha_ctx *tctx;</div><div class='add'>+	const char *name;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (mode &amp; SHA_FLAGS_MODE_MASK) {</div><div class='add'>+	case SHA_FLAGS_HMAC_SHA1:</div><div class='add'>+		name = "atmel-hmac-sha1";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_HMAC_SHA224:</div><div class='add'>+		name = "atmel-hmac-sha224";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_HMAC_SHA256:</div><div class='add'>+		name = "atmel-hmac-sha256";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_HMAC_SHA384:</div><div class='add'>+		name = "atmel-hmac-sha384";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_HMAC_SHA512:</div><div class='add'>+		name = "atmel-hmac-sha512";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_ahash(name,</div><div class='add'>+				 CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+				 CRYPTO_ALG_TYPE_AHASH_MASK);</div><div class='add'>+	if (IS_ERR(tfm)) {</div><div class='add'>+		err = PTR_ERR(tfm);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	tctx = crypto_ahash_ctx(tfm);</div><div class='add'>+	tctx-&gt;start = atmel_sha_authenc_start;</div><div class='add'>+	tctx-&gt;flags = mode;</div><div class='add'>+</div><div class='add'>+	auth = kzalloc(sizeof(*auth), GFP_KERNEL);</div><div class='add'>+	if (!auth) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free_ahash;</div><div class='add'>+	}</div><div class='add'>+	auth-&gt;tfm = tfm;</div><div class='add'>+</div><div class='add'>+	return auth;</div><div class='add'>+</div><div class='add'>+err_free_ahash:</div><div class='add'>+	crypto_free_ahash(tfm);</div><div class='add'>+error:</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(atmel_sha_authenc_spawn);</div><div class='add'>+</div><div class='add'>+void atmel_sha_authenc_free(struct atmel_sha_authenc_ctx *auth)</div><div class='add'>+{</div><div class='add'>+	if (auth)</div><div class='add'>+		crypto_free_ahash(auth-&gt;tfm);</div><div class='add'>+	kfree(auth);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(atmel_sha_authenc_free);</div><div class='add'>+</div><div class='add'>+int atmel_sha_authenc_setkey(struct atmel_sha_authenc_ctx *auth,</div><div class='add'>+			     const u8 *key, unsigned int keylen,</div><div class='add'>+			     u32 *flags)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *tfm = auth-&gt;tfm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	crypto_ahash_clear_flags(tfm, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_ahash_set_flags(tfm, *flags &amp; CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	err = crypto_ahash_setkey(tfm, key, keylen);</div><div class='add'>+	*flags = crypto_ahash_get_flags(tfm);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(atmel_sha_authenc_setkey);</div><div class='add'>+</div><div class='add'>+int atmel_sha_authenc_schedule(struct ahash_request *req,</div><div class='add'>+			       struct atmel_sha_authenc_ctx *auth,</div><div class='add'>+			       atmel_aes_authenc_fn_t cb,</div><div class='add'>+			       struct atmel_aes_dev *aes_dev)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_authenc_reqctx *authctx = ahash_request_ctx(req);</div><div class='add'>+	struct atmel_sha_reqctx *ctx = &amp;authctx-&gt;base;</div><div class='add'>+	struct crypto_ahash *tfm = auth-&gt;tfm;</div><div class='add'>+	struct atmel_sha_ctx *tctx = crypto_ahash_ctx(tfm);</div><div class='add'>+	struct atmel_sha_dev *dd;</div><div class='add'>+</div><div class='add'>+	/* Reset request context (MUST be done first). */</div><div class='add'>+	memset(authctx, 0, sizeof(*authctx));</div><div class='add'>+</div><div class='add'>+	/* Get SHA device. */</div><div class='add'>+	dd = atmel_sha_find_dev(tctx);</div><div class='add'>+	if (!dd)</div><div class='add'>+		return cb(aes_dev, -ENODEV, false);</div><div class='add'>+</div><div class='add'>+	/* Init request context. */</div><div class='add'>+	ctx-&gt;dd = dd;</div><div class='add'>+	ctx-&gt;buflen = SHA_BUFFER_LEN;</div><div class='add'>+	authctx-&gt;cb = cb;</div><div class='add'>+	authctx-&gt;aes_dev = aes_dev;</div><div class='add'>+	ahash_request_set_tfm(req, tfm);</div><div class='add'>+	ahash_request_set_callback(req, 0, atmel_sha_authenc_complete, req);</div><div class='add'>+</div><div class='add'>+	return atmel_sha_handle_queue(dd, req);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(atmel_sha_authenc_schedule);</div><div class='add'>+</div><div class='add'>+int atmel_sha_authenc_init(struct ahash_request *req,</div><div class='add'>+			   struct scatterlist *assoc, unsigned int assoclen,</div><div class='add'>+			   unsigned int textlen,</div><div class='add'>+			   atmel_aes_authenc_fn_t cb,</div><div class='add'>+			   struct atmel_aes_dev *aes_dev)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_authenc_reqctx *authctx = ahash_request_ctx(req);</div><div class='add'>+	struct atmel_sha_reqctx *ctx = &amp;authctx-&gt;base;</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);</div><div class='add'>+	struct atmel_sha_dev *dd = ctx-&gt;dd;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!IS_ALIGNED(assoclen, sizeof(u32))))</div><div class='add'>+		return atmel_sha_complete(dd, -EINVAL);</div><div class='add'>+</div><div class='add'>+	authctx-&gt;cb = cb;</div><div class='add'>+	authctx-&gt;aes_dev = aes_dev;</div><div class='add'>+	authctx-&gt;assoc = assoc;</div><div class='add'>+	authctx-&gt;assoclen = assoclen;</div><div class='add'>+	authctx-&gt;textlen = textlen;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;flags = hmac-&gt;base.flags;</div><div class='add'>+	return atmel_sha_hmac_setup(dd, atmel_sha_authenc_init2);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(atmel_sha_authenc_init);</div><div class='add'>+</div><div class='add'>+static int atmel_sha_authenc_init2(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_authenc_reqctx *authctx = ahash_request_ctx(req);</div><div class='add'>+	struct atmel_sha_reqctx *ctx = &amp;authctx-&gt;base;</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct atmel_sha_hmac_ctx *hmac = crypto_ahash_ctx(tfm);</div><div class='add'>+	size_t hs = ctx-&gt;hash_size;</div><div class='add'>+	size_t i, num_words = hs / sizeof(u32);</div><div class='add'>+	u32 mr, msg_size;</div><div class='add'>+</div><div class='add'>+	atmel_sha_write(dd, SHA_CR, SHA_CR_WUIHV);</div><div class='add'>+	for (i = 0; i &lt; num_words; ++i)</div><div class='add'>+		atmel_sha_write(dd, SHA_REG_DIN(i), hmac-&gt;ipad[i]);</div><div class='add'>+</div><div class='add'>+	atmel_sha_write(dd, SHA_CR, SHA_CR_WUIEHV);</div><div class='add'>+	for (i = 0; i &lt; num_words; ++i)</div><div class='add'>+		atmel_sha_write(dd, SHA_REG_DIN(i), hmac-&gt;opad[i]);</div><div class='add'>+</div><div class='add'>+	mr = (SHA_MR_MODE_IDATAR0 |</div><div class='add'>+	      SHA_MR_HMAC |</div><div class='add'>+	      SHA_MR_DUALBUFF);</div><div class='add'>+	mr |= ctx-&gt;flags &amp; SHA_FLAGS_ALGO_MASK;</div><div class='add'>+	atmel_sha_write(dd, SHA_MR, mr);</div><div class='add'>+</div><div class='add'>+	msg_size = authctx-&gt;assoclen + authctx-&gt;textlen;</div><div class='add'>+	atmel_sha_write(dd, SHA_MSR, msg_size);</div><div class='add'>+	atmel_sha_write(dd, SHA_BCR, msg_size);</div><div class='add'>+</div><div class='add'>+	atmel_sha_write(dd, SHA_CR, SHA_CR_FIRST);</div><div class='add'>+</div><div class='add'>+	/* Process assoc data. */</div><div class='add'>+	return atmel_sha_cpu_start(dd, authctx-&gt;assoc, authctx-&gt;assoclen,</div><div class='add'>+				   true, false,</div><div class='add'>+				   atmel_sha_authenc_init_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atmel_sha_authenc_init_done(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_authenc_reqctx *authctx = ahash_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	return authctx-&gt;cb(authctx-&gt;aes_dev, 0, dd-&gt;is_async);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int atmel_sha_authenc_final(struct ahash_request *req,</div><div class='add'>+			    u32 *digest, unsigned int digestlen,</div><div class='add'>+			    atmel_aes_authenc_fn_t cb,</div><div class='add'>+			    struct atmel_aes_dev *aes_dev)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_authenc_reqctx *authctx = ahash_request_ctx(req);</div><div class='add'>+	struct atmel_sha_reqctx *ctx = &amp;authctx-&gt;base;</div><div class='add'>+	struct atmel_sha_dev *dd = ctx-&gt;dd;</div><div class='add'>+</div><div class='add'>+	switch (ctx-&gt;flags &amp; SHA_FLAGS_ALGO_MASK) {</div><div class='add'>+	case SHA_FLAGS_SHA1:</div><div class='add'>+		authctx-&gt;digestlen = SHA1_DIGEST_SIZE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA224:</div><div class='add'>+		authctx-&gt;digestlen = SHA224_DIGEST_SIZE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA256:</div><div class='add'>+		authctx-&gt;digestlen = SHA256_DIGEST_SIZE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA384:</div><div class='add'>+		authctx-&gt;digestlen = SHA384_DIGEST_SIZE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SHA_FLAGS_SHA512:</div><div class='add'>+		authctx-&gt;digestlen = SHA512_DIGEST_SIZE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return atmel_sha_complete(dd, -EINVAL);</div><div class='add'>+	}</div><div class='add'>+	if (authctx-&gt;digestlen &gt; digestlen)</div><div class='add'>+		authctx-&gt;digestlen = digestlen;</div><div class='add'>+</div><div class='add'>+	authctx-&gt;cb = cb;</div><div class='add'>+	authctx-&gt;aes_dev = aes_dev;</div><div class='add'>+	authctx-&gt;digest = digest;</div><div class='add'>+	return atmel_sha_wait_for_data_ready(dd,</div><div class='add'>+					     atmel_sha_authenc_final_done);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(atmel_sha_authenc_final);</div><div class='add'>+</div><div class='add'>+static int atmel_sha_authenc_final_done(struct atmel_sha_dev *dd)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = dd-&gt;req;</div><div class='add'>+	struct atmel_sha_authenc_reqctx *authctx = ahash_request_ctx(req);</div><div class='add'>+	size_t i, num_words = authctx-&gt;digestlen / sizeof(u32);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_words; ++i)</div><div class='add'>+		authctx-&gt;digest[i] = atmel_sha_read(dd, SHA_REG_DIGEST(i));</div><div class='add'>+</div><div class='add'>+	return atmel_sha_complete(dd, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void atmel_sha_authenc_abort(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct atmel_sha_authenc_reqctx *authctx = ahash_request_ctx(req);</div><div class='add'>+	struct atmel_sha_reqctx *ctx = &amp;authctx-&gt;base;</div><div class='add'>+	struct atmel_sha_dev *dd = ctx-&gt;dd;</div><div class='add'>+</div><div class='add'>+	/* Prevent atmel_sha_complete() from calling req-&gt;base.complete(). */</div><div class='add'>+	dd-&gt;is_async = false;</div><div class='add'>+	dd-&gt;force_complete = false;</div><div class='add'>+	(void)atmel_sha_complete(dd, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(atmel_sha_authenc_abort);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_CRYPTO_DEV_ATMEL_AUTHENC */</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static void atmel_sha_unregister_algs(struct atmel_sha_dev *dd)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (dd-&gt;caps.has_hmac)</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(sha_hmac_algs); i++)</div><div class='add'>+			crypto_unregister_ahash(&amp;sha_hmac_algs[i]);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(sha_1_256_algs); i++)</div><div class='ctx'> 		crypto_unregister_ahash(&amp;sha_1_256_algs[i]);</div><div class='ctx'> </div><div class='hunk'>@@ -1273,8 +2583,21 @@ static int atmel_sha_register_algs(struct atmel_sha_dev *dd)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dd-&gt;caps.has_hmac) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(sha_hmac_algs); i++) {</div><div class='add'>+			err = crypto_register_ahash(&amp;sha_hmac_algs[i]);</div><div class='add'>+			if (err)</div><div class='add'>+				goto err_sha_hmac_algs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+	/*i = ARRAY_SIZE(sha_hmac_algs);*/</div><div class='add'>+err_sha_hmac_algs:</div><div class='add'>+	for (j = 0; j &lt; i; j++)</div><div class='add'>+		crypto_unregister_ahash(&amp;sha_hmac_algs[j]);</div><div class='add'>+	i = ARRAY_SIZE(sha_384_512_algs);</div><div class='ctx'> err_sha_384_512_algs:</div><div class='ctx'> 	for (j = 0; j &lt; i; j++)</div><div class='ctx'> 		crypto_unregister_ahash(&amp;sha_384_512_algs[j]);</div><div class='hunk'>@@ -1344,6 +2667,7 @@ static void atmel_sha_get_cap(struct atmel_sha_dev *dd)</div><div class='ctx'> 	dd-&gt;caps.has_sha224 = 0;</div><div class='ctx'> 	dd-&gt;caps.has_sha_384_512 = 0;</div><div class='ctx'> 	dd-&gt;caps.has_uihv = 0;</div><div class='add'>+	dd-&gt;caps.has_hmac = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* keep only major version number */</div><div class='ctx'> 	switch (dd-&gt;hw_version &amp; 0xff0) {</div><div class='hunk'>@@ -1353,6 +2677,7 @@ static void atmel_sha_get_cap(struct atmel_sha_dev *dd)</div><div class='ctx'> 		dd-&gt;caps.has_sha224 = 1;</div><div class='ctx'> 		dd-&gt;caps.has_sha_384_512 = 1;</div><div class='ctx'> 		dd-&gt;caps.has_uihv = 1;</div><div class='add'>+		dd-&gt;caps.has_hmac = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x420:</div><div class='ctx'> 		dd-&gt;caps.has_dma = 1;</div><div class='head'>diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c<br/>index bf467d7be35c..b25f1b3c981f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/atmel-tdes.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/atmel-tdes.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/atmel-tdes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/atmel-tdes.c</a></div><div class='hunk'>@@ -150,7 +150,7 @@ static struct atmel_tdes_drv atmel_tdes = {</div><div class='ctx'> static int atmel_tdes_sg_copy(struct scatterlist **sg, size_t *offset,</div><div class='ctx'> 			void *buf, size_t buflen, size_t total, int out)</div><div class='ctx'> {</div><div class='del'>-	unsigned int count, off = 0;</div><div class='add'>+	size_t count, off = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (buflen &amp;&amp; total) {</div><div class='ctx'> 		count = min((*sg)-&gt;length - *offset, total);</div><div class='hunk'>@@ -336,7 +336,7 @@ static int atmel_tdes_crypt_pdc_stop(struct atmel_tdes_dev *dd)</div><div class='ctx'> 				dd-&gt;buf_out, dd-&gt;buflen, dd-&gt;dma_size, 1);</div><div class='ctx'> 		if (count != dd-&gt;dma_size) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='del'>-			pr_err("not all data converted: %u\n", count);</div><div class='add'>+			pr_err("not all data converted: %zu\n", count);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -361,7 +361,7 @@ static int atmel_tdes_buff_init(struct atmel_tdes_dev *dd)</div><div class='ctx'> 	dd-&gt;dma_addr_in = dma_map_single(dd-&gt;dev, dd-&gt;buf_in,</div><div class='ctx'> 					dd-&gt;buflen, DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(dd-&gt;dev, dd-&gt;dma_addr_in)) {</div><div class='del'>-		dev_err(dd-&gt;dev, "dma %d bytes error\n", dd-&gt;buflen);</div><div class='add'>+		dev_err(dd-&gt;dev, "dma %zd bytes error\n", dd-&gt;buflen);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err_map_in;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -369,7 +369,7 @@ static int atmel_tdes_buff_init(struct atmel_tdes_dev *dd)</div><div class='ctx'> 	dd-&gt;dma_addr_out = dma_map_single(dd-&gt;dev, dd-&gt;buf_out,</div><div class='ctx'> 					dd-&gt;buflen, DMA_FROM_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(dd-&gt;dev, dd-&gt;dma_addr_out)) {</div><div class='del'>-		dev_err(dd-&gt;dev, "dma %d bytes error\n", dd-&gt;buflen);</div><div class='add'>+		dev_err(dd-&gt;dev, "dma %zd bytes error\n", dd-&gt;buflen);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err_map_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -525,8 +525,8 @@ static int atmel_tdes_crypt_start(struct atmel_tdes_dev *dd)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (fast)  {</div><div class='del'>-		count = min(dd-&gt;total, sg_dma_len(dd-&gt;in_sg));</div><div class='del'>-		count = min(count, sg_dma_len(dd-&gt;out_sg));</div><div class='add'>+		count = min_t(size_t, dd-&gt;total, sg_dma_len(dd-&gt;in_sg));</div><div class='add'>+		count = min_t(size_t, count, sg_dma_len(dd-&gt;out_sg));</div><div class='ctx'> </div><div class='ctx'> 		err = dma_map_sg(dd-&gt;dev, dd-&gt;in_sg, 1, DMA_TO_DEVICE);</div><div class='ctx'> 		if (!err) {</div><div class='hunk'>@@ -661,7 +661,7 @@ static int atmel_tdes_crypt_dma_stop(struct atmel_tdes_dev *dd)</div><div class='ctx'> 				dd-&gt;buf_out, dd-&gt;buflen, dd-&gt;dma_size, 1);</div><div class='ctx'> 			if (count != dd-&gt;dma_size) {</div><div class='ctx'> 				err = -EINVAL;</div><div class='del'>-				pr_err("not all data converted: %u\n", count);</div><div class='add'>+				pr_err("not all data converted: %zu\n", count);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/crypto/bcm/Makefile b/drivers/crypto/bcm/Makefile<br/>new file mode 100644<br/>index 000000000000..13cb80eb2665<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bcm/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/Makefile</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+# File: drivers/crypto/bcm/Makefile</div><div class='add'>+#</div><div class='add'>+# Makefile for crypto acceleration files for Broadcom SPU driver</div><div class='add'>+#</div><div class='add'>+# Uncomment to enable debug tracing in the SPU driver.</div><div class='add'>+# CFLAGS_util.o := -DDEBUG</div><div class='add'>+# CFLAGS_cipher.o := -DDEBUG</div><div class='add'>+# CFLAGS_spu.o := -DDEBUG</div><div class='add'>+# CFLAGS_spu2.o := -DDEBUG</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_BCM_SPU) := bcm_crypto_spu.o</div><div class='add'>+</div><div class='add'>+bcm_crypto_spu-objs :=  util.o spu.o spu2.o cipher.o</div><div class='add'>+</div><div class='add'>+ccflags-y += -I. -DBCMDRIVER</div><div class='head'>diff --git a/drivers/crypto/bcm/cipher.c b/drivers/crypto/bcm/cipher.c<br/>new file mode 100644<br/>index 000000000000..cc0d5b98006e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bcm/cipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/cipher.c</a></div><div class='hunk'>@@ -0,0 +1,4963 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Broadcom</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, version 2, as</div><div class='add'>+ * published by the Free Software Foundation (the "GPL").</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License version 2 (GPLv2) for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * version 2 (GPLv2) along with this source code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/des.h&gt;</div><div class='add'>+#include &lt;crypto/sha.h&gt;</div><div class='add'>+#include &lt;crypto/md5.h&gt;</div><div class='add'>+#include &lt;crypto/authenc.h&gt;</div><div class='add'>+#include &lt;crypto/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/sha3.h&gt;</div><div class='add'>+</div><div class='add'>+#include "util.h"</div><div class='add'>+#include "cipher.h"</div><div class='add'>+#include "spu.h"</div><div class='add'>+#include "spum.h"</div><div class='add'>+#include "spu2.h"</div><div class='add'>+</div><div class='add'>+/* ================= Device Structure ================== */</div><div class='add'>+</div><div class='add'>+struct device_private iproc_priv;</div><div class='add'>+</div><div class='add'>+/* ==================== Parameters ===================== */</div><div class='add'>+</div><div class='add'>+int flow_debug_logging;</div><div class='add'>+module_param(flow_debug_logging, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(flow_debug_logging, "Enable Flow Debug Logging");</div><div class='add'>+</div><div class='add'>+int packet_debug_logging;</div><div class='add'>+module_param(packet_debug_logging, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(packet_debug_logging, "Enable Packet Debug Logging");</div><div class='add'>+</div><div class='add'>+int debug_logging_sleep;</div><div class='add'>+module_param(debug_logging_sleep, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug_logging_sleep, "Packet Debug Logging Sleep");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The value of these module parameters is used to set the priority for each</div><div class='add'>+ * algo type when this driver registers algos with the kernel crypto API.</div><div class='add'>+ * To use a priority other than the default, set the priority in the insmod or</div><div class='add'>+ * modprobe. Changing the module priority after init time has no effect.</div><div class='add'>+ *</div><div class='add'>+ * The default priorities are chosen to be lower (less preferred) than ARMv8 CE</div><div class='add'>+ * algos, but more preferred than generic software algos.</div><div class='add'>+ */</div><div class='add'>+static int cipher_pri = 150;</div><div class='add'>+module_param(cipher_pri, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(cipher_pri, "Priority for cipher algos");</div><div class='add'>+</div><div class='add'>+static int hash_pri = 100;</div><div class='add'>+module_param(hash_pri, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(hash_pri, "Priority for hash algos");</div><div class='add'>+</div><div class='add'>+static int aead_pri = 150;</div><div class='add'>+module_param(aead_pri, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(aead_pri, "Priority for AEAD algos");</div><div class='add'>+</div><div class='add'>+#define MAX_SPUS 16</div><div class='add'>+</div><div class='add'>+/* A type 3 BCM header, expected to precede the SPU header for SPU-M.</div><div class='add'>+ * Bits 3 and 4 in the first byte encode the channel number (the dma ringset).</div><div class='add'>+ * 0x60 - ring 0</div><div class='add'>+ * 0x68 - ring 1</div><div class='add'>+ * 0x70 - ring 2</div><div class='add'>+ * 0x78 - ring 3</div><div class='add'>+ */</div><div class='add'>+char BCMHEADER[] = { 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28 };</div><div class='add'>+/*</div><div class='add'>+ * Some SPU hw does not use BCM header on SPU messages. So BCM_HDR_LEN</div><div class='add'>+ * is set dynamically after reading SPU type from device tree.</div><div class='add'>+ */</div><div class='add'>+#define BCM_HDR_LEN  iproc_priv.bcm_hdr_len</div><div class='add'>+</div><div class='add'>+/* min and max time to sleep before retrying when mbox queue is full. usec */</div><div class='add'>+#define MBOX_SLEEP_MIN  800</div><div class='add'>+#define MBOX_SLEEP_MAX 1000</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * select_channel() - Select a SPU channel to handle a crypto request. Selects</div><div class='add'>+ * channel in round robin order.</div><div class='add'>+ *</div><div class='add'>+ * Return:  channel index</div><div class='add'>+ */</div><div class='add'>+static u8 select_channel(void)</div><div class='add'>+{</div><div class='add'>+	u8 chan_idx = atomic_inc_return(&amp;iproc_priv.next_chan);</div><div class='add'>+</div><div class='add'>+	return chan_idx % iproc_priv.spu.num_spu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_ablkcipher_rx_sg_create() - Build up the scatterlist of buffers used to</div><div class='add'>+ * receive a SPU response message for an ablkcipher request. Includes buffers to</div><div class='add'>+ * catch SPU message headers and the response data.</div><div class='add'>+ * @mssg:	mailbox message containing the receive sg</div><div class='add'>+ * @rctx:	crypto request context</div><div class='add'>+ * @rx_frag_num: number of scatterlist elements required to hold the</div><div class='add'>+ *		SPU response message</div><div class='add'>+ * @chunksize:	Number of bytes of response data expected</div><div class='add'>+ * @stat_pad_len: Number of bytes required to pad the STAT field to</div><div class='add'>+ *		a 4-byte boundary</div><div class='add'>+ *</div><div class='add'>+ * The scatterlist that gets allocated here is freed in spu_chunk_cleanup()</div><div class='add'>+ * when the request completes, whether the request is handled successfully or</div><div class='add'>+ * there is an error.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *   0 if successful</div><div class='add'>+ *   &lt; 0 if an error</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+spu_ablkcipher_rx_sg_create(struct brcm_message *mssg,</div><div class='add'>+			    struct iproc_reqctx_s *rctx,</div><div class='add'>+			    u8 rx_frag_num,</div><div class='add'>+			    unsigned int chunksize, u32 stat_pad_len)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct scatterlist *sg;	/* used to build sgs in mbox message */</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+	u32 datalen;		/* Number of bytes of response data expected */</div><div class='add'>+</div><div class='add'>+	mssg-&gt;spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist),</div><div class='add'>+				rctx-&gt;gfp);</div><div class='add'>+	if (!mssg-&gt;spu.dst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sg = mssg-&gt;spu.dst;</div><div class='add'>+	sg_init_table(sg, rx_frag_num);</div><div class='add'>+	/* Space for SPU message header */</div><div class='add'>+	sg_set_buf(sg++, rctx-&gt;msg_buf.spu_resp_hdr, ctx-&gt;spu_resp_hdr_len);</div><div class='add'>+</div><div class='add'>+	/* If XTS tweak in payload, add buffer to receive encrypted tweak */</div><div class='add'>+	if ((ctx-&gt;cipher.mode == CIPHER_MODE_XTS) &amp;&amp;</div><div class='add'>+	    spu-&gt;spu_xts_tweak_in_payload())</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.c.supdt_tweak,</div><div class='add'>+			   SPU_XTS_TWEAK_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Copy in each dst sg entry from request, up to chunksize */</div><div class='add'>+	datalen = spu_msg_sg_add(&amp;sg, &amp;rctx-&gt;dst_sg, &amp;rctx-&gt;dst_skip,</div><div class='add'>+				 rctx-&gt;dst_nents, chunksize);</div><div class='add'>+	if (datalen &lt; chunksize) {</div><div class='add'>+		pr_err("%s(): failed to copy dst sg to mbox msg. chunksize %u, datalen %u",</div><div class='add'>+		       __func__, chunksize, datalen);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;cipher.alg == CIPHER_ALG_RC4)</div><div class='add'>+		/* Add buffer to catch 260-byte SUPDT field for RC4 */</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.c.supdt_tweak, SPU_SUPDT_LEN);</div><div class='add'>+</div><div class='add'>+	if (stat_pad_len)</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.rx_stat_pad, stat_pad_len);</div><div class='add'>+</div><div class='add'>+	memset(rctx-&gt;msg_buf.rx_stat, 0, SPU_RX_STATUS_LEN);</div><div class='add'>+	sg_set_buf(sg, rctx-&gt;msg_buf.rx_stat, spu-&gt;spu_rx_status_len());</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_ablkcipher_tx_sg_create() - Build up the scatterlist of buffers used to</div><div class='add'>+ * send a SPU request message for an ablkcipher request. Includes SPU message</div><div class='add'>+ * headers and the request data.</div><div class='add'>+ * @mssg:	mailbox message containing the transmit sg</div><div class='add'>+ * @rctx:	crypto request context</div><div class='add'>+ * @tx_frag_num: number of scatterlist elements required to construct the</div><div class='add'>+ *		SPU request message</div><div class='add'>+ * @chunksize:	Number of bytes of request data</div><div class='add'>+ * @pad_len:	Number of pad bytes</div><div class='add'>+ *</div><div class='add'>+ * The scatterlist that gets allocated here is freed in spu_chunk_cleanup()</div><div class='add'>+ * when the request completes, whether the request is handled successfully or</div><div class='add'>+ * there is an error.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *   0 if successful</div><div class='add'>+ *   &lt; 0 if an error</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+spu_ablkcipher_tx_sg_create(struct brcm_message *mssg,</div><div class='add'>+			    struct iproc_reqctx_s *rctx,</div><div class='add'>+			    u8 tx_frag_num, unsigned int chunksize, u32 pad_len)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct scatterlist *sg;	/* used to build sgs in mbox message */</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+	u32 datalen;		/* Number of bytes of response data expected */</div><div class='add'>+	u32 stat_len;</div><div class='add'>+</div><div class='add'>+	mssg-&gt;spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist),</div><div class='add'>+				rctx-&gt;gfp);</div><div class='add'>+	if (unlikely(!mssg-&gt;spu.src))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sg = mssg-&gt;spu.src;</div><div class='add'>+	sg_init_table(sg, tx_frag_num);</div><div class='add'>+</div><div class='add'>+	sg_set_buf(sg++, rctx-&gt;msg_buf.bcm_spu_req_hdr,</div><div class='add'>+		   BCM_HDR_LEN + ctx-&gt;spu_req_hdr_len);</div><div class='add'>+</div><div class='add'>+	/* if XTS tweak in payload, copy from IV (where crypto API puts it) */</div><div class='add'>+	if ((ctx-&gt;cipher.mode == CIPHER_MODE_XTS) &amp;&amp;</div><div class='add'>+	    spu-&gt;spu_xts_tweak_in_payload())</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.iv_ctr, SPU_XTS_TWEAK_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Copy in each src sg entry from request, up to chunksize */</div><div class='add'>+	datalen = spu_msg_sg_add(&amp;sg, &amp;rctx-&gt;src_sg, &amp;rctx-&gt;src_skip,</div><div class='add'>+				 rctx-&gt;src_nents, chunksize);</div><div class='add'>+	if (unlikely(datalen &lt; chunksize)) {</div><div class='add'>+		pr_err("%s(): failed to copy src sg to mbox msg",</div><div class='add'>+		       __func__);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pad_len)</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.spu_req_pad, pad_len);</div><div class='add'>+</div><div class='add'>+	stat_len = spu-&gt;spu_tx_status_len();</div><div class='add'>+	if (stat_len) {</div><div class='add'>+		memset(rctx-&gt;msg_buf.tx_stat, 0, stat_len);</div><div class='add'>+		sg_set_buf(sg, rctx-&gt;msg_buf.tx_stat, stat_len);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handle_ablkcipher_req() - Submit as much of a block cipher request as fits in</div><div class='add'>+ * a single SPU request message, starting at the current position in the request</div><div class='add'>+ * data.</div><div class='add'>+ * @rctx:	Crypto request context</div><div class='add'>+ *</div><div class='add'>+ * This may be called on the crypto API thread, or, when a request is so large</div><div class='add'>+ * it must be broken into multiple SPU messages, on the thread used to invoke</div><div class='add'>+ * the response callback. When requests are broken into multiple SPU</div><div class='add'>+ * messages, we assume subsequent messages depend on previous results, and</div><div class='add'>+ * thus always wait for previous results before submitting the next message.</div><div class='add'>+ * Because requests are submitted in lock step like this, there is no need</div><div class='add'>+ * to synchronize access to request data structures.</div><div class='add'>+ *</div><div class='add'>+ * Return: -EINPROGRESS: request has been accepted and result will be returned</div><div class='add'>+ *			 asynchronously</div><div class='add'>+ *         Any other value indicates an error</div><div class='add'>+ */</div><div class='add'>+static int handle_ablkcipher_req(struct iproc_reqctx_s *rctx)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct crypto_async_request *areq = rctx-&gt;parent;</div><div class='add'>+	struct ablkcipher_request *req =</div><div class='add'>+	    container_of(areq, struct ablkcipher_request, base);</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+	struct spu_cipher_parms cipher_parms;</div><div class='add'>+	int err = 0;</div><div class='add'>+	unsigned int chunksize = 0;	/* Num bytes of request to submit */</div><div class='add'>+	int remaining = 0;	/* Bytes of request still to process */</div><div class='add'>+	int chunk_start;	/* Beginning of data for current SPU msg */</div><div class='add'>+</div><div class='add'>+	/* IV or ctr value to use in this SPU msg */</div><div class='add'>+	u8 local_iv_ctr[MAX_IV_SIZE];</div><div class='add'>+	u32 stat_pad_len;	/* num bytes to align status field */</div><div class='add'>+	u32 pad_len;		/* total length of all padding */</div><div class='add'>+	bool update_key = false;</div><div class='add'>+	struct brcm_message *mssg;	/* mailbox message */</div><div class='add'>+	int retry_cnt = 0;</div><div class='add'>+</div><div class='add'>+	/* number of entries in src and dst sg in mailbox message. */</div><div class='add'>+	u8 rx_frag_num = 2;	/* response header and STATUS */</div><div class='add'>+	u8 tx_frag_num = 1;	/* request header */</div><div class='add'>+</div><div class='add'>+	flow_log("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	cipher_parms.alg = ctx-&gt;cipher.alg;</div><div class='add'>+	cipher_parms.mode = ctx-&gt;cipher.mode;</div><div class='add'>+	cipher_parms.type = ctx-&gt;cipher_type;</div><div class='add'>+	cipher_parms.key_len = ctx-&gt;enckeylen;</div><div class='add'>+	cipher_parms.key_buf = ctx-&gt;enckey;</div><div class='add'>+	cipher_parms.iv_buf = local_iv_ctr;</div><div class='add'>+	cipher_parms.iv_len = rctx-&gt;iv_ctr_len;</div><div class='add'>+</div><div class='add'>+	mssg = &amp;rctx-&gt;mb_mssg;</div><div class='add'>+	chunk_start = rctx-&gt;src_sent;</div><div class='add'>+	remaining = rctx-&gt;total_todo - chunk_start;</div><div class='add'>+</div><div class='add'>+	/* determine the chunk we are breaking off and update the indexes */</div><div class='add'>+	if ((ctx-&gt;max_payload != SPU_MAX_PAYLOAD_INF) &amp;&amp;</div><div class='add'>+	    (remaining &gt; ctx-&gt;max_payload))</div><div class='add'>+		chunksize = ctx-&gt;max_payload;</div><div class='add'>+	else</div><div class='add'>+		chunksize = remaining;</div><div class='add'>+</div><div class='add'>+	rctx-&gt;src_sent += chunksize;</div><div class='add'>+	rctx-&gt;total_sent = rctx-&gt;src_sent;</div><div class='add'>+</div><div class='add'>+	/* Count number of sg entries to be included in this request */</div><div class='add'>+	rctx-&gt;src_nents = spu_sg_count(rctx-&gt;src_sg, rctx-&gt;src_skip, chunksize);</div><div class='add'>+	rctx-&gt;dst_nents = spu_sg_count(rctx-&gt;dst_sg, rctx-&gt;dst_skip, chunksize);</div><div class='add'>+</div><div class='add'>+	if ((ctx-&gt;cipher.mode == CIPHER_MODE_CBC) &amp;&amp;</div><div class='add'>+	    rctx-&gt;is_encrypt &amp;&amp; chunk_start)</div><div class='add'>+		/*</div><div class='add'>+		 * Encrypting non-first first chunk. Copy last block of</div><div class='add'>+		 * previous result to IV for this chunk.</div><div class='add'>+		 */</div><div class='add'>+		sg_copy_part_to_buf(req-&gt;dst, rctx-&gt;msg_buf.iv_ctr,</div><div class='add'>+				    rctx-&gt;iv_ctr_len,</div><div class='add'>+				    chunk_start - rctx-&gt;iv_ctr_len);</div><div class='add'>+</div><div class='add'>+	if (rctx-&gt;iv_ctr_len) {</div><div class='add'>+		/* get our local copy of the iv */</div><div class='add'>+		__builtin_memcpy(local_iv_ctr, rctx-&gt;msg_buf.iv_ctr,</div><div class='add'>+				 rctx-&gt;iv_ctr_len);</div><div class='add'>+</div><div class='add'>+		/* generate the next IV if possible */</div><div class='add'>+		if ((ctx-&gt;cipher.mode == CIPHER_MODE_CBC) &amp;&amp;</div><div class='add'>+		    !rctx-&gt;is_encrypt) {</div><div class='add'>+			/*</div><div class='add'>+			 * CBC Decrypt: next IV is the last ciphertext block in</div><div class='add'>+			 * this chunk</div><div class='add'>+			 */</div><div class='add'>+			sg_copy_part_to_buf(req-&gt;src, rctx-&gt;msg_buf.iv_ctr,</div><div class='add'>+					    rctx-&gt;iv_ctr_len,</div><div class='add'>+					    rctx-&gt;src_sent - rctx-&gt;iv_ctr_len);</div><div class='add'>+		} else if (ctx-&gt;cipher.mode == CIPHER_MODE_CTR) {</div><div class='add'>+			/*</div><div class='add'>+			 * The SPU hardware increments the counter once for</div><div class='add'>+			 * each AES block of 16 bytes. So update the counter</div><div class='add'>+			 * for the next chunk, if there is one. Note that for</div><div class='add'>+			 * this chunk, the counter has already been copied to</div><div class='add'>+			 * local_iv_ctr. We can assume a block size of 16,</div><div class='add'>+			 * because we only support CTR mode for AES, not for</div><div class='add'>+			 * any other cipher alg.</div><div class='add'>+			 */</div><div class='add'>+			add_to_ctr(rctx-&gt;msg_buf.iv_ctr, chunksize &gt;&gt; 4);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;cipher.alg == CIPHER_ALG_RC4) {</div><div class='add'>+		rx_frag_num++;</div><div class='add'>+		if (chunk_start) {</div><div class='add'>+			/*</div><div class='add'>+			 * for non-first RC4 chunks, use SUPDT from previous</div><div class='add'>+			 * response as key for this chunk.</div><div class='add'>+			 */</div><div class='add'>+			cipher_parms.key_buf = rctx-&gt;msg_buf.c.supdt_tweak;</div><div class='add'>+			update_key = true;</div><div class='add'>+			cipher_parms.type = CIPHER_TYPE_UPDT;</div><div class='add'>+		} else if (!rctx-&gt;is_encrypt) {</div><div class='add'>+			/*</div><div class='add'>+			 * First RC4 chunk. For decrypt, key in pre-built msg</div><div class='add'>+			 * header may have been changed if encrypt required</div><div class='add'>+			 * multiple chunks. So revert the key to the</div><div class='add'>+			 * ctx-&gt;enckey value.</div><div class='add'>+			 */</div><div class='add'>+			update_key = true;</div><div class='add'>+			cipher_parms.type = CIPHER_TYPE_INIT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;max_payload == SPU_MAX_PAYLOAD_INF)</div><div class='add'>+		flow_log("max_payload infinite\n");</div><div class='add'>+	else</div><div class='add'>+		flow_log("max_payload %u\n", ctx-&gt;max_payload);</div><div class='add'>+</div><div class='add'>+	flow_log("sent:%u start:%u remains:%u size:%u\n",</div><div class='add'>+		 rctx-&gt;src_sent, chunk_start, remaining, chunksize);</div><div class='add'>+</div><div class='add'>+	/* Copy SPU header template created at setkey time */</div><div class='add'>+	memcpy(rctx-&gt;msg_buf.bcm_spu_req_hdr, ctx-&gt;bcm_spu_req_hdr,</div><div class='add'>+	       sizeof(rctx-&gt;msg_buf.bcm_spu_req_hdr));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Pass SUPDT field as key. Key field in finish() call is only used</div><div class='add'>+	 * when update_key has been set above for RC4. Will be ignored in</div><div class='add'>+	 * all other cases.</div><div class='add'>+	 */</div><div class='add'>+	spu-&gt;spu_cipher_req_finish(rctx-&gt;msg_buf.bcm_spu_req_hdr + BCM_HDR_LEN,</div><div class='add'>+				   ctx-&gt;spu_req_hdr_len, !(rctx-&gt;is_encrypt),</div><div class='add'>+				   &amp;cipher_parms, update_key, chunksize);</div><div class='add'>+</div><div class='add'>+	atomic64_add(chunksize, &amp;iproc_priv.bytes_out);</div><div class='add'>+</div><div class='add'>+	stat_pad_len = spu-&gt;spu_wordalign_padlen(chunksize);</div><div class='add'>+	if (stat_pad_len)</div><div class='add'>+		rx_frag_num++;</div><div class='add'>+	pad_len = stat_pad_len;</div><div class='add'>+	if (pad_len) {</div><div class='add'>+		tx_frag_num++;</div><div class='add'>+		spu-&gt;spu_request_pad(rctx-&gt;msg_buf.spu_req_pad, 0,</div><div class='add'>+				     0, ctx-&gt;auth.alg, ctx-&gt;auth.mode,</div><div class='add'>+				     rctx-&gt;total_sent, stat_pad_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spu-&gt;spu_dump_msg_hdr(rctx-&gt;msg_buf.bcm_spu_req_hdr + BCM_HDR_LEN,</div><div class='add'>+			      ctx-&gt;spu_req_hdr_len);</div><div class='add'>+	packet_log("payload:\n");</div><div class='add'>+	dump_sg(rctx-&gt;src_sg, rctx-&gt;src_skip, chunksize);</div><div class='add'>+	packet_dump("   pad: ", rctx-&gt;msg_buf.spu_req_pad, pad_len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Build mailbox message containing SPU request msg and rx buffers</div><div class='add'>+	 * to catch response message</div><div class='add'>+	 */</div><div class='add'>+	memset(mssg, 0, sizeof(*mssg));</div><div class='add'>+	mssg-&gt;type = BRCM_MESSAGE_SPU;</div><div class='add'>+	mssg-&gt;ctx = rctx;	/* Will be returned in response */</div><div class='add'>+</div><div class='add'>+	/* Create rx scatterlist to catch result */</div><div class='add'>+	rx_frag_num += rctx-&gt;dst_nents;</div><div class='add'>+</div><div class='add'>+	if ((ctx-&gt;cipher.mode == CIPHER_MODE_XTS) &amp;&amp;</div><div class='add'>+	    spu-&gt;spu_xts_tweak_in_payload())</div><div class='add'>+		rx_frag_num++;	/* extra sg to insert tweak */</div><div class='add'>+</div><div class='add'>+	err = spu_ablkcipher_rx_sg_create(mssg, rctx, rx_frag_num, chunksize,</div><div class='add'>+					  stat_pad_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Create tx scatterlist containing SPU request message */</div><div class='add'>+	tx_frag_num += rctx-&gt;src_nents;</div><div class='add'>+	if (spu-&gt;spu_tx_status_len())</div><div class='add'>+		tx_frag_num++;</div><div class='add'>+</div><div class='add'>+	if ((ctx-&gt;cipher.mode == CIPHER_MODE_XTS) &amp;&amp;</div><div class='add'>+	    spu-&gt;spu_xts_tweak_in_payload())</div><div class='add'>+		tx_frag_num++;	/* extra sg to insert tweak */</div><div class='add'>+</div><div class='add'>+	err = spu_ablkcipher_tx_sg_create(mssg, rctx, tx_frag_num, chunksize,</div><div class='add'>+					  pad_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mbox_send_message(iproc_priv.mbox[rctx-&gt;chan_idx], mssg);</div><div class='add'>+	if (req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP) {</div><div class='add'>+		while ((err == -ENOBUFS) &amp;&amp; (retry_cnt &lt; SPU_MB_RETRY_MAX)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Mailbox queue is full. Since MAY_SLEEP is set, assume</div><div class='add'>+			 * not in atomic context and we can wait and try again.</div><div class='add'>+			 */</div><div class='add'>+			retry_cnt++;</div><div class='add'>+			usleep_range(MBOX_SLEEP_MIN, MBOX_SLEEP_MAX);</div><div class='add'>+			err = mbox_send_message(iproc_priv.mbox[rctx-&gt;chan_idx],</div><div class='add'>+						mssg);</div><div class='add'>+			atomic_inc(&amp;iproc_priv.mb_no_spc);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(err &lt; 0)) {</div><div class='add'>+		atomic_inc(&amp;iproc_priv.mb_send_fail);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handle_ablkcipher_resp() - Process a block cipher SPU response. Updates the</div><div class='add'>+ * total received count for the request and updates global stats.</div><div class='add'>+ * @rctx:	Crypto request context</div><div class='add'>+ */</div><div class='add'>+static void handle_ablkcipher_resp(struct iproc_reqctx_s *rctx)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	struct crypto_async_request *areq = rctx-&gt;parent;</div><div class='add'>+	struct ablkcipher_request *req = ablkcipher_request_cast(areq);</div><div class='add'>+#endif</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+	u32 payload_len;</div><div class='add'>+</div><div class='add'>+	/* See how much data was returned */</div><div class='add'>+	payload_len = spu-&gt;spu_payload_length(rctx-&gt;msg_buf.spu_resp_hdr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In XTS mode, the first SPU_XTS_TWEAK_SIZE bytes may be the</div><div class='add'>+	 * encrypted tweak ("i") value; we don't count those.</div><div class='add'>+	 */</div><div class='add'>+	if ((ctx-&gt;cipher.mode == CIPHER_MODE_XTS) &amp;&amp;</div><div class='add'>+	    spu-&gt;spu_xts_tweak_in_payload() &amp;&amp;</div><div class='add'>+	    (payload_len &gt;= SPU_XTS_TWEAK_SIZE))</div><div class='add'>+		payload_len -= SPU_XTS_TWEAK_SIZE;</div><div class='add'>+</div><div class='add'>+	atomic64_add(payload_len, &amp;iproc_priv.bytes_in);</div><div class='add'>+</div><div class='add'>+	flow_log("%s() offset: %u, bd_len: %u BD:\n",</div><div class='add'>+		 __func__, rctx-&gt;total_received, payload_len);</div><div class='add'>+</div><div class='add'>+	dump_sg(req-&gt;dst, rctx-&gt;total_received, payload_len);</div><div class='add'>+	if (ctx-&gt;cipher.alg == CIPHER_ALG_RC4)</div><div class='add'>+		packet_dump("  supdt ", rctx-&gt;msg_buf.c.supdt_tweak,</div><div class='add'>+			    SPU_SUPDT_LEN);</div><div class='add'>+</div><div class='add'>+	rctx-&gt;total_received += payload_len;</div><div class='add'>+	if (rctx-&gt;total_received == rctx-&gt;total_todo) {</div><div class='add'>+		atomic_inc(&amp;iproc_priv.op_counts[SPU_OP_CIPHER]);</div><div class='add'>+		atomic_inc(</div><div class='add'>+		   &amp;iproc_priv.cipher_cnt[ctx-&gt;cipher.alg][ctx-&gt;cipher.mode]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_ahash_rx_sg_create() - Build up the scatterlist of buffers used to</div><div class='add'>+ * receive a SPU response message for an ahash request.</div><div class='add'>+ * @mssg:	mailbox message containing the receive sg</div><div class='add'>+ * @rctx:	crypto request context</div><div class='add'>+ * @rx_frag_num: number of scatterlist elements required to hold the</div><div class='add'>+ *		SPU response message</div><div class='add'>+ * @digestsize: length of hash digest, in bytes</div><div class='add'>+ * @stat_pad_len: Number of bytes required to pad the STAT field to</div><div class='add'>+ *		a 4-byte boundary</div><div class='add'>+ *</div><div class='add'>+ * The scatterlist that gets allocated here is freed in spu_chunk_cleanup()</div><div class='add'>+ * when the request completes, whether the request is handled successfully or</div><div class='add'>+ * there is an error.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *   0 if successful</div><div class='add'>+ *   &lt; 0 if an error</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+spu_ahash_rx_sg_create(struct brcm_message *mssg,</div><div class='add'>+		       struct iproc_reqctx_s *rctx,</div><div class='add'>+		       u8 rx_frag_num, unsigned int digestsize,</div><div class='add'>+		       u32 stat_pad_len)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct scatterlist *sg;	/* used to build sgs in mbox message */</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	mssg-&gt;spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist),</div><div class='add'>+				rctx-&gt;gfp);</div><div class='add'>+	if (!mssg-&gt;spu.dst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sg = mssg-&gt;spu.dst;</div><div class='add'>+	sg_init_table(sg, rx_frag_num);</div><div class='add'>+	/* Space for SPU message header */</div><div class='add'>+	sg_set_buf(sg++, rctx-&gt;msg_buf.spu_resp_hdr, ctx-&gt;spu_resp_hdr_len);</div><div class='add'>+</div><div class='add'>+	/* Space for digest */</div><div class='add'>+	sg_set_buf(sg++, rctx-&gt;msg_buf.digest, digestsize);</div><div class='add'>+</div><div class='add'>+	if (stat_pad_len)</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.rx_stat_pad, stat_pad_len);</div><div class='add'>+</div><div class='add'>+	memset(rctx-&gt;msg_buf.rx_stat, 0, SPU_RX_STATUS_LEN);</div><div class='add'>+	sg_set_buf(sg, rctx-&gt;msg_buf.rx_stat, spu-&gt;spu_rx_status_len());</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_ahash_tx_sg_create() -  Build up the scatterlist of buffers used to send</div><div class='add'>+ * a SPU request message for an ahash request. Includes SPU message headers and</div><div class='add'>+ * the request data.</div><div class='add'>+ * @mssg:	mailbox message containing the transmit sg</div><div class='add'>+ * @rctx:	crypto request context</div><div class='add'>+ * @tx_frag_num: number of scatterlist elements required to construct the</div><div class='add'>+ *		SPU request message</div><div class='add'>+ * @spu_hdr_len: length in bytes of SPU message header</div><div class='add'>+ * @hash_carry_len: Number of bytes of data carried over from previous req</div><div class='add'>+ * @new_data_len: Number of bytes of new request data</div><div class='add'>+ * @pad_len:	Number of pad bytes</div><div class='add'>+ *</div><div class='add'>+ * The scatterlist that gets allocated here is freed in spu_chunk_cleanup()</div><div class='add'>+ * when the request completes, whether the request is handled successfully or</div><div class='add'>+ * there is an error.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *   0 if successful</div><div class='add'>+ *   &lt; 0 if an error</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+spu_ahash_tx_sg_create(struct brcm_message *mssg,</div><div class='add'>+		       struct iproc_reqctx_s *rctx,</div><div class='add'>+		       u8 tx_frag_num,</div><div class='add'>+		       u32 spu_hdr_len,</div><div class='add'>+		       unsigned int hash_carry_len,</div><div class='add'>+		       unsigned int new_data_len, u32 pad_len)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct scatterlist *sg;	/* used to build sgs in mbox message */</div><div class='add'>+	u32 datalen;		/* Number of bytes of response data expected */</div><div class='add'>+	u32 stat_len;</div><div class='add'>+</div><div class='add'>+	mssg-&gt;spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist),</div><div class='add'>+				rctx-&gt;gfp);</div><div class='add'>+	if (!mssg-&gt;spu.src)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sg = mssg-&gt;spu.src;</div><div class='add'>+	sg_init_table(sg, tx_frag_num);</div><div class='add'>+</div><div class='add'>+	sg_set_buf(sg++, rctx-&gt;msg_buf.bcm_spu_req_hdr,</div><div class='add'>+		   BCM_HDR_LEN + spu_hdr_len);</div><div class='add'>+</div><div class='add'>+	if (hash_carry_len)</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;hash_carry, hash_carry_len);</div><div class='add'>+</div><div class='add'>+	if (new_data_len) {</div><div class='add'>+		/* Copy in each src sg entry from request, up to chunksize */</div><div class='add'>+		datalen = spu_msg_sg_add(&amp;sg, &amp;rctx-&gt;src_sg, &amp;rctx-&gt;src_skip,</div><div class='add'>+					 rctx-&gt;src_nents, new_data_len);</div><div class='add'>+		if (datalen &lt; new_data_len) {</div><div class='add'>+			pr_err("%s(): failed to copy src sg to mbox msg",</div><div class='add'>+			       __func__);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pad_len)</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.spu_req_pad, pad_len);</div><div class='add'>+</div><div class='add'>+	stat_len = spu-&gt;spu_tx_status_len();</div><div class='add'>+	if (stat_len) {</div><div class='add'>+		memset(rctx-&gt;msg_buf.tx_stat, 0, stat_len);</div><div class='add'>+		sg_set_buf(sg, rctx-&gt;msg_buf.tx_stat, stat_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handle_ahash_req() - Process an asynchronous hash request from the crypto</div><div class='add'>+ * API.</div><div class='add'>+ * @rctx:  Crypto request context</div><div class='add'>+ *</div><div class='add'>+ * Builds a SPU request message embedded in a mailbox message and submits the</div><div class='add'>+ * mailbox message on a selected mailbox channel. The SPU request message is</div><div class='add'>+ * constructed as a scatterlist, including entries from the crypto API's</div><div class='add'>+ * src scatterlist to avoid copying the data to be hashed. This function is</div><div class='add'>+ * called either on the thread from the crypto API, or, in the case that the</div><div class='add'>+ * crypto API request is too large to fit in a single SPU request message,</div><div class='add'>+ * on the thread that invokes the receive callback with a response message.</div><div class='add'>+ * Because some operations require the response from one chunk before the next</div><div class='add'>+ * chunk can be submitted, we always wait for the response for the previous</div><div class='add'>+ * chunk before submitting the next chunk. Because requests are submitted in</div><div class='add'>+ * lock step like this, there is no need to synchronize access to request data</div><div class='add'>+ * structures.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *   -EINPROGRESS: request has been submitted to SPU and response will be</div><div class='add'>+ *		   returned asynchronously</div><div class='add'>+ *   -EAGAIN:      non-final request included a small amount of data, which for</div><div class='add'>+ *		   efficiency we did not submit to the SPU, but instead stored</div><div class='add'>+ *		   to be submitted to the SPU with the next part of the request</div><div class='add'>+ *   other:        an error code</div><div class='add'>+ */</div><div class='add'>+static int handle_ahash_req(struct iproc_reqctx_s *rctx)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct crypto_async_request *areq = rctx-&gt;parent;</div><div class='add'>+	struct ahash_request *req = ahash_request_cast(areq);</div><div class='add'>+	struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct crypto_tfm *tfm = crypto_ahash_tfm(ahash);</div><div class='add'>+	unsigned int blocksize = crypto_tfm_alg_blocksize(tfm);</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	/* number of bytes still to be hashed in this req */</div><div class='add'>+	unsigned int nbytes_to_hash = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+	unsigned int chunksize = 0;	/* length of hash carry + new data */</div><div class='add'>+	/*</div><div class='add'>+	 * length of new data, not from hash carry, to be submitted in</div><div class='add'>+	 * this hw request</div><div class='add'>+	 */</div><div class='add'>+	unsigned int new_data_len;</div><div class='add'>+</div><div class='add'>+	unsigned int chunk_start = 0;</div><div class='add'>+	u32 db_size;	 /* Length of data field, incl gcm and hash padding */</div><div class='add'>+	int pad_len = 0; /* total pad len, including gcm, hash, stat padding */</div><div class='add'>+	u32 data_pad_len = 0;	/* length of GCM/CCM padding */</div><div class='add'>+	u32 stat_pad_len = 0;	/* length of padding to align STATUS word */</div><div class='add'>+	struct brcm_message *mssg;	/* mailbox message */</div><div class='add'>+	struct spu_request_opts req_opts;</div><div class='add'>+	struct spu_cipher_parms cipher_parms;</div><div class='add'>+	struct spu_hash_parms hash_parms;</div><div class='add'>+	struct spu_aead_parms aead_parms;</div><div class='add'>+	unsigned int local_nbuf;</div><div class='add'>+	u32 spu_hdr_len;</div><div class='add'>+	unsigned int digestsize;</div><div class='add'>+	u16 rem = 0;</div><div class='add'>+	int retry_cnt = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * number of entries in src and dst sg. Always includes SPU msg header.</div><div class='add'>+	 * rx always includes a buffer to catch digest and STATUS.</div><div class='add'>+	 */</div><div class='add'>+	u8 rx_frag_num = 3;</div><div class='add'>+	u8 tx_frag_num = 1;</div><div class='add'>+</div><div class='add'>+	flow_log("total_todo %u, total_sent %u\n",</div><div class='add'>+		 rctx-&gt;total_todo, rctx-&gt;total_sent);</div><div class='add'>+</div><div class='add'>+	memset(&amp;req_opts, 0, sizeof(req_opts));</div><div class='add'>+	memset(&amp;cipher_parms, 0, sizeof(cipher_parms));</div><div class='add'>+	memset(&amp;hash_parms, 0, sizeof(hash_parms));</div><div class='add'>+	memset(&amp;aead_parms, 0, sizeof(aead_parms));</div><div class='add'>+</div><div class='add'>+	req_opts.bd_suppress = true;</div><div class='add'>+	hash_parms.alg = ctx-&gt;auth.alg;</div><div class='add'>+	hash_parms.mode = ctx-&gt;auth.mode;</div><div class='add'>+	hash_parms.type = HASH_TYPE_NONE;</div><div class='add'>+	hash_parms.key_buf = (u8 *)ctx-&gt;authkey;</div><div class='add'>+	hash_parms.key_len = ctx-&gt;authkeylen;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For hash algorithms below assignment looks bit odd but</div><div class='add'>+	 * it's needed for AES-XCBC and AES-CMAC hash algorithms</div><div class='add'>+	 * to differentiate between 128, 192, 256 bit key values.</div><div class='add'>+	 * Based on the key values, hash algorithm is selected.</div><div class='add'>+	 * For example for 128 bit key, hash algorithm is AES-128.</div><div class='add'>+	 */</div><div class='add'>+	cipher_parms.type = ctx-&gt;cipher_type;</div><div class='add'>+</div><div class='add'>+	mssg = &amp;rctx-&gt;mb_mssg;</div><div class='add'>+	chunk_start = rctx-&gt;src_sent;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Compute the amount remaining to hash. This may include data</div><div class='add'>+	 * carried over from previous requests.</div><div class='add'>+	 */</div><div class='add'>+	nbytes_to_hash = rctx-&gt;total_todo - rctx-&gt;total_sent;</div><div class='add'>+	chunksize = nbytes_to_hash;</div><div class='add'>+	if ((ctx-&gt;max_payload != SPU_MAX_PAYLOAD_INF) &amp;&amp;</div><div class='add'>+	    (chunksize &gt; ctx-&gt;max_payload))</div><div class='add'>+		chunksize = ctx-&gt;max_payload;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If this is not a final request and the request data is not a multiple</div><div class='add'>+	 * of a full block, then simply park the extra data and prefix it to the</div><div class='add'>+	 * data for the next request.</div><div class='add'>+	 */</div><div class='add'>+	if (!rctx-&gt;is_final) {</div><div class='add'>+		u8 *dest = rctx-&gt;hash_carry + rctx-&gt;hash_carry_len;</div><div class='add'>+		u16 new_len;  /* len of data to add to hash carry */</div><div class='add'>+</div><div class='add'>+		rem = chunksize % blocksize;   /* remainder */</div><div class='add'>+		if (rem) {</div><div class='add'>+			/* chunksize not a multiple of blocksize */</div><div class='add'>+			chunksize -= rem;</div><div class='add'>+			if (chunksize == 0) {</div><div class='add'>+				/* Don't have a full block to submit to hw */</div><div class='add'>+				new_len = rem - rctx-&gt;hash_carry_len;</div><div class='add'>+				sg_copy_part_to_buf(req-&gt;src, dest, new_len,</div><div class='add'>+						    rctx-&gt;src_sent);</div><div class='add'>+				rctx-&gt;hash_carry_len = rem;</div><div class='add'>+				flow_log("Exiting with hash carry len: %u\n",</div><div class='add'>+					 rctx-&gt;hash_carry_len);</div><div class='add'>+				packet_dump("  buf: ",</div><div class='add'>+					    rctx-&gt;hash_carry,</div><div class='add'>+					    rctx-&gt;hash_carry_len);</div><div class='add'>+				return -EAGAIN;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if we have hash carry, then prefix it to the data in this request */</div><div class='add'>+	local_nbuf = rctx-&gt;hash_carry_len;</div><div class='add'>+	rctx-&gt;hash_carry_len = 0;</div><div class='add'>+	if (local_nbuf)</div><div class='add'>+		tx_frag_num++;</div><div class='add'>+	new_data_len = chunksize - local_nbuf;</div><div class='add'>+</div><div class='add'>+	/* Count number of sg entries to be used in this request */</div><div class='add'>+	rctx-&gt;src_nents = spu_sg_count(rctx-&gt;src_sg, rctx-&gt;src_skip,</div><div class='add'>+				       new_data_len);</div><div class='add'>+</div><div class='add'>+	/* AES hashing keeps key size in type field, so need to copy it here */</div><div class='add'>+	if (hash_parms.alg == HASH_ALG_AES)</div><div class='add'>+		hash_parms.type = cipher_parms.type;</div><div class='add'>+	else</div><div class='add'>+		hash_parms.type = spu-&gt;spu_hash_type(rctx-&gt;total_sent);</div><div class='add'>+</div><div class='add'>+	digestsize = spu-&gt;spu_digest_size(ctx-&gt;digestsize, ctx-&gt;auth.alg,</div><div class='add'>+					  hash_parms.type);</div><div class='add'>+	hash_parms.digestsize =	digestsize;</div><div class='add'>+</div><div class='add'>+	/* update the indexes */</div><div class='add'>+	rctx-&gt;total_sent += chunksize;</div><div class='add'>+	/* if you sent a prebuf then that wasn't from this req-&gt;src */</div><div class='add'>+	rctx-&gt;src_sent += new_data_len;</div><div class='add'>+</div><div class='add'>+	if ((rctx-&gt;total_sent == rctx-&gt;total_todo) &amp;&amp; rctx-&gt;is_final)</div><div class='add'>+		hash_parms.pad_len = spu-&gt;spu_hash_pad_len(hash_parms.alg,</div><div class='add'>+							   hash_parms.mode,</div><div class='add'>+							   chunksize,</div><div class='add'>+							   blocksize);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If a non-first chunk, then include the digest returned from the</div><div class='add'>+	 * previous chunk so that hw can add to it (except for AES types).</div><div class='add'>+	 */</div><div class='add'>+	if ((hash_parms.type == HASH_TYPE_UPDT) &amp;&amp;</div><div class='add'>+	    (hash_parms.alg != HASH_ALG_AES)) {</div><div class='add'>+		hash_parms.key_buf = rctx-&gt;incr_hash;</div><div class='add'>+		hash_parms.key_len = digestsize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic64_add(chunksize, &amp;iproc_priv.bytes_out);</div><div class='add'>+</div><div class='add'>+	flow_log("%s() final: %u nbuf: %u ",</div><div class='add'>+		 __func__, rctx-&gt;is_final, local_nbuf);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;max_payload == SPU_MAX_PAYLOAD_INF)</div><div class='add'>+		flow_log("max_payload infinite\n");</div><div class='add'>+	else</div><div class='add'>+		flow_log("max_payload %u\n", ctx-&gt;max_payload);</div><div class='add'>+</div><div class='add'>+	flow_log("chunk_start: %u chunk_size: %u\n", chunk_start, chunksize);</div><div class='add'>+</div><div class='add'>+	/* Prepend SPU header with type 3 BCM header */</div><div class='add'>+	memcpy(rctx-&gt;msg_buf.bcm_spu_req_hdr, BCMHEADER, BCM_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	hash_parms.prebuf_len = local_nbuf;</div><div class='add'>+	spu_hdr_len = spu-&gt;spu_create_request(rctx-&gt;msg_buf.bcm_spu_req_hdr +</div><div class='add'>+					      BCM_HDR_LEN,</div><div class='add'>+					      &amp;req_opts, &amp;cipher_parms,</div><div class='add'>+					      &amp;hash_parms, &amp;aead_parms,</div><div class='add'>+					      new_data_len);</div><div class='add'>+</div><div class='add'>+	if (spu_hdr_len == 0) {</div><div class='add'>+		pr_err("Failed to create SPU request header\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Determine total length of padding required. Put all padding in one</div><div class='add'>+	 * buffer.</div><div class='add'>+	 */</div><div class='add'>+	data_pad_len = spu-&gt;spu_gcm_ccm_pad_len(ctx-&gt;cipher.mode, chunksize);</div><div class='add'>+	db_size = spu_real_db_size(0, 0, local_nbuf, new_data_len,</div><div class='add'>+				   0, 0, hash_parms.pad_len);</div><div class='add'>+	if (spu-&gt;spu_tx_status_len())</div><div class='add'>+		stat_pad_len = spu-&gt;spu_wordalign_padlen(db_size);</div><div class='add'>+	if (stat_pad_len)</div><div class='add'>+		rx_frag_num++;</div><div class='add'>+	pad_len = hash_parms.pad_len + data_pad_len + stat_pad_len;</div><div class='add'>+	if (pad_len) {</div><div class='add'>+		tx_frag_num++;</div><div class='add'>+		spu-&gt;spu_request_pad(rctx-&gt;msg_buf.spu_req_pad, data_pad_len,</div><div class='add'>+				     hash_parms.pad_len, ctx-&gt;auth.alg,</div><div class='add'>+				     ctx-&gt;auth.mode, rctx-&gt;total_sent,</div><div class='add'>+				     stat_pad_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spu-&gt;spu_dump_msg_hdr(rctx-&gt;msg_buf.bcm_spu_req_hdr + BCM_HDR_LEN,</div><div class='add'>+			      spu_hdr_len);</div><div class='add'>+	packet_dump("    prebuf: ", rctx-&gt;hash_carry, local_nbuf);</div><div class='add'>+	flow_log("Data:\n");</div><div class='add'>+	dump_sg(rctx-&gt;src_sg, rctx-&gt;src_skip, new_data_len);</div><div class='add'>+	packet_dump("   pad: ", rctx-&gt;msg_buf.spu_req_pad, pad_len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Build mailbox message containing SPU request msg and rx buffers</div><div class='add'>+	 * to catch response message</div><div class='add'>+	 */</div><div class='add'>+	memset(mssg, 0, sizeof(*mssg));</div><div class='add'>+	mssg-&gt;type = BRCM_MESSAGE_SPU;</div><div class='add'>+	mssg-&gt;ctx = rctx;	/* Will be returned in response */</div><div class='add'>+</div><div class='add'>+	/* Create rx scatterlist to catch result */</div><div class='add'>+	err = spu_ahash_rx_sg_create(mssg, rctx, rx_frag_num, digestsize,</div><div class='add'>+				     stat_pad_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Create tx scatterlist containing SPU request message */</div><div class='add'>+	tx_frag_num += rctx-&gt;src_nents;</div><div class='add'>+	if (spu-&gt;spu_tx_status_len())</div><div class='add'>+		tx_frag_num++;</div><div class='add'>+	err = spu_ahash_tx_sg_create(mssg, rctx, tx_frag_num, spu_hdr_len,</div><div class='add'>+				     local_nbuf, new_data_len, pad_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mbox_send_message(iproc_priv.mbox[rctx-&gt;chan_idx], mssg);</div><div class='add'>+	if (req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP) {</div><div class='add'>+		while ((err == -ENOBUFS) &amp;&amp; (retry_cnt &lt; SPU_MB_RETRY_MAX)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Mailbox queue is full. Since MAY_SLEEP is set, assume</div><div class='add'>+			 * not in atomic context and we can wait and try again.</div><div class='add'>+			 */</div><div class='add'>+			retry_cnt++;</div><div class='add'>+			usleep_range(MBOX_SLEEP_MIN, MBOX_SLEEP_MAX);</div><div class='add'>+			err = mbox_send_message(iproc_priv.mbox[rctx-&gt;chan_idx],</div><div class='add'>+						mssg);</div><div class='add'>+			atomic_inc(&amp;iproc_priv.mb_no_spc);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		atomic_inc(&amp;iproc_priv.mb_send_fail);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_hmac_outer_hash() - Request synchonous software compute of the outer hash</div><div class='add'>+ * for an HMAC request.</div><div class='add'>+ * @req:  The HMAC request from the crypto API</div><div class='add'>+ * @ctx:  The session context</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if synchronous hash operation successful</div><div class='add'>+ *         -EINVAL if the hash algo is unrecognized</div><div class='add'>+ *         any other value indicates an error</div><div class='add'>+ */</div><div class='add'>+static int spu_hmac_outer_hash(struct ahash_request *req,</div><div class='add'>+			       struct iproc_ctx_s *ctx)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);</div><div class='add'>+	unsigned int blocksize =</div><div class='add'>+		crypto_tfm_alg_blocksize(crypto_ahash_tfm(ahash));</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	switch (ctx-&gt;auth.alg) {</div><div class='add'>+	case HASH_ALG_MD5:</div><div class='add'>+		rc = do_shash("md5", req-&gt;result, ctx-&gt;opad, blocksize,</div><div class='add'>+			      req-&gt;result, ctx-&gt;digestsize, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA1:</div><div class='add'>+		rc = do_shash("sha1", req-&gt;result, ctx-&gt;opad, blocksize,</div><div class='add'>+			      req-&gt;result, ctx-&gt;digestsize, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA224:</div><div class='add'>+		rc = do_shash("sha224", req-&gt;result, ctx-&gt;opad, blocksize,</div><div class='add'>+			      req-&gt;result, ctx-&gt;digestsize, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA256:</div><div class='add'>+		rc = do_shash("sha256", req-&gt;result, ctx-&gt;opad, blocksize,</div><div class='add'>+			      req-&gt;result, ctx-&gt;digestsize, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA384:</div><div class='add'>+		rc = do_shash("sha384", req-&gt;result, ctx-&gt;opad, blocksize,</div><div class='add'>+			      req-&gt;result, ctx-&gt;digestsize, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA512:</div><div class='add'>+		rc = do_shash("sha512", req-&gt;result, ctx-&gt;opad, blocksize,</div><div class='add'>+			      req-&gt;result, ctx-&gt;digestsize, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("%s() Error : unknown hmac type\n", __func__);</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ahash_req_done() - Process a hash result from the SPU hardware.</div><div class='add'>+ * @rctx: Crypto request context</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if successful</div><div class='add'>+ *         &lt; 0 if an error</div><div class='add'>+ */</div><div class='add'>+static int ahash_req_done(struct iproc_reqctx_s *rctx)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct crypto_async_request *areq = rctx-&gt;parent;</div><div class='add'>+	struct ahash_request *req = ahash_request_cast(areq);</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memcpy(req-&gt;result, rctx-&gt;msg_buf.digest, ctx-&gt;digestsize);</div><div class='add'>+</div><div class='add'>+	if (spu-&gt;spu_type == SPU_TYPE_SPUM) {</div><div class='add'>+		/* byte swap the output from the UPDT function to network byte</div><div class='add'>+		 * order</div><div class='add'>+		 */</div><div class='add'>+		if (ctx-&gt;auth.alg == HASH_ALG_MD5) {</div><div class='add'>+			__swab32s((u32 *)req-&gt;result);</div><div class='add'>+			__swab32s(((u32 *)req-&gt;result) + 1);</div><div class='add'>+			__swab32s(((u32 *)req-&gt;result) + 2);</div><div class='add'>+			__swab32s(((u32 *)req-&gt;result) + 3);</div><div class='add'>+			__swab32s(((u32 *)req-&gt;result) + 4);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flow_dump("  digest ", req-&gt;result, ctx-&gt;digestsize);</div><div class='add'>+</div><div class='add'>+	/* if this an HMAC then do the outer hash */</div><div class='add'>+	if (rctx-&gt;is_sw_hmac) {</div><div class='add'>+		err = spu_hmac_outer_hash(req, ctx);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		flow_dump("  hmac: ", req-&gt;result, ctx-&gt;digestsize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rctx-&gt;is_sw_hmac || ctx-&gt;auth.mode == HASH_MODE_HMAC) {</div><div class='add'>+		atomic_inc(&amp;iproc_priv.op_counts[SPU_OP_HMAC]);</div><div class='add'>+		atomic_inc(&amp;iproc_priv.hmac_cnt[ctx-&gt;auth.alg]);</div><div class='add'>+	} else {</div><div class='add'>+		atomic_inc(&amp;iproc_priv.op_counts[SPU_OP_HASH]);</div><div class='add'>+		atomic_inc(&amp;iproc_priv.hash_cnt[ctx-&gt;auth.alg]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handle_ahash_resp() - Process a SPU response message for a hash request.</div><div class='add'>+ * Checks if the entire crypto API request has been processed, and if so,</div><div class='add'>+ * invokes post processing on the result.</div><div class='add'>+ * @rctx: Crypto request context</div><div class='add'>+ */</div><div class='add'>+static void handle_ahash_resp(struct iproc_reqctx_s *rctx)</div><div class='add'>+{</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	struct crypto_async_request *areq = rctx-&gt;parent;</div><div class='add'>+	struct ahash_request *req = ahash_request_cast(areq);</div><div class='add'>+	struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);</div><div class='add'>+	unsigned int blocksize =</div><div class='add'>+		crypto_tfm_alg_blocksize(crypto_ahash_tfm(ahash));</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 * Save hash to use as input to next op if incremental. Might be copying</div><div class='add'>+	 * too much, but that's easier than figuring out actual digest size here</div><div class='add'>+	 */</div><div class='add'>+	memcpy(rctx-&gt;incr_hash, rctx-&gt;msg_buf.digest, MAX_DIGEST_SIZE);</div><div class='add'>+</div><div class='add'>+	flow_log("%s() blocksize:%u digestsize:%u\n",</div><div class='add'>+		 __func__, blocksize, ctx-&gt;digestsize);</div><div class='add'>+</div><div class='add'>+	atomic64_add(ctx-&gt;digestsize, &amp;iproc_priv.bytes_in);</div><div class='add'>+</div><div class='add'>+	if (rctx-&gt;is_final &amp;&amp; (rctx-&gt;total_sent == rctx-&gt;total_todo))</div><div class='add'>+		ahash_req_done(rctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_aead_rx_sg_create() - Build up the scatterlist of buffers used to receive</div><div class='add'>+ * a SPU response message for an AEAD request. Includes buffers to catch SPU</div><div class='add'>+ * message headers and the response data.</div><div class='add'>+ * @mssg:	mailbox message containing the receive sg</div><div class='add'>+ * @rctx:	crypto request context</div><div class='add'>+ * @rx_frag_num: number of scatterlist elements required to hold the</div><div class='add'>+ *		SPU response message</div><div class='add'>+ * @assoc_len:	Length of associated data included in the crypto request</div><div class='add'>+ * @ret_iv_len: Length of IV returned in response</div><div class='add'>+ * @resp_len:	Number of bytes of response data expected to be written to</div><div class='add'>+ *              dst buffer from crypto API</div><div class='add'>+ * @digestsize: Length of hash digest, in bytes</div><div class='add'>+ * @stat_pad_len: Number of bytes required to pad the STAT field to</div><div class='add'>+ *		a 4-byte boundary</div><div class='add'>+ *</div><div class='add'>+ * The scatterlist that gets allocated here is freed in spu_chunk_cleanup()</div><div class='add'>+ * when the request completes, whether the request is handled successfully or</div><div class='add'>+ * there is an error.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *   0 if successful</div><div class='add'>+ *   &lt; 0 if an error</div><div class='add'>+ */</div><div class='add'>+static int spu_aead_rx_sg_create(struct brcm_message *mssg,</div><div class='add'>+				 struct aead_request *req,</div><div class='add'>+				 struct iproc_reqctx_s *rctx,</div><div class='add'>+				 u8 rx_frag_num,</div><div class='add'>+				 unsigned int assoc_len,</div><div class='add'>+				 u32 ret_iv_len, unsigned int resp_len,</div><div class='add'>+				 unsigned int digestsize, u32 stat_pad_len)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct scatterlist *sg;	/* used to build sgs in mbox message */</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+	u32 datalen;		/* Number of bytes of response data expected */</div><div class='add'>+	u32 assoc_buf_len;</div><div class='add'>+	u8 data_padlen = 0;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;is_rfc4543) {</div><div class='add'>+		/* RFC4543: only pad after data, not after AAD */</div><div class='add'>+		data_padlen = spu-&gt;spu_gcm_ccm_pad_len(ctx-&gt;cipher.mode,</div><div class='add'>+							  assoc_len + resp_len);</div><div class='add'>+		assoc_buf_len = assoc_len;</div><div class='add'>+	} else {</div><div class='add'>+		data_padlen = spu-&gt;spu_gcm_ccm_pad_len(ctx-&gt;cipher.mode,</div><div class='add'>+							  resp_len);</div><div class='add'>+		assoc_buf_len = spu-&gt;spu_assoc_resp_len(ctx-&gt;cipher.mode,</div><div class='add'>+						assoc_len, ret_iv_len,</div><div class='add'>+						rctx-&gt;is_encrypt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;cipher.mode == CIPHER_MODE_CCM)</div><div class='add'>+		/* ICV (after data) must be in the next 32-bit word for CCM */</div><div class='add'>+		data_padlen += spu-&gt;spu_wordalign_padlen(assoc_buf_len +</div><div class='add'>+							 resp_len +</div><div class='add'>+							 data_padlen);</div><div class='add'>+</div><div class='add'>+	if (data_padlen)</div><div class='add'>+		/* have to catch gcm pad in separate buffer */</div><div class='add'>+		rx_frag_num++;</div><div class='add'>+</div><div class='add'>+	mssg-&gt;spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist),</div><div class='add'>+				rctx-&gt;gfp);</div><div class='add'>+	if (!mssg-&gt;spu.dst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sg = mssg-&gt;spu.dst;</div><div class='add'>+	sg_init_table(sg, rx_frag_num);</div><div class='add'>+</div><div class='add'>+	/* Space for SPU message header */</div><div class='add'>+	sg_set_buf(sg++, rctx-&gt;msg_buf.spu_resp_hdr, ctx-&gt;spu_resp_hdr_len);</div><div class='add'>+</div><div class='add'>+	if (assoc_buf_len) {</div><div class='add'>+		/*</div><div class='add'>+		 * Don't write directly to req-&gt;dst, because SPU may pad the</div><div class='add'>+		 * assoc data in the response</div><div class='add'>+		 */</div><div class='add'>+		memset(rctx-&gt;msg_buf.a.resp_aad, 0, assoc_buf_len);</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.a.resp_aad, assoc_buf_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp_len) {</div><div class='add'>+		/*</div><div class='add'>+		 * Copy in each dst sg entry from request, up to chunksize.</div><div class='add'>+		 * dst sg catches just the data. digest caught in separate buf.</div><div class='add'>+		 */</div><div class='add'>+		datalen = spu_msg_sg_add(&amp;sg, &amp;rctx-&gt;dst_sg, &amp;rctx-&gt;dst_skip,</div><div class='add'>+					 rctx-&gt;dst_nents, resp_len);</div><div class='add'>+		if (datalen &lt; (resp_len)) {</div><div class='add'>+			pr_err("%s(): failed to copy dst sg to mbox msg. expected len %u, datalen %u",</div><div class='add'>+			       __func__, resp_len, datalen);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If GCM/CCM data is padded, catch padding in separate buffer */</div><div class='add'>+	if (data_padlen) {</div><div class='add'>+		memset(rctx-&gt;msg_buf.a.gcmpad, 0, data_padlen);</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.a.gcmpad, data_padlen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Always catch ICV in separate buffer */</div><div class='add'>+	sg_set_buf(sg++, rctx-&gt;msg_buf.digest, digestsize);</div><div class='add'>+</div><div class='add'>+	flow_log("stat_pad_len %u\n", stat_pad_len);</div><div class='add'>+	if (stat_pad_len) {</div><div class='add'>+		memset(rctx-&gt;msg_buf.rx_stat_pad, 0, stat_pad_len);</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.rx_stat_pad, stat_pad_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(rctx-&gt;msg_buf.rx_stat, 0, SPU_RX_STATUS_LEN);</div><div class='add'>+	sg_set_buf(sg, rctx-&gt;msg_buf.rx_stat, spu-&gt;spu_rx_status_len());</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_aead_tx_sg_create() - Build up the scatterlist of buffers used to send a</div><div class='add'>+ * SPU request message for an AEAD request. Includes SPU message headers and the</div><div class='add'>+ * request data.</div><div class='add'>+ * @mssg:	mailbox message containing the transmit sg</div><div class='add'>+ * @rctx:	crypto request context</div><div class='add'>+ * @tx_frag_num: number of scatterlist elements required to construct the</div><div class='add'>+ *		SPU request message</div><div class='add'>+ * @spu_hdr_len: length of SPU message header in bytes</div><div class='add'>+ * @assoc:	crypto API associated data scatterlist</div><div class='add'>+ * @assoc_len:	length of associated data</div><div class='add'>+ * @assoc_nents: number of scatterlist entries containing assoc data</div><div class='add'>+ * @aead_iv_len: length of AEAD IV, if included</div><div class='add'>+ * @chunksize:	Number of bytes of request data</div><div class='add'>+ * @aad_pad_len: Number of bytes of padding at end of AAD. For GCM/CCM.</div><div class='add'>+ * @pad_len:	Number of pad bytes</div><div class='add'>+ * @incl_icv:	If true, write separate ICV buffer after data and</div><div class='add'>+ *              any padding</div><div class='add'>+ *</div><div class='add'>+ * The scatterlist that gets allocated here is freed in spu_chunk_cleanup()</div><div class='add'>+ * when the request completes, whether the request is handled successfully or</div><div class='add'>+ * there is an error.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *   0 if successful</div><div class='add'>+ *   &lt; 0 if an error</div><div class='add'>+ */</div><div class='add'>+static int spu_aead_tx_sg_create(struct brcm_message *mssg,</div><div class='add'>+				 struct iproc_reqctx_s *rctx,</div><div class='add'>+				 u8 tx_frag_num,</div><div class='add'>+				 u32 spu_hdr_len,</div><div class='add'>+				 struct scatterlist *assoc,</div><div class='add'>+				 unsigned int assoc_len,</div><div class='add'>+				 int assoc_nents,</div><div class='add'>+				 unsigned int aead_iv_len,</div><div class='add'>+				 unsigned int chunksize,</div><div class='add'>+				 u32 aad_pad_len, u32 pad_len, bool incl_icv)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct scatterlist *sg;	/* used to build sgs in mbox message */</div><div class='add'>+	struct scatterlist *assoc_sg = assoc;</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+	u32 datalen;		/* Number of bytes of data to write */</div><div class='add'>+	u32 written;		/* Number of bytes of data written */</div><div class='add'>+	u32 assoc_offset = 0;</div><div class='add'>+	u32 stat_len;</div><div class='add'>+</div><div class='add'>+	mssg-&gt;spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist),</div><div class='add'>+				rctx-&gt;gfp);</div><div class='add'>+	if (!mssg-&gt;spu.src)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sg = mssg-&gt;spu.src;</div><div class='add'>+	sg_init_table(sg, tx_frag_num);</div><div class='add'>+</div><div class='add'>+	sg_set_buf(sg++, rctx-&gt;msg_buf.bcm_spu_req_hdr,</div><div class='add'>+		   BCM_HDR_LEN + spu_hdr_len);</div><div class='add'>+</div><div class='add'>+	if (assoc_len) {</div><div class='add'>+		/* Copy in each associated data sg entry from request */</div><div class='add'>+		written = spu_msg_sg_add(&amp;sg, &amp;assoc_sg, &amp;assoc_offset,</div><div class='add'>+					 assoc_nents, assoc_len);</div><div class='add'>+		if (written &lt; assoc_len) {</div><div class='add'>+			pr_err("%s(): failed to copy assoc sg to mbox msg",</div><div class='add'>+			       __func__);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (aead_iv_len)</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.iv_ctr, aead_iv_len);</div><div class='add'>+</div><div class='add'>+	if (aad_pad_len) {</div><div class='add'>+		memset(rctx-&gt;msg_buf.a.req_aad_pad, 0, aad_pad_len);</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.a.req_aad_pad, aad_pad_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	datalen = chunksize;</div><div class='add'>+	if ((chunksize &gt; ctx-&gt;digestsize) &amp;&amp; incl_icv)</div><div class='add'>+		datalen -= ctx-&gt;digestsize;</div><div class='add'>+	if (datalen) {</div><div class='add'>+		/* For aead, a single msg should consume the entire src sg */</div><div class='add'>+		written = spu_msg_sg_add(&amp;sg, &amp;rctx-&gt;src_sg, &amp;rctx-&gt;src_skip,</div><div class='add'>+					 rctx-&gt;src_nents, datalen);</div><div class='add'>+		if (written &lt; datalen) {</div><div class='add'>+			pr_err("%s(): failed to copy src sg to mbox msg",</div><div class='add'>+			       __func__);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pad_len) {</div><div class='add'>+		memset(rctx-&gt;msg_buf.spu_req_pad, 0, pad_len);</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.spu_req_pad, pad_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (incl_icv)</div><div class='add'>+		sg_set_buf(sg++, rctx-&gt;msg_buf.digest, ctx-&gt;digestsize);</div><div class='add'>+</div><div class='add'>+	stat_len = spu-&gt;spu_tx_status_len();</div><div class='add'>+	if (stat_len) {</div><div class='add'>+		memset(rctx-&gt;msg_buf.tx_stat, 0, stat_len);</div><div class='add'>+		sg_set_buf(sg, rctx-&gt;msg_buf.tx_stat, stat_len);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handle_aead_req() - Submit a SPU request message for the next chunk of the</div><div class='add'>+ * current AEAD request.</div><div class='add'>+ * @rctx:  Crypto request context</div><div class='add'>+ *</div><div class='add'>+ * Unlike other operation types, we assume the length of the request fits in</div><div class='add'>+ * a single SPU request message. aead_enqueue() makes sure this is true.</div><div class='add'>+ * Comments for other op types regarding threads applies here as well.</div><div class='add'>+ *</div><div class='add'>+ * Unlike incremental hash ops, where the spu returns the entire hash for</div><div class='add'>+ * truncated algs like sha-224, the SPU returns just the truncated hash in</div><div class='add'>+ * response to aead requests. So digestsize is always ctx-&gt;digestsize here.</div><div class='add'>+ *</div><div class='add'>+ * Return: -EINPROGRESS: crypto request has been accepted and result will be</div><div class='add'>+ *			 returned asynchronously</div><div class='add'>+ *         Any other value indicates an error</div><div class='add'>+ */</div><div class='add'>+static int handle_aead_req(struct iproc_reqctx_s *rctx)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct crypto_async_request *areq = rctx-&gt;parent;</div><div class='add'>+	struct aead_request *req = container_of(areq,</div><div class='add'>+						struct aead_request, base);</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int chunksize;</div><div class='add'>+	unsigned int resp_len;</div><div class='add'>+	u32 spu_hdr_len;</div><div class='add'>+	u32 db_size;</div><div class='add'>+	u32 stat_pad_len;</div><div class='add'>+	u32 pad_len;</div><div class='add'>+	struct brcm_message *mssg;	/* mailbox message */</div><div class='add'>+	struct spu_request_opts req_opts;</div><div class='add'>+	struct spu_cipher_parms cipher_parms;</div><div class='add'>+	struct spu_hash_parms hash_parms;</div><div class='add'>+	struct spu_aead_parms aead_parms;</div><div class='add'>+	int assoc_nents = 0;</div><div class='add'>+	bool incl_icv = false;</div><div class='add'>+	unsigned int digestsize = ctx-&gt;digestsize;</div><div class='add'>+	int retry_cnt = 0;</div><div class='add'>+</div><div class='add'>+	/* number of entries in src and dst sg. Always includes SPU msg header.</div><div class='add'>+	 */</div><div class='add'>+	u8 rx_frag_num = 2;	/* and STATUS */</div><div class='add'>+	u8 tx_frag_num = 1;</div><div class='add'>+</div><div class='add'>+	/* doing the whole thing at once */</div><div class='add'>+	chunksize = rctx-&gt;total_todo;</div><div class='add'>+</div><div class='add'>+	flow_log("%s: chunksize %u\n", __func__, chunksize);</div><div class='add'>+</div><div class='add'>+	memset(&amp;req_opts, 0, sizeof(req_opts));</div><div class='add'>+	memset(&amp;hash_parms, 0, sizeof(hash_parms));</div><div class='add'>+	memset(&amp;aead_parms, 0, sizeof(aead_parms));</div><div class='add'>+</div><div class='add'>+	req_opts.is_inbound = !(rctx-&gt;is_encrypt);</div><div class='add'>+	req_opts.auth_first = ctx-&gt;auth_first;</div><div class='add'>+	req_opts.is_aead = true;</div><div class='add'>+	req_opts.is_esp = ctx-&gt;is_esp;</div><div class='add'>+</div><div class='add'>+	cipher_parms.alg = ctx-&gt;cipher.alg;</div><div class='add'>+	cipher_parms.mode = ctx-&gt;cipher.mode;</div><div class='add'>+	cipher_parms.type = ctx-&gt;cipher_type;</div><div class='add'>+	cipher_parms.key_buf = ctx-&gt;enckey;</div><div class='add'>+	cipher_parms.key_len = ctx-&gt;enckeylen;</div><div class='add'>+	cipher_parms.iv_buf = rctx-&gt;msg_buf.iv_ctr;</div><div class='add'>+	cipher_parms.iv_len = rctx-&gt;iv_ctr_len;</div><div class='add'>+</div><div class='add'>+	hash_parms.alg = ctx-&gt;auth.alg;</div><div class='add'>+	hash_parms.mode = ctx-&gt;auth.mode;</div><div class='add'>+	hash_parms.type = HASH_TYPE_NONE;</div><div class='add'>+	hash_parms.key_buf = (u8 *)ctx-&gt;authkey;</div><div class='add'>+	hash_parms.key_len = ctx-&gt;authkeylen;</div><div class='add'>+	hash_parms.digestsize = digestsize;</div><div class='add'>+</div><div class='add'>+	if ((ctx-&gt;auth.alg == HASH_ALG_SHA224) &amp;&amp;</div><div class='add'>+	    (ctx-&gt;authkeylen &lt; SHA224_DIGEST_SIZE))</div><div class='add'>+		hash_parms.key_len = SHA224_DIGEST_SIZE;</div><div class='add'>+</div><div class='add'>+	aead_parms.assoc_size = req-&gt;assoclen;</div><div class='add'>+	if (ctx-&gt;is_esp &amp;&amp; !ctx-&gt;is_rfc4543) {</div><div class='add'>+		/*</div><div class='add'>+		 * 8-byte IV is included assoc data in request. SPU2</div><div class='add'>+		 * expects AAD to include just SPI and seqno. So</div><div class='add'>+		 * subtract off the IV len.</div><div class='add'>+		 */</div><div class='add'>+		aead_parms.assoc_size -= GCM_ESP_IV_SIZE;</div><div class='add'>+</div><div class='add'>+		if (rctx-&gt;is_encrypt) {</div><div class='add'>+			aead_parms.return_iv = true;</div><div class='add'>+			aead_parms.ret_iv_len = GCM_ESP_IV_SIZE;</div><div class='add'>+			aead_parms.ret_iv_off = GCM_ESP_SALT_SIZE;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		aead_parms.ret_iv_len = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Count number of sg entries from the crypto API request that are to</div><div class='add'>+	 * be included in this mailbox message. For dst sg, don't count space</div><div class='add'>+	 * for digest. Digest gets caught in a separate buffer and copied back</div><div class='add'>+	 * to dst sg when processing response.</div><div class='add'>+	 */</div><div class='add'>+	rctx-&gt;src_nents = spu_sg_count(rctx-&gt;src_sg, rctx-&gt;src_skip, chunksize);</div><div class='add'>+	rctx-&gt;dst_nents = spu_sg_count(rctx-&gt;dst_sg, rctx-&gt;dst_skip, chunksize);</div><div class='add'>+	if (aead_parms.assoc_size)</div><div class='add'>+		assoc_nents = spu_sg_count(rctx-&gt;assoc, 0,</div><div class='add'>+					   aead_parms.assoc_size);</div><div class='add'>+</div><div class='add'>+	mssg = &amp;rctx-&gt;mb_mssg;</div><div class='add'>+</div><div class='add'>+	rctx-&gt;total_sent = chunksize;</div><div class='add'>+	rctx-&gt;src_sent = chunksize;</div><div class='add'>+	if (spu-&gt;spu_assoc_resp_len(ctx-&gt;cipher.mode,</div><div class='add'>+				    aead_parms.assoc_size,</div><div class='add'>+				    aead_parms.ret_iv_len,</div><div class='add'>+				    rctx-&gt;is_encrypt))</div><div class='add'>+		rx_frag_num++;</div><div class='add'>+</div><div class='add'>+	aead_parms.iv_len = spu-&gt;spu_aead_ivlen(ctx-&gt;cipher.mode,</div><div class='add'>+						rctx-&gt;iv_ctr_len);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;auth.alg == HASH_ALG_AES)</div><div class='add'>+		hash_parms.type = ctx-&gt;cipher_type;</div><div class='add'>+</div><div class='add'>+	/* General case AAD padding (CCM and RFC4543 special cases below) */</div><div class='add'>+	aead_parms.aad_pad_len = spu-&gt;spu_gcm_ccm_pad_len(ctx-&gt;cipher.mode,</div><div class='add'>+						 aead_parms.assoc_size);</div><div class='add'>+</div><div class='add'>+	/* General case data padding (CCM decrypt special case below) */</div><div class='add'>+	aead_parms.data_pad_len = spu-&gt;spu_gcm_ccm_pad_len(ctx-&gt;cipher.mode,</div><div class='add'>+							   chunksize);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;cipher.mode == CIPHER_MODE_CCM) {</div><div class='add'>+		/*</div><div class='add'>+		 * for CCM, AAD len + 2 (rather than AAD len) needs to be</div><div class='add'>+		 * 128-bit aligned</div><div class='add'>+		 */</div><div class='add'>+		aead_parms.aad_pad_len = spu-&gt;spu_gcm_ccm_pad_len(</div><div class='add'>+					 ctx-&gt;cipher.mode,</div><div class='add'>+					 aead_parms.assoc_size + 2);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * And when decrypting CCM, need to pad without including</div><div class='add'>+		 * size of ICV which is tacked on to end of chunk</div><div class='add'>+		 */</div><div class='add'>+		if (!rctx-&gt;is_encrypt)</div><div class='add'>+			aead_parms.data_pad_len =</div><div class='add'>+				spu-&gt;spu_gcm_ccm_pad_len(ctx-&gt;cipher.mode,</div><div class='add'>+							chunksize - digestsize);</div><div class='add'>+</div><div class='add'>+		/* CCM also requires software to rewrite portions of IV: */</div><div class='add'>+		spu-&gt;spu_ccm_update_iv(digestsize, &amp;cipher_parms, req-&gt;assoclen,</div><div class='add'>+				       chunksize, rctx-&gt;is_encrypt,</div><div class='add'>+				       ctx-&gt;is_esp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;is_rfc4543) {</div><div class='add'>+		/*</div><div class='add'>+		 * RFC4543: data is included in AAD, so don't pad after AAD</div><div class='add'>+		 * and pad data based on both AAD + data size</div><div class='add'>+		 */</div><div class='add'>+		aead_parms.aad_pad_len = 0;</div><div class='add'>+		if (!rctx-&gt;is_encrypt)</div><div class='add'>+			aead_parms.data_pad_len = spu-&gt;spu_gcm_ccm_pad_len(</div><div class='add'>+					ctx-&gt;cipher.mode,</div><div class='add'>+					aead_parms.assoc_size + chunksize -</div><div class='add'>+					digestsize);</div><div class='add'>+		else</div><div class='add'>+			aead_parms.data_pad_len = spu-&gt;spu_gcm_ccm_pad_len(</div><div class='add'>+					ctx-&gt;cipher.mode,</div><div class='add'>+					aead_parms.assoc_size + chunksize);</div><div class='add'>+</div><div class='add'>+		req_opts.is_rfc4543 = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spu_req_incl_icv(ctx-&gt;cipher.mode, rctx-&gt;is_encrypt)) {</div><div class='add'>+		incl_icv = true;</div><div class='add'>+		tx_frag_num++;</div><div class='add'>+		/* Copy ICV from end of src scatterlist to digest buf */</div><div class='add'>+		sg_copy_part_to_buf(req-&gt;src, rctx-&gt;msg_buf.digest, digestsize,</div><div class='add'>+				    req-&gt;assoclen + rctx-&gt;total_sent -</div><div class='add'>+				    digestsize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic64_add(chunksize, &amp;iproc_priv.bytes_out);</div><div class='add'>+</div><div class='add'>+	flow_log("%s()-sent chunksize:%u\n", __func__, chunksize);</div><div class='add'>+</div><div class='add'>+	/* Prepend SPU header with type 3 BCM header */</div><div class='add'>+	memcpy(rctx-&gt;msg_buf.bcm_spu_req_hdr, BCMHEADER, BCM_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	spu_hdr_len = spu-&gt;spu_create_request(rctx-&gt;msg_buf.bcm_spu_req_hdr +</div><div class='add'>+					      BCM_HDR_LEN, &amp;req_opts,</div><div class='add'>+					      &amp;cipher_parms, &amp;hash_parms,</div><div class='add'>+					      &amp;aead_parms, chunksize);</div><div class='add'>+</div><div class='add'>+	/* Determine total length of padding. Put all padding in one buffer. */</div><div class='add'>+	db_size = spu_real_db_size(aead_parms.assoc_size, aead_parms.iv_len, 0,</div><div class='add'>+				   chunksize, aead_parms.aad_pad_len,</div><div class='add'>+				   aead_parms.data_pad_len, 0);</div><div class='add'>+</div><div class='add'>+	stat_pad_len = spu-&gt;spu_wordalign_padlen(db_size);</div><div class='add'>+</div><div class='add'>+	if (stat_pad_len)</div><div class='add'>+		rx_frag_num++;</div><div class='add'>+	pad_len = aead_parms.data_pad_len + stat_pad_len;</div><div class='add'>+	if (pad_len) {</div><div class='add'>+		tx_frag_num++;</div><div class='add'>+		spu-&gt;spu_request_pad(rctx-&gt;msg_buf.spu_req_pad,</div><div class='add'>+				     aead_parms.data_pad_len, 0,</div><div class='add'>+				     ctx-&gt;auth.alg, ctx-&gt;auth.mode,</div><div class='add'>+				     rctx-&gt;total_sent, stat_pad_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spu-&gt;spu_dump_msg_hdr(rctx-&gt;msg_buf.bcm_spu_req_hdr + BCM_HDR_LEN,</div><div class='add'>+			      spu_hdr_len);</div><div class='add'>+	dump_sg(rctx-&gt;assoc, 0, aead_parms.assoc_size);</div><div class='add'>+	packet_dump("    aead iv: ", rctx-&gt;msg_buf.iv_ctr, aead_parms.iv_len);</div><div class='add'>+	packet_log("BD:\n");</div><div class='add'>+	dump_sg(rctx-&gt;src_sg, rctx-&gt;src_skip, chunksize);</div><div class='add'>+	packet_dump("   pad: ", rctx-&gt;msg_buf.spu_req_pad, pad_len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Build mailbox message containing SPU request msg and rx buffers</div><div class='add'>+	 * to catch response message</div><div class='add'>+	 */</div><div class='add'>+	memset(mssg, 0, sizeof(*mssg));</div><div class='add'>+	mssg-&gt;type = BRCM_MESSAGE_SPU;</div><div class='add'>+	mssg-&gt;ctx = rctx;	/* Will be returned in response */</div><div class='add'>+</div><div class='add'>+	/* Create rx scatterlist to catch result */</div><div class='add'>+	rx_frag_num += rctx-&gt;dst_nents;</div><div class='add'>+	resp_len = chunksize;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Always catch ICV in separate buffer. Have to for GCM/CCM because of</div><div class='add'>+	 * padding. Have to for SHA-224 and other truncated SHAs because SPU</div><div class='add'>+	 * sends entire digest back.</div><div class='add'>+	 */</div><div class='add'>+	rx_frag_num++;</div><div class='add'>+</div><div class='add'>+	if (((ctx-&gt;cipher.mode == CIPHER_MODE_GCM) ||</div><div class='add'>+	     (ctx-&gt;cipher.mode == CIPHER_MODE_CCM)) &amp;&amp; !rctx-&gt;is_encrypt) {</div><div class='add'>+		/*</div><div class='add'>+		 * Input is ciphertxt plus ICV, but ICV not incl</div><div class='add'>+		 * in output.</div><div class='add'>+		 */</div><div class='add'>+		resp_len -= ctx-&gt;digestsize;</div><div class='add'>+		if (resp_len == 0)</div><div class='add'>+			/* no rx frags to catch output data */</div><div class='add'>+			rx_frag_num -= rctx-&gt;dst_nents;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = spu_aead_rx_sg_create(mssg, req, rctx, rx_frag_num,</div><div class='add'>+				    aead_parms.assoc_size,</div><div class='add'>+				    aead_parms.ret_iv_len, resp_len, digestsize,</div><div class='add'>+				    stat_pad_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Create tx scatterlist containing SPU request message */</div><div class='add'>+	tx_frag_num += rctx-&gt;src_nents;</div><div class='add'>+	tx_frag_num += assoc_nents;</div><div class='add'>+	if (aead_parms.aad_pad_len)</div><div class='add'>+		tx_frag_num++;</div><div class='add'>+	if (aead_parms.iv_len)</div><div class='add'>+		tx_frag_num++;</div><div class='add'>+	if (spu-&gt;spu_tx_status_len())</div><div class='add'>+		tx_frag_num++;</div><div class='add'>+	err = spu_aead_tx_sg_create(mssg, rctx, tx_frag_num, spu_hdr_len,</div><div class='add'>+				    rctx-&gt;assoc, aead_parms.assoc_size,</div><div class='add'>+				    assoc_nents, aead_parms.iv_len, chunksize,</div><div class='add'>+				    aead_parms.aad_pad_len, pad_len, incl_icv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mbox_send_message(iproc_priv.mbox[rctx-&gt;chan_idx], mssg);</div><div class='add'>+	if (req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP) {</div><div class='add'>+		while ((err == -ENOBUFS) &amp;&amp; (retry_cnt &lt; SPU_MB_RETRY_MAX)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Mailbox queue is full. Since MAY_SLEEP is set, assume</div><div class='add'>+			 * not in atomic context and we can wait and try again.</div><div class='add'>+			 */</div><div class='add'>+			retry_cnt++;</div><div class='add'>+			usleep_range(MBOX_SLEEP_MIN, MBOX_SLEEP_MAX);</div><div class='add'>+			err = mbox_send_message(iproc_priv.mbox[rctx-&gt;chan_idx],</div><div class='add'>+						mssg);</div><div class='add'>+			atomic_inc(&amp;iproc_priv.mb_no_spc);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		atomic_inc(&amp;iproc_priv.mb_send_fail);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handle_aead_resp() - Process a SPU response message for an AEAD request.</div><div class='add'>+ * @rctx:  Crypto request context</div><div class='add'>+ */</div><div class='add'>+static void handle_aead_resp(struct iproc_reqctx_s *rctx)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct crypto_async_request *areq = rctx-&gt;parent;</div><div class='add'>+	struct aead_request *req = container_of(areq,</div><div class='add'>+						struct aead_request, base);</div><div class='add'>+	struct iproc_ctx_s *ctx = rctx-&gt;ctx;</div><div class='add'>+	u32 payload_len;</div><div class='add'>+	unsigned int icv_offset;</div><div class='add'>+	u32 result_len;</div><div class='add'>+</div><div class='add'>+	/* See how much data was returned */</div><div class='add'>+	payload_len = spu-&gt;spu_payload_length(rctx-&gt;msg_buf.spu_resp_hdr);</div><div class='add'>+	flow_log("payload_len %u\n", payload_len);</div><div class='add'>+</div><div class='add'>+	/* only count payload */</div><div class='add'>+	atomic64_add(payload_len, &amp;iproc_priv.bytes_in);</div><div class='add'>+</div><div class='add'>+	if (req-&gt;assoclen)</div><div class='add'>+		packet_dump("  assoc_data ", rctx-&gt;msg_buf.a.resp_aad,</div><div class='add'>+			    req-&gt;assoclen);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Copy the ICV back to the destination</div><div class='add'>+	 * buffer. In decrypt case, SPU gives us back the digest, but crypto</div><div class='add'>+	 * API doesn't expect ICV in dst buffer.</div><div class='add'>+	 */</div><div class='add'>+	result_len = req-&gt;cryptlen;</div><div class='add'>+	if (rctx-&gt;is_encrypt) {</div><div class='add'>+		icv_offset = req-&gt;assoclen + rctx-&gt;total_sent;</div><div class='add'>+		packet_dump("  ICV: ", rctx-&gt;msg_buf.digest, ctx-&gt;digestsize);</div><div class='add'>+		flow_log("copying ICV to dst sg at offset %u\n", icv_offset);</div><div class='add'>+		sg_copy_part_from_buf(req-&gt;dst, rctx-&gt;msg_buf.digest,</div><div class='add'>+				      ctx-&gt;digestsize, icv_offset);</div><div class='add'>+		result_len += ctx-&gt;digestsize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	packet_log("response data:  ");</div><div class='add'>+	dump_sg(req-&gt;dst, req-&gt;assoclen, result_len);</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;iproc_priv.op_counts[SPU_OP_AEAD]);</div><div class='add'>+	if (ctx-&gt;cipher.alg == CIPHER_ALG_AES) {</div><div class='add'>+		if (ctx-&gt;cipher.mode == CIPHER_MODE_CCM)</div><div class='add'>+			atomic_inc(&amp;iproc_priv.aead_cnt[AES_CCM]);</div><div class='add'>+		else if (ctx-&gt;cipher.mode == CIPHER_MODE_GCM)</div><div class='add'>+			atomic_inc(&amp;iproc_priv.aead_cnt[AES_GCM]);</div><div class='add'>+		else</div><div class='add'>+			atomic_inc(&amp;iproc_priv.aead_cnt[AUTHENC]);</div><div class='add'>+	} else {</div><div class='add'>+		atomic_inc(&amp;iproc_priv.aead_cnt[AUTHENC]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_chunk_cleanup() - Do cleanup after processing one chunk of a request</div><div class='add'>+ * @rctx:  request context</div><div class='add'>+ *</div><div class='add'>+ * Mailbox scatterlists are allocated for each chunk. So free them after</div><div class='add'>+ * processing each chunk.</div><div class='add'>+ */</div><div class='add'>+static void spu_chunk_cleanup(struct iproc_reqctx_s *rctx)</div><div class='add'>+{</div><div class='add'>+	/* mailbox message used to tx request */</div><div class='add'>+	struct brcm_message *mssg = &amp;rctx-&gt;mb_mssg;</div><div class='add'>+</div><div class='add'>+	kfree(mssg-&gt;spu.src);</div><div class='add'>+	kfree(mssg-&gt;spu.dst);</div><div class='add'>+	memset(mssg, 0, sizeof(struct brcm_message));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * finish_req() - Used to invoke the complete callback from the requester when</div><div class='add'>+ * a request has been handled asynchronously.</div><div class='add'>+ * @rctx:  Request context</div><div class='add'>+ * @err:   Indicates whether the request was successful or not</div><div class='add'>+ *</div><div class='add'>+ * Ensures that cleanup has been done for request</div><div class='add'>+ */</div><div class='add'>+static void finish_req(struct iproc_reqctx_s *rctx, int err)</div><div class='add'>+{</div><div class='add'>+	struct crypto_async_request *areq = rctx-&gt;parent;</div><div class='add'>+</div><div class='add'>+	flow_log("%s() err:%d\n\n", __func__, err);</div><div class='add'>+</div><div class='add'>+	/* No harm done if already called */</div><div class='add'>+	spu_chunk_cleanup(rctx);</div><div class='add'>+</div><div class='add'>+	if (areq)</div><div class='add'>+		areq-&gt;complete(areq, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_rx_callback() - Callback from mailbox framework with a SPU response.</div><div class='add'>+ * @cl:		mailbox client structure for SPU driver</div><div class='add'>+ * @msg:	mailbox message containing SPU response</div><div class='add'>+ */</div><div class='add'>+static void spu_rx_callback(struct mbox_client *cl, void *msg)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct brcm_message *mssg = msg;</div><div class='add'>+	struct iproc_reqctx_s *rctx;</div><div class='add'>+	struct iproc_ctx_s *ctx;</div><div class='add'>+	struct crypto_async_request *areq;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	rctx = mssg-&gt;ctx;</div><div class='add'>+	if (unlikely(!rctx)) {</div><div class='add'>+		/* This is fatal */</div><div class='add'>+		pr_err("%s(): no request context", __func__);</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto cb_finish;</div><div class='add'>+	}</div><div class='add'>+	areq = rctx-&gt;parent;</div><div class='add'>+	ctx = rctx-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	/* process the SPU status */</div><div class='add'>+	err = spu-&gt;spu_status_process(rctx-&gt;msg_buf.rx_stat);</div><div class='add'>+	if (err != 0) {</div><div class='add'>+		if (err == SPU_INVALID_ICV)</div><div class='add'>+			atomic_inc(&amp;iproc_priv.bad_icv);</div><div class='add'>+		err = -EBADMSG;</div><div class='add'>+		goto cb_finish;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Process the SPU response message */</div><div class='add'>+	switch (rctx-&gt;ctx-&gt;alg-&gt;type) {</div><div class='add'>+	case CRYPTO_ALG_TYPE_ABLKCIPHER:</div><div class='add'>+		handle_ablkcipher_resp(rctx);</div><div class='add'>+		break;</div><div class='add'>+	case CRYPTO_ALG_TYPE_AHASH:</div><div class='add'>+		handle_ahash_resp(rctx);</div><div class='add'>+		break;</div><div class='add'>+	case CRYPTO_ALG_TYPE_AEAD:</div><div class='add'>+		handle_aead_resp(rctx);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto cb_finish;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If this response does not complete the request, then send the next</div><div class='add'>+	 * request chunk.</div><div class='add'>+	 */</div><div class='add'>+	if (rctx-&gt;total_sent &lt; rctx-&gt;total_todo) {</div><div class='add'>+		/* Deallocate anything specific to previous chunk */</div><div class='add'>+		spu_chunk_cleanup(rctx);</div><div class='add'>+</div><div class='add'>+		switch (rctx-&gt;ctx-&gt;alg-&gt;type) {</div><div class='add'>+		case CRYPTO_ALG_TYPE_ABLKCIPHER:</div><div class='add'>+			err = handle_ablkcipher_req(rctx);</div><div class='add'>+			break;</div><div class='add'>+		case CRYPTO_ALG_TYPE_AHASH:</div><div class='add'>+			err = handle_ahash_req(rctx);</div><div class='add'>+			if (err == -EAGAIN)</div><div class='add'>+				/*</div><div class='add'>+				 * we saved data in hash carry, but tell crypto</div><div class='add'>+				 * API we successfully completed request.</div><div class='add'>+				 */</div><div class='add'>+				err = 0;</div><div class='add'>+			break;</div><div class='add'>+		case CRYPTO_ALG_TYPE_AEAD:</div><div class='add'>+			err = handle_aead_req(rctx);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (err == -EINPROGRESS)</div><div class='add'>+			/* Successfully submitted request for next chunk */</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+cb_finish:</div><div class='add'>+	finish_req(rctx, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ==================== Kernel Cryptographic API ==================== */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ablkcipher_enqueue() - Handle ablkcipher encrypt or decrypt request.</div><div class='add'>+ * @req:	Crypto API request</div><div class='add'>+ * @encrypt:	true if encrypting; false if decrypting</div><div class='add'>+ *</div><div class='add'>+ * Return: -EINPROGRESS if request accepted and result will be returned</div><div class='add'>+ *			asynchronously</div><div class='add'>+ *	   &lt; 0 if an error</div><div class='add'>+ */</div><div class='add'>+static int ablkcipher_enqueue(struct ablkcipher_request *req, bool encrypt)</div><div class='add'>+{</div><div class='add'>+	struct iproc_reqctx_s *rctx = ablkcipher_request_ctx(req);</div><div class='add'>+	struct iproc_ctx_s *ctx =</div><div class='add'>+	    crypto_ablkcipher_ctx(crypto_ablkcipher_reqtfm(req));</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	flow_log("%s() enc:%u\n", __func__, encrypt);</div><div class='add'>+</div><div class='add'>+	rctx-&gt;gfp = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='add'>+		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='add'>+	rctx-&gt;parent = &amp;req-&gt;base;</div><div class='add'>+	rctx-&gt;is_encrypt = encrypt;</div><div class='add'>+	rctx-&gt;bd_suppress = false;</div><div class='add'>+	rctx-&gt;total_todo = req-&gt;nbytes;</div><div class='add'>+	rctx-&gt;src_sent = 0;</div><div class='add'>+	rctx-&gt;total_sent = 0;</div><div class='add'>+	rctx-&gt;total_received = 0;</div><div class='add'>+	rctx-&gt;ctx = ctx;</div><div class='add'>+</div><div class='add'>+	/* Initialize current position in src and dst scatterlists */</div><div class='add'>+	rctx-&gt;src_sg = req-&gt;src;</div><div class='add'>+	rctx-&gt;src_nents = 0;</div><div class='add'>+	rctx-&gt;src_skip = 0;</div><div class='add'>+	rctx-&gt;dst_sg = req-&gt;dst;</div><div class='add'>+	rctx-&gt;dst_nents = 0;</div><div class='add'>+	rctx-&gt;dst_skip = 0;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;cipher.mode == CIPHER_MODE_CBC ||</div><div class='add'>+	    ctx-&gt;cipher.mode == CIPHER_MODE_CTR ||</div><div class='add'>+	    ctx-&gt;cipher.mode == CIPHER_MODE_OFB ||</div><div class='add'>+	    ctx-&gt;cipher.mode == CIPHER_MODE_XTS ||</div><div class='add'>+	    ctx-&gt;cipher.mode == CIPHER_MODE_GCM ||</div><div class='add'>+	    ctx-&gt;cipher.mode == CIPHER_MODE_CCM) {</div><div class='add'>+		rctx-&gt;iv_ctr_len =</div><div class='add'>+		    crypto_ablkcipher_ivsize(crypto_ablkcipher_reqtfm(req));</div><div class='add'>+		memcpy(rctx-&gt;msg_buf.iv_ctr, req-&gt;info, rctx-&gt;iv_ctr_len);</div><div class='add'>+	} else {</div><div class='add'>+		rctx-&gt;iv_ctr_len = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Choose a SPU to process this request */</div><div class='add'>+	rctx-&gt;chan_idx = select_channel();</div><div class='add'>+	err = handle_ablkcipher_req(rctx);</div><div class='add'>+	if (err != -EINPROGRESS)</div><div class='add'>+		/* synchronous result */</div><div class='add'>+		spu_chunk_cleanup(rctx);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='add'>+		      unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='add'>+	u32 tmp[DES_EXPKEY_WORDS];</div><div class='add'>+</div><div class='add'>+	if (keylen == DES_KEY_SIZE) {</div><div class='add'>+		if (des_ekey(tmp, key) == 0) {</div><div class='add'>+			if (crypto_ablkcipher_get_flags(cipher) &amp;</div><div class='add'>+			    CRYPTO_TFM_REQ_WEAK_KEY) {</div><div class='add'>+				u32 flags = CRYPTO_TFM_RES_WEAK_KEY;</div><div class='add'>+</div><div class='add'>+				crypto_ablkcipher_set_flags(cipher, flags);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ctx-&gt;cipher_type = CIPHER_TYPE_DES;</div><div class='add'>+	} else {</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int threedes_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='add'>+			   unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='add'>+</div><div class='add'>+	if (keylen == (DES_KEY_SIZE * 3)) {</div><div class='add'>+		const u32 *K = (const u32 *)key;</div><div class='add'>+		u32 flags = CRYPTO_TFM_RES_BAD_KEY_SCHED;</div><div class='add'>+</div><div class='add'>+		if (!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||</div><div class='add'>+		    !((K[2] ^ K[4]) | (K[3] ^ K[5]))) {</div><div class='add'>+			crypto_ablkcipher_set_flags(cipher, flags);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ctx-&gt;cipher_type = CIPHER_TYPE_3DES;</div><div class='add'>+	} else {</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aes_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='add'>+		      unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;cipher.mode == CIPHER_MODE_XTS)</div><div class='add'>+		/* XTS includes two keys of equal length */</div><div class='add'>+		keylen = keylen / 2;</div><div class='add'>+</div><div class='add'>+	switch (keylen) {</div><div class='add'>+	case AES_KEYSIZE_128:</div><div class='add'>+		ctx-&gt;cipher_type = CIPHER_TYPE_AES128;</div><div class='add'>+		break;</div><div class='add'>+	case AES_KEYSIZE_192:</div><div class='add'>+		ctx-&gt;cipher_type = CIPHER_TYPE_AES192;</div><div class='add'>+		break;</div><div class='add'>+	case AES_KEYSIZE_256:</div><div class='add'>+		ctx-&gt;cipher_type = CIPHER_TYPE_AES256;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	WARN_ON((ctx-&gt;max_payload != SPU_MAX_PAYLOAD_INF) &amp;&amp;</div><div class='add'>+		((ctx-&gt;max_payload % AES_BLOCK_SIZE) != 0));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rc4_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='add'>+		      unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;enckeylen = ARC4_MAX_KEY_SIZE + ARC4_STATE_SIZE;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;enckey[0] = 0x00;	/* 0x00 */</div><div class='add'>+	ctx-&gt;enckey[1] = 0x00;	/* i    */</div><div class='add'>+	ctx-&gt;enckey[2] = 0x00;	/* 0x00 */</div><div class='add'>+	ctx-&gt;enckey[3] = 0x00;	/* j    */</div><div class='add'>+	for (i = 0; i &lt; ARC4_MAX_KEY_SIZE; i++)</div><div class='add'>+		ctx-&gt;enckey[i + ARC4_STATE_SIZE] = key[i % keylen];</div><div class='add'>+</div><div class='add'>+	ctx-&gt;cipher_type = CIPHER_TYPE_INIT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ablkcipher_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='add'>+			     unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ablkcipher_ctx(cipher);</div><div class='add'>+	struct spu_cipher_parms cipher_parms;</div><div class='add'>+	u32 alloc_len = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	flow_log("ablkcipher_setkey() keylen: %d\n", keylen);</div><div class='add'>+	flow_dump("  key: ", key, keylen);</div><div class='add'>+</div><div class='add'>+	switch (ctx-&gt;cipher.alg) {</div><div class='add'>+	case CIPHER_ALG_DES:</div><div class='add'>+		err = des_setkey(cipher, key, keylen);</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_3DES:</div><div class='add'>+		err = threedes_setkey(cipher, key, keylen);</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_AES:</div><div class='add'>+		err = aes_setkey(cipher, key, keylen);</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_RC4:</div><div class='add'>+		err = rc4_setkey(cipher, key, keylen);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("%s() Error: unknown cipher alg\n", __func__);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* RC4 already populated ctx-&gt;enkey */</div><div class='add'>+	if (ctx-&gt;cipher.alg != CIPHER_ALG_RC4) {</div><div class='add'>+		memcpy(ctx-&gt;enckey, key, keylen);</div><div class='add'>+		ctx-&gt;enckeylen = keylen;</div><div class='add'>+	}</div><div class='add'>+	/* SPU needs XTS keys in the reverse order the crypto API presents */</div><div class='add'>+	if ((ctx-&gt;cipher.alg == CIPHER_ALG_AES) &amp;&amp;</div><div class='add'>+	    (ctx-&gt;cipher.mode == CIPHER_MODE_XTS)) {</div><div class='add'>+		unsigned int xts_keylen = keylen / 2;</div><div class='add'>+</div><div class='add'>+		memcpy(ctx-&gt;enckey, key + xts_keylen, xts_keylen);</div><div class='add'>+		memcpy(ctx-&gt;enckey + xts_keylen, key, xts_keylen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spu-&gt;spu_type == SPU_TYPE_SPUM)</div><div class='add'>+		alloc_len = BCM_HDR_LEN + SPU_HEADER_ALLOC_LEN;</div><div class='add'>+	else if (spu-&gt;spu_type == SPU_TYPE_SPU2)</div><div class='add'>+		alloc_len = BCM_HDR_LEN + SPU2_HEADER_ALLOC_LEN;</div><div class='add'>+	memset(ctx-&gt;bcm_spu_req_hdr, 0, alloc_len);</div><div class='add'>+	cipher_parms.iv_buf = NULL;</div><div class='add'>+	cipher_parms.iv_len = crypto_ablkcipher_ivsize(cipher);</div><div class='add'>+	flow_log("%s: iv_len %u\n", __func__, cipher_parms.iv_len);</div><div class='add'>+</div><div class='add'>+	cipher_parms.alg = ctx-&gt;cipher.alg;</div><div class='add'>+	cipher_parms.mode = ctx-&gt;cipher.mode;</div><div class='add'>+	cipher_parms.type = ctx-&gt;cipher_type;</div><div class='add'>+	cipher_parms.key_buf = ctx-&gt;enckey;</div><div class='add'>+	cipher_parms.key_len = ctx-&gt;enckeylen;</div><div class='add'>+</div><div class='add'>+	/* Prepend SPU request message with BCM header */</div><div class='add'>+	memcpy(ctx-&gt;bcm_spu_req_hdr, BCMHEADER, BCM_HDR_LEN);</div><div class='add'>+	ctx-&gt;spu_req_hdr_len =</div><div class='add'>+	    spu-&gt;spu_cipher_req_init(ctx-&gt;bcm_spu_req_hdr + BCM_HDR_LEN,</div><div class='add'>+				     &amp;cipher_parms);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;spu_resp_hdr_len = spu-&gt;spu_response_hdr_len(ctx-&gt;authkeylen,</div><div class='add'>+							  ctx-&gt;enckeylen,</div><div class='add'>+							  false);</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;iproc_priv.setkey_cnt[SPU_OP_CIPHER]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ablkcipher_encrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	flow_log("ablkcipher_encrypt() nbytes:%u\n", req-&gt;nbytes);</div><div class='add'>+</div><div class='add'>+	return ablkcipher_enqueue(req, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ablkcipher_decrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	flow_log("ablkcipher_decrypt() nbytes:%u\n", req-&gt;nbytes);</div><div class='add'>+	return ablkcipher_enqueue(req, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_enqueue(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iproc_reqctx_s *rctx = ahash_request_ctx(req);</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ahash_ctx(tfm);</div><div class='add'>+	int err = 0;</div><div class='add'>+	const char *alg_name;</div><div class='add'>+</div><div class='add'>+	flow_log("ahash_enqueue() nbytes:%u\n", req-&gt;nbytes);</div><div class='add'>+</div><div class='add'>+	rctx-&gt;gfp = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='add'>+		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='add'>+	rctx-&gt;parent = &amp;req-&gt;base;</div><div class='add'>+	rctx-&gt;ctx = ctx;</div><div class='add'>+	rctx-&gt;bd_suppress = true;</div><div class='add'>+	memset(&amp;rctx-&gt;mb_mssg, 0, sizeof(struct brcm_message));</div><div class='add'>+</div><div class='add'>+	/* Initialize position in src scatterlist */</div><div class='add'>+	rctx-&gt;src_sg = req-&gt;src;</div><div class='add'>+	rctx-&gt;src_skip = 0;</div><div class='add'>+	rctx-&gt;src_nents = 0;</div><div class='add'>+	rctx-&gt;dst_sg = NULL;</div><div class='add'>+	rctx-&gt;dst_skip = 0;</div><div class='add'>+	rctx-&gt;dst_nents = 0;</div><div class='add'>+</div><div class='add'>+	/* SPU2 hardware does not compute hash of zero length data */</div><div class='add'>+	if ((rctx-&gt;is_final == 1) &amp;&amp; (rctx-&gt;total_todo == 0) &amp;&amp;</div><div class='add'>+	    (iproc_priv.spu.spu_type == SPU_TYPE_SPU2)) {</div><div class='add'>+		alg_name = crypto_tfm_alg_name(crypto_ahash_tfm(tfm));</div><div class='add'>+		flow_log("Doing %sfinal %s zero-len hash request in software\n",</div><div class='add'>+			 rctx-&gt;is_final ? "" : "non-", alg_name);</div><div class='add'>+		err = do_shash((unsigned char *)alg_name, req-&gt;result,</div><div class='add'>+			       NULL, 0, NULL, 0, ctx-&gt;authkey,</div><div class='add'>+			       ctx-&gt;authkeylen);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			flow_log("Hash request failed with error %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	/* Choose a SPU to process this request */</div><div class='add'>+	rctx-&gt;chan_idx = select_channel();</div><div class='add'>+</div><div class='add'>+	err = handle_ahash_req(rctx);</div><div class='add'>+	if (err != -EINPROGRESS)</div><div class='add'>+		/* synchronous result */</div><div class='add'>+		spu_chunk_cleanup(rctx);</div><div class='add'>+</div><div class='add'>+	if (err == -EAGAIN)</div><div class='add'>+		/*</div><div class='add'>+		 * we saved data in hash carry, but tell crypto API</div><div class='add'>+		 * we successfully completed request.</div><div class='add'>+		 */</div><div class='add'>+		err = 0;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ahash_init(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct iproc_reqctx_s *rctx = ahash_request_ctx(req);</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ahash_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	flow_log("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* Initialize the context */</div><div class='add'>+	rctx-&gt;hash_carry_len = 0;</div><div class='add'>+	rctx-&gt;is_final = 0;</div><div class='add'>+</div><div class='add'>+	rctx-&gt;total_todo = 0;</div><div class='add'>+	rctx-&gt;src_sent = 0;</div><div class='add'>+	rctx-&gt;total_sent = 0;</div><div class='add'>+	rctx-&gt;total_received = 0;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;digestsize = crypto_ahash_digestsize(tfm);</div><div class='add'>+	/* If we add a hash whose digest is larger, catch it here. */</div><div class='add'>+	WARN_ON(ctx-&gt;digestsize &gt; MAX_DIGEST_SIZE);</div><div class='add'>+</div><div class='add'>+	rctx-&gt;is_sw_hmac = false;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;spu_resp_hdr_len = spu-&gt;spu_response_hdr_len(ctx-&gt;authkeylen, 0,</div><div class='add'>+							  true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_no_incr_hash() - Determine whether incremental hashing is supported.</div><div class='add'>+ * @ctx:  Crypto session context</div><div class='add'>+ *</div><div class='add'>+ * SPU-2 does not support incremental hashing (we'll have to revisit and</div><div class='add'>+ * condition based on chip revision or device tree entry if future versions do</div><div class='add'>+ * support incremental hash)</div><div class='add'>+ *</div><div class='add'>+ * SPU-M also doesn't support incremental hashing of AES-XCBC</div><div class='add'>+ *</div><div class='add'>+ * Return: true if incremental hashing is not supported</div><div class='add'>+ *         false otherwise</div><div class='add'>+ */</div><div class='add'>+bool spu_no_incr_hash(struct iproc_ctx_s *ctx)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+</div><div class='add'>+	if (spu-&gt;spu_type == SPU_TYPE_SPU2)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if ((ctx-&gt;auth.alg == HASH_ALG_AES) &amp;&amp;</div><div class='add'>+	    (ctx-&gt;auth.mode == HASH_MODE_XCBC))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Otherwise, incremental hashing is supported */</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_init(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ahash_ctx(tfm);</div><div class='add'>+	const char *alg_name;</div><div class='add'>+	struct crypto_shash *hash;</div><div class='add'>+	int ret;</div><div class='add'>+	gfp_t gfp;</div><div class='add'>+</div><div class='add'>+	if (spu_no_incr_hash(ctx)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we get an incremental hashing request and it's not</div><div class='add'>+		 * supported by the hardware, we need to handle it in software</div><div class='add'>+		 * by calling synchronous hash functions.</div><div class='add'>+		 */</div><div class='add'>+		alg_name = crypto_tfm_alg_name(crypto_ahash_tfm(tfm));</div><div class='add'>+		hash = crypto_alloc_shash(alg_name, 0, 0);</div><div class='add'>+		if (IS_ERR(hash)) {</div><div class='add'>+			ret = PTR_ERR(hash);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		gfp = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='add'>+		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='add'>+		ctx-&gt;shash = kmalloc(sizeof(*ctx-&gt;shash) +</div><div class='add'>+				     crypto_shash_descsize(hash), gfp);</div><div class='add'>+		if (!ctx-&gt;shash) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto err_hash;</div><div class='add'>+		}</div><div class='add'>+		ctx-&gt;shash-&gt;tfm = hash;</div><div class='add'>+		ctx-&gt;shash-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+		/* Set the key using data we already have from setkey */</div><div class='add'>+		if (ctx-&gt;authkeylen &gt; 0) {</div><div class='add'>+			ret = crypto_shash_setkey(hash, ctx-&gt;authkey,</div><div class='add'>+						  ctx-&gt;authkeylen);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err_shash;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Initialize hash w/ this key and other params */</div><div class='add'>+		ret = crypto_shash_init(ctx-&gt;shash);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_shash;</div><div class='add'>+	} else {</div><div class='add'>+		/* Otherwise call the internal function which uses SPU hw */</div><div class='add'>+		ret = __ahash_init(req);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_shash:</div><div class='add'>+	kfree(ctx-&gt;shash);</div><div class='add'>+err_hash:</div><div class='add'>+	crypto_free_shash(hash);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ahash_update(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iproc_reqctx_s *rctx = ahash_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	flow_log("ahash_update() nbytes:%u\n", req-&gt;nbytes);</div><div class='add'>+</div><div class='add'>+	if (!req-&gt;nbytes)</div><div class='add'>+		return 0;</div><div class='add'>+	rctx-&gt;total_todo += req-&gt;nbytes;</div><div class='add'>+	rctx-&gt;src_sent = 0;</div><div class='add'>+</div><div class='add'>+	return ahash_enqueue(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_update(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ahash_ctx(tfm);</div><div class='add'>+	u8 *tmpbuf;</div><div class='add'>+	int ret;</div><div class='add'>+	int nents;</div><div class='add'>+	gfp_t gfp;</div><div class='add'>+</div><div class='add'>+	if (spu_no_incr_hash(ctx)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we get an incremental hashing request and it's not</div><div class='add'>+		 * supported by the hardware, we need to handle it in software</div><div class='add'>+		 * by calling synchronous hash functions.</div><div class='add'>+		 */</div><div class='add'>+		if (req-&gt;src)</div><div class='add'>+			nents = sg_nents(req-&gt;src);</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Copy data from req scatterlist to tmp buffer */</div><div class='add'>+		gfp = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='add'>+		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='add'>+		tmpbuf = kmalloc(req-&gt;nbytes, gfp);</div><div class='add'>+		if (!tmpbuf)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (sg_copy_to_buffer(req-&gt;src, nents, tmpbuf, req-&gt;nbytes) !=</div><div class='add'>+				req-&gt;nbytes) {</div><div class='add'>+			kfree(tmpbuf);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Call synchronous update */</div><div class='add'>+		ret = crypto_shash_update(ctx-&gt;shash, tmpbuf, req-&gt;nbytes);</div><div class='add'>+		kfree(tmpbuf);</div><div class='add'>+	} else {</div><div class='add'>+		/* Otherwise call the internal function which uses SPU hw */</div><div class='add'>+		ret = __ahash_update(req);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ahash_final(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iproc_reqctx_s *rctx = ahash_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	flow_log("ahash_final() nbytes:%u\n", req-&gt;nbytes);</div><div class='add'>+</div><div class='add'>+	rctx-&gt;is_final = 1;</div><div class='add'>+</div><div class='add'>+	return ahash_enqueue(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_final(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ahash_ctx(tfm);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (spu_no_incr_hash(ctx)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we get an incremental hashing request and it's not</div><div class='add'>+		 * supported by the hardware, we need to handle it in software</div><div class='add'>+		 * by calling synchronous hash functions.</div><div class='add'>+		 */</div><div class='add'>+		ret = crypto_shash_final(ctx-&gt;shash, req-&gt;result);</div><div class='add'>+</div><div class='add'>+		/* Done with hash, can deallocate it now */</div><div class='add'>+		crypto_free_shash(ctx-&gt;shash-&gt;tfm);</div><div class='add'>+		kfree(ctx-&gt;shash);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		/* Otherwise call the internal function which uses SPU hw */</div><div class='add'>+		ret = __ahash_final(req);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ahash_finup(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iproc_reqctx_s *rctx = ahash_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	flow_log("ahash_finup() nbytes:%u\n", req-&gt;nbytes);</div><div class='add'>+</div><div class='add'>+	rctx-&gt;total_todo += req-&gt;nbytes;</div><div class='add'>+	rctx-&gt;src_sent = 0;</div><div class='add'>+	rctx-&gt;is_final = 1;</div><div class='add'>+</div><div class='add'>+	return ahash_enqueue(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_finup(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ahash_ctx(tfm);</div><div class='add'>+	u8 *tmpbuf;</div><div class='add'>+	int ret;</div><div class='add'>+	int nents;</div><div class='add'>+	gfp_t gfp;</div><div class='add'>+</div><div class='add'>+	if (spu_no_incr_hash(ctx)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we get an incremental hashing request and it's not</div><div class='add'>+		 * supported by the hardware, we need to handle it in software</div><div class='add'>+		 * by calling synchronous hash functions.</div><div class='add'>+		 */</div><div class='add'>+		if (req-&gt;src) {</div><div class='add'>+			nents = sg_nents(req-&gt;src);</div><div class='add'>+		} else {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto ahash_finup_exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Copy data from req scatterlist to tmp buffer */</div><div class='add'>+		gfp = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='add'>+		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='add'>+		tmpbuf = kmalloc(req-&gt;nbytes, gfp);</div><div class='add'>+		if (!tmpbuf) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto ahash_finup_exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (sg_copy_to_buffer(req-&gt;src, nents, tmpbuf, req-&gt;nbytes) !=</div><div class='add'>+				req-&gt;nbytes) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto ahash_finup_free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Call synchronous update */</div><div class='add'>+		ret = crypto_shash_finup(ctx-&gt;shash, tmpbuf, req-&gt;nbytes,</div><div class='add'>+					 req-&gt;result);</div><div class='add'>+	} else {</div><div class='add'>+		/* Otherwise call the internal function which uses SPU hw */</div><div class='add'>+		return __ahash_finup(req);</div><div class='add'>+	}</div><div class='add'>+ahash_finup_free:</div><div class='add'>+	kfree(tmpbuf);</div><div class='add'>+</div><div class='add'>+ahash_finup_exit:</div><div class='add'>+	/* Done with hash, can deallocate it now */</div><div class='add'>+	crypto_free_shash(ctx-&gt;shash-&gt;tfm);</div><div class='add'>+	kfree(ctx-&gt;shash);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_digest(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	flow_log("ahash_digest() nbytes:%u\n", req-&gt;nbytes);</div><div class='add'>+</div><div class='add'>+	/* whole thing at once */</div><div class='add'>+	err = __ahash_init(req);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = __ahash_finup(req);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_setkey(struct crypto_ahash *ahash, const u8 *key,</div><div class='add'>+			unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ahash_ctx(ahash);</div><div class='add'>+</div><div class='add'>+	flow_log("%s() ahash:%p key:%p keylen:%u\n",</div><div class='add'>+		 __func__, ahash, key, keylen);</div><div class='add'>+	flow_dump("  key: ", key, keylen);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;auth.alg == HASH_ALG_AES) {</div><div class='add'>+		switch (keylen) {</div><div class='add'>+		case AES_KEYSIZE_128:</div><div class='add'>+			ctx-&gt;cipher_type = CIPHER_TYPE_AES128;</div><div class='add'>+			break;</div><div class='add'>+		case AES_KEYSIZE_192:</div><div class='add'>+			ctx-&gt;cipher_type = CIPHER_TYPE_AES192;</div><div class='add'>+			break;</div><div class='add'>+		case AES_KEYSIZE_256:</div><div class='add'>+			ctx-&gt;cipher_type = CIPHER_TYPE_AES256;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			pr_err("%s() Error: Invalid key length\n", __func__);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		pr_err("%s() Error: unknown hash alg\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	memcpy(ctx-&gt;authkey, key, keylen);</div><div class='add'>+	ctx-&gt;authkeylen = keylen;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_export(struct ahash_request *req, void *out)</div><div class='add'>+{</div><div class='add'>+	const struct iproc_reqctx_s *rctx = ahash_request_ctx(req);</div><div class='add'>+	struct spu_hash_export_s *spu_exp = (struct spu_hash_export_s *)out;</div><div class='add'>+</div><div class='add'>+	spu_exp-&gt;total_todo = rctx-&gt;total_todo;</div><div class='add'>+	spu_exp-&gt;total_sent = rctx-&gt;total_sent;</div><div class='add'>+	spu_exp-&gt;is_sw_hmac = rctx-&gt;is_sw_hmac;</div><div class='add'>+	memcpy(spu_exp-&gt;hash_carry, rctx-&gt;hash_carry, sizeof(rctx-&gt;hash_carry));</div><div class='add'>+	spu_exp-&gt;hash_carry_len = rctx-&gt;hash_carry_len;</div><div class='add'>+	memcpy(spu_exp-&gt;incr_hash, rctx-&gt;incr_hash, sizeof(rctx-&gt;incr_hash));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_import(struct ahash_request *req, const void *in)</div><div class='add'>+{</div><div class='add'>+	struct iproc_reqctx_s *rctx = ahash_request_ctx(req);</div><div class='add'>+	struct spu_hash_export_s *spu_exp = (struct spu_hash_export_s *)in;</div><div class='add'>+</div><div class='add'>+	rctx-&gt;total_todo = spu_exp-&gt;total_todo;</div><div class='add'>+	rctx-&gt;total_sent = spu_exp-&gt;total_sent;</div><div class='add'>+	rctx-&gt;is_sw_hmac = spu_exp-&gt;is_sw_hmac;</div><div class='add'>+	memcpy(rctx-&gt;hash_carry, spu_exp-&gt;hash_carry, sizeof(rctx-&gt;hash_carry));</div><div class='add'>+	rctx-&gt;hash_carry_len = spu_exp-&gt;hash_carry_len;</div><div class='add'>+	memcpy(rctx-&gt;incr_hash, spu_exp-&gt;incr_hash, sizeof(rctx-&gt;incr_hash));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_hmac_setkey(struct crypto_ahash *ahash, const u8 *key,</div><div class='add'>+			     unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ahash_ctx(ahash);</div><div class='add'>+	unsigned int blocksize =</div><div class='add'>+		crypto_tfm_alg_blocksize(crypto_ahash_tfm(ahash));</div><div class='add'>+	unsigned int digestsize = crypto_ahash_digestsize(ahash);</div><div class='add'>+	unsigned int index;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	flow_log("%s() ahash:%p key:%p keylen:%u blksz:%u digestsz:%u\n",</div><div class='add'>+		 __func__, ahash, key, keylen, blocksize, digestsize);</div><div class='add'>+	flow_dump("  key: ", key, keylen);</div><div class='add'>+</div><div class='add'>+	if (keylen &gt; blocksize) {</div><div class='add'>+		switch (ctx-&gt;auth.alg) {</div><div class='add'>+		case HASH_ALG_MD5:</div><div class='add'>+			rc = do_shash("md5", ctx-&gt;authkey, key, keylen, NULL,</div><div class='add'>+				      0, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case HASH_ALG_SHA1:</div><div class='add'>+			rc = do_shash("sha1", ctx-&gt;authkey, key, keylen, NULL,</div><div class='add'>+				      0, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case HASH_ALG_SHA224:</div><div class='add'>+			rc = do_shash("sha224", ctx-&gt;authkey, key, keylen, NULL,</div><div class='add'>+				      0, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case HASH_ALG_SHA256:</div><div class='add'>+			rc = do_shash("sha256", ctx-&gt;authkey, key, keylen, NULL,</div><div class='add'>+				      0, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case HASH_ALG_SHA384:</div><div class='add'>+			rc = do_shash("sha384", ctx-&gt;authkey, key, keylen, NULL,</div><div class='add'>+				      0, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case HASH_ALG_SHA512:</div><div class='add'>+			rc = do_shash("sha512", ctx-&gt;authkey, key, keylen, NULL,</div><div class='add'>+				      0, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case HASH_ALG_SHA3_224:</div><div class='add'>+			rc = do_shash("sha3-224", ctx-&gt;authkey, key, keylen,</div><div class='add'>+				      NULL, 0, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case HASH_ALG_SHA3_256:</div><div class='add'>+			rc = do_shash("sha3-256", ctx-&gt;authkey, key, keylen,</div><div class='add'>+				      NULL, 0, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case HASH_ALG_SHA3_384:</div><div class='add'>+			rc = do_shash("sha3-384", ctx-&gt;authkey, key, keylen,</div><div class='add'>+				      NULL, 0, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case HASH_ALG_SHA3_512:</div><div class='add'>+			rc = do_shash("sha3-512", ctx-&gt;authkey, key, keylen,</div><div class='add'>+				      NULL, 0, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			pr_err("%s() Error: unknown hash alg\n", __func__);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			pr_err("%s() Error %d computing shash for %s\n",</div><div class='add'>+			       __func__, rc, hash_alg_name[ctx-&gt;auth.alg]);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+		ctx-&gt;authkeylen = digestsize;</div><div class='add'>+</div><div class='add'>+		flow_log("  keylen &gt; digestsize... hashed\n");</div><div class='add'>+		flow_dump("  newkey: ", ctx-&gt;authkey, ctx-&gt;authkeylen);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(ctx-&gt;authkey, key, keylen);</div><div class='add'>+		ctx-&gt;authkeylen = keylen;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Full HMAC operation in SPUM is not verified,</div><div class='add'>+	 * So keeping the generation of IPAD, OPAD and</div><div class='add'>+	 * outer hashing in software.</div><div class='add'>+	 */</div><div class='add'>+	if (iproc_priv.spu.spu_type == SPU_TYPE_SPUM) {</div><div class='add'>+		memcpy(ctx-&gt;ipad, ctx-&gt;authkey, ctx-&gt;authkeylen);</div><div class='add'>+		memset(ctx-&gt;ipad + ctx-&gt;authkeylen, 0,</div><div class='add'>+		       blocksize - ctx-&gt;authkeylen);</div><div class='add'>+		ctx-&gt;authkeylen = 0;</div><div class='add'>+		memcpy(ctx-&gt;opad, ctx-&gt;ipad, blocksize);</div><div class='add'>+</div><div class='add'>+		for (index = 0; index &lt; blocksize; index++) {</div><div class='add'>+			ctx-&gt;ipad[index] ^= 0x36;</div><div class='add'>+			ctx-&gt;opad[index] ^= 0x5c;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		flow_dump("  ipad: ", ctx-&gt;ipad, blocksize);</div><div class='add'>+		flow_dump("  opad: ", ctx-&gt;opad, blocksize);</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;digestsize = digestsize;</div><div class='add'>+	atomic_inc(&amp;iproc_priv.setkey_cnt[SPU_OP_HMAC]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_hmac_init(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iproc_reqctx_s *rctx = ahash_request_ctx(req);</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ahash_ctx(tfm);</div><div class='add'>+	unsigned int blocksize =</div><div class='add'>+			crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm));</div><div class='add'>+</div><div class='add'>+	flow_log("ahash_hmac_init()\n");</div><div class='add'>+</div><div class='add'>+	/* init the context as a hash */</div><div class='add'>+	ahash_init(req);</div><div class='add'>+</div><div class='add'>+	if (!spu_no_incr_hash(ctx)) {</div><div class='add'>+		/* SPU-M can do incr hashing but needs sw for outer HMAC */</div><div class='add'>+		rctx-&gt;is_sw_hmac = true;</div><div class='add'>+		ctx-&gt;auth.mode = HASH_MODE_HASH;</div><div class='add'>+		/* start with a prepended ipad */</div><div class='add'>+		memcpy(rctx-&gt;hash_carry, ctx-&gt;ipad, blocksize);</div><div class='add'>+		rctx-&gt;hash_carry_len = blocksize;</div><div class='add'>+		rctx-&gt;total_todo += blocksize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_hmac_update(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	flow_log("ahash_hmac_update() nbytes:%u\n", req-&gt;nbytes);</div><div class='add'>+</div><div class='add'>+	if (!req-&gt;nbytes)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ahash_update(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_hmac_final(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	flow_log("ahash_hmac_final() nbytes:%u\n", req-&gt;nbytes);</div><div class='add'>+</div><div class='add'>+	return ahash_final(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_hmac_finup(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	flow_log("ahash_hmac_finupl() nbytes:%u\n", req-&gt;nbytes);</div><div class='add'>+</div><div class='add'>+	return ahash_finup(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_hmac_digest(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iproc_reqctx_s *rctx = ahash_request_ctx(req);</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_ahash_ctx(tfm);</div><div class='add'>+	unsigned int blocksize =</div><div class='add'>+			crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm));</div><div class='add'>+</div><div class='add'>+	flow_log("ahash_hmac_digest() nbytes:%u\n", req-&gt;nbytes);</div><div class='add'>+</div><div class='add'>+	/* Perform initialization and then call finup */</div><div class='add'>+	__ahash_init(req);</div><div class='add'>+</div><div class='add'>+	if (iproc_priv.spu.spu_type == SPU_TYPE_SPU2) {</div><div class='add'>+		/*</div><div class='add'>+		 * SPU2 supports full HMAC implementation in the</div><div class='add'>+		 * hardware, need not to generate IPAD, OPAD and</div><div class='add'>+		 * outer hash in software.</div><div class='add'>+		 * Only for hash key len &gt; hash block size, SPU2</div><div class='add'>+		 * expects to perform hashing on the key, shorten</div><div class='add'>+		 * it to digest size and feed it as hash key.</div><div class='add'>+		 */</div><div class='add'>+		rctx-&gt;is_sw_hmac = false;</div><div class='add'>+		ctx-&gt;auth.mode = HASH_MODE_HMAC;</div><div class='add'>+	} else {</div><div class='add'>+		rctx-&gt;is_sw_hmac = true;</div><div class='add'>+		ctx-&gt;auth.mode = HASH_MODE_HASH;</div><div class='add'>+		/* start with a prepended ipad */</div><div class='add'>+		memcpy(rctx-&gt;hash_carry, ctx-&gt;ipad, blocksize);</div><div class='add'>+		rctx-&gt;hash_carry_len = blocksize;</div><div class='add'>+		rctx-&gt;total_todo += blocksize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __ahash_finup(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* aead helpers */</div><div class='add'>+</div><div class='add'>+static int aead_need_fallback(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iproc_reqctx_s *rctx = aead_request_ctx(req);</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_aead_ctx(aead);</div><div class='add'>+	u32 payload_len;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SPU hardware cannot handle the AES-GCM/CCM case where plaintext</div><div class='add'>+	 * and AAD are both 0 bytes long. So use fallback in this case.</div><div class='add'>+	 */</div><div class='add'>+	if (((ctx-&gt;cipher.mode == CIPHER_MODE_GCM) ||</div><div class='add'>+	     (ctx-&gt;cipher.mode == CIPHER_MODE_CCM)) &amp;&amp;</div><div class='add'>+	    (req-&gt;assoclen == 0)) {</div><div class='add'>+		if ((rctx-&gt;is_encrypt &amp;&amp; (req-&gt;cryptlen == 0)) ||</div><div class='add'>+		    (!rctx-&gt;is_encrypt &amp;&amp; (req-&gt;cryptlen == ctx-&gt;digestsize))) {</div><div class='add'>+			flow_log("AES GCM/CCM needs fallback for 0 len req\n");</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* SPU-M hardware only supports CCM digest size of 8, 12, or 16 bytes */</div><div class='add'>+	if ((ctx-&gt;cipher.mode == CIPHER_MODE_CCM) &amp;&amp;</div><div class='add'>+	    (spu-&gt;spu_type == SPU_TYPE_SPUM) &amp;&amp;</div><div class='add'>+	    (ctx-&gt;digestsize != 8) &amp;&amp; (ctx-&gt;digestsize != 12) &amp;&amp;</div><div class='add'>+	    (ctx-&gt;digestsize != 16)) {</div><div class='add'>+		flow_log("%s() AES CCM needs fallbck for digest size %d\n",</div><div class='add'>+			 __func__, ctx-&gt;digestsize);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SPU-M on NSP has an issue where AES-CCM hash is not correct</div><div class='add'>+	 * when AAD size is 0</div><div class='add'>+	 */</div><div class='add'>+	if ((ctx-&gt;cipher.mode == CIPHER_MODE_CCM) &amp;&amp;</div><div class='add'>+	    (spu-&gt;spu_subtype == SPU_SUBTYPE_SPUM_NSP) &amp;&amp;</div><div class='add'>+	    (req-&gt;assoclen == 0)) {</div><div class='add'>+		flow_log("%s() AES_CCM needs fallback for 0 len AAD on NSP\n",</div><div class='add'>+			 __func__);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	payload_len = req-&gt;cryptlen;</div><div class='add'>+	if (spu-&gt;spu_type == SPU_TYPE_SPUM)</div><div class='add'>+		payload_len += req-&gt;assoclen;</div><div class='add'>+</div><div class='add'>+	flow_log("%s() payload len: %u\n", __func__, payload_len);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;max_payload == SPU_MAX_PAYLOAD_INF)</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return payload_len &gt; ctx-&gt;max_payload;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aead_complete(struct crypto_async_request *areq, int err)</div><div class='add'>+{</div><div class='add'>+	struct aead_request *req =</div><div class='add'>+	    container_of(areq, struct aead_request, base);</div><div class='add'>+	struct iproc_reqctx_s *rctx = aead_request_ctx(req);</div><div class='add'>+	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='add'>+</div><div class='add'>+	flow_log("%s() err:%d\n", __func__, err);</div><div class='add'>+</div><div class='add'>+	areq-&gt;tfm = crypto_aead_tfm(aead);</div><div class='add'>+</div><div class='add'>+	areq-&gt;complete = rctx-&gt;old_complete;</div><div class='add'>+	areq-&gt;data = rctx-&gt;old_data;</div><div class='add'>+</div><div class='add'>+	areq-&gt;complete(areq, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aead_do_fallback(struct aead_request *req, bool is_encrypt)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='add'>+	struct crypto_tfm *tfm = crypto_aead_tfm(aead);</div><div class='add'>+	struct iproc_reqctx_s *rctx = aead_request_ctx(req);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	int err;</div><div class='add'>+	u32 req_flags;</div><div class='add'>+</div><div class='add'>+	flow_log("%s() enc:%u\n", __func__, is_encrypt);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;fallback_cipher) {</div><div class='add'>+		/* Store the cipher tfm and then use the fallback tfm */</div><div class='add'>+		rctx-&gt;old_tfm = tfm;</div><div class='add'>+		aead_request_set_tfm(req, ctx-&gt;fallback_cipher);</div><div class='add'>+		/*</div><div class='add'>+		 * Save the callback and chain ourselves in, so we can restore</div><div class='add'>+		 * the tfm</div><div class='add'>+		 */</div><div class='add'>+		rctx-&gt;old_complete = req-&gt;base.complete;</div><div class='add'>+		rctx-&gt;old_data = req-&gt;base.data;</div><div class='add'>+		req_flags = aead_request_flags(req);</div><div class='add'>+		aead_request_set_callback(req, req_flags, aead_complete, req);</div><div class='add'>+		err = is_encrypt ? crypto_aead_encrypt(req) :</div><div class='add'>+		    crypto_aead_decrypt(req);</div><div class='add'>+</div><div class='add'>+		if (err == 0) {</div><div class='add'>+			/*</div><div class='add'>+			 * fallback was synchronous (did not return</div><div class='add'>+			 * -EINPROGRESS). So restore request state here.</div><div class='add'>+			 */</div><div class='add'>+			aead_request_set_callback(req, req_flags,</div><div class='add'>+						  rctx-&gt;old_complete, req);</div><div class='add'>+			req-&gt;base.data = rctx-&gt;old_data;</div><div class='add'>+			aead_request_set_tfm(req, aead);</div><div class='add'>+			flow_log("%s() fallback completed successfully\n\n",</div><div class='add'>+				 __func__);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aead_enqueue(struct aead_request *req, bool is_encrypt)</div><div class='add'>+{</div><div class='add'>+	struct iproc_reqctx_s *rctx = aead_request_ctx(req);</div><div class='add'>+	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_aead_ctx(aead);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	flow_log("%s() enc:%u\n", __func__, is_encrypt);</div><div class='add'>+</div><div class='add'>+	if (req-&gt;assoclen &gt; MAX_ASSOC_SIZE) {</div><div class='add'>+		pr_err</div><div class='add'>+		    ("%s() Error: associated data too long. (%u &gt; %u bytes)\n",</div><div class='add'>+		     __func__, req-&gt;assoclen, MAX_ASSOC_SIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rctx-&gt;gfp = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='add'>+		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='add'>+	rctx-&gt;parent = &amp;req-&gt;base;</div><div class='add'>+	rctx-&gt;is_encrypt = is_encrypt;</div><div class='add'>+	rctx-&gt;bd_suppress = false;</div><div class='add'>+	rctx-&gt;total_todo = req-&gt;cryptlen;</div><div class='add'>+	rctx-&gt;src_sent = 0;</div><div class='add'>+	rctx-&gt;total_sent = 0;</div><div class='add'>+	rctx-&gt;total_received = 0;</div><div class='add'>+	rctx-&gt;is_sw_hmac = false;</div><div class='add'>+	rctx-&gt;ctx = ctx;</div><div class='add'>+	memset(&amp;rctx-&gt;mb_mssg, 0, sizeof(struct brcm_message));</div><div class='add'>+</div><div class='add'>+	/* assoc data is at start of src sg */</div><div class='add'>+	rctx-&gt;assoc = req-&gt;src;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Init current position in src scatterlist to be after assoc data.</div><div class='add'>+	 * src_skip set to buffer offset where data begins. (Assoc data could</div><div class='add'>+	 * end in the middle of a buffer.)</div><div class='add'>+	 */</div><div class='add'>+	if (spu_sg_at_offset(req-&gt;src, req-&gt;assoclen, &amp;rctx-&gt;src_sg,</div><div class='add'>+			     &amp;rctx-&gt;src_skip) &lt; 0) {</div><div class='add'>+		pr_err("%s() Error: Unable to find start of src data\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rctx-&gt;src_nents = 0;</div><div class='add'>+	rctx-&gt;dst_nents = 0;</div><div class='add'>+	if (req-&gt;dst == req-&gt;src) {</div><div class='add'>+		rctx-&gt;dst_sg = rctx-&gt;src_sg;</div><div class='add'>+		rctx-&gt;dst_skip = rctx-&gt;src_skip;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Expect req-&gt;dst to have room for assoc data followed by</div><div class='add'>+		 * output data and ICV, if encrypt. So initialize dst_sg</div><div class='add'>+		 * to point beyond assoc len offset.</div><div class='add'>+		 */</div><div class='add'>+		if (spu_sg_at_offset(req-&gt;dst, req-&gt;assoclen, &amp;rctx-&gt;dst_sg,</div><div class='add'>+				     &amp;rctx-&gt;dst_skip) &lt; 0) {</div><div class='add'>+			pr_err("%s() Error: Unable to find start of dst data\n",</div><div class='add'>+			       __func__);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;cipher.mode == CIPHER_MODE_CBC ||</div><div class='add'>+	    ctx-&gt;cipher.mode == CIPHER_MODE_CTR ||</div><div class='add'>+	    ctx-&gt;cipher.mode == CIPHER_MODE_OFB ||</div><div class='add'>+	    ctx-&gt;cipher.mode == CIPHER_MODE_XTS ||</div><div class='add'>+	    ctx-&gt;cipher.mode == CIPHER_MODE_GCM) {</div><div class='add'>+		rctx-&gt;iv_ctr_len =</div><div class='add'>+			ctx-&gt;salt_len +</div><div class='add'>+			crypto_aead_ivsize(crypto_aead_reqtfm(req));</div><div class='add'>+	} else if (ctx-&gt;cipher.mode == CIPHER_MODE_CCM) {</div><div class='add'>+		rctx-&gt;iv_ctr_len = CCM_AES_IV_SIZE;</div><div class='add'>+	} else {</div><div class='add'>+		rctx-&gt;iv_ctr_len = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rctx-&gt;hash_carry_len = 0;</div><div class='add'>+</div><div class='add'>+	flow_log("  src sg: %p\n", req-&gt;src);</div><div class='add'>+	flow_log("  rctx-&gt;src_sg: %p, src_skip %u\n",</div><div class='add'>+		 rctx-&gt;src_sg, rctx-&gt;src_skip);</div><div class='add'>+	flow_log("  assoc:  %p, assoclen %u\n", rctx-&gt;assoc, req-&gt;assoclen);</div><div class='add'>+	flow_log("  dst sg: %p\n", req-&gt;dst);</div><div class='add'>+	flow_log("  rctx-&gt;dst_sg: %p, dst_skip %u\n",</div><div class='add'>+		 rctx-&gt;dst_sg, rctx-&gt;dst_skip);</div><div class='add'>+	flow_log("  iv_ctr_len:%u\n", rctx-&gt;iv_ctr_len);</div><div class='add'>+	flow_dump("  iv: ", req-&gt;iv, rctx-&gt;iv_ctr_len);</div><div class='add'>+	flow_log("  authkeylen:%u\n", ctx-&gt;authkeylen);</div><div class='add'>+	flow_log("  is_esp: %s\n", ctx-&gt;is_esp ? "yes" : "no");</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;max_payload == SPU_MAX_PAYLOAD_INF)</div><div class='add'>+		flow_log("  max_payload infinite");</div><div class='add'>+	else</div><div class='add'>+		flow_log("  max_payload: %u\n", ctx-&gt;max_payload);</div><div class='add'>+</div><div class='add'>+	if (unlikely(aead_need_fallback(req)))</div><div class='add'>+		return aead_do_fallback(req, is_encrypt);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do memory allocations for request after fallback check, because if we</div><div class='add'>+	 * do fallback, we won't call finish_req() to dealloc.</div><div class='add'>+	 */</div><div class='add'>+	if (rctx-&gt;iv_ctr_len) {</div><div class='add'>+		if (ctx-&gt;salt_len)</div><div class='add'>+			memcpy(rctx-&gt;msg_buf.iv_ctr + ctx-&gt;salt_offset,</div><div class='add'>+			       ctx-&gt;salt, ctx-&gt;salt_len);</div><div class='add'>+		memcpy(rctx-&gt;msg_buf.iv_ctr + ctx-&gt;salt_offset + ctx-&gt;salt_len,</div><div class='add'>+		       req-&gt;iv,</div><div class='add'>+		       rctx-&gt;iv_ctr_len - ctx-&gt;salt_len - ctx-&gt;salt_offset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rctx-&gt;chan_idx = select_channel();</div><div class='add'>+	err = handle_aead_req(rctx);</div><div class='add'>+	if (err != -EINPROGRESS)</div><div class='add'>+		/* synchronous result */</div><div class='add'>+		spu_chunk_cleanup(rctx);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aead_authenc_setkey(struct crypto_aead *cipher,</div><div class='add'>+			       const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_aead_ctx(cipher);</div><div class='add'>+	struct crypto_tfm *tfm = crypto_aead_tfm(cipher);</div><div class='add'>+	struct rtattr *rta = (void *)key;</div><div class='add'>+	struct crypto_authenc_key_param *param;</div><div class='add'>+	const u8 *origkey = key;</div><div class='add'>+	const unsigned int origkeylen = keylen;</div><div class='add'>+</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	flow_log("%s() aead:%p key:%p keylen:%u\n", __func__, cipher, key,</div><div class='add'>+		 keylen);</div><div class='add'>+	flow_dump("  key: ", key, keylen);</div><div class='add'>+</div><div class='add'>+	if (!RTA_OK(rta, keylen))</div><div class='add'>+		goto badkey;</div><div class='add'>+	if (rta-&gt;rta_type != CRYPTO_AUTHENC_KEYA_PARAM)</div><div class='add'>+		goto badkey;</div><div class='add'>+	if (RTA_PAYLOAD(rta) &lt; sizeof(*param))</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	param = RTA_DATA(rta);</div><div class='add'>+	ctx-&gt;enckeylen = be32_to_cpu(param-&gt;enckeylen);</div><div class='add'>+</div><div class='add'>+	key += RTA_ALIGN(rta-&gt;rta_len);</div><div class='add'>+	keylen -= RTA_ALIGN(rta-&gt;rta_len);</div><div class='add'>+</div><div class='add'>+	if (keylen &lt; ctx-&gt;enckeylen)</div><div class='add'>+		goto badkey;</div><div class='add'>+	if (ctx-&gt;enckeylen &gt; MAX_KEY_SIZE)</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;authkeylen = keylen - ctx-&gt;enckeylen;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;authkeylen &gt; MAX_KEY_SIZE)</div><div class='add'>+		goto badkey;</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;enckey, key + ctx-&gt;authkeylen, ctx-&gt;enckeylen);</div><div class='add'>+	/* May end up padding auth key. So make sure it's zeroed. */</div><div class='add'>+	memset(ctx-&gt;authkey, 0, sizeof(ctx-&gt;authkey));</div><div class='add'>+	memcpy(ctx-&gt;authkey, key, ctx-&gt;authkeylen);</div><div class='add'>+</div><div class='add'>+	switch (ctx-&gt;alg-&gt;cipher_info.alg) {</div><div class='add'>+	case CIPHER_ALG_DES:</div><div class='add'>+		if (ctx-&gt;enckeylen == DES_KEY_SIZE) {</div><div class='add'>+			u32 tmp[DES_EXPKEY_WORDS];</div><div class='add'>+			u32 flags = CRYPTO_TFM_RES_WEAK_KEY;</div><div class='add'>+</div><div class='add'>+			if (des_ekey(tmp, key) == 0) {</div><div class='add'>+				if (crypto_aead_get_flags(cipher) &amp;</div><div class='add'>+				    CRYPTO_TFM_REQ_WEAK_KEY) {</div><div class='add'>+					crypto_aead_set_flags(cipher, flags);</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ctx-&gt;cipher_type = CIPHER_TYPE_DES;</div><div class='add'>+		} else {</div><div class='add'>+			goto badkey;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_3DES:</div><div class='add'>+		if (ctx-&gt;enckeylen == (DES_KEY_SIZE * 3)) {</div><div class='add'>+			const u32 *K = (const u32 *)key;</div><div class='add'>+			u32 flags = CRYPTO_TFM_RES_BAD_KEY_SCHED;</div><div class='add'>+</div><div class='add'>+			if (!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||</div><div class='add'>+			    !((K[2] ^ K[4]) | (K[3] ^ K[5]))) {</div><div class='add'>+				crypto_aead_set_flags(cipher, flags);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ctx-&gt;cipher_type = CIPHER_TYPE_3DES;</div><div class='add'>+		} else {</div><div class='add'>+			crypto_aead_set_flags(cipher,</div><div class='add'>+					      CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_AES:</div><div class='add'>+		switch (ctx-&gt;enckeylen) {</div><div class='add'>+		case AES_KEYSIZE_128:</div><div class='add'>+			ctx-&gt;cipher_type = CIPHER_TYPE_AES128;</div><div class='add'>+			break;</div><div class='add'>+		case AES_KEYSIZE_192:</div><div class='add'>+			ctx-&gt;cipher_type = CIPHER_TYPE_AES192;</div><div class='add'>+			break;</div><div class='add'>+		case AES_KEYSIZE_256:</div><div class='add'>+			ctx-&gt;cipher_type = CIPHER_TYPE_AES256;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto badkey;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_RC4:</div><div class='add'>+		ctx-&gt;cipher_type = CIPHER_TYPE_INIT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("%s() Error: Unknown cipher alg\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flow_log("  enckeylen:%u authkeylen:%u\n", ctx-&gt;enckeylen,</div><div class='add'>+		 ctx-&gt;authkeylen);</div><div class='add'>+	flow_dump("  enc: ", ctx-&gt;enckey, ctx-&gt;enckeylen);</div><div class='add'>+	flow_dump("  auth: ", ctx-&gt;authkey, ctx-&gt;authkeylen);</div><div class='add'>+</div><div class='add'>+	/* setkey the fallback just in case we needto use it */</div><div class='add'>+	if (ctx-&gt;fallback_cipher) {</div><div class='add'>+		flow_log("  running fallback setkey()\n");</div><div class='add'>+</div><div class='add'>+		ctx-&gt;fallback_cipher-&gt;base.crt_flags &amp;= ~CRYPTO_TFM_REQ_MASK;</div><div class='add'>+		ctx-&gt;fallback_cipher-&gt;base.crt_flags |=</div><div class='add'>+		    tfm-&gt;crt_flags &amp; CRYPTO_TFM_REQ_MASK;</div><div class='add'>+		ret =</div><div class='add'>+		    crypto_aead_setkey(ctx-&gt;fallback_cipher, origkey,</div><div class='add'>+				       origkeylen);</div><div class='add'>+		if (ret) {</div><div class='add'>+			flow_log("  fallback setkey() returned:%d\n", ret);</div><div class='add'>+			tfm-&gt;crt_flags &amp;= ~CRYPTO_TFM_RES_MASK;</div><div class='add'>+			tfm-&gt;crt_flags |=</div><div class='add'>+			    (ctx-&gt;fallback_cipher-&gt;base.crt_flags &amp;</div><div class='add'>+			     CRYPTO_TFM_RES_MASK);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;spu_resp_hdr_len = spu-&gt;spu_response_hdr_len(ctx-&gt;authkeylen,</div><div class='add'>+							  ctx-&gt;enckeylen,</div><div class='add'>+							  false);</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;iproc_priv.setkey_cnt[SPU_OP_AEAD]);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+badkey:</div><div class='add'>+	ctx-&gt;enckeylen = 0;</div><div class='add'>+	ctx-&gt;authkeylen = 0;</div><div class='add'>+	ctx-&gt;digestsize = 0;</div><div class='add'>+</div><div class='add'>+	crypto_aead_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aead_gcm_ccm_setkey(struct crypto_aead *cipher,</div><div class='add'>+			       const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_aead_ctx(cipher);</div><div class='add'>+	struct crypto_tfm *tfm = crypto_aead_tfm(cipher);</div><div class='add'>+</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	flow_log("%s() keylen:%u\n", __func__, keylen);</div><div class='add'>+	flow_dump("  key: ", key, keylen);</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;is_esp)</div><div class='add'>+		ctx-&gt;digestsize = keylen;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;enckeylen = keylen;</div><div class='add'>+	ctx-&gt;authkeylen = 0;</div><div class='add'>+	memcpy(ctx-&gt;enckey, key, ctx-&gt;enckeylen);</div><div class='add'>+</div><div class='add'>+	switch (ctx-&gt;enckeylen) {</div><div class='add'>+	case AES_KEYSIZE_128:</div><div class='add'>+		ctx-&gt;cipher_type = CIPHER_TYPE_AES128;</div><div class='add'>+		break;</div><div class='add'>+	case AES_KEYSIZE_192:</div><div class='add'>+		ctx-&gt;cipher_type = CIPHER_TYPE_AES192;</div><div class='add'>+		break;</div><div class='add'>+	case AES_KEYSIZE_256:</div><div class='add'>+		ctx-&gt;cipher_type = CIPHER_TYPE_AES256;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto badkey;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flow_log("  enckeylen:%u authkeylen:%u\n", ctx-&gt;enckeylen,</div><div class='add'>+		 ctx-&gt;authkeylen);</div><div class='add'>+	flow_dump("  enc: ", ctx-&gt;enckey, ctx-&gt;enckeylen);</div><div class='add'>+	flow_dump("  auth: ", ctx-&gt;authkey, ctx-&gt;authkeylen);</div><div class='add'>+</div><div class='add'>+	/* setkey the fallback just in case we need to use it */</div><div class='add'>+	if (ctx-&gt;fallback_cipher) {</div><div class='add'>+		flow_log("  running fallback setkey()\n");</div><div class='add'>+</div><div class='add'>+		ctx-&gt;fallback_cipher-&gt;base.crt_flags &amp;= ~CRYPTO_TFM_REQ_MASK;</div><div class='add'>+		ctx-&gt;fallback_cipher-&gt;base.crt_flags |=</div><div class='add'>+		    tfm-&gt;crt_flags &amp; CRYPTO_TFM_REQ_MASK;</div><div class='add'>+		ret = crypto_aead_setkey(ctx-&gt;fallback_cipher, key,</div><div class='add'>+					 keylen + ctx-&gt;salt_len);</div><div class='add'>+		if (ret) {</div><div class='add'>+			flow_log("  fallback setkey() returned:%d\n", ret);</div><div class='add'>+			tfm-&gt;crt_flags &amp;= ~CRYPTO_TFM_RES_MASK;</div><div class='add'>+			tfm-&gt;crt_flags |=</div><div class='add'>+			    (ctx-&gt;fallback_cipher-&gt;base.crt_flags &amp;</div><div class='add'>+			     CRYPTO_TFM_RES_MASK);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;spu_resp_hdr_len = spu-&gt;spu_response_hdr_len(ctx-&gt;authkeylen,</div><div class='add'>+							  ctx-&gt;enckeylen,</div><div class='add'>+							  false);</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;iproc_priv.setkey_cnt[SPU_OP_AEAD]);</div><div class='add'>+</div><div class='add'>+	flow_log("  enckeylen:%u authkeylen:%u\n", ctx-&gt;enckeylen,</div><div class='add'>+		 ctx-&gt;authkeylen);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+badkey:</div><div class='add'>+	ctx-&gt;enckeylen = 0;</div><div class='add'>+	ctx-&gt;authkeylen = 0;</div><div class='add'>+	ctx-&gt;digestsize = 0;</div><div class='add'>+</div><div class='add'>+	crypto_aead_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * aead_gcm_esp_setkey() - setkey() operation for ESP variant of GCM AES.</div><div class='add'>+ * @cipher: AEAD structure</div><div class='add'>+ * @key:    Key followed by 4 bytes of salt</div><div class='add'>+ * @keylen: Length of key plus salt, in bytes</div><div class='add'>+ *</div><div class='add'>+ * Extracts salt from key and stores it to be prepended to IV on each request.</div><div class='add'>+ * Digest is always 16 bytes</div><div class='add'>+ *</div><div class='add'>+ * Return: Value from generic gcm setkey.</div><div class='add'>+ */</div><div class='add'>+static int aead_gcm_esp_setkey(struct crypto_aead *cipher,</div><div class='add'>+			       const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_aead_ctx(cipher);</div><div class='add'>+</div><div class='add'>+	flow_log("%s\n", __func__);</div><div class='add'>+	ctx-&gt;salt_len = GCM_ESP_SALT_SIZE;</div><div class='add'>+	ctx-&gt;salt_offset = GCM_ESP_SALT_OFFSET;</div><div class='add'>+	memcpy(ctx-&gt;salt, key + keylen - GCM_ESP_SALT_SIZE, GCM_ESP_SALT_SIZE);</div><div class='add'>+	keylen -= GCM_ESP_SALT_SIZE;</div><div class='add'>+	ctx-&gt;digestsize = GCM_ESP_DIGESTSIZE;</div><div class='add'>+	ctx-&gt;is_esp = true;</div><div class='add'>+	flow_dump("salt: ", ctx-&gt;salt, GCM_ESP_SALT_SIZE);</div><div class='add'>+</div><div class='add'>+	return aead_gcm_ccm_setkey(cipher, key, keylen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rfc4543_gcm_esp_setkey() - setkey operation for RFC4543 variant of GCM/GMAC.</div><div class='add'>+ * cipher: AEAD structure</div><div class='add'>+ * key:    Key followed by 4 bytes of salt</div><div class='add'>+ * keylen: Length of key plus salt, in bytes</div><div class='add'>+ *</div><div class='add'>+ * Extracts salt from key and stores it to be prepended to IV on each request.</div><div class='add'>+ * Digest is always 16 bytes</div><div class='add'>+ *</div><div class='add'>+ * Return: Value from generic gcm setkey.</div><div class='add'>+ */</div><div class='add'>+static int rfc4543_gcm_esp_setkey(struct crypto_aead *cipher,</div><div class='add'>+				  const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_aead_ctx(cipher);</div><div class='add'>+</div><div class='add'>+	flow_log("%s\n", __func__);</div><div class='add'>+	ctx-&gt;salt_len = GCM_ESP_SALT_SIZE;</div><div class='add'>+	ctx-&gt;salt_offset = GCM_ESP_SALT_OFFSET;</div><div class='add'>+	memcpy(ctx-&gt;salt, key + keylen - GCM_ESP_SALT_SIZE, GCM_ESP_SALT_SIZE);</div><div class='add'>+	keylen -= GCM_ESP_SALT_SIZE;</div><div class='add'>+	ctx-&gt;digestsize = GCM_ESP_DIGESTSIZE;</div><div class='add'>+	ctx-&gt;is_esp = true;</div><div class='add'>+	ctx-&gt;is_rfc4543 = true;</div><div class='add'>+	flow_dump("salt: ", ctx-&gt;salt, GCM_ESP_SALT_SIZE);</div><div class='add'>+</div><div class='add'>+	return aead_gcm_ccm_setkey(cipher, key, keylen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * aead_ccm_esp_setkey() - setkey() operation for ESP variant of CCM AES.</div><div class='add'>+ * @cipher: AEAD structure</div><div class='add'>+ * @key:    Key followed by 4 bytes of salt</div><div class='add'>+ * @keylen: Length of key plus salt, in bytes</div><div class='add'>+ *</div><div class='add'>+ * Extracts salt from key and stores it to be prepended to IV on each request.</div><div class='add'>+ * Digest is always 16 bytes</div><div class='add'>+ *</div><div class='add'>+ * Return: Value from generic ccm setkey.</div><div class='add'>+ */</div><div class='add'>+static int aead_ccm_esp_setkey(struct crypto_aead *cipher,</div><div class='add'>+			       const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_aead_ctx(cipher);</div><div class='add'>+</div><div class='add'>+	flow_log("%s\n", __func__);</div><div class='add'>+	ctx-&gt;salt_len = CCM_ESP_SALT_SIZE;</div><div class='add'>+	ctx-&gt;salt_offset = CCM_ESP_SALT_OFFSET;</div><div class='add'>+	memcpy(ctx-&gt;salt, key + keylen - CCM_ESP_SALT_SIZE, CCM_ESP_SALT_SIZE);</div><div class='add'>+	keylen -= CCM_ESP_SALT_SIZE;</div><div class='add'>+	ctx-&gt;is_esp = true;</div><div class='add'>+	flow_dump("salt: ", ctx-&gt;salt, CCM_ESP_SALT_SIZE);</div><div class='add'>+</div><div class='add'>+	return aead_gcm_ccm_setkey(cipher, key, keylen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aead_setauthsize(struct crypto_aead *cipher, unsigned int authsize)</div><div class='add'>+{</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_aead_ctx(cipher);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	flow_log("%s() authkeylen:%u authsize:%u\n",</div><div class='add'>+		 __func__, ctx-&gt;authkeylen, authsize);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;digestsize = authsize;</div><div class='add'>+</div><div class='add'>+	/* setkey the fallback just in case we needto use it */</div><div class='add'>+	if (ctx-&gt;fallback_cipher) {</div><div class='add'>+		flow_log("  running fallback setauth()\n");</div><div class='add'>+</div><div class='add'>+		ret = crypto_aead_setauthsize(ctx-&gt;fallback_cipher, authsize);</div><div class='add'>+		if (ret)</div><div class='add'>+			flow_log("  fallback setauth() returned:%d\n", ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aead_encrypt(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	flow_log("%s() cryptlen:%u %08x\n", __func__, req-&gt;cryptlen,</div><div class='add'>+		 req-&gt;cryptlen);</div><div class='add'>+	dump_sg(req-&gt;src, 0, req-&gt;cryptlen + req-&gt;assoclen);</div><div class='add'>+	flow_log("  assoc_len:%u\n", req-&gt;assoclen);</div><div class='add'>+</div><div class='add'>+	return aead_enqueue(req, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aead_decrypt(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	flow_log("%s() cryptlen:%u\n", __func__, req-&gt;cryptlen);</div><div class='add'>+	dump_sg(req-&gt;src, 0, req-&gt;cryptlen + req-&gt;assoclen);</div><div class='add'>+	flow_log("  assoc_len:%u\n", req-&gt;assoclen);</div><div class='add'>+</div><div class='add'>+	return aead_enqueue(req, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ==================== Supported Cipher Algorithms ==================== */</div><div class='add'>+</div><div class='add'>+static struct iproc_alg_s driver_algs[] = {</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "gcm(aes)",</div><div class='add'>+			.cra_driver_name = "gcm-aes-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_gcm_ccm_setkey,</div><div class='add'>+		 .ivsize = GCM_AES_IV_SIZE,</div><div class='add'>+		.maxauthsize = AES_BLOCK_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_GCM,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_AES,</div><div class='add'>+		       .mode = HASH_MODE_GCM,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "ccm(aes)",</div><div class='add'>+			.cra_driver_name = "ccm-aes-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_gcm_ccm_setkey,</div><div class='add'>+		 .ivsize = CCM_AES_IV_SIZE,</div><div class='add'>+		.maxauthsize = AES_BLOCK_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_CCM,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_AES,</div><div class='add'>+		       .mode = HASH_MODE_CCM,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "rfc4106(gcm(aes))",</div><div class='add'>+			.cra_driver_name = "gcm-aes-esp-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_gcm_esp_setkey,</div><div class='add'>+		 .ivsize = GCM_ESP_IV_SIZE,</div><div class='add'>+		 .maxauthsize = AES_BLOCK_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_GCM,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_AES,</div><div class='add'>+		       .mode = HASH_MODE_GCM,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "rfc4309(ccm(aes))",</div><div class='add'>+			.cra_driver_name = "ccm-aes-esp-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_ccm_esp_setkey,</div><div class='add'>+		 .ivsize = CCM_AES_IV_SIZE,</div><div class='add'>+		 .maxauthsize = AES_BLOCK_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_CCM,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_AES,</div><div class='add'>+		       .mode = HASH_MODE_CCM,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "rfc4543(gcm(aes))",</div><div class='add'>+			.cra_driver_name = "gmac-aes-esp-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = rfc4543_gcm_esp_setkey,</div><div class='add'>+		 .ivsize = GCM_ESP_IV_SIZE,</div><div class='add'>+		 .maxauthsize = AES_BLOCK_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_GCM,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_AES,</div><div class='add'>+		       .mode = HASH_MODE_GCM,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(md5),cbc(aes))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-md5-cbc-aes-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		.ivsize = AES_BLOCK_SIZE,</div><div class='add'>+		.maxauthsize = MD5_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_MD5,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha1),cbc(aes))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha1-cbc-aes-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = AES_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA1_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA1,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha256),cbc(aes))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha256-cbc-aes-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = AES_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA256_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA256,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(md5),cbc(des))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-md5-cbc-des-iproc",</div><div class='add'>+			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = MD5_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_MD5,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha1),cbc(des))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha1-cbc-des-iproc",</div><div class='add'>+			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA1_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA1,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha224),cbc(des))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha224-cbc-des-iproc",</div><div class='add'>+			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA224_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA224,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha256),cbc(des))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha256-cbc-des-iproc",</div><div class='add'>+			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA256_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA256,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha384),cbc(des))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha384-cbc-des-iproc",</div><div class='add'>+			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA384_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA384,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha512),cbc(des))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha512-cbc-des-iproc",</div><div class='add'>+			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA512_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA512,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(md5),cbc(des3_ede))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-md5-cbc-des3-iproc",</div><div class='add'>+			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = MD5_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_3DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_MD5,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha1),cbc(des3_ede))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha1-cbc-des3-iproc",</div><div class='add'>+			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA1_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_3DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA1,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha224),cbc(des3_ede))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha224-cbc-des3-iproc",</div><div class='add'>+			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA224_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_3DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA224,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha256),cbc(des3_ede))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha256-cbc-des3-iproc",</div><div class='add'>+			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA256_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_3DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA256,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha384),cbc(des3_ede))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha384-cbc-des3-iproc",</div><div class='add'>+			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA384_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_3DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA384,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+	 .alg.aead = {</div><div class='add'>+		 .base = {</div><div class='add'>+			.cra_name = "authenc(hmac(sha512),cbc(des3_ede))",</div><div class='add'>+			.cra_driver_name = "authenc-hmac-sha512-cbc-des3-iproc",</div><div class='add'>+			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.cra_flags = CRYPTO_ALG_NEED_FALLBACK | CRYPTO_ALG_ASYNC</div><div class='add'>+		 },</div><div class='add'>+		 .setkey = aead_authenc_setkey,</div><div class='add'>+		 .ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+		 .maxauthsize = SHA512_DIGEST_SIZE,</div><div class='add'>+	 },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_3DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA512,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 .auth_first = 0,</div><div class='add'>+	 },</div><div class='add'>+</div><div class='add'>+/* ABLKCIPHER algorithms. */</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "ecb(arc4)",</div><div class='add'>+			.cra_driver_name = "ecb-arc4-iproc",</div><div class='add'>+			.cra_blocksize = ARC4_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+					   .min_keysize = ARC4_MIN_KEY_SIZE,</div><div class='add'>+					   .max_keysize = ARC4_MAX_KEY_SIZE,</div><div class='add'>+					   .ivsize = 0,</div><div class='add'>+					}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_RC4,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "ofb(des)",</div><div class='add'>+			.cra_driver_name = "ofb-des-iproc",</div><div class='add'>+			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+					   .min_keysize = DES_KEY_SIZE,</div><div class='add'>+					   .max_keysize = DES_KEY_SIZE,</div><div class='add'>+					   .ivsize = DES_BLOCK_SIZE,</div><div class='add'>+					}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_DES,</div><div class='add'>+			 .mode = CIPHER_MODE_OFB,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "cbc(des)",</div><div class='add'>+			.cra_driver_name = "cbc-des-iproc",</div><div class='add'>+			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+					   .min_keysize = DES_KEY_SIZE,</div><div class='add'>+					   .max_keysize = DES_KEY_SIZE,</div><div class='add'>+					   .ivsize = DES_BLOCK_SIZE,</div><div class='add'>+					}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "ecb(des)",</div><div class='add'>+			.cra_driver_name = "ecb-des-iproc",</div><div class='add'>+			.cra_blocksize = DES_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+					   .min_keysize = DES_KEY_SIZE,</div><div class='add'>+					   .max_keysize = DES_KEY_SIZE,</div><div class='add'>+					   .ivsize = 0,</div><div class='add'>+					}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_DES,</div><div class='add'>+			 .mode = CIPHER_MODE_ECB,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "ofb(des3_ede)",</div><div class='add'>+			.cra_driver_name = "ofb-des3-iproc",</div><div class='add'>+			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+					   .min_keysize = DES3_EDE_KEY_SIZE,</div><div class='add'>+					   .max_keysize = DES3_EDE_KEY_SIZE,</div><div class='add'>+					   .ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+					}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_3DES,</div><div class='add'>+			 .mode = CIPHER_MODE_OFB,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "cbc(des3_ede)",</div><div class='add'>+			.cra_driver_name = "cbc-des3-iproc",</div><div class='add'>+			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+					   .min_keysize = DES3_EDE_KEY_SIZE,</div><div class='add'>+					   .max_keysize = DES3_EDE_KEY_SIZE,</div><div class='add'>+					   .ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+					}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_3DES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "ecb(des3_ede)",</div><div class='add'>+			.cra_driver_name = "ecb-des3-iproc",</div><div class='add'>+			.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+					   .min_keysize = DES3_EDE_KEY_SIZE,</div><div class='add'>+					   .max_keysize = DES3_EDE_KEY_SIZE,</div><div class='add'>+					   .ivsize = 0,</div><div class='add'>+					}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_3DES,</div><div class='add'>+			 .mode = CIPHER_MODE_ECB,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "ofb(aes)",</div><div class='add'>+			.cra_driver_name = "ofb-aes-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+					   .min_keysize = AES_MIN_KEY_SIZE,</div><div class='add'>+					   .max_keysize = AES_MAX_KEY_SIZE,</div><div class='add'>+					   .ivsize = AES_BLOCK_SIZE,</div><div class='add'>+					}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_OFB,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "cbc(aes)",</div><div class='add'>+			.cra_driver_name = "cbc-aes-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+					   .min_keysize = AES_MIN_KEY_SIZE,</div><div class='add'>+					   .max_keysize = AES_MAX_KEY_SIZE,</div><div class='add'>+					   .ivsize = AES_BLOCK_SIZE,</div><div class='add'>+					}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_CBC,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "ecb(aes)",</div><div class='add'>+			.cra_driver_name = "ecb-aes-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+					   .min_keysize = AES_MIN_KEY_SIZE,</div><div class='add'>+					   .max_keysize = AES_MAX_KEY_SIZE,</div><div class='add'>+					   .ivsize = 0,</div><div class='add'>+					}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_ECB,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "ctr(aes)",</div><div class='add'>+			.cra_driver_name = "ctr-aes-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+					   /* .geniv = "chainiv", */</div><div class='add'>+					   .min_keysize = AES_MIN_KEY_SIZE,</div><div class='add'>+					   .max_keysize = AES_MAX_KEY_SIZE,</div><div class='add'>+					   .ivsize = AES_BLOCK_SIZE,</div><div class='add'>+					}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_CTR,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_ABLKCIPHER,</div><div class='add'>+	 .alg.crypto = {</div><div class='add'>+			.cra_name = "xts(aes)",</div><div class='add'>+			.cra_driver_name = "xts-aes-iproc",</div><div class='add'>+			.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+			.cra_ablkcipher = {</div><div class='add'>+				.min_keysize = 2 * AES_MIN_KEY_SIZE,</div><div class='add'>+				.max_keysize = 2 * AES_MAX_KEY_SIZE,</div><div class='add'>+				.ivsize = AES_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_AES,</div><div class='add'>+			 .mode = CIPHER_MODE_XTS,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_NONE,</div><div class='add'>+		       .mode = HASH_MODE_NONE,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+</div><div class='add'>+/* AHASH algorithms. */</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = MD5_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "md5",</div><div class='add'>+				    .cra_driver_name = "md5-iproc",</div><div class='add'>+				    .cra_blocksize = MD5_BLOCK_WORDS * 4,</div><div class='add'>+				    .cra_flags = CRYPTO_ALG_TYPE_AHASH |</div><div class='add'>+					     CRYPTO_ALG_ASYNC,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_MD5,</div><div class='add'>+		       .mode = HASH_MODE_HASH,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = MD5_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "hmac(md5)",</div><div class='add'>+				    .cra_driver_name = "hmac-md5-iproc",</div><div class='add'>+				    .cra_blocksize = MD5_BLOCK_WORDS * 4,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_MD5,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA1_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "sha1",</div><div class='add'>+				    .cra_driver_name = "sha1-iproc",</div><div class='add'>+				    .cra_blocksize = SHA1_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA1,</div><div class='add'>+		       .mode = HASH_MODE_HASH,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA1_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "hmac(sha1)",</div><div class='add'>+				    .cra_driver_name = "hmac-sha1-iproc",</div><div class='add'>+				    .cra_blocksize = SHA1_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA1,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+			.halg.digestsize = SHA224_DIGEST_SIZE,</div><div class='add'>+			.halg.base = {</div><div class='add'>+				    .cra_name = "sha224",</div><div class='add'>+				    .cra_driver_name = "sha224-iproc",</div><div class='add'>+				    .cra_blocksize = SHA224_BLOCK_SIZE,</div><div class='add'>+			}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA224,</div><div class='add'>+		       .mode = HASH_MODE_HASH,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA224_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "hmac(sha224)",</div><div class='add'>+				    .cra_driver_name = "hmac-sha224-iproc",</div><div class='add'>+				    .cra_blocksize = SHA224_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA224,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA256_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "sha256",</div><div class='add'>+				    .cra_driver_name = "sha256-iproc",</div><div class='add'>+				    .cra_blocksize = SHA256_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA256,</div><div class='add'>+		       .mode = HASH_MODE_HASH,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA256_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "hmac(sha256)",</div><div class='add'>+				    .cra_driver_name = "hmac-sha256-iproc",</div><div class='add'>+				    .cra_blocksize = SHA256_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA256,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA384_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "sha384",</div><div class='add'>+				    .cra_driver_name = "sha384-iproc",</div><div class='add'>+				    .cra_blocksize = SHA384_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA384,</div><div class='add'>+		       .mode = HASH_MODE_HASH,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA384_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "hmac(sha384)",</div><div class='add'>+				    .cra_driver_name = "hmac-sha384-iproc",</div><div class='add'>+				    .cra_blocksize = SHA384_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA384,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA512_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "sha512",</div><div class='add'>+				    .cra_driver_name = "sha512-iproc",</div><div class='add'>+				    .cra_blocksize = SHA512_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA512,</div><div class='add'>+		       .mode = HASH_MODE_HASH,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA512_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "hmac(sha512)",</div><div class='add'>+				    .cra_driver_name = "hmac-sha512-iproc",</div><div class='add'>+				    .cra_blocksize = SHA512_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA512,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA3_224_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "sha3-224",</div><div class='add'>+				    .cra_driver_name = "sha3-224-iproc",</div><div class='add'>+				    .cra_blocksize = SHA3_224_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA3_224,</div><div class='add'>+		       .mode = HASH_MODE_HASH,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA3_224_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "hmac(sha3-224)",</div><div class='add'>+				    .cra_driver_name = "hmac-sha3-224-iproc",</div><div class='add'>+				    .cra_blocksize = SHA3_224_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA3_224,</div><div class='add'>+		       .mode = HASH_MODE_HMAC</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA3_256_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "sha3-256",</div><div class='add'>+				    .cra_driver_name = "sha3-256-iproc",</div><div class='add'>+				    .cra_blocksize = SHA3_256_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA3_256,</div><div class='add'>+		       .mode = HASH_MODE_HASH,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA3_256_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "hmac(sha3-256)",</div><div class='add'>+				    .cra_driver_name = "hmac-sha3-256-iproc",</div><div class='add'>+				    .cra_blocksize = SHA3_256_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA3_256,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA3_384_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "sha3-384",</div><div class='add'>+				    .cra_driver_name = "sha3-384-iproc",</div><div class='add'>+				    .cra_blocksize = SHA3_224_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA3_384,</div><div class='add'>+		       .mode = HASH_MODE_HASH,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA3_384_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "hmac(sha3-384)",</div><div class='add'>+				    .cra_driver_name = "hmac-sha3-384-iproc",</div><div class='add'>+				    .cra_blocksize = SHA3_384_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA3_384,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA3_512_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "sha3-512",</div><div class='add'>+				    .cra_driver_name = "sha3-512-iproc",</div><div class='add'>+				    .cra_blocksize = SHA3_512_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA3_512,</div><div class='add'>+		       .mode = HASH_MODE_HASH,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = SHA3_512_DIGEST_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "hmac(sha3-512)",</div><div class='add'>+				    .cra_driver_name = "hmac-sha3-512-iproc",</div><div class='add'>+				    .cra_blocksize = SHA3_512_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_SHA3_512,</div><div class='add'>+		       .mode = HASH_MODE_HMAC,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = AES_BLOCK_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "xcbc(aes)",</div><div class='add'>+				    .cra_driver_name = "xcbc-aes-iproc",</div><div class='add'>+				    .cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_AES,</div><div class='add'>+		       .mode = HASH_MODE_XCBC,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='add'>+	 .type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+	 .alg.hash = {</div><div class='add'>+		      .halg.digestsize = AES_BLOCK_SIZE,</div><div class='add'>+		      .halg.base = {</div><div class='add'>+				    .cra_name = "cmac(aes)",</div><div class='add'>+				    .cra_driver_name = "cmac-aes-iproc",</div><div class='add'>+				    .cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+				}</div><div class='add'>+		      },</div><div class='add'>+	 .cipher_info = {</div><div class='add'>+			 .alg = CIPHER_ALG_NONE,</div><div class='add'>+			 .mode = CIPHER_MODE_NONE,</div><div class='add'>+			 },</div><div class='add'>+	 .auth_info = {</div><div class='add'>+		       .alg = HASH_ALG_AES,</div><div class='add'>+		       .mode = HASH_MODE_CMAC,</div><div class='add'>+		       },</div><div class='add'>+	 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int generic_cra_init(struct crypto_tfm *tfm,</div><div class='add'>+			    struct iproc_alg_s *cipher_alg)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	unsigned int blocksize = crypto_tfm_alg_blocksize(tfm);</div><div class='add'>+</div><div class='add'>+	flow_log("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;alg = cipher_alg;</div><div class='add'>+	ctx-&gt;cipher = cipher_alg-&gt;cipher_info;</div><div class='add'>+	ctx-&gt;auth = cipher_alg-&gt;auth_info;</div><div class='add'>+	ctx-&gt;auth_first = cipher_alg-&gt;auth_first;</div><div class='add'>+	ctx-&gt;max_payload = spu-&gt;spu_ctx_max_payload(ctx-&gt;cipher.alg,</div><div class='add'>+						    ctx-&gt;cipher.mode,</div><div class='add'>+						    blocksize);</div><div class='add'>+	ctx-&gt;fallback_cipher = NULL;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;enckeylen = 0;</div><div class='add'>+	ctx-&gt;authkeylen = 0;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;iproc_priv.stream_count);</div><div class='add'>+	atomic_inc(&amp;iproc_priv.session_count);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ablkcipher_cra_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct crypto_alg *alg = tfm-&gt;__crt_alg;</div><div class='add'>+	struct iproc_alg_s *cipher_alg;</div><div class='add'>+</div><div class='add'>+	flow_log("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	tfm-&gt;crt_ablkcipher.reqsize = sizeof(struct iproc_reqctx_s);</div><div class='add'>+</div><div class='add'>+	cipher_alg = container_of(alg, struct iproc_alg_s, alg.crypto);</div><div class='add'>+	return generic_cra_init(tfm, cipher_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_cra_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct crypto_alg *alg = tfm-&gt;__crt_alg;</div><div class='add'>+	struct iproc_alg_s *cipher_alg;</div><div class='add'>+</div><div class='add'>+	cipher_alg = container_of(__crypto_ahash_alg(alg), struct iproc_alg_s,</div><div class='add'>+				  alg.hash);</div><div class='add'>+</div><div class='add'>+	err = generic_cra_init(tfm, cipher_alg);</div><div class='add'>+	flow_log("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * export state size has to be &lt; 512 bytes. So don't include msg bufs</div><div class='add'>+	 * in state size.</div><div class='add'>+	 */</div><div class='add'>+	crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),</div><div class='add'>+				 sizeof(struct iproc_reqctx_s));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aead_cra_init(struct crypto_aead *aead)</div><div class='add'>+{</div><div class='add'>+	struct crypto_tfm *tfm = crypto_aead_tfm(aead);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct crypto_alg *alg = tfm-&gt;__crt_alg;</div><div class='add'>+	struct aead_alg *aalg = container_of(alg, struct aead_alg, base);</div><div class='add'>+	struct iproc_alg_s *cipher_alg = container_of(aalg, struct iproc_alg_s,</div><div class='add'>+						      alg.aead);</div><div class='add'>+</div><div class='add'>+	int err = generic_cra_init(tfm, cipher_alg);</div><div class='add'>+</div><div class='add'>+	flow_log("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	crypto_aead_set_reqsize(aead, sizeof(struct iproc_reqctx_s));</div><div class='add'>+	ctx-&gt;is_esp = false;</div><div class='add'>+	ctx-&gt;salt_len = 0;</div><div class='add'>+	ctx-&gt;salt_offset = 0;</div><div class='add'>+</div><div class='add'>+	/* random first IV */</div><div class='add'>+	get_random_bytes(ctx-&gt;iv, MAX_IV_SIZE);</div><div class='add'>+	flow_dump("  iv: ", ctx-&gt;iv, MAX_IV_SIZE);</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		if (alg-&gt;cra_flags &amp; CRYPTO_ALG_NEED_FALLBACK) {</div><div class='add'>+			flow_log("%s() creating fallback cipher\n", __func__);</div><div class='add'>+</div><div class='add'>+			ctx-&gt;fallback_cipher =</div><div class='add'>+			    crypto_alloc_aead(alg-&gt;cra_name, 0,</div><div class='add'>+					      CRYPTO_ALG_ASYNC |</div><div class='add'>+					      CRYPTO_ALG_NEED_FALLBACK);</div><div class='add'>+			if (IS_ERR(ctx-&gt;fallback_cipher)) {</div><div class='add'>+				pr_err("%s() Error: failed to allocate fallback for %s\n",</div><div class='add'>+				       __func__, alg-&gt;cra_name);</div><div class='add'>+				return PTR_ERR(ctx-&gt;fallback_cipher);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void generic_cra_exit(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	atomic_dec(&amp;iproc_priv.session_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aead_cra_exit(struct crypto_aead *aead)</div><div class='add'>+{</div><div class='add'>+	struct crypto_tfm *tfm = crypto_aead_tfm(aead);</div><div class='add'>+	struct iproc_ctx_s *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	generic_cra_exit(tfm);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;fallback_cipher) {</div><div class='add'>+		crypto_free_aead(ctx-&gt;fallback_cipher);</div><div class='add'>+		ctx-&gt;fallback_cipher = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_functions_register() - Specify hardware-specific SPU functions based on</div><div class='add'>+ * SPU type read from device tree.</div><div class='add'>+ * @dev:	device structure</div><div class='add'>+ * @spu_type:	SPU hardware generation</div><div class='add'>+ * @spu_subtype: SPU hardware version</div><div class='add'>+ */</div><div class='add'>+static void spu_functions_register(struct device *dev,</div><div class='add'>+				   enum spu_spu_type spu_type,</div><div class='add'>+				   enum spu_spu_subtype spu_subtype)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+</div><div class='add'>+	if (spu_type == SPU_TYPE_SPUM) {</div><div class='add'>+		dev_dbg(dev, "Registering SPUM functions");</div><div class='add'>+		spu-&gt;spu_dump_msg_hdr = spum_dump_msg_hdr;</div><div class='add'>+		spu-&gt;spu_payload_length = spum_payload_length;</div><div class='add'>+		spu-&gt;spu_response_hdr_len = spum_response_hdr_len;</div><div class='add'>+		spu-&gt;spu_hash_pad_len = spum_hash_pad_len;</div><div class='add'>+		spu-&gt;spu_gcm_ccm_pad_len = spum_gcm_ccm_pad_len;</div><div class='add'>+		spu-&gt;spu_assoc_resp_len = spum_assoc_resp_len;</div><div class='add'>+		spu-&gt;spu_aead_ivlen = spum_aead_ivlen;</div><div class='add'>+		spu-&gt;spu_hash_type = spum_hash_type;</div><div class='add'>+		spu-&gt;spu_digest_size = spum_digest_size;</div><div class='add'>+		spu-&gt;spu_create_request = spum_create_request;</div><div class='add'>+		spu-&gt;spu_cipher_req_init = spum_cipher_req_init;</div><div class='add'>+		spu-&gt;spu_cipher_req_finish = spum_cipher_req_finish;</div><div class='add'>+		spu-&gt;spu_request_pad = spum_request_pad;</div><div class='add'>+		spu-&gt;spu_tx_status_len = spum_tx_status_len;</div><div class='add'>+		spu-&gt;spu_rx_status_len = spum_rx_status_len;</div><div class='add'>+		spu-&gt;spu_status_process = spum_status_process;</div><div class='add'>+		spu-&gt;spu_xts_tweak_in_payload = spum_xts_tweak_in_payload;</div><div class='add'>+		spu-&gt;spu_ccm_update_iv = spum_ccm_update_iv;</div><div class='add'>+		spu-&gt;spu_wordalign_padlen = spum_wordalign_padlen;</div><div class='add'>+		if (spu_subtype == SPU_SUBTYPE_SPUM_NS2)</div><div class='add'>+			spu-&gt;spu_ctx_max_payload = spum_ns2_ctx_max_payload;</div><div class='add'>+		else</div><div class='add'>+			spu-&gt;spu_ctx_max_payload = spum_nsp_ctx_max_payload;</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(dev, "Registering SPU2 functions");</div><div class='add'>+		spu-&gt;spu_dump_msg_hdr = spu2_dump_msg_hdr;</div><div class='add'>+		spu-&gt;spu_ctx_max_payload = spu2_ctx_max_payload;</div><div class='add'>+		spu-&gt;spu_payload_length = spu2_payload_length;</div><div class='add'>+		spu-&gt;spu_response_hdr_len = spu2_response_hdr_len;</div><div class='add'>+		spu-&gt;spu_hash_pad_len = spu2_hash_pad_len;</div><div class='add'>+		spu-&gt;spu_gcm_ccm_pad_len = spu2_gcm_ccm_pad_len;</div><div class='add'>+		spu-&gt;spu_assoc_resp_len = spu2_assoc_resp_len;</div><div class='add'>+		spu-&gt;spu_aead_ivlen = spu2_aead_ivlen;</div><div class='add'>+		spu-&gt;spu_hash_type = spu2_hash_type;</div><div class='add'>+		spu-&gt;spu_digest_size = spu2_digest_size;</div><div class='add'>+		spu-&gt;spu_create_request = spu2_create_request;</div><div class='add'>+		spu-&gt;spu_cipher_req_init = spu2_cipher_req_init;</div><div class='add'>+		spu-&gt;spu_cipher_req_finish = spu2_cipher_req_finish;</div><div class='add'>+		spu-&gt;spu_request_pad = spu2_request_pad;</div><div class='add'>+		spu-&gt;spu_tx_status_len = spu2_tx_status_len;</div><div class='add'>+		spu-&gt;spu_rx_status_len = spu2_rx_status_len;</div><div class='add'>+		spu-&gt;spu_status_process = spu2_status_process;</div><div class='add'>+		spu-&gt;spu_xts_tweak_in_payload = spu2_xts_tweak_in_payload;</div><div class='add'>+		spu-&gt;spu_ccm_update_iv = spu2_ccm_update_iv;</div><div class='add'>+		spu-&gt;spu_wordalign_padlen = spu2_wordalign_padlen;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_mb_init() - Initialize mailbox client. Request ownership of a mailbox</div><div class='add'>+ * channel for the SPU being probed.</div><div class='add'>+ * @dev:  SPU driver device structure</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if successful</div><div class='add'>+ *	   &lt; 0 otherwise</div><div class='add'>+ */</div><div class='add'>+static int spu_mb_init(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mbox_client *mcl = &amp;iproc_priv.mcl[iproc_priv.spu.num_spu];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mcl-&gt;dev = dev;</div><div class='add'>+	mcl-&gt;tx_block = false;</div><div class='add'>+	mcl-&gt;tx_tout = 0;</div><div class='add'>+	mcl-&gt;knows_txdone = false;</div><div class='add'>+	mcl-&gt;rx_callback = spu_rx_callback;</div><div class='add'>+	mcl-&gt;tx_done = NULL;</div><div class='add'>+</div><div class='add'>+	iproc_priv.mbox[iproc_priv.spu.num_spu] =</div><div class='add'>+			mbox_request_channel(mcl, 0);</div><div class='add'>+	if (IS_ERR(iproc_priv.mbox[iproc_priv.spu.num_spu])) {</div><div class='add'>+		err = (int)PTR_ERR(iproc_priv.mbox[iproc_priv.spu.num_spu]);</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"Mbox channel %d request failed with err %d",</div><div class='add'>+			iproc_priv.spu.num_spu, err);</div><div class='add'>+		iproc_priv.mbox[iproc_priv.spu.num_spu] = NULL;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void spu_mb_release(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; iproc_priv.spu.num_spu; i++)</div><div class='add'>+		mbox_free_channel(iproc_priv.mbox[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void spu_counters_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;iproc_priv.session_count, 0);</div><div class='add'>+	atomic_set(&amp;iproc_priv.stream_count, 0);</div><div class='add'>+	atomic_set(&amp;iproc_priv.next_chan, (int)iproc_priv.spu.num_spu);</div><div class='add'>+	atomic64_set(&amp;iproc_priv.bytes_in, 0);</div><div class='add'>+	atomic64_set(&amp;iproc_priv.bytes_out, 0);</div><div class='add'>+	for (i = 0; i &lt; SPU_OP_NUM; i++) {</div><div class='add'>+		atomic_set(&amp;iproc_priv.op_counts[i], 0);</div><div class='add'>+		atomic_set(&amp;iproc_priv.setkey_cnt[i], 0);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; CIPHER_ALG_LAST; i++)</div><div class='add'>+		for (j = 0; j &lt; CIPHER_MODE_LAST; j++)</div><div class='add'>+			atomic_set(&amp;iproc_priv.cipher_cnt[i][j], 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HASH_ALG_LAST; i++) {</div><div class='add'>+		atomic_set(&amp;iproc_priv.hash_cnt[i], 0);</div><div class='add'>+		atomic_set(&amp;iproc_priv.hmac_cnt[i], 0);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; AEAD_TYPE_LAST; i++)</div><div class='add'>+		atomic_set(&amp;iproc_priv.aead_cnt[i], 0);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;iproc_priv.mb_no_spc, 0);</div><div class='add'>+	atomic_set(&amp;iproc_priv.mb_send_fail, 0);</div><div class='add'>+	atomic_set(&amp;iproc_priv.bad_icv, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spu_register_ablkcipher(struct iproc_alg_s *driver_alg)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct crypto_alg *crypto = &amp;driver_alg-&gt;alg.crypto;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* SPU2 does not support RC4 */</div><div class='add'>+	if ((driver_alg-&gt;cipher_info.alg == CIPHER_ALG_RC4) &amp;&amp;</div><div class='add'>+	    (spu-&gt;spu_type == SPU_TYPE_SPU2))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	crypto-&gt;cra_module = THIS_MODULE;</div><div class='add'>+	crypto-&gt;cra_priority = cipher_pri;</div><div class='add'>+	crypto-&gt;cra_alignmask = 0;</div><div class='add'>+	crypto-&gt;cra_ctxsize = sizeof(struct iproc_ctx_s);</div><div class='add'>+	INIT_LIST_HEAD(&amp;crypto-&gt;cra_list);</div><div class='add'>+</div><div class='add'>+	crypto-&gt;cra_init = ablkcipher_cra_init;</div><div class='add'>+	crypto-&gt;cra_exit = generic_cra_exit;</div><div class='add'>+	crypto-&gt;cra_type = &amp;crypto_ablkcipher_type;</div><div class='add'>+	crypto-&gt;cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC |</div><div class='add'>+				CRYPTO_ALG_KERN_DRIVER_ONLY;</div><div class='add'>+</div><div class='add'>+	crypto-&gt;cra_ablkcipher.setkey = ablkcipher_setkey;</div><div class='add'>+	crypto-&gt;cra_ablkcipher.encrypt = ablkcipher_encrypt;</div><div class='add'>+	crypto-&gt;cra_ablkcipher.decrypt = ablkcipher_decrypt;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_alg(crypto);</div><div class='add'>+	/* Mark alg as having been registered, if successful */</div><div class='add'>+	if (err == 0)</div><div class='add'>+		driver_alg-&gt;registered = true;</div><div class='add'>+	pr_debug("  registered ablkcipher %s\n", crypto-&gt;cra_driver_name);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spu_register_ahash(struct iproc_alg_s *driver_alg)</div><div class='add'>+{</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct ahash_alg *hash = &amp;driver_alg-&gt;alg.hash;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* AES-XCBC is the only AES hash type currently supported on SPU-M */</div><div class='add'>+	if ((driver_alg-&gt;auth_info.alg == HASH_ALG_AES) &amp;&amp;</div><div class='add'>+	    (driver_alg-&gt;auth_info.mode != HASH_MODE_XCBC) &amp;&amp;</div><div class='add'>+	    (spu-&gt;spu_type == SPU_TYPE_SPUM))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* SHA3 algorithm variants are not registered for SPU-M or SPU2. */</div><div class='add'>+	if ((driver_alg-&gt;auth_info.alg &gt;= HASH_ALG_SHA3_224) &amp;&amp;</div><div class='add'>+	    (spu-&gt;spu_subtype != SPU_SUBTYPE_SPU2_V2))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hash-&gt;halg.base.cra_module = THIS_MODULE;</div><div class='add'>+	hash-&gt;halg.base.cra_priority = hash_pri;</div><div class='add'>+	hash-&gt;halg.base.cra_alignmask = 0;</div><div class='add'>+	hash-&gt;halg.base.cra_ctxsize = sizeof(struct iproc_ctx_s);</div><div class='add'>+	hash-&gt;halg.base.cra_init = ahash_cra_init;</div><div class='add'>+	hash-&gt;halg.base.cra_exit = generic_cra_exit;</div><div class='add'>+	hash-&gt;halg.base.cra_type = &amp;crypto_ahash_type;</div><div class='add'>+	hash-&gt;halg.base.cra_flags = CRYPTO_ALG_TYPE_AHASH | CRYPTO_ALG_ASYNC;</div><div class='add'>+	hash-&gt;halg.statesize = sizeof(struct spu_hash_export_s);</div><div class='add'>+</div><div class='add'>+	if (driver_alg-&gt;auth_info.mode != HASH_MODE_HMAC) {</div><div class='add'>+		hash-&gt;setkey = ahash_setkey;</div><div class='add'>+		hash-&gt;init = ahash_init;</div><div class='add'>+		hash-&gt;update = ahash_update;</div><div class='add'>+		hash-&gt;final = ahash_final;</div><div class='add'>+		hash-&gt;finup = ahash_finup;</div><div class='add'>+		hash-&gt;digest = ahash_digest;</div><div class='add'>+	} else {</div><div class='add'>+		hash-&gt;setkey = ahash_hmac_setkey;</div><div class='add'>+		hash-&gt;init = ahash_hmac_init;</div><div class='add'>+		hash-&gt;update = ahash_hmac_update;</div><div class='add'>+		hash-&gt;final = ahash_hmac_final;</div><div class='add'>+		hash-&gt;finup = ahash_hmac_finup;</div><div class='add'>+		hash-&gt;digest = ahash_hmac_digest;</div><div class='add'>+	}</div><div class='add'>+	hash-&gt;export = ahash_export;</div><div class='add'>+	hash-&gt;import = ahash_import;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_ahash(hash);</div><div class='add'>+	/* Mark alg as having been registered, if successful */</div><div class='add'>+	if (err == 0)</div><div class='add'>+		driver_alg-&gt;registered = true;</div><div class='add'>+	pr_debug("  registered ahash %s\n",</div><div class='add'>+		 hash-&gt;halg.base.cra_driver_name);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spu_register_aead(struct iproc_alg_s *driver_alg)</div><div class='add'>+{</div><div class='add'>+	struct aead_alg *aead = &amp;driver_alg-&gt;alg.aead;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	aead-&gt;base.cra_module = THIS_MODULE;</div><div class='add'>+	aead-&gt;base.cra_priority = aead_pri;</div><div class='add'>+	aead-&gt;base.cra_alignmask = 0;</div><div class='add'>+	aead-&gt;base.cra_ctxsize = sizeof(struct iproc_ctx_s);</div><div class='add'>+	INIT_LIST_HEAD(&amp;aead-&gt;base.cra_list);</div><div class='add'>+</div><div class='add'>+	aead-&gt;base.cra_flags |= CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC;</div><div class='add'>+	/* setkey set in alg initialization */</div><div class='add'>+	aead-&gt;setauthsize = aead_setauthsize;</div><div class='add'>+	aead-&gt;encrypt = aead_encrypt;</div><div class='add'>+	aead-&gt;decrypt = aead_decrypt;</div><div class='add'>+	aead-&gt;init = aead_cra_init;</div><div class='add'>+	aead-&gt;exit = aead_cra_exit;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_aead(aead);</div><div class='add'>+	/* Mark alg as having been registered, if successful */</div><div class='add'>+	if (err == 0)</div><div class='add'>+		driver_alg-&gt;registered = true;</div><div class='add'>+	pr_debug("  registered aead %s\n", aead-&gt;base.cra_driver_name);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* register crypto algorithms the device supports */</div><div class='add'>+static int spu_algs_register(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(driver_algs); i++) {</div><div class='add'>+		switch (driver_algs[i].type) {</div><div class='add'>+		case CRYPTO_ALG_TYPE_ABLKCIPHER:</div><div class='add'>+			err = spu_register_ablkcipher(&amp;driver_algs[i]);</div><div class='add'>+			break;</div><div class='add'>+		case CRYPTO_ALG_TYPE_AHASH:</div><div class='add'>+			err = spu_register_ahash(&amp;driver_algs[i]);</div><div class='add'>+			break;</div><div class='add'>+		case CRYPTO_ALG_TYPE_AEAD:</div><div class='add'>+			err = spu_register_aead(&amp;driver_algs[i]);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(dev,</div><div class='add'>+				"iproc-crypto: unknown alg type: %d",</div><div class='add'>+				driver_algs[i].type);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "alg registration failed with error %d\n",</div><div class='add'>+				err);</div><div class='add'>+			goto err_algs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_algs:</div><div class='add'>+	for (j = 0; j &lt; i; j++) {</div><div class='add'>+		/* Skip any algorithm not registered */</div><div class='add'>+		if (!driver_algs[j].registered)</div><div class='add'>+			continue;</div><div class='add'>+		switch (driver_algs[j].type) {</div><div class='add'>+		case CRYPTO_ALG_TYPE_ABLKCIPHER:</div><div class='add'>+			crypto_unregister_alg(&amp;driver_algs[j].alg.crypto);</div><div class='add'>+			driver_algs[j].registered = false;</div><div class='add'>+			break;</div><div class='add'>+		case CRYPTO_ALG_TYPE_AHASH:</div><div class='add'>+			crypto_unregister_ahash(&amp;driver_algs[j].alg.hash);</div><div class='add'>+			driver_algs[j].registered = false;</div><div class='add'>+			break;</div><div class='add'>+		case CRYPTO_ALG_TYPE_AEAD:</div><div class='add'>+			crypto_unregister_aead(&amp;driver_algs[j].alg.aead);</div><div class='add'>+			driver_algs[j].registered = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ==================== Kernel Platform API ==================== */</div><div class='add'>+</div><div class='add'>+static struct spu_type_subtype spum_ns2_types = {</div><div class='add'>+	SPU_TYPE_SPUM, SPU_SUBTYPE_SPUM_NS2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spu_type_subtype spum_nsp_types = {</div><div class='add'>+	SPU_TYPE_SPUM, SPU_SUBTYPE_SPUM_NSP</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spu_type_subtype spu2_types = {</div><div class='add'>+	SPU_TYPE_SPU2, SPU_SUBTYPE_SPU2_V1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spu_type_subtype spu2_v2_types = {</div><div class='add'>+	SPU_TYPE_SPU2, SPU_SUBTYPE_SPU2_V2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id bcm_spu_dt_ids[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "brcm,spum-crypto",</div><div class='add'>+		.data = &amp;spum_ns2_types,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "brcm,spum-nsp-crypto",</div><div class='add'>+		.data = &amp;spum_nsp_types,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "brcm,spu2-crypto",</div><div class='add'>+		.data = &amp;spu2_types,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "brcm,spu2-v2-crypto",</div><div class='add'>+		.data = &amp;spu2_v2_types,</div><div class='add'>+	},</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, bcm_spu_dt_ids);</div><div class='add'>+</div><div class='add'>+static int spu_dt_read(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	struct resource *spu_ctrl_regs;</div><div class='add'>+	const struct of_device_id *match;</div><div class='add'>+	const struct spu_type_subtype *matched_spu_type;</div><div class='add'>+	void __iomem *spu_reg_vbase[MAX_SPUS];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	match = of_match_device(of_match_ptr(bcm_spu_dt_ids), dev);</div><div class='add'>+	matched_spu_type = match-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (iproc_priv.spu.num_spu &gt; 1) {</div><div class='add'>+		/* If this is 2nd or later SPU, make sure it's same type */</div><div class='add'>+		if ((spu-&gt;spu_type != matched_spu_type-&gt;type) ||</div><div class='add'>+		    (spu-&gt;spu_subtype != matched_spu_type-&gt;subtype)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Multiple SPU types not allowed");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Record type of first SPU */</div><div class='add'>+		spu-&gt;spu_type = matched_spu_type-&gt;type;</div><div class='add'>+		spu-&gt;spu_subtype = matched_spu_type-&gt;subtype;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get and map SPU registers */</div><div class='add'>+	spu_ctrl_regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!spu_ctrl_regs) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Invalid/missing registers for SPU\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spu_reg_vbase[iproc_priv.spu.num_spu] =</div><div class='add'>+				devm_ioremap_resource(dev, spu_ctrl_regs);</div><div class='add'>+	if (IS_ERR(spu_reg_vbase[iproc_priv.spu.num_spu])) {</div><div class='add'>+		err = PTR_ERR(spu_reg_vbase[iproc_priv.spu.num_spu]);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to map registers: %d\n",</div><div class='add'>+			err);</div><div class='add'>+		spu_reg_vbase[iproc_priv.spu.num_spu] = NULL;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "SPU %d detected.", iproc_priv.spu.num_spu);</div><div class='add'>+</div><div class='add'>+	spu-&gt;reg_vbase[iproc_priv.spu.num_spu] = spu_reg_vbase;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bcm_spu_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct spu_hw *spu = &amp;iproc_priv.spu;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	iproc_priv.pdev[iproc_priv.spu.num_spu] = pdev;</div><div class='add'>+	platform_set_drvdata(iproc_priv.pdev[iproc_priv.spu.num_spu],</div><div class='add'>+			     &amp;iproc_priv);</div><div class='add'>+</div><div class='add'>+	err = spu_dt_read(pdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failure;</div><div class='add'>+</div><div class='add'>+	err = spu_mb_init(&amp;pdev-&gt;dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failure;</div><div class='add'>+</div><div class='add'>+	iproc_priv.spu.num_spu++;</div><div class='add'>+</div><div class='add'>+	/* If already initialized, we've just added another SPU and are done */</div><div class='add'>+	if (iproc_priv.inited)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (spu-&gt;spu_type == SPU_TYPE_SPUM)</div><div class='add'>+		iproc_priv.bcm_hdr_len = 8;</div><div class='add'>+	else if (spu-&gt;spu_type == SPU_TYPE_SPU2)</div><div class='add'>+		iproc_priv.bcm_hdr_len = 0;</div><div class='add'>+</div><div class='add'>+	spu_functions_register(&amp;pdev-&gt;dev, spu-&gt;spu_type, spu-&gt;spu_subtype);</div><div class='add'>+</div><div class='add'>+	spu_counters_init();</div><div class='add'>+</div><div class='add'>+	spu_setup_debugfs();</div><div class='add'>+</div><div class='add'>+	err = spu_algs_register(dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto fail_reg;</div><div class='add'>+</div><div class='add'>+	iproc_priv.inited = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_reg:</div><div class='add'>+	spu_free_debugfs();</div><div class='add'>+failure:</div><div class='add'>+	spu_mb_release(pdev);</div><div class='add'>+	dev_err(dev, "%s failed with error %d.\n", __func__, err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bcm_spu_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	char *cdn;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(driver_algs); i++) {</div><div class='add'>+		/*</div><div class='add'>+		 * Not all algorithms were registered, depending on whether</div><div class='add'>+		 * hardware is SPU or SPU2.  So here we make sure to skip</div><div class='add'>+		 * those algorithms that were not previously registered.</div><div class='add'>+		 */</div><div class='add'>+		if (!driver_algs[i].registered)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (driver_algs[i].type) {</div><div class='add'>+		case CRYPTO_ALG_TYPE_ABLKCIPHER:</div><div class='add'>+			crypto_unregister_alg(&amp;driver_algs[i].alg.crypto);</div><div class='add'>+			dev_dbg(dev, "  unregistered cipher %s\n",</div><div class='add'>+				driver_algs[i].alg.crypto.cra_driver_name);</div><div class='add'>+			driver_algs[i].registered = false;</div><div class='add'>+			break;</div><div class='add'>+		case CRYPTO_ALG_TYPE_AHASH:</div><div class='add'>+			crypto_unregister_ahash(&amp;driver_algs[i].alg.hash);</div><div class='add'>+			cdn = driver_algs[i].alg.hash.halg.base.cra_driver_name;</div><div class='add'>+			dev_dbg(dev, "  unregistered hash %s\n", cdn);</div><div class='add'>+			driver_algs[i].registered = false;</div><div class='add'>+			break;</div><div class='add'>+		case CRYPTO_ALG_TYPE_AEAD:</div><div class='add'>+			crypto_unregister_aead(&amp;driver_algs[i].alg.aead);</div><div class='add'>+			dev_dbg(dev, "  unregistered aead %s\n",</div><div class='add'>+				driver_algs[i].alg.aead.base.cra_driver_name);</div><div class='add'>+			driver_algs[i].registered = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spu_free_debugfs();</div><div class='add'>+	spu_mb_release(pdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ===== Kernel Module API ===== */</div><div class='add'>+</div><div class='add'>+static struct platform_driver bcm_spu_pdriver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		   .name = "brcm-spu-crypto",</div><div class='add'>+		   .of_match_table = of_match_ptr(bcm_spu_dt_ids),</div><div class='add'>+		   },</div><div class='add'>+	.probe = bcm_spu_probe,</div><div class='add'>+	.remove = bcm_spu_remove,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(bcm_spu_pdriver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Rob Rice &lt;rob.rice@broadcom.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Broadcom symmetric crypto offload driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/crypto/bcm/cipher.h b/drivers/crypto/bcm/cipher.h<br/>new file mode 100644<br/>index 000000000000..51dca529ce8f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bcm/cipher.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/cipher.h</a></div><div class='hunk'>@@ -0,0 +1,483 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Broadcom</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, version 2, as</div><div class='add'>+ * published by the Free Software Foundation (the "GPL").</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License version 2 (GPLv2) for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * version 2 (GPLv2) along with this source code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CIPHER_H</div><div class='add'>+#define _CIPHER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/mailbox/brcm-message.h&gt;</div><div class='add'>+#include &lt;linux/mailbox_client.h&gt;</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/aead.h&gt;</div><div class='add'>+#include &lt;crypto/sha.h&gt;</div><div class='add'>+#include &lt;crypto/sha3.h&gt;</div><div class='add'>+</div><div class='add'>+#include "spu.h"</div><div class='add'>+#include "spum.h"</div><div class='add'>+#include "spu2.h"</div><div class='add'>+</div><div class='add'>+/* Driver supports up to MAX_SPUS SPU blocks */</div><div class='add'>+#define MAX_SPUS 16</div><div class='add'>+</div><div class='add'>+#define ARC4_MIN_KEY_SIZE   1</div><div class='add'>+#define ARC4_MAX_KEY_SIZE   256</div><div class='add'>+#define ARC4_BLOCK_SIZE     1</div><div class='add'>+#define ARC4_STATE_SIZE     4</div><div class='add'>+</div><div class='add'>+#define CCM_AES_IV_SIZE    16</div><div class='add'>+#define GCM_AES_IV_SIZE    12</div><div class='add'>+#define GCM_ESP_IV_SIZE     8</div><div class='add'>+#define CCM_ESP_IV_SIZE     8</div><div class='add'>+#define RFC4543_ICV_SIZE   16</div><div class='add'>+</div><div class='add'>+#define MAX_KEY_SIZE	ARC4_MAX_KEY_SIZE</div><div class='add'>+#define MAX_IV_SIZE	AES_BLOCK_SIZE</div><div class='add'>+#define MAX_DIGEST_SIZE	SHA3_512_DIGEST_SIZE</div><div class='add'>+#define MAX_ASSOC_SIZE	512</div><div class='add'>+</div><div class='add'>+/* size of salt value for AES-GCM-ESP and AES-CCM-ESP */</div><div class='add'>+#define GCM_ESP_SALT_SIZE   4</div><div class='add'>+#define CCM_ESP_SALT_SIZE   3</div><div class='add'>+#define MAX_SALT_SIZE       GCM_ESP_SALT_SIZE</div><div class='add'>+#define GCM_ESP_SALT_OFFSET 0</div><div class='add'>+#define CCM_ESP_SALT_OFFSET 1</div><div class='add'>+</div><div class='add'>+#define GCM_ESP_DIGESTSIZE 16</div><div class='add'>+</div><div class='add'>+#define MAX_HASH_BLOCK_SIZE SHA512_BLOCK_SIZE</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Maximum number of bytes from a non-final hash request that can be deferred</div><div class='add'>+ * until more data is available. With new crypto API framework, this</div><div class='add'>+ * can be no more than one block of data.</div><div class='add'>+ */</div><div class='add'>+#define HASH_CARRY_MAX  MAX_HASH_BLOCK_SIZE</div><div class='add'>+</div><div class='add'>+/* Force at least 4-byte alignment of all SPU message fields */</div><div class='add'>+#define SPU_MSG_ALIGN  4</div><div class='add'>+</div><div class='add'>+/* Number of times to resend mailbox message if mb queue is full */</div><div class='add'>+#define SPU_MB_RETRY_MAX  1000</div><div class='add'>+</div><div class='add'>+/* op_counts[] indexes */</div><div class='add'>+enum op_type {</div><div class='add'>+	SPU_OP_CIPHER,</div><div class='add'>+	SPU_OP_HASH,</div><div class='add'>+	SPU_OP_HMAC,</div><div class='add'>+	SPU_OP_AEAD,</div><div class='add'>+	SPU_OP_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum spu_spu_type {</div><div class='add'>+	SPU_TYPE_SPUM,</div><div class='add'>+	SPU_TYPE_SPU2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SPUM_NS2 and SPUM_NSP are the SPU-M block on Northstar 2 and Northstar Plus,</div><div class='add'>+ * respectively.</div><div class='add'>+ */</div><div class='add'>+enum spu_spu_subtype {</div><div class='add'>+	SPU_SUBTYPE_SPUM_NS2,</div><div class='add'>+	SPU_SUBTYPE_SPUM_NSP,</div><div class='add'>+	SPU_SUBTYPE_SPU2_V1,</div><div class='add'>+	SPU_SUBTYPE_SPU2_V2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct spu_type_subtype {</div><div class='add'>+	enum spu_spu_type type;</div><div class='add'>+	enum spu_spu_subtype subtype;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cipher_op {</div><div class='add'>+	enum spu_cipher_alg alg;</div><div class='add'>+	enum spu_cipher_mode mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct auth_op {</div><div class='add'>+	enum hash_alg alg;</div><div class='add'>+	enum hash_mode mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iproc_alg_s {</div><div class='add'>+	u32 type;</div><div class='add'>+	union {</div><div class='add'>+		struct crypto_alg crypto;</div><div class='add'>+		struct ahash_alg hash;</div><div class='add'>+		struct aead_alg aead;</div><div class='add'>+	} alg;</div><div class='add'>+	struct cipher_op cipher_info;</div><div class='add'>+	struct auth_op auth_info;</div><div class='add'>+	bool auth_first;</div><div class='add'>+	bool registered;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Buffers for a SPU request/reply message pair. All part of one structure to</div><div class='add'>+ * allow a single alloc per request.</div><div class='add'>+ */</div><div class='add'>+struct spu_msg_buf {</div><div class='add'>+	/* Request message fragments */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SPU request message header. For SPU-M, holds MH, EMH, SCTX, BDESC,</div><div class='add'>+	 * and BD header. For SPU2, holds FMD, OMD.</div><div class='add'>+	 */</div><div class='add'>+	u8 bcm_spu_req_hdr[ALIGN(SPU2_HEADER_ALLOC_LEN, SPU_MSG_ALIGN)];</div><div class='add'>+</div><div class='add'>+	/* IV or counter. Size to include salt. Also used for XTS tweek. */</div><div class='add'>+	u8 iv_ctr[ALIGN(2 * AES_BLOCK_SIZE, SPU_MSG_ALIGN)];</div><div class='add'>+</div><div class='add'>+	/* Hash digest. request and response. */</div><div class='add'>+	u8 digest[ALIGN(MAX_DIGEST_SIZE, SPU_MSG_ALIGN)];</div><div class='add'>+</div><div class='add'>+	/* SPU request message padding */</div><div class='add'>+	u8 spu_req_pad[ALIGN(SPU_PAD_LEN_MAX, SPU_MSG_ALIGN)];</div><div class='add'>+</div><div class='add'>+	/* SPU-M request message STATUS field */</div><div class='add'>+	u8 tx_stat[ALIGN(SPU_TX_STATUS_LEN, SPU_MSG_ALIGN)];</div><div class='add'>+</div><div class='add'>+	/* Response message fragments */</div><div class='add'>+</div><div class='add'>+	/* SPU response message header */</div><div class='add'>+	u8 spu_resp_hdr[ALIGN(SPU2_HEADER_ALLOC_LEN, SPU_MSG_ALIGN)];</div><div class='add'>+</div><div class='add'>+	/* SPU response message STATUS field padding */</div><div class='add'>+	u8 rx_stat_pad[ALIGN(SPU_STAT_PAD_MAX, SPU_MSG_ALIGN)];</div><div class='add'>+</div><div class='add'>+	/* SPU response message STATUS field */</div><div class='add'>+	u8 rx_stat[ALIGN(SPU_RX_STATUS_LEN, SPU_MSG_ALIGN)];</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		/* Buffers only used for ablkcipher */</div><div class='add'>+		struct {</div><div class='add'>+			/*</div><div class='add'>+			 * Field used for either SUPDT when RC4 is used</div><div class='add'>+			 * -OR- tweak value when XTS/AES is used</div><div class='add'>+			 */</div><div class='add'>+			u8 supdt_tweak[ALIGN(SPU_SUPDT_LEN, SPU_MSG_ALIGN)];</div><div class='add'>+		} c;</div><div class='add'>+</div><div class='add'>+		/* Buffers only used for aead */</div><div class='add'>+		struct {</div><div class='add'>+			/* SPU response pad for GCM data */</div><div class='add'>+			u8 gcmpad[ALIGN(AES_BLOCK_SIZE, SPU_MSG_ALIGN)];</div><div class='add'>+</div><div class='add'>+			/* SPU request msg padding for GCM AAD */</div><div class='add'>+			u8 req_aad_pad[ALIGN(SPU_PAD_LEN_MAX, SPU_MSG_ALIGN)];</div><div class='add'>+</div><div class='add'>+			/* SPU response data to be discarded */</div><div class='add'>+			u8 resp_aad[ALIGN(MAX_ASSOC_SIZE + MAX_IV_SIZE,</div><div class='add'>+					  SPU_MSG_ALIGN)];</div><div class='add'>+		} a;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iproc_ctx_s {</div><div class='add'>+	u8 enckey[MAX_KEY_SIZE + ARC4_STATE_SIZE];</div><div class='add'>+	unsigned int enckeylen;</div><div class='add'>+</div><div class='add'>+	u8 authkey[MAX_KEY_SIZE + ARC4_STATE_SIZE];</div><div class='add'>+	unsigned int authkeylen;</div><div class='add'>+</div><div class='add'>+	u8 salt[MAX_SALT_SIZE];</div><div class='add'>+	unsigned int salt_len;</div><div class='add'>+	unsigned int salt_offset;</div><div class='add'>+	u8 iv[MAX_IV_SIZE];</div><div class='add'>+</div><div class='add'>+	unsigned int digestsize;</div><div class='add'>+</div><div class='add'>+	struct iproc_alg_s *alg;</div><div class='add'>+	bool is_esp;</div><div class='add'>+</div><div class='add'>+	struct cipher_op cipher;</div><div class='add'>+	enum spu_cipher_type cipher_type;</div><div class='add'>+</div><div class='add'>+	struct auth_op auth;</div><div class='add'>+	bool auth_first;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The maximum length in bytes of the payload in a SPU message for this</div><div class='add'>+	 * context. For SPU-M, the payload is the combination of AAD and data.</div><div class='add'>+	 * For SPU2, the payload is just data. A value of SPU_MAX_PAYLOAD_INF</div><div class='add'>+	 * indicates that there is no limit to the length of the SPU message</div><div class='add'>+	 * payload.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int max_payload;</div><div class='add'>+</div><div class='add'>+	struct crypto_aead *fallback_cipher;</div><div class='add'>+</div><div class='add'>+	/* auth_type is determined during processing of request */</div><div class='add'>+</div><div class='add'>+	u8 ipad[MAX_HASH_BLOCK_SIZE];</div><div class='add'>+	u8 opad[MAX_HASH_BLOCK_SIZE];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Buffer to hold SPU message header template. Template is created at</div><div class='add'>+	 * setkey time for ablkcipher requests, since most of the fields in the</div><div class='add'>+	 * header are known at that time. At request time, just fill in a few</div><div class='add'>+	 * missing pieces related to length of data in the request and IVs, etc.</div><div class='add'>+	 */</div><div class='add'>+	u8 bcm_spu_req_hdr[ALIGN(SPU2_HEADER_ALLOC_LEN, SPU_MSG_ALIGN)];</div><div class='add'>+</div><div class='add'>+	/* Length of SPU request header */</div><div class='add'>+	u16 spu_req_hdr_len;</div><div class='add'>+</div><div class='add'>+	/* Expected length of SPU response header */</div><div class='add'>+	u16 spu_resp_hdr_len;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * shash descriptor - needed to perform incremental hashing in</div><div class='add'>+	 * in software, when hw doesn't support it.</div><div class='add'>+	 */</div><div class='add'>+	struct shash_desc *shash;</div><div class='add'>+</div><div class='add'>+	bool is_rfc4543;	/* RFC 4543 style of GMAC */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* state from iproc_reqctx_s necessary for hash state export/import */</div><div class='add'>+struct spu_hash_export_s {</div><div class='add'>+	unsigned int total_todo;</div><div class='add'>+	unsigned int total_sent;</div><div class='add'>+	u8 hash_carry[HASH_CARRY_MAX];</div><div class='add'>+	unsigned int hash_carry_len;</div><div class='add'>+	u8 incr_hash[MAX_DIGEST_SIZE];</div><div class='add'>+	bool is_sw_hmac;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iproc_reqctx_s {</div><div class='add'>+	/* general context */</div><div class='add'>+	struct crypto_async_request *parent;</div><div class='add'>+</div><div class='add'>+	/* only valid after enqueue() */</div><div class='add'>+	struct iproc_ctx_s *ctx;</div><div class='add'>+</div><div class='add'>+	u8 chan_idx;   /* Mailbox channel to be used to submit this request */</div><div class='add'>+</div><div class='add'>+	/* total todo, rx'd, and sent for this request */</div><div class='add'>+	unsigned int total_todo;</div><div class='add'>+	unsigned int total_received;	/* only valid for ablkcipher */</div><div class='add'>+	unsigned int total_sent;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * num bytes sent to hw from the src sg in this request. This can differ</div><div class='add'>+	 * from total_sent for incremental hashing. total_sent includes previous</div><div class='add'>+	 * init() and update() data. src_sent does not.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int src_sent;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For AEAD requests, start of associated data. This will typically</div><div class='add'>+	 * point to the beginning of the src scatterlist from the request,</div><div class='add'>+	 * since assoc data is at the beginning of the src scatterlist rather</div><div class='add'>+	 * than in its own sg.</div><div class='add'>+	 */</div><div class='add'>+	struct scatterlist *assoc;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * scatterlist entry and offset to start of data for next chunk. Crypto</div><div class='add'>+	 * API src scatterlist for AEAD starts with AAD, if present. For first</div><div class='add'>+	 * chunk, src_sg is sg entry at beginning of input data (after AAD).</div><div class='add'>+	 * src_skip begins at the offset in that sg entry where data begins.</div><div class='add'>+	 */</div><div class='add'>+	struct scatterlist *src_sg;</div><div class='add'>+	int src_nents;		/* Number of src entries with data */</div><div class='add'>+	u32 src_skip;		/* bytes of current sg entry already used */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Same for destination. For AEAD, if there is AAD, output data must</div><div class='add'>+	 * be written at offset following AAD.</div><div class='add'>+	 */</div><div class='add'>+	struct scatterlist *dst_sg;</div><div class='add'>+	int dst_nents;		/* Number of dst entries with data */</div><div class='add'>+	u32 dst_skip;		/* bytes of current sg entry already written */</div><div class='add'>+</div><div class='add'>+	/* Mailbox message used to send this request to PDC driver */</div><div class='add'>+	struct brcm_message mb_mssg;</div><div class='add'>+</div><div class='add'>+	bool bd_suppress;	/* suppress BD field in SPU response? */</div><div class='add'>+</div><div class='add'>+	/* cipher context */</div><div class='add'>+	bool is_encrypt;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CBC mode: IV.  CTR mode: counter.  Else empty. Used as a DMA</div><div class='add'>+	 * buffer for AEAD requests. So allocate as DMAable memory. If IV</div><div class='add'>+	 * concatenated with salt, includes the salt.</div><div class='add'>+	 */</div><div class='add'>+	u8 *iv_ctr;</div><div class='add'>+	/* Length of IV or counter, in bytes */</div><div class='add'>+	unsigned int iv_ctr_len;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Hash requests can be of any size, whether initial, update, or final.</div><div class='add'>+	 * A non-final request must be submitted to the SPU as an integral</div><div class='add'>+	 * number of blocks. This may leave data at the end of the request</div><div class='add'>+	 * that is not a full block. Since the request is non-final, it cannot</div><div class='add'>+	 * be padded. So, we write the remainder to this hash_carry buffer and</div><div class='add'>+	 * hold it until the next request arrives. The carry data is then</div><div class='add'>+	 * submitted at the beginning of the data in the next SPU msg.</div><div class='add'>+	 * hash_carry_len is the number of bytes currently in hash_carry. These</div><div class='add'>+	 * fields are only used for ahash requests.</div><div class='add'>+	 */</div><div class='add'>+	u8 hash_carry[HASH_CARRY_MAX];</div><div class='add'>+	unsigned int hash_carry_len;</div><div class='add'>+	unsigned int is_final;	/* is this the final for the hash op? */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Digest from incremental hash is saved here to include in next hash</div><div class='add'>+	 * operation. Cannot be stored in req-&gt;result for truncated hashes,</div><div class='add'>+	 * since result may be sized for final digest. Cannot be saved in</div><div class='add'>+	 * msg_buf because that gets deleted between incremental hash ops</div><div class='add'>+	 * and is not saved as part of export().</div><div class='add'>+	 */</div><div class='add'>+	u8 incr_hash[MAX_DIGEST_SIZE];</div><div class='add'>+</div><div class='add'>+	/* hmac context */</div><div class='add'>+	bool is_sw_hmac;</div><div class='add'>+</div><div class='add'>+	/* aead context */</div><div class='add'>+	struct crypto_tfm *old_tfm;</div><div class='add'>+	crypto_completion_t old_complete;</div><div class='add'>+	void *old_data;</div><div class='add'>+</div><div class='add'>+	gfp_t gfp;</div><div class='add'>+</div><div class='add'>+	/* Buffers used to build SPU request and response messages */</div><div class='add'>+	struct spu_msg_buf msg_buf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure encapsulates a set of function pointers specific to the type of</div><div class='add'>+ * SPU hardware running. These functions handling creation and parsing of</div><div class='add'>+ * SPU request messages and SPU response messages. Includes hardware-specific</div><div class='add'>+ * values read from device tree.</div><div class='add'>+ */</div><div class='add'>+struct spu_hw {</div><div class='add'>+	void (*spu_dump_msg_hdr)(u8 *buf, unsigned int buf_len);</div><div class='add'>+	u32 (*spu_ctx_max_payload)(enum spu_cipher_alg cipher_alg,</div><div class='add'>+				   enum spu_cipher_mode cipher_mode,</div><div class='add'>+				   unsigned int blocksize);</div><div class='add'>+	u32 (*spu_payload_length)(u8 *spu_hdr);</div><div class='add'>+	u16 (*spu_response_hdr_len)(u16 auth_key_len, u16 enc_key_len,</div><div class='add'>+				    bool is_hash);</div><div class='add'>+	u16 (*spu_hash_pad_len)(enum hash_alg hash_alg,</div><div class='add'>+				enum hash_mode hash_mode, u32 chunksize,</div><div class='add'>+				u16 hash_block_size);</div><div class='add'>+	u32 (*spu_gcm_ccm_pad_len)(enum spu_cipher_mode cipher_mode,</div><div class='add'>+				   unsigned int data_size);</div><div class='add'>+	u32 (*spu_assoc_resp_len)(enum spu_cipher_mode cipher_mode,</div><div class='add'>+				  unsigned int assoc_len,</div><div class='add'>+				  unsigned int iv_len, bool is_encrypt);</div><div class='add'>+	u8 (*spu_aead_ivlen)(enum spu_cipher_mode cipher_mode,</div><div class='add'>+			     u16 iv_len);</div><div class='add'>+	enum hash_type (*spu_hash_type)(u32 src_sent);</div><div class='add'>+	u32 (*spu_digest_size)(u32 digest_size, enum hash_alg alg,</div><div class='add'>+			       enum hash_type);</div><div class='add'>+	u32 (*spu_create_request)(u8 *spu_hdr,</div><div class='add'>+				  struct spu_request_opts *req_opts,</div><div class='add'>+				  struct spu_cipher_parms *cipher_parms,</div><div class='add'>+				  struct spu_hash_parms *hash_parms,</div><div class='add'>+				  struct spu_aead_parms *aead_parms,</div><div class='add'>+				  unsigned int data_size);</div><div class='add'>+	u16 (*spu_cipher_req_init)(u8 *spu_hdr,</div><div class='add'>+				   struct spu_cipher_parms *cipher_parms);</div><div class='add'>+	void (*spu_cipher_req_finish)(u8 *spu_hdr,</div><div class='add'>+				      u16 spu_req_hdr_len,</div><div class='add'>+				      unsigned int is_inbound,</div><div class='add'>+				      struct spu_cipher_parms *cipher_parms,</div><div class='add'>+				      bool update_key,</div><div class='add'>+				      unsigned int data_size);</div><div class='add'>+	void (*spu_request_pad)(u8 *pad_start, u32 gcm_padding,</div><div class='add'>+				u32 hash_pad_len, enum hash_alg auth_alg,</div><div class='add'>+				enum hash_mode auth_mode,</div><div class='add'>+				unsigned int total_sent, u32 status_padding);</div><div class='add'>+	u8 (*spu_xts_tweak_in_payload)(void);</div><div class='add'>+	u8 (*spu_tx_status_len)(void);</div><div class='add'>+	u8 (*spu_rx_status_len)(void);</div><div class='add'>+	int (*spu_status_process)(u8 *statp);</div><div class='add'>+	void (*spu_ccm_update_iv)(unsigned int digestsize,</div><div class='add'>+				  struct spu_cipher_parms *cipher_parms,</div><div class='add'>+				  unsigned int assoclen, unsigned int chunksize,</div><div class='add'>+				  bool is_encrypt, bool is_esp);</div><div class='add'>+	u32 (*spu_wordalign_padlen)(u32 data_size);</div><div class='add'>+</div><div class='add'>+	/* The base virtual address of the SPU hw registers */</div><div class='add'>+	void __iomem *reg_vbase[MAX_SPUS];</div><div class='add'>+</div><div class='add'>+	/* Version of the SPU hardware */</div><div class='add'>+	enum spu_spu_type spu_type;</div><div class='add'>+</div><div class='add'>+	/* Sub-version of the SPU hardware */</div><div class='add'>+	enum spu_spu_subtype spu_subtype;</div><div class='add'>+</div><div class='add'>+	/* The number of SPUs on this platform */</div><div class='add'>+	u32 num_spu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct device_private {</div><div class='add'>+	struct platform_device *pdev[MAX_SPUS];</div><div class='add'>+</div><div class='add'>+	struct spu_hw spu;</div><div class='add'>+</div><div class='add'>+	atomic_t session_count;	/* number of streams active */</div><div class='add'>+	atomic_t stream_count;	/* monotonic counter for streamID's */</div><div class='add'>+</div><div class='add'>+	/* Length of BCM header. Set to 0 when hw does not expect BCM HEADER. */</div><div class='add'>+	u8 bcm_hdr_len;</div><div class='add'>+</div><div class='add'>+	/* The index of the channel to use for the next crypto request */</div><div class='add'>+	atomic_t next_chan;</div><div class='add'>+</div><div class='add'>+	struct dentry *debugfs_dir;</div><div class='add'>+	struct dentry *debugfs_stats;</div><div class='add'>+</div><div class='add'>+	/* Number of request bytes processed and result bytes returned */</div><div class='add'>+	atomic64_t bytes_in;</div><div class='add'>+	atomic64_t bytes_out;</div><div class='add'>+</div><div class='add'>+	/* Number of operations of each type */</div><div class='add'>+	atomic_t op_counts[SPU_OP_NUM];</div><div class='add'>+</div><div class='add'>+	atomic_t cipher_cnt[CIPHER_ALG_LAST][CIPHER_MODE_LAST];</div><div class='add'>+	atomic_t hash_cnt[HASH_ALG_LAST];</div><div class='add'>+	atomic_t hmac_cnt[HASH_ALG_LAST];</div><div class='add'>+	atomic_t aead_cnt[AEAD_TYPE_LAST];</div><div class='add'>+</div><div class='add'>+	/* Number of calls to setkey() for each operation type */</div><div class='add'>+	atomic_t setkey_cnt[SPU_OP_NUM];</div><div class='add'>+</div><div class='add'>+	/* Number of times request was resubmitted because mb was full */</div><div class='add'>+	atomic_t mb_no_spc;</div><div class='add'>+</div><div class='add'>+	/* Number of mailbox send failures */</div><div class='add'>+	atomic_t mb_send_fail;</div><div class='add'>+</div><div class='add'>+	/* Number of ICV check failures for AEAD messages */</div><div class='add'>+	atomic_t bad_icv;</div><div class='add'>+</div><div class='add'>+	struct mbox_client mcl[MAX_SPUS];</div><div class='add'>+	/* Array of mailbox channel pointers, one for each channel */</div><div class='add'>+	struct mbox_chan *mbox[MAX_SPUS];</div><div class='add'>+</div><div class='add'>+	/* Driver initialized */</div><div class='add'>+	bool inited;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct device_private iproc_priv;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/crypto/bcm/spu.c b/drivers/crypto/bcm/spu.c<br/>new file mode 100644<br/>index 000000000000..dbb5c03dde49<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bcm/spu.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/spu.c</a></div><div class='hunk'>@@ -0,0 +1,1251 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Broadcom</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, version 2, as</div><div class='add'>+ * published by the Free Software Foundation (the "GPL").</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License version 2 (GPLv2) for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * version 2 (GPLv2) along with this source code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include "util.h"</div><div class='add'>+#include "spu.h"</div><div class='add'>+#include "spum.h"</div><div class='add'>+#include "cipher.h"</div><div class='add'>+</div><div class='add'>+/* This array is based on the hash algo type supported in spu.h */</div><div class='add'>+char *tag_to_hash_idx[] = { "none", "md5", "sha1", "sha224", "sha256" };</div><div class='add'>+</div><div class='add'>+char *hash_alg_name[] = { "None", "md5", "sha1", "sha224", "sha256", "aes",</div><div class='add'>+	"sha384", "sha512", "sha3_224", "sha3_256", "sha3_384", "sha3_512" };</div><div class='add'>+</div><div class='add'>+char *aead_alg_name[] = { "ccm(aes)", "gcm(aes)", "authenc" };</div><div class='add'>+</div><div class='add'>+/* Assumes SPU-M messages are in big endian */</div><div class='add'>+void spum_dump_msg_hdr(u8 *buf, unsigned int buf_len)</div><div class='add'>+{</div><div class='add'>+	u8 *ptr = buf;</div><div class='add'>+	struct SPUHEADER *spuh = (struct SPUHEADER *)buf;</div><div class='add'>+	unsigned int hash_key_len = 0;</div><div class='add'>+	unsigned int hash_state_len = 0;</div><div class='add'>+	unsigned int cipher_key_len = 0;</div><div class='add'>+	unsigned int iv_len;</div><div class='add'>+	u32 pflags;</div><div class='add'>+	u32 cflags;</div><div class='add'>+	u32 ecf;</div><div class='add'>+	u32 cipher_alg;</div><div class='add'>+	u32 cipher_mode;</div><div class='add'>+	u32 cipher_type;</div><div class='add'>+	u32 hash_alg;</div><div class='add'>+	u32 hash_mode;</div><div class='add'>+	u32 hash_type;</div><div class='add'>+	u32 sctx_size;   /* SCTX length in words */</div><div class='add'>+	u32 sctx_pl_len; /* SCTX payload length in bytes */</div><div class='add'>+</div><div class='add'>+	packet_log("\n");</div><div class='add'>+	packet_log("SPU Message header %p len: %u\n", buf, buf_len);</div><div class='add'>+</div><div class='add'>+	/* ========== Decode MH ========== */</div><div class='add'>+	packet_log("  MH 0x%08x\n", be32_to_cpu(*((u32 *)ptr)));</div><div class='add'>+	if (spuh-&gt;mh.flags &amp; MH_SCTX_PRES)</div><div class='add'>+		packet_log("    SCTX  present\n");</div><div class='add'>+	if (spuh-&gt;mh.flags &amp; MH_BDESC_PRES)</div><div class='add'>+		packet_log("    BDESC present\n");</div><div class='add'>+	if (spuh-&gt;mh.flags &amp; MH_MFM_PRES)</div><div class='add'>+		packet_log("    MFM   present\n");</div><div class='add'>+	if (spuh-&gt;mh.flags &amp; MH_BD_PRES)</div><div class='add'>+		packet_log("    BD    present\n");</div><div class='add'>+	if (spuh-&gt;mh.flags &amp; MH_HASH_PRES)</div><div class='add'>+		packet_log("    HASH  present\n");</div><div class='add'>+	if (spuh-&gt;mh.flags &amp; MH_SUPDT_PRES)</div><div class='add'>+		packet_log("    SUPDT present\n");</div><div class='add'>+	packet_log("    Opcode 0x%02x\n", spuh-&gt;mh.op_code);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(spuh-&gt;mh) + sizeof(spuh-&gt;emh);  /* skip emh. unused */</div><div class='add'>+</div><div class='add'>+	/* ========== Decode SCTX ========== */</div><div class='add'>+	if (spuh-&gt;mh.flags &amp; MH_SCTX_PRES) {</div><div class='add'>+		pflags = be32_to_cpu(spuh-&gt;sa.proto_flags);</div><div class='add'>+		packet_log("  SCTX[0] 0x%08x\n", pflags);</div><div class='add'>+		sctx_size = pflags &amp; SCTX_SIZE;</div><div class='add'>+		packet_log("    Size %u words\n", sctx_size);</div><div class='add'>+</div><div class='add'>+		cflags = be32_to_cpu(spuh-&gt;sa.cipher_flags);</div><div class='add'>+		packet_log("  SCTX[1] 0x%08x\n", cflags);</div><div class='add'>+		packet_log("    Inbound:%lu (1:decrypt/vrfy 0:encrypt/auth)\n",</div><div class='add'>+			   (cflags &amp; CIPHER_INBOUND) &gt;&gt; CIPHER_INBOUND_SHIFT);</div><div class='add'>+		packet_log("    Order:%lu (1:AuthFirst 0:EncFirst)\n",</div><div class='add'>+			   (cflags &amp; CIPHER_ORDER) &gt;&gt; CIPHER_ORDER_SHIFT);</div><div class='add'>+		packet_log("    ICV_IS_512:%lx\n",</div><div class='add'>+			   (cflags &amp; ICV_IS_512) &gt;&gt; ICV_IS_512_SHIFT);</div><div class='add'>+		cipher_alg = (cflags &amp; CIPHER_ALG) &gt;&gt; CIPHER_ALG_SHIFT;</div><div class='add'>+		cipher_mode = (cflags &amp; CIPHER_MODE) &gt;&gt; CIPHER_MODE_SHIFT;</div><div class='add'>+		cipher_type = (cflags &amp; CIPHER_TYPE) &gt;&gt; CIPHER_TYPE_SHIFT;</div><div class='add'>+		packet_log("    Crypto Alg:%u Mode:%u Type:%u\n",</div><div class='add'>+			   cipher_alg, cipher_mode, cipher_type);</div><div class='add'>+		hash_alg = (cflags &amp; HASH_ALG) &gt;&gt; HASH_ALG_SHIFT;</div><div class='add'>+		hash_mode = (cflags &amp; HASH_MODE) &gt;&gt; HASH_MODE_SHIFT;</div><div class='add'>+		hash_type = (cflags &amp; HASH_TYPE) &gt;&gt; HASH_TYPE_SHIFT;</div><div class='add'>+		packet_log("    Hash   Alg:%x Mode:%x Type:%x\n",</div><div class='add'>+			   hash_alg, hash_mode, hash_type);</div><div class='add'>+		packet_log("    UPDT_Offset:%u\n", cflags &amp; UPDT_OFST);</div><div class='add'>+</div><div class='add'>+		ecf = be32_to_cpu(spuh-&gt;sa.ecf);</div><div class='add'>+		packet_log("  SCTX[2] 0x%08x\n", ecf);</div><div class='add'>+		packet_log("    WriteICV:%lu CheckICV:%lu ICV_SIZE:%u ",</div><div class='add'>+			   (ecf &amp; INSERT_ICV) &gt;&gt; INSERT_ICV_SHIFT,</div><div class='add'>+			   (ecf &amp; CHECK_ICV) &gt;&gt; CHECK_ICV_SHIFT,</div><div class='add'>+			   (ecf &amp; ICV_SIZE) &gt;&gt; ICV_SIZE_SHIFT);</div><div class='add'>+		packet_log("BD_SUPPRESS:%lu\n",</div><div class='add'>+			   (ecf &amp; BD_SUPPRESS) &gt;&gt; BD_SUPPRESS_SHIFT);</div><div class='add'>+		packet_log("    SCTX_IV:%lu ExplicitIV:%lu GenIV:%lu ",</div><div class='add'>+			   (ecf &amp; SCTX_IV) &gt;&gt; SCTX_IV_SHIFT,</div><div class='add'>+			   (ecf &amp; EXPLICIT_IV) &gt;&gt; EXPLICIT_IV_SHIFT,</div><div class='add'>+			   (ecf &amp; GEN_IV) &gt;&gt; GEN_IV_SHIFT);</div><div class='add'>+		packet_log("IV_OV_OFST:%lu EXP_IV_SIZE:%u\n",</div><div class='add'>+			   (ecf &amp; IV_OFFSET) &gt;&gt; IV_OFFSET_SHIFT,</div><div class='add'>+			   ecf &amp; EXP_IV_SIZE);</div><div class='add'>+</div><div class='add'>+		ptr += sizeof(struct SCTX);</div><div class='add'>+</div><div class='add'>+		if (hash_alg &amp;&amp; hash_mode) {</div><div class='add'>+			char *name = "NONE";</div><div class='add'>+</div><div class='add'>+			switch (hash_alg) {</div><div class='add'>+			case HASH_ALG_MD5:</div><div class='add'>+				hash_key_len = 16;</div><div class='add'>+				name = "MD5";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_SHA1:</div><div class='add'>+				hash_key_len = 20;</div><div class='add'>+				name = "SHA1";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_SHA224:</div><div class='add'>+				hash_key_len = 28;</div><div class='add'>+				name = "SHA224";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_SHA256:</div><div class='add'>+				hash_key_len = 32;</div><div class='add'>+				name = "SHA256";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_SHA384:</div><div class='add'>+				hash_key_len = 48;</div><div class='add'>+				name = "SHA384";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_SHA512:</div><div class='add'>+				hash_key_len = 64;</div><div class='add'>+				name = "SHA512";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_AES:</div><div class='add'>+				hash_key_len = 0;</div><div class='add'>+				name = "AES";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_NONE:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			packet_log("    Auth Key Type:%s Length:%u Bytes\n",</div><div class='add'>+				   name, hash_key_len);</div><div class='add'>+			packet_dump("    KEY: ", ptr, hash_key_len);</div><div class='add'>+			ptr += hash_key_len;</div><div class='add'>+		} else if ((hash_alg == HASH_ALG_AES) &amp;&amp;</div><div class='add'>+			   (hash_mode == HASH_MODE_XCBC)) {</div><div class='add'>+			char *name = "NONE";</div><div class='add'>+</div><div class='add'>+			switch (cipher_type) {</div><div class='add'>+			case CIPHER_TYPE_AES128:</div><div class='add'>+				hash_key_len = 16;</div><div class='add'>+				name = "AES128-XCBC";</div><div class='add'>+				break;</div><div class='add'>+			case CIPHER_TYPE_AES192:</div><div class='add'>+				hash_key_len = 24;</div><div class='add'>+				name = "AES192-XCBC";</div><div class='add'>+				break;</div><div class='add'>+			case CIPHER_TYPE_AES256:</div><div class='add'>+				hash_key_len = 32;</div><div class='add'>+				name = "AES256-XCBC";</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			packet_log("    Auth Key Type:%s Length:%u Bytes\n",</div><div class='add'>+				   name, hash_key_len);</div><div class='add'>+			packet_dump("    KEY: ", ptr, hash_key_len);</div><div class='add'>+			ptr += hash_key_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (hash_alg &amp;&amp; (hash_mode == HASH_MODE_NONE) &amp;&amp;</div><div class='add'>+		    (hash_type == HASH_TYPE_UPDT)) {</div><div class='add'>+			char *name = "NONE";</div><div class='add'>+</div><div class='add'>+			switch (hash_alg) {</div><div class='add'>+			case HASH_ALG_MD5:</div><div class='add'>+				hash_state_len = 16;</div><div class='add'>+				name = "MD5";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_SHA1:</div><div class='add'>+				hash_state_len = 20;</div><div class='add'>+				name = "SHA1";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_SHA224:</div><div class='add'>+				hash_state_len = 32;</div><div class='add'>+				name = "SHA224";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_SHA256:</div><div class='add'>+				hash_state_len = 32;</div><div class='add'>+				name = "SHA256";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_SHA384:</div><div class='add'>+				hash_state_len = 48;</div><div class='add'>+				name = "SHA384";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_SHA512:</div><div class='add'>+				hash_state_len = 64;</div><div class='add'>+				name = "SHA512";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_AES:</div><div class='add'>+				hash_state_len = 0;</div><div class='add'>+				name = "AES";</div><div class='add'>+				break;</div><div class='add'>+			case HASH_ALG_NONE:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			packet_log("    Auth State Type:%s Length:%u Bytes\n",</div><div class='add'>+				   name, hash_state_len);</div><div class='add'>+			packet_dump("    State: ", ptr, hash_state_len);</div><div class='add'>+			ptr += hash_state_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cipher_alg) {</div><div class='add'>+			char *name = "NONE";</div><div class='add'>+</div><div class='add'>+			switch (cipher_alg) {</div><div class='add'>+			case CIPHER_ALG_DES:</div><div class='add'>+				cipher_key_len = 8;</div><div class='add'>+				name = "DES";</div><div class='add'>+				break;</div><div class='add'>+			case CIPHER_ALG_3DES:</div><div class='add'>+				cipher_key_len = 24;</div><div class='add'>+				name = "3DES";</div><div class='add'>+				break;</div><div class='add'>+			case CIPHER_ALG_RC4:</div><div class='add'>+				cipher_key_len = 260;</div><div class='add'>+				name = "ARC4";</div><div class='add'>+				break;</div><div class='add'>+			case CIPHER_ALG_AES:</div><div class='add'>+				switch (cipher_type) {</div><div class='add'>+				case CIPHER_TYPE_AES128:</div><div class='add'>+					cipher_key_len = 16;</div><div class='add'>+					name = "AES128";</div><div class='add'>+					break;</div><div class='add'>+				case CIPHER_TYPE_AES192:</div><div class='add'>+					cipher_key_len = 24;</div><div class='add'>+					name = "AES192";</div><div class='add'>+					break;</div><div class='add'>+				case CIPHER_TYPE_AES256:</div><div class='add'>+					cipher_key_len = 32;</div><div class='add'>+					name = "AES256";</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			case CIPHER_ALG_NONE:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			packet_log("    Cipher Key Type:%s Length:%u Bytes\n",</div><div class='add'>+				   name, cipher_key_len);</div><div class='add'>+</div><div class='add'>+			/* XTS has two keys */</div><div class='add'>+			if (cipher_mode == CIPHER_MODE_XTS) {</div><div class='add'>+				packet_dump("    KEY2: ", ptr, cipher_key_len);</div><div class='add'>+				ptr += cipher_key_len;</div><div class='add'>+				packet_dump("    KEY1: ", ptr, cipher_key_len);</div><div class='add'>+				ptr += cipher_key_len;</div><div class='add'>+</div><div class='add'>+				cipher_key_len *= 2;</div><div class='add'>+			} else {</div><div class='add'>+				packet_dump("    KEY: ", ptr, cipher_key_len);</div><div class='add'>+				ptr += cipher_key_len;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (ecf &amp; SCTX_IV) {</div><div class='add'>+				sctx_pl_len = sctx_size * sizeof(u32) -</div><div class='add'>+					sizeof(struct SCTX);</div><div class='add'>+				iv_len = sctx_pl_len -</div><div class='add'>+					(hash_key_len + hash_state_len +</div><div class='add'>+					 cipher_key_len);</div><div class='add'>+				packet_log("    IV Length:%u Bytes\n", iv_len);</div><div class='add'>+				packet_dump("    IV: ", ptr, iv_len);</div><div class='add'>+				ptr += iv_len;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ========== Decode BDESC ========== */</div><div class='add'>+	if (spuh-&gt;mh.flags &amp; MH_BDESC_PRES) {</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+		struct BDESC_HEADER *bdesc = (struct BDESC_HEADER *)ptr;</div><div class='add'>+#endif</div><div class='add'>+		packet_log("  BDESC[0] 0x%08x\n", be32_to_cpu(*((u32 *)ptr)));</div><div class='add'>+		packet_log("    OffsetMAC:%u LengthMAC:%u\n",</div><div class='add'>+			   be16_to_cpu(bdesc-&gt;offset_mac),</div><div class='add'>+			   be16_to_cpu(bdesc-&gt;length_mac));</div><div class='add'>+		ptr += sizeof(u32);</div><div class='add'>+</div><div class='add'>+		packet_log("  BDESC[1] 0x%08x\n", be32_to_cpu(*((u32 *)ptr)));</div><div class='add'>+		packet_log("    OffsetCrypto:%u LengthCrypto:%u\n",</div><div class='add'>+			   be16_to_cpu(bdesc-&gt;offset_crypto),</div><div class='add'>+			   be16_to_cpu(bdesc-&gt;length_crypto));</div><div class='add'>+		ptr += sizeof(u32);</div><div class='add'>+</div><div class='add'>+		packet_log("  BDESC[2] 0x%08x\n", be32_to_cpu(*((u32 *)ptr)));</div><div class='add'>+		packet_log("    OffsetICV:%u OffsetIV:%u\n",</div><div class='add'>+			   be16_to_cpu(bdesc-&gt;offset_icv),</div><div class='add'>+			   be16_to_cpu(bdesc-&gt;offset_iv));</div><div class='add'>+		ptr += sizeof(u32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ========== Decode BD ========== */</div><div class='add'>+	if (spuh-&gt;mh.flags &amp; MH_BD_PRES) {</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+		struct BD_HEADER *bd = (struct BD_HEADER *)ptr;</div><div class='add'>+#endif</div><div class='add'>+		packet_log("  BD[0] 0x%08x\n", be32_to_cpu(*((u32 *)ptr)));</div><div class='add'>+		packet_log("    Size:%ubytes PrevLength:%u\n",</div><div class='add'>+			   be16_to_cpu(bd-&gt;size), be16_to_cpu(bd-&gt;prev_length));</div><div class='add'>+		ptr += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Double check sanity */</div><div class='add'>+	if (buf + buf_len != ptr) {</div><div class='add'>+		packet_log(" Packet parsed incorrectly. ");</div><div class='add'>+		packet_log("buf:%p buf_len:%u buf+buf_len:%p ptr:%p\n",</div><div class='add'>+			   buf, buf_len, buf + buf_len, ptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	packet_log("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_ns2_ctx_max_payload() - Determine the max length of the payload for a</div><div class='add'>+ * SPU message for a given cipher and hash alg context.</div><div class='add'>+ * @cipher_alg:		The cipher algorithm</div><div class='add'>+ * @cipher_mode:	The cipher mode</div><div class='add'>+ * @blocksize:		The size of a block of data for this algo</div><div class='add'>+ *</div><div class='add'>+ * The max payload must be a multiple of the blocksize so that if a request is</div><div class='add'>+ * too large to fit in a single SPU message, the request can be broken into</div><div class='add'>+ * max_payload sized chunks. Each chunk must be a multiple of blocksize.</div><div class='add'>+ *</div><div class='add'>+ * Return: Max payload length in bytes</div><div class='add'>+ */</div><div class='add'>+u32 spum_ns2_ctx_max_payload(enum spu_cipher_alg cipher_alg,</div><div class='add'>+			     enum spu_cipher_mode cipher_mode,</div><div class='add'>+			     unsigned int blocksize)</div><div class='add'>+{</div><div class='add'>+	u32 max_payload = SPUM_NS2_MAX_PAYLOAD;</div><div class='add'>+	u32 excess;</div><div class='add'>+</div><div class='add'>+	/* In XTS on SPU-M, we'll need to insert tweak before input data */</div><div class='add'>+	if (cipher_mode == CIPHER_MODE_XTS)</div><div class='add'>+		max_payload -= SPU_XTS_TWEAK_SIZE;</div><div class='add'>+</div><div class='add'>+	excess = max_payload % blocksize;</div><div class='add'>+</div><div class='add'>+	return max_payload - excess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_nsp_ctx_max_payload() - Determine the max length of the payload for a</div><div class='add'>+ * SPU message for a given cipher and hash alg context.</div><div class='add'>+ * @cipher_alg:		The cipher algorithm</div><div class='add'>+ * @cipher_mode:	The cipher mode</div><div class='add'>+ * @blocksize:		The size of a block of data for this algo</div><div class='add'>+ *</div><div class='add'>+ * The max payload must be a multiple of the blocksize so that if a request is</div><div class='add'>+ * too large to fit in a single SPU message, the request can be broken into</div><div class='add'>+ * max_payload sized chunks. Each chunk must be a multiple of blocksize.</div><div class='add'>+ *</div><div class='add'>+ * Return: Max payload length in bytes</div><div class='add'>+ */</div><div class='add'>+u32 spum_nsp_ctx_max_payload(enum spu_cipher_alg cipher_alg,</div><div class='add'>+			     enum spu_cipher_mode cipher_mode,</div><div class='add'>+			     unsigned int blocksize)</div><div class='add'>+{</div><div class='add'>+	u32 max_payload = SPUM_NSP_MAX_PAYLOAD;</div><div class='add'>+	u32 excess;</div><div class='add'>+</div><div class='add'>+	/* In XTS on SPU-M, we'll need to insert tweak before input data */</div><div class='add'>+	if (cipher_mode == CIPHER_MODE_XTS)</div><div class='add'>+		max_payload -= SPU_XTS_TWEAK_SIZE;</div><div class='add'>+</div><div class='add'>+	excess = max_payload % blocksize;</div><div class='add'>+</div><div class='add'>+	return max_payload - excess;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** spum_payload_length() - Given a SPU-M message header, extract the payload</div><div class='add'>+ * length.</div><div class='add'>+ * @spu_hdr:	Start of SPU header</div><div class='add'>+ *</div><div class='add'>+ * Assumes just MH, EMH, BD (no SCTX, BDESC. Works for response frames.</div><div class='add'>+ *</div><div class='add'>+ * Return: payload length in bytes</div><div class='add'>+ */</div><div class='add'>+u32 spum_payload_length(u8 *spu_hdr)</div><div class='add'>+{</div><div class='add'>+	struct BD_HEADER *bd;</div><div class='add'>+	u32 pl_len;</div><div class='add'>+</div><div class='add'>+	/* Find BD header.  skip MH, EMH */</div><div class='add'>+	bd = (struct BD_HEADER *)(spu_hdr + 8);</div><div class='add'>+	pl_len = be16_to_cpu(bd-&gt;size);</div><div class='add'>+</div><div class='add'>+	return pl_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_response_hdr_len() - Given the length of the hash key and encryption</div><div class='add'>+ * key, determine the expected length of a SPU response header.</div><div class='add'>+ * @auth_key_len:	authentication key length (bytes)</div><div class='add'>+ * @enc_key_len:	encryption key length (bytes)</div><div class='add'>+ * @is_hash:		true if response message is for a hash operation</div><div class='add'>+ *</div><div class='add'>+ * Return: length of SPU response header (bytes)</div><div class='add'>+ */</div><div class='add'>+u16 spum_response_hdr_len(u16 auth_key_len, u16 enc_key_len, bool is_hash)</div><div class='add'>+{</div><div class='add'>+	if (is_hash)</div><div class='add'>+		return SPU_HASH_RESP_HDR_LEN;</div><div class='add'>+	else</div><div class='add'>+		return SPU_RESP_HDR_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_hash_pad_len() - Calculate the length of hash padding required to extend</div><div class='add'>+ * data to a full block size.</div><div class='add'>+ * @hash_alg:   hash algorithm</div><div class='add'>+ * @hash_mode:       hash mode</div><div class='add'>+ * @chunksize:  length of data, in bytes</div><div class='add'>+ * @hash_block_size:  size of a block of data for hash algorithm</div><div class='add'>+ *</div><div class='add'>+ * Reserve space for 1 byte (0x80) start of pad and the total length as u64</div><div class='add'>+ *</div><div class='add'>+ * Return:  length of hash pad in bytes</div><div class='add'>+ */</div><div class='add'>+u16 spum_hash_pad_len(enum hash_alg hash_alg, enum hash_mode hash_mode,</div><div class='add'>+		      u32 chunksize, u16 hash_block_size)</div><div class='add'>+{</div><div class='add'>+	unsigned int length_len;</div><div class='add'>+	unsigned int used_space_last_block;</div><div class='add'>+	int hash_pad_len;</div><div class='add'>+</div><div class='add'>+	/* AES-XCBC hash requires just padding to next block boundary */</div><div class='add'>+	if ((hash_alg == HASH_ALG_AES) &amp;&amp; (hash_mode == HASH_MODE_XCBC)) {</div><div class='add'>+		used_space_last_block = chunksize % hash_block_size;</div><div class='add'>+		hash_pad_len = hash_block_size - used_space_last_block;</div><div class='add'>+		if (hash_pad_len &gt;= hash_block_size)</div><div class='add'>+			hash_pad_len -= hash_block_size;</div><div class='add'>+		return hash_pad_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	used_space_last_block = chunksize % hash_block_size + 1;</div><div class='add'>+	if ((hash_alg == HASH_ALG_SHA384) || (hash_alg == HASH_ALG_SHA512))</div><div class='add'>+		length_len = 2 * sizeof(u64);</div><div class='add'>+	else</div><div class='add'>+		length_len = sizeof(u64);</div><div class='add'>+</div><div class='add'>+	used_space_last_block += length_len;</div><div class='add'>+	hash_pad_len = hash_block_size - used_space_last_block;</div><div class='add'>+	if (hash_pad_len &lt; 0)</div><div class='add'>+		hash_pad_len += hash_block_size;</div><div class='add'>+</div><div class='add'>+	hash_pad_len += 1 + length_len;</div><div class='add'>+	return hash_pad_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_gcm_ccm_pad_len() - Determine the required length of GCM or CCM padding.</div><div class='add'>+ * @cipher_mode:	Algo type</div><div class='add'>+ * @data_size:		Length of plaintext (bytes)</div><div class='add'>+ *</div><div class='add'>+ * @Return: Length of padding, in bytes</div><div class='add'>+ */</div><div class='add'>+u32 spum_gcm_ccm_pad_len(enum spu_cipher_mode cipher_mode,</div><div class='add'>+			 unsigned int data_size)</div><div class='add'>+{</div><div class='add'>+	u32 pad_len = 0;</div><div class='add'>+	u32 m1 = SPU_GCM_CCM_ALIGN - 1;</div><div class='add'>+</div><div class='add'>+	if ((cipher_mode == CIPHER_MODE_GCM) ||</div><div class='add'>+	    (cipher_mode == CIPHER_MODE_CCM))</div><div class='add'>+		pad_len = ((data_size + m1) &amp; ~m1) - data_size;</div><div class='add'>+</div><div class='add'>+	return pad_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_assoc_resp_len() - Determine the size of the receive buffer required to</div><div class='add'>+ * catch associated data.</div><div class='add'>+ * @cipher_mode:	cipher mode</div><div class='add'>+ * @assoc_len:		length of associated data (bytes)</div><div class='add'>+ * @iv_len:		length of IV (bytes)</div><div class='add'>+ * @is_encrypt:		true if encrypting. false if decrypting.</div><div class='add'>+ *</div><div class='add'>+ * Return: length of associated data in response message (bytes)</div><div class='add'>+ */</div><div class='add'>+u32 spum_assoc_resp_len(enum spu_cipher_mode cipher_mode,</div><div class='add'>+			unsigned int assoc_len, unsigned int iv_len,</div><div class='add'>+			bool is_encrypt)</div><div class='add'>+{</div><div class='add'>+	u32 buflen = 0;</div><div class='add'>+	u32 pad;</div><div class='add'>+</div><div class='add'>+	if (assoc_len)</div><div class='add'>+		buflen = assoc_len;</div><div class='add'>+</div><div class='add'>+	if (cipher_mode == CIPHER_MODE_GCM) {</div><div class='add'>+		/* AAD needs to be padded in responses too */</div><div class='add'>+		pad = spum_gcm_ccm_pad_len(cipher_mode, buflen);</div><div class='add'>+		buflen += pad;</div><div class='add'>+	}</div><div class='add'>+	if (cipher_mode == CIPHER_MODE_CCM) {</div><div class='add'>+		/*</div><div class='add'>+		 * AAD needs to be padded in responses too</div><div class='add'>+		 * for CCM, len + 2 needs to be 128-bit aligned.</div><div class='add'>+		 */</div><div class='add'>+		pad = spum_gcm_ccm_pad_len(cipher_mode, buflen + 2);</div><div class='add'>+		buflen += pad;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return buflen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_aead_ivlen() - Calculate the length of the AEAD IV to be included</div><div class='add'>+ * in a SPU request after the AAD and before the payload.</div><div class='add'>+ * @cipher_mode:  cipher mode</div><div class='add'>+ * @iv_ctr_len:   initialization vector length in bytes</div><div class='add'>+ *</div><div class='add'>+ * In Linux ~4.2 and later, the assoc_data sg includes the IV. So no need</div><div class='add'>+ * to include the IV as a separate field in the SPU request msg.</div><div class='add'>+ *</div><div class='add'>+ * Return: Length of AEAD IV in bytes</div><div class='add'>+ */</div><div class='add'>+u8 spum_aead_ivlen(enum spu_cipher_mode cipher_mode, u16 iv_len)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_hash_type() - Determine the type of hash operation.</div><div class='add'>+ * @src_sent:  The number of bytes in the current request that have already</div><div class='add'>+ *             been sent to the SPU to be hashed.</div><div class='add'>+ *</div><div class='add'>+ * We do not use HASH_TYPE_FULL for requests that fit in a single SPU message.</div><div class='add'>+ * Using FULL causes failures (such as when the string to be hashed is empty).</div><div class='add'>+ * For similar reasons, we never use HASH_TYPE_FIN. Instead, submit messages</div><div class='add'>+ * as INIT or UPDT and do the hash padding in sw.</div><div class='add'>+ */</div><div class='add'>+enum hash_type spum_hash_type(u32 src_sent)</div><div class='add'>+{</div><div class='add'>+	return src_sent ? HASH_TYPE_UPDT : HASH_TYPE_INIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_digest_size() - Determine the size of a hash digest to expect the SPU to</div><div class='add'>+ * return.</div><div class='add'>+ * alg_digest_size: Number of bytes in the final digest for the given algo</div><div class='add'>+ * alg:             The hash algorithm</div><div class='add'>+ * htype:           Type of hash operation (init, update, full, etc)</div><div class='add'>+ *</div><div class='add'>+ * When doing incremental hashing for an algorithm with a truncated hash</div><div class='add'>+ * (e.g., SHA224), the SPU returns the full digest so that it can be fed back as</div><div class='add'>+ * a partial result for the next chunk.</div><div class='add'>+ */</div><div class='add'>+u32 spum_digest_size(u32 alg_digest_size, enum hash_alg alg,</div><div class='add'>+		     enum hash_type htype)</div><div class='add'>+{</div><div class='add'>+	u32 digestsize = alg_digest_size;</div><div class='add'>+</div><div class='add'>+	/* SPU returns complete digest when doing incremental hash and truncated</div><div class='add'>+	 * hash algo.</div><div class='add'>+	 */</div><div class='add'>+	if ((htype == HASH_TYPE_INIT) || (htype == HASH_TYPE_UPDT)) {</div><div class='add'>+		if (alg == HASH_ALG_SHA224)</div><div class='add'>+			digestsize = SHA256_DIGEST_SIZE;</div><div class='add'>+		else if (alg == HASH_ALG_SHA384)</div><div class='add'>+			digestsize = SHA512_DIGEST_SIZE;</div><div class='add'>+	}</div><div class='add'>+	return digestsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_create_request() - Build a SPU request message header, up to and</div><div class='add'>+ * including the BD header. Construct the message starting at spu_hdr. Caller</div><div class='add'>+ * should allocate this buffer in DMA-able memory at least SPU_HEADER_ALLOC_LEN</div><div class='add'>+ * bytes long.</div><div class='add'>+ * @spu_hdr: Start of buffer where SPU request header is to be written</div><div class='add'>+ * @req_opts: SPU request message options</div><div class='add'>+ * @cipher_parms: Parameters related to cipher algorithm</div><div class='add'>+ * @hash_parms:   Parameters related to hash algorithm</div><div class='add'>+ * @aead_parms:   Parameters related to AEAD operation</div><div class='add'>+ * @data_size:    Length of data to be encrypted or authenticated. If AEAD, does</div><div class='add'>+ *		  not include length of AAD.</div><div class='add'>+</div><div class='add'>+ * Return: the length of the SPU header in bytes. 0 if an error occurs.</div><div class='add'>+ */</div><div class='add'>+u32 spum_create_request(u8 *spu_hdr,</div><div class='add'>+			struct spu_request_opts *req_opts,</div><div class='add'>+			struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			struct spu_hash_parms *hash_parms,</div><div class='add'>+			struct spu_aead_parms *aead_parms,</div><div class='add'>+			unsigned int data_size)</div><div class='add'>+{</div><div class='add'>+	struct SPUHEADER *spuh;</div><div class='add'>+	struct BDESC_HEADER *bdesc;</div><div class='add'>+	struct BD_HEADER *bd;</div><div class='add'>+</div><div class='add'>+	u8 *ptr;</div><div class='add'>+	u32 protocol_bits = 0;</div><div class='add'>+	u32 cipher_bits = 0;</div><div class='add'>+	u32 ecf_bits = 0;</div><div class='add'>+	u8 sctx_words = 0;</div><div class='add'>+	unsigned int buf_len = 0;</div><div class='add'>+</div><div class='add'>+	/* size of the cipher payload */</div><div class='add'>+	unsigned int cipher_len = hash_parms-&gt;prebuf_len + data_size +</div><div class='add'>+				hash_parms-&gt;pad_len;</div><div class='add'>+</div><div class='add'>+	/* offset of prebuf or data from end of BD header */</div><div class='add'>+	unsigned int cipher_offset = aead_parms-&gt;assoc_size +</div><div class='add'>+		aead_parms-&gt;iv_len + aead_parms-&gt;aad_pad_len;</div><div class='add'>+</div><div class='add'>+	/* total size of the DB data (without STAT word padding) */</div><div class='add'>+	unsigned int real_db_size = spu_real_db_size(aead_parms-&gt;assoc_size,</div><div class='add'>+						 aead_parms-&gt;iv_len,</div><div class='add'>+						 hash_parms-&gt;prebuf_len,</div><div class='add'>+						 data_size,</div><div class='add'>+						 aead_parms-&gt;aad_pad_len,</div><div class='add'>+						 aead_parms-&gt;data_pad_len,</div><div class='add'>+						 hash_parms-&gt;pad_len);</div><div class='add'>+</div><div class='add'>+	unsigned int auth_offset = 0;</div><div class='add'>+	unsigned int offset_iv = 0;</div><div class='add'>+</div><div class='add'>+	/* size/offset of the auth payload */</div><div class='add'>+	unsigned int auth_len;</div><div class='add'>+</div><div class='add'>+	auth_len = real_db_size;</div><div class='add'>+</div><div class='add'>+	if (req_opts-&gt;is_aead &amp;&amp; req_opts-&gt;is_inbound)</div><div class='add'>+		cipher_len -= hash_parms-&gt;digestsize;</div><div class='add'>+</div><div class='add'>+	if (req_opts-&gt;is_aead &amp;&amp; req_opts-&gt;is_inbound)</div><div class='add'>+		auth_len -= hash_parms-&gt;digestsize;</div><div class='add'>+</div><div class='add'>+	if ((hash_parms-&gt;alg == HASH_ALG_AES) &amp;&amp;</div><div class='add'>+	    (hash_parms-&gt;mode == HASH_MODE_XCBC)) {</div><div class='add'>+		auth_len -= hash_parms-&gt;pad_len;</div><div class='add'>+		cipher_len -= hash_parms-&gt;pad_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flow_log("%s()\n", __func__);</div><div class='add'>+	flow_log("  in:%u authFirst:%u\n",</div><div class='add'>+		 req_opts-&gt;is_inbound, req_opts-&gt;auth_first);</div><div class='add'>+	flow_log("  %s. cipher alg:%u mode:%u type %u\n",</div><div class='add'>+		 spu_alg_name(cipher_parms-&gt;alg, cipher_parms-&gt;mode),</div><div class='add'>+		 cipher_parms-&gt;alg, cipher_parms-&gt;mode, cipher_parms-&gt;type);</div><div class='add'>+	flow_log("    key: %d\n", cipher_parms-&gt;key_len);</div><div class='add'>+	flow_dump("    key: ", cipher_parms-&gt;key_buf, cipher_parms-&gt;key_len);</div><div class='add'>+	flow_log("    iv: %d\n", cipher_parms-&gt;iv_len);</div><div class='add'>+	flow_dump("    iv: ", cipher_parms-&gt;iv_buf, cipher_parms-&gt;iv_len);</div><div class='add'>+	flow_log("  auth alg:%u mode:%u type %u\n",</div><div class='add'>+		 hash_parms-&gt;alg, hash_parms-&gt;mode, hash_parms-&gt;type);</div><div class='add'>+	flow_log("  digestsize: %u\n", hash_parms-&gt;digestsize);</div><div class='add'>+	flow_log("  authkey: %d\n", hash_parms-&gt;key_len);</div><div class='add'>+	flow_dump("  authkey: ", hash_parms-&gt;key_buf, hash_parms-&gt;key_len);</div><div class='add'>+	flow_log("  assoc_size:%u\n", aead_parms-&gt;assoc_size);</div><div class='add'>+	flow_log("  prebuf_len:%u\n", hash_parms-&gt;prebuf_len);</div><div class='add'>+	flow_log("  data_size:%u\n", data_size);</div><div class='add'>+	flow_log("  hash_pad_len:%u\n", hash_parms-&gt;pad_len);</div><div class='add'>+	flow_log("  real_db_size:%u\n", real_db_size);</div><div class='add'>+	flow_log(" auth_offset:%u auth_len:%u cipher_offset:%u cipher_len:%u\n",</div><div class='add'>+		 auth_offset, auth_len, cipher_offset, cipher_len);</div><div class='add'>+	flow_log("  aead_iv: %u\n", aead_parms-&gt;iv_len);</div><div class='add'>+</div><div class='add'>+	/* starting out: zero the header (plus some) */</div><div class='add'>+	ptr = spu_hdr;</div><div class='add'>+	memset(ptr, 0, sizeof(struct SPUHEADER));</div><div class='add'>+</div><div class='add'>+	/* format master header word */</div><div class='add'>+	/* Do not set the next bit even though the datasheet says to */</div><div class='add'>+	spuh = (struct SPUHEADER *)ptr;</div><div class='add'>+	ptr += sizeof(struct SPUHEADER);</div><div class='add'>+	buf_len += sizeof(struct SPUHEADER);</div><div class='add'>+</div><div class='add'>+	spuh-&gt;mh.op_code = SPU_CRYPTO_OPERATION_GENERIC;</div><div class='add'>+	spuh-&gt;mh.flags |= (MH_SCTX_PRES | MH_BDESC_PRES | MH_BD_PRES);</div><div class='add'>+</div><div class='add'>+	/* Format sctx word 0 (protocol_bits) */</div><div class='add'>+	sctx_words = 3;		/* size in words */</div><div class='add'>+</div><div class='add'>+	/* Format sctx word 1 (cipher_bits) */</div><div class='add'>+	if (req_opts-&gt;is_inbound)</div><div class='add'>+		cipher_bits |= CIPHER_INBOUND;</div><div class='add'>+	if (req_opts-&gt;auth_first)</div><div class='add'>+		cipher_bits |= CIPHER_ORDER;</div><div class='add'>+</div><div class='add'>+	/* Set the crypto parameters in the cipher.flags */</div><div class='add'>+	cipher_bits |= cipher_parms-&gt;alg &lt;&lt; CIPHER_ALG_SHIFT;</div><div class='add'>+	cipher_bits |= cipher_parms-&gt;mode &lt;&lt; CIPHER_MODE_SHIFT;</div><div class='add'>+	cipher_bits |= cipher_parms-&gt;type &lt;&lt; CIPHER_TYPE_SHIFT;</div><div class='add'>+</div><div class='add'>+	/* Set the auth parameters in the cipher.flags */</div><div class='add'>+	cipher_bits |= hash_parms-&gt;alg &lt;&lt; HASH_ALG_SHIFT;</div><div class='add'>+	cipher_bits |= hash_parms-&gt;mode &lt;&lt; HASH_MODE_SHIFT;</div><div class='add'>+	cipher_bits |= hash_parms-&gt;type &lt;&lt; HASH_TYPE_SHIFT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Format sctx extensions if required, and update main fields if</div><div class='add'>+	 * required)</div><div class='add'>+	 */</div><div class='add'>+	if (hash_parms-&gt;alg) {</div><div class='add'>+		/* Write the authentication key material if present */</div><div class='add'>+		if (hash_parms-&gt;key_len) {</div><div class='add'>+			memcpy(ptr, hash_parms-&gt;key_buf, hash_parms-&gt;key_len);</div><div class='add'>+			ptr += hash_parms-&gt;key_len;</div><div class='add'>+			buf_len += hash_parms-&gt;key_len;</div><div class='add'>+			sctx_words += hash_parms-&gt;key_len / 4;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((cipher_parms-&gt;mode == CIPHER_MODE_GCM) ||</div><div class='add'>+		    (cipher_parms-&gt;mode == CIPHER_MODE_CCM))</div><div class='add'>+			/* unpadded length */</div><div class='add'>+			offset_iv = aead_parms-&gt;assoc_size;</div><div class='add'>+</div><div class='add'>+		/* if GCM/CCM we need to write ICV into the payload */</div><div class='add'>+		if (!req_opts-&gt;is_inbound) {</div><div class='add'>+			if ((cipher_parms-&gt;mode == CIPHER_MODE_GCM) ||</div><div class='add'>+			    (cipher_parms-&gt;mode == CIPHER_MODE_CCM))</div><div class='add'>+				ecf_bits |= 1 &lt;&lt; INSERT_ICV_SHIFT;</div><div class='add'>+		} else {</div><div class='add'>+			ecf_bits |= CHECK_ICV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Inform the SPU of the ICV size (in words) */</div><div class='add'>+		if (hash_parms-&gt;digestsize == 64)</div><div class='add'>+			cipher_bits |= ICV_IS_512;</div><div class='add'>+		else</div><div class='add'>+			ecf_bits |=</div><div class='add'>+			(hash_parms-&gt;digestsize / 4) &lt;&lt; ICV_SIZE_SHIFT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (req_opts-&gt;bd_suppress)</div><div class='add'>+		ecf_bits |= BD_SUPPRESS;</div><div class='add'>+</div><div class='add'>+	/* copy the encryption keys in the SAD entry */</div><div class='add'>+	if (cipher_parms-&gt;alg) {</div><div class='add'>+		if (cipher_parms-&gt;key_len) {</div><div class='add'>+			memcpy(ptr, cipher_parms-&gt;key_buf,</div><div class='add'>+			       cipher_parms-&gt;key_len);</div><div class='add'>+			ptr += cipher_parms-&gt;key_len;</div><div class='add'>+			buf_len += cipher_parms-&gt;key_len;</div><div class='add'>+			sctx_words += cipher_parms-&gt;key_len / 4;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * if encrypting then set IV size, use SCTX IV unless no IV</div><div class='add'>+		 * given here</div><div class='add'>+		 */</div><div class='add'>+		if (cipher_parms-&gt;iv_buf &amp;&amp; cipher_parms-&gt;iv_len) {</div><div class='add'>+			/* Use SCTX IV */</div><div class='add'>+			ecf_bits |= SCTX_IV;</div><div class='add'>+</div><div class='add'>+			/* cipher iv provided so put it in here */</div><div class='add'>+			memcpy(ptr, cipher_parms-&gt;iv_buf, cipher_parms-&gt;iv_len);</div><div class='add'>+</div><div class='add'>+			ptr += cipher_parms-&gt;iv_len;</div><div class='add'>+			buf_len += cipher_parms-&gt;iv_len;</div><div class='add'>+			sctx_words += cipher_parms-&gt;iv_len / 4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RFC4543 (GMAC/ESP) requires data to be sent as part of AAD</div><div class='add'>+	 * so we need to override the BDESC parameters.</div><div class='add'>+	 */</div><div class='add'>+	if (req_opts-&gt;is_rfc4543) {</div><div class='add'>+		if (req_opts-&gt;is_inbound)</div><div class='add'>+			data_size -= hash_parms-&gt;digestsize;</div><div class='add'>+		offset_iv = aead_parms-&gt;assoc_size + data_size;</div><div class='add'>+		cipher_len = 0;</div><div class='add'>+		cipher_offset = offset_iv;</div><div class='add'>+		auth_len = cipher_offset + aead_parms-&gt;data_pad_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* write in the total sctx length now that we know it */</div><div class='add'>+	protocol_bits |= sctx_words;</div><div class='add'>+</div><div class='add'>+	/* Endian adjust the SCTX */</div><div class='add'>+	spuh-&gt;sa.proto_flags = cpu_to_be32(protocol_bits);</div><div class='add'>+	spuh-&gt;sa.cipher_flags = cpu_to_be32(cipher_bits);</div><div class='add'>+	spuh-&gt;sa.ecf = cpu_to_be32(ecf_bits);</div><div class='add'>+</div><div class='add'>+	/* === create the BDESC section === */</div><div class='add'>+	bdesc = (struct BDESC_HEADER *)ptr;</div><div class='add'>+</div><div class='add'>+	bdesc-&gt;offset_mac = cpu_to_be16(auth_offset);</div><div class='add'>+	bdesc-&gt;length_mac = cpu_to_be16(auth_len);</div><div class='add'>+	bdesc-&gt;offset_crypto = cpu_to_be16(cipher_offset);</div><div class='add'>+	bdesc-&gt;length_crypto = cpu_to_be16(cipher_len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CCM in SPU-M requires that ICV not be in same 32-bit word as data or</div><div class='add'>+	 * padding.  So account for padding as necessary.</div><div class='add'>+	 */</div><div class='add'>+	if (cipher_parms-&gt;mode == CIPHER_MODE_CCM)</div><div class='add'>+		auth_len += spum_wordalign_padlen(auth_len);</div><div class='add'>+</div><div class='add'>+	bdesc-&gt;offset_icv = cpu_to_be16(auth_len);</div><div class='add'>+	bdesc-&gt;offset_iv = cpu_to_be16(offset_iv);</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(struct BDESC_HEADER);</div><div class='add'>+	buf_len += sizeof(struct BDESC_HEADER);</div><div class='add'>+</div><div class='add'>+	/* === no MFM section === */</div><div class='add'>+</div><div class='add'>+	/* === create the BD section === */</div><div class='add'>+</div><div class='add'>+	/* add the BD header */</div><div class='add'>+	bd = (struct BD_HEADER *)ptr;</div><div class='add'>+	bd-&gt;size = cpu_to_be16(real_db_size);</div><div class='add'>+	bd-&gt;prev_length = 0;</div><div class='add'>+</div><div class='add'>+	ptr += sizeof(struct BD_HEADER);</div><div class='add'>+	buf_len += sizeof(struct BD_HEADER);</div><div class='add'>+</div><div class='add'>+	packet_dump("  SPU request header: ", spu_hdr, buf_len);</div><div class='add'>+</div><div class='add'>+	return buf_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_cipher_req_init() - Build a SPU request message header, up to and</div><div class='add'>+ * including the BD header.</div><div class='add'>+ * @spu_hdr:      Start of SPU request header (MH)</div><div class='add'>+ * @cipher_parms: Parameters that describe the cipher request</div><div class='add'>+ *</div><div class='add'>+ * Construct the message starting at spu_hdr. Caller should allocate this buffer</div><div class='add'>+ * in DMA-able memory at least SPU_HEADER_ALLOC_LEN bytes long.</div><div class='add'>+ *</div><div class='add'>+ * Return: the length of the SPU header in bytes. 0 if an error occurs.</div><div class='add'>+ */</div><div class='add'>+u16 spum_cipher_req_init(u8 *spu_hdr, struct spu_cipher_parms *cipher_parms)</div><div class='add'>+{</div><div class='add'>+	struct SPUHEADER *spuh;</div><div class='add'>+	u32 protocol_bits = 0;</div><div class='add'>+	u32 cipher_bits = 0;</div><div class='add'>+	u32 ecf_bits = 0;</div><div class='add'>+	u8 sctx_words = 0;</div><div class='add'>+	u8 *ptr = spu_hdr;</div><div class='add'>+</div><div class='add'>+	flow_log("%s()\n", __func__);</div><div class='add'>+	flow_log("  cipher alg:%u mode:%u type %u\n", cipher_parms-&gt;alg,</div><div class='add'>+		 cipher_parms-&gt;mode, cipher_parms-&gt;type);</div><div class='add'>+	flow_log("  cipher_iv_len: %u\n", cipher_parms-&gt;iv_len);</div><div class='add'>+	flow_log("    key: %d\n", cipher_parms-&gt;key_len);</div><div class='add'>+	flow_dump("    key: ", cipher_parms-&gt;key_buf, cipher_parms-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	/* starting out: zero the header (plus some) */</div><div class='add'>+	memset(spu_hdr, 0, sizeof(struct SPUHEADER));</div><div class='add'>+	ptr += sizeof(struct SPUHEADER);</div><div class='add'>+</div><div class='add'>+	/* format master header word */</div><div class='add'>+	/* Do not set the next bit even though the datasheet says to */</div><div class='add'>+	spuh = (struct SPUHEADER *)spu_hdr;</div><div class='add'>+</div><div class='add'>+	spuh-&gt;mh.op_code = SPU_CRYPTO_OPERATION_GENERIC;</div><div class='add'>+	spuh-&gt;mh.flags |= (MH_SCTX_PRES | MH_BDESC_PRES | MH_BD_PRES);</div><div class='add'>+</div><div class='add'>+	/* Format sctx word 0 (protocol_bits) */</div><div class='add'>+	sctx_words = 3;		/* size in words */</div><div class='add'>+</div><div class='add'>+	/* copy the encryption keys in the SAD entry */</div><div class='add'>+	if (cipher_parms-&gt;alg) {</div><div class='add'>+		if (cipher_parms-&gt;key_len) {</div><div class='add'>+			ptr += cipher_parms-&gt;key_len;</div><div class='add'>+			sctx_words += cipher_parms-&gt;key_len / 4;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * if encrypting then set IV size, use SCTX IV unless no IV</div><div class='add'>+		 * given here</div><div class='add'>+		 */</div><div class='add'>+		if (cipher_parms-&gt;iv_len) {</div><div class='add'>+			/* Use SCTX IV */</div><div class='add'>+			ecf_bits |= SCTX_IV;</div><div class='add'>+			ptr += cipher_parms-&gt;iv_len;</div><div class='add'>+			sctx_words += cipher_parms-&gt;iv_len / 4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the crypto parameters in the cipher.flags */</div><div class='add'>+	cipher_bits |= cipher_parms-&gt;alg &lt;&lt; CIPHER_ALG_SHIFT;</div><div class='add'>+	cipher_bits |= cipher_parms-&gt;mode &lt;&lt; CIPHER_MODE_SHIFT;</div><div class='add'>+	cipher_bits |= cipher_parms-&gt;type &lt;&lt; CIPHER_TYPE_SHIFT;</div><div class='add'>+</div><div class='add'>+	/* copy the encryption keys in the SAD entry */</div><div class='add'>+	if (cipher_parms-&gt;alg &amp;&amp; cipher_parms-&gt;key_len)</div><div class='add'>+		memcpy(spuh + 1, cipher_parms-&gt;key_buf, cipher_parms-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	/* write in the total sctx length now that we know it */</div><div class='add'>+	protocol_bits |= sctx_words;</div><div class='add'>+</div><div class='add'>+	/* Endian adjust the SCTX */</div><div class='add'>+	spuh-&gt;sa.proto_flags = cpu_to_be32(protocol_bits);</div><div class='add'>+</div><div class='add'>+	/* Endian adjust the SCTX */</div><div class='add'>+	spuh-&gt;sa.cipher_flags = cpu_to_be32(cipher_bits);</div><div class='add'>+	spuh-&gt;sa.ecf = cpu_to_be32(ecf_bits);</div><div class='add'>+</div><div class='add'>+	packet_dump("  SPU request header: ", spu_hdr,</div><div class='add'>+		    sizeof(struct SPUHEADER));</div><div class='add'>+</div><div class='add'>+	return sizeof(struct SPUHEADER) + cipher_parms-&gt;key_len +</div><div class='add'>+		cipher_parms-&gt;iv_len + sizeof(struct BDESC_HEADER) +</div><div class='add'>+		sizeof(struct BD_HEADER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_cipher_req_finish() - Finish building a SPU request message header for a</div><div class='add'>+ * block cipher request. Assumes much of the header was already filled in at</div><div class='add'>+ * setkey() time in spu_cipher_req_init().</div><div class='add'>+ * @spu_hdr:         Start of the request message header (MH field)</div><div class='add'>+ * @spu_req_hdr_len: Length in bytes of the SPU request header</div><div class='add'>+ * @isInbound:       0 encrypt, 1 decrypt</div><div class='add'>+ * @cipher_parms:    Parameters describing cipher operation to be performed</div><div class='add'>+ * @update_key:      If true, rewrite the cipher key in SCTX</div><div class='add'>+ * @data_size:       Length of the data in the BD field</div><div class='add'>+ *</div><div class='add'>+ * Assumes much of the header was already filled in at setkey() time in</div><div class='add'>+ * spum_cipher_req_init().</div><div class='add'>+ * spum_cipher_req_init() fills in the encryption key. For RC4, when submitting</div><div class='add'>+ * a request for a non-first chunk, we use the 260-byte SUPDT field from the</div><div class='add'>+ * previous response as the key. update_key is true for this case. Unused in all</div><div class='add'>+ * other cases.</div><div class='add'>+ */</div><div class='add'>+void spum_cipher_req_finish(u8 *spu_hdr,</div><div class='add'>+			    u16 spu_req_hdr_len,</div><div class='add'>+			    unsigned int is_inbound,</div><div class='add'>+			    struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			    bool update_key,</div><div class='add'>+			    unsigned int data_size)</div><div class='add'>+{</div><div class='add'>+	struct SPUHEADER *spuh;</div><div class='add'>+	struct BDESC_HEADER *bdesc;</div><div class='add'>+	struct BD_HEADER *bd;</div><div class='add'>+	u8 *bdesc_ptr = spu_hdr + spu_req_hdr_len -</div><div class='add'>+	    (sizeof(struct BD_HEADER) + sizeof(struct BDESC_HEADER));</div><div class='add'>+</div><div class='add'>+	u32 cipher_bits;</div><div class='add'>+</div><div class='add'>+	flow_log("%s()\n", __func__);</div><div class='add'>+	flow_log(" in: %u\n", is_inbound);</div><div class='add'>+	flow_log(" cipher alg: %u, cipher_type: %u\n", cipher_parms-&gt;alg,</div><div class='add'>+		 cipher_parms-&gt;type);</div><div class='add'>+	if (update_key) {</div><div class='add'>+		flow_log(" cipher key len: %u\n", cipher_parms-&gt;key_len);</div><div class='add'>+		flow_dump("  key: ", cipher_parms-&gt;key_buf,</div><div class='add'>+			  cipher_parms-&gt;key_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In XTS mode, API puts "i" parameter (block tweak) in IV.  For</div><div class='add'>+	 * SPU-M, should be in start of the BD; tx_sg_create() copies it there.</div><div class='add'>+	 * IV in SPU msg for SPU-M should be 0, since that's the "j" parameter</div><div class='add'>+	 * (block ctr within larger data unit) - given we can send entire disk</div><div class='add'>+	 * block (&lt;= 4KB) in 1 SPU msg, don't need to use this parameter.</div><div class='add'>+	 */</div><div class='add'>+	if (cipher_parms-&gt;mode == CIPHER_MODE_XTS)</div><div class='add'>+		memset(cipher_parms-&gt;iv_buf, 0, cipher_parms-&gt;iv_len);</div><div class='add'>+</div><div class='add'>+	flow_log(" iv len: %d\n", cipher_parms-&gt;iv_len);</div><div class='add'>+	flow_dump("    iv: ", cipher_parms-&gt;iv_buf, cipher_parms-&gt;iv_len);</div><div class='add'>+	flow_log(" data_size: %u\n", data_size);</div><div class='add'>+</div><div class='add'>+	/* format master header word */</div><div class='add'>+	/* Do not set the next bit even though the datasheet says to */</div><div class='add'>+	spuh = (struct SPUHEADER *)spu_hdr;</div><div class='add'>+</div><div class='add'>+	/* cipher_bits was initialized at setkey time */</div><div class='add'>+	cipher_bits = be32_to_cpu(spuh-&gt;sa.cipher_flags);</div><div class='add'>+</div><div class='add'>+	/* Format sctx word 1 (cipher_bits) */</div><div class='add'>+	if (is_inbound)</div><div class='add'>+		cipher_bits |= CIPHER_INBOUND;</div><div class='add'>+	else</div><div class='add'>+		cipher_bits &amp;= ~CIPHER_INBOUND;</div><div class='add'>+</div><div class='add'>+	/* update encryption key for RC4 on non-first chunk */</div><div class='add'>+	if (update_key) {</div><div class='add'>+		spuh-&gt;sa.cipher_flags |=</div><div class='add'>+			cipher_parms-&gt;type &lt;&lt; CIPHER_TYPE_SHIFT;</div><div class='add'>+		memcpy(spuh + 1, cipher_parms-&gt;key_buf, cipher_parms-&gt;key_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cipher_parms-&gt;alg &amp;&amp; cipher_parms-&gt;iv_buf &amp;&amp; cipher_parms-&gt;iv_len)</div><div class='add'>+		/* cipher iv provided so put it in here */</div><div class='add'>+		memcpy(bdesc_ptr - cipher_parms-&gt;iv_len, cipher_parms-&gt;iv_buf,</div><div class='add'>+		       cipher_parms-&gt;iv_len);</div><div class='add'>+</div><div class='add'>+	spuh-&gt;sa.cipher_flags = cpu_to_be32(cipher_bits);</div><div class='add'>+</div><div class='add'>+	/* === create the BDESC section === */</div><div class='add'>+	bdesc = (struct BDESC_HEADER *)bdesc_ptr;</div><div class='add'>+	bdesc-&gt;offset_mac = 0;</div><div class='add'>+	bdesc-&gt;length_mac = 0;</div><div class='add'>+	bdesc-&gt;offset_crypto = 0;</div><div class='add'>+</div><div class='add'>+	/* XTS mode, data_size needs to include tweak parameter */</div><div class='add'>+	if (cipher_parms-&gt;mode == CIPHER_MODE_XTS)</div><div class='add'>+		bdesc-&gt;length_crypto = cpu_to_be16(data_size +</div><div class='add'>+						  SPU_XTS_TWEAK_SIZE);</div><div class='add'>+	else</div><div class='add'>+		bdesc-&gt;length_crypto = cpu_to_be16(data_size);</div><div class='add'>+</div><div class='add'>+	bdesc-&gt;offset_icv = 0;</div><div class='add'>+	bdesc-&gt;offset_iv = 0;</div><div class='add'>+</div><div class='add'>+	/* === no MFM section === */</div><div class='add'>+</div><div class='add'>+	/* === create the BD section === */</div><div class='add'>+	/* add the BD header */</div><div class='add'>+	bd = (struct BD_HEADER *)(bdesc_ptr + sizeof(struct BDESC_HEADER));</div><div class='add'>+	bd-&gt;size = cpu_to_be16(data_size);</div><div class='add'>+</div><div class='add'>+	/* XTS mode, data_size needs to include tweak parameter */</div><div class='add'>+	if (cipher_parms-&gt;mode == CIPHER_MODE_XTS)</div><div class='add'>+		bd-&gt;size = cpu_to_be16(data_size + SPU_XTS_TWEAK_SIZE);</div><div class='add'>+	else</div><div class='add'>+		bd-&gt;size = cpu_to_be16(data_size);</div><div class='add'>+</div><div class='add'>+	bd-&gt;prev_length = 0;</div><div class='add'>+</div><div class='add'>+	packet_dump("  SPU request header: ", spu_hdr, spu_req_hdr_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_request_pad() - Create pad bytes at the end of the data.</div><div class='add'>+ * @pad_start:		Start of buffer where pad bytes are to be written</div><div class='add'>+ * @gcm_ccm_padding:	length of GCM/CCM padding, in bytes</div><div class='add'>+ * @hash_pad_len:	Number of bytes of padding extend data to full block</div><div class='add'>+ * @auth_alg:		authentication algorithm</div><div class='add'>+ * @auth_mode:		authentication mode</div><div class='add'>+ * @total_sent:		length inserted at end of hash pad</div><div class='add'>+ * @status_padding:	Number of bytes of padding to align STATUS word</div><div class='add'>+ *</div><div class='add'>+ * There may be three forms of pad:</div><div class='add'>+ *  1. GCM/CCM pad - for GCM/CCM mode ciphers, pad to 16-byte alignment</div><div class='add'>+ *  2. hash pad - pad to a block length, with 0x80 data terminator and</div><div class='add'>+ *                size at the end</div><div class='add'>+ *  3. STAT pad - to ensure the STAT field is 4-byte aligned</div><div class='add'>+ */</div><div class='add'>+void spum_request_pad(u8 *pad_start,</div><div class='add'>+		      u32 gcm_ccm_padding,</div><div class='add'>+		      u32 hash_pad_len,</div><div class='add'>+		      enum hash_alg auth_alg,</div><div class='add'>+		      enum hash_mode auth_mode,</div><div class='add'>+		      unsigned int total_sent, u32 status_padding)</div><div class='add'>+{</div><div class='add'>+	u8 *ptr = pad_start;</div><div class='add'>+</div><div class='add'>+	/* fix data alignent for GCM/CCM */</div><div class='add'>+	if (gcm_ccm_padding &gt; 0) {</div><div class='add'>+		flow_log("  GCM: padding to 16 byte alignment: %u bytes\n",</div><div class='add'>+			 gcm_ccm_padding);</div><div class='add'>+		memset(ptr, 0, gcm_ccm_padding);</div><div class='add'>+		ptr += gcm_ccm_padding;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hash_pad_len &gt; 0) {</div><div class='add'>+		/* clear the padding section */</div><div class='add'>+		memset(ptr, 0, hash_pad_len);</div><div class='add'>+</div><div class='add'>+		if ((auth_alg == HASH_ALG_AES) &amp;&amp;</div><div class='add'>+		    (auth_mode == HASH_MODE_XCBC)) {</div><div class='add'>+			/* AES/XCBC just requires padding to be 0s */</div><div class='add'>+			ptr += hash_pad_len;</div><div class='add'>+		} else {</div><div class='add'>+			/* terminate the data */</div><div class='add'>+			*ptr = 0x80;</div><div class='add'>+			ptr += (hash_pad_len - sizeof(u64));</div><div class='add'>+</div><div class='add'>+			/* add the size at the end as required per alg */</div><div class='add'>+			if (auth_alg == HASH_ALG_MD5)</div><div class='add'>+				*(u64 *)ptr = cpu_to_le64((u64)total_sent * 8);</div><div class='add'>+			else		/* SHA1, SHA2-224, SHA2-256 */</div><div class='add'>+				*(u64 *)ptr = cpu_to_be64((u64)total_sent * 8);</div><div class='add'>+			ptr += sizeof(u64);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pad to a 4byte alignment for STAT */</div><div class='add'>+	if (status_padding &gt; 0) {</div><div class='add'>+		flow_log("  STAT: padding to 4 byte alignment: %u bytes\n",</div><div class='add'>+			 status_padding);</div><div class='add'>+</div><div class='add'>+		memset(ptr, 0, status_padding);</div><div class='add'>+		ptr += status_padding;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_xts_tweak_in_payload() - Indicate that SPUM DOES place the XTS tweak</div><div class='add'>+ * field in the packet payload (rather than using IV)</div><div class='add'>+ *</div><div class='add'>+ * Return: 1</div><div class='add'>+ */</div><div class='add'>+u8 spum_xts_tweak_in_payload(void)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_tx_status_len() - Return the length of the STATUS field in a SPU</div><div class='add'>+ * response message.</div><div class='add'>+ *</div><div class='add'>+ * Return: Length of STATUS field in bytes.</div><div class='add'>+ */</div><div class='add'>+u8 spum_tx_status_len(void)</div><div class='add'>+{</div><div class='add'>+	return SPU_TX_STATUS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_rx_status_len() - Return the length of the STATUS field in a SPU</div><div class='add'>+ * response message.</div><div class='add'>+ *</div><div class='add'>+ * Return: Length of STATUS field in bytes.</div><div class='add'>+ */</div><div class='add'>+u8 spum_rx_status_len(void)</div><div class='add'>+{</div><div class='add'>+	return SPU_RX_STATUS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_status_process() - Process the status from a SPU response message.</div><div class='add'>+ * @statp:  start of STATUS word</div><div class='add'>+ * Return:</div><div class='add'>+ *   0 - if status is good and response should be processed</div><div class='add'>+ *   !0 - status indicates an error and response is invalid</div><div class='add'>+ */</div><div class='add'>+int spum_status_process(u8 *statp)</div><div class='add'>+{</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	status = __be32_to_cpu(*(__be32 *)statp);</div><div class='add'>+	flow_log("SPU response STATUS %#08x\n", status);</div><div class='add'>+	if (status &amp; SPU_STATUS_ERROR_FLAG) {</div><div class='add'>+		pr_err("%s() Warning: Error result from SPU: %#08x\n",</div><div class='add'>+		       __func__, status);</div><div class='add'>+		if (status &amp; SPU_STATUS_INVALID_ICV)</div><div class='add'>+			return SPU_INVALID_ICV;</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_ccm_update_iv() - Update the IV as per the requirements for CCM mode.</div><div class='add'>+ *</div><div class='add'>+ * @digestsize:		Digest size of this request</div><div class='add'>+ * @cipher_parms:	(pointer to) cipher parmaeters, includes IV buf &amp; IV len</div><div class='add'>+ * @assoclen:		Length of AAD data</div><div class='add'>+ * @chunksize:		length of input data to be sent in this req</div><div class='add'>+ * @is_encrypt:		true if this is an output/encrypt operation</div><div class='add'>+ * @is_esp:		true if this is an ESP / RFC4309 operation</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void spum_ccm_update_iv(unsigned int digestsize,</div><div class='add'>+			struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			unsigned int assoclen,</div><div class='add'>+			unsigned int chunksize,</div><div class='add'>+			bool is_encrypt,</div><div class='add'>+			bool is_esp)</div><div class='add'>+{</div><div class='add'>+	u8 L;		/* L from CCM algorithm, length of plaintext data */</div><div class='add'>+	u8 mprime;	/* M' from CCM algo, (M - 2) / 2, where M=authsize */</div><div class='add'>+	u8 adata;</div><div class='add'>+</div><div class='add'>+	if (cipher_parms-&gt;iv_len != CCM_AES_IV_SIZE) {</div><div class='add'>+		pr_err("%s(): Invalid IV len %d for CCM mode, should be %d\n",</div><div class='add'>+		       __func__, cipher_parms-&gt;iv_len, CCM_AES_IV_SIZE);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IV needs to be formatted as follows:</div><div class='add'>+	 *</div><div class='add'>+	 * |          Byte 0               | Bytes 1 - N | Bytes (N+1) - 15 |</div><div class='add'>+	 * | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | Bits 7 - 0  |    Bits 7 - 0    |</div><div class='add'>+	 * | 0 |Ad?|(M - 2) / 2|   L - 1   |    Nonce    | Plaintext Length |</div><div class='add'>+	 *</div><div class='add'>+	 * Ad? = 1 if AAD present, 0 if not present</div><div class='add'>+	 * M = size of auth field, 8, 12, or 16 bytes (SPU-M) -or-</div><div class='add'>+	 *                         4, 6, 8, 10, 12, 14, 16 bytes (SPU2)</div><div class='add'>+	 * L = Size of Plaintext Length field; Nonce size = 15 - L</div><div class='add'>+	 *</div><div class='add'>+	 * It appears that the crypto API already expects the L-1 portion</div><div class='add'>+	 * to be set in the first byte of the IV, which implicitly determines</div><div class='add'>+	 * the nonce size, and also fills in the nonce.  But the other bits</div><div class='add'>+	 * in byte 0 as well as the plaintext length need to be filled in.</div><div class='add'>+	 *</div><div class='add'>+	 * In rfc4309/esp mode, L is not already in the supplied IV and</div><div class='add'>+	 * we need to fill it in, as well as move the IV data to be after</div><div class='add'>+	 * the salt</div><div class='add'>+	 */</div><div class='add'>+	if (is_esp) {</div><div class='add'>+		L = CCM_ESP_L_VALUE;	/* RFC4309 has fixed L */</div><div class='add'>+	} else {</div><div class='add'>+		/* L' = plaintext length - 1 so Plaintext length is L' + 1 */</div><div class='add'>+		L = ((cipher_parms-&gt;iv_buf[0] &amp; CCM_B0_L_PRIME) &gt;&gt;</div><div class='add'>+		      CCM_B0_L_PRIME_SHIFT) + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mprime = (digestsize - 2) &gt;&gt; 1;  /* M' = (M - 2) / 2 */</div><div class='add'>+	adata = (assoclen &gt; 0);  /* adata = 1 if any associated data */</div><div class='add'>+</div><div class='add'>+	cipher_parms-&gt;iv_buf[0] = (adata &lt;&lt; CCM_B0_ADATA_SHIFT) |</div><div class='add'>+				  (mprime &lt;&lt; CCM_B0_M_PRIME_SHIFT) |</div><div class='add'>+				  ((L - 1) &lt;&lt; CCM_B0_L_PRIME_SHIFT);</div><div class='add'>+</div><div class='add'>+	/* Nonce is already filled in by crypto API, and is 15 - L bytes */</div><div class='add'>+</div><div class='add'>+	/* Don't include digest in plaintext size when decrypting */</div><div class='add'>+	if (!is_encrypt)</div><div class='add'>+		chunksize -= digestsize;</div><div class='add'>+</div><div class='add'>+	/* Fill in length of plaintext, formatted to be L bytes long */</div><div class='add'>+	format_value_ccm(chunksize, &amp;cipher_parms-&gt;iv_buf[15 - L + 1], L);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spum_wordalign_padlen() - Given the length of a data field, determine the</div><div class='add'>+ * padding required to align the data following this field on a 4-byte boundary.</div><div class='add'>+ * @data_size: length of data field in bytes</div><div class='add'>+ *</div><div class='add'>+ * Return: length of status field padding, in bytes</div><div class='add'>+ */</div><div class='add'>+u32 spum_wordalign_padlen(u32 data_size)</div><div class='add'>+{</div><div class='add'>+	return ((data_size + 3) &amp; ~3) - data_size;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/crypto/bcm/spu.h b/drivers/crypto/bcm/spu.h<br/>new file mode 100644<br/>index 000000000000..aa6fc38db263<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bcm/spu.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/spu.h</a></div><div class='hunk'>@@ -0,0 +1,287 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Broadcom</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, version 2, as</div><div class='add'>+ * published by the Free Software Foundation (the "GPL").</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License version 2 (GPLv2) for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * version 2 (GPLv2) along with this source code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This file contains the definition of SPU messages. There are currently two</div><div class='add'>+ * SPU message formats: SPU-M and SPU2. The hardware uses different values to</div><div class='add'>+ * identify the same things in SPU-M vs SPU2. So this file defines values that</div><div class='add'>+ * are hardware independent. Software can use these values for any version of</div><div class='add'>+ * SPU hardware. These values are used in APIs in spu.c. Functions internal to</div><div class='add'>+ * spu.c and spu2.c convert these to hardware-specific values.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _SPU_H</div><div class='add'>+#define _SPU_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;crypto/sha.h&gt;</div><div class='add'>+</div><div class='add'>+enum spu_cipher_alg {</div><div class='add'>+	CIPHER_ALG_NONE = 0x0,</div><div class='add'>+	CIPHER_ALG_RC4 = 0x1,</div><div class='add'>+	CIPHER_ALG_DES = 0x2,</div><div class='add'>+	CIPHER_ALG_3DES = 0x3,</div><div class='add'>+	CIPHER_ALG_AES = 0x4,</div><div class='add'>+	CIPHER_ALG_LAST = 0x5</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum spu_cipher_mode {</div><div class='add'>+	CIPHER_MODE_NONE = 0x0,</div><div class='add'>+	CIPHER_MODE_ECB = 0x0,</div><div class='add'>+	CIPHER_MODE_CBC = 0x1,</div><div class='add'>+	CIPHER_MODE_OFB = 0x2,</div><div class='add'>+	CIPHER_MODE_CFB = 0x3,</div><div class='add'>+	CIPHER_MODE_CTR = 0x4,</div><div class='add'>+	CIPHER_MODE_CCM = 0x5,</div><div class='add'>+	CIPHER_MODE_GCM = 0x6,</div><div class='add'>+	CIPHER_MODE_XTS = 0x7,</div><div class='add'>+	CIPHER_MODE_LAST = 0x8</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum spu_cipher_type {</div><div class='add'>+	CIPHER_TYPE_NONE = 0x0,</div><div class='add'>+	CIPHER_TYPE_DES = 0x0,</div><div class='add'>+	CIPHER_TYPE_3DES = 0x0,</div><div class='add'>+	CIPHER_TYPE_INIT = 0x0,	/* used for ARC4 */</div><div class='add'>+	CIPHER_TYPE_AES128 = 0x0,</div><div class='add'>+	CIPHER_TYPE_AES192 = 0x1,</div><div class='add'>+	CIPHER_TYPE_UPDT = 0x1,	/* used for ARC4 */</div><div class='add'>+	CIPHER_TYPE_AES256 = 0x2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hash_alg {</div><div class='add'>+	HASH_ALG_NONE = 0x0,</div><div class='add'>+	HASH_ALG_MD5 = 0x1,</div><div class='add'>+	HASH_ALG_SHA1 = 0x2,</div><div class='add'>+	HASH_ALG_SHA224 = 0x3,</div><div class='add'>+	HASH_ALG_SHA256 = 0x4,</div><div class='add'>+	HASH_ALG_AES = 0x5,</div><div class='add'>+	HASH_ALG_SHA384 = 0x6,</div><div class='add'>+	HASH_ALG_SHA512 = 0x7,</div><div class='add'>+	/* Keep SHA3 algorithms at the end always */</div><div class='add'>+	HASH_ALG_SHA3_224 = 0x8,</div><div class='add'>+	HASH_ALG_SHA3_256 = 0x9,</div><div class='add'>+	HASH_ALG_SHA3_384 = 0xa,</div><div class='add'>+	HASH_ALG_SHA3_512 = 0xb,</div><div class='add'>+	HASH_ALG_LAST</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hash_mode {</div><div class='add'>+	HASH_MODE_NONE = 0x0,</div><div class='add'>+	HASH_MODE_HASH = 0x0,</div><div class='add'>+	HASH_MODE_XCBC = 0x0,</div><div class='add'>+	HASH_MODE_CMAC = 0x1,</div><div class='add'>+	HASH_MODE_CTXT = 0x1,</div><div class='add'>+	HASH_MODE_HMAC = 0x2,</div><div class='add'>+	HASH_MODE_RABIN = 0x4,</div><div class='add'>+	HASH_MODE_FHMAC = 0x6,</div><div class='add'>+	HASH_MODE_CCM = 0x5,</div><div class='add'>+	HASH_MODE_GCM = 0x6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hash_type {</div><div class='add'>+	HASH_TYPE_NONE = 0x0,</div><div class='add'>+	HASH_TYPE_FULL = 0x0,</div><div class='add'>+	HASH_TYPE_INIT = 0x1,</div><div class='add'>+	HASH_TYPE_UPDT = 0x2,</div><div class='add'>+	HASH_TYPE_FIN = 0x3,</div><div class='add'>+	HASH_TYPE_AES128 = 0x0,</div><div class='add'>+	HASH_TYPE_AES192 = 0x1,</div><div class='add'>+	HASH_TYPE_AES256 = 0x2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum aead_type {</div><div class='add'>+	AES_CCM,</div><div class='add'>+	AES_GCM,</div><div class='add'>+	AUTHENC,</div><div class='add'>+	AEAD_TYPE_LAST</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern char *hash_alg_name[HASH_ALG_LAST];</div><div class='add'>+extern char *aead_alg_name[AEAD_TYPE_LAST];</div><div class='add'>+</div><div class='add'>+struct spu_request_opts {</div><div class='add'>+	bool is_inbound;</div><div class='add'>+	bool auth_first;</div><div class='add'>+	bool is_aead;</div><div class='add'>+	bool is_esp;</div><div class='add'>+	bool bd_suppress;</div><div class='add'>+	bool is_rfc4543;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct spu_cipher_parms {</div><div class='add'>+	enum spu_cipher_alg  alg;</div><div class='add'>+	enum spu_cipher_mode mode;</div><div class='add'>+	enum spu_cipher_type type;</div><div class='add'>+	u8                  *key_buf;</div><div class='add'>+	u16                  key_len;</div><div class='add'>+	/* iv_buf and iv_len include salt, if applicable */</div><div class='add'>+	u8                  *iv_buf;</div><div class='add'>+	u16                  iv_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct spu_hash_parms {</div><div class='add'>+	enum hash_alg  alg;</div><div class='add'>+	enum hash_mode mode;</div><div class='add'>+	enum hash_type type;</div><div class='add'>+	u8             digestsize;</div><div class='add'>+	u8            *key_buf;</div><div class='add'>+	u16            key_len;</div><div class='add'>+	u16            prebuf_len;</div><div class='add'>+	/* length of hash pad. signed, needs to handle roll-overs */</div><div class='add'>+	int            pad_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct spu_aead_parms {</div><div class='add'>+	u32 assoc_size;</div><div class='add'>+	u16 iv_len;      /* length of IV field between assoc data and data */</div><div class='add'>+	u8  aad_pad_len; /* For AES GCM/CCM, length of padding after AAD */</div><div class='add'>+	u8  data_pad_len;/* For AES GCM/CCM, length of padding after data */</div><div class='add'>+	bool return_iv;  /* True if SPU should return an IV */</div><div class='add'>+	u32 ret_iv_len;  /* Length in bytes of returned IV */</div><div class='add'>+	u32 ret_iv_off;  /* Offset into full IV if partial IV returned */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/************** SPU sizes ***************/</div><div class='add'>+</div><div class='add'>+#define SPU_RX_STATUS_LEN  4</div><div class='add'>+</div><div class='add'>+/* Max length of padding for 4-byte alignment of STATUS field */</div><div class='add'>+#define SPU_STAT_PAD_MAX  4</div><div class='add'>+</div><div class='add'>+/* Max length of pad fragment. 4 is for 4-byte alignment of STATUS field */</div><div class='add'>+#define SPU_PAD_LEN_MAX (SPU_GCM_CCM_ALIGN + MAX_HASH_BLOCK_SIZE + \</div><div class='add'>+			 SPU_STAT_PAD_MAX)</div><div class='add'>+</div><div class='add'>+/* GCM and CCM require 16-byte alignment */</div><div class='add'>+#define SPU_GCM_CCM_ALIGN 16</div><div class='add'>+</div><div class='add'>+/* Length up SUPDT field in SPU response message for RC4 */</div><div class='add'>+#define SPU_SUPDT_LEN 260</div><div class='add'>+</div><div class='add'>+/* SPU status error codes. These used as common error codes across all</div><div class='add'>+ * SPU variants.</div><div class='add'>+ */</div><div class='add'>+#define SPU_INVALID_ICV  1</div><div class='add'>+</div><div class='add'>+/* Indicates no limit to the length of the payload in a SPU message */</div><div class='add'>+#define SPU_MAX_PAYLOAD_INF  0xFFFFFFFF</div><div class='add'>+</div><div class='add'>+/* Size of XTS tweak ("i" parameter), in bytes */</div><div class='add'>+#define SPU_XTS_TWEAK_SIZE 16</div><div class='add'>+</div><div class='add'>+/* CCM B_0 field definitions, common for SPU-M and SPU2 */</div><div class='add'>+#define CCM_B0_ADATA		0x40</div><div class='add'>+#define CCM_B0_ADATA_SHIFT	   6</div><div class='add'>+#define CCM_B0_M_PRIME		0x38</div><div class='add'>+#define CCM_B0_M_PRIME_SHIFT	   3</div><div class='add'>+#define CCM_B0_L_PRIME		0x07</div><div class='add'>+#define CCM_B0_L_PRIME_SHIFT	   0</div><div class='add'>+#define CCM_ESP_L_VALUE		   4</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_req_incl_icv() - Return true if SPU request message should include the</div><div class='add'>+ * ICV as a separate buffer.</div><div class='add'>+ * @cipher_mode:  the cipher mode being requested</div><div class='add'>+ * @is_encrypt:   true if encrypting. false if decrypting.</div><div class='add'>+ *</div><div class='add'>+ * Return:  true if ICV to be included as separate buffer</div><div class='add'>+ */</div><div class='add'>+static __always_inline  bool spu_req_incl_icv(enum spu_cipher_mode cipher_mode,</div><div class='add'>+					      bool is_encrypt)</div><div class='add'>+{</div><div class='add'>+	if ((cipher_mode == CIPHER_MODE_GCM) &amp;&amp; !is_encrypt)</div><div class='add'>+		return true;</div><div class='add'>+	if ((cipher_mode == CIPHER_MODE_CCM) &amp;&amp; !is_encrypt)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline u32 spu_real_db_size(u32 assoc_size,</div><div class='add'>+					    u32 aead_iv_buf_len,</div><div class='add'>+					    u32 prebuf_len,</div><div class='add'>+					    u32 data_size,</div><div class='add'>+					    u32 aad_pad_len,</div><div class='add'>+					    u32 gcm_pad_len,</div><div class='add'>+					    u32 hash_pad_len)</div><div class='add'>+{</div><div class='add'>+	return assoc_size + aead_iv_buf_len + prebuf_len + data_size +</div><div class='add'>+	    aad_pad_len + gcm_pad_len + hash_pad_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/************** SPU Functions Prototypes **************/</div><div class='add'>+</div><div class='add'>+void spum_dump_msg_hdr(u8 *buf, unsigned int buf_len);</div><div class='add'>+</div><div class='add'>+u32 spum_ns2_ctx_max_payload(enum spu_cipher_alg cipher_alg,</div><div class='add'>+			     enum spu_cipher_mode cipher_mode,</div><div class='add'>+			     unsigned int blocksize);</div><div class='add'>+u32 spum_nsp_ctx_max_payload(enum spu_cipher_alg cipher_alg,</div><div class='add'>+			     enum spu_cipher_mode cipher_mode,</div><div class='add'>+			     unsigned int blocksize);</div><div class='add'>+u32 spum_payload_length(u8 *spu_hdr);</div><div class='add'>+u16 spum_response_hdr_len(u16 auth_key_len, u16 enc_key_len, bool is_hash);</div><div class='add'>+u16 spum_hash_pad_len(enum hash_alg hash_alg, enum hash_mode hash_mode,</div><div class='add'>+		      u32 chunksize, u16 hash_block_size);</div><div class='add'>+u32 spum_gcm_ccm_pad_len(enum spu_cipher_mode cipher_mode,</div><div class='add'>+			 unsigned int data_size);</div><div class='add'>+u32 spum_assoc_resp_len(enum spu_cipher_mode cipher_mode,</div><div class='add'>+			unsigned int assoc_len, unsigned int iv_len,</div><div class='add'>+			bool is_encrypt);</div><div class='add'>+u8 spum_aead_ivlen(enum spu_cipher_mode cipher_mode, u16 iv_len);</div><div class='add'>+bool spu_req_incl_icv(enum spu_cipher_mode cipher_mode, bool is_encrypt);</div><div class='add'>+enum hash_type spum_hash_type(u32 src_sent);</div><div class='add'>+u32 spum_digest_size(u32 alg_digest_size, enum hash_alg alg,</div><div class='add'>+		     enum hash_type htype);</div><div class='add'>+</div><div class='add'>+u32 spum_create_request(u8 *spu_hdr,</div><div class='add'>+			struct spu_request_opts *req_opts,</div><div class='add'>+			struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			struct spu_hash_parms *hash_parms,</div><div class='add'>+			struct spu_aead_parms *aead_parms,</div><div class='add'>+			unsigned int data_size);</div><div class='add'>+</div><div class='add'>+u16 spum_cipher_req_init(u8 *spu_hdr, struct spu_cipher_parms *cipher_parms);</div><div class='add'>+</div><div class='add'>+void spum_cipher_req_finish(u8 *spu_hdr,</div><div class='add'>+			    u16 spu_req_hdr_len,</div><div class='add'>+			    unsigned int is_inbound,</div><div class='add'>+			    struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			    bool update_key,</div><div class='add'>+			    unsigned int data_size);</div><div class='add'>+</div><div class='add'>+void spum_request_pad(u8 *pad_start,</div><div class='add'>+		      u32 gcm_padding,</div><div class='add'>+		      u32 hash_pad_len,</div><div class='add'>+		      enum hash_alg auth_alg,</div><div class='add'>+		      enum hash_mode auth_mode,</div><div class='add'>+		      unsigned int total_sent, u32 status_padding);</div><div class='add'>+</div><div class='add'>+u8 spum_xts_tweak_in_payload(void);</div><div class='add'>+u8 spum_tx_status_len(void);</div><div class='add'>+u8 spum_rx_status_len(void);</div><div class='add'>+int spum_status_process(u8 *statp);</div><div class='add'>+</div><div class='add'>+void spum_ccm_update_iv(unsigned int digestsize,</div><div class='add'>+			struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			unsigned int assoclen,</div><div class='add'>+			unsigned int chunksize,</div><div class='add'>+			bool is_encrypt,</div><div class='add'>+			bool is_esp);</div><div class='add'>+u32 spum_wordalign_padlen(u32 data_size);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/crypto/bcm/spu2.c b/drivers/crypto/bcm/spu2.c<br/>new file mode 100644<br/>index 000000000000..ef04c9748317<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bcm/spu2.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/spu2.c</a></div><div class='hunk'>@@ -0,0 +1,1401 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Broadcom</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, version 2, as</div><div class='add'>+ * published by the Free Software Foundation (the "GPL").</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License version 2 (GPLv2) for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * version 2 (GPLv2) along with this source code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This file works with the SPU2 version of the SPU. SPU2 has different message</div><div class='add'>+ * formats than the previous version of the SPU. All SPU message format</div><div class='add'>+ * differences should be hidden in the spux.c,h files.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include "util.h"</div><div class='add'>+#include "spu.h"</div><div class='add'>+#include "spu2.h"</div><div class='add'>+</div><div class='add'>+#define SPU2_TX_STATUS_LEN  0	/* SPU2 has no STATUS in input packet */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Controlled by pkt_stat_cnt field in CRYPTO_SS_SPU0_CORE_SPU2_CONTROL0</div><div class='add'>+ * register. Defaults to 2.</div><div class='add'>+ */</div><div class='add'>+#define SPU2_RX_STATUS_LEN  2</div><div class='add'>+</div><div class='add'>+enum spu2_proto_sel {</div><div class='add'>+	SPU2_PROTO_RESV = 0,</div><div class='add'>+	SPU2_MACSEC_SECTAG8_ECB = 1,</div><div class='add'>+	SPU2_MACSEC_SECTAG8_SCB = 2,</div><div class='add'>+	SPU2_MACSEC_SECTAG16 = 3,</div><div class='add'>+	SPU2_MACSEC_SECTAG16_8_XPN = 4,</div><div class='add'>+	SPU2_IPSEC = 5,</div><div class='add'>+	SPU2_IPSEC_ESN = 6,</div><div class='add'>+	SPU2_TLS_CIPHER = 7,</div><div class='add'>+	SPU2_TLS_AEAD = 8,</div><div class='add'>+	SPU2_DTLS_CIPHER = 9,</div><div class='add'>+	SPU2_DTLS_AEAD = 10</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+char *spu2_cipher_type_names[] = { "None", "AES128", "AES192", "AES256",</div><div class='add'>+	"DES", "3DES"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+char *spu2_cipher_mode_names[] = { "ECB", "CBC", "CTR", "CFB", "OFB", "XTS",</div><div class='add'>+	"CCM", "GCM"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+char *spu2_hash_type_names[] = { "None", "AES128", "AES192", "AES256",</div><div class='add'>+	"Reserved", "Reserved", "MD5", "SHA1", "SHA224", "SHA256", "SHA384",</div><div class='add'>+	"SHA512", "SHA512/224", "SHA512/256", "SHA3-224", "SHA3-256",</div><div class='add'>+	"SHA3-384", "SHA3-512"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+char *spu2_hash_mode_names[] = { "CMAC", "CBC-MAC", "XCBC-MAC", "HMAC",</div><div class='add'>+	"Rabin", "CCM", "GCM", "Reserved"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char *spu2_ciph_type_name(enum spu2_cipher_type cipher_type)</div><div class='add'>+{</div><div class='add'>+	if (cipher_type &gt;= SPU2_CIPHER_TYPE_LAST)</div><div class='add'>+		return "Reserved";</div><div class='add'>+	return spu2_cipher_type_names[cipher_type];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *spu2_ciph_mode_name(enum spu2_cipher_mode cipher_mode)</div><div class='add'>+{</div><div class='add'>+	if (cipher_mode &gt;= SPU2_CIPHER_MODE_LAST)</div><div class='add'>+		return "Reserved";</div><div class='add'>+	return spu2_cipher_mode_names[cipher_mode];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *spu2_hash_type_name(enum spu2_hash_type hash_type)</div><div class='add'>+{</div><div class='add'>+	if (hash_type &gt;= SPU2_HASH_TYPE_LAST)</div><div class='add'>+		return "Reserved";</div><div class='add'>+	return spu2_hash_type_names[hash_type];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *spu2_hash_mode_name(enum spu2_hash_mode hash_mode)</div><div class='add'>+{</div><div class='add'>+	if (hash_mode &gt;= SPU2_HASH_MODE_LAST)</div><div class='add'>+		return "Reserved";</div><div class='add'>+	return spu2_hash_mode_names[hash_mode];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert from a software cipher mode value to the corresponding value</div><div class='add'>+ * for SPU2.</div><div class='add'>+ */</div><div class='add'>+static int spu2_cipher_mode_xlate(enum spu_cipher_mode cipher_mode,</div><div class='add'>+				  enum spu2_cipher_mode *spu2_mode)</div><div class='add'>+{</div><div class='add'>+	switch (cipher_mode) {</div><div class='add'>+	case CIPHER_MODE_ECB:</div><div class='add'>+		*spu2_mode = SPU2_CIPHER_MODE_ECB;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_MODE_CBC:</div><div class='add'>+		*spu2_mode = SPU2_CIPHER_MODE_CBC;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_MODE_OFB:</div><div class='add'>+		*spu2_mode = SPU2_CIPHER_MODE_OFB;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_MODE_CFB:</div><div class='add'>+		*spu2_mode = SPU2_CIPHER_MODE_CFB;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_MODE_CTR:</div><div class='add'>+		*spu2_mode = SPU2_CIPHER_MODE_CTR;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_MODE_CCM:</div><div class='add'>+		*spu2_mode = SPU2_CIPHER_MODE_CCM;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_MODE_GCM:</div><div class='add'>+		*spu2_mode = SPU2_CIPHER_MODE_GCM;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_MODE_XTS:</div><div class='add'>+		*spu2_mode = SPU2_CIPHER_MODE_XTS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_cipher_xlate() - Convert a cipher {alg/mode/type} triple to a SPU2</div><div class='add'>+ * cipher type and mode.</div><div class='add'>+ * @cipher_alg:  [in]  cipher algorithm value from software enumeration</div><div class='add'>+ * @cipher_mode: [in]  cipher mode value from software enumeration</div><div class='add'>+ * @cipher_type: [in]  cipher type value from software enumeration</div><div class='add'>+ * @spu2_type:   [out] cipher type value used by spu2 hardware</div><div class='add'>+ * @spu2_mode:   [out] cipher mode value used by spu2 hardware</div><div class='add'>+ *</div><div class='add'>+ * Return:  0 if successful</div><div class='add'>+ */</div><div class='add'>+static int spu2_cipher_xlate(enum spu_cipher_alg cipher_alg,</div><div class='add'>+			     enum spu_cipher_mode cipher_mode,</div><div class='add'>+			     enum spu_cipher_type cipher_type,</div><div class='add'>+			     enum spu2_cipher_type *spu2_type,</div><div class='add'>+			     enum spu2_cipher_mode *spu2_mode)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = spu2_cipher_mode_xlate(cipher_mode, spu2_mode);</div><div class='add'>+	if (err) {</div><div class='add'>+		flow_log("Invalid cipher mode %d\n", cipher_mode);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cipher_alg) {</div><div class='add'>+	case CIPHER_ALG_NONE:</div><div class='add'>+		*spu2_type = SPU2_CIPHER_TYPE_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_RC4:</div><div class='add'>+		/* SPU2 does not support RC4 */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		*spu2_type = SPU2_CIPHER_TYPE_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_DES:</div><div class='add'>+		*spu2_type = SPU2_CIPHER_TYPE_DES;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_3DES:</div><div class='add'>+		*spu2_type = SPU2_CIPHER_TYPE_3DES;</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_AES:</div><div class='add'>+		switch (cipher_type) {</div><div class='add'>+		case CIPHER_TYPE_AES128:</div><div class='add'>+			*spu2_type = SPU2_CIPHER_TYPE_AES128;</div><div class='add'>+			break;</div><div class='add'>+		case CIPHER_TYPE_AES192:</div><div class='add'>+			*spu2_type = SPU2_CIPHER_TYPE_AES192;</div><div class='add'>+			break;</div><div class='add'>+		case CIPHER_TYPE_AES256:</div><div class='add'>+			*spu2_type = SPU2_CIPHER_TYPE_AES256;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_LAST:</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		flow_log("Invalid cipher alg %d or type %d\n",</div><div class='add'>+			 cipher_alg, cipher_type);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert from a software hash mode value to the corresponding value</div><div class='add'>+ * for SPU2. Note that HASH_MODE_NONE and HASH_MODE_XCBC have the same value.</div><div class='add'>+ */</div><div class='add'>+static int spu2_hash_mode_xlate(enum hash_mode hash_mode,</div><div class='add'>+				enum spu2_hash_mode *spu2_mode)</div><div class='add'>+{</div><div class='add'>+	switch (hash_mode) {</div><div class='add'>+	case HASH_MODE_XCBC:</div><div class='add'>+		*spu2_mode = SPU2_HASH_MODE_XCBC_MAC;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_MODE_CMAC:</div><div class='add'>+		*spu2_mode = SPU2_HASH_MODE_CMAC;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_MODE_HMAC:</div><div class='add'>+		*spu2_mode = SPU2_HASH_MODE_HMAC;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_MODE_CCM:</div><div class='add'>+		*spu2_mode = SPU2_HASH_MODE_CCM;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_MODE_GCM:</div><div class='add'>+		*spu2_mode = SPU2_HASH_MODE_GCM;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_hash_xlate() - Convert a hash {alg/mode/type} triple to a SPU2 hash type</div><div class='add'>+ * and mode.</div><div class='add'>+ * @hash_alg:  [in] hash algorithm value from software enumeration</div><div class='add'>+ * @hash_mode: [in] hash mode value from software enumeration</div><div class='add'>+ * @hash_type: [in] hash type value from software enumeration</div><div class='add'>+ * @ciph_type: [in] cipher type value from software enumeration</div><div class='add'>+ * @spu2_type: [out] hash type value used by SPU2 hardware</div><div class='add'>+ * @spu2_mode: [out] hash mode value used by SPU2 hardware</div><div class='add'>+ *</div><div class='add'>+ * Return:  0 if successful</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+spu2_hash_xlate(enum hash_alg hash_alg, enum hash_mode hash_mode,</div><div class='add'>+		enum hash_type hash_type, enum spu_cipher_type ciph_type,</div><div class='add'>+		enum spu2_hash_type *spu2_type, enum spu2_hash_mode *spu2_mode)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = spu2_hash_mode_xlate(hash_mode, spu2_mode);</div><div class='add'>+	if (err) {</div><div class='add'>+		flow_log("Invalid hash mode %d\n", hash_mode);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (hash_alg) {</div><div class='add'>+	case HASH_ALG_NONE:</div><div class='add'>+		*spu2_type = SPU2_HASH_TYPE_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_MD5:</div><div class='add'>+		*spu2_type = SPU2_HASH_TYPE_MD5;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA1:</div><div class='add'>+		*spu2_type = SPU2_HASH_TYPE_SHA1;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA224:</div><div class='add'>+		*spu2_type = SPU2_HASH_TYPE_SHA224;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA256:</div><div class='add'>+		*spu2_type = SPU2_HASH_TYPE_SHA256;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA384:</div><div class='add'>+		*spu2_type = SPU2_HASH_TYPE_SHA384;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA512:</div><div class='add'>+		*spu2_type = SPU2_HASH_TYPE_SHA512;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_AES:</div><div class='add'>+		switch (ciph_type) {</div><div class='add'>+		case CIPHER_TYPE_AES128:</div><div class='add'>+			*spu2_type = SPU2_HASH_TYPE_AES128;</div><div class='add'>+			break;</div><div class='add'>+		case CIPHER_TYPE_AES192:</div><div class='add'>+			*spu2_type = SPU2_HASH_TYPE_AES192;</div><div class='add'>+			break;</div><div class='add'>+		case CIPHER_TYPE_AES256:</div><div class='add'>+			*spu2_type = SPU2_HASH_TYPE_AES256;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA3_224:</div><div class='add'>+		*spu2_type = SPU2_HASH_TYPE_SHA3_224;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA3_256:</div><div class='add'>+		*spu2_type = SPU2_HASH_TYPE_SHA3_256;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA3_384:</div><div class='add'>+		*spu2_type = SPU2_HASH_TYPE_SHA3_384;</div><div class='add'>+		break;</div><div class='add'>+	case HASH_ALG_SHA3_512:</div><div class='add'>+		*spu2_type = SPU2_HASH_TYPE_SHA3_512;</div><div class='add'>+	case HASH_ALG_LAST:</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		flow_log("Invalid hash alg %d or type %d\n",</div><div class='add'>+			 hash_alg, hash_type);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Dump FMD ctrl0. The ctrl0 input is in host byte order */</div><div class='add'>+static void spu2_dump_fmd_ctrl0(u64 ctrl0)</div><div class='add'>+{</div><div class='add'>+	enum spu2_cipher_type ciph_type;</div><div class='add'>+	enum spu2_cipher_mode ciph_mode;</div><div class='add'>+	enum spu2_hash_type hash_type;</div><div class='add'>+	enum spu2_hash_mode hash_mode;</div><div class='add'>+	char *ciph_name;</div><div class='add'>+	char *ciph_mode_name;</div><div class='add'>+	char *hash_name;</div><div class='add'>+	char *hash_mode_name;</div><div class='add'>+	u8 cfb;</div><div class='add'>+	u8 proto;</div><div class='add'>+</div><div class='add'>+	packet_log(" FMD CTRL0 %#16llx\n", ctrl0);</div><div class='add'>+	if (ctrl0 &amp; SPU2_CIPH_ENCRYPT_EN)</div><div class='add'>+		packet_log("  encrypt\n");</div><div class='add'>+	else</div><div class='add'>+		packet_log("  decrypt\n");</div><div class='add'>+</div><div class='add'>+	ciph_type = (ctrl0 &amp; SPU2_CIPH_TYPE) &gt;&gt; SPU2_CIPH_TYPE_SHIFT;</div><div class='add'>+	ciph_name = spu2_ciph_type_name(ciph_type);</div><div class='add'>+	packet_log("  Cipher type: %s\n", ciph_name);</div><div class='add'>+</div><div class='add'>+	if (ciph_type != SPU2_CIPHER_TYPE_NONE) {</div><div class='add'>+		ciph_mode = (ctrl0 &amp; SPU2_CIPH_MODE) &gt;&gt; SPU2_CIPH_MODE_SHIFT;</div><div class='add'>+		ciph_mode_name = spu2_ciph_mode_name(ciph_mode);</div><div class='add'>+		packet_log("  Cipher mode: %s\n", ciph_mode_name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfb = (ctrl0 &amp; SPU2_CFB_MASK) &gt;&gt; SPU2_CFB_MASK_SHIFT;</div><div class='add'>+	packet_log("  CFB %#x\n", cfb);</div><div class='add'>+</div><div class='add'>+	proto = (ctrl0 &amp; SPU2_PROTO_SEL) &gt;&gt; SPU2_PROTO_SEL_SHIFT;</div><div class='add'>+	packet_log("  protocol %#x\n", proto);</div><div class='add'>+</div><div class='add'>+	if (ctrl0 &amp; SPU2_HASH_FIRST)</div><div class='add'>+		packet_log("  hash first\n");</div><div class='add'>+	else</div><div class='add'>+		packet_log("  cipher first\n");</div><div class='add'>+</div><div class='add'>+	if (ctrl0 &amp; SPU2_CHK_TAG)</div><div class='add'>+		packet_log("  check tag\n");</div><div class='add'>+</div><div class='add'>+	hash_type = (ctrl0 &amp; SPU2_HASH_TYPE) &gt;&gt; SPU2_HASH_TYPE_SHIFT;</div><div class='add'>+	hash_name = spu2_hash_type_name(hash_type);</div><div class='add'>+	packet_log("  Hash type: %s\n", hash_name);</div><div class='add'>+</div><div class='add'>+	if (hash_type != SPU2_HASH_TYPE_NONE) {</div><div class='add'>+		hash_mode = (ctrl0 &amp; SPU2_HASH_MODE) &gt;&gt; SPU2_HASH_MODE_SHIFT;</div><div class='add'>+		hash_mode_name = spu2_hash_mode_name(hash_mode);</div><div class='add'>+		packet_log("  Hash mode: %s\n", hash_mode_name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctrl0 &amp; SPU2_CIPH_PAD_EN) {</div><div class='add'>+		packet_log("  Cipher pad: %#2llx\n",</div><div class='add'>+			   (ctrl0 &amp; SPU2_CIPH_PAD) &gt;&gt; SPU2_CIPH_PAD_SHIFT);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Dump FMD ctrl1. The ctrl1 input is in host byte order */</div><div class='add'>+static void spu2_dump_fmd_ctrl1(u64 ctrl1)</div><div class='add'>+{</div><div class='add'>+	u8 hash_key_len;</div><div class='add'>+	u8 ciph_key_len;</div><div class='add'>+	u8 ret_iv_len;</div><div class='add'>+	u8 iv_offset;</div><div class='add'>+	u8 iv_len;</div><div class='add'>+	u8 hash_tag_len;</div><div class='add'>+	u8 ret_md;</div><div class='add'>+</div><div class='add'>+	packet_log(" FMD CTRL1 %#16llx\n", ctrl1);</div><div class='add'>+	if (ctrl1 &amp; SPU2_TAG_LOC)</div><div class='add'>+		packet_log("  Tag after payload\n");</div><div class='add'>+</div><div class='add'>+	packet_log("  Msg includes ");</div><div class='add'>+	if (ctrl1 &amp; SPU2_HAS_FR_DATA)</div><div class='add'>+		packet_log("FD ");</div><div class='add'>+	if (ctrl1 &amp; SPU2_HAS_AAD1)</div><div class='add'>+		packet_log("AAD1 ");</div><div class='add'>+	if (ctrl1 &amp; SPU2_HAS_NAAD)</div><div class='add'>+		packet_log("NAAD ");</div><div class='add'>+	if (ctrl1 &amp; SPU2_HAS_AAD2)</div><div class='add'>+		packet_log("AAD2 ");</div><div class='add'>+	if (ctrl1 &amp; SPU2_HAS_ESN)</div><div class='add'>+		packet_log("ESN ");</div><div class='add'>+	packet_log("\n");</div><div class='add'>+</div><div class='add'>+	hash_key_len = (ctrl1 &amp; SPU2_HASH_KEY_LEN) &gt;&gt; SPU2_HASH_KEY_LEN_SHIFT;</div><div class='add'>+	packet_log("  Hash key len %u\n", hash_key_len);</div><div class='add'>+</div><div class='add'>+	ciph_key_len = (ctrl1 &amp; SPU2_CIPH_KEY_LEN) &gt;&gt; SPU2_CIPH_KEY_LEN_SHIFT;</div><div class='add'>+	packet_log("  Cipher key len %u\n", ciph_key_len);</div><div class='add'>+</div><div class='add'>+	if (ctrl1 &amp; SPU2_GENIV)</div><div class='add'>+		packet_log("  Generate IV\n");</div><div class='add'>+</div><div class='add'>+	if (ctrl1 &amp; SPU2_HASH_IV)</div><div class='add'>+		packet_log("  IV included in hash\n");</div><div class='add'>+</div><div class='add'>+	if (ctrl1 &amp; SPU2_RET_IV)</div><div class='add'>+		packet_log("  Return IV in output before payload\n");</div><div class='add'>+</div><div class='add'>+	ret_iv_len = (ctrl1 &amp; SPU2_RET_IV_LEN) &gt;&gt; SPU2_RET_IV_LEN_SHIFT;</div><div class='add'>+	packet_log("  Length of returned IV %u bytes\n",</div><div class='add'>+		   ret_iv_len ? ret_iv_len : 16);</div><div class='add'>+</div><div class='add'>+	iv_offset = (ctrl1 &amp; SPU2_IV_OFFSET) &gt;&gt; SPU2_IV_OFFSET_SHIFT;</div><div class='add'>+	packet_log("  IV offset %u\n", iv_offset);</div><div class='add'>+</div><div class='add'>+	iv_len = (ctrl1 &amp; SPU2_IV_LEN) &gt;&gt; SPU2_IV_LEN_SHIFT;</div><div class='add'>+	packet_log("  Input IV len %u bytes\n", iv_len);</div><div class='add'>+</div><div class='add'>+	hash_tag_len = (ctrl1 &amp; SPU2_HASH_TAG_LEN) &gt;&gt; SPU2_HASH_TAG_LEN_SHIFT;</div><div class='add'>+	packet_log("  Hash tag length %u bytes\n", hash_tag_len);</div><div class='add'>+</div><div class='add'>+	packet_log("  Return ");</div><div class='add'>+	ret_md = (ctrl1 &amp; SPU2_RETURN_MD) &gt;&gt; SPU2_RETURN_MD_SHIFT;</div><div class='add'>+	if (ret_md)</div><div class='add'>+		packet_log("FMD ");</div><div class='add'>+	if (ret_md == SPU2_RET_FMD_OMD)</div><div class='add'>+		packet_log("OMD ");</div><div class='add'>+	else if (ret_md == SPU2_RET_FMD_OMD_IV)</div><div class='add'>+		packet_log("OMD IV ");</div><div class='add'>+	if (ctrl1 &amp; SPU2_RETURN_FD)</div><div class='add'>+		packet_log("FD ");</div><div class='add'>+	if (ctrl1 &amp; SPU2_RETURN_AAD1)</div><div class='add'>+		packet_log("AAD1 ");</div><div class='add'>+	if (ctrl1 &amp; SPU2_RETURN_NAAD)</div><div class='add'>+		packet_log("NAAD ");</div><div class='add'>+	if (ctrl1 &amp; SPU2_RETURN_AAD2)</div><div class='add'>+		packet_log("AAD2 ");</div><div class='add'>+	if (ctrl1 &amp; SPU2_RETURN_PAY)</div><div class='add'>+		packet_log("Payload");</div><div class='add'>+	packet_log("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Dump FMD ctrl2. The ctrl2 input is in host byte order */</div><div class='add'>+static void spu2_dump_fmd_ctrl2(u64 ctrl2)</div><div class='add'>+{</div><div class='add'>+	packet_log(" FMD CTRL2 %#16llx\n", ctrl2);</div><div class='add'>+</div><div class='add'>+	packet_log("  AAD1 offset %llu length %llu bytes\n",</div><div class='add'>+		   ctrl2 &amp; SPU2_AAD1_OFFSET,</div><div class='add'>+		   (ctrl2 &amp; SPU2_AAD1_LEN) &gt;&gt; SPU2_AAD1_LEN_SHIFT);</div><div class='add'>+	packet_log("  AAD2 offset %llu\n",</div><div class='add'>+		   (ctrl2 &amp; SPU2_AAD2_OFFSET) &gt;&gt; SPU2_AAD2_OFFSET_SHIFT);</div><div class='add'>+	packet_log("  Payload offset %llu\n",</div><div class='add'>+		   (ctrl2 &amp; SPU2_PL_OFFSET) &gt;&gt; SPU2_PL_OFFSET_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Dump FMD ctrl3. The ctrl3 input is in host byte order */</div><div class='add'>+static void spu2_dump_fmd_ctrl3(u64 ctrl3)</div><div class='add'>+{</div><div class='add'>+	packet_log(" FMD CTRL3 %#16llx\n", ctrl3);</div><div class='add'>+</div><div class='add'>+	packet_log("  Payload length %llu bytes\n", ctrl3 &amp; SPU2_PL_LEN);</div><div class='add'>+	packet_log("  TLS length %llu bytes\n",</div><div class='add'>+		   (ctrl3 &amp; SPU2_TLS_LEN) &gt;&gt; SPU2_TLS_LEN_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void spu2_dump_fmd(struct SPU2_FMD *fmd)</div><div class='add'>+{</div><div class='add'>+	spu2_dump_fmd_ctrl0(le64_to_cpu(fmd-&gt;ctrl0));</div><div class='add'>+	spu2_dump_fmd_ctrl1(le64_to_cpu(fmd-&gt;ctrl1));</div><div class='add'>+	spu2_dump_fmd_ctrl2(le64_to_cpu(fmd-&gt;ctrl2));</div><div class='add'>+	spu2_dump_fmd_ctrl3(le64_to_cpu(fmd-&gt;ctrl3));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void spu2_dump_omd(u8 *omd, u16 hash_key_len, u16 ciph_key_len,</div><div class='add'>+			  u16 hash_iv_len, u16 ciph_iv_len)</div><div class='add'>+{</div><div class='add'>+	u8 *ptr = omd;</div><div class='add'>+</div><div class='add'>+	packet_log(" OMD:\n");</div><div class='add'>+</div><div class='add'>+	if (hash_key_len) {</div><div class='add'>+		packet_log("  Hash Key Length %u bytes\n", hash_key_len);</div><div class='add'>+		packet_dump("  KEY: ", ptr, hash_key_len);</div><div class='add'>+		ptr += hash_key_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ciph_key_len) {</div><div class='add'>+		packet_log("  Cipher Key Length %u bytes\n", ciph_key_len);</div><div class='add'>+		packet_dump("  KEY: ", ptr, ciph_key_len);</div><div class='add'>+		ptr += ciph_key_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hash_iv_len) {</div><div class='add'>+		packet_log("  Hash IV Length %u bytes\n", hash_iv_len);</div><div class='add'>+		packet_dump("  hash IV: ", ptr, hash_iv_len);</div><div class='add'>+		ptr += ciph_key_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ciph_iv_len) {</div><div class='add'>+		packet_log("  Cipher IV Length %u bytes\n", ciph_iv_len);</div><div class='add'>+		packet_dump("  cipher IV: ", ptr, ciph_iv_len);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Dump a SPU2 header for debug */</div><div class='add'>+void spu2_dump_msg_hdr(u8 *buf, unsigned int buf_len)</div><div class='add'>+{</div><div class='add'>+	struct SPU2_FMD *fmd = (struct SPU2_FMD *)buf;</div><div class='add'>+	u8 *omd;</div><div class='add'>+	u64 ctrl1;</div><div class='add'>+	u16 hash_key_len;</div><div class='add'>+	u16 ciph_key_len;</div><div class='add'>+	u16 hash_iv_len;</div><div class='add'>+	u16 ciph_iv_len;</div><div class='add'>+	u16 omd_len;</div><div class='add'>+</div><div class='add'>+	packet_log("\n");</div><div class='add'>+	packet_log("SPU2 message header %p len: %u\n", buf, buf_len);</div><div class='add'>+</div><div class='add'>+	spu2_dump_fmd(fmd);</div><div class='add'>+	omd = (u8 *)(fmd + 1);</div><div class='add'>+</div><div class='add'>+	ctrl1 = le64_to_cpu(fmd-&gt;ctrl1);</div><div class='add'>+	hash_key_len = (ctrl1 &amp; SPU2_HASH_KEY_LEN) &gt;&gt; SPU2_HASH_KEY_LEN_SHIFT;</div><div class='add'>+	ciph_key_len = (ctrl1 &amp; SPU2_CIPH_KEY_LEN) &gt;&gt; SPU2_CIPH_KEY_LEN_SHIFT;</div><div class='add'>+	hash_iv_len = 0;</div><div class='add'>+	ciph_iv_len = (ctrl1 &amp; SPU2_IV_LEN) &gt;&gt; SPU2_IV_LEN_SHIFT;</div><div class='add'>+	spu2_dump_omd(omd, hash_key_len, ciph_key_len, hash_iv_len,</div><div class='add'>+		      ciph_iv_len);</div><div class='add'>+</div><div class='add'>+	/* Double check sanity */</div><div class='add'>+	omd_len = hash_key_len + ciph_key_len + hash_iv_len + ciph_iv_len;</div><div class='add'>+	if (FMD_SIZE + omd_len != buf_len) {</div><div class='add'>+		packet_log</div><div class='add'>+		    (" Packet parsed incorrectly. buf_len %u, sum of MD %zu\n",</div><div class='add'>+		     buf_len, FMD_SIZE + omd_len);</div><div class='add'>+	}</div><div class='add'>+	packet_log("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_fmd_init() - At setkey time, initialize the fixed meta data for</div><div class='add'>+ * subsequent ablkcipher requests for this context.</div><div class='add'>+ * @spu2_cipher_type:  Cipher algorithm</div><div class='add'>+ * @spu2_mode:         Cipher mode</div><div class='add'>+ * @cipher_key_len:    Length of cipher key, in bytes</div><div class='add'>+ * @cipher_iv_len:     Length of cipher initialization vector, in bytes</div><div class='add'>+ *</div><div class='add'>+ * Return:  0 (success)</div><div class='add'>+ */</div><div class='add'>+static int spu2_fmd_init(struct SPU2_FMD *fmd,</div><div class='add'>+			 enum spu2_cipher_type spu2_type,</div><div class='add'>+			 enum spu2_cipher_mode spu2_mode,</div><div class='add'>+			 u32 cipher_key_len, u32 cipher_iv_len)</div><div class='add'>+{</div><div class='add'>+	u64 ctrl0;</div><div class='add'>+	u64 ctrl1;</div><div class='add'>+	u64 ctrl2;</div><div class='add'>+	u64 ctrl3;</div><div class='add'>+	u32 aad1_offset;</div><div class='add'>+	u32 aad2_offset;</div><div class='add'>+	u16 aad1_len = 0;</div><div class='add'>+	u64 payload_offset;</div><div class='add'>+</div><div class='add'>+	ctrl0 = (spu2_type &lt;&lt; SPU2_CIPH_TYPE_SHIFT) |</div><div class='add'>+	    (spu2_mode &lt;&lt; SPU2_CIPH_MODE_SHIFT);</div><div class='add'>+</div><div class='add'>+	ctrl1 = (cipher_key_len &lt;&lt; SPU2_CIPH_KEY_LEN_SHIFT) |</div><div class='add'>+	    ((u64)cipher_iv_len &lt;&lt; SPU2_IV_LEN_SHIFT) |</div><div class='add'>+	    ((u64)SPU2_RET_FMD_ONLY &lt;&lt; SPU2_RETURN_MD_SHIFT) | SPU2_RETURN_PAY;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * AAD1 offset is from start of FD. FD length is always 0 for this</div><div class='add'>+	 * driver. So AAD1_offset is always 0.</div><div class='add'>+	 */</div><div class='add'>+	aad1_offset = 0;</div><div class='add'>+	aad2_offset = aad1_offset;</div><div class='add'>+	payload_offset = 0;</div><div class='add'>+	ctrl2 = aad1_offset |</div><div class='add'>+	    (aad1_len &lt;&lt; SPU2_AAD1_LEN_SHIFT) |</div><div class='add'>+	    (aad2_offset &lt;&lt; SPU2_AAD2_OFFSET_SHIFT) |</div><div class='add'>+	    (payload_offset &lt;&lt; SPU2_PL_OFFSET_SHIFT);</div><div class='add'>+</div><div class='add'>+	ctrl3 = 0;</div><div class='add'>+</div><div class='add'>+	fmd-&gt;ctrl0 = cpu_to_le64(ctrl0);</div><div class='add'>+	fmd-&gt;ctrl1 = cpu_to_le64(ctrl1);</div><div class='add'>+	fmd-&gt;ctrl2 = cpu_to_le64(ctrl2);</div><div class='add'>+	fmd-&gt;ctrl3 = cpu_to_le64(ctrl3);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_fmd_ctrl0_write() - Write ctrl0 field in fixed metadata (FMD) field of</div><div class='add'>+ * SPU request packet.</div><div class='add'>+ * @fmd:            Start of FMD field to be written</div><div class='add'>+ * @is_inbound:     true if decrypting. false if encrypting.</div><div class='add'>+ * @authFirst:      true if alg authenticates before encrypting</div><div class='add'>+ * @protocol:       protocol selector</div><div class='add'>+ * @cipher_type:    cipher algorithm</div><div class='add'>+ * @cipher_mode:    cipher mode</div><div class='add'>+ * @auth_type:      authentication type</div><div class='add'>+ * @auth_mode:      authentication mode</div><div class='add'>+ */</div><div class='add'>+static void spu2_fmd_ctrl0_write(struct SPU2_FMD *fmd,</div><div class='add'>+				 bool is_inbound, bool auth_first,</div><div class='add'>+				 enum spu2_proto_sel protocol,</div><div class='add'>+				 enum spu2_cipher_type cipher_type,</div><div class='add'>+				 enum spu2_cipher_mode cipher_mode,</div><div class='add'>+				 enum spu2_hash_type auth_type,</div><div class='add'>+				 enum spu2_hash_mode auth_mode)</div><div class='add'>+{</div><div class='add'>+	u64 ctrl0 = 0;</div><div class='add'>+</div><div class='add'>+	if ((cipher_type != SPU2_CIPHER_TYPE_NONE) &amp;&amp; !is_inbound)</div><div class='add'>+		ctrl0 |= SPU2_CIPH_ENCRYPT_EN;</div><div class='add'>+</div><div class='add'>+	ctrl0 |= ((u64)cipher_type &lt;&lt; SPU2_CIPH_TYPE_SHIFT) |</div><div class='add'>+	    ((u64)cipher_mode &lt;&lt; SPU2_CIPH_MODE_SHIFT);</div><div class='add'>+</div><div class='add'>+	if (protocol)</div><div class='add'>+		ctrl0 |= (u64)protocol &lt;&lt; SPU2_PROTO_SEL_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (auth_first)</div><div class='add'>+		ctrl0 |= SPU2_HASH_FIRST;</div><div class='add'>+</div><div class='add'>+	if (is_inbound &amp;&amp; (auth_type != SPU2_HASH_TYPE_NONE))</div><div class='add'>+		ctrl0 |= SPU2_CHK_TAG;</div><div class='add'>+</div><div class='add'>+	ctrl0 |= (((u64)auth_type &lt;&lt; SPU2_HASH_TYPE_SHIFT) |</div><div class='add'>+		  ((u64)auth_mode &lt;&lt; SPU2_HASH_MODE_SHIFT));</div><div class='add'>+</div><div class='add'>+	fmd-&gt;ctrl0 = cpu_to_le64(ctrl0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_fmd_ctrl1_write() - Write ctrl1 field in fixed metadata (FMD) field of</div><div class='add'>+ * SPU request packet.</div><div class='add'>+ * @fmd:            Start of FMD field to be written</div><div class='add'>+ * @assoc_size:     Length of additional associated data, in bytes</div><div class='add'>+ * @auth_key_len:   Length of authentication key, in bytes</div><div class='add'>+ * @cipher_key_len: Length of cipher key, in bytes</div><div class='add'>+ * @gen_iv:         If true, hw generates IV and returns in response</div><div class='add'>+ * @hash_iv:        IV participates in hash. Used for IPSEC and TLS.</div><div class='add'>+ * @return_iv:      Return IV in output packet before payload</div><div class='add'>+ * @ret_iv_len:     Length of IV returned from SPU, in bytes</div><div class='add'>+ * @ret_iv_offset:  Offset into full IV of start of returned IV</div><div class='add'>+ * @cipher_iv_len:  Length of input cipher IV, in bytes</div><div class='add'>+ * @digest_size:    Length of digest (aka, hash tag or ICV), in bytes</div><div class='add'>+ * @return_payload: Return payload in SPU response</div><div class='add'>+ * @return_md : return metadata in SPU response</div><div class='add'>+ *</div><div class='add'>+ * Packet can have AAD2 w/o AAD1. For algorithms currently supported,</div><div class='add'>+ * associated data goes in AAD2.</div><div class='add'>+ */</div><div class='add'>+static void spu2_fmd_ctrl1_write(struct SPU2_FMD *fmd, bool is_inbound,</div><div class='add'>+				 u64 assoc_size,</div><div class='add'>+				 u64 auth_key_len, u64 cipher_key_len,</div><div class='add'>+				 bool gen_iv, bool hash_iv, bool return_iv,</div><div class='add'>+				 u64 ret_iv_len, u64 ret_iv_offset,</div><div class='add'>+				 u64 cipher_iv_len, u64 digest_size,</div><div class='add'>+				 bool return_payload, bool return_md)</div><div class='add'>+{</div><div class='add'>+	u64 ctrl1 = 0;</div><div class='add'>+</div><div class='add'>+	if (is_inbound &amp;&amp; digest_size)</div><div class='add'>+		ctrl1 |= SPU2_TAG_LOC;</div><div class='add'>+</div><div class='add'>+	if (assoc_size) {</div><div class='add'>+		ctrl1 |= SPU2_HAS_AAD2;</div><div class='add'>+		ctrl1 |= SPU2_RETURN_AAD2;  /* need aad2 for gcm aes esp */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (auth_key_len)</div><div class='add'>+		ctrl1 |= ((auth_key_len &lt;&lt; SPU2_HASH_KEY_LEN_SHIFT) &amp;</div><div class='add'>+			  SPU2_HASH_KEY_LEN);</div><div class='add'>+</div><div class='add'>+	if (cipher_key_len)</div><div class='add'>+		ctrl1 |= ((cipher_key_len &lt;&lt; SPU2_CIPH_KEY_LEN_SHIFT) &amp;</div><div class='add'>+			  SPU2_CIPH_KEY_LEN);</div><div class='add'>+</div><div class='add'>+	if (gen_iv)</div><div class='add'>+		ctrl1 |= SPU2_GENIV;</div><div class='add'>+</div><div class='add'>+	if (hash_iv)</div><div class='add'>+		ctrl1 |= SPU2_HASH_IV;</div><div class='add'>+</div><div class='add'>+	if (return_iv) {</div><div class='add'>+		ctrl1 |= SPU2_RET_IV;</div><div class='add'>+		ctrl1 |= ret_iv_len &lt;&lt; SPU2_RET_IV_LEN_SHIFT;</div><div class='add'>+		ctrl1 |= ret_iv_offset &lt;&lt; SPU2_IV_OFFSET_SHIFT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctrl1 |= ((cipher_iv_len &lt;&lt; SPU2_IV_LEN_SHIFT) &amp; SPU2_IV_LEN);</div><div class='add'>+</div><div class='add'>+	if (digest_size)</div><div class='add'>+		ctrl1 |= ((digest_size &lt;&lt; SPU2_HASH_TAG_LEN_SHIFT) &amp;</div><div class='add'>+			  SPU2_HASH_TAG_LEN);</div><div class='add'>+</div><div class='add'>+	/* Let's ask for the output pkt to include FMD, but don't need to</div><div class='add'>+	 * get keys and IVs back in OMD.</div><div class='add'>+	 */</div><div class='add'>+	if (return_md)</div><div class='add'>+		ctrl1 |= ((u64)SPU2_RET_FMD_ONLY &lt;&lt; SPU2_RETURN_MD_SHIFT);</div><div class='add'>+	else</div><div class='add'>+		ctrl1 |= ((u64)SPU2_RET_NO_MD &lt;&lt; SPU2_RETURN_MD_SHIFT);</div><div class='add'>+</div><div class='add'>+	/* Crypto API does not get assoc data back. So no need for AAD2. */</div><div class='add'>+</div><div class='add'>+	if (return_payload)</div><div class='add'>+		ctrl1 |= SPU2_RETURN_PAY;</div><div class='add'>+</div><div class='add'>+	fmd-&gt;ctrl1 = cpu_to_le64(ctrl1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_fmd_ctrl2_write() - Set the ctrl2 field in the fixed metadata field of</div><div class='add'>+ * SPU2 header.</div><div class='add'>+ * @fmd:            Start of FMD field to be written</div><div class='add'>+ * @cipher_offset:  Number of bytes from Start of Packet (end of FD field) where</div><div class='add'>+ *                  data to be encrypted or decrypted begins</div><div class='add'>+ * @auth_key_len:   Length of authentication key, in bytes</div><div class='add'>+ * @auth_iv_len:    Length of authentication initialization vector, in bytes</div><div class='add'>+ * @cipher_key_len: Length of cipher key, in bytes</div><div class='add'>+ * @cipher_iv_len:  Length of cipher IV, in bytes</div><div class='add'>+ */</div><div class='add'>+static void spu2_fmd_ctrl2_write(struct SPU2_FMD *fmd, u64 cipher_offset,</div><div class='add'>+				 u64 auth_key_len, u64 auth_iv_len,</div><div class='add'>+				 u64 cipher_key_len, u64 cipher_iv_len)</div><div class='add'>+{</div><div class='add'>+	u64 ctrl2;</div><div class='add'>+	u64 aad1_offset;</div><div class='add'>+	u64 aad2_offset;</div><div class='add'>+	u16 aad1_len = 0;</div><div class='add'>+	u64 payload_offset;</div><div class='add'>+</div><div class='add'>+	/* AAD1 offset is from start of FD. FD length always 0. */</div><div class='add'>+	aad1_offset = 0;</div><div class='add'>+</div><div class='add'>+	aad2_offset = aad1_offset;</div><div class='add'>+	payload_offset = cipher_offset;</div><div class='add'>+	ctrl2 = aad1_offset |</div><div class='add'>+	    (aad1_len &lt;&lt; SPU2_AAD1_LEN_SHIFT) |</div><div class='add'>+	    (aad2_offset &lt;&lt; SPU2_AAD2_OFFSET_SHIFT) |</div><div class='add'>+	    (payload_offset &lt;&lt; SPU2_PL_OFFSET_SHIFT);</div><div class='add'>+</div><div class='add'>+	fmd-&gt;ctrl2 = cpu_to_le64(ctrl2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_fmd_ctrl3_write() - Set the ctrl3 field in FMD</div><div class='add'>+ * @fmd:          Fixed meta data. First field in SPU2 msg header.</div><div class='add'>+ * @payload_len:  Length of payload, in bytes</div><div class='add'>+ */</div><div class='add'>+static void spu2_fmd_ctrl3_write(struct SPU2_FMD *fmd, u64 payload_len)</div><div class='add'>+{</div><div class='add'>+	u64 ctrl3;</div><div class='add'>+</div><div class='add'>+	ctrl3 = payload_len &amp; SPU2_PL_LEN;</div><div class='add'>+</div><div class='add'>+	fmd-&gt;ctrl3 = cpu_to_le64(ctrl3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_ctx_max_payload() - Determine the maximum length of the payload for a</div><div class='add'>+ * SPU message for a given cipher and hash alg context.</div><div class='add'>+ * @cipher_alg:		The cipher algorithm</div><div class='add'>+ * @cipher_mode:	The cipher mode</div><div class='add'>+ * @blocksize:		The size of a block of data for this algo</div><div class='add'>+ *</div><div class='add'>+ * For SPU2, the hardware generally ignores the PayloadLen field in ctrl3 of</div><div class='add'>+ * FMD and just keeps computing until it receives a DMA descriptor with the EOF</div><div class='add'>+ * flag set. So we consider the max payload to be infinite. AES CCM is an</div><div class='add'>+ * exception.</div><div class='add'>+ *</div><div class='add'>+ * Return: Max payload length in bytes</div><div class='add'>+ */</div><div class='add'>+u32 spu2_ctx_max_payload(enum spu_cipher_alg cipher_alg,</div><div class='add'>+			 enum spu_cipher_mode cipher_mode,</div><div class='add'>+			 unsigned int blocksize)</div><div class='add'>+{</div><div class='add'>+	if ((cipher_alg == CIPHER_ALG_AES) &amp;&amp;</div><div class='add'>+	    (cipher_mode == CIPHER_MODE_CCM)) {</div><div class='add'>+		u32 excess = SPU2_MAX_PAYLOAD % blocksize;</div><div class='add'>+</div><div class='add'>+		return SPU2_MAX_PAYLOAD - excess;</div><div class='add'>+	} else {</div><div class='add'>+		return SPU_MAX_PAYLOAD_INF;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_payload_length() -  Given a SPU2 message header, extract the payload</div><div class='add'>+ * length.</div><div class='add'>+ * @spu_hdr:  Start of SPU message header (FMD)</div><div class='add'>+ *</div><div class='add'>+ * Return: payload length, in bytes</div><div class='add'>+ */</div><div class='add'>+u32 spu2_payload_length(u8 *spu_hdr)</div><div class='add'>+{</div><div class='add'>+	struct SPU2_FMD *fmd = (struct SPU2_FMD *)spu_hdr;</div><div class='add'>+	u32 pl_len;</div><div class='add'>+	u64 ctrl3;</div><div class='add'>+</div><div class='add'>+	ctrl3 = le64_to_cpu(fmd-&gt;ctrl3);</div><div class='add'>+	pl_len = ctrl3 &amp; SPU2_PL_LEN;</div><div class='add'>+</div><div class='add'>+	return pl_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_response_hdr_len() - Determine the expected length of a SPU response</div><div class='add'>+ * header.</div><div class='add'>+ * @auth_key_len:  Length of authentication key, in bytes</div><div class='add'>+ * @enc_key_len:   Length of encryption key, in bytes</div><div class='add'>+ *</div><div class='add'>+ * For SPU2, includes just FMD. OMD is never requested.</div><div class='add'>+ *</div><div class='add'>+ * Return: Length of FMD, in bytes</div><div class='add'>+ */</div><div class='add'>+u16 spu2_response_hdr_len(u16 auth_key_len, u16 enc_key_len, bool is_hash)</div><div class='add'>+{</div><div class='add'>+	return FMD_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_hash_pad_len() - Calculate the length of hash padding required to extend</div><div class='add'>+ * data to a full block size.</div><div class='add'>+ * @hash_alg:        hash algorithm</div><div class='add'>+ * @hash_mode:       hash mode</div><div class='add'>+ * @chunksize:       length of data, in bytes</div><div class='add'>+ * @hash_block_size: size of a hash block, in bytes</div><div class='add'>+ *</div><div class='add'>+ * SPU2 hardware does all hash padding</div><div class='add'>+ *</div><div class='add'>+ * Return:  length of hash pad in bytes</div><div class='add'>+ */</div><div class='add'>+u16 spu2_hash_pad_len(enum hash_alg hash_alg, enum hash_mode hash_mode,</div><div class='add'>+		      u32 chunksize, u16 hash_block_size)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_gcm_ccm_padlen() -  Determine the length of GCM/CCM padding for either</div><div class='add'>+ * the AAD field or the data.</div><div class='add'>+ *</div><div class='add'>+ * Return:  0. Unlike SPU-M, SPU2 hardware does any GCM/CCM padding required.</div><div class='add'>+ */</div><div class='add'>+u32 spu2_gcm_ccm_pad_len(enum spu_cipher_mode cipher_mode,</div><div class='add'>+			 unsigned int data_size)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_assoc_resp_len() - Determine the size of the AAD2 buffer needed to catch</div><div class='add'>+ * associated data in a SPU2 output packet.</div><div class='add'>+ * @cipher_mode:   cipher mode</div><div class='add'>+ * @assoc_len:     length of additional associated data, in bytes</div><div class='add'>+ * @iv_len:        length of initialization vector, in bytes</div><div class='add'>+ * @is_encrypt:    true if encrypting. false if decrypt.</div><div class='add'>+ *</div><div class='add'>+ * Return: Length of buffer to catch associated data in response</div><div class='add'>+ */</div><div class='add'>+u32 spu2_assoc_resp_len(enum spu_cipher_mode cipher_mode,</div><div class='add'>+			unsigned int assoc_len, unsigned int iv_len,</div><div class='add'>+			bool is_encrypt)</div><div class='add'>+{</div><div class='add'>+	u32 resp_len = assoc_len;</div><div class='add'>+</div><div class='add'>+	if (is_encrypt)</div><div class='add'>+		/* gcm aes esp has to write 8-byte IV in response */</div><div class='add'>+		resp_len += iv_len;</div><div class='add'>+	return resp_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * spu_aead_ivlen() - Calculate the length of the AEAD IV to be included</div><div class='add'>+ * in a SPU request after the AAD and before the payload.</div><div class='add'>+ * @cipher_mode:  cipher mode</div><div class='add'>+ * @iv_ctr_len:   initialization vector length in bytes</div><div class='add'>+ *</div><div class='add'>+ * For SPU2, AEAD IV is included in OMD and does not need to be repeated</div><div class='add'>+ * prior to the payload.</div><div class='add'>+ *</div><div class='add'>+ * Return: Length of AEAD IV in bytes</div><div class='add'>+ */</div><div class='add'>+u8 spu2_aead_ivlen(enum spu_cipher_mode cipher_mode, u16 iv_len)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_hash_type() - Determine the type of hash operation.</div><div class='add'>+ * @src_sent:  The number of bytes in the current request that have already</div><div class='add'>+ *             been sent to the SPU to be hashed.</div><div class='add'>+ *</div><div class='add'>+ * SPU2 always does a FULL hash operation</div><div class='add'>+ */</div><div class='add'>+enum hash_type spu2_hash_type(u32 src_sent)</div><div class='add'>+{</div><div class='add'>+	return HASH_TYPE_FULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_digest_size() - Determine the size of a hash digest to expect the SPU to</div><div class='add'>+ * return.</div><div class='add'>+ * alg_digest_size: Number of bytes in the final digest for the given algo</div><div class='add'>+ * alg:             The hash algorithm</div><div class='add'>+ * htype:           Type of hash operation (init, update, full, etc)</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+u32 spu2_digest_size(u32 alg_digest_size, enum hash_alg alg,</div><div class='add'>+		     enum hash_type htype)</div><div class='add'>+{</div><div class='add'>+	return alg_digest_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_create_request() - Build a SPU2 request message header, includint FMD and</div><div class='add'>+ * OMD.</div><div class='add'>+ * @spu_hdr: Start of buffer where SPU request header is to be written</div><div class='add'>+ * @req_opts: SPU request message options</div><div class='add'>+ * @cipher_parms: Parameters related to cipher algorithm</div><div class='add'>+ * @hash_parms:   Parameters related to hash algorithm</div><div class='add'>+ * @aead_parms:   Parameters related to AEAD operation</div><div class='add'>+ * @data_size:    Length of data to be encrypted or authenticated. If AEAD, does</div><div class='add'>+ *		  not include length of AAD.</div><div class='add'>+ *</div><div class='add'>+ * Construct the message starting at spu_hdr. Caller should allocate this buffer</div><div class='add'>+ * in DMA-able memory at least SPU_HEADER_ALLOC_LEN bytes long.</div><div class='add'>+ *</div><div class='add'>+ * Return: the length of the SPU header in bytes. 0 if an error occurs.</div><div class='add'>+ */</div><div class='add'>+u32 spu2_create_request(u8 *spu_hdr,</div><div class='add'>+			struct spu_request_opts *req_opts,</div><div class='add'>+			struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			struct spu_hash_parms *hash_parms,</div><div class='add'>+			struct spu_aead_parms *aead_parms,</div><div class='add'>+			unsigned int data_size)</div><div class='add'>+{</div><div class='add'>+	struct SPU2_FMD *fmd;</div><div class='add'>+	u8 *ptr;</div><div class='add'>+	unsigned int buf_len;</div><div class='add'>+	int err;</div><div class='add'>+	enum spu2_cipher_type spu2_ciph_type = SPU2_CIPHER_TYPE_NONE;</div><div class='add'>+	enum spu2_cipher_mode spu2_ciph_mode;</div><div class='add'>+	enum spu2_hash_type spu2_auth_type = SPU2_HASH_TYPE_NONE;</div><div class='add'>+	enum spu2_hash_mode spu2_auth_mode;</div><div class='add'>+	bool return_md = true;</div><div class='add'>+	enum spu2_proto_sel proto = SPU2_PROTO_RESV;</div><div class='add'>+</div><div class='add'>+	/* size of the payload */</div><div class='add'>+	unsigned int payload_len =</div><div class='add'>+	    hash_parms-&gt;prebuf_len + data_size + hash_parms-&gt;pad_len -</div><div class='add'>+	    ((req_opts-&gt;is_aead &amp;&amp; req_opts-&gt;is_inbound) ?</div><div class='add'>+	     hash_parms-&gt;digestsize : 0);</div><div class='add'>+</div><div class='add'>+	/* offset of prebuf or data from start of AAD2 */</div><div class='add'>+	unsigned int cipher_offset = aead_parms-&gt;assoc_size +</div><div class='add'>+			aead_parms-&gt;aad_pad_len + aead_parms-&gt;iv_len;</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	/* total size of the data following OMD (without STAT word padding) */</div><div class='add'>+	unsigned int real_db_size = spu_real_db_size(aead_parms-&gt;assoc_size,</div><div class='add'>+						 aead_parms-&gt;iv_len,</div><div class='add'>+						 hash_parms-&gt;prebuf_len,</div><div class='add'>+						 data_size,</div><div class='add'>+						 aead_parms-&gt;aad_pad_len,</div><div class='add'>+						 aead_parms-&gt;data_pad_len,</div><div class='add'>+						 hash_parms-&gt;pad_len);</div><div class='add'>+#endif</div><div class='add'>+	unsigned int assoc_size = aead_parms-&gt;assoc_size;</div><div class='add'>+</div><div class='add'>+	if (req_opts-&gt;is_aead &amp;&amp;</div><div class='add'>+	    (cipher_parms-&gt;alg == CIPHER_ALG_AES) &amp;&amp;</div><div class='add'>+	    (cipher_parms-&gt;mode == CIPHER_MODE_GCM))</div><div class='add'>+		/*</div><div class='add'>+		 * On SPU 2, aes gcm cipher first on encrypt, auth first on</div><div class='add'>+		 * decrypt</div><div class='add'>+		 */</div><div class='add'>+		req_opts-&gt;auth_first = req_opts-&gt;is_inbound;</div><div class='add'>+</div><div class='add'>+	/* and do opposite for ccm (auth 1st on encrypt) */</div><div class='add'>+	if (req_opts-&gt;is_aead &amp;&amp;</div><div class='add'>+	    (cipher_parms-&gt;alg == CIPHER_ALG_AES) &amp;&amp;</div><div class='add'>+	    (cipher_parms-&gt;mode == CIPHER_MODE_CCM))</div><div class='add'>+		req_opts-&gt;auth_first = !req_opts-&gt;is_inbound;</div><div class='add'>+</div><div class='add'>+	flow_log("%s()\n", __func__);</div><div class='add'>+	flow_log("  in:%u authFirst:%u\n",</div><div class='add'>+		 req_opts-&gt;is_inbound, req_opts-&gt;auth_first);</div><div class='add'>+	flow_log("  cipher alg:%u mode:%u type %u\n", cipher_parms-&gt;alg,</div><div class='add'>+		 cipher_parms-&gt;mode, cipher_parms-&gt;type);</div><div class='add'>+	flow_log("  is_esp: %s\n", req_opts-&gt;is_esp ? "yes" : "no");</div><div class='add'>+	flow_log("    key: %d\n", cipher_parms-&gt;key_len);</div><div class='add'>+	flow_dump("    key: ", cipher_parms-&gt;key_buf, cipher_parms-&gt;key_len);</div><div class='add'>+	flow_log("    iv: %d\n", cipher_parms-&gt;iv_len);</div><div class='add'>+	flow_dump("    iv: ", cipher_parms-&gt;iv_buf, cipher_parms-&gt;iv_len);</div><div class='add'>+	flow_log("  auth alg:%u mode:%u type %u\n",</div><div class='add'>+		 hash_parms-&gt;alg, hash_parms-&gt;mode, hash_parms-&gt;type);</div><div class='add'>+	flow_log("  digestsize: %u\n", hash_parms-&gt;digestsize);</div><div class='add'>+	flow_log("  authkey: %d\n", hash_parms-&gt;key_len);</div><div class='add'>+	flow_dump("  authkey: ", hash_parms-&gt;key_buf, hash_parms-&gt;key_len);</div><div class='add'>+	flow_log("  assoc_size:%u\n", assoc_size);</div><div class='add'>+	flow_log("  prebuf_len:%u\n", hash_parms-&gt;prebuf_len);</div><div class='add'>+	flow_log("  data_size:%u\n", data_size);</div><div class='add'>+	flow_log("  hash_pad_len:%u\n", hash_parms-&gt;pad_len);</div><div class='add'>+	flow_log("  real_db_size:%u\n", real_db_size);</div><div class='add'>+	flow_log("  cipher_offset:%u payload_len:%u\n",</div><div class='add'>+		 cipher_offset, payload_len);</div><div class='add'>+	flow_log("  aead_iv: %u\n", aead_parms-&gt;iv_len);</div><div class='add'>+</div><div class='add'>+	/* Convert to spu2 values for cipher alg, hash alg */</div><div class='add'>+	err = spu2_cipher_xlate(cipher_parms-&gt;alg, cipher_parms-&gt;mode,</div><div class='add'>+				cipher_parms-&gt;type,</div><div class='add'>+				&amp;spu2_ciph_type, &amp;spu2_ciph_mode);</div><div class='add'>+</div><div class='add'>+	/* If we are doing GCM hashing only - either via rfc4543 transform</div><div class='add'>+	 * or because we happen to do GCM with AAD only and no payload - we</div><div class='add'>+	 * need to configure hardware to use hash key rather than cipher key</div><div class='add'>+	 * and put data into payload.  This is because unlike SPU-M, running</div><div class='add'>+	 * GCM cipher with 0 size payload is not permitted.</div><div class='add'>+	 */</div><div class='add'>+	if ((req_opts-&gt;is_rfc4543) ||</div><div class='add'>+	    ((spu2_ciph_mode == SPU2_CIPHER_MODE_GCM) &amp;&amp;</div><div class='add'>+	    (payload_len == 0))) {</div><div class='add'>+		/* Use hashing (only) and set up hash key */</div><div class='add'>+		spu2_ciph_type = SPU2_CIPHER_TYPE_NONE;</div><div class='add'>+		hash_parms-&gt;key_len = cipher_parms-&gt;key_len;</div><div class='add'>+		memcpy(hash_parms-&gt;key_buf, cipher_parms-&gt;key_buf,</div><div class='add'>+		       cipher_parms-&gt;key_len);</div><div class='add'>+		cipher_parms-&gt;key_len = 0;</div><div class='add'>+</div><div class='add'>+		if (req_opts-&gt;is_rfc4543)</div><div class='add'>+			payload_len += assoc_size;</div><div class='add'>+		else</div><div class='add'>+			payload_len = assoc_size;</div><div class='add'>+		cipher_offset = 0;</div><div class='add'>+		assoc_size = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	flow_log("spu2 cipher type %s, cipher mode %s\n",</div><div class='add'>+		 spu2_ciph_type_name(spu2_ciph_type),</div><div class='add'>+		 spu2_ciph_mode_name(spu2_ciph_mode));</div><div class='add'>+</div><div class='add'>+	err = spu2_hash_xlate(hash_parms-&gt;alg, hash_parms-&gt;mode,</div><div class='add'>+			      hash_parms-&gt;type,</div><div class='add'>+			      cipher_parms-&gt;type,</div><div class='add'>+			      &amp;spu2_auth_type, &amp;spu2_auth_mode);</div><div class='add'>+	if (err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	flow_log("spu2 hash type %s, hash mode %s\n",</div><div class='add'>+		 spu2_hash_type_name(spu2_auth_type),</div><div class='add'>+		 spu2_hash_mode_name(spu2_auth_mode));</div><div class='add'>+</div><div class='add'>+	fmd = (struct SPU2_FMD *)spu_hdr;</div><div class='add'>+</div><div class='add'>+	spu2_fmd_ctrl0_write(fmd, req_opts-&gt;is_inbound, req_opts-&gt;auth_first,</div><div class='add'>+			     proto, spu2_ciph_type, spu2_ciph_mode,</div><div class='add'>+			     spu2_auth_type, spu2_auth_mode);</div><div class='add'>+</div><div class='add'>+	spu2_fmd_ctrl1_write(fmd, req_opts-&gt;is_inbound, assoc_size,</div><div class='add'>+			     hash_parms-&gt;key_len, cipher_parms-&gt;key_len,</div><div class='add'>+			     false, false,</div><div class='add'>+			     aead_parms-&gt;return_iv, aead_parms-&gt;ret_iv_len,</div><div class='add'>+			     aead_parms-&gt;ret_iv_off,</div><div class='add'>+			     cipher_parms-&gt;iv_len, hash_parms-&gt;digestsize,</div><div class='add'>+			     !req_opts-&gt;bd_suppress, return_md);</div><div class='add'>+</div><div class='add'>+	spu2_fmd_ctrl2_write(fmd, cipher_offset, hash_parms-&gt;key_len, 0,</div><div class='add'>+			     cipher_parms-&gt;key_len, cipher_parms-&gt;iv_len);</div><div class='add'>+</div><div class='add'>+	spu2_fmd_ctrl3_write(fmd, payload_len);</div><div class='add'>+</div><div class='add'>+	ptr = (u8 *)(fmd + 1);</div><div class='add'>+	buf_len = sizeof(struct SPU2_FMD);</div><div class='add'>+</div><div class='add'>+	/* Write OMD */</div><div class='add'>+	if (hash_parms-&gt;key_len) {</div><div class='add'>+		memcpy(ptr, hash_parms-&gt;key_buf, hash_parms-&gt;key_len);</div><div class='add'>+		ptr += hash_parms-&gt;key_len;</div><div class='add'>+		buf_len += hash_parms-&gt;key_len;</div><div class='add'>+	}</div><div class='add'>+	if (cipher_parms-&gt;key_len) {</div><div class='add'>+		memcpy(ptr, cipher_parms-&gt;key_buf, cipher_parms-&gt;key_len);</div><div class='add'>+		ptr += cipher_parms-&gt;key_len;</div><div class='add'>+		buf_len += cipher_parms-&gt;key_len;</div><div class='add'>+	}</div><div class='add'>+	if (cipher_parms-&gt;iv_len) {</div><div class='add'>+		memcpy(ptr, cipher_parms-&gt;iv_buf, cipher_parms-&gt;iv_len);</div><div class='add'>+		ptr += cipher_parms-&gt;iv_len;</div><div class='add'>+		buf_len += cipher_parms-&gt;iv_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	packet_dump("  SPU request header: ", spu_hdr, buf_len);</div><div class='add'>+</div><div class='add'>+	return buf_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_cipher_req_init() - Build an ablkcipher SPU2 request message header,</div><div class='add'>+ * including FMD and OMD.</div><div class='add'>+ * @spu_hdr:       Location of start of SPU request (FMD field)</div><div class='add'>+ * @cipher_parms:  Parameters describing cipher request</div><div class='add'>+ *</div><div class='add'>+ * Called at setkey time to initialize a msg header that can be reused for all</div><div class='add'>+ * subsequent ablkcipher requests. Construct the message starting at spu_hdr.</div><div class='add'>+ * Caller should allocate this buffer in DMA-able memory at least</div><div class='add'>+ * SPU_HEADER_ALLOC_LEN bytes long.</div><div class='add'>+ *</div><div class='add'>+ * Return: the total length of the SPU header (FMD and OMD) in bytes. 0 if an</div><div class='add'>+ * error occurs.</div><div class='add'>+ */</div><div class='add'>+u16 spu2_cipher_req_init(u8 *spu_hdr, struct spu_cipher_parms *cipher_parms)</div><div class='add'>+{</div><div class='add'>+	struct SPU2_FMD *fmd;</div><div class='add'>+	u8 *omd;</div><div class='add'>+	enum spu2_cipher_type spu2_type = SPU2_CIPHER_TYPE_NONE;</div><div class='add'>+	enum spu2_cipher_mode spu2_mode;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	flow_log("%s()\n", __func__);</div><div class='add'>+	flow_log("  cipher alg:%u mode:%u type %u\n", cipher_parms-&gt;alg,</div><div class='add'>+		 cipher_parms-&gt;mode, cipher_parms-&gt;type);</div><div class='add'>+	flow_log("  cipher_iv_len: %u\n", cipher_parms-&gt;iv_len);</div><div class='add'>+	flow_log("    key: %d\n", cipher_parms-&gt;key_len);</div><div class='add'>+	flow_dump("    key: ", cipher_parms-&gt;key_buf, cipher_parms-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	/* Convert to spu2 values */</div><div class='add'>+	err = spu2_cipher_xlate(cipher_parms-&gt;alg, cipher_parms-&gt;mode,</div><div class='add'>+				cipher_parms-&gt;type, &amp;spu2_type, &amp;spu2_mode);</div><div class='add'>+	if (err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	flow_log("spu2 cipher type %s, cipher mode %s\n",</div><div class='add'>+		 spu2_ciph_type_name(spu2_type),</div><div class='add'>+		 spu2_ciph_mode_name(spu2_mode));</div><div class='add'>+</div><div class='add'>+	/* Construct the FMD header */</div><div class='add'>+	fmd = (struct SPU2_FMD *)spu_hdr;</div><div class='add'>+	err = spu2_fmd_init(fmd, spu2_type, spu2_mode, cipher_parms-&gt;key_len,</div><div class='add'>+			    cipher_parms-&gt;iv_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Write cipher key to OMD */</div><div class='add'>+	omd = (u8 *)(fmd + 1);</div><div class='add'>+	if (cipher_parms-&gt;key_buf &amp;&amp; cipher_parms-&gt;key_len)</div><div class='add'>+		memcpy(omd, cipher_parms-&gt;key_buf, cipher_parms-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	packet_dump("  SPU request header: ", spu_hdr,</div><div class='add'>+		    FMD_SIZE + cipher_parms-&gt;key_len + cipher_parms-&gt;iv_len);</div><div class='add'>+</div><div class='add'>+	return FMD_SIZE + cipher_parms-&gt;key_len + cipher_parms-&gt;iv_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_cipher_req_finish() - Finish building a SPU request message header for a</div><div class='add'>+ * block cipher request.</div><div class='add'>+ * @spu_hdr:         Start of the request message header (MH field)</div><div class='add'>+ * @spu_req_hdr_len: Length in bytes of the SPU request header</div><div class='add'>+ * @isInbound:       0 encrypt, 1 decrypt</div><div class='add'>+ * @cipher_parms:    Parameters describing cipher operation to be performed</div><div class='add'>+ * @update_key:      If true, rewrite the cipher key in SCTX</div><div class='add'>+ * @data_size:       Length of the data in the BD field</div><div class='add'>+ *</div><div class='add'>+ * Assumes much of the header was already filled in at setkey() time in</div><div class='add'>+ * spu_cipher_req_init().</div><div class='add'>+ * spu_cipher_req_init() fills in the encryption key. For RC4, when submitting a</div><div class='add'>+ * request for a non-first chunk, we use the 260-byte SUPDT field from the</div><div class='add'>+ * previous response as the key. update_key is true for this case. Unused in all</div><div class='add'>+ * other cases.</div><div class='add'>+ */</div><div class='add'>+void spu2_cipher_req_finish(u8 *spu_hdr,</div><div class='add'>+			    u16 spu_req_hdr_len,</div><div class='add'>+			    unsigned int is_inbound,</div><div class='add'>+			    struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			    bool update_key,</div><div class='add'>+			    unsigned int data_size)</div><div class='add'>+{</div><div class='add'>+	struct SPU2_FMD *fmd;</div><div class='add'>+	u8 *omd;		/* start of optional metadata */</div><div class='add'>+	u64 ctrl0;</div><div class='add'>+	u64 ctrl3;</div><div class='add'>+</div><div class='add'>+	flow_log("%s()\n", __func__);</div><div class='add'>+	flow_log(" in: %u\n", is_inbound);</div><div class='add'>+	flow_log(" cipher alg: %u, cipher_type: %u\n", cipher_parms-&gt;alg,</div><div class='add'>+		 cipher_parms-&gt;type);</div><div class='add'>+	if (update_key) {</div><div class='add'>+		flow_log(" cipher key len: %u\n", cipher_parms-&gt;key_len);</div><div class='add'>+		flow_dump("  key: ", cipher_parms-&gt;key_buf,</div><div class='add'>+			  cipher_parms-&gt;key_len);</div><div class='add'>+	}</div><div class='add'>+	flow_log(" iv len: %d\n", cipher_parms-&gt;iv_len);</div><div class='add'>+	flow_dump("    iv: ", cipher_parms-&gt;iv_buf, cipher_parms-&gt;iv_len);</div><div class='add'>+	flow_log(" data_size: %u\n", data_size);</div><div class='add'>+</div><div class='add'>+	fmd = (struct SPU2_FMD *)spu_hdr;</div><div class='add'>+	omd = (u8 *)(fmd + 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FMD ctrl0 was initialized at setkey time. update it to indicate</div><div class='add'>+	 * whether we are encrypting or decrypting.</div><div class='add'>+	 */</div><div class='add'>+	ctrl0 = le64_to_cpu(fmd-&gt;ctrl0);</div><div class='add'>+	if (is_inbound)</div><div class='add'>+		ctrl0 &amp;= ~SPU2_CIPH_ENCRYPT_EN;	/* decrypt */</div><div class='add'>+	else</div><div class='add'>+		ctrl0 |= SPU2_CIPH_ENCRYPT_EN;	/* encrypt */</div><div class='add'>+	fmd-&gt;ctrl0 = cpu_to_le64(ctrl0);</div><div class='add'>+</div><div class='add'>+	if (cipher_parms-&gt;alg &amp;&amp; cipher_parms-&gt;iv_buf &amp;&amp; cipher_parms-&gt;iv_len) {</div><div class='add'>+		/* cipher iv provided so put it in here */</div><div class='add'>+		memcpy(omd + cipher_parms-&gt;key_len, cipher_parms-&gt;iv_buf,</div><div class='add'>+		       cipher_parms-&gt;iv_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctrl3 = le64_to_cpu(fmd-&gt;ctrl3);</div><div class='add'>+	data_size &amp;= SPU2_PL_LEN;</div><div class='add'>+	ctrl3 |= data_size;</div><div class='add'>+	fmd-&gt;ctrl3 = cpu_to_le64(ctrl3);</div><div class='add'>+</div><div class='add'>+	packet_dump("  SPU request header: ", spu_hdr, spu_req_hdr_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_request_pad() - Create pad bytes at the end of the data.</div><div class='add'>+ * @pad_start:      Start of buffer where pad bytes are to be written</div><div class='add'>+ * @gcm_padding:    Length of GCM padding, in bytes</div><div class='add'>+ * @hash_pad_len:   Number of bytes of padding extend data to full block</div><div class='add'>+ * @auth_alg:       Authentication algorithm</div><div class='add'>+ * @auth_mode:      Authentication mode</div><div class='add'>+ * @total_sent:     Length inserted at end of hash pad</div><div class='add'>+ * @status_padding: Number of bytes of padding to align STATUS word</div><div class='add'>+ *</div><div class='add'>+ * There may be three forms of pad:</div><div class='add'>+ *  1. GCM pad - for GCM mode ciphers, pad to 16-byte alignment</div><div class='add'>+ *  2. hash pad - pad to a block length, with 0x80 data terminator and</div><div class='add'>+ *                size at the end</div><div class='add'>+ *  3. STAT pad - to ensure the STAT field is 4-byte aligned</div><div class='add'>+ */</div><div class='add'>+void spu2_request_pad(u8 *pad_start, u32 gcm_padding, u32 hash_pad_len,</div><div class='add'>+		      enum hash_alg auth_alg, enum hash_mode auth_mode,</div><div class='add'>+		      unsigned int total_sent, u32 status_padding)</div><div class='add'>+{</div><div class='add'>+	u8 *ptr = pad_start;</div><div class='add'>+</div><div class='add'>+	/* fix data alignent for GCM */</div><div class='add'>+	if (gcm_padding &gt; 0) {</div><div class='add'>+		flow_log("  GCM: padding to 16 byte alignment: %u bytes\n",</div><div class='add'>+			 gcm_padding);</div><div class='add'>+		memset(ptr, 0, gcm_padding);</div><div class='add'>+		ptr += gcm_padding;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hash_pad_len &gt; 0) {</div><div class='add'>+		/* clear the padding section */</div><div class='add'>+		memset(ptr, 0, hash_pad_len);</div><div class='add'>+</div><div class='add'>+		/* terminate the data */</div><div class='add'>+		*ptr = 0x80;</div><div class='add'>+		ptr += (hash_pad_len - sizeof(u64));</div><div class='add'>+</div><div class='add'>+		/* add the size at the end as required per alg */</div><div class='add'>+		if (auth_alg == HASH_ALG_MD5)</div><div class='add'>+			*(u64 *)ptr = cpu_to_le64((u64)total_sent * 8);</div><div class='add'>+		else		/* SHA1, SHA2-224, SHA2-256 */</div><div class='add'>+			*(u64 *)ptr = cpu_to_be64((u64)total_sent * 8);</div><div class='add'>+		ptr += sizeof(u64);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pad to a 4byte alignment for STAT */</div><div class='add'>+	if (status_padding &gt; 0) {</div><div class='add'>+		flow_log("  STAT: padding to 4 byte alignment: %u bytes\n",</div><div class='add'>+			 status_padding);</div><div class='add'>+</div><div class='add'>+		memset(ptr, 0, status_padding);</div><div class='add'>+		ptr += status_padding;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_xts_tweak_in_payload() - Indicate that SPU2 does NOT place the XTS</div><div class='add'>+ * tweak field in the packet payload (it uses IV instead)</div><div class='add'>+ *</div><div class='add'>+ * Return: 0</div><div class='add'>+ */</div><div class='add'>+u8 spu2_xts_tweak_in_payload(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_tx_status_len() - Return the length of the STATUS field in a SPU</div><div class='add'>+ * response message.</div><div class='add'>+ *</div><div class='add'>+ * Return: Length of STATUS field in bytes.</div><div class='add'>+ */</div><div class='add'>+u8 spu2_tx_status_len(void)</div><div class='add'>+{</div><div class='add'>+	return SPU2_TX_STATUS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_rx_status_len() - Return the length of the STATUS field in a SPU</div><div class='add'>+ * response message.</div><div class='add'>+ *</div><div class='add'>+ * Return: Length of STATUS field in bytes.</div><div class='add'>+ */</div><div class='add'>+u8 spu2_rx_status_len(void)</div><div class='add'>+{</div><div class='add'>+	return SPU2_RX_STATUS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_status_process() - Process the status from a SPU response message.</div><div class='add'>+ * @statp:  start of STATUS word</div><div class='add'>+ *</div><div class='add'>+ * Return:  0 - if status is good and response should be processed</div><div class='add'>+ *         !0 - status indicates an error and response is invalid</div><div class='add'>+ */</div><div class='add'>+int spu2_status_process(u8 *statp)</div><div class='add'>+{</div><div class='add'>+	/* SPU2 status is 2 bytes by default - SPU_RX_STATUS_LEN */</div><div class='add'>+	u16 status = le16_to_cpu(*(__le16 *)statp);</div><div class='add'>+</div><div class='add'>+	if (status == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	flow_log("rx status is %#x\n", status);</div><div class='add'>+	if (status == SPU2_INVALID_ICV)</div><div class='add'>+		return SPU_INVALID_ICV;</div><div class='add'>+</div><div class='add'>+	return -EBADMSG;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_ccm_update_iv() - Update the IV as per the requirements for CCM mode.</div><div class='add'>+ *</div><div class='add'>+ * @digestsize:		Digest size of this request</div><div class='add'>+ * @cipher_parms:	(pointer to) cipher parmaeters, includes IV buf &amp; IV len</div><div class='add'>+ * @assoclen:		Length of AAD data</div><div class='add'>+ * @chunksize:		length of input data to be sent in this req</div><div class='add'>+ * @is_encrypt:		true if this is an output/encrypt operation</div><div class='add'>+ * @is_esp:		true if this is an ESP / RFC4309 operation</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void spu2_ccm_update_iv(unsigned int digestsize,</div><div class='add'>+			struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			unsigned int assoclen, unsigned int chunksize,</div><div class='add'>+			bool is_encrypt, bool is_esp)</div><div class='add'>+{</div><div class='add'>+	int L;  /* size of length field, in bytes */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In RFC4309 mode, L is fixed at 4 bytes; otherwise, IV from</div><div class='add'>+	 * testmgr contains (L-1) in bottom 3 bits of first byte,</div><div class='add'>+	 * per RFC 3610.</div><div class='add'>+	 */</div><div class='add'>+	if (is_esp)</div><div class='add'>+		L = CCM_ESP_L_VALUE;</div><div class='add'>+	else</div><div class='add'>+		L = ((cipher_parms-&gt;iv_buf[0] &amp; CCM_B0_L_PRIME) &gt;&gt;</div><div class='add'>+		      CCM_B0_L_PRIME_SHIFT) + 1;</div><div class='add'>+</div><div class='add'>+	/* SPU2 doesn't want these length bytes nor the first byte... */</div><div class='add'>+	cipher_parms-&gt;iv_len -= (1 + L);</div><div class='add'>+	memmove(cipher_parms-&gt;iv_buf, &amp;cipher_parms-&gt;iv_buf[1],</div><div class='add'>+		cipher_parms-&gt;iv_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu2_wordalign_padlen() - SPU2 does not require padding.</div><div class='add'>+ * @data_size: length of data field in bytes</div><div class='add'>+ *</div><div class='add'>+ * Return: length of status field padding, in bytes (always 0 on SPU2)</div><div class='add'>+ */</div><div class='add'>+u32 spu2_wordalign_padlen(u32 data_size)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/crypto/bcm/spu2.h b/drivers/crypto/bcm/spu2.h<br/>new file mode 100644<br/>index 000000000000..ab1f59934828<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bcm/spu2.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/spu2.h</a></div><div class='hunk'>@@ -0,0 +1,228 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Broadcom</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, version 2, as</div><div class='add'>+ * published by the Free Software Foundation (the "GPL").</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License version 2 (GPLv2) for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * version 2 (GPLv2) along with this source code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This file contains SPU message definitions specific to SPU2.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _SPU2_H</div><div class='add'>+#define _SPU2_H</div><div class='add'>+</div><div class='add'>+enum spu2_cipher_type {</div><div class='add'>+	SPU2_CIPHER_TYPE_NONE = 0x0,</div><div class='add'>+	SPU2_CIPHER_TYPE_AES128 = 0x1,</div><div class='add'>+	SPU2_CIPHER_TYPE_AES192 = 0x2,</div><div class='add'>+	SPU2_CIPHER_TYPE_AES256 = 0x3,</div><div class='add'>+	SPU2_CIPHER_TYPE_DES = 0x4,</div><div class='add'>+	SPU2_CIPHER_TYPE_3DES = 0x5,</div><div class='add'>+	SPU2_CIPHER_TYPE_LAST</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum spu2_cipher_mode {</div><div class='add'>+	SPU2_CIPHER_MODE_ECB = 0x0,</div><div class='add'>+	SPU2_CIPHER_MODE_CBC = 0x1,</div><div class='add'>+	SPU2_CIPHER_MODE_CTR = 0x2,</div><div class='add'>+	SPU2_CIPHER_MODE_CFB = 0x3,</div><div class='add'>+	SPU2_CIPHER_MODE_OFB = 0x4,</div><div class='add'>+	SPU2_CIPHER_MODE_XTS = 0x5,</div><div class='add'>+	SPU2_CIPHER_MODE_CCM = 0x6,</div><div class='add'>+	SPU2_CIPHER_MODE_GCM = 0x7,</div><div class='add'>+	SPU2_CIPHER_MODE_LAST</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum spu2_hash_type {</div><div class='add'>+	SPU2_HASH_TYPE_NONE = 0x0,</div><div class='add'>+	SPU2_HASH_TYPE_AES128 = 0x1,</div><div class='add'>+	SPU2_HASH_TYPE_AES192 = 0x2,</div><div class='add'>+	SPU2_HASH_TYPE_AES256 = 0x3,</div><div class='add'>+	SPU2_HASH_TYPE_MD5 = 0x6,</div><div class='add'>+	SPU2_HASH_TYPE_SHA1 = 0x7,</div><div class='add'>+	SPU2_HASH_TYPE_SHA224 = 0x8,</div><div class='add'>+	SPU2_HASH_TYPE_SHA256 = 0x9,</div><div class='add'>+	SPU2_HASH_TYPE_SHA384 = 0xa,</div><div class='add'>+	SPU2_HASH_TYPE_SHA512 = 0xb,</div><div class='add'>+	SPU2_HASH_TYPE_SHA512_224 = 0xc,</div><div class='add'>+	SPU2_HASH_TYPE_SHA512_256 = 0xd,</div><div class='add'>+	SPU2_HASH_TYPE_SHA3_224 = 0xe,</div><div class='add'>+	SPU2_HASH_TYPE_SHA3_256 = 0xf,</div><div class='add'>+	SPU2_HASH_TYPE_SHA3_384 = 0x10,</div><div class='add'>+	SPU2_HASH_TYPE_SHA3_512 = 0x11,</div><div class='add'>+	SPU2_HASH_TYPE_LAST</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum spu2_hash_mode {</div><div class='add'>+	SPU2_HASH_MODE_CMAC = 0x0,</div><div class='add'>+	SPU2_HASH_MODE_CBC_MAC = 0x1,</div><div class='add'>+	SPU2_HASH_MODE_XCBC_MAC = 0x2,</div><div class='add'>+	SPU2_HASH_MODE_HMAC = 0x3,</div><div class='add'>+	SPU2_HASH_MODE_RABIN = 0x4,</div><div class='add'>+	SPU2_HASH_MODE_CCM = 0x5,</div><div class='add'>+	SPU2_HASH_MODE_GCM = 0x6,</div><div class='add'>+	SPU2_HASH_MODE_RESERVED = 0x7,</div><div class='add'>+	SPU2_HASH_MODE_LAST</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum spu2_ret_md_opts {</div><div class='add'>+	SPU2_RET_NO_MD = 0,	/* return no metadata */</div><div class='add'>+	SPU2_RET_FMD_OMD = 1,	/* return both FMD and OMD */</div><div class='add'>+	SPU2_RET_FMD_ONLY = 2,	/* return only FMD */</div><div class='add'>+	SPU2_RET_FMD_OMD_IV = 3,	/* return FMD and OMD with just IVs */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Fixed Metadata format */</div><div class='add'>+struct SPU2_FMD {</div><div class='add'>+	u64 ctrl0;</div><div class='add'>+	u64 ctrl1;</div><div class='add'>+	u64 ctrl2;</div><div class='add'>+	u64 ctrl3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FMD_SIZE  sizeof(struct SPU2_FMD)</div><div class='add'>+</div><div class='add'>+/* Fixed part of request message header length in bytes. Just FMD. */</div><div class='add'>+#define SPU2_REQ_FIXED_LEN FMD_SIZE</div><div class='add'>+#define SPU2_HEADER_ALLOC_LEN (SPU_REQ_FIXED_LEN + \</div><div class='add'>+				2 * MAX_KEY_SIZE + 2 * MAX_IV_SIZE)</div><div class='add'>+</div><div class='add'>+/* FMD ctrl0 field masks */</div><div class='add'>+#define SPU2_CIPH_ENCRYPT_EN            0x1 /* 0: decrypt, 1: encrypt */</div><div class='add'>+#define SPU2_CIPH_TYPE                 0xF0 /* one of spu2_cipher_type */</div><div class='add'>+#define SPU2_CIPH_TYPE_SHIFT              4</div><div class='add'>+#define SPU2_CIPH_MODE                0xF00 /* one of spu2_cipher_mode */</div><div class='add'>+#define SPU2_CIPH_MODE_SHIFT              8</div><div class='add'>+#define SPU2_CFB_MASK                0x7000 /* cipher feedback mask */</div><div class='add'>+#define SPU2_CFB_MASK_SHIFT              12</div><div class='add'>+#define SPU2_PROTO_SEL             0xF00000 /* MACsec, IPsec, TLS... */</div><div class='add'>+#define SPU2_PROTO_SEL_SHIFT             20</div><div class='add'>+#define SPU2_HASH_FIRST           0x1000000 /* 1: hash input is input pkt</div><div class='add'>+					     * data</div><div class='add'>+					     */</div><div class='add'>+#define SPU2_CHK_TAG              0x2000000 /* 1: check digest provided */</div><div class='add'>+#define SPU2_HASH_TYPE          0x1F0000000 /* one of spu2_hash_type */</div><div class='add'>+#define SPU2_HASH_TYPE_SHIFT             28</div><div class='add'>+#define SPU2_HASH_MODE         0xF000000000 /* one of spu2_hash_mode */</div><div class='add'>+#define SPU2_HASH_MODE_SHIFT             36</div><div class='add'>+#define SPU2_CIPH_PAD_EN     0x100000000000 /* 1: Add pad to end of payload for</div><div class='add'>+					     *    enc</div><div class='add'>+					     */</div><div class='add'>+#define SPU2_CIPH_PAD      0xFF000000000000 /* cipher pad value */</div><div class='add'>+#define SPU2_CIPH_PAD_SHIFT              48</div><div class='add'>+</div><div class='add'>+/* FMD ctrl1 field masks */</div><div class='add'>+#define SPU2_TAG_LOC                    0x1 /* 1: end of payload, 0: undef */</div><div class='add'>+#define SPU2_HAS_FR_DATA                0x2 /* 1: msg has frame data */</div><div class='add'>+#define SPU2_HAS_AAD1                   0x4 /* 1: msg has AAD1 field */</div><div class='add'>+#define SPU2_HAS_NAAD                   0x8 /* 1: msg has NAAD field */</div><div class='add'>+#define SPU2_HAS_AAD2                  0x10 /* 1: msg has AAD2 field */</div><div class='add'>+#define SPU2_HAS_ESN                   0x20 /* 1: msg has ESN field */</div><div class='add'>+#define SPU2_HASH_KEY_LEN            0xFF00 /* len of hash key in bytes.</div><div class='add'>+					     * HMAC only.</div><div class='add'>+					     */</div><div class='add'>+#define SPU2_HASH_KEY_LEN_SHIFT           8</div><div class='add'>+#define SPU2_CIPH_KEY_LEN         0xFF00000 /* len of cipher key in bytes */</div><div class='add'>+#define SPU2_CIPH_KEY_LEN_SHIFT          20</div><div class='add'>+#define SPU2_GENIV               0x10000000 /* 1: hw generates IV */</div><div class='add'>+#define SPU2_HASH_IV             0x20000000 /* 1: IV incl in hash */</div><div class='add'>+#define SPU2_RET_IV              0x40000000 /* 1: return IV in output msg</div><div class='add'>+					     *    b4 payload</div><div class='add'>+					     */</div><div class='add'>+#define SPU2_RET_IV_LEN         0xF00000000 /* length in bytes of IV returned.</div><div class='add'>+					     * 0 = 16 bytes</div><div class='add'>+					     */</div><div class='add'>+#define SPU2_RET_IV_LEN_SHIFT            32</div><div class='add'>+#define SPU2_IV_OFFSET         0xF000000000 /* gen IV offset */</div><div class='add'>+#define SPU2_IV_OFFSET_SHIFT             36</div><div class='add'>+#define SPU2_IV_LEN          0x1F0000000000 /* length of input IV in bytes */</div><div class='add'>+#define SPU2_IV_LEN_SHIFT                40</div><div class='add'>+#define SPU2_HASH_TAG_LEN  0x7F000000000000 /* hash tag length in bytes */</div><div class='add'>+#define SPU2_HASH_TAG_LEN_SHIFT          48</div><div class='add'>+#define SPU2_RETURN_MD    0x300000000000000 /* return metadata */</div><div class='add'>+#define SPU2_RETURN_MD_SHIFT             56</div><div class='add'>+#define SPU2_RETURN_FD    0x400000000000000</div><div class='add'>+#define SPU2_RETURN_AAD1  0x800000000000000</div><div class='add'>+#define SPU2_RETURN_NAAD 0x1000000000000000</div><div class='add'>+#define SPU2_RETURN_AAD2 0x2000000000000000</div><div class='add'>+#define SPU2_RETURN_PAY  0x4000000000000000 /* return payload */</div><div class='add'>+</div><div class='add'>+/* FMD ctrl2 field masks */</div><div class='add'>+#define SPU2_AAD1_OFFSET              0xFFF /* byte offset of AAD1 field */</div><div class='add'>+#define SPU2_AAD1_LEN               0xFF000 /* length of AAD1 in bytes */</div><div class='add'>+#define SPU2_AAD1_LEN_SHIFT              12</div><div class='add'>+#define SPU2_AAD2_OFFSET         0xFFF00000 /* byte offset of AAD2 field */</div><div class='add'>+#define SPU2_AAD2_OFFSET_SHIFT           20</div><div class='add'>+#define SPU2_PL_OFFSET   0xFFFFFFFF00000000 /* payload offset from AAD2 */</div><div class='add'>+#define SPU2_PL_OFFSET_SHIFT             32</div><div class='add'>+</div><div class='add'>+/* FMD ctrl3 field masks */</div><div class='add'>+#define SPU2_PL_LEN              0xFFFFFFFF /* payload length in bytes */</div><div class='add'>+#define SPU2_TLS_LEN         0xFFFF00000000 /* TLS encrypt: cipher len</div><div class='add'>+					     * TLS decrypt: compressed len</div><div class='add'>+					     */</div><div class='add'>+#define SPU2_TLS_LEN_SHIFT               32</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Max value that can be represented in the Payload Length field of the</div><div class='add'>+ * ctrl3 word of FMD.</div><div class='add'>+ */</div><div class='add'>+#define SPU2_MAX_PAYLOAD  SPU2_PL_LEN</div><div class='add'>+</div><div class='add'>+/* Error values returned in STATUS field of response messages */</div><div class='add'>+#define SPU2_INVALID_ICV  1</div><div class='add'>+</div><div class='add'>+void spu2_dump_msg_hdr(u8 *buf, unsigned int buf_len);</div><div class='add'>+u32 spu2_ctx_max_payload(enum spu_cipher_alg cipher_alg,</div><div class='add'>+			 enum spu_cipher_mode cipher_mode,</div><div class='add'>+			 unsigned int blocksize);</div><div class='add'>+u32 spu2_payload_length(u8 *spu_hdr);</div><div class='add'>+u16 spu2_response_hdr_len(u16 auth_key_len, u16 enc_key_len, bool is_hash);</div><div class='add'>+u16 spu2_hash_pad_len(enum hash_alg hash_alg, enum hash_mode hash_mode,</div><div class='add'>+		      u32 chunksize, u16 hash_block_size);</div><div class='add'>+u32 spu2_gcm_ccm_pad_len(enum spu_cipher_mode cipher_mode,</div><div class='add'>+			 unsigned int data_size);</div><div class='add'>+u32 spu2_assoc_resp_len(enum spu_cipher_mode cipher_mode,</div><div class='add'>+			unsigned int assoc_len, unsigned int iv_len,</div><div class='add'>+			bool is_encrypt);</div><div class='add'>+u8 spu2_aead_ivlen(enum spu_cipher_mode cipher_mode,</div><div class='add'>+		   u16 iv_len);</div><div class='add'>+enum hash_type spu2_hash_type(u32 src_sent);</div><div class='add'>+u32 spu2_digest_size(u32 alg_digest_size, enum hash_alg alg,</div><div class='add'>+		     enum hash_type htype);</div><div class='add'>+u32 spu2_create_request(u8 *spu_hdr,</div><div class='add'>+			struct spu_request_opts *req_opts,</div><div class='add'>+			struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			struct spu_hash_parms *hash_parms,</div><div class='add'>+			struct spu_aead_parms *aead_parms,</div><div class='add'>+			unsigned int data_size);</div><div class='add'>+u16 spu2_cipher_req_init(u8 *spu_hdr, struct spu_cipher_parms *cipher_parms);</div><div class='add'>+void spu2_cipher_req_finish(u8 *spu_hdr,</div><div class='add'>+			    u16 spu_req_hdr_len,</div><div class='add'>+			    unsigned int is_inbound,</div><div class='add'>+			    struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			    bool update_key,</div><div class='add'>+			    unsigned int data_size);</div><div class='add'>+void spu2_request_pad(u8 *pad_start, u32 gcm_padding, u32 hash_pad_len,</div><div class='add'>+		      enum hash_alg auth_alg, enum hash_mode auth_mode,</div><div class='add'>+		      unsigned int total_sent, u32 status_padding);</div><div class='add'>+u8 spu2_xts_tweak_in_payload(void);</div><div class='add'>+u8 spu2_tx_status_len(void);</div><div class='add'>+u8 spu2_rx_status_len(void);</div><div class='add'>+int spu2_status_process(u8 *statp);</div><div class='add'>+void spu2_ccm_update_iv(unsigned int digestsize,</div><div class='add'>+			struct spu_cipher_parms *cipher_parms,</div><div class='add'>+			unsigned int assoclen, unsigned int chunksize,</div><div class='add'>+			bool is_encrypt, bool is_esp);</div><div class='add'>+u32 spu2_wordalign_padlen(u32 data_size);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/crypto/bcm/spum.h b/drivers/crypto/bcm/spum.h<br/>new file mode 100644<br/>index 000000000000..d0a5b5828638<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bcm/spum.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/spum.h</a></div><div class='hunk'>@@ -0,0 +1,174 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Broadcom</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, version 2, as</div><div class='add'>+ * published by the Free Software Foundation (the "GPL").</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License version 2 (GPLv2) for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * version 2 (GPLv2) along with this source code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This file contains SPU message definitions specific to SPU-M.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _SPUM_H_</div><div class='add'>+#define _SPUM_H_</div><div class='add'>+</div><div class='add'>+#define SPU_CRYPTO_OPERATION_GENERIC	0x1</div><div class='add'>+</div><div class='add'>+/* Length of STATUS field in tx and rx packets */</div><div class='add'>+#define SPU_TX_STATUS_LEN  4</div><div class='add'>+</div><div class='add'>+/* SPU-M error codes */</div><div class='add'>+#define SPU_STATUS_MASK                 0x0000FF00</div><div class='add'>+#define SPU_STATUS_SUCCESS              0x00000000</div><div class='add'>+#define SPU_STATUS_INVALID_ICV          0x00000100</div><div class='add'>+</div><div class='add'>+#define SPU_STATUS_ERROR_FLAG           0x00020000</div><div class='add'>+</div><div class='add'>+/* Request message. MH + EMH + BDESC + BD header */</div><div class='add'>+#define SPU_REQ_FIXED_LEN 24</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Max length of a SPU message header. Used to allocate a buffer where</div><div class='add'>+ * the SPU message header is constructed. Can be used for either a SPU-M</div><div class='add'>+ * header or a SPU2 header.</div><div class='add'>+ * For SPU-M, sum of the following:</div><div class='add'>+ *    MH - 4 bytes</div><div class='add'>+ *    EMH - 4</div><div class='add'>+ *    SCTX - 3 +</div><div class='add'>+ *      max auth key len - 64</div><div class='add'>+ *      max cipher key len - 264 (RC4)</div><div class='add'>+ *      max IV len - 16</div><div class='add'>+ *    BDESC - 12</div><div class='add'>+ *    BD header - 4</div><div class='add'>+ * Total:  371</div><div class='add'>+ *</div><div class='add'>+ * For SPU2, FMD_SIZE (32) plus lengths of hash and cipher keys,</div><div class='add'>+ * hash and cipher IVs. If SPU2 does not support RC4, then</div><div class='add'>+ */</div><div class='add'>+#define SPU_HEADER_ALLOC_LEN  (SPU_REQ_FIXED_LEN + MAX_KEY_SIZE + \</div><div class='add'>+				MAX_KEY_SIZE + MAX_IV_SIZE)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Response message header length. Normally MH, EMH, BD header, but when</div><div class='add'>+ * BD_SUPPRESS is used for hash requests, there is no BD header.</div><div class='add'>+ */</div><div class='add'>+#define SPU_RESP_HDR_LEN 12</div><div class='add'>+#define SPU_HASH_RESP_HDR_LEN 8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Max value that can be represented in the Payload Length field of the BD</div><div class='add'>+ * header. This is a 16-bit field.</div><div class='add'>+ */</div><div class='add'>+#define SPUM_NS2_MAX_PAYLOAD  (BIT(16) - 1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NSP SPU is limited to ~9KB because of FA2 FIFO size limitations;</div><div class='add'>+ * Set MAX_PAYLOAD to 8k to allow for addition of header, digest, etc.</div><div class='add'>+ * and stay within limitation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define SPUM_NSP_MAX_PAYLOAD	8192</div><div class='add'>+</div><div class='add'>+/* Buffer Descriptor Header [BDESC]. SPU in big-endian mode. */</div><div class='add'>+struct BDESC_HEADER {</div><div class='add'>+	u16 offset_mac;		/* word 0 [31-16] */</div><div class='add'>+	u16 length_mac;		/* word 0 [15-0]  */</div><div class='add'>+	u16 offset_crypto;	/* word 1 [31-16] */</div><div class='add'>+	u16 length_crypto;	/* word 1 [15-0]  */</div><div class='add'>+	u16 offset_icv;		/* word 2 [31-16] */</div><div class='add'>+	u16 offset_iv;		/* word 2 [15-0]  */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Buffer Data Header [BD]. SPU in big-endian mode. */</div><div class='add'>+struct BD_HEADER {</div><div class='add'>+	u16 size;</div><div class='add'>+	u16 prev_length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Command Context Header. SPU-M in big endian mode. */</div><div class='add'>+struct MHEADER {</div><div class='add'>+	u8 flags;	/* [31:24] */</div><div class='add'>+	u8 op_code;	/* [23:16] */</div><div class='add'>+	u16 reserved;	/* [15:0] */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MH header flags bits */</div><div class='add'>+#define MH_SUPDT_PRES   BIT(0)</div><div class='add'>+#define MH_HASH_PRES    BIT(2)</div><div class='add'>+#define MH_BD_PRES      BIT(3)</div><div class='add'>+#define MH_MFM_PRES     BIT(4)</div><div class='add'>+#define MH_BDESC_PRES   BIT(5)</div><div class='add'>+#define MH_SCTX_PRES	BIT(7)</div><div class='add'>+</div><div class='add'>+/* SCTX word 0 bit offsets and fields masks */</div><div class='add'>+#define SCTX_SIZE               0x000000FF</div><div class='add'>+</div><div class='add'>+/* SCTX word 1 bit shifts and field masks */</div><div class='add'>+#define  UPDT_OFST              0x000000FF   /* offset of SCTX updateable fld */</div><div class='add'>+#define  HASH_TYPE              0x00000300   /* hash alg operation type */</div><div class='add'>+#define  HASH_TYPE_SHIFT                 8</div><div class='add'>+#define  HASH_MODE              0x00001C00   /* one of spu2_hash_mode */</div><div class='add'>+#define  HASH_MODE_SHIFT                10</div><div class='add'>+#define  HASH_ALG               0x0000E000   /* hash algorithm */</div><div class='add'>+#define  HASH_ALG_SHIFT                 13</div><div class='add'>+#define  CIPHER_TYPE            0x00030000   /* encryption operation type */</div><div class='add'>+#define  CIPHER_TYPE_SHIFT              16</div><div class='add'>+#define  CIPHER_MODE            0x001C0000   /* encryption mode */</div><div class='add'>+#define  CIPHER_MODE_SHIFT              18</div><div class='add'>+#define  CIPHER_ALG             0x00E00000   /* encryption algo */</div><div class='add'>+#define  CIPHER_ALG_SHIFT               21</div><div class='add'>+#define  ICV_IS_512                BIT(27)</div><div class='add'>+#define  ICV_IS_512_SHIFT		27</div><div class='add'>+#define  CIPHER_ORDER               BIT(30)</div><div class='add'>+#define  CIPHER_ORDER_SHIFT             30</div><div class='add'>+#define  CIPHER_INBOUND             BIT(31)</div><div class='add'>+#define  CIPHER_INBOUND_SHIFT           31</div><div class='add'>+</div><div class='add'>+/* SCTX word 2 bit shifts and field masks */</div><div class='add'>+#define  EXP_IV_SIZE                   0x7</div><div class='add'>+#define  IV_OFFSET                   BIT(3)</div><div class='add'>+#define  IV_OFFSET_SHIFT                 3</div><div class='add'>+#define  GEN_IV                      BIT(5)</div><div class='add'>+#define  GEN_IV_SHIFT                    5</div><div class='add'>+#define  EXPLICIT_IV                 BIT(6)</div><div class='add'>+#define  EXPLICIT_IV_SHIFT               6</div><div class='add'>+#define  SCTX_IV                     BIT(7)</div><div class='add'>+#define  SCTX_IV_SHIFT                   7</div><div class='add'>+#define  ICV_SIZE                   0x0F00</div><div class='add'>+#define  ICV_SIZE_SHIFT                  8</div><div class='add'>+#define  CHECK_ICV                  BIT(12)</div><div class='add'>+#define  CHECK_ICV_SHIFT                12</div><div class='add'>+#define  INSERT_ICV                 BIT(13)</div><div class='add'>+#define  INSERT_ICV_SHIFT               13</div><div class='add'>+#define  BD_SUPPRESS                BIT(19)</div><div class='add'>+#define  BD_SUPPRESS_SHIFT              19</div><div class='add'>+</div><div class='add'>+/* Generic Mode Security Context Structure [SCTX] */</div><div class='add'>+struct SCTX {</div><div class='add'>+/* word 0: protocol flags */</div><div class='add'>+	u32 proto_flags;</div><div class='add'>+</div><div class='add'>+/* word 1: cipher flags */</div><div class='add'>+	u32 cipher_flags;</div><div class='add'>+</div><div class='add'>+/* word 2: Extended cipher flags */</div><div class='add'>+	u32 ecf;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct SPUHEADER {</div><div class='add'>+	struct MHEADER mh;</div><div class='add'>+	u32 emh;</div><div class='add'>+	struct SCTX sa;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _SPUM_H_ */</div><div class='head'>diff --git a/drivers/crypto/bcm/util.c b/drivers/crypto/bcm/util.c<br/>new file mode 100644<br/>index 000000000000..0502f460dacd<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bcm/util.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/util.c</a></div><div class='hunk'>@@ -0,0 +1,581 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Broadcom</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, version 2, as</div><div class='add'>+ * published by the Free Software Foundation (the "GPL").</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License version 2 (GPLv2) for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * version 2 (GPLv2) along with this source code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cipher.h"</div><div class='add'>+#include "util.h"</div><div class='add'>+</div><div class='add'>+/* offset of SPU_OFIFO_CTRL register */</div><div class='add'>+#define SPU_OFIFO_CTRL      0x40</div><div class='add'>+#define SPU_FIFO_WATERMARK  0x1FF</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_sg_at_offset() - Find the scatterlist entry at a given distance from the</div><div class='add'>+ * start of a scatterlist.</div><div class='add'>+ * @sg:         [in]  Start of a scatterlist</div><div class='add'>+ * @skip:       [in]  Distance from the start of the scatterlist, in bytes</div><div class='add'>+ * @sge:        [out] Scatterlist entry at skip bytes from start</div><div class='add'>+ * @sge_offset: [out] Number of bytes from start of sge buffer to get to</div><div class='add'>+ *                    requested distance.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if entry found at requested distance</div><div class='add'>+ *         &lt; 0 otherwise</div><div class='add'>+ */</div><div class='add'>+int spu_sg_at_offset(struct scatterlist *sg, unsigned int skip,</div><div class='add'>+		     struct scatterlist **sge, unsigned int *sge_offset)</div><div class='add'>+{</div><div class='add'>+	/* byte index from start of sg to the end of the previous entry */</div><div class='add'>+	unsigned int index = 0;</div><div class='add'>+	/* byte index from start of sg to the end of the current entry */</div><div class='add'>+	unsigned int next_index;</div><div class='add'>+</div><div class='add'>+	next_index = sg-&gt;length;</div><div class='add'>+	while (next_index &lt;= skip) {</div><div class='add'>+		sg = sg_next(sg);</div><div class='add'>+		index = next_index;</div><div class='add'>+		if (!sg)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		next_index += sg-&gt;length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*sge_offset = skip - index;</div><div class='add'>+	*sge = sg;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Copy len bytes of sg data, starting at offset skip, to a dest buffer */</div><div class='add'>+void sg_copy_part_to_buf(struct scatterlist *src, u8 *dest,</div><div class='add'>+			 unsigned int len, unsigned int skip)</div><div class='add'>+{</div><div class='add'>+	size_t copied;</div><div class='add'>+	unsigned int nents = sg_nents(src);</div><div class='add'>+</div><div class='add'>+	copied = sg_pcopy_to_buffer(src, nents, dest, len, skip);</div><div class='add'>+	if (copied != len) {</div><div class='add'>+		flow_log("%s copied %u bytes of %u requested. ",</div><div class='add'>+			 __func__, (u32)copied, len);</div><div class='add'>+		flow_log("sg with %u entries and skip %u\n", nents, skip);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy data into a scatterlist starting at a specified offset in the</div><div class='add'>+ * scatterlist. Specifically, copy len bytes of data in the buffer src</div><div class='add'>+ * into the scatterlist dest, starting skip bytes into the scatterlist.</div><div class='add'>+ */</div><div class='add'>+void sg_copy_part_from_buf(struct scatterlist *dest, u8 *src,</div><div class='add'>+			   unsigned int len, unsigned int skip)</div><div class='add'>+{</div><div class='add'>+	size_t copied;</div><div class='add'>+	unsigned int nents = sg_nents(dest);</div><div class='add'>+</div><div class='add'>+	copied = sg_pcopy_from_buffer(dest, nents, src, len, skip);</div><div class='add'>+	if (copied != len) {</div><div class='add'>+		flow_log("%s copied %u bytes of %u requested. ",</div><div class='add'>+			 __func__, (u32)copied, len);</div><div class='add'>+		flow_log("sg with %u entries and skip %u\n", nents, skip);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_sg_count() - Determine number of elements in scatterlist to provide a</div><div class='add'>+ * specified number of bytes.</div><div class='add'>+ * @sg_list:  scatterlist to examine</div><div class='add'>+ * @skip:     index of starting point</div><div class='add'>+ * @nbytes:   consider elements of scatterlist until reaching this number of</div><div class='add'>+ *	      bytes</div><div class='add'>+ *</div><div class='add'>+ * Return: the number of sg entries contributing to nbytes of data</div><div class='add'>+ */</div><div class='add'>+int spu_sg_count(struct scatterlist *sg_list, unsigned int skip, int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	int sg_nents = 0;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+</div><div class='add'>+	if (!sg_list)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (spu_sg_at_offset(sg_list, skip, &amp;sg, &amp;offset) &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	while (sg &amp;&amp; (nbytes &gt; 0)) {</div><div class='add'>+		sg_nents++;</div><div class='add'>+		nbytes -= (sg-&gt;length - offset);</div><div class='add'>+		offset = 0;</div><div class='add'>+		sg = sg_next(sg);</div><div class='add'>+	}</div><div class='add'>+	return sg_nents;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spu_msg_sg_add() - Copy scatterlist entries from one sg to another, up to a</div><div class='add'>+ * given length.</div><div class='add'>+ * @to_sg:       scatterlist to copy to</div><div class='add'>+ * @from_sg:     scatterlist to copy from</div><div class='add'>+ * @from_skip:   number of bytes to skip in from_sg. Non-zero when previous</div><div class='add'>+ *		 request included part of the buffer in entry in from_sg.</div><div class='add'>+ *		 Assumes from_skip &lt; from_sg-&gt;length.</div><div class='add'>+ * @from_nents   number of entries in from_sg</div><div class='add'>+ * @length       number of bytes to copy. may reach this limit before exhausting</div><div class='add'>+ *		 from_sg.</div><div class='add'>+ *</div><div class='add'>+ * Copies the entries themselves, not the data in the entries. Assumes to_sg has</div><div class='add'>+ * enough entries. Does not limit the size of an individual buffer in to_sg.</div><div class='add'>+ *</div><div class='add'>+ * to_sg, from_sg, skip are all updated to end of copy</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of bytes copied</div><div class='add'>+ */</div><div class='add'>+u32 spu_msg_sg_add(struct scatterlist **to_sg,</div><div class='add'>+		   struct scatterlist **from_sg, u32 *from_skip,</div><div class='add'>+		   u8 from_nents, u32 length)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg;	/* an entry in from_sg */</div><div class='add'>+	struct scatterlist *to = *to_sg;</div><div class='add'>+	struct scatterlist *from = *from_sg;</div><div class='add'>+	u32 skip = *from_skip;</div><div class='add'>+	u32 offset;</div><div class='add'>+	int i;</div><div class='add'>+	u32 entry_len = 0;</div><div class='add'>+	u32 frag_len = 0;	/* length of entry added to to_sg */</div><div class='add'>+	u32 copied = 0;		/* number of bytes copied so far */</div><div class='add'>+</div><div class='add'>+	if (length == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for_each_sg(from, sg, from_nents, i) {</div><div class='add'>+		/* number of bytes in this from entry not yet used */</div><div class='add'>+		entry_len = sg-&gt;length - skip;</div><div class='add'>+		frag_len = min(entry_len, length - copied);</div><div class='add'>+		offset = sg-&gt;offset + skip;</div><div class='add'>+		if (frag_len)</div><div class='add'>+			sg_set_page(to++, sg_page(sg), frag_len, offset);</div><div class='add'>+		copied += frag_len;</div><div class='add'>+		if (copied == entry_len) {</div><div class='add'>+			/* used up all of from entry */</div><div class='add'>+			skip = 0;	/* start at beginning of next entry */</div><div class='add'>+		}</div><div class='add'>+		if (copied == length)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	*to_sg = to;</div><div class='add'>+	*from_sg = sg;</div><div class='add'>+	if (frag_len &lt; entry_len)</div><div class='add'>+		*from_skip = skip + frag_len;</div><div class='add'>+	else</div><div class='add'>+		*from_skip = 0;</div><div class='add'>+</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void add_to_ctr(u8 *ctr_pos, unsigned int increment)</div><div class='add'>+{</div><div class='add'>+	__be64 *high_be = (__be64 *)ctr_pos;</div><div class='add'>+	__be64 *low_be = high_be + 1;</div><div class='add'>+	u64 orig_low = __be64_to_cpu(*low_be);</div><div class='add'>+	u64 new_low = orig_low + (u64)increment;</div><div class='add'>+</div><div class='add'>+	*low_be = __cpu_to_be64(new_low);</div><div class='add'>+	if (new_low &lt; orig_low)</div><div class='add'>+		/* there was a carry from the low 8 bytes */</div><div class='add'>+		*high_be = __cpu_to_be64(__be64_to_cpu(*high_be) + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sdesc {</div><div class='add'>+	struct shash_desc shash;</div><div class='add'>+	char ctx[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* do a synchronous decrypt operation */</div><div class='add'>+int do_decrypt(char *alg_name,</div><div class='add'>+	       void *key_ptr, unsigned int key_len,</div><div class='add'>+	       void *iv_ptr, void *src_ptr, void *dst_ptr,</div><div class='add'>+	       unsigned int block_len)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist sg_in[1], sg_out[1];</div><div class='add'>+	struct crypto_blkcipher *tfm =</div><div class='add'>+	    crypto_alloc_blkcipher(alg_name, 0, CRYPTO_ALG_ASYNC);</div><div class='add'>+	struct blkcipher_desc desc = {.tfm = tfm, .flags = 0 };</div><div class='add'>+	int ret = 0;</div><div class='add'>+	void *iv;</div><div class='add'>+	int ivsize;</div><div class='add'>+</div><div class='add'>+	flow_log("%s() name:%s block_len:%u\n", __func__, alg_name, block_len);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(tfm))</div><div class='add'>+		return PTR_ERR(tfm);</div><div class='add'>+</div><div class='add'>+	crypto_blkcipher_setkey((void *)tfm, key_ptr, key_len);</div><div class='add'>+</div><div class='add'>+	sg_init_table(sg_in, 1);</div><div class='add'>+	sg_set_buf(sg_in, src_ptr, block_len);</div><div class='add'>+</div><div class='add'>+	sg_init_table(sg_out, 1);</div><div class='add'>+	sg_set_buf(sg_out, dst_ptr, block_len);</div><div class='add'>+</div><div class='add'>+	iv = crypto_blkcipher_crt(tfm)-&gt;iv;</div><div class='add'>+	ivsize = crypto_blkcipher_ivsize(tfm);</div><div class='add'>+	memcpy(iv, iv_ptr, ivsize);</div><div class='add'>+</div><div class='add'>+	ret = crypto_blkcipher_decrypt(&amp;desc, sg_out, sg_in, block_len);</div><div class='add'>+	crypto_free_blkcipher(tfm);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		pr_err("aes_decrypt failed %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * do_shash() - Do a synchronous hash operation in software</div><div class='add'>+ * @name:       The name of the hash algorithm</div><div class='add'>+ * @result:     Buffer where digest is to be written</div><div class='add'>+ * @data1:      First part of data to hash. May be NULL.</div><div class='add'>+ * @data1_len:  Length of data1, in bytes</div><div class='add'>+ * @data2:      Second part of data to hash. May be NULL.</div><div class='add'>+ * @data2_len:  Length of data2, in bytes</div><div class='add'>+ * @key:	Key (if keyed hash)</div><div class='add'>+ * @key_len:	Length of key, in bytes (or 0 if non-keyed hash)</div><div class='add'>+ *</div><div class='add'>+ * Note that the crypto API will not select this driver's own transform because</div><div class='add'>+ * this driver only registers asynchronous algos.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if hash successfully stored in result</div><div class='add'>+ *         &lt; 0 otherwise</div><div class='add'>+ */</div><div class='add'>+int do_shash(unsigned char *name, unsigned char *result,</div><div class='add'>+	     const u8 *data1, unsigned int data1_len,</div><div class='add'>+	     const u8 *data2, unsigned int data2_len,</div><div class='add'>+	     const u8 *key, unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	struct crypto_shash *hash;</div><div class='add'>+	struct sdesc *sdesc;</div><div class='add'>+</div><div class='add'>+	hash = crypto_alloc_shash(name, 0, 0);</div><div class='add'>+	if (IS_ERR(hash)) {</div><div class='add'>+		rc = PTR_ERR(hash);</div><div class='add'>+		pr_err("%s: Crypto %s allocation error %d", __func__, name, rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size = sizeof(struct shash_desc) + crypto_shash_descsize(hash);</div><div class='add'>+	sdesc = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!sdesc) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		pr_err("%s: Memory allocation failure", __func__);</div><div class='add'>+		goto do_shash_err;</div><div class='add'>+	}</div><div class='add'>+	sdesc-&gt;shash.tfm = hash;</div><div class='add'>+	sdesc-&gt;shash.flags = 0x0;</div><div class='add'>+</div><div class='add'>+	if (key_len &gt; 0) {</div><div class='add'>+		rc = crypto_shash_setkey(hash, key, key_len);</div><div class='add'>+		if (rc) {</div><div class='add'>+			pr_err("%s: Could not setkey %s shash", __func__, name);</div><div class='add'>+			goto do_shash_err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = crypto_shash_init(&amp;sdesc-&gt;shash);</div><div class='add'>+	if (rc) {</div><div class='add'>+		pr_err("%s: Could not init %s shash", __func__, name);</div><div class='add'>+		goto do_shash_err;</div><div class='add'>+	}</div><div class='add'>+	rc = crypto_shash_update(&amp;sdesc-&gt;shash, data1, data1_len);</div><div class='add'>+	if (rc) {</div><div class='add'>+		pr_err("%s: Could not update1", __func__);</div><div class='add'>+		goto do_shash_err;</div><div class='add'>+	}</div><div class='add'>+	if (data2 &amp;&amp; data2_len) {</div><div class='add'>+		rc = crypto_shash_update(&amp;sdesc-&gt;shash, data2, data2_len);</div><div class='add'>+		if (rc) {</div><div class='add'>+			pr_err("%s: Could not update2", __func__);</div><div class='add'>+			goto do_shash_err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rc = crypto_shash_final(&amp;sdesc-&gt;shash, result);</div><div class='add'>+	if (rc)</div><div class='add'>+		pr_err("%s: Could not genereate %s hash", __func__, name);</div><div class='add'>+</div><div class='add'>+do_shash_err:</div><div class='add'>+	crypto_free_shash(hash);</div><div class='add'>+	kfree(sdesc);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Dump len bytes of a scatterlist starting at skip bytes into the sg */</div><div class='add'>+void __dump_sg(struct scatterlist *sg, unsigned int skip, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	u8 dbuf[16];</div><div class='add'>+	unsigned int idx = skip;</div><div class='add'>+	unsigned int num_out = 0;	/* number of bytes dumped so far */</div><div class='add'>+	unsigned int count;</div><div class='add'>+</div><div class='add'>+	if (packet_debug_logging) {</div><div class='add'>+		while (num_out &lt; len) {</div><div class='add'>+			count = (len - num_out &gt; 16) ? 16 : len - num_out;</div><div class='add'>+			sg_copy_part_to_buf(sg, dbuf, count, idx);</div><div class='add'>+			num_out += count;</div><div class='add'>+			print_hex_dump(KERN_ALERT, "  sg: ", DUMP_PREFIX_NONE,</div><div class='add'>+				       4, 1, dbuf, count, false);</div><div class='add'>+			idx += 16;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (debug_logging_sleep)</div><div class='add'>+		msleep(debug_logging_sleep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns the name for a given cipher alg/mode */</div><div class='add'>+char *spu_alg_name(enum spu_cipher_alg alg, enum spu_cipher_mode mode)</div><div class='add'>+{</div><div class='add'>+	switch (alg) {</div><div class='add'>+	case CIPHER_ALG_RC4:</div><div class='add'>+		return "rc4";</div><div class='add'>+	case CIPHER_ALG_AES:</div><div class='add'>+		switch (mode) {</div><div class='add'>+		case CIPHER_MODE_CBC:</div><div class='add'>+			return "cbc(aes)";</div><div class='add'>+		case CIPHER_MODE_ECB:</div><div class='add'>+			return "ecb(aes)";</div><div class='add'>+		case CIPHER_MODE_OFB:</div><div class='add'>+			return "ofb(aes)";</div><div class='add'>+		case CIPHER_MODE_CFB:</div><div class='add'>+			return "cfb(aes)";</div><div class='add'>+		case CIPHER_MODE_CTR:</div><div class='add'>+			return "ctr(aes)";</div><div class='add'>+		case CIPHER_MODE_XTS:</div><div class='add'>+			return "xts(aes)";</div><div class='add'>+		case CIPHER_MODE_GCM:</div><div class='add'>+			return "gcm(aes)";</div><div class='add'>+		default:</div><div class='add'>+			return "aes";</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_DES:</div><div class='add'>+		switch (mode) {</div><div class='add'>+		case CIPHER_MODE_CBC:</div><div class='add'>+			return "cbc(des)";</div><div class='add'>+		case CIPHER_MODE_ECB:</div><div class='add'>+			return "ecb(des)";</div><div class='add'>+		case CIPHER_MODE_CTR:</div><div class='add'>+			return "ctr(des)";</div><div class='add'>+		default:</div><div class='add'>+			return "des";</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CIPHER_ALG_3DES:</div><div class='add'>+		switch (mode) {</div><div class='add'>+		case CIPHER_MODE_CBC:</div><div class='add'>+			return "cbc(des3_ede)";</div><div class='add'>+		case CIPHER_MODE_ECB:</div><div class='add'>+			return "ecb(des3_ede)";</div><div class='add'>+		case CIPHER_MODE_CTR:</div><div class='add'>+			return "ctr(des3_ede)";</div><div class='add'>+		default:</div><div class='add'>+			return "3des";</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return "other";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t spu_debugfs_read(struct file *filp, char __user *ubuf,</div><div class='add'>+				size_t count, loff_t *offp)</div><div class='add'>+{</div><div class='add'>+	struct device_private *ipriv;</div><div class='add'>+	char *buf;</div><div class='add'>+	ssize_t ret, out_offset, out_count;</div><div class='add'>+	int i;</div><div class='add'>+	u32 fifo_len;</div><div class='add'>+	u32 spu_ofifo_ctrl;</div><div class='add'>+	u32 alg;</div><div class='add'>+	u32 mode;</div><div class='add'>+	u32 op_cnt;</div><div class='add'>+</div><div class='add'>+	out_count = 2048;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(out_count, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ipriv = filp-&gt;private_data;</div><div class='add'>+	out_offset = 0;</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "Number of SPUs.........%u\n",</div><div class='add'>+			       ipriv-&gt;spu.num_spu);</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "Current sessions.......%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;session_count));</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "Session count..........%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;stream_count));</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "Cipher setkey..........%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;setkey_cnt[SPU_OP_CIPHER]));</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "Cipher Ops.............%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;op_counts[SPU_OP_CIPHER]));</div><div class='add'>+	for (alg = 0; alg &lt; CIPHER_ALG_LAST; alg++) {</div><div class='add'>+		for (mode = 0; mode &lt; CIPHER_MODE_LAST; mode++) {</div><div class='add'>+			op_cnt = atomic_read(&amp;ipriv-&gt;cipher_cnt[alg][mode]);</div><div class='add'>+			if (op_cnt) {</div><div class='add'>+				out_offset += snprintf(buf + out_offset,</div><div class='add'>+						       out_count - out_offset,</div><div class='add'>+			       "  %-13s%11u\n",</div><div class='add'>+			       spu_alg_name(alg, mode), op_cnt);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "Hash Ops...............%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;op_counts[SPU_OP_HASH]));</div><div class='add'>+	for (alg = 0; alg &lt; HASH_ALG_LAST; alg++) {</div><div class='add'>+		op_cnt = atomic_read(&amp;ipriv-&gt;hash_cnt[alg]);</div><div class='add'>+		if (op_cnt) {</div><div class='add'>+			out_offset += snprintf(buf + out_offset,</div><div class='add'>+					       out_count - out_offset,</div><div class='add'>+		       "  %-13s%11u\n",</div><div class='add'>+		       hash_alg_name[alg], op_cnt);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "HMAC setkey............%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;setkey_cnt[SPU_OP_HMAC]));</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "HMAC Ops...............%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;op_counts[SPU_OP_HMAC]));</div><div class='add'>+	for (alg = 0; alg &lt; HASH_ALG_LAST; alg++) {</div><div class='add'>+		op_cnt = atomic_read(&amp;ipriv-&gt;hmac_cnt[alg]);</div><div class='add'>+		if (op_cnt) {</div><div class='add'>+			out_offset += snprintf(buf + out_offset,</div><div class='add'>+					       out_count - out_offset,</div><div class='add'>+		       "  %-13s%11u\n",</div><div class='add'>+		       hash_alg_name[alg], op_cnt);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "AEAD setkey............%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;setkey_cnt[SPU_OP_AEAD]));</div><div class='add'>+</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "AEAD Ops...............%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;op_counts[SPU_OP_AEAD]));</div><div class='add'>+	for (alg = 0; alg &lt; AEAD_TYPE_LAST; alg++) {</div><div class='add'>+		op_cnt = atomic_read(&amp;ipriv-&gt;aead_cnt[alg]);</div><div class='add'>+		if (op_cnt) {</div><div class='add'>+			out_offset += snprintf(buf + out_offset,</div><div class='add'>+					       out_count - out_offset,</div><div class='add'>+		       "  %-13s%11u\n",</div><div class='add'>+		       aead_alg_name[alg], op_cnt);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "Bytes of req data......%llu\n",</div><div class='add'>+			       (u64)atomic64_read(&amp;ipriv-&gt;bytes_out));</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "Bytes of resp data.....%llu\n",</div><div class='add'>+			       (u64)atomic64_read(&amp;ipriv-&gt;bytes_in));</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "Mailbox full...........%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;mb_no_spc));</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "Mailbox send failures..%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;mb_send_fail));</div><div class='add'>+	out_offset += snprintf(buf + out_offset, out_count - out_offset,</div><div class='add'>+			       "Check ICV errors.......%u\n",</div><div class='add'>+			       atomic_read(&amp;ipriv-&gt;bad_icv));</div><div class='add'>+	if (ipriv-&gt;spu.spu_type == SPU_TYPE_SPUM)</div><div class='add'>+		for (i = 0; i &lt; ipriv-&gt;spu.num_spu; i++) {</div><div class='add'>+			spu_ofifo_ctrl = ioread32(ipriv-&gt;spu.reg_vbase[i] +</div><div class='add'>+						  SPU_OFIFO_CTRL);</div><div class='add'>+			fifo_len = spu_ofifo_ctrl &amp; SPU_FIFO_WATERMARK;</div><div class='add'>+			out_offset += snprintf(buf + out_offset,</div><div class='add'>+					       out_count - out_offset,</div><div class='add'>+				       "SPU %d output FIFO high water.....%u\n",</div><div class='add'>+				       i, fifo_len);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	if (out_offset &gt; out_count)</div><div class='add'>+		out_offset = out_count;</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(ubuf, count, offp, buf, out_offset);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations spu_debugfs_stats = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.read = spu_debugfs_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create the debug FS directories. If the top-level directory has not yet</div><div class='add'>+ * been created, create it now. Create a stats file in this directory for</div><div class='add'>+ * a SPU.</div><div class='add'>+ */</div><div class='add'>+void spu_setup_debugfs(void)</div><div class='add'>+{</div><div class='add'>+	if (!debugfs_initialized())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!iproc_priv.debugfs_dir)</div><div class='add'>+		iproc_priv.debugfs_dir = debugfs_create_dir(KBUILD_MODNAME,</div><div class='add'>+							    NULL);</div><div class='add'>+</div><div class='add'>+	if (!iproc_priv.debugfs_stats)</div><div class='add'>+		/* Create file with permissions S_IRUSR */</div><div class='add'>+		debugfs_create_file("stats", 0400, iproc_priv.debugfs_dir,</div><div class='add'>+				    &amp;iproc_priv, &amp;spu_debugfs_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void spu_free_debugfs(void)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(iproc_priv.debugfs_dir);</div><div class='add'>+	iproc_priv.debugfs_dir = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * format_value_ccm() - Format a value into a buffer, using a specified number</div><div class='add'>+ *			of bytes (i.e. maybe writing value X into a 4 byte</div><div class='add'>+ *			buffer, or maybe into a 12 byte buffer), as per the</div><div class='add'>+ *			SPU CCM spec.</div><div class='add'>+ *</div><div class='add'>+ * @val:		value to write (up to max of unsigned int)</div><div class='add'>+ * @buf:		(pointer to) buffer to write the value</div><div class='add'>+ * @len:		number of bytes to use (0 to 255)</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void format_value_ccm(unsigned int val, u8 *buf, u8 len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* First clear full output buffer */</div><div class='add'>+	memset(buf, 0, len);</div><div class='add'>+</div><div class='add'>+	/* Then, starting from right side, fill in with data */</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		buf[len - i - 1] = (val &gt;&gt; (8 * i)) &amp; 0xff;</div><div class='add'>+		if (i &gt;= 3)</div><div class='add'>+			break;  /* Only handle up to 32 bits of 'val' */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/crypto/bcm/util.h b/drivers/crypto/bcm/util.h<br/>new file mode 100644<br/>index 000000000000..712e029795f8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bcm/util.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bcm/util.h</a></div><div class='hunk'>@@ -0,0 +1,116 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2016 Broadcom</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, version 2, as</div><div class='add'>+ * published by the Free Software Foundation (the "GPL").</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License version 2 (GPLv2) for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * version 2 (GPLv2) along with this source code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _UTIL_H</div><div class='add'>+#define _UTIL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include "spu.h"</div><div class='add'>+</div><div class='add'>+extern int flow_debug_logging;</div><div class='add'>+extern int packet_debug_logging;</div><div class='add'>+extern int debug_logging_sleep;</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#define flow_log(...)	                \</div><div class='add'>+	do {	                              \</div><div class='add'>+		if (flow_debug_logging) {	        \</div><div class='add'>+			printk(__VA_ARGS__);	          \</div><div class='add'>+			if (debug_logging_sleep)	      \</div><div class='add'>+				msleep(debug_logging_sleep);	\</div><div class='add'>+		}	                                \</div><div class='add'>+	} while (0)</div><div class='add'>+#define flow_dump(msg, var, var_len)	   \</div><div class='add'>+	do {	                                 \</div><div class='add'>+		if (flow_debug_logging) {	           \</div><div class='add'>+			print_hex_dump(KERN_ALERT, msg, DUMP_PREFIX_NONE,  \</div><div class='add'>+					16, 1, var, var_len, false); \</div><div class='add'>+				if (debug_logging_sleep)	       \</div><div class='add'>+					msleep(debug_logging_sleep);   \</div><div class='add'>+		}                                    \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define packet_log(...)               \</div><div class='add'>+	do {                                \</div><div class='add'>+		if (packet_debug_logging) {       \</div><div class='add'>+			printk(__VA_ARGS__);            \</div><div class='add'>+			if (debug_logging_sleep)        \</div><div class='add'>+				msleep(debug_logging_sleep);  \</div><div class='add'>+		}                                 \</div><div class='add'>+	} while (0)</div><div class='add'>+#define packet_dump(msg, var, var_len)   \</div><div class='add'>+	do {                                   \</div><div class='add'>+		if (packet_debug_logging) {          \</div><div class='add'>+			print_hex_dump(KERN_ALERT, msg, DUMP_PREFIX_NONE,  \</div><div class='add'>+					16, 1, var, var_len, false); \</div><div class='add'>+			if (debug_logging_sleep)           \</div><div class='add'>+				msleep(debug_logging_sleep);     \</div><div class='add'>+		}                                    \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+void __dump_sg(struct scatterlist *sg, unsigned int skip, unsigned int len);</div><div class='add'>+</div><div class='add'>+#define dump_sg(sg, skip, len)     __dump_sg(sg, skip, len)</div><div class='add'>+</div><div class='add'>+#else /* !DEBUG_ON */</div><div class='add'>+</div><div class='add'>+#define flow_log(...) do {} while (0)</div><div class='add'>+#define flow_dump(msg, var, var_len) do {} while (0)</div><div class='add'>+#define packet_log(...) do {} while (0)</div><div class='add'>+#define packet_dump(msg, var, var_len) do {} while (0)</div><div class='add'>+</div><div class='add'>+#define dump_sg(sg, skip, len) do {} while (0)</div><div class='add'>+</div><div class='add'>+#endif /* DEBUG_ON */</div><div class='add'>+</div><div class='add'>+int spu_sg_at_offset(struct scatterlist *sg, unsigned int skip,</div><div class='add'>+		     struct scatterlist **sge, unsigned int *sge_offset);</div><div class='add'>+</div><div class='add'>+/* Copy sg data, from skip, length len, to dest */</div><div class='add'>+void sg_copy_part_to_buf(struct scatterlist *src, u8 *dest,</div><div class='add'>+			 unsigned int len, unsigned int skip);</div><div class='add'>+/* Copy src into scatterlist from offset, length len */</div><div class='add'>+void sg_copy_part_from_buf(struct scatterlist *dest, u8 *src,</div><div class='add'>+			   unsigned int len, unsigned int skip);</div><div class='add'>+</div><div class='add'>+int spu_sg_count(struct scatterlist *sg_list, unsigned int skip, int nbytes);</div><div class='add'>+u32 spu_msg_sg_add(struct scatterlist **to_sg,</div><div class='add'>+		   struct scatterlist **from_sg, u32 *skip,</div><div class='add'>+		   u8 from_nents, u32 tot_len);</div><div class='add'>+</div><div class='add'>+void add_to_ctr(u8 *ctr_pos, unsigned int increment);</div><div class='add'>+</div><div class='add'>+/* do a synchronous decrypt operation */</div><div class='add'>+int do_decrypt(char *alg_name,</div><div class='add'>+	       void *key_ptr, unsigned int key_len,</div><div class='add'>+	       void *iv_ptr, void *src_ptr, void *dst_ptr,</div><div class='add'>+	       unsigned int block_len);</div><div class='add'>+</div><div class='add'>+/* produce a message digest from data of length n bytes */</div><div class='add'>+int do_shash(unsigned char *name, unsigned char *result,</div><div class='add'>+	     const u8 *data1, unsigned int data1_len,</div><div class='add'>+	     const u8 *data2, unsigned int data2_len,</div><div class='add'>+	     const u8 *key, unsigned int key_len);</div><div class='add'>+</div><div class='add'>+char *spu_alg_name(enum spu_cipher_alg alg, enum spu_cipher_mode mode);</div><div class='add'>+</div><div class='add'>+void spu_setup_debugfs(void);</div><div class='add'>+void spu_free_debugfs(void);</div><div class='add'>+void format_value_ccm(unsigned int val, u8 *buf, u8 len);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/crypto/bfin_crc.c b/drivers/crypto/bfin_crc.c<br/>index 10db7df366c8..a118b9bed669 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/bfin_crc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/bfin_crc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bfin_crc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bfin_crc.c</a></div><div class='hunk'>@@ -203,7 +203,7 @@ static void bfin_crypto_crc_config_dma(struct bfin_crypto_crc *crc)</div><div class='ctx'> 			crc-&gt;sg_cpu[i].x_count = 1;</div><div class='ctx'> 			crc-&gt;sg_cpu[i].x_modify = CHKSUM_DIGEST_SIZE;</div><div class='ctx'> 			dev_dbg(crc-&gt;dev, "%d: crc_dma: start_addr:0x%lx, "</div><div class='del'>-				"cfg:0x%lx, x_count:0x%lx, x_modify:0x%lx\n",</div><div class='add'>+				"cfg:0x%x, x_count:0x%x, x_modify:0x%x\n",</div><div class='ctx'> 				i, crc-&gt;sg_cpu[i].start_addr,</div><div class='ctx'> 				crc-&gt;sg_cpu[i].cfg, crc-&gt;sg_cpu[i].x_count,</div><div class='ctx'> 				crc-&gt;sg_cpu[i].x_modify);</div><div class='hunk'>@@ -233,7 +233,7 @@ static void bfin_crypto_crc_config_dma(struct bfin_crypto_crc *crc)</div><div class='ctx'> 		crc-&gt;sg_cpu[i].x_count = dma_count;</div><div class='ctx'> 		crc-&gt;sg_cpu[i].x_modify = dma_mod;</div><div class='ctx'> 		dev_dbg(crc-&gt;dev, "%d: crc_dma: start_addr:0x%lx, "</div><div class='del'>-			"cfg:0x%lx, x_count:0x%lx, x_modify:0x%lx\n",</div><div class='add'>+			"cfg:0x%x, x_count:0x%x, x_modify:0x%x\n",</div><div class='ctx'> 			i, crc-&gt;sg_cpu[i].start_addr,</div><div class='ctx'> 			crc-&gt;sg_cpu[i].cfg, crc-&gt;sg_cpu[i].x_count,</div><div class='ctx'> 			crc-&gt;sg_cpu[i].x_modify);</div><div class='hunk'>@@ -257,7 +257,7 @@ static void bfin_crypto_crc_config_dma(struct bfin_crypto_crc *crc)</div><div class='ctx'> 		crc-&gt;sg_cpu[i].x_count = 1;</div><div class='ctx'> 		crc-&gt;sg_cpu[i].x_modify = CHKSUM_DIGEST_SIZE;</div><div class='ctx'> 		dev_dbg(crc-&gt;dev, "%d: crc_dma: start_addr:0x%lx, "</div><div class='del'>-			"cfg:0x%lx, x_count:0x%lx, x_modify:0x%lx\n",</div><div class='add'>+			"cfg:0x%x, x_count:0x%x, x_modify:0x%x\n",</div><div class='ctx'> 			i, crc-&gt;sg_cpu[i].start_addr,</div><div class='ctx'> 			crc-&gt;sg_cpu[i].cfg, crc-&gt;sg_cpu[i].x_count,</div><div class='ctx'> 			crc-&gt;sg_cpu[i].x_modify);</div><div class='head'>diff --git a/drivers/crypto/bfin_crc.h b/drivers/crypto/bfin_crc.h<br/>index 75cef4dc85a1..786ef746d109 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/bfin_crc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/bfin_crc.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/bfin_crc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/bfin_crc.h</a></div><div class='hunk'>@@ -55,7 +55,6 @@ struct crc_info {</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct crc_register {</div><div class='ctx'> 	u32 control;</div><div class='head'>diff --git a/drivers/crypto/caam/Kconfig b/drivers/crypto/caam/Kconfig<br/>index 64bf3024b680..bc0d3569f8d9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/Kconfig</a></div><div class='hunk'>@@ -74,7 +74,7 @@ config CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_DEV_FSL_CAAM_CRYPTO_API</div><div class='ctx'> 	tristate "Register algorithm implementations with the Crypto API"</div><div class='del'>-	depends on CRYPTO_DEV_FSL_CAAM &amp;&amp; CRYPTO_DEV_FSL_CAAM_JR</div><div class='add'>+	depends on CRYPTO_DEV_FSL_CAAM_JR</div><div class='ctx'> 	default y</div><div class='ctx'> 	select CRYPTO_AEAD</div><div class='ctx'> 	select CRYPTO_AUTHENC</div><div class='hunk'>@@ -89,7 +89,7 @@ config CRYPTO_DEV_FSL_CAAM_CRYPTO_API</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_DEV_FSL_CAAM_AHASH_API</div><div class='ctx'> 	tristate "Register hash algorithm implementations with Crypto API"</div><div class='del'>-	depends on CRYPTO_DEV_FSL_CAAM &amp;&amp; CRYPTO_DEV_FSL_CAAM_JR</div><div class='add'>+	depends on CRYPTO_DEV_FSL_CAAM_JR</div><div class='ctx'> 	default y</div><div class='ctx'> 	select CRYPTO_HASH</div><div class='ctx'> 	help</div><div class='hunk'>@@ -101,7 +101,7 @@ config CRYPTO_DEV_FSL_CAAM_AHASH_API</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_DEV_FSL_CAAM_PKC_API</div><div class='ctx'>         tristate "Register public key cryptography implementations with Crypto API"</div><div class='del'>-        depends on CRYPTO_DEV_FSL_CAAM &amp;&amp; CRYPTO_DEV_FSL_CAAM_JR</div><div class='add'>+        depends on CRYPTO_DEV_FSL_CAAM_JR</div><div class='ctx'>         default y</div><div class='ctx'>         select CRYPTO_RSA</div><div class='ctx'>         help</div><div class='hunk'>@@ -113,7 +113,7 @@ config CRYPTO_DEV_FSL_CAAM_PKC_API</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_DEV_FSL_CAAM_RNG_API</div><div class='ctx'> 	tristate "Register caam device for hwrng API"</div><div class='del'>-	depends on CRYPTO_DEV_FSL_CAAM &amp;&amp; CRYPTO_DEV_FSL_CAAM_JR</div><div class='add'>+	depends on CRYPTO_DEV_FSL_CAAM_JR</div><div class='ctx'> 	default y</div><div class='ctx'> 	select CRYPTO_RNG</div><div class='ctx'> 	select HW_RANDOM</div><div class='hunk'>@@ -134,3 +134,6 @@ config CRYPTO_DEV_FSL_CAAM_DEBUG</div><div class='ctx'> 	help</div><div class='ctx'> 	  Selecting this will enable printing of various debug</div><div class='ctx'> 	  information in the CAAM driver.</div><div class='add'>+</div><div class='add'>+config CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC</div><div class='add'>+	def_tristate CRYPTO_DEV_FSL_CAAM_CRYPTO_API</div><div class='head'>diff --git a/drivers/crypto/caam/Makefile b/drivers/crypto/caam/Makefile<br/>index 08bf5515ae8a..6554742f357e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/Makefile?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/Makefile</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/Makefile</a></div><div class='hunk'>@@ -8,6 +8,7 @@ endif</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM) += caam.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_JR) += caam_jr.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API) += caamalg.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC) += caamalg_desc.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API) += caamhash.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API) += caamrng.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API) += caam_pkc.o</div><div class='head'>diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c<br/>index 954a64c7757b..9bc80eb06934 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/caamalg.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/caamalg.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/caamalg.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caamalg.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * caam - Freescale FSL CAAM support for crypto API</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2008-2011 Freescale Semiconductor, Inc.</div><div class='add'>+ * Copyright 2016 NXP</div><div class='ctx'>  *</div><div class='ctx'>  * Based on talitos crypto API driver.</div><div class='ctx'>  *</div><div class='hunk'>@@ -53,6 +54,7 @@</div><div class='ctx'> #include "error.h"</div><div class='ctx'> #include "sg_sw_sec4.h"</div><div class='ctx'> #include "key_gen.h"</div><div class='add'>+#include "caamalg_desc.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * crypto alg</div><div class='hunk'>@@ -62,8 +64,6 @@</div><div class='ctx'> #define CAAM_MAX_KEY_SIZE		(AES_MAX_KEY_SIZE + \</div><div class='ctx'> 					 CTR_RFC3686_NONCE_SIZE + \</div><div class='ctx'> 					 SHA512_DIGEST_SIZE * 2)</div><div class='del'>-/* max IV is max of AES_BLOCK_SIZE, DES3_EDE_BLOCK_SIZE */</div><div class='del'>-#define CAAM_MAX_IV_LENGTH		16</div><div class='ctx'> </div><div class='ctx'> #define AEAD_DESC_JOB_IO_LEN		(DESC_JOB_IO_LEN + CAAM_CMD_SZ * 2)</div><div class='ctx'> #define GCM_DESC_JOB_IO_LEN		(AEAD_DESC_JOB_IO_LEN + \</div><div class='hunk'>@@ -71,37 +71,6 @@</div><div class='ctx'> #define AUTHENC_DESC_JOB_IO_LEN		(AEAD_DESC_JOB_IO_LEN + \</div><div class='ctx'> 					 CAAM_CMD_SZ * 5)</div><div class='ctx'> </div><div class='del'>-/* length of descriptors text */</div><div class='del'>-#define DESC_AEAD_BASE			(4 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_AEAD_ENC_LEN		(DESC_AEAD_BASE + 11 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_AEAD_DEC_LEN		(DESC_AEAD_BASE + 15 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_AEAD_GIVENC_LEN		(DESC_AEAD_ENC_LEN + 9 * CAAM_CMD_SZ)</div><div class='del'>-</div><div class='del'>-/* Note: Nonce is counted in enckeylen */</div><div class='del'>-#define DESC_AEAD_CTR_RFC3686_LEN	(4 * CAAM_CMD_SZ)</div><div class='del'>-</div><div class='del'>-#define DESC_AEAD_NULL_BASE		(3 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_AEAD_NULL_ENC_LEN		(DESC_AEAD_NULL_BASE + 11 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_AEAD_NULL_DEC_LEN		(DESC_AEAD_NULL_BASE + 13 * CAAM_CMD_SZ)</div><div class='del'>-</div><div class='del'>-#define DESC_GCM_BASE			(3 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_GCM_ENC_LEN		(DESC_GCM_BASE + 16 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_GCM_DEC_LEN		(DESC_GCM_BASE + 12 * CAAM_CMD_SZ)</div><div class='del'>-</div><div class='del'>-#define DESC_RFC4106_BASE		(3 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_RFC4106_ENC_LEN		(DESC_RFC4106_BASE + 13 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_RFC4106_DEC_LEN		(DESC_RFC4106_BASE + 13 * CAAM_CMD_SZ)</div><div class='del'>-</div><div class='del'>-#define DESC_RFC4543_BASE		(3 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_RFC4543_ENC_LEN		(DESC_RFC4543_BASE + 11 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_RFC4543_DEC_LEN		(DESC_RFC4543_BASE + 12 * CAAM_CMD_SZ)</div><div class='del'>-</div><div class='del'>-#define DESC_ABLKCIPHER_BASE		(3 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_ABLKCIPHER_ENC_LEN		(DESC_ABLKCIPHER_BASE + \</div><div class='del'>-					 20 * CAAM_CMD_SZ)</div><div class='del'>-#define DESC_ABLKCIPHER_DEC_LEN		(DESC_ABLKCIPHER_BASE + \</div><div class='del'>-					 15 * CAAM_CMD_SZ)</div><div class='del'>-</div><div class='ctx'> #define DESC_MAX_USED_BYTES		(CAAM_DESC_BYTES_MAX - DESC_JOB_IO_LEN)</div><div class='ctx'> #define DESC_MAX_USED_LEN		(DESC_MAX_USED_BYTES / CAAM_CMD_SZ)</div><div class='ctx'> </div><div class='hunk'>@@ -117,8 +86,7 @@</div><div class='ctx'> </div><div class='ctx'> static void dbg_dump_sg(const char *level, const char *prefix_str,</div><div class='ctx'> 			int prefix_type, int rowsize, int groupsize,</div><div class='del'>-			struct scatterlist *sg, size_t tlen, bool ascii,</div><div class='del'>-			bool may_sleep)</div><div class='add'>+			struct scatterlist *sg, size_t tlen, bool ascii)</div><div class='ctx'> {</div><div class='ctx'> 	struct scatterlist *it;</div><div class='ctx'> 	void *it_page;</div><div class='hunk'>@@ -152,7 +120,6 @@ static struct list_head alg_list;</div><div class='ctx'> struct caam_alg_entry {</div><div class='ctx'> 	int class1_alg_type;</div><div class='ctx'> 	int class2_alg_type;</div><div class='del'>-	int alg_op;</div><div class='ctx'> 	bool rfc3686;</div><div class='ctx'> 	bool geniv;</div><div class='ctx'> };</div><div class='hunk'>@@ -163,302 +130,67 @@ struct caam_aead_alg {</div><div class='ctx'> 	bool registered;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Set DK bit in class 1 operation if shared */</div><div class='del'>-static inline void append_dec_op1(u32 *desc, u32 type)</div><div class='del'>-{</div><div class='del'>-	u32 *jump_cmd, *uncond_jump_cmd;</div><div class='del'>-</div><div class='del'>-	/* DK bit is valid only for AES */</div><div class='del'>-	if ((type &amp; OP_ALG_ALGSEL_MASK) != OP_ALG_ALGSEL_AES) {</div><div class='del'>-		append_operation(desc, type | OP_ALG_AS_INITFINAL |</div><div class='del'>-				 OP_ALG_DECRYPT);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	jump_cmd = append_jump(desc, JUMP_TEST_ALL | JUMP_COND_SHRD);</div><div class='del'>-	append_operation(desc, type | OP_ALG_AS_INITFINAL |</div><div class='del'>-			 OP_ALG_DECRYPT);</div><div class='del'>-	uncond_jump_cmd = append_jump(desc, JUMP_TEST_ALL);</div><div class='del'>-	set_jump_tgt_here(desc, jump_cmd);</div><div class='del'>-	append_operation(desc, type | OP_ALG_AS_INITFINAL |</div><div class='del'>-			 OP_ALG_DECRYPT | OP_ALG_AAI_DK);</div><div class='del'>-	set_jump_tgt_here(desc, uncond_jump_cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For aead functions, read payload and write payload,</div><div class='del'>- * both of which are specified in req-&gt;src and req-&gt;dst</div><div class='del'>- */</div><div class='del'>-static inline void aead_append_src_dst(u32 *desc, u32 msg_type)</div><div class='del'>-{</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | KEY_VLF);</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_BOTH |</div><div class='del'>-			     KEY_VLF | msg_type | FIFOLD_TYPE_LASTBOTH);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For ablkcipher encrypt and decrypt, read from req-&gt;src and</div><div class='del'>- * write to req-&gt;dst</div><div class='del'>- */</div><div class='del'>-static inline void ablkcipher_append_src_dst(u32 *desc)</div><div class='del'>-{</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 |</div><div class='del'>-			     KEY_VLF | FIFOLD_TYPE_MSG | FIFOLD_TYPE_LAST1);</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | KEY_VLF);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * per-session context</div><div class='ctx'>  */</div><div class='ctx'> struct caam_ctx {</div><div class='del'>-	struct device *jrdev;</div><div class='ctx'> 	u32 sh_desc_enc[DESC_MAX_USED_LEN];</div><div class='ctx'> 	u32 sh_desc_dec[DESC_MAX_USED_LEN];</div><div class='ctx'> 	u32 sh_desc_givenc[DESC_MAX_USED_LEN];</div><div class='add'>+	u8 key[CAAM_MAX_KEY_SIZE];</div><div class='ctx'> 	dma_addr_t sh_desc_enc_dma;</div><div class='ctx'> 	dma_addr_t sh_desc_dec_dma;</div><div class='ctx'> 	dma_addr_t sh_desc_givenc_dma;</div><div class='del'>-	u32 class1_alg_type;</div><div class='del'>-	u32 class2_alg_type;</div><div class='del'>-	u32 alg_op;</div><div class='del'>-	u8 key[CAAM_MAX_KEY_SIZE];</div><div class='ctx'> 	dma_addr_t key_dma;</div><div class='del'>-	unsigned int enckeylen;</div><div class='del'>-	unsigned int split_key_len;</div><div class='del'>-	unsigned int split_key_pad_len;</div><div class='add'>+	struct device *jrdev;</div><div class='add'>+	struct alginfo adata;</div><div class='add'>+	struct alginfo cdata;</div><div class='ctx'> 	unsigned int authsize;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void append_key_aead(u32 *desc, struct caam_ctx *ctx,</div><div class='del'>-			    int keys_fit_inline, bool is_rfc3686)</div><div class='del'>-{</div><div class='del'>-	u32 *nonce;</div><div class='del'>-	unsigned int enckeylen = ctx-&gt;enckeylen;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * RFC3686 specific:</div><div class='del'>-	 *	| ctx-&gt;key = {AUTH_KEY, ENC_KEY, NONCE}</div><div class='del'>-	 *	| enckeylen = encryption key size + nonce size</div><div class='del'>-	 */</div><div class='del'>-	if (is_rfc3686)</div><div class='del'>-		enckeylen -= CTR_RFC3686_NONCE_SIZE;</div><div class='del'>-</div><div class='del'>-	if (keys_fit_inline) {</div><div class='del'>-		append_key_as_imm(desc, ctx-&gt;key, ctx-&gt;split_key_pad_len,</div><div class='del'>-				  ctx-&gt;split_key_len, CLASS_2 |</div><div class='del'>-				  KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='del'>-		append_key_as_imm(desc, (void *)ctx-&gt;key +</div><div class='del'>-				  ctx-&gt;split_key_pad_len, enckeylen,</div><div class='del'>-				  enckeylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	} else {</div><div class='del'>-		append_key(desc, ctx-&gt;key_dma, ctx-&gt;split_key_len, CLASS_2 |</div><div class='del'>-			   KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='del'>-		append_key(desc, ctx-&gt;key_dma + ctx-&gt;split_key_pad_len,</div><div class='del'>-			   enckeylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Load Counter into CONTEXT1 reg */</div><div class='del'>-	if (is_rfc3686) {</div><div class='del'>-		nonce = (u32 *)((void *)ctx-&gt;key + ctx-&gt;split_key_pad_len +</div><div class='del'>-			       enckeylen);</div><div class='del'>-		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,</div><div class='del'>-				   LDST_CLASS_IND_CCB |</div><div class='del'>-				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);</div><div class='del'>-		append_move(desc,</div><div class='del'>-			    MOVE_SRC_OUTFIFO |</div><div class='del'>-			    MOVE_DEST_CLASS1CTX |</div><div class='del'>-			    (16 &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='del'>-			    (CTR_RFC3686_NONCE_SIZE &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void init_sh_desc_key_aead(u32 *desc, struct caam_ctx *ctx,</div><div class='del'>-				  int keys_fit_inline, bool is_rfc3686)</div><div class='del'>-{</div><div class='del'>-	u32 *key_jump_cmd;</div><div class='del'>-</div><div class='del'>-	/* Note: Context registers are saved. */</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='del'>-</div><div class='del'>-	/* Skip if already shared */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-				   JUMP_COND_SHRD);</div><div class='del'>-</div><div class='del'>-	append_key_aead(desc, ctx, keys_fit_inline, is_rfc3686);</div><div class='del'>-</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int aead_null_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	bool keys_fit_inline = false;</div><div class='del'>-	u32 *key_jump_cmd, *jump_cmd, *read_move_cmd, *write_move_cmd;</div><div class='ctx'> 	u32 *desc;</div><div class='add'>+	int rem_bytes = CAAM_DESC_BYTES_MAX - AEAD_DESC_JOB_IO_LEN -</div><div class='add'>+			ctx-&gt;adata.keylen_pad;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Job Descriptor and Shared Descriptors</div><div class='ctx'> 	 * must all fit into the 64-word Descriptor h/w Buffer</div><div class='ctx'> 	 */</div><div class='del'>-	if (DESC_AEAD_NULL_ENC_LEN + AEAD_DESC_JOB_IO_LEN +</div><div class='del'>-	    ctx-&gt;split_key_pad_len &lt;= CAAM_DESC_BYTES_MAX)</div><div class='del'>-		keys_fit_inline = true;</div><div class='add'>+	if (rem_bytes &gt;= DESC_AEAD_NULL_ENC_LEN) {</div><div class='add'>+		ctx-&gt;adata.key_inline = true;</div><div class='add'>+		ctx-&gt;adata.key_virt = ctx-&gt;key;</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;adata.key_inline = false;</div><div class='add'>+		ctx-&gt;adata.key_dma = ctx-&gt;key_dma;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* aead_encrypt shared descriptor */</div><div class='ctx'> 	desc = ctx-&gt;sh_desc_enc;</div><div class='del'>-</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='del'>-</div><div class='del'>-	/* Skip if already shared */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-				   JUMP_COND_SHRD);</div><div class='del'>-	if (keys_fit_inline)</div><div class='del'>-		append_key_as_imm(desc, ctx-&gt;key, ctx-&gt;split_key_pad_len,</div><div class='del'>-				  ctx-&gt;split_key_len, CLASS_2 |</div><div class='del'>-				  KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='del'>-	else</div><div class='del'>-		append_key(desc, ctx-&gt;key_dma, ctx-&gt;split_key_len, CLASS_2 |</div><div class='del'>-			   KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* assoclen + cryptlen = seqinlen */</div><div class='del'>-	append_math_sub(desc, REG3, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Prepare to read and write cryptlen + assoclen bytes */</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * MOVE_LEN opcode is not available in all SEC HW revisions,</div><div class='del'>-	 * thus need to do some magic, i.e. self-patch the descriptor</div><div class='del'>-	 * buffer.</div><div class='del'>-	 */</div><div class='del'>-	read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF |</div><div class='del'>-				    MOVE_DEST_MATH3 |</div><div class='del'>-				    (0x6 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-	write_move_cmd = append_move(desc, MOVE_SRC_MATH3 |</div><div class='del'>-				     MOVE_DEST_DESCBUF |</div><div class='del'>-				     MOVE_WAITCOMP |</div><div class='del'>-				     (0x8 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Class 2 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class2_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT);</div><div class='del'>-</div><div class='del'>-	/* Read and write cryptlen bytes */</div><div class='del'>-	aead_append_src_dst(desc, FIFOLD_TYPE_MSG | FIFOLD_TYPE_FLUSH1);</div><div class='del'>-</div><div class='del'>-	set_move_tgt_here(desc, read_move_cmd);</div><div class='del'>-	set_move_tgt_here(desc, write_move_cmd);</div><div class='del'>-	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='del'>-	append_move(desc, MOVE_SRC_INFIFO_CL | MOVE_DEST_OUTFIFO |</div><div class='del'>-		    MOVE_AUX_LS);</div><div class='del'>-</div><div class='del'>-	/* Write ICV */</div><div class='del'>-	append_seq_store(desc, ctx-&gt;authsize, LDST_CLASS_2_CCB |</div><div class='del'>-			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_enc_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_enc_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "aead null enc shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	cnstr_shdsc_aead_null_encap(desc, &amp;ctx-&gt;adata, ctx-&gt;authsize);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_enc_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Job Descriptor and Shared Descriptors</div><div class='ctx'> 	 * must all fit into the 64-word Descriptor h/w Buffer</div><div class='ctx'> 	 */</div><div class='del'>-	keys_fit_inline = false;</div><div class='del'>-	if (DESC_AEAD_NULL_DEC_LEN + DESC_JOB_IO_LEN +</div><div class='del'>-	    ctx-&gt;split_key_pad_len &lt;= CAAM_DESC_BYTES_MAX)</div><div class='del'>-		keys_fit_inline = true;</div><div class='del'>-</div><div class='del'>-	desc = ctx-&gt;sh_desc_dec;</div><div class='add'>+	if (rem_bytes &gt;= DESC_AEAD_NULL_DEC_LEN) {</div><div class='add'>+		ctx-&gt;adata.key_inline = true;</div><div class='add'>+		ctx-&gt;adata.key_virt = ctx-&gt;key;</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;adata.key_inline = false;</div><div class='add'>+		ctx-&gt;adata.key_dma = ctx-&gt;key_dma;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* aead_decrypt shared descriptor */</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='del'>-</div><div class='del'>-	/* Skip if already shared */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-				   JUMP_COND_SHRD);</div><div class='del'>-	if (keys_fit_inline)</div><div class='del'>-		append_key_as_imm(desc, ctx-&gt;key, ctx-&gt;split_key_pad_len,</div><div class='del'>-				  ctx-&gt;split_key_len, CLASS_2 |</div><div class='del'>-				  KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='del'>-	else</div><div class='del'>-		append_key(desc, ctx-&gt;key_dma, ctx-&gt;split_key_len, CLASS_2 |</div><div class='del'>-			   KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* Class 2 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class2_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_DECRYPT | OP_ALG_ICV_ON);</div><div class='del'>-</div><div class='del'>-	/* assoclen + cryptlen = seqoutlen */</div><div class='del'>-	append_math_sub(desc, REG2, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Prepare to read and write cryptlen + assoclen bytes */</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, ZERO, REG2, CAAM_CMD_SZ);</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, ZERO, REG2, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * MOVE_LEN opcode is not available in all SEC HW revisions,</div><div class='del'>-	 * thus need to do some magic, i.e. self-patch the descriptor</div><div class='del'>-	 * buffer.</div><div class='del'>-	 */</div><div class='del'>-	read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF |</div><div class='del'>-				    MOVE_DEST_MATH2 |</div><div class='del'>-				    (0x6 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-	write_move_cmd = append_move(desc, MOVE_SRC_MATH2 |</div><div class='del'>-				     MOVE_DEST_DESCBUF |</div><div class='del'>-				     MOVE_WAITCOMP |</div><div class='del'>-				     (0x8 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Read and write cryptlen bytes */</div><div class='del'>-	aead_append_src_dst(desc, FIFOLD_TYPE_MSG | FIFOLD_TYPE_FLUSH1);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Insert a NOP here, since we need at least 4 instructions between</div><div class='del'>-	 * code patching the descriptor buffer and the location being patched.</div><div class='del'>-	 */</div><div class='del'>-	jump_cmd = append_jump(desc, JUMP_TEST_ALL);</div><div class='del'>-	set_jump_tgt_here(desc, jump_cmd);</div><div class='del'>-</div><div class='del'>-	set_move_tgt_here(desc, read_move_cmd);</div><div class='del'>-	set_move_tgt_here(desc, write_move_cmd);</div><div class='del'>-	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='del'>-	append_move(desc, MOVE_SRC_INFIFO_CL | MOVE_DEST_OUTFIFO |</div><div class='del'>-		    MOVE_AUX_LS);</div><div class='del'>-	append_cmd(desc, CMD_LOAD | ENABLE_AUTO_INFO_FIFO);</div><div class='del'>-</div><div class='del'>-	/* Load ICV */</div><div class='del'>-	append_seq_fifo_load(desc, ctx-&gt;authsize, FIFOLD_CLASS_CLASS2 |</div><div class='del'>-			     FIFOLD_TYPE_LAST2 | FIFOLD_TYPE_ICV);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_dec_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_dec_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "aead null dec shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	desc = ctx-&gt;sh_desc_dec;</div><div class='add'>+	cnstr_shdsc_aead_null_decap(desc, &amp;ctx-&gt;adata, ctx-&gt;authsize);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_dec_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -470,11 +202,11 @@ static int aead_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> 	unsigned int ivsize = crypto_aead_ivsize(aead);</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	bool keys_fit_inline;</div><div class='del'>-	u32 geniv, moveiv;</div><div class='ctx'> 	u32 ctx1_iv_off = 0;</div><div class='del'>-	u32 *desc;</div><div class='del'>-	const bool ctr_mode = ((ctx-&gt;class1_alg_type &amp; OP_ALG_AAI_MASK) ==</div><div class='add'>+	u32 *desc, *nonce = NULL;</div><div class='add'>+	u32 inl_mask;</div><div class='add'>+	unsigned int data_len[2];</div><div class='add'>+	const bool ctr_mode = ((ctx-&gt;cdata.algtype &amp; OP_ALG_AAI_MASK) ==</div><div class='ctx'> 			       OP_ALG_AAI_CTR_MOD128);</div><div class='ctx'> 	const bool is_rfc3686 = alg-&gt;caam.rfc3686;</div><div class='ctx'> </div><div class='hunk'>@@ -482,7 +214,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* NULL encryption / decryption */</div><div class='del'>-	if (!ctx-&gt;enckeylen)</div><div class='add'>+	if (!ctx-&gt;cdata.keylen)</div><div class='ctx'> 		return aead_null_set_sh_desc(aead);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -497,8 +229,14 @@ static int aead_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> 	 * RFC3686 specific:</div><div class='ctx'> 	 *	CONTEXT1[255:128] = {NONCE, IV, COUNTER}</div><div class='ctx'> 	 */</div><div class='del'>-	if (is_rfc3686)</div><div class='add'>+	if (is_rfc3686) {</div><div class='ctx'> 		ctx1_iv_off = 16 + CTR_RFC3686_NONCE_SIZE;</div><div class='add'>+		nonce = (u32 *)((void *)ctx-&gt;key + ctx-&gt;adata.keylen_pad +</div><div class='add'>+				ctx-&gt;cdata.keylen - CTR_RFC3686_NONCE_SIZE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data_len[0] = ctx-&gt;adata.keylen_pad;</div><div class='add'>+	data_len[1] = ctx-&gt;cdata.keylen;</div><div class='ctx'> </div><div class='ctx'> 	if (alg-&gt;caam.geniv)</div><div class='ctx'> 		goto skip_enc;</div><div class='hunk'>@@ -507,146 +245,63 @@ static int aead_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> 	 * Job Descriptor and Shared Descriptors</div><div class='ctx'> 	 * must all fit into the 64-word Descriptor h/w Buffer</div><div class='ctx'> 	 */</div><div class='del'>-	keys_fit_inline = false;</div><div class='del'>-	if (DESC_AEAD_ENC_LEN + AUTHENC_DESC_JOB_IO_LEN +</div><div class='del'>-	    ctx-&gt;split_key_pad_len + ctx-&gt;enckeylen +</div><div class='del'>-	    (is_rfc3686 ? DESC_AEAD_CTR_RFC3686_LEN : 0) &lt;=</div><div class='del'>-	    CAAM_DESC_BYTES_MAX)</div><div class='del'>-		keys_fit_inline = true;</div><div class='del'>-</div><div class='del'>-	/* aead_encrypt shared descriptor */</div><div class='del'>-	desc = ctx-&gt;sh_desc_enc;</div><div class='del'>-</div><div class='del'>-	/* Note: Context registers are saved. */</div><div class='del'>-	init_sh_desc_key_aead(desc, ctx, keys_fit_inline, is_rfc3686);</div><div class='del'>-</div><div class='del'>-	/* Class 2 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class2_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT);</div><div class='add'>+	if (desc_inline_query(DESC_AEAD_ENC_LEN +</div><div class='add'>+			      (is_rfc3686 ? DESC_AEAD_CTR_RFC3686_LEN : 0),</div><div class='add'>+			      AUTHENC_DESC_JOB_IO_LEN, data_len, &amp;inl_mask,</div><div class='add'>+			      ARRAY_SIZE(data_len)) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Read and write assoclen bytes */</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+	if (inl_mask &amp; 1)</div><div class='add'>+		ctx-&gt;adata.key_virt = ctx-&gt;key;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;adata.key_dma = ctx-&gt;key_dma;</div><div class='ctx'> </div><div class='del'>-	/* Skip assoc data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='add'>+	if (inl_mask &amp; 2)</div><div class='add'>+		ctx-&gt;cdata.key_virt = ctx-&gt;key + ctx-&gt;adata.keylen_pad;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;cdata.key_dma = ctx-&gt;key_dma + ctx-&gt;adata.keylen_pad;</div><div class='ctx'> </div><div class='del'>-	/* read assoc before reading payload */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG |</div><div class='del'>-				      FIFOLDST_VLF);</div><div class='add'>+	ctx-&gt;adata.key_inline = !!(inl_mask &amp; 1);</div><div class='add'>+	ctx-&gt;cdata.key_inline = !!(inl_mask &amp; 2);</div><div class='ctx'> </div><div class='del'>-	/* Load Counter into CONTEXT1 reg */</div><div class='del'>-	if (is_rfc3686)</div><div class='del'>-		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='del'>-				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='del'>-				      LDST_OFFSET_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Class 1 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT);</div><div class='del'>-</div><div class='del'>-	/* Read and write cryptlen bytes */</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-	aead_append_src_dst(desc, FIFOLD_TYPE_MSG1OUT2);</div><div class='del'>-</div><div class='del'>-	/* Write ICV */</div><div class='del'>-	append_seq_store(desc, ctx-&gt;authsize, LDST_CLASS_2_CCB |</div><div class='del'>-			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_enc_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_enc_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR, "aead enc shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	/* aead_encrypt shared descriptor */</div><div class='add'>+	desc = ctx-&gt;sh_desc_enc;</div><div class='add'>+	cnstr_shdsc_aead_encap(desc, &amp;ctx-&gt;cdata, &amp;ctx-&gt;adata, ctx-&gt;authsize,</div><div class='add'>+			       is_rfc3686, nonce, ctx1_iv_off);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_enc_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> skip_enc:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Job Descriptor and Shared Descriptors</div><div class='ctx'> 	 * must all fit into the 64-word Descriptor h/w Buffer</div><div class='ctx'> 	 */</div><div class='del'>-	keys_fit_inline = false;</div><div class='del'>-	if (DESC_AEAD_DEC_LEN + AUTHENC_DESC_JOB_IO_LEN +</div><div class='del'>-	    ctx-&gt;split_key_pad_len + ctx-&gt;enckeylen +</div><div class='del'>-	    (is_rfc3686 ? DESC_AEAD_CTR_RFC3686_LEN : 0) &lt;=</div><div class='del'>-	    CAAM_DESC_BYTES_MAX)</div><div class='del'>-		keys_fit_inline = true;</div><div class='del'>-</div><div class='del'>-	/* aead_decrypt shared descriptor */</div><div class='del'>-	desc = ctx-&gt;sh_desc_dec;</div><div class='del'>-</div><div class='del'>-	/* Note: Context registers are saved. */</div><div class='del'>-	init_sh_desc_key_aead(desc, ctx, keys_fit_inline, is_rfc3686);</div><div class='del'>-</div><div class='del'>-	/* Class 2 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class2_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_DECRYPT | OP_ALG_ICV_ON);</div><div class='add'>+	if (desc_inline_query(DESC_AEAD_DEC_LEN +</div><div class='add'>+			      (is_rfc3686 ? DESC_AEAD_CTR_RFC3686_LEN : 0),</div><div class='add'>+			      AUTHENC_DESC_JOB_IO_LEN, data_len, &amp;inl_mask,</div><div class='add'>+			      ARRAY_SIZE(data_len)) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Read and write assoclen bytes */</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-	if (alg-&gt;caam.geniv)</div><div class='del'>-		append_math_add_imm_u32(desc, VARSEQOUTLEN, REG3, IMM, ivsize);</div><div class='add'>+	if (inl_mask &amp; 1)</div><div class='add'>+		ctx-&gt;adata.key_virt = ctx-&gt;key;</div><div class='ctx'> 	else</div><div class='del'>-		append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Skip assoc data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='del'>-</div><div class='del'>-	/* read assoc before reading payload */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG |</div><div class='del'>-			     KEY_VLF);</div><div class='del'>-</div><div class='del'>-	if (alg-&gt;caam.geniv) {</div><div class='del'>-		append_seq_load(desc, ivsize, LDST_CLASS_1_CCB |</div><div class='del'>-				LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-				(ctx1_iv_off &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='del'>-		append_move(desc, MOVE_SRC_CLASS1CTX | MOVE_DEST_CLASS2INFIFO |</div><div class='del'>-			    (ctx1_iv_off &lt;&lt; MOVE_OFFSET_SHIFT) | ivsize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Load Counter into CONTEXT1 reg */</div><div class='del'>-	if (is_rfc3686)</div><div class='del'>-		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='del'>-				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='del'>-				      LDST_OFFSET_SHIFT));</div><div class='add'>+		ctx-&gt;adata.key_dma = ctx-&gt;key_dma;</div><div class='ctx'> </div><div class='del'>-	/* Choose operation */</div><div class='del'>-	if (ctr_mode)</div><div class='del'>-		append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-				 OP_ALG_AS_INITFINAL | OP_ALG_DECRYPT);</div><div class='add'>+	if (inl_mask &amp; 2)</div><div class='add'>+		ctx-&gt;cdata.key_virt = ctx-&gt;key + ctx-&gt;adata.keylen_pad;</div><div class='ctx'> 	else</div><div class='del'>-		append_dec_op1(desc, ctx-&gt;class1_alg_type);</div><div class='add'>+		ctx-&gt;cdata.key_dma = ctx-&gt;key_dma + ctx-&gt;adata.keylen_pad;</div><div class='ctx'> </div><div class='del'>-	/* Read and write cryptlen bytes */</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-	aead_append_src_dst(desc, FIFOLD_TYPE_MSG);</div><div class='add'>+	ctx-&gt;adata.key_inline = !!(inl_mask &amp; 1);</div><div class='add'>+	ctx-&gt;cdata.key_inline = !!(inl_mask &amp; 2);</div><div class='ctx'> </div><div class='del'>-	/* Load ICV */</div><div class='del'>-	append_seq_fifo_load(desc, ctx-&gt;authsize, FIFOLD_CLASS_CLASS2 |</div><div class='del'>-			     FIFOLD_TYPE_LAST2 | FIFOLD_TYPE_ICV);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_dec_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_dec_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR, "aead dec shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	/* aead_decrypt shared descriptor */</div><div class='add'>+	desc = ctx-&gt;sh_desc_dec;</div><div class='add'>+	cnstr_shdsc_aead_decap(desc, &amp;ctx-&gt;cdata, &amp;ctx-&gt;adata, ivsize,</div><div class='add'>+			       ctx-&gt;authsize, alg-&gt;caam.geniv, is_rfc3686,</div><div class='add'>+			       nonce, ctx1_iv_off);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_dec_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	if (!alg-&gt;caam.geniv)</div><div class='ctx'> 		goto skip_givenc;</div><div class='hunk'>@@ -655,105 +310,32 @@ skip_enc:</div><div class='ctx'> 	 * Job Descriptor and Shared Descriptors</div><div class='ctx'> 	 * must all fit into the 64-word Descriptor h/w Buffer</div><div class='ctx'> 	 */</div><div class='del'>-	keys_fit_inline = false;</div><div class='del'>-	if (DESC_AEAD_GIVENC_LEN + AUTHENC_DESC_JOB_IO_LEN +</div><div class='del'>-	    ctx-&gt;split_key_pad_len + ctx-&gt;enckeylen +</div><div class='del'>-	    (is_rfc3686 ? DESC_AEAD_CTR_RFC3686_LEN : 0) &lt;=</div><div class='del'>-	    CAAM_DESC_BYTES_MAX)</div><div class='del'>-		keys_fit_inline = true;</div><div class='del'>-</div><div class='del'>-	/* aead_givencrypt shared descriptor */</div><div class='del'>-	desc = ctx-&gt;sh_desc_enc;</div><div class='del'>-</div><div class='del'>-	/* Note: Context registers are saved. */</div><div class='del'>-	init_sh_desc_key_aead(desc, ctx, keys_fit_inline, is_rfc3686);</div><div class='del'>-</div><div class='del'>-	if (is_rfc3686)</div><div class='del'>-		goto copy_iv;</div><div class='del'>-</div><div class='del'>-	/* Generate IV */</div><div class='del'>-	geniv = NFIFOENTRY_STYPE_PAD | NFIFOENTRY_DEST_DECO |</div><div class='del'>-		NFIFOENTRY_DTYPE_MSG | NFIFOENTRY_LC1 |</div><div class='del'>-		NFIFOENTRY_PTYPE_RND | (ivsize &lt;&lt; NFIFOENTRY_DLEN_SHIFT);</div><div class='del'>-	append_load_imm_u32(desc, geniv, LDST_CLASS_IND_CCB |</div><div class='del'>-			    LDST_SRCDST_WORD_INFO_FIFO | LDST_IMM);</div><div class='del'>-	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='del'>-	append_move(desc, MOVE_WAITCOMP |</div><div class='del'>-		    MOVE_SRC_INFIFO | MOVE_DEST_CLASS1CTX |</div><div class='del'>-		    (ctx1_iv_off &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='del'>-		    (ivsize &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-	append_cmd(desc, CMD_LOAD | ENABLE_AUTO_INFO_FIFO);</div><div class='del'>-</div><div class='del'>-copy_iv:</div><div class='del'>-	/* Copy IV to class 1 context */</div><div class='del'>-	append_move(desc, MOVE_SRC_CLASS1CTX | MOVE_DEST_OUTFIFO |</div><div class='del'>-		    (ctx1_iv_off &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='del'>-		    (ivsize &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Return to encryption */</div><div class='del'>-	append_operation(desc, ctx-&gt;class2_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT);</div><div class='del'>-</div><div class='del'>-	/* Read and write assoclen bytes */</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* ivsize + cryptlen = seqoutlen - authsize */</div><div class='del'>-	append_math_sub_imm_u32(desc, REG3, SEQOUTLEN, IMM, ctx-&gt;authsize);</div><div class='del'>-</div><div class='del'>-	/* Skip assoc data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='del'>-</div><div class='del'>-	/* read assoc before reading payload */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG |</div><div class='del'>-			     KEY_VLF);</div><div class='del'>-</div><div class='del'>-	/* Copy iv from outfifo to class 2 fifo */</div><div class='del'>-	moveiv = NFIFOENTRY_STYPE_OFIFO | NFIFOENTRY_DEST_CLASS2 |</div><div class='del'>-		 NFIFOENTRY_DTYPE_MSG | (ivsize &lt;&lt; NFIFOENTRY_DLEN_SHIFT);</div><div class='del'>-	append_load_imm_u32(desc, moveiv, LDST_CLASS_IND_CCB |</div><div class='del'>-			    LDST_SRCDST_WORD_INFO_FIFO | LDST_IMM);</div><div class='del'>-	append_load_imm_u32(desc, ivsize, LDST_CLASS_2_CCB |</div><div class='del'>-			    LDST_SRCDST_WORD_DATASZ_REG | LDST_IMM);</div><div class='del'>-</div><div class='del'>-	/* Load Counter into CONTEXT1 reg */</div><div class='del'>-	if (is_rfc3686)</div><div class='del'>-		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='del'>-				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='del'>-				      LDST_OFFSET_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Class 1 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT);</div><div class='del'>-</div><div class='del'>-	/* Will write ivsize + cryptlen */</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+	if (desc_inline_query(DESC_AEAD_GIVENC_LEN +</div><div class='add'>+			      (is_rfc3686 ? DESC_AEAD_CTR_RFC3686_LEN : 0),</div><div class='add'>+			      AUTHENC_DESC_JOB_IO_LEN, data_len, &amp;inl_mask,</div><div class='add'>+			      ARRAY_SIZE(data_len)) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Not need to reload iv */</div><div class='del'>-	append_seq_fifo_load(desc, ivsize,</div><div class='del'>-			     FIFOLD_CLASS_SKIP);</div><div class='add'>+	if (inl_mask &amp; 1)</div><div class='add'>+		ctx-&gt;adata.key_virt = ctx-&gt;key;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;adata.key_dma = ctx-&gt;key_dma;</div><div class='ctx'> </div><div class='del'>-	/* Will read cryptlen */</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-	aead_append_src_dst(desc, FIFOLD_TYPE_MSG1OUT2);</div><div class='add'>+	if (inl_mask &amp; 2)</div><div class='add'>+		ctx-&gt;cdata.key_virt = ctx-&gt;key + ctx-&gt;adata.keylen_pad;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;cdata.key_dma = ctx-&gt;key_dma + ctx-&gt;adata.keylen_pad;</div><div class='ctx'> </div><div class='del'>-	/* Write ICV */</div><div class='del'>-	append_seq_store(desc, ctx-&gt;authsize, LDST_CLASS_2_CCB |</div><div class='del'>-			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='add'>+	ctx-&gt;adata.key_inline = !!(inl_mask &amp; 1);</div><div class='add'>+	ctx-&gt;cdata.key_inline = !!(inl_mask &amp; 2);</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;sh_desc_enc_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_enc_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR, "aead givenc shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	/* aead_givencrypt shared descriptor */</div><div class='add'>+	desc = ctx-&gt;sh_desc_enc;</div><div class='add'>+	cnstr_shdsc_aead_givencap(desc, &amp;ctx-&gt;cdata, &amp;ctx-&gt;adata, ivsize,</div><div class='add'>+				  ctx-&gt;authsize, is_rfc3686, nonce,</div><div class='add'>+				  ctx1_iv_off);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_enc_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> skip_givenc:</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -774,12 +356,11 @@ static int gcm_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	bool keys_fit_inline = false;</div><div class='del'>-	u32 *key_jump_cmd, *zero_payload_jump_cmd,</div><div class='del'>-	    *zero_assoc_jump_cmd1, *zero_assoc_jump_cmd2;</div><div class='ctx'> 	u32 *desc;</div><div class='add'>+	int rem_bytes = CAAM_DESC_BYTES_MAX - GCM_DESC_JOB_IO_LEN -</div><div class='add'>+			ctx-&gt;cdata.keylen;</div><div class='ctx'> </div><div class='del'>-	if (!ctx-&gt;enckeylen || !ctx-&gt;authsize)</div><div class='add'>+	if (!ctx-&gt;cdata.keylen || !ctx-&gt;authsize)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -787,175 +368,35 @@ static int gcm_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> 	 * Job Descriptor and Shared Descriptor</div><div class='ctx'> 	 * must fit into the 64-word Descriptor h/w Buffer</div><div class='ctx'> 	 */</div><div class='del'>-	if (DESC_GCM_ENC_LEN + GCM_DESC_JOB_IO_LEN +</div><div class='del'>-	    ctx-&gt;enckeylen &lt;= CAAM_DESC_BYTES_MAX)</div><div class='del'>-		keys_fit_inline = true;</div><div class='add'>+	if (rem_bytes &gt;= DESC_GCM_ENC_LEN) {</div><div class='add'>+		ctx-&gt;cdata.key_inline = true;</div><div class='add'>+		ctx-&gt;cdata.key_virt = ctx-&gt;key;</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;cdata.key_inline = false;</div><div class='add'>+		ctx-&gt;cdata.key_dma = ctx-&gt;key_dma;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	desc = ctx-&gt;sh_desc_enc;</div><div class='del'>-</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='del'>-</div><div class='del'>-	/* skip key loading if they are loaded due to sharing */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-				   JUMP_COND_SHRD | JUMP_COND_SELF);</div><div class='del'>-	if (keys_fit_inline)</div><div class='del'>-		append_key_as_imm(desc, (void *)ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-				  ctx-&gt;enckeylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	else</div><div class='del'>-		append_key(desc, ctx-&gt;key_dma, ctx-&gt;enckeylen,</div><div class='del'>-			   CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* class 1 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT);</div><div class='del'>-</div><div class='del'>-	/* if assoclen + cryptlen is ZERO, skip to ICV write */</div><div class='del'>-	append_math_sub(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-	zero_assoc_jump_cmd2 = append_jump(desc, JUMP_TEST_ALL |</div><div class='del'>-						 JUMP_COND_MATH_Z);</div><div class='del'>-</div><div class='del'>-	/* if assoclen is ZERO, skip reading the assoc data */</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-	zero_assoc_jump_cmd1 = append_jump(desc, JUMP_TEST_ALL |</div><div class='del'>-						 JUMP_COND_MATH_Z);</div><div class='del'>-</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* skip assoc data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='del'>-</div><div class='del'>-	/* cryptlen = seqinlen - assoclen */</div><div class='del'>-	append_math_sub(desc, VARSEQOUTLEN, SEQINLEN, REG3, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* if cryptlen is ZERO jump to zero-payload commands */</div><div class='del'>-	zero_payload_jump_cmd = append_jump(desc, JUMP_TEST_ALL |</div><div class='del'>-					    JUMP_COND_MATH_Z);</div><div class='del'>-</div><div class='del'>-	/* read assoc data */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='del'>-			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_FLUSH1);</div><div class='del'>-	set_jump_tgt_here(desc, zero_assoc_jump_cmd1);</div><div class='del'>-</div><div class='del'>-	append_math_sub(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* write encrypted data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | FIFOLDST_VLF);</div><div class='del'>-</div><div class='del'>-	/* read payload data */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='del'>-			     FIFOLD_TYPE_MSG | FIFOLD_TYPE_LAST1);</div><div class='del'>-</div><div class='del'>-	/* jump the zero-payload commands */</div><div class='del'>-	append_jump(desc, JUMP_TEST_ALL | 2);</div><div class='del'>-</div><div class='del'>-	/* zero-payload commands */</div><div class='del'>-	set_jump_tgt_here(desc, zero_payload_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* read assoc data */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='del'>-			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_LAST1);</div><div class='del'>-</div><div class='del'>-	/* There is no input data */</div><div class='del'>-	set_jump_tgt_here(desc, zero_assoc_jump_cmd2);</div><div class='del'>-</div><div class='del'>-	/* write ICV */</div><div class='del'>-	append_seq_store(desc, ctx-&gt;authsize, LDST_CLASS_1_CCB |</div><div class='del'>-			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_enc_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_enc_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR, "gcm enc shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	cnstr_shdsc_gcm_encap(desc, &amp;ctx-&gt;cdata, ctx-&gt;authsize);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_enc_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Job Descriptor and Shared Descriptors</div><div class='ctx'> 	 * must all fit into the 64-word Descriptor h/w Buffer</div><div class='ctx'> 	 */</div><div class='del'>-	keys_fit_inline = false;</div><div class='del'>-	if (DESC_GCM_DEC_LEN + GCM_DESC_JOB_IO_LEN +</div><div class='del'>-	    ctx-&gt;enckeylen &lt;= CAAM_DESC_BYTES_MAX)</div><div class='del'>-		keys_fit_inline = true;</div><div class='add'>+	if (rem_bytes &gt;= DESC_GCM_DEC_LEN) {</div><div class='add'>+		ctx-&gt;cdata.key_inline = true;</div><div class='add'>+		ctx-&gt;cdata.key_virt = ctx-&gt;key;</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;cdata.key_inline = false;</div><div class='add'>+		ctx-&gt;cdata.key_dma = ctx-&gt;key_dma;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	desc = ctx-&gt;sh_desc_dec;</div><div class='del'>-</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='del'>-</div><div class='del'>-	/* skip key loading if they are loaded due to sharing */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL |</div><div class='del'>-				   JUMP_TEST_ALL | JUMP_COND_SHRD |</div><div class='del'>-				   JUMP_COND_SELF);</div><div class='del'>-	if (keys_fit_inline)</div><div class='del'>-		append_key_as_imm(desc, (void *)ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-				  ctx-&gt;enckeylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	else</div><div class='del'>-		append_key(desc, ctx-&gt;key_dma, ctx-&gt;enckeylen,</div><div class='del'>-			   CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* class 1 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_DECRYPT | OP_ALG_ICV_ON);</div><div class='del'>-</div><div class='del'>-	/* if assoclen is ZERO, skip reading the assoc data */</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-	zero_assoc_jump_cmd1 = append_jump(desc, JUMP_TEST_ALL |</div><div class='del'>-						 JUMP_COND_MATH_Z);</div><div class='del'>-</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* skip assoc data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='del'>-</div><div class='del'>-	/* read assoc data */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='del'>-			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_FLUSH1);</div><div class='del'>-</div><div class='del'>-	set_jump_tgt_here(desc, zero_assoc_jump_cmd1);</div><div class='del'>-</div><div class='del'>-	/* cryptlen = seqoutlen - assoclen */</div><div class='del'>-	append_math_sub(desc, VARSEQINLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* jump to zero-payload command if cryptlen is zero */</div><div class='del'>-	zero_payload_jump_cmd = append_jump(desc, JUMP_TEST_ALL |</div><div class='del'>-					    JUMP_COND_MATH_Z);</div><div class='del'>-</div><div class='del'>-	append_math_sub(desc, VARSEQOUTLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* store encrypted data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | FIFOLDST_VLF);</div><div class='del'>-</div><div class='del'>-	/* read payload data */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='del'>-			     FIFOLD_TYPE_MSG | FIFOLD_TYPE_FLUSH1);</div><div class='del'>-</div><div class='del'>-	/* zero-payload command */</div><div class='del'>-	set_jump_tgt_here(desc, zero_payload_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* read ICV */</div><div class='del'>-	append_seq_fifo_load(desc, ctx-&gt;authsize, FIFOLD_CLASS_CLASS1 |</div><div class='del'>-			     FIFOLD_TYPE_ICV | FIFOLD_TYPE_LAST1);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_dec_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_dec_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR, "gcm dec shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	cnstr_shdsc_gcm_decap(desc, &amp;ctx-&gt;cdata, ctx-&gt;authsize);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_dec_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -974,11 +415,11 @@ static int rfc4106_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	bool keys_fit_inline = false;</div><div class='del'>-	u32 *key_jump_cmd;</div><div class='ctx'> 	u32 *desc;</div><div class='add'>+	int rem_bytes = CAAM_DESC_BYTES_MAX - GCM_DESC_JOB_IO_LEN -</div><div class='add'>+			ctx-&gt;cdata.keylen;</div><div class='ctx'> </div><div class='del'>-	if (!ctx-&gt;enckeylen || !ctx-&gt;authsize)</div><div class='add'>+	if (!ctx-&gt;cdata.keylen || !ctx-&gt;authsize)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -986,148 +427,35 @@ static int rfc4106_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> 	 * Job Descriptor and Shared Descriptor</div><div class='ctx'> 	 * must fit into the 64-word Descriptor h/w Buffer</div><div class='ctx'> 	 */</div><div class='del'>-	if (DESC_RFC4106_ENC_LEN + GCM_DESC_JOB_IO_LEN +</div><div class='del'>-	    ctx-&gt;enckeylen &lt;= CAAM_DESC_BYTES_MAX)</div><div class='del'>-		keys_fit_inline = true;</div><div class='add'>+	if (rem_bytes &gt;= DESC_RFC4106_ENC_LEN) {</div><div class='add'>+		ctx-&gt;cdata.key_inline = true;</div><div class='add'>+		ctx-&gt;cdata.key_virt = ctx-&gt;key;</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;cdata.key_inline = false;</div><div class='add'>+		ctx-&gt;cdata.key_dma = ctx-&gt;key_dma;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	desc = ctx-&gt;sh_desc_enc;</div><div class='del'>-</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='del'>-</div><div class='del'>-	/* Skip key loading if it is loaded due to sharing */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-				   JUMP_COND_SHRD);</div><div class='del'>-	if (keys_fit_inline)</div><div class='del'>-		append_key_as_imm(desc, (void *)ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-				  ctx-&gt;enckeylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	else</div><div class='del'>-		append_key(desc, ctx-&gt;key_dma, ctx-&gt;enckeylen,</div><div class='del'>-			   CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* Class 1 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT);</div><div class='del'>-</div><div class='del'>-	append_math_sub_imm_u32(desc, VARSEQINLEN, REG3, IMM, 8);</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Read assoc data */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='del'>-			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_FLUSH1);</div><div class='del'>-</div><div class='del'>-	/* Skip IV */</div><div class='del'>-	append_seq_fifo_load(desc, 8, FIFOLD_CLASS_SKIP);</div><div class='del'>-</div><div class='del'>-	/* Will read cryptlen bytes */</div><div class='del'>-	append_math_sub(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Workaround for erratum A-005473 (simultaneous SEQ FIFO skips) */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLD_TYPE_MSG);</div><div class='del'>-</div><div class='del'>-	/* Skip assoc data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='del'>-</div><div class='del'>-	/* cryptlen = seqoutlen - assoclen */</div><div class='del'>-	append_math_sub(desc, VARSEQOUTLEN, VARSEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Write encrypted data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | FIFOLDST_VLF);</div><div class='del'>-</div><div class='del'>-	/* Read payload data */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='del'>-			     FIFOLD_TYPE_MSG | FIFOLD_TYPE_LAST1);</div><div class='del'>-</div><div class='del'>-	/* Write ICV */</div><div class='del'>-	append_seq_store(desc, ctx-&gt;authsize, LDST_CLASS_1_CCB |</div><div class='del'>-			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_enc_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_enc_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR, "rfc4106 enc shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	cnstr_shdsc_rfc4106_encap(desc, &amp;ctx-&gt;cdata, ctx-&gt;authsize);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_enc_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Job Descriptor and Shared Descriptors</div><div class='ctx'> 	 * must all fit into the 64-word Descriptor h/w Buffer</div><div class='ctx'> 	 */</div><div class='del'>-	keys_fit_inline = false;</div><div class='del'>-	if (DESC_RFC4106_DEC_LEN + DESC_JOB_IO_LEN +</div><div class='del'>-	    ctx-&gt;enckeylen &lt;= CAAM_DESC_BYTES_MAX)</div><div class='del'>-		keys_fit_inline = true;</div><div class='add'>+	if (rem_bytes &gt;= DESC_RFC4106_DEC_LEN) {</div><div class='add'>+		ctx-&gt;cdata.key_inline = true;</div><div class='add'>+		ctx-&gt;cdata.key_virt = ctx-&gt;key;</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;cdata.key_inline = false;</div><div class='add'>+		ctx-&gt;cdata.key_dma = ctx-&gt;key_dma;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	desc = ctx-&gt;sh_desc_dec;</div><div class='del'>-</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='del'>-</div><div class='del'>-	/* Skip key loading if it is loaded due to sharing */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL |</div><div class='del'>-				   JUMP_TEST_ALL | JUMP_COND_SHRD);</div><div class='del'>-	if (keys_fit_inline)</div><div class='del'>-		append_key_as_imm(desc, (void *)ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-				  ctx-&gt;enckeylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	else</div><div class='del'>-		append_key(desc, ctx-&gt;key_dma, ctx-&gt;enckeylen,</div><div class='del'>-			   CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* Class 1 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_DECRYPT | OP_ALG_ICV_ON);</div><div class='del'>-</div><div class='del'>-	append_math_sub_imm_u32(desc, VARSEQINLEN, REG3, IMM, 8);</div><div class='del'>-	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Read assoc data */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='del'>-			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_FLUSH1);</div><div class='del'>-</div><div class='del'>-	/* Skip IV */</div><div class='del'>-	append_seq_fifo_load(desc, 8, FIFOLD_CLASS_SKIP);</div><div class='del'>-</div><div class='del'>-	/* Will read cryptlen bytes */</div><div class='del'>-	append_math_sub(desc, VARSEQINLEN, SEQOUTLEN, REG3, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Workaround for erratum A-005473 (simultaneous SEQ FIFO skips) */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLD_TYPE_MSG);</div><div class='del'>-</div><div class='del'>-	/* Skip assoc data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='del'>-</div><div class='del'>-	/* Will write cryptlen bytes */</div><div class='del'>-	append_math_sub(desc, VARSEQOUTLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Store payload data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | FIFOLDST_VLF);</div><div class='del'>-</div><div class='del'>-	/* Read encrypted data */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='del'>-			     FIFOLD_TYPE_MSG | FIFOLD_TYPE_FLUSH1);</div><div class='del'>-</div><div class='del'>-	/* Read ICV */</div><div class='del'>-	append_seq_fifo_load(desc, ctx-&gt;authsize, FIFOLD_CLASS_CLASS1 |</div><div class='del'>-			     FIFOLD_TYPE_ICV | FIFOLD_TYPE_LAST1);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_dec_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_dec_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR, "rfc4106 dec shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	cnstr_shdsc_rfc4106_decap(desc, &amp;ctx-&gt;cdata, ctx-&gt;authsize);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_dec_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1147,12 +475,11 @@ static int rfc4543_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	bool keys_fit_inline = false;</div><div class='del'>-	u32 *key_jump_cmd;</div><div class='del'>-	u32 *read_move_cmd, *write_move_cmd;</div><div class='ctx'> 	u32 *desc;</div><div class='add'>+	int rem_bytes = CAAM_DESC_BYTES_MAX - GCM_DESC_JOB_IO_LEN -</div><div class='add'>+			ctx-&gt;cdata.keylen;</div><div class='ctx'> </div><div class='del'>-	if (!ctx-&gt;enckeylen || !ctx-&gt;authsize)</div><div class='add'>+	if (!ctx-&gt;cdata.keylen || !ctx-&gt;authsize)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1160,151 +487,35 @@ static int rfc4543_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> 	 * Job Descriptor and Shared Descriptor</div><div class='ctx'> 	 * must fit into the 64-word Descriptor h/w Buffer</div><div class='ctx'> 	 */</div><div class='del'>-	if (DESC_RFC4543_ENC_LEN + GCM_DESC_JOB_IO_LEN +</div><div class='del'>-	    ctx-&gt;enckeylen &lt;= CAAM_DESC_BYTES_MAX)</div><div class='del'>-		keys_fit_inline = true;</div><div class='add'>+	if (rem_bytes &gt;= DESC_RFC4543_ENC_LEN) {</div><div class='add'>+		ctx-&gt;cdata.key_inline = true;</div><div class='add'>+		ctx-&gt;cdata.key_virt = ctx-&gt;key;</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;cdata.key_inline = false;</div><div class='add'>+		ctx-&gt;cdata.key_dma = ctx-&gt;key_dma;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	desc = ctx-&gt;sh_desc_enc;</div><div class='del'>-</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='del'>-</div><div class='del'>-	/* Skip key loading if it is loaded due to sharing */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-				   JUMP_COND_SHRD);</div><div class='del'>-	if (keys_fit_inline)</div><div class='del'>-		append_key_as_imm(desc, (void *)ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-				  ctx-&gt;enckeylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	else</div><div class='del'>-		append_key(desc, ctx-&gt;key_dma, ctx-&gt;enckeylen,</div><div class='del'>-			   CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* Class 1 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT);</div><div class='del'>-</div><div class='del'>-	/* assoclen + cryptlen = seqinlen */</div><div class='del'>-	append_math_sub(desc, REG3, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * MOVE_LEN opcode is not available in all SEC HW revisions,</div><div class='del'>-	 * thus need to do some magic, i.e. self-patch the descriptor</div><div class='del'>-	 * buffer.</div><div class='del'>-	 */</div><div class='del'>-	read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF | MOVE_DEST_MATH3 |</div><div class='del'>-				    (0x6 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-	write_move_cmd = append_move(desc, MOVE_SRC_MATH3 | MOVE_DEST_DESCBUF |</div><div class='del'>-				     (0x8 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Will read assoclen + cryptlen bytes */</div><div class='del'>-	append_math_sub(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Will write assoclen + cryptlen bytes */</div><div class='del'>-	append_math_sub(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Read and write assoclen + cryptlen bytes */</div><div class='del'>-	aead_append_src_dst(desc, FIFOLD_TYPE_AAD);</div><div class='del'>-</div><div class='del'>-	set_move_tgt_here(desc, read_move_cmd);</div><div class='del'>-	set_move_tgt_here(desc, write_move_cmd);</div><div class='del'>-	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='del'>-	/* Move payload data to OFIFO */</div><div class='del'>-	append_move(desc, MOVE_SRC_INFIFO_CL | MOVE_DEST_OUTFIFO);</div><div class='del'>-</div><div class='del'>-	/* Write ICV */</div><div class='del'>-	append_seq_store(desc, ctx-&gt;authsize, LDST_CLASS_1_CCB |</div><div class='del'>-			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_enc_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_enc_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR, "rfc4543 enc shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	cnstr_shdsc_rfc4543_encap(desc, &amp;ctx-&gt;cdata, ctx-&gt;authsize);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_enc_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Job Descriptor and Shared Descriptors</div><div class='ctx'> 	 * must all fit into the 64-word Descriptor h/w Buffer</div><div class='ctx'> 	 */</div><div class='del'>-	keys_fit_inline = false;</div><div class='del'>-	if (DESC_RFC4543_DEC_LEN + GCM_DESC_JOB_IO_LEN +</div><div class='del'>-	    ctx-&gt;enckeylen &lt;= CAAM_DESC_BYTES_MAX)</div><div class='del'>-		keys_fit_inline = true;</div><div class='add'>+	if (rem_bytes &gt;= DESC_RFC4543_DEC_LEN) {</div><div class='add'>+		ctx-&gt;cdata.key_inline = true;</div><div class='add'>+		ctx-&gt;cdata.key_virt = ctx-&gt;key;</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;cdata.key_inline = false;</div><div class='add'>+		ctx-&gt;cdata.key_dma = ctx-&gt;key_dma;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	desc = ctx-&gt;sh_desc_dec;</div><div class='del'>-</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='del'>-</div><div class='del'>-	/* Skip key loading if it is loaded due to sharing */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL |</div><div class='del'>-				   JUMP_TEST_ALL | JUMP_COND_SHRD);</div><div class='del'>-	if (keys_fit_inline)</div><div class='del'>-		append_key_as_imm(desc, (void *)ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-				  ctx-&gt;enckeylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	else</div><div class='del'>-		append_key(desc, ctx-&gt;key_dma, ctx-&gt;enckeylen,</div><div class='del'>-			   CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* Class 1 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_DECRYPT | OP_ALG_ICV_ON);</div><div class='del'>-</div><div class='del'>-	/* assoclen + cryptlen = seqoutlen */</div><div class='del'>-	append_math_sub(desc, REG3, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * MOVE_LEN opcode is not available in all SEC HW revisions,</div><div class='del'>-	 * thus need to do some magic, i.e. self-patch the descriptor</div><div class='del'>-	 * buffer.</div><div class='del'>-	 */</div><div class='del'>-	read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF | MOVE_DEST_MATH3 |</div><div class='del'>-				    (0x6 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-	write_move_cmd = append_move(desc, MOVE_SRC_MATH3 | MOVE_DEST_DESCBUF |</div><div class='del'>-				     (0x8 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Will read assoclen + cryptlen bytes */</div><div class='del'>-	append_math_sub(desc, VARSEQINLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Will write assoclen + cryptlen bytes */</div><div class='del'>-	append_math_sub(desc, VARSEQOUTLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Store payload data */</div><div class='del'>-	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | FIFOLDST_VLF);</div><div class='del'>-</div><div class='del'>-	/* In-snoop assoclen + cryptlen data */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_BOTH | FIFOLDST_VLF |</div><div class='del'>-			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_LAST2FLUSH1);</div><div class='del'>-</div><div class='del'>-	set_move_tgt_here(desc, read_move_cmd);</div><div class='del'>-	set_move_tgt_here(desc, write_move_cmd);</div><div class='del'>-	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='del'>-	/* Move payload data to OFIFO */</div><div class='del'>-	append_move(desc, MOVE_SRC_INFIFO_CL | MOVE_DEST_OUTFIFO);</div><div class='del'>-	append_cmd(desc, CMD_LOAD | ENABLE_AUTO_INFO_FIFO);</div><div class='del'>-</div><div class='del'>-	/* Read ICV */</div><div class='del'>-	append_seq_fifo_load(desc, ctx-&gt;authsize, FIFOLD_CLASS_CLASS1 |</div><div class='del'>-			     FIFOLD_TYPE_ICV | FIFOLD_TYPE_LAST1);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_dec_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_dec_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR, "rfc4543 dec shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	cnstr_shdsc_rfc4543_decap(desc, &amp;ctx-&gt;cdata, ctx-&gt;authsize);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_dec_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1320,19 +531,9 @@ static int rfc4543_setauthsize(struct crypto_aead *authenc,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 gen_split_aead_key(struct caam_ctx *ctx, const u8 *key_in,</div><div class='del'>-			      u32 authkeylen)</div><div class='del'>-{</div><div class='del'>-	return gen_split_key(ctx-&gt;jrdev, ctx-&gt;key, ctx-&gt;split_key_len,</div><div class='del'>-			       ctx-&gt;split_key_pad_len, key_in, authkeylen,</div><div class='del'>-			       ctx-&gt;alg_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int aead_setkey(struct crypto_aead *aead,</div><div class='ctx'> 			       const u8 *key, unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	/* Sizes for MDHA pads (*not* keys): MD5, SHA1, 224, 256, 384, 512 */</div><div class='del'>-	static const u8 mdpadlen[] = { 16, 20, 32, 32, 64, 64 };</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='ctx'> 	struct crypto_authenc_keys keys;</div><div class='hunk'>@@ -1341,53 +542,32 @@ static int aead_setkey(struct crypto_aead *aead,</div><div class='ctx'> 	if (crypto_authenc_extractkeys(&amp;keys, key, keylen) != 0)</div><div class='ctx'> 		goto badkey;</div><div class='ctx'> </div><div class='del'>-	/* Pick class 2 key length from algorithm submask */</div><div class='del'>-	ctx-&gt;split_key_len = mdpadlen[(ctx-&gt;alg_op &amp; OP_ALG_ALGSEL_SUBMASK) &gt;&gt;</div><div class='del'>-				      OP_ALG_ALGSEL_SHIFT] * 2;</div><div class='del'>-	ctx-&gt;split_key_pad_len = ALIGN(ctx-&gt;split_key_len, 16);</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;split_key_pad_len + keys.enckeylen &gt; CAAM_MAX_KEY_SIZE)</div><div class='del'>-		goto badkey;</div><div class='del'>-</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk(KERN_ERR "keylen %d enckeylen %d authkeylen %d\n",</div><div class='ctx'> 	       keys.authkeylen + keys.enckeylen, keys.enckeylen,</div><div class='ctx'> 	       keys.authkeylen);</div><div class='del'>-	printk(KERN_ERR "split_key_len %d split_key_pad_len %d\n",</div><div class='del'>-	       ctx-&gt;split_key_len, ctx-&gt;split_key_pad_len);</div><div class='ctx'> 	print_hex_dump(KERN_ERR, "key in @"__stringify(__LINE__)": ",</div><div class='ctx'> 		       DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	ret = gen_split_aead_key(ctx, keys.authkey, keys.authkeylen);</div><div class='add'>+	ret = gen_split_key(ctx-&gt;jrdev, ctx-&gt;key, &amp;ctx-&gt;adata, keys.authkey,</div><div class='add'>+			    keys.authkeylen, CAAM_MAX_KEY_SIZE -</div><div class='add'>+			    keys.enckeylen);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		goto badkey;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* postpend encryption key to auth split key */</div><div class='del'>-	memcpy(ctx-&gt;key + ctx-&gt;split_key_pad_len, keys.enckey, keys.enckeylen);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;key_dma = dma_map_single(jrdev, ctx-&gt;key, ctx-&gt;split_key_pad_len +</div><div class='del'>-				      keys.enckeylen, DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;key_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map key i/o memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	memcpy(ctx-&gt;key + ctx-&gt;adata.keylen_pad, keys.enckey, keys.enckeylen);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;key_dma, ctx-&gt;adata.keylen_pad +</div><div class='add'>+				   keys.enckeylen, DMA_TO_DEVICE);</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	print_hex_dump(KERN_ERR, "ctx.key@"__stringify(__LINE__)": ",</div><div class='ctx'> 		       DUMP_PREFIX_ADDRESS, 16, 4, ctx-&gt;key,</div><div class='del'>-		       ctx-&gt;split_key_pad_len + keys.enckeylen, 1);</div><div class='add'>+		       ctx-&gt;adata.keylen_pad + keys.enckeylen, 1);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	ctx-&gt;enckeylen = keys.enckeylen;</div><div class='del'>-</div><div class='del'>-	ret = aead_set_sh_desc(aead);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dma_unmap_single(jrdev, ctx-&gt;key_dma, ctx-&gt;split_key_pad_len +</div><div class='del'>-				 keys.enckeylen, DMA_TO_DEVICE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	ctx-&gt;cdata.keylen = keys.enckeylen;</div><div class='add'>+	return aead_set_sh_desc(aead);</div><div class='ctx'> badkey:</div><div class='ctx'> 	crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='ctx'> 	return -EINVAL;</div><div class='hunk'>@@ -1398,7 +578,6 @@ static int gcm_setkey(struct crypto_aead *aead,</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	print_hex_dump(KERN_ERR, "key in @"__stringify(__LINE__)": ",</div><div class='hunk'>@@ -1406,21 +585,10 @@ static int gcm_setkey(struct crypto_aead *aead,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ctx-&gt;key, key, keylen);</div><div class='del'>-	ctx-&gt;key_dma = dma_map_single(jrdev, ctx-&gt;key, keylen,</div><div class='del'>-				      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;key_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map key i/o memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;enckeylen = keylen;</div><div class='del'>-</div><div class='del'>-	ret = gcm_set_sh_desc(aead);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dma_unmap_single(jrdev, ctx-&gt;key_dma, ctx-&gt;enckeylen,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	}</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;key_dma, keylen, DMA_TO_DEVICE);</div><div class='add'>+	ctx-&gt;cdata.keylen = keylen;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return gcm_set_sh_desc(aead);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rfc4106_setkey(struct crypto_aead *aead,</div><div class='hunk'>@@ -1428,7 +596,6 @@ static int rfc4106_setkey(struct crypto_aead *aead,</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (keylen &lt; 4)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1444,22 +611,10 @@ static int rfc4106_setkey(struct crypto_aead *aead,</div><div class='ctx'> 	 * The last four bytes of the key material are used as the salt value</div><div class='ctx'> 	 * in the nonce. Update the AES key length.</div><div class='ctx'> 	 */</div><div class='del'>-	ctx-&gt;enckeylen = keylen - 4;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;key_dma = dma_map_single(jrdev, ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-				      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;key_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map key i/o memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = rfc4106_set_sh_desc(aead);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dma_unmap_single(jrdev, ctx-&gt;key_dma, ctx-&gt;enckeylen,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	ctx-&gt;cdata.keylen = keylen - 4;</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;key_dma, ctx-&gt;cdata.keylen,</div><div class='add'>+				   DMA_TO_DEVICE);</div><div class='add'>+	return rfc4106_set_sh_desc(aead);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rfc4543_setkey(struct crypto_aead *aead,</div><div class='hunk'>@@ -1467,7 +622,6 @@ static int rfc4543_setkey(struct crypto_aead *aead,</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_aead_ctx(aead);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (keylen &lt; 4)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1483,43 +637,28 @@ static int rfc4543_setkey(struct crypto_aead *aead,</div><div class='ctx'> 	 * The last four bytes of the key material are used as the salt value</div><div class='ctx'> 	 * in the nonce. Update the AES key length.</div><div class='ctx'> 	 */</div><div class='del'>-	ctx-&gt;enckeylen = keylen - 4;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;key_dma = dma_map_single(jrdev, ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-				      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;key_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map key i/o memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = rfc4543_set_sh_desc(aead);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dma_unmap_single(jrdev, ctx-&gt;key_dma, ctx-&gt;enckeylen,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	ctx-&gt;cdata.keylen = keylen - 4;</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;key_dma, ctx-&gt;cdata.keylen,</div><div class='add'>+				   DMA_TO_DEVICE);</div><div class='add'>+	return rfc4543_set_sh_desc(aead);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,</div><div class='ctx'> 			     const u8 *key, unsigned int keylen)</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_ablkcipher_ctx(ablkcipher);</div><div class='del'>-	struct ablkcipher_tfm *crt = &amp;ablkcipher-&gt;base.crt_ablkcipher;</div><div class='ctx'> 	struct crypto_tfm *tfm = crypto_ablkcipher_tfm(ablkcipher);</div><div class='ctx'> 	const char *alg_name = crypto_tfm_alg_name(tfm);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u32 *key_jump_cmd;</div><div class='add'>+	unsigned int ivsize = crypto_ablkcipher_ivsize(ablkcipher);</div><div class='ctx'> 	u32 *desc;</div><div class='del'>-	u8 *nonce;</div><div class='del'>-	u32 geniv;</div><div class='ctx'> 	u32 ctx1_iv_off = 0;</div><div class='del'>-	const bool ctr_mode = ((ctx-&gt;class1_alg_type &amp; OP_ALG_AAI_MASK) ==</div><div class='add'>+	const bool ctr_mode = ((ctx-&gt;cdata.algtype &amp; OP_ALG_AAI_MASK) ==</div><div class='ctx'> 			       OP_ALG_AAI_CTR_MOD128);</div><div class='ctx'> 	const bool is_rfc3686 = (ctr_mode &amp;&amp;</div><div class='ctx'> 				 (strstr(alg_name, "rfc3686") != NULL));</div><div class='ctx'> </div><div class='add'>+	memcpy(ctx-&gt;key, key, keylen);</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	print_hex_dump(KERN_ERR, "key in @"__stringify(__LINE__)": ",</div><div class='ctx'> 		       DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1);</div><div class='hunk'>@@ -1542,215 +681,33 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,</div><div class='ctx'> 		keylen -= CTR_RFC3686_NONCE_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(ctx-&gt;key, key, keylen);</div><div class='del'>-	ctx-&gt;key_dma = dma_map_single(jrdev, ctx-&gt;key, keylen,</div><div class='del'>-				      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;key_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map key i/o memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;enckeylen = keylen;</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;key_dma, keylen, DMA_TO_DEVICE);</div><div class='add'>+	ctx-&gt;cdata.keylen = keylen;</div><div class='add'>+	ctx-&gt;cdata.key_virt = ctx-&gt;key;</div><div class='add'>+	ctx-&gt;cdata.key_inline = true;</div><div class='ctx'> </div><div class='ctx'> 	/* ablkcipher_encrypt shared descriptor */</div><div class='ctx'> 	desc = ctx-&gt;sh_desc_enc;</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='del'>-	/* Skip if already shared */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-				   JUMP_COND_SHRD);</div><div class='del'>-</div><div class='del'>-	/* Load class1 key only */</div><div class='del'>-	append_key_as_imm(desc, (void *)ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-			  ctx-&gt;enckeylen, CLASS_1 |</div><div class='del'>-			  KEY_DEST_CLASS_REG);</div><div class='add'>+	cnstr_shdsc_ablkcipher_encap(desc, &amp;ctx-&gt;cdata, ivsize, is_rfc3686,</div><div class='add'>+				     ctx1_iv_off);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_enc_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-	/* Load nonce into CONTEXT1 reg */</div><div class='del'>-	if (is_rfc3686) {</div><div class='del'>-		nonce = (u8 *)key + keylen;</div><div class='del'>-		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,</div><div class='del'>-				   LDST_CLASS_IND_CCB |</div><div class='del'>-				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);</div><div class='del'>-		append_move(desc, MOVE_WAITCOMP |</div><div class='del'>-			    MOVE_SRC_OUTFIFO |</div><div class='del'>-			    MOVE_DEST_CLASS1CTX |</div><div class='del'>-			    (16 &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='del'>-			    (CTR_RFC3686_NONCE_SIZE &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* Load iv */</div><div class='del'>-	append_seq_load(desc, crt-&gt;ivsize, LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-			LDST_CLASS_1_CCB | (ctx1_iv_off &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Load counter into CONTEXT1 reg */</div><div class='del'>-	if (is_rfc3686)</div><div class='del'>-		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='del'>-				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='del'>-				      LDST_OFFSET_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Load operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT);</div><div class='del'>-</div><div class='del'>-	/* Perform operation */</div><div class='del'>-	ablkcipher_append_src_dst(desc);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_enc_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_enc_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "ablkcipher enc shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='ctx'> 	/* ablkcipher_decrypt shared descriptor */</div><div class='ctx'> 	desc = ctx-&gt;sh_desc_dec;</div><div class='add'>+	cnstr_shdsc_ablkcipher_decap(desc, &amp;ctx-&gt;cdata, ivsize, is_rfc3686,</div><div class='add'>+				     ctx1_iv_off);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_dec_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='del'>-	/* Skip if already shared */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-				   JUMP_COND_SHRD);</div><div class='del'>-</div><div class='del'>-	/* Load class1 key only */</div><div class='del'>-	append_key_as_imm(desc, (void *)ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-			  ctx-&gt;enckeylen, CLASS_1 |</div><div class='del'>-			  KEY_DEST_CLASS_REG);</div><div class='del'>-</div><div class='del'>-	/* Load nonce into CONTEXT1 reg */</div><div class='del'>-	if (is_rfc3686) {</div><div class='del'>-		nonce = (u8 *)key + keylen;</div><div class='del'>-		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,</div><div class='del'>-				   LDST_CLASS_IND_CCB |</div><div class='del'>-				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);</div><div class='del'>-		append_move(desc, MOVE_WAITCOMP |</div><div class='del'>-			    MOVE_SRC_OUTFIFO |</div><div class='del'>-			    MOVE_DEST_CLASS1CTX |</div><div class='del'>-			    (16 &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='del'>-			    (CTR_RFC3686_NONCE_SIZE &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* load IV */</div><div class='del'>-	append_seq_load(desc, crt-&gt;ivsize, LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-			LDST_CLASS_1_CCB | (ctx1_iv_off &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Load counter into CONTEXT1 reg */</div><div class='del'>-	if (is_rfc3686)</div><div class='del'>-		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='del'>-				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='del'>-				      LDST_OFFSET_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Choose operation */</div><div class='del'>-	if (ctr_mode)</div><div class='del'>-		append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-				 OP_ALG_AS_INITFINAL | OP_ALG_DECRYPT);</div><div class='del'>-	else</div><div class='del'>-		append_dec_op1(desc, ctx-&gt;class1_alg_type);</div><div class='del'>-</div><div class='del'>-	/* Perform operation */</div><div class='del'>-	ablkcipher_append_src_dst(desc);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_dec_dma = dma_map_single(jrdev, desc,</div><div class='del'>-					      desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_dec_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "ablkcipher dec shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='ctx'> 	/* ablkcipher_givencrypt shared descriptor */</div><div class='ctx'> 	desc = ctx-&gt;sh_desc_givenc;</div><div class='add'>+	cnstr_shdsc_ablkcipher_givencap(desc, &amp;ctx-&gt;cdata, ivsize, is_rfc3686,</div><div class='add'>+					ctx1_iv_off);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_givenc_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='del'>-	/* Skip if already shared */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-				   JUMP_COND_SHRD);</div><div class='del'>-</div><div class='del'>-	/* Load class1 key only */</div><div class='del'>-	append_key_as_imm(desc, (void *)ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-			  ctx-&gt;enckeylen, CLASS_1 |</div><div class='del'>-			  KEY_DEST_CLASS_REG);</div><div class='del'>-</div><div class='del'>-	/* Load Nonce into CONTEXT1 reg */</div><div class='del'>-	if (is_rfc3686) {</div><div class='del'>-		nonce = (u8 *)key + keylen;</div><div class='del'>-		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,</div><div class='del'>-				   LDST_CLASS_IND_CCB |</div><div class='del'>-				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);</div><div class='del'>-		append_move(desc, MOVE_WAITCOMP |</div><div class='del'>-			    MOVE_SRC_OUTFIFO |</div><div class='del'>-			    MOVE_DEST_CLASS1CTX |</div><div class='del'>-			    (16 &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='del'>-			    (CTR_RFC3686_NONCE_SIZE &lt;&lt; MOVE_LEN_SHIFT));</div><div class='del'>-	}</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/* Generate IV */</div><div class='del'>-	geniv = NFIFOENTRY_STYPE_PAD | NFIFOENTRY_DEST_DECO |</div><div class='del'>-		NFIFOENTRY_DTYPE_MSG | NFIFOENTRY_LC1 |</div><div class='del'>-		NFIFOENTRY_PTYPE_RND | (crt-&gt;ivsize &lt;&lt; NFIFOENTRY_DLEN_SHIFT);</div><div class='del'>-	append_load_imm_u32(desc, geniv, LDST_CLASS_IND_CCB |</div><div class='del'>-			    LDST_SRCDST_WORD_INFO_FIFO | LDST_IMM);</div><div class='del'>-	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='del'>-	append_move(desc, MOVE_WAITCOMP |</div><div class='del'>-		    MOVE_SRC_INFIFO |</div><div class='del'>-		    MOVE_DEST_CLASS1CTX |</div><div class='del'>-		    (crt-&gt;ivsize &lt;&lt; MOVE_LEN_SHIFT) |</div><div class='del'>-		    (ctx1_iv_off &lt;&lt; MOVE_OFFSET_SHIFT));</div><div class='del'>-	append_cmd(desc, CMD_LOAD | ENABLE_AUTO_INFO_FIFO);</div><div class='del'>-</div><div class='del'>-	/* Copy generated IV to memory */</div><div class='del'>-	append_seq_store(desc, crt-&gt;ivsize,</div><div class='del'>-			 LDST_SRCDST_BYTE_CONTEXT | LDST_CLASS_1_CCB |</div><div class='del'>-			 (ctx1_iv_off &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Load Counter into CONTEXT1 reg */</div><div class='del'>-	if (is_rfc3686)</div><div class='del'>-		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='del'>-				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='del'>-				      LDST_OFFSET_SHIFT));</div><div class='del'>-</div><div class='del'>-	if (ctx1_iv_off)</div><div class='del'>-		append_jump(desc, JUMP_JSL | JUMP_TEST_ALL | JUMP_COND_NCP |</div><div class='del'>-			    (1 &lt;&lt; JUMP_OFFSET_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Load operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class1_alg_type |</div><div class='del'>-			 OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT);</div><div class='del'>-</div><div class='del'>-	/* Perform operation */</div><div class='del'>-	ablkcipher_append_src_dst(desc);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_givenc_dma = dma_map_single(jrdev, desc,</div><div class='del'>-						 desc_bytes(desc),</div><div class='del'>-						 DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_givenc_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "ablkcipher givenc shdesc@" __stringify(__LINE__) ": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,</div><div class='hunk'>@@ -1758,8 +715,7 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_ablkcipher_ctx(ablkcipher);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	u32 *key_jump_cmd, *desc;</div><div class='del'>-	__be64 sector_size = cpu_to_be64(512);</div><div class='add'>+	u32 *desc;</div><div class='ctx'> </div><div class='ctx'> 	if (keylen != 2 * AES_MIN_KEY_SIZE  &amp;&amp; keylen != 2 * AES_MAX_KEY_SIZE) {</div><div class='ctx'> 		crypto_ablkcipher_set_flags(ablkcipher,</div><div class='hunk'>@@ -1769,126 +725,38 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ctx-&gt;key, key, keylen);</div><div class='del'>-	ctx-&gt;key_dma = dma_map_single(jrdev, ctx-&gt;key, keylen, DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;key_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map key i/o memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;enckeylen = keylen;</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;key_dma, keylen, DMA_TO_DEVICE);</div><div class='add'>+	ctx-&gt;cdata.keylen = keylen;</div><div class='add'>+	ctx-&gt;cdata.key_virt = ctx-&gt;key;</div><div class='add'>+	ctx-&gt;cdata.key_inline = true;</div><div class='ctx'> </div><div class='ctx'> 	/* xts_ablkcipher_encrypt shared descriptor */</div><div class='ctx'> 	desc = ctx-&gt;sh_desc_enc;</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='del'>-	/* Skip if already shared */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-				   JUMP_COND_SHRD);</div><div class='del'>-</div><div class='del'>-	/* Load class1 keys only */</div><div class='del'>-	append_key_as_imm(desc, (void *)ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-			  ctx-&gt;enckeylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-</div><div class='del'>-	/* Load sector size with index 40 bytes (0x28) */</div><div class='del'>-	append_cmd(desc, CMD_LOAD | IMMEDIATE | LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-		   LDST_CLASS_1_CCB | (0x28 &lt;&lt; LDST_OFFSET_SHIFT) | 8);</div><div class='del'>-	append_data(desc, (void *)&amp;sector_size, 8);</div><div class='del'>-</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * create sequence for loading the sector index</div><div class='del'>-	 * Upper 8B of IV - will be used as sector index</div><div class='del'>-	 * Lower 8B of IV - will be discarded</div><div class='del'>-	 */</div><div class='del'>-	append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-		   LDST_CLASS_1_CCB | (0x20 &lt;&lt; LDST_OFFSET_SHIFT) | 8);</div><div class='del'>-	append_seq_fifo_load(desc, 8, FIFOLD_CLASS_SKIP);</div><div class='del'>-</div><div class='del'>-	/* Load operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;class1_alg_type | OP_ALG_AS_INITFINAL |</div><div class='del'>-			 OP_ALG_ENCRYPT);</div><div class='del'>-</div><div class='del'>-	/* Perform operation */</div><div class='del'>-	ablkcipher_append_src_dst(desc);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_enc_dma = dma_map_single(jrdev, desc, desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_enc_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "xts ablkcipher enc shdesc@" __stringify(__LINE__) ": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	cnstr_shdsc_xts_ablkcipher_encap(desc, &amp;ctx-&gt;cdata);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_enc_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* xts_ablkcipher_decrypt shared descriptor */</div><div class='ctx'> 	desc = ctx-&gt;sh_desc_dec;</div><div class='del'>-</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='del'>-	/* Skip if already shared */</div><div class='del'>-	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-				   JUMP_COND_SHRD);</div><div class='del'>-</div><div class='del'>-	/* Load class1 key only */</div><div class='del'>-	append_key_as_imm(desc, (void *)ctx-&gt;key, ctx-&gt;enckeylen,</div><div class='del'>-			  ctx-&gt;enckeylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='del'>-</div><div class='del'>-	/* Load sector size with index 40 bytes (0x28) */</div><div class='del'>-	append_cmd(desc, CMD_LOAD | IMMEDIATE | LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-		   LDST_CLASS_1_CCB | (0x28 &lt;&lt; LDST_OFFSET_SHIFT) | 8);</div><div class='del'>-	append_data(desc, (void *)&amp;sector_size, 8);</div><div class='del'>-</div><div class='del'>-	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * create sequence for loading the sector index</div><div class='del'>-	 * Upper 8B of IV - will be used as sector index</div><div class='del'>-	 * Lower 8B of IV - will be discarded</div><div class='del'>-	 */</div><div class='del'>-	append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-		   LDST_CLASS_1_CCB | (0x20 &lt;&lt; LDST_OFFSET_SHIFT) | 8);</div><div class='del'>-	append_seq_fifo_load(desc, 8, FIFOLD_CLASS_SKIP);</div><div class='del'>-</div><div class='del'>-	/* Load operation */</div><div class='del'>-	append_dec_op1(desc, ctx-&gt;class1_alg_type);</div><div class='del'>-</div><div class='del'>-	/* Perform operation */</div><div class='del'>-	ablkcipher_append_src_dst(desc);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_dec_dma = dma_map_single(jrdev, desc, desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_dec_dma)) {</div><div class='del'>-		dma_unmap_single(jrdev, ctx-&gt;sh_desc_enc_dma,</div><div class='del'>-				 desc_bytes(ctx-&gt;sh_desc_enc), DMA_TO_DEVICE);</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR,</div><div class='del'>-		       "xts ablkcipher dec shdesc@" __stringify(__LINE__) ": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='add'>+	cnstr_shdsc_xts_ablkcipher_decap(desc, &amp;ctx-&gt;cdata);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_dec_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * aead_edesc - s/w-extended aead descriptor</div><div class='del'>- * @assoc_nents: number of segments in associated data (SPI+Seq) scatterlist</div><div class='del'>- * @src_nents: number of segments in input scatterlist</div><div class='del'>- * @dst_nents: number of segments in output scatterlist</div><div class='del'>- * @iv_dma: dma address of iv for checking continuity and link table</div><div class='del'>- * @desc: h/w descriptor (variable length; must not exceed MAX_CAAM_DESCSIZE)</div><div class='add'>+ * @src_nents: number of segments in input s/w scatterlist</div><div class='add'>+ * @dst_nents: number of segments in output s/w scatterlist</div><div class='ctx'>  * @sec4_sg_bytes: length of dma mapped sec4_sg space</div><div class='ctx'>  * @sec4_sg_dma: bus physical mapped address of h/w link table</div><div class='add'>+ * @sec4_sg: pointer to h/w link table</div><div class='ctx'>  * @hw_desc: the h/w job descriptor followed by any referenced link tables</div><div class='ctx'>  */</div><div class='ctx'> struct aead_edesc {</div><div class='del'>-	int assoc_nents;</div><div class='ctx'> 	int src_nents;</div><div class='ctx'> 	int dst_nents;</div><div class='del'>-	dma_addr_t iv_dma;</div><div class='ctx'> 	int sec4_sg_bytes;</div><div class='ctx'> 	dma_addr_t sec4_sg_dma;</div><div class='ctx'> 	struct sec4_sg_entry *sec4_sg;</div><div class='hunk'>@@ -1897,12 +765,12 @@ struct aead_edesc {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ablkcipher_edesc - s/w-extended ablkcipher descriptor</div><div class='del'>- * @src_nents: number of segments in input scatterlist</div><div class='del'>- * @dst_nents: number of segments in output scatterlist</div><div class='add'>+ * @src_nents: number of segments in input s/w scatterlist</div><div class='add'>+ * @dst_nents: number of segments in output s/w scatterlist</div><div class='ctx'>  * @iv_dma: dma address of iv for checking continuity and link table</div><div class='del'>- * @desc: h/w descriptor (variable length; must not exceed MAX_CAAM_DESCSIZE)</div><div class='ctx'>  * @sec4_sg_bytes: length of dma mapped sec4_sg space</div><div class='ctx'>  * @sec4_sg_dma: bus physical mapped address of h/w link table</div><div class='add'>+ * @sec4_sg: pointer to h/w link table</div><div class='ctx'>  * @hw_desc: the h/w job descriptor followed by any referenced link tables</div><div class='ctx'>  */</div><div class='ctx'> struct ablkcipher_edesc {</div><div class='hunk'>@@ -1922,10 +790,11 @@ static void caam_unmap(struct device *dev, struct scatterlist *src,</div><div class='ctx'> 		       int sec4_sg_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	if (dst != src) {</div><div class='del'>-		dma_unmap_sg(dev, src, src_nents ? : 1, DMA_TO_DEVICE);</div><div class='del'>-		dma_unmap_sg(dev, dst, dst_nents ? : 1, DMA_FROM_DEVICE);</div><div class='add'>+		if (src_nents)</div><div class='add'>+			dma_unmap_sg(dev, src, src_nents, DMA_TO_DEVICE);</div><div class='add'>+		dma_unmap_sg(dev, dst, dst_nents, DMA_FROM_DEVICE);</div><div class='ctx'> 	} else {</div><div class='del'>-		dma_unmap_sg(dev, src, src_nents ? : 1, DMA_BIDIRECTIONAL);</div><div class='add'>+		dma_unmap_sg(dev, src, src_nents, DMA_BIDIRECTIONAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (iv_dma)</div><div class='hunk'>@@ -2019,8 +888,7 @@ static void ablkcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err,</div><div class='ctx'> 	dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	edesc = (struct ablkcipher_edesc *)((char *)desc -</div><div class='del'>-		 offsetof(struct ablkcipher_edesc, hw_desc));</div><div class='add'>+	edesc = container_of(desc, struct ablkcipher_edesc, hw_desc[0]);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		caam_jr_strstatus(jrdev, err);</div><div class='hunk'>@@ -2031,7 +899,7 @@ static void ablkcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err,</div><div class='ctx'> 		       edesc-&gt;src_nents &gt; 1 ? 100 : ivsize, 1);</div><div class='ctx'> 	dbg_dump_sg(KERN_ERR, "dst    @"__stringify(__LINE__)": ",</div><div class='ctx'> 		    DUMP_PREFIX_ADDRESS, 16, 4, req-&gt;dst,</div><div class='del'>-		    edesc-&gt;dst_nents &gt; 1 ? 100 : req-&gt;nbytes, 1, true);</div><div class='add'>+		    edesc-&gt;dst_nents &gt; 1 ? 100 : req-&gt;nbytes, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	ablkcipher_unmap(jrdev, edesc, req);</div><div class='hunk'>@@ -2052,8 +920,7 @@ static void ablkcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err,</div><div class='ctx'> 	dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	edesc = (struct ablkcipher_edesc *)((char *)desc -</div><div class='del'>-		 offsetof(struct ablkcipher_edesc, hw_desc));</div><div class='add'>+	edesc = container_of(desc, struct ablkcipher_edesc, hw_desc[0]);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		caam_jr_strstatus(jrdev, err);</div><div class='ctx'> </div><div class='hunk'>@@ -2063,7 +930,7 @@ static void ablkcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err,</div><div class='ctx'> 		       ivsize, 1);</div><div class='ctx'> 	dbg_dump_sg(KERN_ERR, "dst    @"__stringify(__LINE__)": ",</div><div class='ctx'> 		    DUMP_PREFIX_ADDRESS, 16, 4, req-&gt;dst,</div><div class='del'>-		    edesc-&gt;dst_nents &gt; 1 ? 100 : req-&gt;nbytes, 1, true);</div><div class='add'>+		    edesc-&gt;dst_nents &gt; 1 ? 100 : req-&gt;nbytes, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	ablkcipher_unmap(jrdev, edesc, req);</div><div class='hunk'>@@ -2096,7 +963,7 @@ static void init_aead_job(struct aead_request *req,</div><div class='ctx'> 	init_job_desc_shared(desc, ptr, len, HDR_SHARE_DEFER | HDR_REVERSE);</div><div class='ctx'> </div><div class='ctx'> 	if (all_contig) {</div><div class='del'>-		src_dma = sg_dma_address(req-&gt;src);</div><div class='add'>+		src_dma = edesc-&gt;src_nents ? sg_dma_address(req-&gt;src) : 0;</div><div class='ctx'> 		in_options = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		src_dma = edesc-&gt;sec4_sg_dma;</div><div class='hunk'>@@ -2111,7 +978,7 @@ static void init_aead_job(struct aead_request *req,</div><div class='ctx'> 	out_options = in_options;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(req-&gt;src != req-&gt;dst)) {</div><div class='del'>-		if (!edesc-&gt;dst_nents) {</div><div class='add'>+		if (edesc-&gt;dst_nents == 1) {</div><div class='ctx'> 			dst_dma = sg_dma_address(req-&gt;dst);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dst_dma = edesc-&gt;sec4_sg_dma +</div><div class='hunk'>@@ -2157,7 +1024,7 @@ static void init_gcm_job(struct aead_request *req,</div><div class='ctx'> 			 FIFOLD_TYPE_IV | FIFOLD_TYPE_FLUSH1 | 12 | last);</div><div class='ctx'> 	/* Append Salt */</div><div class='ctx'> 	if (!generic_gcm)</div><div class='del'>-		append_data(desc, ctx-&gt;key + ctx-&gt;enckeylen, 4);</div><div class='add'>+		append_data(desc, ctx-&gt;key + ctx-&gt;cdata.keylen, 4);</div><div class='ctx'> 	/* Append IV */</div><div class='ctx'> 	append_data(desc, req-&gt;iv, ivsize);</div><div class='ctx'> 	/* End of blank commands */</div><div class='hunk'>@@ -2172,7 +1039,7 @@ static void init_authenc_job(struct aead_request *req,</div><div class='ctx'> 						 struct caam_aead_alg, aead);</div><div class='ctx'> 	unsigned int ivsize = crypto_aead_ivsize(aead);</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_aead_ctx(aead);</div><div class='del'>-	const bool ctr_mode = ((ctx-&gt;class1_alg_type &amp; OP_ALG_AAI_MASK) ==</div><div class='add'>+	const bool ctr_mode = ((ctx-&gt;cdata.algtype &amp; OP_ALG_AAI_MASK) ==</div><div class='ctx'> 			       OP_ALG_AAI_CTR_MOD128);</div><div class='ctx'> 	const bool is_rfc3686 = alg-&gt;caam.rfc3686;</div><div class='ctx'> 	u32 *desc = edesc-&gt;hw_desc;</div><div class='hunk'>@@ -2218,15 +1085,14 @@ static void init_ablkcipher_job(u32 *sh_desc, dma_addr_t ptr,</div><div class='ctx'> 	int len, sec4_sg_index = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-	bool may_sleep = ((req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='del'>-					      CRYPTO_TFM_REQ_MAY_SLEEP)) != 0);</div><div class='ctx'> 	print_hex_dump(KERN_ERR, "presciv@"__stringify(__LINE__)": ",</div><div class='ctx'> 		       DUMP_PREFIX_ADDRESS, 16, 4, req-&gt;info,</div><div class='ctx'> 		       ivsize, 1);</div><div class='del'>-	printk(KERN_ERR "asked=%d, nbytes%d\n", (int)edesc-&gt;src_nents ? 100 : req-&gt;nbytes, req-&gt;nbytes);</div><div class='add'>+	pr_err("asked=%d, nbytes%d\n",</div><div class='add'>+	       (int)edesc-&gt;src_nents &gt; 1 ? 100 : req-&gt;nbytes, req-&gt;nbytes);</div><div class='ctx'> 	dbg_dump_sg(KERN_ERR, "src    @"__stringify(__LINE__)": ",</div><div class='ctx'> 		    DUMP_PREFIX_ADDRESS, 16, 4, req-&gt;src,</div><div class='del'>-		    edesc-&gt;src_nents ? 100 : req-&gt;nbytes, 1, may_sleep);</div><div class='add'>+		    edesc-&gt;src_nents &gt; 1 ? 100 : req-&gt;nbytes, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	len = desc_len(sh_desc);</div><div class='hunk'>@@ -2243,7 +1109,7 @@ static void init_ablkcipher_job(u32 *sh_desc, dma_addr_t ptr,</div><div class='ctx'> 	append_seq_in_ptr(desc, src_dma, req-&gt;nbytes + ivsize, in_options);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(req-&gt;src == req-&gt;dst)) {</div><div class='del'>-		if (!edesc-&gt;src_nents &amp;&amp; iv_contig) {</div><div class='add'>+		if (edesc-&gt;src_nents == 1 &amp;&amp; iv_contig) {</div><div class='ctx'> 			dst_dma = sg_dma_address(req-&gt;src);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dst_dma = edesc-&gt;sec4_sg_dma +</div><div class='hunk'>@@ -2251,7 +1117,7 @@ static void init_ablkcipher_job(u32 *sh_desc, dma_addr_t ptr,</div><div class='ctx'> 			out_options = LDST_SGF;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (!edesc-&gt;dst_nents) {</div><div class='add'>+		if (edesc-&gt;dst_nents == 1) {</div><div class='ctx'> 			dst_dma = sg_dma_address(req-&gt;dst);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dst_dma = edesc-&gt;sec4_sg_dma +</div><div class='hunk'>@@ -2278,20 +1144,18 @@ static void init_ablkcipher_giv_job(u32 *sh_desc, dma_addr_t ptr,</div><div class='ctx'> 	int len, sec4_sg_index = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-	bool may_sleep = ((req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='del'>-					      CRYPTO_TFM_REQ_MAY_SLEEP)) != 0);</div><div class='ctx'> 	print_hex_dump(KERN_ERR, "presciv@" __stringify(__LINE__) ": ",</div><div class='ctx'> 		       DUMP_PREFIX_ADDRESS, 16, 4, req-&gt;info,</div><div class='ctx'> 		       ivsize, 1);</div><div class='ctx'> 	dbg_dump_sg(KERN_ERR, "src    @" __stringify(__LINE__) ": ",</div><div class='ctx'> 		    DUMP_PREFIX_ADDRESS, 16, 4, req-&gt;src,</div><div class='del'>-		    edesc-&gt;src_nents ? 100 : req-&gt;nbytes, 1, may_sleep);</div><div class='add'>+		    edesc-&gt;src_nents &gt; 1 ? 100 : req-&gt;nbytes, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	len = desc_len(sh_desc);</div><div class='ctx'> 	init_job_desc_shared(desc, ptr, len, HDR_SHARE_DEFER | HDR_REVERSE);</div><div class='ctx'> </div><div class='del'>-	if (!edesc-&gt;src_nents) {</div><div class='add'>+	if (edesc-&gt;src_nents == 1) {</div><div class='ctx'> 		src_dma = sg_dma_address(req-&gt;src);</div><div class='ctx'> 		in_options = 0;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2324,85 +1188,98 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req,</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='ctx'> 	gfp_t flags = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='del'>-	int src_nents, dst_nents = 0;</div><div class='add'>+	int src_nents, mapped_src_nents, dst_nents = 0, mapped_dst_nents = 0;</div><div class='ctx'> 	struct aead_edesc *edesc;</div><div class='del'>-	int sgc;</div><div class='del'>-	bool all_contig = true;</div><div class='del'>-	int sec4_sg_index, sec4_sg_len = 0, sec4_sg_bytes;</div><div class='add'>+	int sec4_sg_index, sec4_sg_len, sec4_sg_bytes;</div><div class='ctx'> 	unsigned int authsize = ctx-&gt;authsize;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(req-&gt;dst != req-&gt;src)) {</div><div class='del'>-		src_nents = sg_count(req-&gt;src, req-&gt;assoclen + req-&gt;cryptlen);</div><div class='del'>-		dst_nents = sg_count(req-&gt;dst,</div><div class='del'>-				     req-&gt;assoclen + req-&gt;cryptlen +</div><div class='del'>-					(encrypt ? authsize : (-authsize)));</div><div class='del'>-	} else {</div><div class='del'>-		src_nents = sg_count(req-&gt;src,</div><div class='del'>-				     req-&gt;assoclen + req-&gt;cryptlen +</div><div class='del'>-					(encrypt ? authsize : 0));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check if data are contiguous. */</div><div class='del'>-	all_contig = !src_nents;</div><div class='del'>-	if (!all_contig) {</div><div class='del'>-		src_nents = src_nents ? : 1;</div><div class='del'>-		sec4_sg_len = src_nents;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sec4_sg_len += dst_nents;</div><div class='del'>-</div><div class='del'>-	sec4_sg_bytes = sec4_sg_len * sizeof(struct sec4_sg_entry);</div><div class='add'>+		src_nents = sg_nents_for_len(req-&gt;src, req-&gt;assoclen +</div><div class='add'>+					     req-&gt;cryptlen);</div><div class='add'>+		if (unlikely(src_nents &lt; 0)) {</div><div class='add'>+			dev_err(jrdev, "Insufficient bytes (%d) in src S/G\n",</div><div class='add'>+				req-&gt;assoclen + req-&gt;cryptlen);</div><div class='add'>+			return ERR_PTR(src_nents);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* allocate space for base edesc and hw desc commands, link tables */</div><div class='del'>-	edesc = kzalloc(sizeof(*edesc) + desc_bytes + sec4_sg_bytes,</div><div class='del'>-			GFP_DMA | flags);</div><div class='del'>-	if (!edesc) {</div><div class='del'>-		dev_err(jrdev, "could not allocate extended descriptor\n");</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+		dst_nents = sg_nents_for_len(req-&gt;dst, req-&gt;assoclen +</div><div class='add'>+					     req-&gt;cryptlen +</div><div class='add'>+						(encrypt ? authsize :</div><div class='add'>+							   (-authsize)));</div><div class='add'>+		if (unlikely(dst_nents &lt; 0)) {</div><div class='add'>+			dev_err(jrdev, "Insufficient bytes (%d) in dst S/G\n",</div><div class='add'>+				req-&gt;assoclen + req-&gt;cryptlen +</div><div class='add'>+				(encrypt ? authsize : (-authsize)));</div><div class='add'>+			return ERR_PTR(dst_nents);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		src_nents = sg_nents_for_len(req-&gt;src, req-&gt;assoclen +</div><div class='add'>+					     req-&gt;cryptlen +</div><div class='add'>+					     (encrypt ? authsize : 0));</div><div class='add'>+		if (unlikely(src_nents &lt; 0)) {</div><div class='add'>+			dev_err(jrdev, "Insufficient bytes (%d) in src S/G\n",</div><div class='add'>+				req-&gt;assoclen + req-&gt;cryptlen +</div><div class='add'>+				(encrypt ? authsize : 0));</div><div class='add'>+			return ERR_PTR(src_nents);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (likely(req-&gt;src == req-&gt;dst)) {</div><div class='del'>-		sgc = dma_map_sg(jrdev, req-&gt;src, src_nents ? : 1,</div><div class='del'>-				 DMA_BIDIRECTIONAL);</div><div class='del'>-		if (unlikely(!sgc)) {</div><div class='add'>+		mapped_src_nents = dma_map_sg(jrdev, req-&gt;src, src_nents,</div><div class='add'>+					      DMA_BIDIRECTIONAL);</div><div class='add'>+		if (unlikely(!mapped_src_nents)) {</div><div class='ctx'> 			dev_err(jrdev, "unable to map source\n");</div><div class='del'>-			kfree(edesc);</div><div class='ctx'> 			return ERR_PTR(-ENOMEM);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		sgc = dma_map_sg(jrdev, req-&gt;src, src_nents ? : 1,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-		if (unlikely(!sgc)) {</div><div class='del'>-			dev_err(jrdev, "unable to map source\n");</div><div class='del'>-			kfree(edesc);</div><div class='del'>-			return ERR_PTR(-ENOMEM);</div><div class='add'>+		/* Cover also the case of null (zero length) input data */</div><div class='add'>+		if (src_nents) {</div><div class='add'>+			mapped_src_nents = dma_map_sg(jrdev, req-&gt;src,</div><div class='add'>+						      src_nents, DMA_TO_DEVICE);</div><div class='add'>+			if (unlikely(!mapped_src_nents)) {</div><div class='add'>+				dev_err(jrdev, "unable to map source\n");</div><div class='add'>+				return ERR_PTR(-ENOMEM);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			mapped_src_nents = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sgc = dma_map_sg(jrdev, req-&gt;dst, dst_nents ? : 1,</div><div class='del'>-				 DMA_FROM_DEVICE);</div><div class='del'>-		if (unlikely(!sgc)) {</div><div class='add'>+		mapped_dst_nents = dma_map_sg(jrdev, req-&gt;dst, dst_nents,</div><div class='add'>+					      DMA_FROM_DEVICE);</div><div class='add'>+		if (unlikely(!mapped_dst_nents)) {</div><div class='ctx'> 			dev_err(jrdev, "unable to map destination\n");</div><div class='del'>-			dma_unmap_sg(jrdev, req-&gt;src, src_nents ? : 1,</div><div class='del'>-				     DMA_TO_DEVICE);</div><div class='del'>-			kfree(edesc);</div><div class='add'>+			dma_unmap_sg(jrdev, req-&gt;src, src_nents, DMA_TO_DEVICE);</div><div class='ctx'> 			return ERR_PTR(-ENOMEM);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	sec4_sg_len = mapped_src_nents &gt; 1 ? mapped_src_nents : 0;</div><div class='add'>+	sec4_sg_len += mapped_dst_nents &gt; 1 ? mapped_dst_nents : 0;</div><div class='add'>+	sec4_sg_bytes = sec4_sg_len * sizeof(struct sec4_sg_entry);</div><div class='add'>+</div><div class='add'>+	/* allocate space for base edesc and hw desc commands, link tables */</div><div class='add'>+	edesc = kzalloc(sizeof(*edesc) + desc_bytes + sec4_sg_bytes,</div><div class='add'>+			GFP_DMA | flags);</div><div class='add'>+	if (!edesc) {</div><div class='add'>+		caam_unmap(jrdev, req-&gt;src, req-&gt;dst, src_nents, dst_nents, 0,</div><div class='add'>+			   0, 0, 0);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	edesc-&gt;src_nents = src_nents;</div><div class='ctx'> 	edesc-&gt;dst_nents = dst_nents;</div><div class='ctx'> 	edesc-&gt;sec4_sg = (void *)edesc + sizeof(struct aead_edesc) +</div><div class='ctx'> 			 desc_bytes;</div><div class='del'>-	*all_contig_ptr = all_contig;</div><div class='add'>+	*all_contig_ptr = !(mapped_src_nents &gt; 1);</div><div class='ctx'> </div><div class='ctx'> 	sec4_sg_index = 0;</div><div class='del'>-	if (!all_contig) {</div><div class='del'>-		sg_to_sec4_sg_last(req-&gt;src, src_nents,</div><div class='del'>-			      edesc-&gt;sec4_sg + sec4_sg_index, 0);</div><div class='del'>-		sec4_sg_index += src_nents;</div><div class='add'>+	if (mapped_src_nents &gt; 1) {</div><div class='add'>+		sg_to_sec4_sg_last(req-&gt;src, mapped_src_nents,</div><div class='add'>+				   edesc-&gt;sec4_sg + sec4_sg_index, 0);</div><div class='add'>+		sec4_sg_index += mapped_src_nents;</div><div class='ctx'> 	}</div><div class='del'>-	if (dst_nents) {</div><div class='del'>-		sg_to_sec4_sg_last(req-&gt;dst, dst_nents,</div><div class='add'>+	if (mapped_dst_nents &gt; 1) {</div><div class='add'>+		sg_to_sec4_sg_last(req-&gt;dst, mapped_dst_nents,</div><div class='ctx'> 				   edesc-&gt;sec4_sg + sec4_sg_index, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2556,11 +1433,9 @@ static int aead_decrypt(struct aead_request *req)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-	bool may_sleep = ((req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='del'>-					      CRYPTO_TFM_REQ_MAY_SLEEP)) != 0);</div><div class='ctx'> 	dbg_dump_sg(KERN_ERR, "dec src@"__stringify(__LINE__)": ",</div><div class='ctx'> 		    DUMP_PREFIX_ADDRESS, 16, 4, req-&gt;src,</div><div class='del'>-		    req-&gt;assoclen + req-&gt;cryptlen, 1, may_sleep);</div><div class='add'>+		    req-&gt;assoclen + req-&gt;cryptlen, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* allocate extended descriptor */</div><div class='hunk'>@@ -2602,51 +1477,80 @@ static struct ablkcipher_edesc *ablkcipher_edesc_alloc(struct ablkcipher_request</div><div class='ctx'> 	gfp_t flags = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 					  CRYPTO_TFM_REQ_MAY_SLEEP)) ?</div><div class='ctx'> 		       GFP_KERNEL : GFP_ATOMIC;</div><div class='del'>-	int src_nents, dst_nents = 0, sec4_sg_bytes;</div><div class='add'>+	int src_nents, mapped_src_nents, dst_nents = 0, mapped_dst_nents = 0;</div><div class='ctx'> 	struct ablkcipher_edesc *edesc;</div><div class='ctx'> 	dma_addr_t iv_dma = 0;</div><div class='del'>-	bool iv_contig = false;</div><div class='del'>-	int sgc;</div><div class='add'>+	bool in_contig;</div><div class='ctx'> 	int ivsize = crypto_ablkcipher_ivsize(ablkcipher);</div><div class='del'>-	int sec4_sg_index;</div><div class='add'>+	int dst_sg_idx, sec4_sg_ents, sec4_sg_bytes;</div><div class='ctx'> </div><div class='del'>-	src_nents = sg_count(req-&gt;src, req-&gt;nbytes);</div><div class='add'>+	src_nents = sg_nents_for_len(req-&gt;src, req-&gt;nbytes);</div><div class='add'>+	if (unlikely(src_nents &lt; 0)) {</div><div class='add'>+		dev_err(jrdev, "Insufficient bytes (%d) in src S/G\n",</div><div class='add'>+			req-&gt;nbytes);</div><div class='add'>+		return ERR_PTR(src_nents);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;dst != req-&gt;src)</div><div class='del'>-		dst_nents = sg_count(req-&gt;dst, req-&gt;nbytes);</div><div class='add'>+	if (req-&gt;dst != req-&gt;src) {</div><div class='add'>+		dst_nents = sg_nents_for_len(req-&gt;dst, req-&gt;nbytes);</div><div class='add'>+		if (unlikely(dst_nents &lt; 0)) {</div><div class='add'>+			dev_err(jrdev, "Insufficient bytes (%d) in dst S/G\n",</div><div class='add'>+				req-&gt;nbytes);</div><div class='add'>+			return ERR_PTR(dst_nents);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (likely(req-&gt;src == req-&gt;dst)) {</div><div class='del'>-		sgc = dma_map_sg(jrdev, req-&gt;src, src_nents ? : 1,</div><div class='del'>-				 DMA_BIDIRECTIONAL);</div><div class='add'>+		mapped_src_nents = dma_map_sg(jrdev, req-&gt;src, src_nents,</div><div class='add'>+					      DMA_BIDIRECTIONAL);</div><div class='add'>+		if (unlikely(!mapped_src_nents)) {</div><div class='add'>+			dev_err(jrdev, "unable to map source\n");</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		sgc = dma_map_sg(jrdev, req-&gt;src, src_nents ? : 1,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-		sgc = dma_map_sg(jrdev, req-&gt;dst, dst_nents ? : 1,</div><div class='del'>-				 DMA_FROM_DEVICE);</div><div class='add'>+		mapped_src_nents = dma_map_sg(jrdev, req-&gt;src, src_nents,</div><div class='add'>+					      DMA_TO_DEVICE);</div><div class='add'>+		if (unlikely(!mapped_src_nents)) {</div><div class='add'>+			dev_err(jrdev, "unable to map source\n");</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mapped_dst_nents = dma_map_sg(jrdev, req-&gt;dst, dst_nents,</div><div class='add'>+					      DMA_FROM_DEVICE);</div><div class='add'>+		if (unlikely(!mapped_dst_nents)) {</div><div class='add'>+			dev_err(jrdev, "unable to map destination\n");</div><div class='add'>+			dma_unmap_sg(jrdev, req-&gt;src, src_nents, DMA_TO_DEVICE);</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iv_dma = dma_map_single(jrdev, req-&gt;info, ivsize, DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(jrdev, iv_dma)) {</div><div class='ctx'> 		dev_err(jrdev, "unable to map IV\n");</div><div class='add'>+		caam_unmap(jrdev, req-&gt;src, req-&gt;dst, src_nents, dst_nents, 0,</div><div class='add'>+			   0, 0, 0);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Check if iv can be contiguous with source and destination.</div><div class='del'>-	 * If so, include it. If not, create scatterlist.</div><div class='del'>-	 */</div><div class='del'>-	if (!src_nents &amp;&amp; iv_dma + ivsize == sg_dma_address(req-&gt;src))</div><div class='del'>-		iv_contig = true;</div><div class='del'>-	else</div><div class='del'>-		src_nents = src_nents ? : 1;</div><div class='del'>-	sec4_sg_bytes = ((iv_contig ? 0 : 1) + src_nents + dst_nents) *</div><div class='del'>-			sizeof(struct sec4_sg_entry);</div><div class='add'>+	if (mapped_src_nents == 1 &amp;&amp;</div><div class='add'>+	    iv_dma + ivsize == sg_dma_address(req-&gt;src)) {</div><div class='add'>+		in_contig = true;</div><div class='add'>+		sec4_sg_ents = 0;</div><div class='add'>+	} else {</div><div class='add'>+		in_contig = false;</div><div class='add'>+		sec4_sg_ents = 1 + mapped_src_nents;</div><div class='add'>+	}</div><div class='add'>+	dst_sg_idx = sec4_sg_ents;</div><div class='add'>+	sec4_sg_ents += mapped_dst_nents &gt; 1 ? mapped_dst_nents : 0;</div><div class='add'>+	sec4_sg_bytes = sec4_sg_ents * sizeof(struct sec4_sg_entry);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate space for base edesc and hw desc commands, link tables */</div><div class='ctx'> 	edesc = kzalloc(sizeof(*edesc) + desc_bytes + sec4_sg_bytes,</div><div class='ctx'> 			GFP_DMA | flags);</div><div class='ctx'> 	if (!edesc) {</div><div class='ctx'> 		dev_err(jrdev, "could not allocate extended descriptor\n");</div><div class='add'>+		caam_unmap(jrdev, req-&gt;src, req-&gt;dst, src_nents, dst_nents,</div><div class='add'>+			   iv_dma, ivsize, 0, 0);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2656,23 +1560,24 @@ static struct ablkcipher_edesc *ablkcipher_edesc_alloc(struct ablkcipher_request</div><div class='ctx'> 	edesc-&gt;sec4_sg = (void *)edesc + sizeof(struct ablkcipher_edesc) +</div><div class='ctx'> 			 desc_bytes;</div><div class='ctx'> </div><div class='del'>-	sec4_sg_index = 0;</div><div class='del'>-	if (!iv_contig) {</div><div class='add'>+	if (!in_contig) {</div><div class='ctx'> 		dma_to_sec4_sg_one(edesc-&gt;sec4_sg, iv_dma, ivsize, 0);</div><div class='del'>-		sg_to_sec4_sg_last(req-&gt;src, src_nents,</div><div class='add'>+		sg_to_sec4_sg_last(req-&gt;src, mapped_src_nents,</div><div class='ctx'> 				   edesc-&gt;sec4_sg + 1, 0);</div><div class='del'>-		sec4_sg_index += 1 + src_nents;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dst_nents) {</div><div class='del'>-		sg_to_sec4_sg_last(req-&gt;dst, dst_nents,</div><div class='del'>-			edesc-&gt;sec4_sg + sec4_sg_index, 0);</div><div class='add'>+	if (mapped_dst_nents &gt; 1) {</div><div class='add'>+		sg_to_sec4_sg_last(req-&gt;dst, mapped_dst_nents,</div><div class='add'>+				   edesc-&gt;sec4_sg + dst_sg_idx, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	edesc-&gt;sec4_sg_dma = dma_map_single(jrdev, edesc-&gt;sec4_sg,</div><div class='ctx'> 					    sec4_sg_bytes, DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(jrdev, edesc-&gt;sec4_sg_dma)) {</div><div class='ctx'> 		dev_err(jrdev, "unable to map S/G table\n");</div><div class='add'>+		caam_unmap(jrdev, req-&gt;src, req-&gt;dst, src_nents, dst_nents,</div><div class='add'>+			   iv_dma, ivsize, 0, 0);</div><div class='add'>+		kfree(edesc);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2684,7 +1589,7 @@ static struct ablkcipher_edesc *ablkcipher_edesc_alloc(struct ablkcipher_request</div><div class='ctx'> 		       sec4_sg_bytes, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	*iv_contig_out = iv_contig;</div><div class='add'>+	*iv_contig_out = in_contig;</div><div class='ctx'> 	return edesc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2778,27 +1683,52 @@ static struct ablkcipher_edesc *ablkcipher_giv_edesc_alloc(</div><div class='ctx'> 	gfp_t flags = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 					  CRYPTO_TFM_REQ_MAY_SLEEP)) ?</div><div class='ctx'> 		       GFP_KERNEL : GFP_ATOMIC;</div><div class='del'>-	int src_nents, dst_nents = 0, sec4_sg_bytes;</div><div class='add'>+	int src_nents, mapped_src_nents, dst_nents, mapped_dst_nents;</div><div class='ctx'> 	struct ablkcipher_edesc *edesc;</div><div class='ctx'> 	dma_addr_t iv_dma = 0;</div><div class='del'>-	bool iv_contig = false;</div><div class='del'>-	int sgc;</div><div class='add'>+	bool out_contig;</div><div class='ctx'> 	int ivsize = crypto_ablkcipher_ivsize(ablkcipher);</div><div class='del'>-	int sec4_sg_index;</div><div class='add'>+	int dst_sg_idx, sec4_sg_ents, sec4_sg_bytes;</div><div class='ctx'> </div><div class='del'>-	src_nents = sg_count(req-&gt;src, req-&gt;nbytes);</div><div class='del'>-</div><div class='del'>-	if (unlikely(req-&gt;dst != req-&gt;src))</div><div class='del'>-		dst_nents = sg_count(req-&gt;dst, req-&gt;nbytes);</div><div class='add'>+	src_nents = sg_nents_for_len(req-&gt;src, req-&gt;nbytes);</div><div class='add'>+	if (unlikely(src_nents &lt; 0)) {</div><div class='add'>+		dev_err(jrdev, "Insufficient bytes (%d) in src S/G\n",</div><div class='add'>+			req-&gt;nbytes);</div><div class='add'>+		return ERR_PTR(src_nents);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (likely(req-&gt;src == req-&gt;dst)) {</div><div class='del'>-		sgc = dma_map_sg(jrdev, req-&gt;src, src_nents ? : 1,</div><div class='del'>-				 DMA_BIDIRECTIONAL);</div><div class='add'>+		mapped_src_nents = dma_map_sg(jrdev, req-&gt;src, src_nents,</div><div class='add'>+					      DMA_BIDIRECTIONAL);</div><div class='add'>+		if (unlikely(!mapped_src_nents)) {</div><div class='add'>+			dev_err(jrdev, "unable to map source\n");</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dst_nents = src_nents;</div><div class='add'>+		mapped_dst_nents = src_nents;</div><div class='ctx'> 	} else {</div><div class='del'>-		sgc = dma_map_sg(jrdev, req-&gt;src, src_nents ? : 1,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-		sgc = dma_map_sg(jrdev, req-&gt;dst, dst_nents ? : 1,</div><div class='del'>-				 DMA_FROM_DEVICE);</div><div class='add'>+		mapped_src_nents = dma_map_sg(jrdev, req-&gt;src, src_nents,</div><div class='add'>+					      DMA_TO_DEVICE);</div><div class='add'>+		if (unlikely(!mapped_src_nents)) {</div><div class='add'>+			dev_err(jrdev, "unable to map source\n");</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dst_nents = sg_nents_for_len(req-&gt;dst, req-&gt;nbytes);</div><div class='add'>+		if (unlikely(dst_nents &lt; 0)) {</div><div class='add'>+			dev_err(jrdev, "Insufficient bytes (%d) in dst S/G\n",</div><div class='add'>+				req-&gt;nbytes);</div><div class='add'>+			return ERR_PTR(dst_nents);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mapped_dst_nents = dma_map_sg(jrdev, req-&gt;dst, dst_nents,</div><div class='add'>+					      DMA_FROM_DEVICE);</div><div class='add'>+		if (unlikely(!mapped_dst_nents)) {</div><div class='add'>+			dev_err(jrdev, "unable to map destination\n");</div><div class='add'>+			dma_unmap_sg(jrdev, req-&gt;src, src_nents, DMA_TO_DEVICE);</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2808,21 +1738,29 @@ static struct ablkcipher_edesc *ablkcipher_giv_edesc_alloc(</div><div class='ctx'> 	iv_dma = dma_map_single(jrdev, greq-&gt;giv, ivsize, DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(jrdev, iv_dma)) {</div><div class='ctx'> 		dev_err(jrdev, "unable to map IV\n");</div><div class='add'>+		caam_unmap(jrdev, req-&gt;src, req-&gt;dst, src_nents, dst_nents, 0,</div><div class='add'>+			   0, 0, 0);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!dst_nents &amp;&amp; iv_dma + ivsize == sg_dma_address(req-&gt;dst))</div><div class='del'>-		iv_contig = true;</div><div class='del'>-	else</div><div class='del'>-		dst_nents = dst_nents ? : 1;</div><div class='del'>-	sec4_sg_bytes = ((iv_contig ? 0 : 1) + src_nents + dst_nents) *</div><div class='del'>-			sizeof(struct sec4_sg_entry);</div><div class='add'>+	sec4_sg_ents = mapped_src_nents &gt; 1 ? mapped_src_nents : 0;</div><div class='add'>+	dst_sg_idx = sec4_sg_ents;</div><div class='add'>+	if (mapped_dst_nents == 1 &amp;&amp;</div><div class='add'>+	    iv_dma + ivsize == sg_dma_address(req-&gt;dst)) {</div><div class='add'>+		out_contig = true;</div><div class='add'>+	} else {</div><div class='add'>+		out_contig = false;</div><div class='add'>+		sec4_sg_ents += 1 + mapped_dst_nents;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* allocate space for base edesc and hw desc commands, link tables */</div><div class='add'>+	sec4_sg_bytes = sec4_sg_ents * sizeof(struct sec4_sg_entry);</div><div class='ctx'> 	edesc = kzalloc(sizeof(*edesc) + desc_bytes + sec4_sg_bytes,</div><div class='ctx'> 			GFP_DMA | flags);</div><div class='ctx'> 	if (!edesc) {</div><div class='ctx'> 		dev_err(jrdev, "could not allocate extended descriptor\n");</div><div class='add'>+		caam_unmap(jrdev, req-&gt;src, req-&gt;dst, src_nents, dst_nents,</div><div class='add'>+			   iv_dma, ivsize, 0, 0);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2832,24 +1770,24 @@ static struct ablkcipher_edesc *ablkcipher_giv_edesc_alloc(</div><div class='ctx'> 	edesc-&gt;sec4_sg = (void *)edesc + sizeof(struct ablkcipher_edesc) +</div><div class='ctx'> 			 desc_bytes;</div><div class='ctx'> </div><div class='del'>-	sec4_sg_index = 0;</div><div class='del'>-	if (src_nents) {</div><div class='del'>-		sg_to_sec4_sg_last(req-&gt;src, src_nents, edesc-&gt;sec4_sg, 0);</div><div class='del'>-		sec4_sg_index += src_nents;</div><div class='del'>-	}</div><div class='add'>+	if (mapped_src_nents &gt; 1)</div><div class='add'>+		sg_to_sec4_sg_last(req-&gt;src, mapped_src_nents, edesc-&gt;sec4_sg,</div><div class='add'>+				   0);</div><div class='ctx'> </div><div class='del'>-	if (!iv_contig) {</div><div class='del'>-		dma_to_sec4_sg_one(edesc-&gt;sec4_sg + sec4_sg_index,</div><div class='add'>+	if (!out_contig) {</div><div class='add'>+		dma_to_sec4_sg_one(edesc-&gt;sec4_sg + dst_sg_idx,</div><div class='ctx'> 				   iv_dma, ivsize, 0);</div><div class='del'>-		sec4_sg_index += 1;</div><div class='del'>-		sg_to_sec4_sg_last(req-&gt;dst, dst_nents,</div><div class='del'>-				   edesc-&gt;sec4_sg + sec4_sg_index, 0);</div><div class='add'>+		sg_to_sec4_sg_last(req-&gt;dst, mapped_dst_nents,</div><div class='add'>+				   edesc-&gt;sec4_sg + dst_sg_idx + 1, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	edesc-&gt;sec4_sg_dma = dma_map_single(jrdev, edesc-&gt;sec4_sg,</div><div class='ctx'> 					    sec4_sg_bytes, DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(jrdev, edesc-&gt;sec4_sg_dma)) {</div><div class='ctx'> 		dev_err(jrdev, "unable to map S/G table\n");</div><div class='add'>+		caam_unmap(jrdev, req-&gt;src, req-&gt;dst, src_nents, dst_nents,</div><div class='add'>+			   iv_dma, ivsize, 0, 0);</div><div class='add'>+		kfree(edesc);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> 	edesc-&gt;iv_dma = iv_dma;</div><div class='hunk'>@@ -2861,7 +1799,7 @@ static struct ablkcipher_edesc *ablkcipher_giv_edesc_alloc(</div><div class='ctx'> 		       sec4_sg_bytes, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	*iv_contig_out = iv_contig;</div><div class='add'>+	*iv_contig_out = out_contig;</div><div class='ctx'> 	return edesc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2872,7 +1810,7 @@ static int ablkcipher_givencrypt(struct skcipher_givcrypt_request *creq)</div><div class='ctx'> 	struct crypto_ablkcipher *ablkcipher = crypto_ablkcipher_reqtfm(req);</div><div class='ctx'> 	struct caam_ctx *ctx = crypto_ablkcipher_ctx(ablkcipher);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	bool iv_contig;</div><div class='add'>+	bool iv_contig = false;</div><div class='ctx'> 	u32 *desc;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2916,7 +1854,6 @@ struct caam_alg_template {</div><div class='ctx'> 	} template_u;</div><div class='ctx'> 	u32 class1_alg_type;</div><div class='ctx'> 	u32 class2_alg_type;</div><div class='del'>-	u32 alg_op;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct caam_alg_template driver_algs[] = {</div><div class='hunk'>@@ -3101,7 +2038,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 		.caam = {</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_MD5 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3123,7 +2059,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 		.caam = {</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA1 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3145,7 +2080,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 		.caam = {</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA224 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3167,7 +2101,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 		.caam = {</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA256 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3189,7 +2122,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 		.caam = {</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA384 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3211,7 +2143,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 		.caam = {</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA512 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3233,7 +2164,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_MD5 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3256,7 +2186,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_MD5 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3279,7 +2208,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA1 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3302,7 +2230,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA1 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3325,7 +2252,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA224 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3348,7 +2274,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA224 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3371,7 +2296,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA256 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3394,7 +2318,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA256 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3417,7 +2340,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA384 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3440,7 +2362,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA384 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3463,7 +2384,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA512 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3486,7 +2406,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA512 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3509,7 +2428,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_MD5 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		}</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3532,7 +2450,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_MD5 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		}</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3556,7 +2473,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA1 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3580,7 +2496,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA1 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3604,7 +2519,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA224 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3628,7 +2542,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA224 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3652,7 +2565,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA256 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3676,7 +2588,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA256 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3700,7 +2611,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA384 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3724,7 +2634,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA384 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3748,7 +2657,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA512 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3772,7 +2680,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA512 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3795,7 +2702,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_MD5 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3818,7 +2724,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_MD5 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3841,7 +2746,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA1 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3864,7 +2768,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA1 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3887,7 +2790,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA224 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3910,7 +2812,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA224 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3933,7 +2834,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA256 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3956,7 +2856,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA256 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -3979,7 +2878,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA384 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -4002,7 +2900,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA384 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4025,7 +2922,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA512 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -4048,7 +2944,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 			.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA512 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4073,7 +2968,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_MD5 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4098,7 +2992,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_MD5 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -4124,7 +3017,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA1 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4149,7 +3041,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA1 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -4175,7 +3066,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA224 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4200,7 +3090,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA224 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -4226,7 +3115,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA256 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4251,7 +3139,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA256 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -4277,7 +3164,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA384 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4302,7 +3188,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA384 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -4328,7 +3213,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA512 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4353,7 +3237,6 @@ static struct caam_aead_alg driver_aeads[] = {</div><div class='ctx'> 					   OP_ALG_AAI_CTR_MOD128,</div><div class='ctx'> 			.class2_alg_type = OP_ALG_ALGSEL_SHA512 |</div><div class='ctx'> 					   OP_ALG_AAI_HMAC_PRECOMP,</div><div class='del'>-			.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 			.rfc3686 = true,</div><div class='ctx'> 			.geniv = true,</div><div class='ctx'> 		},</div><div class='hunk'>@@ -4368,16 +3251,34 @@ struct caam_crypto_alg {</div><div class='ctx'> </div><div class='ctx'> static int caam_init_common(struct caam_ctx *ctx, struct caam_alg_entry *caam)</div><div class='ctx'> {</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='ctx'> 	ctx-&gt;jrdev = caam_jr_alloc();</div><div class='ctx'> 	if (IS_ERR(ctx-&gt;jrdev)) {</div><div class='ctx'> 		pr_err("Job Ring Device allocation for transform failed\n");</div><div class='ctx'> 		return PTR_ERR(ctx-&gt;jrdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dma_addr = dma_map_single_attrs(ctx-&gt;jrdev, ctx-&gt;sh_desc_enc,</div><div class='add'>+					offsetof(struct caam_ctx,</div><div class='add'>+						 sh_desc_enc_dma),</div><div class='add'>+					DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);</div><div class='add'>+	if (dma_mapping_error(ctx-&gt;jrdev, dma_addr)) {</div><div class='add'>+		dev_err(ctx-&gt;jrdev, "unable to map key, shared descriptors\n");</div><div class='add'>+		caam_jr_free(ctx-&gt;jrdev);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;sh_desc_enc_dma = dma_addr;</div><div class='add'>+	ctx-&gt;sh_desc_dec_dma = dma_addr + offsetof(struct caam_ctx,</div><div class='add'>+						   sh_desc_dec);</div><div class='add'>+	ctx-&gt;sh_desc_givenc_dma = dma_addr + offsetof(struct caam_ctx,</div><div class='add'>+						      sh_desc_givenc);</div><div class='add'>+	ctx-&gt;key_dma = dma_addr + offsetof(struct caam_ctx, key);</div><div class='add'>+</div><div class='ctx'> 	/* copy descriptor header template value */</div><div class='del'>-	ctx-&gt;class1_alg_type = OP_TYPE_CLASS1_ALG | caam-&gt;class1_alg_type;</div><div class='del'>-	ctx-&gt;class2_alg_type = OP_TYPE_CLASS2_ALG | caam-&gt;class2_alg_type;</div><div class='del'>-	ctx-&gt;alg_op = OP_TYPE_CLASS2_ALG | caam-&gt;alg_op;</div><div class='add'>+	ctx-&gt;cdata.algtype = OP_TYPE_CLASS1_ALG | caam-&gt;class1_alg_type;</div><div class='add'>+	ctx-&gt;adata.algtype = OP_TYPE_CLASS2_ALG | caam-&gt;class2_alg_type;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4404,25 +3305,9 @@ static int caam_aead_init(struct crypto_aead *tfm)</div><div class='ctx'> </div><div class='ctx'> static void caam_exit_common(struct caam_ctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	if (ctx-&gt;sh_desc_enc_dma &amp;&amp;</div><div class='del'>-	    !dma_mapping_error(ctx-&gt;jrdev, ctx-&gt;sh_desc_enc_dma))</div><div class='del'>-		dma_unmap_single(ctx-&gt;jrdev, ctx-&gt;sh_desc_enc_dma,</div><div class='del'>-				 desc_bytes(ctx-&gt;sh_desc_enc), DMA_TO_DEVICE);</div><div class='del'>-	if (ctx-&gt;sh_desc_dec_dma &amp;&amp;</div><div class='del'>-	    !dma_mapping_error(ctx-&gt;jrdev, ctx-&gt;sh_desc_dec_dma))</div><div class='del'>-		dma_unmap_single(ctx-&gt;jrdev, ctx-&gt;sh_desc_dec_dma,</div><div class='del'>-				 desc_bytes(ctx-&gt;sh_desc_dec), DMA_TO_DEVICE);</div><div class='del'>-	if (ctx-&gt;sh_desc_givenc_dma &amp;&amp;</div><div class='del'>-	    !dma_mapping_error(ctx-&gt;jrdev, ctx-&gt;sh_desc_givenc_dma))</div><div class='del'>-		dma_unmap_single(ctx-&gt;jrdev, ctx-&gt;sh_desc_givenc_dma,</div><div class='del'>-				 desc_bytes(ctx-&gt;sh_desc_givenc),</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	if (ctx-&gt;key_dma &amp;&amp;</div><div class='del'>-	    !dma_mapping_error(ctx-&gt;jrdev, ctx-&gt;key_dma))</div><div class='del'>-		dma_unmap_single(ctx-&gt;jrdev, ctx-&gt;key_dma,</div><div class='del'>-				 ctx-&gt;enckeylen + ctx-&gt;split_key_pad_len,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-</div><div class='add'>+	dma_unmap_single_attrs(ctx-&gt;jrdev, ctx-&gt;sh_desc_enc_dma,</div><div class='add'>+			       offsetof(struct caam_ctx, sh_desc_enc_dma),</div><div class='add'>+			       DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);</div><div class='ctx'> 	caam_jr_free(ctx-&gt;jrdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4498,7 +3383,6 @@ static struct caam_crypto_alg *caam_alg_alloc(struct caam_alg_template</div><div class='ctx'> </div><div class='ctx'> 	t_alg-&gt;caam.class1_alg_type = template-&gt;class1_alg_type;</div><div class='ctx'> 	t_alg-&gt;caam.class2_alg_type = template-&gt;class2_alg_type;</div><div class='del'>-	t_alg-&gt;caam.alg_op = template-&gt;alg_op;</div><div class='ctx'> </div><div class='ctx'> 	return t_alg;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/crypto/caam/caamalg_desc.c b/drivers/crypto/caam/caamalg_desc.c<br/>new file mode 100644<br/>index 000000000000..f3f48c10b9d6<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/caamalg_desc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caamalg_desc.c</a></div><div class='hunk'>@@ -0,0 +1,1306 @@</div><div class='add'>+/*</div><div class='add'>+ * Shared descriptors for aead, ablkcipher algorithms</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "compat.h"</div><div class='add'>+#include "desc_constr.h"</div><div class='add'>+#include "caamalg_desc.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For aead functions, read payload and write payload,</div><div class='add'>+ * both of which are specified in req-&gt;src and req-&gt;dst</div><div class='add'>+ */</div><div class='add'>+static inline void aead_append_src_dst(u32 *desc, u32 msg_type)</div><div class='add'>+{</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | KEY_VLF);</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_BOTH |</div><div class='add'>+			     KEY_VLF | msg_type | FIFOLD_TYPE_LASTBOTH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set DK bit in class 1 operation if shared */</div><div class='add'>+static inline void append_dec_op1(u32 *desc, u32 type)</div><div class='add'>+{</div><div class='add'>+	u32 *jump_cmd, *uncond_jump_cmd;</div><div class='add'>+</div><div class='add'>+	/* DK bit is valid only for AES */</div><div class='add'>+	if ((type &amp; OP_ALG_ALGSEL_MASK) != OP_ALG_ALGSEL_AES) {</div><div class='add'>+		append_operation(desc, type | OP_ALG_AS_INITFINAL |</div><div class='add'>+				 OP_ALG_DECRYPT);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jump_cmd = append_jump(desc, JUMP_TEST_ALL | JUMP_COND_SHRD);</div><div class='add'>+	append_operation(desc, type | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_DECRYPT);</div><div class='add'>+	uncond_jump_cmd = append_jump(desc, JUMP_TEST_ALL);</div><div class='add'>+	set_jump_tgt_here(desc, jump_cmd);</div><div class='add'>+	append_operation(desc, type | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_DECRYPT | OP_ALG_AAI_DK);</div><div class='add'>+	set_jump_tgt_here(desc, uncond_jump_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_aead_null_encap - IPSec ESP encapsulation shared descriptor</div><div class='add'>+ *                               (non-protocol) with no (null) encryption.</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @adata: pointer to authentication transform definitions. Note that since a</div><div class='add'>+ *         split key is to be used, the size of the split key itself is</div><div class='add'>+ *         specified. Valid algorithm values - one of OP_ALG_ALGSEL_{MD5, SHA1,</div><div class='add'>+ *         SHA224, SHA256, SHA384, SHA512} ANDed with OP_ALG_AAI_HMAC_PRECOMP.</div><div class='add'>+ * @icvsize: integrity check value (ICV) size (truncated or full)</div><div class='add'>+ *</div><div class='add'>+ * Note: Requires an MDHA split key.</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_aead_null_encap(u32 * const desc, struct alginfo *adata,</div><div class='add'>+				 unsigned int icvsize)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd, *read_move_cmd, *write_move_cmd;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='add'>+</div><div class='add'>+	/* Skip if already shared */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+	if (adata-&gt;key_inline)</div><div class='add'>+		append_key_as_imm(desc, adata-&gt;key_virt, adata-&gt;keylen_pad,</div><div class='add'>+				  adata-&gt;keylen, CLASS_2 | KEY_DEST_MDHA_SPLIT |</div><div class='add'>+				  KEY_ENC);</div><div class='add'>+	else</div><div class='add'>+		append_key(desc, adata-&gt;key_dma, adata-&gt;keylen, CLASS_2 |</div><div class='add'>+			   KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* assoclen + cryptlen = seqinlen */</div><div class='add'>+	append_math_sub(desc, REG3, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Prepare to read and write cryptlen + assoclen bytes */</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * MOVE_LEN opcode is not available in all SEC HW revisions,</div><div class='add'>+	 * thus need to do some magic, i.e. self-patch the descriptor</div><div class='add'>+	 * buffer.</div><div class='add'>+	 */</div><div class='add'>+	read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF |</div><div class='add'>+				    MOVE_DEST_MATH3 |</div><div class='add'>+				    (0x6 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+	write_move_cmd = append_move(desc, MOVE_SRC_MATH3 |</div><div class='add'>+				     MOVE_DEST_DESCBUF |</div><div class='add'>+				     MOVE_WAITCOMP |</div><div class='add'>+				     (0x8 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Class 2 operation */</div><div class='add'>+	append_operation(desc, adata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_ENCRYPT);</div><div class='add'>+</div><div class='add'>+	/* Read and write cryptlen bytes */</div><div class='add'>+	aead_append_src_dst(desc, FIFOLD_TYPE_MSG | FIFOLD_TYPE_FLUSH1);</div><div class='add'>+</div><div class='add'>+	set_move_tgt_here(desc, read_move_cmd);</div><div class='add'>+	set_move_tgt_here(desc, write_move_cmd);</div><div class='add'>+	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='add'>+	append_move(desc, MOVE_SRC_INFIFO_CL | MOVE_DEST_OUTFIFO |</div><div class='add'>+		    MOVE_AUX_LS);</div><div class='add'>+</div><div class='add'>+	/* Write ICV */</div><div class='add'>+	append_seq_store(desc, icvsize, LDST_CLASS_2_CCB |</div><div class='add'>+			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "aead null enc shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_aead_null_encap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_aead_null_decap - IPSec ESP decapsulation shared descriptor</div><div class='add'>+ *                               (non-protocol) with no (null) decryption.</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @adata: pointer to authentication transform definitions. Note that since a</div><div class='add'>+ *         split key is to be used, the size of the split key itself is</div><div class='add'>+ *         specified. Valid algorithm values - one of OP_ALG_ALGSEL_{MD5, SHA1,</div><div class='add'>+ *         SHA224, SHA256, SHA384, SHA512} ANDed with OP_ALG_AAI_HMAC_PRECOMP.</div><div class='add'>+ * @icvsize: integrity check value (ICV) size (truncated or full)</div><div class='add'>+ *</div><div class='add'>+ * Note: Requires an MDHA split key.</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_aead_null_decap(u32 * const desc, struct alginfo *adata,</div><div class='add'>+				 unsigned int icvsize)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd, *read_move_cmd, *write_move_cmd, *jump_cmd;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='add'>+</div><div class='add'>+	/* Skip if already shared */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+	if (adata-&gt;key_inline)</div><div class='add'>+		append_key_as_imm(desc, adata-&gt;key_virt, adata-&gt;keylen_pad,</div><div class='add'>+				  adata-&gt;keylen, CLASS_2 |</div><div class='add'>+				  KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='add'>+	else</div><div class='add'>+		append_key(desc, adata-&gt;key_dma, adata-&gt;keylen, CLASS_2 |</div><div class='add'>+			   KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* Class 2 operation */</div><div class='add'>+	append_operation(desc, adata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_DECRYPT | OP_ALG_ICV_ON);</div><div class='add'>+</div><div class='add'>+	/* assoclen + cryptlen = seqoutlen */</div><div class='add'>+	append_math_sub(desc, REG2, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Prepare to read and write cryptlen + assoclen bytes */</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, ZERO, REG2, CAAM_CMD_SZ);</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, ZERO, REG2, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * MOVE_LEN opcode is not available in all SEC HW revisions,</div><div class='add'>+	 * thus need to do some magic, i.e. self-patch the descriptor</div><div class='add'>+	 * buffer.</div><div class='add'>+	 */</div><div class='add'>+	read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF |</div><div class='add'>+				    MOVE_DEST_MATH2 |</div><div class='add'>+				    (0x6 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+	write_move_cmd = append_move(desc, MOVE_SRC_MATH2 |</div><div class='add'>+				     MOVE_DEST_DESCBUF |</div><div class='add'>+				     MOVE_WAITCOMP |</div><div class='add'>+				     (0x8 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Read and write cryptlen bytes */</div><div class='add'>+	aead_append_src_dst(desc, FIFOLD_TYPE_MSG | FIFOLD_TYPE_FLUSH1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Insert a NOP here, since we need at least 4 instructions between</div><div class='add'>+	 * code patching the descriptor buffer and the location being patched.</div><div class='add'>+	 */</div><div class='add'>+	jump_cmd = append_jump(desc, JUMP_TEST_ALL);</div><div class='add'>+	set_jump_tgt_here(desc, jump_cmd);</div><div class='add'>+</div><div class='add'>+	set_move_tgt_here(desc, read_move_cmd);</div><div class='add'>+	set_move_tgt_here(desc, write_move_cmd);</div><div class='add'>+	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='add'>+	append_move(desc, MOVE_SRC_INFIFO_CL | MOVE_DEST_OUTFIFO |</div><div class='add'>+		    MOVE_AUX_LS);</div><div class='add'>+	append_cmd(desc, CMD_LOAD | ENABLE_AUTO_INFO_FIFO);</div><div class='add'>+</div><div class='add'>+	/* Load ICV */</div><div class='add'>+	append_seq_fifo_load(desc, icvsize, FIFOLD_CLASS_CLASS2 |</div><div class='add'>+			     FIFOLD_TYPE_LAST2 | FIFOLD_TYPE_ICV);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "aead null dec shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_aead_null_decap);</div><div class='add'>+</div><div class='add'>+static void init_sh_desc_key_aead(u32 * const desc,</div><div class='add'>+				  struct alginfo * const cdata,</div><div class='add'>+				  struct alginfo * const adata,</div><div class='add'>+				  const bool is_rfc3686, u32 *nonce)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd;</div><div class='add'>+	unsigned int enckeylen = cdata-&gt;keylen;</div><div class='add'>+</div><div class='add'>+	/* Note: Context registers are saved. */</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='add'>+</div><div class='add'>+	/* Skip if already shared */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RFC3686 specific:</div><div class='add'>+	 *	| key = {AUTH_KEY, ENC_KEY, NONCE}</div><div class='add'>+	 *	| enckeylen = encryption key size + nonce size</div><div class='add'>+	 */</div><div class='add'>+	if (is_rfc3686)</div><div class='add'>+		enckeylen -= CTR_RFC3686_NONCE_SIZE;</div><div class='add'>+</div><div class='add'>+	if (adata-&gt;key_inline)</div><div class='add'>+		append_key_as_imm(desc, adata-&gt;key_virt, adata-&gt;keylen_pad,</div><div class='add'>+				  adata-&gt;keylen, CLASS_2 |</div><div class='add'>+				  KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='add'>+	else</div><div class='add'>+		append_key(desc, adata-&gt;key_dma, adata-&gt;keylen, CLASS_2 |</div><div class='add'>+			   KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='add'>+</div><div class='add'>+	if (cdata-&gt;key_inline)</div><div class='add'>+		append_key_as_imm(desc, cdata-&gt;key_virt, enckeylen,</div><div class='add'>+				  enckeylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='add'>+	else</div><div class='add'>+		append_key(desc, cdata-&gt;key_dma, enckeylen, CLASS_1 |</div><div class='add'>+			   KEY_DEST_CLASS_REG);</div><div class='add'>+</div><div class='add'>+	/* Load Counter into CONTEXT1 reg */</div><div class='add'>+	if (is_rfc3686) {</div><div class='add'>+		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,</div><div class='add'>+				   LDST_CLASS_IND_CCB |</div><div class='add'>+				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);</div><div class='add'>+		append_move(desc,</div><div class='add'>+			    MOVE_SRC_OUTFIFO |</div><div class='add'>+			    MOVE_DEST_CLASS1CTX |</div><div class='add'>+			    (16 &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='add'>+			    (CTR_RFC3686_NONCE_SIZE &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_aead_encap - IPSec ESP encapsulation shared descriptor</div><div class='add'>+ *                          (non-protocol).</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - one of OP_ALG_ALGSEL_{AES, DES, 3DES} ANDed</div><div class='add'>+ *         with OP_ALG_AAI_CBC or OP_ALG_AAI_CTR_MOD128.</div><div class='add'>+ * @adata: pointer to authentication transform definitions. Note that since a</div><div class='add'>+ *         split key is to be used, the size of the split key itself is</div><div class='add'>+ *         specified. Valid algorithm values - one of OP_ALG_ALGSEL_{MD5, SHA1,</div><div class='add'>+ *         SHA224, SHA256, SHA384, SHA512} ANDed with OP_ALG_AAI_HMAC_PRECOMP.</div><div class='add'>+ * @icvsize: integrity check value (ICV) size (truncated or full)</div><div class='add'>+ * @is_rfc3686: true when ctr(aes) is wrapped by rfc3686 template</div><div class='add'>+ * @nonce: pointer to rfc3686 nonce</div><div class='add'>+ * @ctx1_iv_off: IV offset in CONTEXT1 register</div><div class='add'>+ *</div><div class='add'>+ * Note: Requires an MDHA split key.</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_aead_encap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			    struct alginfo *adata, unsigned int icvsize,</div><div class='add'>+			    const bool is_rfc3686, u32 *nonce,</div><div class='add'>+			    const u32 ctx1_iv_off)</div><div class='add'>+{</div><div class='add'>+	/* Note: Context registers are saved. */</div><div class='add'>+	init_sh_desc_key_aead(desc, cdata, adata, is_rfc3686, nonce);</div><div class='add'>+</div><div class='add'>+	/* Class 2 operation */</div><div class='add'>+	append_operation(desc, adata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_ENCRYPT);</div><div class='add'>+</div><div class='add'>+	/* Read and write assoclen bytes */</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Skip assoc data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* read assoc before reading payload */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG |</div><div class='add'>+				      FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* Load Counter into CONTEXT1 reg */</div><div class='add'>+	if (is_rfc3686)</div><div class='add'>+		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='add'>+				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='add'>+				      LDST_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Class 1 operation */</div><div class='add'>+	append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_ENCRYPT);</div><div class='add'>+</div><div class='add'>+	/* Read and write cryptlen bytes */</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+	aead_append_src_dst(desc, FIFOLD_TYPE_MSG1OUT2);</div><div class='add'>+</div><div class='add'>+	/* Write ICV */</div><div class='add'>+	append_seq_store(desc, icvsize, LDST_CLASS_2_CCB |</div><div class='add'>+			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR, "aead enc shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_aead_encap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_aead_decap - IPSec ESP decapsulation shared descriptor</div><div class='add'>+ *                          (non-protocol).</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - one of OP_ALG_ALGSEL_{AES, DES, 3DES} ANDed</div><div class='add'>+ *         with OP_ALG_AAI_CBC or OP_ALG_AAI_CTR_MOD128.</div><div class='add'>+ * @adata: pointer to authentication transform definitions. Note that since a</div><div class='add'>+ *         split key is to be used, the size of the split key itself is</div><div class='add'>+ *         specified. Valid algorithm values - one of OP_ALG_ALGSEL_{MD5, SHA1,</div><div class='add'>+ *         SHA224, SHA256, SHA384, SHA512} ANDed with OP_ALG_AAI_HMAC_PRECOMP.</div><div class='add'>+ * @ivsize: initialization vector size</div><div class='add'>+ * @icvsize: integrity check value (ICV) size (truncated or full)</div><div class='add'>+ * @is_rfc3686: true when ctr(aes) is wrapped by rfc3686 template</div><div class='add'>+ * @nonce: pointer to rfc3686 nonce</div><div class='add'>+ * @ctx1_iv_off: IV offset in CONTEXT1 register</div><div class='add'>+ *</div><div class='add'>+ * Note: Requires an MDHA split key.</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_aead_decap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			    struct alginfo *adata, unsigned int ivsize,</div><div class='add'>+			    unsigned int icvsize, const bool geniv,</div><div class='add'>+			    const bool is_rfc3686, u32 *nonce,</div><div class='add'>+			    const u32 ctx1_iv_off)</div><div class='add'>+{</div><div class='add'>+	/* Note: Context registers are saved. */</div><div class='add'>+	init_sh_desc_key_aead(desc, cdata, adata, is_rfc3686, nonce);</div><div class='add'>+</div><div class='add'>+	/* Class 2 operation */</div><div class='add'>+	append_operation(desc, adata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_DECRYPT | OP_ALG_ICV_ON);</div><div class='add'>+</div><div class='add'>+	/* Read and write assoclen bytes */</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+	if (geniv)</div><div class='add'>+		append_math_add_imm_u32(desc, VARSEQOUTLEN, REG3, IMM, ivsize);</div><div class='add'>+	else</div><div class='add'>+		append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Skip assoc data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* read assoc before reading payload */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG |</div><div class='add'>+			     KEY_VLF);</div><div class='add'>+</div><div class='add'>+	if (geniv) {</div><div class='add'>+		append_seq_load(desc, ivsize, LDST_CLASS_1_CCB |</div><div class='add'>+				LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+				(ctx1_iv_off &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='add'>+		append_move(desc, MOVE_SRC_CLASS1CTX | MOVE_DEST_CLASS2INFIFO |</div><div class='add'>+			    (ctx1_iv_off &lt;&lt; MOVE_OFFSET_SHIFT) | ivsize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Load Counter into CONTEXT1 reg */</div><div class='add'>+	if (is_rfc3686)</div><div class='add'>+		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='add'>+				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='add'>+				      LDST_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Choose operation */</div><div class='add'>+	if (ctx1_iv_off)</div><div class='add'>+		append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+				 OP_ALG_DECRYPT);</div><div class='add'>+	else</div><div class='add'>+		append_dec_op1(desc, cdata-&gt;algtype);</div><div class='add'>+</div><div class='add'>+	/* Read and write cryptlen bytes */</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+	aead_append_src_dst(desc, FIFOLD_TYPE_MSG);</div><div class='add'>+</div><div class='add'>+	/* Load ICV */</div><div class='add'>+	append_seq_fifo_load(desc, icvsize, FIFOLD_CLASS_CLASS2 |</div><div class='add'>+			     FIFOLD_TYPE_LAST2 | FIFOLD_TYPE_ICV);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR, "aead dec shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_aead_decap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_aead_givencap - IPSec ESP encapsulation shared descriptor</div><div class='add'>+ *                             (non-protocol) with HW-generated initialization</div><div class='add'>+ *                             vector.</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - one of OP_ALG_ALGSEL_{AES, DES, 3DES} ANDed</div><div class='add'>+ *         with OP_ALG_AAI_CBC or OP_ALG_AAI_CTR_MOD128.</div><div class='add'>+ * @adata: pointer to authentication transform definitions. Note that since a</div><div class='add'>+ *         split key is to be used, the size of the split key itself is</div><div class='add'>+ *         specified. Valid algorithm values - one of OP_ALG_ALGSEL_{MD5, SHA1,</div><div class='add'>+ *         SHA224, SHA256, SHA384, SHA512} ANDed with OP_ALG_AAI_HMAC_PRECOMP.</div><div class='add'>+ * @ivsize: initialization vector size</div><div class='add'>+ * @icvsize: integrity check value (ICV) size (truncated or full)</div><div class='add'>+ * @is_rfc3686: true when ctr(aes) is wrapped by rfc3686 template</div><div class='add'>+ * @nonce: pointer to rfc3686 nonce</div><div class='add'>+ * @ctx1_iv_off: IV offset in CONTEXT1 register</div><div class='add'>+ *</div><div class='add'>+ * Note: Requires an MDHA split key.</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_aead_givencap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			       struct alginfo *adata, unsigned int ivsize,</div><div class='add'>+			       unsigned int icvsize, const bool is_rfc3686,</div><div class='add'>+			       u32 *nonce, const u32 ctx1_iv_off)</div><div class='add'>+{</div><div class='add'>+	u32 geniv, moveiv;</div><div class='add'>+</div><div class='add'>+	/* Note: Context registers are saved. */</div><div class='add'>+	init_sh_desc_key_aead(desc, cdata, adata, is_rfc3686, nonce);</div><div class='add'>+</div><div class='add'>+	if (is_rfc3686)</div><div class='add'>+		goto copy_iv;</div><div class='add'>+</div><div class='add'>+	/* Generate IV */</div><div class='add'>+	geniv = NFIFOENTRY_STYPE_PAD | NFIFOENTRY_DEST_DECO |</div><div class='add'>+		NFIFOENTRY_DTYPE_MSG | NFIFOENTRY_LC1 |</div><div class='add'>+		NFIFOENTRY_PTYPE_RND | (ivsize &lt;&lt; NFIFOENTRY_DLEN_SHIFT);</div><div class='add'>+	append_load_imm_u32(desc, geniv, LDST_CLASS_IND_CCB |</div><div class='add'>+			    LDST_SRCDST_WORD_INFO_FIFO | LDST_IMM);</div><div class='add'>+	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='add'>+	append_move(desc, MOVE_WAITCOMP |</div><div class='add'>+		    MOVE_SRC_INFIFO | MOVE_DEST_CLASS1CTX |</div><div class='add'>+		    (ctx1_iv_off &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='add'>+		    (ivsize &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+	append_cmd(desc, CMD_LOAD | ENABLE_AUTO_INFO_FIFO);</div><div class='add'>+</div><div class='add'>+copy_iv:</div><div class='add'>+	/* Copy IV to class 1 context */</div><div class='add'>+	append_move(desc, MOVE_SRC_CLASS1CTX | MOVE_DEST_OUTFIFO |</div><div class='add'>+		    (ctx1_iv_off &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='add'>+		    (ivsize &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Return to encryption */</div><div class='add'>+	append_operation(desc, adata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_ENCRYPT);</div><div class='add'>+</div><div class='add'>+	/* Read and write assoclen bytes */</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Skip assoc data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* read assoc before reading payload */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG |</div><div class='add'>+			     KEY_VLF);</div><div class='add'>+</div><div class='add'>+	/* Copy iv from outfifo to class 2 fifo */</div><div class='add'>+	moveiv = NFIFOENTRY_STYPE_OFIFO | NFIFOENTRY_DEST_CLASS2 |</div><div class='add'>+		 NFIFOENTRY_DTYPE_MSG | (ivsize &lt;&lt; NFIFOENTRY_DLEN_SHIFT);</div><div class='add'>+	append_load_imm_u32(desc, moveiv, LDST_CLASS_IND_CCB |</div><div class='add'>+			    LDST_SRCDST_WORD_INFO_FIFO | LDST_IMM);</div><div class='add'>+	append_load_imm_u32(desc, ivsize, LDST_CLASS_2_CCB |</div><div class='add'>+			    LDST_SRCDST_WORD_DATASZ_REG | LDST_IMM);</div><div class='add'>+</div><div class='add'>+	/* Load Counter into CONTEXT1 reg */</div><div class='add'>+	if (is_rfc3686)</div><div class='add'>+		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='add'>+				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='add'>+				      LDST_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Class 1 operation */</div><div class='add'>+	append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_ENCRYPT);</div><div class='add'>+</div><div class='add'>+	/* Will write ivsize + cryptlen */</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Not need to reload iv */</div><div class='add'>+	append_seq_fifo_load(desc, ivsize,</div><div class='add'>+			     FIFOLD_CLASS_SKIP);</div><div class='add'>+</div><div class='add'>+	/* Will read cryptlen */</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_BOTH | KEY_VLF |</div><div class='add'>+			     FIFOLD_TYPE_MSG1OUT2 | FIFOLD_TYPE_LASTBOTH);</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | KEY_VLF);</div><div class='add'>+</div><div class='add'>+	/* Write ICV */</div><div class='add'>+	append_seq_store(desc, icvsize, LDST_CLASS_2_CCB |</div><div class='add'>+			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "aead givenc shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_aead_givencap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_gcm_encap - gcm encapsulation shared descriptor</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - OP_ALG_ALGSEL_AES ANDed with OP_ALG_AAI_GCM.</div><div class='add'>+ * @icvsize: integrity check value (ICV) size (truncated or full)</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_gcm_encap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			   unsigned int icvsize)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd, *zero_payload_jump_cmd, *zero_assoc_jump_cmd1,</div><div class='add'>+	    *zero_assoc_jump_cmd2;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='add'>+</div><div class='add'>+	/* skip key loading if they are loaded due to sharing */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD | JUMP_COND_SELF);</div><div class='add'>+	if (cdata-&gt;key_inline)</div><div class='add'>+		append_key_as_imm(desc, cdata-&gt;key_virt, cdata-&gt;keylen,</div><div class='add'>+				  cdata-&gt;keylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='add'>+	else</div><div class='add'>+		append_key(desc, cdata-&gt;key_dma, cdata-&gt;keylen, CLASS_1 |</div><div class='add'>+			   KEY_DEST_CLASS_REG);</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* class 1 operation */</div><div class='add'>+	append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_ENCRYPT);</div><div class='add'>+</div><div class='add'>+	/* if assoclen + cryptlen is ZERO, skip to ICV write */</div><div class='add'>+	append_math_sub(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+	zero_assoc_jump_cmd2 = append_jump(desc, JUMP_TEST_ALL |</div><div class='add'>+						 JUMP_COND_MATH_Z);</div><div class='add'>+</div><div class='add'>+	/* if assoclen is ZERO, skip reading the assoc data */</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+	zero_assoc_jump_cmd1 = append_jump(desc, JUMP_TEST_ALL |</div><div class='add'>+					   JUMP_COND_MATH_Z);</div><div class='add'>+</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* skip assoc data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* cryptlen = seqinlen - assoclen */</div><div class='add'>+	append_math_sub(desc, VARSEQOUTLEN, SEQINLEN, REG3, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* if cryptlen is ZERO jump to zero-payload commands */</div><div class='add'>+	zero_payload_jump_cmd = append_jump(desc, JUMP_TEST_ALL |</div><div class='add'>+					    JUMP_COND_MATH_Z);</div><div class='add'>+</div><div class='add'>+	/* read assoc data */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='add'>+			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_FLUSH1);</div><div class='add'>+	set_jump_tgt_here(desc, zero_assoc_jump_cmd1);</div><div class='add'>+</div><div class='add'>+	append_math_sub(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* write encrypted data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* read payload data */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='add'>+			     FIFOLD_TYPE_MSG | FIFOLD_TYPE_LAST1);</div><div class='add'>+</div><div class='add'>+	/* jump the zero-payload commands */</div><div class='add'>+	append_jump(desc, JUMP_TEST_ALL | 2);</div><div class='add'>+</div><div class='add'>+	/* zero-payload commands */</div><div class='add'>+	set_jump_tgt_here(desc, zero_payload_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* read assoc data */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='add'>+			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_LAST1);</div><div class='add'>+</div><div class='add'>+	/* There is no input data */</div><div class='add'>+	set_jump_tgt_here(desc, zero_assoc_jump_cmd2);</div><div class='add'>+</div><div class='add'>+	/* write ICV */</div><div class='add'>+	append_seq_store(desc, icvsize, LDST_CLASS_1_CCB |</div><div class='add'>+			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR, "gcm enc shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_gcm_encap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_gcm_decap - gcm decapsulation shared descriptor</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - OP_ALG_ALGSEL_AES ANDed with OP_ALG_AAI_GCM.</div><div class='add'>+ * @icvsize: integrity check value (ICV) size (truncated or full)</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_gcm_decap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			   unsigned int icvsize)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd, *zero_payload_jump_cmd, *zero_assoc_jump_cmd1;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='add'>+</div><div class='add'>+	/* skip key loading if they are loaded due to sharing */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL |</div><div class='add'>+				   JUMP_TEST_ALL | JUMP_COND_SHRD |</div><div class='add'>+				   JUMP_COND_SELF);</div><div class='add'>+	if (cdata-&gt;key_inline)</div><div class='add'>+		append_key_as_imm(desc, cdata-&gt;key_virt, cdata-&gt;keylen,</div><div class='add'>+				  cdata-&gt;keylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='add'>+	else</div><div class='add'>+		append_key(desc, cdata-&gt;key_dma, cdata-&gt;keylen, CLASS_1 |</div><div class='add'>+			   KEY_DEST_CLASS_REG);</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* class 1 operation */</div><div class='add'>+	append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_DECRYPT | OP_ALG_ICV_ON);</div><div class='add'>+</div><div class='add'>+	/* if assoclen is ZERO, skip reading the assoc data */</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+	zero_assoc_jump_cmd1 = append_jump(desc, JUMP_TEST_ALL |</div><div class='add'>+						 JUMP_COND_MATH_Z);</div><div class='add'>+</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* skip assoc data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* read assoc data */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='add'>+			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_FLUSH1);</div><div class='add'>+</div><div class='add'>+	set_jump_tgt_here(desc, zero_assoc_jump_cmd1);</div><div class='add'>+</div><div class='add'>+	/* cryptlen = seqoutlen - assoclen */</div><div class='add'>+	append_math_sub(desc, VARSEQINLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* jump to zero-payload command if cryptlen is zero */</div><div class='add'>+	zero_payload_jump_cmd = append_jump(desc, JUMP_TEST_ALL |</div><div class='add'>+					    JUMP_COND_MATH_Z);</div><div class='add'>+</div><div class='add'>+	append_math_sub(desc, VARSEQOUTLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* store encrypted data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* read payload data */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='add'>+			     FIFOLD_TYPE_MSG | FIFOLD_TYPE_FLUSH1);</div><div class='add'>+</div><div class='add'>+	/* zero-payload command */</div><div class='add'>+	set_jump_tgt_here(desc, zero_payload_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* read ICV */</div><div class='add'>+	append_seq_fifo_load(desc, icvsize, FIFOLD_CLASS_CLASS1 |</div><div class='add'>+			     FIFOLD_TYPE_ICV | FIFOLD_TYPE_LAST1);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR, "gcm dec shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_gcm_decap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_rfc4106_encap - IPSec ESP gcm encapsulation shared descriptor</div><div class='add'>+ *                             (non-protocol).</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - OP_ALG_ALGSEL_AES ANDed with OP_ALG_AAI_GCM.</div><div class='add'>+ * @icvsize: integrity check value (ICV) size (truncated or full)</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_rfc4106_encap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			       unsigned int icvsize)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='add'>+</div><div class='add'>+	/* Skip key loading if it is loaded due to sharing */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+	if (cdata-&gt;key_inline)</div><div class='add'>+		append_key_as_imm(desc, cdata-&gt;key_virt, cdata-&gt;keylen,</div><div class='add'>+				  cdata-&gt;keylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='add'>+	else</div><div class='add'>+		append_key(desc, cdata-&gt;key_dma, cdata-&gt;keylen, CLASS_1 |</div><div class='add'>+			   KEY_DEST_CLASS_REG);</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* Class 1 operation */</div><div class='add'>+	append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_ENCRYPT);</div><div class='add'>+</div><div class='add'>+	append_math_sub_imm_u32(desc, VARSEQINLEN, REG3, IMM, 8);</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Read assoc data */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='add'>+			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_FLUSH1);</div><div class='add'>+</div><div class='add'>+	/* Skip IV */</div><div class='add'>+	append_seq_fifo_load(desc, 8, FIFOLD_CLASS_SKIP);</div><div class='add'>+</div><div class='add'>+	/* Will read cryptlen bytes */</div><div class='add'>+	append_math_sub(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Workaround for erratum A-005473 (simultaneous SEQ FIFO skips) */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLD_TYPE_MSG);</div><div class='add'>+</div><div class='add'>+	/* Skip assoc data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* cryptlen = seqoutlen - assoclen */</div><div class='add'>+	append_math_sub(desc, VARSEQOUTLEN, VARSEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Write encrypted data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* Read payload data */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='add'>+			     FIFOLD_TYPE_MSG | FIFOLD_TYPE_LAST1);</div><div class='add'>+</div><div class='add'>+	/* Write ICV */</div><div class='add'>+	append_seq_store(desc, icvsize, LDST_CLASS_1_CCB |</div><div class='add'>+			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "rfc4106 enc shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_rfc4106_encap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_rfc4106_decap - IPSec ESP gcm decapsulation shared descriptor</div><div class='add'>+ *                             (non-protocol).</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - OP_ALG_ALGSEL_AES ANDed with OP_ALG_AAI_GCM.</div><div class='add'>+ * @icvsize: integrity check value (ICV) size (truncated or full)</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_rfc4106_decap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			       unsigned int icvsize)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='add'>+</div><div class='add'>+	/* Skip key loading if it is loaded due to sharing */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+	if (cdata-&gt;key_inline)</div><div class='add'>+		append_key_as_imm(desc, cdata-&gt;key_virt, cdata-&gt;keylen,</div><div class='add'>+				  cdata-&gt;keylen, CLASS_1 |</div><div class='add'>+				  KEY_DEST_CLASS_REG);</div><div class='add'>+	else</div><div class='add'>+		append_key(desc, cdata-&gt;key_dma, cdata-&gt;keylen, CLASS_1 |</div><div class='add'>+			   KEY_DEST_CLASS_REG);</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* Class 1 operation */</div><div class='add'>+	append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_DECRYPT | OP_ALG_ICV_ON);</div><div class='add'>+</div><div class='add'>+	append_math_sub_imm_u32(desc, VARSEQINLEN, REG3, IMM, 8);</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Read assoc data */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='add'>+			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_FLUSH1);</div><div class='add'>+</div><div class='add'>+	/* Skip IV */</div><div class='add'>+	append_seq_fifo_load(desc, 8, FIFOLD_CLASS_SKIP);</div><div class='add'>+</div><div class='add'>+	/* Will read cryptlen bytes */</div><div class='add'>+	append_math_sub(desc, VARSEQINLEN, SEQOUTLEN, REG3, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Workaround for erratum A-005473 (simultaneous SEQ FIFO skips) */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLD_TYPE_MSG);</div><div class='add'>+</div><div class='add'>+	/* Skip assoc data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* Will write cryptlen bytes */</div><div class='add'>+	append_math_sub(desc, VARSEQOUTLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Store payload data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* Read encrypted data */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | FIFOLDST_VLF |</div><div class='add'>+			     FIFOLD_TYPE_MSG | FIFOLD_TYPE_FLUSH1);</div><div class='add'>+</div><div class='add'>+	/* Read ICV */</div><div class='add'>+	append_seq_fifo_load(desc, icvsize, FIFOLD_CLASS_CLASS1 |</div><div class='add'>+			     FIFOLD_TYPE_ICV | FIFOLD_TYPE_LAST1);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "rfc4106 dec shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_rfc4106_decap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_rfc4543_encap - IPSec ESP gmac encapsulation shared descriptor</div><div class='add'>+ *                             (non-protocol).</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - OP_ALG_ALGSEL_AES ANDed with OP_ALG_AAI_GCM.</div><div class='add'>+ * @icvsize: integrity check value (ICV) size (truncated or full)</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_rfc4543_encap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			       unsigned int icvsize)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd, *read_move_cmd, *write_move_cmd;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='add'>+</div><div class='add'>+	/* Skip key loading if it is loaded due to sharing */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+	if (cdata-&gt;key_inline)</div><div class='add'>+		append_key_as_imm(desc, cdata-&gt;key_virt, cdata-&gt;keylen,</div><div class='add'>+				  cdata-&gt;keylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='add'>+	else</div><div class='add'>+		append_key(desc, cdata-&gt;key_dma, cdata-&gt;keylen, CLASS_1 |</div><div class='add'>+			   KEY_DEST_CLASS_REG);</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* Class 1 operation */</div><div class='add'>+	append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_ENCRYPT);</div><div class='add'>+</div><div class='add'>+	/* assoclen + cryptlen = seqinlen */</div><div class='add'>+	append_math_sub(desc, REG3, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * MOVE_LEN opcode is not available in all SEC HW revisions,</div><div class='add'>+	 * thus need to do some magic, i.e. self-patch the descriptor</div><div class='add'>+	 * buffer.</div><div class='add'>+	 */</div><div class='add'>+	read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF | MOVE_DEST_MATH3 |</div><div class='add'>+				    (0x6 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+	write_move_cmd = append_move(desc, MOVE_SRC_MATH3 | MOVE_DEST_DESCBUF |</div><div class='add'>+				     (0x8 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Will read assoclen + cryptlen bytes */</div><div class='add'>+	append_math_sub(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Will write assoclen + cryptlen bytes */</div><div class='add'>+	append_math_sub(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Read and write assoclen + cryptlen bytes */</div><div class='add'>+	aead_append_src_dst(desc, FIFOLD_TYPE_AAD);</div><div class='add'>+</div><div class='add'>+	set_move_tgt_here(desc, read_move_cmd);</div><div class='add'>+	set_move_tgt_here(desc, write_move_cmd);</div><div class='add'>+	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='add'>+	/* Move payload data to OFIFO */</div><div class='add'>+	append_move(desc, MOVE_SRC_INFIFO_CL | MOVE_DEST_OUTFIFO);</div><div class='add'>+</div><div class='add'>+	/* Write ICV */</div><div class='add'>+	append_seq_store(desc, icvsize, LDST_CLASS_1_CCB |</div><div class='add'>+			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "rfc4543 enc shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_rfc4543_encap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_rfc4543_decap - IPSec ESP gmac decapsulation shared descriptor</div><div class='add'>+ *                             (non-protocol).</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - OP_ALG_ALGSEL_AES ANDed with OP_ALG_AAI_GCM.</div><div class='add'>+ * @icvsize: integrity check value (ICV) size (truncated or full)</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_rfc4543_decap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			       unsigned int icvsize)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd, *read_move_cmd, *write_move_cmd;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='add'>+</div><div class='add'>+	/* Skip key loading if it is loaded due to sharing */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+	if (cdata-&gt;key_inline)</div><div class='add'>+		append_key_as_imm(desc, cdata-&gt;key_virt, cdata-&gt;keylen,</div><div class='add'>+				  cdata-&gt;keylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='add'>+	else</div><div class='add'>+		append_key(desc, cdata-&gt;key_dma, cdata-&gt;keylen, CLASS_1 |</div><div class='add'>+			   KEY_DEST_CLASS_REG);</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* Class 1 operation */</div><div class='add'>+	append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_DECRYPT | OP_ALG_ICV_ON);</div><div class='add'>+</div><div class='add'>+	/* assoclen + cryptlen = seqoutlen */</div><div class='add'>+	append_math_sub(desc, REG3, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * MOVE_LEN opcode is not available in all SEC HW revisions,</div><div class='add'>+	 * thus need to do some magic, i.e. self-patch the descriptor</div><div class='add'>+	 * buffer.</div><div class='add'>+	 */</div><div class='add'>+	read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF | MOVE_DEST_MATH3 |</div><div class='add'>+				    (0x6 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+	write_move_cmd = append_move(desc, MOVE_SRC_MATH3 | MOVE_DEST_DESCBUF |</div><div class='add'>+				     (0x8 &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Will read assoclen + cryptlen bytes */</div><div class='add'>+	append_math_sub(desc, VARSEQINLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Will write assoclen + cryptlen bytes */</div><div class='add'>+	append_math_sub(desc, VARSEQOUTLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+</div><div class='add'>+	/* Store payload data */</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | FIFOLDST_VLF);</div><div class='add'>+</div><div class='add'>+	/* In-snoop assoclen + cryptlen data */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_BOTH | FIFOLDST_VLF |</div><div class='add'>+			     FIFOLD_TYPE_AAD | FIFOLD_TYPE_LAST2FLUSH1);</div><div class='add'>+</div><div class='add'>+	set_move_tgt_here(desc, read_move_cmd);</div><div class='add'>+	set_move_tgt_here(desc, write_move_cmd);</div><div class='add'>+	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='add'>+	/* Move payload data to OFIFO */</div><div class='add'>+	append_move(desc, MOVE_SRC_INFIFO_CL | MOVE_DEST_OUTFIFO);</div><div class='add'>+	append_cmd(desc, CMD_LOAD | ENABLE_AUTO_INFO_FIFO);</div><div class='add'>+</div><div class='add'>+	/* Read ICV */</div><div class='add'>+	append_seq_fifo_load(desc, icvsize, FIFOLD_CLASS_CLASS1 |</div><div class='add'>+			     FIFOLD_TYPE_ICV | FIFOLD_TYPE_LAST1);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "rfc4543 dec shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_rfc4543_decap);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For ablkcipher encrypt and decrypt, read from req-&gt;src and</div><div class='add'>+ * write to req-&gt;dst</div><div class='add'>+ */</div><div class='add'>+static inline void ablkcipher_append_src_dst(u32 *desc)</div><div class='add'>+{</div><div class='add'>+	append_math_add(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 |</div><div class='add'>+			     KEY_VLF | FIFOLD_TYPE_MSG | FIFOLD_TYPE_LAST1);</div><div class='add'>+	append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | KEY_VLF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_ablkcipher_encap - ablkcipher encapsulation shared descriptor</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - one of OP_ALG_ALGSEL_{AES, DES, 3DES} ANDed</div><div class='add'>+ *         with OP_ALG_AAI_CBC or OP_ALG_AAI_CTR_MOD128.</div><div class='add'>+ * @ivsize: initialization vector size</div><div class='add'>+ * @is_rfc3686: true when ctr(aes) is wrapped by rfc3686 template</div><div class='add'>+ * @ctx1_iv_off: IV offset in CONTEXT1 register</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_ablkcipher_encap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+				  unsigned int ivsize, const bool is_rfc3686,</div><div class='add'>+				  const u32 ctx1_iv_off)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='add'>+	/* Skip if already shared */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+</div><div class='add'>+	/* Load class1 key only */</div><div class='add'>+	append_key_as_imm(desc, cdata-&gt;key_virt, cdata-&gt;keylen,</div><div class='add'>+			  cdata-&gt;keylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='add'>+</div><div class='add'>+	/* Load nonce into CONTEXT1 reg */</div><div class='add'>+	if (is_rfc3686) {</div><div class='add'>+		u8 *nonce = cdata-&gt;key_virt + cdata-&gt;keylen;</div><div class='add'>+</div><div class='add'>+		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,</div><div class='add'>+				   LDST_CLASS_IND_CCB |</div><div class='add'>+				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);</div><div class='add'>+		append_move(desc, MOVE_WAITCOMP | MOVE_SRC_OUTFIFO |</div><div class='add'>+			    MOVE_DEST_CLASS1CTX | (16 &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='add'>+			    (CTR_RFC3686_NONCE_SIZE &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* Load iv */</div><div class='add'>+	append_seq_load(desc, ivsize, LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+			LDST_CLASS_1_CCB | (ctx1_iv_off &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Load counter into CONTEXT1 reg */</div><div class='add'>+	if (is_rfc3686)</div><div class='add'>+		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='add'>+				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='add'>+				      LDST_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Load operation */</div><div class='add'>+	append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_ENCRYPT);</div><div class='add'>+</div><div class='add'>+	/* Perform operation */</div><div class='add'>+	ablkcipher_append_src_dst(desc);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "ablkcipher enc shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_ablkcipher_encap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_ablkcipher_decap - ablkcipher decapsulation shared descriptor</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - one of OP_ALG_ALGSEL_{AES, DES, 3DES} ANDed</div><div class='add'>+ *         with OP_ALG_AAI_CBC or OP_ALG_AAI_CTR_MOD128.</div><div class='add'>+ * @ivsize: initialization vector size</div><div class='add'>+ * @is_rfc3686: true when ctr(aes) is wrapped by rfc3686 template</div><div class='add'>+ * @ctx1_iv_off: IV offset in CONTEXT1 register</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_ablkcipher_decap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+				  unsigned int ivsize, const bool is_rfc3686,</div><div class='add'>+				  const u32 ctx1_iv_off)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='add'>+	/* Skip if already shared */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+</div><div class='add'>+	/* Load class1 key only */</div><div class='add'>+	append_key_as_imm(desc, cdata-&gt;key_virt, cdata-&gt;keylen,</div><div class='add'>+			  cdata-&gt;keylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='add'>+</div><div class='add'>+	/* Load nonce into CONTEXT1 reg */</div><div class='add'>+	if (is_rfc3686) {</div><div class='add'>+		u8 *nonce = cdata-&gt;key_virt + cdata-&gt;keylen;</div><div class='add'>+</div><div class='add'>+		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,</div><div class='add'>+				   LDST_CLASS_IND_CCB |</div><div class='add'>+				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);</div><div class='add'>+		append_move(desc, MOVE_WAITCOMP | MOVE_SRC_OUTFIFO |</div><div class='add'>+			    MOVE_DEST_CLASS1CTX | (16 &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='add'>+			    (CTR_RFC3686_NONCE_SIZE &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* load IV */</div><div class='add'>+	append_seq_load(desc, ivsize, LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+			LDST_CLASS_1_CCB | (ctx1_iv_off &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Load counter into CONTEXT1 reg */</div><div class='add'>+	if (is_rfc3686)</div><div class='add'>+		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='add'>+				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='add'>+				      LDST_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Choose operation */</div><div class='add'>+	if (ctx1_iv_off)</div><div class='add'>+		append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+				 OP_ALG_DECRYPT);</div><div class='add'>+	else</div><div class='add'>+		append_dec_op1(desc, cdata-&gt;algtype);</div><div class='add'>+</div><div class='add'>+	/* Perform operation */</div><div class='add'>+	ablkcipher_append_src_dst(desc);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "ablkcipher dec shdesc@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_ablkcipher_decap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_ablkcipher_givencap - ablkcipher encapsulation shared descriptor</div><div class='add'>+ *                                   with HW-generated initialization vector.</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - one of OP_ALG_ALGSEL_{AES, DES, 3DES} ANDed</div><div class='add'>+ *         with OP_ALG_AAI_CBC.</div><div class='add'>+ * @ivsize: initialization vector size</div><div class='add'>+ * @is_rfc3686: true when ctr(aes) is wrapped by rfc3686 template</div><div class='add'>+ * @ctx1_iv_off: IV offset in CONTEXT1 register</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_ablkcipher_givencap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+				     unsigned int ivsize, const bool is_rfc3686,</div><div class='add'>+				     const u32 ctx1_iv_off)</div><div class='add'>+{</div><div class='add'>+	u32 *key_jump_cmd, geniv;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='add'>+	/* Skip if already shared */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+</div><div class='add'>+	/* Load class1 key only */</div><div class='add'>+	append_key_as_imm(desc, cdata-&gt;key_virt, cdata-&gt;keylen,</div><div class='add'>+			  cdata-&gt;keylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='add'>+</div><div class='add'>+	/* Load Nonce into CONTEXT1 reg */</div><div class='add'>+	if (is_rfc3686) {</div><div class='add'>+		u8 *nonce = cdata-&gt;key_virt + cdata-&gt;keylen;</div><div class='add'>+</div><div class='add'>+		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,</div><div class='add'>+				   LDST_CLASS_IND_CCB |</div><div class='add'>+				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);</div><div class='add'>+		append_move(desc, MOVE_WAITCOMP | MOVE_SRC_OUTFIFO |</div><div class='add'>+			    MOVE_DEST_CLASS1CTX | (16 &lt;&lt; MOVE_OFFSET_SHIFT) |</div><div class='add'>+			    (CTR_RFC3686_NONCE_SIZE &lt;&lt; MOVE_LEN_SHIFT));</div><div class='add'>+	}</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/* Generate IV */</div><div class='add'>+	geniv = NFIFOENTRY_STYPE_PAD | NFIFOENTRY_DEST_DECO |</div><div class='add'>+		NFIFOENTRY_DTYPE_MSG | NFIFOENTRY_LC1 | NFIFOENTRY_PTYPE_RND |</div><div class='add'>+		(ivsize &lt;&lt; NFIFOENTRY_DLEN_SHIFT);</div><div class='add'>+	append_load_imm_u32(desc, geniv, LDST_CLASS_IND_CCB |</div><div class='add'>+			    LDST_SRCDST_WORD_INFO_FIFO | LDST_IMM);</div><div class='add'>+	append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO);</div><div class='add'>+	append_move(desc, MOVE_WAITCOMP | MOVE_SRC_INFIFO |</div><div class='add'>+		    MOVE_DEST_CLASS1CTX | (ivsize &lt;&lt; MOVE_LEN_SHIFT) |</div><div class='add'>+		    (ctx1_iv_off &lt;&lt; MOVE_OFFSET_SHIFT));</div><div class='add'>+	append_cmd(desc, CMD_LOAD | ENABLE_AUTO_INFO_FIFO);</div><div class='add'>+</div><div class='add'>+	/* Copy generated IV to memory */</div><div class='add'>+	append_seq_store(desc, ivsize, LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+			 LDST_CLASS_1_CCB | (ctx1_iv_off &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Load Counter into CONTEXT1 reg */</div><div class='add'>+	if (is_rfc3686)</div><div class='add'>+		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |</div><div class='add'>+				     LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) &lt;&lt;</div><div class='add'>+				      LDST_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	if (ctx1_iv_off)</div><div class='add'>+		append_jump(desc, JUMP_JSL | JUMP_TEST_ALL | JUMP_COND_NCP |</div><div class='add'>+			    (1 &lt;&lt; JUMP_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Load operation */</div><div class='add'>+	append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_ENCRYPT);</div><div class='add'>+</div><div class='add'>+	/* Perform operation */</div><div class='add'>+	ablkcipher_append_src_dst(desc);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "ablkcipher givenc shdesc@" __stringify(__LINE__) ": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_ablkcipher_givencap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_xts_ablkcipher_encap - xts ablkcipher encapsulation shared</div><div class='add'>+ *                                    descriptor</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - OP_ALG_ALGSEL_AES ANDed with OP_ALG_AAI_XTS.</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_xts_ablkcipher_encap(u32 * const desc, struct alginfo *cdata)</div><div class='add'>+{</div><div class='add'>+	__be64 sector_size = cpu_to_be64(512);</div><div class='add'>+	u32 *key_jump_cmd;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='add'>+	/* Skip if already shared */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+</div><div class='add'>+	/* Load class1 keys only */</div><div class='add'>+	append_key_as_imm(desc, cdata-&gt;key_virt, cdata-&gt;keylen,</div><div class='add'>+			  cdata-&gt;keylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='add'>+</div><div class='add'>+	/* Load sector size with index 40 bytes (0x28) */</div><div class='add'>+	append_load_as_imm(desc, (void *)&amp;sector_size, 8, LDST_CLASS_1_CCB |</div><div class='add'>+			   LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+			   (0x28 &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * create sequence for loading the sector index</div><div class='add'>+	 * Upper 8B of IV - will be used as sector index</div><div class='add'>+	 * Lower 8B of IV - will be discarded</div><div class='add'>+	 */</div><div class='add'>+	append_seq_load(desc, 8, LDST_SRCDST_BYTE_CONTEXT | LDST_CLASS_1_CCB |</div><div class='add'>+			(0x20 &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='add'>+	append_seq_fifo_load(desc, 8, FIFOLD_CLASS_SKIP);</div><div class='add'>+</div><div class='add'>+	/* Load operation */</div><div class='add'>+	append_operation(desc, cdata-&gt;algtype | OP_ALG_AS_INITFINAL |</div><div class='add'>+			 OP_ALG_ENCRYPT);</div><div class='add'>+</div><div class='add'>+	/* Perform operation */</div><div class='add'>+	ablkcipher_append_src_dst(desc);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "xts ablkcipher enc shdesc@" __stringify(__LINE__) ": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_xts_ablkcipher_encap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cnstr_shdsc_xts_ablkcipher_decap - xts ablkcipher decapsulation shared</div><div class='add'>+ *                                    descriptor</div><div class='add'>+ * @desc: pointer to buffer used for descriptor construction</div><div class='add'>+ * @cdata: pointer to block cipher transform definitions</div><div class='add'>+ *         Valid algorithm values - OP_ALG_ALGSEL_AES ANDed with OP_ALG_AAI_XTS.</div><div class='add'>+ */</div><div class='add'>+void cnstr_shdsc_xts_ablkcipher_decap(u32 * const desc, struct alginfo *cdata)</div><div class='add'>+{</div><div class='add'>+	__be64 sector_size = cpu_to_be64(512);</div><div class='add'>+	u32 *key_jump_cmd;</div><div class='add'>+</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);</div><div class='add'>+	/* Skip if already shared */</div><div class='add'>+	key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+				   JUMP_COND_SHRD);</div><div class='add'>+</div><div class='add'>+	/* Load class1 key only */</div><div class='add'>+	append_key_as_imm(desc, cdata-&gt;key_virt, cdata-&gt;keylen,</div><div class='add'>+			  cdata-&gt;keylen, CLASS_1 | KEY_DEST_CLASS_REG);</div><div class='add'>+</div><div class='add'>+	/* Load sector size with index 40 bytes (0x28) */</div><div class='add'>+	append_load_as_imm(desc, (void *)&amp;sector_size, 8, LDST_CLASS_1_CCB |</div><div class='add'>+			   LDST_SRCDST_BYTE_CONTEXT |</div><div class='add'>+			   (0x28 &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='add'>+</div><div class='add'>+	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * create sequence for loading the sector index</div><div class='add'>+	 * Upper 8B of IV - will be used as sector index</div><div class='add'>+	 * Lower 8B of IV - will be discarded</div><div class='add'>+	 */</div><div class='add'>+	append_seq_load(desc, 8, LDST_SRCDST_BYTE_CONTEXT | LDST_CLASS_1_CCB |</div><div class='add'>+			(0x20 &lt;&lt; LDST_OFFSET_SHIFT));</div><div class='add'>+	append_seq_fifo_load(desc, 8, FIFOLD_CLASS_SKIP);</div><div class='add'>+</div><div class='add'>+	/* Load operation */</div><div class='add'>+	append_dec_op1(desc, cdata-&gt;algtype);</div><div class='add'>+</div><div class='add'>+	/* Perform operation */</div><div class='add'>+	ablkcipher_append_src_dst(desc);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	print_hex_dump(KERN_ERR,</div><div class='add'>+		       "xts ablkcipher dec shdesc@" __stringify(__LINE__) ": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cnstr_shdsc_xts_ablkcipher_decap);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("FSL CAAM descriptor support");</div><div class='add'>+MODULE_AUTHOR("Freescale Semiconductor - NMG/STC");</div><div class='head'>diff --git a/drivers/crypto/caam/caamalg_desc.h b/drivers/crypto/caam/caamalg_desc.h<br/>new file mode 100644<br/>index 000000000000..95551737333a<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/caamalg_desc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caamalg_desc.h</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+/*</div><div class='add'>+ * Shared descriptors for aead, ablkcipher algorithms</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2016 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CAAMALG_DESC_H_</div><div class='add'>+#define _CAAMALG_DESC_H_</div><div class='add'>+</div><div class='add'>+/* length of descriptors text */</div><div class='add'>+#define DESC_AEAD_BASE			(4 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_AEAD_ENC_LEN		(DESC_AEAD_BASE + 11 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_AEAD_DEC_LEN		(DESC_AEAD_BASE + 15 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_AEAD_GIVENC_LEN		(DESC_AEAD_ENC_LEN + 7 * CAAM_CMD_SZ)</div><div class='add'>+</div><div class='add'>+/* Note: Nonce is counted in cdata.keylen */</div><div class='add'>+#define DESC_AEAD_CTR_RFC3686_LEN	(4 * CAAM_CMD_SZ)</div><div class='add'>+</div><div class='add'>+#define DESC_AEAD_NULL_BASE		(3 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_AEAD_NULL_ENC_LEN		(DESC_AEAD_NULL_BASE + 11 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_AEAD_NULL_DEC_LEN		(DESC_AEAD_NULL_BASE + 13 * CAAM_CMD_SZ)</div><div class='add'>+</div><div class='add'>+#define DESC_GCM_BASE			(3 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_GCM_ENC_LEN		(DESC_GCM_BASE + 16 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_GCM_DEC_LEN		(DESC_GCM_BASE + 12 * CAAM_CMD_SZ)</div><div class='add'>+</div><div class='add'>+#define DESC_RFC4106_BASE		(3 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_RFC4106_ENC_LEN		(DESC_RFC4106_BASE + 13 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_RFC4106_DEC_LEN		(DESC_RFC4106_BASE + 13 * CAAM_CMD_SZ)</div><div class='add'>+</div><div class='add'>+#define DESC_RFC4543_BASE		(3 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_RFC4543_ENC_LEN		(DESC_RFC4543_BASE + 11 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_RFC4543_DEC_LEN		(DESC_RFC4543_BASE + 12 * CAAM_CMD_SZ)</div><div class='add'>+</div><div class='add'>+#define DESC_ABLKCIPHER_BASE		(3 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_ABLKCIPHER_ENC_LEN		(DESC_ABLKCIPHER_BASE + \</div><div class='add'>+					 20 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_ABLKCIPHER_DEC_LEN		(DESC_ABLKCIPHER_BASE + \</div><div class='add'>+					 15 * CAAM_CMD_SZ)</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_aead_null_encap(u32 * const desc, struct alginfo *adata,</div><div class='add'>+				 unsigned int icvsize);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_aead_null_decap(u32 * const desc, struct alginfo *adata,</div><div class='add'>+				 unsigned int icvsize);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_aead_encap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			    struct alginfo *adata, unsigned int icvsize,</div><div class='add'>+			    const bool is_rfc3686, u32 *nonce,</div><div class='add'>+			    const u32 ctx1_iv_off);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_aead_decap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			    struct alginfo *adata, unsigned int ivsize,</div><div class='add'>+			    unsigned int icvsize, const bool geniv,</div><div class='add'>+			    const bool is_rfc3686, u32 *nonce,</div><div class='add'>+			    const u32 ctx1_iv_off);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_aead_givencap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			       struct alginfo *adata, unsigned int ivsize,</div><div class='add'>+			       unsigned int icvsize, const bool is_rfc3686,</div><div class='add'>+			       u32 *nonce, const u32 ctx1_iv_off);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_gcm_encap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			   unsigned int icvsize);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_gcm_decap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			   unsigned int icvsize);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_rfc4106_encap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			       unsigned int icvsize);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_rfc4106_decap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			       unsigned int icvsize);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_rfc4543_encap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			       unsigned int icvsize);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_rfc4543_decap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+			       unsigned int icvsize);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_ablkcipher_encap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+				  unsigned int ivsize, const bool is_rfc3686,</div><div class='add'>+				  const u32 ctx1_iv_off);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_ablkcipher_decap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+				  unsigned int ivsize, const bool is_rfc3686,</div><div class='add'>+				  const u32 ctx1_iv_off);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_ablkcipher_givencap(u32 * const desc, struct alginfo *cdata,</div><div class='add'>+				     unsigned int ivsize, const bool is_rfc3686,</div><div class='add'>+				     const u32 ctx1_iv_off);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_xts_ablkcipher_encap(u32 * const desc, struct alginfo *cdata);</div><div class='add'>+</div><div class='add'>+void cnstr_shdsc_xts_ablkcipher_decap(u32 * const desc, struct alginfo *cdata);</div><div class='add'>+</div><div class='add'>+#endif /* _CAAMALG_DESC_H_ */</div><div class='head'>diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c<br/>index 660dc206969f..da4f94eab3da 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/caamhash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/caamhash.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/caamhash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caamhash.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@</div><div class='ctx'> #define CAAM_MAX_HASH_DIGEST_SIZE	SHA512_DIGEST_SIZE</div><div class='ctx'> </div><div class='ctx'> /* length of descriptors text */</div><div class='del'>-#define DESC_AHASH_BASE			(4 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_AHASH_BASE			(3 * CAAM_CMD_SZ)</div><div class='ctx'> #define DESC_AHASH_UPDATE_LEN		(6 * CAAM_CMD_SZ)</div><div class='ctx'> #define DESC_AHASH_UPDATE_FIRST_LEN	(DESC_AHASH_BASE + 4 * CAAM_CMD_SZ)</div><div class='ctx'> #define DESC_AHASH_FINAL_LEN		(DESC_AHASH_BASE + 5 * CAAM_CMD_SZ)</div><div class='hunk'>@@ -103,20 +103,14 @@ struct caam_hash_ctx {</div><div class='ctx'> 	u32 sh_desc_update_first[DESC_HASH_MAX_USED_LEN] ____cacheline_aligned;</div><div class='ctx'> 	u32 sh_desc_fin[DESC_HASH_MAX_USED_LEN] ____cacheline_aligned;</div><div class='ctx'> 	u32 sh_desc_digest[DESC_HASH_MAX_USED_LEN] ____cacheline_aligned;</div><div class='del'>-	u32 sh_desc_finup[DESC_HASH_MAX_USED_LEN] ____cacheline_aligned;</div><div class='ctx'> 	dma_addr_t sh_desc_update_dma ____cacheline_aligned;</div><div class='ctx'> 	dma_addr_t sh_desc_update_first_dma;</div><div class='ctx'> 	dma_addr_t sh_desc_fin_dma;</div><div class='ctx'> 	dma_addr_t sh_desc_digest_dma;</div><div class='del'>-	dma_addr_t sh_desc_finup_dma;</div><div class='ctx'> 	struct device *jrdev;</div><div class='del'>-	u32 alg_type;</div><div class='del'>-	u32 alg_op;</div><div class='ctx'> 	u8 key[CAAM_MAX_HASH_KEY_SIZE];</div><div class='del'>-	dma_addr_t key_dma;</div><div class='ctx'> 	int ctx_len;</div><div class='del'>-	unsigned int split_key_len;</div><div class='del'>-	unsigned int split_key_pad_len;</div><div class='add'>+	struct alginfo adata;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ahash state */</div><div class='hunk'>@@ -143,6 +137,31 @@ struct caam_export_state {</div><div class='ctx'> 	int (*finup)(struct ahash_request *req);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline void switch_buf(struct caam_hash_state *state)</div><div class='add'>+{</div><div class='add'>+	state-&gt;current_buf ^= 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 *current_buf(struct caam_hash_state *state)</div><div class='add'>+{</div><div class='add'>+	return state-&gt;current_buf ? state-&gt;buf_1 : state-&gt;buf_0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 *alt_buf(struct caam_hash_state *state)</div><div class='add'>+{</div><div class='add'>+	return state-&gt;current_buf ? state-&gt;buf_0 : state-&gt;buf_1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int *current_buflen(struct caam_hash_state *state)</div><div class='add'>+{</div><div class='add'>+	return state-&gt;current_buf ? &amp;state-&gt;buflen_1 : &amp;state-&gt;buflen_0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int *alt_buflen(struct caam_hash_state *state)</div><div class='add'>+{</div><div class='add'>+	return state-&gt;current_buf ? &amp;state-&gt;buflen_0 : &amp;state-&gt;buflen_1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Common job descriptor seq in/out ptr routines */</div><div class='ctx'> </div><div class='ctx'> /* Map state-&gt;caam_ctx, and append seq_out_ptr command that points to it */</div><div class='hunk'>@@ -154,6 +173,7 @@ static inline int map_seq_out_ptr_ctx(u32 *desc, struct device *jrdev,</div><div class='ctx'> 					ctx_len, DMA_FROM_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(jrdev, state-&gt;ctx_dma)) {</div><div class='ctx'> 		dev_err(jrdev, "unable to map ctx\n");</div><div class='add'>+		state-&gt;ctx_dma = 0;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -174,36 +194,27 @@ static inline dma_addr_t map_seq_out_ptr_result(u32 *desc, struct device *jrdev,</div><div class='ctx'> 	return dst_dma;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Map current buffer in state and put it in link table */</div><div class='del'>-static inline dma_addr_t buf_map_to_sec4_sg(struct device *jrdev,</div><div class='del'>-					    struct sec4_sg_entry *sec4_sg,</div><div class='del'>-					    u8 *buf, int buflen)</div><div class='add'>+/* Map current buffer in state (if length &gt; 0) and put it in link table */</div><div class='add'>+static inline int buf_map_to_sec4_sg(struct device *jrdev,</div><div class='add'>+				     struct sec4_sg_entry *sec4_sg,</div><div class='add'>+				     struct caam_hash_state *state)</div><div class='ctx'> {</div><div class='del'>-	dma_addr_t buf_dma;</div><div class='add'>+	int buflen = *current_buflen(state);</div><div class='ctx'> </div><div class='del'>-	buf_dma = dma_map_single(jrdev, buf, buflen, DMA_TO_DEVICE);</div><div class='del'>-	dma_to_sec4_sg_one(sec4_sg, buf_dma, buflen, 0);</div><div class='add'>+	if (!buflen)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return buf_dma;</div><div class='del'>-}</div><div class='add'>+	state-&gt;buf_dma = dma_map_single(jrdev, current_buf(state), buflen,</div><div class='add'>+					DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(jrdev, state-&gt;buf_dma)) {</div><div class='add'>+		dev_err(jrdev, "unable to map buf\n");</div><div class='add'>+		state-&gt;buf_dma = 0;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Only put buffer in link table if it contains data, which is possible,</div><div class='del'>- * since a buffer has previously been used, and needs to be unmapped,</div><div class='del'>- */</div><div class='del'>-static inline dma_addr_t</div><div class='del'>-try_buf_map_to_sec4_sg(struct device *jrdev, struct sec4_sg_entry *sec4_sg,</div><div class='del'>-		       u8 *buf, dma_addr_t buf_dma, int buflen,</div><div class='del'>-		       int last_buflen)</div><div class='del'>-{</div><div class='del'>-	if (buf_dma &amp;&amp; !dma_mapping_error(jrdev, buf_dma))</div><div class='del'>-		dma_unmap_single(jrdev, buf_dma, last_buflen, DMA_TO_DEVICE);</div><div class='del'>-	if (buflen)</div><div class='del'>-		buf_dma = buf_map_to_sec4_sg(jrdev, sec4_sg, buf, buflen);</div><div class='del'>-	else</div><div class='del'>-		buf_dma = 0;</div><div class='del'>-</div><div class='del'>-	return buf_dma;</div><div class='add'>+	dma_to_sec4_sg_one(sec4_sg, state-&gt;buf_dma, buflen, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Map state-&gt;caam_ctx, and add it to link table */</div><div class='hunk'>@@ -214,6 +225,7 @@ static inline int ctx_map_to_sec4_sg(u32 *desc, struct device *jrdev,</div><div class='ctx'> 	state-&gt;ctx_dma = dma_map_single(jrdev, state-&gt;caam_ctx, ctx_len, flag);</div><div class='ctx'> 	if (dma_mapping_error(jrdev, state-&gt;ctx_dma)) {</div><div class='ctx'> 		dev_err(jrdev, "unable to map ctx\n");</div><div class='add'>+		state-&gt;ctx_dma = 0;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -222,89 +234,54 @@ static inline int ctx_map_to_sec4_sg(u32 *desc, struct device *jrdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Common shared descriptor commands */</div><div class='del'>-static inline void append_key_ahash(u32 *desc, struct caam_hash_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	append_key_as_imm(desc, ctx-&gt;key, ctx-&gt;split_key_pad_len,</div><div class='del'>-			  ctx-&gt;split_key_len, CLASS_2 |</div><div class='del'>-			  KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Append key if it has been set */</div><div class='del'>-static inline void init_sh_desc_key_ahash(u32 *desc, struct caam_hash_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	u32 *key_jump_cmd;</div><div class='del'>-</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;split_key_len) {</div><div class='del'>-		/* Skip if already shared */</div><div class='del'>-		key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='del'>-					   JUMP_COND_SHRD);</div><div class='del'>-</div><div class='del'>-		append_key_ahash(desc, ctx);</div><div class='del'>-</div><div class='del'>-		set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Propagate errors from shared to job descriptor */</div><div class='del'>-	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * For ahash read data from seqin following state-&gt;caam_ctx,</div><div class='del'>- * and write resulting class2 context to seqout, which may be state-&gt;caam_ctx</div><div class='del'>- * or req-&gt;result</div><div class='add'>+ * For ahash update, final and finup (import_ctx = true)</div><div class='add'>+ *     import context, read and write to seqout</div><div class='add'>+ * For ahash firsts and digest (import_ctx = false)</div><div class='add'>+ *     read and write to seqout</div><div class='ctx'>  */</div><div class='del'>-static inline void ahash_append_load_str(u32 *desc, int digestsize)</div><div class='add'>+static inline void ahash_gen_sh_desc(u32 *desc, u32 state, int digestsize,</div><div class='add'>+				     struct caam_hash_ctx *ctx, bool import_ctx)</div><div class='ctx'> {</div><div class='del'>-	/* Calculate remaining bytes to read */</div><div class='del'>-	append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='del'>-</div><div class='del'>-	/* Read remaining bytes */</div><div class='del'>-	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_LAST2 |</div><div class='del'>-			     FIFOLD_TYPE_MSG | KEY_VLF);</div><div class='add'>+	u32 op = ctx-&gt;adata.algtype;</div><div class='add'>+	u32 *skip_key_load;</div><div class='ctx'> </div><div class='del'>-	/* Store class2 context bytes */</div><div class='del'>-	append_seq_store(desc, digestsize, LDST_CLASS_2_CCB |</div><div class='del'>-			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='del'>-}</div><div class='add'>+	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * For ahash update, final and finup, import context, read and write to seqout</div><div class='del'>- */</div><div class='del'>-static inline void ahash_ctx_data_to_out(u32 *desc, u32 op, u32 state,</div><div class='del'>-					 int digestsize,</div><div class='del'>-					 struct caam_hash_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	init_sh_desc_key_ahash(desc, ctx);</div><div class='add'>+	/* Append key if it has been set; ahash update excluded */</div><div class='add'>+	if ((state != OP_ALG_AS_UPDATE) &amp;&amp; (ctx-&gt;adata.keylen)) {</div><div class='add'>+		/* Skip key loading if already shared */</div><div class='add'>+		skip_key_load = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |</div><div class='add'>+					    JUMP_COND_SHRD);</div><div class='ctx'> </div><div class='del'>-	/* Import context from software */</div><div class='del'>-	append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-		   LDST_CLASS_2_CCB | ctx-&gt;ctx_len);</div><div class='add'>+		append_key_as_imm(desc, ctx-&gt;key, ctx-&gt;adata.keylen_pad,</div><div class='add'>+				  ctx-&gt;adata.keylen, CLASS_2 |</div><div class='add'>+				  KEY_DEST_MDHA_SPLIT | KEY_ENC);</div><div class='ctx'> </div><div class='del'>-	/* Class 2 operation */</div><div class='del'>-	append_operation(desc, op | state | OP_ALG_ENCRYPT);</div><div class='add'>+		set_jump_tgt_here(desc, skip_key_load);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Load from buf and/or src and write to req-&gt;result or state-&gt;context</div><div class='del'>-	 */</div><div class='del'>-	ahash_append_load_str(desc, digestsize);</div><div class='del'>-}</div><div class='add'>+		op |= OP_ALG_AAI_HMAC_PRECOMP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-/* For ahash firsts and digest, read and write to seqout */</div><div class='del'>-static inline void ahash_data_to_out(u32 *desc, u32 op, u32 state,</div><div class='del'>-				     int digestsize, struct caam_hash_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	init_sh_desc_key_ahash(desc, ctx);</div><div class='add'>+	/* If needed, import context from software */</div><div class='add'>+	if (import_ctx)</div><div class='add'>+		append_seq_load(desc, ctx-&gt;ctx_len, LDST_CLASS_2_CCB |</div><div class='add'>+				LDST_SRCDST_BYTE_CONTEXT);</div><div class='ctx'> </div><div class='ctx'> 	/* Class 2 operation */</div><div class='ctx'> 	append_operation(desc, op | state | OP_ALG_ENCRYPT);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Load from buf and/or src and write to req-&gt;result or state-&gt;context</div><div class='add'>+	 * Calculate remaining bytes to read</div><div class='ctx'> 	 */</div><div class='del'>-	ahash_append_load_str(desc, digestsize);</div><div class='add'>+	append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);</div><div class='add'>+	/* Read remaining bytes */</div><div class='add'>+	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_LAST2 |</div><div class='add'>+			     FIFOLD_TYPE_MSG | KEY_VLF);</div><div class='add'>+	/* Store class2 context bytes */</div><div class='add'>+	append_seq_store(desc, digestsize, LDST_CLASS_2_CCB |</div><div class='add'>+			 LDST_SRCDST_BYTE_CONTEXT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ahash_set_sh_desc(struct crypto_ahash *ahash)</div><div class='hunk'>@@ -312,34 +289,13 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash)</div><div class='ctx'> 	struct caam_hash_ctx *ctx = crypto_ahash_ctx(ahash);</div><div class='ctx'> 	int digestsize = crypto_ahash_digestsize(ahash);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='del'>-	u32 have_key = 0;</div><div class='ctx'> 	u32 *desc;</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;split_key_len)</div><div class='del'>-		have_key = OP_ALG_AAI_HMAC_PRECOMP;</div><div class='del'>-</div><div class='ctx'> 	/* ahash_update shared descriptor */</div><div class='ctx'> 	desc = ctx-&gt;sh_desc_update;</div><div class='del'>-</div><div class='del'>-	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='del'>-</div><div class='del'>-	/* Import context from software */</div><div class='del'>-	append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT |</div><div class='del'>-		   LDST_CLASS_2_CCB | ctx-&gt;ctx_len);</div><div class='del'>-</div><div class='del'>-	/* Class 2 operation */</div><div class='del'>-	append_operation(desc, ctx-&gt;alg_type | OP_ALG_AS_UPDATE |</div><div class='del'>-			 OP_ALG_ENCRYPT);</div><div class='del'>-</div><div class='del'>-	/* Load data and write to result or context */</div><div class='del'>-	ahash_append_load_str(desc, ctx-&gt;ctx_len);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_update_dma = dma_map_single(jrdev, desc, desc_bytes(desc),</div><div class='del'>-						 DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_update_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	ahash_gen_sh_desc(desc, OP_ALG_AS_UPDATE, ctx-&gt;ctx_len, ctx, true);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_update_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	print_hex_dump(KERN_ERR,</div><div class='ctx'> 		       "ahash update shdesc@"__stringify(__LINE__)": ",</div><div class='hunk'>@@ -348,17 +304,9 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash)</div><div class='ctx'> </div><div class='ctx'> 	/* ahash_update_first shared descriptor */</div><div class='ctx'> 	desc = ctx-&gt;sh_desc_update_first;</div><div class='del'>-</div><div class='del'>-	ahash_data_to_out(desc, have_key | ctx-&gt;alg_type, OP_ALG_AS_INIT,</div><div class='del'>-			  ctx-&gt;ctx_len, ctx);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_update_first_dma = dma_map_single(jrdev, desc,</div><div class='del'>-						       desc_bytes(desc),</div><div class='del'>-						       DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_update_first_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	ahash_gen_sh_desc(desc, OP_ALG_AS_INIT, ctx-&gt;ctx_len, ctx, false);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_update_first_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	print_hex_dump(KERN_ERR,</div><div class='ctx'> 		       "ahash update first shdesc@"__stringify(__LINE__)": ",</div><div class='hunk'>@@ -367,53 +315,20 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash)</div><div class='ctx'> </div><div class='ctx'> 	/* ahash_final shared descriptor */</div><div class='ctx'> 	desc = ctx-&gt;sh_desc_fin;</div><div class='del'>-</div><div class='del'>-	ahash_ctx_data_to_out(desc, have_key | ctx-&gt;alg_type,</div><div class='del'>-			      OP_ALG_AS_FINALIZE, digestsize, ctx);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_fin_dma = dma_map_single(jrdev, desc, desc_bytes(desc),</div><div class='del'>-					      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_fin_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	ahash_gen_sh_desc(desc, OP_ALG_AS_FINALIZE, digestsize, ctx, true);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_fin_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	print_hex_dump(KERN_ERR, "ahash final shdesc@"__stringify(__LINE__)": ",</div><div class='ctx'> 		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='ctx'> 		       desc_bytes(desc), 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* ahash_finup shared descriptor */</div><div class='del'>-	desc = ctx-&gt;sh_desc_finup;</div><div class='del'>-</div><div class='del'>-	ahash_ctx_data_to_out(desc, have_key | ctx-&gt;alg_type,</div><div class='del'>-			      OP_ALG_AS_FINALIZE, digestsize, ctx);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_finup_dma = dma_map_single(jrdev, desc, desc_bytes(desc),</div><div class='del'>-						DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_finup_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	print_hex_dump(KERN_ERR, "ahash finup shdesc@"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, desc,</div><div class='del'>-		       desc_bytes(desc), 1);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* ahash_digest shared descriptor */</div><div class='ctx'> 	desc = ctx-&gt;sh_desc_digest;</div><div class='del'>-</div><div class='del'>-	ahash_data_to_out(desc, have_key | ctx-&gt;alg_type, OP_ALG_AS_INITFINAL,</div><div class='del'>-			  digestsize, ctx);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;sh_desc_digest_dma = dma_map_single(jrdev, desc,</div><div class='del'>-						 desc_bytes(desc),</div><div class='del'>-						 DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;sh_desc_digest_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map shared descriptor\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	ahash_gen_sh_desc(desc, OP_ALG_AS_INITFINAL, digestsize, ctx, false);</div><div class='add'>+	dma_sync_single_for_device(jrdev, ctx-&gt;sh_desc_digest_dma,</div><div class='add'>+				   desc_bytes(desc), DMA_TO_DEVICE);</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	print_hex_dump(KERN_ERR,</div><div class='ctx'> 		       "ahash digest shdesc@"__stringify(__LINE__)": ",</div><div class='hunk'>@@ -424,14 +339,6 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gen_split_hash_key(struct caam_hash_ctx *ctx, const u8 *key_in,</div><div class='del'>-			      u32 keylen)</div><div class='del'>-{</div><div class='del'>-	return gen_split_key(ctx-&gt;jrdev, ctx-&gt;key, ctx-&gt;split_key_len,</div><div class='del'>-			       ctx-&gt;split_key_pad_len, key_in, keylen,</div><div class='del'>-			       ctx-&gt;alg_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Digest hash size if it is too large */</div><div class='ctx'> static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,</div><div class='ctx'> 			   u32 *keylen, u8 *key_out, u32 digestsize)</div><div class='hunk'>@@ -467,7 +374,7 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Job descriptor to perform unkeyed hash on key_in */</div><div class='del'>-	append_operation(desc, ctx-&gt;alg_type | OP_ALG_ENCRYPT |</div><div class='add'>+	append_operation(desc, ctx-&gt;adata.algtype | OP_ALG_ENCRYPT |</div><div class='ctx'> 			 OP_ALG_AS_INITFINAL);</div><div class='ctx'> 	append_seq_in_ptr(desc, src_dma, *keylen, 0);</div><div class='ctx'> 	append_seq_fifo_load(desc, *keylen, FIFOLD_CLASS_CLASS2 |</div><div class='hunk'>@@ -511,10 +418,7 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,</div><div class='ctx'> static int ahash_setkey(struct crypto_ahash *ahash,</div><div class='ctx'> 			const u8 *key, unsigned int keylen)</div><div class='ctx'> {</div><div class='del'>-	/* Sizes for MDHA pads (*not* keys): MD5, SHA1, 224, 256, 384, 512 */</div><div class='del'>-	static const u8 mdpadlen[] = { 16, 20, 32, 32, 64, 64 };</div><div class='ctx'> 	struct caam_hash_ctx *ctx = crypto_ahash_ctx(ahash);</div><div class='del'>-	struct device *jrdev = ctx-&gt;jrdev;</div><div class='ctx'> 	int blocksize = crypto_tfm_alg_blocksize(&amp;ahash-&gt;base);</div><div class='ctx'> 	int digestsize = crypto_ahash_digestsize(ahash);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -537,43 +441,19 @@ static int ahash_setkey(struct crypto_ahash *ahash,</div><div class='ctx'> 		key = hashed_key;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Pick class 2 key length from algorithm submask */</div><div class='del'>-	ctx-&gt;split_key_len = mdpadlen[(ctx-&gt;alg_op &amp; OP_ALG_ALGSEL_SUBMASK) &gt;&gt;</div><div class='del'>-				      OP_ALG_ALGSEL_SHIFT] * 2;</div><div class='del'>-	ctx-&gt;split_key_pad_len = ALIGN(ctx-&gt;split_key_len, 16);</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_ERR "split_key_len %d split_key_pad_len %d\n",</div><div class='del'>-	       ctx-&gt;split_key_len, ctx-&gt;split_key_pad_len);</div><div class='del'>-	print_hex_dump(KERN_ERR, "key in @"__stringify(__LINE__)": ",</div><div class='del'>-		       DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ret = gen_split_hash_key(ctx, key, keylen);</div><div class='add'>+	ret = gen_split_key(ctx-&gt;jrdev, ctx-&gt;key, &amp;ctx-&gt;adata, key, keylen,</div><div class='add'>+			    CAAM_MAX_HASH_KEY_SIZE);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto bad_free_key;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;key_dma = dma_map_single(jrdev, ctx-&gt;key, ctx-&gt;split_key_pad_len,</div><div class='del'>-				      DMA_TO_DEVICE);</div><div class='del'>-	if (dma_mapping_error(jrdev, ctx-&gt;key_dma)) {</div><div class='del'>-		dev_err(jrdev, "unable to map key i/o memory\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto error_free_key;</div><div class='del'>-	}</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	print_hex_dump(KERN_ERR, "ctx.key@"__stringify(__LINE__)": ",</div><div class='ctx'> 		       DUMP_PREFIX_ADDRESS, 16, 4, ctx-&gt;key,</div><div class='del'>-		       ctx-&gt;split_key_pad_len, 1);</div><div class='add'>+		       ctx-&gt;adata.keylen_pad, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	ret = ahash_set_sh_desc(ahash);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dma_unmap_single(jrdev, ctx-&gt;key_dma, ctx-&gt;split_key_pad_len,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	}</div><div class='del'>- error_free_key:</div><div class='ctx'> 	kfree(hashed_key);</div><div class='del'>-	return ret;</div><div class='add'>+	return ahash_set_sh_desc(ahash);</div><div class='ctx'>  bad_free_key:</div><div class='ctx'> 	kfree(hashed_key);</div><div class='ctx'> 	crypto_ahash_set_flags(ahash, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='hunk'>@@ -602,6 +482,8 @@ static inline void ahash_unmap(struct device *dev,</div><div class='ctx'> 			struct ahash_edesc *edesc,</div><div class='ctx'> 			struct ahash_request *req, int dst_len)</div><div class='ctx'> {</div><div class='add'>+	struct caam_hash_state *state = ahash_request_ctx(req);</div><div class='add'>+</div><div class='ctx'> 	if (edesc-&gt;src_nents)</div><div class='ctx'> 		dma_unmap_sg(dev, req-&gt;src, edesc-&gt;src_nents, DMA_TO_DEVICE);</div><div class='ctx'> 	if (edesc-&gt;dst_dma)</div><div class='hunk'>@@ -610,6 +492,12 @@ static inline void ahash_unmap(struct device *dev,</div><div class='ctx'> 	if (edesc-&gt;sec4_sg_bytes)</div><div class='ctx'> 		dma_unmap_single(dev, edesc-&gt;sec4_sg_dma,</div><div class='ctx'> 				 edesc-&gt;sec4_sg_bytes, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	if (state-&gt;buf_dma) {</div><div class='add'>+		dma_unmap_single(dev, state-&gt;buf_dma, *current_buflen(state),</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+		state-&gt;buf_dma = 0;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ahash_unmap_ctx(struct device *dev,</div><div class='hunk'>@@ -620,8 +508,10 @@ static inline void ahash_unmap_ctx(struct device *dev,</div><div class='ctx'> 	struct caam_hash_ctx *ctx = crypto_ahash_ctx(ahash);</div><div class='ctx'> 	struct caam_hash_state *state = ahash_request_ctx(req);</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;ctx_dma)</div><div class='add'>+	if (state-&gt;ctx_dma) {</div><div class='ctx'> 		dma_unmap_single(dev, state-&gt;ctx_dma, ctx-&gt;ctx_len, flag);</div><div class='add'>+		state-&gt;ctx_dma = 0;</div><div class='add'>+	}</div><div class='ctx'> 	ahash_unmap(dev, edesc, req, dst_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -639,8 +529,7 @@ static void ahash_done(struct device *jrdev, u32 *desc, u32 err,</div><div class='ctx'> 	dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	edesc = (struct ahash_edesc *)((char *)desc -</div><div class='del'>-		 offsetof(struct ahash_edesc, hw_desc));</div><div class='add'>+	edesc = container_of(desc, struct ahash_edesc, hw_desc[0]);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		caam_jr_strstatus(jrdev, err);</div><div class='ctx'> </div><div class='hunk'>@@ -667,19 +556,19 @@ static void ahash_done_bi(struct device *jrdev, u32 *desc, u32 err,</div><div class='ctx'> 	struct ahash_edesc *edesc;</div><div class='ctx'> 	struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);</div><div class='ctx'> 	struct caam_hash_ctx *ctx = crypto_ahash_ctx(ahash);</div><div class='del'>-#ifdef DEBUG</div><div class='ctx'> 	struct caam_hash_state *state = ahash_request_ctx(req);</div><div class='add'>+#ifdef DEBUG</div><div class='ctx'> 	int digestsize = crypto_ahash_digestsize(ahash);</div><div class='ctx'> </div><div class='ctx'> 	dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	edesc = (struct ahash_edesc *)((char *)desc -</div><div class='del'>-		 offsetof(struct ahash_edesc, hw_desc));</div><div class='add'>+	edesc = container_of(desc, struct ahash_edesc, hw_desc[0]);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		caam_jr_strstatus(jrdev, err);</div><div class='ctx'> </div><div class='ctx'> 	ahash_unmap_ctx(jrdev, edesc, req, ctx-&gt;ctx_len, DMA_BIDIRECTIONAL);</div><div class='add'>+	switch_buf(state);</div><div class='ctx'> 	kfree(edesc);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -709,8 +598,7 @@ static void ahash_done_ctx_src(struct device *jrdev, u32 *desc, u32 err,</div><div class='ctx'> 	dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	edesc = (struct ahash_edesc *)((char *)desc -</div><div class='del'>-		 offsetof(struct ahash_edesc, hw_desc));</div><div class='add'>+	edesc = container_of(desc, struct ahash_edesc, hw_desc[0]);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		caam_jr_strstatus(jrdev, err);</div><div class='ctx'> </div><div class='hunk'>@@ -737,19 +625,19 @@ static void ahash_done_ctx_dst(struct device *jrdev, u32 *desc, u32 err,</div><div class='ctx'> 	struct ahash_edesc *edesc;</div><div class='ctx'> 	struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);</div><div class='ctx'> 	struct caam_hash_ctx *ctx = crypto_ahash_ctx(ahash);</div><div class='del'>-#ifdef DEBUG</div><div class='ctx'> 	struct caam_hash_state *state = ahash_request_ctx(req);</div><div class='add'>+#ifdef DEBUG</div><div class='ctx'> 	int digestsize = crypto_ahash_digestsize(ahash);</div><div class='ctx'> </div><div class='ctx'> 	dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	edesc = (struct ahash_edesc *)((char *)desc -</div><div class='del'>-		 offsetof(struct ahash_edesc, hw_desc));</div><div class='add'>+	edesc = container_of(desc, struct ahash_edesc, hw_desc[0]);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		caam_jr_strstatus(jrdev, err);</div><div class='ctx'> </div><div class='ctx'> 	ahash_unmap_ctx(jrdev, edesc, req, ctx-&gt;ctx_len, DMA_FROM_DEVICE);</div><div class='add'>+	switch_buf(state);</div><div class='ctx'> 	kfree(edesc);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -833,11 +721,10 @@ static int ahash_update_ctx(struct ahash_request *req)</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='ctx'> 	gfp_t flags = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='del'>-	u8 *buf = state-&gt;current_buf ? state-&gt;buf_1 : state-&gt;buf_0;</div><div class='del'>-	int *buflen = state-&gt;current_buf ? &amp;state-&gt;buflen_1 : &amp;state-&gt;buflen_0;</div><div class='del'>-	u8 *next_buf = state-&gt;current_buf ? state-&gt;buf_0 : state-&gt;buf_1;</div><div class='del'>-	int *next_buflen = state-&gt;current_buf ? &amp;state-&gt;buflen_0 :</div><div class='del'>-			   &amp;state-&gt;buflen_1, last_buflen;</div><div class='add'>+	u8 *buf = current_buf(state);</div><div class='add'>+	int *buflen = current_buflen(state);</div><div class='add'>+	u8 *next_buf = alt_buf(state);</div><div class='add'>+	int *next_buflen = alt_buflen(state), last_buflen;</div><div class='ctx'> 	int in_len = *buflen + req-&gt;nbytes, to_hash;</div><div class='ctx'> 	u32 *desc;</div><div class='ctx'> 	int src_nents, mapped_nents, sec4_sg_bytes, sec4_sg_src_index;</div><div class='hunk'>@@ -891,10 +778,9 @@ static int ahash_update_ctx(struct ahash_request *req)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto unmap_ctx;</div><div class='ctx'> </div><div class='del'>-		state-&gt;buf_dma = try_buf_map_to_sec4_sg(jrdev,</div><div class='del'>-							edesc-&gt;sec4_sg + 1,</div><div class='del'>-							buf, state-&gt;buf_dma,</div><div class='del'>-							*buflen, last_buflen);</div><div class='add'>+		ret = buf_map_to_sec4_sg(jrdev, edesc-&gt;sec4_sg + 1, state);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unmap_ctx;</div><div class='ctx'> </div><div class='ctx'> 		if (mapped_nents) {</div><div class='ctx'> 			sg_to_sec4_sg_last(req-&gt;src, mapped_nents,</div><div class='hunk'>@@ -909,8 +795,6 @@ static int ahash_update_ctx(struct ahash_request *req)</div><div class='ctx'> 				cpu_to_caam32(SEC4_SG_LEN_FIN);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		state-&gt;current_buf = !state-&gt;current_buf;</div><div class='del'>-</div><div class='ctx'> 		desc = edesc-&gt;hw_desc;</div><div class='ctx'> </div><div class='ctx'> 		edesc-&gt;sec4_sg_dma = dma_map_single(jrdev, edesc-&gt;sec4_sg,</div><div class='hunk'>@@ -967,10 +851,7 @@ static int ahash_final_ctx(struct ahash_request *req)</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='ctx'> 	gfp_t flags = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='del'>-	u8 *buf = state-&gt;current_buf ? state-&gt;buf_1 : state-&gt;buf_0;</div><div class='del'>-	int buflen = state-&gt;current_buf ? state-&gt;buflen_1 : state-&gt;buflen_0;</div><div class='del'>-	int last_buflen = state-&gt;current_buf ? state-&gt;buflen_0 :</div><div class='del'>-			  state-&gt;buflen_1;</div><div class='add'>+	int buflen = *current_buflen(state);</div><div class='ctx'> 	u32 *desc;</div><div class='ctx'> 	int sec4_sg_bytes, sec4_sg_src_index;</div><div class='ctx'> 	int digestsize = crypto_ahash_digestsize(ahash);</div><div class='hunk'>@@ -997,9 +878,10 @@ static int ahash_final_ctx(struct ahash_request *req)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto unmap_ctx;</div><div class='ctx'> </div><div class='del'>-	state-&gt;buf_dma = try_buf_map_to_sec4_sg(jrdev, edesc-&gt;sec4_sg + 1,</div><div class='del'>-						buf, state-&gt;buf_dma, buflen,</div><div class='del'>-						last_buflen);</div><div class='add'>+	ret = buf_map_to_sec4_sg(jrdev, edesc-&gt;sec4_sg + 1, state);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unmap_ctx;</div><div class='add'>+</div><div class='ctx'> 	(edesc-&gt;sec4_sg + sec4_sg_src_index - 1)-&gt;len |=</div><div class='ctx'> 		cpu_to_caam32(SEC4_SG_LEN_FIN);</div><div class='ctx'> </div><div class='hunk'>@@ -1046,10 +928,7 @@ static int ahash_finup_ctx(struct ahash_request *req)</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='ctx'> 	gfp_t flags = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='del'>-	u8 *buf = state-&gt;current_buf ? state-&gt;buf_1 : state-&gt;buf_0;</div><div class='del'>-	int buflen = state-&gt;current_buf ? state-&gt;buflen_1 : state-&gt;buflen_0;</div><div class='del'>-	int last_buflen = state-&gt;current_buf ? state-&gt;buflen_0 :</div><div class='del'>-			  state-&gt;buflen_1;</div><div class='add'>+	int buflen = *current_buflen(state);</div><div class='ctx'> 	u32 *desc;</div><div class='ctx'> 	int sec4_sg_src_index;</div><div class='ctx'> 	int src_nents, mapped_nents;</div><div class='hunk'>@@ -1078,7 +957,7 @@ static int ahash_finup_ctx(struct ahash_request *req)</div><div class='ctx'> </div><div class='ctx'> 	/* allocate space for base edesc and hw desc commands, link tables */</div><div class='ctx'> 	edesc = ahash_edesc_alloc(ctx, sec4_sg_src_index + mapped_nents,</div><div class='del'>-				  ctx-&gt;sh_desc_finup, ctx-&gt;sh_desc_finup_dma,</div><div class='add'>+				  ctx-&gt;sh_desc_fin, ctx-&gt;sh_desc_fin_dma,</div><div class='ctx'> 				  flags);</div><div class='ctx'> 	if (!edesc) {</div><div class='ctx'> 		dma_unmap_sg(jrdev, req-&gt;src, src_nents, DMA_TO_DEVICE);</div><div class='hunk'>@@ -1094,9 +973,9 @@ static int ahash_finup_ctx(struct ahash_request *req)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto unmap_ctx;</div><div class='ctx'> </div><div class='del'>-	state-&gt;buf_dma = try_buf_map_to_sec4_sg(jrdev, edesc-&gt;sec4_sg + 1,</div><div class='del'>-						buf, state-&gt;buf_dma, buflen,</div><div class='del'>-						last_buflen);</div><div class='add'>+	ret = buf_map_to_sec4_sg(jrdev, edesc-&gt;sec4_sg + 1, state);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unmap_ctx;</div><div class='ctx'> </div><div class='ctx'> 	ret = ahash_edesc_add_src(ctx, edesc, req, mapped_nents,</div><div class='ctx'> 				  sec4_sg_src_index, ctx-&gt;ctx_len + buflen,</div><div class='hunk'>@@ -1132,6 +1011,7 @@ static int ahash_digest(struct ahash_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);</div><div class='ctx'> 	struct caam_hash_ctx *ctx = crypto_ahash_ctx(ahash);</div><div class='add'>+	struct caam_hash_state *state = ahash_request_ctx(req);</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='ctx'> 	gfp_t flags = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='hunk'>@@ -1141,6 +1021,8 @@ static int ahash_digest(struct ahash_request *req)</div><div class='ctx'> 	struct ahash_edesc *edesc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	state-&gt;buf_dma = 0;</div><div class='add'>+</div><div class='ctx'> 	src_nents = sg_nents_for_len(req-&gt;src, req-&gt;nbytes);</div><div class='ctx'> 	if (src_nents &lt; 0) {</div><div class='ctx'> 		dev_err(jrdev, "Invalid number of src SG.\n");</div><div class='hunk'>@@ -1213,8 +1095,8 @@ static int ahash_final_no_ctx(struct ahash_request *req)</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='ctx'> 	gfp_t flags = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='del'>-	u8 *buf = state-&gt;current_buf ? state-&gt;buf_1 : state-&gt;buf_0;</div><div class='del'>-	int buflen = state-&gt;current_buf ? state-&gt;buflen_1 : state-&gt;buflen_0;</div><div class='add'>+	u8 *buf = current_buf(state);</div><div class='add'>+	int buflen = *current_buflen(state);</div><div class='ctx'> 	u32 *desc;</div><div class='ctx'> 	int digestsize = crypto_ahash_digestsize(ahash);</div><div class='ctx'> 	struct ahash_edesc *edesc;</div><div class='hunk'>@@ -1274,11 +1156,10 @@ static int ahash_update_no_ctx(struct ahash_request *req)</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='ctx'> 	gfp_t flags = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='del'>-	u8 *buf = state-&gt;current_buf ? state-&gt;buf_1 : state-&gt;buf_0;</div><div class='del'>-	int *buflen = state-&gt;current_buf ? &amp;state-&gt;buflen_1 : &amp;state-&gt;buflen_0;</div><div class='del'>-	u8 *next_buf = state-&gt;current_buf ? state-&gt;buf_0 : state-&gt;buf_1;</div><div class='del'>-	int *next_buflen = state-&gt;current_buf ? &amp;state-&gt;buflen_0 :</div><div class='del'>-			   &amp;state-&gt;buflen_1;</div><div class='add'>+	u8 *buf = current_buf(state);</div><div class='add'>+	int *buflen = current_buflen(state);</div><div class='add'>+	u8 *next_buf = alt_buf(state);</div><div class='add'>+	int *next_buflen = alt_buflen(state);</div><div class='ctx'> 	int in_len = *buflen + req-&gt;nbytes, to_hash;</div><div class='ctx'> 	int sec4_sg_bytes, src_nents, mapped_nents;</div><div class='ctx'> 	struct ahash_edesc *edesc;</div><div class='hunk'>@@ -1327,8 +1208,10 @@ static int ahash_update_no_ctx(struct ahash_request *req)</div><div class='ctx'> 		edesc-&gt;sec4_sg_bytes = sec4_sg_bytes;</div><div class='ctx'> 		edesc-&gt;dst_dma = 0;</div><div class='ctx'> </div><div class='del'>-		state-&gt;buf_dma = buf_map_to_sec4_sg(jrdev, edesc-&gt;sec4_sg,</div><div class='del'>-						    buf, *buflen);</div><div class='add'>+		ret = buf_map_to_sec4_sg(jrdev, edesc-&gt;sec4_sg, state);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unmap_ctx;</div><div class='add'>+</div><div class='ctx'> 		sg_to_sec4_sg_last(req-&gt;src, mapped_nents,</div><div class='ctx'> 				   edesc-&gt;sec4_sg + 1, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1338,8 +1221,6 @@ static int ahash_update_no_ctx(struct ahash_request *req)</div><div class='ctx'> 						 *next_buflen, 0);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		state-&gt;current_buf = !state-&gt;current_buf;</div><div class='del'>-</div><div class='ctx'> 		desc = edesc-&gt;hw_desc;</div><div class='ctx'> </div><div class='ctx'> 		edesc-&gt;sec4_sg_dma = dma_map_single(jrdev, edesc-&gt;sec4_sg,</div><div class='hunk'>@@ -1401,10 +1282,7 @@ static int ahash_finup_no_ctx(struct ahash_request *req)</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='ctx'> 	gfp_t flags = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='del'>-	u8 *buf = state-&gt;current_buf ? state-&gt;buf_1 : state-&gt;buf_0;</div><div class='del'>-	int buflen = state-&gt;current_buf ? state-&gt;buflen_1 : state-&gt;buflen_0;</div><div class='del'>-	int last_buflen = state-&gt;current_buf ? state-&gt;buflen_0 :</div><div class='del'>-			  state-&gt;buflen_1;</div><div class='add'>+	int buflen = *current_buflen(state);</div><div class='ctx'> 	u32 *desc;</div><div class='ctx'> 	int sec4_sg_bytes, sec4_sg_src_index, src_nents, mapped_nents;</div><div class='ctx'> 	int digestsize = crypto_ahash_digestsize(ahash);</div><div class='hunk'>@@ -1446,9 +1324,9 @@ static int ahash_finup_no_ctx(struct ahash_request *req)</div><div class='ctx'> 	edesc-&gt;src_nents = src_nents;</div><div class='ctx'> 	edesc-&gt;sec4_sg_bytes = sec4_sg_bytes;</div><div class='ctx'> </div><div class='del'>-	state-&gt;buf_dma = try_buf_map_to_sec4_sg(jrdev, edesc-&gt;sec4_sg, buf,</div><div class='del'>-						state-&gt;buf_dma, buflen,</div><div class='del'>-						last_buflen);</div><div class='add'>+	ret = buf_map_to_sec4_sg(jrdev, edesc-&gt;sec4_sg, state);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unmap;</div><div class='ctx'> </div><div class='ctx'> 	ret = ahash_edesc_add_src(ctx, edesc, req, mapped_nents, 1, buflen,</div><div class='ctx'> 				  req-&gt;nbytes);</div><div class='hunk'>@@ -1494,9 +1372,8 @@ static int ahash_update_first(struct ahash_request *req)</div><div class='ctx'> 	struct device *jrdev = ctx-&gt;jrdev;</div><div class='ctx'> 	gfp_t flags = (req-&gt;base.flags &amp; (CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='ctx'> 		       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;</div><div class='del'>-	u8 *next_buf = state-&gt;current_buf ? state-&gt;buf_1 : state-&gt;buf_0;</div><div class='del'>-	int *next_buflen = state-&gt;current_buf ?</div><div class='del'>-		&amp;state-&gt;buflen_1 : &amp;state-&gt;buflen_0;</div><div class='add'>+	u8 *next_buf = alt_buf(state);</div><div class='add'>+	int *next_buflen = alt_buflen(state);</div><div class='ctx'> 	int to_hash;</div><div class='ctx'> 	u32 *desc;</div><div class='ctx'> 	int src_nents, mapped_nents;</div><div class='hunk'>@@ -1578,6 +1455,7 @@ static int ahash_update_first(struct ahash_request *req)</div><div class='ctx'> 		state-&gt;final = ahash_final_no_ctx;</div><div class='ctx'> 		scatterwalk_map_and_copy(next_buf, req-&gt;src, 0,</div><div class='ctx'> 					 req-&gt;nbytes, 0);</div><div class='add'>+		switch_buf(state);</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	print_hex_dump(KERN_ERR, "next buf@"__stringify(__LINE__)": ",</div><div class='hunk'>@@ -1605,6 +1483,7 @@ static int ahash_init(struct ahash_request *req)</div><div class='ctx'> 	state-&gt;finup = ahash_finup_first;</div><div class='ctx'> 	state-&gt;final = ahash_final_no_ctx;</div><div class='ctx'> </div><div class='add'>+	state-&gt;ctx_dma = 0;</div><div class='ctx'> 	state-&gt;current_buf = 0;</div><div class='ctx'> 	state-&gt;buf_dma = 0;</div><div class='ctx'> 	state-&gt;buflen_0 = 0;</div><div class='hunk'>@@ -1683,7 +1562,6 @@ struct caam_hash_template {</div><div class='ctx'> 	unsigned int blocksize;</div><div class='ctx'> 	struct ahash_alg template_ahash;</div><div class='ctx'> 	u32 alg_type;</div><div class='del'>-	u32 alg_op;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ahash descriptors */</div><div class='hunk'>@@ -1709,7 +1587,6 @@ static struct caam_hash_template driver_hash[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 		},</div><div class='ctx'> 		.alg_type = OP_ALG_ALGSEL_SHA1,</div><div class='del'>-		.alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sha224",</div><div class='ctx'> 		.driver_name = "sha224-caam",</div><div class='hunk'>@@ -1731,7 +1608,6 @@ static struct caam_hash_template driver_hash[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 		},</div><div class='ctx'> 		.alg_type = OP_ALG_ALGSEL_SHA224,</div><div class='del'>-		.alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sha256",</div><div class='ctx'> 		.driver_name = "sha256-caam",</div><div class='hunk'>@@ -1753,7 +1629,6 @@ static struct caam_hash_template driver_hash[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 		},</div><div class='ctx'> 		.alg_type = OP_ALG_ALGSEL_SHA256,</div><div class='del'>-		.alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sha384",</div><div class='ctx'> 		.driver_name = "sha384-caam",</div><div class='hunk'>@@ -1775,7 +1650,6 @@ static struct caam_hash_template driver_hash[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 		},</div><div class='ctx'> 		.alg_type = OP_ALG_ALGSEL_SHA384,</div><div class='del'>-		.alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sha512",</div><div class='ctx'> 		.driver_name = "sha512-caam",</div><div class='hunk'>@@ -1797,7 +1671,6 @@ static struct caam_hash_template driver_hash[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 		},</div><div class='ctx'> 		.alg_type = OP_ALG_ALGSEL_SHA512,</div><div class='del'>-		.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "md5",</div><div class='ctx'> 		.driver_name = "md5-caam",</div><div class='hunk'>@@ -1819,14 +1692,12 @@ static struct caam_hash_template driver_hash[] = {</div><div class='ctx'> 			},</div><div class='ctx'> 		},</div><div class='ctx'> 		.alg_type = OP_ALG_ALGSEL_MD5,</div><div class='del'>-		.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct caam_hash_alg {</div><div class='ctx'> 	struct list_head entry;</div><div class='ctx'> 	int alg_type;</div><div class='del'>-	int alg_op;</div><div class='ctx'> 	struct ahash_alg ahash_alg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1848,6 +1719,7 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm)</div><div class='ctx'> 					 HASH_MSG_LEN + SHA256_DIGEST_SIZE,</div><div class='ctx'> 					 HASH_MSG_LEN + 64,</div><div class='ctx'> 					 HASH_MSG_LEN + SHA512_DIGEST_SIZE };</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get a Job ring from Job Ring driver to ensure in-order</div><div class='hunk'>@@ -1858,11 +1730,31 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm)</div><div class='ctx'> 		pr_err("Job Ring Device allocation for transform failed\n");</div><div class='ctx'> 		return PTR_ERR(ctx-&gt;jrdev);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	dma_addr = dma_map_single_attrs(ctx-&gt;jrdev, ctx-&gt;sh_desc_update,</div><div class='add'>+					offsetof(struct caam_hash_ctx,</div><div class='add'>+						 sh_desc_update_dma),</div><div class='add'>+					DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);</div><div class='add'>+	if (dma_mapping_error(ctx-&gt;jrdev, dma_addr)) {</div><div class='add'>+		dev_err(ctx-&gt;jrdev, "unable to map shared descriptors\n");</div><div class='add'>+		caam_jr_free(ctx-&gt;jrdev);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;sh_desc_update_dma = dma_addr;</div><div class='add'>+	ctx-&gt;sh_desc_update_first_dma = dma_addr +</div><div class='add'>+					offsetof(struct caam_hash_ctx,</div><div class='add'>+						 sh_desc_update_first);</div><div class='add'>+	ctx-&gt;sh_desc_fin_dma = dma_addr + offsetof(struct caam_hash_ctx,</div><div class='add'>+						   sh_desc_fin);</div><div class='add'>+	ctx-&gt;sh_desc_digest_dma = dma_addr + offsetof(struct caam_hash_ctx,</div><div class='add'>+						      sh_desc_digest);</div><div class='add'>+</div><div class='ctx'> 	/* copy descriptor header template value */</div><div class='del'>-	ctx-&gt;alg_type = OP_TYPE_CLASS2_ALG | caam_hash-&gt;alg_type;</div><div class='del'>-	ctx-&gt;alg_op = OP_TYPE_CLASS2_ALG | caam_hash-&gt;alg_op;</div><div class='add'>+	ctx-&gt;adata.algtype = OP_TYPE_CLASS2_ALG | caam_hash-&gt;alg_type;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;ctx_len = runninglen[(ctx-&gt;alg_op &amp; OP_ALG_ALGSEL_SUBMASK) &gt;&gt;</div><div class='add'>+	ctx-&gt;ctx_len = runninglen[(ctx-&gt;adata.algtype &amp;</div><div class='add'>+				   OP_ALG_ALGSEL_SUBMASK) &gt;&gt;</div><div class='ctx'> 				  OP_ALG_ALGSEL_SHIFT];</div><div class='ctx'> </div><div class='ctx'> 	crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),</div><div class='hunk'>@@ -1874,30 +1766,10 @@ static void caam_hash_cra_exit(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_hash_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;sh_desc_update_dma &amp;&amp;</div><div class='del'>-	    !dma_mapping_error(ctx-&gt;jrdev, ctx-&gt;sh_desc_update_dma))</div><div class='del'>-		dma_unmap_single(ctx-&gt;jrdev, ctx-&gt;sh_desc_update_dma,</div><div class='del'>-				 desc_bytes(ctx-&gt;sh_desc_update),</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	if (ctx-&gt;sh_desc_update_first_dma &amp;&amp;</div><div class='del'>-	    !dma_mapping_error(ctx-&gt;jrdev, ctx-&gt;sh_desc_update_first_dma))</div><div class='del'>-		dma_unmap_single(ctx-&gt;jrdev, ctx-&gt;sh_desc_update_first_dma,</div><div class='del'>-				 desc_bytes(ctx-&gt;sh_desc_update_first),</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	if (ctx-&gt;sh_desc_fin_dma &amp;&amp;</div><div class='del'>-	    !dma_mapping_error(ctx-&gt;jrdev, ctx-&gt;sh_desc_fin_dma))</div><div class='del'>-		dma_unmap_single(ctx-&gt;jrdev, ctx-&gt;sh_desc_fin_dma,</div><div class='del'>-				 desc_bytes(ctx-&gt;sh_desc_fin), DMA_TO_DEVICE);</div><div class='del'>-	if (ctx-&gt;sh_desc_digest_dma &amp;&amp;</div><div class='del'>-	    !dma_mapping_error(ctx-&gt;jrdev, ctx-&gt;sh_desc_digest_dma))</div><div class='del'>-		dma_unmap_single(ctx-&gt;jrdev, ctx-&gt;sh_desc_digest_dma,</div><div class='del'>-				 desc_bytes(ctx-&gt;sh_desc_digest),</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	if (ctx-&gt;sh_desc_finup_dma &amp;&amp;</div><div class='del'>-	    !dma_mapping_error(ctx-&gt;jrdev, ctx-&gt;sh_desc_finup_dma))</div><div class='del'>-		dma_unmap_single(ctx-&gt;jrdev, ctx-&gt;sh_desc_finup_dma,</div><div class='del'>-				 desc_bytes(ctx-&gt;sh_desc_finup), DMA_TO_DEVICE);</div><div class='del'>-</div><div class='add'>+	dma_unmap_single_attrs(ctx-&gt;jrdev, ctx-&gt;sh_desc_update_dma,</div><div class='add'>+			       offsetof(struct caam_hash_ctx,</div><div class='add'>+					sh_desc_update_dma),</div><div class='add'>+			       DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);</div><div class='ctx'> 	caam_jr_free(ctx-&gt;jrdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1956,7 +1828,6 @@ caam_hash_alloc(struct caam_hash_template *template,</div><div class='ctx'> 	alg-&gt;cra_type = &amp;crypto_ahash_type;</div><div class='ctx'> </div><div class='ctx'> 	t_alg-&gt;alg_type = template-&gt;alg_type;</div><div class='del'>-	t_alg-&gt;alg_op = template-&gt;alg_op;</div><div class='ctx'> </div><div class='ctx'> 	return t_alg;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/crypto/caam/caampkc.c b/drivers/crypto/caam/caampkc.c<br/>index 851015e652b8..32100c4851dd 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/caampkc.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/caampkc.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/caampkc.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caampkc.c</a></div><div class='hunk'>@@ -395,7 +395,7 @@ static int caam_rsa_set_pub_key(struct crypto_akcipher *tfm, const void *key,</div><div class='ctx'> 				unsigned int keylen)</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_rsa_ctx *ctx = akcipher_tfm_ctx(tfm);</div><div class='del'>-	struct rsa_key raw_key = {0};</div><div class='add'>+	struct rsa_key raw_key = {NULL};</div><div class='ctx'> 	struct caam_rsa_key *rsa_key = &amp;ctx-&gt;key;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -441,7 +441,7 @@ static int caam_rsa_set_priv_key(struct crypto_akcipher *tfm, const void *key,</div><div class='ctx'> 				 unsigned int keylen)</div><div class='ctx'> {</div><div class='ctx'> 	struct caam_rsa_ctx *ctx = akcipher_tfm_ctx(tfm);</div><div class='del'>-	struct rsa_key raw_key = {0};</div><div class='add'>+	struct rsa_key raw_key = {NULL};</div><div class='ctx'> 	struct caam_rsa_key *rsa_key = &amp;ctx-&gt;key;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c<br/>index 9b92af2c7241..41398da3edf4 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/caamrng.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/caamrng.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/caamrng.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/caamrng.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> </div><div class='ctx'> /* length of descriptors */</div><div class='ctx'> #define DESC_JOB_O_LEN			(CAAM_CMD_SZ * 2 + CAAM_PTR_SZ * 2)</div><div class='del'>-#define DESC_RNG_LEN			(4 * CAAM_CMD_SZ)</div><div class='add'>+#define DESC_RNG_LEN			(3 * CAAM_CMD_SZ)</div><div class='ctx'> </div><div class='ctx'> /* Buffer, its dma address and lock */</div><div class='ctx'> struct buf_data {</div><div class='hunk'>@@ -100,8 +100,7 @@ static void rng_done(struct device *jrdev, u32 *desc, u32 err, void *context)</div><div class='ctx'> {</div><div class='ctx'> 	struct buf_data *bd;</div><div class='ctx'> </div><div class='del'>-	bd = (struct buf_data *)((char *)desc -</div><div class='del'>-	      offsetof(struct buf_data, hw_desc));</div><div class='add'>+	bd = container_of(desc, struct buf_data, hw_desc[0]);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		caam_jr_strstatus(jrdev, err);</div><div class='hunk'>@@ -196,9 +195,6 @@ static inline int rng_create_sh_desc(struct caam_rng_ctx *ctx)</div><div class='ctx'> </div><div class='ctx'> 	init_sh_desc(desc, HDR_SHARE_SERIAL);</div><div class='ctx'> </div><div class='del'>-	/* Propagate errors from shared to job descriptor */</div><div class='del'>-	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);</div><div class='del'>-</div><div class='ctx'> 	/* Generate random bytes */</div><div class='ctx'> 	append_operation(desc, OP_ALG_ALGSEL_RNG | OP_TYPE_CLASS1_ALG);</div><div class='ctx'> </div><div class='hunk'>@@ -351,7 +347,7 @@ static int __init caam_rng_init(void)</div><div class='ctx'> 		pr_err("Job Ring Device allocation for transform failed\n");</div><div class='ctx'> 		return PTR_ERR(dev);</div><div class='ctx'> 	}</div><div class='del'>-	rng_ctx = kmalloc(sizeof(*rng_ctx), GFP_DMA);</div><div class='add'>+	rng_ctx = kmalloc(sizeof(*rng_ctx), GFP_DMA | GFP_KERNEL);</div><div class='ctx'> 	if (!rng_ctx) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto free_caam_alloc;</div><div class='head'>diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c<br/>index e483b78c6343..fef39f9f41ee 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/ctrl.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/ctrl.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/ctrl.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/ctrl.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include "intern.h"</div><div class='ctx'> #include "jr.h"</div><div class='ctx'> #include "desc_constr.h"</div><div class='del'>-#include "error.h"</div><div class='ctx'> #include "ctrl.h"</div><div class='ctx'> </div><div class='ctx'> bool caam_little_end;</div><div class='hunk'>@@ -270,7 +269,7 @@ static int deinstantiate_rng(struct device *ctrldev, int state_handle_mask)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the corresponding bit is set, then it means the state</div><div class='ctx'> 		 * handle was initialized by us, and thus it needs to be</div><div class='del'>-		 * deintialized as well</div><div class='add'>+		 * deinitialized as well</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((1 &lt;&lt; sh_idx) &amp; state_handle_mask) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -309,10 +308,8 @@ static int caam_remove(struct platform_device *pdev)</div><div class='ctx'> 	ctrl = (struct caam_ctrl __iomem *)ctrlpriv-&gt;ctrl;</div><div class='ctx'> </div><div class='ctx'> 	/* Remove platform devices for JobRs */</div><div class='del'>-	for (ring = 0; ring &lt; ctrlpriv-&gt;total_jobrs; ring++) {</div><div class='del'>-		if (ctrlpriv-&gt;jrpdev[ring])</div><div class='del'>-			of_device_unregister(ctrlpriv-&gt;jrpdev[ring]);</div><div class='del'>-	}</div><div class='add'>+	for (ring = 0; ring &lt; ctrlpriv-&gt;total_jobrs; ring++)</div><div class='add'>+		of_device_unregister(ctrlpriv-&gt;jrpdev[ring]);</div><div class='ctx'> </div><div class='ctx'> 	/* De-initialize RNG state handles initialized by this driver. */</div><div class='ctx'> 	if (ctrlpriv-&gt;rng4_sh_init)</div><div class='hunk'>@@ -330,8 +327,8 @@ static int caam_remove(struct platform_device *pdev)</div><div class='ctx'> 	clk_disable_unprepare(ctrlpriv-&gt;caam_ipg);</div><div class='ctx'> 	clk_disable_unprepare(ctrlpriv-&gt;caam_mem);</div><div class='ctx'> 	clk_disable_unprepare(ctrlpriv-&gt;caam_aclk);</div><div class='del'>-	clk_disable_unprepare(ctrlpriv-&gt;caam_emi_slow);</div><div class='del'>-</div><div class='add'>+	if (ctrlpriv-&gt;caam_emi_slow)</div><div class='add'>+		clk_disable_unprepare(ctrlpriv-&gt;caam_emi_slow);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -365,11 +362,8 @@ static void kick_trng(struct platform_device *pdev, int ent_delay)</div><div class='ctx'> 	 */</div><div class='ctx'> 	val = (rd_reg32(&amp;r4tst-&gt;rtsdctl) &amp; RTSDCTL_ENT_DLY_MASK)</div><div class='ctx'> 	      &gt;&gt; RTSDCTL_ENT_DLY_SHIFT;</div><div class='del'>-	if (ent_delay &lt;= val) {</div><div class='del'>-		/* put RNG4 into run mode */</div><div class='del'>-		clrsetbits_32(&amp;r4tst-&gt;rtmctl, RTMCTL_PRGM, 0);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (ent_delay &lt;= val)</div><div class='add'>+		goto start_rng;</div><div class='ctx'> </div><div class='ctx'> 	val = rd_reg32(&amp;r4tst-&gt;rtsdctl);</div><div class='ctx'> 	val = (val &amp; ~RTSDCTL_ENT_DLY_MASK) |</div><div class='hunk'>@@ -381,15 +375,12 @@ static void kick_trng(struct platform_device *pdev, int ent_delay)</div><div class='ctx'> 	wr_reg32(&amp;r4tst-&gt;rtfrqmax, RTFRQMAX_DISABLE);</div><div class='ctx'> 	/* read the control register */</div><div class='ctx'> 	val = rd_reg32(&amp;r4tst-&gt;rtmctl);</div><div class='add'>+start_rng:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * select raw sampling in both entropy shifter</div><div class='del'>-	 * and statistical checker</div><div class='add'>+	 * and statistical checker; ; put RNG4 into run mode</div><div class='ctx'> 	 */</div><div class='del'>-	clrsetbits_32(&amp;val, 0, RTMCTL_SAMP_MODE_RAW_ES_SC);</div><div class='del'>-	/* put RNG4 into run mode */</div><div class='del'>-	clrsetbits_32(&amp;val, RTMCTL_PRGM, 0);</div><div class='del'>-	/* write back the control register */</div><div class='del'>-	wr_reg32(&amp;r4tst-&gt;rtmctl, val);</div><div class='add'>+	clrsetbits_32(&amp;r4tst-&gt;rtmctl, RTMCTL_PRGM, RTMCTL_SAMP_MODE_RAW_ES_SC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -430,7 +421,7 @@ DEFINE_SIMPLE_ATTRIBUTE(caam_fops_u64_ro, caam_debugfs_u64_get, NULL, "%llu\n");</div><div class='ctx'> /* Probe routine for CAAM top (controller) level */</div><div class='ctx'> static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	int ret, ring, rspec, gen_sk, ent_delay = RTSDCTL_ENT_DLY_MIN;</div><div class='add'>+	int ret, ring, ridx, rspec, gen_sk, ent_delay = RTSDCTL_ENT_DLY_MIN;</div><div class='ctx'> 	u64 caam_id;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct device_node *nprop, *np;</div><div class='hunk'>@@ -482,14 +473,16 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	ctrlpriv-&gt;caam_aclk = clk;</div><div class='ctx'> </div><div class='del'>-	clk = caam_drv_identify_clk(&amp;pdev-&gt;dev, "emi_slow");</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		ret = PTR_ERR(clk);</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"can't identify CAAM emi_slow clk: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='add'>+	if (!of_machine_is_compatible("fsl,imx6ul")) {</div><div class='add'>+		clk = caam_drv_identify_clk(&amp;pdev-&gt;dev, "emi_slow");</div><div class='add'>+		if (IS_ERR(clk)) {</div><div class='add'>+			ret = PTR_ERR(clk);</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"can't identify CAAM emi_slow clk: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		ctrlpriv-&gt;caam_emi_slow = clk;</div><div class='ctx'> 	}</div><div class='del'>-	ctrlpriv-&gt;caam_emi_slow = clk;</div><div class='ctx'> </div><div class='ctx'> 	ret = clk_prepare_enable(ctrlpriv-&gt;caam_ipg);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -510,11 +503,13 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto disable_caam_mem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = clk_prepare_enable(ctrlpriv-&gt;caam_emi_slow);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "can't enable CAAM emi slow clock: %d\n",</div><div class='del'>-			ret);</div><div class='del'>-		goto disable_caam_aclk;</div><div class='add'>+	if (ctrlpriv-&gt;caam_emi_slow) {</div><div class='add'>+		ret = clk_prepare_enable(ctrlpriv-&gt;caam_emi_slow);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "can't enable CAAM emi slow clock: %d\n",</div><div class='add'>+				ret);</div><div class='add'>+			goto disable_caam_aclk;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get configuration properties from device tree */</div><div class='hunk'>@@ -541,13 +536,13 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 	else</div><div class='ctx'> 		BLOCK_OFFSET = PG_SIZE_64K;</div><div class='ctx'> </div><div class='del'>-	ctrlpriv-&gt;ctrl = (struct caam_ctrl __force *)ctrl;</div><div class='del'>-	ctrlpriv-&gt;assure = (struct caam_assurance __force *)</div><div class='del'>-			   ((uint8_t *)ctrl +</div><div class='add'>+	ctrlpriv-&gt;ctrl = (struct caam_ctrl __iomem __force *)ctrl;</div><div class='add'>+	ctrlpriv-&gt;assure = (struct caam_assurance __iomem __force *)</div><div class='add'>+			   ((__force uint8_t *)ctrl +</div><div class='ctx'> 			    BLOCK_OFFSET * ASSURE_BLOCK_NUMBER</div><div class='ctx'> 			   );</div><div class='del'>-	ctrlpriv-&gt;deco = (struct caam_deco __force *)</div><div class='del'>-			 ((uint8_t *)ctrl +</div><div class='add'>+	ctrlpriv-&gt;deco = (struct caam_deco __iomem __force *)</div><div class='add'>+			 ((__force uint8_t *)ctrl +</div><div class='ctx'> 			 BLOCK_OFFSET * DECO_BLOCK_NUMBER</div><div class='ctx'> 			 );</div><div class='ctx'> </div><div class='hunk'>@@ -589,13 +584,18 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 			      JRSTART_JR1_START | JRSTART_JR2_START |</div><div class='ctx'> 			      JRSTART_JR3_START);</div><div class='ctx'> </div><div class='del'>-	if (sizeof(dma_addr_t) == sizeof(u64))</div><div class='add'>+	if (sizeof(dma_addr_t) == sizeof(u64)) {</div><div class='ctx'> 		if (of_device_is_compatible(nprop, "fsl,sec-v5.0"))</div><div class='del'>-			dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));</div><div class='add'>+			ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));</div><div class='ctx'> 		else</div><div class='del'>-			dma_set_mask_and_coherent(dev, DMA_BIT_MASK(36));</div><div class='del'>-	else</div><div class='del'>-		dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));</div><div class='add'>+			ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(36));</div><div class='add'>+	} else {</div><div class='add'>+		ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));</div><div class='add'>+	}</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret);</div><div class='add'>+		goto iounmap_ctrl;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Detect and enable JobRs</div><div class='hunk'>@@ -616,6 +616,7 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ring = 0;</div><div class='add'>+	ridx = 0;</div><div class='ctx'> 	ctrlpriv-&gt;total_jobrs = 0;</div><div class='ctx'> 	for_each_available_child_of_node(nprop, np)</div><div class='ctx'> 		if (of_device_is_compatible(np, "fsl,sec-v4.0-job-ring") ||</div><div class='hunk'>@@ -623,17 +624,19 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 			ctrlpriv-&gt;jrpdev[ring] =</div><div class='ctx'> 				of_platform_device_create(np, NULL, dev);</div><div class='ctx'> 			if (!ctrlpriv-&gt;jrpdev[ring]) {</div><div class='del'>-				pr_warn("JR%d Platform device creation error\n",</div><div class='del'>-					ring);</div><div class='add'>+				pr_warn("JR physical index %d: Platform device creation error\n",</div><div class='add'>+					ridx);</div><div class='add'>+				ridx++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			ctrlpriv-&gt;jr[ring] = (struct caam_job_ring __force *)</div><div class='del'>-					     ((uint8_t *)ctrl +</div><div class='del'>-					     (ring + JR_BLOCK_NUMBER) *</div><div class='add'>+			ctrlpriv-&gt;jr[ring] = (struct caam_job_ring __iomem __force *)</div><div class='add'>+					     ((__force uint8_t *)ctrl +</div><div class='add'>+					     (ridx + JR_BLOCK_NUMBER) *</div><div class='ctx'> 					      BLOCK_OFFSET</div><div class='ctx'> 					     );</div><div class='ctx'> 			ctrlpriv-&gt;total_jobrs++;</div><div class='ctx'> 			ring++;</div><div class='add'>+			ridx++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check to see if QI present. If so, enable */</div><div class='hunk'>@@ -641,8 +644,8 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 			!!(rd_reg32(&amp;ctrl-&gt;perfmon.comp_parms_ms) &amp;</div><div class='ctx'> 			   CTPR_MS_QI_MASK);</div><div class='ctx'> 	if (ctrlpriv-&gt;qi_present) {</div><div class='del'>-		ctrlpriv-&gt;qi = (struct caam_queue_if __force *)</div><div class='del'>-			       ((uint8_t *)ctrl +</div><div class='add'>+		ctrlpriv-&gt;qi = (struct caam_queue_if __iomem __force *)</div><div class='add'>+			       ((__force uint8_t *)ctrl +</div><div class='ctx'> 				 BLOCK_OFFSET * QI_BLOCK_NUMBER</div><div class='ctx'> 			       );</div><div class='ctx'> 		/* This is all that's required to physically enable QI */</div><div class='hunk'>@@ -800,7 +803,7 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 				    &amp;caam_fops_u32_ro);</div><div class='ctx'> </div><div class='ctx'> 	/* Internal covering keys (useful in non-secure mode only) */</div><div class='del'>-	ctrlpriv-&gt;ctl_kek_wrap.data = &amp;ctrlpriv-&gt;ctrl-&gt;kek[0];</div><div class='add'>+	ctrlpriv-&gt;ctl_kek_wrap.data = (__force void *)&amp;ctrlpriv-&gt;ctrl-&gt;kek[0];</div><div class='ctx'> 	ctrlpriv-&gt;ctl_kek_wrap.size = KEK_KEY_SIZE * sizeof(u32);</div><div class='ctx'> 	ctrlpriv-&gt;ctl_kek = debugfs_create_blob("kek",</div><div class='ctx'> 						S_IRUSR |</div><div class='hunk'>@@ -808,7 +811,7 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 						ctrlpriv-&gt;ctl,</div><div class='ctx'> 						&amp;ctrlpriv-&gt;ctl_kek_wrap);</div><div class='ctx'> </div><div class='del'>-	ctrlpriv-&gt;ctl_tkek_wrap.data = &amp;ctrlpriv-&gt;ctrl-&gt;tkek[0];</div><div class='add'>+	ctrlpriv-&gt;ctl_tkek_wrap.data = (__force void *)&amp;ctrlpriv-&gt;ctrl-&gt;tkek[0];</div><div class='ctx'> 	ctrlpriv-&gt;ctl_tkek_wrap.size = KEK_KEY_SIZE * sizeof(u32);</div><div class='ctx'> 	ctrlpriv-&gt;ctl_tkek = debugfs_create_blob("tkek",</div><div class='ctx'> 						 S_IRUSR |</div><div class='hunk'>@@ -816,7 +819,7 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 						 ctrlpriv-&gt;ctl,</div><div class='ctx'> 						 &amp;ctrlpriv-&gt;ctl_tkek_wrap);</div><div class='ctx'> </div><div class='del'>-	ctrlpriv-&gt;ctl_tdsk_wrap.data = &amp;ctrlpriv-&gt;ctrl-&gt;tdsk[0];</div><div class='add'>+	ctrlpriv-&gt;ctl_tdsk_wrap.data = (__force void *)&amp;ctrlpriv-&gt;ctrl-&gt;tdsk[0];</div><div class='ctx'> 	ctrlpriv-&gt;ctl_tdsk_wrap.size = KEK_KEY_SIZE * sizeof(u32);</div><div class='ctx'> 	ctrlpriv-&gt;ctl_tdsk = debugfs_create_blob("tdsk",</div><div class='ctx'> 						 S_IRUSR |</div><div class='hunk'>@@ -833,7 +836,8 @@ caam_remove:</div><div class='ctx'> iounmap_ctrl:</div><div class='ctx'> 	iounmap(ctrl);</div><div class='ctx'> disable_caam_emi_slow:</div><div class='del'>-	clk_disable_unprepare(ctrlpriv-&gt;caam_emi_slow);</div><div class='add'>+	if (ctrlpriv-&gt;caam_emi_slow)</div><div class='add'>+		clk_disable_unprepare(ctrlpriv-&gt;caam_emi_slow);</div><div class='ctx'> disable_caam_aclk:</div><div class='ctx'> 	clk_disable_unprepare(ctrlpriv-&gt;caam_aclk);</div><div class='ctx'> disable_caam_mem:</div><div class='head'>diff --git a/drivers/crypto/caam/desc.h b/drivers/crypto/caam/desc.h<br/>index 513b6646bb36..2e6766a1573f 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/desc.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/desc.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/desc.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/desc.h</a></div><div class='hunk'>@@ -22,12 +22,6 @@</div><div class='ctx'> #define SEC4_SG_LEN_MASK	0x3fffffff	/* Excludes EXT and FINAL */</div><div class='ctx'> #define SEC4_SG_OFFSET_MASK	0x00001fff</div><div class='ctx'> </div><div class='del'>-struct sec4_sg_entry {</div><div class='del'>-	u64 ptr;</div><div class='del'>-	u32 len;</div><div class='del'>-	u32 bpid_offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Max size of any CAAM descriptor in 32-bit words, inclusive of header */</div><div class='ctx'> #define MAX_CAAM_DESCSIZE	64</div><div class='ctx'> </div><div class='hunk'>@@ -90,8 +84,8 @@ struct sec4_sg_entry {</div><div class='ctx'> #define HDR_ZRO			0x00008000</div><div class='ctx'> </div><div class='ctx'> /* Start Index or SharedDesc Length */</div><div class='del'>-#define HDR_START_IDX_MASK	0x3f</div><div class='ctx'> #define HDR_START_IDX_SHIFT	16</div><div class='add'>+#define HDR_START_IDX_MASK	(0x3f &lt;&lt; HDR_START_IDX_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* If shared descriptor header, 6-bit length */</div><div class='ctx'> #define HDR_DESCLEN_SHR_MASK	0x3f</div><div class='hunk'>@@ -121,10 +115,10 @@ struct sec4_sg_entry {</div><div class='ctx'> #define HDR_PROP_DNR		0x00000800</div><div class='ctx'> </div><div class='ctx'> /* JobDesc/SharedDesc share property */</div><div class='del'>-#define HDR_SD_SHARE_MASK	0x03</div><div class='ctx'> #define HDR_SD_SHARE_SHIFT	8</div><div class='del'>-#define HDR_JD_SHARE_MASK	0x07</div><div class='add'>+#define HDR_SD_SHARE_MASK	(0x03 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='ctx'> #define HDR_JD_SHARE_SHIFT	8</div><div class='add'>+#define HDR_JD_SHARE_MASK	(0x07 &lt;&lt; HDR_JD_SHARE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define HDR_SHARE_NEVER		(0x00 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='ctx'> #define HDR_SHARE_WAIT		(0x01 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='hunk'>@@ -235,7 +229,7 @@ struct sec4_sg_entry {</div><div class='ctx'> #define LDST_SRCDST_WORD_DECO_MATH2	(0x0a &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> #define LDST_SRCDST_WORD_DECO_AAD_SZ	(0x0b &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> #define LDST_SRCDST_WORD_DECO_MATH3	(0x0b &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_CLASS1_ICV_SZ	(0x0c &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_CLASS1_IV_SZ	(0x0c &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> #define LDST_SRCDST_WORD_ALTDS_CLASS1	(0x0f &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> #define LDST_SRCDST_WORD_PKHA_A_SZ	(0x10 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> #define LDST_SRCDST_WORD_PKHA_B_SZ	(0x11 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='hunk'>@@ -400,7 +394,7 @@ struct sec4_sg_entry {</div><div class='ctx'> #define FIFOST_TYPE_PKHA_N	 (0x08 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='ctx'> #define FIFOST_TYPE_PKHA_A	 (0x0c &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='ctx'> #define FIFOST_TYPE_PKHA_B	 (0x0d &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_AF_SBOX_JKEK (0x10 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_AF_SBOX_JKEK (0x20 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='ctx'> #define FIFOST_TYPE_AF_SBOX_TKEK (0x21 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='ctx'> #define FIFOST_TYPE_PKHA_E_JKEK	 (0x22 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='ctx'> #define FIFOST_TYPE_PKHA_E_TKEK	 (0x23 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='hunk'>@@ -1107,8 +1101,8 @@ struct sec4_sg_entry {</div><div class='ctx'> /* For non-protocol/alg-only op commands */</div><div class='ctx'> #define OP_ALG_TYPE_SHIFT	24</div><div class='ctx'> #define OP_ALG_TYPE_MASK	(0x7 &lt;&lt; OP_ALG_TYPE_SHIFT)</div><div class='del'>-#define OP_ALG_TYPE_CLASS1	2</div><div class='del'>-#define OP_ALG_TYPE_CLASS2	4</div><div class='add'>+#define OP_ALG_TYPE_CLASS1	(2 &lt;&lt; OP_ALG_TYPE_SHIFT)</div><div class='add'>+#define OP_ALG_TYPE_CLASS2	(4 &lt;&lt; OP_ALG_TYPE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define OP_ALG_ALGSEL_SHIFT	16</div><div class='ctx'> #define OP_ALG_ALGSEL_MASK	(0xff &lt;&lt; OP_ALG_ALGSEL_SHIFT)</div><div class='hunk'>@@ -1249,7 +1243,7 @@ struct sec4_sg_entry {</div><div class='ctx'> #define OP_ALG_PKMODE_MOD_PRIMALITY	0x00f</div><div class='ctx'> </div><div class='ctx'> /* PKHA mode copy-memory functions */</div><div class='del'>-#define OP_ALG_PKMODE_SRC_REG_SHIFT	13</div><div class='add'>+#define OP_ALG_PKMODE_SRC_REG_SHIFT	17</div><div class='ctx'> #define OP_ALG_PKMODE_SRC_REG_MASK	(7 &lt;&lt; OP_ALG_PKMODE_SRC_REG_SHIFT)</div><div class='ctx'> #define OP_ALG_PKMODE_DST_REG_SHIFT	10</div><div class='ctx'> #define OP_ALG_PKMODE_DST_REG_MASK	(7 &lt;&lt; OP_ALG_PKMODE_DST_REG_SHIFT)</div><div class='head'>diff --git a/drivers/crypto/caam/desc_constr.h b/drivers/crypto/caam/desc_constr.h<br/>index a8cd8a78ec1f..b9c8d98ef826 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/desc_constr.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/desc_constr.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/desc_constr.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/desc_constr.h</a></div><div class='hunk'>@@ -33,38 +33,39 @@</div><div class='ctx'> </div><div class='ctx'> extern bool caam_little_end;</div><div class='ctx'> </div><div class='del'>-static inline int desc_len(u32 *desc)</div><div class='add'>+static inline int desc_len(u32 * const desc)</div><div class='ctx'> {</div><div class='ctx'> 	return caam32_to_cpu(*desc) &amp; HDR_DESCLEN_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int desc_bytes(void *desc)</div><div class='add'>+static inline int desc_bytes(void * const desc)</div><div class='ctx'> {</div><div class='ctx'> 	return desc_len(desc) * CAAM_CMD_SZ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 *desc_end(u32 *desc)</div><div class='add'>+static inline u32 *desc_end(u32 * const desc)</div><div class='ctx'> {</div><div class='ctx'> 	return desc + desc_len(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *sh_desc_pdb(u32 *desc)</div><div class='add'>+static inline void *sh_desc_pdb(u32 * const desc)</div><div class='ctx'> {</div><div class='ctx'> 	return desc + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void init_desc(u32 *desc, u32 options)</div><div class='add'>+static inline void init_desc(u32 * const desc, u32 options)</div><div class='ctx'> {</div><div class='ctx'> 	*desc = cpu_to_caam32((options | HDR_ONE) + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void init_sh_desc(u32 *desc, u32 options)</div><div class='add'>+static inline void init_sh_desc(u32 * const desc, u32 options)</div><div class='ctx'> {</div><div class='ctx'> 	PRINT_POS;</div><div class='ctx'> 	init_desc(desc, CMD_SHARED_DESC_HDR | options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void init_sh_desc_pdb(u32 *desc, u32 options, size_t pdb_bytes)</div><div class='add'>+static inline void init_sh_desc_pdb(u32 * const desc, u32 options,</div><div class='add'>+				    size_t pdb_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pdb_len = (pdb_bytes + CAAM_CMD_SZ - 1) / CAAM_CMD_SZ;</div><div class='ctx'> </div><div class='hunk'>@@ -72,19 +73,20 @@ static inline void init_sh_desc_pdb(u32 *desc, u32 options, size_t pdb_bytes)</div><div class='ctx'> 		     options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void init_job_desc(u32 *desc, u32 options)</div><div class='add'>+static inline void init_job_desc(u32 * const desc, u32 options)</div><div class='ctx'> {</div><div class='ctx'> 	init_desc(desc, CMD_DESC_HDR | options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void init_job_desc_pdb(u32 *desc, u32 options, size_t pdb_bytes)</div><div class='add'>+static inline void init_job_desc_pdb(u32 * const desc, u32 options,</div><div class='add'>+				     size_t pdb_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pdb_len = (pdb_bytes + CAAM_CMD_SZ - 1) / CAAM_CMD_SZ;</div><div class='ctx'> </div><div class='ctx'> 	init_job_desc(desc, (((pdb_len + 1) &lt;&lt; HDR_START_IDX_SHIFT)) | options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void append_ptr(u32 *desc, dma_addr_t ptr)</div><div class='add'>+static inline void append_ptr(u32 * const desc, dma_addr_t ptr)</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t *offset = (dma_addr_t *)desc_end(desc);</div><div class='ctx'> </div><div class='hunk'>@@ -94,8 +96,8 @@ static inline void append_ptr(u32 *desc, dma_addr_t ptr)</div><div class='ctx'> 				CAAM_PTR_SZ / CAAM_CMD_SZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void init_job_desc_shared(u32 *desc, dma_addr_t ptr, int len,</div><div class='del'>-					u32 options)</div><div class='add'>+static inline void init_job_desc_shared(u32 * const desc, dma_addr_t ptr,</div><div class='add'>+					int len, u32 options)</div><div class='ctx'> {</div><div class='ctx'> 	PRINT_POS;</div><div class='ctx'> 	init_job_desc(desc, HDR_SHARED | options |</div><div class='hunk'>@@ -103,7 +105,7 @@ static inline void init_job_desc_shared(u32 *desc, dma_addr_t ptr, int len,</div><div class='ctx'> 	append_ptr(desc, ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void append_data(u32 *desc, void *data, int len)</div><div class='add'>+static inline void append_data(u32 * const desc, void *data, int len)</div><div class='ctx'> {</div><div class='ctx'> 	u32 *offset = desc_end(desc);</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +116,7 @@ static inline void append_data(u32 *desc, void *data, int len)</div><div class='ctx'> 				(len + CAAM_CMD_SZ - 1) / CAAM_CMD_SZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void append_cmd(u32 *desc, u32 command)</div><div class='add'>+static inline void append_cmd(u32 * const desc, u32 command)</div><div class='ctx'> {</div><div class='ctx'> 	u32 *cmd = desc_end(desc);</div><div class='ctx'> </div><div class='hunk'>@@ -125,7 +127,7 @@ static inline void append_cmd(u32 *desc, u32 command)</div><div class='ctx'> </div><div class='ctx'> #define append_u32 append_cmd</div><div class='ctx'> </div><div class='del'>-static inline void append_u64(u32 *desc, u64 data)</div><div class='add'>+static inline void append_u64(u32 * const desc, u64 data)</div><div class='ctx'> {</div><div class='ctx'> 	u32 *offset = desc_end(desc);</div><div class='ctx'> </div><div class='hunk'>@@ -142,14 +144,14 @@ static inline void append_u64(u32 *desc, u64 data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Write command without affecting header, and return pointer to next word */</div><div class='del'>-static inline u32 *write_cmd(u32 *desc, u32 command)</div><div class='add'>+static inline u32 *write_cmd(u32 * const desc, u32 command)</div><div class='ctx'> {</div><div class='ctx'> 	*desc = cpu_to_caam32(command);</div><div class='ctx'> </div><div class='ctx'> 	return desc + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void append_cmd_ptr(u32 *desc, dma_addr_t ptr, int len,</div><div class='add'>+static inline void append_cmd_ptr(u32 * const desc, dma_addr_t ptr, int len,</div><div class='ctx'> 				  u32 command)</div><div class='ctx'> {</div><div class='ctx'> 	append_cmd(desc, command | len);</div><div class='hunk'>@@ -157,7 +159,7 @@ static inline void append_cmd_ptr(u32 *desc, dma_addr_t ptr, int len,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Write length after pointer, rather than inside command */</div><div class='del'>-static inline void append_cmd_ptr_extlen(u32 *desc, dma_addr_t ptr,</div><div class='add'>+static inline void append_cmd_ptr_extlen(u32 * const desc, dma_addr_t ptr,</div><div class='ctx'> 					 unsigned int len, u32 command)</div><div class='ctx'> {</div><div class='ctx'> 	append_cmd(desc, command);</div><div class='hunk'>@@ -166,7 +168,7 @@ static inline void append_cmd_ptr_extlen(u32 *desc, dma_addr_t ptr,</div><div class='ctx'> 	append_cmd(desc, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void append_cmd_data(u32 *desc, void *data, int len,</div><div class='add'>+static inline void append_cmd_data(u32 * const desc, void *data, int len,</div><div class='ctx'> 				   u32 command)</div><div class='ctx'> {</div><div class='ctx'> 	append_cmd(desc, command | IMMEDIATE | len);</div><div class='hunk'>@@ -174,7 +176,7 @@ static inline void append_cmd_data(u32 *desc, void *data, int len,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define APPEND_CMD_RET(cmd, op) \</div><div class='del'>-static inline u32 *append_##cmd(u32 *desc, u32 options) \</div><div class='add'>+static inline u32 *append_##cmd(u32 * const desc, u32 options) \</div><div class='ctx'> { \</div><div class='ctx'> 	u32 *cmd = desc_end(desc); \</div><div class='ctx'> 	PRINT_POS; \</div><div class='hunk'>@@ -184,13 +186,13 @@ static inline u32 *append_##cmd(u32 *desc, u32 options) \</div><div class='ctx'> APPEND_CMD_RET(jump, JUMP)</div><div class='ctx'> APPEND_CMD_RET(move, MOVE)</div><div class='ctx'> </div><div class='del'>-static inline void set_jump_tgt_here(u32 *desc, u32 *jump_cmd)</div><div class='add'>+static inline void set_jump_tgt_here(u32 * const desc, u32 *jump_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	*jump_cmd = cpu_to_caam32(caam32_to_cpu(*jump_cmd) |</div><div class='ctx'> 				  (desc_len(desc) - (jump_cmd - desc)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void set_move_tgt_here(u32 *desc, u32 *move_cmd)</div><div class='add'>+static inline void set_move_tgt_here(u32 * const desc, u32 *move_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val = caam32_to_cpu(*move_cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -200,7 +202,7 @@ static inline void set_move_tgt_here(u32 *desc, u32 *move_cmd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define APPEND_CMD(cmd, op) \</div><div class='del'>-static inline void append_##cmd(u32 *desc, u32 options) \</div><div class='add'>+static inline void append_##cmd(u32 * const desc, u32 options) \</div><div class='ctx'> { \</div><div class='ctx'> 	PRINT_POS; \</div><div class='ctx'> 	append_cmd(desc, CMD_##op | options); \</div><div class='hunk'>@@ -208,7 +210,8 @@ static inline void append_##cmd(u32 *desc, u32 options) \</div><div class='ctx'> APPEND_CMD(operation, OPERATION)</div><div class='ctx'> </div><div class='ctx'> #define APPEND_CMD_LEN(cmd, op) \</div><div class='del'>-static inline void append_##cmd(u32 *desc, unsigned int len, u32 options) \</div><div class='add'>+static inline void append_##cmd(u32 * const desc, unsigned int len, \</div><div class='add'>+				u32 options) \</div><div class='ctx'> { \</div><div class='ctx'> 	PRINT_POS; \</div><div class='ctx'> 	append_cmd(desc, CMD_##op | len | options); \</div><div class='hunk'>@@ -220,8 +223,8 @@ APPEND_CMD_LEN(seq_fifo_load, SEQ_FIFO_LOAD)</div><div class='ctx'> APPEND_CMD_LEN(seq_fifo_store, SEQ_FIFO_STORE)</div><div class='ctx'> </div><div class='ctx'> #define APPEND_CMD_PTR(cmd, op) \</div><div class='del'>-static inline void append_##cmd(u32 *desc, dma_addr_t ptr, unsigned int len, \</div><div class='del'>-				u32 options) \</div><div class='add'>+static inline void append_##cmd(u32 * const desc, dma_addr_t ptr, \</div><div class='add'>+				unsigned int len, u32 options) \</div><div class='ctx'> { \</div><div class='ctx'> 	PRINT_POS; \</div><div class='ctx'> 	append_cmd_ptr(desc, ptr, len, CMD_##op | options); \</div><div class='hunk'>@@ -231,8 +234,8 @@ APPEND_CMD_PTR(load, LOAD)</div><div class='ctx'> APPEND_CMD_PTR(fifo_load, FIFO_LOAD)</div><div class='ctx'> APPEND_CMD_PTR(fifo_store, FIFO_STORE)</div><div class='ctx'> </div><div class='del'>-static inline void append_store(u32 *desc, dma_addr_t ptr, unsigned int len,</div><div class='del'>-				u32 options)</div><div class='add'>+static inline void append_store(u32 * const desc, dma_addr_t ptr,</div><div class='add'>+				unsigned int len, u32 options)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cmd_src;</div><div class='ctx'> </div><div class='hunk'>@@ -249,7 +252,8 @@ static inline void append_store(u32 *desc, dma_addr_t ptr, unsigned int len,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define APPEND_SEQ_PTR_INTLEN(cmd, op) \</div><div class='del'>-static inline void append_seq_##cmd##_ptr_intlen(u32 *desc, dma_addr_t ptr, \</div><div class='add'>+static inline void append_seq_##cmd##_ptr_intlen(u32 * const desc, \</div><div class='add'>+						 dma_addr_t ptr, \</div><div class='ctx'> 						 unsigned int len, \</div><div class='ctx'> 						 u32 options) \</div><div class='ctx'> { \</div><div class='hunk'>@@ -263,7 +267,7 @@ APPEND_SEQ_PTR_INTLEN(in, IN)</div><div class='ctx'> APPEND_SEQ_PTR_INTLEN(out, OUT)</div><div class='ctx'> </div><div class='ctx'> #define APPEND_CMD_PTR_TO_IMM(cmd, op) \</div><div class='del'>-static inline void append_##cmd##_as_imm(u32 *desc, void *data, \</div><div class='add'>+static inline void append_##cmd##_as_imm(u32 * const desc, void *data, \</div><div class='ctx'> 					 unsigned int len, u32 options) \</div><div class='ctx'> { \</div><div class='ctx'> 	PRINT_POS; \</div><div class='hunk'>@@ -273,7 +277,7 @@ APPEND_CMD_PTR_TO_IMM(load, LOAD);</div><div class='ctx'> APPEND_CMD_PTR_TO_IMM(fifo_load, FIFO_LOAD);</div><div class='ctx'> </div><div class='ctx'> #define APPEND_CMD_PTR_EXTLEN(cmd, op) \</div><div class='del'>-static inline void append_##cmd##_extlen(u32 *desc, dma_addr_t ptr, \</div><div class='add'>+static inline void append_##cmd##_extlen(u32 * const desc, dma_addr_t ptr, \</div><div class='ctx'> 					 unsigned int len, u32 options) \</div><div class='ctx'> { \</div><div class='ctx'> 	PRINT_POS; \</div><div class='hunk'>@@ -287,7 +291,7 @@ APPEND_CMD_PTR_EXTLEN(seq_out_ptr, SEQ_OUT_PTR)</div><div class='ctx'>  * the size of its type</div><div class='ctx'>  */</div><div class='ctx'> #define APPEND_CMD_PTR_LEN(cmd, op, type) \</div><div class='del'>-static inline void append_##cmd(u32 *desc, dma_addr_t ptr, \</div><div class='add'>+static inline void append_##cmd(u32 * const desc, dma_addr_t ptr, \</div><div class='ctx'> 				type len, u32 options) \</div><div class='ctx'> { \</div><div class='ctx'> 	PRINT_POS; \</div><div class='hunk'>@@ -304,7 +308,7 @@ APPEND_CMD_PTR_LEN(seq_out_ptr, SEQ_OUT_PTR, u32)</div><div class='ctx'>  * from length of immediate data provided, e.g., split keys</div><div class='ctx'>  */</div><div class='ctx'> #define APPEND_CMD_PTR_TO_IMM2(cmd, op) \</div><div class='del'>-static inline void append_##cmd##_as_imm(u32 *desc, void *data, \</div><div class='add'>+static inline void append_##cmd##_as_imm(u32 * const desc, void *data, \</div><div class='ctx'> 					 unsigned int data_len, \</div><div class='ctx'> 					 unsigned int len, u32 options) \</div><div class='ctx'> { \</div><div class='hunk'>@@ -315,7 +319,7 @@ static inline void append_##cmd##_as_imm(u32 *desc, void *data, \</div><div class='ctx'> APPEND_CMD_PTR_TO_IMM2(key, KEY);</div><div class='ctx'> </div><div class='ctx'> #define APPEND_CMD_RAW_IMM(cmd, op, type) \</div><div class='del'>-static inline void append_##cmd##_imm_##type(u32 *desc, type immediate, \</div><div class='add'>+static inline void append_##cmd##_imm_##type(u32 * const desc, type immediate, \</div><div class='ctx'> 					     u32 options) \</div><div class='ctx'> { \</div><div class='ctx'> 	PRINT_POS; \</div><div class='hunk'>@@ -426,3 +430,64 @@ do { \</div><div class='ctx'> 	APPEND_MATH_IMM_u64(LSHIFT, desc, dest, src0, src1, data)</div><div class='ctx'> #define append_math_rshift_imm_u64(desc, dest, src0, src1, data) \</div><div class='ctx'> 	APPEND_MATH_IMM_u64(RSHIFT, desc, dest, src0, src1, data)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct alginfo - Container for algorithm details</div><div class='add'>+ * @algtype: algorithm selector; for valid values, see documentation of the</div><div class='add'>+ *           functions where it is used.</div><div class='add'>+ * @keylen: length of the provided algorithm key, in bytes</div><div class='add'>+ * @keylen_pad: padded length of the provided algorithm key, in bytes</div><div class='add'>+ * @key: address where algorithm key resides; virtual address if key_inline</div><div class='add'>+ *       is true, dma (bus) address if key_inline is false.</div><div class='add'>+ * @key_inline: true - key can be inlined in the descriptor; false - key is</div><div class='add'>+ *              referenced by the descriptor</div><div class='add'>+ */</div><div class='add'>+struct alginfo {</div><div class='add'>+	u32 algtype;</div><div class='add'>+	unsigned int keylen;</div><div class='add'>+	unsigned int keylen_pad;</div><div class='add'>+	union {</div><div class='add'>+		dma_addr_t key_dma;</div><div class='add'>+		void *key_virt;</div><div class='add'>+	};</div><div class='add'>+	bool key_inline;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * desc_inline_query() - Provide indications on which data items can be inlined</div><div class='add'>+ *                       and which shall be referenced in a shared descriptor.</div><div class='add'>+ * @sd_base_len: Shared descriptor base length - bytes consumed by the commands,</div><div class='add'>+ *               excluding the data items to be inlined (or corresponding</div><div class='add'>+ *               pointer if an item is not inlined). Each cnstr_* function that</div><div class='add'>+ *               generates descriptors should have a define mentioning</div><div class='add'>+ *               corresponding length.</div><div class='add'>+ * @jd_len: Maximum length of the job descriptor(s) that will be used</div><div class='add'>+ *          together with the shared descriptor.</div><div class='add'>+ * @data_len: Array of lengths of the data items trying to be inlined</div><div class='add'>+ * @inl_mask: 32bit mask with bit x = 1 if data item x can be inlined, 0</div><div class='add'>+ *            otherwise.</div><div class='add'>+ * @count: Number of data items (size of @data_len array); must be &lt;= 32</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if data can be inlined / referenced, negative value if not. If 0,</div><div class='add'>+ *         check @inl_mask for details.</div><div class='add'>+ */</div><div class='add'>+static inline int desc_inline_query(unsigned int sd_base_len,</div><div class='add'>+				    unsigned int jd_len, unsigned int *data_len,</div><div class='add'>+				    u32 *inl_mask, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int rem_bytes = (int)(CAAM_DESC_BYTES_MAX - sd_base_len - jd_len);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	*inl_mask = 0;</div><div class='add'>+	for (i = 0; (i &lt; count) &amp;&amp; (rem_bytes &gt; 0); i++) {</div><div class='add'>+		if (rem_bytes - (int)(data_len[i] +</div><div class='add'>+			(count - i - 1) * CAAM_PTR_SZ) &gt;= 0) {</div><div class='add'>+			rem_bytes -= data_len[i];</div><div class='add'>+			*inl_mask |= (1 &lt;&lt; i);</div><div class='add'>+		} else {</div><div class='add'>+			rem_bytes -= CAAM_PTR_SZ;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (rem_bytes &gt;= 0) ? 0 : -1;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c<br/>index 33e41ea83fcc..6f44ccb55c63 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/error.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/error.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/error.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/error.c</a></div><div class='hunk'>@@ -6,9 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "compat.h"</div><div class='ctx'> #include "regs.h"</div><div class='del'>-#include "intern.h"</div><div class='ctx'> #include "desc.h"</div><div class='del'>-#include "jr.h"</div><div class='ctx'> #include "error.h"</div><div class='ctx'> </div><div class='ctx'> static const struct {</div><div class='hunk'>@@ -146,10 +144,9 @@ static void report_ccb_status(struct device *jrdev, const u32 status,</div><div class='ctx'> 	    strlen(rng_err_id_list[err_id])) {</div><div class='ctx'> 		/* RNG-only error */</div><div class='ctx'> 		err_str = rng_err_id_list[err_id];</div><div class='del'>-	} else if (err_id &lt; ARRAY_SIZE(err_id_list))</div><div class='add'>+	} else {</div><div class='ctx'> 		err_str = err_id_list[err_id];</div><div class='del'>-	else</div><div class='del'>-		snprintf(err_err_code, sizeof(err_err_code), "%02x", err_id);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * CCB ICV check failures are part of normal operation life;</div><div class='head'>diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h<br/>index 5d4c05074a5c..e2bcacc1a921 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/intern.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/intern.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/intern.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/intern.h</a></div><div class='hunk'>@@ -41,6 +41,7 @@ struct caam_drv_private_jr {</div><div class='ctx'> 	struct device		*dev;</div><div class='ctx'> 	int ridx;</div><div class='ctx'> 	struct caam_job_ring __iomem *rregs;	/* JobR's register space */</div><div class='add'>+	struct tasklet_struct irqtask;</div><div class='ctx'> 	int irq;			/* One per queue */</div><div class='ctx'> </div><div class='ctx'> 	/* Number of scatterlist crypt transforms active on the JobR */</div><div class='head'>diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c<br/>index 757c27f9953d..27631000b9f8 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/jr.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/jr.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/jr.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/jr.c</a></div><div class='hunk'>@@ -73,6 +73,8 @@ static int caam_jr_shutdown(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	ret = caam_reset_hw_jr(dev);</div><div class='ctx'> </div><div class='add'>+	tasklet_kill(&amp;jrp-&gt;irqtask);</div><div class='add'>+</div><div class='ctx'> 	/* Release interrupt */</div><div class='ctx'> 	free_irq(jrp-&gt;irq, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -128,7 +130,7 @@ static irqreturn_t caam_jr_interrupt(int irq, void *st_dev)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check the output ring for ready responses, kick</div><div class='del'>-	 * the threaded irq if jobs done.</div><div class='add'>+	 * tasklet if jobs done.</div><div class='ctx'> 	 */</div><div class='ctx'> 	irqstate = rd_reg32(&amp;jrp-&gt;rregs-&gt;jrintstatus);</div><div class='ctx'> 	if (!irqstate)</div><div class='hunk'>@@ -150,13 +152,18 @@ static irqreturn_t caam_jr_interrupt(int irq, void *st_dev)</div><div class='ctx'> 	/* Have valid interrupt at this point, just ACK and trigger */</div><div class='ctx'> 	wr_reg32(&amp;jrp-&gt;rregs-&gt;jrintstatus, irqstate);</div><div class='ctx'> </div><div class='del'>-	return IRQ_WAKE_THREAD;</div><div class='add'>+	preempt_disable();</div><div class='add'>+	tasklet_schedule(&amp;jrp-&gt;irqtask);</div><div class='add'>+	preempt_enable();</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t caam_jr_threadirq(int irq, void *st_dev)</div><div class='add'>+/* Deferred service handler, run as interrupt-fired tasklet */</div><div class='add'>+static void caam_jr_dequeue(unsigned long devarg)</div><div class='ctx'> {</div><div class='ctx'> 	int hw_idx, sw_idx, i, head, tail;</div><div class='del'>-	struct device *dev = st_dev;</div><div class='add'>+	struct device *dev = (struct device *)devarg;</div><div class='ctx'> 	struct caam_drv_private_jr *jrp = dev_get_drvdata(dev);</div><div class='ctx'> 	void (*usercall)(struct device *dev, u32 *desc, u32 status, void *arg);</div><div class='ctx'> 	u32 *userdesc, userstatus;</div><div class='hunk'>@@ -230,8 +237,6 @@ static irqreturn_t caam_jr_threadirq(int irq, void *st_dev)</div><div class='ctx'> </div><div class='ctx'> 	/* reenable / unmask IRQs */</div><div class='ctx'> 	clrsetbits_32(&amp;jrp-&gt;rregs-&gt;rconfig_lo, JRCFG_IMSK, 0);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -389,10 +394,11 @@ static int caam_jr_init(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	jrp = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='add'>+	tasklet_init(&amp;jrp-&gt;irqtask, caam_jr_dequeue, (unsigned long)dev);</div><div class='add'>+</div><div class='ctx'> 	/* Connect job ring interrupt handler. */</div><div class='del'>-	error = request_threaded_irq(jrp-&gt;irq, caam_jr_interrupt,</div><div class='del'>-				     caam_jr_threadirq, IRQF_SHARED,</div><div class='del'>-				     dev_name(dev), dev);</div><div class='add'>+	error = request_irq(jrp-&gt;irq, caam_jr_interrupt, IRQF_SHARED,</div><div class='add'>+			    dev_name(dev), dev);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		dev_err(dev, "can't connect JobR %d interrupt (%d)\n",</div><div class='ctx'> 			jrp-&gt;ridx, jrp-&gt;irq);</div><div class='hunk'>@@ -454,6 +460,7 @@ out_free_inpring:</div><div class='ctx'> out_free_irq:</div><div class='ctx'> 	free_irq(jrp-&gt;irq, dev);</div><div class='ctx'> out_kill_deq:</div><div class='add'>+	tasklet_kill(&amp;jrp-&gt;irqtask);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -489,15 +496,24 @@ static int caam_jr_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	jrpriv-&gt;rregs = (struct caam_job_ring __force *)ctrl;</div><div class='add'>+	jrpriv-&gt;rregs = (struct caam_job_ring __iomem __force *)ctrl;</div><div class='ctx'> </div><div class='del'>-	if (sizeof(dma_addr_t) == sizeof(u64))</div><div class='add'>+	if (sizeof(dma_addr_t) == sizeof(u64)) {</div><div class='ctx'> 		if (of_device_is_compatible(nprop, "fsl,sec-v5.0-job-ring"))</div><div class='del'>-			dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(40));</div><div class='add'>+			error = dma_set_mask_and_coherent(jrdev,</div><div class='add'>+							  DMA_BIT_MASK(40));</div><div class='ctx'> 		else</div><div class='del'>-			dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(36));</div><div class='del'>-	else</div><div class='del'>-		dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(32));</div><div class='add'>+			error = dma_set_mask_and_coherent(jrdev,</div><div class='add'>+							  DMA_BIT_MASK(36));</div><div class='add'>+	} else {</div><div class='add'>+		error = dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(32));</div><div class='add'>+	}</div><div class='add'>+	if (error) {</div><div class='add'>+		dev_err(jrdev, "dma_set_mask_and_coherent failed (%d)\n",</div><div class='add'>+			error);</div><div class='add'>+		iounmap(ctrl);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Identify the interrupt */</div><div class='ctx'> 	jrpriv-&gt;irq = irq_of_parse_and_map(nprop, 0);</div><div class='head'>diff --git a/drivers/crypto/caam/key_gen.c b/drivers/crypto/caam/key_gen.c<br/>index e1eaf4ff9762..1bb2816a9b4d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/key_gen.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/key_gen.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/key_gen.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/key_gen.c</a></div><div class='hunk'>@@ -10,6 +10,36 @@</div><div class='ctx'> #include "desc_constr.h"</div><div class='ctx'> #include "key_gen.h"</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * split_key_len - Compute MDHA split key length for a given algorithm</div><div class='add'>+ * @hash: Hashing algorithm selection, one of OP_ALG_ALGSEL_* - MD5, SHA1,</div><div class='add'>+ *        SHA224, SHA384, SHA512.</div><div class='add'>+ *</div><div class='add'>+ * Return: MDHA split key length</div><div class='add'>+ */</div><div class='add'>+static inline u32 split_key_len(u32 hash)</div><div class='add'>+{</div><div class='add'>+	/* Sizes for MDHA pads (*not* keys): MD5, SHA1, 224, 256, 384, 512 */</div><div class='add'>+	static const u8 mdpadlen[] = { 16, 20, 32, 32, 64, 64 };</div><div class='add'>+	u32 idx;</div><div class='add'>+</div><div class='add'>+	idx = (hash &amp; OP_ALG_ALGSEL_SUBMASK) &gt;&gt; OP_ALG_ALGSEL_SHIFT;</div><div class='add'>+</div><div class='add'>+	return (u32)(mdpadlen[idx] * 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * split_key_pad_len - Compute MDHA split key pad length for a given algorithm</div><div class='add'>+ * @hash: Hashing algorithm selection, one of OP_ALG_ALGSEL_* - MD5, SHA1,</div><div class='add'>+ *        SHA224, SHA384, SHA512.</div><div class='add'>+ *</div><div class='add'>+ * Return: MDHA split key pad length</div><div class='add'>+ */</div><div class='add'>+static inline u32 split_key_pad_len(u32 hash)</div><div class='add'>+{</div><div class='add'>+	return ALIGN(split_key_len(hash), 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void split_key_done(struct device *dev, u32 *desc, u32 err,</div><div class='ctx'> 			   void *context)</div><div class='ctx'> {</div><div class='hunk'>@@ -41,15 +71,29 @@ Split key generation-----------------------------------------------</div><div class='ctx'> [06] 0x64260028    fifostr: class2 mdsplit-jdk len=40</div><div class='ctx'> 			@0xffe04000</div><div class='ctx'> */</div><div class='del'>-int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,</div><div class='del'>-		  int split_key_pad_len, const u8 *key_in, u32 keylen,</div><div class='del'>-		  u32 alg_op)</div><div class='add'>+int gen_split_key(struct device *jrdev, u8 *key_out,</div><div class='add'>+		  struct alginfo * const adata, const u8 *key_in, u32 keylen,</div><div class='add'>+		  int max_keylen)</div><div class='ctx'> {</div><div class='ctx'> 	u32 *desc;</div><div class='ctx'> 	struct split_key_result result;</div><div class='ctx'> 	dma_addr_t dma_addr_in, dma_addr_out;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	adata-&gt;keylen = split_key_len(adata-&gt;algtype &amp; OP_ALG_ALGSEL_MASK);</div><div class='add'>+	adata-&gt;keylen_pad = split_key_pad_len(adata-&gt;algtype &amp;</div><div class='add'>+					      OP_ALG_ALGSEL_MASK);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	dev_err(jrdev, "split keylen %d split keylen padded %d\n",</div><div class='add'>+		adata-&gt;keylen, adata-&gt;keylen_pad);</div><div class='add'>+	print_hex_dump(KERN_ERR, "ctx.key@" __stringify(__LINE__)": ",</div><div class='add'>+		       DUMP_PREFIX_ADDRESS, 16, 4, key_in, keylen, 1);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (adata-&gt;keylen_pad &gt; max_keylen)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	desc = kmalloc(CAAM_CMD_SZ * 6 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		dev_err(jrdev, "unable to allocate key input memory\n");</div><div class='hunk'>@@ -63,7 +107,7 @@ int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dma_addr_out = dma_map_single(jrdev, key_out, split_key_pad_len,</div><div class='add'>+	dma_addr_out = dma_map_single(jrdev, key_out, adata-&gt;keylen_pad,</div><div class='ctx'> 				      DMA_FROM_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(jrdev, dma_addr_out)) {</div><div class='ctx'> 		dev_err(jrdev, "unable to map key output memory\n");</div><div class='hunk'>@@ -74,7 +118,9 @@ int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,</div><div class='ctx'> 	append_key(desc, dma_addr_in, keylen, CLASS_2 | KEY_DEST_CLASS_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* Sets MDHA up into an HMAC-INIT */</div><div class='del'>-	append_operation(desc, alg_op | OP_ALG_DECRYPT | OP_ALG_AS_INIT);</div><div class='add'>+	append_operation(desc, (adata-&gt;algtype &amp; OP_ALG_ALGSEL_MASK) |</div><div class='add'>+			 OP_ALG_AAI_HMAC | OP_TYPE_CLASS2_ALG | OP_ALG_DECRYPT |</div><div class='add'>+			 OP_ALG_AS_INIT);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * do a FIFO_LOAD of zero, this will trigger the internal key expansion</div><div class='hunk'>@@ -87,7 +133,7 @@ int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,</div><div class='ctx'> 	 * FIFO_STORE with the explicit split-key content store</div><div class='ctx'> 	 * (0x26 output type)</div><div class='ctx'> 	 */</div><div class='del'>-	append_fifo_store(desc, dma_addr_out, split_key_len,</div><div class='add'>+	append_fifo_store(desc, dma_addr_out, adata-&gt;keylen,</div><div class='ctx'> 			  LDST_CLASS_2_CCB | FIFOST_TYPE_SPLIT_KEK);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -108,11 +154,11 @@ int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 		print_hex_dump(KERN_ERR, "ctx.key@"__stringify(__LINE__)": ",</div><div class='ctx'> 			       DUMP_PREFIX_ADDRESS, 16, 4, key_out,</div><div class='del'>-			       split_key_pad_len, 1);</div><div class='add'>+			       adata-&gt;keylen_pad, 1);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dma_unmap_single(jrdev, dma_addr_out, split_key_pad_len,</div><div class='add'>+	dma_unmap_single(jrdev, dma_addr_out, adata-&gt;keylen_pad,</div><div class='ctx'> 			 DMA_FROM_DEVICE);</div><div class='ctx'> out_unmap_in:</div><div class='ctx'> 	dma_unmap_single(jrdev, dma_addr_in, keylen, DMA_TO_DEVICE);</div><div class='head'>diff --git a/drivers/crypto/caam/key_gen.h b/drivers/crypto/caam/key_gen.h<br/>index c5588f6d8109..4628f389eb64 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/key_gen.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/key_gen.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/key_gen.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/key_gen.h</a></div><div class='hunk'>@@ -12,6 +12,6 @@ struct split_key_result {</div><div class='ctx'> </div><div class='ctx'> void split_key_done(struct device *dev, u32 *desc, u32 err, void *context);</div><div class='ctx'> </div><div class='del'>-int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,</div><div class='del'>-		    int split_key_pad_len, const u8 *key_in, u32 keylen,</div><div class='del'>-		    u32 alg_op);</div><div class='add'>+int gen_split_key(struct device *jrdev, u8 *key_out,</div><div class='add'>+		  struct alginfo * const adata, const u8 *key_in, u32 keylen,</div><div class='add'>+		  int max_keylen);</div><div class='head'>diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h<br/>index 41cd5a356d05..c6adad09c972 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/caam/sg_sw_sec4.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/caam/sg_sw_sec4.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/caam/sg_sw_sec4.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/caam/sg_sw_sec4.h</a></div><div class='hunk'>@@ -7,7 +7,11 @@</div><div class='ctx'> </div><div class='ctx'> #include "regs.h"</div><div class='ctx'> </div><div class='del'>-struct sec4_sg_entry;</div><div class='add'>+struct sec4_sg_entry {</div><div class='add'>+	u64 ptr;</div><div class='add'>+	u32 len;</div><div class='add'>+	u32 bpid_offset;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * convert single dma address to h/w link table format</div><div class='hunk'>@@ -69,14 +73,3 @@ static inline struct sec4_sg_entry *sg_to_sec4_sg_len(</div><div class='ctx'> 	} while (total);</div><div class='ctx'> 	return sec4_sg_ptr - 1;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/* derive number of elements in scatterlist, but return 0 for 1 */</div><div class='del'>-static inline int sg_count(struct scatterlist *sg_list, int nbytes)</div><div class='del'>-{</div><div class='del'>-	int sg_nents = sg_nents_for_len(sg_list, nbytes);</div><div class='del'>-</div><div class='del'>-	if (likely(sg_nents == 1))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return sg_nents;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/Kconfig b/drivers/crypto/cavium/cpt/Kconfig<br/>new file mode 100644<br/>index 000000000000..cbd51b1aa046<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+#</div><div class='add'>+# Cavium crypto device configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+config CRYPTO_DEV_CPT</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config CAVIUM_CPT</div><div class='add'>+	tristate "Cavium Cryptographic Accelerator driver"</div><div class='add'>+	depends on ARCH_THUNDER || COMPILE_TEST</div><div class='add'>+	depends on PCI_MSI &amp;&amp; 64BIT</div><div class='add'>+	select CRYPTO_DEV_CPT</div><div class='add'>+	help</div><div class='add'>+	  Support for Cavium CPT block found in octeon-tx series of</div><div class='add'>+	  processors.</div><div class='add'>+</div><div class='add'>+	  To compile this as a module, choose M here.</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/Makefile b/drivers/crypto/cavium/cpt/Makefile<br/>new file mode 100644<br/>index 000000000000..dbf055e14622<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-$(CONFIG_CAVIUM_CPT) += cptpf.o cptvf.o</div><div class='add'>+cptpf-objs := cptpf_main.o cptpf_mbox.o</div><div class='add'>+cptvf-objs := cptvf_main.o cptvf_reqmanager.o cptvf_mbox.o cptvf_algs.o</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cpt_common.h b/drivers/crypto/cavium/cpt/cpt_common.h<br/>new file mode 100644<br/>index 000000000000..225078d03773<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/cpt_common.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cpt_common.h</a></div><div class='hunk'>@@ -0,0 +1,156 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CPT_COMMON_H</div><div class='add'>+#define __CPT_COMMON_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cpt_hw_types.h"</div><div class='add'>+</div><div class='add'>+/* Device ID */</div><div class='add'>+#define CPT_81XX_PCI_PF_DEVICE_ID 0xa040</div><div class='add'>+#define CPT_81XX_PCI_VF_DEVICE_ID 0xa041</div><div class='add'>+</div><div class='add'>+/* flags to indicate the features supported */</div><div class='add'>+#define CPT_FLAG_SRIOV_ENABLED BIT(1)</div><div class='add'>+#define CPT_FLAG_VF_DRIVER BIT(2)</div><div class='add'>+#define CPT_FLAG_DEVICE_READY BIT(3)</div><div class='add'>+</div><div class='add'>+#define cpt_sriov_enabled(cpt) ((cpt)-&gt;flags &amp; CPT_FLAG_SRIOV_ENABLED)</div><div class='add'>+#define cpt_vf_driver(cpt) ((cpt)-&gt;flags &amp; CPT_FLAG_VF_DRIVER)</div><div class='add'>+#define cpt_device_ready(cpt) ((cpt)-&gt;flags &amp; CPT_FLAG_DEVICE_READY)</div><div class='add'>+</div><div class='add'>+#define CPT_MBOX_MSG_TYPE_ACK 1</div><div class='add'>+#define CPT_MBOX_MSG_TYPE_NACK 2</div><div class='add'>+#define CPT_MBOX_MSG_TIMEOUT 2000</div><div class='add'>+#define VF_STATE_DOWN 0</div><div class='add'>+#define VF_STATE_UP 1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CPT Registers map for 81xx</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* PF registers */</div><div class='add'>+#define CPTX_PF_CONSTANTS(a) (0x0ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_RESET(a) (0x100ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_DIAG(a) (0x120ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_BIST_STATUS(a) (0x160ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_ECC0_CTL(a) (0x200ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_ECC0_FLIP(a) (0x210ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_ECC0_INT(a) (0x220ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_ECC0_INT_W1S(a) (0x230ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_ECC0_ENA_W1S(a)	(0x240ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_ECC0_ENA_W1C(a)	(0x250ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_MBOX_INTX(a, b)	\</div><div class='add'>+	(0x400ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 3))</div><div class='add'>+#define CPTX_PF_MBOX_INT_W1SX(a, b) \</div><div class='add'>+	(0x420ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 3))</div><div class='add'>+#define CPTX_PF_MBOX_ENA_W1CX(a, b) \</div><div class='add'>+	(0x440ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 3))</div><div class='add'>+#define CPTX_PF_MBOX_ENA_W1SX(a, b) \</div><div class='add'>+	(0x460ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 3))</div><div class='add'>+#define CPTX_PF_EXEC_INT(a) (0x500ll + 0x1000000000ll * ((a) &amp; 0x1))</div><div class='add'>+#define CPTX_PF_EXEC_INT_W1S(a)	(0x520ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXEC_ENA_W1C(a)	(0x540ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXEC_ENA_W1S(a)	(0x560ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_GX_EN(a, b) \</div><div class='add'>+	(0x600ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 3))</div><div class='add'>+#define CPTX_PF_EXEC_INFO(a) (0x700ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXEC_BUSY(a) (0x800ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXEC_INFO0(a) (0x900ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXEC_INFO1(a) (0x910ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_INST_REQ_PC(a) (0x10000ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_INST_LATENCY_PC(a) \</div><div class='add'>+	(0x10020ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_RD_REQ_PC(a) (0x10040ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_RD_LATENCY_PC(a) (0x10060ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_RD_UC_PC(a) (0x10080ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_ACTIVE_CYCLES_PC(a) (0x10100ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXE_CTL(a) (0x4000000ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXE_STATUS(a) (0x4000008ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXE_CLK(a) (0x4000010ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXE_DBG_CTL(a) (0x4000018ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXE_DBG_DATA(a)	(0x4000020ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXE_BIST_STATUS(a) (0x4000028ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXE_REQ_TIMER(a) (0x4000030ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXE_MEM_CTL(a) (0x4000038ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXE_PERF_CTL(a)	(0x4001000ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXE_DBG_CNTX(a, b) \</div><div class='add'>+	(0x4001100ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 3))</div><div class='add'>+#define CPTX_PF_EXE_PERF_EVENT_CNT(a) (0x4001180ll + ((u64)(a) &lt;&lt; 36))</div><div class='add'>+#define CPTX_PF_EXE_EPCI_INBX_CNT(a, b) \</div><div class='add'>+	(0x4001200ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 3))</div><div class='add'>+#define CPTX_PF_EXE_EPCI_OUTBX_CNT(a, b) \</div><div class='add'>+	(0x4001240ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 3))</div><div class='add'>+#define CPTX_PF_ENGX_UCODE_BASE(a, b) \</div><div class='add'>+	(0x4002000ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 3))</div><div class='add'>+#define CPTX_PF_QX_CTL(a, b) \</div><div class='add'>+	(0x8000000ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_PF_QX_GMCTL(a, b) \</div><div class='add'>+	(0x8000020ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_PF_QX_CTL2(a, b) \</div><div class='add'>+	(0x8000100ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_PF_VFX_MBOXX(a, b, c) \</div><div class='add'>+	(0x8001000ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20) + ((c) &lt;&lt; 8))</div><div class='add'>+</div><div class='add'>+/* VF registers */</div><div class='add'>+#define CPTX_VQX_CTL(a, b) (0x100ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_SADDR(a, b) (0x200ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_DONE_WAIT(a, b) (0x400ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_INPROG(a, b) (0x410ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_DONE(a, b) (0x420ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_DONE_ACK(a, b) (0x440ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_DONE_INT_W1S(a, b) (0x460ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_DONE_INT_W1C(a, b) (0x468ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_DONE_ENA_W1S(a, b) (0x470ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_DONE_ENA_W1C(a, b) (0x478ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_MISC_INT(a, b)	(0x500ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_MISC_INT_W1S(a, b) (0x508ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_MISC_ENA_W1S(a, b) (0x510ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_MISC_ENA_W1C(a, b) (0x518ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VQX_DOORBELL(a, b) (0x600ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20))</div><div class='add'>+#define CPTX_VFX_PF_MBOXX(a, b, c) \</div><div class='add'>+	(0x1000ll + ((u64)(a) &lt;&lt; 36) + ((b) &lt;&lt; 20) + ((c) &lt;&lt; 3))</div><div class='add'>+</div><div class='add'>+enum vftype {</div><div class='add'>+	AE_TYPES = 1,</div><div class='add'>+	SE_TYPES = 2,</div><div class='add'>+	BAD_CPT_TYPES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Max CPT devices supported */</div><div class='add'>+enum cpt_mbox_opcode {</div><div class='add'>+	CPT_MSG_VF_UP = 1,</div><div class='add'>+	CPT_MSG_VF_DOWN,</div><div class='add'>+	CPT_MSG_READY,</div><div class='add'>+	CPT_MSG_QLEN,</div><div class='add'>+	CPT_MSG_QBIND_GRP,</div><div class='add'>+	CPT_MSG_VQ_PRIORITY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CPT mailbox structure */</div><div class='add'>+struct cpt_mbox {</div><div class='add'>+	u64 msg; /* Message type MBOX[0] */</div><div class='add'>+	u64 data;/* Data         MBOX[1] */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Register read/write APIs */</div><div class='add'>+static inline void cpt_write_csr64(u8 __iomem *hw_addr, u64 offset,</div><div class='add'>+				   u64 val)</div><div class='add'>+{</div><div class='add'>+	writeq(val, hw_addr + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 cpt_read_csr64(u8 __iomem *hw_addr, u64 offset)</div><div class='add'>+{</div><div class='add'>+	return readq(hw_addr + offset);</div><div class='add'>+}</div><div class='add'>+#endif /* __CPT_COMMON_H */</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cpt_hw_types.h b/drivers/crypto/cavium/cpt/cpt_hw_types.h<br/>new file mode 100644<br/>index 000000000000..279669494196<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/cpt_hw_types.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cpt_hw_types.h</a></div><div class='hunk'>@@ -0,0 +1,658 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CPT_HW_TYPES_H</div><div class='add'>+#define __CPT_HW_TYPES_H</div><div class='add'>+</div><div class='add'>+#include "cpt_common.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Enumeration cpt_comp_e</div><div class='add'>+ *</div><div class='add'>+ * CPT Completion Enumeration</div><div class='add'>+ * Enumerates the values of CPT_RES_S[COMPCODE].</div><div class='add'>+ */</div><div class='add'>+enum cpt_comp_e {</div><div class='add'>+	CPT_COMP_E_NOTDONE = 0x00,</div><div class='add'>+	CPT_COMP_E_GOOD = 0x01,</div><div class='add'>+	CPT_COMP_E_FAULT = 0x02,</div><div class='add'>+	CPT_COMP_E_SWERR = 0x03,</div><div class='add'>+	CPT_COMP_E_LAST_ENTRY = 0xFF</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Structure cpt_inst_s</div><div class='add'>+ *</div><div class='add'>+ * CPT Instruction Structure</div><div class='add'>+ * This structure specifies the instruction layout. Instructions are</div><div class='add'>+ * stored in memory as little-endian unless CPT()_PF_Q()_CTL[INST_BE] is set.</div><div class='add'>+ * cpt_inst_s_s</div><div class='add'>+ * Word 0</div><div class='add'>+ * doneint:1 Done interrupt.</div><div class='add'>+ *	0 = No interrupts related to this instruction.</div><div class='add'>+ *	1 = When the instruction completes, CPT()_VQ()_DONE[DONE] will be</div><div class='add'>+ *	incremented,and based on the rules described there an interrupt may</div><div class='add'>+ *	occur.</div><div class='add'>+ * Word 1</div><div class='add'>+ * res_addr [127: 64] Result IOVA.</div><div class='add'>+ *	If nonzero, specifies where to write CPT_RES_S.</div><div class='add'>+ *	If zero, no result structure will be written.</div><div class='add'>+ *	Address must be 16-byte aligned.</div><div class='add'>+ *	Bits &lt;63:49&gt; are ignored by hardware; software should use a</div><div class='add'>+ *	sign-extended bit &lt;48&gt; for forward compatibility.</div><div class='add'>+ * Word 2</div><div class='add'>+ *  grp:10 [171:162] If [WQ_PTR] is nonzero, the SSO guest-group to use when</div><div class='add'>+ *	CPT submits work SSO.</div><div class='add'>+ *	For the SSO to not discard the add-work request, FPA_PF_MAP() must map</div><div class='add'>+ *	[GRP] and CPT()_PF_Q()_GMCTL[GMID] as valid.</div><div class='add'>+ *  tt:2 [161:160] If [WQ_PTR] is nonzero, the SSO tag type to use when CPT</div><div class='add'>+ *	submits work to SSO</div><div class='add'>+ *  tag:32 [159:128] If [WQ_PTR] is nonzero, the SSO tag to use when CPT</div><div class='add'>+ *	submits work to SSO.</div><div class='add'>+ * Word 3</div><div class='add'>+ *  wq_ptr [255:192] If [WQ_PTR] is nonzero, it is a pointer to a</div><div class='add'>+ *	work-queue entry that CPT submits work to SSO after all context,</div><div class='add'>+ *	output data, and result write operations are visible to other</div><div class='add'>+ *	CNXXXX units and the cores. Bits &lt;2:0&gt; must be zero.</div><div class='add'>+ *	Bits &lt;63:49&gt; are ignored by hardware; software should</div><div class='add'>+ *	use a sign-extended bit &lt;48&gt; for forward compatibility.</div><div class='add'>+ *	Internal:</div><div class='add'>+ *	Bits &lt;63:49&gt;, &lt;2:0&gt; are ignored by hardware, treated as always 0x0.</div><div class='add'>+ * Word 4</div><div class='add'>+ *  ei0; [319:256] Engine instruction word 0. Passed to the AE/SE.</div><div class='add'>+ * Word 5</div><div class='add'>+ *  ei1; [383:320] Engine instruction word 1. Passed to the AE/SE.</div><div class='add'>+ * Word 6</div><div class='add'>+ *  ei2; [447:384] Engine instruction word 1. Passed to the AE/SE.</div><div class='add'>+ * Word 7</div><div class='add'>+ *  ei3; [511:448] Engine instruction word 1. Passed to the AE/SE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+union cpt_inst_s {</div><div class='add'>+	u64 u[8];</div><div class='add'>+	struct cpt_inst_s_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_17_63:47;</div><div class='add'>+		u64 doneint:1;</div><div class='add'>+		u64 reserved_0_1:16;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 reserved_0_15:16;</div><div class='add'>+		u64 doneint:1;</div><div class='add'>+		u64 reserved_17_63:47;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+		u64 res_addr;</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 2 - Big Endian */</div><div class='add'>+		u64 reserved_172_19:20;</div><div class='add'>+		u64 grp:10;</div><div class='add'>+		u64 tt:2;</div><div class='add'>+		u64 tag:32;</div><div class='add'>+#else /* Word 2 - Little Endian */</div><div class='add'>+		u64 tag:32;</div><div class='add'>+		u64 tt:2;</div><div class='add'>+		u64 grp:10;</div><div class='add'>+		u64 reserved_172_191:20;</div><div class='add'>+#endif /* Word 2 - End */</div><div class='add'>+		u64 wq_ptr;</div><div class='add'>+		u64 ei0;</div><div class='add'>+		u64 ei1;</div><div class='add'>+		u64 ei2;</div><div class='add'>+		u64 ei3;</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Structure cpt_res_s</div><div class='add'>+ *</div><div class='add'>+ * CPT Result Structure</div><div class='add'>+ * The CPT coprocessor writes the result structure after it completes a</div><div class='add'>+ * CPT_INST_S instruction. The result structure is exactly 16 bytes, and</div><div class='add'>+ * each instruction completion produces exactly one result structure.</div><div class='add'>+ *</div><div class='add'>+ * This structure is stored in memory as little-endian unless</div><div class='add'>+ * CPT()_PF_Q()_CTL[INST_BE] is set.</div><div class='add'>+ * cpt_res_s_s</div><div class='add'>+ * Word 0</div><div class='add'>+ *  doneint:1 [16:16] Done interrupt. This bit is copied from the</div><div class='add'>+ *	corresponding instruction's CPT_INST_S[DONEINT].</div><div class='add'>+ *  compcode:8 [7:0] Indicates completion/error status of the CPT coprocessor</div><div class='add'>+ *	for the	associated instruction, as enumerated by CPT_COMP_E.</div><div class='add'>+ *	Core software may write the memory location containing [COMPCODE] to</div><div class='add'>+ *	0x0 before ringing the doorbell, and then poll for completion by</div><div class='add'>+ *	checking for a nonzero value.</div><div class='add'>+ *	Once the core observes a nonzero [COMPCODE] value in this case,the CPT</div><div class='add'>+ *	coprocessor will have also completed L2/DRAM write operations.</div><div class='add'>+ * Word 1</div><div class='add'>+ *  reserved</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+union cpt_res_s {</div><div class='add'>+	u64 u[2];</div><div class='add'>+	struct cpt_res_s_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_17_63:47;</div><div class='add'>+		u64 doneint:1;</div><div class='add'>+		u64 reserved_8_15:8;</div><div class='add'>+		u64 compcode:8;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 compcode:8;</div><div class='add'>+		u64 reserved_8_15:8;</div><div class='add'>+		u64 doneint:1;</div><div class='add'>+		u64 reserved_17_63:47;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+		u64 reserved_64_127;</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_pf_bist_status</div><div class='add'>+ *</div><div class='add'>+ * CPT PF Control Bist Status Register</div><div class='add'>+ * This register has the BIST status of memories. Each bit is the BIST result</div><div class='add'>+ * of an individual memory (per bit, 0 = pass and 1 = fail).</div><div class='add'>+ * cptx_pf_bist_status_s</div><div class='add'>+ * Word0</div><div class='add'>+ *  bstatus [29:0](RO/H) BIST status. One bit per memory, enumerated by</div><div class='add'>+ *	CPT_RAMS_E.</div><div class='add'>+ */</div><div class='add'>+union cptx_pf_bist_status {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_pf_bist_status_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_30_63:34;</div><div class='add'>+		u64 bstatus:30;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 bstatus:30;</div><div class='add'>+		u64 reserved_30_63:34;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_pf_constants</div><div class='add'>+ *</div><div class='add'>+ * CPT PF Constants Register</div><div class='add'>+ * This register contains implementation-related parameters of CPT in CNXXXX.</div><div class='add'>+ * cptx_pf_constants_s</div><div class='add'>+ * Word 0</div><div class='add'>+ *  reserved_40_63:24 [63:40] Reserved.</div><div class='add'>+ *  epcis:8 [39:32](RO) Number of EPCI busses.</div><div class='add'>+ *  grps:8 [31:24](RO) Number of engine groups implemented.</div><div class='add'>+ *  ae:8 [23:16](RO/H) Number of AEs. In CNXXXX, for CPT0 returns 0x0,</div><div class='add'>+ *	for CPT1 returns 0x18, or less if there are fuse-disables.</div><div class='add'>+ *  se:8 [15:8](RO/H) Number of SEs. In CNXXXX, for CPT0 returns 0x30,</div><div class='add'>+ *	or less if there are fuse-disables, for CPT1 returns 0x0.</div><div class='add'>+ *  vq:8 [7:0](RO) Number of VQs.</div><div class='add'>+ */</div><div class='add'>+union cptx_pf_constants {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_pf_constants_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_40_63:24;</div><div class='add'>+		u64 epcis:8;</div><div class='add'>+		u64 grps:8;</div><div class='add'>+		u64 ae:8;</div><div class='add'>+		u64 se:8;</div><div class='add'>+		u64 vq:8;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 vq:8;</div><div class='add'>+		u64 se:8;</div><div class='add'>+		u64 ae:8;</div><div class='add'>+		u64 grps:8;</div><div class='add'>+		u64 epcis:8;</div><div class='add'>+		u64 reserved_40_63:24;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_pf_exe_bist_status</div><div class='add'>+ *</div><div class='add'>+ * CPT PF Engine Bist Status Register</div><div class='add'>+ * This register has the BIST status of each engine.  Each bit is the</div><div class='add'>+ * BIST result of an individual engine (per bit, 0 = pass and 1 = fail).</div><div class='add'>+ * cptx_pf_exe_bist_status_s</div><div class='add'>+ * Word0</div><div class='add'>+ *  reserved_48_63:16 [63:48] reserved</div><div class='add'>+ *  bstatus:48 [47:0](RO/H) BIST status. One bit per engine.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+union cptx_pf_exe_bist_status {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_pf_exe_bist_status_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_48_63:16;</div><div class='add'>+		u64 bstatus:48;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 bstatus:48;</div><div class='add'>+		u64 reserved_48_63:16;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_pf_q#_ctl</div><div class='add'>+ *</div><div class='add'>+ * CPT Queue Control Register</div><div class='add'>+ * This register configures queues. This register should be changed only</div><div class='add'>+ * when quiescent (see CPT()_VQ()_INPROG[INFLIGHT]).</div><div class='add'>+ * cptx_pf_qx_ctl_s</div><div class='add'>+ * Word0</div><div class='add'>+ *  reserved_60_63:4 [63:60] reserved.</div><div class='add'>+ *  aura:12; [59:48](R/W) Guest-aura for returning this queue's</div><div class='add'>+ *	instruction-chunk buffers to FPA. Only used when [INST_FREE] is set.</div><div class='add'>+ *	For the FPA to not discard the request, FPA_PF_MAP() must map</div><div class='add'>+ *	[AURA] and CPT()_PF_Q()_GMCTL[GMID] as valid.</div><div class='add'>+ *  reserved_45_47:3 [47:45] reserved.</div><div class='add'>+ *  size:13 [44:32](R/W) Command-buffer size, in number of 64-bit words per</div><div class='add'>+ *	command buffer segment. Must be 8*n + 1, where n is the number of</div><div class='add'>+ *	instructions per buffer segment.</div><div class='add'>+ *  reserved_11_31:21 [31:11] Reserved.</div><div class='add'>+ *  cont_err:1 [10:10](R/W) Continue on error.</div><div class='add'>+ *	0 = When CPT()_VQ()_MISC_INT[NWRP], CPT()_VQ()_MISC_INT[IRDE] or</div><div class='add'>+ *	CPT()_VQ()_MISC_INT[DOVF] are set by hardware or software via</div><div class='add'>+ *	CPT()_VQ()_MISC_INT_W1S, then CPT()_VQ()_CTL[ENA] is cleared.  Due to</div><div class='add'>+ *	pipelining, additional instructions may have been processed between the</div><div class='add'>+ *	instruction causing the error and the next instruction in the disabled</div><div class='add'>+ *	queue (the instruction at CPT()_VQ()_SADDR).</div><div class='add'>+ *	1 = Ignore errors and continue processing instructions.</div><div class='add'>+ *	For diagnostic use only.</div><div class='add'>+ *  inst_free:1 [9:9](R/W) Instruction FPA free. When set, when CPT reaches the</div><div class='add'>+ *	end of an instruction chunk, that chunk will be freed to the FPA.</div><div class='add'>+ *  inst_be:1 [8:8](R/W) Instruction big-endian control. When set, instructions,</div><div class='add'>+ *	instruction next chunk pointers, and result structures are stored in</div><div class='add'>+ *	big-endian format in memory.</div><div class='add'>+ *  iqb_ldwb:1 [7:7](R/W) Instruction load don't write back.</div><div class='add'>+ *	0 = The hardware issues NCB transient load (LDT) towards the cache,</div><div class='add'>+ *	which if the line hits and is is dirty will cause the line to be</div><div class='add'>+ *	written back before being replaced.</div><div class='add'>+ *	1 = The hardware issues NCB LDWB read-and-invalidate command towards</div><div class='add'>+ *	the cache when fetching the last word of instructions; as a result the</div><div class='add'>+ *	line will not be written back when replaced.  This improves</div><div class='add'>+ *	performance, but software must not read the instructions after they are</div><div class='add'>+ *	posted to the hardware.	Reads that do not consume the last word of a</div><div class='add'>+ *	cache line always use LDI.</div><div class='add'>+ *  reserved_4_6:3 [6:4] Reserved.</div><div class='add'>+ *  grp:3; [3:1](R/W) Engine group.</div><div class='add'>+ *  pri:1; [0:0](R/W) Queue priority.</div><div class='add'>+ *	1 = This queue has higher priority. Round-robin between higher</div><div class='add'>+ *	priority queues.</div><div class='add'>+ *	0 = This queue has lower priority. Round-robin between lower</div><div class='add'>+ *	priority queues.</div><div class='add'>+ */</div><div class='add'>+union cptx_pf_qx_ctl {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_pf_qx_ctl_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_60_63:4;</div><div class='add'>+		u64 aura:12;</div><div class='add'>+		u64 reserved_45_47:3;</div><div class='add'>+		u64 size:13;</div><div class='add'>+		u64 reserved_11_31:21;</div><div class='add'>+		u64 cont_err:1;</div><div class='add'>+		u64 inst_free:1;</div><div class='add'>+		u64 inst_be:1;</div><div class='add'>+		u64 iqb_ldwb:1;</div><div class='add'>+		u64 reserved_4_6:3;</div><div class='add'>+		u64 grp:3;</div><div class='add'>+		u64 pri:1;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 pri:1;</div><div class='add'>+		u64 grp:3;</div><div class='add'>+		u64 reserved_4_6:3;</div><div class='add'>+		u64 iqb_ldwb:1;</div><div class='add'>+		u64 inst_be:1;</div><div class='add'>+		u64 inst_free:1;</div><div class='add'>+		u64 cont_err:1;</div><div class='add'>+		u64 reserved_11_31:21;</div><div class='add'>+		u64 size:13;</div><div class='add'>+		u64 reserved_45_47:3;</div><div class='add'>+		u64 aura:12;</div><div class='add'>+		u64 reserved_60_63:4;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_vq#_saddr</div><div class='add'>+ *</div><div class='add'>+ * CPT Queue Starting Buffer Address Registers</div><div class='add'>+ * These registers set the instruction buffer starting address.</div><div class='add'>+ * cptx_vqx_saddr_s</div><div class='add'>+ * Word0</div><div class='add'>+ *  reserved_49_63:15 [63:49] Reserved.</div><div class='add'>+ *  ptr:43 [48:6](R/W/H) Instruction buffer IOVA &lt;48:6&gt; (64-byte aligned).</div><div class='add'>+ *	When written, it is the initial buffer starting address; when read,</div><div class='add'>+ *	it is the next read pointer to be requested from L2C. The PTR field</div><div class='add'>+ *	is overwritten with the next pointer each time that the command buffer</div><div class='add'>+ *	segment is exhausted. New commands will then be read from the newly</div><div class='add'>+ *	specified command buffer pointer.</div><div class='add'>+ *  reserved_0_5:6 [5:0] Reserved.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+union cptx_vqx_saddr {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_vqx_saddr_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_49_63:15;</div><div class='add'>+		u64 ptr:43;</div><div class='add'>+		u64 reserved_0_5:6;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 reserved_0_5:6;</div><div class='add'>+		u64 ptr:43;</div><div class='add'>+		u64 reserved_49_63:15;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_vq#_misc_ena_w1s</div><div class='add'>+ *</div><div class='add'>+ * CPT Queue Misc Interrupt Enable Set Register</div><div class='add'>+ * This register sets interrupt enable bits.</div><div class='add'>+ * cptx_vqx_misc_ena_w1s_s</div><div class='add'>+ * Word0</div><div class='add'>+ * reserved_5_63:59 [63:5] Reserved.</div><div class='add'>+ * swerr:1 [4:4](R/W1S/H) Reads or sets enable for</div><div class='add'>+ *	CPT(0..1)_VQ(0..63)_MISC_INT[SWERR].</div><div class='add'>+ * nwrp:1 [3:3](R/W1S/H) Reads or sets enable for</div><div class='add'>+ *	CPT(0..1)_VQ(0..63)_MISC_INT[NWRP].</div><div class='add'>+ * irde:1 [2:2](R/W1S/H) Reads or sets enable for</div><div class='add'>+ *	CPT(0..1)_VQ(0..63)_MISC_INT[IRDE].</div><div class='add'>+ * dovf:1 [1:1](R/W1S/H) Reads or sets enable for</div><div class='add'>+ *	CPT(0..1)_VQ(0..63)_MISC_INT[DOVF].</div><div class='add'>+ * mbox:1 [0:0](R/W1S/H) Reads or sets enable for</div><div class='add'>+ *	CPT(0..1)_VQ(0..63)_MISC_INT[MBOX].</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+union cptx_vqx_misc_ena_w1s {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_vqx_misc_ena_w1s_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_5_63:59;</div><div class='add'>+		u64 swerr:1;</div><div class='add'>+		u64 nwrp:1;</div><div class='add'>+		u64 irde:1;</div><div class='add'>+		u64 dovf:1;</div><div class='add'>+		u64 mbox:1;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 mbox:1;</div><div class='add'>+		u64 dovf:1;</div><div class='add'>+		u64 irde:1;</div><div class='add'>+		u64 nwrp:1;</div><div class='add'>+		u64 swerr:1;</div><div class='add'>+		u64 reserved_5_63:59;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_vq#_doorbell</div><div class='add'>+ *</div><div class='add'>+ * CPT Queue Doorbell Registers</div><div class='add'>+ * Doorbells for the CPT instruction queues.</div><div class='add'>+ * cptx_vqx_doorbell_s</div><div class='add'>+ * Word0</div><div class='add'>+ *  reserved_20_63:44 [63:20] Reserved.</div><div class='add'>+ *  dbell_cnt:20 [19:0](R/W/H) Number of instruction queue 64-bit words to add</div><div class='add'>+ *	to the CPT instruction doorbell count. Readback value is the the</div><div class='add'>+ *	current number of pending doorbell requests. If counter overflows</div><div class='add'>+ *	CPT()_VQ()_MISC_INT[DBELL_DOVF] is set. To reset the count back to</div><div class='add'>+ *	zero, write one to clear CPT()_VQ()_MISC_INT_ENA_W1C[DBELL_DOVF],</div><div class='add'>+ *	then write a value of 2^20 minus the read [DBELL_CNT], then write one</div><div class='add'>+ *	to CPT()_VQ()_MISC_INT_W1C[DBELL_DOVF] and</div><div class='add'>+ *	CPT()_VQ()_MISC_INT_ENA_W1S[DBELL_DOVF]. Must be a multiple of 8.</div><div class='add'>+ *	All CPT instructions are 8 words and require a doorbell count of</div><div class='add'>+ *	multiple of 8.</div><div class='add'>+ */</div><div class='add'>+union cptx_vqx_doorbell {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_vqx_doorbell_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_20_63:44;</div><div class='add'>+		u64 dbell_cnt:20;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 dbell_cnt:20;</div><div class='add'>+		u64 reserved_20_63:44;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_vq#_inprog</div><div class='add'>+ *</div><div class='add'>+ * CPT Queue In Progress Count Registers</div><div class='add'>+ * These registers contain the per-queue instruction in flight registers.</div><div class='add'>+ * cptx_vqx_inprog_s</div><div class='add'>+ * Word0</div><div class='add'>+ *  reserved_8_63:56 [63:8] Reserved.</div><div class='add'>+ *  inflight:8 [7:0](RO/H) Inflight count. Counts the number of instructions</div><div class='add'>+ *	for the VF for which CPT is fetching, executing or responding to</div><div class='add'>+ *	instructions. However this does not include any interrupts that are</div><div class='add'>+ *	awaiting software handling (CPT()_VQ()_DONE[DONE] != 0x0).</div><div class='add'>+ *	A queue may not be reconfigured until:</div><div class='add'>+ *	1. CPT()_VQ()_CTL[ENA] is cleared by software.</div><div class='add'>+ *	2. [INFLIGHT] is polled until equals to zero.</div><div class='add'>+ */</div><div class='add'>+union cptx_vqx_inprog {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_vqx_inprog_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_8_63:56;</div><div class='add'>+		u64 inflight:8;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 inflight:8;</div><div class='add'>+		u64 reserved_8_63:56;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_vq#_misc_int</div><div class='add'>+ *</div><div class='add'>+ * CPT Queue Misc Interrupt Register</div><div class='add'>+ * These registers contain the per-queue miscellaneous interrupts.</div><div class='add'>+ * cptx_vqx_misc_int_s</div><div class='add'>+ * Word 0</div><div class='add'>+ *  reserved_5_63:59 [63:5] Reserved.</div><div class='add'>+ *  swerr:1 [4:4](R/W1C/H) Software error from engines.</div><div class='add'>+ *  nwrp:1  [3:3](R/W1C/H) NCB result write response error.</div><div class='add'>+ *  irde:1  [2:2](R/W1C/H) Instruction NCB read response error.</div><div class='add'>+ *  dovf:1 [1:1](R/W1C/H) Doorbell overflow.</div><div class='add'>+ *  mbox:1 [0:0](R/W1C/H) PF to VF mailbox interrupt. Set when</div><div class='add'>+ *	CPT()_VF()_PF_MBOX(0) is written.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+union cptx_vqx_misc_int {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_vqx_misc_int_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_5_63:59;</div><div class='add'>+		u64 swerr:1;</div><div class='add'>+		u64 nwrp:1;</div><div class='add'>+		u64 irde:1;</div><div class='add'>+		u64 dovf:1;</div><div class='add'>+		u64 mbox:1;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 mbox:1;</div><div class='add'>+		u64 dovf:1;</div><div class='add'>+		u64 irde:1;</div><div class='add'>+		u64 nwrp:1;</div><div class='add'>+		u64 swerr:1;</div><div class='add'>+		u64 reserved_5_63:59;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_vq#_done_ack</div><div class='add'>+ *</div><div class='add'>+ * CPT Queue Done Count Ack Registers</div><div class='add'>+ * This register is written by software to acknowledge interrupts.</div><div class='add'>+ * cptx_vqx_done_ack_s</div><div class='add'>+ * Word0</div><div class='add'>+ *  reserved_20_63:44 [63:20] Reserved.</div><div class='add'>+ *  done_ack:20 [19:0](R/W/H) Number of decrements to CPT()_VQ()_DONE[DONE].</div><div class='add'>+ *	Reads CPT()_VQ()_DONE[DONE]. Written by software to acknowledge</div><div class='add'>+ *	interrupts. If CPT()_VQ()_DONE[DONE] is still nonzero the interrupt</div><div class='add'>+ *	will be re-sent if the conditions described in CPT()_VQ()_DONE[DONE]</div><div class='add'>+ *	are satisfied.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+union cptx_vqx_done_ack {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_vqx_done_ack_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_20_63:44;</div><div class='add'>+		u64 done_ack:20;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 done_ack:20;</div><div class='add'>+		u64 reserved_20_63:44;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_vq#_done</div><div class='add'>+ *</div><div class='add'>+ * CPT Queue Done Count Registers</div><div class='add'>+ * These registers contain the per-queue instruction done count.</div><div class='add'>+ * cptx_vqx_done_s</div><div class='add'>+ * Word0</div><div class='add'>+ *  reserved_20_63:44 [63:20] Reserved.</div><div class='add'>+ *  done:20 [19:0](R/W/H) Done count. When CPT_INST_S[DONEINT] set and that</div><div class='add'>+ *	instruction completes, CPT()_VQ()_DONE[DONE] is incremented when the</div><div class='add'>+ *	instruction finishes. Write to this field are for diagnostic use only;</div><div class='add'>+ *	instead software writes CPT()_VQ()_DONE_ACK with the number of</div><div class='add'>+ *	decrements for this field.</div><div class='add'>+ *	Interrupts are sent as follows:</div><div class='add'>+ *	* When CPT()_VQ()_DONE[DONE] = 0, then no results are pending, the</div><div class='add'>+ *	interrupt coalescing timer is held to zero, and an interrupt is not</div><div class='add'>+ *	sent.</div><div class='add'>+ *	* When CPT()_VQ()_DONE[DONE] != 0, then the interrupt coalescing timer</div><div class='add'>+ *	counts. If the counter is &gt;= CPT()_VQ()_DONE_WAIT[TIME_WAIT]*1024, or</div><div class='add'>+ *	CPT()_VQ()_DONE[DONE] &gt;= CPT()_VQ()_DONE_WAIT[NUM_WAIT], i.e. enough</div><div class='add'>+ *	time has passed or enough results have arrived, then the interrupt is</div><div class='add'>+ *	sent.</div><div class='add'>+ *	* When CPT()_VQ()_DONE_ACK is written (or CPT()_VQ()_DONE is written</div><div class='add'>+ *	but this is not typical), the interrupt coalescing timer restarts.</div><div class='add'>+ *	Note after decrementing this interrupt equation is recomputed,</div><div class='add'>+ *	for example if CPT()_VQ()_DONE[DONE] &gt;= CPT()_VQ()_DONE_WAIT[NUM_WAIT]</div><div class='add'>+ *	and because the timer is zero, the interrupt will be resent immediately.</div><div class='add'>+ *	(This covers the race case between software acknowledging an interrupt</div><div class='add'>+ *	and a result returning.)</div><div class='add'>+ *	* When CPT()_VQ()_DONE_ENA_W1S[DONE] = 0, interrupts are not sent,</div><div class='add'>+ *	but the counting described above still occurs.</div><div class='add'>+ *	Since CPT instructions complete out-of-order, if software is using</div><div class='add'>+ *	completion interrupts the suggested scheme is to request a DONEINT on</div><div class='add'>+ *	each request, and when an interrupt arrives perform a "greedy" scan for</div><div class='add'>+ *	completions; even if a later command is acknowledged first this will</div><div class='add'>+ *	not result in missing a completion.</div><div class='add'>+ *	Software is responsible for making sure [DONE] does not overflow;</div><div class='add'>+ *	for example by insuring there are not more than 2^20-1 instructions in</div><div class='add'>+ *	flight that may request interrupts.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+union cptx_vqx_done {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_vqx_done_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_20_63:44;</div><div class='add'>+		u64 done:20;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 done:20;</div><div class='add'>+		u64 reserved_20_63:44;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_vq#_done_wait</div><div class='add'>+ *</div><div class='add'>+ * CPT Queue Done Interrupt Coalescing Wait Registers</div><div class='add'>+ * Specifies the per queue interrupt coalescing settings.</div><div class='add'>+ * cptx_vqx_done_wait_s</div><div class='add'>+ * Word0</div><div class='add'>+ *  reserved_48_63:16 [63:48] Reserved.</div><div class='add'>+ *  time_wait:16; [47:32](R/W) Time hold-off. When CPT()_VQ()_DONE[DONE] = 0</div><div class='add'>+ *	or CPT()_VQ()_DONE_ACK is written a timer is cleared. When the timer</div><div class='add'>+ *	reaches [TIME_WAIT]*1024 then interrupt coalescing ends.</div><div class='add'>+ *	see CPT()_VQ()_DONE[DONE]. If 0x0, time coalescing is disabled.</div><div class='add'>+ *  reserved_20_31:12 [31:20] Reserved.</div><div class='add'>+ *  num_wait:20 [19:0](R/W) Number of messages hold-off.</div><div class='add'>+ *	When CPT()_VQ()_DONE[DONE] &gt;= [NUM_WAIT] then interrupt coalescing ends</div><div class='add'>+ *	see CPT()_VQ()_DONE[DONE]. If 0x0, same behavior as 0x1.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+union cptx_vqx_done_wait {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_vqx_done_wait_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_48_63:16;</div><div class='add'>+		u64 time_wait:16;</div><div class='add'>+		u64 reserved_20_31:12;</div><div class='add'>+		u64 num_wait:20;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 num_wait:20;</div><div class='add'>+		u64 reserved_20_31:12;</div><div class='add'>+		u64 time_wait:16;</div><div class='add'>+		u64 reserved_48_63:16;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_vq#_done_ena_w1s</div><div class='add'>+ *</div><div class='add'>+ * CPT Queue Done Interrupt Enable Set Registers</div><div class='add'>+ * Write 1 to these registers will enable the DONEINT interrupt for the queue.</div><div class='add'>+ * cptx_vqx_done_ena_w1s_s</div><div class='add'>+ * Word0</div><div class='add'>+ *  reserved_1_63:63 [63:1] Reserved.</div><div class='add'>+ *  done:1 [0:0](R/W1S/H) Write 1 will enable DONEINT for this queue.</div><div class='add'>+ *	Write 0 has no effect. Read will return the enable bit.</div><div class='add'>+ */</div><div class='add'>+union cptx_vqx_done_ena_w1s {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_vqx_done_ena_w1s_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_1_63:63;</div><div class='add'>+		u64 done:1;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 done:1;</div><div class='add'>+		u64 reserved_1_63:63;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Register (NCB) cpt#_vq#_ctl</div><div class='add'>+ *</div><div class='add'>+ * CPT VF Queue Control Registers</div><div class='add'>+ * This register configures queues. This register should be changed (other than</div><div class='add'>+ * clearing [ENA]) only when quiescent (see CPT()_VQ()_INPROG[INFLIGHT]).</div><div class='add'>+ * cptx_vqx_ctl_s</div><div class='add'>+ * Word0</div><div class='add'>+ *  reserved_1_63:63 [63:1] Reserved.</div><div class='add'>+ *  ena:1 [0:0](R/W/H) Enables the logical instruction queue.</div><div class='add'>+ *	See also CPT()_PF_Q()_CTL[CONT_ERR] and	CPT()_VQ()_INPROG[INFLIGHT].</div><div class='add'>+ *	1 = Queue is enabled.</div><div class='add'>+ *	0 = Queue is disabled.</div><div class='add'>+ */</div><div class='add'>+union cptx_vqx_ctl {</div><div class='add'>+	u64 u;</div><div class='add'>+	struct cptx_vqx_ctl_s {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */</div><div class='add'>+		u64 reserved_1_63:63;</div><div class='add'>+		u64 ena:1;</div><div class='add'>+#else /* Word 0 - Little Endian */</div><div class='add'>+		u64 ena:1;</div><div class='add'>+		u64 reserved_1_63:63;</div><div class='add'>+#endif /* Word 0 - End */</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+#endif /*__CPT_HW_TYPES_H*/</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptpf.h b/drivers/crypto/cavium/cpt/cptpf.h<br/>new file mode 100644<br/>index 000000000000..c0556c5f63c9<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/cptpf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptpf.h</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CPTPF_H</div><div class='add'>+#define __CPTPF_H</div><div class='add'>+</div><div class='add'>+#include "cpt_common.h"</div><div class='add'>+</div><div class='add'>+#define CSR_DELAY 30</div><div class='add'>+#define CPT_MAX_CORE_GROUPS 8</div><div class='add'>+#define CPT_MAX_SE_CORES 10</div><div class='add'>+#define CPT_MAX_AE_CORES 6</div><div class='add'>+#define CPT_MAX_TOTAL_CORES (CPT_MAX_SE_CORES + CPT_MAX_AE_CORES)</div><div class='add'>+#define CPT_MAX_VF_NUM 16</div><div class='add'>+#define	CPT_PF_MSIX_VECTORS 3</div><div class='add'>+#define CPT_PF_INT_VEC_E_MBOXX(a) (0x02 + (a))</div><div class='add'>+#define CPT_UCODE_VERSION_SZ 32</div><div class='add'>+struct cpt_device;</div><div class='add'>+</div><div class='add'>+struct microcode {</div><div class='add'>+	u8 is_mc_valid;</div><div class='add'>+	u8 is_ae;</div><div class='add'>+	u8 group;</div><div class='add'>+	u8 num_cores;</div><div class='add'>+	u32 code_size;</div><div class='add'>+	u64 core_mask;</div><div class='add'>+	u8 version[CPT_UCODE_VERSION_SZ];</div><div class='add'>+	/* Base info */</div><div class='add'>+	dma_addr_t phys_base;</div><div class='add'>+	void *code;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpt_vf_info {</div><div class='add'>+	u8 state;</div><div class='add'>+	u8 priority;</div><div class='add'>+	u8 id;</div><div class='add'>+	u32 qlen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cpt device structure</div><div class='add'>+ */</div><div class='add'>+struct cpt_device {</div><div class='add'>+	u16 flags;	/* Flags to hold device status bits */</div><div class='add'>+	u8 num_vf_en; /* Number of VFs enabled (0...CPT_MAX_VF_NUM) */</div><div class='add'>+	struct cpt_vf_info vfinfo[CPT_MAX_VF_NUM]; /* Per VF info */</div><div class='add'>+</div><div class='add'>+	void __iomem *reg_base; /* Register start address */</div><div class='add'>+	struct pci_dev *pdev; /* pci device handle */</div><div class='add'>+</div><div class='add'>+	struct microcode mcode[CPT_MAX_CORE_GROUPS];</div><div class='add'>+	u8 next_mc_idx; /* next microcode index */</div><div class='add'>+	u8 next_group;</div><div class='add'>+	u8 max_se_cores;</div><div class='add'>+	u8 max_ae_cores;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void cpt_mbox_intr_handler(struct cpt_device *cpt, int mbx);</div><div class='add'>+#endif /* __CPTPF_H */</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptpf_main.c b/drivers/crypto/cavium/cpt/cptpf_main.c<br/>new file mode 100644<br/>index 000000000000..4119c40e7c4b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/cptpf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptpf_main.c</a></div><div class='hunk'>@@ -0,0 +1,670 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/printk.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cptpf.h"</div><div class='add'>+</div><div class='add'>+#define DRV_NAME	"thunder-cpt"</div><div class='add'>+#define DRV_VERSION	"1.0"</div><div class='add'>+</div><div class='add'>+static u32 num_vfs = 4; /* Default 4 VF enabled */</div><div class='add'>+module_param(num_vfs, uint, 0444);</div><div class='add'>+MODULE_PARM_DESC(num_vfs, "Number of VFs to enable(1-16)");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Disable cores specified by coremask</div><div class='add'>+ */</div><div class='add'>+static void cpt_disable_cores(struct cpt_device *cpt, u64 coremask,</div><div class='add'>+			      u8 type, u8 grp)</div><div class='add'>+{</div><div class='add'>+	u64 pf_exe_ctl;</div><div class='add'>+	u32 timeout = 100;</div><div class='add'>+	u64 grpmask = 0;</div><div class='add'>+	struct device *dev = &amp;cpt-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (type == AE_TYPES)</div><div class='add'>+		coremask = (coremask &lt;&lt; cpt-&gt;max_se_cores);</div><div class='add'>+</div><div class='add'>+	/* Disengage the cores from groups */</div><div class='add'>+	grpmask = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_GX_EN(0, grp));</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_GX_EN(0, grp),</div><div class='add'>+			(grpmask &amp; ~coremask));</div><div class='add'>+	udelay(CSR_DELAY);</div><div class='add'>+	grp = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_EXEC_BUSY(0));</div><div class='add'>+	while (grp &amp; coremask) {</div><div class='add'>+		dev_err(dev, "Cores still busy %llx", coremask);</div><div class='add'>+		grp = cpt_read_csr64(cpt-&gt;reg_base,</div><div class='add'>+				     CPTX_PF_EXEC_BUSY(0));</div><div class='add'>+		if (timeout--)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		udelay(CSR_DELAY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable the cores */</div><div class='add'>+	pf_exe_ctl = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_EXE_CTL(0));</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_EXE_CTL(0),</div><div class='add'>+			(pf_exe_ctl &amp; ~coremask));</div><div class='add'>+	udelay(CSR_DELAY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable cores specified by coremask</div><div class='add'>+ */</div><div class='add'>+static void cpt_enable_cores(struct cpt_device *cpt, u64 coremask,</div><div class='add'>+			     u8 type)</div><div class='add'>+{</div><div class='add'>+	u64 pf_exe_ctl;</div><div class='add'>+</div><div class='add'>+	if (type == AE_TYPES)</div><div class='add'>+		coremask = (coremask &lt;&lt; cpt-&gt;max_se_cores);</div><div class='add'>+</div><div class='add'>+	pf_exe_ctl = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_EXE_CTL(0));</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_EXE_CTL(0),</div><div class='add'>+			(pf_exe_ctl | coremask));</div><div class='add'>+	udelay(CSR_DELAY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_configure_group(struct cpt_device *cpt, u8 grp,</div><div class='add'>+				u64 coremask, u8 type)</div><div class='add'>+{</div><div class='add'>+	u64 pf_gx_en = 0;</div><div class='add'>+</div><div class='add'>+	if (type == AE_TYPES)</div><div class='add'>+		coremask = (coremask &lt;&lt; cpt-&gt;max_se_cores);</div><div class='add'>+</div><div class='add'>+	pf_gx_en = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_GX_EN(0, grp));</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_GX_EN(0, grp),</div><div class='add'>+			(pf_gx_en | coremask));</div><div class='add'>+	udelay(CSR_DELAY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_disable_mbox_interrupts(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	/* Clear mbox(0) interupts for all vfs */</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_MBOX_ENA_W1CX(0, 0), ~0ull);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_disable_ecc_interrupts(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	/* Clear ecc(0) interupts for all vfs */</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_ECC0_ENA_W1C(0), ~0ull);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_disable_exec_interrupts(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	/* Clear exec interupts for all vfs */</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_EXEC_ENA_W1C(0), ~0ull);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_disable_all_interrupts(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	cpt_disable_mbox_interrupts(cpt);</div><div class='add'>+	cpt_disable_ecc_interrupts(cpt);</div><div class='add'>+	cpt_disable_exec_interrupts(cpt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_enable_mbox_interrupts(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	/* Set mbox(0) interupts for all vfs */</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_MBOX_ENA_W1SX(0, 0), ~0ull);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpt_load_microcode(struct cpt_device *cpt, struct microcode *mcode)</div><div class='add'>+{</div><div class='add'>+	int ret = 0, core = 0, shift = 0;</div><div class='add'>+	u32 total_cores = 0;</div><div class='add'>+	struct device *dev = &amp;cpt-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (!mcode || !mcode-&gt;code) {</div><div class='add'>+		dev_err(dev, "Either the mcode is null or data is NULL\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mcode-&gt;code_size == 0) {</div><div class='add'>+		dev_err(dev, "microcode size is 0\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Assumes 0-9 are SE cores for UCODE_BASE registers and</div><div class='add'>+	 * AE core bases follow</div><div class='add'>+	 */</div><div class='add'>+	if (mcode-&gt;is_ae) {</div><div class='add'>+		core = CPT_MAX_SE_CORES; /* start couting from 10 */</div><div class='add'>+		total_cores = CPT_MAX_TOTAL_CORES; /* upto 15 */</div><div class='add'>+	} else {</div><div class='add'>+		core = 0; /* start couting from 0 */</div><div class='add'>+		total_cores = CPT_MAX_SE_CORES; /* upto 9 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Point to microcode for each core of the group */</div><div class='add'>+	for (; core &lt; total_cores ; core++, shift++) {</div><div class='add'>+		if (mcode-&gt;core_mask &amp; (1 &lt;&lt; shift)) {</div><div class='add'>+			cpt_write_csr64(cpt-&gt;reg_base,</div><div class='add'>+					CPTX_PF_ENGX_UCODE_BASE(0, core),</div><div class='add'>+					(u64)mcode-&gt;phys_base);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_cpt_init(struct cpt_device *cpt, struct microcode *mcode)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct device *dev = &amp;cpt-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Make device not ready */</div><div class='add'>+	cpt-&gt;flags &amp;= ~CPT_FLAG_DEVICE_READY;</div><div class='add'>+	/* Disable All PF interrupts */</div><div class='add'>+	cpt_disable_all_interrupts(cpt);</div><div class='add'>+	/* Calculate mcode group and coremasks */</div><div class='add'>+	if (mcode-&gt;is_ae) {</div><div class='add'>+		if (mcode-&gt;num_cores &gt; cpt-&gt;max_ae_cores) {</div><div class='add'>+			dev_err(dev, "Requested for more cores than available AE cores\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto cpt_init_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cpt-&gt;next_group &gt;= CPT_MAX_CORE_GROUPS) {</div><div class='add'>+			dev_err(dev, "Can't load, all eight microcode groups in use");</div><div class='add'>+			return -ENFILE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mcode-&gt;group = cpt-&gt;next_group;</div><div class='add'>+		/* Convert requested cores to mask */</div><div class='add'>+		mcode-&gt;core_mask = GENMASK(mcode-&gt;num_cores, 0);</div><div class='add'>+		cpt_disable_cores(cpt, mcode-&gt;core_mask, AE_TYPES,</div><div class='add'>+				  mcode-&gt;group);</div><div class='add'>+		/* Load microcode for AE engines */</div><div class='add'>+		ret = cpt_load_microcode(cpt, mcode);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev, "Microcode load Failed for %s\n",</div><div class='add'>+				mcode-&gt;version);</div><div class='add'>+			goto cpt_init_fail;</div><div class='add'>+		}</div><div class='add'>+		cpt-&gt;next_group++;</div><div class='add'>+		/* Configure group mask for the mcode */</div><div class='add'>+		cpt_configure_group(cpt, mcode-&gt;group, mcode-&gt;core_mask,</div><div class='add'>+				    AE_TYPES);</div><div class='add'>+		/* Enable AE cores for the group mask */</div><div class='add'>+		cpt_enable_cores(cpt, mcode-&gt;core_mask, AE_TYPES);</div><div class='add'>+	} else {</div><div class='add'>+		if (mcode-&gt;num_cores &gt; cpt-&gt;max_se_cores) {</div><div class='add'>+			dev_err(dev, "Requested for more cores than available SE cores\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto cpt_init_fail;</div><div class='add'>+		}</div><div class='add'>+		if (cpt-&gt;next_group &gt;= CPT_MAX_CORE_GROUPS) {</div><div class='add'>+			dev_err(dev, "Can't load, all eight microcode groups in use");</div><div class='add'>+			return -ENFILE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mcode-&gt;group = cpt-&gt;next_group;</div><div class='add'>+		/* Covert requested cores to mask */</div><div class='add'>+		mcode-&gt;core_mask = GENMASK(mcode-&gt;num_cores, 0);</div><div class='add'>+		cpt_disable_cores(cpt, mcode-&gt;core_mask, SE_TYPES,</div><div class='add'>+				  mcode-&gt;group);</div><div class='add'>+		/* Load microcode for SE engines */</div><div class='add'>+		ret = cpt_load_microcode(cpt, mcode);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev, "Microcode load Failed for %s\n",</div><div class='add'>+				mcode-&gt;version);</div><div class='add'>+			goto cpt_init_fail;</div><div class='add'>+		}</div><div class='add'>+		cpt-&gt;next_group++;</div><div class='add'>+		/* Configure group mask for the mcode */</div><div class='add'>+		cpt_configure_group(cpt, mcode-&gt;group, mcode-&gt;core_mask,</div><div class='add'>+				    SE_TYPES);</div><div class='add'>+		/* Enable SE cores for the group mask */</div><div class='add'>+		cpt_enable_cores(cpt, mcode-&gt;core_mask, SE_TYPES);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enabled PF mailbox interrupts */</div><div class='add'>+	cpt_enable_mbox_interrupts(cpt);</div><div class='add'>+	cpt-&gt;flags |= CPT_FLAG_DEVICE_READY;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+cpt_init_fail:</div><div class='add'>+	/* Enabled PF mailbox interrupts */</div><div class='add'>+	cpt_enable_mbox_interrupts(cpt);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ucode_header {</div><div class='add'>+	u8 version[CPT_UCODE_VERSION_SZ];</div><div class='add'>+	u32 code_length;</div><div class='add'>+	u32 data_length;</div><div class='add'>+	u64 sram_address;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cpt_ucode_load_fw(struct cpt_device *cpt, const u8 *fw, bool is_ae)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw_entry;</div><div class='add'>+	struct device *dev = &amp;cpt-&gt;pdev-&gt;dev;</div><div class='add'>+	struct ucode_header *ucode;</div><div class='add'>+	struct microcode *mcode;</div><div class='add'>+	int j, ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw_entry, fw, dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ucode = (struct ucode_header *)fw_entry-&gt;data;</div><div class='add'>+	mcode = &amp;cpt-&gt;mcode[cpt-&gt;next_mc_idx];</div><div class='add'>+	memcpy(mcode-&gt;version, (u8 *)fw_entry-&gt;data, CPT_UCODE_VERSION_SZ);</div><div class='add'>+	mcode-&gt;code_size = ntohl(ucode-&gt;code_length) * 2;</div><div class='add'>+	if (!mcode-&gt;code_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mcode-&gt;is_ae = is_ae;</div><div class='add'>+	mcode-&gt;core_mask = 0ULL;</div><div class='add'>+	mcode-&gt;num_cores = is_ae ? 6 : 10;</div><div class='add'>+</div><div class='add'>+	/*  Allocate DMAable space */</div><div class='add'>+	mcode-&gt;code = dma_zalloc_coherent(&amp;cpt-&gt;pdev-&gt;dev, mcode-&gt;code_size,</div><div class='add'>+					  &amp;mcode-&gt;phys_base, GFP_KERNEL);</div><div class='add'>+	if (!mcode-&gt;code) {</div><div class='add'>+		dev_err(dev, "Unable to allocate space for microcode");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy((void *)mcode-&gt;code, (void *)(fw_entry-&gt;data + sizeof(*ucode)),</div><div class='add'>+	       mcode-&gt;code_size);</div><div class='add'>+</div><div class='add'>+	/* Byte swap 64-bit */</div><div class='add'>+	for (j = 0; j &lt; (mcode-&gt;code_size / 8); j++)</div><div class='add'>+		((u64 *)mcode-&gt;code)[j] = cpu_to_be64(((u64 *)mcode-&gt;code)[j]);</div><div class='add'>+	/*  MC needs 16-bit swap */</div><div class='add'>+	for (j = 0; j &lt; (mcode-&gt;code_size / 2); j++)</div><div class='add'>+		((u16 *)mcode-&gt;code)[j] = cpu_to_be16(((u16 *)mcode-&gt;code)[j]);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "mcode-&gt;code_size = %u\n", mcode-&gt;code_size);</div><div class='add'>+	dev_dbg(dev, "mcode-&gt;is_ae = %u\n", mcode-&gt;is_ae);</div><div class='add'>+	dev_dbg(dev, "mcode-&gt;num_cores = %u\n", mcode-&gt;num_cores);</div><div class='add'>+	dev_dbg(dev, "mcode-&gt;code = %llx\n", (u64)mcode-&gt;code);</div><div class='add'>+	dev_dbg(dev, "mcode-&gt;phys_base = %llx\n", mcode-&gt;phys_base);</div><div class='add'>+</div><div class='add'>+	ret = do_cpt_init(cpt, mcode);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "do_cpt_init failed with ret: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "Microcode Loaded %s\n", mcode-&gt;version);</div><div class='add'>+	mcode-&gt;is_mc_valid = 1;</div><div class='add'>+	cpt-&gt;next_mc_idx++;</div><div class='add'>+	release_firmware(fw_entry);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpt_ucode_load(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct device *dev = &amp;cpt-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	ret = cpt_ucode_load_fw(cpt, "cpt8x-mc-ae.out", true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "ae:cpt_ucode_load failed with ret: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	ret = cpt_ucode_load_fw(cpt, "cpt8x-mc-se.out", false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "se:cpt_ucode_load failed with ret: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t cpt_mbx0_intr_handler(int irq, void *cpt_irq)</div><div class='add'>+{</div><div class='add'>+	struct cpt_device *cpt = (struct cpt_device *)cpt_irq;</div><div class='add'>+</div><div class='add'>+	cpt_mbox_intr_handler(cpt, 0);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_reset(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_RESET(0), 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_find_max_enabled_cores(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	union cptx_pf_constants pf_cnsts = {0};</div><div class='add'>+</div><div class='add'>+	pf_cnsts.u = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_CONSTANTS(0));</div><div class='add'>+	cpt-&gt;max_se_cores = pf_cnsts.s.se;</div><div class='add'>+	cpt-&gt;max_ae_cores = pf_cnsts.s.ae;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 cpt_check_bist_status(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	union cptx_pf_bist_status bist_sts = {0};</div><div class='add'>+</div><div class='add'>+	bist_sts.u = cpt_read_csr64(cpt-&gt;reg_base,</div><div class='add'>+				    CPTX_PF_BIST_STATUS(0));</div><div class='add'>+</div><div class='add'>+	return bist_sts.u;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 cpt_check_exe_bist_status(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	union cptx_pf_exe_bist_status bist_sts = {0};</div><div class='add'>+</div><div class='add'>+	bist_sts.u = cpt_read_csr64(cpt-&gt;reg_base,</div><div class='add'>+				    CPTX_PF_EXE_BIST_STATUS(0));</div><div class='add'>+</div><div class='add'>+	return bist_sts.u;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_disable_all_cores(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	u32 grp, timeout = 100;</div><div class='add'>+	struct device *dev = &amp;cpt-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Disengage the cores from groups */</div><div class='add'>+	for (grp = 0; grp &lt; CPT_MAX_CORE_GROUPS; grp++) {</div><div class='add'>+		cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_GX_EN(0, grp), 0);</div><div class='add'>+		udelay(CSR_DELAY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	grp = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_EXEC_BUSY(0));</div><div class='add'>+	while (grp) {</div><div class='add'>+		dev_err(dev, "Cores still busy");</div><div class='add'>+		grp = cpt_read_csr64(cpt-&gt;reg_base,</div><div class='add'>+				     CPTX_PF_EXEC_BUSY(0));</div><div class='add'>+		if (timeout--)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		udelay(CSR_DELAY);</div><div class='add'>+	}</div><div class='add'>+	/* Disable the cores */</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_EXE_CTL(0), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Ensure all cores are disengaged from all groups by</div><div class='add'>+ * calling cpt_disable_all_cores() before calling this</div><div class='add'>+ * function.</div><div class='add'>+ */</div><div class='add'>+static void cpt_unload_microcode(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	u32 grp = 0, core;</div><div class='add'>+</div><div class='add'>+	/* Free microcode bases and reset group masks */</div><div class='add'>+	for (grp = 0; grp &lt; CPT_MAX_CORE_GROUPS; grp++) {</div><div class='add'>+		struct microcode *mcode = &amp;cpt-&gt;mcode[grp];</div><div class='add'>+</div><div class='add'>+		if (cpt-&gt;mcode[grp].code)</div><div class='add'>+			dma_free_coherent(&amp;cpt-&gt;pdev-&gt;dev, mcode-&gt;code_size,</div><div class='add'>+					  mcode-&gt;code, mcode-&gt;phys_base);</div><div class='add'>+		mcode-&gt;code = NULL;</div><div class='add'>+	}</div><div class='add'>+	/* Clear UCODE_BASE registers for all engines */</div><div class='add'>+	for (core = 0; core &lt; CPT_MAX_TOTAL_CORES; core++)</div><div class='add'>+		cpt_write_csr64(cpt-&gt;reg_base,</div><div class='add'>+				CPTX_PF_ENGX_UCODE_BASE(0, core), 0ull);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpt_device_init(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	u64 bist;</div><div class='add'>+	struct device *dev = &amp;cpt-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Reset the PF when probed first */</div><div class='add'>+	cpt_reset(cpt);</div><div class='add'>+	mdelay(100);</div><div class='add'>+</div><div class='add'>+	/*Check BIST status*/</div><div class='add'>+	bist = (u64)cpt_check_bist_status(cpt);</div><div class='add'>+	if (bist) {</div><div class='add'>+		dev_err(dev, "RAM BIST failed with code 0x%llx", bist);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bist = cpt_check_exe_bist_status(cpt);</div><div class='add'>+	if (bist) {</div><div class='add'>+		dev_err(dev, "Engine BIST failed with code 0x%llx", bist);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*Get CLK frequency*/</div><div class='add'>+	/*Get max enabled cores */</div><div class='add'>+	cpt_find_max_enabled_cores(cpt);</div><div class='add'>+	/*Disable all cores*/</div><div class='add'>+	cpt_disable_all_cores(cpt);</div><div class='add'>+	/*Reset device parameters*/</div><div class='add'>+	cpt-&gt;next_mc_idx   = 0;</div><div class='add'>+	cpt-&gt;next_group = 0;</div><div class='add'>+	/* PF is ready */</div><div class='add'>+	cpt-&gt;flags |= CPT_FLAG_DEVICE_READY;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpt_register_interrupts(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct device *dev = &amp;cpt-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Enable MSI-X */</div><div class='add'>+	ret = pci_alloc_irq_vectors(cpt-&gt;pdev, CPT_PF_MSIX_VECTORS,</div><div class='add'>+			CPT_PF_MSIX_VECTORS, PCI_IRQ_MSIX);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;cpt-&gt;pdev-&gt;dev, "Request for #%d msix vectors failed\n",</div><div class='add'>+			CPT_PF_MSIX_VECTORS);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register mailbox interrupt handlers */</div><div class='add'>+	ret = request_irq(pci_irq_vector(cpt-&gt;pdev, CPT_PF_INT_VEC_E_MBOXX(0)),</div><div class='add'>+			  cpt_mbx0_intr_handler, 0, "CPT Mbox0", cpt);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* Enable mailbox interrupt */</div><div class='add'>+	cpt_enable_mbox_interrupts(cpt);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	dev_err(dev, "Request irq failed\n");</div><div class='add'>+	pci_disable_msix(cpt-&gt;pdev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_unregister_interrupts(struct cpt_device *cpt)</div><div class='add'>+{</div><div class='add'>+	free_irq(pci_irq_vector(cpt-&gt;pdev, CPT_PF_INT_VEC_E_MBOXX(0)), cpt);</div><div class='add'>+	pci_disable_msix(cpt-&gt;pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpt_sriov_init(struct cpt_device *cpt, int num_vfs)</div><div class='add'>+{</div><div class='add'>+	int pos = 0;</div><div class='add'>+	int err;</div><div class='add'>+	u16 total_vf_cnt;</div><div class='add'>+	struct pci_dev *pdev = cpt-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);</div><div class='add'>+	if (!pos) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "SRIOV capability is not found in PCIe config space\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpt-&gt;num_vf_en = num_vfs; /* User requested VFs */</div><div class='add'>+	pci_read_config_word(pdev, (pos + PCI_SRIOV_TOTAL_VF), &amp;total_vf_cnt);</div><div class='add'>+	if (total_vf_cnt &lt; cpt-&gt;num_vf_en)</div><div class='add'>+		cpt-&gt;num_vf_en = total_vf_cnt;</div><div class='add'>+</div><div class='add'>+	if (!total_vf_cnt)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*Enabled the available VFs */</div><div class='add'>+	err = pci_enable_sriov(pdev, cpt-&gt;num_vf_en);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "SRIOV enable failed, num VF is %d\n",</div><div class='add'>+			cpt-&gt;num_vf_en);</div><div class='add'>+		cpt-&gt;num_vf_en = 0;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Optionally enable static VQ priorities feature */</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "SRIOV enabled, number of VF available %d\n",</div><div class='add'>+		 cpt-&gt;num_vf_en);</div><div class='add'>+</div><div class='add'>+	cpt-&gt;flags |= CPT_FLAG_SRIOV_ENABLED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpt_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct cpt_device *cpt;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (num_vfs &gt; 16 || num_vfs &lt; 4) {</div><div class='add'>+		dev_warn(dev, "Invalid vf count %d, Resetting it to 4(default)\n",</div><div class='add'>+			 num_vfs);</div><div class='add'>+		num_vfs = 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpt = devm_kzalloc(dev, sizeof(*cpt), GFP_KERNEL);</div><div class='add'>+	if (!cpt)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, cpt);</div><div class='add'>+	cpt-&gt;pdev = pdev;</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Failed to enable PCI device\n");</div><div class='add'>+		pci_set_drvdata(pdev, NULL);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_request_regions(pdev, DRV_NAME);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "PCI request regions failed 0x%x\n", err);</div><div class='add'>+		goto cpt_err_disable_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(48));</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Unable to get usable DMA configuration\n");</div><div class='add'>+		goto cpt_err_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Unable to get 48-bit DMA for consistent allocations\n");</div><div class='add'>+		goto cpt_err_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MAP PF's configuration registers */</div><div class='add'>+	cpt-&gt;reg_base = pcim_iomap(pdev, 0, 0);</div><div class='add'>+	if (!cpt-&gt;reg_base) {</div><div class='add'>+		dev_err(dev, "Cannot map config register space, aborting\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto cpt_err_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CPT device HW initialization */</div><div class='add'>+	cpt_device_init(cpt);</div><div class='add'>+</div><div class='add'>+	/* Register interrupts */</div><div class='add'>+	err = cpt_register_interrupts(cpt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto cpt_err_release_regions;</div><div class='add'>+</div><div class='add'>+	err = cpt_ucode_load(cpt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto cpt_err_unregister_interrupts;</div><div class='add'>+</div><div class='add'>+	/* Configure SRIOV */</div><div class='add'>+	err = cpt_sriov_init(cpt, num_vfs);</div><div class='add'>+	if (err)</div><div class='add'>+		goto cpt_err_unregister_interrupts;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cpt_err_unregister_interrupts:</div><div class='add'>+	cpt_unregister_interrupts(cpt);</div><div class='add'>+cpt_err_release_regions:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+cpt_err_disable_device:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct cpt_device *cpt = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	/* Disengage SE and AE cores from all groups*/</div><div class='add'>+	cpt_disable_all_cores(cpt);</div><div class='add'>+	/* Unload microcodes */</div><div class='add'>+	cpt_unload_microcode(cpt);</div><div class='add'>+	cpt_unregister_interrupts(cpt);</div><div class='add'>+	pci_disable_sriov(pdev);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct cpt_device *cpt = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!cpt)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "Shutdown device %x:%x.\n",</div><div class='add'>+		 (u32)pdev-&gt;vendor, (u32)pdev-&gt;device);</div><div class='add'>+</div><div class='add'>+	cpt_unregister_interrupts(cpt);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Supported devices */</div><div class='add'>+static const struct pci_device_id cpt_id_table[] = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, CPT_81XX_PCI_PF_DEVICE_ID) },</div><div class='add'>+	{ 0, }  /* end of table */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_driver cpt_pci_driver = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.id_table = cpt_id_table,</div><div class='add'>+	.probe = cpt_probe,</div><div class='add'>+	.remove = cpt_remove,</div><div class='add'>+	.shutdown = cpt_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_pci_driver(cpt_pci_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("George Cherian &lt;george.cherian@cavium.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Cavium Thunder CPT Physical Function Driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+MODULE_DEVICE_TABLE(pci, cpt_id_table);</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptpf_mbox.c b/drivers/crypto/cavium/cpt/cptpf_mbox.c<br/>new file mode 100644<br/>index 000000000000..20f2c6ee46a5<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/cptpf_mbox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptpf_mbox.c</a></div><div class='hunk'>@@ -0,0 +1,163 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "cptpf.h"</div><div class='add'>+</div><div class='add'>+static void cpt_send_msg_to_vf(struct cpt_device *cpt, int vf,</div><div class='add'>+			       struct cpt_mbox *mbx)</div><div class='add'>+{</div><div class='add'>+	/* Writing mbox(0) causes interrupt */</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_VFX_MBOXX(0, vf, 1),</div><div class='add'>+			mbx-&gt;data);</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_VFX_MBOXX(0, vf, 0), mbx-&gt;msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ACKs VF's mailbox message</div><div class='add'>+ * @vf: VF to which ACK to be sent</div><div class='add'>+ */</div><div class='add'>+static void cpt_mbox_send_ack(struct cpt_device *cpt, int vf,</div><div class='add'>+			      struct cpt_mbox *mbx)</div><div class='add'>+{</div><div class='add'>+	mbx-&gt;data = 0ull;</div><div class='add'>+	mbx-&gt;msg = CPT_MBOX_MSG_TYPE_ACK;</div><div class='add'>+	cpt_send_msg_to_vf(cpt, vf, mbx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpt_clear_mbox_intr(struct cpt_device *cpt, u32 vf)</div><div class='add'>+{</div><div class='add'>+	/* W1C for the VF */</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_MBOX_INTX(0, 0), (1 &lt;&lt; vf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Configure QLEN/Chunk sizes for VF</div><div class='add'>+ */</div><div class='add'>+static void cpt_cfg_qlen_for_vf(struct cpt_device *cpt, int vf, u32 size)</div><div class='add'>+{</div><div class='add'>+	union cptx_pf_qx_ctl pf_qx_ctl;</div><div class='add'>+</div><div class='add'>+	pf_qx_ctl.u = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_QX_CTL(0, vf));</div><div class='add'>+	pf_qx_ctl.s.size = size;</div><div class='add'>+	pf_qx_ctl.s.cont_err = true;</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_QX_CTL(0, vf), pf_qx_ctl.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Configure VQ priority</div><div class='add'>+ */</div><div class='add'>+static void cpt_cfg_vq_priority(struct cpt_device *cpt, int vf, u32 pri)</div><div class='add'>+{</div><div class='add'>+	union cptx_pf_qx_ctl pf_qx_ctl;</div><div class='add'>+</div><div class='add'>+	pf_qx_ctl.u = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_QX_CTL(0, vf));</div><div class='add'>+	pf_qx_ctl.s.pri = pri;</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_QX_CTL(0, vf), pf_qx_ctl.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpt_bind_vq_to_grp(struct cpt_device *cpt, u8 q, u8 grp)</div><div class='add'>+{</div><div class='add'>+	struct microcode *mcode = cpt-&gt;mcode;</div><div class='add'>+	union cptx_pf_qx_ctl pf_qx_ctl;</div><div class='add'>+	struct device *dev = &amp;cpt-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (q &gt;= CPT_MAX_VF_NUM) {</div><div class='add'>+		dev_err(dev, "Queues are more than cores in the group");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (grp &gt;= CPT_MAX_CORE_GROUPS) {</div><div class='add'>+		dev_err(dev, "Request group is more than possible groups");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (grp &gt;= cpt-&gt;next_mc_idx) {</div><div class='add'>+		dev_err(dev, "Request group is higher than available functional groups");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	pf_qx_ctl.u = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_QX_CTL(0, q));</div><div class='add'>+	pf_qx_ctl.s.grp = mcode[grp].group;</div><div class='add'>+	cpt_write_csr64(cpt-&gt;reg_base, CPTX_PF_QX_CTL(0, q), pf_qx_ctl.u);</div><div class='add'>+	dev_dbg(dev, "VF %d TYPE %s", q, (mcode[grp].is_ae ? "AE" : "SE"));</div><div class='add'>+</div><div class='add'>+	return mcode[grp].is_ae ? AE_TYPES : SE_TYPES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Interrupt handler to handle mailbox messages from VFs */</div><div class='add'>+static void cpt_handle_mbox_intr(struct cpt_device *cpt, int vf)</div><div class='add'>+{</div><div class='add'>+	struct cpt_vf_info *vfx = &amp;cpt-&gt;vfinfo[vf];</div><div class='add'>+	struct cpt_mbox mbx = {};</div><div class='add'>+	int vftype;</div><div class='add'>+	struct device *dev = &amp;cpt-&gt;pdev-&gt;dev;</div><div class='add'>+	/*</div><div class='add'>+	 * MBOX[0] contains msg</div><div class='add'>+	 * MBOX[1] contains data</div><div class='add'>+	 */</div><div class='add'>+	mbx.msg  = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_VFX_MBOXX(0, vf, 0));</div><div class='add'>+	mbx.data = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_VFX_MBOXX(0, vf, 1));</div><div class='add'>+	dev_dbg(dev, "%s: Mailbox msg 0x%llx from VF%d", __func__, mbx.msg, vf);</div><div class='add'>+	switch (mbx.msg) {</div><div class='add'>+	case CPT_MSG_VF_UP:</div><div class='add'>+		vfx-&gt;state = VF_STATE_UP;</div><div class='add'>+		try_module_get(THIS_MODULE);</div><div class='add'>+		cpt_mbox_send_ack(cpt, vf, &amp;mbx);</div><div class='add'>+		break;</div><div class='add'>+	case CPT_MSG_READY:</div><div class='add'>+		mbx.msg  = CPT_MSG_READY;</div><div class='add'>+		mbx.data = vf;</div><div class='add'>+		cpt_send_msg_to_vf(cpt, vf, &amp;mbx);</div><div class='add'>+		break;</div><div class='add'>+	case CPT_MSG_VF_DOWN:</div><div class='add'>+		/* First msg in VF teardown sequence */</div><div class='add'>+		vfx-&gt;state = VF_STATE_DOWN;</div><div class='add'>+		module_put(THIS_MODULE);</div><div class='add'>+		cpt_mbox_send_ack(cpt, vf, &amp;mbx);</div><div class='add'>+		break;</div><div class='add'>+	case CPT_MSG_QLEN:</div><div class='add'>+		vfx-&gt;qlen = mbx.data;</div><div class='add'>+		cpt_cfg_qlen_for_vf(cpt, vf, vfx-&gt;qlen);</div><div class='add'>+		cpt_mbox_send_ack(cpt, vf, &amp;mbx);</div><div class='add'>+		break;</div><div class='add'>+	case CPT_MSG_QBIND_GRP:</div><div class='add'>+		vftype = cpt_bind_vq_to_grp(cpt, vf, (u8)mbx.data);</div><div class='add'>+		if ((vftype != AE_TYPES) &amp;&amp; (vftype != SE_TYPES))</div><div class='add'>+			dev_err(dev, "Queue %d binding to group %llu failed",</div><div class='add'>+				vf, mbx.data);</div><div class='add'>+		else {</div><div class='add'>+			dev_dbg(dev, "Queue %d binding to group %llu successful",</div><div class='add'>+				vf, mbx.data);</div><div class='add'>+			mbx.msg = CPT_MSG_QBIND_GRP;</div><div class='add'>+			mbx.data = vftype;</div><div class='add'>+			cpt_send_msg_to_vf(cpt, vf, &amp;mbx);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CPT_MSG_VQ_PRIORITY:</div><div class='add'>+		vfx-&gt;priority = mbx.data;</div><div class='add'>+		cpt_cfg_vq_priority(cpt, vf, vfx-&gt;priority);</div><div class='add'>+		cpt_mbox_send_ack(cpt, vf, &amp;mbx);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;cpt-&gt;pdev-&gt;dev, "Invalid msg from VF%d, msg 0x%llx\n",</div><div class='add'>+			vf, mbx.msg);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cpt_mbox_intr_handler (struct cpt_device *cpt, int mbx)</div><div class='add'>+{</div><div class='add'>+	u64 intr;</div><div class='add'>+	u8  vf;</div><div class='add'>+</div><div class='add'>+	intr = cpt_read_csr64(cpt-&gt;reg_base, CPTX_PF_MBOX_INTX(0, 0));</div><div class='add'>+	dev_dbg(&amp;cpt-&gt;pdev-&gt;dev, "PF interrupt Mbox%d 0x%llx\n", mbx, intr);</div><div class='add'>+	for (vf = 0; vf &lt; CPT_MAX_VF_NUM; vf++) {</div><div class='add'>+		if (intr &amp; (1ULL &lt;&lt; vf)) {</div><div class='add'>+			dev_dbg(&amp;cpt-&gt;pdev-&gt;dev, "Intr from VF %d\n", vf);</div><div class='add'>+			cpt_handle_mbox_intr(cpt, vf);</div><div class='add'>+			cpt_clear_mbox_intr(cpt, vf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptvf.h b/drivers/crypto/cavium/cpt/cptvf.h<br/>new file mode 100644<br/>index 000000000000..0a835a07d4f2<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/cptvf.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf.h</a></div><div class='hunk'>@@ -0,0 +1,132 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CPTVF_H</div><div class='add'>+#define __CPTVF_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include "cpt_common.h"</div><div class='add'>+</div><div class='add'>+/* Default command queue length */</div><div class='add'>+#define CPT_CMD_QLEN 2046</div><div class='add'>+#define CPT_CMD_QCHUNK_SIZE 1023</div><div class='add'>+</div><div class='add'>+/* Default command timeout in seconds */</div><div class='add'>+#define CPT_COMMAND_TIMEOUT 4</div><div class='add'>+#define CPT_TIMER_THOLD	0xFFFF</div><div class='add'>+#define CPT_NUM_QS_PER_VF 1</div><div class='add'>+#define CPT_INST_SIZE 64</div><div class='add'>+#define CPT_NEXT_CHUNK_PTR_SIZE 8</div><div class='add'>+</div><div class='add'>+#define	CPT_VF_MSIX_VECTORS 2</div><div class='add'>+#define CPT_VF_INTR_MBOX_MASK BIT(0)</div><div class='add'>+#define CPT_VF_INTR_DOVF_MASK BIT(1)</div><div class='add'>+#define CPT_VF_INTR_IRDE_MASK BIT(2)</div><div class='add'>+#define CPT_VF_INTR_NWRP_MASK BIT(3)</div><div class='add'>+#define CPT_VF_INTR_SERR_MASK BIT(4)</div><div class='add'>+#define DMA_DIRECT_DIRECT 0 /* Input DIRECT, Output DIRECT */</div><div class='add'>+#define DMA_GATHER_SCATTER 1</div><div class='add'>+#define FROM_DPTR 1</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Enumeration cpt_vf_int_vec_e</div><div class='add'>+ *</div><div class='add'>+ * CPT VF MSI-X Vector Enumeration</div><div class='add'>+ * Enumerates the MSI-X interrupt vectors.</div><div class='add'>+ */</div><div class='add'>+enum cpt_vf_int_vec_e {</div><div class='add'>+	CPT_VF_INT_VEC_E_MISC = 0x00,</div><div class='add'>+	CPT_VF_INT_VEC_E_DONE = 0x01</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct command_chunk {</div><div class='add'>+	u8 *head;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	u32 size; /* Chunk size, max CPT_INST_CHUNK_MAX_SIZE */</div><div class='add'>+	struct hlist_node nextchunk;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct command_queue {</div><div class='add'>+	spinlock_t lock; /* command queue lock */</div><div class='add'>+	u32 idx; /* Command queue host write idx */</div><div class='add'>+	u32 nchunks; /* Number of command chunks */</div><div class='add'>+	struct command_chunk *qhead;	/* Command queue head, instructions</div><div class='add'>+					 * are inserted here</div><div class='add'>+					 */</div><div class='add'>+	struct hlist_head chead;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct command_qinfo {</div><div class='add'>+	u32 cmd_size;</div><div class='add'>+	u32 qchunksize; /* Command queue chunk size */</div><div class='add'>+	struct command_queue queue[CPT_NUM_QS_PER_VF];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pending_entry {</div><div class='add'>+	u8 busy; /* Entry status (free/busy) */</div><div class='add'>+</div><div class='add'>+	volatile u64 *completion_addr; /* Completion address */</div><div class='add'>+	void *post_arg;</div><div class='add'>+	void (*callback)(int, void *); /* Kernel ASYNC request callabck */</div><div class='add'>+	void *callback_arg; /* Kernel ASYNC request callabck arg */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pending_queue {</div><div class='add'>+	struct pending_entry *head;	/* head of the queue */</div><div class='add'>+	u32 front; /* Process work from here */</div><div class='add'>+	u32 rear; /* Append new work here */</div><div class='add'>+	atomic64_t pending_count;</div><div class='add'>+	spinlock_t lock; /* Queue lock */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pending_qinfo {</div><div class='add'>+	u32 nr_queues;	/* Number of queues supported */</div><div class='add'>+	u32 qlen; /* Queue length */</div><div class='add'>+	struct pending_queue queue[CPT_NUM_QS_PER_VF];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define for_each_pending_queue(qinfo, q, i)	\</div><div class='add'>+	for (i = 0, q = &amp;qinfo-&gt;queue[i]; i &lt; qinfo-&gt;nr_queues; i++, \</div><div class='add'>+	     q = &amp;qinfo-&gt;queue[i])</div><div class='add'>+</div><div class='add'>+struct cpt_vf {</div><div class='add'>+	u16 flags; /* Flags to hold device status bits */</div><div class='add'>+	u8 vfid; /* Device Index 0...CPT_MAX_VF_NUM */</div><div class='add'>+	u8 vftype; /* VF type of SE_TYPE(1) or AE_TYPE(1) */</div><div class='add'>+	u8 vfgrp; /* VF group (0 - 8) */</div><div class='add'>+	u8 node; /* Operating node: Bits (46:44) in BAR0 address */</div><div class='add'>+	u8 priority; /* VF priority ring: 1-High proirity round</div><div class='add'>+		      * robin ring;0-Low priority round robin ring;</div><div class='add'>+		      */</div><div class='add'>+	struct pci_dev *pdev; /* pci device handle */</div><div class='add'>+	void __iomem *reg_base; /* Register start address */</div><div class='add'>+	void *wqe_info;	/* BH worker info */</div><div class='add'>+	/* MSI-X */</div><div class='add'>+	cpumask_var_t affinity_mask[CPT_VF_MSIX_VECTORS];</div><div class='add'>+	/* Command and Pending queues */</div><div class='add'>+	u32 qsize;</div><div class='add'>+	u32 nr_queues;</div><div class='add'>+	struct command_qinfo cqinfo; /* Command queue information */</div><div class='add'>+	struct pending_qinfo pqinfo; /* Pending queue information */</div><div class='add'>+	/* VF-PF mailbox communication */</div><div class='add'>+	bool pf_acked;</div><div class='add'>+	bool pf_nacked;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cptvf_send_vf_up(struct cpt_vf *cptvf);</div><div class='add'>+int cptvf_send_vf_down(struct cpt_vf *cptvf);</div><div class='add'>+int cptvf_send_vf_to_grp_msg(struct cpt_vf *cptvf);</div><div class='add'>+int cptvf_send_vf_priority_msg(struct cpt_vf *cptvf);</div><div class='add'>+int cptvf_send_vq_size_msg(struct cpt_vf *cptvf);</div><div class='add'>+int cptvf_check_pf_ready(struct cpt_vf *cptvf);</div><div class='add'>+void cptvf_handle_mbox_intr(struct cpt_vf *cptvf);</div><div class='add'>+void cvm_crypto_exit(void);</div><div class='add'>+int cvm_crypto_init(struct cpt_vf *cptvf);</div><div class='add'>+void vq_post_process(struct cpt_vf *cptvf, u32 qno);</div><div class='add'>+void cptvf_write_vq_doorbell(struct cpt_vf *cptvf, u32 val);</div><div class='add'>+#endif /* __CPTVF_H */</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptvf_algs.c b/drivers/crypto/cavium/cpt/cptvf_algs.c<br/>new file mode 100644<br/>index 000000000000..cc853f913d4b<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/cptvf_algs.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf_algs.c</a></div><div class='hunk'>@@ -0,0 +1,444 @@</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/authenc.h&gt;</div><div class='add'>+#include &lt;crypto/cryptd.h&gt;</div><div class='add'>+#include &lt;crypto/crypto_wq.h&gt;</div><div class='add'>+#include &lt;crypto/des.h&gt;</div><div class='add'>+#include &lt;crypto/xts.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cptvf.h"</div><div class='add'>+#include "cptvf_algs.h"</div><div class='add'>+</div><div class='add'>+struct cpt_device_handle {</div><div class='add'>+	void *cdev[MAX_DEVICES];</div><div class='add'>+	u32 dev_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cpt_device_handle dev_handle;</div><div class='add'>+</div><div class='add'>+static void cvm_callback(u32 status, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct crypto_async_request *req = (struct crypto_async_request *)arg;</div><div class='add'>+</div><div class='add'>+	req-&gt;complete(req, !status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void update_input_iv(struct cpt_request_info *req_info,</div><div class='add'>+				   u8 *iv, u32 enc_iv_len,</div><div class='add'>+				   u32 *argcnt)</div><div class='add'>+{</div><div class='add'>+	/* Setting the iv information */</div><div class='add'>+	req_info-&gt;in[*argcnt].vptr = (void *)iv;</div><div class='add'>+	req_info-&gt;in[*argcnt].size = enc_iv_len;</div><div class='add'>+	req_info-&gt;req.dlen += enc_iv_len;</div><div class='add'>+</div><div class='add'>+	++(*argcnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void update_output_iv(struct cpt_request_info *req_info,</div><div class='add'>+				    u8 *iv, u32 enc_iv_len,</div><div class='add'>+				    u32 *argcnt)</div><div class='add'>+{</div><div class='add'>+	/* Setting the iv information */</div><div class='add'>+	req_info-&gt;out[*argcnt].vptr = (void *)iv;</div><div class='add'>+	req_info-&gt;out[*argcnt].size = enc_iv_len;</div><div class='add'>+	req_info-&gt;rlen += enc_iv_len;</div><div class='add'>+</div><div class='add'>+	++(*argcnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void update_input_data(struct cpt_request_info *req_info,</div><div class='add'>+				     struct scatterlist *inp_sg,</div><div class='add'>+				     u32 nbytes, u32 *argcnt)</div><div class='add'>+{</div><div class='add'>+	req_info-&gt;req.dlen += nbytes;</div><div class='add'>+</div><div class='add'>+	while (nbytes) {</div><div class='add'>+		u32 len = min(nbytes, inp_sg-&gt;length);</div><div class='add'>+		u8 *ptr = sg_virt(inp_sg);</div><div class='add'>+</div><div class='add'>+		req_info-&gt;in[*argcnt].vptr = (void *)ptr;</div><div class='add'>+		req_info-&gt;in[*argcnt].size = len;</div><div class='add'>+		nbytes -= len;</div><div class='add'>+</div><div class='add'>+		++(*argcnt);</div><div class='add'>+		++inp_sg;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void update_output_data(struct cpt_request_info *req_info,</div><div class='add'>+				      struct scatterlist *outp_sg,</div><div class='add'>+				      u32 nbytes, u32 *argcnt)</div><div class='add'>+{</div><div class='add'>+	req_info-&gt;rlen += nbytes;</div><div class='add'>+</div><div class='add'>+	while (nbytes) {</div><div class='add'>+		u32 len = min(nbytes, outp_sg-&gt;length);</div><div class='add'>+		u8 *ptr = sg_virt(outp_sg);</div><div class='add'>+</div><div class='add'>+		req_info-&gt;out[*argcnt].vptr = (void *)ptr;</div><div class='add'>+		req_info-&gt;out[*argcnt].size = len;</div><div class='add'>+		nbytes -= len;</div><div class='add'>+		++(*argcnt);</div><div class='add'>+		++outp_sg;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 create_ctx_hdr(struct ablkcipher_request *req, u32 enc,</div><div class='add'>+				 u32 cipher_type, u32 aes_key_type,</div><div class='add'>+				 u32 *argcnt)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);</div><div class='add'>+	struct cvm_enc_ctx *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='add'>+	struct cvm_req_ctx *rctx = ablkcipher_request_ctx(req);</div><div class='add'>+	struct fc_context *fctx = &amp;rctx-&gt;fctx;</div><div class='add'>+	u64 *offset_control = &amp;rctx-&gt;control_word;</div><div class='add'>+	u32 enc_iv_len = crypto_ablkcipher_ivsize(tfm);</div><div class='add'>+	struct cpt_request_info *req_info = &amp;rctx-&gt;cpt_req;</div><div class='add'>+	u64 *ctrl_flags = NULL;</div><div class='add'>+</div><div class='add'>+	req_info-&gt;ctrl.s.grp = 0;</div><div class='add'>+	req_info-&gt;ctrl.s.dma_mode = DMA_GATHER_SCATTER;</div><div class='add'>+	req_info-&gt;ctrl.s.se_req = SE_CORE_REQ;</div><div class='add'>+</div><div class='add'>+	req_info-&gt;req.opcode.s.major = MAJOR_OP_FC |</div><div class='add'>+					DMA_MODE_FLAG(DMA_GATHER_SCATTER);</div><div class='add'>+	if (enc)</div><div class='add'>+		req_info-&gt;req.opcode.s.minor = 2;</div><div class='add'>+	else</div><div class='add'>+		req_info-&gt;req.opcode.s.minor = 3;</div><div class='add'>+</div><div class='add'>+	req_info-&gt;req.param1 = req-&gt;nbytes; /* Encryption Data length */</div><div class='add'>+	req_info-&gt;req.param2 = 0; /*Auth data length */</div><div class='add'>+</div><div class='add'>+	fctx-&gt;enc.enc_ctrl.e.enc_cipher = cipher_type;</div><div class='add'>+	fctx-&gt;enc.enc_ctrl.e.aes_key = aes_key_type;</div><div class='add'>+	fctx-&gt;enc.enc_ctrl.e.iv_source = FROM_DPTR;</div><div class='add'>+</div><div class='add'>+	if (cipher_type == AES_XTS)</div><div class='add'>+		memcpy(fctx-&gt;enc.encr_key, ctx-&gt;enc_key, ctx-&gt;key_len * 2);</div><div class='add'>+	else</div><div class='add'>+		memcpy(fctx-&gt;enc.encr_key, ctx-&gt;enc_key, ctx-&gt;key_len);</div><div class='add'>+	ctrl_flags = (u64 *)&amp;fctx-&gt;enc.enc_ctrl.flags;</div><div class='add'>+	*ctrl_flags = cpu_to_be64(*ctrl_flags);</div><div class='add'>+</div><div class='add'>+	*offset_control = cpu_to_be64(((u64)(enc_iv_len) &lt;&lt; 16));</div><div class='add'>+	/* Storing  Packet Data Information in offset</div><div class='add'>+	 * Control Word First 8 bytes</div><div class='add'>+	 */</div><div class='add'>+	req_info-&gt;in[*argcnt].vptr = (u8 *)offset_control;</div><div class='add'>+	req_info-&gt;in[*argcnt].size = CONTROL_WORD_LEN;</div><div class='add'>+	req_info-&gt;req.dlen += CONTROL_WORD_LEN;</div><div class='add'>+	++(*argcnt);</div><div class='add'>+</div><div class='add'>+	req_info-&gt;in[*argcnt].vptr = (u8 *)fctx;</div><div class='add'>+	req_info-&gt;in[*argcnt].size = sizeof(struct fc_context);</div><div class='add'>+	req_info-&gt;req.dlen += sizeof(struct fc_context);</div><div class='add'>+</div><div class='add'>+	++(*argcnt);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 create_input_list(struct ablkcipher_request  *req, u32 enc,</div><div class='add'>+				    u32 cipher_type, u32 aes_key_type,</div><div class='add'>+				    u32 enc_iv_len)</div><div class='add'>+{</div><div class='add'>+	struct cvm_req_ctx *rctx = ablkcipher_request_ctx(req);</div><div class='add'>+	struct cpt_request_info *req_info = &amp;rctx-&gt;cpt_req;</div><div class='add'>+	u32 argcnt =  0;</div><div class='add'>+</div><div class='add'>+	create_ctx_hdr(req, enc, cipher_type, aes_key_type, &amp;argcnt);</div><div class='add'>+	update_input_iv(req_info, req-&gt;info, enc_iv_len, &amp;argcnt);</div><div class='add'>+	update_input_data(req_info, req-&gt;src, req-&gt;nbytes, &amp;argcnt);</div><div class='add'>+	req_info-&gt;incnt = argcnt;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void store_cb_info(struct ablkcipher_request *req,</div><div class='add'>+				 struct cpt_request_info *req_info)</div><div class='add'>+{</div><div class='add'>+	req_info-&gt;callback = (void *)cvm_callback;</div><div class='add'>+	req_info-&gt;callback_arg = (void *)&amp;req-&gt;base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void create_output_list(struct ablkcipher_request *req,</div><div class='add'>+				      u32 cipher_type,</div><div class='add'>+				      u32 enc_iv_len)</div><div class='add'>+{</div><div class='add'>+	struct cvm_req_ctx *rctx = ablkcipher_request_ctx(req);</div><div class='add'>+	struct cpt_request_info *req_info = &amp;rctx-&gt;cpt_req;</div><div class='add'>+	u32 argcnt = 0;</div><div class='add'>+</div><div class='add'>+	/* OUTPUT Buffer Processing</div><div class='add'>+	 * AES encryption/decryption output would be</div><div class='add'>+	 * received in the following format</div><div class='add'>+	 *</div><div class='add'>+	 * ------IV--------|------ENCRYPTED/DECRYPTED DATA-----|</div><div class='add'>+	 * [ 16 Bytes/     [   Request Enc/Dec/ DATA Len AES CBC ]</div><div class='add'>+	 */</div><div class='add'>+	/* Reading IV information */</div><div class='add'>+	update_output_iv(req_info, req-&gt;info, enc_iv_len, &amp;argcnt);</div><div class='add'>+	update_output_data(req_info, req-&gt;dst, req-&gt;nbytes, &amp;argcnt);</div><div class='add'>+	req_info-&gt;outcnt = argcnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cvm_enc_dec(struct ablkcipher_request *req, u32 enc,</div><div class='add'>+			      u32 cipher_type)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);</div><div class='add'>+	struct cvm_enc_ctx *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='add'>+	u32 key_type = AES_128_BIT;</div><div class='add'>+	struct cvm_req_ctx *rctx = ablkcipher_request_ctx(req);</div><div class='add'>+	u32 enc_iv_len = crypto_ablkcipher_ivsize(tfm);</div><div class='add'>+	struct fc_context *fctx = &amp;rctx-&gt;fctx;</div><div class='add'>+	struct cpt_request_info *req_info = &amp;rctx-&gt;cpt_req;</div><div class='add'>+	void *cdev = NULL;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	switch (ctx-&gt;key_len) {</div><div class='add'>+	case 16:</div><div class='add'>+		key_type = AES_128_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case 24:</div><div class='add'>+		key_type = AES_192_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		if (cipher_type == AES_XTS)</div><div class='add'>+			key_type = AES_128_BIT;</div><div class='add'>+		else</div><div class='add'>+			key_type = AES_256_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case 64:</div><div class='add'>+		if (cipher_type == AES_XTS)</div><div class='add'>+			key_type = AES_256_BIT;</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cipher_type == DES3_CBC)</div><div class='add'>+		key_type = 0;</div><div class='add'>+</div><div class='add'>+	memset(req_info, 0, sizeof(struct cpt_request_info));</div><div class='add'>+	memset(fctx, 0, sizeof(struct fc_context));</div><div class='add'>+	create_input_list(req, enc, cipher_type, key_type, enc_iv_len);</div><div class='add'>+	create_output_list(req, cipher_type, enc_iv_len);</div><div class='add'>+	store_cb_info(req, req_info);</div><div class='add'>+	cdev = dev_handle.cdev[smp_processor_id()];</div><div class='add'>+	status = cptvf_do_request(cdev, req_info);</div><div class='add'>+	/* We perform an asynchronous send and once</div><div class='add'>+	 * the request is completed the driver would</div><div class='add'>+	 * intimate through  registered call back functions</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+	else</div><div class='add'>+		return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cvm_des3_encrypt_cbc(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return cvm_enc_dec(req, true, DES3_CBC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cvm_des3_decrypt_cbc(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return cvm_enc_dec(req, false, DES3_CBC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cvm_aes_encrypt_xts(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return cvm_enc_dec(req, true, AES_XTS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cvm_aes_decrypt_xts(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return cvm_enc_dec(req, false, AES_XTS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cvm_aes_encrypt_cbc(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return cvm_enc_dec(req, true, AES_CBC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cvm_aes_decrypt_cbc(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return cvm_enc_dec(req, false, AES_CBC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cvm_xts_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='add'>+		   u32 keylen)</div><div class='add'>+{</div><div class='add'>+	struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);</div><div class='add'>+	struct cvm_enc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	int err;</div><div class='add'>+	const u8 *key1 = key;</div><div class='add'>+	const u8 *key2 = key + (keylen / 2);</div><div class='add'>+</div><div class='add'>+	err = xts_check_key(tfm, key, keylen);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	ctx-&gt;key_len = keylen;</div><div class='add'>+	memcpy(ctx-&gt;enc_key, key1, keylen / 2);</div><div class='add'>+	memcpy(ctx-&gt;enc_key + KEY2_OFFSET, key2, keylen / 2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cvm_enc_dec_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='add'>+		       u32 keylen)</div><div class='add'>+{</div><div class='add'>+	struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);</div><div class='add'>+	struct cvm_enc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	if ((keylen == 16) || (keylen == 24) || (keylen == 32)) {</div><div class='add'>+		ctx-&gt;key_len = keylen;</div><div class='add'>+		memcpy(ctx-&gt;enc_key, key, keylen);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cvm_enc_dec_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct cvm_enc_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	memset(ctx, 0, sizeof(*ctx));</div><div class='add'>+	tfm-&gt;crt_ablkcipher.reqsize = sizeof(struct cvm_req_ctx) +</div><div class='add'>+					sizeof(struct ablkcipher_request);</div><div class='add'>+	/* Additional memory for ablkcipher_request is</div><div class='add'>+	 * allocated since the cryptd daemon uses</div><div class='add'>+	 * this memory for request_ctx information</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct crypto_alg algs[] = { {</div><div class='add'>+	.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize = sizeof(struct cvm_enc_ctx),</div><div class='add'>+	.cra_alignmask = 7,</div><div class='add'>+	.cra_priority = 4001,</div><div class='add'>+	.cra_name = "xts(aes)",</div><div class='add'>+	.cra_driver_name = "cavium-xts-aes",</div><div class='add'>+	.cra_type = &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.ablkcipher = {</div><div class='add'>+			.ivsize = AES_BLOCK_SIZE,</div><div class='add'>+			.min_keysize = 2 * AES_MIN_KEY_SIZE,</div><div class='add'>+			.max_keysize = 2 * AES_MAX_KEY_SIZE,</div><div class='add'>+			.setkey = cvm_xts_setkey,</div><div class='add'>+			.encrypt = cvm_aes_encrypt_xts,</div><div class='add'>+			.decrypt = cvm_aes_decrypt_xts,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.cra_init = cvm_enc_dec_init,</div><div class='add'>+	.cra_module = THIS_MODULE,</div><div class='add'>+}, {</div><div class='add'>+	.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_blocksize = AES_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize = sizeof(struct cvm_enc_ctx),</div><div class='add'>+	.cra_alignmask = 7,</div><div class='add'>+	.cra_priority = 4001,</div><div class='add'>+	.cra_name = "cbc(aes)",</div><div class='add'>+	.cra_driver_name = "cavium-cbc-aes",</div><div class='add'>+	.cra_type = &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.ablkcipher = {</div><div class='add'>+			.ivsize = AES_BLOCK_SIZE,</div><div class='add'>+			.min_keysize = AES_MIN_KEY_SIZE,</div><div class='add'>+			.max_keysize = AES_MAX_KEY_SIZE,</div><div class='add'>+			.setkey = cvm_enc_dec_setkey,</div><div class='add'>+			.encrypt = cvm_aes_encrypt_cbc,</div><div class='add'>+			.decrypt = cvm_aes_decrypt_cbc,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.cra_init = cvm_enc_dec_init,</div><div class='add'>+	.cra_module = THIS_MODULE,</div><div class='add'>+}, {</div><div class='add'>+	.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize = sizeof(struct cvm_des3_ctx),</div><div class='add'>+	.cra_alignmask = 7,</div><div class='add'>+	.cra_priority = 4001,</div><div class='add'>+	.cra_name = "cbc(des3_ede)",</div><div class='add'>+	.cra_driver_name = "cavium-cbc-des3_ede",</div><div class='add'>+	.cra_type = &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.ablkcipher = {</div><div class='add'>+			.min_keysize = DES3_EDE_KEY_SIZE,</div><div class='add'>+			.max_keysize = DES3_EDE_KEY_SIZE,</div><div class='add'>+			.ivsize = DES_BLOCK_SIZE,</div><div class='add'>+			.setkey = cvm_enc_dec_setkey,</div><div class='add'>+			.encrypt = cvm_des3_encrypt_cbc,</div><div class='add'>+			.decrypt = cvm_des3_decrypt_cbc,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.cra_init = cvm_enc_dec_init,</div><div class='add'>+	.cra_module = THIS_MODULE,</div><div class='add'>+} };</div><div class='add'>+</div><div class='add'>+static inline int cav_register_algs(void)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	err = crypto_register_algs(algs, ARRAY_SIZE(algs));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cav_unregister_algs(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_algs(algs, ARRAY_SIZE(algs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cvm_crypto_init(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	u32 dev_count;</div><div class='add'>+</div><div class='add'>+	dev_count = dev_handle.dev_count;</div><div class='add'>+	dev_handle.cdev[dev_count] = cptvf;</div><div class='add'>+	dev_handle.dev_count++;</div><div class='add'>+</div><div class='add'>+	if (dev_count == 3) {</div><div class='add'>+		if (cav_register_algs()) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Error in registering crypto algorithms\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cvm_crypto_exit(void)</div><div class='add'>+{</div><div class='add'>+	u32 dev_count;</div><div class='add'>+</div><div class='add'>+	dev_count = --dev_handle.dev_count;</div><div class='add'>+	if (!dev_count)</div><div class='add'>+		cav_unregister_algs();</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptvf_algs.h b/drivers/crypto/cavium/cpt/cptvf_algs.h<br/>new file mode 100644<br/>index 000000000000..a12050d11b0c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/cptvf_algs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf_algs.h</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CPTVF_ALGS_H_</div><div class='add'>+#define _CPTVF_ALGS_H_</div><div class='add'>+</div><div class='add'>+#include "request_manager.h"</div><div class='add'>+</div><div class='add'>+#define MAX_DEVICES 16</div><div class='add'>+#define MAJOR_OP_FC 0x33</div><div class='add'>+#define MAX_ENC_KEY_SIZE 32</div><div class='add'>+#define MAX_HASH_KEY_SIZE 64</div><div class='add'>+#define MAX_KEY_SIZE (MAX_ENC_KEY_SIZE + MAX_HASH_KEY_SIZE)</div><div class='add'>+#define CONTROL_WORD_LEN 8</div><div class='add'>+#define KEY2_OFFSET 48</div><div class='add'>+</div><div class='add'>+#define DMA_MODE_FLAG(dma_mode) \</div><div class='add'>+	(((dma_mode) == DMA_GATHER_SCATTER) ? (1 &lt;&lt; 7) : 0)</div><div class='add'>+</div><div class='add'>+enum req_type {</div><div class='add'>+	AE_CORE_REQ,</div><div class='add'>+	SE_CORE_REQ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum cipher_type {</div><div class='add'>+	DES3_CBC = 0x1,</div><div class='add'>+	DES3_ECB = 0x2,</div><div class='add'>+	AES_CBC = 0x3,</div><div class='add'>+	AES_ECB = 0x4,</div><div class='add'>+	AES_CFB = 0x5,</div><div class='add'>+	AES_CTR = 0x6,</div><div class='add'>+	AES_GCM = 0x7,</div><div class='add'>+	AES_XTS = 0x8</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum aes_type {</div><div class='add'>+	AES_128_BIT = 0x1,</div><div class='add'>+	AES_192_BIT = 0x2,</div><div class='add'>+	AES_256_BIT = 0x3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union encr_ctrl {</div><div class='add'>+	u64 flags;</div><div class='add'>+	struct {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD)</div><div class='add'>+		u64 enc_cipher:4;</div><div class='add'>+		u64 reserved1:1;</div><div class='add'>+		u64 aes_key:2;</div><div class='add'>+		u64 iv_source:1;</div><div class='add'>+		u64 hash_type:4;</div><div class='add'>+		u64 reserved2:3;</div><div class='add'>+		u64 auth_input_type:1;</div><div class='add'>+		u64 mac_len:8;</div><div class='add'>+		u64 reserved3:8;</div><div class='add'>+		u64 encr_offset:16;</div><div class='add'>+		u64 iv_offset:8;</div><div class='add'>+		u64 auth_offset:8;</div><div class='add'>+#else</div><div class='add'>+		u64 auth_offset:8;</div><div class='add'>+		u64 iv_offset:8;</div><div class='add'>+		u64 encr_offset:16;</div><div class='add'>+		u64 reserved3:8;</div><div class='add'>+		u64 mac_len:8;</div><div class='add'>+		u64 auth_input_type:1;</div><div class='add'>+		u64 reserved2:3;</div><div class='add'>+		u64 hash_type:4;</div><div class='add'>+		u64 iv_source:1;</div><div class='add'>+		u64 aes_key:2;</div><div class='add'>+		u64 reserved1:1;</div><div class='add'>+		u64 enc_cipher:4;</div><div class='add'>+#endif</div><div class='add'>+	} e;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct enc_context {</div><div class='add'>+	union encr_ctrl enc_ctrl;</div><div class='add'>+	u8 encr_key[32];</div><div class='add'>+	u8 encr_iv[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fchmac_context {</div><div class='add'>+	u8 ipad[64];</div><div class='add'>+	u8 opad[64]; /* or OPAD */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fc_context {</div><div class='add'>+	struct enc_context enc;</div><div class='add'>+	struct fchmac_context hmac;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cvm_enc_ctx {</div><div class='add'>+	u32 key_len;</div><div class='add'>+	u8 enc_key[MAX_KEY_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cvm_des3_ctx {</div><div class='add'>+	u32 key_len;</div><div class='add'>+	u8 des3_key[MAX_KEY_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cvm_req_ctx {</div><div class='add'>+	struct cpt_request_info cpt_req;</div><div class='add'>+	u64 control_word;</div><div class='add'>+	struct fc_context fctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cptvf_do_request(void *cptvf, struct cpt_request_info *req);</div><div class='add'>+#endif /*_CPTVF_ALGS_H_*/</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptvf_main.c b/drivers/crypto/cavium/cpt/cptvf_main.c<br/>new file mode 100644<br/>index 000000000000..6ffc740c7431<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/cptvf_main.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf_main.c</a></div><div class='hunk'>@@ -0,0 +1,866 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cptvf.h"</div><div class='add'>+</div><div class='add'>+#define DRV_NAME	"thunder-cptvf"</div><div class='add'>+#define DRV_VERSION	"1.0"</div><div class='add'>+</div><div class='add'>+struct cptvf_wqe {</div><div class='add'>+	struct tasklet_struct twork;</div><div class='add'>+	void *cptvf;</div><div class='add'>+	u32 qno;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cptvf_wqe_info {</div><div class='add'>+	struct cptvf_wqe vq_wqe[CPT_NUM_QS_PER_VF];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void vq_work_handler(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct cptvf_wqe_info *cwqe_info = (struct cptvf_wqe_info *)data;</div><div class='add'>+	struct cptvf_wqe *cwqe = &amp;cwqe_info-&gt;vq_wqe[0];</div><div class='add'>+</div><div class='add'>+	vq_post_process(cwqe-&gt;cptvf, cwqe-&gt;qno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_worker_threads(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	struct cptvf_wqe_info *cwqe_info;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cwqe_info = kzalloc(sizeof(*cwqe_info), GFP_KERNEL);</div><div class='add'>+	if (!cwqe_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (cptvf-&gt;nr_queues) {</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "Creating VQ worker threads (%d)\n",</div><div class='add'>+			 cptvf-&gt;nr_queues);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cptvf-&gt;nr_queues; i++) {</div><div class='add'>+		tasklet_init(&amp;cwqe_info-&gt;vq_wqe[i].twork, vq_work_handler,</div><div class='add'>+			     (u64)cwqe_info);</div><div class='add'>+		cwqe_info-&gt;vq_wqe[i].qno = i;</div><div class='add'>+		cwqe_info-&gt;vq_wqe[i].cptvf = cptvf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cptvf-&gt;wqe_info = cwqe_info;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup_worker_threads(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct cptvf_wqe_info *cwqe_info;</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cwqe_info = (struct cptvf_wqe_info *)cptvf-&gt;wqe_info;</div><div class='add'>+	if (!cwqe_info)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (cptvf-&gt;nr_queues) {</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "Cleaning VQ worker threads (%u)\n",</div><div class='add'>+			 cptvf-&gt;nr_queues);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cptvf-&gt;nr_queues; i++)</div><div class='add'>+		tasklet_kill(&amp;cwqe_info-&gt;vq_wqe[i].twork);</div><div class='add'>+</div><div class='add'>+	kzfree(cwqe_info);</div><div class='add'>+	cptvf-&gt;wqe_info = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_pending_queues(struct pending_qinfo *pqinfo)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct pending_queue *queue;</div><div class='add'>+</div><div class='add'>+	for_each_pending_queue(pqinfo, queue, i) {</div><div class='add'>+		if (!queue-&gt;head)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* free single queue */</div><div class='add'>+		kzfree((queue-&gt;head));</div><div class='add'>+</div><div class='add'>+		queue-&gt;front = 0;</div><div class='add'>+		queue-&gt;rear = 0;</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pqinfo-&gt;qlen = 0;</div><div class='add'>+	pqinfo-&gt;nr_queues = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alloc_pending_queues(struct pending_qinfo *pqinfo, u32 qlen,</div><div class='add'>+				u32 nr_queues)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+	size_t size;</div><div class='add'>+	int ret;</div><div class='add'>+	struct pending_queue *queue = NULL;</div><div class='add'>+</div><div class='add'>+	pqinfo-&gt;nr_queues = nr_queues;</div><div class='add'>+	pqinfo-&gt;qlen = qlen;</div><div class='add'>+</div><div class='add'>+	size = (qlen * sizeof(struct pending_entry));</div><div class='add'>+</div><div class='add'>+	for_each_pending_queue(pqinfo, queue, i) {</div><div class='add'>+		queue-&gt;head = kzalloc((size), GFP_KERNEL);</div><div class='add'>+		if (!queue-&gt;head) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto pending_qfail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		queue-&gt;front = 0;</div><div class='add'>+		queue-&gt;rear = 0;</div><div class='add'>+		atomic64_set((&amp;queue-&gt;pending_count), (0));</div><div class='add'>+</div><div class='add'>+		/* init queue spin lock */</div><div class='add'>+		spin_lock_init(&amp;queue-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+pending_qfail:</div><div class='add'>+	free_pending_queues(pqinfo);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_pending_queues(struct cpt_vf *cptvf, u32 qlen, u32 nr_queues)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!nr_queues)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = alloc_pending_queues(&amp;cptvf-&gt;pqinfo, qlen, nr_queues);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to setup pending queues (%u)\n",</div><div class='add'>+			nr_queues);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup_pending_queues(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	if (!cptvf-&gt;nr_queues)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "Cleaning VQ pending queue (%u)\n",</div><div class='add'>+		 cptvf-&gt;nr_queues);</div><div class='add'>+	free_pending_queues(&amp;cptvf-&gt;pqinfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_command_queues(struct cpt_vf *cptvf,</div><div class='add'>+				struct command_qinfo *cqinfo)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct command_queue *queue = NULL;</div><div class='add'>+	struct command_chunk *chunk = NULL;</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	struct hlist_node *node;</div><div class='add'>+</div><div class='add'>+	/* clean up for each queue */</div><div class='add'>+	for (i = 0; i &lt; cptvf-&gt;nr_queues; i++) {</div><div class='add'>+		queue = &amp;cqinfo-&gt;queue[i];</div><div class='add'>+		if (hlist_empty(&amp;cqinfo-&gt;queue[i].chead))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		hlist_for_each_entry_safe(chunk, node, &amp;cqinfo-&gt;queue[i].chead,</div><div class='add'>+					  nextchunk) {</div><div class='add'>+			dma_free_coherent(&amp;pdev-&gt;dev, chunk-&gt;size,</div><div class='add'>+					  chunk-&gt;head,</div><div class='add'>+					  chunk-&gt;dma_addr);</div><div class='add'>+			chunk-&gt;head = NULL;</div><div class='add'>+			chunk-&gt;dma_addr = 0;</div><div class='add'>+			hlist_del(&amp;chunk-&gt;nextchunk);</div><div class='add'>+			kzfree(chunk);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		queue-&gt;nchunks = 0;</div><div class='add'>+		queue-&gt;idx = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* common cleanup */</div><div class='add'>+	cqinfo-&gt;cmd_size = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alloc_command_queues(struct cpt_vf *cptvf,</div><div class='add'>+				struct command_qinfo *cqinfo, size_t cmd_size,</div><div class='add'>+				u32 qlen)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	size_t q_size;</div><div class='add'>+	struct command_queue *queue = NULL;</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	/* common init */</div><div class='add'>+	cqinfo-&gt;cmd_size = cmd_size;</div><div class='add'>+	/* Qsize in dwords, needed for SADDR config, 1-next chunk pointer */</div><div class='add'>+	cptvf-&gt;qsize = min(qlen, cqinfo-&gt;qchunksize) *</div><div class='add'>+			CPT_NEXT_CHUNK_PTR_SIZE + 1;</div><div class='add'>+	/* Qsize in bytes to create space for alignment */</div><div class='add'>+	q_size = qlen * cqinfo-&gt;cmd_size;</div><div class='add'>+</div><div class='add'>+	/* per queue initialization */</div><div class='add'>+	for (i = 0; i &lt; cptvf-&gt;nr_queues; i++) {</div><div class='add'>+		size_t c_size = 0;</div><div class='add'>+		size_t rem_q_size = q_size;</div><div class='add'>+		struct command_chunk *curr = NULL, *first = NULL, *last = NULL;</div><div class='add'>+		u32 qcsize_bytes = cqinfo-&gt;qchunksize * cqinfo-&gt;cmd_size;</div><div class='add'>+</div><div class='add'>+		queue = &amp;cqinfo-&gt;queue[i];</div><div class='add'>+		INIT_HLIST_HEAD(&amp;cqinfo-&gt;queue[i].chead);</div><div class='add'>+		do {</div><div class='add'>+			curr = kzalloc(sizeof(*curr), GFP_KERNEL);</div><div class='add'>+			if (!curr)</div><div class='add'>+				goto cmd_qfail;</div><div class='add'>+</div><div class='add'>+			c_size = (rem_q_size &gt; qcsize_bytes) ? qcsize_bytes :</div><div class='add'>+					rem_q_size;</div><div class='add'>+			curr-&gt;head = (u8 *)dma_zalloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+					  c_size + CPT_NEXT_CHUNK_PTR_SIZE,</div><div class='add'>+					  &amp;curr-&gt;dma_addr, GFP_KERNEL);</div><div class='add'>+			if (!curr-&gt;head) {</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "Command Q (%d) chunk (%d) allocation failed\n",</div><div class='add'>+					i, queue-&gt;nchunks);</div><div class='add'>+				kfree(curr);</div><div class='add'>+				goto cmd_qfail;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			curr-&gt;size = c_size;</div><div class='add'>+			if (queue-&gt;nchunks == 0) {</div><div class='add'>+				hlist_add_head(&amp;curr-&gt;nextchunk,</div><div class='add'>+					       &amp;cqinfo-&gt;queue[i].chead);</div><div class='add'>+				first = curr;</div><div class='add'>+			} else {</div><div class='add'>+				hlist_add_behind(&amp;curr-&gt;nextchunk,</div><div class='add'>+						 &amp;last-&gt;nextchunk);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			queue-&gt;nchunks++;</div><div class='add'>+			rem_q_size -= c_size;</div><div class='add'>+			if (last)</div><div class='add'>+				*((u64 *)(&amp;last-&gt;head[last-&gt;size])) = (u64)curr-&gt;dma_addr;</div><div class='add'>+</div><div class='add'>+			last = curr;</div><div class='add'>+		} while (rem_q_size);</div><div class='add'>+</div><div class='add'>+		/* Make the queue circular */</div><div class='add'>+		/* Tie back last chunk entry to head */</div><div class='add'>+		curr = first;</div><div class='add'>+		*((u64 *)(&amp;last-&gt;head[last-&gt;size])) = (u64)curr-&gt;dma_addr;</div><div class='add'>+		queue-&gt;qhead = curr;</div><div class='add'>+		spin_lock_init(&amp;queue-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cmd_qfail:</div><div class='add'>+	free_command_queues(cptvf, cqinfo);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_command_queues(struct cpt_vf *cptvf, u32 qlen)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* setup AE command queues */</div><div class='add'>+	ret = alloc_command_queues(cptvf, &amp;cptvf-&gt;cqinfo, CPT_INST_SIZE,</div><div class='add'>+				   qlen);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to allocate AE command queues (%u)\n",</div><div class='add'>+			cptvf-&gt;nr_queues);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup_command_queues(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	if (!cptvf-&gt;nr_queues)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "Cleaning VQ command queue (%u)\n",</div><div class='add'>+		 cptvf-&gt;nr_queues);</div><div class='add'>+	free_command_queues(cptvf, &amp;cptvf-&gt;cqinfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_sw_cleanup(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	cleanup_worker_threads(cptvf);</div><div class='add'>+	cleanup_pending_queues(cptvf);</div><div class='add'>+	cleanup_command_queues(cptvf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cptvf_sw_init(struct cpt_vf *cptvf, u32 qlen, u32 nr_queues)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 max_dev_queues = 0;</div><div class='add'>+</div><div class='add'>+	max_dev_queues = CPT_NUM_QS_PER_VF;</div><div class='add'>+	/* possible cpus */</div><div class='add'>+	nr_queues = min_t(u32, nr_queues, max_dev_queues);</div><div class='add'>+	cptvf-&gt;nr_queues = nr_queues;</div><div class='add'>+</div><div class='add'>+	ret = init_command_queues(cptvf, qlen);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to setup command queues (%u)\n",</div><div class='add'>+			nr_queues);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = init_pending_queues(cptvf, qlen, nr_queues);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to setup pending queues (%u)\n",</div><div class='add'>+			nr_queues);</div><div class='add'>+		goto setup_pqfail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create worker threads for BH processing */</div><div class='add'>+	ret = init_worker_threads(cptvf);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to setup worker threads\n");</div><div class='add'>+		goto init_work_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+init_work_fail:</div><div class='add'>+	cleanup_worker_threads(cptvf);</div><div class='add'>+	cleanup_pending_queues(cptvf);</div><div class='add'>+</div><div class='add'>+setup_pqfail:</div><div class='add'>+	cleanup_command_queues(cptvf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_free_irq_affinity(struct cpt_vf *cptvf, int vec)</div><div class='add'>+{</div><div class='add'>+	irq_set_affinity_hint(pci_irq_vector(cptvf-&gt;pdev, vec), NULL);</div><div class='add'>+	free_cpumask_var(cptvf-&gt;affinity_mask[vec]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_write_vq_ctl(struct cpt_vf *cptvf, bool val)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_ctl vqx_ctl;</div><div class='add'>+</div><div class='add'>+	vqx_ctl.u = cpt_read_csr64(cptvf-&gt;reg_base, CPTX_VQX_CTL(0, 0));</div><div class='add'>+	vqx_ctl.s.ena = val;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_CTL(0, 0), vqx_ctl.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cptvf_write_vq_doorbell(struct cpt_vf *cptvf, u32 val)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_doorbell vqx_dbell;</div><div class='add'>+</div><div class='add'>+	vqx_dbell.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+				     CPTX_VQX_DOORBELL(0, 0));</div><div class='add'>+	vqx_dbell.s.dbell_cnt = val * 8; /* Num of Instructions * 8 words */</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_DOORBELL(0, 0),</div><div class='add'>+			vqx_dbell.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_write_vq_inprog(struct cpt_vf *cptvf, u8 val)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_inprog vqx_inprg;</div><div class='add'>+</div><div class='add'>+	vqx_inprg.u = cpt_read_csr64(cptvf-&gt;reg_base, CPTX_VQX_INPROG(0, 0));</div><div class='add'>+	vqx_inprg.s.inflight = val;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_INPROG(0, 0), vqx_inprg.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_write_vq_done_numwait(struct cpt_vf *cptvf, u32 val)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_done_wait vqx_dwait;</div><div class='add'>+</div><div class='add'>+	vqx_dwait.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+				     CPTX_VQX_DONE_WAIT(0, 0));</div><div class='add'>+	vqx_dwait.s.num_wait = val;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_DONE_WAIT(0, 0),</div><div class='add'>+			vqx_dwait.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_write_vq_done_timewait(struct cpt_vf *cptvf, u16 time)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_done_wait vqx_dwait;</div><div class='add'>+</div><div class='add'>+	vqx_dwait.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+				     CPTX_VQX_DONE_WAIT(0, 0));</div><div class='add'>+	vqx_dwait.s.time_wait = time;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_DONE_WAIT(0, 0),</div><div class='add'>+			vqx_dwait.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_enable_swerr_interrupts(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_misc_ena_w1s vqx_misc_ena;</div><div class='add'>+</div><div class='add'>+	vqx_misc_ena.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+					CPTX_VQX_MISC_ENA_W1S(0, 0));</div><div class='add'>+	/* Set mbox(0) interupts for the requested vf */</div><div class='add'>+	vqx_misc_ena.s.swerr = 1;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_MISC_ENA_W1S(0, 0),</div><div class='add'>+			vqx_misc_ena.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_enable_mbox_interrupts(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_misc_ena_w1s vqx_misc_ena;</div><div class='add'>+</div><div class='add'>+	vqx_misc_ena.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+					CPTX_VQX_MISC_ENA_W1S(0, 0));</div><div class='add'>+	/* Set mbox(0) interupts for the requested vf */</div><div class='add'>+	vqx_misc_ena.s.mbox = 1;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_MISC_ENA_W1S(0, 0),</div><div class='add'>+			vqx_misc_ena.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_enable_done_interrupts(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_done_ena_w1s vqx_done_ena;</div><div class='add'>+</div><div class='add'>+	vqx_done_ena.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+					CPTX_VQX_DONE_ENA_W1S(0, 0));</div><div class='add'>+	/* Set DONE interrupt for the requested vf */</div><div class='add'>+	vqx_done_ena.s.done = 1;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_DONE_ENA_W1S(0, 0),</div><div class='add'>+			vqx_done_ena.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_clear_dovf_intr(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_misc_int vqx_misc_int;</div><div class='add'>+</div><div class='add'>+	vqx_misc_int.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+					CPTX_VQX_MISC_INT(0, 0));</div><div class='add'>+	/* W1C for the VF */</div><div class='add'>+	vqx_misc_int.s.dovf = 1;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_MISC_INT(0, 0),</div><div class='add'>+			vqx_misc_int.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_clear_irde_intr(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_misc_int vqx_misc_int;</div><div class='add'>+</div><div class='add'>+	vqx_misc_int.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+					CPTX_VQX_MISC_INT(0, 0));</div><div class='add'>+	/* W1C for the VF */</div><div class='add'>+	vqx_misc_int.s.irde = 1;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_MISC_INT(0, 0),</div><div class='add'>+			vqx_misc_int.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_clear_nwrp_intr(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_misc_int vqx_misc_int;</div><div class='add'>+</div><div class='add'>+	vqx_misc_int.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+					CPTX_VQX_MISC_INT(0, 0));</div><div class='add'>+	/* W1C for the VF */</div><div class='add'>+	vqx_misc_int.s.nwrp = 1;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base,</div><div class='add'>+			CPTX_VQX_MISC_INT(0, 0), vqx_misc_int.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_clear_mbox_intr(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_misc_int vqx_misc_int;</div><div class='add'>+</div><div class='add'>+	vqx_misc_int.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+					CPTX_VQX_MISC_INT(0, 0));</div><div class='add'>+	/* W1C for the VF */</div><div class='add'>+	vqx_misc_int.s.mbox = 1;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_MISC_INT(0, 0),</div><div class='add'>+			vqx_misc_int.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_clear_swerr_intr(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_misc_int vqx_misc_int;</div><div class='add'>+</div><div class='add'>+	vqx_misc_int.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+					CPTX_VQX_MISC_INT(0, 0));</div><div class='add'>+	/* W1C for the VF */</div><div class='add'>+	vqx_misc_int.s.swerr = 1;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_MISC_INT(0, 0),</div><div class='add'>+			vqx_misc_int.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 cptvf_read_vf_misc_intr_status(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	return cpt_read_csr64(cptvf-&gt;reg_base, CPTX_VQX_MISC_INT(0, 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t cptvf_misc_intr_handler(int irq, void *cptvf_irq)</div><div class='add'>+{</div><div class='add'>+	struct cpt_vf *cptvf = (struct cpt_vf *)cptvf_irq;</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	u64 intr;</div><div class='add'>+</div><div class='add'>+	intr = cptvf_read_vf_misc_intr_status(cptvf);</div><div class='add'>+	/*Check for MISC interrupt types*/</div><div class='add'>+	if (likely(intr &amp; CPT_VF_INTR_MBOX_MASK)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Mailbox interrupt 0x%llx on CPT VF %d\n",</div><div class='add'>+			intr, cptvf-&gt;vfid);</div><div class='add'>+		cptvf_handle_mbox_intr(cptvf);</div><div class='add'>+		cptvf_clear_mbox_intr(cptvf);</div><div class='add'>+	} else if (unlikely(intr &amp; CPT_VF_INTR_DOVF_MASK)) {</div><div class='add'>+		cptvf_clear_dovf_intr(cptvf);</div><div class='add'>+		/*Clear doorbell count*/</div><div class='add'>+		cptvf_write_vq_doorbell(cptvf, 0);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Doorbell overflow error interrupt 0x%llx on CPT VF %d\n",</div><div class='add'>+			intr, cptvf-&gt;vfid);</div><div class='add'>+	} else if (unlikely(intr &amp; CPT_VF_INTR_IRDE_MASK)) {</div><div class='add'>+		cptvf_clear_irde_intr(cptvf);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Instruction NCB read error interrupt 0x%llx on CPT VF %d\n",</div><div class='add'>+			intr, cptvf-&gt;vfid);</div><div class='add'>+	} else if (unlikely(intr &amp; CPT_VF_INTR_NWRP_MASK)) {</div><div class='add'>+		cptvf_clear_nwrp_intr(cptvf);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "NCB response write error interrupt 0x%llx on CPT VF %d\n",</div><div class='add'>+			intr, cptvf-&gt;vfid);</div><div class='add'>+	} else if (unlikely(intr &amp; CPT_VF_INTR_SERR_MASK)) {</div><div class='add'>+		cptvf_clear_swerr_intr(cptvf);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Software error interrupt 0x%llx on CPT VF %d\n",</div><div class='add'>+			intr, cptvf-&gt;vfid);</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unhandled interrupt in CPT VF %d\n",</div><div class='add'>+			cptvf-&gt;vfid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct cptvf_wqe *get_cptvf_vq_wqe(struct cpt_vf *cptvf,</div><div class='add'>+						 int qno)</div><div class='add'>+{</div><div class='add'>+	struct cptvf_wqe_info *nwqe_info;</div><div class='add'>+</div><div class='add'>+	if (unlikely(qno &gt;= cptvf-&gt;nr_queues))</div><div class='add'>+		return NULL;</div><div class='add'>+	nwqe_info = (struct cptvf_wqe_info *)cptvf-&gt;wqe_info;</div><div class='add'>+</div><div class='add'>+	return &amp;nwqe_info-&gt;vq_wqe[qno];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 cptvf_read_vq_done_count(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_done vqx_done;</div><div class='add'>+</div><div class='add'>+	vqx_done.u = cpt_read_csr64(cptvf-&gt;reg_base, CPTX_VQX_DONE(0, 0));</div><div class='add'>+	return vqx_done.s.done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cptvf_write_vq_done_ack(struct cpt_vf *cptvf,</div><div class='add'>+					   u32 ackcnt)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_done_ack vqx_dack_cnt;</div><div class='add'>+</div><div class='add'>+	vqx_dack_cnt.u = cpt_read_csr64(cptvf-&gt;reg_base,</div><div class='add'>+					CPTX_VQX_DONE_ACK(0, 0));</div><div class='add'>+	vqx_dack_cnt.s.done_ack = ackcnt;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_DONE_ACK(0, 0),</div><div class='add'>+			vqx_dack_cnt.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t cptvf_done_intr_handler(int irq, void *cptvf_irq)</div><div class='add'>+{</div><div class='add'>+	struct cpt_vf *cptvf = (struct cpt_vf *)cptvf_irq;</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	/* Read the number of completions */</div><div class='add'>+	u32 intr = cptvf_read_vq_done_count(cptvf);</div><div class='add'>+</div><div class='add'>+	if (intr) {</div><div class='add'>+		struct cptvf_wqe *wqe;</div><div class='add'>+</div><div class='add'>+		/* Acknowledge the number of</div><div class='add'>+		 * scheduled completions for processing</div><div class='add'>+		 */</div><div class='add'>+		cptvf_write_vq_done_ack(cptvf, intr);</div><div class='add'>+		wqe = get_cptvf_vq_wqe(cptvf, 0);</div><div class='add'>+		if (unlikely(!wqe)) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "No work to schedule for VF (%d)",</div><div class='add'>+				cptvf-&gt;vfid);</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+		}</div><div class='add'>+		tasklet_hi_schedule(&amp;wqe-&gt;twork);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_set_irq_affinity(struct cpt_vf *cptvf, int vec)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	if (!zalloc_cpumask_var(&amp;cptvf-&gt;affinity_mask[vec],</div><div class='add'>+				GFP_KERNEL)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Allocation failed for affinity_mask for VF %d",</div><div class='add'>+			cptvf-&gt;vfid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpu = cptvf-&gt;vfid % num_online_cpus();</div><div class='add'>+	cpumask_set_cpu(cpumask_local_spread(cpu, cptvf-&gt;node),</div><div class='add'>+			cptvf-&gt;affinity_mask[vec]);</div><div class='add'>+	irq_set_affinity_hint(pci_irq_vector(pdev, vec),</div><div class='add'>+			cptvf-&gt;affinity_mask[vec]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_write_vq_saddr(struct cpt_vf *cptvf, u64 val)</div><div class='add'>+{</div><div class='add'>+	union cptx_vqx_saddr vqx_saddr;</div><div class='add'>+</div><div class='add'>+	vqx_saddr.u = val;</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VQX_SADDR(0, 0), vqx_saddr.u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cptvf_device_init(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	u64 base_addr = 0;</div><div class='add'>+</div><div class='add'>+	/* Disable the VQ */</div><div class='add'>+	cptvf_write_vq_ctl(cptvf, 0);</div><div class='add'>+	/* Reset the doorbell */</div><div class='add'>+	cptvf_write_vq_doorbell(cptvf, 0);</div><div class='add'>+	/* Clear inflight */</div><div class='add'>+	cptvf_write_vq_inprog(cptvf, 0);</div><div class='add'>+	/* Write VQ SADDR */</div><div class='add'>+	/* TODO: for now only one queue, so hard coded */</div><div class='add'>+	base_addr = (u64)(cptvf-&gt;cqinfo.queue[0].qhead-&gt;dma_addr);</div><div class='add'>+	cptvf_write_vq_saddr(cptvf, base_addr);</div><div class='add'>+	/* Configure timerhold / coalescence */</div><div class='add'>+	cptvf_write_vq_done_timewait(cptvf, CPT_TIMER_THOLD);</div><div class='add'>+	cptvf_write_vq_done_numwait(cptvf, 1);</div><div class='add'>+	/* Enable the VQ */</div><div class='add'>+	cptvf_write_vq_ctl(cptvf, 1);</div><div class='add'>+	/* Flag the VF ready */</div><div class='add'>+	cptvf-&gt;flags |= CPT_FLAG_DEVICE_READY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cptvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct cpt_vf *cptvf;</div><div class='add'>+	int    err;</div><div class='add'>+</div><div class='add'>+	cptvf = devm_kzalloc(dev, sizeof(*cptvf), GFP_KERNEL);</div><div class='add'>+	if (!cptvf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, cptvf);</div><div class='add'>+	cptvf-&gt;pdev = pdev;</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Failed to enable PCI device\n");</div><div class='add'>+		pci_set_drvdata(pdev, NULL);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_request_regions(pdev, DRV_NAME);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "PCI request regions failed 0x%x\n", err);</div><div class='add'>+		goto cptvf_err_disable_device;</div><div class='add'>+	}</div><div class='add'>+	/* Mark as VF driver */</div><div class='add'>+	cptvf-&gt;flags |= CPT_FLAG_VF_DRIVER;</div><div class='add'>+	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(48));</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Unable to get usable DMA configuration\n");</div><div class='add'>+		goto cptvf_err_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Unable to get 48-bit DMA for consistent allocations\n");</div><div class='add'>+		goto cptvf_err_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MAP PF's configuration registers */</div><div class='add'>+	cptvf-&gt;reg_base = pcim_iomap(pdev, 0, 0);</div><div class='add'>+	if (!cptvf-&gt;reg_base) {</div><div class='add'>+		dev_err(dev, "Cannot map config register space, aborting\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto cptvf_err_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cptvf-&gt;node = dev_to_node(&amp;pdev-&gt;dev);</div><div class='add'>+	err = pci_alloc_irq_vectors(pdev, CPT_VF_MSIX_VECTORS,</div><div class='add'>+			CPT_VF_MSIX_VECTORS, PCI_IRQ_MSIX);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev, "Request for #%d msix vectors failed\n",</div><div class='add'>+			CPT_VF_MSIX_VECTORS);</div><div class='add'>+		goto cptvf_err_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = request_irq(pci_irq_vector(pdev, CPT_VF_INT_VEC_E_MISC),</div><div class='add'>+			  cptvf_misc_intr_handler, 0, "CPT VF misc intr",</div><div class='add'>+			  cptvf);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Request misc irq failed");</div><div class='add'>+		goto cptvf_free_vectors;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable mailbox interrupt */</div><div class='add'>+	cptvf_enable_mbox_interrupts(cptvf);</div><div class='add'>+	cptvf_enable_swerr_interrupts(cptvf);</div><div class='add'>+</div><div class='add'>+	/* Check ready with PF */</div><div class='add'>+	/* Gets chip ID / device Id from PF if ready */</div><div class='add'>+	err = cptvf_check_pf_ready(cptvf);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "PF not responding to READY msg");</div><div class='add'>+		goto cptvf_free_misc_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CPT VF software resources initialization */</div><div class='add'>+	cptvf-&gt;cqinfo.qchunksize = CPT_CMD_QCHUNK_SIZE;</div><div class='add'>+	err = cptvf_sw_init(cptvf, CPT_CMD_QLEN, CPT_NUM_QS_PER_VF);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "cptvf_sw_init() failed");</div><div class='add'>+		goto cptvf_free_misc_irq;</div><div class='add'>+	}</div><div class='add'>+	/* Convey VQ LEN to PF */</div><div class='add'>+	err = cptvf_send_vq_size_msg(cptvf);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "PF not responding to QLEN msg");</div><div class='add'>+		goto cptvf_free_misc_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CPT VF device initialization */</div><div class='add'>+	cptvf_device_init(cptvf);</div><div class='add'>+	/* Send msg to PF to assign currnet Q to required group */</div><div class='add'>+	cptvf-&gt;vfgrp = 1;</div><div class='add'>+	err = cptvf_send_vf_to_grp_msg(cptvf);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "PF not responding to VF_GRP msg");</div><div class='add'>+		goto cptvf_free_misc_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cptvf-&gt;priority = 1;</div><div class='add'>+	err = cptvf_send_vf_priority_msg(cptvf);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "PF not responding to VF_PRIO msg");</div><div class='add'>+		goto cptvf_free_misc_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = request_irq(pci_irq_vector(pdev, CPT_VF_INT_VEC_E_DONE),</div><div class='add'>+			  cptvf_done_intr_handler, 0, "CPT VF done intr",</div><div class='add'>+			  cptvf);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Request done irq failed\n");</div><div class='add'>+		goto cptvf_free_misc_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable mailbox interrupt */</div><div class='add'>+	cptvf_enable_done_interrupts(cptvf);</div><div class='add'>+</div><div class='add'>+	/* Set irq affinity masks */</div><div class='add'>+	cptvf_set_irq_affinity(cptvf, CPT_VF_INT_VEC_E_MISC);</div><div class='add'>+	cptvf_set_irq_affinity(cptvf, CPT_VF_INT_VEC_E_DONE);</div><div class='add'>+</div><div class='add'>+	err = cptvf_send_vf_up(cptvf);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "PF not responding to UP msg");</div><div class='add'>+		goto cptvf_free_irq_affinity;</div><div class='add'>+	}</div><div class='add'>+	err = cvm_crypto_init(cptvf);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Algorithm register failed\n");</div><div class='add'>+		goto cptvf_free_irq_affinity;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cptvf_free_irq_affinity:</div><div class='add'>+	cptvf_free_irq_affinity(cptvf, CPT_VF_INT_VEC_E_DONE);</div><div class='add'>+	cptvf_free_irq_affinity(cptvf, CPT_VF_INT_VEC_E_MISC);</div><div class='add'>+cptvf_free_misc_irq:</div><div class='add'>+	free_irq(pci_irq_vector(pdev, CPT_VF_INT_VEC_E_MISC), cptvf);</div><div class='add'>+cptvf_free_vectors:</div><div class='add'>+	pci_free_irq_vectors(cptvf-&gt;pdev);</div><div class='add'>+cptvf_err_release_regions:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+cptvf_err_disable_device:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct cpt_vf *cptvf = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!cptvf) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Invalid CPT-VF device\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Convey DOWN to PF */</div><div class='add'>+	if (cptvf_send_vf_down(cptvf)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PF not responding to DOWN msg");</div><div class='add'>+	} else {</div><div class='add'>+		cptvf_free_irq_affinity(cptvf, CPT_VF_INT_VEC_E_DONE);</div><div class='add'>+		cptvf_free_irq_affinity(cptvf, CPT_VF_INT_VEC_E_MISC);</div><div class='add'>+		free_irq(pci_irq_vector(pdev, CPT_VF_INT_VEC_E_DONE), cptvf);</div><div class='add'>+		free_irq(pci_irq_vector(pdev, CPT_VF_INT_VEC_E_MISC), cptvf);</div><div class='add'>+		pci_free_irq_vectors(cptvf-&gt;pdev);</div><div class='add'>+		cptvf_sw_cleanup(cptvf);</div><div class='add'>+		pci_set_drvdata(pdev, NULL);</div><div class='add'>+		pci_release_regions(pdev);</div><div class='add'>+		pci_disable_device(pdev);</div><div class='add'>+		cvm_crypto_exit();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cptvf_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	cptvf_remove(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Supported devices */</div><div class='add'>+static const struct pci_device_id cptvf_id_table[] = {</div><div class='add'>+	{PCI_VDEVICE(CAVIUM, CPT_81XX_PCI_VF_DEVICE_ID), 0},</div><div class='add'>+	{ 0, }  /* end of table */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_driver cptvf_pci_driver = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.id_table = cptvf_id_table,</div><div class='add'>+	.probe = cptvf_probe,</div><div class='add'>+	.remove = cptvf_remove,</div><div class='add'>+	.shutdown = cptvf_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_pci_driver(cptvf_pci_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("George Cherian &lt;george.cherian@cavium.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Cavium Thunder CPT Virtual Function Driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+MODULE_DEVICE_TABLE(pci, cptvf_id_table);</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptvf_mbox.c b/drivers/crypto/cavium/cpt/cptvf_mbox.c<br/>new file mode 100644<br/>index 000000000000..d5ec3b8a9e61<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/cptvf_mbox.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf_mbox.c</a></div><div class='hunk'>@@ -0,0 +1,211 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "cptvf.h"</div><div class='add'>+</div><div class='add'>+static void cptvf_send_msg_to_pf(struct cpt_vf *cptvf, struct cpt_mbox *mbx)</div><div class='add'>+{</div><div class='add'>+	/* Writing mbox(1) causes interrupt */</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VFX_PF_MBOXX(0, 0, 0),</div><div class='add'>+			mbx-&gt;msg);</div><div class='add'>+	cpt_write_csr64(cptvf-&gt;reg_base, CPTX_VFX_PF_MBOXX(0, 0, 1),</div><div class='add'>+			mbx-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ACKs PF's mailbox message</div><div class='add'>+ */</div><div class='add'>+void cptvf_mbox_send_ack(struct cpt_vf *cptvf, struct cpt_mbox *mbx)</div><div class='add'>+{</div><div class='add'>+	mbx-&gt;msg = CPT_MBOX_MSG_TYPE_ACK;</div><div class='add'>+	cptvf_send_msg_to_pf(cptvf, mbx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* NACKs PF's mailbox message that VF is not able to</div><div class='add'>+ * complete the action</div><div class='add'>+ */</div><div class='add'>+void cptvf_mbox_send_nack(struct cpt_vf *cptvf, struct cpt_mbox *mbx)</div><div class='add'>+{</div><div class='add'>+	mbx-&gt;msg = CPT_MBOX_MSG_TYPE_NACK;</div><div class='add'>+	cptvf_send_msg_to_pf(cptvf, mbx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Interrupt handler to handle mailbox messages from VFs */</div><div class='add'>+void cptvf_handle_mbox_intr(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct cpt_mbox mbx = {};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * MBOX[0] contains msg</div><div class='add'>+	 * MBOX[1] contains data</div><div class='add'>+	 */</div><div class='add'>+	mbx.msg  = cpt_read_csr64(cptvf-&gt;reg_base, CPTX_VFX_PF_MBOXX(0, 0, 0));</div><div class='add'>+	mbx.data = cpt_read_csr64(cptvf-&gt;reg_base, CPTX_VFX_PF_MBOXX(0, 0, 1));</div><div class='add'>+	dev_dbg(&amp;cptvf-&gt;pdev-&gt;dev, "%s: Mailbox msg 0x%llx from PF\n",</div><div class='add'>+		__func__, mbx.msg);</div><div class='add'>+	switch (mbx.msg) {</div><div class='add'>+	case CPT_MSG_READY:</div><div class='add'>+	{</div><div class='add'>+		cptvf-&gt;pf_acked = true;</div><div class='add'>+		cptvf-&gt;vfid = mbx.data;</div><div class='add'>+		dev_dbg(&amp;cptvf-&gt;pdev-&gt;dev, "Received VFID %d\n", cptvf-&gt;vfid);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case CPT_MSG_QBIND_GRP:</div><div class='add'>+		cptvf-&gt;pf_acked = true;</div><div class='add'>+		cptvf-&gt;vftype = mbx.data;</div><div class='add'>+		dev_dbg(&amp;cptvf-&gt;pdev-&gt;dev, "VF %d type %s group %d\n",</div><div class='add'>+			cptvf-&gt;vfid, ((mbx.data == SE_TYPES) ? "SE" : "AE"),</div><div class='add'>+			cptvf-&gt;vfgrp);</div><div class='add'>+		break;</div><div class='add'>+	case CPT_MBOX_MSG_TYPE_ACK:</div><div class='add'>+		cptvf-&gt;pf_acked = true;</div><div class='add'>+		break;</div><div class='add'>+	case CPT_MBOX_MSG_TYPE_NACK:</div><div class='add'>+		cptvf-&gt;pf_nacked = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;cptvf-&gt;pdev-&gt;dev, "Invalid msg from PF, msg 0x%llx\n",</div><div class='add'>+			mbx.msg);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cptvf_send_msg_to_pf_timeout(struct cpt_vf *cptvf,</div><div class='add'>+					struct cpt_mbox *mbx)</div><div class='add'>+{</div><div class='add'>+	int timeout = CPT_MBOX_MSG_TIMEOUT;</div><div class='add'>+	int sleep = 10;</div><div class='add'>+</div><div class='add'>+	cptvf-&gt;pf_acked = false;</div><div class='add'>+	cptvf-&gt;pf_nacked = false;</div><div class='add'>+	cptvf_send_msg_to_pf(cptvf, mbx);</div><div class='add'>+	/* Wait for previous message to be acked, timeout 2sec */</div><div class='add'>+	while (!cptvf-&gt;pf_acked) {</div><div class='add'>+		if (cptvf-&gt;pf_nacked)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		msleep(sleep);</div><div class='add'>+		if (cptvf-&gt;pf_acked)</div><div class='add'>+			break;</div><div class='add'>+		timeout -= sleep;</div><div class='add'>+		if (!timeout) {</div><div class='add'>+			dev_err(&amp;cptvf-&gt;pdev-&gt;dev, "PF didn't ack to mbox msg %llx from VF%u\n",</div><div class='add'>+				(mbx-&gt;msg &amp; 0xFF), cptvf-&gt;vfid);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Checks if VF is able to comminicate with PF</div><div class='add'>+ * and also gets the CPT number this VF is associated to.</div><div class='add'>+ */</div><div class='add'>+int cptvf_check_pf_ready(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	struct cpt_mbox mbx = {};</div><div class='add'>+</div><div class='add'>+	mbx.msg = CPT_MSG_READY;</div><div class='add'>+	if (cptvf_send_msg_to_pf_timeout(cptvf, &amp;mbx)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PF didn't respond to READY msg\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Communicate VQs size to PF to program CPT(0)_PF_Q(0-15)_CTL of the VF.</div><div class='add'>+ * Must be ACKed.</div><div class='add'>+ */</div><div class='add'>+int cptvf_send_vq_size_msg(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	struct cpt_mbox mbx = {};</div><div class='add'>+</div><div class='add'>+	mbx.msg = CPT_MSG_QLEN;</div><div class='add'>+	mbx.data = cptvf-&gt;qsize;</div><div class='add'>+	if (cptvf_send_msg_to_pf_timeout(cptvf, &amp;mbx)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PF didn't respond to vq_size msg\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Communicate VF group required to PF and get the VQ binded to that group</div><div class='add'>+ */</div><div class='add'>+int cptvf_send_vf_to_grp_msg(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	struct cpt_mbox mbx = {};</div><div class='add'>+</div><div class='add'>+	mbx.msg = CPT_MSG_QBIND_GRP;</div><div class='add'>+	/* Convey group of the VF */</div><div class='add'>+	mbx.data = cptvf-&gt;vfgrp;</div><div class='add'>+	if (cptvf_send_msg_to_pf_timeout(cptvf, &amp;mbx)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PF didn't respond to vf_type msg\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Communicate VF group required to PF and get the VQ binded to that group</div><div class='add'>+ */</div><div class='add'>+int cptvf_send_vf_priority_msg(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	struct cpt_mbox mbx = {};</div><div class='add'>+</div><div class='add'>+	mbx.msg = CPT_MSG_VQ_PRIORITY;</div><div class='add'>+	/* Convey group of the VF */</div><div class='add'>+	mbx.data = cptvf-&gt;priority;</div><div class='add'>+	if (cptvf_send_msg_to_pf_timeout(cptvf, &amp;mbx)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PF didn't respond to vf_type msg\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Communicate to PF that VF is UP and running</div><div class='add'>+ */</div><div class='add'>+int cptvf_send_vf_up(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	struct cpt_mbox mbx = {};</div><div class='add'>+</div><div class='add'>+	mbx.msg = CPT_MSG_VF_UP;</div><div class='add'>+	if (cptvf_send_msg_to_pf_timeout(cptvf, &amp;mbx)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PF didn't respond to UP msg\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Communicate to PF that VF is DOWN and running</div><div class='add'>+ */</div><div class='add'>+int cptvf_send_vf_down(struct cpt_vf *cptvf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	struct cpt_mbox mbx = {};</div><div class='add'>+</div><div class='add'>+	mbx.msg = CPT_MSG_VF_DOWN;</div><div class='add'>+	if (cptvf_send_msg_to_pf_timeout(cptvf, &amp;mbx)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PF didn't respond to DOWN msg\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/cptvf_reqmanager.c b/drivers/crypto/cavium/cpt/cptvf_reqmanager.c<br/>new file mode 100644<br/>index 000000000000..169e66231bcf<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/cptvf_reqmanager.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/cptvf_reqmanager.c</a></div><div class='hunk'>@@ -0,0 +1,593 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "cptvf.h"</div><div class='add'>+#include "request_manager.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * get_free_pending_entry - get free entry from pending queue</div><div class='add'>+ * @param pqinfo: pending_qinfo structure</div><div class='add'>+ * @param qno: queue number</div><div class='add'>+ */</div><div class='add'>+static struct pending_entry *get_free_pending_entry(struct pending_queue *q,</div><div class='add'>+						    int qlen)</div><div class='add'>+{</div><div class='add'>+	struct pending_entry *ent = NULL;</div><div class='add'>+</div><div class='add'>+	ent = &amp;q-&gt;head[q-&gt;rear];</div><div class='add'>+	if (unlikely(ent-&gt;busy)) {</div><div class='add'>+		ent = NULL;</div><div class='add'>+		goto no_free_entry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	q-&gt;rear++;</div><div class='add'>+	if (unlikely(q-&gt;rear == qlen))</div><div class='add'>+		q-&gt;rear = 0;</div><div class='add'>+</div><div class='add'>+no_free_entry:</div><div class='add'>+	return ent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pending_queue_inc_front(struct pending_qinfo *pqinfo,</div><div class='add'>+					   int qno)</div><div class='add'>+{</div><div class='add'>+	struct pending_queue *queue = &amp;pqinfo-&gt;queue[qno];</div><div class='add'>+</div><div class='add'>+	queue-&gt;front++;</div><div class='add'>+	if (unlikely(queue-&gt;front == pqinfo-&gt;qlen))</div><div class='add'>+		queue-&gt;front = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_sgio_components(struct cpt_vf *cptvf, struct buf_ptr *list,</div><div class='add'>+				 int buf_count, u8 *buffer)</div><div class='add'>+{</div><div class='add'>+	int ret = 0, i, j;</div><div class='add'>+	int components;</div><div class='add'>+	struct sglist_component *sg_ptr = NULL;</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!list)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Input List pointer is NULL\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; buf_count; i++) {</div><div class='add'>+		if (likely(list[i].vptr)) {</div><div class='add'>+			list[i].dma_addr = dma_map_single(&amp;pdev-&gt;dev,</div><div class='add'>+							  list[i].vptr,</div><div class='add'>+							  list[i].size,</div><div class='add'>+							  DMA_BIDIRECTIONAL);</div><div class='add'>+			if (unlikely(dma_mapping_error(&amp;pdev-&gt;dev,</div><div class='add'>+						       list[i].dma_addr))) {</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "DMA map kernel buffer failed for component: %d\n",</div><div class='add'>+					i);</div><div class='add'>+				ret = -EIO;</div><div class='add'>+				goto sg_cleanup;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	components = buf_count / 4;</div><div class='add'>+	sg_ptr = (struct sglist_component *)buffer;</div><div class='add'>+	for (i = 0; i &lt; components; i++) {</div><div class='add'>+		sg_ptr-&gt;u.s.len0 = cpu_to_be16(list[i * 4 + 0].size);</div><div class='add'>+		sg_ptr-&gt;u.s.len1 = cpu_to_be16(list[i * 4 + 1].size);</div><div class='add'>+		sg_ptr-&gt;u.s.len2 = cpu_to_be16(list[i * 4 + 2].size);</div><div class='add'>+		sg_ptr-&gt;u.s.len3 = cpu_to_be16(list[i * 4 + 3].size);</div><div class='add'>+		sg_ptr-&gt;ptr0 = cpu_to_be64(list[i * 4 + 0].dma_addr);</div><div class='add'>+		sg_ptr-&gt;ptr1 = cpu_to_be64(list[i * 4 + 1].dma_addr);</div><div class='add'>+		sg_ptr-&gt;ptr2 = cpu_to_be64(list[i * 4 + 2].dma_addr);</div><div class='add'>+		sg_ptr-&gt;ptr3 = cpu_to_be64(list[i * 4 + 3].dma_addr);</div><div class='add'>+		sg_ptr++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	components = buf_count % 4;</div><div class='add'>+</div><div class='add'>+	switch (components) {</div><div class='add'>+	case 3:</div><div class='add'>+		sg_ptr-&gt;u.s.len2 = cpu_to_be16(list[i * 4 + 2].size);</div><div class='add'>+		sg_ptr-&gt;ptr2 = cpu_to_be64(list[i * 4 + 2].dma_addr);</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case 2:</div><div class='add'>+		sg_ptr-&gt;u.s.len1 = cpu_to_be16(list[i * 4 + 1].size);</div><div class='add'>+		sg_ptr-&gt;ptr1 = cpu_to_be64(list[i * 4 + 1].dma_addr);</div><div class='add'>+		/* Fall through */</div><div class='add'>+	case 1:</div><div class='add'>+		sg_ptr-&gt;u.s.len0 = cpu_to_be16(list[i * 4 + 0].size);</div><div class='add'>+		sg_ptr-&gt;ptr0 = cpu_to_be64(list[i * 4 + 0].dma_addr);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+sg_cleanup:</div><div class='add'>+	for (j = 0; j &lt; i; j++) {</div><div class='add'>+		if (list[j].dma_addr) {</div><div class='add'>+			dma_unmap_single(&amp;pdev-&gt;dev, list[i].dma_addr,</div><div class='add'>+					 list[i].size, DMA_BIDIRECTIONAL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list[j].dma_addr = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int setup_sgio_list(struct cpt_vf *cptvf,</div><div class='add'>+				  struct cpt_info_buffer *info,</div><div class='add'>+				  struct cpt_request_info *req)</div><div class='add'>+{</div><div class='add'>+	u16 g_sz_bytes = 0, s_sz_bytes = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;incnt &gt; MAX_SG_IN_CNT || req-&gt;outcnt &gt; MAX_SG_OUT_CNT) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Request SG components are higher than supported\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto  scatter_gather_clean;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup gather (input) components */</div><div class='add'>+	g_sz_bytes = ((req-&gt;incnt + 3) / 4) * sizeof(struct sglist_component);</div><div class='add'>+	info-&gt;gather_components = kzalloc(g_sz_bytes, GFP_KERNEL);</div><div class='add'>+	if (!info-&gt;gather_components) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto  scatter_gather_clean;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = setup_sgio_components(cptvf, req-&gt;in,</div><div class='add'>+				    req-&gt;incnt,</div><div class='add'>+				    info-&gt;gather_components);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to setup gather list\n");</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto  scatter_gather_clean;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup scatter (output) components */</div><div class='add'>+	s_sz_bytes = ((req-&gt;outcnt + 3) / 4) * sizeof(struct sglist_component);</div><div class='add'>+	info-&gt;scatter_components = kzalloc(s_sz_bytes, GFP_KERNEL);</div><div class='add'>+	if (!info-&gt;scatter_components) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto  scatter_gather_clean;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = setup_sgio_components(cptvf, req-&gt;out,</div><div class='add'>+				    req-&gt;outcnt,</div><div class='add'>+				    info-&gt;scatter_components);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to setup gather list\n");</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto  scatter_gather_clean;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create and initialize DPTR */</div><div class='add'>+	info-&gt;dlen = g_sz_bytes + s_sz_bytes + SG_LIST_HDR_SIZE;</div><div class='add'>+	info-&gt;in_buffer = kzalloc(info-&gt;dlen, GFP_KERNEL);</div><div class='add'>+	if (!info-&gt;in_buffer) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto  scatter_gather_clean;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	((u16 *)info-&gt;in_buffer)[0] = req-&gt;outcnt;</div><div class='add'>+	((u16 *)info-&gt;in_buffer)[1] = req-&gt;incnt;</div><div class='add'>+	((u16 *)info-&gt;in_buffer)[2] = 0;</div><div class='add'>+	((u16 *)info-&gt;in_buffer)[3] = 0;</div><div class='add'>+	*(u64 *)info-&gt;in_buffer = cpu_to_be64p((u64 *)info-&gt;in_buffer);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;info-&gt;in_buffer[8], info-&gt;gather_components,</div><div class='add'>+	       g_sz_bytes);</div><div class='add'>+	memcpy(&amp;info-&gt;in_buffer[8 + g_sz_bytes],</div><div class='add'>+	       info-&gt;scatter_components, s_sz_bytes);</div><div class='add'>+</div><div class='add'>+	info-&gt;dptr_baddr = dma_map_single(&amp;pdev-&gt;dev,</div><div class='add'>+					  (void *)info-&gt;in_buffer,</div><div class='add'>+					  info-&gt;dlen,</div><div class='add'>+					  DMA_BIDIRECTIONAL);</div><div class='add'>+	if (dma_mapping_error(&amp;pdev-&gt;dev, info-&gt;dptr_baddr)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Mapping DPTR Failed %d\n", info-&gt;dlen);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto  scatter_gather_clean;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create and initialize RPTR */</div><div class='add'>+	info-&gt;out_buffer = kzalloc(COMPLETION_CODE_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!info-&gt;out_buffer) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto scatter_gather_clean;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*((u64 *)info-&gt;out_buffer) = ~((u64)COMPLETION_CODE_INIT);</div><div class='add'>+	info-&gt;alternate_caddr = (u64 *)info-&gt;out_buffer;</div><div class='add'>+	info-&gt;rptr_baddr = dma_map_single(&amp;pdev-&gt;dev,</div><div class='add'>+					  (void *)info-&gt;out_buffer,</div><div class='add'>+					  COMPLETION_CODE_SIZE,</div><div class='add'>+					  DMA_BIDIRECTIONAL);</div><div class='add'>+	if (dma_mapping_error(&amp;pdev-&gt;dev, info-&gt;rptr_baddr)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Mapping RPTR Failed %d\n",</div><div class='add'>+			COMPLETION_CODE_SIZE);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto  scatter_gather_clean;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+scatter_gather_clean:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int send_cpt_command(struct cpt_vf *cptvf, union cpt_inst_s *cmd,</div><div class='add'>+		     u32 qno)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	struct command_qinfo *qinfo = NULL;</div><div class='add'>+	struct command_queue *queue;</div><div class='add'>+	struct command_chunk *chunk;</div><div class='add'>+	u8 *ent;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(qno &gt;= cptvf-&gt;nr_queues)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Invalid queue (qno: %d, nr_queues: %d)\n",</div><div class='add'>+			qno, cptvf-&gt;nr_queues);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qinfo = &amp;cptvf-&gt;cqinfo;</div><div class='add'>+	queue = &amp;qinfo-&gt;queue[qno];</div><div class='add'>+	/* lock commad queue */</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	ent = &amp;queue-&gt;qhead-&gt;head[queue-&gt;idx * qinfo-&gt;cmd_size];</div><div class='add'>+	memcpy(ent, (void *)cmd, qinfo-&gt;cmd_size);</div><div class='add'>+</div><div class='add'>+	if (++queue-&gt;idx &gt;= queue-&gt;qhead-&gt;size / 64) {</div><div class='add'>+		struct hlist_node *node;</div><div class='add'>+</div><div class='add'>+		hlist_for_each(node, &amp;queue-&gt;chead) {</div><div class='add'>+			chunk = hlist_entry(node, struct command_chunk,</div><div class='add'>+					    nextchunk);</div><div class='add'>+			if (chunk == queue-&gt;qhead) {</div><div class='add'>+				continue;</div><div class='add'>+			} else {</div><div class='add'>+				queue-&gt;qhead = chunk;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		queue-&gt;idx = 0;</div><div class='add'>+	}</div><div class='add'>+	/* make sure all memory stores are done before ringing doorbell */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	cptvf_write_vq_doorbell(cptvf, 1);</div><div class='add'>+	/* unlock command queue */</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void do_request_cleanup(struct cpt_vf *cptvf,</div><div class='add'>+			struct cpt_info_buffer *info)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	struct cpt_request_info *req;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;dptr_baddr)</div><div class='add'>+		dma_unmap_single(&amp;pdev-&gt;dev, info-&gt;dptr_baddr,</div><div class='add'>+				 info-&gt;dlen, DMA_BIDIRECTIONAL);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;rptr_baddr)</div><div class='add'>+		dma_unmap_single(&amp;pdev-&gt;dev, info-&gt;rptr_baddr,</div><div class='add'>+				 COMPLETION_CODE_SIZE, DMA_BIDIRECTIONAL);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;comp_baddr)</div><div class='add'>+		dma_unmap_single(&amp;pdev-&gt;dev, info-&gt;comp_baddr,</div><div class='add'>+				 sizeof(union cpt_res_s), DMA_BIDIRECTIONAL);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;req) {</div><div class='add'>+		req = info-&gt;req;</div><div class='add'>+		for (i = 0; i &lt; req-&gt;outcnt; i++) {</div><div class='add'>+			if (req-&gt;out[i].dma_addr)</div><div class='add'>+				dma_unmap_single(&amp;pdev-&gt;dev,</div><div class='add'>+						 req-&gt;out[i].dma_addr,</div><div class='add'>+						 req-&gt;out[i].size,</div><div class='add'>+						 DMA_BIDIRECTIONAL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; req-&gt;incnt; i++) {</div><div class='add'>+			if (req-&gt;in[i].dma_addr)</div><div class='add'>+				dma_unmap_single(&amp;pdev-&gt;dev,</div><div class='add'>+						 req-&gt;in[i].dma_addr,</div><div class='add'>+						 req-&gt;in[i].size,</div><div class='add'>+						 DMA_BIDIRECTIONAL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;scatter_components)</div><div class='add'>+		kzfree(info-&gt;scatter_components);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;gather_components)</div><div class='add'>+		kzfree(info-&gt;gather_components);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;out_buffer)</div><div class='add'>+		kzfree(info-&gt;out_buffer);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;in_buffer)</div><div class='add'>+		kzfree(info-&gt;in_buffer);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;completion_addr)</div><div class='add'>+		kzfree((void *)info-&gt;completion_addr);</div><div class='add'>+</div><div class='add'>+	kzfree(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void do_post_process(struct cpt_vf *cptvf, struct cpt_info_buffer *info)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	if (!info) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "incorrect cpt_info_buffer for post processing\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	do_request_cleanup(cptvf, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void process_pending_queue(struct cpt_vf *cptvf,</div><div class='add'>+					 struct pending_qinfo *pqinfo,</div><div class='add'>+					 int qno)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	struct pending_queue *pqueue = &amp;pqinfo-&gt;queue[qno];</div><div class='add'>+	struct pending_entry *pentry = NULL;</div><div class='add'>+	struct cpt_info_buffer *info = NULL;</div><div class='add'>+	union cpt_res_s *status = NULL;</div><div class='add'>+	unsigned char ccode;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		spin_lock_bh(&amp;pqueue-&gt;lock);</div><div class='add'>+		pentry = &amp;pqueue-&gt;head[pqueue-&gt;front];</div><div class='add'>+		if (unlikely(!pentry-&gt;busy)) {</div><div class='add'>+			spin_unlock_bh(&amp;pqueue-&gt;lock);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info = (struct cpt_info_buffer *)pentry-&gt;post_arg;</div><div class='add'>+		if (unlikely(!info)) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Pending Entry post arg NULL\n");</div><div class='add'>+			pending_queue_inc_front(pqinfo, qno);</div><div class='add'>+			spin_unlock_bh(&amp;pqueue-&gt;lock);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		status = (union cpt_res_s *)pentry-&gt;completion_addr;</div><div class='add'>+		ccode = status-&gt;s.compcode;</div><div class='add'>+		if ((status-&gt;s.compcode == CPT_COMP_E_FAULT) ||</div><div class='add'>+		    (status-&gt;s.compcode == CPT_COMP_E_SWERR)) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Request failed with %s\n",</div><div class='add'>+				(status-&gt;s.compcode == CPT_COMP_E_FAULT) ?</div><div class='add'>+				"DMA Fault" : "Software error");</div><div class='add'>+			pentry-&gt;completion_addr = NULL;</div><div class='add'>+			pentry-&gt;busy = false;</div><div class='add'>+			atomic64_dec((&amp;pqueue-&gt;pending_count));</div><div class='add'>+			pentry-&gt;post_arg = NULL;</div><div class='add'>+			pending_queue_inc_front(pqinfo, qno);</div><div class='add'>+			do_request_cleanup(cptvf, info);</div><div class='add'>+			spin_unlock_bh(&amp;pqueue-&gt;lock);</div><div class='add'>+			break;</div><div class='add'>+		} else if (status-&gt;s.compcode == COMPLETION_CODE_INIT) {</div><div class='add'>+			/* check for timeout */</div><div class='add'>+			if (time_after_eq(jiffies,</div><div class='add'>+					  (info-&gt;time_in +</div><div class='add'>+					  (CPT_COMMAND_TIMEOUT * HZ)))) {</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "Request timed out");</div><div class='add'>+				pentry-&gt;completion_addr = NULL;</div><div class='add'>+				pentry-&gt;busy = false;</div><div class='add'>+				atomic64_dec((&amp;pqueue-&gt;pending_count));</div><div class='add'>+				pentry-&gt;post_arg = NULL;</div><div class='add'>+				pending_queue_inc_front(pqinfo, qno);</div><div class='add'>+				do_request_cleanup(cptvf, info);</div><div class='add'>+				spin_unlock_bh(&amp;pqueue-&gt;lock);</div><div class='add'>+				break;</div><div class='add'>+			} else if ((*info-&gt;alternate_caddr ==</div><div class='add'>+				(~COMPLETION_CODE_INIT)) &amp;&amp;</div><div class='add'>+				(info-&gt;extra_time &lt; TIME_IN_RESET_COUNT)) {</div><div class='add'>+				info-&gt;time_in = jiffies;</div><div class='add'>+				info-&gt;extra_time++;</div><div class='add'>+				spin_unlock_bh(&amp;pqueue-&gt;lock);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pentry-&gt;completion_addr = NULL;</div><div class='add'>+		pentry-&gt;busy = false;</div><div class='add'>+		pentry-&gt;post_arg = NULL;</div><div class='add'>+		atomic64_dec((&amp;pqueue-&gt;pending_count));</div><div class='add'>+		pending_queue_inc_front(pqinfo, qno);</div><div class='add'>+		spin_unlock_bh(&amp;pqueue-&gt;lock);</div><div class='add'>+</div><div class='add'>+		do_post_process(info-&gt;cptvf, info);</div><div class='add'>+		/*</div><div class='add'>+		 * Calling callback after we find</div><div class='add'>+		 * that the request has been serviced</div><div class='add'>+		 */</div><div class='add'>+		pentry-&gt;callback(ccode, pentry-&gt;callback_arg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int process_request(struct cpt_vf *cptvf, struct cpt_request_info *req)</div><div class='add'>+{</div><div class='add'>+	int ret = 0, clear = 0, queue = 0;</div><div class='add'>+	struct cpt_info_buffer *info = NULL;</div><div class='add'>+	struct cptvf_request *cpt_req = NULL;</div><div class='add'>+	union ctrl_info *ctrl = NULL;</div><div class='add'>+	union cpt_res_s *result = NULL;</div><div class='add'>+	struct pending_entry *pentry = NULL;</div><div class='add'>+	struct pending_queue *pqueue = NULL;</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+	u8 group = 0;</div><div class='add'>+	struct cpt_vq_command vq_cmd;</div><div class='add'>+	union cpt_inst_s cptinst;</div><div class='add'>+</div><div class='add'>+	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (unlikely(!info)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to allocate memory for info_buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpt_req = (struct cptvf_request *)&amp;req-&gt;req;</div><div class='add'>+	ctrl = (union ctrl_info *)&amp;req-&gt;ctrl;</div><div class='add'>+</div><div class='add'>+	info-&gt;cptvf = cptvf;</div><div class='add'>+	group = ctrl-&gt;s.grp;</div><div class='add'>+	ret = setup_sgio_list(cptvf, info, req);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Setting up SG list failed");</div><div class='add'>+		goto request_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpt_req-&gt;dlen = info-&gt;dlen;</div><div class='add'>+	/*</div><div class='add'>+	 * Get buffer for union cpt_res_s response</div><div class='add'>+	 * structure and its physical address</div><div class='add'>+	 */</div><div class='add'>+	info-&gt;completion_addr = kzalloc(sizeof(union cpt_res_s), GFP_KERNEL);</div><div class='add'>+	if (unlikely(!info-&gt;completion_addr)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to allocate memory for completion_addr\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = (union cpt_res_s *)info-&gt;completion_addr;</div><div class='add'>+	result-&gt;s.compcode = COMPLETION_CODE_INIT;</div><div class='add'>+	info-&gt;comp_baddr = dma_map_single(&amp;pdev-&gt;dev,</div><div class='add'>+					       (void *)info-&gt;completion_addr,</div><div class='add'>+					       sizeof(union cpt_res_s),</div><div class='add'>+					       DMA_BIDIRECTIONAL);</div><div class='add'>+	if (dma_mapping_error(&amp;pdev-&gt;dev, info-&gt;comp_baddr)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "mapping compptr Failed %lu\n",</div><div class='add'>+			sizeof(union cpt_res_s));</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto  request_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fill the VQ command */</div><div class='add'>+	vq_cmd.cmd.u64 = 0;</div><div class='add'>+	vq_cmd.cmd.s.opcode = cpu_to_be16(cpt_req-&gt;opcode.flags);</div><div class='add'>+	vq_cmd.cmd.s.param1 = cpu_to_be16(cpt_req-&gt;param1);</div><div class='add'>+	vq_cmd.cmd.s.param2 = cpu_to_be16(cpt_req-&gt;param2);</div><div class='add'>+	vq_cmd.cmd.s.dlen   = cpu_to_be16(cpt_req-&gt;dlen);</div><div class='add'>+</div><div class='add'>+	/* 64-bit swap for microcode data reads, not needed for addresses*/</div><div class='add'>+	vq_cmd.cmd.u64 = cpu_to_be64(vq_cmd.cmd.u64);</div><div class='add'>+	vq_cmd.dptr = info-&gt;dptr_baddr;</div><div class='add'>+	vq_cmd.rptr = info-&gt;rptr_baddr;</div><div class='add'>+	vq_cmd.cptr.u64 = 0;</div><div class='add'>+	vq_cmd.cptr.s.grp = group;</div><div class='add'>+	/* Get Pending Entry to submit command */</div><div class='add'>+	/* Always queue 0, because 1 queue per VF */</div><div class='add'>+	queue = 0;</div><div class='add'>+	pqueue = &amp;cptvf-&gt;pqinfo.queue[queue];</div><div class='add'>+</div><div class='add'>+	if (atomic64_read(&amp;pqueue-&gt;pending_count) &gt; PENDING_THOLD) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "pending threshold reached\n");</div><div class='add'>+		process_pending_queue(cptvf, &amp;cptvf-&gt;pqinfo, queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+get_pending_entry:</div><div class='add'>+	spin_lock_bh(&amp;pqueue-&gt;lock);</div><div class='add'>+	pentry = get_free_pending_entry(pqueue, cptvf-&gt;pqinfo.qlen);</div><div class='add'>+	if (unlikely(!pentry)) {</div><div class='add'>+		spin_unlock_bh(&amp;pqueue-&gt;lock);</div><div class='add'>+		if (clear == 0) {</div><div class='add'>+			process_pending_queue(cptvf, &amp;cptvf-&gt;pqinfo, queue);</div><div class='add'>+			clear = 1;</div><div class='add'>+			goto get_pending_entry;</div><div class='add'>+		}</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Get free entry failed\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "queue: %d, rear: %d, front: %d\n",</div><div class='add'>+			queue, pqueue-&gt;rear, pqueue-&gt;front);</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto request_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pentry-&gt;completion_addr = info-&gt;completion_addr;</div><div class='add'>+	pentry-&gt;post_arg = (void *)info;</div><div class='add'>+	pentry-&gt;callback = req-&gt;callback;</div><div class='add'>+	pentry-&gt;callback_arg = req-&gt;callback_arg;</div><div class='add'>+	info-&gt;pentry = pentry;</div><div class='add'>+	pentry-&gt;busy = true;</div><div class='add'>+	atomic64_inc(&amp;pqueue-&gt;pending_count);</div><div class='add'>+</div><div class='add'>+	/* Send CPT command */</div><div class='add'>+	info-&gt;pentry = pentry;</div><div class='add'>+	info-&gt;time_in = jiffies;</div><div class='add'>+	info-&gt;req = req;</div><div class='add'>+</div><div class='add'>+	/* Create the CPT_INST_S type command for HW intrepretation */</div><div class='add'>+	cptinst.s.doneint = true;</div><div class='add'>+	cptinst.s.res_addr = (u64)info-&gt;comp_baddr;</div><div class='add'>+	cptinst.s.tag = 0;</div><div class='add'>+	cptinst.s.grp = 0;</div><div class='add'>+	cptinst.s.wq_ptr = 0;</div><div class='add'>+	cptinst.s.ei0 = vq_cmd.cmd.u64;</div><div class='add'>+	cptinst.s.ei1 = vq_cmd.dptr;</div><div class='add'>+	cptinst.s.ei2 = vq_cmd.rptr;</div><div class='add'>+	cptinst.s.ei3 = vq_cmd.cptr.u64;</div><div class='add'>+</div><div class='add'>+	ret = send_cpt_command(cptvf, &amp;cptinst, queue);</div><div class='add'>+	spin_unlock_bh(&amp;pqueue-&gt;lock);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Send command failed for AE\n");</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto request_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+request_cleanup:</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "Failed to submit CPT command\n");</div><div class='add'>+	do_request_cleanup(cptvf, info);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vq_post_process(struct cpt_vf *cptvf, u32 qno)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	if (unlikely(qno &gt; cptvf-&gt;nr_queues)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Request for post processing on invalid pending queue: %u\n",</div><div class='add'>+			qno);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	process_pending_queue(cptvf, &amp;cptvf-&gt;pqinfo, qno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cptvf_do_request(void *vfdev, struct cpt_request_info *req)</div><div class='add'>+{</div><div class='add'>+	struct cpt_vf *cptvf = (struct cpt_vf *)vfdev;</div><div class='add'>+	struct pci_dev *pdev = cptvf-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	if (!cpt_device_ready(cptvf)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "CPT Device is not ready");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((cptvf-&gt;vftype == SE_TYPES) &amp;&amp; (!req-&gt;ctrl.s.se_req)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "CPTVF-%d of SE TYPE got AE request",</div><div class='add'>+			cptvf-&gt;vfid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if ((cptvf-&gt;vftype == AE_TYPES) &amp;&amp; (req-&gt;ctrl.s.se_req)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "CPTVF-%d of AE TYPE got SE request",</div><div class='add'>+			cptvf-&gt;vfid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return process_request(cptvf, req);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/crypto/cavium/cpt/request_manager.h b/drivers/crypto/cavium/cpt/request_manager.h<br/>new file mode 100644<br/>index 000000000000..80ee074c6e0c<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/cavium/cpt/request_manager.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/cavium/cpt/request_manager.h</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Cavium, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __REQUEST_MANAGER_H</div><div class='add'>+#define __REQUEST_MANAGER_H</div><div class='add'>+</div><div class='add'>+#include "cpt_common.h"</div><div class='add'>+</div><div class='add'>+#define TIME_IN_RESET_COUNT  5</div><div class='add'>+#define COMPLETION_CODE_SIZE 8</div><div class='add'>+#define COMPLETION_CODE_INIT 0</div><div class='add'>+#define PENDING_THOLD  100</div><div class='add'>+#define MAX_SG_IN_CNT 12</div><div class='add'>+#define MAX_SG_OUT_CNT 13</div><div class='add'>+#define SG_LIST_HDR_SIZE  8</div><div class='add'>+#define MAX_BUF_CNT	16</div><div class='add'>+</div><div class='add'>+union ctrl_info {</div><div class='add'>+	u32 flags;</div><div class='add'>+	struct {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD)</div><div class='add'>+		u32 reserved0:26;</div><div class='add'>+		u32 grp:3; /* Group bits */</div><div class='add'>+		u32 dma_mode:2; /* DMA mode */</div><div class='add'>+		u32 se_req:1;/* To SE core */</div><div class='add'>+#else</div><div class='add'>+		u32 se_req:1; /* To SE core */</div><div class='add'>+		u32 dma_mode:2; /* DMA mode */</div><div class='add'>+		u32 grp:3; /* Group bits */</div><div class='add'>+		u32 reserved0:26;</div><div class='add'>+#endif</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union opcode_info {</div><div class='add'>+	u16 flags;</div><div class='add'>+	struct {</div><div class='add'>+		u8 major;</div><div class='add'>+		u8 minor;</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cptvf_request {</div><div class='add'>+	union opcode_info opcode;</div><div class='add'>+	u16 param1;</div><div class='add'>+	u16 param2;</div><div class='add'>+	u16 dlen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct buf_ptr {</div><div class='add'>+	u8 *vptr;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	u16 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpt_request_info {</div><div class='add'>+	u8 incnt; /* Number of input buffers */</div><div class='add'>+	u8 outcnt; /* Number of output buffers */</div><div class='add'>+	u16 rlen; /* Output length */</div><div class='add'>+	union ctrl_info ctrl; /* User control information */</div><div class='add'>+	struct cptvf_request req; /* Request Information (Core specific) */</div><div class='add'>+</div><div class='add'>+	struct buf_ptr in[MAX_BUF_CNT];</div><div class='add'>+	struct buf_ptr out[MAX_BUF_CNT];</div><div class='add'>+</div><div class='add'>+	void (*callback)(int, void *); /* Kernel ASYNC request callabck */</div><div class='add'>+	void *callback_arg; /* Kernel ASYNC request callabck arg */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sglist_component {</div><div class='add'>+	union {</div><div class='add'>+		u64 len;</div><div class='add'>+		struct {</div><div class='add'>+			u16 len0;</div><div class='add'>+			u16 len1;</div><div class='add'>+			u16 len2;</div><div class='add'>+			u16 len3;</div><div class='add'>+		} s;</div><div class='add'>+	} u;</div><div class='add'>+	u64 ptr0;</div><div class='add'>+	u64 ptr1;</div><div class='add'>+	u64 ptr2;</div><div class='add'>+	u64 ptr3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpt_info_buffer {</div><div class='add'>+	struct cpt_vf *cptvf;</div><div class='add'>+	unsigned long time_in;</div><div class='add'>+	u8 extra_time;</div><div class='add'>+</div><div class='add'>+	struct cpt_request_info *req;</div><div class='add'>+	dma_addr_t dptr_baddr;</div><div class='add'>+	u32 dlen;</div><div class='add'>+	dma_addr_t rptr_baddr;</div><div class='add'>+	dma_addr_t comp_baddr;</div><div class='add'>+	u8 *in_buffer;</div><div class='add'>+	u8 *out_buffer;</div><div class='add'>+	u8 *gather_components;</div><div class='add'>+	u8 *scatter_components;</div><div class='add'>+</div><div class='add'>+	struct pending_entry *pentry;</div><div class='add'>+	volatile u64 *completion_addr;</div><div class='add'>+	volatile u64 *alternate_caddr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CPT_INST_S software command definitions</div><div class='add'>+ * Words EI (0-3)</div><div class='add'>+ */</div><div class='add'>+union vq_cmd_word0 {</div><div class='add'>+	u64 u64;</div><div class='add'>+	struct {</div><div class='add'>+		u16 opcode;</div><div class='add'>+		u16 param1;</div><div class='add'>+		u16 param2;</div><div class='add'>+		u16 dlen;</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union vq_cmd_word3 {</div><div class='add'>+	u64 u64;</div><div class='add'>+	struct {</div><div class='add'>+#if defined(__BIG_ENDIAN_BITFIELD)</div><div class='add'>+		u64 grp:3;</div><div class='add'>+		u64 cptr:61;</div><div class='add'>+#else</div><div class='add'>+		u64 cptr:61;</div><div class='add'>+		u64 grp:3;</div><div class='add'>+#endif</div><div class='add'>+	} s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cpt_vq_command {</div><div class='add'>+	union vq_cmd_word0 cmd;</div><div class='add'>+	u64 dptr;</div><div class='add'>+	u64 rptr;</div><div class='add'>+	union vq_cmd_word3 cptr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void vq_post_process(struct cpt_vf *cptvf, u32 qno);</div><div class='add'>+int process_request(struct cpt_vf *cptvf, struct cpt_request_info *req);</div><div class='add'>+#endif /* __REQUEST_MANAGER_H */</div><div class='head'>diff --git a/drivers/crypto/ccp/ccp-dev-v3.c b/drivers/crypto/ccp/ccp-dev-v3.c<br/>index 8d2dbacc6161..7bc09989e18a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-dev-v3.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/ccp/ccp-dev-v3.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-dev-v3.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-dev-v3.c</a></div><div class='hunk'>@@ -404,10 +404,6 @@ static int ccp_init(struct ccp_device *ccp)</div><div class='ctx'> 		goto e_pool;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Initialize the queues used to wait for KSB space and suspend */</div><div class='del'>-	init_waitqueue_head(&amp;ccp-&gt;sb_queue);</div><div class='del'>-	init_waitqueue_head(&amp;ccp-&gt;suspend_queue);</div><div class='del'>-</div><div class='ctx'> 	dev_dbg(dev, "Starting threads...\n");</div><div class='ctx'> 	/* Create a kthread for each queue */</div><div class='ctx'> 	for (i = 0; i &lt; ccp-&gt;cmd_q_count; i++) {</div><div class='head'>diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c<br/>index faf3cb3ddce2..41cc853f8569 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-dev-v5.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/ccp/ccp-dev-v5.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-dev-v5.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-dev-v5.c</a></div><div class='hunk'>@@ -21,6 +21,12 @@</div><div class='ctx'> </div><div class='ctx'> #include "ccp-dev.h"</div><div class='ctx'> </div><div class='add'>+/* Allocate the requested number of contiguous LSB slots</div><div class='add'>+ * from the LSB bitmap. Look in the private range for this</div><div class='add'>+ * queue first; failing that, check the public area.</div><div class='add'>+ * If no space is available, wait around.</div><div class='add'>+ * Return: first slot number</div><div class='add'>+ */</div><div class='ctx'> static u32 ccp_lsb_alloc(struct ccp_cmd_queue *cmd_q, unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccp_device *ccp;</div><div class='hunk'>@@ -50,7 +56,7 @@ static u32 ccp_lsb_alloc(struct ccp_cmd_queue *cmd_q, unsigned int count)</div><div class='ctx'> 			bitmap_set(ccp-&gt;lsbmap, start, count);</div><div class='ctx'> </div><div class='ctx'> 			mutex_unlock(&amp;ccp-&gt;sb_mutex);</div><div class='del'>-			return start * LSB_ITEM_SIZE;</div><div class='add'>+			return start;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ccp-&gt;sb_avail = 0;</div><div class='hunk'>@@ -63,17 +69,18 @@ static u32 ccp_lsb_alloc(struct ccp_cmd_queue *cmd_q, unsigned int count)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Free a number of LSB slots from the bitmap, starting at</div><div class='add'>+ * the indicated starting slot number.</div><div class='add'>+ */</div><div class='ctx'> static void ccp_lsb_free(struct ccp_cmd_queue *cmd_q, unsigned int start,</div><div class='ctx'> 			 unsigned int count)</div><div class='ctx'> {</div><div class='del'>-	int lsbno = start / LSB_SIZE;</div><div class='del'>-</div><div class='ctx'> 	if (!start)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (cmd_q-&gt;lsb == lsbno) {</div><div class='add'>+	if (cmd_q-&gt;lsb == start) {</div><div class='ctx'> 		/* An entry from the private LSB */</div><div class='del'>-		bitmap_clear(cmd_q-&gt;lsbmap, start % LSB_SIZE, count);</div><div class='add'>+		bitmap_clear(cmd_q-&gt;lsbmap, start, count);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* From the shared LSBs */</div><div class='ctx'> 		struct ccp_device *ccp = cmd_q-&gt;ccp;</div><div class='hunk'>@@ -243,17 +250,20 @@ static int ccp5_do_cmd(struct ccp5_desc *desc,</div><div class='ctx'> 		ret = wait_event_interruptible(cmd_q-&gt;int_queue,</div><div class='ctx'> 					       cmd_q-&gt;int_rcvd);</div><div class='ctx'> 		if (ret || cmd_q-&gt;cmd_error) {</div><div class='add'>+			/* Log the error and flush the queue by</div><div class='add'>+			 * moving the head pointer</div><div class='add'>+			 */</div><div class='ctx'> 			if (cmd_q-&gt;cmd_error)</div><div class='ctx'> 				ccp_log_error(cmd_q-&gt;ccp,</div><div class='ctx'> 					      cmd_q-&gt;cmd_error);</div><div class='del'>-			/* A version 5 device doesn't use Job IDs... */</div><div class='add'>+			iowrite32(tail, cmd_q-&gt;reg_head_lo);</div><div class='ctx'> 			if (!ret)</div><div class='ctx'> 				ret = -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		cmd_q-&gt;int_rcvd = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ccp5_perform_aes(struct ccp_op *op)</div><div class='hunk'>@@ -277,8 +287,7 @@ static int ccp5_perform_aes(struct ccp_op *op)</div><div class='ctx'> 	CCP_AES_ENCRYPT(&amp;function) = op-&gt;u.aes.action;</div><div class='ctx'> 	CCP_AES_MODE(&amp;function) = op-&gt;u.aes.mode;</div><div class='ctx'> 	CCP_AES_TYPE(&amp;function) = op-&gt;u.aes.type;</div><div class='del'>-	if (op-&gt;u.aes.mode == CCP_AES_MODE_CFB)</div><div class='del'>-		CCP_AES_SIZE(&amp;function) = 0x7f;</div><div class='add'>+	CCP_AES_SIZE(&amp;function) = op-&gt;u.aes.size;</div><div class='ctx'> </div><div class='ctx'> 	CCP5_CMD_FUNCTION(&amp;desc) = function.raw;</div><div class='ctx'> </div><div class='hunk'>@@ -396,7 +405,7 @@ static int ccp5_perform_rsa(struct ccp_op *op)</div><div class='ctx'> 	CCP5_CMD_PROT(&amp;desc) = 0;</div><div class='ctx'> </div><div class='ctx'> 	function.raw = 0;</div><div class='del'>-	CCP_RSA_SIZE(&amp;function) = op-&gt;u.rsa.mod_size;</div><div class='add'>+	CCP_RSA_SIZE(&amp;function) = op-&gt;u.rsa.mod_size &gt;&gt; 3;</div><div class='ctx'> 	CCP5_CMD_FUNCTION(&amp;desc) = function.raw;</div><div class='ctx'> </div><div class='ctx'> 	CCP5_CMD_LEN(&amp;desc) = op-&gt;u.rsa.input_len;</div><div class='hunk'>@@ -411,10 +420,10 @@ static int ccp5_perform_rsa(struct ccp_op *op)</div><div class='ctx'> 	CCP5_CMD_DST_HI(&amp;desc) = ccp_addr_hi(&amp;op-&gt;dst.u.dma);</div><div class='ctx'> 	CCP5_CMD_DST_MEM(&amp;desc) = CCP_MEMTYPE_SYSTEM;</div><div class='ctx'> </div><div class='del'>-	/* Key (Exponent) is in external memory */</div><div class='del'>-	CCP5_CMD_KEY_LO(&amp;desc) = ccp_addr_lo(&amp;op-&gt;exp.u.dma);</div><div class='del'>-	CCP5_CMD_KEY_HI(&amp;desc) = ccp_addr_hi(&amp;op-&gt;exp.u.dma);</div><div class='del'>-	CCP5_CMD_KEY_MEM(&amp;desc) = CCP_MEMTYPE_SYSTEM;</div><div class='add'>+	/* Exponent is in LSB memory */</div><div class='add'>+	CCP5_CMD_KEY_LO(&amp;desc) = op-&gt;sb_key * LSB_ITEM_SIZE;</div><div class='add'>+	CCP5_CMD_KEY_HI(&amp;desc) = 0;</div><div class='add'>+	CCP5_CMD_KEY_MEM(&amp;desc) = CCP_MEMTYPE_SB;</div><div class='ctx'> </div><div class='ctx'> 	return ccp5_do_cmd(&amp;desc, op-&gt;cmd_q);</div><div class='ctx'> }</div><div class='hunk'>@@ -525,7 +534,7 @@ static int ccp_find_lsb_regions(struct ccp_cmd_queue *cmd_q, u64 status)</div><div class='ctx'> 		status &gt;&gt;= LSB_REGION_WIDTH;</div><div class='ctx'> 	}</div><div class='ctx'> 	queues = bitmap_weight(cmd_q-&gt;lsbmask, MAX_LSB_CNT);</div><div class='del'>-	dev_info(cmd_q-&gt;ccp-&gt;dev, "Queue %d can access %d LSB regions\n",</div><div class='add'>+	dev_dbg(cmd_q-&gt;ccp-&gt;dev, "Queue %d can access %d LSB regions\n",</div><div class='ctx'> 		 cmd_q-&gt;id, queues);</div><div class='ctx'> </div><div class='ctx'> 	return queues ? 0 : -EINVAL;</div><div class='hunk'>@@ -567,7 +576,7 @@ static int ccp_find_and_assign_lsb_to_q(struct ccp_device *ccp,</div><div class='ctx'> 					 */</div><div class='ctx'> 					cmd_q-&gt;lsb = bitno;</div><div class='ctx'> 					bitmap_clear(lsb_pub, bitno, 1);</div><div class='del'>-					dev_info(ccp-&gt;dev,</div><div class='add'>+					dev_dbg(ccp-&gt;dev,</div><div class='ctx'> 						 "Queue %d gets LSB %d\n",</div><div class='ctx'> 						 i, bitno);</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -725,7 +734,6 @@ static int ccp5_init(struct ccp_device *ccp)</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto e_pool;</div><div class='ctx'> 	}</div><div class='del'>-	dev_notice(dev, "%u command queues available\n", ccp-&gt;cmd_q_count);</div><div class='ctx'> </div><div class='ctx'> 	/* Turn off the queues and disable interrupts until ready */</div><div class='ctx'> 	for (i = 0; i &lt; ccp-&gt;cmd_q_count; i++) {</div><div class='hunk'>@@ -751,9 +759,6 @@ static int ccp5_init(struct ccp_device *ccp)</div><div class='ctx'> 		goto e_pool;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Initialize the queue used to suspend */</div><div class='del'>-	init_waitqueue_head(&amp;ccp-&gt;suspend_queue);</div><div class='del'>-</div><div class='ctx'> 	dev_dbg(dev, "Loading LSB map...\n");</div><div class='ctx'> 	/* Copy the private LSB mask to the public registers */</div><div class='ctx'> 	status_lo = ioread32(ccp-&gt;io_regs + LSB_PRIVATE_MASK_LO_OFFSET);</div><div class='hunk'>@@ -955,7 +960,7 @@ static irqreturn_t ccp5_irq_handler(int irq, void *data)</div><div class='ctx'> static void ccp5_config(struct ccp_device *ccp)</div><div class='ctx'> {</div><div class='ctx'> 	/* Public side */</div><div class='del'>-	iowrite32(0x00001249, ccp-&gt;io_regs + CMD5_REQID_CONFIG_OFFSET);</div><div class='add'>+	iowrite32(0x0, ccp-&gt;io_regs + CMD5_REQID_CONFIG_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ccp5other_config(struct ccp_device *ccp)</div><div class='head'>diff --git a/drivers/crypto/ccp/ccp-dev.c b/drivers/crypto/ccp/ccp-dev.c<br/>index cafa633aae10..511ab042b5e7 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-dev.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/ccp/ccp-dev.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-dev.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-dev.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ struct ccp_tasklet_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Human-readable error strings */</div><div class='del'>-char *ccp_error_codes[] = {</div><div class='add'>+static char *ccp_error_codes[] = {</div><div class='ctx'> 	"",</div><div class='ctx'> 	"ERR 01: ILLEGAL_ENGINE",</div><div class='ctx'> 	"ERR 02: ILLEGAL_KEY_ID",</div><div class='hunk'>@@ -478,6 +478,10 @@ struct ccp_device *ccp_alloc_struct(struct device *dev)</div><div class='ctx'> 	ccp-&gt;sb_count = KSB_COUNT;</div><div class='ctx'> 	ccp-&gt;sb_start = 0;</div><div class='ctx'> </div><div class='add'>+	/* Initialize the wait queues */</div><div class='add'>+	init_waitqueue_head(&amp;ccp-&gt;sb_queue);</div><div class='add'>+	init_waitqueue_head(&amp;ccp-&gt;suspend_queue);</div><div class='add'>+</div><div class='ctx'> 	ccp-&gt;ord = ccp_increment_unit_ordinal();</div><div class='ctx'> 	snprintf(ccp-&gt;name, MAX_CCP_NAME_LEN, "ccp-%u", ccp-&gt;ord);</div><div class='ctx'> 	snprintf(ccp-&gt;rngname, MAX_CCP_NAME_LEN, "ccp-%u-rng", ccp-&gt;ord);</div><div class='head'>diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h<br/>index da5f4a678083..2b5c01fade05 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-dev.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/ccp/ccp-dev.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-dev.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-dev.h</a></div><div class='hunk'>@@ -238,6 +238,7 @@ struct ccp_dma_chan {</div><div class='ctx'> 	struct ccp_device *ccp;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t lock;</div><div class='add'>+	struct list_head created;</div><div class='ctx'> 	struct list_head pending;</div><div class='ctx'> 	struct list_head active;</div><div class='ctx'> 	struct list_head complete;</div><div class='hunk'>@@ -278,7 +279,7 @@ struct ccp_cmd_queue {</div><div class='ctx'> 	/* Private LSB that is assigned to this queue, or -1 if none.</div><div class='ctx'> 	 * Bitmap for my private LSB, unused otherwise</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned int lsb;</div><div class='add'>+	int lsb;</div><div class='ctx'> 	DECLARE_BITMAP(lsbmap, PLSB_MAP_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Queue processing thread */</div><div class='hunk'>@@ -466,6 +467,7 @@ struct ccp_aes_op {</div><div class='ctx'> 	enum ccp_aes_type type;</div><div class='ctx'> 	enum ccp_aes_mode mode;</div><div class='ctx'> 	enum ccp_aes_action action;</div><div class='add'>+	unsigned int size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ccp_xts_aes_op {</div><div class='hunk'>@@ -515,7 +517,6 @@ struct ccp_op {</div><div class='ctx'> 		struct ccp_passthru_op passthru;</div><div class='ctx'> 		struct ccp_ecc_op ecc;</div><div class='ctx'> 	} u;</div><div class='del'>-	struct ccp_mem key;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline u32 ccp_addr_lo(struct ccp_dma_info *info)</div><div class='hunk'>@@ -541,23 +542,23 @@ static inline u32 ccp_addr_hi(struct ccp_dma_info *info)</div><div class='ctx'>  * word 7: upper 16 bits of key pointer; key memory type</div><div class='ctx'>  */</div><div class='ctx'> struct dword0 {</div><div class='del'>-	__le32 soc:1;</div><div class='del'>-	__le32 ioc:1;</div><div class='del'>-	__le32 rsvd1:1;</div><div class='del'>-	__le32 init:1;</div><div class='del'>-	__le32 eom:1;		/* AES/SHA only */</div><div class='del'>-	__le32 function:15;</div><div class='del'>-	__le32 engine:4;</div><div class='del'>-	__le32 prot:1;</div><div class='del'>-	__le32 rsvd2:7;</div><div class='add'>+	unsigned int soc:1;</div><div class='add'>+	unsigned int ioc:1;</div><div class='add'>+	unsigned int rsvd1:1;</div><div class='add'>+	unsigned int init:1;</div><div class='add'>+	unsigned int eom:1;		/* AES/SHA only */</div><div class='add'>+	unsigned int function:15;</div><div class='add'>+	unsigned int engine:4;</div><div class='add'>+	unsigned int prot:1;</div><div class='add'>+	unsigned int rsvd2:7;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dword3 {</div><div class='del'>-	__le32 src_hi:16;</div><div class='del'>-	__le32 src_mem:2;</div><div class='del'>-	__le32 lsb_cxt_id:8;</div><div class='del'>-	__le32 rsvd1:5;</div><div class='del'>-	__le32 fixed:1;</div><div class='add'>+	unsigned int  src_hi:16;</div><div class='add'>+	unsigned int  src_mem:2;</div><div class='add'>+	unsigned int  lsb_cxt_id:8;</div><div class='add'>+	unsigned int  rsvd1:5;</div><div class='add'>+	unsigned int  fixed:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union dword4 {</div><div class='hunk'>@@ -567,18 +568,18 @@ union dword4 {</div><div class='ctx'> </div><div class='ctx'> union dword5 {</div><div class='ctx'> 	struct {</div><div class='del'>-		__le32 dst_hi:16;</div><div class='del'>-		__le32 dst_mem:2;</div><div class='del'>-		__le32 rsvd1:13;</div><div class='del'>-		__le32 fixed:1;</div><div class='add'>+		unsigned int  dst_hi:16;</div><div class='add'>+		unsigned int  dst_mem:2;</div><div class='add'>+		unsigned int  rsvd1:13;</div><div class='add'>+		unsigned int  fixed:1;</div><div class='ctx'> 	} fields;</div><div class='ctx'> 	__le32 sha_len_hi;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dword7 {</div><div class='del'>-	__le32 key_hi:16;</div><div class='del'>-	__le32 key_mem:2;</div><div class='del'>-	__le32 rsvd1:14;</div><div class='add'>+	unsigned int  key_hi:16;</div><div class='add'>+	unsigned int  key_mem:2;</div><div class='add'>+	unsigned int  rsvd1:14;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ccp5_desc {</div><div class='head'>diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c<br/>index 6553912804f7..e5d9278f4019 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-dmaengine.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/ccp/ccp-dmaengine.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-dmaengine.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-dmaengine.c</a></div><div class='hunk'>@@ -63,6 +63,7 @@ static void ccp_free_chan_resources(struct dma_chan *dma_chan)</div><div class='ctx'> 	ccp_free_desc_resources(chan-&gt;ccp, &amp;chan-&gt;complete);</div><div class='ctx'> 	ccp_free_desc_resources(chan-&gt;ccp, &amp;chan-&gt;active);</div><div class='ctx'> 	ccp_free_desc_resources(chan-&gt;ccp, &amp;chan-&gt;pending);</div><div class='add'>+	ccp_free_desc_resources(chan-&gt;ccp, &amp;chan-&gt;created);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chan-&gt;lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -273,6 +274,7 @@ static dma_cookie_t ccp_tx_submit(struct dma_async_tx_descriptor *tx_desc)</div><div class='ctx'> 	spin_lock_irqsave(&amp;chan-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	cookie = dma_cookie_assign(tx_desc);</div><div class='add'>+	list_del(&amp;desc-&gt;entry);</div><div class='ctx'> 	list_add_tail(&amp;desc-&gt;entry, &amp;chan-&gt;pending);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chan-&gt;lock, flags);</div><div class='hunk'>@@ -426,7 +428,7 @@ static struct ccp_dma_desc *ccp_create_desc(struct dma_chan *dma_chan,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;chan-&gt;lock, sflags);</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;desc-&gt;entry, &amp;chan-&gt;pending);</div><div class='add'>+	list_add_tail(&amp;desc-&gt;entry, &amp;chan-&gt;created);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chan-&gt;lock, sflags);</div><div class='ctx'> </div><div class='hunk'>@@ -610,6 +612,7 @@ static int ccp_terminate_all(struct dma_chan *dma_chan)</div><div class='ctx'> 	/*TODO: Purge the complete list? */</div><div class='ctx'> 	ccp_free_desc_resources(chan-&gt;ccp, &amp;chan-&gt;active);</div><div class='ctx'> 	ccp_free_desc_resources(chan-&gt;ccp, &amp;chan-&gt;pending);</div><div class='add'>+	ccp_free_desc_resources(chan-&gt;ccp, &amp;chan-&gt;created);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chan-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -679,6 +682,7 @@ int ccp_dmaengine_register(struct ccp_device *ccp)</div><div class='ctx'> 		chan-&gt;ccp = ccp;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_init(&amp;chan-&gt;lock);</div><div class='add'>+		INIT_LIST_HEAD(&amp;chan-&gt;created);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;chan-&gt;pending);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;chan-&gt;active);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;chan-&gt;complete);</div><div class='head'>diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c<br/>index 50fae4442801..f1396c3aedac 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-ops.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/ccp/ccp-ops.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/ccp/ccp-ops.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/ccp/ccp-ops.c</a></div><div class='hunk'>@@ -184,62 +184,46 @@ static void ccp_get_dm_area(struct ccp_dm_workarea *wa, unsigned int wa_offset,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ccp_reverse_set_dm_area(struct ccp_dm_workarea *wa,</div><div class='add'>+				   unsigned int wa_offset,</div><div class='ctx'> 				   struct scatterlist *sg,</div><div class='del'>-				   unsigned int len, unsigned int se_len,</div><div class='del'>-				   bool sign_extend)</div><div class='add'>+				   unsigned int sg_offset,</div><div class='add'>+				   unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	unsigned int nbytes, sg_offset, dm_offset, sb_len, i;</div><div class='del'>-	u8 buffer[CCP_REVERSE_BUF_SIZE];</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(se_len &gt; sizeof(buffer)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	sg_offset = len;</div><div class='del'>-	dm_offset = 0;</div><div class='del'>-	nbytes = len;</div><div class='del'>-	while (nbytes) {</div><div class='del'>-		sb_len = min_t(unsigned int, nbytes, se_len);</div><div class='del'>-		sg_offset -= sb_len;</div><div class='del'>-</div><div class='del'>-		scatterwalk_map_and_copy(buffer, sg, sg_offset, sb_len, 0);</div><div class='del'>-		for (i = 0; i &lt; sb_len; i++)</div><div class='del'>-			wa-&gt;address[dm_offset + i] = buffer[sb_len - i - 1];</div><div class='del'>-</div><div class='del'>-		dm_offset += sb_len;</div><div class='del'>-		nbytes -= sb_len;</div><div class='del'>-</div><div class='del'>-		if ((sb_len != se_len) &amp;&amp; sign_extend) {</div><div class='del'>-			/* Must sign-extend to nearest sign-extend length */</div><div class='del'>-			if (wa-&gt;address[dm_offset - 1] &amp; 0x80)</div><div class='del'>-				memset(wa-&gt;address + dm_offset, 0xff,</div><div class='del'>-				       se_len - sb_len);</div><div class='del'>-		}</div><div class='add'>+	u8 *p, *q;</div><div class='add'>+</div><div class='add'>+	ccp_set_dm_area(wa, wa_offset, sg, sg_offset, len);</div><div class='add'>+</div><div class='add'>+	p = wa-&gt;address + wa_offset;</div><div class='add'>+	q = p + len - 1;</div><div class='add'>+	while (p &lt; q) {</div><div class='add'>+		*p = *p ^ *q;</div><div class='add'>+		*q = *p ^ *q;</div><div class='add'>+		*p = *p ^ *q;</div><div class='add'>+		p++;</div><div class='add'>+		q--;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ccp_reverse_get_dm_area(struct ccp_dm_workarea *wa,</div><div class='add'>+				    unsigned int wa_offset,</div><div class='ctx'> 				    struct scatterlist *sg,</div><div class='add'>+				    unsigned int sg_offset,</div><div class='ctx'> 				    unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	unsigned int nbytes, sg_offset, dm_offset, sb_len, i;</div><div class='del'>-	u8 buffer[CCP_REVERSE_BUF_SIZE];</div><div class='del'>-</div><div class='del'>-	sg_offset = 0;</div><div class='del'>-	dm_offset = len;</div><div class='del'>-	nbytes = len;</div><div class='del'>-	while (nbytes) {</div><div class='del'>-		sb_len = min_t(unsigned int, nbytes, sizeof(buffer));</div><div class='del'>-		dm_offset -= sb_len;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; sb_len; i++)</div><div class='del'>-			buffer[sb_len - i - 1] = wa-&gt;address[dm_offset + i];</div><div class='del'>-		scatterwalk_map_and_copy(buffer, sg, sg_offset, sb_len, 1);</div><div class='del'>-</div><div class='del'>-		sg_offset += sb_len;</div><div class='del'>-		nbytes -= sb_len;</div><div class='add'>+	u8 *p, *q;</div><div class='add'>+</div><div class='add'>+	p = wa-&gt;address + wa_offset;</div><div class='add'>+	q = p + len - 1;</div><div class='add'>+	while (p &lt; q) {</div><div class='add'>+		*p = *p ^ *q;</div><div class='add'>+		*q = *p ^ *q;</div><div class='add'>+		*p = *p ^ *q;</div><div class='add'>+		p++;</div><div class='add'>+		q--;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ccp_get_dm_area(wa, wa_offset, sg, sg_offset, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ccp_free_data(struct ccp_data *data, struct ccp_cmd_queue *cmd_q)</div><div class='hunk'>@@ -692,6 +676,14 @@ static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)</div><div class='ctx'> 			goto e_ctx;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	switch (aes-&gt;mode) {</div><div class='add'>+	case CCP_AES_MODE_CFB: /* CFB128 only */</div><div class='add'>+	case CCP_AES_MODE_CTR:</div><div class='add'>+		op.u.aes.size = AES_BLOCK_SIZE * BITS_PER_BYTE - 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		op.u.aes.size = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Prepare the input and output data workareas. For in-place</div><div class='ctx'> 	 * operations we need to set the dma direction to BIDIRECTIONAL</div><div class='hunk'>@@ -1261,8 +1253,7 @@ static int ccp_run_rsa_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto e_sb;</div><div class='ctx'> </div><div class='del'>-	ret = ccp_reverse_set_dm_area(&amp;exp, rsa-&gt;exp, rsa-&gt;exp_len,</div><div class='del'>-				      CCP_SB_BYTES, false);</div><div class='add'>+	ret = ccp_reverse_set_dm_area(&amp;exp, 0, rsa-&gt;exp, 0, rsa-&gt;exp_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto e_exp;</div><div class='ctx'> 	ret = ccp_copy_to_sb(cmd_q, &amp;exp, op.jobid, op.sb_key,</div><div class='hunk'>@@ -1280,16 +1271,12 @@ static int ccp_run_rsa_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto e_exp;</div><div class='ctx'> </div><div class='del'>-	ret = ccp_reverse_set_dm_area(&amp;src, rsa-&gt;mod, rsa-&gt;mod_len,</div><div class='del'>-				      CCP_SB_BYTES, false);</div><div class='add'>+	ret = ccp_reverse_set_dm_area(&amp;src, 0, rsa-&gt;mod, 0, rsa-&gt;mod_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto e_src;</div><div class='del'>-	src.address += o_len;	/* Adjust the address for the copy operation */</div><div class='del'>-	ret = ccp_reverse_set_dm_area(&amp;src, rsa-&gt;src, rsa-&gt;src_len,</div><div class='del'>-				      CCP_SB_BYTES, false);</div><div class='add'>+	ret = ccp_reverse_set_dm_area(&amp;src, o_len, rsa-&gt;src, 0, rsa-&gt;src_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto e_src;</div><div class='del'>-	src.address -= o_len;	/* Reset the address to original value */</div><div class='ctx'> </div><div class='ctx'> 	/* Prepare the output area for the operation */</div><div class='ctx'> 	ret = ccp_init_data(&amp;dst, cmd_q, rsa-&gt;dst, rsa-&gt;mod_len,</div><div class='hunk'>@@ -1314,7 +1301,7 @@ static int ccp_run_rsa_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)</div><div class='ctx'> 		goto e_dst;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ccp_reverse_get_dm_area(&amp;dst.dm_wa, rsa-&gt;dst, rsa-&gt;mod_len);</div><div class='add'>+	ccp_reverse_get_dm_area(&amp;dst.dm_wa, 0, rsa-&gt;dst, 0, rsa-&gt;mod_len);</div><div class='ctx'> </div><div class='ctx'> e_dst:</div><div class='ctx'> 	ccp_free_data(&amp;dst, cmd_q);</div><div class='hunk'>@@ -1566,25 +1553,22 @@ static int ccp_run_ecc_mm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)</div><div class='ctx'> 	save = src.address;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the ECC modulus */</div><div class='del'>-	ret = ccp_reverse_set_dm_area(&amp;src, ecc-&gt;mod, ecc-&gt;mod_len,</div><div class='del'>-				      CCP_ECC_OPERAND_SIZE, false);</div><div class='add'>+	ret = ccp_reverse_set_dm_area(&amp;src, 0, ecc-&gt;mod, 0, ecc-&gt;mod_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto e_src;</div><div class='ctx'> 	src.address += CCP_ECC_OPERAND_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the first operand */</div><div class='del'>-	ret = ccp_reverse_set_dm_area(&amp;src, ecc-&gt;u.mm.operand_1,</div><div class='del'>-				      ecc-&gt;u.mm.operand_1_len,</div><div class='del'>-				      CCP_ECC_OPERAND_SIZE, false);</div><div class='add'>+	ret = ccp_reverse_set_dm_area(&amp;src, 0, ecc-&gt;u.mm.operand_1, 0,</div><div class='add'>+				      ecc-&gt;u.mm.operand_1_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto e_src;</div><div class='ctx'> 	src.address += CCP_ECC_OPERAND_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	if (ecc-&gt;function != CCP_ECC_FUNCTION_MINV_384BIT) {</div><div class='ctx'> 		/* Copy the second operand */</div><div class='del'>-		ret = ccp_reverse_set_dm_area(&amp;src, ecc-&gt;u.mm.operand_2,</div><div class='del'>-					      ecc-&gt;u.mm.operand_2_len,</div><div class='del'>-					      CCP_ECC_OPERAND_SIZE, false);</div><div class='add'>+		ret = ccp_reverse_set_dm_area(&amp;src, 0, ecc-&gt;u.mm.operand_2, 0,</div><div class='add'>+					      ecc-&gt;u.mm.operand_2_len);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto e_src;</div><div class='ctx'> 		src.address += CCP_ECC_OPERAND_SIZE;</div><div class='hunk'>@@ -1623,7 +1607,8 @@ static int ccp_run_ecc_mm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Save the ECC result */</div><div class='del'>-	ccp_reverse_get_dm_area(&amp;dst, ecc-&gt;u.mm.result, CCP_ECC_MODULUS_BYTES);</div><div class='add'>+	ccp_reverse_get_dm_area(&amp;dst, 0, ecc-&gt;u.mm.result, 0,</div><div class='add'>+				CCP_ECC_MODULUS_BYTES);</div><div class='ctx'> </div><div class='ctx'> e_dst:</div><div class='ctx'> 	ccp_dm_free(&amp;dst);</div><div class='hunk'>@@ -1691,22 +1676,19 @@ static int ccp_run_ecc_pm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)</div><div class='ctx'> 	save = src.address;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the ECC modulus */</div><div class='del'>-	ret = ccp_reverse_set_dm_area(&amp;src, ecc-&gt;mod, ecc-&gt;mod_len,</div><div class='del'>-				      CCP_ECC_OPERAND_SIZE, false);</div><div class='add'>+	ret = ccp_reverse_set_dm_area(&amp;src, 0, ecc-&gt;mod, 0, ecc-&gt;mod_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto e_src;</div><div class='ctx'> 	src.address += CCP_ECC_OPERAND_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the first point X and Y coordinate */</div><div class='del'>-	ret = ccp_reverse_set_dm_area(&amp;src, ecc-&gt;u.pm.point_1.x,</div><div class='del'>-				      ecc-&gt;u.pm.point_1.x_len,</div><div class='del'>-				      CCP_ECC_OPERAND_SIZE, false);</div><div class='add'>+	ret = ccp_reverse_set_dm_area(&amp;src, 0, ecc-&gt;u.pm.point_1.x, 0,</div><div class='add'>+				      ecc-&gt;u.pm.point_1.x_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto e_src;</div><div class='ctx'> 	src.address += CCP_ECC_OPERAND_SIZE;</div><div class='del'>-	ret = ccp_reverse_set_dm_area(&amp;src, ecc-&gt;u.pm.point_1.y,</div><div class='del'>-				      ecc-&gt;u.pm.point_1.y_len,</div><div class='del'>-				      CCP_ECC_OPERAND_SIZE, false);</div><div class='add'>+	ret = ccp_reverse_set_dm_area(&amp;src, 0, ecc-&gt;u.pm.point_1.y, 0,</div><div class='add'>+				      ecc-&gt;u.pm.point_1.y_len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto e_src;</div><div class='ctx'> 	src.address += CCP_ECC_OPERAND_SIZE;</div><div class='hunk'>@@ -1717,15 +1699,13 @@ static int ccp_run_ecc_pm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)</div><div class='ctx'> </div><div class='ctx'> 	if (ecc-&gt;function == CCP_ECC_FUNCTION_PADD_384BIT) {</div><div class='ctx'> 		/* Copy the second point X and Y coordinate */</div><div class='del'>-		ret = ccp_reverse_set_dm_area(&amp;src, ecc-&gt;u.pm.point_2.x,</div><div class='del'>-					      ecc-&gt;u.pm.point_2.x_len,</div><div class='del'>-					      CCP_ECC_OPERAND_SIZE, false);</div><div class='add'>+		ret = ccp_reverse_set_dm_area(&amp;src, 0, ecc-&gt;u.pm.point_2.x, 0,</div><div class='add'>+					      ecc-&gt;u.pm.point_2.x_len);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto e_src;</div><div class='ctx'> 		src.address += CCP_ECC_OPERAND_SIZE;</div><div class='del'>-		ret = ccp_reverse_set_dm_area(&amp;src, ecc-&gt;u.pm.point_2.y,</div><div class='del'>-					      ecc-&gt;u.pm.point_2.y_len,</div><div class='del'>-					      CCP_ECC_OPERAND_SIZE, false);</div><div class='add'>+		ret = ccp_reverse_set_dm_area(&amp;src, 0, ecc-&gt;u.pm.point_2.y, 0,</div><div class='add'>+					      ecc-&gt;u.pm.point_2.y_len);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto e_src;</div><div class='ctx'> 		src.address += CCP_ECC_OPERAND_SIZE;</div><div class='hunk'>@@ -1735,19 +1715,17 @@ static int ccp_run_ecc_pm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)</div><div class='ctx'> 		src.address += CCP_ECC_OPERAND_SIZE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Copy the Domain "a" parameter */</div><div class='del'>-		ret = ccp_reverse_set_dm_area(&amp;src, ecc-&gt;u.pm.domain_a,</div><div class='del'>-					      ecc-&gt;u.pm.domain_a_len,</div><div class='del'>-					      CCP_ECC_OPERAND_SIZE, false);</div><div class='add'>+		ret = ccp_reverse_set_dm_area(&amp;src, 0, ecc-&gt;u.pm.domain_a, 0,</div><div class='add'>+					      ecc-&gt;u.pm.domain_a_len);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto e_src;</div><div class='ctx'> 		src.address += CCP_ECC_OPERAND_SIZE;</div><div class='ctx'> </div><div class='ctx'> 		if (ecc-&gt;function == CCP_ECC_FUNCTION_PMUL_384BIT) {</div><div class='ctx'> 			/* Copy the scalar value */</div><div class='del'>-			ret = ccp_reverse_set_dm_area(&amp;src, ecc-&gt;u.pm.scalar,</div><div class='del'>-						      ecc-&gt;u.pm.scalar_len,</div><div class='del'>-						      CCP_ECC_OPERAND_SIZE,</div><div class='del'>-						      false);</div><div class='add'>+			ret = ccp_reverse_set_dm_area(&amp;src, 0,</div><div class='add'>+						      ecc-&gt;u.pm.scalar, 0,</div><div class='add'>+						      ecc-&gt;u.pm.scalar_len);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto e_src;</div><div class='ctx'> 			src.address += CCP_ECC_OPERAND_SIZE;</div><div class='hunk'>@@ -1792,10 +1770,10 @@ static int ccp_run_ecc_pm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)</div><div class='ctx'> 	save = dst.address;</div><div class='ctx'> </div><div class='ctx'> 	/* Save the ECC result X and Y coordinates */</div><div class='del'>-	ccp_reverse_get_dm_area(&amp;dst, ecc-&gt;u.pm.result.x,</div><div class='add'>+	ccp_reverse_get_dm_area(&amp;dst, 0, ecc-&gt;u.pm.result.x, 0,</div><div class='ctx'> 				CCP_ECC_MODULUS_BYTES);</div><div class='ctx'> 	dst.address += CCP_ECC_OUTPUT_SIZE;</div><div class='del'>-	ccp_reverse_get_dm_area(&amp;dst, ecc-&gt;u.pm.result.y,</div><div class='add'>+	ccp_reverse_get_dm_area(&amp;dst, 0, ecc-&gt;u.pm.result.y, 0,</div><div class='ctx'> 				CCP_ECC_MODULUS_BYTES);</div><div class='ctx'> 	dst.address += CCP_ECC_OUTPUT_SIZE;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/chelsio/Kconfig b/drivers/crypto/chelsio/Kconfig<br/>index 4ce67fb9a880..3e104f5aa0c2 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/chelsio/Kconfig?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/chelsio/Kconfig</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/chelsio/Kconfig?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/Kconfig</a></div><div class='hunk'>@@ -4,6 +4,7 @@ config CRYPTO_DEV_CHELSIO</div><div class='ctx'> 	select CRYPTO_SHA1</div><div class='ctx'> 	select CRYPTO_SHA256</div><div class='ctx'> 	select CRYPTO_SHA512</div><div class='add'>+	select CRYPTO_AUTHENC</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  The Chelsio Crypto Co-processor driver for T6 adapters.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c<br/>index e4ddb921d7b3..41bc7f4f58cd 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/chelsio/chcr_algo.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/chelsio/chcr_algo.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/chelsio/chcr_algo.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/chcr_algo.c</a></div><div class='hunk'>@@ -54,6 +54,12 @@</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/hash.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='add'>+#include &lt;crypto/authenc.h&gt;</div><div class='add'>+#include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/null.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/aead.h&gt;</div><div class='add'>+#include &lt;crypto/scatterwalk.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "t4fw_api.h"</div><div class='hunk'>@@ -62,6 +68,11 @@</div><div class='ctx'> #include "chcr_algo.h"</div><div class='ctx'> #include "chcr_crypto.h"</div><div class='ctx'> </div><div class='add'>+static inline  struct chcr_aead_ctx *AEAD_CTX(struct chcr_context *ctx)</div><div class='add'>+{</div><div class='add'>+	return ctx-&gt;crypto_ctx-&gt;aeadctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct ablk_ctx *ABLK_CTX(struct chcr_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	return ctx-&gt;crypto_ctx-&gt;ablkctx;</div><div class='hunk'>@@ -72,6 +83,16 @@ static inline struct hmac_ctx *HMAC_CTX(struct chcr_context *ctx)</div><div class='ctx'> 	return ctx-&gt;crypto_ctx-&gt;hmacctx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct chcr_gcm_ctx *GCM_CTX(struct chcr_aead_ctx *gctx)</div><div class='add'>+{</div><div class='add'>+	return gctx-&gt;ctx-&gt;gcm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct chcr_authenc_ctx *AUTHENC_CTX(struct chcr_aead_ctx *gctx)</div><div class='add'>+{</div><div class='add'>+	return gctx-&gt;ctx-&gt;authenc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct uld_ctx *ULD_CTX(struct chcr_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	return ctx-&gt;dev-&gt;u_ctx;</div><div class='hunk'>@@ -94,12 +115,37 @@ static inline unsigned int sgl_len(unsigned int n)</div><div class='ctx'> 	return (3 * n) / 2 + (n &amp; 1) + 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void chcr_verify_tag(struct aead_request *req, u8 *input, int *err)</div><div class='add'>+{</div><div class='add'>+	u8 temp[SHA512_DIGEST_SIZE];</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	int authsize = crypto_aead_authsize(tfm);</div><div class='add'>+	struct cpl_fw6_pld *fw6_pld;</div><div class='add'>+	int cmp = 0;</div><div class='add'>+</div><div class='add'>+	fw6_pld = (struct cpl_fw6_pld *)input;</div><div class='add'>+	if ((get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106) ||</div><div class='add'>+	    (get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_GCM)) {</div><div class='add'>+		cmp = memcmp(&amp;fw6_pld-&gt;data[2], (fw6_pld + 1), authsize);</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		sg_pcopy_to_buffer(req-&gt;src, sg_nents(req-&gt;src), temp,</div><div class='add'>+				authsize, req-&gt;assoclen +</div><div class='add'>+				req-&gt;cryptlen - authsize);</div><div class='add'>+		cmp = memcmp(temp, (fw6_pld + 1), authsize);</div><div class='add'>+	}</div><div class='add'>+	if (cmp)</div><div class='add'>+		*err = -EBADMSG;</div><div class='add'>+	else</div><div class='add'>+		*err = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	chcr_handle_resp - Unmap the DMA buffers associated with the request</div><div class='ctx'>  *	@req: crypto request</div><div class='ctx'>  */</div><div class='ctx'> int chcr_handle_resp(struct crypto_async_request *req, unsigned char *input,</div><div class='del'>-		     int error_status)</div><div class='add'>+			 int err)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_tfm *tfm = req-&gt;tfm;</div><div class='ctx'> 	struct chcr_context *ctx = crypto_tfm_ctx(tfm);</div><div class='hunk'>@@ -109,17 +155,33 @@ int chcr_handle_resp(struct crypto_async_request *req, unsigned char *input,</div><div class='ctx'> 	unsigned int digestsize, updated_digestsize;</div><div class='ctx'> </div><div class='ctx'> 	switch (tfm-&gt;__crt_alg-&gt;cra_flags &amp; CRYPTO_ALG_TYPE_MASK) {</div><div class='del'>-	case CRYPTO_ALG_TYPE_BLKCIPHER:</div><div class='add'>+	case CRYPTO_ALG_TYPE_AEAD:</div><div class='add'>+		ctx_req.req.aead_req = (struct aead_request *)req;</div><div class='add'>+		ctx_req.ctx.reqctx = aead_request_ctx(ctx_req.req.aead_req);</div><div class='add'>+		dma_unmap_sg(&amp;u_ctx-&gt;lldi.pdev-&gt;dev, ctx_req.ctx.reqctx-&gt;dst,</div><div class='add'>+			     ctx_req.ctx.reqctx-&gt;dst_nents, DMA_FROM_DEVICE);</div><div class='add'>+		if (ctx_req.ctx.reqctx-&gt;skb) {</div><div class='add'>+			kfree_skb(ctx_req.ctx.reqctx-&gt;skb);</div><div class='add'>+			ctx_req.ctx.reqctx-&gt;skb = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (ctx_req.ctx.reqctx-&gt;verify == VERIFY_SW) {</div><div class='add'>+			chcr_verify_tag(ctx_req.req.aead_req, input,</div><div class='add'>+					&amp;err);</div><div class='add'>+			ctx_req.ctx.reqctx-&gt;verify = VERIFY_HW;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CRYPTO_ALG_TYPE_ABLKCIPHER:</div><div class='ctx'> 		ctx_req.req.ablk_req = (struct ablkcipher_request *)req;</div><div class='ctx'> 		ctx_req.ctx.ablk_ctx =</div><div class='ctx'> 			ablkcipher_request_ctx(ctx_req.req.ablk_req);</div><div class='del'>-		if (!error_status) {</div><div class='add'>+		if (!err) {</div><div class='ctx'> 			fw6_pld = (struct cpl_fw6_pld *)input;</div><div class='ctx'> 			memcpy(ctx_req.req.ablk_req-&gt;info, &amp;fw6_pld-&gt;data[2],</div><div class='ctx'> 			       AES_BLOCK_SIZE);</div><div class='ctx'> 		}</div><div class='ctx'> 		dma_unmap_sg(&amp;u_ctx-&gt;lldi.pdev-&gt;dev, ctx_req.req.ablk_req-&gt;dst,</div><div class='del'>-			     ABLK_CTX(ctx)-&gt;dst_nents, DMA_FROM_DEVICE);</div><div class='add'>+			     ctx_req.ctx.ablk_ctx-&gt;dst_nents, DMA_FROM_DEVICE);</div><div class='ctx'> 		if (ctx_req.ctx.ablk_ctx-&gt;skb) {</div><div class='ctx'> 			kfree_skb(ctx_req.ctx.ablk_ctx-&gt;skb);</div><div class='ctx'> 			ctx_req.ctx.ablk_ctx-&gt;skb = NULL;</div><div class='hunk'>@@ -138,8 +200,10 @@ int chcr_handle_resp(struct crypto_async_request *req, unsigned char *input,</div><div class='ctx'> 			updated_digestsize = SHA256_DIGEST_SIZE;</div><div class='ctx'> 		else if (digestsize == SHA384_DIGEST_SIZE)</div><div class='ctx'> 			updated_digestsize = SHA512_DIGEST_SIZE;</div><div class='del'>-		if (ctx_req.ctx.ahash_ctx-&gt;skb)</div><div class='add'>+		if (ctx_req.ctx.ahash_ctx-&gt;skb) {</div><div class='add'>+			kfree_skb(ctx_req.ctx.ahash_ctx-&gt;skb);</div><div class='ctx'> 			ctx_req.ctx.ahash_ctx-&gt;skb = NULL;</div><div class='add'>+		}</div><div class='ctx'> 		if (ctx_req.ctx.ahash_ctx-&gt;result == 1) {</div><div class='ctx'> 			ctx_req.ctx.ahash_ctx-&gt;result = 0;</div><div class='ctx'> 			memcpy(ctx_req.req.ahash_req-&gt;result, input +</div><div class='hunk'>@@ -150,11 +214,9 @@ int chcr_handle_resp(struct crypto_async_request *req, unsigned char *input,</div><div class='ctx'> 			       sizeof(struct cpl_fw6_pld),</div><div class='ctx'> 			       updated_digestsize);</div><div class='ctx'> 		}</div><div class='del'>-		kfree(ctx_req.ctx.ahash_ctx-&gt;dummy_payload_ptr);</div><div class='del'>-		ctx_req.ctx.ahash_ctx-&gt;dummy_payload_ptr = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -178,40 +240,81 @@ static inline unsigned int calc_tx_flits_ofld(const struct sk_buff *skb)</div><div class='ctx'> 	return flits + sgl_len(cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct shash_desc *chcr_alloc_shash(unsigned int ds)</div><div class='add'>+static inline void get_aes_decrypt_key(unsigned char *dec_key,</div><div class='add'>+				       const unsigned char *key,</div><div class='add'>+				       unsigned int keylength)</div><div class='add'>+{</div><div class='add'>+	u32 temp;</div><div class='add'>+	u32 w_ring[MAX_NK];</div><div class='add'>+	int i, j, k;</div><div class='add'>+	u8  nr, nk;</div><div class='add'>+</div><div class='add'>+	switch (keylength) {</div><div class='add'>+	case AES_KEYLENGTH_128BIT:</div><div class='add'>+		nk = KEYLENGTH_4BYTES;</div><div class='add'>+		nr = NUMBER_OF_ROUNDS_10;</div><div class='add'>+		break;</div><div class='add'>+	case AES_KEYLENGTH_192BIT:</div><div class='add'>+		nk = KEYLENGTH_6BYTES;</div><div class='add'>+		nr = NUMBER_OF_ROUNDS_12;</div><div class='add'>+		break;</div><div class='add'>+	case AES_KEYLENGTH_256BIT:</div><div class='add'>+		nk = KEYLENGTH_8BYTES;</div><div class='add'>+		nr = NUMBER_OF_ROUNDS_14;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; nk; i++)</div><div class='add'>+		w_ring[i] = be32_to_cpu(*(u32 *)&amp;key[4 * i]);</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	temp = w_ring[nk - 1];</div><div class='add'>+	while (i + nk &lt; (nr + 1) * 4) {</div><div class='add'>+		if (!(i % nk)) {</div><div class='add'>+			/* RotWord(temp) */</div><div class='add'>+			temp = (temp &lt;&lt; 8) | (temp &gt;&gt; 24);</div><div class='add'>+			temp = aes_ks_subword(temp);</div><div class='add'>+			temp ^= round_constant[i / nk];</div><div class='add'>+		} else if (nk == 8 &amp;&amp; (i % 4 == 0)) {</div><div class='add'>+			temp = aes_ks_subword(temp);</div><div class='add'>+		}</div><div class='add'>+		w_ring[i % nk] ^= temp;</div><div class='add'>+		temp = w_ring[i % nk];</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+	i--;</div><div class='add'>+	for (k = 0, j = i % nk; k &lt; nk; k++) {</div><div class='add'>+		*((u32 *)dec_key + k) = htonl(w_ring[j]);</div><div class='add'>+		j--;</div><div class='add'>+		if (j &lt; 0)</div><div class='add'>+			j += nk;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_shash *chcr_alloc_shash(unsigned int ds)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_shash *base_hash = NULL;</div><div class='del'>-	struct shash_desc *desc;</div><div class='ctx'> </div><div class='ctx'> 	switch (ds) {</div><div class='ctx'> 	case SHA1_DIGEST_SIZE:</div><div class='del'>-		base_hash = crypto_alloc_shash("sha1-generic", 0, 0);</div><div class='add'>+		base_hash = crypto_alloc_shash("sha1", 0, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SHA224_DIGEST_SIZE:</div><div class='del'>-		base_hash = crypto_alloc_shash("sha224-generic", 0, 0);</div><div class='add'>+		base_hash = crypto_alloc_shash("sha224", 0, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SHA256_DIGEST_SIZE:</div><div class='del'>-		base_hash = crypto_alloc_shash("sha256-generic", 0, 0);</div><div class='add'>+		base_hash = crypto_alloc_shash("sha256", 0, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SHA384_DIGEST_SIZE:</div><div class='del'>-		base_hash = crypto_alloc_shash("sha384-generic", 0, 0);</div><div class='add'>+		base_hash = crypto_alloc_shash("sha384", 0, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SHA512_DIGEST_SIZE:</div><div class='del'>-		base_hash = crypto_alloc_shash("sha512-generic", 0, 0);</div><div class='add'>+		base_hash = crypto_alloc_shash("sha512", 0, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	if (IS_ERR(base_hash)) {</div><div class='del'>-		pr_err("Can not allocate sha-generic algo.\n");</div><div class='del'>-		return (void *)base_hash;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	desc = kmalloc(sizeof(*desc) + crypto_shash_descsize(base_hash),</div><div class='del'>-		       GFP_KERNEL);</div><div class='del'>-	if (!desc)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	desc-&gt;tfm = base_hash;</div><div class='del'>-	desc-&gt;flags = crypto_shash_get_flags(base_hash);</div><div class='del'>-	return desc;</div><div class='add'>+	return base_hash;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int chcr_compute_partial_hash(struct shash_desc *desc,</div><div class='hunk'>@@ -279,31 +382,18 @@ static inline int is_hmac(struct crypto_tfm *tfm)</div><div class='ctx'> 	struct chcr_alg_template *chcr_crypto_alg =</div><div class='ctx'> 		container_of(__crypto_ahash_alg(alg), struct chcr_alg_template,</div><div class='ctx'> 			     alg.hash);</div><div class='del'>-	if ((chcr_crypto_alg-&gt;type &amp; CRYPTO_ALG_SUB_TYPE_MASK) ==</div><div class='del'>-	    CRYPTO_ALG_SUB_TYPE_HASH_HMAC)</div><div class='add'>+	if (chcr_crypto_alg-&gt;type == CRYPTO_ALG_TYPE_HMAC)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int ch_nents(struct scatterlist *sg,</div><div class='del'>-				    unsigned int *total_size)</div><div class='del'>-{</div><div class='del'>-	unsigned int nents;</div><div class='del'>-</div><div class='del'>-	for (nents = 0, *total_size = 0; sg; sg = sg_next(sg)) {</div><div class='del'>-		nents++;</div><div class='del'>-		*total_size += sg-&gt;length;</div><div class='del'>-	}</div><div class='del'>-	return nents;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void write_phys_cpl(struct cpl_rx_phys_dsgl *phys_cpl,</div><div class='ctx'> 			   struct scatterlist *sg,</div><div class='ctx'> 			   struct phys_sge_parm *sg_param)</div><div class='ctx'> {</div><div class='ctx'> 	struct phys_sge_pairs *to;</div><div class='del'>-	unsigned int out_buf_size = sg_param-&gt;obsize;</div><div class='del'>-	unsigned int nents = sg_param-&gt;nents, i, j, tot_len = 0;</div><div class='add'>+	int out_buf_size = sg_param-&gt;obsize;</div><div class='add'>+	unsigned int nents = sg_param-&gt;nents, i, j = 0;</div><div class='ctx'> </div><div class='ctx'> 	phys_cpl-&gt;op_to_tid = htonl(CPL_RX_PHYS_DSGL_OPCODE_V(CPL_RX_PHYS_DSGL)</div><div class='ctx'> 				    | CPL_RX_PHYS_DSGL_ISRDMA_V(0));</div><div class='hunk'>@@ -321,25 +411,24 @@ static void write_phys_cpl(struct cpl_rx_phys_dsgl *phys_cpl,</div><div class='ctx'> 				       sizeof(struct cpl_rx_phys_dsgl));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; nents; to++) {</div><div class='del'>-		for (j = i; (nents &amp;&amp; (j &lt; (8 + i))); j++, nents--) {</div><div class='del'>-			to-&gt;len[j] = htons(sg-&gt;length);</div><div class='add'>+		for (j = 0; j &lt; 8 &amp;&amp; nents; j++, nents--) {</div><div class='add'>+			out_buf_size -= sg_dma_len(sg);</div><div class='add'>+			to-&gt;len[j] = htons(sg_dma_len(sg));</div><div class='ctx'> 			to-&gt;addr[j] = cpu_to_be64(sg_dma_address(sg));</div><div class='del'>-			if (out_buf_size) {</div><div class='del'>-				if (tot_len + sg_dma_len(sg) &gt;= out_buf_size) {</div><div class='del'>-					to-&gt;len[j] = htons(out_buf_size -</div><div class='del'>-							   tot_len);</div><div class='del'>-					return;</div><div class='del'>-				}</div><div class='del'>-				tot_len += sg_dma_len(sg);</div><div class='del'>-			}</div><div class='ctx'> 			sg = sg_next(sg);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (out_buf_size) {</div><div class='add'>+		j--;</div><div class='add'>+		to--;</div><div class='add'>+		to-&gt;len[j] = htons(ntohs(to-&gt;len[j]) + (out_buf_size));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned</div><div class='del'>-int map_writesg_phys_cpl(struct device *dev, struct cpl_rx_phys_dsgl *phys_cpl,</div><div class='del'>-			 struct scatterlist *sg, struct phys_sge_parm *sg_param)</div><div class='add'>+static inline int map_writesg_phys_cpl(struct device *dev,</div><div class='add'>+					struct cpl_rx_phys_dsgl *phys_cpl,</div><div class='add'>+					struct scatterlist *sg,</div><div class='add'>+					struct phys_sge_parm *sg_param)</div><div class='ctx'> {</div><div class='ctx'> 	if (!sg || !sg_param-&gt;nents)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -353,6 +442,14 @@ int map_writesg_phys_cpl(struct device *dev, struct cpl_rx_phys_dsgl *phys_cpl,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int get_aead_subtype(struct crypto_aead *aead)</div><div class='add'>+{</div><div class='add'>+	struct aead_alg *alg = crypto_aead_alg(aead);</div><div class='add'>+	struct chcr_alg_template *chcr_crypto_alg =</div><div class='add'>+		container_of(alg, struct chcr_alg_template, alg.aead);</div><div class='add'>+	return chcr_crypto_alg-&gt;type &amp; CRYPTO_ALG_SUB_TYPE_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int get_cryptoalg_subtype(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_alg *alg = tfm-&gt;__crt_alg;</div><div class='hunk'>@@ -362,8 +459,23 @@ static inline int get_cryptoalg_subtype(struct crypto_tfm *tfm)</div><div class='ctx'> 	return chcr_crypto_alg-&gt;type &amp; CRYPTO_ALG_SUB_TYPE_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void write_buffer_to_skb(struct sk_buff *skb,</div><div class='add'>+					unsigned int *frags,</div><div class='add'>+					char *bfr,</div><div class='add'>+					u8 bfr_len)</div><div class='add'>+{</div><div class='add'>+	skb-&gt;len += bfr_len;</div><div class='add'>+	skb-&gt;data_len += bfr_len;</div><div class='add'>+	skb-&gt;truesize += bfr_len;</div><div class='add'>+	get_page(virt_to_page(bfr));</div><div class='add'>+	skb_fill_page_desc(skb, *frags, virt_to_page(bfr),</div><div class='add'>+			   offset_in_page(bfr), bfr_len);</div><div class='add'>+	(*frags)++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static inline void</div><div class='del'>-write_sg_data_page_desc(struct sk_buff *skb, unsigned int *frags,</div><div class='add'>+write_sg_to_skb(struct sk_buff *skb, unsigned int *frags,</div><div class='ctx'> 			struct scatterlist *sg, unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *spage;</div><div class='hunk'>@@ -372,8 +484,9 @@ write_sg_data_page_desc(struct sk_buff *skb, unsigned int *frags,</div><div class='ctx'> 	skb-&gt;len += count;</div><div class='ctx'> 	skb-&gt;data_len += count;</div><div class='ctx'> 	skb-&gt;truesize += count;</div><div class='add'>+</div><div class='ctx'> 	while (count &gt; 0) {</div><div class='del'>-		if (sg &amp;&amp; (!(sg-&gt;length)))</div><div class='add'>+		if (!sg || (!(sg-&gt;length)))</div><div class='ctx'> 			break;</div><div class='ctx'> 		spage = sg_page(sg);</div><div class='ctx'> 		get_page(spage);</div><div class='hunk'>@@ -389,29 +502,25 @@ static int generate_copy_rrkey(struct ablk_ctx *ablkctx,</div><div class='ctx'> 			       struct _key_ctx *key_ctx)</div><div class='ctx'> {</div><div class='ctx'> 	if (ablkctx-&gt;ciph_mode == CHCR_SCMD_CIPHER_MODE_AES_CBC) {</div><div class='del'>-		get_aes_decrypt_key(key_ctx-&gt;key, ablkctx-&gt;key,</div><div class='del'>-				    ablkctx-&gt;enckey_len &lt;&lt; 3);</div><div class='del'>-		memset(key_ctx-&gt;key + ablkctx-&gt;enckey_len, 0,</div><div class='del'>-		       CHCR_AES_MAX_KEY_LEN - ablkctx-&gt;enckey_len);</div><div class='add'>+		memcpy(key_ctx-&gt;key, ablkctx-&gt;rrkey, ablkctx-&gt;enckey_len);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		memcpy(key_ctx-&gt;key,</div><div class='ctx'> 		       ablkctx-&gt;key + (ablkctx-&gt;enckey_len &gt;&gt; 1),</div><div class='ctx'> 		       ablkctx-&gt;enckey_len &gt;&gt; 1);</div><div class='del'>-		get_aes_decrypt_key(key_ctx-&gt;key + (ablkctx-&gt;enckey_len &gt;&gt; 1),</div><div class='del'>-				    ablkctx-&gt;key, ablkctx-&gt;enckey_len &lt;&lt; 2);</div><div class='add'>+		memcpy(key_ctx-&gt;key + (ablkctx-&gt;enckey_len &gt;&gt; 1),</div><div class='add'>+		       ablkctx-&gt;rrkey, ablkctx-&gt;enckey_len &gt;&gt; 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void create_wreq(struct chcr_context *ctx,</div><div class='del'>-			       struct fw_crypto_lookaside_wr *wreq,</div><div class='add'>+			       struct chcr_wr *chcr_req,</div><div class='ctx'> 			       void *req, struct sk_buff *skb,</div><div class='ctx'> 			       int kctx_len, int hash_sz,</div><div class='del'>-			       unsigned int phys_dsgl)</div><div class='add'>+			       int is_iv,</div><div class='add'>+			       unsigned int sc_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct uld_ctx *u_ctx = ULD_CTX(ctx);</div><div class='del'>-	struct ulp_txpkt *ulptx = (struct ulp_txpkt *)(wreq + 1);</div><div class='del'>-	struct ulptx_idata *sc_imm = (struct ulptx_idata *)(ulptx + 1);</div><div class='ctx'> 	int iv_loc = IV_DSGL;</div><div class='ctx'> 	int qid = u_ctx-&gt;lldi.rxq_ids[ctx-&gt;tx_channel_id];</div><div class='ctx'> 	unsigned int immdatalen = 0, nr_frags = 0;</div><div class='hunk'>@@ -423,27 +532,28 @@ static inline void create_wreq(struct chcr_context *ctx,</div><div class='ctx'> 		nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wreq-&gt;op_to_cctx_size = FILL_WR_OP_CCTX_SIZE(immdatalen,</div><div class='del'>-						     (kctx_len &gt;&gt; 4));</div><div class='del'>-	wreq-&gt;pld_size_hash_size =</div><div class='add'>+	chcr_req-&gt;wreq.op_to_cctx_size = FILL_WR_OP_CCTX_SIZE(immdatalen,</div><div class='add'>+				((sizeof(chcr_req-&gt;key_ctx) + kctx_len) &gt;&gt; 4));</div><div class='add'>+	chcr_req-&gt;wreq.pld_size_hash_size =</div><div class='ctx'> 		htonl(FW_CRYPTO_LOOKASIDE_WR_PLD_SIZE_V(sgl_lengths[nr_frags]) |</div><div class='ctx'> 		      FW_CRYPTO_LOOKASIDE_WR_HASH_SIZE_V(hash_sz));</div><div class='del'>-	wreq-&gt;len16_pkd = htonl(FW_CRYPTO_LOOKASIDE_WR_LEN16_V(DIV_ROUND_UP(</div><div class='add'>+	chcr_req-&gt;wreq.len16_pkd =</div><div class='add'>+		htonl(FW_CRYPTO_LOOKASIDE_WR_LEN16_V(DIV_ROUND_UP(</div><div class='ctx'> 				    (calc_tx_flits_ofld(skb) * 8), 16)));</div><div class='del'>-	wreq-&gt;cookie = cpu_to_be64((uintptr_t)req);</div><div class='del'>-	wreq-&gt;rx_chid_to_rx_q_id =</div><div class='del'>-		FILL_WR_RX_Q_ID(ctx-&gt;dev-&gt;tx_channel_id, qid,</div><div class='del'>-				(hash_sz) ? IV_NOP : iv_loc);</div><div class='del'>-</div><div class='del'>-	ulptx-&gt;cmd_dest = FILL_ULPTX_CMD_DEST(ctx-&gt;dev-&gt;tx_channel_id);</div><div class='del'>-	ulptx-&gt;len = htonl((DIV_ROUND_UP((calc_tx_flits_ofld(skb) * 8),</div><div class='del'>-					 16) - ((sizeof(*wreq)) &gt;&gt; 4)));</div><div class='del'>-</div><div class='del'>-	sc_imm-&gt;cmd_more = FILL_CMD_MORE(immdatalen);</div><div class='del'>-	sc_imm-&gt;len = cpu_to_be32(sizeof(struct cpl_tx_sec_pdu) + kctx_len +</div><div class='del'>-				  ((hash_sz) ? DUMMY_BYTES :</div><div class='del'>-				  (sizeof(struct cpl_rx_phys_dsgl) +</div><div class='del'>-				   phys_dsgl)) + immdatalen);</div><div class='add'>+	chcr_req-&gt;wreq.cookie = cpu_to_be64((uintptr_t)req);</div><div class='add'>+	chcr_req-&gt;wreq.rx_chid_to_rx_q_id =</div><div class='add'>+		FILL_WR_RX_Q_ID(ctx-&gt;dev-&gt;rx_channel_id, qid,</div><div class='add'>+				is_iv ? iv_loc : IV_NOP, ctx-&gt;tx_channel_id);</div><div class='add'>+</div><div class='add'>+	chcr_req-&gt;ulptx.cmd_dest = FILL_ULPTX_CMD_DEST(ctx-&gt;dev-&gt;tx_channel_id,</div><div class='add'>+						       qid);</div><div class='add'>+	chcr_req-&gt;ulptx.len = htonl((DIV_ROUND_UP((calc_tx_flits_ofld(skb) * 8),</div><div class='add'>+					16) - ((sizeof(chcr_req-&gt;wreq)) &gt;&gt; 4)));</div><div class='add'>+</div><div class='add'>+	chcr_req-&gt;sc_imm.cmd_more = FILL_CMD_MORE(immdatalen);</div><div class='add'>+	chcr_req-&gt;sc_imm.len = cpu_to_be32(sizeof(struct cpl_tx_sec_pdu) +</div><div class='add'>+				   sizeof(chcr_req-&gt;key_ctx) +</div><div class='add'>+				   kctx_len + sc_len + immdatalen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -454,86 +564,83 @@ static inline void create_wreq(struct chcr_context *ctx,</div><div class='ctx'>  *	@op_type:	encryption or decryption</div><div class='ctx'>  */</div><div class='ctx'> static struct sk_buff</div><div class='del'>-*create_cipher_wr(struct crypto_async_request *req_base,</div><div class='del'>-		  struct chcr_context *ctx, unsigned short qid,</div><div class='add'>+*create_cipher_wr(struct ablkcipher_request *req,</div><div class='add'>+		  unsigned short qid,</div><div class='ctx'> 		  unsigned short op_type)</div><div class='ctx'> {</div><div class='del'>-	struct ablkcipher_request *req = (struct ablkcipher_request *)req_base;</div><div class='ctx'> 	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);</div><div class='add'>+	struct chcr_context *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='ctx'> 	struct uld_ctx *u_ctx = ULD_CTX(ctx);</div><div class='ctx'> 	struct ablk_ctx *ablkctx = ABLK_CTX(ctx);</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='del'>-	struct _key_ctx *key_ctx;</div><div class='del'>-	struct fw_crypto_lookaside_wr *wreq;</div><div class='del'>-	struct cpl_tx_sec_pdu *sec_cpl;</div><div class='add'>+	struct chcr_wr *chcr_req;</div><div class='ctx'> 	struct cpl_rx_phys_dsgl *phys_cpl;</div><div class='del'>-	struct chcr_blkcipher_req_ctx *req_ctx = ablkcipher_request_ctx(req);</div><div class='add'>+	struct chcr_blkcipher_req_ctx *reqctx = ablkcipher_request_ctx(req);</div><div class='ctx'> 	struct phys_sge_parm sg_param;</div><div class='del'>-	unsigned int frags = 0, transhdr_len, phys_dsgl, dst_bufsize = 0;</div><div class='add'>+	unsigned int frags = 0, transhdr_len, phys_dsgl;</div><div class='ctx'> 	unsigned int ivsize = crypto_ablkcipher_ivsize(tfm), kctx_len;</div><div class='add'>+	gfp_t flags = req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :</div><div class='add'>+			GFP_ATOMIC;</div><div class='ctx'> </div><div class='ctx'> 	if (!req-&gt;info)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='del'>-	ablkctx-&gt;dst_nents = ch_nents(req-&gt;dst, &amp;dst_bufsize);</div><div class='del'>-	ablkctx-&gt;enc = op_type;</div><div class='del'>-</div><div class='add'>+	reqctx-&gt;dst_nents = sg_nents_for_len(req-&gt;dst, req-&gt;nbytes);</div><div class='add'>+	if (reqctx-&gt;dst_nents &lt;= 0) {</div><div class='add'>+		pr_err("AES:Invalid Destination sg lists\n");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='ctx'> 	if ((ablkctx-&gt;enckey_len == 0) || (ivsize &gt; AES_BLOCK_SIZE) ||</div><div class='del'>-	    (req-&gt;nbytes &lt;= 0) || (req-&gt;nbytes % AES_BLOCK_SIZE))</div><div class='add'>+	    (req-&gt;nbytes &lt;= 0) || (req-&gt;nbytes % AES_BLOCK_SIZE)) {</div><div class='add'>+		pr_err("AES: Invalid value of Key Len %d nbytes %d IV Len %d\n",</div><div class='add'>+		       ablkctx-&gt;enckey_len, req-&gt;nbytes, ivsize);</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	phys_dsgl = get_space_for_phys_dsgl(ablkctx-&gt;dst_nents);</div><div class='add'>+	phys_dsgl = get_space_for_phys_dsgl(reqctx-&gt;dst_nents);</div><div class='ctx'> </div><div class='del'>-	kctx_len = sizeof(*key_ctx) +</div><div class='del'>-		(DIV_ROUND_UP(ablkctx-&gt;enckey_len, 16) * 16);</div><div class='add'>+	kctx_len = (DIV_ROUND_UP(ablkctx-&gt;enckey_len, 16) * 16);</div><div class='ctx'> 	transhdr_len = CIPHER_TRANSHDR_SIZE(kctx_len, phys_dsgl);</div><div class='del'>-	skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)),</div><div class='del'>-			GFP_ATOMIC);</div><div class='add'>+	skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	skb_reserve(skb, sizeof(struct sge_opaque_hdr));</div><div class='del'>-	wreq = (struct fw_crypto_lookaside_wr *)__skb_put(skb, transhdr_len);</div><div class='del'>-</div><div class='del'>-	sec_cpl = (struct cpl_tx_sec_pdu *)((u8 *)wreq + SEC_CPL_OFFSET);</div><div class='del'>-	sec_cpl-&gt;op_ivinsrtofst =</div><div class='del'>-		FILL_SEC_CPL_OP_IVINSR(ctx-&gt;dev-&gt;tx_channel_id, 2, 1, 1);</div><div class='del'>-</div><div class='del'>-	sec_cpl-&gt;pldlen = htonl(ivsize + req-&gt;nbytes);</div><div class='del'>-	sec_cpl-&gt;aadstart_cipherstop_hi = FILL_SEC_CPL_CIPHERSTOP_HI(0, 0,</div><div class='del'>-								ivsize + 1, 0);</div><div class='del'>-</div><div class='del'>-	sec_cpl-&gt;cipherstop_lo_authinsert =  FILL_SEC_CPL_AUTHINSERT(0, 0,</div><div class='del'>-								     0, 0);</div><div class='del'>-	sec_cpl-&gt;seqno_numivs = FILL_SEC_CPL_SCMD0_SEQNO(op_type, 0,</div><div class='add'>+	chcr_req = (struct chcr_wr *)__skb_put(skb, transhdr_len);</div><div class='add'>+	memset(chcr_req, 0, transhdr_len);</div><div class='add'>+	chcr_req-&gt;sec_cpl.op_ivinsrtofst =</div><div class='add'>+		FILL_SEC_CPL_OP_IVINSR(ctx-&gt;dev-&gt;rx_channel_id, 2, 1);</div><div class='add'>+</div><div class='add'>+	chcr_req-&gt;sec_cpl.pldlen = htonl(ivsize + req-&gt;nbytes);</div><div class='add'>+	chcr_req-&gt;sec_cpl.aadstart_cipherstop_hi =</div><div class='add'>+			FILL_SEC_CPL_CIPHERSTOP_HI(0, 0, ivsize + 1, 0);</div><div class='add'>+</div><div class='add'>+	chcr_req-&gt;sec_cpl.cipherstop_lo_authinsert =</div><div class='add'>+			FILL_SEC_CPL_AUTHINSERT(0, 0, 0, 0);</div><div class='add'>+	chcr_req-&gt;sec_cpl.seqno_numivs = FILL_SEC_CPL_SCMD0_SEQNO(op_type, 0,</div><div class='ctx'> 							 ablkctx-&gt;ciph_mode,</div><div class='del'>-							 0, 0, ivsize &gt;&gt; 1, 1);</div><div class='del'>-	sec_cpl-&gt;ivgen_hdrlen = FILL_SEC_CPL_IVGEN_HDRLEN(0, 0, 0,</div><div class='add'>+							 0, 0, ivsize &gt;&gt; 1);</div><div class='add'>+	chcr_req-&gt;sec_cpl.ivgen_hdrlen = FILL_SEC_CPL_IVGEN_HDRLEN(0, 0, 0,</div><div class='ctx'> 							  0, 1, phys_dsgl);</div><div class='ctx'> </div><div class='del'>-	key_ctx = (struct _key_ctx *)((u8 *)sec_cpl + sizeof(*sec_cpl));</div><div class='del'>-	key_ctx-&gt;ctx_hdr = ablkctx-&gt;key_ctx_hdr;</div><div class='add'>+	chcr_req-&gt;key_ctx.ctx_hdr = ablkctx-&gt;key_ctx_hdr;</div><div class='ctx'> 	if (op_type == CHCR_DECRYPT_OP) {</div><div class='del'>-		if (generate_copy_rrkey(ablkctx, key_ctx))</div><div class='del'>-			goto map_fail1;</div><div class='add'>+		generate_copy_rrkey(ablkctx, &amp;chcr_req-&gt;key_ctx);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ablkctx-&gt;ciph_mode == CHCR_SCMD_CIPHER_MODE_AES_CBC) {</div><div class='del'>-			memcpy(key_ctx-&gt;key, ablkctx-&gt;key, ablkctx-&gt;enckey_len);</div><div class='add'>+			memcpy(chcr_req-&gt;key_ctx.key, ablkctx-&gt;key,</div><div class='add'>+			       ablkctx-&gt;enckey_len);</div><div class='ctx'> 		} else {</div><div class='del'>-			memcpy(key_ctx-&gt;key, ablkctx-&gt;key +</div><div class='add'>+			memcpy(chcr_req-&gt;key_ctx.key, ablkctx-&gt;key +</div><div class='ctx'> 			       (ablkctx-&gt;enckey_len &gt;&gt; 1),</div><div class='ctx'> 			       ablkctx-&gt;enckey_len &gt;&gt; 1);</div><div class='del'>-			memcpy(key_ctx-&gt;key +</div><div class='add'>+			memcpy(chcr_req-&gt;key_ctx.key +</div><div class='ctx'> 			       (ablkctx-&gt;enckey_len &gt;&gt; 1),</div><div class='ctx'> 			       ablkctx-&gt;key,</div><div class='ctx'> 			       ablkctx-&gt;enckey_len &gt;&gt; 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	phys_cpl = (struct cpl_rx_phys_dsgl *)((u8 *)key_ctx + kctx_len);</div><div class='del'>-</div><div class='del'>-	memcpy(ablkctx-&gt;iv, req-&gt;info, ivsize);</div><div class='del'>-	sg_init_table(&amp;ablkctx-&gt;iv_sg, 1);</div><div class='del'>-	sg_set_buf(&amp;ablkctx-&gt;iv_sg, ablkctx-&gt;iv, ivsize);</div><div class='del'>-	sg_param.nents = ablkctx-&gt;dst_nents;</div><div class='del'>-	sg_param.obsize = dst_bufsize;</div><div class='add'>+	phys_cpl = (struct cpl_rx_phys_dsgl *)((u8 *)(chcr_req + 1) + kctx_len);</div><div class='add'>+	sg_param.nents = reqctx-&gt;dst_nents;</div><div class='add'>+	sg_param.obsize = req-&gt;nbytes;</div><div class='ctx'> 	sg_param.qid = qid;</div><div class='ctx'> 	sg_param.align = 1;</div><div class='ctx'> 	if (map_writesg_phys_cpl(&amp;u_ctx-&gt;lldi.pdev-&gt;dev, phys_cpl, req-&gt;dst,</div><div class='hunk'>@@ -541,10 +648,12 @@ static struct sk_buff</div><div class='ctx'> 		goto map_fail1;</div><div class='ctx'> </div><div class='ctx'> 	skb_set_transport_header(skb, transhdr_len);</div><div class='del'>-	write_sg_data_page_desc(skb, &amp;frags, &amp;ablkctx-&gt;iv_sg, ivsize);</div><div class='del'>-	write_sg_data_page_desc(skb, &amp;frags, req-&gt;src, req-&gt;nbytes);</div><div class='del'>-	create_wreq(ctx, wreq, req, skb, kctx_len, 0, phys_dsgl);</div><div class='del'>-	req_ctx-&gt;skb = skb;</div><div class='add'>+	memcpy(reqctx-&gt;iv, req-&gt;info, ivsize);</div><div class='add'>+	write_buffer_to_skb(skb, &amp;frags, reqctx-&gt;iv, ivsize);</div><div class='add'>+	write_sg_to_skb(skb, &amp;frags, req-&gt;src, req-&gt;nbytes);</div><div class='add'>+	create_wreq(ctx, chcr_req, req, skb, kctx_len, 0, 1,</div><div class='add'>+			sizeof(struct cpl_rx_phys_dsgl) + phys_dsgl);</div><div class='add'>+	reqctx-&gt;skb = skb;</div><div class='ctx'> 	skb_get(skb);</div><div class='ctx'> 	return skb;</div><div class='ctx'> map_fail1:</div><div class='hunk'>@@ -557,15 +666,9 @@ static int chcr_aes_cbc_setkey(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='ctx'> {</div><div class='ctx'> 	struct chcr_context *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='ctx'> 	struct ablk_ctx *ablkctx = ABLK_CTX(ctx);</div><div class='del'>-	struct ablkcipher_alg *alg = crypto_ablkcipher_alg(tfm);</div><div class='ctx'> 	unsigned int ck_size, context_size;</div><div class='ctx'> 	u16 alignment = 0;</div><div class='ctx'> </div><div class='del'>-	if ((keylen &lt; alg-&gt;min_keysize) || (keylen &gt; alg-&gt;max_keysize))</div><div class='del'>-		goto badkey_err;</div><div class='del'>-</div><div class='del'>-	memcpy(ablkctx-&gt;key, key, keylen);</div><div class='del'>-	ablkctx-&gt;enckey_len = keylen;</div><div class='ctx'> 	if (keylen == AES_KEYSIZE_128) {</div><div class='ctx'> 		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_128;</div><div class='ctx'> 	} else if (keylen == AES_KEYSIZE_192) {</div><div class='hunk'>@@ -576,7 +679,9 @@ static int chcr_aes_cbc_setkey(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		goto badkey_err;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	memcpy(ablkctx-&gt;key, key, keylen);</div><div class='add'>+	ablkctx-&gt;enckey_len = keylen;</div><div class='add'>+	get_aes_decrypt_key(ablkctx-&gt;rrkey, ablkctx-&gt;key, keylen &lt;&lt; 3);</div><div class='ctx'> 	context_size = (KEY_CONTEXT_HDR_SALT_AND_PAD +</div><div class='ctx'> 			keylen + alignment) &gt;&gt; 4;</div><div class='ctx'> </div><div class='hunk'>@@ -592,16 +697,18 @@ badkey_err:</div><div class='ctx'> </div><div class='ctx'> static int cxgb4_is_crypto_q_full(struct net_device *dev, unsigned int idx)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct sge_ofld_txq *q;</div><div class='ctx'> 	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct sge_uld_txq_info *txq_info =</div><div class='add'>+		adap-&gt;sge.uld_txq_info[CXGB4_TX_CRYPTO];</div><div class='add'>+	struct sge_uld_txq *txq;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	local_bh_disable();</div><div class='del'>-	q = &amp;adap-&gt;sge.ofldtxq[idx];</div><div class='del'>-	spin_lock(&amp;q-&gt;sendq.lock);</div><div class='del'>-	if (q-&gt;full)</div><div class='add'>+	txq = &amp;txq_info-&gt;uldtxq[idx];</div><div class='add'>+	spin_lock(&amp;txq-&gt;sendq.lock);</div><div class='add'>+	if (txq-&gt;full)</div><div class='ctx'> 		ret = -1;</div><div class='del'>-	spin_unlock(&amp;q-&gt;sendq.lock);</div><div class='add'>+	spin_unlock(&amp;txq-&gt;sendq.lock);</div><div class='ctx'> 	local_bh_enable();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -610,7 +717,6 @@ static int chcr_aes_encrypt(struct ablkcipher_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);</div><div class='ctx'> 	struct chcr_context *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='del'>-	struct crypto_async_request *req_base = &amp;req-&gt;base;</div><div class='ctx'> 	struct uld_ctx *u_ctx = ULD_CTX(ctx);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='hunk'>@@ -620,8 +726,7 @@ static int chcr_aes_encrypt(struct ablkcipher_request *req)</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = create_cipher_wr(req_base, ctx,</div><div class='del'>-			       u_ctx-&gt;lldi.rxq_ids[ctx-&gt;tx_channel_id],</div><div class='add'>+	skb = create_cipher_wr(req, u_ctx-&gt;lldi.rxq_ids[ctx-&gt;tx_channel_id],</div><div class='ctx'> 			       CHCR_ENCRYPT_OP);</div><div class='ctx'> 	if (IS_ERR(skb)) {</div><div class='ctx'> 		pr_err("chcr : %s : Failed to form WR. No memory\n", __func__);</div><div class='hunk'>@@ -637,7 +742,6 @@ static int chcr_aes_decrypt(struct ablkcipher_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);</div><div class='ctx'> 	struct chcr_context *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='del'>-	struct crypto_async_request *req_base = &amp;req-&gt;base;</div><div class='ctx'> 	struct uld_ctx *u_ctx = ULD_CTX(ctx);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='hunk'>@@ -647,7 +751,7 @@ static int chcr_aes_decrypt(struct ablkcipher_request *req)</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = create_cipher_wr(req_base, ctx, u_ctx-&gt;lldi.rxq_ids[0],</div><div class='add'>+	skb = create_cipher_wr(req, u_ctx-&gt;lldi.rxq_ids[0],</div><div class='ctx'> 			       CHCR_DECRYPT_OP);</div><div class='ctx'> 	if (IS_ERR(skb)) {</div><div class='ctx'> 		pr_err("chcr : %s : Failed to form WR. No memory\n", __func__);</div><div class='hunk'>@@ -674,11 +778,12 @@ static int chcr_device_init(struct chcr_context *ctx)</div><div class='ctx'> 		}</div><div class='ctx'> 		u_ctx = ULD_CTX(ctx);</div><div class='ctx'> 		rxq_perchan = u_ctx-&gt;lldi.nrxq / u_ctx-&gt;lldi.nchan;</div><div class='del'>-		ctx-&gt;dev-&gt;tx_channel_id = 0;</div><div class='ctx'> 		rxq_idx = ctx-&gt;dev-&gt;tx_channel_id * rxq_perchan;</div><div class='ctx'> 		rxq_idx += id % rxq_perchan;</div><div class='ctx'> 		spin_lock(&amp;ctx-&gt;dev-&gt;lock_chcr_dev);</div><div class='ctx'> 		ctx-&gt;tx_channel_id = rxq_idx;</div><div class='add'>+		ctx-&gt;dev-&gt;tx_channel_id = !ctx-&gt;dev-&gt;tx_channel_id;</div><div class='add'>+		ctx-&gt;dev-&gt;rx_channel_id = 0;</div><div class='ctx'> 		spin_unlock(&amp;ctx-&gt;dev-&gt;lock_chcr_dev);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='hunk'>@@ -727,50 +832,33 @@ static int get_alg_config(struct algo_param *params,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-write_buffer_data_page_desc(struct chcr_ahash_req_ctx *req_ctx,</div><div class='del'>-			    struct sk_buff *skb, unsigned int *frags, char *bfr,</div><div class='del'>-			    u8 bfr_len)</div><div class='add'>+static inline void chcr_free_shash(struct crypto_shash *base_hash)</div><div class='ctx'> {</div><div class='del'>-	void *page_ptr = NULL;</div><div class='del'>-</div><div class='del'>-	skb-&gt;len += bfr_len;</div><div class='del'>-	skb-&gt;data_len += bfr_len;</div><div class='del'>-	skb-&gt;truesize += bfr_len;</div><div class='del'>-	page_ptr = kmalloc(CHCR_HASH_MAX_BLOCK_SIZE_128, GFP_ATOMIC | GFP_DMA);</div><div class='del'>-	if (!page_ptr)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	get_page(virt_to_page(page_ptr));</div><div class='del'>-	req_ctx-&gt;dummy_payload_ptr = page_ptr;</div><div class='del'>-	memcpy(page_ptr, bfr, bfr_len);</div><div class='del'>-	skb_fill_page_desc(skb, *frags, virt_to_page(page_ptr),</div><div class='del'>-			   offset_in_page(page_ptr), bfr_len);</div><div class='del'>-	(*frags)++;</div><div class='del'>-	return 0;</div><div class='add'>+		crypto_free_shash(base_hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	create_final_hash_wr - Create hash work request</div><div class='add'>+ *	create_hash_wr - Create hash work request</div><div class='ctx'>  *	@req - Cipher req base</div><div class='ctx'>  */</div><div class='del'>-static struct sk_buff *create_final_hash_wr(struct ahash_request *req,</div><div class='del'>-					    struct hash_wr_param *param)</div><div class='add'>+static struct sk_buff *create_hash_wr(struct ahash_request *req,</div><div class='add'>+				      struct hash_wr_param *param)</div><div class='ctx'> {</div><div class='ctx'> 	struct chcr_ahash_req_ctx *req_ctx = ahash_request_ctx(req);</div><div class='ctx'> 	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);</div><div class='ctx'> 	struct chcr_context *ctx = crypto_tfm_ctx(crypto_ahash_tfm(tfm));</div><div class='ctx'> 	struct hmac_ctx *hmacctx = HMAC_CTX(ctx);</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='del'>-	struct _key_ctx *key_ctx;</div><div class='del'>-	struct fw_crypto_lookaside_wr *wreq;</div><div class='del'>-	struct cpl_tx_sec_pdu *sec_cpl;</div><div class='add'>+	struct chcr_wr *chcr_req;</div><div class='ctx'> 	unsigned int frags = 0, transhdr_len, iopad_alignment = 0;</div><div class='ctx'> 	unsigned int digestsize = crypto_ahash_digestsize(tfm);</div><div class='del'>-	unsigned int kctx_len = sizeof(*key_ctx);</div><div class='add'>+	unsigned int kctx_len = 0;</div><div class='ctx'> 	u8 hash_size_in_response = 0;</div><div class='add'>+	gfp_t flags = req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :</div><div class='add'>+		GFP_ATOMIC;</div><div class='ctx'> </div><div class='ctx'> 	iopad_alignment = KEYCTX_ALIGN_PAD(digestsize);</div><div class='del'>-	kctx_len += param-&gt;alg_prm.result_size + iopad_alignment;</div><div class='add'>+	kctx_len = param-&gt;alg_prm.result_size + iopad_alignment;</div><div class='ctx'> 	if (param-&gt;opad_needed)</div><div class='ctx'> 		kctx_len += param-&gt;alg_prm.result_size + iopad_alignment;</div><div class='ctx'> </div><div class='hunk'>@@ -779,54 +867,54 @@ static struct sk_buff *create_final_hash_wr(struct ahash_request *req,</div><div class='ctx'> 	else</div><div class='ctx'> 		hash_size_in_response = param-&gt;alg_prm.result_size;</div><div class='ctx'> 	transhdr_len = HASH_TRANSHDR_SIZE(kctx_len);</div><div class='del'>-	skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)),</div><div class='del'>-			GFP_ATOMIC);</div><div class='add'>+	skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return skb;</div><div class='ctx'> </div><div class='ctx'> 	skb_reserve(skb, sizeof(struct sge_opaque_hdr));</div><div class='del'>-	wreq = (struct fw_crypto_lookaside_wr *)__skb_put(skb, transhdr_len);</div><div class='del'>-	memset(wreq, 0, transhdr_len);</div><div class='add'>+	chcr_req = (struct chcr_wr *)__skb_put(skb, transhdr_len);</div><div class='add'>+	memset(chcr_req, 0, transhdr_len);</div><div class='ctx'> </div><div class='del'>-	sec_cpl = (struct cpl_tx_sec_pdu *)((u8 *)wreq + SEC_CPL_OFFSET);</div><div class='del'>-	sec_cpl-&gt;op_ivinsrtofst =</div><div class='del'>-		FILL_SEC_CPL_OP_IVINSR(ctx-&gt;dev-&gt;tx_channel_id, 2, 0, 0);</div><div class='del'>-	sec_cpl-&gt;pldlen = htonl(param-&gt;bfr_len + param-&gt;sg_len);</div><div class='add'>+	chcr_req-&gt;sec_cpl.op_ivinsrtofst =</div><div class='add'>+		FILL_SEC_CPL_OP_IVINSR(ctx-&gt;dev-&gt;rx_channel_id, 2, 0);</div><div class='add'>+	chcr_req-&gt;sec_cpl.pldlen = htonl(param-&gt;bfr_len + param-&gt;sg_len);</div><div class='ctx'> </div><div class='del'>-	sec_cpl-&gt;aadstart_cipherstop_hi =</div><div class='add'>+	chcr_req-&gt;sec_cpl.aadstart_cipherstop_hi =</div><div class='ctx'> 		FILL_SEC_CPL_CIPHERSTOP_HI(0, 0, 0, 0);</div><div class='del'>-	sec_cpl-&gt;cipherstop_lo_authinsert =</div><div class='add'>+	chcr_req-&gt;sec_cpl.cipherstop_lo_authinsert =</div><div class='ctx'> 		FILL_SEC_CPL_AUTHINSERT(0, 1, 0, 0);</div><div class='del'>-	sec_cpl-&gt;seqno_numivs =</div><div class='add'>+	chcr_req-&gt;sec_cpl.seqno_numivs =</div><div class='ctx'> 		FILL_SEC_CPL_SCMD0_SEQNO(0, 0, 0, param-&gt;alg_prm.auth_mode,</div><div class='del'>-					 param-&gt;opad_needed, 0, 0);</div><div class='add'>+					 param-&gt;opad_needed, 0);</div><div class='ctx'> </div><div class='del'>-	sec_cpl-&gt;ivgen_hdrlen =</div><div class='add'>+	chcr_req-&gt;sec_cpl.ivgen_hdrlen =</div><div class='ctx'> 		FILL_SEC_CPL_IVGEN_HDRLEN(param-&gt;last, param-&gt;more, 0, 1, 0, 0);</div><div class='ctx'> </div><div class='del'>-	key_ctx = (struct _key_ctx *)((u8 *)sec_cpl + sizeof(*sec_cpl));</div><div class='del'>-	memcpy(key_ctx-&gt;key, req_ctx-&gt;partial_hash, param-&gt;alg_prm.result_size);</div><div class='add'>+	memcpy(chcr_req-&gt;key_ctx.key, req_ctx-&gt;partial_hash,</div><div class='add'>+	       param-&gt;alg_prm.result_size);</div><div class='ctx'> </div><div class='ctx'> 	if (param-&gt;opad_needed)</div><div class='del'>-		memcpy(key_ctx-&gt;key + ((param-&gt;alg_prm.result_size &lt;= 32) ? 32 :</div><div class='del'>-				       CHCR_HASH_MAX_DIGEST_SIZE),</div><div class='add'>+		memcpy(chcr_req-&gt;key_ctx.key +</div><div class='add'>+		       ((param-&gt;alg_prm.result_size &lt;= 32) ? 32 :</div><div class='add'>+			CHCR_HASH_MAX_DIGEST_SIZE),</div><div class='ctx'> 		       hmacctx-&gt;opad, param-&gt;alg_prm.result_size);</div><div class='ctx'> </div><div class='del'>-	key_ctx-&gt;ctx_hdr = FILL_KEY_CTX_HDR(CHCR_KEYCTX_NO_KEY,</div><div class='add'>+	chcr_req-&gt;key_ctx.ctx_hdr = FILL_KEY_CTX_HDR(CHCR_KEYCTX_NO_KEY,</div><div class='ctx'> 					    param-&gt;alg_prm.mk_size, 0,</div><div class='ctx'> 					    param-&gt;opad_needed,</div><div class='del'>-					    (kctx_len &gt;&gt; 4));</div><div class='del'>-	sec_cpl-&gt;scmd1 = cpu_to_be64((u64)param-&gt;scmd1);</div><div class='add'>+					    ((kctx_len +</div><div class='add'>+					     sizeof(chcr_req-&gt;key_ctx)) &gt;&gt; 4));</div><div class='add'>+	chcr_req-&gt;sec_cpl.scmd1 = cpu_to_be64((u64)param-&gt;scmd1);</div><div class='ctx'> </div><div class='ctx'> 	skb_set_transport_header(skb, transhdr_len);</div><div class='ctx'> 	if (param-&gt;bfr_len != 0)</div><div class='del'>-		write_buffer_data_page_desc(req_ctx, skb, &amp;frags, req_ctx-&gt;bfr,</div><div class='del'>-					    param-&gt;bfr_len);</div><div class='add'>+		write_buffer_to_skb(skb, &amp;frags, req_ctx-&gt;reqbfr,</div><div class='add'>+				    param-&gt;bfr_len);</div><div class='ctx'> 	if (param-&gt;sg_len != 0)</div><div class='del'>-		write_sg_data_page_desc(skb, &amp;frags, req-&gt;src, param-&gt;sg_len);</div><div class='add'>+		write_sg_to_skb(skb, &amp;frags, req-&gt;src, param-&gt;sg_len);</div><div class='ctx'> </div><div class='del'>-	create_wreq(ctx, wreq, req, skb, kctx_len, hash_size_in_response,</div><div class='del'>-		    0);</div><div class='add'>+	create_wreq(ctx, chcr_req, req, skb, kctx_len, hash_size_in_response, 0,</div><div class='add'>+			DUMMY_BYTES);</div><div class='ctx'> 	req_ctx-&gt;skb = skb;</div><div class='ctx'> 	skb_get(skb);</div><div class='ctx'> 	return skb;</div><div class='hunk'>@@ -852,34 +940,40 @@ static int chcr_ahash_update(struct ahash_request *req)</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nbytes + req_ctx-&gt;bfr_len &gt;= bs) {</div><div class='del'>-		remainder = (nbytes + req_ctx-&gt;bfr_len) % bs;</div><div class='del'>-		nbytes = nbytes + req_ctx-&gt;bfr_len - remainder;</div><div class='add'>+	if (nbytes + req_ctx-&gt;reqlen &gt;= bs) {</div><div class='add'>+		remainder = (nbytes + req_ctx-&gt;reqlen) % bs;</div><div class='add'>+		nbytes = nbytes + req_ctx-&gt;reqlen - remainder;</div><div class='ctx'> 	} else {</div><div class='del'>-		sg_pcopy_to_buffer(req-&gt;src, sg_nents(req-&gt;src), req_ctx-&gt;bfr +</div><div class='del'>-				   req_ctx-&gt;bfr_len, nbytes, 0);</div><div class='del'>-		req_ctx-&gt;bfr_len += nbytes;</div><div class='add'>+		sg_pcopy_to_buffer(req-&gt;src, sg_nents(req-&gt;src), req_ctx-&gt;reqbfr</div><div class='add'>+				   + req_ctx-&gt;reqlen, nbytes, 0);</div><div class='add'>+		req_ctx-&gt;reqlen += nbytes;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	params.opad_needed = 0;</div><div class='ctx'> 	params.more = 1;</div><div class='ctx'> 	params.last = 0;</div><div class='del'>-	params.sg_len = nbytes - req_ctx-&gt;bfr_len;</div><div class='del'>-	params.bfr_len = req_ctx-&gt;bfr_len;</div><div class='add'>+	params.sg_len = nbytes - req_ctx-&gt;reqlen;</div><div class='add'>+	params.bfr_len = req_ctx-&gt;reqlen;</div><div class='ctx'> 	params.scmd1 = 0;</div><div class='ctx'> 	get_alg_config(&amp;params.alg_prm, crypto_ahash_digestsize(rtfm));</div><div class='ctx'> 	req_ctx-&gt;result = 0;</div><div class='ctx'> 	req_ctx-&gt;data_len += params.sg_len + params.bfr_len;</div><div class='del'>-	skb = create_final_hash_wr(req, &amp;params);</div><div class='add'>+	skb = create_hash_wr(req, &amp;params);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	req_ctx-&gt;bfr_len = remainder;</div><div class='del'>-	if (remainder)</div><div class='add'>+	if (remainder) {</div><div class='add'>+		u8 *temp;</div><div class='add'>+		/* Swap buffers */</div><div class='add'>+		temp = req_ctx-&gt;reqbfr;</div><div class='add'>+		req_ctx-&gt;reqbfr = req_ctx-&gt;skbfr;</div><div class='add'>+		req_ctx-&gt;skbfr = temp;</div><div class='ctx'> 		sg_pcopy_to_buffer(req-&gt;src, sg_nents(req-&gt;src),</div><div class='del'>-				   req_ctx-&gt;bfr, remainder, req-&gt;nbytes -</div><div class='add'>+				   req_ctx-&gt;reqbfr, remainder, req-&gt;nbytes -</div><div class='ctx'> 				   remainder);</div><div class='add'>+	}</div><div class='add'>+	req_ctx-&gt;reqlen = remainder;</div><div class='ctx'> 	skb-&gt;dev = u_ctx-&gt;lldi.ports[0];</div><div class='ctx'> 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx-&gt;tx_channel_id);</div><div class='ctx'> 	chcr_send_wr(skb);</div><div class='hunk'>@@ -915,10 +1009,10 @@ static int chcr_ahash_final(struct ahash_request *req)</div><div class='ctx'> 	params.sg_len = 0;</div><div class='ctx'> 	get_alg_config(&amp;params.alg_prm, crypto_ahash_digestsize(rtfm));</div><div class='ctx'> 	req_ctx-&gt;result = 1;</div><div class='del'>-	params.bfr_len = req_ctx-&gt;bfr_len;</div><div class='add'>+	params.bfr_len = req_ctx-&gt;reqlen;</div><div class='ctx'> 	req_ctx-&gt;data_len += params.bfr_len + params.sg_len;</div><div class='del'>-	if (req_ctx-&gt;bfr &amp;&amp; (req_ctx-&gt;bfr_len == 0)) {</div><div class='del'>-		create_last_hash_block(req_ctx-&gt;bfr, bs, req_ctx-&gt;data_len);</div><div class='add'>+	if (req_ctx-&gt;reqlen == 0) {</div><div class='add'>+		create_last_hash_block(req_ctx-&gt;reqbfr, bs, req_ctx-&gt;data_len);</div><div class='ctx'> 		params.last = 0;</div><div class='ctx'> 		params.more = 1;</div><div class='ctx'> 		params.scmd1 = 0;</div><div class='hunk'>@@ -929,7 +1023,10 @@ static int chcr_ahash_final(struct ahash_request *req)</div><div class='ctx'> 		params.last = 1;</div><div class='ctx'> 		params.more = 0;</div><div class='ctx'> 	}</div><div class='del'>-	skb = create_final_hash_wr(req, &amp;params);</div><div class='add'>+	skb = create_hash_wr(req, &amp;params);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	skb-&gt;dev = u_ctx-&gt;lldi.ports[0];</div><div class='ctx'> 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx-&gt;tx_channel_id);</div><div class='ctx'> 	chcr_send_wr(skb);</div><div class='hunk'>@@ -961,12 +1058,12 @@ static int chcr_ahash_finup(struct ahash_request *req)</div><div class='ctx'> 		params.opad_needed = 0;</div><div class='ctx'> </div><div class='ctx'> 	params.sg_len = req-&gt;nbytes;</div><div class='del'>-	params.bfr_len = req_ctx-&gt;bfr_len;</div><div class='add'>+	params.bfr_len = req_ctx-&gt;reqlen;</div><div class='ctx'> 	get_alg_config(&amp;params.alg_prm, crypto_ahash_digestsize(rtfm));</div><div class='ctx'> 	req_ctx-&gt;data_len += params.bfr_len + params.sg_len;</div><div class='ctx'> 	req_ctx-&gt;result = 1;</div><div class='del'>-	if (req_ctx-&gt;bfr &amp;&amp; (req_ctx-&gt;bfr_len + req-&gt;nbytes) == 0) {</div><div class='del'>-		create_last_hash_block(req_ctx-&gt;bfr, bs, req_ctx-&gt;data_len);</div><div class='add'>+	if ((req_ctx-&gt;reqlen + req-&gt;nbytes) == 0) {</div><div class='add'>+		create_last_hash_block(req_ctx-&gt;reqbfr, bs, req_ctx-&gt;data_len);</div><div class='ctx'> 		params.last = 0;</div><div class='ctx'> 		params.more = 1;</div><div class='ctx'> 		params.scmd1 = 0;</div><div class='hunk'>@@ -977,9 +1074,10 @@ static int chcr_ahash_finup(struct ahash_request *req)</div><div class='ctx'> 		params.more = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = create_final_hash_wr(req, &amp;params);</div><div class='add'>+	skb = create_hash_wr(req, &amp;params);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	skb-&gt;dev = u_ctx-&gt;lldi.ports[0];</div><div class='ctx'> 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx-&gt;tx_channel_id);</div><div class='ctx'> 	chcr_send_wr(skb);</div><div class='hunk'>@@ -1021,13 +1119,13 @@ static int chcr_ahash_digest(struct ahash_request *req)</div><div class='ctx'> 	req_ctx-&gt;result = 1;</div><div class='ctx'> 	req_ctx-&gt;data_len += params.bfr_len + params.sg_len;</div><div class='ctx'> </div><div class='del'>-	if (req_ctx-&gt;bfr &amp;&amp; req-&gt;nbytes == 0) {</div><div class='del'>-		create_last_hash_block(req_ctx-&gt;bfr, bs, 0);</div><div class='add'>+	if (req-&gt;nbytes == 0) {</div><div class='add'>+		create_last_hash_block(req_ctx-&gt;reqbfr, bs, 0);</div><div class='ctx'> 		params.more = 1;</div><div class='ctx'> 		params.bfr_len = bs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = create_final_hash_wr(req, &amp;params);</div><div class='add'>+	skb = create_hash_wr(req, &amp;params);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1042,12 +1140,12 @@ static int chcr_ahash_export(struct ahash_request *areq, void *out)</div><div class='ctx'> 	struct chcr_ahash_req_ctx *req_ctx = ahash_request_ctx(areq);</div><div class='ctx'> 	struct chcr_ahash_req_ctx *state = out;</div><div class='ctx'> </div><div class='del'>-	state-&gt;bfr_len = req_ctx-&gt;bfr_len;</div><div class='add'>+	state-&gt;reqlen = req_ctx-&gt;reqlen;</div><div class='ctx'> 	state-&gt;data_len = req_ctx-&gt;data_len;</div><div class='del'>-	memcpy(state-&gt;bfr, req_ctx-&gt;bfr, CHCR_HASH_MAX_BLOCK_SIZE_128);</div><div class='add'>+	memcpy(state-&gt;bfr1, req_ctx-&gt;reqbfr, req_ctx-&gt;reqlen);</div><div class='ctx'> 	memcpy(state-&gt;partial_hash, req_ctx-&gt;partial_hash,</div><div class='ctx'> 	       CHCR_HASH_MAX_DIGEST_SIZE);</div><div class='del'>-	return 0;</div><div class='add'>+		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int chcr_ahash_import(struct ahash_request *areq, const void *in)</div><div class='hunk'>@@ -1055,10 +1153,11 @@ static int chcr_ahash_import(struct ahash_request *areq, const void *in)</div><div class='ctx'> 	struct chcr_ahash_req_ctx *req_ctx = ahash_request_ctx(areq);</div><div class='ctx'> 	struct chcr_ahash_req_ctx *state = (struct chcr_ahash_req_ctx *)in;</div><div class='ctx'> </div><div class='del'>-	req_ctx-&gt;bfr_len = state-&gt;bfr_len;</div><div class='add'>+	req_ctx-&gt;reqlen = state-&gt;reqlen;</div><div class='ctx'> 	req_ctx-&gt;data_len = state-&gt;data_len;</div><div class='del'>-	req_ctx-&gt;dummy_payload_ptr = NULL;</div><div class='del'>-	memcpy(req_ctx-&gt;bfr, state-&gt;bfr, CHCR_HASH_MAX_BLOCK_SIZE_128);</div><div class='add'>+	req_ctx-&gt;reqbfr = req_ctx-&gt;bfr1;</div><div class='add'>+	req_ctx-&gt;skbfr = req_ctx-&gt;bfr2;</div><div class='add'>+	memcpy(req_ctx-&gt;bfr1, state-&gt;bfr1, CHCR_HASH_MAX_BLOCK_SIZE_128);</div><div class='ctx'> 	memcpy(req_ctx-&gt;partial_hash, state-&gt;partial_hash,</div><div class='ctx'> 	       CHCR_HASH_MAX_DIGEST_SIZE);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1073,15 +1172,16 @@ static int chcr_ahash_setkey(struct crypto_ahash *tfm, const u8 *key,</div><div class='ctx'> 	unsigned int bs = crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm));</div><div class='ctx'> 	unsigned int i, err = 0, updated_digestsize;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * use the key to calculate the ipad and opad. ipad will sent with the</div><div class='add'>+	SHASH_DESC_ON_STACK(shash, hmacctx-&gt;base_hash);</div><div class='add'>+</div><div class='add'>+	/* use the key to calculate the ipad and opad. ipad will sent with the</div><div class='ctx'> 	 * first request's data. opad will be sent with the final hash result</div><div class='ctx'> 	 * ipad in hmacctx-&gt;ipad and opad in hmacctx-&gt;opad location</div><div class='ctx'> 	 */</div><div class='del'>-	if (!hmacctx-&gt;desc)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	shash-&gt;tfm = hmacctx-&gt;base_hash;</div><div class='add'>+	shash-&gt;flags = crypto_shash_get_flags(hmacctx-&gt;base_hash);</div><div class='ctx'> 	if (keylen &gt; bs) {</div><div class='del'>-		err = crypto_shash_digest(hmacctx-&gt;desc, key, keylen,</div><div class='add'>+		err = crypto_shash_digest(shash, key, keylen,</div><div class='ctx'> 					  hmacctx-&gt;ipad);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1102,13 +1202,13 @@ static int chcr_ahash_setkey(struct crypto_ahash *tfm, const u8 *key,</div><div class='ctx'> 		updated_digestsize = SHA256_DIGEST_SIZE;</div><div class='ctx'> 	else if (digestsize == SHA384_DIGEST_SIZE)</div><div class='ctx'> 		updated_digestsize = SHA512_DIGEST_SIZE;</div><div class='del'>-	err = chcr_compute_partial_hash(hmacctx-&gt;desc, hmacctx-&gt;ipad,</div><div class='add'>+	err = chcr_compute_partial_hash(shash, hmacctx-&gt;ipad,</div><div class='ctx'> 					hmacctx-&gt;ipad, digestsize);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	chcr_change_order(hmacctx-&gt;ipad, updated_digestsize);</div><div class='ctx'> </div><div class='del'>-	err = chcr_compute_partial_hash(hmacctx-&gt;desc, hmacctx-&gt;opad,</div><div class='add'>+	err = chcr_compute_partial_hash(shash, hmacctx-&gt;opad,</div><div class='ctx'> 					hmacctx-&gt;opad, digestsize);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1122,28 +1222,29 @@ static int chcr_aes_xts_setkey(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='ctx'> {</div><div class='ctx'> 	struct chcr_context *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='ctx'> 	struct ablk_ctx *ablkctx = ABLK_CTX(ctx);</div><div class='del'>-	int status = 0;</div><div class='ctx'> 	unsigned short context_size = 0;</div><div class='ctx'> </div><div class='del'>-	if ((key_len == (AES_KEYSIZE_128 &lt;&lt; 1)) ||</div><div class='del'>-	    (key_len == (AES_KEYSIZE_256 &lt;&lt; 1))) {</div><div class='del'>-		memcpy(ablkctx-&gt;key, key, key_len);</div><div class='del'>-		ablkctx-&gt;enckey_len = key_len;</div><div class='del'>-		context_size = (KEY_CONTEXT_HDR_SALT_AND_PAD + key_len) &gt;&gt; 4;</div><div class='del'>-		ablkctx-&gt;key_ctx_hdr =</div><div class='del'>-			FILL_KEY_CTX_HDR((key_len == AES_KEYSIZE_256) ?</div><div class='del'>-					 CHCR_KEYCTX_CIPHER_KEY_SIZE_128 :</div><div class='del'>-					 CHCR_KEYCTX_CIPHER_KEY_SIZE_256,</div><div class='del'>-					 CHCR_KEYCTX_NO_KEY, 1,</div><div class='del'>-					 0, context_size);</div><div class='del'>-		ablkctx-&gt;ciph_mode = CHCR_SCMD_CIPHER_MODE_AES_XTS;</div><div class='del'>-	} else {</div><div class='add'>+	if ((key_len != (AES_KEYSIZE_128 &lt;&lt; 1)) &amp;&amp;</div><div class='add'>+	    (key_len != (AES_KEYSIZE_256 &lt;&lt; 1))) {</div><div class='ctx'> 		crypto_tfm_set_flags((struct crypto_tfm *)tfm,</div><div class='ctx'> 				     CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='ctx'> 		ablkctx-&gt;enckey_len = 0;</div><div class='del'>-		status = -EINVAL;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='del'>-	return status;</div><div class='add'>+</div><div class='add'>+	memcpy(ablkctx-&gt;key, key, key_len);</div><div class='add'>+	ablkctx-&gt;enckey_len = key_len;</div><div class='add'>+	get_aes_decrypt_key(ablkctx-&gt;rrkey, ablkctx-&gt;key, key_len &lt;&lt; 2);</div><div class='add'>+	context_size = (KEY_CONTEXT_HDR_SALT_AND_PAD + key_len) &gt;&gt; 4;</div><div class='add'>+	ablkctx-&gt;key_ctx_hdr =</div><div class='add'>+		FILL_KEY_CTX_HDR((key_len == AES_KEYSIZE_256) ?</div><div class='add'>+				 CHCR_KEYCTX_CIPHER_KEY_SIZE_128 :</div><div class='add'>+				 CHCR_KEYCTX_CIPHER_KEY_SIZE_256,</div><div class='add'>+				 CHCR_KEYCTX_NO_KEY, 1,</div><div class='add'>+				 0, context_size);</div><div class='add'>+	ablkctx-&gt;ciph_mode = CHCR_SCMD_CIPHER_MODE_AES_XTS;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int chcr_sha_init(struct ahash_request *areq)</div><div class='hunk'>@@ -1153,8 +1254,9 @@ static int chcr_sha_init(struct ahash_request *areq)</div><div class='ctx'> 	int digestsize =  crypto_ahash_digestsize(tfm);</div><div class='ctx'> </div><div class='ctx'> 	req_ctx-&gt;data_len = 0;</div><div class='del'>-	req_ctx-&gt;dummy_payload_ptr = NULL;</div><div class='del'>-	req_ctx-&gt;bfr_len = 0;</div><div class='add'>+	req_ctx-&gt;reqlen = 0;</div><div class='add'>+	req_ctx-&gt;reqbfr = req_ctx-&gt;bfr1;</div><div class='add'>+	req_ctx-&gt;skbfr = req_ctx-&gt;bfr2;</div><div class='ctx'> 	req_ctx-&gt;skb = NULL;</div><div class='ctx'> 	req_ctx-&gt;result = 0;</div><div class='ctx'> 	copy_hash_init_values(req_ctx-&gt;partial_hash, digestsize);</div><div class='hunk'>@@ -1202,29 +1304,1186 @@ static int chcr_hmac_cra_init(struct crypto_tfm *tfm)</div><div class='ctx'> </div><div class='ctx'> 	crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),</div><div class='ctx'> 				 sizeof(struct chcr_ahash_req_ctx));</div><div class='del'>-	hmacctx-&gt;desc = chcr_alloc_shash(digestsize);</div><div class='del'>-	if (IS_ERR(hmacctx-&gt;desc))</div><div class='del'>-		return PTR_ERR(hmacctx-&gt;desc);</div><div class='add'>+	hmacctx-&gt;base_hash = chcr_alloc_shash(digestsize);</div><div class='add'>+	if (IS_ERR(hmacctx-&gt;base_hash))</div><div class='add'>+		return PTR_ERR(hmacctx-&gt;base_hash);</div><div class='ctx'> 	return chcr_device_init(crypto_tfm_ctx(tfm));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void chcr_free_shash(struct shash_desc *desc)</div><div class='del'>-{</div><div class='del'>-	crypto_free_shash(desc-&gt;tfm);</div><div class='del'>-	kfree(desc);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void chcr_hmac_cra_exit(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct chcr_context *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	struct hmac_ctx *hmacctx = HMAC_CTX(ctx);</div><div class='ctx'> </div><div class='del'>-	if (hmacctx-&gt;desc) {</div><div class='del'>-		chcr_free_shash(hmacctx-&gt;desc);</div><div class='del'>-		hmacctx-&gt;desc = NULL;</div><div class='add'>+	if (hmacctx-&gt;base_hash) {</div><div class='add'>+		chcr_free_shash(hmacctx-&gt;base_hash);</div><div class='add'>+		hmacctx-&gt;base_hash = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_copy_assoc(struct aead_request *req,</div><div class='add'>+				struct chcr_aead_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	SKCIPHER_REQUEST_ON_STACK(skreq, ctx-&gt;null);</div><div class='add'>+</div><div class='add'>+	skcipher_request_set_tfm(skreq, ctx-&gt;null);</div><div class='add'>+	skcipher_request_set_callback(skreq, aead_request_flags(req),</div><div class='add'>+			NULL, NULL);</div><div class='add'>+	skcipher_request_set_crypt(skreq, req-&gt;src, req-&gt;dst, req-&gt;assoclen,</div><div class='add'>+			NULL);</div><div class='add'>+</div><div class='add'>+	return crypto_skcipher_encrypt(skreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char get_hmac(unsigned int authsize)</div><div class='add'>+{</div><div class='add'>+	switch (authsize) {</div><div class='add'>+	case ICV_8:</div><div class='add'>+		return CHCR_SCMD_HMAC_CTRL_PL1;</div><div class='add'>+	case ICV_10:</div><div class='add'>+		return CHCR_SCMD_HMAC_CTRL_TRUNC_RFC4366;</div><div class='add'>+	case ICV_12:</div><div class='add'>+		return CHCR_SCMD_HMAC_CTRL_IPSEC_96BIT;</div><div class='add'>+	}</div><div class='add'>+	return CHCR_SCMD_HMAC_CTRL_NO_TRUNC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct sk_buff *create_authenc_wr(struct aead_request *req,</div><div class='add'>+					 unsigned short qid,</div><div class='add'>+					 int size,</div><div class='add'>+					 unsigned short op_type)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	struct chcr_context *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	struct uld_ctx *u_ctx = ULD_CTX(ctx);</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);</div><div class='add'>+	struct chcr_authenc_ctx *actx = AUTHENC_CTX(aeadctx);</div><div class='add'>+	struct chcr_aead_reqctx *reqctx = aead_request_ctx(req);</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct chcr_wr *chcr_req;</div><div class='add'>+	struct cpl_rx_phys_dsgl *phys_cpl;</div><div class='add'>+	struct phys_sge_parm sg_param;</div><div class='add'>+	struct scatterlist *src;</div><div class='add'>+	unsigned int frags = 0, transhdr_len;</div><div class='add'>+	unsigned int ivsize = crypto_aead_ivsize(tfm), dst_size = 0;</div><div class='add'>+	unsigned int   kctx_len = 0;</div><div class='add'>+	unsigned short stop_offset = 0;</div><div class='add'>+	unsigned int  assoclen = req-&gt;assoclen;</div><div class='add'>+	unsigned int  authsize = crypto_aead_authsize(tfm);</div><div class='add'>+	int err = 0;</div><div class='add'>+	int null = 0;</div><div class='add'>+	gfp_t flags = req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :</div><div class='add'>+		GFP_ATOMIC;</div><div class='add'>+</div><div class='add'>+	if (aeadctx-&gt;enckey_len == 0 || (req-&gt;cryptlen == 0))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (op_type &amp;&amp; req-&gt;cryptlen &lt; crypto_aead_authsize(tfm))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (sg_nents_for_len(req-&gt;src, req-&gt;assoclen + req-&gt;cryptlen) &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+	src = scatterwalk_ffwd(reqctx-&gt;srcffwd, req-&gt;src, req-&gt;assoclen);</div><div class='add'>+	reqctx-&gt;dst = src;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;src != req-&gt;dst) {</div><div class='add'>+		err = chcr_copy_assoc(req, aeadctx);</div><div class='add'>+		if (err)</div><div class='add'>+			return ERR_PTR(err);</div><div class='add'>+		reqctx-&gt;dst = scatterwalk_ffwd(reqctx-&gt;dstffwd, req-&gt;dst,</div><div class='add'>+					       req-&gt;assoclen);</div><div class='add'>+	}</div><div class='add'>+	if (get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_NULL) {</div><div class='add'>+		null = 1;</div><div class='add'>+		assoclen = 0;</div><div class='add'>+	}</div><div class='add'>+	reqctx-&gt;dst_nents = sg_nents_for_len(reqctx-&gt;dst, req-&gt;cryptlen +</div><div class='add'>+					     (op_type ? -authsize : authsize));</div><div class='add'>+	if (reqctx-&gt;dst_nents &lt;= 0) {</div><div class='add'>+		pr_err("AUTHENC:Invalid Destination sg entries\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	dst_size = get_space_for_phys_dsgl(reqctx-&gt;dst_nents);</div><div class='add'>+	kctx_len = (ntohl(KEY_CONTEXT_CTX_LEN_V(aeadctx-&gt;key_ctx_hdr)) &lt;&lt; 4)</div><div class='add'>+		- sizeof(chcr_req-&gt;key_ctx);</div><div class='add'>+	transhdr_len = CIPHER_TRANSHDR_SIZE(kctx_len, dst_size);</div><div class='add'>+	skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* LLD is going to write the sge hdr. */</div><div class='add'>+	skb_reserve(skb, sizeof(struct sge_opaque_hdr));</div><div class='add'>+</div><div class='add'>+	/* Write WR */</div><div class='add'>+	chcr_req = (struct chcr_wr *) __skb_put(skb, transhdr_len);</div><div class='add'>+	memset(chcr_req, 0, transhdr_len);</div><div class='add'>+</div><div class='add'>+	stop_offset = (op_type == CHCR_ENCRYPT_OP) ? 0 : authsize;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Input order	is AAD,IV and Payload. where IV should be included as</div><div class='add'>+	 * the part of authdata. All other fields should be filled according</div><div class='add'>+	 * to the hardware spec</div><div class='add'>+	 */</div><div class='add'>+	chcr_req-&gt;sec_cpl.op_ivinsrtofst =</div><div class='add'>+		FILL_SEC_CPL_OP_IVINSR(ctx-&gt;dev-&gt;rx_channel_id, 2,</div><div class='add'>+				       (ivsize ? (assoclen + 1) : 0));</div><div class='add'>+	chcr_req-&gt;sec_cpl.pldlen = htonl(assoclen + ivsize + req-&gt;cryptlen);</div><div class='add'>+	chcr_req-&gt;sec_cpl.aadstart_cipherstop_hi = FILL_SEC_CPL_CIPHERSTOP_HI(</div><div class='add'>+					assoclen ? 1 : 0, assoclen,</div><div class='add'>+					assoclen + ivsize + 1,</div><div class='add'>+					(stop_offset &amp; 0x1F0) &gt;&gt; 4);</div><div class='add'>+	chcr_req-&gt;sec_cpl.cipherstop_lo_authinsert = FILL_SEC_CPL_AUTHINSERT(</div><div class='add'>+					stop_offset &amp; 0xF,</div><div class='add'>+					null ? 0 : assoclen + ivsize + 1,</div><div class='add'>+					stop_offset, stop_offset);</div><div class='add'>+	chcr_req-&gt;sec_cpl.seqno_numivs = FILL_SEC_CPL_SCMD0_SEQNO(op_type,</div><div class='add'>+					(op_type == CHCR_ENCRYPT_OP) ? 1 : 0,</div><div class='add'>+					CHCR_SCMD_CIPHER_MODE_AES_CBC,</div><div class='add'>+					actx-&gt;auth_mode, aeadctx-&gt;hmac_ctrl,</div><div class='add'>+					ivsize &gt;&gt; 1);</div><div class='add'>+	chcr_req-&gt;sec_cpl.ivgen_hdrlen =  FILL_SEC_CPL_IVGEN_HDRLEN(0, 0, 1,</div><div class='add'>+					 0, 1, dst_size);</div><div class='add'>+</div><div class='add'>+	chcr_req-&gt;key_ctx.ctx_hdr = aeadctx-&gt;key_ctx_hdr;</div><div class='add'>+	if (op_type == CHCR_ENCRYPT_OP)</div><div class='add'>+		memcpy(chcr_req-&gt;key_ctx.key, aeadctx-&gt;key,</div><div class='add'>+		       aeadctx-&gt;enckey_len);</div><div class='add'>+	else</div><div class='add'>+		memcpy(chcr_req-&gt;key_ctx.key, actx-&gt;dec_rrkey,</div><div class='add'>+		       aeadctx-&gt;enckey_len);</div><div class='add'>+</div><div class='add'>+	memcpy(chcr_req-&gt;key_ctx.key + (DIV_ROUND_UP(aeadctx-&gt;enckey_len, 16) &lt;&lt;</div><div class='add'>+					4), actx-&gt;h_iopad, kctx_len -</div><div class='add'>+				(DIV_ROUND_UP(aeadctx-&gt;enckey_len, 16) &lt;&lt; 4));</div><div class='add'>+</div><div class='add'>+	phys_cpl = (struct cpl_rx_phys_dsgl *)((u8 *)(chcr_req + 1) + kctx_len);</div><div class='add'>+	sg_param.nents = reqctx-&gt;dst_nents;</div><div class='add'>+	sg_param.obsize = req-&gt;cryptlen + (op_type ? -authsize : authsize);</div><div class='add'>+	sg_param.qid = qid;</div><div class='add'>+	sg_param.align = 0;</div><div class='add'>+	if (map_writesg_phys_cpl(&amp;u_ctx-&gt;lldi.pdev-&gt;dev, phys_cpl, reqctx-&gt;dst,</div><div class='add'>+				  &amp;sg_param))</div><div class='add'>+		goto dstmap_fail;</div><div class='add'>+</div><div class='add'>+	skb_set_transport_header(skb, transhdr_len);</div><div class='add'>+</div><div class='add'>+	if (assoclen) {</div><div class='add'>+		/* AAD buffer in */</div><div class='add'>+		write_sg_to_skb(skb, &amp;frags, req-&gt;src, assoclen);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	write_buffer_to_skb(skb, &amp;frags, req-&gt;iv, ivsize);</div><div class='add'>+	write_sg_to_skb(skb, &amp;frags, src, req-&gt;cryptlen);</div><div class='add'>+	create_wreq(ctx, chcr_req, req, skb, kctx_len, size, 1,</div><div class='add'>+		   sizeof(struct cpl_rx_phys_dsgl) + dst_size);</div><div class='add'>+	reqctx-&gt;skb = skb;</div><div class='add'>+	skb_get(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+dstmap_fail:</div><div class='add'>+	/* ivmap_fail: */</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+err:</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aes_gcm_empty_pld_pad(struct scatterlist *sg,</div><div class='add'>+				  unsigned short offset)</div><div class='add'>+{</div><div class='add'>+	struct page *spage;</div><div class='add'>+	unsigned char *addr;</div><div class='add'>+</div><div class='add'>+	spage = sg_page(sg);</div><div class='add'>+	get_page(spage); /* so that it is not freed by NIC */</div><div class='add'>+#ifdef KMAP_ATOMIC_ARGS</div><div class='add'>+	addr = kmap_atomic(spage, KM_SOFTIRQ0);</div><div class='add'>+#else</div><div class='add'>+	addr = kmap_atomic(spage);</div><div class='add'>+#endif</div><div class='add'>+	memset(addr + sg-&gt;offset, 0, offset + 1);</div><div class='add'>+</div><div class='add'>+	kunmap_atomic(addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_msg_len(u8 *block, unsigned int msglen, int csize)</div><div class='add'>+{</div><div class='add'>+	__be32 data;</div><div class='add'>+</div><div class='add'>+	memset(block, 0, csize);</div><div class='add'>+	block += csize;</div><div class='add'>+</div><div class='add'>+	if (csize &gt;= 4)</div><div class='add'>+		csize = 4;</div><div class='add'>+	else if (msglen &gt; (unsigned int)(1 &lt;&lt; (8 * csize)))</div><div class='add'>+		return -EOVERFLOW;</div><div class='add'>+</div><div class='add'>+	data = cpu_to_be32(msglen);</div><div class='add'>+	memcpy(block - csize, (u8 *)&amp;data + 4 - csize, csize);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void generate_b0(struct aead_request *req,</div><div class='add'>+			struct chcr_aead_ctx *aeadctx,</div><div class='add'>+			unsigned short op_type)</div><div class='add'>+{</div><div class='add'>+	unsigned int l, lp, m;</div><div class='add'>+	int rc;</div><div class='add'>+	struct crypto_aead *aead = crypto_aead_reqtfm(req);</div><div class='add'>+	struct chcr_aead_reqctx *reqctx = aead_request_ctx(req);</div><div class='add'>+	u8 *b0 = reqctx-&gt;scratch_pad;</div><div class='add'>+</div><div class='add'>+	m = crypto_aead_authsize(aead);</div><div class='add'>+</div><div class='add'>+	memcpy(b0, reqctx-&gt;iv, 16);</div><div class='add'>+</div><div class='add'>+	lp = b0[0];</div><div class='add'>+	l = lp + 1;</div><div class='add'>+</div><div class='add'>+	/* set m, bits 3-5 */</div><div class='add'>+	*b0 |= (8 * ((m - 2) / 2));</div><div class='add'>+</div><div class='add'>+	/* set adata, bit 6, if associated data is used */</div><div class='add'>+	if (req-&gt;assoclen)</div><div class='add'>+		*b0 |= 64;</div><div class='add'>+	rc = set_msg_len(b0 + 16 - l,</div><div class='add'>+			 (op_type == CHCR_DECRYPT_OP) ?</div><div class='add'>+			 req-&gt;cryptlen - m : req-&gt;cryptlen, l);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int crypto_ccm_check_iv(const u8 *iv)</div><div class='add'>+{</div><div class='add'>+	/* 2 &lt;= L &lt;= 8, so 1 &lt;= L' &lt;= 7. */</div><div class='add'>+	if (iv[0] &lt; 1 || iv[0] &gt; 7)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ccm_format_packet(struct aead_request *req,</div><div class='add'>+			     struct chcr_aead_ctx *aeadctx,</div><div class='add'>+			     unsigned int sub_type,</div><div class='add'>+			     unsigned short op_type)</div><div class='add'>+{</div><div class='add'>+	struct chcr_aead_reqctx *reqctx = aead_request_ctx(req);</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;assoclen &gt; T5_MAX_AAD_SIZE) {</div><div class='add'>+		pr_err("CCM: Unsupported AAD data. It should be &lt; %d\n",</div><div class='add'>+		       T5_MAX_AAD_SIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (sub_type == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4309) {</div><div class='add'>+		reqctx-&gt;iv[0] = 3;</div><div class='add'>+		memcpy(reqctx-&gt;iv + 1, &amp;aeadctx-&gt;salt[0], 3);</div><div class='add'>+		memcpy(reqctx-&gt;iv + 4, req-&gt;iv, 8);</div><div class='add'>+		memset(reqctx-&gt;iv + 12, 0, 4);</div><div class='add'>+		*((unsigned short *)(reqctx-&gt;scratch_pad + 16)) =</div><div class='add'>+			htons(req-&gt;assoclen - 8);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(reqctx-&gt;iv, req-&gt;iv, 16);</div><div class='add'>+		*((unsigned short *)(reqctx-&gt;scratch_pad + 16)) =</div><div class='add'>+			htons(req-&gt;assoclen);</div><div class='add'>+	}</div><div class='add'>+	generate_b0(req, aeadctx, op_type);</div><div class='add'>+	/* zero the ctr value */</div><div class='add'>+	memset(reqctx-&gt;iv + 15 - reqctx-&gt;iv[0], 0, reqctx-&gt;iv[0] + 1);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fill_sec_cpl_for_aead(struct cpl_tx_sec_pdu *sec_cpl,</div><div class='add'>+				  unsigned int dst_size,</div><div class='add'>+				  struct aead_request *req,</div><div class='add'>+				  unsigned short op_type,</div><div class='add'>+					  struct chcr_context *chcrctx)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	unsigned int ivsize = AES_BLOCK_SIZE;</div><div class='add'>+	unsigned int cipher_mode = CHCR_SCMD_CIPHER_MODE_AES_CCM;</div><div class='add'>+	unsigned int mac_mode = CHCR_SCMD_AUTH_MODE_CBCMAC;</div><div class='add'>+	unsigned int c_id = chcrctx-&gt;dev-&gt;rx_channel_id;</div><div class='add'>+	unsigned int ccm_xtra;</div><div class='add'>+	unsigned char tag_offset = 0, auth_offset = 0;</div><div class='add'>+	unsigned char hmac_ctrl = get_hmac(crypto_aead_authsize(tfm));</div><div class='add'>+	unsigned int assoclen;</div><div class='add'>+</div><div class='add'>+	if (get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4309)</div><div class='add'>+		assoclen = req-&gt;assoclen - 8;</div><div class='add'>+	else</div><div class='add'>+		assoclen = req-&gt;assoclen;</div><div class='add'>+	ccm_xtra = CCM_B0_SIZE +</div><div class='add'>+		((assoclen) ? CCM_AAD_FIELD_SIZE : 0);</div><div class='add'>+</div><div class='add'>+	auth_offset = req-&gt;cryptlen ?</div><div class='add'>+		(assoclen + ivsize + 1 + ccm_xtra) : 0;</div><div class='add'>+	if (op_type == CHCR_DECRYPT_OP) {</div><div class='add'>+		if (crypto_aead_authsize(tfm) != req-&gt;cryptlen)</div><div class='add'>+			tag_offset = crypto_aead_authsize(tfm);</div><div class='add'>+		else</div><div class='add'>+			auth_offset = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	sec_cpl-&gt;op_ivinsrtofst = FILL_SEC_CPL_OP_IVINSR(c_id,</div><div class='add'>+					 2, (ivsize ?  (assoclen + 1) :  0) +</div><div class='add'>+					 ccm_xtra);</div><div class='add'>+	sec_cpl-&gt;pldlen =</div><div class='add'>+		htonl(assoclen + ivsize + req-&gt;cryptlen + ccm_xtra);</div><div class='add'>+	/* For CCM there wil be b0 always. So AAD start will be 1 always */</div><div class='add'>+	sec_cpl-&gt;aadstart_cipherstop_hi = FILL_SEC_CPL_CIPHERSTOP_HI(</div><div class='add'>+					1, assoclen + ccm_xtra, assoclen</div><div class='add'>+					+ ivsize + 1 + ccm_xtra, 0);</div><div class='add'>+</div><div class='add'>+	sec_cpl-&gt;cipherstop_lo_authinsert = FILL_SEC_CPL_AUTHINSERT(0,</div><div class='add'>+					auth_offset, tag_offset,</div><div class='add'>+					(op_type == CHCR_ENCRYPT_OP) ? 0 :</div><div class='add'>+					crypto_aead_authsize(tfm));</div><div class='add'>+	sec_cpl-&gt;seqno_numivs =  FILL_SEC_CPL_SCMD0_SEQNO(op_type,</div><div class='add'>+					(op_type == CHCR_ENCRYPT_OP) ? 0 : 1,</div><div class='add'>+					cipher_mode, mac_mode, hmac_ctrl,</div><div class='add'>+					ivsize &gt;&gt; 1);</div><div class='add'>+</div><div class='add'>+	sec_cpl-&gt;ivgen_hdrlen = FILL_SEC_CPL_IVGEN_HDRLEN(0, 0, 1, 0,</div><div class='add'>+					1, dst_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aead_ccm_validate_input(unsigned short op_type,</div><div class='add'>+			    struct aead_request *req,</div><div class='add'>+			    struct chcr_aead_ctx *aeadctx,</div><div class='add'>+			    unsigned int sub_type)</div><div class='add'>+{</div><div class='add'>+	if (sub_type != CRYPTO_ALG_SUB_TYPE_AEAD_RFC4309) {</div><div class='add'>+		if (crypto_ccm_check_iv(req-&gt;iv)) {</div><div class='add'>+			pr_err("CCM: IV check fails\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (req-&gt;assoclen != 16 &amp;&amp; req-&gt;assoclen != 20) {</div><div class='add'>+			pr_err("RFC4309: Invalid AAD length %d\n",</div><div class='add'>+			       req-&gt;assoclen);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (aeadctx-&gt;enckey_len == 0) {</div><div class='add'>+		pr_err("CCM: Encryption key not set\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int fill_aead_req_fields(struct sk_buff *skb,</div><div class='add'>+				  struct aead_request *req,</div><div class='add'>+				  struct scatterlist *src,</div><div class='add'>+				  unsigned int ivsize,</div><div class='add'>+				  struct chcr_aead_ctx *aeadctx)</div><div class='add'>+{</div><div class='add'>+	unsigned int frags = 0;</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	struct chcr_aead_reqctx *reqctx = aead_request_ctx(req);</div><div class='add'>+	/* b0 and aad length(if available) */</div><div class='add'>+</div><div class='add'>+	write_buffer_to_skb(skb, &amp;frags, reqctx-&gt;scratch_pad, CCM_B0_SIZE +</div><div class='add'>+				(req-&gt;assoclen ?  CCM_AAD_FIELD_SIZE : 0));</div><div class='add'>+	if (req-&gt;assoclen) {</div><div class='add'>+		if (get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4309)</div><div class='add'>+			write_sg_to_skb(skb, &amp;frags, req-&gt;src,</div><div class='add'>+					req-&gt;assoclen - 8);</div><div class='add'>+		else</div><div class='add'>+			write_sg_to_skb(skb, &amp;frags, req-&gt;src, req-&gt;assoclen);</div><div class='add'>+	}</div><div class='add'>+	write_buffer_to_skb(skb, &amp;frags, reqctx-&gt;iv, ivsize);</div><div class='add'>+	if (req-&gt;cryptlen)</div><div class='add'>+		write_sg_to_skb(skb, &amp;frags, src, req-&gt;cryptlen);</div><div class='add'>+</div><div class='add'>+	return frags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *create_aead_ccm_wr(struct aead_request *req,</div><div class='add'>+					  unsigned short qid,</div><div class='add'>+					  int size,</div><div class='add'>+					  unsigned short op_type)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	struct chcr_context *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	struct uld_ctx *u_ctx = ULD_CTX(ctx);</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);</div><div class='add'>+	struct chcr_aead_reqctx *reqctx = aead_request_ctx(req);</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct chcr_wr *chcr_req;</div><div class='add'>+	struct cpl_rx_phys_dsgl *phys_cpl;</div><div class='add'>+	struct phys_sge_parm sg_param;</div><div class='add'>+	struct scatterlist *src;</div><div class='add'>+	unsigned int frags = 0, transhdr_len, ivsize = AES_BLOCK_SIZE;</div><div class='add'>+	unsigned int dst_size = 0, kctx_len;</div><div class='add'>+	unsigned int sub_type;</div><div class='add'>+	unsigned int authsize = crypto_aead_authsize(tfm);</div><div class='add'>+	int err = 0;</div><div class='add'>+	gfp_t flags = req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :</div><div class='add'>+		GFP_ATOMIC;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (op_type &amp;&amp; req-&gt;cryptlen &lt; crypto_aead_authsize(tfm))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (sg_nents_for_len(req-&gt;src, req-&gt;assoclen + req-&gt;cryptlen) &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+	sub_type = get_aead_subtype(tfm);</div><div class='add'>+	src = scatterwalk_ffwd(reqctx-&gt;srcffwd, req-&gt;src, req-&gt;assoclen);</div><div class='add'>+	reqctx-&gt;dst = src;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;src != req-&gt;dst) {</div><div class='add'>+		err = chcr_copy_assoc(req, aeadctx);</div><div class='add'>+		if (err) {</div><div class='add'>+			pr_err("AAD copy to destination buffer fails\n");</div><div class='add'>+			return ERR_PTR(err);</div><div class='add'>+		}</div><div class='add'>+		reqctx-&gt;dst = scatterwalk_ffwd(reqctx-&gt;dstffwd, req-&gt;dst,</div><div class='add'>+					       req-&gt;assoclen);</div><div class='add'>+	}</div><div class='add'>+	reqctx-&gt;dst_nents = sg_nents_for_len(reqctx-&gt;dst, req-&gt;cryptlen +</div><div class='add'>+					     (op_type ? -authsize : authsize));</div><div class='add'>+	if (reqctx-&gt;dst_nents &lt;= 0) {</div><div class='add'>+		pr_err("CCM:Invalid Destination sg entries\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (aead_ccm_validate_input(op_type, req, aeadctx, sub_type))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	dst_size = get_space_for_phys_dsgl(reqctx-&gt;dst_nents);</div><div class='add'>+	kctx_len = ((DIV_ROUND_UP(aeadctx-&gt;enckey_len, 16)) &lt;&lt; 4) * 2;</div><div class='add'>+	transhdr_len = CIPHER_TRANSHDR_SIZE(kctx_len, dst_size);</div><div class='add'>+	skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)),  flags);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, sizeof(struct sge_opaque_hdr));</div><div class='add'>+</div><div class='add'>+	chcr_req = (struct chcr_wr *) __skb_put(skb, transhdr_len);</div><div class='add'>+	memset(chcr_req, 0, transhdr_len);</div><div class='add'>+</div><div class='add'>+	fill_sec_cpl_for_aead(&amp;chcr_req-&gt;sec_cpl, dst_size, req, op_type, ctx);</div><div class='add'>+</div><div class='add'>+	chcr_req-&gt;key_ctx.ctx_hdr = aeadctx-&gt;key_ctx_hdr;</div><div class='add'>+	memcpy(chcr_req-&gt;key_ctx.key, aeadctx-&gt;key, aeadctx-&gt;enckey_len);</div><div class='add'>+	memcpy(chcr_req-&gt;key_ctx.key + (DIV_ROUND_UP(aeadctx-&gt;enckey_len, 16) *</div><div class='add'>+					16), aeadctx-&gt;key, aeadctx-&gt;enckey_len);</div><div class='add'>+</div><div class='add'>+	phys_cpl = (struct cpl_rx_phys_dsgl *)((u8 *)(chcr_req + 1) + kctx_len);</div><div class='add'>+	if (ccm_format_packet(req, aeadctx, sub_type, op_type))</div><div class='add'>+		goto dstmap_fail;</div><div class='add'>+</div><div class='add'>+	sg_param.nents = reqctx-&gt;dst_nents;</div><div class='add'>+	sg_param.obsize = req-&gt;cryptlen + (op_type ? -authsize : authsize);</div><div class='add'>+	sg_param.qid = qid;</div><div class='add'>+	sg_param.align = 0;</div><div class='add'>+	if (map_writesg_phys_cpl(&amp;u_ctx-&gt;lldi.pdev-&gt;dev, phys_cpl, reqctx-&gt;dst,</div><div class='add'>+				  &amp;sg_param))</div><div class='add'>+		goto dstmap_fail;</div><div class='add'>+</div><div class='add'>+	skb_set_transport_header(skb, transhdr_len);</div><div class='add'>+	frags = fill_aead_req_fields(skb, req, src, ivsize, aeadctx);</div><div class='add'>+	create_wreq(ctx, chcr_req, req, skb, kctx_len, 0, 1,</div><div class='add'>+		    sizeof(struct cpl_rx_phys_dsgl) + dst_size);</div><div class='add'>+	reqctx-&gt;skb = skb;</div><div class='add'>+	skb_get(skb);</div><div class='add'>+	return skb;</div><div class='add'>+dstmap_fail:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	skb = NULL;</div><div class='add'>+err:</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *create_gcm_wr(struct aead_request *req,</div><div class='add'>+				     unsigned short qid,</div><div class='add'>+				     int size,</div><div class='add'>+				     unsigned short op_type)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	struct chcr_context *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	struct uld_ctx *u_ctx = ULD_CTX(ctx);</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);</div><div class='add'>+	struct chcr_aead_reqctx  *reqctx = aead_request_ctx(req);</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct chcr_wr *chcr_req;</div><div class='add'>+	struct cpl_rx_phys_dsgl *phys_cpl;</div><div class='add'>+	struct phys_sge_parm sg_param;</div><div class='add'>+	struct scatterlist *src;</div><div class='add'>+	unsigned int frags = 0, transhdr_len;</div><div class='add'>+	unsigned int ivsize = AES_BLOCK_SIZE;</div><div class='add'>+	unsigned int dst_size = 0, kctx_len;</div><div class='add'>+	unsigned char tag_offset = 0;</div><div class='add'>+	unsigned int crypt_len = 0;</div><div class='add'>+	unsigned int authsize = crypto_aead_authsize(tfm);</div><div class='add'>+	unsigned char hmac_ctrl = get_hmac(authsize);</div><div class='add'>+	int err = 0;</div><div class='add'>+	gfp_t flags = req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :</div><div class='add'>+		GFP_ATOMIC;</div><div class='add'>+</div><div class='add'>+	/* validate key size */</div><div class='add'>+	if (aeadctx-&gt;enckey_len == 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (op_type &amp;&amp; req-&gt;cryptlen &lt; crypto_aead_authsize(tfm))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (sg_nents_for_len(req-&gt;src, req-&gt;assoclen + req-&gt;cryptlen) &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	src = scatterwalk_ffwd(reqctx-&gt;srcffwd, req-&gt;src, req-&gt;assoclen);</div><div class='add'>+	reqctx-&gt;dst = src;</div><div class='add'>+	if (req-&gt;src != req-&gt;dst) {</div><div class='add'>+		err = chcr_copy_assoc(req, aeadctx);</div><div class='add'>+		if (err)</div><div class='add'>+			return	ERR_PTR(err);</div><div class='add'>+		reqctx-&gt;dst = scatterwalk_ffwd(reqctx-&gt;dstffwd, req-&gt;dst,</div><div class='add'>+					       req-&gt;assoclen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!req-&gt;cryptlen)</div><div class='add'>+		/* null-payload is not supported in the hardware.</div><div class='add'>+		 * software is sending block size</div><div class='add'>+		 */</div><div class='add'>+		crypt_len = AES_BLOCK_SIZE;</div><div class='add'>+	else</div><div class='add'>+		crypt_len = req-&gt;cryptlen;</div><div class='add'>+	reqctx-&gt;dst_nents = sg_nents_for_len(reqctx-&gt;dst, req-&gt;cryptlen +</div><div class='add'>+					     (op_type ? -authsize : authsize));</div><div class='add'>+	if (reqctx-&gt;dst_nents &lt;= 0) {</div><div class='add'>+		pr_err("GCM:Invalid Destination sg entries\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dst_size = get_space_for_phys_dsgl(reqctx-&gt;dst_nents);</div><div class='add'>+	kctx_len = ((DIV_ROUND_UP(aeadctx-&gt;enckey_len, 16)) &lt;&lt; 4) +</div><div class='add'>+		AEAD_H_SIZE;</div><div class='add'>+	transhdr_len = CIPHER_TRANSHDR_SIZE(kctx_len, dst_size);</div><div class='add'>+	skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* NIC driver is going to write the sge hdr. */</div><div class='add'>+	skb_reserve(skb, sizeof(struct sge_opaque_hdr));</div><div class='add'>+</div><div class='add'>+	chcr_req = (struct chcr_wr *)__skb_put(skb, transhdr_len);</div><div class='add'>+	memset(chcr_req, 0, transhdr_len);</div><div class='add'>+</div><div class='add'>+	if (get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106)</div><div class='add'>+		req-&gt;assoclen -= 8;</div><div class='add'>+</div><div class='add'>+	tag_offset = (op_type == CHCR_ENCRYPT_OP) ? 0 : authsize;</div><div class='add'>+	chcr_req-&gt;sec_cpl.op_ivinsrtofst = FILL_SEC_CPL_OP_IVINSR(</div><div class='add'>+					ctx-&gt;dev-&gt;rx_channel_id, 2, (ivsize ?</div><div class='add'>+					(req-&gt;assoclen + 1) : 0));</div><div class='add'>+	chcr_req-&gt;sec_cpl.pldlen = htonl(req-&gt;assoclen + ivsize + crypt_len);</div><div class='add'>+	chcr_req-&gt;sec_cpl.aadstart_cipherstop_hi = FILL_SEC_CPL_CIPHERSTOP_HI(</div><div class='add'>+					req-&gt;assoclen ? 1 : 0, req-&gt;assoclen,</div><div class='add'>+					req-&gt;assoclen + ivsize + 1, 0);</div><div class='add'>+	if (req-&gt;cryptlen) {</div><div class='add'>+		chcr_req-&gt;sec_cpl.cipherstop_lo_authinsert =</div><div class='add'>+			FILL_SEC_CPL_AUTHINSERT(0, req-&gt;assoclen + ivsize + 1,</div><div class='add'>+						tag_offset, tag_offset);</div><div class='add'>+		chcr_req-&gt;sec_cpl.seqno_numivs =</div><div class='add'>+			FILL_SEC_CPL_SCMD0_SEQNO(op_type, (op_type ==</div><div class='add'>+					CHCR_ENCRYPT_OP) ? 1 : 0,</div><div class='add'>+					CHCR_SCMD_CIPHER_MODE_AES_GCM,</div><div class='add'>+					CHCR_SCMD_AUTH_MODE_GHASH, hmac_ctrl,</div><div class='add'>+					ivsize &gt;&gt; 1);</div><div class='add'>+	} else {</div><div class='add'>+		chcr_req-&gt;sec_cpl.cipherstop_lo_authinsert =</div><div class='add'>+			FILL_SEC_CPL_AUTHINSERT(0, 0, 0, 0);</div><div class='add'>+		chcr_req-&gt;sec_cpl.seqno_numivs =</div><div class='add'>+			FILL_SEC_CPL_SCMD0_SEQNO(op_type,</div><div class='add'>+					(op_type ==  CHCR_ENCRYPT_OP) ?</div><div class='add'>+					1 : 0, CHCR_SCMD_CIPHER_MODE_AES_CBC,</div><div class='add'>+					0, 0, ivsize &gt;&gt; 1);</div><div class='add'>+	}</div><div class='add'>+	chcr_req-&gt;sec_cpl.ivgen_hdrlen =  FILL_SEC_CPL_IVGEN_HDRLEN(0, 0, 1,</div><div class='add'>+					0, 1, dst_size);</div><div class='add'>+	chcr_req-&gt;key_ctx.ctx_hdr = aeadctx-&gt;key_ctx_hdr;</div><div class='add'>+	memcpy(chcr_req-&gt;key_ctx.key, aeadctx-&gt;key, aeadctx-&gt;enckey_len);</div><div class='add'>+	memcpy(chcr_req-&gt;key_ctx.key + (DIV_ROUND_UP(aeadctx-&gt;enckey_len, 16) *</div><div class='add'>+				16), GCM_CTX(aeadctx)-&gt;ghash_h, AEAD_H_SIZE);</div><div class='add'>+</div><div class='add'>+	/* prepare a 16 byte iv */</div><div class='add'>+	/* S   A   L  T |  IV | 0x00000001 */</div><div class='add'>+	if (get_aead_subtype(tfm) ==</div><div class='add'>+	    CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106) {</div><div class='add'>+		memcpy(reqctx-&gt;iv, aeadctx-&gt;salt, 4);</div><div class='add'>+		memcpy(reqctx-&gt;iv + 4, req-&gt;iv, 8);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(reqctx-&gt;iv, req-&gt;iv, 12);</div><div class='add'>+	}</div><div class='add'>+	*((unsigned int *)(reqctx-&gt;iv + 12)) = htonl(0x01);</div><div class='add'>+</div><div class='add'>+	phys_cpl = (struct cpl_rx_phys_dsgl *)((u8 *)(chcr_req + 1) + kctx_len);</div><div class='add'>+	sg_param.nents = reqctx-&gt;dst_nents;</div><div class='add'>+	sg_param.obsize = req-&gt;cryptlen + (op_type ? -authsize : authsize);</div><div class='add'>+	sg_param.qid = qid;</div><div class='add'>+	sg_param.align = 0;</div><div class='add'>+	if (map_writesg_phys_cpl(&amp;u_ctx-&gt;lldi.pdev-&gt;dev, phys_cpl, reqctx-&gt;dst,</div><div class='add'>+				  &amp;sg_param))</div><div class='add'>+		goto dstmap_fail;</div><div class='add'>+</div><div class='add'>+	skb_set_transport_header(skb, transhdr_len);</div><div class='add'>+</div><div class='add'>+	write_sg_to_skb(skb, &amp;frags, req-&gt;src, req-&gt;assoclen);</div><div class='add'>+</div><div class='add'>+	write_buffer_to_skb(skb, &amp;frags, reqctx-&gt;iv, ivsize);</div><div class='add'>+</div><div class='add'>+	if (req-&gt;cryptlen) {</div><div class='add'>+		write_sg_to_skb(skb, &amp;frags, src, req-&gt;cryptlen);</div><div class='add'>+	} else {</div><div class='add'>+		aes_gcm_empty_pld_pad(req-&gt;dst, authsize - 1);</div><div class='add'>+		write_sg_to_skb(skb, &amp;frags, reqctx-&gt;dst, crypt_len);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	create_wreq(ctx, chcr_req, req, skb, kctx_len, size, 1,</div><div class='add'>+			sizeof(struct cpl_rx_phys_dsgl) + dst_size);</div><div class='add'>+	reqctx-&gt;skb = skb;</div><div class='add'>+	skb_get(skb);</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+dstmap_fail:</div><div class='add'>+	/* ivmap_fail: */</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	skb = NULL;</div><div class='add'>+err:</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int chcr_aead_cra_init(struct crypto_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	struct chcr_context *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);</div><div class='add'>+</div><div class='add'>+	crypto_aead_set_reqsize(tfm, sizeof(struct chcr_aead_reqctx));</div><div class='add'>+	aeadctx-&gt;null = crypto_get_default_null_skcipher();</div><div class='add'>+	if (IS_ERR(aeadctx-&gt;null))</div><div class='add'>+		return PTR_ERR(aeadctx-&gt;null);</div><div class='add'>+	return chcr_device_init(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chcr_aead_cra_exit(struct crypto_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	crypto_put_default_null_skcipher();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_authenc_null_setauthsize(struct crypto_aead *tfm,</div><div class='add'>+					unsigned int authsize)</div><div class='add'>+{</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(crypto_aead_ctx(tfm));</div><div class='add'>+</div><div class='add'>+	aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_NOP;</div><div class='add'>+	aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int chcr_authenc_setauthsize(struct crypto_aead *tfm,</div><div class='add'>+				    unsigned int authsize)</div><div class='add'>+{</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(crypto_aead_ctx(tfm));</div><div class='add'>+	u32 maxauth = crypto_aead_maxauthsize(tfm);</div><div class='add'>+</div><div class='add'>+	/*SHA1 authsize in ipsec is 12 instead of 10 i.e maxauthsize / 2 is not</div><div class='add'>+	 * true for sha1. authsize == 12 condition should be before</div><div class='add'>+	 * authsize == (maxauth &gt;&gt; 1)</div><div class='add'>+	 */</div><div class='add'>+	if (authsize == ICV_4) {</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_PL1;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+	} else if (authsize == ICV_6) {</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_PL2;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+	} else if (authsize == ICV_10) {</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_TRUNC_RFC4366;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+	} else if (authsize == ICV_12) {</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_IPSEC_96BIT;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+	} else if (authsize == ICV_14) {</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_PL3;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+	} else if (authsize == (maxauth &gt;&gt; 1)) {</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_DIV2;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+	} else if (authsize == maxauth) {</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_NO_TRUNC;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+	} else {</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_NO_TRUNC;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_SW;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int chcr_gcm_setauthsize(struct crypto_aead *tfm, unsigned int authsize)</div><div class='add'>+{</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(crypto_aead_ctx(tfm));</div><div class='add'>+</div><div class='add'>+	switch (authsize) {</div><div class='add'>+	case ICV_4:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_PL1;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_8:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_DIV2;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_12:</div><div class='add'>+		 aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_IPSEC_96BIT;</div><div class='add'>+		 aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_14:</div><div class='add'>+		 aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_PL3;</div><div class='add'>+		 aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_16:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_NO_TRUNC;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_13:</div><div class='add'>+	case ICV_15:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_NO_TRUNC;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_SW;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+</div><div class='add'>+		  crypto_tfm_set_flags((struct crypto_tfm *) tfm,</div><div class='add'>+			CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_4106_4309_setauthsize(struct crypto_aead *tfm,</div><div class='add'>+					  unsigned int authsize)</div><div class='add'>+{</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(crypto_aead_ctx(tfm));</div><div class='add'>+</div><div class='add'>+	switch (authsize) {</div><div class='add'>+	case ICV_8:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_DIV2;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_12:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_IPSEC_96BIT;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_16:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_NO_TRUNC;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		crypto_tfm_set_flags((struct crypto_tfm *)tfm,</div><div class='add'>+				     CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_ccm_setauthsize(struct crypto_aead *tfm,</div><div class='add'>+				unsigned int authsize)</div><div class='add'>+{</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(crypto_aead_ctx(tfm));</div><div class='add'>+</div><div class='add'>+	switch (authsize) {</div><div class='add'>+	case ICV_4:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_PL1;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_6:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_PL2;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_8:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_DIV2;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_10:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_TRUNC_RFC4366;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_12:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_IPSEC_96BIT;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_14:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_PL3;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_16:</div><div class='add'>+		aeadctx-&gt;hmac_ctrl = CHCR_SCMD_HMAC_CTRL_NO_TRUNC;</div><div class='add'>+		aeadctx-&gt;mayverify = VERIFY_HW;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		crypto_tfm_set_flags((struct crypto_tfm *)tfm,</div><div class='add'>+				     CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_aead_ccm_setkey(struct crypto_aead *aead,</div><div class='add'>+				const u8 *key,</div><div class='add'>+				unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct chcr_context *ctx = crypto_aead_ctx(aead);</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);</div><div class='add'>+	unsigned char ck_size, mk_size;</div><div class='add'>+	int key_ctx_size = 0;</div><div class='add'>+</div><div class='add'>+	memcpy(aeadctx-&gt;key, key, keylen);</div><div class='add'>+	aeadctx-&gt;enckey_len = keylen;</div><div class='add'>+	key_ctx_size = sizeof(struct _key_ctx) +</div><div class='add'>+		((DIV_ROUND_UP(keylen, 16)) &lt;&lt; 4)  * 2;</div><div class='add'>+	if (keylen == AES_KEYSIZE_128) {</div><div class='add'>+		mk_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_128;</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_128;</div><div class='add'>+	} else if (keylen == AES_KEYSIZE_192) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_192;</div><div class='add'>+		mk_size = CHCR_KEYCTX_MAC_KEY_SIZE_192;</div><div class='add'>+	} else if (keylen == AES_KEYSIZE_256) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_256;</div><div class='add'>+		mk_size = CHCR_KEYCTX_MAC_KEY_SIZE_256;</div><div class='add'>+	} else {</div><div class='add'>+		crypto_tfm_set_flags((struct crypto_tfm *)aead,</div><div class='add'>+				     CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		aeadctx-&gt;enckey_len = 0;</div><div class='add'>+		return	-EINVAL;</div><div class='add'>+	}</div><div class='add'>+	aeadctx-&gt;key_ctx_hdr = FILL_KEY_CTX_HDR(ck_size, mk_size, 0, 0,</div><div class='add'>+						key_ctx_size &gt;&gt; 4);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_aead_rfc4309_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='add'>+				    unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct chcr_context *ctx = crypto_aead_ctx(aead);</div><div class='add'>+	 struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);</div><div class='add'>+</div><div class='add'>+	if (keylen &lt; 3) {</div><div class='add'>+		crypto_tfm_set_flags((struct crypto_tfm *)aead,</div><div class='add'>+				     CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		aeadctx-&gt;enckey_len = 0;</div><div class='add'>+		return	-EINVAL;</div><div class='add'>+	}</div><div class='add'>+	keylen -= 3;</div><div class='add'>+	memcpy(aeadctx-&gt;salt, key + keylen, 3);</div><div class='add'>+	return chcr_aead_ccm_setkey(aead, key, keylen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_gcm_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='add'>+			   unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct chcr_context *ctx = crypto_aead_ctx(aead);</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);</div><div class='add'>+	struct chcr_gcm_ctx *gctx = GCM_CTX(aeadctx);</div><div class='add'>+	struct crypto_cipher *cipher;</div><div class='add'>+	unsigned int ck_size;</div><div class='add'>+	int ret = 0, key_ctx_size = 0;</div><div class='add'>+</div><div class='add'>+	if (get_aead_subtype(aead) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106 &amp;&amp;</div><div class='add'>+	    keylen &gt; 3) {</div><div class='add'>+		keylen -= 4;  /* nonce/salt is present in the last 4 bytes */</div><div class='add'>+		memcpy(aeadctx-&gt;salt, key + keylen, 4);</div><div class='add'>+	}</div><div class='add'>+	if (keylen == AES_KEYSIZE_128) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_128;</div><div class='add'>+	} else if (keylen == AES_KEYSIZE_192) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_192;</div><div class='add'>+	} else if (keylen == AES_KEYSIZE_256) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_256;</div><div class='add'>+	} else {</div><div class='add'>+		crypto_tfm_set_flags((struct crypto_tfm *)aead,</div><div class='add'>+				     CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		aeadctx-&gt;enckey_len = 0;</div><div class='add'>+		pr_err("GCM: Invalid key length %d", keylen);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(aeadctx-&gt;key, key, keylen);</div><div class='add'>+	aeadctx-&gt;enckey_len = keylen;</div><div class='add'>+	key_ctx_size = sizeof(struct _key_ctx) +</div><div class='add'>+		((DIV_ROUND_UP(keylen, 16)) &lt;&lt; 4) +</div><div class='add'>+		AEAD_H_SIZE;</div><div class='add'>+		aeadctx-&gt;key_ctx_hdr = FILL_KEY_CTX_HDR(ck_size,</div><div class='add'>+						CHCR_KEYCTX_MAC_KEY_SIZE_128,</div><div class='add'>+						0, 0,</div><div class='add'>+						key_ctx_size &gt;&gt; 4);</div><div class='add'>+	/* Calculate the H = CIPH(K, 0 repeated 16 times).</div><div class='add'>+	 * It will go in key context</div><div class='add'>+	 */</div><div class='add'>+	cipher = crypto_alloc_cipher("aes-generic", 0, 0);</div><div class='add'>+	if (IS_ERR(cipher)) {</div><div class='add'>+		aeadctx-&gt;enckey_len = 0;</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = crypto_cipher_setkey(cipher, key, keylen);</div><div class='add'>+	if (ret) {</div><div class='add'>+		aeadctx-&gt;enckey_len = 0;</div><div class='add'>+		goto out1;</div><div class='add'>+	}</div><div class='add'>+	memset(gctx-&gt;ghash_h, 0, AEAD_H_SIZE);</div><div class='add'>+	crypto_cipher_encrypt_one(cipher, gctx-&gt;ghash_h, gctx-&gt;ghash_h);</div><div class='add'>+</div><div class='add'>+out1:</div><div class='add'>+	crypto_free_cipher(cipher);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_authenc_setkey(struct crypto_aead *authenc, const u8 *key,</div><div class='add'>+				   unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct chcr_context *ctx = crypto_aead_ctx(authenc);</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);</div><div class='add'>+	struct chcr_authenc_ctx *actx = AUTHENC_CTX(aeadctx);</div><div class='add'>+	/* it contains auth and cipher key both*/</div><div class='add'>+	struct crypto_authenc_keys keys;</div><div class='add'>+	unsigned int bs;</div><div class='add'>+	unsigned int max_authsize = crypto_aead_alg(authenc)-&gt;maxauthsize;</div><div class='add'>+	int err = 0, i, key_ctx_len = 0;</div><div class='add'>+	unsigned char ck_size = 0;</div><div class='add'>+	unsigned char pad[CHCR_HASH_MAX_BLOCK_SIZE_128] = { 0 };</div><div class='add'>+	struct crypto_shash *base_hash = NULL;</div><div class='add'>+	struct algo_param param;</div><div class='add'>+	int align;</div><div class='add'>+	u8 *o_ptr = NULL;</div><div class='add'>+</div><div class='add'>+	if (crypto_authenc_extractkeys(&amp;keys, key, keylen) != 0) {</div><div class='add'>+		crypto_aead_set_flags(authenc, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (get_alg_config(&amp;param, max_authsize)) {</div><div class='add'>+		pr_err("chcr : Unsupported digest size\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (keys.enckeylen == AES_KEYSIZE_128) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_128;</div><div class='add'>+	} else if (keys.enckeylen == AES_KEYSIZE_192) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_192;</div><div class='add'>+	} else if (keys.enckeylen == AES_KEYSIZE_256) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_256;</div><div class='add'>+	} else {</div><div class='add'>+		pr_err("chcr : Unsupported cipher key\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy only encryption key. We use authkey to generate h(ipad) and</div><div class='add'>+	 * h(opad) so authkey is not needed again. authkeylen size have the</div><div class='add'>+	 * size of the hash digest size.</div><div class='add'>+	 */</div><div class='add'>+	memcpy(aeadctx-&gt;key, keys.enckey, keys.enckeylen);</div><div class='add'>+	aeadctx-&gt;enckey_len = keys.enckeylen;</div><div class='add'>+	get_aes_decrypt_key(actx-&gt;dec_rrkey, aeadctx-&gt;key,</div><div class='add'>+			    aeadctx-&gt;enckey_len &lt;&lt; 3);</div><div class='add'>+</div><div class='add'>+	base_hash  = chcr_alloc_shash(max_authsize);</div><div class='add'>+	if (IS_ERR(base_hash)) {</div><div class='add'>+		pr_err("chcr : Base driver cannot be loaded\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	{</div><div class='add'>+		SHASH_DESC_ON_STACK(shash, base_hash);</div><div class='add'>+		shash-&gt;tfm = base_hash;</div><div class='add'>+		shash-&gt;flags = crypto_shash_get_flags(base_hash);</div><div class='add'>+		bs = crypto_shash_blocksize(base_hash);</div><div class='add'>+		align = KEYCTX_ALIGN_PAD(max_authsize);</div><div class='add'>+		o_ptr =  actx-&gt;h_iopad + param.result_size + align;</div><div class='add'>+</div><div class='add'>+		if (keys.authkeylen &gt; bs) {</div><div class='add'>+			err = crypto_shash_digest(shash, keys.authkey,</div><div class='add'>+						  keys.authkeylen,</div><div class='add'>+						  o_ptr);</div><div class='add'>+			if (err) {</div><div class='add'>+				pr_err("chcr : Base driver cannot be loaded\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			keys.authkeylen = max_authsize;</div><div class='add'>+		} else</div><div class='add'>+			memcpy(o_ptr, keys.authkey, keys.authkeylen);</div><div class='add'>+</div><div class='add'>+		/* Compute the ipad-digest*/</div><div class='add'>+		memset(pad + keys.authkeylen, 0, bs - keys.authkeylen);</div><div class='add'>+		memcpy(pad, o_ptr, keys.authkeylen);</div><div class='add'>+		for (i = 0; i &lt; bs &gt;&gt; 2; i++)</div><div class='add'>+			*((unsigned int *)pad + i) ^= IPAD_DATA;</div><div class='add'>+</div><div class='add'>+		if (chcr_compute_partial_hash(shash, pad, actx-&gt;h_iopad,</div><div class='add'>+					      max_authsize))</div><div class='add'>+			goto out;</div><div class='add'>+		/* Compute the opad-digest */</div><div class='add'>+		memset(pad + keys.authkeylen, 0, bs - keys.authkeylen);</div><div class='add'>+		memcpy(pad, o_ptr, keys.authkeylen);</div><div class='add'>+		for (i = 0; i &lt; bs &gt;&gt; 2; i++)</div><div class='add'>+			*((unsigned int *)pad + i) ^= OPAD_DATA;</div><div class='add'>+</div><div class='add'>+		if (chcr_compute_partial_hash(shash, pad, o_ptr, max_authsize))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		/* convert the ipad and opad digest to network order */</div><div class='add'>+		chcr_change_order(actx-&gt;h_iopad, param.result_size);</div><div class='add'>+		chcr_change_order(o_ptr, param.result_size);</div><div class='add'>+		key_ctx_len = sizeof(struct _key_ctx) +</div><div class='add'>+			((DIV_ROUND_UP(keys.enckeylen, 16)) &lt;&lt; 4) +</div><div class='add'>+			(param.result_size + align) * 2;</div><div class='add'>+		aeadctx-&gt;key_ctx_hdr = FILL_KEY_CTX_HDR(ck_size, param.mk_size,</div><div class='add'>+						0, 1, key_ctx_len &gt;&gt; 4);</div><div class='add'>+		actx-&gt;auth_mode = param.auth_mode;</div><div class='add'>+		chcr_free_shash(base_hash);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	aeadctx-&gt;enckey_len = 0;</div><div class='add'>+	if (base_hash)</div><div class='add'>+		chcr_free_shash(base_hash);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_aead_digest_null_setkey(struct crypto_aead *authenc,</div><div class='add'>+					const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct chcr_context *ctx = crypto_aead_ctx(authenc);</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);</div><div class='add'>+	struct chcr_authenc_ctx *actx = AUTHENC_CTX(aeadctx);</div><div class='add'>+	struct crypto_authenc_keys keys;</div><div class='add'>+</div><div class='add'>+	/* it contains auth and cipher key both*/</div><div class='add'>+	int key_ctx_len = 0;</div><div class='add'>+	unsigned char ck_size = 0;</div><div class='add'>+</div><div class='add'>+	if (crypto_authenc_extractkeys(&amp;keys, key, keylen) != 0) {</div><div class='add'>+		crypto_aead_set_flags(authenc, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (keys.enckeylen == AES_KEYSIZE_128) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_128;</div><div class='add'>+	} else if (keys.enckeylen == AES_KEYSIZE_192) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_192;</div><div class='add'>+	} else if (keys.enckeylen == AES_KEYSIZE_256) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_256;</div><div class='add'>+	} else {</div><div class='add'>+		pr_err("chcr : Unsupported cipher key\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	memcpy(aeadctx-&gt;key, keys.enckey, keys.enckeylen);</div><div class='add'>+	aeadctx-&gt;enckey_len = keys.enckeylen;</div><div class='add'>+	get_aes_decrypt_key(actx-&gt;dec_rrkey, aeadctx-&gt;key,</div><div class='add'>+				    aeadctx-&gt;enckey_len &lt;&lt; 3);</div><div class='add'>+	key_ctx_len =  sizeof(struct _key_ctx)</div><div class='add'>+		+ ((DIV_ROUND_UP(keys.enckeylen, 16)) &lt;&lt; 4);</div><div class='add'>+</div><div class='add'>+	aeadctx-&gt;key_ctx_hdr = FILL_KEY_CTX_HDR(ck_size, CHCR_KEYCTX_NO_KEY, 0,</div><div class='add'>+						0, key_ctx_len &gt;&gt; 4);</div><div class='add'>+	actx-&gt;auth_mode = CHCR_SCMD_AUTH_MODE_NOP;</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	aeadctx-&gt;enckey_len = 0;</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+static int chcr_aead_encrypt(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	struct chcr_aead_reqctx *reqctx = aead_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	reqctx-&gt;verify = VERIFY_HW;</div><div class='add'>+</div><div class='add'>+	switch (get_aead_subtype(tfm)) {</div><div class='add'>+	case CRYPTO_ALG_SUB_TYPE_AEAD_AUTHENC:</div><div class='add'>+	case CRYPTO_ALG_SUB_TYPE_AEAD_NULL:</div><div class='add'>+		return chcr_aead_op(req, CHCR_ENCRYPT_OP, 0,</div><div class='add'>+				    create_authenc_wr);</div><div class='add'>+	case CRYPTO_ALG_SUB_TYPE_AEAD_CCM:</div><div class='add'>+	case CRYPTO_ALG_SUB_TYPE_AEAD_RFC4309:</div><div class='add'>+		return chcr_aead_op(req, CHCR_ENCRYPT_OP, 0,</div><div class='add'>+				    create_aead_ccm_wr);</div><div class='add'>+	default:</div><div class='add'>+		return chcr_aead_op(req, CHCR_ENCRYPT_OP, 0,</div><div class='add'>+				    create_gcm_wr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_aead_decrypt(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	struct chcr_aead_ctx *aeadctx = AEAD_CTX(crypto_aead_ctx(tfm));</div><div class='add'>+	struct chcr_aead_reqctx *reqctx = aead_request_ctx(req);</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	if (aeadctx-&gt;mayverify == VERIFY_SW) {</div><div class='add'>+		size = crypto_aead_maxauthsize(tfm);</div><div class='add'>+		reqctx-&gt;verify = VERIFY_SW;</div><div class='add'>+	} else {</div><div class='add'>+		size = 0;</div><div class='add'>+		reqctx-&gt;verify = VERIFY_HW;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (get_aead_subtype(tfm)) {</div><div class='add'>+	case CRYPTO_ALG_SUB_TYPE_AEAD_AUTHENC:</div><div class='add'>+	case CRYPTO_ALG_SUB_TYPE_AEAD_NULL:</div><div class='add'>+		return chcr_aead_op(req, CHCR_DECRYPT_OP, size,</div><div class='add'>+				    create_authenc_wr);</div><div class='add'>+	case CRYPTO_ALG_SUB_TYPE_AEAD_CCM:</div><div class='add'>+	case CRYPTO_ALG_SUB_TYPE_AEAD_RFC4309:</div><div class='add'>+		return chcr_aead_op(req, CHCR_DECRYPT_OP, size,</div><div class='add'>+				    create_aead_ccm_wr);</div><div class='add'>+	default:</div><div class='add'>+		return chcr_aead_op(req, CHCR_DECRYPT_OP, size,</div><div class='add'>+				    create_gcm_wr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int chcr_aead_op(struct aead_request *req,</div><div class='add'>+			  unsigned short op_type,</div><div class='add'>+			  int size,</div><div class='add'>+			  create_wr_t create_wr_fn)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+	struct chcr_context *ctx = crypto_aead_ctx(tfm);</div><div class='add'>+	struct uld_ctx *u_ctx;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;dev) {</div><div class='add'>+		pr_err("chcr : %s : No crypto device.\n", __func__);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+	u_ctx = ULD_CTX(ctx);</div><div class='add'>+	if (cxgb4_is_crypto_q_full(u_ctx-&gt;lldi.ports[0],</div><div class='add'>+				   ctx-&gt;tx_channel_id)) {</div><div class='add'>+		if (!(req-&gt;base.flags &amp; CRYPTO_TFM_REQ_MAY_BACKLOG))</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Form a WR from req */</div><div class='add'>+	skb = create_wr_fn(req, u_ctx-&gt;lldi.rxq_ids[ctx-&gt;tx_channel_id], size,</div><div class='add'>+			   op_type);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(skb) || skb == NULL) {</div><div class='add'>+		pr_err("chcr : %s : failed to form WR. No memory\n", __func__);</div><div class='add'>+		return PTR_ERR(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = u_ctx-&gt;lldi.ports[0];</div><div class='add'>+	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx-&gt;tx_channel_id);</div><div class='add'>+	chcr_send_wr(skb);</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='ctx'> static struct chcr_alg_template driver_algs[] = {</div><div class='ctx'> 	/* AES-CBC */</div><div class='ctx'> 	{</div><div class='hunk'>@@ -1232,9 +2491,9 @@ static struct chcr_alg_template driver_algs[] = {</div><div class='ctx'> 		.is_registered = 0,</div><div class='ctx'> 		.alg.crypto = {</div><div class='ctx'> 			.cra_name		= "cbc(aes)",</div><div class='del'>-			.cra_driver_name	= "cbc(aes-chcr)",</div><div class='add'>+			.cra_driver_name	= "cbc-aes-chcr",</div><div class='ctx'> 			.cra_priority		= CHCR_CRA_PRIORITY,</div><div class='del'>-			.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='add'>+			.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER |</div><div class='ctx'> 				CRYPTO_ALG_ASYNC,</div><div class='ctx'> 			.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='ctx'> 			.cra_ctxsize		= sizeof(struct chcr_context)</div><div class='hunk'>@@ -1259,9 +2518,9 @@ static struct chcr_alg_template driver_algs[] = {</div><div class='ctx'> 		.is_registered = 0,</div><div class='ctx'> 		.alg.crypto =   {</div><div class='ctx'> 			.cra_name		= "xts(aes)",</div><div class='del'>-			.cra_driver_name	= "xts(aes-chcr)",</div><div class='add'>+			.cra_driver_name	= "xts-aes-chcr",</div><div class='ctx'> 			.cra_priority		= CHCR_CRA_PRIORITY,</div><div class='del'>-			.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER |</div><div class='add'>+			.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER |</div><div class='ctx'> 				CRYPTO_ALG_ASYNC,</div><div class='ctx'> 			.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='ctx'> 			.cra_ctxsize		= sizeof(struct chcr_context) +</div><div class='hunk'>@@ -1352,7 +2611,7 @@ static struct chcr_alg_template driver_algs[] = {</div><div class='ctx'> 			.halg.digestsize = SHA1_DIGEST_SIZE,</div><div class='ctx'> 			.halg.base = {</div><div class='ctx'> 				.cra_name = "hmac(sha1)",</div><div class='del'>-				.cra_driver_name = "hmac(sha1-chcr)",</div><div class='add'>+				.cra_driver_name = "hmac-sha1-chcr",</div><div class='ctx'> 				.cra_blocksize = SHA1_BLOCK_SIZE,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1364,7 +2623,7 @@ static struct chcr_alg_template driver_algs[] = {</div><div class='ctx'> 			.halg.digestsize = SHA224_DIGEST_SIZE,</div><div class='ctx'> 			.halg.base = {</div><div class='ctx'> 				.cra_name = "hmac(sha224)",</div><div class='del'>-				.cra_driver_name = "hmac(sha224-chcr)",</div><div class='add'>+				.cra_driver_name = "hmac-sha224-chcr",</div><div class='ctx'> 				.cra_blocksize = SHA224_BLOCK_SIZE,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1376,7 +2635,7 @@ static struct chcr_alg_template driver_algs[] = {</div><div class='ctx'> 			.halg.digestsize = SHA256_DIGEST_SIZE,</div><div class='ctx'> 			.halg.base = {</div><div class='ctx'> 				.cra_name = "hmac(sha256)",</div><div class='del'>-				.cra_driver_name = "hmac(sha256-chcr)",</div><div class='add'>+				.cra_driver_name = "hmac-sha256-chcr",</div><div class='ctx'> 				.cra_blocksize = SHA256_BLOCK_SIZE,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1388,7 +2647,7 @@ static struct chcr_alg_template driver_algs[] = {</div><div class='ctx'> 			.halg.digestsize = SHA384_DIGEST_SIZE,</div><div class='ctx'> 			.halg.base = {</div><div class='ctx'> 				.cra_name = "hmac(sha384)",</div><div class='del'>-				.cra_driver_name = "hmac(sha384-chcr)",</div><div class='add'>+				.cra_driver_name = "hmac-sha384-chcr",</div><div class='ctx'> 				.cra_blocksize = SHA384_BLOCK_SIZE,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1400,11 +2659,205 @@ static struct chcr_alg_template driver_algs[] = {</div><div class='ctx'> 			.halg.digestsize = SHA512_DIGEST_SIZE,</div><div class='ctx'> 			.halg.base = {</div><div class='ctx'> 				.cra_name = "hmac(sha512)",</div><div class='del'>-				.cra_driver_name = "hmac(sha512-chcr)",</div><div class='add'>+				.cra_driver_name = "hmac-sha512-chcr",</div><div class='ctx'> 				.cra_blocksize = SHA512_BLOCK_SIZE,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	},</div><div class='add'>+	/* Add AEAD Algorithms */</div><div class='add'>+	{</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_SUB_TYPE_AEAD_GCM,</div><div class='add'>+		.is_registered = 0,</div><div class='add'>+		.alg.aead = {</div><div class='add'>+			.base = {</div><div class='add'>+				.cra_name = "gcm(aes)",</div><div class='add'>+				.cra_driver_name = "gcm-aes-chcr",</div><div class='add'>+				.cra_blocksize	= 1,</div><div class='add'>+				.cra_ctxsize =	sizeof(struct chcr_context) +</div><div class='add'>+						sizeof(struct chcr_aead_ctx) +</div><div class='add'>+						sizeof(struct chcr_gcm_ctx),</div><div class='add'>+			},</div><div class='add'>+			.ivsize = 12,</div><div class='add'>+			.maxauthsize = GHASH_DIGEST_SIZE,</div><div class='add'>+			.setkey = chcr_gcm_setkey,</div><div class='add'>+			.setauthsize = chcr_gcm_setauthsize,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106,</div><div class='add'>+		.is_registered = 0,</div><div class='add'>+		.alg.aead = {</div><div class='add'>+			.base = {</div><div class='add'>+				.cra_name = "rfc4106(gcm(aes))",</div><div class='add'>+				.cra_driver_name = "rfc4106-gcm-aes-chcr",</div><div class='add'>+				.cra_blocksize	 = 1,</div><div class='add'>+				.cra_ctxsize =	sizeof(struct chcr_context) +</div><div class='add'>+						sizeof(struct chcr_aead_ctx) +</div><div class='add'>+						sizeof(struct chcr_gcm_ctx),</div><div class='add'>+</div><div class='add'>+			},</div><div class='add'>+			.ivsize = 8,</div><div class='add'>+			.maxauthsize	= GHASH_DIGEST_SIZE,</div><div class='add'>+			.setkey = chcr_gcm_setkey,</div><div class='add'>+			.setauthsize	= chcr_4106_4309_setauthsize,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_SUB_TYPE_AEAD_CCM,</div><div class='add'>+		.is_registered = 0,</div><div class='add'>+		.alg.aead = {</div><div class='add'>+			.base = {</div><div class='add'>+				.cra_name = "ccm(aes)",</div><div class='add'>+				.cra_driver_name = "ccm-aes-chcr",</div><div class='add'>+				.cra_blocksize	 = 1,</div><div class='add'>+				.cra_ctxsize =	sizeof(struct chcr_context) +</div><div class='add'>+						sizeof(struct chcr_aead_ctx),</div><div class='add'>+</div><div class='add'>+			},</div><div class='add'>+			.ivsize = AES_BLOCK_SIZE,</div><div class='add'>+			.maxauthsize	= GHASH_DIGEST_SIZE,</div><div class='add'>+			.setkey = chcr_aead_ccm_setkey,</div><div class='add'>+			.setauthsize	= chcr_ccm_setauthsize,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_SUB_TYPE_AEAD_RFC4309,</div><div class='add'>+		.is_registered = 0,</div><div class='add'>+		.alg.aead = {</div><div class='add'>+			.base = {</div><div class='add'>+				.cra_name = "rfc4309(ccm(aes))",</div><div class='add'>+				.cra_driver_name = "rfc4309-ccm-aes-chcr",</div><div class='add'>+				.cra_blocksize	 = 1,</div><div class='add'>+				.cra_ctxsize =	sizeof(struct chcr_context) +</div><div class='add'>+						sizeof(struct chcr_aead_ctx),</div><div class='add'>+</div><div class='add'>+			},</div><div class='add'>+			.ivsize = 8,</div><div class='add'>+			.maxauthsize	= GHASH_DIGEST_SIZE,</div><div class='add'>+			.setkey = chcr_aead_rfc4309_setkey,</div><div class='add'>+			.setauthsize = chcr_4106_4309_setauthsize,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_SUB_TYPE_AEAD_AUTHENC,</div><div class='add'>+		.is_registered = 0,</div><div class='add'>+		.alg.aead = {</div><div class='add'>+			.base = {</div><div class='add'>+				.cra_name = "authenc(hmac(sha1),cbc(aes))",</div><div class='add'>+				.cra_driver_name =</div><div class='add'>+					"authenc-hmac-sha1-cbc-aes-chcr",</div><div class='add'>+				.cra_blocksize	 = AES_BLOCK_SIZE,</div><div class='add'>+				.cra_ctxsize =	sizeof(struct chcr_context) +</div><div class='add'>+						sizeof(struct chcr_aead_ctx) +</div><div class='add'>+						sizeof(struct chcr_authenc_ctx),</div><div class='add'>+</div><div class='add'>+			},</div><div class='add'>+			.ivsize = AES_BLOCK_SIZE,</div><div class='add'>+			.maxauthsize = SHA1_DIGEST_SIZE,</div><div class='add'>+			.setkey = chcr_authenc_setkey,</div><div class='add'>+			.setauthsize = chcr_authenc_setauthsize,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_SUB_TYPE_AEAD_AUTHENC,</div><div class='add'>+		.is_registered = 0,</div><div class='add'>+		.alg.aead = {</div><div class='add'>+			.base = {</div><div class='add'>+</div><div class='add'>+				.cra_name = "authenc(hmac(sha256),cbc(aes))",</div><div class='add'>+				.cra_driver_name =</div><div class='add'>+					"authenc-hmac-sha256-cbc-aes-chcr",</div><div class='add'>+				.cra_blocksize	 = AES_BLOCK_SIZE,</div><div class='add'>+				.cra_ctxsize =	sizeof(struct chcr_context) +</div><div class='add'>+						sizeof(struct chcr_aead_ctx) +</div><div class='add'>+						sizeof(struct chcr_authenc_ctx),</div><div class='add'>+</div><div class='add'>+			},</div><div class='add'>+			.ivsize = AES_BLOCK_SIZE,</div><div class='add'>+			.maxauthsize	= SHA256_DIGEST_SIZE,</div><div class='add'>+			.setkey = chcr_authenc_setkey,</div><div class='add'>+			.setauthsize = chcr_authenc_setauthsize,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_SUB_TYPE_AEAD_AUTHENC,</div><div class='add'>+		.is_registered = 0,</div><div class='add'>+		.alg.aead = {</div><div class='add'>+			.base = {</div><div class='add'>+				.cra_name = "authenc(hmac(sha224),cbc(aes))",</div><div class='add'>+				.cra_driver_name =</div><div class='add'>+					"authenc-hmac-sha224-cbc-aes-chcr",</div><div class='add'>+				.cra_blocksize	 = AES_BLOCK_SIZE,</div><div class='add'>+				.cra_ctxsize =	sizeof(struct chcr_context) +</div><div class='add'>+						sizeof(struct chcr_aead_ctx) +</div><div class='add'>+						sizeof(struct chcr_authenc_ctx),</div><div class='add'>+			},</div><div class='add'>+			.ivsize = AES_BLOCK_SIZE,</div><div class='add'>+			.maxauthsize = SHA224_DIGEST_SIZE,</div><div class='add'>+			.setkey = chcr_authenc_setkey,</div><div class='add'>+			.setauthsize = chcr_authenc_setauthsize,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_SUB_TYPE_AEAD_AUTHENC,</div><div class='add'>+		.is_registered = 0,</div><div class='add'>+		.alg.aead = {</div><div class='add'>+			.base = {</div><div class='add'>+				.cra_name = "authenc(hmac(sha384),cbc(aes))",</div><div class='add'>+				.cra_driver_name =</div><div class='add'>+					"authenc-hmac-sha384-cbc-aes-chcr",</div><div class='add'>+				.cra_blocksize	 = AES_BLOCK_SIZE,</div><div class='add'>+				.cra_ctxsize =	sizeof(struct chcr_context) +</div><div class='add'>+						sizeof(struct chcr_aead_ctx) +</div><div class='add'>+						sizeof(struct chcr_authenc_ctx),</div><div class='add'>+</div><div class='add'>+			},</div><div class='add'>+			.ivsize = AES_BLOCK_SIZE,</div><div class='add'>+			.maxauthsize = SHA384_DIGEST_SIZE,</div><div class='add'>+			.setkey = chcr_authenc_setkey,</div><div class='add'>+			.setauthsize = chcr_authenc_setauthsize,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_SUB_TYPE_AEAD_AUTHENC,</div><div class='add'>+		.is_registered = 0,</div><div class='add'>+		.alg.aead = {</div><div class='add'>+			.base = {</div><div class='add'>+				.cra_name = "authenc(hmac(sha512),cbc(aes))",</div><div class='add'>+				.cra_driver_name =</div><div class='add'>+					"authenc-hmac-sha512-cbc-aes-chcr",</div><div class='add'>+				.cra_blocksize	 = AES_BLOCK_SIZE,</div><div class='add'>+				.cra_ctxsize =	sizeof(struct chcr_context) +</div><div class='add'>+						sizeof(struct chcr_aead_ctx) +</div><div class='add'>+						sizeof(struct chcr_authenc_ctx),</div><div class='add'>+</div><div class='add'>+			},</div><div class='add'>+			.ivsize = AES_BLOCK_SIZE,</div><div class='add'>+			.maxauthsize = SHA512_DIGEST_SIZE,</div><div class='add'>+			.setkey = chcr_authenc_setkey,</div><div class='add'>+			.setauthsize = chcr_authenc_setauthsize,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_SUB_TYPE_AEAD_NULL,</div><div class='add'>+		.is_registered = 0,</div><div class='add'>+		.alg.aead = {</div><div class='add'>+			.base = {</div><div class='add'>+				.cra_name = "authenc(digest_null,cbc(aes))",</div><div class='add'>+				.cra_driver_name =</div><div class='add'>+					"authenc-digest_null-cbc-aes-chcr",</div><div class='add'>+				.cra_blocksize	 = AES_BLOCK_SIZE,</div><div class='add'>+				.cra_ctxsize =	sizeof(struct chcr_context) +</div><div class='add'>+						sizeof(struct chcr_aead_ctx) +</div><div class='add'>+						sizeof(struct chcr_authenc_ctx),</div><div class='add'>+</div><div class='add'>+			},</div><div class='add'>+			.ivsize  = AES_BLOCK_SIZE,</div><div class='add'>+			.maxauthsize = 0,</div><div class='add'>+			.setkey  = chcr_aead_digest_null_setkey,</div><div class='add'>+			.setauthsize = chcr_authenc_null_setauthsize,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1422,6 +2875,11 @@ static int chcr_unregister_alg(void)</div><div class='ctx'> 				crypto_unregister_alg(</div><div class='ctx'> 						&amp;driver_algs[i].alg.crypto);</div><div class='ctx'> 			break;</div><div class='add'>+		case CRYPTO_ALG_TYPE_AEAD:</div><div class='add'>+			if (driver_algs[i].is_registered)</div><div class='add'>+				crypto_unregister_aead(</div><div class='add'>+						&amp;driver_algs[i].alg.aead);</div><div class='add'>+			break;</div><div class='ctx'> 		case CRYPTO_ALG_TYPE_AHASH:</div><div class='ctx'> 			if (driver_algs[i].is_registered)</div><div class='ctx'> 				crypto_unregister_ahash(</div><div class='hunk'>@@ -1456,6 +2914,19 @@ static int chcr_register_alg(void)</div><div class='ctx'> 			err = crypto_register_alg(&amp;driver_algs[i].alg.crypto);</div><div class='ctx'> 			name = driver_algs[i].alg.crypto.cra_driver_name;</div><div class='ctx'> 			break;</div><div class='add'>+		case CRYPTO_ALG_TYPE_AEAD:</div><div class='add'>+			driver_algs[i].alg.aead.base.cra_priority =</div><div class='add'>+				CHCR_CRA_PRIORITY;</div><div class='add'>+			driver_algs[i].alg.aead.base.cra_flags =</div><div class='add'>+				CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC;</div><div class='add'>+			driver_algs[i].alg.aead.encrypt = chcr_aead_encrypt;</div><div class='add'>+			driver_algs[i].alg.aead.decrypt = chcr_aead_decrypt;</div><div class='add'>+			driver_algs[i].alg.aead.init = chcr_aead_cra_init;</div><div class='add'>+			driver_algs[i].alg.aead.exit = chcr_aead_cra_exit;</div><div class='add'>+			driver_algs[i].alg.aead.base.cra_module = THIS_MODULE;</div><div class='add'>+			err = crypto_register_aead(&amp;driver_algs[i].alg.aead);</div><div class='add'>+			name = driver_algs[i].alg.aead.base.cra_driver_name;</div><div class='add'>+			break;</div><div class='ctx'> 		case CRYPTO_ALG_TYPE_AHASH:</div><div class='ctx'> 			a_hash = &amp;driver_algs[i].alg.hash;</div><div class='ctx'> 			a_hash-&gt;update = chcr_ahash_update;</div><div class='head'>diff --git a/drivers/crypto/chelsio/chcr_algo.h b/drivers/crypto/chelsio/chcr_algo.h<br/>index 199b0bb69b89..ba38bae7ce80 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/chelsio/chcr_algo.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/chelsio/chcr_algo.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/chelsio/chcr_algo.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/chcr_algo.h</a></div><div class='hunk'>@@ -108,30 +108,24 @@</div><div class='ctx'> #define IPAD_DATA 0x36363636</div><div class='ctx'> #define OPAD_DATA 0x5c5c5c5c</div><div class='ctx'> </div><div class='del'>-#define TRANSHDR_SIZE(alignedkctx_len)\</div><div class='del'>-	(sizeof(struct ulptx_idata) +\</div><div class='del'>-	 sizeof(struct ulp_txpkt) +\</div><div class='del'>-	 sizeof(struct fw_crypto_lookaside_wr) +\</div><div class='del'>-	 sizeof(struct cpl_tx_sec_pdu) +\</div><div class='del'>-	 (alignedkctx_len))</div><div class='del'>-#define CIPHER_TRANSHDR_SIZE(alignedkctx_len, sge_pairs) \</div><div class='del'>-	(TRANSHDR_SIZE(alignedkctx_len) + sge_pairs +\</div><div class='add'>+#define TRANSHDR_SIZE(kctx_len)\</div><div class='add'>+	(sizeof(struct chcr_wr) +\</div><div class='add'>+	 kctx_len)</div><div class='add'>+#define CIPHER_TRANSHDR_SIZE(kctx_len, sge_pairs) \</div><div class='add'>+	(TRANSHDR_SIZE((kctx_len)) + (sge_pairs) +\</div><div class='ctx'> 	 sizeof(struct cpl_rx_phys_dsgl))</div><div class='del'>-#define HASH_TRANSHDR_SIZE(alignedkctx_len)\</div><div class='del'>-	(TRANSHDR_SIZE(alignedkctx_len) + DUMMY_BYTES)</div><div class='add'>+#define HASH_TRANSHDR_SIZE(kctx_len)\</div><div class='add'>+	(TRANSHDR_SIZE(kctx_len) + DUMMY_BYTES)</div><div class='ctx'> </div><div class='del'>-#define SEC_CPL_OFFSET (sizeof(struct fw_crypto_lookaside_wr) + \</div><div class='del'>-			sizeof(struct ulp_txpkt) + \</div><div class='del'>-			sizeof(struct ulptx_idata))</div><div class='ctx'> </div><div class='del'>-#define FILL_SEC_CPL_OP_IVINSR(id, len, hldr, ofst)      \</div><div class='add'>+#define FILL_SEC_CPL_OP_IVINSR(id, len, ofst)      \</div><div class='ctx'> 	htonl( \</div><div class='ctx'> 	       CPL_TX_SEC_PDU_OPCODE_V(CPL_TX_SEC_PDU) | \</div><div class='ctx'> 	       CPL_TX_SEC_PDU_RXCHID_V((id)) | \</div><div class='ctx'> 	       CPL_TX_SEC_PDU_ACKFOLLOWS_V(0) | \</div><div class='ctx'> 	       CPL_TX_SEC_PDU_ULPTXLPBK_V(1) | \</div><div class='ctx'> 	       CPL_TX_SEC_PDU_CPLLEN_V((len)) | \</div><div class='del'>-	       CPL_TX_SEC_PDU_PLACEHOLDER_V((hldr)) | \</div><div class='add'>+	       CPL_TX_SEC_PDU_PLACEHOLDER_V(0) | \</div><div class='ctx'> 	       CPL_TX_SEC_PDU_IVINSRTOFST_V((ofst)))</div><div class='ctx'> </div><div class='ctx'> #define  FILL_SEC_CPL_CIPHERSTOP_HI(a_start, a_stop, c_start, c_stop_hi) \</div><div class='hunk'>@@ -148,7 +142,7 @@</div><div class='ctx'> 		CPL_TX_SEC_PDU_AUTHSTOP_V((a_stop)) | \</div><div class='ctx'> 		CPL_TX_SEC_PDU_AUTHINSERT_V((a_inst)))</div><div class='ctx'> </div><div class='del'>-#define  FILL_SEC_CPL_SCMD0_SEQNO(ctrl, seq, cmode, amode, opad, size, nivs)  \</div><div class='add'>+#define  FILL_SEC_CPL_SCMD0_SEQNO(ctrl, seq, cmode, amode, opad, size)  \</div><div class='ctx'> 		htonl( \</div><div class='ctx'> 		SCMD_SEQ_NO_CTRL_V(0) | \</div><div class='ctx'> 		SCMD_STATUS_PRESENT_V(0) | \</div><div class='hunk'>@@ -159,7 +153,7 @@</div><div class='ctx'> 		SCMD_AUTH_MODE_V((amode)) | \</div><div class='ctx'> 		SCMD_HMAC_CTRL_V((opad)) | \</div><div class='ctx'> 		SCMD_IV_SIZE_V((size)) | \</div><div class='del'>-		SCMD_NUM_IVS_V((nivs)))</div><div class='add'>+		SCMD_NUM_IVS_V(0))</div><div class='ctx'> </div><div class='ctx'> #define FILL_SEC_CPL_IVGEN_HDRLEN(last, more, ctx_in, mac, ivdrop, len) htonl( \</div><div class='ctx'> 		SCMD_ENB_DBGID_V(0) | \</div><div class='hunk'>@@ -191,20 +185,21 @@</div><div class='ctx'> 			FW_CRYPTO_LOOKASIDE_WR_CCTX_LOC_V(1) | \</div><div class='ctx'> 			FW_CRYPTO_LOOKASIDE_WR_CCTX_SIZE_V((ctx_len)))</div><div class='ctx'> </div><div class='del'>-#define FILL_WR_RX_Q_ID(cid, qid, wr_iv) \</div><div class='add'>+#define FILL_WR_RX_Q_ID(cid, qid, wr_iv, fid) \</div><div class='ctx'> 		htonl( \</div><div class='ctx'> 			FW_CRYPTO_LOOKASIDE_WR_RX_CHID_V((cid)) | \</div><div class='ctx'> 			FW_CRYPTO_LOOKASIDE_WR_RX_Q_ID_V((qid)) | \</div><div class='ctx'> 			FW_CRYPTO_LOOKASIDE_WR_LCB_V(0) | \</div><div class='del'>-			FW_CRYPTO_LOOKASIDE_WR_IV_V((wr_iv)))</div><div class='add'>+			FW_CRYPTO_LOOKASIDE_WR_IV_V((wr_iv)) | \</div><div class='add'>+			FW_CRYPTO_LOOKASIDE_WR_FQIDX_V(fid))</div><div class='ctx'> </div><div class='del'>-#define FILL_ULPTX_CMD_DEST(cid) \</div><div class='add'>+#define FILL_ULPTX_CMD_DEST(cid, qid) \</div><div class='ctx'> 	htonl(ULPTX_CMD_V(ULP_TX_PKT) | \</div><div class='ctx'> 	      ULP_TXPKT_DEST_V(0) | \</div><div class='ctx'> 	      ULP_TXPKT_DATAMODIFY_V(0) | \</div><div class='ctx'> 	      ULP_TXPKT_CHANNELID_V((cid)) | \</div><div class='ctx'> 	      ULP_TXPKT_RO_V(1) | \</div><div class='del'>-	      ULP_TXPKT_FID_V(0))</div><div class='add'>+	      ULP_TXPKT_FID_V(qid))</div><div class='ctx'> </div><div class='ctx'> #define KEYCTX_ALIGN_PAD(bs) ({unsigned int _bs = (bs);\</div><div class='ctx'> 			      _bs == SHA1_DIGEST_SIZE ? 12 : 0; })</div><div class='hunk'>@@ -264,13 +259,15 @@ enum {</div><div class='ctx'>  * where they indicate the size of the integrity check value (ICV)</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='del'>-	AES_CCM_ICV_4   = 4,</div><div class='del'>-	AES_CCM_ICV_6   = 6,</div><div class='del'>-	AES_CCM_ICV_8   = 8,</div><div class='del'>-	AES_CCM_ICV_10  = 10,</div><div class='del'>-	AES_CCM_ICV_12  = 12,</div><div class='del'>-	AES_CCM_ICV_14  = 14,</div><div class='del'>-	AES_CCM_ICV_16 = 16</div><div class='add'>+	ICV_4  = 4,</div><div class='add'>+	ICV_6  = 6,</div><div class='add'>+	ICV_8  = 8,</div><div class='add'>+	ICV_10 = 10,</div><div class='add'>+	ICV_12 = 12,</div><div class='add'>+	ICV_13 = 13,</div><div class='add'>+	ICV_14 = 14,</div><div class='add'>+	ICV_15 = 15,</div><div class='add'>+	ICV_16 = 16</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hash_op_params {</div><div class='hunk'>@@ -394,7 +391,7 @@ static const u8 aes_sbox[256] = {</div><div class='ctx'> 	187, 22</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u32 aes_ks_subword(const u32 w)</div><div class='add'>+static inline u32 aes_ks_subword(const u32 w)</div><div class='ctx'> {</div><div class='ctx'> 	u8 bytes[4];</div><div class='ctx'> </div><div class='hunk'>@@ -412,61 +409,4 @@ static u32 round_constant[11] = {</div><div class='ctx'> 	0x1B000000, 0x36000000, 0x6C000000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* dec_key - OUTPUT - Reverse round key</div><div class='del'>- * key - INPUT - key</div><div class='del'>- * keylength - INPUT - length of the key in number of bits</div><div class='del'>- */</div><div class='del'>-static inline void get_aes_decrypt_key(unsigned char *dec_key,</div><div class='del'>-				       const unsigned char *key,</div><div class='del'>-				       unsigned int keylength)</div><div class='del'>-{</div><div class='del'>-	u32 temp;</div><div class='del'>-	u32 w_ring[MAX_NK];</div><div class='del'>-	int i, j, k;</div><div class='del'>-	u8  nr, nk;</div><div class='del'>-</div><div class='del'>-	switch (keylength) {</div><div class='del'>-	case AES_KEYLENGTH_128BIT:</div><div class='del'>-		nk = KEYLENGTH_4BYTES;</div><div class='del'>-		nr = NUMBER_OF_ROUNDS_10;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AES_KEYLENGTH_192BIT:</div><div class='del'>-		nk = KEYLENGTH_6BYTES;</div><div class='del'>-		nr = NUMBER_OF_ROUNDS_12;</div><div class='del'>-		break;</div><div class='del'>-	case AES_KEYLENGTH_256BIT:</div><div class='del'>-		nk = KEYLENGTH_8BYTES;</div><div class='del'>-		nr = NUMBER_OF_ROUNDS_14;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; nk; i++ )</div><div class='del'>-		w_ring[i] = be32_to_cpu(*(u32 *)&amp;key[4 * i]);</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	temp = w_ring[nk - 1];</div><div class='del'>-	while(i + nk &lt; (nr + 1) * 4) {</div><div class='del'>-		if(!(i % nk)) {</div><div class='del'>-			/* RotWord(temp) */</div><div class='del'>-			temp = (temp &lt;&lt; 8) | (temp &gt;&gt; 24);</div><div class='del'>-			temp = aes_ks_subword(temp);</div><div class='del'>-			temp ^= round_constant[i / nk];</div><div class='del'>-		}</div><div class='del'>-		else if (nk == 8 &amp;&amp; (i % 4 == 0))</div><div class='del'>-			temp = aes_ks_subword(temp);</div><div class='del'>-		w_ring[i % nk] ^= temp;</div><div class='del'>-		temp = w_ring[i % nk];</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-	i--;</div><div class='del'>-	for (k = 0, j = i % nk; k &lt; nk; k++) {</div><div class='del'>-		*((u32 *)dec_key + k) = htonl(w_ring[j]);</div><div class='del'>-		j--;</div><div class='del'>-		if(j &lt; 0)</div><div class='del'>-			j += nk;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* __CHCR_ALGO_H__ */</div><div class='head'>diff --git a/drivers/crypto/chelsio/chcr_core.c b/drivers/crypto/chelsio/chcr_core.c<br/>index fb5f9bbfa09c..c28e018e0773 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/chelsio/chcr_core.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/chelsio/chcr_core.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/chelsio/chcr_core.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/chcr_core.c</a></div><div class='hunk'>@@ -42,6 +42,7 @@ static chcr_handler_func work_handlers[NUM_CPL_CMDS] = {</div><div class='ctx'> static struct cxgb4_uld_info chcr_uld_info = {</div><div class='ctx'> 	.name = DRV_MODULE_NAME,</div><div class='ctx'> 	.nrxq = MAX_ULD_QSETS,</div><div class='add'>+	.ntxq = MAX_ULD_QSETS,</div><div class='ctx'> 	.rxq_size = 1024,</div><div class='ctx'> 	.add = chcr_uld_add,</div><div class='ctx'> 	.state_change = chcr_uld_state_change,</div><div class='hunk'>@@ -51,6 +52,7 @@ static struct cxgb4_uld_info chcr_uld_info = {</div><div class='ctx'> int assign_chcr_device(struct chcr_dev **dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct uld_ctx *u_ctx;</div><div class='add'>+	int ret = -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Which device to use if multiple devices are available TODO</div><div class='hunk'>@@ -58,15 +60,14 @@ int assign_chcr_device(struct chcr_dev **dev)</div><div class='ctx'> 	 * must go to the same device to maintain the ordering.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;dev_mutex); /* TODO ? */</div><div class='del'>-	u_ctx = list_first_entry(&amp;uld_ctx_list, struct uld_ctx, entry);</div><div class='del'>-	if (!u_ctx) {</div><div class='del'>-		mutex_unlock(&amp;dev_mutex);</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	list_for_each_entry(u_ctx, &amp;uld_ctx_list, entry)</div><div class='add'>+		if (u_ctx-&gt;dev) {</div><div class='add'>+			*dev = u_ctx-&gt;dev;</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	*dev = u_ctx-&gt;dev;</div><div class='ctx'> 	mutex_unlock(&amp;dev_mutex);</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int chcr_dev_add(struct uld_ctx *u_ctx)</div><div class='hunk'>@@ -109,14 +110,12 @@ static int cpl_fw6_pld_handler(struct chcr_dev *dev,</div><div class='ctx'> 	if (ack_err_status) {</div><div class='ctx'> 		if (CHK_MAC_ERR_BIT(ack_err_status) ||</div><div class='ctx'> 		    CHK_PAD_ERR_BIT(ack_err_status))</div><div class='del'>-			error_status = -EINVAL;</div><div class='add'>+			error_status = -EBADMSG;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* call completion callback with failure status */</div><div class='ctx'> 	if (req) {</div><div class='del'>-		if (!chcr_handle_resp(req, input, error_status))</div><div class='del'>-			req-&gt;complete(req, error_status);</div><div class='del'>-		else</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		error_status = chcr_handle_resp(req, input, error_status);</div><div class='add'>+		req-&gt;complete(req, error_status);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_err("Incorrect request address from the firmware\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -126,7 +125,7 @@ static int cpl_fw6_pld_handler(struct chcr_dev *dev,</div><div class='ctx'> </div><div class='ctx'> int chcr_send_wr(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return cxgb4_ofld_send(skb-&gt;dev, skb);</div><div class='add'>+	return cxgb4_crypto_send(skb-&gt;dev, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *chcr_uld_add(const struct cxgb4_lld_info *lld)</div><div class='hunk'>@@ -152,18 +151,17 @@ int chcr_uld_rx_handler(void *handle, const __be64 *rsp,</div><div class='ctx'> {</div><div class='ctx'> 	struct uld_ctx *u_ctx = (struct uld_ctx *)handle;</div><div class='ctx'> 	struct chcr_dev *dev = u_ctx-&gt;dev;</div><div class='del'>-	const struct cpl_act_establish *rpl = (struct cpl_act_establish</div><div class='del'>-					       *)rsp;</div><div class='add'>+	const struct cpl_fw6_pld *rpl = (struct cpl_fw6_pld *)rsp;</div><div class='ctx'> </div><div class='del'>-	if (rpl-&gt;ot.opcode != CPL_FW6_PLD) {</div><div class='add'>+	if (rpl-&gt;opcode != CPL_FW6_PLD) {</div><div class='ctx'> 		pr_err("Unsupported opcode\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!pgl)</div><div class='del'>-		work_handlers[rpl-&gt;ot.opcode](dev, (unsigned char *)&amp;rsp[1]);</div><div class='add'>+		work_handlers[rpl-&gt;opcode](dev, (unsigned char *)&amp;rsp[1]);</div><div class='ctx'> 	else</div><div class='del'>-		work_handlers[rpl-&gt;ot.opcode](dev, pgl-&gt;va);</div><div class='add'>+		work_handlers[rpl-&gt;opcode](dev, pgl-&gt;va);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -203,10 +201,8 @@ static int chcr_uld_state_change(void *handle, enum cxgb4_state state)</div><div class='ctx'> </div><div class='ctx'> static int __init chcr_crypto_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (cxgb4_register_uld(CXGB4_ULD_CRYPTO, &amp;chcr_uld_info)) {</div><div class='add'>+	if (cxgb4_register_uld(CXGB4_ULD_CRYPTO, &amp;chcr_uld_info))</div><div class='ctx'> 		pr_err("ULD register fail: No chcr crypto support in cxgb4");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/crypto/chelsio/chcr_core.h b/drivers/crypto/chelsio/chcr_core.h<br/>index 2a5c671a4232..79da22b5cdc9 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/chelsio/chcr_core.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/chelsio/chcr_core.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/chelsio/chcr_core.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/chcr_core.h</a></div><div class='hunk'>@@ -52,15 +52,30 @@</div><div class='ctx'> </div><div class='ctx'> #define MAC_ERROR_BIT		0</div><div class='ctx'> #define CHK_MAC_ERR_BIT(x)	(((x) &gt;&gt; MAC_ERROR_BIT) &amp; 1)</div><div class='add'>+#define MAX_SALT                4</div><div class='ctx'> </div><div class='ctx'> struct uld_ctx;</div><div class='ctx'> </div><div class='add'>+struct _key_ctx {</div><div class='add'>+	__be32 ctx_hdr;</div><div class='add'>+	u8 salt[MAX_SALT];</div><div class='add'>+	__be64 reserverd;</div><div class='add'>+	unsigned char key[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chcr_wr {</div><div class='add'>+	struct fw_crypto_lookaside_wr wreq;</div><div class='add'>+	struct ulp_txpkt ulptx;</div><div class='add'>+	struct ulptx_idata sc_imm;</div><div class='add'>+	struct cpl_tx_sec_pdu sec_cpl;</div><div class='add'>+	struct _key_ctx key_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct chcr_dev {</div><div class='del'>-	/* Request submited to h/w and waiting for response. */</div><div class='ctx'> 	spinlock_t lock_chcr_dev;</div><div class='del'>-	struct crypto_queue pending_queue;</div><div class='ctx'> 	struct uld_ctx *u_ctx;</div><div class='ctx'> 	unsigned char tx_channel_id;</div><div class='add'>+	unsigned char rx_channel_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct uld_ctx {</div><div class='head'>diff --git a/drivers/crypto/chelsio/chcr_crypto.h b/drivers/crypto/chelsio/chcr_crypto.h<br/>index d7d75605da8b..81cfd0ba132e 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/chelsio/chcr_crypto.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/chelsio/chcr_crypto.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/chelsio/chcr_crypto.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/chelsio/chcr_crypto.h</a></div><div class='hunk'>@@ -36,11 +36,19 @@</div><div class='ctx'> #ifndef __CHCR_CRYPTO_H__</div><div class='ctx'> #define __CHCR_CRYPTO_H__</div><div class='ctx'> </div><div class='add'>+#define GHASH_BLOCK_SIZE    16</div><div class='add'>+#define GHASH_DIGEST_SIZE   16</div><div class='add'>+</div><div class='add'>+#define CCM_B0_SIZE             16</div><div class='add'>+#define CCM_AAD_FIELD_SIZE      2</div><div class='add'>+#define T5_MAX_AAD_SIZE 512</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* Define following if h/w is not dropping the AAD and IV data before</div><div class='ctx'>  * giving the processed data</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define CHCR_CRA_PRIORITY 300</div><div class='add'>+#define CHCR_CRA_PRIORITY 3000</div><div class='ctx'> </div><div class='ctx'> #define CHCR_AES_MAX_KEY_LEN  (2 * (AES_MAX_KEY_SIZE)) /* consider xts */</div><div class='ctx'> #define CHCR_MAX_CRYPTO_IV_LEN 16 /* AES IV len */</div><div class='hunk'>@@ -63,22 +71,36 @@</div><div class='ctx'> #define CHCR_SCMD_AUTH_CTRL_AUTH_CIPHER 0</div><div class='ctx'> #define CHCR_SCMD_AUTH_CTRL_CIPHER_AUTH 1</div><div class='ctx'> </div><div class='del'>-#define CHCR_SCMD_CIPHER_MODE_NOP           0</div><div class='del'>-#define CHCR_SCMD_CIPHER_MODE_AES_CBC       1</div><div class='del'>-#define CHCR_SCMD_CIPHER_MODE_GENERIC_AES   4</div><div class='del'>-#define CHCR_SCMD_CIPHER_MODE_AES_XTS       6</div><div class='add'>+#define CHCR_SCMD_CIPHER_MODE_NOP               0</div><div class='add'>+#define CHCR_SCMD_CIPHER_MODE_AES_CBC           1</div><div class='add'>+#define CHCR_SCMD_CIPHER_MODE_AES_GCM           2</div><div class='add'>+#define CHCR_SCMD_CIPHER_MODE_AES_CTR           3</div><div class='add'>+#define CHCR_SCMD_CIPHER_MODE_GENERIC_AES       4</div><div class='add'>+#define CHCR_SCMD_CIPHER_MODE_AES_XTS           6</div><div class='add'>+#define CHCR_SCMD_CIPHER_MODE_AES_CCM           7</div><div class='ctx'> </div><div class='ctx'> #define CHCR_SCMD_AUTH_MODE_NOP             0</div><div class='ctx'> #define CHCR_SCMD_AUTH_MODE_SHA1            1</div><div class='ctx'> #define CHCR_SCMD_AUTH_MODE_SHA224          2</div><div class='ctx'> #define CHCR_SCMD_AUTH_MODE_SHA256          3</div><div class='add'>+#define CHCR_SCMD_AUTH_MODE_GHASH           4</div><div class='ctx'> #define CHCR_SCMD_AUTH_MODE_SHA512_224      5</div><div class='ctx'> #define CHCR_SCMD_AUTH_MODE_SHA512_256      6</div><div class='ctx'> #define CHCR_SCMD_AUTH_MODE_SHA512_384      7</div><div class='ctx'> #define CHCR_SCMD_AUTH_MODE_SHA512_512      8</div><div class='add'>+#define CHCR_SCMD_AUTH_MODE_CBCMAC          9</div><div class='add'>+#define CHCR_SCMD_AUTH_MODE_CMAC            10</div><div class='ctx'> </div><div class='ctx'> #define CHCR_SCMD_HMAC_CTRL_NOP             0</div><div class='ctx'> #define CHCR_SCMD_HMAC_CTRL_NO_TRUNC        1</div><div class='add'>+#define CHCR_SCMD_HMAC_CTRL_TRUNC_RFC4366   2</div><div class='add'>+#define CHCR_SCMD_HMAC_CTRL_IPSEC_96BIT     3</div><div class='add'>+#define CHCR_SCMD_HMAC_CTRL_PL1		    4</div><div class='add'>+#define CHCR_SCMD_HMAC_CTRL_PL2		    5</div><div class='add'>+#define CHCR_SCMD_HMAC_CTRL_PL3		    6</div><div class='add'>+#define CHCR_SCMD_HMAC_CTRL_DIV2	    7</div><div class='add'>+#define VERIFY_HW 0</div><div class='add'>+#define VERIFY_SW 1</div><div class='ctx'> </div><div class='ctx'> #define CHCR_SCMD_IVGEN_CTRL_HW             0</div><div class='ctx'> #define CHCR_SCMD_IVGEN_CTRL_SW             1</div><div class='hunk'>@@ -106,39 +128,77 @@</div><div class='ctx'> #define IV_IMMEDIATE            1</div><div class='ctx'> #define IV_DSGL			2</div><div class='ctx'> </div><div class='add'>+#define AEAD_H_SIZE             16</div><div class='add'>+</div><div class='ctx'> #define CRYPTO_ALG_SUB_TYPE_MASK            0x0f000000</div><div class='ctx'> #define CRYPTO_ALG_SUB_TYPE_HASH_HMAC       0x01000000</div><div class='add'>+#define CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106    0x02000000</div><div class='add'>+#define CRYPTO_ALG_SUB_TYPE_AEAD_GCM	    0x03000000</div><div class='add'>+#define CRYPTO_ALG_SUB_TYPE_AEAD_AUTHENC    0x04000000</div><div class='add'>+#define CRYPTO_ALG_SUB_TYPE_AEAD_CCM        0x05000000</div><div class='add'>+#define CRYPTO_ALG_SUB_TYPE_AEAD_RFC4309    0x06000000</div><div class='add'>+#define CRYPTO_ALG_SUB_TYPE_AEAD_NULL       0x07000000</div><div class='add'>+#define CRYPTO_ALG_SUB_TYPE_CTR             0x08000000</div><div class='ctx'> #define CRYPTO_ALG_TYPE_HMAC (CRYPTO_ALG_TYPE_AHASH |\</div><div class='ctx'> 			      CRYPTO_ALG_SUB_TYPE_HASH_HMAC)</div><div class='ctx'> </div><div class='del'>-#define MAX_SALT                4</div><div class='ctx'> #define MAX_SCRATCH_PAD_SIZE    32</div><div class='ctx'> </div><div class='ctx'> #define CHCR_HASH_MAX_BLOCK_SIZE_64  64</div><div class='ctx'> #define CHCR_HASH_MAX_BLOCK_SIZE_128 128</div><div class='ctx'> </div><div class='ctx'> /* Aligned to 128 bit boundary */</div><div class='del'>-struct _key_ctx {</div><div class='del'>-	__be32 ctx_hdr;</div><div class='del'>-	u8 salt[MAX_SALT];</div><div class='del'>-	__be64 reserverd;</div><div class='del'>-	unsigned char key[0];</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> struct ablk_ctx {</div><div class='del'>-	u8 enc;</div><div class='del'>-	unsigned int processed_len;</div><div class='ctx'> 	__be32 key_ctx_hdr;</div><div class='ctx'> 	unsigned int enckey_len;</div><div class='del'>-	unsigned int dst_nents;</div><div class='del'>-	struct scatterlist iv_sg;</div><div class='ctx'> 	u8 key[CHCR_AES_MAX_KEY_LEN];</div><div class='del'>-	u8 iv[CHCR_MAX_CRYPTO_IV_LEN];</div><div class='ctx'> 	unsigned char ciph_mode;</div><div class='add'>+	u8 rrkey[AES_MAX_KEY_SIZE];</div><div class='add'>+};</div><div class='add'>+struct chcr_aead_reqctx {</div><div class='add'>+	struct	sk_buff	*skb;</div><div class='add'>+	struct scatterlist *dst;</div><div class='add'>+	struct scatterlist srcffwd[2];</div><div class='add'>+	struct scatterlist dstffwd[2];</div><div class='add'>+	short int dst_nents;</div><div class='add'>+	u16 verify;</div><div class='add'>+	u8 iv[CHCR_MAX_CRYPTO_IV_LEN];</div><div class='add'>+	unsigned char scratch_pad[MAX_SCRATCH_PAD_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chcr_gcm_ctx {</div><div class='add'>+	u8 ghash_h[AEAD_H_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct chcr_authenc_ctx {</div><div class='add'>+	u8 dec_rrkey[AES_MAX_KEY_SIZE];</div><div class='add'>+	u8 h_iopad[2 * CHCR_HASH_MAX_DIGEST_SIZE];</div><div class='add'>+	unsigned char auth_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __aead_ctx {</div><div class='add'>+	struct chcr_gcm_ctx gcm[0];</div><div class='add'>+	struct chcr_authenc_ctx authenc[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct chcr_aead_ctx {</div><div class='add'>+	__be32 key_ctx_hdr;</div><div class='add'>+	unsigned int enckey_len;</div><div class='add'>+	struct crypto_skcipher *null;</div><div class='add'>+	u8 salt[MAX_SALT];</div><div class='add'>+	u8 key[CHCR_AES_MAX_KEY_LEN];</div><div class='add'>+	u16 hmac_ctrl;</div><div class='add'>+	u16 mayverify;</div><div class='add'>+	struct	__aead_ctx ctx[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> struct hmac_ctx {</div><div class='del'>-	struct shash_desc *desc;</div><div class='add'>+	struct crypto_shash *base_hash;</div><div class='ctx'> 	u8 ipad[CHCR_HASH_MAX_BLOCK_SIZE_128];</div><div class='ctx'> 	u8 opad[CHCR_HASH_MAX_BLOCK_SIZE_128];</div><div class='ctx'> };</div><div class='hunk'>@@ -146,6 +206,7 @@ struct hmac_ctx {</div><div class='ctx'> struct __crypto_ctx {</div><div class='ctx'> 	struct hmac_ctx hmacctx[0];</div><div class='ctx'> 	struct ablk_ctx ablkctx[0];</div><div class='add'>+	struct chcr_aead_ctx aeadctx[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct chcr_context {</div><div class='hunk'>@@ -156,18 +217,22 @@ struct chcr_context {</div><div class='ctx'> </div><div class='ctx'> struct chcr_ahash_req_ctx {</div><div class='ctx'> 	u32 result;</div><div class='del'>-	char bfr[CHCR_HASH_MAX_BLOCK_SIZE_128];</div><div class='del'>-	u8 bfr_len;</div><div class='add'>+	u8 bfr1[CHCR_HASH_MAX_BLOCK_SIZE_128];</div><div class='add'>+	u8 bfr2[CHCR_HASH_MAX_BLOCK_SIZE_128];</div><div class='add'>+	u8 *reqbfr;</div><div class='add'>+	u8 *skbfr;</div><div class='add'>+	u8 reqlen;</div><div class='ctx'> 	/* DMA the partial hash in it */</div><div class='ctx'> 	u8 partial_hash[CHCR_HASH_MAX_DIGEST_SIZE];</div><div class='ctx'> 	u64 data_len;  /* Data len till time */</div><div class='del'>-	void *dummy_payload_ptr;</div><div class='ctx'> 	/* SKB which is being sent to the hardware for processing */</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct chcr_blkcipher_req_ctx {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	unsigned int dst_nents;</div><div class='add'>+	u8 iv[CHCR_MAX_CRYPTO_IV_LEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct chcr_alg_template {</div><div class='hunk'>@@ -176,16 +241,19 @@ struct chcr_alg_template {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct crypto_alg crypto;</div><div class='ctx'> 		struct ahash_alg hash;</div><div class='add'>+		struct aead_alg aead;</div><div class='ctx'> 	} alg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct chcr_req_ctx {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct ahash_request *ahash_req;</div><div class='add'>+		struct aead_request *aead_req;</div><div class='ctx'> 		struct ablkcipher_request *ablk_req;</div><div class='ctx'> 	} req;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct chcr_ahash_req_ctx *ahash_ctx;</div><div class='add'>+		struct chcr_aead_reqctx *reqctx;</div><div class='ctx'> 		struct chcr_blkcipher_req_ctx *ablk_ctx;</div><div class='ctx'> 	} ctx;</div><div class='ctx'> };</div><div class='hunk'>@@ -195,9 +263,15 @@ struct sge_opaque_hdr {</div><div class='ctx'> 	dma_addr_t addr[MAX_SKB_FRAGS + 1];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef struct sk_buff *(*create_wr_t)(struct crypto_async_request *req,</div><div class='del'>-				       struct chcr_context *ctx,</div><div class='add'>+typedef struct sk_buff *(*create_wr_t)(struct aead_request *req,</div><div class='ctx'> 				       unsigned short qid,</div><div class='add'>+				       int size,</div><div class='ctx'> 				       unsigned short op_type);</div><div class='ctx'> </div><div class='add'>+static int chcr_aead_op(struct aead_request *req_base,</div><div class='add'>+			  unsigned short op_type,</div><div class='add'>+			  int size,</div><div class='add'>+			  create_wr_t create_wr_fn);</div><div class='add'>+static inline int get_aead_subtype(struct crypto_aead *aead);</div><div class='add'>+</div><div class='ctx'> #endif /* __CHCR_CRYPTO_H__ */</div><div class='head'>diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c<br/>index a2e77b87485b..9b07f3d88feb 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/img-hash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/img-hash.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/img-hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/img-hash.c</a></div><div class='hunk'>@@ -226,7 +226,7 @@ static int img_hash_xmit_dma(struct img_hash_dev *hdev, struct scatterlist *sg)</div><div class='ctx'> 	struct dma_async_tx_descriptor *desc;</div><div class='ctx'> 	struct img_hash_request_ctx *ctx = ahash_request_ctx(hdev-&gt;req);</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;dma_ct = dma_map_sg(hdev-&gt;dev, sg, 1, DMA_MEM_TO_DEV);</div><div class='add'>+	ctx-&gt;dma_ct = dma_map_sg(hdev-&gt;dev, sg, 1, DMA_TO_DEVICE);</div><div class='ctx'> 	if (ctx-&gt;dma_ct == 0) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev, "Invalid DMA sg\n");</div><div class='ctx'> 		hdev-&gt;err = -EINVAL;</div><div class='hunk'>@@ -241,7 +241,7 @@ static int img_hash_xmit_dma(struct img_hash_dev *hdev, struct scatterlist *sg)</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		dev_err(hdev-&gt;dev, "Null DMA descriptor\n");</div><div class='ctx'> 		hdev-&gt;err = -EINVAL;</div><div class='del'>-		dma_unmap_sg(hdev-&gt;dev, sg, 1, DMA_MEM_TO_DEV);</div><div class='add'>+		dma_unmap_sg(hdev-&gt;dev, sg, 1, DMA_TO_DEVICE);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	desc-&gt;callback = img_hash_dma_callback;</div><div class='head'>diff --git a/drivers/crypto/marvell/cesa.c b/drivers/crypto/marvell/cesa.c<br/>index 37dadb2a4feb..6e7a5c77a00a 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/marvell/cesa.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/marvell/cesa.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/marvell/cesa.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/marvell/cesa.c</a></div><div class='hunk'>@@ -375,10 +375,6 @@ static int mv_cesa_dev_dma_init(struct mv_cesa_dev *cesa)</div><div class='ctx'> 	if (!dma-&gt;padding_pool)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	dma-&gt;iv_pool = dmam_pool_create("cesa_iv", dev, 16, 1, 0);</div><div class='del'>-	if (!dma-&gt;iv_pool)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	cesa-&gt;dma = dma;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/crypto/marvell/cesa.h b/drivers/crypto/marvell/cesa.h<br/>index e423d33decd4..b7872f62f674 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/marvell/cesa.h?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/marvell/cesa.h</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/marvell/cesa.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/marvell/cesa.h</a></div><div class='hunk'>@@ -273,11 +273,12 @@ struct mv_cesa_op_ctx {</div><div class='ctx'> #define CESA_TDMA_SRC_IN_SRAM			BIT(30)</div><div class='ctx'> #define CESA_TDMA_END_OF_REQ			BIT(29)</div><div class='ctx'> #define CESA_TDMA_BREAK_CHAIN			BIT(28)</div><div class='del'>-#define CESA_TDMA_TYPE_MSK			GENMASK(27, 0)</div><div class='add'>+#define CESA_TDMA_SET_STATE			BIT(27)</div><div class='add'>+#define CESA_TDMA_TYPE_MSK			GENMASK(26, 0)</div><div class='ctx'> #define CESA_TDMA_DUMMY				0</div><div class='ctx'> #define CESA_TDMA_DATA				1</div><div class='ctx'> #define CESA_TDMA_OP				2</div><div class='del'>-#define CESA_TDMA_IV				3</div><div class='add'>+#define CESA_TDMA_RESULT			3</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct mv_cesa_tdma_desc - TDMA descriptor</div><div class='hunk'>@@ -393,7 +394,6 @@ struct mv_cesa_dev_dma {</div><div class='ctx'> 	struct dma_pool *op_pool;</div><div class='ctx'> 	struct dma_pool *cache_pool;</div><div class='ctx'> 	struct dma_pool *padding_pool;</div><div class='del'>-	struct dma_pool *iv_pool;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -839,7 +839,7 @@ mv_cesa_tdma_desc_iter_init(struct mv_cesa_tdma_chain *chain)</div><div class='ctx'> 	memset(chain, 0, sizeof(*chain));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv_cesa_dma_add_iv_op(struct mv_cesa_tdma_chain *chain, dma_addr_t src,</div><div class='add'>+int mv_cesa_dma_add_result_op(struct mv_cesa_tdma_chain *chain, dma_addr_t src,</div><div class='ctx'> 			  u32 size, u32 flags, gfp_t gfp_flags);</div><div class='ctx'> </div><div class='ctx'> struct mv_cesa_op_ctx *mv_cesa_dma_add_op(struct mv_cesa_tdma_chain *chain,</div><div class='head'>diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c<br/>index d19dc9614e6e..098871a22a54 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/marvell/cipher.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/marvell/cipher.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/marvell/cipher.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/marvell/cipher.c</a></div><div class='hunk'>@@ -212,7 +212,8 @@ mv_cesa_ablkcipher_complete(struct crypto_async_request *req)</div><div class='ctx'> 		struct mv_cesa_req *basereq;</div><div class='ctx'> </div><div class='ctx'> 		basereq = &amp;creq-&gt;base;</div><div class='del'>-		memcpy(ablkreq-&gt;info, basereq-&gt;chain.last-&gt;data, ivsize);</div><div class='add'>+		memcpy(ablkreq-&gt;info, basereq-&gt;chain.last-&gt;op-&gt;ctx.blkcipher.iv,</div><div class='add'>+		       ivsize);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		memcpy_fromio(ablkreq-&gt;info,</div><div class='ctx'> 			      engine-&gt;sram + CESA_SA_CRYPT_IV_SRAM_OFFSET,</div><div class='hunk'>@@ -373,8 +374,9 @@ static int mv_cesa_ablkcipher_dma_req_init(struct ablkcipher_request *req,</div><div class='ctx'> </div><div class='ctx'> 	/* Add output data for IV */</div><div class='ctx'> 	ivsize = crypto_ablkcipher_ivsize(crypto_ablkcipher_reqtfm(req));</div><div class='del'>-	ret = mv_cesa_dma_add_iv_op(&amp;basereq-&gt;chain, CESA_SA_CRYPT_IV_SRAM_OFFSET,</div><div class='del'>-				    ivsize, CESA_TDMA_SRC_IN_SRAM, flags);</div><div class='add'>+	ret = mv_cesa_dma_add_result_op(&amp;basereq-&gt;chain, CESA_SA_CFG_SRAM_OFFSET,</div><div class='add'>+				    CESA_SA_DATA_SRAM_OFFSET,</div><div class='add'>+				    CESA_TDMA_SRC_IN_SRAM, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_free_tdma;</div><div class='head'>diff --git a/drivers/crypto/marvell/hash.c b/drivers/crypto/marvell/hash.c<br/>index 77712b375b84..77c0fb936f47 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/marvell/hash.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/marvell/hash.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/marvell/hash.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/marvell/hash.c</a></div><div class='hunk'>@@ -280,13 +280,32 @@ static void mv_cesa_ahash_std_prepare(struct ahash_request *req)</div><div class='ctx'> 	sreq-&gt;offset = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mv_cesa_ahash_dma_step(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct mv_cesa_ahash_req *creq = ahash_request_ctx(req);</div><div class='add'>+	struct mv_cesa_req *base = &amp;creq-&gt;base;</div><div class='add'>+</div><div class='add'>+	/* We must explicitly set the digest state. */</div><div class='add'>+	if (base-&gt;chain.first-&gt;flags &amp; CESA_TDMA_SET_STATE) {</div><div class='add'>+		struct mv_cesa_engine *engine = base-&gt;engine;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		/* Set the hash state in the IVDIG regs. */</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(creq-&gt;state); i++)</div><div class='add'>+			writel_relaxed(creq-&gt;state[i], engine-&gt;regs +</div><div class='add'>+				       CESA_IVDIG(i));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mv_cesa_dma_step(base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mv_cesa_ahash_step(struct crypto_async_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct ahash_request *ahashreq = ahash_request_cast(req);</div><div class='ctx'> 	struct mv_cesa_ahash_req *creq = ahash_request_ctx(ahashreq);</div><div class='ctx'> </div><div class='ctx'> 	if (mv_cesa_req_get_type(&amp;creq-&gt;base) == CESA_DMA_REQ)</div><div class='del'>-		mv_cesa_dma_step(&amp;creq-&gt;base);</div><div class='add'>+		mv_cesa_ahash_dma_step(ahashreq);</div><div class='ctx'> 	else</div><div class='ctx'> 		mv_cesa_ahash_std_step(ahashreq);</div><div class='ctx'> }</div><div class='hunk'>@@ -311,24 +330,40 @@ static void mv_cesa_ahash_complete(struct crypto_async_request *req)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	digsize = crypto_ahash_digestsize(crypto_ahash_reqtfm(ahashreq));</div><div class='del'>-	for (i = 0; i &lt; digsize / 4; i++)</div><div class='del'>-		creq-&gt;state[i] = readl_relaxed(engine-&gt;regs + CESA_IVDIG(i));</div><div class='ctx'> </div><div class='del'>-	if (creq-&gt;last_req) {</div><div class='add'>+	if (mv_cesa_req_get_type(&amp;creq-&gt;base) == CESA_DMA_REQ &amp;&amp;</div><div class='add'>+	    (creq-&gt;base.chain.last-&gt;flags &amp; CESA_TDMA_TYPE_MSK) == CESA_TDMA_RESULT) {</div><div class='add'>+		__le32 *data = NULL;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='del'>-		 * Hardware's MD5 digest is in little endian format, but</div><div class='del'>-		 * SHA in big endian format</div><div class='add'>+		 * Result is already in the correct endianess when the SA is</div><div class='add'>+		 * used</div><div class='ctx'> 		 */</div><div class='del'>-		if (creq-&gt;algo_le) {</div><div class='del'>-			__le32 *result = (void *)ahashreq-&gt;result;</div><div class='add'>+		data = creq-&gt;base.chain.last-&gt;op-&gt;ctx.hash.hash;</div><div class='add'>+		for (i = 0; i &lt; digsize / 4; i++)</div><div class='add'>+			creq-&gt;state[i] = cpu_to_le32(data[i]);</div><div class='ctx'> </div><div class='del'>-			for (i = 0; i &lt; digsize / 4; i++)</div><div class='del'>-				result[i] = cpu_to_le32(creq-&gt;state[i]);</div><div class='del'>-		} else {</div><div class='del'>-			__be32 *result = (void *)ahashreq-&gt;result;</div><div class='add'>+		memcpy(ahashreq-&gt;result, data, digsize);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; digsize / 4; i++)</div><div class='add'>+			creq-&gt;state[i] = readl_relaxed(engine-&gt;regs +</div><div class='add'>+						       CESA_IVDIG(i));</div><div class='add'>+		if (creq-&gt;last_req) {</div><div class='add'>+			/*</div><div class='add'>+			* Hardware's MD5 digest is in little endian format, but</div><div class='add'>+			* SHA in big endian format</div><div class='add'>+			*/</div><div class='add'>+			if (creq-&gt;algo_le) {</div><div class='add'>+				__le32 *result = (void *)ahashreq-&gt;result;</div><div class='add'>+</div><div class='add'>+				for (i = 0; i &lt; digsize / 4; i++)</div><div class='add'>+					result[i] = cpu_to_le32(creq-&gt;state[i]);</div><div class='add'>+			} else {</div><div class='add'>+				__be32 *result = (void *)ahashreq-&gt;result;</div><div class='ctx'> </div><div class='del'>-			for (i = 0; i &lt; digsize / 4; i++)</div><div class='del'>-				result[i] = cpu_to_be32(creq-&gt;state[i]);</div><div class='add'>+				for (i = 0; i &lt; digsize / 4; i++)</div><div class='add'>+					result[i] = cpu_to_be32(creq-&gt;state[i]);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -503,6 +538,12 @@ mv_cesa_ahash_dma_last_req(struct mv_cesa_tdma_chain *chain,</div><div class='ctx'> 						CESA_SA_DESC_CFG_LAST_FRAG,</div><div class='ctx'> 				      CESA_SA_DESC_CFG_FRAG_MSK);</div><div class='ctx'> </div><div class='add'>+		ret = mv_cesa_dma_add_result_op(chain,</div><div class='add'>+						CESA_SA_CFG_SRAM_OFFSET,</div><div class='add'>+						CESA_SA_DATA_SRAM_OFFSET,</div><div class='add'>+						CESA_TDMA_SRC_IN_SRAM, flags);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='ctx'> 		return op;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -562,11 +603,16 @@ static int mv_cesa_ahash_dma_req_init(struct ahash_request *req)</div><div class='ctx'> 	struct mv_cesa_ahash_dma_iter iter;</div><div class='ctx'> 	struct mv_cesa_op_ctx *op = NULL;</div><div class='ctx'> 	unsigned int frag_len;</div><div class='add'>+	bool set_state = false;</div><div class='ctx'> 	int ret;</div><div class='add'>+	u32 type;</div><div class='ctx'> </div><div class='ctx'> 	basereq-&gt;chain.first = NULL;</div><div class='ctx'> 	basereq-&gt;chain.last = NULL;</div><div class='ctx'> </div><div class='add'>+	if (!mv_cesa_mac_op_is_first_frag(&amp;creq-&gt;op_tmpl))</div><div class='add'>+		set_state = true;</div><div class='add'>+</div><div class='ctx'> 	if (creq-&gt;src_nents) {</div><div class='ctx'> 		ret = dma_map_sg(cesa_dev-&gt;dev, req-&gt;src, creq-&gt;src_nents,</div><div class='ctx'> 				 DMA_TO_DEVICE);</div><div class='hunk'>@@ -634,7 +680,15 @@ static int mv_cesa_ahash_dma_req_init(struct ahash_request *req)</div><div class='ctx'> 		goto err_free_tdma;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (op) {</div><div class='add'>+	/*</div><div class='add'>+	 * If results are copied via DMA, this means that this</div><div class='add'>+	 * request can be directly processed by the engine,</div><div class='add'>+	 * without partial updates. So we can chain it at the</div><div class='add'>+	 * DMA level with other requests.</div><div class='add'>+	 */</div><div class='add'>+	type = basereq-&gt;chain.last-&gt;flags &amp; CESA_TDMA_TYPE_MSK;</div><div class='add'>+</div><div class='add'>+	if (op &amp;&amp; type != CESA_TDMA_RESULT) {</div><div class='ctx'> 		/* Add dummy desc to wait for crypto operation end */</div><div class='ctx'> 		ret = mv_cesa_dma_add_dummy_end(&amp;basereq-&gt;chain, flags);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -647,8 +701,19 @@ static int mv_cesa_ahash_dma_req_init(struct ahash_request *req)</div><div class='ctx'> 	else</div><div class='ctx'> 		creq-&gt;cache_ptr = 0;</div><div class='ctx'> </div><div class='del'>-	basereq-&gt;chain.last-&gt;flags |= (CESA_TDMA_END_OF_REQ |</div><div class='del'>-				       CESA_TDMA_BREAK_CHAIN);</div><div class='add'>+	basereq-&gt;chain.last-&gt;flags |= CESA_TDMA_END_OF_REQ;</div><div class='add'>+</div><div class='add'>+	if (type != CESA_TDMA_RESULT)</div><div class='add'>+		basereq-&gt;chain.last-&gt;flags |= CESA_TDMA_BREAK_CHAIN;</div><div class='add'>+</div><div class='add'>+	if (set_state) {</div><div class='add'>+		/*</div><div class='add'>+		 * Put the CESA_TDMA_SET_STATE flag on the first tdma desc to</div><div class='add'>+		 * let the step logic know that the IVDIG registers should be</div><div class='add'>+		 * explicitly set before launching a TDMA chain.</div><div class='add'>+		 */</div><div class='add'>+		basereq-&gt;chain.first-&gt;flags |= CESA_TDMA_SET_STATE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/marvell/tdma.c b/drivers/crypto/marvell/tdma.c<br/>index 9fd7a5fbaa1b..c76375ff376d 100644<br/>--- a/<a href='/drm-misc/tree/drivers/crypto/marvell/tdma.c?id=cdf4275e957c6bad3756e98942341667f1d7de7d'>drivers/crypto/marvell/tdma.c</a><br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/marvell/tdma.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/marvell/tdma.c</a></div><div class='hunk'>@@ -69,9 +69,6 @@ void mv_cesa_dma_cleanup(struct mv_cesa_req *dreq)</div><div class='ctx'> 		if (type == CESA_TDMA_OP)</div><div class='ctx'> 			dma_pool_free(cesa_dev-&gt;dma-&gt;op_pool, tdma-&gt;op,</div><div class='ctx'> 				      le32_to_cpu(tdma-&gt;src));</div><div class='del'>-		else if (type == CESA_TDMA_IV)</div><div class='del'>-			dma_pool_free(cesa_dev-&gt;dma-&gt;iv_pool, tdma-&gt;data,</div><div class='del'>-				      le32_to_cpu(tdma-&gt;dst));</div><div class='ctx'> </div><div class='ctx'> 		tdma = tdma-&gt;next;</div><div class='ctx'> 		dma_pool_free(cesa_dev-&gt;dma-&gt;tdma_desc_pool, old_tdma,</div><div class='hunk'>@@ -112,7 +109,14 @@ void mv_cesa_tdma_chain(struct mv_cesa_engine *engine,</div><div class='ctx'> 		last-&gt;next = dreq-&gt;chain.first;</div><div class='ctx'> 		engine-&gt;chain.last = dreq-&gt;chain.last;</div><div class='ctx'> </div><div class='del'>-		if (!(last-&gt;flags &amp; CESA_TDMA_BREAK_CHAIN))</div><div class='add'>+		/*</div><div class='add'>+		 * Break the DMA chain if the CESA_TDMA_BREAK_CHAIN is set on</div><div class='add'>+		 * the last element of the current chain, or if the request</div><div class='add'>+		 * being queued needs the IV regs to be set before lauching</div><div class='add'>+		 * the request.</div><div class='add'>+		 */</div><div class='add'>+		if (!(last-&gt;flags &amp; CESA_TDMA_BREAK_CHAIN) &amp;&amp;</div><div class='add'>+		    !(dreq-&gt;chain.first-&gt;flags &amp; CESA_TDMA_SET_STATE))</div><div class='ctx'> 			last-&gt;next_dma = dreq-&gt;chain.first-&gt;cur_dma;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -209,29 +213,37 @@ mv_cesa_dma_add_desc(struct mv_cesa_tdma_chain *chain, gfp_t flags)</div><div class='ctx'> 	return new_tdma;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv_cesa_dma_add_iv_op(struct mv_cesa_tdma_chain *chain, dma_addr_t src,</div><div class='add'>+int mv_cesa_dma_add_result_op(struct mv_cesa_tdma_chain *chain, dma_addr_t src,</div><div class='ctx'> 			  u32 size, u32 flags, gfp_t gfp_flags)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	struct mv_cesa_tdma_desc *tdma;</div><div class='del'>-	u8 *iv;</div><div class='del'>-	dma_addr_t dma_handle;</div><div class='add'>+	struct mv_cesa_tdma_desc *tdma, *op_desc;</div><div class='ctx'> </div><div class='ctx'> 	tdma = mv_cesa_dma_add_desc(chain, gfp_flags);</div><div class='ctx'> 	if (IS_ERR(tdma))</div><div class='ctx'> 		return PTR_ERR(tdma);</div><div class='ctx'> </div><div class='del'>-	iv = dma_pool_alloc(cesa_dev-&gt;dma-&gt;iv_pool, gfp_flags, &amp;dma_handle);</div><div class='del'>-	if (!iv)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	/* We re-use an existing op_desc object to retrieve the context</div><div class='add'>+	 * and result instead of allocating a new one.</div><div class='add'>+	 * There is at least one object of this type in a CESA crypto</div><div class='add'>+	 * req, just pick the first one in the chain.</div><div class='add'>+	 */</div><div class='add'>+	for (op_desc = chain-&gt;first; op_desc; op_desc = op_desc-&gt;next) {</div><div class='add'>+		u32 type = op_desc-&gt;flags &amp; CESA_TDMA_TYPE_MSK;</div><div class='add'>+</div><div class='add'>+		if (type == CESA_TDMA_OP)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!op_desc)</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	tdma-&gt;byte_cnt = cpu_to_le32(size | BIT(31));</div><div class='ctx'> 	tdma-&gt;src = src;</div><div class='del'>-	tdma-&gt;dst = cpu_to_le32(dma_handle);</div><div class='del'>-	tdma-&gt;data = iv;</div><div class='add'>+	tdma-&gt;dst = op_desc-&gt;src;</div><div class='add'>+	tdma-&gt;op = op_desc-&gt;op;</div><div class='ctx'> </div><div class='ctx'> 	flags &amp;= (CESA_TDMA_DST_IN_SRAM | CESA_TDMA_SRC_IN_SRAM);</div><div class='del'>-	tdma-&gt;flags = flags | CESA_TDMA_IV;</div><div class='add'>+	tdma-&gt;flags = flags | CESA_TDMA_RESULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/mediatek/Makefile b/drivers/crypto/mediatek/Makefile<br/>new file mode 100644<br/>index 000000000000..187be79c7f3e<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/mediatek/Makefile?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/Makefile</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_MEDIATEK) += mtk-crypto.o</div><div class='add'>+mtk-crypto-objs:= mtk-platform.o mtk-aes.o mtk-sha.o</div><div class='head'>diff --git a/drivers/crypto/mediatek/mtk-aes.c b/drivers/crypto/mediatek/mtk-aes.c<br/>new file mode 100644<br/>index 000000000000..3a47cdb8f0c8<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/mediatek/mtk-aes.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/mtk-aes.c</a></div><div class='hunk'>@@ -0,0 +1,1299 @@</div><div class='add'>+/*</div><div class='add'>+ * Cryptographic API.</div><div class='add'>+ *</div><div class='add'>+ * Driver for EIP97 AES acceleration.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Some ideas are from atmel-aes.c drivers.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include "mtk-platform.h"</div><div class='add'>+</div><div class='add'>+#define AES_QUEUE_SIZE		512</div><div class='add'>+#define AES_BUF_ORDER		2</div><div class='add'>+#define AES_BUF_SIZE		((PAGE_SIZE &lt;&lt; AES_BUF_ORDER) \</div><div class='add'>+				&amp; ~(AES_BLOCK_SIZE - 1))</div><div class='add'>+</div><div class='add'>+/* AES command token size */</div><div class='add'>+#define AES_CT_SIZE_ECB		2</div><div class='add'>+#define AES_CT_SIZE_CBC		3</div><div class='add'>+#define AES_CT_SIZE_CTR		3</div><div class='add'>+#define AES_CT_SIZE_GCM_OUT	5</div><div class='add'>+#define AES_CT_SIZE_GCM_IN	6</div><div class='add'>+#define AES_CT_CTRL_HDR		cpu_to_le32(0x00220000)</div><div class='add'>+</div><div class='add'>+/* AES-CBC/ECB/CTR command token */</div><div class='add'>+#define AES_CMD0		cpu_to_le32(0x05000000)</div><div class='add'>+#define AES_CMD1		cpu_to_le32(0x2d060000)</div><div class='add'>+#define AES_CMD2		cpu_to_le32(0xe4a63806)</div><div class='add'>+/* AES-GCM command token */</div><div class='add'>+#define AES_GCM_CMD0		cpu_to_le32(0x0b000000)</div><div class='add'>+#define AES_GCM_CMD1		cpu_to_le32(0xa0800000)</div><div class='add'>+#define AES_GCM_CMD2		cpu_to_le32(0x25000010)</div><div class='add'>+#define AES_GCM_CMD3		cpu_to_le32(0x0f020000)</div><div class='add'>+#define AES_GCM_CMD4		cpu_to_le32(0x21e60000)</div><div class='add'>+#define AES_GCM_CMD5		cpu_to_le32(0x40e60000)</div><div class='add'>+#define AES_GCM_CMD6		cpu_to_le32(0xd0070000)</div><div class='add'>+</div><div class='add'>+/* AES transform information word 0 fields */</div><div class='add'>+#define AES_TFM_BASIC_OUT	cpu_to_le32(0x4 &lt;&lt; 0)</div><div class='add'>+#define AES_TFM_BASIC_IN	cpu_to_le32(0x5 &lt;&lt; 0)</div><div class='add'>+#define AES_TFM_GCM_OUT		cpu_to_le32(0x6 &lt;&lt; 0)</div><div class='add'>+#define AES_TFM_GCM_IN		cpu_to_le32(0xf &lt;&lt; 0)</div><div class='add'>+#define AES_TFM_SIZE(x)		cpu_to_le32((x) &lt;&lt; 8)</div><div class='add'>+#define AES_TFM_128BITS		cpu_to_le32(0xb &lt;&lt; 16)</div><div class='add'>+#define AES_TFM_192BITS		cpu_to_le32(0xd &lt;&lt; 16)</div><div class='add'>+#define AES_TFM_256BITS		cpu_to_le32(0xf &lt;&lt; 16)</div><div class='add'>+/* AES transform information word 1 fields */</div><div class='add'>+#define AES_TFM_ECB		cpu_to_le32(0x0 &lt;&lt; 0)</div><div class='add'>+#define AES_TFM_CBC		cpu_to_le32(0x1 &lt;&lt; 0)</div><div class='add'>+#define AES_TFM_CTR_INIT	cpu_to_le32(0x2 &lt;&lt; 0)	/* init counter to 1 */</div><div class='add'>+#define AES_TFM_CTR_LOAD	cpu_to_le32(0x6 &lt;&lt; 0)	/* load/reuse counter */</div><div class='add'>+#define AES_TFM_3IV		cpu_to_le32(0x7 &lt;&lt; 5)	/* using IV 0-2 */</div><div class='add'>+#define AES_TFM_FULL_IV		cpu_to_le32(0xf &lt;&lt; 5)	/* using IV 0-3 */</div><div class='add'>+#define AES_TFM_IV_CTR_MODE	cpu_to_le32(0x1 &lt;&lt; 10)</div><div class='add'>+#define AES_TFM_ENC_HASH	cpu_to_le32(0x1 &lt;&lt; 17)</div><div class='add'>+#define AES_TFM_GHASH_DIG	cpu_to_le32(0x2 &lt;&lt; 21)</div><div class='add'>+#define AES_TFM_GHASH		cpu_to_le32(0x4 &lt;&lt; 23)</div><div class='add'>+</div><div class='add'>+/* AES flags */</div><div class='add'>+#define AES_FLAGS_ECB		BIT(0)</div><div class='add'>+#define AES_FLAGS_CBC		BIT(1)</div><div class='add'>+#define AES_FLAGS_CTR		BIT(2)</div><div class='add'>+#define AES_FLAGS_GCM		BIT(3)</div><div class='add'>+#define AES_FLAGS_ENCRYPT	BIT(4)</div><div class='add'>+#define AES_FLAGS_BUSY		BIT(5)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Command token(CT) is a set of hardware instructions that</div><div class='add'>+ * are used to control engine's processing flow of AES.</div><div class='add'>+ *</div><div class='add'>+ * Transform information(TFM) is used to define AES state and</div><div class='add'>+ * contains all keys and initial vectors.</div><div class='add'>+ *</div><div class='add'>+ * The engine requires CT and TFM to do:</div><div class='add'>+ * - Commands decoding and control of the engine's data path.</div><div class='add'>+ * - Coordinating hardware data fetch and store operations.</div><div class='add'>+ * - Result token construction and output.</div><div class='add'>+ *</div><div class='add'>+ * Memory map of GCM's TFM:</div><div class='add'>+ * /-----------\</div><div class='add'>+ * |  AES KEY  | 128/196/256 bits</div><div class='add'>+ * |-----------|</div><div class='add'>+ * |  HASH KEY | a string 128 zero bits encrypted using the block cipher</div><div class='add'>+ * |-----------|</div><div class='add'>+ * |    IVs    | 4 * 4 bytes</div><div class='add'>+ * \-----------/</div><div class='add'>+ */</div><div class='add'>+struct mtk_aes_ct {</div><div class='add'>+	__le32 cmd[AES_CT_SIZE_GCM_IN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_aes_tfm {</div><div class='add'>+	__le32 ctrl[2];</div><div class='add'>+	__le32 state[SIZE_IN_WORDS(AES_KEYSIZE_256 + AES_BLOCK_SIZE * 2)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_aes_reqctx {</div><div class='add'>+	u64 mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_aes_base_ctx {</div><div class='add'>+	struct mtk_cryp *cryp;</div><div class='add'>+	u32 keylen;</div><div class='add'>+	mtk_aes_fn start;</div><div class='add'>+</div><div class='add'>+	struct mtk_aes_ct ct;</div><div class='add'>+	dma_addr_t ct_dma;</div><div class='add'>+	struct mtk_aes_tfm tfm;</div><div class='add'>+	dma_addr_t tfm_dma;</div><div class='add'>+</div><div class='add'>+	__le32 ct_hdr;</div><div class='add'>+	u32 ct_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_aes_ctx {</div><div class='add'>+	struct mtk_aes_base_ctx	base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_aes_ctr_ctx {</div><div class='add'>+	struct mtk_aes_base_ctx base;</div><div class='add'>+</div><div class='add'>+	u32	iv[AES_BLOCK_SIZE / sizeof(u32)];</div><div class='add'>+	size_t offset;</div><div class='add'>+	struct scatterlist src[2];</div><div class='add'>+	struct scatterlist dst[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_aes_gcm_ctx {</div><div class='add'>+	struct mtk_aes_base_ctx base;</div><div class='add'>+</div><div class='add'>+	u32 authsize;</div><div class='add'>+	size_t textlen;</div><div class='add'>+</div><div class='add'>+	struct crypto_skcipher *ctr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_aes_gcm_setkey_result {</div><div class='add'>+	int err;</div><div class='add'>+	struct completion completion;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_aes_drv {</div><div class='add'>+	struct list_head dev_list;</div><div class='add'>+	/* Device list lock */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mtk_aes_drv mtk_aes = {</div><div class='add'>+	.dev_list = LIST_HEAD_INIT(mtk_aes.dev_list),</div><div class='add'>+	.lock = __SPIN_LOCK_UNLOCKED(mtk_aes.lock),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u32 mtk_aes_read(struct mtk_cryp *cryp, u32 offset)</div><div class='add'>+{</div><div class='add'>+	return readl_relaxed(cryp-&gt;base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mtk_aes_write(struct mtk_cryp *cryp,</div><div class='add'>+				 u32 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	writel_relaxed(value, cryp-&gt;base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mtk_cryp *mtk_aes_find_dev(struct mtk_aes_base_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mtk_cryp *cryp = NULL;</div><div class='add'>+	struct mtk_cryp *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;mtk_aes.lock);</div><div class='add'>+	if (!ctx-&gt;cryp) {</div><div class='add'>+		list_for_each_entry(tmp, &amp;mtk_aes.dev_list, aes_list) {</div><div class='add'>+			cryp = tmp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ctx-&gt;cryp = cryp;</div><div class='add'>+	} else {</div><div class='add'>+		cryp = ctx-&gt;cryp;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;mtk_aes.lock);</div><div class='add'>+</div><div class='add'>+	return cryp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline size_t mtk_aes_padlen(size_t len)</div><div class='add'>+{</div><div class='add'>+	len &amp;= AES_BLOCK_SIZE - 1;</div><div class='add'>+	return len ? AES_BLOCK_SIZE - len : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool mtk_aes_check_aligned(struct scatterlist *sg, size_t len,</div><div class='add'>+				  struct mtk_aes_dma *dma)</div><div class='add'>+{</div><div class='add'>+	int nents;</div><div class='add'>+</div><div class='add'>+	if (!IS_ALIGNED(len, AES_BLOCK_SIZE))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (nents = 0; sg; sg = sg_next(sg), ++nents) {</div><div class='add'>+		if (!IS_ALIGNED(sg-&gt;offset, sizeof(u32)))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (len &lt;= sg-&gt;length) {</div><div class='add'>+			if (!IS_ALIGNED(len, AES_BLOCK_SIZE))</div><div class='add'>+				return false;</div><div class='add'>+</div><div class='add'>+			dma-&gt;nents = nents + 1;</div><div class='add'>+			dma-&gt;remainder = sg-&gt;length - len;</div><div class='add'>+			sg-&gt;length = len;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!IS_ALIGNED(sg-&gt;length, AES_BLOCK_SIZE))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		len -= sg-&gt;length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mtk_aes_set_mode(struct mtk_aes_rec *aes,</div><div class='add'>+				    const struct mtk_aes_reqctx *rctx)</div><div class='add'>+{</div><div class='add'>+	/* Clear all but persistent flags and set request flags. */</div><div class='add'>+	aes-&gt;flags = (aes-&gt;flags &amp; AES_FLAGS_BUSY) | rctx-&gt;mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mtk_aes_restore_sg(const struct mtk_aes_dma *dma)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg = dma-&gt;sg;</div><div class='add'>+	int nents = dma-&gt;nents;</div><div class='add'>+</div><div class='add'>+	if (!dma-&gt;remainder)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while (--nents &gt; 0 &amp;&amp; sg)</div><div class='add'>+		sg = sg_next(sg);</div><div class='add'>+</div><div class='add'>+	if (!sg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sg-&gt;length += dma-&gt;remainder;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write descriptors for processing. This will configure the engine, load</div><div class='add'>+ * the transform information and then start the packet processing.</div><div class='add'>+ */</div><div class='add'>+static int mtk_aes_xmit(struct mtk_cryp *cryp, struct mtk_aes_rec *aes)</div><div class='add'>+{</div><div class='add'>+	struct mtk_ring *ring = cryp-&gt;ring[aes-&gt;id];</div><div class='add'>+	struct mtk_desc *cmd = NULL, *res = NULL;</div><div class='add'>+	struct scatterlist *ssg = aes-&gt;src.sg, *dsg = aes-&gt;dst.sg;</div><div class='add'>+	u32 slen = aes-&gt;src.sg_len, dlen = aes-&gt;dst.sg_len;</div><div class='add'>+	int nents;</div><div class='add'>+</div><div class='add'>+	/* Write command descriptors */</div><div class='add'>+	for (nents = 0; nents &lt; slen; ++nents, ssg = sg_next(ssg)) {</div><div class='add'>+		cmd = ring-&gt;cmd_base + ring-&gt;cmd_pos;</div><div class='add'>+		cmd-&gt;hdr = MTK_DESC_BUF_LEN(ssg-&gt;length);</div><div class='add'>+		cmd-&gt;buf = cpu_to_le32(sg_dma_address(ssg));</div><div class='add'>+</div><div class='add'>+		if (nents == 0) {</div><div class='add'>+			cmd-&gt;hdr |= MTK_DESC_FIRST |</div><div class='add'>+				    MTK_DESC_CT_LEN(aes-&gt;ctx-&gt;ct_size);</div><div class='add'>+			cmd-&gt;ct = cpu_to_le32(aes-&gt;ctx-&gt;ct_dma);</div><div class='add'>+			cmd-&gt;ct_hdr = aes-&gt;ctx-&gt;ct_hdr;</div><div class='add'>+			cmd-&gt;tfm = cpu_to_le32(aes-&gt;ctx-&gt;tfm_dma);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (++ring-&gt;cmd_pos == MTK_DESC_NUM)</div><div class='add'>+			ring-&gt;cmd_pos = 0;</div><div class='add'>+	}</div><div class='add'>+	cmd-&gt;hdr |= MTK_DESC_LAST;</div><div class='add'>+</div><div class='add'>+	/* Prepare result descriptors */</div><div class='add'>+	for (nents = 0; nents &lt; dlen; ++nents, dsg = sg_next(dsg)) {</div><div class='add'>+		res = ring-&gt;res_base + ring-&gt;res_pos;</div><div class='add'>+		res-&gt;hdr = MTK_DESC_BUF_LEN(dsg-&gt;length);</div><div class='add'>+		res-&gt;buf = cpu_to_le32(sg_dma_address(dsg));</div><div class='add'>+</div><div class='add'>+		if (nents == 0)</div><div class='add'>+			res-&gt;hdr |= MTK_DESC_FIRST;</div><div class='add'>+</div><div class='add'>+		if (++ring-&gt;res_pos == MTK_DESC_NUM)</div><div class='add'>+			ring-&gt;res_pos = 0;</div><div class='add'>+	}</div><div class='add'>+	res-&gt;hdr |= MTK_DESC_LAST;</div><div class='add'>+</div><div class='add'>+	/* Prepare enough space for authenticated tag */</div><div class='add'>+	if (aes-&gt;flags &amp; AES_FLAGS_GCM)</div><div class='add'>+		res-&gt;hdr += AES_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure that all changes to the DMA ring are done before we</div><div class='add'>+	 * start engine.</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+	/* Start DMA transfer */</div><div class='add'>+	mtk_aes_write(cryp, RDR_PREP_COUNT(aes-&gt;id), MTK_DESC_CNT(dlen));</div><div class='add'>+	mtk_aes_write(cryp, CDR_PREP_COUNT(aes-&gt;id), MTK_DESC_CNT(slen));</div><div class='add'>+</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_aes_unmap(struct mtk_cryp *cryp, struct mtk_aes_rec *aes)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_base_ctx *ctx = aes-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(cryp-&gt;dev, ctx-&gt;ct_dma, sizeof(ctx-&gt;ct),</div><div class='add'>+			 DMA_TO_DEVICE);</div><div class='add'>+	dma_unmap_single(cryp-&gt;dev, ctx-&gt;tfm_dma, sizeof(ctx-&gt;tfm),</div><div class='add'>+			 DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	if (aes-&gt;src.sg == aes-&gt;dst.sg) {</div><div class='add'>+		dma_unmap_sg(cryp-&gt;dev, aes-&gt;src.sg, aes-&gt;src.nents,</div><div class='add'>+			     DMA_BIDIRECTIONAL);</div><div class='add'>+</div><div class='add'>+		if (aes-&gt;src.sg != &amp;aes-&gt;aligned_sg)</div><div class='add'>+			mtk_aes_restore_sg(&amp;aes-&gt;src);</div><div class='add'>+	} else {</div><div class='add'>+		dma_unmap_sg(cryp-&gt;dev, aes-&gt;dst.sg, aes-&gt;dst.nents,</div><div class='add'>+			     DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		if (aes-&gt;dst.sg != &amp;aes-&gt;aligned_sg)</div><div class='add'>+			mtk_aes_restore_sg(&amp;aes-&gt;dst);</div><div class='add'>+</div><div class='add'>+		dma_unmap_sg(cryp-&gt;dev, aes-&gt;src.sg, aes-&gt;src.nents,</div><div class='add'>+			     DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+		if (aes-&gt;src.sg != &amp;aes-&gt;aligned_sg)</div><div class='add'>+			mtk_aes_restore_sg(&amp;aes-&gt;src);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (aes-&gt;dst.sg == &amp;aes-&gt;aligned_sg)</div><div class='add'>+		sg_copy_from_buffer(aes-&gt;real_dst, sg_nents(aes-&gt;real_dst),</div><div class='add'>+				    aes-&gt;buf, aes-&gt;total);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_map(struct mtk_cryp *cryp, struct mtk_aes_rec *aes)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_base_ctx *ctx = aes-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ct_dma = dma_map_single(cryp-&gt;dev, &amp;ctx-&gt;ct, sizeof(ctx-&gt;ct),</div><div class='add'>+				     DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(cryp-&gt;dev, ctx-&gt;ct_dma)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;tfm_dma = dma_map_single(cryp-&gt;dev, &amp;ctx-&gt;tfm, sizeof(ctx-&gt;tfm),</div><div class='add'>+				      DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(cryp-&gt;dev, ctx-&gt;tfm_dma)))</div><div class='add'>+		goto tfm_map_err;</div><div class='add'>+</div><div class='add'>+	if (aes-&gt;src.sg == aes-&gt;dst.sg) {</div><div class='add'>+		aes-&gt;src.sg_len = dma_map_sg(cryp-&gt;dev, aes-&gt;src.sg,</div><div class='add'>+					     aes-&gt;src.nents,</div><div class='add'>+					     DMA_BIDIRECTIONAL);</div><div class='add'>+		aes-&gt;dst.sg_len = aes-&gt;src.sg_len;</div><div class='add'>+		if (unlikely(!aes-&gt;src.sg_len))</div><div class='add'>+			goto sg_map_err;</div><div class='add'>+	} else {</div><div class='add'>+		aes-&gt;src.sg_len = dma_map_sg(cryp-&gt;dev, aes-&gt;src.sg,</div><div class='add'>+					     aes-&gt;src.nents, DMA_TO_DEVICE);</div><div class='add'>+		if (unlikely(!aes-&gt;src.sg_len))</div><div class='add'>+			goto sg_map_err;</div><div class='add'>+</div><div class='add'>+		aes-&gt;dst.sg_len = dma_map_sg(cryp-&gt;dev, aes-&gt;dst.sg,</div><div class='add'>+					     aes-&gt;dst.nents, DMA_FROM_DEVICE);</div><div class='add'>+		if (unlikely(!aes-&gt;dst.sg_len)) {</div><div class='add'>+			dma_unmap_sg(cryp-&gt;dev, aes-&gt;src.sg, aes-&gt;src.nents,</div><div class='add'>+				     DMA_TO_DEVICE);</div><div class='add'>+			goto sg_map_err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mtk_aes_xmit(cryp, aes);</div><div class='add'>+</div><div class='add'>+sg_map_err:</div><div class='add'>+	dma_unmap_single(cryp-&gt;dev, ctx-&gt;tfm_dma, sizeof(ctx-&gt;tfm),</div><div class='add'>+			 DMA_TO_DEVICE);</div><div class='add'>+tfm_map_err:</div><div class='add'>+	dma_unmap_single(cryp-&gt;dev, ctx-&gt;ct_dma, sizeof(ctx-&gt;ct),</div><div class='add'>+			 DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialize transform information of CBC/ECB/CTR mode */</div><div class='add'>+static void mtk_aes_info_init(struct mtk_cryp *cryp, struct mtk_aes_rec *aes,</div><div class='add'>+			      size_t len)</div><div class='add'>+{</div><div class='add'>+	struct ablkcipher_request *req = ablkcipher_request_cast(aes-&gt;areq);</div><div class='add'>+	struct mtk_aes_base_ctx *ctx = aes-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ct_hdr = AES_CT_CTRL_HDR | cpu_to_le32(len);</div><div class='add'>+	ctx-&gt;ct.cmd[0] = AES_CMD0 | cpu_to_le32(len);</div><div class='add'>+	ctx-&gt;ct.cmd[1] = AES_CMD1;</div><div class='add'>+</div><div class='add'>+	if (aes-&gt;flags &amp; AES_FLAGS_ENCRYPT)</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] = AES_TFM_BASIC_OUT;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] = AES_TFM_BASIC_IN;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;keylen == SIZE_IN_WORDS(AES_KEYSIZE_128))</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] |= AES_TFM_128BITS;</div><div class='add'>+	else if (ctx-&gt;keylen == SIZE_IN_WORDS(AES_KEYSIZE_256))</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] |= AES_TFM_256BITS;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] |= AES_TFM_192BITS;</div><div class='add'>+</div><div class='add'>+	if (aes-&gt;flags &amp; AES_FLAGS_CBC) {</div><div class='add'>+		const u32 *iv = (const u32 *)req-&gt;info;</div><div class='add'>+		u32 *iv_state = ctx-&gt;tfm.state + ctx-&gt;keylen;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] |= AES_TFM_SIZE(ctx-&gt;keylen +</div><div class='add'>+				    SIZE_IN_WORDS(AES_BLOCK_SIZE));</div><div class='add'>+		ctx-&gt;tfm.ctrl[1] = AES_TFM_CBC | AES_TFM_FULL_IV;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; SIZE_IN_WORDS(AES_BLOCK_SIZE); i++)</div><div class='add'>+			iv_state[i] = cpu_to_le32(iv[i]);</div><div class='add'>+</div><div class='add'>+		ctx-&gt;ct.cmd[2] = AES_CMD2;</div><div class='add'>+		ctx-&gt;ct_size = AES_CT_SIZE_CBC;</div><div class='add'>+	} else if (aes-&gt;flags &amp; AES_FLAGS_ECB) {</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] |= AES_TFM_SIZE(ctx-&gt;keylen);</div><div class='add'>+		ctx-&gt;tfm.ctrl[1] = AES_TFM_ECB;</div><div class='add'>+</div><div class='add'>+		ctx-&gt;ct_size = AES_CT_SIZE_ECB;</div><div class='add'>+	} else if (aes-&gt;flags &amp; AES_FLAGS_CTR) {</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] |= AES_TFM_SIZE(ctx-&gt;keylen +</div><div class='add'>+				    SIZE_IN_WORDS(AES_BLOCK_SIZE));</div><div class='add'>+		ctx-&gt;tfm.ctrl[1] = AES_TFM_CTR_LOAD | AES_TFM_FULL_IV;</div><div class='add'>+</div><div class='add'>+		ctx-&gt;ct.cmd[2] = AES_CMD2;</div><div class='add'>+		ctx-&gt;ct_size = AES_CT_SIZE_CTR;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_dma(struct mtk_cryp *cryp, struct mtk_aes_rec *aes,</div><div class='add'>+		       struct scatterlist *src, struct scatterlist *dst,</div><div class='add'>+		       size_t len)</div><div class='add'>+{</div><div class='add'>+	size_t padlen = 0;</div><div class='add'>+	bool src_aligned, dst_aligned;</div><div class='add'>+</div><div class='add'>+	aes-&gt;total = len;</div><div class='add'>+	aes-&gt;src.sg = src;</div><div class='add'>+	aes-&gt;dst.sg = dst;</div><div class='add'>+	aes-&gt;real_dst = dst;</div><div class='add'>+</div><div class='add'>+	src_aligned = mtk_aes_check_aligned(src, len, &amp;aes-&gt;src);</div><div class='add'>+	if (src == dst)</div><div class='add'>+		dst_aligned = src_aligned;</div><div class='add'>+	else</div><div class='add'>+		dst_aligned = mtk_aes_check_aligned(dst, len, &amp;aes-&gt;dst);</div><div class='add'>+</div><div class='add'>+	if (!src_aligned || !dst_aligned) {</div><div class='add'>+		padlen = mtk_aes_padlen(len);</div><div class='add'>+</div><div class='add'>+		if (len + padlen &gt; AES_BUF_SIZE)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (!src_aligned) {</div><div class='add'>+			sg_copy_to_buffer(src, sg_nents(src), aes-&gt;buf, len);</div><div class='add'>+			aes-&gt;src.sg = &amp;aes-&gt;aligned_sg;</div><div class='add'>+			aes-&gt;src.nents = 1;</div><div class='add'>+			aes-&gt;src.remainder = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!dst_aligned) {</div><div class='add'>+			aes-&gt;dst.sg = &amp;aes-&gt;aligned_sg;</div><div class='add'>+			aes-&gt;dst.nents = 1;</div><div class='add'>+			aes-&gt;dst.remainder = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sg_init_table(&amp;aes-&gt;aligned_sg, 1);</div><div class='add'>+		sg_set_buf(&amp;aes-&gt;aligned_sg, aes-&gt;buf, len + padlen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtk_aes_info_init(cryp, aes, len + padlen);</div><div class='add'>+</div><div class='add'>+	return mtk_aes_map(cryp, aes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_handle_queue(struct mtk_cryp *cryp, u8 id,</div><div class='add'>+				struct crypto_async_request *new_areq)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_rec *aes = cryp-&gt;aes[id];</div><div class='add'>+	struct crypto_async_request *areq, *backlog;</div><div class='add'>+	struct mtk_aes_base_ctx *ctx;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;aes-&gt;lock, flags);</div><div class='add'>+	if (new_areq)</div><div class='add'>+		ret = crypto_enqueue_request(&amp;aes-&gt;queue, new_areq);</div><div class='add'>+	if (aes-&gt;flags &amp; AES_FLAGS_BUSY) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;aes-&gt;lock, flags);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	backlog = crypto_get_backlog(&amp;aes-&gt;queue);</div><div class='add'>+	areq = crypto_dequeue_request(&amp;aes-&gt;queue);</div><div class='add'>+	if (areq)</div><div class='add'>+		aes-&gt;flags |= AES_FLAGS_BUSY;</div><div class='add'>+	spin_unlock_irqrestore(&amp;aes-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!areq)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (backlog)</div><div class='add'>+		backlog-&gt;complete(backlog, -EINPROGRESS);</div><div class='add'>+</div><div class='add'>+	ctx = crypto_tfm_ctx(areq-&gt;tfm);</div><div class='add'>+</div><div class='add'>+	aes-&gt;areq = areq;</div><div class='add'>+	aes-&gt;ctx = ctx;</div><div class='add'>+</div><div class='add'>+	return ctx-&gt;start(cryp, aes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_complete(struct mtk_cryp *cryp, struct mtk_aes_rec *aes)</div><div class='add'>+{</div><div class='add'>+	aes-&gt;flags &amp;= ~AES_FLAGS_BUSY;</div><div class='add'>+	aes-&gt;areq-&gt;complete(aes-&gt;areq, 0);</div><div class='add'>+</div><div class='add'>+	/* Handle new request */</div><div class='add'>+	return mtk_aes_handle_queue(cryp, aes-&gt;id, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_start(struct mtk_cryp *cryp, struct mtk_aes_rec *aes)</div><div class='add'>+{</div><div class='add'>+	struct ablkcipher_request *req = ablkcipher_request_cast(aes-&gt;areq);</div><div class='add'>+	struct mtk_aes_reqctx *rctx = ablkcipher_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	mtk_aes_set_mode(aes, rctx);</div><div class='add'>+	aes-&gt;resume = mtk_aes_complete;</div><div class='add'>+</div><div class='add'>+	return mtk_aes_dma(cryp, aes, req-&gt;src, req-&gt;dst, req-&gt;nbytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct mtk_aes_ctr_ctx *</div><div class='add'>+mtk_aes_ctr_ctx_cast(struct mtk_aes_base_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	return container_of(ctx, struct mtk_aes_ctr_ctx, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_ctr_transfer(struct mtk_cryp *cryp, struct mtk_aes_rec *aes)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_base_ctx *ctx = aes-&gt;ctx;</div><div class='add'>+	struct mtk_aes_ctr_ctx *cctx = mtk_aes_ctr_ctx_cast(ctx);</div><div class='add'>+	struct ablkcipher_request *req = ablkcipher_request_cast(aes-&gt;areq);</div><div class='add'>+	struct scatterlist *src, *dst;</div><div class='add'>+	int i;</div><div class='add'>+	u32 start, end, ctr, blocks, *iv_state;</div><div class='add'>+	size_t datalen;</div><div class='add'>+	bool fragmented = false;</div><div class='add'>+</div><div class='add'>+	/* Check for transfer completion. */</div><div class='add'>+	cctx-&gt;offset += aes-&gt;total;</div><div class='add'>+	if (cctx-&gt;offset &gt;= req-&gt;nbytes)</div><div class='add'>+		return mtk_aes_complete(cryp, aes);</div><div class='add'>+</div><div class='add'>+	/* Compute data length. */</div><div class='add'>+	datalen = req-&gt;nbytes - cctx-&gt;offset;</div><div class='add'>+	blocks = DIV_ROUND_UP(datalen, AES_BLOCK_SIZE);</div><div class='add'>+	ctr = be32_to_cpu(cctx-&gt;iv[3]);</div><div class='add'>+</div><div class='add'>+	/* Check 32bit counter overflow. */</div><div class='add'>+	start = ctr;</div><div class='add'>+	end = start + blocks - 1;</div><div class='add'>+	if (end &lt; start) {</div><div class='add'>+		ctr |= 0xffffffff;</div><div class='add'>+		datalen = AES_BLOCK_SIZE * -start;</div><div class='add'>+		fragmented = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Jump to offset. */</div><div class='add'>+	src = scatterwalk_ffwd(cctx-&gt;src, req-&gt;src, cctx-&gt;offset);</div><div class='add'>+	dst = ((req-&gt;src == req-&gt;dst) ? src :</div><div class='add'>+	       scatterwalk_ffwd(cctx-&gt;dst, req-&gt;dst, cctx-&gt;offset));</div><div class='add'>+</div><div class='add'>+	/* Write IVs into transform state buffer. */</div><div class='add'>+	iv_state = ctx-&gt;tfm.state + ctx-&gt;keylen;</div><div class='add'>+	for (i = 0; i &lt; SIZE_IN_WORDS(AES_BLOCK_SIZE); i++)</div><div class='add'>+		iv_state[i] = cpu_to_le32(cctx-&gt;iv[i]);</div><div class='add'>+</div><div class='add'>+	if (unlikely(fragmented)) {</div><div class='add'>+	/*</div><div class='add'>+	 * Increment the counter manually to cope with the hardware</div><div class='add'>+	 * counter overflow.</div><div class='add'>+	 */</div><div class='add'>+		cctx-&gt;iv[3] = cpu_to_be32(ctr);</div><div class='add'>+		crypto_inc((u8 *)cctx-&gt;iv, AES_BLOCK_SIZE);</div><div class='add'>+	}</div><div class='add'>+	aes-&gt;resume = mtk_aes_ctr_transfer;</div><div class='add'>+</div><div class='add'>+	return mtk_aes_dma(cryp, aes, src, dst, datalen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_ctr_start(struct mtk_cryp *cryp, struct mtk_aes_rec *aes)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_ctr_ctx *cctx = mtk_aes_ctr_ctx_cast(aes-&gt;ctx);</div><div class='add'>+	struct ablkcipher_request *req = ablkcipher_request_cast(aes-&gt;areq);</div><div class='add'>+	struct mtk_aes_reqctx *rctx = ablkcipher_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	mtk_aes_set_mode(aes, rctx);</div><div class='add'>+</div><div class='add'>+	memcpy(cctx-&gt;iv, req-&gt;info, AES_BLOCK_SIZE);</div><div class='add'>+	cctx-&gt;offset = 0;</div><div class='add'>+	aes-&gt;total = 0;</div><div class='add'>+</div><div class='add'>+	return mtk_aes_ctr_transfer(cryp, aes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check and set the AES key to transform state buffer */</div><div class='add'>+static int mtk_aes_setkey(struct crypto_ablkcipher *tfm,</div><div class='add'>+			  const u8 *key, u32 keylen)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_base_ctx *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='add'>+	const u32 *aes_key = (const u32 *)key;</div><div class='add'>+	u32 *key_state = ctx-&gt;tfm.state;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (keylen != AES_KEYSIZE_128 &amp;&amp;</div><div class='add'>+	    keylen != AES_KEYSIZE_192 &amp;&amp;</div><div class='add'>+	    keylen != AES_KEYSIZE_256) {</div><div class='add'>+		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;keylen = SIZE_IN_WORDS(keylen);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ctx-&gt;keylen; i++)</div><div class='add'>+		key_state[i] = cpu_to_le32(aes_key[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_crypt(struct ablkcipher_request *req, u64 mode)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_base_ctx *ctx;</div><div class='add'>+	struct mtk_aes_reqctx *rctx;</div><div class='add'>+</div><div class='add'>+	ctx = crypto_ablkcipher_ctx(crypto_ablkcipher_reqtfm(req));</div><div class='add'>+	rctx = ablkcipher_request_ctx(req);</div><div class='add'>+	rctx-&gt;mode = mode;</div><div class='add'>+</div><div class='add'>+	return mtk_aes_handle_queue(ctx-&gt;cryp, !(mode &amp; AES_FLAGS_ENCRYPT),</div><div class='add'>+				    &amp;req-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_ecb_encrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return mtk_aes_crypt(req, AES_FLAGS_ENCRYPT | AES_FLAGS_ECB);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_ecb_decrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return mtk_aes_crypt(req, AES_FLAGS_ECB);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_cbc_encrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return mtk_aes_crypt(req, AES_FLAGS_ENCRYPT | AES_FLAGS_CBC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_cbc_decrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return mtk_aes_crypt(req, AES_FLAGS_CBC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_ctr_encrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return mtk_aes_crypt(req, AES_FLAGS_ENCRYPT | AES_FLAGS_CTR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_ctr_decrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	return mtk_aes_crypt(req, AES_FLAGS_CTR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_cra_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct mtk_cryp *cryp = NULL;</div><div class='add'>+</div><div class='add'>+	cryp = mtk_aes_find_dev(&amp;ctx-&gt;base);</div><div class='add'>+	if (!cryp) {</div><div class='add'>+		pr_err("can't find crypto device\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tfm-&gt;crt_ablkcipher.reqsize = sizeof(struct mtk_aes_reqctx);</div><div class='add'>+	ctx-&gt;base.start = mtk_aes_start;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_ctr_cra_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	struct mtk_cryp *cryp = NULL;</div><div class='add'>+</div><div class='add'>+	cryp = mtk_aes_find_dev(&amp;ctx-&gt;base);</div><div class='add'>+	if (!cryp) {</div><div class='add'>+		pr_err("can't find crypto device\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tfm-&gt;crt_ablkcipher.reqsize = sizeof(struct mtk_aes_reqctx);</div><div class='add'>+	ctx-&gt;base.start = mtk_aes_ctr_start;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg aes_algs[] = {</div><div class='add'>+{</div><div class='add'>+	.cra_name		= "cbc(aes)",</div><div class='add'>+	.cra_driver_name	= "cbc-aes-mtk",</div><div class='add'>+	.cra_priority		= 400,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER |</div><div class='add'>+				  CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_init		= mtk_aes_cra_init,</div><div class='add'>+	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct mtk_aes_ctx),</div><div class='add'>+	.cra_alignmask		= 0xf,</div><div class='add'>+	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_u.ablkcipher = {</div><div class='add'>+		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+		.setkey		= mtk_aes_setkey,</div><div class='add'>+		.encrypt	= mtk_aes_cbc_encrypt,</div><div class='add'>+		.decrypt	= mtk_aes_cbc_decrypt,</div><div class='add'>+		.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+	}</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.cra_name		= "ecb(aes)",</div><div class='add'>+	.cra_driver_name	= "ecb-aes-mtk",</div><div class='add'>+	.cra_priority		= 400,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER |</div><div class='add'>+				  CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_init		= mtk_aes_cra_init,</div><div class='add'>+	.cra_blocksize		= AES_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct mtk_aes_ctx),</div><div class='add'>+	.cra_alignmask		= 0xf,</div><div class='add'>+	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_u.ablkcipher = {</div><div class='add'>+		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+		.setkey		= mtk_aes_setkey,</div><div class='add'>+		.encrypt	= mtk_aes_ecb_encrypt,</div><div class='add'>+		.decrypt	= mtk_aes_ecb_decrypt,</div><div class='add'>+	}</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.cra_name		= "ctr(aes)",</div><div class='add'>+	.cra_driver_name	= "ctr-aes-mtk",</div><div class='add'>+	.cra_priority		= 400,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER |</div><div class='add'>+				  CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_init		= mtk_aes_ctr_cra_init,</div><div class='add'>+	.cra_blocksize		= 1,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct mtk_aes_ctr_ctx),</div><div class='add'>+	.cra_alignmask		= 0xf,</div><div class='add'>+	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_u.ablkcipher = {</div><div class='add'>+		.min_keysize	= AES_MIN_KEY_SIZE,</div><div class='add'>+		.max_keysize	= AES_MAX_KEY_SIZE,</div><div class='add'>+		.ivsize		= AES_BLOCK_SIZE,</div><div class='add'>+		.setkey		= mtk_aes_setkey,</div><div class='add'>+		.encrypt	= mtk_aes_ctr_encrypt,</div><div class='add'>+		.decrypt	= mtk_aes_ctr_decrypt,</div><div class='add'>+	}</div><div class='add'>+},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct mtk_aes_gcm_ctx *</div><div class='add'>+mtk_aes_gcm_ctx_cast(struct mtk_aes_base_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	return container_of(ctx, struct mtk_aes_gcm_ctx, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialize transform information of GCM mode */</div><div class='add'>+static void mtk_aes_gcm_info_init(struct mtk_cryp *cryp,</div><div class='add'>+				  struct mtk_aes_rec *aes,</div><div class='add'>+				  size_t len)</div><div class='add'>+{</div><div class='add'>+	struct aead_request *req = aead_request_cast(aes-&gt;areq);</div><div class='add'>+	struct mtk_aes_base_ctx *ctx = aes-&gt;ctx;</div><div class='add'>+	struct mtk_aes_gcm_ctx *gctx = mtk_aes_gcm_ctx_cast(ctx);</div><div class='add'>+	const u32 *iv = (const u32 *)req-&gt;iv;</div><div class='add'>+	u32 *iv_state = ctx-&gt;tfm.state + ctx-&gt;keylen +</div><div class='add'>+			SIZE_IN_WORDS(AES_BLOCK_SIZE);</div><div class='add'>+	u32 ivsize = crypto_aead_ivsize(crypto_aead_reqtfm(req));</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ct_hdr = AES_CT_CTRL_HDR | len;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ct.cmd[0] = AES_GCM_CMD0 | cpu_to_le32(req-&gt;assoclen);</div><div class='add'>+	ctx-&gt;ct.cmd[1] = AES_GCM_CMD1 | cpu_to_le32(req-&gt;assoclen);</div><div class='add'>+	ctx-&gt;ct.cmd[2] = AES_GCM_CMD2;</div><div class='add'>+	ctx-&gt;ct.cmd[3] = AES_GCM_CMD3 | cpu_to_le32(gctx-&gt;textlen);</div><div class='add'>+</div><div class='add'>+	if (aes-&gt;flags &amp; AES_FLAGS_ENCRYPT) {</div><div class='add'>+		ctx-&gt;ct.cmd[4] = AES_GCM_CMD4 | cpu_to_le32(gctx-&gt;authsize);</div><div class='add'>+		ctx-&gt;ct_size = AES_CT_SIZE_GCM_OUT;</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] = AES_TFM_GCM_OUT;</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;ct.cmd[4] = AES_GCM_CMD5 | cpu_to_le32(gctx-&gt;authsize);</div><div class='add'>+		ctx-&gt;ct.cmd[5] = AES_GCM_CMD6 | cpu_to_le32(gctx-&gt;authsize);</div><div class='add'>+		ctx-&gt;ct_size = AES_CT_SIZE_GCM_IN;</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] = AES_TFM_GCM_IN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;keylen == SIZE_IN_WORDS(AES_KEYSIZE_128))</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] |= AES_TFM_128BITS;</div><div class='add'>+	else if (ctx-&gt;keylen == SIZE_IN_WORDS(AES_KEYSIZE_256))</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] |= AES_TFM_256BITS;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;tfm.ctrl[0] |= AES_TFM_192BITS;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;tfm.ctrl[0] |= AES_TFM_GHASH_DIG | AES_TFM_GHASH |</div><div class='add'>+			    AES_TFM_SIZE(ctx-&gt;keylen + SIZE_IN_WORDS(</div><div class='add'>+			    AES_BLOCK_SIZE + ivsize));</div><div class='add'>+	ctx-&gt;tfm.ctrl[1] = AES_TFM_CTR_INIT | AES_TFM_IV_CTR_MODE |</div><div class='add'>+			   AES_TFM_3IV | AES_TFM_ENC_HASH;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SIZE_IN_WORDS(ivsize); i++)</div><div class='add'>+		iv_state[i] = cpu_to_le32(iv[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_gcm_dma(struct mtk_cryp *cryp, struct mtk_aes_rec *aes,</div><div class='add'>+			   struct scatterlist *src, struct scatterlist *dst,</div><div class='add'>+			   size_t len)</div><div class='add'>+{</div><div class='add'>+	bool src_aligned, dst_aligned;</div><div class='add'>+</div><div class='add'>+	aes-&gt;src.sg = src;</div><div class='add'>+	aes-&gt;dst.sg = dst;</div><div class='add'>+	aes-&gt;real_dst = dst;</div><div class='add'>+</div><div class='add'>+	src_aligned = mtk_aes_check_aligned(src, len, &amp;aes-&gt;src);</div><div class='add'>+	if (src == dst)</div><div class='add'>+		dst_aligned = src_aligned;</div><div class='add'>+	else</div><div class='add'>+		dst_aligned = mtk_aes_check_aligned(dst, len, &amp;aes-&gt;dst);</div><div class='add'>+</div><div class='add'>+	if (!src_aligned || !dst_aligned) {</div><div class='add'>+		if (aes-&gt;total &gt; AES_BUF_SIZE)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (!src_aligned) {</div><div class='add'>+			sg_copy_to_buffer(src, sg_nents(src), aes-&gt;buf, len);</div><div class='add'>+			aes-&gt;src.sg = &amp;aes-&gt;aligned_sg;</div><div class='add'>+			aes-&gt;src.nents = 1;</div><div class='add'>+			aes-&gt;src.remainder = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!dst_aligned) {</div><div class='add'>+			aes-&gt;dst.sg = &amp;aes-&gt;aligned_sg;</div><div class='add'>+			aes-&gt;dst.nents = 1;</div><div class='add'>+			aes-&gt;dst.remainder = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sg_init_table(&amp;aes-&gt;aligned_sg, 1);</div><div class='add'>+		sg_set_buf(&amp;aes-&gt;aligned_sg, aes-&gt;buf, aes-&gt;total);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtk_aes_gcm_info_init(cryp, aes, len);</div><div class='add'>+</div><div class='add'>+	return mtk_aes_map(cryp, aes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Todo: GMAC */</div><div class='add'>+static int mtk_aes_gcm_start(struct mtk_cryp *cryp, struct mtk_aes_rec *aes)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_gcm_ctx *gctx = mtk_aes_gcm_ctx_cast(aes-&gt;ctx);</div><div class='add'>+	struct aead_request *req = aead_request_cast(aes-&gt;areq);</div><div class='add'>+	struct mtk_aes_reqctx *rctx = aead_request_ctx(req);</div><div class='add'>+	u32 len = req-&gt;assoclen + req-&gt;cryptlen;</div><div class='add'>+</div><div class='add'>+	mtk_aes_set_mode(aes, rctx);</div><div class='add'>+</div><div class='add'>+	if (aes-&gt;flags &amp; AES_FLAGS_ENCRYPT) {</div><div class='add'>+		u32 tag[4];</div><div class='add'>+		/* Compute total process length. */</div><div class='add'>+		aes-&gt;total = len + gctx-&gt;authsize;</div><div class='add'>+		/* Compute text length. */</div><div class='add'>+		gctx-&gt;textlen = req-&gt;cryptlen;</div><div class='add'>+		/* Hardware will append authenticated tag to output buffer */</div><div class='add'>+		scatterwalk_map_and_copy(tag, req-&gt;dst, len, gctx-&gt;authsize, 1);</div><div class='add'>+	} else {</div><div class='add'>+		aes-&gt;total = len;</div><div class='add'>+		gctx-&gt;textlen = req-&gt;cryptlen - gctx-&gt;authsize;</div><div class='add'>+	}</div><div class='add'>+	aes-&gt;resume = mtk_aes_complete;</div><div class='add'>+</div><div class='add'>+	return mtk_aes_gcm_dma(cryp, aes, req-&gt;src, req-&gt;dst, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_base_ctx *ctx = crypto_aead_ctx(crypto_aead_reqtfm(req));</div><div class='add'>+	struct mtk_aes_reqctx *rctx = aead_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	rctx-&gt;mode = AES_FLAGS_GCM | mode;</div><div class='add'>+</div><div class='add'>+	return mtk_aes_handle_queue(ctx-&gt;cryp, !!(mode &amp; AES_FLAGS_ENCRYPT),</div><div class='add'>+								&amp;req-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_gcm_setkey_done(struct crypto_async_request *req, int err)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_gcm_setkey_result *result = req-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (err == -EINPROGRESS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	result-&gt;err = err;</div><div class='add'>+	complete(&amp;result-&gt;completion);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Because of the hardware limitation, we need to pre-calculate key(H)</div><div class='add'>+ * for the GHASH operation. The result of the encryption operation</div><div class='add'>+ * need to be stored in the transform state buffer.</div><div class='add'>+ */</div><div class='add'>+static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key,</div><div class='add'>+			      u32 keylen)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_base_ctx *ctx = crypto_aead_ctx(aead);</div><div class='add'>+	struct mtk_aes_gcm_ctx *gctx = mtk_aes_gcm_ctx_cast(ctx);</div><div class='add'>+	struct crypto_skcipher *ctr = gctx-&gt;ctr;</div><div class='add'>+	struct {</div><div class='add'>+		u32 hash[4];</div><div class='add'>+		u8 iv[8];</div><div class='add'>+</div><div class='add'>+		struct mtk_aes_gcm_setkey_result result;</div><div class='add'>+</div><div class='add'>+		struct scatterlist sg[1];</div><div class='add'>+		struct skcipher_request req;</div><div class='add'>+	} *data;</div><div class='add'>+	const u32 *aes_key;</div><div class='add'>+	u32 *key_state, *hash_state;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	if (keylen != AES_KEYSIZE_256 &amp;&amp;</div><div class='add'>+	    keylen != AES_KEYSIZE_192 &amp;&amp;</div><div class='add'>+	    keylen != AES_KEYSIZE_128) {</div><div class='add'>+		crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key_state = ctx-&gt;tfm.state;</div><div class='add'>+	aes_key = (u32 *)key;</div><div class='add'>+	ctx-&gt;keylen = SIZE_IN_WORDS(keylen);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ctx-&gt;keylen; i++)</div><div class='add'>+		ctx-&gt;tfm.state[i] = cpu_to_le32(aes_key[i]);</div><div class='add'>+</div><div class='add'>+	/* Same as crypto_gcm_setkey() from crypto/gcm.c */</div><div class='add'>+	crypto_skcipher_clear_flags(ctr, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_skcipher_set_flags(ctr, crypto_aead_get_flags(aead) &amp;</div><div class='add'>+				  CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	err = crypto_skcipher_setkey(ctr, key, keylen);</div><div class='add'>+	crypto_aead_set_flags(aead, crypto_skcipher_get_flags(ctr) &amp;</div><div class='add'>+			      CRYPTO_TFM_RES_MASK);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(*data) + crypto_skcipher_reqsize(ctr),</div><div class='add'>+		       GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;data-&gt;result.completion);</div><div class='add'>+	sg_init_one(data-&gt;sg, &amp;data-&gt;hash, AES_BLOCK_SIZE);</div><div class='add'>+	skcipher_request_set_tfm(&amp;data-&gt;req, ctr);</div><div class='add'>+	skcipher_request_set_callback(&amp;data-&gt;req, CRYPTO_TFM_REQ_MAY_SLEEP |</div><div class='add'>+				      CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='add'>+				      mtk_gcm_setkey_done, &amp;data-&gt;result);</div><div class='add'>+	skcipher_request_set_crypt(&amp;data-&gt;req, data-&gt;sg, data-&gt;sg,</div><div class='add'>+				   AES_BLOCK_SIZE, data-&gt;iv);</div><div class='add'>+</div><div class='add'>+	err = crypto_skcipher_encrypt(&amp;data-&gt;req);</div><div class='add'>+	if (err == -EINPROGRESS || err == -EBUSY) {</div><div class='add'>+		err = wait_for_completion_interruptible(</div><div class='add'>+			&amp;data-&gt;result.completion);</div><div class='add'>+		if (!err)</div><div class='add'>+			err = data-&gt;result.err;</div><div class='add'>+	}</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	hash_state = key_state + ctx-&gt;keylen;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		hash_state[i] = cpu_to_be32(data-&gt;hash[i]);</div><div class='add'>+out:</div><div class='add'>+	kzfree(data);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_gcm_setauthsize(struct crypto_aead *aead,</div><div class='add'>+				   u32 authsize)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_base_ctx *ctx = crypto_aead_ctx(aead);</div><div class='add'>+	struct mtk_aes_gcm_ctx *gctx = mtk_aes_gcm_ctx_cast(ctx);</div><div class='add'>+</div><div class='add'>+	/* Same as crypto_gcm_authsize() from crypto/gcm.c */</div><div class='add'>+	switch (authsize) {</div><div class='add'>+	case 8:</div><div class='add'>+	case 12:</div><div class='add'>+	case 16:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gctx-&gt;authsize = authsize;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_gcm_encrypt(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	return mtk_aes_gcm_crypt(req, AES_FLAGS_ENCRYPT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_gcm_decrypt(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	return mtk_aes_gcm_crypt(req, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_gcm_init(struct crypto_aead *aead)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_gcm_ctx *ctx = crypto_aead_ctx(aead);</div><div class='add'>+	struct mtk_cryp *cryp = NULL;</div><div class='add'>+</div><div class='add'>+	cryp = mtk_aes_find_dev(&amp;ctx-&gt;base);</div><div class='add'>+	if (!cryp) {</div><div class='add'>+		pr_err("can't find crypto device\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ctr = crypto_alloc_skcipher("ctr(aes)", 0,</div><div class='add'>+					 CRYPTO_ALG_ASYNC);</div><div class='add'>+	if (IS_ERR(ctx-&gt;ctr)) {</div><div class='add'>+		pr_err("Error allocating ctr(aes)\n");</div><div class='add'>+		return PTR_ERR(ctx-&gt;ctr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crypto_aead_set_reqsize(aead, sizeof(struct mtk_aes_reqctx));</div><div class='add'>+	ctx-&gt;base.start = mtk_aes_gcm_start;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_aes_gcm_exit(struct crypto_aead *aead)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_gcm_ctx *ctx = crypto_aead_ctx(aead);</div><div class='add'>+</div><div class='add'>+	crypto_free_skcipher(ctx-&gt;ctr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct aead_alg aes_gcm_alg = {</div><div class='add'>+	.setkey		= mtk_aes_gcm_setkey,</div><div class='add'>+	.setauthsize	= mtk_aes_gcm_setauthsize,</div><div class='add'>+	.encrypt	= mtk_aes_gcm_encrypt,</div><div class='add'>+	.decrypt	= mtk_aes_gcm_decrypt,</div><div class='add'>+	.init		= mtk_aes_gcm_init,</div><div class='add'>+	.exit		= mtk_aes_gcm_exit,</div><div class='add'>+	.ivsize		= 12,</div><div class='add'>+	.maxauthsize	= AES_BLOCK_SIZE,</div><div class='add'>+</div><div class='add'>+	.base = {</div><div class='add'>+		.cra_name		= "gcm(aes)",</div><div class='add'>+		.cra_driver_name	= "gcm-aes-mtk",</div><div class='add'>+		.cra_priority		= 400,</div><div class='add'>+		.cra_flags		= CRYPTO_ALG_ASYNC,</div><div class='add'>+		.cra_blocksize		= 1,</div><div class='add'>+		.cra_ctxsize		= sizeof(struct mtk_aes_gcm_ctx),</div><div class='add'>+		.cra_alignmask		= 0xf,</div><div class='add'>+		.cra_module		= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mtk_aes_enc_task(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct mtk_cryp *cryp = (struct mtk_cryp *)data;</div><div class='add'>+	struct mtk_aes_rec *aes = cryp-&gt;aes[0];</div><div class='add'>+</div><div class='add'>+	mtk_aes_unmap(cryp, aes);</div><div class='add'>+	aes-&gt;resume(cryp, aes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_aes_dec_task(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct mtk_cryp *cryp = (struct mtk_cryp *)data;</div><div class='add'>+	struct mtk_aes_rec *aes = cryp-&gt;aes[1];</div><div class='add'>+</div><div class='add'>+	mtk_aes_unmap(cryp, aes);</div><div class='add'>+	aes-&gt;resume(cryp, aes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t mtk_aes_enc_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct mtk_cryp *cryp = (struct mtk_cryp *)dev_id;</div><div class='add'>+	struct mtk_aes_rec *aes = cryp-&gt;aes[0];</div><div class='add'>+	u32 val = mtk_aes_read(cryp, RDR_STAT(RING0));</div><div class='add'>+</div><div class='add'>+	mtk_aes_write(cryp, RDR_STAT(RING0), val);</div><div class='add'>+</div><div class='add'>+	if (likely(AES_FLAGS_BUSY &amp; aes-&gt;flags)) {</div><div class='add'>+		mtk_aes_write(cryp, RDR_PROC_COUNT(RING0), MTK_CNT_RST);</div><div class='add'>+		mtk_aes_write(cryp, RDR_THRESH(RING0),</div><div class='add'>+			      MTK_RDR_PROC_THRESH | MTK_RDR_PROC_MODE);</div><div class='add'>+</div><div class='add'>+		tasklet_schedule(&amp;aes-&gt;task);</div><div class='add'>+	} else {</div><div class='add'>+		dev_warn(cryp-&gt;dev, "AES interrupt when no active requests.\n");</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t mtk_aes_dec_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct mtk_cryp *cryp = (struct mtk_cryp *)dev_id;</div><div class='add'>+	struct mtk_aes_rec *aes = cryp-&gt;aes[1];</div><div class='add'>+	u32 val = mtk_aes_read(cryp, RDR_STAT(RING1));</div><div class='add'>+</div><div class='add'>+	mtk_aes_write(cryp, RDR_STAT(RING1), val);</div><div class='add'>+</div><div class='add'>+	if (likely(AES_FLAGS_BUSY &amp; aes-&gt;flags)) {</div><div class='add'>+		mtk_aes_write(cryp, RDR_PROC_COUNT(RING1), MTK_CNT_RST);</div><div class='add'>+		mtk_aes_write(cryp, RDR_THRESH(RING1),</div><div class='add'>+			      MTK_RDR_PROC_THRESH | MTK_RDR_PROC_MODE);</div><div class='add'>+</div><div class='add'>+		tasklet_schedule(&amp;aes-&gt;task);</div><div class='add'>+	} else {</div><div class='add'>+		dev_warn(cryp-&gt;dev, "AES interrupt when no active requests.\n");</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The purpose of creating encryption and decryption records is</div><div class='add'>+ * to process outbound/inbound data in parallel, it can improve</div><div class='add'>+ * performance in most use cases, such as IPSec VPN, especially</div><div class='add'>+ * under heavy network traffic.</div><div class='add'>+ */</div><div class='add'>+static int mtk_aes_record_init(struct mtk_cryp *cryp)</div><div class='add'>+{</div><div class='add'>+	struct mtk_aes_rec **aes = cryp-&gt;aes;</div><div class='add'>+	int i, err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MTK_REC_NUM; i++) {</div><div class='add'>+		aes[i] = kzalloc(sizeof(**aes), GFP_KERNEL);</div><div class='add'>+		if (!aes[i])</div><div class='add'>+			goto err_cleanup;</div><div class='add'>+</div><div class='add'>+		aes[i]-&gt;buf = (void *)__get_free_pages(GFP_KERNEL,</div><div class='add'>+						AES_BUF_ORDER);</div><div class='add'>+		if (!aes[i]-&gt;buf)</div><div class='add'>+			goto err_cleanup;</div><div class='add'>+</div><div class='add'>+		aes[i]-&gt;id = i;</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;aes[i]-&gt;lock);</div><div class='add'>+		crypto_init_queue(&amp;aes[i]-&gt;queue, AES_QUEUE_SIZE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tasklet_init(&amp;aes[0]-&gt;task, mtk_aes_enc_task, (unsigned long)cryp);</div><div class='add'>+	tasklet_init(&amp;aes[1]-&gt;task, mtk_aes_dec_task, (unsigned long)cryp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cleanup:</div><div class='add'>+	for (; i--; ) {</div><div class='add'>+		free_page((unsigned long)aes[i]-&gt;buf);</div><div class='add'>+		kfree(aes[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_aes_record_free(struct mtk_cryp *cryp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MTK_REC_NUM; i++) {</div><div class='add'>+		tasklet_kill(&amp;cryp-&gt;aes[i]-&gt;task);</div><div class='add'>+		free_page((unsigned long)cryp-&gt;aes[i]-&gt;buf);</div><div class='add'>+		kfree(cryp-&gt;aes[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_aes_unregister_algs(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	crypto_unregister_aead(&amp;aes_gcm_alg);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aes_algs); i++)</div><div class='add'>+		crypto_unregister_alg(&amp;aes_algs[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aes_register_algs(void)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aes_algs); i++) {</div><div class='add'>+		err = crypto_register_alg(&amp;aes_algs[i]);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_aes_algs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = crypto_register_aead(&amp;aes_gcm_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_aes_algs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_aes_algs:</div><div class='add'>+	for (; i--; )</div><div class='add'>+		crypto_unregister_alg(&amp;aes_algs[i]);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mtk_cipher_alg_register(struct mtk_cryp *cryp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;cryp-&gt;aes_list);</div><div class='add'>+</div><div class='add'>+	/* Initialize two cipher records */</div><div class='add'>+	ret = mtk_aes_record_init(cryp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_record;</div><div class='add'>+</div><div class='add'>+	/* Ring0 is use by encryption record */</div><div class='add'>+	ret = devm_request_irq(cryp-&gt;dev, cryp-&gt;irq[RING0], mtk_aes_enc_irq,</div><div class='add'>+			       IRQF_TRIGGER_LOW, "mtk-aes", cryp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cryp-&gt;dev, "unable to request AES encryption irq.\n");</div><div class='add'>+		goto err_res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ring1 is use by decryption record */</div><div class='add'>+	ret = devm_request_irq(cryp-&gt;dev, cryp-&gt;irq[RING1], mtk_aes_dec_irq,</div><div class='add'>+			       IRQF_TRIGGER_LOW, "mtk-aes", cryp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cryp-&gt;dev, "unable to request AES decryption irq.\n");</div><div class='add'>+		goto err_res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable ring0 and ring1 interrupt */</div><div class='add'>+	mtk_aes_write(cryp, AIC_ENABLE_SET(RING0), MTK_IRQ_RDR0);</div><div class='add'>+	mtk_aes_write(cryp, AIC_ENABLE_SET(RING1), MTK_IRQ_RDR1);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;mtk_aes.lock);</div><div class='add'>+	list_add_tail(&amp;cryp-&gt;aes_list, &amp;mtk_aes.dev_list);</div><div class='add'>+	spin_unlock(&amp;mtk_aes.lock);</div><div class='add'>+</div><div class='add'>+	ret = mtk_aes_register_algs();</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_algs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_algs:</div><div class='add'>+	spin_lock(&amp;mtk_aes.lock);</div><div class='add'>+	list_del(&amp;cryp-&gt;aes_list);</div><div class='add'>+	spin_unlock(&amp;mtk_aes.lock);</div><div class='add'>+err_res:</div><div class='add'>+	mtk_aes_record_free(cryp);</div><div class='add'>+err_record:</div><div class='add'>+</div><div class='add'>+	dev_err(cryp-&gt;dev, "mtk-aes initialization failed.\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mtk_cipher_alg_release(struct mtk_cryp *cryp)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;mtk_aes.lock);</div><div class='add'>+	list_del(&amp;cryp-&gt;aes_list);</div><div class='add'>+	spin_unlock(&amp;mtk_aes.lock);</div><div class='add'>+</div><div class='add'>+	mtk_aes_unregister_algs();</div><div class='add'>+	mtk_aes_record_free(cryp);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/crypto/mediatek/mtk-platform.c b/drivers/crypto/mediatek/mtk-platform.c<br/>new file mode 100644<br/>index 000000000000..a9c713d4c733<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/mediatek/mtk-platform.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/mtk-platform.c</a></div><div class='hunk'>@@ -0,0 +1,604 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for EIP97 cryptographic accelerator.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include "mtk-platform.h"</div><div class='add'>+</div><div class='add'>+#define MTK_BURST_SIZE_MSK		GENMASK(7, 4)</div><div class='add'>+#define MTK_BURST_SIZE(x)		((x) &lt;&lt; 4)</div><div class='add'>+#define MTK_DESC_SIZE(x)		((x) &lt;&lt; 0)</div><div class='add'>+#define MTK_DESC_OFFSET(x)		((x) &lt;&lt; 16)</div><div class='add'>+#define MTK_DESC_FETCH_SIZE(x)		((x) &lt;&lt; 0)</div><div class='add'>+#define MTK_DESC_FETCH_THRESH(x)	((x) &lt;&lt; 16)</div><div class='add'>+#define MTK_DESC_OVL_IRQ_EN		BIT(25)</div><div class='add'>+#define MTK_DESC_ATP_PRESENT		BIT(30)</div><div class='add'>+</div><div class='add'>+#define MTK_DFSE_IDLE			GENMASK(3, 0)</div><div class='add'>+#define MTK_DFSE_THR_CTRL_EN		BIT(30)</div><div class='add'>+#define MTK_DFSE_THR_CTRL_RESET		BIT(31)</div><div class='add'>+#define MTK_DFSE_RING_ID(x)		(((x) &gt;&gt; 12) &amp; GENMASK(3, 0))</div><div class='add'>+#define MTK_DFSE_MIN_DATA(x)		((x) &lt;&lt; 0)</div><div class='add'>+#define MTK_DFSE_MAX_DATA(x)		((x) &lt;&lt; 8)</div><div class='add'>+#define MTK_DFE_MIN_CTRL(x)		((x) &lt;&lt; 16)</div><div class='add'>+#define MTK_DFE_MAX_CTRL(x)		((x) &lt;&lt; 24)</div><div class='add'>+</div><div class='add'>+#define MTK_IN_BUF_MIN_THRESH(x)	((x) &lt;&lt; 8)</div><div class='add'>+#define MTK_IN_BUF_MAX_THRESH(x)	((x) &lt;&lt; 12)</div><div class='add'>+#define MTK_OUT_BUF_MIN_THRESH(x)	((x) &lt;&lt; 0)</div><div class='add'>+#define MTK_OUT_BUF_MAX_THRESH(x)	((x) &lt;&lt; 4)</div><div class='add'>+#define MTK_IN_TBUF_SIZE(x)		(((x) &gt;&gt; 4) &amp; GENMASK(3, 0))</div><div class='add'>+#define MTK_IN_DBUF_SIZE(x)		(((x) &gt;&gt; 8) &amp; GENMASK(3, 0))</div><div class='add'>+#define MTK_OUT_DBUF_SIZE(x)		(((x) &gt;&gt; 16) &amp; GENMASK(3, 0))</div><div class='add'>+#define MTK_CMD_FIFO_SIZE(x)		(((x) &gt;&gt; 8) &amp; GENMASK(3, 0))</div><div class='add'>+#define MTK_RES_FIFO_SIZE(x)		(((x) &gt;&gt; 12) &amp; GENMASK(3, 0))</div><div class='add'>+</div><div class='add'>+#define MTK_PE_TK_LOC_AVL		BIT(2)</div><div class='add'>+#define MTK_PE_PROC_HELD		BIT(14)</div><div class='add'>+#define MTK_PE_TK_TIMEOUT_EN		BIT(22)</div><div class='add'>+#define MTK_PE_INPUT_DMA_ERR		BIT(0)</div><div class='add'>+#define MTK_PE_OUTPUT_DMA_ERR		BIT(1)</div><div class='add'>+#define MTK_PE_PKT_PORC_ERR		BIT(2)</div><div class='add'>+#define MTK_PE_PKT_TIMEOUT		BIT(3)</div><div class='add'>+#define MTK_PE_FATAL_ERR		BIT(14)</div><div class='add'>+#define MTK_PE_INPUT_DMA_ERR_EN		BIT(16)</div><div class='add'>+#define MTK_PE_OUTPUT_DMA_ERR_EN	BIT(17)</div><div class='add'>+#define MTK_PE_PKT_PORC_ERR_EN		BIT(18)</div><div class='add'>+#define MTK_PE_PKT_TIMEOUT_EN		BIT(19)</div><div class='add'>+#define MTK_PE_FATAL_ERR_EN		BIT(30)</div><div class='add'>+#define MTK_PE_INT_OUT_EN		BIT(31)</div><div class='add'>+</div><div class='add'>+#define MTK_HIA_SIGNATURE		((u16)0x35ca)</div><div class='add'>+#define MTK_HIA_DATA_WIDTH(x)		(((x) &gt;&gt; 25) &amp; GENMASK(1, 0))</div><div class='add'>+#define MTK_HIA_DMA_LENGTH(x)		(((x) &gt;&gt; 20) &amp; GENMASK(4, 0))</div><div class='add'>+#define MTK_CDR_STAT_CLR		GENMASK(4, 0)</div><div class='add'>+#define MTK_RDR_STAT_CLR		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MTK_AIC_INT_MSK			GENMASK(5, 0)</div><div class='add'>+#define MTK_AIC_VER_MSK			(GENMASK(15, 0) | GENMASK(27, 20))</div><div class='add'>+#define MTK_AIC_VER11			0x011036c9</div><div class='add'>+#define MTK_AIC_VER12			0x012036c9</div><div class='add'>+#define MTK_AIC_G_CLR			GENMASK(30, 20)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * EIP97 is an integrated security subsystem to accelerate cryptographic</div><div class='add'>+ * functions and protocols to offload the host processor.</div><div class='add'>+ * Some important hardware modules are briefly introduced below:</div><div class='add'>+ *</div><div class='add'>+ * Host Interface Adapter(HIA) - the main interface between the host</div><div class='add'>+ * system and the hardware subsystem. It is responsible for attaching</div><div class='add'>+ * processing engine to the specific host bus interface and provides a</div><div class='add'>+ * standardized software view for off loading tasks to the engine.</div><div class='add'>+ *</div><div class='add'>+ * Command Descriptor Ring Manager(CDR Manager) - keeps track of how many</div><div class='add'>+ * CD the host has prepared in the CDR. It monitors the fill level of its</div><div class='add'>+ * CD-FIFO and if there's sufficient space for the next block of descriptors,</div><div class='add'>+ * then it fires off a DMA request to fetch a block of CDs.</div><div class='add'>+ *</div><div class='add'>+ * Data fetch engine(DFE) - It is responsible for parsing the CD and</div><div class='add'>+ * setting up the required control and packet data DMA transfers from</div><div class='add'>+ * system memory to the processing engine.</div><div class='add'>+ *</div><div class='add'>+ * Result Descriptor Ring Manager(RDR Manager) - same as CDR Manager,</div><div class='add'>+ * but target is result descriptors, Moreover, it also handles the RD</div><div class='add'>+ * updates under control of the DSE. For each packet data segment</div><div class='add'>+ * processed, the DSE triggers the RDR Manager to write the updated RD.</div><div class='add'>+ * If triggered to update, the RDR Manager sets up a DMA operation to</div><div class='add'>+ * copy the RD from the DSE to the correct location in the RDR.</div><div class='add'>+ *</div><div class='add'>+ * Data Store Engine(DSE) - It is responsible for parsing the prepared RD</div><div class='add'>+ * and setting up the required control and packet data DMA transfers from</div><div class='add'>+ * the processing engine to system memory.</div><div class='add'>+ *</div><div class='add'>+ * Advanced Interrupt Controllers(AICs) - receive interrupt request signals</div><div class='add'>+ * from various sources and combine them into one interrupt output.</div><div class='add'>+ * The AICs are used by:</div><div class='add'>+ * - One for the HIA global and processing engine interrupts.</div><div class='add'>+ * - The others for the descriptor ring interrupts.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Cryptographic engine capabilities */</div><div class='add'>+struct mtk_sys_cap {</div><div class='add'>+	/* host interface adapter */</div><div class='add'>+	u32 hia_ver;</div><div class='add'>+	u32 hia_opt;</div><div class='add'>+	/* packet engine */</div><div class='add'>+	u32 pkt_eng_opt;</div><div class='add'>+	/* global hardware */</div><div class='add'>+	u32 hw_opt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mtk_desc_ring_link(struct mtk_cryp *cryp, u32 mask)</div><div class='add'>+{</div><div class='add'>+	/* Assign rings to DFE/DSE thread and enable it */</div><div class='add'>+	writel(MTK_DFSE_THR_CTRL_EN | mask, cryp-&gt;base + DFE_THR_CTRL);</div><div class='add'>+	writel(MTK_DFSE_THR_CTRL_EN | mask, cryp-&gt;base + DSE_THR_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_dfe_dse_buf_setup(struct mtk_cryp *cryp,</div><div class='add'>+				  struct mtk_sys_cap *cap)</div><div class='add'>+{</div><div class='add'>+	u32 width = MTK_HIA_DATA_WIDTH(cap-&gt;hia_opt) + 2;</div><div class='add'>+	u32 len = MTK_HIA_DMA_LENGTH(cap-&gt;hia_opt) - 1;</div><div class='add'>+	u32 ipbuf = min((u32)MTK_IN_DBUF_SIZE(cap-&gt;hw_opt) + width, len);</div><div class='add'>+	u32 opbuf = min((u32)MTK_OUT_DBUF_SIZE(cap-&gt;hw_opt) + width, len);</div><div class='add'>+	u32 itbuf = min((u32)MTK_IN_TBUF_SIZE(cap-&gt;hw_opt) + width, len);</div><div class='add'>+</div><div class='add'>+	writel(MTK_DFSE_MIN_DATA(ipbuf - 1) |</div><div class='add'>+	       MTK_DFSE_MAX_DATA(ipbuf) |</div><div class='add'>+	       MTK_DFE_MIN_CTRL(itbuf - 1) |</div><div class='add'>+	       MTK_DFE_MAX_CTRL(itbuf),</div><div class='add'>+	       cryp-&gt;base + DFE_CFG);</div><div class='add'>+</div><div class='add'>+	writel(MTK_DFSE_MIN_DATA(opbuf - 1) |</div><div class='add'>+	       MTK_DFSE_MAX_DATA(opbuf),</div><div class='add'>+	       cryp-&gt;base + DSE_CFG);</div><div class='add'>+</div><div class='add'>+	writel(MTK_IN_BUF_MIN_THRESH(ipbuf - 1) |</div><div class='add'>+	       MTK_IN_BUF_MAX_THRESH(ipbuf),</div><div class='add'>+	       cryp-&gt;base + PE_IN_DBUF_THRESH);</div><div class='add'>+</div><div class='add'>+	writel(MTK_IN_BUF_MIN_THRESH(itbuf - 1) |</div><div class='add'>+	       MTK_IN_BUF_MAX_THRESH(itbuf),</div><div class='add'>+	       cryp-&gt;base + PE_IN_TBUF_THRESH);</div><div class='add'>+</div><div class='add'>+	writel(MTK_OUT_BUF_MIN_THRESH(opbuf - 1) |</div><div class='add'>+	       MTK_OUT_BUF_MAX_THRESH(opbuf),</div><div class='add'>+	       cryp-&gt;base + PE_OUT_DBUF_THRESH);</div><div class='add'>+</div><div class='add'>+	writel(0, cryp-&gt;base + PE_OUT_TBUF_THRESH);</div><div class='add'>+	writel(0, cryp-&gt;base + PE_OUT_BUF_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_dfe_dse_state_check(struct mtk_cryp *cryp)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Check for completion of all DMA transfers */</div><div class='add'>+	val = readl(cryp-&gt;base + DFE_THR_STAT);</div><div class='add'>+	if (MTK_DFSE_RING_ID(val) == MTK_DFSE_IDLE) {</div><div class='add'>+		val = readl(cryp-&gt;base + DSE_THR_STAT);</div><div class='add'>+		if (MTK_DFSE_RING_ID(val) == MTK_DFSE_IDLE)</div><div class='add'>+			ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* Take DFE/DSE thread out of reset */</div><div class='add'>+		writel(0, cryp-&gt;base + DFE_THR_CTRL);</div><div class='add'>+		writel(0, cryp-&gt;base + DSE_THR_CTRL);</div><div class='add'>+	} else {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_dfe_dse_reset(struct mtk_cryp *cryp)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Reset DSE/DFE and correct system priorities for all rings. */</div><div class='add'>+	writel(MTK_DFSE_THR_CTRL_RESET, cryp-&gt;base + DFE_THR_CTRL);</div><div class='add'>+	writel(0, cryp-&gt;base + DFE_PRIO_0);</div><div class='add'>+	writel(0, cryp-&gt;base + DFE_PRIO_1);</div><div class='add'>+	writel(0, cryp-&gt;base + DFE_PRIO_2);</div><div class='add'>+	writel(0, cryp-&gt;base + DFE_PRIO_3);</div><div class='add'>+</div><div class='add'>+	writel(MTK_DFSE_THR_CTRL_RESET, cryp-&gt;base + DSE_THR_CTRL);</div><div class='add'>+	writel(0, cryp-&gt;base + DSE_PRIO_0);</div><div class='add'>+	writel(0, cryp-&gt;base + DSE_PRIO_1);</div><div class='add'>+	writel(0, cryp-&gt;base + DSE_PRIO_2);</div><div class='add'>+	writel(0, cryp-&gt;base + DSE_PRIO_3);</div><div class='add'>+</div><div class='add'>+	err = mtk_dfe_dse_state_check(cryp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_cmd_desc_ring_setup(struct mtk_cryp *cryp,</div><div class='add'>+				    int i, struct mtk_sys_cap *cap)</div><div class='add'>+{</div><div class='add'>+	/* Full descriptor that fits FIFO minus one */</div><div class='add'>+	u32 count =</div><div class='add'>+		((1 &lt;&lt; MTK_CMD_FIFO_SIZE(cap-&gt;hia_opt)) / MTK_DESC_SZ) - 1;</div><div class='add'>+</div><div class='add'>+	/* Temporarily disable external triggering */</div><div class='add'>+	writel(0, cryp-&gt;base + CDR_CFG(i));</div><div class='add'>+</div><div class='add'>+	/* Clear CDR count */</div><div class='add'>+	writel(MTK_CNT_RST, cryp-&gt;base + CDR_PREP_COUNT(i));</div><div class='add'>+	writel(MTK_CNT_RST, cryp-&gt;base + CDR_PROC_COUNT(i));</div><div class='add'>+</div><div class='add'>+	writel(0, cryp-&gt;base + CDR_PREP_PNTR(i));</div><div class='add'>+	writel(0, cryp-&gt;base + CDR_PROC_PNTR(i));</div><div class='add'>+	writel(0, cryp-&gt;base + CDR_DMA_CFG(i));</div><div class='add'>+</div><div class='add'>+	/* Configure CDR host address space */</div><div class='add'>+	writel(0, cryp-&gt;base + CDR_BASE_ADDR_HI(i));</div><div class='add'>+	writel(cryp-&gt;ring[i]-&gt;cmd_dma, cryp-&gt;base + CDR_BASE_ADDR_LO(i));</div><div class='add'>+</div><div class='add'>+	writel(MTK_DESC_RING_SZ, cryp-&gt;base + CDR_RING_SIZE(i));</div><div class='add'>+</div><div class='add'>+	/* Clear and disable all CDR interrupts */</div><div class='add'>+	writel(MTK_CDR_STAT_CLR, cryp-&gt;base + CDR_STAT(i));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set command descriptor offset and enable additional</div><div class='add'>+	 * token present in descriptor.</div><div class='add'>+	 */</div><div class='add'>+	writel(MTK_DESC_SIZE(MTK_DESC_SZ) |</div><div class='add'>+		   MTK_DESC_OFFSET(MTK_DESC_OFF) |</div><div class='add'>+	       MTK_DESC_ATP_PRESENT,</div><div class='add'>+	       cryp-&gt;base + CDR_DESC_SIZE(i));</div><div class='add'>+</div><div class='add'>+	writel(MTK_DESC_FETCH_SIZE(count * MTK_DESC_OFF) |</div><div class='add'>+		   MTK_DESC_FETCH_THRESH(count * MTK_DESC_SZ),</div><div class='add'>+		   cryp-&gt;base + CDR_CFG(i));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_res_desc_ring_setup(struct mtk_cryp *cryp,</div><div class='add'>+				    int i, struct mtk_sys_cap *cap)</div><div class='add'>+{</div><div class='add'>+	u32 rndup = 2;</div><div class='add'>+	u32 count = ((1 &lt;&lt; MTK_RES_FIFO_SIZE(cap-&gt;hia_opt)) / rndup) - 1;</div><div class='add'>+</div><div class='add'>+	/* Temporarily disable external triggering */</div><div class='add'>+	writel(0, cryp-&gt;base + RDR_CFG(i));</div><div class='add'>+</div><div class='add'>+	/* Clear RDR count */</div><div class='add'>+	writel(MTK_CNT_RST, cryp-&gt;base + RDR_PREP_COUNT(i));</div><div class='add'>+	writel(MTK_CNT_RST, cryp-&gt;base + RDR_PROC_COUNT(i));</div><div class='add'>+</div><div class='add'>+	writel(0, cryp-&gt;base + RDR_PREP_PNTR(i));</div><div class='add'>+	writel(0, cryp-&gt;base + RDR_PROC_PNTR(i));</div><div class='add'>+	writel(0, cryp-&gt;base + RDR_DMA_CFG(i));</div><div class='add'>+</div><div class='add'>+	/* Configure RDR host address space */</div><div class='add'>+	writel(0, cryp-&gt;base + RDR_BASE_ADDR_HI(i));</div><div class='add'>+	writel(cryp-&gt;ring[i]-&gt;res_dma, cryp-&gt;base + RDR_BASE_ADDR_LO(i));</div><div class='add'>+</div><div class='add'>+	writel(MTK_DESC_RING_SZ, cryp-&gt;base + RDR_RING_SIZE(i));</div><div class='add'>+	writel(MTK_RDR_STAT_CLR, cryp-&gt;base + RDR_STAT(i));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RDR manager generates update interrupts on a per-completed-packet,</div><div class='add'>+	 * and the rd_proc_thresh_irq interrupt is fired when proc_pkt_count</div><div class='add'>+	 * for the RDR exceeds the number of packets.</div><div class='add'>+	 */</div><div class='add'>+	writel(MTK_RDR_PROC_THRESH | MTK_RDR_PROC_MODE,</div><div class='add'>+	       cryp-&gt;base + RDR_THRESH(i));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure a threshold and time-out value for the processed</div><div class='add'>+	 * result descriptors (or complete packets) that are written to</div><div class='add'>+	 * the RDR.</div><div class='add'>+	 */</div><div class='add'>+	writel(MTK_DESC_SIZE(MTK_DESC_SZ) | MTK_DESC_OFFSET(MTK_DESC_OFF),</div><div class='add'>+	       cryp-&gt;base + RDR_DESC_SIZE(i));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure HIA fetch size and fetch threshold that are used to</div><div class='add'>+	 * fetch blocks of multiple descriptors.</div><div class='add'>+	 */</div><div class='add'>+	writel(MTK_DESC_FETCH_SIZE(count * MTK_DESC_OFF) |</div><div class='add'>+	       MTK_DESC_FETCH_THRESH(count * rndup) |</div><div class='add'>+	       MTK_DESC_OVL_IRQ_EN,</div><div class='add'>+		   cryp-&gt;base + RDR_CFG(i));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_packet_engine_setup(struct mtk_cryp *cryp)</div><div class='add'>+{</div><div class='add'>+	struct mtk_sys_cap cap;</div><div class='add'>+	int i, err;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	cap.hia_ver = readl(cryp-&gt;base + HIA_VERSION);</div><div class='add'>+	cap.hia_opt = readl(cryp-&gt;base + HIA_OPTIONS);</div><div class='add'>+	cap.hw_opt = readl(cryp-&gt;base + EIP97_OPTIONS);</div><div class='add'>+</div><div class='add'>+	if (!(((u16)cap.hia_ver) == MTK_HIA_SIGNATURE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Configure endianness conversion method for master (DMA) interface */</div><div class='add'>+	writel(0, cryp-&gt;base + EIP97_MST_CTRL);</div><div class='add'>+</div><div class='add'>+	/* Set HIA burst size */</div><div class='add'>+	val = readl(cryp-&gt;base + HIA_MST_CTRL);</div><div class='add'>+	val &amp;= ~MTK_BURST_SIZE_MSK;</div><div class='add'>+	val |= MTK_BURST_SIZE(5);</div><div class='add'>+	writel(val, cryp-&gt;base + HIA_MST_CTRL);</div><div class='add'>+</div><div class='add'>+	err = mtk_dfe_dse_reset(cryp);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(cryp-&gt;dev, "Failed to reset DFE and DSE.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtk_dfe_dse_buf_setup(cryp, &amp;cap);</div><div class='add'>+</div><div class='add'>+	/* Enable the 4 rings for the packet engines. */</div><div class='add'>+	mtk_desc_ring_link(cryp, 0xf);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RING_MAX; i++) {</div><div class='add'>+		mtk_cmd_desc_ring_setup(cryp, i, &amp;cap);</div><div class='add'>+		mtk_res_desc_ring_setup(cryp, i, &amp;cap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(MTK_PE_TK_LOC_AVL | MTK_PE_PROC_HELD | MTK_PE_TK_TIMEOUT_EN,</div><div class='add'>+	       cryp-&gt;base + PE_TOKEN_CTRL_STAT);</div><div class='add'>+</div><div class='add'>+	/* Clear all pending interrupts */</div><div class='add'>+	writel(MTK_AIC_G_CLR, cryp-&gt;base + AIC_G_ACK);</div><div class='add'>+	writel(MTK_PE_INPUT_DMA_ERR | MTK_PE_OUTPUT_DMA_ERR |</div><div class='add'>+	       MTK_PE_PKT_PORC_ERR | MTK_PE_PKT_TIMEOUT |</div><div class='add'>+	       MTK_PE_FATAL_ERR | MTK_PE_INPUT_DMA_ERR_EN |</div><div class='add'>+	       MTK_PE_OUTPUT_DMA_ERR_EN | MTK_PE_PKT_PORC_ERR_EN |</div><div class='add'>+	       MTK_PE_PKT_TIMEOUT_EN | MTK_PE_FATAL_ERR_EN |</div><div class='add'>+	       MTK_PE_INT_OUT_EN,</div><div class='add'>+	       cryp-&gt;base + PE_INTERRUPT_CTRL_STAT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aic_cap_check(struct mtk_cryp *cryp, int hw)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (hw == RING_MAX)</div><div class='add'>+		val = readl(cryp-&gt;base + AIC_G_VERSION);</div><div class='add'>+	else</div><div class='add'>+		val = readl(cryp-&gt;base + AIC_VERSION(hw));</div><div class='add'>+</div><div class='add'>+	val &amp;= MTK_AIC_VER_MSK;</div><div class='add'>+	if (val != MTK_AIC_VER11 &amp;&amp; val != MTK_AIC_VER12)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (hw == RING_MAX)</div><div class='add'>+		val = readl(cryp-&gt;base + AIC_G_OPTIONS);</div><div class='add'>+	else</div><div class='add'>+		val = readl(cryp-&gt;base + AIC_OPTIONS(hw));</div><div class='add'>+</div><div class='add'>+	val &amp;= MTK_AIC_INT_MSK;</div><div class='add'>+	if (!val || val &gt; 32)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_aic_init(struct mtk_cryp *cryp, int hw)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mtk_aic_cap_check(cryp, hw);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Disable all interrupts and set initial configuration */</div><div class='add'>+	if (hw == RING_MAX) {</div><div class='add'>+		writel(0, cryp-&gt;base + AIC_G_ENABLE_CTRL);</div><div class='add'>+		writel(0, cryp-&gt;base + AIC_G_POL_CTRL);</div><div class='add'>+		writel(0, cryp-&gt;base + AIC_G_TYPE_CTRL);</div><div class='add'>+		writel(0, cryp-&gt;base + AIC_G_ENABLE_SET);</div><div class='add'>+	} else {</div><div class='add'>+		writel(0, cryp-&gt;base + AIC_ENABLE_CTRL(hw));</div><div class='add'>+		writel(0, cryp-&gt;base + AIC_POL_CTRL(hw));</div><div class='add'>+		writel(0, cryp-&gt;base + AIC_TYPE_CTRL(hw));</div><div class='add'>+		writel(0, cryp-&gt;base + AIC_ENABLE_SET(hw));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_accelerator_init(struct mtk_cryp *cryp)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	/* Initialize advanced interrupt controller(AIC) */</div><div class='add'>+	for (i = 0; i &lt; MTK_IRQ_NUM; i++) {</div><div class='add'>+		err = mtk_aic_init(cryp, i);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(cryp-&gt;dev, "Failed to initialize AIC.\n");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize packet engine */</div><div class='add'>+	err = mtk_packet_engine_setup(cryp);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(cryp-&gt;dev, "Failed to configure packet engine.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtk_desc_dma_free(struct mtk_cryp *cryp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RING_MAX; i++) {</div><div class='add'>+		dma_free_coherent(cryp-&gt;dev, MTK_DESC_RING_SZ,</div><div class='add'>+				  cryp-&gt;ring[i]-&gt;res_base,</div><div class='add'>+				  cryp-&gt;ring[i]-&gt;res_dma);</div><div class='add'>+		dma_free_coherent(cryp-&gt;dev, MTK_DESC_RING_SZ,</div><div class='add'>+				  cryp-&gt;ring[i]-&gt;cmd_base,</div><div class='add'>+				  cryp-&gt;ring[i]-&gt;cmd_dma);</div><div class='add'>+		kfree(cryp-&gt;ring[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_desc_ring_alloc(struct mtk_cryp *cryp)</div><div class='add'>+{</div><div class='add'>+	struct mtk_ring **ring = cryp-&gt;ring;</div><div class='add'>+	int i, err = ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RING_MAX; i++) {</div><div class='add'>+		ring[i] = kzalloc(sizeof(**ring), GFP_KERNEL);</div><div class='add'>+		if (!ring[i])</div><div class='add'>+			goto err_cleanup;</div><div class='add'>+</div><div class='add'>+		ring[i]-&gt;cmd_base = dma_zalloc_coherent(cryp-&gt;dev,</div><div class='add'>+					   MTK_DESC_RING_SZ,</div><div class='add'>+					   &amp;ring[i]-&gt;cmd_dma,</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+		if (!ring[i]-&gt;cmd_base)</div><div class='add'>+			goto err_cleanup;</div><div class='add'>+</div><div class='add'>+		ring[i]-&gt;res_base = dma_zalloc_coherent(cryp-&gt;dev,</div><div class='add'>+					   MTK_DESC_RING_SZ,</div><div class='add'>+					   &amp;ring[i]-&gt;res_dma,</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+		if (!ring[i]-&gt;res_base)</div><div class='add'>+			goto err_cleanup;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cleanup:</div><div class='add'>+	for (; i--; ) {</div><div class='add'>+		dma_free_coherent(cryp-&gt;dev, MTK_DESC_RING_SZ,</div><div class='add'>+				  ring[i]-&gt;res_base, ring[i]-&gt;res_dma);</div><div class='add'>+		dma_free_coherent(cryp-&gt;dev, MTK_DESC_RING_SZ,</div><div class='add'>+				  ring[i]-&gt;cmd_base, ring[i]-&gt;cmd_dma);</div><div class='add'>+		kfree(ring[i]);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_crypto_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	struct mtk_cryp *cryp;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	cryp = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*cryp), GFP_KERNEL);</div><div class='add'>+	if (!cryp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cryp-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(cryp-&gt;base))</div><div class='add'>+		return PTR_ERR(cryp-&gt;base);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MTK_IRQ_NUM; i++) {</div><div class='add'>+		cryp-&gt;irq[i] = platform_get_irq(pdev, i);</div><div class='add'>+		if (cryp-&gt;irq[i] &lt; 0) {</div><div class='add'>+			dev_err(cryp-&gt;dev, "no IRQ:%d resource info\n", i);</div><div class='add'>+			return -ENXIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cryp-&gt;clk_ethif = devm_clk_get(&amp;pdev-&gt;dev, "ethif");</div><div class='add'>+	cryp-&gt;clk_cryp = devm_clk_get(&amp;pdev-&gt;dev, "cryp");</div><div class='add'>+	if (IS_ERR(cryp-&gt;clk_ethif) || IS_ERR(cryp-&gt;clk_cryp))</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='add'>+</div><div class='add'>+	cryp-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	pm_runtime_enable(cryp-&gt;dev);</div><div class='add'>+	pm_runtime_get_sync(cryp-&gt;dev);</div><div class='add'>+</div><div class='add'>+	err = clk_prepare_enable(cryp-&gt;clk_ethif);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_clk_ethif;</div><div class='add'>+</div><div class='add'>+	err = clk_prepare_enable(cryp-&gt;clk_cryp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_clk_cryp;</div><div class='add'>+</div><div class='add'>+	/* Allocate four command/result descriptor rings */</div><div class='add'>+	err = mtk_desc_ring_alloc(cryp);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(cryp-&gt;dev, "Unable to allocate descriptor rings.\n");</div><div class='add'>+		goto err_resource;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize hardware modules */</div><div class='add'>+	err = mtk_accelerator_init(cryp);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(cryp-&gt;dev, "Failed to initialize cryptographic engine.\n");</div><div class='add'>+		goto err_engine;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mtk_cipher_alg_register(cryp);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(cryp-&gt;dev, "Unable to register cipher algorithm.\n");</div><div class='add'>+		goto err_cipher;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mtk_hash_alg_register(cryp);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(cryp-&gt;dev, "Unable to register hash algorithm.\n");</div><div class='add'>+		goto err_hash;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, cryp);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_hash:</div><div class='add'>+	mtk_cipher_alg_release(cryp);</div><div class='add'>+err_cipher:</div><div class='add'>+	mtk_dfe_dse_reset(cryp);</div><div class='add'>+err_engine:</div><div class='add'>+	mtk_desc_dma_free(cryp);</div><div class='add'>+err_resource:</div><div class='add'>+	clk_disable_unprepare(cryp-&gt;clk_cryp);</div><div class='add'>+err_clk_cryp:</div><div class='add'>+	clk_disable_unprepare(cryp-&gt;clk_ethif);</div><div class='add'>+err_clk_ethif:</div><div class='add'>+	pm_runtime_put_sync(cryp-&gt;dev);</div><div class='add'>+	pm_runtime_disable(cryp-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_crypto_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mtk_cryp *cryp = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	mtk_hash_alg_release(cryp);</div><div class='add'>+	mtk_cipher_alg_release(cryp);</div><div class='add'>+	mtk_desc_dma_free(cryp);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(cryp-&gt;clk_cryp);</div><div class='add'>+	clk_disable_unprepare(cryp-&gt;clk_ethif);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_sync(cryp-&gt;dev);</div><div class='add'>+	pm_runtime_disable(cryp-&gt;dev);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_crypto_id[] = {</div><div class='add'>+	{ .compatible = "mediatek,eip97-crypto" },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, of_crypto_id);</div><div class='add'>+</div><div class='add'>+static struct platform_driver mtk_crypto_driver = {</div><div class='add'>+	.probe = mtk_crypto_probe,</div><div class='add'>+	.remove = mtk_crypto_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		   .name = "mtk-crypto",</div><div class='add'>+		   .owner = THIS_MODULE,</div><div class='add'>+		   .of_match_table = of_crypto_id,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(mtk_crypto_driver);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Ryder Lee &lt;ryder.lee@mediatek.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Cryptographic accelerator driver for EIP97");</div><div class='head'>diff --git a/drivers/crypto/mediatek/mtk-platform.h b/drivers/crypto/mediatek/mtk-platform.h<br/>new file mode 100644<br/>index 000000000000..ed6d8717f7f4<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/mediatek/mtk-platform.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/mtk-platform.h</a></div><div class='hunk'>@@ -0,0 +1,231 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for EIP97 cryptographic accelerator.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MTK_PLATFORM_H_</div><div class='add'>+#define __MTK_PLATFORM_H_</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;crypto/scatterwalk.h&gt;</div><div class='add'>+#include &lt;crypto/skcipher.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include "mtk-regs.h"</div><div class='add'>+</div><div class='add'>+#define MTK_RDR_PROC_THRESH	BIT(0)</div><div class='add'>+#define MTK_RDR_PROC_MODE	BIT(23)</div><div class='add'>+#define MTK_CNT_RST		BIT(31)</div><div class='add'>+#define MTK_IRQ_RDR0		BIT(1)</div><div class='add'>+#define MTK_IRQ_RDR1		BIT(3)</div><div class='add'>+#define MTK_IRQ_RDR2		BIT(5)</div><div class='add'>+#define MTK_IRQ_RDR3		BIT(7)</div><div class='add'>+</div><div class='add'>+#define SIZE_IN_WORDS(x)	((x) &gt;&gt; 2)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Ring 0/1 are used by AES encrypt and decrypt.</div><div class='add'>+ * Ring 2/3 are used by SHA.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	RING0 = 0,</div><div class='add'>+	RING1,</div><div class='add'>+	RING2,</div><div class='add'>+	RING3,</div><div class='add'>+	RING_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MTK_REC_NUM		(RING_MAX / 2)</div><div class='add'>+#define MTK_IRQ_NUM		5</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mtk_desc - DMA descriptor</div><div class='add'>+ * @hdr:	the descriptor control header</div><div class='add'>+ * @buf:	DMA address of input buffer segment</div><div class='add'>+ * @ct:		DMA address of command token that control operation flow</div><div class='add'>+ * @ct_hdr:	the command token control header</div><div class='add'>+ * @tag:	the user-defined field</div><div class='add'>+ * @tfm:	DMA address of transform state</div><div class='add'>+ * @bound:	align descriptors offset boundary</div><div class='add'>+ *</div><div class='add'>+ * Structure passed to the crypto engine to describe where source</div><div class='add'>+ * data needs to be fetched and how it needs to be processed.</div><div class='add'>+ */</div><div class='add'>+struct mtk_desc {</div><div class='add'>+	__le32 hdr;</div><div class='add'>+	__le32 buf;</div><div class='add'>+	__le32 ct;</div><div class='add'>+	__le32 ct_hdr;</div><div class='add'>+	__le32 tag;</div><div class='add'>+	__le32 tfm;</div><div class='add'>+	__le32 bound[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MTK_DESC_NUM		512</div><div class='add'>+#define MTK_DESC_OFF		SIZE_IN_WORDS(sizeof(struct mtk_desc))</div><div class='add'>+#define MTK_DESC_SZ		(MTK_DESC_OFF - 2)</div><div class='add'>+#define MTK_DESC_RING_SZ	((sizeof(struct mtk_desc) * MTK_DESC_NUM))</div><div class='add'>+#define MTK_DESC_CNT(x)		((MTK_DESC_OFF * (x)) &lt;&lt; 2)</div><div class='add'>+#define MTK_DESC_LAST		cpu_to_le32(BIT(22))</div><div class='add'>+#define MTK_DESC_FIRST		cpu_to_le32(BIT(23))</div><div class='add'>+#define MTK_DESC_BUF_LEN(x)	cpu_to_le32(x)</div><div class='add'>+#define MTK_DESC_CT_LEN(x)	cpu_to_le32((x) &lt;&lt; 24)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mtk_ring - Descriptor ring</div><div class='add'>+ * @cmd_base:	pointer to command descriptor ring base</div><div class='add'>+ * @cmd_dma:	DMA address of command descriptor ring</div><div class='add'>+ * @cmd_pos:	current position in the command descriptor ring</div><div class='add'>+ * @res_base:	pointer to result descriptor ring base</div><div class='add'>+ * @res_dma:	DMA address of result descriptor ring</div><div class='add'>+ * @res_pos:	current position in the result descriptor ring</div><div class='add'>+ *</div><div class='add'>+ * A descriptor ring is a circular buffer that is used to manage</div><div class='add'>+ * one or more descriptors. There are two type of descriptor rings;</div><div class='add'>+ * the command descriptor ring and result descriptor ring.</div><div class='add'>+ */</div><div class='add'>+struct mtk_ring {</div><div class='add'>+	struct mtk_desc *cmd_base;</div><div class='add'>+	dma_addr_t cmd_dma;</div><div class='add'>+	u32 cmd_pos;</div><div class='add'>+	struct mtk_desc *res_base;</div><div class='add'>+	dma_addr_t res_dma;</div><div class='add'>+	u32 res_pos;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mtk_aes_dma - Structure that holds sg list info</div><div class='add'>+ * @sg:		pointer to scatter-gather list</div><div class='add'>+ * @nents:	number of entries in the sg list</div><div class='add'>+ * @remainder:	remainder of sg list</div><div class='add'>+ * @sg_len:	number of entries in the sg mapped list</div><div class='add'>+ */</div><div class='add'>+struct mtk_aes_dma {</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	int nents;</div><div class='add'>+	u32 remainder;</div><div class='add'>+	u32 sg_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_aes_base_ctx;</div><div class='add'>+struct mtk_aes_rec;</div><div class='add'>+struct mtk_cryp;</div><div class='add'>+</div><div class='add'>+typedef int (*mtk_aes_fn)(struct mtk_cryp *cryp, struct mtk_aes_rec *aes);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mtk_aes_rec - AES operation record</div><div class='add'>+ * @queue:	crypto request queue</div><div class='add'>+ * @areq:	pointer to async request</div><div class='add'>+ * @task:	the tasklet is use in AES interrupt</div><div class='add'>+ * @ctx:	pointer to current context</div><div class='add'>+ * @src:	the structure that holds source sg list info</div><div class='add'>+ * @dst:	the structure that holds destination sg list info</div><div class='add'>+ * @aligned_sg:	the scatter list is use to alignment</div><div class='add'>+ * @real_dst:	pointer to the destination sg list</div><div class='add'>+ * @resume:	pointer to resume function</div><div class='add'>+ * @total:	request buffer length</div><div class='add'>+ * @buf:	pointer to page buffer</div><div class='add'>+ * @id:		record identification</div><div class='add'>+ * @flags:	it's describing AES operation state</div><div class='add'>+ * @lock:	the async queue lock</div><div class='add'>+ *</div><div class='add'>+ * Structure used to record AES execution state.</div><div class='add'>+ */</div><div class='add'>+struct mtk_aes_rec {</div><div class='add'>+	struct crypto_queue queue;</div><div class='add'>+	struct crypto_async_request *areq;</div><div class='add'>+	struct tasklet_struct task;</div><div class='add'>+	struct mtk_aes_base_ctx *ctx;</div><div class='add'>+	struct mtk_aes_dma src;</div><div class='add'>+	struct mtk_aes_dma dst;</div><div class='add'>+</div><div class='add'>+	struct scatterlist aligned_sg;</div><div class='add'>+	struct scatterlist *real_dst;</div><div class='add'>+</div><div class='add'>+	mtk_aes_fn resume;</div><div class='add'>+</div><div class='add'>+	size_t total;</div><div class='add'>+	void *buf;</div><div class='add'>+</div><div class='add'>+	u8 id;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	/* queue lock */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mtk_sha_rec - SHA operation record</div><div class='add'>+ * @queue:	crypto request queue</div><div class='add'>+ * @req:	pointer to ahash request</div><div class='add'>+ * @task:	the tasklet is use in SHA interrupt</div><div class='add'>+ * @id:		record identification</div><div class='add'>+ * @flags:	it's describing SHA operation state</div><div class='add'>+ * @lock:	the ablkcipher queue lock</div><div class='add'>+ *</div><div class='add'>+ * Structure used to record SHA execution state.</div><div class='add'>+ */</div><div class='add'>+struct mtk_sha_rec {</div><div class='add'>+	struct crypto_queue queue;</div><div class='add'>+	struct ahash_request *req;</div><div class='add'>+	struct tasklet_struct task;</div><div class='add'>+</div><div class='add'>+	u8 id;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	/* queue lock */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mtk_cryp - Cryptographic device</div><div class='add'>+ * @base:	pointer to mapped register I/O base</div><div class='add'>+ * @dev:	pointer to device</div><div class='add'>+ * @clk_ethif:	pointer to ethif clock</div><div class='add'>+ * @clk_cryp:	pointer to crypto clock</div><div class='add'>+ * @irq:	global system and rings IRQ</div><div class='add'>+ * @ring:	pointer to execution state of AES</div><div class='add'>+ * @aes:	pointer to execution state of SHA</div><div class='add'>+ * @sha:	each execution record map to a ring</div><div class='add'>+ * @aes_list:	device list of AES</div><div class='add'>+ * @sha_list:	device list of SHA</div><div class='add'>+ * @tmp:	pointer to temporary buffer for internal use</div><div class='add'>+ * @tmp_dma:	DMA address of temporary buffer</div><div class='add'>+ * @rec:	it's used to select SHA record for tfm</div><div class='add'>+ *</div><div class='add'>+ * Structure storing cryptographic device information.</div><div class='add'>+ */</div><div class='add'>+struct mtk_cryp {</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct clk *clk_ethif;</div><div class='add'>+	struct clk *clk_cryp;</div><div class='add'>+	int irq[MTK_IRQ_NUM];</div><div class='add'>+</div><div class='add'>+	struct mtk_ring *ring[RING_MAX];</div><div class='add'>+	struct mtk_aes_rec *aes[MTK_REC_NUM];</div><div class='add'>+	struct mtk_sha_rec *sha[MTK_REC_NUM];</div><div class='add'>+</div><div class='add'>+	struct list_head aes_list;</div><div class='add'>+	struct list_head sha_list;</div><div class='add'>+</div><div class='add'>+	void *tmp;</div><div class='add'>+	dma_addr_t tmp_dma;</div><div class='add'>+	bool rec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int mtk_cipher_alg_register(struct mtk_cryp *cryp);</div><div class='add'>+void mtk_cipher_alg_release(struct mtk_cryp *cryp);</div><div class='add'>+int mtk_hash_alg_register(struct mtk_cryp *cryp);</div><div class='add'>+void mtk_hash_alg_release(struct mtk_cryp *cryp);</div><div class='add'>+</div><div class='add'>+#endif /* __MTK_PLATFORM_H_ */</div><div class='head'>diff --git a/drivers/crypto/mediatek/mtk-regs.h b/drivers/crypto/mediatek/mtk-regs.h<br/>new file mode 100644<br/>index 000000000000..94f4eb85be3f<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/mediatek/mtk-regs.h?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/mtk-regs.h</a></div><div class='hunk'>@@ -0,0 +1,194 @@</div><div class='add'>+/*</div><div class='add'>+ * Support for MediaTek cryptographic accelerator.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 MediaTek Inc.</div><div class='add'>+ * Author: Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MTK_REGS_H__</div><div class='add'>+#define __MTK_REGS_H__</div><div class='add'>+</div><div class='add'>+/* HIA, Command Descriptor Ring Manager */</div><div class='add'>+#define CDR_BASE_ADDR_LO(x)		(0x0 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_BASE_ADDR_HI(x)		(0x4 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_DATA_BASE_ADDR_LO(x)	(0x8 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_DATA_BASE_ADDR_HI(x)	(0xC + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_ACD_BASE_ADDR_LO(x)		(0x10 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_ACD_BASE_ADDR_HI(x)		(0x14 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_RING_SIZE(x)		(0x18 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_DESC_SIZE(x)		(0x1C + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_CFG(x)			(0x20 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_DMA_CFG(x)			(0x24 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_THRESH(x)			(0x28 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_PREP_COUNT(x)		(0x2C + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_PROC_COUNT(x)		(0x30 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_PREP_PNTR(x)		(0x34 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_PROC_PNTR(x)		(0x38 + ((x) &lt;&lt; 12))</div><div class='add'>+#define CDR_STAT(x)			(0x3C + ((x) &lt;&lt; 12))</div><div class='add'>+</div><div class='add'>+/* HIA, Result Descriptor Ring Manager */</div><div class='add'>+#define RDR_BASE_ADDR_LO(x)		(0x800 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_BASE_ADDR_HI(x)		(0x804 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_DATA_BASE_ADDR_LO(x)	(0x808 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_DATA_BASE_ADDR_HI(x)	(0x80C + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_ACD_BASE_ADDR_LO(x)		(0x810 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_ACD_BASE_ADDR_HI(x)		(0x814 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_RING_SIZE(x)		(0x818 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_DESC_SIZE(x)		(0x81C + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_CFG(x)			(0x820 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_DMA_CFG(x)			(0x824 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_THRESH(x)			(0x828 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_PREP_COUNT(x)		(0x82C + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_PROC_COUNT(x)		(0x830 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_PREP_PNTR(x)		(0x834 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_PROC_PNTR(x)		(0x838 + ((x) &lt;&lt; 12))</div><div class='add'>+#define RDR_STAT(x)			(0x83C + ((x) &lt;&lt; 12))</div><div class='add'>+</div><div class='add'>+/* HIA, Ring AIC */</div><div class='add'>+#define AIC_POL_CTRL(x)			(0xE000 - ((x) &lt;&lt; 12))</div><div class='add'>+#define	AIC_TYPE_CTRL(x)		(0xE004 - ((x) &lt;&lt; 12))</div><div class='add'>+#define	AIC_ENABLE_CTRL(x)		(0xE008 - ((x) &lt;&lt; 12))</div><div class='add'>+#define	AIC_RAW_STAL(x)			(0xE00C - ((x) &lt;&lt; 12))</div><div class='add'>+#define	AIC_ENABLE_SET(x)		(0xE00C - ((x) &lt;&lt; 12))</div><div class='add'>+#define	AIC_ENABLED_STAT(x)		(0xE010 - ((x) &lt;&lt; 12))</div><div class='add'>+#define	AIC_ACK(x)			(0xE010 - ((x) &lt;&lt; 12))</div><div class='add'>+#define	AIC_ENABLE_CLR(x)		(0xE014 - ((x) &lt;&lt; 12))</div><div class='add'>+#define	AIC_OPTIONS(x)			(0xE018 - ((x) &lt;&lt; 12))</div><div class='add'>+#define	AIC_VERSION(x)			(0xE01C - ((x) &lt;&lt; 12))</div><div class='add'>+</div><div class='add'>+/* HIA, Global AIC */</div><div class='add'>+#define AIC_G_POL_CTRL			0xF800</div><div class='add'>+#define AIC_G_TYPE_CTRL			0xF804</div><div class='add'>+#define AIC_G_ENABLE_CTRL		0xF808</div><div class='add'>+#define AIC_G_RAW_STAT			0xF80C</div><div class='add'>+#define AIC_G_ENABLE_SET		0xF80C</div><div class='add'>+#define AIC_G_ENABLED_STAT		0xF810</div><div class='add'>+#define AIC_G_ACK			0xF810</div><div class='add'>+#define AIC_G_ENABLE_CLR		0xF814</div><div class='add'>+#define AIC_G_OPTIONS			0xF818</div><div class='add'>+#define AIC_G_VERSION			0xF81C</div><div class='add'>+</div><div class='add'>+/* HIA, Data Fetch Engine */</div><div class='add'>+#define DFE_CFG				0xF000</div><div class='add'>+#define DFE_PRIO_0			0xF010</div><div class='add'>+#define DFE_PRIO_1			0xF014</div><div class='add'>+#define DFE_PRIO_2			0xF018</div><div class='add'>+#define DFE_PRIO_3			0xF01C</div><div class='add'>+</div><div class='add'>+/* HIA, Data Fetch Engine access monitoring for CDR */</div><div class='add'>+#define DFE_RING_REGION_LO(x)		(0xF080 + ((x) &lt;&lt; 3))</div><div class='add'>+#define DFE_RING_REGION_HI(x)		(0xF084 + ((x) &lt;&lt; 3))</div><div class='add'>+</div><div class='add'>+/* HIA, Data Fetch Engine thread control and status for thread */</div><div class='add'>+#define DFE_THR_CTRL			0xF200</div><div class='add'>+#define DFE_THR_STAT			0xF204</div><div class='add'>+#define DFE_THR_DESC_CTRL		0xF208</div><div class='add'>+#define DFE_THR_DESC_DPTR_LO		0xF210</div><div class='add'>+#define DFE_THR_DESC_DPTR_HI		0xF214</div><div class='add'>+#define DFE_THR_DESC_ACDPTR_LO		0xF218</div><div class='add'>+#define DFE_THR_DESC_ACDPTR_HI		0xF21C</div><div class='add'>+</div><div class='add'>+/* HIA, Data Store Engine */</div><div class='add'>+#define DSE_CFG				0xF400</div><div class='add'>+#define DSE_PRIO_0			0xF410</div><div class='add'>+#define DSE_PRIO_1			0xF414</div><div class='add'>+#define DSE_PRIO_2			0xF418</div><div class='add'>+#define DSE_PRIO_3			0xF41C</div><div class='add'>+</div><div class='add'>+/* HIA, Data Store Engine access monitoring for RDR */</div><div class='add'>+#define DSE_RING_REGION_LO(x)		(0xF480 + ((x) &lt;&lt; 3))</div><div class='add'>+#define DSE_RING_REGION_HI(x)		(0xF484 + ((x) &lt;&lt; 3))</div><div class='add'>+</div><div class='add'>+/* HIA, Data Store Engine thread control and status for thread */</div><div class='add'>+#define DSE_THR_CTRL			0xF600</div><div class='add'>+#define DSE_THR_STAT			0xF604</div><div class='add'>+#define DSE_THR_DESC_CTRL		0xF608</div><div class='add'>+#define DSE_THR_DESC_DPTR_LO		0xF610</div><div class='add'>+#define DSE_THR_DESC_DPTR_HI		0xF614</div><div class='add'>+#define DSE_THR_DESC_S_DPTR_LO		0xF618</div><div class='add'>+#define DSE_THR_DESC_S_DPTR_HI		0xF61C</div><div class='add'>+#define DSE_THR_ERROR_STAT		0xF620</div><div class='add'>+</div><div class='add'>+/* HIA Global */</div><div class='add'>+#define HIA_MST_CTRL			0xFFF4</div><div class='add'>+#define HIA_OPTIONS			0xFFF8</div><div class='add'>+#define HIA_VERSION			0xFFFC</div><div class='add'>+</div><div class='add'>+/* Processing Engine Input Side, Processing Engine */</div><div class='add'>+#define PE_IN_DBUF_THRESH		0x10000</div><div class='add'>+#define PE_IN_TBUF_THRESH		0x10100</div><div class='add'>+</div><div class='add'>+/* Packet Engine Configuration / Status Registers */</div><div class='add'>+#define PE_TOKEN_CTRL_STAT		0x11000</div><div class='add'>+#define PE_FUNCTION_EN			0x11004</div><div class='add'>+#define PE_CONTEXT_CTRL			0x11008</div><div class='add'>+#define PE_INTERRUPT_CTRL_STAT		0x11010</div><div class='add'>+#define PE_CONTEXT_STAT			0x1100C</div><div class='add'>+#define PE_OUT_TRANS_CTRL_STAT		0x11018</div><div class='add'>+#define PE_OUT_BUF_CTRL			0x1101C</div><div class='add'>+</div><div class='add'>+/* Packet Engine PRNG Registers */</div><div class='add'>+#define PE_PRNG_STAT			0x11040</div><div class='add'>+#define PE_PRNG_CTRL			0x11044</div><div class='add'>+#define PE_PRNG_SEED_L			0x11048</div><div class='add'>+#define PE_PRNG_SEED_H			0x1104C</div><div class='add'>+#define PE_PRNG_KEY_0_L			0x11050</div><div class='add'>+#define PE_PRNG_KEY_0_H			0x11054</div><div class='add'>+#define PE_PRNG_KEY_1_L			0x11058</div><div class='add'>+#define PE_PRNG_KEY_1_H			0x1105C</div><div class='add'>+#define PE_PRNG_RES_0			0x11060</div><div class='add'>+#define PE_PRNG_RES_1			0x11064</div><div class='add'>+#define PE_PRNG_RES_2			0x11068</div><div class='add'>+#define PE_PRNG_RES_3			0x1106C</div><div class='add'>+#define PE_PRNG_LFSR_L			0x11070</div><div class='add'>+#define PE_PRNG_LFSR_H			0x11074</div><div class='add'>+</div><div class='add'>+/* Packet Engine AIC */</div><div class='add'>+#define PE_EIP96_AIC_POL_CTRL		0x113C0</div><div class='add'>+#define PE_EIP96_AIC_TYPE_CTRL		0x113C4</div><div class='add'>+#define PE_EIP96_AIC_ENABLE_CTRL	0x113C8</div><div class='add'>+#define PE_EIP96_AIC_RAW_STAT		0x113CC</div><div class='add'>+#define PE_EIP96_AIC_ENABLE_SET		0x113CC</div><div class='add'>+#define PE_EIP96_AIC_ENABLED_STAT	0x113D0</div><div class='add'>+#define PE_EIP96_AIC_ACK		0x113D0</div><div class='add'>+#define PE_EIP96_AIC_ENABLE_CLR		0x113D4</div><div class='add'>+#define PE_EIP96_AIC_OPTIONS		0x113D8</div><div class='add'>+#define PE_EIP96_AIC_VERSION		0x113DC</div><div class='add'>+</div><div class='add'>+/* Packet Engine Options &amp; Version Registers */</div><div class='add'>+#define PE_EIP96_OPTIONS		0x113F8</div><div class='add'>+#define PE_EIP96_VERSION		0x113FC</div><div class='add'>+</div><div class='add'>+/* Processing Engine Output Side */</div><div class='add'>+#define PE_OUT_DBUF_THRESH		0x11C00</div><div class='add'>+#define PE_OUT_TBUF_THRESH		0x11D00</div><div class='add'>+</div><div class='add'>+/* Processing Engine Local AIC */</div><div class='add'>+#define PE_AIC_POL_CTRL			0x11F00</div><div class='add'>+#define PE_AIC_TYPE_CTRL		0x11F04</div><div class='add'>+#define PE_AIC_ENABLE_CTRL		0x11F08</div><div class='add'>+#define PE_AIC_RAW_STAT			0x11F0C</div><div class='add'>+#define PE_AIC_ENABLE_SET		0x11F0C</div><div class='add'>+#define PE_AIC_ENABLED_STAT		0x11F10</div><div class='add'>+#define PE_AIC_ENABLE_CLR		0x11F14</div><div class='add'>+#define PE_AIC_OPTIONS			0x11F18</div><div class='add'>+#define PE_AIC_VERSION			0x11F1C</div><div class='add'>+</div><div class='add'>+/* Processing Engine General Configuration and Version */</div><div class='add'>+#define PE_IN_FLIGHT			0x11FF0</div><div class='add'>+#define PE_OPTIONS			0x11FF8</div><div class='add'>+#define PE_VERSION			0x11FFC</div><div class='add'>+</div><div class='add'>+/* EIP-97 - Global */</div><div class='add'>+#define EIP97_CLOCK_STATE		0x1FFE4</div><div class='add'>+#define EIP97_FORCE_CLOCK_ON		0x1FFE8</div><div class='add'>+#define EIP97_FORCE_CLOCK_OFF		0x1FFEC</div><div class='add'>+#define EIP97_MST_CTRL			0x1FFF4</div><div class='add'>+#define EIP97_OPTIONS			0x1FFF8</div><div class='add'>+#define EIP97_VERSION			0x1FFFC</div><div class='add'>+#endif /* __MTK_REGS_H__ */</div><div class='head'>diff --git a/drivers/crypto/mediatek/mtk-sha.c b/drivers/crypto/mediatek/mtk-sha.c<br/>new file mode 100644<br/>index 000000000000..55e3805fba07<br/>--- /dev/null<br/>+++ b/<a href='/drm-misc/tree/drivers/crypto/mediatek/mtk-sha.c?id=9095bf25ea08135a5b74875dd0e3eeaddc4218a0'>drivers/crypto/mediatek/mtk-sha.c</a></div><div class='hunk'>@@ -0,0 +1,1435 @@</div><div class='add'>+/*</div><div class='add'>+ * Cryptographic API.</div><div class='add'>+ *</div><div class='add'>+ * Driver for EIP97 SHA1/SHA2(HMAC) acceleration.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Ryder Lee &lt;ryder.lee@mediatek.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Some ideas are from atmel-sha.c and omap-sham.c drivers.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/sha.h&gt;</div><div class='add'>+#include "mtk-platform.h"</div><div class='add'>+</div><div class='add'>+#define SHA_ALIGN_MSK		(sizeof(u32) - 1)</div><div class='add'>+#define SHA_QUEUE_SIZE		512</div><div class='add'>+#define SHA_TMP_BUF_SIZE	512</div><div class='add'>+#define SHA_BUF_SIZE		((u32)PAGE_SIZE)</div><div class='add'>+</div><div class='add'>+#define SHA_OP_UPDATE		1</div><div class='add'>+#define SHA_OP_FINAL		2</div><div class='add'>+</div><div class='add'>+#define SHA_DATA_LEN_MSK	cpu_to_le32(GENMASK(16, 0))</div><div class='add'>+</div><div class='add'>+/* SHA command token */</div><div class='add'>+#define SHA_CT_SIZE		5</div><div class='add'>+#define SHA_CT_CTRL_HDR		cpu_to_le32(0x02220000)</div><div class='add'>+#define SHA_CMD0		cpu_to_le32(0x03020000)</div><div class='add'>+#define SHA_CMD1		cpu_to_le32(0x21060000)</div><div class='add'>+#define SHA_CMD2		cpu_to_le32(0xe0e63802)</div><div class='add'>+</div><div class='add'>+/* SHA transform information */</div><div class='add'>+#define SHA_TFM_HASH		cpu_to_le32(0x2 &lt;&lt; 0)</div><div class='add'>+#define SHA_TFM_INNER_DIG	cpu_to_le32(0x1 &lt;&lt; 21)</div><div class='add'>+#define SHA_TFM_SIZE(x)		cpu_to_le32((x) &lt;&lt; 8)</div><div class='add'>+#define SHA_TFM_START		cpu_to_le32(0x1 &lt;&lt; 4)</div><div class='add'>+#define SHA_TFM_CONTINUE	cpu_to_le32(0x1 &lt;&lt; 5)</div><div class='add'>+#define SHA_TFM_HASH_STORE	cpu_to_le32(0x1 &lt;&lt; 19)</div><div class='add'>+#define SHA_TFM_SHA1		cpu_to_le32(0x2 &lt;&lt; 23)</div><div class='add'>+#define SHA_TFM_SHA256		cpu_to_le32(0x3 &lt;&lt; 23)</div><div class='add'>+#define SHA_TFM_SHA224		cpu_to_le32(0x4 &lt;&lt; 23)</div><div class='add'>+#define SHA_TFM_SHA512		cpu_to_le32(0x5 &lt;&lt; 23)</div><div class='add'>+#define SHA_TFM_SHA384		cpu_to_le32(0x6 &lt;&lt; 23)</div><div class='add'>+#define SHA_TFM_DIGEST(x)	cpu_to_le32(((x) &amp; GENMASK(3, 0)) &lt;&lt; 24)</div><div class='add'>+</div><div class='add'>+/* SHA flags */</div><div class='add'>+#define SHA_FLAGS_BUSY		BIT(0)</div><div class='add'>+#define	SHA_FLAGS_FINAL		BIT(1)</div><div class='add'>+#define SHA_FLAGS_FINUP		BIT(2)</div><div class='add'>+#define SHA_FLAGS_SG		BIT(3)</div><div class='add'>+#define SHA_FLAGS_ALGO_MSK	GENMASK(8, 4)</div><div class='add'>+#define SHA_FLAGS_SHA1		BIT(4)</div><div class='add'>+#define SHA_FLAGS_SHA224	BIT(5)</div><div class='add'>+#define SHA_FLAGS_SHA256	BIT(6)</div><div class='add'>+#define SHA_FLAGS_SHA384	BIT(7)</div><div class='add'>+#define SHA_FLAGS_SHA512	BIT(8)</div><div class='add'>+#define SHA_FLAGS_HMAC		BIT(9)</div><div class='add'>+#define SHA_FLAGS_PAD		BIT(10)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mtk_sha_ct is a set of hardware instructions(command token)</div><div class='add'>+ * that are used to control engine's processing flow of SHA,</div><div class='add'>+ * and it contains the first two words of transform state.</div><div class='add'>+ */</div><div class='add'>+struct mtk_sha_ct {</div><div class='add'>+	__le32 ctrl[2];</div><div class='add'>+	__le32 cmd[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mtk_sha_tfm is used to define SHA transform state</div><div class='add'>+ * and store result digest that produced by engine.</div><div class='add'>+ */</div><div class='add'>+struct mtk_sha_tfm {</div><div class='add'>+	__le32 ctrl[2];</div><div class='add'>+	__le32 digest[SIZE_IN_WORDS(SHA512_DIGEST_SIZE)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mtk_sha_info consists of command token and transform state</div><div class='add'>+ * of SHA, its role is similar to mtk_aes_info.</div><div class='add'>+ */</div><div class='add'>+struct mtk_sha_info {</div><div class='add'>+	struct mtk_sha_ct ct;</div><div class='add'>+	struct mtk_sha_tfm tfm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_sha_reqctx {</div><div class='add'>+	struct mtk_sha_info info;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned long op;</div><div class='add'>+</div><div class='add'>+	u64 digcnt;</div><div class='add'>+	bool start;</div><div class='add'>+	size_t bufcnt;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	__le32 ct_hdr;</div><div class='add'>+	u32 ct_size;</div><div class='add'>+	dma_addr_t ct_dma;</div><div class='add'>+	dma_addr_t tfm_dma;</div><div class='add'>+</div><div class='add'>+	/* Walk state */</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	u32 offset;	/* Offset in current sg */</div><div class='add'>+	u32 total;	/* Total request */</div><div class='add'>+	size_t ds;</div><div class='add'>+	size_t bs;</div><div class='add'>+</div><div class='add'>+	u8 *buffer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_sha_hmac_ctx {</div><div class='add'>+	struct crypto_shash	*shash;</div><div class='add'>+	u8 ipad[SHA512_BLOCK_SIZE] __aligned(sizeof(u32));</div><div class='add'>+	u8 opad[SHA512_BLOCK_SIZE] __aligned(sizeof(u32));</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_sha_ctx {</div><div class='add'>+	struct mtk_cryp *cryp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 id;</div><div class='add'>+	u8 buf[SHA_BUF_SIZE] __aligned(sizeof(u32));</div><div class='add'>+</div><div class='add'>+	struct mtk_sha_hmac_ctx	base[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mtk_sha_drv {</div><div class='add'>+	struct list_head dev_list;</div><div class='add'>+	/* Device list lock */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mtk_sha_drv mtk_sha = {</div><div class='add'>+	.dev_list = LIST_HEAD_INIT(mtk_sha.dev_list),</div><div class='add'>+	.lock = __SPIN_LOCK_UNLOCKED(mtk_sha.lock),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mtk_sha_handle_queue(struct mtk_cryp *cryp, u8 id,</div><div class='add'>+				struct ahash_request *req);</div><div class='add'>+</div><div class='add'>+static inline u32 mtk_sha_read(struct mtk_cryp *cryp, u32 offset)</div><div class='add'>+{</div><div class='add'>+	return readl_relaxed(cryp-&gt;base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mtk_sha_write(struct mtk_cryp *cryp,</div><div class='add'>+				 u32 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	writel_relaxed(value, cryp-&gt;base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mtk_cryp *mtk_sha_find_dev(struct mtk_sha_ctx *tctx)</div><div class='add'>+{</div><div class='add'>+	struct mtk_cryp *cryp = NULL;</div><div class='add'>+	struct mtk_cryp *tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;mtk_sha.lock);</div><div class='add'>+	if (!tctx-&gt;cryp) {</div><div class='add'>+		list_for_each_entry(tmp, &amp;mtk_sha.dev_list, sha_list) {</div><div class='add'>+			cryp = tmp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tctx-&gt;cryp = cryp;</div><div class='add'>+	} else {</div><div class='add'>+		cryp = tctx-&gt;cryp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assign record id to tfm in round-robin fashion, and this</div><div class='add'>+	 * will help tfm to bind  to corresponding descriptor rings.</div><div class='add'>+	 */</div><div class='add'>+	tctx-&gt;id = cryp-&gt;rec;</div><div class='add'>+	cryp-&gt;rec = !cryp-&gt;rec;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;mtk_sha.lock);</div><div class='add'>+</div><div class='add'>+	return cryp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtk_sha_append_sg(struct mtk_sha_reqctx *ctx)</div><div class='add'>+{</div><div class='add'>+	size_t count;</div><div class='add'>+</div><div class='add'>+	while ((ctx-&gt;bufcnt &lt; SHA_BUF_SIZE) &amp;&amp; ctx-&gt;total) {</div><div class='add'>+		count = min(ctx-&gt;sg-&gt;length - ctx-&gt;offset, ctx-&gt;total);</div><div class='add'>+		count = min(count, SHA_BUF_SIZE - ctx-&gt;bufcnt);</div><div class='add'>+</div><div class='add'>+		if (count &lt;= 0) {</div><div class='add'>+			/*</div><div class='add'>+			 * Check if count &lt;= 0 because the buffer is full or</div><div class='add'>+			 * because the sg length is 0. In the latest case,</div><div class='add'>+			 * check if there is another sg in the list, a 0 length</div><div class='add'>+			 * sg doesn't necessarily mean the end of the sg list.</div><div class='add'>+			 */</div><div class='add'>+			if ((ctx-&gt;sg-&gt;length == 0) &amp;&amp; !sg_is_last(ctx-&gt;sg)) {</div><div class='add'>+				ctx-&gt;sg = sg_next(ctx-&gt;sg);</div><div class='add'>+				continue;</div><div class='add'>+			} else {</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		scatterwalk_map_and_copy(ctx-&gt;buffer + ctx-&gt;bufcnt, ctx-&gt;sg,</div><div class='add'>+					 ctx-&gt;offset, count, 0);</div><div class='add'>+</div><div class='add'>+		ctx-&gt;bufcnt += count;</div><div class='add'>+		ctx-&gt;offset += count;</div><div class='add'>+		ctx-&gt;total -= count;</div><div class='add'>+</div><div class='add'>+		if (ctx-&gt;offset == ctx-&gt;sg-&gt;length) {</div><div class='add'>+			ctx-&gt;sg = sg_next(ctx-&gt;sg);</div><div class='add'>+			if (ctx-&gt;sg)</div><div class='add'>+				ctx-&gt;offset = 0;</div><div class='add'>+			else</div><div class='add'>+				ctx-&gt;total = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The purpose of this padding is to ensure that the padded message is a</div><div class='add'>+ * multiple of 512 bits (SHA1/SHA224/SHA256) or 1024 bits (SHA384/SHA512).</div><div class='add'>+ * The bit "1" is appended at the end of the message followed by</div><div class='add'>+ * "padlen-1" zero bits. Then a 64 bits block (SHA1/SHA224/SHA256) or</div><div class='add'>+ * 128 bits block (SHA384/SHA512) equals to the message length in bits</div><div class='add'>+ * is appended.</div><div class='add'>+ *</div><div class='add'>+ * For SHA1/SHA224/SHA256, padlen is calculated as followed:</div><div class='add'>+ *  - if message length &lt; 56 bytes then padlen = 56 - message length</div><div class='add'>+ *  - else padlen = 64 + 56 - message length</div><div class='add'>+ *</div><div class='add'>+ * For SHA384/SHA512, padlen is calculated as followed:</div><div class='add'>+ *  - if message length &lt; 112 bytes then padlen = 112 - message length</div><div class='add'>+ *  - else padlen = 128 + 112 - message length</div><div class='add'>+ */</div><div class='add'>+static void mtk_sha_fill_padding(struct mtk_sha_reqctx *ctx, u32 len)</div><div class='add'>+{</div><div class='add'>+	u32 index, padlen;</div><div class='add'>+	u64 bits[2];</div><div class='add'>+	u64 size = ctx-&gt;digcnt;</div><div class='add'>+</div><div class='add'>+	size += ctx-&gt;bufcnt;</div><div class='add'>+	size += len;</div><div class='add'>+</div><div class='add'>+	bits[1] = cpu_to_be64(size &lt;&lt; 3);</div><div class='add'>+	bits[0] = cpu_to_be64(size &gt;&gt; 61);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;flags &amp; (SHA_FLAGS_SHA384 | SHA_FLAGS_SHA512)) {</div><div class='add'>+		index = ctx-&gt;bufcnt &amp; 0x7f;</div><div class='add'>+		padlen = (index &lt; 112) ? (112 - index) : ((128 + 112) - index);</div><div class='add'>+		*(ctx-&gt;buffer + ctx-&gt;bufcnt) = 0x80;</div><div class='add'>+		memset(ctx-&gt;buffer + ctx-&gt;bufcnt + 1, 0, padlen - 1);</div><div class='add'>+		memcpy(ctx-&gt;buffer + ctx-&gt;bufcnt + padlen, bits, 16);</div><div class='add'>+		ctx-&gt;bufcnt += padlen + 16;</div><div class='add'>+		ctx-&gt;flags |= SHA_FLAGS_PAD;</div><div class='add'>+	} else {</div><div class='add'>+		index = ctx-&gt;bufcnt &amp; 0x3f;</div><div class='add'>+		padlen = (index &lt; 56) ? (56 - index) : ((64 + 56) - index);</div><div class='add'>+		*(ctx-&gt;buffer + ctx-&gt;bufcnt) = 0x80;</div><div class='add'>+		memset(ctx-&gt;buffer + ctx-&gt;bufcnt + 1, 0, padlen - 1);</div><div class='add'>+		memcpy(ctx-&gt;buffer + ctx-&gt;bufcnt + padlen, &amp;bits[1], 8);</div><div class='add'>+		ctx-&gt;bufcnt += padlen + 8;</div><div class='add'>+		ctx-&gt;flags |= SHA_FLAGS_PAD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialize basic transform information of SHA */</div><div class='add'>+static void mtk_sha_info_init(struct mtk_sha_reqctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mtk_sha_ct *ct = &amp;ctx-&gt;info.ct;</div><div class='add'>+	struct mtk_sha_tfm *tfm = &amp;ctx-&gt;info.tfm;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ct_hdr = SHA_CT_CTRL_HDR;</div><div class='add'>+	ctx-&gt;ct_size = SHA_CT_SIZE;</div><div class='add'>+</div><div class='add'>+	tfm-&gt;ctrl[0] = SHA_TFM_HASH | SHA_TFM_INNER_DIG |</div><div class='add'>+		       SHA_TFM_SIZE(SIZE_IN_WORDS(ctx-&gt;ds));</div><div class='add'>+</div><div class='add'>+	switch (ctx-&gt;flags &amp; SHA_FLAGS_ALGO_MSK) {</div><div class='add'>+	case SHA_FLAGS_SHA1:</div><div class='add'>+		tfm-&gt;ctrl[0] |= SHA_TFM_SHA1;</div><div class='add'>+		break;</div><div class='add'>+	case SHA_FLAGS_SHA224:</div><div class='add'>+		tfm-&gt;ctrl[0] |= SHA_TFM_SHA224;</div><div class='add'>+		break;</div><div class='add'>+	case SHA_FLAGS_SHA256:</div><div class='add'>+		tfm-&gt;ctrl[0] |= SHA_TFM_SHA256;</div><div class='add'>+		break;</div><div class='add'>+	case SHA_FLAGS_SHA384:</div><div class='add'>+		tfm-&gt;ctrl[0] |= SHA_TFM_SHA384;</div><div class='add'>+		break;</div><div class='add'>+	case SHA_FLAGS_SHA512:</div><div class='add'>+		tfm-&gt;ctrl[0] |= SHA_TFM_SHA512;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		/* Should not happen... */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tfm-&gt;ctrl[1] = SHA_TFM_HASH_STORE;</div><div class='add'>+	ct-&gt;ctrl[0] = tfm-&gt;ctrl[0] | SHA_TFM_CONTINUE | SHA_TFM_START;</div><div class='add'>+	ct-&gt;ctrl[1] = tfm-&gt;ctrl[1];</div><div class='add'>+</div><div class='add'>+	ct-&gt;cmd[0] = SHA_CMD0;</div><div class='add'>+	ct-&gt;cmd[1] = SHA_CMD1;</div><div class='add'>+	ct-&gt;cmd[2] = SHA_CMD2 | SHA_TFM_DIGEST(SIZE_IN_WORDS(ctx-&gt;ds));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update input data length field of transform information and</div><div class='add'>+ * map it to DMA region.</div><div class='add'>+ */</div><div class='add'>+static int mtk_sha_info_update(struct mtk_cryp *cryp,</div><div class='add'>+			       struct mtk_sha_rec *sha,</div><div class='add'>+			       size_t len)</div><div class='add'>+{</div><div class='add'>+	struct mtk_sha_reqctx *ctx = ahash_request_ctx(sha-&gt;req);</div><div class='add'>+	struct mtk_sha_info *info = &amp;ctx-&gt;info;</div><div class='add'>+	struct mtk_sha_ct *ct = &amp;info-&gt;ct;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;start)</div><div class='add'>+		ctx-&gt;start = false;</div><div class='add'>+	else</div><div class='add'>+		ct-&gt;ctrl[0] &amp;= ~SHA_TFM_START;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ct_hdr &amp;= ~SHA_DATA_LEN_MSK;</div><div class='add'>+	ctx-&gt;ct_hdr |= cpu_to_le32(len);</div><div class='add'>+	ct-&gt;cmd[0] &amp;= ~SHA_DATA_LEN_MSK;</div><div class='add'>+	ct-&gt;cmd[0] |= cpu_to_le32(len);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;digcnt += len;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ct_dma = dma_map_single(cryp-&gt;dev, info, sizeof(*info),</div><div class='add'>+				     DMA_BIDIRECTIONAL);</div><div class='add'>+	if (unlikely(dma_mapping_error(cryp-&gt;dev, ctx-&gt;ct_dma))) {</div><div class='add'>+		dev_err(cryp-&gt;dev, "dma %zu bytes error\n", sizeof(*info));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;tfm_dma = ctx-&gt;ct_dma + sizeof(*ct);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Because of hardware limitation, we must pre-calculate the inner</div><div class='add'>+ * and outer digest that need to be processed firstly by engine, then</div><div class='add'>+ * apply the result digest to the input message. These complex hashing</div><div class='add'>+ * procedures limits HMAC performance, so we use fallback SW encoding.</div><div class='add'>+ */</div><div class='add'>+static int mtk_sha_finish_hmac(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	struct mtk_sha_ctx *tctx = crypto_tfm_ctx(req-&gt;base.tfm);</div><div class='add'>+	struct mtk_sha_hmac_ctx *bctx = tctx-&gt;base;</div><div class='add'>+	struct mtk_sha_reqctx *ctx = ahash_request_ctx(req);</div><div class='add'>+</div><div class='add'>+	SHASH_DESC_ON_STACK(shash, bctx-&gt;shash);</div><div class='add'>+</div><div class='add'>+	shash-&gt;tfm = bctx-&gt;shash;</div><div class='add'>+	shash-&gt;flags = 0; /* not CRYPTO_TFM_REQ_MAY_SLEEP */</div><div class='add'>+</div><div class='add'>+	return crypto_shash_init(shash) ?:</div><div class='add'>+	       crypto_shash_update(shash, bctx-&gt;opad, ctx-&gt;bs) ?:</div><div class='add'>+	       crypto_shash_finup(shash, req-&gt;result, ctx-&gt;ds, req-&gt;result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialize request context */</div><div class='add'>+static int mtk_sha_init(struct